diff --git a/.gitignore b/.gitignore
index b521d33ec..72a128650 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,10 @@
 *.user
 Thumbs.db
 /Bin/Debug
+/Bin/Debug64
 /Bin/Package
 /Bin/Release
+/Bin/Release64
 /build
 /Config/Project64.cache3
 /Config/Project64.cfg
@@ -30,5 +32,25 @@ Thumbs.db
 /Plugin/RSP/pdb
 /Plugin/RSP/RSP 1.7.dll
 /Plugin/RSP/RSP_d 1.7.dll
+/Plugin64/GFX/lib
+/Plugin64/GFX/map
+/Plugin64/GFX/pdb
+/Plugin64/GFX/PJ64Glide64.dll
+/Plugin64/GFX/PJ64Glide64_d.dll
+/Plugin64/Input/lib
+/Plugin64/Input/map
+/Plugin64/Input/pdb
+/Plugin64/Input/PJ64_NRage.dll
+/Plugin64/Input/PJ64_NRage_d.dll
+/Plugin64/RSP/lib
+/Plugin64/RSP/map
+/Plugin64/RSP/pdb
+/Plugin64/RSP/RSP 1.7.dll
+/Plugin64/RSP/RSP_d 1.7.dll
+/Source/3rd Party/wx/lib/vc_lib/msw/wx/setup.h
+/Source/3rd Party/wx/lib/vc_lib/mswd/wx/setup.h
 /Source/3rd Party/wx/lib/vc_lib/mswu/wx/msw/rcdefs.h
+/Source/3rd Party/wx/lib/vc_lib/mswu/wx/setup.h
 /Source/3rd Party/wx/lib/vc_lib/mswud/wx/msw/rcdefs.h
+/Source/3rd Party/wx/lib/vc_lib/mswud/wx/setup.h
+/Save
diff --git a/Artwork/Installer Sidebar.psd b/Artwork/Installer Sidebar.psd
new file mode 100644
index 000000000..175aa043f
Binary files /dev/null and b/Artwork/Installer Sidebar.psd differ
diff --git a/Artwork/pj64 icon small.psd b/Artwork/pj64 icon small.psd
new file mode 100644
index 000000000..c7d1e6ba1
Binary files /dev/null and b/Artwork/pj64 icon small.psd differ
diff --git a/Artwork/pj64 icon.psd b/Artwork/pj64 icon.psd
new file mode 100644
index 000000000..bca08a662
Binary files /dev/null and b/Artwork/pj64 icon.psd differ
diff --git a/Artwork/pj64 logo.psd b/Artwork/pj64 logo.psd
new file mode 100644
index 000000000..369caaa03
Binary files /dev/null and b/Artwork/pj64 logo.psd differ
diff --git a/Bin/Debug64/Config/Project64.cfg b/Bin/Debug64/Config/Project64.cfg
new file mode 100644
index 000000000..de2c5dfbc
--- /dev/null
+++ b/Bin/Debug64/Config/Project64.cfg
@@ -0,0 +1,2 @@
+[default]
+ConfigFile=..\..\Config\Project64.cfg
diff --git a/Bin/Release64/Config/Project64.cfg b/Bin/Release64/Config/Project64.cfg
new file mode 100644
index 000000000..de2c5dfbc
--- /dev/null
+++ b/Bin/Release64/Config/Project64.cfg
@@ -0,0 +1,2 @@
+[default]
+ConfigFile=..\..\Config\Project64.cfg
diff --git a/Config/Glide64.rdb b/Config/Glide64.rdb
index ebecb2e2f..b2eb8bca0 100644
--- a/Config/Glide64.rdb
+++ b/Config/Glide64.rdb
@@ -182,6 +182,7 @@ Internal Name=1080 SNOWBOARDING
 alt_tex_size=1
 depthmode=0
 fb_clear=1
+fb_render=1
 optimize_texrect=1
 swapmode=2
 
@@ -190,6 +191,7 @@ Good Name=1080 Snowboarding (JU) (M2)
 Internal Name=1080 SNOWBOARDING
 depthmode=0
 fb_clear=1
+fb_render=1
 optimize_texrect=1
 swapmode=2
 
@@ -205,26 +207,31 @@ use_sts1_only=1
 Good Name=A Bug's Life (E)
 Internal Name=A Bug's Life
 depthmode=0
+zmode_compare_less=1
 
 [2B38AEC0-6350B810-C:46]
 Good Name=A Bug's Life (F)
 Internal Name=A Bug's Life
 depthmode=0
+zmode_compare_less=1
 
 [DFF227D9-0D4D8169-C:44]
 Good Name=A Bug's Life (G)
 Internal Name=A Bug's Life
 depthmode=0
+zmode_compare_less=1
 
 [F63B89CE-4582D57D-C:49]
 Good Name=A Bug's Life (I)
 Internal Name=A Bug's Life
 depthmode=0
+zmode_compare_less=1
 
 [82DC04FD-CF2D82F4-C:45]
 Good Name=A Bug's Life (U)
 Internal Name=A Bug's Life
 depthmode=0
+zmode_compare_less=1
 
 [62F6BE95-F102D6D6-C:50]
 Good Name=AeroFighters Assault (E) (M3)
@@ -488,6 +495,7 @@ depthmode=1
 Good Name=Bokujou Monogatari 2 (J) (V1.0)
 Internal Name=Ϟؼޮԓɶ߀ز
 depthmode=0
+fb_smart=0
 fog=0
 zmode_compare_less=1
 
@@ -495,6 +503,7 @@ zmode_compare_less=1
 Good Name=Bokujou Monogatari 2 (J) (V1.1)  //Harvest Moon 64 JAP
 Internal Name=Ϟؼޮԓɶ߀ز
 depthmode=0
+fb_smart=0
 fog=0
 zmode_compare_less=1
 
@@ -502,6 +511,7 @@ zmode_compare_less=1
 Good Name=Bokujou Monogatari 2 (J) (V1.2)  //Harvest Moon 64 JAP
 Internal Name=Ϟؼޮԓɶ߀ز
 depthmode=0
+fb_smart=0
 fog=0
 zmode_compare_less=1
 
@@ -831,6 +841,7 @@ Internal Name=DONKEY KONG 64
 depth_bias=64
 depthmode=1
 fb_clear=1
+fb_render=1
 lodmode=1
 
 [053C89A7-A5064302-C:4A]
@@ -839,6 +850,7 @@ Internal Name=DONKEY KONG 64
 depth_bias=64
 depthmode=1
 fb_clear=1
+fb_render=1
 lodmode=1
 
 [EC58EABF-AD7C7169-C:45]
@@ -847,6 +859,7 @@ Internal Name=DONKEY KONG 64
 depth_bias=64
 depthmode=1
 fb_clear=1
+fb_render=1
 lodmode=1
 
 [0DD4ABAB-B5A2A91E-C:45]
@@ -854,6 +867,7 @@ Good Name=Donkey Kong 64 (U) (Kiosk Demo)
 Internal Name=D K DISPLAY
 depthmode=1
 fb_clear=1
+fb_render=1
 
 [2C739EAC-9EF77726-C:50]
 Good Name=Doom 64 (E)
@@ -976,26 +990,31 @@ filtering=2
 Good Name=Excitebike 64 (E)
 Internal Name=EXCITEBIKE64
 depthmode=0
+fb_render=1
 
 [861C3519-F6091CE5-C:4A]
 Good Name=Excitebike 64 (J)
 Internal Name=EXCITEBIKE64
 depthmode=0
+fb_render=1
 
 [07861842-A12EBC9F-C:45]
 Good Name=Excitebike 64 (U) (V1.0)
 Internal Name=EXCITEBIKE64
 depthmode=0
+fb_render=1
 
 [F9D411E3-7CB29BC0-C:45]
 Good Name=Excitebike 64 (U) (V1.1)
 Internal Name=EXCITEBIKE64
 depthmode=0
+fb_render=1
 
 [AF754F7B-1DD17381-C:45]
 Good Name=Excitebike 64 (U) (Kiosk Demo)
 Internal Name=EXCITEBIKE64
 depthmode=0
+fb_render=1
 
 [8E9D834E-1E8B29A9-C:50]
 Good Name=Extreme-G (E) (M5)
@@ -1314,6 +1333,7 @@ wrap_big_tex=1
 Good Name=Harvest Moon 64 (U)
 Internal Name=HARVESTMOON64
 depthmode=0
+fb_smart=0
 fog=0
 zmode_compare_less=1
 
@@ -1455,7 +1475,6 @@ swapmode=2
 [E436467A-82DE8F9B-C:45]
 Good Name=Indy Racing 2000 (U)
 Internal Name=INDY RACING 2000
-fb_render=0
 fb_smart=0
 
 [336364A0-06C8D5BF-C:58]
@@ -2325,6 +2344,7 @@ Internal Name=Perfect Dark
 decrease_fillrect_edge=1
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 optimize_texrect=0
 useless_is_useless=1
@@ -2335,6 +2355,7 @@ Internal Name=PERFECT DARK
 decrease_fillrect_edge=1
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 optimize_texrect=0
 useless_is_useless=1
@@ -2345,6 +2366,7 @@ Internal Name=Perfect Dark
 decrease_fillrect_edge=1
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 optimize_texrect=0
 useless_is_useless=1
@@ -2355,6 +2377,7 @@ Internal Name=Perfect Dark
 decrease_fillrect_edge=1
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 optimize_texrect=0
 useless_is_useless=1
@@ -2965,6 +2988,13 @@ Good Name=Shadow Man (U)
 Internal Name=Shadowman
 depthmode=0
 
+[B73AB6F6-296267DD-C:45]
+Good Name=Sin & Punishment (J) [T]
+Internal Name=Sin and Punishment
+depthmode=1
+fb_clear=1
+filtering=1
+
 [C2751D1A-F8C19BFF-C:50]
 Good Name=Snowboard Kids 2 (E)
 Internal Name=SNOWBOARD KIDS2
@@ -3252,6 +3282,7 @@ Internal Name=ZELDA MAJORA'S MASK
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3261,6 +3292,7 @@ Internal Name=ZELDA MAJORA'S MASK
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3270,6 +3302,7 @@ Internal Name=ZELDA MAJORA'S MASK
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3279,6 +3312,7 @@ Internal Name=ZELDA MAJORA'S MASK
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3288,6 +3322,7 @@ Internal Name=ZELDA MAJORA'S MASK
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3297,6 +3332,7 @@ Internal Name=ZELDA MAJORA'S MASK
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3306,6 +3342,7 @@ Internal Name=MAJORA'S MASK
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3315,6 +3352,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [B044B569-373C1985-C:50]
@@ -3323,6 +3361,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [B2055FBD-0BAB4E0C-C:50]
@@ -3331,6 +3370,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [F3DD35BA-4152E075-C:45]
@@ -3339,6 +3379,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [EC7011B7-7616D72B-C:45]
@@ -3347,6 +3388,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [D43DA81F-021E1E19-C:45]
@@ -3355,6 +3397,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [693BA2AE-B7F14E9F-C:45]
@@ -3363,6 +3406,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [1D4136F3-AF63EEA9-C:50]
@@ -3371,6 +3415,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [27A3831D-B505A533-C:45]
@@ -3379,6 +3424,7 @@ Internal Name=ZELDA MASTER QUEST
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [1D4136F3-AF63EEA9-C:45]
@@ -3387,6 +3433,7 @@ Internal Name=ZELDA MASTER QUEST
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [917D18F6-69BC5453-C:45]
@@ -3395,6 +3442,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [F034001A-AE47ED06-C:45]
@@ -3403,6 +3451,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [E61CFF0A-CE1C0D71-C:50]
@@ -3613,6 +3662,30 @@ depthmode=1
 filtering=1
 swapmode=2
 
+[CCEB3858-26952D97-C:50]
+Good Name=Toy Story 2 (E)
+zmode_compare_less=1
+
+[CB93DB97-7F5C63D5-C:46]
+Good Name=Toy Story 2 (F)
+zmode_compare_less=1
+
+[782A9075-E552631D-C:44]
+Good Name=Toy Story 2 (G)
+zmode_compare_less=1
+
+[BC4F2AB8-AA99E32E-C:44]
+Good Name=Toy Story 2 (G) (V1.1)
+zmode_compare_less=1
+
+[A150743E-CF2522CD-C:45]
+Good Name=Toy Story 2 (U)
+zmode_compare_less=1
+
+[C151AD61-280FFF22-C:45]
+Good Name=Toy Story 2 (U) (V1.1)
+zmode_compare_less=1
+
 [FE4B6B43-081D29A7-C:45]
 Good Name=Triple Play 2000 (U)
 Internal Name=TRIPLE PLAY 2000
@@ -3631,6 +3704,7 @@ Good Name=Twisted Edge Extreme Snowboarding (E)
 Internal Name=TWISTED EDGE
 depthmode=1
 fb_clear=1
+fb_render=1
 
 [BBC99D32-117DAA80-C:45]
 Good Name=Twisted Edge Extreme Snowboarding (U)
@@ -3832,6 +3906,7 @@ Internal Name=THE MASK OF MUJURA
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3841,6 +3916,7 @@ Internal Name=THE MASK OF MUJURA
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3850,6 +3926,7 @@ Internal Name=ZELDA MAJORA'S MASK
 depthmode=1
 fb_clear=1
 fb_crc_mode=0
+fb_render=1
 filtering=1
 wrap_big_tex=1
 
@@ -3859,6 +3936,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [D43DA81F-021E1E19-C:4A]
@@ -3867,6 +3945,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [693BA2AE-B7F14E9F-C:4A]
@@ -3875,6 +3954,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [F7F52DB8-2195E636-C:4A]
@@ -3883,6 +3963,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [F611F4BA-C584135C-C:4A]
@@ -3891,6 +3972,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 [F43B45BA-2F0E9B6F-C:4A]
@@ -3899,6 +3981,7 @@ Internal Name=THE LEGEND OF ZELDA
 depth_bias=60
 depthmode=1
 fb_clear=1
+fb_render=1
 filtering=1
 
 //================  PD  ================
diff --git a/Config/Project64.cfg.development b/Config/Project64.cfg.development
index 93d84e3d9..df5b3e084 100644
--- a/Config/Project64.cfg.development
+++ b/Config/Project64.cfg.development
@@ -4,9 +4,9 @@ Auto Sleep=0
 Basic Mode=0
 Cheats=..\..\Config\Project64.cht
 ExtInfo=..\..\Config\Project64.rdx
+Glide64RDB=..\..\Config\Glide64.rdb
 Notes=..\..\Config\Project64.rdn
 RomDatabase=..\..\Config\Project64.rdb
-Glide64RDB=..\..\Config\Glide64.rdb
 RomListCache=..\..\Config\Project64.cache3
 ShortCuts=..\..\Config\Project64.sc3
 
@@ -18,6 +18,7 @@ Instant Save=..\..\Save\
 Instant Save - Use Selected=1
 Lang=..\..\Lang
 Plugin=..\..\Plugin\
+Plugin64=..\..\Plugin64\
 Plugin - Use Selected=1
 Save=..\..\Save\
 Save - Use Selected=1
diff --git a/Config/Project64.cht b/Config/Project64.cht
index 858d49024..da5e4036e 100644
--- a/Config/Project64.cht
+++ b/Config/Project64.cht
@@ -11,8 +11,8 @@ Homepage=www.pj64-emu.com
 
 //--------------- (J) Region Cheat Codes ---------------
 
-[80F41131-384645F6-C:4A]
-Name=AeroGauge (J) (V1.1)
+[B00903C9-3916C146-C:4A]
+Name=AeroGauge (J) (V1.0) (Kiosk Demo)
 Cheat0="No Damage\Player 1",50000402 0000,1113D058 0000
 Cheat1="No Damage\Player 2",50000402 0000,1113F0E8 0000
 Cheat2="Unlock All Tracks and Vehicles",E85E2854 5959
@@ -34,8 +34,8 @@ Cheat7_N=For this cheat to work,as soon as you put the cheat on you must turn it
 
 //----
 
-[B00903C9-3916C146-C:4A]
-Name=AeroGauge - Kiosk (J) (V1.0)
+[80F41131-384645F6-C:4A]
+Name=AeroGauge (J) (V1.1)
 Cheat0="No Damage\Player 1",50000402 0000,1113CF08 0000
 Cheat1="No Damage\Player 2",50000402 0000,1113EF98 0000
 Cheat2="Unlock All Tracks and Vehicles",E85E2704 5959
@@ -55,6 +55,87 @@ Cheat10_O=$4F Music On,$5A Music Off
 Cheat4_N=All of the Freeze All Lap Timers must be on. These codes will Stop the others from racing against you in Grand Prix mode. To win a race in Grand Prix you must finish at least one lap in the qualify round, then complete all laps in race for first.
 Cheat7_N=For this cheat to work,as soon as you put the cheat on you must turn it back off,if not you wont beable to quit a Race or even finish one.
 
+//---
+
+[6C45B60C-DCE50E30-C:4A]
+Name=Air Boarder 64 (J)
+Cheat0="Infinite Turbo\Player 1",E86CB76F 5961
+Cheat1="Infinite Turbo\Player2",E86CD0E7 5961
+Cheat2="Infinite Time\Street Work & Coin",E8658A3F 5982
+Cheat3="Infinite Time\Attack Time Time 000000",E9658A3E 595A
+Cheat4="Infinite Time\Time Attack",E8658A3D 595A
+Cheat5="Access All Boards & Characters",E8595717 595E
+Cheat6="Maxed Out Turbo Bar",E96CA940 9BEF,E86CB769 59A9
+Cheat7="Class Score Select",E86CB7F2 59??
+Cheat7_O=$7A Class C,$9A Class B,$B6 Class A,$4F Class S
+Cheat8="Coin Perfect Select",E86CB705 59??
+Cheat8_O=$66 Green Park Level 1,$74 Green park Level 2,$83 Green park Level 3,$A4 Lost Forest Level 1,$B1 Lost Forest Level 2,$DA Lost Forest Level 3,$CD Snow Festival 64 Levels 1 2 & 3,$BF Sunset Island  Level 1,$C6 Sunset Island  Level 2,$D9 Sunset Island  Level 3,$C0 Giant House Level 1,$C7 Giant House Level 2,$CC Giant House Level 3
+Cheat9="Options\Music Modifier",E85957FF 59??
+Cheat9_O=$4F BGM On,$5A BGM Off
+Cheat10="Options\Sound Effects Modifier",E95957FE 59??
+Cheat10_O=$4F SE On,$5A SE Off
+Cheat11="Options\Camera Type Modifier",E95957FA 59??
+Cheat11_O=$5A Roll On Near,$59 Roll On Mid,$5C Roll On Far,$5B Roll Off Near,$56 Roll Off Mid,$55 Roll Off Far
+Cheat12="Options\DJ Function Modifier",E9595704 59??
+Cheat12_O=$59 DJ Function On,$5A DJ Function Off
+Cheat13="All Street Work Levels Unlocked",50007801 0000,10050170 00??
+Cheat13_O=$59 Courses unlocked,$5B Courses unlocked with C rank,$56 Courses unlocked with B rank,$55 Courses unlocked with A rank,$58 Courses unlocked with S rank
+Cheat8_N=this is for Coin Mode to get Perfect Coin Collection Score straight away when you enter the level
+
+//---
+
+[26809B20-39A516A4-C:4A]
+Name=Air Boarder 64 (J)
+Cheat0="Infinite Turbo\Player 1",E86CB76F 5961
+Cheat1="Infinite Turbo\Player2",E86CD0E7 5961
+Cheat2="Infinite Time\Street Work & Coin",E8658A3F 5982
+Cheat3="Infinite Time\Attack Time Time 000000",E9658A3E 595A
+Cheat4="Infinite Time\Time Attack",E8658A3D 595A
+Cheat5="Access All Boards & Characters",E8595717 595E
+Cheat6="Maxed Out Turbo Bar",E96CA940 9BEF,E86CB769 59A9
+Cheat7="Class Score Select",E86CB7F2 59??
+Cheat7_O=$7A Class C,$9A Class B,$B6 Class A,$4F Class S
+Cheat8="Coin Perfect Select",E86CB705 59??
+Cheat8_O=$66 Green Park Level 1,$74 Green park Level 2,$83 Green park Level 3,$A4 Lost Forest Level 1,$B1 Lost Forest Level 2,$DA Lost Forest Level 3,$CD Snow Festival 64 Levels 1 2 & 3,$BF Sunset Island  Level 1,$C6 Sunset Island  Level 2,$D9 Sunset Island  Level 3,$C0 Giant House Level 1,$C7 Giant House Level 2,$CC Giant House Level 3
+Cheat9="Options\Music Modifier",E85957FF 59??
+Cheat9_O=$4F BGM On,$5A BGM Off
+Cheat10="Options\Sound Effects Modifier",E95957FE 59??
+Cheat10_O=$4F SE On,$5A SE Off
+Cheat11="Options\Camera Type Modifier",E95957FA 59??
+Cheat11_O=$5A Roll On Near,$59 Roll On Mid,$5C Roll On Far,$5B Roll Off Near,$56 Roll Off Mid,$55 Roll Off Far
+Cheat12="Options\DJ Function Modifier",E9595704 59??
+Cheat12_O=$59 DJ Function On,$5A DJ Function Off
+Cheat13="All Street Work Levels Unlocked",50007801 0000,10050170 00??
+Cheat13_O=$59 Courses unlocked,$5B Courses unlocked with C rank,$56 Courses unlocked with B rank,$55 Courses unlocked with A rank,$58 Courses unlocked with S rank
+Cheat8_N=this is for Coin Mode to get Perfect Coin Collection Score straight away when you enter the level
+
+//---
+
+[F255D6F1-B65D6728-C:4A]
+Name=Air Boarder 64 (J)
+Cheat0="Infinite Turbo\Player 1",E86CB76F 5961
+Cheat1="Infinite Turbo\Player2",E86CD0E7 5961
+Cheat2="Infinite Time\Street Work & Coin",E8658A3F 5982
+Cheat3="Infinite Time\Attack Time Time 000000",E9658A3E 595A
+Cheat4="Infinite Time\Time Attack",E8658A3D 595A
+Cheat5="Access All Boards & Characters",E8595717 595E
+Cheat6="Maxed Out Turbo Bar",E96CA940 9BEF,E86CB769 59A9
+Cheat7="Class Score Select",E86CB7F2 59??
+Cheat7_O=$7A Class C,$9A Class B,$B6 Class A,$4F Class S
+Cheat8="Coin Perfect Select",E86CB705 59??
+Cheat8_O=$66 Green Park Level 1,$74 Green park Level 2,$83 Green park Level 3,$A4 Lost Forest Level 1,$B1 Lost Forest Level 2,$DA Lost Forest Level 3,$CD Snow Festival 64 Levels 1 2 & 3,$BF Sunset Island  Level 1,$C6 Sunset Island  Level 2,$D9 Sunset Island  Level 3,$C0 Giant House Level 1,$C7 Giant House Level 2,$CC Giant House Level 3
+Cheat9="Options\Music Modifier",E85957FF 59??
+Cheat9_O=$4F BGM On,$5A BGM Off
+Cheat10="Options\Sound Effects Modifier",E95957FE 59??
+Cheat10_O=$4F SE On,$5A SE Off
+Cheat11="Options\Camera Type Modifier",E95957FA 59??
+Cheat11_O=$5A Roll On Near,$59 Roll On Mid,$5C Roll On Far,$5B Roll Off Near,$56 Roll Off Mid,$55 Roll Off Far
+Cheat12="Options\DJ Function Modifier",E9595704 59??
+Cheat12_O=$59 DJ Function On,$5A DJ Function Off
+Cheat13="All Street Work Levels Unlocked",50007801 0000,10050170 00??
+Cheat13_O=$59 Courses unlocked,$5B Courses unlocked with C rank,$56 Courses unlocked with B rank,$55 Courses unlocked with A rank,$58 Courses unlocked with S rank
+Cheat8_N=this is for Coin Mode to get Perfect Coin Collection Score straight away when you enter the level
+
 //----
 
 [B6951A94-63C849AF-C:4A]
@@ -85,7 +166,7 @@ Cheat15_N=This Switch From Cheat lets you switch characters on a saved game For
 //----
 
 [A5533106-B9F25E5B-C:4A]
-Name=Akumajou Dracula Mokushiroku Gaiden-Legend of Cornell (J)
+Name=Akumajou Dracula Mokushiroku Gaiden - Legend of Cornell (J)
 Cheat0="Infinite\Keys\Clocktower A",E8721C71 5964
 Cheat1="Infinite\Keys\Clocktower B",E8721C78 5964
 Cheat2="Infinite\Keys\Storeroom",E8721C68 5964
@@ -159,33 +240,6 @@ Cheat54_O=$55 Henry,$58 Reinhardt,$57 Carrie
 Cheat55_O=$5A Never Get Poisoned or Vamped,$59 Normal,$56 Vamp,$62 Poison,$5E Vamped & Poisoned,$4F Instant Death
 Cheat57_O=$5A 7 Days,$59 6 Days,$5C 5 Days,$5B 4 Days,$56 3 Days,$55 2 Days,$58 1 Day,$57 0 Days
 
-//---
-
-[6C45B60C-DCE50E30-C:4A]
-Name=Airboarder 64 (J)
-Cheat0="Infinite Turbo\Player 1",E86CB76F 5961
-Cheat1="Infinite Turbo\Player2",E86CD0E7 5961
-Cheat2="Infinite Time\Street Work & Coin",E8658A3F 5982
-Cheat3="Infinite Time\Attack Time Time 000000",E9658A3E 595A
-Cheat4="Infinite Time\Time Attack",E8658A3D 595A
-Cheat5="Access All Boards & Characters",E8595717 595E
-Cheat6="Maxed Out Turbo Bar",E96CA940 9BEF,E86CB769 59A9
-Cheat7="Class Score Select",E86CB7F2 59??
-Cheat7_O=$7A Class C,$9A Class B,$B6 Class A,$4F Class S
-Cheat8="Coin Perfect Select",E86CB705 59??
-Cheat8_O=$66 Green Park Level 1,$74 Green park Level 2,$83 Green park Level 3,$A4 Lost Forest Level 1,$B1 Lost Forest Level 2,$DA Lost Forest Level 3,$CD Snow Festival 64 Levels 1 2 & 3,$BF Sunset Island  Level 1,$C6 Sunset Island  Level 2,$D9 Sunset Island  Level 3,$C0 Giant House Level 1,$C7 Giant House Level 2,$CC Giant House Level 3
-Cheat9="Options\Music Modifier",E85957FF 59??
-Cheat9_O=$4F BGM On,$5A BGM Off
-Cheat10="Options\Sound Effects Modifier",E95957FE 59??
-Cheat10_O=$4F SE On,$5A SE Off
-Cheat11="Options\Camera Type Modifier",E95957FA 59??
-Cheat11_O=$5A Roll On Near,$59 Roll On Mid,$5C Roll On Far,$5B Roll Off Near,$56 Roll Off Mid,$55 Roll Off Far
-Cheat12="Options\DJ Function Modifier",E9595704 59??
-Cheat12_O=$59 DJ Function On,$5A DJ Function Off
-Cheat13="All Street Work Levels Unlocked",50007801 0000,10050170 00??
-Cheat13_O=$59 Courses unlocked,$5B Courses unlocked with C rank,$56 Courses unlocked with B rank,$55 Courses unlocked with A rank,$58 Courses unlocked with S rank
-Cheat8_N=this is for Coin Mode to get Perfect Coin Collection Score straight away when you enter the level
-
 //----
 
 [E340A49C-74318D41-C:4A]
@@ -219,7 +273,7 @@ Cheat7_N=This cheat Makes you Flash But you cant be harmed,Once out of danger Tu
 //----
 
 [5168D520-CA5FCD0D-C:4A]
-Name=Banjo to Kazooie no Dai Bouken (J)
+Name=Banjo to Kazooie no Daibouken (J)
 Cheat0="Infinite\Eggs",E88EBDF9 594F
 Cheat1="Infinite\Lives",E88EBD1D 594F
 Cheat2="Infinite\Jiggies",E88EBE5D 594F
@@ -236,7 +290,7 @@ Cheat3_N=Just collect one Note to Have 255 Notes in all Worlds.
 //----
 
 [514B6900-B4B19881-C:4A]
-Name=Banjo to Kazooie no Dai Bouken 2 (J)
+Name=Banjo to Kazooie no Daibouken 2 (J)
 Cheat0="Infinite\Energy\Banjo and Kazooie",E865A67F 59BB,E965AD5C 6364
 Cheat1="Infinite\Air",E868A576 9B22
 Cheat2="Infinite\Energy\Snowball",E865A67F 59BB,E865B059 5955
@@ -307,19 +361,6 @@ Cheat26_N=Bottles Revenge is a Beta mode from Banjo Tooie that the RWP team rece
 
 //----
 
-[91691C3D-F4AC5B4D-C:4A]
-Name=Transformers - Beast Wars Metals 64 (J)
-Cheat0="Infinite\Health\Player 1",E968FCCA 785F
-Cheat1="Infinite\Stun Meter\Player 1",E868FCCF 594F
-Cheat2="Infinite\Health\Player 2",E96AFD4A 785F
-Cheat3="Infinite\Stun Meter\Player 2",E86AFD4F 594F
-Cheat4="Play As\Player 1",E86F0DAC 59??
-Cheat4_O=$5A Optimus Primal,$59 Rattrap,$5C Cheetor,$5B Airazor,$56 Megatron,$55 Tarantulas,$58 Waspinator,$57 Terrorsaur
-Cheat5="Play As\Player 2",E86F0DAB 59??
-Cheat5_O=$5A Optimus Primal,$59 Rattrap,$5C Cheetor,$5B Airazor,$56 Megatron,$55 Tarantulas,$58 Waspinator,$57 Terrorsaur
-
-//----
-
 [65234451-EBD3346F-C:4A]
 Name=Blast Dozer (J)
 Cheat0="Infinite\Hydraulics Sidesweeper",E8943337 59BB
@@ -341,7 +382,7 @@ Cheat14="Drive Through Anything\Van",E993E600 5A59
 //----
 
 [DF6FF0F4-29D14238-C:4A]
-Name=Bomberman 64 - Arcade Edition (J)
+Name=Bomberman 64 (J)
 Cheat0="Have\Max Fire",E87AF6F2 594F
 Cheat1="Have\Max Bombs",E87AF6F1 594F
 Cheat2="Bomb Select",E87AF6F7 59??
@@ -365,7 +406,7 @@ Cheat10="Infinite\Timer",E86334C6 5984
 //----
 
 [67FF12CC-76BF0212-C:4A]
-Name=Bomberman Hero (J)
+Name=Bomberman Hero - Mirian Oujo wo Sukue! (J)
 Cheat0="Full\Bomb Power",E86CA58F 595B
 Cheat1="Full\Fire Power",E86CA58E 595B
 Cheat2="Infinite\Health",E86CA592 5956
@@ -431,7 +472,22 @@ Cheat0_N=This is Turbo fast,So to slow it down a little more keep the B button p
 
 //----
 
+[A7941528-61F1199D-C:4A]
+Name=Chou Snowbow Kids (J)
+Cheat0="All Gold Medals",50000502 0000,11259130 0101
+Cheat1="Max Coins",E979FC12 785F,E879FC11 5922
+Cheat2="Infinite\Trick Game 300 Points",E979FA46 5A7E
+Cheat3="Infinite\Tools Options",E879F97C 59??
+Cheat3_O=$59 Frying Pan,$5C Ghost,$5B Super Ghost,$56 Fan,$55 Rocket,$58 Invisible,$57 Rock,$62 Rat Face,$61 Super Rat Face,$64 Wings
+Cheat4="Infinite\Weapons Options",E879F976 59??,E879F975 5961
+Cheat4_O=$59 Slap Stick,$5C Parachute,$5B Freeze Shot,$56 Snowman,$55 Bomb,$58 Whirlwind
+Cheat5="Open Extra Characters & Snowboards",E979E8C2 5A59,E879E8C8 5959,E879E8B4 5959,E979E8B2 5A59,E979E8B8 5A59
+Cheat5_N=Battle Mode Only
+
+//----
+
 [079501B9-AB0232AB-C:4A]
+Name=Custom Robo V2 (J)
 Cheat0="All Stuff Available For Player 1",50003802 0000,110F4230 FFFF
 Cheat0_N=This modifies your save file. That will make all the multiplayer stages available, as well as unlocking every part. The actual breakdown is:
 Cheat1="All Equipment Unlocked",50001402 0000,110F40B0 FFFF
@@ -444,7 +500,7 @@ Cheat6="Side Invincible\Player 2",E973178C 95D4
 //----
 
 [7188F445-84410A68-C:4A]
-Name=Dance Dance Revolution - Disney Dancing Museum
+Name=Dance Dance Revolution - Disney Dancing Museum (J)
 Cheat0="Maximum Song Score\Player 1",E95EF5B8 94F4,E95EF5B6 224F
 Cheat1="Maximum Song Score\Player 2",E95EF5BC 94F4,E95EF5BA 224F
 Cheat2="Maximum Total Score\Player 1",E95EAB38 94F4,E95EAB36 224F
@@ -513,7 +569,7 @@ Cheat21="Enable Cheat Menu",E8590795 5959
 //----
 
 [BFF7B1C2-AEBF148E-C:4A]
-Name=Doraemon - Mittsu no Seireiseki (J)
+Name=Doraemon - Nobita to 3tsu no Seireiseki (J)
 Cheat0="Infinite\Lives",E8638F1B 5964
 Cheat1="Infinite\Energy",E8630FE9 594F
 Cheat2="Infinite\Bells",E8638F15 59??
@@ -522,7 +578,7 @@ Cheat2_O=$BB 99 Bells,$5A No Bells
 //---
 
 [BD8E206D-98C35E1C-C:4A]
-Name=Dobutsu no Mori (J)
+Name=Doubutsu no Mori (J)
 Cheat0="Hours",E867C212 59??
 Cheat0_O=$5A 00 AM,$59 01 AM,$5C 02 AM,$5B 03 AM,$56 04 AM,$55 05 AM,$58 06 AM,$57 07 AM,$62 08 AM,$61 09 AM,$64 10 AM,$63 11 AM,$5E 00 PM,$5D 01 PM,$60 02 PM,$5F 03 PM,$6A 04 PM,$69 05 PM,$6C 06 PM,$6B 07 PM,$66 08 PM,$65 09 PM,$68 10 PM,$67 11 PM
 Cheat1="Minutes",E867C213 59??
@@ -573,22 +629,6 @@ Cheat7_N=This Fixes the Problem on all Plugins that have Hud covering the Screen
 
 //----
 
-[147E0EDB-36C5B12C-C:4A]
-Name=Neon Genesis Evangelion (J)
-Cheat0="(Press F9)\To Refill Health",891F0F18 42C8,891F0F1A 0000
-Cheat0_N=Don't Press F9 after the Enemy is killed, only during the fight!
-Cheat1="(Press F9)\To Kill Enemy",891F2454 0000,891F2456 0000,891F2458 0000,891F245A 0000
-Cheat1_N=Don't Press F9 after the Enemy is killed, only during the fight! and only use on Press F9 Cheat at a time
-Cheat2="(Press L)\ For One Hit Kill",D0149DD5 0020,E9737BB0 595A,D0149DD5 0020,E9737BAE 595A
-Cheat2_N=Don't Press L after the Enemy is killed, only during the fight!
-Cheat4="Secret Beta 2 Player Test Mode",D00D5115 0015,E861A86B 59A5
-Cheat4_N=Press Reset and enjoy! Secret 2 Player Test Mode? The Second Player doesn't move ;(
-Cheat3="(Press R)\For Level Warp",D00D5115 0015,E861A86B 59??
-Cheat3_O=$83 Level 01,$7F Level 02,$8B Level 03,$87 Level 04,$93 Level 05,$8D Level 06,$9A Level 07,$9B Level 08,$98 Level 09,$A1 Level 10,$9E Level 11,$9F Level 12,$A9 Level 12.5,$AB Level 13,$72 Credits 1,$71 Credits 2,$74 Credits 3
-Cheat3_N=Press Reset and enjoy!
-
-//----
-
 [4D3E622E-9B828B4E-C:4A]
 Name=F-Zero X (J)
 Cheat0="Always 1st Place",E8829E16 5959
@@ -622,15 +662,8 @@ Cheat14="Stop timer for Fastest to get Robot",E96025F4 90DA
 
 //----
 
-[28D5562D-E4D5AE50-C:4A]
-Name=Fire Electric Pen (J)
-Cheat0="Freeze Timer",E85BB71D 5959
-Cheat0_N=Only enable this cheat once the Timer Go moves to 80. Once the level has ended or you have died disable and enable on 80.
-
-//----
-
 [70B0260E-6716D04C-C:4A]
-Name=GAUNTLET LEGENDS
+Name=Gauntlet Legends (J)
 Cheat0="Infinite\Max Health",E962B3AC 595A,E962B3AA 785F,E962B3BC 595A,E962B3BA 785F
 Cheat1="Infinite\Money",E962B34A 504F
 Cheat2="Max Strength",E962B35C 595A,E962B35A 504F
@@ -662,8 +695,25 @@ Cheat6="Press L To Levitate",D005D8D1 0020,E97A1A68 9023
 
 //----
 
+[916AE6B8-8817AB22-C:4A]
+Name=Jikuu Senshi Turok (J)
+Cheat0="Infinite\Body Armor",E96854EA B47B,E8685429 5959
+Cheat1="Infinite\Air",E968E788 0339,E974DC3E 4A4F
+Cheat2="Have All\Level Keys",E8685435 5957,E8685439 5957,E868543D 5957,E8685441 5957,E8685445 5957,E8685449 5957,E868544D 5957
+Cheat3="Have All\Weapons",E86854F9 5959,E86854FD 5959,E8685401 5959,E8685405 5959,E8685409 5959,E868540D 5959,E8685411 5959,E8685415 5959,E8685419 5959,E868541D 5959,E8685421 5959,E8685425 5959
+Cheat4="Infinite\Ammo",E86854D1 594F,E86854E5 594F,E86854D5 594F,E86854B5 594F,E86854DD 594F,E86854B9 594F,E86854E1 594F,E86854BD 594F
+Cheat5="Diffuculty Modifier",E8657C81 59??
+Cheat5_O=$5A Easy,$59 Normal,$5C Hard
+Cheat6="Infinite\Health",E9826C4C 5A8E
+Cheat7="Have\Backpack",E86854ED 5959,E868542D 5959
+Cheat8="Infinite\Lives",E868525D 594F
+Cheat9="Have\Cheat Menu",E9685C48 504F,E9685C46 504F
+Cheat10="Have All\Gems",E8685259 594F
+
+//----
+
 [519EA4E1-EB7584E8-C:4A]
-Name=KING HILL 64
+Name=King Hill 64 - Extreme Snowboarding (J)
 Cheat0="Max\50000 Stunt Points",E95E20D0 1CAA
 Cheat2="Have\All Characters",E95E2010 584F
 Cheat3="Have\All Difficulties",E95E2008 585A
@@ -805,137 +855,24 @@ Cheat20_N=Only use one Max Token Track code of each Level at a time, if you enab
 
 //----
 
-[96747EB4-104BB243-C:4A]
-Name=Perfect Dark (J)
-Cheat0="Have All Weapons\Player 1",E876BEB8 5957,E8742EB8 5957,E8719EB8 5957
-Cheat1="Infinite\Ammo\Player 1",E876B541 594F,E8742541 594F,E8719541 594F,E876AE9D 594F,E8741E9D 594F,E8718E9D 594F
-Cheat2="Infinite\Health\Player 1",E976A624 90DA,E9741624 90DA,E9718624 90DA
-Cheat3="Infinite\Shield\Player 1",E976A638 90DA,E9748CF8 90DA,E972FCF8 90DA
-Cheat4="Have All\Weapons\Player 2",E876DA28 5957,E8744A28 5957,E871BA28 5957
-Cheat5="Infinite\Ammo\Player 2",E876D2B1 594F,E87442B1 594F,E871B2B1 594F,E876CA0D 594F,E8743A0D 594F,E871AA0D 594F
-Cheat6="Infinite\Health\Player 2",E976C794 90DA,E9743794 90DA,E971A794 90DA
-Cheat7="Infinite\Shield\Player 2",E9733568 90DA,E974A568 90DA,E9721568 90DA
-Cheat8="All levels Compleate",50003201 0000,100A2940 0001,50003201 0000,100A2972 0001,50003201 0000,100A29A4 0001
-Cheat0_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
-Cheat1_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
-Cheat2_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
-Cheat3_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
-Cheat4_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
-Cheat5_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
-Cheat6_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
-Cheat7_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
-Cheat8_N=This activate's solo missions, give all medals on solo missions, activate cheats, activate cinemas, and who knows what else. I just don't have the time to identify these codes. I know that some of this is creditted to Zap2. I don't have the time to cut those codes out.
-
-//----
-
-[09CC4801-E42EE491-C:4A]
-Name=Pilot Wings64 (J)
-
-//----
-
-[EC0F690D-32A7438C-C:4A]
-Name=Pocket Monsters Snap (J)
-Cheat0="[Enable All Levels]",E9626F36 5958
-Cheat0_N=This is needed to be able to Play all Levels of the Game
-
-//----
-
-[94807E6B-60CC62E4-C:4A]
-Name=Puyo Puyo Sun 64 (J)
-Cheat0="Maximum Score\Player 1",E96C8524 5645,E96C8522 394F
-Cheat1="Maximum Score\Player 2",E96C8528 5645,E96C8526 394F
-Cheat2="No Warning Icons\Player 1",E86CA1F5 595A
-Cheat3="No Warning Icons\Player 2",E86CA1F9 595A
-Cheat4="Instant 7th Step of Chain\Player 1",D0163A2B 0001,E86C8D7D 5957
-Cheat5="Instant 7th Step of Chain\Player 2",D0163E5B 0001,E86C91AD 5957
-Cheat6="Options Complete Demo Viewer",E86C855D 5957,E96C8564 504F,E96C8562 504F
-Cheat7="Mode Total Continues 0",E86C8501 595A,E86C8519 595A
-Cheat8="Endless Mode\Player Level 99 Player 1",E86C8539 59BB
-Cheat9="Endless Mode\Player Level 99 Player 2",E86C853D 59BB
-Cheat10="Nazo Puyo Mode\All Practice Stages Cleared 4",50000402 0000,111631E8 FFFF
-Cheat11="1P Mode\Stage Select",D0162FEB 0001,E86C823D 59??
-Cheat11_O=$5D Satan Arle game,$62 Satan Schezo game,$60 Car-kun Arle game,$61 Car-kun Schezo game
-
-//----
-
-[9F1ECAF0-EEC48A0E-C:4A]
-Name=Rakuga Kids (J)
-Cheat0="Infinite Energy\Player 1",E860168F 59??
-Cheat0_O=$5A None,$9A Max
-Cheat1="Infinite Energy\Player 2",E8601B7F 59??
-Cheat1_O=$5A None,$8F Max
-Cheat2="Super Attacks\Player 1",E8601693 59??
-Cheat2_O=$5A None,$5B 3
-Cheat3="Super Attacks\Player 2",E8601B83 59??
-Cheat3_O=$5A None,$5B 3
-Cheat4="Infinite Match Time",E8600B85 595A
-Cheat5="Unlock Extras",E8601D5B 594F,E8601D59 594F
-
-//----
-
-[B6BC0FB0-E3812198-C:4A]
-Name=Sin and Punishment - Tsumi To Batsu (J)
-Cheat0="All Levels\Unlock All\Levels - Options Menu",E85BB42A 504F,E85BB429 504F
-Cheat1="All Levels\Unlock All\Option Menu Items",E85BB430 504F,E85BB42F 504F
-Cheat2="All Levels\Infinite\Energy",E861ADED 594F
-Cheat3="All Levels\Infinite\Time",E861ADE9 59BB
-Cheat4="All Levels\Infinite\Max Credits",E85BB434 594F
-Cheat5="Level\0-0\Invincible",E8660E7D 5959
-Cheat6="Level\1-1\Invincible",E86CAA4D 5959
-Cheat7="Level\1-2\Invincible",E86F220D 5959
-Cheat8="Level\1-3\Invincible",E8657A5D 5959
-Cheat9="Level\2-1\Invincible",E86F250D 5959
-Cheat10="Level\2-2\Invincible",E86FE88D 5959
-Cheat11="Level\2-3\Invincible",E870D45D 5959
-Cheat12="Level\3-1\Invincible",E869E05D 5959
-Cheat13="Level\3-2\Invincible",E86FE6DD 5959
-Cheat14="Level\3-3\Invincible",E9666160 1CAA
-Cheat15="Level\0-0\Infinite Air Jumping",E8660E64 595A
-Cheat16="Level\1-1\Infinite Air Jumping",E86CAA34 595A
-Cheat17="Level\1-2\Infinite Air Jumping",E86F22F4 595A
-Cheat18="Level\1-3\Infinite Air Jumping",E8657944 595A
-Cheat19="Level\2-1\Infinite Air Jumping",E86F25F4 595A
-Cheat20="Level\2-2\Infinite Air Jumping",E86FE874 595A
-Cheat21="Level\2-3\Infinite Air Jumping",E870D344 595A
-Cheat22="Level\3-1\Infinite Air Jumping",E869DF44 595A
-Cheat23="Level\3-2\Infinite Air Jumping",E86FE6C4 595A
-Cheat24="Level\3-3\Infinite Air Jumping",E8666624 595A
-Cheat5_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
-Cheat6_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
-Cheat7_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
-Cheat8_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
-Cheat10_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
-Cheat11_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
-Cheat12_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
-Cheat13_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
-Cheat14_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
-Cheat15_N=Only use one Infinite Air Jumping level Code at a time and only use for that specific level Cheat
-Cheat16_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
-Cheat17_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
-Cheat18_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
-Cheat19_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
-Cheat20_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
-Cheat21_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
-Cheat22_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
-Cheat23_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
-Cheat24_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
-
-//----
-
-[66572080-28E348E1-C:4A]
-Name=Super Robot Spirits (J)
-Cheat1="Infinite Sp",E87669FD 59B4
-Cheat2="Infinite Time",E87C5E32 595A
-Cheat0="Infinite Hp",E87669F9 595A
-Cheat3="Player 2 Health Mod",E876BD49 59??
-Cheat3_O=$5A Infinite Health,$22 Instant Death
-Cheat4="Play As",E86FF4B4 59??
-Cheat4_O=$5A FINAL BOSS,$59 R1,$5C DAITARN 3,$5B DANCOUGAR,$56 SHINING GUNDAM,$55 DUNBINE,$58 WALKER GALLIER,$57 VOLTES V,$62 1st BOSS
+[147E0EDB-36C5B12C-C:4A]
+Name=Neon Genesis Evangelion (J)
+Cheat0="(Press F9)\To Refill Health",891F0F18 42C8,891F0F1A 0000
+Cheat0_N=Don't Press F9 after the Enemy is killed, only during the fight!
+Cheat1="(Press F9)\To Kill Enemy",891F2454 0000,891F2456 0000,891F2458 0000,891F245A 0000
+Cheat1_N=Don't Press F9 after the Enemy is killed, only during the fight! and only use on Press F9 Cheat at a time
+Cheat2="(Press L)\ For One Hit Kill",D0149DD5 0020,E9737BB0 595A,D0149DD5 0020,E9737BAE 595A
+Cheat2_N=Don't Press L after the Enemy is killed, only during the fight!
+Cheat4="Secret Beta 2 Player Test Mode",D00D5115 0015,E861A86B 59A5
+Cheat4_N=Press Reset and enjoy! Secret 2 Player Test Mode? The Second Player doesn't move ;(
+Cheat3="(Press R)\For Level Warp",D00D5115 0015,E861A86B 59??
+Cheat3_O=$83 Level 01,$7F Level 02,$8B Level 03,$87 Level 04,$93 Level 05,$8D Level 06,$9A Level 07,$9B Level 08,$98 Level 09,$A1 Level 10,$9E Level 11,$9F Level 12,$A9 Level 12.5,$AB Level 13,$72 Credits 1,$71 Credits 2,$74 Credits 3
+Cheat3_N=Press Reset and enjoy!
 
 //----
 
 [67D20729-F696774C-C:4A]
-Name=All Star! Dairantou Smash Brothers (J)
+Name=Nintendo All-Star! Dairantou Smash Brothers (J)
 Cheat0="Give Kirby A Wierd Blow-Up",E8791870 5964
 Cheat1="Story Mode\Skip Straight To Master Hand",E8607DF9 595D
 Cheat2="Story Mode\Infinite Time",E9607D42 9C23
@@ -1014,6 +951,88 @@ Cheat42_N=Only put this on after you have alreay Chose your Character on the Mai
 
 //----
 
+[96747EB4-104BB243-C:4A]
+Name=Perfect Dark (J)
+Cheat0="Have All Weapons\Player 1",E876BEB8 5957,E8742EB8 5957,E8719EB8 5957
+Cheat1="Infinite\Ammo\Player 1",E876B541 594F,E8742541 594F,E8719541 594F,E876AE9D 594F,E8741E9D 594F,E8718E9D 594F
+Cheat2="Infinite\Health\Player 1",E976A624 90DA,E9741624 90DA,E9718624 90DA
+Cheat3="Infinite\Shield\Player 1",E976A638 90DA,E9748CF8 90DA,E972FCF8 90DA
+Cheat4="Have All\Weapons\Player 2",E876DA28 5957,E8744A28 5957,E871BA28 5957
+Cheat5="Infinite\Ammo\Player 2",E876D2B1 594F,E87442B1 594F,E871B2B1 594F,E876CA0D 594F,E8743A0D 594F,E871AA0D 594F
+Cheat6="Infinite\Health\Player 2",E976C794 90DA,E9743794 90DA,E971A794 90DA
+Cheat7="Infinite\Shield\Player 2",E9733568 90DA,E974A568 90DA,E9721568 90DA
+Cheat8="All levels Complete",50003201 0000,100A2940 0001,50003201 0000,100A2972 0001,50003201 0000,100A29A4 0001
+Cheat0_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
+Cheat1_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
+Cheat2_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
+Cheat3_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
+Cheat4_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
+Cheat5_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
+Cheat6_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
+Cheat7_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
+Cheat8_N=This activate's solo missions, give all medals on solo missions, activate cheats, activate cinemas, and who knows what else. I just don't have the time to identify these codes. I know that some of this is creditted to Zap2. I don't have the time to cut those codes out.
+
+//----
+
+[EC0F690D-32A7438C-C:4A]
+Name=Pokemon Snap (J) (V1.0)
+Cheat0="[Enable All Levels]",E9626F36 5958
+Cheat0_N=This is needed to be able to Play all Levels of the Game
+
+//----
+
+[EC0F690D-32A7438C-C:4A]
+Name=Pokemon Snap (J) (V1.1)
+Cheat0="[Enable All Levels]",E9626F36 5958
+Cheat0_N=This is needed to be able to Play all Levels of the Game
+
+//----
+
+[94807E6B-60CC62E4-C:4A]
+Name=Puyo Puyo Sun 64 (J)
+Cheat0="Maximum Score\Player 1",E96C8524 5645,E96C8522 394F
+Cheat1="Maximum Score\Player 2",E96C8528 5645,E96C8526 394F
+Cheat2="No Warning Icons\Player 1",E86CA1F5 595A
+Cheat3="No Warning Icons\Player 2",E86CA1F9 595A
+Cheat4="Instant 7th Step of Chain\Player 1",D0163A2B 0001,E86C8D7D 5957
+Cheat5="Instant 7th Step of Chain\Player 2",D0163E5B 0001,E86C91AD 5957
+Cheat6="Options Complete Demo Viewer",E86C855D 5957,E96C8564 504F,E96C8562 504F
+Cheat7="Mode Total Continues 0",E86C8501 595A,E86C8519 595A
+Cheat8="Endless Mode\Player Level 99 Player 1",E86C8539 59BB
+Cheat9="Endless Mode\Player Level 99 Player 2",E86C853D 59BB
+Cheat10="Nazo Puyo Mode\All Practice Stages Cleared 4",50000402 0000,111631E8 FFFF
+Cheat11="1P Mode\Stage Select",D0162FEB 0001,E86C823D 59??
+Cheat11_O=$5D Satan Arle game,$62 Satan Schezo game,$60 Car-kun Arle game,$61 Car-kun Schezo game
+
+//----
+
+[9F1ECAF0-EEC48A0E-C:4A]
+Name=Rakuga Kids (J)
+Cheat0="Infinite Energy\Player 1",E860168F 59??
+Cheat0_O=$5A None,$9A Max
+Cheat1="Infinite Energy\Player 2",E8601B7F 59??
+Cheat1_O=$5A None,$8F Max
+Cheat2="Super Attacks\Player 1",E8601693 59??
+Cheat2_O=$5A None,$5B 3
+Cheat3="Super Attacks\Player 2",E8601B83 59??
+Cheat3_O=$5A None,$5B 3
+Cheat4="Infinite Match Time",E8600B85 595A
+Cheat5="Unlock Extras",E8601D5B 594F,E8601D59 594F
+
+//----
+
+[66572080-28E348E1-C:4A]
+Name=Super Robot Spirits (J)
+Cheat1="Infinite Sp",E87669FD 59B4
+Cheat2="Infinite Time",E87C5E32 595A
+Cheat0="Infinite Hp",E87669F9 595A
+Cheat3="Player 2 Health Mod",E876BD49 59??
+Cheat3_O=$5A Infinite Health,$22 Instant Death
+Cheat4="Play As",E86FF4B4 59??
+Cheat4_O=$5A FINAL BOSS,$59 R1,$5C DAITARN 3,$5B DANCOUGAR,$56 SHINING GUNDAM,$55 DUNBINE,$58 WALKER GALLIER,$57 VOLTES V,$62 1st BOSS
+
+//----
+
 [84FC04FF-B1253CE9-C:4A]
 Name=Snowbow Kids (J)
 Cheat0="Infinite\Tools Options",E8686C0B 59??
@@ -1029,20 +1048,6 @@ Cheat2_N=Press the A Button to stop Count,or it will continue to grow without st
 
 //----
 
-[A7941528-61F1199D-C:4A]
-Name=Chou Snowbow Kids (J)
-Cheat0="All Gold Medals",50000502 0000,11259130 0101
-Cheat1="Max Coins",E979FC12 785F,E879FC11 5922
-Cheat2="Infinite\Trick Game 300 Points",E979FA46 5A7E
-Cheat3="Infinite\Tools Options",E879F97C 59??
-Cheat3_O=$59 Frying Pan,$5C Ghost,$5B Super Ghost,$56 Fan,$55 Rocket,$58 Invisible,$57 Rock,$62 Rat Face,$61 Super Rat Face,$64 Wings
-Cheat4="Infinite\Weapons Options",E879F976 59??,E879F975 5961
-Cheat4_O=$59 Slap Stick,$5C Parachute,$5B Freeze Shot,$56 Snowman,$55 Bomb,$58 Whirlwind
-Cheat5="Open Extra Characters & Snowboards",E979E8C2 5A59,E879E8C8 5959,E879E8B4 5959,E979E8B2 5A59,E979E8B8 5A59
-Cheat5_N=Battle Mode Only
-
-//----
-
 [61F5B152-046122AB-C:4A]
 Name=Star Wars Episode I - Racer (J)
 Cheat0="No Damage",E860D799 5959
@@ -1083,7 +1088,7 @@ Cheat12="Have All\Maxed Out Coin Records For All Levels",E876CE7B 594F,E976CE7A
 //----
 
 [D6FBA4A8-6326AA2C-C:4A]
-Name=Super Mario 64 Shindou Edition (J)
+Name=Super Mario 64 - Shindou Edition (J)
 Cheat0="Funny Mario Options\Limbo Mario",E8853364 591A
 Cheat1="Funny Mario Options\Runs Backwards",E8853362 59DA
 Cheat2="Mario's Cap\Off Options",E8853019 59??
@@ -1145,20 +1150,72 @@ Cheat12_O=$5A Normal,$59 Reverse
 
 //----
 
-[916AE6B8-8817AB22-C:4A]
-Name=Tokisora Senshi Turok (J)
-Cheat0="Infinite\Body Armor",E96854EA B47B,E8685429 5959
-Cheat1="Infinite\Air",E968E788 0339,E974DC3E 4A4F
-Cheat2="Have All\Level Keys",E8685435 5957,E8685439 5957,E868543D 5957,E8685441 5957,E8685445 5957,E8685449 5957,E868544D 5957
-Cheat3="Have All\Weapons",E86854F9 5959,E86854FD 5959,E8685401 5959,E8685405 5959,E8685409 5959,E868540D 5959,E8685411 5959,E8685415 5959,E8685419 5959,E868541D 5959,E8685421 5959,E8685425 5959
-Cheat4="Infinite\Ammo",E86854D1 594F,E86854E5 594F,E86854D5 594F,E86854B5 594F,E86854DD 594F,E86854B9 594F,E86854E1 594F,E86854BD 594F
-Cheat5="Diffuculty Modifier",E8657C81 59??
-Cheat5_O=$5A Easy,$59 Normal,$5C Hard
-Cheat6="Infinite\Health",E9826C4C 5A8E
-Cheat7="Have\Backpack",E86854ED 5959,E868542D 5959
-Cheat8="Infinite\Lives",E868525D 594F
-Cheat9="Have\Cheat Menu",E9685C48 504F,E9685C46 504F
-Cheat10="Have All\Gems",E8685259 594F
+[91691C3D-F4AC5B4D-C:4A]
+Name=Transformers - Beast Wars Metals 64 (J)
+Cheat0="Infinite\Health\Player 1",E968FCCA 785F
+Cheat1="Infinite\Stun Meter\Player 1",E868FCCF 594F
+Cheat2="Infinite\Health\Player 2",E96AFD4A 785F
+Cheat3="Infinite\Stun Meter\Player 2",E86AFD4F 594F
+Cheat4="Play As\Player 1",E86F0DAC 59??
+Cheat4_O=$5A Optimus Primal,$59 Rattrap,$5C Cheetor,$5B Airazor,$56 Megatron,$55 Tarantulas,$58 Waspinator,$57 Terrorsaur
+Cheat5="Play As\Player 2",E86F0DAB 59??
+Cheat5_O=$5A Optimus Primal,$59 Rattrap,$5C Cheetor,$5B Airazor,$56 Megatron,$55 Tarantulas,$58 Waspinator,$57 Terrorsaur
+
+//----
+
+[B6BC0FB0-E3812198-C:4A]
+Name=Tsumi to Batsu - Hoshi no Keishousha (J)
+Cheat0="All Levels\Unlock All\Levels - Options Menu",E85BB42A 504F,E85BB429 504F
+Cheat1="All Levels\Unlock All\Option Menu Items",E85BB430 504F,E85BB42F 504F
+Cheat2="All Levels\Infinite\Energy",E861ADED 594F
+Cheat3="All Levels\Infinite\Time",E861ADE9 59BB
+Cheat4="All Levels\Infinite\Max Credits",E85BB434 594F
+Cheat5="Level\0-0\Invincible",E8660E7D 5959
+Cheat6="Level\1-1\Invincible",E86CAA4D 5959
+Cheat7="Level\1-2\Invincible",E86F220D 5959
+Cheat8="Level\1-3\Invincible",E8657A5D 5959
+Cheat9="Level\2-1\Invincible",E86F250D 5959
+Cheat10="Level\2-2\Invincible",E86FE88D 5959
+Cheat11="Level\2-3\Invincible",E870D45D 5959
+Cheat12="Level\3-1\Invincible",E869E05D 5959
+Cheat13="Level\3-2\Invincible",E86FE6DD 5959
+Cheat14="Level\3-3\Invincible",E9666160 1CAA
+Cheat15="Level\0-0\Infinite Air Jumping",E8660E64 595A
+Cheat16="Level\1-1\Infinite Air Jumping",E86CAA34 595A
+Cheat17="Level\1-2\Infinite Air Jumping",E86F22F4 595A
+Cheat18="Level\1-3\Infinite Air Jumping",E8657944 595A
+Cheat19="Level\2-1\Infinite Air Jumping",E86F25F4 595A
+Cheat20="Level\2-2\Infinite Air Jumping",E86FE874 595A
+Cheat21="Level\2-3\Infinite Air Jumping",E870D344 595A
+Cheat22="Level\3-1\Infinite Air Jumping",E869DF44 595A
+Cheat23="Level\3-2\Infinite Air Jumping",E86FE6C4 595A
+Cheat24="Level\3-3\Infinite Air Jumping",E8666624 595A
+Cheat5_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
+Cheat6_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
+Cheat7_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
+Cheat8_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
+Cheat10_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
+Cheat11_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
+Cheat12_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
+Cheat13_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
+Cheat14_N=Only use one Ivincible level Code at a time for that specific level and only use for that specific level Cheat
+Cheat15_N=Only use one Infinite Air Jumping level Code at a time and only use for that specific level Cheat
+Cheat16_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
+Cheat17_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
+Cheat18_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
+Cheat19_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
+Cheat20_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
+Cheat21_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
+Cheat22_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
+Cheat23_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
+Cheat24_N=Only use one Infinite Air Jumping level Code at a time for that specific level and only use for that specific level Cheat
+
+//----
+
+[28D5562D-E4D5AE50-C:4A]
+Name=Ucchan Nanchan no Hono no Challenger - Denryuu Ira Ira Bou (J)
+Cheat0="Freeze Timer",E85BB71D 5959
+Cheat0_N=Only enable this cheat once the Timer Go moves to 80. Once the level has ended or you have died disable and enable on 80.
 
 //----
 
@@ -1176,8 +1233,22 @@ Cheat8="Always First Place",E8715B61 595A
 
 //----
 
+[44995484-20A5FC5E-C:4A]
+Name=Wave Race 64 (J) (V1.1)
+Cheat0="Misses Don't Count",E8715C91 595A
+Cheat1="Infinite Time Stunt Mode",E8715922 594F
+Cheat2="Super Speed",E8715C89 5955,D0161DC1 0010,E8715C89 597A
+Cheat3="99 Points",E871E165 59BB
+Cheat4="Infinite Course Out Time",E8715945 594F
+Cheat5="Maximum Power\Player 1",E8715C89 5955
+Cheat6="Maximum Power\Player 2",E8715EAE 5955,E871644E 5955
+Cheat7="Only Play Glacier Coast",E864DB15 5957
+Cheat8="Always First Place",E8715B61 595A
+
+//----
+
 [535DF3E2-609789F1-C:4A]
-Name=Wave Race 64 Shindou Edition (J) (V1.2)
+Name=Wave Race 64 - Shindou Edition (J) (V1.2)
 Cheat0="Misses Don't Count",E87290F1 595A
 Cheat1="Infinite Time Stunt Mode",E8728E82 594F
 Cheat2="Super Speed",E87290E9 5955,D0155221 0010,E87290E9 597A
@@ -1248,7 +1319,7 @@ Cheat7_O=$595A Broom,$5A59 Shovel,$5B5C Red And White Hockey Stick,$5C5B Guitar,
 //----
 
 [EC417312-EB31DE5F-C:4A]
-Name=Zelda no Densetsu 2 - Mujura no Kamen (J) (v1.0)
+Name=Zelda no Densetsu - Mujura no Kamen (J) (V1.0)
 Cheat0="Have All\Quest Status Items",E8744C73 5955,E9744C72 481F
 Cheat1="Infinite\Rupees",E9744BEE 5C37
 Cheat2="Infinite\Max & Double Magic Meter",E8744BEF 59BA,E9744BF8 5A59
@@ -1307,7 +1378,7 @@ Cheat35_O=$5A9A Max Hearts,$59BB 6 Hearts,$599B 4 Hearts
 //----
 
 [69AE0438-2C63F3F3-C:4A]
-Name=Zelda no Densetsu 2 - Mujura no Kamen (J) (V1.1)
+Name=Zelda no Densetsu - Mujura no Kamen (J) (V1.1)
 Cheat0="Have All\Quest Status Items",E8744A23 5955,E9744A22 481F
 Cheat1="Infinite\Rupees",E9744A9E 5C37
 Cheat2="Infinite\Max & Double Magic Meter",E8744A9F 59BA,E9744AA8 5A59
@@ -1366,7 +1437,7 @@ Cheat35_O=$5A9A Max Hearts,$59BB 6 Hearts,$599B 4 Hearts
 //----
 
 [8473D0C1-23120666-C:4A]
-Name=Zelda no Densetsu 2 - Mujura no Kamen - Zelda Collection Version (J) (GC Version) [!]
+Name=Zelda no Densetsu - Mujura no Kamen - Zelda Collection Version (J) (GC)
 Cheat0="Infinite\Rupees",E9742FAE 5C37
 Cheat1="Infinite\Health",E9742FAA 5C37
 Cheat2="Infinite\Max & Double Magic Meter",E8742FAF 59BA,E9742FB8 5A59
@@ -1429,7 +1500,7 @@ Cheat34_O=$5A Fierce Deity Link,$59 Goron Link,$5C Zora Link,$5B Deku Link,$56 N
 //----
 
 [EC7011B7-7616D72B-C:4A]
-Name=Zelda no Densetsu - Toki no Ocarina (J) (v1.0)
+Name=Zelda no Densetsu - Toki no Ocarina (J) (V1.0)
 Cheat0="Infinite\Rupees",E96510F4 5959
 Cheat1="Press R\For Old Or Young Link",D01C84B5 0010,E865FC29 59??
 Cheat1_O=$59 Link Young,$5A Link Old
@@ -1546,7 +1617,7 @@ Cheat47_N=Use this cheat to levitate. You have to deactivate it to come back dow
 //----
 
 [D43DA81F-021E1E19-C:4A]
-Name=Zelda no Densetsu - Toki no Ocarina (J) (v1.1)
+Name=Zelda no Densetsu - Toki no Ocarina (J) (V1.1)
 Cheat0="Infinite\Rupees",E9650EB4 5959
 Cheat1="Press R\For Old Or Young Link",D01C8675 0010,E865FAE9 59??
 Cheat1_O=$59 Link Young,$5A Link Old
@@ -1663,7 +1734,7 @@ Cheat47_N=Use this cheat to levitate. You have to deactivate it to come back dow
 //----
 
 [693BA2AE-B7F14E9F-C:4A]
-Name=Zelda no Densetsu - Toki no Ocarina (J) (v1.2)
+Name=Zelda no Densetsu - Toki no Ocarina (J) (V1.2)
 Cheat0="Infinite\Rupees",E96517A4 5959
 Cheat1="Press R\For Old Or Young Link",D01C8D75 0010,E86503D9 59??
 Cheat1_O=$59 Link Young,$5A Link Old
@@ -1777,12 +1848,10 @@ Cheat45_N=This modifies the equipment you are carrying.If you Use Black Gauntlet
 Cheat46_N=This modifies the equipment you are carrying.
 Cheat47_N=Use this cheat to levitate. You have to deactivate it to come back down. Useful for passing obstacles that usually can be passed only at a later point!
 
-
 //--------------- (JU) Region Cheat Codes ---------------
 
-
 [1FBAF161-2C1C54F1-C:41]
-Name=1080 SNOWBOARDING
+Name=1080 Snowboarding (JU) (M2)
 Cheat0="Infinite Damage All Players & Levels",E893A393 595A
 Cheat1="Infinite Lives & Continues",E87C081D 595B
 Cheat2="Enable All Levels & Boarders",E879A7DF 594F,E879A7DD 5955,E979A7EA 4D4F,E879A7F0 5957
@@ -1818,9 +1887,34 @@ Cheat28="Have All\Trick Attacks Done",E979A7EA 4D4F
 
 //--------------- (U) Region Cheat Codes ---------------
 
+[033F4C13-319EE7A7-C:45]
+Name=007 - The World is Not Enough (U)
+Cheat0="Have All\Levels Unlocked",E966813A 5979
+Cheat0_N=For Single Player Mode Only
+Cheat1="Invincibility On All levels",E96582C0 5A59
+Cheat2="Skip Intro,",D03B0E5F 0004,E88F61B1 5961
+Cheat3="Level select",E88F61B1 5961
+Cheat4="Infinite\Ammo On All Levels",E95C9F34 755A
+Cheat5="Have All\Guns On All Levels",E959457C 616A,E959457A 595A,E9594580 759C,E959457E 5959,E9965758 8D5C,E9965756 5A5A,E996575C 759C,E996575A 59BB,E9965760 FFDC,E996575E 5BE2,E9965764 FFDC,E9965762 5BF2,E9965768 FFDC,E9965766 5BFA,E996576C FFDC,E996576A 5B02,E9965770 FFDC,E996576E 5B0A,E9965774 FFDC,E9965772 5B1A,E9965778 FFDC,E9965776 5B22,E996577C FFDC,E996577A 5B2A,E9965780 FFDC,E996577E 5B32,E9965784 FFDC,E9965782 5B42,E9965788 FFDC,E9965786 5B4A,E996578C FFDC,E996578A 5B52,E9965790 FFDC,E996578E 5C5A,E9965794 FFDC,E9965792 5C62,E9965798 FFDC,E9965796 5C6A,E996579C FFDC,E996579A 5C7A,E99657A0 FFDC,E996579E 5C8A,E99657A4 FFDC,E99657A2 5C92,E99657A8 FFDC,E99657A6 5CAA,E99657AC FFDC,E99657AA 5CB2,E99657B0 FFDC,E99657AE 5CBA,E99657B4 FFDC,E99657B2 5CCA,E99657B8 FFDC,E99657B6 5CD2,E99657BC FFDC,E99657BA 5CDA,E99657C0 FFDC,E99657BE 5CE2,E99657C4 FFDC,E99657C2 5C9A,E99657C8 FFDC,E99657C6 5CA2,E99657CC FFDC,E99657CA 5CAA,E99657D0 6159,E99657CE CDDE,E99657D4 F9C7,E99657D2 5A4E
+Cheat5_N=Once you pick up a Gun You will have all weapons
+Cheat6="Time Taken Clock At 0:00",E8668256 595A
+Cheat7="Infinite\Time",E98E418E 7212
+Cheat7_N=Underground Uprising
+Cheat8="Have All\Skins + Everyone is Evil",50005C0C 0000,100BF687 0081
+Cheat9="Have All\Gadgets",E86582C3 5959
+Cheat10="Go Solo In Multiplayer",D00E0778 0042,E8665509 5959
+Cheat11="Stop Bond From Going Downhill on Cold Reception",D10E0778 0020,E890DBBA 5959,D10E0778 0010,E890DBBA 595A
+Cheat11_N=Press L to Stop, & R to Go
+Cheat12="Fail Objectives To Complete Them",E9576C10 755C,E9576C0E 5969
+Cheat13="Infinite\Ammo On Clip,",E95CA004 755A
+Cheat14="Have Tons Of Nightvision",E95CA3D6 665A
+Cheat14_N=For Battery Only
+Cheat15="Play Crate Yard Level",E8668131 5962
+
+//----
 
 [82DC04FD-CF2D82F4-C:45]
-Name=A Bug's Life (J)
+Name=A Bug's Life (U)
 Cheat0="Infinite\Lives",E8746D90 5961
 Cheat1="Infinite\Health",E8746D83 5956
 Cheat2="Always Have\Super Jump",E9746D80 597A
@@ -1858,7 +1952,7 @@ Cheat7_O=$5A Chaff,$59 Jammings,$5C Air Mines,$5B Mahibishi,$64 22mm BB Shot,$63
 //----
 
 [AEBE463E-CC71464B-C:45]
-Name=AEROGAUGE
+Name=AeroGauge (U)
 Cheat0="No Damage\Player 1",50000402 0000,1113FFD8 0000
 Cheat1="No Damage\Player 2",50000402 0000,11142078 0000
 Cheat2="Unlock Hidden Tracks & Cars",E85E45F4 5959
@@ -1904,7 +1998,7 @@ Cheat4_N=This will give you 16777215 Total XP Remaning to start with and after y
 //----
 
 [C43E23A7-40B1681A-C:45]
-Name=All-Star Baseball 99 (U)
+Name=All-Star Baseball '99 (U)
 Cheat0="Infinite\Character Creation Points",E8648387 590A
 Cheat1="Infinite\Strikes",E860120F 595A
 Cheat2="Infinite\Balls",E8601209 595A
@@ -1967,6 +2061,26 @@ Cheat5_O=$5A Zoe Taylor,$59 Vanessa Child,$5C Amanda Coetzer,$5B Jana Novotna,$5
 
 //----
 
+[1FB5D932-3BA9481B-C:45]
+Name=Armorines - Project S.W.A.R.M. (U)
+Cheat0="Enable In-Game Cheat Menu & Level Select",E965B08A 5A9F
+Cheat1="Infinite Lewis Laser Rifle",E88474C1 5ACA
+Cheat2="Infinite Lewis Explosive Projectile Weapon",E88474BF 598A
+Cheat3="Infinite Jungle Chemical Gun",E88474CD 5ABA
+Cheat1_N=The infinite ammo will not work with these codes if you have the expansion pak inserted into your console.
+Cheat2_N=The infinite ammo will not work with these codes if you have the expansion pak inserted into your console.
+Cheat3_N=The infinite ammo will not work with these codes if you have the expansion pak inserted into your console.
+Cheat4="Level Select",E965B086 5962
+Cheat5="Infinite Ammo (All Guns)",E95AE928 755A
+Cheat6="Don't Take Any Damage",E95AF5B8 755A
+Cheat7="Invincible",E95AE3F8 755A
+Cheat8="Sound Modifier\Music Volume",E865B09C 59??
+Cheat8_O=$5A Off,$8E Low (5),$D2 Medium (1.0),$0E Defualt (1.5),$4A Max (2.0)
+Cheat9="Sound Modifier\SFX Volume",E865B09B 59??
+Cheat9_O=$5A Off,$8E Low (5),$D2 Medium (1.0),$0E Defualt (1.5),$4A Max (2.0)
+
+//----
+
 [4C52BBB2-CEAB0F6B-C:45]
 Name=Army Men - Air Combat (U)
 Cheat0="Co-Pilot Modifier",E85F7BB4 59??
@@ -2036,26 +2150,6 @@ Cheat8_O=$57 Big Green One,$62 Vikki,$61 Plastro,$63 Mystery Women,$5E Hail Mend
 
 //----
 
-[1FB5D932-3BA9481B-C:45]
-Name=Armorines - Project S.W.A.R.M. (U)
-Cheat0="Enable In-Game Cheat Menu & Level Select",E965B08A 5A9F
-Cheat1="Infinite Lewis Laser Rifle",E88474C1 5ACA
-Cheat2="Infinite Lewis Explosive Projectile Weapon",E88474BF 598A
-Cheat3="Infinite Jungle Chemical Gun",E88474CD 5ABA
-Cheat1_N=The infinite ammo will not work with these codes if you have the expansion pak inserted into your console.
-Cheat2_N=The infinite ammo will not work with these codes if you have the expansion pak inserted into your console.
-Cheat3_N=The infinite ammo will not work with these codes if you have the expansion pak inserted into your console.
-Cheat4="Level Select",E965B086 5962
-Cheat5="Infinite Ammo (All Guns)",E95AE928 755A
-Cheat6="Don't Take Any Damage",E95AF5B8 755A
-Cheat7="Invincible",E95AE3F8 755A
-Cheat8="Sound Modifier\Music Volume",E865B09C 59??
-Cheat8_O=$5A Off,$8E Low (5),$D2 Medium (1.0),$0E Defualt (1.5),$4A Max (2.0)
-Cheat9="Sound Modifier\SFX Volume",E865B09B 59??
-Cheat9_O=$5A Off,$8E Low (5),$D2 Medium (1.0),$0E Defualt (1.5),$4A Max (2.0)
-
-//----
-
 [D1F7D8AB-293B0446-C:45]
 Name=Asteroids Hyper 64 (U)
 Cheat0="Extra Lives",E85B5062 59BB
@@ -2219,17 +2313,6 @@ Cheat16_N=To use this cheat, put the cheat on, then press L as you walk through
 
 //----
 
-[8C138BE0-95700E46-C:45]
-Name=In-Fisherman Bass Hunter 64 (U)
-Cheat0="Catch Bigger Fish",E865725A 5959
-Cheat1="Line Never Breaks",E865725B 5959
-Cheat2="All Lakes Unlocked",E8657258 5959
-Cheat3="Extra Cash",E865725D 5959
-Cheat4="Easier to Catch Fish",E8657262 5959
-Cheat5="No Penalties in Tounament",E8657260 5959
-
-//----
-
 [BCFACCAA-B814D8EF-C:45]
 Name=Bassmasters 2000 (U)
 Cheat0="Player 1 Max Score (Casting Game)",E95BFB66 504F
@@ -2373,29 +2456,8 @@ Cheat17="Add\Satellite",E85CF815 5959
 
 //----
 
-[4D79D316-E8501B33-C:45]
-Name=Beast Wars Transmetal (U)
-Cheat0="Infinite\Health\Player 1",E968249A 785F
-Cheat1="Infinite\Stun Meter\Player 1",E868249F 594F
-Cheat2="Infinite\Health\Player 2",E96A251A 785F
-Cheat3="Infinite\Stun Meter\Player 2",E86A251F 594F
-Cheat4="Play As\Player 1",E86F35FC 59??
-Cheat4_O=$5A Optimus Primal,$59 Rattrap,$5C Cheetor,$5B Airazor,$56 Megatron,$55 Tarantulas,$58 Waspinator,$57 Terrorsaur
-Cheat5="Play As\Player 2",E86F35FB 59??
-Cheat5_O=$5A Optimus Primal,$59 Rattrap,$5C Cheetor,$5B Airazor,$56 Megatron,$55 Tarantulas,$58 Waspinator,$57 Terrorsaur
-Cheat6="Choose Stage\VS. Mode",E8642921 59??
-Cheat6_O=$5A Stage 1,$59 Stage 2,$5C Stage 3,$5B Stage 4,$56 Stage 5,$55 Stage 6,$58 Stage 7,$57 Stage 8 (Hidden Stage),$62 Stage 9 (Hidden Stage),$61 Stage A (Hidden Stage),
-Cheat7="Infinite\Time",E8667DEC 5964
-Cheat8="Bonus Menu Games\Infinite Time\Escape Race 100 & 200\Player 1",E96F260A 5964
-Cheat9="Bonus Menu Games\Infinite Time\Escape Race 100 & 200\Player 2",E96F260E 5964
-Cheat10="Bonus Menu Games\Max\Wins\Sunset & Sunrise Showdown\Player 1",E86F15B1 594F
-Cheat11="Bonus Menu Games\Max\Points\Disc Hunter\Player 1",E86F263F 594F
-Cheat12="Bonus Menu Games\Max\Points\Disc Hunter\Player 2",E86F263D 594F
-
-//----
-
 [EDF419A8-BF1904CC-C:45]
-Name=Beetle Adventure Racing! (U)
+Name=Beetle Adventure Racing! (U) (M3)
 Cheat0="Have\All Cars",E8582249 5963
 Cheat1="Have\All Tracks",E8582245 5958
 Cheat2="Low Timer",E958B42C 909A
@@ -2871,145 +2933,6 @@ Cheat15_N=Must to be used with the Infinite Weapon Codes & the open all 5 item s
 
 //----
 
-[F03C24CA-C5237BCC-C:45]
-Name=Clay Fighter 63 1-3 (U)
-Cheat0="Extra Characters/Secret Options",E8707E97 595F
-Cheat1="Stage Modifier",E8707E7D 59??
-Cheat2="Infinite Time To Choose Your Fighter",E9765E44 5CF7
-Cheat3="Player 1 Character Modifier",E8707E81 59??
-Cheat4="Refuse Room, Grotto Gulch, Santa's Worshop\Player 1\Cant be Stunned",E8736E5D 595A
-Cheat5="Refuse Room, Grotto Gulch, Santa's Worshop\Player 1\Infinite Energy",E8736E65 5904
-Cheat6="Refuse Room, Grotto Gulch, Santa's Worshop\Player 1\No Energy",E8736E65 595A
-Cheat7="Refuse Room, Grotto Gulch, Santa's Worshop\Player 1\Full Super Bar",E9736E6E 5B5A
-Cheat8="Refuse Room, Grotto Gulch, Santa's Worshop\Player 2\Cant be Stunned",E873A2FD 595A
-Cheat9="Refuse Room, Grotto Gulch, Santa's Worshop\Player 2\Infinite Energy",E873A205 5904
-Cheat10="Refuse Room, Grotto Gulch, Santa's Worshop\Player 2\No Energy",E873A205 595A
-Cheat11="Refuse Room, Grotto Gulch, Santa's Worshop\Player 2\Full Super Bar",E973A20E 5B5A
-Cheat12="Tribal Tower\Player 1\Cant be Stunned",E8736EFD 595A
-Cheat13="Tribal Tower\Player 1\Infinite Energy",E8736E05 5904
-Cheat14="Tribal Tower\Player 1\No Energy",E8736E05 595A
-Cheat15="Tribal Tower\Player 1\Full Super Bar",E9736E0E 5B5A
-Cheat16="Tribal Tower\Player 2\Cant be Stunned",E873A79D 595A
-Cheat17="Tribal Tower\Player 2\Infinite Energy",E873A7A5 5904
-Cheat18="Tribal Tower\Player 2\No Energy",E873A7A5 595A
-Cheat19="Tribal Tower\Player 2\Full Super Bar",E973A7AE 5B5A
-Cheat20="Aquadome\Player 1\Cant be Stunned",E873718D 595A
-Cheat21="Aquadome\Player 1\Infinite Energy",E8737185 5904
-Cheat22="Aquadome\Player 1\No Energy",E8737185 595A
-Cheat23="Aquadome\Player 1\Full Super Bar",E973718E 5B5A
-Cheat24="Aquadome\Player 2\Cant be Stunned",E873A51D 595A
-Cheat25="Aquadome\Player 2\Infinite Energy",E873A525 5904
-Cheat26="Aquadome\Player 2\No Energy",E873A525 595A
-Cheat27="Aquadome\Player 2\Full Super Bar",E973A52E 5B5A
-Cheat28="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 1\Cant be Stunned",E873768D 595A
-Cheat29="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 1\Infinite Energy",E8737695 5904
-Cheat30="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 1\No Energy",E8737695 595A
-Cheat31="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 1\Full Super Bar",E973769E 5B5A
-Cheat32="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 2\Cant be Stunned",E873AA2D 595A
-Cheat33="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 2\Infinite Energy",E873AA35 5904
-Cheat34="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 2\No Energy",E873AA35 595A
-Cheat35="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 2\Full Super Bar",E973AA3E 5B5A
-Cheat36="Freezing Fortress\Player 1\Cant be Stunned",E87376ED 595A
-Cheat37="Freezing Fortress\Player 1\Infinite Energy",E87376F5 5904
-Cheat38="Freezing Fortress\Player 1\No Energy",E87376F5 595A
-Cheat39="Freezing Fortress\Player 1\Full Super Bar",E97376FE 5B5A
-Cheat40="Freezing Fortress\Player 2\Cant be Stunned",E873AF8D 595A
-Cheat41="Freezing Fortress\Player 2\Infinite Energy",E873AF95 5904
-Cheat42="Freezing Fortress\Player 2\No Energy",E873AF95 595A
-Cheat43="Freezing Fortress\Player 2\Full Super Bar",E973AF9E 5B5A
-Cheat44="Rubbage Reef\Player 1\Cant be Stunned",E8737B6D 595A
-Cheat45="Rubbage Reef\Player 1\Infinite Energy",E8737B75 5904
-Cheat46="Rubbage Reef\Player 1\No Energy",E8737B75 595A
-Cheat47="Rubbage Reef\Player 1\Full Super Bar",E9737B7E 5B5A
-Cheat48="Rubbage Reef\Player 2\Cant be Stunned",E873AF0D 595A
-Cheat49="Rubbage Reef\Player 2\Infinite Energy",E873AF15 5904
-Cheat50="Rubbage Reef\Player 2\No Energy",E873AF15 595A
-Cheat51="Rubbage Reef\Player 2\Full Super Bar",E973AF1E 5B5A
-Cheat52="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 1\Cant be Stunned",E8737B9D 595A
-Cheat53="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 1\Infinite Energy",E8737BA5 5904
-Cheat54="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 1\No Energy",E8737BA5 595A
-Cheat55="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 1\Full Super Bar",E9737BAE 5B5A
-Cheat56="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 2\Cant be Stunned",E873AF3D 595A
-Cheat57="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 2\Infinite Energy",E873AF45 5904
-Cheat58="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 2\No Energy",E873AF45 595A
-Cheat59="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 2\Full Super Bar",E973AF4E 5B5A
-Cheat60="Clayribbean Cruise\Player 1\Cant be Stunned",E8737B4D 595A
-Cheat61="Clayribbean Cruise\Player 1\Infinite Energy",E8737C55 5904
-Cheat62="Clayribbean Cruise\Player 1\No Energy",E8737C55 595A
-Cheat63="Clayribbean Cruise\Player 1\Full Super Bar",E9737C5E 5B5A
-Cheat64="Clayribbean Cruise\Player 2\Cant be Stunned",E873B0ED 595A
-Cheat65="Clayribbean Cruise\Player 2\Infinite Energy",E873B0F5 5904
-Cheat66="Clayribbean Cruise\Player 2\No Energy",E873B0F5 595A
-Cheat67="Clayribbean Cruise\Player 2\Full Super Bar",E973B0FE 5B5A
-Cheat68="Backwash Bay\Player 1\Cant be Stunned",E8737CDD 595A
-Cheat69="Backwash Bay\Player 1\Infinite Energy",E8737CE5 5904
-Cheat70="Backwash Bay\Player 1\No Energy",E8737CE5 595A
-Cheat71="Backwash Bay\Player 1\Full Super Bar",E9737CEE 5B5A
-Cheat72="Backwash Bay\Player 2\Cant be Stunned",E873AD7D 595A
-Cheat73="Backwash Bay\Player 2\Infinite Energy",E873AD85 5904
-Cheat74="Backwash Bay\Player 2\No Energy",E873AD85 595A
-Cheat75="Backwash Bay\Player 2\Full Super Bar",E973AD8E 5B5A
-Cheat76="Ghastly Graveyard\Player 1\Cant be Stunned",E873797D 595A
-Cheat77="Ghastly Graveyard\Player 1\Infinite Energy",E8737985 5904
-Cheat78="Ghastly Graveyard\Player 1\No Energy",E8737985 595A
-Cheat79="Ghastly Graveyard\Player 1\Full Super Bar",E973798E 5B5A
-Cheat80="Ghastly Graveyard\Player 2\Cant be Stunned",E873AD1D 595A
-Cheat81="Ghastly Graveyard\Player 2\Infinite Energy",E873AD25 5904
-Cheat82="Ghastly Graveyard\Player 2\No Energy",E873AD25 595A
-Cheat83="Ghastly Graveyard\Player 2\Full Super Bar",E973AD2E 5B5A
-Cheat84="Candy Factory\Player 1\Cant be Stunned",E8737A5D 595A
-Cheat85="Candy Factory\Player 1\Infinite Energy",E8737A65 5904
-Cheat86="Candy Factory\Player 1\No Energy",E8737A65 595A
-Cheat87="Candy Factory\Player 1\Full Super Bar",E9737A6E 5B5A
-Cheat88="Candy Factory\Player 2\Cant be Stunned",E873AEFD 595A
-Cheat89="Candy Factory\Player 2\Infinite Energy",E873AE05 5904
-Cheat90="Candy Factory\Player 2\No Energy",E873AE05 595A
-Cheat91="Candy Factory\Player 2\Full Super Bar",E973AE0E 5B5A
-Cheat92="Kooky Courtyard\Player 1\Cant be Stunned",E8737F5D 595A
-Cheat93="Kooky Courtyard\Player 1\Infinite Energy",E8737F65 5904
-Cheat94="Kooky Courtyard\Player 1\No Energy",E8737F65 595A
-Cheat95="Kooky Courtyard\Player 1\Full Super Bar",E9737F6E 5B5A
-Cheat96="Kooky Courtyard\Player 2\Cant be Stunned",E873B3FD 595A
-Cheat97="Kooky Courtyard\Player 2\Infinite Energy",E873B305 5904
-Cheat98="Kooky Courtyard\Player 2\No Energy",E873B305 595A
-Cheat99="Kooky Courtyard\Player 2\Full Super Bar",E973B30E 5B5A
-Cheat100="Santa's Toy Factory\Player 1\Cant be Stunned",E873838D 595A
-Cheat101="Santa's Toy Factory\Player 1\Infinite Energy",E8738395 5904
-Cheat102="Santa's Toy Factory\Player 1\No Energy",E8738395 595A
-Cheat103="Santa's Toy Factory\Player 1\Full Super Bar",E973839E 5B5A
-Cheat104="Santa's Toy Factory\Player 2\Cant be Stunned",E873B72D 595A
-Cheat105="Santa's Toy Factory\Player 2\Infinite Energy",E873B735 5904
-Cheat106="Santa's Toy Factory\Player 2\No Energy",E873B735 595A
-Cheat107="Santa's Toy Factory\Player 2\Full Super Bar",E973B73E 5B5A
-Cheat108="Boogerhenge, Tureen Toilet\Player 1\Cant be Stunned",E873822D 595A
-Cheat109="Boogerhenge, Tureen Toilet\Player 1\Infinite Energy",E8738235 5904
-Cheat110="Boogerhenge, Tureen Toilet\Player 1\No Energy",E8738235 595A
-Cheat111="Boogerhenge, Tureen Toilet\Player 1\Full Super Bar",E973823E 5B5A
-Cheat112="Boogerhenge, Tureen Toilet\Player 2\Cant be Stunned",E873BBCD 595A
-Cheat113="Boogerhenge, Tureen Toilet\Player 2\Infinite Energy",E873BBD5 5904
-Cheat114="Boogerhenge, Tureen Toilet\Player 2\No Energy",E873BBD5 595A
-Cheat115="Boogerhenge, Tureen Toilet\Player 2\Full Super Bar",E973BBDE 5B5A
-Cheat116="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 1\Cant be Stunned",E8738E0D 595A
-Cheat117="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 1\Infinite Energy",E8738E15 5904
-Cheat118="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 1\No Energy",E8738E15 595A
-Cheat119="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 1\Full Super Bar",E9738E1E 5B5A
-Cheat120="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 2\Cant be Stunned",E873C7AD 595A
-Cheat121="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 2\Infinite Energy",E873C7B5 5904
-Cheat122="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 2\No Energy",E873C7B5 595A
-Cheat123="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 2\Full Super Bar",E973C7BE 5B5A
-Cheat124="Rubbage Room\Player 1\Cant be Stunned",E873999D 595A
-Cheat125="Rubbage Room\Player 1\Infinite Energy",E87399A5 5904
-Cheat126="Rubbage Room\Player 1\No Energy",E87399A5 595A
-Cheat127="Rubbage Room\Player 1\Full Super Bar",E97399AE 5B5A
-Cheat128="Rubbage Room\Player 2\Cant be Stunned",E873CD3D 595A
-Cheat129="Rubbage Room\Player 2\Infinite Energy",E873CD45 5904
-Cheat130="Rubbage Room\Player 2\No Energy",E873CD45 595A
-Cheat131="Rubbage Room\Player 2\Full Super Bar",E973CD4E 5B5A
-Cheat1_O=$5A Candy Factory,$59 Claynaveral Hangar,$5C Camp Claynaveral,$5B Outhouse,$56 Mudville Mansion,$55 Ghastly Graveyard,$58 Spooky Spire,$57 Happy Harry's Hut,$62 Freezing Fortress,$61 Refuse Room,$64 Grotto Gulch,$63 Rubbage Room,$5E Rubbage Reef,$5D Kiln's Laboratory,$60 Kiln's Hideout,$5F Fiery Furnace,$6A Research Room,$69 Clayribbean Cruise,$6C Santa's Workship,$6B Kooky Courtyard,$66 Santa's Toy Factory,$65 Boogerhenge,$68 Backwash Bay,$67 Tureen Toilet,$72 Tribal Tower,$71 Aquadome
-Cheat3_O=$59 Blob,$5C Bonker,$5B Boogerman,$56 Dr. Kiln,$55 Earthworm Jim,$62 Houngan,$61 Icky Bod Clay,$64 Kung Pow,$5D Sumo Santa,$60 Taffy,$5F T-Hoppy
-
-//----
-
 [FA5A3DFF-B4C9CDB9-C:45]
 Name=Clay Fighter - Sculptor's Cut (U)
 Cheat0="Santa's Workshop, Refuse Room, Grotto Gulch\Player 1\Cant be Stunned",E86D9051 595A
@@ -3175,6 +3098,145 @@ Cheat140_N=With this code, Press C-Up & C-Down to pick your stage.
 
 //----
 
+[F03C24CA-C5237BCC-C:45]
+Name=Clay Fighter 63 1-3 (U)
+Cheat0="Extra Characters/Secret Options",E8707E97 595F
+Cheat1="Stage Modifier",E8707E7D 59??
+Cheat2="Infinite Time To Choose Your Fighter",E9765E44 5CF7
+Cheat3="Player 1 Character Modifier",E8707E81 59??
+Cheat4="Refuse Room, Grotto Gulch, Santa's Worshop\Player 1\Cant be Stunned",E8736E5D 595A
+Cheat5="Refuse Room, Grotto Gulch, Santa's Worshop\Player 1\Infinite Energy",E8736E65 5904
+Cheat6="Refuse Room, Grotto Gulch, Santa's Worshop\Player 1\No Energy",E8736E65 595A
+Cheat7="Refuse Room, Grotto Gulch, Santa's Worshop\Player 1\Full Super Bar",E9736E6E 5B5A
+Cheat8="Refuse Room, Grotto Gulch, Santa's Worshop\Player 2\Cant be Stunned",E873A2FD 595A
+Cheat9="Refuse Room, Grotto Gulch, Santa's Worshop\Player 2\Infinite Energy",E873A205 5904
+Cheat10="Refuse Room, Grotto Gulch, Santa's Worshop\Player 2\No Energy",E873A205 595A
+Cheat11="Refuse Room, Grotto Gulch, Santa's Worshop\Player 2\Full Super Bar",E973A20E 5B5A
+Cheat12="Tribal Tower\Player 1\Cant be Stunned",E8736EFD 595A
+Cheat13="Tribal Tower\Player 1\Infinite Energy",E8736E05 5904
+Cheat14="Tribal Tower\Player 1\No Energy",E8736E05 595A
+Cheat15="Tribal Tower\Player 1\Full Super Bar",E9736E0E 5B5A
+Cheat16="Tribal Tower\Player 2\Cant be Stunned",E873A79D 595A
+Cheat17="Tribal Tower\Player 2\Infinite Energy",E873A7A5 5904
+Cheat18="Tribal Tower\Player 2\No Energy",E873A7A5 595A
+Cheat19="Tribal Tower\Player 2\Full Super Bar",E973A7AE 5B5A
+Cheat20="Aquadome\Player 1\Cant be Stunned",E873718D 595A
+Cheat21="Aquadome\Player 1\Infinite Energy",E8737185 5904
+Cheat22="Aquadome\Player 1\No Energy",E8737185 595A
+Cheat23="Aquadome\Player 1\Full Super Bar",E973718E 5B5A
+Cheat24="Aquadome\Player 2\Cant be Stunned",E873A51D 595A
+Cheat25="Aquadome\Player 2\Infinite Energy",E873A525 5904
+Cheat26="Aquadome\Player 2\No Energy",E873A525 595A
+Cheat27="Aquadome\Player 2\Full Super Bar",E973A52E 5B5A
+Cheat28="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 1\Cant be Stunned",E873768D 595A
+Cheat29="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 1\Infinite Energy",E8737695 5904
+Cheat30="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 1\No Energy",E8737695 595A
+Cheat31="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 1\Full Super Bar",E973769E 5B5A
+Cheat32="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 2\Cant be Stunned",E873AA2D 595A
+Cheat33="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 2\Infinite Energy",E873AA35 5904
+Cheat34="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 2\No Energy",E873AA35 595A
+Cheat35="Outhouse,Claynaveral Hangar,Camp Claynaveral\Player 2\Full Super Bar",E973AA3E 5B5A
+Cheat36="Freezing Fortress\Player 1\Cant be Stunned",E87376ED 595A
+Cheat37="Freezing Fortress\Player 1\Infinite Energy",E87376F5 5904
+Cheat38="Freezing Fortress\Player 1\No Energy",E87376F5 595A
+Cheat39="Freezing Fortress\Player 1\Full Super Bar",E97376FE 5B5A
+Cheat40="Freezing Fortress\Player 2\Cant be Stunned",E873AF8D 595A
+Cheat41="Freezing Fortress\Player 2\Infinite Energy",E873AF95 5904
+Cheat42="Freezing Fortress\Player 2\No Energy",E873AF95 595A
+Cheat43="Freezing Fortress\Player 2\Full Super Bar",E973AF9E 5B5A
+Cheat44="Rubbage Reef\Player 1\Cant be Stunned",E8737B6D 595A
+Cheat45="Rubbage Reef\Player 1\Infinite Energy",E8737B75 5904
+Cheat46="Rubbage Reef\Player 1\No Energy",E8737B75 595A
+Cheat47="Rubbage Reef\Player 1\Full Super Bar",E9737B7E 5B5A
+Cheat48="Rubbage Reef\Player 2\Cant be Stunned",E873AF0D 595A
+Cheat49="Rubbage Reef\Player 2\Infinite Energy",E873AF15 5904
+Cheat50="Rubbage Reef\Player 2\No Energy",E873AF15 595A
+Cheat51="Rubbage Reef\Player 2\Full Super Bar",E973AF1E 5B5A
+Cheat52="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 1\Cant be Stunned",E8737B9D 595A
+Cheat53="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 1\Infinite Energy",E8737BA5 5904
+Cheat54="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 1\No Energy",E8737BA5 595A
+Cheat55="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 1\Full Super Bar",E9737BAE 5B5A
+Cheat56="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 2\Cant be Stunned",E873AF3D 595A
+Cheat57="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 2\Infinite Energy",E873AF45 5904
+Cheat58="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 2\No Energy",E873AF45 595A
+Cheat59="Happy Harry's Hut, Spooky Spire, Mudville Mansion\Player 2\Full Super Bar",E973AF4E 5B5A
+Cheat60="Clayribbean Cruise\Player 1\Cant be Stunned",E8737B4D 595A
+Cheat61="Clayribbean Cruise\Player 1\Infinite Energy",E8737C55 5904
+Cheat62="Clayribbean Cruise\Player 1\No Energy",E8737C55 595A
+Cheat63="Clayribbean Cruise\Player 1\Full Super Bar",E9737C5E 5B5A
+Cheat64="Clayribbean Cruise\Player 2\Cant be Stunned",E873B0ED 595A
+Cheat65="Clayribbean Cruise\Player 2\Infinite Energy",E873B0F5 5904
+Cheat66="Clayribbean Cruise\Player 2\No Energy",E873B0F5 595A
+Cheat67="Clayribbean Cruise\Player 2\Full Super Bar",E973B0FE 5B5A
+Cheat68="Backwash Bay\Player 1\Cant be Stunned",E8737CDD 595A
+Cheat69="Backwash Bay\Player 1\Infinite Energy",E8737CE5 5904
+Cheat70="Backwash Bay\Player 1\No Energy",E8737CE5 595A
+Cheat71="Backwash Bay\Player 1\Full Super Bar",E9737CEE 5B5A
+Cheat72="Backwash Bay\Player 2\Cant be Stunned",E873AD7D 595A
+Cheat73="Backwash Bay\Player 2\Infinite Energy",E873AD85 5904
+Cheat74="Backwash Bay\Player 2\No Energy",E873AD85 595A
+Cheat75="Backwash Bay\Player 2\Full Super Bar",E973AD8E 5B5A
+Cheat76="Ghastly Graveyard\Player 1\Cant be Stunned",E873797D 595A
+Cheat77="Ghastly Graveyard\Player 1\Infinite Energy",E8737985 5904
+Cheat78="Ghastly Graveyard\Player 1\No Energy",E8737985 595A
+Cheat79="Ghastly Graveyard\Player 1\Full Super Bar",E973798E 5B5A
+Cheat80="Ghastly Graveyard\Player 2\Cant be Stunned",E873AD1D 595A
+Cheat81="Ghastly Graveyard\Player 2\Infinite Energy",E873AD25 5904
+Cheat82="Ghastly Graveyard\Player 2\No Energy",E873AD25 595A
+Cheat83="Ghastly Graveyard\Player 2\Full Super Bar",E973AD2E 5B5A
+Cheat84="Candy Factory\Player 1\Cant be Stunned",E8737A5D 595A
+Cheat85="Candy Factory\Player 1\Infinite Energy",E8737A65 5904
+Cheat86="Candy Factory\Player 1\No Energy",E8737A65 595A
+Cheat87="Candy Factory\Player 1\Full Super Bar",E9737A6E 5B5A
+Cheat88="Candy Factory\Player 2\Cant be Stunned",E873AEFD 595A
+Cheat89="Candy Factory\Player 2\Infinite Energy",E873AE05 5904
+Cheat90="Candy Factory\Player 2\No Energy",E873AE05 595A
+Cheat91="Candy Factory\Player 2\Full Super Bar",E973AE0E 5B5A
+Cheat92="Kooky Courtyard\Player 1\Cant be Stunned",E8737F5D 595A
+Cheat93="Kooky Courtyard\Player 1\Infinite Energy",E8737F65 5904
+Cheat94="Kooky Courtyard\Player 1\No Energy",E8737F65 595A
+Cheat95="Kooky Courtyard\Player 1\Full Super Bar",E9737F6E 5B5A
+Cheat96="Kooky Courtyard\Player 2\Cant be Stunned",E873B3FD 595A
+Cheat97="Kooky Courtyard\Player 2\Infinite Energy",E873B305 5904
+Cheat98="Kooky Courtyard\Player 2\No Energy",E873B305 595A
+Cheat99="Kooky Courtyard\Player 2\Full Super Bar",E973B30E 5B5A
+Cheat100="Santa's Toy Factory\Player 1\Cant be Stunned",E873838D 595A
+Cheat101="Santa's Toy Factory\Player 1\Infinite Energy",E8738395 5904
+Cheat102="Santa's Toy Factory\Player 1\No Energy",E8738395 595A
+Cheat103="Santa's Toy Factory\Player 1\Full Super Bar",E973839E 5B5A
+Cheat104="Santa's Toy Factory\Player 2\Cant be Stunned",E873B72D 595A
+Cheat105="Santa's Toy Factory\Player 2\Infinite Energy",E873B735 5904
+Cheat106="Santa's Toy Factory\Player 2\No Energy",E873B735 595A
+Cheat107="Santa's Toy Factory\Player 2\Full Super Bar",E973B73E 5B5A
+Cheat108="Boogerhenge, Tureen Toilet\Player 1\Cant be Stunned",E873822D 595A
+Cheat109="Boogerhenge, Tureen Toilet\Player 1\Infinite Energy",E8738235 5904
+Cheat110="Boogerhenge, Tureen Toilet\Player 1\No Energy",E8738235 595A
+Cheat111="Boogerhenge, Tureen Toilet\Player 1\Full Super Bar",E973823E 5B5A
+Cheat112="Boogerhenge, Tureen Toilet\Player 2\Cant be Stunned",E873BBCD 595A
+Cheat113="Boogerhenge, Tureen Toilet\Player 2\Infinite Energy",E873BBD5 5904
+Cheat114="Boogerhenge, Tureen Toilet\Player 2\No Energy",E873BBD5 595A
+Cheat115="Boogerhenge, Tureen Toilet\Player 2\Full Super Bar",E973BBDE 5B5A
+Cheat116="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 1\Cant be Stunned",E8738E0D 595A
+Cheat117="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 1\Infinite Energy",E8738E15 5904
+Cheat118="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 1\No Energy",E8738E15 595A
+Cheat119="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 1\Full Super Bar",E9738E1E 5B5A
+Cheat120="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 2\Cant be Stunned",E873C7AD 595A
+Cheat121="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 2\Infinite Energy",E873C7B5 5904
+Cheat122="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 2\No Energy",E873C7B5 595A
+Cheat123="Kiln's Laboratory, Kiln's Hideout, Fiery Furnace, Research Room\Player 2\Full Super Bar",E973C7BE 5B5A
+Cheat124="Rubbage Room\Player 1\Cant be Stunned",E873999D 595A
+Cheat125="Rubbage Room\Player 1\Infinite Energy",E87399A5 5904
+Cheat126="Rubbage Room\Player 1\No Energy",E87399A5 595A
+Cheat127="Rubbage Room\Player 1\Full Super Bar",E97399AE 5B5A
+Cheat128="Rubbage Room\Player 2\Cant be Stunned",E873CD3D 595A
+Cheat129="Rubbage Room\Player 2\Infinite Energy",E873CD45 5904
+Cheat130="Rubbage Room\Player 2\No Energy",E873CD45 595A
+Cheat131="Rubbage Room\Player 2\Full Super Bar",E973CD4E 5B5A
+Cheat1_O=$5A Candy Factory,$59 Claynaveral Hangar,$5C Camp Claynaveral,$5B Outhouse,$56 Mudville Mansion,$55 Ghastly Graveyard,$58 Spooky Spire,$57 Happy Harry's Hut,$62 Freezing Fortress,$61 Refuse Room,$64 Grotto Gulch,$63 Rubbage Room,$5E Rubbage Reef,$5D Kiln's Laboratory,$60 Kiln's Hideout,$5F Fiery Furnace,$6A Research Room,$69 Clayribbean Cruise,$6C Santa's Workship,$6B Kooky Courtyard,$66 Santa's Toy Factory,$65 Boogerhenge,$68 Backwash Bay,$67 Tureen Toilet,$72 Tribal Tower,$71 Aquadome
+Cheat3_O=$59 Blob,$5C Bonker,$5B Boogerman,$56 Dr. Kiln,$55 Earthworm Jim,$62 Houngan,$61 Icky Bod Clay,$64 Kung Pow,$5D Sumo Santa,$60 Taffy,$5F T-Hoppy
+
+//----
+
 [2B6FA7C0-09A71225-C:45]
 Name=Clay Fighter 63 1-3 (U) (beta)
 Cheat0="Extra Characters and Secret Options",E86D4497 595F
@@ -3409,7 +3471,7 @@ Cheat5_O=$5A ,$59 ,$5C ,$5B ,$56 ,$55 ,$58 ,$57 ,$62 ,$61 ,$64 ,$63 ,$5E ,$5D ,$
 //----
 
 [FF2F2FB4-D161149A-C:45]
-Name=Cruis'n USA (U) (v1.0)
+Name=Cruis'n USA (U) (V1.0)
 Cheat0="Always Place 1st",E86955AD 5959
 Cheat1="Unlimited Time",E8695DC0 59E5,E86960D3 59E5
 Cheat2="Car Upgrades\'63 Muscle Car",E86959B1 5955
@@ -3437,7 +3499,7 @@ Cheat15_O=$5A Automatic,$59 Manual
 //----
 
 [5306CF45-CBC49250-C:45]
-Name=Cruis'n USA (U) (v1.1)
+Name=Cruis'n USA (U) (V1.1)
 Cheat0="Car Upgrades\'63 Muscle Car",E8695C91 5955
 Cheat1="Car Upgrades\La Bomba",E8695C95 5955
 Cheat2="Car Upgrades\Devastator",E8695C99 5955
@@ -3463,7 +3525,7 @@ Cheat13_O=$5A Automatic,$59 Manual
 //----
 
 [B3402554-7340C004-C:45]
-Name=Cruis'n USA (U) (v1.2)
+Name=Cruis'n USA (U) (V1.2)
 Cheat0="Car Upgrades\'63 Muscle Car",E8695CC1 5955
 Cheat1="Car Upgrades\La Bomba",E8695CC5 5955
 Cheat2="Car Upgrades\Devastator",E8695CC9 5955
@@ -3625,7 +3687,7 @@ Cheat42="Solo Mode\Sunset Canyon\Infinite Health",D0303A68 0080,E8868DC9 5939
 //----
 
 [53D440E7-7519B011-C:45]
-Name=Diddy Kong Racing (U) (V1.0)
+Name=Diddy Kong Racing (U) (M2) (V1.0)
 Cheat0="Enable All Cheats",50000401 0000,110DFD9C FFFF
 Cheat0_N=Go into Options & then Magic Codes. Then Code list to turn off & on what you want.
 Cheat1="Have All\Trophies",E9732032 504F
@@ -3755,7 +3817,7 @@ Cheat64_N=For Track Race Only.Do not use more than 1 Infinite Power up at a time
 //----
 
 [E402430D-D2FCFC9D-C:45]
-Name=Diddy Kong Racing (U) (V1.1)
+Name=Diddy Kong Racing (U) (M2) (V1.1)
 Cheat0="Enable All Cheats",E9645674 504F,E9645672 504F
 Cheat0_N=Go into Options & then Magic Codes. Then Code list to turn off & on what you want.
 Cheat1="Have All\Trophies",E9732032 504F
@@ -3992,7 +4054,7 @@ Cheat63_N=This is exactly what it says, You can walk through Any Locked Door,Gat
 //----
 
 [A83E101A-E937B69D-C:45]
-Name=Doom64 (U) v1.0
+Name=Doom 64 (U) (V1.0)
 Cheat0="Always Have\Gun",E85C8515 5959
 Cheat1="Always Have\Shotgun",E85C8519 5959
 Cheat2="Always Have\Double Shotgun",E85C851D 5959
@@ -4021,7 +4083,7 @@ Cheat21="Enable Cheat Menu",E859FA25 5959
 //----
 
 [423E96F4-CE88F05B-C:45]
-Name=Doom64 (U) v1.1
+Name=Doom 64 (U) (V1.1)
 Cheat0="Always Have\Gun",E85C86C5 5959
 Cheat1="Always Have\Shotgun",E85C86C9 5959
 Cheat2="Always Have\Double Shotgun",E85C86CD 5959
@@ -4066,7 +4128,7 @@ Cheat11="Player 2\Lifebar Flashes Red",D022672E 0000,E978BA82 591F
 //----
 
 [FBB9F1FA-6BF88689-C:45]
-Name=Duck Dodgers Starring Daffy Duck (U)
+Name=Duck Dodgers Starring Daffy Duck (U) (M3)
 Cheat0="Infinite\Lives",E858BDB9 59BB
 Cheat1="Infinite\Quarks",E969E5D6 504F
 Cheat2="Infinite\Atoms",E969E5DA 504F
@@ -4322,7 +4384,7 @@ Cheat14="Have All Gold Udders",50002802 0000,110C625A 0101
 //----
 
 [BDF9766D-BD068D70-C:45]
-Name=ECW Hardcore Revolut (U)
+Name=ECW Hardcore Revolution (U)
 Cheat0="VS & Tournment Mode\Player 1\Infinite Health",D02931FD 0029,E97D86D8 595A,D02931FD 0029,E97D86D6 595A
 Cheat1="VS & Tournment Mode\Player 1\Infinite Health",D02931FD 0029,E97D86D8 594F,D02931FD 0029,E97D86D6 594F
 Cheat2="VS & Tournment Mode\Player 1\Super Strength",D02931FD 0029,E97D862E 504F
@@ -4629,7 +4691,7 @@ Cheat15_N=If you are using a Plugin other then Jabos and can not see through the
 //----
 
 [AE82687A-9A3F388D-C:45]
-Name=F-1 Pole Position 64 (U)
+Name=F-1 Pole Position 64 (U) (M3)
 Cheat0="Always First Place",E95FF92E 595A
 
 //----
@@ -4732,7 +4794,7 @@ Cheat17="GS Button For 1-Second Shot Clock",8912A4BC 3FC0
 //----
 
 [E8E5B179-44AA30E8-C:45]
-Name=Frogger2 (Unreleased Alpha)
+Name=Frogger 2 (U) (Unreleased Alpha)
 Cheat0="Freeze Timer",E86C8D11 5964
 Cheat2="Infinite Lives (Retro Frogger)",E8790381 5955
 Cheat1="Infinite 99 Lives",E86C8D19 59BB
@@ -4781,7 +4843,7 @@ Cheat27_O=$5A Mute City,$59 Silence,$5C Sand Ocean,$5B Devils Forest,$56 Big Blu
 //----
 
 [729B5E32-B728D980-C:45]
-Name=GAUNTLET LEGENDS
+Name=Gauntlet Legends (U)
 Cheat0="Infinite\Max Health",E962B3AC 595A,E962B3AA 785F,E962B3BC 595A,E962B3BA 785F
 Cheat1="Infinite\Money",E962B34A 504F
 Cheat2="Max Strength",E962B35C 595A,E962B35A 504F
@@ -4802,7 +4864,7 @@ Cheat8="Infinite\Special Weapons",E862B249 5961,E862B489 5961,E862B4B9 5961,E862
 //----
 
 [3EDC7E12-E26C1CC9-C:45]
-Name=Gex 3: Deep Cover Gecko (U)
+Name=Gex 3 - Deep Cover Gecko (U)
 Cheat0="Start With 50 Remotes",D00A54EB 0000,E860AB3D 598C
 Cheat1="Infinite Health",E860AB2F 5956
 Cheat2="Extra Flies",D00A54DF 0000,E860AB31 598C
@@ -4810,7 +4872,7 @@ Cheat2="Extra Flies",D00A54DF 0000,E860AB31 598C
 //----
 
 [89FED774-CAAFE21B-C:45]
-Name=Gex 64: Enter The Gecko (U)
+Name=Gex 64 - Enter the Gecko (U)
 Cheat0="Infinite Health",E862A90D 5955
 Cheat1="Infinite Lives",E862A909 5955
 Cheat2="Have All Artifacts",E862A911 59BB,E862A915 59BB,E862A919 59BB
@@ -4847,7 +4909,7 @@ Cheat7="Open All Levels",50002D02 0000,110882AA 0303
 //----
 
 [DCBC50D1-09FD1AA3-C:45]
-Name=Goldeneye 007 (U)
+Name=GoldenEye 007 (U)
 Cheat0="Enable All Levels & In-Built Cheat Menu",E85CF082 504F,E85CF088 504F,E85CF0B9 504F,E85CF0C4 504F,E85CF0C7 504F,E85CF0CA 504F,E85CF0CD 504F,E85CF081 504F,E85CF0BB 504F,E85CF0BE 504F,E85CF0C1 504F,E85CF0CC 504F,E85CF0CF 504F
 Cheat1="Always Have 00:00 Time (All Levels)",E85AD6D2 595A,E85AD6E2 595A,E85AD6EA 595A,E85BED76 595A,E85BF27A 595A
 Cheat2="Infinite Ammo (All Levels)",E85BF18D 5959
@@ -4877,7 +4939,7 @@ Cheat18="Replace Cradle with Citadell hidden level ",E858FF49 5981,E95A99DE E2CA
 //----
 
 [98DF9DFC-6606C189-C:45]
-Name=Harvest Moon (U)
+Name=Harvest Moon 64 (U)
 Cheat0="Infinite\Money",E9732962 504F
 Cheat1="Belongings\Slot 01",E86EE7DC 59??
 Cheat1_O=$5A Nothing,$59 Weeds,$5C Boulder,$5B Lumber,$56 Moondrop Plant,$55 Pink-Cat-Mint Plant,$58 Blue Plant,$57 Cake,$62 Pie,$61 Cookie,$64 Blue Feather,$63 Pink Liquid In A Bottle,$5E Red Box,$5D Turnips,$60 Potatoes,$5F Cabbages,$6A Tomatoes,$69 Corn,$6C Eggplant,$6B Strawberries,$66 Eggs,$65 Milk,$68 M Size Milk,$67 L Size Milk,$72 Gold Milk,$71 Sheared Wool,$74 High Quality Wool,$73 Wild Grapes,$6E Very Berry Fruit,$6D Tropical Fruit,$70 Walnuts,$6F Mushrooms,$7A Poisonous Mushroom,$79 Green Box,$7C Berry Of Full Moon Plant,$7B Medicinal Herbs,$76 Edible Herbs,$75 Small Fish,$78 Fish,$77 Big Fish,$82 Dumpling,$81 Cotton Candy,$84 Fried Octopus,$83 Roasted Corn,$7E Candy,$7D Chocolate,$80 Iron-Ore,$7F Blue Rock,$8A Rare Metal,$89 Moonlight Stone,$8C Pontata Root,$8B Chicken,$86 Chocolate Bar Picture,$85 ???,$88 Blue Egg Shaped Device,$87 ??,$92 Chocolate Bar Picture,$91 Fodder,$94 White Bag,$93 Tan Bag,$8E Green Bag,$8D Red Bag,$90 Yellow Bag,$8F Purple Bag
@@ -4980,7 +5042,7 @@ Cheat57="Have\Max Shipped In Bin!",E877C6DE 504F
 //----
 
 [7F3CEB77-8981030A-C:45]
-Name=Hercules: The Legendary Journeys (U)
+Name=Hercules - The Legendary Journeys (U)
 Cheat0="Infinite Health",E9625092 5C37,E9625096 5C37
 Cheat1="Infinite Dinars",E85FB795 5942,E85FB796 5942
 Cheat2="Infinite Magic",E95FBC1E 59BB,E95FBC06 59BB,E95FBC36 59BB,E95FBC4E 59BB
@@ -5092,6 +5154,26 @@ Cheat6_O=$59 Unlocked & Not Completed,$5B Unlocked & Completed
 
 //----
 
+[E616B5BC-C9658B88-C:45]
+Name=Iggy's Reckin' Balls (U)
+Cheat0="Extra Characters",E962B682 504F
+Cheat1="Always Have 99 Points",E961E138 59BB
+Cheat2="Infinite Credits",E85F31FB 5955
+Cheat3="Enable All Courses",E9622446 645A,E962244C 645A,E962244A 645A
+
+//----
+
+[8C138BE0-95700E46-C:45]
+Name=In-Fisherman Bass Hunter 64 (U)
+Cheat0="Catch Bigger Fish",E865725A 5959
+Cheat1="Line Never Breaks",E865725B 5959
+Cheat2="All Lakes Unlocked",E8657258 5959
+Cheat3="Extra Cash",E865725D 5959
+Cheat4="Easier to Catch Fish",E8657262 5959
+Cheat5="No Penalties in Tounament",E8657260 5959
+
+//----
+
 [E436467A-82DE8F9B-C:45]
 Name=Indy Racing 2000 (U)
 Cheat0="Max Exp (Gold Cup - All Classes Unlocked)",E9579070 D04F,E957906E 504F
@@ -5106,17 +5188,8 @@ Cheat0_N=With the 'Max Exp' codes for the Gold Cup, start a new file and leave i
 
 //----
 
-[E616B5BC-C9658B88-C:45]
-Name=Iggy's Reckin' Balls (U)
-Cheat0="Extra Characters",E962B682 504F
-Cheat1="Always Have 99 Points",E961E138 59BB
-Cheat2="Infinite Credits",E85F31FB 5955
-Cheat3="Enable All Courses",E9622446 645A,E962244C 645A,E962244A 645A
-
-//----
-
 [69256460-B9A3F586-C:45]
-Name=Jeopardy (U)
+Name=Jeopardy! (U)
 Cheat0="Max Money\Player 1",E959D876 504F
 Cheat1="Max Money\Player 2",E959D87C 504F
 Cheat3="Max Money\Player 3",E959D87A 504F
@@ -5219,7 +5292,77 @@ Cheat13_O=$5C 2nd Inning,$5B 3rd Inning,$56 4th Inning,$55 5th Inning,$58 6th In
 //----
 
 [9E8FE2BA-8B270770-C:45]
-Name=Killer Instinct Gold (U) (v1.0)
+Name=Killer Instinct Gold (U) (V1.0)
+Cheat0="Unlock All Options",E868D6A4 5958
+Cheat1="Player 1\Untouchable",E8718B2C 5964
+Cheat2="Player 1\Fast\Punch Kick",E8718BD2 596A
+Cheat3="Player 1\Fast\Jump Walk",E8718BD4 5959
+Cheat4="Player 1\Slow Jump Walk",E8718BD3 59AA
+Cheat5="Player 1\Infinite Energy",E8718BDC 59C1
+Cheat6="Player 1\Fight Gargos Immediately",E868D69D 5964
+Cheat7="Player 1\Spinal Always Has All Skulls",E8718C75 5958
+Cheat8="Player 1\Fulgore\Always Invisible",E8718BD0 597A,E8718BCF 59EA,E8718B1B 59EC,E8718C79 59B0
+Cheat8_N=Do not use this with Fulgore Always Visible
+Cheat9="Player 1\Fulgore\Always Visible",E8718BD0 597B,E8718BCF 594A,E8718B1B 59DA,E8718C79 59FF
+Cheat9_N=Do not use this with Fulgore Always Invisible
+Cheat10="Player 1\Wins Score",E868D65E 594F
+Cheat11="Player 1\Undefeated Players Scroll By Quickly",E882E340 5957
+Cheat12="Player 1\Play As",E882E310 59??
+Cheat12_O=$5A Jago,$59 Combo,$5C Spinal,$5B Tusk,$56 Glacius,$55 Fulgore,$58 Kim Wu,$57 Sabrewulf,$62 Orchid,$61 Maya,$64 Gargos
+Cheat13="Player 1\1-Hit Death",D01D3484 0078,E8718BDC 5959
+Cheat14="Player 2\Spinal Always Has All Skulls",E8718975 5958
+Cheat15="Player 2\Fulgore Always Invisible",E8718CD0 597A,E8718CCF 59EA,E8718C1B 59EC,E8718C79 59B0
+Cheat15_N=Do not use this with Fulgore Always Visible
+Cheat16="Player 2\Fulgore Always Visible",E8718CD0 597B,E8718CCF 594A,E8718C1B 59DA,E8718C79 59FF
+Cheat16_N=Do not use this with Fulgore Always Invisible
+Cheat17="Player 2\Play As",E85A3DF3 59??
+Cheat17_O=$5A Jago,$59 Combo,$5C Spinal,$5B Tusk,$56 Glacius,$55 Fulgore,$58 Kim Wu,$57 Sabrewulf,$62 Orchid,$61 Maya,$64 Gargos
+Cheat18="Player 2\Infinite Energy",E8718CDC 59D2
+Cheat19="Player 2\Fast\Punch Kick",E8718CD2 596A
+Cheat20="Player 2\Fast\Jump Walk",E8718CD4 5959
+Cheat21="Player 2\Slow\Punch Kick",E8718CD1 59AA
+Cheat22="Player 2\Slow\Jump Walk",E8718CD3 59AA
+Cheat23="Player 2\Untouchable",E8718B2B 5964
+
+//----
+
+[9E8FCDFA-49F5652B-C:45]
+Name=Killer Instinct Gold (U) (V1.1)
+Cheat0="Unlock All Options",E868D6A4 5958
+Cheat1="Player 1\Untouchable",E8718B2C 5964
+Cheat2="Player 1\Fast\Punch Kick",E8718BD2 596A
+Cheat3="Player 1\Fast\Jump Walk",E8718BD4 5959
+Cheat4="Player 1\Slow Jump Walk",E8718BD3 59AA
+Cheat5="Player 1\Infinite Energy",E8718BDC 59C1
+Cheat6="Player 1\Fight Gargos Immediately",E868D69D 5964
+Cheat7="Player 1\Spinal Always Has All Skulls",E8718C75 5958
+Cheat8="Player 1\Fulgore\Always Invisible",E8718BD0 597A,E8718BCF 59EA,E8718B1B 59EC,E8718C79 59B0
+Cheat8_N=Do not use this with Fulgore Always Visible
+Cheat9="Player 1\Fulgore\Always Visible",E8718BD0 597B,E8718BCF 594A,E8718B1B 59DA,E8718C79 59FF
+Cheat9_N=Do not use this with Fulgore Always Invisible
+Cheat10="Player 1\Wins Score",E868D65E 594F
+Cheat11="Player 1\Undefeated Players Scroll By Quickly",E882E340 5957
+Cheat12="Player 1\Play As",E882E310 59??
+Cheat12_O=$5A Jago,$59 Combo,$5C Spinal,$5B Tusk,$56 Glacius,$55 Fulgore,$58 Kim Wu,$57 Sabrewulf,$62 Orchid,$61 Maya,$64 Gargos
+Cheat13="Player 1\1-Hit Death",D01D3484 0078,E8718BDC 5959
+Cheat14="Player 2\Spinal Always Has All Skulls",E8718975 5958
+Cheat15="Player 2\Fulgore Always Invisible",E8718CD0 597A,E8718CCF 59EA,E8718C1B 59EC,E8718C79 59B0
+Cheat15_N=Do not use this with Fulgore Always Visible
+Cheat16="Player 2\Fulgore Always Visible",E8718CD0 597B,E8718CCF 594A,E8718C1B 59DA,E8718C79 59FF
+Cheat16_N=Do not use this with Fulgore Always Invisible
+Cheat17="Player 2\Play As",E85A3DF3 59??
+Cheat17_O=$5A Jago,$59 Combo,$5C Spinal,$5B Tusk,$56 Glacius,$55 Fulgore,$58 Kim Wu,$57 Sabrewulf,$62 Orchid,$61 Maya,$64 Gargos
+Cheat18="Player 2\Infinite Energy",E8718CDC 59D2
+Cheat19="Player 2\Fast\Punch Kick",E8718CD2 596A
+Cheat20="Player 2\Fast\Jump Walk",E8718CD4 5959
+Cheat21="Player 2\Slow\Punch Kick",E8718CD1 59AA
+Cheat22="Player 2\Slow\Jump Walk",E8718CD3 59AA
+Cheat23="Player 2\Untouchable",E8718B2B 5964
+
+//----
+
+[F908CA4C-36464327-C:45]
+Name=Killer Instinct Gold (U) (V1.2)
 Cheat0="Unlock All Options",E868D6A4 5958
 Cheat1="Player 1\Untouchable",E8718B2C 5964
 Cheat2="Player 1\Fast\Punch Kick",E8718BD2 596A
@@ -5303,514 +5446,14 @@ Cheat16_O=$5A Great Western Forum,$59 Caesars Palace,$5C Ecko Sports Arena,$5B I
 
 //----
 
-[5354631C-03A2DEF0-C:45]
-Name=Legend of Zelda 2, The - Majora's Mask (U)
-Cheat0="Infinite\Health",E97449FA 5A9A
-Cheat1="Infinite\Hearts Options",E97449FC ????
-Cheat1_O=$5A9A Max Hearts,$59BB 6 Hearts,$599B 4 Hearts
-Cheat1_N=If you need to clear the Infinite Max Hearts from the screen just choose the 6 or 4 Heart Options, take off the cheat & then make a save.
-Cheat3="Infinite\Rupees",E97449FE 5C37
-Cheat4="Infinite\Max & Double Magic Meter",E87449FF 59BA,E9744908 5A59
-Cheat5="Infinite\Items",E8744A67 59BB,E8744A6A 59BB,E8744A69 59BB,E8744A70 59BB,E8744A6F 59BB,E8744A6E 59BB,E8744A74 59BB,E8744A73 59BB
-Cheat6="Have\Ocarina of Time",E8744938 595A
-Cheat7="Have\Hero's Bow",E8744937 5959
-Cheat8="Have\Arrows\Fire Arrow",E8744936 595C
-Cheat9="Have\Arrows\Ice Arrow",E8744935 595B
-Cheat10="Have\Arrows\Light Arrow",E874493C 5956
-Cheat11="Have\Bombs",E874493A 5958
-Cheat12="Have\Bombchu",E8744939 5957
-Cheat13="Have\Deku Sticks",E8744940 5962
-Cheat14="Have\Deku Nuts",E874493F 5961
-Cheat15="Have\Magic Beans",E874493E 5964
-Cheat16="Have\Powder Kegs",E8744944 595E
-Cheat17="Have\Pictograph",E8744943 595D
-Cheat18="Have\Lens of Truth",E8744942 5960
-Cheat19="Have\Hookshot",E8744941 595F
-Cheat20="Have\Great Fairy's Sword",E8744948 596A
-Cheat21="Maximum Visibility",E86CB870 597A
-Cheat22="Fog\Blue",E86CB860 597A
-Cheat23="Fog\Pink",E86CB864 597A
-Cheat24="Fog\Yellow",E86CB868 597A
-Cheat25="Press L To Levitate",D03E6B3B 0020,E9935170 9923
-Cheat25_N=Press L To Levitate & Let go to land
-Cheat26="Have\All Masks",E8744950 5990,E874494F 5992,E874494E 5997,E874494D 5995,E8744954 599A,E8744953 598C,E8744952 5994,E8744951 5998,E8744A58 5991,E8744A57 599C,E8744A56 59A2,E8744A55 598B,E8744A5C 598E,E8744A5B 598D,E8744A5A 5987,E8744A59 598F,E8744A60 5988,E8744A5F 5986,E8744A5E 599B,E8744A5D 5999,E8744A64 5993,E8744A63 5996,E8744A62 59A1,E8744A61 5985
-Cheat27="Beta World 1",D03E6B3B 0000,E87449C6 59??
-Cheat28="Fight Demo Majora's Mask",E86CFA70 597A
-Cheat29="Event Item\Modifier 1",E874493B 59??
-Cheat30="Event Item\Modifier 2",E874493D 59??
-Cheat31="Event Item\Modifier 3",E8744947 59??
-Cheat32="Have\Item Modifier",E8744948 59??
-Cheat33="Have Bottle Modifier 1",E8744946 59??
-Cheat34="Have Bottle Modifier 2",E8744945 59??
-Cheat35="Have Bottle Modifier 3",E874494C 59??
-Cheat36="Have Bottle Modifier 4",E874494B 59??
-Cheat37="Have Bottle Modifier 5",E874494A 59??
-Cheat38="Have Bottle Modifier 6",E8744949 59??
-Cheat39="Use C-Buttons Anywhere",E9738CE0 595A,E9738CDE 595A
-Cheat40="All Equipment Upgrades",E8744933 597B,E9744A7E 7973,E8744914 599F
-Cheat41="Replace Sword With",E8744914 59??
-Cheat41_O=$A4 Fire Arrow w/ Bow,$A3 Ice Arrow w/ Bow,$9E Light Arrow w/ Bow,$9D Kokiri Sword,$A0 Razor Sword,$9F Guilded Sword,$AA Deity Link's Sword
-Cheat42="Play As",E87449E8 59??
-Cheat43="Warp Modifier",D03E6B3A 0000,E89346EB 5959,E99346EE ????
-Cheat27_O=$5A Mama's House non Beta,$59 Fearful Spider House,$5C Beneaf the Graveyard,$5B Southern Swamp Mr Tingle Entry,$58 Outside Tourist Information Southern Swamp,$62 Outside Magic Hag's Potion Shop,$64 Southern Swamp Woods Of Mystery Entry,$76 Counter Of The Tresure Chest Shop,$80 Woodfall Temple non Beta,$8C Spider Hand,$85 Statue outside Gorman Track,$88 Statue outside Lair Of The Temples Boss,$92 Path to Romani Ranch non Beta,$A4 outside The Royal Palace of the Deku Kingdom,$9E Ledge in The Royal Palace of the Deku Kingdom,$A0 inside The Royal Palace of the Deku Kingdom 1,$C9 Green Blobs,$C6 Cave Portal to Last Boss Field,$CF Waterfall Sothern Swamp,$E4 Giant Turtle In the Temple non beta,$E3 Room of Miau & Tijo Zora Great Hall,$E6 Recieving Gorans Mask non Beta,$E5 ?,$E8 Hungry Goran in the Snow,$FC Statue in Stone Tower,$F8 Stone Tower non Beta,$11 Recieving Deku Mask non Beta,$31 Giant Lizards in a Cave,$34 Cave with Steaming Water,$4F Vamps House In Ikana Canyon
-Cheat29_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
-Cheat30_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
-Cheat31_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
-Cheat32_O=$55 Japanese Flute?,$63 Japanese Item?,$6A Great Fairy's Sword,$69 Japanese Hookshot?,$89 Japanese Scroll?,$A4 Japanese Bow?
-Cheat33_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat34_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat35_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat36_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat37_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat38_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat42_O=$5A Fierce Deity Link,$59 Goron Link,$5C Zora Link,$5B Deku Link,$56 Normal Link
-Cheat43_O=$596A Mayors Residence,$5962 Magic Hags Potion Shop,$5964 Romani Ranch Barn,$5963 Mama's House,$5960 Honey & Darlings Shop,$5965 Final Boss Arena,$596F Beneath the Graveyard (left entrance),$597F Beneath the Graveyard (right entrance),$598A Southern Swamp (Reg Entrance),$599F Southern Swamp (from tour house),$59C0 Southern Swamp (from Woodfall),$59BF Southern Swamp (from Deku Palace),$59D2 Path to Ikana Canyon,$59F0 Southern Swamp (from Deku Place 2),$59EF Southern Swamp (From Potion Shop),$59FF Boat Cruise (picture taking),$591D Southern Swamp (From Woods of Mystery),$5920 Southern Swamp (From Spider House),$591F Southern Swamp (From Ikana Canyon),$5950 Southern Swamp (From Owl Warp),$5F5A Curiosity Shop,$5F92 Ikana Canyon Entrance,$665A Lens of Truth Cave (get it),$775A Stone Tower Temple (Upside down),$7761 Stone Tower Temple (Boss Room Entrance),$7756 Treasure Chest Shop,$7755 Treausre Chest Shop (counter),$7760 Clock Tower (w/ skull kid, silent),$776A Stone Tower Temple (endless fall),$BB66 Romani Ranch,$EB66 Zora Shop,$0B66 Snowhead (Path to temple, warp in),$2B66 East Clock Down
-Cheat27_N=Put on the code on load up,After the Nintendo logo you will be in that place of Choice.you can also choose another place & then press F1 (reset) to go to that place this is for beta interest only it will not assist you in playing the game.
-Cheat28_N=With this code,load the game & put the cheat on. then press start to apear in the Demo mode.
-Cheat39_N=This code allows you to use C-Button Items where you normally can't use them. (Created by: The Gentleman)
-Cheat41_N=Only put the Deity Link's Sword on, if using The Play As Fierce Deity Link Code, if not it will turn Fierce Deity Link into a crazed slashing Machine. You have been warned.
-Cheat43_N=Put this code on and it will now take where you wanted to go, turn it back off or it will infinite loop entering all the time.
-Cheat2="Have\All Quest/Status Items",E8744A83 5955,E9744A82 481F
-
-//----
-
-[B443EB08-4DB31193-C:45]
-Name=Legend of Zelda, The - Majora's Mask (U) (GC Version)
-Cheat0="Infinite\Health",E9742FBA 5A9A
-Cheat1="Infinite\Hearts Options",E9742FBC ????
-Cheat1_O=$5A9A Max Hearts,$59BB 6 Hearts,$599B 4 Hearts
-Cheat1_N=If you need to clear the Infinite Max Hearts from the screen just choose the 6 or 4 Heart Options, take off the cheat & then make a save.
-Cheat2="Have\All Quest/Status Items",E8742F43 5955,E9742F42 481F
-Cheat3="Infinite\Rupees",E9742FBE 5C37
-Cheat4="Infinite\Max & Double Magic Meter",E8742FBF 59BA,E9742FC8 5A59
-Cheat5="Infinite\Items",E8742F27 59BB,50000501 0000,101ED8D6 0063,50000201 0000,101ED8DC 0063
-Cheat6="Have\Ocarina of Time",E8742FF8 595A
-Cheat7="Have\Hero's Bow",E8742FF7 5959
-Cheat8="Have\Arrows\Fire Arrow",E8742FF6 595C
-Cheat9="Have\Arrows\Ice Arrow",E8742FF5 595B
-Cheat10="Have\Arrows\Light Arrow",E8742FFC 5956
-Cheat11="Have\Bombs",E8742FFA 5958
-Cheat12="Have\Bombchu",E8742FF9 5957
-Cheat13="Have\Deku Sticks",E8742F00 5962
-Cheat14="Have\Deku Nuts",E8742FFF 5961
-Cheat15="Have\Magic Beans",E8742FFE 5964
-Cheat16="Have\Powder Kegs",E8742F04 595E
-Cheat17="Have\Pictograph",E8742F03 595D
-Cheat18="Have\Lens of Truth",E8742F02 5960
-Cheat19="Have\Hookshot",E8742F01 595F
-Cheat20="Have\Great Fairy's Sword",E8742F08 596A
-Cheat21="Maximum Visibility",E86C9530 597A
-Cheat22="Fog\Blue",E86C9520 597A
-Cheat23="Fog\Pink",E86C9524 597A
-Cheat24="Fog\Yellow",E86C9528 597A
-Cheat25="Press L To Levitate",D038127B 0020,E98DFCB0 9923
-Cheat25_N=Press L To Levitate & Let go to land
-Cheat26="Have\All Masks",E8742F10 5990,E8742F0F 5992,E8742F0E 5997,E8742F0D 5995,E8742F14 599A,E8742F13 598C,E8742F12 5994,E8742F11 5998,E8742F18 5991,E8742F17 599C,E8742F16 59A2,E8742F15 598B,E8742F1C 598E,E8742F1B 598D,E8742F1A 5987,E8742F19 598F,E8742F20 5988,E8742F1F 5986,E8742F1E 599B,E8742F1D 5999,E8742F24 5993,E8742F23 5996,E8742F22 59A1,E8742F21 5985
-Cheat27="Beta World 1",D038127B 0000,E8742F86 59??
-Cheat28="Fight Demo Majora's Mask",E86CDF30 597A
-Cheat29="Event Item\Modifier 1",E8742FFB 59??
-Cheat30="Event Item\Modifier 2",E8742FFD 59??
-Cheat31="Event Item\Modifier 3",E8742F07 59??
-Cheat32="Have\Item Modifier",E8742F08 59??
-Cheat33="Have Bottle Modifier 1",E8742F06 59??
-Cheat34="Have Bottle Modifier 2",E8742F05 59??
-Cheat35="Have Bottle Modifier 3",E8742F0C 59??
-Cheat36="Have Bottle Modifier 4",E8742F0B 59??
-Cheat37="Have Bottle Modifier 5",E8742F0A 59??
-Cheat38="Have Bottle Modifier 6",E8742F09 59??
-Cheat39="Use C-Buttons Anywhere",E9736AA0 595A,E9736A9E 595A
-Cheat40="All Equipment Upgrades",E8742FF3 597B,E9742F3E 7973,E8742FD4 599F
-Cheat41="Replace Sword With",E8742FD4 59??
-Cheat41_O=$A4 Fire Arrow w/ Bow,$A3 Ice Arrow w/ Bow,$9E Light Arrow w/ Bow,$9D Kokiri Sword,$A0 Razor Sword,$9F Guilded Sword,$AA Deity Link's Sword
-Cheat42="Play As",E8742FA8 59??
-Cheat43="Warp Modifier",D03E4CFA 0000,E8932CAB 5959,E9932CAE ????
-Cheat27_O=$5A Mama's House non Beta,$59 Fearful Spider House,$5C Beneaf the Graveyard,$5B Southern Swamp Mr Tingle Entry,$58 Outside Tourist Information Southern Swamp,$62 Outside Magic Hag's Potion Shop,$64 Southern Swamp Woods Of Mystery Entry,$76 Counter Of The Tresure Chest Shop,$80 Woodfall Temple non Beta,$8C Spider Hand,$85 Statue outside Gorman Track,$88 Statue outside Lair Of The Temples Boss,$92 Path to Romani Ranch non Beta,$A4 outside The Royal Palace of the Deku Kingdom,$9E Ledge in The Royal Palace of the Deku Kingdom,$A0 inside The Royal Palace of the Deku Kingdom 1,$C9 Green Blobs,$C6 Cave Portal to Last Boss Field,$CF Waterfall Sothern Swamp,$E4 Giant Turtle In the Temple non beta,$E3 Room of Miau & Tijo Zora Great Hall,$E6 Recieving Gorans Mask non Beta,$E5 ?,$E8 Hungry Goran in the Snow,$FC Statue in Stone Tower,$F8 Stone Tower non Beta,$11 Recieving Deku Mask non Beta,$31 Giant Lizards in a Cave,$34 Cave with Steaming Water,$4F Vamps House In Ikana Canyon
-Cheat29_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
-Cheat30_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
-Cheat31_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
-Cheat32_O=$55 Japanese Flute?,$63 Japanese Item?,$6A Great Fairy's Sword,$69 Japanese Hookshot?,$89 Japanese Scroll?,$A4 Japanese Bow?
-Cheat33_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat34_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat35_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat36_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat37_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat38_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
-Cheat42_O=$5A Fierce Deity Link,$59 Goron Link,$5C Zora Link,$5B Deku Link,$56 Normal Link
-Cheat43_O=$596A Mayors Residence,$5962 Magic Hags Potion Shop,$5964 Romani Ranch Barn,$5963 Mama's House,$5960 Honey & Darlings Shop,$5965 Final Boss Arena,$596F Beneath the Graveyard (left entrance),$597F Beneath the Graveyard (right entrance),$598A Southern Swamp (Reg Entrance),$599F Southern Swamp (from tour house),$59C0 Southern Swamp (from Woodfall),$59BF Southern Swamp (from Deku Palace),$59D2 Path to Ikana Canyon,$59F0 Southern Swamp (from Deku Place 2),$59EF Southern Swamp (From Potion Shop),$59FF Boat Cruise (picture taking),$591D Southern Swamp (From Woods of Mystery),$5920 Southern Swamp (From Spider House),$591F Southern Swamp (From Ikana Canyon),$5950 Southern Swamp (From Owl Warp),$5F5A Curiosity Shop,$5F92 Ikana Canyon Entrance,$665A Lens of Truth Cave (get it),$775A Stone Tower Temple (Upside down),$7761 Stone Tower Temple (Boss Room Entrance),$7756 Treasure Chest Shop,$7755 Treausre Chest Shop (counter),$7760 Clock Tower (w/ skull kid, silent),$776A Stone Tower Temple (endless fall),$BB66 Romani Ranch,$EB66 Zora Shop,$0B66 Snowhead (Path to temple, warp in),$2B66 East Clock Down
-Cheat27_N=Put on the code on load up,After the Nintendo logo you will be in that place of Choice.you can also choose another place & then press F1 (reset) to go to that place this is for beta interest only it will not assist you in playing the game.
-Cheat28_N=With this code,load the game & put the cheat on. then press start to apear in the Demo mode.
-Cheat39_N=This code allows you to use C-Button Items where you normally can't use them. (Created by: The Gentleman)
-Cheat41_N=Only put the Deity Link's Sword on, if using The Play As Fierce Deity Link Code, if not it will turn Fierce Deity Link into a crazed slashing Machine. You have been warned.
-Cheat43_N=Put this code on and it will now take where you wanted to go, turn it back off or it will infinite loop entering all the time.
-
-//----
-
-[EC7011B7-7616D72B-C:45]
-Name=Legend of Zelda, The - Ocarina of Time (U) (V1.0)
-Cheat0="Infinite\Rupees",E96510F4 5959
-Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
-Cheat1="Press R\For Old Or Young Link",D01C84B5 0010,E865FC29 59??
-Cheat1_O=$59 Link Young,$5A Link Old
-Cheat1_N=To Activate this Cheat Hold The R Button when walking through a Doorway this will change you to the option on the other side, Disable this Cheat straight away after getting to the other side, in some places you might even get Access Violations. Just press ok untill you can carry on.
-Cheat2="Use Any Item In Any House",E9650A46 595A,E9650A4C 595A
-Cheat3="Have\All Equipment",E965F9C4 C8C7
-Cheat4="Have\All Quest/Status Items",E965F9CC 894F,E965F9CA 504F
-Cheat5="Max\Heart Containers",E965FC52 5A9A
-Cheat6="Max\Gold Skulltulas Killed",E865F9F7 59B6
-Cheat7="Time of Day Modifier",E965FC34 ????
-Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
-Cheat8="Infinite\Energy",E965F958 5A9A
-Cheat9="Infinite\Magic",D011A609 0008,E865F95E 5959,E865F964 5959,E865F955 59BA
-Cheat10="Tunic & Boot Options",E865F998 59??
-Cheat11="Infinite\Deku Sticks",E865F9B4 5961
-Cheat12="Infinite\Deku Nuts",E865F9B3 5961
-Cheat13="Infinite\Bombs",E865F9B2 5961
-Cheat14="Infinite\Arrows",E865F9B1 5961
-Cheat15="Infinite\Deku Seeds",E865F9B6 5961
-Cheat16="Infinite\Bombchu's",E865F9BC 5961
-Cheat17="Infinite\Magic Beans",E865F9BE 5961
-Cheat18="Infinite\Big Key,Small Keys,Compass,& Map",E865F9D0 5957,E865F9CF 5957,E865F9CE 5957,E865F9CD 5957,E865F9D4 5957,E865F9D3 5957,E865F9D2 5957,E865F9D1 5957,E865F9D8 5957,E865F9D7 5957,E865F9D6 5957,E865F9E1 5961,E865F9E8 5961,E865F9E7 5961,E865F9E6 5961,E865F9E5 5961,E865F9EF 5961,E865F9F4 5961,E865F9E9 5961
-Cheat19="Have\Ocarina",E865F99D 59??
-Cheat20="Have\Boomerang",E865F9A8 5960
-Cheat21="Have\Lens of Truth",E865F9A7 595F
-Cheat22="Have\Megaton Hammer",E865F9A5 5969
-Cheat23="Have\Deku Stick",E865F99C 595A
-Cheat24="Have\Deku Nut",E865F99B 5959
-Cheat25="Have\Bombs",E865F99A 595C
-Cheat26="Have\Fairy Bow",E865F999 595B
-Cheat27="Have\Fairy Slingshot",E865F99E 5958
-Cheat28="Have\Bombchu",E865F9A4 5961
-Cheat29="Have\Arrows\Fire Arrow",E865F9A0 5956
-Cheat30="Have\Arrows\Ice Arrow",E865F9A2 595E
-Cheat31="Have\Arrows\Light Arrow",E865F9AC 596C
-Cheat32="Have\Hookshot",E865F9A3 59??
-Cheat33="Have\Magic Beans",E865F9A6 596A
-Cheat34="Have\Magic\Fairie's Wind",E865F9A1 595D
-Cheat35="Have\Magic\Nayru's Love",E865F9AB 596B
-Cheat36="Have\Magic\Din's Fire",E865F99F 5955
-Cheat37="Bottles\Bottle 1 Modifier",E865F9AA 59??
-Cheat38="Bottles\Bottle 2 Modifier",E865F9A9 59??
-Cheat39="Bottles\Bottle 3 Modifier",E865F9B0 59??
-Cheat40="Bottles\Bottle 4 Modifier",E865F9AF 59??
-Cheat41="Trading\Adult Link Item",E865F9AE 59??
-Cheat42="Trading\Young Link Item",E865F9AD 59??
-Cheat43="Turn Giant's Knife Into Biggoron's Sword",E865F962 5959
-Cheat44="Have Quiver (Holds 30)",E865F9C7 5959
-Cheat45="Equipment Modifier 1",E865F9C6 59??
-Cheat46="Equipment Modifier 2",E865F9C5 59??
-Cheat47="Press L\To Levitate",D01C84B5 0020,E971FDE8 9923
-Cheat47_N=Press L To Levitate & Let go to land
-Cheat48="Press L\For infinite Hover Boots",D01C84B5 0020,E9710506 595D
-Cheat48_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
-Cheat49="Instant Step Hoover Boots",D01C84B5 0020,E971FDE8 9923,D01C84B5 0000,E9710506 595D,E865F998 59??
-Cheat49_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat49_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
-Cheat50="Beta\Play Beta Quest Worlds",D01C84B5 0000,E8651035 59??
-Cheat50_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
-Cheat50_N=Put on the code on load up,After the Nintendo logo you will be in Beta Mode,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
-Cheat51="Warp Song Location\Minuet of Forest & Serenade of Water",E86510BB 59??
-Cheat51_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
-Cheat51_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat52="Warp Song Location\Prelude of Light & Nocturne of Shadow",E86510BB 59??
-Cheat52_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
-Cheat52_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat53="Warp Song Location\Bolero of Fire",E86510BB 59??
-Cheat53_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
-Cheat53_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat54="Warp Song Location\Requiem of Spirit",E86510BB 59??
-Cheat54_O=$55 Lake Hylia,08 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
-Cheat54_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat55="Max\Double Defense Power",E865F9F1 5966
-Cheat55_N=This gives you White Border Hearts
-Cheat56="Nayru's Love is Always",E96510F0 ????
-Cheat56_O=$595A OFF,$504F ON
-Cheat56_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
-Cheat57="Infinite\Timers\All Other Timers",E86510F7 598C
-Cheat57_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
-Cheat58="Epona\Max Carrots\Lon Lon Raunch",E8737560 5955,E87443E0 5955
-Cheat58_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
-Cheat59="Infinite\Timers\Escape From Gannons Tower",E86510FB 5906
-Cheat59_N=This cheat works only on The Final Boss.
-Cheat60="Beta\Specific things lean",E858A96C 5959
-Cheat60_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest 01).
-Cheat61="Beta\Appear in Strange Places (Hold R)",D01C84B5 0010,E965108A 5959
-Cheat61_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
-Cheat62="Beta\Interface always off/on",E8650B0F 594F,E8651081 59??
-Cheat62_O=$5A Off,$59 On
-Cheat62_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset.
-Cheat63="Always Have Wallet Size",E865F9C6 59??
-Cheat63_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
-Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
-Cheat32_O=$64 Hookshot,$63 Longshot
-Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
-Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
-Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
-Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
-Cheat2_N=do not use under or in water
-Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
-Cheat45_N=This modifies the equipment you are carrying.
-Cheat46_N=This modifies the equipment you are carrying.
-Cheat64="Press L+R For FMV Select",D01C84B5 0030,E965FC26 59FA,D01C84B5 0030,E965FC2E ????
-Cheat64_O=$504A Triforce FMV,$5049 fire FMV,$504C Triforce FMV,$504B Ganondorf FMV,$5046 Planet Making FMV,$5045 Fire FMV,$5048 Ganondorf FMV,$5047 More Triforce FMV,$5052 Ending
-Cheat64_N=Hold down `L+R' after the Nintendo logo is spinning to see your favourite FMV
-Cheat65="Dark Link\Make Dark Link Apear In TOT",E8773F61 597A,E8773F6B 598B
-Cheat66="Dark Link\Play As Dark Link",D01C84B5 0020,E971FEB8 D970,D01C84B5 0020,E973837C D96D,D01C84B5 0020,E973837A 038A,D01C84B5 0020,E972F73C D970,D01C84B5 0020,E972F73A A4BA,D01C84B5 0020,E9749EB8 595A,D01C84B5 0020,E9749EB6 5B4F,D01C84B5 0020,E971FD88 598B,D01C84B5 0020,E971FD86 6259,D01C84B5 0020,E971FEB6 783A,D01C84B5 0020,E974A3E8 D961,D01C84B5 0020,E974A3E6 C89A,D01C84B5 0020,E972DA68 D970,D01C84B5 0020,E972DA66 A4BA
-
-//----
-
-[D43DA81F-021E1E19-C:45]
-Name=Legend of Zelda, The - Ocarina of Time (U) (V1.1)
-Cheat0="Infinite\Rupees",E9650EB4 5959
-Cheat1="Press R\For Old Or Young Link",D01C8675 0010,E865FAE9 59??
-Cheat1_O=$59 Link Young,$5A Link Old
-Cheat1_N=To Activate this Cheat Hold The R Button when walking through a Doorway this will change you to the option on the other side, Disable this Cheat straight away after getting to the other side, in some places you might even get Access Violations. Just press ok untill you can carry on.
-Cheat2="Use Any Item In Any House",E9651006 595A,E965100C 595A
-Cheat3="Have\All Equipment",E965FF84 C8C7
-Cheat4="Have\All Quest/Status Items",E965FF8C 894F,E965FF8A 504F
-Cheat5="Max\Heart Containers",E965FA12 5A9A
-Cheat6="Max\Gold Skulltulas Killed",E865FFB7 59B6
-Cheat7="Time of Day Modifier",E965FAF4 ????
-Cheat8="Infinite\Energy",E965FA18 5A9A
-Cheat9="Infinite\Magic",D011A7C9 0008,E865FA1E 5959,E865FA24 5959,E865FA15 59BA
-Cheat10="Tunic & Boot Options",E865FF58 59??
-Cheat11="Infinite\Deku Sticks",E865FF74 5961
-Cheat12="Infinite\Deku Nuts",E865FF73 5961
-Cheat13="Infinite\Bombs",E865FF72 5961
-Cheat14="Infinite\Arrows",E865FF71 5961
-Cheat15="Infinite\Deku Seeds",E865FF76 5961
-Cheat16="Infinite\Bombchu's",E865FF7C 5961
-Cheat17="Infinite\Magic Beans",E865FF7E 5961
-Cheat18="Infinite\Big Keys,Small Keys,Compass,& Map",E865FF90 5957,E865FF8F 5957,E865FF8E 5957,E865FF8D 5957,E865FF94 5957,E865FF93 5957,E865FF92 5957,E865FF91 5957,E865FF98 5957,E865FF97 5957,E865FF96 5957,E865FFA1 5961,E865FFA8 5961,E865FFA7 5961,E865FFA6 5961,E865FFA5 5961,E865FFAF 5961,E865FFB4 5961,E865FFA9 5961
-Cheat19="Have\Ocarina",E865FF5D 59??
-Cheat20="Have\Boomerang",E865FF68 5960
-Cheat21="Have\Lens of Truth",E865FF67 595F
-Cheat22="Have\Megaton Hammer",E865FF65 5969
-Cheat23="Have\Deku Stick",E865FF5C 595A
-Cheat24="Have\Deku Nut",E865FF5B 5959
-Cheat25="Have\Bombs",E865FF5A 595C
-Cheat26="Have\Fairy Bow",E865FF59 595B
-Cheat27="Have\Fairy Slingshot",E865FF5E 5958
-Cheat28="Have\Bombchu",E865FF64 5961
-Cheat29="Have\Arrows\Fire Arrow",E865FF60 5956
-Cheat30="Have\Arrows\Ice Arrow",E865FF62 595E
-Cheat31="Have\Arrows\Light Arrow",E865FF6C 596C
-Cheat32="Have\Hookshot",E865FF63 59??
-Cheat33="Have\Magic Beans",E865FF66 596A
-Cheat34="Have\Magic\Fairie's Wind",E865FF61 595D
-Cheat35="Have\Magic\Nayru's Love",E865FF6B 596B
-Cheat36="Have\Magic\Din's Fire",E865FF5F 5955
-Cheat37="Bottles\Bottle 1 Modifier",E865FF6A 59??
-Cheat38="Bottles\Bottle 2 Modifier",E865FF69 59??
-Cheat39="Bottles\Bottle 3 Modifier",E865FF70 59??
-Cheat40="Bottles\Bottle 4 Modifier",E865FF6F 59??
-Cheat41="Trading\Adult Link Item",E865FF6E 59??
-Cheat42="Trading\Young Link Item",E865FF6D 59??
-Cheat43="Turn Giant's Knife Into Biggoron's Sword",E865FA22 5959
-Cheat44="Have Quiver (Holds 30)",E865FF87 5959
-Cheat45="Equipment Modifier 1",E865FF86 59??
-Cheat46="Equipment Modifier 2",E865FF85 59??
-Cheat47="Press L To Levitate",D01C8675 0020,E97103A8 9923
-Cheat47_N=Press L To Levitate & Let go to land
-Cheat48="Press L For infinite Hover Boots",D01C8675 0020,E9710BC6 595D
-Cheat48_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
-Cheat49="Instant Step Hoover Boots",D01C8675 0020,E97103A8 9923,D01C8675 0000,E9710BC6 595D,E865FF58 59??
-Cheat49_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat49_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
-Cheat50="Beta\Play Beta Quest Worlds",D01C8675 0000,E8650EF5 59??
-Cheat50_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
-Cheat50_N=Put on the code on load up,After the Nintendo logo you will be in Hyrule Field,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
-Cheat51="Warp Song Location\Minuet of Forest & Serenade of Water",E8650E7B 59??
-Cheat51_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
-Cheat51_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat52="Warp Song Location\Prelude of Light & Nocturne of Shadow",E8650E7B 59??
-Cheat52_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
-Cheat52_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat53="Warp Song Location\Bolero of Fire",E8650E7B 59??
-Cheat53_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
-Cheat53_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat54="Warp Song Location\Requiem of Spirit",E8650E7B 59??
-Cheat54_O=$55 Lake Hylia,08 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
-Cheat54_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat55="Max\Double Defense Power",E865FFB1 5966
-Cheat55_N=This gives you White Border Hearts
-Cheat56="Nayru's Love is Always",E9650EB0 ????
-Cheat56_O=$595A OFF,$504F ON
-Cheat56_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
-Cheat57="Infinite\Timers\All Other Timers",E8650EB7 598C
-Cheat57_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
-Cheat58="Epona\Max Carrots\Lon Lon Raunch",E87389E0 5955,E8738FA0 5955
-Cheat58_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
-Cheat59="Infinite\Timers\Escape From Gannons Tower",E8650EBB 5906
-Cheat59_N=This cheat works only on The Final Boss.
-Cheat60="Beta\Specific things lean",E858AA2C 5959
-Cheat60_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest World 01)
-Cheat61="Beta\Appear in Strange Places (Hold R)",D01C8675 0010,E9650D4A 5959
-Cheat61_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
-Cheat62="Beta\Interface always off/on",E86509CF 594F,E8650D41 59??
-Cheat62_O=$5A Off,$59 On
-Cheat62_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset.
-Cheat63="Always Have Wallet Size",E865FF86 59??
-Cheat63_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
-Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
-Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
-Cheat32_O=$64 Hookshot,$63 Longshot
-Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
-Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
-Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
-Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
-Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
-Cheat2_N=do not use under or in water
-Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
-Cheat45_N=This modifies the equipment you are carrying.
-Cheat46_N=This modifies the equipment you are carrying.
-Cheat64="Press L+R For FMV Select",D01C8675 0030,E865FAE5 59FA,D01C8675 0030,E865FAED ????
-Cheat64_O=$495A riforce FMV,$4A5F ire FMV,$4B5A riforce FMV,$4C5A anondorf FMV,$455A lanet Making FMV,$465F ire FMV,$475A anondorf FMV,$485A ore Triforce FMV,$5160 nding
-Cheat64_N=Hold down `L+R' after the Nintendo logo is spinning to see your favourite FMV
-Cheat65="Dark Link\Make Dark Link Apear In TOT",E8774001 597A,E877400B 598B
-
-//----
-
-[693BA2AE-B7F14E9F-C:45]
-Name=Legend of Zelda, The - Ocarina of Time (U) (V1.2)
-Cheat0="Infinite\Rupees",E96517A4 5959
-Cheat1="Press R\For Old Or Young Link",D01C8D75 0010,E86503D9 59??
-Cheat1_O=$59 Link Young,$5A Link Old
-Cheat1_N=To Activate this Cheat Hold The R Button when walking through a Doorway this will change you to the option on the other side, Disable this Cheat straight away after getting to the other side, in some places you might even get Access Violations. Just press ok untill you can carry on.
-Cheat2="Use Any Item In Any House",E96511F6 595A,E96511FC 595A
-Cheat3="Have\All Equipment",E9650474 C8C7
-Cheat4="Have\All Quest/Status Items",E965047C 894F,E965047A 504F
-Cheat5="Max\Heart Containers",E9650302 5A9A
-Cheat6="Max\Gold Skulltulas Killed",E86504A7 59B6
-Cheat7="Time of Day Modifier",E96503E4 ????
-Cheat8="Infinite\Energy",E9650308 5A9A
-Cheat9="Infinite\Magic",D011ACB9 0008,E865030E 5959,E8650314 5959,E8650305 59BA
-Cheat10="Tunic & Boot Options",E8650348 59??
-Cheat11="Infinite\Deku Sticks",E8650464 5961
-Cheat12="Infinite\Deku Nuts",E8650463 5961
-Cheat13="Infinite\Bombs",E8650462 5961
-Cheat14="Infinite\Arrows",E8650461 5961
-Cheat15="Infinite\Deku Seeds",E8650466 5961
-Cheat16="Infinite\Bombchu's",E865046C 5961
-Cheat17="Infinite\Magic Beans",E865046E 5961
-Cheat18="Infinite\Big Key,Small Keys,Compass,& Map",E8650480 5957,E865047F 5957,E865047E 5957,E865047D 5957,E8650484 5957,E8650483 5957,E8650482 5957,E8650481 5957,E8650488 5957,E8650487 5957,E8650486 5957,E8650491 5961,E8650498 5961,E8650497 5961,E8650496 5961,E8650495 5961,E865049F 5961,E86504A4 5961,E8650499 5961
-Cheat19="Have\Ocarina",E865034D 59??
-Cheat20="Have\Boomerang",E8650458 5960
-Cheat21="Have\Lens of Truth",E8650457 595F
-Cheat22="Have\Megaton Hammer",E8650455 5969
-Cheat23="Have\Deku Stick",E865034C 595A
-Cheat24="Have\Deku Nut",E865034B 5959
-Cheat25="Have\Bombs",E865034A 595C
-Cheat26="Have\Fairy Bow",E8650349 595B
-Cheat27="Have\Fairy Slingshot",E865034E 5958
-Cheat28="Have\Bombchu",E8650354 5961
-Cheat29="Have\Arrows\Fire Arrow",E8650350 5956
-Cheat30="Have\Arrows\Ice Arrow",E8650352 595E
-Cheat31="Have\Arrows\Light Arrow",E865045C 596C
-Cheat32="Have\Hookshot",E8650353 59??
-Cheat33="Have\Magic Beans",E8650456 596A
-Cheat34="Have\Magic\Fairie's Wind",E8650351 595D
-Cheat35="Have\Magic\Nayru's Love",E865045B 596B
-Cheat36="Have\Magic\Din's Fire",E865034F 5955
-Cheat37="Bottles\Bottle 1 Modifier",E865045A 59??
-Cheat38="Bottles\Bottle 2 Modifier",E8650459 59??
-Cheat39="Bottles\Bottle 3 Modifier",E8650460 59??
-Cheat40="Bottles\Bottle 4 Modifier",E865045F 59??
-Cheat41="Trading\Adult Link Item",E865045E 59??
-Cheat42="Trading\Young Link Item",E865045D 59??
-Cheat43="Turn Giant's Knife Into Biggoron's Sword",E8650312 5959
-Cheat44="Have Quiver (Holds 30)",E8650477 5959
-Cheat45="Equipment Modifier 1",E8650476 59??
-Cheat46="Equipment Modifier 2",E8650475 59??
-Cheat47="Press L To Levitate",D01C8D75 0020,E97106A8 9923
-Cheat47_N=Press L To Levitate & Let go to land
-Cheat48="Press L For infinite Hover Boots",D01C8D75 0020,E9710EC6 595D
-Cheat48_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
-Cheat49="Instant Step Hoover Boots",D01C8D75 0020,E97106A8 9923,D01C8D75 0000,E9710EC6 595D,E8650348 59??
-Cheat49_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat49_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
-Cheat50="Beta\Play Beta Quest Worlds",D01C8D75 0000,E86517E5 59??
-Cheat50_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
-Cheat50_N=Put on the code on load up,After the Nintendo logo you will be in Hyrule Field,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
-Cheat51="Warp Song Location\Minuet of Forest & Serenade of Water",E865176B 59??
-Cheat51_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
-Cheat51_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat52="Warp Song Location\Prelude of Light & Nocturne of Shadow",E865176B 59??
-Cheat52_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
-Cheat52_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat53="Warp Song Location\Bolero of Fire",E865176B 59??
-Cheat53_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
-Cheat53_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat54="Warp Song Location\Requiem of Spirit",E865176B 59??
-Cheat54_O=$55 Lake Hylia,08 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
-Cheat54_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat55="Max\Double Defense Power",E86504A1 5966
-Cheat55_N=This gives you White Border Hearts
-Cheat56="Nayru's Love is Always",E96517A0 ????
-Cheat56_O=$595A OFF,$504F ON
-Cheat56_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
-Cheat57="Infinite\Timers\All Other Timers",E8651567 598C
-Cheat57_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
-Cheat58="Epona\Max Carrots\Lon Lon Raunch",E8739490 5955,E8739150 5955
-Cheat58_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
-Cheat59="Infinite\Timers\Escape From Gannons Tower",E865156B 5906
-Cheat59_N=This cheat works only on The Final Boss.
-Cheat60="Beta\Specific things lean",E858B31C 5959
-Cheat60_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest World 01)
-Cheat61="Beta\Appear in Strange Places (Hold R)",D01C8B65 0010,E965123A 5959
-Cheat61_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
-Cheat62="Beta\Interface always off/on",E8650EBF 594F,E8651231 59??
-Cheat62_O=$5A Off,$59 On
-Cheat62_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset,
-Cheat63="Always Have Wallet Size",E8650476 59??
-Cheat63_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
-Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
-Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
-Cheat32_O=$64 Hookshot,$63 Longshot
-Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
-Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
-Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
-Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
-Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
-Cheat2_N=do not use under or in water
-Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
-Cheat45_N=This modifies the equipment you are carrying.
-Cheat46_N=This modifies the equipment you are carrying.
-Cheat64="Press L+R For FMV Select",D01C8D75 0030,E86503D5 59FA,D01C8D75 0030,E86503DD ????
-Cheat64_O=$495A riforce FMV,$4A5F ire FMV,$4B5A riforce FMV,$4C5A anondorf FMV,$455A lanet Making FMV,$465F ire FMV,$475A anondorf FMV,$485A ore Triforce FMV,$5160 nding
-Cheat64_N=Hold down `L+R' after the Nintendo logo is spinning to see your favourite FMV
-Cheat65="Dark Link\Make Dark Link Apear In TOT",E8774211 597A,E877421B 598B
-
-//----
-
 [096A40EA-8ABE0A10-C:45]
-Name=LEGO Racers (U)
+Name=LEGO Racers (U) (M10)
 Cheat0="Have All Tracks and Building Pieces",E979C92C 504F,E979C92A 504F
 
 //----
 
 [255018DF-57D6AE3A-C:45]
-Name=Lode Runner 3D (U)
+Name=Lode Runner 3-D (U)
 Cheat0="Infinite Lives",E86980F1 59BB
 Cheat1="High Gold",E8697D51 598C,E869808D 598C
 Cheat2="All Navigation Pieces",E86980DD 5955
@@ -5836,8 +5479,26 @@ Cheat13="Infinite Time",E967DE7E 5862
 
 //----
 
+[13836389-265B3C76-C:45]
+Name=Madden Football 64 (U)
+Cheat0="Infinite\Time Outs Home Team",E85E84E9 595B
+Cheat1="Infinite\Time Outs Away Team",E85EA135 595B
+Cheat2="No Time-Outs\Home Team",E85E84E9 595A
+Cheat3="No Time-Outs\Away Team",E85EA135 595A
+Cheat4="Enable\All Stadiums",50000901 0000,10073510 00FF
+Cheat5="Enable\All Teams",50000901 0000,10073CF8 00FF
+Cheat6="Invisible Players",E8599CF8 595A,E8599CF8 5959,E8599CF8 595C,E8599CF8 595B
+Cheat7="Background\Gray Madden",E959E938 595A
+Cheat8="Background\Pink Madden",E959E938 5959
+Cheat9="Background\Green & Black Madden",E959E938 595C
+Cheat10="Background\Coloured Madden",E959E938 595B
+Cheat11="Background\Pink & Purple Madden",E959E938 5956
+Cheat12="Background\Pinker Madden",E959E938 5958
+
+//----
+
 [0CB81686-5FD85A81-C:45]
-Name=Madden 2000 (U)
+Name=Madden NFL 2000 (U)
 Cheat0="Enable\Stadium\Dodge City",E859E8F0 594F
 Cheat1="Enable\Stadium\Xmas Rush",E859E8EF 594F
 Cheat2="Enable\Stadium\Tib Bros",E859E8EE 594F
@@ -6005,21 +5666,18 @@ Cheat163="Players\Super Red",E8594B92 595C
 
 //----
 
-[13836389-265B3C76-C:45]
-Name=Madden Football 64 (U)
-Cheat0="Infinite\Time Outs Home Team",E85E84E9 595B
-Cheat1="Infinite\Time Outs Away Team",E85EA135 595B
-Cheat2="No Time-Outs\Home Team",E85E84E9 595A
-Cheat3="No Time-Outs\Away Team",E85EA135 595A
-Cheat4="Enable\All Stadiums",50000901 0000,10073510 00FF
-Cheat5="Enable\All Teams",50000901 0000,10073CF8 00FF
-Cheat6="Invisible Players",E8599CF8 595A,E8599CF8 5959,E8599CF8 595C,E8599CF8 595B
-Cheat7="Background\Gray Madden",E959E938 595A
-Cheat8="Background\Pink Madden",E959E938 5959
-Cheat9="Background\Green & Black Madden",E959E938 595C
-Cheat10="Background\Coloured Madden",E959E938 595B
-Cheat11="Background\Pink & Purple Madden",E959E938 5956
-Cheat12="Background\Pinker Madden",E959E938 5958
+[EB38F792-190EA246-C:45]
+Name=Madden NFL 2001 (U)
+Cheat0="Home Team\Infinite Time-Outs",E85B6969 595B
+Cheat1="Home Team\No Time-Outs",E85B6969 595A
+Cheat2="Away Team\Infinite Time-Outs",E85B8F39 595B
+Cheat3="Away Team\No Time-Outs",E85B8F39 595A
+Cheat5="Have All\Cheats",50000402 0000,11070788 FFFF
+Cheat6="Have 99 Tokens",E9695048 59BB
+Cheat7="Have All\Stadiums",50000802 0000,11061850 FFFF
+Cheat8="Have All\Teams",50001102 0000,110C1628 FFFF
+Cheat9="Have All\Levels Completed",50001902 0000,1115FB2C FFFF
+Cheat10="Have All\Cards",50007802 0000,1115F9F2 FFFF
 
 //----
 
@@ -6050,21 +5708,6 @@ Cheat21="Press L For More Time To Choose Play\Player 4",D0066F45 0020,E85C659B 5
 
 //----
 
-[EB38F792-190EA246-C:45]
-Name=Madden NFL 2001 (U)
-Cheat0="Home Team\Infinite Time-Outs",E85B6969 595B
-Cheat1="Home Team\No Time-Outs",E85B6969 595A
-Cheat2="Away Team\Infinite Time-Outs",E85B8F39 595B
-Cheat3="Away Team\No Time-Outs",E85B8F39 595A
-Cheat5="Have All\Cheats",50000402 0000,11070788 FFFF
-Cheat6="Have 99 Tokens",E9695048 59BB
-Cheat7="Have All\Stadiums",50000802 0000,11061850 FFFF
-Cheat8="Have All\Teams",50001102 0000,110C1628 FFFF
-Cheat9="Have All\Levels Completed",50001902 0000,1115FB2C FFFF
-Cheat10="Have All\Cards",50007802 0000,1115F9F2 FFFF
-
-//----
-
 [75B61647-7ADABF78-C:45]
 Name=Magical Tetris Challenge (U)
 Cheat0="Always Get\Magical Tetris Pieces",E97179D2 347A
@@ -6479,7 +6122,14 @@ Cheat0="Bowl A Perfect Game",5000090C 0000,100AC9F0 000A,E8601DB2 5964
 //----
 
 [0B93051B-603D81F9-C:45]
-Name=Mischief Makers (U)
+Name=Mischief Makers (U) (V1.0)
+Cheat0="Infinite\Red Gems",E96BAEBA 785F
+Cheat1="Infinite\Health",E9642738 5C42
+
+//----
+
+[BFA526B4-0691E430-C:45]
+Name=Mischief Makers (U) (V1.1)
 Cheat0="Infinite\Red Gems",E96BAEBA 785F
 Cheat1="Infinite\Health",E9642738 5C42
 
@@ -6501,7 +6151,7 @@ Cheat6_N=This will allow you to pass through anything & even walk on water.if yo
 //----
 
 [5AC383E1-D712E387-C:45]
-Name=Monopoly (U)
+Name=Monopoly (U) (M2)
 Cheat0="Infinite\Money\Player 1",E9889E9A 785F
 Cheat1="Infinite\Money\Player 2",E9889EAE 785F
 Cheat2="Infinite\Money\Player 3",E9889EC2 785F
@@ -6546,7 +6196,25 @@ Cheat3="Max Experience",E9657762 4DF4
 //----
 
 [D9F75C12-A8859B59-C:45]
-Name=Mortal Kombat Trilogy (U) (v1.0)
+Name=Mortal Kombat Trilogy (U) (V1.0)
+Cheat0="Player 1\No Energy",E86CEFA3 595A
+Cheat1="Player 2\No Energy",E86CEE77 595A
+Cheat2="Player 2\Unlimited Energy",E86CEE77 59F8
+Cheat3="Player 1\Unlimited Energy",E86CEFA3 59F8
+
+//----
+
+[19F55D46-73A27B34-C:45]
+Name=Mortal Kombat Trilogy (U) (V1.1)
+Cheat0="Player 1\No Energy",E86CEFA3 595A
+Cheat1="Player 2\No Energy",E86CEE77 595A
+Cheat2="Player 2\Unlimited Energy",E86CEE77 59F8
+Cheat3="Player 1\Unlimited Energy",E86CEFA3 59F8
+
+//----
+
+[83F33AA9-A901D40D-C:45]
+Name=Mortal Kombat Trilogy (U) (V1.2)
 Cheat0="Player 1\No Energy",E86CEFA3 595A
 Cheat1="Player 2\No Energy",E86CEE77 595A
 Cheat2="Player 2\Unlimited Energy",E86CEE77 59F8
@@ -6657,15 +6325,6 @@ Cheat26="Pole Position\Score",E966CE50 F2F1
 
 //----
 
-[23749578-80DC58FD-C:45]
-Name=NASCAR 99 (U)
-Cheat0="1 Lap to Race",E85A8F05 5961,D021FBAB 0000,E8754EFD 5962,D022359B 0000,E8788CED 5962
-Cheat1="Total Laps to Race Modifier",E85A8F05 59??
-Cheat1_O=$59 1 lap,$5C 2 lap,$5B 3 lap,$56 4 lap,$55 5 lap,$58 6 lap,$57 7 lap,$62 8 lap,$61 9 lap
-Cheat2="Max Gear Ratios",E962F1E8 D070,E962F1D6 C9CF
-
-//----
-
 [DF331A18-5FD4E044-C:45]
 Name=NASCAR 2000 (U)
 Cheat0="Total Number Of Laps",E85ABCA5 59??
@@ -6684,6 +6343,15 @@ Cheat10="Have CPU Control Car Player 1",D0092985 0020,E86923B4 5959,D0092985 001
 
 //----
 
+[23749578-80DC58FD-C:45]
+Name=NASCAR 99 (U)
+Cheat0="1 Lap to Race",E85A8F05 5961,D021FBAB 0000,E8754EFD 5962,D022359B 0000,E8788CED 5962
+Cheat1="Total Laps to Race Modifier",E85A8F05 59??
+Cheat1_O=$59 1 lap,$5C 2 lap,$5B 3 lap,$56 4 lap,$55 5 lap,$58 6 lap,$57 7 lap,$62 8 lap,$61 9 lap
+Cheat2="Max Gear Ratios",E962F1E8 D070,E962F1D6 C9CF
+
+//----
+
 [4E69B487-FE18E290-C:45]
 Name=NBA Hangtime (U)
 Cheat0="Team 1 Scores 150 pts",E860B9DF 59E8
@@ -6691,41 +6359,6 @@ Cheat1="Team 2 Scores 150 pts",E860B9DD 59E8
 
 //----
 
-[EBEEA8DB-F2ECB23C-C:45]
-Name=NBA JAM 2000
-Cheat0="Infinite Shot Clock",E867CF31 5968
-Cheat1="Infinite Violation Clock",E867CF8D 59AD
-Cheat2="Infinite Turbo\Team 1\Player 1",E9690C66 505A
-Cheat3="Infinite Turbo\Team 1\Player 2",E9690C6A 505A
-Cheat4="Team 1 Score Select",E867C869 59??
-Cheat4_O=$5A 00,$E8 150
-Cheat5="Infinite Turbo\Team 2\Player 1",E9690C5E 505A
-Cheat6="Infinite Turbo\Team 2\Player 2",E9690C62 505A
-Cheat7="Team 2 Score Select",E867C865 59??
-Cheat7_O=$5A 00,$E8 150
-
-//----
-
-[810729F6-E03FCFC1-C:45]
-Name=NBA Jam 99 (U)
-Cheat0="Home Team\Scores 150",E96C624E 59E8
-Cheat1="Home Team\Scores 0",E96C624E 595A
-Cheat2="Away Team\Scores 150",E96C6252 59E8
-Cheat3="Home Team\Scores 0",E96C6252 595A
-Cheat4="Infinite\Time Outs\Home",E861B3CB 5957
-Cheat5="No Time Outs\Home",E861B3D1 595A
-Cheat6="Infinite\Time Outs\Away",E861B3ED 5957
-Cheat7="No Time Outs\Away",E861B3ED 595A
-Cheat8="Away Team\Full Court Dunks",E96E81A2 5956,E96E87AE 5956,E96E85BA 5956,E96E8BC6 5956,E96E89D2 5956
-Cheat9="Away Team\Giant Players",E96E844A 598C,E96E8452 598E,E96E8756 598C,E96E875E 598E,E96E8562 598C,E96E856A 598E,E96E8B6E 598C,E96E8B76 598E,E96E897A 598C,E96E8982 598E
-Cheat10="Away Team\Tiny Players",E96E844A 5969,E96E8452 5966,E96E8756 5969,E96E875E 5966,E96E8562 5969,E96E856A 5966,E96E8B6E 5969,E96E8B76 5966,E96E897A 5969,E96E8982 5966
-Cheat11="Creation Points (L / R)",D0061269 0020,E96B3760 5B5A,D0061269 0010,E96B3760 595A
-Cheat12="Home Team\Full Court Dunks",E96E7B66 5956,E96E7972 5956,E96E7F7E 5956,E96E7D8A 5956,E96E8396 5956
-Cheat13="Home Team\Giant Players",E96E760E 598C,E96E7616 598E,E96E7C1A 598C,E96E7C22 598E,E96E7A26 598C,E96E7A2E 598E,E96E8032 598C,E96E803A 598E,E96E7E3E 598C,E96E7E46 598E
-Cheat14="Home Team\Tiny Players",E96E760E 5969,E96E7616 5966,E96E7C1A 5969,E96E7C22 5966,E96E7A26 5969,E96E7A2E 5966,E96E8032 5969,E96E803A 5966,E96E7E3E 5969,E96E7E46 5966
-
-//----
-
 [6A121930-665CC274-C:45]
 Name=NBA In The Zone '98 (U)
 Cheat0="Options\FT. Penalty Situations",E86AA0EF 59??
@@ -6809,8 +6442,43 @@ Cheat12="Create A Player Codes\Max Capaility",E882B256 59BB
 
 //----
 
+[EBEEA8DB-F2ECB23C-C:45]
+Name=NBA Jam 2000 (U)
+Cheat0="Infinite Shot Clock",E867CF31 5968
+Cheat1="Infinite Violation Clock",E867CF8D 59AD
+Cheat2="Infinite Turbo\Team 1\Player 1",E9690C66 505A
+Cheat3="Infinite Turbo\Team 1\Player 2",E9690C6A 505A
+Cheat4="Team 1 Score Select",E867C869 59??
+Cheat4_O=$5A 00,$E8 150
+Cheat5="Infinite Turbo\Team 2\Player 1",E9690C5E 505A
+Cheat6="Infinite Turbo\Team 2\Player 2",E9690C62 505A
+Cheat7="Team 2 Score Select",E867C865 59??
+Cheat7_O=$5A 00,$E8 150
+
+//----
+
+[810729F6-E03FCFC1-C:45]
+Name=NBA Jam 99 (U)
+Cheat0="Home Team\Scores 150",E96C624E 59E8
+Cheat1="Home Team\Scores 0",E96C624E 595A
+Cheat2="Away Team\Scores 150",E96C6252 59E8
+Cheat3="Home Team\Scores 0",E96C6252 595A
+Cheat4="Infinite\Time Outs\Home",E861B3CB 5957
+Cheat5="No Time Outs\Home",E861B3D1 595A
+Cheat6="Infinite\Time Outs\Away",E861B3ED 5957
+Cheat7="No Time Outs\Away",E861B3ED 595A
+Cheat8="Away Team\Full Court Dunks",E96E81A2 5956,E96E87AE 5956,E96E85BA 5956,E96E8BC6 5956,E96E89D2 5956
+Cheat9="Away Team\Giant Players",E96E844A 598C,E96E8452 598E,E96E8756 598C,E96E875E 598E,E96E8562 598C,E96E856A 598E,E96E8B6E 598C,E96E8B76 598E,E96E897A 598C,E96E8982 598E
+Cheat10="Away Team\Tiny Players",E96E844A 5969,E96E8452 5966,E96E8756 5969,E96E875E 5966,E96E8562 5969,E96E856A 5966,E96E8B6E 5969,E96E8B76 5966,E96E897A 5969,E96E8982 5966
+Cheat11="Creation Points (L / R)",D0061269 0020,E96B3760 5B5A,D0061269 0010,E96B3760 595A
+Cheat12="Home Team\Full Court Dunks",E96E7B66 5956,E96E7972 5956,E96E7F7E 5956,E96E7D8A 5956,E96E8396 5956
+Cheat13="Home Team\Giant Players",E96E760E 598C,E96E7616 598E,E96E7C1A 598C,E96E7C22 598E,E96E7A26 598C,E96E7A2E 598E,E96E8032 598C,E96E803A 598E,E96E7E3E 598C,E96E7E46 598E
+Cheat14="Home Team\Tiny Players",E96E760E 5969,E96E7616 5966,E96E7C1A 5969,E96E7C22 5966,E96E7A26 5969,E96E7A2E 5966,E96E8032 5969,E96E803A 5966,E96E7E3E 5969,E96E7E46 5966
+
+//----
+
 [5F25B0EE-6227C1DB-C:45]
-Name=NBA Live 2000 (U)
+Name=NBA Live 2000 (U) (M4)
 Cheat0="Home Team\Infinite Time Outs",E9679B28 585A
 Cheat1="Home Team\No Time Outs",E9679B28 595A
 Cheat2="Away Team\Infinite Time Outs",E967A7F0 585A
@@ -6838,23 +6506,6 @@ Cheat23="Max\Shooting Range",E86B0A12 59B6
 
 //----
 
-[6DFDCDC3-4DE701C8-C:45]
-Name==NHL Breakaway 98 (U)
-Cheat0="Activate Cheat Menu",E8599290 5959
-Cheat1="Home Team Goals",E8680E14 59??
-Cheat1_O=$5A No Score,$4F Max Score
-Cheat2="Away Team Goals",E8680E13 59??
-Cheat2_O=$5A No Score,$4F Max Score
-
-//----
-
-[82EFDC30-806A2461-C:45]
-Name=NHL Blades Of Steel '99 (U)
-Cheat3="Home Team Scores 50",E873BB5A 598C,E8765B11 598C
-Cheat1="Away Team Scores 50",E873BB59 598C,E8765B18 598C
-
-//----
-
 [36FA35EB-E85E2E36-C:45]
 Name=NFL Blitz 2001 (U)
 Cheat0="Fire Team 1\Player 1",E864171D 59??
@@ -6868,21 +6519,21 @@ Cheat3="Infinite Turbo\Player 2",E93418BC 9B22,E93418BA 595A
 
 [E3AB4ED0-83040DD2-C:45]
 Name=NFL Quarterback Club 2000 (U)
-Cheat0="Max Clu",E85BA5CB 59BB
-Cheat1="Max End",E85BA5D3 59BB
-Cheat2="Max Hnd",E85BA5CF 59BB
-Cheat3="Max Rcg",E85BA5C5 59BB
-Cheat4="Max Rng",E85BA5C1 59BB
-Cheat5="Max Scr",E85BA5C7 59BB
-Cheat6="Max Spd",E85BA5C9 59BB
-Cheat7="Home Team\No Time Outs",E859A0AA 595A
-Cheat8="Away Team\No Time Outs Away",E859A12A 595A
-Cheat9="Infinite Creation Points",E95B06C2 5C37
-Cheat10="Home Team\Infinite Time Outs",E859A0AA 595B
-Cheat11="Away Team\Infinite Time Outs",E859A12A 595B
-Cheat12="Infinite Time To Choose Play",E95E6BA0 815A
-Cheat13="Max Acc",E85BA5C3 59B6
-Cheat14="Max Cat",E85BA5CD 59BB
+Cheat0="Home Team\Infinite Time Outs",E859A0AA 595B
+Cheat1="Home Team\No Time Outs",E859A0AA 595A
+Cheat2="Away Team\Infinite Time Outs",E859A12A 595B
+Cheat3="Away Team\No Time Outs",E859A12A 595A
+Cheat4="Infinite\Time To Choose Play",E95E6BA0 815A
+Cheat5="Max\Acc",E85BA5C3 59B6
+Cheat6="Max\Cat",E85BA5CD 59BB
+Cheat7="Max\Clu",E85BA5CB 59BB
+Cheat8="Max\End",E85BA5D3 59BB
+Cheat9="Max\Hnd",E85BA5CF 59BB
+Cheat10="Max\Rcg",E85BA5C5 59BB
+Cheat11="Max\Rng",E85BA5C1 59BB
+Cheat12="Max\Scr",E85BA5C7 59BB
+Cheat13="Max\Spd",E85BA5C9 59BB
+Cheat14="Infinite\Creation Points",E95B06C2 5C37
 
 //----
 
@@ -6912,29 +6563,20 @@ Cheat12="Max\Endurance",E95C541C 59B6
 
 //----
 
-[E3AB4ED0-83040DD2-C:45]
-Name=NFL Quarterback Club 2000 (U)
-Cheat0="Home Team\Infinite Time Outs",E859A0AA 595B
-Cheat1="Home Team\No Time Outs",E859A0AA 595A
-Cheat2="Away Team\Infinite Time Outs",E859A12A 595B
-Cheat3="Away Team\No Time Outs",E859A12A 595A
-Cheat4="Infinite\Time To Choose Play",E95E6BA0 815A
-Cheat5="Max\Acc",E85BA5C3 59B6
-Cheat6="Max\Cat",E85BA5CD 59BB
-Cheat7="Max\Clu",E85BA5CB 59BB
-Cheat8="Max\End",E85BA5D3 59BB
-Cheat9="Max\Hnd",E85BA5CF 59BB
-Cheat10="Max\Rcg",E85BA5C5 59BB
-Cheat11="Max\Rng",E85BA5C1 59BB
-Cheat12="Max\Scr",E85BA5C7 59BB
-Cheat13="Max\Spd",E85BA5C9 59BB
-Cheat14="Infinite\Creation Points",E95B06C2 5C37
+[82EFDC30-806A2461-C:45]
+Name=NHL Blades Of Steel '99 (U)
+Cheat3="Home Team Scores 50",E873BB5A 598C,E8765B11 598C
+Cheat1="Away Team Scores 50",E873BB59 598C,E8765B18 598C
 
 //----
 
-[2153143F-992D6351-C:45]
-Name=New Tetris, The (U)
-Cheat0="Press L + C-Down For Cheat Screen",D01101B3 0024,E9571238 595A,D01101B3 0024,E9571236 595A
+[6DFDCDC3-4DE701C8-C:45]
+Name==NHL Breakaway 98 (U)
+Cheat0="Activate Cheat Menu",E8599290 5959
+Cheat1="Home Team Goals",E8680E14 59??
+Cheat1_O=$5A No Score,$4F Max Score
+Cheat2="Away Team Goals",E8680E13 59??
+Cheat2_O=$5A No Score,$4F Max Score
 
 //----
 
@@ -7118,7 +6760,7 @@ Cheat8_N=Multiplayer Mode Only for Player 2
 //----
 
 [E6419BC5-69011DE3-C:45]
-Name=Ogre Battle 64 - Person of Lordly Caliber (U)
+Name=Ogre Battle 64 - Person of Lordly Caliber (U) (V1.0)
 Cheat0="Infinite Goth",E96DBDC2 504F
 Cheat1="Max Goth",E96DBDC4 59F2,E96DBDC2 E7CF
 Cheat2="Open All Paths",E96DBDD8 5A4F,E96DBDD6 B8CF,E96DBDDC 4D4F
@@ -7138,18 +6780,24 @@ Cheat15="Magnus\Max Dex",E96D9372 5C37
 
 //----
 
-[3E198D9E-F2E1267E-C:45]
-Name=Paperboy (U)
-Cheat0="Enable Level Select",E85CFC49 5959
-Cheat0_N=Also accesses All Bonus Levels
-Cheat1="Invincibility",E97CDF52 5959
-Cheat2="Infinite Newspapers",E97CDE66 5959
-Cheat3="Big Newspapers",E97CDEAE 5959
-Cheat4="Turbo Mode",E97CDE8A 5959
-Cheat5="Super Jump Springs",E97CDE8E 5959
-Cheat6="Rocket Boosters",E97CDE92 5959
-Cheat7="99 Total Houses",E95CFCBE 59BB
-Cheat8="Infinite Health",E85CFC26 59B6
+[0ADAECA7-B17F9795-C:45]
+Name=Ogre Battle 64 - Person of Lordly Caliber (U) (V1.1)
+Cheat0="Infinite Goth",E96DBDC2 504F
+Cheat1="Max Goth",E96DBDC4 59F2,E96DBDC2 E7CF
+Cheat2="Open All Paths",E96DBDD8 5A4F,E96DBDD6 B8CF,E96DBDDC 4D4F
+Cheat3="Finish All Levels",E96DBDDA A5A6,E96DBDE0 AA9A,E96DBDDE 96A5,E96DBDE4 E666,E96DBDE2 A665
+Cheat4="Always Have Retreat & Elem Pedra Opened",D01A1C72 0000,E97073C6 595B
+Cheat5="Hour Always 00",E96DBD84 595A
+Cheat6="Day Always 00",E97367C4 595A
+Cheat7="Magnus\Level 99",E86D935D 59BB
+Cheat8="Magnus\Max HP",E96D9362 5C37
+Cheat9="Magnus\Infinite HP",E96D9368 5C37
+Cheat10="Magnus\Max Str",E96D936C 5C37
+Cheat11="Magnus\Max Vit",E96D936A 5C37
+Cheat12="Magnus\Max Int",E96D9370 5C37
+Cheat13="Magnus\Max Mem",E96D936E 5C37
+Cheat14="Magnus\Max Agi",E96D9374 5C37
+Cheat15="Magnus\Max Dex",E96D9372 5C37
 
 //----
 
@@ -7246,6 +6894,21 @@ Cheat47_N=Only use One Have item Option at one time.
 
 //----
 
+[3E198D9E-F2E1267E-C:45]
+Name=Paperboy (U)
+Cheat0="Enable Level Select",E85CFC49 5959
+Cheat0_N=Also accesses All Bonus Levels
+Cheat1="Invincibility",E97CDF52 5959
+Cheat2="Infinite Newspapers",E97CDE66 5959
+Cheat3="Big Newspapers",E97CDEAE 5959
+Cheat4="Turbo Mode",E97CDE8A 5959
+Cheat5="Super Jump Springs",E97CDE8E 5959
+Cheat6="Rocket Boosters",E97CDE92 5959
+Cheat7="99 Total Houses",E95CFCBE 59BB
+Cheat8="Infinite Health",E85CFC26 59B6
+
+//----
+
 [73ABB1FB-9CCA6093-C:45]
 Name=Penny Racers (U)
 Cheat0="Super Speed",E9780110 A15A
@@ -7258,7 +6921,7 @@ Cheat2_N=This code is useful because you can play Class AA without having to bea
 //----
 
 [DDF460CC-3CA634C0-C:45]
-Name=Perfect Dark (U) (v1.0)
+Name=Perfect Dark (U) (V1.0)
 Cheat0="Have All\Weapons\Player 1",E876D268 5957,E8744268 5957,E871B268 5957
 Cheat1="Infinite\Ammo\Player 1",E876C9F1 594F,E87439F1 594F,E871A9F1 594F,E876C14D 594F,E874314D 594F,E871A14D 594F
 Cheat2="Infinite\Health\Player 1",E976BAD4 90DA,E9742AD4 90DA,E9719AD4 90DA
@@ -7271,7 +6934,7 @@ Cheat8="The Ultimate All In One",E85EDB45 5959,E85EDC62 5959,E85EDCCB 5959,50000
 Cheat9="Carrington Institute\Have 999 points in Firing Range",E95F7186 5C37
 Cheat10="Carrington Institute\Have Infinite time in Firing Range",E95F7182 599D
 Cheat11="Carrington Institute\Have 255 targets destroyed",E95F718C 594F
-Cheat12="All levels Compleate",50004002 0000,110A2218 0001
+Cheat12="All levels Complete",50004002 0000,110A2218 0001
 Cheat0_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
 Cheat1_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
 Cheat2_N=This code is for all Low/High Res Solo & Multi-Player Level ;) Enjoy
@@ -7285,7 +6948,7 @@ Cheat8_N=The Ultimate All In One activate's solo missions, give all medals on so
 //----
 
 [41F2B98F-B458B466-C:45]
-Name=Perfect Dark (U) (v1.1)
+Name=Perfect Dark (U) (V1.1)
 Cheat0="Have All\Weapons\Player 1",E876D268 5957,E8744268 5957,E871B268 5957
 Cheat1="Infinite\Ammo\Player 1",E876C9F1 594F,E87439F1 594F,E871A9F1 594F,E876C14D 594F,E874314D 594F,E871A14D 594F
 Cheat2="Infinite\Health\Player 1",E976BAD4 90DA,E9742AD4 90DA,E9719AD4 90DA
@@ -7334,7 +6997,7 @@ Cheat17="Hole In One\Hole 18",E8634A8B 595A
 //----
 
 [C851961C-78FCAAFA-C:45]
-Name=Pilot Wings64 (U)
+Name=Pilotwings 64 (U)
 Cheat0="Infinite Fuel\Gyrocopter",E88C7F77 59D9
 Cheat1="Infinite Fuel\Rocket Belt",E88C7F97 59D9
 Cheat2="Time Always 00'00'10",E88C7AA8 5959
@@ -7480,26 +7143,8 @@ Cheat1_N=For Overhead & Driving Levels
 
 //----
 
-[FC74D475-9A0278AB-C:45]
-Name=Powerpuff Girls, The - Chemical X-traction (U)
-Cheat0="1 Win Needed\Player 1",D00BAD0F 0000,E85F0461 5959
-Cheat1="Infinite Health\Player 1",E95F0334 9B22
-Cheat2="Max Chemical X\Player 1",E85F0480 595B
-Cheat3="Never Win\Player 1",E85F0461 595A
-Cheat4="No Chemical X\Player 1",E85F0480 595A
-Cheat5="No Health\Player 1",E95F0334 595A
-Cheat6="1 Win Needed\Player 2",D00BB04F 0000,E85F07A1 5959
-Cheat7="Infinite Health\Player 2",E95F0774 9B22
-Cheat8="Max Chemical X\Player 2",E85F07C0 595B
-Cheat9="Never Win\Player 2",E85F07A1 595A
-Cheat10="No Chemical X\Player 2",E85F07C0 595A
-Cheat11="No Health\Player 2",E95F0774 595A
-Cheat12="Infinite Time",E964C004 9B4A
-
-//----
-
 [9F5BF79C-D2FE08A0-C:45]
-Name=Quake
+Name=Quake 64 (U)
 Cheat0="Infinite\Ammo",50000402 0000,10163A2D 0064,50000402 0000,11163A2C 03E7
 Cheat1="Have\All Weapons",E86C903D 59CF
 Cheat2="Debug Mode",E85C1B16 5959
@@ -7525,7 +7170,7 @@ Cheat19="Multi\Infinite Ammo\Player 2",50000402 0000,1116665C 03E7
 //----
 
 [BDA8F143-B1AF2D62-C:45]
-Name=QUAKE II
+Name=Quake II (U)
 Cheat0="The Ultimate",E95A0484 615A,E95A0482 5972,E95657B8 DF8A,E95657B6 59C2,E95657BC 7573,E95657BA 5C37,E95657C0 FF73,E95657BE 598A,E95657C4 FDF3,E95657C2 5B56,E95657C8 FB71,E95657C6 59A3,E95657CC FB71,E95657CA 599E,E95657D0 695A,E95657CE 5955,E95657D4 FB71,E95657D2 59AA,50000604 0000,11000090 A219,50000604 0004,11000092 0054,50000504 0000,110000A8 AE1B,50000504 0004,110000AA 006C,E9565714 6159,E9565712 849D,E9565718 FF73,E9565716 59DA
 Cheat1="Multi\Agony\Have\All Weapons\Player 1",E86E8509 5959,E86E850D 5959,E86E8511 5959,E86E8515 5959,E86E8519 5959,E86E851D 5959,E86E8521 5959,E86E8525 5959,E86E8529 5959,E86E852D 5959
 Cheat2="Multi\Agony\Infinite\Ammo\Player 1",E86E8531 59BB,E86E8535 59BB,E86E8539 59BB,E86E853D 59BB,E86E8541 59BB,E86E8545 59BB
@@ -7696,7 +7341,7 @@ Cheat36="Myukus Codes\Infinite\Lives",E969A1B4 59BB
 //----
 
 [673D099B-A4C808DE-C:45]
-Name=Rampage 2: Universal Tour (U)
+Name=Rampage 2 - Universal Tour (U)
 Cheat0="Always Full Special\Myukus",E9A9A1C0 5996
 Cheat1="Always Full Special\Ralph",E969A3A4 5996
 Cheat2="Enable\Myukus",E96E22F0 595A
@@ -7726,7 +7371,7 @@ Cheat24="Infinite\Lives\Curtis",E969980C 59BB
 //----
 
 [0304C48E-AC4001B8-C:45]
-Name=Rat Attack (U)
+Name=Rat Attack (U) (M6)
 Cheat0="Play As/Player 1",E8696B45 59??
 Cheat1="Play As/Player 2",E8696C55 59??
 Cheat2="Play As/Player 3",E8696C65 59??
@@ -7740,7 +7385,7 @@ Cheat3_O=$5A Hai Jinx,$59 Sparky,$5C Manx,$5B Muffy Dupont,$56 Bob Cat,$55 Smoke
 //----
 
 [F3C5BF9B-160F33E2-C:45]
-Name=Rayman 2 The Great Escape (U)
+Name=Rayman 2 - The Great Escape (U) (M5)
 Cheat0="Have All\Crates",E962C750 D04F,E962C74E 504F,E962C754 504F,E962C752 504F,E962C858 504F,E862C856 594F
 Cheat1="All Masks",891F1210 8780
 Cheat2="Start with Full Health",E96F19A4 5970
@@ -7765,6 +7410,29 @@ Cheat5="Have All Charcters & Levels Unlocked",50000740 0000,100CB951 0001,500003
 
 //----
 
+[0F1FA987-BFC1AFA6-C:45]
+Name=Re-Volt (U)
+Cheat0="Access All\Cars & Tracks",E95A03FA 5959
+Cheat1="Access All\Cups",5000032C 0000,110542FA 00FF
+Cheat2="Always 1st",E965A9B2 5959,E965A9BA 595A,E9661842 5B46
+Cheat3="Infinite Continues",E9661836 5958
+Cheat4="Drones Have No Weapons",E96524D2 595A
+Cheat5="Infinite Weapons\Player 1",E965A9A0 595A,E965A99E 59??,E965A9A2 5959
+Cheat5_O=$5A Green Missile,$59 Orange Missile,$5C Multi-Orange Missiles,$5B The Bomb,$56 Water Balloon,$55 Blue Protector,$58 Oil Slick,$57 Bowling Ball Mine,$62 Yellow Protector,$61 Lightning Bolt,$64 Orange Star,$63 Beach Ball
+Cheat6="Laps To Race",E95B2E22 59??
+Cheat6_O=$59 1 Lap,$5C 2 laps,$5B 3 Laps,$56 4 Laps,$55 5 Laps,$58 6 Laps,$57 7 Laps,$62 8 Laps,$61 9 Laps
+Cheat7="Number Of Drones In The Race",E96651FA 59??
+Cheat7_O=$59 1 Drone,$5C 2 Drones,$5B 3 Drones,$56 4 Drones,$55 5 Drones,$58 6 Drones,$57 7 Drones,$62 8 Drones,$61 9 Drones
+Cheat8="99 Points Player 1",E8661841 59BB
+Cheat9="Infinite Weapons\Player 2",E965CE68 595A,E965CE66 59??,E965CE6A 5959
+Cheat9_O=$5A Green Missile,$59 Orange Missile,$5C Multi-Orange Missiles,$5B The Bomb,$56 Water Balloon,$55 Blue Protector,$58 Oil Slick,$57 Bowling Ball Mine,$62 Yellow Protector,$61 Lightning Bolt,$64 Orange Star,$63 Beach Ball
+Cheat10="Infinite Weapons\Player 3",E965F230 595A,E965F22E 59??,E965F232 5959
+Cheat10_O=$5A Green Missile,$59 Orange Missile,$5C Multi-Orange Missiles,$5B The Bomb,$56 Water Balloon,$55 Blue Protector,$58 Oil Slick,$57 Bowling Ball Mine,$62 Yellow Protector,$61 Lightning Bolt,$64 Orange Star,$63 Beach Ball
+Cheat11="Infinite Weapons\Player 4",E9651BF8 595A,E9651BF6 59??,E9651BFA 5959
+Cheat11_O=$5A Green Missile,$59 Orange Missile,$5C Multi-Orange Missiles,$5B The Bomb,$56 Water Balloon,$55 Blue Protector,$58 Oil Slick,$57 Bowling Ball Mine,$62 Yellow Protector,$61 Lightning Bolt,$64 Orange Star,$63 Beach Ball
+
+//----
+
 [EAB7B429-BAC92C57-C:45]
 Name=Ready 2 Rumble Boxing (U)
 Cheat0="Infinite\Money",E9642086 504F
@@ -7788,7 +7456,7 @@ Cheat8_O=$8A Max,$5A Never Rumble
 //----
 
 [E9219533-13FBAFBD-C:45]
-Name=Ready 2 Rumble Boxing: Round 2 (U)
+Name=Ready 2 Rumble Boxing Round 2 (U)
 Cheat0="Infinite\Health\Player 1",E963490A 59B6
 Cheat1="No Health\Player 1",E963490A 595A
 Cheat2="Infinite\Stamina\Player 1",E963490E 59B6
@@ -7891,38 +7559,8 @@ Cheat14="Infinite\Time",E864E311 596A
 
 //----
 
-[0F1FA987-BFC1AFA6-C:45]
-Name=Re-Volt (U)
-Cheat0="Access All\Cars & Tracks",E95A03FA 5959
-Cheat1="Access All\Cups",5000032C 0000,110542FA 00FF
-Cheat2="Always 1st",E965A9B2 5959,E965A9BA 595A,E9661842 5B46
-Cheat3="Infinite Continues",E9661836 5958
-Cheat4="Drones Have No Weapons",E96524D2 595A
-Cheat5="Infinite Weapons\Player 1",E965A9A0 595A,E965A99E 59??,E965A9A2 5959
-Cheat5_O=$5A Green Missile,$59 Orange Missile,$5C Multi-Orange Missiles,$5B The Bomb,$56 Water Balloon,$55 Blue Protector,$58 Oil Slick,$57 Bowling Ball Mine,$62 Yellow Protector,$61 Lightning Bolt,$64 Orange Star,$63 Beach Ball
-Cheat6="Laps To Race",E95B2E22 59??
-Cheat6_O=$59 1 Lap,$5C 2 laps,$5B 3 Laps,$56 4 Laps,$55 5 Laps,$58 6 Laps,$57 7 Laps,$62 8 Laps,$61 9 Laps
-Cheat7="Number Of Drones In The Race",E96651FA 59??
-Cheat7_O=$59 1 Drone,$5C 2 Drones,$5B 3 Drones,$56 4 Drones,$55 5 Drones,$58 6 Drones,$57 7 Drones,$62 8 Drones,$61 9 Drones
-Cheat8="99 Points Player 1",E8661841 59BB
-Cheat9="Infinite Weapons\Player 2",E965CE68 595A,E965CE66 59??,E965CE6A 5959
-Cheat9_O=$5A Green Missile,$59 Orange Missile,$5C Multi-Orange Missiles,$5B The Bomb,$56 Water Balloon,$55 Blue Protector,$58 Oil Slick,$57 Bowling Ball Mine,$62 Yellow Protector,$61 Lightning Bolt,$64 Orange Star,$63 Beach Ball
-Cheat10="Infinite Weapons\Player 3",E965F230 595A,E965F22E 59??,E965F232 5959
-Cheat10_O=$5A Green Missile,$59 Orange Missile,$5C Multi-Orange Missiles,$5B The Bomb,$56 Water Balloon,$55 Blue Protector,$58 Oil Slick,$57 Bowling Ball Mine,$62 Yellow Protector,$61 Lightning Bolt,$64 Orange Star,$63 Beach Ball
-Cheat11="Infinite Weapons\Player 4",E9651BF8 595A,E9651BF6 59??,E9651BFA 5959
-Cheat11_O=$5A Green Missile,$59 Orange Missile,$5C Multi-Orange Missiles,$5B The Bomb,$56 Water Balloon,$55 Blue Protector,$58 Oil Slick,$57 Bowling Ball Mine,$62 Yellow Protector,$61 Lightning Bolt,$64 Orange Star,$63 Beach Ball
-
-//----
-
-[0B6B4DDB-9671E682-C:45]
-Name=Roadsters Trophy (U) (M3)
-Cheat0="Cheats Enabled Modifier",E95E4F98 ????
-Cheat0_O=$5956 Fast Bucks (You Get 250,$5962 Easy Money (You Get 1,$596A Trophies (Second And Third Championships Wins),$597A Smurfing (High Pitched Voices),$599A Big Wheels (Big Foot Cars),$59DA Skywalker (Hover Cars),$5A5A Car Radio (Remote Control Cars),$5B5A Chopper (Top Down View),$555A Anyway (Race Circuits Backwards),$615A Extra Resolution (Able To Change Resolution In Options Screen)
-
-//----
-
 [F050746C-247B820B-C:45]
-Name=ROAD RASH 64
+Name=Road Rash 64 (U)
 Cheat0="Always 1st",E961CFAA 595A
 Cheat1="Always Have\Max Cash",E961BDCE 504F
 Cheat3="Access\Infinite & All Weapons",50000E02 0000,111B8D7A 0505
@@ -7935,6 +7573,13 @@ Cheat2="Access\All Bikes & Tracks",E860CA2B 59BB
 
 //----
 
+[0B6B4DDB-9671E682-C:45]
+Name=Roadsters Trophy (U) (M3)
+Cheat0="Cheats Enabled Modifier",E95E4F98 ????
+Cheat0_O=$5956 Fast Bucks (You Get 250,$5962 Easy Money (You Get 1,$596A Trophies (Second And Third Championships Wins),$597A Smurfing (High Pitched Voices),$599A Big Wheels (Big Foot Cars),$59DA Skywalker (Hover Cars),$5A5A Car Radio (Remote Control Cars),$5B5A Chopper (Top Down View),$555A Anyway (Race Circuits Backwards),$615A Extra Resolution (Able To Change Resolution In Options Screen)
+
+//----
+
 [AC8E4B32-E7B47326-C:45]
 Name=Robotron 64 (U)
 Cheat0="Infinite Lives",E85D0801 5961
@@ -7944,7 +7589,7 @@ Cheat2="Level Select In Setup Menu",E95BC24A C0DE
 //----
 
 [0C5EE085-A167DD3E-C:45]
-Name=Rocket: Robot On Wheels (U)
+Name=Rocket - Robot on Wheels (U)
 Cheat0="Infinite\Max Health",E95D4A56 595E,E95D4A5A 595E
 Cheat1="Max\Tinker Toys",E960B0F2 785F
 Cheat2="Max\Ticket Switches",E960B0F6 5922
@@ -7966,7 +7611,6 @@ Cheat17="Pyramid Scheme\Infinite Time",E960B0A2 504F
 Cheat18="Food Fright\Max Tickets",E960B0A8 504F,E960B0A6 504F,E960B0AC 504F,E960B0AA 504F,E960B0B0 504F,E960B0AE 504F,E960B0B4 504F
 Cheat19="Food Fright\Infinite Time",E960B0B2 504F
 
-
 //----
 
 [2500267E-2A7EC3CE-C:45]
@@ -8108,7 +7752,7 @@ Cheat72="Have All Keys Found\Seattle\Normal",E9627420 504F
 //----
 
 [769147F3-2033C10E-C:45]
-Name=SCARS (U)
+Name=S.C.A.R.S. (U)
 Cheat0="Have All\Cars",50000402 0000,103DF94B 0001
 Cheat1="Have All\Cups,Tracks & Challenges",50000302 0000,102CB4A9 0001,50000402 0000,103DD109 0001
 Cheat2="Infinite Credits",E88EE373 5961
@@ -8127,7 +7771,33 @@ Cheat8_O=$5A Turbo,$59 Magnet,$5B Stinger,$56 Boomerang,$55 Seeker,$58 Stopper,$
 //----
 
 [2A6B1820-6ABCF466-C:45]
-Name=San Francisco Rush - Extreme Racing (U)
+Name=San Francisco Rush - Extreme Racing (U) (V1.0)
+Cheat0="Activate\Stop Timer",E86397E8 5959
+Cheat1="Activate\Auto Abort Disable",E86397D0 5959
+Cheat2="Activate\Cones to Mines",E86392E0 5959
+Cheat3="Activate\Disable Car 2 Car Control",E86397A8 5959
+Cheat4="Activate\Resurrect in Place",E86397D8 5959
+Cheat5="Activate\Upside Down Mode",E86397B7 5959
+Cheat6="Car",D00F40A5 0020,E861F117 59??,E861F2BC 59??,E861F7D0 59??,E861F677 59??
+Cheat7="Edge Boost",D00F40A5 0010,E9666687 504F
+Cheat8="Car Type",E8639707 59??
+Cheat9="Press F9 For Track Select",88100050 00??
+Cheat10="Gravity",E86394E7 59??
+Cheat11="Always Place 1st",E866668F 595A
+Cheat12="Have Two Special Cars",E96203D6 504F,E96203F0 504F,E9620302 504F,E962031C 504F,E962032E 504F,E9620348 504F
+Cheat6_O=$62 Taxi,$61 Hot Rod,$64 F1 Car
+Cheat8_O=$5A Normal Car,$59 Flat Car,$5C Fat Car,$5B Giant Car,$64 Invisible Car,$96 Super-Tiny Car #2,$B8 Paper-Thin Cars,$C0 Screen-Talled Cars,$13 Super-Sky Car,$1D Invisible Car (Can See Wheels),$2D Super-Sky Car #2,$4F Super-Tiny Car
+Cheat9_O=$5A Track 1,$59 Track 2,$5C Track 3,$5B Track 4,$56 Track 5,$55 Track 6,$58 Track 7
+Cheat10_O=$5A A Balloon & 2 Weights,$59 Normal,$5C 1 Weight,$5B 2 Weights
+Cheat7_N=by pressing R you will get a small speed boost that pushes you ahead.
+Cheat8_N=It gets you from 0-150 in the the time it takes the F1 racer to. Don't use the F1 racer and only hold until you reach 150 or the game will freeze.
+Cheat9_N=With this code, press F9 when on the track selction screen and press A to select that track!
+Cheat12_N=You receive the Hotrod and Taxi with this code, but you may have to go through the cars from the "Beginning" past the "Extreme" for them to appear.
+
+//----
+
+[AC9F7DA7-A8C029D8-C:45]
+Name=San Francisco Rush - Extreme Racing (U) (V1.1)
 Cheat0="Activate\Stop Timer",E86397E8 5959
 Cheat1="Activate\Auto Abort Disable",E86397D0 5959
 Cheat2="Activate\Cones to Mines",E86392E0 5959
@@ -8185,7 +7855,7 @@ Cheat0="Infinite Health",E95EBE1E 5992,E85F02E9 5957
 //----
 
 [3A4760B5-2D74D410-C:45]
-Name=Shadowman (U)
+Name=Shadow Man (U)
 Cheat0="Infinite\Air",E95BAE74 595A,E95BAE72 786A
 Cheat1="Infinite\Health",E95BAE70 595A,E95BAE6E 786A,E95BAE6C 595A,E95BAE6A 786A
 Cheat2="All Cheats Book of Shadows",E95759E8 5956,E95759E6 5C63
@@ -8262,8 +7932,20 @@ Cheat3="Infinite Credits",E85E29AF 59BB
 
 //----
 
+[EBFE2397-FF74DA34-C:45]
+Name=Space Invaders (U)
+Cheat0="Infinite\Lives",E85FA833 59BB
+Cheat1="Infinite\Points",E95FA836 504F
+Cheat2="Always Have\Vertical Burst",E95FA832 5A56
+Cheat3="Always Have\Horizontal Right",E95FA832 5B56
+Cheat4="Always Have\Horizontal Left",E95FA832 5C56
+Cheat5="Always Have\Diagonal Burst",E95FA832 5556
+Cheat6="Infinite\Shield",E95FA80A 5959
+
+//----
+
 [BFE23884-EF48EAAF-C:45]
-Name=Silicon Valley (U)
+Name=Space Station Silicon Valley (U)
 Cheat0="Infinite\Ability\Sheep",E97140F8 555A
 Cheat1="Infinite\Ability\Mouse",E9715320 555A
 Cheat2="Infinite\Boost\Mouse",E971531C 555A
@@ -8307,18 +7989,6 @@ Cheat38="All Levels Open",50002001 0000,103F7DE0 0001
 
 //----
 
-[EBFE2397-FF74DA34-C:45]
-Name=Space Invaders (U)
-Cheat0="Infinite\Lives",E85FA833 59BB
-Cheat1="Infinite\Points",E95FA836 504F
-Cheat2="Always Have\Vertical Burst",E95FA832 5A56
-Cheat3="Always Have\Horizontal Right",E95FA832 5B56
-Cheat4="Always Have\Horizontal Left",E95FA832 5C56
-Cheat5="Always Have\Diagonal Burst",E95FA832 5556
-Cheat6="Infinite\Shield",E95FA80A 5959
-
-//----
-
 [A60ED171-3D85D06E-C:45]
 Name=Spider-Man (U)
 Cheat0="Unlocked\All Costumes",E96424D2 504F
@@ -8329,14 +7999,6 @@ Cheat4="Infinite\Webbing",E863B2A5 5959
 
 //----
 
-[0684FBFB-5D3EA8A5-C:45]
-Name=StarCraft 64 (U)
-Cheat0="Infinite\& Max Minerals",50000C04 0000,110B1D46 FFFF,50000C04 0000,110B1D44 3B9A,50000C04 0000,110B1D46 C9FF
-Cheat1="Infinite\& Max Vespene Gas",50000C04 0000,110B1D76 FFFF,50000D04 0000,110B1D74 3B9A,50000D04 0000,110B1D76 C9FF
-Cheat2="All levels complete",E861661C 595E,E861661B 5964,E861661A 5964,E8616619 5964,E8616620 5964,E861661F 5964
-
-//----
-
 [A7D015F8-2289AA43-C:45]
 Name=Star Fox 64 (U) (V1.0)
 Cheat0="Unlimited\Boost",E967D3F4 595A,E967D3F2 595A,E967FED4 595A,E967FED2 595A
@@ -8388,7 +8050,7 @@ Cheat22="Infinite Boost\Player 4",E9672C84 595A,E9672C82 595A,E96A5B64 595A,E96A
 //----
 
 [DDD93C85-DAE381E8-C:45]
-Name=Star Soldier: Vanishing Earth (U)
+Name=Star Soldier - Vanishing Earth (U)
 Cheat0="Infinite\Lives",E86089A0 595B
 Cheat1="Infinite\Specials",E860899F 595B
 Cheat2="Extra Armor",E8608981 5959
@@ -8403,20 +8065,6 @@ Cheat8_O=$59 High,$5C Mid,$5B Low
 
 //----
 
-[72F70398-6556A98B-C:45]
-Name=Star Wars EP1 Pod Racer (U)
-Cheat0="No Damage",E860A529 5959
-Cheat0_N=If when Racing Your Pod Over heats & bursts into flames Press "R" & you will Repair the Damage.
-Cheat2="Always 1st",E965E244 5959
-Cheat1="Infinite Truguts",E96591CE 504F,E96591D0 D04F
-Cheat3="Enable In-Game cheat Menu & Cheats",E85D0A29 5959,E95D0A2E 504F
-Cheat3_N=Here you can Activate the IN-Built Cheats Menu. At the Front Screen Just Press C-Button Right.This will open up All Tracks & Characters In Free Play & Time Attack. Also In A Race, Press The Start/Pause button to Access the In-Cheat-Menu Option.You can also choose how many Pod's Racers are in the Race & also how many Laps are in the Race in Free Play & Time Attack
-Cheat4="Unlock All Tracks & Characters",E86591C0 594F,E86591BF 594F,E86591BE 594F,E86591BD 594F,E96591C0 504F,E96591BE 504F,E86591CC 59CD,E96591CA 504F
-Cheat4_N=When using Unlock All Tracks & Characters For can to pick & choose what ever you want to play As & where ;)
-Cheat5="Have All Tracks Completed",E96591BE 504F,E96591C4 904F,E96591C2 904F,E96591C8 904F,E96591C6 594F
-
-//----
-
 [264D7E5C-18874622-C:45]
 Name=Star Wars - Shadows of the Empire (U) (V1.0)
 Cheat0="All Levels\Infinite\Lives",E8645C1D 59B6
@@ -8447,12 +8095,85 @@ Cheat21="Press F9 For Pink Cheat Debug Screen",890D017F 0001
 
 [4147B091-63251060-C:45]
 Name=Star Wars - Shadows of the Empire (U) (V1.1)
-Cheat0="Press F9 For Pink Cheat Debug Screen",890D01BF 0001
+Cheat0="All Levels\Infinite\Lives",E8645C1D 59B6
+Cheat1="All Levels\Infinite\Missiles",E86465BB 594F
+Cheat2="All Stages\Invincible",E95BFAC8 755A
+Cheat3="All Stages\Infinite Health",E95B8464 755A
+Cheat4="All Stages\Lasers Never Overheat",E95B90A0 755A
+Cheat5="All Stages\Upper Lasers",E95B909C 8D58,E95B909A 9F4F
+Cheat5_N=Don't Use With Never Overheat Code
+Cheat6="All Stages\Infinite\Pulse Ammo",E95B955C 755A
+Cheat7="All Stages\Infinite\Flame Ammo",E95B8A78 755A
+Cheat8="All Stages\Infinite\Seeker Ammo",E95B8DEC 755A
+Cheat9="All Stages\Infinite\Stunner Ammo",E95B8E2C 755A
+Cheat10="All Stages\Infinite\Disruptor Ammo",E95B925C 755A
+Cheat11="All Stages\Infinite\Jet Pack",E95BBD04 755A,E95BC3B0 755A,E95BBEA0 755A
+Cheat12="All Levels\Time Always 0:00:02",E9645B40 995A
+Cheat13="All Levels\No Clipping\Off",E96571B9 5959
+Cheat14="All Levels\No Clipping\On",E96571B9 595A
+Cheat15="All Levels\Visibililty\Maximum",E85FF97D 504F
+Cheat16="All Levels\Visibililty\Minimum",E85FF9BD 504F
+Cheat17="All Levels\Large Mutant Enemies",E85F097D 504F
+Cheat18="All Levels\Dash Becomes Shorter & Wider",E85FF77B 504F
+Cheat19="All Levels\See Through\Some Walls",E85F197B 504F
+Cheat20="All Levels\See Through\Everything Except Specific Things",E85F19BB 504F
+Cheat21="Press F9 For Pink Cheat Debug Screen",890D017F 0001
+
+//----
+
+[4DD7ED54-74F9287D-C:45]
+Name=Star Wars - Shadows of the Empire (U) (V1.2)
+Cheat0="All Levels\Infinite\Lives",E8645C1D 59B6
+Cheat1="All Levels\Infinite\Missiles",E86465BB 594F
+Cheat2="All Stages\Invincible",E95BFAC8 755A
+Cheat3="All Stages\Infinite Health",E95B8464 755A
+Cheat4="All Stages\Lasers Never Overheat",E95B90A0 755A
+Cheat5="All Stages\Upper Lasers",E95B909C 8D58,E95B909A 9F4F
+Cheat5_N=Don't Use With Never Overheat Code
+Cheat6="All Stages\Infinite\Pulse Ammo",E95B955C 755A
+Cheat7="All Stages\Infinite\Flame Ammo",E95B8A78 755A
+Cheat8="All Stages\Infinite\Seeker Ammo",E95B8DEC 755A
+Cheat9="All Stages\Infinite\Stunner Ammo",E95B8E2C 755A
+Cheat10="All Stages\Infinite\Disruptor Ammo",E95B925C 755A
+Cheat11="All Stages\Infinite\Jet Pack",E95BBD04 755A,E95BC3B0 755A,E95BBEA0 755A
+Cheat12="All Levels\Time Always 0:00:02",E9645B40 995A
+Cheat13="All Levels\No Clipping\Off",E96571B9 5959
+Cheat14="All Levels\No Clipping\On",E96571B9 595A
+Cheat15="All Levels\Visibililty\Maximum",E85FF97D 504F
+Cheat16="All Levels\Visibililty\Minimum",E85FF9BD 504F
+Cheat17="All Levels\Large Mutant Enemies",E85F097D 504F
+Cheat18="All Levels\Dash Becomes Shorter & Wider",E85FF77B 504F
+Cheat19="All Levels\See Through\Some Walls",E85F197B 504F
+Cheat20="All Levels\See Through\Everything Except Specific Things",E85F19BB 504F
+Cheat21="Press F9 For Pink Cheat Debug Screen",890D017F 0001
+
+//----
+
+[72F70398-6556A98B-C:45]
+Name=Star Wars Episode I - Racer (U)
+Cheat0="No Damage",E860A529 5959
+Cheat0_N=If when Racing Your Pod Over heats & bursts into flames Press "R" & you will Repair the Damage.
+Cheat2="Always 1st",E965E244 5959
+Cheat1="Infinite Truguts",E96591CE 504F,E96591D0 D04F
+Cheat3="Enable In-Game cheat Menu & Cheats",E85D0A29 5959,E95D0A2E 504F
+Cheat3_N=Here you can Activate the IN-Built Cheats Menu. At the Front Screen Just Press C-Button Right.This will open up All Tracks & Characters In Free Play & Time Attack. Also In A Race, Press The Start/Pause button to Access the In-Cheat-Menu Option.You can also choose how many Pod's Racers are in the Race & also how many Laps are in the Race in Free Play & Time Attack
+Cheat4="Unlock All Tracks & Characters",E86591C0 594F,E86591BF 594F,E86591BE 594F,E86591BD 594F,E96591C0 504F,E96591BE 504F,E86591CC 59CD,E96591CA 504F
+Cheat4_N=When using Unlock All Tracks & Characters For can to pick & choose what ever you want to play As & where ;)
+Cheat5="Have All Tracks Completed",E96591BE 504F,E96591C4 904F,E96591C2 904F,E96591C8 904F,E96591C6 594F
+
+
+//----
+
+[0684FBFB-5D3EA8A5-C:45]
+Name=StarCraft 64 (U)
+Cheat0="Infinite\& Max Minerals",50000C04 0000,110B1D46 FFFF,50000C04 0000,110B1D44 3B9A,50000C04 0000,110B1D46 C9FF
+Cheat1="Infinite\& Max Vespene Gas",50000C04 0000,110B1D76 FFFF,50000D04 0000,110B1D74 3B9A,50000D04 0000,110B1D76 C9FF
+Cheat2="All levels complete",E861661C 595E,E861661B 5964,E861661A 5964,E8616619 5964,E8616620 5964,E861661F 5964
 
 //----
 
 [635A2BFF-8B022326-C:45]
-Name=SUPER MARIO 64
+Name=Super Mario 64 (U)
 Cheat0="Press F9 For 255 Coins",8933B218 00FF
 Cheat1="Have\Level Select",A032D58C 0001
 Cheat2="Don't Hurt Mario\Monsters",A033B197 0001
@@ -8499,7 +8220,7 @@ Cheat23_N=Select a Level. Jump Into a Painting. Press A at the Stars Collected S
 //----
 
 [916B8B5B-780B85A4-C:45]
-Name=Super Smash Brothers (U)
+Name=Super Smash Bros. (U)
 Cheat0="Give Kirby A Wierd Blow-Up",E87938B0 5964
 Cheat1="Story Mode\Skip Straight To Master Hand",E8609D39 595D
 Cheat2="Story Mode\Infinite Time",E9609E82 9C23
@@ -8581,7 +8302,7 @@ Cheat43_N=Go into Vs Mode & then Vs Options & then Press Up On the D-Pad Or Anal
 //----
 
 [A2E8F35B-C9DC87D9-C:45]
-Name=Superman (U)
+Name=Superman (U) (M3)
 Cheat0="Fly Through 1st & Last Ring Only To Complete Challenge",E86A953F 59BB
 Cheat1="Infinite Freezing Breath",E9782440 9B22
 Cheat2="Infinite Health",E978242C 9B22
@@ -8600,6 +8321,530 @@ Cheat3="Single Player Stage Select",E9646534 5959
 
 //----
 
+[5354631C-03A2DEF0-C:45]
+Name=The Legend of Zelda - Majora's Mask (U)
+Cheat0="Infinite\Health",E97449FA 5A9A
+Cheat1="Infinite\Hearts Options",E97449FC ????
+Cheat1_O=$5A9A Max Hearts,$59BB 6 Hearts,$599B 4 Hearts
+Cheat1_N=If you need to clear the Infinite Max Hearts from the screen just choose the 6 or 4 Heart Options, take off the cheat & then make a save.
+Cheat3="Infinite\Rupees",E97449FE 5C37
+Cheat4="Infinite\Max & Double Magic Meter",E87449FF 59BA,E9744908 5A59
+Cheat5="Infinite\Items",E8744A67 59BB,E8744A6A 59BB,E8744A69 59BB,E8744A70 59BB,E8744A6F 59BB,E8744A6E 59BB,E8744A74 59BB,E8744A73 59BB
+Cheat6="Have\Ocarina of Time",E8744938 595A
+Cheat7="Have\Hero's Bow",E8744937 5959
+Cheat8="Have\Arrows\Fire Arrow",E8744936 595C
+Cheat9="Have\Arrows\Ice Arrow",E8744935 595B
+Cheat10="Have\Arrows\Light Arrow",E874493C 5956
+Cheat11="Have\Bombs",E874493A 5958
+Cheat12="Have\Bombchu",E8744939 5957
+Cheat13="Have\Deku Sticks",E8744940 5962
+Cheat14="Have\Deku Nuts",E874493F 5961
+Cheat15="Have\Magic Beans",E874493E 5964
+Cheat16="Have\Powder Kegs",E8744944 595E
+Cheat17="Have\Pictograph",E8744943 595D
+Cheat18="Have\Lens of Truth",E8744942 5960
+Cheat19="Have\Hookshot",E8744941 595F
+Cheat20="Have\Great Fairy's Sword",E8744948 596A
+Cheat21="Maximum Visibility",E86CB870 597A
+Cheat22="Fog\Blue",E86CB860 597A
+Cheat23="Fog\Pink",E86CB864 597A
+Cheat24="Fog\Yellow",E86CB868 597A
+Cheat25="Press L To Levitate",D03E6B3B 0020,E9935170 9923
+Cheat25_N=Press L To Levitate & Let go to land
+Cheat26="Have\All Masks",E8744950 5990,E874494F 5992,E874494E 5997,E874494D 5995,E8744954 599A,E8744953 598C,E8744952 5994,E8744951 5998,E8744A58 5991,E8744A57 599C,E8744A56 59A2,E8744A55 598B,E8744A5C 598E,E8744A5B 598D,E8744A5A 5987,E8744A59 598F,E8744A60 5988,E8744A5F 5986,E8744A5E 599B,E8744A5D 5999,E8744A64 5993,E8744A63 5996,E8744A62 59A1,E8744A61 5985
+Cheat27="Beta World 1",D03E6B3B 0000,E87449C6 59??
+Cheat28="Fight Demo Majora's Mask",E86CFA70 597A
+Cheat29="Event Item\Modifier 1",E874493B 59??
+Cheat30="Event Item\Modifier 2",E874493D 59??
+Cheat31="Event Item\Modifier 3",E8744947 59??
+Cheat32="Have\Item Modifier",E8744948 59??
+Cheat33="Have Bottle Modifier 1",E8744946 59??
+Cheat34="Have Bottle Modifier 2",E8744945 59??
+Cheat35="Have Bottle Modifier 3",E874494C 59??
+Cheat36="Have Bottle Modifier 4",E874494B 59??
+Cheat37="Have Bottle Modifier 5",E874494A 59??
+Cheat38="Have Bottle Modifier 6",E8744949 59??
+Cheat39="Use C-Buttons Anywhere",E9738CE0 595A,E9738CDE 595A
+Cheat40="All Equipment Upgrades",E8744933 597B,E9744A7E 7973,E8744914 599F
+Cheat41="Replace Sword With",E8744914 59??
+Cheat41_O=$A4 Fire Arrow w/ Bow,$A3 Ice Arrow w/ Bow,$9E Light Arrow w/ Bow,$9D Kokiri Sword,$A0 Razor Sword,$9F Guilded Sword,$AA Deity Link's Sword
+Cheat42="Play As",E87449E8 59??
+Cheat43="Warp Modifier",D03E6B3A 0000,E89346EB 5959,E99346EE ????
+Cheat27_O=$5A Mama's House non Beta,$59 Fearful Spider House,$5C Beneaf the Graveyard,$5B Southern Swamp Mr Tingle Entry,$58 Outside Tourist Information Southern Swamp,$62 Outside Magic Hag's Potion Shop,$64 Southern Swamp Woods Of Mystery Entry,$76 Counter Of The Tresure Chest Shop,$80 Woodfall Temple non Beta,$8C Spider Hand,$85 Statue outside Gorman Track,$88 Statue outside Lair Of The Temples Boss,$92 Path to Romani Ranch non Beta,$A4 outside The Royal Palace of the Deku Kingdom,$9E Ledge in The Royal Palace of the Deku Kingdom,$A0 inside The Royal Palace of the Deku Kingdom 1,$C9 Green Blobs,$C6 Cave Portal to Last Boss Field,$CF Waterfall Sothern Swamp,$E4 Giant Turtle In the Temple non beta,$E3 Room of Miau & Tijo Zora Great Hall,$E6 Recieving Gorans Mask non Beta,$E5 ?,$E8 Hungry Goran in the Snow,$FC Statue in Stone Tower,$F8 Stone Tower non Beta,$11 Recieving Deku Mask non Beta,$31 Giant Lizards in a Cave,$34 Cave with Steaming Water,$4F Vamps House In Ikana Canyon
+Cheat29_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
+Cheat30_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
+Cheat31_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
+Cheat32_O=$55 Japanese Flute?,$63 Japanese Item?,$6A Great Fairy's Sword,$69 Japanese Hookshot?,$89 Japanese Scroll?,$A4 Japanese Bow?
+Cheat33_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat34_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat35_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat36_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat37_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat38_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat42_O=$5A Fierce Deity Link,$59 Goron Link,$5C Zora Link,$5B Deku Link,$56 Normal Link
+Cheat43_O=$596A Mayors Residence,$5962 Magic Hags Potion Shop,$5964 Romani Ranch Barn,$5963 Mama's House,$5960 Honey & Darlings Shop,$5965 Final Boss Arena,$596F Beneath the Graveyard (left entrance),$597F Beneath the Graveyard (right entrance),$598A Southern Swamp (Reg Entrance),$599F Southern Swamp (from tour house),$59C0 Southern Swamp (from Woodfall),$59BF Southern Swamp (from Deku Palace),$59D2 Path to Ikana Canyon,$59F0 Southern Swamp (from Deku Place 2),$59EF Southern Swamp (From Potion Shop),$59FF Boat Cruise (picture taking),$591D Southern Swamp (From Woods of Mystery),$5920 Southern Swamp (From Spider House),$591F Southern Swamp (From Ikana Canyon),$5950 Southern Swamp (From Owl Warp),$5F5A Curiosity Shop,$5F92 Ikana Canyon Entrance,$665A Lens of Truth Cave (get it),$775A Stone Tower Temple (Upside down),$7761 Stone Tower Temple (Boss Room Entrance),$7756 Treasure Chest Shop,$7755 Treausre Chest Shop (counter),$7760 Clock Tower (w/ skull kid, silent),$776A Stone Tower Temple (endless fall),$BB66 Romani Ranch,$EB66 Zora Shop,$0B66 Snowhead (Path to temple, warp in),$2B66 East Clock Down
+Cheat27_N=Put on the code on load up,After the Nintendo logo you will be in that place of Choice.you can also choose another place & then press F1 (reset) to go to that place this is for beta interest only it will not assist you in playing the game.
+Cheat28_N=With this code,load the game & put the cheat on. then press start to apear in the Demo mode.
+Cheat39_N=This code allows you to use C-Button Items where you normally can't use them. (Created by: The Gentleman)
+Cheat41_N=Only put the Deity Link's Sword on, if using The Play As Fierce Deity Link Code, if not it will turn Fierce Deity Link into a crazed slashing Machine. You have been warned.
+Cheat43_N=Put this code on and it will now take where you wanted to go, turn it back off or it will infinite loop entering all the time.
+Cheat2="Have\All Quest/Status Items",E8744A83 5955,E9744A82 481F
+
+//----
+
+[B443EB08-4DB31193-C:45]
+Name=The Legend of Zelda - Majora's Mask - Collector's Edition (U) (GC)
+Cheat0="Infinite\Health",E9742FBA 5A9A
+Cheat1="Infinite\Hearts Options",E9742FBC ????
+Cheat1_O=$5A9A Max Hearts,$59BB 6 Hearts,$599B 4 Hearts
+Cheat1_N=If you need to clear the Infinite Max Hearts from the screen just choose the 6 or 4 Heart Options, take off the cheat & then make a save.
+Cheat2="Have\All Quest/Status Items",E8742F43 5955,E9742F42 481F
+Cheat3="Infinite\Rupees",E9742FBE 5C37
+Cheat4="Infinite\Max & Double Magic Meter",E8742FBF 59BA,E9742FC8 5A59
+Cheat5="Infinite\Items",E8742F27 59BB,50000501 0000,101ED8D6 0063,50000201 0000,101ED8DC 0063
+Cheat6="Have\Ocarina of Time",E8742FF8 595A
+Cheat7="Have\Hero's Bow",E8742FF7 5959
+Cheat8="Have\Arrows\Fire Arrow",E8742FF6 595C
+Cheat9="Have\Arrows\Ice Arrow",E8742FF5 595B
+Cheat10="Have\Arrows\Light Arrow",E8742FFC 5956
+Cheat11="Have\Bombs",E8742FFA 5958
+Cheat12="Have\Bombchu",E8742FF9 5957
+Cheat13="Have\Deku Sticks",E8742F00 5962
+Cheat14="Have\Deku Nuts",E8742FFF 5961
+Cheat15="Have\Magic Beans",E8742FFE 5964
+Cheat16="Have\Powder Kegs",E8742F04 595E
+Cheat17="Have\Pictograph",E8742F03 595D
+Cheat18="Have\Lens of Truth",E8742F02 5960
+Cheat19="Have\Hookshot",E8742F01 595F
+Cheat20="Have\Great Fairy's Sword",E8742F08 596A
+Cheat21="Maximum Visibility",E86C9530 597A
+Cheat22="Fog\Blue",E86C9520 597A
+Cheat23="Fog\Pink",E86C9524 597A
+Cheat24="Fog\Yellow",E86C9528 597A
+Cheat25="Press L To Levitate",D038127B 0020,E98DFCB0 9923
+Cheat25_N=Press L To Levitate & Let go to land
+Cheat26="Have\All Masks",E8742F10 5990,E8742F0F 5992,E8742F0E 5997,E8742F0D 5995,E8742F14 599A,E8742F13 598C,E8742F12 5994,E8742F11 5998,E8742F18 5991,E8742F17 599C,E8742F16 59A2,E8742F15 598B,E8742F1C 598E,E8742F1B 598D,E8742F1A 5987,E8742F19 598F,E8742F20 5988,E8742F1F 5986,E8742F1E 599B,E8742F1D 5999,E8742F24 5993,E8742F23 5996,E8742F22 59A1,E8742F21 5985
+Cheat27="Beta World 1",D038127B 0000,E8742F86 59??
+Cheat28="Fight Demo Majora's Mask",E86CDF30 597A
+Cheat29="Event Item\Modifier 1",E8742FFB 59??
+Cheat30="Event Item\Modifier 2",E8742FFD 59??
+Cheat31="Event Item\Modifier 3",E8742F07 59??
+Cheat32="Have\Item Modifier",E8742F08 59??
+Cheat33="Have Bottle Modifier 1",E8742F06 59??
+Cheat34="Have Bottle Modifier 2",E8742F05 59??
+Cheat35="Have Bottle Modifier 3",E8742F0C 59??
+Cheat36="Have Bottle Modifier 4",E8742F0B 59??
+Cheat37="Have Bottle Modifier 5",E8742F0A 59??
+Cheat38="Have Bottle Modifier 6",E8742F09 59??
+Cheat39="Use C-Buttons Anywhere",E9736AA0 595A,E9736A9E 595A
+Cheat40="All Equipment Upgrades",E8742FF3 597B,E9742F3E 7973,E8742FD4 599F
+Cheat41="Replace Sword With",E8742FD4 59??
+Cheat41_O=$A4 Fire Arrow w/ Bow,$A3 Ice Arrow w/ Bow,$9E Light Arrow w/ Bow,$9D Kokiri Sword,$A0 Razor Sword,$9F Guilded Sword,$AA Deity Link's Sword
+Cheat42="Play As",E8742FA8 59??
+Cheat43="Warp Modifier",D03E4CFA 0000,E8932CAB 5959,E9932CAE ????
+Cheat27_O=$5A Mama's House non Beta,$59 Fearful Spider House,$5C Beneaf the Graveyard,$5B Southern Swamp Mr Tingle Entry,$58 Outside Tourist Information Southern Swamp,$62 Outside Magic Hag's Potion Shop,$64 Southern Swamp Woods Of Mystery Entry,$76 Counter Of The Tresure Chest Shop,$80 Woodfall Temple non Beta,$8C Spider Hand,$85 Statue outside Gorman Track,$88 Statue outside Lair Of The Temples Boss,$92 Path to Romani Ranch non Beta,$A4 outside The Royal Palace of the Deku Kingdom,$9E Ledge in The Royal Palace of the Deku Kingdom,$A0 inside The Royal Palace of the Deku Kingdom 1,$C9 Green Blobs,$C6 Cave Portal to Last Boss Field,$CF Waterfall Sothern Swamp,$E4 Giant Turtle In the Temple non beta,$E3 Room of Miau & Tijo Zora Great Hall,$E6 Recieving Gorans Mask non Beta,$E5 ?,$E8 Hungry Goran in the Snow,$FC Statue in Stone Tower,$F8 Stone Tower non Beta,$11 Recieving Deku Mask non Beta,$31 Giant Lizards in a Cave,$34 Cave with Steaming Water,$4F Vamps House In Ikana Canyon
+Cheat29_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
+Cheat30_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
+Cheat31_O=$82 Moon's Tear,$81 Land Title Deed,$84 Swap Title Deed,$83 Mountain Title Deed,$7E Ocean Title Deed,$7D Room Key,$80 Special Delivery To Mama,$7F Letter To Kafei,$8A Pendant Of Memories
+Cheat32_O=$55 Japanese Flute?,$63 Japanese Item?,$6A Great Fairy's Sword,$69 Japanese Hookshot?,$89 Japanese Scroll?,$A4 Japanese Bow?
+Cheat33_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat34_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat35_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat36_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat37_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat38_O=$6C Empty Bottle,$6B Red Potion,$66 Green Potion,$65 Blue Potion,$68 Fairy,$67 Deku Princess,$72 Milk,$71 Milk (1/2),$74 Fish,$73 Bug,$6E Blue Fire,$6D Poe,$70 Big Poe,$6F Spring Water,$7A Hot Spring Water,$79 Zora Egg,$7C Gold Dust,$7B Magical Mushroom,$76 Sea Horse,$75 Chateau Romani,$78 Japanese Bottle?,$77 Empty Japanese Bottle?
+Cheat42_O=$5A Fierce Deity Link,$59 Goron Link,$5C Zora Link,$5B Deku Link,$56 Normal Link
+Cheat43_O=$596A Mayors Residence,$5962 Magic Hags Potion Shop,$5964 Romani Ranch Barn,$5963 Mama's House,$5960 Honey & Darlings Shop,$5965 Final Boss Arena,$596F Beneath the Graveyard (left entrance),$597F Beneath the Graveyard (right entrance),$598A Southern Swamp (Reg Entrance),$599F Southern Swamp (from tour house),$59C0 Southern Swamp (from Woodfall),$59BF Southern Swamp (from Deku Palace),$59D2 Path to Ikana Canyon,$59F0 Southern Swamp (from Deku Place 2),$59EF Southern Swamp (From Potion Shop),$59FF Boat Cruise (picture taking),$591D Southern Swamp (From Woods of Mystery),$5920 Southern Swamp (From Spider House),$591F Southern Swamp (From Ikana Canyon),$5950 Southern Swamp (From Owl Warp),$5F5A Curiosity Shop,$5F92 Ikana Canyon Entrance,$665A Lens of Truth Cave (get it),$775A Stone Tower Temple (Upside down),$7761 Stone Tower Temple (Boss Room Entrance),$7756 Treasure Chest Shop,$7755 Treausre Chest Shop (counter),$7760 Clock Tower (w/ skull kid, silent),$776A Stone Tower Temple (endless fall),$BB66 Romani Ranch,$EB66 Zora Shop,$0B66 Snowhead (Path to temple, warp in),$2B66 East Clock Down
+Cheat27_N=Put on the code on load up,After the Nintendo logo you will be in that place of Choice.you can also choose another place & then press F1 (reset) to go to that place this is for beta interest only it will not assist you in playing the game.
+Cheat28_N=With this code,load the game & put the cheat on. then press start to apear in the Demo mode.
+Cheat39_N=This code allows you to use C-Button Items where you normally can't use them. (Created by: The Gentleman)
+Cheat41_N=Only put the Deity Link's Sword on, if using The Play As Fierce Deity Link Code, if not it will turn Fierce Deity Link into a crazed slashing Machine. You have been warned.
+Cheat43_N=Put this code on and it will now take where you wanted to go, turn it back off or it will infinite loop entering all the time.
+
+//----
+
+[EC7011B7-7616D72B-C:45]
+Name=The Legend of Zelda - Ocarina of Time (U) (V1.0)
+Cheat0="Infinite\Rupees",E96510F4 5959
+Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
+Cheat1="Press R\For Old Or Young Link",D01C84B5 0010,E865FC29 59??
+Cheat1_O=$59 Link Young,$5A Link Old
+Cheat1_N=To Activate this Cheat Hold The R Button when walking through a Doorway this will change you to the option on the other side, Disable this Cheat straight away after getting to the other side, in some places you might even get Access Violations. Just press ok untill you can carry on.
+Cheat2="Use Any Item In Any House",E9650A46 595A,E9650A4C 595A
+Cheat3="Have\All Equipment",E965F9C4 C8C7
+Cheat4="Have\All Quest/Status Items",E965F9CC 894F,E965F9CA 504F
+Cheat5="Max\Heart Containers",E965FC52 5A9A
+Cheat6="Max\Gold Skulltulas Killed",E865F9F7 59B6
+Cheat7="Time of Day Modifier",E965FC34 ????
+Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
+Cheat8="Infinite\Energy",E965F958 5A9A
+Cheat9="Infinite\Magic",D011A609 0008,E865F95E 5959,E865F964 5959,E865F955 59BA
+Cheat10="Tunic & Boot Options",E865F998 59??
+Cheat11="Infinite\Deku Sticks",E865F9B4 5961
+Cheat12="Infinite\Deku Nuts",E865F9B3 5961
+Cheat13="Infinite\Bombs",E865F9B2 5961
+Cheat14="Infinite\Arrows",E865F9B1 5961
+Cheat15="Infinite\Deku Seeds",E865F9B6 5961
+Cheat16="Infinite\Bombchu's",E865F9BC 5961
+Cheat17="Infinite\Magic Beans",E865F9BE 5961
+Cheat18="Infinite\Big Key,Small Keys,Compass,& Map",E865F9D0 5957,E865F9CF 5957,E865F9CE 5957,E865F9CD 5957,E865F9D4 5957,E865F9D3 5957,E865F9D2 5957,E865F9D1 5957,E865F9D8 5957,E865F9D7 5957,E865F9D6 5957,E865F9E1 5961,E865F9E8 5961,E865F9E7 5961,E865F9E6 5961,E865F9E5 5961,E865F9EF 5961,E865F9F4 5961,E865F9E9 5961
+Cheat19="Have\Ocarina",E865F99D 59??
+Cheat20="Have\Boomerang",E865F9A8 5960
+Cheat21="Have\Lens of Truth",E865F9A7 595F
+Cheat22="Have\Megaton Hammer",E865F9A5 5969
+Cheat23="Have\Deku Stick",E865F99C 595A
+Cheat24="Have\Deku Nut",E865F99B 5959
+Cheat25="Have\Bombs",E865F99A 595C
+Cheat26="Have\Fairy Bow",E865F999 595B
+Cheat27="Have\Fairy Slingshot",E865F99E 5958
+Cheat28="Have\Bombchu",E865F9A4 5961
+Cheat29="Have\Arrows\Fire Arrow",E865F9A0 5956
+Cheat30="Have\Arrows\Ice Arrow",E865F9A2 595E
+Cheat31="Have\Arrows\Light Arrow",E865F9AC 596C
+Cheat32="Have\Hookshot",E865F9A3 59??
+Cheat33="Have\Magic Beans",E865F9A6 596A
+Cheat34="Have\Magic\Fairie's Wind",E865F9A1 595D
+Cheat35="Have\Magic\Nayru's Love",E865F9AB 596B
+Cheat36="Have\Magic\Din's Fire",E865F99F 5955
+Cheat37="Bottles\Bottle 1 Modifier",E865F9AA 59??
+Cheat38="Bottles\Bottle 2 Modifier",E865F9A9 59??
+Cheat39="Bottles\Bottle 3 Modifier",E865F9B0 59??
+Cheat40="Bottles\Bottle 4 Modifier",E865F9AF 59??
+Cheat41="Trading\Adult Link Item",E865F9AE 59??
+Cheat42="Trading\Young Link Item",E865F9AD 59??
+Cheat43="Turn Giant's Knife Into Biggoron's Sword",E865F962 5959
+Cheat44="Have Quiver (Holds 30)",E865F9C7 5959
+Cheat45="Equipment Modifier 1",E865F9C6 59??
+Cheat46="Equipment Modifier 2",E865F9C5 59??
+Cheat47="Press L\To Levitate",D01C84B5 0020,E971FDE8 9923
+Cheat47_N=Press L To Levitate & Let go to land
+Cheat48="Press L\For infinite Hover Boots",D01C84B5 0020,E9710506 595D
+Cheat48_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
+Cheat49="Instant Step Hoover Boots",D01C84B5 0020,E971FDE8 9923,D01C84B5 0000,E9710506 595D,E865F998 59??
+Cheat49_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat49_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
+Cheat50="Beta\Play Beta Quest Worlds",D01C84B5 0000,E8651035 59??
+Cheat50_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
+Cheat50_N=Put on the code on load up,After the Nintendo logo you will be in Beta Mode,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
+Cheat51="Warp Song Location\Minuet of Forest & Serenade of Water",E86510BB 59??
+Cheat51_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
+Cheat51_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat52="Warp Song Location\Prelude of Light & Nocturne of Shadow",E86510BB 59??
+Cheat52_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
+Cheat52_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat53="Warp Song Location\Bolero of Fire",E86510BB 59??
+Cheat53_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
+Cheat53_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat54="Warp Song Location\Requiem of Spirit",E86510BB 59??
+Cheat54_O=$55 Lake Hylia,08 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
+Cheat54_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat55="Max\Double Defense Power",E865F9F1 5966
+Cheat55_N=This gives you White Border Hearts
+Cheat56="Nayru's Love is Always",E96510F0 ????
+Cheat56_O=$595A OFF,$504F ON
+Cheat56_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
+Cheat57="Infinite\Timers\All Other Timers",E86510F7 598C
+Cheat57_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
+Cheat58="Epona\Max Carrots\Lon Lon Raunch",E8737560 5955,E87443E0 5955
+Cheat58_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
+Cheat59="Infinite\Timers\Escape From Gannons Tower",E86510FB 5906
+Cheat59_N=This cheat works only on The Final Boss.
+Cheat60="Beta\Specific things lean",E858A96C 5959
+Cheat60_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest 01).
+Cheat61="Beta\Appear in Strange Places (Hold R)",D01C84B5 0010,E965108A 5959
+Cheat61_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
+Cheat62="Beta\Interface always off/on",E8650B0F 594F,E8651081 59??
+Cheat62_O=$5A Off,$59 On
+Cheat62_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset.
+Cheat63="Always Have Wallet Size",E865F9C6 59??
+Cheat63_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
+Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
+Cheat32_O=$64 Hookshot,$63 Longshot
+Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
+Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
+Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
+Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
+Cheat2_N=do not use under or in water
+Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
+Cheat45_N=This modifies the equipment you are carrying.
+Cheat46_N=This modifies the equipment you are carrying.
+Cheat64="Press L+R For FMV Select",D01C84B5 0030,E965FC26 59FA,D01C84B5 0030,E965FC2E ????
+Cheat64_O=$504A Triforce FMV,$5049 fire FMV,$504C Triforce FMV,$504B Ganondorf FMV,$5046 Planet Making FMV,$5045 Fire FMV,$5048 Ganondorf FMV,$5047 More Triforce FMV,$5052 Ending
+Cheat64_N=Hold down `L+R' after the Nintendo logo is spinning to see your favourite FMV
+Cheat65="Dark Link\Make Dark Link Apear In TOT",E8773F61 597A,E8773F6B 598B
+Cheat66="Dark Link\Play As Dark Link",D01C84B5 0020,E971FEB8 D970,D01C84B5 0020,E973837C D96D,D01C84B5 0020,E973837A 038A,D01C84B5 0020,E972F73C D970,D01C84B5 0020,E972F73A A4BA,D01C84B5 0020,E9749EB8 595A,D01C84B5 0020,E9749EB6 5B4F,D01C84B5 0020,E971FD88 598B,D01C84B5 0020,E971FD86 6259,D01C84B5 0020,E971FEB6 783A,D01C84B5 0020,E974A3E8 D961,D01C84B5 0020,E974A3E6 C89A,D01C84B5 0020,E972DA68 D970,D01C84B5 0020,E972DA66 A4BA
+
+//----
+
+[D43DA81F-021E1E19-C:45]
+Name=The Legend of Zelda - Ocarina of Time (U) (V1.1)
+Cheat0="Infinite\Rupees",E9650EB4 5959
+Cheat1="Press R\For Old Or Young Link",D01C8675 0010,E865FAE9 59??
+Cheat1_O=$59 Link Young,$5A Link Old
+Cheat1_N=To Activate this Cheat Hold The R Button when walking through a Doorway this will change you to the option on the other side, Disable this Cheat straight away after getting to the other side, in some places you might even get Access Violations. Just press ok untill you can carry on.
+Cheat2="Use Any Item In Any House",E9651006 595A,E965100C 595A
+Cheat3="Have\All Equipment",E965FF84 C8C7
+Cheat4="Have\All Quest/Status Items",E965FF8C 894F,E965FF8A 504F
+Cheat5="Max\Heart Containers",E965FA12 5A9A
+Cheat6="Max\Gold Skulltulas Killed",E865FFB7 59B6
+Cheat7="Time of Day Modifier",E965FAF4 ????
+Cheat8="Infinite\Energy",E965FA18 5A9A
+Cheat9="Infinite\Magic",D011A7C9 0008,E865FA1E 5959,E865FA24 5959,E865FA15 59BA
+Cheat10="Tunic & Boot Options",E865FF58 59??
+Cheat11="Infinite\Deku Sticks",E865FF74 5961
+Cheat12="Infinite\Deku Nuts",E865FF73 5961
+Cheat13="Infinite\Bombs",E865FF72 5961
+Cheat14="Infinite\Arrows",E865FF71 5961
+Cheat15="Infinite\Deku Seeds",E865FF76 5961
+Cheat16="Infinite\Bombchu's",E865FF7C 5961
+Cheat17="Infinite\Magic Beans",E865FF7E 5961
+Cheat18="Infinite\Big Keys,Small Keys,Compass,& Map",E865FF90 5957,E865FF8F 5957,E865FF8E 5957,E865FF8D 5957,E865FF94 5957,E865FF93 5957,E865FF92 5957,E865FF91 5957,E865FF98 5957,E865FF97 5957,E865FF96 5957,E865FFA1 5961,E865FFA8 5961,E865FFA7 5961,E865FFA6 5961,E865FFA5 5961,E865FFAF 5961,E865FFB4 5961,E865FFA9 5961
+Cheat19="Have\Ocarina",E865FF5D 59??
+Cheat20="Have\Boomerang",E865FF68 5960
+Cheat21="Have\Lens of Truth",E865FF67 595F
+Cheat22="Have\Megaton Hammer",E865FF65 5969
+Cheat23="Have\Deku Stick",E865FF5C 595A
+Cheat24="Have\Deku Nut",E865FF5B 5959
+Cheat25="Have\Bombs",E865FF5A 595C
+Cheat26="Have\Fairy Bow",E865FF59 595B
+Cheat27="Have\Fairy Slingshot",E865FF5E 5958
+Cheat28="Have\Bombchu",E865FF64 5961
+Cheat29="Have\Arrows\Fire Arrow",E865FF60 5956
+Cheat30="Have\Arrows\Ice Arrow",E865FF62 595E
+Cheat31="Have\Arrows\Light Arrow",E865FF6C 596C
+Cheat32="Have\Hookshot",E865FF63 59??
+Cheat33="Have\Magic Beans",E865FF66 596A
+Cheat34="Have\Magic\Fairie's Wind",E865FF61 595D
+Cheat35="Have\Magic\Nayru's Love",E865FF6B 596B
+Cheat36="Have\Magic\Din's Fire",E865FF5F 5955
+Cheat37="Bottles\Bottle 1 Modifier",E865FF6A 59??
+Cheat38="Bottles\Bottle 2 Modifier",E865FF69 59??
+Cheat39="Bottles\Bottle 3 Modifier",E865FF70 59??
+Cheat40="Bottles\Bottle 4 Modifier",E865FF6F 59??
+Cheat41="Trading\Adult Link Item",E865FF6E 59??
+Cheat42="Trading\Young Link Item",E865FF6D 59??
+Cheat43="Turn Giant's Knife Into Biggoron's Sword",E865FA22 5959
+Cheat44="Have Quiver (Holds 30)",E865FF87 5959
+Cheat45="Equipment Modifier 1",E865FF86 59??
+Cheat46="Equipment Modifier 2",E865FF85 59??
+Cheat47="Press L To Levitate",D01C8675 0020,E97103A8 9923
+Cheat47_N=Press L To Levitate & Let go to land
+Cheat48="Press L For infinite Hover Boots",D01C8675 0020,E9710BC6 595D
+Cheat48_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
+Cheat49="Instant Step Hoover Boots",D01C8675 0020,E97103A8 9923,D01C8675 0000,E9710BC6 595D,E865FF58 59??
+Cheat49_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat49_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
+Cheat50="Beta\Play Beta Quest Worlds",D01C8675 0000,E8650EF5 59??
+Cheat50_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
+Cheat50_N=Put on the code on load up,After the Nintendo logo you will be in Hyrule Field,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
+Cheat51="Warp Song Location\Minuet of Forest & Serenade of Water",E8650E7B 59??
+Cheat51_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
+Cheat51_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat52="Warp Song Location\Prelude of Light & Nocturne of Shadow",E8650E7B 59??
+Cheat52_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
+Cheat52_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat53="Warp Song Location\Bolero of Fire",E8650E7B 59??
+Cheat53_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
+Cheat53_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat54="Warp Song Location\Requiem of Spirit",E8650E7B 59??
+Cheat54_O=$55 Lake Hylia,08 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
+Cheat54_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat55="Max\Double Defense Power",E865FFB1 5966
+Cheat55_N=This gives you White Border Hearts
+Cheat56="Nayru's Love is Always",E9650EB0 ????
+Cheat56_O=$595A OFF,$504F ON
+Cheat56_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
+Cheat57="Infinite\Timers\All Other Timers",E8650EB7 598C
+Cheat57_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
+Cheat58="Epona\Max Carrots\Lon Lon Raunch",E87389E0 5955,E8738FA0 5955
+Cheat58_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
+Cheat59="Infinite\Timers\Escape From Gannons Tower",E8650EBB 5906
+Cheat59_N=This cheat works only on The Final Boss.
+Cheat60="Beta\Specific things lean",E858AA2C 5959
+Cheat60_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest World 01)
+Cheat61="Beta\Appear in Strange Places (Hold R)",D01C8675 0010,E9650D4A 5959
+Cheat61_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
+Cheat62="Beta\Interface always off/on",E86509CF 594F,E8650D41 59??
+Cheat62_O=$5A Off,$59 On
+Cheat62_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset.
+Cheat63="Always Have Wallet Size",E865FF86 59??
+Cheat63_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
+Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
+Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
+Cheat32_O=$64 Hookshot,$63 Longshot
+Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
+Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
+Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
+Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
+Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
+Cheat2_N=do not use under or in water
+Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
+Cheat45_N=This modifies the equipment you are carrying.
+Cheat46_N=This modifies the equipment you are carrying.
+Cheat64="Press L+R For FMV Select",D01C8675 0030,E865FAE5 59FA,D01C8675 0030,E865FAED ????
+Cheat64_O=$495A riforce FMV,$4A5F ire FMV,$4B5A riforce FMV,$4C5A anondorf FMV,$455A lanet Making FMV,$465F ire FMV,$475A anondorf FMV,$485A ore Triforce FMV,$5160 nding
+Cheat64_N=Hold down `L+R' after the Nintendo logo is spinning to see your favourite FMV
+Cheat65="Dark Link\Make Dark Link Apear In TOT",E8774001 597A,E877400B 598B
+
+//----
+
+[693BA2AE-B7F14E9F-C:45]
+Name=The Legend of Zelda - Ocarina of Time (U) (V1.2)
+Cheat0="Infinite\Rupees",E96517A4 5959
+Cheat1="Press R\For Old Or Young Link",D01C8D75 0010,E86503D9 59??
+Cheat1_O=$59 Link Young,$5A Link Old
+Cheat1_N=To Activate this Cheat Hold The R Button when walking through a Doorway this will change you to the option on the other side, Disable this Cheat straight away after getting to the other side, in some places you might even get Access Violations. Just press ok untill you can carry on.
+Cheat2="Use Any Item In Any House",E96511F6 595A,E96511FC 595A
+Cheat3="Have\All Equipment",E9650474 C8C7
+Cheat4="Have\All Quest/Status Items",E965047C 894F,E965047A 504F
+Cheat5="Max\Heart Containers",E9650302 5A9A
+Cheat6="Max\Gold Skulltulas Killed",E86504A7 59B6
+Cheat7="Time of Day Modifier",E96503E4 ????
+Cheat8="Infinite\Energy",E9650308 5A9A
+Cheat9="Infinite\Magic",D011ACB9 0008,E865030E 5959,E8650314 5959,E8650305 59BA
+Cheat10="Tunic & Boot Options",E8650348 59??
+Cheat11="Infinite\Deku Sticks",E8650464 5961
+Cheat12="Infinite\Deku Nuts",E8650463 5961
+Cheat13="Infinite\Bombs",E8650462 5961
+Cheat14="Infinite\Arrows",E8650461 5961
+Cheat15="Infinite\Deku Seeds",E8650466 5961
+Cheat16="Infinite\Bombchu's",E865046C 5961
+Cheat17="Infinite\Magic Beans",E865046E 5961
+Cheat18="Infinite\Big Key,Small Keys,Compass,& Map",E8650480 5957,E865047F 5957,E865047E 5957,E865047D 5957,E8650484 5957,E8650483 5957,E8650482 5957,E8650481 5957,E8650488 5957,E8650487 5957,E8650486 5957,E8650491 5961,E8650498 5961,E8650497 5961,E8650496 5961,E8650495 5961,E865049F 5961,E86504A4 5961,E8650499 5961
+Cheat19="Have\Ocarina",E865034D 59??
+Cheat20="Have\Boomerang",E8650458 5960
+Cheat21="Have\Lens of Truth",E8650457 595F
+Cheat22="Have\Megaton Hammer",E8650455 5969
+Cheat23="Have\Deku Stick",E865034C 595A
+Cheat24="Have\Deku Nut",E865034B 5959
+Cheat25="Have\Bombs",E865034A 595C
+Cheat26="Have\Fairy Bow",E8650349 595B
+Cheat27="Have\Fairy Slingshot",E865034E 5958
+Cheat28="Have\Bombchu",E8650354 5961
+Cheat29="Have\Arrows\Fire Arrow",E8650350 5956
+Cheat30="Have\Arrows\Ice Arrow",E8650352 595E
+Cheat31="Have\Arrows\Light Arrow",E865045C 596C
+Cheat32="Have\Hookshot",E8650353 59??
+Cheat33="Have\Magic Beans",E8650456 596A
+Cheat34="Have\Magic\Fairie's Wind",E8650351 595D
+Cheat35="Have\Magic\Nayru's Love",E865045B 596B
+Cheat36="Have\Magic\Din's Fire",E865034F 5955
+Cheat37="Bottles\Bottle 1 Modifier",E865045A 59??
+Cheat38="Bottles\Bottle 2 Modifier",E8650459 59??
+Cheat39="Bottles\Bottle 3 Modifier",E8650460 59??
+Cheat40="Bottles\Bottle 4 Modifier",E865045F 59??
+Cheat41="Trading\Adult Link Item",E865045E 59??
+Cheat42="Trading\Young Link Item",E865045D 59??
+Cheat43="Turn Giant's Knife Into Biggoron's Sword",E8650312 5959
+Cheat44="Have Quiver (Holds 30)",E8650477 5959
+Cheat45="Equipment Modifier 1",E8650476 59??
+Cheat46="Equipment Modifier 2",E8650475 59??
+Cheat47="Press L To Levitate",D01C8D75 0020,E97106A8 9923
+Cheat47_N=Press L To Levitate & Let go to land
+Cheat48="Press L For infinite Hover Boots",D01C8D75 0020,E9710EC6 595D
+Cheat48_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
+Cheat49="Instant Step Hoover Boots",D01C8D75 0020,E97106A8 9923,D01C8D75 0000,E9710EC6 595D,E8650348 59??
+Cheat49_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat49_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
+Cheat50="Beta\Play Beta Quest Worlds",D01C8D75 0000,E86517E5 59??
+Cheat50_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
+Cheat50_N=Put on the code on load up,After the Nintendo logo you will be in Hyrule Field,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
+Cheat51="Warp Song Location\Minuet of Forest & Serenade of Water",E865176B 59??
+Cheat51_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
+Cheat51_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat52="Warp Song Location\Prelude of Light & Nocturne of Shadow",E865176B 59??
+Cheat52_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
+Cheat52_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat53="Warp Song Location\Bolero of Fire",E865176B 59??
+Cheat53_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
+Cheat53_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat54="Warp Song Location\Requiem of Spirit",E865176B 59??
+Cheat54_O=$55 Lake Hylia,08 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
+Cheat54_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat55="Max\Double Defense Power",E86504A1 5966
+Cheat55_N=This gives you White Border Hearts
+Cheat56="Nayru's Love is Always",E96517A0 ????
+Cheat56_O=$595A OFF,$504F ON
+Cheat56_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
+Cheat57="Infinite\Timers\All Other Timers",E8651567 598C
+Cheat57_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
+Cheat58="Epona\Max Carrots\Lon Lon Raunch",E8739490 5955,E8739150 5955
+Cheat58_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
+Cheat59="Infinite\Timers\Escape From Gannons Tower",E865156B 5906
+Cheat59_N=This cheat works only on The Final Boss.
+Cheat60="Beta\Specific things lean",E858B31C 5959
+Cheat60_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest World 01)
+Cheat61="Beta\Appear in Strange Places (Hold R)",D01C8B65 0010,E965123A 5959
+Cheat61_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
+Cheat62="Beta\Interface always off/on",E8650EBF 594F,E8651231 59??
+Cheat62_O=$5A Off,$59 On
+Cheat62_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset,
+Cheat63="Always Have Wallet Size",E8650476 59??
+Cheat63_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
+Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
+Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
+Cheat32_O=$64 Hookshot,$63 Longshot
+Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
+Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
+Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
+Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
+Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
+Cheat2_N=do not use under or in water
+Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
+Cheat45_N=This modifies the equipment you are carrying.
+Cheat46_N=This modifies the equipment you are carrying.
+Cheat64="Press L+R For FMV Select",D01C8D75 0030,E86503D5 59FA,D01C8D75 0030,E86503DD ????
+Cheat64_O=$495A riforce FMV,$4A5F ire FMV,$4B5A riforce FMV,$4C5A anondorf FMV,$455A lanet Making FMV,$465F ire FMV,$475A anondorf FMV,$485A ore Triforce FMV,$5160 nding
+Cheat64_N=Hold down `L+R' after the Nintendo logo is spinning to see your favourite FMV
+Cheat65="Dark Link\Make Dark Link Apear In TOT",E8774211 597A,E877421B 598B
+
+//----
+
+[2153143F-992D6351-C:45]
+Name=The New Tetris (U)
+Cheat0="Press L + C-Down For Cheat Screen",D01101B3 0024,E9571238 595A,D01101B3 0024,E9571236 595A
+
+//----
+
+[FC74D475-9A0278AB-C:45]
+Name=The Powerpuff Girls - Chemical X-traction (U)
+Cheat0="1 Win Needed\Player 1",D00BAD0F 0000,E85F0461 5959
+Cheat1="Infinite Health\Player 1",E95F0334 9B22
+Cheat2="Max Chemical X\Player 1",E85F0480 595B
+Cheat3="Never Win\Player 1",E85F0461 595A
+Cheat4="No Chemical X\Player 1",E85F0480 595A
+Cheat5="No Health\Player 1",E95F0334 595A
+Cheat6="1 Win Needed\Player 2",D00BB04F 0000,E85F07A1 5959
+Cheat7="Infinite Health\Player 2",E95F0774 9B22
+Cheat8="Max Chemical X\Player 2",E85F07C0 595B
+Cheat9="Never Win\Player 2",E85F07A1 595A
+Cheat10="No Chemical X\Player 2",E85F07C0 595A
+Cheat11="No Health\Player 2",E95F0774 595A
+Cheat12="Infinite Time",E964C004 9B4A
+
+//----
+
 [63E7391C-E6CCEA33-C:45]
 Name=Tom and Jerry in Fists of Furry (U)
 Cheat0="Unlock All Characters",E9649B46 594F
@@ -8618,7 +8863,7 @@ Cheat0_N=This Gives you all Characters to choose from plus fixes A freeze on the
 //----
 
 [392A0C42-B790E77D-C:45]
-Name=RAINBOW SIX
+Name=Tom Clancy's Rainbow Six (U)
 Cheat0="All Missions Unlocked",E9627268 5963
 Cheat2="Infinite Ammo",E957F8D8 755A
 Cheat1="Infinite Health",E959A8DE 755A
@@ -8626,8 +8871,91 @@ Cheat1="Infinite Health",E959A8DE 755A
 //----
 
 [204EC022-B119D185-C:45]
-[204EC022-B119D185-C:45]
-Name=Tony Hawk's Pro Skater (U)
+Name=Tony Hawk's Pro Skater (U) (V1.0)
+Cheat0="Officer Dick\Have All\Tapes",50000901 0000,100DDE08 00FF
+Cheat1="Officer Dick\Have All\Gold Medal\Burnside",E8613162 594F
+Cheat2="Officer Dick\Have All\Gold Medal\Skate Park",E861315D 594F
+Cheat3="Officer Dick\Have All\Gold Medal\Roswell",E8613168 594F
+Cheat4="Tony Hawk\Have All\Tapes",50000901 0000,100DDD40 00FF
+Cheat5="Tony Hawk\Have All\Gold Medal\Burnside Portland",E861349A 594F
+Cheat6="Tony Hawk\Have All\Gold Medal\Skate Park Chicago",E8613495 594F
+Cheat7="Tony Hawk\Have All\Gold Medal\Roswell",E86134A0 594F
+Cheat8="Bob Burnquist\Have All\Tapes",50000901 0000,100DDD54 00FF
+Cheat9="Bob Burnquist\Have All\Gold Medal\Burnside Portland",E86134AE 594F
+Cheat10="Bob Burnquist\Have All\Gold Medal\Skate Park Chicago",E86134A9 594F
+Cheat11="Bob Burnquist\Have All\Gold Medal\Roswell",E86134B4 594F
+Cheat12="Geoff Rowley\Have All\Tapes",50000901 0000,100DDD68 00FF
+Cheat13="Geoff Rowley\Have All\Gold Medal\Burnside Portland",E86134C2 594F
+Cheat14="Geoff Rowley\Have All\Gold Medal\Skate Park Chicago",E86134BD 594F
+Cheat15="Geoff Rowley\Have All\Gold Medal\Roswell",E86134C8 594F
+Cheat16="Bucky Lasek\Have All\Tapes",50000901 0000,100DDD7C 00FF
+Cheat17="Bucky Lasek\Have All\Gold Medal\Burnside Portland",E86134D6 594F
+Cheat18="Bucky Lasek\Have All\Gold Medal\Skate Park Chicago",E86134D1 594F
+Cheat19="Bucky Lasek\Have All\Gold Medal\Roswell",E86134DC 594F
+Cheat20="Chad Muska\Have All\Tapes",50000901 0000,100DDD90 00FF
+Cheat21="Chad Muska\Have All\Gold Medal\Burnside Portland",E86134EA 594F
+Cheat22="Chad Muska\Have All\Gold Medal\Skate Park Chicago",E86134E5 594F
+Cheat23="Chad Muska\Have All\Gold Medal\Roswell",E86134F0 594F
+Cheat24="Kareem Campbell\Have All\Tapes",50000901 0000,100DDDA4 00FF
+Cheat25="Kareem Campbell\Have All\Gold Medal\Burnside Portland",E86134FE 594F
+Cheat26="Kareem Campbell\Have All\Gold Medal\Skate Park Chicago",E86134F9 594F
+Cheat27="Kareem Campbell\Have All\Gold Medal\Roswell",E8613404 594F
+Cheat28="Andrew Reynolds\Have All\Tapes",50000901 0000,100DDDB8 00FF
+Cheat29="Andrew Reynolds\Have All\Gold Medal\Burnside Portland",E8613412 594F
+Cheat30="Andrew Reynolds\Have All\Gold Medal\Skate Park Chicago",E861340D 594F
+Cheat31="Andrew Reynolds\Have All\Gold Medal\Roswell",E8613418 594F
+Cheat32="Rune Glifberg\Have All\Tapes",50000901 0000,100DDDCC 00FF
+Cheat33="Rune Glifberg\Have All\Gold Medal\Burnside Portland",E8613426 594F
+Cheat34="Rune Glifberg\Have All\Gold Medal\Skate Park Chicago",E8613421 594F
+Cheat35="Rune Glifberg\Have All\Gold Medal\Roswell",E861342C 594F
+Cheat36="Jamie Thomas\Have All\Tapes",50000901 0000,100DDDE0 00FF
+Cheat37="Jamie Thomas\Have All\Gold Medal\Burnside Portland",E861343A 594F
+Cheat38="Jamie Thomas\Have All\Gold Medal\Skate Park Chicago",E8613435 594F
+Cheat39="Jamie Thomas\Have All\Gold Medal\Roswell",E8613440 594F
+Cheat40="Elissa Steamer\Have All\Tapes",50000901 0000,100DDDF4 00FF
+Cheat41="Elissa Steamer\Have All\Gold Medal\Burnside Portland",E861344E 594F
+Cheat42="Elissa Steamer\Have All\Gold Medal\Skate Park Chicago",E8613449 594F
+Cheat43="Elissa Steamer\Have All\Gold Medal\Roswell",E8613454 594F
+Cheat44="Have All Tracks",E991C196 504F,E991A24E 504F,E991B4B6 504F,E991DB36 504F,E991A21E 504F,E991B27E 504F,E991E3A6 504F,E991A956 504F,E991C48E 504F
+Cheat45="Player 1\Tony Hawk\Full Special All Levels",D00C0223 0000,E991BCCA 5B40,D00C0223 0001,E9919A80 5B40,D00C0223 0002,E991ABEA 5B40,D00C0223 0003,E991D36A 5B40,D00C0223 0004,E99199D2 5B40,D00C0223 0005,E991A9B2 5B40,D00C0223 0006,E991D6DA 5B40,D00C0223 0007,E991A48A 5B40,D00C0223 0008,E991BBC2 5B40
+Cheat46="Player 1\Max Points\The Warehouse",E991C196 504F
+Cheat47="Player 1\Max Points\The School",E991A24E 504F
+Cheat48="Player 1\Max Points\The Mall",E991B4B6 504F
+Cheat49="Player 1\Max Points\The Skate Park",E991DB36 504F
+Cheat50="Player 1\Max Points\Downtown Chicago",E991A21E 504F
+Cheat5="Player 1\Max Points\Downhill Jam",E991B27E 504F
+Cheat5="Player 1\Max Points\Burnside",E991E3A6 504F
+Cheat5="Player 1\Max Points\Street",E991A956 504F
+Cheat5="Player 1\Max Points\Roswell New Mexico",E991C48E 504F
+Cheat5="Player 1\Super Max\Ollie",E861A974 504F
+Cheat5="Player 1\Super Max\Speed",E861A973 504F
+Cheat5="Player 1\Super Max\Air",E861A972 504F
+Cheat5="Player 1\Super Max\Balance",E861A971 504F
+Cheat59="Player 1\Super Max\Turning",E861A978 504F
+Cheat60="Player 2\Super Max\Ollie",E861A977 504F
+Cheat61="Player 2\Super Max\Speed",E861A976 504F
+Cheat62="Player 2\Super Max\Air",E861A975 504F
+Cheat63="Player 2\Super Max\Balance",E861A97C 504F
+Cheat64="Player 2\Super Max\Turning",E861A97B 504F
+Cheat65="Player 1\Play As",E861562C 59??
+Cheat66_O=$ 00 Tony Hawk,$ 01 Bob Burnquist,$ 02 Geoff Rowley,$ 03 Bucky Lasek,$ 04 Chad Muska,$ 05 Kareem Campbell,$ 06 Andrew Reynolds,$ 07 Rune Glifberg,$ 08 Jamie Thomas,$ 09 Elissa Steamer,$ 0A Officer Dick
+Cheat67="Player 2\Play As",E861562B 59??
+Cheat67_O=$5A Tony Hawk,$59 Bob Burnquist,$5C Geoff Rowley,$5B Bucky Lasek,$56 Chad Muska,$55 Kareem Campbell,$58 Andrew Reynolds,$57 Rune Glifberg,$62 Jamie Thomas,$61 Elissa Steamer,$64 Officer Dick
+Cheat68="Player 1\Have Perfect Balance",E8612ED5 5959
+Cheat68="Player 1\Max Trick Score\The Warehouse",E991C196 504F
+Cheat69="Player 1\Max Trick Score\The School",E991A24E 504F
+Cheat70="Player 1\Max Trick Score\The Mall",E991B4B6 504F
+Cheat71="Player 1\Max Trick Score\The Skate Park Course",E991DB36 504F
+Cheat72="Player 1\Max Trick Score\Downtown",E991A21E 504F
+Cheat73="Player 1\Max Trick Score\Downhill Jam",E991B27E 504F
+Cheat74="Player 1\Max Trick Score\Burnside",E991E3A6 504F
+Cheat75="Player 1\Max Trick Score\The Streets",E991A956 504F
+Cheat76="Player 1\Max Trick Score\Roswell",E991C48E 504F
+
+//----
+
+[E0144180-650B78C9-C:45]
+Name=Tony Hawk's Pro Skater (U) (V1.1)
 Cheat0="Officer Dick\Have All\Tapes",50000901 0000,100DDE08 00FF
 Cheat1="Officer Dick\Have All\Gold Medal\Burnside",E8613162 594F
 Cheat2="Officer Dick\Have All\Gold Medal\Skate Park",E861315D 594F
@@ -8768,41 +9096,41 @@ Cheat50="Access In-Game Cheat Menu",50001104 0000,100E9DD8 0001
 
 [1A7F70B5-00B7B9FD-C:45]
 Name=Tony Hawk's Pro Skater 3 (U)
-Cheat0="Tony Hawk\All Levels Open,Gold Medals & Goals Compleated",E8642F50 594F,50001001 0000,100ED908 00FF
+Cheat0="Tony Hawk\All Levels Open,Gold Medals & Goals Completed",E8642F50 594F,50001001 0000,100ED908 00FF
 Cheat1="Tony Hawk\Have all 5of5 Stat Points & All Decks",50000F04 0000,100ED934 00FF
-Cheat2="Steve Caballero\All Levels Open,Gold Medals & Goals Compleated",E864302C 594F,50001001 0000,100ED9E4 00FF
+Cheat2="Steve Caballero\All Levels Open,Gold Medals & Goals Completed",E864302C 594F,50001001 0000,100ED9E4 00FF
 Cheat3="Steve Caballero\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EDA10 00FF
-Cheat4="Kareem Campbell\All Levels Open,Gold Medals & Goals Compleated",E8642D08 594F,50001001 0000,100EDAC0 00FF
+Cheat4="Kareem Campbell\All Levels Open,Gold Medals & Goals Completed",E8642D08 594F,50001001 0000,100EDAC0 00FF
 Cheat5="Kareem Campbell\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EDAEC 00FF
-Cheat6="Rune Glifberg\All Levels Open,Gold Medals & Goals Compleated",E8642EE4 594F,50001001 0000,100EDB9C 00FF
+Cheat6="Rune Glifberg\All Levels Open,Gold Medals & Goals Completed",E8642EE4 594F,50001001 0000,100EDB9C 00FF
 Cheat7="Rune Glifberg\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EDBC8 00FF
-Cheat8="Eric Koston\All Levels Open,Gold Medals & Goals Compleated",E86433C0 594F,50001001 0000,100EDC78 00FF
+Cheat8="Eric Koston\All Levels Open,Gold Medals & Goals Completed",E86433C0 594F,50001001 0000,100EDC78 00FF
 Cheat9="Eric Koston\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EDCA4 00FF
-Cheat10="Bucky Lasek\All Levels Open,Gold Medals & Goals Compleated",E864349C 594F,50001001 0000,100EDD54 00FF
+Cheat10="Bucky Lasek\All Levels Open,Gold Medals & Goals Completed",E864349C 594F,50001001 0000,100EDD54 00FF
 Cheat11="Bucky Lasek\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EDD80 00FF
-Cheat12="Rodney Mullen\All Levels Open,Gold Medals & Goals Compleated",E8643178 594F,50001001 0000,100EDE30 00FF
+Cheat12="Rodney Mullen\All Levels Open,Gold Medals & Goals Completed",E8643178 594F,50001001 0000,100EDE30 00FF
 Cheat13="Rodney Mullen\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EDE5C 00FF
-Cheat14="Chad Muska\All Levels Open,Gold Medals & Goals Compleated",E8643154 594F,50001001 0000,100EDF0C 00FF
+Cheat14="Chad Muska\All Levels Open,Gold Medals & Goals Completed",E8643154 594F,50001001 0000,100EDF0C 00FF
 Cheat15="Chad Muska\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EDF38 00FF
-Cheat16="Andrew Rynolds\All Levels Open,Gold Medals & Goals Compleated",E8643230 594F,50001001 0000,100EDFE8 00FF
+Cheat16="Andrew Rynolds\All Levels Open,Gold Medals & Goals Completed",E8643230 594F,50001001 0000,100EDFE8 00FF
 Cheat17="Andrew Rynolds\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE014 00FF
-Cheat18="Geoff Rowley\All Levels Open,Gold Medals & Goals Compleated",E864370C 594F,50001001 0000,100EE0C4 00FF
+Cheat18="Geoff Rowley\All Levels Open,Gold Medals & Goals Completed",E864370C 594F,50001001 0000,100EE0C4 00FF
 Cheat19="Geoff Rowley\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE0F0 00FF
-Cheat20="Elissa Steamer\All Levels Open,Gold Medals & Goals Compleated",E86438E8 594F,50001001 0000,100EE1A0 00FF
+Cheat20="Elissa Steamer\All Levels Open,Gold Medals & Goals Completed",E86438E8 594F,50001001 0000,100EE1A0 00FF
 Cheat21="Elissa Steamer\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE1CC 00FF
-Cheat22="Jamie Thomas\All Levels Open,Gold Medals & Goals Compleated",E86435C4 594F,50001001 0000,100EE27C 00FF
+Cheat22="Jamie Thomas\All Levels Open,Gold Medals & Goals Completed",E86435C4 594F,50001001 0000,100EE27C 00FF
 Cheat23="Jamie Thomas\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE2A8 00FF
-Cheat24="Bam Margera\All Levels Open,Gold Medals & Goals Compleated",E86436A0 594F,50001001 0000,100EE358 00FF
+Cheat24="Bam Margera\All Levels Open,Gold Medals & Goals Completed",E86436A0 594F,50001001 0000,100EE358 00FF
 Cheat25="Bam Margera\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE384 00FF
-Cheat26="Skater A\All Levels Open,Gold Medals & Goals Compleated",E8643B7C 594F,50001001 0000,100EE434 00FF
+Cheat26="Skater A\All Levels Open,Gold Medals & Goals Completed",E8643B7C 594F,50001001 0000,100EE434 00FF
 Cheat27="Skater A\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE460 00FF
-Cheat28="Skater B\All Levels Open,Gold Medals & Goals Compleated",E8643C58 594F,50001001 0000,100EE510 00FF
+Cheat28="Skater B\All Levels Open,Gold Medals & Goals Completed",E8643C58 594F,50001001 0000,100EE510 00FF
 Cheat29="Skater B\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE53C 00FF
-Cheat30="Skater C\All Levels Open,Gold Medals & Goals Compleated",E8643C34 594F,50001001 0000,100EE5EC 00FF
+Cheat30="Skater C\All Levels Open,Gold Medals & Goals Completed",E8643C34 594F,50001001 0000,100EE5EC 00FF
 Cheat31="Skater C\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE618 00FF
-Cheat32="Officer Dick\All Levels Open,Gold Medals & Goals Compleated",E8643910 594F,50001001 0000,100EE6C8 00FF
+Cheat32="Officer Dick\All Levels Open,Gold Medals & Goals Completed",E8643910 594F,50001001 0000,100EE6C8 00FF
 Cheat33="Officer Dick\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE6F4 00FF
-Cheat34="Wolverine\All Levels Open,Gold Medals & Goals Compleated",E8643AEC 594F,50001001 0000,100EE7A4 00FF
+Cheat34="Wolverine\All Levels Open,Gold Medals & Goals Completed",E8643AEC 594F,50001001 0000,100EE7A4 00FF
 Cheat35="Wolverine\Have all 5of5 Stat Points & All Decks",50000F04 0000,100EE7D0 00FF
 Cheat36="Infinite Stat Upgrades & Deck Boards to Buy",E8642F4F 594F,E864305B 594F,E864349B 594F,E86434A7 594F,E864323B 594F,E864322F 594F,E864302B 594F,E8643037 594F,E8642D07 594F,E8642D13 594F,E8642EE3 594F,E8642EEF 594F,E86433BF 594F,E86433CB 594F,E8643177 594F,E8643183 594F,E8643153 594F,E864325F 594F,E864370B 594F,E8643717 594F,E86438E7 594F,E86438F3 594F,E86435C3 594F,E86435CF 594F,E864369F 594F,E86436AB 594F,E8643B7B 594F,E8643B87 594F,E8643C57 594F,E8643C63 594F,E8643C33 594F,E8643C3F 594F,E864390F 594F,E864391B 594F,E8643AEB 594F,E8643AF7 594F
 Cheat37="Play As",E864F4BF 59??
@@ -8816,7 +9144,7 @@ Cheat36_N=This allows you to ugrade you stats in Upgrades to the Max & Also to o
 //----
 
 [8ECC02F0-7F8BDE81-C:45]
-Name=Top Gear Hyper-Bike (U)
+Name=Top Gear Hyper Bike (U)
 Cheat0="Access All\Bikes",E9631312 504F
 Cheat1="Access All\Tracks",E9631316 504F
 Cheat2="Infinite\Nitro",E95FE1A4 9B22
@@ -8884,8 +9212,29 @@ Cheat4="Hold jump to fly",E95F0754 595C
 
 //----
 
+[4D79D316-E8501B33-C:45]
+Name=Transformers - Beast Wars Transmetal (U)
+Cheat0="Infinite\Health\Player 1",E968249A 785F
+Cheat1="Infinite\Stun Meter\Player 1",E868249F 594F
+Cheat2="Infinite\Health\Player 2",E96A251A 785F
+Cheat3="Infinite\Stun Meter\Player 2",E86A251F 594F
+Cheat4="Play As\Player 1",E86F35FC 59??
+Cheat4_O=$5A Optimus Primal,$59 Rattrap,$5C Cheetor,$5B Airazor,$56 Megatron,$55 Tarantulas,$58 Waspinator,$57 Terrorsaur
+Cheat5="Play As\Player 2",E86F35FB 59??
+Cheat5_O=$5A Optimus Primal,$59 Rattrap,$5C Cheetor,$5B Airazor,$56 Megatron,$55 Tarantulas,$58 Waspinator,$57 Terrorsaur
+Cheat6="Choose Stage\VS. Mode",E8642921 59??
+Cheat6_O=$5A Stage 1,$59 Stage 2,$5C Stage 3,$5B Stage 4,$56 Stage 5,$55 Stage 6,$58 Stage 7,$57 Stage 8 (Hidden Stage),$62 Stage 9 (Hidden Stage),$61 Stage A (Hidden Stage),
+Cheat7="Infinite\Time",E8667DEC 5964
+Cheat8="Bonus Menu Games\Infinite Time\Escape Race 100 & 200\Player 1",E96F260A 5964
+Cheat9="Bonus Menu Games\Infinite Time\Escape Race 100 & 200\Player 2",E96F260E 5964
+Cheat10="Bonus Menu Games\Max\Wins\Sunset & Sunrise Showdown\Player 1",E86F15B1 594F
+Cheat11="Bonus Menu Games\Max\Points\Disc Hunter\Player 1",E86F263F 594F
+Cheat12="Bonus Menu Games\Max\Points\Disc Hunter\Player 2",E86F263D 594F
+
+//----
+
 [2F70F10D-5C4187FF-C:45]
-Name=Turok: Dinosaur Hunter (U) (v1.0)
+Name=Turok - Dinosaur Hunter (U) (V1.0)
 Cheat0="Infinite\Body Armor",E968E33A B47B,E868E479 5959
 Cheat1="Infinite\Air",E968E788 0339,E974DC3E 4A4F
 Cheat2="Have\All Level Keys",50000604 0000,10128D33 0007,E868E49D 596F,E868E4BD 594F
@@ -8903,7 +9252,7 @@ Cheat10="Have\Cheat Menu",E965EC98 504F,E965EC96 504F
 //----
 
 [2F700DCD-176CC5C9-C:45]
-Name=Turok: Dinosaur Hunter (U) (v1.1)
+Name=Turok - Dinosaur Hunter (U) (V1.1) (V1.2)
 Cheat0="Infinite\Body Armor",E968E18A B47B,E868E1C9 5959
 Cheat1="Infinite\Air",E968E8D8 0339,E974DA8E 4A4F
 Cheat2="Have\All Level Keys",50000604 0000,10128E83 0007,E868E1ED 596F,E868E10D 594F
@@ -8969,7 +9318,7 @@ Cheat9_N=Do Not use this with Level Select Proving Ground-Tightrope. Only use On
 //----
 
 [E8C95AFC-35D121DA-C:45]
-Name=Turok 2: Seeds of Evil (U) (Kiosk)
+Name=Turok 2 - Seeds of Evil (U) (Kiosk Demo)
 Cheat0="Infinite\Health",E886AB9A 59B6,E8BAE2FA 59B6
 Cheat1="99 Gems",E886AB9F 59BB,E8BAE2FF 59BB
 Cheat2="Infinite\Ammo",50000302 0000,11305868 0063,50000304 0000,11305872 0063,5000020E 0000,11305882 0063,50000302 0000,116493C8 0063,50000304 0000,116493D2 0063,5000020E 0000,116493E2 0063
@@ -8977,7 +9326,20 @@ Cheat2="Infinite\Ammo",50000302 0000,11305868 0063,50000304 0000,11305872 0063,5
 //----
 
 [49088A11-6494957E-C:45]
-Name=Turok 2: Seeds of Evil (U)
+Name=Turok 2 - Seeds of Evil (U) (V1.0)
+Cheat0="Player 1\Have All\Weapons",D12FC912 0000,E9832066 5A59,D12FC914 0000,E983206C 5A59,D12FC916 0000,E983206A 5A59,D12FC918 0000,E9832070 5A59,D12FC91A 0000,E983206E 5A59,D12FC91C 0000,E9832074 5A59,D12FC91E 0000,E9832072 5A59,D12FC920 0000,E9832078 5A59,D12FC922 0000,E9832076 5A59,D12FC924 0000,E983207C 5A59,D12FC926 0000,E983207A 5A59,D12FC928 0000,E9832080 5A59,D12FC92A 0000,E983207E 5A59,D12FC92C 0000,E9832084 5A59,D12FC92E 0000,E9832082 5A59,D12FC930 0000,E9832088 5A59,D12FC932 0000,E9832086 5A59,E8C33A96 5959,E8C33A95 5959,E8C33A9C 5959,E8C33A9B 5959,E8C33A9A 5959,E8C33A99 5959,E8C33AA0 5959,E8C33A9F 5959,E8C33A9E 5959,E8C33A9D 5959,E8C33AA4 5959,E8C33AA3 5959,E8C33AA2 5959,E8C33AA1 5959,E8C33AA8 5959,E8C33AA7 5959,E8C33AA6 5959,E8C33AA5 5959,E8C33AAC 5959,E8C33AAA 5959,E8C33AA9 5959,E8C33AB0 5959,E8C33AAF 5959,E8C33AAE 5959,E8C33AAD 5959,E8C33AB4 5959,E8C33AB2 5959,E8C33AB1 5959,E8C33AB8 5959,E8C33AB7 5959,E8C33AB6 5959,E8C33AB5 5959,E8C33ABC 5959
+Cheat1="Player 1\Infinite\Health",E9831B1A 59B6,E9C3354A B55A
+Cheat2="Player 1\99 Gems",E9831B20 59BB,E8C33550 59BB
+Cheat3="Player 1\Infinite\Ammo",E8831BEF 595A,50000302 0000,112FC8D4 0063,E9831F32 59BB,E9831F36 59BB,50000A02 0000,112FC8E6 0063,50000302 0000,116FE704 0063,E9C33A62 59BB,E9C33A66 59BB,50000802 0000,116FE716 0063,E9C33A84 59BB,E9C33A88 59BB
+Cheat4="Player 1\Have All\Keys,Nuke,Evrything",E8831956 598A,E8831964 598A,E883196A 598A,E8831978 598A,50000601 0000,102FC634 0030,50000501 0000,102FC648 0030,50000401 0000,102FC65C 0030,50000601 0000,102FC99C 0030,E8831B38 598B,E8831B3B 598B,E8831B3E 598B,E8831CEC 598B,E8831C88 598B,E8831C8E 598B,E8831C8D 598B,E8831C08 598B,E8831C07 598B,E8831C06 598B,E8831C05 598B,E8C33B86 598A,E8C33B94 598A,E8C33B9A 598A,E8C33BA8 598A,50000601 0000,106FE464 0030,50000501 0000,106FE478 0030,50000501 0000,106FE48C 0030,50000601 0000,106FE4CC 0030,E8C33668 598B,E8C3366B 598B,E8C3366E 598B,E8C336B8 598B,E8C336BE 598B,E8C336BD 598B,E8C3361C 598B,50000401 0000,106FE3E0 0033,50000601 0000,1059D61A 0001,50000D01 0000,1059D620 0001,50000401 0000,1059D62E 0001
+Cheat5="Player 2\Infinite\Health",E983C592 59B6,E8AD2822 59B6
+Cheat6="Player 2\Infinite\Ammo",50000602 0000,112F767C 0063,E983C9A4 5A8E,E983C9A2 5A8E,50000302 0000,112F7654 013C,E983C9B8 5A8E,E983C9BC 5A8E,E983C9BE 5A8E,E983C9C4 5A8E,E983C9CC 5A8E,E983C9D0 5A8E,E9AD2C34 5A8E,E9AD2C32 5A8E,E9AD2C3C 5A8E,E9AD2C40 5A8E,E9AD2C3E 5A8E,E9AD2C48 5A8E,E9AD2C4C 5A8E,E9AD2C4E 5A8E,E9AD2C54 5A8E,E9AD295C 5A8E,E9AD2960 5A8E,50000602 0000,1159D60C 013C
+Cheat7="Player 2\99 Gems",E983C598 59BB
+
+//----
+
+[E0B92B94-B9A7E025-C:45]
+Name=Turok 2 - Seeds of Evil (U) (V1.1)
 Cheat0="Player 1\Have All\Weapons",D12FC912 0000,E9832066 5A59,D12FC914 0000,E983206C 5A59,D12FC916 0000,E983206A 5A59,D12FC918 0000,E9832070 5A59,D12FC91A 0000,E983206E 5A59,D12FC91C 0000,E9832074 5A59,D12FC91E 0000,E9832072 5A59,D12FC920 0000,E9832078 5A59,D12FC922 0000,E9832076 5A59,D12FC924 0000,E983207C 5A59,D12FC926 0000,E983207A 5A59,D12FC928 0000,E9832080 5A59,D12FC92A 0000,E983207E 5A59,D12FC92C 0000,E9832084 5A59,D12FC92E 0000,E9832082 5A59,D12FC930 0000,E9832088 5A59,D12FC932 0000,E9832086 5A59,E8C33A96 5959,E8C33A95 5959,E8C33A9C 5959,E8C33A9B 5959,E8C33A9A 5959,E8C33A99 5959,E8C33AA0 5959,E8C33A9F 5959,E8C33A9E 5959,E8C33A9D 5959,E8C33AA4 5959,E8C33AA3 5959,E8C33AA2 5959,E8C33AA1 5959,E8C33AA8 5959,E8C33AA7 5959,E8C33AA6 5959,E8C33AA5 5959,E8C33AAC 5959,E8C33AAA 5959,E8C33AA9 5959,E8C33AB0 5959,E8C33AAF 5959,E8C33AAE 5959,E8C33AAD 5959,E8C33AB4 5959,E8C33AB2 5959,E8C33AB1 5959,E8C33AB8 5959,E8C33AB7 5959,E8C33AB6 5959,E8C33AB5 5959,E8C33ABC 5959
 Cheat1="Player 1\Infinite\Health",E9831B1A 59B6,E9C3354A B55A
 Cheat2="Player 1\99 Gems",E9831B20 59BB,E8C33550 59BB
@@ -8990,7 +9352,7 @@ Cheat7="Player 2\99 Gems",E983C598 59BB
 //----
 
 [89A579F1-667E97EF-C:45]
-Name=Turok 3: Shadow of Oblivion (U)
+Name=Turok 3 - Shadow of Oblivion (U)
 Cheat0="Have PSG",E8878B8E 5959
 Cheat1="Have Cerebral Bore",E8878B89 5959
 Cheat2="Have All Secrets",E96CB01A 504F,E96CB01C 504F
@@ -9007,34 +9369,8 @@ Cheat12="Have Shotgun",E8878B88 5959
 
 //----
 
-[033F4C13-319EE7A7-C:45]
-Name=World is Not Enough, The (U)
-Cheat0="Have All\Levels Unlocked",E966813A 5979
-Cheat0_N=For Single Player Mode Only
-Cheat1="Invincibility On All levels",E96582C0 5A59
-Cheat2="Skip Intro,",D03B0E5F 0004,E88F61B1 5961
-Cheat3="Level select",E88F61B1 5961
-Cheat4="Infinite\Ammo On All Levels",E95C9F34 755A
-Cheat5="Have All\Guns On All Levels",E959457C 616A,E959457A 595A,E9594580 759C,E959457E 5959,E9965758 8D5C,E9965756 5A5A,E996575C 759C,E996575A 59BB,E9965760 FFDC,E996575E 5BE2,E9965764 FFDC,E9965762 5BF2,E9965768 FFDC,E9965766 5BFA,E996576C FFDC,E996576A 5B02,E9965770 FFDC,E996576E 5B0A,E9965774 FFDC,E9965772 5B1A,E9965778 FFDC,E9965776 5B22,E996577C FFDC,E996577A 5B2A,E9965780 FFDC,E996577E 5B32,E9965784 FFDC,E9965782 5B42,E9965788 FFDC,E9965786 5B4A,E996578C FFDC,E996578A 5B52,E9965790 FFDC,E996578E 5C5A,E9965794 FFDC,E9965792 5C62,E9965798 FFDC,E9965796 5C6A,E996579C FFDC,E996579A 5C7A,E99657A0 FFDC,E996579E 5C8A,E99657A4 FFDC,E99657A2 5C92,E99657A8 FFDC,E99657A6 5CAA,E99657AC FFDC,E99657AA 5CB2,E99657B0 FFDC,E99657AE 5CBA,E99657B4 FFDC,E99657B2 5CCA,E99657B8 FFDC,E99657B6 5CD2,E99657BC FFDC,E99657BA 5CDA,E99657C0 FFDC,E99657BE 5CE2,E99657C4 FFDC,E99657C2 5C9A,E99657C8 FFDC,E99657C6 5CA2,E99657CC FFDC,E99657CA 5CAA,E99657D0 6159,E99657CE CDDE,E99657D4 F9C7,E99657D2 5A4E
-Cheat5_N=Once you pick up a Gun You will have all weapons
-Cheat6="Time Taken Clock At 0:00",E8668256 595A
-Cheat7="Infinite\Time",E98E418E 7212
-Cheat7_N=Underground Uprising
-Cheat8="Have All\Skins + Everyone is Evil",50005C0C 0000,100BF687 0081
-Cheat9="Have All\Gadgets",E86582C3 5959
-Cheat10="Go Solo In Multiplayer",D00E0778 0042,E8665509 5959
-Cheat11="Stop Bond From Going Downhill on Cold Reception",D10E0778 0020,E890DBBA 5959,D10E0778 0010,E890DBBA 595A
-Cheat11_N=Press L to Stop, & R to Go
-Cheat12="Fail Objectives To Complete Them",E9576C10 755C,E9576C0E 5969
-Cheat13="Infinite\Ammo On Clip,",E95CA004 755A
-Cheat14="Have Tons Of Nightvision",E95CA3D6 665A
-Cheat14_N=For Battery Only
-Cheat15="Play Crate Yard Level",E8668131 5962
-
-//----
-
 [BBC99D32-117DAA80-C:45]
-Name=TWISTED EDGE
+Name=Twisted Edge Extreme Snowboarding (U)
 Cheat0="Max\50000 Stunt Points",E95E8010 1CAA
 Cheat2="Have\All Characters",E95E8050 584F
 Cheat3="Have\All Difficulties",E95E8048 585A
@@ -9044,6 +9380,16 @@ Cheat1="Low Timer",E86AEC51 595A,E86AE957 595A
 
 //----
 
+[3C059038-C8BF2182-C:45]
+Name=V-Rally Edition 99 (U)
+Cheat0="Enable All\Cars",E86A6471 598F
+Cheat1="Enable All\Tracks",E86A646E 59CA
+Cheat2="Unlock Champ",E86A6480 5959
+Cheat3="Enable All\Expert Times",E86A6474 5989
+Cheat4="Unlock Cheat Menu",D11B1F14 0000,E96F726C 594F,E971A65E 554F,D11B1F14 00FF,E96F55C8 505B
+
+//----
+
 [EA71056A-E4214847-C:45]
 Name=Vigilante 8 (U)
 Cheat0="All Characters & Levels",E96E6CC6 5A1A
@@ -9075,7 +9421,7 @@ Cheat11="All Characters\Have Max\Target Avoidance\Player 2",5000120A 0000,101980
 //----
 
 [82B3248B-E73E244D-C:45]
-Name=Virtual Chess 64 (U)
+Name=Virtual Chess 64 (U) (M3)
 Cheat0="Debug Mode",E964B5E8 5959
 Cheat1="Time Always Counts Down\On Black Players Side",E86819D3 5959
 Cheat2="Time Always Counts Down\On White Players Side",E86819D3 595A
@@ -9105,18 +9451,26 @@ Cheat9="Aiming Sites Always Available",E9836076 5956
 
 //----
 
-[3C059038-C8BF2182-C:45]
-Name=V-Rally Edition 99 (U)
-Cheat0="Enable All\Cars",E86A6471 598F
-Cheat1="Enable All\Tracks",E86A646E 59CA
-Cheat2="Unlock Champ",E86A6480 5959
-Cheat3="Enable All\Expert Times",E86A6474 5989
-Cheat4="Unlock Cheat Menu",D11B1F14 0000,E96F726C 594F,E971A65E 554F,D11B1F14 00FF,E96F55C8 505B
+[8066D58A-C3DECAC1-C:45]
+Name=Waialae Country Club - True Golf Classics (U) (V1.0)
+Cheat0="Max Power",E868FB87 504F
+Cheat1="Max Technique",E868FB85 504F
+Cheat2="Max Putt",E868FB8B 504F
+Cheat3="Max Recover",E868FB89 504F
+Cheat4="Select Club",E871FBEA 59??
+Cheat4_O=$5A 1W,$59 2W,$5C 3W,$5B 4W,$56 5W,$55 1I,$58 2I,$57 3I,$62 4I,$61 5I,$64 6I,$63 7I,$5E 8I,$5D 9I,$60 PW,$5F AW,$6A SW,$69 Putter
+Cheat5="Always On First Shot",E971FBCE 5959
+Cheat6="Club Type\Woods Mods",E868FBC6 59??
+Cheat6_O=$5A Titan,$59 Metal Wood,$5C Persimmon
+Cheat7="Club Type\Irons Mods",E868FBC5 59??
+Cheat7_O=$5A Cavity,$59 Conventional
+Cheat8="Club Type\Sand Wedge Mods",E868FBCC 59??
+Cheat8_O=$5A 58 Degrees,$59 60 Degrees,$5C 62 Degrees
 
 //----
 
-[8066D58A-C3DECAC1-C:45]
-Name=Waialae Country Club - True Golf Classics (U)
+[DD318CE2-B73798BA-C:45]
+Name=Waialae Country Club - True Golf Classics (U) (V1.1)
 Cheat0="Max Power",E868FB87 504F
 Cheat1="Max Technique",E868FB85 504F
 Cheat2="Max Putt",E868FB8B 504F
@@ -9142,7 +9496,7 @@ Cheat2="Infinite Credits",E987BCD6 5955,E987BCE2 5956
 //----
 
 [7DE11F53-74872F9D-C:45]
-Name=Wave Race 64 (U) (v1.0)
+Name=Wave Race 64 (U) (V1.0)
 Cheat0="Misses Don't Count",E8727A21 595A
 Cheat1="Infinite Time Stunt Mode",E87280B2 594F
 Cheat2="Super Speed",E8727A19 5955,D0154051 0010,E8727A19 597A
@@ -9163,7 +9517,7 @@ Cheat11="Always First Place",E87279F1 595A
 //----
 
 [492F4B61-04E5146A-C:45]
-Name=Wave Race 64 (U) (v1.1)
+Name=Wave Race 64 (U) (V1.1)
 Cheat0="Misses Don't Count",E8727DC1 595A
 Cheat1="Infinite Time Stunt Mode",E8727E52 594F
 Cheat2="Super Speed",E8727DB9 5955,D01CE659 0010,E8727DB9 597A
@@ -9183,22 +9537,6 @@ Cheat11="Always First Place",E8728091 595A
 
 //----
 
-[6B45223F-F00E5C56-C:45]
-Name=Wayne Gretzky's 3D Hockey (U)
-Cheat0="Team 1\Score pts",E864BD07 59??
-Cheat0_O=$5A Zero Points,$70 30 Points,$7B 50 Points,$A3 75 Points,$BB 99 Points
-Cheat1="Team 2\Score pts",E864F2E3 ????
-Cheat1_O=$595A ero Points,$6F5B 0 Points,$7C55 0 Points,$A457 5 Points,$BC61 9 Points
-Cheat2="Crunched Players",E964F7D0 905A
-Cheat3="Extra Teams",E862C55B 5959
-Cheat4="Get In Fights Constantly",E8609B82 597A
-Cheat5="Players\Height Size",E964F7CC ????
-Cheat5_O=$905A Midgets,$90DA Normal Size,$901A Large,$99DA Giants
-Cheat6="Players\Head Size",E964F7C8 ????
-Cheat6_O=$905A Very Small,$90DA Normal Size,$99DA Very Large
-
-//----
-
 [5A9D3859-97AAE710-C:45]
 Name=Wayne Gretzky's 3D Hockey '98 (U)
 Cheat0="Team 1\Score pts",E86517B7 59??
@@ -9215,8 +9553,40 @@ Cheat6_O=$905A Very Small,$90DA Normal Size,$99DA Very Large
 
 //----
 
+[6B45223F-F00E5C56-C:45]
+Name=Wayne Gretzky's 3D Hockey (U) (V1.0)
+Cheat0="Team 1\Score pts",E864BD07 59??
+Cheat0_O=$5A Zero Points,$70 30 Points,$7B 50 Points,$A3 75 Points,$BB 99 Points
+Cheat1="Team 2\Score pts",E864F2E3 ????
+Cheat1_O=$595A ero Points,$6F5B 0 Points,$7C55 0 Points,$A457 5 Points,$BC61 9 Points
+Cheat2="Crunched Players",E964F7D0 905A
+Cheat3="Extra Teams",E862C55B 5959
+Cheat4="Get In Fights Constantly",E8609B82 597A
+Cheat5="Players\Height Size",E964F7CC ????
+Cheat5_O=$905A Midgets,$90DA Normal Size,$901A Large,$99DA Giants
+Cheat6="Players\Head Size",E964F7C8 ????
+Cheat6_O=$905A Very Small,$90DA Normal Size,$99DA Very Large
+
+//----
+
+[6B45223F-F00E5C56-C:45]
+Name=Wayne Gretzky's 3D Hockey (U) (V1.1)
+Cheat0="Team 1\Score pts",E864BD07 59??
+Cheat0_O=$5A Zero Points,$70 30 Points,$7B 50 Points,$A3 75 Points,$BB 99 Points
+Cheat1="Team 2\Score pts",E864F2E3 ????
+Cheat1_O=$595A ero Points,$6F5B 0 Points,$7C55 0 Points,$A457 5 Points,$BC61 9 Points
+Cheat2="Crunched Players",E964F7D0 905A
+Cheat3="Extra Teams",E862C55B 5959
+Cheat4="Get In Fights Constantly",E8609B82 597A
+Cheat5="Players\Height Size",E964F7CC ????
+Cheat5_O=$905A Midgets,$90DA Normal Size,$901A Large,$99DA Giants
+Cheat6="Players\Head Size",E964F7C8 ????
+Cheat6_O=$905A Very Small,$90DA Normal Size,$99DA Very Large
+
+//----
+
 [33BE8CD6-EC186912-C:45]
-Name=WCW MAYHEM
+Good Name=WCW Mayhem (U)
 Cheat0="Character Creation\Max\Strength",E883694B 5961
 Cheat1="Character Creation\Max\Impact",E885780B 5961
 Cheat2="Character Creation\Max\Speed",E885A94B 5961
@@ -9239,7 +9609,7 @@ Cheat14="Freeze Timer",E95F8596 2C5A
 //----
 
 [CEA8B54F-7F21D503-C:45]
-Name=Wetrix (U)
+Name=Wetrix (U) (M6)
 Cheat0="Infinite Lakes",E96F5092 5961
 Cheat1="Mega Score",E86F50B0 594F,E874445C 594F
 Cheat2="Always Empty Drain",E86F50E7 595A,E96F50E6 595A,E96F50EC 595A
@@ -9285,7 +9655,7 @@ Cheat8="Have Trial Mode Unlocked",E9663342 5956
 //----
 
 [132D2732-C70E9118-C:45]
-Name=Wipeout 64
+Name=Wipeout 64 (U)
 Cheat0="Infinite\Check Point Time",E96231E6 62BA
 Cheat1="Always Place First",E95D13C0 5959,E95D715A 595B
 Cheat1_N=For This code doesn't record the win on the Time Trial Gold Challenge or the Weapons Gold Challenge.
@@ -9313,7 +9683,7 @@ Cheat15_N=This cheat enabled fixes Av's popping up and spoiling you racing,it al
 //----
 
 [BD636D6A-5D1F54BA-C:45]
-Name=World Cup 98 (U)
+Name=World Cup 98 (U) (M8)
 Cheat0="Home Team scores",E85ACF11 59??
 Cheat0_O=$5A 0 Goals,$71 25 Goals,$8C 50 Goals,$BB 99 Goals,
 Cheat1="Away Team scores",E85ACF0D 59??
@@ -9322,6 +9692,13 @@ Cheat2="Open Cup Classic Mode",E85723C1 5959
 
 //----
 
+[CD5BEC0F-86FD1008-C:45]
+Name=WWF - War Zone (U)
+Cheat0="Extra Characters",E967FBE0 695A,E967FBDE 584F,E967FBE4 795A,E967FBE2 904F
+Cheat1="Infinite Creation Points",E867B59B 595A
+
+//----
+
 [D2BE2F14-38453788-C:45]
 Name=WWF Attitude (U)
 Cheat0="Enable Everything",E9683574 495A,E9683572 624F,E9683578 504F,E9683576 504F
@@ -9337,7 +9714,7 @@ Cheat8="Max\Toughness",E86A363F 5964
 //----
 
 [4E4B0640-1B49BCFB-C:45]
-Name=WWF No Mercy (U)
+Name=WWF No Mercy (U) (V1.0)
 Cheat0="Infinite\Money\Championship Mode",E95DEB5E 504F
 Cheat1="Infinite\Money\Smackdown Mall Shop",E96A4D2A 504F
 Cheat2="Have All\Characters,Costumes, & Moves",50000B02 0000,110BEE40 FFFF
@@ -9549,10 +9926,216 @@ Cheat106_N= Breakable/Fixable/Rebreakable/Refixable press Z to break, C-right +
 
 //----
 
-[CD5BEC0F-86FD1008-C:45]
-Name=WWF War Zone (U)
-Cheat0="Extra Characters",E967FBE0 695A,E967FBDE 584F,E967FBE4 795A,E967FBE2 904F
-Cheat1="Infinite Creation Points",E867B59B 595A
+[4E4B0640-1B49BCFB-C:45]
+Name=WWF No Mercy (U) (V1.1)
+Cheat0="Infinite\Money\Championship Mode",E95DEB5E 504F
+Cheat1="Infinite\Money\Smackdown Mall Shop",E96A4D2A 504F
+Cheat2="Have All\Characters,Costumes, & Moves",50000B02 0000,110BEE40 FFFF
+Cheat3="Max Spirit\Player 1",D015A5D1 0015,E86902B1 594F
+Cheat4="Max Spirit\Player 2",D015A5D1 0015,E8690509 594F
+Cheat5="Max Spirit\Player 3",D015A5D1 0015,E8690961 594F
+Cheat6="Max Spirit\Player 4",D015A5D1 0015,E86910B9 594F
+Cheat7="Always Special\Player 1",D015A5D1 0015,E86902F2 5956
+Cheat8="Always Special\Player 2",D015A5D1 0015,E869054A 5956
+Cheat9="Always Special\Player 3",D015A5D1 0015,E86909A2 5956
+Cheat10="Always Special\Player 4",D015A5D1 0015,E86910FA 5956
+Cheat11="Ultimate Code\Player 1",D015A5D1 0015,E86902B2 59B6
+Cheat12="Ultimate Code\Player 2",D015A5D1 0015,E869050A 59B6
+Cheat13="Ultimate Code\Player 3",D015A5D1 0015,E8690962 59B6
+Cheat14="Ultimate Code\Player 4",D015A5D1 0015,E86910BC 59B6
+Cheat15="2 Player Championship Mode",E960CCB2 595C
+Cheat16="CPU To Human Control\Player 1",E86902EF 59??
+Cheat16_O=$67 Human,$72 CPU
+Cheat17="CPU To Human Control\Player 2",E8690547 59??
+Cheat17_O=$67 Human,$72 CPU
+Cheat18="CPU To Human Control\Player 3",E869099F 59??
+Cheat18_O=$67 Human,$72 CPU
+Cheat19="Can't Pin\Player 1",E86C2175 5956
+Cheat20="Can't Pin\Player 2",E86C2169 5956
+Cheat21="Can't Pin\Player 3",E86C2181 5956
+Cheat22="Can't Pin\Player 4",E86C218D 5956
+Cheat23="Auto-Pin\Player 1",E86C2175 595B
+Cheat24="Auto-Pin\Player 2",E86C2169 595B
+Cheat25="Auto-Pin\Player 3",E86C2181 595B
+Cheat26="Auto-Pin\Player 4",E86C218D 595B
+Cheat27="Play As\Player 1\Option 1",E960FD28 ????
+Cheat27_O=$5959 Rock,$595C SCSA,$595B Undertaker,$5956 Kane,$5955 Richards,$5958 Mankind,$5957 Cactus,$5962 Mick,$5961 HBK,$5A59 HHH,$5A5C X-Pac,$5A5B Mr. Ass,$5A56 Road Dogg,$5B59 Benoit,$5B5C Malenko,$5B5B Saturn,$5B56 Guerrero,$5C59 Jericho,$5C5C Angle,$5C5B Tazz,$5C56 Test,$5C55 GodFather,$5C58 D`Lo,$5C57 Venis,$5C62 Shamrock
+Cheat28="Play As\Player 1\Option 2",E960FD28 ????
+Cheat28_O=$5559 Rikishi,$555C Sexay,$555B Scotty,$5556 Edge,$5555 Christian,$5558 Matt,$5557 Jeff,$5659 Faarooq,$565C Bradshaw,$565B D-Von,$5656 Buh Buh,$5655 Hardcore,$5658 Crash,$5657 Bossman,$5662 Albert,$5759 Al,$575C Blackman,$575B Bulldog,$5756 Henry,$5755 Viscera,$5758 Andre,$5757 Buchanan,$5762 Rios,$5761 Taka,$5859 Chyna
+Cheat29="Play As\Player 1\Option 3",E960FD28 ????
+Cheat29_O=$585C Stephanie,$585B Tori,$5856 Debra,$5855 Trish,$5858 Lita,$6159 Jacqueline,$615C Linda,$615B Kat,$6156 Moola,$6155 Ho,$6259 Vince,$625C Shane,$625B Hebner,$6256 Jim Ross
+Cheat30="Play As\Player 2\Option 1",E960FD34 ????
+Cheat30_O=$5959 Rock,$595C SCSA,$595B Undertaker,$5956 Kane,$5955 Richards,$5958 Mankind,$5957 Cactus,$5962 Mick,$5961 HBK,$5A59 HHH,$5A5C X-Pac,$5A5B Mr. Ass,$5A56 Road Dogg,$5B59 Benoit,$5B5C Malenko,$5B5B Saturn,$5B56 Guerrero,$5C59 Jericho,$5C5C Angle,$5C5B Tazz,$5C56 Test,$5C55 GodFather,$5C58 D`Lo,$5C57 Venis,$5C62 Shamrock
+Cheat31="Play As\Player 2\Option 2",E960FD34 ????
+Cheat31_O=$5559 Rikishi,$555C Sexay,$555B Scotty,$5556 Edge,$5555 Christian,$5558 Matt,$5557 Jeff,$5659 Faarooq,$565C Bradshaw,$565B D-Von,$5656 Buh Buh,$5655 Hardcore,$5658 Crash,$5657 Bossman,$5662 Albert,$5759 Al,$575C Blackman,$575B Bulldog,$5756 Henry,$5755 Viscera,$5758 Andre,$5757 Buchanan,$5762 Rios,$5761 Taka,$5859 Chyna
+Cheat32="Play As\Player 2\Option 3",E960FD34 ????
+Cheat32_O=$585C Stephanie,$585B Tori,$5856 Debra,$5855 Trish,$5858 Lita,$6159 Jacqueline,$615C Linda,$615B Kat,$6156 Moola,$6155 Ho,$6259 Vince,$625C Shane,$625B Hebner,$6256 Jim Ross
+Cheat33="Play As\Player 3\Option 1",E960FD40 ????
+Cheat33_O=$5959 Rock,$595C SCSA,$595B Undertaker,$5956 Kane,$5955 Richards,$5958 Mankind,$5957 Cactus,$5962 Mick,$5961 HBK,$5A59 HHH,$5A5C X-Pac,$5A5B Mr. Ass,$5A56 Road Dogg,$5B59 Benoit,$5B5C Malenko,$5B5B Saturn,$5B56 Guerrero,$5C59 Jericho,$5C5C Angle,$5C5B Tazz,$5C56 Test,$5C55 GodFather,$5C58 D`Lo,$5C57 Venis,$5C62 Shamrock
+Cheat34="Play As\Player 3\Option 2",E960FD40 ????
+Cheat34_O=$5559 Rikishi,$555C Sexay,$555B Scotty,$5556 Edge,$5555 Christian,$5558 Matt,$5557 Jeff,$5659 Faarooq,$565C Bradshaw,$565B D-Von,$5656 Buh Buh,$5655 Hardcore,$5658 Crash,$5657 Bossman,$5662 Albert,$5759 Al,$575C Blackman,$575B Bulldog,$5756 Henry,$5755 Viscera,$5758 Andre,$5757 Buchanan,$5762 Rios,$5761 Taka,$5859 Chyna
+Cheat35="Play As\Player 3\Option 3",E960FD40 ????
+Cheat35_O=$585C Stephanie,$585B Tori,$5856 Debra,$5855 Trish,$5858 Lita,$6159 Jacqueline,$615C Linda,$615B Kat,$6156 Moola,$6155 Ho,$6259 Vince,$625C Shane,$625B Hebner,$6256 Jim Ross
+Cheat36="Play As\Player 4\Option 1",E960FD4C ????
+Cheat36_O=$5959 Rock,$595C SCSA,$595B Undertaker,$5956 Kane,$5955 Richards,$5958 Mankind,$5957 Cactus,$5962 Mick,$5961 HBK,$5A59 HHH,$5A5C X-Pac,$5A5B Mr. Ass,$5A56 Road Dogg,$5B59 Benoit,$5B5C Malenko,$5B5B Saturn,$5B56 Guerrero,$5C59 Jericho,$5C5C Angle,$5C5B Tazz,$5C56 Test,$5C55 GodFather,$5C58 D`Lo,$5C57 Venis,$5C62 Shamrock
+Cheat37="Play As\Player 4\Option 2",E960FD4C ????
+Cheat37_O=$5559 Rikishi,$555C Sexay,$555B Scotty,$5556 Edge,$5555 Christian,$5558 Matt,$5557 Jeff,$5659 Faarooq,$565C Bradshaw,$565B D-Von,$5656 Buh Buh,$5655 Hardcore,$5658 Crash,$5657 Bossman,$5662 Albert,$5759 Al,$575C Blackman,$575B Bulldog,$5756 Henry,$5755 Viscera,$5758 Andre,$5757 Buchanan,$5762 Rios,$5761 Taka,$5859 Chyna
+Cheat38="Play As\Player 4\Option 3",E960FD4C ????
+Cheat38_O=$585C Stephanie,$585B Tori,$5856 Debra,$5855 Trish,$5858 Lita,$6159 Jacqueline,$615C Linda,$615B Kat,$6156 Moola,$6155 Ho,$6259 Vince,$625C Shane,$625B Hebner,$6256 Jim Ross
+Cheat39="Cannot Be Grabbed\Player 1",D115AEC6 0052,E969011A 5959,D115AEC6 00A1,E969011A 5919
+Cheat40="Cannot Be Punched\Player 1",D115AEC6 002D,E969011A 5959,D115AEC6 0035,E969011A 5919
+Cheat41="Cannot Be Knocked Down\Player 1",D115AEC6 0031,E969011A 5959
+Cheat42="Wrestler Size & Shape\Player 1\Thin wrestler",E95C0BC0 8EDA
+Cheat43="Wrestler Size & Shape\Player 1\Wide wrestler",E95C0BC0 904F
+Cheat44="Wrestler Size & Shape\Player 1\Short wrestler",E95C0BD4 8FDA
+Cheat45="Wrestler Size & Shape\Player 1\Tall wrestler",E95C0BD4 904F
+Cheat46="Wrestler Size & Shape\Player 1\Flat wrestler",E95C0BE8 8EDA
+Cheat47="Wrestler Size & Shape\Player 1\Bulgy wrestler",E95C0BE8 904F
+Cheat48="Wrestler Size & Shape\Player 1\Giant wrestler",E95C0BFC 8FDA
+Cheat49="Wrestler Size & Shape\Player 1\Small wrestler",E95C0BFC 904F
+Cheat50="Wrestler Size & Shape\Player 2\Thin wrestler",E85C0C80 8EDA
+Cheat51="Wrestler Size & Shape\Player 2\Wide wrestler",E85C0C80 904F
+Cheat52="Wrestler Size & Shape\Player 2\Short wrestler",E85C0C94 8FDA
+Cheat53="Wrestler Size & Shape\Player 2\Tall wrestler",E85C0C94 904F
+Cheat54="Wrestler Size & Shape\Player 2\Flat wrestler",E85C0C68 8E4F
+Cheat55="Wrestler Size & Shape\Player 2\Bulgy wrestler",E85C0C68 904F
+Cheat56="Wrestler Size & Shape\Player 2\Giant wrestler",E85C0CBC 8FDA
+Cheat57="Wrestler Size & Shape\Player 2\Small wrestler",E85C0CBC 904F
+Cheat58="Wrestler Size & Shape\Player 3\Thin wrestler",E85C0C40 8EDA
+Cheat59="Wrestler Size & Shape\Player 3\Wide wrestler",E85C0C40 904F
+Cheat60="Wrestler Size & Shape\Player 3\Short wrestler",E85C0C54 8FDA
+Cheat61="Wrestler Size & Shape\Player 3\Tall wrestler",E85C0C54 904F
+Cheat62="Wrestler Size & Shape\Player 3\Flat wrestler",E85C0968 8EDA
+Cheat63="Wrestler Size & Shape\Player 3\Bulgy wrestler",E85C0968 904F
+Cheat64="Wrestler Size & Shape\Player 3\Giant wrestler",E85C097C 8FDA
+Cheat65="Wrestler Size & Shape\Player 3\Small wrestler",E85C097C 904F
+Cheat66="Wrestler Size & Shape\Player 4\Thin wrestler",E85C0900 8EDA
+Cheat67="Wrestler Size & Shape\Player 4\Wide wrestler",E85C0900 904F
+Cheat68="Wrestler Size & Shape\Player 4\Short wrestler",E85C0914 8FDA
+Cheat69="Wrestler Size & Shape\Player 4\Tall wrestler",E85C0914 904F
+Cheat70="Wrestler Size & Shape\Player 4\Flat wrestler",E85C0928 8EDA
+Cheat71="Wrestler Size & Shape\Player 4\Bulgy wrestler",E85C0928 904F
+Cheat72="Wrestler Size & Shape\Player 4\Giant wrestler",E85C093C 8FDA
+Cheat73="Wrestler Size & Shape\Player 4\Small wrestler",E85C093C 904F
+Cheat74="Z LADDER",D1064880 2000,E96C1AC0 595A,D1064880 2000,E96C1ABE 5971,D1064880 2000,E96C1AC4 595A,D1064880 2000,E96C1AC2 5971,D1064880 2000,E96C1AE0 DA56
+Cheat75="Replace Raw War with\TOKYO DOME",E9597F4C CB7B,E9597F4A 5A71,E959587C 5A5A,E959587A 5A5A,E9595880 5A5A,E959587E 5A5A,E9595884 5A5A,E9595882 5A5A,E9595888 5A5A,E9595886 5A5A,E959588C 5A5A,E959588A 5A5A,E9595862 62F1,E9595B58 5CF5,E9595B56 5CD5,E9595B5C 5CD5,E9595B5A 5CD5,E9595B60 5CD5,E9595B5E 5CF5,E9595B64 5CF5,E9595B62 558F,E9595B88 558F,E9595B84 5CF5,E9595B88 7AF5,E9595B86 5A5A,E9595B8C 595A,E9595B8A 7D53,E9595B90 61F1,E9595B94 5CFF,E9595B98 5CFF,E9595B96 5CF5,E9595740 751B,E9595B9C 5A5A,E95958E8 623F,E95958E6 595A,E95958EC 623F,E95958EA 7D4D
+Cheat76="Replace Raw War with\BARBEDWIRE ROPES",E9595868 554B,E9595866 5546,E959586C 5545,E959586A 554B,E9595870 5546,E959586E 5545,E9595874 554B,E9595872 5546,E9595878 5545,E959587C 7D53,E959587A 7D53,E9595880 7D53,E959587E 7D53,E9595884 7D53,E9595882 7D53,E9595888 7D53,E9595886 7D53,E959588C 7D53,E95BF4E8 90BE,E95BF4EC 90A2,E95BF4FC 8E6A,E95BF410 90C9,E95BF1C4 90BE,E95BF1D8 8E6A,E95BF1E8 9097,E95BF2A0 90BE,E95BF2A4 109E,E95BF2B4 8E6A,E95BF2C8 90C9,E95BF77C 90BE,E95BF780 9082,E95BF790 8E6A,E95BF7A4 90C9,E95BF858 90BE,E95BF86C 8E6A,E95BF87C 907B,E95BF834 90BE,E95BF838 1084,E95BF848 8E6A,E95BF55C 90C9,E95BF510 90BE,E95BF514 905C,E95BF524 8E6A,E95BF538 90C9,E95BF6EC 90BE,E95BF600 8E6A,E95BF610 905A,E95BFBC8 90BE,E95BFBCC 105C,E95BFBDC 8E6A,E95BFBF0 90C9,E959589C 56C1,E95958AC 5847,E9597F4C 5D59,E9597F4A 56A5,E9595898 5546,E95958A8 7D53,E95BF980 90BA,E95BF994 8E6A,E95BF9A4 90AC,E95BF9A8 10DA,E95BFF14 90A8,E95BFF1C 135A,E95BFF28 8E6A,E95BFF34 8DB4,E95BFF38 908A,E95BFF3C 10DA,E95B043C 90A8,E95B0444 135A,E95B0450 8E6A,E95B015C 8DB4,E95B0160 9060,E95B0164 10DA,E95BFED4 905A,D115AF56 2EB2,E969011A 5967,D115B2AE 2EB2,E9690572 5967,D115B606 2EB2,E9690CC8 5967,D115B95E 2EB2,E9690F22 5967,E9598076 504F,E959807C 504F,E959807A 504F
+Cheat77="Replace Raw War with\BARBEDWIRE SQUARE\Part 1",E9595868 554B,E9595866 5546,E959586C 5545,E959586A 554B,E9595870 5546,E959586E 5545,E9595874 554B,E9595872 5546,E9595878 5545,E959587C 7D53,E959587A 7D53,E9595880 7D53,E959587E 7D53,E9595884 7D53,E9595882 7D53,E9595888 7D53,E9595886 7D53,E959588C 7D53,E95BF4E8 90BE,E95BF4EC 90A2,E95BF4FC 8E6A,E95BF410 90C9,E95BF1C4 90BE,E95BF1D8 8E6A,E95BF1E8 9097,E95BF2A0 90BE,E95BF2A4 109E,E95BF2B4 8E6A,E95BF2C8 90C9,E95BF77C 90BE,E95BF780 9082,E95BF790 8E6A,E95BF7A4 90C9,E95BF858 90BE,E95BF86C 8E6A,E95BF87C 907B,E95BF834 90BE,E95BF838 1084,E95BF848 8E6A,E95BF55C 90C9,E95BF510 90BE,E95BF514 905C,E95BF524 8E6A,E95BF538 90C9,E95BF6EC 90BE,E95BF600 8E6A,E95BF610 905A,E95BFBC8 90BE,E95BFBCC 105C,E95BFBDC 8E6A,E95BFBF0 90C9,E959589C 56C1,E95958AC 5847,E9597F4C 5D59,E9597F4A 56A5,E9595898 5546,E95958A8 7D53,E95BF980 90BA,E95BF994 8E6A,E95BF9A4 90AC,E95BF9A8 10DA,E95BFF14 90A8,E95BFF1C 135A,E95BFF28 8E6A,E95BFF34 8DB4,E95BFF38 908A,E95BFF3C 10DA,E95B043C 90A8,E95B0444 135A,E95B0450 8E6A,E95B015C 8DB4,E95B0160 9060,E95B0164 10DA,E95BFED4 905A,D115AF56 2EB2,E969011A 5967,D115B2AE 2EB2,E9690572 5967,D115B606 2EB2,E9690CC8 5967,D115B95E 2EB2,E9690F22 5967,E9598076 504F,E959807C 504F,E959807A 504F,E96C1688 595A,E96C1686 5964,E96C168C 595A,E96C168A 5964,E96C16D0 9B06
+Cheat78="Replace Raw War with\BARBEDWIRE SQUARE\Part 2",E96C16D6 595A,E96C16E4 504F,E95983F4 57CC,E95983FC 7D53,D1064880 0002,E9690572 597F,D1064886 0002,E969011A 597F,E96C163C 595A,E96C163A 595E,E96C1640 595A,E96C163E 595E,E96C1B80 1C26,E96C1B98 504F,E9598306 7D1C,E959830C 6155,E959830A 7D53,D1064880 2000,E96C163A 596F,D1064880 2000,E96C163E 596F,D1064880 2000,E956ACE6 90D9,D1005592 3F81,E96C163A 596F,D1064880 2000,E956ACE6 90D9,D1005592 3F81,E96C163E 596F,D1064886 2000,E96C163A 596F,D1064886 2000,E96C163A 596F,D1064886 2000,E956ACE6 90D9,D1005592 3F81,E96C163E 596F,E9598350 5546,E9598458 7D53,E96C163C 595A,E96C163A 5965,E96C1640 595A,E96C163E 5965,E96C1B80 595A,E96C1B7E 595A,E96C1B84 9C43,E96C1B82 595A,E96C1B88 1CF8,E96C1B86 595A,E96C1B8A 555A,E96C1B8E 595A,E96C1B92 595A,E96C1B98 504F,E96C1B96 595A,E95EAC00 905A,E95EA9DC 905A,E95EAAA8 905A,E95EAF94 905A,E9595858 7D53,E9595862 7D53
+Cheat79="Replace Raw War with\FLAMING TURNBUCKLES",E96C168C 504F,E96C168A 596F,E96C16CC 1CAA,E96C16CA 504B,E96C16D0 9CC7,E96C16CE 77E1,E96C16D4 1CDA,E96C16D2 5558,E96C16D6 5E66,E96C16DA 601E,E96C16DE 582E,E96C16E4 504F,E96C16E2 4E3B,E96C1640 504F,E96C163E 596F,E96C1B80 1CBA,E96C1B84 9CCA,E96C1B88 9CC8,E96C1B8A 5E66,E96C1B8E 601E,E96C1B92 582E,E96C1B96 5216,E96C1BF4 504F,E96C1BF2 596F,E96C1B34 9CBA,E96C1B38 9CCA,E96C1B3C 9CDA,E96C1B3E 5D2A,E96C1B42 5A88,E96C1B46 5540,E96C1B4A 4759,E96C1CA8 504F,E96C1CA6 596F,E96C1CE8 9C9F,E96C1CEC 9CCA,E96C1CF0 1CBE,E96C1CF2 5FCA,E96C1CF6 60B2,E96C1CFA 6166,E96C1CFE 4A38
+Cheat80="Replace Raw War with\REMOVE RING",E95958A8 595A,E95958A6 595A,E95958AC 595A,E9595740 595A,E95EAC00 905A,E95EA9DC 905A,E95EAAA8 905A,E95EAF94 905A,E95BF360 905A,E95BF36C 905A,E95BEE68 905A
+Cheat81="Replace Raw War with\BACKYARD ARENA",E9595862 60C8,E9595864 60C8,E95AD540 597F,E95958A8 7D4D,E9597F4C 8C4F,E9597F4A 8C4F,E95958A6 7E17,E959586C 5546,E959586A 5545,E9595872 554B,E9595880 584F,E959587E 584F,E9595886 584F,E95BF2A0 995E,E95BF2B4 905A,E95BF2C8 904F,E95BF77C 996A,E95BF790 905A,E95BF7A4 997A,E95BF7B8 90D6,E95BF6EC 996C,E95BF600 905A,E95BF614 998A,E95BF628 90D6,E9595B84 62A1,E9595B8A 584F,E9595B90 584F,E9595B8E 584F,E9595B94 595A,E9595B92 584F,E9595B98 62A1,E9595B96 62A1,E9595B88 60C8,E9595880 584F,E959587E 584F,E9595884 595A,E9595882 584F,E9595888 584F,E9595886 584F,E959588C 595A,E959588A 6151,E95958EA 7D4D,E95958EC 623F,E95958E6 595A,E95958E8 623F,E96C1BF2 5971,E96C1B10 5956,E96C1B34 1B39,E96C1B38 9B06,E9595752 7E7D,E9595858 7E7D,E9595856 7E7D,E9595B58 7E17,E9595B56 7E17,E9595B5C 7E17,E9595B5A 7E17,E9595B60 7E17,E9595B5E 7E17,E9595B64 7E17,E9595B62 7E17,50001002 0000,110501B8 0000,50000402 0000,110501E0 0000,50000902 0000,11050262 0000,50001402 0000,11050290 0000,50002C02 0000,110502EC 0000,E95BEB74 903A,E95BEB80 904F,E9595744 5750,E9595742 574D,E9595750 584F,E959574E 62E7,E9595868 574E,E9595866 5753,E959586E 574F,E9595874 5754,E9598348 7D21,E959834C 7E73,E9598328 7D29,E959832C 62BB,E95983DC 7D0F,E95983DE 62B9,E9598310 7D16,E9598314 7E27,E9598320 7D29,E9598324 7D53,E95983D0 7D0E,E95983D8 7E89,E9598350 7D19,E9598458 7E27
+Cheat82="Replace Raw War with\BACKYARD WEAK",E9595B84 5FE2,E9595B82 7E5D,E9595B88 7E5D,E9595B86 7E5D,E9595B8C 7E5D,E9595B8A 584D,E9595B8E 7D53,E9595B94 7E5D,E9595B92 7E5D,E9595B98 7E5D,E9595B96 7E5D,E9595740 7E5D,E9595862 7E5D,E9595864 7E5D,E95958A8 7E5D,E95958EA 7D53,E959587C 7D53,E959587A 7D53,E9595880 7D53,E959587E 7D53,E9595884 7D53,E9595882 7D53,E9595888 7D53,E9595886 7D53,E959588C 7D53,E959588A 7D53,E9595B58 7E5D,E9595B56 7E5D,E9595B5C 7E5D,E9595B5A 7E5D,E9595B60 7E5D,E9595B5E 7E5D,E9595B64 7E5D,E9595B62 7E5D,E9597F4C 7E5D,E9597F4A 7E5D,E9598340 7D21,E9598344 7E7D
+Cheat83="Replace Raw War with\BARBEDWIRE ARENA",E9595B84 7D53,E9595B82 7D53,E9595B88 7D53,E9595B86 7D53,E9595B8C 7D53,E9595B8A 7D53,E9595B90 7D53,E9595B8E 7D53,E9595B94 7D53,E9595B92 7D53,E9595B98 7D53,E9595B96 7D53,E9595740 7D53,E9595862 7D53,E9595864 7D53,E95958A8 7D53,E95958EA 7D53,E959587C 7D53,E959587A 7D53,E9595880 7D53,E959587E 7D53,E9595884 7D53,E9595882 7D53,E9595888 7D53,E9595886 7D53,E959588C 7D53,E959588A 7D53,E9597F4C 2E2D,E9597F4A 2E2D,E9598340 7D24,E9598344 7D53,E9595B58 7D53,E9595B56 7D53,E9595B5C 7D53,E9595B5A 7D53,E9595B60 7D53,E9595B5E 7D53,E9595B64 7D53,E9595B62 7D53
+Cheat84="Replace Raw War with\DUDLEY ARENA",E9595B84 7AF7,E9595B82 7E5D,E9595B86 7E5D,E9595B8A 7AF7,E9595B92 7E5D,E9595B98 595A,E9595B96 595A,E9595740 7E5D,E9595864 7D4D,E9595862 7D4D,E95958A8 7E81,E95958A6 7D53,E9595B58 623F,E9595B56 623F,E9595B5C 595A,E9595B5A 595A,E9595B60 595A,E9595B5E 595A,E9595B64 623F,E9595B62 623F,E95958E0 5548,E95958DE 5547,E95958E4 5552,E95958E2 5551,E95958E8 623F,E95958E6 595A,E95958EC 623F,E95958EA 7E5D,E9597F4C B7B8,E9597F4A B7B8,E9598340 7D1C,E9598344 7E5D,E9598474 7D2B,E9598472 7D26,E9598478 7D25,E9598476 7D28,E959847C 7D4D,E959847A 7D4D,E9598480 7D53,E959847E 7D53,E959587C 7D4D,E959587A 7D4D,E9595880 7D4D,E959587E 7D4D,E9595884 7D4D,E9595882 7D4D,E9595888 7D4D,E9595886 7D4D,E959588C 7D4D,E959588A 7D4D,E95958AC 7D53,E9698650 5980
+Cheat85="Replace Raw War with\FLAME ARENA",E9595862 5F50,E9595864 5F50,E9597F4C 7662,E9597F4A 7662,E9595B88 7559,E9595B88 7559,E9595B5C 7559,E9595B5A 7559,E9595B60 7559,E9595B5F 7559,E9595B5E 7559,E9595B64 7559,E9595740 7559
+Cheat86="Replace Raw War with\GREENWICH STREET ARENA",E9595B88 7E15,E9595B8A 595A,E9595B90 595A,E9595B8E 595A,E9595B92 595A,E9595B40 5F50,E9595862 7E15,E9595864 7E15,E95958EA 7D4D,E959588A 6008,E959588C 6018,E9595886 6008,E9595888 6018,E9595882 6008,E9595884 6018,E959587E 6008,E9595880 6018,E959587A 6008,E959587C 6018,E9595B98 595A,E9595B96 595A,50002C02 0000,11050378 0000,50002C02 0000,110502EC 0000,50001402 0000,11050290 0000,50000902 0000,11050262 0000,50000402 0000,110501CE 0000,50001002 0000,110501B8 0000,50000402 0000,110501E0 0000,E9595B84 7E5D,E9595B88 595A,E95958A8 754A
+Cheat87="Replace Raw War with\HHH ARNEA",E9595B62 753F,E9595B64 753F,E9595B5E 753F,E9595B60 753F,E9595B5A 753F,E9595B5C 753F,E9595B56 753F,E9595B58 753F,E9595B8A 7541,E9595B98 7541,E9595B96 7541,E9595B92 753F,E9595B82 753F,E9595B94 753F,E9595B84 7541,E9595862 7541,E9595864 7541,E95958EA 7541,E9595B82 753F,E9595B86 753F,E9595750 753F,E959574E 753F,E9595754 753F,E9595754 753F,E9595858 753F,E9595858 753F,E9598340 7D24,E9598344 753F,E95958A8 7541,E95958A6 7541,E95958AC 7541,E9597F4C 7541,E9597F4A 7541
+Cheat88="Replace Raw War with\HOSPITAL ARENA",E9595B84 62A1,E9595B82 818F,E9595B80 62A1,E9595B88 62A1,E9595B88 62A1,E9595B8A 62C3,E9595B90 62EB,E9595B8E 62C3,E9595B92 818F,E9595B98 818F,E9595B96 818F,E9595B40 62A1,E95958A8 818F,E95958EA 818F,E9595B58 818F,E9595B56 818F,E9595B5C 818F,E9595B5A 818F,E9595B60 818F,E9595B5E 818F,E9595B64 818F,E9595B62 818F,E9595750 818F,E959574E 818F,E9595754 818F,E9595752 818F,E9595858 818F,E9595858 818F,E9598340 7D24,E9598344 818F,E9595862 818F,E9595864 818F,E959587C 62A1,E959587A 62A1,E9595880 62A1,E959587E 62A1,E9595884 62A1,E9595882 62A1,E9595888 62A1,E9595886 62A1,E959588C 62A1,E959588A 62A1,E9595740 62A1,E9597F4C 595A,E9598338 7D21
+Cheat89="Replace Raw War with\KANE ARENA",E9595B84 63B9,E9595B82 63B9,E9595B80 84BE,E9595B88 84BE,E9595B88 84BE,E9595B8A 84A7,E9595B90 84A7,E9595B8E 84A7,E9595B92 63B9,E9595B98 84A7,E9595B96 84A7,E9595740 7470,E9595862 7E87,E9595864 79EF,E95958EC 62A5,E95958EA 84A7,E9595B58 77F1,E9595B56 77F1,E9595B5C 77F1,E9595B5A 77F1,E9595B60 77F1,E9595B5E 77F1,E9595B64 77F1,E9595B62 77F1
+Cheat90="Replace Raw War with\SHIMMER ARENA",E9595B84 728C,E9595B82 728C,E9595B88 728C,E9595B8C 728C,E9595B86 728C,E9595B8A 728C,E9595B90 728C,E9595B8E 728C,E9595B92 728C,E9595B98 728C,E9595B96 728C,E95958A8 728C,E95958A6 728C,E95958AC 728C,E95958E8 728C,E95958E6 728C,E95958EC 728C,E95958EA 728C,E959587C 728C,E959587A 728C,E9595880 728C,E959587E 728C,E9595884 728C,E9595882 728C,E9595888 728C,E9595886 728C,E959588C 728C,E959588A 728C,E9595740 728C,E9595862 728C,E9595864 728C
+Cheat91="Replace Raw War with\SPACE SHIP ARENA",E9595B84 629D,E9595B82 62AB,E9595B88 62AB,E9595B86 6060,E9595B8C 62AB,E9595B8A 6060,E9595B90 61F1,E9595B94 62AB,E9595B92 61F1,E9595B98 62BB,E9595B96 62BB,E9595B58 62AB,E9595B56 62AB,E9595B5C 62AB,E9595B5A 62AB,E9595B60 62AB,E9595B5E 62AB,E9595B64 62AB,E9595B62 62AB,E9595740 63C5,E9597F4C CB7B,E9597F4A 5A71,E95958A8 62BB,E95958A6 62BB,E95958E8 62AB,E95958E6 62AB,E95958EC 62AB,E95958EA 62BB,E9595862 6060,E9595864 6060,E959587C 606A,E959587A 606A,E9595880 606A,E959587E 606A,E9595884 606A,E9595882 606A,E9595888 606A,E9595886 606A,E959588C 606A,E959588A 606A,E9595750 62BB,E959574E 62BB,E9595754 62BB,E9595752 62BB,E9595858 62BB,E9595856 62BB,E9598340 7D24,E9598344 62BB
+Cheat92="Tables\IN RING TABLE\Part 1",E9598348 5739,E959834C 6249,E9598350 573C,E9598458 6249,E9598464 573B,E9598462 5736,E9598468 623F,E9598466 623F,E959846C 5735,E959846A 5738,E9598470 623F,E959846E 623F,D1064880 0001,E9690208 9C7E,D1064880 0001,E9690660 9C7E,D1064880 2000,E9690208 9B06,D1064880 2000,E9690660 9B06,E96C1688 595A,E96C1686 5966,E96C168C 595A,E96C168A 5966,E96C16CC 9B6A,E96C16CA 1909,E96C16D0 9C7F,E96C16CE AA2E,E96C16D4 9B6A,E96C16D2 EB49,E96C16D6 615A,E96C16DA 56FA,E96C16DE 615A,E96C16E4 504F,E96C16E2 4C0E,E96C163C 595A,E96C163A 5965,E96C1640 595A,E96C163E 5965,E96C1B80 9B6A,E96C1B7E 1909,E96C1B84 9C7F,E96C1B82 AA2E,E96C1B88 9B6A,E96C1B86 EB49,E96C1B8A 615A,E96C1B8E 56FA,E96C1B92 615A,E96C1B98 504F,E96C1B96 4C0E,D1064880 2000,E96C16D0 9B3A
+Cheat93="Tables\IN RING TABLE\Part 2",D1064880 2000,E96C16D6 583A,D1064880 2000,E96C16DE 57DA,D1064880 2000,E96C1B84 9B3A,D1064880 2000,E96C1B8A 617A,D1064880 2000,E96C1B92 62DA,E96C1BF0 595A,E96C1BEE 5967,E96C1BF4 595A,E96C1BF2 5967,E96C1B34 9B6A,E96C1B32 1909,E96C1B38 9C84,E96C1B36 AA2E,E96C1B3C 9B6A,E96C1B3A EB49,E96C1B3E 615A,E96C1B42 56FA,E96C1B46 615A,E96C1B4C 504F,E96C1B4A 4C0E,E96C1CA4 595A,E96C1CA2 5972,E96C1CA8 595A,E96C1CA6 5972,E96C1CE8 9B6A,E96C1CE6 1909,E96C1CEC 9C84,E96C1CEA AA2E,E96C1CF0 9B6A,E96C1CEE EB49,E96C1CF2 615A,E96C1CF6 56FA,E96C1CFA 615A,E96C1C00 504F,E96C1CFE 4C0E,D1064880 2000,E96C1B38 9B3A,D1064880 2000,E96C1B3E 583A,D1064880 2000,E96C1B46 57DA,D1064880 2000,E96C1CEC 9B3A,D1064880 2000,E96C1CF2 617A,D1064880 2000,E96C1CFA 62DA
+Cheat94="Novalty\Truck In The Crowd",E9595868 5897,E9595866 58A2,E959586C 58A1,E959586A 58A4,E9595870 58A3,E959587C 63A3,E959587A 639B,E9595880 63A3,E959587E 639B,E9595884 639B,E9595882 639B,E959586E 589E,E9595874 589D,E9595888 639B,E9595872 58A0,E9595886 639B,E9595878 5898,E959588C 63A3,E9595876 589B,E959588A 63A3,D1064880 2000,E9690208 9B40,D1064880 2000,E9690660 9B40
+Cheat95="CPU To Human Control\Player 4",E86910F7 59??
+Cheat95_O=$67 Human,$72 CPU
+Cheat96="Clock At 00:00",E969FE72 595A,E960F046 595A
+Cheat97="Hacked Moves\Dragon Screw Stunner",D106B454 3749,D106B456 0094,E95C0BB8 5941,D106B454 3749,D106B456 0094,E95C0BB6 1210,D106B514 374A,D106B516 0094,E95C0C78 5941,D106B514 374A,D106B516 0094
+Cheat98="Hacked Moves\Morality Check to Back of head",D106B454 3892,D106B456 0000,E95C0BB8 590B,D106B454 3892,D106B456 0000,E95C0BB6 729E
+Cheat99="Hacked Moves\Dragon Screw Suplex",D106B454 3749,D106B456 007C,E95C0BB8 59FD,D106B454 3749,D106B456 007C,E95C0BB6 3484,D106B514 374A,D106B516 007C,E95C0C78 59FD,D106B514 374A,D106B516 007C,E95C0C76 433A,D106B454 3749,D106B456 00A5,E96902A6 595A,D106B514 374A,D106B516 00A5,E96905FE 595A
+Cheat100="Hacked Moves\Dominator into HHH Facebuster",D106B454 3810,D106B456 005C,E95C0CB8 5A74,D106B454 3810,D106B456 005C,E95C0CB6 FBA8,D106B514 3811,D106B516 005C,E95C0C78 5A74,D106B514 3811,D106B516 005C,E95C0C76 FD0A,D106B454 3810,D106B456 0075,E96902A6 595A
+Cheat101="Hacked Moves\Capture Tazzplex",D106B454 3689,D106B456 0021,E95C0BB8 590E,D106B454 3689,D106B456 0021,E95C0BB6 F63C,D106B514 368A,D106B516 0021,E95C0C78 590E,D106B514 368A,D106B516 0021,E95C0C76 0710
+Cheat102="Hacked Moves\Running Rock Bottom",D106B454 3A80,D106B456 0000,E95C0BB8 5919,D106B454 3A80,D106B456 0000,E95C0BB6 48FC,D106B514 3A81,D106B516 0000,E95C0C78 591C,D106B514 3A81,D106B516 0000,E95C0C76 6B6A
+Cheat103="Hacked Moves\Running Tazplex",D106B454 3A7A,D106B456 0000,E95C0BB8 590E,D106B454 3A7A,D106B456 0000,E95C0BB6 F670,D106B514 3A7B,D106B516 0000,E95C0C78 590E,D106B514 3A7B,D106B516 0000,E95C0C76 0654
+Cheat104="Tables\MOVABLE TABLES\Part 1",E959837C 5739,E959837A 573B,E9598384 6249,E9598382 623F,E9598388 573C,E9598386 5735,E9598390 6249,E959838E 623F,E95983A0 5736,E959839E 5738,E95983A8 623F,E95983A6 623F,E96C163C 595A,E96C163A 5959,E96C1640 595A,E96C163E 5959,E96C1BF0 595A,E96C1BEE 595B,E96C1BF4 595A,E96C1BF2 595B,E96C1688 595A,E96C1686 595A,E96C168C 595A,E96C168A 595A,D116C556 0000,E96C168E 595A,D116C33A 0000,E96C1642 595A,D116C3EE 0000,E96C1BF6 595A,D116C556 0001,E96C168E 5959,D116C33A 0001,E96C1642 5959,D116C3EE 0001,E96C1BF6 5959,D116C556 0002,E96C168E 595C,D116C33A 0002,E96C1642 595C,D116C3EE 0002,E96C1BF6 595C,D116C556 0003,E96C168E 595B,D116C33A 0003,E96C1642 595B,D116C3EE 0003,E96C1BF6 595B,D116C556 FFFF,E96C168E 504F,D116C33A FFFF,E96C1642 504F,D116C3EE FFFF,E96C1BF6 504F,D216C556 FFFF,E95BEE68 90DA,D1064886 2000,E95BEE68 90D9,D106488C 2000,E95BEE68 90D9,D1064892 2000,E95BEE68 90D9
+Cheat105="Tables\MOVABLE TABLES\Part 2",D116C33A FFFF,E96C16D6 595A,D116C382 0000,E96C16DA 595A,D116C386 0000,E96C16DE 595A,D116C38A 0000,E96C16E2 595A,D116C38E 0000,E96C1B8A 595A,D116C436 0000,E96C1B8E 595A,D116C43A 0000,E96C1B92 595A,D116C43E 0000,E96C1B96 595A,D116C442 0000,E96C1B3E 595A,D116C4EA 0000,E96C1B42 595A,D116C4EE 0000,E96C1B46 595A,D116C4F2 0000,E96C1B4A 595A,D116C594 42B4,D116C556 FFFF,E96C16D0 9C85,D116C378 4335,E96C1B84 9C85,D116C42C 4335,E96C1B38 9C85,D116C594 3DC7,D116C556 FFFF,E96C16D0 9B0A,D116C378 42B0,E96C1B84 9B0A,D116C42C 42B0,E96C1B38 9B0A,D1064880 2000,E95BEE68 90D9,D1079B10 3F81,D116C594 42B4,D116C556 FFFF,E96C16D0 9B4A,D116C378 42F0,E96C1B84 9B4A,D116C42C 42F0,E96C1B38 9B4A,D1079B10 3F81,E96C16DE 605A,D116C38A 0F00,E96C1B92 5A5A,D116C594 3C93,E96C16D0 9B0A,E9598470 595A,E959846E 595A,D116C54C 0000,E96C1CA2 5972,D116C550 0000,E96C1CA6 5972
+Cheat106="Tables\Sabu Table",E96C1BEE 595E,E96C1BF2 595E,E96C1B34 9C1E,E96C1B38 9B38,E96C1B3C 1B15,E96C1B42 615A,E96C1956 595E,E96C195A 595E,E96C19A0 9B38,E96C199C 9C1E,E96C19A4 1C66,E95983AC 573B,E95983B4 623F,E96C1950 9C1E,E96C1954 9B4A,E96C1A58 1B49,E96C1A5E 555A,E96C1B80 9C1E,E96C1B88 1B2A,E96C1B84 9B4A,E96C1B8E 5D5A,E96C190A 5956,E96C190E 5956,E96C163A 5956,E96C163E 5956,D1064880 2000,E956ACE6 90D9,D1005592 3F81,E96C1B3E 605A,D1005592 3F81,E96C19A6 5A5A,D1005592 3F81,E96C1B38 9B9A,D1005592 3F81,E96C19A0 9B9A,D1064880 0005,E956B32C 90DB,D1005CD4 3F83,E96C1B3E 595A,D1005CD4 3F83,E96C19A6 595A,D1005CD4 3F83,E96C1B38 9B38,D1005CD4 3F83,E96C19A0 9B38,D1005CD4 3F83,D1064880 2000,E956B32C 595A
+Cheat0_N=For Championship Mode
+Cheat1_N=For Smackdown Mall Shop
+Cheat15_N=This lets player 2 play with you in championship mode so if you have a friend that you want to tag team up with in tag team championship now you can.
+Cheat19_N=Do not use with Auto Pin
+Cheat20_N=Do not use with Auto Pin
+Cheat21_N=Do not use with Auto Pin
+Cheat22_N=Do not use with Auto Pin
+Cheat23_N=Do not use with Cant Pin
+Cheat24_N=Do not use with Cant Pin
+Cheat25_N=Do not use with Cant Pin
+Cheat26_N=Do not use with Cant Pin
+Cheat27_N=Do not use this with anyother Play As Player 1 Option, only use one option at a time
+Cheat28_N=Do not use this with anyother Play As Player 1 Option, only use one option at a time
+Cheat29_N=Do not use this with anyother Play As Player 1 Option, only use one option at a time
+Cheat30_N=Do not use this with anyother Play As Player 2 Option, only use one option at a time
+Cheat31_N=Do not use this with anyother Play As Player 2 Option, only use one option at a time
+Cheat32_N=Do not use this with anyother Play As Player 2 Option, only use one option at a time
+Cheat33_N=Do not use this with anyother Play As Player 3 Option, only use one option at a time
+Cheat34_N=Do not use this with anyother Play As Player 3 Option, only use one option at a time
+Cheat35_N=Do not use this with anyother Play As Player 3 Option, only use one option at a time
+Cheat36_N=Do not use this with anyother Play As Player 4 Option, only use one option at a time
+Cheat37_N=Do not use this with anyother Play As Player 4 Option, only use one option at a time
+Cheat38_N=Do not use this with anyother Play As Player 4 Option, only use one option at a time
+Cheat42_N=Do not use this with anyother Size & Shape Player 1 Option, only use one option at a time
+Cheat43_N=Do not use this with anyother Size & Shape Player 1 Option, only use one option at a time
+Cheat44_N=Do not use this with anyother Size & Shape Player 1 Option, only use one option at a time
+Cheat45_N=Do not use this with anyother Size & Shape Player 1 Option, only use one option at a time
+Cheat46_N=Do not use this with anyother Size & Shape Player 1 Option, only use one option at a time
+Cheat47_N=Do not use this with anyother Size & Shape Player 1 Option, only use one option at a time
+Cheat48_N=Do not use this with anyother Size & Shape Player 1 Option, only use one option at a time
+Cheat49_N=Do not use this with anyother Size & Shape Player 2 Option, only use one option at a time
+Cheat50_N=Do not use this with anyother Size & Shape Player 2 Option, only use one option at a time
+Cheat51_N=Do not use this with anyother Size & Shape Player 2 Option, only use one option at a time
+Cheat52_N=Do not use this with anyother Size & Shape Player 2 Option, only use one option at a time
+Cheat53_N=Do not use this with anyother Size & Shape Player 2 Option, only use one option at a time
+Cheat54_N=Do not use this with anyother Size & Shape Player 2 Option, only use one option at a time
+Cheat55_N=Do not use this with anyother Size & Shape Player 2 Option, only use one option at a time
+Cheat56_N=Do not use this with anyother Size & Shape Player 2 Option, only use one option at a time
+Cheat57_N=Do not use this with anyother Size & Shape Player 3 Option, only use one option at a time
+Cheat58_N=Do not use this with anyother Size & Shape Player 3 Option, only use one option at a time
+Cheat59_N=Do not use this with anyother Size & Shape Player 3 Option, only use one option at a time
+Cheat60_N=Do not use this with anyother Size & Shape Player 3 Option, only use one option at a time
+Cheat61_N=Do not use this with anyother Size & Shape Player 3 Option, only use one option at a time
+Cheat62_N=Do not use this with anyother Size & Shape Player 3 Option, only use one option at a time
+Cheat63_N=Do not use this with anyother Size & Shape Player 3 Option, only use one option at a time
+Cheat64_N=Do not use this with anyother Size & Shape Player 3 Option, only use one option at a time
+Cheat65_N=Do not use this with anyother Size & Shape Player 4 Option, only use one option at a time
+Cheat66_N=Do not use this with anyother Size & Shape Player 4 Option, only use one option at a time
+Cheat67_N=Do not use this with anyother Size & Shape Player 4 Option, only use one option at a time
+Cheat68_N=Do not use this with anyother Size & Shape Player 4 Option, only use one option at a time
+Cheat69_N=Do not use this with anyother Size & Shape Player 4 Option, only use one option at a time
+Cheat70_N=Do not use this with anyother Size & Shape Player 4 Option, only use one option at a time
+Cheat71_N=Do not use this with anyother Size & Shape Player 4 Option, only use one option at a time
+Cheat72_N=Do not use this with anyother Size & Shape Player 4 Option, only use one option at a time
+Cheat73_N=Do not use this with anyother Size & Shape Player 1 Option, only use one option at a time
+Cheat74_N=Press Z for the ladder to appear, sometimes there is an invisable ladder
+Cheat75_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat76_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat77_N=Both Parts must be on for this Press the C Left Button to make your opponent bleed,These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat78_N=Both Parts must be on for this Press the C Left Button to make your opponent bleed,These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat79_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat80_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat81_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat82_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat83_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat84_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat85_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat86_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat87_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat88_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat89_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat90_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat91_N=These Replace Raw War Arena With what ever coice you make. Only use 1 option at a time.
+Cheat92_N=To Make the Table look broken Keep the Z Button press down, To make player stand on the Table, Stand next to it & Keep C-Right Pressed Down.Put all Parts on Together for this Cheat to work
+Cheat93_N=To Make the Table look broken Keep the Z Button press down, To make player stand on the Table, Stand next to it & Keep C-Right Pressed Down.Put all Parts on Together for this Cheat to work
+Cheat97_N=Dragon Screw 02 P1 does a Dragon Screw then picks up P2 (still holding his leg) and spins him around and gives him a Stone Cold Stunner
+Cheat98_N=Replaces: Back Clothesline P1 is immediately backed up and does the Morality Check to P2 in the back of the head (misses by a little)
+Cheat99_N=Replaces: Double Dragon Screw 02 P1 does a Dragon screw then picks then up (still holding their feet) and does a capture suplex.
+Cheat100_N=Replaces: Dominator
+Cheat101_N=Replaces: Capture Suplex P1 grabs P2's feet like a capture suplex, then lets go & does a Tazzplex.
+Cheat102_N=Replaces: Farooq Spinebuster P2 runs into P1 and P1 delivers a RockBottom to P2.
+Cheat103_N=Replaces: Underhook Belly to Belly P2 runs into P1 and P1 does a Tazplex to P2.
+Cheat104_N=You must use both parts for this cheat to work
+Cheat105_N=You must use both parts for this cheat to work
+Cheat106_N= Breakable/Fixable/Rebreakable/Refixable press Z to break, C-right + Cdown to fix
 
 //----
 
@@ -9599,7 +10182,7 @@ Cheat7_O=$595A Broom,$5A59 Shovel,$5B5C Red And White Hockey Stick,$5C5B Guitar,
 //----
 
 [0553AE9D-EAD8E0C1-C:45]
-Name=Xena Warrior Princess: The Talisman of Fate (U)
+Name=Xena Warrior Princess - Talisman of Fate (U)
 Cheat0="1 Hit to Kill Opponent\Player 1",D10B6354 42C8,E95FB6AC 99DA
 Cheat1="Opponent Has No Energy\Player 1",E95FB6AC 19DA
 Cheat2="Player 2 Never Wins",E862635B 595A
@@ -9613,7 +10196,7 @@ Cheat8="Unlock Titan Difficulty Level",E95F4AA6 5959
 //----
 
 [2337D8E8-6B8E7CEC-C:45]
-Name=Yoshi's Story (U)
+Name=Yoshi's Story (U) (M2)
 Cheat0="Infinite\Health",E9580AD8 755A
 Cheat0_N=This is for All Yoshis All levels
 Cheat1="Infinite\Eggs Once You Get One",E9573FF4 755A
@@ -9621,243 +10204,8 @@ Cheat1_N=This is for All Yoshis All levels
 Cheat2="Infinite\Lives",E863E449 594F
 Cheat2_N=This is for All Yoshis All levels
 
-//----
-
-[1D4136F3-AF63EEA9-C:45]
-Name=Legend of Zelda, The - Ocarina of Time - Master Quest (E) [f1] (NTSC)
-Cheat0="Infinite\Rupees",E965F45C 5959
-Cheat1="Max\Double Defense Power",E865DD59 5966
-Cheat1_N=This gives you White Border Hearts
-Cheat2="Use Any Item In Any House",E965EEAE 595A,E965EEB4 595A
-Cheat3="Have\All Equipment",E965E02C C8C7
-Cheat5="Max\Heart Containers",E965E0BA 5A9A
-Cheat6="Max\Gold Skulltulas Killed",E865DD5F 59B6
-Cheat7="Time of Day Modifier",E965E09C ????
-Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
-Cheat8="Infinite\Energy",E965E0C0 5A9A
-Cheat9="Infinite\Magic",D0118971 0008,E865E0C6 5959,E865E0CC 5959,E865E0BD 59BA
-Cheat10="Tunic & Boot Options",E865E000 59??
-Cheat11="Infinite\Deku Sticks",E865E01C 5961
-Cheat12="Infinite\Deku Nuts",E865E01B 5961
-Cheat13="Infinite\Bombs",E865E01A 5961
-Cheat14="Infinite\Arrows",E865E019 5961
-Cheat15="Infinite\Deku Seeds",E865E01E 5961
-Cheat16="Infinite\Bombchu's",E865E024 5961
-Cheat17="Infinite\Magic Beans",E865E026 5961
-Cheat18="Infinite\Big Key,Small Keys,Compass,& Map",E865E038 5957,E865E037 5957,E865E036 5957,E865E035 5957,E865E03C 5957,E865E03B 5957,E865E03A 5957,E865E039 5957,E865E040 5957,E865E03F 5957,E865E03E 5957,E865E049 5961,E865E050 5961,E865E04F 5961,E865E04E 5961,E865E04D 5961,E865DD57 5961,E865DD5C 5961,E865E051 5961
-Cheat19="Have\Ocarina",E865E005 59??
-Cheat20="Have\Boomerang",E865E010 5960
-Cheat21="Have\Lens of Truth",E865E00F 595F
-Cheat22="Have\Megaton Hammer",E865E00D 5969
-Cheat23="Have\Deku Stick",E865E004 595A
-Cheat24="Have\Deku Nut",E865E003 5959
-Cheat25="Have\Bombs",E865E002 595C
-Cheat26="Have\Fairy Bow",E865E001 595B
-Cheat27="Have\Fairy Slingshot",E865E006 5958
-Cheat28="Have\Bombchu",E865E00C 5961
-Cheat29="Have\Arrows\Fire Arrow",E865E008 5956
-Cheat30="Have\Arrows\Ice Arrow",E865E00A 595E
-Cheat31="Have\Arrows\Light Arrow",E865E014 596C
-Cheat32="Have\Hookshot",E865E00B 59??
-Cheat33="Have\Magic Beans",E865E00E 596A
-Cheat34="Have\Magic\Fairie's Wind",E865E009 595D
-Cheat35="Have\Magic\Nayru's Love",E865E013 596B
-Cheat36="Have\Magic\Din's Fire",E865E007 5955
-Cheat37="Bottles\Bottle 1 Modifier",E865E012 59??
-Cheat38="Bottles\Bottle 2 Modifier",E865E011 59??
-Cheat39="Bottles\Bottle 3 Modifier",E865E018 59??
-Cheat40="Bottles\Bottle 4 Modifier",E865E017 59??
-Cheat41="Trading\Adult Link Item",E865E016 59??
-Cheat42="Trading\Young Link Item",E865E015 59??
-Cheat43="Turn Giant's Knife Into Biggoron's Sword",E865E0CA 5959
-Cheat44="Have Quiver (Holds 30)",E865E02F 5959
-Cheat45="Equipment Modifier 1",E865E02E 59??
-Cheat46="Equipment Modifier 2",E865E02D 59??
-Cheat47="Warp Song Location\Minuet of Forest & Serenade of Water",E865F323 59??
-Cheat47_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
-Cheat47_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat48="Warp Song Location\Prelude of Light & Nocturne of Shadow",E865F323 59??
-Cheat48_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
-Cheat48_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat49="Warp Song Location\Bolero of Fire",E865F323 59??
-Cheat49_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
-Cheat49_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat50="Warp Song Location\Requiem of Spirit",E865F323 59??
-Cheat50_O=$55 Lake Hylia,$62 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
-Cheat50_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat51="Nayru's Love is Always",E965F458 ????
-Cheat51_O=$595A OFF,$504F ON
-Cheat51_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
-Cheat52="Infinite\Timers\All Other Timers",E86510F7 598C
-Cheat52_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
-Cheat53="Epona\Max Carrots\Lon Lon Raunch",E8736DC0 5955,E8743C60 5955
-Cheat53_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
-Cheat54="Infinite\Timers\Escape From Gannons Tower",E865F463 5906
-Cheat54_N=This cheat works only on The Final Boss.
-Cheat55="Beta\Play Beta Quest Worlds",D011BB71 0000,E865F49D 59??
-Cheat55_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
-Cheat55_N=Put on the code on load up,& then press reset (F1) you will be in Beta Mode,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
-Cheat56="Level Select",D01C6E35 0000,E965E08E ????
-Cheat56_O=$595A Inside the Deku Tree,$5956 Dodongo's Cavern,$5962 Gerudo Training Ground,$595E Below The Phantom Gannon Boss,$596A Water Temple,$5977 Inside Jabu-Jabu's Belly,$597E Royal Family's Tomb,$5988 Shoadow Temple,$599C Lakeside Laboratory,$59AC Temple Of Time,$59BE ?
-Cheat57="Language Select",E865F497 59??
-Cheat57_O=$5A English,$59 German,$5C French
-Cheat58="Press L\To Levitate",D011BB11 0020,E971E628 9923
-Cheat59="Press L\For Infinite Hover Boots",D011BB11 0020,E971EE46 595D
-Cheat60="Instant Step Hoover Boots",D011BB11 0020,E971E628 9923,D011BB11 0000,E971EE46 595D,E865E000 59??
-Cheat60_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat61="Beta\Specific things lean",E85890D4 5959
-Cheat61_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest World 01)
-Cheat62="Beta\Appear in Strange Places (Hold R)",D01C681D 0010,E965F3F2 5959
-Cheat62_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
-Cheat63="Beta\Interface always off/on",E865EF77 594F,E865F3E9 59??
-Cheat63_O=$5A Off,$59 On
-Cheat63_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset.
-Cheat64="Always Have Wallet Size",E865E02E 59??
-Cheat64_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
-Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
-Cheat32_O=$64 Hookshot,$63 Longshot
-Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
-Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
-Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
-Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
-Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
-Cheat2_N=do not use under or in water
-Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
-Cheat45_N=This modifies the equipment you are carrying.
-Cheat46_N=This modifies the equipment you are carrying.
-Cheat58_N=Press L To Levitate & Let go to land
-Cheat59_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
-Cheat60_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
-Cheat4="Have\All Quest/Status Items",E965E034 894F,E965E032 504F
-Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-
-//----
-
-[27A3831D-B505A533-C:45]
-Name=Legend of Zelda, The - Ocarina of Time - Master Quest (E) [f2]
-Cheat0="Infinite\Rupees",E965F45C 5959
-Cheat1="Max\Double Defense Power",E865DD59 5966
-Cheat1_N=This gives you White Border Hearts
-Cheat2="Use Any Item In Any House",E965EEAE 595A,E965EEB4 595A
-Cheat3="Have\All Equipment",E965E02C C8C7
-Cheat5="Max\Heart Containers",E965E0BA 5A9A
-Cheat6="Max\Gold Skulltulas Killed",E865DD5F 59B6
-Cheat7="Time of Day Modifier",E965E09C ????
-Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
-Cheat8="Infinite\Energy",E965E0C0 5A9A
-Cheat9="Infinite\Magic",D0118971 0008,E865E0C6 5959,E865E0CC 5959,E865E0BD 59BA
-Cheat10="Tunic & Boot Options",E865E000 59??
-Cheat11="Infinite\Deku Sticks",E865E01C 5961
-Cheat12="Infinite\Deku Nuts",E865E01B 5961
-Cheat13="Infinite\Bombs",E865E01A 5961
-Cheat14="Infinite\Arrows",E865E019 5961
-Cheat15="Infinite\Deku Seeds",E865E01E 5961
-Cheat16="Infinite\Bombchu's",E865E024 5961
-Cheat17="Infinite\Magic Beans",E865E026 5961
-Cheat18="Infinite\Big Key,Small Keys,Compass,& Map",E865E038 5957,E865E037 5957,E865E036 5957,E865E035 5957,E865E03C 5957,E865E03B 5957,E865E03A 5957,E865E039 5957,E865E040 5957,E865E03F 5957,E865E03E 5957,E865E049 5961,E865E050 5961,E865E04F 5961,E865E04E 5961,E865E04D 5961,E865DD57 5961,E865DD5C 5961,E865E051 5961
-Cheat19="Have\Ocarina",E865E005 59??
-Cheat20="Have\Boomerang",E865E010 5960
-Cheat21="Have\Lens of Truth",E865E00F 595F
-Cheat22="Have\Megaton Hammer",E865E00D 5969
-Cheat23="Have\Deku Stick",E865E004 595A
-Cheat24="Have\Deku Nut",E865E003 5959
-Cheat25="Have\Bombs",E865E002 595C
-Cheat26="Have\Fairy Bow",E865E001 595B
-Cheat27="Have\Fairy Slingshot",E865E006 5958
-Cheat28="Have\Bombchu",E865E00C 5961
-Cheat29="Have\Arrows\Fire Arrow",E865E008 5956
-Cheat30="Have\Arrows\Ice Arrow",E865E00A 595E
-Cheat31="Have\Arrows\Light Arrow",E865E014 596C
-Cheat32="Have\Hookshot",E865E00B 59??
-Cheat33="Have\Magic Beans",E865E00E 596A
-Cheat34="Have\Magic\Fairie's Wind",E865E009 595D
-Cheat35="Have\Magic\Nayru's Love",E865E013 596B
-Cheat36="Have\Magic\Din's Fire",E865E007 5955
-Cheat37="Bottles\Bottle 1 Modifier",E865E012 59??
-Cheat38="Bottles\Bottle 2 Modifier",E865E011 59??
-Cheat39="Bottles\Bottle 3 Modifier",E865E018 59??
-Cheat40="Bottles\Bottle 4 Modifier",E865E017 59??
-Cheat41="Trading\Adult Link Item",E865E016 59??
-Cheat42="Trading\Young Link Item",E865E015 59??
-Cheat43="Turn Giant's Knife Into Biggoron's Sword",E865E0CA 5959
-Cheat44="Have Quiver (Holds 30)",E865E02F 5959
-Cheat45="Equipment Modifier 1",E865E02E 59??
-Cheat46="Equipment Modifier 2",E865E02D 59??
-Cheat47="Warp Song Location\Minuet of Forest & Serenade of Water",E865F323 59??
-Cheat47_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
-Cheat47_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat48="Warp Song Location\Prelude of Light & Nocturne of Shadow",E865F323 59??
-Cheat48_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
-Cheat48_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat49="Warp Song Location\Bolero of Fire",E865F323 59??
-Cheat49_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
-Cheat49_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat50="Warp Song Location\Requiem of Spirit",E865F323 59??
-Cheat50_O=$55 Lake Hylia,$62 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
-Cheat50_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
-Cheat51="Nayru's Love is Always",E965F458 ????
-Cheat51_O=$595A OFF,$504F ON
-Cheat51_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
-Cheat52="Infinite\Timers\All Other Timers",E86510F7 598C
-Cheat52_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
-Cheat53="Epona\Max Carrots\Lon Lon Raunch",E8736DC0 5955,E8743C60 5955
-Cheat53_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
-Cheat54="Infinite\Timers\Escape From Gannons Tower",E865F463 5906
-Cheat54_N=This cheat works only on The Final Boss.
-Cheat55="Beta\Play Beta Quest Worlds",D011BB71 0000,E865F49D 59??
-Cheat55_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
-Cheat55_N=Put on the code on load up,& then press reset (F1) you will be in Beta Mode,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
-Cheat56="Level Select",D01C6E35 0000,E965E08E ????
-Cheat56_O=$595A Inside the Deku Tree,$5956 Dodongo's Cavern,$5962 Gerudo Training Ground,$595E Below The Phantom Gannon Boss,$596A Water Temple,$5977 Inside Jabu-Jabu's Belly,$597E Royal Family's Tomb,$5988 Shoadow Temple,$599C Lakeside Laboratory,$59AC Temple Of Time,$59BE ?
-Cheat57="Language Select",E865F497 59??
-Cheat57_O=$5A English,$59 German,$5C French
-Cheat58="Press L\To Levitate",D011BB11 0020,E971E628 9923
-Cheat59="Press L\For Infinite Hover Boots",D011BB11 0020,E971EE46 595D
-Cheat60="Instant Step Hoover Boots",D011BB11 0020,E971E628 9923,D011BB11 0000,E971EE46 595D,E865E000 59??
-Cheat60_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat61="Beta\Specific things lean",E85890D4 5959
-Cheat61_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest World 01)
-Cheat62="Beta\Appear in Strange Places (Hold R)",D01C681D 0010,E965F3F2 5959
-Cheat62_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
-Cheat63="Beta\Interface always off/on",E865EF77 594F,E865F3E9 59??
-Cheat63_O=$5A Off,$59 On
-Cheat63_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset.
-Cheat64="Always Have Wallet Size",E865E02E 59??
-Cheat64_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
-Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
-Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
-Cheat32_O=$64 Hookshot,$63 Longshot
-Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
-Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
-Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
-Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
-Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
-Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
-Cheat2_N=do not use under or in water
-Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
-Cheat45_N=This modifies the equipment you are carrying.
-Cheat46_N=This modifies the equipment you are carrying.
-Cheat58_N=Press L To Levitate & Let go to land
-Cheat59_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
-Cheat60_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
-Cheat4="Have\All Quest/Status Items",E965E034 894F,E965E032 504F
-Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
-
-
 //--------------- PAL (E) Region Cheat Codes
 
-
-
 [0414CA61-2E57B8AA-C:50]
 Name=GOLDENEYE
 Cheat0="Enemies Do Nothing",E858D1AC 594F
@@ -9882,7 +10230,6 @@ Cheat10="Replace Cradle with Citadell hidden level ",E858B199 5981,E9572EBE 3206
 Cheat11="Secret Island on Dam Level",D004C2D1 0020,E85FFAE3 59AA,880BA78D 0000
 Cheat11_N=For the above code to work,Get to the 2nd guard tower & go down the ladder on the left hand side & to the end of the Dock, Press L & F9 and you will be transfered in the water. Just keep walking straight & you will get to it. Obviously you can't actually climb ladders or anything, you will simply walkthrough anything on that Part, if you want to walk back to the Dock, when you come near it click the cheat back on & keep pressing  L & F9 untill you are back on it.
 
-
 //----
 
 [3B941695-F90A5EEB-C:50]
@@ -13814,6 +14161,238 @@ Cheat6="Level Select",D00EA380 0020,E96BF6D0 596B,D00EA380 0020,E96BF6E0 595F,E9
 
 //----
 
+[1D4136F3-AF63EEA9-C:45]
+Name=The Legend of Zelda - Ocarina of Time - Master Quest (E) [h1C]
+Cheat0="Infinite\Rupees",E965F45C 5959
+Cheat1="Max\Double Defense Power",E865DD59 5966
+Cheat1_N=This gives you White Border Hearts
+Cheat2="Use Any Item In Any House",E965EEAE 595A,E965EEB4 595A
+Cheat3="Have\All Equipment",E965E02C C8C7
+Cheat5="Max\Heart Containers",E965E0BA 5A9A
+Cheat6="Max\Gold Skulltulas Killed",E865DD5F 59B6
+Cheat7="Time of Day Modifier",E965E09C ????
+Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
+Cheat8="Infinite\Energy",E965E0C0 5A9A
+Cheat9="Infinite\Magic",D0118971 0008,E865E0C6 5959,E865E0CC 5959,E865E0BD 59BA
+Cheat10="Tunic & Boot Options",E865E000 59??
+Cheat11="Infinite\Deku Sticks",E865E01C 5961
+Cheat12="Infinite\Deku Nuts",E865E01B 5961
+Cheat13="Infinite\Bombs",E865E01A 5961
+Cheat14="Infinite\Arrows",E865E019 5961
+Cheat15="Infinite\Deku Seeds",E865E01E 5961
+Cheat16="Infinite\Bombchu's",E865E024 5961
+Cheat17="Infinite\Magic Beans",E865E026 5961
+Cheat18="Infinite\Big Key,Small Keys,Compass,& Map",E865E038 5957,E865E037 5957,E865E036 5957,E865E035 5957,E865E03C 5957,E865E03B 5957,E865E03A 5957,E865E039 5957,E865E040 5957,E865E03F 5957,E865E03E 5957,E865E049 5961,E865E050 5961,E865E04F 5961,E865E04E 5961,E865E04D 5961,E865DD57 5961,E865DD5C 5961,E865E051 5961
+Cheat19="Have\Ocarina",E865E005 59??
+Cheat20="Have\Boomerang",E865E010 5960
+Cheat21="Have\Lens of Truth",E865E00F 595F
+Cheat22="Have\Megaton Hammer",E865E00D 5969
+Cheat23="Have\Deku Stick",E865E004 595A
+Cheat24="Have\Deku Nut",E865E003 5959
+Cheat25="Have\Bombs",E865E002 595C
+Cheat26="Have\Fairy Bow",E865E001 595B
+Cheat27="Have\Fairy Slingshot",E865E006 5958
+Cheat28="Have\Bombchu",E865E00C 5961
+Cheat29="Have\Arrows\Fire Arrow",E865E008 5956
+Cheat30="Have\Arrows\Ice Arrow",E865E00A 595E
+Cheat31="Have\Arrows\Light Arrow",E865E014 596C
+Cheat32="Have\Hookshot",E865E00B 59??
+Cheat33="Have\Magic Beans",E865E00E 596A
+Cheat34="Have\Magic\Fairie's Wind",E865E009 595D
+Cheat35="Have\Magic\Nayru's Love",E865E013 596B
+Cheat36="Have\Magic\Din's Fire",E865E007 5955
+Cheat37="Bottles\Bottle 1 Modifier",E865E012 59??
+Cheat38="Bottles\Bottle 2 Modifier",E865E011 59??
+Cheat39="Bottles\Bottle 3 Modifier",E865E018 59??
+Cheat40="Bottles\Bottle 4 Modifier",E865E017 59??
+Cheat41="Trading\Adult Link Item",E865E016 59??
+Cheat42="Trading\Young Link Item",E865E015 59??
+Cheat43="Turn Giant's Knife Into Biggoron's Sword",E865E0CA 5959
+Cheat44="Have Quiver (Holds 30)",E865E02F 5959
+Cheat45="Equipment Modifier 1",E865E02E 59??
+Cheat46="Equipment Modifier 2",E865E02D 59??
+Cheat47="Warp Song Location\Minuet of Forest & Serenade of Water",E865F323 59??
+Cheat47_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
+Cheat47_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat48="Warp Song Location\Prelude of Light & Nocturne of Shadow",E865F323 59??
+Cheat48_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
+Cheat48_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat49="Warp Song Location\Bolero of Fire",E865F323 59??
+Cheat49_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
+Cheat49_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat50="Warp Song Location\Requiem of Spirit",E865F323 59??
+Cheat50_O=$55 Lake Hylia,$62 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
+Cheat50_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat51="Nayru's Love is Always",E965F458 ????
+Cheat51_O=$595A OFF,$504F ON
+Cheat51_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
+Cheat52="Infinite\Timers\All Other Timers",E86510F7 598C
+Cheat52_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
+Cheat53="Epona\Max Carrots\Lon Lon Raunch",E8736DC0 5955,E8743C60 5955
+Cheat53_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
+Cheat54="Infinite\Timers\Escape From Gannons Tower",E865F463 5906
+Cheat54_N=This cheat works only on The Final Boss.
+Cheat55="Beta\Play Beta Quest Worlds",D011BB71 0000,E865F49D 59??
+Cheat55_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
+Cheat55_N=Put on the code on load up,& then press reset (F1) you will be in Beta Mode,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
+Cheat56="Level Select",D01C6E35 0000,E965E08E ????
+Cheat56_O=$595A Inside the Deku Tree,$5956 Dodongo's Cavern,$5962 Gerudo Training Ground,$595E Below The Phantom Gannon Boss,$596A Water Temple,$5977 Inside Jabu-Jabu's Belly,$597E Royal Family's Tomb,$5988 Shoadow Temple,$599C Lakeside Laboratory,$59AC Temple Of Time,$59BE ?
+Cheat57="Language Select",E865F497 59??
+Cheat57_O=$5A English,$59 German,$5C French
+Cheat58="Press L\To Levitate",D011BB11 0020,E971E628 9923
+Cheat59="Press L\For Infinite Hover Boots",D011BB11 0020,E971EE46 595D
+Cheat60="Instant Step Hoover Boots",D011BB11 0020,E971E628 9923,D011BB11 0000,E971EE46 595D,E865E000 59??
+Cheat60_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat61="Beta\Specific things lean",E85890D4 5959
+Cheat61_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest World 01)
+Cheat62="Beta\Appear in Strange Places (Hold R)",D01C681D 0010,E965F3F2 5959
+Cheat62_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
+Cheat63="Beta\Interface always off/on",E865EF77 594F,E865F3E9 59??
+Cheat63_O=$5A Off,$59 On
+Cheat63_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset.
+Cheat64="Always Have Wallet Size",E865E02E 59??
+Cheat64_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
+Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
+Cheat32_O=$64 Hookshot,$63 Longshot
+Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
+Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
+Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
+Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
+Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
+Cheat2_N=do not use under or in water
+Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
+Cheat45_N=This modifies the equipment you are carrying.
+Cheat46_N=This modifies the equipment you are carrying.
+Cheat58_N=Press L To Levitate & Let go to land
+Cheat59_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
+Cheat60_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
+Cheat4="Have\All Quest/Status Items",E965E034 894F,E965E032 504F
+Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+
+//----
+
+[27A3831D-B505A533-C:45]
+Name=The Legend of Zelda - Ocarina of Time - Master Quest (E) [f1] (NTSC)
+Cheat0="Infinite\Rupees",E965F45C 5959
+Cheat1="Max\Double Defense Power",E865DD59 5966
+Cheat1_N=This gives you White Border Hearts
+Cheat2="Use Any Item In Any House",E965EEAE 595A,E965EEB4 595A
+Cheat3="Have\All Equipment",E965E02C C8C7
+Cheat5="Max\Heart Containers",E965E0BA 5A9A
+Cheat6="Max\Gold Skulltulas Killed",E865DD5F 59B6
+Cheat7="Time of Day Modifier",E965E09C ????
+Cheat7_O=$995A At Sunrise,$B15A Daylight Out,$C95A Very Bright Out,$195A At Sunset,$295A Fairly Dark
+Cheat8="Infinite\Energy",E965E0C0 5A9A
+Cheat9="Infinite\Magic",D0118971 0008,E865E0C6 5959,E865E0CC 5959,E865E0BD 59BA
+Cheat10="Tunic & Boot Options",E865E000 59??
+Cheat11="Infinite\Deku Sticks",E865E01C 5961
+Cheat12="Infinite\Deku Nuts",E865E01B 5961
+Cheat13="Infinite\Bombs",E865E01A 5961
+Cheat14="Infinite\Arrows",E865E019 5961
+Cheat15="Infinite\Deku Seeds",E865E01E 5961
+Cheat16="Infinite\Bombchu's",E865E024 5961
+Cheat17="Infinite\Magic Beans",E865E026 5961
+Cheat18="Infinite\Big Key,Small Keys,Compass,& Map",E865E038 5957,E865E037 5957,E865E036 5957,E865E035 5957,E865E03C 5957,E865E03B 5957,E865E03A 5957,E865E039 5957,E865E040 5957,E865E03F 5957,E865E03E 5957,E865E049 5961,E865E050 5961,E865E04F 5961,E865E04E 5961,E865E04D 5961,E865DD57 5961,E865DD5C 5961,E865E051 5961
+Cheat19="Have\Ocarina",E865E005 59??
+Cheat20="Have\Boomerang",E865E010 5960
+Cheat21="Have\Lens of Truth",E865E00F 595F
+Cheat22="Have\Megaton Hammer",E865E00D 5969
+Cheat23="Have\Deku Stick",E865E004 595A
+Cheat24="Have\Deku Nut",E865E003 5959
+Cheat25="Have\Bombs",E865E002 595C
+Cheat26="Have\Fairy Bow",E865E001 595B
+Cheat27="Have\Fairy Slingshot",E865E006 5958
+Cheat28="Have\Bombchu",E865E00C 5961
+Cheat29="Have\Arrows\Fire Arrow",E865E008 5956
+Cheat30="Have\Arrows\Ice Arrow",E865E00A 595E
+Cheat31="Have\Arrows\Light Arrow",E865E014 596C
+Cheat32="Have\Hookshot",E865E00B 59??
+Cheat33="Have\Magic Beans",E865E00E 596A
+Cheat34="Have\Magic\Fairie's Wind",E865E009 595D
+Cheat35="Have\Magic\Nayru's Love",E865E013 596B
+Cheat36="Have\Magic\Din's Fire",E865E007 5955
+Cheat37="Bottles\Bottle 1 Modifier",E865E012 59??
+Cheat38="Bottles\Bottle 2 Modifier",E865E011 59??
+Cheat39="Bottles\Bottle 3 Modifier",E865E018 59??
+Cheat40="Bottles\Bottle 4 Modifier",E865E017 59??
+Cheat41="Trading\Adult Link Item",E865E016 59??
+Cheat42="Trading\Young Link Item",E865E015 59??
+Cheat43="Turn Giant's Knife Into Biggoron's Sword",E865E0CA 5959
+Cheat44="Have Quiver (Holds 30)",E865E02F 5959
+Cheat45="Equipment Modifier 1",E865E02E 59??
+Cheat46="Equipment Modifier 2",E865E02D 59??
+Cheat47="Warp Song Location\Minuet of Forest & Serenade of Water",E865F323 59??
+Cheat47_O=$5A Sacred Forest Meadow,$56 Lake Hylia,$65 Inside Jabu Jabu's Belly,$72 Dodongo's Cavern,$C2 Inside The Deku Tree
+Cheat47_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat48="Warp Song Location\Prelude of Light & Nocturne of Shadow",E865F323 59??
+Cheat48_O=$5B Kakariko Windmill,$57 Bombchu Bowling Alley,$5F Zelda & Impa Flee,$66 Kakariko Village,$67 Ganon,Final Battle,$6D Top of Ganon's Tower,$82 Bombchu Shop,$7E Bazaar,$8A Happy Mask Shop,$86 Ganon's Tower,$92 Ganon's Castle,$9E Inside Spirit Door,$BE Burning Castle,$AA House of Skulltula,$B6 Death Mountain Trail,$C2 Graveyard,$CA Thieves' Hideout,$C6 Royal Family's Tomb,$D2 Great Fairy Fountain 1,$D6 Forest Temple,Room With Falling Floor,$E2 Great Fairy Fountain 2,$F1 Grotto 01,$ED Grotto 02,$F6 Grotto 04,$02 Grotto 05,$0B Grotto 06,$0A Grotto 07,$06 Grotto 08,$12 Grotto 09,$1B Grotto 10,$1A Grotto 11,$16 Grotto 12,$4E Grotto 13,$2B Bottom of the Well,$2A Lon Lon Ranch Shed,$2B Lon Lon Ranch Outside Shed,$32 Ice Cavern,$3B Outside Cow Pen,$3A Lost Woods Bridge,$36 Lon Lon Ranch Chicken Room,$42 In Front of Deku Tree,$4E Spirit Temple Boss,$49 Castle Courtyard,In Front of Zelda,$46 Temple of Time,$52 Gerudo Fortress Jail
+Cheat48_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat49="Warp Song Location\Bolero of Fire",E865F323 59??
+Cheat49_O=$5B Castle Courtyard,$63 Dodongo's Cavern Boss,$6A Inside The Deku Tree Boss,$66 Shadow Temple Boss,$67 Water Temple Boss,$6E Ganon's Castle Tower,$6F Ganon First Battle,$82 Ganon's Castle Room Before Ganon,$83 Inside Ganon's Castle Room With Pillar,$7F Lon Lon Ranch,$8B Mido's House,$87 Saria's House,$A3 Bearded Man's House,$9A Top of Ganon's Castle,$97 Outside Saria's House,$9F Dampe's Race,$A7 Kokiri Forest,$B3 Top of Death Mountain,$AF Fishing Pond,$C2 Inside Ganon's Castle,$CF Hyrule Castle Gate,$14 Top of Ganon's Tower,$1C Great Fairy Fountain,$28 Lost Woods Goron Entrance,$34 Lost Woods River Entrance,$30 Lost Woods Bridge Field Entrance,$3B Goron City Lost Woods Entrance,$48 Death Mountain Crater,$4D Ganon's Castle
+Cheat49_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat50="Warp Song Location\Requiem of Spirit",E865F323 59??
+Cheat50_O=$55 Lake Hylia,$62 Zora's Domain,$72 Gerudo Valley,$70 Lost Woods,$82 Gerudo Fortress,$8A Haunted Wasteland,$86 Ganon's Castle Inside Burning Castle,$92 Hyrule Castle,$94 Ganon's Castle,$8D Death Mountain Trail,$9D Goron City,$B5 Fire Temple,$C1 Forest Temple,$C0 Shooting Gallery,$D1 Ganon's Castle Inside Burning Castle,$D0 Kakariko Village Entrance,$D3 Zora's River Entrance,$D5 Kokiri Forest Entrance,$E4 Lake Hyrule Entrance,$E0 Gerudo Valley Entrance,$EC Death Mountain Trail Entrance,$E5 Graveyard Entrance,$F0 Zora's Domain Entrance,$FC Zora's Fountain Entrance,$14 Goron City Entrance,$10 Death Mountain Trail,$19 Goron City,$15 Lakeside Laboratory,$21 Top of Ganon's Castle,$1D Hyrule Market (Child Link's),$1F Hyrule Market (Adult Link's),$49 Desert Colossus,$54 Lon Lon Ranch Entrance,$4D Hyrule Field
+Cheat50_N=For this cheat to work,You have to have the Ocarina & Songs. make your choice & Play the song of the cheat name to get where you chose.
+Cheat51="Nayru's Love is Always",E965F458 ????
+Cheat51_O=$595A OFF,$504F ON
+Cheat51_N=For this to work On Or off, you have to walk through a Doorway to activate the Change.
+Cheat52="Infinite\Timers\All Other Timers",E86510F7 598C
+Cheat52_N=This cheat works on all Race Timers not the final Boss and Under Water with iron Boots etc.
+Cheat53="Epona\Max Carrots\Lon Lon Raunch",E8736DC0 5955,E8743C60 5955
+Cheat53_N=This is For Practicing,Racing.Warning take this off before jumping the exit fence after winning Epona
+Cheat54="Infinite\Timers\Escape From Gannons Tower",E865F463 5906
+Cheat54_N=This cheat works only on The Final Boss.
+Cheat55="Beta\Play Beta Quest Worlds",D011BB71 0000,E865F49D 59??
+Cheat55_O=$5A World 01,$59 World 02,$5C World 03,$5B World 04,$56 World 05,$57 World 06,$62 World 07,$68 World 08
+Cheat55_N=Put on the code on load up,& then press reset (F1) you will be in Beta Mode,There are no icons, energy bar etc. on the screen.When you press a C-Buttton you can use an object.Here the objects for the C-Buttons:C-left: arrows, C-down: bombs, C-right: Ocarina of Time. There is also no Navi and start menu.When you go to some places the game will freeze or you can't move.
+Cheat56="Level Select",D01C6E35 0000,E965E08E ????
+Cheat56_O=$595A Inside the Deku Tree,$5956 Dodongo's Cavern,$5962 Gerudo Training Ground,$595E Below The Phantom Gannon Boss,$596A Water Temple,$5977 Inside Jabu-Jabu's Belly,$597E Royal Family's Tomb,$5988 Shoadow Temple,$599C Lakeside Laboratory,$59AC Temple Of Time,$59BE ?
+Cheat57="Language Select",E865F497 59??
+Cheat57_O=$5A English,$59 German,$5C French
+Cheat58="Press L\To Levitate",D011BB11 0020,E971E628 9923
+Cheat59="Press L\For Infinite Hover Boots",D011BB11 0020,E971EE46 595D
+Cheat60="Instant Step Hoover Boots",D011BB11 0020,E971E628 9923,D011BB11 0000,E971EE46 595D,E865E000 59??
+Cheat60_O=$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat61="Beta\Specific things lean",E85890D4 5959
+Cheat61_N=This code will cause all items on a specific plane to lean. This is helpful for areas in which the plane causes the crash (Ex. Weird Zora's Fountain Beta Quest World 01)
+Cheat62="Beta\Appear in Strange Places (Hold R)",D01C681D 0010,E965F3F2 5959
+Cheat62_N=If you go to an area where Link is immobile or invisible, using the "appear in strange places" code will almost always fix it, but you'll start somewhere outside of the Arena and in air. I recommend using the infinite step Hover boots code already supplied with PJ64 so you can float back into the arena in the event that this happens.
+Cheat63="Beta\Interface always off/on",E865EF77 594F,E865F3E9 59??
+Cheat63_O=$5A Off,$59 On
+Cheat63_N=If you go to an area where the interface is accessible, this signigfies that you're not in 'beta' mode anymore. Using the "interface always off/on" code, you can stay in 'beta' mode regardless of what happens. This may cause more crashes in SOME areas, but it's rare and is not too severe. If you need to explore a beta area with the interface, "use the interface always on" portion of the code. Don't use the codes as you start the game. If you need the interface on/off at a specific time, start the game, go to the area, activate the code, keep it on until next reset.
+Cheat64="Always Have Wallet Size",E865E02E 59??
+Cheat64_O=$97 Kid Wallet (Holds 99),$A7 Adult Wallet (Holds 200),$B7 Giant Wallet (Holds 500)
+Cheat10_O=$69 Kokiri Tunic & Kokiri Boots,$6C Goron Tunic & Kokiri Boots,$6B Zora Tunic & Kokiri Boots,$66 Black Tunic & Kokiri Boots,$65 White Tunic & Kokiri Boots,$68 Yellow Tunic & Kokiri Boots,$79 Kokiri Tunic & Iron Boots,$7C Goron Tunic & Iron Boots,$7B Zora Tunic & Iron Boots,$76 Black Tunic & Iron Boots,$75 White Tunic & Iron Boots,$78 Yellow Tunic & Iron Boots,$89 Kokiri Tunic & Hover Boots,$8C Goron Tunic & Hover Boots,$8B Zora Tunic & Hover Boots,$86 Black Tunic & Hover Boots,$85 White Tunic & Hover Boots,$88 Yellow Tunic & Hover Boots
+Cheat19_O=$57 Fairy Ocarina,$62 Ocarina Of Time
+Cheat32_O=$64 Hookshot,$63 Longshot
+Cheat37_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat38_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat39_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat40_O=$66 Empty Bottle,$65 Red Potion,$68 Green Potion,$67 Blue Potion,$72 Bottled Fairy,$71 Fish,$74 Lon Lon Milk,$73 Letter,$6E Blue Fire,$6D Bug,$70 Big Poe,$6F Lon Lon Milk (Half),$7A Poe
+Cheat41_O=$7D Pocket Egg,$80 Pocket Cucco,$7F Cojiro,$8A Odd Mushroom,$89 Odd Potion,$8C Poacher's Saw,$8B Goron's Sword (Broken),$86 Prescription,$85 Eyeball Frog,$88 Eye Drops,$87 Claim Check
+Cheat42_O=$79 Weird Egg,$7C Chicken,$7B Zelda's Letter,$76 Keaton Mask,$75 Skull Mask,$78 Spooky Mask,$77 Bunny Hood,$82 Goron Mask,$81 Zora Mask,$84 Gerudo Mask,$83 Mask of Truth,$7E SOLD OUT
+Cheat45_O=$5C Silver Scale,$56 Golden Scale,$58 Giant's Knife (Broken),$85 Black Gauntlets,$9A Bullet Bag (Holds 30),$DA Bullet Bag (Holds 40),$1A Bullet Bag (Holds 50)
+Cheat46_O=$62 Bomb Bag (Holds 20),$6A Bomb Bag (Holds 30),$72 Bomb Bag (Holds 40),$7A Goron's Bracelet,$82 Silver Gauntlets,$8A Golden Gauntlets
+Cheat0_N=This cheat allows you to have the max Rupees to the Wallet you currently Hold
+Cheat2_N=do not use under or in water
+Cheat3_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+Cheat10_N=This changes what you are wearing,once you have enabled the code press Start & then start again.
+Cheat45_N=This modifies the equipment you are carrying.
+Cheat46_N=This modifies the equipment you are carrying.
+Cheat58_N=Press L To Levitate & Let go to land
+Cheat59_N=Press L For Infinite Hover Boots & Let go to land,This Only works when you have the Boots on
+Cheat60_N=Take off from Anywhere & to go higher just press L Once, this will lift you higher while walking.to come back Down Keep R pressed.Once you have enabled the code press Start & then start again.
+Cheat4="Have\All Quest/Status Items",E965E034 894F,E965E032 504F
+Cheat4_N=This cheat causes the Goron Temple door not to open, but if you go to the very top of the mountain where the fairy is, next to her entrance is another one in to the fire temple.once inside put on the hover boots & infinite hover cheat to hover over to the ledge on the left hand side.From here you can carry on the game as normal
+
+//----
+
 [E0C4F72F-769E1506-C:50]
 Name=Tigger's Honey Hunt (E)
 Cheat0="Max Honey Pots",E9607FDE 5C37
@@ -14429,10 +15008,8 @@ Cheat1_N=This is for All Yoshis All levels
 Cheat2="Infinite Eggs",E87EA7D0 5958
 Cheat2_N=This is for All Yoshis All levels
 
-
 //--------------- PAL (A) Region Cheat Codes
 
-
 [155B7CDF-F0DA7325-C:55]
 Name=BANJO TOOIE
 Cheat0="Infinite\Energy\Banjo and Kazooie",E86552FF 59BB,E9685CDC 6364
@@ -14610,10 +15187,8 @@ Cheat33_N=Only put this on after you have alreay Chose your Character on the Mai
 Cheat34_N=Only put this on after you have alreay Chose your Character on the Main Menu,& Do not use more then 1 Character Modifier at a time.Using this Code This could also result freezing at the end of the Level.
 Cheat42_N=Only put this on after you have alreay Chose your Character on the Main Menu,& Do not use more then 1 Character Modifier at a time.Using this Code This could also result freezing at the end of the Level.
 
-
 //--------------- PAL (F) Region Cheat Codes
 
-
 [2B38AEC0-6350B810-C:46]
 Name=A Bug's Life (F)
 Cheat0="Infinite\Lives",E8747A18 5961
@@ -14762,7 +15337,6 @@ Name=Pokemon Snap (F)
 Cheat0="[Enable All Levels]",E9627CA6 5958
 Cheat0_N=This is needed to be able to Play all Levels of the Game
 
-
 //--------------- PAL (G) Region Cheat Codes
 
 [DFF227D9-0D4D8169-C:44]
@@ -14951,10 +15525,8 @@ Name=Pokemon Snap (G)
 Cheat0="[Enable All Levels]",E9627B26 5958
 Cheat0_N=This is needed to be able to Play all Levels of the Game
 
-
 //--------------- PAL (I) Region Cheat Codes
 
-
 [F63B89CE-4582D57D-C:49]
 Name=A Bug's Life (I)
 Cheat0="Infinite\Lives",E8747AB8 5961
@@ -14994,10 +15566,8 @@ Name=Pokemon Snap (I)
 Cheat0="[Enable All Levels]",E9627A66 5958
 Cheat0_N=This is needed to be able to Play all Levels of the Game
 
-
 //--------------- PAL (S) Region Cheat Codes
 
-
 [5F6A04E2-D4FA070D-C:53]
 Name=Mission Impossible (S)
 Cheat0="Invincibility",E95EBB1C 5A59
@@ -15018,7 +15588,6 @@ Name=Pokemon Snap (S)
 Cheat0="[Enable All Levels]",E9627A66 5958
 Cheat0_N=This is needed to be able to Play all Levels of the Game
 
-
 //--------------- PAL (FGD) Region Cheat Codes
 
 [2E0E7749-B8B49D59-C:58]
@@ -15031,7 +15600,6 @@ Cheat0="Access In-Game Cheat Menu",E967A9E4 504F,E967A9E2 504F
 Name=Turok 2 - Seeds of Evil (FGD)
 Cheat0="Access In-Game Cheat Menu",E967A9E4 504F,E967A9E2 504F
 
-
 //--------------- Demo Cheat Codes
 
 [3A089BBC-54AB2C06-C:0]
@@ -15052,7 +15620,6 @@ Cheat4="Infinite Health\Player 2",E884A1F6 5977
 Cheat5="Infinite Health\Player 3",E884A14E 5977
 Cheat6="Infinite Health\Player 4",E884A2A6 5977
 
-
 //Recent in File---------->Anything under here is still being worked on<--------------------------------
 
 [04DAF07F-0D18E688-C:45]
@@ -15066,7 +15633,6 @@ Cheat5="Invincibility",E8614115 5959
 Cheat6="Time Always 00:00",E870701A 595A
 Cheat7="Enable Debug Menu",E86150E8 5959
 
-
 [32CA974B-B2C29C50-C:46]
 Name=DUKE NUKEM ZERO HOUR (F)
 Cheat0="Cheat Menu\Cheat Menu Enabled",E871FAA0 5959
@@ -15215,67 +15781,4 @@ Cheat6="Infinite Cash",E89098E2 995A
 Cheat7="Freeze Timer",E85772F1 595A
 Cheat5="Max Sponsor Credits",E890BA56 596A,E890BA5C 5959
 
-[E0144180-650B78C9-C:45]
-Name=Tony Hawk's Pro Skater (U) (V1.1)
-Cheat0="Officer Dick\Have All\Tapes",50000901 0000,100DEAC8 00FF
-Cheat1="Officer Dick\Have All\Gold Medal\Burnside",E8613D22 594F
-Cheat2="Officer Dick\Have All\Gold Medal\Skate Park",E8613D1D 594F
-Cheat3="Officer Dick\Have All\Gold Medal\Roswell",E8613D28 594F
-Cheat4="Tony Hawk\Have All\Tapes",50000901 0000,100DEA00 00FF
-Cheat5="Tony Hawk\Have All\Gold Medal\Burnside Portland",E8613D5A 594F
-Cheat6="Tony Hawk\Have All\Gold Medal\Skate Park Chicago",E8613D55 594F
-Cheat7="Tony Hawk\Have All\Gold Medal\Roswell",E8613D60 594F
-Cheat8="Bob Burnquist\Have All\Tapes",50000901 0000,100DEA14 00FF
-Cheat9="Bob Burnquist\Have All\Gold Medal\Burnside Portland",E8613D6E 594F
-Cheat10="Bob Burnquist\Have All\Gold Medal\Skate Park Chicago",E8613D69 594F
-Cheat11="Bob Burnquist\Have All\Gold Medal\Roswell",E8613D74 594F
-Cheat12="Geoff Rowley\Have All\Tapes",50000901 0000,100DEA28 00FF
-Cheat13="Geoff Rowley\Have All\Gold Medal\Burnside Portland",E8613D82 594F
-Cheat14="Geoff Rowley\Have All\Gold Medal\Skate Park Chicago",E8613D7D 594F
-Cheat15="Geoff Rowley\Have All\Gold Medal\Roswell",E8613D88 594F
-Cheat16="Bucky Lasek\Have All\Tapes",50000901 0000,100DEA3C 00FF
-Cheat17="Bucky Lasek\Have All\Gold Medal\Burnside Portland",E8613D96 594F
-Cheat18="Bucky Lasek\Have All\Gold Medal\Skate Park Chicago",E8613D91 594F
-Cheat19="Bucky Lasek\Have All\Gold Medal\Roswell",E8613D9C 594F
-Cheat20="Chad Muska\Have All\Tapes",50000901 0000,100DEA50 00FF
-Cheat21="Chad Muska\Have All\Gold Medal\Burnside Portland",E8613DAA 594F
-Cheat22="Chad Muska\Have All\Gold Medal\Skate Park Chicago",E8613DA5 594F
-Cheat23="Chad Muska\Have All\Gold Medal\Roswell",E8613DB0 594F
-Cheat24="Kareem Campbell\Have All\Tapes",50000901 0000,100DEA64 00FF
-Cheat25="Kareem Campbell\Have All\Gold Medal\Burnside Portland",E8613DBE 594F
-Cheat26="Kareem Campbell\Have All\Gold Medal\Skate Park Chicago",E8613DB9 594F
-Cheat27="Kareem Campbell\Have All\Gold Medal\Roswell",E8613DC4 594F
-Cheat28="Andrew Reynolds\Have All\Tapes",50000901 0000,100DEA78 00FF
-Cheat29="Andrew Reynolds\Have All\Gold Medal\Burnside Portland",E8613DD2 594F
-Cheat30="Andrew Reynolds\Have All\Gold Medal\Skate Park Chicago",E8613DCD 594F
-Cheat31="Andrew Reynolds\Have All\Gold Medal\Roswell",E8613DD8 594F
-Cheat32="Rune Glifberg\Have All\Tapes",50000901 0000,100DEA8C 00FF
-Cheat33="Rune Glifberg\Have All\Gold Medal\Burnside Portland",E8613DE6 594F
-Cheat34="Rune Glifberg\Have All\Gold Medal\Skate Park Chicago",E8613DE1 594F
-Cheat35="Rune Glifberg\Have All\Gold Medal\Roswell",E8613DEC 594F
-Cheat36="Jamie Thomas\Have All\Tapes",50000901 0000,100DEAA0 00FF
-Cheat37="Jamie Thomas\Have All\Gold Medal\Burnside Portland",E8613DFA 594F
-Cheat38="Jamie Thomas\Have All\Gold Medal\Skate Park Chicago",E8613DF5 594F
-Cheat39="Jamie Thomas\Have All\Gold Medal\Roswell",E8613D00 594F
-Cheat40="Elissa Steamer\Have All\Tapes",50000901 0000,100DEAB4 00FF
-Cheat41="Elissa Steamer\Have All\Gold Medal\Burnside Portland",E8613D0E 594F
-Cheat42="Elissa Steamer\Have All\Gold Medal\Skate Park Chicago",E8613D09 594F
-Cheat43="Elissa Steamer\Have All\Gold Medal\Roswell",E8613D14 594F
-Cheat44="Player 1\Super Max\Ollie",E861B534 504F
-Cheat45="Player 1\Super Max\Speed",E861B533 504F
-Cheat46="Player 1\Super Max\Air",E861B532 504F
-Cheat47="Player 1\Super Max\Balance",E861B531 504F
-Cheat48="Player 1\Super Max\Turning",E861B538 504F
-Cheat49="Player 2\Super Max\Ollie",E861B537 504F
-Cheat50="Player 2\Super Max\Speed",E861B536 504F
-Cheat51="Player 2\Super Max\Air",E861B535 504F
-Cheat52="Player 2\Super Max\Balance",E861B53C 504F
-Cheat53="Player 2\Super Max\Turning",E861B53B 504F
-Cheat54="Player 1\Play As",E861622C 59??
-Cheat54_O=$5A Tony Hawk,$59 Bob Burnquist,$5C Geoff Rowley,$5B Bucky Lasek,$56 Chad Muska,$55 Kareem Campbell,$58 Andrew Reynolds,$57 Rune Glifberg,$62 Jamie Thomas,$61 Elissa Steamer,$64 Officer Dick
-Cheat55="Player 2\Play As",E861622B 59??
-Cheat55_O=$5A Tony Hawk,$59 Bob Burnquist,$5C Geoff Rowley,$5B Bucky Lasek,$56 Chad Muska,$55 Kareem Campbell,$58 Andrew Reynolds,$57 Rune Glifberg,$62 Jamie Thomas,$61 Elissa Steamer,$64 Officer Dick
-Cheat56="Player 1\Have Perfect Balance",E8613F95 5959
-
 //End Of File---------->Anything under here was put in by you<--------------------------------
-
diff --git a/Config/Project64.rdb b/Config/Project64.rdb
index ae3611e3d..ce2dbb1d9 100644
--- a/Config/Project64.rdb
+++ b/Config/Project64.rdb
@@ -1,7 +1,6 @@
 // ============ RDB for PJ64 v2.2. GoodN64 v321 =====================================
 // PJ64 v2.2 Official RDB
 // Not for use with PJ64 v1.6 or previous
-
 //---- START OF RDB FILE HEADER ---------------------------------------------------------
 
 [Meta]
@@ -156,6 +155,7 @@ Good Name=007 - The World is Not Enough (E) (M3)
 Internal Name=TWINE
 Status=Compatible
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Fixed Audio=1
 RDRAM Size=8
 Sync Audio=0
@@ -165,6 +165,7 @@ Good Name=007 - The World is Not Enough (U)
 Internal Name=TWINE
 Status=Compatible
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Fixed Audio=1
 RDRAM Size=8
 Sync Audio=0
@@ -299,10 +300,9 @@ Status=Compatible
 
 [8CC182A6-C2D0CAB0-C:4A]
 Good Name=AI Shougi 3 (J)
-Internal Name=AI¼®³·Þ3
-Status=Unsupported
-Core Note=causing texture errors
-Culling=1
+Internal Name=AIｼｮｳｷﾞ3
+Status=Compatible
+Core Note=
 
 [2DC4FFCC-C8FF5A21-C:50]
 Good Name=Aidyn Chronicles - The First Mage (E)
@@ -335,18 +335,37 @@ RDRAM Size=8
 Sync Audio=0
 
 [27C425D0-8C2D99C1-C:50]
-Good Name=Airboarder 64 (E)
+Good Name=Air Boarder 64 (E)
 Internal Name=AIR BOARDER 64
 Status=Compatible
 Counter Factor=1
 
+[89A498AE-DE3CD49A-C:50]
+Good Name=Air Boarder 64 (E) (NTSC)
+Internal Name=AIR BOARDER 64
+Screenhertz=60
+Status=Compatible
+Counter Factor=1
+
 [6C45B60C-DCE50E30-C:4A]
-Good Name=Airboarder 64 (J)
+Good Name=Air Boarder 64 (J)
 Internal Name=´±°ÎÞ°ÀÞ°64
 Status=Compatible
 Counter Factor=1
 Culling=1
 
+[26809B20-39A516A4-C:4A]
+Good Name=Air Boarder 64 (J)
+Internal Name=´±°ÎÞ°ÀÞ°64
+Status=Compatible
+Counter Factor=1
+
+[F255D6F1-B65D6728-C:4A]
+Good Name=Air Boarder 64 (J)
+Internal Name=Աюް^ж4
+Status=Compatible
+Counter Factor=1
+
 [B6951A94-63C849AF-C:4A]
 Good Name=Akumajou Dracula Mokushiroku - Real Action Adventure (J)
 Internal Name=DRACULA MOKUSHIROKU
@@ -406,26 +425,31 @@ ViRefresh=1400
 
 [8F0CC36D-C738259E-C:45]
 Good Name=Animal Forest [T-90%]
-Status=Compatible
-Plugin Note=[video] errorsause menu
+Status=Issues (plugin)
+Plugin Note=[video] errors:pause menu
+Save Type=FlashRam
+SMM-Protect=1
 
 [3CC77150-21CDB987-C:50]
 Good Name=Armorines - Project S.W.A.R.M. (E)
 Internal Name=Armorines Project S.
 Status=Compatible
 Culling=1
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [C0F6DB17-80E0D532-C:44]
 Good Name=Armorines - Project S.W.A.R.M. (G)
 Internal Name=Armorines Project S.
 Status=Compatible
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [1FB5D932-3BA9481B-C:45]
 Good Name=Armorines - Project S.W.A.R.M. (U)
 Internal Name=Armorines Project S.
 Status=Compatible
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [4C52BBB2-CEAB0F6B-C:45]
@@ -433,24 +457,28 @@ Good Name=Army Men - Air Combat (U)
 Internal Name=ARMYMENAIRCOMBAT
 Status=Compatible
 Plugin Note=[video] errors:missile on level2+
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [B210DF19-98B58D1A-C:50]
 Good Name=Army Men - Sarge's Heroes (E) (M3)
 Internal Name=Army Men Sarge
 Status=Compatible
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [862C0657-8DFD896D-C:45]
 Good Name=Army Men - Sarge's Heroes (U)
 Internal Name=Army Men Sarge
 Status=Compatible
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [B20F73B6-2975FC34-C:45]
 Good Name=Army Men - Sarge's Heroes 2 (U)
 Internal Name=ARMYMEN SARGE 2
 Status=Compatible
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [D1F7D8AB-293B0446-C:45]
@@ -504,6 +532,7 @@ Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 Culling=1
 Self Texture=1
+RDRAM Size=8
 
 [514B6900-B4B19881-C:4A]
 Good Name=Banjo to Kazooie no Daibouken 2 (J)
@@ -512,6 +541,7 @@ Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 Save Type=16kbit Eeprom
+RDRAM Size=8
 
 [733FCCB1-444892F9-C:50]
 Good Name=Banjo-Kazooie (E) (M3)
@@ -520,6 +550,7 @@ Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 Culling=1
 Self Texture=1
+RDRAM Size=8
 
 [A4BF9306-BF0CDFD1-C:45]
 Good Name=Banjo-Kazooie (U) (V1.0)
@@ -529,6 +560,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Primary Frame Buffer=1
 Self Texture=1
+RDRAM Size=8
 
 [CD7559AC-B26CF5AE-C:45]
 Good Name=Banjo-Kazooie (U) (V1.1)
@@ -538,6 +570,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Primary Frame Buffer=1
 Self Texture=1
+RDRAM Size=8
 
 [155B7CDF-F0DA7325-C:55]
 Good Name=Banjo-Tooie (A)
@@ -546,6 +579,7 @@ Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 Save Type=16kbit Eeprom
+RDRAM Size=8
 
 [C9176D39-EA4779D1-C:50]
 Good Name=Banjo-Tooie (E) (M4)
@@ -556,6 +590,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Save Type=16kbit Eeprom
 Self Texture=1
+RDRAM Size=8
 
 [C2E9AA9A-475D70AA-C:45]
 Good Name=Banjo-Tooie (U)
@@ -567,6 +602,7 @@ AiCountPerBytes=625
 Culling=1
 Save Type=16kbit Eeprom
 Self Texture=1
+RDRAM Size=8
 
 [B088FBB4-441E4B1D-C:50]
 Good Name=Bass Hunter 64 (E)
@@ -588,6 +624,7 @@ Status=Compatible
 Plugin Note=[video] missing:player textures in menu; use Glide64
 Counter Factor=1
 Culling=1
+RDRAM Size=8
 
 [204489C1-1286CF2B-C:45]
 Good Name=Batman Beyond - Return of the Joker (U)
@@ -606,16 +643,19 @@ RDRAM Size=8
 Good Name=BattleTanx (U)
 Internal Name=BATTLETANX
 Status=Compatible
+AudioResetOnLoad=Yes
 Counter Factor=3
 
 [0CAD17E6-71A5B797-C:50]
 Good Name=BattleTanx - Global Assault (E) (M3)
 Internal Name=BATTLETANXGA
+AudioResetOnLoad=Yes
 
 [75A4E247-6008963D-C:45]
 Good Name=BattleTanx - Global Assault (U)
 Internal Name=BATTLETANXGA
 Status=Compatible
+AudioResetOnLoad=Yes
 Counter Factor=3
 
 [55D4C4CE-7753C78A-C:45]
@@ -682,8 +722,10 @@ Core Note=(see GameFAQ)
 Plugin Note=[video] depth problem (use Glide64 RDRAM Size=8 in main RDB, otherwise Glide64 will not render all the background in some scenes)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fixed Audio=1
+Linking=Off
 Sync Audio=0
 
 [7C64E6DB-55B924DB-C:50]
@@ -848,6 +890,17 @@ Good Name=Bust-A-Move '99 (U)
 Internal Name=Bust A Move '99
 Status=Compatible
 
+[8AFB2D9A-9F186C02-C:45]
+Good Name=Bust-A-Move '99 (U)
+Internal Name=Bust-A-Move '99 
+Status=Compatible
+
+[F23CA406-EC2ACE78-C:45]
+Good Name=Bust-A-Move '99 (U) (PAL)
+Internal Name=Bust-A-Move '99
+Status=Compatible
+Screenhertz=50
+
 [CEDCDE1E-513A0502-C:50]
 Good Name=Bust-A-Move 2 - Arcade Edition (E)
 Internal Name=Bust A Move 2
@@ -863,6 +916,19 @@ Good Name=Bust-A-Move 3 DX (E)
 Internal Name=Bust A Move 3 DX
 Status=Compatible
 
+[D5BDCD1D-393AFE43-C:50]
+Core Note=
+Good Name=Bust-A-Move 3 DX (E) (NTSC)
+internal Name=Bust-A-Move 3 DX
+Screenhertz=60
+Status=Compatible
+
+[364C4ADC-D3050993-C:50]
+Good Name=Bust-A-Move 3 DX (E) (NTSC100%)
+internal Name=Bust-A-Move 3 DX
+Status=Compatible
+Screenhertz=60
+
 //================  C  ================
 [CA2A7444-71DAB71C-C:50]
 Good Name=California Speed (E) (M5)
@@ -1329,14 +1395,16 @@ Status=Compatible
 [A5F667E1-DA1FBD1F-C:4A]
 Good Name=Derby Stallion 64 (J)
 Internal Name=DERBYSTALLION 64
+Save Type=FlashRam
 Status=Compatible
 AiCountPerBytes=200
-Sync Audio=0
 
 [96BA4EFB-C9988E4E-C:0]
 Good Name=Derby Stallion 64 (J) (Beta)
 Internal Name=
-Status=Unsupported
+Save Type=FlashRam
+Status=Compatible
+CRC-Recalc=Yes
 
 [630AA37D-896BD7DB-C:50]
 Good Name=Destruction Derby 64 (E) (M3)
@@ -1458,6 +1526,13 @@ Status=Compatible
 Counter Factor=3
 RDRAM Size=8
 
+[D52FE29D-8EA6A759-C:0]
+Counter Factor=1
+Good Name=Donchan Puzzle Hanabi de Doon! (J) [ALECK64]
+Status=Compatible
+RDRAM Size=8
+Save Type=4kbit Eeprom
+
 [11936D8C-6F2C4B43-C:50]
 Good Name=Donkey Kong 64 (E)
 Internal Name=DONKEY KONG 64
@@ -1539,6 +1614,7 @@ Good Name=Doom 64 (U) (V1.1)
 Internal Name=Doom64
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
+32bit=No
 Culling=1
 
 [BFF7B1C2-AEBF148E-C:4A]
@@ -1563,8 +1639,10 @@ Save Type=16kbit Eeprom
 [BD8E206D-98C35E1C-C:4A]
 Good Name=Doubutsu no Mori (J)
 Internal Name=DOUBUTSUNOMORI
-Status=Compatible
+Status=Issues (plugin)
 Plugin Note=[video] errors:pause menu
+Save Type=FlashRam
+SMM-Protect=1
 
 [769D4D13-DA233FFE-C:45]
 Good Name=Dr. Mario 64 (U)
@@ -1603,6 +1681,8 @@ Good Name=Duck Dodgers Starring Daffy Duck (U) (M3)
 Internal Name=LT DUCK DODGERS
 Status=Compatible
 Counter Factor=1
+Dsound-SyncAudio=1
+Sync Audio=0
 
 [DC36626A-3F3770CB-C:50]
 Good Name=Duke Nukem - ZER0 H0UR (E)
@@ -1637,6 +1717,12 @@ Internal Name=DUKE NUKEM
 Status=Compatible
 Plugin Note=[video] depth problem; use Glide64
 
+[FF14C1DA-167FDE92-C:45]
+Good Name=Duke Nukem 64 (Prototype)
+Internal Name=duke
+Status=Compatible
+Plugin Note=[video] depth problem; use Glide64
+
 [1E12883D-D3B92718-C:46]
 Good Name=Duke Nukem 64 (F)
 Internal Name=DUKE NUKEM
@@ -1682,6 +1768,13 @@ Internal Name=´²º³É¾ÝıÝÄÞØ­°½
 Status=Issues (plugin)
 Plugin Note=[video] errors:sky,various (see GameFAQ)
 
+[6D9D1FE4-84D10BEA-C:4A]
+Counter Factor=1
+Good Name=Eleven Beat - World Tournament (J) [ALECK64]
+Status=Compatible
+RDRAM Size=8
+Save Type=4kbit Eeprom
+
 [F2A653CB-60633B3B-C:45]
 Good Name=Elmo's Letter Adventure (U)
 Internal Name=Elmo's Letter Advent
@@ -1866,6 +1959,26 @@ Plugin Note=[video] (see GameFAQ)
 Clear Frame=2
 Culling=1
 
+[BBFDEC37-D93B9EC0-C:4A]
+Good Name=F-ZERO X + Expansion Kit (J) [CART HACK]
+Status=Compatible
+Core Note=(see GameFAQ)
+Plugin Note=[video] (see GameFAQ)
+32bit=No
+RDRAM Size=8
+Culling=1
+AllowROMWrites=Yes
+
+[C6E39C0A-D2726676-C:45]
+Good Name=F-ZERO X + Expansion Kit (U) [CART HACK]
+Status=Compatible
+Core Note=(see GameFAQ)
+Plugin Note=[video] (see GameFAQ)
+32bit=No
+RDRAM Size=8
+Culling=1
+AllowROMWrites=Yes
+
 [3CECBCB8-6126BF07-C:50]
 Good Name=F1 Racing Championship (E) (M5)
 Internal Name=F1RacingChampionship
@@ -2005,18 +2118,21 @@ Good Name=Forsaken 64 (E) (M4)
 Internal Name=Forsaken
 Status=Compatible
 Core Note=timing (see GameFAQ)
+RDRAM Size=8
 
 [C3CD76FF-9B9DCBDE-C:44]
 Good Name=Forsaken 64 (G)
 Internal Name=Forsaken
 Status=Compatible
 Core Note=timing (see GameFAQ)
+RDRAM Size=8
 
 [9E330C01-8C0314BA-C:45]
 Good Name=Forsaken 64 (U)
 Internal Name=Forsaken
 Status=Compatible
 Core Note=timing (see GameFAQ)
+RDRAM Size=8
 
 [3261D479-ED0DBC25-C:45]
 Good Name=Fox Sports College Hoops '99 (U)
@@ -2026,21 +2142,22 @@ Culling=1
 
 [F774EAEE-F0D8B13E-C:4A]
 Good Name=Fushigi no Dungeon - Fuurai no Shiren 2 - Oni Shuurai! Shiren Jou! (J)
-Internal Name=F3 ̳ײɼÚÝ2
-Status=Uncertain
-Core Note=?
-Plugin Note=[video] (see GameFAQ)
-32bit=No
-Clear Frame=2
+Internal Name=F3 ﾌｳﾗｲﾉｼﾚﾝ2
+Status=Issues (plugin)
+Plugin Note=[video] missing:graphics (see GameFAQ)
 Counter Factor=1
-Culling=1
-Self Texture=1
+32bit=No
 
 //================  G  ================
 [68FCF726-49658CBC-C:50]
 Good Name=G.A.S.P!! Fighters' NEXTream (E)
 Internal Name=G.A.S.P!!Fighters'NE
 Status=Compatible
+SMM-Cache=0
+SMM-FUNC=0
+SMM-PI DMA=0
+SMM-Protect=1
+SMM-TLB=0
 Culling=1
 RDRAM Size=8
 
@@ -2048,6 +2165,11 @@ RDRAM Size=8
 Good Name=G.A.S.P!! Fighters' NEXTream (J)
 Internal Name=G.A.S.P!!Fighters'NE
 Status=Compatible
+SMM-Cache=0
+SMM-FUNC=0
+SMM-PI DMA=0
+SMM-Protect=1
+SMM-TLB=0
 RDRAM Size=8
 
 [457B9CD9-09C55352-C:4A]
@@ -2289,6 +2411,13 @@ Counter Factor=1
 Delay SI=Yes
 RDRAM Size=8
 
+[B57D4EB4-345E09E5-C:0]
+Counter Factor=1
+Good Name=Guru - Kuru Kuru Fever (J) [ALECK64]
+Status=Compatible
+RDRAM Size=8
+Save Type=4kbit Eeprom
+
 //================  H  ================
 [95A80114-E0B72A7F-C:4A]
 Good Name=Hamster Monogatari 64 (J)
@@ -2313,8 +2442,8 @@ Counter Factor=1
 [3E70E866-4438BAE8-C:4A]
 Good Name=Heiwa Pachinko World 64 (J)
 Internal Name=HEIWA ÊßÁݺ Ü°ÙÄÞ64
-Status=Uncertain
-Plugin Note=[video] unsupported; use Glide64; errors:?
+Status=Issues (plugin)
+Plugin Note=[video] use Glide64; errors:various
 RDRAM Size=8
 
 [AE90DBEB-79B89123-C:50]
@@ -2483,6 +2612,7 @@ Internal Name=Hydro Thunder
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=530
+Audio Signal=Yes
 Counter Factor=1
 Fixed Audio=1
 RDRAM Size=8
@@ -2494,6 +2624,7 @@ Internal Name=Hydro Thunder
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=530
+Audio Signal=Yes
 Counter Factor=1
 Fixed Audio=1
 RDRAM Size=8
@@ -2505,6 +2636,7 @@ Internal Name=HYDRO THUNDER
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=530
+Audio Signal=Yes
 Counter Factor=1
 Fixed Audio=1
 RDRAM Size=8
@@ -2530,12 +2662,14 @@ Good Name=Iggy's Reckin' Balls (E)
 Internal Name=Iggy's Reckin' Balls
 Status=Compatible
 Core Note=hang after race?
+AudioResetOnLoad=Yes
 
 [E616B5BC-C9658B88-C:45]
 Good Name=Iggy's Reckin' Balls (U)
 Internal Name=Iggy's Reckin' Balls
 Status=Compatible
 Core Note=hang after race?
+AudioResetOnLoad=Yes
 
 [69458B9E-FC95F936-C:4A]
 Good Name=Iggy-kun no Bura Bura Poyon (J)
@@ -2558,6 +2692,7 @@ Core Note=Recompiler Trading Post freeze.
 Plugin Note=[rsp] interpreter only
 32bit=No
 AiCountPerBytes=650
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fast SP=No
 Fixed Audio=1
@@ -2579,6 +2714,7 @@ Core Note=Recompiler Trading Post freeze.
 Plugin Note=[rsp] interpreter only [audio] wrong speed;use(E)ROM
 32bit=No
 AiCountPerBytes=740
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fast SP=No
 Fixed Audio=1
@@ -2708,8 +2844,17 @@ Status=Compatible
 [C73AD016-48C5537D-C:4A]
 Good Name=Jangou Simulation Mahjong Dou 64 (J)
 Internal Name=Ï°¼Þ¬ÝÄÞ³64
-Status=Only intro/part OK
-Core Note=crashes
+Status=Compatible
+
+[C99936D1-23D1D65D-C:4A]
+Good Name=Japan Pro Golf Tour 64 (J) [CART HACK]
+Status=Issues (core)
+Core Note=Saves not supported
+32bit=No
+Counter Factor=1
+RDRAM Size=8
+Sync Audio=0
+AllowROMWrites=Yes
 
 [69256460-B9A3F586-C:45]
 Good Name=Jeopardy! (U)
@@ -2734,6 +2879,7 @@ Internal Name=JET FORCE GEMINI
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 32bit=No
+Counter Factor=1
 Culling=1
 Emulate Clear=1
 SMM-Cache=0
@@ -2748,6 +2894,7 @@ Internal Name=JET FORCE GEMINI
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 32bit=No
+Counter Factor=1
 Culling=1
 Emulate Clear=1
 SMM-Cache=0
@@ -2761,6 +2908,7 @@ Good Name=Jet Force Gemini (U) (Kiosk Demo)
 Internal Name=J F G DISPLAY
 Status=Compatible
 32bit=No
+Counter Factor=1
 SMM-Cache=0
 SMM-FUNC=0
 SMM-PI DMA=0
@@ -2837,16 +2985,19 @@ Status=Compatible
 Good Name=Jikkyou Powerful Pro Yakyuu 6 (J) (V1.0)
 Internal Name=PAWAFURU PUROYAKYU6
 Status=Compatible
+32bit=No
 
 [3C084040-081B060C-C:4A]
 Good Name=Jikkyou Powerful Pro Yakyuu 6 (J) (V1.1)
 Internal Name=PAWAFURU PUROYAKYU6
 Status=Compatible
+32bit=No
 
 [438E6026-3BA24E07-C:4A]
 Good Name=Jikkyou Powerful Pro Yakyuu 6 (J) (V1.2)
 Internal Name=PAWAFURU PUROYAKYU6
 Status=Compatible
+32bit=No
 
 [6EDD4766-A93E9BA8-C:4A]
 Good Name=Jikkyou Powerful Pro Yakyuu Basic Ban 2001 (J) (V1.0)
@@ -2891,6 +3042,7 @@ Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=800
+AudioResetOnLoad=Yes
 
 [4AAAF6ED-376428AD-C:4A]
 Good Name=Jinsei Game 64 (J)
@@ -2971,7 +3123,7 @@ Good Name=King Hill 64 - Extreme Snowboarding (J)
 Internal Name=KING HILL 64
 Status=Issues (core)
 Core Note=no sound
-Plugin Note=[video] errors:menu snowflakes
+Plugin Note=[video] errors:menu snowflakes; use Glide64
 RDRAM Size=8
 
 [75BC6AD6-78552BC9-C:4A]
@@ -3038,6 +3190,36 @@ Culling=1
 RDRAM Size=8
 Save Type=16kbit Eeprom
 
+[0837F87A-D1436FF8-C:4A]
+Good Name=Kyojin no Doshin 1 (J) [CART HACK]
+Status=Issues (core)
+Core Note=Saves not supported
+32bit=No
+Counter Factor=1
+RDRAM Size=8
+Sync Audio=0
+AllowROMWrites=Yes
+
+[E7BDA0BE-ADA09CAC-C:4A]
+Good Name=Kyojin no Doshin 1 (J) (Kiosk Demo) [CART HACK]
+Status=Issues (core)
+Core Note=Saves not supported
+32bit=No
+Counter Factor=1
+RDRAM Size=8
+Sync Audio=0
+AllowROMWrites=Yes
+
+[8C47CE8B-06019FEF-C:4A]
+Good Name=Kyojin no Doshin - Kaihou Sensen Chibikko Chikko Daishuugou (J) [CART HACK]
+Status=Issues (core)
+Core Note=Saves not supported
+32bit=No
+Counter Factor=1
+RDRAM Size=8
+Sync Audio=0
+AllowROMWrites=Yes
+
 //================  L  ================
 [7F304099-52CF5276-C:4A]
 Good Name=Last Legion UX (J)
@@ -3095,6 +3277,8 @@ ViRefresh=1400
 Good Name=Looney Tunes - Duck Dodgers (E) (M6)
 Internal Name=DAFFY DUCK STARRING
 Status=Compatible
+Dsound-SyncAudio=1
+Sync Audio=0
 RDRAM Size=8
 
 [2483F22B-136E025E-C:55]
@@ -3102,11 +3286,13 @@ Good Name=Lylat Wars (A) (M3)
 Internal Name=STARFOX64
 Status=Compatible
 Culling=1
+Linking=Off
 
 [F4CBE92C-B392ED12-C:50]
 Good Name=Lylat Wars (E) (M3)
 Internal Name=STARFOX64
 Status=Compatible
+Linking=Off
 
 //================  M  ================
 [1145443D-11610EDB-C:50]
@@ -3186,6 +3372,13 @@ Internal Name=MAGICAL TETRIS
 Status=Compatible
 AiCountPerBytes=200
 
+[D5356BAC-97AE69D2-C:4A]
+Counter Factor=1
+Good Name=Magical Tetris Challenge Featuring Mickey (J) [ALECK64]
+Status=Compatible
+RDRAM Size=8
+Save Type=4kbit Eeprom
+
 [C53EDC41-ECE19359-C:4A]
 Good Name=Mahjong 64 (J)
 Internal Name=MAHJONG64
@@ -3218,6 +3411,44 @@ Internal Name=MLB FEATURING K G JR
 Status=Issues (plugin)
 Plugin Note=[video] slow; use 1.6 plugin (see GameFAQ)
 
+[AB9EB27D-5F05605F-C:4A]
+Good Name=Mario Artist - Communication Kit (J) [CART HACK]
+Status=Compatible
+32bit=No
+Counter Factor=1
+RDRAM Size=8
+Sync Audio=0
+AllowROMWrites=Yes
+
+[3A3EB7FB-0DDD515C-C:4A]
+Good Name=Mario Artist - Paint Studio (J) [CART HACK]
+Status=Issues (plugin)
+Plugin Note=[video] HLE not fully supported; stamps not working
+32bit=No
+Counter Factor=1
+RDRAM Size=8
+Sync Audio=0
+AllowROMWrites=Yes
+
+[2D5EFCC5-98CF79D2-C:4A]
+Good Name=Mario Artist - Polygon Studio (J) [CART HACK]
+Status=Issues (plugin)
+Plugin Note=[video] HLE not fully supported; cannot model
+32bit=No
+Counter Factor=1
+RDRAM Size=8
+AllowROMWrites=Yes
+
+[4CBC3B56-FDB69B1C-C:4A]
+Good Name=Mario Artist - Talent Studio (J) [CART HACK]
+Status=Issues (plugin)
+Plugin Note=[video] HLE not fully supported; face and animation editing does not work
+32bit=No
+Counter Factor=1
+RDRAM Size=8
+Sync Audio=0
+AllowROMWrites=Yes
+
 [62E957D0-7FC15A5D-C:50]
 Good Name=Mario Golf (E)
 Internal Name=MarioGolf64
@@ -3254,6 +3485,7 @@ Self Texture=1
 Good Name=Mario Kart 64 (E) (V1.0)
 Internal Name=MARIOKART64
 Status=Compatible
+Cheat0=81001A38 2409,81001A3A 0002,81001A3C 2409,81001A3E 0002,81001C90 240A,81001C92 0002,81001C94 240A,81001C96 0002 //Multiplayer timing fix
 Plugin Note=[video] (see GameFAQ)
 Culling=1
 Primary Frame Buffer=1
@@ -3262,6 +3494,7 @@ Primary Frame Buffer=1
 Good Name=Mario Kart 64 (E) (V1.1)
 Internal Name=MARIOKART64
 Status=Compatible
+Cheat0=81001A38 2409,81001A3A 0002,81001A3C 2409,81001A3E 0002,81001C90 240A,81001C92 0002,81001C94 240A,81001C96 0002 //Multiplayer timing fix
 Plugin Note=[video] (see GameFAQ)
 Culling=1
 Primary Frame Buffer=1
@@ -3270,6 +3503,7 @@ Primary Frame Buffer=1
 Good Name=Mario Kart 64 (J) (V1.0)
 Internal Name=MARIOKART64
 Status=Compatible
+Cheat0=81001A38 2409,81001A3A 0002,81001A3C 2409,81001A3E 0002,81001C90 240A,81001C92 0002,81001C94 240A,81001C96 0002 //Multiplayer timing fix
 Plugin Note=[video] (see GameFAQ)
 Culling=1
 Primary Frame Buffer=1
@@ -3278,6 +3512,7 @@ Primary Frame Buffer=1
 Good Name=Mario Kart 64 (J) (V1.1)
 Internal Name=MARIOKART64
 Status=Compatible
+Cheat0=81001A38 2409,81001A3A 0002,81001A3C 2409,81001A3E 0002,81001C90 240A,81001C92 0002,81001C94 240A,81001C96 0002 //Multiplayer timing fix
 Plugin Note=[video] (see GameFAQ)
 Culling=1
 Primary Frame Buffer=1
@@ -3286,6 +3521,7 @@ Primary Frame Buffer=1
 Good Name=Mario Kart 64 (U)
 Internal Name=MARIOKART64
 Status=Compatible
+Cheat0=81001A38 2409,81001A3A 0002,81001A3C 2409,81001A3E 0002,81001C90 240A,81001C92 0002,81001C94 240A,81001C96 0002 //Multiplayer timing fix
 Plugin Note=[video] (see GameFAQ)
 Culling=1
 Primary Frame Buffer=1
@@ -3293,9 +3529,8 @@ Primary Frame Buffer=1
 [9A9890AC-F0C313DF-C:4A]
 Good Name=Mario no Photopi (J)
 Internal Name=ÏصÉÌ«ÄËß°
-Status=Needs video plugin
-Plugin Note=[video] HLE not supported; major errors
-HLE GFX=No
+Status=Needs RSP plugin
+Plugin Note=[rsp] needs semaphore lock
 
 [9C663069-80F24A80-C:50]
 Good Name=Mario Party (E) (M3)
@@ -3369,6 +3604,7 @@ Internal Name=MARIO STORY
 Status=Compatible
 Plugin Note=[video] errors:menus (see GameFAQ)
 32bit=No
+Save Type=FlashRam
 Clear Frame=1
 Counter Factor=1
 Culling=1
@@ -3694,6 +3930,7 @@ Good Name=Namco Museum 64 (U)
 Internal Name=NAMCOMUSEUM64
 Status=Compatible
 Culling=1
+RDRAM Size=8
 
 [DF331A18-5FD4E044-C:45]
 Good Name=NASCAR 2000 (U)
@@ -3702,6 +3939,7 @@ Status=Issues (plugin)
 Plugin Note=[video] splitscreen problem; use software rendering
 Clear Frame=2
 Culling=1
+RDRAM Size=8
 
 [AE4992C9-9253B253-C:50]
 Good Name=NASCAR 99 (E) (M3)
@@ -3709,6 +3947,7 @@ Internal Name=NASCAR 99
 Status=Issues (plugin)
 Plugin Note=[video] splitscreen problem; use software rendering
 Clear Frame=2
+RDRAM Size=8
 
 [23749578-80DC58FD-C:45]
 Good Name=NASCAR 99 (U)
@@ -3716,6 +3955,7 @@ Internal Name=NASCAR 99
 Status=Issues (plugin)
 Plugin Note=[video] splitscreen problem; use software rendering
 Clear Frame=2
+RDRAM Size=8
 
 [916852D8-73DBEAEF-C:45]
 Good Name=NBA Courtside 2 - Featuring Kobe Bryant (U)
@@ -3840,6 +4080,7 @@ ViRefresh=500
 Good Name=Neon Genesis Evangelion (J)
 Internal Name=EVANGELION
 Status=Compatible
+AudioResetOnLoad=Yes
 Clear Frame=1
 Culling=1
 Save Type=16kbit Eeprom
@@ -3890,12 +4131,18 @@ RDRAM Size=8
 [4B629EF4-99B21D9B-C:50]
 Good Name=NFL Quarterback Club 98 (E)
 Internal Name=quarterback_club_98
-Status=Unsupported
+Status=Compatible
+Plugin Note=[video] HLE not supported
+32bit=No
+HLE GFX=No
 
 [D89BE2F8-99C97ADF-C:45]
 Good Name=NFL Quarterback Club 98 (U)
 Internal Name=quarterback_club_98
-Status=Unsupported
+Status=Compatible
+Plugin Note=[video] HLE not supported
+32bit=No
+HLE GFX=No
 
 [52A3CF47-4EC13BFC-C:50]
 Good Name=NFL Quarterback Club 99 (E)
@@ -3913,11 +4160,13 @@ RDRAM Size=8
 Good Name=NHL 99 (E)
 Internal Name=NHL 99
 Status=Compatible
+RDRAM Size=8
 
 [591A806E-A5E6921D-C:45]
 Good Name=NHL 99 (U)
 Internal Name=NHL 99
 Status=Compatible
+RDRAM Size=8
 
 [82EFDC30-806A2461-C:45]
 Good Name=NHL Blades of Steel '99 (U)
@@ -4023,7 +4272,8 @@ Culling=1
 [5B9B1618-1B43C649-C:4A]
 Good Name=Nushi Duri 64 - Shiokaze ni Notte (J)
 Internal Name=ǼÂÞØ64¼µ¶¾ÞÆɯÃ
-Status=Unsupported
+Status=Compatible
+Plugin Note=[video] missing:lots; use Glide64
 
 //================  O  ================
 [812289D0-C2E53296-C:50]
@@ -4044,6 +4294,7 @@ Internal Name=OgreBattle64
 Status=Issues (plugin)
 Core Note=old [!] ROM is bad; high system requirement
 Plugin Note=[video] missing:backgrounds in battle scenes
+32bit=No
 
 [E6419BC5-69011DE3-C:45]
 Good Name=Ogre Battle 64 - Person of Lordly Caliber (U) (V1.0)
@@ -4051,6 +4302,7 @@ Internal Name=OgreBattle64
 Status=Issues (plugin)
 Core Note=high system requirement
 Plugin Note=[video] missing:backgrounds in battle scenes
+32bit=No
 
 [0ADAECA7-B17F9795-C:45]
 Good Name=Ogre Battle 64 - Person of Lordly Caliber (U) (V1.1)
@@ -4058,6 +4310,7 @@ Internal Name=OgreBattle64
 Status=Issues (plugin)
 Core Note=high system requirement
 Plugin Note=[video] missing:backgrounds in battle scenes
+32bit=No
 
 [AE2D3A35-24F0D41A-C:50]
 Good Name=Olympic Hockey Nagano '98 (E) (M4)
@@ -4098,6 +4351,7 @@ Internal Name=PAPER MARIO
 Status=Compatible
 Plugin Note=[video] errors:menus (see GameFAQ)
 32bit=No
+Save Type=FlashRam
 Clear Frame=1
 Counter Factor=1
 Culling=1
@@ -4108,6 +4362,7 @@ Internal Name=PAPER MARIO
 Status=Compatible
 Plugin Note=[video] errors:menus (see GameFAQ)
 32bit=No
+Save Type=FlashRam
 Clear Frame=1
 Counter Factor=1
 Culling=1
@@ -4467,6 +4722,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Emulate Clear=1
 Linking=Off
+RDRAM Size=8
 
 [AC5AA5C7-A9B0CDC3-C:46]
 Good Name=Pokemon Stadium 2 (F)
@@ -4476,6 +4732,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Emulate Clear=1
 Linking=Off
+RDRAM Size=8
 
 [439B7E7E-C1A1495D-C:44]
 Good Name=Pokemon Stadium 2 (G)
@@ -4485,6 +4742,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Emulate Clear=1
 Linking=Off
+RDRAM Size=8
 
 [EFCEAF00-22094848-C:49]
 Good Name=Pokemon Stadium 2 (I)
@@ -4494,6 +4752,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Emulate Clear=1
 Linking=Off
+RDRAM Size=8
 
 [63775886-5FB80E7B-C:4A]
 Good Name=Pokemon Stadium 2 (J)
@@ -4503,6 +4762,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Emulate Clear=1
 Linking=Off
+RDRAM Size=8
 
 [D0A1FC5B-2FB8074B-C:53]
 Good Name=Pokemon Stadium 2 (S)
@@ -4512,6 +4772,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Emulate Clear=1
 Linking=Off
+RDRAM Size=8
 
 [03571182-892FD06D-C:45]
 Good Name=Pokemon Stadium 2 (U)
@@ -4521,6 +4782,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Emulate Clear=1
 Linking=Off
+RDRAM Size=8
 
 [EE4FD7C2-9CF1D938-C:4A]
 Good Name=Pokemon Stadium Kin Gin (J)
@@ -4530,6 +4792,7 @@ Plugin Note=[video] (see GameFAQ)
 Culling=1
 Emulate Clear=1
 Linking=Off
+RDRAM Size=8
 
 [41380792-A167E045-C:45]
 Good Name=Polaris SnoCross (U)
@@ -4547,12 +4810,14 @@ Good Name=Power Rangers - Lightspeed Rescue (E)
 Internal Name=POWER RANGERS
 Status=Compatible
 Plugin Note=[video] errors:2D; use Glide64 (see GameFAQ)
+RDRAM Size=8
 
 [CF8957AD-96D57EA9-C:45]
 Good Name=Power Rangers - Lightspeed Rescue (U)
 Internal Name=POWER RANGERS
 Status=Compatible
 Plugin Note=[video] errors:2D; use Glide64 (see GameFAQ)
+RDRAM Size=8
 
 [F3D27F54-C111ACF9-C:50]
 Good Name=Premier Manager 64 (E)
@@ -4595,6 +4860,18 @@ Good Name=Puzzle Bobble 64 (J)
 Internal Name=PUZZLEBOBBLE64
 Status=Compatible
 
+[412E02B8-51A57E8E-C:4A]
+Good Name=Puzzle Bobble 64 (J) (PAL)
+internal Name=PUZZLEBOBBLE64
+Status=Compatible
+Screenhertz=50
+
+[53D93EA2-B88836C6-C:4A]
+Good Name=Puzzle Bobble 64 (J) (PAL)
+internal Name=PUZZLEBOBBLE64
+Status=Compatible
+Screenhertz=50
+
 [4BBBA2E2-8BF3BBB2-C:0]
 Good Name=Puzzle Master 64 by Michael Searl (PD)
 Internal Name=Puzzle Master 64
@@ -4742,7 +5019,11 @@ Internal Name=Re-Volt
 Status=Compatible
 Plugin Note=[video] slow in options menu
 RDRAM Size=8
-ViRefresh=1400
+ViRefresh=1500
+AiCountPerBytes=530
+Counter Factor=1
+Fixed Audio=1
+Sync Audio=0
 
 [0F1FA987-BFC1AFA6-C:45]
 Good Name=Re-Volt (U)
@@ -4750,7 +5031,11 @@ Internal Name=Re-Volt
 Status=Compatible
 Plugin Note=[video] slow in options menu
 RDRAM Size=8
-ViRefresh=1400
+ViRefresh=1500
+AiCountPerBytes=530
+Counter Factor=1
+Fixed Audio=1
+Sync Audio=0
 
 [8BD4A334-1E138B05-C:50]
 Good Name=Ready 2 Rumble Boxing (E) (M3)
@@ -4777,8 +5062,10 @@ Core Note=(see GameFAQ)
 Plugin Note=[video] depth problem (use Glide64 and RDRAM Size=4 in main RDB, otherwise Glide64 will not render all the background in some scenes)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fixed Audio=1
+Linking=Off
 Sync Audio=0
 
 [2F493DD0-2E64DFD9-C:45]
@@ -4789,9 +5076,11 @@ Core Note=(see GameFAQ)
 Plugin Note=[video] depth problem (use Glide64 and RDRAM Size=4 in main RDB, otherwise Glide64 will not render all the background in some scenes)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Culling=1
 Fixed Audio=1
+Linking=Off
 Sync Audio=0
 
 [AA18B1A5-07DB6AEB-C:45]
@@ -4802,9 +5091,11 @@ Core Note=(see GameFAQ)
 Plugin Note=[video] depth problem (use Glide64 and RDRAM Size=4 in main RDB, otherwise Glide64 will not render all the background in some scenes)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Culling=1
 Fixed Audio=1
+Linking=Off
 Sync Audio=0
 
 [02D8366A-6CABEF9C-C:50]
@@ -4829,6 +5120,7 @@ Status=Compatible
 Core Note=high system requirement
 Plugin Note=[video] missing:mirror; use Glide64
 Culling=1
+RDRAM Size=8
 
 [0B6B4DDB-9671E682-C:45]
 Good Name=Roadsters Trophy (U) (M3)
@@ -4842,8 +5134,7 @@ RDRAM Size=8
 [272B690F-AD0A7A77-C:4A]
 Good Name=Robot Ponkottsu 64 - 7tsu no Umi no Caramel (J)
 Internal Name=Robopon64
-Status=Uncertain
-Core Note=TLB used?
+Status=Compatible
 Clear Frame=1
 Save Type=16kbit Eeprom
 
@@ -5023,6 +5314,7 @@ Good Name=SD Hiryuu no Ken Densetsu (J)
 Internal Name=SD HIRYU STADIUM
 Status=Needs video plugin
 Plugin Note=[video] missing:menus,HUD
+RDRAM Size=8
 
 [93A625B9-2D6022E6-C:42]
 Good Name=Shadow Man (B)
@@ -5087,11 +5379,12 @@ Status=Compatible
 [EF703CA4-4D4A9AC9-C:4A]
 Good Name=Shin Nihon Pro Wrestling Toukon Road - Brave Spirits (J)
 Internal Name=TOUKON ROAD
-Status=Uncertain
-Core Note=input problem?
-Plugin Note=[video] HLE not supported
-HLE GFX=No
+Status=Issues (plugin)
+Core Note=high system requirement
+Plugin Note=[video] HLE not supported; flicker
 RDRAM Size=8
+Delay SI=Yes
+HLE GFX=No
 
 [551C7F43-9149831C-C:4A]
 Good Name=Shin Nihon Pro Wrestling Toukon Road 2 - The Next Generation (J)
@@ -5102,6 +5395,16 @@ Plugin Note=[video] HLE not supported; flicker
 HLE GFX=No
 RDRAM Size=8
 
+[909535F8-118FEF8F-C:4A]
+Good Name=Sim City 64 (J) [CART HACK]
+Status=Issues (plugin)
+Plugin Note=[video] HLE not supported; rendering problems in city
+32bit=No
+Counter Factor=1
+HLE GFX=No
+RDRAM Size=8
+AllowROMWrites=Yes
+
 [B1D5280C-4BA7BC2A-C:4A]
 Good Name=Sim City 2000 (J)
 Internal Name=SIM CITY 2000
@@ -5113,6 +5416,7 @@ Good Name=Sin & Punishment (J) [T]
 Internal Name=Sin and Punishment
 Status=Compatible
 Plugin Note=[video] errors:static in cutscenes
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 Emulate Clear=1
@@ -5164,22 +5468,28 @@ Status=Compatible
 Good Name=South Park (B)
 Internal Name=South Park
 Status=Compatible
+AudioResetOnLoad=Yes
+RDRAM Size=8
 
 [20B53662-7B61899F-C:50]
 Good Name=South Park (E) (M3)
 Internal Name=South Park
 Status=Compatible
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [91B66D42-16AC4E46-C:44]
 Good Name=South Park (G)
 Internal Name=South Park
 Status=Compatible
+AudioResetOnLoad=Yes
+RDRAM Size=8
 
 [7ECBE939-3C331795-C:45]
 Good Name=South Park (U)
 Internal Name=South Park
 Status=Compatible
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [C00CA948-8E60D34B-C:50]
@@ -5254,32 +5564,44 @@ Plugin Note=[video] (see GameFAQ)
 Clear Frame=2
 Culling=1
 RDRAM Size=8
+AudioResetOnLoad=Yes
 
 [FFCAA7C1-68858537-C:4A]
 Good Name=Star Fox 64 (J) (V1.0)
 Internal Name=STARFOX64
 Status=Compatible
+Linking=Off
 
 [65AEDEEF-3857C728-C:4A]
 Good Name=Star Fox 64 (J) (V1.1)
 Internal Name=STARFOX64
 Status=Compatible
+Linking=Off
 
 [A7D015F8-2289AA43-C:45]
 Good Name=Star Fox 64 (U) (V1.0)
 Internal Name=STARFOX64
 Status=Compatible
+Linking=Off
 
 [BA780BA0-0F21DB34-C:45]
 Good Name=Star Fox 64 (U) (V1.1)
 Internal Name=STARFOX64
 Status=Compatible
+Linking=Off
 
 [B703EB23-28AAE53A-C:4A]
 Good Name=Star Soldier - Vanishing Earth (J)
 Internal Name=STAR SOLDIER
 Status=Compatible
 
+[315C7466-3A453265-C:4A]
+Counter Factor=1
+Good Name=Star Soldier - Vanishing Earth (J) [ALECK64]
+Status=Compatible
+RDRAM Size=8
+Save Type=4kbit Eeprom
+
 [DDD93C85-DAE381E8-C:45]
 Good Name=Star Soldier - Vanishing Earth (U)
 Internal Name=STAR SOLDIER
@@ -5290,8 +5612,14 @@ Good Name=Star Twins (J)
 Internal Name=STAR TWINS
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
+Counter Factor=1
 Culling=1
 Emulate Clear=1
+SMM-Cache=0
+SMM-FUNC=0
+SMM-PI DMA=0
+SMM-Protect=1
+SMM-TLB=0
 
 [7EE0E8BB-49E411AA-C:50]
 Good Name=Star Wars - Rogue Squadron (E) (M3) (V1.0)
@@ -5301,6 +5629,7 @@ Core Note=high system requirement
 Plugin Note=[rsp] interpreter only, flicker [video] (see GameFAQ)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fixed Audio=1
 HLE GFX=No
@@ -5316,6 +5645,7 @@ Core Note=high system requirement
 Plugin Note=[rsp] interpreter only, flicker [video] (see GameFAQ)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fixed Audio=1
 HLE GFX=No
@@ -5331,6 +5661,7 @@ Core Note=high system requirement
 Plugin Note=[rsp] interpreter only, flicker [video] (see GameFAQ)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fixed Audio=1
 HLE GFX=No
@@ -5346,6 +5677,7 @@ Core Note=high system requirement
 Plugin Note=[rsp] interpreter only, flicker [video] (see GameFAQ)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fixed Audio=1
 HLE GFX=No
@@ -5412,6 +5744,7 @@ Core Note=(see GameFAQ)
 Plugin Note=[rsp] interpreter only [video] errors:various (see GameFAQ)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fixed Audio=1
 HLE GFX=No
@@ -5427,6 +5760,7 @@ Core Note=(see GameFAQ)
 Plugin Note=[rsp] interpreter only [video] errors:various (see GameFAQ)
 32bit=No
 AiCountPerBytes=530
+AudioResetOnLoad=Yes
 Counter Factor=1
 Fixed Audio=1
 HLE GFX=No
@@ -5438,6 +5772,7 @@ Sync Audio=0
 Good Name=Star Wars Episode I - Racer (E) (M3)
 Internal Name=STAR WARS EP1 RACER
 Status=Compatible
+AudioResetOnLoad=Yes
 Counter Factor=1
 Culling=1
 Emulate Clear=1
@@ -5448,6 +5783,7 @@ Save Type=16kbit Eeprom
 Good Name=Star Wars Episode I - Racer (J)
 Internal Name=STAR WARS EP1 RACER
 Status=Compatible
+AudioResetOnLoad=Yes
 Counter Factor=1
 Culling=1
 Emulate Clear=1
@@ -5458,6 +5794,7 @@ Save Type=16kbit Eeprom
 Good Name=Star Wars Episode I - Racer (U)
 Internal Name=STAR WARS EP1 RACER
 Status=Compatible
+AudioResetOnLoad=Yes
 Counter Factor=1
 Culling=1
 Emulate Clear=1
@@ -5468,6 +5805,7 @@ Save Type=16kbit Eeprom
 Good Name=StarCraft 64 (E)
 Internal Name=STARCRAFT 64
 Status=Compatible
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 RDRAM Size=8
@@ -5476,6 +5814,7 @@ RDRAM Size=8
 Good Name=StarCraft 64 (G) (Beta)
 Internal Name=STARCRAFT 64
 Status=Compatible
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 RDRAM Size=8
@@ -5484,6 +5823,7 @@ RDRAM Size=8
 Good Name=StarCraft 64 (U) (Beta)
 Internal Name=Á2فE8y)±tU…y7àÕ]¹9
 Status=Compatible
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 RDRAM Size=8
@@ -5492,6 +5832,7 @@ RDRAM Size=8
 Good Name=StarCraft 64 (U)
 Internal Name=STARCRAFT 64
 Status=Compatible
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 RDRAM Size=8
@@ -5650,12 +5991,14 @@ Status=Compatible
 Cheat0=80000303 0000
 CheatPlugin0=Jabo's Direct3D8,Glide64 For PJ64
 Resolution Height=239
+RDRAM Size=8
 
 [80A78080-5F9F8833-C:0]
 Good Name=Sydney 2000 (U) (Unreleased)
 Internal Name=Syd2k USA
 Status=Compatible
 Resolution Height=239
+RDRAM Size=8
 
 //================  T  ================
 [37955E65-C6F2B7B3-C:0]
@@ -5807,6 +6150,7 @@ Emulate Clear=1
 SMM-PI DMA=0
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [B044B569-373C1985-C:50]
 Good Name=The Legend of Zelda - Ocarina of Time (E) (M3) (V1.0)
@@ -5822,6 +6166,7 @@ Emulate Clear=1
 SMM-PI DMA=0
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [B2055FBD-0BAB4E0C-C:50]
 Good Name=The Legend of Zelda - Ocarina of Time (E) (M3) (V1.1)
@@ -5837,6 +6182,7 @@ Emulate Clear=1
 SMM-PI DMA=0
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [F3DD35BA-4152E075-C:45]
 Good Name=The Legend of Zelda - Ocarina of Time (U) (GC)
@@ -5853,6 +6199,7 @@ Emulate Clear=1
 SMM-PI DMA=0
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [EC7011B7-7616D72B-C:45]
 Good Name=The Legend of Zelda - Ocarina of Time (U) (V1.0)
@@ -5873,6 +6220,7 @@ SMM-PI DMA=0
 SMM-Protect=1
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [D43DA81F-021E1E19-C:45]
 Good Name=The Legend of Zelda - Ocarina of Time (U) (V1.1)
@@ -5892,6 +6240,7 @@ SMM-PI DMA=0
 SMM-Protect=1
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [693BA2AE-B7F14E9F-C:45]
 Good Name=The Legend of Zelda - Ocarina of Time (U) (V1.2)
@@ -5911,6 +6260,7 @@ SMM-PI DMA=0
 SMM-Protect=1
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [1D4136F3-AF63EEA9-C:50]
 Good Name=The Legend of Zelda - Ocarina of Time - Master Quest (E) (GC)
@@ -6030,23 +6380,27 @@ Good Name=Tom Clancy's Rainbow Six (E)
 Internal Name=RAINBOW SIX
 Status=Compatible
 32bit=No
+RDRAM Size=8
 
 [486BF335-034DCC81-C:46]
 Good Name=Tom Clancy's Rainbow Six (F)
 Internal Name=RAINBOW SIX
 Status=Compatible
+RDRAM Size=8
 
 [8D412933-588F64DB-C:44]
 Good Name=Tom Clancy's Rainbow Six (G)
 Internal Name=RAINBOW SIX
 Status=Compatible
 32bit=No
+RDRAM Size=8
 
 [392A0C42-B790E77D-C:45]
 Good Name=Tom Clancy's Rainbow Six (U)
 Internal Name=RAINBOW SIX
 Status=Compatible
 32bit=No
+RDRAM Size=8
 
 [21260D94-06AE1DFE-C:45]
 Good Name=Tommy Thunder (U) (Unreleased Alpha)
@@ -6074,6 +6428,7 @@ Self Texture=1
 Good Name=Tony Hawk's Pro Skater (E)
 Internal Name=TONY HAWK SKATEBOARD
 Status=Compatible
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 RDRAM Size=8
@@ -6082,18 +6437,21 @@ RDRAM Size=8
 Good Name=Tony Hawk's Pro Skater (U) (V1.0)
 Internal Name=TONY HAWK PRO SKATER
 Status=Compatible
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [E0144180-650B78C9-C:45]
 Good Name=Tony Hawk's Pro Skater (U) (V1.1)
 Internal Name=TONY HAWK PRO SKATER
 Status=Compatible
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [84EAB557-C88A190F-C:50]
 Good Name=Tony Hawk's Pro Skater 2 (E)
 Internal Name=THPS2
 Status=Compatible
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 RDRAM Size=8
@@ -6102,6 +6460,7 @@ RDRAM Size=8
 Good Name=Tony Hawk's Pro Skater 2 (U)
 Internal Name=THPS2
 Status=Compatible
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 RDRAM Size=8
@@ -6110,6 +6469,7 @@ RDRAM Size=8
 Good Name=Tony Hawk's Pro Skater 3 (U)
 Internal Name=THPS3
 Status=Compatible
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 RDRAM Size=8
@@ -6235,6 +6595,13 @@ Status=Compatible
 Core Note=timing (see GameFAQ)
 Plugin Note=[video] errors:resolution; use 1.6 plugin
 
+[90AF8D2C-E1AC1B37-C:0]
+Counter Factor=1
+Good Name=Tower & Shaft (J) [ALECK64]
+Status=Unsupported
+RDRAM Size=8
+Save Type=4kbit Eeprom
+
 [CCEB3858-26952D97-C:50]
 Good Name=Toy Story 2 (E)
 Internal Name=Toy Story 2
@@ -6296,6 +6663,7 @@ Good Name=Tsumi to Batsu - Hoshi no Keishousha (J)
 Internal Name=TSUMI TO BATSU
 Status=Compatible
 Plugin Note=[video] errors:static in cutscenes
+AudioResetOnLoad=Yes
 Clear Frame=2
 Culling=1
 Emulate Clear=1
@@ -6308,14 +6676,16 @@ Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=800
+AudioResetOnLoad=Yes
 
 [2F700DCD-176CC5C9-C:50]
-Good Name=Turok - Dinosaur Hunter (E) (V1.1)/(V1.2)
+Good Name=Turok - Dinosaur Hunter (E) (V1.1) (V1.2)
 Internal Name=TUROK_DINOSAUR_HUNTE
 Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=800
+AudioResetOnLoad=Yes
 
 [665FD963-B5CC6612-C:44]
 Good Name=Turok - Dinosaur Hunter (G) (V1.0)
@@ -6324,14 +6694,16 @@ Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=800
+AudioResetOnLoad=Yes
 
 [665FC793-6934A73B-C:44]
-Good Name=Turok - Dinosaur Hunter (G) (V1.1)/(V1.2)
+Good Name=Turok - Dinosaur Hunter (G) (V1.1) (V1.2)
 Internal Name=TUROK_DINOSAUR_HUNTE
 Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=800
+AudioResetOnLoad=Yes
 
 [2F70F10D-5C4187FF-C:45]
 Good Name=Turok - Dinosaur Hunter (U) (V1.0)
@@ -6340,20 +6712,23 @@ Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=800
+AudioResetOnLoad=Yes
 
 [2F700DCD-176CC5C9-C:45]
-Good Name=Turok - Dinosaur Hunter (U) (V1.1)/(V1.2)
+Good Name=Turok - Dinosaur Hunter (U) (V1.1) (V1.2)
 Internal Name=TUROK_DINOSAUR_HUNTE
 Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 AiCountPerBytes=800
+AudioResetOnLoad=Yes
 
 [66E4FA0F-DE88C7D0-C:44]
 Good Name=Turok - Legenden des Verlorenen Landes (G)
 Internal Name=Turok: Rage Wars
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [1EA26214-E790900F-C:50]
@@ -6361,6 +6736,7 @@ Good Name=Turok - Rage Wars (E)
 Internal Name=Turok: Rage Wars
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [B6BE20A5-FACAF66D-C:58]
@@ -6368,6 +6744,7 @@ Good Name=Turok - Rage Wars (FI)
 Internal Name=Turok: Rage Wars
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [ADB9498B-DAF28F55-C:45]
@@ -6382,6 +6759,7 @@ Good Name=Turok - Rage Wars (U) (V1.1)
 Internal Name=Turok: Rage Wars
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [E8C95AFC-35D121DA-C:50]
@@ -6389,6 +6767,7 @@ Good Name=Turok 2 - Seeds of Evil (E) (Kiosk Demo)
 Internal Name=Turok 2: Kiosk
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [E0B92B94-80E87CBD-C:50]
@@ -6396,6 +6775,7 @@ Good Name=Turok 2 - Seeds of Evil (E) (M4)
 Internal Name=Turok 2: Seeds of Ev
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [2E0E7749-B8B49D59-C:58]
@@ -6403,6 +6783,7 @@ Good Name=Turok 2 - Seeds of Evil (FIS) (M3)
 Internal Name=Turok 2: Seeds of Ev
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [FE05840B-9393320C-C:44]
@@ -6410,6 +6791,7 @@ Good Name=Turok 2 - Seeds of Evil (G)
 Internal Name=Turok 2: Seeds of Ev
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [E8C95AFC-35D121DA-C:45]
@@ -6417,6 +6799,7 @@ Good Name=Turok 2 - Seeds of Evil (U) (Kiosk Demo)
 Internal Name=Turok 2: Kiosk
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [49088A11-6494957E-C:45]
@@ -6424,6 +6807,7 @@ Good Name=Turok 2 - Seeds of Evil (U) (V1.0)
 Internal Name=Turok 2: Seeds of Ev
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [E0B92B94-B9A7E025-C:45]
@@ -6431,6 +6815,7 @@ Good Name=Turok 2 - Seeds of Evil (U) (V1.1)
 Internal Name=Turok 2: Seeds of Ev
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [6A162FF2-2093704C-C:50]
@@ -6438,6 +6823,7 @@ Good Name=Turok 3 - Shadow of Oblivion (E)
 Internal Name=Turok 3: Shadow of O
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [89A579F1-667E97EF-C:45]
@@ -6445,12 +6831,14 @@ Good Name=Turok 3 - Shadow of Oblivion (U)
 Internal Name=Turok 3: Shadow of O
 Status=Compatible
 Core Note=(see GameFAQ)
+AudioResetOnLoad=Yes
 RDRAM Size=8
 
 [D25C1211-13EEBF67-C:44]
 Good Name=Turok 3 - Shadow of Oblivion (U) (Beta)
 Internal Name=turok
 Status=Compatible
+AudioResetOnLoad=Yes
 Cheat0=80000303 0001
 CheatPlugin0=Jabo's Direct3D8,Glide64 For PJ64
 
@@ -6459,7 +6847,7 @@ Good Name=Twisted Edge Extreme Snowboarding (E)
 Internal Name=TWISTED EDGE
 Status=Issues (core)
 Core Note=no sound
-Plugin Note=[video] errors:menu snowflakes;
+Plugin Note=[video] errors:menu snowflakes; use Glide64
 RDRAM Size=8
 
 [BBC99D32-117DAA80-C:45]
@@ -6467,7 +6855,7 @@ Good Name=Twisted Edge Extreme Snowboarding (U)
 Internal Name=TWISTED EDGE
 Status=Issues (core)
 Core Note=no sound
-Plugin Note=[video] errors:menu snowflakes;
+Plugin Note=[video] errors:menu snowflakes; use Glide64
 Culling=1
 RDRAM Size=8
 
@@ -6596,6 +6984,14 @@ Status=Issues (core)
 Plugin Note=[video] flicker
 Clear Frame=1
 
+[2F57C9F7-F1E29CA6-C:4A]
+Good Name=Vivid Dolls (J) [ALECK64]
+Status=Compatible
+Core Note=LLE may be required on some GFX plugins
+Counter Factor=1
+RDRAM Size=8
+Save Type=4kbit Eeprom
+
 //================  W  ================
 [93053075-261E0F43-C:50]
 Good Name=Waialae Country Club - True Golf Classics (E) (M4) (V1.0)
@@ -6977,6 +7373,7 @@ Good Name=Xena Warrior Princess - Talisman of Fate (E)
 Internal Name=XENAWARRIORPRINCESS
 Status=Compatible
 Culling=1
+RDRAM Size=8
 
 [0553AE9D-EAD8E0C1-C:45]
 Good Name=Xena Warrior Princess - Talisman of Fate (U)
@@ -7002,6 +7399,7 @@ Internal Name=YOSHI STORY
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 Save Type=16kbit Eeprom
+RDRAM Size=8
 
 [D3F97D49-6924135B-C:50]
 Good Name=Yoshi's Story (E) (M3)
@@ -7009,6 +7407,7 @@ Internal Name=YOSHI STORY
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 Save Type=16kbit Eeprom
+RDRAM Size=8
 
 [2337D8E8-6B8E7CEC-C:45]
 Good Name=Yoshi's Story (U) (M2)
@@ -7016,6 +7415,7 @@ Internal Name=YOSHI STORY
 Status=Compatible
 Plugin Note=[video] (see GameFAQ)
 Save Type=16kbit Eeprom
+RDRAM Size=8
 
 [9FE6162D-E97E4037-C:4A]
 Good Name=Yuke Yuke!! Trouble Makers (J)
@@ -7069,6 +7469,7 @@ Emulate Clear=1
 SMM-PI DMA=0
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [D43DA81F-021E1E19-C:4A]
 Good Name=Zelda no Densetsu - Toki no Ocarina (J) (V1.1)
@@ -7083,6 +7484,7 @@ Emulate Clear=1
 SMM-PI DMA=0
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [693BA2AE-B7F14E9F-C:4A]
 Good Name=Zelda no Densetsu - Toki no Ocarina (J) (V1.2)
@@ -7097,6 +7499,7 @@ Emulate Clear=1
 SMM-PI DMA=0
 SMM-TLB=0
 Self Texture=1
+RDRAM Size=8
 
 [F7F52DB8-2195E636-C:4A]
 Good Name=Zelda no Densetsu - Toki no Ocarina - Zelda Collection Version (J) (GC)
@@ -8280,3 +8683,44 @@ Core Note=slow
 Good Name=Yoshi's Story BootEmu (PD)
 Internal Name=YOSHI BOOT EMU
 Status=Unsupported
+
+[5A4C57FE-AA6807C4-C:41]
+Good Name=NUS-64 Aging Cassette
+Internal Name=AGING ROM
+Status=Needs RSP plugin
+
+[BB0598C7-AE917C5D-C:0]
+Good Name=64GB Checker V1.05
+Internal Name=64GB Checker V1.05
+Status=Compatible
+
+[816BE37F-9BCE6CAA-C:0]
+Good Name=Dolphin Controller Test
+Internal Name=Dolphin Controller Test
+Status=Compatible
+
+[6F46DA42-D971A312-C:45]
+Good Name=Ronaldinho's Soccer 64
+Internal Name=RONALDINHO SOCCER
+Status=Compatible
+Plugin Note=[video] errors:shadows; use Glide64
+AiCountPerBytes=200
+Counter Factor=1
+Culling=1
+
+[A01B8D3B-E0FAC46F-C:0]
+Good Name=Photo Viewer
+Internal Name=Photo Viewer
+Status=Compatible
+
+[2F33EFCA-6CA95A9C-C:0]
+Good Name=funnelcube (PD)
+Internal Name=funnelcube
+Status=Compatible
+
+[D55891EB-2BEFD9C8-C:0]
+Good Name=MGC 2011 Demo (PD)
+Internal Name=shut up and code
+CPU Type=Interpreter
+RDRAM Size=8
+Status=Unsupported
diff --git a/Config/RDB Info.txt b/Config/RDB Info.txt
index a4015d037..17673ad1d 100644
--- a/Config/RDB Info.txt	
+++ b/Config/RDB Info.txt	
@@ -16,7 +16,7 @@ An emulated RDRAM size of 8MB represents an N64 console with the 4MB memory expa
 Notes:
 - if a game supports the Expansion Pak as an option it will usually tell you in its introduction screens (usually two lines, like "Expansion Pak supported, Expansion Pak detected"). If a game doesn't support the Pak, or absolutely requires it, it probably won't say anything.
 - you gain nothing by using the Expansion Pak on a game that doesn't support it - you just waste resources.
-- further, if a game has optional Expansion Pak support where the Pak is used only to raise screen resolution, it is generally recommended you set this to No, because there's no point wasting resources on higher native resolutions when the graphics are high level emulated (hence largely resolution independant) anyway, also it can often cause severe aspect ratio problems in the video plugin.
+- further, if a game has optional Expansion Pak support where the Pak is used only to raise screen resolution, it is generally recommended you set this to No, because there's no point wasting resources on higher native resolutions when the graphics are high level emulated (hence largely resolution independent) anyway, also it can often cause severe aspect ratio problems in the video plugin.
 - in rare cases, for reasons unkown to me, the Project64 video plugin requires the Expansion Pak to avoid an Access Violation (even in games that don't use the Expansion Pak). The RDB is already set up for this for all known cases.
 - the above two points explain why the setting may sometimes appear to be logically incorrect - it has been set that way for a good reason!
 - this setting should already be correctly configured for every game by the RDB, don't change it unless you know what you're doing!
@@ -29,7 +29,7 @@ Save Type
 - Sram
 - FlashRam
 
-You can set any of the four possible native cartridge save types here, but the only one that should be needed is 16kbit EEPROM, because it is not possible for the emulator to detect the difference between a game asking for 16kbit and a game asking for 4kbit - Project64 assumes 4kbit, the more common size. If a game actually needs 16kbit it will either fail to save or not boot unless set to 16kbit EEPROM. The other settings are included for the rare possibility that the autodetect goes wrong - generally, don't set them. Note that MemPak is treated seperately and will work in addition to whatever is selected here.
+You can set any of the four possible native cartridge save types here, but the only one that should be needed is 16kbit EEPROM, because it is not possible for the emulator to detect the difference between a game asking for 16kbit and a game asking for 4kbit - Project64 assumes 4kbit, the more common size. If a game actually needs 16kbit it will either fail to save or not boot unless set to 16kbit EEPROM. The other settings are included for the rare possibility that the autodetect goes wrong - generally, don't set them. Note that MemPak is treated separately and will work in addition to whatever is selected here.
 
 Counter Factor
 --------------
@@ -91,7 +91,14 @@ Audio Signal
 - true
 - false (default)
 
-This option has allowed for some once unsupported Musyx games like: Hydro Thunder, NBA Showtime, Disney�s Tarzan to be playable with either loading with sound available or now accessing speech although not perfect in games such as The World is Not Enough and Resident Evil 2.
+This option has allowed for some once unsupported Musyx games like: Hydro Thunder, NBA Showtime, Disney's Tarzan to be playable with either loading with sound available or now accessing speech although not perfect in games such as The World is Not Enough and Resident Evil 2.
+
+AudioResetOnLoad
+----------------
+- true
+- false (default)
+
+This fixes the losing audio after loading a save state issue with certain plugins in certain games.
 
 **** Recompiler ****
 
@@ -103,7 +110,7 @@ CPU Type
 
 R4300i core
 
-The Recompiler and Interpreter are two seperate cores in the emulator (although the Recompiler implementation is based on the Interpreter). Generally, any game that works on the Recompiler will also work on the Interpreter, but not always vice-versa. Explaining the difference between a Recompiler and an Interpreter in a general sense is beyond the scope of this document, suffficient to say that the Recompiler is (usually much) faster but (a little) less compatible, the Interpreter (usually much) slower but (a little) more compatible. If you have a fast enough PC that peformance is not an issue for you, you can probably use the Interpreter all the time, but i wouldn't recommend it since it generally shouldn't offer much advantage.
+The Recompiler and Interpreter are two separate cores in the emulator (although the Recompiler implementation is based on the Interpreter). Generally, any game that works on the Recompiler will also work on the Interpreter, but not always vice-versa. Explaining the difference between a Recompiler and an Interpreter in a general sense is beyond the scope of this document, sufficient to say that the Recompiler is (usually much) faster but (a little) less compatible, the Interpreter (usually much) slower but (a little) more compatible. If you have a fast enough PC that performance is not an issue for you, you can probably use the Interpreter all the time, but i wouldn't recommend it since it generally shouldn't offer much advantage.
 
 Note that if you are using the Interpreter, the following settings are ignored (they are only relevant to the recompiler):
 
@@ -130,28 +137,28 @@ Reg Cache
 - true (default)
 - false
 
-Probably the recompiler's most significant optimisation technique, register caching usually dramatically improves the efficiency of the recompiler, and usually without side effects. The reason this is included as an option is that sometimes register caching will produce an error in a game. Register caching can cause many kinds of obscure errors, such as events in a game not triggering, or a game becoming stuck in a loop, or graphics being messed up, aswell as obvious errors such as a crash. If you find you are having stability problems with the recompiler and not the interpreter, try disabling register caching to see if you can get past the point/game with at least some of the performance of the recompiler.
+Probably the recompiler's most significant optimisation technique, register caching usually dramatically improves the efficiency of the recompiler, and usually without side effects. The reason this is included as an option is that sometimes register caching will produce an error in a game. Register caching can cause many kinds of obscure errors, such as events in a game not triggering, or a game becoming stuck in a loop, or graphics being messed up, as well as obvious errors such as a crash. If you find you are having stability problems with the recompiler and not the interpreter, try disabling register caching to see if you can get past the point/game with at least some of the performance of the recompiler.
 
 Linking
 -------
 - true (default)
 - false
 
-Advanced Block Linking is one of Project64's speed optimisation techniques, it usually provides a speed vs. smoothness tradeoff that you'd want to set globally (for all games) under the Geneal tab, according to whether you have a fast or slow PC. On is usually (often significantly) faster than Off but may be less smooth. This depends on the game. A few games run particularly badly with this On, or may require this to be On or Off, which is why the RDB sometimes does set this control.
+Advanced Block Linking is one of Project64's speed optimisation techniques, it usually provides a speed vs. smoothness trade-off that you'd want to set globally (for all games) under the General tab, according to whether you have a fast or slow PC. On is usually (often significantly) faster than Off but may be less smooth. This depends on the game. A few games run particularly badly with this On, or may require this to be On or Off, which is why the RDB sometimes does set this control.
 this control is a performance option for the recompiler, where setting On gives more speed (higher maximum and overall average speed) and setting Off gives better "smoothness" (higher consistency of speed, less variation from one part of a game to another, fewer jerks and slowdowns, but a lower overall speed).
 The effect of having ABL on vs. off is probably most noticeable in fast moving racing games such as Didddy Kong Racing and Mario Kart.
 
 Notes:
 - Project64 game compatibility was only thoroughly tested with ABL enabled, due to time constraints. If you turn ABL off, there is a possibility that some ROMs may need their settings adjusted - occasionally a higher self-mod code method is needed. There is also a chance that some games will not work at all with ABL turned off, so be prepared to turn it back on
 - Some background info: ABL is not new to Project64 1.4+. The emulator was always using ABL, what is new in 1.4+ is the ability for you to turn it off! During the early stages of Project64 development performance was a major concern, but we expect Project64 to perform better on future PCs without ABL.
-This is NOT normally set by the RDB, therecore this control IS normally used! (unlike all the other controls on Advanced tab).
+This is NOT normally set by the RDB, therefore this control IS normally used! (unlike all the other controls on Advanced tab).
 
 Fast SP
 -------
 - true (default)
 - false
 
-This option was added in v1.5 simply as a performance feature - enabling it gives typically 5% more speed from the core, however a large numbe of games will not be stable with it enabled, therefore it's not set often. Try it if you are desperate for speed, but for most people most of the time it's recommended you leave it off.
+This option was added in v1.5 simply as a performance feature - enabling it gives typically 5% more speed from the core, however a large number of games will not be stable with it enabled, therefore it's not set often. Try it if you are desperate for speed, but for most people most of the time it's recommended you leave it off.
 
 **** Self Mod Methods ****
 
@@ -264,14 +271,14 @@ Resolution Height
 
 This refers to the native horizontal resolution of the game. This is normally autodetected correctly by the plugin, however in some cases this can go wrong, hence this control is available to allow you to force any resolution. Values must be integers (whole numbers). A sensible place to start is 320, the horizontal resolution of most N64 games.
 
-Note that this control cannot be used effectively when a game has dynamic or mixed resolition!
+Note that this control cannot be used effectively when a game has dynamic or mixed resolution!
 
 Resolution Width
 ----------------
 
 Exactly as per "Emulated Width", except for vertical resolution, tends to be used more often to correct PAL resolution problems, and has a typical value of 240.
 
-Note that this control cannot be used effectively when a game has dynamic or mixed resolition!
+Note that this control cannot be used effectively when a game has dynamic or mixed resolution!
 
 Clear Frame
 -----------
@@ -284,7 +291,7 @@ Clear Frame
 
 The default setting ("default") means none and was always used in previous versions of the plugin.
 "Only per frame" is a possible solution for games suffering from the "black layer" problem, where the whole screen is hidden behind a black layer. This was added in v1.5 for Chameleon Twist 2 and is also used for several other games.
-"Always" is a possible solution for games suffering from screen clearing problms within a particular part of the screen. It was added in v1.5 for the sky in Perfect Dark, and is also used for several other games.
+"Always" is a possible solution for games suffering from screen clearing problems within a particular part of the screen. It was added in v1.5 for the sky in Perfect Dark, and is also used for several other games.
 Non-default settings can cause problems with some games and should only be enabled if needed.
 
 Self Texture
@@ -321,7 +328,7 @@ Culling
 - 1
 
 Note: culling has been improved in v1.5 to the point where we do not know of a single game that does not benefit from it, however this control is kept in case there is something discovered.
-If unchecked, if the plugin determines that something doesn't need to be rendered it will skip the entire rendering sequence of that display list, which could take a great deal of CPU time to work through, hence you may see performance increases, but you might also see things disapear. The effectiveness of this depends on the game and the "intelligence" of the plugin.
+If unchecked, if the plugin determines that something doesn't need to be rendered it will skip the entire rendering sequence of that display list, which could take a great deal of CPU time to work through, hence you may see performance increases, but you might also see things disappear. The effectiveness of this depends on the game and the "intelligence" of the plugin.
 If checked, the plugin will draw everything in the scene regardless of whether or not it will be shown, which guarantees that nothing is culled that shouldn't be, but will take some extra CPU time, usually not a great deal more, and not an issue on fast systems, so you can turn it off.
 
 #################################
diff --git a/Lang/Brazilian Portuguese.pj.Lang b/Lang/Brazilian Portuguese.pj.Lang
index 46ecbfb73..c92e66dd9 100644
--- a/Lang/Brazilian Portuguese.pj.Lang	
+++ b/Lang/Brazilian Portuguese.pj.Lang	
@@ -3,9 +3,9 @@
 *********************************************************************************/
 //About DLL
 #1  #  "Português Brasileiro"	// LANGUAGE ID
-#2  #  "Lithium64"				// Author
+#2  #  "Project64 team"			// Author
 #3  #  "2.2"					// Version
-#4  #  "Março, 2015"			// Date
+#4  #  "Abril, 2015"			// Date
 
 //About DLL Dialog
 #5  #  "Idioma Atual"
@@ -18,7 +18,7 @@
 #12 #  "Informação Extendida da ROM (.RDX)"
 
 //About INI title
-#20 #  "Sobre os Arquivos INI"
+#20 #  "Sobre os Arquivos de Configuração"
 
 /*********************************************************************************
 * Menu                                                                           *
@@ -60,7 +60,7 @@
 #144#  "Configurar o Plugin de Áudio..."
 #145#  "Configurar o Plugin do Controle..."
 #146#  "Configurar o Plugin RSP..."
-#147#  "Mostrar o Uso da CPU %"
+#147#  "Mostrar o uso da CPU"
 #148#  "&Configurações..."
 
 //Debugger Menu
@@ -71,7 +71,7 @@
 
 //Help Menu
 #180#  "&Ajuda"
-#181#  "Sobre os arquivos de Conf&iguração"
+#181#  "Sobre os Arqui&vos de Configuração"
 #182#  "&Sobre o Project 64"
 #183# "Fórum de &Suporte"
 #184# "&Homepage"
@@ -140,7 +140,7 @@
 #278#  "Sobre o aplicativo e os autores"
 #277#  "Sobre os autores dos arquivos de suporte"
 #279#  "Abrir esta imagem da ROM aberta anteriormente"
-#280#  "Escolher este diretório como seu diretório das roms"
+#280#  "Escolher este diretório como seu diretório das ROMs"
 #281#  "Mudar o Aplicativo para usar este idioma"
 #282#  "Escolher este local para salvamento rápido"
 #283#  "Jogar o jogo selecionado"
@@ -177,7 +177,7 @@
 #320#  "Selecionar o diretório atual das ROMs"
 
 //Messages
-#340#  "ROM ruim? Use o GoodN64 & procure por um INI atualizado"
+#340#  "ROM ruim? Use o GoodN64 & procure por um RDB atualizado"
 
 /*********************************************************************************
 * Options                                                                        *
@@ -194,49 +194,49 @@
 #406#  "Configurações Gerais"
 #407#  "Integração com o Shell"
 #408#  "Notas"
-#409#  "Atalhos de Teclado"
-#410#  "Estado"
+#409#  "Atalhos do Teclado"
+#410#  "Status"
 #411#  "Recompilador"
 
 //Plugin Dialog
 #420#  "Sobre"
-#421#  " Plugin de RSP (Reality Signal Processor): "
+#421#  " Plugin RSP (Reality Signal Processor): "
 #422#  " Plugin de Vídeo (gráficos): "
 #423#  " Plugin de Áudio (som) : "
 #424#  " Plugin de Entrada (controle): "
-#425#  "Usar Gráficos HLE?"
-#426#  "Usar Aúdio HLE?"
-#427#  "** Usar Plugin do Sistema **"
+#425#  "Gráficos HLE"
+#426#  "Áudio HLE"
+#427#  "** Usar Plugins do Sistema **"
 
 //Directory Dialog
-#440#  " Diretório dos Plugins:: "
+#440#  " Diretório dos Plugins: "
 #441#  " Diretório das ROMs: "
-#442#  " Auto saves do N64: "
-#443#  " Salvamentos instantâneos: "
-#444#  " Screen Shots: "
+#442#  " Diretório dos saves nativos do N64: "
+#443#  " Diretório dos save states: "
+#444#  " Diretório das screenshots: "
 #445#  "Última pasta de onde uma ROM foi aberta."
-#446#  "Selecionar o diretório de plugins"
-#447#  "Selecionar o diretório de roms"
-#448#  "Selecionar o diretório de salvamento automático"
-#449#  "Selecionar o diretório de salvamento instantâneo"
-#450#  "Selecionar o diretório de capturas de tela"
-#451#  " Diretório de Texturas: "
-#452#  "Selecionar o diretório de texturas"
+#446#  "Selecionar o diretório dos plugins"
+#447#  "Selecionar o diretório das ROMs"
+#448#  "Selecionar o diretório dos saves nativos do N64"
+#449#  "Selecionar o diretório dos save states"
+#450#  "Selecionar o diretório das screenshots"
+#451#  " Diretório do pacote de texturas: "
+#452#  "Selecionar o diretório do pacote de texturas"
 
 //Options (general) Tab
 #460#  "Pausar a emulação quando a janela não está ativa"
-#461#  "Ao carregar uma ROM ir para a tela cheia"
-#462#  "Esconder as Configurações Avançadas"
+#461#  "Entrar em modo de tela cheia quando carregar uma ROM"
+#462#  "Esconder as configurações avançadas"
 #463#  "Lembrar as trapaças selecionadas"
-#464#  "Desativar proteção de tela quando rodar a ROM"
-#465#  "Mostrar Frame Rate"
-#466#  "Mudar forma de visualização do Frame Rate:"
+#464#  "Desativar a proteção de tela quando executar uma ROM"
+#465#  "Exibir a velocidade"
+#466#  "Forma de exibição da velocidade:"
 #467#  "Verificar se o Project64 já está em execução"
 
 //ROM Browser Tab
-#480#  "Máx # de ROMs Lembradas (Máx 10):"
+#480#  "Máx # de ROMs Lembradas (0-10):"
 #481#  "ROMs"
-#482#  "Máx # de Dirs. de ROMs Lembrados (Máx 10):"
+#482#  "Máx # de Dirs. de ROMs Lembrados (0-10):"
 #483#  "Diretórios"
 #484#  "Usar Explorador de ROMs"
 #485#  "Usar repetição de diretório"
@@ -252,59 +252,59 @@
 #500#  "A maioria destas mudanças não acontecerão até que uma nova ROM seja aberta ou que a ROM atual seja resetada."
 #501#  "Padrões do Core"
 #502#  "Estilo do core da CPU:"
-#503#  "Método do código Self-mod:"
-#504#  "Tamanho Padrão da Memória:"
-#505#  "Ligamento de Blocos Avançado:"
-#506#  "Iniciar a Emulação quando a ROM está aberta?"
-#507#  "Sempre sobrescrever as configurações padrão com as da RDB?"
-#508#  "Comprimir automaticamente os salvamentos instantâneos"
-#509#  "Habilitar Debugger"
+#503#  "Método do código self-mod"
+#504#  "Tamanho padrão da memória:"
+#505#  "Ligamento de blocos avançado"
+#506#  "Iniciar a emulação quando a ROM está aberta"
+#507#  "Sempre sobrescrever as configurações padrão com aquelas do RDB"
+#508#  "Automaticamente comprimir os save states"
+#509#  "Ativar debugger"
 #510#  "Cache"
 #511#  "PI DMA"
 #512#  "Inicio Modificado"
-#513#  "Proteger a Memória"
+#513#  "Proteger memória"
 #514#  "TLB Não Mapeado"
 
 //ROM Options
 #520#  "Estilo do core da CPU:"
 #521#  "Frequência de atualização da VI:"
-#522#  "Tamanho da Memória:"
-#523#  "Ligamento de Blocos Avançado:"
-#524#  "Tipo de Salvamento Padrão:"
-#525#  "Contra Fator:"
-#526#  "Buffer de Compilação Maior"
+#522#  "Tamanho da memória:"
+#523#  "Ligamento de blocos avançado:"
+#524#  "Tipo de salvamento padrão:"
+#525#  "Contra fator:"
+#526#  "Buffer de compilação maior"
 #527#  "Usar o TLB"
 #528#  "Caching do registro"
-#529#  "Atrasar o SI Interrupt"
+#529#  "Atrasar o SI interrupt"
 #530#  "SP Rápido"
 #531#  "Padrão"
-#532#  "Sinal de Áudio do RSP"
-#533#  "Timing de Áudio Fixo"
-#534#  "Método de Função de Pesquisa:"
-#535#  "Método de Self Mod Personalizado"
-#536#  "Sincronizar através do Áudio"
-#537#  "Contagem de IA Por Byte"
-#538#  "Motor 32 Bit"
-#539#  "Atrasar Interrupção DP"
+#532#  "Sinal de áudio do RSP"
+#533#  "Timing do áudio fixo"
+#534#  "Método de procura de função:"
+#535#  "Método de self-mod personalizado"
+#536#  "Sincronizar usando o áudio"
+#537#  "Contagem de IA por byte"
+#538#  "Engine de 32 bits"
+#539#  "Atrasar a interrupção do DP"
 
 //Core Styles
 #540#  "Interpretador"
 #541#  "Recompilador"
-#542#  "Sincronizar os Cores"
+#542#  "Sincronizar cores"
 
 //Self Mod Methods
 #560#  "Nenhum"
 #561#  "Cache"
-#562#  "Proteger a Memória"
-#563#  "Verificar a Memória & Cache"
-#564#  "Mudar a Memória & Cache"
-#565#  "Verificar o Avanço da Memória"
-#566#  "Limpar Cógido no Cache"
+#562#  "Proteger memória"
+#563#  "Verificar a memória & cache"
+#564#  "Mudar a memória & cache"
+#565#  "Verificar o avanço da memória"
+#566#  "Limpar o código no cache"
 
-//Function Lookup memthod
-#570#  "Tabela de Pesquisa Física"
-#571#  "Tabela de Pesquisa Virtual"
-#572#  "Alterar a Memória"
+//Function Lookup method
+#570#  "Tabela de procura física"
+#571#  "Tabela de procura virtual"
+#572#  "Mudar memória"
 
 //RDRAM Size
 #580#  "4 MB"
@@ -330,18 +330,19 @@
 #662#  "Nota do Plugin:"
 
 // Accelerator Selector
-#680#  "Estado do CPU:"
-#681#  "Item do Menu:"
-#682#  "Atalhos Atuais:"
-#683#  "Selecionar Novo Atalho:"
-#684#  "Atualmente Atribuído Ao:"
-#685#  "Atribuir"
+#680#  "Estado da CPU:"
+#681#  "Item do menu:"
+#682#  "Teclas atuais:"
+#683#  "Selecionar nova tecla de atalho:"
+#684#  "Atualmente designado para:"
+#685#  "Designar"
 #686#  "Remover"
-#687#  "Restaurar Todos"
-#688#  "Jogo Parado"
-#689#  "Jogo em Curso"
-#690#  "Jogo em Curso (janela)"
-#691#  "Jogo em Curso (tela cheia)"
+#687#  "Reseta Tudo"
+#688#  "O jogo não está em execução"
+#689#  "Jogo em execução"
+#690#  "Jogo em execução (modo janela)"
+#691#  "Jogo em execução (tela cheia)"
+#692#  "Detectar"
 
 // Frame Rate Option
 #700#  "Vertical Interupts por segundo"
@@ -349,13 +350,14 @@
 #702#  "Percentual de Velocidade"
 
 // Increase speed
-#710#  "Aumentar Velocidade do Jogo"
-#711#  "Diminuir Velocidade do Jogo"
+#710#  "Aumentar a Velocidade do Jogo"
+#711#  "Diminuir a Velocidade do Jogo"
 
-//Bottom Page Buttons
+//Bottom page buttons
 #720#  "Resetar Página"
 #721#  "Resetar Tudo"
 #722#  "Aplicar"
+#723#  "Fechar"
 
 /*********************************************************************************
 * ROM Information                                                                *
@@ -365,10 +367,10 @@
 
 //ROM Info Text
 #801#  "Nome da ROM:"
-#802#  "Nome do Arquivo:"
+#802#  "Nome do arquivo:"
 #803#  "Local:"
 #804#  "Tamanho da ROM:"
-#805#  "ID do Cartucho:"
+#805#  "ID do cartucho:"
 #806#  "Fabricante:"
 #807#  "País:"
 #808#  "CRC1:"
@@ -417,19 +419,19 @@
 //Edit Cheat
 #1027#  "Editar a Trapaça"
 #1028#  "Atualizar a Trapaça"
-#1029#  "A trapaça foi mudada você quer atualizar?"
-#1030#  "Trapaça Atualizada"
+#1029#  "A trapaça foi mudada.\n\nVocê quer atualizar?"
+#1030#  "Trapaça atualizada"
 
 //Cheat Popup Menu
 #1040#  "Adicionar Nova Trapaça..."
 #1041#  "Editar"
 #1042#  "Apagar"
 
-// short cut editor
-#1100#  "Restaurar Atalhos"
-#1101#  "Você tem certeza que deseja rastaurar os atalhos?\n\nEsta ação não pode ser desfeita."
-#1102#  "Menu de Arquivos"
-#1103#  "Menu de Sistema"
+// short-cut editor
+#1100#  "Resetar Atalhos"
+#1101#  "Você tem certeza que deseja resetar os atalhos?\n\nEsta ação não pode ser desfeita."
+#1102#  "Menu dos Arquivos"
+#1103#  "Menu do Sistema"
 #1104#  "Opções"
 #1105#  "Slots de Salvamento"
 
@@ -440,57 +442,57 @@
 #2001#  "CPU Resumida"
 #2002#  "Em um loop permanente do qual não se pode sair. \nA emulação vai parar agora. \n\nVerifique a ROM e as configurações da ROM."
 #2003#  "Falha ao alocar a Memória"
-#2004#  "O plugin de vídeo padrão ou selecionado está faltando ou é inválido. \n\nVocê precisa ir em Configurações e selecionar um plugin de vídeo (gráficos).\nVerifique se você tem pelo menos um arquivo de plugin compatível na sua pasta de plugins."
-#2005#  "O plugin de áudio padrão ou selecionado está faltando ou é inválido. \n\nVocê precisa ir em Configurações e selecionar um plugin de áudio (som).\nVerifique se você tem pelo menos um arquivo de plugin compatível na sua pasta de plugins."
-#2006#  "O plugin de RSP padrão ou selecionado está faltando ou é inválido. \n\nVocê precisa ir em Configurações e selecionar um plugin de RSP (Reality Signal Processor).\nVerifique se você tem pelo menos um arquivo de plugin compatível na sua pasta de plugins."
-#2007#  "O plugin de entrada padrão ou selecionado está faltando ou é inválido. \n\nVocê precisa ir em Configurações e selecionar um plugin de vídeo (controle).\nVerifique se você tem pelo menos um arquivo de plugin compatível na sua pasta de plugins."
+#2004#  "O plugin de vídeo padrão ou selecionado está faltando ou é inválido. \n\nVocê precisa ir em Configurações e selecionar um plugin de vídeo (gráficos).\nVerifique se você tem ao menos um arquivo de plugin compatível na sua pasta de plugins."
+#2005#  "O plugin de áudio padrão ou selecionado está faltando ou é inválido. \n\nVocê precisa ir em Configurações e selecionar um plugin de áudio (som).\nVerifique se você tem ao menos um arquivo de plugin compatível na sua pasta de plugins."
+#2006#  "O plugin de RSP padrão ou selecionado está faltando ou é inválido. \n\nVocê precisa ir em Configurações e selecionar um plugin de RSP (Reality Signal Processor).\nVerifique se você tem ao menos um arquivo de plugin compatível na sua pasta de plugins."
+#2007#  "O plugin de entrada padrão ou selecionado está faltando ou é inválido. \n\nVocê precisa ir em Configurações e selecionar um plugin de entrada (controle).\nVerifique se você tem ao menos um arquivo de plugin compatível na sua pasta de plugins."
 #2008#  "Falha ao carregar o plugin:"
 #2009#  "Falha ao carregar a palavra\n\nVerifique a ROM e as configurações da ROM."
 #2010#  "Falha ao abrir o Arquivo do Salvamento"
 #2011#  "Falha ao abrir o EEPROM"
 #2012#  "Falha ao abrir a flash RAM"
 #2013#  "Falha ao abrir o mempak"
-#2014#  "Tentativa de abrir o arquivo zip falhou. \n\nProvavelmente um arquivo zip corrompido - tente descompactar a ROM manualmente."
+#2014#  "A tentativa de abrir o arquivo zip falhou. \n\nProvavelmente um arquivo zip corrompido - tente descompactar a ROM manualmente."
 #2015#  "A tentativa de abrir o arquivo falhou."
 #2016#  "Um erro ocorreu quando tentava abrir o arquivo zip."
-#2017#  "O arquivo carregado não aparenta ser uma ROM de Nintendo 64 válida. \n\nVerifique suas ROMs com o GoodN64."
+#2017#  "O arquivo carregado não aparenta ser uma ROM de N64 válida. \n\nVerifique suas ROMs com o GoodN64."
 #2018#  "País desconhecido"
 #2019#  "Chip Cic desconhecido"
 #2020#  "Formato do arquivo desconhecido"
-#2021#  "Ação de memória desconhecida/n/nEmulação parada"
+#2021#  "Ação de memória desconhecida\n\nEmulação parada"
 #2022#  "OpCode R4300i não manejado em"
-#2023#  "Executando a partir de espaço não-mapeado. \n\nVerifique a ROM e as configurações da ROM."
-#2024#  "O Save State não aparenta combinar com a ROM em execução. \n\nOs save states devem ser salvos & carregados entre ROMs 100% idênticas, \nem particular a REGIÃO e VERSÃO precisam ser as mesmas. \nCarregar este state provavelmente causaria um crash no jogo e/ou no emulador. \n\nVocê tem certeza que você quer continuar carregando?"
+#2023#  "Executando do espaço não-mapeado.\n\nVerifique a ROM e as configurações da ROM."
+#2024#  "Este save state não aparenta combinar com a ROM em execução. \n\nOs save states devem ser salvos & carregados entre ROMs 100% idênticas, \nEm particular a REGIÃO e VERSÃO precisam ser as mesmas. \nCarregar este state provavelmente causaria um crash no jogo e/ou no emulador. \n\nVocê tem certeza que você quer continuar carregando?"
 #2025#  "Erro"
-#2026#  "Sequência de Copyright não encontrada no LUT.  O jogo não mais funcionará."
+#2026#  "Sequência de Copyright não encontrada no LUT. O jogo não mais funcionará."
 #2027#  "Falha da Proteção Contra Cópia"
-#2028#  "Mudar um plugin requer que o Project64 resete uma ROM em execução. \nSe você não quer perder o seu local, responda Não e faça um save state primeiro. \n\nMudar os plugins e reiniciar o jogo agora?"
+#2028#  "Mudar um plugin requer que o Project64 resete uma ROM em execução. \nSe você não quer perder seu lugar, responda Não e faça um save state primeiro. \n\nMudar os plugins e resetar a ROM agora?"
 #2029#  "Mudar os Plugins"
-#2030#  "Emulação finalizada"
+#2030#  "Emulação encerrada"
 #2031#  "Emulação iniciada"
-#2032#  "Não é possível carregar o save state"
-#2033#  "Save state carregado"
-#2034#  "Salvar o state atual em"
-#2035#  "Slot do save state"
-#2036#  "Imagem de swapping dos bytes"
+#2032#  "Incapaz de carregar o state"
+#2033#  "State carregado"
+#2034#  "Salvou o state atual em"
+#2035#  "Slot do state"
+#2036#  "Imagem de byte-swapping"
 #2037#  "Escolhendo a imagem do N64"
 #2038#  "Carregado"
-#2039#  "Carregando a imagem"
+#2039#  "Carregando imagem"
 #2040#  "Não foi possível carregar a ROM porque os plugins não foram inicializados com sucesso"
 #2041#  "Você tem certeza que realmente deseja excluir isto?"
 #2042#  "Apagar a Trapaça"
-#2043#  "O nome da trapaça já está em uso"
-#2044#  "Voce alcançou a quantia máxima de trapaças para esta ROM"
-#2045#  "Plug-in Inicializando"
+#2043#  "O nome da trapaça já está em uso."
+#2044#  "Você alcançou a quantia máxima de trapaças para esta ROM"
+#2045#  "Plugin inicializando"
 #2046#  "Você não selecionou uma tecla virtual para atribuir ao item de menu"
 #2047#  "Você precisa selecionar um item de menu para atribuir esta tecla para"
-#2048#  "Este Atalho já foi atribuído a outro item de menu"
+#2048#  "O atalho foi designado a outro item do menu."
 #2049#  "Nenhum atalho foi selecionado para ser removido"
-#2050#  "ROM Carregada. Aguardando a emulação para começar."
-#2051#  "Project64 beta é para membros apenas.\n\nSe você tem uma conta no pj64.net, você pode não ver esse erro!!\nPor favor contate-nos no website"
+#2050#  "ROM carregada. Esperando a emulação iniciar."
+#2051#  "O beta do Project64 é só pra membros.\n\nSe você tem uma conta no pj64.net não deveria estar vendo este erro!!\nPor favor entre em contato conosco no site."
 #2052#  "Erro do Programa"
-#2053#  "Não foi possível encontrar um nome de arquivo no arquivo 7z"
+#2053#  "Não foi possível encontrar o nome do arquivo no arquivo 7z"
 #2054#  "Gráficos LLE"
 #2055#  "Gráficos LLE não são para uso geral!!!\nÉ aconselhável que você só utilize para testes, não para jogar qualquer jogo com ele\n\nMudar para Gráficos LLE?"
 #2056#  "Aúdio HLE"
-#2057#  "Áudio HLE requer plugin de terceiros!!!\nSe você não tem um plugin de terceiros com suporte a HLE você não vai ouvir nada.\n\nUtilizar Áudio HLE?"
+#2057#  "O Áudio HLE requer um plugin de terceiros!!!\nSe você não tem um plugin de áudio de terceiros que suporta HLE você não ouvirá o som.\n\nMudar pra áudio HLE?"
diff --git a/Lang/Catalan.pj.Lang b/Lang/Catalan.pj.Lang
new file mode 100644
index 000000000..4be6344af
--- /dev/null
+++ b/Lang/Catalan.pj.Lang
@@ -0,0 +1,498 @@
+/*********************************************************************************
+* Meta Information                                                               *
+*********************************************************************************/
+//About DLL
+#1  #  "Català"		// LANGUAGE ID
+#2  #  "Hiro5"			// Author
+#3  #  "2.2"			// Version
+#4  #  "11 d'octubre de 2015"		// Date
+
+//About DLL Dialog
+#5  #  "Idioma actual"
+#6  #  "Autor"
+#7  #  "Versió"
+#8  #  "Data"
+#9  #  "Visiteu el lloc web"
+#10 #  "Base de dades de ROMs (.RDB)"
+#11 #  "Fitxer de Trucs (.CHT)"
+#12 #  "Informació estesa de ROM (.RDX)"
+
+//About INI title
+#20 #  "Quant als fitxers de configuració"
+
+/*********************************************************************************
+* Menu                                                                           *
+*********************************************************************************/
+//File Menu
+#100#  "&Fitxer"
+#101#  "&Obre una ROM"
+#102#  "&Informació de ROM...."
+#103#  "Comença l'emulació"
+#104#  "&Finalitza l'emulació"
+#105#  "Tria directori de ROMs..."
+#106#  "Actualitza llista de ROMs"
+#107#  "ROMs recents"
+#108#  "Directoris de ROMs recents"
+#109#  "&Surt"
+
+//System Menu
+#120#  "&Sistema"
+#121#  "&Reinicia"
+#122#  "&Pausa"
+#123#  "Captura pantalla"
+#124#  "Limitador de velocitat"
+#125#  "&Desa"
+#126#  "Anomena i desa..."
+#127#  "&Restaura"
+#128#  "Carrega..."
+#129#  "&Estat desat actual"
+#130#  "Trucs..."
+#131#  "Botó de GameShark"
+#132#  "Continua"
+#133#  "Reinicia el &Programari"
+#134#  "Reinicia el &Maquinari"
+
+//Options Menu
+#140#  "&Opcions"
+#141#  "&Pantalla completa"
+#142#  "&Sempre a sobre"
+#143#  "Configura el connector de vídeo..."
+#144#  "Configura el connector d'àudio..."
+#145#  "Configura el connector del controlador..."
+#146#  "Configura el connector RSP..."
+#147#  "Mostra % d'ús de CPU"
+#148#  "&Paràmetres..."
+
+//Debugger Menu
+#160#  "&Depurador"
+
+//Language Menu
+#175#  "&Idioma"
+
+//Help Menu
+#180#  "&Ajuda"
+#181#  "Quant als fitxers &INI"
+#182#  "&Quant al Project 64"
+#183# "&Fòrum de suport"
+#184# "&Lloc web"
+
+//Current Save Slot menu
+#190#  "Per defecte"
+#191#  "Ranura 1"
+#192#  "Ranura 2"
+#193#  "Ranura 3"
+#194#  "Ranura 4"
+#195#  "Ranura 5"
+#196#  "Ranura 6"
+#197#  "Ranura 7"
+#198#  "Ranura 8"
+#199#  "Ranura 9"
+#200#  "Ranura 10"
+
+//Pop up Menu
+#210#  "Juga el joc"
+#211#  "Informació de ROM"
+#212#  "Edita els paràmetres del joc"
+#213#  "Edita els trucs"
+#214#  "Connector de vídeo"
+
+//Alternate Name to save Slot
+#220#  "Desa a la ranura per defecte"
+#221#  "Desa a la ranura 1"
+#222#  "Desa a la ranura 2"
+#223#  "Desa a la ranura 3"
+#224#  "Desa a la ranura 4"
+#225#  "Desa a la ranura 5"
+#226#  "Desa a la ranura 6"
+#227#  "Desa a la ranura 7"
+#228#  "Desa a la ranura 8"
+#229#  "Desa a la ranura 9"
+#230#  "Desa a la ranura 10"
+
+// Menu Descriptions
+#250#  "Obre una imatge ROM de Nintendo 64"
+#251#  "Mostra informació de la imatge carregada"
+#252#  "Inicia l'emulació de la imatge ROM carregada"
+#253#  "Atura l'emulació de la imatge ROM carregada"
+#254#  "Selecciona el directori de ROMs"
+#255#  "Actualitza la llista de ROMs en l'explorador de ROMs"
+#256#  "Tanca aquesta aplicació"
+#257#  "Recarrega la imatge ROM actual (recarrega qualsevol canvi de paràmetres)"
+#258#  "Pausa/Continua l'emulació de la ROM en execució actual"
+#259#  "Genera una imatge Bitmap de la pantalla actual"
+#260#  "Limita els quadres per segon a la velocitat correcta de la n64"
+#261#  "Crea una instantània del sistema actual per un desat ràpid"
+#262#  "Crea una instantània del sistema actual seleccionant la ubicació del fitxer"
+#263#  "Carrega una instantània ràpida desada"
+#264#  "Tria un fitxer d'instantània per carregar"
+#265#  "Activa/Desactiva trucs del GameShark"
+#266#  "El botó de GameShark s'utilitza amb trucs específics"
+#267#  "Canvia l'emulació de mode en finestra a pantalla completa"
+#268#  "Fa que la finestra estigui per sobre de totes les altres"
+#269#  "Canvia els paràmetres dins del connector de vídeo"
+#270#  "Canvia els paràmetres dins del connector d'àudio"
+#271#  "Canvia els paràmetres dins del connector de controladors (i.e. assigna les tecles)"
+#272#  "Canvia els paràmetres dins del connector RSP"
+#273#  "Mostra l'ús de CPU de l'emulador dividit en diferents recursos"
+#274#  "Mostra/Canvia paràmetres per aquesta aplicació"
+#275#  "Mostra el Manual per l'aplicació"
+#276#  "Mostra les PMF per l'aplicació"
+#278#  "Quant a l'aplicació i als autors"
+#277#  "Quant als autors dels fitxers de suport"
+#279#  "Obre aquesta imatge de ROM oberta anteriorment"
+#280#  "Tria aquest directori com el directori de ROMs"
+#281#  "Canvia l'aplicació per utilitzar aquest idioma"
+#282#  "Tria aquesta ubicació de desat ràpid"
+#283#  "Comença el joc seleccionat"
+#284#  "Informació del joc seleccionat"
+#285#  "Edita els paràmetres pel joc seleccionat"
+#286#  "Edita els trucs per joc seleccionat"
+
+/*********************************************************************************
+* ROM Browser                                                                    *
+*********************************************************************************/
+//ROM Browser Fields
+#300#  "Nom de fitxer"
+#301#  "Nom intern"
+#302#  "Nom bo"
+#303#  "Estat"
+#304#  "Mida de ROM"
+#305#  "Notes (Nucli)"
+#306#  "Notes (complements per defecte)"
+#307#  "Notes (Usuari)"
+#308#  "ID de cartutx"
+#309#  "Fabricant"
+#310#  "País"
+#311#  "Desenvolupador"
+#312#  "CRC1"
+#313#  "CRC2"
+#314#  "Xip CIC"
+#315#  "Data de sortida"
+#316#  "Gènere"
+#317#  "Jugadors"
+#318#  "Força resposta"
+#319#  "Format de fitxer"
+
+//Select ROM
+#320#  "Selecciona directori de ROMs actual"
+
+//Messages
+#340#  "ROM dolenta? Utilitza GoodN64 i cerca una RDB actualitzada"
+
+/*********************************************************************************
+* Options                                                                        *
+*********************************************************************************/
+//Options Title
+#400#  "Paràmetres"
+
+//Tabs
+#401#  "Connectors"
+#402#  "Directoris"
+#403#  "Opcions"
+#404#  "Selecció de ROM"
+#405#  "Avançat"
+#406#  "Paràmetres generals"
+#407#  "Integració del sistema"
+#408#  "Notes"
+#409#  "Dreceres de teclat"
+#410#  "Estat"
+#411#  "Recompilador"
+
+//Plugin Dialog
+#420#  "Quant a"
+#421#  " Complement de processador de senyal de realitat: "
+#422#  " Complement de vídeo (gràfics): "
+#423#  " Complement d'àudio (so): "
+#424#  " Complement d'entrada (controlador): "
+#425#  "HLE de vídeo"
+#426#  "HLE d'àudio"
+#427#  "** Utilitza complement del sistema **"
+
+//Directory Dialog
+#440#  " Directori de complements: "
+#441#  " Directori de ROMs: "
+#442#  " Autodesats de N64: "
+#443#  " Instantànies: "
+#444#  " Captures de pantalla: "
+#445#  "Carpeta des d'on es va obrir la darrera ROM."
+#446#  "Seleccioneu directori de complements"
+#447#  "Seleccioneu directori de ROMs"
+#448#  "Seleccioneu directori d'autodesats"
+#449#  "Seleccioneu directori de desats d'instantànies"
+#450#  "Seleccioneu directori d'imatges"
+#451#  " Directori de paquets de textures: "
+#452#  "Seleccioneu directori de paquets de textures"
+
+//Options Dialog
+#460#  "Posa en pausa quan la finestra no està activa"
+#461#  "Canvia a pantalla completa en carregar una ROM"
+#462#  "Amaga els paràmetres avançats"
+#463#  "Recorda els trucs seleccionats"
+#464#  "Desactiva l'estalvi de pantalla mentre s'executa una ROM"
+#465#  "Mostra la velocitat"
+#466#  "Mostra la velocitat:"
+#467#  "Comprova si Project64 ja s'està executant"
+
+//ROM Browser Tab
+#480#  "Límit de ROMs recordades (Màx 10):"
+#481#  "ROMs"
+#482#  "Límit de Dirs de ROMs recordades (Màx 10):"
+#483#  "dirs"
+#484#  "Empra explorador de ROMs"
+#485#  "Cerca subdirectoris"
+#486#  "Camps disponibles:"
+#487#  "Mostra els camps en aquest ordre:"
+#488#  "Afegeix ->"
+#489#  "<- Esborra"
+#490#  "Amunt"
+#491#  "Avall"
+#492#  "Refresca el navegador automàticament"
+
+//Advanced Options
+#500#  "La majoria d'aquests canvis no faran efecte fins que s'obri una nova ROM o fins a reiniciar l'actual ROM."
+#501#  "Predeterminats de nucli"
+#502#  "Estil de nucli de CPU:"
+#503#  "Mètode de codi auto-mod:"
+#504#  "Mida de memòria per defecte:"
+#505#  "Enllaçat de bloc avançat:"
+#506#  "Iniciar l'emulació quan s'obri la ROM"
+#507#  "Sobreescriu sempre els paràmetres per defecte amb els de l'INI"
+#508#  "Comprimeix automàticament els estats desats"
+#509#  "Activa el depurador"
+#510#  "Mem. cau"
+#511#  "PI DMA"
+#512#  "Inici canviat"
+#513#  "Memòria protegida"
+#514#  "Desmapat TLB"
+
+//ROM Options
+#520#  "Estil de nucli de CPU:"
+#521#  "Refresc d'entrada de vídeo:"
+#522#  "Mida de memòria:"
+#523#  "Enllaçat de blocs avançat:"
+#524#  "Tipus de desat per defecte:"
+#525#  "Factor de comptador:"
+#526#  "Memòria de compilació més gran"
+#527#  "Empra TLB"
+#528#  "Registra la mem. cau"
+#529#  "Retard d'interrupció SI"
+#530#  "Modificació d'SP"
+#531#  "Per defecte"
+#532#  "Senyal d'àudio RSP"
+#533#  "Sincr. d'àudio arreglada"
+#534#  "Funció de mètode de cerca:"
+#535#  "Mètode de codi auto-modificant"
+#536#  "Sincr. utilitzant l'àudio"
+#537#  "Compta AI per byte"
+#538#  "Màquina 32-bit"
+#539#  "Retard d'interrupció DP"
+
+//Core Styles
+#540#  "Intèrpret"
+#541#  "Recompilador"
+#542#  "Sincronitza nuclis"
+
+//Self Mod Methods
+#560#  "Cap"
+#561#  "Mem. cau"
+#562#  "Protegeix memòria"
+#563#  "Comprova memòria i mem. cau"
+#564#  "Canvia memòria i mem. cau"
+#565#  "Comprova memòria avançada"
+#566#  "Neteja codi en mem. cau"
+
+//Function Lookup method
+#570#  "Taula de cerca física"
+#571#  "Taula de cerca virtual"
+#572#  "Canvia la memòria"
+
+//RDRAM Size
+#580#  "4 MB"
+#581#  "8 MB"
+
+//Advanced Block Linking
+#600#  "Encès"
+#601#  "Apagat"
+
+//Save Type
+#620#  "Primer tipus de desat usat"
+#621#  "EEPROM de 4 kbits"
+#622#  "EEPROM de 16 kbits"
+#623#  "SRAM de 32kbytes"
+#624#  "FlashRAM de 128kbytes"
+
+//Shell Integration Tab
+#640#  "Associació d'extensions de fitxer:"
+
+//ROM Notes
+#660#  "Estat de ROM:"
+#661#  "Nota de nucli:"
+#662#  "Nota de complement:"
+
+// Accelerator Selector
+#680#  "Estat de CPU:"
+#681#  "Element de menú:"
+#682#  "Claus actuals:"
+#683#  "Seleccioneu la nova clau de drecera:"
+#684#  "Assignada actualment a:"
+#685#  "Assigna"
+#686#  "Esborra"
+#687#  "Reinicia-ho tot"
+#688#  "No s'està jugant"
+#689#  "S'està jugant"
+#690#  "S'està jugant en finestra"
+#691#  "S'està jugant a pantalla completa"
+#692#  "Detecta tecla"
+
+// Frame Rate Option
+#700#  "Interrupcions vertical per segon"
+#701#  "Mostra llistes per segon"
+#702#  "% de velocitat completa"
+
+// Increase speed
+#710#  "Augmenta velocitat de joc"
+#711#  "Disminueix velocitat de joc"
+
+//Bottom page buttons
+#720#  "Reinicia pàg."
+#721#  "Reinicia tot"
+#722#  "Aplica"
+#723#  "Tanca"
+
+/*********************************************************************************
+* ROM Information                                                                *
+*********************************************************************************/
+//ROM Info Title
+#800#  "Informació de ROM"
+
+//ROM Info Text
+#801#  "Nom de ROM:"
+#802#  "Nom de fitxer:"
+#803#  "Ubicació:"
+#804#  "Mida de ROM:"
+#805#  "ID de cartutx:"
+#806#  "Fabricant:"
+#807#  "País:"
+#808#  "CRC1:"
+#809#  "CRC2:"
+#810#  "Xip CIC:"
+#811#  "MD5:"
+
+/*********************************************************************************
+* Cheats                                                                         *
+*********************************************************************************/
+//Cheat List
+#1000#  "Trucs"
+#1001#  "Trucs:"
+#1002#  " Notes: "
+#1003#  "Marca-ho tot"
+#1004#  "Desmarca-ho tot"
+
+//Add Cheat
+#1005#  "Afegeix truc"
+#1006#  "Nom:"
+#1007#  "Codi:"
+#1008#  "Insereix"
+#1009#  "Neteja"
+#1010#  " Notes del truc: "
+#1011#  "Afegeix a la DB"
+
+//Code extension
+#1012#  "Extensions de codi"
+#1013#  "Trieu un valor per:"
+#1014#  "D'acord"
+#1015#  "Cancel·la"
+
+//Digital Value
+#1016#  "Dígit de quantitat"
+#1017#  "Trieu un valor per:"
+#1018#  "&Valor"
+#1019#  "de"
+#1020#  "a"
+#1021#  "&Notes:"
+#1022#  "Afegeix truc"
+#1023#  "Nou truc"
+#1024#  "<adreça> <valor>"
+#1025#  "Opcions:"
+#1026#  "<valor> <etiqueta>"
+
+//Edit Cheat
+#1027#  "Edita el truc"
+#1028#  "Actualitza el truc"
+#1029#  "El truc s'ha modificat.\n\nVoleu actualitzar?"
+#1030#  "Truc actualitzat"
+
+//Cheat Popup Menu
+#1040#  "Afegeix nou truc..."
+#1041#  "Edita"
+#1042#  "Esborra"
+
+// short-cut editor
+#1100#  "Reinicia dreceres"
+#1101#  "Segur que voleu reiniciar les dreceres?\n\nAquesta acció no es podrà desfer."
+#1102#  "Menú de Fitxer"
+#1103#  "Menú de Sistema"
+#1104#  "Opcions"
+#1105#  "Ranures de desat"
+
+/*********************************************************************************
+* Messages                                                                       *
+*********************************************************************************/
+#2000#  "*** CPU EN PAUSA ***"
+#2001#  "CPU continuat"
+#2002#  "Es troba en un bucle permanent i no pot sortir.\nL'emulació s'aturarà ara.\n\nComproveu la ROM i els paràmetres de ROM."
+#2003#  "No s'ha pogut assignar memòria"
+#2004#  "Ha desaparegut o no és vàlid el complement de vídeo seleccionat o per defecte.\n\nComproveu que teniu com a mínim un fitxer de complement compatible en la carpeta de complements."
+#2005#  "Ha desaparegut o no és vàlid el complement d'àudio seleccionat o per defecte.\n\nComproveu que teniu com a mínim un fitxer de complement compatible en la carpeta de complements."
+#2006#  "Ha desaparegut o no és vàlid el complement d'RSP seleccionat o per defecte.\n\nComproveu que teniu Project64 instal·lat adequadament amb un camí de complements vàlid."
+#2007#  "Ha desaparegut o no és vàlid el complement d'entrada seleccionat o per defecte.\n\nComproveu que teniu com a mínim un fitxer de complement compatible en la carpeta de complements."
+#2008#  "No s'ha pogut carregar el complement:"
+#2009#  "No s'ha pogut carregar la paraula\n\nComproveu la ROM i els paràmetres de ROM."
+#2010#  "No s'ha pogut obrir el fitxer de desat"
+#2011#  "No s'ha pogut obrir l'EEPROM"
+#2012#  "No s'ha pogut obrir el FlashRAM"
+#2013#  "No s'ha pogut obrir el mempak"
+#2014#  "Ha fallat l'intent d'obrir el fitxer zip.\nFitxer zip desaparegut o malmès - comproveu el camí i el fitxer.\n\nPotser necessitareu reiniciar l'aplicació."
+#2015#  "Ha fallat l'intent d'obrir el fitxer."
+#2016#  "S'ha produït un error en provar d'obrir el fitxer zip."
+#2017#  "El fitxer carregat no sembla que sigui una ROM de Nintendo 64 vàlida.\n\nVerifiqueu les ROMs amb GoodN64."
+#2018#  "País desconegut"
+#2019#  "Xip CIC desconegut"
+#2020#  "Format de fitxer desconegut"
+#2021#  "Acció de memòria desconeguda\n\nEmulació aturada"
+#2022#  "OpCode R4300i no gestionat a"
+#2023#  "Executant des d'un espai no-mapat.\n\nVerifiqueu la ROM i els paràmetres de la ROM."
+#2024#  "Sembla que l'estat desat no correspon a la ROM en execució.\n\nEls estats desats s'han de desar i carregar entre ROMs 100% idèntiques,\nen particular la REGIÓ i la VERSIÓ han de ser les mateixes.\nCarregant aquest estat és com provocar una fallida al joc o a l'emulador.\n\nSegur que voleu continuar carregant?"
+#2025#  "Error"
+#2026#  "No s'ha trobat la seqüència de copyright en el LUT.  El joc deixarà de funcionar."
+#2027#  "Fallida de protecció de còpia"
+#2028#  "Canviar un complement cal que Project64 reinicii una ROM en execució.\nSi no vols perdre la teva posició, respon No i fes un desat d'estat primer.\n\nVoleu canviar els complements i reiniciar el joc ara?"
+#2029#  "Canvia complements"
+#2030#  "Emulació finalitzada"
+#2031#  "Emulació iniciada"
+#2032#  "No s'ha pogut carregar l'estat desat"
+#2033#  "S'ha carregat l'estat desat"
+#2034#  "S'ha desat l'estat actual a"
+#2035#  "Ranura d'estat desat"
+#2036#  "Imatge d'intercanvi d'octets"
+#2037#  "Triant imatge de N64"
+#2038#  "Carregat"
+#2039#  "Carregant imatge"
+#2040#  "No es pot obrir cap ROM perquè els complements no s'han iniciat correctament"
+#2041#  "Esteu realment segur que voleu esborrar això?"
+#2042#  "Esborra el truc"
+#2043#  "El nom del truc ja es troba en ús"
+#2044#  "Heu arribat al límit màxim de trucs per aquesta ROM"
+#2045#  "Inicialitzant complement"
+#2046#  "No heu seleccionat una clau virtual per assignar a l'element de menú."
+#2047#  "Necessiteu seleccionar un element de menú per assignar a aquesta acció."
+#2048#  "La drecera ja està assignada a un altre element de menú."
+#2049#  "No s'ha seleccionat cap drecera per esborrar."
+#2050#  "ROM carregada. Esperant per iniciar l'emulació."
+#2051#  "La versió beta de Project64 només és pels membres.\n\nSi teniu un compte a pj64.net, no hauríeu de veure aquest error!!\nContacteu amb nosaltres a la web."
+#2052#  "Error del programa"
+#2053#  "No s'ha pogut trobar el fitxer dins del fitxer 7z"
+#2054#  "Emulació de baix nivell (LLE) de vídeo"
+#2055#  "L'LLE de vídeo no és per un ús genèric!!!\nÉs aconsellable que només utilitzis això per fer proves i no per jugar.\n\nVoleu canviar a l'LLE de vídeo?"
+#2056#  "Emulació d'alt nivell (HLE) d'àudio"
+#2057#  "L'HLE d'àudio requereix un complement de tercers!!!\nSi s'utilitza cap complement de tercers que suporti HLE, no hi haurà cap so.\n\nVoleu canviar a l'HLE d'àudio?"
diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang
index 91ac9007e..38271ce56 100644
--- a/Lang/Chinese (Simplified).pj.Lang	
+++ b/Lang/Chinese (Simplified).pj.Lang	
@@ -5,7 +5,7 @@
 #1  #  "简体中文"		 	// LANGUAGE ID
 #2  #  "山姆"			// Author
 #3  #  "2.2"		        // Version
-#4  #  "2015 年 3 月 11 日"	// Date
+#4  #  "2015 年 4 月"		// Date
 
 //About DLL Dialog
 #5  #  "当前使用的语言"
@@ -60,7 +60,7 @@
 #144#  "设置音频插件..."
 #145#  "设置控制器插件..."
 #146#  "设置 RSP 插件..."
-#147#  "显示 CPU 占用率 %"
+#147#  "显示 CPU 占用率"
 #148#  "设置(&S)..."
 
 //Debugger Menu
@@ -183,7 +183,7 @@
 * Options                                                                        *
 *********************************************************************************/
 //Options Title
-#400#  "系统设置"
+#400#  "设置"
 
 //Tabs
 #401#  "插件"
@@ -204,8 +204,8 @@
 #422#  " 视频 (图形) 插件: "
 #423#  " 音频 (声音) 插件: "
 #424#  " 输入 (控制器) 插件: "
-#425#  "是否使用高级(HLE)图形?"
-#426#  "是否使用高级(HLE)音频?"
+#425#  "图形HLE模拟"
+#426#  "音频HLE模拟"
 #427#  "** 使用系统插件 **"
 
 //Directory Dialog
@@ -224,19 +224,19 @@
 #452#  " 选择材质包目录"
 
 //Options Dialog
-#460#  "当窗口挂起时暂停模拟器"
-#461#  "载入 ROM 完毕后切换为全屏模式"
+#460#  "当窗口处于非活动状态时暂停模拟器"
+#461#  "载入ROM后切换为全屏模式"
 #462#  "隐藏高级设置"
 #463#  "记住已选择的金手指"
-#464#  "在ROM运行时禁用屏幕保护程序"
+#464#  "在ROM运行时关闭屏幕保护"
 #465#  "显示帧速率"
 #466#  "帧速率回显:"
 #467#  "检查Project64是否已经在运行"
 
 //ROM Browser Tab
-#480#  "最大 # ROM 记录数 (最大 10):"
+#480#  "最大 # ROM 记录数 (0-10):"
 #481#  "ROM"
-#482#  "最大 # ROM 目录记录数 (最大 10):"
+#482#  "最大 # ROM 目录记录数 (0-10):"
 #483#  "目录"
 #484#  "使用 ROM 浏览器"
 #485#  "包含所有子目录"
@@ -249,13 +249,13 @@
 #492#  "自动刷新浏览器"
 
 //Advanced Options
-#500#  "在这里的大多数被更改的选项要重新载入一个 ROM 或将当前的 ROM 重置才能生效"
+#500#  "大部分所修改的选项无法立即生效，需要打开一个新ROM或重置当前ROM才能生效"
 #501#  "默认内核"
 #502#  "CPU 内核类型:"
 #503#  "自我修改码方案:"
 #504#  "默认存档容量:"
-#505#  "高级模块连接:"
-#506#  "当 ROM 加载后开始模拟"
+#505#  "高级模块连接"
+#506#  "当ROM加载后，开始模拟"
 #507#  "总是从 RDB 中覆盖默认设置"
 #508#  "自动压缩即时存档文件"
 #509#  "开启调试器"
@@ -332,7 +332,7 @@
 // Accelerator Selector
 #680#  "CPU 状态:"
 #681#  "菜单选项:"
-#682#  "目前使用的按键:"
+#682#  "快捷键:"
 #683#  "选择新快捷键:"
 #684#  "目前设置为:"
 #685#  "设置"
@@ -342,6 +342,7 @@
 #689#  "游戏正在运行"
 #690#  "游戏正在运行 (窗口)"
 #691#  "游戏正在运行 (全屏)"
+#692#  "按下按键"
 
 // Frame Rate Option
 #700# "每秒垂直中断 (VI/s)"
@@ -356,6 +357,7 @@
 #720#  "重置此页"
 #721#  "全部重设"
 #722#  "应用"
+#723#  "关闭"
 
 /*********************************************************************************
 * ROM Information                                                                *
@@ -484,11 +486,11 @@
 #2023#  "没有运行所需的映射空间。
 
 请检查 ROM 和 ROM 设置."
-#2024#  "即时记忆看来不是当前正在运行的 ROM 的。
+#2024#  "即时存档看来不是当前正在运行的 ROM 的。
 
-即时记忆必须在 100% 相同的 ROM 上保存和载入,
+即时存档必须在 100% 相同的 ROM 上保存和载入,
 特别是版本和区域必须相同。
-载入这个即时记忆可能使模拟器或游戏死机
+载入这个即时存档可能使模拟器或游戏死机
 
 您确实要继续载入吗?"
 #2025#  "错误"
@@ -518,7 +520,7 @@
 #2046# 	"您还未设置个虚拟键作为选项"
 #2047#  "您必须选择一个选项分配给菜单选项"
 #2048#  "快捷键已被分配为另一个选项"
-#2049#  "在移除前，还未选择快捷键"
+#2049#  "你还未选择你想要删除的快捷键"
 #2050#  "ROM 已被载入。正在等待模拟开始。"
 #2051#  "Project64 beta仅限于会员.
 
@@ -527,12 +529,13 @@
 请联系我们网站"
 #2052#  "程序错误"
 #2053#  "无法在7z文件中查询文件名"
-#2054#  "使用低级画面"
-#2055#  "低级(LLE)图形不是平时使用的！！！
-建议您仅在测试环境下使用低级(LLE)图形, 玩游戏时不要使用低级(LLE)图形
+#2054#  "图形LLE模拟"
+#2055#  "图形LLE模拟不是平时使用的！！！
+这仅用于测试，而不是玩游戏
 
-您确定修改为低级(LLE)图形?"
-#2056# "使用高级音频"
-#2057# "高级(HLE)音频需要第三方插件！！！
-如果您使用的第三方插件不支持高级(HLE)音频，您将听不到声音。
-是否使用高级(HLE)音频?"
+你确定改成图形LLE?"
+#2056# "音频HLE模拟"
+#2057# "音频HLE模拟需要第三方插件！！！
+如果你使用的第三方插件不支持音频HLE，你将听不到声音。
+
+你确定改成音频HLE?"
diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang
index 8fd494a21..e527a9d89 100644
--- a/Lang/English.pj.Lang
+++ b/Lang/English.pj.Lang
@@ -131,7 +131,7 @@
 #268#  "Make window stay on top of all other windows"
 #269#  "Change settings inside the graphics plugin"
 #270#  "Change settings inside the audio plugin"
-#271#  "Change settings inside the controller plugin (i.e. set keys)"
+#271#  "Change settings inside the controller plugin (i.e., set keys)"
 #272#  "Change settings inside the RSP plugin"
 #273#  "Show the CPU usage of the emulator split over different resources"
 #274#  "View/change settings for this application"
@@ -177,7 +177,7 @@
 #320#  "Select current ROM directory"
 
 //Messages
-#340#  "Bad ROM? Use GoodN64 & check for updated RDB"
+#340#  "Bad ROM? Use GoodN64 & check for updated RDB."
 
 /*********************************************************************************
 * Options                                                                        *
@@ -254,7 +254,7 @@
 #502#  "CPU core style:"
 #503#  "Self mod methods"
 #504#  "Default memory size:"
-#505#  "Advanced block linking:"
+#505#  "Advanced block linking"
 #506#  "Start emulation when ROM is opened"
 #507#  "Always override default settings with ones from RDB"
 #508#  "Automatically compress saved states"
@@ -269,7 +269,7 @@
 #520#  "CPU core style:"
 #521#  "VI refresh rate:"
 #522#  "Memory size:"
-#523#  "Advanced block linking:"
+#523#  "Advanced block linking"
 #524#  "Default save type:"
 #525#  "Counter factor:"
 #526#  "Larger compile buffer"
@@ -342,6 +342,7 @@
 #689#  "Game playing"
 #690#  "Game playing (windowed)"
 #691#  "Game playing (full-screen)"
+#692#  "Detect Key"
 
 // Frame Rate Option
 #700#  "Vertical interrupts per second"
@@ -356,6 +357,7 @@
 #720#  "Reset Page"
 #721#  "Reset All"
 #722#  "Apply"
+#723#  "Close"
 
 /*********************************************************************************
 * ROM Information                                                                *
@@ -438,33 +440,33 @@
 *********************************************************************************/
 #2000#  "*** CPU PAUSED ***"
 #2001#  "CPU Resumed"
-#2002#  "In a permanent loop that cannot be exited. \nEmulation will now stop. \n\nVerify ROM and ROM settings."
+#2002#  "In a permanent loop that cannot be exited.\nEmulation will now stop.\n\nVerify ROM and its settings."
 #2003#  "Failed to allocate memory"
-#2004#  "The default or selected video plugin is missing or invalid. \n\nYou need to go into Settings and select a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."
-#2005#  "The default or selected audio plugin is missing or invalid. \n\nYou need to go into Settings and select a audio (sound) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."
-#2006#  "The default or selected RSP plugin is missing or invalid. \n\nYou need to go into Settings and select a RSP (Reality Signal Processor) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."
-#2007#  "The default or selected input plugin is missing or invalid. \n\nYou need to go into Settings and select an input (controller) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."
+#2004#  "The default or selected video plugin is missing or invalid.\n\nYou need to go into Settings and select a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."
+#2005#  "The default or selected audio plugin is missing or invalid.\n\nYou need to go into Settings and select a audio (sound) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."
+#2006#  "The default or selected RSP plugin is missing or invalid.\n\nYou need to go into Settings and select a RSP (Reality Signal Processor) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."
+#2007#  "The default or selected input plugin is missing or invalid.\n\nYou need to go into Settings and select an input (controller) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."
 #2008#  "Failed to load plugin:"
-#2009#  "Failed to load word.\n\nVerify ROM and ROM settings."
+#2009#  "Failed to load word.\n\nVerify ROM and its settings."
 #2010#  "Failed to open save file"
 #2011#  "Failed to open EEPROM"
 #2012#  "Failed to open flash RAM"
 #2013#  "Failed to open mempak"
-#2014#  "Attempt to open zip file failed. \n\nProbably a corrupt zip file - try unzipping ROM manually."
+#2014#  "Attempt to open zip file failed.\n\nProbably a corrupt zip file - try unzipping ROM manually."
 #2015#  "Attempt to open file failed."
 #2016#  "Error occurred when trying to open zip file."
-#2017#  "File loaded does not appear to be a valid N64 ROM. \n\nVerify your ROMs with GoodN64."
+#2017#  "File loaded does not appear to be a valid N64 ROM.\n\nVerify your ROMs with GoodN64."
 #2018#  "Unknown country"
 #2019#  "Unknown CIC chip"
 #2020#  "Unknown file format"
 #2021#  "Unknown memory action\n\nEmulation stopped"
 #2022#  "Unhandled R4300i opcode at"
-#2023#  "Executing from non-mapped space.\n\nVerify ROM and ROM settings."
-#2024#  "This saved state does not appear to match the running ROM. \n\nStates must be saved & loaded between 100% identical ROMs. \nIn particular the REGION and VERSION need to be the same. \nLoading this state is likely to cause the game and/or emulator to crash. \n\nAre you sure you want to continue loading?"
+#2023#  "Executing from non-mapped space.\n\nVerify ROM and its settings."
+#2024#  "This saved state does not appear to match the running ROM.\n\nStates must be saved & loaded between 100% identical ROMs.\nIn particular, the REGION and VERSION need to be the same.\nLoading this state is likely to cause the game and/or emulator to crash.\n\nAre you sure you want to continue loading?"
 #2025#  "Error"
-#2026#  "Copyright sequence not found in LUT.  Game will no longer function."
+#2026#  "Copyright sequence not found in LUT. Game will no longer function."
 #2027#  "Copy Protection Failure"
-#2028#  "Changing a plugin requires Project64 to reset a running ROM. \nIf you don't want to lose your place, answer No and save the current state first. \n\nChange plugins and reset ROM now?"
+#2028#  "Changing a plugin requires Project64 to reset a running ROM.\nIf you don't want to lose your place, answer No and save the current state first.\n\nChange plugins and reset ROM now?"
 #2029#  "Change Plugins"
 #2030#  "Emulation ended"
 #2031#  "Emulation started"
@@ -487,7 +489,7 @@
 #2048#  "Short-cut has already been assigned to another menu item."
 #2049#  "No shortcut has been selected to be removed."
 #2050#  "ROM loaded. Waiting for emulation to start."
-#2051#  "Project64 beta is for members only.\n\nIf you have an account at pj64.net, you should not be seeing this error!!\nPlease contact us on the site."
+#2051#  "Project64 beta versions are for members only.\n\nIf you have an account at www.pj64-emu.com, you should not be seeing this error!!\nPlease contact us on the site."
 #2052#  "Program Error"
 #2053#  "Failed to find filename in 7z file"
 #2054#  "Graphics Low-Level Emulation"
diff --git a/Lang/English_alternative.pj.Lang b/Lang/English_alternative.pj.Lang
index 50057f234..00f916e40 100644
--- a/Lang/English_alternative.pj.Lang
+++ b/Lang/English_alternative.pj.Lang
@@ -118,7 +118,7 @@
 #271#  "Configure selected input (controller) plugin"
 #272#  "Configure RSP plugin"
 #273#  "Show/hide display of system CPU use divided amoung emulator components"
-#274#  "Project64 main application settings (plugin selection etc.)"
+#274#  "Project64 main application settings (plugin selection, etc.)"
 #275#  "Open the User Manual for Project64"
 #276#  "Open the Project64 game-specific FAQ"
 #278#  "About the application and authors"
diff --git a/Lang/French.pj.Lang b/Lang/French.pj.Lang
index ea45823ae..4a9ca43fb 100644
--- a/Lang/French.pj.Lang
+++ b/Lang/French.pj.Lang
@@ -1,134 +1,152 @@
-/*********************************************************************************
+/*********************************************************************************
 * Meta Information                                                               *
 *********************************************************************************/
 //About DLL
-#1  #  "Français"	// LANGUAGE ID
-#2  #  "Pharmboy (Pharmboy_VII@hotmail.com)"			// Author
-#3  #  "1.5.3"		// Version
-#4  #  "2002-09-11"		// Date
+#1  #  "Français"		// LANGUAGE ID
+#2  #  "Benjamin Siskoo"			// Author
+#3  #  "2.2"			// Version
+#4  #  "6 Mai 2015"		// Date
 
 //About DLL Dialog
-#5  #  "Langue actuelle (.pj.Lang)"
+#5  #  "Langue actuelle"
 #6  #  "Auteur"
 #7  #  "Version"
 #8  #  "Date"
-#9  #  "Site de l'auteur"
-#10 #  "Base de données des ROMs (Project64.rdb)"
-#11 #  "Fichier des codes triche (Project64.cht)"
-#12 #  "Informations étendues des ROMs (Project64.rdx)"
+#9  #  "Visiter le site web"
+#10 #  "Base de données des ROM (.rdb)"
+#11 #  "Fichier des cheats (.cht)"
+#12 #  "Infos sur les ROM étendues (.rdx)"
 
 //About INI title
-#20 #  "Project64 utilise actuellement :"
+#20 #  "À propos des fichiers de configuration"
 
 /*********************************************************************************
 * Menu                                                                           *
 *********************************************************************************/
 //File Menu
 #100#  "&Fichier"
-#101#  "&Ouvrir une ROM..."
-#102#  "&Infos sur la ROM..."
-#103#  "&Démarrer l'émulation"
-#104#  "&Arrêter l'émulation"
-#105#  "&Choix du dossier des ROMs..."
-#106#  "&Rafraîchir la liste des ROMs"
-#107#  "Ro&ms récentes"
-#108#  "Do&ssier des ROMs récentes"
+#101#  "&Ouvrir une ROM"
+#102#  "&Infos sur la ROM…"
+#103#  "Démarrer l’émulation"
+#104#  "Arrêter l’émulation"
+#105#  "Choisir le répertoire des ROM…"
+#106#  "Rafraîchir la liste des ROM"
+#107#  "ROM récentes"
+#108#  "Répertoires des ROM récentes"
 #109#  "&Quitter"
 
 //System Menu
-#120#  "S&ystème"
-#121#  "&Redémarrer la ROM"
+#120#  "&Système"
+#121#  "&Redémarrer"
 #122#  "&Pause"
-#123#  "Cap&ture d'écran"
-#124#  "&Vitesse réelle"
-#125#  "&Sauvegarde rapide"
-#126#  "S&auvegarder sous..."
-#127#  "&Chargement rapide"
-#128#  "C&harger..."
-#129#  "&Numéro de la sauvegarde rapide"
-#130#  "C&odes triche..."
-#131#  "&Bouton triche"
-#132#  "Cont&inuer"
+#123#  "&Capture d’écran"
+#124#  "Limiter les FPS"
+#125#  "&Sauvegarder l’état"
+#126#  "Sauvegarder sous…"
+#127#  "&Charger un état"
+#128#  "Charger…"
+#129#  "Sauvegarder l’&état actuel"
+#130#  "Cheats…"
+#131#  "Bouton GameShark (cheats)"
+#132#  "R&eprendre"
+#133#  "Redémarrage &logiciel"
+#134#  "Redémarrage &matériel"
 
 //Options Menu
 #140#  "&Options"
 #141#  "&Plein écran"
-#142#  "&Toujours au premier plan"
-#143#  "Configurer le plugin &Vidéo..."
-#144#  "Configurer le plugin &Audio..."
-#145#  "Configurer le plugin &Contrôles..."
-#146#  "Configurer le plugin &RSP..."
-#147#  "A&fficher la charge du CPU en %"
-#148#  "Ré&glages..."
+#142#  "&Toujours visible"
+#143#  "Configurer le plugin graphique…"
+#144#  "Configurer le plugin audio…"
+#145#  "Configurer le plugin contrôleur…"
+#146#  "Configurer le plugin RSP…"
+#147#  "Afficher l’utilisation du CPU"
+#148#  "&Paramètres…"
 
 //Debugger Menu
 #160#  "&Débogueur"
 
 //Language Menu
-#175#  "&Langue"
+#175#  "&Langage"
 
 //Help Menu
 #180#  "&Aide"
-#181#  "A propos des fichiers &INI"
-#182#  "A propos de &Project64"
+#181#  "À propos des fichiers de conf&iguration"
+#182#  "À &propos de Project64"
+#183#  "&Forum de support"
+#184#  "Site &web"
 
 //Current Save Slot menu
-#190#  "&Par défaut (.pj)"
-#191#  "&1 (.pj1)"
-#192#  "&2 (.pj2)"
-#193#  "&3 (.pj3)"
-#194#  "&4 (.pj4)"
-#195#  "&5 (.pj5)"
-#196#  "&6 (.pj6)"
-#197#  "&7 (.pj7)"
-#198#  "&8 (.pj8)"
-#199#  "&9 (.pj9)"
-#200#  "1&0 (.pj0)"
+#190#  "Défaut"
+#191#  "Emplacement 1"
+#192#  "Emplacement 2"
+#193#  "Emplacement 3"
+#194#  "Emplacement 4"
+#195#  "Emplacement 5"
+#196#  "Emplacement 6"
+#197#  "Emplacement 7"
+#198#  "Emplacement 8"
+#199#  "Emplacement 9"
+#200#  "Emplacement 10"
 
 //Pop up Menu
-#210#  "&Jouer"
-#211#  "&Informations sur la ROM"
-#212#  "&Editer les réglages du jeu"
-#213#  "Editer les codes &triche"
+#210#  "Lancer le jeu"
+#211#  "Informations sur la ROM"
+#212#  "Éditer les paramètres du jeu"
+#213#  "Éditer les cheats"
+#214#  "Plugin graphique"
+
+//Alternate Name to save Slot
+#220#  "Emplacement de sauvegarde - Défaut"
+#221#  "Emplacement de sauvegarde - 1"
+#222#  "Emplacement de sauvegarde - 2"
+#223#  "Emplacement de sauvegarde - 3"
+#224#  "Emplacement de sauvegarde - 4"
+#225#  "Emplacement de sauvegarde - 5"
+#226#  "Emplacement de sauvegarde - 6"
+#227#  "Emplacement de sauvegarde - 7"
+#228#  "Emplacement de sauvegarde - 8"
+#229#  "Emplacement de sauvegarde - 9"
+#230#  "Emplacement de sauvegarde - 10"
 
 // Menu Descriptions
-#250#  "Parcourir l'ordinateur pour trouver et charger une ROM"
-#251#  "Afficher des informations sur la ROM chargée"
-#252#  "Démarrer l'émulation de la ROM chargée"
-#253#  "Arrêter l'émulation de la ROM chargée et retourner au navigateur"
-#254#  "Changer le dossier du navigateur de ROMs"
-#255#  "Rafraîchir la fenêtre du navigateur pour refléter les changements du dossier des ROMs"
-#256#  "Quitter Project64"
-#257#  "Redémarrer l'émulation de la ROM"
-#258#  "Mettre en pause/redémarrer l'émulation de la ROM"
-#259#  "Générer un fichier bitmap à partir du plugin graphique"
-#260#  "Limiter le nombre de 'VI/s' à la vitesse réelle selon la région de la ROM"
-#261#  "Sauvegarder l'état actuel du système avec le numéro choisi"
-#262#  "Sauvegarder l'état du système avec choix du dossier où sauvegarder"
-#263#  "Charger l'état du système contenu dans une sauvegarde rapide"
-#264#  "Choisir une sauvegarde de l'état à charger"
-#265#  "Choisir ou ajouter des codes triche pour la ROM chargée"
-#266#  "Emuler l'appui sur le bouton du 'GameShark' - à utiliser avec certains codes triche"
-#267#  "Basculer du mode fenêtre au mode plein écran (appuyer sur Esc pour revenir au mode fenêtre)"
-#268#  "Garder la fenêtre de Project64 devant les autres fenêtres"
-#269#  "Configurer le plugin vidéo actuel"
-#270#  "Configurer le plugin audio actuel"
-#271#  "Configurer le plugin des contrôles actuel"
-#272#  "Configurer le plugin 'Reality Signal Processor'"
-#273#  "Montrer/masquer l'affichage de la charge actuelle du CPU selon les composants"
-#274#  "Réglages principaux de Project64 (sélection des plugins, etc...)"
-#275#  "Ouvrir le manuel de l'utilisateur pour Project64"
-#276#  "Ouvrir la Foire Aux Questions sur les jeux"
-#277#  "A propos des auteurs des fichiers de support"
-#278#  "A propos du programme et de ces auteurs"
-#279#  "Charger une ROM chargée récemment"
-#280#  "Basculer le navigateur de ROMs vers le dossier choisi"
-#281#  "Changer la langue de l'interface graphique de Project64"
-#282#  "Changer le numéro de la sauvegarde rapide"
-#283#  "Charger et démarrer l'émulation du jeu choisi"
-#284#  "Voir les informations sur le jeu choisi"
-#285#  "Editer les réglages du jeu choisi dans le fichier RDB"
-#286#  "Editer les codes triche du jeu choisi dans le fichier CHT"
+#250#  "Ouvrir une image ROM N64"
+#251#  "Afficher les informations concernant l’image chargée"
+#252#  "Lancer l’émulation de l’image ROM chargée"
+#253#  "Arrêter l’émulation de l’image ROM chargée"
+#254#  "Sélectionner le répertoire des ROM"
+#255#  "Rafraîchir la liste actuelle des ROM dans le navigateur de ROM"
+#256#  "Quitter l’application"
+#257#  "Redémarrer l’image ROM actuelle (recharger tous les changements de paramètres)"
+#258#  "Mettre en pause/reprendre l’émulation de la ROM lancée"
+#259#  "Générer une image bitmap de l’écran actuel"
+#260#  "Limiter les FPS à la bonne vitesse de la N64"
+#261#  "Sauvegarder l’état actuel du système"
+#262#  "Sauvegarder l’état actuel du système à l’emplacement du fichier sélectionné"
+#263#  "Charger la sauvegarde d’état"
+#264#  "Choisir un fichier de sauvegarde d’état à charger"
+#265#  "Activer/désactiver les cheats GameShark"
+#266#  "Le bouton GameShark est utilisé avec des cheats spécifiques."
+#267#  "Basculer l’émulation du mode fenêtré vers le mode plein écran."
+#268#  "Permet de mettre la fenêtre Project64 toujours au premier plan"
+#269#  "Configurer le plugin graphique"
+#270#  "Configurer le plugin audio"
+#271#  "Configurer le plugin contrôleur (ex : choisir les touches)"
+#272#  "Configurer le plugin RSP"
+#273#  "Afficher l’utilisation du CPU de l’émulateur répartie sur les différentes ressources"
+#274#  "Voir/changer les paramètres pour cette application"
+#275#  "Voir le manuel pour l’application"
+#276#  "Voir la FAQ pour l’application"
+#278#  "À propos de l’application et des auteurs"
+#277#  "À propos des auteurs sur les fichiers de support"
+#279#  "Ouvrir l’image ROM ouverte précédemment"
+#280#  "Choisir ce répertoire comme votre répertoire de jeu"
+#281#  "Changer l’application pour utiliser cette langue"
+#282#  "Choisir l’emplacement de sauvegarde pour l’état sauvegardé"
+#283#  "Jouer au jeu sélectionné"
+#284#  "Informations concernant le jeu sélectionné"
+#285#  "Éditer les paramètres pour le jeu sélectionné"
+#286#  "Éditer les cheats pour le jeu sélectionné"
 
 /*********************************************************************************
 * ROM Browser                                                                    *
@@ -136,11 +154,11 @@
 //ROM Browser Fields
 #300#  "Nom du fichier"
 #301#  "Nom interne"
-#302#  "Nom dans GoodN64"
+#302#  "Nom correct (GoodN64)"
 #303#  "Statut"
 #304#  "Taille de la ROM"
 #305#  "Notes (noyau)"
-#306#  "Notes (plugins)"
+#306#  "Notes (plugins par défaut)"
 #307#  "Notes (utilisateur)"
 #308#  "ID de la cartouche"
 #309#  "Constructeur"
@@ -152,271 +170,327 @@
 #315#  "Date de sortie"
 #316#  "Genre"
 #317#  "Joueurs"
+#318#  "Forcer le feedback"
+#319#  "Format de fichier"
 
 //Select ROM
-#320#  "Choisir le dossier des ROMs pour le navigateur de ROMs"
+#320#  "Sélectionner le répertoire de ROM actuel"
 
 //Messages
-#340#  "Mauvaise ROM? Utilisez GoodN64, cherchez un nouveau fichier RDB"
+#340#  "Mauvaise ROM ? Utilisez GoodN64 et vérifiez que le fichier RDB est à jour"
 
 /*********************************************************************************
 * Options                                                                        *
 *********************************************************************************/
 //Options Title
-#400#  "Réglages de Project64"
+#400#  "Paramètres"
 
 //Tabs
 #401#  "Plugins"
-#402#  "Dossiers"
+#402#  "Répertoires"
 #403#  "Options"
-#404#  "Sélection d'une ROM"
-#405#  "Avancées"
-#406#  "Réglages de la ROM"
-#407#  "Association"
-#408#  "Notes sur la ROM"
+#404#  "Navigateur de ROM"
+#405#  "Avancé"
+#406#  "Paramètres généraux"
+#407#  "Intégration au shell"
+#408#  "Notes"
+#409#  "Raccourcis clavier"
+#410#  "Statut"
+#411#  "Recompilateur"
 
 //Plugin Dialog
-#420#  "A propos"
-#421#  "Plugin &Reality Signal Processor"
-#422#  "Plugin &Vidéo"
-#423#  "Plugin &Audio"
-#424#  "Plugin &Contrôles"
+#420#  "À propos"
+#421#  " Plugin RSP (Reality Signal Processor) : "
+#422#  " Plugin vidéo (graphique) : "
+#423#  " Plugin audio (son) : "
+#424#  " Plugin input (contrôleur) : "
+#425#  "Graphismes HLE"
+#426#  "Audio HLE"
+#427#  "** Utiliser le plugin système **"
 
 //Directory Dialog
-#440#  "Dossier des &plugins"
-#441#  "Dossier des &ROMs"
-#442#  "Dossier des sauvegardes de la &N64"
-#443#  "Dossier des &sauvegardes rapides"
-#444#  "Dossier des &captures d'écran"
-#445#  "Retenir le dernier dossier où une ROM a été ouverte"
-#446#  "Choisir un dossier pour les plugins"
-#447#  "Choisir un dossier pour les ROMs"
-#448#  "Choisir un dossier pour les sauvegardes de la N64"
-#449#  "Choisir un dossier pour les sauvegardes rapides"
-#450#  "Choisir un dossier pour les captures d'écran"
+#440#  " Répertoire des plugins : "
+#441#  " Répertoire des ROM : "
+#442#  " Répertoire des sauvegardes N64 natives : "
+#443#  " Répertoire des sauvegardes d’état : "
+#444#  " Répertoire des captures d’écran : "
+#445#  "Dernier répertoire d’où la ROM a été ouverte"
+#446#  "Sélectionner le répertoire des plugins"
+#447#  "Sélectionner le répertoire des ROM"
+#448#  "Sélectionner le répertoire des sauvegardes N64 natives"
+#449#  "Sélectionner le répertoire des sauvegardes d’état"
+#450#  "Sélectionner le répertoire des captures d’écran"
+#451#  " Répertoire du pack de textures : "
+#452#  "Sélectionner le répertoire du pack de texture"
 
-//Options Dialog
-#460#  "&Mettre en pause quand la fenêtre perd le focus"
-#461#  "Basculer en &plein écran quand une ROM est chargée"
-#462#  "&Cacher les réglages avancés (recommandé)"
-#463#  "&Retenir les codes triche sélectionnés"
+//Options (general) Tab
+#460#  "Émulation en pause quand la fenêtre est inactive"
+#461#  "Passer en plein écran au chargement d’une ROM"
+#462#  "Cacher les paramètres avancés"
+#463#  "Retenir les cheats sélectionnés"
+#464#  "Désactiver l’écran de veille quand une ROM est lancée"
+#465#  "Afficher la vitesse"
+#466#  "Vitesse affichée :"
+#467#  "Vérifier si Project64 est déjà lancé"
 
 //ROM Browser Tab
-#480#  "&Nombres de ROMs à retenir (0-10)"
-#481#  "ROMs"
-#482#  "N&ombre de dossiers de ROMs à retenir (0-10)"
-#483#  "dossiers"
-#484#  "Na&vigateur de ROMs activé"
-#485#  "&Récursivité des dossiers"
-#486#  "&Champs disponibles :"
-#487#  "&Montrer dans cet ordre :"
-#488#  "&Ajouter ->"
-#489#  "<- &Enlever"
-#490#  "&Haut"
-#491#  "&Bas"
+#480#  "Max de ROM à retenir (0-10) :"
+#481#  "ROM"
+#482#  "Max de répertoires ROM à retenir (0-10) :"
+#483#  "répertoires"
+#484#  "Utiliser le navigateur de ROM"
+#485#  "Utiliser également les sous-répertoires"
+#486#  "Champs disponibles :"
+#487#  "Champs dans l’ordre :"
+#488#  "Ajouter ->"
+#489#  "<- Supprimer"
+#490#  "Haut"
+#491#  "Bas"
+#492#  "Rafraîchir automatiquement le navigateur"
 
 //Advanced Options
-#500#  "Ces réglages sont utilisés si le RDB n'a pas spécifié de valeur,
-aucun RDB n'existe ou l'option 'Préférer ...' n'est pas cochée"
-#501#  "&Réglages par défaut du noyau"
-#502#  "&Noyau R4300i :"
-#503#  "&Méthode du 'Self-mod. Code' :"
-#504#  "&Taille de la RDRAM :"
-#505#  "&Advanced Block Linking :"
-#506#  "&Démarrer l'émulation après le chargement des ROMs"
-#507#  "&Préférer les réglages du fichier RDB à ceux par défaut"
-#508#  "&Compresser (zip) toutes les sauvegardes rapides"
+#500#  "La plupart de ces changements ne prendront pas effet avant qu’une nouvelle ROM soit ouverte ou que la ROM actuelle soit redémarrée."
+#501#  "Noyau par défaut"
+#502#  "Style de noyau CPU :"
+#503#  "Méthodes Self Mod"
+#504#  "Taille de la mémoire par défaut :"
+#505#  "Liaison de blocs avancée"
+#506#  "Démarrer l’émulation au chargement d’une ROM"
+#507#  "Préférer les réglages du fichier RDB à ceux par défaut"
+#508#  "Compresser automatiquement les sauvegardes d’état"
+#509#  "Activer le débogueur"
+#510#  "Cache"
+#511#  "PI DMA"
+#512#  "Lancer si modifié"
+#513#  "Protéger la mémoire"
+#514#  "TLB unmapping"
 
 //ROM Options
-#520#  "&Noyau R4300i :"
-#521#  "&Méthode du 'Self-mod. Code' :"
-#522#  "&Taille de la RDRAM :"
-#523#  "&Advanced Block Linking :"
-#524#  "T&ype de sauvegarde :"
-#525#  "&Counter Factor :"
-#526#  "&Larger Compile Buffer"
-#527#  "TL&B"
-#528#  "&Register Caching"
-#529#  "Delay SI &Interrupt"
-#530#  "SP &Hack"
-#531#  "* par défaut"
+#520#  "Style de noyau CPU :"
+#521#  "Taux de rafraîchissement VI :"
+#522#  "Taille de la mémoire :"
+#523#  "Liaison de blocs avancée"
+#524#  "Type de sauvegarde :"
+#525#  "Facteur compteur :"
+#526#  "Plus grand tampon de compilation"
+#527#  "Utiliser le TLB"
+#528#  "Mettre en cache les registres"
+#529#  "Retarder l’interruption SI"
+#530#  "SP rapide"
+#531#  "Défaut"
+#532#  "Signal audio RSP"
+#533#  "Correction du timing audio"
+#534#  "Méthode de recherche de fonctions :"
+#535#  "Méthode self mod personnalisée"
+#536#  "Synchronisation audio"
+#537#  "Compteur AI par octet"
+#538#  "Moteur 32 bits"
+#539#  "Retarder l’interruption DP"
 
 //Core Styles
 #540#  "Interpréteur"
-#541#  "Recompileur"
+#541#  "Recompilateur"
 #542#  "Synchroniser les noyaux"
 
 //Self Mod Methods
-#560#  "Aucune"
+#560#  "Aucun"
 #561#  "Cache"
-#562#  "Protect Memory"
-#563#  "Check Memory & Cache"
-#564#  "Change Memory & Cache"
-#565#  "Check Memory Advance"
+#562#  "Protéger la mémoire"
+#563#  "Vérifier la mémoire et le cache"
+#564#  "Changer la mémoire et le cache"
+#565#  "Vérifier la mémoire avancée"
+#566#  "Vider le code du cache"
+
+//Function Lookup method
+#570#  "Table de recherche physique"
+#571#  "Table de recherche virtuelle"
+#572#  "Changer la mémoire"
 
 //RDRAM Size
 #580#  "4 Mo"
 #581#  "8 Mo"
 
 //Advanced Block Linking
-#600#  "Oui"
-#601#  "Non"
+#600#  "On"
+#601#  "Off"
 
 //Save Type
-#620#  "* détecter automatiquement"
-#621#  "4-kbit EEPROM"
-#622#  "16-kbit EEPROM"
-#623#  "32-ko SRAM"
-#624#  "128-ko flash RAM"
+#620#  "Par défaut"
+#621#  "4 kbit EEPROM"
+#622#  "16 kbit EEPROM"
+#623#  "32 ko SRAM"
+#624#  "Flash RAM"
 
-//Shell Intergration Tab
-#640#  "Associer à Project64 :"
+//Shell Integration Tab
+#640#  "Associer l’extension de fichier :"
 
 //ROM Notes
-#660#  "&Statut :"
-#661#  "Notes (&noyau) :"
-#662#  "Notes (&plugin) :"
+#660#  "Statut ROM :"
+#661#  "Note noyau :"
+#662#  "Note plugin :"
+
+// Accelerator Selector
+#680#  "État du CPU :"
+#681#  "Menu objet :"
+#682#  "Touches actuelles :"
+#683#  "Sélectionner nouveau raccourci :"
+#684#  "Actuellement assigné à :"
+#685#  "Assigner"
+#686#  "Supprimer"
+#687#  "Tout Réinitialiser"
+#688#  "Aucun jeu lancé"
+#689#  "Un jeu est lancé"
+#690#  "Un jeu est lancé (fenêtré)"
+#691#  "Un jeu est lancé (plein écran)"
+
+// Frame Rate Option
+#700#  "Interruptions verticales par seconde"
+#701#  "Listes d’affichage par seconde"
+#702#  "Pourcentage de la vitesse normale"
+
+// Increase speed
+#710#  "Augmenter la vitesse du jeu"
+#711#  "Diminuer la vitesse du jeu"
+
+//Bottom page buttons
+#720#  "Réinitialiser la page"
+#721#  "Tout réinitialiser"
+#722#  "Appliquer"
 
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
-//ROM Info Title Title
-#800#  "Information sur la ROM"
+//ROM Info Title
+#800#  "Informations sur la ROM"
 
 //ROM Info Text
-#801#  "Nom interne"
-#802#  "Nom du fichier"
-#803#  "Lieu"
-#804#  "Taille"
-#805#  "ID de la cartouche"
-#806#  "Constructeur"
-#807#  "Pays"
-#808#  "CRC1"
-#809#  "CRC2"
-#810#  "Puce CIC"
+#801#  "Nom de la ROM :"
+#802#  "Nom du fichier :"
+#803#  "Emplacement :"
+#804#  "Taille de la ROM :"
+#805#  "ID cartouche :"
+#806#  "Développeur :"
+#807#  "Pays :"
+#808#  "CRC1 :"
+#809#  "CRC2 :"
+#810#  "Puce CIC :"
+#811#  "MD5 :"
 
 /*********************************************************************************
 * Cheats                                                                         *
 *********************************************************************************/
 //Cheat List
-#1000#  "Codes triche"
-#1001#  "Codes :"
-#1002#  "Notes :"
+#1000#  "Cheats"
+#1001#  "Cheats :"
+#1002#  " Notes : "
 #1003#  "Tout cocher"
-#1004#  "&Tout décocher"
+#1004#  "Tout décocher"
 
 //Add Cheat
-#1005#  "Ajouter un code"
+#1005#  "Ajouter un cheat"
 #1006#  "Nom :"
 #1007#  "Code :"
 #1008#  "Insérer"
-#1009#  "Effacer"
-#1010#  "Notes (code) : "
-#1011#  "Ajouter au fichier"
-#1022#  "Ajouter un code"
-#1023#  "Nouveau code"
-#1024#  "<adresse> <valeur>"
-#1025#  "Options :"
-#1026#  "<valeur> <objet>"
+#1009#  "Vider"
+#1010#  " Notes cheat : "
+#1011#  "Ajouter à la BDD"
 
 //Code extension
-#1012#  "Extensions des codes"
-#1013#  "Choisir une valeur à utiliser pour :"
+#1012#  "Extensions de code"
+#1013#  "Veuillez choisir une valeur à utiliser pour :"
 #1014#  "OK"
 #1015#  "Annuler"
 
 //Digital Value
-#1016#  "Chiffre de quantité"
-#1017#  "Choisir une valeur pour :"
+#1016#  "Nombre quantité"
+#1017#  "Veuillez choisir une valeur pour :"
 #1018#  "&Valeur"
-#1019#  "de"
-#1020#  "jusqu'à"
+#1019#  "depuis"
+#1020#  "vers"
 #1021#  "&Notes :"
+#1022#  "Ajouter un cheat"
+#1023#  "nouveau cheat"
+#1024#  "<adresse> <valeur>"
+#1025#  "Options :"
+#1026#  "<valeur> <label>"
 
 //Edit Cheat
-#1027#  "Editer le code"
-#1028#  "Mettre à jour"
+#1027#  "Éditer un cheat"
+#1028#  "Mettre à jour un cheat"
+#1029#  "Le cheat a été modifié.\n\nVoulez vous mettre à jour ?"
+#1030#  "Cheat mise à jour"
 
 //Cheat Popup Menu
-#1040#  "Ajouter un nouveau code..."
-#1041#  "Editer..."
-#1042#  "Supprimer"
+#1040#  "Ajouter un nouveau cheat…"
+#1041#  "Éditer"
+#1042#  "Effacer"
+
+// short-cut editor
+#1100#  "Réinitialiser les raccourcis"
+#1101#  "Êtes-vous sûr de vouloir réinitialiser les raccourcis?\n\nCette action ne peut pas être annulée."
+#1102#  "Menu fichier"
+#1103#  "Menu système"
+#1104#  "Options"
+#1105#  "Emplacements de sauvegarde"
 
 /*********************************************************************************
 * Messages                                                                       *
 *********************************************************************************/
-#2000#  "Pause"
-#2001#  "Reprise"
-#2002#  "Dans une boucle permanente qui ne peut pas être quittée.
-L'émulation va maintenant s'arrêter.
-
-Verifiez la ROM et ces réglages."
-#2003#  "Echec de l'allocation la mémoire"
-#2004#  "Le plugin vidéo par défaut ou sélectionné est manquant ou est invalide.
-
-Vérifiez que vous avez au moins un fichier plugin compatible dans le dossier des plugins."
-#2005#  "Le plugin audio par défaut ou sélectionné est manquant ou est invalide.
-
-Vérifiez que vous avez au moins un fichier plugin compatible dans le dossier des plugins."
-#2006#  "Le plugin RSP par défaut ou sélectionné est manquant ou est invalide.
-
-Vérifiez que vous avez installé proprement Project64 avec le dossier des plugins bien défini."
-#2007#  "Le plugin contrôles par défaut ou sélectionné est manquant ou est invalide.
-
-Vérifiez que vous avez au moins un fichier plugin compatible dans le dossier des plugins."
-#2008#  "Echec du chargement du plugin :"
-#2009#  "Echec du chargement du mot
-
-Vérifiez la ROM et ces réglages."
-#2010#  "Echec de l'ouverture de la sauvegarde rapide"
-#2011#  "Echec de l'ouverture de l'EEPROM"
-#2012#  "Echec de l'ouverture de la flash RAM"
-#2013#  "Echec de l'ouverture du mempak"
-#2014#  "La tentative d'ouverture du fichier zip a échoué.
-
-Fichier zip manquant ou corrompu - vérifiez le chemin et le fichier."
-#2015#  "La tentative d'ouverture du fichier a échoué."
-#2016#  "Une erreur s'est produite en essayant d'ouvrir le fichier zip."
-#2017#  "Le fichier chargé ne semble pas être une ROM N64 valide.
-
-Vérifiez vos ROMs avec GoodN64."
+#2000#  "*** CPU EN PAUSE ***"
+#2001#  "Reprise du CPU"
+#2002#  "Dans une boucle permanente dont il est impossible de sortir.\nL’émulation va maintenant s’arrêter.\n\nVérifiez la ROM et les paramètres de la ROM."
+#2003#  "L’allocation de mémoire a échoué"
+#2004#  "Le plugin vidéo sélectionné ou par défaut est manquant ou invalide.\n\nVous devez aller dans les paramètres et sélectionner un plugin vidéo (graphique).\nVérifiez que vous avez au moins un fichier plugin compatible dans votre répertoire de plugins."
+#2005#  "Le plugin audio sélectionné ou par défaut est manquant ou invalide.\n\nVous devez aller dans les paramètres et sélectionner un plugin audio (son).\nVérifiez que vous avez au moins un fichier plugin compatible dans votre répertoire de plugins."
+#2006#  "Le plugin RSP sélectionné ou par défaut est manquant ou invalide.\n\nVous devez aller dans les paramètres et sélectionner un plugin RSP (Reality Signal Processor).\nVérifiez que vous avez au moins un fichier plugin compatible dans votre répertoire de plugins."
+#2007#  "Le plugin input sélectionné ou par défaut est manquant ou invalide.\n\nVous devez aller dans les paramètres et sélectionner un plugin input (contrôleur).\nVérifiez que vous avez au moins un fichier plugin compatible dans votre répertoire de plugins."
+#2008#  "Échec du chargement du plugin :"
+#2009#  "Échec du chargement word.\n\nVérifier la ROM et les paramètres de la ROM."
+#2010#  "Échec à l’ouverture du fichier de sauvegarde"
+#2011#  "Échec à l’ouverture de l’EEPROM"
+#2012#  "Échec à l’ouverture de la RAM flash"
+#2013#  "Échec à l’ouverture du mempak"
+#2014#  "La tentative d’ouverture du fichier zip a échoué.\n\nIl est possible que le fichier zip soit corrompu – essayez de décompresser la ROM manuellement."
+#2015#  "La tentative d’ouverture du fichier a échoué."
+#2016#  "Une erreur s’est produite pendant l’ouverture du fichier zip."
+#2017#  "Le fichier chargé ne semble pas être une ROM N64 valide.\n\nVérifiez vos ROM avec GoodN64."
 #2018#  "Pays inconnu"
-#2019#  "Puce CIC inconnue"
+#2019#  "Puce CIC inconnu"
 #2020#  "Format de fichier inconnu"
-#2021#  "Action sur la mémoire inconnue
-
-Arrêt de l'émulation"
-#2022#  "OpCode R4300i non pris en charge à"
-#2023#  "Exécution à partir d'un espace non mappé.
-
-Vérifiez la ROM et ces réglages."
-#2024#  "La sauvegarde rapide ne semble pas correspondre à la ROM actuelle.
-
-Les sauvegardes rapides doivent être sauvegardées et chargées à partir d'une ROM
-100% identique, le pays et la version doivent être les mêmes en particulier.
-Le chargement de cette sauvegarde rapide pourrait causer un plantage du jeu/émulateur.
-
-Êtes-vous sur de vouloir continuer à charger ?"
-#2025#  "Erreur de l'application/noyau"
-#2026#  "Séquence du 'copyright' non trouvée dans le 'LUT'. Le jeu ne va plus fonctionner."
-#2027#  "Echec de la protection contre la copie"
-#2028#  "Changer un plugin nécessite que Project64 redémarre la ROM chargée.
-Si vous ne voulez pas perdre votre partie, répondez Non et réalisez une sauvegarde rapide d'abord.
-
-Changer les plugins et redémarrer le jeu maintenant ?"
+#2021#  "Action de la mémoire inconnue\n\nL’émulation s’est arrêtée."
+#2022#  "Opcode R4300i non pris en charge à"
+#2023#  "Exécution depuis un espace non mappé.\n\nVérifiez la ROM et les paramètres de ROM."
+#2024#  "Cette sauvegarde d’état ne semble pas correspondre à la ROM qui est lancée.\n\nLes états sauvegardés et chargés doivent être à 100 % identiques à la ROM.\nEn particulier la RÉGION et la VERSION doivent être identiques.\nLe chargement de cette sauvegarde va probablement faire planter le jeu ou l’émulateur.\n\nSouhaitez-vous le charger quand même ?"
+#2025#  "Erreur"
+#2026#  "La séquence de copyright n’a pas été trouvé dans la LUT. Le jeu ne fonctionnera plus."
+#2027#  "Échec de la protection de copie"
+#2028#  "Changer un plugin nécessite que Project64 redémarre la ROM lancée.\nSi vous ne voulez pas perdre votre progression, répondez non et sauvegardez l’état actuel d’abord.\n\nChanger les plugins et redémarrer maintenant ?"
 #2029#  "Changer les plugins"
-#2030#  "Emulation terminée"
-#2031#  "Emulation démarrée"
-#2032#  "Impossible de charger la sauvegarde rapide"
-#2033#  "Chargement effectué :"
-#2034#  "Sauvegarde effectuée :"
-#2035#  "Numéro actuel de la sauvegarde rapide"
-#2036#  "'Byteswapping' de la ROM"
-#2037#  "Attente du choix d'une ROM"
-#2038#  "Chargée"
-#2039#  "Chargement de la ROM"
-#2040#  "Vous ne pouvez pas ouvrir une ROM si tous les plugins (Vidéo, Audio, Contrôles & RSP) ne sont pas initialisés"
-#2041#  "Êtes-vous sur de vouloir effacer ce code ?"
-#2042#  "Effacer le code"
-#2043#  "Nom du code déjà utilisé, utilisez un autre nom"
-#2044#  "Vous avez atteint le nombre maximum de codes triche pour ce jeu"
+#2030#  "Émulation terminée"
+#2031#  "Émulation démarrée"
+#2032#  "Impossible de charger l’état"
+#2033#  "État chargé"
+#2034#  "État sauvegardé vers"
+#2035#  "Emplacement d’état"
+#2036#  "Byte-swapping image"
+#2037#  "Choisir une image N64"
+#2038#  "Chargé"
+#2039#  "Chargement de l’image"
+#2040#  "Impossible d’ouvrir une ROM car les plugins n’ont pas été initialisés."
+#2041#  "Êtes-vous sûr de vouloir effacer ceci ?"
+#2042#  "Effacer le cheat"
+#2043#  "Le nom du cheat est déjà utilisé."
+#2044#  "Vous avez atteint le nombre maximum de codes cheats pour ce jeu"
+#2045#  "Initialisation du plugin"
+#2046#  "Vous n’avez pas sélectionné de touche virtuelle à assigner à l’entrée de menu."
+#2047#  "Vous avez besoin de sélectionner une entrée de menu à laquelle assigner cette touche."
+#2048#  "Le raccourci a déjà été assigné à une autre entrée de menu."
+#2049#  "Aucun raccourci n’a été sélectionné pour être supprimé."
+#2050#  "ROM chargée. Émulation en attente de lancement."
+#2051#  "Project64 beta est réservé aux membres seulement.\n\nSi vous avez un compte sur pj64-emu.com, vous ne devriez pas voir cette erreur !!\nVeuillez nous contacter sur le site."
+#2052#  "Erreur du programme"
+#2053#  "Impossible de trouver le nom de fichier dans l’archive 7z"
+#2054#  "Émulation des graphismes bas niveau (LLE)"
+#2055#  "Les graphismes LLE ne sont pas à utiliser par tout le monde !!!\nIl est recommandé d’utiliser seulement ceci à des fins de test et non pour jouer.\n\nChanger pour les graphismes en mode LLE ?"
+#2056#  "Émulation audio haut niveau (HLE)"
+#2057#  "L’audio HLE nécessite un plugin tiers !!!\nSi vous n’utilisez pas un plugin audio tiers qui supporte le HLE, vous n’entendrez aucun son.\n\nChanger pour l’audio en mode HLE ?"
diff --git a/Lang/Japanese.pj.Lang b/Lang/Japanese.pj.Lang
index da0bd4885..779b3c9b8 100644
--- a/Lang/Japanese.pj.Lang
+++ b/Lang/Japanese.pj.Lang
@@ -177,7 +177,7 @@
 #320#  "ロムディレクトリを選択して下さい"
 
 //Messages
-#340#  "不明なロム? GoodN64を使用するかINIファイルをアップデートして下さい"
+#340#  "不明なロム? GoodN64を使用するかRDBファイルをアップデートして下さい"
 
 /*********************************************************************************
 * Options                                                                        *
@@ -233,9 +233,9 @@
 #466#  "表示形式によってフレームレートを変更する:"
 
 //ROM Browser Tab
-#480#  "最近開いたロムファイルの表示する数（最大10）:"
+#480#  "最近開いたロムファイルの表示する数(0～10):"
 #481#  "個"
-#482#  "最近開いたロムフォルダの表示する数（最大10）:"
+#482#  "最近開いたロムフォルダの表示する数(0～10):"
 #483#  "個"
 #484#  "ロムブラウザを使用する(&U)"
 #485#  "サブフォルダも検索(&S)"
@@ -282,6 +282,9 @@
 #534#  "関数検索方法:"
 #535#  "カスタム自己書換方法"
 #536#  "オーディオに同期"
+#537#  "AIカウント/バイト"
+#538#  "32bitエンジン"
+#539#  "DP割り込み遅延"
 
 //Core Styles
 #540#  "インタプリタ"
@@ -348,6 +351,11 @@
 #710#  "スピードを上げる"
 #711#  "スピードを下げる"
 
+//Bottom page buttons
+#720#  "この項目のリセット"
+#721#  "すべてリセット"
+#722#  "適用"
+
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
@@ -359,7 +367,7 @@
 #802#  "ファイル名:"
 #803#  "保存場所:"
 #804#  "ロムサイズ:"
-#805#  "ｶｰﾄﾘｯｼﾞID:"
+#805#  "カートリッジID:"
 #806#  "製造元:"
 #807#  "国情報:"
 #808#  "CRC1:"
diff --git a/Lang/Spanish.pj.Lang b/Lang/Spanish.pj.Lang
index c746b9c95..e82095789 100644
--- a/Lang/Spanish.pj.Lang
+++ b/Lang/Spanish.pj.Lang
@@ -5,14 +5,14 @@
 #1  #  "Español"		// LANGUAGE ID
 #2  #  "MELERIX"		// Author
 #3  #  "2.2"			// Version
-#4  #  "March, 2015"		// Date
+#4  #  "April, 2015"	// Date
 
 //About DLL Dialog
 #5  #  "Lenguaje Actual"
 #6  #  "Autor"
 #7  #  "Versión"
 #8  #  "Fecha"
-#9  #  "Visitar la Pagina Principal"
+#9  #  "Visitar la Página Principal"
 #10 #  "Base de datos de ROMs (.RDB)"
 #11 #  "Archivo de Códigos de Trucos (.CHT)"
 #12 #  "Información Extendida del ROM (.RDX)"
@@ -131,7 +131,7 @@
 #268#  "Hacer que la ventana quede por encima las demás ventanas"
 #269#  "Cambiar ajustes dentro del plugin de gráficos"
 #270#  "Cambiar ajustes dentro del plugin de audio"
-#271#  "Cambiar ajustes dentro del plugin de control (es decir definir las teclas)"
+#271#  "Cambiar ajustes dentro del plugin de control (es decir, definir las teclas)"
 #272#  "Cambiar ajustes dentro del plugin de RSP"
 #273#  "Mostrar uso de CPU del emulador dividido sobre diferentes recursos"
 #274#  "Ver/cambiar ajustes para esta aplicación"
@@ -177,7 +177,7 @@
 #320#  "Seleccionar directorio de ROMs actual"
 
 //Messages
-#340#  "ROM Dañado? Usa GoodN64 y comprueba por una RDB actualizada"
+#340#  "¿ROM Dañado? Usa GoodN64 y verifica que la RDB esté actualizada."
 
 /*********************************************************************************
 * Options                                                                        *
@@ -224,7 +224,7 @@
 #452#  "Seleccionar directorio de paquete de texturas"
 
 //Options Dialog
-#460#  "Pausar emulación cuando la ventana no este activa"
+#460#  "Pausar emulación cuando la ventana no esté activa"
 #461#  "Entrar en modo de pantalla completa al cargar un ROM"
 #462#  "Ocultar ajustes avanzados"
 #463#  "Recordar trucos seleccionados"
@@ -241,7 +241,7 @@
 #484#  "Usar navegador de ROMs"
 #485#  "Usar recursión de directorio"
 #486#  "Campos disponibles:"
-#487#  "Mostrar campos en este orden:"
+#487#  "Orden de campos:"
 #488#  "Agregar ->"
 #489#  "<- Remover"
 #490#  "Arriba"
@@ -254,7 +254,7 @@
 #502#  "Estilo de núcleo del CPU:"
 #503#  "Métodos self mod:"
 #504#  "Tamaño de memoria predeterminado:"
-#505#  "Vinculación avanzada de bloques:"
+#505#  "Vinculación avanzada de bloques"
 #506#  "Iniciar emulación cuando el ROM sea abierto"
 #507#  "Siempre sustituir los ajustes predeterminados con los de la RDB"
 #508#  "Comprimir automáticamente estados guardados"
@@ -269,7 +269,7 @@
 #520#  "Estilo de núcleo del CPU:"
 #521#  "Frecuencia de actualización de VI:"
 #522#  "Tamaño de memoria:"
-#523#  "Vinculación avanzada de bloques:"
+#523#  "Vinculación avanzada de bloques"
 #524#  "Tipo de guardado predeterminado:"
 #525#  "Factor de contador:"
 #526#  "Buffer de compilación ampliado"
@@ -284,7 +284,7 @@
 #535#  "Método self mod personalizado"
 #536#  "Sincronizar usando audio"
 #537#  "Contador de AI por byte"
-#538#  "Motor de 32-bit"
+#538#  "Motor de 32 bits"
 #539#  "Demorar interrupción DP"
 
 //Core Styles
@@ -342,6 +342,7 @@
 #689#  "Jugando Juego"
 #690#  "Jugando Juego (en ventana)"
 #691#  "Jugando Juego (pantalla completa)"
+#692#  "Detectar Tecla"
 
 // Frame Rate Option
 #700#  "Interrupciones verticales por segundo"
@@ -356,6 +357,7 @@
 #720#  "Reiniciar Página"
 #721#  "Reiniciar Todo"
 #722#  "Aplicar"
+#723#  "Cerrar"
 
 /*********************************************************************************
 * ROM Information                                                                *
@@ -398,7 +400,7 @@
 //Code extension
 #1012#  "Extensiones de Código"
 #1013#  "Por favor elige un valor a ser usado para:"
-#1014#  "Bien"
+#1014#  "Aceptar"
 #1015#  "Cancelar"
 
 //Digital Value
@@ -417,7 +419,7 @@
 //Edit Cheat
 #1027#  "Editar Truco"
 #1028#  "Actualizar Truco"
-#1029#  "El Truco ha sido cambiado.\n\nQuieres actualizar?"
+#1029#  "El Truco ha sido cambiado.\n\n¿Deseas actualizar?"
 #1030#  "Truco actualizado"
 
 //Cheat Popup Menu
@@ -427,7 +429,7 @@
 
 // short-cut editor
 #1100#  "Reiniciar accesos directos"
-#1101#  "Estás seguro de que quieres reiniciar los accesos directos?\n\nEsta acción no se puede deshacer."
+#1101#  "¿Estás seguro de que quieres reiniciar los accesos directos?\n\nEsta acción no se puede deshacer."
 #1102#  "Menú de Archivo"
 #1103#  "Menú de Sistema"
 #1104#  "Opciones"
@@ -438,33 +440,33 @@
 *********************************************************************************/
 #2000#  "*** CPU PAUSADO ***"
 #2001#  "CPU Reanudado"
-#2002#  "En un bucle permanente que no se puede salir. \nLa Emulación ahora se detendrá. \n\nComprueba el ROM y los Ajustes del ROM."
+#2002#  "En un bucle permanente del que no se puede salir.\nLa Emulación se detendrá ahora.\n\nComprueba el ROM y sus ajustes."
 #2003#  "Error al asignar memoria"
-#2004#  "El plugin predeterminado o seleccionado de vídeo falta o es invalido. \n\nNecesitas entrar en Ajustes y seleccionar un plugin de vídeo (gráficos).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
-#2005#  "El plugin predeterminado o seleccionado de audio falta o es invalido. \n\nNecesitas entrar en Ajustes y seleccionar un plugin de audio (sonido).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
-#2006#  "El plugin predeterminado o seleccionado de RSP falta o es invalido. \n\nNecesitas entrar en Ajustes y seleccionar un plugin RSP (Reality Signal Processor).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
-#2007#  "El plugin predeterminado o seleccionado de entrada falta o es invalido. \n\nNecesitas entrar en Ajustes y seleccionar un plugin de vídeo (gráficos).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
+#2004#  "El plugin predeterminado o seleccionado de vídeo no se encuentra o es inválido.\n\nNecesitas entrar en Ajustes y seleccionar un plugin de vídeo (gráficos).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
+#2005#  "El plugin predeterminado o seleccionado de audio no se encuentra o es inválido.\n\nNecesitas entrar en Ajustes y seleccionar un plugin de audio (sonido).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
+#2006#  "El plugin predeterminado o seleccionado de RSP no se encuentra o es inválido.\n\nNecesitas entrar en Ajustes y seleccionar un plugin RSP (Reality Signal Processor).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
+#2007#  "El plugin predeterminado o seleccionado de entrada no se encuentra o es inválido.\n\nNecesitas entrar en Ajustes y seleccionar un plugin de entrada (controles).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
 #2008#  "Error al cargar plugin:"
 #2009#  "Error al cargar palabra\n\nComprueba el ROM y los ajustes del ROM."
 #2010#  "Error al abrir el archivo de guardado"
 #2011#  "Error al abrir EEPROM"
 #2012#  "Error al abrir flash RAM"
 #2013#  "Error al abrir mempak"
-#2014#  "Intento de abrir el archivo zip fallido. \n\nProbablemente un archivo zip corrupto - prueba descomprimir el ROM manualmente."
-#2015#  "Intento de abrir el archivo fallido."
-#2016#  "Ocurrió un error cuando se intentaba abrir el archivo zip."
-#2017#  "El archivo cargado no parece ser un ROM de N64 valido. \n\nComprueba tus ROMs con GoodN64."
+#2014#  "Error al intentar abrir el archivo ZIP.\n\nEl archivo podría estar corrupto - Intenta descomprimir el ROM manualmente."
+#2015#  "Error al intentar abrir el archivo."
+#2016#  "Ocurrió un error cuando se intentaba abrir el archivo ZIP."
+#2017#  "El archivo cargado no parece ser un ROM de N64 válido. \n\nVerifica tus ROMs con GoodN64."
 #2018#  "País desconocido"
 #2019#  "Chip CIC desconocido"
 #2020#  "Formato de archivo desconocido"
 #2021#  "Acción de memoria desconocida\n\nEmulación detenida"
 #2022#  "OpCode R4300i no manejado en"
-#2023#  "Ejecutando desde un espacio no-mapeado.\n\nComprueba el ROM y los ajustes del ROM."
-#2024#  "Este estado guardado no parece coincidir con el ROM en ejecución. \n\nLos estados deben ser guardados y cargados entre ROMs 100% idénticos. \nEn particular la REGION y VERSION necesita ser la misma. \nCargar esta estado es probable que cause al juego y/o al emulador se bloquee. \n\nEstás seguro de que quieres continuar cargando?"
+#2023#  "Ejecutando desde un espacio no mapeado.\n\nComprueba el ROM y los ajustes del ROM."
+#2024#  "Este estado guardado no coincide con el ROM en ejecución.\n\nLos estados deben ser guardados y cargados entre ROMs 100% idénticos.\nEn particular, la REGIÓN y VERSIÓN necesita ser la misma.\nCargar esta estado podría causar que el juego y/o emulador se bloqueen.\n\n¿Estás seguro de que quieres continuar cargando?"
 #2025#  "Error"
-#2026#  "Secuencia de copyright no encontrada en el LUT.  El Juego ya no funcionara."
+#2026#  "Secuencia de copyright no encontrada en el LUT.  El juego ya no funcionará."
 #2027#  "Falla en la Protección de Copia"
-#2028#  "Cambiar un plugin requiere que Project64 reinicie un ROM en ejecución. \nSi no quieres perder tu posición, responde No y guarda el estado actual primero. \n\nCambiar plugins y reiniciar el ROM ahora?"
+#2028#  "Cambiar un plugin requiere que Project64 reinicie un ROM en ejecución.\nSi no quieres perder tu posición, responde No y guarda el estado actual primero.\n\n¿Cambiar plugins y reiniciar el ROM ahora?"
 #2029#  "Cambiar Plugins"
 #2030#  "Emulación finalizada"
 #2031#  "Emulación iniciada"
@@ -477,20 +479,20 @@
 #2038#  "Cargada"
 #2039#  "Cargando imagen"
 #2040#  "No se puede abrir un ROM porque los plugins no se han inicializado correctamente."
-#2041#  "Estás seguro de que realmente quieres borrar esto?"
+#2041#  "¿Estás seguro de que realmente quieres borrar esto?"
 #2042#  "Borrar Truco"
 #2043#  "El nombre del truco ya está en uso."
 #2044#  "Haz alcanzado la cantidad máxima de trucos para este ROM."
 #2045#  "Inicializando el plugin"
-#2046#  "No has seleccionado una tecla virtual para asignarla al elemento del menú."
-#2047#  "Necesitas seleccionar un elemento del menú para asignarle esta tecla a."
+#2046#  "No has seleccionado una tecla virtual para asignar al elemento del menú."
+#2047#  "Necesitas seleccionar un elemento del menú al cual asignarle esta tecla."
 #2048#  "El acceso directo ya está asignado a otro elemento del menú."
 #2049#  "Ningún acceso directo ha sido seleccionado para ser removido."
-#2050#  "ROM cargada. Esperando por la emulación para iniciar."
-#2051#  "Project64 beta es solo para miembros.\n\nSi tienes una cuenta en pj64.net, no deberías estar viendo este error!!\nPor favor contacta con nosotros en el sitio."
+#2050#  "ROM cargado. Esperando el inicio de la emulación."
+#2051#  "Project64 Beta es sólo para miembros.\n\n¡¡Si tienes una cuenta en pj64-emu.com, no deberías estar viendo este error!!\nPor favor contacta con nosotros en el sitio."
 #2052#  "Error del Programa"
 #2053#  "Fallo al encontrar el nombre de archivo en archivo 7z"
 #2054#  "Gráficos de Emulación de Bajo Nivel"
-#2055#  "Los Gráficos LLE no son para uso general!!!\nEs aconsejable que tu solo uses esto para pruebas, y no para jugar juegos.\n\nCambiar a Gráficos LLE?"
+#2055#  "¡¡¡Los Gráficos LLE no son para uso general!!!\nEs aconsejable que sólo uses esto para pruebas, y no para jugar juegos.\n\n¿Cambiar a Gráficos LLE?"
 #2056#  "Audio de Emulación de Alto Nivel"
-#2057#  "El Audio HLE requiere un plugin de terceros!!!\nSi no usas un plugin de audio terceros que soporte HLE, no oirás ningún sonido.\n\nCambiar a Audio HLE?"
+#2057#  "¡¡¡El Audio HLE requiere un plugin de terceros!!!\nSi no usas un plugin de audio terceros que soporte HLE, no oirás ningún sonido.\n\n¿Cambiar a Audio HLE?"
diff --git a/Project64.sln b/Project64.sln
new file mode 100644
index 000000000..55bdfbdfd
Binary files /dev/null and b/Project64.sln differ
diff --git a/Project64.vs2008.sln b/Project64.vs2008.sln
index 676b82a9c..544859f62 100644
--- a/Project64.vs2008.sln
+++ b/Project64.vs2008.sln
@@ -39,6 +39,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Glide64\G
 		{25A25249-C284-4C5A-8DC2-26FC3EB13703} = {25A25249-C284-4C5A-8DC2-26FC3EB13703}
 		{B4A4B994-9111-42B1-93C2-6F1CA8BC4421} = {B4A4B994-9111-42B1-93C2-6F1CA8BC4421}
 		{2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {2DADDAA5-0F57-46ED-A974-747908DDC7F3}
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
 		{8B9961B1-88D9-4EA3-A752-507A00DD9F3D} = {8B9961B1-88D9-4EA3-A752-507A00DD9F3D}
 		{427F1DCD-3BED-4010-9322-077A4C06D871} = {427F1DCD-3BED-4010-9322-077A4C06D871}
 		{93CFEDF3-9A75-4484-B169-D9D8074F5AC2} = {93CFEDF3-9A75-4484-B169-D9D8074F5AC2}
@@ -79,6 +80,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SortRdb", "Source\SortRdb\S
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev20\NRage_Input_V2.vcproj", "{FD617E80-9E40-4138-85DA-B94633972E6A}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "Source\3rd Party\sdl\sdl2.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -156,6 +159,10 @@ Global
 		{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.Build.0 = Debug|Win32
 		{FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.ActiveCfg = Release|Win32
 		{FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.Build.0 = Release|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.ActiveCfg = Debug|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Debug|Win32.Build.0 = Debug|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.ActiveCfg = Release|Win32
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -165,6 +172,7 @@ Global
 		{731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
 		{1379F817-7E3D-4F58-9C22-7E364E46E842} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
 		{3326E128-33AF-422C-BB7C-67CC6B915610} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
+		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
 		{462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
 		{A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
 		{2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
diff --git a/Project64.vs2013.sln b/Project64.vs2013.sln
deleted file mode 100644
index 32b6005d2..000000000
--- a/Project64.vs2013.sln
+++ /dev/null
@@ -1,140 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wxWidgets", "wxWidgets", "{1379F817-7E3D-4F58-9C22-7E364E46E842}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glide", "Glide", "{9FE699A5-41C3-4441-92AB-639B3D77DE26}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Source\Common\Common.vcxproj", "{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project64\Project64.vcxproj", "{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RSP", "Source\RSP\RSP.vcxproj", "{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Settings", "Source\Settings\Settings.vcxproj", "{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zip", "Source\3rd Party\7zip\7zip.vcxproj", "{3326E128-33AF-422C-BB7C-67CC6B915610}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTL", "Source\3rd Party\WTL\WTL.vcxproj", "{4BC6906B-213E-40D7-9FC7-1A93E228393D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "Source\3rd Party\zlib\zlib.vcxproj", "{731BD205-2826-4631-B7AF-117658E88DBC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64Setup", "Source\Installer\Installer.vcxproj", "{360A34F3-3172-4B09-8BC9-B3FBEE677863}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Glide64\Glide64.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "Source\3rd Party\wx\wx_core.vcxproj", "{93447136-FACD-4740-8F35-FC46FB4A9E82}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "Source\3rd Party\wx\wx_base.vcxproj", "{427F1DCD-3BED-4010-9322-077A4C06D871}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "Source\3rd Party\wx\wx_wxjpeg.vcxproj", "{93CFEDF3-9A75-4484-B169-D9D8074F5AC2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "Source\3rd Party\wx\wx_wxpng.vcxproj", "{05B9CB11-12D1-47CD-8E4A-88E12162119B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "Source\3rd Party\wx\wx_wxzlib.vcxproj", "{25A25249-C284-4C5A-8DC2-26FC3EB13703}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Glitch64\Glitch64.vcxproj", "{462C2608-182F-452C-944F-AF201E19300B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\GlideHQ\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev20\NRage_Input_V2.vcxproj", "{FD617E80-9E40-4138-85DA-B94633972E6A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Debug|Win32.Build.0 = Debug|Win32
-		{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.ActiveCfg = Release|Win32
-		{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}.Release|Win32.Build.0 = Release|Win32
-		{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Debug|Win32.Build.0 = Debug|Win32
-		{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|Win32.ActiveCfg = Release|Win32
-		{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}.Release|Win32.Build.0 = Release|Win32
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Debug|Win32.Build.0 = Debug|Win32
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.ActiveCfg = Release|Win32
-		{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}.Release|Win32.Build.0 = Release|Win32
-		{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Debug|Win32.Build.0 = Debug|Win32
-		{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.ActiveCfg = Release|Win32
-		{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}.Release|Win32.Build.0 = Release|Win32
-		{3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3326E128-33AF-422C-BB7C-67CC6B915610}.Debug|Win32.Build.0 = Debug|Win32
-		{3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.ActiveCfg = Release|Win32
-		{3326E128-33AF-422C-BB7C-67CC6B915610}.Release|Win32.Build.0 = Release|Win32
-		{4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4BC6906B-213E-40D7-9FC7-1A93E228393D}.Debug|Win32.Build.0 = Debug|Win32
-		{4BC6906B-213E-40D7-9FC7-1A93E228393D}.Release|Win32.ActiveCfg = Release|Win32
-		{4BC6906B-213E-40D7-9FC7-1A93E228393D}.Release|Win32.Build.0 = Release|Win32
-		{731BD205-2826-4631-B7AF-117658E88DBC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{731BD205-2826-4631-B7AF-117658E88DBC}.Debug|Win32.Build.0 = Debug|Win32
-		{731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.ActiveCfg = Release|Win32
-		{731BD205-2826-4631-B7AF-117658E88DBC}.Release|Win32.Build.0 = Release|Win32
-		{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Debug|Win32.ActiveCfg = Debug|Win32
-		{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.ActiveCfg = Release|Win32
-		{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.Build.0 = Release|Win32
-		{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.Build.0 = Debug|Win32
-		{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.ActiveCfg = Release|Win32
-		{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32
-		{93447136-FACD-4740-8F35-FC46FB4A9E82}.Debug|Win32.ActiveCfg = Debug|Win32
-		{93447136-FACD-4740-8F35-FC46FB4A9E82}.Debug|Win32.Build.0 = Debug|Win32
-		{93447136-FACD-4740-8F35-FC46FB4A9E82}.Release|Win32.ActiveCfg = Release|Win32
-		{93447136-FACD-4740-8F35-FC46FB4A9E82}.Release|Win32.Build.0 = Release|Win32
-		{427F1DCD-3BED-4010-9322-077A4C06D871}.Debug|Win32.ActiveCfg = Debug|Win32
-		{427F1DCD-3BED-4010-9322-077A4C06D871}.Debug|Win32.Build.0 = Debug|Win32
-		{427F1DCD-3BED-4010-9322-077A4C06D871}.Release|Win32.ActiveCfg = Release|Win32
-		{427F1DCD-3BED-4010-9322-077A4C06D871}.Release|Win32.Build.0 = Release|Win32
-		{93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Debug|Win32.Build.0 = Debug|Win32
-		{93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Release|Win32.ActiveCfg = Release|Win32
-		{93CFEDF3-9A75-4484-B169-D9D8074F5AC2}.Release|Win32.Build.0 = Release|Win32
-		{05B9CB11-12D1-47CD-8E4A-88E12162119B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{05B9CB11-12D1-47CD-8E4A-88E12162119B}.Debug|Win32.Build.0 = Debug|Win32
-		{05B9CB11-12D1-47CD-8E4A-88E12162119B}.Release|Win32.ActiveCfg = Release|Win32
-		{05B9CB11-12D1-47CD-8E4A-88E12162119B}.Release|Win32.Build.0 = Release|Win32
-		{25A25249-C284-4C5A-8DC2-26FC3EB13703}.Debug|Win32.ActiveCfg = Debug|Win32
-		{25A25249-C284-4C5A-8DC2-26FC3EB13703}.Debug|Win32.Build.0 = Debug|Win32
-		{25A25249-C284-4C5A-8DC2-26FC3EB13703}.Release|Win32.ActiveCfg = Release|Win32
-		{25A25249-C284-4C5A-8DC2-26FC3EB13703}.Release|Win32.Build.0 = Release|Win32
-		{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.Build.0 = Debug|Win32
-		{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.ActiveCfg = Release|Win32
-		{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.Build.0 = Release|Win32
-		{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32
-		{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32
-		{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32
-		{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.Build.0 = Debug|Win32
-		{FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.ActiveCfg = Release|Win32
-		{FD617E80-9E40-4138-85DA-B94633972E6A}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1379F817-7E3D-4F58-9C22-7E364E46E842} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
-		{3326E128-33AF-422C-BB7C-67CC6B915610} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
-		{4BC6906B-213E-40D7-9FC7-1A93E228393D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
-		{731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
-		{A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
-		{93447136-FACD-4740-8F35-FC46FB4A9E82} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
-		{427F1DCD-3BED-4010-9322-077A4C06D871} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
-		{93CFEDF3-9A75-4484-B169-D9D8074F5AC2} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
-		{05B9CB11-12D1-47CD-8E4A-88E12162119B} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
-		{25A25249-C284-4C5A-8DC2-26FC3EB13703} = {1379F817-7E3D-4F58-9C22-7E364E46E842}
-		{462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
-		{2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
-	EndGlobalSection
-EndGlobal
diff --git a/PropertySheets/Debug.props b/PropertySheets/Debug.props
index b2812cc1e..ed3d9416f 100644
--- a/PropertySheets/Debug.props
+++ b/PropertySheets/Debug.props
@@ -1,32 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <SmallerTypeCheck>true</SmallerTypeCheck>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <ProfileGuidedDatabase />
-    </Link>
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
+      <OmitFramePointers>false</OmitFramePointers>
+      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <SmallerTypeCheck>true</SmallerTypeCheck>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
diff --git a/PropertySheets/Debug.vsprops b/PropertySheets/Debug.vsprops
index 12da0c6e3..3e94c6fdb 100644
--- a/PropertySheets/Debug.vsprops
+++ b/PropertySheets/Debug.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
diff --git a/PropertySheets/Default.vsprops b/PropertySheets/Default.vsprops
index 6b9616573..91126dca7 100644
--- a/PropertySheets/Default.vsprops
+++ b/PropertySheets/Default.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -69,7 +69,7 @@
 	/>
 	<Tool
 		Name="VCLibrarianTool"
-		OutputFile="$(OutDir)\lib\$(ProjectName).lib"
+		OutputFile="$(OutDir)\$(ProjectName).lib"
 		UseUnicodeResponseFiles="true"
 		LinkLibraryDependencies="true"
 		AdditionalLibraryDirectories=""
diff --git a/PropertySheets/Win32.Debug.props b/PropertySheets/Platform.Debug.props
similarity index 52%
rename from PropertySheets/Win32.Debug.props
rename to PropertySheets/Platform.Debug.props
index 16f18ab90..9db2d28c1 100644
--- a/PropertySheets/Win32.Debug.props
+++ b/PropertySheets/Platform.Debug.props
@@ -1,13 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Win32.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Platform.props" />
+    <Import Project="Debug.props" />
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/PropertySheets/Win32.Release.props b/PropertySheets/Platform.Release.props
similarity index 52%
rename from PropertySheets/Win32.Release.props
rename to PropertySheets/Platform.Release.props
index 75f0422da..73e73ad66 100644
--- a/PropertySheets/Win32.Release.props
+++ b/PropertySheets/Platform.Release.props
@@ -1,13 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Win32.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Platform.props" />
+    <Import Project="Release.props" />
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/PropertySheets/Win32.props b/PropertySheets/Platform.props
similarity index 82%
rename from PropertySheets/Win32.props
rename to PropertySheets/Platform.props
index bbd03a1be..d7b451c62 100644
--- a/PropertySheets/Win32.props
+++ b/PropertySheets/Platform.props
@@ -1,195 +1,221 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\$(Configuration)\$(ProjectName)\</IntDir>
-    <ExtensionsToDeleteOnClean>*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-    <LinkIncremental>false</LinkIncremental>
-    <LinkDelaySign>false</LinkDelaySign>
-    <EmbedManifest>true</EmbedManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'">
-    <OutDir>$(SolutionDir)bin\$(Configuration)\lib\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <PropertyGroup Label="UserMacros">
-    <ROOT>$(SolutionDir)</ROOT>
-    <SRC>$(ROOT)Source\</SRC>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="ROOT">
-      <Value>$(ROOT)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SRC">
-      <Value>$(SRC)</Value>
-    </BuildMacro>
-  </ItemGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <BuildLog>
-      <Path>$(IntDir)BuildLog.htm</Path>
-    </BuildLog>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(OutDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\;..\;..\3rd Party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <PreprocessToFile>false</PreprocessToFile>
-      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
-      <PreprocessKeepComments>false</PreprocessKeepComments>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>Async</ExceptionHandling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <StructMemberAlignment>Default</StructMemberAlignment>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <FloatingPointExceptions>false</FloatingPointExceptions>
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <AdditionalOptions />
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <OpenMPSupport>false</OpenMPSupport>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <ExpandAttributedSource>false</ExpandAttributedSource>
-      <AssemblerOutput />
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)vc90.pdb</ProgramDataBaseFileName>
-      <GenerateXMLDocumentationFiles>false</GenerateXMLDocumentationFiles>
-      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
-      <BrowseInformation />
-      <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>false</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <CompileAs>Default</CompileAs>
-      <ShowIncludes>false</ShowIncludes>
-      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
-      <EnablePREfast>false</EnablePREfast>
-      <UseFullPaths>false</UseFullPaths>
-      <OmitDefaultLibName>false</OmitDefaultLibName>
-      <ErrorReporting>Prompt</ErrorReporting>
-    </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
-      <UseUnicodeResponseFiles>true</UseUnicodeResponseFiles>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-    </Lib>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Link>
-      <RegisterOutput>false</RegisterOutput>
-      <PerUserRedirection>false</PerUserRedirection>
-      <AdditionalOptions>/IGNORE:4199 /OPT:ICF=3 %(AdditionalOptions)</AdditionalOptions>
-      <ShowProgress>NotSet</ShowProgress>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile />
-      <DelayLoadDLLs>advapi32.dll;userenv.dll;shell32.dll;shlwapi.dll;ws2_32.dll;version.dll;wtsapi32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <IgnoreEmbeddedIDL>false</IgnoreEmbeddedIDL>
-      <TypeLibraryResourceID>1</TypeLibraryResourceID>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AssemblyDebug />
-      <ProgramDatabaseFile>$(TargetDir)pdb/$(TargetName).pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(TargetDir)map/$(TargetName).map</MapFileName>
-      <MapExports>false</MapExports>
-      <HeapReserveSize>0</HeapReserveSize>
-      <HeapCommitSize>0</HeapCommitSize>
-      <StackReserveSize>0</StackReserveSize>
-      <StackCommitSize>0</StackCommitSize>
-      <LargeAddressAware />
-      <TerminalServerAware />
-      <SwapRunFromCD>false</SwapRunFromCD>
-      <SwapRunFromNET>false</SwapRunFromNET>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ProfileGuidedDatabase />
-      <NoEntryPoint>false</NoEntryPoint>
-      <SetChecksum>false</SetChecksum>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <FixedBaseAddress>false</FixedBaseAddress>
-      <DataExecutionPrevention />
-      <TurnOffAssemblyGeneration>false</TurnOffAssemblyGeneration>
-      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
-      <ImportLibrary>$(TargetDir)lib/$(TargetName).lib</ImportLibrary>
-      <Profile>false</Profile>
-      <CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute>
-      <CLRImageType>Default</CLRImageType>
-      <LinkErrorReporting>PromptImmediately</LinkErrorReporting>
-      <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
-      <SubSystem>Windows</SubSystem>
-      <MinimumRequiredVersion />
-    </Link>
-    <Midl>
-      <AdditionalIncludeDirectories>.;$(SRC);$(SRC)\3rd Party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <WarningLevel>3</WarningLevel>
-      <WarnAsError>false</WarnAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DefaultCharType>Unsigned</DefaultCharType>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <GenerateTypeLibrary>true</GenerateTypeLibrary>
-      <TypeLibraryName>$(IntDir)%(Filename).tlb</TypeLibraryName>
-      <HeaderFileName>%(Filename)_h.h</HeaderFileName>
-      <DllDataFileName />
-      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
-      <EnableErrorChecks>All</EnableErrorChecks>
-      <ErrorCheckAllocations>false</ErrorCheckAllocations>
-      <ErrorCheckBounds>false</ErrorCheckBounds>
-      <ErrorCheckEnumRange>false</ErrorCheckEnumRange>
-      <ErrorCheckRefPointers>false</ErrorCheckRefPointers>
-      <ErrorCheckStubData>false</ErrorCheckStubData>
-      <ValidateAllParameters>true</ValidateAllParameters>
-      <StructMemberAlignment>NotSet</StructMemberAlignment>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0000</Culture>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <ShowProgress>false</ShowProgress>
-      <ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName>
-    </ResourceCompile>
-    <Manifest>
-      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <VerboseOutput>false</VerboseOutput>
-      <GenerateCatalogFiles>false</GenerateCatalogFiles>
-      <UpdateFileHashes>false</UpdateFileHashes>
-    </Manifest>
-    <ManifestResourceCompile>
-      <ResourceOutputFileName>$(IntDir)$(TargetFileName).embed.manifest.res</ResourceOutputFileName>
-    </ManifestResourceCompile>
-    <Xdcmake>
-      <DocumentLibraryDependencies>true</DocumentLibraryDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(TargetDir)$(TargetName).xml</OutputFile>
-    </Xdcmake>
-  </ItemDefinitionGroup>
-  <ItemGroup />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v140_xp</PlatformToolset>
+  </PropertyGroup>
+
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  
+  <!-- All platforms settings -->
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(Configuration)\$(ProjectName)\</IntDir>
+    <ExtensionsToDeleteOnClean>*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath);$(ExtensionsToDeleteOnClean)</ExtensionsToDeleteOnClean>
+    <IgnoreImportLibrary>false</IgnoreImportLibrary>
+    <LinkIncremental>false</LinkIncremental>
+    <EmbedManifest>true</EmbedManifest>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(ConfigurationType)'=='StaticLibrary'">
+    <OutDir>$(SolutionDir)bin\$(Configuration)\lib\</OutDir>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+  <PropertyGroup Label="UserMacros">
+    <ROOT>$(SolutionDir)</ROOT>
+    <SRC>$(ROOT)Source\</SRC>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <BuildMacro Include="ROOT">
+      <Value>$(ROOT)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SRC">
+      <Value>$(SRC)</Value>
+    </BuildMacro>
+  </ItemGroup>
+
+  <ItemDefinitionGroup>
+    <BuildLog>
+      <Path>$(IntDir)BuildLog.htm</Path>
+    </BuildLog>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(OutDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\;..\;..\3rd Party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <PreprocessToFile>false</PreprocessToFile>
+      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
+      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>true</MinimalRebuild>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <SmallerTypeCheck>false</SmallerTypeCheck>
+      <StructMemberAlignment>Default</StructMemberAlignment>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32'">NoExtensions</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32' AND ('$(PlatformToolset)'=='v90' OR '$(PlatformToolset)'=='v100')">NotSet</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>  
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <OpenMPSupport>false</OpenMPSupport>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
+      <ExpandAttributedSource>false</ExpandAttributedSource>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)vc$(VisualStudioVersion).pdb</ProgramDataBaseFileName>
+      <GenerateXMLDocumentationFiles>false</GenerateXMLDocumentationFiles>
+      <XMLDocumentationFileName>$(IntDir)</XMLDocumentationFileName>
+      <BrowseInformationFile>$(IntDir)</BrowseInformationFile>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <ShowIncludes>false</ShowIncludes>
+      <UndefineAllPreprocessorDefinitions>false</UndefineAllPreprocessorDefinitions>
+      <EnablePREfast>false</EnablePREfast>
+      <UseFullPaths>false</UseFullPaths>
+      <OmitDefaultLibName>false</OmitDefaultLibName>
+      <ErrorReporting>Prompt</ErrorReporting>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
+      <UseUnicodeResponseFiles>true</UseUnicodeResponseFiles>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Lib>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Link>
+      <RegisterOutput>false</RegisterOutput>
+      <PerUserRedirection>false</PerUserRedirection>
+      <AdditionalOptions>/IGNORE:4199 /OPT:ICF=3 %(AdditionalOptions)</AdditionalOptions>
+      <ShowProgress>NotSet</ShowProgress>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ManifestFile>$(IntDir)$(TargetFileName).intermediate.manifest</ManifestFile>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile />
+      <DelayLoadDLLs>advapi32.dll;userenv.dll;shell32.dll;shlwapi.dll;ws2_32.dll;version.dll;wtsapi32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <IgnoreEmbeddedIDL>false</IgnoreEmbeddedIDL>
+      <TypeLibraryResourceID>1</TypeLibraryResourceID>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(TargetDir)pdb/$(TargetName).pdb</ProgramDatabaseFile>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapFileName>$(TargetDir)map/$(TargetName).map</MapFileName>
+      <MapExports>false</MapExports>
+      <HeapReserveSize>0</HeapReserveSize>
+      <HeapCommitSize>0</HeapCommitSize>
+      <StackReserveSize>0</StackReserveSize>
+      <StackCommitSize>0</StackCommitSize>
+      <SwapRunFromCD>false</SwapRunFromCD>
+      <SwapRunFromNET>false</SwapRunFromNET>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <NoEntryPoint>false</NoEntryPoint>
+      <SetChecksum>false</SetChecksum>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <TurnOffAssemblyGeneration>false</TurnOffAssemblyGeneration>
+      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
+      <ImportLibrary>$(TargetDir)lib/$(TargetName).lib</ImportLibrary>
+      <Profile>false</Profile>
+      <CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute>
+      <CLRImageType>Default</CLRImageType>
+      <LinkErrorReporting>PromptImmediately</LinkErrorReporting>
+      <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
+    </Link>
+    <Midl>
+      <AdditionalIncludeDirectories>.;$(SRC);$(SRC)\3rd Party;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <WarningLevel>3</WarningLevel>
+      <WarnAsError>false</WarnAsError>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DefaultCharType>Unsigned</DefaultCharType>
+      <GenerateStublessProxies>true</GenerateStublessProxies>
+      <GenerateTypeLibrary>true</GenerateTypeLibrary>
+      <TypeLibraryName>$(IntDir)%(Filename).tlb</TypeLibraryName>
+      <HeaderFileName>%(Filename)_h.h</HeaderFileName>
+      <InterfaceIdentifierFileName>%(Filename)_i.c</InterfaceIdentifierFileName>
+      <ProxyFileName>%(Filename)_p.c</ProxyFileName>
+      <EnableErrorChecks>All</EnableErrorChecks>
+      <ErrorCheckAllocations>false</ErrorCheckAllocations>
+      <ErrorCheckBounds>false</ErrorCheckBounds>
+      <ErrorCheckEnumRange>false</ErrorCheckEnumRange>
+      <ErrorCheckRefPointers>false</ErrorCheckRefPointers>
+      <ErrorCheckStubData>false</ErrorCheckStubData>
+      <ValidateAllParameters>true</ValidateAllParameters>
+      <StructMemberAlignment>NotSet</StructMemberAlignment>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0000</Culture>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <ShowProgress>false</ShowProgress>
+      <ResourceOutputFileName>$(IntDir)%(Filename).res</ResourceOutputFileName>
+    </ResourceCompile>
+    <Manifest>
+      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <VerboseOutput>false</VerboseOutput>
+      <GenerateCatalogFiles>false</GenerateCatalogFiles>
+      <UpdateFileHashes>false</UpdateFileHashes>
+    </Manifest>
+    <ManifestResourceCompile>
+      <ResourceOutputFileName>$(IntDir)$(TargetFileName).embed.manifest.res</ResourceOutputFileName>
+    </ManifestResourceCompile>
+    <Xdcmake>
+      <DocumentLibraryDependencies>true</DocumentLibraryDependencies>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(TargetDir)$(TargetName).xml</OutputFile>
+    </Xdcmake>
+  </ItemDefinitionGroup>
+  <!-- END common platform settings -->
+  
+  <!-- Win32 -->
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <!-- END Win32 -->
+  
+  <!-- x64 -->
+  <PropertyGroup Condition="'$(Platform)'=='x64'">
+    <OutDir>$(SolutionDir)bin\$(Configuration)64\</OutDir>
+    <IntDir>$(SolutionDir)build\$(Configuration)64\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(ConfigurationType)|$(Platform)'=='StaticLibrary|x64'">
+    <OutDir>$(SolutionDir)bin\$(Configuration)64\lib\</OutDir>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+    <Link>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <!-- END x64 -->
+
 </Project>
\ No newline at end of file
diff --git a/PropertySheets/Release.props b/PropertySheets/Release.props
index b22c81a3e..b2f7c5eac 100644
--- a/PropertySheets/Release.props
+++ b/PropertySheets/Release.props
@@ -1,30 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <ProfileGuidedDatabase />
-    </Link>
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </Midl>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <OmitFramePointers>false</OmitFramePointers>
+      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SmallerTypeCheck>false</SmallerTypeCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
 </Project>
\ No newline at end of file
diff --git a/PropertySheets/Release.vsprops b/PropertySheets/Release.vsprops
index 61b6f3b2d..3cd19af07 100644
--- a/PropertySheets/Release.vsprops
+++ b/PropertySheets/Release.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
diff --git a/PropertySheets/Win32.Debug.vsprops b/PropertySheets/Win32.Debug.vsprops
index 1d669a6e6..3842f0408 100644
--- a/PropertySheets/Win32.Debug.vsprops
+++ b/PropertySheets/Win32.Debug.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
diff --git a/PropertySheets/Win32.Release.vsprops b/PropertySheets/Win32.Release.vsprops
index 36310c7ed..df71c8921 100644
--- a/PropertySheets/Win32.Release.vsprops
+++ b/PropertySheets/Win32.Release.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
diff --git a/PropertySheets/Win32.vsprops b/PropertySheets/Win32.vsprops
index 8548eafc5..b586673a8 100644
--- a/PropertySheets/Win32.vsprops
+++ b/PropertySheets/Win32.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1251"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
diff --git a/PropertySheets/root.vsprops b/PropertySheets/root.vsprops
index f5c7c59d4..def0e2276 100644
--- a/PropertySheets/root.vsprops
+++ b/PropertySheets/root.vsprops
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="utf-8"?>
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
diff --git a/Source/3rd Party/7zip/7zip.vcxproj b/Source/3rd Party/7zip/7zip.vcxproj
index 33f0110e7..00f1752ae 100644
--- a/Source/3rd Party/7zip/7zip.vcxproj	
+++ b/Source/3rd Party/7zip/7zip.vcxproj	
@@ -5,11 +5,38 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3326E128-33AF-422C-BB7C-67CC6B915610}</ProjectGuid>
+    <RootNamespace>7zip</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
+  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader />
+      <DisableSpecificWarnings>4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="7z.h" />
     <ClInclude Include="7zAlloc.h" />
@@ -81,33 +108,4 @@
     <ClCompile Include="XzEnc.c" />
     <ClCompile Include="XzIn.c" />
   </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3326E128-33AF-422C-BB7C-67CC6B915610}</ProjectGuid>
-    <RootNamespace>7zip</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PrecompiledHeader />
-      <DisableSpecificWarnings>4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/7zip/CpuArch.h b/Source/3rd Party/7zip/CpuArch.h
index 01930c7e6..47092eca6 100644
--- a/Source/3rd Party/7zip/CpuArch.h	
+++ b/Source/3rd Party/7zip/CpuArch.h	
@@ -98,6 +98,7 @@ Stop_Compiling_Bad_Endian
 #endif
 
 #if defined(MY_CPU_LE_UNALIGN) && defined(_WIN64) && (_MSC_VER >= 1300)
+#include <stdlib.h>
 
 #pragma intrinsic(_byteswap_ulong)
 #pragma intrinsic(_byteswap_uint64)
diff --git a/Source/3rd Party/WTL/WTL.vcxproj b/Source/3rd Party/WTL/WTL.vcxproj
index f916d5ecb..aefc00cdb 100644
--- a/Source/3rd Party/WTL/WTL.vcxproj	
+++ b/Source/3rd Party/WTL/WTL.vcxproj	
@@ -5,33 +5,32 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4BC6906B-213E-40D7-9FC7-1A93E228393D}</ProjectGuid>
     <RootNamespace>WTL</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemGroup>
     <ClInclude Include="atlapp.h" />
     <ClInclude Include="atlcrack.h" />
@@ -54,7 +53,4 @@
     <ClInclude Include="atlwince.h" />
     <ClInclude Include="atlwinx.h" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/directx/include/dsound.h b/Source/3rd Party/directx/include/dsound.h
new file mode 100644
index 000000000..bb75b9e73
--- /dev/null
+++ b/Source/3rd Party/directx/include/dsound.h	
@@ -0,0 +1,2354 @@
+/*==========================================================================;
+ *
+ *  Copyright (C) 1995-2001 Microsoft Corporation.  All Rights Reserved.
+ *
+ *  File:       dsound.h
+ *  Content:    DirectSound include file
+ *
+ **************************************************************************/
+
+#define COM_NO_WINDOWS_H
+#include <objbase.h>
+#include <float.h>
+
+#ifndef DIRECTSOUND_VERSION
+#define DIRECTSOUND_VERSION 0x0800  /* Version 8.0 */
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+#ifndef __DSOUND_INCLUDED__
+#define __DSOUND_INCLUDED__
+
+/* Type definitions shared with Direct3D */
+
+#ifndef DX_SHARED_DEFINES
+
+typedef float D3DVALUE, *LPD3DVALUE;
+
+#ifndef D3DCOLOR_DEFINED
+typedef DWORD D3DCOLOR;
+#define D3DCOLOR_DEFINED
+#endif
+
+#ifndef LPD3DCOLOR_DEFINED
+typedef DWORD *LPD3DCOLOR;
+#define LPD3DCOLOR_DEFINED
+#endif
+
+#ifndef D3DVECTOR_DEFINED
+typedef struct _D3DVECTOR {
+    float x;
+    float y;
+    float z;
+} D3DVECTOR;
+#define D3DVECTOR_DEFINED
+#endif
+
+#ifndef LPD3DVECTOR_DEFINED
+typedef D3DVECTOR *LPD3DVECTOR;
+#define LPD3DVECTOR_DEFINED
+#endif
+
+#define DX_SHARED_DEFINES
+#endif // DX_SHARED_DEFINES
+
+#define _FACDS  0x878   /* DirectSound's facility code */
+#define MAKE_DSHRESULT(code)  MAKE_HRESULT(1, _FACDS, code)
+
+// DirectSound Component GUID {47D4D946-62E8-11CF-93BC-444553540000}
+DEFINE_GUID(CLSID_DirectSound, 0x47d4d946, 0x62e8, 0x11cf, 0x93, 0xbc, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0);
+
+// DirectSound 8.0 Component GUID {3901CC3F-84B5-4FA4-BA35-AA8172B8A09B}
+DEFINE_GUID(CLSID_DirectSound8, 0x3901cc3f, 0x84b5, 0x4fa4, 0xba, 0x35, 0xaa, 0x81, 0x72, 0xb8, 0xa0, 0x9b);
+
+// DirectSound Capture Component GUID {B0210780-89CD-11D0-AF08-00A0C925CD16}
+DEFINE_GUID(CLSID_DirectSoundCapture, 0xb0210780, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
+
+// DirectSound 8.0 Capture Component GUID {E4BCAC13-7F99-4908-9A8E-74E3BF24B6E1}
+DEFINE_GUID(CLSID_DirectSoundCapture8, 0xe4bcac13, 0x7f99, 0x4908, 0x9a, 0x8e, 0x74, 0xe3, 0xbf, 0x24, 0xb6, 0xe1);
+
+// DirectSound Full Duplex Component GUID {FEA4300C-7959-4147-B26A-2377B9E7A91D}
+DEFINE_GUID(CLSID_DirectSoundFullDuplex, 0xfea4300c, 0x7959, 0x4147, 0xb2, 0x6a, 0x23, 0x77, 0xb9, 0xe7, 0xa9, 0x1d);
+
+
+// DirectSound default playback device GUID {DEF00000-9C6D-47ED-AAF1-4DDA8F2B5C03}
+DEFINE_GUID(DSDEVID_DefaultPlayback, 0xdef00000, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03);
+
+// DirectSound default capture device GUID {DEF00001-9C6D-47ED-AAF1-4DDA8F2B5C03}
+DEFINE_GUID(DSDEVID_DefaultCapture, 0xdef00001, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03);
+
+// DirectSound default device for voice playback {DEF00002-9C6D-47ED-AAF1-4DDA8F2B5C03}
+DEFINE_GUID(DSDEVID_DefaultVoicePlayback, 0xdef00002, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03);
+
+// DirectSound default device for voice capture {DEF00003-9C6D-47ED-AAF1-4DDA8F2B5C03}
+DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xdef00003, 0x9c6d, 0x47ed, 0xaa, 0xf1, 0x4d, 0xda, 0x8f, 0x2b, 0x5c, 0x03);
+
+
+//
+// Forward declarations for interfaces.
+// 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined
+//
+
+#ifdef __cplusplus
+struct IDirectSound;
+struct IDirectSoundBuffer;
+struct IDirectSound3DListener;
+struct IDirectSound3DBuffer;
+struct IDirectSoundCapture;
+struct IDirectSoundCaptureBuffer;
+struct IDirectSoundNotify;
+#endif // __cplusplus
+
+
+//
+// DirectSound 8.0 interfaces.
+//
+
+#if DIRECTSOUND_VERSION >= 0x0800
+
+#ifdef __cplusplus
+struct IDirectSound8;
+struct IDirectSoundBuffer8;
+struct IDirectSoundCaptureBuffer8;
+struct IDirectSoundFXGargle;
+struct IDirectSoundFXChorus;
+struct IDirectSoundFXFlanger;
+struct IDirectSoundFXEcho;
+struct IDirectSoundFXDistortion;
+struct IDirectSoundFXCompressor;
+struct IDirectSoundFXParamEq;
+struct IDirectSoundFXWavesReverb;
+struct IDirectSoundFXI3DL2Reverb;
+struct IDirectSoundCaptureFXAec;
+struct IDirectSoundCaptureFXNoiseSuppress;
+struct IDirectSoundFullDuplex;
+#endif // __cplusplus
+
+// IDirectSound8, IDirectSoundBuffer8 and IDirectSoundCaptureBuffer8 are the
+// only DirectSound 7.0 interfaces with changed functionality in version 8.0.
+// The other level 8 interfaces as equivalent to their level 7 counterparts:
+
+#define IDirectSoundCapture8            IDirectSoundCapture
+#define IDirectSound3DListener8         IDirectSound3DListener
+#define IDirectSound3DBuffer8           IDirectSound3DBuffer
+#define IDirectSoundNotify8             IDirectSoundNotify
+#define IDirectSoundFXGargle8           IDirectSoundFXGargle
+#define IDirectSoundFXChorus8           IDirectSoundFXChorus
+#define IDirectSoundFXFlanger8          IDirectSoundFXFlanger
+#define IDirectSoundFXEcho8             IDirectSoundFXEcho
+#define IDirectSoundFXDistortion8       IDirectSoundFXDistortion
+#define IDirectSoundFXCompressor8       IDirectSoundFXCompressor
+#define IDirectSoundFXParamEq8          IDirectSoundFXParamEq
+#define IDirectSoundFXWavesReverb8      IDirectSoundFXWavesReverb
+#define IDirectSoundFXI3DL2Reverb8      IDirectSoundFXI3DL2Reverb
+#define IDirectSoundCaptureFXAec8       IDirectSoundCaptureFXAec
+#define IDirectSoundCaptureFXNoiseSuppress8 IDirectSoundCaptureFXNoiseSuppress
+#define IDirectSoundFullDuplex8         IDirectSoundFullDuplex
+
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+
+typedef struct IDirectSound                 *LPDIRECTSOUND;
+typedef struct IDirectSoundBuffer           *LPDIRECTSOUNDBUFFER;
+typedef struct IDirectSound3DListener       *LPDIRECTSOUND3DLISTENER;
+typedef struct IDirectSound3DBuffer         *LPDIRECTSOUND3DBUFFER;
+typedef struct IDirectSoundCapture          *LPDIRECTSOUNDCAPTURE;
+typedef struct IDirectSoundCaptureBuffer    *LPDIRECTSOUNDCAPTUREBUFFER;
+typedef struct IDirectSoundNotify           *LPDIRECTSOUNDNOTIFY;
+
+
+#if DIRECTSOUND_VERSION >= 0x0800
+typedef struct IDirectSoundFXGargle         *LPDIRECTSOUNDFXGARGLE;
+typedef struct IDirectSoundFXChorus         *LPDIRECTSOUNDFXCHORUS;
+typedef struct IDirectSoundFXFlanger        *LPDIRECTSOUNDFXFLANGER;
+typedef struct IDirectSoundFXEcho           *LPDIRECTSOUNDFXECHO;
+typedef struct IDirectSoundFXDistortion     *LPDIRECTSOUNDFXDISTORTION;
+typedef struct IDirectSoundFXCompressor     *LPDIRECTSOUNDFXCOMPRESSOR;
+typedef struct IDirectSoundFXParamEq        *LPDIRECTSOUNDFXPARAMEQ;
+typedef struct IDirectSoundFXWavesReverb    *LPDIRECTSOUNDFXWAVESREVERB;
+typedef struct IDirectSoundFXI3DL2Reverb    *LPDIRECTSOUNDFXI3DL2REVERB;
+typedef struct IDirectSoundCaptureFXAec     *LPDIRECTSOUNDCAPTUREFXAEC;
+typedef struct IDirectSoundCaptureFXNoiseSuppress *LPDIRECTSOUNDCAPTUREFXNOISESUPPRESS;
+typedef struct IDirectSoundFullDuplex       *LPDIRECTSOUNDFULLDUPLEX;
+
+typedef struct IDirectSound8                *LPDIRECTSOUND8;
+typedef struct IDirectSoundBuffer8          *LPDIRECTSOUNDBUFFER8;
+typedef struct IDirectSound3DListener8      *LPDIRECTSOUND3DLISTENER8;
+typedef struct IDirectSound3DBuffer8        *LPDIRECTSOUND3DBUFFER8;
+typedef struct IDirectSoundCapture8         *LPDIRECTSOUNDCAPTURE8;
+typedef struct IDirectSoundCaptureBuffer8   *LPDIRECTSOUNDCAPTUREBUFFER8;
+typedef struct IDirectSoundNotify8          *LPDIRECTSOUNDNOTIFY8;
+typedef struct IDirectSoundFXGargle8        *LPDIRECTSOUNDFXGARGLE8;
+typedef struct IDirectSoundFXChorus8        *LPDIRECTSOUNDFXCHORUS8;
+typedef struct IDirectSoundFXFlanger8       *LPDIRECTSOUNDFXFLANGER8;
+typedef struct IDirectSoundFXEcho8          *LPDIRECTSOUNDFXECHO8;
+typedef struct IDirectSoundFXDistortion8    *LPDIRECTSOUNDFXDISTORTION8;
+typedef struct IDirectSoundFXCompressor8    *LPDIRECTSOUNDFXCOMPRESSOR8;
+typedef struct IDirectSoundFXParamEq8       *LPDIRECTSOUNDFXPARAMEQ8;
+typedef struct IDirectSoundFXWavesReverb8   *LPDIRECTSOUNDFXWAVESREVERB8;
+typedef struct IDirectSoundFXI3DL2Reverb8   *LPDIRECTSOUNDFXI3DL2REVERB8;
+typedef struct IDirectSoundCaptureFXAec8    *LPDIRECTSOUNDCAPTUREFXAEC8;
+typedef struct IDirectSoundCaptureFXNoiseSuppress8 *LPDIRECTSOUNDCAPTUREFXNOISESUPPRESS8;
+typedef struct IDirectSoundFullDuplex8      *LPDIRECTSOUNDFULLDUPLEX8;
+
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+//
+// IID definitions for the unchanged DirectSound 8.0 interfaces
+//
+
+#if DIRECTSOUND_VERSION >= 0x0800
+#define IID_IDirectSoundCapture8            IID_IDirectSoundCapture
+#define IID_IDirectSound3DListener8         IID_IDirectSound3DListener
+#define IID_IDirectSound3DBuffer8           IID_IDirectSound3DBuffer
+#define IID_IDirectSoundNotify8             IID_IDirectSoundNotify
+#define IID_IDirectSoundFXGargle8           IID_IDirectSoundFXGargle
+#define IID_IDirectSoundFXChorus8           IID_IDirectSoundFXChorus
+#define IID_IDirectSoundFXFlanger8          IID_IDirectSoundFXFlanger
+#define IID_IDirectSoundFXEcho8             IID_IDirectSoundFXEcho
+#define IID_IDirectSoundFXDistortion8       IID_IDirectSoundFXDistortion
+#define IID_IDirectSoundFXCompressor8       IID_IDirectSoundFXCompressor
+#define IID_IDirectSoundFXParamEq8          IID_IDirectSoundFXParamEq
+#define IID_IDirectSoundFXWavesReverb8      IID_IDirectSoundFXWavesReverb
+#define IID_IDirectSoundFXI3DL2Reverb8      IID_IDirectSoundFXI3DL2Reverb
+#define IID_IDirectSoundCaptureFXAec8       IID_IDirectSoundCaptureFXAec
+#define IID_IDirectSoundCaptureFXNoiseSuppress8 IID_IDirectSoundCaptureFXNoiseSuppress
+#define IID_IDirectSoundFullDuplex8         IID_IDirectSoundFullDuplex
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+//
+// Compatibility typedefs
+//
+
+#ifndef _LPCWAVEFORMATEX_DEFINED
+#define _LPCWAVEFORMATEX_DEFINED
+typedef const WAVEFORMATEX *LPCWAVEFORMATEX;
+#endif // _LPCWAVEFORMATEX_DEFINED
+
+#ifndef __LPCGUID_DEFINED__
+#define __LPCGUID_DEFINED__
+typedef const GUID *LPCGUID;
+#endif // __LPCGUID_DEFINED__
+
+typedef LPDIRECTSOUND *LPLPDIRECTSOUND;
+typedef LPDIRECTSOUNDBUFFER *LPLPDIRECTSOUNDBUFFER;
+typedef LPDIRECTSOUND3DLISTENER *LPLPDIRECTSOUND3DLISTENER;
+typedef LPDIRECTSOUND3DBUFFER *LPLPDIRECTSOUND3DBUFFER;
+typedef LPDIRECTSOUNDCAPTURE *LPLPDIRECTSOUNDCAPTURE;
+typedef LPDIRECTSOUNDCAPTUREBUFFER *LPLPDIRECTSOUNDCAPTUREBUFFER;
+typedef LPDIRECTSOUNDNOTIFY *LPLPDIRECTSOUNDNOTIFY;
+
+#if DIRECTSOUND_VERSION >= 0x0800
+typedef LPDIRECTSOUND8 *LPLPDIRECTSOUND8;
+typedef LPDIRECTSOUNDBUFFER8 *LPLPDIRECTSOUNDBUFFER8;
+typedef LPDIRECTSOUNDCAPTURE8 *LPLPDIRECTSOUNDCAPTURE8;
+typedef LPDIRECTSOUNDCAPTUREBUFFER8 *LPLPDIRECTSOUNDCAPTUREBUFFER8;
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+//
+// Structures
+//
+
+typedef struct _DSCAPS
+{
+    DWORD           dwSize;
+    DWORD           dwFlags;
+    DWORD           dwMinSecondarySampleRate;
+    DWORD           dwMaxSecondarySampleRate;
+    DWORD           dwPrimaryBuffers;
+    DWORD           dwMaxHwMixingAllBuffers;
+    DWORD           dwMaxHwMixingStaticBuffers;
+    DWORD           dwMaxHwMixingStreamingBuffers;
+    DWORD           dwFreeHwMixingAllBuffers;
+    DWORD           dwFreeHwMixingStaticBuffers;
+    DWORD           dwFreeHwMixingStreamingBuffers;
+    DWORD           dwMaxHw3DAllBuffers;
+    DWORD           dwMaxHw3DStaticBuffers;
+    DWORD           dwMaxHw3DStreamingBuffers;
+    DWORD           dwFreeHw3DAllBuffers;
+    DWORD           dwFreeHw3DStaticBuffers;
+    DWORD           dwFreeHw3DStreamingBuffers;
+    DWORD           dwTotalHwMemBytes;
+    DWORD           dwFreeHwMemBytes;
+    DWORD           dwMaxContigFreeHwMemBytes;
+    DWORD           dwUnlockTransferRateHwBuffers;
+    DWORD           dwPlayCpuOverheadSwBuffers;
+    DWORD           dwReserved1;
+    DWORD           dwReserved2;
+} DSCAPS, *LPDSCAPS;
+
+typedef const DSCAPS *LPCDSCAPS;
+
+typedef struct _DSBCAPS
+{
+    DWORD           dwSize;
+    DWORD           dwFlags;
+    DWORD           dwBufferBytes;
+    DWORD           dwUnlockTransferRate;
+    DWORD           dwPlayCpuOverhead;
+} DSBCAPS, *LPDSBCAPS;
+
+typedef const DSBCAPS *LPCDSBCAPS;
+
+#if DIRECTSOUND_VERSION >= 0x0800
+
+    typedef struct _DSEFFECTDESC
+    {
+        DWORD       dwSize;
+        DWORD       dwFlags;
+        GUID        guidDSFXClass;
+        DWORD_PTR   dwReserved1;
+        DWORD_PTR   dwReserved2;
+    } DSEFFECTDESC, *LPDSEFFECTDESC;
+    typedef const DSEFFECTDESC *LPCDSEFFECTDESC;
+
+    #define DSFX_LOCHARDWARE    0x00000001
+    #define DSFX_LOCSOFTWARE    0x00000002
+
+    enum
+    {
+        DSFXR_PRESENT,          // 0
+        DSFXR_LOCHARDWARE,      // 1
+        DSFXR_LOCSOFTWARE,      // 2
+        DSFXR_UNALLOCATED,      // 3
+        DSFXR_FAILED,           // 4
+        DSFXR_UNKNOWN,          // 5
+        DSFXR_SENDLOOP          // 6
+    };
+
+    typedef struct _DSCEFFECTDESC
+    {
+        DWORD       dwSize;
+        DWORD       dwFlags;
+        GUID        guidDSCFXClass;
+        GUID        guidDSCFXInstance;
+        DWORD       dwReserved1;
+        DWORD       dwReserved2;
+    } DSCEFFECTDESC, *LPDSCEFFECTDESC;
+    typedef const DSCEFFECTDESC *LPCDSCEFFECTDESC;
+
+    #define DSCFX_LOCHARDWARE   0x00000001
+    #define DSCFX_LOCSOFTWARE   0x00000002
+
+    #define DSCFXR_LOCHARDWARE  0x00000010
+    #define DSCFXR_LOCSOFTWARE  0x00000020
+
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+typedef struct _DSBUFFERDESC
+{
+    DWORD           dwSize;
+    DWORD           dwFlags;
+    DWORD           dwBufferBytes;
+    DWORD           dwReserved;
+    LPWAVEFORMATEX  lpwfxFormat;
+#if DIRECTSOUND_VERSION >= 0x0700
+    GUID            guid3DAlgorithm;
+#endif
+} DSBUFFERDESC, *LPDSBUFFERDESC;
+
+typedef const DSBUFFERDESC *LPCDSBUFFERDESC;
+
+// Older version of this structure:
+
+typedef struct _DSBUFFERDESC1
+{
+    DWORD           dwSize;
+    DWORD           dwFlags;
+    DWORD           dwBufferBytes;
+    DWORD           dwReserved;
+    LPWAVEFORMATEX  lpwfxFormat;
+} DSBUFFERDESC1, *LPDSBUFFERDESC1;
+
+typedef const DSBUFFERDESC1 *LPCDSBUFFERDESC1;
+
+typedef struct _DS3DBUFFER
+{
+    DWORD           dwSize;
+    D3DVECTOR       vPosition;
+    D3DVECTOR       vVelocity;
+    DWORD           dwInsideConeAngle;
+    DWORD           dwOutsideConeAngle;
+    D3DVECTOR       vConeOrientation;
+    LONG            lConeOutsideVolume;
+    D3DVALUE        flMinDistance;
+    D3DVALUE        flMaxDistance;
+    DWORD           dwMode;
+} DS3DBUFFER, *LPDS3DBUFFER;
+
+typedef const DS3DBUFFER *LPCDS3DBUFFER;
+
+typedef struct _DS3DLISTENER
+{
+    DWORD           dwSize;
+    D3DVECTOR       vPosition;
+    D3DVECTOR       vVelocity;
+    D3DVECTOR       vOrientFront;
+    D3DVECTOR       vOrientTop;
+    D3DVALUE        flDistanceFactor;
+    D3DVALUE        flRolloffFactor;
+    D3DVALUE        flDopplerFactor;
+} DS3DLISTENER, *LPDS3DLISTENER;
+
+typedef const DS3DLISTENER *LPCDS3DLISTENER;
+
+typedef struct _DSCCAPS
+{
+    DWORD           dwSize;
+    DWORD           dwFlags;
+    DWORD           dwFormats;
+    DWORD           dwChannels;
+} DSCCAPS, *LPDSCCAPS;
+
+typedef const DSCCAPS *LPCDSCCAPS;
+
+typedef struct _DSCBUFFERDESC1
+{
+    DWORD           dwSize;
+    DWORD           dwFlags;
+    DWORD           dwBufferBytes;
+    DWORD           dwReserved;
+    LPWAVEFORMATEX  lpwfxFormat;
+} DSCBUFFERDESC1, *LPDSCBUFFERDESC1;
+
+typedef struct _DSCBUFFERDESC
+{
+    DWORD           dwSize;
+    DWORD           dwFlags;
+    DWORD           dwBufferBytes;
+    DWORD           dwReserved;
+    LPWAVEFORMATEX  lpwfxFormat;
+#if DIRECTSOUND_VERSION >= 0x0800
+    DWORD           dwFXCount;
+    LPDSCEFFECTDESC lpDSCFXDesc;
+#endif
+} DSCBUFFERDESC, *LPDSCBUFFERDESC;
+
+typedef const DSCBUFFERDESC *LPCDSCBUFFERDESC;
+
+typedef struct _DSCBCAPS
+{
+    DWORD           dwSize;
+    DWORD           dwFlags;
+    DWORD           dwBufferBytes;
+    DWORD           dwReserved;
+} DSCBCAPS, *LPDSCBCAPS;
+
+typedef const DSCBCAPS *LPCDSCBCAPS;
+
+typedef struct _DSBPOSITIONNOTIFY
+{
+    DWORD           dwOffset;
+    HANDLE          hEventNotify;
+} DSBPOSITIONNOTIFY, *LPDSBPOSITIONNOTIFY;
+
+typedef const DSBPOSITIONNOTIFY *LPCDSBPOSITIONNOTIFY;
+
+//
+// DirectSound API
+//
+
+typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID, LPCSTR, LPCSTR, LPVOID);
+typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID, LPCWSTR, LPCWSTR, LPVOID);
+
+extern HRESULT WINAPI DirectSoundCreate(LPCGUID pcGuidDevice, LPDIRECTSOUND *ppDS, LPUNKNOWN pUnkOuter);
+extern HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA pDSEnumCallback, LPVOID pContext);
+extern HRESULT WINAPI DirectSoundEnumerateW(LPDSENUMCALLBACKW pDSEnumCallback, LPVOID pContext);
+
+extern HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID pcGuidDevice, LPDIRECTSOUNDCAPTURE *ppDSC, LPUNKNOWN pUnkOuter);
+extern HRESULT WINAPI DirectSoundCaptureEnumerateA(LPDSENUMCALLBACKA pDSEnumCallback, LPVOID pContext);
+extern HRESULT WINAPI DirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW pDSEnumCallback, LPVOID pContext);
+
+#if DIRECTSOUND_VERSION >= 0x0800
+extern HRESULT WINAPI DirectSoundCreate8(LPCGUID pcGuidDevice, LPDIRECTSOUND8 *ppDS8, LPUNKNOWN pUnkOuter);
+extern HRESULT WINAPI DirectSoundCaptureCreate8(LPCGUID pcGuidDevice, LPDIRECTSOUNDCAPTURE8 *ppDSC8, LPUNKNOWN pUnkOuter);
+extern HRESULT WINAPI DirectSoundFullDuplexCreate(LPCGUID pcGuidCaptureDevice, LPCGUID pcGuidRenderDevice,
+        LPCDSCBUFFERDESC pcDSCBufferDesc, LPCDSBUFFERDESC pcDSBufferDesc, HWND hWnd,
+        DWORD dwLevel, LPDIRECTSOUNDFULLDUPLEX* ppDSFD, LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8,
+        LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, LPUNKNOWN pUnkOuter);
+#define DirectSoundFullDuplexCreate8 DirectSoundFullDuplexCreate
+
+extern HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest);
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+#ifdef UNICODE
+#define LPDSENUMCALLBACK            LPDSENUMCALLBACKW
+#define DirectSoundEnumerate        DirectSoundEnumerateW
+#define DirectSoundCaptureEnumerate DirectSoundCaptureEnumerateW
+#else // UNICODE
+#define LPDSENUMCALLBACK            LPDSENUMCALLBACKA
+#define DirectSoundEnumerate        DirectSoundEnumerateA
+#define DirectSoundCaptureEnumerate DirectSoundCaptureEnumerateA
+#endif // UNICODE
+
+//
+// IUnknown
+//
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#ifndef IUnknown_QueryInterface
+#define IUnknown_QueryInterface(p,a,b)  (p)->lpVtbl->QueryInterface(p,a,b)
+#endif // IUnknown_QueryInterface
+#ifndef IUnknown_AddRef
+#define IUnknown_AddRef(p)              (p)->lpVtbl->AddRef(p)
+#endif // IUnknown_AddRef
+#ifndef IUnknown_Release
+#define IUnknown_Release(p)             (p)->lpVtbl->Release(p)
+#endif // IUnknown_Release
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#ifndef IUnknown_QueryInterface
+#define IUnknown_QueryInterface(p,a,b)  (p)->QueryInterface(a,b)
+#endif // IUnknown_QueryInterface
+#ifndef IUnknown_AddRef
+#define IUnknown_AddRef(p)              (p)->AddRef()
+#endif // IUnknown_AddRef
+#ifndef IUnknown_Release
+#define IUnknown_Release(p)             (p)->Release()
+#endif // IUnknown_Release
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+#ifndef __IReferenceClock_INTERFACE_DEFINED__
+#define __IReferenceClock_INTERFACE_DEFINED__
+
+typedef LONGLONG REFERENCE_TIME;
+typedef REFERENCE_TIME *LPREFERENCE_TIME;
+
+DEFINE_GUID(IID_IReferenceClock, 0x56a86897, 0x0ad4, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70);
+
+#undef INTERFACE
+#define INTERFACE IReferenceClock
+
+DECLARE_INTERFACE_(IReferenceClock, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IReferenceClock methods
+    STDMETHOD(GetTime)              (THIS_ REFERENCE_TIME *pTime) PURE;
+    STDMETHOD(AdviseTime)           (THIS_ REFERENCE_TIME rtBaseTime, REFERENCE_TIME rtStreamTime,
+                                           HANDLE hEvent, LPDWORD pdwAdviseCookie) PURE;
+    STDMETHOD(AdvisePeriodic)       (THIS_ REFERENCE_TIME rtStartTime, REFERENCE_TIME rtPeriodTime,
+                                           HANDLE hSemaphore, LPDWORD pdwAdviseCookie) PURE;
+    STDMETHOD(Unadvise)             (THIS_ DWORD dwAdviseCookie) PURE;
+};
+
+#endif // __IReferenceClock_INTERFACE_DEFINED__
+
+#ifndef IReferenceClock_QueryInterface
+
+#define IReferenceClock_QueryInterface(p,a,b)      IUnknown_QueryInterface(p,a,b)
+#define IReferenceClock_AddRef(p)                  IUnknown_AddRef(p)
+#define IReferenceClock_Release(p)                 IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IReferenceClock_GetTime(p,a)               (p)->lpVtbl->GetTime(p,a)
+#define IReferenceClock_AdviseTime(p,a,b,c,d)      (p)->lpVtbl->AdviseTime(p,a,b,c,d)
+#define IReferenceClock_AdvisePeriodic(p,a,b,c,d)  (p)->lpVtbl->AdvisePeriodic(p,a,b,c,d)
+#define IReferenceClock_Unadvise(p,a)              (p)->lpVtbl->Unadvise(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IReferenceClock_GetTime(p,a)               (p)->GetTime(a)
+#define IReferenceClock_AdviseTime(p,a,b,c,d)      (p)->AdviseTime(a,b,c,d)
+#define IReferenceClock_AdvisePeriodic(p,a,b,c,d)  (p)->AdvisePeriodic(a,b,c,d)
+#define IReferenceClock_Unadvise(p,a)              (p)->Unadvise(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+#endif // IReferenceClock_QueryInterface
+
+//
+// IDirectSound
+//
+
+DEFINE_GUID(IID_IDirectSound, 0x279AFA83, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
+
+#undef INTERFACE
+#define INTERFACE IDirectSound
+
+DECLARE_INTERFACE_(IDirectSound, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSound methods
+    STDMETHOD(CreateSoundBuffer)    (THIS_ LPCDSBUFFERDESC pcDSBufferDesc, LPDIRECTSOUNDBUFFER *ppDSBuffer, LPUNKNOWN pUnkOuter) PURE;
+    STDMETHOD(GetCaps)              (THIS_ LPDSCAPS pDSCaps) PURE;
+    STDMETHOD(DuplicateSoundBuffer) (THIS_ LPDIRECTSOUNDBUFFER pDSBufferOriginal, LPDIRECTSOUNDBUFFER *ppDSBufferDuplicate) PURE;
+    STDMETHOD(SetCooperativeLevel)  (THIS_ HWND hwnd, DWORD dwLevel) PURE;
+    STDMETHOD(Compact)              (THIS) PURE;
+    STDMETHOD(GetSpeakerConfig)     (THIS_ LPDWORD pdwSpeakerConfig) PURE;
+    STDMETHOD(SetSpeakerConfig)     (THIS_ DWORD dwSpeakerConfig) PURE;
+    STDMETHOD(Initialize)           (THIS_ LPCGUID pcGuidDevice) PURE;
+};
+
+#define IDirectSound_QueryInterface(p,a,b)       IUnknown_QueryInterface(p,a,b)
+#define IDirectSound_AddRef(p)                   IUnknown_AddRef(p)
+#define IDirectSound_Release(p)                  IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSound_CreateSoundBuffer(p,a,b,c)  (p)->lpVtbl->CreateSoundBuffer(p,a,b,c)
+#define IDirectSound_GetCaps(p,a)                (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSound_DuplicateSoundBuffer(p,a,b) (p)->lpVtbl->DuplicateSoundBuffer(p,a,b)
+#define IDirectSound_SetCooperativeLevel(p,a,b)  (p)->lpVtbl->SetCooperativeLevel(p,a,b)
+#define IDirectSound_Compact(p)                  (p)->lpVtbl->Compact(p)
+#define IDirectSound_GetSpeakerConfig(p,a)       (p)->lpVtbl->GetSpeakerConfig(p,a)
+#define IDirectSound_SetSpeakerConfig(p,b)       (p)->lpVtbl->SetSpeakerConfig(p,b)
+#define IDirectSound_Initialize(p,a)             (p)->lpVtbl->Initialize(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSound_CreateSoundBuffer(p,a,b,c)  (p)->CreateSoundBuffer(a,b,c)
+#define IDirectSound_GetCaps(p,a)                (p)->GetCaps(a)
+#define IDirectSound_DuplicateSoundBuffer(p,a,b) (p)->DuplicateSoundBuffer(a,b)
+#define IDirectSound_SetCooperativeLevel(p,a,b)  (p)->SetCooperativeLevel(a,b)
+#define IDirectSound_Compact(p)                  (p)->Compact()
+#define IDirectSound_GetSpeakerConfig(p,a)       (p)->GetSpeakerConfig(a)
+#define IDirectSound_SetSpeakerConfig(p,b)       (p)->SetSpeakerConfig(b)
+#define IDirectSound_Initialize(p,a)             (p)->Initialize(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+#if DIRECTSOUND_VERSION >= 0x0800
+
+//
+// IDirectSound8
+//
+
+DEFINE_GUID(IID_IDirectSound8, 0xC50A7E93, 0xF395, 0x4834, 0x9E, 0xF6, 0x7F, 0xA9, 0x9D, 0xE5, 0x09, 0x66);
+
+#undef INTERFACE
+#define INTERFACE IDirectSound8
+
+DECLARE_INTERFACE_(IDirectSound8, IDirectSound)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSound methods
+    STDMETHOD(CreateSoundBuffer)    (THIS_ LPCDSBUFFERDESC pcDSBufferDesc, LPDIRECTSOUNDBUFFER *ppDSBuffer, LPUNKNOWN pUnkOuter) PURE;
+    STDMETHOD(GetCaps)              (THIS_ LPDSCAPS pDSCaps) PURE;
+    STDMETHOD(DuplicateSoundBuffer) (THIS_ LPDIRECTSOUNDBUFFER pDSBufferOriginal, LPDIRECTSOUNDBUFFER *ppDSBufferDuplicate) PURE;
+    STDMETHOD(SetCooperativeLevel)  (THIS_ HWND hwnd, DWORD dwLevel) PURE;
+    STDMETHOD(Compact)              (THIS) PURE;
+    STDMETHOD(GetSpeakerConfig)     (THIS_ LPDWORD pdwSpeakerConfig) PURE;
+    STDMETHOD(SetSpeakerConfig)     (THIS_ DWORD dwSpeakerConfig) PURE;
+    STDMETHOD(Initialize)           (THIS_ LPCGUID pcGuidDevice) PURE;
+
+    // IDirectSound8 methods
+    STDMETHOD(VerifyCertification)  (THIS_ LPDWORD pdwCertified) PURE;
+};
+
+#define IDirectSound8_QueryInterface(p,a,b)       IDirectSound_QueryInterface(p,a,b)
+#define IDirectSound8_AddRef(p)                   IDirectSound_AddRef(p)
+#define IDirectSound8_Release(p)                  IDirectSound_Release(p)
+#define IDirectSound8_CreateSoundBuffer(p,a,b,c)  IDirectSound_CreateSoundBuffer(p,a,b,c)
+#define IDirectSound8_GetCaps(p,a)                IDirectSound_GetCaps(p,a)
+#define IDirectSound8_DuplicateSoundBuffer(p,a,b) IDirectSound_DuplicateSoundBuffer(p,a,b)
+#define IDirectSound8_SetCooperativeLevel(p,a,b)  IDirectSound_SetCooperativeLevel(p,a,b)
+#define IDirectSound8_Compact(p)                  IDirectSound_Compact(p)
+#define IDirectSound8_GetSpeakerConfig(p,a)       IDirectSound_GetSpeakerConfig(p,a)
+#define IDirectSound8_SetSpeakerConfig(p,a)       IDirectSound_SetSpeakerConfig(p,a)
+#define IDirectSound8_Initialize(p,a)             IDirectSound_Initialize(p,a)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSound8_VerifyCertification(p,a)           (p)->lpVtbl->VerifyCertification(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSound8_VerifyCertification(p,a)           (p)->VerifyCertification(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+//
+// IDirectSoundBuffer
+//
+
+DEFINE_GUID(IID_IDirectSoundBuffer, 0x279AFA85, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundBuffer
+
+DECLARE_INTERFACE_(IDirectSoundBuffer, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundBuffer methods
+    STDMETHOD(GetCaps)              (THIS_ LPDSBCAPS pDSBufferCaps) PURE;
+    STDMETHOD(GetCurrentPosition)   (THIS_ LPDWORD pdwCurrentPlayCursor, LPDWORD pdwCurrentWriteCursor) PURE;
+    STDMETHOD(GetFormat)            (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE;
+    STDMETHOD(GetVolume)            (THIS_ LPLONG plVolume) PURE;
+    STDMETHOD(GetPan)               (THIS_ LPLONG plPan) PURE;
+    STDMETHOD(GetFrequency)         (THIS_ LPDWORD pdwFrequency) PURE;
+    STDMETHOD(GetStatus)            (THIS_ LPDWORD pdwStatus) PURE;
+    STDMETHOD(Initialize)           (THIS_ LPDIRECTSOUND pDirectSound, LPCDSBUFFERDESC pcDSBufferDesc) PURE;
+    STDMETHOD(Lock)                 (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
+                                           LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
+    STDMETHOD(Play)                 (THIS_ DWORD dwReserved1, DWORD dwPriority, DWORD dwFlags) PURE;
+    STDMETHOD(SetCurrentPosition)   (THIS_ DWORD dwNewPosition) PURE;
+    STDMETHOD(SetFormat)            (THIS_ LPCWAVEFORMATEX pcfxFormat) PURE;
+    STDMETHOD(SetVolume)            (THIS_ LONG lVolume) PURE;
+    STDMETHOD(SetPan)               (THIS_ LONG lPan) PURE;
+    STDMETHOD(SetFrequency)         (THIS_ DWORD dwFrequency) PURE;
+    STDMETHOD(Stop)                 (THIS) PURE;
+    STDMETHOD(Unlock)               (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE;
+    STDMETHOD(Restore)              (THIS) PURE;
+};
+
+#define IDirectSoundBuffer_QueryInterface(p,a,b)        IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundBuffer_AddRef(p)                    IUnknown_AddRef(p)
+#define IDirectSoundBuffer_Release(p)                   IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundBuffer_GetCaps(p,a)                 (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSoundBuffer_GetCurrentPosition(p,a,b)    (p)->lpVtbl->GetCurrentPosition(p,a,b)
+#define IDirectSoundBuffer_GetFormat(p,a,b,c)           (p)->lpVtbl->GetFormat(p,a,b,c)
+#define IDirectSoundBuffer_GetVolume(p,a)               (p)->lpVtbl->GetVolume(p,a)
+#define IDirectSoundBuffer_GetPan(p,a)                  (p)->lpVtbl->GetPan(p,a)
+#define IDirectSoundBuffer_GetFrequency(p,a)            (p)->lpVtbl->GetFrequency(p,a)
+#define IDirectSoundBuffer_GetStatus(p,a)               (p)->lpVtbl->GetStatus(p,a)
+#define IDirectSoundBuffer_Initialize(p,a,b)            (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g)        (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g)
+#define IDirectSoundBuffer_Play(p,a,b,c)                (p)->lpVtbl->Play(p,a,b,c)
+#define IDirectSoundBuffer_SetCurrentPosition(p,a)      (p)->lpVtbl->SetCurrentPosition(p,a)
+#define IDirectSoundBuffer_SetFormat(p,a)               (p)->lpVtbl->SetFormat(p,a)
+#define IDirectSoundBuffer_SetVolume(p,a)               (p)->lpVtbl->SetVolume(p,a)
+#define IDirectSoundBuffer_SetPan(p,a)                  (p)->lpVtbl->SetPan(p,a)
+#define IDirectSoundBuffer_SetFrequency(p,a)            (p)->lpVtbl->SetFrequency(p,a)
+#define IDirectSoundBuffer_Stop(p)                      (p)->lpVtbl->Stop(p)
+#define IDirectSoundBuffer_Unlock(p,a,b,c,d)            (p)->lpVtbl->Unlock(p,a,b,c,d)
+#define IDirectSoundBuffer_Restore(p)                   (p)->lpVtbl->Restore(p)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundBuffer_GetCaps(p,a)                 (p)->GetCaps(a)
+#define IDirectSoundBuffer_GetCurrentPosition(p,a,b)    (p)->GetCurrentPosition(a,b)
+#define IDirectSoundBuffer_GetFormat(p,a,b,c)           (p)->GetFormat(a,b,c)
+#define IDirectSoundBuffer_GetVolume(p,a)               (p)->GetVolume(a)
+#define IDirectSoundBuffer_GetPan(p,a)                  (p)->GetPan(a)
+#define IDirectSoundBuffer_GetFrequency(p,a)            (p)->GetFrequency(a)
+#define IDirectSoundBuffer_GetStatus(p,a)               (p)->GetStatus(a)
+#define IDirectSoundBuffer_Initialize(p,a,b)            (p)->Initialize(a,b)
+#define IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g)        (p)->Lock(a,b,c,d,e,f,g)
+#define IDirectSoundBuffer_Play(p,a,b,c)                (p)->Play(a,b,c)
+#define IDirectSoundBuffer_SetCurrentPosition(p,a)      (p)->SetCurrentPosition(a)
+#define IDirectSoundBuffer_SetFormat(p,a)               (p)->SetFormat(a)
+#define IDirectSoundBuffer_SetVolume(p,a)               (p)->SetVolume(a)
+#define IDirectSoundBuffer_SetPan(p,a)                  (p)->SetPan(a)
+#define IDirectSoundBuffer_SetFrequency(p,a)            (p)->SetFrequency(a)
+#define IDirectSoundBuffer_Stop(p)                      (p)->Stop()
+#define IDirectSoundBuffer_Unlock(p,a,b,c,d)            (p)->Unlock(a,b,c,d)
+#define IDirectSoundBuffer_Restore(p)                   (p)->Restore()
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+#if DIRECTSOUND_VERSION >= 0x0800
+
+//
+// IDirectSoundBuffer8
+//
+
+DEFINE_GUID(IID_IDirectSoundBuffer8, 0x6825a449, 0x7524, 0x4d82, 0x92, 0x0f, 0x50, 0xe3, 0x6a, 0xb3, 0xab, 0x1e);
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundBuffer8
+
+DECLARE_INTERFACE_(IDirectSoundBuffer8, IDirectSoundBuffer)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundBuffer methods
+    STDMETHOD(GetCaps)              (THIS_ LPDSBCAPS pDSBufferCaps) PURE;
+    STDMETHOD(GetCurrentPosition)   (THIS_ LPDWORD pdwCurrentPlayCursor, LPDWORD pdwCurrentWriteCursor) PURE;
+    STDMETHOD(GetFormat)            (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE;
+    STDMETHOD(GetVolume)            (THIS_ LPLONG plVolume) PURE;
+    STDMETHOD(GetPan)               (THIS_ LPLONG plPan) PURE;
+    STDMETHOD(GetFrequency)         (THIS_ LPDWORD pdwFrequency) PURE;
+    STDMETHOD(GetStatus)            (THIS_ LPDWORD pdwStatus) PURE;
+    STDMETHOD(Initialize)           (THIS_ LPDIRECTSOUND pDirectSound, LPCDSBUFFERDESC pcDSBufferDesc) PURE;
+    STDMETHOD(Lock)                 (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
+                                           LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
+    STDMETHOD(Play)                 (THIS_ DWORD dwReserved1, DWORD dwPriority, DWORD dwFlags) PURE;
+    STDMETHOD(SetCurrentPosition)   (THIS_ DWORD dwNewPosition) PURE;
+    STDMETHOD(SetFormat)            (THIS_ LPCWAVEFORMATEX pcfxFormat) PURE;
+    STDMETHOD(SetVolume)            (THIS_ LONG lVolume) PURE;
+    STDMETHOD(SetPan)               (THIS_ LONG lPan) PURE;
+    STDMETHOD(SetFrequency)         (THIS_ DWORD dwFrequency) PURE;
+    STDMETHOD(Stop)                 (THIS) PURE;
+    STDMETHOD(Unlock)               (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE;
+    STDMETHOD(Restore)              (THIS) PURE;
+
+    // IDirectSoundBuffer8 methods
+    STDMETHOD(SetFX)                (THIS_ DWORD dwEffectsCount, LPDSEFFECTDESC pDSFXDesc, LPDWORD pdwResultCodes) PURE;
+    STDMETHOD(AcquireResources)     (THIS_ DWORD dwFlags, DWORD dwEffectsCount, LPDWORD pdwResultCodes) PURE;
+    STDMETHOD(GetObjectInPath)      (THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE;
+};
+
+// Special GUID meaning "select all objects" for use in GetObjectInPath()
+DEFINE_GUID(GUID_All_Objects, 0xaa114de5, 0xc262, 0x4169, 0xa1, 0xc8, 0x23, 0xd6, 0x98, 0xcc, 0x73, 0xb5);
+
+#define IDirectSoundBuffer8_QueryInterface(p,a,b)           IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundBuffer8_AddRef(p)                       IUnknown_AddRef(p)
+#define IDirectSoundBuffer8_Release(p)                      IUnknown_Release(p)
+
+#define IDirectSoundBuffer8_GetCaps(p,a)                    IDirectSoundBuffer_GetCaps(p,a)
+#define IDirectSoundBuffer8_GetCurrentPosition(p,a,b)       IDirectSoundBuffer_GetCurrentPosition(p,a,b)
+#define IDirectSoundBuffer8_GetFormat(p,a,b,c)              IDirectSoundBuffer_GetFormat(p,a,b,c)
+#define IDirectSoundBuffer8_GetVolume(p,a)                  IDirectSoundBuffer_GetVolume(p,a)
+#define IDirectSoundBuffer8_GetPan(p,a)                     IDirectSoundBuffer_GetPan(p,a)
+#define IDirectSoundBuffer8_GetFrequency(p,a)               IDirectSoundBuffer_GetFrequency(p,a)
+#define IDirectSoundBuffer8_GetStatus(p,a)                  IDirectSoundBuffer_GetStatus(p,a)
+#define IDirectSoundBuffer8_Initialize(p,a,b)               IDirectSoundBuffer_Initialize(p,a,b)
+#define IDirectSoundBuffer8_Lock(p,a,b,c,d,e,f,g)           IDirectSoundBuffer_Lock(p,a,b,c,d,e,f,g)
+#define IDirectSoundBuffer8_Play(p,a,b,c)                   IDirectSoundBuffer_Play(p,a,b,c)
+#define IDirectSoundBuffer8_SetCurrentPosition(p,a)         IDirectSoundBuffer_SetCurrentPosition(p,a)
+#define IDirectSoundBuffer8_SetFormat(p,a)                  IDirectSoundBuffer_SetFormat(p,a)
+#define IDirectSoundBuffer8_SetVolume(p,a)                  IDirectSoundBuffer_SetVolume(p,a)
+#define IDirectSoundBuffer8_SetPan(p,a)                     IDirectSoundBuffer_SetPan(p,a)
+#define IDirectSoundBuffer8_SetFrequency(p,a)               IDirectSoundBuffer_SetFrequency(p,a)
+#define IDirectSoundBuffer8_Stop(p)                         IDirectSoundBuffer_Stop(p)
+#define IDirectSoundBuffer8_Unlock(p,a,b,c,d)               IDirectSoundBuffer_Unlock(p,a,b,c,d)
+#define IDirectSoundBuffer8_Restore(p)                      IDirectSoundBuffer_Restore(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundBuffer8_SetFX(p,a,b,c)                  (p)->lpVtbl->SetFX(p,a,b,c)
+#define IDirectSoundBuffer8_AcquireResources(p,a,b,c)       (p)->lpVtbl->AcquireResources(p,a,b,c)
+#define IDirectSoundBuffer8_GetObjectInPath(p,a,b,c,d)      (p)->lpVtbl->GetObjectInPath(p,a,b,c,d)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundBuffer8_SetFX(p,a,b,c)                  (p)->SetFX(a,b,c)
+#define IDirectSoundBuffer8_AcquireResources(p,a,b,c)       (p)->AcquireResources(a,b,c)
+#define IDirectSoundBuffer8_GetObjectInPath(p,a,b,c,d)      (p)->GetObjectInPath(a,b,c,d)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+//
+// IDirectSound3DListener
+//
+
+DEFINE_GUID(IID_IDirectSound3DListener, 0x279AFA84, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
+
+#undef INTERFACE
+#define INTERFACE IDirectSound3DListener
+
+DECLARE_INTERFACE_(IDirectSound3DListener, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)           (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)            (THIS) PURE;
+    STDMETHOD_(ULONG,Release)           (THIS) PURE;
+
+    // IDirectSound3DListener methods
+    STDMETHOD(GetAllParameters)         (THIS_ LPDS3DLISTENER pListener) PURE;
+    STDMETHOD(GetDistanceFactor)        (THIS_ D3DVALUE* pflDistanceFactor) PURE;
+    STDMETHOD(GetDopplerFactor)         (THIS_ D3DVALUE* pflDopplerFactor) PURE;
+    STDMETHOD(GetOrientation)           (THIS_ D3DVECTOR* pvOrientFront, D3DVECTOR* pvOrientTop) PURE;
+    STDMETHOD(GetPosition)              (THIS_ D3DVECTOR* pvPosition) PURE;
+    STDMETHOD(GetRolloffFactor)         (THIS_ D3DVALUE* pflRolloffFactor) PURE;
+    STDMETHOD(GetVelocity)              (THIS_ D3DVECTOR* pvVelocity) PURE;
+    STDMETHOD(SetAllParameters)         (THIS_ LPCDS3DLISTENER pcListener, DWORD dwApply) PURE;
+    STDMETHOD(SetDistanceFactor)        (THIS_ D3DVALUE flDistanceFactor, DWORD dwApply) PURE;
+    STDMETHOD(SetDopplerFactor)         (THIS_ D3DVALUE flDopplerFactor, DWORD dwApply) PURE;
+    STDMETHOD(SetOrientation)           (THIS_ D3DVALUE xFront, D3DVALUE yFront, D3DVALUE zFront,
+                                               D3DVALUE xTop, D3DVALUE yTop, D3DVALUE zTop, DWORD dwApply) PURE;
+    STDMETHOD(SetPosition)              (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+    STDMETHOD(SetRolloffFactor)         (THIS_ D3DVALUE flRolloffFactor, DWORD dwApply) PURE;
+    STDMETHOD(SetVelocity)              (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+    STDMETHOD(CommitDeferredSettings)   (THIS) PURE;
+};
+
+#define IDirectSound3DListener_QueryInterface(p,a,b)            IUnknown_QueryInterface(p,a,b)
+#define IDirectSound3DListener_AddRef(p)                        IUnknown_AddRef(p)
+#define IDirectSound3DListener_Release(p)                       IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSound3DListener_GetAllParameters(p,a)            (p)->lpVtbl->GetAllParameters(p,a)
+#define IDirectSound3DListener_GetDistanceFactor(p,a)           (p)->lpVtbl->GetDistanceFactor(p,a)
+#define IDirectSound3DListener_GetDopplerFactor(p,a)            (p)->lpVtbl->GetDopplerFactor(p,a)
+#define IDirectSound3DListener_GetOrientation(p,a,b)            (p)->lpVtbl->GetOrientation(p,a,b)
+#define IDirectSound3DListener_GetPosition(p,a)                 (p)->lpVtbl->GetPosition(p,a)
+#define IDirectSound3DListener_GetRolloffFactor(p,a)            (p)->lpVtbl->GetRolloffFactor(p,a)
+#define IDirectSound3DListener_GetVelocity(p,a)                 (p)->lpVtbl->GetVelocity(p,a)
+#define IDirectSound3DListener_SetAllParameters(p,a,b)          (p)->lpVtbl->SetAllParameters(p,a,b)
+#define IDirectSound3DListener_SetDistanceFactor(p,a,b)         (p)->lpVtbl->SetDistanceFactor(p,a,b)
+#define IDirectSound3DListener_SetDopplerFactor(p,a,b)          (p)->lpVtbl->SetDopplerFactor(p,a,b)
+#define IDirectSound3DListener_SetOrientation(p,a,b,c,d,e,f,g)  (p)->lpVtbl->SetOrientation(p,a,b,c,d,e,f,g)
+#define IDirectSound3DListener_SetPosition(p,a,b,c,d)           (p)->lpVtbl->SetPosition(p,a,b,c,d)
+#define IDirectSound3DListener_SetRolloffFactor(p,a,b)          (p)->lpVtbl->SetRolloffFactor(p,a,b)
+#define IDirectSound3DListener_SetVelocity(p,a,b,c,d)           (p)->lpVtbl->SetVelocity(p,a,b,c,d)
+#define IDirectSound3DListener_CommitDeferredSettings(p)        (p)->lpVtbl->CommitDeferredSettings(p)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSound3DListener_GetAllParameters(p,a)            (p)->GetAllParameters(a)
+#define IDirectSound3DListener_GetDistanceFactor(p,a)           (p)->GetDistanceFactor(a)
+#define IDirectSound3DListener_GetDopplerFactor(p,a)            (p)->GetDopplerFactor(a)
+#define IDirectSound3DListener_GetOrientation(p,a,b)            (p)->GetOrientation(a,b)
+#define IDirectSound3DListener_GetPosition(p,a)                 (p)->GetPosition(a)
+#define IDirectSound3DListener_GetRolloffFactor(p,a)            (p)->GetRolloffFactor(a)
+#define IDirectSound3DListener_GetVelocity(p,a)                 (p)->GetVelocity(a)
+#define IDirectSound3DListener_SetAllParameters(p,a,b)          (p)->SetAllParameters(a,b)
+#define IDirectSound3DListener_SetDistanceFactor(p,a,b)         (p)->SetDistanceFactor(a,b)
+#define IDirectSound3DListener_SetDopplerFactor(p,a,b)          (p)->SetDopplerFactor(a,b)
+#define IDirectSound3DListener_SetOrientation(p,a,b,c,d,e,f,g)  (p)->SetOrientation(a,b,c,d,e,f,g)
+#define IDirectSound3DListener_SetPosition(p,a,b,c,d)           (p)->SetPosition(a,b,c,d)
+#define IDirectSound3DListener_SetRolloffFactor(p,a,b)          (p)->SetRolloffFactor(a,b)
+#define IDirectSound3DListener_SetVelocity(p,a,b,c,d)           (p)->SetVelocity(a,b,c,d)
+#define IDirectSound3DListener_CommitDeferredSettings(p)        (p)->CommitDeferredSettings()
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSound3DBuffer
+//
+
+DEFINE_GUID(IID_IDirectSound3DBuffer, 0x279AFA86, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
+
+#undef INTERFACE
+#define INTERFACE IDirectSound3DBuffer
+
+DECLARE_INTERFACE_(IDirectSound3DBuffer, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSound3DBuffer methods
+    STDMETHOD(GetAllParameters)     (THIS_ LPDS3DBUFFER pDs3dBuffer) PURE;
+    STDMETHOD(GetConeAngles)        (THIS_ LPDWORD pdwInsideConeAngle, LPDWORD pdwOutsideConeAngle) PURE;
+    STDMETHOD(GetConeOrientation)   (THIS_ D3DVECTOR* pvOrientation) PURE;
+    STDMETHOD(GetConeOutsideVolume) (THIS_ LPLONG plConeOutsideVolume) PURE;
+    STDMETHOD(GetMaxDistance)       (THIS_ D3DVALUE* pflMaxDistance) PURE;
+    STDMETHOD(GetMinDistance)       (THIS_ D3DVALUE* pflMinDistance) PURE;
+    STDMETHOD(GetMode)              (THIS_ LPDWORD pdwMode) PURE;
+    STDMETHOD(GetPosition)          (THIS_ D3DVECTOR* pvPosition) PURE;
+    STDMETHOD(GetVelocity)          (THIS_ D3DVECTOR* pvVelocity) PURE;
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDS3DBUFFER pcDs3dBuffer, DWORD dwApply) PURE;
+    STDMETHOD(SetConeAngles)        (THIS_ DWORD dwInsideConeAngle, DWORD dwOutsideConeAngle, DWORD dwApply) PURE;
+    STDMETHOD(SetConeOrientation)   (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+    STDMETHOD(SetConeOutsideVolume) (THIS_ LONG lConeOutsideVolume, DWORD dwApply) PURE;
+    STDMETHOD(SetMaxDistance)       (THIS_ D3DVALUE flMaxDistance, DWORD dwApply) PURE;
+    STDMETHOD(SetMinDistance)       (THIS_ D3DVALUE flMinDistance, DWORD dwApply) PURE;
+    STDMETHOD(SetMode)              (THIS_ DWORD dwMode, DWORD dwApply) PURE;
+    STDMETHOD(SetPosition)          (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+    STDMETHOD(SetVelocity)          (THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z, DWORD dwApply) PURE;
+};
+
+#define IDirectSound3DBuffer_QueryInterface(p,a,b)          IUnknown_QueryInterface(p,a,b)
+#define IDirectSound3DBuffer_AddRef(p)                      IUnknown_AddRef(p)
+#define IDirectSound3DBuffer_Release(p)                     IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSound3DBuffer_GetAllParameters(p,a)          (p)->lpVtbl->GetAllParameters(p,a)
+#define IDirectSound3DBuffer_GetConeAngles(p,a,b)           (p)->lpVtbl->GetConeAngles(p,a,b)
+#define IDirectSound3DBuffer_GetConeOrientation(p,a)        (p)->lpVtbl->GetConeOrientation(p,a)
+#define IDirectSound3DBuffer_GetConeOutsideVolume(p,a)      (p)->lpVtbl->GetConeOutsideVolume(p,a)
+#define IDirectSound3DBuffer_GetPosition(p,a)               (p)->lpVtbl->GetPosition(p,a)
+#define IDirectSound3DBuffer_GetMinDistance(p,a)            (p)->lpVtbl->GetMinDistance(p,a)
+#define IDirectSound3DBuffer_GetMaxDistance(p,a)            (p)->lpVtbl->GetMaxDistance(p,a)
+#define IDirectSound3DBuffer_GetMode(p,a)                   (p)->lpVtbl->GetMode(p,a)
+#define IDirectSound3DBuffer_GetVelocity(p,a)               (p)->lpVtbl->GetVelocity(p,a)
+#define IDirectSound3DBuffer_SetAllParameters(p,a,b)        (p)->lpVtbl->SetAllParameters(p,a,b)
+#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c)         (p)->lpVtbl->SetConeAngles(p,a,b,c)
+#define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d)  (p)->lpVtbl->SetConeOrientation(p,a,b,c,d)
+#define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b)    (p)->lpVtbl->SetConeOutsideVolume(p,a,b)
+#define IDirectSound3DBuffer_SetPosition(p,a,b,c,d)         (p)->lpVtbl->SetPosition(p,a,b,c,d)
+#define IDirectSound3DBuffer_SetMinDistance(p,a,b)          (p)->lpVtbl->SetMinDistance(p,a,b)
+#define IDirectSound3DBuffer_SetMaxDistance(p,a,b)          (p)->lpVtbl->SetMaxDistance(p,a,b)
+#define IDirectSound3DBuffer_SetMode(p,a,b)                 (p)->lpVtbl->SetMode(p,a,b)
+#define IDirectSound3DBuffer_SetVelocity(p,a,b,c,d)         (p)->lpVtbl->SetVelocity(p,a,b,c,d)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSound3DBuffer_GetAllParameters(p,a)          (p)->GetAllParameters(a)
+#define IDirectSound3DBuffer_GetConeAngles(p,a,b)           (p)->GetConeAngles(a,b)
+#define IDirectSound3DBuffer_GetConeOrientation(p,a)        (p)->GetConeOrientation(a)
+#define IDirectSound3DBuffer_GetConeOutsideVolume(p,a)      (p)->GetConeOutsideVolume(a)
+#define IDirectSound3DBuffer_GetPosition(p,a)               (p)->GetPosition(a)
+#define IDirectSound3DBuffer_GetMinDistance(p,a)            (p)->GetMinDistance(a)
+#define IDirectSound3DBuffer_GetMaxDistance(p,a)            (p)->GetMaxDistance(a)
+#define IDirectSound3DBuffer_GetMode(p,a)                   (p)->GetMode(a)
+#define IDirectSound3DBuffer_GetVelocity(p,a)               (p)->GetVelocity(a)
+#define IDirectSound3DBuffer_SetAllParameters(p,a,b)        (p)->SetAllParameters(a,b)
+#define IDirectSound3DBuffer_SetConeAngles(p,a,b,c)         (p)->SetConeAngles(a,b,c)
+#define IDirectSound3DBuffer_SetConeOrientation(p,a,b,c,d)  (p)->SetConeOrientation(a,b,c,d)
+#define IDirectSound3DBuffer_SetConeOutsideVolume(p,a,b)    (p)->SetConeOutsideVolume(a,b)
+#define IDirectSound3DBuffer_SetPosition(p,a,b,c,d)         (p)->SetPosition(a,b,c,d)
+#define IDirectSound3DBuffer_SetMinDistance(p,a,b)          (p)->SetMinDistance(a,b)
+#define IDirectSound3DBuffer_SetMaxDistance(p,a,b)          (p)->SetMaxDistance(a,b)
+#define IDirectSound3DBuffer_SetMode(p,a,b)                 (p)->SetMode(a,b)
+#define IDirectSound3DBuffer_SetVelocity(p,a,b,c,d)         (p)->SetVelocity(a,b,c,d)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSoundCapture
+//
+
+DEFINE_GUID(IID_IDirectSoundCapture, 0xb0210781, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundCapture
+
+DECLARE_INTERFACE_(IDirectSoundCapture, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundCapture methods
+    STDMETHOD(CreateCaptureBuffer)  (THIS_ LPCDSCBUFFERDESC pcDSCBufferDesc, LPDIRECTSOUNDCAPTUREBUFFER *ppDSCBuffer, LPUNKNOWN pUnkOuter) PURE;
+    STDMETHOD(GetCaps)              (THIS_ LPDSCCAPS pDSCCaps) PURE;
+    STDMETHOD(Initialize)           (THIS_ LPCGUID pcGuidDevice) PURE;
+};
+
+#define IDirectSoundCapture_QueryInterface(p,a,b)           IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundCapture_AddRef(p)                       IUnknown_AddRef(p)
+#define IDirectSoundCapture_Release(p)                      IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCapture_CreateCaptureBuffer(p,a,b,c)    (p)->lpVtbl->CreateCaptureBuffer(p,a,b,c)
+#define IDirectSoundCapture_GetCaps(p,a)                    (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSoundCapture_Initialize(p,a)                 (p)->lpVtbl->Initialize(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCapture_CreateCaptureBuffer(p,a,b,c)    (p)->CreateCaptureBuffer(a,b,c)
+#define IDirectSoundCapture_GetCaps(p,a)                    (p)->GetCaps(a)
+#define IDirectSoundCapture_Initialize(p,a)                 (p)->Initialize(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSoundCaptureBuffer
+//
+
+DEFINE_GUID(IID_IDirectSoundCaptureBuffer, 0xb0210782, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundCaptureBuffer
+
+DECLARE_INTERFACE_(IDirectSoundCaptureBuffer, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundCaptureBuffer methods
+    STDMETHOD(GetCaps)              (THIS_ LPDSCBCAPS pDSCBCaps) PURE;
+    STDMETHOD(GetCurrentPosition)   (THIS_ LPDWORD pdwCapturePosition, LPDWORD pdwReadPosition) PURE;
+    STDMETHOD(GetFormat)            (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE;
+    STDMETHOD(GetStatus)            (THIS_ LPDWORD pdwStatus) PURE;
+    STDMETHOD(Initialize)           (THIS_ LPDIRECTSOUNDCAPTURE pDirectSoundCapture, LPCDSCBUFFERDESC pcDSCBufferDesc) PURE;
+    STDMETHOD(Lock)                 (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
+                                           LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
+    STDMETHOD(Start)                (THIS_ DWORD dwFlags) PURE;
+    STDMETHOD(Stop)                 (THIS) PURE;
+    STDMETHOD(Unlock)               (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE;
+};
+
+#define IDirectSoundCaptureBuffer_QueryInterface(p,a,b)         IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundCaptureBuffer_AddRef(p)                     IUnknown_AddRef(p)
+#define IDirectSoundCaptureBuffer_Release(p)                    IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCaptureBuffer_GetCaps(p,a)                  (p)->lpVtbl->GetCaps(p,a)
+#define IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b)     (p)->lpVtbl->GetCurrentPosition(p,a,b)
+#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c)            (p)->lpVtbl->GetFormat(p,a,b,c)
+#define IDirectSoundCaptureBuffer_GetStatus(p,a)                (p)->lpVtbl->GetStatus(p,a)
+#define IDirectSoundCaptureBuffer_Initialize(p,a,b)             (p)->lpVtbl->Initialize(p,a,b)
+#define IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g)         (p)->lpVtbl->Lock(p,a,b,c,d,e,f,g)
+#define IDirectSoundCaptureBuffer_Start(p,a)                    (p)->lpVtbl->Start(p,a)
+#define IDirectSoundCaptureBuffer_Stop(p)                       (p)->lpVtbl->Stop(p)
+#define IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d)             (p)->lpVtbl->Unlock(p,a,b,c,d)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCaptureBuffer_GetCaps(p,a)                  (p)->GetCaps(a)
+#define IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b)     (p)->GetCurrentPosition(a,b)
+#define IDirectSoundCaptureBuffer_GetFormat(p,a,b,c)            (p)->GetFormat(a,b,c)
+#define IDirectSoundCaptureBuffer_GetStatus(p,a)                (p)->GetStatus(a)
+#define IDirectSoundCaptureBuffer_Initialize(p,a,b)             (p)->Initialize(a,b)
+#define IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g)         (p)->Lock(a,b,c,d,e,f,g)
+#define IDirectSoundCaptureBuffer_Start(p,a)                    (p)->Start(a)
+#define IDirectSoundCaptureBuffer_Stop(p)                       (p)->Stop()
+#define IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d)             (p)->Unlock(a,b,c,d)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+
+#if DIRECTSOUND_VERSION >= 0x0800
+
+//
+// IDirectSoundCaptureBuffer8
+//
+
+DEFINE_GUID(IID_IDirectSoundCaptureBuffer8, 0x990df4, 0xdbb, 0x4872, 0x83, 0x3e, 0x6d, 0x30, 0x3e, 0x80, 0xae, 0xb6);
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundCaptureBuffer8
+
+DECLARE_INTERFACE_(IDirectSoundCaptureBuffer8, IDirectSoundCaptureBuffer)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundCaptureBuffer methods
+    STDMETHOD(GetCaps)              (THIS_ LPDSCBCAPS pDSCBCaps) PURE;
+    STDMETHOD(GetCurrentPosition)   (THIS_ LPDWORD pdwCapturePosition, LPDWORD pdwReadPosition) PURE;
+    STDMETHOD(GetFormat)            (THIS_ LPWAVEFORMATEX pwfxFormat, DWORD dwSizeAllocated, LPDWORD pdwSizeWritten) PURE;
+    STDMETHOD(GetStatus)            (THIS_ LPDWORD pdwStatus) PURE;
+    STDMETHOD(Initialize)           (THIS_ LPDIRECTSOUNDCAPTURE pDirectSoundCapture, LPCDSCBUFFERDESC pcDSCBufferDesc) PURE;
+    STDMETHOD(Lock)                 (THIS_ DWORD dwOffset, DWORD dwBytes, LPVOID *ppvAudioPtr1, LPDWORD pdwAudioBytes1,
+                                           LPVOID *ppvAudioPtr2, LPDWORD pdwAudioBytes2, DWORD dwFlags) PURE;
+    STDMETHOD(Start)                (THIS_ DWORD dwFlags) PURE;
+    STDMETHOD(Stop)                 (THIS) PURE;
+    STDMETHOD(Unlock)               (THIS_ LPVOID pvAudioPtr1, DWORD dwAudioBytes1, LPVOID pvAudioPtr2, DWORD dwAudioBytes2) PURE;
+
+    // IDirectSoundCaptureBuffer8 methods
+    STDMETHOD(GetObjectInPath)      (THIS_ REFGUID rguidObject, DWORD dwIndex, REFGUID rguidInterface, LPVOID *ppObject) PURE;
+    STDMETHOD(GetFXStatus)          (DWORD dwFXCount, LPDWORD pdwFXStatus) PURE;
+};
+
+#define IDirectSoundCaptureBuffer8_QueryInterface(p,a,b)            IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundCaptureBuffer8_AddRef(p)                        IUnknown_AddRef(p)
+#define IDirectSoundCaptureBuffer8_Release(p)                       IUnknown_Release(p)
+
+#define IDirectSoundCaptureBuffer8_GetCaps(p,a)                     IDirectSoundCaptureBuffer_GetCaps(p,a)
+#define IDirectSoundCaptureBuffer8_GetCurrentPosition(p,a,b)        IDirectSoundCaptureBuffer_GetCurrentPosition(p,a,b)
+#define IDirectSoundCaptureBuffer8_GetFormat(p,a,b,c)               IDirectSoundCaptureBuffer_GetFormat(p,a,b,c)
+#define IDirectSoundCaptureBuffer8_GetStatus(p,a)                   IDirectSoundCaptureBuffer_GetStatus(p,a)
+#define IDirectSoundCaptureBuffer8_Initialize(p,a,b)                IDirectSoundCaptureBuffer_Initialize(p,a,b)
+#define IDirectSoundCaptureBuffer8_Lock(p,a,b,c,d,e,f,g)            IDirectSoundCaptureBuffer_Lock(p,a,b,c,d,e,f,g)
+#define IDirectSoundCaptureBuffer8_Start(p,a)                       IDirectSoundCaptureBuffer_Start(p,a)
+#define IDirectSoundCaptureBuffer8_Stop(p)                          IDirectSoundCaptureBuffer_Stop(p))
+#define IDirectSoundCaptureBuffer8_Unlock(p,a,b,c,d)                IDirectSoundCaptureBuffer_Unlock(p,a,b,c,d)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCaptureBuffer8_GetObjectInPath(p,a,b,c,d)       (p)->lpVtbl->GetObjectInPath(p,a,b,c,d)
+#define IDirectSoundCaptureBuffer8_GetFXStatus(p,a,b)               (p)->lpVtbl->GetFXStatus(p,a,b)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCaptureBuffer8_GetObjectInPath(p,a,b,c,d)       (p)->GetObjectInPath(a,b,c,d)
+#define IDirectSoundCaptureBuffer8_GetFXStatus(p,a,b)               (p)->GetFXStatus(a,b)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+//
+// IDirectSoundNotify
+//
+
+DEFINE_GUID(IID_IDirectSoundNotify, 0xb0210783, 0x89cd, 0x11d0, 0xaf, 0x8, 0x0, 0xa0, 0xc9, 0x25, 0xcd, 0x16);
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundNotify
+
+DECLARE_INTERFACE_(IDirectSoundNotify, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)           (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)            (THIS) PURE;
+    STDMETHOD_(ULONG,Release)           (THIS) PURE;
+
+    // IDirectSoundNotify methods
+    STDMETHOD(SetNotificationPositions) (THIS_ DWORD dwPositionNotifies, LPCDSBPOSITIONNOTIFY pcPositionNotifies) PURE;
+};
+
+#define IDirectSoundNotify_QueryInterface(p,a,b)            IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundNotify_AddRef(p)                        IUnknown_AddRef(p)
+#define IDirectSoundNotify_Release(p)                       IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundNotify_SetNotificationPositions(p,a,b)  (p)->lpVtbl->SetNotificationPositions(p,a,b)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundNotify_SetNotificationPositions(p,a,b)  (p)->SetNotificationPositions(a,b)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IKsPropertySet
+//
+
+#ifndef _IKsPropertySet_
+#define _IKsPropertySet_
+
+#ifdef __cplusplus
+// 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined
+struct IKsPropertySet;
+#endif // __cplusplus
+
+typedef struct IKsPropertySet *LPKSPROPERTYSET;
+
+#define KSPROPERTY_SUPPORT_GET  0x00000001
+#define KSPROPERTY_SUPPORT_SET  0x00000002
+
+DEFINE_GUID(IID_IKsPropertySet, 0x31efac30, 0x515c, 0x11d0, 0xa9, 0xaa, 0x00, 0xaa, 0x00, 0x61, 0xbe, 0x93);
+
+#undef INTERFACE
+#define INTERFACE IKsPropertySet
+
+DECLARE_INTERFACE_(IKsPropertySet, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)   (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)    (THIS) PURE;
+    STDMETHOD_(ULONG,Release)   (THIS) PURE;
+
+    // IKsPropertySet methods
+    STDMETHOD(Get)              (THIS_ REFGUID rguidPropSet, ULONG ulId, LPVOID pInstanceData, ULONG ulInstanceLength,
+                                       LPVOID pPropertyData, ULONG ulDataLength, PULONG pulBytesReturned) PURE;
+    STDMETHOD(Set)              (THIS_ REFGUID rguidPropSet, ULONG ulId, LPVOID pInstanceData, ULONG ulInstanceLength,
+                                       LPVOID pPropertyData, ULONG ulDataLength) PURE;
+    STDMETHOD(QuerySupport)     (THIS_ REFGUID rguidPropSet, ULONG ulId, PULONG pulTypeSupport) PURE;
+};
+
+#define IKsPropertySet_QueryInterface(p,a,b)       IUnknown_QueryInterface(p,a,b)
+#define IKsPropertySet_AddRef(p)                   IUnknown_AddRef(p)
+#define IKsPropertySet_Release(p)                  IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IKsPropertySet_Get(p,a,b,c,d,e,f,g)        (p)->lpVtbl->Get(p,a,b,c,d,e,f,g)
+#define IKsPropertySet_Set(p,a,b,c,d,e,f)          (p)->lpVtbl->Set(p,a,b,c,d,e,f)
+#define IKsPropertySet_QuerySupport(p,a,b,c)       (p)->lpVtbl->QuerySupport(p,a,b,c)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IKsPropertySet_Get(p,a,b,c,d,e,f,g)        (p)->Get(a,b,c,d,e,f,g)
+#define IKsPropertySet_Set(p,a,b,c,d,e,f)          (p)->Set(a,b,c,d,e,f)
+#define IKsPropertySet_QuerySupport(p,a,b,c)       (p)->QuerySupport(a,b,c)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+#endif // _IKsPropertySet_
+
+#if DIRECTSOUND_VERSION >= 0x0800
+
+//
+// IDirectSoundFXGargle
+//
+
+DEFINE_GUID(IID_IDirectSoundFXGargle, 0xd616f352, 0xd622, 0x11ce, 0xaa, 0xc5, 0x00, 0x20, 0xaf, 0x0b, 0x99, 0xa3);
+
+typedef struct _DSFXGargle
+{
+    DWORD       dwRateHz;               // Rate of modulation in hz
+    DWORD       dwWaveShape;            // DSFXGARGLE_WAVE_xxx
+} DSFXGargle, *LPDSFXGargle;
+
+#define DSFXGARGLE_WAVE_TRIANGLE        0
+#define DSFXGARGLE_WAVE_SQUARE          1
+
+typedef const DSFXGargle *LPCDSFXGargle;
+
+#define DSFXGARGLE_RATEHZ_MIN           1
+#define DSFXGARGLE_RATEHZ_MAX           1000
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFXGargle
+
+DECLARE_INTERFACE_(IDirectSoundFXGargle, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundFXGargle methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSFXGargle pcDsFxGargle) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSFXGargle pDsFxGargle) PURE;
+};
+
+#define IDirectSoundFXGargle_QueryInterface(p,a,b)          IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFXGargle_AddRef(p)                      IUnknown_AddRef(p)
+#define IDirectSoundFXGargle_Release(p)                     IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXGargle_SetAllParameters(p,a)          (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundFXGargle_GetAllParameters(p,a)          (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXGargle_SetAllParameters(p,a)          (p)->SetAllParameters(a)
+#define IDirectSoundFXGargle_GetAllParameters(p,a)          (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSoundFXChorus
+//
+
+DEFINE_GUID(IID_IDirectSoundFXChorus, 0x880842e3, 0x145f, 0x43e6, 0xa9, 0x34, 0xa7, 0x18, 0x06, 0xe5, 0x05, 0x47);
+
+typedef struct _DSFXChorus
+{
+    FLOAT       fWetDryMix;
+    FLOAT       fDepth;
+    FLOAT       fFeedback;
+    FLOAT       fFrequency;
+    LONG        lWaveform;          // LFO shape; DSFXCHORUS_WAVE_xxx
+    FLOAT       fDelay;
+    LONG        lPhase;
+} DSFXChorus, *LPDSFXChorus;
+
+typedef const DSFXChorus *LPCDSFXChorus;
+
+#define DSFXCHORUS_WAVE_TRIANGLE        0
+#define DSFXCHORUS_WAVE_SIN             1
+
+#define DSFXCHORUS_WETDRYMIX_MIN        0.0f
+#define DSFXCHORUS_WETDRYMIX_MAX        100.0f
+#define DSFXCHORUS_DEPTH_MIN            0.0f
+#define DSFXCHORUS_DEPTH_MAX            100.0f
+#define DSFXCHORUS_FEEDBACK_MIN         -99.0f
+#define DSFXCHORUS_FEEDBACK_MAX         99.0f
+#define DSFXCHORUS_FREQUENCY_MIN        0.0f
+#define DSFXCHORUS_FREQUENCY_MAX        10.0f
+#define DSFXCHORUS_DELAY_MIN            0.0f
+#define DSFXCHORUS_DELAY_MAX            20.0f
+#define DSFXCHORUS_PHASE_MIN            0
+#define DSFXCHORUS_PHASE_MAX            4
+
+#define DSFXCHORUS_PHASE_NEG_180        0
+#define DSFXCHORUS_PHASE_NEG_90         1
+#define DSFXCHORUS_PHASE_ZERO           2
+#define DSFXCHORUS_PHASE_90             3
+#define DSFXCHORUS_PHASE_180            4
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFXChorus
+
+DECLARE_INTERFACE_(IDirectSoundFXChorus, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundFXChorus methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSFXChorus pcDsFxChorus) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSFXChorus pDsFxChorus) PURE;
+};
+
+#define IDirectSoundFXChorus_QueryInterface(p,a,b)          IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFXChorus_AddRef(p)                      IUnknown_AddRef(p)
+#define IDirectSoundFXChorus_Release(p)                     IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXChorus_SetAllParameters(p,a)          (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundFXChorus_GetAllParameters(p,a)          (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXChorus_SetAllParameters(p,a)          (p)->SetAllParameters(a)
+#define IDirectSoundFXChorus_GetAllParameters(p,a)          (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSoundFXFlanger
+//
+
+DEFINE_GUID(IID_IDirectSoundFXFlanger, 0x903e9878, 0x2c92, 0x4072, 0x9b, 0x2c, 0xea, 0x68, 0xf5, 0x39, 0x67, 0x83);
+
+typedef struct _DSFXFlanger
+{
+    FLOAT       fWetDryMix;
+    FLOAT       fDepth;
+    FLOAT       fFeedback;
+    FLOAT       fFrequency;
+    LONG        lWaveform;
+    FLOAT       fDelay;
+    LONG        lPhase;
+} DSFXFlanger, *LPDSFXFlanger;
+
+typedef const DSFXFlanger *LPCDSFXFlanger;
+
+#define DSFXFLANGER_WAVE_TRIANGLE       0
+#define DSFXFLANGER_WAVE_SIN            1
+
+#define DSFXFLANGER_WETDRYMIX_MIN       0.0f
+#define DSFXFLANGER_WETDRYMIX_MAX       100.0f
+#define DSFXFLANGER_FREQUENCY_MIN       0.0f
+#define DSFXFLANGER_FREQUENCY_MAX       10.0f
+#define DSFXFLANGER_DEPTH_MIN           0.0f
+#define DSFXFLANGER_DEPTH_MAX           100.0f
+#define DSFXFLANGER_PHASE_MIN           0
+#define DSFXFLANGER_PHASE_MAX           4
+#define DSFXFLANGER_FEEDBACK_MIN        -99.0f
+#define DSFXFLANGER_FEEDBACK_MAX        99.0f
+#define DSFXFLANGER_DELAY_MIN           0.0f
+#define DSFXFLANGER_DELAY_MAX           4.0f
+
+#define DSFXFLANGER_PHASE_NEG_180       0
+#define DSFXFLANGER_PHASE_NEG_90        1
+#define DSFXFLANGER_PHASE_ZERO          2
+#define DSFXFLANGER_PHASE_90            3
+#define DSFXFLANGER_PHASE_180           4
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFXFlanger
+
+DECLARE_INTERFACE_(IDirectSoundFXFlanger, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundFXFlanger methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSFXFlanger pcDsFxFlanger) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSFXFlanger pDsFxFlanger) PURE;
+};
+
+#define IDirectSoundFXFlanger_QueryInterface(p,a,b)         IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFXFlanger_AddRef(p)                     IUnknown_AddRef(p)
+#define IDirectSoundFXFlanger_Release(p)                    IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXFlanger_SetAllParameters(p,a)         (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundFXFlanger_GetAllParameters(p,a)         (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXFlanger_SetAllParameters(p,a)         (p)->SetAllParameters(a)
+#define IDirectSoundFXFlanger_GetAllParameters(p,a)         (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSoundFXEcho
+//
+
+DEFINE_GUID(IID_IDirectSoundFXEcho, 0x8bd28edf, 0x50db, 0x4e92, 0xa2, 0xbd, 0x44, 0x54, 0x88, 0xd1, 0xed, 0x42);
+
+typedef struct _DSFXEcho
+{
+    FLOAT   fWetDryMix;
+    FLOAT   fFeedback;
+    FLOAT   fLeftDelay;
+    FLOAT   fRightDelay;
+    LONG    lPanDelay;
+} DSFXEcho, *LPDSFXEcho;
+
+typedef const DSFXEcho *LPCDSFXEcho;
+
+#define DSFXECHO_WETDRYMIX_MIN      0.0f
+#define DSFXECHO_WETDRYMIX_MAX      100.0f
+#define DSFXECHO_FEEDBACK_MIN       0.0f
+#define DSFXECHO_FEEDBACK_MAX       100.0f
+#define DSFXECHO_LEFTDELAY_MIN      1.0f
+#define DSFXECHO_LEFTDELAY_MAX      2000.0f
+#define DSFXECHO_RIGHTDELAY_MIN     1.0f
+#define DSFXECHO_RIGHTDELAY_MAX     2000.0f
+#define DSFXECHO_PANDELAY_MIN       0
+#define DSFXECHO_PANDELAY_MAX       1
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFXEcho
+
+DECLARE_INTERFACE_(IDirectSoundFXEcho, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundFXEcho methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSFXEcho pcDsFxEcho) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSFXEcho pDsFxEcho) PURE;
+};
+
+#define IDirectSoundFXEcho_QueryInterface(p,a,b)            IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFXEcho_AddRef(p)                        IUnknown_AddRef(p)
+#define IDirectSoundFXEcho_Release(p)                       IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXEcho_SetAllParameters(p,a)            (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundFXEcho_GetAllParameters(p,a)            (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXEcho_SetAllParameters(p,a)            (p)->SetAllParameters(a)
+#define IDirectSoundFXEcho_GetAllParameters(p,a)            (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSoundFXDistortion
+//
+
+DEFINE_GUID(IID_IDirectSoundFXDistortion, 0x8ecf4326, 0x455f, 0x4d8b, 0xbd, 0xa9, 0x8d, 0x5d, 0x3e, 0x9e, 0x3e, 0x0b);
+
+typedef struct _DSFXDistortion
+{
+    FLOAT   fGain;
+    FLOAT   fEdge;
+    FLOAT   fPostEQCenterFrequency;
+    FLOAT   fPostEQBandwidth;
+    FLOAT   fPreLowpassCutoff;
+} DSFXDistortion, *LPDSFXDistortion;
+
+typedef const DSFXDistortion *LPCDSFXDistortion;
+
+#define DSFXDISTORTION_GAIN_MIN                     -60.0f
+#define DSFXDISTORTION_GAIN_MAX                     0.0f
+#define DSFXDISTORTION_EDGE_MIN                     0.0f
+#define DSFXDISTORTION_EDGE_MAX                     100.0f
+#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MIN    100.0f
+#define DSFXDISTORTION_POSTEQCENTERFREQUENCY_MAX    8000.0f
+#define DSFXDISTORTION_POSTEQBANDWIDTH_MIN          100.0f
+#define DSFXDISTORTION_POSTEQBANDWIDTH_MAX          8000.0f
+#define DSFXDISTORTION_PRELOWPASSCUTOFF_MIN         100.0f
+#define DSFXDISTORTION_PRELOWPASSCUTOFF_MAX         8000.0f
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFXDistortion
+
+DECLARE_INTERFACE_(IDirectSoundFXDistortion, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundFXDistortion methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSFXDistortion pcDsFxDistortion) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSFXDistortion pDsFxDistortion) PURE;
+};
+
+#define IDirectSoundFXDistortion_QueryInterface(p,a,b)      IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFXDistortion_AddRef(p)                  IUnknown_AddRef(p)
+#define IDirectSoundFXDistortion_Release(p)                 IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXDistortion_SetAllParameters(p,a)      (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundFXDistortion_GetAllParameters(p,a)      (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXDistortion_SetAllParameters(p,a)      (p)->SetAllParameters(a)
+#define IDirectSoundFXDistortion_GetAllParameters(p,a)      (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSoundFXCompressor
+//
+
+DEFINE_GUID(IID_IDirectSoundFXCompressor, 0x4bbd1154, 0x62f6, 0x4e2c, 0xa1, 0x5c, 0xd3, 0xb6, 0xc4, 0x17, 0xf7, 0xa0);
+
+typedef struct _DSFXCompressor
+{
+    FLOAT   fGain;
+    FLOAT   fAttack;
+    FLOAT   fRelease;
+    FLOAT   fThreshold;
+    FLOAT   fRatio;
+    FLOAT   fPredelay;
+} DSFXCompressor, *LPDSFXCompressor;
+
+typedef const DSFXCompressor *LPCDSFXCompressor;
+
+#define DSFXCOMPRESSOR_GAIN_MIN             -60.0f
+#define DSFXCOMPRESSOR_GAIN_MAX             60.0f
+#define DSFXCOMPRESSOR_ATTACK_MIN           0.01f
+#define DSFXCOMPRESSOR_ATTACK_MAX           500.0f
+#define DSFXCOMPRESSOR_RELEASE_MIN          50.0f
+#define DSFXCOMPRESSOR_RELEASE_MAX          3000.0f
+#define DSFXCOMPRESSOR_THRESHOLD_MIN        -60.0f
+#define DSFXCOMPRESSOR_THRESHOLD_MAX        0.0f
+#define DSFXCOMPRESSOR_RATIO_MIN            1.0f
+#define DSFXCOMPRESSOR_RATIO_MAX            100.0f
+#define DSFXCOMPRESSOR_PREDELAY_MIN         0.0f
+#define DSFXCOMPRESSOR_PREDELAY_MAX         4.0f
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFXCompressor
+
+DECLARE_INTERFACE_(IDirectSoundFXCompressor, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundFXCompressor methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSFXCompressor pcDsFxCompressor) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSFXCompressor pDsFxCompressor) PURE;
+};
+
+#define IDirectSoundFXCompressor_QueryInterface(p,a,b)      IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFXCompressor_AddRef(p)                  IUnknown_AddRef(p)
+#define IDirectSoundFXCompressor_Release(p)                 IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXCompressor_SetAllParameters(p,a)      (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundFXCompressor_GetAllParameters(p,a)      (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXCompressor_SetAllParameters(p,a)      (p)->SetAllParameters(a)
+#define IDirectSoundFXCompressor_GetAllParameters(p,a)      (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSoundFXParamEq
+//
+
+DEFINE_GUID(IID_IDirectSoundFXParamEq, 0xc03ca9fe, 0xfe90, 0x4204, 0x80, 0x78, 0x82, 0x33, 0x4c, 0xd1, 0x77, 0xda);
+
+typedef struct _DSFXParamEq
+{
+    FLOAT   fCenter;
+    FLOAT   fBandwidth;
+    FLOAT   fGain;
+} DSFXParamEq, *LPDSFXParamEq;
+
+typedef const DSFXParamEq *LPCDSFXParamEq;
+
+#define DSFXPARAMEQ_CENTER_MIN      80.0f
+#define DSFXPARAMEQ_CENTER_MAX      16000.0f
+#define DSFXPARAMEQ_BANDWIDTH_MIN   1.0f
+#define DSFXPARAMEQ_BANDWIDTH_MAX   36.0f
+#define DSFXPARAMEQ_GAIN_MIN        -15.0f
+#define DSFXPARAMEQ_GAIN_MAX        15.0f
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFXParamEq
+
+DECLARE_INTERFACE_(IDirectSoundFXParamEq, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundFXParamEq methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSFXParamEq pcDsFxParamEq) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSFXParamEq pDsFxParamEq) PURE;
+};
+
+#define IDirectSoundFXParamEq_QueryInterface(p,a,b)      IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFXParamEq_AddRef(p)                  IUnknown_AddRef(p)
+#define IDirectSoundFXParamEq_Release(p)                 IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXParamEq_SetAllParameters(p,a)      (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundFXParamEq_GetAllParameters(p,a)      (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXParamEq_SetAllParameters(p,a)      (p)->SetAllParameters(a)
+#define IDirectSoundFXParamEq_GetAllParameters(p,a)      (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+
+//
+// IDirectSoundFXI3DL2Reverb
+//
+
+DEFINE_GUID(IID_IDirectSoundFXI3DL2Reverb, 0x4b166a6a, 0x0d66, 0x43f3, 0x80, 0xe3, 0xee, 0x62, 0x80, 0xde, 0xe1, 0xa4);
+
+typedef struct _DSFXI3DL2Reverb
+{
+    LONG    lRoom;                  // [-10000, 0]      default: -1000 mB
+    LONG    lRoomHF;                // [-10000, 0]      default: 0 mB
+    FLOAT   flRoomRolloffFactor;    // [0.0, 10.0]      default: 0.0
+    FLOAT   flDecayTime;            // [0.1, 20.0]      default: 1.49s
+    FLOAT   flDecayHFRatio;         // [0.1, 2.0]       default: 0.83
+    LONG    lReflections;           // [-10000, 1000]   default: -2602 mB
+    FLOAT   flReflectionsDelay;     // [0.0, 0.3]       default: 0.007 s
+    LONG    lReverb;                // [-10000, 2000]   default: 200 mB
+    FLOAT   flReverbDelay;          // [0.0, 0.1]       default: 0.011 s
+    FLOAT   flDiffusion;            // [0.0, 100.0]     default: 100.0 %
+    FLOAT   flDensity;              // [0.0, 100.0]     default: 100.0 %
+    FLOAT   flHFReference;          // [20.0, 20000.0]  default: 5000.0 Hz
+} DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb;
+
+typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb;
+
+#define DSFX_I3DL2REVERB_ROOM_MIN                   (-10000)
+#define DSFX_I3DL2REVERB_ROOM_MAX                   0
+#define DSFX_I3DL2REVERB_ROOM_DEFAULT               (-1000)
+                                                    
+#define DSFX_I3DL2REVERB_ROOMHF_MIN                 (-10000)
+#define DSFX_I3DL2REVERB_ROOMHF_MAX                 0
+#define DSFX_I3DL2REVERB_ROOMHF_DEFAULT             (-100)
+                                                    
+#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MIN      0.0f
+#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MAX      10.0f
+#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_DEFAULT  0.0f
+
+#define DSFX_I3DL2REVERB_DECAYTIME_MIN              0.1f
+#define DSFX_I3DL2REVERB_DECAYTIME_MAX              20.0f
+#define DSFX_I3DL2REVERB_DECAYTIME_DEFAULT          1.49f
+                                                    
+#define DSFX_I3DL2REVERB_DECAYHFRATIO_MIN           0.1f
+#define DSFX_I3DL2REVERB_DECAYHFRATIO_MAX           2.0f
+#define DSFX_I3DL2REVERB_DECAYHFRATIO_DEFAULT       0.83f
+                                                    
+#define DSFX_I3DL2REVERB_REFLECTIONS_MIN            (-10000)
+#define DSFX_I3DL2REVERB_REFLECTIONS_MAX            1000
+#define DSFX_I3DL2REVERB_REFLECTIONS_DEFAULT        (-2602)
+                                                    
+#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MIN       0.0f
+#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MAX       0.3f
+#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_DEFAULT   0.007f
+
+#define DSFX_I3DL2REVERB_REVERB_MIN                 (-10000)
+#define DSFX_I3DL2REVERB_REVERB_MAX                 2000
+#define DSFX_I3DL2REVERB_REVERB_DEFAULT             (200)
+                                                    
+#define DSFX_I3DL2REVERB_REVERBDELAY_MIN            0.0f
+#define DSFX_I3DL2REVERB_REVERBDELAY_MAX            0.1f
+#define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT        0.011f
+                                                    
+#define DSFX_I3DL2REVERB_DIFFUSION_MIN              0.0f
+#define DSFX_I3DL2REVERB_DIFFUSION_MAX              100.0f
+#define DSFX_I3DL2REVERB_DIFFUSION_DEFAULT          100.0f
+                                                    
+#define DSFX_I3DL2REVERB_DENSITY_MIN                0.0f
+#define DSFX_I3DL2REVERB_DENSITY_MAX                100.0f
+#define DSFX_I3DL2REVERB_DENSITY_DEFAULT            100.0f
+                                                    
+#define DSFX_I3DL2REVERB_HFREFERENCE_MIN            20.0f
+#define DSFX_I3DL2REVERB_HFREFERENCE_MAX            20000.0f
+#define DSFX_I3DL2REVERB_HFREFERENCE_DEFAULT        5000.0f
+                                                    
+#define DSFX_I3DL2REVERB_QUALITY_MIN                0
+#define DSFX_I3DL2REVERB_QUALITY_MAX                3
+#define DSFX_I3DL2REVERB_QUALITY_DEFAULT            2
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFXI3DL2Reverb
+
+DECLARE_INTERFACE_(IDirectSoundFXI3DL2Reverb, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundFXI3DL2Reverb methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSFXI3DL2Reverb pcDsFxI3DL2Reverb) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSFXI3DL2Reverb pDsFxI3DL2Reverb) PURE;
+    STDMETHOD(SetPreset)            (THIS_ DWORD dwPreset) PURE;
+    STDMETHOD(GetPreset)            (THIS_ LPDWORD pdwPreset) PURE;
+    STDMETHOD(SetQuality)           (THIS_ LONG lQuality) PURE;
+    STDMETHOD(GetQuality)           (THIS_ LONG *plQuality) PURE;
+};
+
+#define IDirectSoundFXI3DL2Reverb_QueryInterface(p,a,b)     IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFXI3DL2Reverb_AddRef(p)                 IUnknown_AddRef(p)
+#define IDirectSoundFXI3DL2Reverb_Release(p)                IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a)     (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a)     (p)->lpVtbl->GetAllParameters(p,a)
+#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a)            (p)->lpVtbl->SetPreset(p,a)
+#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a)            (p)->lpVtbl->GetPreset(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXI3DL2Reverb_SetAllParameters(p,a)     (p)->SetAllParameters(a)
+#define IDirectSoundFXI3DL2Reverb_GetAllParameters(p,a)     (p)->GetAllParameters(a)
+#define IDirectSoundFXI3DL2Reverb_SetPreset(p,a)            (p)->SetPreset(a)
+#define IDirectSoundFXI3DL2Reverb_GetPreset(p,a)            (p)->GetPreset(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+
+//
+// IDirectSoundFXWavesReverb
+//
+
+DEFINE_GUID(IID_IDirectSoundFXWavesReverb,0x46858c3a,0x0dc6,0x45e3,0xb7,0x60,0xd4,0xee,0xf1,0x6c,0xb3,0x25);
+
+typedef struct _DSFXWavesReverb
+{
+    FLOAT   fInGain;                // [-96.0,0.0]            default: 0.0 dB
+    FLOAT   fReverbMix;             // [-96.0,0.0]            default: 0.0 db
+    FLOAT   fReverbTime;            // [0.001,3000.0]         default: 1000.0 ms
+    FLOAT   fHighFreqRTRatio;       // [0.001,0.999]          default: 0.001
+} DSFXWavesReverb, *LPDSFXWavesReverb;
+
+typedef const DSFXWavesReverb *LPCDSFXWavesReverb;
+
+#define DSFX_WAVESREVERB_INGAIN_MIN                 -96.0f
+#define DSFX_WAVESREVERB_INGAIN_MAX                 0.0f
+#define DSFX_WAVESREVERB_INGAIN_DEFAULT             0.0f
+#define DSFX_WAVESREVERB_REVERBMIX_MIN              -96.0f
+#define DSFX_WAVESREVERB_REVERBMIX_MAX              0.0f
+#define DSFX_WAVESREVERB_REVERBMIX_DEFAULT          0.0f
+#define DSFX_WAVESREVERB_REVERBTIME_MIN             0.001f
+#define DSFX_WAVESREVERB_REVERBTIME_MAX             3000.0f
+#define DSFX_WAVESREVERB_REVERBTIME_DEFAULT         1000.0f
+#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MIN        0.001f
+#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_MAX        0.999f
+#define DSFX_WAVESREVERB_HIGHFREQRTRATIO_DEFAULT    0.001f
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFXWavesReverb
+
+DECLARE_INTERFACE_(IDirectSoundFXWavesReverb, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundFXWavesReverb methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSFXWavesReverb pcDsFxWavesReverb) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSFXWavesReverb pDsFxWavesReverb) PURE;
+};
+
+#define IDirectSoundFXWavesReverb_QueryInterface(p,a,b)     IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFXWavesReverb_AddRef(p)                 IUnknown_AddRef(p)
+#define IDirectSoundFXWavesReverb_Release(p)                IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXWavesReverb_SetAllParameters(p,a)     (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundFXWavesReverb_GetAllParameters(p,a)     (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFXWavesReverb_SetAllParameters(p,a)     (p)->SetAllParameters(a)
+#define IDirectSoundFXWavesReverb_GetAllParameters(p,a)     (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+//
+// IDirectSoundCaptureFXAec
+//
+
+DEFINE_GUID(IID_IDirectSoundCaptureFXAec, 0xad74143d, 0x903d, 0x4ab7, 0x80, 0x66, 0x28, 0xd3, 0x63, 0x03, 0x6d, 0x65);
+
+typedef struct _DSCFXAec
+{
+    BOOL    fEnable;
+    BOOL    fNoiseFill;
+    DWORD   dwMode;
+} DSCFXAec, *LPDSCFXAec;
+
+typedef const DSCFXAec *LPCDSCFXAec;
+
+// These match the AEC_MODE_* constants in the DDK's ksmedia.h file
+#define DSCFX_AEC_MODE_PASS_THROUGH                     0x0
+#define DSCFX_AEC_MODE_HALF_DUPLEX                      0x1
+#define DSCFX_AEC_MODE_FULL_DUPLEX                      0x2
+
+// These match the AEC_STATUS_* constants in ksmedia.h
+#define DSCFX_AEC_STATUS_HISTORY_UNINITIALIZED          0x0
+#define DSCFX_AEC_STATUS_HISTORY_CONTINUOUSLY_CONVERGED 0x1
+#define DSCFX_AEC_STATUS_HISTORY_PREVIOUSLY_DIVERGED    0x2
+#define DSCFX_AEC_STATUS_CURRENTLY_CONVERGED            0x8
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundCaptureFXAec
+
+DECLARE_INTERFACE_(IDirectSoundCaptureFXAec, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundCaptureFXAec methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSCFXAec pDscFxAec) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSCFXAec pDscFxAec) PURE;
+    STDMETHOD(GetStatus)            (THIS_ PDWORD pdwStatus) PURE;
+    STDMETHOD(Reset)                (THIS) PURE;
+};
+
+#define IDirectSoundCaptureFXAec_QueryInterface(p,a,b)     IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundCaptureFXAec_AddRef(p)                 IUnknown_AddRef(p)
+#define IDirectSoundCaptureFXAec_Release(p)                IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCaptureFXAec_SetAllParameters(p,a)     (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundCaptureFXAec_GetAllParameters(p,a)     (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCaptureFXAec_SetAllParameters(p,a)     (p)->SetAllParameters(a)
+#define IDirectSoundCaptureFXAec_GetAllParameters(p,a)     (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+
+//
+// IDirectSoundCaptureFXNoiseSuppress
+//
+
+DEFINE_GUID(IID_IDirectSoundCaptureFXNoiseSuppress, 0xed311e41, 0xfbae, 0x4175, 0x96, 0x25, 0xcd, 0x8, 0x54, 0xf6, 0x93, 0xca);
+
+typedef struct _DSCFXNoiseSuppress
+{
+    BOOL    fEnable;
+} DSCFXNoiseSuppress, *LPDSCFXNoiseSuppress;
+
+typedef const DSCFXNoiseSuppress *LPCDSCFXNoiseSuppress;
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundCaptureFXNoiseSuppress
+
+DECLARE_INTERFACE_(IDirectSoundCaptureFXNoiseSuppress, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)       (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)        (THIS) PURE;
+    STDMETHOD_(ULONG,Release)       (THIS) PURE;
+
+    // IDirectSoundCaptureFXNoiseSuppress methods
+    STDMETHOD(SetAllParameters)     (THIS_ LPCDSCFXNoiseSuppress pcDscFxNoiseSuppress) PURE;
+    STDMETHOD(GetAllParameters)     (THIS_ LPDSCFXNoiseSuppress pDscFxNoiseSuppress) PURE;
+    STDMETHOD(Reset)                (THIS) PURE;
+};
+
+#define IDirectSoundCaptureFXNoiseSuppress_QueryInterface(p,a,b)     IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundCaptureFXNoiseSuppress_AddRef(p)                 IUnknown_AddRef(p)
+#define IDirectSoundCaptureFXNoiseSuppress_Release(p)                IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCaptureFXNoiseSuppress_SetAllParameters(p,a)     (p)->lpVtbl->SetAllParameters(p,a)
+#define IDirectSoundCaptureFXNoiseSuppress_GetAllParameters(p,a)     (p)->lpVtbl->GetAllParameters(p,a)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundCaptureFXNoiseSuppress_SetAllParameters(p,a)     (p)->SetAllParameters(a)
+#define IDirectSoundCaptureFXNoiseSuppress_GetAllParameters(p,a)     (p)->GetAllParameters(a)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+
+//
+// IDirectSoundFullDuplex
+//
+
+#ifndef _IDirectSoundFullDuplex_
+#define _IDirectSoundFullDuplex_
+
+#ifdef __cplusplus
+// 'struct' not 'class' per the way DECLARE_INTERFACE_ is defined
+struct IDirectSoundFullDuplex;
+#endif // __cplusplus
+
+typedef struct IDirectSoundFullDuplex *LPDIRECTSOUNDFULLDUPLEX;
+
+DEFINE_GUID(IID_IDirectSoundFullDuplex, 0xedcb4c7a, 0xdaab, 0x4216, 0xa4, 0x2e, 0x6c, 0x50, 0x59, 0x6d, 0xdc, 0x1d);
+
+#undef INTERFACE
+#define INTERFACE IDirectSoundFullDuplex
+
+DECLARE_INTERFACE_(IDirectSoundFullDuplex, IUnknown)
+{
+    // IUnknown methods
+    STDMETHOD(QueryInterface)   (THIS_ REFIID, LPVOID *) PURE;
+    STDMETHOD_(ULONG,AddRef)    (THIS) PURE;
+    STDMETHOD_(ULONG,Release)   (THIS) PURE;
+
+    // IDirectSoundFullDuplex methods 
+    STDMETHOD(Initialize)     (THIS_ LPCGUID pCaptureGuid, LPCGUID pRenderGuid, LPCDSCBUFFERDESC lpDscBufferDesc, LPCDSBUFFERDESC lpDsBufferDesc, HWND hWnd, DWORD dwLevel, LPLPDIRECTSOUNDCAPTUREBUFFER8 lplpDirectSoundCaptureBuffer8, LPLPDIRECTSOUNDBUFFER8 lplpDirectSoundBuffer8) PURE;
+};
+
+#define IDirectSoundFullDuplex_QueryInterface(p,a,b)    IUnknown_QueryInterface(p,a,b)
+#define IDirectSoundFullDuplex_AddRef(p)                IUnknown_AddRef(p)
+#define IDirectSoundFullDuplex_Release(p)               IUnknown_Release(p)
+
+#if !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h)     (p)->lpVtbl->Initialize(p,a,b,c,d,e,f,g,h)
+#else // !defined(__cplusplus) || defined(CINTERFACE)
+#define IDirectSoundFullDuplex_Initialize(p,a,b,c,d,e,f,g,h)     (p)->Initialize(a,b,c,d,e,f,g,h)
+#endif // !defined(__cplusplus) || defined(CINTERFACE)
+
+#endif // _IDirectSoundFullDuplex_
+
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+//
+// Return Codes
+//
+
+// The function completed successfully
+#define DS_OK                           S_OK
+
+// The call succeeded, but we had to substitute the 3D algorithm
+#define DS_NO_VIRTUALIZATION            MAKE_HRESULT(0, _FACDS, 10)
+
+// The call succeeded, but not all of the optional effects were obtained.
+#define DS_INCOMPLETE                   MAKE_HRESULT(0, _FACDS, 20)
+
+// The call failed because resources (such as a priority level)
+// were already being used by another caller
+#define DSERR_ALLOCATED                 MAKE_DSHRESULT(10)
+
+// The control (vol, pan, etc.) requested by the caller is not available
+#define DSERR_CONTROLUNAVAIL            MAKE_DSHRESULT(30)
+
+// An invalid parameter was passed to the returning function
+#define DSERR_INVALIDPARAM              E_INVALIDARG
+
+// This call is not valid for the current state of this object
+#define DSERR_INVALIDCALL               MAKE_DSHRESULT(50)
+
+// An undetermined error occurred inside the DirectSound subsystem
+#define DSERR_GENERIC                   E_FAIL
+
+// The caller does not have the priority level required for the function to
+// succeed
+#define DSERR_PRIOLEVELNEEDED           MAKE_DSHRESULT(70)
+
+// Not enough free memory is available to complete the operation
+#define DSERR_OUTOFMEMORY               E_OUTOFMEMORY
+
+// The specified WAVE format is not supported
+#define DSERR_BADFORMAT                 MAKE_DSHRESULT(100)
+
+// The function called is not supported at this time
+#define DSERR_UNSUPPORTED               E_NOTIMPL
+
+// No sound driver is available for use
+#define DSERR_NODRIVER                  MAKE_DSHRESULT(120)
+
+// This object is already initialized
+#define DSERR_ALREADYINITIALIZED        MAKE_DSHRESULT(130)
+
+// This object does not support aggregation
+#define DSERR_NOAGGREGATION             CLASS_E_NOAGGREGATION
+
+// The buffer memory has been lost, and must be restored
+#define DSERR_BUFFERLOST                MAKE_DSHRESULT(150)
+
+// Another app has a higher priority level, preventing this call from
+// succeeding
+#define DSERR_OTHERAPPHASPRIO           MAKE_DSHRESULT(160)
+
+// This object has not been initialized
+#define DSERR_UNINITIALIZED             MAKE_DSHRESULT(170)
+
+// The requested COM interface is not available
+#define DSERR_NOINTERFACE               E_NOINTERFACE
+
+// Access is denied
+#define DSERR_ACCESSDENIED              E_ACCESSDENIED
+
+// Tried to create a DSBCAPS_CTRLFX buffer shorter than DSBSIZE_FX_MIN milliseconds
+#define DSERR_BUFFERTOOSMALL            MAKE_DSHRESULT(180)
+
+// Attempt to use DirectSound 8 functionality on an older DirectSound object
+#define DSERR_DS8_REQUIRED              MAKE_DSHRESULT(190)
+
+// A circular loop of send effects was detected
+#define DSERR_SENDLOOP                  MAKE_DSHRESULT(200)
+
+// The GUID specified in an audiopath file does not match a valid MIXIN buffer
+#define DSERR_BADSENDBUFFERGUID         MAKE_DSHRESULT(210)
+
+// The object requested was not found (numerically equal to DMUS_E_NOT_FOUND)
+#define DSERR_OBJECTNOTFOUND            MAKE_DSHRESULT(4449)
+
+// The effects requested could not be found on the system, or they were found
+// but in the wrong order, or in the wrong hardware/software locations.
+#define DSERR_FXUNAVAILABLE             MAKE_DSHRESULT(220)
+
+//
+// Flags
+//
+
+#define DSCAPS_PRIMARYMONO          0x00000001
+#define DSCAPS_PRIMARYSTEREO        0x00000002
+#define DSCAPS_PRIMARY8BIT          0x00000004
+#define DSCAPS_PRIMARY16BIT         0x00000008
+#define DSCAPS_CONTINUOUSRATE       0x00000010
+#define DSCAPS_EMULDRIVER           0x00000020
+#define DSCAPS_CERTIFIED            0x00000040
+#define DSCAPS_SECONDARYMONO        0x00000100
+#define DSCAPS_SECONDARYSTEREO      0x00000200
+#define DSCAPS_SECONDARY8BIT        0x00000400
+#define DSCAPS_SECONDARY16BIT       0x00000800
+
+#define DSSCL_NORMAL                0x00000001
+#define DSSCL_PRIORITY              0x00000002
+#define DSSCL_EXCLUSIVE             0x00000003
+#define DSSCL_WRITEPRIMARY          0x00000004
+
+#define DSSPEAKER_DIRECTOUT         0x00000000
+#define DSSPEAKER_HEADPHONE         0x00000001
+#define DSSPEAKER_MONO              0x00000002
+#define DSSPEAKER_QUAD              0x00000003
+#define DSSPEAKER_STEREO            0x00000004
+#define DSSPEAKER_SURROUND          0x00000005
+#define DSSPEAKER_5POINT1           0x00000006
+#define DSSPEAKER_7POINT1           0x00000007
+
+#define DSSPEAKER_GEOMETRY_MIN      0x00000005  //   5 degrees
+#define DSSPEAKER_GEOMETRY_NARROW   0x0000000A  //  10 degrees
+#define DSSPEAKER_GEOMETRY_WIDE     0x00000014  //  20 degrees
+#define DSSPEAKER_GEOMETRY_MAX      0x000000B4  // 180 degrees
+
+#define DSSPEAKER_COMBINED(c, g)    ((DWORD)(((BYTE)(c)) | ((DWORD)((BYTE)(g))) << 16))
+#define DSSPEAKER_CONFIG(a)         ((BYTE)(a))
+#define DSSPEAKER_GEOMETRY(a)       ((BYTE)(((DWORD)(a) >> 16) & 0x00FF))
+
+#define DSBCAPS_PRIMARYBUFFER       0x00000001
+#define DSBCAPS_STATIC              0x00000002
+#define DSBCAPS_LOCHARDWARE         0x00000004
+#define DSBCAPS_LOCSOFTWARE         0x00000008
+#define DSBCAPS_CTRL3D              0x00000010
+#define DSBCAPS_CTRLFREQUENCY       0x00000020
+#define DSBCAPS_CTRLPAN             0x00000040
+#define DSBCAPS_CTRLVOLUME          0x00000080
+#define DSBCAPS_CTRLPOSITIONNOTIFY  0x00000100
+#define DSBCAPS_CTRLFX              0x00000200
+#define DSBCAPS_STICKYFOCUS         0x00004000
+#define DSBCAPS_GLOBALFOCUS         0x00008000
+#define DSBCAPS_GETCURRENTPOSITION2 0x00010000
+#define DSBCAPS_MUTE3DATMAXDISTANCE 0x00020000
+#define DSBCAPS_LOCDEFER            0x00040000
+
+#define DSBPLAY_LOOPING             0x00000001
+#define DSBPLAY_LOCHARDWARE         0x00000002
+#define DSBPLAY_LOCSOFTWARE         0x00000004
+#define DSBPLAY_TERMINATEBY_TIME    0x00000008
+#define DSBPLAY_TERMINATEBY_DISTANCE    0x000000010
+#define DSBPLAY_TERMINATEBY_PRIORITY    0x000000020
+
+#define DSBSTATUS_PLAYING           0x00000001
+#define DSBSTATUS_BUFFERLOST        0x00000002
+#define DSBSTATUS_LOOPING           0x00000004
+#define DSBSTATUS_LOCHARDWARE       0x00000008
+#define DSBSTATUS_LOCSOFTWARE       0x00000010
+#define DSBSTATUS_TERMINATED        0x00000020
+
+#define DSBLOCK_FROMWRITECURSOR     0x00000001
+#define DSBLOCK_ENTIREBUFFER        0x00000002
+
+#define DSBFREQUENCY_MIN            100
+#define DSBFREQUENCY_MAX            100000
+#define DSBFREQUENCY_ORIGINAL       0
+
+#define DSBPAN_LEFT                 -10000
+#define DSBPAN_CENTER               0
+#define DSBPAN_RIGHT                10000
+
+#define DSBVOLUME_MIN               -10000
+#define DSBVOLUME_MAX               0
+
+#define DSBSIZE_MIN                 4
+#define DSBSIZE_MAX                 0x0FFFFFFF
+#define DSBSIZE_FX_MIN              150  // NOTE: Milliseconds, not bytes
+
+#define DS3DMODE_NORMAL             0x00000000
+#define DS3DMODE_HEADRELATIVE       0x00000001
+#define DS3DMODE_DISABLE            0x00000002
+
+#define DS3D_IMMEDIATE              0x00000000
+#define DS3D_DEFERRED               0x00000001
+
+#define DS3D_MINDISTANCEFACTOR      FLT_MIN
+#define DS3D_MAXDISTANCEFACTOR      FLT_MAX
+#define DS3D_DEFAULTDISTANCEFACTOR  1.0f
+
+#define DS3D_MINROLLOFFFACTOR       0.0f
+#define DS3D_MAXROLLOFFFACTOR       10.0f
+#define DS3D_DEFAULTROLLOFFFACTOR   1.0f
+
+#define DS3D_MINDOPPLERFACTOR       0.0f
+#define DS3D_MAXDOPPLERFACTOR       10.0f
+#define DS3D_DEFAULTDOPPLERFACTOR   1.0f
+
+#define DS3D_DEFAULTMINDISTANCE     1.0f
+#define DS3D_DEFAULTMAXDISTANCE     1000000000.0f
+
+#define DS3D_MINCONEANGLE           0
+#define DS3D_MAXCONEANGLE           360
+#define DS3D_DEFAULTCONEANGLE       360
+
+#define DS3D_DEFAULTCONEOUTSIDEVOLUME DSBVOLUME_MAX
+
+// IDirectSoundCapture attributes
+
+#define DSCCAPS_EMULDRIVER          DSCAPS_EMULDRIVER
+#define DSCCAPS_CERTIFIED           DSCAPS_CERTIFIED
+
+// IDirectSoundCaptureBuffer attributes
+
+#define DSCBCAPS_WAVEMAPPED         0x80000000
+
+#if DIRECTSOUND_VERSION >= 0x0800
+#define DSCBCAPS_CTRLFX             0x00000200
+#endif
+
+
+#define DSCBLOCK_ENTIREBUFFER       0x00000001
+
+#define DSCBSTATUS_CAPTURING        0x00000001
+#define DSCBSTATUS_LOOPING          0x00000002
+
+#define DSCBSTART_LOOPING           0x00000001
+
+#define DSBPN_OFFSETSTOP            0xFFFFFFFF
+
+#define DS_CERTIFIED                0x00000000
+#define DS_UNCERTIFIED              0x00000001
+
+
+//
+// I3DL2 Material Presets
+//
+
+enum
+{
+    DSFX_I3DL2_MATERIAL_PRESET_SINGLEWINDOW,
+    DSFX_I3DL2_MATERIAL_PRESET_DOUBLEWINDOW,
+    DSFX_I3DL2_MATERIAL_PRESET_THINDOOR,
+    DSFX_I3DL2_MATERIAL_PRESET_THICKDOOR,
+    DSFX_I3DL2_MATERIAL_PRESET_WOODWALL,
+    DSFX_I3DL2_MATERIAL_PRESET_BRICKWALL,
+    DSFX_I3DL2_MATERIAL_PRESET_STONEWALL,
+    DSFX_I3DL2_MATERIAL_PRESET_CURTAIN
+};
+
+#define I3DL2_MATERIAL_PRESET_SINGLEWINDOW    -2800,0.71f
+#define I3DL2_MATERIAL_PRESET_DOUBLEWINDOW    -5000,0.40f
+#define I3DL2_MATERIAL_PRESET_THINDOOR        -1800,0.66f
+#define I3DL2_MATERIAL_PRESET_THICKDOOR       -4400,0.64f
+#define I3DL2_MATERIAL_PRESET_WOODWALL        -4000,0.50f
+#define I3DL2_MATERIAL_PRESET_BRICKWALL       -5000,0.60f
+#define I3DL2_MATERIAL_PRESET_STONEWALL       -6000,0.68f
+#define I3DL2_MATERIAL_PRESET_CURTAIN         -1200,0.15f
+
+
+enum
+{
+    DSFX_I3DL2_ENVIRONMENT_PRESET_DEFAULT,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_GENERIC,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_PADDEDCELL,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_ROOM,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_BATHROOM,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_LIVINGROOM,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_STONEROOM,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_AUDITORIUM,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_CONCERTHALL,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_CAVE,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_ARENA,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_HANGAR,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_HALLWAY,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_ALLEY,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_FOREST,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_CITY,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_MOUNTAINS,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_QUARRY,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_PLAIN,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_PARKINGLOT,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_SEWERPIPE,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_UNDERWATER,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_SMALLROOM,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEROOM,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEHALL,
+    DSFX_I3DL2_ENVIRONMENT_PRESET_PLATE
+};
+
+//
+// I3DL2 Reverberation Presets Values
+//
+
+#define I3DL2_ENVIRONMENT_PRESET_DEFAULT         -1000, -100, 0.0f, 1.49f, 0.83f, -2602, 0.007f,   200, 0.011f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_GENERIC         -1000, -100, 0.0f, 1.49f, 0.83f, -2602, 0.007f,   200, 0.011f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_PADDEDCELL      -1000,-6000, 0.0f, 0.17f, 0.10f, -1204, 0.001f,   207, 0.002f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_ROOM            -1000, -454, 0.0f, 0.40f, 0.83f, -1646, 0.002f,    53, 0.003f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_BATHROOM        -1000,-1200, 0.0f, 1.49f, 0.54f,  -370, 0.007f,  1030, 0.011f, 100.0f,  60.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_LIVINGROOM      -1000,-6000, 0.0f, 0.50f, 0.10f, -1376, 0.003f, -1104, 0.004f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_STONEROOM       -1000, -300, 0.0f, 2.31f, 0.64f,  -711, 0.012f,    83, 0.017f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_AUDITORIUM      -1000, -476, 0.0f, 4.32f, 0.59f,  -789, 0.020f,  -289, 0.030f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_CONCERTHALL     -1000, -500, 0.0f, 3.92f, 0.70f, -1230, 0.020f,    -2, 0.029f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_CAVE            -1000,    0, 0.0f, 2.91f, 1.30f,  -602, 0.015f,  -302, 0.022f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_ARENA           -1000, -698, 0.0f, 7.24f, 0.33f, -1166, 0.020f,    16, 0.030f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_HANGAR          -1000,-1000, 0.0f,10.05f, 0.23f,  -602, 0.020f,   198, 0.030f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY -1000,-4000, 0.0f, 0.30f, 0.10f, -1831, 0.002f, -1630, 0.030f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_HALLWAY         -1000, -300, 0.0f, 1.49f, 0.59f, -1219, 0.007f,   441, 0.011f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR   -1000, -237, 0.0f, 2.70f, 0.79f, -1214, 0.013f,   395, 0.020f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_ALLEY           -1000, -270, 0.0f, 1.49f, 0.86f, -1204, 0.007f,    -4, 0.011f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_FOREST          -1000,-3300, 0.0f, 1.49f, 0.54f, -2560, 0.162f,  -613, 0.088f,  79.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_CITY            -1000, -800, 0.0f, 1.49f, 0.67f, -2273, 0.007f, -2217, 0.011f,  50.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_MOUNTAINS       -1000,-2500, 0.0f, 1.49f, 0.21f, -2780, 0.300f, -2014, 0.100f,  27.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_QUARRY          -1000,-1000, 0.0f, 1.49f, 0.83f,-10000, 0.061f,   500, 0.025f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_PLAIN           -1000,-2000, 0.0f, 1.49f, 0.50f, -2466, 0.179f, -2514, 0.100f,  21.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_PARKINGLOT      -1000,    0, 0.0f, 1.65f, 1.50f, -1363, 0.008f, -1153, 0.012f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_SEWERPIPE       -1000,-1000, 0.0f, 2.81f, 0.14f,   429, 0.014f,   648, 0.021f,  80.0f,  60.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_UNDERWATER      -1000,-4000, 0.0f, 1.49f, 0.10f,  -449, 0.007f,  1700, 0.011f, 100.0f, 100.0f, 5000.0f
+
+//
+// Examples simulating 'musical' reverb presets
+//
+// Name       Decay time   Description
+// Small Room    1.1s      A small size room with a length of 5m or so.
+// Medium Room   1.3s      A medium size room with a length of 10m or so.
+// Large Room    1.5s      A large size room suitable for live performances.
+// Medium Hall   1.8s      A medium size concert hall.
+// Large Hall    1.8s      A large size concert hall suitable for a full orchestra.
+// Plate         1.3s      A plate reverb simulation.
+//
+
+#define I3DL2_ENVIRONMENT_PRESET_SMALLROOM       -1000, -600, 0.0f, 1.10f, 0.83f,  -400, 0.005f,   500, 0.010f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM      -1000, -600, 0.0f, 1.30f, 0.83f, -1000, 0.010f,  -200, 0.020f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_LARGEROOM       -1000, -600, 0.0f, 1.50f, 0.83f, -1600, 0.020f, -1000, 0.040f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL      -1000, -600, 0.0f, 1.80f, 0.70f, -1300, 0.015f,  -800, 0.030f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_LARGEHALL       -1000, -600, 0.0f, 1.80f, 0.70f, -2000, 0.030f, -1400, 0.060f, 100.0f, 100.0f, 5000.0f
+#define I3DL2_ENVIRONMENT_PRESET_PLATE           -1000, -200, 0.0f, 1.30f, 0.90f,     0, 0.002f,     0, 0.010f, 100.0f,  75.0f, 5000.0f
+
+//
+// DirectSound3D Algorithms
+//
+
+// Default DirectSound3D algorithm {00000000-0000-0000-0000-000000000000}
+#define DS3DALG_DEFAULT GUID_NULL
+
+// No virtualization (Pan3D) {C241333F-1C1B-11d2-94F5-00C04FC28ACA}
+DEFINE_GUID(DS3DALG_NO_VIRTUALIZATION, 0xc241333f, 0x1c1b, 0x11d2, 0x94, 0xf5, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca);
+
+// High-quality HRTF algorithm {C2413340-1C1B-11d2-94F5-00C04FC28ACA}
+DEFINE_GUID(DS3DALG_HRTF_FULL, 0xc2413340, 0x1c1b, 0x11d2, 0x94, 0xf5, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca);
+
+// Lower-quality HRTF algorithm {C2413342-1C1B-11d2-94F5-00C04FC28ACA}
+DEFINE_GUID(DS3DALG_HRTF_LIGHT, 0xc2413342, 0x1c1b, 0x11d2, 0x94, 0xf5, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca);
+
+
+#if DIRECTSOUND_VERSION >= 0x0800
+
+//
+// DirectSound Internal Effect Algorithms
+//
+
+
+// Gargle {DAFD8210-5711-4B91-9FE3-F75B7AE279BF}
+DEFINE_GUID(GUID_DSFX_STANDARD_GARGLE, 0xdafd8210, 0x5711, 0x4b91, 0x9f, 0xe3, 0xf7, 0x5b, 0x7a, 0xe2, 0x79, 0xbf);
+
+// Chorus {EFE6629C-81F7-4281-BD91-C9D604A95AF6}
+DEFINE_GUID(GUID_DSFX_STANDARD_CHORUS, 0xefe6629c, 0x81f7, 0x4281, 0xbd, 0x91, 0xc9, 0xd6, 0x04, 0xa9, 0x5a, 0xf6);
+
+// Flanger {EFCA3D92-DFD8-4672-A603-7420894BAD98}
+DEFINE_GUID(GUID_DSFX_STANDARD_FLANGER, 0xefca3d92, 0xdfd8, 0x4672, 0xa6, 0x03, 0x74, 0x20, 0x89, 0x4b, 0xad, 0x98);
+
+// Echo/Delay {EF3E932C-D40B-4F51-8CCF-3F98F1B29D5D}
+DEFINE_GUID(GUID_DSFX_STANDARD_ECHO, 0xef3e932c, 0xd40b, 0x4f51, 0x8c, 0xcf, 0x3f, 0x98, 0xf1, 0xb2, 0x9d, 0x5d);
+
+// Distortion {EF114C90-CD1D-484E-96E5-09CFAF912A21}
+DEFINE_GUID(GUID_DSFX_STANDARD_DISTORTION, 0xef114c90, 0xcd1d, 0x484e, 0x96, 0xe5, 0x09, 0xcf, 0xaf, 0x91, 0x2a, 0x21);
+
+// Compressor/Limiter {EF011F79-4000-406D-87AF-BFFB3FC39D57}
+DEFINE_GUID(GUID_DSFX_STANDARD_COMPRESSOR, 0xef011f79, 0x4000, 0x406d, 0x87, 0xaf, 0xbf, 0xfb, 0x3f, 0xc3, 0x9d, 0x57);
+
+// Parametric Equalization {120CED89-3BF4-4173-A132-3CB406CF3231}
+DEFINE_GUID(GUID_DSFX_STANDARD_PARAMEQ, 0x120ced89, 0x3bf4, 0x4173, 0xa1, 0x32, 0x3c, 0xb4, 0x06, 0xcf, 0x32, 0x31);
+
+
+// I3DL2 Environmental Reverberation: Reverb (Listener) Effect {EF985E71-D5C7-42D4-BA4D-2D073E2E96F4}
+DEFINE_GUID(GUID_DSFX_STANDARD_I3DL2REVERB, 0xef985e71, 0xd5c7, 0x42d4, 0xba, 0x4d, 0x2d, 0x07, 0x3e, 0x2e, 0x96, 0xf4);
+
+// Waves Reverberation {87FC0268-9A55-4360-95AA-004A1D9DE26C}
+DEFINE_GUID(GUID_DSFX_WAVES_REVERB, 0x87fc0268, 0x9a55, 0x4360, 0x95, 0xaa, 0x00, 0x4a, 0x1d, 0x9d, 0xe2, 0x6c);
+
+//
+// DirectSound Capture Effect Algorithms
+//
+
+
+// Acoustic Echo Canceller {BF963D80-C559-11D0-8A2B-00A0C9255AC1}
+// Matches KSNODETYPE_ACOUSTIC_ECHO_CANCEL in ksmedia.h
+DEFINE_GUID(GUID_DSCFX_CLASS_AEC, 0xBF963D80L, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1);
+
+// Microsoft AEC {CDEBB919-379A-488a-8765-F53CFD36DE40}
+DEFINE_GUID(GUID_DSCFX_MS_AEC, 0xcdebb919, 0x379a, 0x488a, 0x87, 0x65, 0xf5, 0x3c, 0xfd, 0x36, 0xde, 0x40);
+
+// System AEC {1C22C56D-9879-4f5b-A389-27996DDC2810}
+DEFINE_GUID(GUID_DSCFX_SYSTEM_AEC, 0x1c22c56d, 0x9879, 0x4f5b, 0xa3, 0x89, 0x27, 0x99, 0x6d, 0xdc, 0x28, 0x10);
+
+// Noise Supression {E07F903F-62FD-4e60-8CDD-DEA7236665B5}
+// Matches KSNODETYPE_NOISE_SUPPRESS in post Windows ME DDK's ksmedia.h
+DEFINE_GUID(GUID_DSCFX_CLASS_NS, 0xe07f903f, 0x62fd, 0x4e60, 0x8c, 0xdd, 0xde, 0xa7, 0x23, 0x66, 0x65, 0xb5);
+
+// Microsoft Noise Suppresion {11C5C73B-66E9-4ba1-A0BA-E814C6EED92D}
+DEFINE_GUID(GUID_DSCFX_MS_NS, 0x11c5c73b, 0x66e9, 0x4ba1, 0xa0, 0xba, 0xe8, 0x14, 0xc6, 0xee, 0xd9, 0x2d);
+
+// System Noise Suppresion {5AB0882E-7274-4516-877D-4EEE99BA4FD0}
+DEFINE_GUID(GUID_DSCFX_SYSTEM_NS, 0x5ab0882e, 0x7274, 0x4516, 0x87, 0x7d, 0x4e, 0xee, 0x99, 0xba, 0x4f, 0xd0);
+
+#endif // DIRECTSOUND_VERSION >= 0x0800
+
+#endif // __DSOUND_INCLUDED__
+
+
+
+#ifdef __cplusplus
+};
+#endif // __cplusplus
+
+
diff --git a/Source/3rd Party/directx/lib64/dinput8.lib b/Source/3rd Party/directx/lib64/dinput8.lib
new file mode 100644
index 000000000..fcd91e148
Binary files /dev/null and b/Source/3rd Party/directx/lib64/dinput8.lib differ
diff --git a/Source/3rd Party/directx/lib64/dxguid.lib b/Source/3rd Party/directx/lib64/dxguid.lib
new file mode 100644
index 000000000..f3994f9c4
Binary files /dev/null and b/Source/3rd Party/directx/lib64/dxguid.lib differ
diff --git a/Source/3rd Party/sdl/include/SDL.h b/Source/3rd Party/sdl/include/SDL.h
new file mode 100644
index 000000000..a9077095f
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL.h	
@@ -0,0 +1,163 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL.h
+ *
+ *  Main include header for the SDL library
+ */
+
+/**
+ *  \mainpage Simple DirectMedia Layer (SDL)
+ *
+ *  http://www.libsdl.org/
+ *
+ *  \section intro_sec Introduction
+ *
+ *  Simple DirectMedia Layer is a cross-platform development library designed
+ *  to provide low level access to audio, keyboard, mouse, joystick, and
+ *  graphics hardware via OpenGL and Direct3D. It is used by video playback
+ *  software, emulators, and popular games including Valve's award winning
+ *  catalog and many Humble Bundle games.
+ *
+ *  SDL officially supports Windows, Mac OS X, Linux, iOS, and Android.
+ *  Support for other platforms may be found in the source code.
+ *
+ *  SDL is written in C, works natively with C++, and there are bindings 
+ *  available for several other languages, including C# and Python.
+ *
+ *  This library is distributed under the zlib license, which can be found
+ *  in the file "COPYING.txt".
+ *
+ *  The best way to learn how to use SDL is to check out the header files in
+ *  the "include" subdirectory and the programs in the "test" subdirectory.
+ *  The header files and test programs are well commented and always up to date.
+ *  More documentation and FAQs are available online at:
+ *      http://wiki.libsdl.org/
+ *
+ *  If you need help with the library, or just want to discuss SDL related
+ *  issues, you can join the developers mailing list:
+ *      http://www.libsdl.org/mailing-list.php
+ *
+ *  Enjoy!
+ *      Sam Lantinga                (slouken@libsdl.org)
+ */
+
+#ifndef _SDL_H
+#define _SDL_H
+
+#include "SDL_main.h"
+#include "SDL_stdinc.h"
+#include "SDL_assert.h"
+#include "SDL_atomic.h"
+#include "SDL_audio.h"
+#include "SDL_clipboard.h"
+#include "SDL_cpuinfo.h"
+#include "SDL_endian.h"
+#include "SDL_error.h"
+#include "SDL_events.h"
+#include "SDL_filesystem.h"
+#include "SDL_joystick.h"
+#include "SDL_gamecontroller.h"
+#include "SDL_haptic.h"
+#include "SDL_hints.h"
+#include "SDL_loadso.h"
+#include "SDL_log.h"
+#include "SDL_messagebox.h"
+#include "SDL_mutex.h"
+#include "SDL_power.h"
+#include "SDL_render.h"
+#include "SDL_rwops.h"
+#include "SDL_system.h"
+#include "SDL_thread.h"
+#include "SDL_timer.h"
+#include "SDL_version.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* As of version 0.5, SDL is loaded dynamically into the application */
+
+/**
+ *  \name SDL_INIT_*
+ *
+ *  These are the flags which may be passed to SDL_Init().  You should
+ *  specify the subsystems which you will be using in your application.
+ */
+/* @{ */
+#define SDL_INIT_TIMER          0x00000001
+#define SDL_INIT_AUDIO          0x00000010
+#define SDL_INIT_VIDEO          0x00000020  /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
+#define SDL_INIT_JOYSTICK       0x00000200  /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */
+#define SDL_INIT_HAPTIC         0x00001000
+#define SDL_INIT_GAMECONTROLLER 0x00002000  /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */
+#define SDL_INIT_EVENTS         0x00004000
+#define SDL_INIT_NOPARACHUTE    0x00100000  /**< Don't catch fatal signals */
+#define SDL_INIT_EVERYTHING ( \
+                SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
+                SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \
+            )
+/* @} */
+
+/**
+ *  This function initializes  the subsystems specified by \c flags
+ *  Unless the ::SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
+ *  signal handlers for some commonly ignored fatal signals (like SIGSEGV).
+ */
+extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
+
+/**
+ *  This function initializes specific SDL subsystems
+ */
+extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
+
+/**
+ *  This function cleans up specific SDL subsystems
+ */
+extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
+
+/**
+ *  This function returns a mask of the specified subsystems which have
+ *  previously been initialized.
+ *
+ *  If \c flags is 0, it returns a mask of all initialized subsystems.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
+
+/**
+ *  This function cleans up all initialized subsystems. You should
+ *  call it upon all exit conditions.
+ */
+extern DECLSPEC void SDLCALL SDL_Quit(void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_H */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_assert.h b/Source/3rd Party/sdl/include/SDL_assert.h
new file mode 100644
index 000000000..42348f7d1
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_assert.h	
@@ -0,0 +1,284 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_assert_h
+#define _SDL_assert_h
+
+#include "SDL_config.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef SDL_ASSERT_LEVEL
+#ifdef SDL_DEFAULT_ASSERT_LEVEL
+#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL
+#elif defined(_DEBUG) || defined(DEBUG) || \
+      (defined(__GNUC__) && !defined(__OPTIMIZE__))
+#define SDL_ASSERT_LEVEL 2
+#else
+#define SDL_ASSERT_LEVEL 1
+#endif
+#endif /* SDL_ASSERT_LEVEL */
+
+/*
+These are macros and not first class functions so that the debugger breaks
+on the assertion line and not in some random guts of SDL, and so each
+assert can have unique static variables associated with it.
+*/
+
+#if defined(_MSC_VER)
+/* Don't include intrin.h here because it contains C++ code */
+    extern void __cdecl __debugbreak(void);
+    #define SDL_TriggerBreakpoint() __debugbreak()
+#elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
+    #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
+#elif defined(HAVE_SIGNAL_H)
+    #include <signal.h>
+    #define SDL_TriggerBreakpoint() raise(SIGTRAP)
+#else
+    /* How do we trigger breakpoints on this platform? */
+    #define SDL_TriggerBreakpoint()
+#endif
+
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */
+#   define SDL_FUNCTION __func__
+#elif ((__GNUC__ >= 2) || defined(_MSC_VER))
+#   define SDL_FUNCTION __FUNCTION__
+#else
+#   define SDL_FUNCTION "???"
+#endif
+#define SDL_FILE    __FILE__
+#define SDL_LINE    __LINE__
+
+/*
+sizeof (x) makes the compiler still parse the expression even without
+assertions enabled, so the code is always checked at compile time, but
+doesn't actually generate code for it, so there are no side effects or
+expensive checks at run time, just the constant size of what x WOULD be,
+which presumably gets optimized out as unused.
+This also solves the problem of...
+
+    int somevalue = blah();
+    SDL_assert(somevalue == 1);
+
+...which would cause compiles to complain that somevalue is unused if we
+disable assertions.
+*/
+
+#ifdef _MSC_VER  /* stupid /W4 warnings. */
+#define SDL_NULL_WHILE_LOOP_CONDITION (-1 == __LINE__)
+#else
+#define SDL_NULL_WHILE_LOOP_CONDITION (0)
+#endif
+
+#define SDL_disabled_assert(condition) \
+    do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION)
+
+typedef enum
+{
+    SDL_ASSERTION_RETRY,  /**< Retry the assert immediately. */
+    SDL_ASSERTION_BREAK,  /**< Make the debugger trigger a breakpoint. */
+    SDL_ASSERTION_ABORT,  /**< Terminate the program. */
+    SDL_ASSERTION_IGNORE,  /**< Ignore the assert. */
+    SDL_ASSERTION_ALWAYS_IGNORE  /**< Ignore the assert from now on. */
+} SDL_assert_state;
+
+typedef struct SDL_assert_data
+{
+    int always_ignore;
+    unsigned int trigger_count;
+    const char *condition;
+    const char *filename;
+    int linenum;
+    const char *function;
+    const struct SDL_assert_data *next;
+} SDL_assert_data;
+
+#if (SDL_ASSERT_LEVEL > 0)
+
+/* Never call this directly. Use the SDL_assert* macros. */
+extern DECLSPEC SDL_assert_state SDLCALL SDL_ReportAssertion(SDL_assert_data *,
+                                                             const char *,
+                                                             const char *, int)
+#if defined(__clang__)
+#if __has_feature(attribute_analyzer_noreturn)
+/* this tells Clang's static analysis that we're a custom assert function,
+   and that the analyzer should assume the condition was always true past this
+   SDL_assert test. */
+   __attribute__((analyzer_noreturn))
+#endif
+#endif
+;
+
+/* the do {} while(0) avoids dangling else problems:
+    if (x) SDL_assert(y); else blah();
+       ... without the do/while, the "else" could attach to this macro's "if".
+   We try to handle just the minimum we need here in a macro...the loop,
+   the static vars, and break points. The heavy lifting is handled in
+   SDL_ReportAssertion(), in SDL_assert.c.
+*/
+#define SDL_enabled_assert(condition) \
+    do { \
+        while ( !(condition) ) { \
+            static struct SDL_assert_data assert_data = { \
+                0, 0, #condition, 0, 0, 0, 0 \
+            }; \
+            const SDL_assert_state state = SDL_ReportAssertion(&assert_data, \
+                                                               SDL_FUNCTION, \
+                                                               SDL_FILE, \
+                                                               SDL_LINE); \
+            if (state == SDL_ASSERTION_RETRY) { \
+                continue; /* go again. */ \
+            } else if (state == SDL_ASSERTION_BREAK) { \
+                SDL_TriggerBreakpoint(); \
+            } \
+            break; /* not retrying. */ \
+        } \
+    } while (SDL_NULL_WHILE_LOOP_CONDITION)
+
+#endif  /* enabled assertions support code */
+
+/* Enable various levels of assertions. */
+#if SDL_ASSERT_LEVEL == 0   /* assertions disabled */
+#   define SDL_assert(condition) SDL_disabled_assert(condition)
+#   define SDL_assert_release(condition) SDL_disabled_assert(condition)
+#   define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
+#elif SDL_ASSERT_LEVEL == 1  /* release settings. */
+#   define SDL_assert(condition) SDL_disabled_assert(condition)
+#   define SDL_assert_release(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
+#elif SDL_ASSERT_LEVEL == 2  /* normal settings. */
+#   define SDL_assert(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_release(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
+#elif SDL_ASSERT_LEVEL == 3  /* paranoid settings. */
+#   define SDL_assert(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_release(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_paranoid(condition) SDL_enabled_assert(condition)
+#else
+#   error Unknown assertion level.
+#endif
+
+/* this assertion is never disabled at any level. */
+#define SDL_assert_always(condition) SDL_enabled_assert(condition)
+
+
+typedef SDL_assert_state (SDLCALL *SDL_AssertionHandler)(
+                                 const SDL_assert_data* data, void* userdata);
+
+/**
+ *  \brief Set an application-defined assertion handler.
+ *
+ *  This allows an app to show its own assertion UI and/or force the
+ *  response to an assertion failure. If the app doesn't provide this, SDL
+ *  will try to do the right thing, popping up a system-specific GUI dialog,
+ *  and probably minimizing any fullscreen windows.
+ *
+ *  This callback may fire from any thread, but it runs wrapped in a mutex, so
+ *  it will only fire from one thread at a time.
+ *
+ *  Setting the callback to NULL restores SDL's original internal handler.
+ *
+ *  This callback is NOT reset to SDL's internal handler upon SDL_Quit()!
+ *
+ *  \return SDL_assert_state value of how to handle the assertion failure.
+ *
+ *  \param handler Callback function, called when an assertion fails.
+ *  \param userdata A pointer passed to the callback as-is.
+ */
+extern DECLSPEC void SDLCALL SDL_SetAssertionHandler(
+                                            SDL_AssertionHandler handler,
+                                            void *userdata);
+
+/**
+ *  \brief Get the default assertion handler.
+ *
+ *  This returns the function pointer that is called by default when an
+ *   assertion is triggered. This is an internal function provided by SDL,
+ *   that is used for assertions when SDL_SetAssertionHandler() hasn't been
+ *   used to provide a different function.
+ *
+ *  \return The default SDL_AssertionHandler that is called when an assert triggers.
+ */
+extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void);
+
+/**
+ *  \brief Get the current assertion handler.
+ *
+ *  This returns the function pointer that is called when an assertion is
+ *   triggered. This is either the value last passed to
+ *   SDL_SetAssertionHandler(), or if no application-specified function is
+ *   set, is equivalent to calling SDL_GetDefaultAssertionHandler().
+ *
+ *   \param puserdata Pointer to a void*, which will store the "userdata"
+ *                    pointer that was passed to SDL_SetAssertionHandler().
+ *                    This value will always be NULL for the default handler.
+ *                    If you don't care about this data, it is safe to pass
+ *                    a NULL pointer to this function to ignore it.
+ *  \return The SDL_AssertionHandler that is called when an assert triggers.
+ */
+extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata);
+
+/**
+ *  \brief Get a list of all assertion failures.
+ *
+ *  Get all assertions triggered since last call to SDL_ResetAssertionReport(),
+ *  or the start of the program.
+ *
+ *  The proper way to examine this data looks something like this:
+ *
+ *  <code>
+ *  const SDL_assert_data *item = SDL_GetAssertionReport();
+ *  while (item) {
+ *      printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n",
+ *             item->condition, item->function, item->filename,
+ *             item->linenum, item->trigger_count,
+ *             item->always_ignore ? "yes" : "no");
+ *      item = item->next;
+ *  }
+ *  </code>
+ *
+ *  \return List of all assertions.
+ *  \sa SDL_ResetAssertionReport
+ */
+extern DECLSPEC const SDL_assert_data * SDLCALL SDL_GetAssertionReport(void);
+
+/**
+ *  \brief Reset the list of all assertion failures.
+ *
+ *  Reset list of all assertions triggered.
+ *
+ *  \sa SDL_GetAssertionReport
+ */
+extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_assert_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_atomic.h b/Source/3rd Party/sdl/include/SDL_atomic.h
new file mode 100644
index 000000000..bb3a9b657
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_atomic.h	
@@ -0,0 +1,260 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ * \file SDL_atomic.h
+ *
+ * Atomic operations.
+ *
+ * IMPORTANT:
+ * If you are not an expert in concurrent lockless programming, you should
+ * only be using the atomic lock and reference counting functions in this
+ * file.  In all other cases you should be protecting your data structures
+ * with full mutexes.
+ *
+ * The list of "safe" functions to use are:
+ *  SDL_AtomicLock()
+ *  SDL_AtomicUnlock()
+ *  SDL_AtomicIncRef()
+ *  SDL_AtomicDecRef()
+ *
+ * Seriously, here be dragons!
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ *
+ * You can find out a little more about lockless programming and the
+ * subtle issues that can arise here:
+ * http://msdn.microsoft.com/en-us/library/ee418650%28v=vs.85%29.aspx
+ *
+ * There's also lots of good information here:
+ * http://www.1024cores.net/home/lock-free-algorithms
+ * http://preshing.com/
+ *
+ * These operations may or may not actually be implemented using
+ * processor specific atomic operations. When possible they are
+ * implemented as true processor specific atomic operations. When that
+ * is not possible the are implemented using locks that *do* use the
+ * available atomic operations.
+ *
+ * All of the atomic operations that modify memory are full memory barriers.
+ */
+
+#ifndef _SDL_atomic_h_
+#define _SDL_atomic_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_platform.h"
+
+#include "begin_code.h"
+
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \name SDL AtomicLock
+ *
+ * The atomic locks are efficient spinlocks using CPU instructions,
+ * but are vulnerable to starvation and can spin forever if a thread
+ * holding a lock has been terminated.  For this reason you should
+ * minimize the code executed inside an atomic lock and never do
+ * expensive things like API or system calls while holding them.
+ *
+ * The atomic locks are not safe to lock recursively.
+ *
+ * Porting Note:
+ * The spin lock functions and type are required and can not be
+ * emulated because they are used in the atomic emulation code.
+ */
+/* @{ */
+
+typedef int SDL_SpinLock;
+
+/**
+ * \brief Try to lock a spin lock by setting it to a non-zero value.
+ *
+ * \param lock Points to the lock.
+ *
+ * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock);
+
+/**
+ * \brief Lock a spin lock by setting it to a non-zero value.
+ *
+ * \param lock Points to the lock.
+ */
+extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock);
+
+/**
+ * \brief Unlock a spin lock by setting it to 0. Always returns immediately
+ *
+ * \param lock Points to the lock.
+ */
+extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock);
+
+/* @} *//* SDL AtomicLock */
+
+
+/**
+ * The compiler barrier prevents the compiler from reordering
+ * reads and writes to globally visible variables across the call.
+ */
+#if defined(_MSC_VER) && (_MSC_VER > 1200)
+void _ReadWriteBarrier(void);
+#pragma intrinsic(_ReadWriteBarrier)
+#define SDL_CompilerBarrier()   _ReadWriteBarrier()
+#elif defined(__GNUC__)
+#define SDL_CompilerBarrier()   __asm__ __volatile__ ("" : : : "memory")
+#else
+#define SDL_CompilerBarrier()   \
+{ SDL_SpinLock _tmp = 0; SDL_AtomicLock(&_tmp); SDL_AtomicUnlock(&_tmp); }
+#endif
+
+/**
+ * Memory barriers are designed to prevent reads and writes from being
+ * reordered by the compiler and being seen out of order on multi-core CPUs.
+ *
+ * A typical pattern would be for thread A to write some data and a flag,
+ * and for thread B to read the flag and get the data. In this case you
+ * would insert a release barrier between writing the data and the flag,
+ * guaranteeing that the data write completes no later than the flag is
+ * written, and you would insert an acquire barrier between reading the
+ * flag and reading the data, to ensure that all the reads associated
+ * with the flag have completed.
+ *
+ * In this pattern you should always see a release barrier paired with
+ * an acquire barrier and you should gate the data reads/writes with a
+ * single flag variable.
+ *
+ * For more information on these semantics, take a look at the blog post:
+ * http://preshing.com/20120913/acquire-and-release-semantics
+ */
+#if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("lwsync" : : : "memory")
+#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("lwsync" : : : "memory")
+#elif defined(__GNUC__) && defined(__arm__)
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__)
+#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("dmb ish" : : : "memory")
+#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("dmb ish" : : : "memory")
+#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__)
+#ifdef __thumb__
+/* The mcr instruction isn't available in thumb mode, use real functions */
+extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease();
+extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire();
+#else
+#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
+#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
+#endif /* __thumb__ */
+#else
+#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("" : : : "memory")
+#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("" : : : "memory")
+#endif /* __GNUC__ && __arm__ */
+#else
+/* This is correct for the x86 and x64 CPUs, and we'll expand this over time. */
+#define SDL_MemoryBarrierRelease()  SDL_CompilerBarrier()
+#define SDL_MemoryBarrierAcquire()  SDL_CompilerBarrier()
+#endif
+
+/**
+ * \brief A type representing an atomic integer value.  It is a struct
+ *        so people don't accidentally use numeric operations on it.
+ */
+typedef struct { int value; } SDL_atomic_t;
+
+/**
+ * \brief Set an atomic variable to a new value if it is currently an old value.
+ *
+ * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise.
+ *
+ * \note If you don't know what this function is for, you shouldn't use it!
+*/
+extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval);
+
+/**
+ * \brief Set an atomic variable to a value.
+ *
+ * \return The previous value of the atomic variable.
+ */
+extern DECLSPEC int SDLCALL SDL_AtomicSet(SDL_atomic_t *a, int v);
+
+/**
+ * \brief Get the value of an atomic variable
+ */
+extern DECLSPEC int SDLCALL SDL_AtomicGet(SDL_atomic_t *a);
+
+/**
+ * \brief Add to an atomic variable.
+ *
+ * \return The previous value of the atomic variable.
+ *
+ * \note This same style can be used for any number operation
+ */
+extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v);
+
+/**
+ * \brief Increment an atomic variable used as a reference count.
+ */
+#ifndef SDL_AtomicIncRef
+#define SDL_AtomicIncRef(a)    SDL_AtomicAdd(a, 1)
+#endif
+
+/**
+ * \brief Decrement an atomic variable used as a reference count.
+ *
+ * \return SDL_TRUE if the variable reached zero after decrementing,
+ *         SDL_FALSE otherwise
+ */
+#ifndef SDL_AtomicDecRef
+#define SDL_AtomicDecRef(a)    (SDL_AtomicAdd(a, -1) == 1)
+#endif
+
+/**
+ * \brief Set a pointer to a new value if it is currently an old value.
+ *
+ * \return SDL_TRUE if the pointer was set, SDL_FALSE otherwise.
+ *
+ * \note If you don't know what this function is for, you shouldn't use it!
+*/
+extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr(void **a, void *oldval, void *newval);
+
+/**
+ * \brief Set a pointer to a value atomically.
+ *
+ * \return The previous value of the pointer.
+ */
+extern DECLSPEC void* SDLCALL SDL_AtomicSetPtr(void **a, void* v);
+
+/**
+ * \brief Get the value of a pointer atomically.
+ */
+extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+
+#include "close_code.h"
+
+#endif /* _SDL_atomic_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_audio.h b/Source/3rd Party/sdl/include/SDL_audio.h
new file mode 100644
index 000000000..4c987d511
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_audio.h	
@@ -0,0 +1,506 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_audio.h
+ *
+ *  Access to the raw audio mixing buffer for the SDL library.
+ */
+
+#ifndef _SDL_audio_h
+#define _SDL_audio_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_endian.h"
+#include "SDL_mutex.h"
+#include "SDL_thread.h"
+#include "SDL_rwops.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief Audio format flags.
+ *
+ *  These are what the 16 bits in SDL_AudioFormat currently mean...
+ *  (Unspecified bits are always zero).
+ *
+ *  \verbatim
+    ++-----------------------sample is signed if set
+    ||
+    ||       ++-----------sample is bigendian if set
+    ||       ||
+    ||       ||          ++---sample is float if set
+    ||       ||          ||
+    ||       ||          || +---sample bit size---+
+    ||       ||          || |                     |
+    15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00
+    \endverbatim
+ *
+ *  There are macros in SDL 2.0 and later to query these bits.
+ */
+typedef Uint16 SDL_AudioFormat;
+
+/**
+ *  \name Audio flags
+ */
+/* @{ */
+
+#define SDL_AUDIO_MASK_BITSIZE       (0xFF)
+#define SDL_AUDIO_MASK_DATATYPE      (1<<8)
+#define SDL_AUDIO_MASK_ENDIAN        (1<<12)
+#define SDL_AUDIO_MASK_SIGNED        (1<<15)
+#define SDL_AUDIO_BITSIZE(x)         (x & SDL_AUDIO_MASK_BITSIZE)
+#define SDL_AUDIO_ISFLOAT(x)         (x & SDL_AUDIO_MASK_DATATYPE)
+#define SDL_AUDIO_ISBIGENDIAN(x)     (x & SDL_AUDIO_MASK_ENDIAN)
+#define SDL_AUDIO_ISSIGNED(x)        (x & SDL_AUDIO_MASK_SIGNED)
+#define SDL_AUDIO_ISINT(x)           (!SDL_AUDIO_ISFLOAT(x))
+#define SDL_AUDIO_ISLITTLEENDIAN(x)  (!SDL_AUDIO_ISBIGENDIAN(x))
+#define SDL_AUDIO_ISUNSIGNED(x)      (!SDL_AUDIO_ISSIGNED(x))
+
+/**
+ *  \name Audio format flags
+ *
+ *  Defaults to LSB byte order.
+ */
+/* @{ */
+#define AUDIO_U8        0x0008  /**< Unsigned 8-bit samples */
+#define AUDIO_S8        0x8008  /**< Signed 8-bit samples */
+#define AUDIO_U16LSB    0x0010  /**< Unsigned 16-bit samples */
+#define AUDIO_S16LSB    0x8010  /**< Signed 16-bit samples */
+#define AUDIO_U16MSB    0x1010  /**< As above, but big-endian byte order */
+#define AUDIO_S16MSB    0x9010  /**< As above, but big-endian byte order */
+#define AUDIO_U16       AUDIO_U16LSB
+#define AUDIO_S16       AUDIO_S16LSB
+/* @} */
+
+/**
+ *  \name int32 support
+ */
+/* @{ */
+#define AUDIO_S32LSB    0x8020  /**< 32-bit integer samples */
+#define AUDIO_S32MSB    0x9020  /**< As above, but big-endian byte order */
+#define AUDIO_S32       AUDIO_S32LSB
+/* @} */
+
+/**
+ *  \name float32 support
+ */
+/* @{ */
+#define AUDIO_F32LSB    0x8120  /**< 32-bit floating point samples */
+#define AUDIO_F32MSB    0x9120  /**< As above, but big-endian byte order */
+#define AUDIO_F32       AUDIO_F32LSB
+/* @} */
+
+/**
+ *  \name Native audio byte ordering
+ */
+/* @{ */
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+#define AUDIO_U16SYS    AUDIO_U16LSB
+#define AUDIO_S16SYS    AUDIO_S16LSB
+#define AUDIO_S32SYS    AUDIO_S32LSB
+#define AUDIO_F32SYS    AUDIO_F32LSB
+#else
+#define AUDIO_U16SYS    AUDIO_U16MSB
+#define AUDIO_S16SYS    AUDIO_S16MSB
+#define AUDIO_S32SYS    AUDIO_S32MSB
+#define AUDIO_F32SYS    AUDIO_F32MSB
+#endif
+/* @} */
+
+/**
+ *  \name Allow change flags
+ *
+ *  Which audio format changes are allowed when opening a device.
+ */
+/* @{ */
+#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE    0x00000001
+#define SDL_AUDIO_ALLOW_FORMAT_CHANGE       0x00000002
+#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE     0x00000004
+#define SDL_AUDIO_ALLOW_ANY_CHANGE          (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
+/* @} */
+
+/* @} *//* Audio flags */
+
+/**
+ *  This function is called when the audio device needs more data.
+ *
+ *  \param userdata An application-specific parameter saved in
+ *                  the SDL_AudioSpec structure
+ *  \param stream A pointer to the audio data buffer.
+ *  \param len    The length of that buffer in bytes.
+ *
+ *  Once the callback returns, the buffer will no longer be valid.
+ *  Stereo samples are stored in a LRLRLR ordering.
+ */
+typedef void (SDLCALL * SDL_AudioCallback) (void *userdata, Uint8 * stream,
+                                            int len);
+
+/**
+ *  The calculated values in this structure are calculated by SDL_OpenAudio().
+ */
+typedef struct SDL_AudioSpec
+{
+    int freq;                   /**< DSP frequency -- samples per second */
+    SDL_AudioFormat format;     /**< Audio data format */
+    Uint8 channels;             /**< Number of channels: 1 mono, 2 stereo */
+    Uint8 silence;              /**< Audio buffer silence value (calculated) */
+    Uint16 samples;             /**< Audio buffer size in samples (power of 2) */
+    Uint16 padding;             /**< Necessary for some compile environments */
+    Uint32 size;                /**< Audio buffer size in bytes (calculated) */
+    SDL_AudioCallback callback;
+    void *userdata;
+} SDL_AudioSpec;
+
+
+struct SDL_AudioCVT;
+typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt,
+                                          SDL_AudioFormat format);
+
+/**
+ *  A structure to hold a set of audio conversion filters and buffers.
+ */
+#ifdef __GNUC__
+/* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't
+   pad it out to 88 bytes to guarantee ABI compatibility between compilers.
+   vvv
+   The next time we rev the ABI, make sure to size the ints and add padding.
+*/
+#define SDL_AUDIOCVT_PACKED __attribute__((packed))
+#else
+#define SDL_AUDIOCVT_PACKED
+#endif
+/* */
+typedef struct SDL_AudioCVT
+{
+    int needed;                 /**< Set to 1 if conversion possible */
+    SDL_AudioFormat src_format; /**< Source audio format */
+    SDL_AudioFormat dst_format; /**< Target audio format */
+    double rate_incr;           /**< Rate conversion increment */
+    Uint8 *buf;                 /**< Buffer to hold entire audio data */
+    int len;                    /**< Length of original audio buffer */
+    int len_cvt;                /**< Length of converted audio buffer */
+    int len_mult;               /**< buffer must be len*len_mult big */
+    double len_ratio;           /**< Given len, final size is len*len_ratio */
+    SDL_AudioFilter filters[10];        /**< Filter list */
+    int filter_index;           /**< Current audio conversion function */
+} SDL_AUDIOCVT_PACKED SDL_AudioCVT;
+
+
+/* Function prototypes */
+
+/**
+ *  \name Driver discovery functions
+ *
+ *  These functions return the list of built in audio drivers, in the
+ *  order that they are normally initialized by default.
+ */
+/* @{ */
+extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void);
+extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
+/* @} */
+
+/**
+ *  \name Initialization and cleanup
+ *
+ *  \internal These functions are used internally, and should not be used unless
+ *            you have a specific need to specify the audio driver you want to
+ *            use.  You should normally use SDL_Init() or SDL_InitSubSystem().
+ */
+/* @{ */
+extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
+extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
+/* @} */
+
+/**
+ *  This function returns the name of the current audio driver, or NULL
+ *  if no driver has been initialized.
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void);
+
+/**
+ *  This function opens the audio device with the desired parameters, and
+ *  returns 0 if successful, placing the actual hardware parameters in the
+ *  structure pointed to by \c obtained.  If \c obtained is NULL, the audio
+ *  data passed to the callback function will be guaranteed to be in the
+ *  requested format, and will be automatically converted to the hardware
+ *  audio format if necessary.  This function returns -1 if it failed
+ *  to open the audio device, or couldn't set up the audio thread.
+ *
+ *  When filling in the desired audio spec structure,
+ *    - \c desired->freq should be the desired audio frequency in samples-per-
+ *      second.
+ *    - \c desired->format should be the desired audio format.
+ *    - \c desired->samples is the desired size of the audio buffer, in
+ *      samples.  This number should be a power of two, and may be adjusted by
+ *      the audio driver to a value more suitable for the hardware.  Good values
+ *      seem to range between 512 and 8096 inclusive, depending on the
+ *      application and CPU speed.  Smaller values yield faster response time,
+ *      but can lead to underflow if the application is doing heavy processing
+ *      and cannot fill the audio buffer in time.  A stereo sample consists of
+ *      both right and left channels in LR ordering.
+ *      Note that the number of samples is directly related to time by the
+ *      following formula:  \code ms = (samples*1000)/freq \endcode
+ *    - \c desired->size is the size in bytes of the audio buffer, and is
+ *      calculated by SDL_OpenAudio().
+ *    - \c desired->silence is the value used to set the buffer to silence,
+ *      and is calculated by SDL_OpenAudio().
+ *    - \c desired->callback should be set to a function that will be called
+ *      when the audio device is ready for more data.  It is passed a pointer
+ *      to the audio buffer, and the length in bytes of the audio buffer.
+ *      This function usually runs in a separate thread, and so you should
+ *      protect data structures that it accesses by calling SDL_LockAudio()
+ *      and SDL_UnlockAudio() in your code.
+ *    - \c desired->userdata is passed as the first parameter to your callback
+ *      function.
+ *
+ *  The audio device starts out playing silence when it's opened, and should
+ *  be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready
+ *  for your audio callback function to be called.  Since the audio driver
+ *  may modify the requested size of the audio buffer, you should allocate
+ *  any local mixing buffers after you open the audio device.
+ */
+extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired,
+                                          SDL_AudioSpec * obtained);
+
+/**
+ *  SDL Audio Device IDs.
+ *
+ *  A successful call to SDL_OpenAudio() is always device id 1, and legacy
+ *  SDL audio APIs assume you want this device ID. SDL_OpenAudioDevice() calls
+ *  always returns devices >= 2 on success. The legacy calls are good both
+ *  for backwards compatibility and when you don't care about multiple,
+ *  specific, or capture devices.
+ */
+typedef Uint32 SDL_AudioDeviceID;
+
+/**
+ *  Get the number of available devices exposed by the current driver.
+ *  Only valid after a successfully initializing the audio subsystem.
+ *  Returns -1 if an explicit list of devices can't be determined; this is
+ *  not an error. For example, if SDL is set up to talk to a remote audio
+ *  server, it can't list every one available on the Internet, but it will
+ *  still allow a specific host to be specified to SDL_OpenAudioDevice().
+ *
+ *  In many common cases, when this function returns a value <= 0, it can still
+ *  successfully open the default device (NULL for first argument of
+ *  SDL_OpenAudioDevice()).
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture);
+
+/**
+ *  Get the human-readable name of a specific audio device.
+ *  Must be a value between 0 and (number of audio devices-1).
+ *  Only valid after a successfully initializing the audio subsystem.
+ *  The values returned by this function reflect the latest call to
+ *  SDL_GetNumAudioDevices(); recall that function to redetect available
+ *  hardware.
+ *
+ *  The string returned by this function is UTF-8 encoded, read-only, and
+ *  managed internally. You are not to free it. If you need to keep the
+ *  string for any length of time, you should make your own copy of it, as it
+ *  will be invalid next time any of several other SDL functions is called.
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index,
+                                                           int iscapture);
+
+
+/**
+ *  Open a specific audio device. Passing in a device name of NULL requests
+ *  the most reasonable default (and is equivalent to calling SDL_OpenAudio()).
+ *
+ *  The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but
+ *  some drivers allow arbitrary and driver-specific strings, such as a
+ *  hostname/IP address for a remote audio server, or a filename in the
+ *  diskaudio driver.
+ *
+ *  \return 0 on error, a valid device ID that is >= 2 on success.
+ *
+ *  SDL_OpenAudio(), unlike this function, always acts on device ID 1.
+ */
+extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
+                                                              *device,
+                                                              int iscapture,
+                                                              const
+                                                              SDL_AudioSpec *
+                                                              desired,
+                                                              SDL_AudioSpec *
+                                                              obtained,
+                                                              int
+                                                              allowed_changes);
+
+
+
+/**
+ *  \name Audio state
+ *
+ *  Get the current audio state.
+ */
+/* @{ */
+typedef enum
+{
+    SDL_AUDIO_STOPPED = 0,
+    SDL_AUDIO_PLAYING,
+    SDL_AUDIO_PAUSED
+} SDL_AudioStatus;
+extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void);
+
+extern DECLSPEC SDL_AudioStatus SDLCALL
+SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
+/* @} *//* Audio State */
+
+/**
+ *  \name Pause audio functions
+ *
+ *  These functions pause and unpause the audio callback processing.
+ *  They should be called with a parameter of 0 after opening the audio
+ *  device to start playing sound.  This is so you can safely initialize
+ *  data for your callback function after opening the audio device.
+ *  Silence will be written to the audio device during the pause.
+ */
+/* @{ */
+extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
+extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev,
+                                                  int pause_on);
+/* @} *//* Pause audio functions */
+
+/**
+ *  This function loads a WAVE from the data source, automatically freeing
+ *  that source if \c freesrc is non-zero.  For example, to load a WAVE file,
+ *  you could do:
+ *  \code
+ *      SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
+ *  \endcode
+ *
+ *  If this function succeeds, it returns the given SDL_AudioSpec,
+ *  filled with the audio data format of the wave data, and sets
+ *  \c *audio_buf to a malloc()'d buffer containing the audio data,
+ *  and sets \c *audio_len to the length of that audio buffer, in bytes.
+ *  You need to free the audio buffer with SDL_FreeWAV() when you are
+ *  done with it.
+ *
+ *  This function returns NULL and sets the SDL error message if the
+ *  wave file cannot be opened, uses an unknown data format, or is
+ *  corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
+ */
+extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src,
+                                                      int freesrc,
+                                                      SDL_AudioSpec * spec,
+                                                      Uint8 ** audio_buf,
+                                                      Uint32 * audio_len);
+
+/**
+ *  Loads a WAV from a file.
+ *  Compatibility convenience function.
+ */
+#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
+    SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
+
+/**
+ *  This function frees data previously allocated with SDL_LoadWAV_RW()
+ */
+extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf);
+
+/**
+ *  This function takes a source format and rate and a destination format
+ *  and rate, and initializes the \c cvt structure with information needed
+ *  by SDL_ConvertAudio() to convert a buffer of audio data from one format
+ *  to the other.
+ *
+ *  \return -1 if the format conversion is not supported, 0 if there's
+ *  no conversion needed, or 1 if the audio filter is set up.
+ */
+extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
+                                              SDL_AudioFormat src_format,
+                                              Uint8 src_channels,
+                                              int src_rate,
+                                              SDL_AudioFormat dst_format,
+                                              Uint8 dst_channels,
+                                              int dst_rate);
+
+/**
+ *  Once you have initialized the \c cvt structure using SDL_BuildAudioCVT(),
+ *  created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of
+ *  audio data in the source format, this function will convert it in-place
+ *  to the desired format.
+ *
+ *  The data conversion may expand the size of the audio data, so the buffer
+ *  \c cvt->buf should be allocated after the \c cvt structure is initialized by
+ *  SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long.
+ */
+extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt);
+
+#define SDL_MIX_MAXVOLUME 128
+/**
+ *  This takes two audio buffers of the playing audio format and mixes
+ *  them, performing addition, volume adjustment, and overflow clipping.
+ *  The volume ranges from 0 - 128, and should be set to ::SDL_MIX_MAXVOLUME
+ *  for full audio volume.  Note this does not change hardware volume.
+ *  This is provided for convenience -- you can mix your own audio data.
+ */
+extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src,
+                                          Uint32 len, int volume);
+
+/**
+ *  This works like SDL_MixAudio(), but you specify the audio format instead of
+ *  using the format of audio device 1. Thus it can be used when no audio
+ *  device is open at all.
+ */
+extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst,
+                                                const Uint8 * src,
+                                                SDL_AudioFormat format,
+                                                Uint32 len, int volume);
+
+/**
+ *  \name Audio lock functions
+ *
+ *  The lock manipulated by these functions protects the callback function.
+ *  During a SDL_LockAudio()/SDL_UnlockAudio() pair, you can be guaranteed that
+ *  the callback function is not running.  Do not call these from the callback
+ *  function or you will cause deadlock.
+ */
+/* @{ */
+extern DECLSPEC void SDLCALL SDL_LockAudio(void);
+extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev);
+extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
+extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev);
+/* @} *//* Audio lock functions */
+
+/**
+ *  This function shuts down audio processing and closes the audio device.
+ */
+extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
+extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_audio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_bits.h b/Source/3rd Party/sdl/include/SDL_bits.h
new file mode 100644
index 000000000..341524fd9
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_bits.h	
@@ -0,0 +1,97 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_bits.h
+ *
+ *  Functions for fiddling with bits and bitmasks.
+ */
+
+#ifndef _SDL_bits_h
+#define _SDL_bits_h
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \file SDL_bits.h
+ */
+
+/**
+ *  Get the index of the most significant bit. Result is undefined when called
+ *  with 0. This operation can also be stated as "count leading zeroes" and
+ *  "log base 2".
+ *
+ *  \return Index of the most significant bit, or -1 if the value is 0.
+ */
+SDL_FORCE_INLINE int
+SDL_MostSignificantBitIndex32(Uint32 x)
+{
+#if defined(__GNUC__) && __GNUC__ >= 4
+    /* Count Leading Zeroes builtin in GCC.
+     * http://gcc.gnu.org/onlinedocs/gcc-4.3.4/gcc/Other-Builtins.html
+     */
+    if (x == 0) {
+        return -1;
+    }
+    return 31 - __builtin_clz(x);
+#else
+    /* Based off of Bit Twiddling Hacks by Sean Eron Anderson
+     * <seander@cs.stanford.edu>, released in the public domain.
+     * http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog
+     */
+    const Uint32 b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000};
+    const int    S[] = {1, 2, 4, 8, 16};
+
+    int msbIndex = 0;
+    int i;
+
+    if (x == 0) {
+        return -1;
+    }
+
+    for (i = 4; i >= 0; i--)
+    {
+        if (x & b[i])
+        {
+            x >>= S[i];
+            msbIndex |= S[i];
+        }
+    }
+
+    return msbIndex;
+#endif
+}
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_bits_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_blendmode.h b/Source/3rd Party/sdl/include/SDL_blendmode.h
new file mode 100644
index 000000000..8c257be9c
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_blendmode.h	
@@ -0,0 +1,63 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_blendmode.h
+ *
+ *  Header file declaring the SDL_BlendMode enumeration
+ */
+
+#ifndef _SDL_blendmode_h
+#define _SDL_blendmode_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief The blend mode used in SDL_RenderCopy() and drawing operations.
+ */
+typedef enum
+{
+    SDL_BLENDMODE_NONE = 0x00000000,     /**< no blending
+                                              dstRGBA = srcRGBA */
+    SDL_BLENDMODE_BLEND = 0x00000001,    /**< alpha blending
+                                              dstRGB = (srcRGB * srcA) + (dstRGB * (1-srcA))
+                                              dstA = srcA + (dstA * (1-srcA)) */
+    SDL_BLENDMODE_ADD = 0x00000002,      /**< additive blending
+                                              dstRGB = (srcRGB * srcA) + dstRGB
+                                              dstA = dstA */
+    SDL_BLENDMODE_MOD = 0x00000004       /**< color modulate
+                                              dstRGB = srcRGB * dstRGB
+                                              dstA = dstA */
+} SDL_BlendMode;
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_video_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_clipboard.h b/Source/3rd Party/sdl/include/SDL_clipboard.h
new file mode 100644
index 000000000..74e2b32fe
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_clipboard.h	
@@ -0,0 +1,71 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ * \file SDL_clipboard.h
+ *
+ * Include file for SDL clipboard handling
+ */
+
+#ifndef _SDL_clipboard_h
+#define _SDL_clipboard_h
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Function prototypes */
+
+/**
+ * \brief Put UTF-8 text into the clipboard
+ *
+ * \sa SDL_GetClipboardText()
+ */
+extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text);
+
+/**
+ * \brief Get UTF-8 text from the clipboard, which must be freed with SDL_free()
+ *
+ * \sa SDL_SetClipboardText()
+ */
+extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void);
+
+/**
+ * \brief Returns a flag indicating whether the clipboard exists and contains a text string that is non-empty
+ *
+ * \sa SDL_GetClipboardText()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_clipboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_config.h b/Source/3rd Party/sdl/include/SDL_config.h
new file mode 100644
index 000000000..9a2e51c55
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config.h	
@@ -0,0 +1,55 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_h
+#define _SDL_config_h
+
+#include "SDL_platform.h"
+
+/**
+ *  \file SDL_config.h
+ */
+
+/* Add any platform that doesn't build using the configure system. */
+#ifdef USING_PREMAKE_CONFIG_H
+#include "SDL_config_premake.h"
+#elif defined(__WIN32__)
+#include "SDL_config_windows.h"
+#elif defined(__WINRT__)
+#include "SDL_config_winrt.h"
+#elif defined(__MACOSX__)
+#include "SDL_config_macosx.h"
+#elif defined(__IPHONEOS__)
+#include "SDL_config_iphoneos.h"
+#elif defined(__ANDROID__)
+#include "SDL_config_android.h"
+#elif defined(__PSP__)
+#include "SDL_config_psp.h"
+#else
+/* This is a minimal configuration just to get SDL running on new platforms */
+#include "SDL_config_minimal.h"
+#endif /* platform config */
+
+#ifdef USING_GENERATED_CONFIG_H
+#error Wrong SDL_config.h, check your include path?
+#endif
+
+#endif /* _SDL_config_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config.h.cmake b/Source/3rd Party/sdl/include/SDL_config.h.cmake
new file mode 100644
index 000000000..b6fb53aa2
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config.h.cmake	
@@ -0,0 +1,395 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_h
+#define _SDL_config_h
+
+/**
+ *  \file SDL_config.h.in
+ *
+ *  This is a set of defines to configure the SDL features
+ */
+
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
+/* C language features */
+#cmakedefine const @HAVE_CONST@
+#cmakedefine inline @HAVE_INLINE@
+#cmakedefine volatile @HAVE_VOLATILE@
+
+/* C datatypes */
+/* Define SIZEOF_VOIDP for 64/32 architectures */
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+
+#cmakedefine HAVE_GCC_ATOMICS @HAVE_GCC_ATOMICS@
+#cmakedefine HAVE_GCC_SYNC_LOCK_TEST_AND_SET @HAVE_GCC_SYNC_LOCK_TEST_AND_SET@
+#cmakedefine HAVE_PTHREAD_SPINLOCK @HAVE_PTHREAD_SPINLOCK@
+
+/* Comment this if you want to build without any C library requirements */
+#cmakedefine HAVE_LIBC 1
+#if HAVE_LIBC
+
+/* Useful headers */
+#cmakedefine HAVE_ALLOCA_H 1
+#cmakedefine HAVE_SYS_TYPES_H 1
+#cmakedefine HAVE_STDIO_H 1
+#cmakedefine STDC_HEADERS 1
+#cmakedefine HAVE_STDLIB_H 1
+#cmakedefine HAVE_STDARG_H 1
+#cmakedefine HAVE_MALLOC_H 1
+#cmakedefine HAVE_MEMORY_H 1
+#cmakedefine HAVE_STRING_H 1
+#cmakedefine HAVE_STRINGS_H 1
+#cmakedefine HAVE_INTTYPES_H 1
+#cmakedefine HAVE_STDINT_H 1
+#cmakedefine HAVE_CTYPE_H 1
+#cmakedefine HAVE_MATH_H 1
+#cmakedefine HAVE_ICONV_H 1
+#cmakedefine HAVE_SIGNAL_H 1
+#cmakedefine HAVE_ALTIVEC_H 1
+#cmakedefine HAVE_PTHREAD_NP_H 1
+#cmakedefine HAVE_LIBUDEV_H 1
+#cmakedefine HAVE_DBUS_DBUS_H 1
+
+/* C library functions */
+#cmakedefine HAVE_MALLOC 1
+#cmakedefine HAVE_CALLOC 1
+#cmakedefine HAVE_REALLOC 1
+#cmakedefine HAVE_FREE 1
+#cmakedefine HAVE_ALLOCA 1
+#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
+#cmakedefine HAVE_GETENV 1
+#cmakedefine HAVE_SETENV 1
+#cmakedefine HAVE_PUTENV 1
+#cmakedefine HAVE_UNSETENV 1
+#endif
+#cmakedefine HAVE_QSORT 1
+#cmakedefine HAVE_ABS 1
+#cmakedefine HAVE_BCOPY 1
+#cmakedefine HAVE_MEMSET 1
+#cmakedefine HAVE_MEMCPY 1
+#cmakedefine HAVE_MEMMOVE 1
+#cmakedefine HAVE_MEMCMP 1
+#cmakedefine HAVE_STRLEN 1
+#cmakedefine HAVE_STRLCPY 1
+#cmakedefine HAVE_STRLCAT 1
+#cmakedefine HAVE_STRDUP 1
+#cmakedefine HAVE__STRREV 1
+#cmakedefine HAVE__STRUPR 1
+#cmakedefine HAVE__STRLWR 1
+#cmakedefine HAVE_INDEX 1
+#cmakedefine HAVE_RINDEX 1
+#cmakedefine HAVE_STRCHR 1
+#cmakedefine HAVE_STRRCHR 1
+#cmakedefine HAVE_STRSTR 1
+#cmakedefine HAVE_ITOA 1
+#cmakedefine HAVE__LTOA 1
+#cmakedefine HAVE__UITOA 1
+#cmakedefine HAVE__ULTOA 1
+#cmakedefine HAVE_STRTOL 1
+#cmakedefine HAVE_STRTOUL 1
+#cmakedefine HAVE__I64TOA 1
+#cmakedefine HAVE__UI64TOA 1
+#cmakedefine HAVE_STRTOLL 1
+#cmakedefine HAVE_STRTOULL 1
+#cmakedefine HAVE_STRTOD 1
+#cmakedefine HAVE_ATOI 1
+#cmakedefine HAVE_ATOF 1
+#cmakedefine HAVE_STRCMP 1
+#cmakedefine HAVE_STRNCMP 1
+#cmakedefine HAVE__STRICMP 1
+#cmakedefine HAVE_STRCASECMP 1
+#cmakedefine HAVE__STRNICMP 1
+#cmakedefine HAVE_STRNCASECMP 1
+#cmakedefine HAVE_VSSCANF 1
+#cmakedefine HAVE_VSNPRINTF 1
+#cmakedefine HAVE_M_PI 1
+#cmakedefine HAVE_ATAN 1
+#cmakedefine HAVE_ATAN2 1
+#cmakedefine HAVE_ACOS 1
+#cmakedefine HAVE_ASIN 1
+#cmakedefine HAVE_CEIL 1
+#cmakedefine HAVE_COPYSIGN 1
+#cmakedefine HAVE_COS 1
+#cmakedefine HAVE_COSF 1
+#cmakedefine HAVE_FABS 1
+#cmakedefine HAVE_FLOOR 1
+#cmakedefine HAVE_LOG 1
+#cmakedefine HAVE_POW 1
+#cmakedefine HAVE_SCALBN 1
+#cmakedefine HAVE_SIN 1
+#cmakedefine HAVE_SINF 1
+#cmakedefine HAVE_SQRT 1
+#cmakedefine HAVE_FSEEKO 1
+#cmakedefine HAVE_FSEEKO64 1
+#cmakedefine HAVE_SIGACTION 1
+#cmakedefine HAVE_SA_SIGACTION 1
+#cmakedefine HAVE_SETJMP 1
+#cmakedefine HAVE_NANOSLEEP 1
+#cmakedefine HAVE_SYSCONF 1
+#cmakedefine HAVE_SYSCTLBYNAME 1
+#cmakedefine HAVE_CLOCK_GETTIME 1
+#cmakedefine HAVE_GETPAGESIZE 1
+#cmakedefine HAVE_MPROTECT 1
+#cmakedefine HAVE_ICONV 1
+#cmakedefine HAVE_PTHREAD_SETNAME_NP 1
+#cmakedefine HAVE_PTHREAD_SET_NAME_NP 1
+#cmakedefine HAVE_SEM_TIMEDWAIT 1
+#elif __WIN32__
+#cmakedefine HAVE_STDARG_H 1
+#cmakedefine HAVE_STDDEF_H 1
+#else
+/* We may need some replacement for stdarg.h here */
+#include <stdarg.h>
+#endif /* HAVE_LIBC */
+
+/* SDL internal assertion support */
+#cmakedefine SDL_DEFAULT_ASSERT_LEVEL @SDL_DEFAULT_ASSERT_LEVEL@
+
+/* Allow disabling of core subsystems */
+#cmakedefine SDL_ATOMIC_DISABLED @SDL_ATOMIC_DISABLED@
+#cmakedefine SDL_AUDIO_DISABLED @SDL_AUDIO_DISABLED@
+#cmakedefine SDL_CPUINFO_DISABLED @SDL_CPUINFO_DISABLED@
+#cmakedefine SDL_EVENTS_DISABLED @SDL_EVENTS_DISABLED@
+#cmakedefine SDL_FILE_DISABLED @SDL_FILE_DISABLED@
+#cmakedefine SDL_JOYSTICK_DISABLED @SDL_JOYSTICK_DISABLED@
+#cmakedefine SDL_HAPTIC_DISABLED @SDL_HAPTIC_DISABLED@
+#cmakedefine SDL_LOADSO_DISABLED @SDL_LOADSO_DISABLED@
+#cmakedefine SDL_RENDER_DISABLED @SDL_RENDER_DISABLED@
+#cmakedefine SDL_THREADS_DISABLED @SDL_THREADS_DISABLED@
+#cmakedefine SDL_TIMERS_DISABLED @SDL_TIMERS_DISABLED@
+#cmakedefine SDL_VIDEO_DISABLED @SDL_VIDEO_DISABLED@
+#cmakedefine SDL_POWER_DISABLED @SDL_POWER_DISABLED@
+#cmakedefine SDL_FILESYSTEM_DISABLED @SDL_FILESYSTEM_DISABLED@
+
+/* Enable various audio drivers */
+#cmakedefine SDL_AUDIO_DRIVER_ALSA @SDL_AUDIO_DRIVER_ALSA@
+#cmakedefine SDL_AUDIO_DRIVER_ALSA_DYNAMIC @SDL_AUDIO_DRIVER_ALSA_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_ARTS @SDL_AUDIO_DRIVER_ARTS@
+#cmakedefine SDL_AUDIO_DRIVER_ARTS_DYNAMIC @SDL_AUDIO_DRIVER_ARTS_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO @SDL_AUDIO_DRIVER_PULSEAUDIO@
+#cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC @SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_HAIKU @SDL_AUDIO_DRIVER_HAIKU@
+#cmakedefine SDL_AUDIO_DRIVER_BSD @SDL_AUDIO_DRIVER_BSD@
+#cmakedefine SDL_AUDIO_DRIVER_COREAUDIO @SDL_AUDIO_DRIVER_COREAUDIO@
+#cmakedefine SDL_AUDIO_DRIVER_DISK @SDL_AUDIO_DRIVER_DISK@
+#cmakedefine SDL_AUDIO_DRIVER_DUMMY @SDL_AUDIO_DRIVER_DUMMY@
+#cmakedefine SDL_AUDIO_DRIVER_XAUDIO2 @SDL_AUDIO_DRIVER_XAUDIO2@
+#cmakedefine SDL_AUDIO_DRIVER_DSOUND @SDL_AUDIO_DRIVER_DSOUND@
+#cmakedefine SDL_AUDIO_DRIVER_ESD @SDL_AUDIO_DRIVER_ESD@
+#cmakedefine SDL_AUDIO_DRIVER_ESD_DYNAMIC @SDL_AUDIO_DRIVER_ESD_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_NAS @SDL_AUDIO_DRIVER_NAS@
+#cmakedefine SDL_AUDIO_DRIVER_NAS_DYNAMIC @SDL_AUDIO_DRIVER_NAS_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_SNDIO @SDL_AUDIO_DRIVER_SNDIO@
+#cmakedefine SDL_AUDIO_DRIVER_SNDIO_DYNAMIC @SDL_AUDIO_DRIVER_SNDIO_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_OSS @SDL_AUDIO_DRIVER_OSS@
+#cmakedefine SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H @SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H@
+#cmakedefine SDL_AUDIO_DRIVER_PAUDIO @SDL_AUDIO_DRIVER_PAUDIO@
+#cmakedefine SDL_AUDIO_DRIVER_QSA @SDL_AUDIO_DRIVER_QSA@
+#cmakedefine SDL_AUDIO_DRIVER_SUNAUDIO @SDL_AUDIO_DRIVER_SUNAUDIO@
+#cmakedefine SDL_AUDIO_DRIVER_WINMM @SDL_AUDIO_DRIVER_WINMM@
+#cmakedefine SDL_AUDIO_DRIVER_FUSIONSOUND @SDL_AUDIO_DRIVER_FUSIONSOUND@
+#cmakedefine SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC @SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC@
+
+/* Enable various input drivers */
+#cmakedefine SDL_INPUT_LINUXEV @SDL_INPUT_LINUXEV@
+#cmakedefine SDL_INPUT_LINUXKD @SDL_INPUT_LINUXKD@
+#cmakedefine SDL_INPUT_TSLIB @SDL_INPUT_TSLIB@
+#cmakedefine SDL_JOYSTICK_HAIKU @SDL_JOYSTICK_HAIKU@
+#cmakedefine SDL_JOYSTICK_DINPUT @SDL_JOYSTICK_DINPUT@
+#cmakedefine SDL_JOYSTICK_DUMMY @SDL_JOYSTICK_DUMMY@
+#cmakedefine SDL_JOYSTICK_IOKIT @SDL_JOYSTICK_IOKIT@
+#cmakedefine SDL_JOYSTICK_LINUX @SDL_JOYSTICK_LINUX@
+#cmakedefine SDL_JOYSTICK_WINMM @SDL_JOYSTICK_WINMM@
+#cmakedefine SDL_JOYSTICK_USBHID @SDL_JOYSTICK_USBHID@
+#cmakedefine SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H @SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H@
+#cmakedefine SDL_HAPTIC_DUMMY @SDL_HAPTIC_DUMMY@
+#cmakedefine SDL_HAPTIC_LINUX @SDL_HAPTIC_LINUX@
+#cmakedefine SDL_HAPTIC_IOKIT @SDL_HAPTIC_IOKIT@
+#cmakedefine SDL_HAPTIC_DINPUT @SDL_HAPTIC_DINPUT@
+
+/* Enable various shared object loading systems */
+#cmakedefine SDL_LOADSO_HAIKU @SDL_LOADSO_HAIKU@
+#cmakedefine SDL_LOADSO_DLOPEN @SDL_LOADSO_DLOPEN@
+#cmakedefine SDL_LOADSO_DUMMY @SDL_LOADSO_DUMMY@
+#cmakedefine SDL_LOADSO_LDG @SDL_LOADSO_LDG@
+#cmakedefine SDL_LOADSO_WINDOWS @SDL_LOADSO_WINDOWS@
+
+/* Enable various threading systems */
+#cmakedefine SDL_THREAD_PTHREAD @SDL_THREAD_PTHREAD@
+#cmakedefine SDL_THREAD_PTHREAD_RECURSIVE_MUTEX @SDL_THREAD_PTHREAD_RECURSIVE_MUTEX@
+#cmakedefine SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP @SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP@
+#cmakedefine SDL_THREAD_WINDOWS @SDL_THREAD_WINDOWS@
+
+/* Enable various timer systems */
+#cmakedefine SDL_TIMER_HAIKU @SDL_TIMER_HAIKU@
+#cmakedefine SDL_TIMER_DUMMY @SDL_TIMER_DUMMY@
+#cmakedefine SDL_TIMER_UNIX @SDL_TIMER_UNIX@
+#cmakedefine SDL_TIMER_WINDOWS @SDL_TIMER_WINDOWS@
+#cmakedefine SDL_TIMER_WINCE @SDL_TIMER_WINCE@
+
+/* Enable various video drivers */
+#cmakedefine SDL_VIDEO_DRIVER_HAIKU @SDL_VIDEO_DRIVER_HAIKU@
+#cmakedefine SDL_VIDEO_DRIVER_COCOA @SDL_VIDEO_DRIVER_COCOA@
+#cmakedefine SDL_VIDEO_DRIVER_DIRECTFB @SDL_VIDEO_DRIVER_DIRECTFB@
+#cmakedefine SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC @SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC@
+#cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@
+#cmakedefine SDL_VIDEO_DRIVER_WINDOWS @SDL_VIDEO_DRIVER_WINDOWS@
+#cmakedefine SDL_VIDEO_DRIVER_WAYLAND @SDL_VIDEO_DRIVER_WAYLAND@
+
+#if 0
+/* !!! FIXME: in configure script version, missing here: */
+#undef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON
+#endif
+
+#cmakedefine SDL_VIDEO_DRIVER_MIR @SDL_VIDEO_DRIVER_MIR@
+#cmakedefine SDL_VIDEO_DRIVER_MIR_DYNAMIC @SDL_VIDEO_DRIVER_MIR_DYNAMIC@
+#cmakedefine SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON @SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON@
+#cmakedefine SDL_VIDEO_DRIVER_X11 @SDL_VIDEO_DRIVER_X11@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC @SDL_VIDEO_DRIVER_X11_DYNAMIC@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT @SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR @SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA @SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 @SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR @SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS @SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE @SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XCURSOR @SDL_VIDEO_DRIVER_X11_XCURSOR@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XINERAMA @SDL_VIDEO_DRIVER_X11_XINERAMA@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2 @SDL_VIDEO_DRIVER_X11_XINPUT2@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH @SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XRANDR @SDL_VIDEO_DRIVER_X11_XRANDR@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XSCRNSAVER @SDL_VIDEO_DRIVER_X11_XSCRNSAVER@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE @SDL_VIDEO_DRIVER_X11_XSHAPE@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XVIDMODE @SDL_VIDEO_DRIVER_X11_XVIDMODE@
+#cmakedefine SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS @SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS@
+#cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32@
+#cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY@
+#cmakedefine SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM @SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM@
+
+#cmakedefine SDL_VIDEO_RENDER_D3D @SDL_VIDEO_RENDER_D3D@
+#cmakedefine SDL_VIDEO_RENDER_D3D11 @SDL_VIDEO_RENDER_D3D11@
+#cmakedefine SDL_VIDEO_RENDER_OGL @SDL_VIDEO_RENDER_OGL@
+#cmakedefine SDL_VIDEO_RENDER_OGL_ES @SDL_VIDEO_RENDER_OGL_ES@
+#cmakedefine SDL_VIDEO_RENDER_OGL_ES2 @SDL_VIDEO_RENDER_OGL_ES2@
+#cmakedefine SDL_VIDEO_RENDER_DIRECTFB @SDL_VIDEO_RENDER_DIRECTFB@
+
+/* Enable OpenGL support */
+#cmakedefine SDL_VIDEO_OPENGL @SDL_VIDEO_OPENGL@
+#cmakedefine SDL_VIDEO_OPENGL_ES @SDL_VIDEO_OPENGL_ES@
+#cmakedefine SDL_VIDEO_OPENGL_ES2 @SDL_VIDEO_OPENGL_ES2@
+#cmakedefine SDL_VIDEO_OPENGL_BGL @SDL_VIDEO_OPENGL_BGL@
+#cmakedefine SDL_VIDEO_OPENGL_CGL @SDL_VIDEO_OPENGL_CGL@
+#cmakedefine SDL_VIDEO_OPENGL_GLX @SDL_VIDEO_OPENGL_GLX@
+#cmakedefine SDL_VIDEO_OPENGL_WGL @SDL_VIDEO_OPENGL_WGL@
+#cmakedefine SDL_VIDEO_OPENGL_EGL @SDL_VIDEO_OPENGL_EGL@
+#cmakedefine SDL_VIDEO_OPENGL_OSMESA @SDL_VIDEO_OPENGL_OSMESA@
+#cmakedefine SDL_VIDEO_OPENGL_OSMESA_DYNAMIC @SDL_VIDEO_OPENGL_OSMESA_DYNAMIC@
+
+/* Enable system power support */
+#cmakedefine SDL_POWER_LINUX @SDL_POWER_LINUX@
+#cmakedefine SDL_POWER_WINDOWS @SDL_POWER_WINDOWS@
+#cmakedefine SDL_POWER_MACOSX @SDL_POWER_MACOSX@
+#cmakedefine SDL_POWER_HAIKU @SDL_POWER_HAIKU@
+#cmakedefine SDL_POWER_HARDWIRED @SDL_POWER_HARDWIRED@
+
+/* Enable system filesystem support */
+#cmakedefine SDL_FILESYSTEM_HAIKU @SDL_FILESYSTEM_HAIKU@
+#cmakedefine SDL_FILESYSTEM_COCOA @SDL_FILESYSTEM_COCOA@
+#cmakedefine SDL_FILESYSTEM_DUMMY @SDL_FILESYSTEM_DUMMY@
+#cmakedefine SDL_FILESYSTEM_UNIX @SDL_FILESYSTEM_UNIX@
+#cmakedefine SDL_FILESYSTEM_WINDOWS @SDL_FILESYSTEM_WINDOWS@
+
+/* Enable assembly routines */
+#cmakedefine SDL_ASSEMBLY_ROUTINES @SDL_ASSEMBLY_ROUTINES@
+#cmakedefine SDL_ALTIVEC_BLITTERS @SDL_ALTIVEC_BLITTERS@
+
+
+/* Platform specific definitions */
+#if !defined(__WIN32__)
+#  if !defined(_STDINT_H_) && !defined(_STDINT_H) && !defined(HAVE_STDINT_H) && !defined(_HAVE_STDINT_H)
+typedef unsigned int size_t;
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+typedef unsigned long uintptr_t;
+#  endif /* if (stdint.h isn't available) */
+#else /* __WIN32__ */
+#  if !defined(_STDINT_H_) && !defined(HAVE_STDINT_H) && !defined(_HAVE_STDINT_H)
+#    if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
+#define HAVE_STDINT_H	1
+#    elif defined(_MSC_VER)
+typedef signed __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#      ifndef _UINTPTR_T_DEFINED
+#        ifdef  _WIN64
+typedef unsigned __int64 uintptr_t;
+#          else
+typedef unsigned int uintptr_t;
+#        endif
+#define _UINTPTR_T_DEFINED
+#      endif
+/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
+#      if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
+#define DWORD_PTR DWORD
+#      endif
+#      if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
+#define LONG_PTR LONG
+#      endif
+#    else /* !__GNUC__ && !_MSC_VER */
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+#      ifndef _SIZE_T_DEFINED_
+#define _SIZE_T_DEFINED_
+typedef unsigned int size_t;
+#      endif
+typedef unsigned int uintptr_t;
+#    endif /* __GNUC__ || _MSC_VER */
+#  endif /* !_STDINT_H_ && !HAVE_STDINT_H */
+#endif /* __WIN32__ */
+
+#endif /* _SDL_config_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config.h.in b/Source/3rd Party/sdl/include/SDL_config.h.in
new file mode 100644
index 000000000..689dcf839
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config.h.in	
@@ -0,0 +1,333 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_h
+#define _SDL_config_h
+
+/**
+ *  \file SDL_config.h.in
+ *
+ *  This is a set of defines to configure the SDL features
+ */
+
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
+/* Make sure that this isn't included by Visual C++ */
+#ifdef _MSC_VER
+#error You should run hg revert SDL_config.h 
+#endif
+
+/* C language features */
+#undef const
+#undef inline
+#undef volatile
+
+/* C datatypes */
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+#undef HAVE_GCC_ATOMICS
+#undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET
+#undef HAVE_PTHREAD_SPINLOCK
+
+/* Comment this if you want to build without any C library requirements */
+#undef HAVE_LIBC
+#if HAVE_LIBC
+
+/* Useful headers */
+#undef HAVE_ALLOCA_H
+#undef HAVE_SYS_TYPES_H
+#undef HAVE_STDIO_H
+#undef STDC_HEADERS
+#undef HAVE_STDLIB_H
+#undef HAVE_STDARG_H
+#undef HAVE_MALLOC_H
+#undef HAVE_MEMORY_H
+#undef HAVE_STRING_H
+#undef HAVE_STRINGS_H
+#undef HAVE_INTTYPES_H
+#undef HAVE_STDINT_H
+#undef HAVE_CTYPE_H
+#undef HAVE_MATH_H
+#undef HAVE_ICONV_H
+#undef HAVE_SIGNAL_H
+#undef HAVE_ALTIVEC_H
+#undef HAVE_PTHREAD_NP_H
+#undef HAVE_LIBUDEV_H
+#undef HAVE_DBUS_DBUS_H
+
+/* C library functions */
+#undef HAVE_MALLOC
+#undef HAVE_CALLOC
+#undef HAVE_REALLOC
+#undef HAVE_FREE
+#undef HAVE_ALLOCA
+#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
+#undef HAVE_GETENV
+#undef HAVE_SETENV
+#undef HAVE_PUTENV
+#undef HAVE_UNSETENV
+#endif
+#undef HAVE_QSORT
+#undef HAVE_ABS
+#undef HAVE_BCOPY
+#undef HAVE_MEMSET
+#undef HAVE_MEMCPY
+#undef HAVE_MEMMOVE
+#undef HAVE_MEMCMP
+#undef HAVE_STRLEN
+#undef HAVE_STRLCPY
+#undef HAVE_STRLCAT
+#undef HAVE_STRDUP
+#undef HAVE__STRREV
+#undef HAVE__STRUPR
+#undef HAVE__STRLWR
+#undef HAVE_INDEX
+#undef HAVE_RINDEX
+#undef HAVE_STRCHR
+#undef HAVE_STRRCHR
+#undef HAVE_STRSTR
+#undef HAVE_ITOA
+#undef HAVE__LTOA
+#undef HAVE__UITOA
+#undef HAVE__ULTOA
+#undef HAVE_STRTOL
+#undef HAVE_STRTOUL
+#undef HAVE__I64TOA
+#undef HAVE__UI64TOA
+#undef HAVE_STRTOLL
+#undef HAVE_STRTOULL
+#undef HAVE_STRTOD
+#undef HAVE_ATOI
+#undef HAVE_ATOF
+#undef HAVE_STRCMP
+#undef HAVE_STRNCMP
+#undef HAVE__STRICMP
+#undef HAVE_STRCASECMP
+#undef HAVE__STRNICMP
+#undef HAVE_STRNCASECMP
+#undef HAVE_SSCANF
+#undef HAVE_VSSCANF
+#undef HAVE_SNPRINTF
+#undef HAVE_VSNPRINTF
+#undef HAVE_M_PI
+#undef HAVE_ATAN
+#undef HAVE_ATAN2
+#undef HAVE_ACOS
+#undef HAVE_ASIN
+#undef HAVE_CEIL
+#undef HAVE_COPYSIGN
+#undef HAVE_COS
+#undef HAVE_COSF
+#undef HAVE_FABS
+#undef HAVE_FLOOR
+#undef HAVE_LOG
+#undef HAVE_POW
+#undef HAVE_SCALBN
+#undef HAVE_SIN
+#undef HAVE_SINF
+#undef HAVE_SQRT
+#undef HAVE_FSEEKO
+#undef HAVE_FSEEKO64
+#undef HAVE_SIGACTION
+#undef HAVE_SA_SIGACTION
+#undef HAVE_SETJMP
+#undef HAVE_NANOSLEEP
+#undef HAVE_SYSCONF
+#undef HAVE_SYSCTLBYNAME
+#undef HAVE_CLOCK_GETTIME
+#undef HAVE_GETPAGESIZE
+#undef HAVE_MPROTECT
+#undef HAVE_ICONV
+#undef HAVE_PTHREAD_SETNAME_NP
+#undef HAVE_PTHREAD_SET_NAME_NP
+#undef HAVE_SEM_TIMEDWAIT
+
+#else
+#define HAVE_STDARG_H   1
+#define HAVE_STDDEF_H   1
+#define HAVE_STDINT_H   1
+#endif /* HAVE_LIBC */
+
+/* SDL internal assertion support */
+#undef SDL_DEFAULT_ASSERT_LEVEL
+
+/* Allow disabling of core subsystems */
+#undef SDL_ATOMIC_DISABLED
+#undef SDL_AUDIO_DISABLED
+#undef SDL_CPUINFO_DISABLED
+#undef SDL_EVENTS_DISABLED
+#undef SDL_FILE_DISABLED
+#undef SDL_JOYSTICK_DISABLED
+#undef SDL_HAPTIC_DISABLED
+#undef SDL_LOADSO_DISABLED
+#undef SDL_RENDER_DISABLED
+#undef SDL_THREADS_DISABLED
+#undef SDL_TIMERS_DISABLED
+#undef SDL_VIDEO_DISABLED
+#undef SDL_POWER_DISABLED
+#undef SDL_FILESYSTEM_DISABLED
+
+/* Enable various audio drivers */
+#undef SDL_AUDIO_DRIVER_ALSA
+#undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
+#undef SDL_AUDIO_DRIVER_ARTS
+#undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
+#undef SDL_AUDIO_DRIVER_PULSEAUDIO
+#undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
+#undef SDL_AUDIO_DRIVER_HAIKU
+#undef SDL_AUDIO_DRIVER_BSD
+#undef SDL_AUDIO_DRIVER_COREAUDIO
+#undef SDL_AUDIO_DRIVER_DISK
+#undef SDL_AUDIO_DRIVER_DUMMY
+#undef SDL_AUDIO_DRIVER_XAUDIO2
+#undef SDL_AUDIO_DRIVER_DSOUND
+#undef SDL_AUDIO_DRIVER_ESD
+#undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
+#undef SDL_AUDIO_DRIVER_NAS
+#undef SDL_AUDIO_DRIVER_NAS_DYNAMIC
+#undef SDL_AUDIO_DRIVER_SNDIO
+#undef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC
+#undef SDL_AUDIO_DRIVER_OSS
+#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
+#undef SDL_AUDIO_DRIVER_PAUDIO
+#undef SDL_AUDIO_DRIVER_QSA
+#undef SDL_AUDIO_DRIVER_SUNAUDIO
+#undef SDL_AUDIO_DRIVER_WINMM
+#undef SDL_AUDIO_DRIVER_FUSIONSOUND
+#undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC
+
+/* Enable various input drivers */
+#undef SDL_INPUT_LINUXEV
+#undef SDL_INPUT_LINUXKD
+#undef SDL_INPUT_TSLIB
+#undef SDL_JOYSTICK_HAIKU
+#undef SDL_JOYSTICK_DINPUT
+#undef SDL_JOYSTICK_DUMMY
+#undef SDL_JOYSTICK_IOKIT
+#undef SDL_JOYSTICK_LINUX
+#undef SDL_JOYSTICK_WINMM
+#undef SDL_JOYSTICK_USBHID
+#undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
+#undef SDL_HAPTIC_DUMMY
+#undef SDL_HAPTIC_LINUX
+#undef SDL_HAPTIC_IOKIT
+#undef SDL_HAPTIC_DINPUT
+
+/* Enable various shared object loading systems */
+#undef SDL_LOADSO_HAIKU
+#undef SDL_LOADSO_DLOPEN
+#undef SDL_LOADSO_DUMMY
+#undef SDL_LOADSO_LDG
+#undef SDL_LOADSO_WINDOWS
+
+/* Enable various threading systems */
+#undef SDL_THREAD_PTHREAD
+#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
+#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
+#undef SDL_THREAD_WINDOWS
+
+/* Enable various timer systems */
+#undef SDL_TIMER_HAIKU
+#undef SDL_TIMER_DUMMY
+#undef SDL_TIMER_UNIX
+#undef SDL_TIMER_WINDOWS
+
+/* Enable various video drivers */
+#undef SDL_VIDEO_DRIVER_HAIKU
+#undef SDL_VIDEO_DRIVER_COCOA
+#undef SDL_VIDEO_DRIVER_DIRECTFB
+#undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC
+#undef SDL_VIDEO_DRIVER_DUMMY
+#undef SDL_VIDEO_DRIVER_WINDOWS
+#undef SDL_VIDEO_DRIVER_WAYLAND
+#undef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON
+#undef SDL_VIDEO_DRIVER_MIR
+#undef SDL_VIDEO_DRIVER_MIR_DYNAMIC
+#undef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON
+#undef SDL_VIDEO_DRIVER_X11
+#undef SDL_VIDEO_DRIVER_RPI
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE
+#undef SDL_VIDEO_DRIVER_X11_XCURSOR
+#undef SDL_VIDEO_DRIVER_X11_XINERAMA
+#undef SDL_VIDEO_DRIVER_X11_XINPUT2
+#undef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+#undef SDL_VIDEO_DRIVER_X11_XRANDR
+#undef SDL_VIDEO_DRIVER_X11_XSCRNSAVER
+#undef SDL_VIDEO_DRIVER_X11_XSHAPE
+#undef SDL_VIDEO_DRIVER_X11_XVIDMODE
+#undef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY
+#undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+
+#undef SDL_VIDEO_RENDER_D3D
+#undef SDL_VIDEO_RENDER_D3D11
+#undef SDL_VIDEO_RENDER_OGL
+#undef SDL_VIDEO_RENDER_OGL_ES
+#undef SDL_VIDEO_RENDER_OGL_ES2
+#undef SDL_VIDEO_RENDER_DIRECTFB
+
+/* Enable OpenGL support */
+#undef SDL_VIDEO_OPENGL
+#undef SDL_VIDEO_OPENGL_ES
+#undef SDL_VIDEO_OPENGL_ES2
+#undef SDL_VIDEO_OPENGL_BGL
+#undef SDL_VIDEO_OPENGL_CGL
+#undef SDL_VIDEO_OPENGL_EGL
+#undef SDL_VIDEO_OPENGL_GLX
+#undef SDL_VIDEO_OPENGL_WGL
+#undef SDL_VIDEO_OPENGL_OSMESA
+#undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
+
+/* Enable system power support */
+#undef SDL_POWER_LINUX
+#undef SDL_POWER_WINDOWS
+#undef SDL_POWER_MACOSX
+#undef SDL_POWER_HAIKU
+#undef SDL_POWER_HARDWIRED
+
+/* Enable system filesystem support */
+#undef SDL_FILESYSTEM_HAIKU
+#undef SDL_FILESYSTEM_COCOA
+#undef SDL_FILESYSTEM_DUMMY
+#undef SDL_FILESYSTEM_UNIX
+#undef SDL_FILESYSTEM_WINDOWS
+
+/* Enable assembly routines */
+#undef SDL_ASSEMBLY_ROUTINES
+#undef SDL_ALTIVEC_BLITTERS
+
+#endif /* _SDL_config_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config_android.h b/Source/3rd Party/sdl/include/SDL_config_android.h
new file mode 100644
index 000000000..738dd94cc
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config_android.h	
@@ -0,0 +1,144 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_android_h
+#define _SDL_config_android_h
+
+#include "SDL_platform.h"
+
+/**
+ *  \file SDL_config_android.h
+ *
+ *  This is a configuration that can be used to build SDL for Android
+ */
+
+#include <stdarg.h>
+
+#define HAVE_GCC_ATOMICS    1
+
+#define HAVE_ALLOCA_H       1
+#define HAVE_SYS_TYPES_H    1
+#define HAVE_STDIO_H    1
+#define STDC_HEADERS    1
+#define HAVE_STRING_H   1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H   1
+#define HAVE_CTYPE_H    1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H   1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_SETENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRLCPY    1
+#define HAVE_STRLCAT    1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF   1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_M_PI   1
+#define HAVE_ATAN   1
+#define HAVE_ATAN2  1
+#define HAVE_ACOS  1
+#define HAVE_ASIN  1
+#define HAVE_CEIL   1
+#define HAVE_COPYSIGN   1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_FABS   1
+#define HAVE_FLOOR  1
+#define HAVE_LOG    1
+#define HAVE_POW    1
+#define HAVE_SCALBN 1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SIGACTION  1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+#define HAVE_SYSCONF    1
+
+#define SIZEOF_VOIDP 4
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_ANDROID    1
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable various input drivers */
+#define SDL_JOYSTICK_ANDROID    1
+#define SDL_HAPTIC_DUMMY    1
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_DLOPEN   1
+
+/* Enable various threading systems */
+#define SDL_THREAD_PTHREAD  1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_UNIX  1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_ANDROID 1
+
+/* Enable OpenGL ES */
+#define SDL_VIDEO_OPENGL_ES 1
+#define SDL_VIDEO_OPENGL_ES2 1
+#define SDL_VIDEO_OPENGL_EGL 1
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_RENDER_OGL_ES2    1
+
+/* Enable system power support */
+#define SDL_POWER_ANDROID 1
+
+/* !!! FIXME: what does Android do for filesystem stuff? */
+#define SDL_FILESYSTEM_DUMMY   1
+
+#endif /* _SDL_config_android_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config_iphoneos.h b/Source/3rd Party/sdl/include/SDL_config_iphoneos.h
new file mode 100644
index 000000000..a0f55b6a7
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config_iphoneos.h	
@@ -0,0 +1,155 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_iphoneos_h
+#define _SDL_config_iphoneos_h
+
+#include "SDL_platform.h"
+
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+
+#define HAVE_GCC_ATOMICS    1
+
+#define HAVE_ALLOCA_H       1
+#define HAVE_SYS_TYPES_H    1
+#define HAVE_STDIO_H    1
+#define STDC_HEADERS    1
+#define HAVE_STRING_H   1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H   1
+#define HAVE_CTYPE_H    1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H   1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_SETENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRLCPY    1
+#define HAVE_STRLCAT    1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF   1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_M_PI   1
+#define HAVE_ATAN   1
+#define HAVE_ATAN2  1
+#define HAVE_ACOS  1
+#define HAVE_ASIN  1
+#define HAVE_CEIL   1
+#define HAVE_COPYSIGN   1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_FABS   1
+#define HAVE_FLOOR  1
+#define HAVE_LOG    1
+#define HAVE_POW    1
+#define HAVE_SCALBN 1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SIGACTION  1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+#define HAVE_SYSCONF    1
+#define HAVE_SYSCTLBYNAME 1
+
+/* enable iPhone version of Core Audio driver */
+#define SDL_AUDIO_DRIVER_COREAUDIO 1
+/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
+#define SDL_HAPTIC_DISABLED 1
+
+/* Enable Unix style SO loading */
+/* Technically this works, but it violates the iPhone developer agreement */
+/* #define SDL_LOADSO_DLOPEN 1 */
+
+/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
+#define SDL_LOADSO_DISABLED 1
+
+/* Enable various threading systems */
+#define SDL_THREAD_PTHREAD  1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_UNIX  1
+
+/* Supported video drivers */
+#define SDL_VIDEO_DRIVER_UIKIT  1
+#define SDL_VIDEO_DRIVER_DUMMY  1
+
+/* enable OpenGL ES */
+#define SDL_VIDEO_OPENGL_ES 1
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_RENDER_OGL_ES2    1
+
+/* Enable system power support */
+#define SDL_POWER_UIKIT 1
+
+/* enable iPhone keyboard support */
+#define SDL_IPHONE_KEYBOARD 1
+
+/* enable joystick subsystem */
+#define SDL_JOYSTICK_DISABLED 0
+
+/* Set max recognized G-force from accelerometer
+   See src/joystick/uikit/SDLUIAccelerationDelegate.m for notes on why this is needed
+ */
+#define SDL_IPHONE_MAX_GFORCE 5.0
+
+/* enable filesystem support */
+#define SDL_FILESYSTEM_COCOA   1
+
+#endif /* _SDL_config_iphoneos_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config_macosx.h b/Source/3rd Party/sdl/include/SDL_config_macosx.h
new file mode 100644
index 000000000..e627aef26
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config_macosx.h	
@@ -0,0 +1,184 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_macosx_h
+#define _SDL_config_macosx_h
+
+#include "SDL_platform.h"
+
+/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
+#include <AvailabilityMacros.h>
+
+/* This is a set of defines to configure the SDL features */
+
+#ifdef __LP64__
+    #define SIZEOF_VOIDP 8
+#else
+    #define SIZEOF_VOIDP 4
+#endif
+
+/* Useful headers */
+#define HAVE_ALLOCA_H       1
+#define HAVE_SYS_TYPES_H    1
+#define HAVE_STDIO_H    1
+#define STDC_HEADERS    1
+#define HAVE_STRING_H   1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H   1
+#define HAVE_CTYPE_H    1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H   1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRLCPY    1
+#define HAVE_STRLCAT    1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF   1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_CEIL   1
+#define HAVE_COPYSIGN   1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_FABS   1
+#define HAVE_FLOOR  1
+#define HAVE_LOG    1
+#define HAVE_POW    1
+#define HAVE_SCALBN 1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SIGACTION  1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+#define HAVE_SYSCONF    1
+#define HAVE_SYSCTLBYNAME 1
+#define HAVE_ATAN 1
+#define HAVE_ATAN2 1
+#define HAVE_ACOS 1
+#define HAVE_ASIN 1
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_COREAUDIO  1
+#define SDL_AUDIO_DRIVER_DISK   1
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable various input drivers */
+#define SDL_JOYSTICK_IOKIT  1
+#define SDL_HAPTIC_IOKIT    1
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_DLOPEN   1
+
+/* Enable various threading systems */
+#define SDL_THREAD_PTHREAD  1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_UNIX  1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_COCOA  1
+#define SDL_VIDEO_DRIVER_DUMMY  1
+#undef SDL_VIDEO_DRIVER_X11
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/usr/X11R6/lib/libXi.6.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib"
+#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
+#define SDL_VIDEO_DRIVER_X11_XRANDR 1
+#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
+#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
+#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1
+#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
+
+#ifdef MAC_OS_X_VERSION_10_8
+/*
+ * No matter the versions targeted, this is the 10.8 or later SDK, so you have
+ *  to use the external Xquartz, which is a more modern Xlib. Previous SDKs
+ *  used an older Xlib.
+ */
+#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
+#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
+#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1
+#endif
+
+#ifndef SDL_VIDEO_RENDER_OGL
+#define SDL_VIDEO_RENDER_OGL    1
+#endif
+
+/* Enable OpenGL support */
+#ifndef SDL_VIDEO_OPENGL
+#define SDL_VIDEO_OPENGL    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_CGL
+#define SDL_VIDEO_OPENGL_CGL    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_GLX
+#define SDL_VIDEO_OPENGL_GLX    1
+#endif
+
+/* Enable system power support */
+#define SDL_POWER_MACOSX 1
+
+/* enable filesystem support */
+#define SDL_FILESYSTEM_COCOA   1
+
+/* Enable assembly routines */
+#define SDL_ASSEMBLY_ROUTINES   1
+#ifdef __ppc__
+#define SDL_ALTIVEC_BLITTERS    1
+#endif
+
+#endif /* _SDL_config_macosx_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config_minimal.h b/Source/3rd Party/sdl/include/SDL_config_minimal.h
new file mode 100644
index 000000000..1bddafea7
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config_minimal.h	
@@ -0,0 +1,81 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_minimal_h
+#define _SDL_config_minimal_h
+
+#include "SDL_platform.h"
+
+/**
+ *  \file SDL_config_minimal.h
+ *
+ *  This is the minimal configuration that can be used to build SDL.
+ */
+
+#define HAVE_STDARG_H   1
+#define HAVE_STDDEF_H   1
+
+/* Most everything except Visual Studio 2008 and earlier has stdint.h now */
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
+/* Here are some reasonable defaults */
+typedef unsigned int size_t;
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+typedef unsigned long uintptr_t;
+#else
+#define HAVE_STDINT_H 1
+#endif /* Visual Studio 2008 */
+
+#ifdef __GNUC__
+#define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1
+#endif
+
+/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
+#define SDL_JOYSTICK_DISABLED   1
+
+/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
+#define SDL_HAPTIC_DISABLED 1
+
+/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
+#define SDL_LOADSO_DISABLED 1
+
+/* Enable the stub thread support (src/thread/generic/\*.c) */
+#define SDL_THREADS_DISABLED    1
+
+/* Enable the stub timer support (src/timer/dummy/\*.c) */
+#define SDL_TIMERS_DISABLED 1
+
+/* Enable the dummy video driver (src/video/dummy/\*.c) */
+#define SDL_VIDEO_DRIVER_DUMMY  1
+
+/* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */
+#define SDL_FILESYSTEM_DUMMY  1
+
+#endif /* _SDL_config_minimal_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config_pandora.h b/Source/3rd Party/sdl/include/SDL_config_pandora.h
new file mode 100644
index 000000000..ac8b08508
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config_pandora.h	
@@ -0,0 +1,124 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_h
+#define _SDL_config_h
+
+/* This is a set of defines to configure the SDL features */
+
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+
+#define SDL_BYTEORDER 1234
+
+#define HAVE_ALLOCA_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_ICONV_H 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_BCOPY 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_STRLEN 1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_STRTOLL 1
+#define HAVE_STRTOULL 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_M_PI 1
+#define HAVE_CEIL 1
+#define HAVE_COPYSIGN 1
+#define HAVE_COS 1
+#define HAVE_COSF 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_LOG 1
+#define HAVE_SCALBN 1
+#define HAVE_SIN 1
+#define HAVE_SINF 1
+#define HAVE_SQRT 1
+#define HAVE_SIGACTION 1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP 1
+
+#define SDL_AUDIO_DRIVER_DUMMY 1
+#define SDL_AUDIO_DRIVER_OSS 1
+
+#define SDL_INPUT_LINUXEV 1
+#define SDL_INPUT_TSLIB 1
+#define SDL_JOYSTICK_LINUX 1
+#define SDL_HAPTIC_LINUX 1
+
+#define SDL_LOADSO_DLOPEN 1
+
+#define SDL_THREAD_PTHREAD 1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1
+
+#define SDL_TIMER_UNIX 1
+#define SDL_FILESYSTEM_UNIX 1
+
+#define SDL_VIDEO_DRIVER_DUMMY 1
+#define SDL_VIDEO_DRIVER_X11 1
+#define SDL_VIDEO_DRIVER_PANDORA 1
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_OPENGL_ES 1
+
+#endif /* _SDL_config_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config_psp.h b/Source/3rd Party/sdl/include/SDL_config_psp.h
new file mode 100644
index 000000000..2f9d023c5
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config_psp.h	
@@ -0,0 +1,140 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_psp_h
+#define _SDL_config_psp_h
+
+#include "SDL_platform.h"
+
+
+
+#ifdef __GNUC__
+#define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1
+#endif
+
+#define HAVE_GCC_ATOMICS    1
+
+#define HAVE_ALLOCA_H       1
+#define HAVE_SYS_TYPES_H    1
+#define HAVE_STDIO_H    1
+#define STDC_HEADERS    1
+#define HAVE_STRING_H   1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H   1
+#define HAVE_CTYPE_H    1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H   1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_SETENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRLCPY    1
+#define HAVE_STRLCAT    1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF   1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_M_PI   1
+#define HAVE_ATAN   1
+#define HAVE_ATAN2  1
+#define HAVE_ACOS  1
+#define HAVE_ASIN  1
+#define HAVE_CEIL   1
+#define HAVE_COPYSIGN   1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_FABS   1
+#define HAVE_FLOOR  1
+#define HAVE_LOG    1
+#define HAVE_POW    1
+#define HAVE_SCALBN 1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+/* #define HAVE_SYSCONF  1 */
+/* #define HAVE_SIGACTION    1 */
+
+
+/* PSP isn't that sophisticated */
+#define LACKS_SYS_MMAN_H 1
+
+/* Enable the stub thread support (src/thread/psp/\*.c) */
+#define SDL_THREAD_PSP  1
+
+/* Enable the stub timer support (src/timer/psp/\*.c) */
+#define SDL_TIMERS_PSP  1
+
+/* Enable the stub joystick driver (src/joystick/psp/\*.c) */
+#define SDL_JOYSTICK_PSP        1
+
+/* Enable the stub audio driver (src/audio/psp/\*.c) */
+#define SDL_AUDIO_DRIVER_PSP    1
+
+/* PSP video dirver */
+#define SDL_VIDEO_DRIVER_PSP   1
+
+/* PSP render dirver */
+#define SDL_VIDEO_RENDER_PSP   1
+
+#define SDL_POWER_PSP          1
+
+/* !!! FIXME: what does PSP do for filesystem stuff? */
+#define SDL_FILESYSTEM_DUMMY   1
+
+/* PSP doesn't have haptic device (src/haptic/dummy/\*.c) */
+#define SDL_HAPTIC_DISABLED    1
+
+/* PSP can't load shared object (src/loadso/dummy/\*.c) */
+#define SDL_LOADSO_DISABLED    1
+
+
+#endif /* _SDL_config_psp_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config_windows.h b/Source/3rd Party/sdl/include/SDL_config_windows.h
new file mode 100644
index 000000000..35eda4653
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config_windows.h	
@@ -0,0 +1,210 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_windows_h
+#define _SDL_config_windows_h
+
+#include "SDL_platform.h"
+
+/* This is a set of defines to configure the SDL features */
+
+#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
+#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
+#define HAVE_STDINT_H   1
+#elif defined(_MSC_VER)
+typedef signed __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#ifndef _UINTPTR_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64 uintptr_t;
+#else
+typedef unsigned int uintptr_t;
+#endif
+#define _UINTPTR_T_DEFINED
+#endif
+/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
+#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
+#define DWORD_PTR DWORD
+#endif
+#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
+#define LONG_PTR LONG
+#endif
+#else /* !__GNUC__ && !_MSC_VER */
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+#ifndef _SIZE_T_DEFINED_
+#define _SIZE_T_DEFINED_
+typedef unsigned int size_t;
+#endif
+typedef unsigned int uintptr_t;
+#endif /* __GNUC__ || _MSC_VER */
+#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
+
+#ifdef _WIN64
+# define SIZEOF_VOIDP 8
+#else
+# define SIZEOF_VOIDP 4
+#endif
+
+/* This is disabled by default to avoid C runtime dependencies and manifest requirements */
+#ifdef HAVE_LIBC
+/* Useful headers */
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STRING_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H 1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE__STRREV 1
+#define HAVE__STRUPR 1
+#define HAVE__STRLWR 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE__LTOA 1
+#define HAVE__ULTOA 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE__STRICMP 1
+#define HAVE__STRNICMP 1
+#define HAVE_ATAN 1
+#define HAVE_ATAN2 1
+#define HAVE_ACOS  1
+#define HAVE_ASIN  1
+#define HAVE_CEIL 1
+#define HAVE_COS 1
+#define HAVE_COSF 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_LOG 1
+#define HAVE_POW 1
+#define HAVE_SIN 1
+#define HAVE_SINF 1
+#define HAVE_SQRT 1
+#if _MSC_VER >= 1800
+#define HAVE_STRTOLL 1
+#define HAVE_VSSCANF 1
+#define HAVE_COPYSIGN 1
+#define HAVE_SCALBN 1
+#endif
+#if !defined(_MSC_VER) || defined(_USE_MATH_DEFINES)
+#define HAVE_M_PI 1
+#endif
+#else
+#define HAVE_STDARG_H   1
+#define HAVE_STDDEF_H   1
+#endif
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_DSOUND 1
+#define SDL_AUDIO_DRIVER_XAUDIO2    1
+#define SDL_AUDIO_DRIVER_WINMM  1
+#define SDL_AUDIO_DRIVER_DISK   1
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable various input drivers */
+#define SDL_JOYSTICK_DINPUT 1
+#define SDL_HAPTIC_DINPUT   1
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_WINDOWS  1
+
+/* Enable various threading systems */
+#define SDL_THREAD_WINDOWS  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_WINDOWS   1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_DUMMY  1
+#define SDL_VIDEO_DRIVER_WINDOWS    1
+
+#ifndef SDL_VIDEO_RENDER_D3D
+#define SDL_VIDEO_RENDER_D3D    1
+#endif
+#ifndef SDL_VIDEO_RENDER_D3D11
+#define SDL_VIDEO_RENDER_D3D11	0
+#endif
+
+/* Enable OpenGL support */
+#ifndef SDL_VIDEO_OPENGL
+#define SDL_VIDEO_OPENGL    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_WGL
+#define SDL_VIDEO_OPENGL_WGL    1
+#endif
+#ifndef SDL_VIDEO_RENDER_OGL
+#define SDL_VIDEO_RENDER_OGL    1
+#endif
+#ifndef SDL_VIDEO_RENDER_OGL_ES2
+#define SDL_VIDEO_RENDER_OGL_ES2    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_ES2
+#define SDL_VIDEO_OPENGL_ES2    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_EGL
+#define SDL_VIDEO_OPENGL_EGL    1
+#endif
+
+
+/* Enable system power support */
+#define SDL_POWER_WINDOWS 1
+
+/* Enable filesystem support */
+#define SDL_FILESYSTEM_WINDOWS  1
+
+/* Enable assembly routines (Win64 doesn't have inline asm) */
+#ifndef _WIN64
+#define SDL_ASSEMBLY_ROUTINES   1
+#endif
+
+#endif /* _SDL_config_windows_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config_winrt.h b/Source/3rd Party/sdl/include/SDL_config_winrt.h
new file mode 100644
index 000000000..78b43ab64
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config_winrt.h	
@@ -0,0 +1,190 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_windows_h
+#define _SDL_config_windows_h
+
+#include "SDL_platform.h"
+
+/* This is a set of defines to configure the SDL features */
+
+#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
+#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
+#define HAVE_STDINT_H	1
+#elif defined(_MSC_VER)
+typedef signed __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#ifndef _UINTPTR_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64 uintptr_t;
+#else
+typedef unsigned int uintptr_t;
+#endif
+#define _UINTPTR_T_DEFINED
+#endif
+/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
+#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
+#define DWORD_PTR DWORD
+#endif
+#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
+#define LONG_PTR LONG
+#endif
+#else /* !__GNUC__ && !_MSC_VER */
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+#ifndef _SIZE_T_DEFINED_
+#define _SIZE_T_DEFINED_
+typedef unsigned int size_t;
+#endif
+typedef unsigned int uintptr_t;
+#endif /* __GNUC__ || _MSC_VER */
+#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
+
+#ifdef _WIN64
+# define SIZEOF_VOIDP 8
+#else
+# define SIZEOF_VOIDP 4
+#endif
+
+/* Useful headers */
+#define HAVE_LIBC 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STRING_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_FLOAT_H 1
+#define HAVE_SIGNAL_H 1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE__STRREV 1
+#define HAVE__STRUPR 1
+//#define HAVE__STRLWR 1	// TODO, WinRT: consider using _strlwr_s instead
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+//#define HAVE_ITOA 1   // TODO, WinRT: consider using _itoa_s instead
+//#define HAVE__LTOA 1	// TODO, WinRT: consider using _ltoa_s instead
+//#define HAVE__ULTOA 1	// TODO, WinRT: consider using _ultoa_s instead
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+//#define HAVE_STRTOLL 1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE__STRICMP 1
+#define HAVE__STRNICMP 1
+#define HAVE_VSNPRINTF 1
+//#define HAVE_SSCANF 1	// TODO, WinRT: consider using sscanf_s instead
+#define HAVE_M_PI 1
+#define HAVE_ATAN 1
+#define HAVE_ATAN2 1
+#define HAVE_CEIL 1
+#define HAVE__COPYSIGN 1
+#define HAVE_COS 1
+#define HAVE_COSF 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_LOG 1
+#define HAVE_POW 1
+//#define HAVE_SCALBN 1
+#define HAVE__SCALB 1
+#define HAVE_SIN 1
+#define HAVE_SINF 1
+#define HAVE_SQRT 1
+#define HAVE__FSEEKI64 1
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_XAUDIO2	1
+#define SDL_AUDIO_DRIVER_DISK	1
+#define SDL_AUDIO_DRIVER_DUMMY	1
+
+/* Enable various input drivers */
+// TODO, WinRT: Get haptic support working
+#define SDL_HAPTIC_DISABLED	1
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#define SDL_JOYSTICK_DISABLED 1
+#else
+#define SDL_JOYSTICK_XINPUT 1
+#endif
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_WINDOWS	1
+
+/* Enable various threading systems */
+#define SDL_THREAD_STDCPP   1
+
+/* Enable various timer systems */
+#define SDL_TIMER_WINDOWS	1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_WINRT	1
+#define SDL_VIDEO_DRIVER_DUMMY  1
+
+/* Enable OpenGL ES 2.0 (via a modified ANGLE library) */
+#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP    /* TODO, WinRT: try adding OpenGL ES 2 support for Windows Phone 8 */
+#define SDL_VIDEO_OPENGL_ES2 1
+#define SDL_VIDEO_OPENGL_EGL 1
+#endif
+
+/* Enable appropriate renderer(s) */
+#define SDL_VIDEO_RENDER_D3D11  1
+
+#if SDL_VIDEO_OPENGL_ES2
+#define SDL_VIDEO_RENDER_OGL_ES2 1
+#endif
+
+/* Enable system power support */
+#define SDL_POWER_WINRT 1
+
+/* Enable assembly routines (Win64 doesn't have inline asm) */
+#ifndef _WIN64
+#define SDL_ASSEMBLY_ROUTINES	1
+#endif
+
+#endif /* _SDL_config_windows_h */
diff --git a/Source/3rd Party/sdl/include/SDL_config_wiz.h b/Source/3rd Party/sdl/include/SDL_config_wiz.h
new file mode 100644
index 000000000..7efc20bc9
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_config_wiz.h	
@@ -0,0 +1,118 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_config_h
+#define _SDL_config_h
+
+/* This is a set of defines to configure the SDL features */
+
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
+#define SDL_BYTEORDER 1234
+
+#define HAVE_ALLOCA_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_ICONV_H 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_BCOPY 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_STRLEN 1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_STRTOLL 1
+#define HAVE_STRTOULL 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_M_PI 1
+#define HAVE_CEIL 1
+#define HAVE_COPYSIGN 1
+#define HAVE_COS 1
+#define HAVE_COSF 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_LOG 1
+#define HAVE_SCALBN 1
+#define HAVE_SIN 1
+#define HAVE_SINF 1
+#define HAVE_SQRT 1
+#define HAVE_SIGACTION 1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_POW 1
+
+#define SDL_CDROM_DISABLED 1
+#define SDL_AUDIO_DRIVER_DUMMY 1
+#define SDL_AUDIO_DRIVER_OSS 1
+
+#define SDL_INPUT_LINUXEV 1
+#define SDL_INPUT_TSLIB 1
+#define SDL_JOYSTICK_LINUX 1
+#define SDL_HAPTIC_LINUX 1
+
+#define SDL_LOADSO_DLOPEN 1
+
+#define SDL_THREAD_PTHREAD 1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1
+
+#define SDL_TIMER_UNIX 1
+
+#define SDL_VIDEO_DRIVER_DUMMY 1
+#define SDL_VIDEO_DRIVER_PANDORA 1
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_OPENGL_ES 1
+
+#endif /* _SDL_config_h */
diff --git a/Source/3rd Party/sdl/include/SDL_copying.h b/Source/3rd Party/sdl/include/SDL_copying.h
new file mode 100644
index 000000000..0964da84f
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_copying.h	
@@ -0,0 +1,20 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
diff --git a/Source/3rd Party/sdl/include/SDL_cpuinfo.h b/Source/3rd Party/sdl/include/SDL_cpuinfo.h
new file mode 100644
index 000000000..1f6efd384
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_cpuinfo.h	
@@ -0,0 +1,156 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_cpuinfo.h
+ *
+ *  CPU feature detection for SDL.
+ */
+
+#ifndef _SDL_cpuinfo_h
+#define _SDL_cpuinfo_h
+
+#include "SDL_stdinc.h"
+
+/* Need to do this here because intrin.h has C++ code in it */
+/* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */
+#if defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_IX86) || defined(_M_X64))
+#include <intrin.h>
+#ifndef _WIN64
+#define __MMX__
+#define __3dNOW__
+#endif
+#define __SSE__
+#define __SSE2__
+#elif defined(__MINGW64_VERSION_MAJOR)
+#include <intrin.h>
+#else
+#ifdef __ALTIVEC__
+#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__)
+#include <altivec.h>
+#undef pixel
+#endif
+#endif
+#ifdef __MMX__
+#include <mmintrin.h>
+#endif
+#ifdef __3dNOW__
+#include <mm3dnow.h>
+#endif
+#ifdef __SSE__
+#include <xmmintrin.h>
+#endif
+#ifdef __SSE2__
+#include <emmintrin.h>
+#endif
+#endif
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This is a guess for the cacheline size used for padding.
+ * Most x86 processors have a 64 byte cache line.
+ * The 64-bit PowerPC processors have a 128 byte cache line.
+ * We'll use the larger value to be generally safe.
+ */
+#define SDL_CACHELINE_SIZE  128
+
+/**
+ *  This function returns the number of CPU cores available.
+ */
+extern DECLSPEC int SDLCALL SDL_GetCPUCount(void);
+
+/**
+ *  This function returns the L1 cache line size of the CPU
+ *
+ *  This is useful for determining multi-threaded structure padding
+ *  or SIMD prefetch sizes.
+ */
+extern DECLSPEC int SDLCALL SDL_GetCPUCacheLineSize(void);
+
+/**
+ *  This function returns true if the CPU has the RDTSC instruction.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
+
+/**
+ *  This function returns true if the CPU has AltiVec features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
+
+/**
+ *  This function returns true if the CPU has MMX features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
+
+/**
+ *  This function returns true if the CPU has 3DNow! features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
+
+/**
+ *  This function returns true if the CPU has SSE features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
+
+/**
+ *  This function returns true if the CPU has SSE2 features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
+
+/**
+ *  This function returns true if the CPU has SSE3 features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE3(void);
+
+/**
+ *  This function returns true if the CPU has SSE4.1 features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void);
+
+/**
+ *  This function returns true if the CPU has SSE4.2 features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void);
+
+/**
+ *  This function returns true if the CPU has AVX features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void);
+
+/**
+ *  This function returns the amount of RAM configured in the system, in MB.
+ */
+extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_cpuinfo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_egl.h b/Source/3rd Party/sdl/include/SDL_egl.h
new file mode 100644
index 000000000..d312f0425
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_egl.h	
@@ -0,0 +1,1396 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_opengles.h
+ *
+ *  This is a simple file to encapsulate the OpenGL ES 2.0 API headers.
+ */
+#ifndef _MSC_VER
+
+#include <EGL/egl.h>
+
+#else /* _MSC_VER */
+
+/* EGL headers for Visual Studio */
+
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2009 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+*
+* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
+*
+* Adopters may modify this file to suit their platform. Adopters are
+* encouraged to submit platform specific modifications to the Khronos
+* group so that they can be included in future versions of this file.
+* Please submit changes by sending them to the public Khronos Bugzilla
+* (http://khronos.org/bugzilla) by filing a bug against product
+* "Khronos (general)" component "Registry".
+*
+* A predefined template which fills in some of the bug fields can be
+* reached using http://tinyurl.com/khrplatform-h-bugreport, but you
+* must create a Bugzilla login first.
+*
+*
+* See the Implementer's Guidelines for information about where this file
+* should be located on your system and for more details of its use:
+*    http://www.khronos.org/registry/implementers_guide.pdf
+*
+* This file should be included as
+*        #include <KHR/khrplatform.h>
+* by Khronos client API header files that use its types and defines.
+*
+* The types in khrplatform.h should only be used to define API-specific types.
+*
+* Types defined in khrplatform.h:
+*    khronos_int8_t              signed   8  bit
+*    khronos_uint8_t             unsigned 8  bit
+*    khronos_int16_t             signed   16 bit
+*    khronos_uint16_t            unsigned 16 bit
+*    khronos_int32_t             signed   32 bit
+*    khronos_uint32_t            unsigned 32 bit
+*    khronos_int64_t             signed   64 bit
+*    khronos_uint64_t            unsigned 64 bit
+*    khronos_intptr_t            signed   same number of bits as a pointer
+*    khronos_uintptr_t           unsigned same number of bits as a pointer
+*    khronos_ssize_t             signed   size
+*    khronos_usize_t             unsigned size
+*    khronos_float_t             signed   32 bit floating point
+*    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+*    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+*                                         nanoseconds
+*    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+*    khronos_boolean_enum_t      enumerated boolean type. This should
+*      only be used as a base type when a client API's boolean type is
+*      an enum. Client APIs which use an integer or other type for
+*      booleans cannot use this as the base type for their boolean.
+*
+* Tokens defined in khrplatform.h:
+*
+*    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+*
+*    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+*    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+*
+* Calling convention macros defined in this file:
+*    KHRONOS_APICALL
+*    KHRONOS_APIENTRY
+*    KHRONOS_APIATTRIBUTES
+*
+* These may be used in function prototypes as:
+*
+*      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+*                                  int arg1,
+*                                  int arg2) KHRONOS_APIATTRIBUTES;
+*/
+
+/*-------------------------------------------------------------------------
+* Definition of KHRONOS_APICALL
+*-------------------------------------------------------------------------
+* This precedes the return type of the function in the function prototype.
+*/
+#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+* Definition of KHRONOS_APIENTRY
+*-------------------------------------------------------------------------
+* This follows the return type of the function  and precedes the function
+* name in the function prototype.
+*/
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+/* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+* Definition of KHRONOS_APIATTRIBUTES
+*-------------------------------------------------------------------------
+* This follows the closing parenthesis of the function prototype arguments.
+*/
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+* basic type definitions
+*-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+* Using <stdint.h>
+*/
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+* Using <inttypes.h>
+*/
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+* Win32
+*/
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+* Sun or Digital
+*/
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+* Hypothetical platform with no float or int64 support
+*/
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+* Generic fallback
+*/
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+* Types that are (so far) the same on all platforms
+*/
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+* Types that differ between LLP64 and LP64 architectures - in LLP64,
+* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+* to be the only LLP64 architecture in current use.
+*/
+#ifdef _WIN64
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+* Float type
+*/
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+*
+* These types can be used to represent a time interval in nanoseconds or
+* an absolute Unadjusted System Time.  Unadjusted System Time is the number
+* of nanoseconds since some arbitrary system event (e.g. since the last
+* time the system booted).  The Unadjusted System Time is an unsigned
+* 64 bit value that wraps back to 0 every 584 years.  Time intervals
+* may be either signed or unsigned.
+*/
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+* Dummy value used to pad enum types to 32 bits.
+*/
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+* Enumerated boolean type
+*
+* Values other than zero should be considered to be true.  Therefore
+* comparisons should not be made against KHRONOS_TRUE.
+*/
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */
+
+
+#ifndef __eglplatform_h_
+#define __eglplatform_h_
+
+/*
+** Copyright (c) 2007-2009 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Platform-specific types and definitions for egl.h
+* $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
+*
+* Adopters may modify khrplatform.h and this file to suit their platform.
+* You are encouraged to submit all modifications to the Khronos group so that
+* they can be included in future versions of this file.  Please submit changes
+* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
+* by filing a bug against product "EGL" component "Registry".
+*/
+
+/*#include <KHR/khrplatform.h>*/
+
+/* Macros used in EGL function prototype declarations.
+*
+* EGL functions should be prototyped as:
+*
+* EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
+* typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
+*
+* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
+*/
+
+#ifndef EGLAPI
+#define EGLAPI KHRONOS_APICALL
+#endif
+
+#ifndef EGLAPIENTRY
+#define EGLAPIENTRY  KHRONOS_APIENTRY
+#endif
+#define EGLAPIENTRYP EGLAPIENTRY*
+
+/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
+* are aliases of window-system-dependent types, such as X Display * or
+* Windows Device Context. They must be defined in platform-specific
+* code below. The EGL-prefixed versions of Native*Type are the same
+* types, renamed in EGL 1.3 so all types in the API start with "EGL".
+*
+* Khronos STRONGLY RECOMMENDS that you use the default definitions
+* provided below, since these changes affect both binary and source
+* portability of applications using EGL running on different EGL
+* implementations.
+*/
+
+#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+
+#if __WINRT__
+#include <Unknwn.h>
+typedef IUnknown * EGLNativeWindowType;
+typedef int EGLNativeDisplayType;
+typedef HBITMAP EGLNativePixmapType;
+#else
+typedef HDC     EGLNativeDisplayType;
+typedef HBITMAP EGLNativePixmapType;
+typedef HWND    EGLNativeWindowType;
+#endif
+
+#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
+
+typedef int   EGLNativeDisplayType;
+typedef void *EGLNativeWindowType;
+typedef void *EGLNativePixmapType;
+
+#elif defined(WL_EGL_PLATFORM)
+
+typedef struct wl_display     *EGLNativeDisplayType;
+typedef struct wl_egl_pixmap  *EGLNativePixmapType;
+typedef struct wl_egl_window  *EGLNativeWindowType;
+
+#elif defined(__GBM__)
+
+typedef struct gbm_device  *EGLNativeDisplayType;
+typedef struct gbm_bo      *EGLNativePixmapType;
+typedef void               *EGLNativeWindowType;
+
+#elif defined(ANDROID) /* Android */
+
+struct ANativeWindow;
+struct egl_native_pixmap_t;
+
+typedef struct ANativeWindow        *EGLNativeWindowType;
+typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
+typedef void                        *EGLNativeDisplayType;
+
+#elif defined(MIR_EGL_PLATFORM)
+
+#include <mir_toolkit/mir_client_library.h>
+typedef MirEGLNativeDisplayType EGLNativeDisplayType;
+typedef void                   *EGLNativePixmapType;
+typedef MirEGLNativeWindowType  EGLNativeWindowType;
+
+#elif defined(__unix__)
+
+#ifdef MESA_EGL_NO_X11_HEADERS
+
+typedef void            *EGLNativeDisplayType;
+typedef khronos_uintptr_t EGLNativePixmapType;
+typedef khronos_uintptr_t EGLNativeWindowType;
+
+#else
+
+/* X11 (tentative)  */
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+typedef Display *EGLNativeDisplayType;
+typedef Pixmap   EGLNativePixmapType;
+typedef Window   EGLNativeWindowType;
+
+#endif /* MESA_EGL_NO_X11_HEADERS */
+
+#else
+#error "Platform not recognized"
+#endif
+
+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
+typedef EGLNativeDisplayType NativeDisplayType;
+typedef EGLNativePixmapType  NativePixmapType;
+typedef EGLNativeWindowType  NativeWindowType;
+
+
+/* Define EGLint. This must be a signed integral type large enough to contain
+* all legal attribute names and values passed into and out of EGL, whether
+* their type is boolean, bitmask, enumerant (symbolic constant), integer,
+* handle, or other.  While in general a 32-bit integer will suffice, if
+* handles are 64 bit types, then EGLint should be defined as a signed 64-bit
+* integer type.
+*/
+typedef khronos_int32_t EGLint;
+
+#endif /* __eglplatform_h */
+
+/* -*- mode: c; tab-width: 8; -*- */
+/* vi: set sw=4 ts=8: */
+/* Reference version of egl.h for EGL 1.4.
+* $Revision: 9356 $ on $Date: 2009-10-21 02:52:25 -0700 (Wed, 21 Oct 2009) $
+*/
+
+/*
+** Copyright (c) 2007-2009 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+#ifndef __egl_h_
+#define __egl_h_
+
+/* All platform-dependent types and macro boilerplate (such as EGLAPI
+* and EGLAPIENTRY) should go in eglplatform.h.
+*/
+/*#include <EGL/eglplatform.h>*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /* EGL Types */
+    /* EGLint is defined in eglplatform.h */
+    typedef unsigned int EGLBoolean;
+    typedef unsigned int EGLenum;
+    typedef void *EGLConfig;
+    typedef void *EGLContext;
+    typedef void *EGLDisplay;
+    typedef void *EGLSurface;
+    typedef void *EGLClientBuffer;
+
+    /* EGL Versioning */
+#define EGL_VERSION_1_0			1
+#define EGL_VERSION_1_1			1
+#define EGL_VERSION_1_2			1
+#define EGL_VERSION_1_3			1
+#define EGL_VERSION_1_4			1
+
+    /* EGL Enumerants. Bitmasks and other exceptional cases aside, most
+    * enums are assigned unique values starting at 0x3000.
+    */
+
+    /* EGL aliases */
+#define EGL_FALSE			0
+#define EGL_TRUE			1
+
+    /* Out-of-band handle values */
+#define EGL_DEFAULT_DISPLAY		((EGLNativeDisplayType)0)
+#define EGL_NO_CONTEXT			((EGLContext)0)
+#define EGL_NO_DISPLAY			((EGLDisplay)0)
+#define EGL_NO_SURFACE			((EGLSurface)0)
+
+    /* Out-of-band attribute value */
+#define EGL_DONT_CARE			((EGLint)-1)
+
+    /* Errors / GetError return values */
+#define EGL_SUCCESS			0x3000
+#define EGL_NOT_INITIALIZED		0x3001
+#define EGL_BAD_ACCESS			0x3002
+#define EGL_BAD_ALLOC			0x3003
+#define EGL_BAD_ATTRIBUTE		0x3004
+#define EGL_BAD_CONFIG			0x3005
+#define EGL_BAD_CONTEXT			0x3006
+#define EGL_BAD_CURRENT_SURFACE		0x3007
+#define EGL_BAD_DISPLAY			0x3008
+#define EGL_BAD_MATCH			0x3009
+#define EGL_BAD_NATIVE_PIXMAP		0x300A
+#define EGL_BAD_NATIVE_WINDOW		0x300B
+#define EGL_BAD_PARAMETER		0x300C
+#define EGL_BAD_SURFACE			0x300D
+#define EGL_CONTEXT_LOST		0x300E	/* EGL 1.1 - IMG_power_management */
+
+    /* Reserved 0x300F-0x301F for additional errors */
+
+    /* Config attributes */
+#define EGL_BUFFER_SIZE			0x3020
+#define EGL_ALPHA_SIZE			0x3021
+#define EGL_BLUE_SIZE			0x3022
+#define EGL_GREEN_SIZE			0x3023
+#define EGL_RED_SIZE			0x3024
+#define EGL_DEPTH_SIZE			0x3025
+#define EGL_STENCIL_SIZE		0x3026
+#define EGL_CONFIG_CAVEAT		0x3027
+#define EGL_CONFIG_ID			0x3028
+#define EGL_LEVEL			0x3029
+#define EGL_MAX_PBUFFER_HEIGHT		0x302A
+#define EGL_MAX_PBUFFER_PIXELS		0x302B
+#define EGL_MAX_PBUFFER_WIDTH		0x302C
+#define EGL_NATIVE_RENDERABLE		0x302D
+#define EGL_NATIVE_VISUAL_ID		0x302E
+#define EGL_NATIVE_VISUAL_TYPE		0x302F
+#define EGL_SAMPLES			0x3031
+#define EGL_SAMPLE_BUFFERS		0x3032
+#define EGL_SURFACE_TYPE		0x3033
+#define EGL_TRANSPARENT_TYPE		0x3034
+#define EGL_TRANSPARENT_BLUE_VALUE	0x3035
+#define EGL_TRANSPARENT_GREEN_VALUE	0x3036
+#define EGL_TRANSPARENT_RED_VALUE	0x3037
+#define EGL_NONE			0x3038	/* Attrib list terminator */
+#define EGL_BIND_TO_TEXTURE_RGB		0x3039
+#define EGL_BIND_TO_TEXTURE_RGBA	0x303A
+#define EGL_MIN_SWAP_INTERVAL		0x303B
+#define EGL_MAX_SWAP_INTERVAL		0x303C
+#define EGL_LUMINANCE_SIZE		0x303D
+#define EGL_ALPHA_MASK_SIZE		0x303E
+#define EGL_COLOR_BUFFER_TYPE		0x303F
+#define EGL_RENDERABLE_TYPE		0x3040
+#define EGL_MATCH_NATIVE_PIXMAP		0x3041	/* Pseudo-attribute (not queryable) */
+#define EGL_CONFORMANT			0x3042
+
+    /* Reserved 0x3041-0x304F for additional config attributes */
+
+    /* Config attribute values */
+#define EGL_SLOW_CONFIG			0x3050	/* EGL_CONFIG_CAVEAT value */
+#define EGL_NON_CONFORMANT_CONFIG	0x3051	/* EGL_CONFIG_CAVEAT value */
+#define EGL_TRANSPARENT_RGB		0x3052	/* EGL_TRANSPARENT_TYPE value */
+#define EGL_RGB_BUFFER			0x308E	/* EGL_COLOR_BUFFER_TYPE value */
+#define EGL_LUMINANCE_BUFFER		0x308F	/* EGL_COLOR_BUFFER_TYPE value */
+
+    /* More config attribute values, for EGL_TEXTURE_FORMAT */
+#define EGL_NO_TEXTURE			0x305C
+#define EGL_TEXTURE_RGB			0x305D
+#define EGL_TEXTURE_RGBA		0x305E
+#define EGL_TEXTURE_2D			0x305F
+
+    /* Config attribute mask bits */
+#define EGL_PBUFFER_BIT			0x0001	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_PIXMAP_BIT			0x0002	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_WINDOW_BIT			0x0004	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_VG_COLORSPACE_LINEAR_BIT	0x0020	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_VG_ALPHA_FORMAT_PRE_BIT	0x0040	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_MULTISAMPLE_RESOLVE_BOX_BIT 0x0200	/* EGL_SURFACE_TYPE mask bits */
+#define EGL_SWAP_BEHAVIOR_PRESERVED_BIT 0x0400	/* EGL_SURFACE_TYPE mask bits */
+
+#define EGL_OPENGL_ES_BIT		0x0001	/* EGL_RENDERABLE_TYPE mask bits */
+#define EGL_OPENVG_BIT			0x0002	/* EGL_RENDERABLE_TYPE mask bits */
+#define EGL_OPENGL_ES2_BIT		0x0004	/* EGL_RENDERABLE_TYPE mask bits */
+#define EGL_OPENGL_BIT			0x0008	/* EGL_RENDERABLE_TYPE mask bits */
+
+    /* QueryString targets */
+#define EGL_VENDOR			0x3053
+#define EGL_VERSION			0x3054
+#define EGL_EXTENSIONS			0x3055
+#define EGL_CLIENT_APIS			0x308D
+
+    /* QuerySurface / SurfaceAttrib / CreatePbufferSurface targets */
+#define EGL_HEIGHT			0x3056
+#define EGL_WIDTH			0x3057
+#define EGL_LARGEST_PBUFFER		0x3058
+#define EGL_TEXTURE_FORMAT		0x3080
+#define EGL_TEXTURE_TARGET		0x3081
+#define EGL_MIPMAP_TEXTURE		0x3082
+#define EGL_MIPMAP_LEVEL		0x3083
+#define EGL_RENDER_BUFFER		0x3086
+#define EGL_VG_COLORSPACE		0x3087
+#define EGL_VG_ALPHA_FORMAT		0x3088
+#define EGL_HORIZONTAL_RESOLUTION	0x3090
+#define EGL_VERTICAL_RESOLUTION		0x3091
+#define EGL_PIXEL_ASPECT_RATIO		0x3092
+#define EGL_SWAP_BEHAVIOR		0x3093
+#define EGL_MULTISAMPLE_RESOLVE		0x3099
+
+    /* EGL_RENDER_BUFFER values / BindTexImage / ReleaseTexImage buffer targets */
+#define EGL_BACK_BUFFER			0x3084
+#define EGL_SINGLE_BUFFER		0x3085
+
+    /* OpenVG color spaces */
+#define EGL_VG_COLORSPACE_sRGB		0x3089	/* EGL_VG_COLORSPACE value */
+#define EGL_VG_COLORSPACE_LINEAR	0x308A	/* EGL_VG_COLORSPACE value */
+
+    /* OpenVG alpha formats */
+#define EGL_VG_ALPHA_FORMAT_NONPRE	0x308B	/* EGL_ALPHA_FORMAT value */
+#define EGL_VG_ALPHA_FORMAT_PRE		0x308C	/* EGL_ALPHA_FORMAT value */
+
+    /* Constant scale factor by which fractional display resolutions &
+    * aspect ratio are scaled when queried as integer values.
+    */
+#define EGL_DISPLAY_SCALING		10000
+
+    /* Unknown display resolution/aspect ratio */
+#define EGL_UNKNOWN			((EGLint)-1)
+
+    /* Back buffer swap behaviors */
+#define EGL_BUFFER_PRESERVED		0x3094	/* EGL_SWAP_BEHAVIOR value */
+#define EGL_BUFFER_DESTROYED		0x3095	/* EGL_SWAP_BEHAVIOR value */
+
+    /* CreatePbufferFromClientBuffer buffer types */
+#define EGL_OPENVG_IMAGE		0x3096
+
+    /* QueryContext targets */
+#define EGL_CONTEXT_CLIENT_TYPE		0x3097
+
+    /* CreateContext attributes */
+#define EGL_CONTEXT_CLIENT_VERSION	0x3098
+
+    /* Multisample resolution behaviors */
+#define EGL_MULTISAMPLE_RESOLVE_DEFAULT 0x309A	/* EGL_MULTISAMPLE_RESOLVE value */
+#define EGL_MULTISAMPLE_RESOLVE_BOX	0x309B	/* EGL_MULTISAMPLE_RESOLVE value */
+
+    /* BindAPI/QueryAPI targets */
+#define EGL_OPENGL_ES_API		0x30A0
+#define EGL_OPENVG_API			0x30A1
+#define EGL_OPENGL_API			0x30A2
+
+    /* GetCurrentSurface targets */
+#define EGL_DRAW			0x3059
+#define EGL_READ			0x305A
+
+    /* WaitNative engines */
+#define EGL_CORE_NATIVE_ENGINE		0x305B
+
+    /* EGL 1.2 tokens renamed for consistency in EGL 1.3 */
+#define EGL_COLORSPACE			EGL_VG_COLORSPACE
+#define EGL_ALPHA_FORMAT		EGL_VG_ALPHA_FORMAT
+#define EGL_COLORSPACE_sRGB		EGL_VG_COLORSPACE_sRGB
+#define EGL_COLORSPACE_LINEAR		EGL_VG_COLORSPACE_LINEAR
+#define EGL_ALPHA_FORMAT_NONPRE		EGL_VG_ALPHA_FORMAT_NONPRE
+#define EGL_ALPHA_FORMAT_PRE		EGL_VG_ALPHA_FORMAT_PRE
+
+    /* EGL extensions must request enum blocks from the Khronos
+    * API Registrar, who maintains the enumerant registry. Submit
+    * a bug in Khronos Bugzilla against task "Registry".
+    */
+
+
+
+    /* EGL Functions */
+
+    EGLAPI EGLint EGLAPIENTRY eglGetError(void);
+
+    EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id);
+    EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
+    EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy);
+
+    EGLAPI const char * EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name);
+
+    EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
+        EGLint config_size, EGLint *num_config);
+    EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list,
+        EGLConfig *configs, EGLint config_size,
+        EGLint *num_config);
+    EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
+        EGLint attribute, EGLint *value);
+
+    EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config,
+        EGLNativeWindowType win,
+        const EGLint *attrib_list);
+    EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config,
+        const EGLint *attrib_list);
+    EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config,
+        EGLNativePixmapType pixmap,
+        const EGLint *attrib_list);
+    EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface);
+    EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface,
+        EGLint attribute, EGLint *value);
+
+    EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api);
+    EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void);
+
+    EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void);
+
+    EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void);
+
+    EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(
+        EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer,
+        EGLConfig config, const EGLint *attrib_list);
+
+    EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface,
+        EGLint attribute, EGLint value);
+    EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
+    EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
+
+
+    EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval);
+
+
+    EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config,
+        EGLContext share_context,
+        const EGLint *attrib_list);
+    EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx);
+    EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw,
+        EGLSurface read, EGLContext ctx);
+
+    EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void);
+    EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw);
+    EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void);
+    EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx,
+        EGLint attribute, EGLint *value);
+
+    EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void);
+    EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine);
+    EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface);
+    EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface,
+        EGLNativePixmapType target);
+
+    /* This is a generic function pointer type, whose name indicates it must
+    * be cast to the proper type *and calling convention* before use.
+    */
+    typedef void(*__eglMustCastToProperFunctionPointerType)(void);
+
+    /* Now, define eglGetProcAddress using the generic function ptr. type */
+    EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY
+        eglGetProcAddress(const char *procname);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __egl_h_ */
+
+
+
+
+#ifndef __eglext_h_
+#define __eglext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    /*
+    ** Copyright (c) 2007-2013 The Khronos Group Inc.
+    **
+    ** Permission is hereby granted, free of charge, to any person obtaining a
+    ** copy of this software and/or associated documentation files (the
+    ** "Materials"), to deal in the Materials without restriction, including
+    ** without limitation the rights to use, copy, modify, merge, publish,
+    ** distribute, sublicense, and/or sell copies of the Materials, and to
+    ** permit persons to whom the Materials are furnished to do so, subject to
+    ** the following conditions:
+    **
+    ** The above copyright notice and this permission notice shall be included
+    ** in all copies or substantial portions of the Materials.
+    **
+    ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    ** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    ** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    ** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+    */
+
+/* #include <EGL/eglplatform.h> */
+
+    /*************************************************************/
+
+    /* Header file version number */
+    /* Current version at http://www.khronos.org/registry/egl/ */
+    /* $Revision: 21254 $ on $Date: 2013-04-25 03:11:55 -0700 (Thu, 25 Apr 2013) $ */
+#define EGL_EGLEXT_VERSION 16
+
+#ifndef EGL_KHR_config_attribs
+#define EGL_KHR_config_attribs 1
+#define EGL_CONFORMANT_KHR			0x3042	/* EGLConfig attribute */
+#define EGL_VG_COLORSPACE_LINEAR_BIT_KHR	0x0020	/* EGL_SURFACE_TYPE bitfield */
+#define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR		0x0040	/* EGL_SURFACE_TYPE bitfield */
+#endif
+
+#ifndef EGL_KHR_lock_surface
+#define EGL_KHR_lock_surface 1
+#define EGL_READ_SURFACE_BIT_KHR		0x0001	/* EGL_LOCK_USAGE_HINT_KHR bitfield */
+#define EGL_WRITE_SURFACE_BIT_KHR		0x0002	/* EGL_LOCK_USAGE_HINT_KHR bitfield */
+#define EGL_LOCK_SURFACE_BIT_KHR		0x0080	/* EGL_SURFACE_TYPE bitfield */
+#define EGL_OPTIMAL_FORMAT_BIT_KHR		0x0100	/* EGL_SURFACE_TYPE bitfield */
+#define EGL_MATCH_FORMAT_KHR			0x3043	/* EGLConfig attribute */
+#define EGL_FORMAT_RGB_565_EXACT_KHR		0x30C0	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_FORMAT_RGB_565_KHR			0x30C1	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_FORMAT_RGBA_8888_EXACT_KHR		0x30C2	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_FORMAT_RGBA_8888_KHR		0x30C3	/* EGL_MATCH_FORMAT_KHR value */
+#define EGL_MAP_PRESERVE_PIXELS_KHR		0x30C4	/* eglLockSurfaceKHR attribute */
+#define EGL_LOCK_USAGE_HINT_KHR			0x30C5	/* eglLockSurfaceKHR attribute */
+#define EGL_BITMAP_POINTER_KHR			0x30C6	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PITCH_KHR			0x30C7	/* eglQuerySurface attribute */
+#define EGL_BITMAP_ORIGIN_KHR			0x30C8	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR		0x30C9	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR	0x30CA	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR	0x30CB	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR	0x30CC	/* eglQuerySurface attribute */
+#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR	0x30CD	/* eglQuerySurface attribute */
+#define EGL_LOWER_LEFT_KHR			0x30CE	/* EGL_BITMAP_ORIGIN_KHR value */
+#define EGL_UPPER_LEFT_KHR			0x30CF	/* EGL_BITMAP_ORIGIN_KHR value */
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLBoolean EGLAPIENTRY eglLockSurfaceKHR(EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
+    EGLAPI EGLBoolean EGLAPIENTRY eglUnlockSurfaceKHR(EGLDisplay display, EGLSurface surface);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface, const EGLint *attrib_list);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay display, EGLSurface surface);
+#endif
+
+#ifndef EGL_KHR_image
+#define EGL_KHR_image 1
+#define EGL_NATIVE_PIXMAP_KHR			0x30B0	/* eglCreateImageKHR target */
+    typedef void *EGLImageKHR;
+#define EGL_NO_IMAGE_KHR			((EGLImageKHR)0)
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
+    EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLImageKHR(EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image);
+#endif
+
+#ifndef EGL_KHR_vg_parent_image
+#define EGL_KHR_vg_parent_image 1
+#define EGL_VG_PARENT_IMAGE_KHR			0x30BA	/* eglCreateImageKHR target */
+#endif
+
+#ifndef EGL_KHR_gl_texture_2D_image
+#define EGL_KHR_gl_texture_2D_image 1
+#define EGL_GL_TEXTURE_2D_KHR			0x30B1	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_LEVEL_KHR		0x30BC	/* eglCreateImageKHR attribute */
+#endif
+
+#ifndef EGL_KHR_gl_texture_cubemap_image
+#define EGL_KHR_gl_texture_cubemap_image 1
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR	0x30B3	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR	0x30B4	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR	0x30B5	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR	0x30B6	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR	0x30B7	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR	0x30B8	/* eglCreateImageKHR target */
+#endif
+
+#ifndef EGL_KHR_gl_texture_3D_image
+#define EGL_KHR_gl_texture_3D_image 1
+#define EGL_GL_TEXTURE_3D_KHR			0x30B2	/* eglCreateImageKHR target */
+#define EGL_GL_TEXTURE_ZOFFSET_KHR		0x30BD	/* eglCreateImageKHR attribute */
+#endif
+
+#ifndef EGL_KHR_gl_renderbuffer_image
+#define EGL_KHR_gl_renderbuffer_image 1
+#define EGL_GL_RENDERBUFFER_KHR			0x30B9	/* eglCreateImageKHR target */
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* EGLTimeKHR requires 64-bit uint support */
+#ifndef EGL_KHR_reusable_sync
+#define EGL_KHR_reusable_sync 1
+
+    typedef void* EGLSyncKHR;
+    typedef khronos_utime_nanoseconds_t EGLTimeKHR;
+
+#define EGL_SYNC_STATUS_KHR			0x30F1
+#define EGL_SIGNALED_KHR			0x30F2
+#define EGL_UNSIGNALED_KHR			0x30F3
+#define EGL_TIMEOUT_EXPIRED_KHR			0x30F5
+#define EGL_CONDITION_SATISFIED_KHR		0x30F6
+#define EGL_SYNC_TYPE_KHR			0x30F7
+#define EGL_SYNC_REUSABLE_KHR			0x30FA
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR		0x0001	/* eglClientWaitSyncKHR <flags> bitfield */
+#define EGL_FOREVER_KHR				0xFFFFFFFFFFFFFFFFull
+#define EGL_NO_SYNC_KHR				((EGLSyncKHR)0)
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+    EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR(EGLDisplay dpy, EGLSyncKHR sync);
+    EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+    EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
+    EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLSyncKHR(EGLAPIENTRYP PFNEGLCREATESYNCKHRPROC) (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync);
+    typedef EGLint(EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#endif
+#endif
+
+#ifndef EGL_KHR_image_base
+#define EGL_KHR_image_base 1
+    /* Most interfaces defined by EGL_KHR_image_pixmap above */
+#define EGL_IMAGE_PRESERVED_KHR			0x30D2	/* eglCreateImageKHR attribute */
+#endif
+
+#ifndef EGL_KHR_image_pixmap
+#define EGL_KHR_image_pixmap 1
+    /* Interfaces defined by EGL_KHR_image above */
+#endif
+
+#ifndef EGL_IMG_context_priority
+#define EGL_IMG_context_priority 1
+#define EGL_CONTEXT_PRIORITY_LEVEL_IMG		0x3100
+#define EGL_CONTEXT_PRIORITY_HIGH_IMG		0x3101
+#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG		0x3102
+#define EGL_CONTEXT_PRIORITY_LOW_IMG		0x3103
+#endif
+
+#ifndef EGL_KHR_lock_surface2
+#define EGL_KHR_lock_surface2 1
+#define EGL_BITMAP_PIXEL_SIZE_KHR		0x3110
+#endif
+
+#ifndef EGL_NV_coverage_sample
+#define EGL_NV_coverage_sample 1
+#define EGL_COVERAGE_BUFFERS_NV			0x30E0
+#define EGL_COVERAGE_SAMPLES_NV			0x30E1
+#endif
+
+#ifndef EGL_NV_depth_nonlinear
+#define EGL_NV_depth_nonlinear 1
+#define EGL_DEPTH_ENCODING_NV			0x30E2
+#define EGL_DEPTH_ENCODING_NONE_NV 0
+#define EGL_DEPTH_ENCODING_NONLINEAR_NV		0x30E3
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* EGLTimeNV requires 64-bit uint support */
+#ifndef EGL_NV_sync
+#define EGL_NV_sync 1
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV	0x30E6
+#define EGL_SYNC_STATUS_NV			0x30E7
+#define EGL_SIGNALED_NV				0x30E8
+#define EGL_UNSIGNALED_NV			0x30E9
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_NV		0x0001
+#define EGL_FOREVER_NV				0xFFFFFFFFFFFFFFFFull
+#define EGL_ALREADY_SIGNALED_NV			0x30EA
+#define EGL_TIMEOUT_EXPIRED_NV			0x30EB
+#define EGL_CONDITION_SATISFIED_NV		0x30EC
+#define EGL_SYNC_TYPE_NV			0x30ED
+#define EGL_SYNC_CONDITION_NV			0x30EE
+#define EGL_SYNC_FENCE_NV			0x30EF
+#define EGL_NO_SYNC_NV				((EGLSyncNV)0)
+    typedef void* EGLSyncNV;
+    typedef khronos_utime_nanoseconds_t EGLTimeNV;
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLSyncNV EGLAPIENTRY eglCreateFenceSyncNV(EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);
+    EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncNV(EGLSyncNV sync);
+    EGLAPI EGLBoolean EGLAPIENTRY eglFenceNV(EGLSyncNV sync);
+    EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncNV(EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);
+    EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncNV(EGLSyncNV sync, EGLenum mode);
+    EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribNV(EGLSyncNV sync, EGLint attribute, EGLint *value);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLSyncNV(EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync);
+    typedef EGLint(EGLAPIENTRYP PFNEGLCLIENTWAITSYNCNVPROC) (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLSIGNALSYNCNVPROC) (EGLSyncNV sync, EGLenum mode);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGLint attribute, EGLint *value);
+#endif
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* Dependent on EGL_KHR_reusable_sync which requires 64-bit uint support */
+#ifndef EGL_KHR_fence_sync
+#define EGL_KHR_fence_sync 1
+    /* Reuses most tokens and entry points from EGL_KHR_reusable_sync */
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR	0x30F0
+#define EGL_SYNC_CONDITION_KHR			0x30F8
+#define EGL_SYNC_FENCE_KHR			0x30F9
+#endif
+#endif
+
+#ifndef EGL_HI_clientpixmap
+#define EGL_HI_clientpixmap 1
+
+    /* Surface Attribute */
+#define EGL_CLIENT_PIXMAP_POINTER_HI		0x8F74
+    /*
+    * Structure representing a client pixmap
+    * (pixmap's data is in client-space memory).
+    */
+    struct EGLClientPixmapHI
+    {
+        void*		pData;
+        EGLint		iWidth;
+        EGLint		iHeight;
+        EGLint		iStride;
+    };
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI(EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLSurface(EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEHIPROC) (EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);
+#endif	/* EGL_HI_clientpixmap */
+
+#ifndef EGL_HI_colorformats
+#define EGL_HI_colorformats 1
+    /* Config Attribute */
+#define EGL_COLOR_FORMAT_HI			0x8F70
+    /* Color Formats */
+#define EGL_COLOR_RGB_HI			0x8F71
+#define EGL_COLOR_RGBA_HI			0x8F72
+#define EGL_COLOR_ARGB_HI			0x8F73
+#endif /* EGL_HI_colorformats */
+
+#ifndef EGL_MESA_drm_image
+#define EGL_MESA_drm_image 1
+#define EGL_DRM_BUFFER_FORMAT_MESA		0x31D0	    /* CreateDRMImageMESA attribute */
+#define EGL_DRM_BUFFER_USE_MESA			0x31D1	    /* CreateDRMImageMESA attribute */
+#define EGL_DRM_BUFFER_FORMAT_ARGB32_MESA	0x31D2	    /* EGL_IMAGE_FORMAT_MESA attribute value */
+#define EGL_DRM_BUFFER_MESA			0x31D3	    /* eglCreateImageKHR target */
+#define EGL_DRM_BUFFER_STRIDE_MESA		0x31D4
+#define EGL_DRM_BUFFER_USE_SCANOUT_MESA		0x00000001  /* EGL_DRM_BUFFER_USE_MESA bits */
+#define EGL_DRM_BUFFER_USE_SHARE_MESA		0x00000002  /* EGL_DRM_BUFFER_USE_MESA bits */
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLImageKHR EGLAPIENTRY eglCreateDRMImageMESA(EGLDisplay dpy, const EGLint *attrib_list);
+    EGLAPI EGLBoolean EGLAPIENTRY eglExportDRMImageMESA(EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLImageKHR(EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
+#endif
+
+#ifndef EGL_NV_post_sub_buffer
+#define EGL_NV_post_sub_buffer 1
+#define EGL_POST_SUB_BUFFER_SUPPORTED_NV	0x30BE
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLPOSTSUBBUFFERNVPROC) (EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height);
+#endif
+
+#ifndef EGL_ANGLE_query_surface_pointer
+#define EGL_ANGLE_query_surface_pointer 1
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLBoolean eglQuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value);
+#endif
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLQUERYSURFACEPOINTERANGLEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value);
+#endif
+
+#ifndef EGL_ANGLE_surface_d3d_texture_2d_share_handle
+#define EGL_ANGLE_surface_d3d_texture_2d_share_handle 1
+#define EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE	0x3200
+#endif
+
+#ifndef EGL_NV_coverage_sample_resolve
+#define EGL_NV_coverage_sample_resolve 1
+#define EGL_COVERAGE_SAMPLE_RESOLVE_NV		0x3131
+#define EGL_COVERAGE_SAMPLE_RESOLVE_DEFAULT_NV	0x3132
+#define EGL_COVERAGE_SAMPLE_RESOLVE_NONE_NV	0x3133
+#endif
+
+#if KHRONOS_SUPPORT_INT64   /* EGLuint64NV requires 64-bit uint support */
+#ifndef EGL_NV_system_time
+#define EGL_NV_system_time 1
+    typedef khronos_utime_nanoseconds_t EGLuint64NV;
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeFrequencyNV(void);
+    EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV(void);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLuint64NV(EGLAPIENTRYP PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC) (void);
+    typedef EGLuint64NV(EGLAPIENTRYP PFNEGLGETSYSTEMTIMENVPROC) (void);
+#endif
+#endif
+
+#if KHRONOS_SUPPORT_INT64 /* EGLuint64KHR requires 64-bit uint support */
+#ifndef EGL_KHR_stream
+#define EGL_KHR_stream 1
+    typedef void* EGLStreamKHR;
+    typedef khronos_uint64_t EGLuint64KHR;
+#define EGL_NO_STREAM_KHR			((EGLStreamKHR)0)
+#define EGL_CONSUMER_LATENCY_USEC_KHR		0x3210
+#define EGL_PRODUCER_FRAME_KHR			0x3212
+#define EGL_CONSUMER_FRAME_KHR			0x3213
+#define EGL_STREAM_STATE_KHR			0x3214
+#define EGL_STREAM_STATE_CREATED_KHR		0x3215
+#define EGL_STREAM_STATE_CONNECTING_KHR		0x3216
+#define EGL_STREAM_STATE_EMPTY_KHR		0x3217
+#define EGL_STREAM_STATE_NEW_FRAME_AVAILABLE_KHR    0x3218
+#define EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR    0x3219
+#define EGL_STREAM_STATE_DISCONNECTED_KHR	0x321A
+#define EGL_BAD_STREAM_KHR			0x321B
+#define EGL_BAD_STATE_KHR			0x321C
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list);
+    EGLAPI EGLBoolean EGLAPIENTRY eglDestroyStreamKHR(EGLDisplay dpy, EGLStreamKHR stream);
+    EGLAPI EGLBoolean EGLAPIENTRY eglStreamAttribKHR(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint value);
+    EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamKHR(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint *value);
+    EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamu64KHR(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLuint64KHR *value);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLStreamKHR(EGLAPIENTRYP PFNEGLCREATESTREAMKHRPROC)(EGLDisplay dpy, const EGLint *attrib_list);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLDESTROYSTREAMKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLSTREAMATTRIBKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint value);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLQUERYSTREAMKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint *value);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLQUERYSTREAMU64KHRPROC)(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLuint64KHR *value);
+#endif
+#endif
+
+#ifdef EGL_KHR_stream /* Requires KHR_stream extension */
+#ifndef EGL_KHR_stream_consumer_gltexture
+#define EGL_KHR_stream_consumer_gltexture 1
+#define EGL_CONSUMER_ACQUIRE_TIMEOUT_USEC_KHR	0x321E
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalKHR(EGLDisplay dpy, EGLStreamKHR stream);
+    EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerAcquireKHR(EGLDisplay dpy, EGLStreamKHR stream);
+    EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseKHR(EGLDisplay dpy, EGLStreamKHR stream);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLSTREAMCONSUMERACQUIREKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLSTREAMCONSUMERRELEASEKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream);
+#endif
+#endif
+
+#ifdef EGL_KHR_stream /* Requires KHR_stream extension */
+#ifndef EGL_KHR_stream_producer_eglsurface
+#define EGL_KHR_stream_producer_eglsurface 1
+#define EGL_STREAM_BIT_KHR			0x0800
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLSurface EGLAPIENTRY eglCreateStreamProducerSurfaceKHR(EGLDisplay dpy, EGLConfig config, EGLStreamKHR stream, const EGLint *attrib_list);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLSurface(EGLAPIENTRYP PFNEGLCREATESTREAMPRODUCERSURFACEKHRPROC)(EGLDisplay dpy, EGLConfig config, EGLStreamKHR stream, const EGLint *attrib_list);
+#endif
+#endif
+
+#ifdef EGL_KHR_stream /* Requires KHR_stream extension */
+#ifndef EGL_KHR_stream_producer_aldatalocator
+#define EGL_KHR_stream_producer_aldatalocator 1
+#endif
+#endif
+
+#ifdef EGL_KHR_stream /* Requires KHR_stream extension */
+#ifndef EGL_KHR_stream_fifo
+#define EGL_KHR_stream_fifo 1
+    /* reuse EGLTimeKHR */
+#define EGL_STREAM_FIFO_LENGTH_KHR		0x31FC
+#define EGL_STREAM_TIME_NOW_KHR			0x31FD
+#define EGL_STREAM_TIME_CONSUMER_KHR		0x31FE
+#define EGL_STREAM_TIME_PRODUCER_KHR		0x31FF
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamTimeKHR(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLTimeKHR *value);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLQUERYSTREAMTIMEKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLTimeKHR *value);
+#endif
+#endif
+
+#ifndef EGL_EXT_create_context_robustness
+#define EGL_EXT_create_context_robustness 1
+#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT	0x30BF
+#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT 0x3138
+#define EGL_NO_RESET_NOTIFICATION_EXT		0x31BE
+#define EGL_LOSE_CONTEXT_ON_RESET_EXT		0x31BF
+#endif
+
+#ifndef EGL_ANGLE_d3d_share_handle_client_buffer
+#define EGL_ANGLE_d3d_share_handle_client_buffer 1
+    /* reuse EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE */
+#endif
+
+#ifndef EGL_KHR_create_context
+#define EGL_KHR_create_context 1
+#define EGL_CONTEXT_MAJOR_VERSION_KHR			    EGL_CONTEXT_CLIENT_VERSION
+#define EGL_CONTEXT_MINOR_VERSION_KHR			    0x30FB
+#define EGL_CONTEXT_FLAGS_KHR				    0x30FC
+#define EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR		    0x30FD
+#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR  0x31BD
+#define EGL_NO_RESET_NOTIFICATION_KHR			    0x31BE
+#define EGL_LOSE_CONTEXT_ON_RESET_KHR			    0x31BF
+#define EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR		    0x00000001
+#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR	    0x00000002
+#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR	    0x00000004
+#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR		    0x00000001
+#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR    0x00000002
+#define EGL_OPENGL_ES3_BIT_KHR				    0x00000040
+#endif
+
+#ifndef EGL_KHR_surfaceless_context
+#define EGL_KHR_surfaceless_context 1
+    /* No tokens/entry points, just relaxes an error condition */
+#endif
+
+#ifdef EGL_KHR_stream /* Requires KHR_stream extension */
+#ifndef EGL_KHR_stream_cross_process_fd
+#define EGL_KHR_stream_cross_process_fd 1
+    typedef int EGLNativeFileDescriptorKHR;
+#define EGL_NO_FILE_DESCRIPTOR_KHR		((EGLNativeFileDescriptorKHR)(-1))
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLNativeFileDescriptorKHR EGLAPIENTRY eglGetStreamFileDescriptorKHR(EGLDisplay dpy, EGLStreamKHR stream);
+    EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamFromFileDescriptorKHR(EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLNativeFileDescriptorKHR(EGLAPIENTRYP PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream);
+    typedef EGLStreamKHR(EGLAPIENTRYP PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC)(EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor);
+#endif
+#endif
+
+#ifndef EGL_EXT_multiview_window
+#define EGL_EXT_multiview_window 1
+#define EGL_MULTIVIEW_VIEW_COUNT_EXT		0x3134
+#endif
+
+#ifndef EGL_KHR_wait_sync
+#define EGL_KHR_wait_sync 1
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLint(EGLAPIENTRYP PFNEGLWAITSYNCKHRPROC)(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags);
+#endif
+
+#ifndef EGL_NV_post_convert_rounding
+#define EGL_NV_post_convert_rounding 1
+    /* No tokens or entry points, just relaxes behavior of SwapBuffers */
+#endif
+
+#ifndef EGL_NV_native_query
+#define EGL_NV_native_query 1
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLBoolean EGLAPIENTRY eglQueryNativeDisplayNV(EGLDisplay dpy, EGLNativeDisplayType* display_id);
+    EGLAPI EGLBoolean EGLAPIENTRY eglQueryNativeWindowNV(EGLDisplay dpy, EGLSurface surf, EGLNativeWindowType* window);
+    EGLAPI EGLBoolean EGLAPIENTRY eglQueryNativePixmapNV(EGLDisplay dpy, EGLSurface surf, EGLNativePixmapType* pixmap);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLQUERYNATIVEDISPLAYNVPROC)(EGLDisplay dpy, EGLNativeDisplayType *display_id);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLQUERYNATIVEWINDOWNVPROC)(EGLDisplay dpy, EGLSurface surf, EGLNativeWindowType *window);
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLQUERYNATIVEPIXMAPNVPROC)(EGLDisplay dpy, EGLSurface surf, EGLNativePixmapType *pixmap);
+#endif
+
+#ifndef EGL_NV_3dvision_surface
+#define EGL_NV_3dvision_surface 1
+#define EGL_AUTO_STEREO_NV			0x3136
+#endif
+
+#ifndef EGL_ANDROID_framebuffer_target
+#define EGL_ANDROID_framebuffer_target 1
+#define EGL_FRAMEBUFFER_TARGET_ANDROID		0x3147
+#endif
+
+#ifndef EGL_ANDROID_blob_cache
+#define EGL_ANDROID_blob_cache 1
+    typedef khronos_ssize_t EGLsizeiANDROID;
+    typedef void(*EGLSetBlobFuncANDROID) (const void *key, EGLsizeiANDROID keySize, const void *value, EGLsizeiANDROID valueSize);
+    typedef EGLsizeiANDROID(*EGLGetBlobFuncANDROID) (const void *key, EGLsizeiANDROID keySize, void *value, EGLsizeiANDROID valueSize);
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI void EGLAPIENTRY eglSetBlobCacheFuncsANDROID(EGLDisplay dpy, EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef void (EGLAPIENTRYP PFNEGLSETBLOBCACHEFUNCSANDROIDPROC)(EGLDisplay dpy, EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);
+#endif
+
+#ifndef EGL_ANDROID_image_native_buffer
+#define EGL_ANDROID_image_native_buffer 1
+#define EGL_NATIVE_BUFFER_ANDROID		0x3140
+#endif
+
+#ifndef EGL_ANDROID_native_fence_sync
+#define EGL_ANDROID_native_fence_sync 1
+#define EGL_SYNC_NATIVE_FENCE_ANDROID		0x3144
+#define EGL_SYNC_NATIVE_FENCE_FD_ANDROID	0x3145
+#define EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID	0x3146
+#define EGL_NO_NATIVE_FENCE_FD_ANDROID		-1
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID(EGLDisplay dpy, EGLSyncKHR);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLint(EGLAPIENTRYP PFNEGLDUPNATIVEFENCEFDANDROIDPROC)(EGLDisplay dpy, EGLSyncKHR);
+#endif
+
+#ifndef EGL_ANDROID_recordable
+#define EGL_ANDROID_recordable 1
+#define EGL_RECORDABLE_ANDROID			0x3142
+#endif
+
+#ifndef EGL_EXT_buffer_age
+#define EGL_EXT_buffer_age 1
+#define EGL_BUFFER_AGE_EXT			0x313D
+#endif
+
+#ifndef EGL_EXT_image_dma_buf_import
+#define EGL_EXT_image_dma_buf_import 1
+#define EGL_LINUX_DMA_BUF_EXT			0x3270
+#define EGL_LINUX_DRM_FOURCC_EXT		0x3271
+#define EGL_DMA_BUF_PLANE0_FD_EXT		0x3272
+#define EGL_DMA_BUF_PLANE0_OFFSET_EXT		0x3273
+#define EGL_DMA_BUF_PLANE0_PITCH_EXT		0x3274
+#define EGL_DMA_BUF_PLANE1_FD_EXT		0x3275
+#define EGL_DMA_BUF_PLANE1_OFFSET_EXT		0x3276
+#define EGL_DMA_BUF_PLANE1_PITCH_EXT		0x3277
+#define EGL_DMA_BUF_PLANE2_FD_EXT		0x3278
+#define EGL_DMA_BUF_PLANE2_OFFSET_EXT		0x3279
+#define EGL_DMA_BUF_PLANE2_PITCH_EXT		0x327A
+#define EGL_YUV_COLOR_SPACE_HINT_EXT		0x327B
+#define EGL_SAMPLE_RANGE_HINT_EXT		0x327C
+#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D
+#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT 0x327E
+#define EGL_ITU_REC601_EXT			0x327F
+#define EGL_ITU_REC709_EXT			0x3280
+#define EGL_ITU_REC2020_EXT			0x3281
+#define EGL_YUV_FULL_RANGE_EXT			0x3282
+#define EGL_YUV_NARROW_RANGE_EXT		0x3283
+#define EGL_YUV_CHROMA_SITING_0_EXT		0x3284
+#define EGL_YUV_CHROMA_SITING_0_5_EXT		0x3285
+#endif
+
+#ifndef EGL_ARM_pixmap_multisample_discard
+#define EGL_ARM_pixmap_multisample_discard 1
+#define EGL_DISCARD_SAMPLES_ARM			0x3286
+#endif
+
+#ifndef EGL_EXT_swap_buffers_with_damage
+#define EGL_EXT_swap_buffers_with_damage 1
+#ifdef EGL_EGLEXT_PROTOTYPES
+    EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#endif /* EGL_EGLEXT_PROTOTYPES */
+    typedef EGLBoolean(EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC)(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#endif
+
+/* #include <EGL/eglmesaext.h> */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __eglext_h_ */
+
+
+
+#endif /* _MSC_VER */
diff --git a/Source/3rd Party/sdl/include/SDL_endian.h b/Source/3rd Party/sdl/include/SDL_endian.h
new file mode 100644
index 000000000..161c418de
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_endian.h	
@@ -0,0 +1,239 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_endian.h
+ *
+ *  Functions for reading and writing endian-specific values
+ */
+
+#ifndef _SDL_endian_h
+#define _SDL_endian_h
+
+#include "SDL_stdinc.h"
+
+/**
+ *  \name The two types of endianness
+ */
+/* @{ */
+#define SDL_LIL_ENDIAN  1234
+#define SDL_BIG_ENDIAN  4321
+/* @} */
+
+#ifndef SDL_BYTEORDER           /* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER  __BYTE_ORDER
+#else /* __linux __ */
+#if defined(__hppa__) || \
+    defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
+    (defined(__MIPS__) && defined(__MISPEB__)) || \
+    defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
+    defined(__sparc__)
+#define SDL_BYTEORDER   SDL_BIG_ENDIAN
+#else
+#define SDL_BYTEORDER   SDL_LIL_ENDIAN
+#endif
+#endif /* __linux __ */
+#endif /* !SDL_BYTEORDER */
+
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \file SDL_endian.h
+ */
+#if defined(__GNUC__) && defined(__i386__) && \
+   !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+  __asm__("xchgb %b0,%h0": "=q"(x):"0"(x));
+    return x;
+}
+#elif defined(__GNUC__) && defined(__x86_64__)
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+  __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x));
+    return x;
+}
+#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+    int result;
+
+  __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
+    return (Uint16)result;
+}
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+  __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc");
+    return x;
+}
+#else
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+    return SDL_static_cast(Uint16, ((x << 8) | (x >> 8)));
+}
+#endif
+
+#if defined(__GNUC__) && defined(__i386__)
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+  __asm__("bswap %0": "=r"(x):"0"(x));
+    return x;
+}
+#elif defined(__GNUC__) && defined(__x86_64__)
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+  __asm__("bswapl %0": "=r"(x):"0"(x));
+    return x;
+}
+#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+    Uint32 result;
+
+  __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x));
+  __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x));
+  __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
+    return result;
+}
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+  __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc");
+    return x;
+}
+#else
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+    return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) |
+                                    ((x >> 8) & 0x0000FF00) | (x >> 24)));
+}
+#endif
+
+#if defined(__GNUC__) && defined(__i386__)
+SDL_FORCE_INLINE Uint64
+SDL_Swap64(Uint64 x)
+{
+    union
+    {
+        struct
+        {
+            Uint32 a, b;
+        } s;
+        Uint64 u;
+    } v;
+    v.u = x;
+  __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
+            "1"(v.s.
+                b));
+    return v.u;
+}
+#elif defined(__GNUC__) && defined(__x86_64__)
+SDL_FORCE_INLINE Uint64
+SDL_Swap64(Uint64 x)
+{
+  __asm__("bswapq %0": "=r"(x):"0"(x));
+    return x;
+}
+#else
+SDL_FORCE_INLINE Uint64
+SDL_Swap64(Uint64 x)
+{
+    Uint32 hi, lo;
+
+    /* Separate into high and low 32-bit values and swap them */
+    lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
+    x >>= 32;
+    hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
+    x = SDL_Swap32(lo);
+    x <<= 32;
+    x |= SDL_Swap32(hi);
+    return (x);
+}
+#endif
+
+
+SDL_FORCE_INLINE float
+SDL_SwapFloat(float x)
+{
+    union
+    {
+        float f;
+        Uint32 ui32;
+    } swapper;
+    swapper.f = x;
+    swapper.ui32 = SDL_Swap32(swapper.ui32);
+    return swapper.f;
+}
+
+
+/**
+ *  \name Swap to native
+ *  Byteswap item from the specified endianness to the native endianness.
+ */
+/* @{ */
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+#define SDL_SwapLE16(X) (X)
+#define SDL_SwapLE32(X) (X)
+#define SDL_SwapLE64(X) (X)
+#define SDL_SwapFloatLE(X)  (X)
+#define SDL_SwapBE16(X) SDL_Swap16(X)
+#define SDL_SwapBE32(X) SDL_Swap32(X)
+#define SDL_SwapBE64(X) SDL_Swap64(X)
+#define SDL_SwapFloatBE(X)  SDL_SwapFloat(X)
+#else
+#define SDL_SwapLE16(X) SDL_Swap16(X)
+#define SDL_SwapLE32(X) SDL_Swap32(X)
+#define SDL_SwapLE64(X) SDL_Swap64(X)
+#define SDL_SwapFloatLE(X)  SDL_SwapFloat(X)
+#define SDL_SwapBE16(X) (X)
+#define SDL_SwapBE32(X) (X)
+#define SDL_SwapBE64(X) (X)
+#define SDL_SwapFloatBE(X)  (X)
+#endif
+/* @} *//* Swap to native */
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_endian_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_error.h b/Source/3rd Party/sdl/include/SDL_error.h
new file mode 100644
index 000000000..5776cfa26
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_error.h	
@@ -0,0 +1,76 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_error.h
+ *
+ *  Simple error message routines for SDL.
+ */
+
+#ifndef _SDL_error_h
+#define _SDL_error_h
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Public functions */
+/* SDL_SetError() unconditionally returns -1. */
+extern DECLSPEC int SDLCALL SDL_SetError(const char *fmt, ...);
+extern DECLSPEC const char *SDLCALL SDL_GetError(void);
+extern DECLSPEC void SDLCALL SDL_ClearError(void);
+
+/**
+ *  \name Internal error functions
+ *
+ *  \internal
+ *  Private error reporting function - used internally.
+ */
+/* @{ */
+#define SDL_OutOfMemory()   SDL_Error(SDL_ENOMEM)
+#define SDL_Unsupported()   SDL_Error(SDL_UNSUPPORTED)
+#define SDL_InvalidParamError(param)    SDL_SetError("Parameter '%s' is invalid", (param))
+typedef enum
+{
+    SDL_ENOMEM,
+    SDL_EFREAD,
+    SDL_EFWRITE,
+    SDL_EFSEEK,
+    SDL_UNSUPPORTED,
+    SDL_LASTERROR
+} SDL_errorcode;
+/* SDL_Error() unconditionally returns -1. */
+extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
+/* @} *//* Internal error functions */
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_error_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_events.h b/Source/3rd Party/sdl/include/SDL_events.h
new file mode 100644
index 000000000..fc5a145e7
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_events.h	
@@ -0,0 +1,723 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_events.h
+ *
+ *  Include file for SDL event handling.
+ */
+
+#ifndef _SDL_events_h
+#define _SDL_events_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+#include "SDL_keyboard.h"
+#include "SDL_mouse.h"
+#include "SDL_joystick.h"
+#include "SDL_gamecontroller.h"
+#include "SDL_quit.h"
+#include "SDL_gesture.h"
+#include "SDL_touch.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* General keyboard/mouse state definitions */
+#define SDL_RELEASED    0
+#define SDL_PRESSED 1
+
+/**
+ * \brief The types of events that can be delivered.
+ */
+typedef enum
+{
+    SDL_FIRSTEVENT     = 0,     /**< Unused (do not remove) */
+
+    /* Application events */
+    SDL_QUIT           = 0x100, /**< User-requested quit */
+
+    /* These application events have special meaning on iOS, see README-ios.txt for details */
+    SDL_APP_TERMINATING,        /**< The application is being terminated by the OS
+                                     Called on iOS in applicationWillTerminate()
+                                     Called on Android in onDestroy()
+                                */
+    SDL_APP_LOWMEMORY,          /**< The application is low on memory, free memory if possible.
+                                     Called on iOS in applicationDidReceiveMemoryWarning()
+                                     Called on Android in onLowMemory()
+                                */
+    SDL_APP_WILLENTERBACKGROUND, /**< The application is about to enter the background
+                                     Called on iOS in applicationWillResignActive()
+                                     Called on Android in onPause()
+                                */
+    SDL_APP_DIDENTERBACKGROUND, /**< The application did enter the background and may not get CPU for some time
+                                     Called on iOS in applicationDidEnterBackground()
+                                     Called on Android in onPause()
+                                */
+    SDL_APP_WILLENTERFOREGROUND, /**< The application is about to enter the foreground
+                                     Called on iOS in applicationWillEnterForeground()
+                                     Called on Android in onResume()
+                                */
+    SDL_APP_DIDENTERFOREGROUND, /**< The application is now interactive
+                                     Called on iOS in applicationDidBecomeActive()
+                                     Called on Android in onResume()
+                                */
+
+    /* Window events */
+    SDL_WINDOWEVENT    = 0x200, /**< Window state change */
+    SDL_SYSWMEVENT,             /**< System specific event */
+
+    /* Keyboard events */
+    SDL_KEYDOWN        = 0x300, /**< Key pressed */
+    SDL_KEYUP,                  /**< Key released */
+    SDL_TEXTEDITING,            /**< Keyboard text editing (composition) */
+    SDL_TEXTINPUT,              /**< Keyboard text input */
+
+    /* Mouse events */
+    SDL_MOUSEMOTION    = 0x400, /**< Mouse moved */
+    SDL_MOUSEBUTTONDOWN,        /**< Mouse button pressed */
+    SDL_MOUSEBUTTONUP,          /**< Mouse button released */
+    SDL_MOUSEWHEEL,             /**< Mouse wheel motion */
+
+    /* Joystick events */
+    SDL_JOYAXISMOTION  = 0x600, /**< Joystick axis motion */
+    SDL_JOYBALLMOTION,          /**< Joystick trackball motion */
+    SDL_JOYHATMOTION,           /**< Joystick hat position change */
+    SDL_JOYBUTTONDOWN,          /**< Joystick button pressed */
+    SDL_JOYBUTTONUP,            /**< Joystick button released */
+    SDL_JOYDEVICEADDED,         /**< A new joystick has been inserted into the system */
+    SDL_JOYDEVICEREMOVED,       /**< An opened joystick has been removed */
+
+    /* Game controller events */
+    SDL_CONTROLLERAXISMOTION  = 0x650, /**< Game controller axis motion */
+    SDL_CONTROLLERBUTTONDOWN,          /**< Game controller button pressed */
+    SDL_CONTROLLERBUTTONUP,            /**< Game controller button released */
+    SDL_CONTROLLERDEVICEADDED,         /**< A new Game controller has been inserted into the system */
+    SDL_CONTROLLERDEVICEREMOVED,       /**< An opened Game controller has been removed */
+    SDL_CONTROLLERDEVICEREMAPPED,      /**< The controller mapping was updated */
+
+    /* Touch events */
+    SDL_FINGERDOWN      = 0x700,
+    SDL_FINGERUP,
+    SDL_FINGERMOTION,
+
+    /* Gesture events */
+    SDL_DOLLARGESTURE   = 0x800,
+    SDL_DOLLARRECORD,
+    SDL_MULTIGESTURE,
+
+    /* Clipboard events */
+    SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */
+
+    /* Drag and drop events */
+    SDL_DROPFILE        = 0x1000, /**< The system requests a file open */
+
+    /* Render events */
+    SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset */
+
+    /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use,
+     *  and should be allocated with SDL_RegisterEvents()
+     */
+    SDL_USEREVENT    = 0x8000,
+
+    /**
+     *  This last event is only for bounding internal arrays
+     */
+    SDL_LASTEVENT    = 0xFFFF
+} SDL_EventType;
+
+/**
+ *  \brief Fields shared by every event
+ */
+typedef struct SDL_CommonEvent
+{
+    Uint32 type;
+    Uint32 timestamp;
+} SDL_CommonEvent;
+
+/**
+ *  \brief Window state change event data (event.window.*)
+ */
+typedef struct SDL_WindowEvent
+{
+    Uint32 type;        /**< ::SDL_WINDOWEVENT */
+    Uint32 timestamp;
+    Uint32 windowID;    /**< The associated window */
+    Uint8 event;        /**< ::SDL_WindowEventID */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    Sint32 data1;       /**< event dependent data */
+    Sint32 data2;       /**< event dependent data */
+} SDL_WindowEvent;
+
+/**
+ *  \brief Keyboard button event structure (event.key.*)
+ */
+typedef struct SDL_KeyboardEvent
+{
+    Uint32 type;        /**< ::SDL_KEYDOWN or ::SDL_KEYUP */
+    Uint32 timestamp;
+    Uint32 windowID;    /**< The window with keyboard focus, if any */
+    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
+    Uint8 repeat;       /**< Non-zero if this is a key repeat */
+    Uint8 padding2;
+    Uint8 padding3;
+    SDL_Keysym keysym;  /**< The key that was pressed or released */
+} SDL_KeyboardEvent;
+
+#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32)
+/**
+ *  \brief Keyboard text editing event structure (event.edit.*)
+ */
+typedef struct SDL_TextEditingEvent
+{
+    Uint32 type;                                /**< ::SDL_TEXTEDITING */
+    Uint32 timestamp;
+    Uint32 windowID;                            /**< The window with keyboard focus, if any */
+    char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
+    Sint32 start;                               /**< The start cursor of selected editing text */
+    Sint32 length;                              /**< The length of selected editing text */
+} SDL_TextEditingEvent;
+
+
+#define SDL_TEXTINPUTEVENT_TEXT_SIZE (32)
+/**
+ *  \brief Keyboard text input event structure (event.text.*)
+ */
+typedef struct SDL_TextInputEvent
+{
+    Uint32 type;                              /**< ::SDL_TEXTINPUT */
+    Uint32 timestamp;
+    Uint32 windowID;                          /**< The window with keyboard focus, if any */
+    char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
+} SDL_TextInputEvent;
+
+/**
+ *  \brief Mouse motion event structure (event.motion.*)
+ */
+typedef struct SDL_MouseMotionEvent
+{
+    Uint32 type;        /**< ::SDL_MOUSEMOTION */
+    Uint32 timestamp;
+    Uint32 windowID;    /**< The window with mouse focus, if any */
+    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
+    Uint32 state;       /**< The current button state */
+    Sint32 x;           /**< X coordinate, relative to window */
+    Sint32 y;           /**< Y coordinate, relative to window */
+    Sint32 xrel;        /**< The relative motion in the X direction */
+    Sint32 yrel;        /**< The relative motion in the Y direction */
+} SDL_MouseMotionEvent;
+
+/**
+ *  \brief Mouse button event structure (event.button.*)
+ */
+typedef struct SDL_MouseButtonEvent
+{
+    Uint32 type;        /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
+    Uint32 timestamp;
+    Uint32 windowID;    /**< The window with mouse focus, if any */
+    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
+    Uint8 button;       /**< The mouse button index */
+    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
+    Uint8 clicks;       /**< 1 for single-click, 2 for double-click, etc. */
+    Uint8 padding1;
+    Sint32 x;           /**< X coordinate, relative to window */
+    Sint32 y;           /**< Y coordinate, relative to window */
+} SDL_MouseButtonEvent;
+
+/**
+ *  \brief Mouse wheel event structure (event.wheel.*)
+ */
+typedef struct SDL_MouseWheelEvent
+{
+    Uint32 type;        /**< ::SDL_MOUSEWHEEL */
+    Uint32 timestamp;
+    Uint32 windowID;    /**< The window with mouse focus, if any */
+    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
+    Sint32 x;           /**< The amount scrolled horizontally, positive to the right and negative to the left */
+    Sint32 y;           /**< The amount scrolled vertically, positive away from the user and negative toward the user */
+} SDL_MouseWheelEvent;
+
+/**
+ *  \brief Joystick axis motion event structure (event.jaxis.*)
+ */
+typedef struct SDL_JoyAxisEvent
+{
+    Uint32 type;        /**< ::SDL_JOYAXISMOTION */
+    Uint32 timestamp;
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 axis;         /**< The joystick axis index */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    Sint16 value;       /**< The axis value (range: -32768 to 32767) */
+    Uint16 padding4;
+} SDL_JoyAxisEvent;
+
+/**
+ *  \brief Joystick trackball motion event structure (event.jball.*)
+ */
+typedef struct SDL_JoyBallEvent
+{
+    Uint32 type;        /**< ::SDL_JOYBALLMOTION */
+    Uint32 timestamp;
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 ball;         /**< The joystick trackball index */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    Sint16 xrel;        /**< The relative motion in the X direction */
+    Sint16 yrel;        /**< The relative motion in the Y direction */
+} SDL_JoyBallEvent;
+
+/**
+ *  \brief Joystick hat position change event structure (event.jhat.*)
+ */
+typedef struct SDL_JoyHatEvent
+{
+    Uint32 type;        /**< ::SDL_JOYHATMOTION */
+    Uint32 timestamp;
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 hat;          /**< The joystick hat index */
+    Uint8 value;        /**< The hat position value.
+                         *   \sa ::SDL_HAT_LEFTUP ::SDL_HAT_UP ::SDL_HAT_RIGHTUP
+                         *   \sa ::SDL_HAT_LEFT ::SDL_HAT_CENTERED ::SDL_HAT_RIGHT
+                         *   \sa ::SDL_HAT_LEFTDOWN ::SDL_HAT_DOWN ::SDL_HAT_RIGHTDOWN
+                         *
+                         *   Note that zero means the POV is centered.
+                         */
+    Uint8 padding1;
+    Uint8 padding2;
+} SDL_JoyHatEvent;
+
+/**
+ *  \brief Joystick button event structure (event.jbutton.*)
+ */
+typedef struct SDL_JoyButtonEvent
+{
+    Uint32 type;        /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */
+    Uint32 timestamp;
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 button;       /**< The joystick button index */
+    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
+    Uint8 padding1;
+    Uint8 padding2;
+} SDL_JoyButtonEvent;
+
+/**
+ *  \brief Joystick device event structure (event.jdevice.*)
+ */
+typedef struct SDL_JoyDeviceEvent
+{
+    Uint32 type;        /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */
+    Uint32 timestamp;
+    Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED event */
+} SDL_JoyDeviceEvent;
+
+
+/**
+ *  \brief Game controller axis motion event structure (event.caxis.*)
+ */
+typedef struct SDL_ControllerAxisEvent
+{
+    Uint32 type;        /**< ::SDL_CONTROLLERAXISMOTION */
+    Uint32 timestamp;
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 axis;         /**< The controller axis (SDL_GameControllerAxis) */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    Sint16 value;       /**< The axis value (range: -32768 to 32767) */
+    Uint16 padding4;
+} SDL_ControllerAxisEvent;
+
+
+/**
+ *  \brief Game controller button event structure (event.cbutton.*)
+ */
+typedef struct SDL_ControllerButtonEvent
+{
+    Uint32 type;        /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */
+    Uint32 timestamp;
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 button;       /**< The controller button (SDL_GameControllerButton) */
+    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
+    Uint8 padding1;
+    Uint8 padding2;
+} SDL_ControllerButtonEvent;
+
+
+/**
+ *  \brief Controller device event structure (event.cdevice.*)
+ */
+typedef struct SDL_ControllerDeviceEvent
+{
+    Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
+    Uint32 timestamp;
+    Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */
+} SDL_ControllerDeviceEvent;
+
+
+/**
+ *  \brief Touch finger event structure (event.tfinger.*)
+ */
+typedef struct SDL_TouchFingerEvent
+{
+    Uint32 type;        /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */
+    Uint32 timestamp;
+    SDL_TouchID touchId; /**< The touch device id */
+    SDL_FingerID fingerId;
+    float x;            /**< Normalized in the range 0...1 */
+    float y;            /**< Normalized in the range 0...1 */
+    float dx;           /**< Normalized in the range 0...1 */
+    float dy;           /**< Normalized in the range 0...1 */
+    float pressure;     /**< Normalized in the range 0...1 */
+} SDL_TouchFingerEvent;
+
+
+/**
+ *  \brief Multiple Finger Gesture Event (event.mgesture.*)
+ */
+typedef struct SDL_MultiGestureEvent
+{
+    Uint32 type;        /**< ::SDL_MULTIGESTURE */
+    Uint32 timestamp;
+    SDL_TouchID touchId; /**< The touch device index */
+    float dTheta;
+    float dDist;
+    float x;
+    float y;
+    Uint16 numFingers;
+    Uint16 padding;
+} SDL_MultiGestureEvent;
+
+
+/**
+ * \brief Dollar Gesture Event (event.dgesture.*)
+ */
+typedef struct SDL_DollarGestureEvent
+{
+    Uint32 type;        /**< ::SDL_DOLLARGESTURE */
+    Uint32 timestamp;
+    SDL_TouchID touchId; /**< The touch device id */
+    SDL_GestureID gestureId;
+    Uint32 numFingers;
+    float error;
+    float x;            /**< Normalized center of gesture */
+    float y;            /**< Normalized center of gesture */
+} SDL_DollarGestureEvent;
+
+
+/**
+ *  \brief An event used to request a file open by the system (event.drop.*)
+ *         This event is disabled by default, you can enable it with SDL_EventState()
+ *  \note If you enable this event, you must free the filename in the event.
+ */
+typedef struct SDL_DropEvent
+{
+    Uint32 type;        /**< ::SDL_DROPFILE */
+    Uint32 timestamp;
+    char *file;         /**< The file name, which should be freed with SDL_free() */
+} SDL_DropEvent;
+
+
+/**
+ *  \brief The "quit requested" event
+ */
+typedef struct SDL_QuitEvent
+{
+    Uint32 type;        /**< ::SDL_QUIT */
+    Uint32 timestamp;
+} SDL_QuitEvent;
+
+/**
+ *  \brief OS Specific event
+ */
+typedef struct SDL_OSEvent
+{
+    Uint32 type;        /**< ::SDL_QUIT */
+    Uint32 timestamp;
+} SDL_OSEvent;
+
+/**
+ *  \brief A user-defined event type (event.user.*)
+ */
+typedef struct SDL_UserEvent
+{
+    Uint32 type;        /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */
+    Uint32 timestamp;
+    Uint32 windowID;    /**< The associated window if any */
+    Sint32 code;        /**< User defined event code */
+    void *data1;        /**< User defined data pointer */
+    void *data2;        /**< User defined data pointer */
+} SDL_UserEvent;
+
+
+struct SDL_SysWMmsg;
+typedef struct SDL_SysWMmsg SDL_SysWMmsg;
+
+/**
+ *  \brief A video driver dependent system event (event.syswm.*)
+ *         This event is disabled by default, you can enable it with SDL_EventState()
+ *
+ *  \note If you want to use this event, you should include SDL_syswm.h.
+ */
+typedef struct SDL_SysWMEvent
+{
+    Uint32 type;        /**< ::SDL_SYSWMEVENT */
+    Uint32 timestamp;
+    SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
+} SDL_SysWMEvent;
+
+/**
+ *  \brief General event structure
+ */
+typedef union SDL_Event
+{
+    Uint32 type;                    /**< Event type, shared with all events */
+    SDL_CommonEvent common;         /**< Common event data */
+    SDL_WindowEvent window;         /**< Window event data */
+    SDL_KeyboardEvent key;          /**< Keyboard event data */
+    SDL_TextEditingEvent edit;      /**< Text editing event data */
+    SDL_TextInputEvent text;        /**< Text input event data */
+    SDL_MouseMotionEvent motion;    /**< Mouse motion event data */
+    SDL_MouseButtonEvent button;    /**< Mouse button event data */
+    SDL_MouseWheelEvent wheel;      /**< Mouse wheel event data */
+    SDL_JoyAxisEvent jaxis;         /**< Joystick axis event data */
+    SDL_JoyBallEvent jball;         /**< Joystick ball event data */
+    SDL_JoyHatEvent jhat;           /**< Joystick hat event data */
+    SDL_JoyButtonEvent jbutton;     /**< Joystick button event data */
+    SDL_JoyDeviceEvent jdevice;     /**< Joystick device change event data */
+    SDL_ControllerAxisEvent caxis;      /**< Game Controller axis event data */
+    SDL_ControllerButtonEvent cbutton;  /**< Game Controller button event data */
+    SDL_ControllerDeviceEvent cdevice;  /**< Game Controller device event data */
+    SDL_QuitEvent quit;             /**< Quit request event data */
+    SDL_UserEvent user;             /**< Custom event data */
+    SDL_SysWMEvent syswm;           /**< System dependent window event data */
+    SDL_TouchFingerEvent tfinger;   /**< Touch finger event data */
+    SDL_MultiGestureEvent mgesture; /**< Gesture event data */
+    SDL_DollarGestureEvent dgesture; /**< Gesture event data */
+    SDL_DropEvent drop;             /**< Drag and drop event data */
+
+    /* This is necessary for ABI compatibility between Visual C++ and GCC
+       Visual C++ will respect the push pack pragma and use 52 bytes for
+       this structure, and GCC will use the alignment of the largest datatype
+       within the union, which is 8 bytes.
+
+       So... we'll add padding to force the size to be 56 bytes for both.
+    */
+    Uint8 padding[56];
+} SDL_Event;
+
+
+/* Function prototypes */
+
+/**
+ *  Pumps the event loop, gathering events from the input devices.
+ *
+ *  This function updates the event queue and internal input device state.
+ *
+ *  This should only be run in the thread that sets the video mode.
+ */
+extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
+
+/* @{ */
+typedef enum
+{
+    SDL_ADDEVENT,
+    SDL_PEEKEVENT,
+    SDL_GETEVENT
+} SDL_eventaction;
+
+/**
+ *  Checks the event queue for messages and optionally returns them.
+ *
+ *  If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to
+ *  the back of the event queue.
+ *
+ *  If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front
+ *  of the event queue, within the specified minimum and maximum type,
+ *  will be returned and will not be removed from the queue.
+ *
+ *  If \c action is ::SDL_GETEVENT, up to \c numevents events at the front
+ *  of the event queue, within the specified minimum and maximum type,
+ *  will be returned and will be removed from the queue.
+ *
+ *  \return The number of events actually stored, or -1 if there was an error.
+ *
+ *  This function is thread-safe.
+ */
+extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
+                                           SDL_eventaction action,
+                                           Uint32 minType, Uint32 maxType);
+/* @} */
+
+/**
+ *  Checks to see if certain event types are in the event queue.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType);
+
+/**
+ *  This function clears events from the event queue
+ */
+extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type);
+extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType);
+
+/**
+ *  \brief Polls for currently pending events.
+ *
+ *  \return 1 if there are any pending events, or 0 if there are none available.
+ *
+ *  \param event If not NULL, the next event is removed from the queue and
+ *               stored in that area.
+ */
+extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event);
+
+/**
+ *  \brief Waits indefinitely for the next available event.
+ *
+ *  \return 1, or 0 if there was an error while waiting for events.
+ *
+ *  \param event If not NULL, the next event is removed from the queue and
+ *               stored in that area.
+ */
+extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event);
+
+/**
+ *  \brief Waits until the specified timeout (in milliseconds) for the next
+ *         available event.
+ *
+ *  \return 1, or 0 if there was an error while waiting for events.
+ *
+ *  \param event If not NULL, the next event is removed from the queue and
+ *               stored in that area.
+ *  \param timeout The timeout (in milliseconds) to wait for next event.
+ */
+extern DECLSPEC int SDLCALL SDL_WaitEventTimeout(SDL_Event * event,
+                                                 int timeout);
+
+/**
+ *  \brief Add an event to the event queue.
+ *
+ *  \return 1 on success, 0 if the event was filtered, or -1 if the event queue
+ *          was full or there was some other error.
+ */
+extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event);
+
+typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event);
+
+/**
+ *  Sets up a filter to process all events before they change internal state and
+ *  are posted to the internal event queue.
+ *
+ *  The filter is prototyped as:
+ *  \code
+ *      int SDL_EventFilter(void *userdata, SDL_Event * event);
+ *  \endcode
+ *
+ *  If the filter returns 1, then the event will be added to the internal queue.
+ *  If it returns 0, then the event will be dropped from the queue, but the
+ *  internal state will still be updated.  This allows selective filtering of
+ *  dynamically arriving events.
+ *
+ *  \warning  Be very careful of what you do in the event filter function, as
+ *            it may run in a different thread!
+ *
+ *  There is one caveat when dealing with the ::SDL_QuitEvent event type.  The
+ *  event filter is only called when the window manager desires to close the
+ *  application window.  If the event filter returns 1, then the window will
+ *  be closed, otherwise the window will remain open if possible.
+ *
+ *  If the quit event is generated by an interrupt signal, it will bypass the
+ *  internal queue and be delivered to the application at the next event poll.
+ */
+extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter,
+                                                void *userdata);
+
+/**
+ *  Return the current event filter - can be used to "chain" filters.
+ *  If there is no event filter set, this function returns SDL_FALSE.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter,
+                                                    void **userdata);
+
+/**
+ *  Add a function which is called when an event is added to the queue.
+ */
+extern DECLSPEC void SDLCALL SDL_AddEventWatch(SDL_EventFilter filter,
+                                               void *userdata);
+
+/**
+ *  Remove an event watch function added with SDL_AddEventWatch()
+ */
+extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter,
+                                               void *userdata);
+
+/**
+ *  Run the filter function on the current event queue, removing any
+ *  events for which the filter returns 0.
+ */
+extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
+                                              void *userdata);
+
+/* @{ */
+#define SDL_QUERY   -1
+#define SDL_IGNORE   0
+#define SDL_DISABLE  0
+#define SDL_ENABLE   1
+
+/**
+ *  This function allows you to set the state of processing certain events.
+ *   - If \c state is set to ::SDL_IGNORE, that event will be automatically
+ *     dropped from the event queue and will not event be filtered.
+ *   - If \c state is set to ::SDL_ENABLE, that event will be processed
+ *     normally.
+ *   - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the
+ *     current processing state of the specified event.
+ */
+extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state);
+/* @} */
+#define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY)
+
+/**
+ *  This function allocates a set of user-defined events, and returns
+ *  the beginning event number for that set of events.
+ *
+ *  If there aren't enough user-defined events left, this function
+ *  returns (Uint32)-1
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_events_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_filesystem.h b/Source/3rd Party/sdl/include/SDL_filesystem.h
new file mode 100644
index 000000000..de3e227d4
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_filesystem.h	
@@ -0,0 +1,136 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_filesystem.h
+ *
+ *  \brief Include file for filesystem SDL API functions
+ */
+
+#ifndef _SDL_filesystem_h
+#define _SDL_filesystem_h
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Get the path where the application resides.
+ *
+ * Get the "base path". This is the directory where the application was run
+ *  from, which is probably the installation directory, and may or may not
+ *  be the process's current working directory.
+ *
+ * This returns an absolute path in UTF-8 encoding, and is guaranteed to
+ *  end with a path separator ('\\' on Windows, '/' most other places).
+ *
+ * The pointer returned by this function is owned by you. Please call
+ *  SDL_free() on the pointer when you are done with it, or it will be a
+ *  memory leak. This is not necessarily a fast call, though, so you should
+ *  call this once near startup and save the string if you need it.
+ *
+ * Some platforms can't determine the application's path, and on other
+ *  platforms, this might be meaningless. In such cases, this function will
+ *  return NULL.
+ *
+ *  \return String of base dir in UTF-8 encoding, or NULL on error.
+ *
+ * \sa SDL_GetPrefPath
+ */
+extern DECLSPEC char *SDLCALL SDL_GetBasePath(void);
+
+/**
+ * \brief Get the user-and-app-specific path where files can be written.
+ *
+ * Get the "pref dir". This is meant to be where users can write personal
+ *  files (preferences and save games, etc) that are specific to your
+ *  application. This directory is unique per user, per application.
+ *
+ * This function will decide the appropriate location in the native filesystem,
+ *  create the directory if necessary, and return a string of the absolute
+ *  path to the directory in UTF-8 encoding.
+ *
+ * On Windows, the string might look like:
+ *  "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\"
+ *
+ * On Linux, the string might look like:
+ *  "/home/bob/.local/share/My Program Name/"
+ *
+ * On Mac OS X, the string might look like:
+ *  "/Users/bob/Library/Application Support/My Program Name/"
+ *
+ * (etc.)
+ *
+ * You specify the name of your organization (if it's not a real organization,
+ *  your name or an Internet domain you own might do) and the name of your
+ *  application. These should be untranslated proper names.
+ *
+ * Both the org and app strings may become part of a directory name, so
+ *  please follow these rules:
+ *
+ *    - Try to use the same org string (including case-sensitivity) for
+ *      all your applications that use this function.
+ *    - Always use a unique app string for each one, and make sure it never
+ *      changes for an app once you've decided on it.
+ *    - Unicode characters are legal, as long as it's UTF-8 encoded, but...
+ *    - ...only use letters, numbers, and spaces. Avoid punctuation like
+ *      "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient.
+ *
+ * This returns an absolute path in UTF-8 encoding, and is guaranteed to
+ *  end with a path separator ('\\' on Windows, '/' most other places).
+ *
+ * The pointer returned by this function is owned by you. Please call
+ *  SDL_free() on the pointer when you are done with it, or it will be a
+ *  memory leak. This is not necessarily a fast call, though, so you should
+ *  call this once near startup and save the string if you need it.
+ *
+ * You should assume the path returned by this function is the only safe
+ *  place to write files (and that SDL_GetBasePath(), while it might be
+ *  writable, or even the parent of the returned path, aren't where you
+ *  should be writing things).
+ *
+ * Some platforms can't determine the pref path, and on other
+ *  platforms, this might be meaningless. In such cases, this function will
+ *  return NULL.
+ *
+ *   \param org The name of your organization.
+ *   \param app The name of your application.
+ *  \return UTF-8 string of user dir in platform-dependent notation. NULL
+ *          if there's a problem (creating directory failed, etc).
+ *
+ * \sa SDL_GetBasePath
+ */
+extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_system_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_gamecontroller.h b/Source/3rd Party/sdl/include/SDL_gamecontroller.h
new file mode 100644
index 000000000..b00ad713d
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_gamecontroller.h	
@@ -0,0 +1,316 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_gamecontroller.h
+ *
+ *  Include file for SDL game controller event handling
+ */
+
+#ifndef _SDL_gamecontroller_h
+#define _SDL_gamecontroller_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_rwops.h"
+#include "SDL_joystick.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \file SDL_gamecontroller.h
+ *
+ *  In order to use these functions, SDL_Init() must have been called
+ *  with the ::SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
+ *  for game controllers, and load appropriate drivers.
+ *
+ *  If you would like to receive controller updates while the application
+ *  is in the background, you should set the following hint before calling
+ *  SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
+ */
+
+/* The gamecontroller structure used to identify an SDL game controller */
+struct _SDL_GameController;
+typedef struct _SDL_GameController SDL_GameController;
+
+
+typedef enum
+{
+    SDL_CONTROLLER_BINDTYPE_NONE = 0,
+    SDL_CONTROLLER_BINDTYPE_BUTTON,
+    SDL_CONTROLLER_BINDTYPE_AXIS,
+    SDL_CONTROLLER_BINDTYPE_HAT
+} SDL_GameControllerBindType;
+
+/**
+ *  Get the SDL joystick layer binding for this controller button/axis mapping
+ */
+typedef struct SDL_GameControllerButtonBind
+{
+    SDL_GameControllerBindType bindType;
+    union
+    {
+        int button;
+        int axis;
+        struct {
+            int hat;
+            int hat_mask;
+        } hat;
+    } value;
+
+} SDL_GameControllerButtonBind;
+
+
+/**
+ *  To count the number of game controllers in the system for the following:
+ *  int nJoysticks = SDL_NumJoysticks();
+ *  int nGameControllers = 0;
+ *  for ( int i = 0; i < nJoysticks; i++ ) {
+ *      if ( SDL_IsGameController(i) ) {
+ *          nGameControllers++;
+ *      }
+ *  }
+ *
+ *  Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is:
+ *  guid,name,mappings
+ *
+ *  Where GUID is the string value from SDL_JoystickGetGUIDString(), name is the human readable string for the device and mappings are controller mappings to joystick ones.
+ *  Under Windows there is a reserved GUID of "xinput" that covers any XInput devices.
+ *  The mapping format for joystick is:
+ *      bX - a joystick button, index X
+ *      hX.Y - hat X with value Y
+ *      aX - axis X of the joystick
+ *  Buttons can be used as a controller axis and vice versa.
+ *
+ *  This string shows an example of a valid mapping for a controller
+ *  "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7",
+ *
+ */
+
+/**
+ *  Load a set of mappings from a seekable SDL data stream (memory or file), filtered by the current SDL_GetPlatform()
+ *  A community sourced database of controllers is available at https://raw.github.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt
+ *
+ *  If \c freerw is non-zero, the stream will be closed after being read.
+ * 
+ * \return number of mappings added, -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW( SDL_RWops * rw, int freerw );
+
+/**
+ *  Load a set of mappings from a file, filtered by the current SDL_GetPlatform()
+ *
+ *  Convenience macro.
+ */
+#define SDL_GameControllerAddMappingsFromFile(file)   SDL_GameControllerAddMappingsFromRW(SDL_RWFromFile(file, "rb"), 1)
+
+/**
+ *  Add or update an existing mapping configuration
+ *
+ * \return 1 if mapping is added, 0 if updated, -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping( const char* mappingString );
+
+/**
+ *  Get a mapping string for a GUID
+ *
+ *  \return the mapping string.  Must be freed with SDL_free.  Returns NULL if no mapping is available
+ */
+extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID( SDL_JoystickGUID guid );
+
+/**
+ *  Get a mapping string for an open GameController
+ *
+ *  \return the mapping string.  Must be freed with SDL_free.  Returns NULL if no mapping is available
+ */
+extern DECLSPEC char * SDLCALL SDL_GameControllerMapping( SDL_GameController * gamecontroller );
+
+/**
+ *  Is the joystick on this index supported by the game controller interface?
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index);
+
+
+/**
+ *  Get the implementation dependent name of a game controller.
+ *  This can be called before any controllers are opened.
+ *  If no name can be found, this function returns NULL.
+ */
+extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index);
+
+/**
+ *  Open a game controller for use.
+ *  The index passed as an argument refers to the N'th game controller on the system.
+ *  This index is the value which will identify this controller in future controller
+ *  events.
+ *
+ *  \return A controller identifier, or NULL if an error occurred.
+ */
+extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerOpen(int joystick_index);
+
+/**
+ *  Return the name for this currently opened controller
+ */
+extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller);
+
+/**
+ *  Returns SDL_TRUE if the controller has been opened and currently connected,
+ *  or SDL_FALSE if it has not.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerGetAttached(SDL_GameController *gamecontroller);
+
+/**
+ *  Get the underlying joystick object used by a controller
+ */
+extern DECLSPEC SDL_Joystick *SDLCALL SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller);
+
+/**
+ *  Enable/disable controller event polling.
+ *
+ *  If controller events are disabled, you must call SDL_GameControllerUpdate()
+ *  yourself and check the state of the controller when you want controller
+ *  information.
+ *
+ *  The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE.
+ */
+extern DECLSPEC int SDLCALL SDL_GameControllerEventState(int state);
+
+/**
+ *  Update the current state of the open game controllers.
+ *
+ *  This is called automatically by the event loop if any game controller
+ *  events are enabled.
+ */
+extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void);
+
+
+/**
+ *  The list of axes available from a controller
+ */
+typedef enum
+{
+    SDL_CONTROLLER_AXIS_INVALID = -1,
+    SDL_CONTROLLER_AXIS_LEFTX,
+    SDL_CONTROLLER_AXIS_LEFTY,
+    SDL_CONTROLLER_AXIS_RIGHTX,
+    SDL_CONTROLLER_AXIS_RIGHTY,
+    SDL_CONTROLLER_AXIS_TRIGGERLEFT,
+    SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
+    SDL_CONTROLLER_AXIS_MAX
+} SDL_GameControllerAxis;
+
+/**
+ *  turn this string into a axis mapping
+ */
+extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString);
+
+/**
+ *  turn this axis enum into a string mapping
+ */
+extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis);
+
+/**
+ *  Get the SDL joystick layer binding for this controller button mapping
+ */
+extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
+SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller,
+                                 SDL_GameControllerAxis axis);
+
+/**
+ *  Get the current state of an axis control on a game controller.
+ *
+ *  The state is a value ranging from -32768 to 32767.
+ *
+ *  The axis indices start at index 0.
+ */
+extern DECLSPEC Sint16 SDLCALL
+SDL_GameControllerGetAxis(SDL_GameController *gamecontroller,
+                          SDL_GameControllerAxis axis);
+
+/**
+ *  The list of buttons available from a controller
+ */
+typedef enum
+{
+    SDL_CONTROLLER_BUTTON_INVALID = -1,
+    SDL_CONTROLLER_BUTTON_A,
+    SDL_CONTROLLER_BUTTON_B,
+    SDL_CONTROLLER_BUTTON_X,
+    SDL_CONTROLLER_BUTTON_Y,
+    SDL_CONTROLLER_BUTTON_BACK,
+    SDL_CONTROLLER_BUTTON_GUIDE,
+    SDL_CONTROLLER_BUTTON_START,
+    SDL_CONTROLLER_BUTTON_LEFTSTICK,
+    SDL_CONTROLLER_BUTTON_RIGHTSTICK,
+    SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
+    SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
+    SDL_CONTROLLER_BUTTON_DPAD_UP,
+    SDL_CONTROLLER_BUTTON_DPAD_DOWN,
+    SDL_CONTROLLER_BUTTON_DPAD_LEFT,
+    SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
+    SDL_CONTROLLER_BUTTON_MAX
+} SDL_GameControllerButton;
+
+/**
+ *  turn this string into a button mapping
+ */
+extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString);
+
+/**
+ *  turn this button enum into a string mapping
+ */
+extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForButton(SDL_GameControllerButton button);
+
+/**
+ *  Get the SDL joystick layer binding for this controller button mapping
+ */
+extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
+SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller,
+                                   SDL_GameControllerButton button);
+
+
+/**
+ *  Get the current state of a button on a game controller.
+ *
+ *  The button indices start at index 0.
+ */
+extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller,
+                                                          SDL_GameControllerButton button);
+
+/**
+ *  Close a controller previously opened with SDL_GameControllerOpen().
+ */
+extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecontroller);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_gamecontroller_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_gesture.h b/Source/3rd Party/sdl/include/SDL_gesture.h
new file mode 100644
index 000000000..dbc169242
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_gesture.h	
@@ -0,0 +1,87 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_gesture.h
+ *
+ *  Include file for SDL gesture event handling.
+ */
+
+#ifndef _SDL_gesture_h
+#define _SDL_gesture_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+
+#include "SDL_touch.h"
+
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef Sint64 SDL_GestureID;
+
+/* Function prototypes */
+
+/**
+ *  \brief Begin Recording a gesture on the specified touch, or all touches (-1)
+ *
+ *
+ */
+extern DECLSPEC int SDLCALL SDL_RecordGesture(SDL_TouchID touchId);
+
+
+/**
+ *  \brief Save all currently loaded Dollar Gesture templates
+ *
+ *
+ */
+extern DECLSPEC int SDLCALL SDL_SaveAllDollarTemplates(SDL_RWops *dst);
+
+/**
+ *  \brief Save a currently loaded Dollar Gesture template
+ *
+ *
+ */
+extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *dst);
+
+
+/**
+ *  \brief Load Dollar Gesture templates from a file
+ *
+ *
+ */
+extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_gesture_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_haptic.h b/Source/3rd Party/sdl/include/SDL_haptic.h
new file mode 100644
index 000000000..234975abe
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_haptic.h	
@@ -0,0 +1,1225 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_haptic.h
+ *
+ *  \brief The SDL Haptic subsystem allows you to control haptic (force feedback)
+ *         devices.
+ *
+ *  The basic usage is as follows:
+ *   - Initialize the Subsystem (::SDL_INIT_HAPTIC).
+ *   - Open a Haptic Device.
+ *    - SDL_HapticOpen() to open from index.
+ *    - SDL_HapticOpenFromJoystick() to open from an existing joystick.
+ *   - Create an effect (::SDL_HapticEffect).
+ *   - Upload the effect with SDL_HapticNewEffect().
+ *   - Run the effect with SDL_HapticRunEffect().
+ *   - (optional) Free the effect with SDL_HapticDestroyEffect().
+ *   - Close the haptic device with SDL_HapticClose().
+ *
+ * \par Simple rumble example:
+ * \code
+ *    SDL_Haptic *haptic;
+ *
+ *    // Open the device
+ *    haptic = SDL_HapticOpen( 0 );
+ *    if (haptic == NULL)
+ *       return -1;
+ *
+ *    // Initialize simple rumble
+ *    if (SDL_HapticRumbleInit( haptic ) != 0)
+ *       return -1;
+ *
+ *    // Play effect at 50% strength for 2 seconds
+ *    if (SDL_HapticRumblePlay( haptic, 0.5, 2000 ) != 0)
+ *       return -1;
+ *    SDL_Delay( 2000 );
+ *
+ *    // Clean up
+ *    SDL_HapticClose( haptic );
+ * \endcode
+ *
+ * \par Complete example:
+ * \code
+ * int test_haptic( SDL_Joystick * joystick ) {
+ *    SDL_Haptic *haptic;
+ *    SDL_HapticEffect effect;
+ *    int effect_id;
+ *
+ *    // Open the device
+ *    haptic = SDL_HapticOpenFromJoystick( joystick );
+ *    if (haptic == NULL) return -1; // Most likely joystick isn't haptic
+ *
+ *    // See if it can do sine waves
+ *    if ((SDL_HapticQuery(haptic) & SDL_HAPTIC_SINE)==0) {
+ *       SDL_HapticClose(haptic); // No sine effect
+ *       return -1;
+ *    }
+ *
+ *    // Create the effect
+ *    memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default
+ *    effect.type = SDL_HAPTIC_SINE;
+ *    effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates
+ *    effect.periodic.direction.dir[0] = 18000; // Force comes from south
+ *    effect.periodic.period = 1000; // 1000 ms
+ *    effect.periodic.magnitude = 20000; // 20000/32767 strength
+ *    effect.periodic.length = 5000; // 5 seconds long
+ *    effect.periodic.attack_length = 1000; // Takes 1 second to get max strength
+ *    effect.periodic.fade_length = 1000; // Takes 1 second to fade away
+ *
+ *    // Upload the effect
+ *    effect_id = SDL_HapticNewEffect( haptic, &effect );
+ *
+ *    // Test the effect
+ *    SDL_HapticRunEffect( haptic, effect_id, 1 );
+ *    SDL_Delay( 5000); // Wait for the effect to finish
+ *
+ *    // We destroy the effect, although closing the device also does this
+ *    SDL_HapticDestroyEffect( haptic, effect_id );
+ *
+ *    // Close the device
+ *    SDL_HapticClose(haptic);
+ *
+ *    return 0; // Success
+ * }
+ * \endcode
+ *
+ * You can also find out more information on my blog:
+ * http://bobbens.dyndns.org/journal/2010/sdl_haptic/
+ *
+ * \author Edgar Simo Serra
+ */
+
+#ifndef _SDL_haptic_h
+#define _SDL_haptic_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_joystick.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ *  \typedef SDL_Haptic
+ *
+ *  \brief The haptic structure used to identify an SDL haptic.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticOpenFromJoystick
+ *  \sa SDL_HapticClose
+ */
+struct _SDL_Haptic;
+typedef struct _SDL_Haptic SDL_Haptic;
+
+
+/**
+ *  \name Haptic features
+ *
+ *  Different haptic features a device can have.
+ */
+/* @{ */
+
+/**
+ *  \name Haptic effects
+ */
+/* @{ */
+
+/**
+ *  \brief Constant effect supported.
+ *
+ *  Constant haptic effect.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_CONSTANT   (1<<0)
+
+/**
+ *  \brief Sine wave effect supported.
+ *
+ *  Periodic haptic effect that simulates sine waves.
+ *
+ *  \sa SDL_HapticPeriodic
+ */
+#define SDL_HAPTIC_SINE       (1<<1)
+
+/**
+ *  \brief Left/Right effect supported.
+ *
+ *  Haptic effect for direct control over high/low frequency motors.
+ *
+ *  \sa SDL_HapticLeftRight
+ * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry,
+ *          we ran out of bits, and this is important for XInput devices.
+ */
+#define SDL_HAPTIC_LEFTRIGHT     (1<<2)
+
+/* !!! FIXME: put this back when we have more bits in 2.1 */
+/* #define SDL_HAPTIC_SQUARE     (1<<2) */
+
+/**
+ *  \brief Triangle wave effect supported.
+ *
+ *  Periodic haptic effect that simulates triangular waves.
+ *
+ *  \sa SDL_HapticPeriodic
+ */
+#define SDL_HAPTIC_TRIANGLE   (1<<3)
+
+/**
+ *  \brief Sawtoothup wave effect supported.
+ *
+ *  Periodic haptic effect that simulates saw tooth up waves.
+ *
+ *  \sa SDL_HapticPeriodic
+ */
+#define SDL_HAPTIC_SAWTOOTHUP (1<<4)
+
+/**
+ *  \brief Sawtoothdown wave effect supported.
+ *
+ *  Periodic haptic effect that simulates saw tooth down waves.
+ *
+ *  \sa SDL_HapticPeriodic
+ */
+#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5)
+
+/**
+ *  \brief Ramp effect supported.
+ *
+ *  Ramp haptic effect.
+ *
+ *  \sa SDL_HapticRamp
+ */
+#define SDL_HAPTIC_RAMP       (1<<6)
+
+/**
+ *  \brief Spring effect supported - uses axes position.
+ *
+ *  Condition haptic effect that simulates a spring.  Effect is based on the
+ *  axes position.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_SPRING     (1<<7)
+
+/**
+ *  \brief Damper effect supported - uses axes velocity.
+ *
+ *  Condition haptic effect that simulates dampening.  Effect is based on the
+ *  axes velocity.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_DAMPER     (1<<8)
+
+/**
+ *  \brief Inertia effect supported - uses axes acceleration.
+ *
+ *  Condition haptic effect that simulates inertia.  Effect is based on the axes
+ *  acceleration.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_INERTIA    (1<<9)
+
+/**
+ *  \brief Friction effect supported - uses axes movement.
+ *
+ *  Condition haptic effect that simulates friction.  Effect is based on the
+ *  axes movement.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_FRICTION   (1<<10)
+
+/**
+ *  \brief Custom effect is supported.
+ *
+ *  User defined custom haptic effect.
+ */
+#define SDL_HAPTIC_CUSTOM     (1<<11)
+
+/* @} *//* Haptic effects */
+
+/* These last few are features the device has, not effects */
+
+/**
+ *  \brief Device can set global gain.
+ *
+ *  Device supports setting the global gain.
+ *
+ *  \sa SDL_HapticSetGain
+ */
+#define SDL_HAPTIC_GAIN       (1<<12)
+
+/**
+ *  \brief Device can set autocenter.
+ *
+ *  Device supports setting autocenter.
+ *
+ *  \sa SDL_HapticSetAutocenter
+ */
+#define SDL_HAPTIC_AUTOCENTER (1<<13)
+
+/**
+ *  \brief Device can be queried for effect status.
+ *
+ *  Device can be queried for effect status.
+ *
+ *  \sa SDL_HapticGetEffectStatus
+ */
+#define SDL_HAPTIC_STATUS     (1<<14)
+
+/**
+ *  \brief Device can be paused.
+ *
+ *  \sa SDL_HapticPause
+ *  \sa SDL_HapticUnpause
+ */
+#define SDL_HAPTIC_PAUSE      (1<<15)
+
+
+/**
+ * \name Direction encodings
+ */
+/* @{ */
+
+/**
+ *  \brief Uses polar coordinates for the direction.
+ *
+ *  \sa SDL_HapticDirection
+ */
+#define SDL_HAPTIC_POLAR      0
+
+/**
+ *  \brief Uses cartesian coordinates for the direction.
+ *
+ *  \sa SDL_HapticDirection
+ */
+#define SDL_HAPTIC_CARTESIAN  1
+
+/**
+ *  \brief Uses spherical coordinates for the direction.
+ *
+ *  \sa SDL_HapticDirection
+ */
+#define SDL_HAPTIC_SPHERICAL  2
+
+/* @} *//* Direction encodings */
+
+/* @} *//* Haptic features */
+
+/*
+ * Misc defines.
+ */
+
+/**
+ * \brief Used to play a device an infinite number of times.
+ *
+ * \sa SDL_HapticRunEffect
+ */
+#define SDL_HAPTIC_INFINITY   4294967295U
+
+
+/**
+ *  \brief Structure that represents a haptic direction.
+ *
+ *  Directions can be specified by:
+ *   - ::SDL_HAPTIC_POLAR : Specified by polar coordinates.
+ *   - ::SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates.
+ *   - ::SDL_HAPTIC_SPHERICAL : Specified by spherical coordinates.
+ *
+ *  Cardinal directions of the haptic device are relative to the positioning
+ *  of the device.  North is considered to be away from the user.
+ *
+ *  The following diagram represents the cardinal directions:
+ *  \verbatim
+                 .--.
+                 |__| .-------.
+                 |=.| |.-----.|
+                 |--| ||     ||
+                 |  | |'-----'|
+                 |__|~')_____('
+                   [ COMPUTER ]
+
+
+                     North (0,-1)
+                         ^
+                         |
+                         |
+    (1,0)  West <----[ HAPTIC ]----> East (-1,0)
+                         |
+                         |
+                         v
+                      South (0,1)
+
+
+                      [ USER ]
+                        \|||/
+                        (o o)
+                  ---ooO-(_)-Ooo---
+    \endverbatim
+ *
+ *  If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a
+ *  degree starting north and turning clockwise.  ::SDL_HAPTIC_POLAR only uses
+ *  the first \c dir parameter.  The cardinal directions would be:
+ *   - North: 0 (0 degrees)
+ *   - East: 9000 (90 degrees)
+ *   - South: 18000 (180 degrees)
+ *   - West: 27000 (270 degrees)
+ *
+ *  If type is ::SDL_HAPTIC_CARTESIAN, direction is encoded by three positions
+ *  (X axis, Y axis and Z axis (with 3 axes)).  ::SDL_HAPTIC_CARTESIAN uses
+ *  the first three \c dir parameters.  The cardinal directions would be:
+ *   - North:  0,-1, 0
+ *   - East:  -1, 0, 0
+ *   - South:  0, 1, 0
+ *   - West:   1, 0, 0
+ *
+ *  The Z axis represents the height of the effect if supported, otherwise
+ *  it's unused.  In cartesian encoding (1, 2) would be the same as (2, 4), you
+ *  can use any multiple you want, only the direction matters.
+ *
+ *  If type is ::SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations.
+ *  The first two \c dir parameters are used.  The \c dir parameters are as
+ *  follows (all values are in hundredths of degrees):
+ *   - Degrees from (1, 0) rotated towards (0, 1).
+ *   - Degrees towards (0, 0, 1) (device needs at least 3 axes).
+ *
+ *
+ *  Example of force coming from the south with all encodings (force coming
+ *  from the south means the user will have to pull the stick to counteract):
+ *  \code
+ *  SDL_HapticDirection direction;
+ *
+ *  // Cartesian directions
+ *  direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding.
+ *  direction.dir[0] = 0; // X position
+ *  direction.dir[1] = 1; // Y position
+ *  // Assuming the device has 2 axes, we don't need to specify third parameter.
+ *
+ *  // Polar directions
+ *  direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding.
+ *  direction.dir[0] = 18000; // Polar only uses first parameter
+ *
+ *  // Spherical coordinates
+ *  direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding
+ *  direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters.
+ *  \endcode
+ *
+ *  \sa SDL_HAPTIC_POLAR
+ *  \sa SDL_HAPTIC_CARTESIAN
+ *  \sa SDL_HAPTIC_SPHERICAL
+ *  \sa SDL_HapticEffect
+ *  \sa SDL_HapticNumAxes
+ */
+typedef struct SDL_HapticDirection
+{
+    Uint8 type;         /**< The type of encoding. */
+    Sint32 dir[3];      /**< The encoded direction. */
+} SDL_HapticDirection;
+
+
+/**
+ *  \brief A structure containing a template for a Constant effect.
+ *
+ *  The struct is exclusive to the ::SDL_HAPTIC_CONSTANT effect.
+ *
+ *  A constant effect applies a constant force in the specified direction
+ *  to the joystick.
+ *
+ *  \sa SDL_HAPTIC_CONSTANT
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticConstant
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_CONSTANT */
+    SDL_HapticDirection direction;  /**< Direction of the effect. */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect. */
+    Uint16 delay;           /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;          /**< Button that triggers the effect. */
+    Uint16 interval;        /**< How soon it can be triggered again after button. */
+
+    /* Constant */
+    Sint16 level;           /**< Strength of the constant effect. */
+
+    /* Envelope */
+    Uint16 attack_length;   /**< Duration of the attack. */
+    Uint16 attack_level;    /**< Level at the start of the attack. */
+    Uint16 fade_length;     /**< Duration of the fade. */
+    Uint16 fade_level;      /**< Level at the end of the fade. */
+} SDL_HapticConstant;
+
+/**
+ *  \brief A structure containing a template for a Periodic effect.
+ *
+ *  The struct handles the following effects:
+ *   - ::SDL_HAPTIC_SINE
+ *   - ::SDL_HAPTIC_LEFTRIGHT
+ *   - ::SDL_HAPTIC_TRIANGLE
+ *   - ::SDL_HAPTIC_SAWTOOTHUP
+ *   - ::SDL_HAPTIC_SAWTOOTHDOWN
+ *
+ *  A periodic effect consists in a wave-shaped effect that repeats itself
+ *  over time.  The type determines the shape of the wave and the parameters
+ *  determine the dimensions of the wave.
+ *
+ *  Phase is given by hundredth of a cycle meaning that giving the phase a value
+ *  of 9000 will displace it 25% of its period.  Here are sample values:
+ *   -     0: No phase displacement.
+ *   -  9000: Displaced 25% of its period.
+ *   - 18000: Displaced 50% of its period.
+ *   - 27000: Displaced 75% of its period.
+ *   - 36000: Displaced 100% of its period, same as 0, but 0 is preferred.
+ *
+ *  Examples:
+ *  \verbatim
+    SDL_HAPTIC_SINE
+      __      __      __      __
+     /  \    /  \    /  \    /
+    /    \__/    \__/    \__/
+
+    SDL_HAPTIC_SQUARE
+     __    __    __    __    __
+    |  |  |  |  |  |  |  |  |  |
+    |  |__|  |__|  |__|  |__|  |
+
+    SDL_HAPTIC_TRIANGLE
+      /\    /\    /\    /\    /\
+     /  \  /  \  /  \  /  \  /
+    /    \/    \/    \/    \/
+
+    SDL_HAPTIC_SAWTOOTHUP
+      /|  /|  /|  /|  /|  /|  /|
+     / | / | / | / | / | / | / |
+    /  |/  |/  |/  |/  |/  |/  |
+
+    SDL_HAPTIC_SAWTOOTHDOWN
+    \  |\  |\  |\  |\  |\  |\  |
+     \ | \ | \ | \ | \ | \ | \ |
+      \|  \|  \|  \|  \|  \|  \|
+    \endverbatim
+ *
+ *  \sa SDL_HAPTIC_SINE
+ *  \sa SDL_HAPTIC_LEFTRIGHT
+ *  \sa SDL_HAPTIC_TRIANGLE
+ *  \sa SDL_HAPTIC_SAWTOOTHUP
+ *  \sa SDL_HAPTIC_SAWTOOTHDOWN
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticPeriodic
+{
+    /* Header */
+    Uint16 type;        /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_LEFTRIGHT,
+                             ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or
+                             ::SDL_HAPTIC_SAWTOOTHDOWN */
+    SDL_HapticDirection direction;  /**< Direction of the effect. */
+
+    /* Replay */
+    Uint32 length;      /**< Duration of the effect. */
+    Uint16 delay;       /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;      /**< Button that triggers the effect. */
+    Uint16 interval;    /**< How soon it can be triggered again after button. */
+
+    /* Periodic */
+    Uint16 period;      /**< Period of the wave. */
+    Sint16 magnitude;   /**< Peak value. */
+    Sint16 offset;      /**< Mean value of the wave. */
+    Uint16 phase;       /**< Horizontal shift given by hundredth of a cycle. */
+
+    /* Envelope */
+    Uint16 attack_length;   /**< Duration of the attack. */
+    Uint16 attack_level;    /**< Level at the start of the attack. */
+    Uint16 fade_length; /**< Duration of the fade. */
+    Uint16 fade_level;  /**< Level at the end of the fade. */
+} SDL_HapticPeriodic;
+
+/**
+ *  \brief A structure containing a template for a Condition effect.
+ *
+ *  The struct handles the following effects:
+ *   - ::SDL_HAPTIC_SPRING: Effect based on axes position.
+ *   - ::SDL_HAPTIC_DAMPER: Effect based on axes velocity.
+ *   - ::SDL_HAPTIC_INERTIA: Effect based on axes acceleration.
+ *   - ::SDL_HAPTIC_FRICTION: Effect based on axes movement.
+ *
+ *  Direction is handled by condition internals instead of a direction member.
+ *  The condition effect specific members have three parameters.  The first
+ *  refers to the X axis, the second refers to the Y axis and the third
+ *  refers to the Z axis.  The right terms refer to the positive side of the
+ *  axis and the left terms refer to the negative side of the axis.  Please
+ *  refer to the ::SDL_HapticDirection diagram for which side is positive and
+ *  which is negative.
+ *
+ *  \sa SDL_HapticDirection
+ *  \sa SDL_HAPTIC_SPRING
+ *  \sa SDL_HAPTIC_DAMPER
+ *  \sa SDL_HAPTIC_INERTIA
+ *  \sa SDL_HAPTIC_FRICTION
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticCondition
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER,
+                                 ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */
+    SDL_HapticDirection direction;  /**< Direction of the effect - Not used ATM. */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect. */
+    Uint16 delay;           /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;          /**< Button that triggers the effect. */
+    Uint16 interval;        /**< How soon it can be triggered again after button. */
+
+    /* Condition */
+    Uint16 right_sat[3];    /**< Level when joystick is to the positive side. */
+    Uint16 left_sat[3];     /**< Level when joystick is to the negative side. */
+    Sint16 right_coeff[3];  /**< How fast to increase the force towards the positive side. */
+    Sint16 left_coeff[3];   /**< How fast to increase the force towards the negative side. */
+    Uint16 deadband[3];     /**< Size of the dead zone. */
+    Sint16 center[3];       /**< Position of the dead zone. */
+} SDL_HapticCondition;
+
+/**
+ *  \brief A structure containing a template for a Ramp effect.
+ *
+ *  This struct is exclusively for the ::SDL_HAPTIC_RAMP effect.
+ *
+ *  The ramp effect starts at start strength and ends at end strength.
+ *  It augments in linear fashion.  If you use attack and fade with a ramp
+ *  the effects get added to the ramp effect making the effect become
+ *  quadratic instead of linear.
+ *
+ *  \sa SDL_HAPTIC_RAMP
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticRamp
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_RAMP */
+    SDL_HapticDirection direction;  /**< Direction of the effect. */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect. */
+    Uint16 delay;           /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;          /**< Button that triggers the effect. */
+    Uint16 interval;        /**< How soon it can be triggered again after button. */
+
+    /* Ramp */
+    Sint16 start;           /**< Beginning strength level. */
+    Sint16 end;             /**< Ending strength level. */
+
+    /* Envelope */
+    Uint16 attack_length;   /**< Duration of the attack. */
+    Uint16 attack_level;    /**< Level at the start of the attack. */
+    Uint16 fade_length;     /**< Duration of the fade. */
+    Uint16 fade_level;      /**< Level at the end of the fade. */
+} SDL_HapticRamp;
+
+/**
+ * \brief A structure containing a template for a Left/Right effect.
+ *
+ * This struct is exclusively for the ::SDL_HAPTIC_LEFTRIGHT effect.
+ *
+ * The Left/Right effect is used to explicitly control the large and small
+ * motors, commonly found in modern game controllers. One motor is high
+ * frequency, the other is low frequency.
+ *
+ * \sa SDL_HAPTIC_LEFTRIGHT
+ * \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticLeftRight
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_LEFTRIGHT */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect. */
+
+    /* Rumble */
+    Uint16 large_magnitude; /**< Control of the large controller motor. */
+    Uint16 small_magnitude; /**< Control of the small controller motor. */
+} SDL_HapticLeftRight;
+
+/**
+ *  \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect.
+ *
+ *  A custom force feedback effect is much like a periodic effect, where the
+ *  application can define its exact shape.  You will have to allocate the
+ *  data yourself.  Data should consist of channels * samples Uint16 samples.
+ *
+ *  If channels is one, the effect is rotated using the defined direction.
+ *  Otherwise it uses the samples in data for the different axes.
+ *
+ *  \sa SDL_HAPTIC_CUSTOM
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticCustom
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_CUSTOM */
+    SDL_HapticDirection direction;  /**< Direction of the effect. */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect. */
+    Uint16 delay;           /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;          /**< Button that triggers the effect. */
+    Uint16 interval;        /**< How soon it can be triggered again after button. */
+
+    /* Custom */
+    Uint8 channels;         /**< Axes to use, minimum of one. */
+    Uint16 period;          /**< Sample periods. */
+    Uint16 samples;         /**< Amount of samples. */
+    Uint16 *data;           /**< Should contain channels*samples items. */
+
+    /* Envelope */
+    Uint16 attack_length;   /**< Duration of the attack. */
+    Uint16 attack_level;    /**< Level at the start of the attack. */
+    Uint16 fade_length;     /**< Duration of the fade. */
+    Uint16 fade_level;      /**< Level at the end of the fade. */
+} SDL_HapticCustom;
+
+/**
+ *  \brief The generic template for any haptic effect.
+ *
+ *  All values max at 32767 (0x7FFF).  Signed values also can be negative.
+ *  Time values unless specified otherwise are in milliseconds.
+ *
+ *  You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767
+ *  value.  Neither delay, interval, attack_length nor fade_length support
+ *  ::SDL_HAPTIC_INFINITY.  Fade will also not be used since effect never ends.
+ *
+ *  Additionally, the ::SDL_HAPTIC_RAMP effect does not support a duration of
+ *  ::SDL_HAPTIC_INFINITY.
+ *
+ *  Button triggers may not be supported on all devices, it is advised to not
+ *  use them if possible.  Buttons start at index 1 instead of index 0 like
+ *  the joystick.
+ *
+ *  If both attack_length and fade_level are 0, the envelope is not used,
+ *  otherwise both values are used.
+ *
+ *  Common parts:
+ *  \code
+ *  // Replay - All effects have this
+ *  Uint32 length;        // Duration of effect (ms).
+ *  Uint16 delay;         // Delay before starting effect.
+ *
+ *  // Trigger - All effects have this
+ *  Uint16 button;        // Button that triggers effect.
+ *  Uint16 interval;      // How soon before effect can be triggered again.
+ *
+ *  // Envelope - All effects except condition effects have this
+ *  Uint16 attack_length; // Duration of the attack (ms).
+ *  Uint16 attack_level;  // Level at the start of the attack.
+ *  Uint16 fade_length;   // Duration of the fade out (ms).
+ *  Uint16 fade_level;    // Level at the end of the fade.
+ *  \endcode
+ *
+ *
+ *  Here we have an example of a constant effect evolution in time:
+ *  \verbatim
+    Strength
+    ^
+    |
+    |    effect level -->  _________________
+    |                     /                 \
+    |                    /                   \
+    |                   /                     \
+    |                  /                       \
+    | attack_level --> |                        \
+    |                  |                        |  <---  fade_level
+    |
+    +--------------------------------------------------> Time
+                       [--]                 [---]
+                       attack_length        fade_length
+
+    [------------------][-----------------------]
+    delay               length
+    \endverbatim
+ *
+ *  Note either the attack_level or the fade_level may be above the actual
+ *  effect level.
+ *
+ *  \sa SDL_HapticConstant
+ *  \sa SDL_HapticPeriodic
+ *  \sa SDL_HapticCondition
+ *  \sa SDL_HapticRamp
+ *  \sa SDL_HapticLeftRight
+ *  \sa SDL_HapticCustom
+ */
+typedef union SDL_HapticEffect
+{
+    /* Common for all force feedback effects */
+    Uint16 type;                    /**< Effect type. */
+    SDL_HapticConstant constant;    /**< Constant effect. */
+    SDL_HapticPeriodic periodic;    /**< Periodic effect. */
+    SDL_HapticCondition condition;  /**< Condition effect. */
+    SDL_HapticRamp ramp;            /**< Ramp effect. */
+    SDL_HapticLeftRight leftright;  /**< Left/Right effect. */
+    SDL_HapticCustom custom;        /**< Custom effect. */
+} SDL_HapticEffect;
+
+
+/* Function prototypes */
+/**
+ *  \brief Count the number of haptic devices attached to the system.
+ *
+ *  \return Number of haptic devices detected on the system.
+ */
+extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
+
+/**
+ *  \brief Get the implementation dependent name of a Haptic device.
+ *
+ *  This can be called before any joysticks are opened.
+ *  If no name can be found, this function returns NULL.
+ *
+ *  \param device_index Index of the device to get its name.
+ *  \return Name of the device or NULL on error.
+ *
+ *  \sa SDL_NumHaptics
+ */
+extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index);
+
+/**
+ *  \brief Opens a Haptic device for usage.
+ *
+ *  The index passed as an argument refers to the N'th Haptic device on this
+ *  system.
+ *
+ *  When opening a haptic device, its gain will be set to maximum and
+ *  autocenter will be disabled.  To modify these values use
+ *  SDL_HapticSetGain() and SDL_HapticSetAutocenter().
+ *
+ *  \param device_index Index of the device to open.
+ *  \return Device identifier or NULL on error.
+ *
+ *  \sa SDL_HapticIndex
+ *  \sa SDL_HapticOpenFromMouse
+ *  \sa SDL_HapticOpenFromJoystick
+ *  \sa SDL_HapticClose
+ *  \sa SDL_HapticSetGain
+ *  \sa SDL_HapticSetAutocenter
+ *  \sa SDL_HapticPause
+ *  \sa SDL_HapticStopAll
+ */
+extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index);
+
+/**
+ *  \brief Checks if the haptic device at index has been opened.
+ *
+ *  \param device_index Index to check to see if it has been opened.
+ *  \return 1 if it has been opened or 0 if it hasn't.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticIndex
+ */
+extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index);
+
+/**
+ *  \brief Gets the index of a haptic device.
+ *
+ *  \param haptic Haptic device to get the index of.
+ *  \return The index of the haptic device or -1 on error.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticOpened
+ */
+extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic);
+
+/**
+ *  \brief Gets whether or not the current mouse has haptic capabilities.
+ *
+ *  \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't.
+ *
+ *  \sa SDL_HapticOpenFromMouse
+ */
+extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void);
+
+/**
+ *  \brief Tries to open a haptic device from the current mouse.
+ *
+ *  \return The haptic device identifier or NULL on error.
+ *
+ *  \sa SDL_MouseIsHaptic
+ *  \sa SDL_HapticOpen
+ */
+extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void);
+
+/**
+ *  \brief Checks to see if a joystick has haptic features.
+ *
+ *  \param joystick Joystick to test for haptic capabilities.
+ *  \return 1 if the joystick is haptic, 0 if it isn't
+ *          or -1 if an error ocurred.
+ *
+ *  \sa SDL_HapticOpenFromJoystick
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick);
+
+/**
+ *  \brief Opens a Haptic device for usage from a Joystick device.
+ *
+ *  You must still close the haptic device seperately.  It will not be closed
+ *  with the joystick.
+ *
+ *  When opening from a joystick you should first close the haptic device before
+ *  closing the joystick device.  If not, on some implementations the haptic
+ *  device will also get unallocated and you'll be unable to use force feedback
+ *  on that device.
+ *
+ *  \param joystick Joystick to create a haptic device from.
+ *  \return A valid haptic device identifier on success or NULL on error.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticClose
+ */
+extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick *
+                                                               joystick);
+
+/**
+ *  \brief Closes a Haptic device previously opened with SDL_HapticOpen().
+ *
+ *  \param haptic Haptic device to close.
+ */
+extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic);
+
+/**
+ *  \brief Returns the number of effects a haptic device can store.
+ *
+ *  On some platforms this isn't fully supported, and therefore is an
+ *  approximation.  Always check to see if your created effect was actually
+ *  created and do not rely solely on SDL_HapticNumEffects().
+ *
+ *  \param haptic The haptic device to query effect max.
+ *  \return The number of effects the haptic device can store or
+ *          -1 on error.
+ *
+ *  \sa SDL_HapticNumEffectsPlaying
+ *  \sa SDL_HapticQuery
+ */
+extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic);
+
+/**
+ *  \brief Returns the number of effects a haptic device can play at the same
+ *         time.
+ *
+ *  This is not supported on all platforms, but will always return a value.
+ *  Added here for the sake of completeness.
+ *
+ *  \param haptic The haptic device to query maximum playing effects.
+ *  \return The number of effects the haptic device can play at the same time
+ *          or -1 on error.
+ *
+ *  \sa SDL_HapticNumEffects
+ *  \sa SDL_HapticQuery
+ */
+extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic);
+
+/**
+ *  \brief Gets the haptic devices supported features in bitwise matter.
+ *
+ *  Example:
+ *  \code
+ *  if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) {
+ *      printf("We have constant haptic effect!");
+ *  }
+ *  \endcode
+ *
+ *  \param haptic The haptic device to query.
+ *  \return Haptic features in bitwise manner (OR'd).
+ *
+ *  \sa SDL_HapticNumEffects
+ *  \sa SDL_HapticEffectSupported
+ */
+extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic);
+
+
+/**
+ *  \brief Gets the number of haptic axes the device has.
+ *
+ *  \sa SDL_HapticDirection
+ */
+extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic);
+
+/**
+ *  \brief Checks to see if effect is supported by haptic.
+ *
+ *  \param haptic Haptic device to check on.
+ *  \param effect Effect to check to see if it is supported.
+ *  \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error.
+ *
+ *  \sa SDL_HapticQuery
+ *  \sa SDL_HapticNewEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic,
+                                                      SDL_HapticEffect *
+                                                      effect);
+
+/**
+ *  \brief Creates a new haptic effect on the device.
+ *
+ *  \param haptic Haptic device to create the effect on.
+ *  \param effect Properties of the effect to create.
+ *  \return The id of the effect on success or -1 on error.
+ *
+ *  \sa SDL_HapticUpdateEffect
+ *  \sa SDL_HapticRunEffect
+ *  \sa SDL_HapticDestroyEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic,
+                                                SDL_HapticEffect * effect);
+
+/**
+ *  \brief Updates the properties of an effect.
+ *
+ *  Can be used dynamically, although behaviour when dynamically changing
+ *  direction may be strange.  Specifically the effect may reupload itself
+ *  and start playing from the start.  You cannot change the type either when
+ *  running SDL_HapticUpdateEffect().
+ *
+ *  \param haptic Haptic device that has the effect.
+ *  \param effect Effect to update.
+ *  \param data New effect properties to use.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticNewEffect
+ *  \sa SDL_HapticRunEffect
+ *  \sa SDL_HapticDestroyEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic,
+                                                   int effect,
+                                                   SDL_HapticEffect * data);
+
+/**
+ *  \brief Runs the haptic effect on its associated haptic device.
+ *
+ *  If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over
+ *  repeating the envelope (attack and fade) every time.  If you only want the
+ *  effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length
+ *  parameter.
+ *
+ *  \param haptic Haptic device to run the effect on.
+ *  \param effect Identifier of the haptic effect to run.
+ *  \param iterations Number of iterations to run the effect. Use
+ *         ::SDL_HAPTIC_INFINITY for infinity.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticStopEffect
+ *  \sa SDL_HapticDestroyEffect
+ *  \sa SDL_HapticGetEffectStatus
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic,
+                                                int effect,
+                                                Uint32 iterations);
+
+/**
+ *  \brief Stops the haptic effect on its associated haptic device.
+ *
+ *  \param haptic Haptic device to stop the effect on.
+ *  \param effect Identifier of the effect to stop.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticRunEffect
+ *  \sa SDL_HapticDestroyEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic,
+                                                 int effect);
+
+/**
+ *  \brief Destroys a haptic effect on the device.
+ *
+ *  This will stop the effect if it's running.  Effects are automatically
+ *  destroyed when the device is closed.
+ *
+ *  \param haptic Device to destroy the effect on.
+ *  \param effect Identifier of the effect to destroy.
+ *
+ *  \sa SDL_HapticNewEffect
+ */
+extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic,
+                                                     int effect);
+
+/**
+ *  \brief Gets the status of the current effect on the haptic device.
+ *
+ *  Device must support the ::SDL_HAPTIC_STATUS feature.
+ *
+ *  \param haptic Haptic device to query the effect status on.
+ *  \param effect Identifier of the effect to query its status.
+ *  \return 0 if it isn't playing, 1 if it is playing or -1 on error.
+ *
+ *  \sa SDL_HapticRunEffect
+ *  \sa SDL_HapticStopEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic,
+                                                      int effect);
+
+/**
+ *  \brief Sets the global gain of the device.
+ *
+ *  Device must support the ::SDL_HAPTIC_GAIN feature.
+ *
+ *  The user may specify the maximum gain by setting the environment variable
+ *  SDL_HAPTIC_GAIN_MAX which should be between 0 and 100.  All calls to
+ *  SDL_HapticSetGain() will scale linearly using SDL_HAPTIC_GAIN_MAX as the
+ *  maximum.
+ *
+ *  \param haptic Haptic device to set the gain on.
+ *  \param gain Value to set the gain to, should be between 0 and 100.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticQuery
+ */
+extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain);
+
+/**
+ *  \brief Sets the global autocenter of the device.
+ *
+ *  Autocenter should be between 0 and 100.  Setting it to 0 will disable
+ *  autocentering.
+ *
+ *  Device must support the ::SDL_HAPTIC_AUTOCENTER feature.
+ *
+ *  \param haptic Haptic device to set autocentering on.
+ *  \param autocenter Value to set autocenter to, 0 disables autocentering.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticQuery
+ */
+extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic,
+                                                    int autocenter);
+
+/**
+ *  \brief Pauses a haptic device.
+ *
+ *  Device must support the ::SDL_HAPTIC_PAUSE feature.  Call
+ *  SDL_HapticUnpause() to resume playback.
+ *
+ *  Do not modify the effects nor add new ones while the device is paused.
+ *  That can cause all sorts of weird errors.
+ *
+ *  \param haptic Haptic device to pause.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticUnpause
+ */
+extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic);
+
+/**
+ *  \brief Unpauses a haptic device.
+ *
+ *  Call to unpause after SDL_HapticPause().
+ *
+ *  \param haptic Haptic device to pause.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticPause
+ */
+extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic);
+
+/**
+ *  \brief Stops all the currently playing effects on a haptic device.
+ *
+ *  \param haptic Haptic device to stop.
+ *  \return 0 on success or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic);
+
+/**
+ *  \brief Checks to see if rumble is supported on a haptic device.
+ *
+ *  \param haptic Haptic device to check to see if it supports rumble.
+ *  \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error.
+ *
+ *  \sa SDL_HapticRumbleInit
+ *  \sa SDL_HapticRumblePlay
+ *  \sa SDL_HapticRumbleStop
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRumbleSupported(SDL_Haptic * haptic);
+
+/**
+ *  \brief Initializes the haptic device for simple rumble playback.
+ *
+ *  \param haptic Haptic device to initialize for simple rumble playback.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticRumbleSupported
+ *  \sa SDL_HapticRumblePlay
+ *  \sa SDL_HapticRumbleStop
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRumbleInit(SDL_Haptic * haptic);
+
+/**
+ *  \brief Runs simple rumble on a haptic device
+ *
+ *  \param haptic Haptic device to play rumble effect on.
+ *  \param strength Strength of the rumble to play as a 0-1 float value.
+ *  \param length Length of the rumble to play in milliseconds.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticRumbleSupported
+ *  \sa SDL_HapticRumbleInit
+ *  \sa SDL_HapticRumbleStop
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length );
+
+/**
+ *  \brief Stops the simple rumble on a haptic device.
+ *
+ *  \param haptic Haptic to stop the rumble on.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticRumbleSupported
+ *  \sa SDL_HapticRumbleInit
+ *  \sa SDL_HapticRumblePlay
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_haptic_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_hints.h b/Source/3rd Party/sdl/include/SDL_hints.h
new file mode 100644
index 000000000..b98ce6834
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_hints.h	
@@ -0,0 +1,517 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_hints.h
+ *
+ *  Official documentation for SDL configuration variables
+ *
+ *  This file contains functions to set and get configuration hints,
+ *  as well as listing each of them alphabetically.
+ *
+ *  The convention for naming hints is SDL_HINT_X, where "SDL_X" is
+ *  the environment variable that can be used to override the default.
+ *
+ *  In general these hints are just that - they may or may not be
+ *  supported or applicable on any given platform, but they provide
+ *  a way for an application or user to give the library a hint as
+ *  to how they would like the library to work.
+ */
+
+#ifndef _SDL_hints_h
+#define _SDL_hints_h
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief  A variable controlling how 3D acceleration is used to accelerate the SDL screen surface.
+ *
+ *  SDL can try to accelerate the SDL screen surface by using streaming
+ *  textures with a 3D rendering engine.  This variable controls whether and
+ *  how this is done.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable 3D acceleration
+ *    "1"       - Enable 3D acceleration, using the default renderer.
+ *    "X"       - Enable 3D acceleration, using X where X is one of the valid rendering drivers.  (e.g. "direct3d", "opengl", etc.)
+ *
+ *  By default SDL tries to make a best guess for each platform whether
+ *  to use acceleration or not.
+ */
+#define SDL_HINT_FRAMEBUFFER_ACCELERATION   "SDL_FRAMEBUFFER_ACCELERATION"
+
+/**
+ *  \brief  A variable specifying which render driver to use.
+ *
+ *  If the application doesn't pick a specific renderer to use, this variable
+ *  specifies the name of the preferred renderer.  If the preferred renderer
+ *  can't be initialized, the normal default renderer is used.
+ *
+ *  This variable is case insensitive and can be set to the following values:
+ *    "direct3d"
+ *    "opengl"
+ *    "opengles2"
+ *    "opengles"
+ *    "software"
+ *
+ *  The default varies by platform, but it's the first one in the list that
+ *  is available on the current platform.
+ */
+#define SDL_HINT_RENDER_DRIVER              "SDL_RENDER_DRIVER"
+
+/**
+ *  \brief  A variable controlling whether the OpenGL render driver uses shaders if they are available.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable shaders
+ *    "1"       - Enable shaders
+ *
+ *  By default shaders are used if OpenGL supports them.
+ */
+#define SDL_HINT_RENDER_OPENGL_SHADERS      "SDL_RENDER_OPENGL_SHADERS"
+
+/**
+ *  \brief  A variable controlling whether the Direct3D device is initialized for thread-safe operations.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Thread-safety is not enabled (faster)
+ *    "1"       - Thread-safety is enabled
+ *
+ *  By default the Direct3D device is created with thread-safety disabled.
+ */
+#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE"
+
+/**
+ *  \brief  A variable controlling whether to enable Direct3D 11+'s Debug Layer.
+ *
+ *  This variable does not have any effect on the Direct3D 9 based renderer.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable Debug Layer use
+ *    "1"       - Enable Debug Layer use
+ *
+ *  By default, SDL does not use Direct3D Debug Layer.
+ */
+#define SDL_HINT_RENDER_DIRECT3D11_DEBUG    "SDL_HINT_RENDER_DIRECT3D11_DEBUG"
+
+/**
+ *  \brief  A variable controlling the scaling quality
+ *
+ *  This variable can be set to the following values:
+ *    "0" or "nearest" - Nearest pixel sampling
+ *    "1" or "linear"  - Linear filtering (supported by OpenGL and Direct3D)
+ *    "2" or "best"    - Currently this is the same as "linear"
+ *
+ *  By default nearest pixel sampling is used
+ */
+#define SDL_HINT_RENDER_SCALE_QUALITY       "SDL_RENDER_SCALE_QUALITY"
+
+/**
+ *  \brief  A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable vsync
+ *    "1"       - Enable vsync
+ *
+ *  By default SDL does not sync screen surface updates with vertical refresh.
+ */
+#define SDL_HINT_RENDER_VSYNC               "SDL_RENDER_VSYNC"
+
+/**
+ *  \brief  A variable controlling whether the screensaver is enabled. 
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable screensaver
+ *    "1"       - Enable screensaver
+ *
+ *  By default SDL will disable the screensaver.
+ */
+#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER    "SDL_VIDEO_ALLOW_SCREENSAVER"
+
+/**
+ *  \brief  A variable controlling whether the X11 VidMode extension should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable XVidMode
+ *    "1"       - Enable XVidMode
+ *
+ *  By default SDL will use XVidMode if it is available.
+ */
+#define SDL_HINT_VIDEO_X11_XVIDMODE         "SDL_VIDEO_X11_XVIDMODE"
+
+/**
+ *  \brief  A variable controlling whether the X11 Xinerama extension should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable Xinerama
+ *    "1"       - Enable Xinerama
+ *
+ *  By default SDL will use Xinerama if it is available.
+ */
+#define SDL_HINT_VIDEO_X11_XINERAMA         "SDL_VIDEO_X11_XINERAMA"
+
+/**
+ *  \brief  A variable controlling whether the X11 XRandR extension should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable XRandR
+ *    "1"       - Enable XRandR
+ *
+ *  By default SDL will not use XRandR because of window manager issues.
+ */
+#define SDL_HINT_VIDEO_X11_XRANDR           "SDL_VIDEO_X11_XRANDR"
+
+/**
+ *  \brief  A variable controlling whether grabbing input grabs the keyboard
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Grab will affect only the mouse
+ *    "1"       - Grab will affect mouse and keyboard
+ *
+ *  By default SDL will not grab the keyboard so system shortcuts still work.
+ */
+#define SDL_HINT_GRAB_KEYBOARD              "SDL_GRAB_KEYBOARD"
+
+/**
+*  \brief  A variable controlling whether relative mouse mode is implemented using mouse warping
+*
+*  This variable can be set to the following values:
+*    "0"       - Relative mouse mode uses raw input
+*    "1"       - Relative mouse mode uses mouse warping
+*
+*  By default SDL will use raw input for relative mouse mode
+*/
+#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP    "SDL_MOUSE_RELATIVE_MODE_WARP"
+
+/**
+ *  \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true.
+ *
+ */
+#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS   "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS"
+
+/**
+ *  \brief  A variable controlling whether the idle timer is disabled on iOS.
+ *
+ *  When an iOS app does not receive touches for some time, the screen is
+ *  dimmed automatically. For games where the accelerometer is the only input
+ *  this is problematic. This functionality can be disabled by setting this
+ *  hint.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Enable idle timer
+ *    "1"       - Disable idle timer
+ */
+#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED"
+
+/**
+ *  \brief  A variable controlling which orientations are allowed on iOS.
+ *
+ *  In some circumstances it is necessary to be able to explicitly control
+ *  which UI orientations are allowed.
+ *
+ *  This variable is a space delimited list of the following values:
+ *    "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown"
+ */
+#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS"
+    
+/**
+ *  \brief  A variable controlling whether an Android built-in accelerometer should be
+ *  listed as a joystick device, rather than listing actual joysticks only.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - List only real joysticks and accept input from them
+ *    "1"       - List real joysticks along with the accelerometer as if it were a 3 axis joystick (the default).
+ */
+#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK"
+
+
+/**
+ *  \brief  A variable that lets you disable the detection and use of Xinput gamepad devices
+ *
+ *  The variable can be set to the following values:
+ *    "0"       - Disable XInput detection (only uses direct input)
+ *    "1"       - Enable XInput detection (the default)
+ */
+#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED"
+
+
+/**
+ *  \brief  A variable that lets you manually hint extra gamecontroller db entries
+ *
+ *  The variable should be newline delimited rows of gamecontroller config data, see SDL_gamecontroller.h
+ *
+ *  This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER)
+ *  You can update mappings after the system is initialized with SDL_GameControllerMappingForGUID() and SDL_GameControllerAddMapping()
+ */
+#define SDL_HINT_GAMECONTROLLERCONFIG "SDL_GAMECONTROLLERCONFIG"
+
+
+/**
+ *  \brief  A variable that lets you enable joystick (and gamecontroller) events even when your app is in the background.
+ *
+ *  The variable can be set to the following values:
+ *    "0"       - Disable joystick & gamecontroller input events when the
+ *                application is in the background.
+ *    "1"       - Enable joystick & gamecontroller input events when the
+ *                application is in the background.
+ *
+ *  The default value is "0".  This hint may be set at any time.
+ */
+#define SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS"
+
+
+/**
+ *  \brief If set to 0 then never set the top most bit on a SDL Window, even if the video mode expects it.
+ *      This is a debugging aid for developers and not expected to be used by end users. The default is "1"
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - don't allow topmost
+ *    "1"       - allow topmost
+ */
+#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST"
+
+
+/**
+ *  \brief A variable that controls the timer resolution, in milliseconds.
+ *
+ *  The higher resolution the timer, the more frequently the CPU services
+ *  timer interrupts, and the more precise delays are, but this takes up
+ *  power and CPU time.  This hint is only used on Windows 7 and earlier.
+ *
+ *  See this blog post for more information:
+ *  http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/
+ *
+ *  If this variable is set to "0", the system timer resolution is not set.
+ *
+ *  The default value is "1". This hint may be set at any time.
+ */
+#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION"
+
+
+/**
+ *  \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac)
+ */
+#define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED"
+
+/**
+ *  \brief A variable that determines whether ctrl+click should generate a right-click event on Mac
+ *  
+ *  If present, holding ctrl while left clicking will generate a right click
+ *  event when on Mac.
+ */
+#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK"
+
+/**
+*  \brief  A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries
+*
+*  SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It
+*  can use two different sets of binaries, those compiled by the user from source
+*  or those provided by the Chrome browser. In the later case, these binaries require
+*  that SDL loads a DLL providing the shader compiler.
+*
+*  This variable can be set to the following values:
+*    "d3dcompiler_46.dll" - default, best for Vista or later.
+*    "d3dcompiler_43.dll" - for XP support.
+*    "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries.
+*
+*/
+#define SDL_HINT_VIDEO_WIN_D3DCOMPILER              "SDL_VIDEO_WIN_D3DCOMPILER"
+
+/**
+*  \brief  A variable that is the address of another SDL_Window* (as a hex string formatted with "%p").
+*  
+*  If this hint is set before SDL_CreateWindowFrom() and the SDL_Window* it is set to has
+*  SDL_WINDOW_OPENGL set (and running on WGL only, currently), then two things will occur on the newly 
+*  created SDL_Window:
+*
+*  1. Its pixel format will be set to the same pixel format as this SDL_Window.  This is
+*  needed for example when sharing an OpenGL context across multiple windows.
+*
+*  2. The flag SDL_WINDOW_OPENGL will be set on the new window so it can be used for
+*  OpenGL rendering.
+*
+*  This variable can be set to the following values:
+*    The address (as a string "%p") of the SDL_Window* that new windows created with SDL_CreateWindowFrom() should
+*    share a pixel format with.
+*/
+#define SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT    "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT"
+
+/*
+ *  \brief A URL to a WinRT app's privacy policy
+ *
+ *  All network-enabled WinRT apps must make a privacy policy available to its
+ *  users.  On Windows 8, 8.1, and RT, Microsoft mandates that this policy be
+ *  be available in the Windows Settings charm, as accessed from within the app.
+ *  SDL provides code to add a URL-based link there, which can point to the app's
+ *  privacy policy.
+ *
+ *  To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL
+ *  before calling any SDL_Init functions.  The contents of the hint should
+ *  be a valid URL.  For example, "http://www.example.com".
+ *
+ *  The default value is "", which will prevent SDL from adding a privacy policy
+ *  link to the Settings charm.  This hint should only be set during app init.
+ *
+ *  The label text of an app's "Privacy Policy" link may be customized via another
+ *  hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL.
+ *
+ *  Please note that on Windows Phone, Microsoft does not provide standard UI
+ *  for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL
+ *  will not get used on that platform.  Network-enabled phone apps should display
+ *  their privacy policy through some other, in-app means.
+ */
+#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_HINT_WINRT_PRIVACY_POLICY_URL"
+
+/** \brief Label text for a WinRT app's privacy policy link
+ *
+ *  Network-enabled WinRT apps must include a privacy policy.  On Windows 8, 8.1, and RT,
+ *  Microsoft mandates that this policy be available via the Windows Settings charm.
+ *  SDL provides code to add a link there, with it's label text being set via the
+ *  optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL.
+ *
+ *  Please note that a privacy policy's contents are not set via this hint.  A separate
+ *  hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the
+ *  policy.
+ *
+ *  The contents of this hint should be encoded as a UTF8 string.
+ *
+ *  The default value is "Privacy Policy".  This hint should only be set during app
+ *  initialization, preferably before any calls to SDL_Init.
+ *
+ *  For additional information on linking to a privacy policy, see the documentation for
+ *  SDL_HINT_WINRT_PRIVACY_POLICY_URL.
+ */
+#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_HINT_WINRT_PRIVACY_POLICY_LABEL"
+
+/** \brief If set to 1, back button press events on Windows Phone 8+ will be marked as handled.
+ *
+ *  TODO, WinRT: document SDL_HINT_WINRT_HANDLE_BACK_BUTTON need and use
+ *  For now, more details on why this is needed can be found at the
+ *  beginning of the following web page:
+ *  http://msdn.microsoft.com/en-us/library/windowsphone/develop/jj247550(v=vs.105).aspx
+ */
+#define SDL_HINT_WINRT_HANDLE_BACK_BUTTON "SDL_HINT_WINRT_HANDLE_BACK_BUTTON"
+
+/**
+ *  \brief  A variable that dictates policy for fullscreen Spaces on Mac OS X.
+ *
+ *  This hint only applies to Mac OS X.
+ *
+ *  The variable can be set to the following values:
+ *    "0"       - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and
+ *                SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen"
+ *                button on their titlebars).
+ *    "1"       - Enable Spaces support (FULLSCREEN_DESKTOP will use them and
+ *                SDL_WINDOW_RESIZABLE windows will offer the "fullscreen"
+ *                button on their titlebars.
+ *
+ *  The default value is "1". Spaces are disabled regardless of this hint if
+ *   the OS isn't at least Mac OS X Lion (10.7). This hint must be set before
+ *   any windows are created.
+ */
+#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES    "SDL_VIDEO_MAC_FULLSCREEN_SPACES"
+
+
+/**
+ *  \brief  An enumeration of hint priorities
+ */
+typedef enum
+{
+    SDL_HINT_DEFAULT,
+    SDL_HINT_NORMAL,
+    SDL_HINT_OVERRIDE
+} SDL_HintPriority;
+
+
+/**
+ *  \brief Set a hint with a specific priority
+ *
+ *  The priority controls the behavior when setting a hint that already
+ *  has a value.  Hints will replace existing hints of their priority and
+ *  lower.  Environment variables are considered to have override priority.
+ *
+ *  \return SDL_TRUE if the hint was set, SDL_FALSE otherwise
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name,
+                                                         const char *value,
+                                                         SDL_HintPriority priority);
+
+/**
+ *  \brief Set a hint with normal priority
+ *
+ *  \return SDL_TRUE if the hint was set, SDL_FALSE otherwise
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name,
+                                             const char *value);
+
+/**
+ *  \brief Get a hint
+ *
+ *  \return The string value of a hint variable.
+ */
+extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name);
+
+/**
+ *  \brief Add a function to watch a particular hint
+ *
+ *  \param name The hint to watch
+ *  \param callback The function to call when the hint value changes
+ *  \param userdata A pointer to pass to the callback function
+ */
+typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue);
+extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name,
+                                                 SDL_HintCallback callback,
+                                                 void *userdata);
+
+/**
+ *  \brief Remove a function watching a particular hint
+ *
+ *  \param name The hint being watched
+ *  \param callback The function being called when the hint value changes
+ *  \param userdata A pointer being passed to the callback function
+ */
+extern DECLSPEC void SDLCALL SDL_DelHintCallback(const char *name,
+                                                 SDL_HintCallback callback,
+                                                 void *userdata);
+
+/**
+ *  \brief  Clear all hints
+ *
+ *  This function is called during SDL_Quit() to free stored hints.
+ */
+extern DECLSPEC void SDLCALL SDL_ClearHints(void);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_hints_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_joystick.h b/Source/3rd Party/sdl/include/SDL_joystick.h
new file mode 100644
index 000000000..b0b1c6673
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_joystick.h	
@@ -0,0 +1,253 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_joystick.h
+ *
+ *  Include file for SDL joystick event handling
+ *
+ * The term "device_index" identifies currently plugged in joystick devices between 0 and SDL_NumJoysticks, with the exact joystick
+ *   behind a device_index changing as joysticks are plugged and unplugged.
+ *
+ * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted
+ *   then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in.
+ *
+ * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of
+ *   the device (a X360 wired controller for example). This identifier is platform dependent.
+ *
+ *
+ */
+
+#ifndef _SDL_joystick_h
+#define _SDL_joystick_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \file SDL_joystick.h
+ *
+ *  In order to use these functions, SDL_Init() must have been called
+ *  with the ::SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
+ *  for joysticks, and load appropriate drivers.
+ *
+ *  If you would like to receive joystick updates while the application
+ *  is in the background, you should set the following hint before calling
+ *  SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
+ */
+
+/* The joystick structure used to identify an SDL joystick */
+struct _SDL_Joystick;
+typedef struct _SDL_Joystick SDL_Joystick;
+
+/* A structure that encodes the stable unique id for a joystick device */
+typedef struct {
+    Uint8 data[16];
+} SDL_JoystickGUID;
+
+typedef Sint32 SDL_JoystickID;
+
+
+/* Function prototypes */
+/**
+ *  Count the number of joysticks attached to the system right now
+ */
+extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
+
+/**
+ *  Get the implementation dependent name of a joystick.
+ *  This can be called before any joysticks are opened.
+ *  If no name can be found, this function returns NULL.
+ */
+extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index);
+
+/**
+ *  Open a joystick for use.
+ *  The index passed as an argument refers tothe N'th joystick on the system.
+ *  This index is the value which will identify this joystick in future joystick
+ *  events.
+ *
+ *  \return A joystick identifier, or NULL if an error occurred.
+ */
+extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index);
+
+/**
+ *  Return the name for this currently opened joystick.
+ *  If no name can be found, this function returns NULL.
+ */
+extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick);
+
+/**
+ *  Return the GUID for the joystick at this index
+ */
+extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index);
+
+/**
+ *  Return the GUID for this opened joystick
+ */
+extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick);
+
+/**
+ *  Return a string representation for this guid. pszGUID must point to at least 33 bytes
+ *  (32 for the string plus a NULL terminator).
+ */
+extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID);
+
+/**
+ *  convert a string into a joystick formatted guid
+ */
+extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID);
+
+/**
+ *  Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick);
+
+/**
+ *  Get the instance ID of an opened joystick or -1 if the joystick is invalid.
+ */
+extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick);
+
+/**
+ *  Get the number of general axis controls on a joystick.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick);
+
+/**
+ *  Get the number of trackballs on a joystick.
+ *
+ *  Joystick trackballs have only relative motion events associated
+ *  with them and their state cannot be polled.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick);
+
+/**
+ *  Get the number of POV hats on a joystick.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick);
+
+/**
+ *  Get the number of buttons on a joystick.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick);
+
+/**
+ *  Update the current state of the open joysticks.
+ *
+ *  This is called automatically by the event loop if any joystick
+ *  events are enabled.
+ */
+extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
+
+/**
+ *  Enable/disable joystick event polling.
+ *
+ *  If joystick events are disabled, you must call SDL_JoystickUpdate()
+ *  yourself and check the state of the joystick when you want joystick
+ *  information.
+ *
+ *  The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
+
+/**
+ *  Get the current state of an axis control on a joystick.
+ *
+ *  The state is a value ranging from -32768 to 32767.
+ *
+ *  The axis indices start at index 0.
+ */
+extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
+                                                   int axis);
+
+/**
+ *  \name Hat positions
+ */
+/* @{ */
+#define SDL_HAT_CENTERED    0x00
+#define SDL_HAT_UP      0x01
+#define SDL_HAT_RIGHT       0x02
+#define SDL_HAT_DOWN        0x04
+#define SDL_HAT_LEFT        0x08
+#define SDL_HAT_RIGHTUP     (SDL_HAT_RIGHT|SDL_HAT_UP)
+#define SDL_HAT_RIGHTDOWN   (SDL_HAT_RIGHT|SDL_HAT_DOWN)
+#define SDL_HAT_LEFTUP      (SDL_HAT_LEFT|SDL_HAT_UP)
+#define SDL_HAT_LEFTDOWN    (SDL_HAT_LEFT|SDL_HAT_DOWN)
+/* @} */
+
+/**
+ *  Get the current state of a POV hat on a joystick.
+ *
+ *  The hat indices start at index 0.
+ *
+ *  \return The return value is one of the following positions:
+ *           - ::SDL_HAT_CENTERED
+ *           - ::SDL_HAT_UP
+ *           - ::SDL_HAT_RIGHT
+ *           - ::SDL_HAT_DOWN
+ *           - ::SDL_HAT_LEFT
+ *           - ::SDL_HAT_RIGHTUP
+ *           - ::SDL_HAT_RIGHTDOWN
+ *           - ::SDL_HAT_LEFTUP
+ *           - ::SDL_HAT_LEFTDOWN
+ */
+extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick,
+                                                 int hat);
+
+/**
+ *  Get the ball axis change since the last poll.
+ *
+ *  \return 0, or -1 if you passed it invalid parameters.
+ *
+ *  The ball indices start at index 0.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick,
+                                                int ball, int *dx, int *dy);
+
+/**
+ *  Get the current state of a button on a joystick.
+ *
+ *  The button indices start at index 0.
+ */
+extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick,
+                                                    int button);
+
+/**
+ *  Close a joystick previously opened with SDL_JoystickOpen().
+ */
+extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_joystick_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_keyboard.h b/Source/3rd Party/sdl/include/SDL_keyboard.h
new file mode 100644
index 000000000..586a26cff
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_keyboard.h	
@@ -0,0 +1,217 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_keyboard.h
+ *
+ *  Include file for SDL keyboard event handling
+ */
+
+#ifndef _SDL_keyboard_h
+#define _SDL_keyboard_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_keycode.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief The SDL keysym structure, used in key events.
+ *
+ *  \note  If you are looking for translated character input, see the ::SDL_TEXTINPUT event.
+ */
+typedef struct SDL_Keysym
+{
+    SDL_Scancode scancode;      /**< SDL physical key code - see ::SDL_Scancode for details */
+    SDL_Keycode sym;            /**< SDL virtual key code - see ::SDL_Keycode for details */
+    Uint16 mod;                 /**< current key modifiers */
+    Uint32 unused;
+} SDL_Keysym;
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the window which currently has keyboard focus.
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void);
+
+/**
+ *  \brief Get a snapshot of the current state of the keyboard.
+ *
+ *  \param numkeys if non-NULL, receives the length of the returned array.
+ *
+ *  \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values.
+ *
+ *  \b Example:
+ *  \code
+ *  const Uint8 *state = SDL_GetKeyboardState(NULL);
+ *  if ( state[SDL_SCANCODE_RETURN] )   {
+ *      printf("<RETURN> is pressed.\n");
+ *  }
+ *  \endcode
+ */
+extern DECLSPEC const Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys);
+
+/**
+ *  \brief Get the current key modifier state for the keyboard.
+ */
+extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void);
+
+/**
+ *  \brief Set the current key modifier state for the keyboard.
+ *
+ *  \note This does not change the keyboard state, only the key modifier flags.
+ */
+extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate);
+
+/**
+ *  \brief Get the key code corresponding to the given scancode according
+ *         to the current keyboard layout.
+ *
+ *  See ::SDL_Keycode for details.
+ *
+ *  \sa SDL_GetKeyName()
+ */
+extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode);
+
+/**
+ *  \brief Get the scancode corresponding to the given key code according to the
+ *         current keyboard layout.
+ *
+ *  See ::SDL_Scancode for details.
+ *
+ *  \sa SDL_GetScancodeName()
+ */
+extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key);
+
+/**
+ *  \brief Get a human-readable name for a scancode.
+ *
+ *  \return A pointer to the name for the scancode.
+ *          If the scancode doesn't have a name, this function returns
+ *          an empty string ("").
+ *
+ *  \sa SDL_Scancode
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode scancode);
+
+/**
+ *  \brief Get a scancode from a human-readable name
+ *
+ *  \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized
+ *
+ *  \sa SDL_Scancode
+ */
+extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name);
+
+/**
+ *  \brief Get a human-readable name for a key.
+ *
+ *  \return A pointer to a UTF-8 string that stays valid at least until the next
+ *          call to this function. If you need it around any longer, you must
+ *          copy it.  If the key doesn't have a name, this function returns an
+ *          empty string ("").
+ *
+ *  \sa SDL_Key
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key);
+
+/**
+ *  \brief Get a key code from a human-readable name
+ *
+ *  \return key code, or SDLK_UNKNOWN if the name wasn't recognized
+ *
+ *  \sa SDL_Keycode
+ */
+extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name);
+
+/**
+ *  \brief Start accepting Unicode text input events.
+ *         This function will show the on-screen keyboard if supported.
+ *
+ *  \sa SDL_StopTextInput()
+ *  \sa SDL_SetTextInputRect()
+ *  \sa SDL_HasScreenKeyboardSupport()
+ */
+extern DECLSPEC void SDLCALL SDL_StartTextInput(void);
+
+/**
+ *  \brief Return whether or not Unicode text input events are enabled.
+ *
+ *  \sa SDL_StartTextInput()
+ *  \sa SDL_StopTextInput()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void);
+
+/**
+ *  \brief Stop receiving any text input events.
+ *         This function will hide the on-screen keyboard if supported.
+ *
+ *  \sa SDL_StartTextInput()
+ *  \sa SDL_HasScreenKeyboardSupport()
+ */
+extern DECLSPEC void SDLCALL SDL_StopTextInput(void);
+
+/**
+ *  \brief Set the rectangle used to type Unicode text inputs.
+ *         This is used as a hint for IME and on-screen keyboard placement.
+ *
+ *  \sa SDL_StartTextInput()
+ */
+extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect);
+
+/**
+ *  \brief Returns whether the platform has some screen keyboard support.
+ *
+ *  \return SDL_TRUE if some keyboard support is available else SDL_FALSE.
+ *
+ *  \note Not all screen keyboard functions are supported on all platforms.
+ *
+ *  \sa SDL_IsScreenKeyboardShown()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void);
+
+/**
+ *  \brief Returns whether the screen keyboard is shown for given window.
+ *
+ *  \param window The window for which screen keyboard should be queried.
+ *
+ *  \return SDL_TRUE if screen keyboard is shown else SDL_FALSE.
+ *
+ *  \sa SDL_HasScreenKeyboardSupport()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_keyboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_keycode.h b/Source/3rd Party/sdl/include/SDL_keycode.h
new file mode 100644
index 000000000..d5f5dd0ae
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_keycode.h	
@@ -0,0 +1,341 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_keycode.h
+ *
+ *  Defines constants which identify keyboard keys and modifiers.
+ */
+
+#ifndef _SDL_keycode_h
+#define _SDL_keycode_h
+
+#include "SDL_stdinc.h"
+#include "SDL_scancode.h"
+
+/**
+ *  \brief The SDL virtual key representation.
+ *
+ *  Values of this type are used to represent keyboard keys using the current
+ *  layout of the keyboard.  These values include Unicode values representing
+ *  the unmodified character that would be generated by pressing the key, or
+ *  an SDLK_* constant for those keys that do not generate characters.
+ */
+typedef Sint32 SDL_Keycode;
+
+#define SDLK_SCANCODE_MASK (1<<30)
+#define SDL_SCANCODE_TO_KEYCODE(X)  (X | SDLK_SCANCODE_MASK)
+
+enum
+{
+    SDLK_UNKNOWN = 0,
+
+    SDLK_RETURN = '\r',
+    SDLK_ESCAPE = '\033',
+    SDLK_BACKSPACE = '\b',
+    SDLK_TAB = '\t',
+    SDLK_SPACE = ' ',
+    SDLK_EXCLAIM = '!',
+    SDLK_QUOTEDBL = '"',
+    SDLK_HASH = '#',
+    SDLK_PERCENT = '%',
+    SDLK_DOLLAR = '$',
+    SDLK_AMPERSAND = '&',
+    SDLK_QUOTE = '\'',
+    SDLK_LEFTPAREN = '(',
+    SDLK_RIGHTPAREN = ')',
+    SDLK_ASTERISK = '*',
+    SDLK_PLUS = '+',
+    SDLK_COMMA = ',',
+    SDLK_MINUS = '-',
+    SDLK_PERIOD = '.',
+    SDLK_SLASH = '/',
+    SDLK_0 = '0',
+    SDLK_1 = '1',
+    SDLK_2 = '2',
+    SDLK_3 = '3',
+    SDLK_4 = '4',
+    SDLK_5 = '5',
+    SDLK_6 = '6',
+    SDLK_7 = '7',
+    SDLK_8 = '8',
+    SDLK_9 = '9',
+    SDLK_COLON = ':',
+    SDLK_SEMICOLON = ';',
+    SDLK_LESS = '<',
+    SDLK_EQUALS = '=',
+    SDLK_GREATER = '>',
+    SDLK_QUESTION = '?',
+    SDLK_AT = '@',
+    /*
+       Skip uppercase letters
+     */
+    SDLK_LEFTBRACKET = '[',
+    SDLK_BACKSLASH = '\\',
+    SDLK_RIGHTBRACKET = ']',
+    SDLK_CARET = '^',
+    SDLK_UNDERSCORE = '_',
+    SDLK_BACKQUOTE = '`',
+    SDLK_a = 'a',
+    SDLK_b = 'b',
+    SDLK_c = 'c',
+    SDLK_d = 'd',
+    SDLK_e = 'e',
+    SDLK_f = 'f',
+    SDLK_g = 'g',
+    SDLK_h = 'h',
+    SDLK_i = 'i',
+    SDLK_j = 'j',
+    SDLK_k = 'k',
+    SDLK_l = 'l',
+    SDLK_m = 'm',
+    SDLK_n = 'n',
+    SDLK_o = 'o',
+    SDLK_p = 'p',
+    SDLK_q = 'q',
+    SDLK_r = 'r',
+    SDLK_s = 's',
+    SDLK_t = 't',
+    SDLK_u = 'u',
+    SDLK_v = 'v',
+    SDLK_w = 'w',
+    SDLK_x = 'x',
+    SDLK_y = 'y',
+    SDLK_z = 'z',
+
+    SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK),
+
+    SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1),
+    SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2),
+    SDLK_F3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3),
+    SDLK_F4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4),
+    SDLK_F5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5),
+    SDLK_F6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6),
+    SDLK_F7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7),
+    SDLK_F8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8),
+    SDLK_F9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9),
+    SDLK_F10 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10),
+    SDLK_F11 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11),
+    SDLK_F12 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12),
+
+    SDLK_PRINTSCREEN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN),
+    SDLK_SCROLLLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK),
+    SDLK_PAUSE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE),
+    SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT),
+    SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME),
+    SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP),
+    SDLK_DELETE = '\177',
+    SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END),
+    SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN),
+    SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT),
+    SDLK_LEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT),
+    SDLK_DOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN),
+    SDLK_UP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP),
+
+    SDLK_NUMLOCKCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR),
+    SDLK_KP_DIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE),
+    SDLK_KP_MULTIPLY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY),
+    SDLK_KP_MINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS),
+    SDLK_KP_PLUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS),
+    SDLK_KP_ENTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER),
+    SDLK_KP_1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1),
+    SDLK_KP_2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2),
+    SDLK_KP_3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3),
+    SDLK_KP_4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4),
+    SDLK_KP_5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5),
+    SDLK_KP_6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6),
+    SDLK_KP_7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7),
+    SDLK_KP_8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8),
+    SDLK_KP_9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9),
+    SDLK_KP_0 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0),
+    SDLK_KP_PERIOD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD),
+
+    SDLK_APPLICATION = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION),
+    SDLK_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER),
+    SDLK_KP_EQUALS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS),
+    SDLK_F13 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13),
+    SDLK_F14 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14),
+    SDLK_F15 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15),
+    SDLK_F16 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16),
+    SDLK_F17 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17),
+    SDLK_F18 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18),
+    SDLK_F19 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19),
+    SDLK_F20 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20),
+    SDLK_F21 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21),
+    SDLK_F22 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22),
+    SDLK_F23 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23),
+    SDLK_F24 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24),
+    SDLK_EXECUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE),
+    SDLK_HELP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP),
+    SDLK_MENU = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU),
+    SDLK_SELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT),
+    SDLK_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP),
+    SDLK_AGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN),
+    SDLK_UNDO = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO),
+    SDLK_CUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT),
+    SDLK_COPY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY),
+    SDLK_PASTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE),
+    SDLK_FIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND),
+    SDLK_MUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE),
+    SDLK_VOLUMEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP),
+    SDLK_VOLUMEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN),
+    SDLK_KP_COMMA = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA),
+    SDLK_KP_EQUALSAS400 =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400),
+
+    SDLK_ALTERASE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE),
+    SDLK_SYSREQ = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ),
+    SDLK_CANCEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL),
+    SDLK_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR),
+    SDLK_PRIOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR),
+    SDLK_RETURN2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2),
+    SDLK_SEPARATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR),
+    SDLK_OUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT),
+    SDLK_OPER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER),
+    SDLK_CLEARAGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN),
+    SDLK_CRSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL),
+    SDLK_EXSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL),
+
+    SDLK_KP_00 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00),
+    SDLK_KP_000 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000),
+    SDLK_THOUSANDSSEPARATOR =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR),
+    SDLK_DECIMALSEPARATOR =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR),
+    SDLK_CURRENCYUNIT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT),
+    SDLK_CURRENCYSUBUNIT =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT),
+    SDLK_KP_LEFTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN),
+    SDLK_KP_RIGHTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN),
+    SDLK_KP_LEFTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE),
+    SDLK_KP_RIGHTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE),
+    SDLK_KP_TAB = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB),
+    SDLK_KP_BACKSPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE),
+    SDLK_KP_A = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A),
+    SDLK_KP_B = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B),
+    SDLK_KP_C = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C),
+    SDLK_KP_D = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D),
+    SDLK_KP_E = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E),
+    SDLK_KP_F = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F),
+    SDLK_KP_XOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR),
+    SDLK_KP_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER),
+    SDLK_KP_PERCENT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT),
+    SDLK_KP_LESS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS),
+    SDLK_KP_GREATER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER),
+    SDLK_KP_AMPERSAND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND),
+    SDLK_KP_DBLAMPERSAND =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND),
+    SDLK_KP_VERTICALBAR =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR),
+    SDLK_KP_DBLVERTICALBAR =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR),
+    SDLK_KP_COLON = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON),
+    SDLK_KP_HASH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH),
+    SDLK_KP_SPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE),
+    SDLK_KP_AT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT),
+    SDLK_KP_EXCLAM = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM),
+    SDLK_KP_MEMSTORE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE),
+    SDLK_KP_MEMRECALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL),
+    SDLK_KP_MEMCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR),
+    SDLK_KP_MEMADD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD),
+    SDLK_KP_MEMSUBTRACT =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT),
+    SDLK_KP_MEMMULTIPLY =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY),
+    SDLK_KP_MEMDIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE),
+    SDLK_KP_PLUSMINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS),
+    SDLK_KP_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR),
+    SDLK_KP_CLEARENTRY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY),
+    SDLK_KP_BINARY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY),
+    SDLK_KP_OCTAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL),
+    SDLK_KP_DECIMAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL),
+    SDLK_KP_HEXADECIMAL =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL),
+
+    SDLK_LCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL),
+    SDLK_LSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT),
+    SDLK_LALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT),
+    SDLK_LGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI),
+    SDLK_RCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL),
+    SDLK_RSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT),
+    SDLK_RALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT),
+    SDLK_RGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI),
+
+    SDLK_MODE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE),
+
+    SDLK_AUDIONEXT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT),
+    SDLK_AUDIOPREV = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV),
+    SDLK_AUDIOSTOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP),
+    SDLK_AUDIOPLAY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY),
+    SDLK_AUDIOMUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE),
+    SDLK_MEDIASELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT),
+    SDLK_WWW = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW),
+    SDLK_MAIL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL),
+    SDLK_CALCULATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR),
+    SDLK_COMPUTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER),
+    SDLK_AC_SEARCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH),
+    SDLK_AC_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME),
+    SDLK_AC_BACK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK),
+    SDLK_AC_FORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD),
+    SDLK_AC_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP),
+    SDLK_AC_REFRESH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH),
+    SDLK_AC_BOOKMARKS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS),
+
+    SDLK_BRIGHTNESSDOWN =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN),
+    SDLK_BRIGHTNESSUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP),
+    SDLK_DISPLAYSWITCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH),
+    SDLK_KBDILLUMTOGGLE =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE),
+    SDLK_KBDILLUMDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN),
+    SDLK_KBDILLUMUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP),
+    SDLK_EJECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT),
+    SDLK_SLEEP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP)
+};
+
+/**
+ * \brief Enumeration of valid key mods (possibly OR'd together).
+ */
+typedef enum
+{
+    KMOD_NONE = 0x0000,
+    KMOD_LSHIFT = 0x0001,
+    KMOD_RSHIFT = 0x0002,
+    KMOD_LCTRL = 0x0040,
+    KMOD_RCTRL = 0x0080,
+    KMOD_LALT = 0x0100,
+    KMOD_RALT = 0x0200,
+    KMOD_LGUI = 0x0400,
+    KMOD_RGUI = 0x0800,
+    KMOD_NUM = 0x1000,
+    KMOD_CAPS = 0x2000,
+    KMOD_MODE = 0x4000,
+    KMOD_RESERVED = 0x8000
+} SDL_Keymod;
+
+#define KMOD_CTRL   (KMOD_LCTRL|KMOD_RCTRL)
+#define KMOD_SHIFT  (KMOD_LSHIFT|KMOD_RSHIFT)
+#define KMOD_ALT    (KMOD_LALT|KMOD_RALT)
+#define KMOD_GUI    (KMOD_LGUI|KMOD_RGUI)
+
+#endif /* _SDL_keycode_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_loadso.h b/Source/3rd Party/sdl/include/SDL_loadso.h
new file mode 100644
index 000000000..0359eae17
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_loadso.h	
@@ -0,0 +1,81 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_loadso.h
+ *
+ *  System dependent library loading routines
+ *
+ *  Some things to keep in mind:
+ *  \li These functions only work on C function names.  Other languages may
+ *      have name mangling and intrinsic language support that varies from
+ *      compiler to compiler.
+ *  \li Make sure you declare your function pointers with the same calling
+ *      convention as the actual library function.  Your code will crash
+ *      mysteriously if you do not do this.
+ *  \li Avoid namespace collisions.  If you load a symbol from the library,
+ *      it is not defined whether or not it goes into the global symbol
+ *      namespace for the application.  If it does and it conflicts with
+ *      symbols in your code or other shared libraries, you will not get
+ *      the results you expect. :)
+ */
+
+#ifndef _SDL_loadso_h
+#define _SDL_loadso_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  This function dynamically loads a shared object and returns a pointer
+ *  to the object handle (or NULL if there was an error).
+ *  The 'sofile' parameter is a system dependent name of the object file.
+ */
+extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile);
+
+/**
+ *  Given an object handle, this function looks up the address of the
+ *  named function in the shared object and returns it.  This address
+ *  is no longer valid after calling SDL_UnloadObject().
+ */
+extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle,
+                                               const char *name);
+
+/**
+ *  Unload a shared object from memory.
+ */
+extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_loadso_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_log.h b/Source/3rd Party/sdl/include/SDL_log.h
new file mode 100644
index 000000000..5c2bca593
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_log.h	
@@ -0,0 +1,211 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_log.h
+ *
+ *  Simple log messages with categories and priorities.
+ *
+ *  By default logs are quiet, but if you're debugging SDL you might want:
+ *
+ *      SDL_LogSetAllPriority(SDL_LOG_PRIORITY_WARN);
+ *
+ *  Here's where the messages go on different platforms:
+ *      Windows: debug output stream
+ *      Android: log output
+ *      Others: standard error output (stderr)
+ */
+
+#ifndef _SDL_log_h
+#define _SDL_log_h
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ *  \brief The maximum size of a log message
+ *
+ *  Messages longer than the maximum size will be truncated
+ */
+#define SDL_MAX_LOG_MESSAGE 4096
+
+/**
+ *  \brief The predefined log categories
+ *
+ *  By default the application category is enabled at the INFO level,
+ *  the assert category is enabled at the WARN level, test is enabled
+ *  at the VERBOSE level and all other categories are enabled at the
+ *  CRITICAL level.
+ */
+enum
+{
+    SDL_LOG_CATEGORY_APPLICATION,
+    SDL_LOG_CATEGORY_ERROR,
+    SDL_LOG_CATEGORY_ASSERT,
+    SDL_LOG_CATEGORY_SYSTEM,
+    SDL_LOG_CATEGORY_AUDIO,
+    SDL_LOG_CATEGORY_VIDEO,
+    SDL_LOG_CATEGORY_RENDER,
+    SDL_LOG_CATEGORY_INPUT,
+    SDL_LOG_CATEGORY_TEST,
+
+    /* Reserved for future SDL library use */
+    SDL_LOG_CATEGORY_RESERVED1,
+    SDL_LOG_CATEGORY_RESERVED2,
+    SDL_LOG_CATEGORY_RESERVED3,
+    SDL_LOG_CATEGORY_RESERVED4,
+    SDL_LOG_CATEGORY_RESERVED5,
+    SDL_LOG_CATEGORY_RESERVED6,
+    SDL_LOG_CATEGORY_RESERVED7,
+    SDL_LOG_CATEGORY_RESERVED8,
+    SDL_LOG_CATEGORY_RESERVED9,
+    SDL_LOG_CATEGORY_RESERVED10,
+
+    /* Beyond this point is reserved for application use, e.g.
+       enum {
+           MYAPP_CATEGORY_AWESOME1 = SDL_LOG_CATEGORY_CUSTOM,
+           MYAPP_CATEGORY_AWESOME2,
+           MYAPP_CATEGORY_AWESOME3,
+           ...
+       };
+     */
+    SDL_LOG_CATEGORY_CUSTOM
+};
+
+/**
+ *  \brief The predefined log priorities
+ */
+typedef enum
+{
+    SDL_LOG_PRIORITY_VERBOSE = 1,
+    SDL_LOG_PRIORITY_DEBUG,
+    SDL_LOG_PRIORITY_INFO,
+    SDL_LOG_PRIORITY_WARN,
+    SDL_LOG_PRIORITY_ERROR,
+    SDL_LOG_PRIORITY_CRITICAL,
+    SDL_NUM_LOG_PRIORITIES
+} SDL_LogPriority;
+
+
+/**
+ *  \brief Set the priority of all log categories
+ */
+extern DECLSPEC void SDLCALL SDL_LogSetAllPriority(SDL_LogPriority priority);
+
+/**
+ *  \brief Set the priority of a particular log category
+ */
+extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category,
+                                                SDL_LogPriority priority);
+
+/**
+ *  \brief Get the priority of a particular log category
+ */
+extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category);
+
+/**
+ *  \brief Reset all priorities to default.
+ *
+ *  \note This is called in SDL_Quit().
+ */
+extern DECLSPEC void SDLCALL SDL_LogResetPriorities(void);
+
+/**
+ *  \brief Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO
+ */
+extern DECLSPEC void SDLCALL SDL_Log(const char *fmt, ...);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_VERBOSE
+ */
+extern DECLSPEC void SDLCALL SDL_LogVerbose(int category, const char *fmt, ...);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_DEBUG
+ */
+extern DECLSPEC void SDLCALL SDL_LogDebug(int category, const char *fmt, ...);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_INFO
+ */
+extern DECLSPEC void SDLCALL SDL_LogInfo(int category, const char *fmt, ...);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_WARN
+ */
+extern DECLSPEC void SDLCALL SDL_LogWarn(int category, const char *fmt, ...);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_ERROR
+ */
+extern DECLSPEC void SDLCALL SDL_LogError(int category, const char *fmt, ...);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_CRITICAL
+ */
+extern DECLSPEC void SDLCALL SDL_LogCritical(int category, const char *fmt, ...);
+
+/**
+ *  \brief Log a message with the specified category and priority.
+ */
+extern DECLSPEC void SDLCALL SDL_LogMessage(int category,
+                                            SDL_LogPriority priority,
+                                            const char *fmt, ...);
+
+/**
+ *  \brief Log a message with the specified category and priority.
+ */
+extern DECLSPEC void SDLCALL SDL_LogMessageV(int category,
+                                             SDL_LogPriority priority,
+                                             const char *fmt, va_list ap);
+
+/**
+ *  \brief The prototype for the log output function
+ */
+typedef void (*SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message);
+
+/**
+ *  \brief Get the current log output function.
+ */
+extern DECLSPEC void SDLCALL SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata);
+
+/**
+ *  \brief This function allows you to replace the default log output
+ *         function with one of your own.
+ */
+extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_log_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_main.h b/Source/3rd Party/sdl/include/SDL_main.h
new file mode 100644
index 000000000..2e8fae95e
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_main.h	
@@ -0,0 +1,155 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_main_h
+#define _SDL_main_h
+
+#include "SDL_stdinc.h"
+
+/**
+ *  \file SDL_main.h
+ *
+ *  Redefine main() on some platforms so that it is called by SDL.
+ */
+
+#ifndef SDL_MAIN_HANDLED
+#if defined(__WIN32__)
+/* On Windows SDL provides WinMain(), which parses the command line and passes
+   the arguments to your main function.
+
+   If you provide your own WinMain(), you may define SDL_MAIN_HANDLED
+ */
+#define SDL_MAIN_AVAILABLE
+
+#elif defined(__WINRT__)
+/* On WinRT, SDL provides a main function that initializes CoreApplication,
+   creating an instance of IFrameworkView in the process.
+
+   Please note that #include'ing SDL_main.h is not enough to get a main()
+   function working.  In non-XAML apps, the file,
+   src/main/winrt/SDL_WinRT_main_NonXAML.cpp, or a copy of it, must be compiled
+   into the app itself.  In XAML apps, the function, SDL_WinRTRunApp must be
+   called, with a pointer to the Direct3D-hosted XAML control passed in.
+*/
+#define SDL_MAIN_NEEDED
+
+#elif defined(__IPHONEOS__)
+/* On iOS SDL provides a main function that creates an application delegate
+   and starts the iOS application run loop.
+
+   See src/video/uikit/SDL_uikitappdelegate.m for more details.
+ */
+#define SDL_MAIN_NEEDED
+
+#elif defined(__ANDROID__)
+/* On Android SDL provides a Java class in SDLActivity.java that is the
+   main activity entry point.
+
+   See README-android.txt for more details on extending that class.
+ */
+#define SDL_MAIN_NEEDED
+
+#endif
+#endif /* SDL_MAIN_HANDLED */
+
+#ifdef __cplusplus
+#define C_LINKAGE   "C"
+#else
+#define C_LINKAGE
+#endif /* __cplusplus */
+
+/**
+ *  \file SDL_main.h
+ *
+ *  The application's main() function must be called with C linkage,
+ *  and should be declared like this:
+ *  \code
+ *  #ifdef __cplusplus
+ *  extern "C"
+ *  #endif
+ *  int main(int argc, char *argv[])
+ *  {
+ *  }
+ *  \endcode
+ */
+
+#if defined(SDL_MAIN_NEEDED) || defined(SDL_MAIN_AVAILABLE)
+#define main    SDL_main
+#endif
+
+/**
+ *  The prototype for the application's main() function
+ */
+extern C_LINKAGE int SDL_main(int argc, char *argv[]);
+
+
+#include "begin_code.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  This is called by the real SDL main function to let the rest of the
+ *  library know that initialization was done properly.
+ *
+ *  Calling this yourself without knowing what you're doing can cause
+ *  crashes and hard to diagnose problems with your application.
+ */
+extern DECLSPEC void SDLCALL SDL_SetMainReady(void);
+
+#ifdef __WIN32__
+
+/**
+ *  This can be called to set the application class at startup
+ */
+extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style,
+                                            void *hInst);
+extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
+
+#endif /* __WIN32__ */
+
+
+#ifdef __WINRT__
+
+/**
+ *  \brief Initializes and launches an SDL/WinRT application.
+ *
+ *  \param mainFunction The SDL app's C-style main().
+ *  \param xamlBackgroundPanel An optional, XAML-based, background panel.
+ *     For Non-XAML apps, this value must be set to NULL.  For XAML apps,
+ *     pass in a pointer to a SwapChainBackgroundPanel, casted to an
+ *     IInspectable (via reinterpret_cast).
+ *  \ret 0 on success, -1 on failure.  On failure, use SDL_GetError to retrieve more
+ *      information on the failure.
+ */
+extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), void * xamlBackgroundPanel);
+
+#endif /* __WINRT__ */
+
+
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_main_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_messagebox.h b/Source/3rd Party/sdl/include/SDL_messagebox.h
new file mode 100644
index 000000000..6004da0f5
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_messagebox.h	
@@ -0,0 +1,144 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_messagebox_h
+#define _SDL_messagebox_h
+
+#include "SDL_stdinc.h"
+#include "SDL_video.h"      /* For SDL_Window */
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief SDL_MessageBox flags. If supported will display warning icon, etc.
+ */
+typedef enum
+{
+    SDL_MESSAGEBOX_ERROR        = 0x00000010,   /**< error dialog */
+    SDL_MESSAGEBOX_WARNING      = 0x00000020,   /**< warning dialog */
+    SDL_MESSAGEBOX_INFORMATION  = 0x00000040    /**< informational dialog */
+} SDL_MessageBoxFlags;
+
+/**
+ * \brief Flags for SDL_MessageBoxButtonData.
+ */
+typedef enum
+{
+    SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT = 0x00000001,  /**< Marks the default button when return is hit */
+    SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT = 0x00000002   /**< Marks the default button when escape is hit */
+} SDL_MessageBoxButtonFlags;
+
+/**
+ *  \brief Individual button data.
+ */
+typedef struct
+{
+    Uint32 flags;       /**< ::SDL_MessageBoxButtonFlags */
+    int buttonid;       /**< User defined button id (value returned via SDL_ShowMessageBox) */
+    const char * text;  /**< The UTF-8 button text */
+} SDL_MessageBoxButtonData;
+
+/**
+ * \brief RGB value used in a message box color scheme
+ */
+typedef struct
+{
+    Uint8 r, g, b;
+} SDL_MessageBoxColor;
+
+typedef enum
+{
+    SDL_MESSAGEBOX_COLOR_BACKGROUND,
+    SDL_MESSAGEBOX_COLOR_TEXT,
+    SDL_MESSAGEBOX_COLOR_BUTTON_BORDER,
+    SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND,
+    SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED,
+    SDL_MESSAGEBOX_COLOR_MAX
+} SDL_MessageBoxColorType;
+
+/**
+ * \brief A set of colors to use for message box dialogs
+ */
+typedef struct
+{
+    SDL_MessageBoxColor colors[SDL_MESSAGEBOX_COLOR_MAX];
+} SDL_MessageBoxColorScheme;
+
+/**
+ *  \brief MessageBox structure containing title, text, window, etc.
+ */
+typedef struct
+{
+    Uint32 flags;                       /**< ::SDL_MessageBoxFlags */
+    SDL_Window *window;                 /**< Parent window, can be NULL */
+    const char *title;                  /**< UTF-8 title */
+    const char *message;                /**< UTF-8 message text */
+
+    int numbuttons;
+    const SDL_MessageBoxButtonData *buttons;
+
+    const SDL_MessageBoxColorScheme *colorScheme;   /**< ::SDL_MessageBoxColorScheme, can be NULL to use system settings */
+} SDL_MessageBoxData;
+
+/**
+ *  \brief Create a modal message box.
+ *
+ *  \param messageboxdata The SDL_MessageBoxData structure with title, text, etc.
+ *  \param buttonid The pointer to which user id of hit button should be copied.
+ *
+ *  \return -1 on error, otherwise 0 and buttonid contains user id of button
+ *          hit or -1 if dialog was closed.
+ *
+ *  \note This function should be called on the thread that created the parent
+ *        window, or on the main thread if the messagebox has no parent.  It will
+ *        block execution of that thread until the user clicks a button or
+ *        closes the messagebox.
+ */
+extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
+
+/**
+ *  \brief Create a simple modal message box
+ *
+ *  \param flags    ::SDL_MessageBoxFlags
+ *  \param title    UTF-8 title text
+ *  \param message  UTF-8 message text
+ *  \param window   The parent window, or NULL for no parent
+ *
+ *  \return 0 on success, -1 on error
+ *
+ *  \sa SDL_ShowMessageBox
+ */
+extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_messagebox_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_mouse.h b/Source/3rd Party/sdl/include/SDL_mouse.h
new file mode 100644
index 000000000..ebfd18fa7
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_mouse.h	
@@ -0,0 +1,224 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_mouse.h
+ *
+ *  Include file for SDL mouse event handling.
+ */
+
+#ifndef _SDL_mouse_h
+#define _SDL_mouse_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct SDL_Cursor SDL_Cursor;   /* Implementation dependent */
+
+/**
+ * \brief Cursor types for SDL_CreateSystemCursor.
+ */
+typedef enum
+{
+    SDL_SYSTEM_CURSOR_ARROW,     /**< Arrow */
+    SDL_SYSTEM_CURSOR_IBEAM,     /**< I-beam */
+    SDL_SYSTEM_CURSOR_WAIT,      /**< Wait */
+    SDL_SYSTEM_CURSOR_CROSSHAIR, /**< Crosshair */
+    SDL_SYSTEM_CURSOR_WAITARROW, /**< Small wait cursor (or Wait if not available) */
+    SDL_SYSTEM_CURSOR_SIZENWSE,  /**< Double arrow pointing northwest and southeast */
+    SDL_SYSTEM_CURSOR_SIZENESW,  /**< Double arrow pointing northeast and southwest */
+    SDL_SYSTEM_CURSOR_SIZEWE,    /**< Double arrow pointing west and east */
+    SDL_SYSTEM_CURSOR_SIZENS,    /**< Double arrow pointing north and south */
+    SDL_SYSTEM_CURSOR_SIZEALL,   /**< Four pointed arrow pointing north, south, east, and west */
+    SDL_SYSTEM_CURSOR_NO,        /**< Slashed circle or crossbones */
+    SDL_SYSTEM_CURSOR_HAND,      /**< Hand */
+    SDL_NUM_SYSTEM_CURSORS
+} SDL_SystemCursor;
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the window which currently has mouse focus.
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_GetMouseFocus(void);
+
+/**
+ *  \brief Retrieve the current state of the mouse.
+ *
+ *  The current button state is returned as a button bitmask, which can
+ *  be tested using the SDL_BUTTON(X) macros, and x and y are set to the
+ *  mouse cursor position relative to the focus window for the currently
+ *  selected mouse.  You can pass NULL for either x or y.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetMouseState(int *x, int *y);
+
+/**
+ *  \brief Retrieve the relative state of the mouse.
+ *
+ *  The current button state is returned as a button bitmask, which can
+ *  be tested using the SDL_BUTTON(X) macros, and x and y are set to the
+ *  mouse deltas since the last call to SDL_GetRelativeMouseState().
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetRelativeMouseState(int *x, int *y);
+
+/**
+ *  \brief Moves the mouse to the given position within the window.
+ *
+ *  \param window The window to move the mouse into, or NULL for the current mouse focus
+ *  \param x The x coordinate within the window
+ *  \param y The y coordinate within the window
+ *
+ *  \note This function generates a mouse motion event
+ */
+extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window,
+                                                   int x, int y);
+
+/**
+ *  \brief Set relative mouse mode.
+ *
+ *  \param enabled Whether or not to enable relative mode
+ *
+ *  \return 0 on success, or -1 if relative mode is not supported.
+ *
+ *  While the mouse is in relative mode, the cursor is hidden, and the
+ *  driver will try to report continuous motion in the current window.
+ *  Only relative motion events will be delivered, the mouse position
+ *  will not change.
+ *
+ *  \note This function will flush any pending mouse motion.
+ *
+ *  \sa SDL_GetRelativeMouseMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled);
+
+/**
+ *  \brief Query whether relative mouse mode is enabled.
+ *
+ *  \sa SDL_SetRelativeMouseMode()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void);
+
+/**
+ *  \brief Create a cursor, using the specified bitmap data and
+ *         mask (in MSB format).
+ *
+ *  The cursor width must be a multiple of 8 bits.
+ *
+ *  The cursor is created in black and white according to the following:
+ *  <table>
+ *  <tr><td> data </td><td> mask </td><td> resulting pixel on screen </td></tr>
+ *  <tr><td>  0   </td><td>  1   </td><td> White </td></tr>
+ *  <tr><td>  1   </td><td>  1   </td><td> Black </td></tr>
+ *  <tr><td>  0   </td><td>  0   </td><td> Transparent </td></tr>
+ *  <tr><td>  1   </td><td>  0   </td><td> Inverted color if possible, black
+ *                                         if not. </td></tr>
+ *  </table>
+ *
+ *  \sa SDL_FreeCursor()
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data,
+                                                     const Uint8 * mask,
+                                                     int w, int h, int hot_x,
+                                                     int hot_y);
+
+/**
+ *  \brief Create a color cursor.
+ *
+ *  \sa SDL_FreeCursor()
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface,
+                                                          int hot_x,
+                                                          int hot_y);
+
+/**
+ *  \brief Create a system cursor.
+ *
+ *  \sa SDL_FreeCursor()
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateSystemCursor(SDL_SystemCursor id);
+
+/**
+ *  \brief Set the active cursor.
+ */
+extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor);
+
+/**
+ *  \brief Return the active cursor.
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void);
+
+/**
+ *  \brief Return the default cursor.
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void);
+
+/**
+ *  \brief Frees a cursor created with SDL_CreateCursor().
+ *
+ *  \sa SDL_CreateCursor()
+ */
+extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor);
+
+/**
+ *  \brief Toggle whether or not the cursor is shown.
+ *
+ *  \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current
+ *                state.
+ *
+ *  \return 1 if the cursor is shown, or 0 if the cursor is hidden.
+ */
+extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
+
+/**
+ *  Used as a mask when testing buttons in buttonstate.
+ *   - Button 1:  Left mouse button
+ *   - Button 2:  Middle mouse button
+ *   - Button 3:  Right mouse button
+ */
+#define SDL_BUTTON(X)       (1 << ((X)-1))
+#define SDL_BUTTON_LEFT     1
+#define SDL_BUTTON_MIDDLE   2
+#define SDL_BUTTON_RIGHT    3
+#define SDL_BUTTON_X1       4
+#define SDL_BUTTON_X2       5
+#define SDL_BUTTON_LMASK    SDL_BUTTON(SDL_BUTTON_LEFT)
+#define SDL_BUTTON_MMASK    SDL_BUTTON(SDL_BUTTON_MIDDLE)
+#define SDL_BUTTON_RMASK    SDL_BUTTON(SDL_BUTTON_RIGHT)
+#define SDL_BUTTON_X1MASK   SDL_BUTTON(SDL_BUTTON_X1)
+#define SDL_BUTTON_X2MASK   SDL_BUTTON(SDL_BUTTON_X2)
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_mouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_mutex.h b/Source/3rd Party/sdl/include/SDL_mutex.h
new file mode 100644
index 000000000..3e8b4dbed
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_mutex.h	
@@ -0,0 +1,251 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_mutex_h
+#define _SDL_mutex_h
+
+/**
+ *  \file SDL_mutex.h
+ *
+ *  Functions to provide thread synchronization primitives.
+ */
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  Synchronization functions which can time out return this value
+ *  if they time out.
+ */
+#define SDL_MUTEX_TIMEDOUT  1
+
+/**
+ *  This is the timeout value which corresponds to never time out.
+ */
+#define SDL_MUTEX_MAXWAIT   (~(Uint32)0)
+
+
+/**
+ *  \name Mutex functions
+ */
+/* @{ */
+
+/* The SDL mutex structure, defined in SDL_sysmutex.c */
+struct SDL_mutex;
+typedef struct SDL_mutex SDL_mutex;
+
+/**
+ *  Create a mutex, initialized unlocked.
+ */
+extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void);
+
+/**
+ *  Lock the mutex.
+ *
+ *  \return 0, or -1 on error.
+ */
+#define SDL_mutexP(m)   SDL_LockMutex(m)
+extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex);
+
+/**
+ *  Try to lock the mutex
+ *
+ *  \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex);
+
+/**
+ *  Unlock the mutex.
+ *
+ *  \return 0, or -1 on error.
+ *
+ *  \warning It is an error to unlock a mutex that has not been locked by
+ *           the current thread, and doing so results in undefined behavior.
+ */
+#define SDL_mutexV(m)   SDL_UnlockMutex(m)
+extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex);
+
+/**
+ *  Destroy a mutex.
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex);
+
+/* @} *//* Mutex functions */
+
+
+/**
+ *  \name Semaphore functions
+ */
+/* @{ */
+
+/* The SDL semaphore structure, defined in SDL_syssem.c */
+struct SDL_semaphore;
+typedef struct SDL_semaphore SDL_sem;
+
+/**
+ *  Create a semaphore, initialized with value, returns NULL on failure.
+ */
+extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value);
+
+/**
+ *  Destroy a semaphore.
+ */
+extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem);
+
+/**
+ *  This function suspends the calling thread until the semaphore pointed
+ *  to by \c sem has a positive count. It then atomically decreases the
+ *  semaphore count.
+ */
+extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem);
+
+/**
+ *  Non-blocking variant of SDL_SemWait().
+ *
+ *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would
+ *          block, and -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem);
+
+/**
+ *  Variant of SDL_SemWait() with a timeout in milliseconds.
+ *
+ *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not
+ *          succeed in the allotted time, and -1 on error.
+ *
+ *  \warning On some platforms this function is implemented by looping with a
+ *           delay of 1 ms, and so should be avoided if possible.
+ */
+extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms);
+
+/**
+ *  Atomically increases the semaphore's count (not blocking).
+ *
+ *  \return 0, or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem);
+
+/**
+ *  Returns the current count of the semaphore.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem);
+
+/* @} *//* Semaphore functions */
+
+
+/**
+ *  \name Condition variable functions
+ */
+/* @{ */
+
+/* The SDL condition variable structure, defined in SDL_syscond.c */
+struct SDL_cond;
+typedef struct SDL_cond SDL_cond;
+
+/**
+ *  Create a condition variable.
+ *
+ *  Typical use of condition variables:
+ *
+ *  Thread A:
+ *    SDL_LockMutex(lock);
+ *    while ( ! condition ) {
+ *        SDL_CondWait(cond, lock);
+ *    }
+ *    SDL_UnlockMutex(lock);
+ *
+ *  Thread B:
+ *    SDL_LockMutex(lock);
+ *    ...
+ *    condition = true;
+ *    ...
+ *    SDL_CondSignal(cond);
+ *    SDL_UnlockMutex(lock);
+ *
+ *  There is some discussion whether to signal the condition variable
+ *  with the mutex locked or not.  There is some potential performance
+ *  benefit to unlocking first on some platforms, but there are some
+ *  potential race conditions depending on how your code is structured.
+ *
+ *  In general it's safer to signal the condition variable while the
+ *  mutex is locked.
+ */
+extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void);
+
+/**
+ *  Destroy a condition variable.
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond);
+
+/**
+ *  Restart one of the threads that are waiting on the condition variable.
+ *
+ *  \return 0 or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond);
+
+/**
+ *  Restart all threads that are waiting on the condition variable.
+ *
+ *  \return 0 or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond);
+
+/**
+ *  Wait on the condition variable, unlocking the provided mutex.
+ *
+ *  \warning The mutex must be locked before entering this function!
+ *
+ *  The mutex is re-locked once the condition variable is signaled.
+ *
+ *  \return 0 when it is signaled, or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex);
+
+/**
+ *  Waits for at most \c ms milliseconds, and returns 0 if the condition
+ *  variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not
+ *  signaled in the allotted time, and -1 on error.
+ *
+ *  \warning On some platforms this function is implemented by looping with a
+ *           delay of 1 ms, and so should be avoided if possible.
+ */
+extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
+                                                SDL_mutex * mutex, Uint32 ms);
+
+/* @} *//* Condition variable functions */
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_mutex_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_name.h b/Source/3rd Party/sdl/include/SDL_name.h
new file mode 100644
index 000000000..719666ff1
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_name.h	
@@ -0,0 +1,33 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDLname_h_
+#define _SDLname_h_
+
+#if defined(__STDC__) || defined(__cplusplus)
+#define NeedFunctionPrototypes 1
+#endif
+
+#define SDL_NAME(X) SDL_##X
+
+#endif /* _SDLname_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_opengl.h b/Source/3rd Party/sdl/include/SDL_opengl.h
new file mode 100644
index 000000000..f7ef7f8c2
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_opengl.h	
@@ -0,0 +1,11126 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_opengl.h
+ *
+ *  This is a simple file to encapsulate the OpenGL API headers.
+ */
+
+#ifndef _SDL_opengl_h
+#define _SDL_opengl_h
+
+#include "SDL_config.h"
+
+#ifndef __IPHONEOS__
+
+#ifdef __WIN32__
+//#define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
+#define NOMINMAX                /* Don't defined min() and max() */
+#endif
+#include <windows.h>
+#endif
+
+#ifdef __glext_h_
+/* Someone has already included glext.h */
+#define NO_SDL_GLEXT
+#endif
+#ifndef NO_SDL_GLEXT
+#define __glext_h_              /* Don't let gl.h include glext.h */
+#endif
+#if defined(__MACOSX__)
+#include <OpenGL/gl.h>          /* Header File For The OpenGL Library */
+#define __X_GL_H
+#else
+#include <GL/gl.h>              /* Header File For The OpenGL Library */
+#endif
+#ifndef NO_SDL_GLEXT
+#undef __glext_h_
+#endif
+
+/**
+ *  \file SDL_opengl.h
+ *
+ *  This file is included because glext.h is not available on some systems.
+ *  If you don't want this version included, simply define ::NO_SDL_GLEXT.
+ *
+ *  The latest version is available from:
+ *      http://www.opengl.org/registry/
+ */
+
+/**
+ *  \def NO_SDL_GLEXT
+ *
+ *  Define this if you have your own version of glext.h and want to disable the
+ *  version included in SDL_opengl.h.
+ */
+
+#if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY)
+#ifndef __glext_h_
+#define __glext_h_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007-2010 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Header file version number, required by OpenGL ABI for Linux */
+/* glext.h last updated $Date: 2010-08-03 01:30:25 -0700 (Tue, 03 Aug 2010) $ */
+/* Current version at http://www.opengl.org/registry/ */
+#define GL_GLEXT_VERSION 64
+/* Function declaration macros - to move into glplatform.h */
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+/*************************************************************/
+
+#ifndef GL_VERSION_1_2
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#endif
+
+#ifndef GL_VERSION_1_2_DEPRECATED
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+#endif
+
+#ifndef GL_ARB_imaging
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+#define GL_FUNC_ADD                       0x8006
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#endif
+
+#ifndef GL_ARB_imaging_DEPRECATED
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#endif
+
+#ifndef GL_VERSION_1_3_DEPRECATED
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#endif
+
+#ifndef GL_VERSION_1_4_DEPRECATED
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#endif
+
+#ifndef GL_VERSION_1_5_DEPRECATED
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_FOG_COORD_SRC                  0x8450
+#define GL_FOG_COORD                      0x8451
+#define GL_CURRENT_FOG_COORD              0x8453
+#define GL_FOG_COORD_ARRAY_TYPE           0x8454
+#define GL_FOG_COORD_ARRAY_STRIDE         0x8455
+#define GL_FOG_COORD_ARRAY_POINTER        0x8456
+#define GL_FOG_COORD_ARRAY                0x8457
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D
+#define GL_SRC0_RGB                       0x8580
+#define GL_SRC1_RGB                       0x8581
+#define GL_SRC2_RGB                       0x8582
+#define GL_SRC0_ALPHA                     0x8588
+#define GL_SRC1_ALPHA                     0x8589
+#define GL_SRC2_ALPHA                     0x858A
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_BLEND_EQUATION_RGB             0x8009
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#endif
+
+#ifndef GL_VERSION_2_0_DEPRECATED
+#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#define GL_MAX_TEXTURE_COORDS             0x8871
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#endif
+
+#ifndef GL_VERSION_2_1_DEPRECATED
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_SLUMINANCE_ALPHA               0x8C44
+#define GL_SLUMINANCE8_ALPHA8             0x8C45
+#define GL_SLUMINANCE                     0x8C46
+#define GL_SLUMINANCE8                    0x8C47
+#define GL_COMPRESSED_SLUMINANCE          0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_COMPARE_REF_TO_TEXTURE         0x884E
+#define GL_CLIP_DISTANCE0                 0x3000
+#define GL_CLIP_DISTANCE1                 0x3001
+#define GL_CLIP_DISTANCE2                 0x3002
+#define GL_CLIP_DISTANCE3                 0x3003
+#define GL_CLIP_DISTANCE4                 0x3004
+#define GL_CLIP_DISTANCE5                 0x3005
+#define GL_CLIP_DISTANCE6                 0x3006
+#define GL_CLIP_DISTANCE7                 0x3007
+#define GL_MAX_CLIP_DISTANCES             0x0D32
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
+#define GL_NUM_EXTENSIONS                 0x821D
+#define GL_CONTEXT_FLAGS                  0x821E
+#define GL_DEPTH_BUFFER                   0x8223
+#define GL_STENCIL_BUFFER                 0x8224
+#define GL_COMPRESSED_RED                 0x8225
+#define GL_COMPRESSED_RG                  0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001
+#define GL_RGBA32F                        0x8814
+#define GL_RGB32F                         0x8815
+#define GL_RGBA16F                        0x881A
+#define GL_RGB16F                         0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
+#define GL_CLAMP_READ_COLOR               0x891C
+#define GL_FIXED_ONLY                     0x891D
+#define GL_MAX_VARYING_COMPONENTS         0x8B4B
+#define GL_TEXTURE_1D_ARRAY               0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
+#define GL_TEXTURE_2D_ARRAY               0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
+#define GL_R11F_G11F_B10F                 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
+#define GL_RGB9_E5                        0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
+#define GL_TEXTURE_SHARED_SIZE            0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED           0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD             0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS            0x8C8C
+#define GL_SEPARATE_ATTRIBS               0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI                       0x8D70
+#define GL_RGB32UI                        0x8D71
+#define GL_RGBA16UI                       0x8D76
+#define GL_RGB16UI                        0x8D77
+#define GL_RGBA8UI                        0x8D7C
+#define GL_RGB8UI                         0x8D7D
+#define GL_RGBA32I                        0x8D82
+#define GL_RGB32I                         0x8D83
+#define GL_RGBA16I                        0x8D88
+#define GL_RGB16I                         0x8D89
+#define GL_RGBA8I                         0x8D8E
+#define GL_RGB8I                          0x8D8F
+#define GL_RED_INTEGER                    0x8D94
+#define GL_GREEN_INTEGER                  0x8D95
+#define GL_BLUE_INTEGER                   0x8D96
+#define GL_RGB_INTEGER                    0x8D98
+#define GL_RGBA_INTEGER                   0x8D99
+#define GL_BGR_INTEGER                    0x8D9A
+#define GL_BGRA_INTEGER                   0x8D9B
+#define GL_SAMPLER_1D_ARRAY               0x8DC0
+#define GL_SAMPLER_2D_ARRAY               0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
+#define GL_UNSIGNED_INT_VEC2              0x8DC6
+#define GL_UNSIGNED_INT_VEC3              0x8DC7
+#define GL_UNSIGNED_INT_VEC4              0x8DC8
+#define GL_INT_SAMPLER_1D                 0x8DC9
+#define GL_INT_SAMPLER_2D                 0x8DCA
+#define GL_INT_SAMPLER_3D                 0x8DCB
+#define GL_INT_SAMPLER_CUBE               0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
+#define GL_QUERY_WAIT                     0x8E13
+#define GL_QUERY_NO_WAIT                  0x8E14
+#define GL_QUERY_BY_REGION_WAIT           0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+#define GL_BUFFER_ACCESS_FLAGS            0x911F
+#define GL_BUFFER_MAP_LENGTH              0x9120
+#define GL_BUFFER_MAP_OFFSET              0x9121
+/* Reuse tokens from ARB_depth_buffer_float */
+/* reuse GL_DEPTH_COMPONENT32F */
+/* reuse GL_DEPTH32F_STENCIL8 */
+/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_DEFAULT */
+/* reuse GL_FRAMEBUFFER_UNDEFINED */
+/* reuse GL_DEPTH_STENCIL_ATTACHMENT */
+/* reuse GL_INDEX */
+/* reuse GL_MAX_RENDERBUFFER_SIZE */
+/* reuse GL_DEPTH_STENCIL */
+/* reuse GL_UNSIGNED_INT_24_8 */
+/* reuse GL_DEPTH24_STENCIL8 */
+/* reuse GL_TEXTURE_STENCIL_SIZE */
+/* reuse GL_TEXTURE_RED_TYPE */
+/* reuse GL_TEXTURE_GREEN_TYPE */
+/* reuse GL_TEXTURE_BLUE_TYPE */
+/* reuse GL_TEXTURE_ALPHA_TYPE */
+/* reuse GL_TEXTURE_DEPTH_TYPE */
+/* reuse GL_UNSIGNED_NORMALIZED */
+/* reuse GL_FRAMEBUFFER_BINDING */
+/* reuse GL_DRAW_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_BINDING */
+/* reuse GL_READ_FRAMEBUFFER */
+/* reuse GL_DRAW_FRAMEBUFFER */
+/* reuse GL_READ_FRAMEBUFFER_BINDING */
+/* reuse GL_RENDERBUFFER_SAMPLES */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* reuse GL_FRAMEBUFFER_COMPLETE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+/* reuse GL_FRAMEBUFFER_UNSUPPORTED */
+/* reuse GL_MAX_COLOR_ATTACHMENTS */
+/* reuse GL_COLOR_ATTACHMENT0 */
+/* reuse GL_COLOR_ATTACHMENT1 */
+/* reuse GL_COLOR_ATTACHMENT2 */
+/* reuse GL_COLOR_ATTACHMENT3 */
+/* reuse GL_COLOR_ATTACHMENT4 */
+/* reuse GL_COLOR_ATTACHMENT5 */
+/* reuse GL_COLOR_ATTACHMENT6 */
+/* reuse GL_COLOR_ATTACHMENT7 */
+/* reuse GL_COLOR_ATTACHMENT8 */
+/* reuse GL_COLOR_ATTACHMENT9 */
+/* reuse GL_COLOR_ATTACHMENT10 */
+/* reuse GL_COLOR_ATTACHMENT11 */
+/* reuse GL_COLOR_ATTACHMENT12 */
+/* reuse GL_COLOR_ATTACHMENT13 */
+/* reuse GL_COLOR_ATTACHMENT14 */
+/* reuse GL_COLOR_ATTACHMENT15 */
+/* reuse GL_DEPTH_ATTACHMENT */
+/* reuse GL_STENCIL_ATTACHMENT */
+/* reuse GL_FRAMEBUFFER */
+/* reuse GL_RENDERBUFFER */
+/* reuse GL_RENDERBUFFER_WIDTH */
+/* reuse GL_RENDERBUFFER_HEIGHT */
+/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */
+/* reuse GL_STENCIL_INDEX1 */
+/* reuse GL_STENCIL_INDEX4 */
+/* reuse GL_STENCIL_INDEX8 */
+/* reuse GL_STENCIL_INDEX16 */
+/* reuse GL_RENDERBUFFER_RED_SIZE */
+/* reuse GL_RENDERBUFFER_GREEN_SIZE */
+/* reuse GL_RENDERBUFFER_BLUE_SIZE */
+/* reuse GL_RENDERBUFFER_ALPHA_SIZE */
+/* reuse GL_RENDERBUFFER_DEPTH_SIZE */
+/* reuse GL_RENDERBUFFER_STENCIL_SIZE */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+/* reuse GL_MAX_SAMPLES */
+/* Reuse tokens from ARB_framebuffer_sRGB */
+/* reuse GL_FRAMEBUFFER_SRGB */
+/* Reuse tokens from ARB_half_float_vertex */
+/* reuse GL_HALF_FLOAT */
+/* Reuse tokens from ARB_map_buffer_range */
+/* reuse GL_MAP_READ_BIT */
+/* reuse GL_MAP_WRITE_BIT */
+/* reuse GL_MAP_INVALIDATE_RANGE_BIT */
+/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */
+/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */
+/* reuse GL_MAP_UNSYNCHRONIZED_BIT */
+/* Reuse tokens from ARB_texture_compression_rgtc */
+/* reuse GL_COMPRESSED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */
+/* reuse GL_COMPRESSED_RG_RGTC2 */
+/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */
+/* Reuse tokens from ARB_texture_rg */
+/* reuse GL_RG */
+/* reuse GL_RG_INTEGER */
+/* reuse GL_R8 */
+/* reuse GL_R16 */
+/* reuse GL_RG8 */
+/* reuse GL_RG16 */
+/* reuse GL_R16F */
+/* reuse GL_R32F */
+/* reuse GL_RG16F */
+/* reuse GL_RG32F */
+/* reuse GL_R8I */
+/* reuse GL_R8UI */
+/* reuse GL_R16I */
+/* reuse GL_R16UI */
+/* reuse GL_R32I */
+/* reuse GL_R32UI */
+/* reuse GL_RG8I */
+/* reuse GL_RG8UI */
+/* reuse GL_RG16I */
+/* reuse GL_RG16UI */
+/* reuse GL_RG32I */
+/* reuse GL_RG32UI */
+/* Reuse tokens from ARB_vertex_array_object */
+/* reuse GL_VERTEX_ARRAY_BINDING */
+#endif
+
+#ifndef GL_VERSION_3_0_DEPRECATED
+#define GL_CLAMP_VERTEX_COLOR             0x891A
+#define GL_CLAMP_FRAGMENT_COLOR           0x891B
+#define GL_ALPHA_INTEGER                  0x8D97
+/* Reuse tokens from ARB_framebuffer_object */
+/* reuse GL_TEXTURE_LUMINANCE_TYPE */
+/* reuse GL_TEXTURE_INTENSITY_TYPE */
+#endif
+
+#ifndef GL_VERSION_3_1
+#define GL_SAMPLER_2D_RECT                0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
+#define GL_SAMPLER_BUFFER                 0x8DC2
+#define GL_INT_SAMPLER_2D_RECT            0x8DCD
+#define GL_INT_SAMPLER_BUFFER             0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
+#define GL_TEXTURE_BUFFER                 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT          0x8C2E
+#define GL_TEXTURE_RECTANGLE              0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
+#define GL_RED_SNORM                      0x8F90
+#define GL_RG_SNORM                       0x8F91
+#define GL_RGB_SNORM                      0x8F92
+#define GL_RGBA_SNORM                     0x8F93
+#define GL_R8_SNORM                       0x8F94
+#define GL_RG8_SNORM                      0x8F95
+#define GL_RGB8_SNORM                     0x8F96
+#define GL_RGBA8_SNORM                    0x8F97
+#define GL_R16_SNORM                      0x8F98
+#define GL_RG16_SNORM                     0x8F99
+#define GL_RGB16_SNORM                    0x8F9A
+#define GL_RGBA16_SNORM                   0x8F9B
+#define GL_SIGNED_NORMALIZED              0x8F9C
+#define GL_PRIMITIVE_RESTART              0x8F9D
+#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
+/* Reuse tokens from ARB_copy_buffer */
+/* reuse GL_COPY_READ_BUFFER */
+/* reuse GL_COPY_WRITE_BUFFER */
+/* Reuse tokens from ARB_draw_instanced (none) */
+/* Reuse tokens from ARB_uniform_buffer_object */
+/* reuse GL_UNIFORM_BUFFER */
+/* reuse GL_UNIFORM_BUFFER_BINDING */
+/* reuse GL_UNIFORM_BUFFER_START */
+/* reuse GL_UNIFORM_BUFFER_SIZE */
+/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */
+/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */
+/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */
+/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */
+/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */
+/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */
+/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */
+/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */
+/* reuse GL_ACTIVE_UNIFORM_BLOCKS */
+/* reuse GL_UNIFORM_TYPE */
+/* reuse GL_UNIFORM_SIZE */
+/* reuse GL_UNIFORM_NAME_LENGTH */
+/* reuse GL_UNIFORM_BLOCK_INDEX */
+/* reuse GL_UNIFORM_OFFSET */
+/* reuse GL_UNIFORM_ARRAY_STRIDE */
+/* reuse GL_UNIFORM_MATRIX_STRIDE */
+/* reuse GL_UNIFORM_IS_ROW_MAJOR */
+/* reuse GL_UNIFORM_BLOCK_BINDING */
+/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */
+/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */
+/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */
+/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */
+/* reuse GL_INVALID_INDEX */
+#endif
+
+#ifndef GL_VERSION_3_2
+#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
+#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define GL_LINES_ADJACENCY                0x000A
+#define GL_LINE_STRIP_ADJACENCY           0x000B
+#define GL_TRIANGLES_ADJACENCY            0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
+#define GL_PROGRAM_POINT_SIZE             0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
+#define GL_GEOMETRY_SHADER                0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT          0x8916
+#define GL_GEOMETRY_INPUT_TYPE            0x8917
+#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
+#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
+#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
+#define GL_CONTEXT_PROFILE_MASK           0x9126
+/* reuse GL_MAX_VARYING_COMPONENTS */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+/* Reuse tokens from ARB_depth_clamp */
+/* reuse GL_DEPTH_CLAMP */
+/* Reuse tokens from ARB_draw_elements_base_vertex (none) */
+/* Reuse tokens from ARB_fragment_coord_conventions (none) */
+/* Reuse tokens from ARB_provoking_vertex */
+/* reuse GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+/* reuse GL_FIRST_VERTEX_CONVENTION */
+/* reuse GL_LAST_VERTEX_CONVENTION */
+/* reuse GL_PROVOKING_VERTEX */
+/* Reuse tokens from ARB_seamless_cube_map */
+/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS */
+/* Reuse tokens from ARB_sync */
+/* reuse GL_MAX_SERVER_WAIT_TIMEOUT */
+/* reuse GL_OBJECT_TYPE */
+/* reuse GL_SYNC_CONDITION */
+/* reuse GL_SYNC_STATUS */
+/* reuse GL_SYNC_FLAGS */
+/* reuse GL_SYNC_FENCE */
+/* reuse GL_SYNC_GPU_COMMANDS_COMPLETE */
+/* reuse GL_UNSIGNALED */
+/* reuse GL_SIGNALED */
+/* reuse GL_ALREADY_SIGNALED */
+/* reuse GL_TIMEOUT_EXPIRED */
+/* reuse GL_CONDITION_SATISFIED */
+/* reuse GL_WAIT_FAILED */
+/* reuse GL_TIMEOUT_IGNORED */
+/* reuse GL_SYNC_FLUSH_COMMANDS_BIT */
+/* reuse GL_TIMEOUT_IGNORED */
+/* Reuse tokens from ARB_texture_multisample */
+/* reuse GL_SAMPLE_POSITION */
+/* reuse GL_SAMPLE_MASK */
+/* reuse GL_SAMPLE_MASK_VALUE */
+/* reuse GL_MAX_SAMPLE_MASK_WORDS */
+/* reuse GL_TEXTURE_2D_MULTISAMPLE */
+/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE */
+/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE */
+/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_TEXTURE_SAMPLES */
+/* reuse GL_TEXTURE_FIXED_SAMPLE_LOCATIONS */
+/* reuse GL_SAMPLER_2D_MULTISAMPLE */
+/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE */
+/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE */
+/* reuse GL_SAMPLER_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */
+/* reuse GL_MAX_COLOR_TEXTURE_SAMPLES */
+/* reuse GL_MAX_DEPTH_TEXTURE_SAMPLES */
+/* reuse GL_MAX_INTEGER_SAMPLES */
+/* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */
+#endif
+
+#ifndef GL_VERSION_3_3
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR    0x88FE
+/* Reuse tokens from ARB_blend_func_extended */
+/* reuse GL_SRC1_COLOR */
+/* reuse GL_ONE_MINUS_SRC1_COLOR */
+/* reuse GL_ONE_MINUS_SRC1_ALPHA */
+/* reuse GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */
+/* Reuse tokens from ARB_explicit_attrib_location (none) */
+/* Reuse tokens from ARB_occlusion_query2 */
+/* reuse GL_ANY_SAMPLES_PASSED */
+/* Reuse tokens from ARB_sampler_objects */
+/* reuse GL_SAMPLER_BINDING */
+/* Reuse tokens from ARB_shader_bit_encoding (none) */
+/* Reuse tokens from ARB_texture_rgb10_a2ui */
+/* reuse GL_RGB10_A2UI */
+/* Reuse tokens from ARB_texture_swizzle */
+/* reuse GL_TEXTURE_SWIZZLE_R */
+/* reuse GL_TEXTURE_SWIZZLE_G */
+/* reuse GL_TEXTURE_SWIZZLE_B */
+/* reuse GL_TEXTURE_SWIZZLE_A */
+/* reuse GL_TEXTURE_SWIZZLE_RGBA */
+/* Reuse tokens from ARB_timer_query */
+/* reuse GL_TIME_ELAPSED */
+/* reuse GL_TIMESTAMP */
+/* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */
+/* reuse GL_INT_2_10_10_10_REV */
+#endif
+
+#ifndef GL_VERSION_4_0
+#define GL_SAMPLE_SHADING                 0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F
+#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
+/* Reuse tokens from ARB_texture_query_lod (none) */
+/* Reuse tokens from ARB_draw_buffers_blend (none) */
+/* Reuse tokens from ARB_draw_indirect */
+/* reuse GL_DRAW_INDIRECT_BUFFER */
+/* reuse GL_DRAW_INDIRECT_BUFFER_BINDING */
+/* Reuse tokens from ARB_gpu_shader5 */
+/* reuse GL_GEOMETRY_SHADER_INVOCATIONS */
+/* reuse GL_MAX_GEOMETRY_SHADER_INVOCATIONS */
+/* reuse GL_MIN_FRAGMENT_INTERPOLATION_OFFSET */
+/* reuse GL_MAX_FRAGMENT_INTERPOLATION_OFFSET */
+/* reuse GL_FRAGMENT_INTERPOLATION_OFFSET_BITS */
+/* reuse GL_MAX_VERTEX_STREAMS */
+/* Reuse tokens from ARB_gpu_shader_fp64 */
+/* reuse GL_DOUBLE_VEC2 */
+/* reuse GL_DOUBLE_VEC3 */
+/* reuse GL_DOUBLE_VEC4 */
+/* reuse GL_DOUBLE_MAT2 */
+/* reuse GL_DOUBLE_MAT3 */
+/* reuse GL_DOUBLE_MAT4 */
+/* reuse GL_DOUBLE_MAT2x3 */
+/* reuse GL_DOUBLE_MAT2x4 */
+/* reuse GL_DOUBLE_MAT3x2 */
+/* reuse GL_DOUBLE_MAT3x4 */
+/* reuse GL_DOUBLE_MAT4x2 */
+/* reuse GL_DOUBLE_MAT4x3 */
+/* Reuse tokens from ARB_shader_subroutine */
+/* reuse GL_ACTIVE_SUBROUTINES */
+/* reuse GL_ACTIVE_SUBROUTINE_UNIFORMS */
+/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS */
+/* reuse GL_ACTIVE_SUBROUTINE_MAX_LENGTH */
+/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH */
+/* reuse GL_MAX_SUBROUTINES */
+/* reuse GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS */
+/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */
+/* reuse GL_COMPATIBLE_SUBROUTINES */
+/* Reuse tokens from ARB_tessellation_shader */
+/* reuse GL_PATCHES */
+/* reuse GL_PATCH_VERTICES */
+/* reuse GL_PATCH_DEFAULT_INNER_LEVEL */
+/* reuse GL_PATCH_DEFAULT_OUTER_LEVEL */
+/* reuse GL_TESS_CONTROL_OUTPUT_VERTICES */
+/* reuse GL_TESS_GEN_MODE */
+/* reuse GL_TESS_GEN_SPACING */
+/* reuse GL_TESS_GEN_VERTEX_ORDER */
+/* reuse GL_TESS_GEN_POINT_MODE */
+/* reuse GL_ISOLINES */
+/* reuse GL_FRACTIONAL_ODD */
+/* reuse GL_FRACTIONAL_EVEN */
+/* reuse GL_MAX_PATCH_VERTICES */
+/* reuse GL_MAX_TESS_GEN_LEVEL */
+/* reuse GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS */
+/* reuse GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS */
+/* reuse GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_PATCH_COMPONENTS */
+/* reuse GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS */
+/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS */
+/* reuse GL_MAX_TESS_CONTROL_INPUT_COMPONENTS */
+/* reuse GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS */
+/* reuse GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS */
+/* reuse GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER */
+/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER */
+/* reuse GL_TESS_EVALUATION_SHADER */
+/* reuse GL_TESS_CONTROL_SHADER */
+/* Reuse tokens from ARB_texture_buffer_object_rgb32 (none) */
+/* Reuse tokens from ARB_transform_feedback2 */
+/* reuse GL_TRANSFORM_FEEDBACK */
+/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+/* reuse GL_TRANSFORM_FEEDBACK_BINDING */
+/* Reuse tokens from ARB_transform_feedback3 */
+/* reuse GL_MAX_TRANSFORM_FEEDBACK_BUFFERS */
+/* reuse GL_MAX_VERTEX_STREAMS */
+#endif
+
+#ifndef GL_VERSION_4_1
+/* Reuse tokens from ARB_ES2_compatibility */
+/* reuse GL_FIXED */
+/* reuse GL_IMPLEMENTATION_COLOR_READ_TYPE */
+/* reuse GL_IMPLEMENTATION_COLOR_READ_FORMAT */
+/* reuse GL_LOW_FLOAT */
+/* reuse GL_MEDIUM_FLOAT */
+/* reuse GL_HIGH_FLOAT */
+/* reuse GL_LOW_INT */
+/* reuse GL_MEDIUM_INT */
+/* reuse GL_HIGH_INT */
+/* reuse GL_SHADER_COMPILER */
+/* reuse GL_NUM_SHADER_BINARY_FORMATS */
+/* reuse GL_MAX_VERTEX_UNIFORM_VECTORS */
+/* reuse GL_MAX_VARYING_VECTORS */
+/* reuse GL_MAX_FRAGMENT_UNIFORM_VECTORS */
+/* Reuse tokens from ARB_get_program_binary */
+/* reuse GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+/* reuse GL_PROGRAM_BINARY_LENGTH */
+/* reuse GL_NUM_PROGRAM_BINARY_FORMATS */
+/* reuse GL_PROGRAM_BINARY_FORMATS */
+/* Reuse tokens from ARB_separate_shader_objects */
+/* reuse GL_VERTEX_SHADER_BIT */
+/* reuse GL_FRAGMENT_SHADER_BIT */
+/* reuse GL_GEOMETRY_SHADER_BIT */
+/* reuse GL_TESS_CONTROL_SHADER_BIT */
+/* reuse GL_TESS_EVALUATION_SHADER_BIT */
+/* reuse GL_ALL_SHADER_BITS */
+/* reuse GL_PROGRAM_SEPARABLE */
+/* reuse GL_ACTIVE_PROGRAM */
+/* reuse GL_PROGRAM_PIPELINE_BINDING */
+/* Reuse tokens from ARB_shader_precision (none) */
+/* Reuse tokens from ARB_vertex_attrib_64bit - all are in GL 3.0 and 4.0 already */
+/* Reuse tokens from ARB_viewport_array - some are in GL 1.1 and ARB_provoking_vertex already */
+/* reuse GL_MAX_VIEWPORTS */
+/* reuse GL_VIEWPORT_SUBPIXEL_BITS */
+/* reuse GL_VIEWPORT_BOUNDS_RANGE */
+/* reuse GL_LAYER_PROVOKING_VERTEX */
+/* reuse GL_VIEWPORT_INDEX_PROVOKING_VERTEX */
+/* reuse GL_UNDEFINED_VERTEX */
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif
+
+#ifndef GL_ARB_window_pos
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_SAMPLER_1D_ARB                 0x8B5D
+#define GL_SAMPLER_2D_ARB                 0x8B5E
+#define GL_SAMPLER_3D_ARB                 0x8B5F
+#define GL_SAMPLER_CUBE_ARB               0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
+#define GL_SAMPLER_2D_RECT_ARB            0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#endif
+
+#ifndef GL_ARB_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
+#define GL_DRAW_BUFFER0_ARB               0x8825
+#define GL_DRAW_BUFFER1_ARB               0x8826
+#define GL_DRAW_BUFFER2_ARB               0x8827
+#define GL_DRAW_BUFFER3_ARB               0x8828
+#define GL_DRAW_BUFFER4_ARB               0x8829
+#define GL_DRAW_BUFFER5_ARB               0x882A
+#define GL_DRAW_BUFFER6_ARB               0x882B
+#define GL_DRAW_BUFFER7_ARB               0x882C
+#define GL_DRAW_BUFFER8_ARB               0x882D
+#define GL_DRAW_BUFFER9_ARB               0x882E
+#define GL_DRAW_BUFFER10_ARB              0x882F
+#define GL_DRAW_BUFFER11_ARB              0x8830
+#define GL_DRAW_BUFFER12_ARB              0x8831
+#define GL_DRAW_BUFFER13_ARB              0x8832
+#define GL_DRAW_BUFFER14_ARB              0x8833
+#define GL_DRAW_BUFFER15_ARB              0x8834
+#endif
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_RGBA_FLOAT_MODE_ARB            0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
+#define GL_CLAMP_READ_COLOR_ARB           0x891C
+#define GL_FIXED_ONLY_ARB                 0x891D
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif
+
+#ifndef GL_ARB_texture_float
+#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
+#define GL_RGBA32F_ARB                    0x8814
+#define GL_RGB32F_ARB                     0x8815
+#define GL_ALPHA32F_ARB                   0x8816
+#define GL_INTENSITY32F_ARB               0x8817
+#define GL_LUMINANCE32F_ARB               0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
+#define GL_RGBA16F_ARB                    0x881A
+#define GL_RGB16F_ARB                     0x881B
+#define GL_ALPHA16F_ARB                   0x881C
+#define GL_INTENSITY16F_ARB               0x881D
+#define GL_LUMINANCE16F_ARB               0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
+#endif
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+#endif
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#endif
+
+#ifndef GL_ARB_draw_instanced
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT            0x8218
+#define GL_FRAMEBUFFER_UNDEFINED          0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+#define GL_DEPTH_STENCIL                  0x84F9
+#define GL_UNSIGNED_INT_24_8              0x84FA
+#define GL_DEPTH24_STENCIL8               0x88F0
+#define GL_TEXTURE_STENCIL_SIZE           0x88F1
+#define GL_TEXTURE_RED_TYPE               0x8C10
+#define GL_TEXTURE_GREEN_TYPE             0x8C11
+#define GL_TEXTURE_BLUE_TYPE              0x8C12
+#define GL_TEXTURE_ALPHA_TYPE             0x8C13
+#define GL_TEXTURE_DEPTH_TYPE             0x8C16
+#define GL_UNSIGNED_NORMALIZED            0x8C17
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING       GL_FRAMEBUFFER_BINDING
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
+#define GL_RENDERBUFFER_SAMPLES           0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_COLOR_ATTACHMENT1              0x8CE1
+#define GL_COLOR_ATTACHMENT2              0x8CE2
+#define GL_COLOR_ATTACHMENT3              0x8CE3
+#define GL_COLOR_ATTACHMENT4              0x8CE4
+#define GL_COLOR_ATTACHMENT5              0x8CE5
+#define GL_COLOR_ATTACHMENT6              0x8CE6
+#define GL_COLOR_ATTACHMENT7              0x8CE7
+#define GL_COLOR_ATTACHMENT8              0x8CE8
+#define GL_COLOR_ATTACHMENT9              0x8CE9
+#define GL_COLOR_ATTACHMENT10             0x8CEA
+#define GL_COLOR_ATTACHMENT11             0x8CEB
+#define GL_COLOR_ATTACHMENT12             0x8CEC
+#define GL_COLOR_ATTACHMENT13             0x8CED
+#define GL_COLOR_ATTACHMENT14             0x8CEE
+#define GL_COLOR_ATTACHMENT15             0x8CEF
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_STENCIL_INDEX1                 0x8D46
+#define GL_STENCIL_INDEX4                 0x8D47
+#define GL_STENCIL_INDEX8                 0x8D48
+#define GL_STENCIL_INDEX16                0x8D49
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES                    0x8D57
+#endif
+
+#ifndef GL_ARB_framebuffer_object_DEPRECATED
+#define GL_INDEX                          0x8222
+#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#endif
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_LINES_ADJACENCY_ARB            0x000A
+#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
+#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
+#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
+#define GL_GEOMETRY_SHADER_ARB            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+/* reuse GL_MAX_VARYING_COMPONENTS */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+#endif
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_HALF_FLOAT                     0x140B
+#endif
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#endif
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_TEXTURE_BUFFER_ARB             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING           0x85B5
+#endif
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_UNIFORM_BUFFER                 0x8A11
+#define GL_UNIFORM_BUFFER_BINDING         0x8A28
+#define GL_UNIFORM_BUFFER_START           0x8A29
+#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
+#define GL_UNIFORM_TYPE                   0x8A37
+#define GL_UNIFORM_SIZE                   0x8A38
+#define GL_UNIFORM_NAME_LENGTH            0x8A39
+#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
+#define GL_UNIFORM_OFFSET                 0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
+#define GL_INVALID_INDEX                  0xFFFFFFFFu
+#endif
+
+#ifndef GL_ARB_compatibility
+/* ARB_compatibility just defines tokens from core 3.0 */
+#endif
+
+#ifndef GL_ARB_copy_buffer
+#define GL_COPY_READ_BUFFER               0x8F36
+#define GL_COPY_WRITE_BUFFER              0x8F37
+#endif
+
+#ifndef GL_ARB_shader_texture_lod
+#endif
+
+#ifndef GL_ARB_depth_clamp
+#define GL_DEPTH_CLAMP                    0x864F
+#endif
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#endif
+
+#ifndef GL_ARB_fragment_coord_conventions
+#endif
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
+#define GL_LAST_VERTEX_CONVENTION         0x8E4E
+#define GL_PROVOKING_VERTEX               0x8E4F
+#endif
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
+#endif
+
+#ifndef GL_ARB_sync
+#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
+#define GL_OBJECT_TYPE                    0x9112
+#define GL_SYNC_CONDITION                 0x9113
+#define GL_SYNC_STATUS                    0x9114
+#define GL_SYNC_FLAGS                     0x9115
+#define GL_SYNC_FENCE                     0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
+#define GL_UNSIGNALED                     0x9118
+#define GL_SIGNALED                       0x9119
+#define GL_ALREADY_SIGNALED               0x911A
+#define GL_TIMEOUT_EXPIRED                0x911B
+#define GL_CONDITION_SATISFIED            0x911C
+#define GL_WAIT_FAILED                    0x911D
+#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
+#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
+#endif
+
+#ifndef GL_ARB_texture_multisample
+#define GL_SAMPLE_POSITION                0x8E50
+#define GL_SAMPLE_MASK                    0x8E51
+#define GL_SAMPLE_MASK_VALUE              0x8E52
+#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
+#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
+#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
+#define GL_TEXTURE_SAMPLES                0x9106
+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
+#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
+#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
+#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
+#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
+#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
+#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
+#define GL_MAX_INTEGER_SAMPLES            0x9110
+#endif
+
+#ifndef GL_ARB_vertex_array_bgra
+/* reuse GL_BGRA */
+#endif
+
+#ifndef GL_ARB_draw_buffers_blend
+#endif
+
+#ifndef GL_ARB_sample_shading
+#define GL_SAMPLE_SHADING_ARB             0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE_ARB   0x8C37
+#endif
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB     0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB     0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F
+#endif
+
+#ifndef GL_ARB_texture_gather
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
+#endif
+
+#ifndef GL_ARB_texture_query_lod
+#endif
+
+#ifndef GL_ARB_shading_language_include
+#define GL_SHADER_INCLUDE_ARB             0x8DAE
+#define GL_NAMED_STRING_LENGTH_ARB        0x8DE9
+#define GL_NAMED_STRING_TYPE_ARB          0x8DEA
+#endif
+
+#ifndef GL_ARB_texture_compression_bptc
+#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
+#endif
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_SRC1_COLOR                     0x88F9
+/* reuse GL_SRC1_ALPHA */
+#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
+#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
+#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
+#endif
+
+#ifndef GL_ARB_explicit_attrib_location
+#endif
+
+#ifndef GL_ARB_occlusion_query2
+#define GL_ANY_SAMPLES_PASSED             0x8C2F
+#endif
+
+#ifndef GL_ARB_sampler_objects
+#define GL_SAMPLER_BINDING                0x8919
+#endif
+
+#ifndef GL_ARB_shader_bit_encoding
+#endif
+
+#ifndef GL_ARB_texture_rgb10_a2ui
+#define GL_RGB10_A2UI                     0x906F
+#endif
+
+#ifndef GL_ARB_texture_swizzle
+#define GL_TEXTURE_SWIZZLE_R              0x8E42
+#define GL_TEXTURE_SWIZZLE_G              0x8E43
+#define GL_TEXTURE_SWIZZLE_B              0x8E44
+#define GL_TEXTURE_SWIZZLE_A              0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
+#endif
+
+#ifndef GL_ARB_timer_query
+#define GL_TIME_ELAPSED                   0x88BF
+#define GL_TIMESTAMP                      0x8E28
+#endif
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+/* reuse GL_UNSIGNED_INT_2_10_10_10_REV */
+#define GL_INT_2_10_10_10_REV             0x8D9F
+#endif
+
+#ifndef GL_ARB_draw_indirect
+#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
+#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
+#endif
+
+#ifndef GL_ARB_gpu_shader5
+#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
+#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
+/* reuse GL_MAX_VERTEX_STREAMS */
+#endif
+
+#ifndef GL_ARB_gpu_shader_fp64
+/* reuse GL_DOUBLE */
+#define GL_DOUBLE_VEC2                    0x8FFC
+#define GL_DOUBLE_VEC3                    0x8FFD
+#define GL_DOUBLE_VEC4                    0x8FFE
+#define GL_DOUBLE_MAT2                    0x8F46
+#define GL_DOUBLE_MAT3                    0x8F47
+#define GL_DOUBLE_MAT4                    0x8F48
+#define GL_DOUBLE_MAT2x3                  0x8F49
+#define GL_DOUBLE_MAT2x4                  0x8F4A
+#define GL_DOUBLE_MAT3x2                  0x8F4B
+#define GL_DOUBLE_MAT3x4                  0x8F4C
+#define GL_DOUBLE_MAT4x2                  0x8F4D
+#define GL_DOUBLE_MAT4x3                  0x8F4E
+#endif
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ACTIVE_SUBROUTINES             0x8DE5
+#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
+#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
+#define GL_MAX_SUBROUTINES                0x8DE7
+#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
+#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
+#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
+/* reuse GL_UNIFORM_SIZE */
+/* reuse GL_UNIFORM_NAME_LENGTH */
+#endif
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_PATCHES                        0x000E
+#define GL_PATCH_VERTICES                 0x8E72
+#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
+#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
+#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
+#define GL_TESS_GEN_MODE                  0x8E76
+#define GL_TESS_GEN_SPACING               0x8E77
+#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
+#define GL_TESS_GEN_POINT_MODE            0x8E79
+/* reuse GL_TRIANGLES */
+/* reuse GL_QUADS */
+#define GL_ISOLINES                       0x8E7A
+/* reuse GL_EQUAL */
+#define GL_FRACTIONAL_ODD                 0x8E7B
+#define GL_FRACTIONAL_EVEN                0x8E7C
+/* reuse GL_CCW */
+/* reuse GL_CW */
+#define GL_MAX_PATCH_VERTICES             0x8E7D
+#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
+#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
+#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
+#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
+#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
+#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
+#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
+#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
+#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
+#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
+#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
+#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
+#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
+#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
+#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
+#define GL_TESS_EVALUATION_SHADER         0x8E87
+#define GL_TESS_CONTROL_SHADER            0x8E88
+#endif
+
+#ifndef GL_ARB_texture_buffer_object_rgb32
+/* reuse GL_RGB32F */
+/* reuse GL_RGB32UI */
+/* reuse GL_RGB32I */
+#endif
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_TRANSFORM_FEEDBACK             0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
+#endif
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
+#define GL_MAX_VERTEX_STREAMS             0x8E71
+#endif
+
+#ifndef GL_ARB_ES2_compatibility
+#define GL_FIXED                          0x140C
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
+#define GL_LOW_FLOAT                      0x8DF0
+#define GL_MEDIUM_FLOAT                   0x8DF1
+#define GL_HIGH_FLOAT                     0x8DF2
+#define GL_LOW_INT                        0x8DF3
+#define GL_MEDIUM_INT                     0x8DF4
+#define GL_HIGH_INT                       0x8DF5
+#define GL_SHADER_COMPILER                0x8DFA
+#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
+#define GL_MAX_VERTEX_UNIFORM_VECTORS     0x8DFB
+#define GL_MAX_VARYING_VECTORS            0x8DFC
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS   0x8DFD
+#endif
+
+#ifndef GL_ARB_get_program_binary
+#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
+#define GL_PROGRAM_BINARY_LENGTH          0x8741
+#define GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
+#define GL_PROGRAM_BINARY_FORMATS         0x87FF
+#endif
+
+#ifndef GL_ARB_separate_shader_objects
+#define GL_VERTEX_SHADER_BIT              0x00000001
+#define GL_FRAGMENT_SHADER_BIT            0x00000002
+#define GL_GEOMETRY_SHADER_BIT            0x00000004
+#define GL_TESS_CONTROL_SHADER_BIT        0x00000008
+#define GL_TESS_EVALUATION_SHADER_BIT     0x00000010
+#define GL_ALL_SHADER_BITS                0xFFFFFFFF
+#define GL_PROGRAM_SEPARABLE              0x8258
+#define GL_ACTIVE_PROGRAM                 0x8259
+#define GL_PROGRAM_PIPELINE_BINDING       0x825A
+#endif
+
+#ifndef GL_ARB_shader_precision
+#endif
+
+#ifndef GL_ARB_vertex_attrib_64bit
+/* reuse GL_RGB32I */
+/* reuse GL_DOUBLE_VEC2 */
+/* reuse GL_DOUBLE_VEC3 */
+/* reuse GL_DOUBLE_VEC4 */
+/* reuse GL_DOUBLE_MAT2 */
+/* reuse GL_DOUBLE_MAT3 */
+/* reuse GL_DOUBLE_MAT4 */
+/* reuse GL_DOUBLE_MAT2x3 */
+/* reuse GL_DOUBLE_MAT2x4 */
+/* reuse GL_DOUBLE_MAT3x2 */
+/* reuse GL_DOUBLE_MAT3x4 */
+/* reuse GL_DOUBLE_MAT4x2 */
+/* reuse GL_DOUBLE_MAT4x3 */
+#endif
+
+#ifndef GL_ARB_viewport_array
+/* reuse GL_SCISSOR_BOX */
+/* reuse GL_VIEWPORT */
+/* reuse GL_DEPTH_RANGE */
+/* reuse GL_SCISSOR_TEST */
+#define GL_MAX_VIEWPORTS                  0x825B
+#define GL_VIEWPORT_SUBPIXEL_BITS         0x825C
+#define GL_VIEWPORT_BOUNDS_RANGE          0x825D
+#define GL_LAYER_PROVOKING_VERTEX         0x825E
+#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
+#define GL_UNDEFINED_VERTEX               0x8260
+/* reuse GL_FIRST_VERTEX_CONVENTION */
+/* reuse GL_LAST_VERTEX_CONVENTION */
+/* reuse GL_PROVOKING_VERTEX */
+#endif
+
+#ifndef GL_ARB_cl_event
+#define GL_SYNC_CL_EVENT_ARB              0x8240
+#define GL_SYNC_CL_EVENT_COMPLETE_ARB     0x8241
+#endif
+
+#ifndef GL_ARB_debug_output
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB   0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION_ARB    0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM_ARB  0x8245
+#define GL_DEBUG_SOURCE_API_ARB           0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB   0x8249
+#define GL_DEBUG_SOURCE_APPLICATION_ARB   0x824A
+#define GL_DEBUG_SOURCE_OTHER_ARB         0x824B
+#define GL_DEBUG_TYPE_ERROR_ARB           0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E
+#define GL_DEBUG_TYPE_PORTABILITY_ARB     0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE_ARB     0x8250
+#define GL_DEBUG_TYPE_OTHER_ARB           0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB   0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_ARB      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_ARB        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_ARB      0x9147
+#define GL_DEBUG_SEVERITY_LOW_ARB         0x9148
+#endif
+
+#ifndef GL_ARB_robustness
+/* reuse GL_NO_ERROR */
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define GL_LOSE_CONTEXT_ON_RESET_ARB      0x8252
+#define GL_GUILTY_CONTEXT_RESET_ARB       0x8253
+#define GL_INNOCENT_CONTEXT_RESET_ARB     0x8254
+#define GL_UNKNOWN_CONTEXT_RESET_ARB      0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define GL_NO_RESET_NOTIFICATION_ARB      0x8261
+#endif
+
+#ifndef GL_ARB_shader_stencil_export
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_ABGR_EXT                       0x8000
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+#endif
+
+#ifndef GL_EXT_subtexture
+#endif
+
+#ifndef GL_EXT_copy_texture
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+#endif
+
+#ifndef GL_SGI_color_matrix
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_BLEND_EQUATION_EXT             0x8009
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_INTERLACE_SGIX                 0x8094
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif
+
+#ifndef GL_SGIS_texture_select
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#endif
+
+#ifndef GL_FfdMaskSGIX
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif
+
+#ifndef GL_INGR_palette_buffer
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif
+
+#ifndef GL_EXT_color_subtable
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_LIST_PRIORITY_SGIX             0x8182
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif
+
+#ifndef GL_EXT_index_texture
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+/* reuse GL_FRAGMENT_DEPTH_EXT */
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif
+
+#ifndef GL_SGIX_impact_pixel_texture
+#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
+#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
+#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
+#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
+#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
+#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
+#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_ASYNC_MARKER_SGIX              0x8329
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif
+
+#ifndef GL_INTEL_texture_scissor
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_FOG_SCALE_SGIX                 0x81FC
+#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+#endif
+
+#ifndef GL_SUN_vertex
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+/* reuse GL_TEXTURE0_ARB */
+/* reuse GL_TEXTURE1_ARB */
+/* reuse GL_ZERO */
+/* reuse GL_NONE */
+/* reuse GL_FOG */
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+/* reuse GL_EYE_PLANE */
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif
+
+#ifndef GL_NV_blend_square
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#endif
+
+#ifndef GL_MESA_window_pos
+#endif
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_CULL_VERTEX_IBM                103050
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif
+
+#ifndef GL_SGI_depth_pass_instrument
+#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
+#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
+#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_PACK_RESAMPLE_SGIX             0x842C
+#define GL_UNPACK_RESAMPLE_SGIX           0x842D
+#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif
+
+#ifndef GL_NV_fence
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+#endif
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif
+
+#ifndef GL_OML_resample
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_ELEMENT_ARRAY_APPLE            0x8A0C
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8A0D
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x8A0E
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CLIENT_APPLE           0x85B4
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_YCBCR_422_APPLE                0x85B9
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+#endif
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_HALF_FLOAT_NV                  0x140B
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif
+
+#ifndef GL_NV_vertex_program2
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#endif
+
+#ifndef GL_OES_read_format
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_BLEND_EQUATION_RGB_EXT         0x8009
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_PACK_INVERT_MESA               0x8758
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+#endif
+
+#ifndef GL_NV_fragment_program_option
+#endif
+
+#ifndef GL_NV_fragment_program2
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
+#endif
+
+#ifndef GL_NV_vertex_program2_option
+/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
+#endif
+
+#ifndef GL_NV_vertex_program3
+/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
+#define GL_FRAMEBUFFER_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT             0x8D46
+#define GL_STENCIL_INDEX4_EXT             0x8D47
+#define GL_STENCIL_INDEX8_EXT             0x8D48
+#define GL_STENCIL_INDEX16_EXT            0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#endif
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_DEPTH_STENCIL_EXT              0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
+#define GL_DEPTH24_STENCIL8_EXT           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
+#endif
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_STENCIL_TAG_BITS_EXT           0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
+#endif
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_SRGB_EXT                       0x8C40
+#define GL_SRGB8_EXT                      0x8C41
+#define GL_SRGB_ALPHA_EXT                 0x8C42
+#define GL_SRGB8_ALPHA8_EXT               0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
+#define GL_SLUMINANCE_EXT                 0x8C46
+#define GL_SLUMINANCE8_EXT                0x8C47
+#define GL_COMPRESSED_SRGB_EXT            0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   GL_FRAMEBUFFER_BINDING_EXT
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
+#endif
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT                0x8D57
+#endif
+
+#ifndef GL_MESAX_texture_stack
+#define GL_TEXTURE_1D_STACK_MESAX         0x8759
+#define GL_TEXTURE_2D_STACK_MESAX         0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+#endif
+
+#ifndef GL_EXT_timer_query
+#define GL_TIME_ELAPSED_EXT               0x88BF
+#endif
+
+#ifndef GL_EXT_gpu_program_parameters
+#endif
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
+#endif
+
+#ifndef GL_NV_gpu_program4
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+#endif
+
+#ifndef GL_NV_geometry_program4
+#define GL_LINES_ADJACENCY_EXT            0x000A
+#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
+#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
+#define GL_GEOMETRY_PROGRAM_NV            0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
+#endif
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_GEOMETRY_SHADER_EXT            0x8DD9
+/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */
+/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */
+/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */
+/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+/* reuse GL_LINES_ADJACENCY_EXT */
+/* reuse GL_LINE_STRIP_ADJACENCY_EXT */
+/* reuse GL_TRIANGLES_ADJACENCY_EXT */
+/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */
+/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+/* reuse GL_PROGRAM_POINT_SIZE_EXT */
+#endif
+
+#ifndef GL_NV_vertex_program4
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+#endif
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_SAMPLER_BUFFER_EXT             0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
+#define GL_INT_SAMPLER_1D_EXT             0x8DC9
+#define GL_INT_SAMPLER_2D_EXT             0x8DCA
+#define GL_INT_SAMPLER_3D_EXT             0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+#endif
+
+#ifndef GL_EXT_draw_instanced
+#endif
+
+#ifndef GL_EXT_packed_float
+#define GL_R11F_G11F_B10F_EXT             0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
+#endif
+
+#ifndef GL_EXT_texture_array
+#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+#endif
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_TEXTURE_BUFFER_EXT             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
+#endif
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+#endif
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_RGB9_E5_EXT                    0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
+#endif
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
+#endif
+
+#ifndef GL_NV_fragment_program4
+#endif
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
+#endif
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
+#endif
+
+#ifndef GL_NV_geometry_shader4
+#endif
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+#endif
+
+#ifndef GL_EXT_draw_buffers2
+#endif
+
+#ifndef GL_NV_transform_feedback
+#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
+#define GL_TEXTURE_COORD_NV               0x8C79
+#define GL_CLIP_DISTANCE_NV               0x8C7A
+#define GL_VERTEX_ID_NV                   0x8C7B
+#define GL_PRIMITIVE_ID_NV                0x8C7C
+#define GL_GENERIC_ATTRIB_NV              0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV             0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
+#define GL_PRIMITIVES_GENERATED_NV        0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV          0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+#define GL_LAYER_NV                       0x8DAA
+#define GL_NEXT_BUFFER_NV                 -2
+#define GL_SKIP_COMPONENTS4_NV            -3
+#define GL_SKIP_COMPONENTS3_NV            -4
+#define GL_SKIP_COMPONENTS2_NV            -5
+#define GL_SKIP_COMPONENTS1_NV            -6
+#endif
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
+#define GL_UNIFORM_BUFFER_EXT             0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
+#endif
+
+#ifndef GL_EXT_texture_integer
+#define GL_RGBA32UI_EXT                   0x8D70
+#define GL_RGB32UI_EXT                    0x8D71
+#define GL_ALPHA32UI_EXT                  0x8D72
+#define GL_INTENSITY32UI_EXT              0x8D73
+#define GL_LUMINANCE32UI_EXT              0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
+#define GL_RGBA16UI_EXT                   0x8D76
+#define GL_RGB16UI_EXT                    0x8D77
+#define GL_ALPHA16UI_EXT                  0x8D78
+#define GL_INTENSITY16UI_EXT              0x8D79
+#define GL_LUMINANCE16UI_EXT              0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
+#define GL_RGBA8UI_EXT                    0x8D7C
+#define GL_RGB8UI_EXT                     0x8D7D
+#define GL_ALPHA8UI_EXT                   0x8D7E
+#define GL_INTENSITY8UI_EXT               0x8D7F
+#define GL_LUMINANCE8UI_EXT               0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
+#define GL_RGBA32I_EXT                    0x8D82
+#define GL_RGB32I_EXT                     0x8D83
+#define GL_ALPHA32I_EXT                   0x8D84
+#define GL_INTENSITY32I_EXT               0x8D85
+#define GL_LUMINANCE32I_EXT               0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
+#define GL_RGBA16I_EXT                    0x8D88
+#define GL_RGB16I_EXT                     0x8D89
+#define GL_ALPHA16I_EXT                   0x8D8A
+#define GL_INTENSITY16I_EXT               0x8D8B
+#define GL_LUMINANCE16I_EXT               0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
+#define GL_RGBA8I_EXT                     0x8D8E
+#define GL_RGB8I_EXT                      0x8D8F
+#define GL_ALPHA8I_EXT                    0x8D90
+#define GL_INTENSITY8I_EXT                0x8D91
+#define GL_LUMINANCE8I_EXT                0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
+#define GL_RED_INTEGER_EXT                0x8D94
+#define GL_GREEN_INTEGER_EXT              0x8D95
+#define GL_BLUE_INTEGER_EXT               0x8D96
+#define GL_ALPHA_INTEGER_EXT              0x8D97
+#define GL_RGB_INTEGER_EXT                0x8D98
+#define GL_RGBA_INTEGER_EXT               0x8D99
+#define GL_BGR_INTEGER_EXT                0x8D9A
+#define GL_BGRA_INTEGER_EXT               0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
+#endif
+
+#ifndef GL_GREMEDY_frame_terminator
+#endif
+
+#ifndef GL_NV_conditional_render
+#define GL_QUERY_WAIT_NV                  0x8E13
+#define GL_QUERY_NO_WAIT_NV               0x8E14
+#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
+#endif
+
+#ifndef GL_NV_present_video
+#define GL_FRAME_NV                       0x8E26
+#define GL_FIELDS_NV                      0x8E27
+#define GL_CURRENT_TIME_NV                0x8E28
+#define GL_NUM_FILL_STREAMS_NV            0x8E29
+#define GL_PRESENT_TIME_NV                0x8E2A
+#define GL_PRESENT_DURATION_NV            0x8E2B
+#endif
+
+#ifndef GL_EXT_transform_feedback
+#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
+#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
+#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
+#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
+#define GL_RASTERIZER_DISCARD_EXT         0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
+#endif
+
+#ifndef GL_EXT_direct_state_access
+#define GL_PROGRAM_MATRIX_EXT             0x8E2D
+#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
+#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
+#endif
+
+#ifndef GL_EXT_vertex_array_bgra
+/* reuse GL_BGRA */
+#endif
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
+#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
+#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
+#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
+#endif
+
+#ifndef GL_NV_explicit_multisample
+#define GL_SAMPLE_POSITION_NV             0x8E50
+#define GL_SAMPLE_MASK_NV                 0x8E51
+#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
+#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
+#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
+#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
+#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
+#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
+#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
+#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
+#endif
+
+#ifndef GL_NV_transform_feedback2
+#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
+#endif
+
+#ifndef GL_ATI_meminfo
+#define GL_VBO_FREE_MEMORY_ATI            0x87FB
+#define GL_TEXTURE_FREE_MEMORY_ATI        0x87FC
+#define GL_RENDERBUFFER_FREE_MEMORY_ATI   0x87FD
+#endif
+
+#ifndef GL_AMD_performance_monitor
+#define GL_COUNTER_TYPE_AMD               0x8BC0
+#define GL_COUNTER_RANGE_AMD              0x8BC1
+#define GL_UNSIGNED_INT64_AMD             0x8BC2
+#define GL_PERCENTAGE_AMD                 0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD   0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD        0x8BC5
+#define GL_PERFMON_RESULT_AMD             0x8BC6
+#endif
+
+#ifndef GL_AMD_texture_texture4
+#endif
+
+#ifndef GL_AMD_vertex_shader_tesselator
+#define GL_SAMPLER_BUFFER_AMD             0x9001
+#define GL_INT_SAMPLER_BUFFER_AMD         0x9002
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
+#define GL_TESSELLATION_MODE_AMD          0x9004
+#define GL_TESSELLATION_FACTOR_AMD        0x9005
+#define GL_DISCRETE_AMD                   0x9006
+#define GL_CONTINUOUS_AMD                 0x9007
+#endif
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION_EXT    0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT     0x8E4E
+#define GL_PROVOKING_VERTEX_EXT           0x8E4F
+#endif
+
+#ifndef GL_EXT_texture_snorm
+#define GL_ALPHA_SNORM                    0x9010
+#define GL_LUMINANCE_SNORM                0x9011
+#define GL_LUMINANCE_ALPHA_SNORM          0x9012
+#define GL_INTENSITY_SNORM                0x9013
+#define GL_ALPHA8_SNORM                   0x9014
+#define GL_LUMINANCE8_SNORM               0x9015
+#define GL_LUMINANCE8_ALPHA8_SNORM        0x9016
+#define GL_INTENSITY8_SNORM               0x9017
+#define GL_ALPHA16_SNORM                  0x9018
+#define GL_LUMINANCE16_SNORM              0x9019
+#define GL_LUMINANCE16_ALPHA16_SNORM      0x901A
+#define GL_INTENSITY16_SNORM              0x901B
+/* reuse GL_RED_SNORM */
+/* reuse GL_RG_SNORM */
+/* reuse GL_RGB_SNORM */
+/* reuse GL_RGBA_SNORM */
+/* reuse GL_R8_SNORM */
+/* reuse GL_RG8_SNORM */
+/* reuse GL_RGB8_SNORM */
+/* reuse GL_RGBA8_SNORM */
+/* reuse GL_R16_SNORM */
+/* reuse GL_RG16_SNORM */
+/* reuse GL_RGB16_SNORM */
+/* reuse GL_RGBA16_SNORM */
+/* reuse GL_SIGNED_NORMALIZED */
+#endif
+
+#ifndef GL_AMD_draw_buffers_blend
+#endif
+
+#ifndef GL_APPLE_texture_range
+#define GL_TEXTURE_RANGE_LENGTH_APPLE     0x85B7
+#define GL_TEXTURE_RANGE_POINTER_APPLE    0x85B8
+#define GL_TEXTURE_STORAGE_HINT_APPLE     0x85BC
+#define GL_STORAGE_PRIVATE_APPLE          0x85BD
+/* reuse GL_STORAGE_CACHED_APPLE */
+/* reuse GL_STORAGE_SHARED_APPLE */
+#endif
+
+#ifndef GL_APPLE_float_pixels
+#define GL_HALF_APPLE                     0x140B
+#define GL_RGBA_FLOAT32_APPLE             0x8814
+#define GL_RGB_FLOAT32_APPLE              0x8815
+#define GL_ALPHA_FLOAT32_APPLE            0x8816
+#define GL_INTENSITY_FLOAT32_APPLE        0x8817
+#define GL_LUMINANCE_FLOAT32_APPLE        0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE  0x8819
+#define GL_RGBA_FLOAT16_APPLE             0x881A
+#define GL_RGB_FLOAT16_APPLE              0x881B
+#define GL_ALPHA_FLOAT16_APPLE            0x881C
+#define GL_INTENSITY_FLOAT16_APPLE        0x881D
+#define GL_LUMINANCE_FLOAT16_APPLE        0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE  0x881F
+#define GL_COLOR_FLOAT_APPLE              0x8A0F
+#endif
+
+#ifndef GL_APPLE_vertex_program_evaluators
+#define GL_VERTEX_ATTRIB_MAP1_APPLE       0x8A00
+#define GL_VERTEX_ATTRIB_MAP2_APPLE       0x8A01
+#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE  0x8A02
+#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
+#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
+#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
+#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE  0x8A06
+#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
+#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
+#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
+#endif
+
+#ifndef GL_APPLE_aux_depth_stencil
+#define GL_AUX_DEPTH_STENCIL_APPLE        0x8A14
+#endif
+
+#ifndef GL_APPLE_object_purgeable
+#define GL_BUFFER_OBJECT_APPLE            0x85B3
+#define GL_RELEASED_APPLE                 0x8A19
+#define GL_VOLATILE_APPLE                 0x8A1A
+#define GL_RETAINED_APPLE                 0x8A1B
+#define GL_UNDEFINED_APPLE                0x8A1C
+#define GL_PURGEABLE_APPLE                0x8A1D
+#endif
+
+#ifndef GL_APPLE_row_bytes
+#define GL_PACK_ROW_BYTES_APPLE           0x8A15
+#define GL_UNPACK_ROW_BYTES_APPLE         0x8A16
+#endif
+
+#ifndef GL_APPLE_rgb_422
+#define GL_RGB_422_APPLE                  0x8A1F
+/* reuse GL_UNSIGNED_SHORT_8_8_APPLE */
+/* reuse GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+#endif
+
+#ifndef GL_NV_video_capture
+#define GL_VIDEO_BUFFER_NV                0x9020
+#define GL_VIDEO_BUFFER_BINDING_NV        0x9021
+#define GL_FIELD_UPPER_NV                 0x9022
+#define GL_FIELD_LOWER_NV                 0x9023
+#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV   0x9024
+#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
+#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
+#define GL_LAST_VIDEO_CAPTURE_STATUS_NV   0x9027
+#define GL_VIDEO_BUFFER_PITCH_NV          0x9028
+#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
+#define GL_VIDEO_COLOR_CONVERSION_MAX_NV  0x902A
+#define GL_VIDEO_COLOR_CONVERSION_MIN_NV  0x902B
+#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
+#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
+#define GL_PARTIAL_SUCCESS_NV             0x902E
+#define GL_SUCCESS_NV                     0x902F
+#define GL_FAILURE_NV                     0x9030
+#define GL_YCBYCR8_422_NV                 0x9031
+#define GL_YCBAYCR8A_4224_NV              0x9032
+#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV  0x9033
+#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
+#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV  0x9035
+#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
+#define GL_Z4Y12Z4CB12Z4CR12_444_NV       0x9037
+#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV   0x9038
+#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV  0x9039
+#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
+#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
+#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
+#endif
+
+#ifndef GL_NV_copy_image
+#endif
+
+#ifndef GL_EXT_separate_shader_objects
+#define GL_ACTIVE_PROGRAM_EXT             0x8B8D
+#endif
+
+#ifndef GL_NV_parameter_buffer_object2
+#endif
+
+#ifndef GL_NV_shader_buffer_load
+#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
+#define GL_GPU_ADDRESS_NV                 0x8F34
+#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
+#endif
+
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
+#define GL_ELEMENT_ARRAY_UNIFIED_NV       0x8F1F
+#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
+#define GL_VERTEX_ARRAY_ADDRESS_NV        0x8F21
+#define GL_NORMAL_ARRAY_ADDRESS_NV        0x8F22
+#define GL_COLOR_ARRAY_ADDRESS_NV         0x8F23
+#define GL_INDEX_ARRAY_ADDRESS_NV         0x8F24
+#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
+#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV     0x8F26
+#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
+#define GL_FOG_COORD_ARRAY_ADDRESS_NV     0x8F28
+#define GL_ELEMENT_ARRAY_ADDRESS_NV       0x8F29
+#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV  0x8F2A
+#define GL_VERTEX_ARRAY_LENGTH_NV         0x8F2B
+#define GL_NORMAL_ARRAY_LENGTH_NV         0x8F2C
+#define GL_COLOR_ARRAY_LENGTH_NV          0x8F2D
+#define GL_INDEX_ARRAY_LENGTH_NV          0x8F2E
+#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV  0x8F2F
+#define GL_EDGE_FLAG_ARRAY_LENGTH_NV      0x8F30
+#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
+#define GL_FOG_COORD_ARRAY_LENGTH_NV      0x8F32
+#define GL_ELEMENT_ARRAY_LENGTH_NV        0x8F33
+#define GL_DRAW_INDIRECT_UNIFIED_NV       0x8F40
+#define GL_DRAW_INDIRECT_ADDRESS_NV       0x8F41
+#define GL_DRAW_INDIRECT_LENGTH_NV        0x8F42
+#endif
+
+#ifndef GL_NV_texture_barrier
+#endif
+
+#ifndef GL_AMD_shader_stencil_export
+#endif
+
+#ifndef GL_AMD_seamless_cubemap_per_texture
+/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB */
+#endif
+
+#ifndef GL_AMD_conservative_depth
+#endif
+
+#ifndef GL_EXT_shader_image_load_store
+#define GL_MAX_IMAGE_UNITS_EXT            0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39
+#define GL_IMAGE_BINDING_NAME_EXT         0x8F3A
+#define GL_IMAGE_BINDING_LEVEL_EXT        0x8F3B
+#define GL_IMAGE_BINDING_LAYERED_EXT      0x8F3C
+#define GL_IMAGE_BINDING_LAYER_EXT        0x8F3D
+#define GL_IMAGE_BINDING_ACCESS_EXT       0x8F3E
+#define GL_IMAGE_1D_EXT                   0x904C
+#define GL_IMAGE_2D_EXT                   0x904D
+#define GL_IMAGE_3D_EXT                   0x904E
+#define GL_IMAGE_2D_RECT_EXT              0x904F
+#define GL_IMAGE_CUBE_EXT                 0x9050
+#define GL_IMAGE_BUFFER_EXT               0x9051
+#define GL_IMAGE_1D_ARRAY_EXT             0x9052
+#define GL_IMAGE_2D_ARRAY_EXT             0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY_EXT       0x9054
+#define GL_IMAGE_2D_MULTISAMPLE_EXT       0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056
+#define GL_INT_IMAGE_1D_EXT               0x9057
+#define GL_INT_IMAGE_2D_EXT               0x9058
+#define GL_INT_IMAGE_3D_EXT               0x9059
+#define GL_INT_IMAGE_2D_RECT_EXT          0x905A
+#define GL_INT_IMAGE_CUBE_EXT             0x905B
+#define GL_INT_IMAGE_BUFFER_EXT           0x905C
+#define GL_INT_IMAGE_1D_ARRAY_EXT         0x905D
+#define GL_INT_IMAGE_2D_ARRAY_EXT         0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT   0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT   0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D_EXT      0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D_EXT      0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D_EXT      0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT    0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT  0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C
+#define GL_MAX_IMAGE_SAMPLES_EXT          0x906D
+#define GL_IMAGE_BINDING_FORMAT_EXT       0x906E
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT  0x00000002
+#define GL_UNIFORM_BARRIER_BIT_EXT        0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT  0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020
+#define GL_COMMAND_BARRIER_BIT_EXT        0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT   0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT  0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT_EXT    0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000
+#define GL_ALL_BARRIER_BITS_EXT           0xFFFFFFFF
+#endif
+
+#ifndef GL_EXT_vertex_attrib_64bit
+/* reuse GL_DOUBLE */
+#define GL_DOUBLE_VEC2_EXT                0x8FFC
+#define GL_DOUBLE_VEC3_EXT                0x8FFD
+#define GL_DOUBLE_VEC4_EXT                0x8FFE
+#define GL_DOUBLE_MAT2_EXT                0x8F46
+#define GL_DOUBLE_MAT3_EXT                0x8F47
+#define GL_DOUBLE_MAT4_EXT                0x8F48
+#define GL_DOUBLE_MAT2x3_EXT              0x8F49
+#define GL_DOUBLE_MAT2x4_EXT              0x8F4A
+#define GL_DOUBLE_MAT3x2_EXT              0x8F4B
+#define GL_DOUBLE_MAT3x4_EXT              0x8F4C
+#define GL_DOUBLE_MAT4x2_EXT              0x8F4D
+#define GL_DOUBLE_MAT4x3_EXT              0x8F4E
+#endif
+
+#ifndef GL_NV_gpu_program5
+#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C
+#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D
+#define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44
+#define GL_MAX_PROGRAM_SUBROUTINE_NUM_NV  0x8F45
+#endif
+
+#ifndef GL_NV_gpu_shader5
+#define GL_INT64_NV                       0x140E
+#define GL_UNSIGNED_INT64_NV              0x140F
+#define GL_INT8_NV                        0x8FE0
+#define GL_INT8_VEC2_NV                   0x8FE1
+#define GL_INT8_VEC3_NV                   0x8FE2
+#define GL_INT8_VEC4_NV                   0x8FE3
+#define GL_INT16_NV                       0x8FE4
+#define GL_INT16_VEC2_NV                  0x8FE5
+#define GL_INT16_VEC3_NV                  0x8FE6
+#define GL_INT16_VEC4_NV                  0x8FE7
+#define GL_INT64_VEC2_NV                  0x8FE9
+#define GL_INT64_VEC3_NV                  0x8FEA
+#define GL_INT64_VEC4_NV                  0x8FEB
+#define GL_UNSIGNED_INT8_NV               0x8FEC
+#define GL_UNSIGNED_INT8_VEC2_NV          0x8FED
+#define GL_UNSIGNED_INT8_VEC3_NV          0x8FEE
+#define GL_UNSIGNED_INT8_VEC4_NV          0x8FEF
+#define GL_UNSIGNED_INT16_NV              0x8FF0
+#define GL_UNSIGNED_INT16_VEC2_NV         0x8FF1
+#define GL_UNSIGNED_INT16_VEC3_NV         0x8FF2
+#define GL_UNSIGNED_INT16_VEC4_NV         0x8FF3
+#define GL_UNSIGNED_INT64_VEC2_NV         0x8FF5
+#define GL_UNSIGNED_INT64_VEC3_NV         0x8FF6
+#define GL_UNSIGNED_INT64_VEC4_NV         0x8FF7
+#define GL_FLOAT16_NV                     0x8FF8
+#define GL_FLOAT16_VEC2_NV                0x8FF9
+#define GL_FLOAT16_VEC3_NV                0x8FFA
+#define GL_FLOAT16_VEC4_NV                0x8FFB
+/* reuse GL_PATCHES */
+#endif
+
+#ifndef GL_NV_shader_buffer_store
+#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010
+/* reuse GL_READ_WRITE */
+/* reuse GL_WRITE_ONLY */
+#endif
+
+#ifndef GL_NV_tessellation_program5
+#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV   0x86D8
+#define GL_TESS_CONTROL_PROGRAM_NV        0x891E
+#define GL_TESS_EVALUATION_PROGRAM_NV     0x891F
+#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74
+#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75
+#endif
+
+#ifndef GL_NV_vertex_attrib_integer_64bit
+/* reuse GL_INT64_NV */
+/* reuse GL_UNSIGNED_INT64_NV */
+#endif
+
+#ifndef GL_NV_multisample_coverage
+#define GL_COVERAGE_SAMPLES_NV            0x80A9
+#define GL_COLOR_SAMPLES_NV               0x8E20
+#endif
+
+#ifndef GL_AMD_name_gen_delete
+#define GL_DATA_BUFFER_AMD                0x9151
+#define GL_PERFORMANCE_MONITOR_AMD        0x9152
+#define GL_QUERY_OBJECT_AMD               0x9153
+#define GL_VERTEX_ARRAY_OBJECT_AMD        0x9154
+#define GL_SAMPLER_OBJECT_AMD             0x9155
+#endif
+
+#ifndef GL_AMD_debug_output
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_AMD      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_AMD        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_AMD      0x9147
+#define GL_DEBUG_SEVERITY_LOW_AMD         0x9148
+#define GL_DEBUG_CATEGORY_API_ERROR_AMD   0x9149
+#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A
+#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B
+#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C
+#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D
+#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E
+#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F
+#define GL_DEBUG_CATEGORY_OTHER_AMD       0x9150
+#endif
+
+#ifndef GL_NV_vdpau_interop
+#define GL_SURFACE_STATE_NV               0x86EB
+#define GL_SURFACE_REGISTERED_NV          0x86FD
+#define GL_SURFACE_MAPPED_NV              0x8700
+#define GL_WRITE_DISCARD_NV               0x88BE
+#endif
+
+#ifndef GL_AMD_transform_feedback3_lines_triangles
+#endif
+
+
+/*************************************************************/
+
+#include <stddef.h>
+#ifndef GL_VERSION_2_0
+/* GL type for program/shader text */
+typedef char GLchar;
+#endif
+
+#ifndef GL_VERSION_1_5
+/* GL types for handling large vertex buffer objects */
+#if defined(__APPLE__)
+typedef long GLintptr;
+typedef long GLsizeiptr;
+#else
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+#endif
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+/* GL types for handling large vertex buffer objects */
+#if defined(__APPLE__)
+typedef long GLintptrARB;
+typedef long GLsizeiptrARB;
+#else
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+#endif
+
+#ifndef GL_ARB_shader_objects
+/* GL types for program/shader text and shader object handles */
+typedef char GLcharARB;
+#if defined(__APPLE__)
+typedef void *GLhandleARB;
+#else
+typedef unsigned int GLhandleARB;
+#endif
+#endif
+
+/* GL type for "half" precision (s10e5) float data in host memory */
+#ifndef GL_ARB_half_float_pixel
+typedef unsigned short GLhalfARB;
+#endif
+
+#ifndef GL_NV_half_float
+typedef unsigned short GLhalfNV;
+#endif
+
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glxext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GL_EXT_timer_query extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__) || defined(_LP64)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS ) || defined(__sgi)
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+/* Fallback if nothing above works */
+#include <inttypes.h>
+#endif
+#endif
+
+#ifndef GL_EXT_timer_query
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif
+
+#ifndef GL_ARB_sync
+typedef int64_t GLint64;
+typedef uint64_t GLuint64;
+typedef struct __GLsync *GLsync;
+#endif
+
+#ifndef GL_ARB_cl_event
+/* These incomplete types let us declare types compatible with OpenCL's cl_context and cl_event */
+struct _cl_context;
+struct _cl_event;
+#endif
+
+#ifndef GL_ARB_debug_output
+typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
+#endif
+
+#ifndef GL_AMD_debug_output
+typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
+#endif
+
+#ifndef GL_NV_vdpau_interop
+typedef GLintptr GLvdpauSurfaceNV;
+#endif
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GLAPI void APIENTRY glBlendEquation (GLenum mode);
+GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_VERSION_1_2_DEPRECATED
+#define GL_VERSION_1_2_DEPRECATED 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, GLvoid *table);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, GLvoid *image);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogram (GLenum target);
+GLAPI void APIENTRY glResetMinmax (GLenum target);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+#endif
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum texture);
+GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_VERSION_1_3_DEPRECATED
+#define GL_VERSION_1_3_DEPRECATED 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClientActiveTexture (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+#endif
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_VERSION_1_4_DEPRECATED
+#define GL_VERSION_1_4_DEPRECATED 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordf (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoordd (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
+GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQuery (GLenum target);
+GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
+GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+GLAPI GLvoid* APIENTRY glMapBuffer (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid* *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
+GLAPI void APIENTRY glCompileShader (GLuint shader);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum type);
+GLAPI void APIENTRY glDeleteProgram (GLuint program);
+GLAPI void APIENTRY glDeleteShader (GLuint shader);
+GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid* *pointer);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
+GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
+GLAPI void APIENTRY glLinkProgram (GLuint program);
+GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+GLAPI void APIENTRY glUseProgram (GLuint program);
+GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glValidateProgram (GLuint program);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+/* OpenGL 3.0 also reuses entry points from these extensions: */
+/* ARB_framebuffer_object */
+/* ARB_map_buffer_range */
+/* ARB_vertex_array_object */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI const GLubyte * APIENTRY glGetStringi (GLenum name, GLuint index);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+#endif
+
+#ifndef GL_VERSION_3_1
+#define GL_VERSION_3_1 1
+/* OpenGL 3.1 also reuses entry points from these extensions: */
+/* ARB_copy_buffer */
+/* ARB_uniform_buffer_object */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
+#endif
+
+#ifndef GL_VERSION_3_2
+#define GL_VERSION_3_2 1
+/* OpenGL 3.2 also reuses entry points from these extensions: */
+/* ARB_draw_elements_base_vertex */
+/* ARB_provoking_vertex */
+/* ARB_sync */
+/* ARB_texture_multisample */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
+GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+#endif
+
+#ifndef GL_VERSION_3_3
+#define GL_VERSION_3_3 1
+/* OpenGL 3.3 also reuses entry points from these extensions: */
+/* ARB_blend_func_extended */
+/* ARB_sampler_objects */
+/* ARB_explicit_attrib_location, but it has none */
+/* ARB_occlusion_query2 (no entry points) */
+/* ARB_shader_bit_encoding (no entry points) */
+/* ARB_texture_rgb10_a2ui (no entry points) */
+/* ARB_texture_swizzle (no entry points) */
+/* ARB_timer_query */
+/* ARB_vertex_type_2_10_10_10_rev */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
+#endif
+
+#ifndef GL_VERSION_4_0
+#define GL_VERSION_4_0 1
+/* OpenGL 4.0 also reuses entry points from these extensions: */
+/* ARB_texture_query_lod (no entry points) */
+/* ARB_draw_indirect */
+/* ARB_gpu_shader5 (no entry points) */
+/* ARB_gpu_shader_fp64 */
+/* ARB_shader_subroutine */
+/* ARB_tessellation_shader */
+/* ARB_texture_buffer_object_rgb32 (no entry points) */
+/* ARB_texture_cube_map_array (no entry points) */
+/* ARB_texture_gather (no entry points) */
+/* ARB_transform_feedback2 */
+/* ARB_transform_feedback3 */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShading (GLclampf value);
+GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif
+
+#ifndef GL_VERSION_4_1
+#define GL_VERSION_4_1 1
+/* OpenGL 4.1 also reuses entry points from these extensions: */
+/* ARB_ES2_compatibility */
+/* ARB_get_program_binary */
+/* ARB_separate_shader_objects */
+/* ARB_shader_precision (no entry points) */
+/* ARB_vertex_attrib_64bit */
+/* ARB_viewport_array */
+#endif
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#endif
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#endif
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLclampf value, GLboolean invert);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+#endif
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#endif
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, GLvoid *img);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
+#endif
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#endif
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights);
+GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights);
+GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights);
+GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights);
+GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights);
+GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights);
+GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights);
+GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights);
+GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glVertexBlendARB (GLint count);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#endif
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#endif
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#endif
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#endif
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#endif
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#endif
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#endif
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, GLvoid *string);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, GLvoid* *pointer);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#endif
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer);
+GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, GLvoid* *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id);
+GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQueryARB (GLenum target);
+GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#endif
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#endif
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#endif
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#endif
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#endif
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+#endif
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+#endif
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+#endif
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+#endif
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_ARB_depth_buffer_float 1
+#endif
+
+#ifndef GL_ARB_draw_instanced
+#define GL_ARB_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmap (GLenum target);
+GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+#endif
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_ARB_framebuffer_sRGB 1
+#endif
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_ARB_geometry_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_ARB_half_float_vertex 1
+#endif
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_ARB_instanced_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
+#endif
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_ARB_texture_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc 1
+#endif
+
+#ifndef GL_ARB_texture_rg
+#define GL_ARB_texture_rg 1
+#endif
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArray (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
+#endif
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_ARB_uniform_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
+GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
+GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif
+
+#ifndef GL_ARB_compatibility
+#define GL_ARB_compatibility 1
+#endif
+
+#ifndef GL_ARB_copy_buffer
+#define GL_ARB_copy_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+#endif
+
+#ifndef GL_ARB_shader_texture_lod
+#define GL_ARB_shader_texture_lod 1
+#endif
+
+#ifndef GL_ARB_depth_clamp
+#define GL_ARB_depth_clamp 1
+#endif
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#define GL_ARB_draw_elements_base_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
+GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex);
+#endif
+
+#ifndef GL_ARB_fragment_coord_conventions
+#define GL_ARB_fragment_coord_conventions 1
+#endif
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_ARB_provoking_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertex (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
+#endif
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_ARB_seamless_cube_map 1
+#endif
+
+#ifndef GL_ARB_sync
+#define GL_ARB_sync 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
+GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
+GLAPI void APIENTRY glDeleteSync (GLsync sync);
+GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
+typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
+typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
+typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif
+
+#ifndef GL_ARB_texture_multisample
+#define GL_ARB_texture_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask);
+#endif
+
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_ARB_vertex_array_bgra 1
+#endif
+
+#ifndef GL_ARB_draw_buffers_blend
+#define GL_ARB_draw_buffers_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationiARB (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateiARB (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunciARB (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif
+
+#ifndef GL_ARB_sample_shading
+#define GL_ARB_sample_shading 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShadingARB (GLclampf value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value);
+#endif
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_ARB_texture_cube_map_array 1
+#endif
+
+#ifndef GL_ARB_texture_gather
+#define GL_ARB_texture_gather 1
+#endif
+
+#ifndef GL_ARB_texture_query_lod
+#define GL_ARB_texture_query_lod 1
+#endif
+
+#ifndef GL_ARB_shading_language_include
+#define GL_ARB_shading_language_include 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length);
+GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_ARB_texture_compression_bptc
+#define GL_ARB_texture_compression_bptc 1
+#endif
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_ARB_blend_func_extended 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
+#endif
+
+#ifndef GL_ARB_explicit_attrib_location
+#define GL_ARB_explicit_attrib_location 1
+#endif
+
+#ifndef GL_ARB_occlusion_query2
+#define GL_ARB_occlusion_query2 1
+#endif
+
+#ifndef GL_ARB_sampler_objects
+#define GL_ARB_sampler_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
+GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
+GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
+GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler);
+GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
+GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
+GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetSamplerParameterIuiv (GLuint sampler, GLenum pname, GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
+typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
+typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
+typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_ARB_texture_rgb10_a2ui
+#define GL_ARB_texture_rgb10_a2ui 1
+#endif
+
+#ifndef GL_ARB_texture_swizzle
+#define GL_ARB_texture_swizzle 1
+#endif
+
+#ifndef GL_ARB_timer_query
+#define GL_ARB_timer_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
+GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
+#endif
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+#define GL_ARB_vertex_type_2_10_10_10_rev 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+#endif
+
+#ifndef GL_ARB_draw_indirect
+#define GL_ARB_draw_indirect 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const GLvoid *indirect);
+GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const GLvoid *indirect);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const GLvoid *indirect);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const GLvoid *indirect);
+#endif
+
+#ifndef GL_ARB_gpu_shader5
+#define GL_ARB_gpu_shader5 1
+#endif
+
+#ifndef GL_ARB_gpu_shader_fp64
+#define GL_ARB_gpu_shader_fp64 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
+GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
+#endif
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ARB_shader_subroutine 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
+GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
+GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
+typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+#endif
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_ARB_tessellation_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
+GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
+#endif
+
+#ifndef GL_ARB_texture_buffer_object_rgb32
+#define GL_ARB_texture_buffer_object_rgb32 1
+#endif
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_ARB_transform_feedback2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedback (void);
+GLAPI void APIENTRY glResumeTransformFeedback (void);
+GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
+#endif
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_ARB_transform_feedback3 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
+GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
+GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
+typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_ARB_ES2_compatibility
+#define GL_ARB_ES2_compatibility 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReleaseShaderCompiler (void);
+GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
+GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+GLAPI void APIENTRY glDepthRangef (GLclampf n, GLclampf f);
+GLAPI void APIENTRY glClearDepthf (GLclampf d);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
+typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f);
+typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLclampf d);
+#endif
+
+#ifndef GL_ARB_get_program_binary
+#define GL_ARB_get_program_binary 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetProgramBinary (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+GLAPI void APIENTRY glProgramBinary (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
+GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
+#endif
+
+#ifndef GL_ARB_separate_shader_objects
+#define GL_ARB_separate_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program);
+GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar* *strings);
+GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines);
+GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines);
+GLAPI GLboolean APIENTRY glIsProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineiv (GLuint pipeline, GLenum pname, GLint *params);
+GLAPI void APIENTRY glProgramUniform1i (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform1iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform1f (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform1fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1d (GLuint program, GLint location, GLdouble v0);
+GLAPI void APIENTRY glProgramUniform1dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform1ui (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform1uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2i (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform2iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2f (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform2fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2d (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+GLAPI void APIENTRY glProgramUniform2dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2ui (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform2uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform3iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform3fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+GLAPI void APIENTRY glProgramUniform3dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform3uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform4iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform4fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+GLAPI void APIENTRY glProgramUniform4dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform4uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glValidateProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar* *strings);
+typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines);
+typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+#endif
+
+#ifndef GL_ARB_vertex_attrib_64bit
+#define GL_ARB_vertex_attrib_64bit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+#endif
+
+#ifndef GL_ARB_viewport_array
+#define GL_ARB_viewport_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glViewportArrayv (GLuint first, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glViewportIndexedf (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+GLAPI void APIENTRY glViewportIndexedfv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v);
+GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLclampd *v);
+GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLclampd n, GLclampd f);
+GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f);
+typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data);
+#endif
+
+#ifndef GL_ARB_cl_event
+#define GL_ARB_cl_event 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glCreateSyncFromCLeventARB (struct _cl_context * context, struct _cl_event * event, GLbitfield flags);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context * context, struct _cl_event * event, GLbitfield flags);
+#endif
+
+#ifndef GL_ARB_debug_output
+#define GL_ARB_debug_output 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const GLvoid *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const GLvoid *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#endif
+
+#ifndef GL_ARB_robustness
+#define GL_ARB_robustness 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void);
+GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values);
+GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values);
+GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values);
+GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern);
+GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table);
+GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image);
+GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span);
+GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
+GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
+GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img);
+GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data);
+GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img);
+GLAPI void APIENTRY glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+GLAPI void APIENTRY glGetnUniformivARB (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void);
+typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values);
+typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern);
+typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img);
+typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data);
+typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img);
+typedef void (APIENTRYP PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+#endif
+
+#ifndef GL_ARB_shader_stencil_export
+#define GL_ARB_shader_stencil_export 1
+#endif
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#endif
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+#endif
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#endif
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#endif
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum target);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum target);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *image);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+#endif
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+#endif
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, GLvoid *table);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#endif
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#endif
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#endif
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences);
+GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#endif
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#endif
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#endif
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#endif
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint i);
+GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer);
+GLAPI void APIENTRY glGetPointervEXT (GLenum pname, GLvoid* *params);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#endif
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#endif
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#endif
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#endif
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#endif
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#endif
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#endif
+
+#ifndef GL_SGIX_texture_select
+#define GL_SGIX_texture_select 1
+#endif
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#endif
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#endif
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#endif
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint factor);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#endif
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield mask);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#endif
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#endif
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#endif
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#endif
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#endif
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#endif
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#endif
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#endif
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#endif
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#endif
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, GLvoid *data);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#endif
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#endif
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#endif
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#endif
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#endif
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#endif
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#endif
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#endif
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#endif
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#endif
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#endif
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+#endif
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#endif
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#endif
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum mode);
+GLAPI void APIENTRY glTextureLightEXT (GLenum pname);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#endif
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#endif
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#endif
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#endif
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#endif
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#endif
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const GLvoid* *pointer);
+GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#endif
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+#endif
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#endif
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#endif
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#endif
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *v);
+GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *v);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#endif
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#endif
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#endif
+
+#ifndef GL_SGIX_fog_scale
+#define GL_SGIX_fog_scale 1
+#endif
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#endif
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#endif
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const GLvoid* *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
+#endif
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#endif
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#endif
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#endif
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#endif
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#endif
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#endif
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#endif
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#endif
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#endif
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const GLvoid *pointer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
+#endif
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#endif
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#endif
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#endif
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#endif
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#endif
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#endif
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
+#endif
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
+#endif
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#endif
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#endif
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#endif
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#endif
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#endif
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#endif
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#endif
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#endif
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#endif
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#endif
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const GLvoid *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
+#endif
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#endif
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#endif
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence);
+GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFinishFenceNV (GLuint fence);
+GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#endif
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
+GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#endif
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#endif
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#endif
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#endif
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#endif
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#endif
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences);
+GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, GLvoid* *pointer);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id);
+GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLuint count, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLuint count, const GLfloat *v);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#endif
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#endif
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#endif
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#endif
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#endif
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#endif
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#endif
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle);
+GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#endif
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const GLvoid *pointer, GLenum usage);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const GLvoid *addr);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const GLvoid *addr);
+GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr);
+GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr);
+GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr);
+GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr);
+GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr);
+GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr);
+GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr);
+GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, GLvoid* *data);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#endif
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#endif
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum type, const GLvoid *pointer);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#endif
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#endif
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#endif
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#endif
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#endif
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#endif
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#endif
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#endif
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const GLvoid *pointer);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#endif
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#endif
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#endif
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#endif
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#endif
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_ATI_pixel_format_float 1
+/* This is really a WGL extension, but defines some associated GL enums.
+ * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
+ */
+#endif
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#endif
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#endif
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#endif
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, GLvoid *pointer);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#endif
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#endif
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#endif
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#endif
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_OES_read_format
+#define GL_OES_read_format 1
+#endif
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#endif
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#endif
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#endif
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#endif
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#endif
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+#endif
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+#endif
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+#endif
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+#endif
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+#endif
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#endif
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const GLvoid *string);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
+#endif
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+#endif
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+#endif
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+#endif
+
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64EXT *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params);
+#endif
+
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif
+
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+#endif
+
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit);
+GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+#endif
+
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+#endif
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+#endif
+
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#endif
+
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#endif
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+#endif
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#endif
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+#endif
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glClearDepthdNV (GLdouble depth);
+GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+#endif
+
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+#endif
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+#endif
+
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+#endif
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params);
+#endif
+
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+#endif
+
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackNV (void);
+GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint count, const GLint *attribs, GLenum bufferMode);
+GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name);
+GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location);
+GLAPI void APIENTRY glTransformFeedbackStreamAttribsNV (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKSTREAMATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#endif
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer);
+GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location);
+GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+#endif
+
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha);
+GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif
+
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#endif
+
+#ifndef GL_NV_conditional_render
+#define GL_NV_conditional_render 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRenderNV (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
+#endif
+
+#ifndef GL_NV_present_video
+#define GL_NV_present_video 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#endif
+
+#ifndef GL_EXT_transform_feedback
+#define GL_EXT_transform_feedback 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
+GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#endif
+
+#ifndef GL_EXT_direct_state_access
+#define GL_EXT_direct_state_access 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixPopEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixPushEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture);
+GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data);
+GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, GLvoid* *data);
+GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, GLvoid *img);
+GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
+GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, GLvoid *string);
+GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer);
+GLAPI GLvoid* APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, GLvoid* *params);
+GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
+GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target);
+GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target);
+GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target);
+GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
+GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
+typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
+typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
+typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
+typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+#endif
+
+#ifndef GL_EXT_vertex_array_bgra
+#define GL_EXT_vertex_array_bgra 1
+#endif
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_EXT_texture_swizzle 1
+#endif
+
+#ifndef GL_NV_explicit_multisample
+#define GL_NV_explicit_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask);
+GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
+#endif
+
+#ifndef GL_NV_transform_feedback2
+#define GL_NV_transform_feedback2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
+GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
+GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
+#endif
+
+#ifndef GL_ATI_meminfo
+#define GL_ATI_meminfo 1
+#endif
+
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
+GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
+typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+
+#ifndef GL_AMD_texture_texture4
+#define GL_AMD_texture_texture4 1
+#endif
+
+#ifndef GL_AMD_vertex_shader_tesselator
+#define GL_AMD_vertex_shader_tesselator 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor);
+GLAPI void APIENTRY glTessellationModeAMD (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_EXT_provoking_vertex 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
+#endif
+
+#ifndef GL_EXT_texture_snorm
+#define GL_EXT_texture_snorm 1
+#endif
+
+#ifndef GL_AMD_draw_buffers_blend
+#define GL_AMD_draw_buffers_blend 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#endif
+
+#ifndef GL_APPLE_texture_range
+#define GL_APPLE_texture_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const GLvoid *pointer);
+GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, GLvoid* *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, GLvoid* *params);
+#endif
+
+#ifndef GL_APPLE_float_pixels
+#define GL_APPLE_float_pixels 1
+#endif
+
+#ifndef GL_APPLE_vertex_program_evaluators
+#define GL_APPLE_vertex_program_evaluators 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#endif
+
+#ifndef GL_APPLE_aux_depth_stencil
+#define GL_APPLE_aux_depth_stencil 1
+#endif
+
+#ifndef GL_APPLE_object_purgeable
+#define GL_APPLE_object_purgeable 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#endif
+
+#ifndef GL_APPLE_row_bytes
+#define GL_APPLE_row_bytes 1
+#endif
+
+#ifndef GL_APPLE_rgb_422
+#define GL_APPLE_rgb_422 1
+#endif
+
+#ifndef GL_NV_video_capture
+#define GL_NV_video_capture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#endif
+
+#ifndef GL_NV_copy_image
+#define GL_NV_copy_image 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+
+#ifndef GL_EXT_separate_shader_objects
+#define GL_EXT_separate_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program);
+GLAPI void APIENTRY glActiveProgramEXT (GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
+#endif
+
+#ifndef GL_NV_parameter_buffer_object2
+#define GL_NV_parameter_buffer_object2 1
+#endif
+
+#ifndef GL_NV_shader_buffer_load
+#define GL_NV_shader_buffer_load 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access);
+GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target);
+GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target);
+GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access);
+GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer);
+GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer);
+GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result);
+GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
+GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
+typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_NV_vertex_buffer_unified_memory 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride);
+GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result);
+#endif
+
+#ifndef GL_NV_texture_barrier
+#define GL_NV_texture_barrier 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureBarrierNV (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void);
+#endif
+
+#ifndef GL_AMD_shader_stencil_export
+#define GL_AMD_shader_stencil_export 1
+#endif
+
+#ifndef GL_AMD_seamless_cubemap_per_texture
+#define GL_AMD_seamless_cubemap_per_texture 1
+#endif
+
+#ifndef GL_AMD_conservative_depth
+#define GL_AMD_conservative_depth 1
+#endif
+
+#ifndef GL_EXT_shader_image_load_store
+#define GL_EXT_shader_image_load_store 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindImageTextureEXT (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+typedef void (APIENTRYP PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);
+#endif
+
+#ifndef GL_EXT_vertex_attrib_64bit
+#define GL_EXT_vertex_attrib_64bit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1dEXT (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2dEXT (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdvEXT (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+#endif
+
+#ifndef GL_NV_gpu_program5
+#define GL_NV_gpu_program5 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramSubroutineParametersuivNV (GLenum target, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint index, GLuint *param);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLPROGRAMSUBROUTINEPARAMETERSUIVNVPROC) (GLenum target, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSUBROUTINEPARAMETERUIVNVPROC) (GLenum target, GLuint index, GLuint *param);
+#endif
+
+#ifndef GL_NV_gpu_shader5
+#define GL_NV_gpu_shader5 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x);
+GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params);
+GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x);
+GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+
+#ifndef GL_NV_shader_buffer_store
+#define GL_NV_shader_buffer_store 1
+#endif
+
+#ifndef GL_NV_tessellation_program5
+#define GL_NV_tessellation_program5 1
+#endif
+
+#ifndef GL_NV_vertex_attrib_integer_64bit
+#define GL_NV_vertex_attrib_integer_64bit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+#endif
+
+#ifndef GL_NV_multisample_coverage
+#define GL_NV_multisample_coverage 1
+#endif
+
+#ifndef GL_AMD_name_gen_delete
+#define GL_AMD_name_gen_delete 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenNamesAMD (GLenum identifier, GLuint num, GLuint *names);
+GLAPI void APIENTRY glDeleteNamesAMD (GLenum identifier, GLuint num, const GLuint *names);
+GLAPI GLboolean APIENTRY glIsNameAMD (GLenum identifier, GLuint name);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint *names);
+typedef void (APIENTRYP PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint *names);
+typedef GLboolean (APIENTRYP PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name);
+#endif
+
+#ifndef GL_AMD_debug_output
+#define GL_AMD_debug_output 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, GLvoid *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, GLvoid *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#endif
+
+#ifndef GL_NV_vdpau_interop
+#define GL_NV_vdpau_interop 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVDPAUInitNV (const GLvoid *vdpDevice, const GLvoid *getProcAddress);
+GLAPI void APIENTRY glVDPAUFiniNV (void);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI void APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access);
+GLAPI void APIENTRY glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const GLvoid *vdpDevice, const GLvoid *getProcAddress);
+typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef void (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access);
+typedef void (APIENTRYP PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#endif
+
+#ifndef GL_AMD_transform_feedback3_lines_triangles
+#define GL_AMD_transform_feedback3_lines_triangles 1
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+#endif /* NO_SDL_GLEXT */
+
+#endif /* !__IPHONEOS__ */
+
+#endif /* _SDL_opengl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_opengles.h b/Source/3rd Party/sdl/include/SDL_opengles.h
new file mode 100644
index 000000000..d88e1573f
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_opengles.h	
@@ -0,0 +1,38 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_opengles.h
+ *
+ *  This is a simple file to encapsulate the OpenGL ES 1.X API headers.
+ */
+
+#ifdef __IPHONEOS__
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
+#else
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
diff --git a/Source/3rd Party/sdl/include/SDL_opengles2.h b/Source/3rd Party/sdl/include/SDL_opengles2.h
new file mode 100644
index 000000000..2c0547923
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_opengles2.h	
@@ -0,0 +1,2790 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_opengles.h
+ *
+ *  This is a simple file to encapsulate the OpenGL ES 2.0 API headers.
+ */
+#ifndef _MSC_VER
+#ifdef __IPHONEOS__
+#include <OpenGLES/ES2/gl.h>
+#include <OpenGLES/ES2/glext.h>
+#else
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#endif
+
+#else /* _MSC_VER */
+
+/* OpenGL ES2 headers for Visual Studio */
+
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2009 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+*
+* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
+*
+* Adopters may modify this file to suit their platform. Adopters are
+* encouraged to submit platform specific modifications to the Khronos
+* group so that they can be included in future versions of this file.
+* Please submit changes by sending them to the public Khronos Bugzilla
+* (http://khronos.org/bugzilla) by filing a bug against product
+* "Khronos (general)" component "Registry".
+*
+* A predefined template which fills in some of the bug fields can be
+* reached using http://tinyurl.com/khrplatform-h-bugreport, but you
+* must create a Bugzilla login first.
+*
+*
+* See the Implementer's Guidelines for information about where this file
+* should be located on your system and for more details of its use:
+*    http://www.khronos.org/registry/implementers_guide.pdf
+*
+* This file should be included as
+*        #include <KHR/khrplatform.h>
+* by Khronos client API header files that use its types and defines.
+*
+* The types in khrplatform.h should only be used to define API-specific types.
+*
+* Types defined in khrplatform.h:
+*    khronos_int8_t              signed   8  bit
+*    khronos_uint8_t             unsigned 8  bit
+*    khronos_int16_t             signed   16 bit
+*    khronos_uint16_t            unsigned 16 bit
+*    khronos_int32_t             signed   32 bit
+*    khronos_uint32_t            unsigned 32 bit
+*    khronos_int64_t             signed   64 bit
+*    khronos_uint64_t            unsigned 64 bit
+*    khronos_intptr_t            signed   same number of bits as a pointer
+*    khronos_uintptr_t           unsigned same number of bits as a pointer
+*    khronos_ssize_t             signed   size
+*    khronos_usize_t             unsigned size
+*    khronos_float_t             signed   32 bit floating point
+*    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+*    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+*                                         nanoseconds
+*    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+*    khronos_boolean_enum_t      enumerated boolean type. This should
+*      only be used as a base type when a client API's boolean type is
+*      an enum. Client APIs which use an integer or other type for
+*      booleans cannot use this as the base type for their boolean.
+*
+* Tokens defined in khrplatform.h:
+*
+*    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+*
+*    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+*    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+*
+* Calling convention macros defined in this file:
+*    KHRONOS_APICALL
+*    KHRONOS_APIENTRY
+*    KHRONOS_APIATTRIBUTES
+*
+* These may be used in function prototypes as:
+*
+*      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+*                                  int arg1,
+*                                  int arg2) KHRONOS_APIATTRIBUTES;
+*/
+
+/*-------------------------------------------------------------------------
+* Definition of KHRONOS_APICALL
+*-------------------------------------------------------------------------
+* This precedes the return type of the function in the function prototype.
+*/
+#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+* Definition of KHRONOS_APIENTRY
+*-------------------------------------------------------------------------
+* This follows the return type of the function  and precedes the function
+* name in the function prototype.
+*/
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+/* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+* Definition of KHRONOS_APIATTRIBUTES
+*-------------------------------------------------------------------------
+* This follows the closing parenthesis of the function prototype arguments.
+*/
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+* basic type definitions
+*-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+* Using <stdint.h>
+*/
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+* Using <inttypes.h>
+*/
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+* Win32
+*/
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+* Sun or Digital
+*/
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+* Hypothetical platform with no float or int64 support
+*/
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+* Generic fallback
+*/
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+* Types that are (so far) the same on all platforms
+*/
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+* Types that differ between LLP64 and LP64 architectures - in LLP64,
+* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+* to be the only LLP64 architecture in current use.
+*/
+#ifdef _WIN64
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+* Float type
+*/
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+*
+* These types can be used to represent a time interval in nanoseconds or
+* an absolute Unadjusted System Time.  Unadjusted System Time is the number
+* of nanoseconds since some arbitrary system event (e.g. since the last
+* time the system booted).  The Unadjusted System Time is an unsigned
+* 64 bit value that wraps back to 0 every 584 years.  Time intervals
+* may be either signed or unsigned.
+*/
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+* Dummy value used to pad enum types to 32 bits.
+*/
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+* Enumerated boolean type
+*
+* Values other than zero should be considered to be true.  Therefore
+* comparisons should not be made against KHRONOS_TRUE.
+*/
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */
+
+
+#ifndef __gl2platform_h_
+#define __gl2platform_h_
+
+/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+/* Platform-specific types and definitions for OpenGL ES 2.X  gl2.h
+ *
+ * Adopters may modify khrplatform.h and this file to suit their platform.
+ * You are encouraged to submit all modifications to the Khronos group so that
+ * they can be included in future versions of this file.  Please submit changes
+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
+ * by filing a bug against product "OpenGL-ES" component "Registry".
+ */
+
+/*#include <KHR/khrplatform.h>*/
+
+#ifndef GL_APICALL
+#define GL_APICALL  KHRONOS_APICALL
+#endif
+
+#ifndef GL_APIENTRY
+#define GL_APIENTRY KHRONOS_APIENTRY
+#endif
+
+#endif /* __gl2platform_h_ */
+
+#ifndef __gl2_h_
+#define __gl2_h_
+
+/* $Revision: 16803 $ on $Date:: 2012-02-02 09:49:18 -0800 #$ */
+
+/*#include <GLES2/gl2platform.h>*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+/*-------------------------------------------------------------------------
+ * Data type definitions
+ *-----------------------------------------------------------------------*/
+
+typedef void             GLvoid;
+typedef char             GLchar;
+typedef unsigned int     GLenum;
+typedef unsigned char    GLboolean;
+typedef unsigned int     GLbitfield;
+typedef khronos_int8_t   GLbyte;
+typedef short            GLshort;
+typedef int              GLint;
+typedef int              GLsizei;
+typedef khronos_uint8_t  GLubyte;
+typedef unsigned short   GLushort;
+typedef unsigned int     GLuint;
+typedef khronos_float_t  GLfloat;
+typedef khronos_float_t  GLclampf;
+typedef khronos_int32_t  GLfixed;
+
+/* GL types for handling large vertex buffer objects */
+typedef khronos_intptr_t GLintptr;
+typedef khronos_ssize_t  GLsizeiptr;
+
+/* OpenGL ES core versions */
+#define GL_ES_VERSION_2_0                 1
+
+/* ClearBufferMask */
+#define GL_DEPTH_BUFFER_BIT               0x00000100
+#define GL_STENCIL_BUFFER_BIT             0x00000400
+#define GL_COLOR_BUFFER_BIT               0x00004000
+
+/* Boolean */
+#define GL_FALSE                          0
+#define GL_TRUE                           1
+
+/* BeginMode */
+#define GL_POINTS                         0x0000
+#define GL_LINES                          0x0001
+#define GL_LINE_LOOP                      0x0002
+#define GL_LINE_STRIP                     0x0003
+#define GL_TRIANGLES                      0x0004
+#define GL_TRIANGLE_STRIP                 0x0005
+#define GL_TRIANGLE_FAN                   0x0006
+
+/* AlphaFunction (not supported in ES20) */
+/*      GL_NEVER */
+/*      GL_LESS */
+/*      GL_EQUAL */
+/*      GL_LEQUAL */
+/*      GL_GREATER */
+/*      GL_NOTEQUAL */
+/*      GL_GEQUAL */
+/*      GL_ALWAYS */
+
+/* BlendingFactorDest */
+#define GL_ZERO                           0
+#define GL_ONE                            1
+#define GL_SRC_COLOR                      0x0300
+#define GL_ONE_MINUS_SRC_COLOR            0x0301
+#define GL_SRC_ALPHA                      0x0302
+#define GL_ONE_MINUS_SRC_ALPHA            0x0303
+#define GL_DST_ALPHA                      0x0304
+#define GL_ONE_MINUS_DST_ALPHA            0x0305
+
+/* BlendingFactorSrc */
+/*      GL_ZERO */
+/*      GL_ONE */
+#define GL_DST_COLOR                      0x0306
+#define GL_ONE_MINUS_DST_COLOR            0x0307
+#define GL_SRC_ALPHA_SATURATE             0x0308
+/*      GL_SRC_ALPHA */
+/*      GL_ONE_MINUS_SRC_ALPHA */
+/*      GL_DST_ALPHA */
+/*      GL_ONE_MINUS_DST_ALPHA */
+
+/* BlendEquationSeparate */
+#define GL_FUNC_ADD                       0x8006
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_BLEND_EQUATION_RGB             0x8009    /* same as BLEND_EQUATION */
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+
+/* BlendSubtract */
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+
+/* Separate Blend Functions */
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+
+/* Buffer Objects */
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_DYNAMIC_DRAW                   0x88E8
+
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+
+/* CullFaceMode */
+#define GL_FRONT                          0x0404
+#define GL_BACK                           0x0405
+#define GL_FRONT_AND_BACK                 0x0408
+
+/* DepthFunction */
+/*      GL_NEVER */
+/*      GL_LESS */
+/*      GL_EQUAL */
+/*      GL_LEQUAL */
+/*      GL_GREATER */
+/*      GL_NOTEQUAL */
+/*      GL_GEQUAL */
+/*      GL_ALWAYS */
+
+/* EnableCap */
+#define GL_TEXTURE_2D                     0x0DE1
+#define GL_CULL_FACE                      0x0B44
+#define GL_BLEND                          0x0BE2
+#define GL_DITHER                         0x0BD0
+#define GL_STENCIL_TEST                   0x0B90
+#define GL_DEPTH_TEST                     0x0B71
+#define GL_SCISSOR_TEST                   0x0C11
+#define GL_POLYGON_OFFSET_FILL            0x8037
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_COVERAGE                0x80A0
+
+/* ErrorCode */
+#define GL_NO_ERROR                       0
+#define GL_INVALID_ENUM                   0x0500
+#define GL_INVALID_VALUE                  0x0501
+#define GL_INVALID_OPERATION              0x0502
+#define GL_OUT_OF_MEMORY                  0x0505
+
+/* FrontFaceDirection */
+#define GL_CW                             0x0900
+#define GL_CCW                            0x0901
+
+/* GetPName */
+#define GL_LINE_WIDTH                     0x0B21
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#define GL_CULL_FACE_MODE                 0x0B45
+#define GL_FRONT_FACE                     0x0B46
+#define GL_DEPTH_RANGE                    0x0B70
+#define GL_DEPTH_WRITEMASK                0x0B72
+#define GL_DEPTH_CLEAR_VALUE              0x0B73
+#define GL_DEPTH_FUNC                     0x0B74
+#define GL_STENCIL_CLEAR_VALUE            0x0B91
+#define GL_STENCIL_FUNC                   0x0B92
+#define GL_STENCIL_FAIL                   0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
+#define GL_STENCIL_REF                    0x0B97
+#define GL_STENCIL_VALUE_MASK             0x0B93
+#define GL_STENCIL_WRITEMASK              0x0B98
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#define GL_VIEWPORT                       0x0BA2
+#define GL_SCISSOR_BOX                    0x0C10
+/*      GL_SCISSOR_TEST */
+#define GL_COLOR_CLEAR_VALUE              0x0C22
+#define GL_COLOR_WRITEMASK                0x0C23
+#define GL_UNPACK_ALIGNMENT               0x0CF5
+#define GL_PACK_ALIGNMENT                 0x0D05
+#define GL_MAX_TEXTURE_SIZE               0x0D33
+#define GL_MAX_VIEWPORT_DIMS              0x0D3A
+#define GL_SUBPIXEL_BITS                  0x0D50
+#define GL_RED_BITS                       0x0D52
+#define GL_GREEN_BITS                     0x0D53
+#define GL_BLUE_BITS                      0x0D54
+#define GL_ALPHA_BITS                     0x0D55
+#define GL_DEPTH_BITS                     0x0D56
+#define GL_STENCIL_BITS                   0x0D57
+#define GL_POLYGON_OFFSET_UNITS           0x2A00
+/*      GL_POLYGON_OFFSET_FILL */
+#define GL_POLYGON_OFFSET_FACTOR          0x8038
+#define GL_TEXTURE_BINDING_2D             0x8069
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+
+/* GetTextureParameter */
+/*      GL_TEXTURE_MAG_FILTER */
+/*      GL_TEXTURE_MIN_FILTER */
+/*      GL_TEXTURE_WRAP_S */
+/*      GL_TEXTURE_WRAP_T */
+
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+
+/* HintMode */
+#define GL_DONT_CARE                      0x1100
+#define GL_FASTEST                        0x1101
+#define GL_NICEST                         0x1102
+
+/* HintTarget */
+#define GL_GENERATE_MIPMAP_HINT            0x8192
+
+/* DataType */
+#define GL_BYTE                           0x1400
+#define GL_UNSIGNED_BYTE                  0x1401
+#define GL_SHORT                          0x1402
+#define GL_UNSIGNED_SHORT                 0x1403
+#define GL_INT                            0x1404
+#define GL_UNSIGNED_INT                   0x1405
+#define GL_FLOAT                          0x1406
+#define GL_FIXED                          0x140C
+
+/* PixelFormat */
+#define GL_DEPTH_COMPONENT                0x1902
+#define GL_ALPHA                          0x1906
+#define GL_RGB                            0x1907
+#define GL_RGBA                           0x1908
+#define GL_LUMINANCE                      0x1909
+#define GL_LUMINANCE_ALPHA                0x190A
+
+/* PixelType */
+/*      GL_UNSIGNED_BYTE */
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+
+/* Shaders */
+#define GL_FRAGMENT_SHADER                  0x8B30
+#define GL_VERTEX_SHADER                    0x8B31
+#define GL_MAX_VERTEX_ATTRIBS               0x8869
+#define GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
+#define GL_MAX_VARYING_VECTORS              0x8DFC
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS   0x8B4C
+#define GL_MAX_TEXTURE_IMAGE_UNITS          0x8872
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
+#define GL_SHADER_TYPE                      0x8B4F
+#define GL_DELETE_STATUS                    0x8B80
+#define GL_LINK_STATUS                      0x8B82
+#define GL_VALIDATE_STATUS                  0x8B83
+#define GL_ATTACHED_SHADERS                 0x8B85
+#define GL_ACTIVE_UNIFORMS                  0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH        0x8B87
+#define GL_ACTIVE_ATTRIBUTES                0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH      0x8B8A
+#define GL_SHADING_LANGUAGE_VERSION         0x8B8C
+#define GL_CURRENT_PROGRAM                  0x8B8D
+
+/* StencilFunction */
+#define GL_NEVER                          0x0200
+#define GL_LESS                           0x0201
+#define GL_EQUAL                          0x0202
+#define GL_LEQUAL                         0x0203
+#define GL_GREATER                        0x0204
+#define GL_NOTEQUAL                       0x0205
+#define GL_GEQUAL                         0x0206
+#define GL_ALWAYS                         0x0207
+
+/* StencilOp */
+/*      GL_ZERO */
+#define GL_KEEP                           0x1E00
+#define GL_REPLACE                        0x1E01
+#define GL_INCR                           0x1E02
+#define GL_DECR                           0x1E03
+#define GL_INVERT                         0x150A
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+
+/* StringName */
+#define GL_VENDOR                         0x1F00
+#define GL_RENDERER                       0x1F01
+#define GL_VERSION                        0x1F02
+#define GL_EXTENSIONS                     0x1F03
+
+/* TextureMagFilter */
+#define GL_NEAREST                        0x2600
+#define GL_LINEAR                         0x2601
+
+/* TextureMinFilter */
+/*      GL_NEAREST */
+/*      GL_LINEAR */
+#define GL_NEAREST_MIPMAP_NEAREST         0x2700
+#define GL_LINEAR_MIPMAP_NEAREST          0x2701
+#define GL_NEAREST_MIPMAP_LINEAR          0x2702
+#define GL_LINEAR_MIPMAP_LINEAR           0x2703
+
+/* TextureParameterName */
+#define GL_TEXTURE_MAG_FILTER             0x2800
+#define GL_TEXTURE_MIN_FILTER             0x2801
+#define GL_TEXTURE_WRAP_S                 0x2802
+#define GL_TEXTURE_WRAP_T                 0x2803
+
+/* TextureTarget */
+/*      GL_TEXTURE_2D */
+#define GL_TEXTURE                        0x1702
+
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+
+/* TextureUnit */
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+
+/* TextureWrapMode */
+#define GL_REPEAT                         0x2901
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_MIRRORED_REPEAT                0x8370
+
+/* Uniform Types */
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_CUBE                   0x8B60
+
+/* Vertex Arrays */
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED        0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE           0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE         0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE           0x8625
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED     0x886A
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER        0x8645
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+
+/* Read Format */
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE   0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
+
+/* Shader Source */
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_SHADER_COMPILER                0x8DFA
+
+/* Shader Binary */
+#define GL_SHADER_BINARY_FORMATS          0x8DF8
+#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
+
+/* Shader Precision-Specified Types */
+#define GL_LOW_FLOAT                      0x8DF0
+#define GL_MEDIUM_FLOAT                   0x8DF1
+#define GL_HIGH_FLOAT                     0x8DF2
+#define GL_LOW_INT                        0x8DF3
+#define GL_MEDIUM_INT                     0x8DF4
+#define GL_HIGH_INT                       0x8DF5
+
+/* Framebuffer Object. */
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+
+#define GL_RGBA4                          0x8056
+#define GL_RGB5_A1                        0x8057
+#define GL_RGB565                         0x8D62
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_STENCIL_INDEX8                 0x8D48
+
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE           0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME           0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL         0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+
+#define GL_NONE                           0
+
+#define GL_FRAMEBUFFER_COMPLETE                      0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT         0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         0x8CD9
+#define GL_FRAMEBUFFER_UNSUPPORTED                   0x8CDD
+
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+
+/*-------------------------------------------------------------------------
+ * GL core functions.
+ *-----------------------------------------------------------------------*/
+
+GL_APICALL void         GL_APIENTRY glActiveTexture (GLenum texture);
+GL_APICALL void         GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
+GL_APICALL void         GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name);
+GL_APICALL void         GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GL_APICALL void         GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GL_APICALL void         GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GL_APICALL void         GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
+GL_APICALL void         GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GL_APICALL void         GL_APIENTRY glBlendEquation ( GLenum mode );
+GL_APICALL void         GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GL_APICALL void         GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
+GL_APICALL void         GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GL_APICALL void         GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage);
+GL_APICALL void         GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
+GL_APICALL GLenum       GL_APIENTRY glCheckFramebufferStatus (GLenum target);
+GL_APICALL void         GL_APIENTRY glClear (GLbitfield mask);
+GL_APICALL void         GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GL_APICALL void         GL_APIENTRY glClearDepthf (GLclampf depth);
+GL_APICALL void         GL_APIENTRY glClearStencil (GLint s);
+GL_APICALL void         GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+GL_APICALL void         GL_APIENTRY glCompileShader (GLuint shader);
+GL_APICALL void         GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void         GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void         GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GL_APICALL void         GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL GLuint       GL_APIENTRY glCreateProgram (void);
+GL_APICALL GLuint       GL_APIENTRY glCreateShader (GLenum type);
+GL_APICALL void         GL_APIENTRY glCullFace (GLenum mode);
+GL_APICALL void         GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers);
+GL_APICALL void         GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers);
+GL_APICALL void         GL_APIENTRY glDeleteProgram (GLuint program);
+GL_APICALL void         GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers);
+GL_APICALL void         GL_APIENTRY glDeleteShader (GLuint shader);
+GL_APICALL void         GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures);
+GL_APICALL void         GL_APIENTRY glDepthFunc (GLenum func);
+GL_APICALL void         GL_APIENTRY glDepthMask (GLboolean flag);
+GL_APICALL void         GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar);
+GL_APICALL void         GL_APIENTRY glDetachShader (GLuint program, GLuint shader);
+GL_APICALL void         GL_APIENTRY glDisable (GLenum cap);
+GL_APICALL void         GL_APIENTRY glDisableVertexAttribArray (GLuint index);
+GL_APICALL void         GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
+GL_APICALL void         GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices);
+GL_APICALL void         GL_APIENTRY glEnable (GLenum cap);
+GL_APICALL void         GL_APIENTRY glEnableVertexAttribArray (GLuint index);
+GL_APICALL void         GL_APIENTRY glFinish (void);
+GL_APICALL void         GL_APIENTRY glFlush (void);
+GL_APICALL void         GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GL_APICALL void         GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GL_APICALL void         GL_APIENTRY glFrontFace (GLenum mode);
+GL_APICALL void         GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers);
+GL_APICALL void         GL_APIENTRY glGenerateMipmap (GLenum target);
+GL_APICALL void         GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers);
+GL_APICALL void         GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers);
+GL_APICALL void         GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
+GL_APICALL void         GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+GL_APICALL void         GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+GL_APICALL void         GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
+GL_APICALL int          GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
+GL_APICALL void         GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
+GL_APICALL void         GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL GLenum       GL_APIENTRY glGetError (void);
+GL_APICALL void         GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params);
+GL_APICALL void         GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog);
+GL_APICALL void         GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog);
+GL_APICALL void         GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
+GL_APICALL void         GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source);
+GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name);
+GL_APICALL void         GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params);
+GL_APICALL void         GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
+GL_APICALL void         GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
+GL_APICALL int          GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
+GL_APICALL void         GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
+GL_APICALL void         GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
+GL_APICALL void         GL_APIENTRY glHint (GLenum target, GLenum mode);
+GL_APICALL GLboolean    GL_APIENTRY glIsBuffer (GLuint buffer);
+GL_APICALL GLboolean    GL_APIENTRY glIsEnabled (GLenum cap);
+GL_APICALL GLboolean    GL_APIENTRY glIsFramebuffer (GLuint framebuffer);
+GL_APICALL GLboolean    GL_APIENTRY glIsProgram (GLuint program);
+GL_APICALL GLboolean    GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GL_APICALL GLboolean    GL_APIENTRY glIsShader (GLuint shader);
+GL_APICALL GLboolean    GL_APIENTRY glIsTexture (GLuint texture);
+GL_APICALL void         GL_APIENTRY glLineWidth (GLfloat width);
+GL_APICALL void         GL_APIENTRY glLinkProgram (GLuint program);
+GL_APICALL void         GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
+GL_APICALL void         GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
+GL_APICALL void         GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels);
+GL_APICALL void         GL_APIENTRY glReleaseShaderCompiler (void);
+GL_APICALL void         GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void         GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
+GL_APICALL void         GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL void         GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
+GL_APICALL void         GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
+GL_APICALL void         GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
+GL_APICALL void         GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
+GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
+GL_APICALL void         GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GL_APICALL void         GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+GL_APICALL void         GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
+GL_APICALL void         GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void         GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
+GL_APICALL void         GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);
+GL_APICALL void         GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
+GL_APICALL void         GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params);
+GL_APICALL void         GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void         GL_APIENTRY glUniform1f (GLint location, GLfloat x);
+GL_APICALL void         GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void         GL_APIENTRY glUniform1i (GLint location, GLint x);
+GL_APICALL void         GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void         GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y);
+GL_APICALL void         GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void         GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y);
+GL_APICALL void         GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void         GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void         GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void         GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z);
+GL_APICALL void         GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void         GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GL_APICALL void         GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void         GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w);
+GL_APICALL void         GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void         GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void         GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void         GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void         GL_APIENTRY glUseProgram (GLuint program);
+GL_APICALL void         GL_APIENTRY glValidateProgram (GLuint program);
+GL_APICALL void         GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x);
+GL_APICALL void         GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values);
+GL_APICALL void         GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y);
+GL_APICALL void         GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values);
+GL_APICALL void         GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void         GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values);
+GL_APICALL void         GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GL_APICALL void         GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values);
+GL_APICALL void         GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr);
+GL_APICALL void         GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gl2_h_ */
+
+
+#ifndef __gl2ext_h_
+#define __gl2ext_h_
+
+/* $Revision: 19436 $ on $Date:: 2012-10-10 10:37:04 -0700 #$ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+#ifndef GL_APIENTRYP
+#   define GL_APIENTRYP GL_APIENTRY*
+#endif
+
+/*------------------------------------------------------------------------*
+ * OES extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_OES_compressed_ETC1_RGB8_texture */
+#ifndef GL_OES_compressed_ETC1_RGB8_texture
+#define GL_ETC1_RGB8_OES                                        0x8D64
+#endif
+
+/* GL_OES_compressed_paletted_texture */
+#ifndef GL_OES_compressed_paletted_texture
+#define GL_PALETTE4_RGB8_OES                                    0x8B90
+#define GL_PALETTE4_RGBA8_OES                                   0x8B91
+#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
+#define GL_PALETTE4_RGBA4_OES                                   0x8B93
+#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
+#define GL_PALETTE8_RGB8_OES                                    0x8B95
+#define GL_PALETTE8_RGBA8_OES                                   0x8B96
+#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
+#define GL_PALETTE8_RGBA4_OES                                   0x8B98
+#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
+#endif
+
+/* GL_OES_depth24 */
+#ifndef GL_OES_depth24
+#define GL_DEPTH_COMPONENT24_OES                                0x81A6
+#endif
+
+/* GL_OES_depth32 */
+#ifndef GL_OES_depth32
+#define GL_DEPTH_COMPONENT32_OES                                0x81A7
+#endif
+
+/* GL_OES_depth_texture */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_EGL_image */
+#ifndef GL_OES_EGL_image
+typedef void* GLeglImageOES;
+#endif
+
+/* GL_OES_EGL_image_external */
+#ifndef GL_OES_EGL_image_external
+/* GLeglImageOES defined in GL_OES_EGL_image already. */
+#define GL_TEXTURE_EXTERNAL_OES                                 0x8D65
+#define GL_SAMPLER_EXTERNAL_OES                                 0x8D66
+#define GL_TEXTURE_BINDING_EXTERNAL_OES                         0x8D67
+#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES                     0x8D68
+#endif
+
+/* GL_OES_element_index_uint */
+#ifndef GL_OES_element_index_uint
+#define GL_UNSIGNED_INT                                         0x1405
+#endif
+
+/* GL_OES_get_program_binary */
+#ifndef GL_OES_get_program_binary
+#define GL_PROGRAM_BINARY_LENGTH_OES                            0x8741
+#define GL_NUM_PROGRAM_BINARY_FORMATS_OES                       0x87FE
+#define GL_PROGRAM_BINARY_FORMATS_OES                           0x87FF
+#endif
+
+/* GL_OES_mapbuffer */
+#ifndef GL_OES_mapbuffer
+#define GL_WRITE_ONLY_OES                                       0x88B9
+#define GL_BUFFER_ACCESS_OES                                    0x88BB
+#define GL_BUFFER_MAPPED_OES                                    0x88BC
+#define GL_BUFFER_MAP_POINTER_OES                               0x88BD
+#endif
+
+/* GL_OES_packed_depth_stencil */
+#ifndef GL_OES_packed_depth_stencil
+#define GL_DEPTH_STENCIL_OES                                    0x84F9
+#define GL_UNSIGNED_INT_24_8_OES                                0x84FA
+#define GL_DEPTH24_STENCIL8_OES                                 0x88F0
+#endif
+
+/* GL_OES_required_internalformat */
+#ifndef GL_OES_required_internalformat 
+#define GL_ALPHA8_OES                                           0x803C
+#define GL_DEPTH_COMPONENT16_OES                                0x81A5
+/* reuse GL_DEPTH_COMPONENT24_OES */                            
+/* reuse GL_DEPTH24_STENCIL8_OES */                             
+/* reuse GL_DEPTH_COMPONENT32_OES */                            
+#define GL_LUMINANCE4_ALPHA4_OES                                0x8043
+#define GL_LUMINANCE8_ALPHA8_OES                                0x8045
+#define GL_LUMINANCE8_OES                                       0x8040
+#define GL_RGBA4_OES                                            0x8056
+#define GL_RGB5_A1_OES                                          0x8057
+#define GL_RGB565_OES                                           0x8D62
+/* reuse GL_RGB8_OES */                              
+/* reuse GL_RGBA8_OES */  
+/* reuse GL_RGB10_EXT */
+/* reuse GL_RGB10_A2_EXT */
+#endif 
+
+/* GL_OES_rgb8_rgba8 */
+#ifndef GL_OES_rgb8_rgba8
+#define GL_RGB8_OES                                             0x8051
+#define GL_RGBA8_OES                                            0x8058
+#endif
+
+/* GL_OES_standard_derivatives */
+#ifndef GL_OES_standard_derivatives
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES                  0x8B8B
+#endif
+
+/* GL_OES_stencil1 */
+#ifndef GL_OES_stencil1
+#define GL_STENCIL_INDEX1_OES                                   0x8D46
+#endif
+
+/* GL_OES_stencil4 */
+#ifndef GL_OES_stencil4
+#define GL_STENCIL_INDEX4_OES                                   0x8D47
+#endif
+
+#ifndef GL_OES_surfaceless_context
+#define GL_FRAMEBUFFER_UNDEFINED_OES                            0x8219
+#endif
+
+/* GL_OES_texture_3D */
+#ifndef GL_OES_texture_3D
+#define GL_TEXTURE_WRAP_R_OES                                   0x8072
+#define GL_TEXTURE_3D_OES                                       0x806F
+#define GL_TEXTURE_BINDING_3D_OES                               0x806A
+#define GL_MAX_3D_TEXTURE_SIZE_OES                              0x8073
+#define GL_SAMPLER_3D_OES                                       0x8B5F
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES        0x8CD4
+#endif
+
+/* GL_OES_texture_float */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_texture_float_linear */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_texture_half_float */
+#ifndef GL_OES_texture_half_float
+#define GL_HALF_FLOAT_OES                                       0x8D61
+#endif
+
+/* GL_OES_texture_half_float_linear */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_texture_npot */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_vertex_array_object */
+#ifndef GL_OES_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING_OES                             0x85B5
+#endif
+
+/* GL_OES_vertex_half_float */
+/* GL_HALF_FLOAT_OES defined in GL_OES_texture_half_float already. */
+
+/* GL_OES_vertex_type_10_10_10_2 */
+#ifndef GL_OES_vertex_type_10_10_10_2
+#define GL_UNSIGNED_INT_10_10_10_2_OES                          0x8DF6
+#define GL_INT_10_10_10_2_OES                                   0x8DF7
+#endif
+
+/*------------------------------------------------------------------------*
+ * KHR extension tokens
+ *------------------------------------------------------------------------*/
+
+#ifndef GL_KHR_debug
+typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam);
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS                             0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH                     0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION                              0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM                            0x8245
+#define GL_DEBUG_SOURCE_API                                     0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM                           0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER                         0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY                             0x8249
+#define GL_DEBUG_SOURCE_APPLICATION                             0x824A
+#define GL_DEBUG_SOURCE_OTHER                                   0x824B
+#define GL_DEBUG_TYPE_ERROR                                     0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR                       0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR                        0x824E
+#define GL_DEBUG_TYPE_PORTABILITY                               0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE                               0x8250
+#define GL_DEBUG_TYPE_OTHER                                     0x8251
+#define GL_DEBUG_TYPE_MARKER                                    0x8268
+#define GL_DEBUG_TYPE_PUSH_GROUP                                0x8269
+#define GL_DEBUG_TYPE_POP_GROUP                                 0x826A
+#define GL_DEBUG_SEVERITY_NOTIFICATION                          0x826B
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH                          0x826C
+#define GL_DEBUG_GROUP_STACK_DEPTH                              0x826D
+#define GL_BUFFER                                               0x82E0
+#define GL_SHADER                                               0x82E1
+#define GL_PROGRAM                                              0x82E2
+#define GL_QUERY                                                0x82E3
+/* PROGRAM_PIPELINE only in GL */                               
+#define GL_SAMPLER                                              0x82E6
+/* DISPLAY_LIST only in GL */                                   
+#define GL_MAX_LABEL_LENGTH                                     0x82E8
+#define GL_MAX_DEBUG_MESSAGE_LENGTH                             0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES                            0x9144
+#define GL_DEBUG_LOGGED_MESSAGES                                0x9145
+#define GL_DEBUG_SEVERITY_HIGH                                  0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM                                0x9147
+#define GL_DEBUG_SEVERITY_LOW                                   0x9148
+#define GL_DEBUG_OUTPUT                                         0x92E0
+#define GL_CONTEXT_FLAG_DEBUG_BIT                               0x00000002
+#define GL_STACK_OVERFLOW                                       0x0503
+#define GL_STACK_UNDERFLOW                                      0x0504
+#endif
+
+#ifndef GL_KHR_texture_compression_astc_ldr
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR                         0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR                         0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR                         0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR                         0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR                         0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR                         0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR                         0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR                         0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR                        0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR                        0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR                        0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR                       0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR                       0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR                       0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR                 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR                 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR                 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR                 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR                 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR                 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR                 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR                 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR                0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR                0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR                0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR               0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR               0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR               0x93DD
+#endif
+
+/*------------------------------------------------------------------------*
+ * AMD extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_AMD_compressed_3DC_texture */
+#ifndef GL_AMD_compressed_3DC_texture
+#define GL_3DC_X_AMD                                            0x87F9
+#define GL_3DC_XY_AMD                                           0x87FA
+#endif
+
+/* GL_AMD_compressed_ATC_texture */
+#ifndef GL_AMD_compressed_ATC_texture
+#define GL_ATC_RGB_AMD                                          0x8C92
+#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD                          0x8C93
+#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD                      0x87EE
+#endif
+
+/* GL_AMD_performance_monitor */
+#ifndef GL_AMD_performance_monitor
+#define GL_COUNTER_TYPE_AMD                                     0x8BC0
+#define GL_COUNTER_RANGE_AMD                                    0x8BC1
+#define GL_UNSIGNED_INT64_AMD                                   0x8BC2
+#define GL_PERCENTAGE_AMD                                       0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD                         0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD                              0x8BC5
+#define GL_PERFMON_RESULT_AMD                                   0x8BC6
+#endif
+
+/* GL_AMD_program_binary_Z400 */
+#ifndef GL_AMD_program_binary_Z400
+#define GL_Z400_BINARY_AMD                                      0x8740
+#endif
+
+/*------------------------------------------------------------------------*
+ * ANGLE extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_ANGLE_framebuffer_blit */
+#ifndef GL_ANGLE_framebuffer_blit
+#define GL_READ_FRAMEBUFFER_ANGLE                               0x8CA8
+#define GL_DRAW_FRAMEBUFFER_ANGLE                               0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE                       0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING_ANGLE                       0x8CAA
+#endif
+
+/* GL_ANGLE_framebuffer_multisample */
+#ifndef GL_ANGLE_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_ANGLE                           0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE             0x8D56
+#define GL_MAX_SAMPLES_ANGLE                                    0x8D57
+#endif
+
+/* GL_ANGLE_instanced_arrays */
+#ifndef GL_ANGLE_instanced_arrays 
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE                    0x88FE
+#endif
+
+/* GL_ANGLE_pack_reverse_row_order */
+#ifndef GL_ANGLE_pack_reverse_row_order 
+#define GL_PACK_REVERSE_ROW_ORDER_ANGLE                         0x93A4
+#endif
+
+/* GL_ANGLE_texture_compression_dxt3 */
+#ifndef GL_ANGLE_texture_compression_dxt3 
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE                      0x83F2
+#endif
+
+/* GL_ANGLE_texture_compression_dxt5 */
+#ifndef GL_ANGLE_texture_compression_dxt5 
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE                      0x83F3
+#endif
+
+/* GL_ANGLE_texture_usage */
+#ifndef GL_ANGLE_texture_usage 
+#define GL_TEXTURE_USAGE_ANGLE                                  0x93A2
+#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE                         0x93A3
+#endif
+
+/* GL_ANGLE_translated_shader_source */
+#ifndef GL_ANGLE_translated_shader_source 
+#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE                0x93A0
+#endif
+
+/*------------------------------------------------------------------------*
+ * APPLE extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_APPLE_copy_texture_levels */
+/* No new tokens introduced by this extension. */
+    
+/* GL_APPLE_framebuffer_multisample */
+#ifndef GL_APPLE_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_APPLE                           0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE             0x8D56
+#define GL_MAX_SAMPLES_APPLE                                    0x8D57
+#define GL_READ_FRAMEBUFFER_APPLE                               0x8CA8
+#define GL_DRAW_FRAMEBUFFER_APPLE                               0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE                       0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING_APPLE                       0x8CAA
+#endif
+
+/* GL_APPLE_rgb_422 */
+#ifndef GL_APPLE_rgb_422
+#define GL_RGB_422_APPLE                                        0x8A1F
+#define GL_UNSIGNED_SHORT_8_8_APPLE                             0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE                         0x85BB
+#endif
+
+/* GL_APPLE_sync */
+#ifndef GL_APPLE_sync
+
+#ifndef __gl3_h_
+/* These types are defined with reference to <inttypes.h>
+ * in the Apple extension spec, but here we use the Khronos
+ * portable types in khrplatform.h, and assume those types 
+ * are always defined.
+ * If any other extensions using these types are defined, 
+ * the typedefs must move out of this block and be shared.
+ */
+typedef khronos_int64_t GLint64;
+typedef khronos_uint64_t GLuint64;
+typedef struct __GLsync *GLsync;
+#endif
+
+#define GL_SYNC_OBJECT_APPLE                                    0x8A53
+#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE                        0x9111
+#define GL_OBJECT_TYPE_APPLE                                    0x9112
+#define GL_SYNC_CONDITION_APPLE                                 0x9113
+#define GL_SYNC_STATUS_APPLE                                    0x9114
+#define GL_SYNC_FLAGS_APPLE                                     0x9115
+#define GL_SYNC_FENCE_APPLE                                     0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE                     0x9117
+#define GL_UNSIGNALED_APPLE                                     0x9118
+#define GL_SIGNALED_APPLE                                       0x9119
+#define GL_ALREADY_SIGNALED_APPLE                               0x911A
+#define GL_TIMEOUT_EXPIRED_APPLE                                0x911B
+#define GL_CONDITION_SATISFIED_APPLE                            0x911C
+#define GL_WAIT_FAILED_APPLE                                    0x911D
+#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE                        0x00000001
+#define GL_TIMEOUT_IGNORED_APPLE                                0xFFFFFFFFFFFFFFFFull
+#endif
+
+/* GL_APPLE_texture_format_BGRA8888 */
+#ifndef GL_APPLE_texture_format_BGRA8888
+#define GL_BGRA_EXT                                             0x80E1
+#endif
+
+/* GL_APPLE_texture_max_level */
+#ifndef GL_APPLE_texture_max_level
+#define GL_TEXTURE_MAX_LEVEL_APPLE                              0x813D
+#endif
+
+/*------------------------------------------------------------------------*
+ * ARM extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_ARM_mali_program_binary */
+#ifndef GL_ARM_mali_program_binary
+#define GL_MALI_PROGRAM_BINARY_ARM                              0x8F61
+#endif
+
+/* GL_ARM_mali_shader_binary */
+#ifndef GL_ARM_mali_shader_binary
+#define GL_MALI_SHADER_BINARY_ARM                               0x8F60
+#endif
+
+/* GL_ARM_rgba8 */
+/* No new tokens introduced by this extension. */
+
+/*------------------------------------------------------------------------*
+ * EXT extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_EXT_blend_minmax */
+#ifndef GL_EXT_blend_minmax
+#define GL_MIN_EXT                                              0x8007
+#define GL_MAX_EXT                                              0x8008
+#endif
+
+/* GL_EXT_color_buffer_half_float */
+#ifndef GL_EXT_color_buffer_half_float
+#define GL_RGBA16F_EXT                                          0x881A
+#define GL_RGB16F_EXT                                           0x881B
+#define GL_RG16F_EXT                                            0x822F
+#define GL_R16F_EXT                                             0x822D
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT            0x8211
+#define GL_UNSIGNED_NORMALIZED_EXT                              0x8C17
+#endif
+
+/* GL_EXT_debug_label */
+#ifndef GL_EXT_debug_label
+#define GL_PROGRAM_PIPELINE_OBJECT_EXT                          0x8A4F
+#define GL_PROGRAM_OBJECT_EXT                                   0x8B40
+#define GL_SHADER_OBJECT_EXT                                    0x8B48
+#define GL_BUFFER_OBJECT_EXT                                    0x9151
+#define GL_QUERY_OBJECT_EXT                                     0x9153
+#define GL_VERTEX_ARRAY_OBJECT_EXT                              0x9154
+#endif
+
+/* GL_EXT_debug_marker */
+/* No new tokens introduced by this extension. */
+
+/* GL_EXT_discard_framebuffer */
+#ifndef GL_EXT_discard_framebuffer
+#define GL_COLOR_EXT                                            0x1800
+#define GL_DEPTH_EXT                                            0x1801
+#define GL_STENCIL_EXT                                          0x1802
+#endif
+
+/* GL_EXT_map_buffer_range */
+#ifndef GL_EXT_map_buffer_range
+#define GL_MAP_READ_BIT_EXT                                     0x0001
+#define GL_MAP_WRITE_BIT_EXT                                    0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT_EXT                         0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT                        0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT                           0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT_EXT                           0x0020
+#endif
+
+/* GL_EXT_multisampled_render_to_texture */
+#ifndef GL_EXT_multisampled_render_to_texture
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT           0x8D6C
+/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ 
+#define GL_RENDERBUFFER_SAMPLES_EXT                             0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT               0x8D56
+#define GL_MAX_SAMPLES_EXT                                      0x8D57
+#endif
+
+/* GL_EXT_multiview_draw_buffers */
+#ifndef GL_EXT_multiview_draw_buffers
+#define GL_COLOR_ATTACHMENT_EXT                                 0x90F0
+#define GL_MULTIVIEW_EXT                                        0x90F1
+#define GL_DRAW_BUFFER_EXT                                      0x0C01
+#define GL_READ_BUFFER_EXT                                      0x0C02
+#define GL_MAX_MULTIVIEW_BUFFERS_EXT                            0x90F2
+#endif
+
+/* GL_EXT_multi_draw_arrays */
+/* No new tokens introduced by this extension. */
+
+/* GL_EXT_occlusion_query_boolean */
+#ifndef GL_EXT_occlusion_query_boolean
+#define GL_ANY_SAMPLES_PASSED_EXT                               0x8C2F
+#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT                  0x8D6A
+#define GL_CURRENT_QUERY_EXT                                    0x8865
+#define GL_QUERY_RESULT_EXT                                     0x8866
+#define GL_QUERY_RESULT_AVAILABLE_EXT                           0x8867
+#endif
+
+/* GL_EXT_read_format_bgra */
+#ifndef GL_EXT_read_format_bgra
+#define GL_BGRA_EXT                                             0x80E1
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT                       0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT                       0x8366
+#endif
+
+/* GL_EXT_robustness */
+#ifndef GL_EXT_robustness
+/* reuse GL_NO_ERROR */
+#define GL_GUILTY_CONTEXT_RESET_EXT                             0x8253
+#define GL_INNOCENT_CONTEXT_RESET_EXT                           0x8254
+#define GL_UNKNOWN_CONTEXT_RESET_EXT                            0x8255
+#define GL_CONTEXT_ROBUST_ACCESS_EXT                            0x90F3
+#define GL_RESET_NOTIFICATION_STRATEGY_EXT                      0x8256
+#define GL_LOSE_CONTEXT_ON_RESET_EXT                            0x8252
+#define GL_NO_RESET_NOTIFICATION_EXT                            0x8261
+#endif
+
+/* GL_EXT_separate_shader_objects */
+#ifndef GL_EXT_separate_shader_objects
+#define GL_VERTEX_SHADER_BIT_EXT                                0x00000001
+#define GL_FRAGMENT_SHADER_BIT_EXT                              0x00000002
+#define GL_ALL_SHADER_BITS_EXT                                  0xFFFFFFFF
+#define GL_PROGRAM_SEPARABLE_EXT                                0x8258
+#define GL_ACTIVE_PROGRAM_EXT                                   0x8259
+#define GL_PROGRAM_PIPELINE_BINDING_EXT                         0x825A
+#endif
+
+/* GL_EXT_shader_framebuffer_fetch */
+#ifndef GL_EXT_shader_framebuffer_fetch
+#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT                 0x8A52
+#endif
+
+/* GL_EXT_shader_texture_lod */
+/* No new tokens introduced by this extension. */
+
+/* GL_EXT_shadow_samplers */
+#ifndef GL_EXT_shadow_samplers
+#define GL_TEXTURE_COMPARE_MODE_EXT                             0x884C
+#define GL_TEXTURE_COMPARE_FUNC_EXT                             0x884D
+#define GL_COMPARE_REF_TO_TEXTURE_EXT                           0x884E
+#define GL_SAMPLER_2D_SHADOW_EXT                                0x8B62
+#endif
+
+/* GL_EXT_sRGB */
+#ifndef GL_EXT_sRGB
+#define GL_SRGB_EXT                                             0x8C40
+#define GL_SRGB_ALPHA_EXT                                       0x8C42
+#define GL_SRGB8_ALPHA8_EXT                                     0x8C43
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT            0x8210
+#endif
+
+/* GL_EXT_texture_compression_dxt1 */
+#ifndef GL_EXT_texture_compression_dxt1
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT                         0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT                        0x83F1
+#endif
+
+/* GL_EXT_texture_filter_anisotropic */
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT                           0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT                       0x84FF
+#endif
+
+/* GL_EXT_texture_format_BGRA8888 */
+#ifndef GL_EXT_texture_format_BGRA8888
+#define GL_BGRA_EXT                                             0x80E1
+#endif
+
+/* GL_EXT_texture_rg */
+#ifndef GL_EXT_texture_rg
+#define GL_RED_EXT                                              0x1903
+#define GL_RG_EXT                                               0x8227
+#define GL_R8_EXT                                               0x8229
+#define GL_RG8_EXT                                              0x822B
+#endif
+
+/* GL_EXT_texture_storage */
+#ifndef GL_EXT_texture_storage
+#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT                         0x912F
+#define GL_ALPHA8_EXT                                           0x803C  
+#define GL_LUMINANCE8_EXT                                       0x8040
+#define GL_LUMINANCE8_ALPHA8_EXT                                0x8045
+#define GL_RGBA32F_EXT                                          0x8814  
+#define GL_RGB32F_EXT                                           0x8815
+#define GL_ALPHA32F_EXT                                         0x8816
+#define GL_LUMINANCE32F_EXT                                     0x8818
+#define GL_LUMINANCE_ALPHA32F_EXT                               0x8819
+/* reuse GL_RGBA16F_EXT */
+/* reuse GL_RGB16F_EXT */
+#define GL_ALPHA16F_EXT                                         0x881C
+#define GL_LUMINANCE16F_EXT                                     0x881E
+#define GL_LUMINANCE_ALPHA16F_EXT                               0x881F
+#define GL_RGB10_A2_EXT                                         0x8059  
+#define GL_RGB10_EXT                                            0x8052
+#define GL_BGRA8_EXT                                            0x93A1
+#define GL_R8_EXT                                               0x8229
+#define GL_RG8_EXT                                              0x822B
+#define GL_R32F_EXT                                             0x822E  
+#define GL_RG32F_EXT                                            0x8230
+#define GL_R16F_EXT                                             0x822D
+#define GL_RG16F_EXT                                            0x822F
+#endif
+
+/* GL_EXT_texture_type_2_10_10_10_REV */
+#ifndef GL_EXT_texture_type_2_10_10_10_REV
+#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT                      0x8368
+#endif
+
+/* GL_EXT_unpack_subimage */
+#ifndef GL_EXT_unpack_subimage
+#define GL_UNPACK_ROW_LENGTH                                    0x0CF2
+#define GL_UNPACK_SKIP_ROWS                                     0x0CF3
+#define GL_UNPACK_SKIP_PIXELS                                   0x0CF4
+#endif
+
+/*------------------------------------------------------------------------*
+ * DMP extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_DMP_shader_binary */
+#ifndef GL_DMP_shader_binary
+#define GL_SHADER_BINARY_DMP                                    0x9250
+#endif
+
+/*------------------------------------------------------------------------*
+ * FJ extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_FJ_shader_binary_GCCSO */
+#ifndef GL_FJ_shader_binary_GCCSO
+#define GCCSO_SHADER_BINARY_FJ                                  0x9260
+#endif
+
+/*------------------------------------------------------------------------*
+ * IMG extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_IMG_program_binary */
+#ifndef GL_IMG_program_binary
+#define GL_SGX_PROGRAM_BINARY_IMG                               0x9130
+#endif
+
+/* GL_IMG_read_format */
+#ifndef GL_IMG_read_format
+#define GL_BGRA_IMG                                             0x80E1
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG                       0x8365
+#endif
+
+/* GL_IMG_shader_binary */
+#ifndef GL_IMG_shader_binary
+#define GL_SGX_BINARY_IMG                                       0x8C0A
+#endif
+
+/* GL_IMG_texture_compression_pvrtc */
+#ifndef GL_IMG_texture_compression_pvrtc
+#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG                      0x8C00
+#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG                      0x8C01
+#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG                     0x8C02
+#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG                     0x8C03
+#endif
+
+/* GL_IMG_multisampled_render_to_texture */
+#ifndef GL_IMG_multisampled_render_to_texture
+#define GL_RENDERBUFFER_SAMPLES_IMG                             0x9133
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG               0x9134
+#define GL_MAX_SAMPLES_IMG                                      0x9135
+#define GL_TEXTURE_SAMPLES_IMG                                  0x9136
+#endif
+
+/*------------------------------------------------------------------------*
+ * NV extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_NV_coverage_sample */
+#ifndef GL_NV_coverage_sample
+#define GL_COVERAGE_COMPONENT_NV                                0x8ED0
+#define GL_COVERAGE_COMPONENT4_NV                               0x8ED1
+#define GL_COVERAGE_ATTACHMENT_NV                               0x8ED2
+#define GL_COVERAGE_BUFFERS_NV                                  0x8ED3
+#define GL_COVERAGE_SAMPLES_NV                                  0x8ED4
+#define GL_COVERAGE_ALL_FRAGMENTS_NV                            0x8ED5
+#define GL_COVERAGE_EDGE_FRAGMENTS_NV                           0x8ED6
+#define GL_COVERAGE_AUTOMATIC_NV                                0x8ED7
+#define GL_COVERAGE_BUFFER_BIT_NV                               0x8000
+#endif
+
+/* GL_NV_depth_nonlinear */
+#ifndef GL_NV_depth_nonlinear
+#define GL_DEPTH_COMPONENT16_NONLINEAR_NV                       0x8E2C
+#endif
+
+/* GL_NV_draw_buffers */
+#ifndef GL_NV_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_NV                                  0x8824
+#define GL_DRAW_BUFFER0_NV                                      0x8825
+#define GL_DRAW_BUFFER1_NV                                      0x8826
+#define GL_DRAW_BUFFER2_NV                                      0x8827
+#define GL_DRAW_BUFFER3_NV                                      0x8828
+#define GL_DRAW_BUFFER4_NV                                      0x8829
+#define GL_DRAW_BUFFER5_NV                                      0x882A
+#define GL_DRAW_BUFFER6_NV                                      0x882B
+#define GL_DRAW_BUFFER7_NV                                      0x882C
+#define GL_DRAW_BUFFER8_NV                                      0x882D
+#define GL_DRAW_BUFFER9_NV                                      0x882E
+#define GL_DRAW_BUFFER10_NV                                     0x882F
+#define GL_DRAW_BUFFER11_NV                                     0x8830
+#define GL_DRAW_BUFFER12_NV                                     0x8831
+#define GL_DRAW_BUFFER13_NV                                     0x8832
+#define GL_DRAW_BUFFER14_NV                                     0x8833
+#define GL_DRAW_BUFFER15_NV                                     0x8834
+#define GL_COLOR_ATTACHMENT0_NV                                 0x8CE0
+#define GL_COLOR_ATTACHMENT1_NV                                 0x8CE1
+#define GL_COLOR_ATTACHMENT2_NV                                 0x8CE2
+#define GL_COLOR_ATTACHMENT3_NV                                 0x8CE3
+#define GL_COLOR_ATTACHMENT4_NV                                 0x8CE4
+#define GL_COLOR_ATTACHMENT5_NV                                 0x8CE5
+#define GL_COLOR_ATTACHMENT6_NV                                 0x8CE6
+#define GL_COLOR_ATTACHMENT7_NV                                 0x8CE7
+#define GL_COLOR_ATTACHMENT8_NV                                 0x8CE8
+#define GL_COLOR_ATTACHMENT9_NV                                 0x8CE9
+#define GL_COLOR_ATTACHMENT10_NV                                0x8CEA
+#define GL_COLOR_ATTACHMENT11_NV                                0x8CEB
+#define GL_COLOR_ATTACHMENT12_NV                                0x8CEC
+#define GL_COLOR_ATTACHMENT13_NV                                0x8CED
+#define GL_COLOR_ATTACHMENT14_NV                                0x8CEE
+#define GL_COLOR_ATTACHMENT15_NV                                0x8CEF
+#endif
+
+/* GL_NV_fbo_color_attachments */
+#ifndef GL_NV_fbo_color_attachments
+#define GL_MAX_COLOR_ATTACHMENTS_NV                             0x8CDF
+/* GL_COLOR_ATTACHMENT{0-15}_NV defined in GL_NV_draw_buffers already. */
+#endif
+
+/* GL_NV_fence */
+#ifndef GL_NV_fence
+#define GL_ALL_COMPLETED_NV                                     0x84F2
+#define GL_FENCE_STATUS_NV                                      0x84F3
+#define GL_FENCE_CONDITION_NV                                   0x84F4
+#endif
+
+/* GL_NV_read_buffer */
+#ifndef GL_NV_read_buffer
+#define GL_READ_BUFFER_NV                                       0x0C02
+#endif
+
+/* GL_NV_read_buffer_front */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_read_depth */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_read_depth_stencil */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_read_stencil */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_texture_compression_s3tc_update */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_texture_npot_2D_mipmap */
+/* No new tokens introduced by this extension. */
+
+/*------------------------------------------------------------------------*
+ * QCOM extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_QCOM_alpha_test */
+#ifndef GL_QCOM_alpha_test
+#define GL_ALPHA_TEST_QCOM                                      0x0BC0
+#define GL_ALPHA_TEST_FUNC_QCOM                                 0x0BC1
+#define GL_ALPHA_TEST_REF_QCOM                                  0x0BC2
+#endif
+
+/* GL_QCOM_binning_control */
+#ifndef GL_QCOM_binning_control
+#define GL_BINNING_CONTROL_HINT_QCOM                            0x8FB0
+#define GL_CPU_OPTIMIZED_QCOM                                   0x8FB1
+#define GL_GPU_OPTIMIZED_QCOM                                   0x8FB2
+#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM                    0x8FB3
+#endif
+
+/* GL_QCOM_driver_control */
+/* No new tokens introduced by this extension. */
+
+/* GL_QCOM_extended_get */
+#ifndef GL_QCOM_extended_get
+#define GL_TEXTURE_WIDTH_QCOM                                   0x8BD2
+#define GL_TEXTURE_HEIGHT_QCOM                                  0x8BD3
+#define GL_TEXTURE_DEPTH_QCOM                                   0x8BD4
+#define GL_TEXTURE_INTERNAL_FORMAT_QCOM                         0x8BD5
+#define GL_TEXTURE_FORMAT_QCOM                                  0x8BD6
+#define GL_TEXTURE_TYPE_QCOM                                    0x8BD7
+#define GL_TEXTURE_IMAGE_VALID_QCOM                             0x8BD8
+#define GL_TEXTURE_NUM_LEVELS_QCOM                              0x8BD9
+#define GL_TEXTURE_TARGET_QCOM                                  0x8BDA
+#define GL_TEXTURE_OBJECT_VALID_QCOM                            0x8BDB
+#define GL_STATE_RESTORE                                        0x8BDC
+#endif
+
+/* GL_QCOM_extended_get2 */
+/* No new tokens introduced by this extension. */
+
+/* GL_QCOM_perfmon_global_mode */
+#ifndef GL_QCOM_perfmon_global_mode
+#define GL_PERFMON_GLOBAL_MODE_QCOM                             0x8FA0
+#endif
+
+/* GL_QCOM_writeonly_rendering */
+#ifndef GL_QCOM_writeonly_rendering
+#define GL_WRITEONLY_RENDERING_QCOM                             0x8823
+#endif
+
+/* GL_QCOM_tiled_rendering */
+#ifndef GL_QCOM_tiled_rendering
+#define GL_COLOR_BUFFER_BIT0_QCOM                               0x00000001
+#define GL_COLOR_BUFFER_BIT1_QCOM                               0x00000002
+#define GL_COLOR_BUFFER_BIT2_QCOM                               0x00000004
+#define GL_COLOR_BUFFER_BIT3_QCOM                               0x00000008
+#define GL_COLOR_BUFFER_BIT4_QCOM                               0x00000010
+#define GL_COLOR_BUFFER_BIT5_QCOM                               0x00000020
+#define GL_COLOR_BUFFER_BIT6_QCOM                               0x00000040
+#define GL_COLOR_BUFFER_BIT7_QCOM                               0x00000080
+#define GL_DEPTH_BUFFER_BIT0_QCOM                               0x00000100
+#define GL_DEPTH_BUFFER_BIT1_QCOM                               0x00000200
+#define GL_DEPTH_BUFFER_BIT2_QCOM                               0x00000400
+#define GL_DEPTH_BUFFER_BIT3_QCOM                               0x00000800
+#define GL_DEPTH_BUFFER_BIT4_QCOM                               0x00001000
+#define GL_DEPTH_BUFFER_BIT5_QCOM                               0x00002000
+#define GL_DEPTH_BUFFER_BIT6_QCOM                               0x00004000
+#define GL_DEPTH_BUFFER_BIT7_QCOM                               0x00008000
+#define GL_STENCIL_BUFFER_BIT0_QCOM                             0x00010000
+#define GL_STENCIL_BUFFER_BIT1_QCOM                             0x00020000
+#define GL_STENCIL_BUFFER_BIT2_QCOM                             0x00040000
+#define GL_STENCIL_BUFFER_BIT3_QCOM                             0x00080000
+#define GL_STENCIL_BUFFER_BIT4_QCOM                             0x00100000
+#define GL_STENCIL_BUFFER_BIT5_QCOM                             0x00200000
+#define GL_STENCIL_BUFFER_BIT6_QCOM                             0x00400000
+#define GL_STENCIL_BUFFER_BIT7_QCOM                             0x00800000
+#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM                         0x01000000
+#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM                         0x02000000
+#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM                         0x04000000
+#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM                         0x08000000
+#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM                         0x10000000
+#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM                         0x20000000
+#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM                         0x40000000
+#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM                         0x80000000
+#endif
+
+/*------------------------------------------------------------------------*
+ * VIV extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_VIV_shader_binary */
+#ifndef GL_VIV_shader_binary
+#define GL_SHADER_BINARY_VIV                                    0x8FC4
+#endif
+
+/*------------------------------------------------------------------------*
+ * End of extension tokens, start of corresponding extension functions
+ *------------------------------------------------------------------------*/
+
+/*------------------------------------------------------------------------*
+ * OES extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_OES_compressed_ETC1_RGB8_texture */
+#ifndef GL_OES_compressed_ETC1_RGB8_texture
+#define GL_OES_compressed_ETC1_RGB8_texture 1
+#endif
+
+/* GL_OES_compressed_paletted_texture */
+#ifndef GL_OES_compressed_paletted_texture
+#define GL_OES_compressed_paletted_texture 1
+#endif
+
+/* GL_OES_depth24 */
+#ifndef GL_OES_depth24
+#define GL_OES_depth24 1
+#endif
+
+/* GL_OES_depth32 */
+#ifndef GL_OES_depth32
+#define GL_OES_depth32 1
+#endif
+
+/* GL_OES_depth_texture */
+#ifndef GL_OES_depth_texture
+#define GL_OES_depth_texture 1
+#endif
+
+/* GL_OES_EGL_image */
+#ifndef GL_OES_EGL_image
+#define GL_OES_EGL_image 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
+GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
+#endif
+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
+#endif
+
+/* GL_OES_EGL_image_external */
+#ifndef GL_OES_EGL_image_external
+#define GL_OES_EGL_image_external 1
+/* glEGLImageTargetTexture2DOES defined in GL_OES_EGL_image already. */
+#endif
+
+/* GL_OES_element_index_uint */
+#ifndef GL_OES_element_index_uint
+#define GL_OES_element_index_uint 1
+#endif
+
+/* GL_OES_fbo_render_mipmap */
+#ifndef GL_OES_fbo_render_mipmap
+#define GL_OES_fbo_render_mipmap 1
+#endif
+
+/* GL_OES_fragment_precision_high */
+#ifndef GL_OES_fragment_precision_high
+#define GL_OES_fragment_precision_high 1
+#endif
+
+/* GL_OES_get_program_binary */
+#ifndef GL_OES_get_program_binary
+#define GL_OES_get_program_binary 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetProgramBinaryOES (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+GL_APICALL void GL_APIENTRY glProgramBinaryOES (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length);
+#endif
+typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length);
+#endif
+
+/* GL_OES_mapbuffer */
+#ifndef GL_OES_mapbuffer
+#define GL_OES_mapbuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access);
+GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target);
+GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLvoid** params);
+#endif
+typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access);
+typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target);
+typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, GLvoid** params);
+#endif
+
+/* GL_OES_packed_depth_stencil */
+#ifndef GL_OES_packed_depth_stencil
+#define GL_OES_packed_depth_stencil 1
+#endif
+
+/* GL_OES_required_internalformat */
+#ifndef GL_OES_required_internalformat
+#define GL_OES_required_internalformat 1
+#endif
+
+/* GL_OES_rgb8_rgba8 */
+#ifndef GL_OES_rgb8_rgba8
+#define GL_OES_rgb8_rgba8 1
+#endif
+
+/* GL_OES_standard_derivatives */
+#ifndef GL_OES_standard_derivatives
+#define GL_OES_standard_derivatives 1
+#endif
+
+/* GL_OES_stencil1 */
+#ifndef GL_OES_stencil1
+#define GL_OES_stencil1 1
+#endif
+
+/* GL_OES_stencil4 */
+#ifndef GL_OES_stencil4
+#define GL_OES_stencil4 1
+#endif
+
+#ifndef GL_OES_surfaceless_context
+#define GL_OES_surfaceless_context 1
+#endif
+
+/* GL_OES_texture_3D */
+#ifndef GL_OES_texture_3D
+#define GL_OES_texture_3D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void GL_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+#endif
+typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels);
+typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+#endif
+
+/* GL_OES_texture_float */
+#ifndef GL_OES_texture_float
+#define GL_OES_texture_float 1
+#endif
+
+/* GL_OES_texture_float_linear */
+#ifndef GL_OES_texture_float_linear
+#define GL_OES_texture_float_linear 1
+#endif
+
+/* GL_OES_texture_half_float */
+#ifndef GL_OES_texture_half_float
+#define GL_OES_texture_half_float 1
+#endif
+
+/* GL_OES_texture_half_float_linear */
+#ifndef GL_OES_texture_half_float_linear
+#define GL_OES_texture_half_float_linear 1
+#endif
+
+/* GL_OES_texture_npot */
+#ifndef GL_OES_texture_npot
+#define GL_OES_texture_npot 1
+#endif
+
+/* GL_OES_vertex_array_object */
+#ifndef GL_OES_vertex_array_object
+#define GL_OES_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glBindVertexArrayOES (GLuint array);
+GL_APICALL void GL_APIENTRY glDeleteVertexArraysOES (GLsizei n, const GLuint *arrays);
+GL_APICALL void GL_APIENTRY glGenVertexArraysOES (GLsizei n, GLuint *arrays);
+GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayOES (GLuint array);
+#endif
+typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESPROC) (GLuint array);
+typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays);
+typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array);
+#endif
+
+/* GL_OES_vertex_half_float */
+#ifndef GL_OES_vertex_half_float
+#define GL_OES_vertex_half_float 1
+#endif
+
+/* GL_OES_vertex_type_10_10_10_2 */
+#ifndef GL_OES_vertex_type_10_10_10_2
+#define GL_OES_vertex_type_10_10_10_2 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * KHR extension functions
+ *------------------------------------------------------------------------*/
+
+#ifndef GL_KHR_debug
+#define GL_KHR_debug 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GL_APICALL void GL_APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GL_APICALL void GL_APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam);
+GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+GL_APICALL void GL_APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+GL_APICALL void GL_APIENTRY glPopDebugGroup (void);
+GL_APICALL void GL_APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label);
+GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params);
+#endif 
+typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
+typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void);
+typedef void (GL_APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label);
+typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params);
+#endif
+
+#ifndef GL_KHR_texture_compression_astc_ldr
+#define GL_KHR_texture_compression_astc_ldr 1
+#endif
+
+
+/*------------------------------------------------------------------------*
+ * AMD extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_AMD_compressed_3DC_texture */
+#ifndef GL_AMD_compressed_3DC_texture
+#define GL_AMD_compressed_3DC_texture 1
+#endif
+
+/* GL_AMD_compressed_ATC_texture */
+#ifndef GL_AMD_compressed_ATC_texture
+#define GL_AMD_compressed_ATC_texture 1
+#endif
+
+/* AMD_performance_monitor */
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
+GL_APICALL void GL_APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GL_APICALL void GL_APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GL_APICALL void GL_APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList);
+GL_APICALL void GL_APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
+GL_APICALL void GL_APIENTRY glEndPerfMonitorAMD (GLuint monitor);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
+typedef void (GL_APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (GL_APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (GL_APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList);
+typedef void (GL_APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (GL_APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+
+/* GL_AMD_program_binary_Z400 */
+#ifndef GL_AMD_program_binary_Z400
+#define GL_AMD_program_binary_Z400 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * ANGLE extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_ANGLE_framebuffer_blit */
+#ifndef GL_ANGLE_framebuffer_blit
+#define GL_ANGLE_framebuffer_blit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glBlitFramebufferANGLE (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+
+/* GL_ANGLE_framebuffer_multisample */
+#ifndef GL_ANGLE_framebuffer_multisample
+#define GL_ANGLE_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_ANGLE_instanced_arrays 
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor);
+#endif
+typedef void (GL_APIENTRYP PFLGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (GL_APIENTRYP PFLGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+typedef void (GL_APIENTRYP PFLGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor);
+#endif
+
+/* GL_ANGLE_pack_reverse_row_order */
+#ifndef GL_ANGLE_pack_reverse_row_order 
+#define GL_ANGLE_pack_reverse_row_order 1
+#endif
+
+/* GL_ANGLE_texture_compression_dxt3 */
+#ifndef GL_ANGLE_texture_compression_dxt3 
+#define GL_ANGLE_texture_compression_dxt3 1
+#endif
+
+/* GL_ANGLE_texture_compression_dxt5 */
+#ifndef GL_ANGLE_texture_compression_dxt5 
+#define GL_ANGLE_texture_compression_dxt5 1
+#endif
+
+/* GL_ANGLE_texture_usage */
+#ifndef GL_ANGLE_texture_usage 
+#define GL_ANGLE_texture_usage 1
+#endif
+
+#ifndef GL_ANGLE_translated_shader_source 
+#define GL_ANGLE_translated_shader_source 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
+#endif
+typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
+#endif
+
+/*------------------------------------------------------------------------*
+ * APPLE extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_APPLE_copy_texture_levels */
+#ifndef GL_APPLE_copy_texture_levels
+#define GL_APPLE_copy_texture_levels 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);
+#endif
+typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);
+#endif
+
+/* GL_APPLE_framebuffer_multisample */
+#ifndef GL_APPLE_framebuffer_multisample
+#define GL_APPLE_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+GL_APICALL void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void);
+#endif
+
+/* GL_APPLE_rgb_422 */
+#ifndef GL_APPLE_rgb_422
+#define GL_APPLE_rgb_422 1
+#endif
+
+/* GL_APPLE_sync */
+#ifndef GL_APPLE_sync
+#define GL_APPLE_sync 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags);
+GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync);
+GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync);
+GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params);
+GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif
+typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags);
+typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync);
+typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync);
+typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params);
+typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif
+
+/* GL_APPLE_texture_format_BGRA8888 */
+#ifndef GL_APPLE_texture_format_BGRA8888
+#define GL_APPLE_texture_format_BGRA8888 1
+#endif
+
+/* GL_APPLE_texture_max_level */
+#ifndef GL_APPLE_texture_max_level
+#define GL_APPLE_texture_max_level 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * ARM extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_ARM_mali_program_binary */
+#ifndef GL_ARM_mali_program_binary
+#define GL_ARM_mali_program_binary 1
+#endif
+
+/* GL_ARM_mali_shader_binary */
+#ifndef GL_ARM_mali_shader_binary
+#define GL_ARM_mali_shader_binary 1
+#endif
+
+/* GL_ARM_rgba8 */
+#ifndef GL_ARM_rgba8
+#define GL_ARM_rgba8 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * EXT extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_EXT_blend_minmax */
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#endif
+
+/* GL_EXT_color_buffer_half_float */
+#ifndef GL_EXT_color_buffer_half_float
+#define GL_EXT_color_buffer_half_float 1
+#endif
+
+/* GL_EXT_debug_label */
+#ifndef GL_EXT_debug_label
+#define GL_EXT_debug_label 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+GL_APICALL void GL_APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+typedef void (GL_APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+
+/* GL_EXT_debug_marker */
+#ifndef GL_EXT_debug_marker
+#define GL_EXT_debug_marker 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker);
+GL_APICALL void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker);
+GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void);
+#endif
+typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void);
+#endif
+
+/* GL_EXT_discard_framebuffer */
+#ifndef GL_EXT_discard_framebuffer
+#define GL_EXT_discard_framebuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+#endif
+typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+#endif
+
+/* GL_EXT_map_buffer_range */
+#ifndef GL_EXT_map_buffer_range
+#define GL_EXT_map_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void* GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif
+typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif
+
+/* GL_EXT_multisampled_render_to_texture */
+#ifndef GL_EXT_multisampled_render_to_texture
+#define GL_EXT_multisampled_render_to_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);
+#endif
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
+#endif
+
+/* GL_EXT_multiview_draw_buffers */
+#ifndef GL_EXT_multiview_draw_buffers
+#define GL_EXT_multiview_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index);
+GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices);
+GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data);
+#endif
+typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index);
+typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices);
+typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data);
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
+GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
+#endif
+
+/* GL_EXT_occlusion_query_boolean */
+#ifndef GL_EXT_occlusion_query_boolean
+#define GL_EXT_occlusion_query_boolean 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids);
+GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids);
+GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id);
+GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id);
+GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target);
+GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params);
+GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params);
+#endif
+typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids);
+typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id);
+typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id);
+typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target);
+typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params);
+#endif
+
+/* GL_EXT_read_format_bgra */
+#ifndef GL_EXT_read_format_bgra
+#define GL_EXT_read_format_bgra 1
+#endif
+
+/* GL_EXT_robustness */
+#ifndef GL_EXT_robustness
+#define GL_EXT_robustness 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void);
+GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, float *params);
+GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+#endif
+typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void);
+typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, float *params);
+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+#endif
+
+/* GL_EXT_separate_shader_objects */
+#ifndef GL_EXT_separate_shader_objects
+#define GL_EXT_separate_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glUseProgramStagesEXT (GLuint pipeline, GLbitfield stages, GLuint program);
+GL_APICALL void GL_APIENTRY glActiveShaderProgramEXT (GLuint pipeline, GLuint program);
+GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvEXT (GLenum type, GLsizei count, const GLchar **strings);
+GL_APICALL void GL_APIENTRY glBindProgramPipelineEXT (GLuint pipeline);
+GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesEXT (GLsizei n, const GLuint *pipelines);
+GL_APICALL void GL_APIENTRY glGenProgramPipelinesEXT (GLsizei n, GLuint *pipelines);
+GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineEXT (GLuint pipeline);
+GL_APICALL void GL_APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
+GL_APICALL void GL_APIENTRY glGetProgramPipelineivEXT (GLuint pipeline, GLenum pname, GLint *params);
+GL_APICALL void GL_APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint x);
+GL_APICALL void GL_APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint x, GLint y);
+GL_APICALL void GL_APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z);
+GL_APICALL void GL_APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+GL_APICALL void GL_APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat x);
+GL_APICALL void GL_APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat x, GLfloat y);
+GL_APICALL void GL_APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void GL_APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GL_APICALL void GL_APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GL_APICALL void GL_APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GL_APICALL void GL_APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GL_APICALL void GL_APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GL_APICALL void GL_APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glValidateProgramPipelineEXT (GLuint pipeline);
+GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogEXT (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+#endif
+typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
+typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program);
+typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings);
+typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
+typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines);
+typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines);
+typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
+typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint x);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint x, GLint y);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat x);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
+typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+#endif
+
+/* GL_EXT_shader_framebuffer_fetch */
+#ifndef GL_EXT_shader_framebuffer_fetch
+#define GL_EXT_shader_framebuffer_fetch 1
+#endif
+
+/* GL_EXT_shader_texture_lod */
+#ifndef GL_EXT_shader_texture_lod
+#define GL_EXT_shader_texture_lod 1
+#endif
+
+/* GL_EXT_shadow_samplers */
+#ifndef GL_EXT_shadow_samplers
+#define GL_EXT_shadow_samplers 1
+#endif
+
+/* GL_EXT_sRGB */
+#ifndef GL_EXT_sRGB
+#define GL_EXT_sRGB 1
+#endif
+
+/* GL_EXT_texture_compression_dxt1 */
+#ifndef GL_EXT_texture_compression_dxt1
+#define GL_EXT_texture_compression_dxt1 1
+#endif
+
+/* GL_EXT_texture_filter_anisotropic */
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#endif
+
+/* GL_EXT_texture_format_BGRA8888 */
+#ifndef GL_EXT_texture_format_BGRA8888
+#define GL_EXT_texture_format_BGRA8888 1
+#endif
+
+/* GL_EXT_texture_rg */
+#ifndef GL_EXT_texture_rg
+#define GL_EXT_texture_rg 1
+#endif
+
+/* GL_EXT_texture_storage */
+#ifndef GL_EXT_texture_storage
+#define GL_EXT_texture_storage 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GL_APICALL void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GL_APICALL void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+
+/* GL_EXT_texture_type_2_10_10_10_REV */
+#ifndef GL_EXT_texture_type_2_10_10_10_REV
+#define GL_EXT_texture_type_2_10_10_10_REV 1
+#endif
+
+/* GL_EXT_unpack_subimage */
+#ifndef GL_EXT_unpack_subimage
+#define GL_EXT_unpack_subimage 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * DMP extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_DMP_shader_binary */
+#ifndef GL_DMP_shader_binary
+#define GL_DMP_shader_binary 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * FJ extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_FJ_shader_binary_GCCSO */
+#ifndef GL_FJ_shader_binary_GCCSO
+#define GL_FJ_shader_binary_GCCSO 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * IMG extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_IMG_program_binary */
+#ifndef GL_IMG_program_binary
+#define GL_IMG_program_binary 1
+#endif
+
+/* GL_IMG_read_format */
+#ifndef GL_IMG_read_format
+#define GL_IMG_read_format 1
+#endif
+
+/* GL_IMG_shader_binary */
+#ifndef GL_IMG_shader_binary
+#define GL_IMG_shader_binary 1
+#endif
+
+/* GL_IMG_texture_compression_pvrtc */
+#ifndef GL_IMG_texture_compression_pvrtc
+#define GL_IMG_texture_compression_pvrtc 1
+#endif
+
+/* GL_IMG_multisampled_render_to_texture */
+#ifndef GL_IMG_multisampled_render_to_texture
+#define GL_IMG_multisampled_render_to_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei);
+GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei);
+#endif
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
+#endif
+
+/*------------------------------------------------------------------------*
+ * NV extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_NV_coverage_sample */
+#ifndef GL_NV_coverage_sample
+#define GL_NV_coverage_sample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glCoverageMaskNV (GLboolean mask);
+GL_APICALL void GL_APIENTRY glCoverageOperationNV (GLenum operation);
+#endif
+typedef void (GL_APIENTRYP PFNGLCOVERAGEMASKNVPROC) (GLboolean mask);
+typedef void (GL_APIENTRYP PFNGLCOVERAGEOPERATIONNVPROC) (GLenum operation);
+#endif
+
+/* GL_NV_depth_nonlinear */
+#ifndef GL_NV_depth_nonlinear
+#define GL_NV_depth_nonlinear 1
+#endif
+
+/* GL_NV_draw_buffers */
+#ifndef GL_NV_draw_buffers
+#define GL_NV_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDrawBuffersNV (GLsizei n, const GLenum *bufs);
+#endif
+typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+/* GL_NV_fbo_color_attachments */
+#ifndef GL_NV_fbo_color_attachments
+#define GL_NV_fbo_color_attachments 1
+#endif
+
+/* GL_NV_fence */
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
+GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei, GLuint *);
+GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint);
+GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint);
+GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
+GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint);
+GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint, GLenum);
+#endif
+typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#endif
+
+/* GL_NV_read_buffer */
+#ifndef GL_NV_read_buffer
+#define GL_NV_read_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glReadBufferNV (GLenum mode);
+#endif
+typedef void (GL_APIENTRYP PFNGLREADBUFFERNVPROC) (GLenum mode);
+#endif
+
+/* GL_NV_read_buffer_front */
+#ifndef GL_NV_read_buffer_front
+#define GL_NV_read_buffer_front 1
+#endif
+
+/* GL_NV_read_depth */
+#ifndef GL_NV_read_depth
+#define GL_NV_read_depth 1
+#endif
+
+/* GL_NV_read_depth_stencil */
+#ifndef GL_NV_read_depth_stencil
+#define GL_NV_read_depth_stencil 1
+#endif
+
+/* GL_NV_read_stencil */
+#ifndef GL_NV_read_stencil
+#define GL_NV_read_stencil 1
+#endif
+
+/* GL_NV_texture_compression_s3tc_update */
+#ifndef GL_NV_texture_compression_s3tc_update
+#define GL_NV_texture_compression_s3tc_update 1
+#endif
+
+/* GL_NV_texture_npot_2D_mipmap */
+#ifndef GL_NV_texture_npot_2D_mipmap
+#define GL_NV_texture_npot_2D_mipmap 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * QCOM extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_QCOM_alpha_test */
+#ifndef GL_QCOM_alpha_test
+#define GL_QCOM_alpha_test 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref);
+#endif
+typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref);
+#endif
+
+/* GL_QCOM_binning_control */
+#ifndef GL_QCOM_binning_control
+#define GL_QCOM_binning_control 1
+#endif
+
+/* GL_QCOM_driver_control */
+#ifndef GL_QCOM_driver_control
+#define GL_QCOM_driver_control 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls);
+GL_APICALL void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString);
+GL_APICALL void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl);
+GL_APICALL void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl);
+#endif
+typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls);
+typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString);
+typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
+typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
+#endif
+
+/* GL_QCOM_extended_get */
+#ifndef GL_QCOM_extended_get
+#define GL_QCOM_extended_get 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glExtGetTexturesQCOM (GLuint *textures, GLint maxTextures, GLint *numTextures);
+GL_APICALL void GL_APIENTRY glExtGetBuffersQCOM (GLuint *buffers, GLint maxBuffers, GLint *numBuffers);
+GL_APICALL void GL_APIENTRY glExtGetRenderbuffersQCOM (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers);
+GL_APICALL void GL_APIENTRY glExtGetFramebuffersQCOM (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers);
+GL_APICALL void GL_APIENTRY glExtGetTexLevelParameterivQCOM (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params);
+GL_APICALL void GL_APIENTRY glExtTexObjectStateOverrideiQCOM (GLenum target, GLenum pname, GLint param);
+GL_APICALL void GL_APIENTRY glExtGetTexSubImageQCOM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels);
+GL_APICALL void GL_APIENTRY glExtGetBufferPointervQCOM (GLenum target, GLvoid **params);
+#endif
+typedef void (GL_APIENTRYP PFNGLEXTGETTEXTURESQCOMPROC) (GLuint *textures, GLint maxTextures, GLint *numTextures);
+typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERSQCOMPROC) (GLuint *buffers, GLint maxBuffers, GLint *numBuffers);
+typedef void (GL_APIENTRYP PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers);
+typedef void (GL_APIENTRYP PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers);
+typedef void (GL_APIENTRYP PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (GL_APIENTRYP PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels);
+typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, GLvoid **params);
+#endif
+
+/* GL_QCOM_extended_get2 */
+#ifndef GL_QCOM_extended_get2
+#define GL_QCOM_extended_get2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glExtGetShadersQCOM (GLuint *shaders, GLint maxShaders, GLint *numShaders);
+GL_APICALL void GL_APIENTRY glExtGetProgramsQCOM (GLuint *programs, GLint maxPrograms, GLint *numPrograms);
+GL_APICALL GLboolean GL_APIENTRY glExtIsProgramBinaryQCOM (GLuint program);
+GL_APICALL void GL_APIENTRY glExtGetProgramBinarySourceQCOM (GLuint program, GLenum shadertype, GLchar *source, GLint *length);
+#endif
+typedef void (GL_APIENTRYP PFNGLEXTGETSHADERSQCOMPROC) (GLuint *shaders, GLint maxShaders, GLint *numShaders);
+typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint *programs, GLint maxPrograms, GLint *numPrograms);
+typedef GLboolean (GL_APIENTRYP PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program);
+typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar *source, GLint *length);
+#endif
+
+/* GL_QCOM_perfmon_global_mode */
+#ifndef GL_QCOM_perfmon_global_mode
+#define GL_QCOM_perfmon_global_mode 1
+#endif
+
+/* GL_QCOM_writeonly_rendering */
+#ifndef GL_QCOM_writeonly_rendering
+#define GL_QCOM_writeonly_rendering 1
+#endif
+
+/* GL_QCOM_tiled_rendering */
+#ifndef GL_QCOM_tiled_rendering
+#define GL_QCOM_tiled_rendering 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glStartTilingQCOM (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
+GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask);
+#endif
+typedef void (GL_APIENTRYP PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
+typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask);
+#endif
+
+/*------------------------------------------------------------------------*
+ * VIV extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_VIV_shader_binary */
+#ifndef GL_VIV_shader_binary
+#define GL_VIV_shader_binary 1
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gl2ext_h_ */
+
+#endif /* _MSC_VER */
+
+#ifndef APIENTRY
+#define APIENTRY GL_APIENTRY
+#endif
diff --git a/Source/3rd Party/sdl/include/SDL_pixels.h b/Source/3rd Party/sdl/include/SDL_pixels.h
new file mode 100644
index 000000000..3131af7b7
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_pixels.h	
@@ -0,0 +1,429 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_pixels.h
+ *
+ *  Header for the enumerated pixel format definitions.
+ */
+
+#ifndef _SDL_pixels_h
+#define _SDL_pixels_h
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \name Transparency definitions
+ *
+ *  These define alpha as the opacity of a surface.
+ */
+/* @{ */
+#define SDL_ALPHA_OPAQUE 255
+#define SDL_ALPHA_TRANSPARENT 0
+/* @} */
+
+/** Pixel type. */
+enum
+{
+    SDL_PIXELTYPE_UNKNOWN,
+    SDL_PIXELTYPE_INDEX1,
+    SDL_PIXELTYPE_INDEX4,
+    SDL_PIXELTYPE_INDEX8,
+    SDL_PIXELTYPE_PACKED8,
+    SDL_PIXELTYPE_PACKED16,
+    SDL_PIXELTYPE_PACKED32,
+    SDL_PIXELTYPE_ARRAYU8,
+    SDL_PIXELTYPE_ARRAYU16,
+    SDL_PIXELTYPE_ARRAYU32,
+    SDL_PIXELTYPE_ARRAYF16,
+    SDL_PIXELTYPE_ARRAYF32
+};
+
+/** Bitmap pixel order, high bit -> low bit. */
+enum
+{
+    SDL_BITMAPORDER_NONE,
+    SDL_BITMAPORDER_4321,
+    SDL_BITMAPORDER_1234
+};
+
+/** Packed component order, high bit -> low bit. */
+enum
+{
+    SDL_PACKEDORDER_NONE,
+    SDL_PACKEDORDER_XRGB,
+    SDL_PACKEDORDER_RGBX,
+    SDL_PACKEDORDER_ARGB,
+    SDL_PACKEDORDER_RGBA,
+    SDL_PACKEDORDER_XBGR,
+    SDL_PACKEDORDER_BGRX,
+    SDL_PACKEDORDER_ABGR,
+    SDL_PACKEDORDER_BGRA
+};
+
+/** Array component order, low byte -> high byte. */
+enum
+{
+    SDL_ARRAYORDER_NONE,
+    SDL_ARRAYORDER_RGB,
+    SDL_ARRAYORDER_RGBA,
+    SDL_ARRAYORDER_ARGB,
+    SDL_ARRAYORDER_BGR,
+    SDL_ARRAYORDER_BGRA,
+    SDL_ARRAYORDER_ABGR
+};
+
+/** Packed component layout. */
+enum
+{
+    SDL_PACKEDLAYOUT_NONE,
+    SDL_PACKEDLAYOUT_332,
+    SDL_PACKEDLAYOUT_4444,
+    SDL_PACKEDLAYOUT_1555,
+    SDL_PACKEDLAYOUT_5551,
+    SDL_PACKEDLAYOUT_565,
+    SDL_PACKEDLAYOUT_8888,
+    SDL_PACKEDLAYOUT_2101010,
+    SDL_PACKEDLAYOUT_1010102
+};
+
+#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D)
+
+#define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \
+    ((1 << 28) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \
+     ((bits) << 8) | ((bytes) << 0))
+
+#define SDL_PIXELFLAG(X)    (((X) >> 28) & 0x0F)
+#define SDL_PIXELTYPE(X)    (((X) >> 24) & 0x0F)
+#define SDL_PIXELORDER(X)   (((X) >> 20) & 0x0F)
+#define SDL_PIXELLAYOUT(X)  (((X) >> 16) & 0x0F)
+#define SDL_BITSPERPIXEL(X) (((X) >> 8) & 0xFF)
+#define SDL_BYTESPERPIXEL(X) \
+    (SDL_ISPIXELFORMAT_FOURCC(X) ? \
+        ((((X) == SDL_PIXELFORMAT_YUY2) || \
+          ((X) == SDL_PIXELFORMAT_UYVY) || \
+          ((X) == SDL_PIXELFORMAT_YVYU)) ? 2 : 1) : (((X) >> 0) & 0xFF))
+
+#define SDL_ISPIXELFORMAT_INDEXED(format)   \
+    (!SDL_ISPIXELFORMAT_FOURCC(format) && \
+     ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX1) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX4) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX8)))
+
+#define SDL_ISPIXELFORMAT_ALPHA(format)   \
+    (!SDL_ISPIXELFORMAT_FOURCC(format) && \
+     ((SDL_PIXELORDER(format) == SDL_PACKEDORDER_ARGB) || \
+      (SDL_PIXELORDER(format) == SDL_PACKEDORDER_RGBA) || \
+      (SDL_PIXELORDER(format) == SDL_PACKEDORDER_ABGR) || \
+      (SDL_PIXELORDER(format) == SDL_PACKEDORDER_BGRA)))
+
+/* The flag is set to 1 because 0x1? is not in the printable ASCII range */
+#define SDL_ISPIXELFORMAT_FOURCC(format)    \
+    ((format) && (SDL_PIXELFLAG(format) != 1))
+
+/* Note: If you modify this list, update SDL_GetPixelFormatName() */
+enum
+{
+    SDL_PIXELFORMAT_UNKNOWN,
+    SDL_PIXELFORMAT_INDEX1LSB =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_4321, 0,
+                               1, 0),
+    SDL_PIXELFORMAT_INDEX1MSB =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_1234, 0,
+                               1, 0),
+    SDL_PIXELFORMAT_INDEX4LSB =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_4321, 0,
+                               4, 0),
+    SDL_PIXELFORMAT_INDEX4MSB =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_1234, 0,
+                               4, 0),
+    SDL_PIXELFORMAT_INDEX8 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1),
+    SDL_PIXELFORMAT_RGB332 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_332, 8, 1),
+    SDL_PIXELFORMAT_RGB444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_4444, 12, 2),
+    SDL_PIXELFORMAT_RGB555 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_1555, 15, 2),
+    SDL_PIXELFORMAT_BGR555 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR,
+                               SDL_PACKEDLAYOUT_1555, 15, 2),
+    SDL_PIXELFORMAT_ARGB4444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
+                               SDL_PACKEDLAYOUT_4444, 16, 2),
+    SDL_PIXELFORMAT_RGBA4444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA,
+                               SDL_PACKEDLAYOUT_4444, 16, 2),
+    SDL_PIXELFORMAT_ABGR4444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR,
+                               SDL_PACKEDLAYOUT_4444, 16, 2),
+    SDL_PIXELFORMAT_BGRA4444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA,
+                               SDL_PACKEDLAYOUT_4444, 16, 2),
+    SDL_PIXELFORMAT_ARGB1555 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
+                               SDL_PACKEDLAYOUT_1555, 16, 2),
+    SDL_PIXELFORMAT_RGBA5551 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA,
+                               SDL_PACKEDLAYOUT_5551, 16, 2),
+    SDL_PIXELFORMAT_ABGR1555 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR,
+                               SDL_PACKEDLAYOUT_1555, 16, 2),
+    SDL_PIXELFORMAT_BGRA5551 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA,
+                               SDL_PACKEDLAYOUT_5551, 16, 2),
+    SDL_PIXELFORMAT_RGB565 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_565, 16, 2),
+    SDL_PIXELFORMAT_BGR565 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR,
+                               SDL_PACKEDLAYOUT_565, 16, 2),
+    SDL_PIXELFORMAT_RGB24 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_RGB, 0,
+                               24, 3),
+    SDL_PIXELFORMAT_BGR24 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0,
+                               24, 3),
+    SDL_PIXELFORMAT_RGB888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_8888, 24, 4),
+    SDL_PIXELFORMAT_RGBX8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBX,
+                               SDL_PACKEDLAYOUT_8888, 24, 4),
+    SDL_PIXELFORMAT_BGR888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR,
+                               SDL_PACKEDLAYOUT_8888, 24, 4),
+    SDL_PIXELFORMAT_BGRX8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRX,
+                               SDL_PACKEDLAYOUT_8888, 24, 4),
+    SDL_PIXELFORMAT_ARGB8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
+                               SDL_PACKEDLAYOUT_8888, 32, 4),
+    SDL_PIXELFORMAT_RGBA8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBA,
+                               SDL_PACKEDLAYOUT_8888, 32, 4),
+    SDL_PIXELFORMAT_ABGR8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR,
+                               SDL_PACKEDLAYOUT_8888, 32, 4),
+    SDL_PIXELFORMAT_BGRA8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRA,
+                               SDL_PACKEDLAYOUT_8888, 32, 4),
+    SDL_PIXELFORMAT_ARGB2101010 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
+                               SDL_PACKEDLAYOUT_2101010, 32, 4),
+
+    SDL_PIXELFORMAT_YV12 =      /**< Planar mode: Y + V + U  (3 planes) */
+        SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'),
+    SDL_PIXELFORMAT_IYUV =      /**< Planar mode: Y + U + V  (3 planes) */
+        SDL_DEFINE_PIXELFOURCC('I', 'Y', 'U', 'V'),
+    SDL_PIXELFORMAT_YUY2 =      /**< Packed mode: Y0+U0+Y1+V0 (1 plane) */
+        SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'),
+    SDL_PIXELFORMAT_UYVY =      /**< Packed mode: U0+Y0+V0+Y1 (1 plane) */
+        SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'),
+    SDL_PIXELFORMAT_YVYU =      /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */
+        SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U')
+};
+
+typedef struct SDL_Color
+{
+    Uint8 r;
+    Uint8 g;
+    Uint8 b;
+    Uint8 a;
+} SDL_Color;
+#define SDL_Colour SDL_Color
+
+typedef struct SDL_Palette
+{
+    int ncolors;
+    SDL_Color *colors;
+    Uint32 version;
+    int refcount;
+} SDL_Palette;
+
+/**
+ *  \note Everything in the pixel format structure is read-only.
+ */
+typedef struct SDL_PixelFormat
+{
+    Uint32 format;
+    SDL_Palette *palette;
+    Uint8 BitsPerPixel;
+    Uint8 BytesPerPixel;
+    Uint8 padding[2];
+    Uint32 Rmask;
+    Uint32 Gmask;
+    Uint32 Bmask;
+    Uint32 Amask;
+    Uint8 Rloss;
+    Uint8 Gloss;
+    Uint8 Bloss;
+    Uint8 Aloss;
+    Uint8 Rshift;
+    Uint8 Gshift;
+    Uint8 Bshift;
+    Uint8 Ashift;
+    int refcount;
+    struct SDL_PixelFormat *next;
+} SDL_PixelFormat;
+
+/**
+ * \brief Get the human readable name of a pixel format
+ */
+extern DECLSPEC const char* SDLCALL SDL_GetPixelFormatName(Uint32 format);
+
+/**
+ *  \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks.
+ *
+ *  \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible.
+ *
+ *  \sa SDL_MasksToPixelFormatEnum()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format,
+                                                            int *bpp,
+                                                            Uint32 * Rmask,
+                                                            Uint32 * Gmask,
+                                                            Uint32 * Bmask,
+                                                            Uint32 * Amask);
+
+/**
+ *  \brief Convert a bpp and RGBA masks to an enumerated pixel format.
+ *
+ *  \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion
+ *          wasn't possible.
+ *
+ *  \sa SDL_PixelFormatEnumToMasks()
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp,
+                                                          Uint32 Rmask,
+                                                          Uint32 Gmask,
+                                                          Uint32 Bmask,
+                                                          Uint32 Amask);
+
+/**
+ *  \brief Create an SDL_PixelFormat structure from a pixel format enum.
+ */
+extern DECLSPEC SDL_PixelFormat * SDLCALL SDL_AllocFormat(Uint32 pixel_format);
+
+/**
+ *  \brief Free an SDL_PixelFormat structure.
+ */
+extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format);
+
+/**
+ *  \brief Create a palette structure with the specified number of color
+ *         entries.
+ *
+ *  \return A new palette, or NULL if there wasn't enough memory.
+ *
+ *  \note The palette entries are initialized to white.
+ *
+ *  \sa SDL_FreePalette()
+ */
+extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors);
+
+/**
+ *  \brief Set the palette for a pixel format structure.
+ */
+extern DECLSPEC int SDLCALL SDL_SetPixelFormatPalette(SDL_PixelFormat * format,
+                                                      SDL_Palette *palette);
+
+/**
+ *  \brief Set a range of colors in a palette.
+ *
+ *  \param palette    The palette to modify.
+ *  \param colors     An array of colors to copy into the palette.
+ *  \param firstcolor The index of the first palette entry to modify.
+ *  \param ncolors    The number of entries to modify.
+ *
+ *  \return 0 on success, or -1 if not all of the colors could be set.
+ */
+extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette,
+                                                 const SDL_Color * colors,
+                                                 int firstcolor, int ncolors);
+
+/**
+ *  \brief Free a palette created with SDL_AllocPalette().
+ *
+ *  \sa SDL_AllocPalette()
+ */
+extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette);
+
+/**
+ *  \brief Maps an RGB triple to an opaque pixel value for a given pixel format.
+ *
+ *  \sa SDL_MapRGBA
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format,
+                                          Uint8 r, Uint8 g, Uint8 b);
+
+/**
+ *  \brief Maps an RGBA quadruple to a pixel value for a given pixel format.
+ *
+ *  \sa SDL_MapRGB
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format,
+                                           Uint8 r, Uint8 g, Uint8 b,
+                                           Uint8 a);
+
+/**
+ *  \brief Get the RGB components from a pixel of the specified format.
+ *
+ *  \sa SDL_GetRGBA
+ */
+extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel,
+                                        const SDL_PixelFormat * format,
+                                        Uint8 * r, Uint8 * g, Uint8 * b);
+
+/**
+ *  \brief Get the RGBA components from a pixel of the specified format.
+ *
+ *  \sa SDL_GetRGB
+ */
+extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
+                                         const SDL_PixelFormat * format,
+                                         Uint8 * r, Uint8 * g, Uint8 * b,
+                                         Uint8 * a);
+
+/**
+ *  \brief Calculate a 256 entry gamma ramp for a gamma value.
+ */
+extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_pixels_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_platform.h b/Source/3rd Party/sdl/include/SDL_platform.h
new file mode 100644
index 000000000..c43f4b54a
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_platform.h	
@@ -0,0 +1,164 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_platform.h
+ *
+ *  Try to get a standard set of platform defines.
+ */
+
+#ifndef _SDL_platform_h
+#define _SDL_platform_h
+
+#if defined(_AIX)
+#undef __AIX__
+#define __AIX__     1
+#endif
+#if defined(__HAIKU__)
+#undef __HAIKU__
+#define __HAIKU__   1
+#endif
+#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
+#undef __BSDI__
+#define __BSDI__    1
+#endif
+#if defined(_arch_dreamcast)
+#undef __DREAMCAST__
+#define __DREAMCAST__   1
+#endif
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#undef __FREEBSD__
+#define __FREEBSD__ 1
+#endif
+#if defined(hpux) || defined(__hpux) || defined(__hpux__)
+#undef __HPUX__
+#define __HPUX__    1
+#endif
+#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
+#undef __IRIX__
+#define __IRIX__    1
+#endif
+#if defined(linux) || defined(__linux) || defined(__linux__)
+#undef __LINUX__
+#define __LINUX__   1
+#endif
+#if defined(ANDROID) || defined(__ANDROID__)
+#undef __ANDROID__
+#undef __LINUX__ /* do we need to do this? */
+#define __ANDROID__ 1
+#endif
+
+#if defined(__APPLE__)
+/* lets us know what version of Mac OS X we're compiling on */
+#include "AvailabilityMacros.h"
+#include "TargetConditionals.h"
+#if TARGET_OS_IPHONE
+/* if compiling for iPhone */
+#undef __IPHONEOS__
+#define __IPHONEOS__ 1
+#undef __MACOSX__
+#else
+/* if not compiling for iPhone */
+#undef __MACOSX__
+#define __MACOSX__  1
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+# error SDL for Mac OS X only supports deploying on 10.5 and above.
+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */
+#endif /* TARGET_OS_IPHONE */
+#endif /* defined(__APPLE__) */
+
+#if defined(__NetBSD__)
+#undef __NETBSD__
+#define __NETBSD__  1
+#endif
+#if defined(__OpenBSD__)
+#undef __OPENBSD__
+#define __OPENBSD__ 1
+#endif
+#if defined(__OS2__)
+#undef __OS2__
+#define __OS2__     1
+#endif
+#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
+#undef __OSF__
+#define __OSF__     1
+#endif
+#if defined(__QNXNTO__)
+#undef __QNXNTO__
+#define __QNXNTO__  1
+#endif
+#if defined(riscos) || defined(__riscos) || defined(__riscos__)
+#undef __RISCOS__
+#define __RISCOS__  1
+#endif
+#if defined(__SVR4)
+#undef __SOLARIS__
+#define __SOLARIS__ 1
+#endif
+
+#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
+/* Try to find out if we're compiling for WinRT or non-WinRT */
+/* If _USING_V110_SDK71_ is defined it means we are using the v110_xp or v120_xp toolset. */
+#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1700) && !_USING_V110_SDK71_)	/* _MSC_VER==1700 for MSVC 2012 */
+#include <winapifamily.h>
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#undef __WINDOWS__
+#define __WINDOWS__   1
+/* See if we're compiling for WinRT: */
+#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
+#undef __WINRT__
+#define __WINRT__ 1
+#endif
+#else
+#undef __WINDOWS__
+#define __WINDOWS__   1
+#endif /* _MSC_VER < 1700 */
+#endif /* defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) */
+
+#if defined(__WINDOWS__)
+#undef __WIN32__
+#define __WIN32__ 1
+#endif
+#if defined(__PSP__)
+#undef __PSP__
+#define __PSP__ 1
+#endif
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief Gets the name of the platform.
+ */
+extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_platform_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_power.h b/Source/3rd Party/sdl/include/SDL_power.h
new file mode 100644
index 000000000..cf71c9824
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_power.h	
@@ -0,0 +1,75 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_power_h
+#define _SDL_power_h
+
+/**
+ *  \file SDL_power.h
+ *
+ *  Header for the SDL power management routines.
+ */
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief The basic state for the system's power supply.
+ */
+typedef enum
+{
+    SDL_POWERSTATE_UNKNOWN,      /**< cannot determine power status */
+    SDL_POWERSTATE_ON_BATTERY,   /**< Not plugged in, running on the battery */
+    SDL_POWERSTATE_NO_BATTERY,   /**< Plugged in, no battery available */
+    SDL_POWERSTATE_CHARGING,     /**< Plugged in, charging battery */
+    SDL_POWERSTATE_CHARGED       /**< Plugged in, battery charged */
+} SDL_PowerState;
+
+
+/**
+ *  \brief Get the current power supply details.
+ *
+ *  \param secs Seconds of battery life left. You can pass a NULL here if
+ *              you don't care. Will return -1 if we can't determine a
+ *              value, or we're not running on a battery.
+ *
+ *  \param pct Percentage of battery life left, between 0 and 100. You can
+ *             pass a NULL here if you don't care. Will return -1 if we
+ *             can't determine a value, or we're not running on a battery.
+ *
+ *  \return The state of the battery (if any).
+ */
+extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_power_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_quit.h b/Source/3rd Party/sdl/include/SDL_quit.h
new file mode 100644
index 000000000..8a786445d
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_quit.h	
@@ -0,0 +1,58 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_quit.h
+ *
+ *  Include file for SDL quit event handling.
+ */
+
+#ifndef _SDL_quit_h
+#define _SDL_quit_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+/**
+ *  \file SDL_quit.h
+ *
+ *  An ::SDL_QUIT event is generated when the user tries to close the application
+ *  window.  If it is ignored or filtered out, the window will remain open.
+ *  If it is not ignored or filtered, it is queued normally and the window
+ *  is allowed to close.  When the window is closed, screen updates will
+ *  complete, but have no effect.
+ *
+ *  SDL_Init() installs signal handlers for SIGINT (keyboard interrupt)
+ *  and SIGTERM (system termination request), if handlers do not already
+ *  exist, that generate ::SDL_QUIT events as well.  There is no way
+ *  to determine the cause of an ::SDL_QUIT event, but setting a signal
+ *  handler in your application will override the default generation of
+ *  quit events for that signal.
+ *
+ *  \sa SDL_Quit()
+ */
+
+/* There are no functions directly affecting the quit event */
+
+#define SDL_QuitRequested() \
+        (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0))
+
+#endif /* _SDL_quit_h */
diff --git a/Source/3rd Party/sdl/include/SDL_rect.h b/Source/3rd Party/sdl/include/SDL_rect.h
new file mode 100644
index 000000000..0a95a3344
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_rect.h	
@@ -0,0 +1,138 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_rect.h
+ *
+ *  Header file for SDL_rect definition and management functions.
+ */
+
+#ifndef _SDL_rect_h
+#define _SDL_rect_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_pixels.h"
+#include "SDL_rwops.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief  The structure that defines a point
+ *
+ *  \sa SDL_EnclosePoints
+ */
+typedef struct SDL_Point
+{
+    int x;
+    int y;
+} SDL_Point;
+
+/**
+ *  \brief A rectangle, with the origin at the upper left.
+ *
+ *  \sa SDL_RectEmpty
+ *  \sa SDL_RectEquals
+ *  \sa SDL_HasIntersection
+ *  \sa SDL_IntersectRect
+ *  \sa SDL_UnionRect
+ *  \sa SDL_EnclosePoints
+ */
+typedef struct SDL_Rect
+{
+    int x, y;
+    int w, h;
+} SDL_Rect;
+
+/**
+ *  \brief Returns true if the rectangle has no area.
+ */
+SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r)
+{
+    return ((!r) || (r->w <= 0) || (r->h <= 0)) ? SDL_TRUE : SDL_FALSE;
+}
+
+/**
+ *  \brief Returns true if the two rectangles are equal.
+ */
+SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b)
+{
+    return (a && b && (a->x == b->x) && (a->y == b->y) &&
+            (a->w == b->w) && (a->h == b->h)) ? SDL_TRUE : SDL_FALSE;
+}
+
+/**
+ *  \brief Determine whether two rectangles intersect.
+ *
+ *  \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A,
+                                                     const SDL_Rect * B);
+
+/**
+ *  \brief Calculate the intersection of two rectangles.
+ *
+ *  \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A,
+                                                   const SDL_Rect * B,
+                                                   SDL_Rect * result);
+
+/**
+ *  \brief Calculate the union of two rectangles.
+ */
+extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A,
+                                           const SDL_Rect * B,
+                                           SDL_Rect * result);
+
+/**
+ *  \brief Calculate a minimal rectangle enclosing a set of points
+ *
+ *  \return SDL_TRUE if any points were within the clipping rect
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points,
+                                                   int count,
+                                                   const SDL_Rect * clip,
+                                                   SDL_Rect * result);
+
+/**
+ *  \brief Calculate the intersection of a rectangle and line segment.
+ *
+ *  \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect *
+                                                          rect, int *X1,
+                                                          int *Y1, int *X2,
+                                                          int *Y2);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_rect_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_render.h b/Source/3rd Party/sdl/include/SDL_render.h
new file mode 100644
index 000000000..77f706a9b
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_render.h	
@@ -0,0 +1,870 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_render.h
+ *
+ *  Header file for SDL 2D rendering functions.
+ *
+ *  This API supports the following features:
+ *      * single pixel points
+ *      * single pixel lines
+ *      * filled rectangles
+ *      * texture images
+ *
+ *  The primitives may be drawn in opaque, blended, or additive modes.
+ *
+ *  The texture images may be drawn in opaque, blended, or additive modes.
+ *  They can have an additional color tint or alpha modulation applied to
+ *  them, and may also be stretched with linear interpolation.
+ *
+ *  This API is designed to accelerate simple 2D operations. You may
+ *  want more functionality such as polygons and particle effects and
+ *  in that case you should use SDL's OpenGL/Direct3D support or one
+ *  of the many good 3D engines.
+ *
+ *  These functions must be called from the main thread.
+ *  See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995
+ */
+
+#ifndef _SDL_render_h
+#define _SDL_render_h
+
+#include "SDL_stdinc.h"
+#include "SDL_rect.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief Flags used when creating a rendering context
+ */
+typedef enum
+{
+    SDL_RENDERER_SOFTWARE = 0x00000001,         /**< The renderer is a software fallback */
+    SDL_RENDERER_ACCELERATED = 0x00000002,      /**< The renderer uses hardware
+                                                     acceleration */
+    SDL_RENDERER_PRESENTVSYNC = 0x00000004,     /**< Present is synchronized
+                                                     with the refresh rate */
+    SDL_RENDERER_TARGETTEXTURE = 0x00000008     /**< The renderer supports
+                                                     rendering to texture */
+} SDL_RendererFlags;
+
+/**
+ *  \brief Information on the capabilities of a render driver or context.
+ */
+typedef struct SDL_RendererInfo
+{
+    const char *name;           /**< The name of the renderer */
+    Uint32 flags;               /**< Supported ::SDL_RendererFlags */
+    Uint32 num_texture_formats; /**< The number of available texture formats */
+    Uint32 texture_formats[16]; /**< The available texture formats */
+    int max_texture_width;      /**< The maximimum texture width */
+    int max_texture_height;     /**< The maximimum texture height */
+} SDL_RendererInfo;
+
+/**
+ *  \brief The access pattern allowed for a texture.
+ */
+typedef enum
+{
+    SDL_TEXTUREACCESS_STATIC,    /**< Changes rarely, not lockable */
+    SDL_TEXTUREACCESS_STREAMING, /**< Changes frequently, lockable */
+    SDL_TEXTUREACCESS_TARGET     /**< Texture can be used as a render target */
+} SDL_TextureAccess;
+
+/**
+ *  \brief The texture channel modulation used in SDL_RenderCopy().
+ */
+typedef enum
+{
+    SDL_TEXTUREMODULATE_NONE = 0x00000000,     /**< No modulation */
+    SDL_TEXTUREMODULATE_COLOR = 0x00000001,    /**< srcC = srcC * color */
+    SDL_TEXTUREMODULATE_ALPHA = 0x00000002     /**< srcA = srcA * alpha */
+} SDL_TextureModulate;
+
+/**
+ *  \brief Flip constants for SDL_RenderCopyEx
+ */
+typedef enum
+{
+    SDL_FLIP_NONE = 0x00000000,     /**< Do not flip */
+    SDL_FLIP_HORIZONTAL = 0x00000001,    /**< flip horizontally */
+    SDL_FLIP_VERTICAL = 0x00000002     /**< flip vertically */
+} SDL_RendererFlip;
+
+/**
+ *  \brief A structure representing rendering state
+ */
+struct SDL_Renderer;
+typedef struct SDL_Renderer SDL_Renderer;
+
+/**
+ *  \brief An efficient driver-specific representation of pixel data
+ */
+struct SDL_Texture;
+typedef struct SDL_Texture SDL_Texture;
+
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the number of 2D rendering drivers available for the current
+ *         display.
+ *
+ *  A render driver is a set of code that handles rendering and texture
+ *  management on a particular display.  Normally there is only one, but
+ *  some drivers may have several available with different capabilities.
+ *
+ *  \sa SDL_GetRenderDriverInfo()
+ *  \sa SDL_CreateRenderer()
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void);
+
+/**
+ *  \brief Get information about a specific 2D rendering driver for the current
+ *         display.
+ *
+ *  \param index The index of the driver to query information about.
+ *  \param info  A pointer to an SDL_RendererInfo struct to be filled with
+ *               information on the rendering driver.
+ *
+ *  \return 0 on success, -1 if the index was out of range.
+ *
+ *  \sa SDL_CreateRenderer()
+ */
+extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index,
+                                                    SDL_RendererInfo * info);
+
+/**
+ *  \brief Create a window and default renderer
+ *
+ *  \param width    The width of the window
+ *  \param height   The height of the window
+ *  \param window_flags The flags used to create the window
+ *  \param window   A pointer filled with the window, or NULL on error
+ *  \param renderer A pointer filled with the renderer, or NULL on error
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(
+                                int width, int height, Uint32 window_flags,
+                                SDL_Window **window, SDL_Renderer **renderer);
+
+
+/**
+ *  \brief Create a 2D rendering context for a window.
+ *
+ *  \param window The window where rendering is displayed.
+ *  \param index    The index of the rendering driver to initialize, or -1 to
+ *                  initialize the first one supporting the requested flags.
+ *  \param flags    ::SDL_RendererFlags.
+ *
+ *  \return A valid rendering context or NULL if there was an error.
+ *
+ *  \sa SDL_CreateSoftwareRenderer()
+ *  \sa SDL_GetRendererInfo()
+ *  \sa SDL_DestroyRenderer()
+ */
+extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window,
+                                               int index, Uint32 flags);
+
+/**
+ *  \brief Create a 2D software rendering context for a surface.
+ *
+ *  \param surface The surface where rendering is done.
+ *
+ *  \return A valid rendering context or NULL if there was an error.
+ *
+ *  \sa SDL_CreateRenderer()
+ *  \sa SDL_DestroyRenderer()
+ */
+extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface);
+
+/**
+ *  \brief Get the renderer associated with a window.
+ */
+extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window);
+
+/**
+ *  \brief Get information about a rendering context.
+ */
+extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer,
+                                                SDL_RendererInfo * info);
+
+/**
+ *  \brief Get the output size of a rendering context.
+ */
+extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer,
+                                                      int *w, int *h);
+
+/**
+ *  \brief Create a texture for a rendering context.
+ *
+ *  \param renderer The renderer.
+ *  \param format The format of the texture.
+ *  \param access One of the enumerated values in ::SDL_TextureAccess.
+ *  \param w      The width of the texture in pixels.
+ *  \param h      The height of the texture in pixels.
+ *
+ *  \return The created texture is returned, or 0 if no rendering context was
+ *          active,  the format was unsupported, or the width or height were out
+ *          of range.
+ *
+ *  \sa SDL_QueryTexture()
+ *  \sa SDL_UpdateTexture()
+ *  \sa SDL_DestroyTexture()
+ */
+extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer,
+                                                        Uint32 format,
+                                                        int access, int w,
+                                                        int h);
+
+/**
+ *  \brief Create a texture from an existing surface.
+ *
+ *  \param renderer The renderer.
+ *  \param surface The surface containing pixel data used to fill the texture.
+ *
+ *  \return The created texture is returned, or 0 on error.
+ *
+ *  \note The surface is not modified or freed by this function.
+ *
+ *  \sa SDL_QueryTexture()
+ *  \sa SDL_DestroyTexture()
+ */
+extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface);
+
+/**
+ *  \brief Query the attributes of a texture
+ *
+ *  \param texture A texture to be queried.
+ *  \param format  A pointer filled in with the raw format of the texture.  The
+ *                 actual format may differ, but pixel transfers will use this
+ *                 format.
+ *  \param access  A pointer filled in with the actual access to the texture.
+ *  \param w       A pointer filled in with the width of the texture in pixels.
+ *  \param h       A pointer filled in with the height of the texture in pixels.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ */
+extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture,
+                                             Uint32 * format, int *access,
+                                             int *w, int *h);
+
+/**
+ *  \brief Set an additional color value used in render copy operations.
+ *
+ *  \param texture The texture to update.
+ *  \param r       The red color value multiplied into copy operations.
+ *  \param g       The green color value multiplied into copy operations.
+ *  \param b       The blue color value multiplied into copy operations.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid or color modulation
+ *          is not supported.
+ *
+ *  \sa SDL_GetTextureColorMod()
+ */
+extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture,
+                                                   Uint8 r, Uint8 g, Uint8 b);
+
+
+/**
+ *  \brief Get the additional color value used in render copy operations.
+ *
+ *  \param texture The texture to query.
+ *  \param r         A pointer filled in with the current red color value.
+ *  \param g         A pointer filled in with the current green color value.
+ *  \param b         A pointer filled in with the current blue color value.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \sa SDL_SetTextureColorMod()
+ */
+extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture,
+                                                   Uint8 * r, Uint8 * g,
+                                                   Uint8 * b);
+
+/**
+ *  \brief Set an additional alpha value used in render copy operations.
+ *
+ *  \param texture The texture to update.
+ *  \param alpha     The alpha value multiplied into copy operations.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid or alpha modulation
+ *          is not supported.
+ *
+ *  \sa SDL_GetTextureAlphaMod()
+ */
+extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture,
+                                                   Uint8 alpha);
+
+/**
+ *  \brief Get the additional alpha value used in render copy operations.
+ *
+ *  \param texture The texture to query.
+ *  \param alpha     A pointer filled in with the current alpha value.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \sa SDL_SetTextureAlphaMod()
+ */
+extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture,
+                                                   Uint8 * alpha);
+
+/**
+ *  \brief Set the blend mode used for texture copy operations.
+ *
+ *  \param texture The texture to update.
+ *  \param blendMode ::SDL_BlendMode to use for texture blending.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid or the blend mode is
+ *          not supported.
+ *
+ *  \note If the blend mode is not supported, the closest supported mode is
+ *        chosen.
+ *
+ *  \sa SDL_GetTextureBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture,
+                                                    SDL_BlendMode blendMode);
+
+/**
+ *  \brief Get the blend mode used for texture copy operations.
+ *
+ *  \param texture   The texture to query.
+ *  \param blendMode A pointer filled in with the current blend mode.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \sa SDL_SetTextureBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture,
+                                                    SDL_BlendMode *blendMode);
+
+/**
+ *  \brief Update the given texture rectangle with new pixel data.
+ *
+ *  \param texture   The texture to update
+ *  \param rect      A pointer to the rectangle of pixels to update, or NULL to
+ *                   update the entire texture.
+ *  \param pixels    The raw pixel data.
+ *  \param pitch     The number of bytes between rows of pixel data.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \note This is a fairly slow function.
+ */
+extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture,
+                                              const SDL_Rect * rect,
+                                              const void *pixels, int pitch);
+
+/**
+ *  \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data.
+ *
+ *  \param texture   The texture to update
+ *  \param rect      A pointer to the rectangle of pixels to update, or NULL to
+ *                   update the entire texture.
+ *  \param Yplane    The raw pixel data for the Y plane.
+ *  \param Ypitch    The number of bytes between rows of pixel data for the Y plane.
+ *  \param Uplane    The raw pixel data for the U plane.
+ *  \param Upitch    The number of bytes between rows of pixel data for the U plane.
+ *  \param Vplane    The raw pixel data for the V plane.
+ *  \param Vpitch    The number of bytes between rows of pixel data for the V plane.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \note You can use SDL_UpdateTexture() as long as your pixel data is
+ *        a contiguous block of Y and U/V planes in the proper order, but
+ *        this function is available if your pixel data is not contiguous.
+ */
+extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture,
+                                                 const SDL_Rect * rect,
+                                                 const Uint8 *Yplane, int Ypitch,
+                                                 const Uint8 *Uplane, int Upitch,
+                                                 const Uint8 *Vplane, int Vpitch);
+
+/**
+ *  \brief Lock a portion of the texture for write-only pixel access.
+ *
+ *  \param texture   The texture to lock for access, which was created with
+ *                   ::SDL_TEXTUREACCESS_STREAMING.
+ *  \param rect      A pointer to the rectangle to lock for access. If the rect
+ *                   is NULL, the entire texture will be locked.
+ *  \param pixels    This is filled in with a pointer to the locked pixels,
+ *                   appropriately offset by the locked area.
+ *  \param pitch     This is filled in with the pitch of the locked pixels.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid or was not created with ::SDL_TEXTUREACCESS_STREAMING.
+ *
+ *  \sa SDL_UnlockTexture()
+ */
+extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture,
+                                            const SDL_Rect * rect,
+                                            void **pixels, int *pitch);
+
+/**
+ *  \brief Unlock a texture, uploading the changes to video memory, if needed.
+ *
+ *  \sa SDL_LockTexture()
+ */
+extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture);
+
+/**
+ * \brief Determines whether a window supports the use of render targets
+ *
+ * \param renderer The renderer that will be checked
+ *
+ * \return SDL_TRUE if supported, SDL_FALSE if not.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer);
+
+/**
+ * \brief Set a texture as the current rendering target.
+ *
+ * \param renderer The renderer.
+ * \param texture The targeted texture, which must be created with the SDL_TEXTUREACCESS_TARGET flag, or NULL for the default render target
+ *
+ * \return 0 on success, or -1 on error
+ *
+ *  \sa SDL_GetRenderTarget()
+ */
+extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer,
+                                                SDL_Texture *texture);
+
+/**
+ * \brief Get the current render target or NULL for the default render target.
+ *
+ * \return The current render target
+ *
+ *  \sa SDL_SetRenderTarget()
+ */
+extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer);
+
+/**
+ *  \brief Set device independent resolution for rendering
+ *
+ *  \param renderer The renderer for which resolution should be set.
+ *  \param w      The width of the logical resolution
+ *  \param h      The height of the logical resolution
+ *
+ *  This function uses the viewport and scaling functionality to allow a fixed logical
+ *  resolution for rendering, regardless of the actual output resolution.  If the actual
+ *  output resolution doesn't have the same aspect ratio the output rendering will be
+ *  centered within the output display.
+ *
+ *  If the output display is a window, mouse events in the window will be filtered
+ *  and scaled so they seem to arrive within the logical resolution.
+ *
+ *  \note If this function results in scaling or subpixel drawing by the
+ *        rendering backend, it will be handled using the appropriate
+ *        quality hints.
+ *
+ *  \sa SDL_RenderGetLogicalSize()
+ *  \sa SDL_RenderSetScale()
+ *  \sa SDL_RenderSetViewport()
+ */
+extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h);
+
+/**
+ *  \brief Get device independent resolution for rendering
+ *
+ *  \param renderer The renderer from which resolution should be queried.
+ *  \param w      A pointer filled with the width of the logical resolution
+ *  \param h      A pointer filled with the height of the logical resolution
+ *
+ *  \sa SDL_RenderSetLogicalSize()
+ */
+extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h);
+
+/**
+ *  \brief Set the drawing area for rendering on the current target.
+ *
+ *  \param renderer The renderer for which the drawing area should be set.
+ *  \param rect The rectangle representing the drawing area, or NULL to set the viewport to the entire target.
+ *
+ *  The x,y of the viewport rect represents the origin for rendering.
+ *
+ *  \return 0 on success, or -1 on error
+ *
+ *  \note If the window associated with the renderer is resized, the viewport is automatically reset.
+ *
+ *  \sa SDL_RenderGetViewport()
+ *  \sa SDL_RenderSetLogicalSize()
+ */
+extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer,
+                                                  const SDL_Rect * rect);
+
+/**
+ *  \brief Get the drawing area for the current target.
+ *
+ *  \sa SDL_RenderSetViewport()
+ */
+extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer,
+                                                   SDL_Rect * rect);
+
+/**
+ *  \brief Set the clip rectangle for the current target.
+ *
+ *  \param renderer The renderer for which clip rectangle should be set.
+ *  \param rect   A pointer to the rectangle to set as the clip rectangle, or
+ *                NULL to disable clipping.
+ *
+ *  \return 0 on success, or -1 on error
+ *
+ *  \sa SDL_RenderGetClipRect()
+ */
+extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer,
+                                                  const SDL_Rect * rect);
+
+/**
+ *  \brief Get the clip rectangle for the current target.
+ *
+ *  \param renderer The renderer from which clip rectangle should be queried.
+ *  \param rect   A pointer filled in with the current clip rectangle, or
+ *                an empty rectangle if clipping is disabled.
+ *
+ *  \sa SDL_RenderSetClipRect()
+ */
+extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer,
+                                                   SDL_Rect * rect);
+
+/**
+ *  \brief Set the drawing scale for rendering on the current target.
+ *
+ *  \param renderer The renderer for which the drawing scale should be set.
+ *  \param scaleX The horizontal scaling factor
+ *  \param scaleY The vertical scaling factor
+ *
+ *  The drawing coordinates are scaled by the x/y scaling factors
+ *  before they are used by the renderer.  This allows resolution
+ *  independent drawing with a single coordinate system.
+ *
+ *  \note If this results in scaling or subpixel drawing by the
+ *        rendering backend, it will be handled using the appropriate
+ *        quality hints.  For best results use integer scaling factors.
+ *
+ *  \sa SDL_RenderGetScale()
+ *  \sa SDL_RenderSetLogicalSize()
+ */
+extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer,
+                                               float scaleX, float scaleY);
+
+/**
+ *  \brief Get the drawing scale for the current target.
+ *
+ *  \param renderer The renderer from which drawing scale should be queried.
+ *  \param scaleX A pointer filled in with the horizontal scaling factor
+ *  \param scaleY A pointer filled in with the vertical scaling factor
+ *
+ *  \sa SDL_RenderSetScale()
+ */
+extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer,
+                                               float *scaleX, float *scaleY);
+
+/**
+ *  \brief Set the color used for drawing operations (Rect, Line and Clear).
+ *
+ *  \param renderer The renderer for which drawing color should be set.
+ *  \param r The red value used to draw on the rendering target.
+ *  \param g The green value used to draw on the rendering target.
+ *  \param b The blue value used to draw on the rendering target.
+ *  \param a The alpha value used to draw on the rendering target, usually
+ *           ::SDL_ALPHA_OPAQUE (255).
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer,
+                                           Uint8 r, Uint8 g, Uint8 b,
+                                           Uint8 a);
+
+/**
+ *  \brief Get the color used for drawing operations (Rect, Line and Clear).
+ *
+ *  \param renderer The renderer from which drawing color should be queried.
+ *  \param r A pointer to the red value used to draw on the rendering target.
+ *  \param g A pointer to the green value used to draw on the rendering target.
+ *  \param b A pointer to the blue value used to draw on the rendering target.
+ *  \param a A pointer to the alpha value used to draw on the rendering target,
+ *           usually ::SDL_ALPHA_OPAQUE (255).
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer,
+                                           Uint8 * r, Uint8 * g, Uint8 * b,
+                                           Uint8 * a);
+
+/**
+ *  \brief Set the blend mode used for drawing operations (Fill and Line).
+ *
+ *  \param renderer The renderer for which blend mode should be set.
+ *  \param blendMode ::SDL_BlendMode to use for blending.
+ *
+ *  \return 0 on success, or -1 on error
+ *
+ *  \note If the blend mode is not supported, the closest supported mode is
+ *        chosen.
+ *
+ *  \sa SDL_GetRenderDrawBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer,
+                                                       SDL_BlendMode blendMode);
+
+/**
+ *  \brief Get the blend mode used for drawing operations.
+ *
+ *  \param renderer The renderer from which blend mode should be queried.
+ *  \param blendMode A pointer filled in with the current blend mode.
+ *
+ *  \return 0 on success, or -1 on error
+ *
+ *  \sa SDL_SetRenderDrawBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer,
+                                                       SDL_BlendMode *blendMode);
+
+/**
+ *  \brief Clear the current rendering target with the drawing color
+ *
+ *  This function clears the entire rendering target, ignoring the viewport.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer);
+
+/**
+ *  \brief Draw a point on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw a point.
+ *  \param x The x coordinate of the point.
+ *  \param y The y coordinate of the point.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer,
+                                                int x, int y);
+
+/**
+ *  \brief Draw multiple points on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw multiple points.
+ *  \param points The points to draw
+ *  \param count The number of points to draw
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer,
+                                                 const SDL_Point * points,
+                                                 int count);
+
+/**
+ *  \brief Draw a line on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw a line.
+ *  \param x1 The x coordinate of the start point.
+ *  \param y1 The y coordinate of the start point.
+ *  \param x2 The x coordinate of the end point.
+ *  \param y2 The y coordinate of the end point.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawLine(SDL_Renderer * renderer,
+                                               int x1, int y1, int x2, int y2);
+
+/**
+ *  \brief Draw a series of connected lines on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw multiple lines.
+ *  \param points The points along the lines
+ *  \param count The number of points, drawing count-1 lines
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawLines(SDL_Renderer * renderer,
+                                                const SDL_Point * points,
+                                                int count);
+
+/**
+ *  \brief Draw a rectangle on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw a rectangle.
+ *  \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawRect(SDL_Renderer * renderer,
+                                               const SDL_Rect * rect);
+
+/**
+ *  \brief Draw some number of rectangles on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw multiple rectangles.
+ *  \param rects A pointer to an array of destination rectangles.
+ *  \param count The number of rectangles.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawRects(SDL_Renderer * renderer,
+                                                const SDL_Rect * rects,
+                                                int count);
+
+/**
+ *  \brief Fill a rectangle on the current rendering target with the drawing color.
+ *
+ *  \param renderer The renderer which should fill a rectangle.
+ *  \param rect A pointer to the destination rectangle, or NULL for the entire
+ *              rendering target.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderFillRect(SDL_Renderer * renderer,
+                                               const SDL_Rect * rect);
+
+/**
+ *  \brief Fill some number of rectangles on the current rendering target with the drawing color.
+ *
+ *  \param renderer The renderer which should fill multiple rectangles.
+ *  \param rects A pointer to an array of destination rectangles.
+ *  \param count The number of rectangles.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderFillRects(SDL_Renderer * renderer,
+                                                const SDL_Rect * rects,
+                                                int count);
+
+/**
+ *  \brief Copy a portion of the texture to the current rendering target.
+ *
+ *  \param renderer The renderer which should copy parts of a texture.
+ *  \param texture The source texture.
+ *  \param srcrect   A pointer to the source rectangle, or NULL for the entire
+ *                   texture.
+ *  \param dstrect   A pointer to the destination rectangle, or NULL for the
+ *                   entire rendering target.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer,
+                                           SDL_Texture * texture,
+                                           const SDL_Rect * srcrect,
+                                           const SDL_Rect * dstrect);
+
+/**
+ *  \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center
+ *
+ *  \param renderer The renderer which should copy parts of a texture.
+ *  \param texture The source texture.
+ *  \param srcrect   A pointer to the source rectangle, or NULL for the entire
+ *                   texture.
+ *  \param dstrect   A pointer to the destination rectangle, or NULL for the
+ *                   entire rendering target.
+ *  \param angle    An angle in degrees that indicates the rotation that will be applied to dstrect
+ *  \param center   A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done aroud dstrect.w/2, dstrect.h/2)
+ *  \param flip     An SDL_RendererFlip value stating which flipping actions should be performed on the texture
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer,
+                                           SDL_Texture * texture,
+                                           const SDL_Rect * srcrect,
+                                           const SDL_Rect * dstrect,
+                                           const double angle,
+                                           const SDL_Point *center,
+                                           const SDL_RendererFlip flip);
+
+/**
+ *  \brief Read pixels from the current rendering target.
+ *
+ *  \param renderer The renderer from which pixels should be read.
+ *  \param rect   A pointer to the rectangle to read, or NULL for the entire
+ *                render target.
+ *  \param format The desired format of the pixel data, or 0 to use the format
+ *                of the rendering target
+ *  \param pixels A pointer to be filled in with the pixel data
+ *  \param pitch  The pitch of the pixels parameter.
+ *
+ *  \return 0 on success, or -1 if pixel reading is not supported.
+ *
+ *  \warning This is a very slow operation, and should not be used frequently.
+ */
+extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer,
+                                                 const SDL_Rect * rect,
+                                                 Uint32 format,
+                                                 void *pixels, int pitch);
+
+/**
+ *  \brief Update the screen with rendering performed.
+ */
+extern DECLSPEC void SDLCALL SDL_RenderPresent(SDL_Renderer * renderer);
+
+/**
+ *  \brief Destroy the specified texture.
+ *
+ *  \sa SDL_CreateTexture()
+ *  \sa SDL_CreateTextureFromSurface()
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture);
+
+/**
+ *  \brief Destroy the rendering context for a window and free associated
+ *         textures.
+ *
+ *  \sa SDL_CreateRenderer()
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Renderer * renderer);
+
+
+/**
+ *  \brief Bind the texture to the current OpenGL/ES/ES2 context for use with
+ *         OpenGL instructions.
+ *
+ *  \param texture  The SDL texture to bind
+ *  \param texw     A pointer to a float that will be filled with the texture width
+ *  \param texh     A pointer to a float that will be filled with the texture height
+ *
+ *  \return 0 on success, or -1 if the operation is not supported
+ */
+extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh);
+
+/**
+ *  \brief Unbind a texture from the current OpenGL/ES/ES2 context.
+ *
+ *  \param texture  The SDL texture to unbind
+ *
+ *  \return 0 on success, or -1 if the operation is not supported
+ */
+extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_render_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_revision.h b/Source/3rd Party/sdl/include/SDL_revision.h
new file mode 100644
index 000000000..a75dc3309
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_revision.h	
@@ -0,0 +1,2 @@
+#define SDL_REVISION "hg-8628:b558f99d48f0"
+#define SDL_REVISION_NUMBER 8628
diff --git a/Source/3rd Party/sdl/include/SDL_rwops.h b/Source/3rd Party/sdl/include/SDL_rwops.h
new file mode 100644
index 000000000..4bdd7876a
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_rwops.h	
@@ -0,0 +1,232 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_rwops.h
+ *
+ *  This file provides a general interface for SDL to read and write
+ *  data streams.  It can easily be extended to files, memory, etc.
+ */
+
+#ifndef _SDL_rwops_h
+#define _SDL_rwops_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RWops Types */
+#define SDL_RWOPS_UNKNOWN   0   /* Unknown stream type */
+#define SDL_RWOPS_WINFILE   1   /* Win32 file */
+#define SDL_RWOPS_STDFILE   2   /* Stdio file */
+#define SDL_RWOPS_JNIFILE   3   /* Android asset */
+#define SDL_RWOPS_MEMORY    4   /* Memory stream */
+#define SDL_RWOPS_MEMORY_RO 5   /* Read-Only memory stream */
+
+/**
+ * This is the read/write operation structure -- very basic.
+ */
+typedef struct SDL_RWops
+{
+    /**
+     *  Return the size of the file in this rwops, or -1 if unknown
+     */
+    Sint64 (SDLCALL * size) (struct SDL_RWops * context);
+
+    /**
+     *  Seek to \c offset relative to \c whence, one of stdio's whence values:
+     *  RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END
+     *
+     *  \return the final offset in the data stream, or -1 on error.
+     */
+    Sint64 (SDLCALL * seek) (struct SDL_RWops * context, Sint64 offset,
+                             int whence);
+
+    /**
+     *  Read up to \c maxnum objects each of size \c size from the data
+     *  stream to the area pointed at by \c ptr.
+     *
+     *  \return the number of objects read, or 0 at error or end of file.
+     */
+    size_t (SDLCALL * read) (struct SDL_RWops * context, void *ptr,
+                             size_t size, size_t maxnum);
+
+    /**
+     *  Write exactly \c num objects each of size \c size from the area
+     *  pointed at by \c ptr to data stream.
+     *
+     *  \return the number of objects written, or 0 at error or end of file.
+     */
+    size_t (SDLCALL * write) (struct SDL_RWops * context, const void *ptr,
+                              size_t size, size_t num);
+
+    /**
+     *  Close and free an allocated SDL_RWops structure.
+     *
+     *  \return 0 if successful or -1 on write error when flushing data.
+     */
+    int (SDLCALL * close) (struct SDL_RWops * context);
+
+    Uint32 type;
+    union
+    {
+#if defined(ANDROID)
+        struct
+        {
+            void *fileNameRef;
+            void *inputStreamRef;
+            void *readableByteChannelRef;
+            void *readMethod;
+            void *assetFileDescriptorRef;
+            long position;
+            long size;
+            long offset;
+            int fd;
+        } androidio;
+#elif defined(__WIN32__)
+        struct
+        {
+            SDL_bool append;
+            void *h;
+            struct
+            {
+                void *data;
+                size_t size;
+                size_t left;
+            } buffer;
+        } windowsio;
+#endif
+
+#ifdef HAVE_STDIO_H
+        struct
+        {
+            SDL_bool autoclose;
+            FILE *fp;
+        } stdio;
+#endif
+        struct
+        {
+            Uint8 *base;
+            Uint8 *here;
+            Uint8 *stop;
+        } mem;
+        struct
+        {
+            void *data1;
+            void *data2;
+        } unknown;
+    } hidden;
+
+} SDL_RWops;
+
+
+/**
+ *  \name RWFrom functions
+ *
+ *  Functions to create SDL_RWops structures from various data streams.
+ */
+/* @{ */
+
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file,
+                                                  const char *mode);
+
+#ifdef HAVE_STDIO_H
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp,
+                                                SDL_bool autoclose);
+#else
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(void * fp,
+                                                SDL_bool autoclose);
+#endif
+
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size);
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem,
+                                                      int size);
+
+/* @} *//* RWFrom functions */
+
+
+extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void);
+extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area);
+
+#define RW_SEEK_SET 0       /**< Seek from the beginning of data */
+#define RW_SEEK_CUR 1       /**< Seek relative to current read point */
+#define RW_SEEK_END 2       /**< Seek relative to the end of data */
+
+/**
+ *  \name Read/write macros
+ *
+ *  Macros to easily read and write from an SDL_RWops structure.
+ */
+/* @{ */
+#define SDL_RWsize(ctx)         (ctx)->size(ctx)
+#define SDL_RWseek(ctx, offset, whence) (ctx)->seek(ctx, offset, whence)
+#define SDL_RWtell(ctx)         (ctx)->seek(ctx, 0, RW_SEEK_CUR)
+#define SDL_RWread(ctx, ptr, size, n)   (ctx)->read(ctx, ptr, size, n)
+#define SDL_RWwrite(ctx, ptr, size, n)  (ctx)->write(ctx, ptr, size, n)
+#define SDL_RWclose(ctx)        (ctx)->close(ctx)
+/* @} *//* Read/write macros */
+
+
+/**
+ *  \name Read endian functions
+ *
+ *  Read an item of the specified endianness and return in native format.
+ */
+/* @{ */
+extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src);
+extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src);
+extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src);
+extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src);
+extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src);
+extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src);
+extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src);
+/* @} *//* Read endian functions */
+
+/**
+ *  \name Write endian functions
+ *
+ *  Write an item of native format to the specified endianness.
+ */
+/* @{ */
+extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
+/* @} *//* Write endian functions */
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_rwops_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_scancode.h b/Source/3rd Party/sdl/include/SDL_scancode.h
new file mode 100644
index 000000000..4b3be28fb
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_scancode.h	
@@ -0,0 +1,401 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_scancode.h
+ *
+ *  Defines keyboard scancodes.
+ */
+
+#ifndef _SDL_scancode_h
+#define _SDL_scancode_h
+
+#include "SDL_stdinc.h"
+
+/**
+ *  \brief The SDL keyboard scancode representation.
+ *
+ *  Values of this type are used to represent keyboard keys, among other places
+ *  in the \link SDL_Keysym::scancode key.keysym.scancode \endlink field of the
+ *  SDL_Event structure.
+ *
+ *  The values in this enumeration are based on the USB usage page standard:
+ *  http://www.usb.org/developers/devclass_docs/Hut1_12v2.pdf
+ */
+typedef enum
+{
+    SDL_SCANCODE_UNKNOWN = 0,
+
+    /**
+     *  \name Usage page 0x07
+     *
+     *  These values are from usage page 0x07 (USB keyboard page).
+     */
+    /* @{ */
+
+    SDL_SCANCODE_A = 4,
+    SDL_SCANCODE_B = 5,
+    SDL_SCANCODE_C = 6,
+    SDL_SCANCODE_D = 7,
+    SDL_SCANCODE_E = 8,
+    SDL_SCANCODE_F = 9,
+    SDL_SCANCODE_G = 10,
+    SDL_SCANCODE_H = 11,
+    SDL_SCANCODE_I = 12,
+    SDL_SCANCODE_J = 13,
+    SDL_SCANCODE_K = 14,
+    SDL_SCANCODE_L = 15,
+    SDL_SCANCODE_M = 16,
+    SDL_SCANCODE_N = 17,
+    SDL_SCANCODE_O = 18,
+    SDL_SCANCODE_P = 19,
+    SDL_SCANCODE_Q = 20,
+    SDL_SCANCODE_R = 21,
+    SDL_SCANCODE_S = 22,
+    SDL_SCANCODE_T = 23,
+    SDL_SCANCODE_U = 24,
+    SDL_SCANCODE_V = 25,
+    SDL_SCANCODE_W = 26,
+    SDL_SCANCODE_X = 27,
+    SDL_SCANCODE_Y = 28,
+    SDL_SCANCODE_Z = 29,
+
+    SDL_SCANCODE_1 = 30,
+    SDL_SCANCODE_2 = 31,
+    SDL_SCANCODE_3 = 32,
+    SDL_SCANCODE_4 = 33,
+    SDL_SCANCODE_5 = 34,
+    SDL_SCANCODE_6 = 35,
+    SDL_SCANCODE_7 = 36,
+    SDL_SCANCODE_8 = 37,
+    SDL_SCANCODE_9 = 38,
+    SDL_SCANCODE_0 = 39,
+
+    SDL_SCANCODE_RETURN = 40,
+    SDL_SCANCODE_ESCAPE = 41,
+    SDL_SCANCODE_BACKSPACE = 42,
+    SDL_SCANCODE_TAB = 43,
+    SDL_SCANCODE_SPACE = 44,
+
+    SDL_SCANCODE_MINUS = 45,
+    SDL_SCANCODE_EQUALS = 46,
+    SDL_SCANCODE_LEFTBRACKET = 47,
+    SDL_SCANCODE_RIGHTBRACKET = 48,
+    SDL_SCANCODE_BACKSLASH = 49, /**< Located at the lower left of the return
+                                  *   key on ISO keyboards and at the right end
+                                  *   of the QWERTY row on ANSI keyboards.
+                                  *   Produces REVERSE SOLIDUS (backslash) and
+                                  *   VERTICAL LINE in a US layout, REVERSE
+                                  *   SOLIDUS and VERTICAL LINE in a UK Mac
+                                  *   layout, NUMBER SIGN and TILDE in a UK
+                                  *   Windows layout, DOLLAR SIGN and POUND SIGN
+                                  *   in a Swiss German layout, NUMBER SIGN and
+                                  *   APOSTROPHE in a German layout, GRAVE
+                                  *   ACCENT and POUND SIGN in a French Mac
+                                  *   layout, and ASTERISK and MICRO SIGN in a
+                                  *   French Windows layout.
+                                  */
+    SDL_SCANCODE_NONUSHASH = 50, /**< ISO USB keyboards actually use this code
+                                  *   instead of 49 for the same key, but all
+                                  *   OSes I've seen treat the two codes
+                                  *   identically. So, as an implementor, unless
+                                  *   your keyboard generates both of those
+                                  *   codes and your OS treats them differently,
+                                  *   you should generate SDL_SCANCODE_BACKSLASH
+                                  *   instead of this code. As a user, you
+                                  *   should not rely on this code because SDL
+                                  *   will never generate it with most (all?)
+                                  *   keyboards.
+                                  */
+    SDL_SCANCODE_SEMICOLON = 51,
+    SDL_SCANCODE_APOSTROPHE = 52,
+    SDL_SCANCODE_GRAVE = 53, /**< Located in the top left corner (on both ANSI
+                              *   and ISO keyboards). Produces GRAVE ACCENT and
+                              *   TILDE in a US Windows layout and in US and UK
+                              *   Mac layouts on ANSI keyboards, GRAVE ACCENT
+                              *   and NOT SIGN in a UK Windows layout, SECTION
+                              *   SIGN and PLUS-MINUS SIGN in US and UK Mac
+                              *   layouts on ISO keyboards, SECTION SIGN and
+                              *   DEGREE SIGN in a Swiss German layout (Mac:
+                              *   only on ISO keyboards), CIRCUMFLEX ACCENT and
+                              *   DEGREE SIGN in a German layout (Mac: only on
+                              *   ISO keyboards), SUPERSCRIPT TWO and TILDE in a
+                              *   French Windows layout, COMMERCIAL AT and
+                              *   NUMBER SIGN in a French Mac layout on ISO
+                              *   keyboards, and LESS-THAN SIGN and GREATER-THAN
+                              *   SIGN in a Swiss German, German, or French Mac
+                              *   layout on ANSI keyboards.
+                              */
+    SDL_SCANCODE_COMMA = 54,
+    SDL_SCANCODE_PERIOD = 55,
+    SDL_SCANCODE_SLASH = 56,
+
+    SDL_SCANCODE_CAPSLOCK = 57,
+
+    SDL_SCANCODE_F1 = 58,
+    SDL_SCANCODE_F2 = 59,
+    SDL_SCANCODE_F3 = 60,
+    SDL_SCANCODE_F4 = 61,
+    SDL_SCANCODE_F5 = 62,
+    SDL_SCANCODE_F6 = 63,
+    SDL_SCANCODE_F7 = 64,
+    SDL_SCANCODE_F8 = 65,
+    SDL_SCANCODE_F9 = 66,
+    SDL_SCANCODE_F10 = 67,
+    SDL_SCANCODE_F11 = 68,
+    SDL_SCANCODE_F12 = 69,
+
+    SDL_SCANCODE_PRINTSCREEN = 70,
+    SDL_SCANCODE_SCROLLLOCK = 71,
+    SDL_SCANCODE_PAUSE = 72,
+    SDL_SCANCODE_INSERT = 73, /**< insert on PC, help on some Mac keyboards (but
+                                   does send code 73, not 117) */
+    SDL_SCANCODE_HOME = 74,
+    SDL_SCANCODE_PAGEUP = 75,
+    SDL_SCANCODE_DELETE = 76,
+    SDL_SCANCODE_END = 77,
+    SDL_SCANCODE_PAGEDOWN = 78,
+    SDL_SCANCODE_RIGHT = 79,
+    SDL_SCANCODE_LEFT = 80,
+    SDL_SCANCODE_DOWN = 81,
+    SDL_SCANCODE_UP = 82,
+
+    SDL_SCANCODE_NUMLOCKCLEAR = 83, /**< num lock on PC, clear on Mac keyboards
+                                     */
+    SDL_SCANCODE_KP_DIVIDE = 84,
+    SDL_SCANCODE_KP_MULTIPLY = 85,
+    SDL_SCANCODE_KP_MINUS = 86,
+    SDL_SCANCODE_KP_PLUS = 87,
+    SDL_SCANCODE_KP_ENTER = 88,
+    SDL_SCANCODE_KP_1 = 89,
+    SDL_SCANCODE_KP_2 = 90,
+    SDL_SCANCODE_KP_3 = 91,
+    SDL_SCANCODE_KP_4 = 92,
+    SDL_SCANCODE_KP_5 = 93,
+    SDL_SCANCODE_KP_6 = 94,
+    SDL_SCANCODE_KP_7 = 95,
+    SDL_SCANCODE_KP_8 = 96,
+    SDL_SCANCODE_KP_9 = 97,
+    SDL_SCANCODE_KP_0 = 98,
+    SDL_SCANCODE_KP_PERIOD = 99,
+
+    SDL_SCANCODE_NONUSBACKSLASH = 100, /**< This is the additional key that ISO
+                                        *   keyboards have over ANSI ones,
+                                        *   located between left shift and Y.
+                                        *   Produces GRAVE ACCENT and TILDE in a
+                                        *   US or UK Mac layout, REVERSE SOLIDUS
+                                        *   (backslash) and VERTICAL LINE in a
+                                        *   US or UK Windows layout, and
+                                        *   LESS-THAN SIGN and GREATER-THAN SIGN
+                                        *   in a Swiss German, German, or French
+                                        *   layout. */
+    SDL_SCANCODE_APPLICATION = 101, /**< windows contextual menu, compose */
+    SDL_SCANCODE_POWER = 102, /**< The USB document says this is a status flag,
+                               *   not a physical key - but some Mac keyboards
+                               *   do have a power key. */
+    SDL_SCANCODE_KP_EQUALS = 103,
+    SDL_SCANCODE_F13 = 104,
+    SDL_SCANCODE_F14 = 105,
+    SDL_SCANCODE_F15 = 106,
+    SDL_SCANCODE_F16 = 107,
+    SDL_SCANCODE_F17 = 108,
+    SDL_SCANCODE_F18 = 109,
+    SDL_SCANCODE_F19 = 110,
+    SDL_SCANCODE_F20 = 111,
+    SDL_SCANCODE_F21 = 112,
+    SDL_SCANCODE_F22 = 113,
+    SDL_SCANCODE_F23 = 114,
+    SDL_SCANCODE_F24 = 115,
+    SDL_SCANCODE_EXECUTE = 116,
+    SDL_SCANCODE_HELP = 117,
+    SDL_SCANCODE_MENU = 118,
+    SDL_SCANCODE_SELECT = 119,
+    SDL_SCANCODE_STOP = 120,
+    SDL_SCANCODE_AGAIN = 121,   /**< redo */
+    SDL_SCANCODE_UNDO = 122,
+    SDL_SCANCODE_CUT = 123,
+    SDL_SCANCODE_COPY = 124,
+    SDL_SCANCODE_PASTE = 125,
+    SDL_SCANCODE_FIND = 126,
+    SDL_SCANCODE_MUTE = 127,
+    SDL_SCANCODE_VOLUMEUP = 128,
+    SDL_SCANCODE_VOLUMEDOWN = 129,
+/* not sure whether there's a reason to enable these */
+/*     SDL_SCANCODE_LOCKINGCAPSLOCK = 130,  */
+/*     SDL_SCANCODE_LOCKINGNUMLOCK = 131, */
+/*     SDL_SCANCODE_LOCKINGSCROLLLOCK = 132, */
+    SDL_SCANCODE_KP_COMMA = 133,
+    SDL_SCANCODE_KP_EQUALSAS400 = 134,
+
+    SDL_SCANCODE_INTERNATIONAL1 = 135, /**< used on Asian keyboards, see
+                                            footnotes in USB doc */
+    SDL_SCANCODE_INTERNATIONAL2 = 136,
+    SDL_SCANCODE_INTERNATIONAL3 = 137, /**< Yen */
+    SDL_SCANCODE_INTERNATIONAL4 = 138,
+    SDL_SCANCODE_INTERNATIONAL5 = 139,
+    SDL_SCANCODE_INTERNATIONAL6 = 140,
+    SDL_SCANCODE_INTERNATIONAL7 = 141,
+    SDL_SCANCODE_INTERNATIONAL8 = 142,
+    SDL_SCANCODE_INTERNATIONAL9 = 143,
+    SDL_SCANCODE_LANG1 = 144, /**< Hangul/English toggle */
+    SDL_SCANCODE_LANG2 = 145, /**< Hanja conversion */
+    SDL_SCANCODE_LANG3 = 146, /**< Katakana */
+    SDL_SCANCODE_LANG4 = 147, /**< Hiragana */
+    SDL_SCANCODE_LANG5 = 148, /**< Zenkaku/Hankaku */
+    SDL_SCANCODE_LANG6 = 149, /**< reserved */
+    SDL_SCANCODE_LANG7 = 150, /**< reserved */
+    SDL_SCANCODE_LANG8 = 151, /**< reserved */
+    SDL_SCANCODE_LANG9 = 152, /**< reserved */
+
+    SDL_SCANCODE_ALTERASE = 153, /**< Erase-Eaze */
+    SDL_SCANCODE_SYSREQ = 154,
+    SDL_SCANCODE_CANCEL = 155,
+    SDL_SCANCODE_CLEAR = 156,
+    SDL_SCANCODE_PRIOR = 157,
+    SDL_SCANCODE_RETURN2 = 158,
+    SDL_SCANCODE_SEPARATOR = 159,
+    SDL_SCANCODE_OUT = 160,
+    SDL_SCANCODE_OPER = 161,
+    SDL_SCANCODE_CLEARAGAIN = 162,
+    SDL_SCANCODE_CRSEL = 163,
+    SDL_SCANCODE_EXSEL = 164,
+
+    SDL_SCANCODE_KP_00 = 176,
+    SDL_SCANCODE_KP_000 = 177,
+    SDL_SCANCODE_THOUSANDSSEPARATOR = 178,
+    SDL_SCANCODE_DECIMALSEPARATOR = 179,
+    SDL_SCANCODE_CURRENCYUNIT = 180,
+    SDL_SCANCODE_CURRENCYSUBUNIT = 181,
+    SDL_SCANCODE_KP_LEFTPAREN = 182,
+    SDL_SCANCODE_KP_RIGHTPAREN = 183,
+    SDL_SCANCODE_KP_LEFTBRACE = 184,
+    SDL_SCANCODE_KP_RIGHTBRACE = 185,
+    SDL_SCANCODE_KP_TAB = 186,
+    SDL_SCANCODE_KP_BACKSPACE = 187,
+    SDL_SCANCODE_KP_A = 188,
+    SDL_SCANCODE_KP_B = 189,
+    SDL_SCANCODE_KP_C = 190,
+    SDL_SCANCODE_KP_D = 191,
+    SDL_SCANCODE_KP_E = 192,
+    SDL_SCANCODE_KP_F = 193,
+    SDL_SCANCODE_KP_XOR = 194,
+    SDL_SCANCODE_KP_POWER = 195,
+    SDL_SCANCODE_KP_PERCENT = 196,
+    SDL_SCANCODE_KP_LESS = 197,
+    SDL_SCANCODE_KP_GREATER = 198,
+    SDL_SCANCODE_KP_AMPERSAND = 199,
+    SDL_SCANCODE_KP_DBLAMPERSAND = 200,
+    SDL_SCANCODE_KP_VERTICALBAR = 201,
+    SDL_SCANCODE_KP_DBLVERTICALBAR = 202,
+    SDL_SCANCODE_KP_COLON = 203,
+    SDL_SCANCODE_KP_HASH = 204,
+    SDL_SCANCODE_KP_SPACE = 205,
+    SDL_SCANCODE_KP_AT = 206,
+    SDL_SCANCODE_KP_EXCLAM = 207,
+    SDL_SCANCODE_KP_MEMSTORE = 208,
+    SDL_SCANCODE_KP_MEMRECALL = 209,
+    SDL_SCANCODE_KP_MEMCLEAR = 210,
+    SDL_SCANCODE_KP_MEMADD = 211,
+    SDL_SCANCODE_KP_MEMSUBTRACT = 212,
+    SDL_SCANCODE_KP_MEMMULTIPLY = 213,
+    SDL_SCANCODE_KP_MEMDIVIDE = 214,
+    SDL_SCANCODE_KP_PLUSMINUS = 215,
+    SDL_SCANCODE_KP_CLEAR = 216,
+    SDL_SCANCODE_KP_CLEARENTRY = 217,
+    SDL_SCANCODE_KP_BINARY = 218,
+    SDL_SCANCODE_KP_OCTAL = 219,
+    SDL_SCANCODE_KP_DECIMAL = 220,
+    SDL_SCANCODE_KP_HEXADECIMAL = 221,
+
+    SDL_SCANCODE_LCTRL = 224,
+    SDL_SCANCODE_LSHIFT = 225,
+    SDL_SCANCODE_LALT = 226, /**< alt, option */
+    SDL_SCANCODE_LGUI = 227, /**< windows, command (apple), meta */
+    SDL_SCANCODE_RCTRL = 228,
+    SDL_SCANCODE_RSHIFT = 229,
+    SDL_SCANCODE_RALT = 230, /**< alt gr, option */
+    SDL_SCANCODE_RGUI = 231, /**< windows, command (apple), meta */
+
+    SDL_SCANCODE_MODE = 257,    /**< I'm not sure if this is really not covered
+                                 *   by any of the above, but since there's a
+                                 *   special KMOD_MODE for it I'm adding it here
+                                 */
+
+    /* @} *//* Usage page 0x07 */
+
+    /**
+     *  \name Usage page 0x0C
+     *
+     *  These values are mapped from usage page 0x0C (USB consumer page).
+     */
+    /* @{ */
+
+    SDL_SCANCODE_AUDIONEXT = 258,
+    SDL_SCANCODE_AUDIOPREV = 259,
+    SDL_SCANCODE_AUDIOSTOP = 260,
+    SDL_SCANCODE_AUDIOPLAY = 261,
+    SDL_SCANCODE_AUDIOMUTE = 262,
+    SDL_SCANCODE_MEDIASELECT = 263,
+    SDL_SCANCODE_WWW = 264,
+    SDL_SCANCODE_MAIL = 265,
+    SDL_SCANCODE_CALCULATOR = 266,
+    SDL_SCANCODE_COMPUTER = 267,
+    SDL_SCANCODE_AC_SEARCH = 268,
+    SDL_SCANCODE_AC_HOME = 269,
+    SDL_SCANCODE_AC_BACK = 270,
+    SDL_SCANCODE_AC_FORWARD = 271,
+    SDL_SCANCODE_AC_STOP = 272,
+    SDL_SCANCODE_AC_REFRESH = 273,
+    SDL_SCANCODE_AC_BOOKMARKS = 274,
+
+    /* @} *//* Usage page 0x0C */
+
+    /**
+     *  \name Walther keys
+     *
+     *  These are values that Christian Walther added (for mac keyboard?).
+     */
+    /* @{ */
+
+    SDL_SCANCODE_BRIGHTNESSDOWN = 275,
+    SDL_SCANCODE_BRIGHTNESSUP = 276,
+    SDL_SCANCODE_DISPLAYSWITCH = 277, /**< display mirroring/dual display
+                                           switch, video mode switch */
+    SDL_SCANCODE_KBDILLUMTOGGLE = 278,
+    SDL_SCANCODE_KBDILLUMDOWN = 279,
+    SDL_SCANCODE_KBDILLUMUP = 280,
+    SDL_SCANCODE_EJECT = 281,
+    SDL_SCANCODE_SLEEP = 282,
+
+    SDL_SCANCODE_APP1 = 283,
+    SDL_SCANCODE_APP2 = 284,
+
+    /* @} *//* Walther keys */
+
+    /* Add any other keys here. */
+
+    SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes
+                                 for array bounds */
+} SDL_Scancode;
+
+#endif /* _SDL_scancode_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_shape.h b/Source/3rd Party/sdl/include/SDL_shape.h
new file mode 100644
index 000000000..53029306e
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_shape.h	
@@ -0,0 +1,143 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_shape_h
+#define _SDL_shape_h
+
+#include "SDL_stdinc.h"
+#include "SDL_pixels.h"
+#include "SDL_rect.h"
+#include "SDL_surface.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \file SDL_shape.h
+ *
+ * Header file for the shaped window API.
+ */
+
+#define SDL_NONSHAPEABLE_WINDOW -1
+#define SDL_INVALID_SHAPE_ARGUMENT -2
+#define SDL_WINDOW_LACKS_SHAPE -3
+
+/**
+ *  \brief Create a window that can be shaped with the specified position, dimensions, and flags.
+ *
+ *  \param title The title of the window, in UTF-8 encoding.
+ *  \param x     The x position of the window, ::SDL_WINDOWPOS_CENTERED, or
+ *               ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param y     The y position of the window, ::SDL_WINDOWPOS_CENTERED, or
+ *               ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param w     The width of the window.
+ *  \param h     The height of the window.
+ *  \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following:
+ *               ::SDL_WINDOW_OPENGL,     ::SDL_WINDOW_INPUT_GRABBED,
+ *               ::SDL_WINDOW_HIDDEN,     ::SDL_WINDOW_RESIZABLE,
+ *               ::SDL_WINDOW_MAXIMIZED,  ::SDL_WINDOW_MINIMIZED,
+ *       ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset.
+ *
+ *  \return The window created, or NULL if window creation failed.
+ *
+ *  \sa SDL_DestroyWindow()
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags);
+
+/**
+ * \brief Return whether the given window is a shaped window.
+ *
+ * \param window The window to query for being shaped.
+ *
+ * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL.
+ * \sa SDL_CreateShapedWindow
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsShapedWindow(const SDL_Window *window);
+
+/** \brief An enum denoting the specific type of contents present in an SDL_WindowShapeParams union. */
+typedef enum {
+    /** \brief The default mode, a binarized alpha cutoff of 1. */
+    ShapeModeDefault,
+    /** \brief A binarized alpha cutoff with a given integer value. */
+    ShapeModeBinarizeAlpha,
+    /** \brief A binarized alpha cutoff with a given integer value, but with the opposite comparison. */
+    ShapeModeReverseBinarizeAlpha,
+    /** \brief A color key is applied. */
+    ShapeModeColorKey
+} WindowShapeMode;
+
+#define SDL_SHAPEMODEALPHA(mode) (mode == ShapeModeDefault || mode == ShapeModeBinarizeAlpha || mode == ShapeModeReverseBinarizeAlpha)
+
+/** \brief A union containing parameters for shaped windows. */
+typedef union {
+    /** \brief a cutoff alpha value for binarization of the window shape's alpha channel. */
+    Uint8 binarizationCutoff;
+    SDL_Color colorKey;
+} SDL_WindowShapeParams;
+
+/** \brief A struct that tags the SDL_WindowShapeParams union with an enum describing the type of its contents. */
+typedef struct SDL_WindowShapeMode {
+    /** \brief The mode of these window-shape parameters. */
+    WindowShapeMode mode;
+    /** \brief Window-shape parameters. */
+    SDL_WindowShapeParams parameters;
+} SDL_WindowShapeMode;
+
+/**
+ * \brief Set the shape and parameters of a shaped window.
+ *
+ * \param window The shaped window whose parameters should be set.
+ * \param shape A surface encoding the desired shape for the window.
+ * \param shape_mode The parameters to set for the shaped window.
+ *
+ * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on invalid an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW
+ *           if the SDL_Window* given does not reference a valid shaped window.
+ *
+ * \sa SDL_WindowShapeMode
+ * \sa SDL_GetShapedWindowMode.
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
+
+/**
+ * \brief Get the shape parameters of a shaped window.
+ *
+ * \param window The shaped window whose parameters should be retrieved.
+ * \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape.
+ *
+ * \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode
+ *           data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if
+ *           the SDL_Window* given is a shapeable window currently lacking a shape.
+ *
+ * \sa SDL_WindowShapeMode
+ * \sa SDL_SetWindowShape
+ */
+extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shape_mode);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_shape_h */
diff --git a/Source/3rd Party/sdl/include/SDL_stdinc.h b/Source/3rd Party/sdl/include/SDL_stdinc.h
new file mode 100644
index 000000000..31b343d30
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_stdinc.h	
@@ -0,0 +1,405 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_stdinc.h
+ *
+ *  This is a general header that includes C language support.
+ */
+
+#ifndef _SDL_stdinc_h
+#define _SDL_stdinc_h
+
+#include "SDL_config.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#if defined(STDC_HEADERS)
+# include <stdlib.h>
+# include <stddef.h>
+# include <stdarg.h>
+#else
+# if defined(HAVE_STDLIB_H)
+#  include <stdlib.h>
+# elif defined(HAVE_MALLOC_H)
+#  include <malloc.h>
+# endif
+# if defined(HAVE_STDDEF_H)
+#  include <stddef.h>
+# endif
+# if defined(HAVE_STDARG_H)
+#  include <stdarg.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if defined(HAVE_INTTYPES_H)
+# include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+# include <stdint.h>
+#endif
+#ifdef HAVE_CTYPE_H
+# include <ctype.h>
+#endif
+#ifdef HAVE_MATH_H
+# if defined(__WINRT__)
+/* Defining _USE_MATH_DEFINES is required to get M_PI to be defined on
+   WinRT.  See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
+   for more information.
+*/
+#  define _USE_MATH_DEFINES
+# endif
+# include <math.h>
+#endif
+#ifdef HAVE_FLOAT_H
+# include <float.h>
+#endif
+#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
+# include <iconv.h>
+#endif
+
+/**
+ *  The number of elements in an array.
+ */
+#define SDL_arraysize(array)    (sizeof(array)/sizeof(array[0]))
+#define SDL_TABLESIZE(table)    SDL_arraysize(table)
+
+/**
+ *  \name Cast operators
+ *
+ *  Use proper C++ casts when compiled as C++ to be compatible with the option
+ *  -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above).
+ */
+/* @{ */
+#ifdef __cplusplus
+#define SDL_reinterpret_cast(type, expression) reinterpret_cast<type>(expression)
+#define SDL_static_cast(type, expression) static_cast<type>(expression)
+#define SDL_const_cast(type, expression) const_cast<type>(expression)
+#else
+#define SDL_reinterpret_cast(type, expression) ((type)(expression))
+#define SDL_static_cast(type, expression) ((type)(expression))
+#define SDL_const_cast(type, expression) ((type)(expression))
+#endif
+/* @} *//* Cast operators */
+
+/* Define a four character code as a Uint32 */
+#define SDL_FOURCC(A, B, C, D) \
+    ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \
+     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \
+     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \
+     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24))
+
+/**
+ *  \name Basic data types
+ */
+/* @{ */
+
+typedef enum
+{
+    SDL_FALSE = 0,
+    SDL_TRUE = 1
+} SDL_bool;
+
+/**
+ * \brief A signed 8-bit integer type.
+ */
+typedef int8_t Sint8;
+/**
+ * \brief An unsigned 8-bit integer type.
+ */
+typedef uint8_t Uint8;
+/**
+ * \brief A signed 16-bit integer type.
+ */
+typedef int16_t Sint16;
+/**
+ * \brief An unsigned 16-bit integer type.
+ */
+typedef uint16_t Uint16;
+/**
+ * \brief A signed 32-bit integer type.
+ */
+typedef int32_t Sint32;
+/**
+ * \brief An unsigned 32-bit integer type.
+ */
+typedef uint32_t Uint32;
+
+/**
+ * \brief A signed 64-bit integer type.
+ */
+typedef int64_t Sint64;
+/**
+ * \brief An unsigned 64-bit integer type.
+ */
+typedef uint64_t Uint64;
+
+/* @} *//* Basic data types */
+
+
+#define SDL_COMPILE_TIME_ASSERT(name, x)               \
+       typedef int SDL_dummy_ ## name[(x) * 2 - 1]
+/** \cond */
+#ifndef DOXYGEN_SHOULD_IGNORE_THIS
+SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
+SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
+SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
+SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
+SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
+SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
+SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
+SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
+#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
+/** \endcond */
+
+/* Check to make sure enums are the size of ints, for structure packing.
+   For both Watcom C/C++ and Borland C/C++ the compiler option that makes
+   enums having the size of an int must be enabled.
+   This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
+*/
+
+/** \cond */
+#ifndef DOXYGEN_SHOULD_IGNORE_THIS
+#if !defined(__ANDROID__)
+   /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
+typedef enum
+{
+    DUMMY_ENUM_VALUE
+} SDL_DUMMY_ENUM;
+
+SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
+#endif
+#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
+/** \endcond */
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(HAVE_ALLOCA) && !defined(alloca)
+# if defined(HAVE_ALLOCA_H)
+#  include <alloca.h>
+# elif defined(__GNUC__)
+#  define alloca __builtin_alloca
+# elif defined(_MSC_VER)
+#  include <malloc.h>
+#  define alloca _alloca
+# elif defined(__WATCOMC__)
+#  include <malloc.h>
+# elif defined(__BORLANDC__)
+#  include <malloc.h>
+# elif defined(__DMC__)
+#  include <stdlib.h>
+# elif defined(__AIX__)
+#pragma alloca
+# elif defined(__MRC__)
+void *alloca(unsigned);
+# else
+char *alloca();
+# endif
+#endif
+#ifdef HAVE_ALLOCA
+#define SDL_stack_alloc(type, count)    (type*)alloca(sizeof(type)*(count))
+#define SDL_stack_free(data)
+#else
+#define SDL_stack_alloc(type, count)    (type*)SDL_malloc(sizeof(type)*(count))
+#define SDL_stack_free(data)            SDL_free(data)
+#endif
+
+extern DECLSPEC void *SDLCALL SDL_malloc(size_t size);
+extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size);
+extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size);
+extern DECLSPEC void SDLCALL SDL_free(void *mem);
+
+extern DECLSPEC char *SDLCALL SDL_getenv(const char *name);
+extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value, int overwrite);
+
+extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, const void *));
+
+extern DECLSPEC int SDLCALL SDL_abs(int x);
+
+/* !!! FIXME: these have side effects. You probably shouldn't use them. */
+/* !!! FIXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */
+#define SDL_min(x, y) (((x) < (y)) ? (x) : (y))
+#define SDL_max(x, y) (((x) > (y)) ? (x) : (y))
+
+extern DECLSPEC int SDLCALL SDL_isdigit(int x);
+extern DECLSPEC int SDLCALL SDL_isspace(int x);
+extern DECLSPEC int SDLCALL SDL_toupper(int x);
+extern DECLSPEC int SDLCALL SDL_tolower(int x);
+
+extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len);
+
+#define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x)))
+#define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x)))
+
+/* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */
+SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords)
+{
+#if defined(__GNUC__) && defined(i386)
+    int u0, u1, u2;
+    __asm__ __volatile__ (
+        "cld \n\t"
+        "rep ; stosl \n\t"
+        : "=&D" (u0), "=&a" (u1), "=&c" (u2)
+        : "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, dwords))
+        : "memory"
+    );
+#else
+    size_t _n = (dwords + 3) / 4;
+    Uint32 *_p = SDL_static_cast(Uint32 *, dst);
+    Uint32 _val = (val);
+    if (dwords == 0)
+        return;
+    switch (dwords % 4)
+    {
+        case 0: do {    *_p++ = _val;
+        case 3:         *_p++ = _val;
+        case 2:         *_p++ = _val;
+        case 1:         *_p++ = _val;
+        } while ( --_n );
+    }
+#endif
+}
+
+
+extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src, size_t len);
+
+SDL_FORCE_INLINE void *SDL_memcpy4(void *dst, const void *src, size_t dwords)
+{
+    return SDL_memcpy(dst, src, dwords * 4);
+}
+
+extern DECLSPEC void *SDLCALL SDL_memmove(void *dst, const void *src, size_t len);
+extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len);
+
+extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr);
+extern DECLSPEC size_t SDLCALL SDL_wcslcpy(wchar_t *dst, const wchar_t *src, size_t maxlen);
+extern DECLSPEC size_t SDLCALL SDL_wcslcat(wchar_t *dst, const wchar_t *src, size_t maxlen);
+
+extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str);
+extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen);
+extern DECLSPEC size_t SDLCALL SDL_utf8strlcpy(char *dst, const char *src, size_t dst_bytes);
+extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen);
+extern DECLSPEC char *SDLCALL SDL_strdup(const char *str);
+extern DECLSPEC char *SDLCALL SDL_strrev(char *str);
+extern DECLSPEC char *SDLCALL SDL_strupr(char *str);
+extern DECLSPEC char *SDLCALL SDL_strlwr(char *str);
+extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c);
+extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c);
+extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle);
+
+extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_uitoa(unsigned int value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *str, int radix);
+
+extern DECLSPEC int SDLCALL SDL_atoi(const char *str);
+extern DECLSPEC double SDLCALL SDL_atof(const char *str);
+extern DECLSPEC long SDLCALL SDL_strtol(const char *str, char **endp, int base);
+extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *str, char **endp, int base);
+extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *str, char **endp, int base);
+extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *str, char **endp, int base);
+extern DECLSPEC double SDLCALL SDL_strtod(const char *str, char **endp);
+
+extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
+extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
+extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2);
+extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t len);
+
+extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...);
+extern DECLSPEC int SDLCALL SDL_vsscanf(const char *text, const char *fmt, va_list ap);
+extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...);
+extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap);
+
+#ifndef HAVE_M_PI
+#ifndef M_PI
+#define M_PI    3.14159265358979323846264338327950288   /* pi */
+#endif
+#endif
+
+extern DECLSPEC double SDLCALL SDL_acos(double x);
+extern DECLSPEC double SDLCALL SDL_asin(double x);
+extern DECLSPEC double SDLCALL SDL_atan(double x);
+extern DECLSPEC double SDLCALL SDL_atan2(double x, double y);
+extern DECLSPEC double SDLCALL SDL_ceil(double x);
+extern DECLSPEC double SDLCALL SDL_copysign(double x, double y);
+extern DECLSPEC double SDLCALL SDL_cos(double x);
+extern DECLSPEC float SDLCALL SDL_cosf(float x);
+extern DECLSPEC double SDLCALL SDL_fabs(double x);
+extern DECLSPEC double SDLCALL SDL_floor(double x);
+extern DECLSPEC double SDLCALL SDL_log(double x);
+extern DECLSPEC double SDLCALL SDL_pow(double x, double y);
+extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n);
+extern DECLSPEC double SDLCALL SDL_sin(double x);
+extern DECLSPEC float SDLCALL SDL_sinf(float x);
+extern DECLSPEC double SDLCALL SDL_sqrt(double x);
+
+/* The SDL implementation of iconv() returns these error codes */
+#define SDL_ICONV_ERROR     (size_t)-1
+#define SDL_ICONV_E2BIG     (size_t)-2
+#define SDL_ICONV_EILSEQ    (size_t)-3
+#define SDL_ICONV_EINVAL    (size_t)-4
+
+/* SDL_iconv_* are now always real symbols/types, not macros or inlined. */
+typedef struct _SDL_iconv_t *SDL_iconv_t;
+extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode,
+                                                   const char *fromcode);
+extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
+extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf,
+                                         size_t * inbytesleft, char **outbuf,
+                                         size_t * outbytesleft);
+/**
+ *  This function converts a string between encodings in one pass, returning a
+ *  string that must be freed with SDL_free() or NULL on error.
+ */
+extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode,
+                                               const char *fromcode,
+                                               const char *inbuf,
+                                               size_t inbytesleft);
+#define SDL_iconv_utf8_locale(S)    SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
+#define SDL_iconv_utf8_ucs2(S)      (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
+#define SDL_iconv_utf8_ucs4(S)      (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_stdinc_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_surface.h b/Source/3rd Party/sdl/include/SDL_surface.h
new file mode 100644
index 000000000..aa8d82174
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_surface.h	
@@ -0,0 +1,503 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_surface.h
+ *
+ *  Header file for ::SDL_Surface definition and management functions.
+ */
+
+#ifndef _SDL_surface_h
+#define _SDL_surface_h
+
+#include "SDL_stdinc.h"
+#include "SDL_pixels.h"
+#include "SDL_rect.h"
+#include "SDL_blendmode.h"
+#include "SDL_rwops.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \name Surface flags
+ *
+ *  These are the currently supported flags for the ::SDL_Surface.
+ *
+ *  \internal
+ *  Used internally (read-only).
+ */
+/* @{ */
+#define SDL_SWSURFACE       0           /**< Just here for compatibility */
+#define SDL_PREALLOC        0x00000001  /**< Surface uses preallocated memory */
+#define SDL_RLEACCEL        0x00000002  /**< Surface is RLE encoded */
+#define SDL_DONTFREE        0x00000004  /**< Surface is referenced internally */
+/* @} *//* Surface flags */
+
+/**
+ *  Evaluates to true if the surface needs to be locked before access.
+ */
+#define SDL_MUSTLOCK(S) (((S)->flags & SDL_RLEACCEL) != 0)
+
+/**
+ * \brief A collection of pixels used in software blitting.
+ *
+ * \note  This structure should be treated as read-only, except for \c pixels,
+ *        which, if not NULL, contains the raw pixel data for the surface.
+ */
+typedef struct SDL_Surface
+{
+    Uint32 flags;               /**< Read-only */
+    SDL_PixelFormat *format;    /**< Read-only */
+    int w, h;                   /**< Read-only */
+    int pitch;                  /**< Read-only */
+    void *pixels;               /**< Read-write */
+
+    /** Application data associated with the surface */
+    void *userdata;             /**< Read-write */
+
+    /** information needed for surfaces requiring locks */
+    int locked;                 /**< Read-only */
+    void *lock_data;            /**< Read-only */
+
+    /** clipping information */
+    SDL_Rect clip_rect;         /**< Read-only */
+
+    /** info for fast blit mapping to other surfaces */
+    struct SDL_BlitMap *map;    /**< Private */
+
+    /** Reference count -- used when freeing surface */
+    int refcount;               /**< Read-mostly */
+} SDL_Surface;
+
+/**
+ * \brief The type of function used for surface blitting functions.
+ */
+typedef int (*SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect,
+                         struct SDL_Surface * dst, SDL_Rect * dstrect);
+
+/**
+ *  Allocate and free an RGB surface.
+ *
+ *  If the depth is 4 or 8 bits, an empty palette is allocated for the surface.
+ *  If the depth is greater than 8 bits, the pixel format is set using the
+ *  flags '[RGB]mask'.
+ *
+ *  If the function runs out of memory, it will return NULL.
+ *
+ *  \param flags The \c flags are obsolete and should be set to 0.
+ *  \param width The width in pixels of the surface to create.
+ *  \param height The height in pixels of the surface to create.
+ *  \param depth The depth in bits of the surface to create.
+ *  \param Rmask The red mask of the surface to create.
+ *  \param Gmask The green mask of the surface to create.
+ *  \param Bmask The blue mask of the surface to create.
+ *  \param Amask The alpha mask of the surface to create.
+ */
+extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface
+    (Uint32 flags, int width, int height, int depth,
+     Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
+extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels,
+                                                              int width,
+                                                              int height,
+                                                              int depth,
+                                                              int pitch,
+                                                              Uint32 Rmask,
+                                                              Uint32 Gmask,
+                                                              Uint32 Bmask,
+                                                              Uint32 Amask);
+extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface);
+
+/**
+ *  \brief Set the palette used by a surface.
+ *
+ *  \return 0, or -1 if the surface format doesn't use a palette.
+ *
+ *  \note A single palette can be shared with many surfaces.
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface,
+                                                  SDL_Palette * palette);
+
+/**
+ *  \brief Sets up a surface for directly accessing the pixels.
+ *
+ *  Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write
+ *  to and read from \c surface->pixels, using the pixel format stored in
+ *  \c surface->format.  Once you are done accessing the surface, you should
+ *  use SDL_UnlockSurface() to release it.
+ *
+ *  Not all surfaces require locking.  If SDL_MUSTLOCK(surface) evaluates
+ *  to 0, then you can read and write to the surface at any time, and the
+ *  pixel format of the surface will not change.
+ *
+ *  No operating system or library calls should be made between lock/unlock
+ *  pairs, as critical system locks may be held during this time.
+ *
+ *  SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked.
+ *
+ *  \sa SDL_UnlockSurface()
+ */
+extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface);
+/** \sa SDL_LockSurface() */
+extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface);
+
+/**
+ *  Load a surface from a seekable SDL data stream (memory or file).
+ *
+ *  If \c freesrc is non-zero, the stream will be closed after being read.
+ *
+ *  The new surface should be freed with SDL_FreeSurface().
+ *
+ *  \return the new surface, or NULL if there was an error.
+ */
+extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src,
+                                                    int freesrc);
+
+/**
+ *  Load a surface from a file.
+ *
+ *  Convenience macro.
+ */
+#define SDL_LoadBMP(file)   SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1)
+
+/**
+ *  Save a surface to a seekable SDL data stream (memory or file).
+ *
+ *  If \c freedst is non-zero, the stream will be closed after being written.
+ *
+ *  \return 0 if successful or -1 if there was an error.
+ */
+extern DECLSPEC int SDLCALL SDL_SaveBMP_RW
+    (SDL_Surface * surface, SDL_RWops * dst, int freedst);
+
+/**
+ *  Save a surface to a file.
+ *
+ *  Convenience macro.
+ */
+#define SDL_SaveBMP(surface, file) \
+        SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1)
+
+/**
+ *  \brief Sets the RLE acceleration hint for a surface.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid
+ *
+ *  \note If RLE is enabled, colorkey and alpha blending blits are much faster,
+ *        but the surface must be locked before directly accessing the pixels.
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface,
+                                              int flag);
+
+/**
+ *  \brief Sets the color key (transparent pixel) in a blittable surface.
+ *
+ *  \param surface The surface to update
+ *  \param flag Non-zero to enable colorkey and 0 to disable colorkey
+ *  \param key The transparent pixel in the native surface format
+ *
+ *  \return 0 on success, or -1 if the surface is not valid
+ *
+ *  You can pass SDL_RLEACCEL to enable RLE accelerated blits.
+ */
+extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface,
+                                            int flag, Uint32 key);
+
+/**
+ *  \brief Gets the color key (transparent pixel) in a blittable surface.
+ *
+ *  \param surface The surface to update
+ *  \param key A pointer filled in with the transparent pixel in the native
+ *             surface format
+ *
+ *  \return 0 on success, or -1 if the surface is not valid or colorkey is not
+ *          enabled.
+ */
+extern DECLSPEC int SDLCALL SDL_GetColorKey(SDL_Surface * surface,
+                                            Uint32 * key);
+
+/**
+ *  \brief Set an additional color value used in blit operations.
+ *
+ *  \param surface The surface to update.
+ *  \param r The red color value multiplied into blit operations.
+ *  \param g The green color value multiplied into blit operations.
+ *  \param b The blue color value multiplied into blit operations.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_GetSurfaceColorMod()
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface,
+                                                   Uint8 r, Uint8 g, Uint8 b);
+
+
+/**
+ *  \brief Get the additional color value used in blit operations.
+ *
+ *  \param surface The surface to query.
+ *  \param r A pointer filled in with the current red color value.
+ *  \param g A pointer filled in with the current green color value.
+ *  \param b A pointer filled in with the current blue color value.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_SetSurfaceColorMod()
+ */
+extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface,
+                                                   Uint8 * r, Uint8 * g,
+                                                   Uint8 * b);
+
+/**
+ *  \brief Set an additional alpha value used in blit operations.
+ *
+ *  \param surface The surface to update.
+ *  \param alpha The alpha value multiplied into blit operations.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_GetSurfaceAlphaMod()
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface,
+                                                   Uint8 alpha);
+
+/**
+ *  \brief Get the additional alpha value used in blit operations.
+ *
+ *  \param surface The surface to query.
+ *  \param alpha A pointer filled in with the current alpha value.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_SetSurfaceAlphaMod()
+ */
+extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface,
+                                                   Uint8 * alpha);
+
+/**
+ *  \brief Set the blend mode used for blit operations.
+ *
+ *  \param surface The surface to update.
+ *  \param blendMode ::SDL_BlendMode to use for blit blending.
+ *
+ *  \return 0 on success, or -1 if the parameters are not valid.
+ *
+ *  \sa SDL_GetSurfaceBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface,
+                                                    SDL_BlendMode blendMode);
+
+/**
+ *  \brief Get the blend mode used for blit operations.
+ *
+ *  \param surface   The surface to query.
+ *  \param blendMode A pointer filled in with the current blend mode.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_SetSurfaceBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface,
+                                                    SDL_BlendMode *blendMode);
+
+/**
+ *  Sets the clipping rectangle for the destination surface in a blit.
+ *
+ *  If the clip rectangle is NULL, clipping will be disabled.
+ *
+ *  If the clip rectangle doesn't intersect the surface, the function will
+ *  return SDL_FALSE and blits will be completely clipped.  Otherwise the
+ *  function returns SDL_TRUE and blits to the surface will be clipped to
+ *  the intersection of the surface area and the clipping rectangle.
+ *
+ *  Note that blits are automatically clipped to the edges of the source
+ *  and destination surfaces.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface,
+                                                 const SDL_Rect * rect);
+
+/**
+ *  Gets the clipping rectangle for the destination surface in a blit.
+ *
+ *  \c rect must be a pointer to a valid rectangle which will be filled
+ *  with the correct values.
+ */
+extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface,
+                                             SDL_Rect * rect);
+
+/**
+ *  Creates a new surface of the specified format, and then copies and maps
+ *  the given surface to it so the blit of the converted surface will be as
+ *  fast as possible.  If this function fails, it returns NULL.
+ *
+ *  The \c flags parameter is passed to SDL_CreateRGBSurface() and has those
+ *  semantics.  You can also pass ::SDL_RLEACCEL in the flags parameter and
+ *  SDL will try to RLE accelerate colorkey and alpha blits in the resulting
+ *  surface.
+ */
+extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface
+    (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags);
+extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat
+    (SDL_Surface * src, Uint32 pixel_format, Uint32 flags);
+
+/**
+ * \brief Copy a block of pixels of one format to another format
+ *
+ *  \return 0 on success, or -1 if there was an error
+ */
+extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height,
+                                              Uint32 src_format,
+                                              const void * src, int src_pitch,
+                                              Uint32 dst_format,
+                                              void * dst, int dst_pitch);
+
+/**
+ *  Performs a fast fill of the given rectangle with \c color.
+ *
+ *  If \c rect is NULL, the whole surface will be filled with \c color.
+ *
+ *  The color should be a pixel of the format used by the surface, and
+ *  can be generated by the SDL_MapRGB() function.
+ *
+ *  \return 0 on success, or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_FillRect
+    (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color);
+extern DECLSPEC int SDLCALL SDL_FillRects
+    (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color);
+
+/**
+ *  Performs a fast blit from the source surface to the destination surface.
+ *
+ *  This assumes that the source and destination rectangles are
+ *  the same size.  If either \c srcrect or \c dstrect are NULL, the entire
+ *  surface (\c src or \c dst) is copied.  The final blit rectangles are saved
+ *  in \c srcrect and \c dstrect after all clipping is performed.
+ *
+ *  \return If the blit is successful, it returns 0, otherwise it returns -1.
+ *
+ *  The blit function should not be called on a locked surface.
+ *
+ *  The blit semantics for surfaces with and without blending and colorkey
+ *  are defined as follows:
+ *  \verbatim
+    RGBA->RGB:
+      Source surface blend mode set to SDL_BLENDMODE_BLEND:
+        alpha-blend (using the source alpha-channel and per-surface alpha)
+        SDL_SRCCOLORKEY ignored.
+      Source surface blend mode set to SDL_BLENDMODE_NONE:
+        copy RGB.
+        if SDL_SRCCOLORKEY set, only copy the pixels matching the
+        RGB values of the source color key, ignoring alpha in the
+        comparison.
+
+    RGB->RGBA:
+      Source surface blend mode set to SDL_BLENDMODE_BLEND:
+        alpha-blend (using the source per-surface alpha)
+      Source surface blend mode set to SDL_BLENDMODE_NONE:
+        copy RGB, set destination alpha to source per-surface alpha value.
+      both:
+        if SDL_SRCCOLORKEY set, only copy the pixels matching the
+        source color key.
+
+    RGBA->RGBA:
+      Source surface blend mode set to SDL_BLENDMODE_BLEND:
+        alpha-blend (using the source alpha-channel and per-surface alpha)
+        SDL_SRCCOLORKEY ignored.
+      Source surface blend mode set to SDL_BLENDMODE_NONE:
+        copy all of RGBA to the destination.
+        if SDL_SRCCOLORKEY set, only copy the pixels matching the
+        RGB values of the source color key, ignoring alpha in the
+        comparison.
+
+    RGB->RGB:
+      Source surface blend mode set to SDL_BLENDMODE_BLEND:
+        alpha-blend (using the source per-surface alpha)
+      Source surface blend mode set to SDL_BLENDMODE_NONE:
+        copy RGB.
+      both:
+        if SDL_SRCCOLORKEY set, only copy the pixels matching the
+        source color key.
+    \endverbatim
+ *
+ *  You should call SDL_BlitSurface() unless you know exactly how SDL
+ *  blitting works internally and how to use the other blit functions.
+ */
+#define SDL_BlitSurface SDL_UpperBlit
+
+/**
+ *  This is the public blit function, SDL_BlitSurface(), and it performs
+ *  rectangle validation and clipping before passing it to SDL_LowerBlit()
+ */
+extern DECLSPEC int SDLCALL SDL_UpperBlit
+    (SDL_Surface * src, const SDL_Rect * srcrect,
+     SDL_Surface * dst, SDL_Rect * dstrect);
+
+/**
+ *  This is a semi-private blit function and it performs low-level surface
+ *  blitting only.
+ */
+extern DECLSPEC int SDLCALL SDL_LowerBlit
+    (SDL_Surface * src, SDL_Rect * srcrect,
+     SDL_Surface * dst, SDL_Rect * dstrect);
+
+/**
+ *  \brief Perform a fast, low quality, stretch blit between two surfaces of the
+ *         same pixel format.
+ *
+ *  \note This function uses a static buffer, and is not thread-safe.
+ */
+extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src,
+                                            const SDL_Rect * srcrect,
+                                            SDL_Surface * dst,
+                                            const SDL_Rect * dstrect);
+
+#define SDL_BlitScaled SDL_UpperBlitScaled
+
+/**
+ *  This is the public scaled blit function, SDL_BlitScaled(), and it performs
+ *  rectangle validation and clipping before passing it to SDL_LowerBlitScaled()
+ */
+extern DECLSPEC int SDLCALL SDL_UpperBlitScaled
+    (SDL_Surface * src, const SDL_Rect * srcrect,
+    SDL_Surface * dst, SDL_Rect * dstrect);
+
+/**
+ *  This is a semi-private blit function and it performs low-level surface
+ *  scaled blitting only.
+ */
+extern DECLSPEC int SDLCALL SDL_LowerBlitScaled
+    (SDL_Surface * src, SDL_Rect * srcrect,
+    SDL_Surface * dst, SDL_Rect * dstrect);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_surface_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_system.h b/Source/3rd Party/sdl/include/SDL_system.h
new file mode 100644
index 000000000..fd929f7f9
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_system.h	
@@ -0,0 +1,191 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_system.h
+ *
+ *  Include file for platform specific SDL API functions
+ */
+
+#ifndef _SDL_system_h
+#define _SDL_system_h
+
+#include "SDL_stdinc.h"
+#include "SDL_keyboard.h"
+#include "SDL_render.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Platform specific functions for Windows */
+#ifdef __WIN32__
+
+/* Returns the D3D9 adapter index that matches the specified display index.
+   This adapter index can be passed to IDirect3D9::CreateDevice and controls
+   on which monitor a full screen application will appear.
+*/
+extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex );
+
+/* Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer.
+   Once you are done using the device, you should release it to avoid a resource leak.
+ */
+typedef struct IDirect3DDevice9 IDirect3DDevice9;
+extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer);
+
+/* Returns the DXGI Adapter and Output indices for the specified display index. 
+   These can be passed to EnumAdapters and EnumOutputs respectively to get the objects
+   required to create a DX10 or DX11 device and swap chain.
+ */
+extern DECLSPEC void SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex );
+
+#endif /* __WIN32__ */
+
+
+/* Platform specific functions for iOS */
+#if defined(__IPHONEOS__) && __IPHONEOS__
+
+extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
+extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
+
+#endif /* __IPHONEOS__ */
+
+
+/* Platform specific functions for Android */
+#if defined(__ANDROID__) && __ANDROID__
+
+/* Get the JNI environment for the current thread
+   This returns JNIEnv*, but the prototype is void* so we don't need jni.h
+ */
+extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv();
+
+/* Get the SDL Activity object for the application
+   This returns jobject, but the prototype is void* so we don't need jni.h
+   The jobject returned by SDL_AndroidGetActivity is a local reference.
+   It is the caller's responsibility to properly release it
+   (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef)
+ */
+extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity();
+
+/* See the official Android developer guide for more information:
+   http://developer.android.com/guide/topics/data/data-storage.html
+*/
+#define SDL_ANDROID_EXTERNAL_STORAGE_READ   0x01
+#define SDL_ANDROID_EXTERNAL_STORAGE_WRITE  0x02
+
+/* Get the path used for internal storage for this application.
+   This path is unique to your application and cannot be written to
+   by other applications.
+ */
+extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath();
+
+/* Get the current state of external storage, a bitmask of these values:
+    SDL_ANDROID_EXTERNAL_STORAGE_READ
+    SDL_ANDROID_EXTERNAL_STORAGE_WRITE
+   If external storage is currently unavailable, this will return 0.
+*/
+extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState();
+
+/* Get the path used for external storage for this application.
+   This path is unique to your application, but is public and can be
+   written to by other applications.
+ */
+extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath();
+
+#endif /* __ANDROID__ */
+
+/* Platform specific functions for WinRT */
+#if defined(__WINRT__) && __WINRT__
+
+/**
+ *  \brief WinRT / Windows Phone path types
+ */
+typedef enum
+{
+    /** \brief The installed app's root directory.
+        Files here are likely to be read-only. */
+    SDL_WINRT_PATH_INSTALLED_LOCATION,
+
+    /** \brief The app's local data store.  Files may be written here */
+    SDL_WINRT_PATH_LOCAL_FOLDER,
+
+    /** \brief The app's roaming data store.  Unsupported on Windows Phone.
+        Files written here may be copied to other machines via a network
+        connection.
+    */
+    SDL_WINRT_PATH_ROAMING_FOLDER,
+
+    /** \brief The app's temporary data store.  Unsupported on Windows Phone.
+        Files written here may be deleted at any time. */
+    SDL_WINRT_PATH_TEMP_FOLDER
+} SDL_WinRT_Path;
+
+
+/**
+ *  \brief Retrieves a WinRT defined path on the local file system
+ *
+ *  \note Documentation on most app-specific path types on WinRT
+ *      can be found on MSDN, at the URL:
+ *      http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
+ *
+ *  \param pathType The type of path to retrieve.
+ *  \ret A UCS-2 string (16-bit, wide-char) containing the path, or NULL
+ *      if the path is not available for any reason.  Not all paths are
+ *      available on all versions of Windows.  This is especially true on
+ *      Windows Phone.  Check the documentation for the given
+ *      SDL_WinRT_Path for more information on which path types are
+ *      supported where.
+ */
+extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType);
+
+/**
+ *  \brief Retrieves a WinRT defined path on the local file system
+ *
+ *  \note Documentation on most app-specific path types on WinRT
+ *      can be found on MSDN, at the URL:
+ *      http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
+ *
+ *  \param pathType The type of path to retrieve.
+ *  \ret A UTF-8 string (8-bit, multi-byte) containing the path, or NULL
+ *      if the path is not available for any reason.  Not all paths are
+ *      available on all versions of Windows.  This is especially true on
+ *      Windows Phone.  Check the documentation for the given
+ *      SDL_WinRT_Path for more information on which path types are
+ *      supported where.
+ */
+extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType);
+
+#endif /* __WINRT__ */
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_system_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_syswm.h b/Source/3rd Party/sdl/include/SDL_syswm.h
new file mode 100644
index 000000000..42ec271e3
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_syswm.h	
@@ -0,0 +1,272 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_syswm.h
+ *
+ *  Include file for SDL custom system window manager hooks.
+ */
+
+#ifndef _SDL_syswm_h
+#define _SDL_syswm_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+#include "SDL_version.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \file SDL_syswm.h
+ *
+ *  Your application has access to a special type of event ::SDL_SYSWMEVENT,
+ *  which contains window-manager specific information and arrives whenever
+ *  an unhandled window event occurs.  This event is ignored by default, but
+ *  you can enable it with SDL_EventState().
+ */
+#ifdef SDL_PROTOTYPES_ONLY
+struct SDL_SysWMinfo;
+#else
+
+#if defined(SDL_VIDEO_DRIVER_WINDOWS)
+//#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_WINRT)
+#include <Inspectable.h>
+#endif
+
+/* This is the structure for custom window manager events */
+#if defined(SDL_VIDEO_DRIVER_X11)
+#if defined(__APPLE__) && defined(__MACH__)
+/* conflicts with Quickdraw.h */
+#define Cursor X11Cursor
+#endif
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+#if defined(__APPLE__) && defined(__MACH__)
+/* matches the re-define above */
+#undef Cursor
+#endif
+
+#endif /* defined(SDL_VIDEO_DRIVER_X11) */
+
+#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
+#include <directfb.h>
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_COCOA)
+#ifdef __OBJC__
+#include <Cocoa/Cocoa.h>
+#else
+typedef struct _NSWindow NSWindow;
+#endif
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_UIKIT)
+#ifdef __OBJC__
+#include <UIKit/UIKit.h>
+#else
+typedef struct _UIWindow UIWindow;
+typedef struct _UIViewController UIViewController;
+#endif
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_MIR)
+#include <mir_toolkit/mir_client_library.h>
+#endif
+
+
+/**
+ *  These are the various supported windowing subsystems
+ */
+typedef enum
+{
+    SDL_SYSWM_UNKNOWN,
+    SDL_SYSWM_WINDOWS,
+    SDL_SYSWM_X11,
+    SDL_SYSWM_DIRECTFB,
+    SDL_SYSWM_COCOA,
+    SDL_SYSWM_UIKIT,
+    SDL_SYSWM_WAYLAND,
+    SDL_SYSWM_MIR,
+    SDL_SYSWM_WINRT,
+} SDL_SYSWM_TYPE;
+
+/**
+ *  The custom event structure.
+ */
+struct SDL_SysWMmsg
+{
+    SDL_version version;
+    SDL_SYSWM_TYPE subsystem;
+    union
+    {
+#if defined(SDL_VIDEO_DRIVER_WINDOWS)
+        struct {
+            HWND hwnd;                  /**< The window for the message */
+            UINT msg;                   /**< The type of message */
+            WPARAM wParam;              /**< WORD message parameter */
+            LPARAM lParam;              /**< LONG message parameter */
+        } win;
+#endif
+#if defined(SDL_VIDEO_DRIVER_X11)
+        struct {
+            XEvent event;
+        } x11;
+#endif
+#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
+        struct {
+            DFBEvent event;
+        } dfb;
+#endif
+#if defined(SDL_VIDEO_DRIVER_COCOA)
+        struct
+        {
+            /* No Cocoa window events yet */
+        } cocoa;
+#endif
+#if defined(SDL_VIDEO_DRIVER_UIKIT)
+        struct
+        {
+            /* No UIKit window events yet */
+        } uikit;
+#endif
+        /* Can't have an empty union */
+        int dummy;
+    } msg;
+};
+
+/**
+ *  The custom window manager information structure.
+ *
+ *  When this structure is returned, it holds information about which
+ *  low level system it is using, and will be one of SDL_SYSWM_TYPE.
+ */
+struct SDL_SysWMinfo
+{
+    SDL_version version;
+    SDL_SYSWM_TYPE subsystem;
+    union
+    {
+#if defined(SDL_VIDEO_DRIVER_WINDOWS)
+        struct
+        {
+            HWND window;                /**< The window handle */
+        } win;
+#endif
+#if defined(SDL_VIDEO_DRIVER_WINRT)
+        struct
+        {
+            IInspectable * window;      /**< The WinRT CoreWindow */
+        } winrt;
+#endif
+#if defined(SDL_VIDEO_DRIVER_X11)
+        struct
+        {
+            Display *display;           /**< The X11 display */
+            Window window;              /**< The X11 window */
+        } x11;
+#endif
+#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
+        struct
+        {
+            IDirectFB *dfb;             /**< The directfb main interface */
+            IDirectFBWindow *window;    /**< The directfb window handle */
+            IDirectFBSurface *surface;  /**< The directfb client surface */
+        } dfb;
+#endif
+#if defined(SDL_VIDEO_DRIVER_COCOA)
+        struct
+        {
+            NSWindow *window;           /* The Cocoa window */
+        } cocoa;
+#endif
+#if defined(SDL_VIDEO_DRIVER_UIKIT)
+        struct
+        {
+            UIWindow *window;           /* The UIKit window */
+        } uikit;
+#endif
+#if defined(SDL_VIDEO_DRIVER_WAYLAND)
+        struct
+        {
+            struct wl_display *display;            /**< Wayland display */
+            struct wl_surface *surface;            /**< Wayland surface */
+            struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */
+        } wl;
+#endif
+#if defined(SDL_VIDEO_DRIVER_MIR)
+        struct
+        {
+            MirConnection *connection;  /**< Mir display server connection */
+            MirSurface *surface;  /**< Mir surface */
+        } mir;
+#endif
+
+        /* Can't have an empty union */
+        int dummy;
+    } info;
+};
+
+#endif /* SDL_PROTOTYPES_ONLY */
+
+typedef struct SDL_SysWMinfo SDL_SysWMinfo;
+
+/* Function prototypes */
+/**
+ *  \brief This function allows access to driver-dependent window information.
+ *
+ *  \param window The window about which information is being requested
+ *  \param info This structure must be initialized with the SDL version, and is
+ *              then filled in with information about the given window.
+ *
+ *  \return SDL_TRUE if the function is implemented and the version member of
+ *          the \c info struct is valid, SDL_FALSE otherwise.
+ *
+ *  You typically use this function like this:
+ *  \code
+ *  SDL_SysWMinfo info;
+ *  SDL_VERSION(&info.version);
+ *  if ( SDL_GetWindowWMInfo(window, &info) ) { ... }
+ *  \endcode
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window,
+                                                     SDL_SysWMinfo * info);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_syswm_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test.h b/Source/3rd Party/sdl/include/SDL_test.h
new file mode 100644
index 000000000..ae649a420
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test.h	
@@ -0,0 +1,68 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+#ifndef _SDL_test_h
+#define _SDL_test_h
+
+#include "SDL.h"
+#include "SDL_test_common.h"
+#include "SDL_test_font.h"
+#include "SDL_test_random.h"
+#include "SDL_test_fuzzer.h"
+#include "SDL_test_crc32.h"
+#include "SDL_test_md5.h"
+#include "SDL_test_log.h"
+#include "SDL_test_assert.h"
+#include "SDL_test_harness.h"
+#include "SDL_test_images.h"
+#include "SDL_test_compare.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Global definitions */
+
+/*
+ * Note: Maximum size of SDLTest log message is less than SDLs limit
+ * to ensure we can fit additional information such as the timestamp.
+ */
+#define SDLTEST_MAX_LOGMESSAGE_LENGTH   3584
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_assert.h b/Source/3rd Party/sdl/include/SDL_test_assert.h
new file mode 100644
index 000000000..79c84d606
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_assert.h	
@@ -0,0 +1,105 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_assert.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+ *
+ * Assert API for test code and test cases
+ *
+ */
+
+#ifndef _SDL_test_assert_h
+#define _SDL_test_assert_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Fails the assert.
+ */
+#define ASSERT_FAIL     0
+
+/**
+ * \brief Passes the assert.
+ */
+#define ASSERT_PASS     1
+
+/**
+ * \brief Assert that logs and break execution flow on failures.
+ *
+ * \param assertCondition Evaluated condition or variable to assert; fail (==0) or pass (!=0).
+ * \param assertDescription Message to log with the assert describing it.
+ */
+void SDLTest_Assert(int assertCondition, const char *assertDescription, ...);
+
+/**
+ * \brief Assert for test cases that logs but does not break execution flow on failures. Updates assertion counters.
+ *
+ * \param assertCondition Evaluated condition or variable to assert; fail (==0) or pass (!=0).
+ * \param assertDescription Message to log with the assert describing it.
+ *
+ * \returns Returns the assertCondition so it can be used to externally to break execution flow if desired.
+ */
+int SDLTest_AssertCheck(int assertCondition, const char *assertDescription, ...);
+
+/**
+ * \brief Explicitely pass without checking an assertion condition. Updates assertion counter.
+ *
+ * \param assertDescription Message to log with the assert describing it.
+ */
+void SDLTest_AssertPass(const char *assertDescription, ...);
+
+/**
+ * \brief Resets the assert summary counters to zero.
+ */
+void SDLTest_ResetAssertSummary();
+
+/**
+ * \brief Logs summary of all assertions (total, pass, fail) since last reset as INFO or ERROR.
+ */
+void SDLTest_LogAssertSummary();
+
+
+/**
+ * \brief Converts the current assert summary state to a test result.
+ *
+ * \returns TEST_RESULT_PASSED, TEST_RESULT_FAILED, or TEST_RESULT_NO_ASSERT
+ */
+int SDLTest_AssertSummaryToTestResult();
+
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_assert_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_common.h b/Source/3rd Party/sdl/include/SDL_test_common.h
new file mode 100644
index 000000000..45c9edafd
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_common.h	
@@ -0,0 +1,188 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_common.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/* Ported from original test\common.h file. */
+
+#ifndef _SDL_test_common_h
+#define _SDL_test_common_h
+
+#include "SDL.h"
+
+#if defined(__PSP__)
+#define DEFAULT_WINDOW_WIDTH  480
+#define DEFAULT_WINDOW_HEIGHT 272
+#else
+#define DEFAULT_WINDOW_WIDTH  640
+#define DEFAULT_WINDOW_HEIGHT 480
+#endif
+
+#define VERBOSE_VIDEO   0x00000001
+#define VERBOSE_MODES   0x00000002
+#define VERBOSE_RENDER  0x00000004
+#define VERBOSE_EVENT   0x00000008
+#define VERBOSE_AUDIO   0x00000010
+
+typedef struct
+{
+    /* SDL init flags */
+    char **argv;
+    Uint32 flags;
+    Uint32 verbose;
+
+    /* Video info */
+    const char *videodriver;
+    int display;
+    const char *window_title;
+    const char *window_icon;
+    Uint32 window_flags;
+    int window_x;
+    int window_y;
+    int window_w;
+    int window_h;
+    int window_minW;
+    int window_minH;
+    int window_maxW;
+    int window_maxH;
+    int logical_w;
+    int logical_h;
+    float scale;
+    int depth;
+    int refresh_rate;
+    int num_windows;
+    SDL_Window **windows;
+
+    /* Renderer info */
+    const char *renderdriver;
+    Uint32 render_flags;
+    SDL_bool skip_renderer;
+    SDL_Renderer **renderers;
+    SDL_Texture **targets;
+
+    /* Audio info */
+    const char *audiodriver;
+    SDL_AudioSpec audiospec;
+
+    /* GL settings */
+    int gl_red_size;
+    int gl_green_size;
+    int gl_blue_size;
+    int gl_alpha_size;
+    int gl_buffer_size;
+    int gl_depth_size;
+    int gl_stencil_size;
+    int gl_double_buffer;
+    int gl_accum_red_size;
+    int gl_accum_green_size;
+    int gl_accum_blue_size;
+    int gl_accum_alpha_size;
+    int gl_stereo;
+    int gl_multisamplebuffers;
+    int gl_multisamplesamples;
+    int gl_retained_backing;
+    int gl_accelerated;
+    int gl_major_version;
+    int gl_minor_version;
+    int gl_debug;
+    int gl_profile_mask;
+} SDLTest_CommonState;
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Function prototypes */
+
+/**
+ * \brief Parse command line parameters and create common state.
+ *
+ * \param argv Array of command line parameters
+ * \param flags Flags indicating which subsystem to initialize (i.e. SDL_INIT_VIDEO | SDL_INIT_AUDIO)
+ *
+ * \returns Returns a newly allocated common state object.
+ */
+SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags);
+
+/**
+ * \brief Process one common argument.
+ *
+ * \param state The common state describing the test window to create.
+ * \param index The index of the argument to process in argv[].
+ *
+ * \returns The number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error.
+ */
+int SDLTest_CommonArg(SDLTest_CommonState * state, int index);
+
+/**
+ * \brief Returns common usage information
+ *
+ * \param state The common state describing the test window to create.
+ *
+ * \returns String with usage information
+ */
+const char *SDLTest_CommonUsage(SDLTest_CommonState * state);
+
+/**
+ * \brief Open test window.
+ *
+ * \param state The common state describing the test window to create.
+ *
+ * \returns True if initialization succeeded, false otherwise
+ */
+SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state);
+
+/**
+ * \brief Common event handler for test windows.
+ *
+ * \param state The common state used to create test window.
+ * \param event The event to handle.
+ * \param done Flag indicating we are done.
+ *
+ */
+void SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done);
+
+/**
+ * \brief Close test window.
+ *
+ * \param state The common state used to create test window.
+ *
+ */
+void SDLTest_CommonQuit(SDLTest_CommonState * state);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_common_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_compare.h b/Source/3rd Party/sdl/include/SDL_test_compare.h
new file mode 100644
index 000000000..f1353a8d2
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_compare.h	
@@ -0,0 +1,69 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_compare.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+ Defines comparison functions (i.e. for surfaces).
+
+*/
+
+#ifndef _SDL_test_compare_h
+#define _SDL_test_compare_h
+
+#include "SDL.h"
+
+#include "SDL_test_images.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Compares a surface and with reference image data for equality
+ *
+ * \param surface Surface used in comparison
+ * \param referenceSurface Test Surface used in comparison
+ * \param allowable_error Allowable difference (squared) in blending accuracy.
+ *
+ * \returns 0 if comparison succeeded, >0 (=number of pixels where comparison failed) if comparison failed, -1 if any of the surfaces were NULL, -2 if the surface sizes differ.
+ */
+int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface, int allowable_error);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_compare_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_crc32.h b/Source/3rd Party/sdl/include/SDL_test_crc32.h
new file mode 100644
index 000000000..a180fe3bb
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_crc32.h	
@@ -0,0 +1,124 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_crc32.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+ Implements CRC32 calculations (default output is Perl String::CRC32 compatible).
+
+*/
+
+#ifndef _SDL_test_crc32_h
+#define _SDL_test_crc32_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* ------------ Definitions --------- */
+
+/* Definition shared by all CRC routines */
+
+#ifndef CrcUint32
+ #define CrcUint32  unsigned int
+#endif
+#ifndef CrcUint8
+ #define CrcUint8   unsigned char
+#endif
+
+#ifdef ORIGINAL_METHOD
+ #define CRC32_POLY 0x04c11db7   /* AUTODIN II, Ethernet, & FDDI */
+#else
+ #define CRC32_POLY 0xEDB88320   /* Perl String::CRC32 compatible */
+#endif
+
+/**
+ * Data structure for CRC32 (checksum) computation
+ */
+  typedef struct {
+    CrcUint32    crc32_table[256]; /* CRC table */
+  } SDLTest_Crc32Context;
+
+/* ---------- Function Prototypes ------------- */
+
+/**
+ * /brief Initialize the CRC context
+ *
+ * Note: The function initializes the crc table required for all crc calculations.
+ *
+ * /param crcContext        pointer to context variable
+ *
+ * /returns 0 for OK, -1 on error
+ *
+ */
+ int SDLTest_Crc32Init(SDLTest_Crc32Context * crcContext);
+
+
+/**
+ * /brief calculate a crc32 from a data block
+ *
+ * /param crcContext         pointer to context variable
+ * /param inBuf              input buffer to checksum
+ * /param inLen              length of input buffer
+ * /param crc32              pointer to Uint32 to store the final CRC into
+ *
+ * /returns 0 for OK, -1 on error
+ *
+ */
+int SDLTest_crc32Calc(SDLTest_Crc32Context * crcContext, CrcUint8 *inBuf, CrcUint32 inLen, CrcUint32 *crc32);
+
+/* Same routine broken down into three steps */
+int SDLTest_Crc32CalcStart(SDLTest_Crc32Context * crcContext, CrcUint32 *crc32);
+int SDLTest_Crc32CalcEnd(SDLTest_Crc32Context * crcContext, CrcUint32 *crc32);
+int SDLTest_Crc32CalcBuffer(SDLTest_Crc32Context * crcContext, CrcUint8 *inBuf, CrcUint32 inLen, CrcUint32 *crc32);
+
+
+/**
+ * /brief clean up CRC context
+ *
+ * /param crcContext        pointer to context variable
+ *
+ * /returns 0 for OK, -1 on error
+ *
+*/
+
+int SDLTest_Crc32Done(SDLTest_Crc32Context * crcContext);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_crc32_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_font.h b/Source/3rd Party/sdl/include/SDL_test_font.h
new file mode 100644
index 000000000..8d51d4a9b
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_font.h	
@@ -0,0 +1,76 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_font.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+#ifndef _SDL_test_font_h
+#define _SDL_test_font_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Function prototypes */
+
+#define FONT_CHARACTER_SIZE  8
+
+/**
+ *  \brief Draw a string in the currently set font.
+ *
+ *  \param renderer The renderer to draw on.
+ *  \param x The X coordinate of the upper left corner of the character.
+ *  \param y The Y coordinate of the upper left corner of the character.
+ *  \param c The character to draw.
+ *
+ *  \returns Returns 0 on success, -1 on failure.
+ */
+int SDLTest_DrawCharacter( SDL_Renderer *renderer, int x, int y, char c );
+
+/**
+ *  \brief Draw a string in the currently set font.
+ *
+ *  \param renderer The renderer to draw on.
+ *  \param x The X coordinate of the upper left corner of the string.
+ *  \param y The Y coordinate of the upper left corner of the string.
+ *  \param s The string to draw.
+ *
+ *  \returns Returns 0 on success, -1 on failure.
+ */
+int SDLTest_DrawString( SDL_Renderer * renderer, int x, int y, const char *s );
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_font_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_fuzzer.h b/Source/3rd Party/sdl/include/SDL_test_fuzzer.h
new file mode 100644
index 000000000..640180397
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_fuzzer.h	
@@ -0,0 +1,384 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_fuzzer.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+  Data generators for fuzzing test data in a reproducible way.
+
+*/
+
+#ifndef _SDL_test_fuzzer_h
+#define _SDL_test_fuzzer_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+  Based on GSOC code by Markus Kauppila <markus.kauppila@gmail.com>
+*/
+
+
+/**
+ * \file
+ * Note: The fuzzer implementation uses a static instance of random context
+ * internally which makes it thread-UNsafe.
+ */
+
+/**
+ * Initializes the fuzzer for a test
+ *
+ * /param execKey Execution "Key" that initializes the random number generator uniquely for the test.
+ *
+ */
+void SDLTest_FuzzerInit(Uint64 execKey);
+
+
+/**
+ * Returns a random Uint8
+ *
+ * \returns Generated integer
+ */
+Uint8 SDLTest_RandomUint8();
+
+/**
+ * Returns a random Sint8
+ *
+ * \returns Generated signed integer
+ */
+Sint8 SDLTest_RandomSint8();
+
+
+/**
+ * Returns a random Uint16
+ *
+ * \returns Generated integer
+ */
+Uint16 SDLTest_RandomUint16();
+
+/**
+ * Returns a random Sint16
+ *
+ * \returns Generated signed integer
+ */
+Sint16 SDLTest_RandomSint16();
+
+
+/**
+ * Returns a random integer
+ *
+ * \returns Generated integer
+ */
+Sint32 SDLTest_RandomSint32();
+
+
+/**
+ * Returns a random positive integer
+ *
+ * \returns Generated integer
+ */
+Uint32 SDLTest_RandomUint32();
+
+/**
+ * Returns random Uint64.
+ *
+ * \returns Generated integer
+ */
+Uint64 SDLTest_RandomUint64();
+
+
+/**
+ * Returns random Sint64.
+ *
+ * \returns Generated signed integer
+ */
+Sint64 SDLTest_RandomSint64();
+
+/**
+ * \returns random float in range [0.0 - 1.0[
+ */
+float SDLTest_RandomUnitFloat();
+
+/**
+ * \returns random double in range [0.0 - 1.0[
+ */
+double SDLTest_RandomUnitDouble();
+
+/**
+ * \returns random float.
+ *
+ */
+float SDLTest_RandomFloat();
+
+/**
+ * \returns random double.
+ *
+ */
+double SDLTest_RandomDouble();
+
+/**
+ * Returns a random boundary value for Uint8 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomUint8BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
+ * RandomUint8BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
+ * RandomUint8BoundaryValue(0, 99, SDL_FALSE) returns 100
+ * RandomUint8BoundaryValue(0, 255, SDL_FALSE) returns 0 (error set)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or 0 with error set
+ */
+Uint8 SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Uint16 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomUint16BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
+ * RandomUint16BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
+ * RandomUint16BoundaryValue(0, 99, SDL_FALSE) returns 100
+ * RandomUint16BoundaryValue(0, 0xFFFF, SDL_FALSE) returns 0 (error set)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or 0 with error set
+ */
+Uint16 SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Uint32 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomUint32BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
+ * RandomUint32BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
+ * RandomUint32BoundaryValue(0, 99, SDL_FALSE) returns 100
+ * RandomUint32BoundaryValue(0, 0xFFFFFFFF, SDL_FALSE) returns 0 (with error set)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or 0 with error set
+ */
+Uint32 SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Uint64 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomUint64BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
+ * RandomUint64BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
+ * RandomUint64BoundaryValue(0, 99, SDL_FALSE) returns 100
+ * RandomUint64BoundaryValue(0, 0xFFFFFFFFFFFFFFFF, SDL_FALSE) returns 0 (with error set)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or 0 with error set
+ */
+Uint64 SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Sint8 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomSint8BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
+ * RandomSint8BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
+ * RandomSint8BoundaryValue(SINT8_MIN, 99, SDL_FALSE) returns 100
+ * RandomSint8BoundaryValue(SINT8_MIN, SINT8_MAX, SDL_FALSE) returns SINT8_MIN (== error value) with error set
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or SINT8_MIN with error set
+ */
+Sint8 SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_bool validDomain);
+
+
+/**
+ * Returns a random boundary value for Sint16 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomSint16BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
+ * RandomSint16BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
+ * RandomSint16BoundaryValue(SINT16_MIN, 99, SDL_FALSE) returns 100
+ * RandomSint16BoundaryValue(SINT16_MIN, SINT16_MAX, SDL_FALSE) returns SINT16_MIN (== error value) with error set
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or SINT16_MIN with error set
+ */
+Sint16 SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Sint32 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomSint32BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
+ * RandomSint32BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
+ * RandomSint32BoundaryValue(SINT32_MIN, 99, SDL_FALSE) returns 100
+ * RandomSint32BoundaryValue(SINT32_MIN, SINT32_MAX, SDL_FALSE) returns SINT32_MIN (== error value)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or SINT32_MIN with error set
+ */
+Sint32 SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Sint64 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomSint64BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
+ * RandomSint64BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
+ * RandomSint64BoundaryValue(SINT64_MIN, 99, SDL_FALSE) returns 100
+ * RandomSint64BoundaryValue(SINT64_MIN, SINT64_MAX, SDL_FALSE) returns SINT64_MIN (== error value) and error set
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or SINT64_MIN with error set
+ */
+Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL_bool validDomain);
+
+
+/**
+ * Returns integer in range [min, max] (inclusive).
+ * Min and max values can be negative values.
+ * If Max in smaller tham min, then the values are swapped.
+ * Min and max are the same value, that value will be returned.
+ *
+ * \param min Minimum inclusive value of returned random number
+ * \param max Maximum inclusive value of returned random number
+ *
+ * \returns Generated random integer in range
+ */
+Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max);
+
+
+/**
+ * Generates random null-terminated string. The minimum length for
+ * the string is 1 character, maximum length for the string is 255
+ * characters and it can contain ASCII characters from 32 to 126.
+ *
+ * Note: Returned string needs to be deallocated.
+ *
+ * \returns Newly allocated random string; or NULL if length was invalid or string could not be allocated.
+ */
+char * SDLTest_RandomAsciiString();
+
+
+/**
+ * Generates random null-terminated string. The maximum length for
+ * the string is defined by the maxLength parameter.
+ * String can contain ASCII characters from 32 to 126.
+ *
+ * Note: Returned string needs to be deallocated.
+ *
+ * \param maxLength The maximum length of the generated string.
+ *
+ * \returns Newly allocated random string; or NULL if maxLength was invalid or string could not be allocated.
+ */
+char * SDLTest_RandomAsciiStringWithMaximumLength(int maxLength);
+
+
+/**
+ * Generates random null-terminated string. The length for
+ * the string is defined by the size parameter.
+ * String can contain ASCII characters from 32 to 126.
+ *
+ * Note: Returned string needs to be deallocated.
+ *
+ * \param size The length of the generated string
+ *
+ * \returns Newly allocated random string; or NULL if size was invalid or string could not be allocated.
+ */
+char * SDLTest_RandomAsciiStringOfSize(int size);
+
+/**
+ * Returns the invocation count for the fuzzer since last ...FuzzerInit.
+ */
+int SDLTest_GetFuzzerInvocationCount();
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_fuzzer_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_harness.h b/Source/3rd Party/sdl/include/SDL_test_harness.h
new file mode 100644
index 000000000..2c1e2ade8
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_harness.h	
@@ -0,0 +1,123 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_harness.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+  Defines types for test case definitions and the test execution harness API.
+
+  Based on original GSOC code by Markus Kauppila <markus.kauppila@gmail.com>
+*/
+
+#ifndef _SDL_test_harness_h
+#define _SDL_test_harness_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* ! Definitions for test case structures */
+#define TEST_ENABLED  1
+#define TEST_DISABLED 0
+
+/* ! Definition of all the possible test return values of the test case method */
+#define TEST_ABORTED        -1
+#define TEST_STARTED         0
+#define TEST_COMPLETED       1
+#define TEST_SKIPPED         2
+
+/* ! Definition of all the possible test results for the harness */
+#define TEST_RESULT_PASSED              0
+#define TEST_RESULT_FAILED              1
+#define TEST_RESULT_NO_ASSERT           2
+#define TEST_RESULT_SKIPPED             3
+#define TEST_RESULT_SETUP_FAILURE       4
+
+/* !< Function pointer to a test case setup function (run before every test) */
+typedef void (*SDLTest_TestCaseSetUpFp)(void *arg);
+
+/* !< Function pointer to a test case function */
+typedef int (*SDLTest_TestCaseFp)(void *arg);
+
+/* !< Function pointer to a test case teardown function (run after every test) */
+typedef void  (*SDLTest_TestCaseTearDownFp)(void *arg);
+
+/**
+ * Holds information about a single test case.
+ */
+typedef struct SDLTest_TestCaseReference {
+    /* !< Func2Stress */
+    SDLTest_TestCaseFp testCase;
+    /* !< Short name (or function name) "Func2Stress" */
+    char *name;
+    /* !< Long name or full description "This test pushes func2() to the limit." */
+    char *description;
+    /* !< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */
+    int enabled;
+} SDLTest_TestCaseReference;
+
+/**
+ * Holds information about a test suite (multiple test cases).
+ */
+typedef struct SDLTest_TestSuiteReference {
+    /* !< "PlatformSuite" */
+    char *name;
+    /* !< The function that is run before each test. NULL skips. */
+    SDLTest_TestCaseSetUpFp testSetUp;
+    /* !< The test cases that are run as part of the suite. Last item should be NULL. */
+    const SDLTest_TestCaseReference **testCases;
+    /* !< The function that is run after each test. NULL skips. */
+    SDLTest_TestCaseTearDownFp testTearDown;
+} SDLTest_TestSuiteReference;
+
+
+/**
+ * \brief Execute a test suite using the given run seed and execution key.
+ *
+ * \param testSuites Suites containing the test case.
+ * \param userRunSeed Custom run seed provided by user, or NULL to autogenerate one.
+ * \param userExecKey Custom execution key provided by user, or 0 to autogenerate one.
+ * \param filter Filter specification. NULL disables. Case sensitive.
+ * \param testIterations Number of iterations to run each test case.
+ *
+ * \returns Test run result; 0 when all tests passed, 1 if any tests failed.
+ */
+int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *userRunSeed, Uint64 userExecKey, const char *filter, int testIterations);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_harness_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_images.h b/Source/3rd Party/sdl/include/SDL_test_images.h
new file mode 100644
index 000000000..056279961
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_images.h	
@@ -0,0 +1,78 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_images.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+ Defines some images for tests.
+
+*/
+
+#ifndef _SDL_test_images_h
+#define _SDL_test_images_h
+
+#include "SDL.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *Type for test images.
+ */
+typedef struct SDLTest_SurfaceImage_s {
+  int width;
+  int height;
+  unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */
+  const char *pixel_data;
+} SDLTest_SurfaceImage_t;
+
+/* Test images */
+SDL_Surface *SDLTest_ImageBlit();
+SDL_Surface *SDLTest_ImageBlitColor();
+SDL_Surface *SDLTest_ImageBlitAlpha();
+SDL_Surface *SDLTest_ImageBlitBlendAdd();
+SDL_Surface *SDLTest_ImageBlitBlend();
+SDL_Surface *SDLTest_ImageBlitBlendMod();
+SDL_Surface *SDLTest_ImageBlitBlendNone();
+SDL_Surface *SDLTest_ImageBlitBlendAll();
+SDL_Surface *SDLTest_ImageFace();
+SDL_Surface *SDLTest_ImagePrimitives();
+SDL_Surface *SDLTest_ImagePrimitivesBlend();
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_images_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_log.h b/Source/3rd Party/sdl/include/SDL_test_log.h
new file mode 100644
index 000000000..76ce10583
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_log.h	
@@ -0,0 +1,67 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_log.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+ *
+ *  Wrapper to log in the TEST category
+ *
+ */
+
+#ifndef _SDL_test_log_h
+#define _SDL_test_log_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Prints given message with a timestamp in the TEST category and INFO priority.
+ *
+ * \param fmt Message to be logged
+ */
+void SDLTest_Log(const char *fmt, ...);
+
+/**
+ * \brief Prints given message with a timestamp in the TEST category and the ERROR priority.
+ *
+ * \param fmt Message to be logged
+ */
+void SDLTest_LogError(const char *fmt, ...);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_log_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_md5.h b/Source/3rd Party/sdl/include/SDL_test_md5.h
new file mode 100644
index 000000000..029e164bf
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_md5.h	
@@ -0,0 +1,129 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_md5.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+ ***********************************************************************
+ ** Header file for implementation of MD5                             **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version               **
+ ** Revised (for MD5): RLR 4/27/91                                    **
+ **   -- G modified to have y&~z instead of y&z                       **
+ **   -- FF, GG, HH modified to add in last register done             **
+ **   -- Access pattern: round 2 works mod 5, round 3 works mod 3     **
+ **   -- distinct additive constant for each step                     **
+ **   -- round 4 added, working mod 7                                 **
+ ***********************************************************************
+*/
+
+/*
+ ***********************************************************************
+ **  Message-digest routines:                                         **
+ **  To form the message digest for a message M                       **
+ **    (1) Initialize a context buffer mdContext using MD5Init        **
+ **    (2) Call MD5Update on mdContext and M                          **
+ **    (3) Call MD5Final on mdContext                                 **
+ **  The message digest is now in mdContext->digest[0...15]           **
+ ***********************************************************************
+*/
+
+#ifndef _SDL_test_md5_h
+#define _SDL_test_md5_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ------------ Definitions --------- */
+
+/* typedef a 32-bit type */
+  typedef unsigned long int MD5UINT4;
+
+/* Data structure for MD5 (Message-Digest) computation */
+  typedef struct {
+    MD5UINT4  i[2];     /* number of _bits_ handled mod 2^64 */
+    MD5UINT4  buf[4];       /* scratch buffer */
+    unsigned char in[64];   /* input buffer */
+    unsigned char digest[16];   /* actual digest after Md5Final call */
+  } SDLTest_Md5Context;
+
+/* ---------- Function Prototypes ------------- */
+
+/**
+ * /brief initialize the context
+ *
+ * /param  mdContext        pointer to context variable
+ *
+ * Note: The function initializes the message-digest context
+ *       mdContext. Call before each new use of the context -
+ *       all fields are set to zero.
+ */
+ void SDLTest_Md5Init(SDLTest_Md5Context * mdContext);
+
+
+/**
+ * /brief update digest from variable length data
+ *
+ * /param  mdContext       pointer to context variable
+ * /param  inBuf           pointer to data array/string
+ * /param  inLen           length of data array/string
+ *
+ * Note: The function updates the message-digest context to account
+ *       for the presence of each of the characters inBuf[0..inLen-1]
+ *       in the message whose digest is being computed.
+*/
+
+ void SDLTest_Md5Update(SDLTest_Md5Context * mdContext, unsigned char *inBuf,
+                 unsigned int inLen);
+
+
+/*
+ * /brief complete digest computation
+ *
+ * /param mdContext     pointer to context variable
+ *
+ * Note: The function terminates the message-digest computation and
+ *       ends with the desired message digest in mdContext.digest[0..15].
+ *       Always call before using the digest[] variable.
+*/
+
+ void SDLTest_Md5Final(SDLTest_Md5Context * mdContext);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_md5_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_test_random.h b/Source/3rd Party/sdl/include/SDL_test_random.h
new file mode 100644
index 000000000..6c5660d80
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_test_random.h	
@@ -0,0 +1,115 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_random.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+ A "32-bit Multiply with carry random number generator. Very fast.
+ Includes a list of recommended multipliers.
+
+ multiply-with-carry generator: x(n) = a*x(n-1) + carry mod 2^32.
+ period: (a*2^31)-1
+
+*/
+
+#ifndef _SDL_test_random_h
+#define _SDL_test_random_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* --- Definitions */
+
+/*
+ * Macros that return a random number in a specific format.
+ */
+#define SDLTest_RandomInt(c)        ((int)SDLTest_Random(c))
+
+/*
+ * Context structure for the random number generator state.
+ */
+  typedef struct {
+    unsigned int a;
+    unsigned int x;
+    unsigned int c;
+    unsigned int ah;
+    unsigned int al;
+  } SDLTest_RandomContext;
+
+
+/* --- Function prototypes */
+
+/**
+ *  \brief Initialize random number generator with two integers.
+ *
+ *  Note: The random sequence of numbers returned by ...Random() is the
+ *  same for the same two integers and has a period of 2^31.
+ *
+ *  \param rndContext     pointer to context structure
+ *  \param xi         integer that defines the random sequence
+ *  \param ci         integer that defines the random sequence
+ *
+ */
+ void SDLTest_RandomInit(SDLTest_RandomContext * rndContext, unsigned int xi,
+                  unsigned int ci);
+
+/**
+ *  \brief Initialize random number generator based on current system time.
+ *
+ *  \param rndContext     pointer to context structure
+ *
+ */
+ void SDLTest_RandomInitTime(SDLTest_RandomContext *rndContext);
+
+
+/**
+ *  \brief Initialize random number generator based on current system time.
+ *
+ *  Note: ...RandomInit() or ...RandomInitTime() must have been called
+ *  before using this function.
+ *
+ *  \param rndContext     pointer to context structure
+ *
+ *  \returns A random number (32bit unsigned integer)
+ *
+ */
+ unsigned int SDLTest_Random(SDLTest_RandomContext *rndContext);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_test_random_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_thread.h b/Source/3rd Party/sdl/include/SDL_thread.h
new file mode 100644
index 000000000..4e48cc34c
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_thread.h	
@@ -0,0 +1,287 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_thread_h
+#define _SDL_thread_h
+
+/**
+ *  \file SDL_thread.h
+ *
+ *  Header for the SDL thread management routines.
+ */
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+/* Thread synchronization primitives */
+#include "SDL_atomic.h"
+#include "SDL_mutex.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* The SDL thread structure, defined in SDL_thread.c */
+struct SDL_Thread;
+typedef struct SDL_Thread SDL_Thread;
+
+/* The SDL thread ID */
+typedef unsigned long SDL_threadID;
+
+/* Thread local storage ID, 0 is the invalid ID */
+typedef unsigned int SDL_TLSID;
+
+/**
+ *  The SDL thread priority.
+ *
+ *  \note On many systems you require special privileges to set high priority.
+ */
+typedef enum {
+    SDL_THREAD_PRIORITY_LOW,
+    SDL_THREAD_PRIORITY_NORMAL,
+    SDL_THREAD_PRIORITY_HIGH
+} SDL_ThreadPriority;
+
+/**
+ *  The function passed to SDL_CreateThread().
+ *  It is passed a void* user context parameter and returns an int.
+ */
+typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
+
+#if defined(__WIN32__) && !defined(HAVE_LIBC)
+/**
+ *  \file SDL_thread.h
+ *
+ *  We compile SDL into a DLL. This means, that it's the DLL which
+ *  creates a new thread for the calling process with the SDL_CreateThread()
+ *  API. There is a problem with this, that only the RTL of the SDL.DLL will
+ *  be initialized for those threads, and not the RTL of the calling
+ *  application!
+ *
+ *  To solve this, we make a little hack here.
+ *
+ *  We'll always use the caller's _beginthread() and _endthread() APIs to
+ *  start a new thread. This way, if it's the SDL.DLL which uses this API,
+ *  then the RTL of SDL.DLL will be used to create the new thread, and if it's
+ *  the application, then the RTL of the application will be used.
+ *
+ *  So, in short:
+ *  Always use the _beginthread() and _endthread() of the calling runtime
+ *  library!
+ */
+#define SDL_PASSED_BEGINTHREAD_ENDTHREAD
+#include <process.h>            /* This has _beginthread() and _endthread() defined! */
+
+typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
+                                                        unsigned (__stdcall *
+                                                                  func) (void
+                                                                         *),
+                                                        void *arg, unsigned,
+                                                        unsigned *threadID);
+typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
+
+/**
+ *  Create a thread.
+ */
+extern DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data,
+                 pfnSDL_CurrentBeginThread pfnBeginThread,
+                 pfnSDL_CurrentEndThread pfnEndThread);
+
+/**
+ *  Create a thread.
+ */
+#if defined(SDL_CreateThread) && SDL_DYNAMIC_API
+#undef SDL_CreateThread
+#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex)
+#else
+#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex)
+#endif
+
+#else
+
+/**
+ *  Create a thread.
+ *
+ *   Thread naming is a little complicated: Most systems have very small
+ *    limits for the string length (Haiku has 32 bytes, Linux currently has 16,
+ *    Visual C++ 6.0 has nine!), and possibly other arbitrary rules. You'll
+ *    have to see what happens with your system's debugger. The name should be
+ *    UTF-8 (but using the naming limits of C identifiers is a better bet).
+ *   There are no requirements for thread naming conventions, so long as the
+ *    string is null-terminated UTF-8, but these guidelines are helpful in
+ *    choosing a name:
+ *
+ *    http://stackoverflow.com/questions/149932/naming-conventions-for-threads
+ *
+ *   If a system imposes requirements, SDL will try to munge the string for
+ *    it (truncate, etc), but the original string contents will be available
+ *    from SDL_GetThreadName().
+ */
+extern DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data);
+
+#endif
+
+/**
+ * Get the thread name, as it was specified in SDL_CreateThread().
+ *  This function returns a pointer to a UTF-8 string that names the
+ *  specified thread, or NULL if it doesn't have a name. This is internal
+ *  memory, not to be free()'d by the caller, and remains valid until the
+ *  specified thread is cleaned up by SDL_WaitThread().
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetThreadName(SDL_Thread *thread);
+
+/**
+ *  Get the thread identifier for the current thread.
+ */
+extern DECLSPEC SDL_threadID SDLCALL SDL_ThreadID(void);
+
+/**
+ *  Get the thread identifier for the specified thread.
+ *
+ *  Equivalent to SDL_ThreadID() if the specified thread is NULL.
+ */
+extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread);
+
+/**
+ *  Set the priority for the current thread
+ */
+extern DECLSPEC int SDLCALL SDL_SetThreadPriority(SDL_ThreadPriority priority);
+
+/**
+ *  Wait for a thread to finish. Threads that haven't been detached will
+ *  remain (as a "zombie") until this function cleans them up. Not doing so
+ *  is a resource leak.
+ *
+ *  Once a thread has been cleaned up through this function, the SDL_Thread
+ *  that references it becomes invalid and should not be referenced again.
+ *  As such, only one thread may call SDL_WaitThread() on another.
+ *
+ *  The return code for the thread function is placed in the area
+ *  pointed to by \c status, if \c status is not NULL.
+ *
+ *  You may not wait on a thread that has been used in a call to
+ *  SDL_DetachThread(). Use either that function or this one, but not
+ *  both, or behavior is undefined.
+ *
+ *  It is safe to pass NULL to this function; it is a no-op.
+ */
+extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status);
+
+/**
+ *  A thread may be "detached" to signify that it should not remain until
+ *  another thread has called SDL_WaitThread() on it. Detaching a thread
+ *  is useful for long-running threads that nothing needs to synchronize
+ *  with or further manage. When a detached thread is done, it simply
+ *  goes away.
+ *
+ *  There is no way to recover the return code of a detached thread. If you
+ *  need this, don't detach the thread and instead use SDL_WaitThread().
+ *
+ *  Once a thread is detached, you should usually assume the SDL_Thread isn't
+ *  safe to reference again, as it will become invalid immediately upon
+ *  the detached thread's exit, instead of remaining until someone has called
+ *  SDL_WaitThread() to finally clean it up. As such, don't detach the same
+ *  thread more than once.
+ *
+ *  If a thread has already exited when passed to SDL_DetachThread(), it will
+ *  stop waiting for a call to SDL_WaitThread() and clean up immediately.
+ *  It is not safe to detach a thread that might be used with SDL_WaitThread().
+ *
+ *  You may not call SDL_WaitThread() on a thread that has been detached.
+ *  Use either that function or this one, but not both, or behavior is
+ *  undefined.
+ *
+ *  It is safe to pass NULL to this function; it is a no-op.
+ */
+extern DECLSPEC void SDLCALL SDL_DetachThread(SDL_Thread * thread);
+
+/**
+ *  \brief Create an identifier that is globally visible to all threads but refers to data that is thread-specific.
+ *
+ *  \return The newly created thread local storage identifier, or 0 on error
+ *
+ *  \code
+ *  static SDL_SpinLock tls_lock;
+ *  static SDL_TLSID thread_local_storage;
+ * 
+ *  void SetMyThreadData(void *value)
+ *  {
+ *      if (!thread_local_storage) {
+ *          SDL_AtomicLock(&tls_lock);
+ *          if (!thread_local_storage) {
+ *              thread_local_storage = SDL_TLSCreate();
+ *          }
+ *          SDL_AtomicUnLock(&tls_lock);
+ *      }
+ *      SDL_TLSSet(thread_local_storage, value);
+ *  }
+ *  
+ *  void *GetMyThreadData(void)
+ *  {
+ *      return SDL_TLSGet(thread_local_storage);
+ *  }
+ *  \endcode
+ *
+ *  \sa SDL_TLSGet()
+ *  \sa SDL_TLSSet()
+ */
+extern DECLSPEC SDL_TLSID SDLCALL SDL_TLSCreate(void);
+
+/**
+ *  \brief Get the value associated with a thread local storage ID for the current thread.
+ *
+ *  \param id The thread local storage ID
+ *
+ *  \return The value associated with the ID for the current thread, or NULL if no value has been set.
+ *
+ *  \sa SDL_TLSCreate()
+ *  \sa SDL_TLSSet()
+ */
+extern DECLSPEC void * SDLCALL SDL_TLSGet(SDL_TLSID id);
+
+/**
+ *  \brief Set the value associated with a thread local storage ID for the current thread.
+ *
+ *  \param id The thread local storage ID
+ *  \param value The value to associate with the ID for the current thread
+ *  \param destructor A function called when the thread exits, to free the value.
+ *
+ *  \return 0 on success, -1 on error
+ *
+ *  \sa SDL_TLSCreate()
+ *  \sa SDL_TLSGet()
+ */
+extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (*destructor)(void*));
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_thread_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_timer.h b/Source/3rd Party/sdl/include/SDL_timer.h
new file mode 100644
index 000000000..a48e0466e
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_timer.h	
@@ -0,0 +1,115 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_timer_h
+#define _SDL_timer_h
+
+/**
+ *  \file SDL_timer.h
+ *
+ *  Header for the SDL time management routines.
+ */
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Get the number of milliseconds since the SDL library initialization.
+ *
+ * \note This value wraps if the program runs for more than ~49 days.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void);
+
+/**
+ * \brief Compare SDL ticks values, and return true if A has passed B
+ *
+ * e.g. if you want to wait 100 ms, you could do this:
+ *  Uint32 timeout = SDL_GetTicks() + 100;
+ *  while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) {
+ *      ... do work until timeout has elapsed
+ *  }
+ */
+#define SDL_TICKS_PASSED(A, B)  ((Sint32)((B) - (A)) <= 0)
+
+/**
+ * \brief Get the current value of the high resolution counter
+ */
+extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void);
+
+/**
+ * \brief Get the count per second of the high resolution counter
+ */
+extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceFrequency(void);
+
+/**
+ * \brief Wait a specified number of milliseconds before returning.
+ */
+extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
+
+/**
+ *  Function prototype for the timer callback function.
+ *
+ *  The callback function is passed the current timer interval and returns
+ *  the next timer interval.  If the returned value is the same as the one
+ *  passed in, the periodic alarm continues, otherwise a new alarm is
+ *  scheduled.  If the callback returns 0, the periodic alarm is cancelled.
+ */
+typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param);
+
+/**
+ * Definition of the timer ID type.
+ */
+typedef int SDL_TimerID;
+
+/**
+ * \brief Add a new timer to the pool of timers already running.
+ *
+ * \return A timer ID, or NULL when an error occurs.
+ */
+extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval,
+                                                 SDL_TimerCallback callback,
+                                                 void *param);
+
+/**
+ * \brief Remove a timer knowing its ID.
+ *
+ * \return A boolean value indicating success or failure.
+ *
+ * \warning It is not safe to remove a timer multiple times.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_timer_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_touch.h b/Source/3rd Party/sdl/include/SDL_touch.h
new file mode 100644
index 000000000..017deb28b
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_touch.h	
@@ -0,0 +1,86 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_touch.h
+ *
+ *  Include file for SDL touch event handling.
+ */
+
+#ifndef _SDL_touch_h
+#define _SDL_touch_h
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef Sint64 SDL_TouchID;
+typedef Sint64 SDL_FingerID;
+
+typedef struct SDL_Finger
+{
+    SDL_FingerID id;
+    float x;
+    float y;
+    float pressure;
+} SDL_Finger;
+
+/* Used as the device ID for mouse events simulated with touch input */
+#define SDL_TOUCH_MOUSEID ((Uint32)-1)
+
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the number of registered touch devices.
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumTouchDevices(void);
+
+/**
+ *  \brief Get the touch ID with the given index, or 0 if the index is invalid.
+ */
+extern DECLSPEC SDL_TouchID SDLCALL SDL_GetTouchDevice(int index);
+
+/**
+ *  \brief Get the number of active fingers for a given touch device.
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumTouchFingers(SDL_TouchID touchID);
+
+/**
+ *  \brief Get the finger object of the given touch, with the given index.
+ */
+extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int index);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_touch_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_types.h b/Source/3rd Party/sdl/include/SDL_types.h
new file mode 100644
index 000000000..cd3ba33cd
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_types.h	
@@ -0,0 +1,29 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_types.h
+ *
+ *  \deprecated
+ */
+
+/* DEPRECATED */
+#include "SDL_stdinc.h"
diff --git a/Source/3rd Party/sdl/include/SDL_version.h b/Source/3rd Party/sdl/include/SDL_version.h
new file mode 100644
index 000000000..d02898bbb
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_version.h	
@@ -0,0 +1,162 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_version.h
+ *
+ *  This header defines the current SDL version.
+ */
+
+#ifndef _SDL_version_h
+#define _SDL_version_h
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief Information the version of SDL in use.
+ *
+ *  Represents the library's version as three levels: major revision
+ *  (increments with massive changes, additions, and enhancements),
+ *  minor revision (increments with backwards-compatible changes to the
+ *  major revision), and patchlevel (increments with fixes to the minor
+ *  revision).
+ *
+ *  \sa SDL_VERSION
+ *  \sa SDL_GetVersion
+ */
+typedef struct SDL_version
+{
+    Uint8 major;        /**< major version */
+    Uint8 minor;        /**< minor version */
+    Uint8 patch;        /**< update version */
+} SDL_version;
+
+/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
+*/
+#define SDL_MAJOR_VERSION   2
+#define SDL_MINOR_VERSION   0
+#define SDL_PATCHLEVEL      3
+
+/**
+ *  \brief Macro to determine SDL version program was compiled against.
+ *
+ *  This macro fills in a SDL_version structure with the version of the
+ *  library you compiled against. This is determined by what header the
+ *  compiler uses. Note that if you dynamically linked the library, you might
+ *  have a slightly newer or older version at runtime. That version can be
+ *  determined with SDL_GetVersion(), which, unlike SDL_VERSION(),
+ *  is not a macro.
+ *
+ *  \param x A pointer to a SDL_version struct to initialize.
+ *
+ *  \sa SDL_version
+ *  \sa SDL_GetVersion
+ */
+#define SDL_VERSION(x)                          \
+{                                   \
+    (x)->major = SDL_MAJOR_VERSION;                 \
+    (x)->minor = SDL_MINOR_VERSION;                 \
+    (x)->patch = SDL_PATCHLEVEL;                    \
+}
+
+/**
+ *  This macro turns the version numbers into a numeric value:
+ *  \verbatim
+    (1,2,3) -> (1203)
+    \endverbatim
+ *
+ *  This assumes that there will never be more than 100 patchlevels.
+ */
+#define SDL_VERSIONNUM(X, Y, Z)                     \
+    ((X)*1000 + (Y)*100 + (Z))
+
+/**
+ *  This is the version number macro for the current SDL version.
+ */
+#define SDL_COMPILEDVERSION \
+    SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL)
+
+/**
+ *  This macro will evaluate to true if compiled with SDL at least X.Y.Z.
+ */
+#define SDL_VERSION_ATLEAST(X, Y, Z) \
+    (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z))
+
+/**
+ *  \brief Get the version of SDL that is linked against your program.
+ *
+ *  If you are linking to SDL dynamically, then it is possible that the
+ *  current version will be different than the version you compiled against.
+ *  This function returns the current version, while SDL_VERSION() is a
+ *  macro that tells you what version you compiled with.
+ *
+ *  \code
+ *  SDL_version compiled;
+ *  SDL_version linked;
+ *
+ *  SDL_VERSION(&compiled);
+ *  SDL_GetVersion(&linked);
+ *  printf("We compiled against SDL version %d.%d.%d ...\n",
+ *         compiled.major, compiled.minor, compiled.patch);
+ *  printf("But we linked against SDL version %d.%d.%d.\n",
+ *         linked.major, linked.minor, linked.patch);
+ *  \endcode
+ *
+ *  This function may be called safely at any time, even before SDL_Init().
+ *
+ *  \sa SDL_VERSION
+ */
+extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver);
+
+/**
+ *  \brief Get the code revision of SDL that is linked against your program.
+ *
+ *  Returns an arbitrary string (a hash value) uniquely identifying the
+ *  exact revision of the SDL library in use, and is only useful in comparing
+ *  against other revisions. It is NOT an incrementing number.
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetRevision(void);
+
+/**
+ *  \brief Get the revision number of SDL that is linked against your program.
+ *
+ *  Returns a number uniquely identifying the exact revision of the SDL
+ *  library in use. It is an incrementing number based on commits to
+ *  hg.libsdl.org.
+ */
+extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_version_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/SDL_video.h b/Source/3rd Party/sdl/include/SDL_video.h
new file mode 100644
index 000000000..49ea37ad0
--- /dev/null
+++ b/Source/3rd Party/sdl/include/SDL_video.h	
@@ -0,0 +1,979 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_video.h
+ *
+ *  Header file for SDL video functions.
+ */
+
+#ifndef _SDL_video_h
+#define _SDL_video_h
+
+#include "SDL_stdinc.h"
+#include "SDL_pixels.h"
+#include "SDL_rect.h"
+#include "SDL_surface.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief  The structure that defines a display mode
+ *
+ *  \sa SDL_GetNumDisplayModes()
+ *  \sa SDL_GetDisplayMode()
+ *  \sa SDL_GetDesktopDisplayMode()
+ *  \sa SDL_GetCurrentDisplayMode()
+ *  \sa SDL_GetClosestDisplayMode()
+ *  \sa SDL_SetWindowDisplayMode()
+ *  \sa SDL_GetWindowDisplayMode()
+ */
+typedef struct
+{
+    Uint32 format;              /**< pixel format */
+    int w;                      /**< width */
+    int h;                      /**< height */
+    int refresh_rate;           /**< refresh rate (or zero for unspecified) */
+    void *driverdata;           /**< driver-specific data, initialize to 0 */
+} SDL_DisplayMode;
+
+/**
+ *  \brief The type used to identify a window
+ *
+ *  \sa SDL_CreateWindow()
+ *  \sa SDL_CreateWindowFrom()
+ *  \sa SDL_DestroyWindow()
+ *  \sa SDL_GetWindowData()
+ *  \sa SDL_GetWindowFlags()
+ *  \sa SDL_GetWindowGrab()
+ *  \sa SDL_GetWindowPosition()
+ *  \sa SDL_GetWindowSize()
+ *  \sa SDL_GetWindowTitle()
+ *  \sa SDL_HideWindow()
+ *  \sa SDL_MaximizeWindow()
+ *  \sa SDL_MinimizeWindow()
+ *  \sa SDL_RaiseWindow()
+ *  \sa SDL_RestoreWindow()
+ *  \sa SDL_SetWindowData()
+ *  \sa SDL_SetWindowFullscreen()
+ *  \sa SDL_SetWindowGrab()
+ *  \sa SDL_SetWindowIcon()
+ *  \sa SDL_SetWindowPosition()
+ *  \sa SDL_SetWindowSize()
+ *  \sa SDL_SetWindowBordered()
+ *  \sa SDL_SetWindowTitle()
+ *  \sa SDL_ShowWindow()
+ */
+typedef struct SDL_Window SDL_Window;
+
+/**
+ *  \brief The flags on a window
+ *
+ *  \sa SDL_GetWindowFlags()
+ */
+typedef enum
+{
+    SDL_WINDOW_FULLSCREEN = 0x00000001,         /**< fullscreen window */
+    SDL_WINDOW_OPENGL = 0x00000002,             /**< window usable with OpenGL context */
+    SDL_WINDOW_SHOWN = 0x00000004,              /**< window is visible */
+    SDL_WINDOW_HIDDEN = 0x00000008,             /**< window is not visible */
+    SDL_WINDOW_BORDERLESS = 0x00000010,         /**< no window decoration */
+    SDL_WINDOW_RESIZABLE = 0x00000020,          /**< window can be resized */
+    SDL_WINDOW_MINIMIZED = 0x00000040,          /**< window is minimized */
+    SDL_WINDOW_MAXIMIZED = 0x00000080,          /**< window is maximized */
+    SDL_WINDOW_INPUT_GRABBED = 0x00000100,      /**< window has grabbed input focus */
+    SDL_WINDOW_INPUT_FOCUS = 0x00000200,        /**< window has input focus */
+    SDL_WINDOW_MOUSE_FOCUS = 0x00000400,        /**< window has mouse focus */
+    SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ),
+    SDL_WINDOW_FOREIGN = 0x00000800,            /**< window not created by SDL */
+    SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000       /**< window should be created in high-DPI mode if supported */
+} SDL_WindowFlags;
+
+/**
+ *  \brief Used to indicate that you don't care what the window position is.
+ */
+#define SDL_WINDOWPOS_UNDEFINED_MASK    0x1FFF0000
+#define SDL_WINDOWPOS_UNDEFINED_DISPLAY(X)  (SDL_WINDOWPOS_UNDEFINED_MASK|(X))
+#define SDL_WINDOWPOS_UNDEFINED         SDL_WINDOWPOS_UNDEFINED_DISPLAY(0)
+#define SDL_WINDOWPOS_ISUNDEFINED(X)    \
+            (((X)&0xFFFF0000) == SDL_WINDOWPOS_UNDEFINED_MASK)
+
+/**
+ *  \brief Used to indicate that the window position should be centered.
+ */
+#define SDL_WINDOWPOS_CENTERED_MASK    0x2FFF0000
+#define SDL_WINDOWPOS_CENTERED_DISPLAY(X)  (SDL_WINDOWPOS_CENTERED_MASK|(X))
+#define SDL_WINDOWPOS_CENTERED         SDL_WINDOWPOS_CENTERED_DISPLAY(0)
+#define SDL_WINDOWPOS_ISCENTERED(X)    \
+            (((X)&0xFFFF0000) == SDL_WINDOWPOS_CENTERED_MASK)
+
+/**
+ *  \brief Event subtype for window events
+ */
+typedef enum
+{
+    SDL_WINDOWEVENT_NONE,           /**< Never used */
+    SDL_WINDOWEVENT_SHOWN,          /**< Window has been shown */
+    SDL_WINDOWEVENT_HIDDEN,         /**< Window has been hidden */
+    SDL_WINDOWEVENT_EXPOSED,        /**< Window has been exposed and should be
+                                         redrawn */
+    SDL_WINDOWEVENT_MOVED,          /**< Window has been moved to data1, data2
+                                     */
+    SDL_WINDOWEVENT_RESIZED,        /**< Window has been resized to data1xdata2 */
+    SDL_WINDOWEVENT_SIZE_CHANGED,   /**< The window size has changed, either as a result of an API call or through the system or user changing the window size. */
+    SDL_WINDOWEVENT_MINIMIZED,      /**< Window has been minimized */
+    SDL_WINDOWEVENT_MAXIMIZED,      /**< Window has been maximized */
+    SDL_WINDOWEVENT_RESTORED,       /**< Window has been restored to normal size
+                                         and position */
+    SDL_WINDOWEVENT_ENTER,          /**< Window has gained mouse focus */
+    SDL_WINDOWEVENT_LEAVE,          /**< Window has lost mouse focus */
+    SDL_WINDOWEVENT_FOCUS_GAINED,   /**< Window has gained keyboard focus */
+    SDL_WINDOWEVENT_FOCUS_LOST,     /**< Window has lost keyboard focus */
+    SDL_WINDOWEVENT_CLOSE           /**< The window manager requests that the
+                                         window be closed */
+} SDL_WindowEventID;
+
+/**
+ *  \brief An opaque handle to an OpenGL context.
+ */
+typedef void *SDL_GLContext;
+
+/**
+ *  \brief OpenGL configuration attributes
+ */
+typedef enum
+{
+    SDL_GL_RED_SIZE,
+    SDL_GL_GREEN_SIZE,
+    SDL_GL_BLUE_SIZE,
+    SDL_GL_ALPHA_SIZE,
+    SDL_GL_BUFFER_SIZE,
+    SDL_GL_DOUBLEBUFFER,
+    SDL_GL_DEPTH_SIZE,
+    SDL_GL_STENCIL_SIZE,
+    SDL_GL_ACCUM_RED_SIZE,
+    SDL_GL_ACCUM_GREEN_SIZE,
+    SDL_GL_ACCUM_BLUE_SIZE,
+    SDL_GL_ACCUM_ALPHA_SIZE,
+    SDL_GL_STEREO,
+    SDL_GL_MULTISAMPLEBUFFERS,
+    SDL_GL_MULTISAMPLESAMPLES,
+    SDL_GL_ACCELERATED_VISUAL,
+    SDL_GL_RETAINED_BACKING,
+    SDL_GL_CONTEXT_MAJOR_VERSION,
+    SDL_GL_CONTEXT_MINOR_VERSION,
+    SDL_GL_CONTEXT_EGL,
+    SDL_GL_CONTEXT_FLAGS,
+    SDL_GL_CONTEXT_PROFILE_MASK,
+    SDL_GL_SHARE_WITH_CURRENT_CONTEXT,
+    SDL_GL_FRAMEBUFFER_SRGB_CAPABLE
+} SDL_GLattr;
+
+typedef enum
+{
+    SDL_GL_CONTEXT_PROFILE_CORE           = 0x0001,
+    SDL_GL_CONTEXT_PROFILE_COMPATIBILITY  = 0x0002,
+    SDL_GL_CONTEXT_PROFILE_ES             = 0x0004 /* GLX_CONTEXT_ES2_PROFILE_BIT_EXT */
+} SDL_GLprofile;
+
+typedef enum
+{
+    SDL_GL_CONTEXT_DEBUG_FLAG              = 0x0001,
+    SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002,
+    SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG      = 0x0004,
+    SDL_GL_CONTEXT_RESET_ISOLATION_FLAG    = 0x0008
+} SDL_GLcontextFlag;
+
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the number of video drivers compiled into SDL
+ *
+ *  \sa SDL_GetVideoDriver()
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void);
+
+/**
+ *  \brief Get the name of a built in video driver.
+ *
+ *  \note The video drivers are presented in the order in which they are
+ *        normally checked during initialization.
+ *
+ *  \sa SDL_GetNumVideoDrivers()
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index);
+
+/**
+ *  \brief Initialize the video subsystem, optionally specifying a video driver.
+ *
+ *  \param driver_name Initialize a specific driver by name, or NULL for the
+ *                     default video driver.
+ *
+ *  \return 0 on success, -1 on error
+ *
+ *  This function initializes the video subsystem; setting up a connection
+ *  to the window manager, etc, and determines the available display modes
+ *  and pixel formats, but does not initialize a window or graphics mode.
+ *
+ *  \sa SDL_VideoQuit()
+ */
+extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name);
+
+/**
+ *  \brief Shuts down the video subsystem.
+ *
+ *  This function closes all windows, and restores the original video mode.
+ *
+ *  \sa SDL_VideoInit()
+ */
+extern DECLSPEC void SDLCALL SDL_VideoQuit(void);
+
+/**
+ *  \brief Returns the name of the currently initialized video driver.
+ *
+ *  \return The name of the current video driver or NULL if no driver
+ *          has been initialized
+ *
+ *  \sa SDL_GetNumVideoDrivers()
+ *  \sa SDL_GetVideoDriver()
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void);
+
+/**
+ *  \brief Returns the number of available video displays.
+ *
+ *  \sa SDL_GetDisplayBounds()
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void);
+
+/**
+ *  \brief Get the name of a display in UTF-8 encoding
+ *
+ *  \return The name of a display, or NULL for an invalid display index.
+ *
+ *  \sa SDL_GetNumVideoDisplays()
+ */
+extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex);
+
+/**
+ *  \brief Get the desktop area represented by a display, with the primary
+ *         display located at 0,0
+ *
+ *  \return 0 on success, or -1 if the index is out of range.
+ *
+ *  \sa SDL_GetNumVideoDisplays()
+ */
+extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect);
+
+/**
+ *  \brief Returns the number of available display modes.
+ *
+ *  \sa SDL_GetDisplayMode()
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex);
+
+/**
+ *  \brief Fill in information about a specific display mode.
+ *
+ *  \note The display modes are sorted in this priority:
+ *        \li bits per pixel -> more colors to fewer colors
+ *        \li width -> largest to smallest
+ *        \li height -> largest to smallest
+ *        \li refresh rate -> highest to lowest
+ *
+ *  \sa SDL_GetNumDisplayModes()
+ */
+extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex,
+                                               SDL_DisplayMode * mode);
+
+/**
+ *  \brief Fill in information about the desktop display mode.
+ */
+extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode);
+
+/**
+ *  \brief Fill in information about the current display mode.
+ */
+extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode);
+
+
+/**
+ *  \brief Get the closest match to the requested display mode.
+ *
+ *  \param displayIndex The index of display from which mode should be queried.
+ *  \param mode The desired display mode
+ *  \param closest A pointer to a display mode to be filled in with the closest
+ *                 match of the available display modes.
+ *
+ *  \return The passed in value \c closest, or NULL if no matching video mode
+ *          was available.
+ *
+ *  The available display modes are scanned, and \c closest is filled in with the
+ *  closest mode matching the requested mode and returned.  The mode format and
+ *  refresh_rate default to the desktop mode if they are 0.  The modes are
+ *  scanned with size being first priority, format being second priority, and
+ *  finally checking the refresh_rate.  If all the available modes are too
+ *  small, then NULL is returned.
+ *
+ *  \sa SDL_GetNumDisplayModes()
+ *  \sa SDL_GetDisplayMode()
+ */
+extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest);
+
+/**
+ *  \brief Get the display index associated with a window.
+ *
+ *  \return the display index of the display containing the center of the
+ *          window, or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window);
+
+/**
+ *  \brief Set the display mode used when a fullscreen window is visible.
+ *
+ *  By default the window's dimensions and the desktop format and refresh rate
+ *  are used.
+ *
+ *  \param window The window for which the display mode should be set.
+ *  \param mode The mode to use, or NULL for the default mode.
+ *
+ *  \return 0 on success, or -1 if setting the display mode failed.
+ *
+ *  \sa SDL_GetWindowDisplayMode()
+ *  \sa SDL_SetWindowFullscreen()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window,
+                                                     const SDL_DisplayMode
+                                                         * mode);
+
+/**
+ *  \brief Fill in information about the display mode used when a fullscreen
+ *         window is visible.
+ *
+ *  \sa SDL_SetWindowDisplayMode()
+ *  \sa SDL_SetWindowFullscreen()
+ */
+extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window,
+                                                     SDL_DisplayMode * mode);
+
+/**
+ *  \brief Get the pixel format associated with the window.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window);
+
+/**
+ *  \brief Create a window with the specified position, dimensions, and flags.
+ *
+ *  \param title The title of the window, in UTF-8 encoding.
+ *  \param x     The x position of the window, ::SDL_WINDOWPOS_CENTERED, or
+ *               ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param y     The y position of the window, ::SDL_WINDOWPOS_CENTERED, or
+ *               ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param w     The width of the window.
+ *  \param h     The height of the window.
+ *  \param flags The flags for the window, a mask of any of the following:
+ *               ::SDL_WINDOW_FULLSCREEN,    ::SDL_WINDOW_OPENGL,
+ *               ::SDL_WINDOW_HIDDEN,        ::SDL_WINDOW_BORDERLESS,
+ *               ::SDL_WINDOW_RESIZABLE,     ::SDL_WINDOW_MAXIMIZED,
+ *               ::SDL_WINDOW_MINIMIZED,     ::SDL_WINDOW_INPUT_GRABBED,
+ *               ::SDL_WINDOW_ALLOW_HIGHDPI.
+ *
+ *  \return The id of the window created, or zero if window creation failed.
+ *
+ *  \sa SDL_DestroyWindow()
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title,
+                                                      int x, int y, int w,
+                                                      int h, Uint32 flags);
+
+/**
+ *  \brief Create an SDL window from an existing native window.
+ *
+ *  \param data A pointer to driver-dependent window creation data
+ *
+ *  \return The id of the window created, or zero if window creation failed.
+ *
+ *  \sa SDL_DestroyWindow()
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data);
+
+/**
+ *  \brief Get the numeric ID of a window, for logging purposes.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window);
+
+/**
+ *  \brief Get a window from a stored ID, or NULL if it doesn't exist.
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id);
+
+/**
+ *  \brief Get the window flags.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window);
+
+/**
+ *  \brief Set the title of a window, in UTF-8 format.
+ *
+ *  \sa SDL_GetWindowTitle()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window,
+                                                const char *title);
+
+/**
+ *  \brief Get the title of a window, in UTF-8 format.
+ *
+ *  \sa SDL_SetWindowTitle()
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window);
+
+/**
+ *  \brief Set the icon for a window.
+ *
+ *  \param window The window for which the icon should be set.
+ *  \param icon The icon for the window.
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window,
+                                               SDL_Surface * icon);
+
+/**
+ *  \brief Associate an arbitrary named pointer with a window.
+ *
+ *  \param window   The window to associate with the pointer.
+ *  \param name     The name of the pointer.
+ *  \param userdata The associated pointer.
+ *
+ *  \return The previous value associated with 'name'
+ *
+ *  \note The name is case-sensitive.
+ *
+ *  \sa SDL_GetWindowData()
+ */
+extern DECLSPEC void* SDLCALL SDL_SetWindowData(SDL_Window * window,
+                                                const char *name,
+                                                void *userdata);
+
+/**
+ *  \brief Retrieve the data pointer associated with a window.
+ *
+ *  \param window   The window to query.
+ *  \param name     The name of the pointer.
+ *
+ *  \return The value associated with 'name'
+ *
+ *  \sa SDL_SetWindowData()
+ */
+extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window,
+                                                const char *name);
+
+/**
+ *  \brief Set the position of a window.
+ *
+ *  \param window   The window to reposition.
+ *  \param x        The x coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or
+                    ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param y        The y coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or
+                    ::SDL_WINDOWPOS_UNDEFINED.
+ *
+ *  \note The window coordinate origin is the upper left of the display.
+ *
+ *  \sa SDL_GetWindowPosition()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window,
+                                                   int x, int y);
+
+/**
+ *  \brief Get the position of a window.
+ *
+ *  \param window   The window to query.
+ *  \param x        Pointer to variable for storing the x position, may be NULL
+ *  \param y        Pointer to variable for storing the y position, may be NULL
+ *
+ *  \sa SDL_SetWindowPosition()
+ */
+extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window,
+                                                   int *x, int *y);
+
+/**
+ *  \brief Set the size of a window's client area.
+ *
+ *  \param window   The window to resize.
+ *  \param w        The width of the window, must be >0
+ *  \param h        The height of the window, must be >0
+ *
+ *  \note You can't change the size of a fullscreen window, it automatically
+ *        matches the size of the display mode.
+ *
+ *  \sa SDL_GetWindowSize()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w,
+                                               int h);
+
+/**
+ *  \brief Get the size of a window's client area.
+ *
+ *  \param window   The window to query.
+ *  \param w        Pointer to variable for storing the width, may be NULL
+ *  \param h        Pointer to variable for storing the height, may be NULL
+ *
+ *  \sa SDL_SetWindowSize()
+ */
+extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w,
+                                               int *h);
+
+/**
+ *  \brief Set the minimum size of a window's client area.
+ *
+ *  \param window    The window to set a new minimum size.
+ *  \param min_w     The minimum width of the window, must be >0
+ *  \param min_h     The minimum height of the window, must be >0
+ *
+ *  \note You can't change the minimum size of a fullscreen window, it
+ *        automatically matches the size of the display mode.
+ *
+ *  \sa SDL_GetWindowMinimumSize()
+ *  \sa SDL_SetWindowMaximumSize()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowMinimumSize(SDL_Window * window,
+                                                      int min_w, int min_h);
+
+/**
+ *  \brief Get the minimum size of a window's client area.
+ *
+ *  \param window   The window to query.
+ *  \param w        Pointer to variable for storing the minimum width, may be NULL
+ *  \param h        Pointer to variable for storing the minimum height, may be NULL
+ *
+ *  \sa SDL_GetWindowMaximumSize()
+ *  \sa SDL_SetWindowMinimumSize()
+ */
+extern DECLSPEC void SDLCALL SDL_GetWindowMinimumSize(SDL_Window * window,
+                                                      int *w, int *h);
+
+/**
+ *  \brief Set the maximum size of a window's client area.
+ *
+ *  \param window    The window to set a new maximum size.
+ *  \param max_w     The maximum width of the window, must be >0
+ *  \param max_h     The maximum height of the window, must be >0
+ *
+ *  \note You can't change the maximum size of a fullscreen window, it
+ *        automatically matches the size of the display mode.
+ *
+ *  \sa SDL_GetWindowMaximumSize()
+ *  \sa SDL_SetWindowMinimumSize()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowMaximumSize(SDL_Window * window,
+                                                      int max_w, int max_h);
+
+/**
+ *  \brief Get the maximum size of a window's client area.
+ *
+ *  \param window   The window to query.
+ *  \param w        Pointer to variable for storing the maximum width, may be NULL
+ *  \param h        Pointer to variable for storing the maximum height, may be NULL
+ *
+ *  \sa SDL_GetWindowMinimumSize()
+ *  \sa SDL_SetWindowMaximumSize()
+ */
+extern DECLSPEC void SDLCALL SDL_GetWindowMaximumSize(SDL_Window * window,
+                                                      int *w, int *h);
+
+/**
+ *  \brief Set the border state of a window.
+ *
+ *  This will add or remove the window's SDL_WINDOW_BORDERLESS flag and
+ *  add or remove the border from the actual window. This is a no-op if the
+ *  window's border already matches the requested state.
+ *
+ *  \param window The window of which to change the border state.
+ *  \param bordered SDL_FALSE to remove border, SDL_TRUE to add border.
+ *
+ *  \note You can't change the border state of a fullscreen window.
+ *
+ *  \sa SDL_GetWindowFlags()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowBordered(SDL_Window * window,
+                                                   SDL_bool bordered);
+
+/**
+ *  \brief Show a window.
+ *
+ *  \sa SDL_HideWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window);
+
+/**
+ *  \brief Hide a window.
+ *
+ *  \sa SDL_ShowWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window);
+
+/**
+ *  \brief Raise a window above other windows and set the input focus.
+ */
+extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window);
+
+/**
+ *  \brief Make a window as large as possible.
+ *
+ *  \sa SDL_RestoreWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window);
+
+/**
+ *  \brief Minimize a window to an iconic representation.
+ *
+ *  \sa SDL_RestoreWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window);
+
+/**
+ *  \brief Restore the size and position of a minimized or maximized window.
+ *
+ *  \sa SDL_MaximizeWindow()
+ *  \sa SDL_MinimizeWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window);
+
+/**
+ *  \brief Set a window's fullscreen state.
+ *
+ *  \return 0 on success, or -1 if setting the display mode failed.
+ *
+ *  \sa SDL_SetWindowDisplayMode()
+ *  \sa SDL_GetWindowDisplayMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window,
+                                                    Uint32 flags);
+
+/**
+ *  \brief Get the SDL surface associated with the window.
+ *
+ *  \return The window's framebuffer surface, or NULL on error.
+ *
+ *  A new surface will be created with the optimal format for the window,
+ *  if necessary. This surface will be freed when the window is destroyed.
+ *
+ *  \note You may not combine this with 3D or the rendering API on this window.
+ *
+ *  \sa SDL_UpdateWindowSurface()
+ *  \sa SDL_UpdateWindowSurfaceRects()
+ */
+extern DECLSPEC SDL_Surface * SDLCALL SDL_GetWindowSurface(SDL_Window * window);
+
+/**
+ *  \brief Copy the window surface to the screen.
+ *
+ *  \return 0 on success, or -1 on error.
+ *
+ *  \sa SDL_GetWindowSurface()
+ *  \sa SDL_UpdateWindowSurfaceRects()
+ */
+extern DECLSPEC int SDLCALL SDL_UpdateWindowSurface(SDL_Window * window);
+
+/**
+ *  \brief Copy a number of rectangles on the window surface to the screen.
+ *
+ *  \return 0 on success, or -1 on error.
+ *
+ *  \sa SDL_GetWindowSurface()
+ *  \sa SDL_UpdateWindowSurfaceRect()
+ */
+extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window * window,
+                                                         const SDL_Rect * rects,
+                                                         int numrects);
+
+/**
+ *  \brief Set a window's input grab mode.
+ *
+ *  \param window The window for which the input grab mode should be set.
+ *  \param grabbed This is SDL_TRUE to grab input, and SDL_FALSE to release input.
+ *
+ *  \sa SDL_GetWindowGrab()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window,
+                                               SDL_bool grabbed);
+
+/**
+ *  \brief Get a window's input grab mode.
+ *
+ *  \return This returns SDL_TRUE if input is grabbed, and SDL_FALSE otherwise.
+ *
+ *  \sa SDL_SetWindowGrab()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowGrab(SDL_Window * window);
+
+/**
+ *  \brief Set the brightness (gamma correction) for a window.
+ *
+ *  \return 0 on success, or -1 if setting the brightness isn't supported.
+ *
+ *  \sa SDL_GetWindowBrightness()
+ *  \sa SDL_SetWindowGammaRamp()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowBrightness(SDL_Window * window, float brightness);
+
+/**
+ *  \brief Get the brightness (gamma correction) for a window.
+ *
+ *  \return The last brightness value passed to SDL_SetWindowBrightness()
+ *
+ *  \sa SDL_SetWindowBrightness()
+ */
+extern DECLSPEC float SDLCALL SDL_GetWindowBrightness(SDL_Window * window);
+
+/**
+ *  \brief Set the gamma ramp for a window.
+ *
+ *  \param window The window for which the gamma ramp should be set.
+ *  \param red The translation table for the red channel, or NULL.
+ *  \param green The translation table for the green channel, or NULL.
+ *  \param blue The translation table for the blue channel, or NULL.
+ *
+ *  \return 0 on success, or -1 if gamma ramps are unsupported.
+ *
+ *  Set the gamma translation table for the red, green, and blue channels
+ *  of the video hardware.  Each table is an array of 256 16-bit quantities,
+ *  representing a mapping between the input and output for that channel.
+ *  The input is the index into the array, and the output is the 16-bit
+ *  gamma value at that index, scaled to the output color precision.
+ *
+ *  \sa SDL_GetWindowGammaRamp()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window,
+                                                   const Uint16 * red,
+                                                   const Uint16 * green,
+                                                   const Uint16 * blue);
+
+/**
+ *  \brief Get the gamma ramp for a window.
+ *
+ *  \param window The window from which the gamma ramp should be queried.
+ *  \param red   A pointer to a 256 element array of 16-bit quantities to hold
+ *               the translation table for the red channel, or NULL.
+ *  \param green A pointer to a 256 element array of 16-bit quantities to hold
+ *               the translation table for the green channel, or NULL.
+ *  \param blue  A pointer to a 256 element array of 16-bit quantities to hold
+ *               the translation table for the blue channel, or NULL.
+ *
+ *  \return 0 on success, or -1 if gamma ramps are unsupported.
+ *
+ *  \sa SDL_SetWindowGammaRamp()
+ */
+extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window,
+                                                   Uint16 * red,
+                                                   Uint16 * green,
+                                                   Uint16 * blue);
+
+/**
+ *  \brief Destroy a window.
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window);
+
+
+/**
+ *  \brief Returns whether the screensaver is currently enabled (default on).
+ *
+ *  \sa SDL_EnableScreenSaver()
+ *  \sa SDL_DisableScreenSaver()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void);
+
+/**
+ *  \brief Allow the screen to be blanked by a screensaver
+ *
+ *  \sa SDL_IsScreenSaverEnabled()
+ *  \sa SDL_DisableScreenSaver()
+ */
+extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void);
+
+/**
+ *  \brief Prevent the screen from being blanked by a screensaver
+ *
+ *  \sa SDL_IsScreenSaverEnabled()
+ *  \sa SDL_EnableScreenSaver()
+ */
+extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void);
+
+
+/**
+ *  \name OpenGL support functions
+ */
+/* @{ */
+
+/**
+ *  \brief Dynamically load an OpenGL library.
+ *
+ *  \param path The platform dependent OpenGL library name, or NULL to open the
+ *              default OpenGL library.
+ *
+ *  \return 0 on success, or -1 if the library couldn't be loaded.
+ *
+ *  This should be done after initializing the video driver, but before
+ *  creating any OpenGL windows.  If no OpenGL library is loaded, the default
+ *  library will be loaded upon creation of the first OpenGL window.
+ *
+ *  \note If you do this, you need to retrieve all of the GL functions used in
+ *        your program from the dynamic library using SDL_GL_GetProcAddress().
+ *
+ *  \sa SDL_GL_GetProcAddress()
+ *  \sa SDL_GL_UnloadLibrary()
+ */
+extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path);
+
+/**
+ *  \brief Get the address of an OpenGL function.
+ */
+extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc);
+
+/**
+ *  \brief Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary().
+ *
+ *  \sa SDL_GL_LoadLibrary()
+ */
+extern DECLSPEC void SDLCALL SDL_GL_UnloadLibrary(void);
+
+/**
+ *  \brief Return true if an OpenGL extension is supported for the current
+ *         context.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char
+                                                           *extension);
+
+/**
+ *  \brief Reset all previously set OpenGL context attributes to their default values
+ */
+extern DECLSPEC void SDLCALL SDL_GL_ResetAttributes(void);
+
+/**
+ *  \brief Set an OpenGL window attribute before window creation.
+ */
+extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);
+
+/**
+ *  \brief Get the actual value for an attribute from the current context.
+ */
+extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value);
+
+/**
+ *  \brief Create an OpenGL context for use with an OpenGL window, and make it
+ *         current.
+ *
+ *  \sa SDL_GL_DeleteContext()
+ */
+extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window *
+                                                           window);
+
+/**
+ *  \brief Set up an OpenGL context for rendering into an OpenGL window.
+ *
+ *  \note The context must have been created with a compatible window.
+ */
+extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window,
+                                               SDL_GLContext context);
+
+/**
+ *  \brief Get the currently active OpenGL window.
+ */
+extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void);
+
+/**
+ *  \brief Get the currently active OpenGL context.
+ */
+extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void);
+
+/**
+ *  \brief Get the size of a window's underlying drawable (for use with glViewport).
+ *
+ *  \param window   Window from which the drawable size should be queried
+ *  \param w        Pointer to variable for storing the width, may be NULL
+ *  \param h        Pointer to variable for storing the height, may be NULL
+ *
+ * This may differ from SDL_GetWindowSize if we're rendering to a high-DPI
+ * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a
+ * platform with high-DPI support (Apple calls this "Retina"), and not disabled
+ * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint.
+ *
+ *  \sa SDL_GetWindowSize()
+ *  \sa SDL_CreateWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w,
+                                                    int *h);
+
+/**
+ *  \brief Set the swap interval for the current OpenGL context.
+ *
+ *  \param interval 0 for immediate updates, 1 for updates synchronized with the
+ *                  vertical retrace. If the system supports it, you may
+ *                  specify -1 to allow late swaps to happen immediately
+ *                  instead of waiting for the next retrace.
+ *
+ *  \return 0 on success, or -1 if setting the swap interval is not supported.
+ *
+ *  \sa SDL_GL_GetSwapInterval()
+ */
+extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval);
+
+/**
+ *  \brief Get the swap interval for the current OpenGL context.
+ *
+ *  \return 0 if there is no vertical retrace synchronization, 1 if the buffer
+ *          swap is synchronized with the vertical retrace, and -1 if late
+ *          swaps happen immediately instead of waiting for the next retrace.
+ *          If the system can't determine the swap interval, or there isn't a
+ *          valid current context, this will return 0 as a safe default.
+ *
+ *  \sa SDL_GL_SetSwapInterval()
+ */
+extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void);
+
+/**
+ * \brief Swap the OpenGL buffers for a window, if double-buffering is
+ *        supported.
+ */
+extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window);
+
+/**
+ *  \brief Delete an OpenGL context.
+ *
+ *  \sa SDL_GL_CreateContext()
+ */
+extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
+
+/* @} *//* OpenGL support functions */
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_video_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/include/begin_code.h b/Source/3rd Party/sdl/include/begin_code.h
new file mode 100644
index 000000000..f37ee3696
--- /dev/null
+++ b/Source/3rd Party/sdl/include/begin_code.h	
@@ -0,0 +1,140 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file begin_code.h
+ *
+ *  This file sets things up for C dynamic library function definitions,
+ *  static inlined functions, and structures aligned at 4-byte alignment.
+ *  If you don't like ugly C preprocessor code, don't look at this file. :)
+ */
+
+/* This shouldn't be nested -- included it around code only. */
+#ifdef _begin_code_h
+#error Nested inclusion of begin_code.h
+#endif
+#define _begin_code_h
+
+#ifndef SDL_DEPRECATED
+#  if (__GNUC__ >= 4)  /* technically, this arrived in gcc 3.1, but oh well. */
+#    define SDL_DEPRECATED __attribute__((deprecated))
+#  else
+#    define SDL_DEPRECATED
+#  endif
+#endif
+
+/* Some compilers use a special export keyword */
+#ifndef DECLSPEC
+# if defined(__WIN32__) || defined(__WINRT__)
+#  ifdef __BORLANDC__
+#   ifdef BUILD_SDL
+#    define DECLSPEC
+#   else
+#    define DECLSPEC    __declspec(dllimport)
+#   endif
+#  else
+#   define DECLSPEC __declspec(dllexport)
+#  endif
+# else
+#  if defined(__GNUC__) && __GNUC__ >= 4
+#   define DECLSPEC __attribute__ ((visibility("default")))
+#  elif defined(__GNUC__) && __GNUC__ >= 2
+#   define DECLSPEC __declspec(dllexport)
+#  else
+#   define DECLSPEC
+#  endif
+# endif
+#endif
+
+/* By default SDL uses the C calling convention */
+#ifndef SDLCALL
+#if (defined(__WIN32__) || defined(__WINRT__)) && !defined(__GNUC__)
+#define SDLCALL __cdecl
+#else
+#define SDLCALL
+#endif
+#endif /* SDLCALL */
+
+/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
+#ifdef __SYMBIAN32__
+#undef DECLSPEC
+#define DECLSPEC
+#endif /* __SYMBIAN32__ */
+
+/* Force structure packing at 4 byte alignment.
+   This is necessary if the header is included in code which has structure
+   packing set to an alternate value, say for loading structures from disk.
+   The packing is reset to the previous value in close_code.h
+ */
+#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
+#ifdef _MSC_VER
+#pragma warning(disable: 4103)
+#endif
+#ifdef __BORLANDC__
+#pragma nopackwarning
+#endif
+#ifdef _M_X64
+/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */
+#pragma pack(push,8)
+#else
+#pragma pack(push,4)
+#endif
+#endif /* Compiler needs structure packing set */
+
+#ifndef SDL_INLINE
+#if defined(__GNUC__)
+#define SDL_INLINE __inline__
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || \
+      defined(__DMC__) || defined(__SC__) || \
+      defined(__WATCOMC__) || defined(__LCC__) || \
+      defined(__DECC)
+#define SDL_INLINE __inline
+#ifndef __inline__
+#define __inline__ __inline
+#endif
+#else
+#define SDL_INLINE inline
+#ifndef __inline__
+#define __inline__ inline
+#endif
+#endif
+#endif /* SDL_INLINE not defined */
+
+#ifndef SDL_FORCE_INLINE
+#if defined(_MSC_VER)
+#define SDL_FORCE_INLINE __forceinline
+#elif ( (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) )
+#define SDL_FORCE_INLINE __attribute__((always_inline)) static __inline__
+#else
+#define SDL_FORCE_INLINE static SDL_INLINE
+#endif
+#endif /* SDL_FORCE_INLINE not defined */
+
+/* Apparently this is needed by several Windows compilers */
+#if !defined(__MACH__)
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL 0
+#else
+#define NULL ((void *)0)
+#endif
+#endif /* NULL */
+#endif /* ! Mac OS X - breaks precompiled headers */
diff --git a/Source/3rd Party/sdl/include/close_code.h b/Source/3rd Party/sdl/include/close_code.h
new file mode 100644
index 000000000..9826f1478
--- /dev/null
+++ b/Source/3rd Party/sdl/include/close_code.h	
@@ -0,0 +1,37 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file close_code.h
+ *
+ *  This file reverses the effects of begin_code.h and should be included
+ *  after you finish any function and structure declarations in your headers
+ */
+
+#undef _begin_code_h
+
+/* Reset structure packing at previous byte alignment */
+#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__)  || defined(__BORLANDC__)
+#ifdef __BORLANDC__
+#pragma nopackwarning
+#endif
+#pragma pack(pop)
+#endif /* Compiler needs structure packing set */
diff --git a/Source/3rd Party/sdl/include/doxyfile b/Source/3rd Party/sdl/include/doxyfile
new file mode 100644
index 000000000..495dbc19b
--- /dev/null
+++ b/Source/3rd Party/sdl/include/doxyfile	
@@ -0,0 +1,1555 @@
+# Doxyfile 1.5.9
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = SDL
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER         = 2.0.0
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = .
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = YES
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, 
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = "defined=\"\def\"" \
+                         "discussion=\"\par Discussion:\n\""
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses. 
+# With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
+# The format is ext=language, where ext is a file extension, and language is one of 
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set
+# FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      = 
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = YES
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk. 
+# When the cache is full, less often used symbols will be written to disk. 
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penality. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will rougly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = YES
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = YES
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
+# doxygen. The layout file controls the global structure of the generated output files 
+# in an output format independent way. The create the layout file that represents 
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+# of the layout file.
+
+LAYOUT_FILE            = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = ./doxygen_warn.txt
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = .
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.f90 \
+                         *.f \
+                         *.vhd \
+                         *.vhdl \
+                         *.h.in \
+                         *.h.default
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = ../doxy \
+                         ../test \
+                         ../Xcode \
+                         ../VisualC \
+                         ../VisualCE \
+                         ../Xcode-iOS
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = YES
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = YES
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code.  Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = SDL_ \
+                         SDL
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "SDL 2.0 Doxygen"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.libsdl.sdl20
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = ./sdl20.chm
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING     = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = YES
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
+# are set, an additional index file will be generated that can be used as input for 
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+# HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = 
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
+# For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION           = 
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 1
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to FRAME, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list; 
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
+# disables this behavior completely. For backwards compatibility with previous 
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
+# respectively.
+
+GENERATE_TREEVIEW      = ALL
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = DOXYGEN_SHOULD_IGNORE_THIS=1 \
+                         DECLSPEC= \
+                         SDLCALL= \
+                         _WIN32=1
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links. 
+# Note that each tag file must have a unique name 
+# (where the name does NOT include the path) 
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = ./SDL.tag
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = c:\Perl\bin\perl.exe
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = YES
+
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include 
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif 
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 2
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Options related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = NO
diff --git a/Source/3rd Party/sdl/sdl2.vcproj b/Source/3rd Party/sdl/sdl2.vcproj
new file mode 100644
index 000000000..c103f6cbd
--- /dev/null
+++ b/Source/3rd Party/sdl/sdl2.vcproj	
@@ -0,0 +1,1157 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="SDL2"
+	ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
+	RootNamespace="SDL"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(SolutionDir)PropertySheets/Win32.Debug.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="include;&quot;$(Root)Source/3rd Party/directx/include&quot;"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DisableSpecificWarnings="4127"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="version.lib imm32.lib winmm.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(SolutionDir)PropertySheets/Win32.Release.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="include;&quot;$(Root)Source/3rd Party/directx/include&quot;"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DisableSpecificWarnings="4127"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				AdditionalDependencies="version.lib imm32.lib winmm.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="API Headers"
+			>
+			<File
+				RelativePath=".\include\SDL.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_assert.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_atomic.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_audio.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_bits.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_blendmode.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_clipboard.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_config.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_config_windows.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_copying.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_cpuinfo.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_egl.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\video\sdl_egl_c.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_endian.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_error.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_events.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_filesystem.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_gamecontroller.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_gesture.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_haptic.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_hints.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_joystick.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_keyboard.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_keycode.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_loadso.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_log.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_main.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_messagebox.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_mouse.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_mutex.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_name.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_opengl.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_opengles.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_pixels.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_platform.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_power.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_quit.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_rect.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_render.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_revision.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_rwops.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_scancode.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_shape.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_stdinc.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_surface.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_system.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_syswm.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_thread.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_timer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_touch.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_types.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_version.h"
+				>
+			</File>
+			<File
+				RelativePath=".\include\SDL_video.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\video\windows\SDL_windowsopengles.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\src\events\blank_cursor.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\default_cursor.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\directsound\directx.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\e_atan2.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\e_log.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\e_pow.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\e_rem_pio2.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\e_sqrt.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\k_cos.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\k_rem_pio2.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\k_sin.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\math.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\math_private.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\mmx.h"
+			>
+		</File>
+		<File
+			RelativePath=".\resource.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\s_atan.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\s_copysign.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\s_cos.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\s_fabs.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\s_floor.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\s_scalbn.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\libm\s_sin.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\SDL.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\SDL_assert.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\atomic\SDL_atomic.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_audio.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_audio_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_audiocvt.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_audiodev.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_audiodev_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_audiomem.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_audiotypecvt.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_blendfillrect.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_blendfillrect.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_blendline.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_blendline.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_blendpoint.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_blendpoint.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_0.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_1.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_A.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_auto.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_auto.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_copy.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_copy.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_N.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_slow.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_blit_slow.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_bmp.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_clipboard.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_clipboardevents.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_clipboardevents_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\cpuinfo\SDL_cpuinfo.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\SDL_d3dmath.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\SDL_d3dmath.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\directsound\SDL_directsound.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\directsound\SDL_directsound.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\disk\SDL_diskaudio.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\disk\SDL_diskaudio.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_draw.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_drawline.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_drawline.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_drawpoint.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_drawpoint.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_dropevents.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_dropevents_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\dummy\SDL_dummyaudio.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\dummy\SDL_dummyaudio.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\joystick\windows\SDL_dxjoystick.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\dynapi\SDL_dynapi.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\dynapi\SDL_dynapi.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\dynapi\SDL_dynapi_overrides.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\dynapi\SDL_dynapi_procs.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_egl.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\SDL_error.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\SDL_error_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_events.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_events_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_fillrect.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\joystick\SDL_gamecontroller.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_gesture.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_gesture_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\stdlib\SDL_getenv.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_glesfuncs.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_glfuncs.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\haptic\SDL_haptic.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\SDL_hints.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\SDL_hints_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\stdlib\SDL_iconv.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\joystick\SDL_joystick.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\joystick\SDL_joystick_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_keyboard.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_keyboard_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\SDL_log.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\stdlib\SDL_malloc.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_mixer.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\joystick\windows\SDL_mmjoystick.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_mouse.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_mouse_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\dummy\SDL_nullevents.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\dummy\SDL_nullevents_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\dummy\SDL_nullframebuffer.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\dummy\SDL_nullframebuffer_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\dummy\SDL_nullvideo.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\dummy\SDL_nullvideo.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_pixels.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_pixels_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\power\SDL_power.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\stdlib\SDL_qsort.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_quit.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_rect.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_rect_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\SDL_render.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\direct3d\SDL_render_d3d.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\direct3d11\SDL_render_d3d11.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\opengl\SDL_render_gl.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\opengles2\SDL_render_gles2.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_render_sw.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_render_sw_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_RLEaccel.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_RLEaccel_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_rotate.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\software\SDL_rotate.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\file\SDL_rwops.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\opengl\SDL_shaders_gl.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\opengl\SDL_shaders_gl.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\opengles2\SDL_shaders_gles2.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_shape.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_shape_internals.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\atomic\SDL_spinlock.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\stdlib\SDL_stdlib.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_stretch.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\stdlib\SDL_string.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_surface.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_sysaudio.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\thread\generic\SDL_syscond.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_sysevents.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\filesystem\windows\SDL_sysfilesystem.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\haptic\windows\SDL_syshaptic.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\haptic\SDL_syshaptic.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\joystick\SDL_sysjoystick.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\loadso\windows\SDL_sysloadso.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\thread\windows\SDL_sysmutex.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\power\windows\SDL_syspower.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\SDL_sysrender.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\thread\windows\SDL_syssem.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\thread\windows\SDL_systhread.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\thread\SDL_systhread.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\thread\windows\SDL_systhread_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\timer\windows\SDL_systimer.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\timer\SDL_systimer.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\thread\windows\SDL_systls.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_sysvideo.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\thread\SDL_thread.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\thread\SDL_thread_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\timer\SDL_timer.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\timer\SDL_timer_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_touch.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_touch_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\SDL_video.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_vkeys.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_wave.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\SDL_wave.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_windowevents.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\events\SDL_windowevents_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\core\windows\SDL_windows.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\core\windows\SDL_windows.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsclipboard.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsclipboard.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsevents.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsevents.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsframebuffer.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsframebuffer.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowskeyboard.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowskeyboard.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsmessagebox.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsmessagebox.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsmodes.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsmodes.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsmouse.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsmouse.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsopengl.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsopengl.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsopengles.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsshape.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsshape.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsvideo.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowsvideo.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowswindow.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\SDL_windowswindow.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\winmm\SDL_winmm.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\winmm\SDL_winmm.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\audio\xaudio2\SDL_xaudio2.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\SDL_yuv_mmx.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\SDL_yuv_sw.c"
+			>
+		</File>
+		<File
+			RelativePath=".\src\render\SDL_yuv_sw_c.h"
+			>
+		</File>
+		<File
+			RelativePath=".\src\main\windows\version.rc"
+			>
+		</File>
+		<File
+			RelativePath=".\src\video\windows\wmmsg.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/Source/3rd Party/sdl/sdl2.vcxproj b/Source/3rd Party/sdl/sdl2.vcxproj
new file mode 100644
index 000000000..f45391b9b
--- /dev/null
+++ b/Source/3rd Party/sdl/sdl2.vcxproj	
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>SDL2</ProjectName>
+    <ProjectGuid>{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}</ProjectGuid>
+    <RootNamespace>SDL</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
+  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader />
+      <AdditionalIncludeDirectories>include;$(Root)Source/3rd Party/directx/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>version.lib;imm32.lib;winmm.lib</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include=".\include\SDL.h" />
+    <ClInclude Include=".\include\SDL_assert.h" />
+    <ClInclude Include=".\include\SDL_atomic.h" />
+    <ClInclude Include=".\include\SDL_audio.h" />
+    <ClInclude Include=".\include\SDL_bits.h" />
+    <ClInclude Include=".\include\SDL_blendmode.h" />
+    <ClInclude Include=".\include\SDL_clipboard.h" />
+    <ClInclude Include=".\include\SDL_config.h" />
+    <ClInclude Include=".\include\SDL_config_windows.h" />
+    <ClInclude Include=".\include\SDL_copying.h" />
+    <ClInclude Include=".\include\SDL_cpuinfo.h" />
+    <ClInclude Include=".\include\SDL_egl.h" />
+    <ClInclude Include=".\include\SDL_endian.h" />
+    <ClInclude Include=".\include\SDL_error.h" />
+    <ClInclude Include=".\include\SDL_events.h" />
+    <ClInclude Include=".\include\SDL_filesystem.h" />
+    <ClInclude Include=".\include\SDL_gamecontroller.h" />
+    <ClInclude Include=".\include\SDL_gesture.h" />
+    <ClInclude Include=".\include\SDL_haptic.h" />
+    <ClInclude Include=".\include\SDL_hints.h" />
+    <ClInclude Include=".\include\SDL_joystick.h" />
+    <ClInclude Include=".\include\SDL_keyboard.h" />
+    <ClInclude Include=".\include\SDL_keycode.h" />
+    <ClInclude Include=".\include\SDL_loadso.h" />
+    <ClInclude Include=".\include\SDL_log.h" />
+    <ClInclude Include=".\include\SDL_main.h" />
+    <ClInclude Include=".\include\SDL_messagebox.h" />
+    <ClInclude Include=".\include\SDL_mouse.h" />
+    <ClInclude Include=".\include\SDL_mutex.h" />
+    <ClInclude Include=".\include\SDL_name.h" />
+    <ClInclude Include=".\include\SDL_opengl.h" />
+    <ClInclude Include=".\include\SDL_opengles.h" />
+    <ClInclude Include=".\include\SDL_pixels.h" />
+    <ClInclude Include=".\include\SDL_platform.h" />
+    <ClInclude Include=".\include\SDL_power.h" />
+    <ClInclude Include=".\include\SDL_quit.h" />
+    <ClInclude Include=".\include\SDL_rect.h" />
+    <ClInclude Include=".\include\SDL_render.h" />
+    <ClInclude Include=".\include\SDL_revision.h" />
+    <ClInclude Include=".\include\SDL_rwops.h" />
+    <ClInclude Include=".\include\SDL_scancode.h" />
+    <ClInclude Include=".\include\SDL_shape.h" />
+    <ClInclude Include=".\include\SDL_stdinc.h" />
+    <ClInclude Include=".\include\SDL_surface.h" />
+    <ClInclude Include=".\include\SDL_system.h" />
+    <ClInclude Include=".\include\SDL_syswm.h" />
+    <ClInclude Include=".\include\SDL_thread.h" />
+    <ClInclude Include=".\include\SDL_timer.h" />
+    <ClInclude Include=".\include\SDL_touch.h" />
+    <ClInclude Include=".\include\SDL_types.h" />
+    <ClInclude Include=".\include\SDL_version.h" />
+    <ClInclude Include=".\include\SDL_video.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\audio\directsound\directx.h" />
+    <ClInclude Include="src\audio\directsound\SDL_directsound.h" />
+    <ClInclude Include="src\audio\disk\SDL_diskaudio.h" />
+    <ClInclude Include="src\audio\dummy\SDL_dummyaudio.h" />
+    <ClInclude Include="src\audio\SDL_audiodev_c.h" />
+    <ClInclude Include="src\audio\SDL_audiomem.h" />
+    <ClInclude Include="src\audio\SDL_audio_c.h" />
+    <ClInclude Include="src\audio\SDL_sysaudio.h" />
+    <ClInclude Include="src\audio\SDL_wave.h" />
+    <ClInclude Include="src\audio\winmm\SDL_winmm.h" />
+    <ClInclude Include="src\core\windows\SDL_windows.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi_overrides.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi_procs.h" />
+    <ClInclude Include="src\events\blank_cursor.h" />
+    <ClInclude Include="src\events\default_cursor.h" />
+    <ClInclude Include="src\events\SDL_clipboardevents_c.h" />
+    <ClInclude Include="src\events\SDL_dropevents_c.h" />
+    <ClInclude Include="src\events\SDL_events_c.h" />
+    <ClInclude Include="src\events\SDL_gesture_c.h" />
+    <ClInclude Include="src\events\SDL_keyboard_c.h" />
+    <ClInclude Include="src\events\SDL_mouse_c.h" />
+    <ClInclude Include="src\events\SDL_sysevents.h" />
+    <ClInclude Include="src\events\SDL_touch_c.h" />
+    <ClInclude Include="src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="src\haptic\SDL_syshaptic.h" />
+    <ClInclude Include="src\joystick\SDL_joystick_c.h" />
+    <ClInclude Include="src\joystick\SDL_sysjoystick.h" />
+    <ClInclude Include="src\libm\math.h" />
+    <ClInclude Include="src\libm\math_private.h" />
+    <ClInclude Include="src\render\mmx.h" />
+    <ClInclude Include="src\render\opengl\SDL_shaders_gl.h" />
+    <ClInclude Include="src\render\SDL_d3dmath.h" />
+    <ClInclude Include="src\render\SDL_sysrender.h" />
+    <ClInclude Include="src\render\SDL_yuv_sw_c.h" />
+    <ClInclude Include="src\render\software\SDL_blendfillrect.h" />
+    <ClInclude Include="src\render\software\SDL_blendline.h" />
+    <ClInclude Include="src\render\software\SDL_blendpoint.h" />
+    <ClInclude Include="src\render\software\SDL_draw.h" />
+    <ClInclude Include="src\render\software\SDL_drawline.h" />
+    <ClInclude Include="src\render\software\SDL_drawpoint.h" />
+    <ClInclude Include="src\render\software\SDL_render_sw_c.h" />
+    <ClInclude Include="src\render\software\SDL_rotate.h" />
+    <ClInclude Include="src\SDL_error_c.h" />
+    <ClInclude Include="src\SDL_hints_c.h" />
+    <ClInclude Include="src\thread\SDL_systhread.h" />
+    <ClInclude Include="src\thread\SDL_thread_c.h" />
+    <ClInclude Include="src\thread\windows\SDL_systhread_c.h" />
+    <ClInclude Include="src\timer\SDL_systimer.h" />
+    <ClInclude Include="src\timer\SDL_timer_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullevents_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullframebuffer_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullvideo.h" />
+    <ClInclude Include="src\video\SDL_blit.h" />
+    <ClInclude Include="src\video\SDL_blit_auto.h" />
+    <ClInclude Include="src\video\SDL_blit_copy.h" />
+    <ClInclude Include="src\video\SDL_blit_slow.h" />
+    <ClInclude Include="src\video\sdl_egl_c.h" />
+    <ClInclude Include="src\video\SDL_glesfuncs.h" />
+    <ClInclude Include="src\video\SDL_glfuncs.h" />
+    <ClInclude Include="src\video\SDL_pixels_c.h" />
+    <ClInclude Include="src\video\SDL_rect_c.h" />
+    <ClInclude Include="src\video\SDL_RLEaccel_c.h" />
+    <ClInclude Include="src\video\SDL_shape_internals.h" />
+    <ClInclude Include="src\video\SDL_sysvideo.h" />
+    <ClInclude Include="src\video\windows\SDL_vkeys.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsclipboard.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsevents.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsframebuffer.h" />
+    <ClInclude Include="src\video\windows\SDL_windowskeyboard.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmessagebox.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmodes.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmouse.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsopengl.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsopengles.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsshape.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsvideo.h" />
+    <ClInclude Include="src\video\windows\SDL_windowswindow.h" />
+    <ClInclude Include="src\video\windows\wmmsg.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\atomic\SDL_atomic.c" />
+    <ClCompile Include="src\atomic\SDL_spinlock.c" />
+    <ClCompile Include="src\audio\directsound\SDL_directsound.c" />
+    <ClCompile Include="src\audio\disk\SDL_diskaudio.c" />
+    <ClCompile Include="src\audio\dummy\SDL_dummyaudio.c" />
+    <ClCompile Include="src\audio\SDL_audio.c" />
+    <ClCompile Include="src\audio\SDL_audiocvt.c" />
+    <ClCompile Include="src\audio\SDL_audiodev.c" />
+    <ClCompile Include="src\audio\SDL_audiotypecvt.c" />
+    <ClCompile Include="src\audio\SDL_mixer.c" />
+    <ClCompile Include="src\audio\SDL_wave.c" />
+    <ClCompile Include="src\audio\winmm\SDL_winmm.c" />
+    <ClCompile Include="src\audio\xaudio2\SDL_xaudio2.c" />
+    <ClCompile Include="src\core\windows\SDL_windows.c" />
+    <ClCompile Include="src\cpuinfo\SDL_cpuinfo.c" />
+    <ClCompile Include="src\dynapi\SDL_dynapi.c" />
+    <ClCompile Include="src\events\SDL_clipboardevents.c" />
+    <ClCompile Include="src\events\SDL_dropevents.c" />
+    <ClCompile Include="src\events\SDL_events.c" />
+    <ClCompile Include="src\events\SDL_gesture.c" />
+    <ClCompile Include="src\events\SDL_keyboard.c" />
+    <ClCompile Include="src\events\SDL_mouse.c" />
+    <ClCompile Include="src\events\SDL_quit.c" />
+    <ClCompile Include="src\events\SDL_touch.c" />
+    <ClCompile Include="src\events\SDL_windowevents.c" />
+    <ClCompile Include="src\filesystem\windows\SDL_sysfilesystem.c" />
+    <ClCompile Include="src\file\SDL_rwops.c" />
+    <ClCompile Include="src\haptic\SDL_haptic.c" />
+    <ClCompile Include="src\haptic\windows\SDL_syshaptic.c" />
+    <ClCompile Include="src\joystick\SDL_gamecontroller.c" />
+    <ClCompile Include="src\joystick\SDL_joystick.c" />
+    <ClCompile Include="src\joystick\windows\SDL_dxjoystick.c" />
+    <ClCompile Include="src\joystick\windows\SDL_mmjoystick.c" />
+    <ClCompile Include="src\libm\e_atan2.c" />
+    <ClCompile Include="src\libm\e_log.c" />
+    <ClCompile Include="src\libm\e_pow.c" />
+    <ClCompile Include="src\libm\e_rem_pio2.c" />
+    <ClCompile Include="src\libm\e_sqrt.c" />
+    <ClCompile Include="src\libm\k_cos.c" />
+    <ClCompile Include="src\libm\k_rem_pio2.c" />
+    <ClCompile Include="src\libm\k_sin.c" />
+    <ClCompile Include="src\libm\s_atan.c" />
+    <ClCompile Include="src\libm\s_copysign.c" />
+    <ClCompile Include="src\libm\s_cos.c" />
+    <ClCompile Include="src\libm\s_fabs.c" />
+    <ClCompile Include="src\libm\s_floor.c" />
+    <ClCompile Include="src\libm\s_scalbn.c" />
+    <ClCompile Include="src\libm\s_sin.c" />
+    <ClCompile Include="src\loadso\windows\SDL_sysloadso.c" />
+    <ClCompile Include="src\power\SDL_power.c" />
+    <ClCompile Include="src\power\windows\SDL_syspower.c" />
+    <ClCompile Include="src\render\direct3d11\SDL_render_d3d11.c" />
+    <ClCompile Include="src\render\direct3d\SDL_render_d3d.c" />
+    <ClCompile Include="src\render\opengles2\SDL_render_gles2.c" />
+    <ClCompile Include="src\render\opengles2\SDL_shaders_gles2.c" />
+    <ClCompile Include="src\render\opengl\SDL_render_gl.c" />
+    <ClCompile Include="src\render\opengl\SDL_shaders_gl.c" />
+    <ClCompile Include="src\render\SDL_d3dmath.c" />
+    <ClCompile Include="src\render\SDL_render.c" />
+    <ClCompile Include="src\render\SDL_yuv_mmx.c" />
+    <ClCompile Include="src\render\SDL_yuv_sw.c" />
+    <ClCompile Include="src\render\software\SDL_blendfillrect.c" />
+    <ClCompile Include="src\render\software\SDL_blendline.c" />
+    <ClCompile Include="src\render\software\SDL_blendpoint.c" />
+    <ClCompile Include="src\render\software\SDL_drawline.c" />
+    <ClCompile Include="src\render\software\SDL_drawpoint.c" />
+    <ClCompile Include="src\render\software\SDL_render_sw.c" />
+    <ClCompile Include="src\render\software\SDL_rotate.c" />
+    <ClCompile Include="src\SDL.c" />
+    <ClCompile Include="src\SDL_assert.c" />
+    <ClCompile Include="src\SDL_error.c" />
+    <ClCompile Include="src\SDL_hints.c" />
+    <ClCompile Include="src\SDL_log.c" />
+    <ClCompile Include="src\stdlib\SDL_getenv.c" />
+    <ClCompile Include="src\stdlib\SDL_iconv.c" />
+    <ClCompile Include="src\stdlib\SDL_malloc.c" />
+    <ClCompile Include="src\stdlib\SDL_qsort.c" />
+    <ClCompile Include="src\stdlib\SDL_stdlib.c" />
+    <ClCompile Include="src\stdlib\SDL_string.c" />
+    <ClCompile Include="src\thread\generic\SDL_syscond.c" />
+    <ClCompile Include="src\thread\SDL_thread.c" />
+    <ClCompile Include="src\thread\windows\SDL_sysmutex.c" />
+    <ClCompile Include="src\thread\windows\SDL_syssem.c" />
+    <ClCompile Include="src\thread\windows\SDL_systhread.c" />
+    <ClCompile Include="src\thread\windows\SDL_systls.c" />
+    <ClCompile Include="src\timer\SDL_timer.c" />
+    <ClCompile Include="src\timer\windows\SDL_systimer.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullevents.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullframebuffer.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullvideo.c" />
+    <ClCompile Include="src\video\SDL_blit.c" />
+    <ClCompile Include="src\video\SDL_blit_0.c" />
+    <ClCompile Include="src\video\SDL_blit_1.c" />
+    <ClCompile Include="src\video\SDL_blit_A.c" />
+    <ClCompile Include="src\video\SDL_blit_auto.c" />
+    <ClCompile Include="src\video\SDL_blit_copy.c" />
+    <ClCompile Include="src\video\SDL_blit_N.c" />
+    <ClCompile Include="src\video\SDL_blit_slow.c" />
+    <ClCompile Include="src\video\SDL_bmp.c" />
+    <ClCompile Include="src\video\SDL_clipboard.c" />
+    <ClCompile Include="src\video\SDL_egl.c" />
+    <ClCompile Include="src\video\SDL_fillrect.c" />
+    <ClCompile Include="src\video\SDL_pixels.c" />
+    <ClCompile Include="src\video\SDL_rect.c" />
+    <ClCompile Include="src\video\SDL_RLEaccel.c" />
+    <ClCompile Include="src\video\SDL_shape.c" />
+    <ClCompile Include="src\video\SDL_stretch.c" />
+    <ClCompile Include="src\video\SDL_surface.c" />
+    <ClCompile Include="src\video\SDL_video.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsclipboard.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsevents.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsframebuffer.c" />
+    <ClCompile Include="src\video\windows\SDL_windowskeyboard.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmessagebox.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmodes.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmouse.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsopengl.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsopengles.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsshape.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsvideo.c" />
+    <ClCompile Include="src\video\windows\SDL_windowswindow.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\main\windows\version.rc" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/sdl/sdl2.vcxproj.filters b/Source/3rd Party/sdl/sdl2.vcxproj.filters
new file mode 100644
index 000000000..bb76d082d
--- /dev/null
+++ b/Source/3rd Party/sdl/sdl2.vcxproj.filters	
@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="API Headers">
+      <UniqueIdentifier>{80dab642-b512-42eb-b781-c1d3c091fdb1}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include=".\include\SDL.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_assert.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_atomic.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_audio.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_bits.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_blendmode.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_clipboard.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_config.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_config_windows.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_copying.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_cpuinfo.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_egl.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video\sdl_egl_c.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_endian.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_error.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_events.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_filesystem.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_gamecontroller.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_gesture.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_haptic.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_hints.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_joystick.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_keyboard.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_keycode.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_loadso.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_log.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_main.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_messagebox.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_mouse.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_mutex.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_name.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_opengl.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_opengles.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_pixels.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_platform.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_power.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_quit.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_rect.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_render.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_revision.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_rwops.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_scancode.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_shape.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_stdinc.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_surface.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_system.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_syswm.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_thread.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_timer.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_touch.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_types.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_version.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\SDL_video.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\video\windows\SDL_windowsopengles.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\events\blank_cursor.h" />
+    <ClInclude Include="src\events\default_cursor.h" />
+    <ClInclude Include="src\audio\directsound\directx.h" />
+    <ClInclude Include="src\libm\math.h" />
+    <ClInclude Include="src\libm\math_private.h" />
+    <ClInclude Include="src\render\mmx.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="src\audio\SDL_audio_c.h" />
+    <ClInclude Include="src\audio\SDL_audiodev_c.h" />
+    <ClInclude Include="src\audio\SDL_audiomem.h" />
+    <ClInclude Include="src\render\software\SDL_blendfillrect.h" />
+    <ClInclude Include="src\render\software\SDL_blendline.h" />
+    <ClInclude Include="src\render\software\SDL_blendpoint.h" />
+    <ClInclude Include="src\video\SDL_blit.h" />
+    <ClInclude Include="src\video\SDL_blit_auto.h" />
+    <ClInclude Include="src\video\SDL_blit_copy.h" />
+    <ClInclude Include="src\video\SDL_blit_slow.h" />
+    <ClInclude Include="src\events\SDL_clipboardevents_c.h" />
+    <ClInclude Include="src\render\SDL_d3dmath.h" />
+    <ClInclude Include="src\audio\directsound\SDL_directsound.h" />
+    <ClInclude Include="src\audio\disk\SDL_diskaudio.h" />
+    <ClInclude Include="src\render\software\SDL_draw.h" />
+    <ClInclude Include="src\render\software\SDL_drawline.h" />
+    <ClInclude Include="src\render\software\SDL_drawpoint.h" />
+    <ClInclude Include="src\events\SDL_dropevents_c.h" />
+    <ClInclude Include="src\audio\dummy\SDL_dummyaudio.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi_overrides.h" />
+    <ClInclude Include="src\dynapi\SDL_dynapi_procs.h" />
+    <ClInclude Include="src\SDL_error_c.h" />
+    <ClInclude Include="src\events\SDL_events_c.h" />
+    <ClInclude Include="src\events\SDL_gesture_c.h" />
+    <ClInclude Include="src\video\SDL_glesfuncs.h" />
+    <ClInclude Include="src\video\SDL_glfuncs.h" />
+    <ClInclude Include="src\SDL_hints_c.h" />
+    <ClInclude Include="src\joystick\SDL_joystick_c.h" />
+    <ClInclude Include="src\events\SDL_keyboard_c.h" />
+    <ClInclude Include="src\events\SDL_mouse_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullevents_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullframebuffer_c.h" />
+    <ClInclude Include="src\video\dummy\SDL_nullvideo.h" />
+    <ClInclude Include="src\video\SDL_pixels_c.h" />
+    <ClInclude Include="src\video\SDL_rect_c.h" />
+    <ClInclude Include="src\render\software\SDL_render_sw_c.h" />
+    <ClInclude Include="src\video\SDL_RLEaccel_c.h" />
+    <ClInclude Include="src\render\software\SDL_rotate.h" />
+    <ClInclude Include="src\render\opengl\SDL_shaders_gl.h" />
+    <ClInclude Include="src\video\SDL_shape_internals.h" />
+    <ClInclude Include="src\audio\SDL_sysaudio.h" />
+    <ClInclude Include="src\events\SDL_sysevents.h" />
+    <ClInclude Include="src\haptic\SDL_syshaptic.h" />
+    <ClInclude Include="src\joystick\SDL_sysjoystick.h" />
+    <ClInclude Include="src\render\SDL_sysrender.h" />
+    <ClInclude Include="src\thread\SDL_systhread.h" />
+    <ClInclude Include="src\thread\windows\SDL_systhread_c.h" />
+    <ClInclude Include="src\timer\SDL_systimer.h" />
+    <ClInclude Include="src\video\SDL_sysvideo.h" />
+    <ClInclude Include="src\thread\SDL_thread_c.h" />
+    <ClInclude Include="src\timer\SDL_timer_c.h" />
+    <ClInclude Include="src\events\SDL_touch_c.h" />
+    <ClInclude Include="src\video\windows\SDL_vkeys.h" />
+    <ClInclude Include="src\audio\SDL_wave.h" />
+    <ClInclude Include="src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="src\core\windows\SDL_windows.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsclipboard.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsevents.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsframebuffer.h" />
+    <ClInclude Include="src\video\windows\SDL_windowskeyboard.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmessagebox.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmodes.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsmouse.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsopengl.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsshape.h" />
+    <ClInclude Include="src\video\windows\SDL_windowsvideo.h" />
+    <ClInclude Include="src\video\windows\SDL_windowswindow.h" />
+    <ClInclude Include="src\audio\winmm\SDL_winmm.h" />
+    <ClInclude Include="src\render\SDL_yuv_sw_c.h" />
+    <ClInclude Include="src\video\windows\wmmsg.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\libm\e_atan2.c" />
+    <ClCompile Include="src\libm\e_log.c" />
+    <ClCompile Include="src\libm\e_pow.c" />
+    <ClCompile Include="src\libm\e_rem_pio2.c" />
+    <ClCompile Include="src\libm\e_sqrt.c" />
+    <ClCompile Include="src\libm\k_cos.c" />
+    <ClCompile Include="src\libm\k_rem_pio2.c" />
+    <ClCompile Include="src\libm\k_sin.c" />
+    <ClCompile Include="src\libm\s_atan.c" />
+    <ClCompile Include="src\libm\s_copysign.c" />
+    <ClCompile Include="src\libm\s_cos.c" />
+    <ClCompile Include="src\libm\s_fabs.c" />
+    <ClCompile Include="src\libm\s_floor.c" />
+    <ClCompile Include="src\libm\s_scalbn.c" />
+    <ClCompile Include="src\libm\s_sin.c" />
+    <ClCompile Include="src\SDL.c" />
+    <ClCompile Include="src\SDL_assert.c" />
+    <ClCompile Include="src\atomic\SDL_atomic.c" />
+    <ClCompile Include="src\audio\SDL_audio.c" />
+    <ClCompile Include="src\audio\SDL_audiocvt.c" />
+    <ClCompile Include="src\audio\SDL_audiodev.c" />
+    <ClCompile Include="src\audio\SDL_audiotypecvt.c" />
+    <ClCompile Include="src\render\software\SDL_blendfillrect.c" />
+    <ClCompile Include="src\render\software\SDL_blendline.c" />
+    <ClCompile Include="src\render\software\SDL_blendpoint.c" />
+    <ClCompile Include="src\video\SDL_blit.c" />
+    <ClCompile Include="src\video\SDL_blit_0.c" />
+    <ClCompile Include="src\video\SDL_blit_1.c" />
+    <ClCompile Include="src\video\SDL_blit_A.c" />
+    <ClCompile Include="src\video\SDL_blit_auto.c" />
+    <ClCompile Include="src\video\SDL_blit_copy.c" />
+    <ClCompile Include="src\video\SDL_blit_N.c" />
+    <ClCompile Include="src\video\SDL_blit_slow.c" />
+    <ClCompile Include="src\video\SDL_bmp.c" />
+    <ClCompile Include="src\video\SDL_clipboard.c" />
+    <ClCompile Include="src\events\SDL_clipboardevents.c" />
+    <ClCompile Include="src\cpuinfo\SDL_cpuinfo.c" />
+    <ClCompile Include="src\render\SDL_d3dmath.c" />
+    <ClCompile Include="src\audio\directsound\SDL_directsound.c" />
+    <ClCompile Include="src\audio\disk\SDL_diskaudio.c" />
+    <ClCompile Include="src\render\software\SDL_drawline.c" />
+    <ClCompile Include="src\render\software\SDL_drawpoint.c" />
+    <ClCompile Include="src\events\SDL_dropevents.c" />
+    <ClCompile Include="src\audio\dummy\SDL_dummyaudio.c" />
+    <ClCompile Include="src\joystick\windows\SDL_dxjoystick.c" />
+    <ClCompile Include="src\dynapi\SDL_dynapi.c" />
+    <ClCompile Include="src\video\SDL_egl.c" />
+    <ClCompile Include="src\SDL_error.c" />
+    <ClCompile Include="src\events\SDL_events.c" />
+    <ClCompile Include="src\video\SDL_fillrect.c" />
+    <ClCompile Include="src\joystick\SDL_gamecontroller.c" />
+    <ClCompile Include="src\events\SDL_gesture.c" />
+    <ClCompile Include="src\stdlib\SDL_getenv.c" />
+    <ClCompile Include="src\haptic\SDL_haptic.c" />
+    <ClCompile Include="src\SDL_hints.c" />
+    <ClCompile Include="src\stdlib\SDL_iconv.c" />
+    <ClCompile Include="src\joystick\SDL_joystick.c" />
+    <ClCompile Include="src\events\SDL_keyboard.c" />
+    <ClCompile Include="src\SDL_log.c" />
+    <ClCompile Include="src\stdlib\SDL_malloc.c" />
+    <ClCompile Include="src\audio\SDL_mixer.c" />
+    <ClCompile Include="src\joystick\windows\SDL_mmjoystick.c" />
+    <ClCompile Include="src\events\SDL_mouse.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullevents.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullframebuffer.c" />
+    <ClCompile Include="src\video\dummy\SDL_nullvideo.c" />
+    <ClCompile Include="src\video\SDL_pixels.c" />
+    <ClCompile Include="src\power\SDL_power.c" />
+    <ClCompile Include="src\stdlib\SDL_qsort.c" />
+    <ClCompile Include="src\events\SDL_quit.c" />
+    <ClCompile Include="src\video\SDL_rect.c" />
+    <ClCompile Include="src\render\SDL_render.c" />
+    <ClCompile Include="src\render\direct3d\SDL_render_d3d.c" />
+    <ClCompile Include="src\render\direct3d11\SDL_render_d3d11.c" />
+    <ClCompile Include="src\render\opengl\SDL_render_gl.c" />
+    <ClCompile Include="src\render\opengles2\SDL_render_gles2.c" />
+    <ClCompile Include="src\render\software\SDL_render_sw.c" />
+    <ClCompile Include="src\video\SDL_RLEaccel.c" />
+    <ClCompile Include="src\render\software\SDL_rotate.c" />
+    <ClCompile Include="src\file\SDL_rwops.c" />
+    <ClCompile Include="src\render\opengl\SDL_shaders_gl.c" />
+    <ClCompile Include="src\render\opengles2\SDL_shaders_gles2.c" />
+    <ClCompile Include="src\video\SDL_shape.c" />
+    <ClCompile Include="src\atomic\SDL_spinlock.c" />
+    <ClCompile Include="src\stdlib\SDL_stdlib.c" />
+    <ClCompile Include="src\video\SDL_stretch.c" />
+    <ClCompile Include="src\stdlib\SDL_string.c" />
+    <ClCompile Include="src\video\SDL_surface.c" />
+    <ClCompile Include="src\thread\generic\SDL_syscond.c" />
+    <ClCompile Include="src\filesystem\windows\SDL_sysfilesystem.c" />
+    <ClCompile Include="src\haptic\windows\SDL_syshaptic.c" />
+    <ClCompile Include="src\loadso\windows\SDL_sysloadso.c" />
+    <ClCompile Include="src\thread\windows\SDL_sysmutex.c" />
+    <ClCompile Include="src\power\windows\SDL_syspower.c" />
+    <ClCompile Include="src\thread\windows\SDL_syssem.c" />
+    <ClCompile Include="src\thread\windows\SDL_systhread.c" />
+    <ClCompile Include="src\timer\windows\SDL_systimer.c" />
+    <ClCompile Include="src\thread\windows\SDL_systls.c" />
+    <ClCompile Include="src\thread\SDL_thread.c" />
+    <ClCompile Include="src\timer\SDL_timer.c" />
+    <ClCompile Include="src\events\SDL_touch.c" />
+    <ClCompile Include="src\video\SDL_video.c" />
+    <ClCompile Include="src\audio\SDL_wave.c" />
+    <ClCompile Include="src\events\SDL_windowevents.c" />
+    <ClCompile Include="src\core\windows\SDL_windows.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsclipboard.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsevents.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsframebuffer.c" />
+    <ClCompile Include="src\video\windows\SDL_windowskeyboard.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmessagebox.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmodes.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsmouse.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsopengl.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsopengles.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsshape.c" />
+    <ClCompile Include="src\video\windows\SDL_windowsvideo.c" />
+    <ClCompile Include="src\video\windows\SDL_windowswindow.c" />
+    <ClCompile Include="src\audio\winmm\SDL_winmm.c" />
+    <ClCompile Include="src\audio\xaudio2\SDL_xaudio2.c" />
+    <ClCompile Include="src\render\SDL_yuv_mmx.c" />
+    <ClCompile Include="src\render\SDL_yuv_sw.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\main\windows\version.rc" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/3rd Party/sdl/src/SDL.c b/Source/3rd Party/sdl/src/SDL.c
new file mode 100644
index 000000000..a203c9715
--- /dev/null
+++ b/Source/3rd Party/sdl/src/SDL.c	
@@ -0,0 +1,471 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "./SDL_internal.h"
+
+#if defined(__WIN32__)
+#include "core/windows/SDL_windows.h"
+#endif
+
+/* Initialization code for SDL */
+
+#include "SDL.h"
+#include "SDL_bits.h"
+#include "SDL_revision.h"
+#include "SDL_assert_c.h"
+#include "events/SDL_events_c.h"
+#include "haptic/SDL_haptic_c.h"
+#include "joystick/SDL_joystick_c.h"
+
+/* Initialization/Cleanup routines */
+#if !SDL_TIMERS_DISABLED
+extern int SDL_TimerInit(void);
+extern void SDL_TimerQuit(void);
+extern void SDL_TicksInit(void);
+extern void SDL_TicksQuit(void);
+#endif
+#if SDL_VIDEO_DRIVER_WINDOWS
+extern int SDL_HelperWindowCreate(void);
+extern int SDL_HelperWindowDestroy(void);
+#endif
+
+
+/* The initialized subsystems */
+#ifdef SDL_MAIN_NEEDED
+static SDL_bool SDL_MainIsReady = SDL_FALSE;
+#else
+static SDL_bool SDL_MainIsReady = SDL_TRUE;
+#endif
+static SDL_bool SDL_bInMainQuit = SDL_FALSE;
+static Uint8 SDL_SubsystemRefCount[ 32 ];
+
+/* Private helper to increment a subsystem's ref counter. */
+static void
+SDL_PrivateSubsystemRefCountIncr(Uint32 subsystem)
+{
+    int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
+    SDL_assert(SDL_SubsystemRefCount[subsystem_index] < 255);
+    ++SDL_SubsystemRefCount[subsystem_index];
+}
+
+/* Private helper to decrement a subsystem's ref counter. */
+static void
+SDL_PrivateSubsystemRefCountDecr(Uint32 subsystem)
+{
+    int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
+    if (SDL_SubsystemRefCount[subsystem_index] > 0) {
+        --SDL_SubsystemRefCount[subsystem_index];
+    }
+}
+
+/* Private helper to check if a system needs init. */
+static SDL_bool
+SDL_PrivateShouldInitSubsystem(Uint32 subsystem)
+{
+    int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
+    SDL_assert(SDL_SubsystemRefCount[subsystem_index] < 255);
+    return (SDL_SubsystemRefCount[subsystem_index] == 0);
+}
+
+/* Private helper to check if a system needs to be quit. */
+static SDL_bool
+SDL_PrivateShouldQuitSubsystem(Uint32 subsystem) {
+    int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
+    if (SDL_SubsystemRefCount[subsystem_index] == 0) {
+      return SDL_FALSE;
+    }
+
+    /* If we're in SDL_Quit, we shut down every subsystem, even if refcount
+     * isn't zero.
+     */
+    return SDL_SubsystemRefCount[subsystem_index] == 1 || SDL_bInMainQuit;
+}
+
+void
+SDL_SetMainReady(void)
+{
+    SDL_MainIsReady = SDL_TRUE;
+}
+
+int
+SDL_InitSubSystem(Uint32 flags)
+{
+    if (!SDL_MainIsReady) {
+        SDL_SetError("Application didn't initialize properly, did you include SDL_main.h in the file containing your main() function?");
+        return -1;
+    }
+
+    /* Clear the error message */
+    SDL_ClearError();
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+	if ((flags & (SDL_INIT_HAPTIC|SDL_INIT_JOYSTICK))) {
+		if (SDL_HelperWindowCreate() < 0) {
+			return -1;
+		}
+	}
+#endif
+
+#if !SDL_TIMERS_DISABLED
+    SDL_TicksInit();
+#endif
+
+    if ((flags & SDL_INIT_GAMECONTROLLER)) {
+        /* game controller implies joystick */
+        flags |= SDL_INIT_JOYSTICK;
+    }
+
+    if ((flags & (SDL_INIT_VIDEO|SDL_INIT_JOYSTICK))) {
+        /* video or joystick implies events */
+        flags |= SDL_INIT_EVENTS;
+    }
+
+    /* Initialize the event subsystem */
+    if ((flags & SDL_INIT_EVENTS)) {
+#if !SDL_EVENTS_DISABLED
+        if (SDL_PrivateShouldInitSubsystem(SDL_INIT_EVENTS)) {
+            if (SDL_StartEventLoop() < 0) {
+                return (-1);
+            }
+            SDL_QuitInit();
+        }
+        SDL_PrivateSubsystemRefCountIncr(SDL_INIT_EVENTS);
+#else
+        return SDL_SetError("SDL not built with events support");
+#endif
+    }
+
+    /* Initialize the timer subsystem */
+    if ((flags & SDL_INIT_TIMER)){
+#if !SDL_TIMERS_DISABLED
+        if (SDL_PrivateShouldInitSubsystem(SDL_INIT_TIMER)) {
+            if (SDL_TimerInit() < 0) {
+                return (-1);
+            }
+        }
+        SDL_PrivateSubsystemRefCountIncr(SDL_INIT_TIMER);
+#else
+        return SDL_SetError("SDL not built with timer support");
+#endif
+    }
+
+    /* Initialize the video subsystem */
+    if ((flags & SDL_INIT_VIDEO)){
+#if !SDL_VIDEO_DISABLED
+        if (SDL_PrivateShouldInitSubsystem(SDL_INIT_VIDEO)) {
+            if (SDL_VideoInit(NULL) < 0) {
+                return (-1);
+            }
+        }
+        SDL_PrivateSubsystemRefCountIncr(SDL_INIT_VIDEO);
+#else
+        return SDL_SetError("SDL not built with video support");
+#endif
+    }
+
+    /* Initialize the audio subsystem */
+    if ((flags & SDL_INIT_AUDIO)){
+#if !SDL_AUDIO_DISABLED
+        if (SDL_PrivateShouldInitSubsystem(SDL_INIT_AUDIO)) {
+            if (SDL_AudioInit(NULL) < 0) {
+                return (-1);
+            }
+        }
+        SDL_PrivateSubsystemRefCountIncr(SDL_INIT_AUDIO);
+#else
+        return SDL_SetError("SDL not built with audio support");
+#endif
+    }
+
+    /* Initialize the joystick subsystem */
+    if ((flags & SDL_INIT_JOYSTICK)){
+#if !SDL_JOYSTICK_DISABLED
+        if (SDL_PrivateShouldInitSubsystem(SDL_INIT_JOYSTICK)) {
+           if (SDL_JoystickInit() < 0) {
+               return (-1);
+           }
+        }
+        SDL_PrivateSubsystemRefCountIncr(SDL_INIT_JOYSTICK);
+#else
+        return SDL_SetError("SDL not built with joystick support");
+#endif
+    }
+
+    if ((flags & SDL_INIT_GAMECONTROLLER)){
+#if !SDL_JOYSTICK_DISABLED
+        if (SDL_PrivateShouldInitSubsystem(SDL_INIT_GAMECONTROLLER)) {
+            if (SDL_GameControllerInit() < 0) {
+                return (-1);
+            }
+        }
+        SDL_PrivateSubsystemRefCountIncr(SDL_INIT_GAMECONTROLLER);
+#else
+        return SDL_SetError("SDL not built with joystick support");
+#endif
+    }
+
+    /* Initialize the haptic subsystem */
+    if ((flags & SDL_INIT_HAPTIC)){
+#if !SDL_HAPTIC_DISABLED
+        if (SDL_PrivateShouldInitSubsystem(SDL_INIT_HAPTIC)) {
+            if (SDL_HapticInit() < 0) {
+                return (-1);
+            }
+        }
+        SDL_PrivateSubsystemRefCountIncr(SDL_INIT_HAPTIC);
+#else
+        return SDL_SetError("SDL not built with haptic (force feedback) support");
+#endif
+    }
+
+    return (0);
+}
+
+int
+SDL_Init(Uint32 flags)
+{
+    return SDL_InitSubSystem(flags);
+}
+
+void
+SDL_QuitSubSystem(Uint32 flags)
+{
+    /* Shut down requested initialized subsystems */
+#if !SDL_JOYSTICK_DISABLED
+    if ((flags & SDL_INIT_GAMECONTROLLER)) {
+        /* game controller implies joystick */
+        flags |= SDL_INIT_JOYSTICK;
+
+        if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_GAMECONTROLLER)) {
+            SDL_GameControllerQuit();
+        }
+        SDL_PrivateSubsystemRefCountDecr(SDL_INIT_GAMECONTROLLER);
+    }
+
+    if ((flags & SDL_INIT_JOYSTICK)) {
+        /* joystick implies events */
+        flags |= SDL_INIT_EVENTS;
+
+        if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_JOYSTICK)) {
+            SDL_JoystickQuit();
+        }
+        SDL_PrivateSubsystemRefCountDecr(SDL_INIT_JOYSTICK);
+    }
+#endif
+
+#if !SDL_HAPTIC_DISABLED
+    if ((flags & SDL_INIT_HAPTIC)) {
+        if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_HAPTIC)) {
+            SDL_HapticQuit();
+        }
+        SDL_PrivateSubsystemRefCountDecr(SDL_INIT_HAPTIC);
+    }
+#endif
+
+#if !SDL_AUDIO_DISABLED
+    if ((flags & SDL_INIT_AUDIO)) {
+        if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_AUDIO)) {
+            SDL_AudioQuit();
+        }
+        SDL_PrivateSubsystemRefCountDecr(SDL_INIT_AUDIO);
+    }
+#endif
+
+#if !SDL_VIDEO_DISABLED
+    if ((flags & SDL_INIT_VIDEO)) {
+        /* video implies events */
+        flags |= SDL_INIT_EVENTS;
+
+        if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_VIDEO)) {
+            SDL_VideoQuit();
+        }
+        SDL_PrivateSubsystemRefCountDecr(SDL_INIT_VIDEO);
+    }
+#endif
+
+#if !SDL_TIMERS_DISABLED
+    if ((flags & SDL_INIT_TIMER)) {
+        if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_TIMER)) {
+            SDL_TimerQuit();
+        }
+        SDL_PrivateSubsystemRefCountDecr(SDL_INIT_TIMER);
+    }
+#endif
+
+#if !SDL_EVENTS_DISABLED
+    if ((flags & SDL_INIT_EVENTS)) {
+        if (SDL_PrivateShouldQuitSubsystem(SDL_INIT_EVENTS)) {
+            SDL_QuitQuit();
+            SDL_StopEventLoop();
+        }
+        SDL_PrivateSubsystemRefCountDecr(SDL_INIT_EVENTS);
+    }
+#endif
+}
+
+Uint32
+SDL_WasInit(Uint32 flags)
+{
+    int i;
+    int num_subsystems = SDL_arraysize(SDL_SubsystemRefCount);
+    Uint32 initialized = 0;
+
+    if (!flags) {
+        flags = SDL_INIT_EVERYTHING;
+    }
+
+    num_subsystems = SDL_min(num_subsystems, SDL_MostSignificantBitIndex32(flags) + 1);
+
+    /* Iterate over each bit in flags, and check the matching subsystem. */
+    for (i = 0; i < num_subsystems; ++i) {
+        if ((flags & 1) && SDL_SubsystemRefCount[i] > 0) {
+            initialized |= (1 << i);
+        }
+
+        flags >>= 1;
+    }
+
+    return initialized;
+}
+
+void
+SDL_Quit(void)
+{
+    SDL_bInMainQuit = SDL_TRUE;
+
+    /* Quit all subsystems */
+#if SDL_VIDEO_DRIVER_WINDOWS
+    SDL_HelperWindowDestroy();
+#endif
+    SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
+
+#if !SDL_TIMERS_DISABLED
+    SDL_TicksQuit();
+#endif
+
+    SDL_ClearHints();
+    SDL_AssertionsQuit();
+    SDL_LogResetPriorities();
+
+    /* Now that every subsystem has been quit, we reset the subsystem refcount
+     * and the list of initialized subsystems.
+     */
+    SDL_memset( SDL_SubsystemRefCount, 0x0, sizeof(SDL_SubsystemRefCount) );
+
+    SDL_bInMainQuit = SDL_FALSE;
+}
+
+/* Get the library version number */
+void
+SDL_GetVersion(SDL_version * ver)
+{
+    SDL_VERSION(ver);
+}
+
+/* Get the library source revision */
+const char *
+SDL_GetRevision(void)
+{
+    return SDL_REVISION;
+}
+
+/* Get the library source revision number */
+int
+SDL_GetRevisionNumber(void)
+{
+    return SDL_REVISION_NUMBER;
+}
+
+/* Get the name of the platform */
+const char *
+SDL_GetPlatform()
+{
+#if __AIX__
+    return "AIX";
+#elif __ANDROID__
+    return "Android";
+#elif __BSDI__
+    return "BSDI";
+#elif __DREAMCAST__
+    return "Dreamcast";
+#elif __FREEBSD__
+    return "FreeBSD";
+#elif __HAIKU__
+    return "Haiku";
+#elif __HPUX__
+    return "HP-UX";
+#elif __IRIX__
+    return "Irix";
+#elif __LINUX__
+    return "Linux";
+#elif __MINT__
+    return "Atari MiNT";
+#elif __MACOS__
+    return "MacOS Classic";
+#elif __MACOSX__
+    return "Mac OS X";
+#elif __NETBSD__
+    return "NetBSD";
+#elif __OPENBSD__
+    return "OpenBSD";
+#elif __OS2__
+    return "OS/2";
+#elif __OSF__
+    return "OSF/1";
+#elif __QNXNTO__
+    return "QNX Neutrino";
+#elif __RISCOS__
+    return "RISC OS";
+#elif __SOLARIS__
+    return "Solaris";
+#elif __WIN32__
+    return "Windows";
+#elif __IPHONEOS__
+    return "iOS";
+#elif __PSP__
+    return "PlayStation Portable";
+#else
+    return "Unknown (see SDL_platform.h)";
+#endif
+}
+
+#if defined(__WIN32__)
+
+#if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL))
+/* Need to include DllMain() on Watcom C for some reason.. */
+
+/*BOOL APIENTRY
+_DllMainCRTStartup(HANDLE hModule,
+                   DWORD ul_reason_for_call, LPVOID lpReserved)
+{
+    switch (ul_reason_for_call) {
+    case DLL_PROCESS_ATTACH:
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+    case DLL_PROCESS_DETACH:
+        break;
+    }
+    return TRUE;
+}*/
+#endif /* building DLL with Watcom C */
+
+#endif /* __WIN32__ */
+
+/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/SDL_assert.c b/Source/3rd Party/sdl/src/SDL_assert.c
new file mode 100644
index 000000000..98e758447
--- /dev/null
+++ b/Source/3rd Party/sdl/src/SDL_assert.c	
@@ -0,0 +1,384 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "./SDL_internal.h"
+
+#if defined(__WIN32__)
+#include "core/windows/SDL_windows.h"
+#endif
+
+#include "SDL.h"
+#include "SDL_atomic.h"
+#include "SDL_messagebox.h"
+#include "SDL_video.h"
+#include "SDL_assert.h"
+#include "SDL_assert_c.h"
+#include "video/SDL_sysvideo.h"
+
+#ifdef __WIN32__
+#ifndef WS_OVERLAPPEDWINDOW
+#define WS_OVERLAPPEDWINDOW 0
+#endif
+#else  /* fprintf, _exit(), etc. */
+#include <stdio.h>
+#include <stdlib.h>
+#if ! defined(__WINRT__)
+#include <unistd.h>
+#endif
+#endif
+
+static SDL_assert_state
+SDL_PromptAssertion(const SDL_assert_data *data, void *userdata);
+
+/*
+ * We keep all triggered assertions in a singly-linked list so we can
+ *  generate a report later.
+ */
+static SDL_assert_data *triggered_assertions = NULL;
+
+static SDL_mutex *assertion_mutex = NULL;
+static SDL_AssertionHandler assertion_handler = SDL_PromptAssertion;
+static void *assertion_userdata = NULL;
+
+#ifdef __GNUC__
+static void
+debug_print(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+#endif
+
+static void
+debug_print(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    SDL_LogMessageV(SDL_LOG_CATEGORY_ASSERT, SDL_LOG_PRIORITY_WARN, fmt, ap);
+    va_end(ap);
+}
+
+
+static void SDL_AddAssertionToReport(SDL_assert_data *data)
+{
+    /* (data) is always a static struct defined with the assert macros, so
+       we don't have to worry about copying or allocating them. */
+    data->trigger_count++;
+    if (data->trigger_count == 1) {  /* not yet added? */
+        data->next = triggered_assertions;
+        triggered_assertions = data;
+    }
+}
+
+
+static void SDL_GenerateAssertionReport(void)
+{
+    const SDL_assert_data *item = triggered_assertions;
+
+    /* only do this if the app hasn't assigned an assertion handler. */
+    if ((item != NULL) && (assertion_handler != SDL_PromptAssertion)) {
+        debug_print("\n\nSDL assertion report.\n");
+        debug_print("All SDL assertions between last init/quit:\n\n");
+
+        while (item != NULL) {
+            debug_print(
+                "'%s'\n"
+                "    * %s (%s:%d)\n"
+                "    * triggered %u time%s.\n"
+                "    * always ignore: %s.\n",
+                item->condition, item->function, item->filename,
+                item->linenum, item->trigger_count,
+                (item->trigger_count == 1) ? "" : "s",
+                item->always_ignore ? "yes" : "no");
+            item = item->next;
+        }
+        debug_print("\n");
+
+        SDL_ResetAssertionReport();
+    }
+}
+
+static void SDL_ExitProcess(int exitcode)
+{
+#ifdef __WIN32__
+    ExitProcess(exitcode);
+#else
+    _exit(exitcode);
+#endif
+}
+
+static void SDL_AbortAssertion(void)
+{
+    SDL_Quit();
+    SDL_ExitProcess(42);
+}
+
+
+static SDL_assert_state
+SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
+{
+#ifdef __WIN32__
+    #define ENDLINE "\r\n"
+#else
+    #define ENDLINE "\n"
+#endif
+
+    const char *envr;
+    SDL_assert_state state = SDL_ASSERTION_ABORT;
+    SDL_Window *window;
+    SDL_MessageBoxData messagebox;
+    SDL_MessageBoxButtonData buttons[] = {
+        {   0,  SDL_ASSERTION_RETRY,            "Retry" },
+        {   0,  SDL_ASSERTION_BREAK,            "Break" },
+        {   0,  SDL_ASSERTION_ABORT,            "Abort" },
+        {   SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT,
+                SDL_ASSERTION_IGNORE,           "Ignore" },
+        {   SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT,
+                SDL_ASSERTION_ALWAYS_IGNORE,    "Always Ignore" }
+    };
+    char *message;
+    int selected;
+
+    (void) userdata;  /* unused in default handler. */
+
+    message = SDL_stack_alloc(char, SDL_MAX_LOG_MESSAGE);
+    if (!message) {
+        /* Uh oh, we're in real trouble now... */
+        return SDL_ASSERTION_ABORT;
+    }
+    SDL_snprintf(message, SDL_MAX_LOG_MESSAGE,
+                 "Assertion failure at %s (%s:%d), triggered %u %s:" ENDLINE
+                    "  '%s'",
+                 data->function, data->filename, data->linenum,
+                 data->trigger_count, (data->trigger_count == 1) ? "time" : "times",
+                 data->condition);
+
+    debug_print("\n\n%s\n\n", message);
+
+    /* let env. variable override, so unit tests won't block in a GUI. */
+    envr = SDL_getenv("SDL_ASSERT");
+    if (envr != NULL) {
+        SDL_stack_free(message);
+
+        if (SDL_strcmp(envr, "abort") == 0) {
+            return SDL_ASSERTION_ABORT;
+        } else if (SDL_strcmp(envr, "break") == 0) {
+            return SDL_ASSERTION_BREAK;
+        } else if (SDL_strcmp(envr, "retry") == 0) {
+            return SDL_ASSERTION_RETRY;
+        } else if (SDL_strcmp(envr, "ignore") == 0) {
+            return SDL_ASSERTION_IGNORE;
+        } else if (SDL_strcmp(envr, "always_ignore") == 0) {
+            return SDL_ASSERTION_ALWAYS_IGNORE;
+        } else {
+            return SDL_ASSERTION_ABORT;  /* oh well. */
+        }
+    }
+
+    /* Leave fullscreen mode, if possible (scary!) */
+    window = SDL_GetFocusWindow();
+    if (window) {
+        if (SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN) {
+            SDL_MinimizeWindow(window);
+        } else {
+            /* !!! FIXME: ungrab the input if we're not fullscreen? */
+            /* No need to mess with the window */
+            window = NULL;
+        }
+    }
+
+    /* Show a messagebox if we can, otherwise fall back to stdio */
+    SDL_zero(messagebox);
+    messagebox.flags = SDL_MESSAGEBOX_WARNING;
+    messagebox.window = window;
+    messagebox.title = "Assertion Failed";
+    messagebox.message = message;
+    messagebox.numbuttons = SDL_arraysize(buttons);
+    messagebox.buttons = buttons;
+
+    if (SDL_ShowMessageBox(&messagebox, &selected) == 0) {
+        if (selected == -1) {
+            state = SDL_ASSERTION_IGNORE;
+        } else {
+            state = (SDL_assert_state)selected;
+        }
+    }
+#ifdef HAVE_STDIO_H
+    else
+    {
+        /* this is a little hacky. */
+        for ( ; ; ) {
+            char buf[32];
+            fprintf(stderr, "Abort/Break/Retry/Ignore/AlwaysIgnore? [abriA] : ");
+            fflush(stderr);
+            if (fgets(buf, sizeof (buf), stdin) == NULL) {
+                break;
+            }
+
+            if (SDL_strcmp(buf, "a") == 0) {
+                state = SDL_ASSERTION_ABORT;
+                break;
+            } else if (SDL_strcmp(buf, "b") == 0) {
+                state = SDL_ASSERTION_BREAK;
+                break;
+            } else if (SDL_strcmp(buf, "r") == 0) {
+                state = SDL_ASSERTION_RETRY;
+                break;
+            } else if (SDL_strcmp(buf, "i") == 0) {
+                state = SDL_ASSERTION_IGNORE;
+                break;
+            } else if (SDL_strcmp(buf, "A") == 0) {
+                state = SDL_ASSERTION_ALWAYS_IGNORE;
+                break;
+            }
+        }
+    }
+#endif /* HAVE_STDIO_H */
+
+    /* Re-enter fullscreen mode */
+    if (window) {
+        SDL_RestoreWindow(window);
+    }
+
+    SDL_stack_free(message);
+
+    return state;
+}
+
+
+SDL_assert_state
+SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,
+                    int line)
+{
+    static int assertion_running = 0;
+    static SDL_SpinLock spinlock = 0;
+    SDL_assert_state state = SDL_ASSERTION_IGNORE;
+
+    SDL_AtomicLock(&spinlock);
+    if (assertion_mutex == NULL) { /* never called SDL_Init()? */
+        assertion_mutex = SDL_CreateMutex();
+        if (assertion_mutex == NULL) {
+            SDL_AtomicUnlock(&spinlock);
+            return SDL_ASSERTION_IGNORE;   /* oh well, I guess. */
+        }
+    }
+    SDL_AtomicUnlock(&spinlock);
+
+    if (SDL_LockMutex(assertion_mutex) < 0) {
+        return SDL_ASSERTION_IGNORE;   /* oh well, I guess. */
+    }
+
+    /* doing this because Visual C is upset over assigning in the macro. */
+    if (data->trigger_count == 0) {
+        data->function = func;
+        data->filename = file;
+        data->linenum = line;
+    }
+
+    SDL_AddAssertionToReport(data);
+
+    assertion_running++;
+    if (assertion_running > 1) {   /* assert during assert! Abort. */
+        if (assertion_running == 2) {
+            SDL_AbortAssertion();
+        } else if (assertion_running == 3) {  /* Abort asserted! */
+            SDL_ExitProcess(42);
+        } else {
+            while (1) { /* do nothing but spin; what else can you do?! */ }
+        }
+    }
+
+    if (!data->always_ignore) {
+        state = assertion_handler(data, assertion_userdata);
+    }
+
+    switch (state)
+    {
+        case SDL_ASSERTION_ABORT:
+            SDL_AbortAssertion();
+            return SDL_ASSERTION_IGNORE;  /* shouldn't return, but oh well. */
+
+        case SDL_ASSERTION_ALWAYS_IGNORE:
+            state = SDL_ASSERTION_IGNORE;
+            data->always_ignore = 1;
+            break;
+
+        case SDL_ASSERTION_IGNORE:
+        case SDL_ASSERTION_RETRY:
+        case SDL_ASSERTION_BREAK:
+            break;  /* macro handles these. */
+    }
+
+    assertion_running--;
+    SDL_UnlockMutex(assertion_mutex);
+
+    return state;
+}
+
+
+void SDL_AssertionsQuit(void)
+{
+    SDL_GenerateAssertionReport();
+    if (assertion_mutex != NULL) {
+        SDL_DestroyMutex(assertion_mutex);
+        assertion_mutex = NULL;
+    }
+}
+
+void SDL_SetAssertionHandler(SDL_AssertionHandler handler, void *userdata)
+{
+    if (handler != NULL) {
+        assertion_handler = handler;
+        assertion_userdata = userdata;
+    } else {
+        assertion_handler = SDL_PromptAssertion;
+        assertion_userdata = NULL;
+    }
+}
+
+const SDL_assert_data *SDL_GetAssertionReport(void)
+{
+    return triggered_assertions;
+}
+
+void SDL_ResetAssertionReport(void)
+{
+    SDL_assert_data *next = NULL;
+    SDL_assert_data *item;
+    for (item = triggered_assertions; item != NULL; item = next) {
+        next = (SDL_assert_data *) item->next;
+        item->always_ignore = SDL_FALSE;
+        item->trigger_count = 0;
+        item->next = NULL;
+    }
+
+    triggered_assertions = NULL;
+}
+
+SDL_AssertionHandler SDL_GetDefaultAssertionHandler(void)
+{
+    return SDL_PromptAssertion;
+}
+
+SDL_AssertionHandler SDL_GetAssertionHandler(void **userdata)
+{
+    if (userdata != NULL) {
+        *userdata = assertion_userdata;
+    }
+    return assertion_handler;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/SDL_assert_c.h b/Source/3rd Party/sdl/src/SDL_assert_c.h
new file mode 100644
index 000000000..f94b24c29
--- /dev/null
+++ b/Source/3rd Party/sdl/src/SDL_assert_c.h	
@@ -0,0 +1,24 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+extern void SDL_AssertionsQuit(void);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/SDL_error.c b/Source/3rd Party/sdl/src/SDL_error.c
new file mode 100644
index 000000000..ecbf4507b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/SDL_error.c	
@@ -0,0 +1,257 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "./SDL_internal.h"
+
+/* Simple error handling in SDL */
+
+#include "SDL_log.h"
+#include "SDL_error.h"
+#include "SDL_error_c.h"
+
+
+/* Routine to get the thread-specific error variable */
+#if SDL_THREADS_DISABLED
+/* The default (non-thread-safe) global error variable */
+static SDL_error SDL_global_error;
+#define SDL_GetErrBuf() (&SDL_global_error)
+#else
+extern SDL_error *SDL_GetErrBuf(void);
+#endif /* SDL_THREADS_DISABLED */
+
+#define SDL_ERRBUFIZE   1024
+
+/* Private functions */
+
+static const char *
+SDL_LookupString(const char *key)
+{
+    /* FIXME: Add code to lookup key in language string hash-table */
+    return key;
+}
+
+/* Public functions */
+
+int
+SDL_SetError(const char *fmt, ...)
+{
+    va_list ap;
+    SDL_error *error;
+
+    /* Ignore call if invalid format pointer was passed */
+    if (fmt == NULL) return -1;
+
+    /* Copy in the key, mark error as valid */
+    error = SDL_GetErrBuf();
+    error->error = 1;
+    SDL_strlcpy((char *) error->key, fmt, sizeof(error->key));
+
+    va_start(ap, fmt);
+    error->argc = 0;
+    while (*fmt) {
+        if (*fmt++ == '%') {
+            while (*fmt == '.' || (*fmt >= '0' && *fmt <= '9')) {
+                ++fmt;
+            }
+            switch (*fmt++) {
+            case 0:            /* Malformed format string.. */
+                --fmt;
+                break;
+            case 'c':
+            case 'i':
+            case 'd':
+            case 'u':
+            case 'o':
+            case 'x':
+            case 'X':
+                error->args[error->argc++].value_i = va_arg(ap, int);
+                break;
+            case 'f':
+                error->args[error->argc++].value_f = va_arg(ap, double);
+                break;
+            case 'p':
+                error->args[error->argc++].value_ptr = va_arg(ap, void *);
+                break;
+            case 's':
+                {
+                    int i = error->argc;
+                    const char *str = va_arg(ap, const char *);
+                    if (str == NULL)
+                        str = "(null)";
+                    SDL_strlcpy((char *) error->args[i].buf, str,
+                                ERR_MAX_STRLEN);
+                    error->argc++;
+                }
+                break;
+            default:
+                break;
+            }
+            if (error->argc >= ERR_MAX_ARGS) {
+                break;
+            }
+        }
+    }
+    va_end(ap);
+
+    /* If we are in debug mode, print out an error message */
+    SDL_LogError(SDL_LOG_CATEGORY_ERROR, "%s", SDL_GetError());
+
+    return -1;
+}
+
+/* This function has a bit more overhead than most error functions
+   so that it supports internationalization and thread-safe errors.
+*/
+static char *
+SDL_GetErrorMsg(char *errstr, unsigned int maxlen)
+{
+    SDL_error *error;
+
+    /* Clear the error string */
+    *errstr = '\0';
+    --maxlen;
+
+    /* Get the thread-safe error, and print it out */
+    error = SDL_GetErrBuf();
+    if (error->error) {
+        const char *fmt;
+        char *msg = errstr;
+        int len;
+        int argi;
+
+        fmt = SDL_LookupString(error->key);
+        argi = 0;
+        while (*fmt && (maxlen > 0)) {
+            if (*fmt == '%') {
+                char tmp[32], *spot = tmp;
+                *spot++ = *fmt++;
+                while ((*fmt == '.' || (*fmt >= '0' && *fmt <= '9'))
+                       && spot < (tmp + SDL_arraysize(tmp) - 2)) {
+                    *spot++ = *fmt++;
+                }
+                *spot++ = *fmt++;
+                *spot++ = '\0';
+                switch (spot[-2]) {
+                case '%':
+                    *msg++ = '%';
+                    maxlen -= 1;
+                    break;
+                case 'c':
+                case 'i':
+                case 'd':
+                case 'u':
+                case 'o':
+                case 'x':
+                case 'X':
+                    len =
+                        SDL_snprintf(msg, maxlen, tmp,
+                                     error->args[argi++].value_i);
+                    msg += len;
+                    maxlen -= len;
+                    break;
+                case 'f':
+                    len =
+                        SDL_snprintf(msg, maxlen, tmp,
+                                     error->args[argi++].value_f);
+                    msg += len;
+                    maxlen -= len;
+                    break;
+                case 'p':
+                    len =
+                        SDL_snprintf(msg, maxlen, tmp,
+                                     error->args[argi++].value_ptr);
+                    msg += len;
+                    maxlen -= len;
+                    break;
+                case 's':
+                    len =
+                        SDL_snprintf(msg, maxlen, tmp,
+                                     SDL_LookupString(error->args[argi++].
+                                                      buf));
+                    msg += len;
+                    maxlen -= len;
+                    break;
+                }
+            } else {
+                *msg++ = *fmt++;
+                maxlen -= 1;
+            }
+        }
+        *msg = 0;               /* NULL terminate the string */
+    }
+    return (errstr);
+}
+
+/* Available for backwards compatibility */
+const char *
+SDL_GetError(void)
+{
+    static char errmsg[SDL_ERRBUFIZE];
+
+    return SDL_GetErrorMsg(errmsg, SDL_ERRBUFIZE);
+}
+
+void
+SDL_ClearError(void)
+{
+    SDL_error *error;
+
+    error = SDL_GetErrBuf();
+    error->error = 0;
+}
+
+/* Very common errors go here */
+int
+SDL_Error(SDL_errorcode code)
+{
+    switch (code) {
+    case SDL_ENOMEM:
+        return SDL_SetError("Out of memory");
+    case SDL_EFREAD:
+        return SDL_SetError("Error reading from datastream");
+    case SDL_EFWRITE:
+        return SDL_SetError("Error writing to datastream");
+    case SDL_EFSEEK:
+        return SDL_SetError("Error seeking in datastream");
+    case SDL_UNSUPPORTED:
+        return SDL_SetError("That operation is not supported");
+    default:
+        return SDL_SetError("Unknown SDL error");
+    }
+}
+
+#ifdef TEST_ERROR
+int
+main(int argc, char *argv[])
+{
+    char buffer[BUFSIZ + 1];
+
+    SDL_SetError("Hi there!");
+    printf("Error 1: %s\n", SDL_GetError());
+    SDL_ClearError();
+    SDL_memset(buffer, '1', BUFSIZ);
+    buffer[BUFSIZ] = 0;
+    SDL_SetError("This is the error: %s (%f)", buffer, 1.0);
+    printf("Error 2: %s\n", SDL_GetError());
+    exit(0);
+}
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/SDL_error_c.h b/Source/3rd Party/sdl/src/SDL_error_c.h
new file mode 100644
index 000000000..98c20c492
--- /dev/null
+++ b/Source/3rd Party/sdl/src/SDL_error_c.h	
@@ -0,0 +1,64 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "./SDL_internal.h"
+
+/* This file defines a structure that carries language-independent
+   error messages
+*/
+
+#ifndef _SDL_error_c_h
+#define _SDL_error_c_h
+
+#define ERR_MAX_STRLEN  128
+#define ERR_MAX_ARGS    5
+
+typedef struct SDL_error
+{
+    /* This is a numeric value corresponding to the current error */
+    int error;
+
+    /* This is a key used to index into a language hashtable containing
+       internationalized versions of the SDL error messages.  If the key
+       is not in the hashtable, or no hashtable is available, the key is
+       used directly as an error message format string.
+     */
+    char key[ERR_MAX_STRLEN];
+
+    /* These are the arguments for the error functions */
+    int argc;
+    union
+    {
+        void *value_ptr;
+#if 0                           /* What is a character anyway?  (UNICODE issues) */
+        unsigned char value_c;
+#endif
+        int value_i;
+        double value_f;
+        char buf[ERR_MAX_STRLEN];
+    } args[ERR_MAX_ARGS];
+} SDL_error;
+
+/* Defined in SDL_thread.c */
+extern SDL_error *SDL_GetErrBuf(void);
+
+#endif /* _SDL_error_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/SDL_hints.c b/Source/3rd Party/sdl/src/SDL_hints.c
new file mode 100644
index 000000000..365459ec7
--- /dev/null
+++ b/Source/3rd Party/sdl/src/SDL_hints.c	
@@ -0,0 +1,217 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "./SDL_internal.h"
+
+#include "SDL_hints.h"
+#include "SDL_error.h"
+
+
+/* Assuming there aren't many hints set and they aren't being queried in
+   critical performance paths, we'll just use linked lists here.
+ */
+typedef struct SDL_HintWatch {
+    SDL_HintCallback callback;
+    void *userdata;
+    struct SDL_HintWatch *next;
+} SDL_HintWatch;
+
+typedef struct SDL_Hint {
+    char *name;
+    char *value;
+    SDL_HintPriority priority;
+    SDL_HintWatch *callbacks;
+    struct SDL_Hint *next;
+} SDL_Hint;
+
+static SDL_Hint *SDL_hints;
+
+SDL_bool
+SDL_SetHintWithPriority(const char *name, const char *value,
+                        SDL_HintPriority priority)
+{
+    const char *env;
+    SDL_Hint *hint;
+    SDL_HintWatch *entry;
+
+    if (!name || !value) {
+        return SDL_FALSE;
+    }
+
+    env = SDL_getenv(name);
+    if (env && priority < SDL_HINT_OVERRIDE) {
+        return SDL_FALSE;
+    }
+
+    for (hint = SDL_hints; hint; hint = hint->next) {
+        if (SDL_strcmp(name, hint->name) == 0) {
+            if (priority < hint->priority) {
+                return SDL_FALSE;
+            }
+            if (!hint->value || !value || SDL_strcmp(hint->value, value) != 0) {
+                for (entry = hint->callbacks; entry; ) {
+                    /* Save the next entry in case this one is deleted */
+                    SDL_HintWatch *next = entry->next;
+                    entry->callback(entry->userdata, name, hint->value, value);
+                    entry = next;
+                }
+                SDL_free(hint->value);
+                hint->value = value ? SDL_strdup(value) : NULL;
+            }
+            hint->priority = priority;
+            return SDL_TRUE;
+        }
+    }
+
+    /* Couldn't find the hint, add a new one */
+    hint = (SDL_Hint *)SDL_malloc(sizeof(*hint));
+    if (!hint) {
+        return SDL_FALSE;
+    }
+    hint->name = SDL_strdup(name);
+    hint->value = value ? SDL_strdup(value) : NULL;
+    hint->priority = priority;
+    hint->callbacks = NULL;
+    hint->next = SDL_hints;
+    SDL_hints = hint;
+    return SDL_TRUE;
+}
+
+SDL_bool
+SDL_SetHint(const char *name, const char *value)
+{
+    return SDL_SetHintWithPriority(name, value, SDL_HINT_NORMAL);
+}
+
+const char *
+SDL_GetHint(const char *name)
+{
+    const char *env;
+    SDL_Hint *hint;
+
+    env = SDL_getenv(name);
+    for (hint = SDL_hints; hint; hint = hint->next) {
+        if (SDL_strcmp(name, hint->name) == 0) {
+            if (!env || hint->priority == SDL_HINT_OVERRIDE) {
+                return hint->value;
+            }
+            break;
+        }
+    }
+    return env;
+}
+
+void
+SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
+{
+    SDL_Hint *hint;
+    SDL_HintWatch *entry;
+    const char *value;
+
+    if (!name || !*name) {
+        SDL_InvalidParamError("name");
+        return;
+    }
+    if (!callback) {
+        SDL_InvalidParamError("callback");
+        return;
+    }
+
+    SDL_DelHintCallback(name, callback, userdata);
+
+    entry = (SDL_HintWatch *)SDL_malloc(sizeof(*entry));
+    entry->callback = callback;
+    entry->userdata = userdata;
+
+    for (hint = SDL_hints; hint; hint = hint->next) {
+        if (SDL_strcmp(name, hint->name) == 0) {
+            break;
+        }
+    }
+    if (!hint) {
+        /* Need to add a hint entry for this watcher */
+        hint = (SDL_Hint *)SDL_malloc(sizeof(*hint));
+        if (!hint) {
+            return;
+        }
+        hint->name = SDL_strdup(name);
+        hint->value = NULL;
+        hint->priority = SDL_HINT_DEFAULT;
+        hint->callbacks = NULL;
+        hint->next = SDL_hints;
+        SDL_hints = hint;
+    }
+
+    /* Add it to the callbacks for this hint */
+    entry->next = hint->callbacks;
+    hint->callbacks = entry;
+
+    /* Now call it with the current value */
+    value = SDL_GetHint(name);
+    callback(userdata, name, value, value);
+}
+
+void
+SDL_DelHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
+{
+    SDL_Hint *hint;
+    SDL_HintWatch *entry, *prev;
+
+    for (hint = SDL_hints; hint; hint = hint->next) {
+        if (SDL_strcmp(name, hint->name) == 0) {
+            prev = NULL;
+            for (entry = hint->callbacks; entry; entry = entry->next) {
+                if (callback == entry->callback && userdata == entry->userdata) {
+                    if (prev) {
+                        prev->next = entry->next;
+                    } else {
+                        hint->callbacks = entry->next;
+                    }
+                    SDL_free(entry);
+                    break;
+                }
+                prev = entry;
+            }
+            return;
+        }
+    }
+}
+
+void SDL_ClearHints(void)
+{
+    SDL_Hint *hint;
+    SDL_HintWatch *entry;
+
+    while (SDL_hints) {
+        hint = SDL_hints;
+        SDL_hints = hint->next;
+
+        SDL_free(hint->name);
+        SDL_free(hint->value);
+        for (entry = hint->callbacks; entry; ) {
+            SDL_HintWatch *freeable = entry;
+            entry = entry->next;
+            SDL_free(freeable);
+        }
+        SDL_free(hint);
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/SDL_internal.h b/Source/3rd Party/sdl/src/SDL_internal.h
new file mode 100644
index 000000000..cb66abd8e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/SDL_internal.h	
@@ -0,0 +1,38 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef _SDL_internal_h
+#define _SDL_internal_h
+
+#include "dynapi/SDL_dynapi.h"
+
+#if SDL_DYNAMIC_API
+#include "dynapi/SDL_dynapi_overrides.h"
+/* force DECLSPEC and SDLCALL off...it's all internal symbols now.
+   These will have actual #defines during SDL_dynapi.c only */
+#define DECLSPEC
+#define SDLCALL
+#endif
+
+#include "SDL_config.h"
+
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/SDL_log.c b/Source/3rd Party/sdl/src/SDL_log.c
new file mode 100644
index 000000000..39aa3e4bf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/SDL_log.c	
@@ -0,0 +1,439 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "./SDL_internal.h"
+
+#if defined(__WIN32__) || defined(__WINRT__)
+#include "core/windows/SDL_windows.h"
+#endif
+
+/* Simple log messages in SDL */
+
+#include "SDL_log.h"
+
+#if HAVE_STDIO_H
+#include <stdio.h>
+#endif
+
+#if defined(__ANDROID__)
+#include <android/log.h>
+#endif
+
+#define DEFAULT_PRIORITY                SDL_LOG_PRIORITY_CRITICAL
+#define DEFAULT_ASSERT_PRIORITY         SDL_LOG_PRIORITY_WARN
+#define DEFAULT_APPLICATION_PRIORITY    SDL_LOG_PRIORITY_INFO
+#define DEFAULT_TEST_PRIORITY           SDL_LOG_PRIORITY_VERBOSE
+
+/* Forward definition of error function */
+extern int SDL_SetError(const char *fmt, ...);
+
+typedef struct SDL_LogLevel
+{
+    int category;
+    SDL_LogPriority priority;
+    struct SDL_LogLevel *next;
+} SDL_LogLevel;
+
+/* The default log output function */
+static void SDL_LogOutput(void *userdata,
+                          int category, SDL_LogPriority priority,
+                          const char *message);
+
+static SDL_LogLevel *SDL_loglevels;
+static SDL_LogPriority SDL_default_priority = DEFAULT_PRIORITY;
+static SDL_LogPriority SDL_assert_priority = DEFAULT_ASSERT_PRIORITY;
+static SDL_LogPriority SDL_application_priority = DEFAULT_APPLICATION_PRIORITY;
+static SDL_LogPriority SDL_test_priority = DEFAULT_TEST_PRIORITY;
+static SDL_LogOutputFunction SDL_log_function = SDL_LogOutput;
+static void *SDL_log_userdata = NULL;
+
+static const char *SDL_priority_prefixes[SDL_NUM_LOG_PRIORITIES] = {
+    NULL,
+    "VERBOSE",
+    "DEBUG",
+    "INFO",
+    "WARN",
+    "ERROR",
+    "CRITICAL"
+};
+
+#ifdef __ANDROID__
+static const char *SDL_category_prefixes[SDL_LOG_CATEGORY_RESERVED1] = {
+    "APP",
+    "ERROR",
+    "SYSTEM",
+    "AUDIO",
+    "VIDEO",
+    "RENDER",
+    "INPUT"
+};
+
+static int SDL_android_priority[SDL_NUM_LOG_PRIORITIES] = {
+    ANDROID_LOG_UNKNOWN,
+    ANDROID_LOG_VERBOSE,
+    ANDROID_LOG_DEBUG,
+    ANDROID_LOG_INFO,
+    ANDROID_LOG_WARN,
+    ANDROID_LOG_ERROR,
+    ANDROID_LOG_FATAL
+};
+#endif /* __ANDROID__ */
+
+
+void
+SDL_LogSetAllPriority(SDL_LogPriority priority)
+{
+    SDL_LogLevel *entry;
+
+    for (entry = SDL_loglevels; entry; entry = entry->next) {
+        entry->priority = priority;
+    }
+    SDL_default_priority = priority;
+    SDL_assert_priority = priority;
+    SDL_application_priority = priority;
+}
+
+void
+SDL_LogSetPriority(int category, SDL_LogPriority priority)
+{
+    SDL_LogLevel *entry;
+
+    for (entry = SDL_loglevels; entry; entry = entry->next) {
+        if (entry->category == category) {
+            entry->priority = priority;
+            return;
+        }
+    }
+
+    /* Create a new entry */
+    entry = (SDL_LogLevel *)SDL_malloc(sizeof(*entry));
+    if (entry) {
+        entry->category = category;
+        entry->priority = priority;
+        entry->next = SDL_loglevels;
+        SDL_loglevels = entry;
+    }
+}
+
+SDL_LogPriority
+SDL_LogGetPriority(int category)
+{
+    SDL_LogLevel *entry;
+
+    for (entry = SDL_loglevels; entry; entry = entry->next) {
+        if (entry->category == category) {
+            return entry->priority;
+        }
+    }
+
+    if (category == SDL_LOG_CATEGORY_TEST) {
+        return SDL_test_priority;
+    } else if (category == SDL_LOG_CATEGORY_APPLICATION) {
+        return SDL_application_priority;
+    } else if (category == SDL_LOG_CATEGORY_ASSERT) {
+        return SDL_assert_priority;
+    } else {
+        return SDL_default_priority;
+    }
+}
+
+void
+SDL_LogResetPriorities(void)
+{
+    SDL_LogLevel *entry;
+
+    while (SDL_loglevels) {
+        entry = SDL_loglevels;
+        SDL_loglevels = entry->next;
+        SDL_free(entry);
+    }
+
+    SDL_default_priority = DEFAULT_PRIORITY;
+    SDL_assert_priority = DEFAULT_ASSERT_PRIORITY;
+    SDL_application_priority = DEFAULT_APPLICATION_PRIORITY;
+    SDL_test_priority = DEFAULT_TEST_PRIORITY;
+}
+
+void
+SDL_Log(const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    SDL_LogMessageV(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, fmt, ap);
+    va_end(ap);
+}
+
+void
+SDL_LogVerbose(int category, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    SDL_LogMessageV(category, SDL_LOG_PRIORITY_VERBOSE, fmt, ap);
+    va_end(ap);
+}
+
+void
+SDL_LogDebug(int category, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    SDL_LogMessageV(category, SDL_LOG_PRIORITY_DEBUG, fmt, ap);
+    va_end(ap);
+}
+
+void
+SDL_LogInfo(int category, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    SDL_LogMessageV(category, SDL_LOG_PRIORITY_INFO, fmt, ap);
+    va_end(ap);
+}
+
+void
+SDL_LogWarn(int category, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    SDL_LogMessageV(category, SDL_LOG_PRIORITY_WARN, fmt, ap);
+    va_end(ap);
+}
+
+void
+SDL_LogError(int category, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    SDL_LogMessageV(category, SDL_LOG_PRIORITY_ERROR, fmt, ap);
+    va_end(ap);
+}
+
+void
+SDL_LogCritical(int category, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    SDL_LogMessageV(category, SDL_LOG_PRIORITY_CRITICAL, fmt, ap);
+    va_end(ap);
+}
+
+void
+SDL_LogMessage(int category, SDL_LogPriority priority, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    SDL_LogMessageV(category, priority, fmt, ap);
+    va_end(ap);
+}
+
+#ifdef __ANDROID__
+static const char *
+GetCategoryPrefix(int category)
+{
+    if (category < SDL_LOG_CATEGORY_RESERVED1) {
+        return SDL_category_prefixes[category];
+    }
+    if (category < SDL_LOG_CATEGORY_CUSTOM) {
+        return "RESERVED";
+    }
+    return "CUSTOM";
+}
+#endif /* __ANDROID__ */
+
+void
+SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap)
+{
+    char *message;
+    size_t len;
+
+    /* Nothing to do if we don't have an output function */
+    if (!SDL_log_function) {
+        return;
+    }
+
+    /* Make sure we don't exceed array bounds */
+    if ((int)priority < 0 || priority >= SDL_NUM_LOG_PRIORITIES) {
+        return;
+    }
+
+    /* See if we want to do anything with this message */
+    if (priority < SDL_LogGetPriority(category)) {
+        return;
+    }
+
+    message = SDL_stack_alloc(char, SDL_MAX_LOG_MESSAGE);
+    if (!message) {
+        return;
+    }
+
+    SDL_vsnprintf(message, SDL_MAX_LOG_MESSAGE, fmt, ap);
+
+    /* Chop off final endline. */
+    len = SDL_strlen(message);
+    if ((len > 0) && (message[len-1] == '\n')) {
+        message[--len] = '\0';
+        if ((len > 0) && (message[len-1] == '\r')) {  /* catch "\r\n", too. */
+            message[--len] = '\0';
+        }
+    }
+
+    SDL_log_function(SDL_log_userdata, category, priority, message);
+    SDL_stack_free(message);
+}
+
+#if defined(__WIN32__)
+/* Flag tracking the attachment of the console: 0=unattached, 1=attached, -1=error */
+static int consoleAttached = 0;
+
+/* Handle to stderr output of console. */
+static HANDLE stderrHandle = NULL;
+#endif
+
+static void
+SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
+              const char *message)
+{
+#if defined(__WIN32__) || defined(__WINRT__)
+    /* Way too many allocations here, urgh */
+    /* Note: One can't call SDL_SetError here, since that function itself logs. */
+    {
+        char *output;
+        size_t length;
+        LPTSTR tstr;
+
+#ifndef __WINRT__
+        BOOL attachResult;
+        DWORD attachError;
+        unsigned long charsWritten; 
+
+        /* Maybe attach console and get stderr handle */
+        if (consoleAttached == 0) {
+            attachResult = AttachConsole(ATTACH_PARENT_PROCESS);
+            if (!attachResult) {
+                    attachError = GetLastError();
+                    if (attachError == ERROR_INVALID_HANDLE) {
+                        OutputDebugString(TEXT("Parent process has no console\r\n"));
+                        consoleAttached = -1;
+                    } else if (attachError == ERROR_GEN_FAILURE) {
+                         OutputDebugString(TEXT("Could not attach to console of parent process\r\n"));
+                         consoleAttached = -1;
+                    } else if (attachError == ERROR_ACCESS_DENIED) {  
+                         /* Already attached */
+                        consoleAttached = 1;
+                    } else {
+                        OutputDebugString(TEXT("Error attaching console\r\n"));
+                        consoleAttached = -1;
+                    }
+                } else {
+                    /* Newly attached */
+                    consoleAttached = 1;
+                }
+			
+                if (consoleAttached == 1) {
+                        stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
+                }
+        }
+#endif /* ifndef __WINRT__ */
+
+        length = SDL_strlen(SDL_priority_prefixes[priority]) + 2 + SDL_strlen(message) + 1 + 1 + 1;
+        output = SDL_stack_alloc(char, length);
+        SDL_snprintf(output, length, "%s: %s\r\n", SDL_priority_prefixes[priority], message);
+        tstr = WIN_UTF8ToString(output);
+        
+        /* Output to debugger */
+        OutputDebugString(tstr);
+       
+#ifndef __WINRT__
+        /* Screen output to stderr, if console was attached. */
+        if (consoleAttached == 1) {
+                if (!WriteConsole(stderrHandle, tstr, lstrlen(tstr), &charsWritten, NULL)) {
+                    OutputDebugString(TEXT("Error calling WriteConsole\r\n"));
+                }
+                if (charsWritten == ERROR_NOT_ENOUGH_MEMORY) {
+                    OutputDebugString(TEXT("Insufficient heap memory to write message\r\n"));
+                }
+        }
+#endif /* ifndef __WINRT__ */
+
+        SDL_free(tstr);
+        SDL_stack_free(output);
+    }
+#elif defined(__ANDROID__)
+    {
+        char tag[32];
+
+        SDL_snprintf(tag, SDL_arraysize(tag), "SDL/%s", GetCategoryPrefix(category));
+        __android_log_write(SDL_android_priority[priority], tag, message);
+    }
+#elif defined(__APPLE__) && defined(SDL_VIDEO_DRIVER_COCOA)
+    /* Technically we don't need SDL_VIDEO_DRIVER_COCOA, but that's where this function is defined for now.
+    */
+    extern void SDL_NSLog(const char *text);
+    {
+        char *text;
+
+        text = SDL_stack_alloc(char, SDL_MAX_LOG_MESSAGE);
+        if (text) {
+            SDL_snprintf(text, SDL_MAX_LOG_MESSAGE, "%s: %s", SDL_priority_prefixes[priority], message);
+            SDL_NSLog(text);
+            SDL_stack_free(text);
+            return;
+        }
+    }
+#elif defined(__PSP__)
+    {
+        FILE*        pFile;
+        pFile = fopen ("SDL_Log.txt", "a");
+        fprintf(pFile, "%s: %s\n", SDL_priority_prefixes[priority], message);
+        fclose (pFile);
+    }
+#endif
+#if HAVE_STDIO_H
+    fprintf(stderr, "%s: %s\n", SDL_priority_prefixes[priority], message);
+#endif
+}
+
+void
+SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata)
+{
+    if (callback) {
+        *callback = SDL_log_function;
+    }
+    if (userdata) {
+        *userdata = SDL_log_userdata;
+    }
+}
+
+void
+SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata)
+{
+    SDL_log_function = callback;
+    SDL_log_userdata = userdata;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/atomic/SDL_atomic.c b/Source/3rd Party/sdl/src/atomic/SDL_atomic.c
new file mode 100644
index 000000000..be3f4002b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/atomic/SDL_atomic.c	
@@ -0,0 +1,221 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_atomic.h"
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#include <intrin.h>
+#define HAVE_MSC_ATOMICS 1
+#endif
+
+#if defined(__MACOSX__)  /* !!! FIXME: should we favor gcc atomics? */
+#include <libkern/OSAtomic.h>
+#endif
+
+/*
+  If any of the operations are not provided then we must emulate some
+  of them. That means we need a nice implementation of spin locks
+  that avoids the "one big lock" problem. We use a vector of spin
+  locks and pick which one to use based on the address of the operand
+  of the function.
+
+  To generate the index of the lock we first shift by 3 bits to get
+  rid on the zero bits that result from 32 and 64 bit allignment of
+  data. We then mask off all but 5 bits and use those 5 bits as an
+  index into the table.
+
+  Picking the lock this way insures that accesses to the same data at
+  the same time will go to the same lock. OTOH, accesses to different
+  data have only a 1/32 chance of hitting the same lock. That should
+  pretty much eliminate the chances of several atomic operations on
+  different data from waiting on the same "big lock". If it isn't
+  then the table of locks can be expanded to a new size so long as
+  the new size is a power of two.
+
+  Contributed by Bob Pendleton, bob@pendleton.com
+*/
+
+#if !defined(HAVE_MSC_ATOMICS) && !defined(HAVE_GCC_ATOMICS) && !defined(__MACOSX__)
+#define EMULATE_CAS 1
+#endif
+
+#if EMULATE_CAS
+static SDL_SpinLock locks[32];
+
+static SDL_INLINE void
+enterLock(void *a)
+{
+    uintptr_t index = ((((uintptr_t)a) >> 3) & 0x1f);
+
+    SDL_AtomicLock(&locks[index]);
+}
+
+static SDL_INLINE void
+leaveLock(void *a)
+{
+    uintptr_t index = ((((uintptr_t)a) >> 3) & 0x1f);
+
+    SDL_AtomicUnlock(&locks[index]);
+}
+#endif
+
+
+SDL_bool
+SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval)
+{
+#ifdef HAVE_MSC_ATOMICS
+    return (_InterlockedCompareExchange((long*)&a->value, (long)newval, (long)oldval) == (long)oldval);
+#elif defined(__MACOSX__)  /* !!! FIXME: should we favor gcc atomics? */
+    return (SDL_bool) OSAtomicCompareAndSwap32Barrier(oldval, newval, &a->value);
+#elif defined(HAVE_GCC_ATOMICS)
+    return (SDL_bool) __sync_bool_compare_and_swap(&a->value, oldval, newval);
+#elif EMULATE_CAS
+    SDL_bool retval = SDL_FALSE;
+
+    enterLock(a);
+    if (a->value == oldval) {
+        a->value = newval;
+        retval = SDL_TRUE;
+    }
+    leaveLock(a);
+
+    return retval;
+#else
+    #error Please define your platform.
+#endif
+}
+
+SDL_bool
+SDL_AtomicCASPtr(void **a, void *oldval, void *newval)
+{
+#if defined(HAVE_MSC_ATOMICS) && (_M_IX86)
+    return (_InterlockedCompareExchange((long*)a, (long)newval, (long)oldval) == (long)oldval);
+#elif defined(HAVE_MSC_ATOMICS) && (!_M_IX86)
+    return (_InterlockedCompareExchangePointer(a, newval, oldval) == oldval);
+#elif defined(__MACOSX__) && defined(__LP64__)   /* !!! FIXME: should we favor gcc atomics? */
+    return (SDL_bool) OSAtomicCompareAndSwap64Barrier((int64_t)oldval, (int64_t)newval, (int64_t*) a);
+#elif defined(__MACOSX__) && !defined(__LP64__)  /* !!! FIXME: should we favor gcc atomics? */
+    return (SDL_bool) OSAtomicCompareAndSwap32Barrier((int32_t)oldval, (int32_t)newval, (int32_t*) a);
+#elif defined(HAVE_GCC_ATOMICS)
+    return __sync_bool_compare_and_swap(a, oldval, newval);
+#elif EMULATE_CAS
+    SDL_bool retval = SDL_FALSE;
+
+    enterLock(a);
+    if (*a == oldval) {
+        *a = newval;
+        retval = SDL_TRUE;
+    }
+    leaveLock(a);
+
+    return retval;
+#else
+    #error Please define your platform.
+#endif
+}
+
+int
+SDL_AtomicSet(SDL_atomic_t *a, int v)
+{
+#ifdef HAVE_MSC_ATOMICS
+    return _InterlockedExchange((long*)&a->value, v);
+#elif defined(HAVE_GCC_ATOMICS)
+    return __sync_lock_test_and_set(&a->value, v);
+#else
+    int value;
+    do {
+        value = a->value;
+    } while (!SDL_AtomicCAS(a, value, v));
+    return value;
+#endif
+}
+
+void*
+SDL_AtomicSetPtr(void **a, void *v)
+{
+#if defined(HAVE_MSC_ATOMICS) && (_M_IX86)
+    return (void *) _InterlockedExchange((long *)a, (long) v);
+#elif defined(HAVE_MSC_ATOMICS) && (!_M_IX86)
+    return _InterlockedExchangePointer(a, v);
+#elif defined(HAVE_GCC_ATOMICS)
+    return __sync_lock_test_and_set(a, v);
+#else
+    void *value;
+    do {
+        value = *a;
+    } while (!SDL_AtomicCASPtr(a, value, v));
+    return value;
+#endif
+}
+
+int
+SDL_AtomicAdd(SDL_atomic_t *a, int v)
+{
+#ifdef HAVE_MSC_ATOMICS
+    return _InterlockedExchangeAdd((long*)&a->value, v);
+#elif defined(HAVE_GCC_ATOMICS)
+    return __sync_fetch_and_add(&a->value, v);
+#else
+    int value;
+    do {
+        value = a->value;
+    } while (!SDL_AtomicCAS(a, value, (value + v)));
+    return value;
+#endif
+}
+
+int
+SDL_AtomicGet(SDL_atomic_t *a)
+{
+    int value;
+    do {
+        value = a->value;
+    } while (!SDL_AtomicCAS(a, value, value));
+    return value;
+}
+
+void *
+SDL_AtomicGetPtr(void **a)
+{
+    void *value;
+    do {
+        value = *a;
+    } while (!SDL_AtomicCASPtr(a, value, value));
+    return value;
+}
+
+#ifdef __thumb__
+#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__)
+__asm__(
+"   .align 2\n"
+"   .globl _SDL_MemoryBarrierRelease\n"
+"   .globl _SDL_MemoryBarrierAcquire\n"
+"_SDL_MemoryBarrierRelease:\n"
+"_SDL_MemoryBarrierAcquire:\n"
+"   mov r0, #0\n"
+"   mcr p15, 0, r0, c7, c10, 5\n"
+"   bx lr\n"
+);
+#endif
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/atomic/SDL_spinlock.c b/Source/3rd Party/sdl/src/atomic/SDL_spinlock.c
new file mode 100644
index 000000000..2d8446dc5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/atomic/SDL_spinlock.c	
@@ -0,0 +1,126 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#if defined(__WIN32__) || defined(__WINRT__)
+#include "../core/windows/SDL_windows.h"
+#endif
+
+#include "SDL_atomic.h"
+#include "SDL_mutex.h"
+#include "SDL_timer.h"
+
+
+/* This function is where all the magic happens... */
+SDL_bool
+SDL_AtomicTryLock(SDL_SpinLock *lock)
+{
+#if SDL_ATOMIC_DISABLED
+    /* Terrible terrible damage */
+    static SDL_mutex *_spinlock_mutex;
+
+    if (!_spinlock_mutex) {
+        /* Race condition on first lock... */
+        _spinlock_mutex = SDL_CreateMutex();
+    }
+    SDL_LockMutex(_spinlock_mutex);
+    if (*lock == 0) {
+        *lock = 1;
+        SDL_UnlockMutex(_spinlock_mutex);
+        return SDL_TRUE;
+    } else {
+        SDL_UnlockMutex(_spinlock_mutex);
+        return SDL_FALSE;
+    }
+
+#elif defined(_MSC_VER)
+    SDL_COMPILE_TIME_ASSERT(locksize, sizeof(*lock) == sizeof(long));
+    return (InterlockedExchange((long*)lock, 1) == 0);
+
+#elif HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET
+    return (__sync_lock_test_and_set(lock, 1) == 0);
+
+#elif defined(__GNUC__) && defined(__arm__) && \
+        (defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || \
+         defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5TE__) || \
+         defined(__ARM_ARCH_5TEJ__))
+    int result;
+    __asm__ __volatile__ (
+        "swp %0, %1, [%2]\n"
+        : "=&r,&r" (result) : "r,0" (1), "r,r" (lock) : "memory");
+    return (result == 0);
+
+#elif defined(__GNUC__) && defined(__arm__)
+    int result;
+    __asm__ __volatile__ (
+        "ldrex %0, [%2]\nteq   %0, #0\nstrexeq %0, %1, [%2]"
+        : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory");
+    return (result == 0);
+
+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+    int result;
+    __asm__ __volatile__(
+        "lock ; xchgl %0, (%1)\n"
+        : "=r" (result) : "r" (lock), "0" (1) : "cc", "memory");
+    return (result == 0);
+
+#elif defined(__MACOSX__) || defined(__IPHONEOS__)
+    /* Maybe used for PowerPC, but the Intel asm or gcc atomics are favored. */
+    return OSAtomicCompareAndSwap32Barrier(0, 1, lock);
+
+#elif HAVE_PTHREAD_SPINLOCK
+    /* pthread instructions */
+    return (pthread_spin_trylock(lock) == 0);
+
+#else
+#error Please implement for your platform.
+    return SDL_FALSE;
+#endif
+}
+
+void
+SDL_AtomicLock(SDL_SpinLock *lock)
+{
+    /* FIXME: Should we have an eventual timeout? */
+    while (!SDL_AtomicTryLock(lock)) {
+        SDL_Delay(0);
+    }
+}
+
+void
+SDL_AtomicUnlock(SDL_SpinLock *lock)
+{
+#if defined(_MSC_VER)
+    _ReadWriteBarrier();
+    *lock = 0;
+
+#elif HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET
+    __sync_lock_release(lock);
+
+#elif HAVE_PTHREAD_SPINLOCK
+    pthread_spin_unlock(lock);
+
+#else
+    *lock = 0;
+#endif
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_audio.c b/Source/3rd Party/sdl/src/audio/SDL_audio.c
new file mode 100644
index 000000000..40cb53923
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_audio.c	
@@ -0,0 +1,1293 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Allow access to a raw mixing buffer */
+
+#include "SDL.h"
+#include "SDL_audio.h"
+#include "SDL_audio_c.h"
+#include "SDL_audiomem.h"
+#include "SDL_sysaudio.h"
+
+#define _THIS SDL_AudioDevice *_this
+
+static SDL_AudioDriver current_audio;
+static SDL_AudioDevice *open_devices[16];
+
+/* !!! FIXME: These are wordy and unlocalized... */
+#define DEFAULT_OUTPUT_DEVNAME "System audio output device"
+#define DEFAULT_INPUT_DEVNAME "System audio capture device"
+
+
+/*
+ * Not all of these will be compiled and linked in, but it's convenient
+ *  to have a complete list here and saves yet-another block of #ifdefs...
+ *  Please see bootstrap[], below, for the actual #ifdef mess.
+ */
+extern AudioBootStrap BSD_AUDIO_bootstrap;
+extern AudioBootStrap DSP_bootstrap;
+extern AudioBootStrap ALSA_bootstrap;
+extern AudioBootStrap PULSEAUDIO_bootstrap;
+extern AudioBootStrap QSAAUDIO_bootstrap;
+extern AudioBootStrap SUNAUDIO_bootstrap;
+extern AudioBootStrap ARTS_bootstrap;
+extern AudioBootStrap ESD_bootstrap;
+extern AudioBootStrap NAS_bootstrap;
+extern AudioBootStrap XAUDIO2_bootstrap;
+extern AudioBootStrap DSOUND_bootstrap;
+extern AudioBootStrap WINMM_bootstrap;
+extern AudioBootStrap PAUDIO_bootstrap;
+extern AudioBootStrap HAIKUAUDIO_bootstrap;
+extern AudioBootStrap COREAUDIO_bootstrap;
+extern AudioBootStrap SNDMGR_bootstrap;
+extern AudioBootStrap DISKAUD_bootstrap;
+extern AudioBootStrap DUMMYAUD_bootstrap;
+extern AudioBootStrap DCAUD_bootstrap;
+extern AudioBootStrap DART_bootstrap;
+extern AudioBootStrap NDSAUD_bootstrap;
+extern AudioBootStrap FUSIONSOUND_bootstrap;
+extern AudioBootStrap ANDROIDAUD_bootstrap;
+extern AudioBootStrap PSPAUD_bootstrap;
+extern AudioBootStrap SNDIO_bootstrap;
+
+/* Available audio drivers */
+static const AudioBootStrap *const bootstrap[] = {
+#if SDL_AUDIO_DRIVER_PULSEAUDIO
+    &PULSEAUDIO_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_ALSA
+    &ALSA_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_SNDIO
+    &SNDIO_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_BSD
+    &BSD_AUDIO_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_OSS
+    &DSP_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_QSA
+    &QSAAUDIO_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_SUNAUDIO
+    &SUNAUDIO_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_ARTS
+    &ARTS_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_ESD
+    &ESD_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_NAS
+    &NAS_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_XAUDIO2
+    &XAUDIO2_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_DSOUND
+    &DSOUND_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_WINMM
+    &WINMM_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_PAUDIO
+    &PAUDIO_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_HAIKU
+    &HAIKUAUDIO_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_COREAUDIO
+    &COREAUDIO_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_DISK
+    &DISKAUD_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_DUMMY
+    &DUMMYAUD_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_FUSIONSOUND
+    &FUSIONSOUND_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_ANDROID
+    &ANDROIDAUD_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_PSP
+    &PSPAUD_bootstrap,
+#endif
+    NULL
+};
+
+static SDL_AudioDevice *
+get_audio_device(SDL_AudioDeviceID id)
+{
+    id--;
+    if ((id >= SDL_arraysize(open_devices)) || (open_devices[id] == NULL)) {
+        SDL_SetError("Invalid audio device ID");
+        return NULL;
+    }
+
+    return open_devices[id];
+}
+
+
+/* stubs for audio drivers that don't need a specific entry point... */
+static void
+SDL_AudioDetectDevices_Default(int iscapture, SDL_AddAudioDevice addfn)
+{                               /* no-op. */
+}
+
+static void
+SDL_AudioThreadInit_Default(_THIS)
+{                               /* no-op. */
+}
+
+static void
+SDL_AudioWaitDevice_Default(_THIS)
+{                               /* no-op. */
+}
+
+static void
+SDL_AudioPlayDevice_Default(_THIS)
+{                               /* no-op. */
+}
+
+static Uint8 *
+SDL_AudioGetDeviceBuf_Default(_THIS)
+{
+    return NULL;
+}
+
+static void
+SDL_AudioWaitDone_Default(_THIS)
+{                               /* no-op. */
+}
+
+static void
+SDL_AudioCloseDevice_Default(_THIS)
+{                               /* no-op. */
+}
+
+static void
+SDL_AudioDeinitialize_Default(void)
+{                               /* no-op. */
+}
+
+static int
+SDL_AudioOpenDevice_Default(_THIS, const char *devname, int iscapture)
+{
+    return -1;
+}
+
+static void
+SDL_AudioLockDevice_Default(SDL_AudioDevice * device)
+{
+    if (device->thread && (SDL_ThreadID() == device->threadid)) {
+        return;
+    }
+    SDL_LockMutex(device->mixer_lock);
+}
+
+static void
+SDL_AudioUnlockDevice_Default(SDL_AudioDevice * device)
+{
+    if (device->thread && (SDL_ThreadID() == device->threadid)) {
+        return;
+    }
+    SDL_UnlockMutex(device->mixer_lock);
+}
+
+
+static void
+finalize_audio_entry_points(void)
+{
+    /*
+     * Fill in stub functions for unused driver entry points. This lets us
+     *  blindly call them without having to check for validity first.
+     */
+
+#define FILL_STUB(x) \
+        if (current_audio.impl.x == NULL) { \
+            current_audio.impl.x = SDL_Audio##x##_Default; \
+        }
+    FILL_STUB(DetectDevices);
+    FILL_STUB(OpenDevice);
+    FILL_STUB(ThreadInit);
+    FILL_STUB(WaitDevice);
+    FILL_STUB(PlayDevice);
+    FILL_STUB(GetDeviceBuf);
+    FILL_STUB(WaitDone);
+    FILL_STUB(CloseDevice);
+    FILL_STUB(LockDevice);
+    FILL_STUB(UnlockDevice);
+    FILL_STUB(Deinitialize);
+#undef FILL_STUB
+}
+
+/* Streaming functions (for when the input and output buffer sizes are different) */
+/* Write [length] bytes from buf into the streamer */
+static void
+SDL_StreamWrite(SDL_AudioStreamer * stream, Uint8 * buf, int length)
+{
+    int i;
+
+    for (i = 0; i < length; ++i) {
+        stream->buffer[stream->write_pos] = buf[i];
+        ++stream->write_pos;
+    }
+}
+
+/* Read [length] bytes out of the streamer into buf */
+static void
+SDL_StreamRead(SDL_AudioStreamer * stream, Uint8 * buf, int length)
+{
+    int i;
+
+    for (i = 0; i < length; ++i) {
+        buf[i] = stream->buffer[stream->read_pos];
+        ++stream->read_pos;
+    }
+}
+
+static int
+SDL_StreamLength(SDL_AudioStreamer * stream)
+{
+    return (stream->write_pos - stream->read_pos) % stream->max_len;
+}
+
+/* Initialize the stream by allocating the buffer and setting the read/write heads to the beginning */
+#if 0
+static int
+SDL_StreamInit(SDL_AudioStreamer * stream, int max_len, Uint8 silence)
+{
+    /* First try to allocate the buffer */
+    stream->buffer = (Uint8 *) SDL_malloc(max_len);
+    if (stream->buffer == NULL) {
+        return -1;
+    }
+
+    stream->max_len = max_len;
+    stream->read_pos = 0;
+    stream->write_pos = 0;
+
+    /* Zero out the buffer */
+    SDL_memset(stream->buffer, silence, max_len);
+
+    return 0;
+}
+#endif
+
+/* Deinitialize the stream simply by freeing the buffer */
+static void
+SDL_StreamDeinit(SDL_AudioStreamer * stream)
+{
+    SDL_free(stream->buffer);
+}
+
+#if defined(ANDROID)
+#include <android/log.h>
+#endif
+
+/* The general mixing thread function */
+int SDLCALL
+SDL_RunAudio(void *devicep)
+{
+    SDL_AudioDevice *device = (SDL_AudioDevice *) devicep;
+    Uint8 *stream;
+    int stream_len;
+    void *udata;
+    void (SDLCALL * fill) (void *userdata, Uint8 * stream, int len);
+    Uint32 delay;
+    /* For streaming when the buffer sizes don't match up */
+    Uint8 *istream;
+    int istream_len = 0;
+
+    /* The audio mixing is always a high priority thread */
+    SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
+
+    /* Perform any thread setup */
+    device->threadid = SDL_ThreadID();
+    current_audio.impl.ThreadInit(device);
+
+    /* Set up the mixing function */
+    fill = device->spec.callback;
+    udata = device->spec.userdata;
+
+    /* By default do not stream */
+    device->use_streamer = 0;
+
+    if (device->convert.needed) {
+#if 0                           /* !!! FIXME: I took len_div out of the structure. Use rate_incr instead? */
+        /* If the result of the conversion alters the length, i.e. resampling is being used, use the streamer */
+        if (device->convert.len_mult != 1 || device->convert.len_div != 1) {
+            /* The streamer's maximum length should be twice whichever is larger: spec.size or len_cvt */
+            stream_max_len = 2 * device->spec.size;
+            if (device->convert.len_mult > device->convert.len_div) {
+                stream_max_len *= device->convert.len_mult;
+                stream_max_len /= device->convert.len_div;
+            }
+            if (SDL_StreamInit(&device->streamer, stream_max_len, silence) <
+                0)
+                return -1;
+            device->use_streamer = 1;
+
+            /* istream_len should be the length of what we grab from the callback and feed to conversion,
+               so that we get close to spec_size. I.e. we want device.spec_size = istream_len * u / d
+             */
+            istream_len =
+                device->spec.size * device->convert.len_div /
+                device->convert.len_mult;
+        }
+#endif
+        stream_len = device->convert.len;
+    } else {
+        stream_len = device->spec.size;
+    }
+
+    /* Calculate the delay while paused */
+    delay = ((device->spec.samples * 1000) / device->spec.freq);
+
+    /* Determine if the streamer is necessary here */
+    if (device->use_streamer == 1) {
+        /* This code is almost the same as the old code. The difference is, instead of reading
+           directly from the callback into "stream", then converting and sending the audio off,
+           we go: callback -> "istream" -> (conversion) -> streamer -> stream -> device.
+           However, reading and writing with streamer are done separately:
+           - We only call the callback and write to the streamer when the streamer does not
+           contain enough samples to output to the device.
+           - We only read from the streamer and tell the device to play when the streamer
+           does have enough samples to output.
+           This allows us to perform resampling in the conversion step, where the output of the
+           resampling process can be any number. We will have to see what a good size for the
+           stream's maximum length is, but I suspect 2*max(len_cvt, stream_len) is a good figure.
+         */
+        while (device->enabled) {
+
+            if (device->paused) {
+                SDL_Delay(delay);
+                continue;
+            }
+
+            /* Only read in audio if the streamer doesn't have enough already (if it does not have enough samples to output) */
+            if (SDL_StreamLength(&device->streamer) < stream_len) {
+                /* Set up istream */
+                if (device->convert.needed) {
+                    if (device->convert.buf) {
+                        istream = device->convert.buf;
+                    } else {
+                        continue;
+                    }
+                } else {
+/* FIXME: Ryan, this is probably wrong.  I imagine we don't want to get
+ * a device buffer both here and below in the stream output.
+ */
+                    istream = current_audio.impl.GetDeviceBuf(device);
+                    if (istream == NULL) {
+                        istream = device->fake_stream;
+                    }
+                }
+
+                /* Read from the callback into the _input_ stream */
+                SDL_LockMutex(device->mixer_lock);
+                (*fill) (udata, istream, istream_len);
+                SDL_UnlockMutex(device->mixer_lock);
+
+                /* Convert the audio if necessary and write to the streamer */
+                if (device->convert.needed) {
+                    SDL_ConvertAudio(&device->convert);
+                    if (istream == NULL) {
+                        istream = device->fake_stream;
+                    }
+                    /* SDL_memcpy(istream, device->convert.buf, device->convert.len_cvt); */
+                    SDL_StreamWrite(&device->streamer, device->convert.buf,
+                                    device->convert.len_cvt);
+                } else {
+                    SDL_StreamWrite(&device->streamer, istream, istream_len);
+                }
+            }
+
+            /* Only output audio if the streamer has enough to output */
+            if (SDL_StreamLength(&device->streamer) >= stream_len) {
+                /* Set up the output stream */
+                if (device->convert.needed) {
+                    if (device->convert.buf) {
+                        stream = device->convert.buf;
+                    } else {
+                        continue;
+                    }
+                } else {
+                    stream = current_audio.impl.GetDeviceBuf(device);
+                    if (stream == NULL) {
+                        stream = device->fake_stream;
+                    }
+                }
+
+                /* Now read from the streamer */
+                SDL_StreamRead(&device->streamer, stream, stream_len);
+
+                /* Ready current buffer for play and change current buffer */
+                if (stream != device->fake_stream) {
+                    current_audio.impl.PlayDevice(device);
+                    /* Wait for an audio buffer to become available */
+                    current_audio.impl.WaitDevice(device);
+                } else {
+                    SDL_Delay(delay);
+                }
+            }
+
+        }
+    } else {
+        /* Otherwise, do not use the streamer. This is the old code. */
+        const int silence = (int) device->spec.silence;
+
+        /* Loop, filling the audio buffers */
+        while (device->enabled) {
+
+            /* Fill the current buffer with sound */
+            if (device->convert.needed) {
+                if (device->convert.buf) {
+                    stream = device->convert.buf;
+                } else {
+                    continue;
+                }
+            } else {
+                stream = current_audio.impl.GetDeviceBuf(device);
+                if (stream == NULL) {
+                    stream = device->fake_stream;
+                }
+            }
+
+            SDL_LockMutex(device->mixer_lock);
+            if (device->paused) {
+                SDL_memset(stream, silence, stream_len);
+            } else {
+                (*fill) (udata, stream, stream_len);
+            }
+            SDL_UnlockMutex(device->mixer_lock);
+
+            /* Convert the audio if necessary */
+            if (device->convert.needed) {
+                SDL_ConvertAudio(&device->convert);
+                stream = current_audio.impl.GetDeviceBuf(device);
+                if (stream == NULL) {
+                    stream = device->fake_stream;
+                }
+                SDL_memcpy(stream, device->convert.buf,
+                           device->convert.len_cvt);
+            }
+
+            /* Ready current buffer for play and change current buffer */
+            if (stream != device->fake_stream) {
+                current_audio.impl.PlayDevice(device);
+                /* Wait for an audio buffer to become available */
+                current_audio.impl.WaitDevice(device);
+            } else {
+                SDL_Delay(delay);
+            }
+        }
+    }
+
+    /* Wait for the audio to drain.. */
+    current_audio.impl.WaitDone(device);
+
+    /* If necessary, deinit the streamer */
+    if (device->use_streamer == 1)
+        SDL_StreamDeinit(&device->streamer);
+
+    return (0);
+}
+
+
+static SDL_AudioFormat
+SDL_ParseAudioFormat(const char *string)
+{
+#define CHECK_FMT_STRING(x) if (SDL_strcmp(string, #x) == 0) return AUDIO_##x
+    CHECK_FMT_STRING(U8);
+    CHECK_FMT_STRING(S8);
+    CHECK_FMT_STRING(U16LSB);
+    CHECK_FMT_STRING(S16LSB);
+    CHECK_FMT_STRING(U16MSB);
+    CHECK_FMT_STRING(S16MSB);
+    CHECK_FMT_STRING(U16SYS);
+    CHECK_FMT_STRING(S16SYS);
+    CHECK_FMT_STRING(U16);
+    CHECK_FMT_STRING(S16);
+    CHECK_FMT_STRING(S32LSB);
+    CHECK_FMT_STRING(S32MSB);
+    CHECK_FMT_STRING(S32SYS);
+    CHECK_FMT_STRING(S32);
+    CHECK_FMT_STRING(F32LSB);
+    CHECK_FMT_STRING(F32MSB);
+    CHECK_FMT_STRING(F32SYS);
+    CHECK_FMT_STRING(F32);
+#undef CHECK_FMT_STRING
+    return 0;
+}
+
+int
+SDL_GetNumAudioDrivers(void)
+{
+    return (SDL_arraysize(bootstrap) - 1);
+}
+
+const char *
+SDL_GetAudioDriver(int index)
+{
+    if (index >= 0 && index < SDL_GetNumAudioDrivers()) {
+        return (bootstrap[index]->name);
+    }
+    return (NULL);
+}
+
+int
+SDL_AudioInit(const char *driver_name)
+{
+    int i = 0;
+    int initialized = 0;
+    int tried_to_init = 0;
+
+    if (SDL_WasInit(SDL_INIT_AUDIO)) {
+        SDL_AudioQuit();        /* shutdown driver if already running. */
+    }
+
+    SDL_memset(&current_audio, '\0', sizeof(current_audio));
+    SDL_memset(open_devices, '\0', sizeof(open_devices));
+
+    /* Select the proper audio driver */
+    if (driver_name == NULL) {
+        driver_name = SDL_getenv("SDL_AUDIODRIVER");
+    }
+
+    for (i = 0; (!initialized) && (bootstrap[i]); ++i) {
+        /* make sure we should even try this driver before doing so... */
+        const AudioBootStrap *backend = bootstrap[i];
+        if ((driver_name && (SDL_strncasecmp(backend->name, driver_name, SDL_strlen(driver_name)) != 0)) ||
+            (!driver_name && backend->demand_only)) {
+            continue;
+        }
+
+        tried_to_init = 1;
+        SDL_memset(&current_audio, 0, sizeof(current_audio));
+        current_audio.name = backend->name;
+        current_audio.desc = backend->desc;
+        initialized = backend->init(&current_audio.impl);
+    }
+
+    if (!initialized) {
+        /* specific drivers will set the error message if they fail... */
+        if (!tried_to_init) {
+            if (driver_name) {
+                SDL_SetError("Audio target '%s' not available", driver_name);
+            } else {
+                SDL_SetError("No available audio device");
+            }
+        }
+
+        SDL_memset(&current_audio, 0, sizeof(current_audio));
+        return (-1);            /* No driver was available, so fail. */
+    }
+
+    finalize_audio_entry_points();
+
+    return (0);
+}
+
+/*
+ * Get the current audio driver name
+ */
+const char *
+SDL_GetCurrentAudioDriver()
+{
+    return current_audio.name;
+}
+
+static void
+free_device_list(char ***devices, int *devCount)
+{
+    int i = *devCount;
+    if ((i > 0) && (*devices != NULL)) {
+        while (i--) {
+            SDL_free((*devices)[i]);
+        }
+    }
+
+    SDL_free(*devices);
+
+    *devices = NULL;
+    *devCount = 0;
+}
+
+static
+void SDL_AddCaptureAudioDevice(const char *_name)
+{
+    char *name = NULL;
+    void *ptr = SDL_realloc(current_audio.inputDevices,
+                          (current_audio.inputDeviceCount+1) * sizeof(char*));
+    if (ptr == NULL) {
+        return;  /* oh well. */
+    }
+
+    current_audio.inputDevices = (char **) ptr;
+    name = SDL_strdup(_name);  /* if this returns NULL, that's okay. */
+    current_audio.inputDevices[current_audio.inputDeviceCount++] = name;
+}
+
+static
+void SDL_AddOutputAudioDevice(const char *_name)
+{
+    char *name = NULL;
+    void *ptr = SDL_realloc(current_audio.outputDevices,
+                          (current_audio.outputDeviceCount+1) * sizeof(char*));
+    if (ptr == NULL) {
+        return;  /* oh well. */
+    }
+
+    current_audio.outputDevices = (char **) ptr;
+    name = SDL_strdup(_name);  /* if this returns NULL, that's okay. */
+    current_audio.outputDevices[current_audio.outputDeviceCount++] = name;
+}
+
+
+int
+SDL_GetNumAudioDevices(int iscapture)
+{
+    int retval = 0;
+
+    if (!SDL_WasInit(SDL_INIT_AUDIO)) {
+        return -1;
+    }
+
+    if ((iscapture) && (!current_audio.impl.HasCaptureSupport)) {
+        return 0;
+    }
+
+    if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) {
+        return 1;
+    }
+
+    if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) {
+        return 1;
+    }
+
+    if (iscapture) {
+        free_device_list(&current_audio.inputDevices,
+                         &current_audio.inputDeviceCount);
+        current_audio.impl.DetectDevices(iscapture, SDL_AddCaptureAudioDevice);
+        retval = current_audio.inputDeviceCount;
+    } else {
+        free_device_list(&current_audio.outputDevices,
+                         &current_audio.outputDeviceCount);
+        current_audio.impl.DetectDevices(iscapture, SDL_AddOutputAudioDevice);
+        retval = current_audio.outputDeviceCount;
+    }
+
+    return retval;
+}
+
+
+const char *
+SDL_GetAudioDeviceName(int index, int iscapture)
+{
+    if (!SDL_WasInit(SDL_INIT_AUDIO)) {
+        SDL_SetError("Audio subsystem is not initialized");
+        return NULL;
+    }
+
+    if ((iscapture) && (!current_audio.impl.HasCaptureSupport)) {
+        SDL_SetError("No capture support");
+        return NULL;
+    }
+
+    if (index < 0) {
+        goto no_such_device;
+    }
+
+    if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) {
+        if (index > 0) {
+            goto no_such_device;
+        }
+        return DEFAULT_INPUT_DEVNAME;
+    }
+
+    if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) {
+        if (index > 0) {
+            goto no_such_device;
+        }
+        return DEFAULT_OUTPUT_DEVNAME;
+    }
+
+    if (iscapture) {
+        if (index >= current_audio.inputDeviceCount) {
+            goto no_such_device;
+        }
+        return current_audio.inputDevices[index];
+    } else {
+        if (index >= current_audio.outputDeviceCount) {
+            goto no_such_device;
+        }
+        return current_audio.outputDevices[index];
+    }
+
+no_such_device:
+    SDL_SetError("No such device");
+    return NULL;
+}
+
+
+static void
+close_audio_device(SDL_AudioDevice * device)
+{
+    device->enabled = 0;
+    if (device->thread != NULL) {
+        SDL_WaitThread(device->thread, NULL);
+    }
+    if (device->mixer_lock != NULL) {
+        SDL_DestroyMutex(device->mixer_lock);
+    }
+    SDL_FreeAudioMem(device->fake_stream);
+    if (device->convert.needed) {
+        SDL_FreeAudioMem(device->convert.buf);
+    }
+    if (device->opened) {
+        current_audio.impl.CloseDevice(device);
+        device->opened = 0;
+    }
+    SDL_FreeAudioMem(device);
+}
+
+
+/*
+ * Sanity check desired AudioSpec for SDL_OpenAudio() in (orig).
+ *  Fills in a sanitized copy in (prepared).
+ *  Returns non-zero if okay, zero on fatal parameters in (orig).
+ */
+static int
+prepare_audiospec(const SDL_AudioSpec * orig, SDL_AudioSpec * prepared)
+{
+    SDL_memcpy(prepared, orig, sizeof(SDL_AudioSpec));
+
+    if (orig->callback == NULL) {
+        SDL_SetError("SDL_OpenAudio() passed a NULL callback");
+        return 0;
+    }
+
+    if (orig->freq == 0) {
+        const char *env = SDL_getenv("SDL_AUDIO_FREQUENCY");
+        if ((!env) || ((prepared->freq = SDL_atoi(env)) == 0)) {
+            prepared->freq = 22050;     /* a reasonable default */
+        }
+    }
+
+    if (orig->format == 0) {
+        const char *env = SDL_getenv("SDL_AUDIO_FORMAT");
+        if ((!env) || ((prepared->format = SDL_ParseAudioFormat(env)) == 0)) {
+            prepared->format = AUDIO_S16;       /* a reasonable default */
+        }
+    }
+
+    switch (orig->channels) {
+    case 0:{
+            const char *env = SDL_getenv("SDL_AUDIO_CHANNELS");
+            if ((!env) || ((prepared->channels = (Uint8) SDL_atoi(env)) == 0)) {
+                prepared->channels = 2; /* a reasonable default */
+            }
+            break;
+        }
+    case 1:                    /* Mono */
+    case 2:                    /* Stereo */
+    case 4:                    /* surround */
+    case 6:                    /* surround with center and lfe */
+        break;
+    default:
+        SDL_SetError("Unsupported number of audio channels.");
+        return 0;
+    }
+
+    if (orig->samples == 0) {
+        const char *env = SDL_getenv("SDL_AUDIO_SAMPLES");
+        if ((!env) || ((prepared->samples = (Uint16) SDL_atoi(env)) == 0)) {
+            /* Pick a default of ~46 ms at desired frequency */
+            /* !!! FIXME: remove this when the non-Po2 resampling is in. */
+            const int samples = (prepared->freq / 1000) * 46;
+            int power2 = 1;
+            while (power2 < samples) {
+                power2 *= 2;
+            }
+            prepared->samples = power2;
+        }
+    }
+
+    /* Calculate the silence and size of the audio specification */
+    SDL_CalculateAudioSpec(prepared);
+
+    return 1;
+}
+
+
+static SDL_AudioDeviceID
+open_audio_device(const char *devname, int iscapture,
+                  const SDL_AudioSpec * desired, SDL_AudioSpec * obtained,
+                  int allowed_changes, int min_id)
+{
+    SDL_AudioDeviceID id = 0;
+    SDL_AudioSpec _obtained;
+    SDL_AudioDevice *device;
+    SDL_bool build_cvt;
+    int i = 0;
+
+    if (!SDL_WasInit(SDL_INIT_AUDIO)) {
+        SDL_SetError("Audio subsystem is not initialized");
+        return 0;
+    }
+
+    if ((iscapture) && (!current_audio.impl.HasCaptureSupport)) {
+        SDL_SetError("No capture support");
+        return 0;
+    }
+
+    if (!obtained) {
+        obtained = &_obtained;
+    }
+    if (!prepare_audiospec(desired, obtained)) {
+        return 0;
+    }
+
+    /* If app doesn't care about a specific device, let the user override. */
+    if (devname == NULL) {
+        devname = SDL_getenv("SDL_AUDIO_DEVICE_NAME");
+    }
+
+    /*
+     * Catch device names at the high level for the simple case...
+     * This lets us have a basic "device enumeration" for systems that
+     *  don't have multiple devices, but makes sure the device name is
+     *  always NULL when it hits the low level.
+     *
+     * Also make sure that the simple case prevents multiple simultaneous
+     *  opens of the default system device.
+     */
+
+    if ((iscapture) && (current_audio.impl.OnlyHasDefaultInputDevice)) {
+        if ((devname) && (SDL_strcmp(devname, DEFAULT_INPUT_DEVNAME) != 0)) {
+            SDL_SetError("No such device");
+            return 0;
+        }
+        devname = NULL;
+
+        for (i = 0; i < SDL_arraysize(open_devices); i++) {
+            if ((open_devices[i]) && (open_devices[i]->iscapture)) {
+                SDL_SetError("Audio device already open");
+                return 0;
+            }
+        }
+    }
+
+    if ((!iscapture) && (current_audio.impl.OnlyHasDefaultOutputDevice)) {
+        if ((devname) && (SDL_strcmp(devname, DEFAULT_OUTPUT_DEVNAME) != 0)) {
+            SDL_SetError("No such device");
+            return 0;
+        }
+        devname = NULL;
+
+        for (i = 0; i < SDL_arraysize(open_devices); i++) {
+            if ((open_devices[i]) && (!open_devices[i]->iscapture)) {
+                SDL_SetError("Audio device already open");
+                return 0;
+            }
+        }
+    }
+
+    device = (SDL_AudioDevice *) SDL_AllocAudioMem(sizeof(SDL_AudioDevice));
+    if (device == NULL) {
+        SDL_OutOfMemory();
+        return 0;
+    }
+    SDL_memset(device, '\0', sizeof(SDL_AudioDevice));
+    device->spec = *obtained;
+    device->enabled = 1;
+    device->paused = 1;
+    device->iscapture = iscapture;
+
+    /* Create a semaphore for locking the sound buffers */
+    if (!current_audio.impl.SkipMixerLock) {
+        device->mixer_lock = SDL_CreateMutex();
+        if (device->mixer_lock == NULL) {
+            close_audio_device(device);
+            SDL_SetError("Couldn't create mixer lock");
+            return 0;
+        }
+    }
+
+    /* force a device detection if we haven't done one yet. */
+    if ( ((iscapture) && (current_audio.inputDevices == NULL)) ||
+         ((!iscapture) && (current_audio.outputDevices == NULL)) )
+        SDL_GetNumAudioDevices(iscapture);
+
+    if (current_audio.impl.OpenDevice(device, devname, iscapture) < 0) {
+        close_audio_device(device);
+        return 0;
+    }
+    device->opened = 1;
+
+    /* Allocate a fake audio memory buffer */
+    device->fake_stream = (Uint8 *)SDL_AllocAudioMem(device->spec.size);
+    if (device->fake_stream == NULL) {
+        close_audio_device(device);
+        SDL_OutOfMemory();
+        return 0;
+    }
+
+    /* See if we need to do any conversion */
+    build_cvt = SDL_FALSE;
+    if (obtained->freq != device->spec.freq) {
+        if (allowed_changes & SDL_AUDIO_ALLOW_FREQUENCY_CHANGE) {
+            obtained->freq = device->spec.freq;
+        } else {
+            build_cvt = SDL_TRUE;
+        }
+    }
+    if (obtained->format != device->spec.format) {
+        if (allowed_changes & SDL_AUDIO_ALLOW_FORMAT_CHANGE) {
+            obtained->format = device->spec.format;
+        } else {
+            build_cvt = SDL_TRUE;
+        }
+    }
+    if (obtained->channels != device->spec.channels) {
+        if (allowed_changes & SDL_AUDIO_ALLOW_CHANNELS_CHANGE) {
+            obtained->channels = device->spec.channels;
+        } else {
+            build_cvt = SDL_TRUE;
+        }
+    }
+
+    /* If the audio driver changes the buffer size, accept it.
+       This needs to be done after the format is modified above,
+       otherwise it might not have the correct buffer size.
+     */
+    if (device->spec.samples != obtained->samples) {
+        obtained->samples = device->spec.samples;
+        SDL_CalculateAudioSpec(obtained);
+    }
+
+    if (build_cvt) {
+        /* Build an audio conversion block */
+        if (SDL_BuildAudioCVT(&device->convert,
+                              obtained->format, obtained->channels,
+                              obtained->freq,
+                              device->spec.format, device->spec.channels,
+                              device->spec.freq) < 0) {
+            close_audio_device(device);
+            return 0;
+        }
+        if (device->convert.needed) {
+            device->convert.len = (int) (((double) device->spec.size) /
+                                         device->convert.len_ratio);
+
+            device->convert.buf =
+                (Uint8 *) SDL_AllocAudioMem(device->convert.len *
+                                            device->convert.len_mult);
+            if (device->convert.buf == NULL) {
+                close_audio_device(device);
+                SDL_OutOfMemory();
+                return 0;
+            }
+        }
+    }
+
+    /* Find an available device ID and store the structure... */
+    for (id = min_id - 1; id < SDL_arraysize(open_devices); id++) {
+        if (open_devices[id] == NULL) {
+            open_devices[id] = device;
+            break;
+        }
+    }
+
+    if (id == SDL_arraysize(open_devices)) {
+        SDL_SetError("Too many open audio devices");
+        close_audio_device(device);
+        return 0;
+    }
+
+    /* Start the audio thread if necessary */
+    if (!current_audio.impl.ProvidesOwnCallbackThread) {
+        /* Start the audio thread */
+        char name[64];
+        SDL_snprintf(name, sizeof (name), "SDLAudioDev%d", (int) (id + 1));
+/* !!! FIXME: this is nasty. */
+#if defined(__WIN32__) && !defined(HAVE_LIBC)
+#undef SDL_CreateThread
+#if SDL_DYNAMIC_API
+        device->thread = SDL_CreateThread_REAL(SDL_RunAudio, name, device, NULL, NULL);
+#else
+        device->thread = SDL_CreateThread(SDL_RunAudio, name, device, NULL, NULL);
+#endif
+#else
+        device->thread = SDL_CreateThread(SDL_RunAudio, name, device);
+#endif
+        if (device->thread == NULL) {
+            SDL_CloseAudioDevice(id + 1);
+            SDL_SetError("Couldn't create audio thread");
+            return 0;
+        }
+    }
+
+    return id + 1;
+}
+
+
+int
+SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained)
+{
+    SDL_AudioDeviceID id = 0;
+
+    /* Start up the audio driver, if necessary. This is legacy behaviour! */
+    if (!SDL_WasInit(SDL_INIT_AUDIO)) {
+        if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
+            return (-1);
+        }
+    }
+
+    /* SDL_OpenAudio() is legacy and can only act on Device ID #1. */
+    if (open_devices[0] != NULL) {
+        SDL_SetError("Audio device is already opened");
+        return (-1);
+    }
+
+    if (obtained) {
+        id = open_audio_device(NULL, 0, desired, obtained,
+                               SDL_AUDIO_ALLOW_ANY_CHANGE, 1);
+    } else {
+        id = open_audio_device(NULL, 0, desired, desired, 0, 1);
+    }
+
+    SDL_assert((id == 0) || (id == 1));
+    return ((id == 0) ? -1 : 0);
+}
+
+SDL_AudioDeviceID
+SDL_OpenAudioDevice(const char *device, int iscapture,
+                    const SDL_AudioSpec * desired, SDL_AudioSpec * obtained,
+                    int allowed_changes)
+{
+    return open_audio_device(device, iscapture, desired, obtained,
+                             allowed_changes, 2);
+}
+
+SDL_AudioStatus
+SDL_GetAudioDeviceStatus(SDL_AudioDeviceID devid)
+{
+    SDL_AudioDevice *device = get_audio_device(devid);
+    SDL_AudioStatus status = SDL_AUDIO_STOPPED;
+    if (device && device->enabled) {
+        if (device->paused) {
+            status = SDL_AUDIO_PAUSED;
+        } else {
+            status = SDL_AUDIO_PLAYING;
+        }
+    }
+    return (status);
+}
+
+
+SDL_AudioStatus
+SDL_GetAudioStatus(void)
+{
+    return SDL_GetAudioDeviceStatus(1);
+}
+
+void
+SDL_PauseAudioDevice(SDL_AudioDeviceID devid, int pause_on)
+{
+    SDL_AudioDevice *device = get_audio_device(devid);
+    if (device) {
+        current_audio.impl.LockDevice(device);
+        device->paused = pause_on;
+        current_audio.impl.UnlockDevice(device);
+    }
+}
+
+void
+SDL_PauseAudio(int pause_on)
+{
+    SDL_PauseAudioDevice(1, pause_on);
+}
+
+
+void
+SDL_LockAudioDevice(SDL_AudioDeviceID devid)
+{
+    /* Obtain a lock on the mixing buffers */
+    SDL_AudioDevice *device = get_audio_device(devid);
+    if (device) {
+        current_audio.impl.LockDevice(device);
+    }
+}
+
+void
+SDL_LockAudio(void)
+{
+    SDL_LockAudioDevice(1);
+}
+
+void
+SDL_UnlockAudioDevice(SDL_AudioDeviceID devid)
+{
+    /* Obtain a lock on the mixing buffers */
+    SDL_AudioDevice *device = get_audio_device(devid);
+    if (device) {
+        current_audio.impl.UnlockDevice(device);
+    }
+}
+
+void
+SDL_UnlockAudio(void)
+{
+    SDL_UnlockAudioDevice(1);
+}
+
+void
+SDL_CloseAudioDevice(SDL_AudioDeviceID devid)
+{
+    SDL_AudioDevice *device = get_audio_device(devid);
+    if (device) {
+        close_audio_device(device);
+        open_devices[devid - 1] = NULL;
+    }
+}
+
+void
+SDL_CloseAudio(void)
+{
+    SDL_CloseAudioDevice(1);
+}
+
+void
+SDL_AudioQuit(void)
+{
+    SDL_AudioDeviceID i;
+
+    if (!current_audio.name) {  /* not initialized?! */
+        return;
+    }
+
+    for (i = 0; i < SDL_arraysize(open_devices); i++) {
+        if (open_devices[i] != NULL) {
+            SDL_CloseAudioDevice(i+1);
+        }
+    }
+
+    /* Free the driver data */
+    current_audio.impl.Deinitialize();
+    free_device_list(&current_audio.outputDevices,
+                     &current_audio.outputDeviceCount);
+    free_device_list(&current_audio.inputDevices,
+                     &current_audio.inputDeviceCount);
+    SDL_memset(&current_audio, '\0', sizeof(current_audio));
+    SDL_memset(open_devices, '\0', sizeof(open_devices));
+}
+
+#define NUM_FORMATS 10
+static int format_idx;
+static int format_idx_sub;
+static SDL_AudioFormat format_list[NUM_FORMATS][NUM_FORMATS] = {
+    {AUDIO_U8, AUDIO_S8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB,
+     AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB},
+    {AUDIO_S8, AUDIO_U8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB,
+     AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB},
+    {AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S32LSB,
+     AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8},
+    {AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S32MSB,
+     AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8},
+    {AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_S32LSB,
+     AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8},
+    {AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_S32MSB,
+     AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8},
+    {AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S16LSB,
+     AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8},
+    {AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S16MSB,
+     AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8},
+    {AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_S16LSB,
+     AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8},
+    {AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_S16MSB,
+     AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8},
+};
+
+SDL_AudioFormat
+SDL_FirstAudioFormat(SDL_AudioFormat format)
+{
+    for (format_idx = 0; format_idx < NUM_FORMATS; ++format_idx) {
+        if (format_list[format_idx][0] == format) {
+            break;
+        }
+    }
+    format_idx_sub = 0;
+    return (SDL_NextAudioFormat());
+}
+
+SDL_AudioFormat
+SDL_NextAudioFormat(void)
+{
+    if ((format_idx == NUM_FORMATS) || (format_idx_sub == NUM_FORMATS)) {
+        return (0);
+    }
+    return (format_list[format_idx][format_idx_sub++]);
+}
+
+void
+SDL_CalculateAudioSpec(SDL_AudioSpec * spec)
+{
+    switch (spec->format) {
+    case AUDIO_U8:
+        spec->silence = 0x80;
+        break;
+    default:
+        spec->silence = 0x00;
+        break;
+    }
+    spec->size = SDL_AUDIO_BITSIZE(spec->format) / 8;
+    spec->size *= spec->channels;
+    spec->size *= spec->samples;
+}
+
+
+/*
+ * Moved here from SDL_mixer.c, since it relies on internals of an opened
+ *  audio device (and is deprecated, by the way!).
+ */
+void
+SDL_MixAudio(Uint8 * dst, const Uint8 * src, Uint32 len, int volume)
+{
+    /* Mix the user-level audio format */
+    SDL_AudioDevice *device = get_audio_device(1);
+    if (device != NULL) {
+        SDL_AudioFormat format;
+        if (device->convert.needed) {
+            format = device->convert.src_format;
+        } else {
+            format = device->spec.format;
+        }
+        SDL_MixAudioFormat(dst, src, format, len, volume);
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_audio_c.h b/Source/3rd Party/sdl/src/audio/SDL_audio_c.h
new file mode 100644
index 000000000..2ea4e148c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_audio_c.h	
@@ -0,0 +1,55 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Functions and variables exported from SDL_audio.c for SDL_sysaudio.c */
+
+/* Functions to get a list of "close" audio formats */
+extern SDL_AudioFormat SDL_FirstAudioFormat(SDL_AudioFormat format);
+extern SDL_AudioFormat SDL_NextAudioFormat(void);
+
+/* Function to calculate the size and silence for a SDL_AudioSpec */
+extern void SDL_CalculateAudioSpec(SDL_AudioSpec * spec);
+
+/* The actual mixing thread function */
+extern int SDLCALL SDL_RunAudio(void *audiop);
+
+/* this is used internally to access some autogenerated code. */
+typedef struct
+{
+    SDL_AudioFormat src_fmt;
+    SDL_AudioFormat dst_fmt;
+    SDL_AudioFilter filter;
+} SDL_AudioTypeFilters;
+extern const SDL_AudioTypeFilters sdl_audio_type_filters[];
+
+/* this is used internally to access some autogenerated code. */
+typedef struct
+{
+    SDL_AudioFormat fmt;
+    int channels;
+    int upsample;
+    int multiple;
+    SDL_AudioFilter filter;
+} SDL_AudioRateFilters;
+extern const SDL_AudioRateFilters sdl_audio_rate_filters[];
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_audiocvt.c b/Source/3rd Party/sdl/src/audio/SDL_audiocvt.c
new file mode 100644
index 000000000..518735bfc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_audiocvt.c	
@@ -0,0 +1,1121 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Functions for audio drivers to perform runtime conversion of audio format */
+
+#include "SDL_audio.h"
+#include "SDL_audio_c.h"
+
+#include "SDL_assert.h"
+
+/* #define DEBUG_CONVERT */
+
+/* Effectively mix right and left channels into a single channel */
+static void SDLCALL
+SDL_ConvertMono(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    Sint32 sample;
+
+#ifdef DEBUG_CONVERT
+    fprintf(stderr, "Converting to mono\n");
+#endif
+	switch (format & (SDL_AUDIO_MASK_SIGNED |
+                      SDL_AUDIO_MASK_BITSIZE |
+                      SDL_AUDIO_MASK_DATATYPE)) {
+    case AUDIO_U8:
+        {
+            Uint8 *src, *dst;
+
+            src = cvt->buf;
+            dst = cvt->buf;
+            for (i = cvt->len_cvt / 2; i; --i) {
+                sample = src[0] + src[1];
+                *dst = (Uint8) (sample / 2);
+                src += 2;
+                dst += 1;
+            }
+        }
+        break;
+
+    case AUDIO_S8:
+        {
+            Sint8 *src, *dst;
+
+            src = (Sint8 *) cvt->buf;
+            dst = (Sint8 *) cvt->buf;
+            for (i = cvt->len_cvt / 2; i; --i) {
+                sample = src[0] + src[1];
+                *dst = (Sint8) (sample / 2);
+                src += 2;
+                dst += 1;
+            }
+        }
+        break;
+
+    case AUDIO_U16:
+        {
+            Uint8 *src, *dst;
+
+            src = cvt->buf;
+            dst = cvt->buf;
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    sample = (Uint16) ((src[0] << 8) | src[1]) +
+                        (Uint16) ((src[2] << 8) | src[3]);
+                    sample /= 2;
+                    dst[1] = (sample & 0xFF);
+                    sample >>= 8;
+                    dst[0] = (sample & 0xFF);
+                    src += 4;
+                    dst += 2;
+                }
+            } else {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    sample = (Uint16) ((src[1] << 8) | src[0]) +
+                        (Uint16) ((src[3] << 8) | src[2]);
+                    sample /= 2;
+                    dst[0] = (sample & 0xFF);
+                    sample >>= 8;
+                    dst[1] = (sample & 0xFF);
+                    src += 4;
+                    dst += 2;
+                }
+            }
+        }
+        break;
+
+    case AUDIO_S16:
+        {
+            Uint8 *src, *dst;
+
+            src = cvt->buf;
+            dst = cvt->buf;
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    sample = (Sint16) ((src[0] << 8) | src[1]) +
+                        (Sint16) ((src[2] << 8) | src[3]);
+                    sample /= 2;
+                    dst[1] = (sample & 0xFF);
+                    sample >>= 8;
+                    dst[0] = (sample & 0xFF);
+                    src += 4;
+                    dst += 2;
+                }
+            } else {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    sample = (Sint16) ((src[1] << 8) | src[0]) +
+                        (Sint16) ((src[3] << 8) | src[2]);
+                    sample /= 2;
+                    dst[0] = (sample & 0xFF);
+                    sample >>= 8;
+                    dst[1] = (sample & 0xFF);
+                    src += 4;
+                    dst += 2;
+                }
+            }
+        }
+        break;
+
+    case AUDIO_S32:
+        {
+            const Uint32 *src = (const Uint32 *) cvt->buf;
+            Uint32 *dst = (Uint32 *) cvt->buf;
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 8; i; --i, src += 2) {
+                    const Sint64 added =
+                        (((Sint64) (Sint32) SDL_SwapBE32(src[0])) +
+                         ((Sint64) (Sint32) SDL_SwapBE32(src[1])));
+                    *(dst++) = SDL_SwapBE32((Uint32) ((Sint32) (added / 2)));
+                }
+            } else {
+                for (i = cvt->len_cvt / 8; i; --i, src += 2) {
+                    const Sint64 added =
+                        (((Sint64) (Sint32) SDL_SwapLE32(src[0])) +
+                         ((Sint64) (Sint32) SDL_SwapLE32(src[1])));
+                    *(dst++) = SDL_SwapLE32((Uint32) ((Sint32) (added / 2)));
+                }
+            }
+        }
+        break;
+
+    case AUDIO_F32:
+        {
+            const float *src = (const float *) cvt->buf;
+            float *dst = (float *) cvt->buf;
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 8; i; --i, src += 2) {
+                    const float src1 = SDL_SwapFloatBE(src[0]);
+                    const float src2 = SDL_SwapFloatBE(src[1]);
+                    const double added = ((double) src1) + ((double) src2);
+                    const float halved = (float) (added * 0.5);
+                    *(dst++) = SDL_SwapFloatBE(halved);
+                }
+            } else {
+                for (i = cvt->len_cvt / 8; i; --i, src += 2) {
+                    const float src1 = SDL_SwapFloatLE(src[0]);
+                    const float src2 = SDL_SwapFloatLE(src[1]);
+                    const double added = ((double) src1) + ((double) src2);
+                    const float halved = (float) (added * 0.5);
+                    *(dst++) = SDL_SwapFloatLE(halved);
+                }
+            }
+        }
+        break;
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+
+/* Discard top 4 channels */
+static void SDLCALL
+SDL_ConvertStrip(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+
+#ifdef DEBUG_CONVERT
+    fprintf(stderr, "Converting down from 6 channels to stereo\n");
+#endif
+
+#define strip_chans_6_to_2(type) \
+    { \
+        const type *src = (const type *) cvt->buf; \
+        type *dst = (type *) cvt->buf; \
+        for (i = cvt->len_cvt / (sizeof (type) * 6); i; --i) { \
+            dst[0] = src[0]; \
+            dst[1] = src[1]; \
+            src += 6; \
+            dst += 2; \
+        } \
+    }
+
+    /* this function only cares about typesize, and data as a block of bits. */
+    switch (SDL_AUDIO_BITSIZE(format)) {
+    case 8:
+        strip_chans_6_to_2(Uint8);
+        break;
+    case 16:
+        strip_chans_6_to_2(Uint16);
+        break;
+    case 32:
+        strip_chans_6_to_2(Uint32);
+        break;
+    }
+
+#undef strip_chans_6_to_2
+
+    cvt->len_cvt /= 3;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+
+/* Discard top 2 channels of 6 */
+static void SDLCALL
+SDL_ConvertStrip_2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+
+#ifdef DEBUG_CONVERT
+    fprintf(stderr, "Converting 6 down to quad\n");
+#endif
+
+#define strip_chans_6_to_4(type) \
+    { \
+        const type *src = (const type *) cvt->buf; \
+        type *dst = (type *) cvt->buf; \
+        for (i = cvt->len_cvt / (sizeof (type) * 6); i; --i) { \
+            dst[0] = src[0]; \
+            dst[1] = src[1]; \
+            dst[2] = src[2]; \
+            dst[3] = src[3]; \
+            src += 6; \
+            dst += 4; \
+        } \
+    }
+
+    /* this function only cares about typesize, and data as a block of bits. */
+    switch (SDL_AUDIO_BITSIZE(format)) {
+    case 8:
+        strip_chans_6_to_4(Uint8);
+        break;
+    case 16:
+        strip_chans_6_to_4(Uint16);
+        break;
+    case 32:
+        strip_chans_6_to_4(Uint32);
+        break;
+    }
+
+#undef strip_chans_6_to_4
+
+    cvt->len_cvt /= 6;
+    cvt->len_cvt *= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+/* Duplicate a mono channel to both stereo channels */
+static void SDLCALL
+SDL_ConvertStereo(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+
+#ifdef DEBUG_CONVERT
+    fprintf(stderr, "Converting to stereo\n");
+#endif
+
+#define dup_chans_1_to_2(type) \
+    { \
+        const type *src = (const type *) (cvt->buf + cvt->len_cvt); \
+        type *dst = (type *) (cvt->buf + cvt->len_cvt * 2); \
+        for (i = cvt->len_cvt / sizeof(type); i; --i) { \
+            src -= 1; \
+            dst -= 2; \
+            dst[0] = dst[1] = *src; \
+        } \
+    }
+
+    /* this function only cares about typesize, and data as a block of bits. */
+    switch (SDL_AUDIO_BITSIZE(format)) {
+    case 8:
+        dup_chans_1_to_2(Uint8);
+        break;
+    case 16:
+        dup_chans_1_to_2(Uint16);
+        break;
+    case 32:
+        dup_chans_1_to_2(Uint32);
+        break;
+    }
+
+#undef dup_chans_1_to_2
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+
+/* Duplicate a stereo channel to a pseudo-5.1 stream */
+static void SDLCALL
+SDL_ConvertSurround(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+
+#ifdef DEBUG_CONVERT
+    fprintf(stderr, "Converting stereo to surround\n");
+#endif
+
+    switch (format & (SDL_AUDIO_MASK_SIGNED  |
+                      SDL_AUDIO_MASK_BITSIZE |
+                      SDL_AUDIO_MASK_DATATYPE)) {
+    case AUDIO_U8:
+        {
+            Uint8 *src, *dst, lf, rf, ce;
+
+            src = (Uint8 *) (cvt->buf + cvt->len_cvt);
+            dst = (Uint8 *) (cvt->buf + cvt->len_cvt * 3);
+            for (i = cvt->len_cvt; i; --i) {
+                dst -= 6;
+                src -= 2;
+                lf = src[0];
+                rf = src[1];
+                ce = (lf / 2) + (rf / 2);
+                dst[0] = lf;
+                dst[1] = rf;
+                dst[2] = lf - ce;
+                dst[3] = rf - ce;
+                dst[4] = ce;
+                dst[5] = ce;
+            }
+        }
+        break;
+
+    case AUDIO_S8:
+        {
+            Sint8 *src, *dst, lf, rf, ce;
+
+            src = (Sint8 *) cvt->buf + cvt->len_cvt;
+            dst = (Sint8 *) cvt->buf + cvt->len_cvt * 3;
+            for (i = cvt->len_cvt; i; --i) {
+                dst -= 6;
+                src -= 2;
+                lf = src[0];
+                rf = src[1];
+                ce = (lf / 2) + (rf / 2);
+                dst[0] = lf;
+                dst[1] = rf;
+                dst[2] = lf - ce;
+                dst[3] = rf - ce;
+                dst[4] = ce;
+                dst[5] = ce;
+            }
+        }
+        break;
+
+    case AUDIO_U16:
+        {
+            Uint8 *src, *dst;
+            Uint16 lf, rf, ce, lr, rr;
+
+            src = cvt->buf + cvt->len_cvt;
+            dst = cvt->buf + cvt->len_cvt * 3;
+
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    dst -= 12;
+                    src -= 4;
+                    lf = (Uint16) ((src[0] << 8) | src[1]);
+                    rf = (Uint16) ((src[2] << 8) | src[3]);
+                    ce = (lf / 2) + (rf / 2);
+                    rr = lf - ce;
+                    lr = rf - ce;
+                    dst[1] = (lf & 0xFF);
+                    dst[0] = ((lf >> 8) & 0xFF);
+                    dst[3] = (rf & 0xFF);
+                    dst[2] = ((rf >> 8) & 0xFF);
+
+                    dst[1 + 4] = (lr & 0xFF);
+                    dst[0 + 4] = ((lr >> 8) & 0xFF);
+                    dst[3 + 4] = (rr & 0xFF);
+                    dst[2 + 4] = ((rr >> 8) & 0xFF);
+
+                    dst[1 + 8] = (ce & 0xFF);
+                    dst[0 + 8] = ((ce >> 8) & 0xFF);
+                    dst[3 + 8] = (ce & 0xFF);
+                    dst[2 + 8] = ((ce >> 8) & 0xFF);
+                }
+            } else {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    dst -= 12;
+                    src -= 4;
+                    lf = (Uint16) ((src[1] << 8) | src[0]);
+                    rf = (Uint16) ((src[3] << 8) | src[2]);
+                    ce = (lf / 2) + (rf / 2);
+                    rr = lf - ce;
+                    lr = rf - ce;
+                    dst[0] = (lf & 0xFF);
+                    dst[1] = ((lf >> 8) & 0xFF);
+                    dst[2] = (rf & 0xFF);
+                    dst[3] = ((rf >> 8) & 0xFF);
+
+                    dst[0 + 4] = (lr & 0xFF);
+                    dst[1 + 4] = ((lr >> 8) & 0xFF);
+                    dst[2 + 4] = (rr & 0xFF);
+                    dst[3 + 4] = ((rr >> 8) & 0xFF);
+
+                    dst[0 + 8] = (ce & 0xFF);
+                    dst[1 + 8] = ((ce >> 8) & 0xFF);
+                    dst[2 + 8] = (ce & 0xFF);
+                    dst[3 + 8] = ((ce >> 8) & 0xFF);
+                }
+            }
+        }
+        break;
+
+    case AUDIO_S16:
+        {
+            Uint8 *src, *dst;
+            Sint16 lf, rf, ce, lr, rr;
+
+            src = cvt->buf + cvt->len_cvt;
+            dst = cvt->buf + cvt->len_cvt * 3;
+
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    dst -= 12;
+                    src -= 4;
+                    lf = (Sint16) ((src[0] << 8) | src[1]);
+                    rf = (Sint16) ((src[2] << 8) | src[3]);
+                    ce = (lf / 2) + (rf / 2);
+                    rr = lf - ce;
+                    lr = rf - ce;
+                    dst[1] = (lf & 0xFF);
+                    dst[0] = ((lf >> 8) & 0xFF);
+                    dst[3] = (rf & 0xFF);
+                    dst[2] = ((rf >> 8) & 0xFF);
+
+                    dst[1 + 4] = (lr & 0xFF);
+                    dst[0 + 4] = ((lr >> 8) & 0xFF);
+                    dst[3 + 4] = (rr & 0xFF);
+                    dst[2 + 4] = ((rr >> 8) & 0xFF);
+
+                    dst[1 + 8] = (ce & 0xFF);
+                    dst[0 + 8] = ((ce >> 8) & 0xFF);
+                    dst[3 + 8] = (ce & 0xFF);
+                    dst[2 + 8] = ((ce >> 8) & 0xFF);
+                }
+            } else {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    dst -= 12;
+                    src -= 4;
+                    lf = (Sint16) ((src[1] << 8) | src[0]);
+                    rf = (Sint16) ((src[3] << 8) | src[2]);
+                    ce = (lf / 2) + (rf / 2);
+                    rr = lf - ce;
+                    lr = rf - ce;
+                    dst[0] = (lf & 0xFF);
+                    dst[1] = ((lf >> 8) & 0xFF);
+                    dst[2] = (rf & 0xFF);
+                    dst[3] = ((rf >> 8) & 0xFF);
+
+                    dst[0 + 4] = (lr & 0xFF);
+                    dst[1 + 4] = ((lr >> 8) & 0xFF);
+                    dst[2 + 4] = (rr & 0xFF);
+                    dst[3 + 4] = ((rr >> 8) & 0xFF);
+
+                    dst[0 + 8] = (ce & 0xFF);
+                    dst[1 + 8] = ((ce >> 8) & 0xFF);
+                    dst[2 + 8] = (ce & 0xFF);
+                    dst[3 + 8] = ((ce >> 8) & 0xFF);
+                }
+            }
+        }
+        break;
+
+    case AUDIO_S32:
+        {
+            Sint32 lf, rf, ce;
+            const Uint32 *src = (const Uint32 *) (cvt->buf + cvt->len_cvt);
+            Uint32 *dst = (Uint32 *) (cvt->buf + cvt->len_cvt * 3);
+
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 8; i; --i) {
+                    dst -= 6;
+                    src -= 2;
+                    lf = (Sint32) SDL_SwapBE32(src[0]);
+                    rf = (Sint32) SDL_SwapBE32(src[1]);
+                    ce = (lf / 2) + (rf / 2);
+                    dst[0] = SDL_SwapBE32((Uint32) lf);
+                    dst[1] = SDL_SwapBE32((Uint32) rf);
+                    dst[2] = SDL_SwapBE32((Uint32) (lf - ce));
+                    dst[3] = SDL_SwapBE32((Uint32) (rf - ce));
+                    dst[4] = SDL_SwapBE32((Uint32) ce);
+                    dst[5] = SDL_SwapBE32((Uint32) ce);
+                }
+            } else {
+                for (i = cvt->len_cvt / 8; i; --i) {
+                    dst -= 6;
+                    src -= 2;
+                    lf = (Sint32) SDL_SwapLE32(src[0]);
+                    rf = (Sint32) SDL_SwapLE32(src[1]);
+                    ce = (lf / 2) + (rf / 2);
+                    dst[0] = src[0];
+                    dst[1] = src[1];
+                    dst[2] = SDL_SwapLE32((Uint32) (lf - ce));
+                    dst[3] = SDL_SwapLE32((Uint32) (rf - ce));
+                    dst[4] = SDL_SwapLE32((Uint32) ce);
+                    dst[5] = SDL_SwapLE32((Uint32) ce);
+                }
+            }
+        }
+        break;
+
+    case AUDIO_F32:
+        {
+            float lf, rf, ce;
+            const float *src = (const float *) (cvt->buf + cvt->len_cvt);
+            float *dst = (float *) (cvt->buf + cvt->len_cvt * 3);
+
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 8; i; --i) {
+                    dst -= 6;
+                    src -= 2;
+                    lf = SDL_SwapFloatBE(src[0]);
+                    rf = SDL_SwapFloatBE(src[1]);
+                    ce = (lf * 0.5f) + (rf * 0.5f);
+                    dst[0] = src[0];
+                    dst[1] = src[1];
+                    dst[2] = SDL_SwapFloatBE(lf - ce);
+                    dst[3] = SDL_SwapFloatBE(rf - ce);
+                    dst[4] = dst[5] = SDL_SwapFloatBE(ce);
+                }
+            } else {
+                for (i = cvt->len_cvt / 8; i; --i) {
+                    dst -= 6;
+                    src -= 2;
+                    lf = SDL_SwapFloatLE(src[0]);
+                    rf = SDL_SwapFloatLE(src[1]);
+                    ce = (lf * 0.5f) + (rf * 0.5f);
+                    dst[0] = src[0];
+                    dst[1] = src[1];
+                    dst[2] = SDL_SwapFloatLE(lf - ce);
+                    dst[3] = SDL_SwapFloatLE(rf - ce);
+                    dst[4] = dst[5] = SDL_SwapFloatLE(ce);
+                }
+            }
+        }
+        break;
+
+    }
+    cvt->len_cvt *= 3;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+
+/* Duplicate a stereo channel to a pseudo-4.0 stream */
+static void SDLCALL
+SDL_ConvertSurround_4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+
+#ifdef DEBUG_CONVERT
+    fprintf(stderr, "Converting stereo to quad\n");
+#endif
+
+    switch (format & (SDL_AUDIO_MASK_SIGNED |
+                      SDL_AUDIO_MASK_BITSIZE |
+                      SDL_AUDIO_MASK_DATATYPE)) {
+    case AUDIO_U8:
+        {
+            Uint8 *src, *dst, lf, rf, ce;
+
+            src = (Uint8 *) (cvt->buf + cvt->len_cvt);
+            dst = (Uint8 *) (cvt->buf + cvt->len_cvt * 2);
+            for (i = cvt->len_cvt; i; --i) {
+                dst -= 4;
+                src -= 2;
+                lf = src[0];
+                rf = src[1];
+                ce = (lf / 2) + (rf / 2);
+                dst[0] = lf;
+                dst[1] = rf;
+                dst[2] = lf - ce;
+                dst[3] = rf - ce;
+            }
+        }
+        break;
+
+    case AUDIO_S8:
+        {
+            Sint8 *src, *dst, lf, rf, ce;
+
+            src = (Sint8 *) cvt->buf + cvt->len_cvt;
+            dst = (Sint8 *) cvt->buf + cvt->len_cvt * 2;
+            for (i = cvt->len_cvt; i; --i) {
+                dst -= 4;
+                src -= 2;
+                lf = src[0];
+                rf = src[1];
+                ce = (lf / 2) + (rf / 2);
+                dst[0] = lf;
+                dst[1] = rf;
+                dst[2] = lf - ce;
+                dst[3] = rf - ce;
+            }
+        }
+        break;
+
+    case AUDIO_U16:
+        {
+            Uint8 *src, *dst;
+            Uint16 lf, rf, ce, lr, rr;
+
+            src = cvt->buf + cvt->len_cvt;
+            dst = cvt->buf + cvt->len_cvt * 2;
+
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    dst -= 8;
+                    src -= 4;
+                    lf = (Uint16) ((src[0] << 8) | src[1]);
+                    rf = (Uint16) ((src[2] << 8) | src[3]);
+                    ce = (lf / 2) + (rf / 2);
+                    rr = lf - ce;
+                    lr = rf - ce;
+                    dst[1] = (lf & 0xFF);
+                    dst[0] = ((lf >> 8) & 0xFF);
+                    dst[3] = (rf & 0xFF);
+                    dst[2] = ((rf >> 8) & 0xFF);
+
+                    dst[1 + 4] = (lr & 0xFF);
+                    dst[0 + 4] = ((lr >> 8) & 0xFF);
+                    dst[3 + 4] = (rr & 0xFF);
+                    dst[2 + 4] = ((rr >> 8) & 0xFF);
+                }
+            } else {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    dst -= 8;
+                    src -= 4;
+                    lf = (Uint16) ((src[1] << 8) | src[0]);
+                    rf = (Uint16) ((src[3] << 8) | src[2]);
+                    ce = (lf / 2) + (rf / 2);
+                    rr = lf - ce;
+                    lr = rf - ce;
+                    dst[0] = (lf & 0xFF);
+                    dst[1] = ((lf >> 8) & 0xFF);
+                    dst[2] = (rf & 0xFF);
+                    dst[3] = ((rf >> 8) & 0xFF);
+
+                    dst[0 + 4] = (lr & 0xFF);
+                    dst[1 + 4] = ((lr >> 8) & 0xFF);
+                    dst[2 + 4] = (rr & 0xFF);
+                    dst[3 + 4] = ((rr >> 8) & 0xFF);
+                }
+            }
+        }
+        break;
+
+    case AUDIO_S16:
+        {
+            Uint8 *src, *dst;
+            Sint16 lf, rf, ce, lr, rr;
+
+            src = cvt->buf + cvt->len_cvt;
+            dst = cvt->buf + cvt->len_cvt * 2;
+
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    dst -= 8;
+                    src -= 4;
+                    lf = (Sint16) ((src[0] << 8) | src[1]);
+                    rf = (Sint16) ((src[2] << 8) | src[3]);
+                    ce = (lf / 2) + (rf / 2);
+                    rr = lf - ce;
+                    lr = rf - ce;
+                    dst[1] = (lf & 0xFF);
+                    dst[0] = ((lf >> 8) & 0xFF);
+                    dst[3] = (rf & 0xFF);
+                    dst[2] = ((rf >> 8) & 0xFF);
+
+                    dst[1 + 4] = (lr & 0xFF);
+                    dst[0 + 4] = ((lr >> 8) & 0xFF);
+                    dst[3 + 4] = (rr & 0xFF);
+                    dst[2 + 4] = ((rr >> 8) & 0xFF);
+                }
+            } else {
+                for (i = cvt->len_cvt / 4; i; --i) {
+                    dst -= 8;
+                    src -= 4;
+                    lf = (Sint16) ((src[1] << 8) | src[0]);
+                    rf = (Sint16) ((src[3] << 8) | src[2]);
+                    ce = (lf / 2) + (rf / 2);
+                    rr = lf - ce;
+                    lr = rf - ce;
+                    dst[0] = (lf & 0xFF);
+                    dst[1] = ((lf >> 8) & 0xFF);
+                    dst[2] = (rf & 0xFF);
+                    dst[3] = ((rf >> 8) & 0xFF);
+
+                    dst[0 + 4] = (lr & 0xFF);
+                    dst[1 + 4] = ((lr >> 8) & 0xFF);
+                    dst[2 + 4] = (rr & 0xFF);
+                    dst[3 + 4] = ((rr >> 8) & 0xFF);
+                }
+            }
+        }
+        break;
+
+    case AUDIO_S32:
+        {
+            const Uint32 *src = (const Uint32 *) (cvt->buf + cvt->len_cvt);
+            Uint32 *dst = (Uint32 *) (cvt->buf + cvt->len_cvt * 2);
+            Sint32 lf, rf, ce;
+
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 8; i; --i) {
+                    dst -= 4;
+                    src -= 2;
+                    lf = (Sint32) SDL_SwapBE32(src[0]);
+                    rf = (Sint32) SDL_SwapBE32(src[1]);
+                    ce = (lf / 2) + (rf / 2);
+                    dst[0] = src[0];
+                    dst[1] = src[1];
+                    dst[2] = SDL_SwapBE32((Uint32) (lf - ce));
+                    dst[3] = SDL_SwapBE32((Uint32) (rf - ce));
+                }
+            } else {
+                for (i = cvt->len_cvt / 8; i; --i) {
+                    dst -= 4;
+                    src -= 2;
+                    lf = (Sint32) SDL_SwapLE32(src[0]);
+                    rf = (Sint32) SDL_SwapLE32(src[1]);
+                    ce = (lf / 2) + (rf / 2);
+                    dst[0] = src[0];
+                    dst[1] = src[1];
+                    dst[2] = SDL_SwapLE32((Uint32) (lf - ce));
+                    dst[3] = SDL_SwapLE32((Uint32) (rf - ce));
+                }
+            }
+        }
+        break;
+
+    case AUDIO_F32:
+        {
+            const float *src = (const float *) (cvt->buf + cvt->len_cvt);
+            float *dst = (float *) (cvt->buf + cvt->len_cvt * 2);
+            float lf, rf, ce;
+
+            if (SDL_AUDIO_ISBIGENDIAN(format)) {
+                for (i = cvt->len_cvt / 8; i; --i) {
+                    dst -= 4;
+                    src -= 2;
+                    lf = SDL_SwapFloatBE(src[0]);
+                    rf = SDL_SwapFloatBE(src[1]);
+                    ce = (lf / 2) + (rf / 2);
+                    dst[0] = src[0];
+                    dst[1] = src[1];
+                    dst[2] = SDL_SwapFloatBE(lf - ce);
+                    dst[3] = SDL_SwapFloatBE(rf - ce);
+                }
+            } else {
+                for (i = cvt->len_cvt / 8; i; --i) {
+                    dst -= 4;
+                    src -= 2;
+                    lf = SDL_SwapFloatLE(src[0]);
+                    rf = SDL_SwapFloatLE(src[1]);
+                    ce = (lf / 2) + (rf / 2);
+                    dst[0] = src[0];
+                    dst[1] = src[1];
+                    dst[2] = SDL_SwapFloatLE(lf - ce);
+                    dst[3] = SDL_SwapFloatLE(rf - ce);
+                }
+            }
+        }
+        break;
+    }
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+
+int
+SDL_ConvertAudio(SDL_AudioCVT * cvt)
+{
+    /* !!! FIXME: (cvt) should be const; stack-copy it here. */
+    /* !!! FIXME: (actually, we can't...len_cvt needs to be updated. Grr.) */
+
+    /* Make sure there's data to convert */
+    if (cvt->buf == NULL) {
+        SDL_SetError("No buffer allocated for conversion");
+        return (-1);
+    }
+    /* Return okay if no conversion is necessary */
+    cvt->len_cvt = cvt->len;
+    if (cvt->filters[0] == NULL) {
+        return (0);
+    }
+
+    /* Set up the conversion and go! */
+    cvt->filter_index = 0;
+    cvt->filters[0] (cvt, cvt->src_format);
+    return (0);
+}
+
+
+static SDL_AudioFilter
+SDL_HandTunedTypeCVT(SDL_AudioFormat src_fmt, SDL_AudioFormat dst_fmt)
+{
+    /*
+     * Fill in any future conversions that are specialized to a
+     *  processor, platform, compiler, or library here.
+     */
+
+    return NULL;                /* no specialized converter code available. */
+}
+
+
+/*
+ * Find a converter between two data types. We try to select a hand-tuned
+ *  asm/vectorized/optimized function first, and then fallback to an
+ *  autogenerated function that is customized to convert between two
+ *  specific data types.
+ */
+static int
+SDL_BuildAudioTypeCVT(SDL_AudioCVT * cvt,
+                      SDL_AudioFormat src_fmt, SDL_AudioFormat dst_fmt)
+{
+    if (src_fmt != dst_fmt) {
+        const Uint16 src_bitsize = SDL_AUDIO_BITSIZE(src_fmt);
+        const Uint16 dst_bitsize = SDL_AUDIO_BITSIZE(dst_fmt);
+        SDL_AudioFilter filter = SDL_HandTunedTypeCVT(src_fmt, dst_fmt);
+
+        /* No hand-tuned converter? Try the autogenerated ones. */
+        if (filter == NULL) {
+            int i;
+            for (i = 0; sdl_audio_type_filters[i].filter != NULL; i++) {
+                const SDL_AudioTypeFilters *filt = &sdl_audio_type_filters[i];
+                if ((filt->src_fmt == src_fmt) && (filt->dst_fmt == dst_fmt)) {
+                    filter = filt->filter;
+                    break;
+                }
+            }
+
+            if (filter == NULL) {
+                SDL_SetError("No conversion available for these formats");
+                return -1;
+            }
+        }
+
+        /* Update (cvt) with filter details... */
+        cvt->filters[cvt->filter_index++] = filter;
+        if (src_bitsize < dst_bitsize) {
+            const int mult = (dst_bitsize / src_bitsize);
+            cvt->len_mult *= mult;
+            cvt->len_ratio *= mult;
+        } else if (src_bitsize > dst_bitsize) {
+            cvt->len_ratio /= (src_bitsize / dst_bitsize);
+        }
+
+        return 1;               /* added a converter. */
+    }
+
+    return 0;                   /* no conversion necessary. */
+}
+
+
+static SDL_AudioFilter
+SDL_HandTunedResampleCVT(SDL_AudioCVT * cvt, int dst_channels,
+                         int src_rate, int dst_rate)
+{
+    /*
+     * Fill in any future conversions that are specialized to a
+     *  processor, platform, compiler, or library here.
+     */
+
+    return NULL;                /* no specialized converter code available. */
+}
+
+static int
+SDL_FindFrequencyMultiple(const int src_rate, const int dst_rate)
+{
+    int retval = 0;
+
+    /* If we only built with the arbitrary resamplers, ignore multiples. */
+#if !LESS_RESAMPLERS
+    int lo, hi;
+    int div;
+
+    SDL_assert(src_rate != 0);
+    SDL_assert(dst_rate != 0);
+    SDL_assert(src_rate != dst_rate);
+
+    if (src_rate < dst_rate) {
+        lo = src_rate;
+        hi = dst_rate;
+    } else {
+        lo = dst_rate;
+        hi = src_rate;
+    }
+
+    /* zero means "not a supported multiple" ... we only do 2x and 4x. */
+    if ((hi % lo) != 0)
+        return 0;               /* not a multiple. */
+
+    div = hi / lo;
+    retval = ((div == 2) || (div == 4)) ? div : 0;
+#endif
+
+    return retval;
+}
+
+static int
+SDL_BuildAudioResampleCVT(SDL_AudioCVT * cvt, int dst_channels,
+                          int src_rate, int dst_rate)
+{
+    if (src_rate != dst_rate) {
+        SDL_AudioFilter filter = SDL_HandTunedResampleCVT(cvt, dst_channels,
+                                                          src_rate, dst_rate);
+
+        /* No hand-tuned converter? Try the autogenerated ones. */
+        if (filter == NULL) {
+            int i;
+            const int upsample = (src_rate < dst_rate) ? 1 : 0;
+            const int multiple =
+                SDL_FindFrequencyMultiple(src_rate, dst_rate);
+
+            for (i = 0; sdl_audio_rate_filters[i].filter != NULL; i++) {
+                const SDL_AudioRateFilters *filt = &sdl_audio_rate_filters[i];
+                if ((filt->fmt == cvt->dst_format) &&
+                    (filt->channels == dst_channels) &&
+                    (filt->upsample == upsample) &&
+                    (filt->multiple == multiple)) {
+                    filter = filt->filter;
+                    break;
+                }
+            }
+
+            if (filter == NULL) {
+                SDL_SetError("No conversion available for these rates");
+                return -1;
+            }
+        }
+
+        /* Update (cvt) with filter details... */
+        cvt->filters[cvt->filter_index++] = filter;
+        if (src_rate < dst_rate) {
+            const double mult = ((double) dst_rate) / ((double) src_rate);
+            cvt->len_mult *= (int) SDL_ceil(mult);
+            cvt->len_ratio *= mult;
+        } else {
+            cvt->len_ratio /= ((double) src_rate) / ((double) dst_rate);
+        }
+
+        return 1;               /* added a converter. */
+    }
+
+    return 0;                   /* no conversion necessary. */
+}
+
+
+/* Creates a set of audio filters to convert from one format to another.
+   Returns -1 if the format conversion is not supported, 0 if there's
+   no conversion needed, or 1 if the audio filter is set up.
+*/
+
+int
+SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
+                  SDL_AudioFormat src_fmt, Uint8 src_channels, int src_rate,
+                  SDL_AudioFormat dst_fmt, Uint8 dst_channels, int dst_rate)
+{
+    /*
+     * !!! FIXME: reorder filters based on which grow/shrink the buffer.
+     * !!! FIXME: ideally, we should do everything that shrinks the buffer
+     * !!! FIXME: first, so we don't have to process as many bytes in a given
+     * !!! FIXME: filter and abuse the CPU cache less. This might not be as
+     * !!! FIXME: good in practice as it sounds in theory, though.
+     */
+
+    /* Sanity check target pointer */
+    if (cvt == NULL) {
+        return SDL_InvalidParamError("cvt");
+    }
+
+    /* there are no unsigned types over 16 bits, so catch this up front. */
+    if ((SDL_AUDIO_BITSIZE(src_fmt) > 16) && (!SDL_AUDIO_ISSIGNED(src_fmt))) {
+        return SDL_SetError("Invalid source format");
+    }
+    if ((SDL_AUDIO_BITSIZE(dst_fmt) > 16) && (!SDL_AUDIO_ISSIGNED(dst_fmt))) {
+        return SDL_SetError("Invalid destination format");
+    }
+
+    /* prevent possible divisions by zero, etc. */
+    if ((src_channels == 0) || (dst_channels == 0)) {
+        return SDL_SetError("Source or destination channels is zero");
+    }
+    if ((src_rate == 0) || (dst_rate == 0)) {
+        return SDL_SetError("Source or destination rate is zero");
+    }
+#ifdef DEBUG_CONVERT
+    printf("Build format %04x->%04x, channels %u->%u, rate %d->%d\n",
+           src_fmt, dst_fmt, src_channels, dst_channels, src_rate, dst_rate);
+#endif
+
+    /* Start off with no conversion necessary */
+    SDL_zerop(cvt);
+    cvt->src_format = src_fmt;
+    cvt->dst_format = dst_fmt;
+    cvt->needed = 0;
+    cvt->filter_index = 0;
+    cvt->filters[0] = NULL;
+    cvt->len_mult = 1;
+    cvt->len_ratio = 1.0;
+    cvt->rate_incr = ((double) dst_rate) / ((double) src_rate);
+
+    /* Convert data types, if necessary. Updates (cvt). */
+    if (SDL_BuildAudioTypeCVT(cvt, src_fmt, dst_fmt) == -1) {
+        return -1;              /* shouldn't happen, but just in case... */
+    }
+
+    /* Channel conversion */
+    if (src_channels != dst_channels) {
+        if ((src_channels == 1) && (dst_channels > 1)) {
+            cvt->filters[cvt->filter_index++] = SDL_ConvertStereo;
+            cvt->len_mult *= 2;
+            src_channels = 2;
+            cvt->len_ratio *= 2;
+        }
+        if ((src_channels == 2) && (dst_channels == 6)) {
+            cvt->filters[cvt->filter_index++] = SDL_ConvertSurround;
+            src_channels = 6;
+            cvt->len_mult *= 3;
+            cvt->len_ratio *= 3;
+        }
+        if ((src_channels == 2) && (dst_channels == 4)) {
+            cvt->filters[cvt->filter_index++] = SDL_ConvertSurround_4;
+            src_channels = 4;
+            cvt->len_mult *= 2;
+            cvt->len_ratio *= 2;
+        }
+        while ((src_channels * 2) <= dst_channels) {
+            cvt->filters[cvt->filter_index++] = SDL_ConvertStereo;
+            cvt->len_mult *= 2;
+            src_channels *= 2;
+            cvt->len_ratio *= 2;
+        }
+        if ((src_channels == 6) && (dst_channels <= 2)) {
+            cvt->filters[cvt->filter_index++] = SDL_ConvertStrip;
+            src_channels = 2;
+            cvt->len_ratio /= 3;
+        }
+        if ((src_channels == 6) && (dst_channels == 4)) {
+            cvt->filters[cvt->filter_index++] = SDL_ConvertStrip_2;
+            src_channels = 4;
+            cvt->len_ratio /= 2;
+        }
+        /* This assumes that 4 channel audio is in the format:
+           Left {front/back} + Right {front/back}
+           so converting to L/R stereo works properly.
+         */
+        while (((src_channels % 2) == 0) &&
+               ((src_channels / 2) >= dst_channels)) {
+            cvt->filters[cvt->filter_index++] = SDL_ConvertMono;
+            src_channels /= 2;
+            cvt->len_ratio /= 2;
+        }
+        if (src_channels != dst_channels) {
+            /* Uh oh.. */ ;
+        }
+    }
+
+    /* Do rate conversion, if necessary. Updates (cvt). */
+    if (SDL_BuildAudioResampleCVT(cvt, dst_channels, src_rate, dst_rate) ==
+        -1) {
+        return -1;              /* shouldn't happen, but just in case... */
+    }
+
+    /* Set up the filter information */
+    if (cvt->filter_index != 0) {
+        cvt->needed = 1;
+        cvt->src_format = src_fmt;
+        cvt->dst_format = dst_fmt;
+        cvt->len = 0;
+        cvt->buf = NULL;
+        cvt->filters[cvt->filter_index] = NULL;
+    }
+    return (cvt->needed);
+}
+
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_audiodev.c b/Source/3rd Party/sdl/src/audio/SDL_audiodev.c
new file mode 100644
index 000000000..e9af62119
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_audiodev.c	
@@ -0,0 +1,113 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Get the name of the audio device we use for output */
+
+#if SDL_AUDIO_DRIVER_BSD || SDL_AUDIO_DRIVER_OSS || SDL_AUDIO_DRIVER_SUNAUDIO
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h> /* For close() */
+
+#include "SDL_stdinc.h"
+#include "SDL_audiodev_c.h"
+
+#ifndef _PATH_DEV_DSP
+#if defined(__NETBSD__) || defined(__OPENBSD__)
+#define _PATH_DEV_DSP  "/dev/audio"
+#else
+#define _PATH_DEV_DSP  "/dev/dsp"
+#endif
+#endif
+#ifndef _PATH_DEV_DSP24
+#define _PATH_DEV_DSP24 "/dev/sound/dsp"
+#endif
+#ifndef _PATH_DEV_AUDIO
+#define _PATH_DEV_AUDIO "/dev/audio"
+#endif
+
+static SDL_INLINE void
+test_device(const char *fname, int flags, int (*test) (int fd),
+            SDL_AddAudioDevice addfn)
+{
+    struct stat sb;
+    if ((stat(fname, &sb) == 0) && (S_ISCHR(sb.st_mode))) {
+        const int audio_fd = open(fname, flags, 0);
+        if (audio_fd >= 0) {
+            if (test(audio_fd)) {
+                addfn(fname);
+            }
+            close(audio_fd);
+        }
+    }
+}
+
+static int
+test_stub(int fd)
+{
+    return 1;
+}
+
+void
+SDL_EnumUnixAudioDevices(int iscapture, int classic, int (*test)(int fd),
+                         SDL_AddAudioDevice addfn)
+{
+    const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT);
+    const char *audiodev;
+    char audiopath[1024];
+
+    if (test == NULL)
+        test = test_stub;
+
+    /* Figure out what our audio device is */
+    if (((audiodev = SDL_getenv("SDL_PATH_DSP")) == NULL) &&
+        ((audiodev = SDL_getenv("AUDIODEV")) == NULL)) {
+        if (classic) {
+            audiodev = _PATH_DEV_AUDIO;
+        } else {
+            struct stat sb;
+
+            /* Added support for /dev/sound/\* in Linux 2.4 */
+            if (((stat("/dev/sound", &sb) == 0) && S_ISDIR(sb.st_mode))
+                && ((stat(_PATH_DEV_DSP24, &sb) == 0)
+                    && S_ISCHR(sb.st_mode))) {
+                audiodev = _PATH_DEV_DSP24;
+            } else {
+                audiodev = _PATH_DEV_DSP;
+            }
+        }
+    }
+    test_device(audiodev, flags, test, addfn);
+
+    if (SDL_strlen(audiodev) < (sizeof(audiopath) - 3)) {
+        int instance = 0;
+        while (instance++ <= 64) {
+            SDL_snprintf(audiopath, SDL_arraysize(audiopath),
+                         "%s%d", audiodev, instance);
+            test_device(audiopath, flags, test, addfn);
+        }
+    }
+}
+
+#endif /* Audio driver selection */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_audiodev_c.h b/Source/3rd Party/sdl/src/audio/SDL_audiodev_c.h
new file mode 100644
index 000000000..1ad0dc101
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_audiodev_c.h	
@@ -0,0 +1,39 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL.h"
+#include "../SDL_internal.h"
+#include "SDL_sysaudio.h"
+
+/* Open the audio device for playback, and don't block if busy */
+/* #define USE_BLOCKING_WRITES */
+
+#ifdef USE_BLOCKING_WRITES
+#define OPEN_FLAGS_OUTPUT O_WRONLY
+#define OPEN_FLAGS_INPUT O_RDONLY
+#else
+#define OPEN_FLAGS_OUTPUT (O_WRONLY|O_NONBLOCK)
+#define OPEN_FLAGS_INPUT (O_RDONLY|O_NONBLOCK)
+#endif
+
+void SDL_EnumUnixAudioDevices(int iscapture, int classic,
+                              int (*test) (int fd), SDL_AddAudioDevice addfn);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_audiomem.h b/Source/3rd Party/sdl/src/audio/SDL_audiomem.h
new file mode 100644
index 000000000..3711ac945
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_audiomem.h	
@@ -0,0 +1,25 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#define SDL_AllocAudioMem   SDL_malloc
+#define SDL_FreeAudioMem    SDL_free
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_audiotypecvt.c b/Source/3rd Party/sdl/src/audio/SDL_audiotypecvt.c
new file mode 100644
index 000000000..18e227736
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_audiotypecvt.c	
@@ -0,0 +1,16015 @@
+/* DO NOT EDIT!  This file is generated by sdlgenaudiocvt.pl */
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../SDL_internal.h"
+#include "SDL_audio.h"
+#include "SDL_audio_c.h"
+
+#ifndef DEBUG_CONVERT
+#define DEBUG_CONVERT 0
+#endif
+
+
+/* If you can guarantee your data and need space, you can eliminate code... */
+
+/* Just build the arbitrary resamplers if you're saving code space. */
+#ifndef LESS_RESAMPLERS
+#define LESS_RESAMPLERS 0
+#endif
+
+/* Don't build any resamplers if you're REALLY saving code space. */
+#ifndef NO_RESAMPLERS
+#define NO_RESAMPLERS 0
+#endif
+
+/* Don't build any type converters if you're saving code space. */
+#ifndef NO_CONVERTERS
+#define NO_CONVERTERS 0
+#endif
+
+
+/* *INDENT-OFF* */
+
+#define DIVBY127 0.0078740157480315f
+#define DIVBY32767 3.05185094759972e-05f
+#define DIVBY2147483647 4.6566128752458e-10f
+
+#if !NO_CONVERTERS
+
+static void SDLCALL
+SDL_Convert_U8_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Sint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S8.\n");
+#endif
+
+    src = (const Uint8 *) cvt->buf;
+    dst = (Sint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, ++src, ++dst) {
+        const Sint8 val = ((*src) ^ 0x80);
+        *dst = ((Sint8) val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U8_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U8 to AUDIO_U16LSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Uint16 val = (((Uint16) *src) << 8);
+        *dst = SDL_SwapLE16(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U8_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S16LSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Sint16 val = (((Sint16) ((*src) ^ 0x80)) << 8);
+        *dst = ((Sint16) SDL_SwapLE16(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U8_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U8 to AUDIO_U16MSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Uint16 val = (((Uint16) *src) << 8);
+        *dst = SDL_SwapBE16(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U8_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S16MSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Sint16 val = (((Sint16) ((*src) ^ 0x80)) << 8);
+        *dst = ((Sint16) SDL_SwapBE16(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U8_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S32LSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((*src) ^ 0x80)) << 24);
+        *dst = ((Sint32) SDL_SwapLE32(val));
+    }
+
+    cvt->len_cvt *= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U8_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U8 to AUDIO_S32MSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((*src) ^ 0x80)) << 24);
+        *dst = ((Sint32) SDL_SwapBE32(val));
+    }
+
+    cvt->len_cvt *= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U8_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U8 to AUDIO_F32LSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const float val = ((((float) *src) * DIVBY127) - 1.0f);
+        *dst = SDL_SwapFloatLE(val);
+    }
+
+    cvt->len_cvt *= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U8_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U8 to AUDIO_F32MSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const float val = ((((float) *src) * DIVBY127) - 1.0f);
+        *dst = SDL_SwapFloatBE(val);
+    }
+
+    cvt->len_cvt *= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S8_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Uint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U8.\n");
+#endif
+
+    src = (const Uint8 *) cvt->buf;
+    dst = (Uint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, ++src, ++dst) {
+        const Uint8 val = ((((Sint8) *src)) ^ 0x80);
+        *dst = val;
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S8_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U16LSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Uint16 val = (((Uint16) ((((Sint8) *src)) ^ 0x80)) << 8);
+        *dst = SDL_SwapLE16(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S8_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S16LSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Sint16 val = (((Sint16) ((Sint8) *src)) << 8);
+        *dst = ((Sint16) SDL_SwapLE16(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S8_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S8 to AUDIO_U16MSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Uint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Uint16 val = (((Uint16) ((((Sint8) *src)) ^ 0x80)) << 8);
+        *dst = SDL_SwapBE16(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S8_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S16MSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint16 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Sint16 val = (((Sint16) ((Sint8) *src)) << 8);
+        *dst = ((Sint16) SDL_SwapBE16(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S8_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S32LSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((Sint8) *src)) << 24);
+        *dst = ((Sint32) SDL_SwapLE32(val));
+    }
+
+    cvt->len_cvt *= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S8_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S8 to AUDIO_S32MSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((Sint8) *src)) << 24);
+        *dst = ((Sint32) SDL_SwapBE32(val));
+    }
+
+    cvt->len_cvt *= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S8_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S8 to AUDIO_F32LSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const float val = (((float) ((Sint8) *src)) * DIVBY127);
+        *dst = SDL_SwapFloatLE(val);
+    }
+
+    cvt->len_cvt *= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S8_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint8 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S8 to AUDIO_F32MSB.\n");
+#endif
+
+    src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint8); i; --i, --src, --dst) {
+        const float val = (((float) ((Sint8) *src)) * DIVBY127);
+        *dst = SDL_SwapFloatBE(val);
+    }
+
+    cvt->len_cvt *= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16LSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_U8.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint8 val = ((Uint8) (SDL_SwapLE16(*src) >> 8));
+        *dst = val;
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16LSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S8.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint8 val = ((Sint8) (((SDL_SwapLE16(*src)) ^ 0x8000) >> 8));
+        *dst = ((Sint8) val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16LSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S16LSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint16 val = ((SDL_SwapLE16(*src)) ^ 0x8000);
+        *dst = ((Sint16) SDL_SwapLE16(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16LSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_U16MSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint16 val = SDL_SwapLE16(*src);
+        *dst = SDL_SwapBE16(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16LSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S16MSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint16 val = ((SDL_SwapLE16(*src)) ^ 0x8000);
+        *dst = ((Sint16) SDL_SwapBE16(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S32LSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((SDL_SwapLE16(*src)) ^ 0x8000)) << 16);
+        *dst = ((Sint32) SDL_SwapLE32(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_S32MSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((SDL_SwapLE16(*src)) ^ 0x8000)) << 16);
+        *dst = ((Sint32) SDL_SwapBE32(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_F32LSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const float val = ((((float) SDL_SwapLE16(*src)) * DIVBY32767) - 1.0f);
+        *dst = SDL_SwapFloatLE(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16LSB to AUDIO_F32MSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const float val = ((((float) SDL_SwapLE16(*src)) * DIVBY32767) - 1.0f);
+        *dst = SDL_SwapFloatBE(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16LSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_U8.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint8 val = ((Uint8) (((((Sint16) SDL_SwapLE16(*src))) ^ 0x8000) >> 8));
+        *dst = val;
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16LSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S8.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint8 val = ((Sint8) (((Sint16) SDL_SwapLE16(*src)) >> 8));
+        *dst = ((Sint8) val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16LSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_U16LSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint16 val = ((((Sint16) SDL_SwapLE16(*src))) ^ 0x8000);
+        *dst = SDL_SwapLE16(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16LSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_U16MSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint16 val = ((((Sint16) SDL_SwapLE16(*src))) ^ 0x8000);
+        *dst = SDL_SwapBE16(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16LSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S16MSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) SDL_SwapLE16(*src));
+        *dst = ((Sint16) SDL_SwapBE16(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S32LSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((Sint16) SDL_SwapLE16(*src))) << 16);
+        *dst = ((Sint32) SDL_SwapLE32(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_S32MSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((Sint16) SDL_SwapLE16(*src))) << 16);
+        *dst = ((Sint32) SDL_SwapBE32(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_F32LSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const float val = (((float) ((Sint16) SDL_SwapLE16(*src))) * DIVBY32767);
+        *dst = SDL_SwapFloatLE(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16LSB to AUDIO_F32MSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const float val = (((float) ((Sint16) SDL_SwapLE16(*src))) * DIVBY32767);
+        *dst = SDL_SwapFloatBE(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16MSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_U8.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint8 val = ((Uint8) (SDL_SwapBE16(*src) >> 8));
+        *dst = val;
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16MSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S8.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint8 val = ((Sint8) (((SDL_SwapBE16(*src)) ^ 0x8000) >> 8));
+        *dst = ((Sint8) val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16MSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_U16LSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint16 val = SDL_SwapBE16(*src);
+        *dst = SDL_SwapLE16(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16MSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S16LSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint16 val = ((SDL_SwapBE16(*src)) ^ 0x8000);
+        *dst = ((Sint16) SDL_SwapLE16(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16MSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S16MSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint16 val = ((SDL_SwapBE16(*src)) ^ 0x8000);
+        *dst = ((Sint16) SDL_SwapBE16(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S32LSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((SDL_SwapBE16(*src)) ^ 0x8000)) << 16);
+        *dst = ((Sint32) SDL_SwapLE32(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_S32MSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((SDL_SwapBE16(*src)) ^ 0x8000)) << 16);
+        *dst = ((Sint32) SDL_SwapBE32(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_F32LSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const float val = ((((float) SDL_SwapBE16(*src)) * DIVBY32767) - 1.0f);
+        *dst = SDL_SwapFloatLE(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_U16MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_U16MSB to AUDIO_F32MSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const float val = ((((float) SDL_SwapBE16(*src)) * DIVBY32767) - 1.0f);
+        *dst = SDL_SwapFloatBE(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16MSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_U8.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint8 val = ((Uint8) (((((Sint16) SDL_SwapBE16(*src))) ^ 0x8000) >> 8));
+        *dst = val;
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16MSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S8.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint8 val = ((Sint8) (((Sint16) SDL_SwapBE16(*src)) >> 8));
+        *dst = ((Sint8) val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16MSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_U16LSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint16 val = ((((Sint16) SDL_SwapBE16(*src))) ^ 0x8000);
+        *dst = SDL_SwapLE16(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16MSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S16LSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) SDL_SwapBE16(*src));
+        *dst = ((Sint16) SDL_SwapLE16(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16MSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_U16MSB.\n");
+#endif
+
+    src = (const Uint16 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, ++src, ++dst) {
+        const Uint16 val = ((((Sint16) SDL_SwapBE16(*src))) ^ 0x8000);
+        *dst = SDL_SwapBE16(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S32LSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((Sint16) SDL_SwapBE16(*src))) << 16);
+        *dst = ((Sint32) SDL_SwapLE32(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_S32MSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((Sint32 *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const Sint32 val = (((Sint32) ((Sint16) SDL_SwapBE16(*src))) << 16);
+        *dst = ((Sint32) SDL_SwapBE32(val));
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_F32LSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const float val = (((float) ((Sint16) SDL_SwapBE16(*src))) * DIVBY32767);
+        *dst = SDL_SwapFloatLE(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S16MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint16 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S16MSB to AUDIO_F32MSB.\n");
+#endif
+
+    src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
+        const float val = (((float) ((Sint16) SDL_SwapBE16(*src))) * DIVBY32767);
+        *dst = SDL_SwapFloatBE(val);
+    }
+
+    cvt->len_cvt *= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32LSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Uint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_U8.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Uint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Uint8 val = ((Uint8) (((((Sint32) SDL_SwapLE32(*src))) ^ 0x80000000) >> 24));
+        *dst = val;
+    }
+
+    cvt->len_cvt /= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32LSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Sint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_S8.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Sint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Sint8 val = ((Sint8) (((Sint32) SDL_SwapLE32(*src)) >> 24));
+        *dst = ((Sint8) val);
+    }
+
+    cvt->len_cvt /= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32LSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_U16LSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Uint16 val = ((Uint16) (((((Sint32) SDL_SwapLE32(*src))) ^ 0x80000000) >> 16));
+        *dst = SDL_SwapLE16(val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32LSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_S16LSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) (((Sint32) SDL_SwapLE32(*src)) >> 16));
+        *dst = ((Sint16) SDL_SwapLE16(val));
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32LSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_U16MSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Uint16 val = ((Uint16) (((((Sint32) SDL_SwapLE32(*src))) ^ 0x80000000) >> 16));
+        *dst = SDL_SwapBE16(val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32LSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_S16MSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) (((Sint32) SDL_SwapLE32(*src)) >> 16));
+        *dst = ((Sint16) SDL_SwapBE16(val));
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_S32MSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Sint32 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Sint32 val = ((Sint32) SDL_SwapLE32(*src));
+        *dst = ((Sint32) SDL_SwapBE32(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32LSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_F32LSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (float *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const float val = (((float) ((Sint32) SDL_SwapLE32(*src))) * DIVBY2147483647);
+        *dst = SDL_SwapFloatLE(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32LSB to AUDIO_F32MSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (float *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const float val = (((float) ((Sint32) SDL_SwapLE32(*src))) * DIVBY2147483647);
+        *dst = SDL_SwapFloatBE(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32MSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Uint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_U8.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Uint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Uint8 val = ((Uint8) (((((Sint32) SDL_SwapBE32(*src))) ^ 0x80000000) >> 24));
+        *dst = val;
+    }
+
+    cvt->len_cvt /= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32MSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Sint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_S8.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Sint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Sint8 val = ((Sint8) (((Sint32) SDL_SwapBE32(*src)) >> 24));
+        *dst = ((Sint8) val);
+    }
+
+    cvt->len_cvt /= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32MSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_U16LSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Uint16 val = ((Uint16) (((((Sint32) SDL_SwapBE32(*src))) ^ 0x80000000) >> 16));
+        *dst = SDL_SwapLE16(val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32MSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_S16LSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) (((Sint32) SDL_SwapBE32(*src)) >> 16));
+        *dst = ((Sint16) SDL_SwapLE16(val));
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32MSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_U16MSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Uint16 val = ((Uint16) (((((Sint32) SDL_SwapBE32(*src))) ^ 0x80000000) >> 16));
+        *dst = SDL_SwapBE16(val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32MSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_S16MSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) (((Sint32) SDL_SwapBE32(*src)) >> 16));
+        *dst = ((Sint16) SDL_SwapBE16(val));
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_S32LSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (Sint32 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const Sint32 val = ((Sint32) SDL_SwapBE32(*src));
+        *dst = ((Sint32) SDL_SwapLE32(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_F32LSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (float *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const float val = (((float) ((Sint32) SDL_SwapBE32(*src))) * DIVBY2147483647);
+        *dst = SDL_SwapFloatLE(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_S32MSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const Uint32 *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_S32MSB to AUDIO_F32MSB.\n");
+#endif
+
+    src = (const Uint32 *) cvt->buf;
+    dst = (float *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (Uint32); i; --i, ++src, ++dst) {
+        const float val = (((float) ((Sint32) SDL_SwapBE32(*src))) * DIVBY2147483647);
+        *dst = SDL_SwapFloatBE(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32LSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Uint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_U8.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Uint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Uint8 val = ((Uint8) ((SDL_SwapFloatLE(*src) + 1.0f) * 127.0f));
+        *dst = val;
+    }
+
+    cvt->len_cvt /= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32LSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S8.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint8 val = ((Sint8) (SDL_SwapFloatLE(*src) * 127.0f));
+        *dst = ((Sint8) val);
+    }
+
+    cvt->len_cvt /= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32LSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_U16LSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Uint16 val = ((Uint16) ((SDL_SwapFloatLE(*src) + 1.0f) * 32767.0f));
+        *dst = SDL_SwapLE16(val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32LSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S16LSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) (SDL_SwapFloatLE(*src) * 32767.0f));
+        *dst = ((Sint16) SDL_SwapLE16(val));
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32LSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_U16MSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Uint16 val = ((Uint16) ((SDL_SwapFloatLE(*src) + 1.0f) * 32767.0f));
+        *dst = SDL_SwapBE16(val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32LSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S16MSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) (SDL_SwapFloatLE(*src) * 32767.0f));
+        *dst = ((Sint16) SDL_SwapBE16(val));
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32LSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S32LSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint32 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint32 val = ((Sint32) (SDL_SwapFloatLE(*src) * 2147483647.0));
+        *dst = ((Sint32) SDL_SwapLE32(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32LSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_S32MSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint32 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint32 val = ((Sint32) (SDL_SwapFloatLE(*src) * 2147483647.0));
+        *dst = ((Sint32) SDL_SwapBE32(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32LSB_to_F32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32LSB to AUDIO_F32MSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (float *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const float val = SDL_SwapFloatLE(*src);
+        *dst = SDL_SwapFloatBE(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32MSB_to_U8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Uint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_U8.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Uint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Uint8 val = ((Uint8) ((SDL_SwapFloatBE(*src) + 1.0f) * 127.0f));
+        *dst = val;
+    }
+
+    cvt->len_cvt /= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32MSB_to_S8(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint8 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S8.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint8 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint8 val = ((Sint8) (SDL_SwapFloatBE(*src) * 127.0f));
+        *dst = ((Sint8) val);
+    }
+
+    cvt->len_cvt /= 4;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S8);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32MSB_to_U16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_U16LSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Uint16 val = ((Uint16) ((SDL_SwapFloatBE(*src) + 1.0f) * 32767.0f));
+        *dst = SDL_SwapLE16(val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32MSB_to_S16LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S16LSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) (SDL_SwapFloatBE(*src) * 32767.0f));
+        *dst = ((Sint16) SDL_SwapLE16(val));
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32MSB_to_U16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Uint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_U16MSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Uint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Uint16 val = ((Uint16) ((SDL_SwapFloatBE(*src) + 1.0f) * 32767.0f));
+        *dst = SDL_SwapBE16(val);
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_U16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32MSB_to_S16MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint16 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S16MSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint16 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint16 val = ((Sint16) (SDL_SwapFloatBE(*src) * 32767.0f));
+        *dst = ((Sint16) SDL_SwapBE16(val));
+    }
+
+    cvt->len_cvt /= 2;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S16MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32MSB_to_S32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S32LSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint32 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint32 val = ((Sint32) (SDL_SwapFloatBE(*src) * 2147483647.0));
+        *dst = ((Sint32) SDL_SwapLE32(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32LSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32MSB_to_S32MSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    Sint32 *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_S32MSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (Sint32 *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const Sint32 val = ((Sint32) (SDL_SwapFloatBE(*src) * 2147483647.0));
+        *dst = ((Sint32) SDL_SwapBE32(val));
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_S32MSB);
+    }
+}
+
+static void SDLCALL
+SDL_Convert_F32MSB_to_F32LSB(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const float *src;
+    float *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_F32MSB to AUDIO_F32LSB.\n");
+#endif
+
+    src = (const float *) cvt->buf;
+    dst = (float *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+        const float val = SDL_SwapFloatBE(*src);
+        *dst = SDL_SwapFloatLE(val);
+    }
+
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_F32LSB);
+    }
+}
+
+#endif  /* !NO_CONVERTERS */
+
+
+const SDL_AudioTypeFilters sdl_audio_type_filters[] =
+{
+#if !NO_CONVERTERS
+    { AUDIO_U8, AUDIO_S8, SDL_Convert_U8_to_S8 },
+    { AUDIO_U8, AUDIO_U16LSB, SDL_Convert_U8_to_U16LSB },
+    { AUDIO_U8, AUDIO_S16LSB, SDL_Convert_U8_to_S16LSB },
+    { AUDIO_U8, AUDIO_U16MSB, SDL_Convert_U8_to_U16MSB },
+    { AUDIO_U8, AUDIO_S16MSB, SDL_Convert_U8_to_S16MSB },
+    { AUDIO_U8, AUDIO_S32LSB, SDL_Convert_U8_to_S32LSB },
+    { AUDIO_U8, AUDIO_S32MSB, SDL_Convert_U8_to_S32MSB },
+    { AUDIO_U8, AUDIO_F32LSB, SDL_Convert_U8_to_F32LSB },
+    { AUDIO_U8, AUDIO_F32MSB, SDL_Convert_U8_to_F32MSB },
+    { AUDIO_S8, AUDIO_U8, SDL_Convert_S8_to_U8 },
+    { AUDIO_S8, AUDIO_U16LSB, SDL_Convert_S8_to_U16LSB },
+    { AUDIO_S8, AUDIO_S16LSB, SDL_Convert_S8_to_S16LSB },
+    { AUDIO_S8, AUDIO_U16MSB, SDL_Convert_S8_to_U16MSB },
+    { AUDIO_S8, AUDIO_S16MSB, SDL_Convert_S8_to_S16MSB },
+    { AUDIO_S8, AUDIO_S32LSB, SDL_Convert_S8_to_S32LSB },
+    { AUDIO_S8, AUDIO_S32MSB, SDL_Convert_S8_to_S32MSB },
+    { AUDIO_S8, AUDIO_F32LSB, SDL_Convert_S8_to_F32LSB },
+    { AUDIO_S8, AUDIO_F32MSB, SDL_Convert_S8_to_F32MSB },
+    { AUDIO_U16LSB, AUDIO_U8, SDL_Convert_U16LSB_to_U8 },
+    { AUDIO_U16LSB, AUDIO_S8, SDL_Convert_U16LSB_to_S8 },
+    { AUDIO_U16LSB, AUDIO_S16LSB, SDL_Convert_U16LSB_to_S16LSB },
+    { AUDIO_U16LSB, AUDIO_U16MSB, SDL_Convert_U16LSB_to_U16MSB },
+    { AUDIO_U16LSB, AUDIO_S16MSB, SDL_Convert_U16LSB_to_S16MSB },
+    { AUDIO_U16LSB, AUDIO_S32LSB, SDL_Convert_U16LSB_to_S32LSB },
+    { AUDIO_U16LSB, AUDIO_S32MSB, SDL_Convert_U16LSB_to_S32MSB },
+    { AUDIO_U16LSB, AUDIO_F32LSB, SDL_Convert_U16LSB_to_F32LSB },
+    { AUDIO_U16LSB, AUDIO_F32MSB, SDL_Convert_U16LSB_to_F32MSB },
+    { AUDIO_S16LSB, AUDIO_U8, SDL_Convert_S16LSB_to_U8 },
+    { AUDIO_S16LSB, AUDIO_S8, SDL_Convert_S16LSB_to_S8 },
+    { AUDIO_S16LSB, AUDIO_U16LSB, SDL_Convert_S16LSB_to_U16LSB },
+    { AUDIO_S16LSB, AUDIO_U16MSB, SDL_Convert_S16LSB_to_U16MSB },
+    { AUDIO_S16LSB, AUDIO_S16MSB, SDL_Convert_S16LSB_to_S16MSB },
+    { AUDIO_S16LSB, AUDIO_S32LSB, SDL_Convert_S16LSB_to_S32LSB },
+    { AUDIO_S16LSB, AUDIO_S32MSB, SDL_Convert_S16LSB_to_S32MSB },
+    { AUDIO_S16LSB, AUDIO_F32LSB, SDL_Convert_S16LSB_to_F32LSB },
+    { AUDIO_S16LSB, AUDIO_F32MSB, SDL_Convert_S16LSB_to_F32MSB },
+    { AUDIO_U16MSB, AUDIO_U8, SDL_Convert_U16MSB_to_U8 },
+    { AUDIO_U16MSB, AUDIO_S8, SDL_Convert_U16MSB_to_S8 },
+    { AUDIO_U16MSB, AUDIO_U16LSB, SDL_Convert_U16MSB_to_U16LSB },
+    { AUDIO_U16MSB, AUDIO_S16LSB, SDL_Convert_U16MSB_to_S16LSB },
+    { AUDIO_U16MSB, AUDIO_S16MSB, SDL_Convert_U16MSB_to_S16MSB },
+    { AUDIO_U16MSB, AUDIO_S32LSB, SDL_Convert_U16MSB_to_S32LSB },
+    { AUDIO_U16MSB, AUDIO_S32MSB, SDL_Convert_U16MSB_to_S32MSB },
+    { AUDIO_U16MSB, AUDIO_F32LSB, SDL_Convert_U16MSB_to_F32LSB },
+    { AUDIO_U16MSB, AUDIO_F32MSB, SDL_Convert_U16MSB_to_F32MSB },
+    { AUDIO_S16MSB, AUDIO_U8, SDL_Convert_S16MSB_to_U8 },
+    { AUDIO_S16MSB, AUDIO_S8, SDL_Convert_S16MSB_to_S8 },
+    { AUDIO_S16MSB, AUDIO_U16LSB, SDL_Convert_S16MSB_to_U16LSB },
+    { AUDIO_S16MSB, AUDIO_S16LSB, SDL_Convert_S16MSB_to_S16LSB },
+    { AUDIO_S16MSB, AUDIO_U16MSB, SDL_Convert_S16MSB_to_U16MSB },
+    { AUDIO_S16MSB, AUDIO_S32LSB, SDL_Convert_S16MSB_to_S32LSB },
+    { AUDIO_S16MSB, AUDIO_S32MSB, SDL_Convert_S16MSB_to_S32MSB },
+    { AUDIO_S16MSB, AUDIO_F32LSB, SDL_Convert_S16MSB_to_F32LSB },
+    { AUDIO_S16MSB, AUDIO_F32MSB, SDL_Convert_S16MSB_to_F32MSB },
+    { AUDIO_S32LSB, AUDIO_U8, SDL_Convert_S32LSB_to_U8 },
+    { AUDIO_S32LSB, AUDIO_S8, SDL_Convert_S32LSB_to_S8 },
+    { AUDIO_S32LSB, AUDIO_U16LSB, SDL_Convert_S32LSB_to_U16LSB },
+    { AUDIO_S32LSB, AUDIO_S16LSB, SDL_Convert_S32LSB_to_S16LSB },
+    { AUDIO_S32LSB, AUDIO_U16MSB, SDL_Convert_S32LSB_to_U16MSB },
+    { AUDIO_S32LSB, AUDIO_S16MSB, SDL_Convert_S32LSB_to_S16MSB },
+    { AUDIO_S32LSB, AUDIO_S32MSB, SDL_Convert_S32LSB_to_S32MSB },
+    { AUDIO_S32LSB, AUDIO_F32LSB, SDL_Convert_S32LSB_to_F32LSB },
+    { AUDIO_S32LSB, AUDIO_F32MSB, SDL_Convert_S32LSB_to_F32MSB },
+    { AUDIO_S32MSB, AUDIO_U8, SDL_Convert_S32MSB_to_U8 },
+    { AUDIO_S32MSB, AUDIO_S8, SDL_Convert_S32MSB_to_S8 },
+    { AUDIO_S32MSB, AUDIO_U16LSB, SDL_Convert_S32MSB_to_U16LSB },
+    { AUDIO_S32MSB, AUDIO_S16LSB, SDL_Convert_S32MSB_to_S16LSB },
+    { AUDIO_S32MSB, AUDIO_U16MSB, SDL_Convert_S32MSB_to_U16MSB },
+    { AUDIO_S32MSB, AUDIO_S16MSB, SDL_Convert_S32MSB_to_S16MSB },
+    { AUDIO_S32MSB, AUDIO_S32LSB, SDL_Convert_S32MSB_to_S32LSB },
+    { AUDIO_S32MSB, AUDIO_F32LSB, SDL_Convert_S32MSB_to_F32LSB },
+    { AUDIO_S32MSB, AUDIO_F32MSB, SDL_Convert_S32MSB_to_F32MSB },
+    { AUDIO_F32LSB, AUDIO_U8, SDL_Convert_F32LSB_to_U8 },
+    { AUDIO_F32LSB, AUDIO_S8, SDL_Convert_F32LSB_to_S8 },
+    { AUDIO_F32LSB, AUDIO_U16LSB, SDL_Convert_F32LSB_to_U16LSB },
+    { AUDIO_F32LSB, AUDIO_S16LSB, SDL_Convert_F32LSB_to_S16LSB },
+    { AUDIO_F32LSB, AUDIO_U16MSB, SDL_Convert_F32LSB_to_U16MSB },
+    { AUDIO_F32LSB, AUDIO_S16MSB, SDL_Convert_F32LSB_to_S16MSB },
+    { AUDIO_F32LSB, AUDIO_S32LSB, SDL_Convert_F32LSB_to_S32LSB },
+    { AUDIO_F32LSB, AUDIO_S32MSB, SDL_Convert_F32LSB_to_S32MSB },
+    { AUDIO_F32LSB, AUDIO_F32MSB, SDL_Convert_F32LSB_to_F32MSB },
+    { AUDIO_F32MSB, AUDIO_U8, SDL_Convert_F32MSB_to_U8 },
+    { AUDIO_F32MSB, AUDIO_S8, SDL_Convert_F32MSB_to_S8 },
+    { AUDIO_F32MSB, AUDIO_U16LSB, SDL_Convert_F32MSB_to_U16LSB },
+    { AUDIO_F32MSB, AUDIO_S16LSB, SDL_Convert_F32MSB_to_S16LSB },
+    { AUDIO_F32MSB, AUDIO_U16MSB, SDL_Convert_F32MSB_to_U16MSB },
+    { AUDIO_F32MSB, AUDIO_S16MSB, SDL_Convert_F32MSB_to_S16MSB },
+    { AUDIO_F32MSB, AUDIO_S32LSB, SDL_Convert_F32MSB_to_S32LSB },
+    { AUDIO_F32MSB, AUDIO_S32MSB, SDL_Convert_F32MSB_to_S32MSB },
+    { AUDIO_F32MSB, AUDIO_F32LSB, SDL_Convert_F32MSB_to_F32LSB },
+#endif  /* !NO_CONVERTERS */
+    { 0, 0, NULL }
+};
+
+
+#if !NO_RESAMPLERS
+
+static void SDLCALL
+SDL_Upsample_U8_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 16;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 1;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Uint8 sample0 = src[0];
+    Uint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = sample0;
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 16;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Uint8 sample0 = src[0];
+    Uint8 last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = sample0;
+            dst++;
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 2;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Uint8 sample1 = src[1];
+    Uint8 sample0 = src[0];
+    Uint8 last_sample1 = sample1;
+    Uint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = sample1;
+        dst[0] = sample0;
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1);
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Uint8 sample0 = src[0];
+    Uint8 sample1 = src[1];
+    Uint8 last_sample0 = sample0;
+    Uint8 last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = sample0;
+            dst[1] = sample1;
+            dst += 2;
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 4;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Uint8 sample3 = src[3];
+    Uint8 sample2 = src[2];
+    Uint8 sample1 = src[1];
+    Uint8 sample0 = src[0];
+    Uint8 last_sample3 = sample3;
+    Uint8 last_sample2 = sample2;
+    Uint8 last_sample1 = sample1;
+    Uint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = sample3;
+        dst[2] = sample2;
+        dst[1] = sample1;
+        dst[0] = sample0;
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1);
+            sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1);
+            sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1);
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Uint8 sample0 = src[0];
+    Uint8 sample1 = src[1];
+    Uint8 sample2 = src[2];
+    Uint8 sample3 = src[3];
+    Uint8 last_sample0 = sample0;
+    Uint8 last_sample1 = sample1;
+    Uint8 last_sample2 = sample2;
+    Uint8 last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = sample0;
+            dst[1] = sample1;
+            dst[2] = sample2;
+            dst[3] = sample3;
+            dst += 4;
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1);
+            sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1);
+            sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 96;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 6;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Uint8 sample5 = src[5];
+    Uint8 sample4 = src[4];
+    Uint8 sample3 = src[3];
+    Uint8 sample2 = src[2];
+    Uint8 sample1 = src[1];
+    Uint8 sample0 = src[0];
+    Uint8 last_sample5 = sample5;
+    Uint8 last_sample4 = sample4;
+    Uint8 last_sample3 = sample3;
+    Uint8 last_sample2 = sample2;
+    Uint8 last_sample1 = sample1;
+    Uint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = sample5;
+        dst[4] = sample4;
+        dst[3] = sample3;
+        dst[2] = sample2;
+        dst[1] = sample1;
+        dst[0] = sample0;
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (Uint8) ((((Sint16) src[5]) + ((Sint16) last_sample5)) >> 1);
+            sample4 = (Uint8) ((((Sint16) src[4]) + ((Sint16) last_sample4)) >> 1);
+            sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1);
+            sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1);
+            sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1);
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 96;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Uint8 sample0 = src[0];
+    Uint8 sample1 = src[1];
+    Uint8 sample2 = src[2];
+    Uint8 sample3 = src[3];
+    Uint8 sample4 = src[4];
+    Uint8 sample5 = src[5];
+    Uint8 last_sample0 = sample0;
+    Uint8 last_sample1 = sample1;
+    Uint8 last_sample2 = sample2;
+    Uint8 last_sample3 = sample3;
+    Uint8 last_sample4 = sample4;
+    Uint8 last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = sample0;
+            dst[1] = sample1;
+            dst[2] = sample2;
+            dst[3] = sample3;
+            dst[4] = sample4;
+            dst[5] = sample5;
+            dst += 6;
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1);
+            sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1);
+            sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1);
+            sample4 = (Uint8) ((((Sint16) src[4]) + ((Sint16) last_sample4)) >> 1);
+            sample5 = (Uint8) ((((Sint16) src[5]) + ((Sint16) last_sample5)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U8, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 8;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Uint8 sample7 = src[7];
+    Uint8 sample6 = src[6];
+    Uint8 sample5 = src[5];
+    Uint8 sample4 = src[4];
+    Uint8 sample3 = src[3];
+    Uint8 sample2 = src[2];
+    Uint8 sample1 = src[1];
+    Uint8 sample0 = src[0];
+    Uint8 last_sample7 = sample7;
+    Uint8 last_sample6 = sample6;
+    Uint8 last_sample5 = sample5;
+    Uint8 last_sample4 = sample4;
+    Uint8 last_sample3 = sample3;
+    Uint8 last_sample2 = sample2;
+    Uint8 last_sample1 = sample1;
+    Uint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = sample7;
+        dst[6] = sample6;
+        dst[5] = sample5;
+        dst[4] = sample4;
+        dst[3] = sample3;
+        dst[2] = sample2;
+        dst[1] = sample1;
+        dst[0] = sample0;
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (Uint8) ((((Sint16) src[7]) + ((Sint16) last_sample7)) >> 1);
+            sample6 = (Uint8) ((((Sint16) src[6]) + ((Sint16) last_sample6)) >> 1);
+            sample5 = (Uint8) ((((Sint16) src[5]) + ((Sint16) last_sample5)) >> 1);
+            sample4 = (Uint8) ((((Sint16) src[4]) + ((Sint16) last_sample4)) >> 1);
+            sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1);
+            sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1);
+            sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1);
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U8, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Uint8 sample0 = src[0];
+    Uint8 sample1 = src[1];
+    Uint8 sample2 = src[2];
+    Uint8 sample3 = src[3];
+    Uint8 sample4 = src[4];
+    Uint8 sample5 = src[5];
+    Uint8 sample6 = src[6];
+    Uint8 sample7 = src[7];
+    Uint8 last_sample0 = sample0;
+    Uint8 last_sample1 = sample1;
+    Uint8 last_sample2 = sample2;
+    Uint8 last_sample3 = sample3;
+    Uint8 last_sample4 = sample4;
+    Uint8 last_sample5 = sample5;
+    Uint8 last_sample6 = sample6;
+    Uint8 last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = sample0;
+            dst[1] = sample1;
+            dst[2] = sample2;
+            dst[3] = sample3;
+            dst[4] = sample4;
+            dst[5] = sample5;
+            dst[6] = sample6;
+            dst[7] = sample7;
+            dst += 8;
+            sample0 = (Uint8) ((((Sint16) src[0]) + ((Sint16) last_sample0)) >> 1);
+            sample1 = (Uint8) ((((Sint16) src[1]) + ((Sint16) last_sample1)) >> 1);
+            sample2 = (Uint8) ((((Sint16) src[2]) + ((Sint16) last_sample2)) >> 1);
+            sample3 = (Uint8) ((((Sint16) src[3]) + ((Sint16) last_sample3)) >> 1);
+            sample4 = (Uint8) ((((Sint16) src[4]) + ((Sint16) last_sample4)) >> 1);
+            sample5 = (Uint8) ((((Sint16) src[5]) + ((Sint16) last_sample5)) >> 1);
+            sample6 = (Uint8) ((((Sint16) src[6]) + ((Sint16) last_sample6)) >> 1);
+            sample7 = (Uint8) ((((Sint16) src[7]) + ((Sint16) last_sample7)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 16;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 1;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = ((Sint8) sample0);
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 16;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint8) sample0);
+            dst++;
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 2;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint8 sample1 = ((Sint8) src[1]);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 last_sample1 = sample1;
+    Sint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = ((Sint8) sample1);
+        dst[0] = ((Sint8) sample0);
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1);
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 sample1 = ((Sint8) src[1]);
+    Sint8 last_sample0 = sample0;
+    Sint8 last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint8) sample0);
+            dst[1] = ((Sint8) sample1);
+            dst += 2;
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 4;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint8 sample3 = ((Sint8) src[3]);
+    Sint8 sample2 = ((Sint8) src[2]);
+    Sint8 sample1 = ((Sint8) src[1]);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 last_sample3 = sample3;
+    Sint8 last_sample2 = sample2;
+    Sint8 last_sample1 = sample1;
+    Sint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = ((Sint8) sample3);
+        dst[2] = ((Sint8) sample2);
+        dst[1] = ((Sint8) sample1);
+        dst[0] = ((Sint8) sample0);
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1);
+            sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1);
+            sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1);
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 sample1 = ((Sint8) src[1]);
+    Sint8 sample2 = ((Sint8) src[2]);
+    Sint8 sample3 = ((Sint8) src[3]);
+    Sint8 last_sample0 = sample0;
+    Sint8 last_sample1 = sample1;
+    Sint8 last_sample2 = sample2;
+    Sint8 last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint8) sample0);
+            dst[1] = ((Sint8) sample1);
+            dst[2] = ((Sint8) sample2);
+            dst[3] = ((Sint8) sample3);
+            dst += 4;
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1);
+            sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1);
+            sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 96;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 6;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint8 sample5 = ((Sint8) src[5]);
+    Sint8 sample4 = ((Sint8) src[4]);
+    Sint8 sample3 = ((Sint8) src[3]);
+    Sint8 sample2 = ((Sint8) src[2]);
+    Sint8 sample1 = ((Sint8) src[1]);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 last_sample5 = sample5;
+    Sint8 last_sample4 = sample4;
+    Sint8 last_sample3 = sample3;
+    Sint8 last_sample2 = sample2;
+    Sint8 last_sample1 = sample1;
+    Sint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = ((Sint8) sample5);
+        dst[4] = ((Sint8) sample4);
+        dst[3] = ((Sint8) sample3);
+        dst[2] = ((Sint8) sample2);
+        dst[1] = ((Sint8) sample1);
+        dst[0] = ((Sint8) sample0);
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (Sint8) ((((Sint16) ((Sint8) src[5])) + ((Sint16) last_sample5)) >> 1);
+            sample4 = (Sint8) ((((Sint16) ((Sint8) src[4])) + ((Sint16) last_sample4)) >> 1);
+            sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1);
+            sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1);
+            sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1);
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 96;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 sample1 = ((Sint8) src[1]);
+    Sint8 sample2 = ((Sint8) src[2]);
+    Sint8 sample3 = ((Sint8) src[3]);
+    Sint8 sample4 = ((Sint8) src[4]);
+    Sint8 sample5 = ((Sint8) src[5]);
+    Sint8 last_sample0 = sample0;
+    Sint8 last_sample1 = sample1;
+    Sint8 last_sample2 = sample2;
+    Sint8 last_sample3 = sample3;
+    Sint8 last_sample4 = sample4;
+    Sint8 last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint8) sample0);
+            dst[1] = ((Sint8) sample1);
+            dst[2] = ((Sint8) sample2);
+            dst[3] = ((Sint8) sample3);
+            dst[4] = ((Sint8) sample4);
+            dst[5] = ((Sint8) sample5);
+            dst += 6;
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1);
+            sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1);
+            sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1);
+            sample4 = (Sint8) ((((Sint16) ((Sint8) src[4])) + ((Sint16) last_sample4)) >> 1);
+            sample5 = (Sint8) ((((Sint16) ((Sint8) src[5])) + ((Sint16) last_sample5)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S8, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 8;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint8 sample7 = ((Sint8) src[7]);
+    Sint8 sample6 = ((Sint8) src[6]);
+    Sint8 sample5 = ((Sint8) src[5]);
+    Sint8 sample4 = ((Sint8) src[4]);
+    Sint8 sample3 = ((Sint8) src[3]);
+    Sint8 sample2 = ((Sint8) src[2]);
+    Sint8 sample1 = ((Sint8) src[1]);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 last_sample7 = sample7;
+    Sint8 last_sample6 = sample6;
+    Sint8 last_sample5 = sample5;
+    Sint8 last_sample4 = sample4;
+    Sint8 last_sample3 = sample3;
+    Sint8 last_sample2 = sample2;
+    Sint8 last_sample1 = sample1;
+    Sint8 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = ((Sint8) sample7);
+        dst[6] = ((Sint8) sample6);
+        dst[5] = ((Sint8) sample5);
+        dst[4] = ((Sint8) sample4);
+        dst[3] = ((Sint8) sample3);
+        dst[2] = ((Sint8) sample2);
+        dst[1] = ((Sint8) sample1);
+        dst[0] = ((Sint8) sample0);
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (Sint8) ((((Sint16) ((Sint8) src[7])) + ((Sint16) last_sample7)) >> 1);
+            sample6 = (Sint8) ((((Sint16) ((Sint8) src[6])) + ((Sint16) last_sample6)) >> 1);
+            sample5 = (Sint8) ((((Sint16) ((Sint8) src[5])) + ((Sint16) last_sample5)) >> 1);
+            sample4 = (Sint8) ((((Sint16) ((Sint8) src[4])) + ((Sint16) last_sample4)) >> 1);
+            sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1);
+            sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1);
+            sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1);
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S8, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint8 sample0 = ((Sint8) src[0]);
+    Sint8 sample1 = ((Sint8) src[1]);
+    Sint8 sample2 = ((Sint8) src[2]);
+    Sint8 sample3 = ((Sint8) src[3]);
+    Sint8 sample4 = ((Sint8) src[4]);
+    Sint8 sample5 = ((Sint8) src[5]);
+    Sint8 sample6 = ((Sint8) src[6]);
+    Sint8 sample7 = ((Sint8) src[7]);
+    Sint8 last_sample0 = sample0;
+    Sint8 last_sample1 = sample1;
+    Sint8 last_sample2 = sample2;
+    Sint8 last_sample3 = sample3;
+    Sint8 last_sample4 = sample4;
+    Sint8 last_sample5 = sample5;
+    Sint8 last_sample6 = sample6;
+    Sint8 last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint8) sample0);
+            dst[1] = ((Sint8) sample1);
+            dst[2] = ((Sint8) sample2);
+            dst[3] = ((Sint8) sample3);
+            dst[4] = ((Sint8) sample4);
+            dst[5] = ((Sint8) sample5);
+            dst[6] = ((Sint8) sample6);
+            dst[7] = ((Sint8) sample7);
+            dst += 8;
+            sample0 = (Sint8) ((((Sint16) ((Sint8) src[0])) + ((Sint16) last_sample0)) >> 1);
+            sample1 = (Sint8) ((((Sint16) ((Sint8) src[1])) + ((Sint16) last_sample1)) >> 1);
+            sample2 = (Sint8) ((((Sint16) ((Sint8) src[2])) + ((Sint16) last_sample2)) >> 1);
+            sample3 = (Sint8) ((((Sint16) ((Sint8) src[3])) + ((Sint16) last_sample3)) >> 1);
+            sample4 = (Sint8) ((((Sint16) ((Sint8) src[4])) + ((Sint16) last_sample4)) >> 1);
+            sample5 = (Sint8) ((((Sint16) ((Sint8) src[5])) + ((Sint16) last_sample5)) >> 1);
+            sample6 = (Sint8) ((((Sint16) ((Sint8) src[6])) + ((Sint16) last_sample6)) >> 1);
+            sample7 = (Sint8) ((((Sint16) ((Sint8) src[7])) + ((Sint16) last_sample7)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = SDL_SwapLE16(sample0);
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapLE16(sample0);
+            dst++;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample1 = SDL_SwapLE16(src[1]);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = SDL_SwapLE16(sample1);
+        dst[0] = SDL_SwapLE16(sample0);
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 sample1 = SDL_SwapLE16(src[1]);
+    Uint16 last_sample0 = sample0;
+    Uint16 last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapLE16(sample0);
+            dst[1] = SDL_SwapLE16(sample1);
+            dst += 2;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample3 = SDL_SwapLE16(src[3]);
+    Uint16 sample2 = SDL_SwapLE16(src[2]);
+    Uint16 sample1 = SDL_SwapLE16(src[1]);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = SDL_SwapLE16(sample3);
+        dst[2] = SDL_SwapLE16(sample2);
+        dst[1] = SDL_SwapLE16(sample1);
+        dst[0] = SDL_SwapLE16(sample0);
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 sample1 = SDL_SwapLE16(src[1]);
+    Uint16 sample2 = SDL_SwapLE16(src[2]);
+    Uint16 sample3 = SDL_SwapLE16(src[3]);
+    Uint16 last_sample0 = sample0;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapLE16(sample0);
+            dst[1] = SDL_SwapLE16(sample1);
+            dst[2] = SDL_SwapLE16(sample2);
+            dst[3] = SDL_SwapLE16(sample3);
+            dst += 4;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 192;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample5 = SDL_SwapLE16(src[5]);
+    Uint16 sample4 = SDL_SwapLE16(src[4]);
+    Uint16 sample3 = SDL_SwapLE16(src[3]);
+    Uint16 sample2 = SDL_SwapLE16(src[2]);
+    Uint16 sample1 = SDL_SwapLE16(src[1]);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 last_sample5 = sample5;
+    Uint16 last_sample4 = sample4;
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = SDL_SwapLE16(sample5);
+        dst[4] = SDL_SwapLE16(sample4);
+        dst[3] = SDL_SwapLE16(sample3);
+        dst[2] = SDL_SwapLE16(sample2);
+        dst[1] = SDL_SwapLE16(sample1);
+        dst[0] = SDL_SwapLE16(sample0);
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (Uint16) ((((Sint32) SDL_SwapLE16(src[5])) + ((Sint32) last_sample5)) >> 1);
+            sample4 = (Uint16) ((((Sint32) SDL_SwapLE16(src[4])) + ((Sint32) last_sample4)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 192;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 sample1 = SDL_SwapLE16(src[1]);
+    Uint16 sample2 = SDL_SwapLE16(src[2]);
+    Uint16 sample3 = SDL_SwapLE16(src[3]);
+    Uint16 sample4 = SDL_SwapLE16(src[4]);
+    Uint16 sample5 = SDL_SwapLE16(src[5]);
+    Uint16 last_sample0 = sample0;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample4 = sample4;
+    Uint16 last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapLE16(sample0);
+            dst[1] = SDL_SwapLE16(sample1);
+            dst[2] = SDL_SwapLE16(sample2);
+            dst[3] = SDL_SwapLE16(sample3);
+            dst[4] = SDL_SwapLE16(sample4);
+            dst[5] = SDL_SwapLE16(sample5);
+            dst += 6;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample4 = (Uint16) ((((Sint32) SDL_SwapLE16(src[4])) + ((Sint32) last_sample4)) >> 1);
+            sample5 = (Uint16) ((((Sint32) SDL_SwapLE16(src[5])) + ((Sint32) last_sample5)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16LSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample7 = SDL_SwapLE16(src[7]);
+    Uint16 sample6 = SDL_SwapLE16(src[6]);
+    Uint16 sample5 = SDL_SwapLE16(src[5]);
+    Uint16 sample4 = SDL_SwapLE16(src[4]);
+    Uint16 sample3 = SDL_SwapLE16(src[3]);
+    Uint16 sample2 = SDL_SwapLE16(src[2]);
+    Uint16 sample1 = SDL_SwapLE16(src[1]);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 last_sample7 = sample7;
+    Uint16 last_sample6 = sample6;
+    Uint16 last_sample5 = sample5;
+    Uint16 last_sample4 = sample4;
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = SDL_SwapLE16(sample7);
+        dst[6] = SDL_SwapLE16(sample6);
+        dst[5] = SDL_SwapLE16(sample5);
+        dst[4] = SDL_SwapLE16(sample4);
+        dst[3] = SDL_SwapLE16(sample3);
+        dst[2] = SDL_SwapLE16(sample2);
+        dst[1] = SDL_SwapLE16(sample1);
+        dst[0] = SDL_SwapLE16(sample0);
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (Uint16) ((((Sint32) SDL_SwapLE16(src[7])) + ((Sint32) last_sample7)) >> 1);
+            sample6 = (Uint16) ((((Sint32) SDL_SwapLE16(src[6])) + ((Sint32) last_sample6)) >> 1);
+            sample5 = (Uint16) ((((Sint32) SDL_SwapLE16(src[5])) + ((Sint32) last_sample5)) >> 1);
+            sample4 = (Uint16) ((((Sint32) SDL_SwapLE16(src[4])) + ((Sint32) last_sample4)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16LSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapLE16(src[0]);
+    Uint16 sample1 = SDL_SwapLE16(src[1]);
+    Uint16 sample2 = SDL_SwapLE16(src[2]);
+    Uint16 sample3 = SDL_SwapLE16(src[3]);
+    Uint16 sample4 = SDL_SwapLE16(src[4]);
+    Uint16 sample5 = SDL_SwapLE16(src[5]);
+    Uint16 sample6 = SDL_SwapLE16(src[6]);
+    Uint16 sample7 = SDL_SwapLE16(src[7]);
+    Uint16 last_sample0 = sample0;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample4 = sample4;
+    Uint16 last_sample5 = sample5;
+    Uint16 last_sample6 = sample6;
+    Uint16 last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapLE16(sample0);
+            dst[1] = SDL_SwapLE16(sample1);
+            dst[2] = SDL_SwapLE16(sample2);
+            dst[3] = SDL_SwapLE16(sample3);
+            dst[4] = SDL_SwapLE16(sample4);
+            dst[5] = SDL_SwapLE16(sample5);
+            dst[6] = SDL_SwapLE16(sample6);
+            dst[7] = SDL_SwapLE16(sample7);
+            dst += 8;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapLE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapLE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapLE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapLE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample4 = (Uint16) ((((Sint32) SDL_SwapLE16(src[4])) + ((Sint32) last_sample4)) >> 1);
+            sample5 = (Uint16) ((((Sint32) SDL_SwapLE16(src[5])) + ((Sint32) last_sample5)) >> 1);
+            sample6 = (Uint16) ((((Sint32) SDL_SwapLE16(src[6])) + ((Sint32) last_sample6)) >> 1);
+            sample7 = (Uint16) ((((Sint32) SDL_SwapLE16(src[7])) + ((Sint32) last_sample7)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+            dst++;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1]));
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = ((Sint16) SDL_SwapLE16(sample1));
+        dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1]));
+    Sint16 last_sample0 = sample0;
+    Sint16 last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+            dst[1] = ((Sint16) SDL_SwapLE16(sample1));
+            dst += 2;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3]));
+    Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2]));
+    Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1]));
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = ((Sint16) SDL_SwapLE16(sample3));
+        dst[2] = ((Sint16) SDL_SwapLE16(sample2));
+        dst[1] = ((Sint16) SDL_SwapLE16(sample1));
+        dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1]));
+    Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2]));
+    Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3]));
+    Sint16 last_sample0 = sample0;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+            dst[1] = ((Sint16) SDL_SwapLE16(sample1));
+            dst[2] = ((Sint16) SDL_SwapLE16(sample2));
+            dst[3] = ((Sint16) SDL_SwapLE16(sample3));
+            dst += 4;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 192;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample5 = ((Sint16) SDL_SwapLE16(src[5]));
+    Sint16 sample4 = ((Sint16) SDL_SwapLE16(src[4]));
+    Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3]));
+    Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2]));
+    Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1]));
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 last_sample5 = sample5;
+    Sint16 last_sample4 = sample4;
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = ((Sint16) SDL_SwapLE16(sample5));
+        dst[4] = ((Sint16) SDL_SwapLE16(sample4));
+        dst[3] = ((Sint16) SDL_SwapLE16(sample3));
+        dst[2] = ((Sint16) SDL_SwapLE16(sample2));
+        dst[1] = ((Sint16) SDL_SwapLE16(sample1));
+        dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[5]))) + ((Sint32) last_sample5)) >> 1);
+            sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[4]))) + ((Sint32) last_sample4)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 192;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1]));
+    Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2]));
+    Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3]));
+    Sint16 sample4 = ((Sint16) SDL_SwapLE16(src[4]));
+    Sint16 sample5 = ((Sint16) SDL_SwapLE16(src[5]));
+    Sint16 last_sample0 = sample0;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample4 = sample4;
+    Sint16 last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+            dst[1] = ((Sint16) SDL_SwapLE16(sample1));
+            dst[2] = ((Sint16) SDL_SwapLE16(sample2));
+            dst[3] = ((Sint16) SDL_SwapLE16(sample3));
+            dst[4] = ((Sint16) SDL_SwapLE16(sample4));
+            dst[5] = ((Sint16) SDL_SwapLE16(sample5));
+            dst += 6;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[4]))) + ((Sint32) last_sample4)) >> 1);
+            sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[5]))) + ((Sint32) last_sample5)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16LSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample7 = ((Sint16) SDL_SwapLE16(src[7]));
+    Sint16 sample6 = ((Sint16) SDL_SwapLE16(src[6]));
+    Sint16 sample5 = ((Sint16) SDL_SwapLE16(src[5]));
+    Sint16 sample4 = ((Sint16) SDL_SwapLE16(src[4]));
+    Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3]));
+    Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2]));
+    Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1]));
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 last_sample7 = sample7;
+    Sint16 last_sample6 = sample6;
+    Sint16 last_sample5 = sample5;
+    Sint16 last_sample4 = sample4;
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = ((Sint16) SDL_SwapLE16(sample7));
+        dst[6] = ((Sint16) SDL_SwapLE16(sample6));
+        dst[5] = ((Sint16) SDL_SwapLE16(sample5));
+        dst[4] = ((Sint16) SDL_SwapLE16(sample4));
+        dst[3] = ((Sint16) SDL_SwapLE16(sample3));
+        dst[2] = ((Sint16) SDL_SwapLE16(sample2));
+        dst[1] = ((Sint16) SDL_SwapLE16(sample1));
+        dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[7]))) + ((Sint32) last_sample7)) >> 1);
+            sample6 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[6]))) + ((Sint32) last_sample6)) >> 1);
+            sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[5]))) + ((Sint32) last_sample5)) >> 1);
+            sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[4]))) + ((Sint32) last_sample4)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16LSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapLE16(src[0]));
+    Sint16 sample1 = ((Sint16) SDL_SwapLE16(src[1]));
+    Sint16 sample2 = ((Sint16) SDL_SwapLE16(src[2]));
+    Sint16 sample3 = ((Sint16) SDL_SwapLE16(src[3]));
+    Sint16 sample4 = ((Sint16) SDL_SwapLE16(src[4]));
+    Sint16 sample5 = ((Sint16) SDL_SwapLE16(src[5]));
+    Sint16 sample6 = ((Sint16) SDL_SwapLE16(src[6]));
+    Sint16 sample7 = ((Sint16) SDL_SwapLE16(src[7]));
+    Sint16 last_sample0 = sample0;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample4 = sample4;
+    Sint16 last_sample5 = sample5;
+    Sint16 last_sample6 = sample6;
+    Sint16 last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapLE16(sample0));
+            dst[1] = ((Sint16) SDL_SwapLE16(sample1));
+            dst[2] = ((Sint16) SDL_SwapLE16(sample2));
+            dst[3] = ((Sint16) SDL_SwapLE16(sample3));
+            dst[4] = ((Sint16) SDL_SwapLE16(sample4));
+            dst[5] = ((Sint16) SDL_SwapLE16(sample5));
+            dst[6] = ((Sint16) SDL_SwapLE16(sample6));
+            dst[7] = ((Sint16) SDL_SwapLE16(sample7));
+            dst += 8;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[4]))) + ((Sint32) last_sample4)) >> 1);
+            sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[5]))) + ((Sint32) last_sample5)) >> 1);
+            sample6 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[6]))) + ((Sint32) last_sample6)) >> 1);
+            sample7 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapLE16(src[7]))) + ((Sint32) last_sample7)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = SDL_SwapBE16(sample0);
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapBE16(sample0);
+            dst++;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample1 = SDL_SwapBE16(src[1]);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = SDL_SwapBE16(sample1);
+        dst[0] = SDL_SwapBE16(sample0);
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 sample1 = SDL_SwapBE16(src[1]);
+    Uint16 last_sample0 = sample0;
+    Uint16 last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapBE16(sample0);
+            dst[1] = SDL_SwapBE16(sample1);
+            dst += 2;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample3 = SDL_SwapBE16(src[3]);
+    Uint16 sample2 = SDL_SwapBE16(src[2]);
+    Uint16 sample1 = SDL_SwapBE16(src[1]);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = SDL_SwapBE16(sample3);
+        dst[2] = SDL_SwapBE16(sample2);
+        dst[1] = SDL_SwapBE16(sample1);
+        dst[0] = SDL_SwapBE16(sample0);
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 sample1 = SDL_SwapBE16(src[1]);
+    Uint16 sample2 = SDL_SwapBE16(src[2]);
+    Uint16 sample3 = SDL_SwapBE16(src[3]);
+    Uint16 last_sample0 = sample0;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapBE16(sample0);
+            dst[1] = SDL_SwapBE16(sample1);
+            dst[2] = SDL_SwapBE16(sample2);
+            dst[3] = SDL_SwapBE16(sample3);
+            dst += 4;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 192;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample5 = SDL_SwapBE16(src[5]);
+    Uint16 sample4 = SDL_SwapBE16(src[4]);
+    Uint16 sample3 = SDL_SwapBE16(src[3]);
+    Uint16 sample2 = SDL_SwapBE16(src[2]);
+    Uint16 sample1 = SDL_SwapBE16(src[1]);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 last_sample5 = sample5;
+    Uint16 last_sample4 = sample4;
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = SDL_SwapBE16(sample5);
+        dst[4] = SDL_SwapBE16(sample4);
+        dst[3] = SDL_SwapBE16(sample3);
+        dst[2] = SDL_SwapBE16(sample2);
+        dst[1] = SDL_SwapBE16(sample1);
+        dst[0] = SDL_SwapBE16(sample0);
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (Uint16) ((((Sint32) SDL_SwapBE16(src[5])) + ((Sint32) last_sample5)) >> 1);
+            sample4 = (Uint16) ((((Sint32) SDL_SwapBE16(src[4])) + ((Sint32) last_sample4)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 192;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 sample1 = SDL_SwapBE16(src[1]);
+    Uint16 sample2 = SDL_SwapBE16(src[2]);
+    Uint16 sample3 = SDL_SwapBE16(src[3]);
+    Uint16 sample4 = SDL_SwapBE16(src[4]);
+    Uint16 sample5 = SDL_SwapBE16(src[5]);
+    Uint16 last_sample0 = sample0;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample4 = sample4;
+    Uint16 last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapBE16(sample0);
+            dst[1] = SDL_SwapBE16(sample1);
+            dst[2] = SDL_SwapBE16(sample2);
+            dst[3] = SDL_SwapBE16(sample3);
+            dst[4] = SDL_SwapBE16(sample4);
+            dst[5] = SDL_SwapBE16(sample5);
+            dst += 6;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample4 = (Uint16) ((((Sint32) SDL_SwapBE16(src[4])) + ((Sint32) last_sample4)) >> 1);
+            sample5 = (Uint16) ((((Sint32) SDL_SwapBE16(src[5])) + ((Sint32) last_sample5)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_U16MSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Uint16 sample7 = SDL_SwapBE16(src[7]);
+    Uint16 sample6 = SDL_SwapBE16(src[6]);
+    Uint16 sample5 = SDL_SwapBE16(src[5]);
+    Uint16 sample4 = SDL_SwapBE16(src[4]);
+    Uint16 sample3 = SDL_SwapBE16(src[3]);
+    Uint16 sample2 = SDL_SwapBE16(src[2]);
+    Uint16 sample1 = SDL_SwapBE16(src[1]);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 last_sample7 = sample7;
+    Uint16 last_sample6 = sample6;
+    Uint16 last_sample5 = sample5;
+    Uint16 last_sample4 = sample4;
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = SDL_SwapBE16(sample7);
+        dst[6] = SDL_SwapBE16(sample6);
+        dst[5] = SDL_SwapBE16(sample5);
+        dst[4] = SDL_SwapBE16(sample4);
+        dst[3] = SDL_SwapBE16(sample3);
+        dst[2] = SDL_SwapBE16(sample2);
+        dst[1] = SDL_SwapBE16(sample1);
+        dst[0] = SDL_SwapBE16(sample0);
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (Uint16) ((((Sint32) SDL_SwapBE16(src[7])) + ((Sint32) last_sample7)) >> 1);
+            sample6 = (Uint16) ((((Sint32) SDL_SwapBE16(src[6])) + ((Sint32) last_sample6)) >> 1);
+            sample5 = (Uint16) ((((Sint32) SDL_SwapBE16(src[5])) + ((Sint32) last_sample5)) >> 1);
+            sample4 = (Uint16) ((((Sint32) SDL_SwapBE16(src[4])) + ((Sint32) last_sample4)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_U16MSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Uint16 sample0 = SDL_SwapBE16(src[0]);
+    Uint16 sample1 = SDL_SwapBE16(src[1]);
+    Uint16 sample2 = SDL_SwapBE16(src[2]);
+    Uint16 sample3 = SDL_SwapBE16(src[3]);
+    Uint16 sample4 = SDL_SwapBE16(src[4]);
+    Uint16 sample5 = SDL_SwapBE16(src[5]);
+    Uint16 sample6 = SDL_SwapBE16(src[6]);
+    Uint16 sample7 = SDL_SwapBE16(src[7]);
+    Uint16 last_sample0 = sample0;
+    Uint16 last_sample1 = sample1;
+    Uint16 last_sample2 = sample2;
+    Uint16 last_sample3 = sample3;
+    Uint16 last_sample4 = sample4;
+    Uint16 last_sample5 = sample5;
+    Uint16 last_sample6 = sample6;
+    Uint16 last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapBE16(sample0);
+            dst[1] = SDL_SwapBE16(sample1);
+            dst[2] = SDL_SwapBE16(sample2);
+            dst[3] = SDL_SwapBE16(sample3);
+            dst[4] = SDL_SwapBE16(sample4);
+            dst[5] = SDL_SwapBE16(sample5);
+            dst[6] = SDL_SwapBE16(sample6);
+            dst[7] = SDL_SwapBE16(sample7);
+            dst += 8;
+            sample0 = (Uint16) ((((Sint32) SDL_SwapBE16(src[0])) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Uint16) ((((Sint32) SDL_SwapBE16(src[1])) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Uint16) ((((Sint32) SDL_SwapBE16(src[2])) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Uint16) ((((Sint32) SDL_SwapBE16(src[3])) + ((Sint32) last_sample3)) >> 1);
+            sample4 = (Uint16) ((((Sint32) SDL_SwapBE16(src[4])) + ((Sint32) last_sample4)) >> 1);
+            sample5 = (Uint16) ((((Sint32) SDL_SwapBE16(src[5])) + ((Sint32) last_sample5)) >> 1);
+            sample6 = (Uint16) ((((Sint32) SDL_SwapBE16(src[6])) + ((Sint32) last_sample6)) >> 1);
+            sample7 = (Uint16) ((((Sint32) SDL_SwapBE16(src[7])) + ((Sint32) last_sample7)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 32;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+            dst++;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1]));
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = ((Sint16) SDL_SwapBE16(sample1));
+        dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1]));
+    Sint16 last_sample0 = sample0;
+    Sint16 last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+            dst[1] = ((Sint16) SDL_SwapBE16(sample1));
+            dst += 2;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3]));
+    Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2]));
+    Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1]));
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = ((Sint16) SDL_SwapBE16(sample3));
+        dst[2] = ((Sint16) SDL_SwapBE16(sample2));
+        dst[1] = ((Sint16) SDL_SwapBE16(sample1));
+        dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1]));
+    Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2]));
+    Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3]));
+    Sint16 last_sample0 = sample0;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+            dst[1] = ((Sint16) SDL_SwapBE16(sample1));
+            dst[2] = ((Sint16) SDL_SwapBE16(sample2));
+            dst[3] = ((Sint16) SDL_SwapBE16(sample3));
+            dst += 4;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 192;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample5 = ((Sint16) SDL_SwapBE16(src[5]));
+    Sint16 sample4 = ((Sint16) SDL_SwapBE16(src[4]));
+    Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3]));
+    Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2]));
+    Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1]));
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 last_sample5 = sample5;
+    Sint16 last_sample4 = sample4;
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = ((Sint16) SDL_SwapBE16(sample5));
+        dst[4] = ((Sint16) SDL_SwapBE16(sample4));
+        dst[3] = ((Sint16) SDL_SwapBE16(sample3));
+        dst[2] = ((Sint16) SDL_SwapBE16(sample2));
+        dst[1] = ((Sint16) SDL_SwapBE16(sample1));
+        dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[5]))) + ((Sint32) last_sample5)) >> 1);
+            sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[4]))) + ((Sint32) last_sample4)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 192;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1]));
+    Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2]));
+    Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3]));
+    Sint16 sample4 = ((Sint16) SDL_SwapBE16(src[4]));
+    Sint16 sample5 = ((Sint16) SDL_SwapBE16(src[5]));
+    Sint16 last_sample0 = sample0;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample4 = sample4;
+    Sint16 last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+            dst[1] = ((Sint16) SDL_SwapBE16(sample1));
+            dst[2] = ((Sint16) SDL_SwapBE16(sample2));
+            dst[3] = ((Sint16) SDL_SwapBE16(sample3));
+            dst[4] = ((Sint16) SDL_SwapBE16(sample4));
+            dst[5] = ((Sint16) SDL_SwapBE16(sample5));
+            dst += 6;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[4]))) + ((Sint32) last_sample4)) >> 1);
+            sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[5]))) + ((Sint32) last_sample5)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S16MSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint16 sample7 = ((Sint16) SDL_SwapBE16(src[7]));
+    Sint16 sample6 = ((Sint16) SDL_SwapBE16(src[6]));
+    Sint16 sample5 = ((Sint16) SDL_SwapBE16(src[5]));
+    Sint16 sample4 = ((Sint16) SDL_SwapBE16(src[4]));
+    Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3]));
+    Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2]));
+    Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1]));
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 last_sample7 = sample7;
+    Sint16 last_sample6 = sample6;
+    Sint16 last_sample5 = sample5;
+    Sint16 last_sample4 = sample4;
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = ((Sint16) SDL_SwapBE16(sample7));
+        dst[6] = ((Sint16) SDL_SwapBE16(sample6));
+        dst[5] = ((Sint16) SDL_SwapBE16(sample5));
+        dst[4] = ((Sint16) SDL_SwapBE16(sample4));
+        dst[3] = ((Sint16) SDL_SwapBE16(sample3));
+        dst[2] = ((Sint16) SDL_SwapBE16(sample2));
+        dst[1] = ((Sint16) SDL_SwapBE16(sample1));
+        dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[7]))) + ((Sint32) last_sample7)) >> 1);
+            sample6 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[6]))) + ((Sint32) last_sample6)) >> 1);
+            sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[5]))) + ((Sint32) last_sample5)) >> 1);
+            sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[4]))) + ((Sint32) last_sample4)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S16MSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint16 sample0 = ((Sint16) SDL_SwapBE16(src[0]));
+    Sint16 sample1 = ((Sint16) SDL_SwapBE16(src[1]));
+    Sint16 sample2 = ((Sint16) SDL_SwapBE16(src[2]));
+    Sint16 sample3 = ((Sint16) SDL_SwapBE16(src[3]));
+    Sint16 sample4 = ((Sint16) SDL_SwapBE16(src[4]));
+    Sint16 sample5 = ((Sint16) SDL_SwapBE16(src[5]));
+    Sint16 sample6 = ((Sint16) SDL_SwapBE16(src[6]));
+    Sint16 sample7 = ((Sint16) SDL_SwapBE16(src[7]));
+    Sint16 last_sample0 = sample0;
+    Sint16 last_sample1 = sample1;
+    Sint16 last_sample2 = sample2;
+    Sint16 last_sample3 = sample3;
+    Sint16 last_sample4 = sample4;
+    Sint16 last_sample5 = sample5;
+    Sint16 last_sample6 = sample6;
+    Sint16 last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint16) SDL_SwapBE16(sample0));
+            dst[1] = ((Sint16) SDL_SwapBE16(sample1));
+            dst[2] = ((Sint16) SDL_SwapBE16(sample2));
+            dst[3] = ((Sint16) SDL_SwapBE16(sample3));
+            dst[4] = ((Sint16) SDL_SwapBE16(sample4));
+            dst[5] = ((Sint16) SDL_SwapBE16(sample5));
+            dst[6] = ((Sint16) SDL_SwapBE16(sample6));
+            dst[7] = ((Sint16) SDL_SwapBE16(sample7));
+            dst += 8;
+            sample0 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[0]))) + ((Sint32) last_sample0)) >> 1);
+            sample1 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[1]))) + ((Sint32) last_sample1)) >> 1);
+            sample2 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[2]))) + ((Sint32) last_sample2)) >> 1);
+            sample3 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[3]))) + ((Sint32) last_sample3)) >> 1);
+            sample4 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[4]))) + ((Sint32) last_sample4)) >> 1);
+            sample5 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[5]))) + ((Sint32) last_sample5)) >> 1);
+            sample6 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[6]))) + ((Sint32) last_sample6)) >> 1);
+            sample7 = (Sint16) ((((Sint32) ((Sint16) SDL_SwapBE16(src[7]))) + ((Sint32) last_sample7)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+            dst++;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1]));
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = ((Sint32) SDL_SwapLE32(sample1));
+        dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1]));
+    Sint32 last_sample0 = sample0;
+    Sint32 last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+            dst[1] = ((Sint32) SDL_SwapLE32(sample1));
+            dst += 2;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3]));
+    Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2]));
+    Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1]));
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = ((Sint32) SDL_SwapLE32(sample3));
+        dst[2] = ((Sint32) SDL_SwapLE32(sample2));
+        dst[1] = ((Sint32) SDL_SwapLE32(sample1));
+        dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1]));
+    Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2]));
+    Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3]));
+    Sint32 last_sample0 = sample0;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+            dst[1] = ((Sint32) SDL_SwapLE32(sample1));
+            dst[2] = ((Sint32) SDL_SwapLE32(sample2));
+            dst[3] = ((Sint32) SDL_SwapLE32(sample3));
+            dst += 4;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 384;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample5 = ((Sint32) SDL_SwapLE32(src[5]));
+    Sint32 sample4 = ((Sint32) SDL_SwapLE32(src[4]));
+    Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3]));
+    Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2]));
+    Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1]));
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 last_sample5 = sample5;
+    Sint32 last_sample4 = sample4;
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = ((Sint32) SDL_SwapLE32(sample5));
+        dst[4] = ((Sint32) SDL_SwapLE32(sample4));
+        dst[3] = ((Sint32) SDL_SwapLE32(sample3));
+        dst[2] = ((Sint32) SDL_SwapLE32(sample2));
+        dst[1] = ((Sint32) SDL_SwapLE32(sample1));
+        dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[5]))) + ((Sint64) last_sample5)) >> 1);
+            sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[4]))) + ((Sint64) last_sample4)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 384;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1]));
+    Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2]));
+    Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3]));
+    Sint32 sample4 = ((Sint32) SDL_SwapLE32(src[4]));
+    Sint32 sample5 = ((Sint32) SDL_SwapLE32(src[5]));
+    Sint32 last_sample0 = sample0;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample4 = sample4;
+    Sint32 last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+            dst[1] = ((Sint32) SDL_SwapLE32(sample1));
+            dst[2] = ((Sint32) SDL_SwapLE32(sample2));
+            dst[3] = ((Sint32) SDL_SwapLE32(sample3));
+            dst[4] = ((Sint32) SDL_SwapLE32(sample4));
+            dst[5] = ((Sint32) SDL_SwapLE32(sample5));
+            dst += 6;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[4]))) + ((Sint64) last_sample4)) >> 1);
+            sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[5]))) + ((Sint64) last_sample5)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32LSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 512;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample7 = ((Sint32) SDL_SwapLE32(src[7]));
+    Sint32 sample6 = ((Sint32) SDL_SwapLE32(src[6]));
+    Sint32 sample5 = ((Sint32) SDL_SwapLE32(src[5]));
+    Sint32 sample4 = ((Sint32) SDL_SwapLE32(src[4]));
+    Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3]));
+    Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2]));
+    Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1]));
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 last_sample7 = sample7;
+    Sint32 last_sample6 = sample6;
+    Sint32 last_sample5 = sample5;
+    Sint32 last_sample4 = sample4;
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = ((Sint32) SDL_SwapLE32(sample7));
+        dst[6] = ((Sint32) SDL_SwapLE32(sample6));
+        dst[5] = ((Sint32) SDL_SwapLE32(sample5));
+        dst[4] = ((Sint32) SDL_SwapLE32(sample4));
+        dst[3] = ((Sint32) SDL_SwapLE32(sample3));
+        dst[2] = ((Sint32) SDL_SwapLE32(sample2));
+        dst[1] = ((Sint32) SDL_SwapLE32(sample1));
+        dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[7]))) + ((Sint64) last_sample7)) >> 1);
+            sample6 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[6]))) + ((Sint64) last_sample6)) >> 1);
+            sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[5]))) + ((Sint64) last_sample5)) >> 1);
+            sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[4]))) + ((Sint64) last_sample4)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32LSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 512;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapLE32(src[0]));
+    Sint32 sample1 = ((Sint32) SDL_SwapLE32(src[1]));
+    Sint32 sample2 = ((Sint32) SDL_SwapLE32(src[2]));
+    Sint32 sample3 = ((Sint32) SDL_SwapLE32(src[3]));
+    Sint32 sample4 = ((Sint32) SDL_SwapLE32(src[4]));
+    Sint32 sample5 = ((Sint32) SDL_SwapLE32(src[5]));
+    Sint32 sample6 = ((Sint32) SDL_SwapLE32(src[6]));
+    Sint32 sample7 = ((Sint32) SDL_SwapLE32(src[7]));
+    Sint32 last_sample0 = sample0;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample4 = sample4;
+    Sint32 last_sample5 = sample5;
+    Sint32 last_sample6 = sample6;
+    Sint32 last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapLE32(sample0));
+            dst[1] = ((Sint32) SDL_SwapLE32(sample1));
+            dst[2] = ((Sint32) SDL_SwapLE32(sample2));
+            dst[3] = ((Sint32) SDL_SwapLE32(sample3));
+            dst[4] = ((Sint32) SDL_SwapLE32(sample4));
+            dst[5] = ((Sint32) SDL_SwapLE32(sample5));
+            dst[6] = ((Sint32) SDL_SwapLE32(sample6));
+            dst[7] = ((Sint32) SDL_SwapLE32(sample7));
+            dst += 8;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[4]))) + ((Sint64) last_sample4)) >> 1);
+            sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[5]))) + ((Sint64) last_sample5)) >> 1);
+            sample6 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[6]))) + ((Sint64) last_sample6)) >> 1);
+            sample7 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapLE32(src[7]))) + ((Sint64) last_sample7)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+            dst++;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1]));
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = ((Sint32) SDL_SwapBE32(sample1));
+        dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1]));
+    Sint32 last_sample0 = sample0;
+    Sint32 last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+            dst[1] = ((Sint32) SDL_SwapBE32(sample1));
+            dst += 2;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3]));
+    Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2]));
+    Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1]));
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = ((Sint32) SDL_SwapBE32(sample3));
+        dst[2] = ((Sint32) SDL_SwapBE32(sample2));
+        dst[1] = ((Sint32) SDL_SwapBE32(sample1));
+        dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1]));
+    Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2]));
+    Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3]));
+    Sint32 last_sample0 = sample0;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+            dst[1] = ((Sint32) SDL_SwapBE32(sample1));
+            dst[2] = ((Sint32) SDL_SwapBE32(sample2));
+            dst[3] = ((Sint32) SDL_SwapBE32(sample3));
+            dst += 4;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 384;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample5 = ((Sint32) SDL_SwapBE32(src[5]));
+    Sint32 sample4 = ((Sint32) SDL_SwapBE32(src[4]));
+    Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3]));
+    Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2]));
+    Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1]));
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 last_sample5 = sample5;
+    Sint32 last_sample4 = sample4;
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = ((Sint32) SDL_SwapBE32(sample5));
+        dst[4] = ((Sint32) SDL_SwapBE32(sample4));
+        dst[3] = ((Sint32) SDL_SwapBE32(sample3));
+        dst[2] = ((Sint32) SDL_SwapBE32(sample2));
+        dst[1] = ((Sint32) SDL_SwapBE32(sample1));
+        dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[5]))) + ((Sint64) last_sample5)) >> 1);
+            sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[4]))) + ((Sint64) last_sample4)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 384;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1]));
+    Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2]));
+    Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3]));
+    Sint32 sample4 = ((Sint32) SDL_SwapBE32(src[4]));
+    Sint32 sample5 = ((Sint32) SDL_SwapBE32(src[5]));
+    Sint32 last_sample0 = sample0;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample4 = sample4;
+    Sint32 last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+            dst[1] = ((Sint32) SDL_SwapBE32(sample1));
+            dst[2] = ((Sint32) SDL_SwapBE32(sample2));
+            dst[3] = ((Sint32) SDL_SwapBE32(sample3));
+            dst[4] = ((Sint32) SDL_SwapBE32(sample4));
+            dst[5] = ((Sint32) SDL_SwapBE32(sample5));
+            dst += 6;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[4]))) + ((Sint64) last_sample4)) >> 1);
+            sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[5]))) + ((Sint64) last_sample5)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_S32MSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 512;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint32 sample7 = ((Sint32) SDL_SwapBE32(src[7]));
+    Sint32 sample6 = ((Sint32) SDL_SwapBE32(src[6]));
+    Sint32 sample5 = ((Sint32) SDL_SwapBE32(src[5]));
+    Sint32 sample4 = ((Sint32) SDL_SwapBE32(src[4]));
+    Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3]));
+    Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2]));
+    Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1]));
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 last_sample7 = sample7;
+    Sint32 last_sample6 = sample6;
+    Sint32 last_sample5 = sample5;
+    Sint32 last_sample4 = sample4;
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = ((Sint32) SDL_SwapBE32(sample7));
+        dst[6] = ((Sint32) SDL_SwapBE32(sample6));
+        dst[5] = ((Sint32) SDL_SwapBE32(sample5));
+        dst[4] = ((Sint32) SDL_SwapBE32(sample4));
+        dst[3] = ((Sint32) SDL_SwapBE32(sample3));
+        dst[2] = ((Sint32) SDL_SwapBE32(sample2));
+        dst[1] = ((Sint32) SDL_SwapBE32(sample1));
+        dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[7]))) + ((Sint64) last_sample7)) >> 1);
+            sample6 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[6]))) + ((Sint64) last_sample6)) >> 1);
+            sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[5]))) + ((Sint64) last_sample5)) >> 1);
+            sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[4]))) + ((Sint64) last_sample4)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_S32MSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 512;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint32 sample0 = ((Sint32) SDL_SwapBE32(src[0]));
+    Sint32 sample1 = ((Sint32) SDL_SwapBE32(src[1]));
+    Sint32 sample2 = ((Sint32) SDL_SwapBE32(src[2]));
+    Sint32 sample3 = ((Sint32) SDL_SwapBE32(src[3]));
+    Sint32 sample4 = ((Sint32) SDL_SwapBE32(src[4]));
+    Sint32 sample5 = ((Sint32) SDL_SwapBE32(src[5]));
+    Sint32 sample6 = ((Sint32) SDL_SwapBE32(src[6]));
+    Sint32 sample7 = ((Sint32) SDL_SwapBE32(src[7]));
+    Sint32 last_sample0 = sample0;
+    Sint32 last_sample1 = sample1;
+    Sint32 last_sample2 = sample2;
+    Sint32 last_sample3 = sample3;
+    Sint32 last_sample4 = sample4;
+    Sint32 last_sample5 = sample5;
+    Sint32 last_sample6 = sample6;
+    Sint32 last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = ((Sint32) SDL_SwapBE32(sample0));
+            dst[1] = ((Sint32) SDL_SwapBE32(sample1));
+            dst[2] = ((Sint32) SDL_SwapBE32(sample2));
+            dst[3] = ((Sint32) SDL_SwapBE32(sample3));
+            dst[4] = ((Sint32) SDL_SwapBE32(sample4));
+            dst[5] = ((Sint32) SDL_SwapBE32(sample5));
+            dst[6] = ((Sint32) SDL_SwapBE32(sample6));
+            dst[7] = ((Sint32) SDL_SwapBE32(sample7));
+            dst += 8;
+            sample0 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[0]))) + ((Sint64) last_sample0)) >> 1);
+            sample1 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[1]))) + ((Sint64) last_sample1)) >> 1);
+            sample2 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[2]))) + ((Sint64) last_sample2)) >> 1);
+            sample3 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[3]))) + ((Sint64) last_sample3)) >> 1);
+            sample4 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[4]))) + ((Sint64) last_sample4)) >> 1);
+            sample5 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[5]))) + ((Sint64) last_sample5)) >> 1);
+            sample6 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[6]))) + ((Sint64) last_sample6)) >> 1);
+            sample7 = (Sint32) ((((Sint64) ((Sint32) SDL_SwapBE32(src[7]))) + ((Sint64) last_sample7)) >> 1);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 1;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1;
+    const float *target = ((const float *) cvt->buf);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = SDL_SwapFloatLE(sample0);
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatLE(sample0);
+            dst++;
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2;
+    const float *target = ((const float *) cvt->buf);
+    float sample1 = SDL_SwapFloatLE(src[1]);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float last_sample1 = sample1;
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = SDL_SwapFloatLE(sample1);
+        dst[0] = SDL_SwapFloatLE(sample0);
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float sample1 = SDL_SwapFloatLE(src[1]);
+    float last_sample0 = sample0;
+    float last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatLE(sample0);
+            dst[1] = SDL_SwapFloatLE(sample1);
+            dst += 2;
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4;
+    const float *target = ((const float *) cvt->buf);
+    float sample3 = SDL_SwapFloatLE(src[3]);
+    float sample2 = SDL_SwapFloatLE(src[2]);
+    float sample1 = SDL_SwapFloatLE(src[1]);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float last_sample3 = sample3;
+    float last_sample2 = sample2;
+    float last_sample1 = sample1;
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = SDL_SwapFloatLE(sample3);
+        dst[2] = SDL_SwapFloatLE(sample2);
+        dst[1] = SDL_SwapFloatLE(sample1);
+        dst[0] = SDL_SwapFloatLE(sample0);
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float sample1 = SDL_SwapFloatLE(src[1]);
+    float sample2 = SDL_SwapFloatLE(src[2]);
+    float sample3 = SDL_SwapFloatLE(src[3]);
+    float last_sample0 = sample0;
+    float last_sample1 = sample1;
+    float last_sample2 = sample2;
+    float last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatLE(sample0);
+            dst[1] = SDL_SwapFloatLE(sample1);
+            dst[2] = SDL_SwapFloatLE(sample2);
+            dst[3] = SDL_SwapFloatLE(sample3);
+            dst += 4;
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 384;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 6;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6;
+    const float *target = ((const float *) cvt->buf);
+    float sample5 = SDL_SwapFloatLE(src[5]);
+    float sample4 = SDL_SwapFloatLE(src[4]);
+    float sample3 = SDL_SwapFloatLE(src[3]);
+    float sample2 = SDL_SwapFloatLE(src[2]);
+    float sample1 = SDL_SwapFloatLE(src[1]);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float last_sample5 = sample5;
+    float last_sample4 = sample4;
+    float last_sample3 = sample3;
+    float last_sample2 = sample2;
+    float last_sample1 = sample1;
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = SDL_SwapFloatLE(sample5);
+        dst[4] = SDL_SwapFloatLE(sample4);
+        dst[3] = SDL_SwapFloatLE(sample3);
+        dst[2] = SDL_SwapFloatLE(sample2);
+        dst[1] = SDL_SwapFloatLE(sample1);
+        dst[0] = SDL_SwapFloatLE(sample0);
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (float) ((((double) SDL_SwapFloatLE(src[5])) + ((double) last_sample5)) * 0.5);
+            sample4 = (float) ((((double) SDL_SwapFloatLE(src[4])) + ((double) last_sample4)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 384;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float sample1 = SDL_SwapFloatLE(src[1]);
+    float sample2 = SDL_SwapFloatLE(src[2]);
+    float sample3 = SDL_SwapFloatLE(src[3]);
+    float sample4 = SDL_SwapFloatLE(src[4]);
+    float sample5 = SDL_SwapFloatLE(src[5]);
+    float last_sample0 = sample0;
+    float last_sample1 = sample1;
+    float last_sample2 = sample2;
+    float last_sample3 = sample3;
+    float last_sample4 = sample4;
+    float last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatLE(sample0);
+            dst[1] = SDL_SwapFloatLE(sample1);
+            dst[2] = SDL_SwapFloatLE(sample2);
+            dst[3] = SDL_SwapFloatLE(sample3);
+            dst[4] = SDL_SwapFloatLE(sample4);
+            dst[5] = SDL_SwapFloatLE(sample5);
+            dst += 6;
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample4 = (float) ((((double) SDL_SwapFloatLE(src[4])) + ((double) last_sample4)) * 0.5);
+            sample5 = (float) ((((double) SDL_SwapFloatLE(src[5])) + ((double) last_sample5)) * 0.5);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32LSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 512;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 8;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8;
+    const float *target = ((const float *) cvt->buf);
+    float sample7 = SDL_SwapFloatLE(src[7]);
+    float sample6 = SDL_SwapFloatLE(src[6]);
+    float sample5 = SDL_SwapFloatLE(src[5]);
+    float sample4 = SDL_SwapFloatLE(src[4]);
+    float sample3 = SDL_SwapFloatLE(src[3]);
+    float sample2 = SDL_SwapFloatLE(src[2]);
+    float sample1 = SDL_SwapFloatLE(src[1]);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float last_sample7 = sample7;
+    float last_sample6 = sample6;
+    float last_sample5 = sample5;
+    float last_sample4 = sample4;
+    float last_sample3 = sample3;
+    float last_sample2 = sample2;
+    float last_sample1 = sample1;
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = SDL_SwapFloatLE(sample7);
+        dst[6] = SDL_SwapFloatLE(sample6);
+        dst[5] = SDL_SwapFloatLE(sample5);
+        dst[4] = SDL_SwapFloatLE(sample4);
+        dst[3] = SDL_SwapFloatLE(sample3);
+        dst[2] = SDL_SwapFloatLE(sample2);
+        dst[1] = SDL_SwapFloatLE(sample1);
+        dst[0] = SDL_SwapFloatLE(sample0);
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (float) ((((double) SDL_SwapFloatLE(src[7])) + ((double) last_sample7)) * 0.5);
+            sample6 = (float) ((((double) SDL_SwapFloatLE(src[6])) + ((double) last_sample6)) * 0.5);
+            sample5 = (float) ((((double) SDL_SwapFloatLE(src[5])) + ((double) last_sample5)) * 0.5);
+            sample4 = (float) ((((double) SDL_SwapFloatLE(src[4])) + ((double) last_sample4)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32LSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 512;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatLE(src[0]);
+    float sample1 = SDL_SwapFloatLE(src[1]);
+    float sample2 = SDL_SwapFloatLE(src[2]);
+    float sample3 = SDL_SwapFloatLE(src[3]);
+    float sample4 = SDL_SwapFloatLE(src[4]);
+    float sample5 = SDL_SwapFloatLE(src[5]);
+    float sample6 = SDL_SwapFloatLE(src[6]);
+    float sample7 = SDL_SwapFloatLE(src[7]);
+    float last_sample0 = sample0;
+    float last_sample1 = sample1;
+    float last_sample2 = sample2;
+    float last_sample3 = sample3;
+    float last_sample4 = sample4;
+    float last_sample5 = sample5;
+    float last_sample6 = sample6;
+    float last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatLE(sample0);
+            dst[1] = SDL_SwapFloatLE(sample1);
+            dst[2] = SDL_SwapFloatLE(sample2);
+            dst[3] = SDL_SwapFloatLE(sample3);
+            dst[4] = SDL_SwapFloatLE(sample4);
+            dst[5] = SDL_SwapFloatLE(sample5);
+            dst[6] = SDL_SwapFloatLE(sample6);
+            dst[7] = SDL_SwapFloatLE(sample7);
+            dst += 8;
+            sample0 = (float) ((((double) SDL_SwapFloatLE(src[0])) + ((double) last_sample0)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatLE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatLE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatLE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample4 = (float) ((((double) SDL_SwapFloatLE(src[4])) + ((double) last_sample4)) * 0.5);
+            sample5 = (float) ((((double) SDL_SwapFloatLE(src[5])) + ((double) last_sample5)) * 0.5);
+            sample6 = (float) ((((double) SDL_SwapFloatLE(src[6])) + ((double) last_sample6)) * 0.5);
+            sample7 = (float) ((((double) SDL_SwapFloatLE(src[7])) + ((double) last_sample7)) * 0.5);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 1;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1;
+    const float *target = ((const float *) cvt->buf);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[0] = SDL_SwapFloatBE(sample0);
+        dst--;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src--;
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_1c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 1 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 64;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float last_sample0 = sample0;
+    while (dst < target) {
+        src++;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatBE(sample0);
+            dst++;
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample0 = sample0;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2;
+    const float *target = ((const float *) cvt->buf);
+    float sample1 = SDL_SwapFloatBE(src[1]);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float last_sample1 = sample1;
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[1] = SDL_SwapFloatBE(sample1);
+        dst[0] = SDL_SwapFloatBE(sample0);
+        dst -= 2;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 2;
+            sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_2c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 2 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 128;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float sample1 = SDL_SwapFloatBE(src[1]);
+    float last_sample0 = sample0;
+    float last_sample1 = sample1;
+    while (dst < target) {
+        src += 2;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatBE(sample0);
+            dst[1] = SDL_SwapFloatBE(sample1);
+            dst += 2;
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4;
+    const float *target = ((const float *) cvt->buf);
+    float sample3 = SDL_SwapFloatBE(src[3]);
+    float sample2 = SDL_SwapFloatBE(src[2]);
+    float sample1 = SDL_SwapFloatBE(src[1]);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float last_sample3 = sample3;
+    float last_sample2 = sample2;
+    float last_sample1 = sample1;
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[3] = SDL_SwapFloatBE(sample3);
+        dst[2] = SDL_SwapFloatBE(sample2);
+        dst[1] = SDL_SwapFloatBE(sample1);
+        dst[0] = SDL_SwapFloatBE(sample0);
+        dst -= 4;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 4;
+            sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_4c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 4 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 256;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float sample1 = SDL_SwapFloatBE(src[1]);
+    float sample2 = SDL_SwapFloatBE(src[2]);
+    float sample3 = SDL_SwapFloatBE(src[3]);
+    float last_sample0 = sample0;
+    float last_sample1 = sample1;
+    float last_sample2 = sample2;
+    float last_sample3 = sample3;
+    while (dst < target) {
+        src += 4;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatBE(sample0);
+            dst[1] = SDL_SwapFloatBE(sample1);
+            dst[2] = SDL_SwapFloatBE(sample2);
+            dst[3] = SDL_SwapFloatBE(sample3);
+            dst += 4;
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 384;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 6;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6;
+    const float *target = ((const float *) cvt->buf);
+    float sample5 = SDL_SwapFloatBE(src[5]);
+    float sample4 = SDL_SwapFloatBE(src[4]);
+    float sample3 = SDL_SwapFloatBE(src[3]);
+    float sample2 = SDL_SwapFloatBE(src[2]);
+    float sample1 = SDL_SwapFloatBE(src[1]);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float last_sample5 = sample5;
+    float last_sample4 = sample4;
+    float last_sample3 = sample3;
+    float last_sample2 = sample2;
+    float last_sample1 = sample1;
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[5] = SDL_SwapFloatBE(sample5);
+        dst[4] = SDL_SwapFloatBE(sample4);
+        dst[3] = SDL_SwapFloatBE(sample3);
+        dst[2] = SDL_SwapFloatBE(sample2);
+        dst[1] = SDL_SwapFloatBE(sample1);
+        dst[0] = SDL_SwapFloatBE(sample0);
+        dst -= 6;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 6;
+            sample5 = (float) ((((double) SDL_SwapFloatBE(src[5])) + ((double) last_sample5)) * 0.5);
+            sample4 = (float) ((((double) SDL_SwapFloatBE(src[4])) + ((double) last_sample4)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_6c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 6 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 384;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float sample1 = SDL_SwapFloatBE(src[1]);
+    float sample2 = SDL_SwapFloatBE(src[2]);
+    float sample3 = SDL_SwapFloatBE(src[3]);
+    float sample4 = SDL_SwapFloatBE(src[4]);
+    float sample5 = SDL_SwapFloatBE(src[5]);
+    float last_sample0 = sample0;
+    float last_sample1 = sample1;
+    float last_sample2 = sample2;
+    float last_sample3 = sample3;
+    float last_sample4 = sample4;
+    float last_sample5 = sample5;
+    while (dst < target) {
+        src += 6;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatBE(sample0);
+            dst[1] = SDL_SwapFloatBE(sample1);
+            dst[2] = SDL_SwapFloatBE(sample2);
+            dst[3] = SDL_SwapFloatBE(sample3);
+            dst[4] = SDL_SwapFloatBE(sample4);
+            dst[5] = SDL_SwapFloatBE(sample5);
+            dst += 6;
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample4 = (float) ((((double) SDL_SwapFloatBE(src[4])) + ((double) last_sample4)) * 0.5);
+            sample5 = (float) ((((double) SDL_SwapFloatBE(src[5])) + ((double) last_sample5)) * 0.5);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample arbitrary (x%f) AUDIO_F32MSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 512;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 8;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8;
+    const float *target = ((const float *) cvt->buf);
+    float sample7 = SDL_SwapFloatBE(src[7]);
+    float sample6 = SDL_SwapFloatBE(src[6]);
+    float sample5 = SDL_SwapFloatBE(src[5]);
+    float sample4 = SDL_SwapFloatBE(src[4]);
+    float sample3 = SDL_SwapFloatBE(src[3]);
+    float sample2 = SDL_SwapFloatBE(src[2]);
+    float sample1 = SDL_SwapFloatBE(src[1]);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float last_sample7 = sample7;
+    float last_sample6 = sample6;
+    float last_sample5 = sample5;
+    float last_sample4 = sample4;
+    float last_sample3 = sample3;
+    float last_sample2 = sample2;
+    float last_sample1 = sample1;
+    float last_sample0 = sample0;
+    while (dst >= target) {
+        dst[7] = SDL_SwapFloatBE(sample7);
+        dst[6] = SDL_SwapFloatBE(sample6);
+        dst[5] = SDL_SwapFloatBE(sample5);
+        dst[4] = SDL_SwapFloatBE(sample4);
+        dst[3] = SDL_SwapFloatBE(sample3);
+        dst[2] = SDL_SwapFloatBE(sample2);
+        dst[1] = SDL_SwapFloatBE(sample1);
+        dst[0] = SDL_SwapFloatBE(sample0);
+        dst -= 8;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            src -= 8;
+            sample7 = (float) ((((double) SDL_SwapFloatBE(src[7])) + ((double) last_sample7)) * 0.5);
+            sample6 = (float) ((((double) SDL_SwapFloatBE(src[6])) + ((double) last_sample6)) * 0.5);
+            sample5 = (float) ((((double) SDL_SwapFloatBE(src[5])) + ((double) last_sample5)) * 0.5);
+            sample4 = (float) ((((double) SDL_SwapFloatBE(src[4])) + ((double) last_sample4)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            last_sample7 = sample7;
+            last_sample6 = sample6;
+            last_sample5 = sample5;
+            last_sample4 = sample4;
+            last_sample3 = sample3;
+            last_sample2 = sample2;
+            last_sample1 = sample1;
+            last_sample0 = sample0;
+            eps -= dstsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_8c(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample arbitrary (x%f) AUDIO_F32MSB, 8 channels.\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - 512;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    float sample0 = SDL_SwapFloatBE(src[0]);
+    float sample1 = SDL_SwapFloatBE(src[1]);
+    float sample2 = SDL_SwapFloatBE(src[2]);
+    float sample3 = SDL_SwapFloatBE(src[3]);
+    float sample4 = SDL_SwapFloatBE(src[4]);
+    float sample5 = SDL_SwapFloatBE(src[5]);
+    float sample6 = SDL_SwapFloatBE(src[6]);
+    float sample7 = SDL_SwapFloatBE(src[7]);
+    float last_sample0 = sample0;
+    float last_sample1 = sample1;
+    float last_sample2 = sample2;
+    float last_sample3 = sample3;
+    float last_sample4 = sample4;
+    float last_sample5 = sample5;
+    float last_sample6 = sample6;
+    float last_sample7 = sample7;
+    while (dst < target) {
+        src += 8;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+            dst[0] = SDL_SwapFloatBE(sample0);
+            dst[1] = SDL_SwapFloatBE(sample1);
+            dst[2] = SDL_SwapFloatBE(sample2);
+            dst[3] = SDL_SwapFloatBE(sample3);
+            dst[4] = SDL_SwapFloatBE(sample4);
+            dst[5] = SDL_SwapFloatBE(sample5);
+            dst[6] = SDL_SwapFloatBE(sample6);
+            dst[7] = SDL_SwapFloatBE(sample7);
+            dst += 8;
+            sample0 = (float) ((((double) SDL_SwapFloatBE(src[0])) + ((double) last_sample0)) * 0.5);
+            sample1 = (float) ((((double) SDL_SwapFloatBE(src[1])) + ((double) last_sample1)) * 0.5);
+            sample2 = (float) ((((double) SDL_SwapFloatBE(src[2])) + ((double) last_sample2)) * 0.5);
+            sample3 = (float) ((((double) SDL_SwapFloatBE(src[3])) + ((double) last_sample3)) * 0.5);
+            sample4 = (float) ((((double) SDL_SwapFloatBE(src[4])) + ((double) last_sample4)) * 0.5);
+            sample5 = (float) ((((double) SDL_SwapFloatBE(src[5])) + ((double) last_sample5)) * 0.5);
+            sample6 = (float) ((((double) SDL_SwapFloatBE(src[6])) + ((double) last_sample6)) * 0.5);
+            sample7 = (float) ((((double) SDL_SwapFloatBE(src[7])) + ((double) last_sample7)) * 0.5);
+            last_sample0 = sample0;
+            last_sample1 = sample1;
+            last_sample2 = sample2;
+            last_sample3 = sample3;
+            last_sample4 = sample4;
+            last_sample5 = sample5;
+            last_sample6 = sample6;
+            last_sample7 = sample7;
+            eps -= srcsize;
+        }
+    }
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+
+#if !LESS_RESAMPLERS
+
+static void SDLCALL
+SDL_Upsample_U8_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U8, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 1 * 2;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        src--;
+        dst[1] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[0] = (Uint8) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U8, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        src += 2;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U8, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 1 * 4;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        src--;
+        dst[3] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[2] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[0] = (Uint8) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U8, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        src += 4;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U8, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 2 * 2;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample0 = (Sint16) src[0];
+        src -= 2;
+        dst[3] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) sample1;
+        dst[0] = (Uint8) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U8, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    Sint16 last_sample1 = (Sint16) src[1];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        const Sint16 sample1 = (Sint16) src[1];
+        src += 4;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U8, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 2 * 4;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample0 = (Sint16) src[0];
+        src -= 2;
+        dst[7] = (Uint8) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[6] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[5] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Uint8) (((3 * sample1) + last_sample1) >> 2);
+        dst[2] = (Uint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[1] = (Uint8) sample1;
+        dst[0] = (Uint8) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U8, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    Sint16 last_sample1 = (Sint16) src[1];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        const Sint16 sample1 = (Sint16) src[1];
+        src += 8;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U8, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 4 * 2;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample0 = (Sint16) src[0];
+        src -= 4;
+        dst[7] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[6] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[5] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Uint8) sample3;
+        dst[2] = (Uint8) sample2;
+        dst[1] = (Uint8) sample1;
+        dst[0] = (Uint8) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U8, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample3 = (Sint16) src[3];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample3 = (Sint16) src[3];
+        src += 8;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint8) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U8, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 4 * 4;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample0 = (Sint16) src[0];
+        src -= 4;
+        dst[15] = (Uint8) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[14] = (Uint8) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[13] = (Uint8) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[12] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[11] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Uint8) (((3 * sample3) + last_sample3) >> 2);
+        dst[6] = (Uint8) (((3 * sample2) + last_sample2) >> 2);
+        dst[5] = (Uint8) (((3 * sample1) + last_sample1) >> 2);
+        dst[4] = (Uint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[3] = (Uint8) sample3;
+        dst[2] = (Uint8) sample2;
+        dst[1] = (Uint8) sample1;
+        dst[0] = (Uint8) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U8, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample3 = (Sint16) src[3];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample3 = (Sint16) src[3];
+        src += 16;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint8) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U8, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 6 * 2;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample5 = (Sint16) src[5];
+    Sint16 last_sample4 = (Sint16) src[4];
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample5 = (Sint16) src[5];
+        const Sint16 sample4 = (Sint16) src[4];
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample0 = (Sint16) src[0];
+        src -= 6;
+        dst[11] = (Uint8) ((sample5 + last_sample5) >> 1);
+        dst[10] = (Uint8) ((sample4 + last_sample4) >> 1);
+        dst[9] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[8] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[7] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[6] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[5] = (Uint8) sample5;
+        dst[4] = (Uint8) sample4;
+        dst[3] = (Uint8) sample3;
+        dst[2] = (Uint8) sample2;
+        dst[1] = (Uint8) sample1;
+        dst[0] = (Uint8) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U8, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample4 = (Sint16) src[4];
+    Sint16 last_sample5 = (Sint16) src[5];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample4 = (Sint16) src[4];
+        const Sint16 sample5 = (Sint16) src[5];
+        src += 12;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint8) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint8) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U8, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 6 * 4;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample5 = (Sint16) src[5];
+    Sint16 last_sample4 = (Sint16) src[4];
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample5 = (Sint16) src[5];
+        const Sint16 sample4 = (Sint16) src[4];
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample0 = (Sint16) src[0];
+        src -= 6;
+        dst[23] = (Uint8) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[22] = (Uint8) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[21] = (Uint8) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[20] = (Uint8) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[19] = (Uint8) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[18] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[17] = (Uint8) ((sample5 + last_sample5) >> 1);
+        dst[16] = (Uint8) ((sample4 + last_sample4) >> 1);
+        dst[15] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[14] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[13] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[12] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[11] = (Uint8) (((3 * sample5) + last_sample5) >> 2);
+        dst[10] = (Uint8) (((3 * sample4) + last_sample4) >> 2);
+        dst[9] = (Uint8) (((3 * sample3) + last_sample3) >> 2);
+        dst[8] = (Uint8) (((3 * sample2) + last_sample2) >> 2);
+        dst[7] = (Uint8) (((3 * sample1) + last_sample1) >> 2);
+        dst[6] = (Uint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[5] = (Uint8) sample5;
+        dst[4] = (Uint8) sample4;
+        dst[3] = (Uint8) sample3;
+        dst[2] = (Uint8) sample2;
+        dst[1] = (Uint8) sample1;
+        dst[0] = (Uint8) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U8, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample4 = (Sint16) src[4];
+    Sint16 last_sample5 = (Sint16) src[5];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample4 = (Sint16) src[4];
+        const Sint16 sample5 = (Sint16) src[5];
+        src += 24;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint8) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint8) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U8, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 8 * 2;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample7 = (Sint16) src[7];
+    Sint16 last_sample6 = (Sint16) src[6];
+    Sint16 last_sample5 = (Sint16) src[5];
+    Sint16 last_sample4 = (Sint16) src[4];
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample7 = (Sint16) src[7];
+        const Sint16 sample6 = (Sint16) src[6];
+        const Sint16 sample5 = (Sint16) src[5];
+        const Sint16 sample4 = (Sint16) src[4];
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample0 = (Sint16) src[0];
+        src -= 8;
+        dst[15] = (Uint8) ((sample7 + last_sample7) >> 1);
+        dst[14] = (Uint8) ((sample6 + last_sample6) >> 1);
+        dst[13] = (Uint8) ((sample5 + last_sample5) >> 1);
+        dst[12] = (Uint8) ((sample4 + last_sample4) >> 1);
+        dst[11] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Uint8) sample7;
+        dst[6] = (Uint8) sample6;
+        dst[5] = (Uint8) sample5;
+        dst[4] = (Uint8) sample4;
+        dst[3] = (Uint8) sample3;
+        dst[2] = (Uint8) sample2;
+        dst[1] = (Uint8) sample1;
+        dst[0] = (Uint8) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U8, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample4 = (Sint16) src[4];
+    Sint16 last_sample5 = (Sint16) src[5];
+    Sint16 last_sample6 = (Sint16) src[6];
+    Sint16 last_sample7 = (Sint16) src[7];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample4 = (Sint16) src[4];
+        const Sint16 sample5 = (Sint16) src[5];
+        const Sint16 sample6 = (Sint16) src[6];
+        const Sint16 sample7 = (Sint16) src[7];
+        src += 16;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint8) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint8) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Uint8) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Uint8) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U8_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U8, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint8 *dst = ((Uint8 *) (cvt->buf + dstsize)) - 8 * 4;
+    const Uint8 *src = ((Uint8 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Uint8 *target = ((const Uint8 *) cvt->buf);
+    Sint16 last_sample7 = (Sint16) src[7];
+    Sint16 last_sample6 = (Sint16) src[6];
+    Sint16 last_sample5 = (Sint16) src[5];
+    Sint16 last_sample4 = (Sint16) src[4];
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample0 = (Sint16) src[0];
+    while (dst >= target) {
+        const Sint16 sample7 = (Sint16) src[7];
+        const Sint16 sample6 = (Sint16) src[6];
+        const Sint16 sample5 = (Sint16) src[5];
+        const Sint16 sample4 = (Sint16) src[4];
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample0 = (Sint16) src[0];
+        src -= 8;
+        dst[31] = (Uint8) ((sample7 + (3 * last_sample7)) >> 2);
+        dst[30] = (Uint8) ((sample6 + (3 * last_sample6)) >> 2);
+        dst[29] = (Uint8) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[28] = (Uint8) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[27] = (Uint8) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[26] = (Uint8) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[25] = (Uint8) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[24] = (Uint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[23] = (Uint8) ((sample7 + last_sample7) >> 1);
+        dst[22] = (Uint8) ((sample6 + last_sample6) >> 1);
+        dst[21] = (Uint8) ((sample5 + last_sample5) >> 1);
+        dst[20] = (Uint8) ((sample4 + last_sample4) >> 1);
+        dst[19] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[18] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[17] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[16] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[15] = (Uint8) (((3 * sample7) + last_sample7) >> 2);
+        dst[14] = (Uint8) (((3 * sample6) + last_sample6) >> 2);
+        dst[13] = (Uint8) (((3 * sample5) + last_sample5) >> 2);
+        dst[12] = (Uint8) (((3 * sample4) + last_sample4) >> 2);
+        dst[11] = (Uint8) (((3 * sample3) + last_sample3) >> 2);
+        dst[10] = (Uint8) (((3 * sample2) + last_sample2) >> 2);
+        dst[9] = (Uint8) (((3 * sample1) + last_sample1) >> 2);
+        dst[8] = (Uint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[7] = (Uint8) sample7;
+        dst[6] = (Uint8) sample6;
+        dst[5] = (Uint8) sample5;
+        dst[4] = (Uint8) sample4;
+        dst[3] = (Uint8) sample3;
+        dst[2] = (Uint8) sample2;
+        dst[1] = (Uint8) sample1;
+        dst[0] = (Uint8) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U8_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U8, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint8 *dst = (Uint8 *) cvt->buf;
+    const Uint8 *src = (Uint8 *) cvt->buf;
+    const Uint8 *target = (const Uint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) src[0];
+    Sint16 last_sample1 = (Sint16) src[1];
+    Sint16 last_sample2 = (Sint16) src[2];
+    Sint16 last_sample3 = (Sint16) src[3];
+    Sint16 last_sample4 = (Sint16) src[4];
+    Sint16 last_sample5 = (Sint16) src[5];
+    Sint16 last_sample6 = (Sint16) src[6];
+    Sint16 last_sample7 = (Sint16) src[7];
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) src[0];
+        const Sint16 sample1 = (Sint16) src[1];
+        const Sint16 sample2 = (Sint16) src[2];
+        const Sint16 sample3 = (Sint16) src[3];
+        const Sint16 sample4 = (Sint16) src[4];
+        const Sint16 sample5 = (Sint16) src[5];
+        const Sint16 sample6 = (Sint16) src[6];
+        const Sint16 sample7 = (Sint16) src[7];
+        src += 32;
+        dst[0] = (Uint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint8) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint8) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint8) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Uint8) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Uint8) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S8, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 1 * 2;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src--;
+        dst[1] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[0] = (Sint8) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S8, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src += 2;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S8, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 1 * 4;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src--;
+        dst[3] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[2] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[0] = (Sint8) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S8, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src += 4;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S8, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 2 * 2;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src -= 2;
+        dst[3] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) sample1;
+        dst[0] = (Sint8) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S8, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        src += 4;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S8, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 2 * 4;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src -= 2;
+        dst[7] = (Sint8) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[6] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[5] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint8) (((3 * sample1) + last_sample1) >> 2);
+        dst[2] = (Sint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[1] = (Sint8) sample1;
+        dst[0] = (Sint8) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S8, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        src += 8;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S8, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 4 * 2;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src -= 4;
+        dst[7] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[6] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[5] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint8) sample3;
+        dst[2] = (Sint8) sample2;
+        dst[1] = (Sint8) sample1;
+        dst[0] = (Sint8) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S8, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        src += 8;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint8) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S8, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 4 * 4;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src -= 4;
+        dst[15] = (Sint8) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[14] = (Sint8) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[13] = (Sint8) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[12] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[11] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint8) (((3 * sample3) + last_sample3) >> 2);
+        dst[6] = (Sint8) (((3 * sample2) + last_sample2) >> 2);
+        dst[5] = (Sint8) (((3 * sample1) + last_sample1) >> 2);
+        dst[4] = (Sint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[3] = (Sint8) sample3;
+        dst[2] = (Sint8) sample2;
+        dst[1] = (Sint8) sample1;
+        dst[0] = (Sint8) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S8, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        src += 16;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint8) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S8, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 6 * 2;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample5 = (Sint16) ((Sint8) src[5]);
+    Sint16 last_sample4 = (Sint16) ((Sint8) src[4]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample5 = (Sint16) ((Sint8) src[5]);
+        const Sint16 sample4 = (Sint16) ((Sint8) src[4]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src -= 6;
+        dst[11] = (Sint8) ((sample5 + last_sample5) >> 1);
+        dst[10] = (Sint8) ((sample4 + last_sample4) >> 1);
+        dst[9] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[8] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[7] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[6] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[5] = (Sint8) sample5;
+        dst[4] = (Sint8) sample4;
+        dst[3] = (Sint8) sample3;
+        dst[2] = (Sint8) sample2;
+        dst[1] = (Sint8) sample1;
+        dst[0] = (Sint8) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S8, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample4 = (Sint16) ((Sint8) src[4]);
+    Sint16 last_sample5 = (Sint16) ((Sint8) src[5]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample4 = (Sint16) ((Sint8) src[4]);
+        const Sint16 sample5 = (Sint16) ((Sint8) src[5]);
+        src += 12;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint8) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint8) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S8, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 6 * 4;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample5 = (Sint16) ((Sint8) src[5]);
+    Sint16 last_sample4 = (Sint16) ((Sint8) src[4]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample5 = (Sint16) ((Sint8) src[5]);
+        const Sint16 sample4 = (Sint16) ((Sint8) src[4]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src -= 6;
+        dst[23] = (Sint8) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[22] = (Sint8) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[21] = (Sint8) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[20] = (Sint8) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[19] = (Sint8) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[18] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[17] = (Sint8) ((sample5 + last_sample5) >> 1);
+        dst[16] = (Sint8) ((sample4 + last_sample4) >> 1);
+        dst[15] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[14] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[13] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[12] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[11] = (Sint8) (((3 * sample5) + last_sample5) >> 2);
+        dst[10] = (Sint8) (((3 * sample4) + last_sample4) >> 2);
+        dst[9] = (Sint8) (((3 * sample3) + last_sample3) >> 2);
+        dst[8] = (Sint8) (((3 * sample2) + last_sample2) >> 2);
+        dst[7] = (Sint8) (((3 * sample1) + last_sample1) >> 2);
+        dst[6] = (Sint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[5] = (Sint8) sample5;
+        dst[4] = (Sint8) sample4;
+        dst[3] = (Sint8) sample3;
+        dst[2] = (Sint8) sample2;
+        dst[1] = (Sint8) sample1;
+        dst[0] = (Sint8) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S8, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample4 = (Sint16) ((Sint8) src[4]);
+    Sint16 last_sample5 = (Sint16) ((Sint8) src[5]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample4 = (Sint16) ((Sint8) src[4]);
+        const Sint16 sample5 = (Sint16) ((Sint8) src[5]);
+        src += 24;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint8) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint8) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S8, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 8 * 2;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample7 = (Sint16) ((Sint8) src[7]);
+    Sint16 last_sample6 = (Sint16) ((Sint8) src[6]);
+    Sint16 last_sample5 = (Sint16) ((Sint8) src[5]);
+    Sint16 last_sample4 = (Sint16) ((Sint8) src[4]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample7 = (Sint16) ((Sint8) src[7]);
+        const Sint16 sample6 = (Sint16) ((Sint8) src[6]);
+        const Sint16 sample5 = (Sint16) ((Sint8) src[5]);
+        const Sint16 sample4 = (Sint16) ((Sint8) src[4]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src -= 8;
+        dst[15] = (Sint8) ((sample7 + last_sample7) >> 1);
+        dst[14] = (Sint8) ((sample6 + last_sample6) >> 1);
+        dst[13] = (Sint8) ((sample5 + last_sample5) >> 1);
+        dst[12] = (Sint8) ((sample4 + last_sample4) >> 1);
+        dst[11] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint8) sample7;
+        dst[6] = (Sint8) sample6;
+        dst[5] = (Sint8) sample5;
+        dst[4] = (Sint8) sample4;
+        dst[3] = (Sint8) sample3;
+        dst[2] = (Sint8) sample2;
+        dst[1] = (Sint8) sample1;
+        dst[0] = (Sint8) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S8, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample4 = (Sint16) ((Sint8) src[4]);
+    Sint16 last_sample5 = (Sint16) ((Sint8) src[5]);
+    Sint16 last_sample6 = (Sint16) ((Sint8) src[6]);
+    Sint16 last_sample7 = (Sint16) ((Sint8) src[7]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample4 = (Sint16) ((Sint8) src[4]);
+        const Sint16 sample5 = (Sint16) ((Sint8) src[5]);
+        const Sint16 sample6 = (Sint16) ((Sint8) src[6]);
+        const Sint16 sample7 = (Sint16) ((Sint8) src[7]);
+        src += 16;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint8) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint8) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint8) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint8) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S8_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S8, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint8 *dst = ((Sint8 *) (cvt->buf + dstsize)) - 8 * 4;
+    const Sint8 *src = ((Sint8 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint8 *target = ((const Sint8 *) cvt->buf);
+    Sint16 last_sample7 = (Sint16) ((Sint8) src[7]);
+    Sint16 last_sample6 = (Sint16) ((Sint8) src[6]);
+    Sint16 last_sample5 = (Sint16) ((Sint8) src[5]);
+    Sint16 last_sample4 = (Sint16) ((Sint8) src[4]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    while (dst >= target) {
+        const Sint16 sample7 = (Sint16) ((Sint8) src[7]);
+        const Sint16 sample6 = (Sint16) ((Sint8) src[6]);
+        const Sint16 sample5 = (Sint16) ((Sint8) src[5]);
+        const Sint16 sample4 = (Sint16) ((Sint8) src[4]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        src -= 8;
+        dst[31] = (Sint8) ((sample7 + (3 * last_sample7)) >> 2);
+        dst[30] = (Sint8) ((sample6 + (3 * last_sample6)) >> 2);
+        dst[29] = (Sint8) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[28] = (Sint8) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[27] = (Sint8) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[26] = (Sint8) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[25] = (Sint8) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[24] = (Sint8) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[23] = (Sint8) ((sample7 + last_sample7) >> 1);
+        dst[22] = (Sint8) ((sample6 + last_sample6) >> 1);
+        dst[21] = (Sint8) ((sample5 + last_sample5) >> 1);
+        dst[20] = (Sint8) ((sample4 + last_sample4) >> 1);
+        dst[19] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[18] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[17] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[16] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[15] = (Sint8) (((3 * sample7) + last_sample7) >> 2);
+        dst[14] = (Sint8) (((3 * sample6) + last_sample6) >> 2);
+        dst[13] = (Sint8) (((3 * sample5) + last_sample5) >> 2);
+        dst[12] = (Sint8) (((3 * sample4) + last_sample4) >> 2);
+        dst[11] = (Sint8) (((3 * sample3) + last_sample3) >> 2);
+        dst[10] = (Sint8) (((3 * sample2) + last_sample2) >> 2);
+        dst[9] = (Sint8) (((3 * sample1) + last_sample1) >> 2);
+        dst[8] = (Sint8) (((3 * sample0) + last_sample0) >> 2);
+        dst[7] = (Sint8) sample7;
+        dst[6] = (Sint8) sample6;
+        dst[5] = (Sint8) sample5;
+        dst[4] = (Sint8) sample4;
+        dst[3] = (Sint8) sample3;
+        dst[2] = (Sint8) sample2;
+        dst[1] = (Sint8) sample1;
+        dst[0] = (Sint8) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S8_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S8, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint8 *dst = (Sint8 *) cvt->buf;
+    const Sint8 *src = (Sint8 *) cvt->buf;
+    const Sint8 *target = (const Sint8 *) (cvt->buf + dstsize);
+    Sint16 last_sample0 = (Sint16) ((Sint8) src[0]);
+    Sint16 last_sample1 = (Sint16) ((Sint8) src[1]);
+    Sint16 last_sample2 = (Sint16) ((Sint8) src[2]);
+    Sint16 last_sample3 = (Sint16) ((Sint8) src[3]);
+    Sint16 last_sample4 = (Sint16) ((Sint8) src[4]);
+    Sint16 last_sample5 = (Sint16) ((Sint8) src[5]);
+    Sint16 last_sample6 = (Sint16) ((Sint8) src[6]);
+    Sint16 last_sample7 = (Sint16) ((Sint8) src[7]);
+    while (dst < target) {
+        const Sint16 sample0 = (Sint16) ((Sint8) src[0]);
+        const Sint16 sample1 = (Sint16) ((Sint8) src[1]);
+        const Sint16 sample2 = (Sint16) ((Sint8) src[2]);
+        const Sint16 sample3 = (Sint16) ((Sint8) src[3]);
+        const Sint16 sample4 = (Sint16) ((Sint8) src[4]);
+        const Sint16 sample5 = (Sint16) ((Sint8) src[5]);
+        const Sint16 sample6 = (Sint16) ((Sint8) src[6]);
+        const Sint16 sample7 = (Sint16) ((Sint8) src[7]);
+        src += 32;
+        dst[0] = (Sint8) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint8) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint8) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint8) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint8) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint8) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint8) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint8) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src--;
+        dst[1] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[0] = (Uint16) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src += 2;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src--;
+        dst[3] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[2] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[0] = (Uint16) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src += 4;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src -= 2;
+        dst[3] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        src += 4;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src -= 2;
+        dst[7] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[6] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[5] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Uint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[2] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        src += 8;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src -= 4;
+        dst[7] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[6] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[5] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        src += 8;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src -= 4;
+        dst[15] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[14] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[13] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[12] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[11] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Uint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[6] = (Uint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[5] = (Uint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[4] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        src += 16;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]);
+        const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src -= 6;
+        dst[11] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[10] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[9] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[8] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[7] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[6] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[5] = (Uint16) sample5;
+        dst[4] = (Uint16) sample4;
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]);
+        const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]);
+        src += 12;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint16) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]);
+        const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src -= 6;
+        dst[23] = (Uint16) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[22] = (Uint16) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[21] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[20] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[19] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[18] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[17] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[16] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[15] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[14] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[13] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[12] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[11] = (Uint16) (((3 * sample5) + last_sample5) >> 2);
+        dst[10] = (Uint16) (((3 * sample4) + last_sample4) >> 2);
+        dst[9] = (Uint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[8] = (Uint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[7] = (Uint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[6] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[5] = (Uint16) sample5;
+        dst[4] = (Uint16) sample4;
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]);
+        const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]);
+        src += 24;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint16) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample7 = (Sint32) SDL_SwapLE16(src[7]);
+    Sint32 last_sample6 = (Sint32) SDL_SwapLE16(src[6]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample7 = (Sint32) SDL_SwapLE16(src[7]);
+        const Sint32 sample6 = (Sint32) SDL_SwapLE16(src[6]);
+        const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]);
+        const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src -= 8;
+        dst[15] = (Uint16) ((sample7 + last_sample7) >> 1);
+        dst[14] = (Uint16) ((sample6 + last_sample6) >> 1);
+        dst[13] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[12] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[11] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Uint16) sample7;
+        dst[6] = (Uint16) sample6;
+        dst[5] = (Uint16) sample5;
+        dst[4] = (Uint16) sample4;
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]);
+    Sint32 last_sample6 = (Sint32) SDL_SwapLE16(src[6]);
+    Sint32 last_sample7 = (Sint32) SDL_SwapLE16(src[7]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]);
+        const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]);
+        const Sint32 sample6 = (Sint32) SDL_SwapLE16(src[6]);
+        const Sint32 sample7 = (Sint32) SDL_SwapLE16(src[7]);
+        src += 16;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Uint16) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Uint16) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample7 = (Sint32) SDL_SwapLE16(src[7]);
+    Sint32 last_sample6 = (Sint32) SDL_SwapLE16(src[6]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample7 = (Sint32) SDL_SwapLE16(src[7]);
+        const Sint32 sample6 = (Sint32) SDL_SwapLE16(src[6]);
+        const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]);
+        const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        src -= 8;
+        dst[31] = (Uint16) ((sample7 + (3 * last_sample7)) >> 2);
+        dst[30] = (Uint16) ((sample6 + (3 * last_sample6)) >> 2);
+        dst[29] = (Uint16) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[28] = (Uint16) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[27] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[26] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[25] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[24] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[23] = (Uint16) ((sample7 + last_sample7) >> 1);
+        dst[22] = (Uint16) ((sample6 + last_sample6) >> 1);
+        dst[21] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[20] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[19] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[18] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[17] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[16] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[15] = (Uint16) (((3 * sample7) + last_sample7) >> 2);
+        dst[14] = (Uint16) (((3 * sample6) + last_sample6) >> 2);
+        dst[13] = (Uint16) (((3 * sample5) + last_sample5) >> 2);
+        dst[12] = (Uint16) (((3 * sample4) + last_sample4) >> 2);
+        dst[11] = (Uint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[10] = (Uint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[9] = (Uint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[8] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[7] = (Uint16) sample7;
+        dst[6] = (Uint16) sample6;
+        dst[5] = (Uint16) sample5;
+        dst[4] = (Uint16) sample4;
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapLE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapLE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapLE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapLE16(src[3]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapLE16(src[4]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapLE16(src[5]);
+    Sint32 last_sample6 = (Sint32) SDL_SwapLE16(src[6]);
+    Sint32 last_sample7 = (Sint32) SDL_SwapLE16(src[7]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapLE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapLE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapLE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapLE16(src[3]);
+        const Sint32 sample4 = (Sint32) SDL_SwapLE16(src[4]);
+        const Sint32 sample5 = (Sint32) SDL_SwapLE16(src[5]);
+        const Sint32 sample6 = (Sint32) SDL_SwapLE16(src[6]);
+        const Sint32 sample7 = (Sint32) SDL_SwapLE16(src[7]);
+        src += 32;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Uint16) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Uint16) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src--;
+        dst[1] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[0] = (Sint16) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src += 2;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src--;
+        dst[3] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[2] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[0] = (Sint16) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src += 4;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src -= 2;
+        dst[3] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        src += 4;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src -= 2;
+        dst[7] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[6] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[5] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[2] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        src += 8;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src -= 4;
+        dst[7] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[6] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[5] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        src += 8;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src -= 4;
+        dst[15] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[14] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[13] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[12] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[11] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[6] = (Sint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[5] = (Sint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[4] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        src += 16;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src -= 6;
+        dst[11] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[10] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[9] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[8] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[7] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[6] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[5] = (Sint16) sample5;
+        dst[4] = (Sint16) sample4;
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+        src += 12;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint16) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src -= 6;
+        dst[23] = (Sint16) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[22] = (Sint16) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[21] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[20] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[19] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[18] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[17] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[16] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[15] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[14] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[13] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[12] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[11] = (Sint16) (((3 * sample5) + last_sample5) >> 2);
+        dst[10] = (Sint16) (((3 * sample4) + last_sample4) >> 2);
+        dst[9] = (Sint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[8] = (Sint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[7] = (Sint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[6] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[5] = (Sint16) sample5;
+        dst[4] = (Sint16) sample4;
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+        src += 24;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint16) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7]));
+    Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7]));
+        const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src -= 8;
+        dst[15] = (Sint16) ((sample7 + last_sample7) >> 1);
+        dst[14] = (Sint16) ((sample6 + last_sample6) >> 1);
+        dst[13] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[12] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[11] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint16) sample7;
+        dst[6] = (Sint16) sample6;
+        dst[5] = (Sint16) sample5;
+        dst[4] = (Sint16) sample4;
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+    Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6]));
+    Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+        const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6]));
+        const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7]));
+        src += 16;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint16) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint16) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7]));
+    Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7]));
+        const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        src -= 8;
+        dst[31] = (Sint16) ((sample7 + (3 * last_sample7)) >> 2);
+        dst[30] = (Sint16) ((sample6 + (3 * last_sample6)) >> 2);
+        dst[29] = (Sint16) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[28] = (Sint16) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[27] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[26] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[25] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[24] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[23] = (Sint16) ((sample7 + last_sample7) >> 1);
+        dst[22] = (Sint16) ((sample6 + last_sample6) >> 1);
+        dst[21] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[20] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[19] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[18] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[17] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[16] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[15] = (Sint16) (((3 * sample7) + last_sample7) >> 2);
+        dst[14] = (Sint16) (((3 * sample6) + last_sample6) >> 2);
+        dst[13] = (Sint16) (((3 * sample5) + last_sample5) >> 2);
+        dst[12] = (Sint16) (((3 * sample4) + last_sample4) >> 2);
+        dst[11] = (Sint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[10] = (Sint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[9] = (Sint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[8] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[7] = (Sint16) sample7;
+        dst[6] = (Sint16) sample6;
+        dst[5] = (Sint16) sample5;
+        dst[4] = (Sint16) sample4;
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+    Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6]));
+    Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapLE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapLE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapLE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapLE16(src[3]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapLE16(src[4]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapLE16(src[5]));
+        const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapLE16(src[6]));
+        const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapLE16(src[7]));
+        src += 32;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint16) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint16) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src--;
+        dst[1] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[0] = (Uint16) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src += 2;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 1 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src--;
+        dst[3] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[2] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[0] = (Uint16) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src += 4;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src -= 2;
+        dst[3] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        src += 4;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 2 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src -= 2;
+        dst[7] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[6] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[5] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Uint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[2] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        src += 8;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src -= 4;
+        dst[7] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[6] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[5] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        src += 8;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 4 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src -= 4;
+        dst[15] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[14] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[13] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[12] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[11] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Uint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[6] = (Uint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[5] = (Uint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[4] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        src += 16;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]);
+        const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src -= 6;
+        dst[11] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[10] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[9] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[8] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[7] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[6] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[5] = (Uint16) sample5;
+        dst[4] = (Uint16) sample4;
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]);
+        const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]);
+        src += 12;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint16) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 6 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]);
+        const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src -= 6;
+        dst[23] = (Uint16) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[22] = (Uint16) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[21] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[20] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[19] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[18] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[17] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[16] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[15] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[14] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[13] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[12] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[11] = (Uint16) (((3 * sample5) + last_sample5) >> 2);
+        dst[10] = (Uint16) (((3 * sample4) + last_sample4) >> 2);
+        dst[9] = (Uint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[8] = (Uint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[7] = (Uint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[6] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[5] = (Uint16) sample5;
+        dst[4] = (Uint16) sample4;
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]);
+        const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]);
+        src += 24;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint16) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_U16MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8 * 2;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample7 = (Sint32) SDL_SwapBE16(src[7]);
+    Sint32 last_sample6 = (Sint32) SDL_SwapBE16(src[6]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample7 = (Sint32) SDL_SwapBE16(src[7]);
+        const Sint32 sample6 = (Sint32) SDL_SwapBE16(src[6]);
+        const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]);
+        const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src -= 8;
+        dst[15] = (Uint16) ((sample7 + last_sample7) >> 1);
+        dst[14] = (Uint16) ((sample6 + last_sample6) >> 1);
+        dst[13] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[12] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[11] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Uint16) sample7;
+        dst[6] = (Uint16) sample6;
+        dst[5] = (Uint16) sample5;
+        dst[4] = (Uint16) sample4;
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_U16MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]);
+    Sint32 last_sample6 = (Sint32) SDL_SwapBE16(src[6]);
+    Sint32 last_sample7 = (Sint32) SDL_SwapBE16(src[7]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]);
+        const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]);
+        const Sint32 sample6 = (Sint32) SDL_SwapBE16(src[6]);
+        const Sint32 sample7 = (Sint32) SDL_SwapBE16(src[7]);
+        src += 16;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Uint16) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Uint16) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_U16MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_U16MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Uint16 *dst = ((Uint16 *) (cvt->buf + dstsize)) - 8 * 4;
+    const Uint16 *src = ((Uint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Uint16 *target = ((const Uint16 *) cvt->buf);
+    Sint32 last_sample7 = (Sint32) SDL_SwapBE16(src[7]);
+    Sint32 last_sample6 = (Sint32) SDL_SwapBE16(src[6]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    while (dst >= target) {
+        const Sint32 sample7 = (Sint32) SDL_SwapBE16(src[7]);
+        const Sint32 sample6 = (Sint32) SDL_SwapBE16(src[6]);
+        const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]);
+        const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        src -= 8;
+        dst[31] = (Uint16) ((sample7 + (3 * last_sample7)) >> 2);
+        dst[30] = (Uint16) ((sample6 + (3 * last_sample6)) >> 2);
+        dst[29] = (Uint16) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[28] = (Uint16) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[27] = (Uint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[26] = (Uint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[25] = (Uint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[24] = (Uint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[23] = (Uint16) ((sample7 + last_sample7) >> 1);
+        dst[22] = (Uint16) ((sample6 + last_sample6) >> 1);
+        dst[21] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[20] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[19] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[18] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[17] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[16] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[15] = (Uint16) (((3 * sample7) + last_sample7) >> 2);
+        dst[14] = (Uint16) (((3 * sample6) + last_sample6) >> 2);
+        dst[13] = (Uint16) (((3 * sample5) + last_sample5) >> 2);
+        dst[12] = (Uint16) (((3 * sample4) + last_sample4) >> 2);
+        dst[11] = (Uint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[10] = (Uint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[9] = (Uint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[8] = (Uint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[7] = (Uint16) sample7;
+        dst[6] = (Uint16) sample6;
+        dst[5] = (Uint16) sample5;
+        dst[4] = (Uint16) sample4;
+        dst[3] = (Uint16) sample3;
+        dst[2] = (Uint16) sample2;
+        dst[1] = (Uint16) sample1;
+        dst[0] = (Uint16) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_U16MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_U16MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Uint16 *dst = (Uint16 *) cvt->buf;
+    const Uint16 *src = (Uint16 *) cvt->buf;
+    const Uint16 *target = (const Uint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) SDL_SwapBE16(src[0]);
+    Sint32 last_sample1 = (Sint32) SDL_SwapBE16(src[1]);
+    Sint32 last_sample2 = (Sint32) SDL_SwapBE16(src[2]);
+    Sint32 last_sample3 = (Sint32) SDL_SwapBE16(src[3]);
+    Sint32 last_sample4 = (Sint32) SDL_SwapBE16(src[4]);
+    Sint32 last_sample5 = (Sint32) SDL_SwapBE16(src[5]);
+    Sint32 last_sample6 = (Sint32) SDL_SwapBE16(src[6]);
+    Sint32 last_sample7 = (Sint32) SDL_SwapBE16(src[7]);
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) SDL_SwapBE16(src[0]);
+        const Sint32 sample1 = (Sint32) SDL_SwapBE16(src[1]);
+        const Sint32 sample2 = (Sint32) SDL_SwapBE16(src[2]);
+        const Sint32 sample3 = (Sint32) SDL_SwapBE16(src[3]);
+        const Sint32 sample4 = (Sint32) SDL_SwapBE16(src[4]);
+        const Sint32 sample5 = (Sint32) SDL_SwapBE16(src[5]);
+        const Sint32 sample6 = (Sint32) SDL_SwapBE16(src[6]);
+        const Sint32 sample7 = (Sint32) SDL_SwapBE16(src[7]);
+        src += 32;
+        dst[0] = (Uint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Uint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Uint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Uint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Uint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Uint16) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Uint16) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Uint16) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src--;
+        dst[1] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[0] = (Sint16) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src += 2;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 1 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src--;
+        dst[3] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[2] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[0] = (Sint16) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src += 4;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src -= 2;
+        dst[3] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        src += 4;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 2 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src -= 2;
+        dst[7] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[6] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[5] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[2] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        src += 8;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src -= 4;
+        dst[7] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[6] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[5] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        src += 8;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 4 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src -= 4;
+        dst[15] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[14] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[13] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[12] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[11] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[6] = (Sint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[5] = (Sint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[4] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        src += 16;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src -= 6;
+        dst[11] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[10] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[9] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[8] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[7] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[6] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[5] = (Sint16) sample5;
+        dst[4] = (Sint16) sample4;
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+        src += 12;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint16) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 6 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src -= 6;
+        dst[23] = (Sint16) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[22] = (Sint16) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[21] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[20] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[19] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[18] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[17] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[16] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[15] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[14] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[13] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[12] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[11] = (Sint16) (((3 * sample5) + last_sample5) >> 2);
+        dst[10] = (Sint16) (((3 * sample4) + last_sample4) >> 2);
+        dst[9] = (Sint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[8] = (Sint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[7] = (Sint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[6] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[5] = (Sint16) sample5;
+        dst[4] = (Sint16) sample4;
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+        src += 24;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint16) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S16MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8 * 2;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7]));
+    Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7]));
+        const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src -= 8;
+        dst[15] = (Sint16) ((sample7 + last_sample7) >> 1);
+        dst[14] = (Sint16) ((sample6 + last_sample6) >> 1);
+        dst[13] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[12] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[11] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint16) sample7;
+        dst[6] = (Sint16) sample6;
+        dst[5] = (Sint16) sample5;
+        dst[4] = (Sint16) sample4;
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S16MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+    Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6]));
+    Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+        const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6]));
+        const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7]));
+        src += 16;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint16) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint16) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S16MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S16MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint16 *dst = ((Sint16 *) (cvt->buf + dstsize)) - 8 * 4;
+    const Sint16 *src = ((Sint16 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint16 *target = ((const Sint16 *) cvt->buf);
+    Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7]));
+    Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    while (dst >= target) {
+        const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7]));
+        const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        src -= 8;
+        dst[31] = (Sint16) ((sample7 + (3 * last_sample7)) >> 2);
+        dst[30] = (Sint16) ((sample6 + (3 * last_sample6)) >> 2);
+        dst[29] = (Sint16) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[28] = (Sint16) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[27] = (Sint16) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[26] = (Sint16) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[25] = (Sint16) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[24] = (Sint16) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[23] = (Sint16) ((sample7 + last_sample7) >> 1);
+        dst[22] = (Sint16) ((sample6 + last_sample6) >> 1);
+        dst[21] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[20] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[19] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[18] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[17] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[16] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[15] = (Sint16) (((3 * sample7) + last_sample7) >> 2);
+        dst[14] = (Sint16) (((3 * sample6) + last_sample6) >> 2);
+        dst[13] = (Sint16) (((3 * sample5) + last_sample5) >> 2);
+        dst[12] = (Sint16) (((3 * sample4) + last_sample4) >> 2);
+        dst[11] = (Sint16) (((3 * sample3) + last_sample3) >> 2);
+        dst[10] = (Sint16) (((3 * sample2) + last_sample2) >> 2);
+        dst[9] = (Sint16) (((3 * sample1) + last_sample1) >> 2);
+        dst[8] = (Sint16) (((3 * sample0) + last_sample0) >> 2);
+        dst[7] = (Sint16) sample7;
+        dst[6] = (Sint16) sample6;
+        dst[5] = (Sint16) sample5;
+        dst[4] = (Sint16) sample4;
+        dst[3] = (Sint16) sample3;
+        dst[2] = (Sint16) sample2;
+        dst[1] = (Sint16) sample1;
+        dst[0] = (Sint16) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S16MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S16MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint16 *dst = (Sint16 *) cvt->buf;
+    const Sint16 *src = (Sint16 *) cvt->buf;
+    const Sint16 *target = (const Sint16 *) (cvt->buf + dstsize);
+    Sint32 last_sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+    Sint32 last_sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+    Sint32 last_sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+    Sint32 last_sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+    Sint32 last_sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+    Sint32 last_sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+    Sint32 last_sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6]));
+    Sint32 last_sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7]));
+    while (dst < target) {
+        const Sint32 sample0 = (Sint32) ((Sint16) SDL_SwapBE16(src[0]));
+        const Sint32 sample1 = (Sint32) ((Sint16) SDL_SwapBE16(src[1]));
+        const Sint32 sample2 = (Sint32) ((Sint16) SDL_SwapBE16(src[2]));
+        const Sint32 sample3 = (Sint32) ((Sint16) SDL_SwapBE16(src[3]));
+        const Sint32 sample4 = (Sint32) ((Sint16) SDL_SwapBE16(src[4]));
+        const Sint32 sample5 = (Sint32) ((Sint16) SDL_SwapBE16(src[5]));
+        const Sint32 sample6 = (Sint32) ((Sint16) SDL_SwapBE16(src[6]));
+        const Sint32 sample7 = (Sint32) ((Sint16) SDL_SwapBE16(src[7]));
+        src += 32;
+        dst[0] = (Sint16) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint16) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint16) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint16) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint16) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint16) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint16) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint16) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src--;
+        dst[1] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[0] = (Sint32) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src += 2;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src--;
+        dst[3] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[2] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[0] = (Sint32) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src += 4;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src -= 2;
+        dst[3] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        src += 4;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src -= 2;
+        dst[7] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[6] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[5] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint32) (((3 * sample1) + last_sample1) >> 2);
+        dst[2] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        src += 8;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src -= 4;
+        dst[7] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[6] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[5] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        src += 8;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src -= 4;
+        dst[15] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[14] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[13] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[12] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[11] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint32) (((3 * sample3) + last_sample3) >> 2);
+        dst[6] = (Sint32) (((3 * sample2) + last_sample2) >> 2);
+        dst[5] = (Sint32) (((3 * sample1) + last_sample1) >> 2);
+        dst[4] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        src += 16;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src -= 6;
+        dst[11] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[10] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[9] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[8] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[7] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[6] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[5] = (Sint32) sample5;
+        dst[4] = (Sint32) sample4;
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+        src += 12;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint32) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src -= 6;
+        dst[23] = (Sint32) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[22] = (Sint32) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[21] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[20] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[19] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[18] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[17] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[16] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[15] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[14] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[13] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[12] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[11] = (Sint32) (((3 * sample5) + last_sample5) >> 2);
+        dst[10] = (Sint32) (((3 * sample4) + last_sample4) >> 2);
+        dst[9] = (Sint32) (((3 * sample3) + last_sample3) >> 2);
+        dst[8] = (Sint32) (((3 * sample2) + last_sample2) >> 2);
+        dst[7] = (Sint32) (((3 * sample1) + last_sample1) >> 2);
+        dst[6] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[5] = (Sint32) sample5;
+        dst[4] = (Sint32) sample4;
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+        src += 24;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint32) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7]));
+    Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7]));
+        const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src -= 8;
+        dst[15] = (Sint32) ((sample7 + last_sample7) >> 1);
+        dst[14] = (Sint32) ((sample6 + last_sample6) >> 1);
+        dst[13] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[12] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[11] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint32) sample7;
+        dst[6] = (Sint32) sample6;
+        dst[5] = (Sint32) sample5;
+        dst[4] = (Sint32) sample4;
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+    Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6]));
+    Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+        const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6]));
+        const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7]));
+        src += 16;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint32) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint32) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7]));
+    Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7]));
+        const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        src -= 8;
+        dst[31] = (Sint32) ((sample7 + (3 * last_sample7)) >> 2);
+        dst[30] = (Sint32) ((sample6 + (3 * last_sample6)) >> 2);
+        dst[29] = (Sint32) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[28] = (Sint32) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[27] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[26] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[25] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[24] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[23] = (Sint32) ((sample7 + last_sample7) >> 1);
+        dst[22] = (Sint32) ((sample6 + last_sample6) >> 1);
+        dst[21] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[20] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[19] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[18] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[17] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[16] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[15] = (Sint32) (((3 * sample7) + last_sample7) >> 2);
+        dst[14] = (Sint32) (((3 * sample6) + last_sample6) >> 2);
+        dst[13] = (Sint32) (((3 * sample5) + last_sample5) >> 2);
+        dst[12] = (Sint32) (((3 * sample4) + last_sample4) >> 2);
+        dst[11] = (Sint32) (((3 * sample3) + last_sample3) >> 2);
+        dst[10] = (Sint32) (((3 * sample2) + last_sample2) >> 2);
+        dst[9] = (Sint32) (((3 * sample1) + last_sample1) >> 2);
+        dst[8] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[7] = (Sint32) sample7;
+        dst[6] = (Sint32) sample6;
+        dst[5] = (Sint32) sample5;
+        dst[4] = (Sint32) sample4;
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+    Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6]));
+    Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapLE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapLE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapLE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapLE32(src[3]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapLE32(src[4]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapLE32(src[5]));
+        const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapLE32(src[6]));
+        const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapLE32(src[7]));
+        src += 32;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint32) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint32) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src--;
+        dst[1] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[0] = (Sint32) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src += 2;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 1 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 1;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src--;
+        dst[3] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[2] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[0] = (Sint32) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src += 4;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src -= 2;
+        dst[3] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        src += 4;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 2 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 2;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src -= 2;
+        dst[7] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[6] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[5] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint32) (((3 * sample1) + last_sample1) >> 2);
+        dst[2] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        src += 8;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src -= 4;
+        dst[7] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[6] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[5] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[4] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        src += 8;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 4 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 4;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src -= 4;
+        dst[15] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[14] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[13] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[12] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[11] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint32) (((3 * sample3) + last_sample3) >> 2);
+        dst[6] = (Sint32) (((3 * sample2) + last_sample2) >> 2);
+        dst[5] = (Sint32) (((3 * sample1) + last_sample1) >> 2);
+        dst[4] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        src += 16;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src -= 6;
+        dst[11] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[10] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[9] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[8] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[7] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[6] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[5] = (Sint32) sample5;
+        dst[4] = (Sint32) sample4;
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+        src += 12;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint32) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 6 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 6;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src -= 6;
+        dst[23] = (Sint32) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[22] = (Sint32) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[21] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[20] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[19] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[18] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[17] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[16] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[15] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[14] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[13] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[12] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[11] = (Sint32) (((3 * sample5) + last_sample5) >> 2);
+        dst[10] = (Sint32) (((3 * sample4) + last_sample4) >> 2);
+        dst[9] = (Sint32) (((3 * sample3) + last_sample3) >> 2);
+        dst[8] = (Sint32) (((3 * sample2) + last_sample2) >> 2);
+        dst[7] = (Sint32) (((3 * sample1) + last_sample1) >> 2);
+        dst[6] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[5] = (Sint32) sample5;
+        dst[4] = (Sint32) sample4;
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+        src += 24;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint32) ((sample5 + last_sample5) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_S32MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8 * 2;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7]));
+    Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7]));
+        const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src -= 8;
+        dst[15] = (Sint32) ((sample7 + last_sample7) >> 1);
+        dst[14] = (Sint32) ((sample6 + last_sample6) >> 1);
+        dst[13] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[12] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[11] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[10] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[9] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[8] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[7] = (Sint32) sample7;
+        dst[6] = (Sint32) sample6;
+        dst[5] = (Sint32) sample5;
+        dst[4] = (Sint32) sample4;
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_S32MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+    Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6]));
+    Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+        const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6]));
+        const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7]));
+        src += 16;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint32) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint32) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_S32MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_S32MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    Sint32 *dst = ((Sint32 *) (cvt->buf + dstsize)) - 8 * 4;
+    const Sint32 *src = ((Sint32 *) (cvt->buf + cvt->len_cvt)) - 8;
+    const Sint32 *target = ((const Sint32 *) cvt->buf);
+    Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7]));
+    Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    while (dst >= target) {
+        const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7]));
+        const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        src -= 8;
+        dst[31] = (Sint32) ((sample7 + (3 * last_sample7)) >> 2);
+        dst[30] = (Sint32) ((sample6 + (3 * last_sample6)) >> 2);
+        dst[29] = (Sint32) ((sample5 + (3 * last_sample5)) >> 2);
+        dst[28] = (Sint32) ((sample4 + (3 * last_sample4)) >> 2);
+        dst[27] = (Sint32) ((sample3 + (3 * last_sample3)) >> 2);
+        dst[26] = (Sint32) ((sample2 + (3 * last_sample2)) >> 2);
+        dst[25] = (Sint32) ((sample1 + (3 * last_sample1)) >> 2);
+        dst[24] = (Sint32) ((sample0 + (3 * last_sample0)) >> 2);
+        dst[23] = (Sint32) ((sample7 + last_sample7) >> 1);
+        dst[22] = (Sint32) ((sample6 + last_sample6) >> 1);
+        dst[21] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[20] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[19] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[18] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[17] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[16] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[15] = (Sint32) (((3 * sample7) + last_sample7) >> 2);
+        dst[14] = (Sint32) (((3 * sample6) + last_sample6) >> 2);
+        dst[13] = (Sint32) (((3 * sample5) + last_sample5) >> 2);
+        dst[12] = (Sint32) (((3 * sample4) + last_sample4) >> 2);
+        dst[11] = (Sint32) (((3 * sample3) + last_sample3) >> 2);
+        dst[10] = (Sint32) (((3 * sample2) + last_sample2) >> 2);
+        dst[9] = (Sint32) (((3 * sample1) + last_sample1) >> 2);
+        dst[8] = (Sint32) (((3 * sample0) + last_sample0) >> 2);
+        dst[7] = (Sint32) sample7;
+        dst[6] = (Sint32) sample6;
+        dst[5] = (Sint32) sample5;
+        dst[4] = (Sint32) sample4;
+        dst[3] = (Sint32) sample3;
+        dst[2] = (Sint32) sample2;
+        dst[1] = (Sint32) sample1;
+        dst[0] = (Sint32) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_S32MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_S32MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    Sint32 *dst = (Sint32 *) cvt->buf;
+    const Sint32 *src = (Sint32 *) cvt->buf;
+    const Sint32 *target = (const Sint32 *) (cvt->buf + dstsize);
+    Sint64 last_sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+    Sint64 last_sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+    Sint64 last_sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+    Sint64 last_sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+    Sint64 last_sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+    Sint64 last_sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+    Sint64 last_sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6]));
+    Sint64 last_sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7]));
+    while (dst < target) {
+        const Sint64 sample0 = (Sint64) ((Sint32) SDL_SwapBE32(src[0]));
+        const Sint64 sample1 = (Sint64) ((Sint32) SDL_SwapBE32(src[1]));
+        const Sint64 sample2 = (Sint64) ((Sint32) SDL_SwapBE32(src[2]));
+        const Sint64 sample3 = (Sint64) ((Sint32) SDL_SwapBE32(src[3]));
+        const Sint64 sample4 = (Sint64) ((Sint32) SDL_SwapBE32(src[4]));
+        const Sint64 sample5 = (Sint64) ((Sint32) SDL_SwapBE32(src[5]));
+        const Sint64 sample6 = (Sint64) ((Sint32) SDL_SwapBE32(src[6]));
+        const Sint64 sample7 = (Sint64) ((Sint32) SDL_SwapBE32(src[7]));
+        src += 32;
+        dst[0] = (Sint32) ((sample0 + last_sample0) >> 1);
+        dst[1] = (Sint32) ((sample1 + last_sample1) >> 1);
+        dst[2] = (Sint32) ((sample2 + last_sample2) >> 1);
+        dst[3] = (Sint32) ((sample3 + last_sample3) >> 1);
+        dst[4] = (Sint32) ((sample4 + last_sample4) >> 1);
+        dst[5] = (Sint32) ((sample5 + last_sample5) >> 1);
+        dst[6] = (Sint32) ((sample6 + last_sample6) >> 1);
+        dst[7] = (Sint32) ((sample7 + last_sample7) >> 1);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 1 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src--;
+        dst[1] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[0] = (float) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src += 2;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 1 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src--;
+        dst[3] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[2] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[0] = (float) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src += 4;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 2 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src -= 2;
+        dst[3] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        src += 4;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 2 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src -= 2;
+        dst[7] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25);
+        dst[6] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[5] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[4] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[3] = (float) (((3.0 * sample1) + last_sample1) * 0.25);
+        dst[2] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        src += 8;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 4 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src -= 4;
+        dst[7] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[6] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[5] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[4] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        src += 8;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 4 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src -= 4;
+        dst[15] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25);
+        dst[14] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25);
+        dst[13] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25);
+        dst[12] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[11] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[10] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[9] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[8] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[7] = (float) (((3.0 * sample3) + last_sample3) * 0.25);
+        dst[6] = (float) (((3.0 * sample2) + last_sample2) * 0.25);
+        dst[5] = (float) (((3.0 * sample1) + last_sample1) * 0.25);
+        dst[4] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        src += 16;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 6 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample5 = (double) SDL_SwapFloatLE(src[5]);
+    double last_sample4 = (double) SDL_SwapFloatLE(src[4]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample5 = (double) SDL_SwapFloatLE(src[5]);
+        const double sample4 = (double) SDL_SwapFloatLE(src[4]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src -= 6;
+        dst[11] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[10] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[9] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[8] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[7] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[6] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[5] = (float) sample5;
+        dst[4] = (float) sample4;
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample4 = (double) SDL_SwapFloatLE(src[4]);
+    double last_sample5 = (double) SDL_SwapFloatLE(src[5]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample4 = (double) SDL_SwapFloatLE(src[4]);
+        const double sample5 = (double) SDL_SwapFloatLE(src[5]);
+        src += 12;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[4] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[5] = (float) ((sample5 + last_sample5) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 6 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample5 = (double) SDL_SwapFloatLE(src[5]);
+    double last_sample4 = (double) SDL_SwapFloatLE(src[4]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample5 = (double) SDL_SwapFloatLE(src[5]);
+        const double sample4 = (double) SDL_SwapFloatLE(src[4]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src -= 6;
+        dst[23] = (float) ((sample5 + (3.0 * last_sample5)) * 0.25);
+        dst[22] = (float) ((sample4 + (3.0 * last_sample4)) * 0.25);
+        dst[21] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25);
+        dst[20] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25);
+        dst[19] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25);
+        dst[18] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[17] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[16] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[15] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[14] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[13] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[12] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[11] = (float) (((3.0 * sample5) + last_sample5) * 0.25);
+        dst[10] = (float) (((3.0 * sample4) + last_sample4) * 0.25);
+        dst[9] = (float) (((3.0 * sample3) + last_sample3) * 0.25);
+        dst[8] = (float) (((3.0 * sample2) + last_sample2) * 0.25);
+        dst[7] = (float) (((3.0 * sample1) + last_sample1) * 0.25);
+        dst[6] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[5] = (float) sample5;
+        dst[4] = (float) sample4;
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample4 = (double) SDL_SwapFloatLE(src[4]);
+    double last_sample5 = (double) SDL_SwapFloatLE(src[5]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample4 = (double) SDL_SwapFloatLE(src[4]);
+        const double sample5 = (double) SDL_SwapFloatLE(src[5]);
+        src += 24;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[4] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[5] = (float) ((sample5 + last_sample5) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 8 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample7 = (double) SDL_SwapFloatLE(src[7]);
+    double last_sample6 = (double) SDL_SwapFloatLE(src[6]);
+    double last_sample5 = (double) SDL_SwapFloatLE(src[5]);
+    double last_sample4 = (double) SDL_SwapFloatLE(src[4]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample7 = (double) SDL_SwapFloatLE(src[7]);
+        const double sample6 = (double) SDL_SwapFloatLE(src[6]);
+        const double sample5 = (double) SDL_SwapFloatLE(src[5]);
+        const double sample4 = (double) SDL_SwapFloatLE(src[4]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src -= 8;
+        dst[15] = (float) ((sample7 + last_sample7) * 0.5);
+        dst[14] = (float) ((sample6 + last_sample6) * 0.5);
+        dst[13] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[12] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[11] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[10] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[9] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[8] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[7] = (float) sample7;
+        dst[6] = (float) sample6;
+        dst[5] = (float) sample5;
+        dst[4] = (float) sample4;
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample4 = (double) SDL_SwapFloatLE(src[4]);
+    double last_sample5 = (double) SDL_SwapFloatLE(src[5]);
+    double last_sample6 = (double) SDL_SwapFloatLE(src[6]);
+    double last_sample7 = (double) SDL_SwapFloatLE(src[7]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample4 = (double) SDL_SwapFloatLE(src[4]);
+        const double sample5 = (double) SDL_SwapFloatLE(src[5]);
+        const double sample6 = (double) SDL_SwapFloatLE(src[6]);
+        const double sample7 = (double) SDL_SwapFloatLE(src[7]);
+        src += 16;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[4] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[5] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[6] = (float) ((sample6 + last_sample6) * 0.5);
+        dst[7] = (float) ((sample7 + last_sample7) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 8 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample7 = (double) SDL_SwapFloatLE(src[7]);
+    double last_sample6 = (double) SDL_SwapFloatLE(src[6]);
+    double last_sample5 = (double) SDL_SwapFloatLE(src[5]);
+    double last_sample4 = (double) SDL_SwapFloatLE(src[4]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    while (dst >= target) {
+        const double sample7 = (double) SDL_SwapFloatLE(src[7]);
+        const double sample6 = (double) SDL_SwapFloatLE(src[6]);
+        const double sample5 = (double) SDL_SwapFloatLE(src[5]);
+        const double sample4 = (double) SDL_SwapFloatLE(src[4]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        src -= 8;
+        dst[31] = (float) ((sample7 + (3.0 * last_sample7)) * 0.25);
+        dst[30] = (float) ((sample6 + (3.0 * last_sample6)) * 0.25);
+        dst[29] = (float) ((sample5 + (3.0 * last_sample5)) * 0.25);
+        dst[28] = (float) ((sample4 + (3.0 * last_sample4)) * 0.25);
+        dst[27] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25);
+        dst[26] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25);
+        dst[25] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25);
+        dst[24] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[23] = (float) ((sample7 + last_sample7) * 0.5);
+        dst[22] = (float) ((sample6 + last_sample6) * 0.5);
+        dst[21] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[20] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[19] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[18] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[17] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[16] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[15] = (float) (((3.0 * sample7) + last_sample7) * 0.25);
+        dst[14] = (float) (((3.0 * sample6) + last_sample6) * 0.25);
+        dst[13] = (float) (((3.0 * sample5) + last_sample5) * 0.25);
+        dst[12] = (float) (((3.0 * sample4) + last_sample4) * 0.25);
+        dst[11] = (float) (((3.0 * sample3) + last_sample3) * 0.25);
+        dst[10] = (float) (((3.0 * sample2) + last_sample2) * 0.25);
+        dst[9] = (float) (((3.0 * sample1) + last_sample1) * 0.25);
+        dst[8] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[7] = (float) sample7;
+        dst[6] = (float) sample6;
+        dst[5] = (float) sample5;
+        dst[4] = (float) sample4;
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32LSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32LSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatLE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatLE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatLE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatLE(src[3]);
+    double last_sample4 = (double) SDL_SwapFloatLE(src[4]);
+    double last_sample5 = (double) SDL_SwapFloatLE(src[5]);
+    double last_sample6 = (double) SDL_SwapFloatLE(src[6]);
+    double last_sample7 = (double) SDL_SwapFloatLE(src[7]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatLE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatLE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatLE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatLE(src[3]);
+        const double sample4 = (double) SDL_SwapFloatLE(src[4]);
+        const double sample5 = (double) SDL_SwapFloatLE(src[5]);
+        const double sample6 = (double) SDL_SwapFloatLE(src[6]);
+        const double sample7 = (double) SDL_SwapFloatLE(src[7]);
+        src += 32;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[4] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[5] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[6] = (float) ((sample6 + last_sample6) * 0.5);
+        dst[7] = (float) ((sample7 + last_sample7) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 1 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src--;
+        dst[1] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[0] = (float) sample0;
+        last_sample0 = sample0;
+        dst -= 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_1c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src += 2;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 1 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 1;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src--;
+        dst[3] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[2] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[0] = (float) sample0;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_1c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 1 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src += 4;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        last_sample0 = sample0;
+        dst++;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 2 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src -= 2;
+        dst[3] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_2c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        src += 4;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 2 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 2;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src -= 2;
+        dst[7] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25);
+        dst[6] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[5] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[4] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[3] = (float) (((3.0 * sample1) + last_sample1) * 0.25);
+        dst[2] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_2c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 2 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        src += 8;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        dst += 2;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 4 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src -= 4;
+        dst[7] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[6] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[5] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[4] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_4c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        src += 8;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 4 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 4;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src -= 4;
+        dst[15] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25);
+        dst[14] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25);
+        dst[13] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25);
+        dst[12] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[11] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[10] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[9] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[8] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[7] = (float) (((3.0 * sample3) + last_sample3) * 0.25);
+        dst[6] = (float) (((3.0 * sample2) + last_sample2) * 0.25);
+        dst[5] = (float) (((3.0 * sample1) + last_sample1) * 0.25);
+        dst[4] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_4c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 4 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        src += 16;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        dst += 4;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 6 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample5 = (double) SDL_SwapFloatBE(src[5]);
+    double last_sample4 = (double) SDL_SwapFloatBE(src[4]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample5 = (double) SDL_SwapFloatBE(src[5]);
+        const double sample4 = (double) SDL_SwapFloatBE(src[4]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src -= 6;
+        dst[11] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[10] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[9] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[8] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[7] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[6] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[5] = (float) sample5;
+        dst[4] = (float) sample4;
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 12;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_6c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample4 = (double) SDL_SwapFloatBE(src[4]);
+    double last_sample5 = (double) SDL_SwapFloatBE(src[5]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample4 = (double) SDL_SwapFloatBE(src[4]);
+        const double sample5 = (double) SDL_SwapFloatBE(src[5]);
+        src += 12;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[4] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[5] = (float) ((sample5 + last_sample5) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 6 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 6;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample5 = (double) SDL_SwapFloatBE(src[5]);
+    double last_sample4 = (double) SDL_SwapFloatBE(src[4]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample5 = (double) SDL_SwapFloatBE(src[5]);
+        const double sample4 = (double) SDL_SwapFloatBE(src[4]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src -= 6;
+        dst[23] = (float) ((sample5 + (3.0 * last_sample5)) * 0.25);
+        dst[22] = (float) ((sample4 + (3.0 * last_sample4)) * 0.25);
+        dst[21] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25);
+        dst[20] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25);
+        dst[19] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25);
+        dst[18] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[17] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[16] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[15] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[14] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[13] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[12] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[11] = (float) (((3.0 * sample5) + last_sample5) * 0.25);
+        dst[10] = (float) (((3.0 * sample4) + last_sample4) * 0.25);
+        dst[9] = (float) (((3.0 * sample3) + last_sample3) * 0.25);
+        dst[8] = (float) (((3.0 * sample2) + last_sample2) * 0.25);
+        dst[7] = (float) (((3.0 * sample1) + last_sample1) * 0.25);
+        dst[6] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[5] = (float) sample5;
+        dst[4] = (float) sample4;
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 24;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_6c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 6 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample4 = (double) SDL_SwapFloatBE(src[4]);
+    double last_sample5 = (double) SDL_SwapFloatBE(src[5]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample4 = (double) SDL_SwapFloatBE(src[4]);
+        const double sample5 = (double) SDL_SwapFloatBE(src[5]);
+        src += 24;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[4] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[5] = (float) ((sample5 + last_sample5) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        dst += 6;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x2) AUDIO_F32MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 2;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 8 * 2;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample7 = (double) SDL_SwapFloatBE(src[7]);
+    double last_sample6 = (double) SDL_SwapFloatBE(src[6]);
+    double last_sample5 = (double) SDL_SwapFloatBE(src[5]);
+    double last_sample4 = (double) SDL_SwapFloatBE(src[4]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample7 = (double) SDL_SwapFloatBE(src[7]);
+        const double sample6 = (double) SDL_SwapFloatBE(src[6]);
+        const double sample5 = (double) SDL_SwapFloatBE(src[5]);
+        const double sample4 = (double) SDL_SwapFloatBE(src[4]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src -= 8;
+        dst[15] = (float) ((sample7 + last_sample7) * 0.5);
+        dst[14] = (float) ((sample6 + last_sample6) * 0.5);
+        dst[13] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[12] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[11] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[10] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[9] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[8] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[7] = (float) sample7;
+        dst[6] = (float) sample6;
+        dst[5] = (float) sample5;
+        dst[4] = (float) sample4;
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 16;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_8c_x2(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x2) AUDIO_F32MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 2;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample4 = (double) SDL_SwapFloatBE(src[4]);
+    double last_sample5 = (double) SDL_SwapFloatBE(src[5]);
+    double last_sample6 = (double) SDL_SwapFloatBE(src[6]);
+    double last_sample7 = (double) SDL_SwapFloatBE(src[7]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample4 = (double) SDL_SwapFloatBE(src[4]);
+        const double sample5 = (double) SDL_SwapFloatBE(src[5]);
+        const double sample6 = (double) SDL_SwapFloatBE(src[6]);
+        const double sample7 = (double) SDL_SwapFloatBE(src[7]);
+        src += 16;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[4] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[5] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[6] = (float) ((sample6 + last_sample6) * 0.5);
+        dst[7] = (float) ((sample7 + last_sample7) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Upsample_F32MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Upsample (x4) AUDIO_F32MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt * 4;
+    float *dst = ((float *) (cvt->buf + dstsize)) - 8 * 4;
+    const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8;
+    const float *target = ((const float *) cvt->buf);
+    double last_sample7 = (double) SDL_SwapFloatBE(src[7]);
+    double last_sample6 = (double) SDL_SwapFloatBE(src[6]);
+    double last_sample5 = (double) SDL_SwapFloatBE(src[5]);
+    double last_sample4 = (double) SDL_SwapFloatBE(src[4]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    while (dst >= target) {
+        const double sample7 = (double) SDL_SwapFloatBE(src[7]);
+        const double sample6 = (double) SDL_SwapFloatBE(src[6]);
+        const double sample5 = (double) SDL_SwapFloatBE(src[5]);
+        const double sample4 = (double) SDL_SwapFloatBE(src[4]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        src -= 8;
+        dst[31] = (float) ((sample7 + (3.0 * last_sample7)) * 0.25);
+        dst[30] = (float) ((sample6 + (3.0 * last_sample6)) * 0.25);
+        dst[29] = (float) ((sample5 + (3.0 * last_sample5)) * 0.25);
+        dst[28] = (float) ((sample4 + (3.0 * last_sample4)) * 0.25);
+        dst[27] = (float) ((sample3 + (3.0 * last_sample3)) * 0.25);
+        dst[26] = (float) ((sample2 + (3.0 * last_sample2)) * 0.25);
+        dst[25] = (float) ((sample1 + (3.0 * last_sample1)) * 0.25);
+        dst[24] = (float) ((sample0 + (3.0 * last_sample0)) * 0.25);
+        dst[23] = (float) ((sample7 + last_sample7) * 0.5);
+        dst[22] = (float) ((sample6 + last_sample6) * 0.5);
+        dst[21] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[20] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[19] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[18] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[17] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[16] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[15] = (float) (((3.0 * sample7) + last_sample7) * 0.25);
+        dst[14] = (float) (((3.0 * sample6) + last_sample6) * 0.25);
+        dst[13] = (float) (((3.0 * sample5) + last_sample5) * 0.25);
+        dst[12] = (float) (((3.0 * sample4) + last_sample4) * 0.25);
+        dst[11] = (float) (((3.0 * sample3) + last_sample3) * 0.25);
+        dst[10] = (float) (((3.0 * sample2) + last_sample2) * 0.25);
+        dst[9] = (float) (((3.0 * sample1) + last_sample1) * 0.25);
+        dst[8] = (float) (((3.0 * sample0) + last_sample0) * 0.25);
+        dst[7] = (float) sample7;
+        dst[6] = (float) sample6;
+        dst[5] = (float) sample5;
+        dst[4] = (float) sample4;
+        dst[3] = (float) sample3;
+        dst[2] = (float) sample2;
+        dst[1] = (float) sample1;
+        dst[0] = (float) sample0;
+        last_sample7 = sample7;
+        last_sample6 = sample6;
+        last_sample5 = sample5;
+        last_sample4 = sample4;
+        last_sample3 = sample3;
+        last_sample2 = sample2;
+        last_sample1 = sample1;
+        last_sample0 = sample0;
+        dst -= 32;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+static void SDLCALL
+SDL_Downsample_F32MSB_8c_x4(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "Downsample (x4) AUDIO_F32MSB, 8 channels.\n");
+#endif
+
+    const int dstsize = cvt->len_cvt / 4;
+    float *dst = (float *) cvt->buf;
+    const float *src = (float *) cvt->buf;
+    const float *target = (const float *) (cvt->buf + dstsize);
+    double last_sample0 = (double) SDL_SwapFloatBE(src[0]);
+    double last_sample1 = (double) SDL_SwapFloatBE(src[1]);
+    double last_sample2 = (double) SDL_SwapFloatBE(src[2]);
+    double last_sample3 = (double) SDL_SwapFloatBE(src[3]);
+    double last_sample4 = (double) SDL_SwapFloatBE(src[4]);
+    double last_sample5 = (double) SDL_SwapFloatBE(src[5]);
+    double last_sample6 = (double) SDL_SwapFloatBE(src[6]);
+    double last_sample7 = (double) SDL_SwapFloatBE(src[7]);
+    while (dst < target) {
+        const double sample0 = (double) SDL_SwapFloatBE(src[0]);
+        const double sample1 = (double) SDL_SwapFloatBE(src[1]);
+        const double sample2 = (double) SDL_SwapFloatBE(src[2]);
+        const double sample3 = (double) SDL_SwapFloatBE(src[3]);
+        const double sample4 = (double) SDL_SwapFloatBE(src[4]);
+        const double sample5 = (double) SDL_SwapFloatBE(src[5]);
+        const double sample6 = (double) SDL_SwapFloatBE(src[6]);
+        const double sample7 = (double) SDL_SwapFloatBE(src[7]);
+        src += 32;
+        dst[0] = (float) ((sample0 + last_sample0) * 0.5);
+        dst[1] = (float) ((sample1 + last_sample1) * 0.5);
+        dst[2] = (float) ((sample2 + last_sample2) * 0.5);
+        dst[3] = (float) ((sample3 + last_sample3) * 0.5);
+        dst[4] = (float) ((sample4 + last_sample4) * 0.5);
+        dst[5] = (float) ((sample5 + last_sample5) * 0.5);
+        dst[6] = (float) ((sample6 + last_sample6) * 0.5);
+        dst[7] = (float) ((sample7 + last_sample7) * 0.5);
+        last_sample0 = sample0;
+        last_sample1 = sample1;
+        last_sample2 = sample2;
+        last_sample3 = sample3;
+        last_sample4 = sample4;
+        last_sample5 = sample5;
+        last_sample6 = sample6;
+        last_sample7 = sample7;
+        dst += 8;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+#endif  /* !LESS_RESAMPLERS */
+#endif  /* !NO_RESAMPLERS */
+
+
+const SDL_AudioRateFilters sdl_audio_rate_filters[] =
+{
+#if !NO_RESAMPLERS
+    { AUDIO_U8, 1, 0, 0, SDL_Downsample_U8_1c },
+    { AUDIO_U8, 1, 1, 0, SDL_Upsample_U8_1c },
+    { AUDIO_U8, 2, 0, 0, SDL_Downsample_U8_2c },
+    { AUDIO_U8, 2, 1, 0, SDL_Upsample_U8_2c },
+    { AUDIO_U8, 4, 0, 0, SDL_Downsample_U8_4c },
+    { AUDIO_U8, 4, 1, 0, SDL_Upsample_U8_4c },
+    { AUDIO_U8, 6, 0, 0, SDL_Downsample_U8_6c },
+    { AUDIO_U8, 6, 1, 0, SDL_Upsample_U8_6c },
+    { AUDIO_U8, 8, 0, 0, SDL_Downsample_U8_8c },
+    { AUDIO_U8, 8, 1, 0, SDL_Upsample_U8_8c },
+    { AUDIO_S8, 1, 0, 0, SDL_Downsample_S8_1c },
+    { AUDIO_S8, 1, 1, 0, SDL_Upsample_S8_1c },
+    { AUDIO_S8, 2, 0, 0, SDL_Downsample_S8_2c },
+    { AUDIO_S8, 2, 1, 0, SDL_Upsample_S8_2c },
+    { AUDIO_S8, 4, 0, 0, SDL_Downsample_S8_4c },
+    { AUDIO_S8, 4, 1, 0, SDL_Upsample_S8_4c },
+    { AUDIO_S8, 6, 0, 0, SDL_Downsample_S8_6c },
+    { AUDIO_S8, 6, 1, 0, SDL_Upsample_S8_6c },
+    { AUDIO_S8, 8, 0, 0, SDL_Downsample_S8_8c },
+    { AUDIO_S8, 8, 1, 0, SDL_Upsample_S8_8c },
+    { AUDIO_U16LSB, 1, 0, 0, SDL_Downsample_U16LSB_1c },
+    { AUDIO_U16LSB, 1, 1, 0, SDL_Upsample_U16LSB_1c },
+    { AUDIO_U16LSB, 2, 0, 0, SDL_Downsample_U16LSB_2c },
+    { AUDIO_U16LSB, 2, 1, 0, SDL_Upsample_U16LSB_2c },
+    { AUDIO_U16LSB, 4, 0, 0, SDL_Downsample_U16LSB_4c },
+    { AUDIO_U16LSB, 4, 1, 0, SDL_Upsample_U16LSB_4c },
+    { AUDIO_U16LSB, 6, 0, 0, SDL_Downsample_U16LSB_6c },
+    { AUDIO_U16LSB, 6, 1, 0, SDL_Upsample_U16LSB_6c },
+    { AUDIO_U16LSB, 8, 0, 0, SDL_Downsample_U16LSB_8c },
+    { AUDIO_U16LSB, 8, 1, 0, SDL_Upsample_U16LSB_8c },
+    { AUDIO_S16LSB, 1, 0, 0, SDL_Downsample_S16LSB_1c },
+    { AUDIO_S16LSB, 1, 1, 0, SDL_Upsample_S16LSB_1c },
+    { AUDIO_S16LSB, 2, 0, 0, SDL_Downsample_S16LSB_2c },
+    { AUDIO_S16LSB, 2, 1, 0, SDL_Upsample_S16LSB_2c },
+    { AUDIO_S16LSB, 4, 0, 0, SDL_Downsample_S16LSB_4c },
+    { AUDIO_S16LSB, 4, 1, 0, SDL_Upsample_S16LSB_4c },
+    { AUDIO_S16LSB, 6, 0, 0, SDL_Downsample_S16LSB_6c },
+    { AUDIO_S16LSB, 6, 1, 0, SDL_Upsample_S16LSB_6c },
+    { AUDIO_S16LSB, 8, 0, 0, SDL_Downsample_S16LSB_8c },
+    { AUDIO_S16LSB, 8, 1, 0, SDL_Upsample_S16LSB_8c },
+    { AUDIO_U16MSB, 1, 0, 0, SDL_Downsample_U16MSB_1c },
+    { AUDIO_U16MSB, 1, 1, 0, SDL_Upsample_U16MSB_1c },
+    { AUDIO_U16MSB, 2, 0, 0, SDL_Downsample_U16MSB_2c },
+    { AUDIO_U16MSB, 2, 1, 0, SDL_Upsample_U16MSB_2c },
+    { AUDIO_U16MSB, 4, 0, 0, SDL_Downsample_U16MSB_4c },
+    { AUDIO_U16MSB, 4, 1, 0, SDL_Upsample_U16MSB_4c },
+    { AUDIO_U16MSB, 6, 0, 0, SDL_Downsample_U16MSB_6c },
+    { AUDIO_U16MSB, 6, 1, 0, SDL_Upsample_U16MSB_6c },
+    { AUDIO_U16MSB, 8, 0, 0, SDL_Downsample_U16MSB_8c },
+    { AUDIO_U16MSB, 8, 1, 0, SDL_Upsample_U16MSB_8c },
+    { AUDIO_S16MSB, 1, 0, 0, SDL_Downsample_S16MSB_1c },
+    { AUDIO_S16MSB, 1, 1, 0, SDL_Upsample_S16MSB_1c },
+    { AUDIO_S16MSB, 2, 0, 0, SDL_Downsample_S16MSB_2c },
+    { AUDIO_S16MSB, 2, 1, 0, SDL_Upsample_S16MSB_2c },
+    { AUDIO_S16MSB, 4, 0, 0, SDL_Downsample_S16MSB_4c },
+    { AUDIO_S16MSB, 4, 1, 0, SDL_Upsample_S16MSB_4c },
+    { AUDIO_S16MSB, 6, 0, 0, SDL_Downsample_S16MSB_6c },
+    { AUDIO_S16MSB, 6, 1, 0, SDL_Upsample_S16MSB_6c },
+    { AUDIO_S16MSB, 8, 0, 0, SDL_Downsample_S16MSB_8c },
+    { AUDIO_S16MSB, 8, 1, 0, SDL_Upsample_S16MSB_8c },
+    { AUDIO_S32LSB, 1, 0, 0, SDL_Downsample_S32LSB_1c },
+    { AUDIO_S32LSB, 1, 1, 0, SDL_Upsample_S32LSB_1c },
+    { AUDIO_S32LSB, 2, 0, 0, SDL_Downsample_S32LSB_2c },
+    { AUDIO_S32LSB, 2, 1, 0, SDL_Upsample_S32LSB_2c },
+    { AUDIO_S32LSB, 4, 0, 0, SDL_Downsample_S32LSB_4c },
+    { AUDIO_S32LSB, 4, 1, 0, SDL_Upsample_S32LSB_4c },
+    { AUDIO_S32LSB, 6, 0, 0, SDL_Downsample_S32LSB_6c },
+    { AUDIO_S32LSB, 6, 1, 0, SDL_Upsample_S32LSB_6c },
+    { AUDIO_S32LSB, 8, 0, 0, SDL_Downsample_S32LSB_8c },
+    { AUDIO_S32LSB, 8, 1, 0, SDL_Upsample_S32LSB_8c },
+    { AUDIO_S32MSB, 1, 0, 0, SDL_Downsample_S32MSB_1c },
+    { AUDIO_S32MSB, 1, 1, 0, SDL_Upsample_S32MSB_1c },
+    { AUDIO_S32MSB, 2, 0, 0, SDL_Downsample_S32MSB_2c },
+    { AUDIO_S32MSB, 2, 1, 0, SDL_Upsample_S32MSB_2c },
+    { AUDIO_S32MSB, 4, 0, 0, SDL_Downsample_S32MSB_4c },
+    { AUDIO_S32MSB, 4, 1, 0, SDL_Upsample_S32MSB_4c },
+    { AUDIO_S32MSB, 6, 0, 0, SDL_Downsample_S32MSB_6c },
+    { AUDIO_S32MSB, 6, 1, 0, SDL_Upsample_S32MSB_6c },
+    { AUDIO_S32MSB, 8, 0, 0, SDL_Downsample_S32MSB_8c },
+    { AUDIO_S32MSB, 8, 1, 0, SDL_Upsample_S32MSB_8c },
+    { AUDIO_F32LSB, 1, 0, 0, SDL_Downsample_F32LSB_1c },
+    { AUDIO_F32LSB, 1, 1, 0, SDL_Upsample_F32LSB_1c },
+    { AUDIO_F32LSB, 2, 0, 0, SDL_Downsample_F32LSB_2c },
+    { AUDIO_F32LSB, 2, 1, 0, SDL_Upsample_F32LSB_2c },
+    { AUDIO_F32LSB, 4, 0, 0, SDL_Downsample_F32LSB_4c },
+    { AUDIO_F32LSB, 4, 1, 0, SDL_Upsample_F32LSB_4c },
+    { AUDIO_F32LSB, 6, 0, 0, SDL_Downsample_F32LSB_6c },
+    { AUDIO_F32LSB, 6, 1, 0, SDL_Upsample_F32LSB_6c },
+    { AUDIO_F32LSB, 8, 0, 0, SDL_Downsample_F32LSB_8c },
+    { AUDIO_F32LSB, 8, 1, 0, SDL_Upsample_F32LSB_8c },
+    { AUDIO_F32MSB, 1, 0, 0, SDL_Downsample_F32MSB_1c },
+    { AUDIO_F32MSB, 1, 1, 0, SDL_Upsample_F32MSB_1c },
+    { AUDIO_F32MSB, 2, 0, 0, SDL_Downsample_F32MSB_2c },
+    { AUDIO_F32MSB, 2, 1, 0, SDL_Upsample_F32MSB_2c },
+    { AUDIO_F32MSB, 4, 0, 0, SDL_Downsample_F32MSB_4c },
+    { AUDIO_F32MSB, 4, 1, 0, SDL_Upsample_F32MSB_4c },
+    { AUDIO_F32MSB, 6, 0, 0, SDL_Downsample_F32MSB_6c },
+    { AUDIO_F32MSB, 6, 1, 0, SDL_Upsample_F32MSB_6c },
+    { AUDIO_F32MSB, 8, 0, 0, SDL_Downsample_F32MSB_8c },
+    { AUDIO_F32MSB, 8, 1, 0, SDL_Upsample_F32MSB_8c },
+#if !LESS_RESAMPLERS
+    { AUDIO_U8, 1, 0, 2, SDL_Downsample_U8_1c_x2 },
+    { AUDIO_U8, 1, 1, 2, SDL_Upsample_U8_1c_x2 },
+    { AUDIO_U8, 1, 0, 4, SDL_Downsample_U8_1c_x4 },
+    { AUDIO_U8, 1, 1, 4, SDL_Upsample_U8_1c_x4 },
+    { AUDIO_U8, 2, 0, 2, SDL_Downsample_U8_2c_x2 },
+    { AUDIO_U8, 2, 1, 2, SDL_Upsample_U8_2c_x2 },
+    { AUDIO_U8, 2, 0, 4, SDL_Downsample_U8_2c_x4 },
+    { AUDIO_U8, 2, 1, 4, SDL_Upsample_U8_2c_x4 },
+    { AUDIO_U8, 4, 0, 2, SDL_Downsample_U8_4c_x2 },
+    { AUDIO_U8, 4, 1, 2, SDL_Upsample_U8_4c_x2 },
+    { AUDIO_U8, 4, 0, 4, SDL_Downsample_U8_4c_x4 },
+    { AUDIO_U8, 4, 1, 4, SDL_Upsample_U8_4c_x4 },
+    { AUDIO_U8, 6, 0, 2, SDL_Downsample_U8_6c_x2 },
+    { AUDIO_U8, 6, 1, 2, SDL_Upsample_U8_6c_x2 },
+    { AUDIO_U8, 6, 0, 4, SDL_Downsample_U8_6c_x4 },
+    { AUDIO_U8, 6, 1, 4, SDL_Upsample_U8_6c_x4 },
+    { AUDIO_U8, 8, 0, 2, SDL_Downsample_U8_8c_x2 },
+    { AUDIO_U8, 8, 1, 2, SDL_Upsample_U8_8c_x2 },
+    { AUDIO_U8, 8, 0, 4, SDL_Downsample_U8_8c_x4 },
+    { AUDIO_U8, 8, 1, 4, SDL_Upsample_U8_8c_x4 },
+    { AUDIO_S8, 1, 0, 2, SDL_Downsample_S8_1c_x2 },
+    { AUDIO_S8, 1, 1, 2, SDL_Upsample_S8_1c_x2 },
+    { AUDIO_S8, 1, 0, 4, SDL_Downsample_S8_1c_x4 },
+    { AUDIO_S8, 1, 1, 4, SDL_Upsample_S8_1c_x4 },
+    { AUDIO_S8, 2, 0, 2, SDL_Downsample_S8_2c_x2 },
+    { AUDIO_S8, 2, 1, 2, SDL_Upsample_S8_2c_x2 },
+    { AUDIO_S8, 2, 0, 4, SDL_Downsample_S8_2c_x4 },
+    { AUDIO_S8, 2, 1, 4, SDL_Upsample_S8_2c_x4 },
+    { AUDIO_S8, 4, 0, 2, SDL_Downsample_S8_4c_x2 },
+    { AUDIO_S8, 4, 1, 2, SDL_Upsample_S8_4c_x2 },
+    { AUDIO_S8, 4, 0, 4, SDL_Downsample_S8_4c_x4 },
+    { AUDIO_S8, 4, 1, 4, SDL_Upsample_S8_4c_x4 },
+    { AUDIO_S8, 6, 0, 2, SDL_Downsample_S8_6c_x2 },
+    { AUDIO_S8, 6, 1, 2, SDL_Upsample_S8_6c_x2 },
+    { AUDIO_S8, 6, 0, 4, SDL_Downsample_S8_6c_x4 },
+    { AUDIO_S8, 6, 1, 4, SDL_Upsample_S8_6c_x4 },
+    { AUDIO_S8, 8, 0, 2, SDL_Downsample_S8_8c_x2 },
+    { AUDIO_S8, 8, 1, 2, SDL_Upsample_S8_8c_x2 },
+    { AUDIO_S8, 8, 0, 4, SDL_Downsample_S8_8c_x4 },
+    { AUDIO_S8, 8, 1, 4, SDL_Upsample_S8_8c_x4 },
+    { AUDIO_U16LSB, 1, 0, 2, SDL_Downsample_U16LSB_1c_x2 },
+    { AUDIO_U16LSB, 1, 1, 2, SDL_Upsample_U16LSB_1c_x2 },
+    { AUDIO_U16LSB, 1, 0, 4, SDL_Downsample_U16LSB_1c_x4 },
+    { AUDIO_U16LSB, 1, 1, 4, SDL_Upsample_U16LSB_1c_x4 },
+    { AUDIO_U16LSB, 2, 0, 2, SDL_Downsample_U16LSB_2c_x2 },
+    { AUDIO_U16LSB, 2, 1, 2, SDL_Upsample_U16LSB_2c_x2 },
+    { AUDIO_U16LSB, 2, 0, 4, SDL_Downsample_U16LSB_2c_x4 },
+    { AUDIO_U16LSB, 2, 1, 4, SDL_Upsample_U16LSB_2c_x4 },
+    { AUDIO_U16LSB, 4, 0, 2, SDL_Downsample_U16LSB_4c_x2 },
+    { AUDIO_U16LSB, 4, 1, 2, SDL_Upsample_U16LSB_4c_x2 },
+    { AUDIO_U16LSB, 4, 0, 4, SDL_Downsample_U16LSB_4c_x4 },
+    { AUDIO_U16LSB, 4, 1, 4, SDL_Upsample_U16LSB_4c_x4 },
+    { AUDIO_U16LSB, 6, 0, 2, SDL_Downsample_U16LSB_6c_x2 },
+    { AUDIO_U16LSB, 6, 1, 2, SDL_Upsample_U16LSB_6c_x2 },
+    { AUDIO_U16LSB, 6, 0, 4, SDL_Downsample_U16LSB_6c_x4 },
+    { AUDIO_U16LSB, 6, 1, 4, SDL_Upsample_U16LSB_6c_x4 },
+    { AUDIO_U16LSB, 8, 0, 2, SDL_Downsample_U16LSB_8c_x2 },
+    { AUDIO_U16LSB, 8, 1, 2, SDL_Upsample_U16LSB_8c_x2 },
+    { AUDIO_U16LSB, 8, 0, 4, SDL_Downsample_U16LSB_8c_x4 },
+    { AUDIO_U16LSB, 8, 1, 4, SDL_Upsample_U16LSB_8c_x4 },
+    { AUDIO_S16LSB, 1, 0, 2, SDL_Downsample_S16LSB_1c_x2 },
+    { AUDIO_S16LSB, 1, 1, 2, SDL_Upsample_S16LSB_1c_x2 },
+    { AUDIO_S16LSB, 1, 0, 4, SDL_Downsample_S16LSB_1c_x4 },
+    { AUDIO_S16LSB, 1, 1, 4, SDL_Upsample_S16LSB_1c_x4 },
+    { AUDIO_S16LSB, 2, 0, 2, SDL_Downsample_S16LSB_2c_x2 },
+    { AUDIO_S16LSB, 2, 1, 2, SDL_Upsample_S16LSB_2c_x2 },
+    { AUDIO_S16LSB, 2, 0, 4, SDL_Downsample_S16LSB_2c_x4 },
+    { AUDIO_S16LSB, 2, 1, 4, SDL_Upsample_S16LSB_2c_x4 },
+    { AUDIO_S16LSB, 4, 0, 2, SDL_Downsample_S16LSB_4c_x2 },
+    { AUDIO_S16LSB, 4, 1, 2, SDL_Upsample_S16LSB_4c_x2 },
+    { AUDIO_S16LSB, 4, 0, 4, SDL_Downsample_S16LSB_4c_x4 },
+    { AUDIO_S16LSB, 4, 1, 4, SDL_Upsample_S16LSB_4c_x4 },
+    { AUDIO_S16LSB, 6, 0, 2, SDL_Downsample_S16LSB_6c_x2 },
+    { AUDIO_S16LSB, 6, 1, 2, SDL_Upsample_S16LSB_6c_x2 },
+    { AUDIO_S16LSB, 6, 0, 4, SDL_Downsample_S16LSB_6c_x4 },
+    { AUDIO_S16LSB, 6, 1, 4, SDL_Upsample_S16LSB_6c_x4 },
+    { AUDIO_S16LSB, 8, 0, 2, SDL_Downsample_S16LSB_8c_x2 },
+    { AUDIO_S16LSB, 8, 1, 2, SDL_Upsample_S16LSB_8c_x2 },
+    { AUDIO_S16LSB, 8, 0, 4, SDL_Downsample_S16LSB_8c_x4 },
+    { AUDIO_S16LSB, 8, 1, 4, SDL_Upsample_S16LSB_8c_x4 },
+    { AUDIO_U16MSB, 1, 0, 2, SDL_Downsample_U16MSB_1c_x2 },
+    { AUDIO_U16MSB, 1, 1, 2, SDL_Upsample_U16MSB_1c_x2 },
+    { AUDIO_U16MSB, 1, 0, 4, SDL_Downsample_U16MSB_1c_x4 },
+    { AUDIO_U16MSB, 1, 1, 4, SDL_Upsample_U16MSB_1c_x4 },
+    { AUDIO_U16MSB, 2, 0, 2, SDL_Downsample_U16MSB_2c_x2 },
+    { AUDIO_U16MSB, 2, 1, 2, SDL_Upsample_U16MSB_2c_x2 },
+    { AUDIO_U16MSB, 2, 0, 4, SDL_Downsample_U16MSB_2c_x4 },
+    { AUDIO_U16MSB, 2, 1, 4, SDL_Upsample_U16MSB_2c_x4 },
+    { AUDIO_U16MSB, 4, 0, 2, SDL_Downsample_U16MSB_4c_x2 },
+    { AUDIO_U16MSB, 4, 1, 2, SDL_Upsample_U16MSB_4c_x2 },
+    { AUDIO_U16MSB, 4, 0, 4, SDL_Downsample_U16MSB_4c_x4 },
+    { AUDIO_U16MSB, 4, 1, 4, SDL_Upsample_U16MSB_4c_x4 },
+    { AUDIO_U16MSB, 6, 0, 2, SDL_Downsample_U16MSB_6c_x2 },
+    { AUDIO_U16MSB, 6, 1, 2, SDL_Upsample_U16MSB_6c_x2 },
+    { AUDIO_U16MSB, 6, 0, 4, SDL_Downsample_U16MSB_6c_x4 },
+    { AUDIO_U16MSB, 6, 1, 4, SDL_Upsample_U16MSB_6c_x4 },
+    { AUDIO_U16MSB, 8, 0, 2, SDL_Downsample_U16MSB_8c_x2 },
+    { AUDIO_U16MSB, 8, 1, 2, SDL_Upsample_U16MSB_8c_x2 },
+    { AUDIO_U16MSB, 8, 0, 4, SDL_Downsample_U16MSB_8c_x4 },
+    { AUDIO_U16MSB, 8, 1, 4, SDL_Upsample_U16MSB_8c_x4 },
+    { AUDIO_S16MSB, 1, 0, 2, SDL_Downsample_S16MSB_1c_x2 },
+    { AUDIO_S16MSB, 1, 1, 2, SDL_Upsample_S16MSB_1c_x2 },
+    { AUDIO_S16MSB, 1, 0, 4, SDL_Downsample_S16MSB_1c_x4 },
+    { AUDIO_S16MSB, 1, 1, 4, SDL_Upsample_S16MSB_1c_x4 },
+    { AUDIO_S16MSB, 2, 0, 2, SDL_Downsample_S16MSB_2c_x2 },
+    { AUDIO_S16MSB, 2, 1, 2, SDL_Upsample_S16MSB_2c_x2 },
+    { AUDIO_S16MSB, 2, 0, 4, SDL_Downsample_S16MSB_2c_x4 },
+    { AUDIO_S16MSB, 2, 1, 4, SDL_Upsample_S16MSB_2c_x4 },
+    { AUDIO_S16MSB, 4, 0, 2, SDL_Downsample_S16MSB_4c_x2 },
+    { AUDIO_S16MSB, 4, 1, 2, SDL_Upsample_S16MSB_4c_x2 },
+    { AUDIO_S16MSB, 4, 0, 4, SDL_Downsample_S16MSB_4c_x4 },
+    { AUDIO_S16MSB, 4, 1, 4, SDL_Upsample_S16MSB_4c_x4 },
+    { AUDIO_S16MSB, 6, 0, 2, SDL_Downsample_S16MSB_6c_x2 },
+    { AUDIO_S16MSB, 6, 1, 2, SDL_Upsample_S16MSB_6c_x2 },
+    { AUDIO_S16MSB, 6, 0, 4, SDL_Downsample_S16MSB_6c_x4 },
+    { AUDIO_S16MSB, 6, 1, 4, SDL_Upsample_S16MSB_6c_x4 },
+    { AUDIO_S16MSB, 8, 0, 2, SDL_Downsample_S16MSB_8c_x2 },
+    { AUDIO_S16MSB, 8, 1, 2, SDL_Upsample_S16MSB_8c_x2 },
+    { AUDIO_S16MSB, 8, 0, 4, SDL_Downsample_S16MSB_8c_x4 },
+    { AUDIO_S16MSB, 8, 1, 4, SDL_Upsample_S16MSB_8c_x4 },
+    { AUDIO_S32LSB, 1, 0, 2, SDL_Downsample_S32LSB_1c_x2 },
+    { AUDIO_S32LSB, 1, 1, 2, SDL_Upsample_S32LSB_1c_x2 },
+    { AUDIO_S32LSB, 1, 0, 4, SDL_Downsample_S32LSB_1c_x4 },
+    { AUDIO_S32LSB, 1, 1, 4, SDL_Upsample_S32LSB_1c_x4 },
+    { AUDIO_S32LSB, 2, 0, 2, SDL_Downsample_S32LSB_2c_x2 },
+    { AUDIO_S32LSB, 2, 1, 2, SDL_Upsample_S32LSB_2c_x2 },
+    { AUDIO_S32LSB, 2, 0, 4, SDL_Downsample_S32LSB_2c_x4 },
+    { AUDIO_S32LSB, 2, 1, 4, SDL_Upsample_S32LSB_2c_x4 },
+    { AUDIO_S32LSB, 4, 0, 2, SDL_Downsample_S32LSB_4c_x2 },
+    { AUDIO_S32LSB, 4, 1, 2, SDL_Upsample_S32LSB_4c_x2 },
+    { AUDIO_S32LSB, 4, 0, 4, SDL_Downsample_S32LSB_4c_x4 },
+    { AUDIO_S32LSB, 4, 1, 4, SDL_Upsample_S32LSB_4c_x4 },
+    { AUDIO_S32LSB, 6, 0, 2, SDL_Downsample_S32LSB_6c_x2 },
+    { AUDIO_S32LSB, 6, 1, 2, SDL_Upsample_S32LSB_6c_x2 },
+    { AUDIO_S32LSB, 6, 0, 4, SDL_Downsample_S32LSB_6c_x4 },
+    { AUDIO_S32LSB, 6, 1, 4, SDL_Upsample_S32LSB_6c_x4 },
+    { AUDIO_S32LSB, 8, 0, 2, SDL_Downsample_S32LSB_8c_x2 },
+    { AUDIO_S32LSB, 8, 1, 2, SDL_Upsample_S32LSB_8c_x2 },
+    { AUDIO_S32LSB, 8, 0, 4, SDL_Downsample_S32LSB_8c_x4 },
+    { AUDIO_S32LSB, 8, 1, 4, SDL_Upsample_S32LSB_8c_x4 },
+    { AUDIO_S32MSB, 1, 0, 2, SDL_Downsample_S32MSB_1c_x2 },
+    { AUDIO_S32MSB, 1, 1, 2, SDL_Upsample_S32MSB_1c_x2 },
+    { AUDIO_S32MSB, 1, 0, 4, SDL_Downsample_S32MSB_1c_x4 },
+    { AUDIO_S32MSB, 1, 1, 4, SDL_Upsample_S32MSB_1c_x4 },
+    { AUDIO_S32MSB, 2, 0, 2, SDL_Downsample_S32MSB_2c_x2 },
+    { AUDIO_S32MSB, 2, 1, 2, SDL_Upsample_S32MSB_2c_x2 },
+    { AUDIO_S32MSB, 2, 0, 4, SDL_Downsample_S32MSB_2c_x4 },
+    { AUDIO_S32MSB, 2, 1, 4, SDL_Upsample_S32MSB_2c_x4 },
+    { AUDIO_S32MSB, 4, 0, 2, SDL_Downsample_S32MSB_4c_x2 },
+    { AUDIO_S32MSB, 4, 1, 2, SDL_Upsample_S32MSB_4c_x2 },
+    { AUDIO_S32MSB, 4, 0, 4, SDL_Downsample_S32MSB_4c_x4 },
+    { AUDIO_S32MSB, 4, 1, 4, SDL_Upsample_S32MSB_4c_x4 },
+    { AUDIO_S32MSB, 6, 0, 2, SDL_Downsample_S32MSB_6c_x2 },
+    { AUDIO_S32MSB, 6, 1, 2, SDL_Upsample_S32MSB_6c_x2 },
+    { AUDIO_S32MSB, 6, 0, 4, SDL_Downsample_S32MSB_6c_x4 },
+    { AUDIO_S32MSB, 6, 1, 4, SDL_Upsample_S32MSB_6c_x4 },
+    { AUDIO_S32MSB, 8, 0, 2, SDL_Downsample_S32MSB_8c_x2 },
+    { AUDIO_S32MSB, 8, 1, 2, SDL_Upsample_S32MSB_8c_x2 },
+    { AUDIO_S32MSB, 8, 0, 4, SDL_Downsample_S32MSB_8c_x4 },
+    { AUDIO_S32MSB, 8, 1, 4, SDL_Upsample_S32MSB_8c_x4 },
+    { AUDIO_F32LSB, 1, 0, 2, SDL_Downsample_F32LSB_1c_x2 },
+    { AUDIO_F32LSB, 1, 1, 2, SDL_Upsample_F32LSB_1c_x2 },
+    { AUDIO_F32LSB, 1, 0, 4, SDL_Downsample_F32LSB_1c_x4 },
+    { AUDIO_F32LSB, 1, 1, 4, SDL_Upsample_F32LSB_1c_x4 },
+    { AUDIO_F32LSB, 2, 0, 2, SDL_Downsample_F32LSB_2c_x2 },
+    { AUDIO_F32LSB, 2, 1, 2, SDL_Upsample_F32LSB_2c_x2 },
+    { AUDIO_F32LSB, 2, 0, 4, SDL_Downsample_F32LSB_2c_x4 },
+    { AUDIO_F32LSB, 2, 1, 4, SDL_Upsample_F32LSB_2c_x4 },
+    { AUDIO_F32LSB, 4, 0, 2, SDL_Downsample_F32LSB_4c_x2 },
+    { AUDIO_F32LSB, 4, 1, 2, SDL_Upsample_F32LSB_4c_x2 },
+    { AUDIO_F32LSB, 4, 0, 4, SDL_Downsample_F32LSB_4c_x4 },
+    { AUDIO_F32LSB, 4, 1, 4, SDL_Upsample_F32LSB_4c_x4 },
+    { AUDIO_F32LSB, 6, 0, 2, SDL_Downsample_F32LSB_6c_x2 },
+    { AUDIO_F32LSB, 6, 1, 2, SDL_Upsample_F32LSB_6c_x2 },
+    { AUDIO_F32LSB, 6, 0, 4, SDL_Downsample_F32LSB_6c_x4 },
+    { AUDIO_F32LSB, 6, 1, 4, SDL_Upsample_F32LSB_6c_x4 },
+    { AUDIO_F32LSB, 8, 0, 2, SDL_Downsample_F32LSB_8c_x2 },
+    { AUDIO_F32LSB, 8, 1, 2, SDL_Upsample_F32LSB_8c_x2 },
+    { AUDIO_F32LSB, 8, 0, 4, SDL_Downsample_F32LSB_8c_x4 },
+    { AUDIO_F32LSB, 8, 1, 4, SDL_Upsample_F32LSB_8c_x4 },
+    { AUDIO_F32MSB, 1, 0, 2, SDL_Downsample_F32MSB_1c_x2 },
+    { AUDIO_F32MSB, 1, 1, 2, SDL_Upsample_F32MSB_1c_x2 },
+    { AUDIO_F32MSB, 1, 0, 4, SDL_Downsample_F32MSB_1c_x4 },
+    { AUDIO_F32MSB, 1, 1, 4, SDL_Upsample_F32MSB_1c_x4 },
+    { AUDIO_F32MSB, 2, 0, 2, SDL_Downsample_F32MSB_2c_x2 },
+    { AUDIO_F32MSB, 2, 1, 2, SDL_Upsample_F32MSB_2c_x2 },
+    { AUDIO_F32MSB, 2, 0, 4, SDL_Downsample_F32MSB_2c_x4 },
+    { AUDIO_F32MSB, 2, 1, 4, SDL_Upsample_F32MSB_2c_x4 },
+    { AUDIO_F32MSB, 4, 0, 2, SDL_Downsample_F32MSB_4c_x2 },
+    { AUDIO_F32MSB, 4, 1, 2, SDL_Upsample_F32MSB_4c_x2 },
+    { AUDIO_F32MSB, 4, 0, 4, SDL_Downsample_F32MSB_4c_x4 },
+    { AUDIO_F32MSB, 4, 1, 4, SDL_Upsample_F32MSB_4c_x4 },
+    { AUDIO_F32MSB, 6, 0, 2, SDL_Downsample_F32MSB_6c_x2 },
+    { AUDIO_F32MSB, 6, 1, 2, SDL_Upsample_F32MSB_6c_x2 },
+    { AUDIO_F32MSB, 6, 0, 4, SDL_Downsample_F32MSB_6c_x4 },
+    { AUDIO_F32MSB, 6, 1, 4, SDL_Upsample_F32MSB_6c_x4 },
+    { AUDIO_F32MSB, 8, 0, 2, SDL_Downsample_F32MSB_8c_x2 },
+    { AUDIO_F32MSB, 8, 1, 2, SDL_Upsample_F32MSB_8c_x2 },
+    { AUDIO_F32MSB, 8, 0, 4, SDL_Downsample_F32MSB_8c_x4 },
+    { AUDIO_F32MSB, 8, 1, 4, SDL_Upsample_F32MSB_8c_x4 },
+#endif  /* !LESS_RESAMPLERS */
+#endif  /* !NO_RESAMPLERS */
+    { 0, 0, 0, 0, NULL }
+};
+
+/* 390 converters generated. */
+
+/* *INDENT-ON* */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_mixer.c b/Source/3rd Party/sdl/src/audio/SDL_mixer.c
new file mode 100644
index 000000000..42a1c6873
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_mixer.c	
@@ -0,0 +1,321 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This provides the default mixing callback for the SDL audio routines */
+
+#include "SDL_cpuinfo.h"
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "SDL_sysaudio.h"
+
+/* This table is used to add two sound values together and pin
+ * the value to avoid overflow.  (used with permission from ARDI)
+ * Changed to use 0xFE instead of 0xFF for better sound quality.
+ */
+static const Uint8 mix8[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03,
+    0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
+    0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
+    0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24,
+    0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A,
+    0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45,
+    0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,
+    0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B,
+    0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66,
+    0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71,
+    0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C,
+    0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92,
+    0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D,
+    0x9E, 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8,
+    0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3,
+    0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE,
+    0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9,
+    0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4,
+    0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
+    0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA,
+    0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5,
+    0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE,
+    0xFE, 0xFE, 0xFE, 0xFE, 0xFE, 0xFE
+};
+
+/* The volume ranges from 0 - 128 */
+#define ADJUST_VOLUME(s, v) (s = (s*v)/SDL_MIX_MAXVOLUME)
+#define ADJUST_VOLUME_U8(s, v)  (s = (((s-128)*v)/SDL_MIX_MAXVOLUME)+128)
+
+
+void
+SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
+                   Uint32 len, int volume)
+{
+    if (volume == 0) {
+        return;
+    }
+
+    switch (format) {
+
+    case AUDIO_U8:
+        {
+#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
+            SDL_MixAudio_m68k_U8((char *) dst, (char *) src,
+                                 (unsigned long) len, (long) volume,
+                                 (char *) mix8);
+#else
+            Uint8 src_sample;
+
+            while (len--) {
+                src_sample = *src;
+                ADJUST_VOLUME_U8(src_sample, volume);
+                *dst = mix8[*dst + src_sample];
+                ++dst;
+                ++src;
+            }
+#endif
+        }
+        break;
+
+    case AUDIO_S8:
+        {
+            Sint8 *dst8, *src8;
+            Sint8 src_sample;
+            int dst_sample;
+            const int max_audioval = ((1 << (8 - 1)) - 1);
+            const int min_audioval = -(1 << (8 - 1));
+
+            src8 = (Sint8 *) src;
+            dst8 = (Sint8 *) dst;
+            while (len--) {
+                src_sample = *src8;
+                ADJUST_VOLUME(src_sample, volume);
+                dst_sample = *dst8 + src_sample;
+                if (dst_sample > max_audioval) {
+                    *dst8 = max_audioval;
+                } else if (dst_sample < min_audioval) {
+                    *dst8 = min_audioval;
+                } else {
+                    *dst8 = dst_sample;
+                }
+                ++dst8;
+                ++src8;
+            }
+        }
+        break;
+
+    case AUDIO_S16LSB:
+        {
+            Sint16 src1, src2;
+            int dst_sample;
+            const int max_audioval = ((1 << (16 - 1)) - 1);
+            const int min_audioval = -(1 << (16 - 1));
+
+            len /= 2;
+            while (len--) {
+                src1 = ((src[1]) << 8 | src[0]);
+                ADJUST_VOLUME(src1, volume);
+                src2 = ((dst[1]) << 8 | dst[0]);
+                src += 2;
+                dst_sample = src1 + src2;
+                if (dst_sample > max_audioval) {
+                    dst_sample = max_audioval;
+                } else if (dst_sample < min_audioval) {
+                    dst_sample = min_audioval;
+                }
+                dst[0] = dst_sample & 0xFF;
+                dst_sample >>= 8;
+                dst[1] = dst_sample & 0xFF;
+                dst += 2;
+            }
+        }
+        break;
+
+    case AUDIO_S16MSB:
+        {
+#if defined(__GNUC__) && defined(__M68000__) && !defined(__mcoldfire__) && defined(SDL_ASSEMBLY_ROUTINES)
+            SDL_MixAudio_m68k_S16MSB((short *) dst, (short *) src,
+                                     (unsigned long) len, (long) volume);
+#else
+            Sint16 src1, src2;
+            int dst_sample;
+            const int max_audioval = ((1 << (16 - 1)) - 1);
+            const int min_audioval = -(1 << (16 - 1));
+
+            len /= 2;
+            while (len--) {
+                src1 = ((src[0]) << 8 | src[1]);
+                ADJUST_VOLUME(src1, volume);
+                src2 = ((dst[0]) << 8 | dst[1]);
+                src += 2;
+                dst_sample = src1 + src2;
+                if (dst_sample > max_audioval) {
+                    dst_sample = max_audioval;
+                } else if (dst_sample < min_audioval) {
+                    dst_sample = min_audioval;
+                }
+                dst[1] = dst_sample & 0xFF;
+                dst_sample >>= 8;
+                dst[0] = dst_sample & 0xFF;
+                dst += 2;
+            }
+#endif
+        }
+        break;
+
+    case AUDIO_S32LSB:
+        {
+            const Uint32 *src32 = (Uint32 *) src;
+            Uint32 *dst32 = (Uint32 *) dst;
+            Sint64 src1, src2;
+            Sint64 dst_sample;
+            const Sint64 max_audioval = ((((Sint64) 1) << (32 - 1)) - 1);
+            const Sint64 min_audioval = -(((Sint64) 1) << (32 - 1));
+
+            len /= 4;
+            while (len--) {
+                src1 = (Sint64) ((Sint32) SDL_SwapLE32(*src32));
+                src32++;
+                ADJUST_VOLUME(src1, volume);
+                src2 = (Sint64) ((Sint32) SDL_SwapLE32(*dst32));
+                dst_sample = src1 + src2;
+                if (dst_sample > max_audioval) {
+                    dst_sample = max_audioval;
+                } else if (dst_sample < min_audioval) {
+                    dst_sample = min_audioval;
+                }
+                *(dst32++) = SDL_SwapLE32((Uint32) ((Sint32) dst_sample));
+            }
+        }
+        break;
+
+    case AUDIO_S32MSB:
+        {
+            const Uint32 *src32 = (Uint32 *) src;
+            Uint32 *dst32 = (Uint32 *) dst;
+            Sint64 src1, src2;
+            Sint64 dst_sample;
+            const Sint64 max_audioval = ((((Sint64) 1) << (32 - 1)) - 1);
+            const Sint64 min_audioval = -(((Sint64) 1) << (32 - 1));
+
+            len /= 4;
+            while (len--) {
+                src1 = (Sint64) ((Sint32) SDL_SwapBE32(*src32));
+                src32++;
+                ADJUST_VOLUME(src1, volume);
+                src2 = (Sint64) ((Sint32) SDL_SwapBE32(*dst32));
+                dst_sample = src1 + src2;
+                if (dst_sample > max_audioval) {
+                    dst_sample = max_audioval;
+                } else if (dst_sample < min_audioval) {
+                    dst_sample = min_audioval;
+                }
+                *(dst32++) = SDL_SwapBE32((Uint32) ((Sint32) dst_sample));
+            }
+        }
+        break;
+
+    case AUDIO_F32LSB:
+        {
+            const float fmaxvolume = 1.0f / ((float) SDL_MIX_MAXVOLUME);
+            const float fvolume = (float) volume;
+            const float *src32 = (float *) src;
+            float *dst32 = (float *) dst;
+            float src1, src2;
+            double dst_sample;
+            /* !!! FIXME: are these right? */
+            const double max_audioval = 3.402823466e+38F;
+            const double min_audioval = -3.402823466e+38F;
+
+            len /= 4;
+            while (len--) {
+                src1 = ((SDL_SwapFloatLE(*src32) * fvolume) * fmaxvolume);
+                src2 = SDL_SwapFloatLE(*dst32);
+                src32++;
+
+                dst_sample = ((double) src1) + ((double) src2);
+                if (dst_sample > max_audioval) {
+                    dst_sample = max_audioval;
+                } else if (dst_sample < min_audioval) {
+                    dst_sample = min_audioval;
+                }
+                *(dst32++) = SDL_SwapFloatLE((float) dst_sample);
+            }
+        }
+        break;
+
+    case AUDIO_F32MSB:
+        {
+            const float fmaxvolume = 1.0f / ((float) SDL_MIX_MAXVOLUME);
+            const float fvolume = (float) volume;
+            const float *src32 = (float *) src;
+            float *dst32 = (float *) dst;
+            float src1, src2;
+            double dst_sample;
+            /* !!! FIXME: are these right? */
+            const double max_audioval = 3.402823466e+38F;
+            const double min_audioval = -3.402823466e+38F;
+
+            len /= 4;
+            while (len--) {
+                src1 = ((SDL_SwapFloatBE(*src32) * fvolume) * fmaxvolume);
+                src2 = SDL_SwapFloatBE(*dst32);
+                src32++;
+
+                dst_sample = ((double) src1) + ((double) src2);
+                if (dst_sample > max_audioval) {
+                    dst_sample = max_audioval;
+                } else if (dst_sample < min_audioval) {
+                    dst_sample = min_audioval;
+                }
+                *(dst32++) = SDL_SwapFloatBE((float) dst_sample);
+            }
+        }
+        break;
+
+    default:                   /* If this happens... FIXME! */
+        SDL_SetError("SDL_MixAudio(): unknown audio format");
+        return;
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_sysaudio.h b/Source/3rd Party/sdl/src/audio/SDL_sysaudio.h
new file mode 100644
index 000000000..9fe31c807
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_sysaudio.h	
@@ -0,0 +1,138 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_sysaudio_h
+#define _SDL_sysaudio_h
+
+#include "SDL_mutex.h"
+#include "SDL_thread.h"
+
+/* The SDL audio driver */
+typedef struct SDL_AudioDevice SDL_AudioDevice;
+#define _THIS   SDL_AudioDevice *_this
+
+/* Used by audio targets during DetectDevices() */
+typedef void (*SDL_AddAudioDevice)(const char *name);
+
+typedef struct SDL_AudioDriverImpl
+{
+    void (*DetectDevices) (int iscapture, SDL_AddAudioDevice addfn);
+    int (*OpenDevice) (_THIS, const char *devname, int iscapture);
+    void (*ThreadInit) (_THIS); /* Called by audio thread at start */
+    void (*WaitDevice) (_THIS);
+    void (*PlayDevice) (_THIS);
+    Uint8 *(*GetDeviceBuf) (_THIS);
+    void (*WaitDone) (_THIS);
+    void (*CloseDevice) (_THIS);
+    void (*LockDevice) (_THIS);
+    void (*UnlockDevice) (_THIS);
+    void (*Deinitialize) (void);
+
+    /* !!! FIXME: add pause(), so we can optimize instead of mixing silence. */
+
+    /* Some flags to push duplicate code into the core and reduce #ifdefs. */
+    int ProvidesOwnCallbackThread;
+    int SkipMixerLock;  /* !!! FIXME: do we need this anymore? */
+    int HasCaptureSupport;
+    int OnlyHasDefaultOutputDevice;
+    int OnlyHasDefaultInputDevice;
+} SDL_AudioDriverImpl;
+
+
+typedef struct SDL_AudioDriver
+{
+    /* * * */
+    /* The name of this audio driver */
+    const char *name;
+
+    /* * * */
+    /* The description of this audio driver */
+    const char *desc;
+
+    SDL_AudioDriverImpl impl;
+
+    char **outputDevices;
+    int outputDeviceCount;
+
+    char **inputDevices;
+    int inputDeviceCount;
+} SDL_AudioDriver;
+
+
+/* Streamer */
+typedef struct
+{
+    Uint8 *buffer;
+    int max_len;                /* the maximum length in bytes */
+    int read_pos, write_pos;    /* the position of the write and read heads in bytes */
+} SDL_AudioStreamer;
+
+
+/* Define the SDL audio driver structure */
+struct SDL_AudioDevice
+{
+    /* * * */
+    /* Data common to all devices */
+
+    /* The current audio specification (shared with audio thread) */
+    SDL_AudioSpec spec;
+
+    /* An audio conversion block for audio format emulation */
+    SDL_AudioCVT convert;
+
+    /* The streamer, if sample rate conversion necessitates it */
+    int use_streamer;
+    SDL_AudioStreamer streamer;
+
+    /* Current state flags */
+    int iscapture;
+    int enabled;
+    int paused;
+    int opened;
+
+    /* Fake audio buffer for when the audio hardware is busy */
+    Uint8 *fake_stream;
+
+    /* A semaphore for locking the mixing buffers */
+    SDL_mutex *mixer_lock;
+
+    /* A thread to feed the audio device */
+    SDL_Thread *thread;
+    SDL_threadID threadid;
+
+    /* * * */
+    /* Data private to this driver */
+    struct SDL_PrivateAudioData *hidden;
+};
+#undef _THIS
+
+typedef struct AudioBootStrap
+{
+    const char *name;
+    const char *desc;
+    int (*init) (SDL_AudioDriverImpl * impl);
+    int demand_only;  /* 1==request explicitly, or it won't be available. */
+} AudioBootStrap;
+
+#endif /* _SDL_sysaudio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_wave.c b/Source/3rd Party/sdl/src/audio/SDL_wave.c
new file mode 100644
index 000000000..903264ca9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_wave.c	
@@ -0,0 +1,623 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Microsoft WAVE file loading routines */
+
+#include "SDL_audio.h"
+#include "SDL_wave.h"
+
+
+static int ReadChunk(SDL_RWops * src, Chunk * chunk);
+
+struct MS_ADPCM_decodestate
+{
+    Uint8 hPredictor;
+    Uint16 iDelta;
+    Sint16 iSamp1;
+    Sint16 iSamp2;
+};
+static struct MS_ADPCM_decoder
+{
+    WaveFMT wavefmt;
+    Uint16 wSamplesPerBlock;
+    Uint16 wNumCoef;
+    Sint16 aCoeff[7][2];
+    /* * * */
+    struct MS_ADPCM_decodestate state[2];
+} MS_ADPCM_state;
+
+static int
+InitMS_ADPCM(WaveFMT * format)
+{
+    Uint8 *rogue_feel;
+    int i;
+
+    /* Set the rogue pointer to the MS_ADPCM specific data */
+    MS_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
+    MS_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels);
+    MS_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency);
+    MS_ADPCM_state.wavefmt.byterate = SDL_SwapLE32(format->byterate);
+    MS_ADPCM_state.wavefmt.blockalign = SDL_SwapLE16(format->blockalign);
+    MS_ADPCM_state.wavefmt.bitspersample =
+        SDL_SwapLE16(format->bitspersample);
+    rogue_feel = (Uint8 *) format + sizeof(*format);
+    if (sizeof(*format) == 16) {
+        /* const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */
+        rogue_feel += sizeof(Uint16);
+    }
+    MS_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
+    rogue_feel += sizeof(Uint16);
+    MS_ADPCM_state.wNumCoef = ((rogue_feel[1] << 8) | rogue_feel[0]);
+    rogue_feel += sizeof(Uint16);
+    if (MS_ADPCM_state.wNumCoef != 7) {
+        SDL_SetError("Unknown set of MS_ADPCM coefficients");
+        return (-1);
+    }
+    for (i = 0; i < MS_ADPCM_state.wNumCoef; ++i) {
+        MS_ADPCM_state.aCoeff[i][0] = ((rogue_feel[1] << 8) | rogue_feel[0]);
+        rogue_feel += sizeof(Uint16);
+        MS_ADPCM_state.aCoeff[i][1] = ((rogue_feel[1] << 8) | rogue_feel[0]);
+        rogue_feel += sizeof(Uint16);
+    }
+    return (0);
+}
+
+static Sint32
+MS_ADPCM_nibble(struct MS_ADPCM_decodestate *state,
+                Uint8 nybble, Sint16 * coeff)
+{
+    const Sint32 max_audioval = ((1 << (16 - 1)) - 1);
+    const Sint32 min_audioval = -(1 << (16 - 1));
+    const Sint32 adaptive[] = {
+        230, 230, 230, 230, 307, 409, 512, 614,
+        768, 614, 512, 409, 307, 230, 230, 230
+    };
+    Sint32 new_sample, delta;
+
+    new_sample = ((state->iSamp1 * coeff[0]) +
+                  (state->iSamp2 * coeff[1])) / 256;
+    if (nybble & 0x08) {
+        new_sample += state->iDelta * (nybble - 0x10);
+    } else {
+        new_sample += state->iDelta * nybble;
+    }
+    if (new_sample < min_audioval) {
+        new_sample = min_audioval;
+    } else if (new_sample > max_audioval) {
+        new_sample = max_audioval;
+    }
+    delta = ((Sint32) state->iDelta * adaptive[nybble]) / 256;
+    if (delta < 16) {
+        delta = 16;
+    }
+    state->iDelta = (Uint16) delta;
+    state->iSamp2 = state->iSamp1;
+    state->iSamp1 = (Sint16) new_sample;
+    return (new_sample);
+}
+
+static int
+MS_ADPCM_decode(Uint8 ** audio_buf, Uint32 * audio_len)
+{
+    struct MS_ADPCM_decodestate *state[2];
+    Uint8 *freeable, *encoded, *decoded;
+    Sint32 encoded_len, samplesleft;
+    Sint8 nybble, stereo;
+    Sint16 *coeff[2];
+    Sint32 new_sample;
+
+    /* Allocate the proper sized output buffer */
+    encoded_len = *audio_len;
+    encoded = *audio_buf;
+    freeable = *audio_buf;
+    *audio_len = (encoded_len / MS_ADPCM_state.wavefmt.blockalign) *
+        MS_ADPCM_state.wSamplesPerBlock *
+        MS_ADPCM_state.wavefmt.channels * sizeof(Sint16);
+    *audio_buf = (Uint8 *) SDL_malloc(*audio_len);
+    if (*audio_buf == NULL) {
+        return SDL_OutOfMemory();
+    }
+    decoded = *audio_buf;
+
+    /* Get ready... Go! */
+    stereo = (MS_ADPCM_state.wavefmt.channels == 2);
+    state[0] = &MS_ADPCM_state.state[0];
+    state[1] = &MS_ADPCM_state.state[stereo];
+    while (encoded_len >= MS_ADPCM_state.wavefmt.blockalign) {
+        /* Grab the initial information for this block */
+        state[0]->hPredictor = *encoded++;
+        if (stereo) {
+            state[1]->hPredictor = *encoded++;
+        }
+        state[0]->iDelta = ((encoded[1] << 8) | encoded[0]);
+        encoded += sizeof(Sint16);
+        if (stereo) {
+            state[1]->iDelta = ((encoded[1] << 8) | encoded[0]);
+            encoded += sizeof(Sint16);
+        }
+        state[0]->iSamp1 = ((encoded[1] << 8) | encoded[0]);
+        encoded += sizeof(Sint16);
+        if (stereo) {
+            state[1]->iSamp1 = ((encoded[1] << 8) | encoded[0]);
+            encoded += sizeof(Sint16);
+        }
+        state[0]->iSamp2 = ((encoded[1] << 8) | encoded[0]);
+        encoded += sizeof(Sint16);
+        if (stereo) {
+            state[1]->iSamp2 = ((encoded[1] << 8) | encoded[0]);
+            encoded += sizeof(Sint16);
+        }
+        coeff[0] = MS_ADPCM_state.aCoeff[state[0]->hPredictor];
+        coeff[1] = MS_ADPCM_state.aCoeff[state[1]->hPredictor];
+
+        /* Store the two initial samples we start with */
+        decoded[0] = state[0]->iSamp2 & 0xFF;
+        decoded[1] = state[0]->iSamp2 >> 8;
+        decoded += 2;
+        if (stereo) {
+            decoded[0] = state[1]->iSamp2 & 0xFF;
+            decoded[1] = state[1]->iSamp2 >> 8;
+            decoded += 2;
+        }
+        decoded[0] = state[0]->iSamp1 & 0xFF;
+        decoded[1] = state[0]->iSamp1 >> 8;
+        decoded += 2;
+        if (stereo) {
+            decoded[0] = state[1]->iSamp1 & 0xFF;
+            decoded[1] = state[1]->iSamp1 >> 8;
+            decoded += 2;
+        }
+
+        /* Decode and store the other samples in this block */
+        samplesleft = (MS_ADPCM_state.wSamplesPerBlock - 2) *
+            MS_ADPCM_state.wavefmt.channels;
+        while (samplesleft > 0) {
+            nybble = (*encoded) >> 4;
+            new_sample = MS_ADPCM_nibble(state[0], nybble, coeff[0]);
+            decoded[0] = new_sample & 0xFF;
+            new_sample >>= 8;
+            decoded[1] = new_sample & 0xFF;
+            decoded += 2;
+
+            nybble = (*encoded) & 0x0F;
+            new_sample = MS_ADPCM_nibble(state[1], nybble, coeff[1]);
+            decoded[0] = new_sample & 0xFF;
+            new_sample >>= 8;
+            decoded[1] = new_sample & 0xFF;
+            decoded += 2;
+
+            ++encoded;
+            samplesleft -= 2;
+        }
+        encoded_len -= MS_ADPCM_state.wavefmt.blockalign;
+    }
+    SDL_free(freeable);
+    return (0);
+}
+
+struct IMA_ADPCM_decodestate
+{
+    Sint32 sample;
+    Sint8 index;
+};
+static struct IMA_ADPCM_decoder
+{
+    WaveFMT wavefmt;
+    Uint16 wSamplesPerBlock;
+    /* * * */
+    struct IMA_ADPCM_decodestate state[2];
+} IMA_ADPCM_state;
+
+static int
+InitIMA_ADPCM(WaveFMT * format)
+{
+    Uint8 *rogue_feel;
+
+    /* Set the rogue pointer to the IMA_ADPCM specific data */
+    IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
+    IMA_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels);
+    IMA_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency);
+    IMA_ADPCM_state.wavefmt.byterate = SDL_SwapLE32(format->byterate);
+    IMA_ADPCM_state.wavefmt.blockalign = SDL_SwapLE16(format->blockalign);
+    IMA_ADPCM_state.wavefmt.bitspersample =
+        SDL_SwapLE16(format->bitspersample);
+    rogue_feel = (Uint8 *) format + sizeof(*format);
+    if (sizeof(*format) == 16) {
+        /* const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */
+        rogue_feel += sizeof(Uint16);
+    }
+    IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
+    return (0);
+}
+
+static Sint32
+IMA_ADPCM_nibble(struct IMA_ADPCM_decodestate *state, Uint8 nybble)
+{
+    const Sint32 max_audioval = ((1 << (16 - 1)) - 1);
+    const Sint32 min_audioval = -(1 << (16 - 1));
+    const int index_table[16] = {
+        -1, -1, -1, -1,
+        2, 4, 6, 8,
+        -1, -1, -1, -1,
+        2, 4, 6, 8
+    };
+    const Sint32 step_table[89] = {
+        7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 19, 21, 23, 25, 28, 31,
+        34, 37, 41, 45, 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, 130,
+        143, 157, 173, 190, 209, 230, 253, 279, 307, 337, 371, 408,
+        449, 494, 544, 598, 658, 724, 796, 876, 963, 1060, 1166, 1282,
+        1411, 1552, 1707, 1878, 2066, 2272, 2499, 2749, 3024, 3327,
+        3660, 4026, 4428, 4871, 5358, 5894, 6484, 7132, 7845, 8630,
+        9493, 10442, 11487, 12635, 13899, 15289, 16818, 18500, 20350,
+        22385, 24623, 27086, 29794, 32767
+    };
+    Sint32 delta, step;
+
+    /* Compute difference and new sample value */
+    if (state->index > 88) {
+        state->index = 88;
+    } else if (state->index < 0) {
+        state->index = 0;
+    }
+    step = step_table[state->index];
+    delta = step >> 3;
+    if (nybble & 0x04)
+        delta += step;
+    if (nybble & 0x02)
+        delta += (step >> 1);
+    if (nybble & 0x01)
+        delta += (step >> 2);
+    if (nybble & 0x08)
+        delta = -delta;
+    state->sample += delta;
+
+    /* Update index value */
+    state->index += index_table[nybble];
+
+    /* Clamp output sample */
+    if (state->sample > max_audioval) {
+        state->sample = max_audioval;
+    } else if (state->sample < min_audioval) {
+        state->sample = min_audioval;
+    }
+    return (state->sample);
+}
+
+/* Fill the decode buffer with a channel block of data (8 samples) */
+static void
+Fill_IMA_ADPCM_block(Uint8 * decoded, Uint8 * encoded,
+                     int channel, int numchannels,
+                     struct IMA_ADPCM_decodestate *state)
+{
+    int i;
+    Sint8 nybble;
+    Sint32 new_sample;
+
+    decoded += (channel * 2);
+    for (i = 0; i < 4; ++i) {
+        nybble = (*encoded) & 0x0F;
+        new_sample = IMA_ADPCM_nibble(state, nybble);
+        decoded[0] = new_sample & 0xFF;
+        new_sample >>= 8;
+        decoded[1] = new_sample & 0xFF;
+        decoded += 2 * numchannels;
+
+        nybble = (*encoded) >> 4;
+        new_sample = IMA_ADPCM_nibble(state, nybble);
+        decoded[0] = new_sample & 0xFF;
+        new_sample >>= 8;
+        decoded[1] = new_sample & 0xFF;
+        decoded += 2 * numchannels;
+
+        ++encoded;
+    }
+}
+
+static int
+IMA_ADPCM_decode(Uint8 ** audio_buf, Uint32 * audio_len)
+{
+    struct IMA_ADPCM_decodestate *state;
+    Uint8 *freeable, *encoded, *decoded;
+    Sint32 encoded_len, samplesleft;
+    unsigned int c, channels;
+
+    /* Check to make sure we have enough variables in the state array */
+    channels = IMA_ADPCM_state.wavefmt.channels;
+    if (channels > SDL_arraysize(IMA_ADPCM_state.state)) {
+        SDL_SetError("IMA ADPCM decoder can only handle %d channels",
+                     SDL_arraysize(IMA_ADPCM_state.state));
+        return (-1);
+    }
+    state = IMA_ADPCM_state.state;
+
+    /* Allocate the proper sized output buffer */
+    encoded_len = *audio_len;
+    encoded = *audio_buf;
+    freeable = *audio_buf;
+    *audio_len = (encoded_len / IMA_ADPCM_state.wavefmt.blockalign) *
+        IMA_ADPCM_state.wSamplesPerBlock *
+        IMA_ADPCM_state.wavefmt.channels * sizeof(Sint16);
+    *audio_buf = (Uint8 *) SDL_malloc(*audio_len);
+    if (*audio_buf == NULL) {
+        return SDL_OutOfMemory();
+    }
+    decoded = *audio_buf;
+
+    /* Get ready... Go! */
+    while (encoded_len >= IMA_ADPCM_state.wavefmt.blockalign) {
+        /* Grab the initial information for this block */
+        for (c = 0; c < channels; ++c) {
+            /* Fill the state information for this block */
+            state[c].sample = ((encoded[1] << 8) | encoded[0]);
+            encoded += 2;
+            if (state[c].sample & 0x8000) {
+                state[c].sample -= 0x10000;
+            }
+            state[c].index = *encoded++;
+            /* Reserved byte in buffer header, should be 0 */
+            if (*encoded++ != 0) {
+                /* Uh oh, corrupt data?  Buggy code? */ ;
+            }
+
+            /* Store the initial sample we start with */
+            decoded[0] = (Uint8) (state[c].sample & 0xFF);
+            decoded[1] = (Uint8) (state[c].sample >> 8);
+            decoded += 2;
+        }
+
+        /* Decode and store the other samples in this block */
+        samplesleft = (IMA_ADPCM_state.wSamplesPerBlock - 1) * channels;
+        while (samplesleft > 0) {
+            for (c = 0; c < channels; ++c) {
+                Fill_IMA_ADPCM_block(decoded, encoded,
+                                     c, channels, &state[c]);
+                encoded += 4;
+                samplesleft -= 8;
+            }
+            decoded += (channels * 8 * 2);
+        }
+        encoded_len -= IMA_ADPCM_state.wavefmt.blockalign;
+    }
+    SDL_free(freeable);
+    return (0);
+}
+
+SDL_AudioSpec *
+SDL_LoadWAV_RW(SDL_RWops * src, int freesrc,
+               SDL_AudioSpec * spec, Uint8 ** audio_buf, Uint32 * audio_len)
+{
+    int was_error;
+    Chunk chunk;
+    int lenread;
+    int IEEE_float_encoded, MS_ADPCM_encoded, IMA_ADPCM_encoded;
+    int samplesize;
+
+    /* WAV magic header */
+    Uint32 RIFFchunk;
+    Uint32 wavelen = 0;
+    Uint32 WAVEmagic;
+    Uint32 headerDiff = 0;
+
+    /* FMT chunk */
+    WaveFMT *format = NULL;
+
+    SDL_zero(chunk);
+
+    /* Make sure we are passed a valid data source */
+    was_error = 0;
+    if (src == NULL) {
+        was_error = 1;
+        goto done;
+    }
+
+    /* Check the magic header */
+    RIFFchunk = SDL_ReadLE32(src);
+    wavelen = SDL_ReadLE32(src);
+    if (wavelen == WAVE) {      /* The RIFFchunk has already been read */
+        WAVEmagic = wavelen;
+        wavelen = RIFFchunk;
+        RIFFchunk = RIFF;
+    } else {
+        WAVEmagic = SDL_ReadLE32(src);
+    }
+    if ((RIFFchunk != RIFF) || (WAVEmagic != WAVE)) {
+        SDL_SetError("Unrecognized file type (not WAVE)");
+        was_error = 1;
+        goto done;
+    }
+    headerDiff += sizeof(Uint32);       /* for WAVE */
+
+    /* Read the audio data format chunk */
+    chunk.data = NULL;
+    do {
+        SDL_free(chunk.data);
+        chunk.data = NULL;
+        lenread = ReadChunk(src, &chunk);
+        if (lenread < 0) {
+            was_error = 1;
+            goto done;
+        }
+        /* 2 Uint32's for chunk header+len, plus the lenread */
+        headerDiff += lenread + 2 * sizeof(Uint32);
+    } while ((chunk.magic == FACT) || (chunk.magic == LIST));
+
+    /* Decode the audio data format */
+    format = (WaveFMT *) chunk.data;
+    if (chunk.magic != FMT) {
+        SDL_SetError("Complex WAVE files not supported");
+        was_error = 1;
+        goto done;
+    }
+    IEEE_float_encoded = MS_ADPCM_encoded = IMA_ADPCM_encoded = 0;
+    switch (SDL_SwapLE16(format->encoding)) {
+    case PCM_CODE:
+        /* We can understand this */
+        break;
+    case IEEE_FLOAT_CODE:
+        IEEE_float_encoded = 1;
+        /* We can understand this */
+        break;
+    case MS_ADPCM_CODE:
+        /* Try to understand this */
+        if (InitMS_ADPCM(format) < 0) {
+            was_error = 1;
+            goto done;
+        }
+        MS_ADPCM_encoded = 1;
+        break;
+    case IMA_ADPCM_CODE:
+        /* Try to understand this */
+        if (InitIMA_ADPCM(format) < 0) {
+            was_error = 1;
+            goto done;
+        }
+        IMA_ADPCM_encoded = 1;
+        break;
+    case MP3_CODE:
+        SDL_SetError("MPEG Layer 3 data not supported",
+                     SDL_SwapLE16(format->encoding));
+        was_error = 1;
+        goto done;
+    default:
+        SDL_SetError("Unknown WAVE data format: 0x%.4x",
+                     SDL_SwapLE16(format->encoding));
+        was_error = 1;
+        goto done;
+    }
+    SDL_memset(spec, 0, (sizeof *spec));
+    spec->freq = SDL_SwapLE32(format->frequency);
+
+    if (IEEE_float_encoded) {
+        if ((SDL_SwapLE16(format->bitspersample)) != 32) {
+            was_error = 1;
+        } else {
+            spec->format = AUDIO_F32;
+        }
+    } else {
+        switch (SDL_SwapLE16(format->bitspersample)) {
+        case 4:
+            if (MS_ADPCM_encoded || IMA_ADPCM_encoded) {
+                spec->format = AUDIO_S16;
+            } else {
+                was_error = 1;
+            }
+            break;
+        case 8:
+            spec->format = AUDIO_U8;
+            break;
+        case 16:
+            spec->format = AUDIO_S16;
+            break;
+        case 32:
+            spec->format = AUDIO_S32;
+            break;
+        default:
+            was_error = 1;
+            break;
+        }
+    }
+
+    if (was_error) {
+        SDL_SetError("Unknown %d-bit PCM data format",
+                     SDL_SwapLE16(format->bitspersample));
+        goto done;
+    }
+    spec->channels = (Uint8) SDL_SwapLE16(format->channels);
+    spec->samples = 4096;       /* Good default buffer size */
+
+    /* Read the audio data chunk */
+    *audio_buf = NULL;
+    do {
+        SDL_free(*audio_buf);
+        *audio_buf = NULL;
+        lenread = ReadChunk(src, &chunk);
+        if (lenread < 0) {
+            was_error = 1;
+            goto done;
+        }
+        *audio_len = lenread;
+        *audio_buf = chunk.data;
+        if (chunk.magic != DATA)
+            headerDiff += lenread + 2 * sizeof(Uint32);
+    } while (chunk.magic != DATA);
+    headerDiff += 2 * sizeof(Uint32);   /* for the data chunk and len */
+
+    if (MS_ADPCM_encoded) {
+        if (MS_ADPCM_decode(audio_buf, audio_len) < 0) {
+            was_error = 1;
+            goto done;
+        }
+    }
+    if (IMA_ADPCM_encoded) {
+        if (IMA_ADPCM_decode(audio_buf, audio_len) < 0) {
+            was_error = 1;
+            goto done;
+        }
+    }
+
+    /* Don't return a buffer that isn't a multiple of samplesize */
+    samplesize = ((SDL_AUDIO_BITSIZE(spec->format)) / 8) * spec->channels;
+    *audio_len &= ~(samplesize - 1);
+
+  done:
+    SDL_free(format);
+    if (src) {
+        if (freesrc) {
+            SDL_RWclose(src);
+        } else {
+            /* seek to the end of the file (given by the RIFF chunk) */
+            SDL_RWseek(src, wavelen - chunk.length - headerDiff, RW_SEEK_CUR);
+        }
+    }
+    if (was_error) {
+        spec = NULL;
+    }
+    return (spec);
+}
+
+/* Since the WAV memory is allocated in the shared library, it must also
+   be freed here.  (Necessary under Win32, VC++)
+ */
+void
+SDL_FreeWAV(Uint8 * audio_buf)
+{
+    SDL_free(audio_buf);
+}
+
+static int
+ReadChunk(SDL_RWops * src, Chunk * chunk)
+{
+    chunk->magic = SDL_ReadLE32(src);
+    chunk->length = SDL_ReadLE32(src);
+    chunk->data = (Uint8 *) SDL_malloc(chunk->length);
+    if (chunk->data == NULL) {
+        return SDL_OutOfMemory();
+    }
+    if (SDL_RWread(src, chunk->data, chunk->length, 1) != 1) {
+        SDL_free(chunk->data);
+        chunk->data = NULL;
+        return SDL_Error(SDL_EFREAD);
+    }
+    return (chunk->length);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/SDL_wave.h b/Source/3rd Party/sdl/src/audio/SDL_wave.h
new file mode 100644
index 000000000..c53ad590a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/SDL_wave.h	
@@ -0,0 +1,65 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* WAVE files are little-endian */
+
+/*******************************************/
+/* Define values for Microsoft WAVE format */
+/*******************************************/
+#define RIFF            0x46464952      /* "RIFF" */
+#define WAVE            0x45564157      /* "WAVE" */
+#define FACT            0x74636166      /* "fact" */
+#define LIST            0x5453494c      /* "LIST" */
+#define FMT             0x20746D66      /* "fmt " */
+#define DATA            0x61746164      /* "data" */
+#define PCM_CODE        0x0001
+#define MS_ADPCM_CODE   0x0002
+#define IEEE_FLOAT_CODE 0x0003
+#define IMA_ADPCM_CODE  0x0011
+#define MP3_CODE        0x0055
+#define WAVE_MONO       1
+#define WAVE_STEREO     2
+
+/* Normally, these three chunks come consecutively in a WAVE file */
+typedef struct WaveFMT
+{
+/* Not saved in the chunk we read:
+    Uint32  FMTchunk;
+    Uint32  fmtlen;
+*/
+    Uint16 encoding;
+    Uint16 channels;            /* 1 = mono, 2 = stereo */
+    Uint32 frequency;           /* One of 11025, 22050, or 44100 Hz */
+    Uint32 byterate;            /* Average bytes per second */
+    Uint16 blockalign;          /* Bytes per sample block */
+    Uint16 bitspersample;       /* One of 8, 12, 16, or 4 for ADPCM */
+} WaveFMT;
+
+/* The general chunk found in the WAVE file */
+typedef struct Chunk
+{
+    Uint32 magic;
+    Uint32 length;
+    Uint8 *data;
+} Chunk;
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/alsa/SDL_alsa_audio.c b/Source/3rd Party/sdl/src/audio/alsa/SDL_alsa_audio.c
new file mode 100644
index 000000000..1f3def3f6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/alsa/SDL_alsa_audio.c	
@@ -0,0 +1,685 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_ALSA
+
+/* Allow access to a raw mixing buffer */
+
+#include <sys/types.h>
+#include <signal.h>             /* For kill() */
+#include <errno.h>
+#include <string.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_alsa_audio.h"
+
+#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
+#include "SDL_loadso.h"
+#endif
+
+static int (*ALSA_snd_pcm_open)
+  (snd_pcm_t **, const char *, snd_pcm_stream_t, int);
+static int (*ALSA_snd_pcm_close) (snd_pcm_t * pcm);
+static snd_pcm_sframes_t(*ALSA_snd_pcm_writei)
+  (snd_pcm_t *, const void *, snd_pcm_uframes_t);
+static int (*ALSA_snd_pcm_recover) (snd_pcm_t *, int, int);
+static int (*ALSA_snd_pcm_prepare) (snd_pcm_t *);
+static int (*ALSA_snd_pcm_drain) (snd_pcm_t *);
+static const char *(*ALSA_snd_strerror) (int);
+static size_t(*ALSA_snd_pcm_hw_params_sizeof) (void);
+static size_t(*ALSA_snd_pcm_sw_params_sizeof) (void);
+static void (*ALSA_snd_pcm_hw_params_copy)
+  (snd_pcm_hw_params_t *, const snd_pcm_hw_params_t *);
+static int (*ALSA_snd_pcm_hw_params_any) (snd_pcm_t *, snd_pcm_hw_params_t *);
+static int (*ALSA_snd_pcm_hw_params_set_access)
+  (snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_access_t);
+static int (*ALSA_snd_pcm_hw_params_set_format)
+  (snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_format_t);
+static int (*ALSA_snd_pcm_hw_params_set_channels)
+  (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int);
+static int (*ALSA_snd_pcm_hw_params_get_channels)
+  (const snd_pcm_hw_params_t *, unsigned int *);
+static int (*ALSA_snd_pcm_hw_params_set_rate_near)
+  (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *);
+static int (*ALSA_snd_pcm_hw_params_set_period_size_near)
+  (snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *);
+static int (*ALSA_snd_pcm_hw_params_get_period_size)
+  (const snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *);
+static int (*ALSA_snd_pcm_hw_params_set_periods_near)
+  (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *);
+static int (*ALSA_snd_pcm_hw_params_get_periods)
+  (const snd_pcm_hw_params_t *, unsigned int *, int *);
+static int (*ALSA_snd_pcm_hw_params_set_buffer_size_near)
+  (snd_pcm_t *pcm, snd_pcm_hw_params_t *, snd_pcm_uframes_t *);
+static int (*ALSA_snd_pcm_hw_params_get_buffer_size)
+  (const snd_pcm_hw_params_t *, snd_pcm_uframes_t *);
+static int (*ALSA_snd_pcm_hw_params) (snd_pcm_t *, snd_pcm_hw_params_t *);
+static int (*ALSA_snd_pcm_sw_params_current) (snd_pcm_t *,
+                                              snd_pcm_sw_params_t *);
+static int (*ALSA_snd_pcm_sw_params_set_start_threshold)
+  (snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t);
+static int (*ALSA_snd_pcm_sw_params) (snd_pcm_t *, snd_pcm_sw_params_t *);
+static int (*ALSA_snd_pcm_nonblock) (snd_pcm_t *, int);
+static int (*ALSA_snd_pcm_wait)(snd_pcm_t *, int);
+static int (*ALSA_snd_pcm_sw_params_set_avail_min)
+  (snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t);
+
+#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
+#define snd_pcm_hw_params_sizeof ALSA_snd_pcm_hw_params_sizeof
+#define snd_pcm_sw_params_sizeof ALSA_snd_pcm_sw_params_sizeof
+
+static const char *alsa_library = SDL_AUDIO_DRIVER_ALSA_DYNAMIC;
+static void *alsa_handle = NULL;
+
+static int
+load_alsa_sym(const char *fn, void **addr)
+{
+    *addr = SDL_LoadFunction(alsa_handle, fn);
+    if (*addr == NULL) {
+        /* Don't call SDL_SetError(): SDL_LoadFunction already did. */
+        return 0;
+    }
+
+    return 1;
+}
+
+/* cast funcs to char* first, to please GCC's strict aliasing rules. */
+#define SDL_ALSA_SYM(x) \
+    if (!load_alsa_sym(#x, (void **) (char *) &ALSA_##x)) return -1
+#else
+#define SDL_ALSA_SYM(x) ALSA_##x = x
+#endif
+
+static int
+load_alsa_syms(void)
+{
+    SDL_ALSA_SYM(snd_pcm_open);
+    SDL_ALSA_SYM(snd_pcm_close);
+    SDL_ALSA_SYM(snd_pcm_writei);
+    SDL_ALSA_SYM(snd_pcm_recover);
+    SDL_ALSA_SYM(snd_pcm_prepare);
+    SDL_ALSA_SYM(snd_pcm_drain);
+    SDL_ALSA_SYM(snd_strerror);
+    SDL_ALSA_SYM(snd_pcm_hw_params_sizeof);
+    SDL_ALSA_SYM(snd_pcm_sw_params_sizeof);
+    SDL_ALSA_SYM(snd_pcm_hw_params_copy);
+    SDL_ALSA_SYM(snd_pcm_hw_params_any);
+    SDL_ALSA_SYM(snd_pcm_hw_params_set_access);
+    SDL_ALSA_SYM(snd_pcm_hw_params_set_format);
+    SDL_ALSA_SYM(snd_pcm_hw_params_set_channels);
+    SDL_ALSA_SYM(snd_pcm_hw_params_get_channels);
+    SDL_ALSA_SYM(snd_pcm_hw_params_set_rate_near);
+    SDL_ALSA_SYM(snd_pcm_hw_params_set_period_size_near);
+    SDL_ALSA_SYM(snd_pcm_hw_params_get_period_size);
+    SDL_ALSA_SYM(snd_pcm_hw_params_set_periods_near);
+    SDL_ALSA_SYM(snd_pcm_hw_params_get_periods);
+    SDL_ALSA_SYM(snd_pcm_hw_params_set_buffer_size_near);
+    SDL_ALSA_SYM(snd_pcm_hw_params_get_buffer_size);
+    SDL_ALSA_SYM(snd_pcm_hw_params);
+    SDL_ALSA_SYM(snd_pcm_sw_params_current);
+    SDL_ALSA_SYM(snd_pcm_sw_params_set_start_threshold);
+    SDL_ALSA_SYM(snd_pcm_sw_params);
+    SDL_ALSA_SYM(snd_pcm_nonblock);
+    SDL_ALSA_SYM(snd_pcm_wait);
+    SDL_ALSA_SYM(snd_pcm_sw_params_set_avail_min);
+    return 0;
+}
+
+#undef SDL_ALSA_SYM
+
+#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
+
+static void
+UnloadALSALibrary(void)
+{
+    if (alsa_handle != NULL) {
+        SDL_UnloadObject(alsa_handle);
+        alsa_handle = NULL;
+    }
+}
+
+static int
+LoadALSALibrary(void)
+{
+    int retval = 0;
+    if (alsa_handle == NULL) {
+        alsa_handle = SDL_LoadObject(alsa_library);
+        if (alsa_handle == NULL) {
+            retval = -1;
+            /* Don't call SDL_SetError(): SDL_LoadObject already did. */
+        } else {
+            retval = load_alsa_syms();
+            if (retval < 0) {
+                UnloadALSALibrary();
+            }
+        }
+    }
+    return retval;
+}
+
+#else
+
+static void
+UnloadALSALibrary(void)
+{
+}
+
+static int
+LoadALSALibrary(void)
+{
+    load_alsa_syms();
+    return 0;
+}
+
+#endif /* SDL_AUDIO_DRIVER_ALSA_DYNAMIC */
+
+static const char *
+get_audio_device(int channels)
+{
+    const char *device;
+
+    device = SDL_getenv("AUDIODEV");    /* Is there a standard variable name? */
+    if (device == NULL) {
+        switch (channels) {
+        case 6:
+            device = "plug:surround51";
+            break;
+        case 4:
+            device = "plug:surround40";
+            break;
+        default:
+            device = "default";
+            break;
+        }
+    }
+    return device;
+}
+
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+ALSA_WaitDevice(_THIS)
+{
+    /* We're in blocking mode, so there's nothing to do here */
+}
+
+
+/* !!! FIXME: is there a channel swizzler in alsalib instead? */
+/*
+ * http://bugzilla.libsdl.org/show_bug.cgi?id=110
+ * "For Linux ALSA, this is FL-FR-RL-RR-C-LFE
+ *  and for Windows DirectX [and CoreAudio], this is FL-FR-C-LFE-RL-RR"
+ */
+#define SWIZ6(T) \
+    T *ptr = (T *) this->hidden->mixbuf; \
+    Uint32 i; \
+    for (i = 0; i < this->spec.samples; i++, ptr += 6) { \
+        T tmp; \
+        tmp = ptr[2]; ptr[2] = ptr[4]; ptr[4] = tmp; \
+        tmp = ptr[3]; ptr[3] = ptr[5]; ptr[5] = tmp; \
+    }
+
+static SDL_INLINE void
+swizzle_alsa_channels_6_64bit(_THIS)
+{
+    SWIZ6(Uint64);
+}
+
+static SDL_INLINE void
+swizzle_alsa_channels_6_32bit(_THIS)
+{
+    SWIZ6(Uint32);
+}
+
+static SDL_INLINE void
+swizzle_alsa_channels_6_16bit(_THIS)
+{
+    SWIZ6(Uint16);
+}
+
+static SDL_INLINE void
+swizzle_alsa_channels_6_8bit(_THIS)
+{
+    SWIZ6(Uint8);
+}
+
+#undef SWIZ6
+
+
+/*
+ * Called right before feeding this->hidden->mixbuf to the hardware. Swizzle
+ *  channels from Windows/Mac order to the format alsalib will want.
+ */
+static SDL_INLINE void
+swizzle_alsa_channels(_THIS)
+{
+    if (this->spec.channels == 6) {
+        const Uint16 fmtsize = (this->spec.format & 0xFF);      /* bits/channel. */
+        if (fmtsize == 16)
+            swizzle_alsa_channels_6_16bit(this);
+        else if (fmtsize == 8)
+            swizzle_alsa_channels_6_8bit(this);
+        else if (fmtsize == 32)
+            swizzle_alsa_channels_6_32bit(this);
+        else if (fmtsize == 64)
+            swizzle_alsa_channels_6_64bit(this);
+    }
+
+    /* !!! FIXME: update this for 7.1 if needed, later. */
+}
+
+
+static void
+ALSA_PlayDevice(_THIS)
+{
+    int status;
+    const Uint8 *sample_buf = (const Uint8 *) this->hidden->mixbuf;
+    const int frame_size = (((int) (this->spec.format & 0xFF)) / 8) *
+                                this->spec.channels;
+    snd_pcm_uframes_t frames_left = ((snd_pcm_uframes_t) this->spec.samples);
+
+    swizzle_alsa_channels(this);
+
+    while ( frames_left > 0 && this->enabled ) {
+        /* !!! FIXME: This works, but needs more testing before going live */
+        /* ALSA_snd_pcm_wait(this->hidden->pcm_handle, -1); */
+        status = ALSA_snd_pcm_writei(this->hidden->pcm_handle,
+                                     sample_buf, frames_left);
+
+        if (status < 0) {
+            if (status == -EAGAIN) {
+                /* Apparently snd_pcm_recover() doesn't handle this case -
+                   does it assume snd_pcm_wait() above? */
+                SDL_Delay(1);
+                continue;
+            }
+            status = ALSA_snd_pcm_recover(this->hidden->pcm_handle, status, 0);
+            if (status < 0) {
+                /* Hmm, not much we can do - abort */
+                fprintf(stderr, "ALSA write failed (unrecoverable): %s\n",
+                        ALSA_snd_strerror(status));
+                this->enabled = 0;
+                return;
+            }
+            continue;
+        }
+        sample_buf += status * frame_size;
+        frames_left -= status;
+    }
+}
+
+static Uint8 *
+ALSA_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+static void
+ALSA_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->pcm_handle) {
+            ALSA_snd_pcm_drain(this->hidden->pcm_handle);
+            ALSA_snd_pcm_close(this->hidden->pcm_handle);
+            this->hidden->pcm_handle = NULL;
+        }
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static int
+ALSA_finalize_hardware(_THIS, snd_pcm_hw_params_t *hwparams, int override)
+{
+    int status;
+    snd_pcm_uframes_t bufsize;
+
+    /* "set" the hardware with the desired parameters */
+    status = ALSA_snd_pcm_hw_params(this->hidden->pcm_handle, hwparams);
+    if ( status < 0 ) {
+        return(-1);
+    }
+
+    /* Get samples for the actual buffer size */
+    status = ALSA_snd_pcm_hw_params_get_buffer_size(hwparams, &bufsize);
+    if ( status < 0 ) {
+        return(-1);
+    }
+    if ( !override && bufsize != this->spec.samples * 2 ) {
+        return(-1);
+    }
+
+    /* !!! FIXME: Is this safe to do? */
+    this->spec.samples = bufsize / 2;
+
+    /* This is useful for debugging */
+    if ( SDL_getenv("SDL_AUDIO_ALSA_DEBUG") ) {
+        snd_pcm_uframes_t persize = 0;
+        unsigned int periods = 0;
+
+        ALSA_snd_pcm_hw_params_get_period_size(hwparams, &persize, NULL);
+        ALSA_snd_pcm_hw_params_get_periods(hwparams, &periods, NULL);
+
+        fprintf(stderr,
+            "ALSA: period size = %ld, periods = %u, buffer size = %lu\n",
+            persize, periods, bufsize);
+    }
+
+    return(0);
+}
+
+static int
+ALSA_set_period_size(_THIS, snd_pcm_hw_params_t *params, int override)
+{
+    const char *env;
+    int status;
+    snd_pcm_hw_params_t *hwparams;
+    snd_pcm_uframes_t frames;
+    unsigned int periods;
+
+    /* Copy the hardware parameters for this setup */
+    snd_pcm_hw_params_alloca(&hwparams);
+    ALSA_snd_pcm_hw_params_copy(hwparams, params);
+
+    if ( !override ) {
+        env = SDL_getenv("SDL_AUDIO_ALSA_SET_PERIOD_SIZE");
+        if ( env ) {
+            override = SDL_atoi(env);
+            if ( override == 0 ) {
+                return(-1);
+            }
+        }
+    }
+
+    frames = this->spec.samples;
+    status = ALSA_snd_pcm_hw_params_set_period_size_near(
+                this->hidden->pcm_handle, hwparams, &frames, NULL);
+    if ( status < 0 ) {
+        return(-1);
+    }
+
+    periods = 2;
+    status = ALSA_snd_pcm_hw_params_set_periods_near(
+                this->hidden->pcm_handle, hwparams, &periods, NULL);
+    if ( status < 0 ) {
+        return(-1);
+    }
+
+    return ALSA_finalize_hardware(this, hwparams, override);
+}
+
+static int
+ALSA_set_buffer_size(_THIS, snd_pcm_hw_params_t *params, int override)
+{
+    const char *env;
+    int status;
+    snd_pcm_hw_params_t *hwparams;
+    snd_pcm_uframes_t frames;
+
+    /* Copy the hardware parameters for this setup */
+    snd_pcm_hw_params_alloca(&hwparams);
+    ALSA_snd_pcm_hw_params_copy(hwparams, params);
+
+    if ( !override ) {
+        env = SDL_getenv("SDL_AUDIO_ALSA_SET_BUFFER_SIZE");
+        if ( env ) {
+            override = SDL_atoi(env);
+            if ( override == 0 ) {
+                return(-1);
+            }
+        }
+    }
+
+    frames = this->spec.samples * 2;
+    status = ALSA_snd_pcm_hw_params_set_buffer_size_near(
+                    this->hidden->pcm_handle, hwparams, &frames);
+    if ( status < 0 ) {
+        return(-1);
+    }
+
+    return ALSA_finalize_hardware(this, hwparams, override);
+}
+
+static int
+ALSA_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    int status = 0;
+    snd_pcm_t *pcm_handle = NULL;
+    snd_pcm_hw_params_t *hwparams = NULL;
+    snd_pcm_sw_params_t *swparams = NULL;
+    snd_pcm_format_t format = 0;
+    SDL_AudioFormat test_format = 0;
+    unsigned int rate = 0;
+    unsigned int channels = 0;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Open the audio device */
+    /* Name of device should depend on # channels in spec */
+    status = ALSA_snd_pcm_open(&pcm_handle,
+                               get_audio_device(this->spec.channels),
+                               SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
+
+    if (status < 0) {
+        ALSA_CloseDevice(this);
+        return SDL_SetError("ALSA: Couldn't open audio device: %s",
+                            ALSA_snd_strerror(status));
+    }
+
+    this->hidden->pcm_handle = pcm_handle;
+
+    /* Figure out what the hardware is capable of */
+    snd_pcm_hw_params_alloca(&hwparams);
+    status = ALSA_snd_pcm_hw_params_any(pcm_handle, hwparams);
+    if (status < 0) {
+        ALSA_CloseDevice(this);
+        return SDL_SetError("ALSA: Couldn't get hardware config: %s",
+                            ALSA_snd_strerror(status));
+    }
+
+    /* SDL only uses interleaved sample output */
+    status = ALSA_snd_pcm_hw_params_set_access(pcm_handle, hwparams,
+                                               SND_PCM_ACCESS_RW_INTERLEAVED);
+    if (status < 0) {
+        ALSA_CloseDevice(this);
+        return SDL_SetError("ALSA: Couldn't set interleaved access: %s",
+                     ALSA_snd_strerror(status));
+    }
+
+    /* Try for a closest match on audio format */
+    status = -1;
+    for (test_format = SDL_FirstAudioFormat(this->spec.format);
+         test_format && (status < 0);) {
+        status = 0;             /* if we can't support a format, it'll become -1. */
+        switch (test_format) {
+        case AUDIO_U8:
+            format = SND_PCM_FORMAT_U8;
+            break;
+        case AUDIO_S8:
+            format = SND_PCM_FORMAT_S8;
+            break;
+        case AUDIO_S16LSB:
+            format = SND_PCM_FORMAT_S16_LE;
+            break;
+        case AUDIO_S16MSB:
+            format = SND_PCM_FORMAT_S16_BE;
+            break;
+        case AUDIO_U16LSB:
+            format = SND_PCM_FORMAT_U16_LE;
+            break;
+        case AUDIO_U16MSB:
+            format = SND_PCM_FORMAT_U16_BE;
+            break;
+        case AUDIO_S32LSB:
+            format = SND_PCM_FORMAT_S32_LE;
+            break;
+        case AUDIO_S32MSB:
+            format = SND_PCM_FORMAT_S32_BE;
+            break;
+        case AUDIO_F32LSB:
+            format = SND_PCM_FORMAT_FLOAT_LE;
+            break;
+        case AUDIO_F32MSB:
+            format = SND_PCM_FORMAT_FLOAT_BE;
+            break;
+        default:
+            status = -1;
+            break;
+        }
+        if (status >= 0) {
+            status = ALSA_snd_pcm_hw_params_set_format(pcm_handle,
+                                                       hwparams, format);
+        }
+        if (status < 0) {
+            test_format = SDL_NextAudioFormat();
+        }
+    }
+    if (status < 0) {
+        ALSA_CloseDevice(this);
+        return SDL_SetError("ALSA: Couldn't find any hardware audio formats");
+    }
+    this->spec.format = test_format;
+
+    /* Set the number of channels */
+    status = ALSA_snd_pcm_hw_params_set_channels(pcm_handle, hwparams,
+                                                 this->spec.channels);
+    channels = this->spec.channels;
+    if (status < 0) {
+        status = ALSA_snd_pcm_hw_params_get_channels(hwparams, &channels);
+        if (status < 0) {
+            ALSA_CloseDevice(this);
+            return SDL_SetError("ALSA: Couldn't set audio channels");
+        }
+        this->spec.channels = channels;
+    }
+
+    /* Set the audio rate */
+    rate = this->spec.freq;
+    status = ALSA_snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams,
+                                                  &rate, NULL);
+    if (status < 0) {
+        ALSA_CloseDevice(this);
+        return SDL_SetError("ALSA: Couldn't set audio frequency: %s",
+                            ALSA_snd_strerror(status));
+    }
+    this->spec.freq = rate;
+
+    /* Set the buffer size, in samples */
+    if ( ALSA_set_period_size(this, hwparams, 0) < 0 &&
+         ALSA_set_buffer_size(this, hwparams, 0) < 0 ) {
+        /* Failed to set desired buffer size, do the best you can... */
+        if ( ALSA_set_period_size(this, hwparams, 1) < 0 ) {
+            ALSA_CloseDevice(this);
+            return SDL_SetError("Couldn't set hardware audio parameters: %s", ALSA_snd_strerror(status));
+        }
+    }
+    /* Set the software parameters */
+    snd_pcm_sw_params_alloca(&swparams);
+    status = ALSA_snd_pcm_sw_params_current(pcm_handle, swparams);
+    if (status < 0) {
+        ALSA_CloseDevice(this);
+        return SDL_SetError("ALSA: Couldn't get software config: %s",
+                            ALSA_snd_strerror(status));
+    }
+    status = ALSA_snd_pcm_sw_params_set_avail_min(pcm_handle, swparams, this->spec.samples);
+    if (status < 0) {
+        ALSA_CloseDevice(this);
+        return SDL_SetError("Couldn't set minimum available samples: %s",
+                            ALSA_snd_strerror(status));
+    }
+    status =
+        ALSA_snd_pcm_sw_params_set_start_threshold(pcm_handle, swparams, 1);
+    if (status < 0) {
+        ALSA_CloseDevice(this);
+        return SDL_SetError("ALSA: Couldn't set start threshold: %s",
+                            ALSA_snd_strerror(status));
+    }
+    status = ALSA_snd_pcm_sw_params(pcm_handle, swparams);
+    if (status < 0) {
+        ALSA_CloseDevice(this);
+        return SDL_SetError("Couldn't set software audio parameters: %s",
+                            ALSA_snd_strerror(status));
+    }
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Allocate mixing buffer */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        ALSA_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->hidden->mixlen);
+
+    /* Switch to blocking mode for playback */
+    ALSA_snd_pcm_nonblock(pcm_handle, 0);
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+static void
+ALSA_Deinitialize(void)
+{
+    UnloadALSALibrary();
+}
+
+static int
+ALSA_Init(SDL_AudioDriverImpl * impl)
+{
+    if (LoadALSALibrary() < 0) {
+        return 0;
+    }
+
+    /* Set the function pointers */
+    impl->OpenDevice = ALSA_OpenDevice;
+    impl->WaitDevice = ALSA_WaitDevice;
+    impl->GetDeviceBuf = ALSA_GetDeviceBuf;
+    impl->PlayDevice = ALSA_PlayDevice;
+    impl->CloseDevice = ALSA_CloseDevice;
+    impl->Deinitialize = ALSA_Deinitialize;
+    impl->OnlyHasDefaultOutputDevice = 1;       /* !!! FIXME: Add device enum! */
+
+    return 1;   /* this audio target is available. */
+}
+
+
+AudioBootStrap ALSA_bootstrap = {
+    "alsa", "ALSA PCM audio", ALSA_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_ALSA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/alsa/SDL_alsa_audio.h b/Source/3rd Party/sdl/src/audio/alsa/SDL_alsa_audio.h
new file mode 100644
index 000000000..45353883d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/alsa/SDL_alsa_audio.h	
@@ -0,0 +1,45 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_ALSA_audio_h
+#define _SDL_ALSA_audio_h
+
+#include <alsa/asoundlib.h>
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The audio device handle */
+    snd_pcm_t *pcm_handle;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+};
+
+#endif /* _SDL_ALSA_audio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/android/SDL_androidaudio.c b/Source/3rd Party/sdl/src/audio/android/SDL_androidaudio.c
new file mode 100644
index 000000000..0c85b83cb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/android/SDL_androidaudio.c	
@@ -0,0 +1,141 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_ANDROID
+
+/* Output audio to Android */
+
+#include "SDL_audio.h"
+#include "../SDL_audio_c.h"
+#include "SDL_androidaudio.h"
+
+#include "../../core/android/SDL_android.h"
+
+#include <android/log.h>
+
+static void * audioDevice;
+
+static int
+AndroidAUD_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    SDL_AudioFormat test_format;
+
+    if (iscapture) {
+        /* TODO: implement capture */
+        return SDL_SetError("Capture not supported on Android");
+    }
+
+    if (audioDevice != NULL) {
+        return SDL_SetError("Only one audio device at a time please!");
+    }
+
+    audioDevice = this;
+
+    test_format = SDL_FirstAudioFormat(this->spec.format);
+    while (test_format != 0) { /* no "UNKNOWN" constant */
+        if ((test_format == AUDIO_U8) || (test_format == AUDIO_S16LSB)) {
+            this->spec.format = test_format;
+            break;
+        }
+        test_format = SDL_NextAudioFormat();
+    }
+
+    if (test_format == 0) {
+        /* Didn't find a compatible format :( */
+        return SDL_SetError("No compatible audio format!");
+    }
+
+    if (this->spec.channels > 1) {
+        this->spec.channels = 2;
+    } else {
+        this->spec.channels = 1;
+    }
+
+    if (this->spec.freq < 8000) {
+        this->spec.freq = 8000;
+    }
+    if (this->spec.freq > 48000) {
+        this->spec.freq = 48000;
+    }
+
+    /* TODO: pass in/return a (Java) device ID, also whether we're opening for input or output */
+    this->spec.samples = Android_JNI_OpenAudioDevice(this->spec.freq, this->spec.format == AUDIO_U8 ? 0 : 1, this->spec.channels, this->spec.samples);
+    SDL_CalculateAudioSpec(&this->spec);
+
+    if (this->spec.samples == 0) {
+        /* Init failed? */
+        return SDL_SetError("Java-side initialization failed!");
+    }
+
+    return 0;
+}
+
+static void
+AndroidAUD_PlayDevice(_THIS)
+{
+    Android_JNI_WriteAudioBuffer();
+}
+
+static Uint8 *
+AndroidAUD_GetDeviceBuf(_THIS)
+{
+    return Android_JNI_GetAudioBuffer();
+}
+
+static void
+AndroidAUD_CloseDevice(_THIS)
+{
+    /* At this point SDL_CloseAudioDevice via close_audio_device took care of terminating the audio thread
+       so it's safe to terminate the Java side buffer and AudioTrack
+     */
+    Android_JNI_CloseAudioDevice();
+
+    if (audioDevice == this) {
+        audioDevice = NULL;
+    }
+}
+
+static int
+AndroidAUD_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->OpenDevice = AndroidAUD_OpenDevice;
+    impl->PlayDevice = AndroidAUD_PlayDevice;
+    impl->GetDeviceBuf = AndroidAUD_GetDeviceBuf;
+    impl->CloseDevice = AndroidAUD_CloseDevice;
+
+    /* and the capabilities */
+    impl->HasCaptureSupport = 0; /* TODO */
+    impl->OnlyHasDefaultOutputDevice = 1;
+    impl->OnlyHasDefaultInputDevice = 1;
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap ANDROIDAUD_bootstrap = {
+    "android", "SDL Android audio driver", AndroidAUD_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/audio/android/SDL_androidaudio.h b/Source/3rd Party/sdl/src/audio/android/SDL_androidaudio.h
new file mode 100644
index 000000000..ab49f000f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/android/SDL_androidaudio.h	
@@ -0,0 +1,39 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_androidaudio_h
+#define _SDL_androidaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+};
+
+static void AndroidAUD_CloseDevice(_THIS);
+
+#endif /* _SDL_androidaudio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/arts/SDL_artsaudio.c b/Source/3rd Party/sdl/src/audio/arts/SDL_artsaudio.c
new file mode 100644
index 000000000..72fba70cc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/arts/SDL_artsaudio.c	
@@ -0,0 +1,384 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_ARTS
+
+/* Allow access to a raw mixing buffer */
+
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#include <unistd.h>
+#include <errno.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_artsaudio.h"
+
+#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
+#include "SDL_name.h"
+#include "SDL_loadso.h"
+#else
+#define SDL_NAME(X)	X
+#endif
+
+#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
+
+static const char *arts_library = SDL_AUDIO_DRIVER_ARTS_DYNAMIC;
+static void *arts_handle = NULL;
+
+/* !!! FIXME: I hate this SDL_NAME clutter...it makes everything so messy! */
+static int (*SDL_NAME(arts_init)) (void);
+static void (*SDL_NAME(arts_free)) (void);
+static arts_stream_t(*SDL_NAME(arts_play_stream)) (int rate, int bits,
+                                                   int channels,
+                                                   const char *name);
+static int (*SDL_NAME(arts_stream_set)) (arts_stream_t s,
+                                         arts_parameter_t param, int value);
+static int (*SDL_NAME(arts_stream_get)) (arts_stream_t s,
+                                         arts_parameter_t param);
+static int (*SDL_NAME(arts_write)) (arts_stream_t s, const void *buffer,
+                                    int count);
+static void (*SDL_NAME(arts_close_stream)) (arts_stream_t s);
+static int (*SDL_NAME(arts_suspend))(void);
+static int (*SDL_NAME(arts_suspended)) (void);
+static const char *(*SDL_NAME(arts_error_text)) (int errorcode);
+
+#define SDL_ARTS_SYM(x) { #x, (void **) (char *) &SDL_NAME(x) }
+static struct
+{
+    const char *name;
+    void **func;
+} arts_functions[] = {
+/* *INDENT-OFF* */
+    SDL_ARTS_SYM(arts_init),
+    SDL_ARTS_SYM(arts_free),
+    SDL_ARTS_SYM(arts_play_stream),
+    SDL_ARTS_SYM(arts_stream_set),
+    SDL_ARTS_SYM(arts_stream_get),
+    SDL_ARTS_SYM(arts_write),
+    SDL_ARTS_SYM(arts_close_stream),
+    SDL_ARTS_SYM(arts_suspend),
+    SDL_ARTS_SYM(arts_suspended),
+    SDL_ARTS_SYM(arts_error_text),
+/* *INDENT-ON* */
+};
+
+#undef SDL_ARTS_SYM
+
+static void
+UnloadARTSLibrary()
+{
+    if (arts_handle != NULL) {
+        SDL_UnloadObject(arts_handle);
+        arts_handle = NULL;
+    }
+}
+
+static int
+LoadARTSLibrary(void)
+{
+    int i, retval = -1;
+
+    if (arts_handle == NULL) {
+        arts_handle = SDL_LoadObject(arts_library);
+        if (arts_handle != NULL) {
+            retval = 0;
+            for (i = 0; i < SDL_arraysize(arts_functions); ++i) {
+                *arts_functions[i].func =
+                    SDL_LoadFunction(arts_handle, arts_functions[i].name);
+                if (!*arts_functions[i].func) {
+                    retval = -1;
+                    UnloadARTSLibrary();
+                    break;
+                }
+            }
+        }
+    }
+
+    return retval;
+}
+
+#else
+
+static void
+UnloadARTSLibrary()
+{
+    return;
+}
+
+static int
+LoadARTSLibrary(void)
+{
+    return 0;
+}
+
+#endif /* SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+ARTS_WaitDevice(_THIS)
+{
+    Sint32 ticks;
+
+    /* Check to see if the thread-parent process is still alive */
+    {
+        static int cnt = 0;
+        /* Note that this only works with thread implementations
+           that use a different process id for each thread.
+         */
+        /* Check every 10 loops */
+        if (this->hidden->parent && (((++cnt) % 10) == 0)) {
+            if (kill(this->hidden->parent, 0) < 0 && errno == ESRCH) {
+                this->enabled = 0;
+            }
+        }
+    }
+
+    /* Use timer for general audio synchronization */
+    ticks =
+        ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS;
+    if (ticks > 0) {
+        SDL_Delay(ticks);
+    }
+}
+
+static void
+ARTS_PlayDevice(_THIS)
+{
+    /* Write the audio data */
+    int written = SDL_NAME(arts_write) (this->hidden->stream,
+                                        this->hidden->mixbuf,
+                                        this->hidden->mixlen);
+
+    /* If timer synchronization is enabled, set the next write frame */
+    if (this->hidden->frame_ticks) {
+        this->hidden->next_frame += this->hidden->frame_ticks;
+    }
+
+    /* If we couldn't write, assume fatal error for now */
+    if (written < 0) {
+        this->enabled = 0;
+    }
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Wrote %d bytes of audio data\n", written);
+#endif
+}
+
+static void
+ARTS_WaitDone(_THIS)
+{
+    /* !!! FIXME: camp here until buffer drains... SDL_Delay(???); */
+}
+
+
+static Uint8 *
+ARTS_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+
+static void
+ARTS_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->stream) {
+            SDL_NAME(arts_close_stream) (this->hidden->stream);
+            this->hidden->stream = 0;
+        }
+        SDL_NAME(arts_free) ();
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static int
+ARTS_Suspend(void)
+{
+    const Uint32 abortms = SDL_GetTicks() + 3000; /* give up after 3 secs */
+    while ( (!SDL_NAME(arts_suspended)()) && !SDL_TICKS_PASSED(SDL_GetTicks(), abortms) ) {
+        if ( SDL_NAME(arts_suspend)() ) {
+            break;
+        }
+    }
+    return SDL_NAME(arts_suspended)();
+}
+
+static int
+ARTS_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    int rc = 0;
+    int bits = 0, frag_spec = 0;
+    SDL_AudioFormat test_format = 0, format = 0;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Try for a closest match on audio format */
+    for (test_format = SDL_FirstAudioFormat(this->spec.format);
+         !format && test_format;) {
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Trying format 0x%4.4x\n", test_format);
+#endif
+        switch (test_format) {
+        case AUDIO_U8:
+            bits = 8;
+            format = 1;
+            break;
+        case AUDIO_S16LSB:
+            bits = 16;
+            format = 1;
+            break;
+        default:
+            format = 0;
+            break;
+        }
+        if (!format) {
+            test_format = SDL_NextAudioFormat();
+        }
+    }
+    if (format == 0) {
+        ARTS_CloseDevice(this);
+        return SDL_SetError("Couldn't find any hardware audio formats");
+    }
+    this->spec.format = test_format;
+
+    if ((rc = SDL_NAME(arts_init) ()) != 0) {
+        ARTS_CloseDevice(this);
+        return SDL_SetError("Unable to initialize ARTS: %s",
+                            SDL_NAME(arts_error_text) (rc));
+    }
+
+    if (!ARTS_Suspend()) {
+        ARTS_CloseDevice(this);
+        return SDL_SetError("ARTS can not open audio device");
+    }
+
+    this->hidden->stream = SDL_NAME(arts_play_stream) (this->spec.freq,
+                                                       bits,
+                                                       this->spec.channels,
+                                                       "SDL");
+
+    /* Play nothing so we have at least one write (server bug workaround). */
+    SDL_NAME(arts_write) (this->hidden->stream, "", 0);
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Determine the power of two of the fragment size */
+    for (frag_spec = 0; (0x01 << frag_spec) < this->spec.size; ++frag_spec);
+    if ((0x01 << frag_spec) != this->spec.size) {
+        ARTS_CloseDevice(this);
+        return SDL_SetError("Fragment size must be a power of two");
+    }
+    frag_spec |= 0x00020000;    /* two fragments, for low latency */
+
+#ifdef ARTS_P_PACKET_SETTINGS
+    SDL_NAME(arts_stream_set) (this->hidden->stream,
+                               ARTS_P_PACKET_SETTINGS, frag_spec);
+#else
+    SDL_NAME(arts_stream_set) (this->hidden->stream, ARTS_P_PACKET_SIZE,
+                               frag_spec & 0xffff);
+    SDL_NAME(arts_stream_set) (this->hidden->stream, ARTS_P_PACKET_COUNT,
+                               frag_spec >> 16);
+#endif
+    this->spec.size = SDL_NAME(arts_stream_get) (this->hidden->stream,
+                                                 ARTS_P_PACKET_SIZE);
+
+    /* Allocate mixing buffer */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        ARTS_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+
+    /* Get the parent process id (we're the parent of the audio thread) */
+    this->hidden->parent = getpid();
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+
+static void
+ARTS_Deinitialize(void)
+{
+    UnloadARTSLibrary();
+}
+
+
+static int
+ARTS_Init(SDL_AudioDriverImpl * impl)
+{
+    if (LoadARTSLibrary() < 0) {
+        return 0;
+    } else {
+        if (SDL_NAME(arts_init) () != 0) {
+            UnloadARTSLibrary();
+            SDL_SetError("ARTS: arts_init failed (no audio server?)");
+            return 0;
+        }
+
+        /* Play a stream so aRts doesn't crash */
+        if (ARTS_Suspend()) {
+            arts_stream_t stream;
+            stream = SDL_NAME(arts_play_stream) (44100, 16, 2, "SDL");
+            SDL_NAME(arts_write) (stream, "", 0);
+            SDL_NAME(arts_close_stream) (stream);
+        }
+
+        SDL_NAME(arts_free) ();
+    }
+
+    /* Set the function pointers */
+    impl->OpenDevice = ARTS_OpenDevice;
+    impl->PlayDevice = ARTS_PlayDevice;
+    impl->WaitDevice = ARTS_WaitDevice;
+    impl->GetDeviceBuf = ARTS_GetDeviceBuf;
+    impl->CloseDevice = ARTS_CloseDevice;
+    impl->WaitDone = ARTS_WaitDone;
+    impl->Deinitialize = ARTS_Deinitialize;
+    impl->OnlyHasDefaultOutputDevice = 1;
+
+    return 1;   /* this audio target is available. */
+}
+
+
+AudioBootStrap ARTS_bootstrap = {
+    "arts", "Analog RealTime Synthesizer", ARTS_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_ARTS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/arts/SDL_artsaudio.h b/Source/3rd Party/sdl/src/audio/arts/SDL_artsaudio.h
new file mode 100644
index 000000000..fb7706fcf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/arts/SDL_artsaudio.h	
@@ -0,0 +1,52 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_artscaudio_h
+#define _SDL_artscaudio_h
+
+#include <artsc.h>
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The stream descriptor for the audio device */
+    arts_stream_t stream;
+
+    /* The parent process id, to detect when application quits */
+    pid_t parent;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+
+    /* Support for audio timing using a timer, in addition to select() */
+    float frame_ticks;
+    float next_frame;
+};
+#define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
+
+#endif /* _SDL_artscaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/bsd/SDL_bsdaudio.c b/Source/3rd Party/sdl/src/audio/bsd/SDL_bsdaudio.c
new file mode 100644
index 000000000..f415fe040
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/bsd/SDL_bsdaudio.c	
@@ -0,0 +1,361 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_BSD
+
+/*
+ * Driver for native OpenBSD/NetBSD audio(4).
+ * vedge@vedge.com.ar.
+ */
+
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/audioio.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
+#include "SDL_bsdaudio.h"
+
+/* Use timer for synchronization */
+/* #define USE_TIMER_SYNC */
+
+/* #define DEBUG_AUDIO */
+/* #define DEBUG_AUDIO_STREAM */
+
+
+static void
+BSDAUDIO_DetectDevices(int iscapture, SDL_AddAudioDevice addfn)
+{
+    SDL_EnumUnixAudioDevices(iscapture, 0, NULL, addfn);
+}
+
+
+static void
+BSDAUDIO_Status(_THIS)
+{
+#ifdef DEBUG_AUDIO
+    /* *INDENT-OFF* */
+    audio_info_t info;
+
+    if (ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info) < 0) {
+        fprintf(stderr, "AUDIO_GETINFO failed.\n");
+        return;
+    }
+    fprintf(stderr, "\n"
+            "[play/record info]\n"
+            "buffer size	:   %d bytes\n"
+            "sample rate	:   %i Hz\n"
+            "channels	:   %i\n"
+            "precision	:   %i-bit\n"
+            "encoding	:   0x%x\n"
+            "seek		:   %i\n"
+            "sample count	:   %i\n"
+            "EOF count	:   %i\n"
+            "paused		:   %s\n"
+            "error occured	:   %s\n"
+            "waiting		:   %s\n"
+            "active		:   %s\n"
+            "",
+            info.play.buffer_size,
+            info.play.sample_rate,
+            info.play.channels,
+            info.play.precision,
+            info.play.encoding,
+            info.play.seek,
+            info.play.samples,
+            info.play.eof,
+            info.play.pause ? "yes" : "no",
+            info.play.error ? "yes" : "no",
+            info.play.waiting ? "yes" : "no",
+            info.play.active ? "yes" : "no");
+
+    fprintf(stderr, "\n"
+            "[audio info]\n"
+            "monitor_gain	:   %i\n"
+            "hw block size	:   %d bytes\n"
+            "hi watermark	:   %i\n"
+            "lo watermark	:   %i\n"
+            "audio mode	:   %s\n"
+            "",
+            info.monitor_gain,
+            info.blocksize,
+            info.hiwat, info.lowat,
+            (info.mode == AUMODE_PLAY) ? "PLAY"
+            : (info.mode = AUMODE_RECORD) ? "RECORD"
+            : (info.mode == AUMODE_PLAY_ALL ? "PLAY_ALL" : "?"));
+    /* *INDENT-ON* */
+#endif /* DEBUG_AUDIO */
+}
+
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+BSDAUDIO_WaitDevice(_THIS)
+{
+#ifndef USE_BLOCKING_WRITES     /* Not necessary when using blocking writes */
+    /* See if we need to use timed audio synchronization */
+    if (this->hidden->frame_ticks) {
+        /* Use timer for general audio synchronization */
+        Sint32 ticks;
+
+        ticks = ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS;
+        if (ticks > 0) {
+            SDL_Delay(ticks);
+        }
+    } else {
+        /* Use select() for audio synchronization */
+        fd_set fdset;
+        struct timeval timeout;
+
+        FD_ZERO(&fdset);
+        FD_SET(this->hidden->audio_fd, &fdset);
+        timeout.tv_sec = 10;
+        timeout.tv_usec = 0;
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Waiting for audio to get ready\n");
+#endif
+        if (select(this->hidden->audio_fd + 1, NULL, &fdset, NULL, &timeout)
+            <= 0) {
+            const char *message =
+                "Audio timeout - buggy audio driver? (disabled)";
+            /* In general we should never print to the screen,
+               but in this case we have no other way of letting
+               the user know what happened.
+             */
+            fprintf(stderr, "SDL: %s\n", message);
+            this->enabled = 0;
+            /* Don't try to close - may hang */
+            this->hidden->audio_fd = -1;
+#ifdef DEBUG_AUDIO
+            fprintf(stderr, "Done disabling audio\n");
+#endif
+        }
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Ready!\n");
+#endif
+    }
+#endif /* !USE_BLOCKING_WRITES */
+}
+
+static void
+BSDAUDIO_PlayDevice(_THIS)
+{
+    int written, p = 0;
+
+    /* Write the audio data, checking for EAGAIN on broken audio drivers */
+    do {
+        written = write(this->hidden->audio_fd,
+                        &this->hidden->mixbuf[p], this->hidden->mixlen - p);
+
+        if (written > 0)
+            p += written;
+        if (written == -1 && errno != 0 && errno != EAGAIN && errno != EINTR) {
+            /* Non recoverable error has occurred. It should be reported!!! */
+            perror("audio");
+            break;
+        }
+
+        if (p < written
+            || ((written < 0) && ((errno == 0) || (errno == EAGAIN)))) {
+            SDL_Delay(1);       /* Let a little CPU time go by */
+        }
+    } while (p < written);
+
+    /* If timer synchronization is enabled, set the next write frame */
+    if (this->hidden->frame_ticks) {
+        this->hidden->next_frame += this->hidden->frame_ticks;
+    }
+
+    /* If we couldn't write, assume fatal error for now */
+    if (written < 0) {
+        this->enabled = 0;
+    }
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Wrote %d bytes of audio data\n", written);
+#endif
+}
+
+static Uint8 *
+BSDAUDIO_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+static void
+BSDAUDIO_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->audio_fd >= 0) {
+            close(this->hidden->audio_fd);
+            this->hidden->audio_fd = -1;
+        }
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static int
+BSDAUDIO_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT);
+    SDL_AudioFormat format = 0;
+    audio_info_t info;
+
+    /* We don't care what the devname is...we'll try to open anything. */
+    /*  ...but default to first name in the list... */
+    if (devname == NULL) {
+        devname = SDL_GetAudioDeviceName(0, iscapture);
+        if (devname == NULL) {
+            return SDL_SetError("No such audio device");
+        }
+    }
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Open the audio device */
+    this->hidden->audio_fd = open(devname, flags, 0);
+    if (this->hidden->audio_fd < 0) {
+        return SDL_SetError("Couldn't open %s: %s", devname, strerror(errno));
+    }
+
+    AUDIO_INITINFO(&info);
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Set to play mode */
+    info.mode = AUMODE_PLAY;
+    if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) < 0) {
+        BSDAUDIO_CloseDevice(this);
+        return SDL_SetError("Couldn't put device into play mode");
+    }
+
+    AUDIO_INITINFO(&info);
+    for (format = SDL_FirstAudioFormat(this->spec.format);
+         format; format = SDL_NextAudioFormat()) {
+        switch (format) {
+        case AUDIO_U8:
+            info.play.encoding = AUDIO_ENCODING_ULINEAR;
+            info.play.precision = 8;
+            break;
+        case AUDIO_S8:
+            info.play.encoding = AUDIO_ENCODING_SLINEAR;
+            info.play.precision = 8;
+            break;
+        case AUDIO_S16LSB:
+            info.play.encoding = AUDIO_ENCODING_SLINEAR_LE;
+            info.play.precision = 16;
+            break;
+        case AUDIO_S16MSB:
+            info.play.encoding = AUDIO_ENCODING_SLINEAR_BE;
+            info.play.precision = 16;
+            break;
+        case AUDIO_U16LSB:
+            info.play.encoding = AUDIO_ENCODING_ULINEAR_LE;
+            info.play.precision = 16;
+            break;
+        case AUDIO_U16MSB:
+            info.play.encoding = AUDIO_ENCODING_ULINEAR_BE;
+            info.play.precision = 16;
+            break;
+        default:
+            continue;
+        }
+
+        if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) == 0) {
+            break;
+        }
+    }
+
+    if (!format) {
+        BSDAUDIO_CloseDevice(this);
+        return SDL_SetError("No supported encoding for 0x%x", this->spec.format);
+    }
+
+    this->spec.format = format;
+
+    AUDIO_INITINFO(&info);
+    info.play.channels = this->spec.channels;
+    if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) == -1) {
+        this->spec.channels = 1;
+    }
+    AUDIO_INITINFO(&info);
+    info.play.sample_rate = this->spec.freq;
+    info.blocksize = this->spec.size;
+    info.hiwat = 5;
+    info.lowat = 3;
+    (void) ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info);
+    (void) ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info);
+    this->spec.freq = info.play.sample_rate;
+    /* Allocate mixing buffer */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        BSDAUDIO_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+
+    BSDAUDIO_Status(this);
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+static int
+BSDAUDIO_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->DetectDevices = BSDAUDIO_DetectDevices;
+    impl->OpenDevice = BSDAUDIO_OpenDevice;
+    impl->PlayDevice = BSDAUDIO_PlayDevice;
+    impl->WaitDevice = BSDAUDIO_WaitDevice;
+    impl->GetDeviceBuf = BSDAUDIO_GetDeviceBuf;
+    impl->CloseDevice = BSDAUDIO_CloseDevice;
+
+    return 1;   /* this audio target is available. */
+}
+
+
+AudioBootStrap BSD_AUDIO_bootstrap = {
+    "bsd", "BSD audio", BSDAUDIO_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_BSD */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/bsd/SDL_bsdaudio.h b/Source/3rd Party/sdl/src/audio/bsd/SDL_bsdaudio.h
new file mode 100644
index 000000000..625bdb549
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/bsd/SDL_bsdaudio.h	
@@ -0,0 +1,51 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_bsdaudio_h
+#define _SDL_bsdaudio_h
+
+#include "../SDL_sysaudio.h"
+
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The file descriptor for the audio device */
+    int audio_fd;
+
+    /* The parent process id, to detect when application quits */
+    pid_t parent;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+
+    /* Support for audio timing using a timer, in addition to select() */
+    float frame_ticks;
+    float next_frame;
+};
+
+#define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
+
+#endif /* _SDL_bsdaudio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/coreaudio/SDL_coreaudio.c b/Source/3rd Party/sdl/src/audio/coreaudio/SDL_coreaudio.c
new file mode 100644
index 000000000..950110289
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/coreaudio/SDL_coreaudio.c	
@@ -0,0 +1,559 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+#include "SDL_audio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
+#include "SDL_coreaudio.h"
+#include "SDL_assert.h"
+
+#define DEBUG_COREAUDIO 0
+
+static void COREAUDIO_CloseDevice(_THIS);
+
+#define CHECK_RESULT(msg) \
+    if (result != noErr) { \
+        COREAUDIO_CloseDevice(this); \
+        SDL_SetError("CoreAudio error (%s): %d", msg, (int) result); \
+        return 0; \
+    }
+
+#if MACOSX_COREAUDIO
+typedef void (*addDevFn)(const char *name, AudioDeviceID devId, void *data);
+
+static void
+addToDevList(const char *name, AudioDeviceID devId, void *data)
+{
+    SDL_AddAudioDevice addfn = (SDL_AddAudioDevice) data;
+    addfn(name);
+}
+
+typedef struct
+{
+    const char *findname;
+    AudioDeviceID devId;
+    int found;
+} FindDevIdData;
+
+static void
+findDevId(const char *name, AudioDeviceID devId, void *_data)
+{
+    FindDevIdData *data = (FindDevIdData *) _data;
+    if (!data->found) {
+        if (SDL_strcmp(name, data->findname) == 0) {
+            data->found = 1;
+            data->devId = devId;
+        }
+    }
+}
+
+static void
+build_device_list(int iscapture, addDevFn addfn, void *addfndata)
+{
+    OSStatus result = noErr;
+    UInt32 size = 0;
+    AudioDeviceID *devs = NULL;
+    UInt32 i = 0;
+    UInt32 max = 0;
+
+    AudioObjectPropertyAddress addr = {
+        kAudioHardwarePropertyDevices,
+        kAudioObjectPropertyScopeGlobal,
+        kAudioObjectPropertyElementMaster
+    };
+
+    result = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &addr,
+                                            0, NULL, &size);
+    if (result != kAudioHardwareNoError)
+        return;
+
+    devs = (AudioDeviceID *) alloca(size);
+    if (devs == NULL)
+        return;
+
+    result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr,
+                                        0, NULL, &size, devs);
+    if (result != kAudioHardwareNoError)
+        return;
+
+    max = size / sizeof (AudioDeviceID);
+    for (i = 0; i < max; i++) {
+        CFStringRef cfstr = NULL;
+        char *ptr = NULL;
+        AudioDeviceID dev = devs[i];
+        AudioBufferList *buflist = NULL;
+        int usable = 0;
+        CFIndex len = 0;
+
+        addr.mScope = iscapture ? kAudioDevicePropertyScopeInput :
+                        kAudioDevicePropertyScopeOutput;
+        addr.mSelector = kAudioDevicePropertyStreamConfiguration;
+
+        result = AudioObjectGetPropertyDataSize(dev, &addr, 0, NULL, &size);
+        if (result != noErr)
+            continue;
+
+        buflist = (AudioBufferList *) SDL_malloc(size);
+        if (buflist == NULL)
+            continue;
+
+        result = AudioObjectGetPropertyData(dev, &addr, 0, NULL,
+                                            &size, buflist);
+
+        if (result == noErr) {
+            UInt32 j;
+            for (j = 0; j < buflist->mNumberBuffers; j++) {
+                if (buflist->mBuffers[j].mNumberChannels > 0) {
+                    usable = 1;
+                    break;
+                }
+            }
+        }
+
+        SDL_free(buflist);
+
+        if (!usable)
+            continue;
+
+        addr.mSelector = kAudioObjectPropertyName;
+        size = sizeof (CFStringRef);
+        result = AudioObjectGetPropertyData(dev, &addr, 0, NULL, &size, &cfstr);
+        if (result != kAudioHardwareNoError)
+            continue;
+
+        len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstr),
+                                                kCFStringEncodingUTF8);
+
+        ptr = (char *) SDL_malloc(len + 1);
+        usable = ((ptr != NULL) &&
+                  (CFStringGetCString
+                   (cfstr, ptr, len + 1, kCFStringEncodingUTF8)));
+
+        CFRelease(cfstr);
+
+        if (usable) {
+            len = strlen(ptr);
+            /* Some devices have whitespace at the end...trim it. */
+            while ((len > 0) && (ptr[len - 1] == ' ')) {
+                len--;
+            }
+            usable = (len > 0);
+        }
+
+        if (usable) {
+            ptr[len] = '\0';
+
+#if DEBUG_COREAUDIO
+            printf("COREAUDIO: Found %s device #%d: '%s' (devid %d)\n",
+                   ((iscapture) ? "capture" : "output"),
+                   (int) *devCount, ptr, (int) dev);
+#endif
+            addfn(ptr, dev, addfndata);
+        }
+        SDL_free(ptr);  /* addfn() would have copied the string. */
+    }
+}
+
+static void
+COREAUDIO_DetectDevices(int iscapture, SDL_AddAudioDevice addfn)
+{
+    build_device_list(iscapture, addToDevList, addfn);
+}
+
+static int
+find_device_by_name(_THIS, const char *devname, int iscapture)
+{
+    AudioDeviceID devid = 0;
+    OSStatus result = noErr;
+    UInt32 size = 0;
+    UInt32 alive = 0;
+    pid_t pid = 0;
+
+    AudioObjectPropertyAddress addr = {
+        0,
+        kAudioObjectPropertyScopeGlobal,
+        kAudioObjectPropertyElementMaster
+    };
+
+    if (devname == NULL) {
+        size = sizeof (AudioDeviceID);
+        addr.mSelector =
+            ((iscapture) ? kAudioHardwarePropertyDefaultInputDevice :
+            kAudioHardwarePropertyDefaultOutputDevice);
+        result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr,
+                                            0, NULL, &size, &devid);
+        CHECK_RESULT("AudioHardwareGetProperty (default device)");
+    } else {
+        FindDevIdData data;
+        SDL_zero(data);
+        data.findname = devname;
+        build_device_list(iscapture, findDevId, &data);
+        if (!data.found) {
+            SDL_SetError("CoreAudio: No such audio device.");
+            return 0;
+        }
+        devid = data.devId;
+    }
+
+    addr.mSelector = kAudioDevicePropertyDeviceIsAlive;
+    addr.mScope = iscapture ? kAudioDevicePropertyScopeInput :
+                    kAudioDevicePropertyScopeOutput;
+
+    size = sizeof (alive);
+    result = AudioObjectGetPropertyData(devid, &addr, 0, NULL, &size, &alive);
+    CHECK_RESULT
+        ("AudioDeviceGetProperty (kAudioDevicePropertyDeviceIsAlive)");
+
+    if (!alive) {
+        SDL_SetError("CoreAudio: requested device exists, but isn't alive.");
+        return 0;
+    }
+
+    addr.mSelector = kAudioDevicePropertyHogMode;
+    size = sizeof (pid);
+    result = AudioObjectGetPropertyData(devid, &addr, 0, NULL, &size, &pid);
+
+    /* some devices don't support this property, so errors are fine here. */
+    if ((result == noErr) && (pid != -1)) {
+        SDL_SetError("CoreAudio: requested device is being hogged.");
+        return 0;
+    }
+
+    this->hidden->deviceID = devid;
+    return 1;
+}
+#endif
+
+/* The CoreAudio callback */
+static OSStatus
+outputCallback(void *inRefCon,
+               AudioUnitRenderActionFlags * ioActionFlags,
+               const AudioTimeStamp * inTimeStamp,
+               UInt32 inBusNumber, UInt32 inNumberFrames,
+               AudioBufferList * ioData)
+{
+    SDL_AudioDevice *this = (SDL_AudioDevice *) inRefCon;
+    AudioBuffer *abuf;
+    UInt32 remaining, len;
+    void *ptr;
+    UInt32 i;
+
+    /* Only do anything if audio is enabled and not paused */
+    if (!this->enabled || this->paused) {
+        for (i = 0; i < ioData->mNumberBuffers; i++) {
+            abuf = &ioData->mBuffers[i];
+            SDL_memset(abuf->mData, this->spec.silence, abuf->mDataByteSize);
+        }
+        return 0;
+    }
+
+    /* No SDL conversion should be needed here, ever, since we accept
+       any input format in OpenAudio, and leave the conversion to CoreAudio.
+     */
+    /*
+       SDL_assert(!this->convert.needed);
+       SDL_assert(this->spec.channels == ioData->mNumberChannels);
+     */
+
+    for (i = 0; i < ioData->mNumberBuffers; i++) {
+        abuf = &ioData->mBuffers[i];
+        remaining = abuf->mDataByteSize;
+        ptr = abuf->mData;
+        while (remaining > 0) {
+            if (this->hidden->bufferOffset >= this->hidden->bufferSize) {
+                /* Generate the data */
+                SDL_LockMutex(this->mixer_lock);
+                (*this->spec.callback)(this->spec.userdata,
+                            this->hidden->buffer, this->hidden->bufferSize);
+                SDL_UnlockMutex(this->mixer_lock);
+                this->hidden->bufferOffset = 0;
+            }
+
+            len = this->hidden->bufferSize - this->hidden->bufferOffset;
+            if (len > remaining)
+                len = remaining;
+            SDL_memcpy(ptr, (char *)this->hidden->buffer +
+                       this->hidden->bufferOffset, len);
+            ptr = (char *)ptr + len;
+            remaining -= len;
+            this->hidden->bufferOffset += len;
+        }
+    }
+
+    return 0;
+}
+
+static OSStatus
+inputCallback(void *inRefCon,
+              AudioUnitRenderActionFlags * ioActionFlags,
+              const AudioTimeStamp * inTimeStamp,
+              UInt32 inBusNumber, UInt32 inNumberFrames,
+              AudioBufferList * ioData)
+{
+    /* err = AudioUnitRender(afr->fAudioUnit, ioActionFlags, inTimeStamp, inBusNumber, inNumberFrames, afr->fAudioBuffer); */
+    /* !!! FIXME: write me! */
+    return noErr;
+}
+
+
+static void
+COREAUDIO_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        if (this->hidden->audioUnitOpened) {
+            OSStatus result = noErr;
+            AURenderCallbackStruct callback;
+            const AudioUnitElement output_bus = 0;
+            const AudioUnitElement input_bus = 1;
+            const int iscapture = this->iscapture;
+            const AudioUnitElement bus =
+                ((iscapture) ? input_bus : output_bus);
+            const AudioUnitScope scope =
+                ((iscapture) ? kAudioUnitScope_Output :
+                 kAudioUnitScope_Input);
+
+            /* stop processing the audio unit */
+            result = AudioOutputUnitStop(this->hidden->audioUnit);
+
+            /* Remove the input callback */
+            SDL_memset(&callback, 0, sizeof(AURenderCallbackStruct));
+            result = AudioUnitSetProperty(this->hidden->audioUnit,
+                                          kAudioUnitProperty_SetRenderCallback,
+                                          scope, bus, &callback,
+                                          sizeof(callback));
+
+            #if MACOSX_COREAUDIO
+            CloseComponent(this->hidden->audioUnit);
+            #else
+            AudioComponentInstanceDispose(this->hidden->audioUnit);
+            #endif
+
+            this->hidden->audioUnitOpened = 0;
+        }
+        SDL_free(this->hidden->buffer);
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+
+static int
+prepare_audiounit(_THIS, const char *devname, int iscapture,
+                  const AudioStreamBasicDescription * strdesc)
+{
+    OSStatus result = noErr;
+    AURenderCallbackStruct callback;
+#if MACOSX_COREAUDIO
+    ComponentDescription desc;
+    Component comp = NULL;
+#else
+    AudioComponentDescription desc;
+    AudioComponent comp = NULL;
+#endif
+    const AudioUnitElement output_bus = 0;
+    const AudioUnitElement input_bus = 1;
+    const AudioUnitElement bus = ((iscapture) ? input_bus : output_bus);
+    const AudioUnitScope scope = ((iscapture) ? kAudioUnitScope_Output :
+                                  kAudioUnitScope_Input);
+
+#if MACOSX_COREAUDIO
+    if (!find_device_by_name(this, devname, iscapture)) {
+        SDL_SetError("Couldn't find requested CoreAudio device");
+        return 0;
+    }
+#endif
+
+    SDL_zero(desc);
+    desc.componentType = kAudioUnitType_Output;
+    desc.componentManufacturer = kAudioUnitManufacturer_Apple;
+
+#if MACOSX_COREAUDIO
+    desc.componentSubType = kAudioUnitSubType_DefaultOutput;
+    comp = FindNextComponent(NULL, &desc);
+#else
+    desc.componentSubType = kAudioUnitSubType_RemoteIO;
+    comp = AudioComponentFindNext(NULL, &desc);
+#endif
+
+    if (comp == NULL) {
+        SDL_SetError("Couldn't find requested CoreAudio component");
+        return 0;
+    }
+
+    /* Open & initialize the audio unit */
+#if MACOSX_COREAUDIO
+    result = OpenAComponent(comp, &this->hidden->audioUnit);
+    CHECK_RESULT("OpenAComponent");
+#else
+    /*
+       AudioComponentInstanceNew only available on iPhone OS 2.0 and Mac OS X 10.6
+       We can't use OpenAComponent on iPhone because it is not present
+     */
+    result = AudioComponentInstanceNew(comp, &this->hidden->audioUnit);
+    CHECK_RESULT("AudioComponentInstanceNew");
+#endif
+
+    this->hidden->audioUnitOpened = 1;
+
+#if MACOSX_COREAUDIO
+    result = AudioUnitSetProperty(this->hidden->audioUnit,
+                                  kAudioOutputUnitProperty_CurrentDevice,
+                                  kAudioUnitScope_Global, 0,
+                                  &this->hidden->deviceID,
+                                  sizeof(AudioDeviceID));
+    CHECK_RESULT
+        ("AudioUnitSetProperty (kAudioOutputUnitProperty_CurrentDevice)");
+#endif
+
+    /* Set the data format of the audio unit. */
+    result = AudioUnitSetProperty(this->hidden->audioUnit,
+                                  kAudioUnitProperty_StreamFormat,
+                                  scope, bus, strdesc, sizeof(*strdesc));
+    CHECK_RESULT("AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)");
+
+    /* Set the audio callback */
+    SDL_memset(&callback, 0, sizeof(AURenderCallbackStruct));
+    callback.inputProc = ((iscapture) ? inputCallback : outputCallback);
+    callback.inputProcRefCon = this;
+    result = AudioUnitSetProperty(this->hidden->audioUnit,
+                                  kAudioUnitProperty_SetRenderCallback,
+                                  scope, bus, &callback, sizeof(callback));
+    CHECK_RESULT
+        ("AudioUnitSetProperty (kAudioUnitProperty_SetRenderCallback)");
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Allocate a sample buffer */
+    this->hidden->bufferOffset = this->hidden->bufferSize = this->spec.size;
+    this->hidden->buffer = SDL_malloc(this->hidden->bufferSize);
+
+    result = AudioUnitInitialize(this->hidden->audioUnit);
+    CHECK_RESULT("AudioUnitInitialize");
+
+    /* Finally, start processing of the audio unit */
+    result = AudioOutputUnitStart(this->hidden->audioUnit);
+    CHECK_RESULT("AudioOutputUnitStart");
+
+    /* We're running! */
+    return 1;
+}
+
+
+static int
+COREAUDIO_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    AudioStreamBasicDescription strdesc;
+    SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format);
+    int valid_datatype = 0;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Setup a AudioStreamBasicDescription with the requested format */
+    SDL_memset(&strdesc, '\0', sizeof(AudioStreamBasicDescription));
+    strdesc.mFormatID = kAudioFormatLinearPCM;
+    strdesc.mFormatFlags = kLinearPCMFormatFlagIsPacked;
+    strdesc.mChannelsPerFrame = this->spec.channels;
+    strdesc.mSampleRate = this->spec.freq;
+    strdesc.mFramesPerPacket = 1;
+
+    while ((!valid_datatype) && (test_format)) {
+        this->spec.format = test_format;
+        /* Just a list of valid SDL formats, so people don't pass junk here. */
+        switch (test_format) {
+        case AUDIO_U8:
+        case AUDIO_S8:
+        case AUDIO_U16LSB:
+        case AUDIO_S16LSB:
+        case AUDIO_U16MSB:
+        case AUDIO_S16MSB:
+        case AUDIO_S32LSB:
+        case AUDIO_S32MSB:
+        case AUDIO_F32LSB:
+        case AUDIO_F32MSB:
+            valid_datatype = 1;
+            strdesc.mBitsPerChannel = SDL_AUDIO_BITSIZE(this->spec.format);
+            if (SDL_AUDIO_ISBIGENDIAN(this->spec.format))
+                strdesc.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian;
+
+            if (SDL_AUDIO_ISFLOAT(this->spec.format))
+                strdesc.mFormatFlags |= kLinearPCMFormatFlagIsFloat;
+            else if (SDL_AUDIO_ISSIGNED(this->spec.format))
+                strdesc.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger;
+            break;
+        }
+    }
+
+    if (!valid_datatype) {      /* shouldn't happen, but just in case... */
+        COREAUDIO_CloseDevice(this);
+        return SDL_SetError("Unsupported audio format");
+    }
+
+    strdesc.mBytesPerFrame =
+        strdesc.mBitsPerChannel * strdesc.mChannelsPerFrame / 8;
+    strdesc.mBytesPerPacket =
+        strdesc.mBytesPerFrame * strdesc.mFramesPerPacket;
+
+    if (!prepare_audiounit(this, devname, iscapture, &strdesc)) {
+        COREAUDIO_CloseDevice(this);
+        return -1;      /* prepare_audiounit() will call SDL_SetError()... */
+    }
+
+    return 0;   /* good to go. */
+}
+
+static int
+COREAUDIO_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->OpenDevice = COREAUDIO_OpenDevice;
+    impl->CloseDevice = COREAUDIO_CloseDevice;
+
+#if MACOSX_COREAUDIO
+    impl->DetectDevices = COREAUDIO_DetectDevices;
+#else
+    impl->OnlyHasDefaultOutputDevice = 1;
+
+    /* Set category to ambient sound so that other music continues playing.
+       You can change this at runtime in your own code if you need different
+       behavior.  If this is common, we can add an SDL hint for this.
+    */
+    AudioSessionInitialize(NULL, NULL, NULL, nil);
+    UInt32 category = kAudioSessionCategory_AmbientSound;
+    AudioSessionSetProperty(kAudioSessionProperty_AudioCategory, sizeof(UInt32), &category);
+#endif
+
+    impl->ProvidesOwnCallbackThread = 1;
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap COREAUDIO_bootstrap = {
+    "coreaudio", "CoreAudio", COREAUDIO_Init, 0
+};
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/coreaudio/SDL_coreaudio.h b/Source/3rd Party/sdl/src/audio/coreaudio/SDL_coreaudio.h
new file mode 100644
index 000000000..41e8cea2b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/coreaudio/SDL_coreaudio.h	
@@ -0,0 +1,57 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_coreaudio_h
+#define _SDL_coreaudio_h
+
+#include "../SDL_sysaudio.h"
+
+#if !defined(__IPHONEOS__)
+#define MACOSX_COREAUDIO 1
+#endif
+
+#if MACOSX_COREAUDIO
+#include <CoreAudio/CoreAudio.h>
+#include <CoreServices/CoreServices.h>
+#else
+#include <AudioToolbox/AudioToolbox.h>
+#endif
+
+#include <AudioUnit/AudioUnit.h>
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    AudioUnit audioUnit;
+    int audioUnitOpened;
+    void *buffer;
+    UInt32 bufferOffset;
+    UInt32 bufferSize;
+#if MACOSX_COREAUDIO
+    AudioDeviceID deviceID;
+#endif
+};
+
+#endif /* _SDL_coreaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/directsound/SDL_directsound.c b/Source/3rd Party/sdl/src/audio/directsound/SDL_directsound.c
new file mode 100644
index 000000000..067683ccc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/directsound/SDL_directsound.c	
@@ -0,0 +1,550 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_DSOUND
+
+/* Allow access to a raw mixing buffer */
+
+#include "SDL_timer.h"
+#include "SDL_loadso.h"
+#include "SDL_audio.h"
+#include "../SDL_audio_c.h"
+#include "SDL_directsound.h"
+
+#ifndef WAVE_FORMAT_IEEE_FLOAT
+#define WAVE_FORMAT_IEEE_FLOAT 0x0003
+#endif
+
+/* DirectX function pointers for audio */
+static void* DSoundDLL = NULL;
+typedef HRESULT(WINAPI*fnDirectSoundCreate8)(LPGUID,LPDIRECTSOUND*,LPUNKNOWN);
+typedef HRESULT(WINAPI*fnDirectSoundEnumerateW)(LPDSENUMCALLBACKW, LPVOID);
+typedef HRESULT(WINAPI*fnDirectSoundCaptureEnumerateW)(LPDSENUMCALLBACKW,LPVOID);
+static fnDirectSoundCreate8 pDirectSoundCreate8 = NULL;
+static fnDirectSoundEnumerateW pDirectSoundEnumerateW = NULL;
+static fnDirectSoundCaptureEnumerateW pDirectSoundCaptureEnumerateW = NULL;
+
+static void
+DSOUND_Unload(void)
+{
+    pDirectSoundCreate8 = NULL;
+    pDirectSoundEnumerateW = NULL;
+    pDirectSoundCaptureEnumerateW = NULL;
+
+    if (DSoundDLL != NULL) {
+        SDL_UnloadObject(DSoundDLL);
+        DSoundDLL = NULL;
+    }
+}
+
+
+static int
+DSOUND_Load(void)
+{
+    int loaded = 0;
+
+    DSOUND_Unload();
+
+    DSoundDLL = SDL_LoadObject("DSOUND.DLL");
+    if (DSoundDLL == NULL) {
+        SDL_SetError("DirectSound: failed to load DSOUND.DLL");
+    } else {
+        /* Now make sure we have DirectX 8 or better... */
+        #define DSOUNDLOAD(f) { \
+            p##f = (fn##f) SDL_LoadFunction(DSoundDLL, #f); \
+            if (!p##f) loaded = 0; \
+        }
+        loaded = 1;  /* will reset if necessary. */
+        DSOUNDLOAD(DirectSoundCreate8);
+        DSOUNDLOAD(DirectSoundEnumerateW);
+        DSOUNDLOAD(DirectSoundCaptureEnumerateW);
+        #undef DSOUNDLOAD
+
+        if (!loaded) {
+            SDL_SetError("DirectSound: System doesn't appear to have DX8.");
+        }
+    }
+
+    if (!loaded) {
+        DSOUND_Unload();
+    }
+
+    return loaded;
+}
+
+static int
+SetDSerror(const char *function, int code)
+{
+    static const char *error;
+    static char errbuf[1024];
+
+    errbuf[0] = 0;
+    switch (code) {
+    case E_NOINTERFACE:
+        error = "Unsupported interface -- Is DirectX 8.0 or later installed?";
+        break;
+    case DSERR_ALLOCATED:
+        error = "Audio device in use";
+        break;
+    case DSERR_BADFORMAT:
+        error = "Unsupported audio format";
+        break;
+    case DSERR_BUFFERLOST:
+        error = "Mixing buffer was lost";
+        break;
+    case DSERR_CONTROLUNAVAIL:
+        error = "Control requested is not available";
+        break;
+    case DSERR_INVALIDCALL:
+        error = "Invalid call for the current state";
+        break;
+    case DSERR_INVALIDPARAM:
+        error = "Invalid parameter";
+        break;
+    case DSERR_NODRIVER:
+        error = "No audio device found";
+        break;
+    case DSERR_OUTOFMEMORY:
+        error = "Out of memory";
+        break;
+    case DSERR_PRIOLEVELNEEDED:
+        error = "Caller doesn't have priority";
+        break;
+    case DSERR_UNSUPPORTED:
+        error = "Function not supported";
+        break;
+    default:
+        SDL_snprintf(errbuf, SDL_arraysize(errbuf),
+                     "%s: Unknown DirectSound error: 0x%x", function, code);
+        break;
+    }
+    if (!errbuf[0]) {
+        SDL_snprintf(errbuf, SDL_arraysize(errbuf), "%s: %s", function,
+                     error);
+    }
+    return SDL_SetError("%s", errbuf);
+}
+
+
+static BOOL CALLBACK
+FindAllDevs(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID data)
+{
+    SDL_AddAudioDevice addfn = (SDL_AddAudioDevice) data;
+    if (guid != NULL) {  /* skip default device */
+        char *str = WIN_StringToUTF8(desc);
+        if (str != NULL) {
+            addfn(str);
+            SDL_free(str);  /* addfn() makes a copy of this string. */
+        }
+    }
+    return TRUE;  /* keep enumerating. */
+}
+
+static void
+DSOUND_DetectDevices(int iscapture, SDL_AddAudioDevice addfn)
+{
+    if (iscapture) {
+        pDirectSoundCaptureEnumerateW(FindAllDevs, addfn);
+    } else {
+        pDirectSoundEnumerateW(FindAllDevs, addfn);
+    }
+}
+
+
+static void
+DSOUND_WaitDevice(_THIS)
+{
+    DWORD status = 0;
+    DWORD cursor = 0;
+    DWORD junk = 0;
+    HRESULT result = DS_OK;
+
+    /* Semi-busy wait, since we have no way of getting play notification
+       on a primary mixing buffer located in hardware (DirectX 5.0)
+     */
+    result = IDirectSoundBuffer_GetCurrentPosition(this->hidden->mixbuf,
+                                                   &junk, &cursor);
+    if (result != DS_OK) {
+        if (result == DSERR_BUFFERLOST) {
+            IDirectSoundBuffer_Restore(this->hidden->mixbuf);
+        }
+#ifdef DEBUG_SOUND
+        SetDSerror("DirectSound GetCurrentPosition", result);
+#endif
+        return;
+    }
+
+    while ((cursor / this->hidden->mixlen) == this->hidden->lastchunk) {
+        /* FIXME: find out how much time is left and sleep that long */
+        SDL_Delay(1);
+
+        /* Try to restore a lost sound buffer */
+        IDirectSoundBuffer_GetStatus(this->hidden->mixbuf, &status);
+        if ((status & DSBSTATUS_BUFFERLOST)) {
+            IDirectSoundBuffer_Restore(this->hidden->mixbuf);
+            IDirectSoundBuffer_GetStatus(this->hidden->mixbuf, &status);
+            if ((status & DSBSTATUS_BUFFERLOST)) {
+                break;
+            }
+        }
+        if (!(status & DSBSTATUS_PLAYING)) {
+            result = IDirectSoundBuffer_Play(this->hidden->mixbuf, 0, 0,
+                                             DSBPLAY_LOOPING);
+            if (result == DS_OK) {
+                continue;
+            }
+#ifdef DEBUG_SOUND
+            SetDSerror("DirectSound Play", result);
+#endif
+            return;
+        }
+
+        /* Find out where we are playing */
+        result = IDirectSoundBuffer_GetCurrentPosition(this->hidden->mixbuf,
+                                                       &junk, &cursor);
+        if (result != DS_OK) {
+            SetDSerror("DirectSound GetCurrentPosition", result);
+            return;
+        }
+    }
+}
+
+static void
+DSOUND_PlayDevice(_THIS)
+{
+    /* Unlock the buffer, allowing it to play */
+    if (this->hidden->locked_buf) {
+        IDirectSoundBuffer_Unlock(this->hidden->mixbuf,
+                                  this->hidden->locked_buf,
+                                  this->hidden->mixlen, NULL, 0);
+    }
+
+}
+
+static Uint8 *
+DSOUND_GetDeviceBuf(_THIS)
+{
+    DWORD cursor = 0;
+    DWORD junk = 0;
+    HRESULT result = DS_OK;
+    DWORD rawlen = 0;
+
+    /* Figure out which blocks to fill next */
+    this->hidden->locked_buf = NULL;
+    result = IDirectSoundBuffer_GetCurrentPosition(this->hidden->mixbuf,
+                                                   &junk, &cursor);
+    if (result == DSERR_BUFFERLOST) {
+        IDirectSoundBuffer_Restore(this->hidden->mixbuf);
+        result = IDirectSoundBuffer_GetCurrentPosition(this->hidden->mixbuf,
+                                                       &junk, &cursor);
+    }
+    if (result != DS_OK) {
+        SetDSerror("DirectSound GetCurrentPosition", result);
+        return (NULL);
+    }
+    cursor /= this->hidden->mixlen;
+#ifdef DEBUG_SOUND
+    /* Detect audio dropouts */
+    {
+        DWORD spot = cursor;
+        if (spot < this->hidden->lastchunk) {
+            spot += this->hidden->num_buffers;
+        }
+        if (spot > this->hidden->lastchunk + 1) {
+            fprintf(stderr, "Audio dropout, missed %d fragments\n",
+                    (spot - (this->hidden->lastchunk + 1)));
+        }
+    }
+#endif
+    this->hidden->lastchunk = cursor;
+    cursor = (cursor + 1) % this->hidden->num_buffers;
+    cursor *= this->hidden->mixlen;
+
+    /* Lock the audio buffer */
+    result = IDirectSoundBuffer_Lock(this->hidden->mixbuf, cursor,
+                                     this->hidden->mixlen,
+                                     (LPVOID *) & this->hidden->locked_buf,
+                                     &rawlen, NULL, &junk, 0);
+    if (result == DSERR_BUFFERLOST) {
+        IDirectSoundBuffer_Restore(this->hidden->mixbuf);
+        result = IDirectSoundBuffer_Lock(this->hidden->mixbuf, cursor,
+                                         this->hidden->mixlen,
+                                         (LPVOID *) & this->
+                                         hidden->locked_buf, &rawlen, NULL,
+                                         &junk, 0);
+    }
+    if (result != DS_OK) {
+        SetDSerror("DirectSound Lock", result);
+        return (NULL);
+    }
+    return (this->hidden->locked_buf);
+}
+
+static void
+DSOUND_WaitDone(_THIS)
+{
+    Uint8 *stream = DSOUND_GetDeviceBuf(this);
+
+    /* Wait for the playing chunk to finish */
+    if (stream != NULL) {
+        SDL_memset(stream, this->spec.silence, this->hidden->mixlen);
+        DSOUND_PlayDevice(this);
+    }
+    DSOUND_WaitDevice(this);
+
+    /* Stop the looping sound buffer */
+    IDirectSoundBuffer_Stop(this->hidden->mixbuf);
+}
+
+static void
+DSOUND_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        if (this->hidden->sound != NULL) {
+            if (this->hidden->mixbuf != NULL) {
+                /* Clean up the audio buffer */
+                IDirectSoundBuffer_Release(this->hidden->mixbuf);
+                this->hidden->mixbuf = NULL;
+            }
+            IDirectSound_Release(this->hidden->sound);
+            this->hidden->sound = NULL;
+        }
+
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+/* This function tries to create a secondary audio buffer, and returns the
+   number of audio chunks available in the created buffer.
+*/
+static int
+CreateSecondary(_THIS, HWND focus)
+{
+    LPDIRECTSOUND sndObj = this->hidden->sound;
+    LPDIRECTSOUNDBUFFER *sndbuf = &this->hidden->mixbuf;
+    Uint32 chunksize = this->spec.size;
+    const int numchunks = 8;
+    HRESULT result = DS_OK;
+    DSBUFFERDESC format;
+    LPVOID pvAudioPtr1, pvAudioPtr2;
+    DWORD dwAudioBytes1, dwAudioBytes2;
+    WAVEFORMATEX wfmt;
+
+    SDL_zero(wfmt);
+
+    if (SDL_AUDIO_ISFLOAT(this->spec.format)) {
+        wfmt.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
+    } else {
+        wfmt.wFormatTag = WAVE_FORMAT_PCM;
+    }
+
+    wfmt.wBitsPerSample = SDL_AUDIO_BITSIZE(this->spec.format);
+    wfmt.nChannels = this->spec.channels;
+    wfmt.nSamplesPerSec = this->spec.freq;
+    wfmt.nBlockAlign = wfmt.nChannels * (wfmt.wBitsPerSample / 8);
+    wfmt.nAvgBytesPerSec = wfmt.nSamplesPerSec * wfmt.nBlockAlign;
+
+    /* Update the fragment size as size in bytes */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Try to set primary mixing privileges */
+    if (focus) {
+        result = IDirectSound_SetCooperativeLevel(sndObj,
+                                                  focus, DSSCL_PRIORITY);
+    } else {
+        result = IDirectSound_SetCooperativeLevel(sndObj,
+                                                  GetDesktopWindow(),
+                                                  DSSCL_NORMAL);
+    }
+    if (result != DS_OK) {
+        return SetDSerror("DirectSound SetCooperativeLevel", result);
+    }
+
+    /* Try to create the secondary buffer */
+    SDL_zero(format);
+    format.dwSize = sizeof(format);
+    format.dwFlags = DSBCAPS_GETCURRENTPOSITION2;
+    if (!focus) {
+        format.dwFlags |= DSBCAPS_GLOBALFOCUS;
+    } else {
+        format.dwFlags |= DSBCAPS_STICKYFOCUS;
+    }
+    format.dwBufferBytes = numchunks * chunksize;
+    if ((format.dwBufferBytes < DSBSIZE_MIN) ||
+        (format.dwBufferBytes > DSBSIZE_MAX)) {
+        return SDL_SetError("Sound buffer size must be between %d and %d",
+                            DSBSIZE_MIN / numchunks, DSBSIZE_MAX / numchunks);
+    }
+    format.dwReserved = 0;
+    format.lpwfxFormat = &wfmt;
+    result = IDirectSound_CreateSoundBuffer(sndObj, &format, sndbuf, NULL);
+    if (result != DS_OK) {
+        return SetDSerror("DirectSound CreateSoundBuffer", result);
+    }
+    IDirectSoundBuffer_SetFormat(*sndbuf, &wfmt);
+
+    /* Silence the initial audio buffer */
+    result = IDirectSoundBuffer_Lock(*sndbuf, 0, format.dwBufferBytes,
+                                     (LPVOID *) & pvAudioPtr1, &dwAudioBytes1,
+                                     (LPVOID *) & pvAudioPtr2, &dwAudioBytes2,
+                                     DSBLOCK_ENTIREBUFFER);
+    if (result == DS_OK) {
+        SDL_memset(pvAudioPtr1, this->spec.silence, dwAudioBytes1);
+        IDirectSoundBuffer_Unlock(*sndbuf,
+                                  (LPVOID) pvAudioPtr1, dwAudioBytes1,
+                                  (LPVOID) pvAudioPtr2, dwAudioBytes2);
+    }
+
+    /* We're ready to go */
+    return (numchunks);
+}
+
+typedef struct FindDevGUIDData
+{
+    const char *devname;
+    GUID guid;
+    int found;
+} FindDevGUIDData;
+
+static BOOL CALLBACK
+FindDevGUID(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID _data)
+{
+    if (guid != NULL) {  /* skip the default device. */
+        FindDevGUIDData *data = (FindDevGUIDData *) _data;
+        char *str = WIN_StringToUTF8(desc);
+        const int match = (SDL_strcmp(str, data->devname) == 0);
+        SDL_free(str);
+        if (match) {
+            data->found = 1;
+            SDL_memcpy(&data->guid, guid, sizeof (data->guid));
+            return FALSE;  /* found it! stop enumerating. */
+        }
+    }
+    return TRUE;  /* keep enumerating. */
+}
+
+static int
+DSOUND_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    HRESULT result;
+    SDL_bool valid_format = SDL_FALSE;
+    SDL_bool tried_format = SDL_FALSE;
+    SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format);
+    FindDevGUIDData devguid;
+    LPGUID guid = NULL;
+
+    if (devname != NULL) {
+        devguid.found = 0;
+        devguid.devname = devname;
+        if (iscapture)
+            pDirectSoundCaptureEnumerateW(FindDevGUID, &devguid);
+        else
+            pDirectSoundEnumerateW(FindDevGUID, &devguid);
+
+        if (!devguid.found) {
+            return SDL_SetError("DirectSound: Requested device not found");
+        }
+        guid = &devguid.guid;
+    }
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Open the audio device */
+    result = pDirectSoundCreate8(guid, &this->hidden->sound, NULL);
+    if (result != DS_OK) {
+        DSOUND_CloseDevice(this);
+        return SetDSerror("DirectSoundCreate", result);
+    }
+
+    while ((!valid_format) && (test_format)) {
+        switch (test_format) {
+        case AUDIO_U8:
+        case AUDIO_S16:
+        case AUDIO_S32:
+        case AUDIO_F32:
+            tried_format = SDL_TRUE;
+            this->spec.format = test_format;
+            this->hidden->num_buffers = CreateSecondary(this, NULL);
+            if (this->hidden->num_buffers > 0) {
+                valid_format = SDL_TRUE;
+            }
+            break;
+        }
+        test_format = SDL_NextAudioFormat();
+    }
+
+    if (!valid_format) {
+        DSOUND_CloseDevice(this);
+        if (tried_format) {
+            return -1;  /* CreateSecondary() should have called SDL_SetError(). */
+        }
+        return SDL_SetError("DirectSound: Unsupported audio format");
+    }
+
+    /* The buffer will auto-start playing in DSOUND_WaitDevice() */
+    this->hidden->mixlen = this->spec.size;
+
+    return 0;                   /* good to go. */
+}
+
+
+static void
+DSOUND_Deinitialize(void)
+{
+    DSOUND_Unload();
+}
+
+
+static int
+DSOUND_Init(SDL_AudioDriverImpl * impl)
+{
+    if (!DSOUND_Load()) {
+        return 0;
+    }
+
+    /* Set the function pointers */
+    impl->DetectDevices = DSOUND_DetectDevices;
+    impl->OpenDevice = DSOUND_OpenDevice;
+    impl->PlayDevice = DSOUND_PlayDevice;
+    impl->WaitDevice = DSOUND_WaitDevice;
+    impl->WaitDone = DSOUND_WaitDone;
+    impl->GetDeviceBuf = DSOUND_GetDeviceBuf;
+    impl->CloseDevice = DSOUND_CloseDevice;
+    impl->Deinitialize = DSOUND_Deinitialize;
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap DSOUND_bootstrap = {
+    "directsound", "DirectSound", DSOUND_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_DSOUND */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/directsound/SDL_directsound.h b/Source/3rd Party/sdl/src/audio/directsound/SDL_directsound.h
new file mode 100644
index 000000000..b873391fb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/directsound/SDL_directsound.h	
@@ -0,0 +1,46 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_directsound_h
+#define _SDL_directsound_h
+
+#include "directx.h"
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+/* The DirectSound objects */
+struct SDL_PrivateAudioData
+{
+    LPDIRECTSOUND sound;
+    LPDIRECTSOUNDBUFFER mixbuf;
+    int num_buffers;
+    int mixlen;
+    DWORD lastchunk;
+    Uint8 *locked_buf;
+};
+
+#endif /* _SDL_directsound_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/directsound/directx.h b/Source/3rd Party/sdl/src/audio/directsound/directx.h
new file mode 100644
index 000000000..472a0ee0e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/directsound/directx.h	
@@ -0,0 +1,102 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _directx_h
+#define _directx_h
+
+/* Include all of the DirectX 8.0 headers and adds any necessary tweaks */
+
+#include "../../core/windows/SDL_windows.h"
+#include <mmsystem.h>
+#ifndef WIN32
+#define WIN32
+#endif
+#undef  WINNT
+
+/* Far pointers don't exist in 32-bit code */
+#ifndef FAR
+#define FAR
+#endif
+
+/* Error codes not yet included in Win32 API header files */
+#ifndef MAKE_HRESULT
+#define MAKE_HRESULT(sev,fac,code) \
+    ((HRESULT)(((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))))
+#endif
+
+#ifndef S_OK
+#define S_OK        (HRESULT)0x00000000L
+#endif
+
+#ifndef SUCCEEDED
+#define SUCCEEDED(x)    ((HRESULT)(x) >= 0)
+#endif
+#ifndef FAILED
+#define FAILED(x)   ((HRESULT)(x)<0)
+#endif
+
+#ifndef E_FAIL
+#define E_FAIL      (HRESULT)0x80000008L
+#endif
+#ifndef E_NOINTERFACE
+#define E_NOINTERFACE   (HRESULT)0x80004002L
+#endif
+#ifndef E_OUTOFMEMORY
+#define E_OUTOFMEMORY   (HRESULT)0x8007000EL
+#endif
+#ifndef E_INVALIDARG
+#define E_INVALIDARG    (HRESULT)0x80070057L
+#endif
+#ifndef E_NOTIMPL
+#define E_NOTIMPL   (HRESULT)0x80004001L
+#endif
+#ifndef REGDB_E_CLASSNOTREG
+#define REGDB_E_CLASSNOTREG (HRESULT)0x80040154L
+#endif
+
+/* Severity codes */
+#ifndef SEVERITY_ERROR
+#define SEVERITY_ERROR  1
+#endif
+
+/* Error facility codes */
+#ifndef FACILITY_WIN32
+#define FACILITY_WIN32  7
+#endif
+
+#ifndef FIELD_OFFSET
+#define FIELD_OFFSET(type, field)    ((LONG)&(((type *)0)->field))
+#endif
+
+/* DirectX headers (if it isn't included, I haven't tested it yet)
+ */
+/* We need these defines to mark what version of DirectX API we use */
+#define DIRECTDRAW_VERSION  0x0700
+#define DIRECTSOUND_VERSION 0x0800
+#define DIRECTINPUT_VERSION 0x0500
+
+#include <ddraw.h>
+#include <dsound.h>
+#include <dinput.h>
+
+#endif /* _directx_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/disk/SDL_diskaudio.c b/Source/3rd Party/sdl/src/audio/disk/SDL_diskaudio.c
new file mode 100644
index 000000000..cc4e3efc6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/disk/SDL_diskaudio.c	
@@ -0,0 +1,163 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_DISK
+
+/* Output raw audio data to a file. */
+
+#if HAVE_STDIO_H
+#include <stdio.h>
+#endif
+
+#include "SDL_rwops.h"
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_diskaudio.h"
+
+/* environment variables and defaults. */
+#define DISKENVR_OUTFILE         "SDL_DISKAUDIOFILE"
+#define DISKDEFAULT_OUTFILE      "sdlaudio.raw"
+#define DISKENVR_WRITEDELAY      "SDL_DISKAUDIODELAY"
+#define DISKDEFAULT_WRITEDELAY   150
+
+static const char *
+DISKAUD_GetOutputFilename(const char *devname)
+{
+    if (devname == NULL) {
+        devname = SDL_getenv(DISKENVR_OUTFILE);
+        if (devname == NULL) {
+            devname = DISKDEFAULT_OUTFILE;
+        }
+    }
+    return devname;
+}
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+DISKAUD_WaitDevice(_THIS)
+{
+    SDL_Delay(this->hidden->write_delay);
+}
+
+static void
+DISKAUD_PlayDevice(_THIS)
+{
+    size_t written;
+
+    /* Write the audio data */
+    written = SDL_RWwrite(this->hidden->output,
+                          this->hidden->mixbuf, 1, this->hidden->mixlen);
+
+    /* If we couldn't write, assume fatal error for now */
+    if (written != this->hidden->mixlen) {
+        this->enabled = 0;
+    }
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Wrote %d bytes of audio data\n", written);
+#endif
+}
+
+static Uint8 *
+DISKAUD_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+static void
+DISKAUD_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->output != NULL) {
+            SDL_RWclose(this->hidden->output);
+            this->hidden->output = NULL;
+        }
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static int
+DISKAUD_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    const char *envr = SDL_getenv(DISKENVR_WRITEDELAY);
+    const char *fname = DISKAUD_GetOutputFilename(devname);
+
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc(sizeof(*this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, sizeof(*this->hidden));
+
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->write_delay =
+        (envr) ? SDL_atoi(envr) : DISKDEFAULT_WRITEDELAY;
+
+    /* Open the audio device */
+    this->hidden->output = SDL_RWFromFile(fname, "wb");
+    if (this->hidden->output == NULL) {
+        DISKAUD_CloseDevice(this);
+        return -1;
+    }
+
+    /* Allocate mixing buffer */
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        DISKAUD_CloseDevice(this);
+        return -1;
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+
+#if HAVE_STDIO_H
+    fprintf(stderr,
+            "WARNING: You are using the SDL disk writer audio driver!\n"
+            " Writing to file [%s].\n", fname);
+#endif
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+static int
+DISKAUD_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->OpenDevice = DISKAUD_OpenDevice;
+    impl->WaitDevice = DISKAUD_WaitDevice;
+    impl->PlayDevice = DISKAUD_PlayDevice;
+    impl->GetDeviceBuf = DISKAUD_GetDeviceBuf;
+    impl->CloseDevice = DISKAUD_CloseDevice;
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap DISKAUD_bootstrap = {
+    "disk", "direct-to-disk audio", DISKAUD_Init, 1
+};
+
+#endif /* SDL_AUDIO_DRIVER_DISK */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/disk/SDL_diskaudio.h b/Source/3rd Party/sdl/src/audio/disk/SDL_diskaudio.h
new file mode 100644
index 000000000..9c5a7afaf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/disk/SDL_diskaudio.h	
@@ -0,0 +1,42 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_diskaudio_h
+#define _SDL_diskaudio_h
+
+#include "SDL_rwops.h"
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The file descriptor for the audio device */
+    SDL_RWops *output;
+    Uint8 *mixbuf;
+    Uint32 mixlen;
+    Uint32 write_delay;
+};
+
+#endif /* _SDL_diskaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/dsp/SDL_dspaudio.c b/Source/3rd Party/sdl/src/audio/dsp/SDL_dspaudio.c
new file mode 100644
index 000000000..eea5a5f86
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/dsp/SDL_dspaudio.c	
@@ -0,0 +1,306 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_OSS
+
+/* Allow access to a raw mixing buffer */
+
+#include <stdio.h>              /* For perror() */
+#include <string.h>             /* For strerror() */
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+
+#if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
+/* This is installed on some systems */
+#include <soundcard.h>
+#else
+/* This is recommended by OSS */
+#include <sys/soundcard.h>
+#endif
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
+#include "SDL_dspaudio.h"
+
+
+static void
+DSP_DetectDevices(int iscapture, SDL_AddAudioDevice addfn)
+{
+    SDL_EnumUnixAudioDevices(iscapture, 0, NULL, addfn);
+}
+
+
+static void
+DSP_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->audio_fd >= 0) {
+            close(this->hidden->audio_fd);
+            this->hidden->audio_fd = -1;
+        }
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+
+static int
+DSP_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT);
+    int format;
+    int value;
+    int frag_spec;
+    SDL_AudioFormat test_format;
+
+    /* We don't care what the devname is...we'll try to open anything. */
+    /*  ...but default to first name in the list... */
+    if (devname == NULL) {
+        devname = SDL_GetAudioDeviceName(0, iscapture);
+        if (devname == NULL) {
+            return SDL_SetError("No such audio device");
+        }
+    }
+
+    /* Make sure fragment size stays a power of 2, or OSS fails. */
+    /* I don't know which of these are actually legal values, though... */
+    if (this->spec.channels > 8)
+        this->spec.channels = 8;
+    else if (this->spec.channels > 4)
+        this->spec.channels = 4;
+    else if (this->spec.channels > 2)
+        this->spec.channels = 2;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Open the audio device */
+    this->hidden->audio_fd = open(devname, flags, 0);
+    if (this->hidden->audio_fd < 0) {
+        DSP_CloseDevice(this);
+        return SDL_SetError("Couldn't open %s: %s", devname, strerror(errno));
+    }
+    this->hidden->mixbuf = NULL;
+
+    /* Make the file descriptor use blocking writes with fcntl() */
+    {
+        long ctlflags;
+        ctlflags = fcntl(this->hidden->audio_fd, F_GETFL);
+        ctlflags &= ~O_NONBLOCK;
+        if (fcntl(this->hidden->audio_fd, F_SETFL, ctlflags) < 0) {
+            DSP_CloseDevice(this);
+            return SDL_SetError("Couldn't set audio blocking mode");
+        }
+    }
+
+    /* Get a list of supported hardware formats */
+    if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_GETFMTS, &value) < 0) {
+        perror("SNDCTL_DSP_GETFMTS");
+        DSP_CloseDevice(this);
+        return SDL_SetError("Couldn't get audio format list");
+    }
+
+    /* Try for a closest match on audio format */
+    format = 0;
+    for (test_format = SDL_FirstAudioFormat(this->spec.format);
+         !format && test_format;) {
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Trying format 0x%4.4x\n", test_format);
+#endif
+        switch (test_format) {
+        case AUDIO_U8:
+            if (value & AFMT_U8) {
+                format = AFMT_U8;
+            }
+            break;
+        case AUDIO_S16LSB:
+            if (value & AFMT_S16_LE) {
+                format = AFMT_S16_LE;
+            }
+            break;
+        case AUDIO_S16MSB:
+            if (value & AFMT_S16_BE) {
+                format = AFMT_S16_BE;
+            }
+            break;
+#if 0
+/*
+ * These formats are not used by any real life systems so they are not
+ * needed here.
+ */
+        case AUDIO_S8:
+            if (value & AFMT_S8) {
+                format = AFMT_S8;
+            }
+            break;
+        case AUDIO_U16LSB:
+            if (value & AFMT_U16_LE) {
+                format = AFMT_U16_LE;
+            }
+            break;
+        case AUDIO_U16MSB:
+            if (value & AFMT_U16_BE) {
+                format = AFMT_U16_BE;
+            }
+            break;
+#endif
+        default:
+            format = 0;
+            break;
+        }
+        if (!format) {
+            test_format = SDL_NextAudioFormat();
+        }
+    }
+    if (format == 0) {
+        DSP_CloseDevice(this);
+        return SDL_SetError("Couldn't find any hardware audio formats");
+    }
+    this->spec.format = test_format;
+
+    /* Set the audio format */
+    value = format;
+    if ((ioctl(this->hidden->audio_fd, SNDCTL_DSP_SETFMT, &value) < 0) ||
+        (value != format)) {
+        perror("SNDCTL_DSP_SETFMT");
+        DSP_CloseDevice(this);
+        return SDL_SetError("Couldn't set audio format");
+    }
+
+    /* Set the number of channels of output */
+    value = this->spec.channels;
+    if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_CHANNELS, &value) < 0) {
+        perror("SNDCTL_DSP_CHANNELS");
+        DSP_CloseDevice(this);
+        return SDL_SetError("Cannot set the number of channels");
+    }
+    this->spec.channels = value;
+
+    /* Set the DSP frequency */
+    value = this->spec.freq;
+    if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_SPEED, &value) < 0) {
+        perror("SNDCTL_DSP_SPEED");
+        DSP_CloseDevice(this);
+        return SDL_SetError("Couldn't set audio frequency");
+    }
+    this->spec.freq = value;
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Determine the power of two of the fragment size */
+    for (frag_spec = 0; (0x01U << frag_spec) < this->spec.size; ++frag_spec);
+    if ((0x01U << frag_spec) != this->spec.size) {
+        DSP_CloseDevice(this);
+        return SDL_SetError("Fragment size must be a power of two");
+    }
+    frag_spec |= 0x00020000;    /* two fragments, for low latency */
+
+    /* Set the audio buffering parameters */
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Requesting %d fragments of size %d\n",
+            (frag_spec >> 16), 1 << (frag_spec & 0xFFFF));
+#endif
+    if (ioctl(this->hidden->audio_fd, SNDCTL_DSP_SETFRAGMENT, &frag_spec) < 0) {
+        perror("SNDCTL_DSP_SETFRAGMENT");
+    }
+#ifdef DEBUG_AUDIO
+    {
+        audio_buf_info info;
+        ioctl(this->hidden->audio_fd, SNDCTL_DSP_GETOSPACE, &info);
+        fprintf(stderr, "fragments = %d\n", info.fragments);
+        fprintf(stderr, "fragstotal = %d\n", info.fragstotal);
+        fprintf(stderr, "fragsize = %d\n", info.fragsize);
+        fprintf(stderr, "bytes = %d\n", info.bytes);
+    }
+#endif
+
+    /* Allocate mixing buffer */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        DSP_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+
+static void
+DSP_PlayDevice(_THIS)
+{
+    const Uint8 *mixbuf = this->hidden->mixbuf;
+    const int mixlen = this->hidden->mixlen;
+    if (write(this->hidden->audio_fd, mixbuf, mixlen) == -1) {
+        perror("Audio write");
+        this->enabled = 0;
+    }
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Wrote %d bytes of audio data\n", mixlen);
+#endif
+}
+
+static Uint8 *
+DSP_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+static int
+DSP_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->DetectDevices = DSP_DetectDevices;
+    impl->OpenDevice = DSP_OpenDevice;
+    impl->PlayDevice = DSP_PlayDevice;
+    impl->GetDeviceBuf = DSP_GetDeviceBuf;
+    impl->CloseDevice = DSP_CloseDevice;
+
+    return 1;   /* this audio target is available. */
+}
+
+
+AudioBootStrap DSP_bootstrap = {
+    "dsp", "OSS /dev/dsp standard audio", DSP_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_OSS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/dsp/SDL_dspaudio.h b/Source/3rd Party/sdl/src/audio/dsp/SDL_dspaudio.h
new file mode 100644
index 000000000..5cbb563b9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/dsp/SDL_dspaudio.h	
@@ -0,0 +1,43 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_dspaudio_h
+#define _SDL_dspaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The file descriptor for the audio device */
+    int audio_fd;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+};
+#define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
+
+#endif /* _SDL_dspaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/dummy/SDL_dummyaudio.c b/Source/3rd Party/sdl/src/audio/dummy/SDL_dummyaudio.c
new file mode 100644
index 000000000..671e222cf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/dummy/SDL_dummyaudio.c	
@@ -0,0 +1,48 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* Output audio to nowhere... */
+
+#include "SDL_audio.h"
+#include "../SDL_audio_c.h"
+#include "SDL_dummyaudio.h"
+
+static int
+DUMMYAUD_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    return 0;                   /* always succeeds. */
+}
+
+static int
+DUMMYAUD_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->OpenDevice = DUMMYAUD_OpenDevice;
+    impl->OnlyHasDefaultOutputDevice = 1;
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap DUMMYAUD_bootstrap = {
+    "dummy", "SDL dummy audio driver", DUMMYAUD_Init, 1
+};
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/dummy/SDL_dummyaudio.h b/Source/3rd Party/sdl/src/audio/dummy/SDL_dummyaudio.h
new file mode 100644
index 000000000..185401113
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/dummy/SDL_dummyaudio.h	
@@ -0,0 +1,41 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_dummyaudio_h
+#define _SDL_dummyaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The file descriptor for the audio device */
+    Uint8 *mixbuf;
+    Uint32 mixlen;
+    Uint32 write_delay;
+    Uint32 initial_calls;
+};
+
+#endif /* _SDL_dummyaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/esd/SDL_esdaudio.c b/Source/3rd Party/sdl/src/audio/esd/SDL_esdaudio.c
new file mode 100644
index 000000000..e675272dc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/esd/SDL_esdaudio.c	
@@ -0,0 +1,345 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_ESD
+
+/* Allow access to an ESD network stream mixing buffer */
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <signal.h>
+#include <errno.h>
+#include <esd.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_esdaudio.h"
+
+#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC
+#include "SDL_name.h"
+#include "SDL_loadso.h"
+#else
+#define SDL_NAME(X) X
+#endif
+
+#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC
+
+static const char *esd_library = SDL_AUDIO_DRIVER_ESD_DYNAMIC;
+static void *esd_handle = NULL;
+
+static int (*SDL_NAME(esd_open_sound)) (const char *host);
+static int (*SDL_NAME(esd_close)) (int esd);
+static int (*SDL_NAME(esd_play_stream)) (esd_format_t format, int rate,
+                                         const char *host, const char *name);
+
+#define SDL_ESD_SYM(x) { #x, (void **) (char *) &SDL_NAME(x) }
+static struct
+{
+    const char *name;
+    void **func;
+} const esd_functions[] = {
+    SDL_ESD_SYM(esd_open_sound),
+    SDL_ESD_SYM(esd_close), SDL_ESD_SYM(esd_play_stream),
+};
+
+#undef SDL_ESD_SYM
+
+static void
+UnloadESDLibrary()
+{
+    if (esd_handle != NULL) {
+        SDL_UnloadObject(esd_handle);
+        esd_handle = NULL;
+    }
+}
+
+static int
+LoadESDLibrary(void)
+{
+    int i, retval = -1;
+
+    if (esd_handle == NULL) {
+        esd_handle = SDL_LoadObject(esd_library);
+        if (esd_handle) {
+            retval = 0;
+            for (i = 0; i < SDL_arraysize(esd_functions); ++i) {
+                *esd_functions[i].func =
+                    SDL_LoadFunction(esd_handle, esd_functions[i].name);
+                if (!*esd_functions[i].func) {
+                    retval = -1;
+                    UnloadESDLibrary();
+                    break;
+                }
+            }
+        }
+    }
+    return retval;
+}
+
+#else
+
+static void
+UnloadESDLibrary()
+{
+    return;
+}
+
+static int
+LoadESDLibrary(void)
+{
+    return 0;
+}
+
+#endif /* SDL_AUDIO_DRIVER_ESD_DYNAMIC */
+
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+ESD_WaitDevice(_THIS)
+{
+    Sint32 ticks;
+
+    /* Check to see if the thread-parent process is still alive */
+    {
+        static int cnt = 0;
+        /* Note that this only works with thread implementations
+           that use a different process id for each thread.
+         */
+        /* Check every 10 loops */
+        if (this->hidden->parent && (((++cnt) % 10) == 0)) {
+            if (kill(this->hidden->parent, 0) < 0 && errno == ESRCH) {
+                this->enabled = 0;
+            }
+        }
+    }
+
+    /* Use timer for general audio synchronization */
+    ticks = ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS;
+    if (ticks > 0) {
+        SDL_Delay(ticks);
+    }
+}
+
+static void
+ESD_PlayDevice(_THIS)
+{
+    int written = 0;
+
+    /* Write the audio data, checking for EAGAIN on broken audio drivers */
+    do {
+        written = write(this->hidden->audio_fd,
+                        this->hidden->mixbuf, this->hidden->mixlen);
+        if ((written < 0) && ((errno == 0) || (errno == EAGAIN))) {
+            SDL_Delay(1);       /* Let a little CPU time go by */
+        }
+    } while ((written < 0) &&
+             ((errno == 0) || (errno == EAGAIN) || (errno == EINTR)));
+
+    /* Set the next write frame */
+    this->hidden->next_frame += this->hidden->frame_ticks;
+
+    /* If we couldn't write, assume fatal error for now */
+    if (written < 0) {
+        this->enabled = 0;
+    }
+}
+
+static Uint8 *
+ESD_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+static void
+ESD_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->audio_fd >= 0) {
+            SDL_NAME(esd_close) (this->hidden->audio_fd);
+            this->hidden->audio_fd = -1;
+        }
+
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+/* Try to get the name of the program */
+static char *
+get_progname(void)
+{
+    char *progname = NULL;
+#ifdef __LINUX__
+    FILE *fp;
+    static char temp[BUFSIZ];
+
+    SDL_snprintf(temp, SDL_arraysize(temp), "/proc/%d/cmdline", getpid());
+    fp = fopen(temp, "r");
+    if (fp != NULL) {
+        if (fgets(temp, sizeof(temp) - 1, fp)) {
+            progname = SDL_strrchr(temp, '/');
+            if (progname == NULL) {
+                progname = temp;
+            } else {
+                progname = progname + 1;
+            }
+        }
+        fclose(fp);
+    }
+#endif
+    return (progname);
+}
+
+
+static int
+ESD_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    esd_format_t format = (ESD_STREAM | ESD_PLAY);
+    SDL_AudioFormat test_format = 0;
+    int found = 0;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    this->hidden->audio_fd = -1;
+
+    /* Convert audio spec to the ESD audio format */
+    /* Try for a closest match on audio format */
+    for (test_format = SDL_FirstAudioFormat(this->spec.format);
+         !found && test_format; test_format = SDL_NextAudioFormat()) {
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Trying format 0x%4.4x\n", test_format);
+#endif
+        found = 1;
+        switch (test_format) {
+        case AUDIO_U8:
+            format |= ESD_BITS8;
+            break;
+        case AUDIO_S16SYS:
+            format |= ESD_BITS16;
+            break;
+        default:
+            found = 0;
+            break;
+        }
+    }
+
+    if (!found) {
+        ESD_CloseDevice(this);
+        return SDL_SetError("Couldn't find any hardware audio formats");
+    }
+
+    if (this->spec.channels == 1) {
+        format |= ESD_MONO;
+    } else {
+        format |= ESD_STEREO;
+    }
+#if 0
+    this->spec.samples = ESD_BUF_SIZE;  /* Darn, no way to change this yet */
+#endif
+
+    /* Open a connection to the ESD audio server */
+    this->hidden->audio_fd =
+        SDL_NAME(esd_play_stream) (format, this->spec.freq, NULL,
+                                   get_progname());
+
+    if (this->hidden->audio_fd < 0) {
+        ESD_CloseDevice(this);
+        return SDL_SetError("Couldn't open ESD connection");
+    }
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+    this->hidden->frame_ticks =
+        (float) (this->spec.samples * 1000) / this->spec.freq;
+    this->hidden->next_frame = SDL_GetTicks() + this->hidden->frame_ticks;
+
+    /* Allocate mixing buffer */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        ESD_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+
+    /* Get the parent process id (we're the parent of the audio thread) */
+    this->hidden->parent = getpid();
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+static void
+ESD_Deinitialize(void)
+{
+    UnloadESDLibrary();
+}
+
+static int
+ESD_Init(SDL_AudioDriverImpl * impl)
+{
+    if (LoadESDLibrary() < 0) {
+        return 0;
+    } else {
+        int connection = 0;
+
+        /* Don't start ESD if it's not running */
+        SDL_setenv("ESD_NO_SPAWN", "1", 0);
+
+        connection = SDL_NAME(esd_open_sound) (NULL);
+        if (connection < 0) {
+            UnloadESDLibrary();
+            SDL_SetError("ESD: esd_open_sound failed (no audio server?)");
+            return 0;
+        }
+        SDL_NAME(esd_close) (connection);
+    }
+
+    /* Set the function pointers */
+    impl->OpenDevice = ESD_OpenDevice;
+    impl->PlayDevice = ESD_PlayDevice;
+    impl->WaitDevice = ESD_WaitDevice;
+    impl->GetDeviceBuf = ESD_GetDeviceBuf;
+    impl->CloseDevice = ESD_CloseDevice;
+    impl->Deinitialize = ESD_Deinitialize;
+    impl->OnlyHasDefaultOutputDevice = 1;
+
+    return 1;   /* this audio target is available. */
+}
+
+
+AudioBootStrap ESD_bootstrap = {
+    "esd", "Enlightened Sound Daemon", ESD_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_ESD */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/esd/SDL_esdaudio.h b/Source/3rd Party/sdl/src/audio/esd/SDL_esdaudio.h
new file mode 100644
index 000000000..e0d5d4cdf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/esd/SDL_esdaudio.h	
@@ -0,0 +1,50 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_esdaudio_h
+#define _SDL_esdaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The file descriptor for the audio device */
+    int audio_fd;
+
+    /* The parent process id, to detect when application quits */
+    pid_t parent;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+
+    /* Support for audio timing using a timer */
+    float frame_ticks;
+    float next_frame;
+};
+#define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
+
+#endif /* _SDL_esdaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/fusionsound/SDL_fsaudio.c b/Source/3rd Party/sdl/src/audio/fusionsound/SDL_fsaudio.c
new file mode 100644
index 000000000..b8367715f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/fusionsound/SDL_fsaudio.c	
@@ -0,0 +1,345 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_FUSIONSOUND
+
+/* Allow access to a raw mixing buffer */
+
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#include <unistd.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_fsaudio.h"
+
+#include <fusionsound/fusionsound_version.h>
+
+/* #define SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC "libfusionsound.so" */
+
+#ifdef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC
+#include "SDL_name.h"
+#include "SDL_loadso.h"
+#else
+#define SDL_NAME(X) X
+#endif
+
+#if (FUSIONSOUND_MAJOR_VERSION == 1) && (FUSIONSOUND_MINOR_VERSION < 1)
+typedef DFBResult DirectResult;
+#endif
+
+/* Buffers to use - more than 2 gives a lot of latency */
+#define FUSION_BUFFERS              (2)
+
+#ifdef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC
+
+static const char *fs_library = SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC;
+static void *fs_handle = NULL;
+
+static DirectResult (*SDL_NAME(FusionSoundInit)) (int *argc, char *(*argv[]));
+static DirectResult (*SDL_NAME(FusionSoundCreate)) (IFusionSound **
+                                                   ret_interface);
+
+#define SDL_FS_SYM(x) { #x, (void **) (char *) &SDL_NAME(x) }
+static struct
+{
+    const char *name;
+    void **func;
+} fs_functions[] = {
+/* *INDENT-OFF* */
+    SDL_FS_SYM(FusionSoundInit),
+    SDL_FS_SYM(FusionSoundCreate),
+/* *INDENT-ON* */
+};
+
+#undef SDL_FS_SYM
+
+static void
+UnloadFusionSoundLibrary()
+{
+    if (fs_handle != NULL) {
+        SDL_UnloadObject(fs_handle);
+        fs_handle = NULL;
+    }
+}
+
+static int
+LoadFusionSoundLibrary(void)
+{
+    int i, retval = -1;
+
+    if (fs_handle == NULL) {
+        fs_handle = SDL_LoadObject(fs_library);
+        if (fs_handle != NULL) {
+            retval = 0;
+            for (i = 0; i < SDL_arraysize(fs_functions); ++i) {
+                *fs_functions[i].func =
+                    SDL_LoadFunction(fs_handle, fs_functions[i].name);
+                if (!*fs_functions[i].func) {
+                    retval = -1;
+                    UnloadFusionSoundLibrary();
+                    break;
+                }
+            }
+        }
+    }
+
+    return retval;
+}
+
+#else
+
+static void
+UnloadFusionSoundLibrary()
+{
+    return;
+}
+
+static int
+LoadFusionSoundLibrary(void)
+{
+    return 0;
+}
+
+#endif /* SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+SDL_FS_WaitDevice(_THIS)
+{
+    this->hidden->stream->Wait(this->hidden->stream,
+                               this->hidden->mixsamples);
+}
+
+static void
+SDL_FS_PlayDevice(_THIS)
+{
+    DirectResult ret;
+
+    ret = this->hidden->stream->Write(this->hidden->stream,
+                                      this->hidden->mixbuf,
+                                      this->hidden->mixsamples);
+    /* If we couldn't write, assume fatal error for now */
+    if (ret) {
+        this->enabled = 0;
+    }
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Wrote %d bytes of audio data\n", this->hidden->mixlen);
+#endif
+}
+
+static void
+SDL_FS_WaitDone(_THIS)
+{
+    this->hidden->stream->Wait(this->hidden->stream,
+                               this->hidden->mixsamples * FUSION_BUFFERS);
+}
+
+
+static Uint8 *
+SDL_FS_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+
+static void
+SDL_FS_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->stream) {
+            this->hidden->stream->Release(this->hidden->stream);
+            this->hidden->stream = NULL;
+        }
+        if (this->hidden->fs) {
+            this->hidden->fs->Release(this->hidden->fs);
+            this->hidden->fs = NULL;
+        }
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+
+static int
+SDL_FS_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    int bytes;
+    SDL_AudioFormat test_format = 0, format = 0;
+    FSSampleFormat fs_format;
+    FSStreamDescription desc;
+    DirectResult ret;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Try for a closest match on audio format */
+    for (test_format = SDL_FirstAudioFormat(this->spec.format);
+         !format && test_format;) {
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Trying format 0x%4.4x\n", test_format);
+#endif
+        switch (test_format) {
+        case AUDIO_U8:
+            fs_format = FSSF_U8;
+            bytes = 1;
+            format = 1;
+            break;
+        case AUDIO_S16SYS:
+            fs_format = FSSF_S16;
+            bytes = 2;
+            format = 1;
+            break;
+        case AUDIO_S32SYS:
+            fs_format = FSSF_S32;
+            bytes = 4;
+            format = 1;
+            break;
+        case AUDIO_F32SYS:
+            fs_format = FSSF_FLOAT;
+            bytes = 4;
+            format = 1;
+            break;
+        default:
+            format = 0;
+            break;
+        }
+        if (!format) {
+            test_format = SDL_NextAudioFormat();
+        }
+    }
+
+    if (format == 0) {
+        SDL_FS_CloseDevice(this);
+        return SDL_SetError("Couldn't find any hardware audio formats");
+    }
+    this->spec.format = test_format;
+
+    /* Retrieve the main sound interface. */
+    ret = SDL_NAME(FusionSoundCreate) (&this->hidden->fs);
+    if (ret) {
+        SDL_FS_CloseDevice(this);
+        return SDL_SetError("Unable to initialize FusionSound: %d", ret);
+    }
+
+    this->hidden->mixsamples = this->spec.size / bytes / this->spec.channels;
+
+    /* Fill stream description. */
+    desc.flags = FSSDF_SAMPLERATE | FSSDF_BUFFERSIZE |
+        FSSDF_CHANNELS | FSSDF_SAMPLEFORMAT | FSSDF_PREBUFFER;
+    desc.samplerate = this->spec.freq;
+    desc.buffersize = this->spec.size * FUSION_BUFFERS;
+    desc.channels = this->spec.channels;
+    desc.prebuffer = 10;
+    desc.sampleformat = fs_format;
+
+    ret =
+        this->hidden->fs->CreateStream(this->hidden->fs, &desc,
+                                       &this->hidden->stream);
+    if (ret) {
+        SDL_FS_CloseDevice(this);
+        return SDL_SetError("Unable to create FusionSoundStream: %d", ret);
+    }
+
+    /* See what we got */
+    desc.flags = FSSDF_SAMPLERATE | FSSDF_BUFFERSIZE |
+        FSSDF_CHANNELS | FSSDF_SAMPLEFORMAT;
+    ret = this->hidden->stream->GetDescription(this->hidden->stream, &desc);
+
+    this->spec.freq = desc.samplerate;
+    this->spec.size =
+        desc.buffersize / FUSION_BUFFERS * bytes * desc.channels;
+    this->spec.channels = desc.channels;
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Allocate mixing buffer */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        SDL_FS_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+
+static void
+SDL_FS_Deinitialize(void)
+{
+    UnloadFusionSoundLibrary();
+}
+
+
+static int
+SDL_FS_Init(SDL_AudioDriverImpl * impl)
+{
+    if (LoadFusionSoundLibrary() < 0) {
+        return 0;
+    } else {
+        DirectResult ret;
+
+        ret = SDL_NAME(FusionSoundInit) (NULL, NULL);
+        if (ret) {
+            UnloadFusionSoundLibrary();
+            SDL_SetError
+                ("FusionSound: SDL_FS_init failed (FusionSoundInit: %d)",
+                 ret);
+            return 0;
+        }
+    }
+
+    /* Set the function pointers */
+    impl->OpenDevice = SDL_FS_OpenDevice;
+    impl->PlayDevice = SDL_FS_PlayDevice;
+    impl->WaitDevice = SDL_FS_WaitDevice;
+    impl->GetDeviceBuf = SDL_FS_GetDeviceBuf;
+    impl->CloseDevice = SDL_FS_CloseDevice;
+    impl->WaitDone = SDL_FS_WaitDone;
+    impl->Deinitialize = SDL_FS_Deinitialize;
+    impl->OnlyHasDefaultOutputDevice = 1;
+
+    return 1;   /* this audio target is available. */
+}
+
+
+AudioBootStrap FUSIONSOUND_bootstrap = {
+    "fusionsound", "FusionSound", SDL_FS_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_FUSIONSOUND */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/fusionsound/SDL_fsaudio.h b/Source/3rd Party/sdl/src/audio/fusionsound/SDL_fsaudio.h
new file mode 100644
index 000000000..1f9d6bd27
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/fusionsound/SDL_fsaudio.h	
@@ -0,0 +1,49 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_fsaudio_h
+#define _SDL_fsaudio_h
+
+#include <fusionsound/fusionsound.h>
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* Interface */
+    IFusionSound *fs;
+
+    /* The stream interface for the audio device */
+    IFusionSoundStream *stream;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+    int mixsamples;
+
+};
+
+#endif /* _SDL_fsaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/haiku/SDL_haikuaudio.cc b/Source/3rd Party/sdl/src/audio/haiku/SDL_haikuaudio.cc
new file mode 100644
index 000000000..dddb77922
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/haiku/SDL_haikuaudio.cc	
@@ -0,0 +1,240 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_HAIKU
+
+/* Allow access to the audio stream on Haiku */
+
+#include <SoundPlayer.h>
+#include <signal.h>
+
+#include "../../main/haiku/SDL_BeApp.h"
+
+extern "C"
+{
+
+#include "SDL_audio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
+#include "SDL_haikuaudio.h"
+
+}
+
+
+/* !!! FIXME: have the callback call the higher level to avoid code dupe. */
+/* The Haiku callback for handling the audio buffer */
+static void
+FillSound(void *device, void *stream, size_t len,
+          const media_raw_audio_format & format)
+{
+    SDL_AudioDevice *audio = (SDL_AudioDevice *) device;
+
+    /* Only do soemthing if audio is enabled */
+    if (!audio->enabled)
+        return;
+
+    if (!audio->paused) {
+        if (audio->convert.needed) {
+            SDL_LockMutex(audio->mixer_lock);
+            (*audio->spec.callback) (audio->spec.userdata,
+                                     (Uint8 *) audio->convert.buf,
+                                     audio->convert.len);
+            SDL_UnlockMutex(audio->mixer_lock);
+            SDL_ConvertAudio(&audio->convert);
+            SDL_memcpy(stream, audio->convert.buf, audio->convert.len_cvt);
+        } else {
+            SDL_LockMutex(audio->mixer_lock);
+            (*audio->spec.callback) (audio->spec.userdata,
+                                     (Uint8 *) stream, len);
+            SDL_UnlockMutex(audio->mixer_lock);
+        }
+    }
+}
+
+static void
+HAIKUAUDIO_CloseDevice(_THIS)
+{
+    if (_this->hidden != NULL) {
+        if (_this->hidden->audio_obj) {
+            _this->hidden->audio_obj->Stop();
+            delete _this->hidden->audio_obj;
+            _this->hidden->audio_obj = NULL;
+        }
+
+        delete _this->hidden;
+        _this->hidden = NULL;
+    }
+}
+
+
+static const int sig_list[] = {
+    SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGWINCH, 0
+};
+
+static inline void
+MaskSignals(sigset_t * omask)
+{
+    sigset_t mask;
+    int i;
+
+    sigemptyset(&mask);
+    for (i = 0; sig_list[i]; ++i) {
+        sigaddset(&mask, sig_list[i]);
+    }
+    sigprocmask(SIG_BLOCK, &mask, omask);
+}
+
+static inline void
+UnmaskSignals(sigset_t * omask)
+{
+    sigprocmask(SIG_SETMASK, omask, NULL);
+}
+
+
+static int
+HAIKUAUDIO_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    int valid_datatype = 0;
+    media_raw_audio_format format;
+    SDL_AudioFormat test_format = SDL_FirstAudioFormat(_this->spec.format);
+
+    /* Initialize all variables that we clean on shutdown */
+    _this->hidden = new SDL_PrivateAudioData;
+    if (_this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(_this->hidden, 0, (sizeof *_this->hidden));
+
+    /* Parse the audio format and fill the Be raw audio format */
+    SDL_memset(&format, '\0', sizeof(media_raw_audio_format));
+    format.byte_order = B_MEDIA_LITTLE_ENDIAN;
+    format.frame_rate = (float) _this->spec.freq;
+    format.channel_count = _this->spec.channels;        /* !!! FIXME: support > 2? */
+    while ((!valid_datatype) && (test_format)) {
+        valid_datatype = 1;
+        _this->spec.format = test_format;
+        switch (test_format) {
+        case AUDIO_S8:
+            format.format = media_raw_audio_format::B_AUDIO_CHAR;
+            break;
+
+        case AUDIO_U8:
+            format.format = media_raw_audio_format::B_AUDIO_UCHAR;
+            break;
+
+        case AUDIO_S16LSB:
+            format.format = media_raw_audio_format::B_AUDIO_SHORT;
+            break;
+
+        case AUDIO_S16MSB:
+            format.format = media_raw_audio_format::B_AUDIO_SHORT;
+            format.byte_order = B_MEDIA_BIG_ENDIAN;
+            break;
+
+        case AUDIO_S32LSB:
+            format.format = media_raw_audio_format::B_AUDIO_INT;
+            break;
+
+        case AUDIO_S32MSB:
+            format.format = media_raw_audio_format::B_AUDIO_INT;
+            format.byte_order = B_MEDIA_BIG_ENDIAN;
+            break;
+
+        case AUDIO_F32LSB:
+            format.format = media_raw_audio_format::B_AUDIO_FLOAT;
+            break;
+
+        case AUDIO_F32MSB:
+            format.format = media_raw_audio_format::B_AUDIO_FLOAT;
+            format.byte_order = B_MEDIA_BIG_ENDIAN;
+            break;
+
+        default:
+            valid_datatype = 0;
+            test_format = SDL_NextAudioFormat();
+            break;
+        }
+    }
+
+    if (!valid_datatype) {      /* shouldn't happen, but just in case... */
+        HAIKUAUDIO_CloseDevice(_this);
+        return SDL_SetError("Unsupported audio format");
+    }
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&_this->spec);
+
+    format.buffer_size = _this->spec.size;
+
+    /* Subscribe to the audio stream (creates a new thread) */
+    sigset_t omask;
+    MaskSignals(&omask);
+    _this->hidden->audio_obj = new BSoundPlayer(&format, "SDL Audio",
+                                                FillSound, NULL, _this);
+    UnmaskSignals(&omask);
+
+    if (_this->hidden->audio_obj->Start() == B_NO_ERROR) {
+        _this->hidden->audio_obj->SetHasData(true);
+    } else {
+        HAIKUAUDIO_CloseDevice(_this);
+        return SDL_SetError("Unable to start Be audio");
+    }
+
+    /* We're running! */
+    return 0;
+}
+
+static void
+HAIKUAUDIO_Deinitialize(void)
+{
+    SDL_QuitBeApp();
+}
+
+static int
+HAIKUAUDIO_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Initialize the Be Application, if it's not already started */
+    if (SDL_InitBeApp() < 0) {
+        return 0;
+    }
+
+    /* Set the function pointers */
+    impl->OpenDevice = HAIKUAUDIO_OpenDevice;
+    impl->CloseDevice = HAIKUAUDIO_CloseDevice;
+    impl->Deinitialize = HAIKUAUDIO_Deinitialize;
+    impl->ProvidesOwnCallbackThread = 1;
+    impl->OnlyHasDefaultOutputDevice = 1;
+
+    return 1;   /* this audio target is available. */
+}
+
+extern "C"
+{
+    extern AudioBootStrap HAIKUAUDIO_bootstrap;
+}
+AudioBootStrap HAIKUAUDIO_bootstrap = {
+    "haiku", "Haiku BSoundPlayer", HAIKUAUDIO_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_HAIKU */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/haiku/SDL_haikuaudio.h b/Source/3rd Party/sdl/src/audio/haiku/SDL_haikuaudio.h
new file mode 100644
index 000000000..c6c019e9c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/haiku/SDL_haikuaudio.h	
@@ -0,0 +1,38 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_beaudio_h
+#define _SDL_beaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *_this
+
+struct SDL_PrivateAudioData
+{
+    BSoundPlayer *audio_obj;
+};
+
+#endif /* _SDL_beaudio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/nas/SDL_nasaudio.c b/Source/3rd Party/sdl/src/audio/nas/SDL_nasaudio.c
new file mode 100644
index 000000000..a41a480f2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/nas/SDL_nasaudio.c	
@@ -0,0 +1,397 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_NAS
+
+/* Allow access to a raw mixing buffer */
+
+#include <signal.h>
+#include <unistd.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "SDL_loadso.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_nasaudio.h"
+
+static struct SDL_PrivateAudioData *this2 = NULL;
+
+
+static void (*NAS_AuCloseServer) (AuServer *);
+static void (*NAS_AuNextEvent) (AuServer *, AuBool, AuEvent *);
+static AuBool(*NAS_AuDispatchEvent) (AuServer *, AuEvent *);
+static AuFlowID(*NAS_AuCreateFlow) (AuServer *, AuStatus *);
+static void (*NAS_AuStartFlow) (AuServer *, AuFlowID, AuStatus *);
+static void (*NAS_AuSetElements)
+  (AuServer *, AuFlowID, AuBool, int, AuElement *, AuStatus *);
+static void (*NAS_AuWriteElement)
+  (AuServer *, AuFlowID, int, AuUint32, AuPointer, AuBool, AuStatus *);
+static AuServer *(*NAS_AuOpenServer)
+  (_AuConst char *, int, _AuConst char *, int, _AuConst char *, char **);
+static AuEventHandlerRec *(*NAS_AuRegisterEventHandler)
+  (AuServer *, AuMask, int, AuID, AuEventHandlerCallback, AuPointer);
+
+
+#ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC
+
+static const char *nas_library = SDL_AUDIO_DRIVER_NAS_DYNAMIC;
+static void *nas_handle = NULL;
+
+static int
+load_nas_sym(const char *fn, void **addr)
+{
+    *addr = SDL_LoadFunction(nas_handle, fn);
+    if (*addr == NULL) {
+        return 0;
+    }
+    return 1;
+}
+
+/* cast funcs to char* first, to please GCC's strict aliasing rules. */
+#define SDL_NAS_SYM(x) \
+    if (!load_nas_sym(#x, (void **) (char *) &NAS_##x)) return -1
+#else
+#define SDL_NAS_SYM(x) NAS_##x = x
+#endif
+
+static int
+load_nas_syms(void)
+{
+    SDL_NAS_SYM(AuCloseServer);
+    SDL_NAS_SYM(AuNextEvent);
+    SDL_NAS_SYM(AuDispatchEvent);
+    SDL_NAS_SYM(AuCreateFlow);
+    SDL_NAS_SYM(AuStartFlow);
+    SDL_NAS_SYM(AuSetElements);
+    SDL_NAS_SYM(AuWriteElement);
+    SDL_NAS_SYM(AuOpenServer);
+    SDL_NAS_SYM(AuRegisterEventHandler);
+    return 0;
+}
+
+#undef SDL_NAS_SYM
+
+#ifdef SDL_AUDIO_DRIVER_NAS_DYNAMIC
+
+static void
+UnloadNASLibrary(void)
+{
+    if (nas_handle != NULL) {
+        SDL_UnloadObject(nas_handle);
+        nas_handle = NULL;
+    }
+}
+
+static int
+LoadNASLibrary(void)
+{
+    int retval = 0;
+    if (nas_handle == NULL) {
+        nas_handle = SDL_LoadObject(nas_library);
+        if (nas_handle == NULL) {
+            /* Copy error string so we can use it in a new SDL_SetError(). */
+            const char *origerr = SDL_GetError();
+            const size_t len = SDL_strlen(origerr) + 1;
+            char *err = (char *) alloca(len);
+            SDL_strlcpy(err, origerr, len);
+            retval = -1;
+            SDL_SetError("NAS: SDL_LoadObject('%s') failed: %s\n",
+                         nas_library, err);
+        } else {
+            retval = load_nas_syms();
+            if (retval < 0) {
+                UnloadNASLibrary();
+            }
+        }
+    }
+    return retval;
+}
+
+#else
+
+static void
+UnloadNASLibrary(void)
+{
+}
+
+static int
+LoadNASLibrary(void)
+{
+    load_nas_syms();
+    return 0;
+}
+
+#endif /* SDL_AUDIO_DRIVER_NAS_DYNAMIC */
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+NAS_WaitDevice(_THIS)
+{
+    while (this->hidden->buf_free < this->hidden->mixlen) {
+        AuEvent ev;
+        NAS_AuNextEvent(this->hidden->aud, AuTrue, &ev);
+        NAS_AuDispatchEvent(this->hidden->aud, &ev);
+    }
+}
+
+static void
+NAS_PlayDevice(_THIS)
+{
+    while (this->hidden->mixlen > this->hidden->buf_free) {
+        /*
+         * We think the buffer is full? Yikes! Ask the server for events,
+         *  in the hope that some of them is LowWater events telling us more
+         *  of the buffer is free now than what we think.
+         */
+        AuEvent ev;
+        NAS_AuNextEvent(this->hidden->aud, AuTrue, &ev);
+        NAS_AuDispatchEvent(this->hidden->aud, &ev);
+    }
+    this->hidden->buf_free -= this->hidden->mixlen;
+
+    /* Write the audio data */
+    NAS_AuWriteElement(this->hidden->aud, this->hidden->flow, 0,
+                       this->hidden->mixlen, this->hidden->mixbuf, AuFalse,
+                       NULL);
+
+    this->hidden->written += this->hidden->mixlen;
+
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Wrote %d bytes of audio data\n", this->hidden->mixlen);
+#endif
+}
+
+static Uint8 *
+NAS_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+static void
+NAS_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->aud) {
+            NAS_AuCloseServer(this->hidden->aud);
+            this->hidden->aud = 0;
+        }
+        SDL_free(this->hidden);
+        this2 = this->hidden = NULL;
+    }
+}
+
+static unsigned char
+sdlformat_to_auformat(unsigned int fmt)
+{
+    switch (fmt) {
+    case AUDIO_U8:
+        return AuFormatLinearUnsigned8;
+    case AUDIO_S8:
+        return AuFormatLinearSigned8;
+    case AUDIO_U16LSB:
+        return AuFormatLinearUnsigned16LSB;
+    case AUDIO_U16MSB:
+        return AuFormatLinearUnsigned16MSB;
+    case AUDIO_S16LSB:
+        return AuFormatLinearSigned16LSB;
+    case AUDIO_S16MSB:
+        return AuFormatLinearSigned16MSB;
+    }
+    return AuNone;
+}
+
+static AuBool
+event_handler(AuServer * aud, AuEvent * ev, AuEventHandlerRec * hnd)
+{
+    switch (ev->type) {
+    case AuEventTypeElementNotify:
+        {
+            AuElementNotifyEvent *event = (AuElementNotifyEvent *) ev;
+
+            switch (event->kind) {
+            case AuElementNotifyKindLowWater:
+                if (this2->buf_free >= 0) {
+                    this2->really += event->num_bytes;
+                    gettimeofday(&this2->last_tv, 0);
+                    this2->buf_free += event->num_bytes;
+                } else {
+                    this2->buf_free = event->num_bytes;
+                }
+                break;
+            case AuElementNotifyKindState:
+                switch (event->cur_state) {
+                case AuStatePause:
+                    if (event->reason != AuReasonUser) {
+                        if (this2->buf_free >= 0) {
+                            this2->really += event->num_bytes;
+                            gettimeofday(&this2->last_tv, 0);
+                            this2->buf_free += event->num_bytes;
+                        } else {
+                            this2->buf_free = event->num_bytes;
+                        }
+                    }
+                    break;
+                }
+            }
+        }
+    }
+    return AuTrue;
+}
+
+static AuDeviceID
+find_device(_THIS, int nch)
+{
+    /* These "Au" things are all macros, not functions... */
+    int i;
+    for (i = 0; i < AuServerNumDevices(this->hidden->aud); i++) {
+        if ((AuDeviceKind(AuServerDevice(this->hidden->aud, i)) ==
+             AuComponentKindPhysicalOutput) &&
+            AuDeviceNumTracks(AuServerDevice(this->hidden->aud, i)) == nch) {
+            return AuDeviceIdentifier(AuServerDevice(this->hidden->aud, i));
+        }
+    }
+    return AuNone;
+}
+
+static int
+NAS_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    AuElement elms[3];
+    int buffer_size;
+    SDL_AudioFormat test_format, format;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Try for a closest match on audio format */
+    format = 0;
+    for (test_format = SDL_FirstAudioFormat(this->spec.format);
+         !format && test_format;) {
+        format = sdlformat_to_auformat(test_format);
+        if (format == AuNone) {
+            test_format = SDL_NextAudioFormat();
+        }
+    }
+    if (format == 0) {
+        NAS_CloseDevice(this);
+        return SDL_SetError("NAS: Couldn't find any hardware audio formats");
+    }
+    this->spec.format = test_format;
+
+    this->hidden->aud = NAS_AuOpenServer("", 0, NULL, 0, NULL, NULL);
+    if (this->hidden->aud == 0) {
+        NAS_CloseDevice(this);
+        return SDL_SetError("NAS: Couldn't open connection to NAS server");
+    }
+
+    this->hidden->dev = find_device(this, this->spec.channels);
+    if ((this->hidden->dev == AuNone)
+        || (!(this->hidden->flow = NAS_AuCreateFlow(this->hidden->aud, 0)))) {
+        NAS_CloseDevice(this);
+        return SDL_SetError("NAS: Couldn't find a fitting device on NAS server");
+    }
+
+    buffer_size = this->spec.freq;
+    if (buffer_size < 4096)
+        buffer_size = 4096;
+
+    if (buffer_size > 32768)
+        buffer_size = 32768;    /* So that the buffer won't get unmanageably big. */
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    this2 = this->hidden;
+
+    AuMakeElementImportClient(elms, this->spec.freq, format,
+                              this->spec.channels, AuTrue, buffer_size,
+                              buffer_size / 4, 0, NULL);
+    AuMakeElementExportDevice(elms + 1, 0, this->hidden->dev, this->spec.freq,
+                              AuUnlimitedSamples, 0, NULL);
+    NAS_AuSetElements(this->hidden->aud, this->hidden->flow, AuTrue, 2, elms,
+                      NULL);
+    NAS_AuRegisterEventHandler(this->hidden->aud, AuEventHandlerIDMask, 0,
+                               this->hidden->flow, event_handler,
+                               (AuPointer) NULL);
+
+    NAS_AuStartFlow(this->hidden->aud, this->hidden->flow, NULL);
+
+    /* Allocate mixing buffer */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        NAS_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+static void
+NAS_Deinitialize(void)
+{
+    UnloadNASLibrary();
+}
+
+static int
+NAS_Init(SDL_AudioDriverImpl * impl)
+{
+    if (LoadNASLibrary() < 0) {
+        return 0;
+    } else {
+        AuServer *aud = NAS_AuOpenServer("", 0, NULL, 0, NULL, NULL);
+        if (aud == NULL) {
+            SDL_SetError("NAS: AuOpenServer() failed (no audio server?)");
+            return 0;
+        }
+        NAS_AuCloseServer(aud);
+    }
+
+    /* Set the function pointers */
+    impl->OpenDevice = NAS_OpenDevice;
+    impl->PlayDevice = NAS_PlayDevice;
+    impl->WaitDevice = NAS_WaitDevice;
+    impl->GetDeviceBuf = NAS_GetDeviceBuf;
+    impl->CloseDevice = NAS_CloseDevice;
+    impl->Deinitialize = NAS_Deinitialize;
+    impl->OnlyHasDefaultOutputDevice = 1;       /* !!! FIXME: is this true? */
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap NAS_bootstrap = {
+    "nas", "Network Audio System", NAS_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_NAS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/nas/SDL_nasaudio.h b/Source/3rd Party/sdl/src/audio/nas/SDL_nasaudio.h
new file mode 100644
index 000000000..e1ee6a521
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/nas/SDL_nasaudio.h	
@@ -0,0 +1,56 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_nasaudio_h
+#define _SDL_nasaudio_h
+
+#ifdef __sgi
+#include <nas/audiolib.h>
+#else
+#include <audio/audiolib.h>
+#endif
+#include <sys/time.h>
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    AuServer *aud;
+    AuFlowID flow;
+    AuDeviceID dev;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+
+    int written;
+    int really;
+    int bps;
+    struct timeval last_tv;
+    int buf_free;
+};
+#endif /* _SDL_nasaudio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/paudio/SDL_paudio.c b/Source/3rd Party/sdl/src/audio/paudio/SDL_paudio.c
new file mode 100644
index 000000000..032d8d2cd
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/paudio/SDL_paudio.c	
@@ -0,0 +1,541 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_PAUDIO
+
+/* Allow access to a raw mixing buffer */
+
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "SDL_stdinc.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_paudio.h"
+
+#define DEBUG_AUDIO 0
+
+/* A conflict within AIX 4.3.3 <sys/> headers and probably others as well.
+ * I guess nobody ever uses audio... Shame over AIX header files.  */
+#include <sys/machine.h>
+#undef BIG_ENDIAN
+#include <sys/audio.h>
+
+/* Open the audio device for playback, and don't block if busy */
+/* #define OPEN_FLAGS   (O_WRONLY|O_NONBLOCK) */
+#define OPEN_FLAGS  O_WRONLY
+
+/* Get the name of the audio device we use for output */
+
+#ifndef _PATH_DEV_DSP
+#define _PATH_DEV_DSP   "/dev/%caud%c/%c"
+#endif
+
+static char devsettings[][3] = {
+    {'p', '0', '1'}, {'p', '0', '2'}, {'p', '0', '3'}, {'p', '0', '4'},
+    {'p', '1', '1'}, {'p', '1', '2'}, {'p', '1', '3'}, {'p', '1', '4'},
+    {'p', '2', '1'}, {'p', '2', '2'}, {'p', '2', '3'}, {'p', '2', '4'},
+    {'p', '3', '1'}, {'p', '3', '2'}, {'p', '3', '3'}, {'p', '3', '4'},
+    {'b', '0', '1'}, {'b', '0', '2'}, {'b', '0', '3'}, {'b', '0', '4'},
+    {'b', '1', '1'}, {'b', '1', '2'}, {'b', '1', '3'}, {'b', '1', '4'},
+    {'b', '2', '1'}, {'b', '2', '2'}, {'b', '2', '3'}, {'b', '2', '4'},
+    {'b', '3', '1'}, {'b', '3', '2'}, {'b', '3', '3'}, {'b', '3', '4'},
+    {'\0', '\0', '\0'}
+};
+
+static int
+OpenUserDefinedDevice(char *path, int maxlen, int flags)
+{
+    const char *audiodev;
+    int fd;
+
+    /* Figure out what our audio device is */
+    if ((audiodev = SDL_getenv("SDL_PATH_DSP")) == NULL) {
+        audiodev = SDL_getenv("AUDIODEV");
+    }
+    if (audiodev == NULL) {
+        return -1;
+    }
+    fd = open(audiodev, flags, 0);
+    if (path != NULL) {
+        SDL_strlcpy(path, audiodev, maxlen);
+        path[maxlen - 1] = '\0';
+    }
+    return fd;
+}
+
+static int
+OpenAudioPath(char *path, int maxlen, int flags, int classic)
+{
+    struct stat sb;
+    int cycle = 0;
+    int fd = OpenUserDefinedDevice(path, maxlen, flags);
+
+    if (fd != -1) {
+        return fd;
+    }
+
+    /* !!! FIXME: do we really need a table here? */
+    while (devsettings[cycle][0] != '\0') {
+        char audiopath[1024];
+        SDL_snprintf(audiopath, SDL_arraysize(audiopath),
+                     _PATH_DEV_DSP,
+                     devsettings[cycle][0],
+                     devsettings[cycle][1], devsettings[cycle][2]);
+
+        if (stat(audiopath, &sb) == 0) {
+            fd = open(audiopath, flags, 0);
+            if (fd > 0) {
+                if (path != NULL) {
+                    SDL_strlcpy(path, audiopath, maxlen);
+                }
+                return fd;
+            }
+        }
+    }
+    return -1;
+}
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+PAUDIO_WaitDevice(_THIS)
+{
+    fd_set fdset;
+
+    /* See if we need to use timed audio synchronization */
+    if (this->hidden->frame_ticks) {
+        /* Use timer for general audio synchronization */
+        Sint32 ticks;
+
+        ticks = ((Sint32) (this->hidden->next_frame - SDL_GetTicks())) - FUDGE_TICKS;
+        if (ticks > 0) {
+            SDL_Delay(ticks);
+        }
+    } else {
+        audio_buffer paud_bufinfo;
+
+        /* Use select() for audio synchronization */
+        struct timeval timeout;
+        FD_ZERO(&fdset);
+        FD_SET(this->hidden->audio_fd, &fdset);
+
+        if (ioctl(this->hidden->audio_fd, AUDIO_BUFFER, &paud_bufinfo) < 0) {
+#ifdef DEBUG_AUDIO
+            fprintf(stderr, "Couldn't get audio buffer information\n");
+#endif
+            timeout.tv_sec = 10;
+            timeout.tv_usec = 0;
+        } else {
+            long ms_in_buf = paud_bufinfo.write_buf_time;
+            timeout.tv_sec = ms_in_buf / 1000;
+            ms_in_buf = ms_in_buf - timeout.tv_sec * 1000;
+            timeout.tv_usec = ms_in_buf * 1000;
+#ifdef DEBUG_AUDIO
+            fprintf(stderr,
+                    "Waiting for write_buf_time=%ld,%ld\n",
+                    timeout.tv_sec, timeout.tv_usec);
+#endif
+        }
+
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Waiting for audio to get ready\n");
+#endif
+        if (select(this->hidden->audio_fd + 1, NULL, &fdset, NULL, &timeout)
+            <= 0) {
+            const char *message =
+                "Audio timeout - buggy audio driver? (disabled)";
+            /*
+             * In general we should never print to the screen,
+             * but in this case we have no other way of letting
+             * the user know what happened.
+             */
+            fprintf(stderr, "SDL: %s - %s\n", strerror(errno), message);
+            this->enabled = 0;
+            /* Don't try to close - may hang */
+            this->hidden->audio_fd = -1;
+#ifdef DEBUG_AUDIO
+            fprintf(stderr, "Done disabling audio\n");
+#endif
+        }
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Ready!\n");
+#endif
+    }
+}
+
+static void
+PAUDIO_PlayDevice(_THIS)
+{
+    int written = 0;
+    const Uint8 *mixbuf = this->hidden->mixbuf;
+    const size_t mixlen = this->hidden->mixlen;
+
+    /* Write the audio data, checking for EAGAIN on broken audio drivers */
+    do {
+        written = write(this->hidden->audio_fd, mixbuf, mixlen);
+        if ((written < 0) && ((errno == 0) || (errno == EAGAIN))) {
+            SDL_Delay(1);       /* Let a little CPU time go by */
+        }
+    } while ((written < 0) &&
+             ((errno == 0) || (errno == EAGAIN) || (errno == EINTR)));
+
+    /* If timer synchronization is enabled, set the next write frame */
+    if (this->hidden->frame_ticks) {
+        this->hidden->next_frame += this->hidden->frame_ticks;
+    }
+
+    /* If we couldn't write, assume fatal error for now */
+    if (written < 0) {
+        this->enabled = 0;
+    }
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Wrote %d bytes of audio data\n", written);
+#endif
+}
+
+static Uint8 *
+PAUDIO_GetDeviceBuf(_THIS)
+{
+    return this->hidden->mixbuf;
+}
+
+static void
+PAUDIO_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->audio_fd >= 0) {
+            close(this->hidden->audio_fd);
+            this->hidden->audio_fd = -1;
+        }
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static int
+PAUDIO_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    const char *workaround = SDL_getenv("SDL_DSP_NOSELECT");
+    char audiodev[1024];
+    const char *err = NULL;
+    int format;
+    int bytes_per_sample;
+    SDL_AudioFormat test_format;
+    audio_init paud_init;
+    audio_buffer paud_bufinfo;
+    audio_status paud_status;
+    audio_control paud_control;
+    audio_change paud_change;
+    int fd = -1;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Open the audio device */
+    fd = OpenAudioPath(audiodev, sizeof(audiodev), OPEN_FLAGS, 0);
+    this->hidden->audio_fd = fd;
+    if (fd < 0) {
+        PAUDIO_CloseDevice(this);
+        return SDL_SetError("Couldn't open %s: %s", audiodev, strerror(errno));
+    }
+
+    /*
+     * We can't set the buffer size - just ask the device for the maximum
+     * that we can have.
+     */
+    if (ioctl(fd, AUDIO_BUFFER, &paud_bufinfo) < 0) {
+        PAUDIO_CloseDevice(this);
+        return SDL_SetError("Couldn't get audio buffer information");
+    }
+
+    if (this->spec.channels > 1)
+        this->spec.channels = 2;
+    else
+        this->spec.channels = 1;
+
+    /*
+     * Fields in the audio_init structure:
+     *
+     * Ignored by us:
+     *
+     * paud.loadpath[LOAD_PATH]; * DSP code to load, MWave chip only?
+     * paud.slot_number;         * slot number of the adapter
+     * paud.device_id;           * adapter identification number
+     *
+     * Input:
+     *
+     * paud.srate;           * the sampling rate in Hz
+     * paud.bits_per_sample; * 8, 16, 32, ...
+     * paud.bsize;           * block size for this rate
+     * paud.mode;            * ADPCM, PCM, MU_LAW, A_LAW, SOURCE_MIX
+     * paud.channels;        * 1=mono, 2=stereo
+     * paud.flags;           * FIXED - fixed length data
+     *                       * LEFT_ALIGNED, RIGHT_ALIGNED (var len only)
+     *                       * TWOS_COMPLEMENT - 2's complement data
+     *                       * SIGNED - signed? comment seems wrong in sys/audio.h
+     *                       * BIG_ENDIAN
+     * paud.operation;       * PLAY, RECORD
+     *
+     * Output:
+     *
+     * paud.flags;           * PITCH            - pitch is supported
+     *                       * INPUT            - input is supported
+     *                       * OUTPUT           - output is supported
+     *                       * MONITOR          - monitor is supported
+     *                       * VOLUME           - volume is supported
+     *                       * VOLUME_DELAY     - volume delay is supported
+     *                       * BALANCE          - balance is supported
+     *                       * BALANCE_DELAY    - balance delay is supported
+     *                       * TREBLE           - treble control is supported
+     *                       * BASS             - bass control is supported
+     *                       * BESTFIT_PROVIDED - best fit returned
+     *                       * LOAD_CODE        - DSP load needed
+     * paud.rc;              * NO_PLAY         - DSP code can't do play requests
+     *                       * NO_RECORD       - DSP code can't do record requests
+     *                       * INVALID_REQUEST - request was invalid
+     *                       * CONFLICT        - conflict with open's flags
+     *                       * OVERLOADED      - out of DSP MIPS or memory
+     * paud.position_resolution; * smallest increment for position
+     */
+
+    paud_init.srate = this->spec.freq;
+    paud_init.mode = PCM;
+    paud_init.operation = PLAY;
+    paud_init.channels = this->spec.channels;
+
+    /* Try for a closest match on audio format */
+    format = 0;
+    for (test_format = SDL_FirstAudioFormat(this->spec.format);
+         !format && test_format;) {
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Trying format 0x%4.4x\n", test_format);
+#endif
+        switch (test_format) {
+        case AUDIO_U8:
+            bytes_per_sample = 1;
+            paud_init.bits_per_sample = 8;
+            paud_init.flags = TWOS_COMPLEMENT | FIXED;
+            format = 1;
+            break;
+        case AUDIO_S8:
+            bytes_per_sample = 1;
+            paud_init.bits_per_sample = 8;
+            paud_init.flags = SIGNED | TWOS_COMPLEMENT | FIXED;
+            format = 1;
+            break;
+        case AUDIO_S16LSB:
+            bytes_per_sample = 2;
+            paud_init.bits_per_sample = 16;
+            paud_init.flags = SIGNED | TWOS_COMPLEMENT | FIXED;
+            format = 1;
+            break;
+        case AUDIO_S16MSB:
+            bytes_per_sample = 2;
+            paud_init.bits_per_sample = 16;
+            paud_init.flags = BIG_ENDIAN | SIGNED | TWOS_COMPLEMENT | FIXED;
+            format = 1;
+            break;
+        case AUDIO_U16LSB:
+            bytes_per_sample = 2;
+            paud_init.bits_per_sample = 16;
+            paud_init.flags = TWOS_COMPLEMENT | FIXED;
+            format = 1;
+            break;
+        case AUDIO_U16MSB:
+            bytes_per_sample = 2;
+            paud_init.bits_per_sample = 16;
+            paud_init.flags = BIG_ENDIAN | TWOS_COMPLEMENT | FIXED;
+            format = 1;
+            break;
+        default:
+            break;
+        }
+        if (!format) {
+            test_format = SDL_NextAudioFormat();
+        }
+    }
+    if (format == 0) {
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Couldn't find any hardware audio formats\n");
+#endif
+        PAUDIO_CloseDevice(this);
+        return SDL_SetError("Couldn't find any hardware audio formats");
+    }
+    this->spec.format = test_format;
+
+    /*
+     * We know the buffer size and the max number of subsequent writes
+     *  that can be pending. If more than one can pend, allow the application
+     *  to do something like double buffering between our write buffer and
+     *  the device's own buffer that we are filling with write() anyway.
+     *
+     * We calculate this->spec.samples like this because
+     *  SDL_CalculateAudioSpec() will give put paud_bufinfo.write_buf_cap
+     *  (or paud_bufinfo.write_buf_cap/2) into this->spec.size in return.
+     */
+    if (paud_bufinfo.request_buf_cap == 1) {
+        this->spec.samples = paud_bufinfo.write_buf_cap
+            / bytes_per_sample / this->spec.channels;
+    } else {
+        this->spec.samples = paud_bufinfo.write_buf_cap
+            / bytes_per_sample / this->spec.channels / 2;
+    }
+    paud_init.bsize = bytes_per_sample * this->spec.channels;
+
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /*
+     * The AIX paud device init can't modify the values of the audio_init
+     * structure that we pass to it. So we don't need any recalculation
+     * of this stuff and no reinit call as in linux dsp code.
+     *
+     * /dev/paud supports all of the encoding formats, so we don't need
+     * to do anything like reopening the device, either.
+     */
+    if (ioctl(fd, AUDIO_INIT, &paud_init) < 0) {
+        switch (paud_init.rc) {
+        case 1:
+            err = "Couldn't set audio format: DSP can't do play requests";
+            break;
+        case 2:
+            err = "Couldn't set audio format: DSP can't do record requests";
+            break;
+        case 4:
+            err = "Couldn't set audio format: request was invalid";
+            break;
+        case 5:
+            err = "Couldn't set audio format: conflict with open's flags";
+            break;
+        case 6:
+            err = "Couldn't set audio format: out of DSP MIPS or memory";
+            break;
+        default:
+            err = "Couldn't set audio format: not documented in sys/audio.h";
+            break;
+        }
+    }
+
+    if (err != NULL) {
+        PAUDIO_CloseDevice(this);
+        return SDL_SetError("Paudio: %s", err);
+    }
+
+    /* Allocate mixing buffer */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        PAUDIO_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+
+    /*
+     * Set some paramters: full volume, first speaker that we can find.
+     * Ignore the other settings for now.
+     */
+    paud_change.input = AUDIO_IGNORE;   /* the new input source */
+    paud_change.output = OUTPUT_1;      /* EXTERNAL_SPEAKER,INTERNAL_SPEAKER,OUTPUT_1 */
+    paud_change.monitor = AUDIO_IGNORE; /* the new monitor state */
+    paud_change.volume = 0x7fffffff;    /* volume level [0-0x7fffffff] */
+    paud_change.volume_delay = AUDIO_IGNORE;    /* the new volume delay */
+    paud_change.balance = 0x3fffffff;   /* the new balance */
+    paud_change.balance_delay = AUDIO_IGNORE;   /* the new balance delay */
+    paud_change.treble = AUDIO_IGNORE;  /* the new treble state */
+    paud_change.bass = AUDIO_IGNORE;    /* the new bass state */
+    paud_change.pitch = AUDIO_IGNORE;   /* the new pitch state */
+
+    paud_control.ioctl_request = AUDIO_CHANGE;
+    paud_control.request_info = (char *) &paud_change;
+    if (ioctl(fd, AUDIO_CONTROL, &paud_control) < 0) {
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Can't change audio display settings\n");
+#endif
+    }
+
+    /*
+     * Tell the device to expect data. Actual start will wait for
+     * the first write() call.
+     */
+    paud_control.ioctl_request = AUDIO_START;
+    paud_control.position = 0;
+    if (ioctl(fd, AUDIO_CONTROL, &paud_control) < 0) {
+        PAUDIO_CloseDevice(this);
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Can't start audio play\n");
+#endif
+        return SDL_SetError("Can't start audio play");
+    }
+
+    /* Check to see if we need to use select() workaround */
+    if (workaround != NULL) {
+        this->hidden->frame_ticks = (float) (this->spec.samples * 1000) /
+            this->spec.freq;
+        this->hidden->next_frame = SDL_GetTicks() + this->hidden->frame_ticks;
+    }
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+static int
+PAUDIO_Init(SDL_AudioDriverImpl * impl)
+{
+    /* !!! FIXME: not right for device enum? */
+    int fd = OpenAudioPath(NULL, 0, OPEN_FLAGS, 0);
+    if (fd < 0) {
+        SDL_SetError("PAUDIO: Couldn't open audio device");
+        return 0;
+    }
+    close(fd);
+
+    /* Set the function pointers */
+    impl->OpenDevice = DSP_OpenDevice;
+    impl->PlayDevice = DSP_PlayDevice;
+    impl->PlayDevice = DSP_WaitDevice;
+    impl->GetDeviceBuf = DSP_GetDeviceBuf;
+    impl->CloseDevice = DSP_CloseDevice;
+    impl->OnlyHasDefaultOutputDevice = 1;       /* !!! FIXME: add device enum! */
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap PAUDIO_bootstrap = {
+    "paud", "AIX Paudio", PAUDIO_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_PAUDIO */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/paudio/SDL_paudio.h b/Source/3rd Party/sdl/src/audio/paudio/SDL_paudio.h
new file mode 100644
index 000000000..5a1a64884
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/paudio/SDL_paudio.h	
@@ -0,0 +1,47 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_paudaudio_h
+#define _SDL_paudaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The file descriptor for the audio device */
+    int audio_fd;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+
+    /* Support for audio timing using a timer, in addition to select() */
+    float frame_ticks;
+    float next_frame;
+};
+#define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
+
+#endif /* _SDL_paudaudio_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/psp/SDL_pspaudio.c b/Source/3rd Party/sdl/src/audio/psp/SDL_pspaudio.c
new file mode 100644
index 000000000..5b1705926
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/psp/SDL_pspaudio.c	
@@ -0,0 +1,195 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <malloc.h>
+
+#include "SDL_audio.h"
+#include "SDL_error.h"
+#include "SDL_timer.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
+#include "../SDL_sysaudio.h"
+#include "SDL_pspaudio.h"
+
+#include <pspaudio.h>
+#include <pspthreadman.h>
+
+/* The tag name used by PSP audio */
+#define PSPAUD_DRIVER_NAME         "psp"
+
+static int
+PSPAUD_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    int format, mixlen, i;
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc(sizeof(*this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, sizeof(*this->hidden));
+    switch (this->spec.format & 0xff) {
+        case 8:
+        case 16:
+            this->spec.format = AUDIO_S16LSB;
+            break;
+        default:
+            return SDL_SetError("Unsupported audio format");
+    }
+
+    /* The sample count must be a multiple of 64. */
+    this->spec.samples = PSP_AUDIO_SAMPLE_ALIGN(this->spec.samples);
+    this->spec.freq = 44100;
+
+    /* Update the fragment size as size in bytes. */
+/*  SDL_CalculateAudioSpec(this->spec); MOD */
+    switch (this->spec.format) {
+    case AUDIO_U8:
+        this->spec.silence = 0x80;
+        break;
+    default:
+        this->spec.silence = 0x00;
+        break;
+    }
+    this->spec.size = SDL_AUDIO_BITSIZE(this->spec.format) / 8;
+    this->spec.size *= this->spec.channels;
+    this->spec.size *= this->spec.samples;
+
+/* ========================================== */
+
+    /* Allocate the mixing buffer.  Its size and starting address must
+       be a multiple of 64 bytes.  Our sample count is already a multiple of
+       64, so spec->size should be a multiple of 64 as well. */
+    mixlen = this->spec.size * NUM_BUFFERS;
+    this->hidden->rawbuf = (Uint8 *) memalign(64, mixlen);
+    if (this->hidden->rawbuf == NULL) {
+        return SDL_SetError("Couldn't allocate mixing buffer");
+    }
+
+    /* Setup the hardware channel. */
+    if (this->spec.channels == 1) {
+        format = PSP_AUDIO_FORMAT_MONO;
+    } else {
+        format = PSP_AUDIO_FORMAT_STEREO;
+    }
+    this->hidden->channel = sceAudioChReserve(PSP_AUDIO_NEXT_CHANNEL, this->spec.samples, format);
+    if (this->hidden->channel < 0) {
+        free(this->hidden->rawbuf);
+        this->hidden->rawbuf = NULL;
+        return SDL_SetError("Couldn't reserve hardware channel");
+    }
+
+    memset(this->hidden->rawbuf, 0, mixlen);
+    for (i = 0; i < NUM_BUFFERS; i++) {
+        this->hidden->mixbufs[i] = &this->hidden->rawbuf[i * this->spec.size];
+    }
+
+    this->hidden->next_buffer = 0;
+    return 0;
+}
+
+static void PSPAUD_PlayDevice(_THIS)
+{
+    Uint8 *mixbuf = this->hidden->mixbufs[this->hidden->next_buffer];
+
+    if (this->spec.channels == 1) {
+        sceAudioOutputBlocking(this->hidden->channel, PSP_AUDIO_VOLUME_MAX, mixbuf);
+    } else {
+        sceAudioOutputPannedBlocking(this->hidden->channel, PSP_AUDIO_VOLUME_MAX, PSP_AUDIO_VOLUME_MAX, mixbuf);
+    }
+
+    this->hidden->next_buffer = (this->hidden->next_buffer + 1) % NUM_BUFFERS;
+}
+
+/* This function waits until it is possible to write a full sound buffer */
+static void PSPAUD_WaitDevice(_THIS)
+{
+    /* Because we block when sending audio, there's no need for this function to do anything. */
+}
+static Uint8 *PSPAUD_GetDeviceBuf(_THIS)
+{
+    return this->hidden->mixbufs[this->hidden->next_buffer];
+}
+
+static void PSPAUD_CloseDevice(_THIS)
+{
+    if (this->hidden->channel >= 0) {
+        sceAudioChRelease(this->hidden->channel);
+        this->hidden->channel = -1;
+    }
+
+    if (this->hidden->rawbuf != NULL) {
+        free(this->hidden->rawbuf);
+        this->hidden->rawbuf = NULL;
+    }
+}
+static void PSPAUD_ThreadInit(_THIS)
+{
+    /* Increase the priority of this audio thread by 1 to put it
+       ahead of other SDL threads. */
+    SceUID thid;
+    SceKernelThreadInfo status;
+    thid = sceKernelGetThreadId();
+    status.size = sizeof(SceKernelThreadInfo);
+    if (sceKernelReferThreadStatus(thid, &status) == 0) {
+        sceKernelChangeThreadPriority(thid, status.currentPriority - 1);
+    }
+}
+
+
+static int
+PSPAUD_Init(SDL_AudioDriverImpl * impl)
+{
+
+    /* Set the function pointers */
+    impl->OpenDevice = PSPAUD_OpenDevice;
+    impl->PlayDevice = PSPAUD_PlayDevice;
+    impl->WaitDevice = PSPAUD_WaitDevice;
+    impl->GetDeviceBuf = PSPAUD_GetDeviceBuf;
+    impl->WaitDone = PSPAUD_WaitDevice;
+    impl->CloseDevice = PSPAUD_CloseDevice;
+    impl->ThreadInit = PSPAUD_ThreadInit;
+
+    /* PSP audio device */
+    impl->OnlyHasDefaultOutputDevice = 1;
+/*
+    impl->HasCaptureSupport = 1;
+
+    impl->OnlyHasDefaultInputDevice = 1;
+*/
+    /*
+    impl->DetectDevices = DSOUND_DetectDevices;
+    impl->Deinitialize = DSOUND_Deinitialize;
+    */
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap PSPAUD_bootstrap = {
+    "psp", "PSP audio driver", PSPAUD_Init, 0
+};
+
+ /* SDL_AUDI */
+
+
+
diff --git a/Source/3rd Party/sdl/src/audio/psp/SDL_pspaudio.h b/Source/3rd Party/sdl/src/audio/psp/SDL_pspaudio.h
new file mode 100644
index 000000000..8e420f313
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/psp/SDL_pspaudio.h	
@@ -0,0 +1,45 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_pspaudio_h
+#define _SDL_pspaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the video functions */
+#define _THIS   SDL_AudioDevice *this
+
+#define NUM_BUFFERS 2
+
+struct SDL_PrivateAudioData {
+    /* The hardware output channel. */
+    int     channel;
+    /* The raw allocated mixing buffer. */
+    Uint8   *rawbuf;
+    /* Individual mixing buffers. */
+    Uint8   *mixbufs[NUM_BUFFERS];
+    /* Index of the next available mixing buffer. */
+    int     next_buffer;
+};
+
+#endif /* _SDL_pspaudio_h */
+/* vim: ts=4 sw=4
+ */
diff --git a/Source/3rd Party/sdl/src/audio/pulseaudio/SDL_pulseaudio.c b/Source/3rd Party/sdl/src/audio/pulseaudio/SDL_pulseaudio.c
new file mode 100644
index 000000000..c3e1238b4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/pulseaudio/SDL_pulseaudio.c	
@@ -0,0 +1,554 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  The PulseAudio target for SDL 1.3 is based on the 1.3 arts target, with
+   the appropriate parts replaced with the 1.2 PulseAudio target code. This
+   was the cleanest way to move it to 1.3. The 1.2 target was written by
+   Stéphan Kochen: stephan .a.t. kochen.nl
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_PULSEAUDIO
+
+/* Allow access to a raw mixing buffer */
+
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#include <unistd.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/simple.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_pulseaudio.h"
+#include "SDL_loadso.h"
+
+#if (PA_API_VERSION < 12)
+/** Return non-zero if the passed state is one of the connected states */
+static SDL_INLINE int PA_CONTEXT_IS_GOOD(pa_context_state_t x) {
+    return
+        x == PA_CONTEXT_CONNECTING ||
+        x == PA_CONTEXT_AUTHORIZING ||
+        x == PA_CONTEXT_SETTING_NAME ||
+        x == PA_CONTEXT_READY;
+}
+/** Return non-zero if the passed state is one of the connected states */
+static SDL_INLINE int PA_STREAM_IS_GOOD(pa_stream_state_t x) {
+    return
+        x == PA_STREAM_CREATING ||
+        x == PA_STREAM_READY;
+}
+#endif /* pulseaudio <= 0.9.10 */
+
+
+static const char *(*PULSEAUDIO_pa_get_library_version) (void);
+static pa_simple *(*PULSEAUDIO_pa_simple_new) (const char *, const char *,
+    pa_stream_direction_t, const char *, const char *, const pa_sample_spec *,
+    const pa_channel_map *, const pa_buffer_attr *, int *);
+static void (*PULSEAUDIO_pa_simple_free) (pa_simple *);
+static pa_channel_map *(*PULSEAUDIO_pa_channel_map_init_auto) (
+    pa_channel_map *, unsigned, pa_channel_map_def_t);
+static const char * (*PULSEAUDIO_pa_strerror) (int);
+static pa_mainloop * (*PULSEAUDIO_pa_mainloop_new) (void);
+static pa_mainloop_api * (*PULSEAUDIO_pa_mainloop_get_api) (pa_mainloop *);
+static int (*PULSEAUDIO_pa_mainloop_iterate) (pa_mainloop *, int, int *);
+static void (*PULSEAUDIO_pa_mainloop_free) (pa_mainloop *);
+
+static pa_operation_state_t (*PULSEAUDIO_pa_operation_get_state) (
+    pa_operation *);
+static void (*PULSEAUDIO_pa_operation_cancel) (pa_operation *);
+static void (*PULSEAUDIO_pa_operation_unref) (pa_operation *);
+
+static pa_context * (*PULSEAUDIO_pa_context_new) (pa_mainloop_api *,
+    const char *);
+static int (*PULSEAUDIO_pa_context_connect) (pa_context *, const char *,
+    pa_context_flags_t, const pa_spawn_api *);
+static pa_context_state_t (*PULSEAUDIO_pa_context_get_state) (pa_context *);
+static void (*PULSEAUDIO_pa_context_disconnect) (pa_context *);
+static void (*PULSEAUDIO_pa_context_unref) (pa_context *);
+
+static pa_stream * (*PULSEAUDIO_pa_stream_new) (pa_context *, const char *,
+    const pa_sample_spec *, const pa_channel_map *);
+static int (*PULSEAUDIO_pa_stream_connect_playback) (pa_stream *, const char *,
+    const pa_buffer_attr *, pa_stream_flags_t, pa_cvolume *, pa_stream *);
+static pa_stream_state_t (*PULSEAUDIO_pa_stream_get_state) (pa_stream *);
+static size_t (*PULSEAUDIO_pa_stream_writable_size) (pa_stream *);
+static int (*PULSEAUDIO_pa_stream_write) (pa_stream *, const void *, size_t,
+    pa_free_cb_t, int64_t, pa_seek_mode_t);
+static pa_operation * (*PULSEAUDIO_pa_stream_drain) (pa_stream *,
+    pa_stream_success_cb_t, void *);
+static int (*PULSEAUDIO_pa_stream_disconnect) (pa_stream *);
+static void (*PULSEAUDIO_pa_stream_unref) (pa_stream *);
+
+static int load_pulseaudio_syms(void);
+
+
+#ifdef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
+
+static const char *pulseaudio_library = SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC;
+static void *pulseaudio_handle = NULL;
+
+static int
+load_pulseaudio_sym(const char *fn, void **addr)
+{
+    *addr = SDL_LoadFunction(pulseaudio_handle, fn);
+    if (*addr == NULL) {
+        /* Don't call SDL_SetError(): SDL_LoadFunction already did. */
+        return 0;
+    }
+
+    return 1;
+}
+
+/* cast funcs to char* first, to please GCC's strict aliasing rules. */
+#define SDL_PULSEAUDIO_SYM(x) \
+    if (!load_pulseaudio_sym(#x, (void **) (char *) &PULSEAUDIO_##x)) return -1
+
+static void
+UnloadPulseAudioLibrary(void)
+{
+    if (pulseaudio_handle != NULL) {
+        SDL_UnloadObject(pulseaudio_handle);
+        pulseaudio_handle = NULL;
+    }
+}
+
+static int
+LoadPulseAudioLibrary(void)
+{
+    int retval = 0;
+    if (pulseaudio_handle == NULL) {
+        pulseaudio_handle = SDL_LoadObject(pulseaudio_library);
+        if (pulseaudio_handle == NULL) {
+            retval = -1;
+            /* Don't call SDL_SetError(): SDL_LoadObject already did. */
+        } else {
+            retval = load_pulseaudio_syms();
+            if (retval < 0) {
+                UnloadPulseAudioLibrary();
+            }
+        }
+    }
+    return retval;
+}
+
+#else
+
+#define SDL_PULSEAUDIO_SYM(x) PULSEAUDIO_##x = x
+
+static void
+UnloadPulseAudioLibrary(void)
+{
+}
+
+static int
+LoadPulseAudioLibrary(void)
+{
+    load_pulseaudio_syms();
+    return 0;
+}
+
+#endif /* SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC */
+
+
+static int
+load_pulseaudio_syms(void)
+{
+    SDL_PULSEAUDIO_SYM(pa_get_library_version);
+    SDL_PULSEAUDIO_SYM(pa_simple_new);
+    SDL_PULSEAUDIO_SYM(pa_simple_free);
+    SDL_PULSEAUDIO_SYM(pa_mainloop_new);
+    SDL_PULSEAUDIO_SYM(pa_mainloop_get_api);
+    SDL_PULSEAUDIO_SYM(pa_mainloop_iterate);
+    SDL_PULSEAUDIO_SYM(pa_mainloop_free);
+    SDL_PULSEAUDIO_SYM(pa_operation_get_state);
+    SDL_PULSEAUDIO_SYM(pa_operation_cancel);
+    SDL_PULSEAUDIO_SYM(pa_operation_unref);
+    SDL_PULSEAUDIO_SYM(pa_context_new);
+    SDL_PULSEAUDIO_SYM(pa_context_connect);
+    SDL_PULSEAUDIO_SYM(pa_context_get_state);
+    SDL_PULSEAUDIO_SYM(pa_context_disconnect);
+    SDL_PULSEAUDIO_SYM(pa_context_unref);
+    SDL_PULSEAUDIO_SYM(pa_stream_new);
+    SDL_PULSEAUDIO_SYM(pa_stream_connect_playback);
+    SDL_PULSEAUDIO_SYM(pa_stream_get_state);
+    SDL_PULSEAUDIO_SYM(pa_stream_writable_size);
+    SDL_PULSEAUDIO_SYM(pa_stream_write);
+    SDL_PULSEAUDIO_SYM(pa_stream_drain);
+    SDL_PULSEAUDIO_SYM(pa_stream_disconnect);
+    SDL_PULSEAUDIO_SYM(pa_stream_unref);
+    SDL_PULSEAUDIO_SYM(pa_channel_map_init_auto);
+    SDL_PULSEAUDIO_SYM(pa_strerror);
+    return 0;
+}
+
+
+/* Check to see if we can connect to PulseAudio */
+static SDL_bool
+CheckPulseAudioAvailable()
+{
+    pa_simple *s;
+    pa_sample_spec ss;
+
+    ss.format = PA_SAMPLE_S16NE;
+    ss.channels = 1;
+    ss.rate = 22050;
+
+    s = PULSEAUDIO_pa_simple_new(NULL, "SDL", PA_STREAM_PLAYBACK, NULL,
+                                 "Test", &ss, NULL, NULL, NULL);
+    if (s) {
+        PULSEAUDIO_pa_simple_free(s);
+        return SDL_TRUE;
+    } else {
+        return SDL_FALSE;
+    }
+}
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+PULSEAUDIO_WaitDevice(_THIS)
+{
+    struct SDL_PrivateAudioData *h = this->hidden;
+
+    while(1) {
+        if (PULSEAUDIO_pa_context_get_state(h->context) != PA_CONTEXT_READY ||
+            PULSEAUDIO_pa_stream_get_state(h->stream) != PA_STREAM_READY ||
+            PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) {
+            this->enabled = 0;
+            return;
+        }
+        if (PULSEAUDIO_pa_stream_writable_size(h->stream) >= h->mixlen) {
+            return;
+        }
+    }
+}
+
+static void
+PULSEAUDIO_PlayDevice(_THIS)
+{
+    /* Write the audio data */
+    struct SDL_PrivateAudioData *h = this->hidden;
+    if (PULSEAUDIO_pa_stream_write(h->stream, h->mixbuf, h->mixlen, NULL, 0LL,
+                                   PA_SEEK_RELATIVE) < 0) {
+        this->enabled = 0;
+    }
+}
+
+static void
+stream_drain_complete(pa_stream *s, int success, void *userdata)
+{
+    /* no-op for pa_stream_drain() to use for callback. */
+}
+
+static void
+PULSEAUDIO_WaitDone(_THIS)
+{
+    struct SDL_PrivateAudioData *h = this->hidden;
+    pa_operation *o;
+
+    o = PULSEAUDIO_pa_stream_drain(h->stream, stream_drain_complete, NULL);
+    if (!o) {
+        return;
+    }
+
+    while (PULSEAUDIO_pa_operation_get_state(o) != PA_OPERATION_DONE) {
+        if (PULSEAUDIO_pa_context_get_state(h->context) != PA_CONTEXT_READY ||
+            PULSEAUDIO_pa_stream_get_state(h->stream) != PA_STREAM_READY ||
+            PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) {
+            PULSEAUDIO_pa_operation_cancel(o);
+            break;
+        }
+    }
+
+    PULSEAUDIO_pa_operation_unref(o);
+}
+
+
+
+static Uint8 *
+PULSEAUDIO_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+
+static void
+PULSEAUDIO_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if (this->hidden->stream) {
+            PULSEAUDIO_pa_stream_disconnect(this->hidden->stream);
+            PULSEAUDIO_pa_stream_unref(this->hidden->stream);
+            this->hidden->stream = NULL;
+        }
+        if (this->hidden->context != NULL) {
+            PULSEAUDIO_pa_context_disconnect(this->hidden->context);
+            PULSEAUDIO_pa_context_unref(this->hidden->context);
+            this->hidden->context = NULL;
+        }
+        if (this->hidden->mainloop != NULL) {
+            PULSEAUDIO_pa_mainloop_free(this->hidden->mainloop);
+            this->hidden->mainloop = NULL;
+        }
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+
+static SDL_INLINE int
+squashVersion(const int major, const int minor, const int patch)
+{
+    return ((major & 0xFF) << 16) | ((minor & 0xFF) << 8) | (patch & 0xFF);
+}
+
+/* Workaround for older pulse: pa_context_new() must have non-NULL appname */
+static const char *
+getAppName(void)
+{
+    const char *verstr = PULSEAUDIO_pa_get_library_version();
+    if (verstr != NULL) {
+        int maj, min, patch;
+        if (SDL_sscanf(verstr, "%d.%d.%d", &maj, &min, &patch) == 3) {
+            if (squashVersion(maj, min, patch) >= squashVersion(0, 9, 15)) {
+                return NULL;  /* 0.9.15+ handles NULL correctly. */
+            }
+        }
+    }
+    return "SDL Application";  /* oh well. */
+}
+
+static int
+PULSEAUDIO_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    struct SDL_PrivateAudioData *h = NULL;
+    Uint16 test_format = 0;
+    pa_sample_spec paspec;
+    pa_buffer_attr paattr;
+    pa_channel_map pacmap;
+    pa_stream_flags_t flags = 0;
+    int state = 0;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+    h = this->hidden;
+
+    paspec.format = PA_SAMPLE_INVALID;
+
+    /* Try for a closest match on audio format */
+    for (test_format = SDL_FirstAudioFormat(this->spec.format);
+         (paspec.format == PA_SAMPLE_INVALID) && test_format;) {
+#ifdef DEBUG_AUDIO
+        fprintf(stderr, "Trying format 0x%4.4x\n", test_format);
+#endif
+        switch (test_format) {
+        case AUDIO_U8:
+            paspec.format = PA_SAMPLE_U8;
+            break;
+        case AUDIO_S16LSB:
+            paspec.format = PA_SAMPLE_S16LE;
+            break;
+        case AUDIO_S16MSB:
+            paspec.format = PA_SAMPLE_S16BE;
+            break;
+        case AUDIO_S32LSB:
+            paspec.format = PA_SAMPLE_S32LE;
+            break;
+        case AUDIO_S32MSB:
+            paspec.format = PA_SAMPLE_S32BE;
+            break;
+        case AUDIO_F32LSB:
+            paspec.format = PA_SAMPLE_FLOAT32LE;
+            break;
+        case AUDIO_F32MSB:
+            paspec.format = PA_SAMPLE_FLOAT32BE;
+            break;
+        default:
+            paspec.format = PA_SAMPLE_INVALID;
+            break;
+        }
+        if (paspec.format == PA_SAMPLE_INVALID) {
+            test_format = SDL_NextAudioFormat();
+        }
+    }
+    if (paspec.format == PA_SAMPLE_INVALID) {
+        PULSEAUDIO_CloseDevice(this);
+        return SDL_SetError("Couldn't find any hardware audio formats");
+    }
+    this->spec.format = test_format;
+
+    /* Calculate the final parameters for this audio specification */
+#ifdef PA_STREAM_ADJUST_LATENCY
+    this->spec.samples /= 2; /* Mix in smaller chunck to avoid underruns */
+#endif
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Allocate mixing buffer */
+    h->mixlen = this->spec.size;
+    h->mixbuf = (Uint8 *) SDL_AllocAudioMem(h->mixlen);
+    if (h->mixbuf == NULL) {
+        PULSEAUDIO_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(h->mixbuf, this->spec.silence, this->spec.size);
+
+    paspec.channels = this->spec.channels;
+    paspec.rate = this->spec.freq;
+
+    /* Reduced prebuffering compared to the defaults. */
+#ifdef PA_STREAM_ADJUST_LATENCY
+    /* 2x original requested bufsize */
+    paattr.tlength = h->mixlen * 4;
+    paattr.prebuf = -1;
+    paattr.maxlength = -1;
+    /* -1 can lead to pa_stream_writable_size() >= mixlen never being true */
+    paattr.minreq = h->mixlen;
+    flags = PA_STREAM_ADJUST_LATENCY;
+#else
+    paattr.tlength = h->mixlen*2;
+    paattr.prebuf = h->mixlen*2;
+    paattr.maxlength = h->mixlen*2;
+    paattr.minreq = h->mixlen;
+#endif
+
+    /* The SDL ALSA output hints us that we use Windows' channel mapping */
+    /* http://bugzilla.libsdl.org/show_bug.cgi?id=110 */
+    PULSEAUDIO_pa_channel_map_init_auto(&pacmap, this->spec.channels,
+                                        PA_CHANNEL_MAP_WAVEEX);
+
+    /* Set up a new main loop */
+    if (!(h->mainloop = PULSEAUDIO_pa_mainloop_new())) {
+        PULSEAUDIO_CloseDevice(this);
+        return SDL_SetError("pa_mainloop_new() failed");
+    }
+
+    h->mainloop_api = PULSEAUDIO_pa_mainloop_get_api(h->mainloop);
+    h->context = PULSEAUDIO_pa_context_new(h->mainloop_api, getAppName());
+    if (!h->context) {
+        PULSEAUDIO_CloseDevice(this);
+        return SDL_SetError("pa_context_new() failed");
+    }
+
+    /* Connect to the PulseAudio server */
+    if (PULSEAUDIO_pa_context_connect(h->context, NULL, 0, NULL) < 0) {
+        PULSEAUDIO_CloseDevice(this);
+        return SDL_SetError("Could not setup connection to PulseAudio");
+    }
+
+    do {
+        if (PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) {
+            PULSEAUDIO_CloseDevice(this);
+            return SDL_SetError("pa_mainloop_iterate() failed");
+        }
+        state = PULSEAUDIO_pa_context_get_state(h->context);
+        if (!PA_CONTEXT_IS_GOOD(state)) {
+            PULSEAUDIO_CloseDevice(this);
+            return SDL_SetError("Could not connect to PulseAudio");
+        }
+    } while (state != PA_CONTEXT_READY);
+
+    h->stream = PULSEAUDIO_pa_stream_new(
+        h->context,
+        "Simple DirectMedia Layer", /* stream description */
+        &paspec,    /* sample format spec */
+        &pacmap     /* channel map */
+        );
+
+    if (h->stream == NULL) {
+        PULSEAUDIO_CloseDevice(this);
+        return SDL_SetError("Could not set up PulseAudio stream");
+    }
+
+    if (PULSEAUDIO_pa_stream_connect_playback(h->stream, NULL, &paattr, flags,
+            NULL, NULL) < 0) {
+        PULSEAUDIO_CloseDevice(this);
+        return SDL_SetError("Could not connect PulseAudio stream");
+    }
+
+    do {
+        if (PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) {
+            PULSEAUDIO_CloseDevice(this);
+            return SDL_SetError("pa_mainloop_iterate() failed");
+        }
+        state = PULSEAUDIO_pa_stream_get_state(h->stream);
+        if (!PA_STREAM_IS_GOOD(state)) {
+            PULSEAUDIO_CloseDevice(this);
+            return SDL_SetError("Could not create to PulseAudio stream");
+        }
+    } while (state != PA_STREAM_READY);
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+
+static void
+PULSEAUDIO_Deinitialize(void)
+{
+    UnloadPulseAudioLibrary();
+}
+
+static int
+PULSEAUDIO_Init(SDL_AudioDriverImpl * impl)
+{
+    if (LoadPulseAudioLibrary() < 0) {
+        return 0;
+    }
+
+    if (!CheckPulseAudioAvailable()) {
+        UnloadPulseAudioLibrary();
+        return 0;
+    }
+
+    /* Set the function pointers */
+    impl->OpenDevice = PULSEAUDIO_OpenDevice;
+    impl->PlayDevice = PULSEAUDIO_PlayDevice;
+    impl->WaitDevice = PULSEAUDIO_WaitDevice;
+    impl->GetDeviceBuf = PULSEAUDIO_GetDeviceBuf;
+    impl->CloseDevice = PULSEAUDIO_CloseDevice;
+    impl->WaitDone = PULSEAUDIO_WaitDone;
+    impl->Deinitialize = PULSEAUDIO_Deinitialize;
+    impl->OnlyHasDefaultOutputDevice = 1;
+
+    return 1;   /* this audio target is available. */
+}
+
+
+AudioBootStrap PULSEAUDIO_bootstrap = {
+    "pulseaudio", "PulseAudio", PULSEAUDIO_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_PULSEAUDIO */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/pulseaudio/SDL_pulseaudio.h b/Source/3rd Party/sdl/src/audio/pulseaudio/SDL_pulseaudio.h
new file mode 100644
index 000000000..a75409bc0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/pulseaudio/SDL_pulseaudio.h	
@@ -0,0 +1,48 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_pulseaudio_h
+#define _SDL_pulseaudio_h
+
+#include <pulse/simple.h>
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* pulseaudio structures */
+    pa_mainloop *mainloop;
+    pa_mainloop_api *mainloop_api;
+    pa_context *context;
+    pa_stream *stream;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+};
+
+#endif /* _SDL_pulseaudio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/qsa/SDL_qsa_audio.c b/Source/3rd Party/sdl/src/audio/qsa/SDL_qsa_audio.c
new file mode 100644
index 000000000..d6b8a6800
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/qsa/SDL_qsa_audio.c	
@@ -0,0 +1,857 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_QSA
+
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sched.h>
+#include <sys/select.h>
+#include <sys/neutrino.h>
+#include <sys/asoundlib.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_qsa_audio.h"
+
+/* default channel communication parameters */
+#define DEFAULT_CPARAMS_RATE   44100
+#define DEFAULT_CPARAMS_VOICES 1
+
+#define DEFAULT_CPARAMS_FRAG_SIZE 4096
+#define DEFAULT_CPARAMS_FRAGS_MIN 1
+#define DEFAULT_CPARAMS_FRAGS_MAX 1
+
+#define QSA_NO_WORKAROUNDS  0x00000000
+#define QSA_MMAP_WORKAROUND 0x00000001
+
+struct BuggyCards
+{
+    char *cardname;
+    unsigned long bugtype;
+};
+
+#define QSA_WA_CARDS             3
+#define QSA_MAX_CARD_NAME_LENGTH 33
+
+struct BuggyCards buggycards[QSA_WA_CARDS] = {
+    {"Sound Blaster Live!", QSA_MMAP_WORKAROUND},
+    {"Vortex 8820", QSA_MMAP_WORKAROUND},
+    {"Vortex 8830", QSA_MMAP_WORKAROUND},
+};
+
+/* List of found devices */
+#define QSA_MAX_DEVICES       32
+#define QSA_MAX_NAME_LENGTH   81+16     /* Hardcoded in QSA, can't be changed */
+
+typedef struct _QSA_Device
+{
+    char name[QSA_MAX_NAME_LENGTH];     /* Long audio device name for SDL  */
+    int cardno;
+    int deviceno;
+} QSA_Device;
+
+QSA_Device qsa_playback_device[QSA_MAX_DEVICES];
+uint32_t qsa_playback_devices;
+
+QSA_Device qsa_capture_device[QSA_MAX_DEVICES];
+uint32_t qsa_capture_devices;
+
+static SDL_INLINE int
+QSA_SetError(const char *fn, int status)
+{
+    return SDL_SetError("QSA: %s() failed: %s", fn, snd_strerror(status));
+}
+
+/* card names check to apply the workarounds */
+static int
+QSA_CheckBuggyCards(_THIS, unsigned long checkfor)
+{
+    char scardname[QSA_MAX_CARD_NAME_LENGTH];
+    int it;
+
+    if (snd_card_get_name
+        (this->hidden->cardno, scardname, QSA_MAX_CARD_NAME_LENGTH - 1) < 0) {
+        return 0;
+    }
+
+    for (it = 0; it < QSA_WA_CARDS; it++) {
+        if (SDL_strcmp(buggycards[it].cardname, scardname) == 0) {
+            if (buggycards[it].bugtype == checkfor) {
+                return 1;
+            }
+        }
+    }
+
+    return 0;
+}
+
+/* !!! FIXME: does this need to be here? Does the SDL version not work? */
+static void
+QSA_ThreadInit(_THIS)
+{
+    struct sched_param param;
+    int status;
+
+    /* Increase default 10 priority to 25 to avoid jerky sound */
+    status = SchedGet(0, 0, &param);
+    param.sched_priority = param.sched_curpriority + 15;
+    status = SchedSet(0, 0, SCHED_NOCHANGE, &param);
+}
+
+/* PCM channel parameters initialize function */
+static void
+QSA_InitAudioParams(snd_pcm_channel_params_t * cpars)
+{
+    SDL_memset(cpars, 0, sizeof(snd_pcm_channel_params_t));
+
+    cpars->channel = SND_PCM_CHANNEL_PLAYBACK;
+    cpars->mode = SND_PCM_MODE_BLOCK;
+    cpars->start_mode = SND_PCM_START_DATA;
+    cpars->stop_mode = SND_PCM_STOP_STOP;
+    cpars->format.format = SND_PCM_SFMT_S16_LE;
+    cpars->format.interleave = 1;
+    cpars->format.rate = DEFAULT_CPARAMS_RATE;
+    cpars->format.voices = DEFAULT_CPARAMS_VOICES;
+    cpars->buf.block.frag_size = DEFAULT_CPARAMS_FRAG_SIZE;
+    cpars->buf.block.frags_min = DEFAULT_CPARAMS_FRAGS_MIN;
+    cpars->buf.block.frags_max = DEFAULT_CPARAMS_FRAGS_MAX;
+}
+
+/* This function waits until it is possible to write a full sound buffer */
+static void
+QSA_WaitDevice(_THIS)
+{
+    fd_set wfds;
+    fd_set rfds;
+    int selectret;
+    struct timeval timeout;
+
+    if (!this->hidden->iscapture) {
+        FD_ZERO(&wfds);
+        FD_SET(this->hidden->audio_fd, &wfds);
+    } else {
+        FD_ZERO(&rfds);
+        FD_SET(this->hidden->audio_fd, &rfds);
+    }
+
+    do {
+        /* Setup timeout for playing one fragment equal to 2 seconds          */
+        /* If timeout occured than something wrong with hardware or driver    */
+        /* For example, Vortex 8820 audio driver stucks on second DAC because */
+        /* it doesn't exist !                                                 */
+        timeout.tv_sec = 2;
+        timeout.tv_usec = 0;
+        this->hidden->timeout_on_wait = 0;
+
+        if (!this->hidden->iscapture) {
+            selectret =
+                select(this->hidden->audio_fd + 1, NULL, &wfds, NULL,
+                       &timeout);
+        } else {
+            selectret =
+                select(this->hidden->audio_fd + 1, &rfds, NULL, NULL,
+                       &timeout);
+        }
+
+        switch (selectret) {
+        case -1:
+            {
+                SDL_SetError("QSA: select() failed: %s", strerror(errno));
+                return;
+            }
+            break;
+        case 0:
+            {
+                SDL_SetError("QSA: timeout on buffer waiting occured");
+                this->hidden->timeout_on_wait = 1;
+                return;
+            }
+            break;
+        default:
+            {
+                if (!this->hidden->iscapture) {
+                    if (FD_ISSET(this->hidden->audio_fd, &wfds)) {
+                        return;
+                    }
+                } else {
+                    if (FD_ISSET(this->hidden->audio_fd, &rfds)) {
+                        return;
+                    }
+                }
+            }
+            break;
+        }
+    } while (1);
+}
+
+static void
+QSA_PlayDevice(_THIS)
+{
+    snd_pcm_channel_status_t cstatus;
+    int written;
+    int status;
+    int towrite;
+    void *pcmbuffer;
+
+    if ((!this->enabled) || (!this->hidden)) {
+        return;
+    }
+
+    towrite = this->spec.size;
+    pcmbuffer = this->hidden->pcm_buf;
+
+    /* Write the audio data, checking for EAGAIN (buffer full) and underrun */
+    do {
+        written =
+            snd_pcm_plugin_write(this->hidden->audio_handle, pcmbuffer,
+                                 towrite);
+        if (written != towrite) {
+            /* Check if samples playback got stuck somewhere in hardware or in */
+            /* the audio device driver */
+            if ((errno == EAGAIN) && (written == 0)) {
+                if (this->hidden->timeout_on_wait != 0) {
+                    SDL_SetError("QSA: buffer playback timeout");
+                    return;
+                }
+            }
+
+            /* Check for errors or conditions */
+            if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) {
+                /* Let a little CPU time go by and try to write again */
+                SDL_Delay(1);
+
+                /* if we wrote some data */
+                towrite -= written;
+                pcmbuffer += written * this->spec.channels;
+                continue;
+            } else {
+                if ((errno == EINVAL) || (errno == EIO)) {
+                    SDL_memset(&cstatus, 0, sizeof(cstatus));
+                    if (!this->hidden->iscapture) {
+                        cstatus.channel = SND_PCM_CHANNEL_PLAYBACK;
+                    } else {
+                        cstatus.channel = SND_PCM_CHANNEL_CAPTURE;
+                    }
+
+                    status =
+                        snd_pcm_plugin_status(this->hidden->audio_handle,
+                                              &cstatus);
+                    if (status < 0) {
+                        QSA_SetError("snd_pcm_plugin_status", status);
+                        return;
+                    }
+
+                    if ((cstatus.status == SND_PCM_STATUS_UNDERRUN) ||
+                        (cstatus.status == SND_PCM_STATUS_READY)) {
+                        if (!this->hidden->iscapture) {
+                            status =
+                                snd_pcm_plugin_prepare(this->hidden->
+                                                       audio_handle,
+                                                       SND_PCM_CHANNEL_PLAYBACK);
+                        } else {
+                            status =
+                                snd_pcm_plugin_prepare(this->hidden->
+                                                       audio_handle,
+                                                       SND_PCM_CHANNEL_CAPTURE);
+                        }
+                        if (status < 0) {
+                            QSA_SetError("snd_pcm_plugin_prepare", status);
+                            return;
+                        }
+                    }
+                    continue;
+                } else {
+                    return;
+                }
+            }
+        } else {
+            /* we wrote all remaining data */
+            towrite -= written;
+            pcmbuffer += written * this->spec.channels;
+        }
+    } while ((towrite > 0) && (this->enabled));
+
+    /* If we couldn't write, assume fatal error for now */
+    if (towrite != 0) {
+        this->enabled = 0;
+    }
+}
+
+static Uint8 *
+QSA_GetDeviceBuf(_THIS)
+{
+    return this->hidden->pcm_buf;
+}
+
+static void
+QSA_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        if (this->hidden->audio_handle != NULL) {
+            if (!this->hidden->iscapture) {
+                /* Finish playing available samples */
+                snd_pcm_plugin_flush(this->hidden->audio_handle,
+                                     SND_PCM_CHANNEL_PLAYBACK);
+            } else {
+                /* Cancel unread samples during capture */
+                snd_pcm_plugin_flush(this->hidden->audio_handle,
+                                     SND_PCM_CHANNEL_CAPTURE);
+            }
+            snd_pcm_close(this->hidden->audio_handle);
+            this->hidden->audio_handle = NULL;
+        }
+
+        SDL_FreeAudioMem(this->hidden->pcm_buf);
+        this->hidden->pcm_buf = NULL;
+
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static int
+QSA_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    int status = 0;
+    int format = 0;
+    SDL_AudioFormat test_format = 0;
+    int found = 0;
+    snd_pcm_channel_setup_t csetup;
+    snd_pcm_channel_params_t cparams;
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden =
+        (struct SDL_PrivateAudioData *) SDL_calloc(1,
+                                                   (sizeof
+                                                    (struct
+                                                     SDL_PrivateAudioData)));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, sizeof(struct SDL_PrivateAudioData));
+
+    /* Initialize channel transfer parameters to default */
+    QSA_InitAudioParams(&cparams);
+
+    /* Initialize channel direction: capture or playback */
+    this->hidden->iscapture = iscapture;
+
+    /* Find deviceid and cardid by device name for playback */
+    if ((!this->hidden->iscapture) && (devname != NULL)) {
+        uint32_t device;
+        int32_t status;
+
+        /* Search in the playback devices */
+        device = 0;
+        do {
+            status = SDL_strcmp(qsa_playback_device[device].name, devname);
+            if (status == 0) {
+                /* Found requested device */
+                this->hidden->deviceno = qsa_playback_device[device].deviceno;
+                this->hidden->cardno = qsa_playback_device[device].cardno;
+                break;
+            }
+            device++;
+            if (device >= qsa_playback_devices) {
+                QSA_CloseDevice(this);
+                return SDL_SetError("No such playback device");
+            }
+        } while (1);
+    }
+
+    /* Find deviceid and cardid by device name for capture */
+    if ((this->hidden->iscapture) && (devname != NULL)) {
+        /* Search in the capture devices */
+        uint32_t device;
+        int32_t status;
+
+        /* Searching in the playback devices */
+        device = 0;
+        do {
+            status = SDL_strcmp(qsa_capture_device[device].name, devname);
+            if (status == 0) {
+                /* Found requested device */
+                this->hidden->deviceno = qsa_capture_device[device].deviceno;
+                this->hidden->cardno = qsa_capture_device[device].cardno;
+                break;
+            }
+            device++;
+            if (device >= qsa_capture_devices) {
+                QSA_CloseDevice(this);
+                return SDL_SetError("No such capture device");
+            }
+        } while (1);
+    }
+
+    /* Check if SDL requested default audio device */
+    if (devname == NULL) {
+        /* Open system default audio device */
+        if (!this->hidden->iscapture) {
+            status = snd_pcm_open_preferred(&this->hidden->audio_handle,
+                                            &this->hidden->cardno,
+                                            &this->hidden->deviceno,
+                                            SND_PCM_OPEN_PLAYBACK);
+        } else {
+            status = snd_pcm_open_preferred(&this->hidden->audio_handle,
+                                            &this->hidden->cardno,
+                                            &this->hidden->deviceno,
+                                            SND_PCM_OPEN_CAPTURE);
+        }
+    } else {
+        /* Open requested audio device */
+        if (!this->hidden->iscapture) {
+            status =
+                snd_pcm_open(&this->hidden->audio_handle,
+                             this->hidden->cardno, this->hidden->deviceno,
+                             SND_PCM_OPEN_PLAYBACK);
+        } else {
+            status =
+                snd_pcm_open(&this->hidden->audio_handle,
+                             this->hidden->cardno, this->hidden->deviceno,
+                             SND_PCM_OPEN_CAPTURE);
+        }
+    }
+
+    /* Check if requested device is opened */
+    if (status < 0) {
+        this->hidden->audio_handle = NULL;
+        QSA_CloseDevice(this);
+        return QSA_SetError("snd_pcm_open", status);
+    }
+
+    if (!QSA_CheckBuggyCards(this, QSA_MMAP_WORKAROUND)) {
+        /* Disable QSA MMAP plugin for buggy audio drivers */
+        status =
+            snd_pcm_plugin_set_disable(this->hidden->audio_handle,
+                                       PLUGIN_DISABLE_MMAP);
+        if (status < 0) {
+            QSA_CloseDevice(this);
+            return QSA_SetError("snd_pcm_plugin_set_disable", status);
+        }
+    }
+
+    /* Try for a closest match on audio format */
+    format = 0;
+    /* can't use format as SND_PCM_SFMT_U8 = 0 in qsa */
+    found = 0;
+
+    for (test_format = SDL_FirstAudioFormat(this->spec.format); !found;) {
+        /* if match found set format to equivalent QSA format */
+        switch (test_format) {
+        case AUDIO_U8:
+            {
+                format = SND_PCM_SFMT_U8;
+                found = 1;
+            }
+            break;
+        case AUDIO_S8:
+            {
+                format = SND_PCM_SFMT_S8;
+                found = 1;
+            }
+            break;
+        case AUDIO_S16LSB:
+            {
+                format = SND_PCM_SFMT_S16_LE;
+                found = 1;
+            }
+            break;
+        case AUDIO_S16MSB:
+            {
+                format = SND_PCM_SFMT_S16_BE;
+                found = 1;
+            }
+            break;
+        case AUDIO_U16LSB:
+            {
+                format = SND_PCM_SFMT_U16_LE;
+                found = 1;
+            }
+            break;
+        case AUDIO_U16MSB:
+            {
+                format = SND_PCM_SFMT_U16_BE;
+                found = 1;
+            }
+            break;
+        case AUDIO_S32LSB:
+            {
+                format = SND_PCM_SFMT_S32_LE;
+                found = 1;
+            }
+            break;
+        case AUDIO_S32MSB:
+            {
+                format = SND_PCM_SFMT_S32_BE;
+                found = 1;
+            }
+            break;
+        case AUDIO_F32LSB:
+            {
+                format = SND_PCM_SFMT_FLOAT_LE;
+                found = 1;
+            }
+            break;
+        case AUDIO_F32MSB:
+            {
+                format = SND_PCM_SFMT_FLOAT_BE;
+                found = 1;
+            }
+            break;
+        default:
+            {
+                break;
+            }
+        }
+
+        if (!found) {
+            test_format = SDL_NextAudioFormat();
+        }
+    }
+
+    /* assumes test_format not 0 on success */
+    if (test_format == 0) {
+        QSA_CloseDevice(this);
+        return SDL_SetError("QSA: Couldn't find any hardware audio formats");
+    }
+
+    this->spec.format = test_format;
+
+    /* Set the audio format */
+    cparams.format.format = format;
+
+    /* Set mono/stereo/4ch/6ch/8ch audio */
+    cparams.format.voices = this->spec.channels;
+
+    /* Set rate */
+    cparams.format.rate = this->spec.freq;
+
+    /* Setup the transfer parameters according to cparams */
+    status = snd_pcm_plugin_params(this->hidden->audio_handle, &cparams);
+    if (status < 0) {
+        QSA_CloseDevice(this);
+        return QSA_SetError("snd_pcm_channel_params", status);
+    }
+
+    /* Make sure channel is setup right one last time */
+    SDL_memset(&csetup, 0, sizeof(csetup));
+    if (!this->hidden->iscapture) {
+        csetup.channel = SND_PCM_CHANNEL_PLAYBACK;
+    } else {
+        csetup.channel = SND_PCM_CHANNEL_CAPTURE;
+    }
+
+    /* Setup an audio channel */
+    if (snd_pcm_plugin_setup(this->hidden->audio_handle, &csetup) < 0) {
+        QSA_CloseDevice(this);
+        return SDL_SetError("QSA: Unable to setup channel");
+    }
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    this->hidden->pcm_len = this->spec.size;
+
+    if (this->hidden->pcm_len == 0) {
+        this->hidden->pcm_len =
+            csetup.buf.block.frag_size * this->spec.channels *
+            (snd_pcm_format_width(format) / 8);
+    }
+
+    /*
+     * Allocate memory to the audio buffer and initialize with silence
+     *  (Note that buffer size must be a multiple of fragment size, so find
+     *  closest multiple)
+     */
+    this->hidden->pcm_buf =
+        (Uint8 *) SDL_AllocAudioMem(this->hidden->pcm_len);
+    if (this->hidden->pcm_buf == NULL) {
+        QSA_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->pcm_buf, this->spec.silence,
+               this->hidden->pcm_len);
+
+    /* get the file descriptor */
+    if (!this->hidden->iscapture) {
+        this->hidden->audio_fd =
+            snd_pcm_file_descriptor(this->hidden->audio_handle,
+                                    SND_PCM_CHANNEL_PLAYBACK);
+    } else {
+        this->hidden->audio_fd =
+            snd_pcm_file_descriptor(this->hidden->audio_handle,
+                                    SND_PCM_CHANNEL_CAPTURE);
+    }
+
+    if (this->hidden->audio_fd < 0) {
+        QSA_CloseDevice(this);
+        return QSA_SetError("snd_pcm_file_descriptor", status);
+    }
+
+    /* Prepare an audio channel */
+    if (!this->hidden->iscapture) {
+        /* Prepare audio playback */
+        status =
+            snd_pcm_plugin_prepare(this->hidden->audio_handle,
+                                   SND_PCM_CHANNEL_PLAYBACK);
+    } else {
+        /* Prepare audio capture */
+        status =
+            snd_pcm_plugin_prepare(this->hidden->audio_handle,
+                                   SND_PCM_CHANNEL_CAPTURE);
+    }
+
+    if (status < 0) {
+        QSA_CloseDevice(this);
+        return QSA_SetError("snd_pcm_plugin_prepare", status);
+    }
+
+    /* We're really ready to rock and roll. :-) */
+    return 0;
+}
+
+static void
+QSA_DetectDevices(int iscapture, SDL_AddAudioDevice addfn)
+{
+    uint32_t it;
+    uint32_t cards;
+    uint32_t devices;
+    int32_t status;
+
+    /* Detect amount of available devices       */
+    /* this value can be changed in the runtime */
+    cards = snd_cards();
+
+    /* If io-audio manager is not running we will get 0 as number */
+    /* of available audio devices                                 */
+    if (cards == 0) {
+        /* We have no any available audio devices */
+        return;
+    }
+
+    /* Find requested devices by type */
+    if (!iscapture) {
+        /* Playback devices enumeration requested */
+        for (it = 0; it < cards; it++) {
+            devices = 0;
+            do {
+                status =
+                    snd_card_get_longname(it,
+                                          qsa_playback_device
+                                          [qsa_playback_devices].name,
+                                          QSA_MAX_NAME_LENGTH);
+                if (status == EOK) {
+                    snd_pcm_t *handle;
+
+                    /* Add device number to device name */
+                    sprintf(qsa_playback_device[qsa_playback_devices].name +
+                            SDL_strlen(qsa_playback_device
+                                       [qsa_playback_devices].name), " d%d",
+                            devices);
+
+                    /* Store associated card number id */
+                    qsa_playback_device[qsa_playback_devices].cardno = it;
+
+                    /* Check if this device id could play anything */
+                    status =
+                        snd_pcm_open(&handle, it, devices,
+                                     SND_PCM_OPEN_PLAYBACK);
+                    if (status == EOK) {
+                        qsa_playback_device[qsa_playback_devices].deviceno =
+                            devices;
+                        status = snd_pcm_close(handle);
+                        if (status == EOK) {
+                            addfn(qsa_playback_device[qsa_playback_devices].name);
+                            qsa_playback_devices++;
+                        }
+                    } else {
+                        /* Check if we got end of devices list */
+                        if (status == -ENOENT) {
+                            break;
+                        }
+                    }
+                } else {
+                    break;
+                }
+
+                /* Check if we reached maximum devices count */
+                if (qsa_playback_devices >= QSA_MAX_DEVICES) {
+                    break;
+                }
+                devices++;
+            } while (1);
+
+            /* Check if we reached maximum devices count */
+            if (qsa_playback_devices >= QSA_MAX_DEVICES) {
+                break;
+            }
+        }
+    } else {
+        /* Capture devices enumeration requested */
+        for (it = 0; it < cards; it++) {
+            devices = 0;
+            do {
+                status =
+                    snd_card_get_longname(it,
+                                          qsa_capture_device
+                                          [qsa_capture_devices].name,
+                                          QSA_MAX_NAME_LENGTH);
+                if (status == EOK) {
+                    snd_pcm_t *handle;
+
+                    /* Add device number to device name */
+                    sprintf(qsa_capture_device[qsa_capture_devices].name +
+                            SDL_strlen(qsa_capture_device
+                                       [qsa_capture_devices].name), " d%d",
+                            devices);
+
+                    /* Store associated card number id */
+                    qsa_capture_device[qsa_capture_devices].cardno = it;
+
+                    /* Check if this device id could play anything */
+                    status =
+                        snd_pcm_open(&handle, it, devices,
+                                     SND_PCM_OPEN_CAPTURE);
+                    if (status == EOK) {
+                        qsa_capture_device[qsa_capture_devices].deviceno =
+                            devices;
+                        status = snd_pcm_close(handle);
+                        if (status == EOK) {
+                            addfn(qsa_capture_device[qsa_capture_devices].name);
+                            qsa_capture_devices++;
+                        }
+                    } else {
+                        /* Check if we got end of devices list */
+                        if (status == -ENOENT) {
+                            break;
+                        }
+                    }
+
+                    /* Check if we reached maximum devices count */
+                    if (qsa_capture_devices >= QSA_MAX_DEVICES) {
+                        break;
+                    }
+                } else {
+                    break;
+                }
+                devices++;
+            } while (1);
+
+            /* Check if we reached maximum devices count */
+            if (qsa_capture_devices >= QSA_MAX_DEVICES) {
+                break;
+            }
+        }
+    }
+}
+
+static void
+QSA_WaitDone(_THIS)
+{
+    if (!this->hidden->iscapture) {
+        if (this->hidden->audio_handle != NULL) {
+            /* Wait till last fragment is played and stop channel */
+            snd_pcm_plugin_flush(this->hidden->audio_handle,
+                                 SND_PCM_CHANNEL_PLAYBACK);
+        }
+    } else {
+        if (this->hidden->audio_handle != NULL) {
+            /* Discard all unread data and stop channel */
+            snd_pcm_plugin_flush(this->hidden->audio_handle,
+                                 SND_PCM_CHANNEL_CAPTURE);
+        }
+    }
+}
+
+static void
+QSA_Deinitialize(void)
+{
+    /* Clear devices array on shutdown */
+    SDL_memset(qsa_playback_device, 0x00,
+               sizeof(QSA_Device) * QSA_MAX_DEVICES);
+    SDL_memset(qsa_capture_device, 0x00,
+               sizeof(QSA_Device) * QSA_MAX_DEVICES);
+    qsa_playback_devices = 0;
+    qsa_capture_devices = 0;
+}
+
+static int
+QSA_Init(SDL_AudioDriverImpl * impl)
+{
+    snd_pcm_t *handle = NULL;
+    int32_t status = 0;
+
+    /* Clear devices array */
+    SDL_memset(qsa_playback_device, 0x00,
+               sizeof(QSA_Device) * QSA_MAX_DEVICES);
+    SDL_memset(qsa_capture_device, 0x00,
+               sizeof(QSA_Device) * QSA_MAX_DEVICES);
+    qsa_playback_devices = 0;
+    qsa_capture_devices = 0;
+
+    /* Set function pointers                                     */
+    /* DeviceLock and DeviceUnlock functions are used default,   */
+    /* provided by SDL, which uses pthread_mutex for lock/unlock */
+    impl->DetectDevices = QSA_DetectDevices;
+    impl->OpenDevice = QSA_OpenDevice;
+    impl->ThreadInit = QSA_ThreadInit;
+    impl->WaitDevice = QSA_WaitDevice;
+    impl->PlayDevice = QSA_PlayDevice;
+    impl->GetDeviceBuf = QSA_GetDeviceBuf;
+    impl->CloseDevice = QSA_CloseDevice;
+    impl->WaitDone = QSA_WaitDone;
+    impl->Deinitialize = QSA_Deinitialize;
+    impl->LockDevice = NULL;
+    impl->UnlockDevice = NULL;
+
+    impl->OnlyHasDefaultOutputDevice = 0;
+    impl->ProvidesOwnCallbackThread = 0;
+    impl->SkipMixerLock = 0;
+    impl->HasCaptureSupport = 1;
+    impl->OnlyHasDefaultOutputDevice = 0;
+    impl->OnlyHasDefaultInputDevice = 0;
+
+    /* Check if io-audio manager is running or not */
+    status = snd_cards();
+    if (status == 0) {
+        /* if no, return immediately */
+        return 1;
+    }
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap QSAAUDIO_bootstrap = {
+    "qsa", "QNX QSA Audio", QSA_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_QSA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/qsa/SDL_qsa_audio.h b/Source/3rd Party/sdl/src/audio/qsa/SDL_qsa_audio.h
new file mode 100644
index 000000000..66650d2a3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/qsa/SDL_qsa_audio.h	
@@ -0,0 +1,57 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef __SDL_QSA_AUDIO_H__
+#define __SDL_QSA_AUDIO_H__
+
+#include <sys/asoundlib.h>
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS SDL_AudioDevice* this
+
+struct SDL_PrivateAudioData
+{
+    /* SDL capture state */
+    int iscapture;
+
+    /* The audio device handle */
+    int cardno;
+    int deviceno;
+    snd_pcm_t *audio_handle;
+
+    /* The audio file descriptor */
+    int audio_fd;
+
+    /* Select timeout status */
+    uint32_t timeout_on_wait;
+
+    /* Raw mixing buffer */
+    Uint8 *pcm_buf;
+    Uint32 pcm_len;
+};
+
+#endif /* __SDL_QSA_AUDIO_H__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/sdlgenaudiocvt.pl b/Source/3rd Party/sdl/src/audio/sdlgenaudiocvt.pl
new file mode 100644
index 000000000..73c021aa4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/sdlgenaudiocvt.pl	
@@ -0,0 +1,760 @@
+#!/usr/bin/perl -w
+
+use warnings;
+use strict;
+
+my @audiotypes = qw(
+    U8
+    S8
+    U16LSB
+    S16LSB
+    U16MSB
+    S16MSB
+    S32LSB
+    S32MSB
+    F32LSB
+    F32MSB
+);
+
+my @channels = ( 1, 2, 4, 6, 8 );
+my %funcs;
+my $custom_converters = 0;
+
+
+sub getTypeConvertHashId {
+    my ($from, $to) = @_;
+    return "TYPECONVERTER $from/$to";
+}
+
+
+sub getResamplerHashId {
+    my ($from, $channels, $upsample, $multiple) = @_;
+    return "RESAMPLER $from/$channels/$upsample/$multiple";
+}
+
+
+sub outputHeader {
+    print <<EOF;
+/* DO NOT EDIT!  This file is generated by sdlgenaudiocvt.pl */
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken\@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../SDL_internal.h"
+#include "SDL_audio.h"
+#include "SDL_audio_c.h"
+
+#ifndef DEBUG_CONVERT
+#define DEBUG_CONVERT 0
+#endif
+
+
+/* If you can guarantee your data and need space, you can eliminate code... */
+
+/* Just build the arbitrary resamplers if you're saving code space. */
+#ifndef LESS_RESAMPLERS
+#define LESS_RESAMPLERS 0
+#endif
+
+/* Don't build any resamplers if you're REALLY saving code space. */
+#ifndef NO_RESAMPLERS
+#define NO_RESAMPLERS 0
+#endif
+
+/* Don't build any type converters if you're saving code space. */
+#ifndef NO_CONVERTERS
+#define NO_CONVERTERS 0
+#endif
+
+
+/* *INDENT-OFF* */
+
+EOF
+
+    my @vals = ( 127, 32767, 2147483647 );
+    foreach (@vals) {
+        my $val = $_;
+        my $fval = 1.0 / $val;
+        print("#define DIVBY${val} ${fval}f\n");
+    }
+
+    print("\n");
+}
+
+sub outputFooter {
+    print <<EOF;
+/* $custom_converters converters generated. */
+
+/* *INDENT-ON* */
+
+/* vi: set ts=4 sw=4 expandtab: */
+EOF
+}
+
+sub splittype {
+    my $t = shift;
+    my ($signed, $size, $endian) = $t =~ /([USF])(\d+)([LM]SB|)/;
+    my $float = ($signed eq 'F') ? 1 : 0;
+    $signed = (($float) or ($signed eq 'S')) ? 1 : 0;
+    $endian = 'NONE' if ($endian eq '');
+
+    my $ctype = '';
+    if ($float) {
+        $ctype = (($size == 32) ? 'float' : 'double');
+    } else {
+        $ctype = (($signed) ? 'S' : 'U') . "int${size}";
+    }
+
+    return ($signed, $float, $size, $endian, $ctype);
+}
+
+sub getSwapFunc {
+    my ($size, $signed, $float, $endian, $val) = @_;
+    my $BEorLE = (($endian eq 'MSB') ? 'BE' : 'LE');
+    my $code = '';
+
+    if ($float) {
+        $code = "SDL_SwapFloat${BEorLE}($val)";
+    } else {
+        if ($size > 8) {
+            $code = "SDL_Swap${BEorLE}${size}($val)";
+        } else {
+            $code = $val;
+        }
+
+        if (($signed) and (!$float)) {
+            $code = "((Sint${size}) $code)";
+        }
+    }
+
+    return "${code}";
+}
+
+
+sub maxIntVal {
+    my $size = shift;
+    if ($size == 8) {
+        return 0x7F;
+    } elsif ($size == 16) {
+        return 0x7FFF;
+    } elsif ($size == 32) {
+        return 0x7FFFFFFF;
+    }
+
+    die("bug in script.\n");
+}
+
+sub getFloatToIntMult {
+    my $size = shift;
+    my $val = maxIntVal($size) . '.0';
+    $val .= 'f' if ($size < 32);
+    return $val;
+}
+
+sub getIntToFloatDivBy {
+    my $size = shift;
+    return 'DIVBY' . maxIntVal($size);
+}
+
+sub getSignFlipVal {
+    my $size = shift;
+    if ($size == 8) {
+        return '0x80';
+    } elsif ($size == 16) {
+        return '0x8000';
+    } elsif ($size == 32) {
+        return '0x80000000';
+    }
+
+    die("bug in script.\n");
+}
+
+sub buildCvtFunc {
+    my ($from, $to) = @_;
+    my ($fsigned, $ffloat, $fsize, $fendian, $fctype) = splittype($from);
+    my ($tsigned, $tfloat, $tsize, $tendian, $tctype) = splittype($to);
+    my $diffs = 0;
+    $diffs++ if ($fsize != $tsize);
+    $diffs++ if ($fsigned != $tsigned);
+    $diffs++ if ($ffloat != $tfloat);
+    $diffs++ if ($fendian ne $tendian);
+
+    return if ($diffs == 0);
+
+    my $hashid = getTypeConvertHashId($from, $to);
+    if (1) { # !!! FIXME: if ($diffs > 1) {
+        my $sym = "SDL_Convert_${from}_to_${to}";
+        $funcs{$hashid} = $sym;
+        $custom_converters++;
+
+        # Always unsigned for ints, for possible byteswaps.
+        my $srctype = (($ffloat) ? 'float' : "Uint${fsize}");
+
+        print <<EOF;
+static void SDLCALL
+${sym}(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+    int i;
+    const $srctype *src;
+    $tctype *dst;
+
+#if DEBUG_CONVERT
+    fprintf(stderr, "Converting AUDIO_${from} to AUDIO_${to}.\\n");
+#endif
+
+EOF
+
+        if ($fsize < $tsize) {
+            my $mult = $tsize / $fsize;
+            print <<EOF;
+    src = ((const $srctype *) (cvt->buf + cvt->len_cvt)) - 1;
+    dst = (($tctype *) (cvt->buf + cvt->len_cvt * $mult)) - 1;
+    for (i = cvt->len_cvt / sizeof ($srctype); i; --i, --src, --dst) {
+EOF
+        } else {
+            print <<EOF;
+    src = (const $srctype *) cvt->buf;
+    dst = ($tctype *) cvt->buf;
+    for (i = cvt->len_cvt / sizeof ($srctype); i; --i, ++src, ++dst) {
+EOF
+        }
+
+        # Have to convert to/from float/int.
+        # !!! FIXME: cast through double for int32<->float?
+        my $code = getSwapFunc($fsize, $fsigned, $ffloat, $fendian, '*src');
+        if ($ffloat != $tfloat) {
+            if ($ffloat) {
+                my $mult = getFloatToIntMult($tsize);
+                if (!$tsigned) {   # bump from -1.0f/1.0f to 0.0f/2.0f
+                    $code = "($code + 1.0f)";
+                }
+                $code = "(($tctype) ($code * $mult))";
+            } else {
+                # $divby will be the reciprocal, to avoid pipeline stalls
+                #  from floating point division...so multiply it.
+                my $divby = getIntToFloatDivBy($fsize);
+                $code = "(((float) $code) * $divby)";
+                if (!$fsigned) {   # bump from 0.0f/2.0f to -1.0f/1.0f.
+                    $code = "($code - 1.0f)";
+                }
+            }
+        } else {
+            # All integer conversions here.
+            if ($fsigned != $tsigned) {
+                my $signflipval = getSignFlipVal($fsize);
+                $code = "(($code) ^ $signflipval)";
+            }
+
+            my $shiftval = abs($fsize - $tsize);
+            if ($fsize < $tsize) {
+                $code = "((($tctype) $code) << $shiftval)";
+            } elsif ($fsize > $tsize) {
+                $code = "(($tctype) ($code >> $shiftval))";
+            }
+        }
+
+        my $swap = getSwapFunc($tsize, $tsigned, $tfloat, $tendian, 'val');
+
+        print <<EOF;
+        const $tctype val = $code;
+        *dst = ${swap};
+    }
+
+EOF
+
+        if ($fsize > $tsize) {
+            my $divby = $fsize / $tsize;
+            print("    cvt->len_cvt /= $divby;\n");
+        } elsif ($fsize < $tsize) {
+            my $mult = $tsize / $fsize;
+            print("    cvt->len_cvt *= $mult;\n");
+        }
+
+        print <<EOF;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, AUDIO_$to);
+    }
+}
+
+EOF
+
+    } else {
+        if ($fsigned != $tsigned) {
+            $funcs{$hashid} = 'SDL_ConvertSigned';
+        } elsif ($ffloat != $tfloat) {
+            $funcs{$hashid} = 'SDL_ConvertFloat';
+        } elsif ($fsize != $tsize) {
+            $funcs{$hashid} = 'SDL_ConvertSize';
+        } elsif ($fendian ne $tendian) {
+            $funcs{$hashid} = 'SDL_ConvertEndian';
+        } else {
+            die("error in script.\n");
+        }
+    }
+}
+
+
+sub buildTypeConverters {
+    print "#if !NO_CONVERTERS\n\n";
+    foreach (@audiotypes) {
+        my $from = $_;
+        foreach (@audiotypes) {
+            my $to = $_;
+            buildCvtFunc($from, $to);
+        }
+    }
+    print "#endif  /* !NO_CONVERTERS */\n\n\n";
+
+    print "const SDL_AudioTypeFilters sdl_audio_type_filters[] =\n{\n";
+    print "#if !NO_CONVERTERS\n";
+    foreach (@audiotypes) {
+        my $from = $_;
+        foreach (@audiotypes) {
+            my $to = $_;
+            if ($from ne $to) {
+                my $hashid = getTypeConvertHashId($from, $to);
+                my $sym = $funcs{$hashid};
+                print("    { AUDIO_$from, AUDIO_$to, $sym },\n");
+            }
+        }
+    }
+    print "#endif  /* !NO_CONVERTERS */\n";
+
+    print("    { 0, 0, NULL }\n");
+    print "};\n\n\n";
+}
+
+sub getBiggerCtype {
+    my ($isfloat, $size) = @_;
+
+    if ($isfloat) {
+        if ($size == 32) {
+            return 'double';
+        }
+        die("bug in script.\n");
+    }
+
+    if ($size == 8) {
+        return 'Sint16';
+    } elsif ($size == 16) {
+        return 'Sint32'
+    } elsif ($size == 32) {
+        return 'Sint64'
+    }
+
+    die("bug in script.\n");
+}
+
+
+# These handle arbitrary resamples...44100Hz to 48000Hz, for example.
+# Man, this code is skanky.
+sub buildArbitraryResampleFunc {
+    # !!! FIXME: we do a lot of unnecessary and ugly casting in here, due to getSwapFunc().
+    my ($from, $channels, $upsample) = @_;
+    my ($fsigned, $ffloat, $fsize, $fendian, $fctype) = splittype($from);
+
+    my $bigger = getBiggerCtype($ffloat, $fsize);
+    my $interp = ($ffloat) ? '* 0.5' : '>> 1';
+
+    my $resample = ($upsample) ? 'Upsample' : 'Downsample';
+    my $hashid = getResamplerHashId($from, $channels, $upsample, 0);
+    my $sym = "SDL_${resample}_${from}_${channels}c";
+    $funcs{$hashid} = $sym;
+    $custom_converters++;
+
+    my $fudge = $fsize * $channels * 2;  # !!! FIXME
+    my $eps_adjust = ($upsample) ? 'dstsize' : 'srcsize';
+    my $incr = '';
+    my $incr2 = '';
+
+
+    # !!! FIXME: DEBUG_CONVERT should report frequencies.
+    print <<EOF;
+static void SDLCALL
+${sym}(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "$resample arbitrary (x%f) AUDIO_${from}, ${channels} channels.\\n", cvt->rate_incr);
+#endif
+
+    const int srcsize = cvt->len_cvt - $fudge;
+    const int dstsize = (int) (((double)cvt->len_cvt) * cvt->rate_incr);
+    register int eps = 0;
+EOF
+
+    my $endcomparison = '!=';
+
+    # Upsampling (growing the buffer) needs to work backwards, since we
+    #  overwrite the buffer as we go.
+    if ($upsample) {
+        $endcomparison = '>=';  # dst > target
+        print <<EOF;
+    $fctype *dst = (($fctype *) (cvt->buf + dstsize)) - $channels;
+    const $fctype *src = (($fctype *) (cvt->buf + cvt->len_cvt)) - $channels;
+    const $fctype *target = ((const $fctype *) cvt->buf);
+EOF
+    } else {
+        $endcomparison = '<';  # dst < target
+        print <<EOF;
+    $fctype *dst = ($fctype *) cvt->buf;
+    const $fctype *src = ($fctype *) cvt->buf;
+    const $fctype *target = (const $fctype *) (cvt->buf + dstsize);
+EOF
+    }
+
+    for (my $i = 0; $i < $channels; $i++) {
+        my $idx = ($upsample) ? (($channels - $i) - 1) : $i;
+        my $val = getSwapFunc($fsize, $fsigned, $ffloat, $fendian, "src[$idx]");
+        print <<EOF;
+    $fctype sample${idx} = $val;
+EOF
+    }
+
+    for (my $i = 0; $i < $channels; $i++) {
+        my $idx = ($upsample) ? (($channels - $i) - 1) : $i;
+        print <<EOF;
+    $fctype last_sample${idx} = sample${idx};
+EOF
+    }
+
+    print <<EOF;
+    while (dst $endcomparison target) {
+EOF
+
+    if ($upsample) {
+        for (my $i = 0; $i < $channels; $i++) {
+            # !!! FIXME: don't do this swap every write, just when the samples change.
+            my $idx = (($channels - $i) - 1);
+            my $val = getSwapFunc($fsize, $fsigned, $ffloat, $fendian, "sample${idx}");
+            print <<EOF;
+        dst[$idx] = $val;
+EOF
+        }
+
+        $incr = ($channels == 1) ? 'dst--' : "dst -= $channels";
+        $incr2 = ($channels == 1) ? 'src--' : "src -= $channels";
+
+        print <<EOF;
+        $incr;
+        eps += srcsize;
+        if ((eps << 1) >= dstsize) {
+            $incr2;
+EOF
+    } else {  # downsample.
+        $incr = ($channels == 1) ? 'src++' : "src += $channels";
+        print <<EOF;
+        $incr;
+        eps += dstsize;
+        if ((eps << 1) >= srcsize) {
+EOF
+        for (my $i = 0; $i < $channels; $i++) {
+            my $val = getSwapFunc($fsize, $fsigned, $ffloat, $fendian, "sample${i}");
+            print <<EOF;
+            dst[$i] = $val;
+EOF
+        }
+
+        $incr = ($channels == 1) ? 'dst++' : "dst += $channels";
+        print <<EOF;
+            $incr;
+EOF
+    }
+
+    for (my $i = 0; $i < $channels; $i++) {
+        my $idx = ($upsample) ? (($channels - $i) - 1) : $i;
+        my $swapped = getSwapFunc($fsize, $fsigned, $ffloat, $fendian, "src[$idx]");
+        print <<EOF;
+            sample${idx} = ($fctype) (((($bigger) $swapped) + (($bigger) last_sample${idx})) $interp);
+EOF
+    }
+
+    for (my $i = 0; $i < $channels; $i++) {
+        my $idx = ($upsample) ? (($channels - $i) - 1) : $i;
+        print <<EOF;
+            last_sample${idx} = sample${idx};
+EOF
+    }
+
+    print <<EOF;
+            eps -= $eps_adjust;
+        }
+    }
+EOF
+
+        print <<EOF;
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+EOF
+
+}
+
+# These handle clean resamples...doubling and quadrupling the sample rate, etc.
+sub buildMultipleResampleFunc {
+    # !!! FIXME: we do a lot of unnecessary and ugly casting in here, due to getSwapFunc().
+    my ($from, $channels, $upsample, $multiple) = @_;
+    my ($fsigned, $ffloat, $fsize, $fendian, $fctype) = splittype($from);
+
+    my $bigger = getBiggerCtype($ffloat, $fsize);
+    my $interp = ($ffloat) ? '* 0.5' : '>> 1';
+    my $interp2 = ($ffloat) ? '* 0.25' : '>> 2';
+    my $mult3 = ($ffloat) ? '3.0' : '3';
+    my $lencvtop = ($upsample) ? '*' : '/';
+
+    my $resample = ($upsample) ? 'Upsample' : 'Downsample';
+    my $hashid = getResamplerHashId($from, $channels, $upsample, $multiple);
+    my $sym = "SDL_${resample}_${from}_${channels}c_x${multiple}";
+    $funcs{$hashid} = $sym;
+    $custom_converters++;
+
+    # !!! FIXME: DEBUG_CONVERT should report frequencies.
+    print <<EOF;
+static void SDLCALL
+${sym}(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+{
+#if DEBUG_CONVERT
+    fprintf(stderr, "$resample (x${multiple}) AUDIO_${from}, ${channels} channels.\\n");
+#endif
+
+    const int dstsize = cvt->len_cvt $lencvtop $multiple;
+EOF
+
+    my $endcomparison = '!=';
+
+    # Upsampling (growing the buffer) needs to work backwards, since we
+    #  overwrite the buffer as we go.
+    if ($upsample) {
+        $endcomparison = '>=';  # dst > target
+        print <<EOF;
+    $fctype *dst = (($fctype *) (cvt->buf + dstsize)) - $channels * $multiple;
+    const $fctype *src = (($fctype *) (cvt->buf + cvt->len_cvt)) - $channels;
+    const $fctype *target = ((const $fctype *) cvt->buf);
+EOF
+    } else {
+        $endcomparison = '<';  # dst < target
+        print <<EOF;
+    $fctype *dst = ($fctype *) cvt->buf;
+    const $fctype *src = ($fctype *) cvt->buf;
+    const $fctype *target = (const $fctype *) (cvt->buf + dstsize);
+EOF
+    }
+
+    for (my $i = 0; $i < $channels; $i++) {
+        my $idx = ($upsample) ? (($channels - $i) - 1) : $i;
+        my $val = getSwapFunc($fsize, $fsigned, $ffloat, $fendian, "src[$idx]");
+        print <<EOF;
+    $bigger last_sample${idx} = ($bigger) $val;
+EOF
+    }
+
+    print <<EOF;
+    while (dst $endcomparison target) {
+EOF
+
+    for (my $i = 0; $i < $channels; $i++) {
+        my $idx = ($upsample) ? (($channels - $i) - 1) : $i;
+        my $val = getSwapFunc($fsize, $fsigned, $ffloat, $fendian, "src[$idx]");
+        print <<EOF;
+        const $bigger sample${idx} = ($bigger) $val;
+EOF
+    }
+
+    my $incr = '';
+    if ($upsample) {
+        $incr = ($channels == 1) ? 'src--' : "src -= $channels";
+    } else {
+        my $amount = $channels * $multiple;
+        $incr = "src += $amount";  # can't ever be 1, so no "++" version.
+    }
+
+
+    print <<EOF;
+        $incr;
+EOF
+
+    # !!! FIXME: This really begs for some Altivec or SSE, etc.
+    if ($upsample) {
+        if ($multiple == 2) {
+            for (my $i = $channels-1; $i >= 0; $i--) {
+                my $dsti = $i + $channels;
+                print <<EOF;
+        dst[$dsti] = ($fctype) ((sample${i} + last_sample${i}) $interp);
+EOF
+            }
+            for (my $i = $channels-1; $i >= 0; $i--) {
+                my $dsti = $i;
+                print <<EOF;
+        dst[$dsti] = ($fctype) sample${i};
+EOF
+            }
+        } elsif ($multiple == 4) {
+            for (my $i = $channels-1; $i >= 0; $i--) {
+                my $dsti = $i + ($channels * 3);
+                print <<EOF;
+        dst[$dsti] = ($fctype) ((sample${i} + ($mult3 * last_sample${i})) $interp2);
+EOF
+            }
+
+            for (my $i = $channels-1; $i >= 0; $i--) {
+                my $dsti = $i + ($channels * 2);
+                print <<EOF;
+        dst[$dsti] = ($fctype) ((sample${i} + last_sample${i}) $interp);
+EOF
+            }
+
+            for (my $i = $channels-1; $i >= 0; $i--) {
+                my $dsti = $i + ($channels * 1);
+                print <<EOF;
+        dst[$dsti] = ($fctype) ((($mult3 * sample${i}) + last_sample${i}) $interp2);
+EOF
+            }
+
+            for (my $i = $channels-1; $i >= 0; $i--) {
+                my $dsti = $i + ($channels * 0);
+                print <<EOF;
+        dst[$dsti] = ($fctype) sample${i};
+EOF
+            }
+        } else {
+            die('bug in program.');  # we only handle x2 and x4.
+        }
+    } else {  # downsample.
+        if ($multiple == 2) {
+            for (my $i = 0; $i < $channels; $i++) {
+                print <<EOF;
+        dst[$i] = ($fctype) ((sample${i} + last_sample${i}) $interp);
+EOF
+            }
+        } elsif ($multiple == 4) {
+            # !!! FIXME: interpolate all 4 samples?
+            for (my $i = 0; $i < $channels; $i++) {
+                print <<EOF;
+        dst[$i] = ($fctype) ((sample${i} + last_sample${i}) $interp);
+EOF
+            }
+        } else {
+            die('bug in program.');  # we only handle x2 and x4.
+        }
+    }
+
+    for (my $i = 0; $i < $channels; $i++) {
+        my $idx = ($upsample) ? (($channels - $i) - 1) : $i;
+        print <<EOF;
+        last_sample${idx} = sample${idx};
+EOF
+    }
+
+    if ($upsample) {
+        my $amount = $channels * $multiple;
+        $incr = "dst -= $amount";  # can't ever be 1, so no "--" version.
+    } else {
+        $incr = ($channels == 1) ? 'dst++' : "dst += $channels";
+    }
+
+    print <<EOF;
+        $incr;
+    }
+
+    cvt->len_cvt = dstsize;
+    if (cvt->filters[++cvt->filter_index]) {
+        cvt->filters[cvt->filter_index] (cvt, format);
+    }
+}
+
+EOF
+
+}
+
+sub buildResamplers {
+    print "#if !NO_RESAMPLERS\n\n";
+    foreach (@audiotypes) {
+        my $from = $_;
+        foreach (@channels) {
+            my $channel = $_;
+            buildArbitraryResampleFunc($from, $channel, 1);
+            buildArbitraryResampleFunc($from, $channel, 0);
+        }
+    }
+
+    print "\n#if !LESS_RESAMPLERS\n\n";
+    foreach (@audiotypes) {
+        my $from = $_;
+        foreach (@channels) {
+            my $channel = $_;
+            for (my $multiple = 2; $multiple <= 4; $multiple += 2) {
+                buildMultipleResampleFunc($from, $channel, 1, $multiple);
+                buildMultipleResampleFunc($from, $channel, 0, $multiple);
+            }
+        }
+    }
+
+    print "#endif  /* !LESS_RESAMPLERS */\n";
+    print "#endif  /* !NO_RESAMPLERS */\n\n\n";
+
+    print "const SDL_AudioRateFilters sdl_audio_rate_filters[] =\n{\n";
+    print "#if !NO_RESAMPLERS\n";
+    foreach (@audiotypes) {
+        my $from = $_;
+        foreach (@channels) {
+            my $channel = $_;
+            for (my $upsample = 0; $upsample <= 1; $upsample++) {
+                my $hashid = getResamplerHashId($from, $channel, $upsample, 0);
+                my $sym = $funcs{$hashid};
+                print("    { AUDIO_$from, $channel, $upsample, 0, $sym },\n");
+            }
+        }
+    }
+
+    print "#if !LESS_RESAMPLERS\n";
+    foreach (@audiotypes) {
+        my $from = $_;
+        foreach (@channels) {
+            my $channel = $_;
+            for (my $multiple = 2; $multiple <= 4; $multiple += 2) {
+                for (my $upsample = 0; $upsample <= 1; $upsample++) {
+                    my $hashid = getResamplerHashId($from, $channel, $upsample, $multiple);
+                    my $sym = $funcs{$hashid};
+                    print("    { AUDIO_$from, $channel, $upsample, $multiple, $sym },\n");
+                }
+            }
+        }
+    }
+
+    print "#endif  /* !LESS_RESAMPLERS */\n";
+    print "#endif  /* !NO_RESAMPLERS */\n";
+    print("    { 0, 0, 0, 0, NULL }\n");
+    print "};\n\n";
+}
+
+
+# mainline ...
+
+outputHeader();
+buildTypeConverters();
+buildResamplers();
+outputFooter();
+
+exit 0;
+
+# end of sdlgenaudiocvt.pl ...
+
diff --git a/Source/3rd Party/sdl/src/audio/sndio/SDL_sndioaudio.c b/Source/3rd Party/sdl/src/audio/sndio/SDL_sndioaudio.c
new file mode 100644
index 000000000..a0e578303
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/sndio/SDL_sndioaudio.c	
@@ -0,0 +1,327 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_SNDIO
+
+/* OpenBSD sndio target */
+
+#if HAVE_STDIO_H
+#include <stdio.h>
+#endif
+
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
+#include <unistd.h>
+
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "SDL_sndioaudio.h"
+
+#ifdef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC
+#include "SDL_loadso.h"
+#endif
+
+static struct sio_hdl * (*SNDIO_sio_open)(const char *, unsigned int, int);
+static void (*SNDIO_sio_close)(struct sio_hdl *);
+static int (*SNDIO_sio_setpar)(struct sio_hdl *, struct sio_par *);
+static int (*SNDIO_sio_getpar)(struct sio_hdl *, struct sio_par *);
+static int (*SNDIO_sio_start)(struct sio_hdl *);
+static int (*SNDIO_sio_stop)(struct sio_hdl *);
+static size_t (*SNDIO_sio_read)(struct sio_hdl *, void *, size_t);
+static size_t (*SNDIO_sio_write)(struct sio_hdl *, const void *, size_t);
+static void (*SNDIO_sio_initpar)(struct sio_par *);
+
+#ifdef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC
+static const char *sndio_library = SDL_AUDIO_DRIVER_SNDIO_DYNAMIC;
+static void *sndio_handle = NULL;
+
+static int
+load_sndio_sym(const char *fn, void **addr)
+{
+    *addr = SDL_LoadFunction(sndio_handle, fn);
+    if (*addr == NULL) {
+        /* Don't call SDL_SetError(): SDL_LoadFunction already did. */
+        return 0;
+    }
+
+    return 1;
+}
+
+/* cast funcs to char* first, to please GCC's strict aliasing rules. */
+#define SDL_SNDIO_SYM(x) \
+    if (!load_sndio_sym(#x, (void **) (char *) &SNDIO_##x)) return -1
+#else
+#define SDL_SNDIO_SYM(x) SNDIO_##x = x
+#endif
+
+static int
+load_sndio_syms(void)
+{
+    SDL_SNDIO_SYM(sio_open);
+    SDL_SNDIO_SYM(sio_close);
+    SDL_SNDIO_SYM(sio_setpar);
+    SDL_SNDIO_SYM(sio_getpar);
+    SDL_SNDIO_SYM(sio_start);
+    SDL_SNDIO_SYM(sio_stop);
+    SDL_SNDIO_SYM(sio_read);
+    SDL_SNDIO_SYM(sio_write);
+    SDL_SNDIO_SYM(sio_initpar);
+    return 0;
+}
+
+#undef SDL_SNDIO_SYM
+
+#ifdef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC
+
+static void
+UnloadSNDIOLibrary(void)
+{
+    if (sndio_handle != NULL) {
+        SDL_UnloadObject(sndio_handle);
+        sndio_handle = NULL;
+    }
+}
+
+static int
+LoadSNDIOLibrary(void)
+{
+    int retval = 0;
+    if (sndio_handle == NULL) {
+        sndio_handle = SDL_LoadObject(sndio_library);
+        if (sndio_handle == NULL) {
+            retval = -1;
+            /* Don't call SDL_SetError(): SDL_LoadObject already did. */
+        } else {
+            retval = load_sndio_syms();
+            if (retval < 0) {
+                UnloadSNDIOLibrary();
+            }
+        }
+    }
+    return retval;
+}
+
+#else
+
+static void
+UnloadSNDIOLibrary(void)
+{
+}
+
+static int
+LoadSNDIOLibrary(void)
+{
+    load_sndio_syms();
+    return 0;
+}
+
+#endif /* SDL_AUDIO_DRIVER_SNDIO_DYNAMIC */
+
+
+
+
+static void
+SNDIO_WaitDevice(_THIS)
+{
+    /* no-op; SNDIO_sio_write() blocks if necessary. */
+}
+
+static void
+SNDIO_PlayDevice(_THIS)
+{
+    const int written = SNDIO_sio_write(this->hidden->dev,
+                                        this->hidden->mixbuf,
+                                        this->hidden->mixlen);
+
+    /* If we couldn't write, assume fatal error for now */
+    if ( written == 0 ) {
+        this->enabled = 0;
+    }
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Wrote %d bytes of audio data\n", written);
+#endif
+}
+
+static Uint8 *
+SNDIO_GetDeviceBuf(_THIS)
+{
+    return this->hidden->mixbuf;
+}
+
+static void
+SNDIO_WaitDone(_THIS)
+{
+    SNDIO_sio_stop(this->hidden->dev);
+}
+
+static void
+SNDIO_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        if ( this->hidden->dev != NULL ) {
+            SNDIO_sio_close(this->hidden->dev);
+            this->hidden->dev = NULL;
+        }
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static int
+SNDIO_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format);
+    struct sio_par par;
+    int status;
+
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc(sizeof(*this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, sizeof(*this->hidden));
+
+    this->hidden->mixlen = this->spec.size;
+
+    /* !!! FIXME: SIO_DEVANY can be a specific device... */
+    if ((this->hidden->dev = SNDIO_sio_open(NULL, SIO_PLAY, 0)) == NULL) {
+        SNDIO_CloseDevice(this);
+        return SDL_SetError("sio_open() failed");
+    }
+
+    SNDIO_sio_initpar(&par);
+
+    par.rate = this->spec.freq;
+    par.pchan = this->spec.channels;
+    par.round = this->spec.samples;
+    par.appbufsz = par.round * 2;
+
+    /* Try for a closest match on audio format */
+    status = -1;
+    while (test_format && (status < 0)) {
+        if (!SDL_AUDIO_ISFLOAT(test_format)) {
+            par.le = SDL_AUDIO_ISLITTLEENDIAN(test_format) ? 1 : 0;
+            par.sig = SDL_AUDIO_ISSIGNED(test_format) ? 1 : 0;
+            par.bits = SDL_AUDIO_BITSIZE(test_format);
+
+            if (SNDIO_sio_setpar(this->hidden->dev, &par) == 1) {
+                status = 0;
+                break;
+            }
+        }
+        test_format = SDL_NextAudioFormat();
+    }
+
+    if (status < 0) {
+        SNDIO_CloseDevice(this);
+        return SDL_SetError("sndio: Couldn't find any hardware audio formats");
+    }
+
+    if (SNDIO_sio_getpar(this->hidden->dev, &par) == 0) {
+        SNDIO_CloseDevice(this);
+        return SDL_SetError("sio_getpar() failed");
+    }
+
+    if ((par.bits == 32) && (par.sig) && (par.le))
+        this->spec.format = AUDIO_S32LSB;
+    else if ((par.bits == 32) && (par.sig) && (!par.le))
+        this->spec.format = AUDIO_S32MSB;
+    else if ((par.bits == 16) && (par.sig) && (par.le))
+        this->spec.format = AUDIO_S16LSB;
+    else if ((par.bits == 16) && (par.sig) && (!par.le))
+        this->spec.format = AUDIO_S16MSB;
+    else if ((par.bits == 16) && (!par.sig) && (par.le))
+        this->spec.format = AUDIO_U16LSB;
+    else if ((par.bits == 16) && (!par.sig) && (!par.le))
+        this->spec.format = AUDIO_U16MSB;
+    else if ((par.bits == 8) && (par.sig))
+        this->spec.format = AUDIO_S8;
+    else if ((par.bits == 8) && (!par.sig))
+        this->spec.format = AUDIO_U8;
+    else {
+        SNDIO_CloseDevice(this);
+        return SDL_SetError("sndio: Got unsupported hardware audio format.");
+    }
+
+    this->spec.freq = par.rate;
+    this->spec.channels = par.pchan;
+    this->spec.samples = par.round;
+
+    /* Calculate the final parameters for this audio specification */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Allocate mixing buffer */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        SNDIO_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->hidden->mixlen);
+
+    if (!SNDIO_sio_start(this->hidden->dev)) {
+        return SDL_SetError("sio_start() failed");
+    }
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+static void
+SNDIO_Deinitialize(void)
+{
+    UnloadSNDIOLibrary();
+}
+
+static int
+SNDIO_Init(SDL_AudioDriverImpl * impl)
+{
+    if (LoadSNDIOLibrary() < 0) {
+        return 0;
+    }
+
+    /* Set the function pointers */
+    impl->OpenDevice = SNDIO_OpenDevice;
+    impl->WaitDevice = SNDIO_WaitDevice;
+    impl->PlayDevice = SNDIO_PlayDevice;
+    impl->GetDeviceBuf = SNDIO_GetDeviceBuf;
+    impl->WaitDone = SNDIO_WaitDone;
+    impl->CloseDevice = SNDIO_CloseDevice;
+    impl->Deinitialize = SNDIO_Deinitialize;
+    impl->OnlyHasDefaultOutputDevice = 1;  /* !!! FIXME: sndio can handle multiple devices. */
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap SNDIO_bootstrap = {
+    "sndio", "OpenBSD sndio", SNDIO_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_SNDIO */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/sndio/SDL_sndioaudio.h b/Source/3rd Party/sdl/src/audio/sndio/SDL_sndioaudio.h
new file mode 100644
index 000000000..b8dadb7db
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/sndio/SDL_sndioaudio.h	
@@ -0,0 +1,45 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_sndioaudio_h
+#define _SDL_sndioaudio_h
+
+#include <sndio.h>
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The audio device handle */
+    struct sio_hdl *dev;
+
+    /* Raw mixing buffer */
+    Uint8 *mixbuf;
+    int mixlen;
+};
+
+#endif /* _SDL_sndioaudio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/sun/SDL_sunaudio.c b/Source/3rd Party/sdl/src/audio/sun/SDL_sunaudio.c
new file mode 100644
index 000000000..7efe30ece
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/sun/SDL_sunaudio.c	
@@ -0,0 +1,426 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_SUNAUDIO
+
+/* Allow access to a raw mixing buffer */
+
+#include <fcntl.h>
+#include <errno.h>
+#ifdef __NETBSD__
+#include <sys/ioctl.h>
+#include <sys/audioio.h>
+#endif
+#ifdef __SVR4
+#include <sys/audioio.h>
+#else
+#include <sys/time.h>
+#include <sys/types.h>
+#endif
+#include <unistd.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
+#include "SDL_sunaudio.h"
+
+/* Open the audio device for playback, and don't block if busy */
+
+#if defined(AUDIO_GETINFO) && !defined(AUDIO_GETBUFINFO)
+#define AUDIO_GETBUFINFO AUDIO_GETINFO
+#endif
+
+/* Audio driver functions */
+static Uint8 snd2au(int sample);
+
+/* Audio driver bootstrap functions */
+static void
+SUNAUDIO_DetectDevices(int iscapture, SDL_AddAudioDevice addfn)
+{
+    SDL_EnumUnixAudioDevices(iscapture, 1, (int (*)(int fd)) NULL, addfn);
+}
+
+#ifdef DEBUG_AUDIO
+void
+CheckUnderflow(_THIS)
+{
+#ifdef AUDIO_GETBUFINFO
+    audio_info_t info;
+    int left;
+
+    ioctl(this->hidden->audio_fd, AUDIO_GETBUFINFO, &info);
+    left = (this->hidden->written - info.play.samples);
+    if (this->hidden->written && (left == 0)) {
+        fprintf(stderr, "audio underflow!\n");
+    }
+#endif
+}
+#endif
+
+static void
+SUNAUDIO_WaitDevice(_THIS)
+{
+#ifdef AUDIO_GETBUFINFO
+#define SLEEP_FUDGE 10      /* 10 ms scheduling fudge factor */
+    audio_info_t info;
+    Sint32 left;
+
+    ioctl(this->hidden->audio_fd, AUDIO_GETBUFINFO, &info);
+    left = (this->hidden->written - info.play.samples);
+    if (left > this->hidden->fragsize) {
+        Sint32 sleepy;
+
+        sleepy = ((left - this->hidden->fragsize) / this->hidden->frequency);
+        sleepy -= SLEEP_FUDGE;
+        if (sleepy > 0) {
+            SDL_Delay(sleepy);
+        }
+    }
+#else
+    fd_set fdset;
+
+    FD_ZERO(&fdset);
+    FD_SET(this->hidden->audio_fd, &fdset);
+    select(this->hidden->audio_fd + 1, NULL, &fdset, NULL, NULL);
+#endif
+}
+
+static void
+SUNAUDIO_PlayDevice(_THIS)
+{
+    /* Write the audio data */
+    if (this->hidden->ulaw_only) {
+        /* Assuming that this->spec.freq >= 8000 Hz */
+        int accum, incr, pos;
+        Uint8 *aubuf;
+
+        accum = 0;
+        incr = this->spec.freq / 8;
+        aubuf = this->hidden->ulaw_buf;
+        switch (this->hidden->audio_fmt & 0xFF) {
+        case 8:
+            {
+                Uint8 *sndbuf;
+
+                sndbuf = this->hidden->mixbuf;
+                for (pos = 0; pos < this->hidden->fragsize; ++pos) {
+                    *aubuf = snd2au((0x80 - *sndbuf) * 64);
+                    accum += incr;
+                    while (accum > 0) {
+                        accum -= 1000;
+                        sndbuf += 1;
+                    }
+                    aubuf += 1;
+                }
+            }
+            break;
+        case 16:
+            {
+                Sint16 *sndbuf;
+
+                sndbuf = (Sint16 *) this->hidden->mixbuf;
+                for (pos = 0; pos < this->hidden->fragsize; ++pos) {
+                    *aubuf = snd2au(*sndbuf / 4);
+                    accum += incr;
+                    while (accum > 0) {
+                        accum -= 1000;
+                        sndbuf += 1;
+                    }
+                    aubuf += 1;
+                }
+            }
+            break;
+        }
+#ifdef DEBUG_AUDIO
+        CheckUnderflow(this);
+#endif
+        if (write(this->hidden->audio_fd, this->hidden->ulaw_buf,
+            this->hidden->fragsize) < 0) {
+            /* Assume fatal error, for now */
+            this->enabled = 0;
+        }
+        this->hidden->written += this->hidden->fragsize;
+    } else {
+#ifdef DEBUG_AUDIO
+        CheckUnderflow(this);
+#endif
+        if (write(this->hidden->audio_fd, this->hidden->mixbuf,
+            this->spec.size) < 0) {
+            /* Assume fatal error, for now */
+            this->enabled = 0;
+        }
+        this->hidden->written += this->hidden->fragsize;
+    }
+}
+
+static Uint8 *
+SUNAUDIO_GetDeviceBuf(_THIS)
+{
+    return (this->hidden->mixbuf);
+}
+
+static void
+SUNAUDIO_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        SDL_FreeAudioMem(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+        SDL_free(this->hidden->ulaw_buf);
+        this->hidden->ulaw_buf = NULL;
+        if (this->hidden->audio_fd >= 0) {
+            close(this->hidden->audio_fd);
+            this->hidden->audio_fd = -1;
+        }
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static int
+SUNAUDIO_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT);
+    SDL_AudioFormat format = 0;
+    audio_info_t info;
+
+    /* We don't care what the devname is...we'll try to open anything. */
+    /*  ...but default to first name in the list... */
+    if (devname == NULL) {
+        devname = SDL_GetAudioDeviceName(0, iscapture);
+        if (devname == NULL) {
+            return SDL_SetError("No such audio device");
+        }
+    }
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Open the audio device */
+    this->hidden->audio_fd = open(devname, flags, 0);
+    if (this->hidden->audio_fd < 0) {
+        return SDL_SetError("Couldn't open %s: %s", devname, strerror(errno));
+    }
+
+#ifdef AUDIO_SETINFO
+    int enc;
+#endif
+    int desired_freq = this->spec.freq;
+
+    /* Determine the audio parameters from the AudioSpec */
+    switch (SDL_AUDIO_BITSIZE(this->spec.format)) {
+
+    case 8:
+        {                       /* Unsigned 8 bit audio data */
+            this->spec.format = AUDIO_U8;
+#ifdef AUDIO_SETINFO
+            enc = AUDIO_ENCODING_LINEAR8;
+#endif
+        }
+        break;
+
+    case 16:
+        {                       /* Signed 16 bit audio data */
+            this->spec.format = AUDIO_S16SYS;
+#ifdef AUDIO_SETINFO
+            enc = AUDIO_ENCODING_LINEAR;
+#endif
+        }
+        break;
+
+    default:
+        {
+            /* !!! FIXME: fallback to conversion on unsupported types! */
+            return SDL_SetError("Unsupported audio format");
+        }
+    }
+    this->hidden->audio_fmt = this->spec.format;
+
+    this->hidden->ulaw_only = 0;    /* modern Suns do support linear audio */
+#ifdef AUDIO_SETINFO
+    for (;;) {
+        audio_info_t info;
+        AUDIO_INITINFO(&info);  /* init all fields to "no change" */
+
+        /* Try to set the requested settings */
+        info.play.sample_rate = this->spec.freq;
+        info.play.channels = this->spec.channels;
+        info.play.precision = (enc == AUDIO_ENCODING_ULAW)
+            ? 8 : this->spec.format & 0xff;
+        info.play.encoding = enc;
+        if (ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info) == 0) {
+
+            /* Check to be sure we got what we wanted */
+            if (ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info) < 0) {
+                return SDL_SetError("Error getting audio parameters: %s",
+                                    strerror(errno));
+            }
+            if (info.play.encoding == enc
+                && info.play.precision == (this->spec.format & 0xff)
+                && info.play.channels == this->spec.channels) {
+                /* Yow! All seems to be well! */
+                this->spec.freq = info.play.sample_rate;
+                break;
+            }
+        }
+
+        switch (enc) {
+        case AUDIO_ENCODING_LINEAR8:
+            /* unsigned 8bit apparently not supported here */
+            enc = AUDIO_ENCODING_LINEAR;
+            this->spec.format = AUDIO_S16SYS;
+            break;              /* try again */
+
+        case AUDIO_ENCODING_LINEAR:
+            /* linear 16bit didn't work either, resort to �-law */
+            enc = AUDIO_ENCODING_ULAW;
+            this->spec.channels = 1;
+            this->spec.freq = 8000;
+            this->spec.format = AUDIO_U8;
+            this->hidden->ulaw_only = 1;
+            break;
+
+        default:
+            /* oh well... */
+            return SDL_SetError("Error setting audio parameters: %s",
+                                strerror(errno));
+        }
+    }
+#endif /* AUDIO_SETINFO */
+    this->hidden->written = 0;
+
+    /* We can actually convert on-the-fly to U-Law */
+    if (this->hidden->ulaw_only) {
+        this->spec.freq = desired_freq;
+        this->hidden->fragsize = (this->spec.samples * 1000) /
+            (this->spec.freq / 8);
+        this->hidden->frequency = 8;
+        this->hidden->ulaw_buf = (Uint8 *) SDL_malloc(this->hidden->fragsize);
+        if (this->hidden->ulaw_buf == NULL) {
+            return SDL_OutOfMemory();
+        }
+        this->spec.channels = 1;
+    } else {
+        this->hidden->fragsize = this->spec.samples;
+        this->hidden->frequency = this->spec.freq / 1000;
+    }
+#ifdef DEBUG_AUDIO
+    fprintf(stderr, "Audio device %s U-Law only\n",
+            this->hidden->ulaw_only ? "is" : "is not");
+    fprintf(stderr, "format=0x%x chan=%d freq=%d\n",
+            this->spec.format, this->spec.channels, this->spec.freq);
+#endif
+
+    /* Update the fragment size as size in bytes */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Allocate mixing buffer */
+    this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->spec.size);
+    if (this->hidden->mixbuf == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
+
+    /* We're ready to rock and roll. :-) */
+    return 0;
+}
+
+/************************************************************************/
+/* This function (snd2au()) copyrighted:                                */
+/************************************************************************/
+/*      Copyright 1989 by Rich Gopstein and Harris Corporation          */
+/*                                                                      */
+/*      Permission to use, copy, modify, and distribute this software   */
+/*      and its documentation for any purpose and without fee is        */
+/*      hereby granted, provided that the above copyright notice        */
+/*      appears in all copies and that both that copyright notice and   */
+/*      this permission notice appear in supporting documentation, and  */
+/*      that the name of Rich Gopstein and Harris Corporation not be    */
+/*      used in advertising or publicity pertaining to distribution     */
+/*      of the software without specific, written prior permission.     */
+/*      Rich Gopstein and Harris Corporation make no representations    */
+/*      about the suitability of this software for any purpose.  It     */
+/*      provided "as is" without express or implied warranty.           */
+/************************************************************************/
+
+static Uint8
+snd2au(int sample)
+{
+
+    int mask;
+
+    if (sample < 0) {
+        sample = -sample;
+        mask = 0x7f;
+    } else {
+        mask = 0xff;
+    }
+
+    if (sample < 32) {
+        sample = 0xF0 | (15 - sample / 2);
+    } else if (sample < 96) {
+        sample = 0xE0 | (15 - (sample - 32) / 4);
+    } else if (sample < 224) {
+        sample = 0xD0 | (15 - (sample - 96) / 8);
+    } else if (sample < 480) {
+        sample = 0xC0 | (15 - (sample - 224) / 16);
+    } else if (sample < 992) {
+        sample = 0xB0 | (15 - (sample - 480) / 32);
+    } else if (sample < 2016) {
+        sample = 0xA0 | (15 - (sample - 992) / 64);
+    } else if (sample < 4064) {
+        sample = 0x90 | (15 - (sample - 2016) / 128);
+    } else if (sample < 8160) {
+        sample = 0x80 | (15 - (sample - 4064) / 256);
+    } else {
+        sample = 0x80;
+    }
+    return (mask & sample);
+}
+
+static int
+SUNAUDIO_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->DetectDevices = SUNAUDIO_DetectDevices;
+    impl->OpenDevice = SUNAUDIO_OpenDevice;
+    impl->PlayDevice = SUNAUDIO_PlayDevice;
+    impl->WaitDevice = SUNAUDIO_WaitDevice;
+    impl->GetDeviceBuf = SUNAUDIO_GetDeviceBuf;
+    impl->CloseDevice = SUNAUDIO_CloseDevice;
+
+    return 1; /* this audio target is available. */
+}
+
+AudioBootStrap SUNAUDIO_bootstrap = {
+    "audio", "UNIX /dev/audio interface", SUNAUDIO_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_SUNAUDIO */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/sun/SDL_sunaudio.h b/Source/3rd Party/sdl/src/audio/sun/SDL_sunaudio.h
new file mode 100644
index 000000000..df05e6fca
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/sun/SDL_sunaudio.h	
@@ -0,0 +1,47 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_sunaudio_h
+#define _SDL_sunaudio_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+struct SDL_PrivateAudioData
+{
+    /* The file descriptor for the audio device */
+    int audio_fd;
+
+    SDL_AudioFormat audio_fmt;  /* The app audio format */
+    Uint8 *mixbuf;              /* The app mixing buffer */
+    int ulaw_only;              /* Flag -- does hardware only output U-law? */
+    Uint8 *ulaw_buf;            /* The U-law mixing buffer */
+    Sint32 written;             /* The number of samples written */
+    int fragsize;               /* The audio fragment size in samples */
+    int frequency;              /* The audio frequency in KHz */
+};
+
+#endif /* _SDL_sunaudio_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/winmm/SDL_winmm.c b/Source/3rd Party/sdl/src/audio/winmm/SDL_winmm.c
new file mode 100644
index 000000000..88a8154ec
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/winmm/SDL_winmm.c	
@@ -0,0 +1,400 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_WINMM
+
+/* Allow access to a raw mixing buffer */
+
+#include "../../core/windows/SDL_windows.h"
+#include <mmsystem.h>
+
+#include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audio_c.h"
+#include "SDL_winmm.h"
+
+#ifndef WAVE_FORMAT_IEEE_FLOAT
+#define WAVE_FORMAT_IEEE_FLOAT 0x0003
+#endif
+
+#define DETECT_DEV_IMPL(typ, capstyp) \
+static void DetectWave##typ##Devs(SDL_AddAudioDevice addfn) { \
+    const UINT devcount = wave##typ##GetNumDevs(); \
+    capstyp caps; \
+    UINT i; \
+    for (i = 0; i < devcount; i++) { \
+        if (wave##typ##GetDevCaps(i,&caps,sizeof(caps))==MMSYSERR_NOERROR) { \
+            char *name = WIN_StringToUTF8(caps.szPname); \
+            if (name != NULL) { \
+                addfn(name); \
+                SDL_free(name); \
+            } \
+        } \
+    } \
+}
+
+DETECT_DEV_IMPL(Out, WAVEOUTCAPS)
+DETECT_DEV_IMPL(In, WAVEINCAPS)
+
+static void
+WINMM_DetectDevices(int iscapture, SDL_AddAudioDevice addfn)
+{
+    if (iscapture) {
+        DetectWaveInDevs(addfn);
+    } else {
+        DetectWaveOutDevs(addfn);
+    }
+}
+
+static void CALLBACK
+CaptureSound(HWAVEIN hwi, UINT uMsg, DWORD_PTR dwInstance,
+          DWORD_PTR dwParam1, DWORD_PTR dwParam2)
+{
+    SDL_AudioDevice *this = (SDL_AudioDevice *) dwInstance;
+
+    /* Only service "buffer is filled" messages */
+    if (uMsg != WIM_DATA)
+        return;
+
+    /* Signal that we have a new buffer of data */
+    ReleaseSemaphore(this->hidden->audio_sem, 1, NULL);
+}
+
+
+/* The Win32 callback for filling the WAVE device */
+static void CALLBACK
+FillSound(HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwInstance,
+          DWORD_PTR dwParam1, DWORD_PTR dwParam2)
+{
+    SDL_AudioDevice *this = (SDL_AudioDevice *) dwInstance;
+
+    /* Only service "buffer done playing" messages */
+    if (uMsg != WOM_DONE)
+        return;
+
+    /* Signal that we are done playing a buffer */
+    ReleaseSemaphore(this->hidden->audio_sem, 1, NULL);
+}
+
+static int
+SetMMerror(char *function, MMRESULT code)
+{
+    int len;
+    char errbuf[MAXERRORLENGTH];
+    wchar_t werrbuf[MAXERRORLENGTH];
+
+    SDL_snprintf(errbuf, SDL_arraysize(errbuf), "%s: ", function);
+    len = SDL_static_cast(int, SDL_strlen(errbuf));
+
+    waveOutGetErrorText(code, werrbuf, MAXERRORLENGTH - len);
+    WideCharToMultiByte(CP_ACP, 0, werrbuf, -1, errbuf + len,
+                        MAXERRORLENGTH - len, NULL, NULL);
+
+    return SDL_SetError("%s", errbuf);
+}
+
+static void
+WINMM_WaitDevice(_THIS)
+{
+    /* Wait for an audio chunk to finish */
+    WaitForSingleObject(this->hidden->audio_sem, INFINITE);
+}
+
+static Uint8 *
+WINMM_GetDeviceBuf(_THIS)
+{
+    return (Uint8 *) (this->hidden->
+                      wavebuf[this->hidden->next_buffer].lpData);
+}
+
+static void
+WINMM_PlayDevice(_THIS)
+{
+    /* Queue it up */
+    waveOutWrite(this->hidden->hout,
+                 &this->hidden->wavebuf[this->hidden->next_buffer],
+                 sizeof(this->hidden->wavebuf[0]));
+    this->hidden->next_buffer = (this->hidden->next_buffer + 1) % NUM_BUFFERS;
+}
+
+static void
+WINMM_WaitDone(_THIS)
+{
+    int i, left;
+
+    do {
+        left = NUM_BUFFERS;
+        for (i = 0; i < NUM_BUFFERS; ++i) {
+            if (this->hidden->wavebuf[i].dwFlags & WHDR_DONE) {
+                --left;
+            }
+        }
+        if (left > 0) {
+            SDL_Delay(100);
+        }
+    } while (left > 0);
+}
+
+static void
+WINMM_CloseDevice(_THIS)
+{
+    /* Close up audio */
+    if (this->hidden != NULL) {
+        int i;
+
+        if (this->hidden->audio_sem) {
+            CloseHandle(this->hidden->audio_sem);
+            this->hidden->audio_sem = 0;
+        }
+
+        /* Clean up mixing buffers */
+        for (i = 0; i < NUM_BUFFERS; ++i) {
+            if (this->hidden->wavebuf[i].dwUser != 0xFFFF) {
+                waveOutUnprepareHeader(this->hidden->hout,
+                                       &this->hidden->wavebuf[i],
+                                       sizeof(this->hidden->wavebuf[i]));
+                this->hidden->wavebuf[i].dwUser = 0xFFFF;
+            }
+        }
+
+        /* Free raw mixing buffer */
+        SDL_free(this->hidden->mixbuf);
+        this->hidden->mixbuf = NULL;
+
+        if (this->hidden->hin) {
+            waveInClose(this->hidden->hin);
+            this->hidden->hin = 0;
+        }
+
+        if (this->hidden->hout) {
+            waveOutClose(this->hidden->hout);
+            this->hidden->hout = 0;
+        }
+
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static SDL_bool
+PrepWaveFormat(_THIS, UINT devId, WAVEFORMATEX *pfmt, const int iscapture)
+{
+    SDL_zerop(pfmt);
+
+    if (SDL_AUDIO_ISFLOAT(this->spec.format)) {
+        pfmt->wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
+    } else {
+        pfmt->wFormatTag = WAVE_FORMAT_PCM;
+    }
+    pfmt->wBitsPerSample = SDL_AUDIO_BITSIZE(this->spec.format);
+
+    pfmt->nChannels = this->spec.channels;
+    pfmt->nSamplesPerSec = this->spec.freq;
+    pfmt->nBlockAlign = pfmt->nChannels * (pfmt->wBitsPerSample / 8);
+    pfmt->nAvgBytesPerSec = pfmt->nSamplesPerSec * pfmt->nBlockAlign;
+
+    if (iscapture) {
+        return (waveInOpen(0, devId, pfmt, 0, 0, WAVE_FORMAT_QUERY) == 0);
+    } else {
+        return (waveOutOpen(0, devId, pfmt, 0, 0, WAVE_FORMAT_QUERY) == 0);
+    }
+}
+
+static int
+WINMM_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format);
+    int valid_datatype = 0;
+    MMRESULT result;
+    WAVEFORMATEX waveformat;
+    UINT devId = WAVE_MAPPER;  /* WAVE_MAPPER == choose system's default */
+    char *utf8 = NULL;
+    UINT i;
+
+    if (devname != NULL) {  /* specific device requested? */
+        if (iscapture) {
+            const UINT devcount = waveInGetNumDevs();
+            WAVEINCAPS caps;
+            for (i = 0; (i < devcount) && (devId == WAVE_MAPPER); i++) {
+                result = waveInGetDevCaps(i, &caps, sizeof (caps));
+                if (result != MMSYSERR_NOERROR)
+                    continue;
+                else if ((utf8 = WIN_StringToUTF8(caps.szPname)) == NULL)
+                    continue;
+                else if (SDL_strcmp(devname, utf8) == 0)
+                    devId = i;
+                SDL_free(utf8);
+            }
+        } else {
+            const UINT devcount = waveOutGetNumDevs();
+            WAVEOUTCAPS caps;
+            for (i = 0; (i < devcount) && (devId == WAVE_MAPPER); i++) {
+                result = waveOutGetDevCaps(i, &caps, sizeof (caps));
+                if (result != MMSYSERR_NOERROR)
+                    continue;
+                else if ((utf8 = WIN_StringToUTF8(caps.szPname)) == NULL)
+                    continue;
+                else if (SDL_strcmp(devname, utf8) == 0)
+                    devId = i;
+                SDL_free(utf8);
+            }
+        }
+
+        if (devId == WAVE_MAPPER) {
+            return SDL_SetError("Requested device not found");
+        }
+    }
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    /* Initialize the wavebuf structures for closing */
+    for (i = 0; i < NUM_BUFFERS; ++i)
+        this->hidden->wavebuf[i].dwUser = 0xFFFF;
+
+    if (this->spec.channels > 2)
+        this->spec.channels = 2;        /* !!! FIXME: is this right? */
+
+    /* Check the buffer size -- minimum of 1/4 second (word aligned) */
+    if (this->spec.samples < (this->spec.freq / 4))
+        this->spec.samples = ((this->spec.freq / 4) + 3) & ~3;
+
+    while ((!valid_datatype) && (test_format)) {
+        switch (test_format) {
+        case AUDIO_U8:
+        case AUDIO_S16:
+        case AUDIO_S32:
+        case AUDIO_F32:
+            this->spec.format = test_format;
+            if (PrepWaveFormat(this, devId, &waveformat, iscapture)) {
+                valid_datatype = 1;
+            } else {
+                test_format = SDL_NextAudioFormat();
+            }
+            break;
+
+        default:
+            test_format = SDL_NextAudioFormat();
+            break;
+        }
+    }
+
+    if (!valid_datatype) {
+        WINMM_CloseDevice(this);
+        return SDL_SetError("Unsupported audio format");
+    }
+
+    /* Update the fragment size as size in bytes */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* Open the audio device */
+    if (iscapture) {
+        result = waveInOpen(&this->hidden->hin, devId, &waveformat,
+                             (DWORD_PTR) CaptureSound, (DWORD_PTR) this,
+                             CALLBACK_FUNCTION);
+    } else {
+        result = waveOutOpen(&this->hidden->hout, devId, &waveformat,
+                             (DWORD_PTR) FillSound, (DWORD_PTR) this,
+                             CALLBACK_FUNCTION);
+    }
+
+    if (result != MMSYSERR_NOERROR) {
+        WINMM_CloseDevice(this);
+        return SetMMerror("waveOutOpen()", result);
+    }
+#ifdef SOUND_DEBUG
+    /* Check the sound device we retrieved */
+    {
+        WAVEOUTCAPS caps;
+
+        result = waveOutGetDevCaps((UINT) this->hidden->hout,
+                                   &caps, sizeof(caps));
+        if (result != MMSYSERR_NOERROR) {
+            WINMM_CloseDevice(this);
+            return SetMMerror("waveOutGetDevCaps()", result);
+        }
+        printf("Audio device: %s\n", caps.szPname);
+    }
+#endif
+
+    /* Create the audio buffer semaphore */
+    this->hidden->audio_sem =
+        CreateSemaphore(NULL, NUM_BUFFERS - 1, NUM_BUFFERS, NULL);
+    if (this->hidden->audio_sem == NULL) {
+        WINMM_CloseDevice(this);
+        return SDL_SetError("Couldn't create semaphore");
+    }
+
+    /* Create the sound buffers */
+    this->hidden->mixbuf =
+        (Uint8 *) SDL_malloc(NUM_BUFFERS * this->spec.size);
+    if (this->hidden->mixbuf == NULL) {
+        WINMM_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    for (i = 0; i < NUM_BUFFERS; ++i) {
+        SDL_memset(&this->hidden->wavebuf[i], 0,
+                   sizeof(this->hidden->wavebuf[i]));
+        this->hidden->wavebuf[i].dwBufferLength = this->spec.size;
+        this->hidden->wavebuf[i].dwFlags = WHDR_DONE;
+        this->hidden->wavebuf[i].lpData =
+            (LPSTR) & this->hidden->mixbuf[i * this->spec.size];
+        result = waveOutPrepareHeader(this->hidden->hout,
+                                      &this->hidden->wavebuf[i],
+                                      sizeof(this->hidden->wavebuf[i]));
+        if (result != MMSYSERR_NOERROR) {
+            WINMM_CloseDevice(this);
+            return SetMMerror("waveOutPrepareHeader()", result);
+        }
+    }
+
+    return 0;                   /* Ready to go! */
+}
+
+
+static int
+WINMM_Init(SDL_AudioDriverImpl * impl)
+{
+    /* Set the function pointers */
+    impl->DetectDevices = WINMM_DetectDevices;
+    impl->OpenDevice = WINMM_OpenDevice;
+    impl->PlayDevice = WINMM_PlayDevice;
+    impl->WaitDevice = WINMM_WaitDevice;
+    impl->WaitDone = WINMM_WaitDone;
+    impl->GetDeviceBuf = WINMM_GetDeviceBuf;
+    impl->CloseDevice = WINMM_CloseDevice;
+
+    return 1;   /* this audio target is available. */
+}
+
+AudioBootStrap WINMM_bootstrap = {
+    "winmm", "Windows Waveform Audio", WINMM_Init, 0
+};
+
+#endif /* SDL_AUDIO_DRIVER_WINMM */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/winmm/SDL_winmm.h b/Source/3rd Party/sdl/src/audio/winmm/SDL_winmm.h
new file mode 100644
index 000000000..47996c1aa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/winmm/SDL_winmm.h	
@@ -0,0 +1,45 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_winmm_h
+#define _SDL_winmm_h
+
+#include "../SDL_sysaudio.h"
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+#define NUM_BUFFERS 2           /* -- Don't lower this! */
+
+struct SDL_PrivateAudioData
+{
+    HWAVEOUT hout;
+    HWAVEIN hin;
+    HANDLE audio_sem;
+    Uint8 *mixbuf;              /* The raw allocated mixing buffer */
+    WAVEHDR wavebuf[NUM_BUFFERS];       /* Wave audio fragments */
+    int next_buffer;
+};
+
+#endif /* _SDL_winmm_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/xaudio2/SDL_xaudio2.c b/Source/3rd Party/sdl/src/audio/xaudio2/SDL_xaudio2.c
new file mode 100644
index 000000000..877a4cb92
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/xaudio2/SDL_xaudio2.c	
@@ -0,0 +1,542 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* WinRT NOTICE:
+
+   A few changes to SDL's XAudio2 backend were warranted by API
+   changes to Windows.  Many, but not all of these are documented by Microsoft
+   at:
+   http://blogs.msdn.com/b/chuckw/archive/2012/04/02/xaudio2-and-windows-8-consumer-preview.aspx
+
+   1. Windows' thread synchronization function, CreateSemaphore, was removed
+      from WinRT.  SDL's semaphore API was substituted instead.
+   2. The method calls, IXAudio2::GetDeviceCount and IXAudio2::GetDeviceDetails
+      were removed from the XAudio2 API.  Microsoft is telling developers to
+      use APIs in Windows::Foundation instead.
+      For SDL, the missing methods were reimplemented using the APIs Microsoft
+      said to use.
+   3. CoInitialize and CoUninitialize are not available in WinRT.
+      These calls were removed, as COM will have been initialized earlier,
+      at least by the call to the WinRT app's main function
+      (aka 'int main(Platform::Array<Platform::String^>^)).  (DLudwig:
+      This was my understanding of how WinRT: the 'main' function uses
+      a tag of [MTAThread], which should initialize COM.  My understanding
+      of COM is somewhat limited, and I may be incorrect here.)
+   4. IXAudio2::CreateMasteringVoice changed its integer-based 'DeviceIndex'
+      argument to a string-based one, 'szDeviceId'.  In WinRT, the
+      string-based argument will be used.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_AUDIO_DRIVER_XAUDIO2
+
+#include "../../core/windows/SDL_windows.h"
+#include "SDL_audio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
+#include "SDL_assert.h"
+
+#ifdef __GNUC__
+/* The configure script already did any necessary checking */
+#  define SDL_XAUDIO2_HAS_SDK 1
+#elif defined(__WINRT__)
+/* WinRT always has access to the .the XAudio 2 SDK */
+#  define SDL_XAUDIO2_HAS_SDK
+#else
+/* XAudio2 exists as of the March 2008 DirectX SDK 
+   The XAudio2 implementation available in the Windows 8 SDK targets Windows 8 and newer.
+   If you want to build SDL with XAudio2 support you should install the DirectX SDK.
+ */
+//#include <dxsdkver.h>
+#if (!defined(_DXSDK_BUILD_MAJOR) || (_DXSDK_BUILD_MAJOR < 1284))
+#  pragma message("Your DirectX SDK is too old. Disabling XAudio2 support.")
+#else
+#  define SDL_XAUDIO2_HAS_SDK 1
+#endif
+#endif
+
+#ifdef SDL_XAUDIO2_HAS_SDK
+
+/* Check to see if we're compiling for XAudio 2.8, or higher. */
+#ifdef WINVER
+#if WINVER >= 0x0602  /* Windows 8 SDK or higher? */
+#define SDL_XAUDIO2_WIN8 1
+#endif
+#endif
+
+/* The XAudio header file, when #include'd on WinRT, will only compile in C++
+   files, but not C.  A few preprocessor-based hacks are defined below in order
+   to get xaudio2.h to compile in the C/non-C++ file, SDL_xaudio2.c.
+ */
+#ifdef __WINRT__
+#define uuid(x)
+#define DX_BUILD
+#endif
+
+#define INITGUID 1
+#include <xaudio2.h>
+
+/* Hidden "this" pointer for the audio functions */
+#define _THIS   SDL_AudioDevice *this
+
+#ifdef __WINRT__
+#include "SDL_xaudio2_winrthelpers.h"
+#endif
+
+/* Fixes bug 1210 where some versions of gcc need named parameters */
+#ifdef __GNUC__
+#ifdef THIS
+#undef THIS
+#endif
+#define THIS    INTERFACE *p
+#ifdef THIS_
+#undef THIS_
+#endif
+#define THIS_   INTERFACE *p,
+#endif
+
+struct SDL_PrivateAudioData
+{
+    IXAudio2 *ixa2;
+    IXAudio2SourceVoice *source;
+    IXAudio2MasteringVoice *mastering;
+    SDL_sem * semaphore;
+    Uint8 *mixbuf;
+    int mixlen;
+    Uint8 *nextbuf;
+};
+
+
+static void
+XAUDIO2_DetectDevices(int iscapture, SDL_AddAudioDevice addfn)
+{
+    IXAudio2 *ixa2 = NULL;
+    UINT32 devcount = 0;
+    UINT32 i = 0;
+
+    if (iscapture) {
+        SDL_SetError("XAudio2: capture devices unsupported.");
+        return;
+    } else if (XAudio2Create(&ixa2, 0, XAUDIO2_DEFAULT_PROCESSOR) != S_OK) {
+        SDL_SetError("XAudio2: XAudio2Create() failed at detection.");
+        return;
+    } else if (IXAudio2_GetDeviceCount(ixa2, &devcount) != S_OK) {
+        SDL_SetError("XAudio2: IXAudio2::GetDeviceCount() failed.");
+        IXAudio2_Release(ixa2);
+        return;
+    }
+
+    for (i = 0; i < devcount; i++) {
+        XAUDIO2_DEVICE_DETAILS details;
+        if (IXAudio2_GetDeviceDetails(ixa2, i, &details) == S_OK) {
+            char *str = WIN_StringToUTF8(details.DisplayName);
+            if (str != NULL) {
+                addfn(str);
+                SDL_free(str);  /* addfn() made a copy of the string. */
+            }
+        }
+    }
+
+    IXAudio2_Release(ixa2);
+}
+
+static void STDMETHODCALLTYPE
+VoiceCBOnBufferEnd(THIS_ void *data)
+{
+    /* Just signal the SDL audio thread and get out of XAudio2's way. */
+    SDL_AudioDevice *this = (SDL_AudioDevice *) data;
+    SDL_SemPost(this->hidden->semaphore);
+}
+
+static void STDMETHODCALLTYPE
+VoiceCBOnVoiceError(THIS_ void *data, HRESULT Error)
+{
+    /* !!! FIXME: attempt to recover, or mark device disconnected. */
+    SDL_assert(0 && "write me!");
+}
+
+/* no-op callbacks... */
+static void STDMETHODCALLTYPE VoiceCBOnStreamEnd(THIS) {}
+static void STDMETHODCALLTYPE VoiceCBOnVoiceProcessPassStart(THIS_ UINT32 b) {}
+static void STDMETHODCALLTYPE VoiceCBOnVoiceProcessPassEnd(THIS) {}
+static void STDMETHODCALLTYPE VoiceCBOnBufferStart(THIS_ void *data) {}
+static void STDMETHODCALLTYPE VoiceCBOnLoopEnd(THIS_ void *data) {}
+
+
+static Uint8 *
+XAUDIO2_GetDeviceBuf(_THIS)
+{
+    return this->hidden->nextbuf;
+}
+
+static void
+XAUDIO2_PlayDevice(_THIS)
+{
+    XAUDIO2_BUFFER buffer;
+    Uint8 *mixbuf = this->hidden->mixbuf;
+    Uint8 *nextbuf = this->hidden->nextbuf;
+    const int mixlen = this->hidden->mixlen;
+    IXAudio2SourceVoice *source = this->hidden->source;
+    HRESULT result = S_OK;
+
+    if (!this->enabled) { /* shutting down? */
+        return;
+    }
+
+    /* Submit the next filled buffer */
+    SDL_zero(buffer);
+    buffer.AudioBytes = mixlen;
+    buffer.pAudioData = nextbuf;
+    buffer.pContext = this;
+
+    if (nextbuf == mixbuf) {
+        nextbuf += mixlen;
+    } else {
+        nextbuf = mixbuf;
+    }
+    this->hidden->nextbuf = nextbuf;
+
+    result = IXAudio2SourceVoice_SubmitSourceBuffer(source, &buffer, NULL);
+    if (result == XAUDIO2_E_DEVICE_INVALIDATED) {
+        /* !!! FIXME: possibly disconnected or temporary lost. Recover? */
+    }
+
+    if (result != S_OK) {  /* uhoh, panic! */
+        IXAudio2SourceVoice_FlushSourceBuffers(source);
+        this->enabled = 0;
+    }
+}
+
+static void
+XAUDIO2_WaitDevice(_THIS)
+{
+    if (this->enabled) {
+        SDL_SemWait(this->hidden->semaphore);
+    }
+}
+
+static void
+XAUDIO2_WaitDone(_THIS)
+{
+    IXAudio2SourceVoice *source = this->hidden->source;
+    XAUDIO2_VOICE_STATE state;
+    SDL_assert(!this->enabled);  /* flag that stops playing. */
+    IXAudio2SourceVoice_Discontinuity(source);
+#if SDL_XAUDIO2_WIN8
+    IXAudio2SourceVoice_GetState(source, &state, 0);
+#else
+    IXAudio2SourceVoice_GetState(source, &state);
+#endif
+    while (state.BuffersQueued > 0) {
+        SDL_SemWait(this->hidden->semaphore);
+#if SDL_XAUDIO2_WIN8
+        IXAudio2SourceVoice_GetState(source, &state, 0);
+#else
+        IXAudio2SourceVoice_GetState(source, &state);
+#endif
+    }
+}
+
+
+static void
+XAUDIO2_CloseDevice(_THIS)
+{
+    if (this->hidden != NULL) {
+        IXAudio2 *ixa2 = this->hidden->ixa2;
+        IXAudio2SourceVoice *source = this->hidden->source;
+        IXAudio2MasteringVoice *mastering = this->hidden->mastering;
+
+        if (source != NULL) {
+            IXAudio2SourceVoice_Stop(source, 0, XAUDIO2_COMMIT_NOW);
+            IXAudio2SourceVoice_FlushSourceBuffers(source);
+            IXAudio2SourceVoice_DestroyVoice(source);
+        }
+        if (ixa2 != NULL) {
+            IXAudio2_StopEngine(ixa2);
+        }
+        if (mastering != NULL) {
+            IXAudio2MasteringVoice_DestroyVoice(mastering);
+        }
+        if (ixa2 != NULL) {
+            IXAudio2_Release(ixa2);
+        }
+        SDL_free(this->hidden->mixbuf);
+        if (this->hidden->semaphore != NULL) {
+            SDL_DestroySemaphore(this->hidden->semaphore);
+        }
+
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
+static int
+XAUDIO2_OpenDevice(_THIS, const char *devname, int iscapture)
+{
+    HRESULT result = S_OK;
+    WAVEFORMATEX waveformat;
+    int valid_format = 0;
+    SDL_AudioFormat test_format = SDL_FirstAudioFormat(this->spec.format);
+    IXAudio2 *ixa2 = NULL;
+    IXAudio2SourceVoice *source = NULL;
+#if defined(SDL_XAUDIO2_WIN8)
+    LPCWSTR devId = NULL;
+#else
+    UINT32 devId = 0;  /* 0 == system default device. */
+#endif
+
+    static IXAudio2VoiceCallbackVtbl callbacks_vtable = {
+        VoiceCBOnVoiceProcessPassStart,
+        VoiceCBOnVoiceProcessPassEnd,
+        VoiceCBOnStreamEnd,
+        VoiceCBOnBufferStart,
+        VoiceCBOnBufferEnd,
+        VoiceCBOnLoopEnd,
+        VoiceCBOnVoiceError
+    };
+
+    static IXAudio2VoiceCallback callbacks = { &callbacks_vtable };
+
+    if (iscapture) {
+        return SDL_SetError("XAudio2: capture devices unsupported.");
+    } else if (XAudio2Create(&ixa2, 0, XAUDIO2_DEFAULT_PROCESSOR) != S_OK) {
+        return SDL_SetError("XAudio2: XAudio2Create() failed at open.");
+    }
+
+    /*
+    XAUDIO2_DEBUG_CONFIGURATION debugConfig;
+    debugConfig.TraceMask = XAUDIO2_LOG_ERRORS; //XAUDIO2_LOG_WARNINGS | XAUDIO2_LOG_DETAIL | XAUDIO2_LOG_FUNC_CALLS | XAUDIO2_LOG_TIMING | XAUDIO2_LOG_LOCKS | XAUDIO2_LOG_MEMORY | XAUDIO2_LOG_STREAMING;
+    debugConfig.BreakMask = XAUDIO2_LOG_ERRORS; //XAUDIO2_LOG_WARNINGS;
+    debugConfig.LogThreadID = TRUE;
+    debugConfig.LogFileline = TRUE;
+    debugConfig.LogFunctionName = TRUE;
+    debugConfig.LogTiming = TRUE;
+    ixa2->SetDebugConfiguration(&debugConfig);
+    */
+
+#if ! defined(__WINRT__)
+    if (devname != NULL) {
+        UINT32 devcount = 0;
+        UINT32 i = 0;
+
+        if (IXAudio2_GetDeviceCount(ixa2, &devcount) != S_OK) {
+            IXAudio2_Release(ixa2);
+            return SDL_SetError("XAudio2: IXAudio2_GetDeviceCount() failed.");
+        }
+        for (i = 0; i < devcount; i++) {
+            XAUDIO2_DEVICE_DETAILS details;
+            if (IXAudio2_GetDeviceDetails(ixa2, i, &details) == S_OK) {
+                char *str = WIN_StringToUTF8(details.DisplayName);
+                if (str != NULL) {
+                    const int match = (SDL_strcmp(str, devname) == 0);
+                    SDL_free(str);
+                    if (match) {
+                        devId = i;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (i == devcount) {
+            IXAudio2_Release(ixa2);
+            return SDL_SetError("XAudio2: Requested device not found.");
+        }
+    }
+#endif
+
+    /* Initialize all variables that we clean on shutdown */
+    this->hidden = (struct SDL_PrivateAudioData *)
+        SDL_malloc((sizeof *this->hidden));
+    if (this->hidden == NULL) {
+        IXAudio2_Release(ixa2);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(this->hidden, 0, (sizeof *this->hidden));
+
+    this->hidden->ixa2 = ixa2;
+    this->hidden->semaphore = SDL_CreateSemaphore(1);
+    if (this->hidden->semaphore == NULL) {
+        XAUDIO2_CloseDevice(this);
+        return SDL_SetError("XAudio2: CreateSemaphore() failed!");
+    }
+
+    while ((!valid_format) && (test_format)) {
+        switch (test_format) {
+        case AUDIO_U8:
+        case AUDIO_S16:
+        case AUDIO_S32:
+        case AUDIO_F32:
+            this->spec.format = test_format;
+            valid_format = 1;
+            break;
+        }
+        test_format = SDL_NextAudioFormat();
+    }
+
+    if (!valid_format) {
+        XAUDIO2_CloseDevice(this);
+        return SDL_SetError("XAudio2: Unsupported audio format");
+    }
+
+    /* Update the fragment size as size in bytes */
+    SDL_CalculateAudioSpec(&this->spec);
+
+    /* We feed a Source, it feeds the Mastering, which feeds the device. */
+    this->hidden->mixlen = this->spec.size;
+    this->hidden->mixbuf = (Uint8 *) SDL_malloc(2 * this->hidden->mixlen);
+    if (this->hidden->mixbuf == NULL) {
+        XAUDIO2_CloseDevice(this);
+        return SDL_OutOfMemory();
+    }
+    this->hidden->nextbuf = this->hidden->mixbuf;
+    SDL_memset(this->hidden->mixbuf, 0, 2 * this->hidden->mixlen);
+
+    /* We use XAUDIO2_DEFAULT_CHANNELS instead of this->spec.channels. On
+       Xbox360, this means 5.1 output, but on Windows, it means "figure out
+       what the system has." It might be preferable to let XAudio2 blast
+       stereo output to appropriate surround sound configurations
+       instead of clamping to 2 channels, even though we'll configure the
+       Source Voice for whatever number of channels you supply. */
+#if SDL_XAUDIO2_WIN8
+    result = IXAudio2_CreateMasteringVoice(ixa2, &this->hidden->mastering,
+                                           XAUDIO2_DEFAULT_CHANNELS,
+                                           this->spec.freq, 0, devId, NULL, AudioCategory_GameEffects);
+#else
+    result = IXAudio2_CreateMasteringVoice(ixa2, &this->hidden->mastering,
+                                           XAUDIO2_DEFAULT_CHANNELS,
+                                           this->spec.freq, 0, devId, NULL);
+#endif
+    if (result != S_OK) {
+        XAUDIO2_CloseDevice(this);
+        return SDL_SetError("XAudio2: Couldn't create mastering voice");
+    }
+
+    SDL_zero(waveformat);
+    if (SDL_AUDIO_ISFLOAT(this->spec.format)) {
+        waveformat.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
+    } else {
+        waveformat.wFormatTag = WAVE_FORMAT_PCM;
+    }
+    waveformat.wBitsPerSample = SDL_AUDIO_BITSIZE(this->spec.format);
+    waveformat.nChannels = this->spec.channels;
+    waveformat.nSamplesPerSec = this->spec.freq;
+    waveformat.nBlockAlign =
+        waveformat.nChannels * (waveformat.wBitsPerSample / 8);
+    waveformat.nAvgBytesPerSec =
+        waveformat.nSamplesPerSec * waveformat.nBlockAlign;
+    waveformat.cbSize = sizeof(waveformat);
+
+#ifdef __WINRT__
+    // DLudwig: for now, make XAudio2 do sample rate conversion, just to
+    // get the loopwave test to work.
+    //
+    // TODO, WinRT: consider removing WinRT-specific source-voice creation code from SDL_xaudio2.c
+    result = IXAudio2_CreateSourceVoice(ixa2, &source, &waveformat,
+                                        0,
+                                        1.0f, &callbacks, NULL, NULL);
+#else
+    result = IXAudio2_CreateSourceVoice(ixa2, &source, &waveformat,
+                                        XAUDIO2_VOICE_NOSRC |
+                                        XAUDIO2_VOICE_NOPITCH,
+                                        1.0f, &callbacks, NULL, NULL);
+
+#endif
+    if (result != S_OK) {
+        XAUDIO2_CloseDevice(this);
+        return SDL_SetError("XAudio2: Couldn't create source voice");
+    }
+    this->hidden->source = source;
+
+    /* Start everything playing! */
+    result = IXAudio2_StartEngine(ixa2);
+    if (result != S_OK) {
+        XAUDIO2_CloseDevice(this);
+        return SDL_SetError("XAudio2: Couldn't start engine");
+    }
+
+    result = IXAudio2SourceVoice_Start(source, 0, XAUDIO2_COMMIT_NOW);
+    if (result != S_OK) {
+        XAUDIO2_CloseDevice(this);
+        return SDL_SetError("XAudio2: Couldn't start source voice");
+    }
+
+    return 0; /* good to go. */
+}
+
+static void
+XAUDIO2_Deinitialize(void)
+{
+#if defined(__WIN32__)
+    WIN_CoUninitialize();
+#endif
+}
+
+#endif  /* SDL_XAUDIO2_HAS_SDK */
+
+
+static int
+XAUDIO2_Init(SDL_AudioDriverImpl * impl)
+{
+#ifndef SDL_XAUDIO2_HAS_SDK
+    SDL_SetError("XAudio2: SDL was built without XAudio2 support (old DirectX SDK).");
+    return 0;  /* no XAudio2 support, ever. Update your SDK! */
+#else
+    /* XAudio2Create() is a macro that uses COM; we don't load the .dll */
+    IXAudio2 *ixa2 = NULL;
+#if defined(__WIN32__)
+    // TODO, WinRT: Investigate using CoInitializeEx here
+    if (FAILED(WIN_CoInitialize())) {
+        SDL_SetError("XAudio2: CoInitialize() failed");
+        return 0;
+    }
+#endif
+
+    if (XAudio2Create(&ixa2, 0, XAUDIO2_DEFAULT_PROCESSOR) != S_OK) {
+#if defined(__WIN32__)
+        WIN_CoUninitialize();
+#endif
+        SDL_SetError("XAudio2: XAudio2Create() failed at initialization");
+        return 0;  /* not available. */
+    }
+    IXAudio2_Release(ixa2);
+
+    /* Set the function pointers */
+    impl->DetectDevices = XAUDIO2_DetectDevices;
+    impl->OpenDevice = XAUDIO2_OpenDevice;
+    impl->PlayDevice = XAUDIO2_PlayDevice;
+    impl->WaitDevice = XAUDIO2_WaitDevice;
+    impl->WaitDone = XAUDIO2_WaitDone;
+    impl->GetDeviceBuf = XAUDIO2_GetDeviceBuf;
+    impl->CloseDevice = XAUDIO2_CloseDevice;
+    impl->Deinitialize = XAUDIO2_Deinitialize;
+
+    return 1;   /* this audio target is available. */
+#endif
+}
+
+AudioBootStrap XAUDIO2_bootstrap = {
+    "xaudio2", "XAudio2", XAUDIO2_Init, 0
+};
+
+#endif  /* SDL_AUDIO_DRIVER_XAUDIO2 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp b/Source/3rd Party/sdl/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp
new file mode 100644
index 000000000..69eb5ad12
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp	
@@ -0,0 +1,90 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include <xaudio2.h>
+#include "SDL_xaudio2_winrthelpers.h"
+
+#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
+using Windows::Devices::Enumeration::DeviceClass;
+using Windows::Devices::Enumeration::DeviceInformation;
+using Windows::Devices::Enumeration::DeviceInformationCollection;
+#endif
+
+extern "C" HRESULT __cdecl IXAudio2_GetDeviceCount(IXAudio2 * ixa2, UINT32 * devcount)
+{
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    // There doesn't seem to be any audio device enumeration on Windows Phone.
+    // In lieu of this, just treat things as if there is one and only one
+    // audio device.
+    *devcount = 1;
+    return S_OK;
+#else
+    // TODO, WinRT: make xaudio2 device enumeration only happen once, and in the background
+    auto operation = DeviceInformation::FindAllAsync(DeviceClass::AudioRender);
+    while (operation->Status != Windows::Foundation::AsyncStatus::Completed)
+    {
+    }
+ 
+    DeviceInformationCollection^ devices = operation->GetResults();
+    *devcount = devices->Size;
+    return S_OK;
+#endif
+}
+
+extern "C" HRESULT IXAudio2_GetDeviceDetails(IXAudio2 * unused, UINT32 index, XAUDIO2_DEVICE_DETAILS * details)
+{
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    // Windows Phone doesn't seem to have the same device enumeration APIs that
+    // Windows 8/RT has, or it doesn't have them at all.  In lieu of this,
+    // just treat things as if there is one, and only one, default device.
+    if (index != 0)
+    {
+        return XAUDIO2_E_INVALID_CALL;
+    }
+
+    if (details)
+    {
+        wcsncpy_s(details->DeviceID, ARRAYSIZE(details->DeviceID), L"default", _TRUNCATE);
+        wcsncpy_s(details->DisplayName, ARRAYSIZE(details->DisplayName), L"default", _TRUNCATE);
+    }
+    return S_OK;
+#else
+    auto operation = DeviceInformation::FindAllAsync(DeviceClass::AudioRender);
+    while (operation->Status != Windows::Foundation::AsyncStatus::Completed)
+    {
+    }
+ 
+    DeviceInformationCollection^ devices = operation->GetResults();
+    if (index >= devices->Size)
+    {
+        return XAUDIO2_E_INVALID_CALL;
+    }
+
+    DeviceInformation^ d = devices->GetAt(index);
+    if (details)
+    {
+        wcsncpy_s(details->DeviceID, ARRAYSIZE(details->DeviceID), d->Id->Data(), _TRUNCATE);
+        wcsncpy_s(details->DisplayName, ARRAYSIZE(details->DisplayName), d->Name->Data(), _TRUNCATE);
+    }
+    return S_OK;
+#endif
+}
diff --git a/Source/3rd Party/sdl/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h b/Source/3rd Party/sdl/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h
new file mode 100644
index 000000000..3db04cf96
--- /dev/null
+++ b/Source/3rd Party/sdl/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h	
@@ -0,0 +1,70 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+//
+// Re-implementation of methods removed from XAudio2 (in WinRT):
+//
+
+typedef struct XAUDIO2_DEVICE_DETAILS
+{
+    WCHAR DeviceID[256];
+    WCHAR DisplayName[256];
+    /* Other fields exist in the pre-Windows 8 version of this struct, however
+       they weren't used by SDL, so they weren't added.
+    */
+} XAUDIO2_DEVICE_DETAILS;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+HRESULT IXAudio2_GetDeviceCount(IXAudio2 * unused, UINT32 * devcount);
+HRESULT IXAudio2_GetDeviceDetails(IXAudio2 * unused, UINT32 index, XAUDIO2_DEVICE_DETAILS * details);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+//
+// C-style macros to call XAudio2's methods in C++:
+//
+#ifdef __cplusplus
+/*
+#define IXAudio2_CreateMasteringVoice(A, B, C, D, E, F, G) (A)->CreateMasteringVoice((B), (C), (D), (E), (F), (G))
+#define IXAudio2_CreateSourceVoice(A, B, C, D, E, F, G, H) (A)->CreateSourceVoice((B), (C), (D), (E), (F), (G), (H))
+#define IXAudio2_QueryInterface(A, B, C) (A)->QueryInterface((B), (C))
+#define IXAudio2_Release(A) (A)->Release()
+#define IXAudio2_StartEngine(A) (A)->StartEngine()
+#define IXAudio2_StopEngine(A) (A)->StopEngine()
+
+#define IXAudio2MasteringVoice_DestroyVoice(A) (A)->DestroyVoice()
+
+#define IXAudio2SourceVoice_DestroyVoice(A) (A)->DestroyVoice()
+#define IXAudio2SourceVoice_Discontinuity(A) (A)->Discontinuity()
+#define IXAudio2SourceVoice_FlushSourceBuffers(A) (A)->FlushSourceBuffers()
+#define IXAudio2SourceVoice_GetState(A, B) (A)->GetState((B))
+#define IXAudio2SourceVoice_Start(A, B, C) (A)->Start((B), (C))
+#define IXAudio2SourceVoice_Stop(A, B, C) (A)->Stop((B), (C))
+#define IXAudio2SourceVoice_SubmitSourceBuffer(A, B, C) (A)->SubmitSourceBuffer((B), (C))
+*/
+#endif // ifdef __cplusplus
diff --git a/Source/3rd Party/sdl/src/core/android/SDL_android.c b/Source/3rd Party/sdl/src/core/android/SDL_android.c
new file mode 100644
index 000000000..d806208e7
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/android/SDL_android.c	
@@ -0,0 +1,1496 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+#include "SDL_stdinc.h"
+#include "SDL_assert.h"
+#include "SDL_log.h"
+
+#ifdef __ANDROID__
+
+#include "SDL_system.h"
+#include "SDL_android.h"
+#include <EGL/egl.h>
+
+#include "../../events/SDL_events_c.h"
+#include "../../video/android/SDL_androidkeyboard.h"
+#include "../../video/android/SDL_androidtouch.h"
+#include "../../video/android/SDL_androidvideo.h"
+#include "../../video/android/SDL_androidwindow.h"
+#include "../../joystick/android/SDL_sysjoystick_c.h"
+
+#include <android/log.h>
+#include <pthread.h>
+#include <sys/types.h>
+#include <unistd.h>
+#define LOG_TAG "SDL_android"
+/* #define LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__) */
+/* #define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__) */
+#define LOGI(...) do {} while (false)
+#define LOGE(...) do {} while (false)
+
+/* Uncomment this to log messages entering and exiting methods in this file */
+/* #define DEBUG_JNI */
+
+static void Android_JNI_ThreadDestroyed(void*);
+
+/*******************************************************************************
+ This file links the Java side of Android with libsdl
+*******************************************************************************/
+#include <jni.h>
+#include <android/log.h>
+#include <stdbool.h>
+
+
+/*******************************************************************************
+                               Globals
+*******************************************************************************/
+static pthread_key_t mThreadKey;
+static JavaVM* mJavaVM;
+
+/* Main activity */
+static jclass mActivityClass;
+
+/* method signatures */
+static jmethodID midGetNativeSurface;
+static jmethodID midFlipBuffers;
+static jmethodID midAudioInit;
+static jmethodID midAudioWriteShortBuffer;
+static jmethodID midAudioWriteByteBuffer;
+static jmethodID midAudioQuit;
+static jmethodID midPollInputDevices;
+
+/* Accelerometer data storage */
+static float fLastAccelerometer[3];
+static bool bHasNewData;
+
+/*******************************************************************************
+                 Functions called by JNI
+*******************************************************************************/
+
+/* Library init */
+jint JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+    JNIEnv *env;
+    mJavaVM = vm;
+    LOGI("JNI_OnLoad called");
+    if ((*mJavaVM)->GetEnv(mJavaVM, (void**) &env, JNI_VERSION_1_4) != JNI_OK) {
+        LOGE("Failed to get the environment using GetEnv()");
+        return -1;
+    }
+    /*
+     * Create mThreadKey so we can keep track of the JNIEnv assigned to each thread
+     * Refer to http://developer.android.com/guide/practices/design/jni.html for the rationale behind this
+     */
+    if (pthread_key_create(&mThreadKey, Android_JNI_ThreadDestroyed) != 0) {
+        __android_log_print(ANDROID_LOG_ERROR, "SDL", "Error initializing pthread key");
+    }
+    Android_JNI_SetupThread();
+
+    return JNI_VERSION_1_4;
+}
+
+/* Called before SDL_main() to initialize JNI bindings */
+void SDL_Android_Init(JNIEnv* mEnv, jclass cls)
+{
+    __android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init()");
+
+    Android_JNI_SetupThread();
+
+    mActivityClass = (jclass)((*mEnv)->NewGlobalRef(mEnv, cls));
+
+    midGetNativeSurface = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
+                                "getNativeSurface","()Landroid/view/Surface;");
+    midFlipBuffers = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
+                                "flipBuffers","()V");
+    midAudioInit = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
+                                "audioInit", "(IZZI)I");
+    midAudioWriteShortBuffer = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
+                                "audioWriteShortBuffer", "([S)V");
+    midAudioWriteByteBuffer = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
+                                "audioWriteByteBuffer", "([B)V");
+    midAudioQuit = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
+                                "audioQuit", "()V");
+    midPollInputDevices = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
+                                "pollInputDevices", "()V");
+
+    bHasNewData = false;
+
+    if(!midGetNativeSurface || !midFlipBuffers || !midAudioInit ||
+       !midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioQuit || !midPollInputDevices) {
+        __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL: Couldn't locate Java callbacks, check that they're named and typed correctly");
+    }
+    __android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init() finished!");
+}
+
+/* Resize */
+void Java_org_libsdl_app_SDLActivity_onNativeResize(
+                                    JNIEnv* env, jclass jcls,
+                                    jint width, jint height, jint format)
+{
+    Android_SetScreenResolution(width, height, format);
+}
+
+// Paddown
+int Java_org_libsdl_app_SDLActivity_onNativePadDown(
+                                    JNIEnv* env, jclass jcls,
+                                    jint device_id, jint keycode)
+{
+    return Android_OnPadDown(device_id, keycode);
+}
+
+// Padup
+int Java_org_libsdl_app_SDLActivity_onNativePadUp(
+                                   JNIEnv* env, jclass jcls,
+                                   jint device_id, jint keycode)
+{
+    return Android_OnPadUp(device_id, keycode);
+}
+
+/* Joy */
+void Java_org_libsdl_app_SDLActivity_onNativeJoy(
+                                    JNIEnv* env, jclass jcls,
+                                    jint device_id, jint axis, jfloat value)
+{
+    Android_OnJoy(device_id, axis, value);
+}
+
+/* POV Hat */
+void Java_org_libsdl_app_SDLActivity_onNativeHat(
+                                    JNIEnv* env, jclass jcls,
+                                    jint device_id, jint hat_id, jint x, jint y)
+{
+    Android_OnHat(device_id, hat_id, x, y);
+}
+
+
+int Java_org_libsdl_app_SDLActivity_nativeAddJoystick(
+    JNIEnv* env, jclass jcls,
+    jint device_id, jstring device_name, jint is_accelerometer, 
+    jint nbuttons, jint naxes, jint nhats, jint nballs)
+{
+    int retval;
+    const char *name = (*env)->GetStringUTFChars(env, device_name, NULL);
+
+    retval = Android_AddJoystick(device_id, name, (SDL_bool) is_accelerometer, nbuttons, naxes, nhats, nballs);
+
+    (*env)->ReleaseStringUTFChars(env, device_name, name);
+    
+    return retval;
+}
+
+int Java_org_libsdl_app_SDLActivity_nativeRemoveJoystick(
+    JNIEnv* env, jclass jcls, jint device_id)
+{
+    return Android_RemoveJoystick(device_id);
+}
+
+
+/* Surface Created */
+void Java_org_libsdl_app_SDLActivity_onNativeSurfaceChanged(JNIEnv* env, jclass jcls)
+{
+    SDL_WindowData *data;
+    SDL_VideoDevice *_this;
+
+    if (Android_Window == NULL || Android_Window->driverdata == NULL ) {
+        return;
+    }
+    
+    _this =  SDL_GetVideoDevice();
+    data =  (SDL_WindowData *) Android_Window->driverdata;
+    
+    /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
+    if (data->egl_surface == EGL_NO_SURFACE) {
+        if(data->native_window) {
+            ANativeWindow_release(data->native_window);
+        }
+        data->native_window = Android_JNI_GetNativeWindow();
+        data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) data->native_window);
+    }
+    
+    /* GL Context handling is done in the event loop because this function is run from the Java thread */
+    
+}
+
+/* Surface Destroyed */
+void Java_org_libsdl_app_SDLActivity_onNativeSurfaceDestroyed(JNIEnv* env, jclass jcls)
+{
+    /* We have to clear the current context and destroy the egl surface here
+     * Otherwise there's BAD_NATIVE_WINDOW errors coming from eglCreateWindowSurface on resume
+     * Ref: http://stackoverflow.com/questions/8762589/eglcreatewindowsurface-on-ics-and-switching-from-2d-to-3d
+     */
+    SDL_WindowData *data;
+    SDL_VideoDevice *_this;
+    
+    if (Android_Window == NULL || Android_Window->driverdata == NULL ) {
+        return;
+    }
+    
+    _this =  SDL_GetVideoDevice();
+    data = (SDL_WindowData *) Android_Window->driverdata;
+    
+    if (data->egl_surface != EGL_NO_SURFACE) {
+        SDL_EGL_MakeCurrent(_this, NULL, NULL);
+        SDL_EGL_DestroySurface(_this, data->egl_surface);
+        data->egl_surface = EGL_NO_SURFACE;
+    }
+    
+    /* GL Context handling is done in the event loop because this function is run from the Java thread */
+
+}
+
+void Java_org_libsdl_app_SDLActivity_nativeFlipBuffers(JNIEnv* env, jclass jcls)
+{
+    SDL_GL_SwapWindow(Android_Window);
+}
+
+/* Keydown */
+void Java_org_libsdl_app_SDLActivity_onNativeKeyDown(
+                                    JNIEnv* env, jclass jcls, jint keycode)
+{
+    Android_OnKeyDown(keycode);
+}
+
+/* Keyup */
+void Java_org_libsdl_app_SDLActivity_onNativeKeyUp(
+                                    JNIEnv* env, jclass jcls, jint keycode)
+{
+    Android_OnKeyUp(keycode);
+}
+
+/* Keyboard Focus Lost */
+void Java_org_libsdl_app_SDLActivity_onNativeKeyboardFocusLost(
+                                    JNIEnv* env, jclass jcls)
+{
+    /* Calling SDL_StopTextInput will take care of hiding the keyboard and cleaning up the DummyText widget */
+    SDL_StopTextInput();
+}
+
+
+/* Touch */
+void Java_org_libsdl_app_SDLActivity_onNativeTouch(
+                                    JNIEnv* env, jclass jcls,
+                                    jint touch_device_id_in, jint pointer_finger_id_in,
+                                    jint action, jfloat x, jfloat y, jfloat p)
+{
+    Android_OnTouch(touch_device_id_in, pointer_finger_id_in, action, x, y, p);
+}
+
+/* Accelerometer */
+void Java_org_libsdl_app_SDLActivity_onNativeAccel(
+                                    JNIEnv* env, jclass jcls,
+                                    jfloat x, jfloat y, jfloat z)
+{
+    fLastAccelerometer[0] = x;
+    fLastAccelerometer[1] = y;
+    fLastAccelerometer[2] = z;
+    bHasNewData = true;
+}
+
+/* Low memory */
+void Java_org_libsdl_app_SDLActivity_nativeLowMemory(
+                                    JNIEnv* env, jclass cls)
+{
+    SDL_SendAppEvent(SDL_APP_LOWMEMORY);
+}
+
+/* Quit */
+void Java_org_libsdl_app_SDLActivity_nativeQuit(
+                                    JNIEnv* env, jclass cls)
+{
+    /* Discard previous events. The user should have handled state storage
+     * in SDL_APP_WILLENTERBACKGROUND. After nativeQuit() is called, no
+     * events other than SDL_QUIT and SDL_APP_TERMINATING should fire */
+    SDL_FlushEvents(SDL_FIRSTEVENT, SDL_LASTEVENT);
+    /* Inject a SDL_QUIT event */
+    SDL_SendQuit();
+    SDL_SendAppEvent(SDL_APP_TERMINATING);
+    /* Resume the event loop so that the app can catch SDL_QUIT which
+     * should now be the top event in the event queue. */
+    if (!SDL_SemValue(Android_ResumeSem)) SDL_SemPost(Android_ResumeSem);
+}
+
+/* Pause */
+void Java_org_libsdl_app_SDLActivity_nativePause(
+                                    JNIEnv* env, jclass cls)
+{
+    __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "nativePause()");
+    if (Android_Window) {
+        SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0);
+        SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
+        SDL_SendAppEvent(SDL_APP_WILLENTERBACKGROUND);
+        SDL_SendAppEvent(SDL_APP_DIDENTERBACKGROUND);
+    
+        /* *After* sending the relevant events, signal the pause semaphore 
+         * so the event loop knows to pause and (optionally) block itself */
+        if (!SDL_SemValue(Android_PauseSem)) SDL_SemPost(Android_PauseSem);
+    }
+}
+
+/* Resume */
+void Java_org_libsdl_app_SDLActivity_nativeResume(
+                                    JNIEnv* env, jclass cls)
+{
+    __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "nativeResume()");
+
+    if (Android_Window) {
+        SDL_SendAppEvent(SDL_APP_WILLENTERFOREGROUND);
+        SDL_SendAppEvent(SDL_APP_DIDENTERFOREGROUND);
+        SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_FOCUS_GAINED, 0, 0);
+        SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_RESTORED, 0, 0);
+        /* Signal the resume semaphore so the event loop knows to resume and restore the GL Context
+         * We can't restore the GL Context here because it needs to be done on the SDL main thread
+         * and this function will be called from the Java thread instead.
+         */
+        if (!SDL_SemValue(Android_ResumeSem)) SDL_SemPost(Android_ResumeSem);
+    }
+}
+
+void Java_org_libsdl_app_SDLInputConnection_nativeCommitText(
+                                    JNIEnv* env, jclass cls,
+                                    jstring text, jint newCursorPosition)
+{
+    const char *utftext = (*env)->GetStringUTFChars(env, text, NULL);
+
+    SDL_SendKeyboardText(utftext);
+
+    (*env)->ReleaseStringUTFChars(env, text, utftext);
+}
+
+void Java_org_libsdl_app_SDLInputConnection_nativeSetComposingText(
+                                    JNIEnv* env, jclass cls,
+                                    jstring text, jint newCursorPosition)
+{
+    const char *utftext = (*env)->GetStringUTFChars(env, text, NULL);
+
+    SDL_SendEditingText(utftext, 0, 0);
+
+    (*env)->ReleaseStringUTFChars(env, text, utftext);
+}
+
+
+
+/*******************************************************************************
+             Functions called by SDL into Java
+*******************************************************************************/
+
+static int s_active = 0;
+struct LocalReferenceHolder
+{
+    JNIEnv *m_env;
+    const char *m_func;
+};
+
+static struct LocalReferenceHolder LocalReferenceHolder_Setup(const char *func)
+{
+    struct LocalReferenceHolder refholder;
+    refholder.m_env = NULL;
+    refholder.m_func = func;
+#ifdef DEBUG_JNI
+    SDL_Log("Entering function %s", func);
+#endif
+    return refholder;
+}
+
+static SDL_bool LocalReferenceHolder_Init(struct LocalReferenceHolder *refholder, JNIEnv *env)
+{
+    const int capacity = 16;
+    if ((*env)->PushLocalFrame(env, capacity) < 0) {
+        SDL_SetError("Failed to allocate enough JVM local references");
+        return SDL_FALSE;
+    }
+    ++s_active;
+    refholder->m_env = env;
+    return SDL_TRUE;
+}
+
+static void LocalReferenceHolder_Cleanup(struct LocalReferenceHolder *refholder)
+{
+#ifdef DEBUG_JNI
+    SDL_Log("Leaving function %s", refholder->m_func);
+#endif
+    if (refholder->m_env) {
+        JNIEnv* env = refholder->m_env;
+        (*env)->PopLocalFrame(env, NULL);
+        --s_active;
+    }
+}
+
+static SDL_bool LocalReferenceHolder_IsActive()
+{
+    return s_active > 0;    
+}
+
+ANativeWindow* Android_JNI_GetNativeWindow(void)
+{
+    ANativeWindow* anw;
+    jobject s;
+    JNIEnv *env = Android_JNI_GetEnv();
+
+    s = (*env)->CallStaticObjectMethod(env, mActivityClass, midGetNativeSurface);
+    anw = ANativeWindow_fromSurface(env, s);
+    (*env)->DeleteLocalRef(env, s);
+  
+    return anw;
+}
+
+void Android_JNI_SwapWindow()
+{
+    JNIEnv *mEnv = Android_JNI_GetEnv();
+    (*mEnv)->CallStaticVoidMethod(mEnv, mActivityClass, midFlipBuffers);
+}
+
+void Android_JNI_SetActivityTitle(const char *title)
+{
+    jmethodID mid;
+    JNIEnv *mEnv = Android_JNI_GetEnv();
+    mid = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,"setActivityTitle","(Ljava/lang/String;)Z");
+    if (mid) {
+        jstring jtitle = (jstring)((*mEnv)->NewStringUTF(mEnv, title));
+        (*mEnv)->CallStaticBooleanMethod(mEnv, mActivityClass, mid, jtitle);
+        (*mEnv)->DeleteLocalRef(mEnv, jtitle);
+    }
+}
+
+SDL_bool Android_JNI_GetAccelerometerValues(float values[3])
+{
+    int i;
+    SDL_bool retval = SDL_FALSE;
+
+    if (bHasNewData) {
+        for (i = 0; i < 3; ++i) {
+            values[i] = fLastAccelerometer[i];
+        }
+        bHasNewData = false;
+        retval = SDL_TRUE;
+    }
+
+    return retval;
+}
+
+static void Android_JNI_ThreadDestroyed(void* value)
+{
+    /* The thread is being destroyed, detach it from the Java VM and set the mThreadKey value to NULL as required */
+    JNIEnv *env = (JNIEnv*) value;
+    if (env != NULL) {
+        (*mJavaVM)->DetachCurrentThread(mJavaVM);
+        pthread_setspecific(mThreadKey, NULL);
+    }
+}
+
+JNIEnv* Android_JNI_GetEnv(void)
+{
+    /* From http://developer.android.com/guide/practices/jni.html
+     * All threads are Linux threads, scheduled by the kernel.
+     * They're usually started from managed code (using Thread.start), but they can also be created elsewhere and then
+     * attached to the JavaVM. For example, a thread started with pthread_create can be attached with the
+     * JNI AttachCurrentThread or AttachCurrentThreadAsDaemon functions. Until a thread is attached, it has no JNIEnv,
+     * and cannot make JNI calls.
+     * Attaching a natively-created thread causes a java.lang.Thread object to be constructed and added to the "main"
+     * ThreadGroup, making it visible to the debugger. Calling AttachCurrentThread on an already-attached thread
+     * is a no-op.
+     * Note: You can call this function any number of times for the same thread, there's no harm in it
+     */
+
+    JNIEnv *env;
+    int status = (*mJavaVM)->AttachCurrentThread(mJavaVM, &env, NULL);
+    if(status < 0) {
+        LOGE("failed to attach current thread");
+        return 0;
+    }
+
+    /* From http://developer.android.com/guide/practices/jni.html
+     * Threads attached through JNI must call DetachCurrentThread before they exit. If coding this directly is awkward,
+     * in Android 2.0 (Eclair) and higher you can use pthread_key_create to define a destructor function that will be
+     * called before the thread exits, and call DetachCurrentThread from there. (Use that key with pthread_setspecific
+     * to store the JNIEnv in thread-local-storage; that way it'll be passed into your destructor as the argument.)
+     * Note: The destructor is not called unless the stored value is != NULL
+     * Note: You can call this function any number of times for the same thread, there's no harm in it
+     *       (except for some lost CPU cycles)
+     */
+    pthread_setspecific(mThreadKey, (void*) env);
+
+    return env;
+}
+
+int Android_JNI_SetupThread(void)
+{
+    Android_JNI_GetEnv();
+    return 1;
+}
+
+/*
+ * Audio support
+ */
+static jboolean audioBuffer16Bit = JNI_FALSE;
+static jboolean audioBufferStereo = JNI_FALSE;
+static jobject audioBuffer = NULL;
+static void* audioBufferPinned = NULL;
+
+int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames)
+{
+    int audioBufferFrames;
+
+    JNIEnv *env = Android_JNI_GetEnv();
+
+    if (!env) {
+        LOGE("callback_handler: failed to attach current thread");
+    }
+    Android_JNI_SetupThread();
+
+    __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDL audio: opening device");
+    audioBuffer16Bit = is16Bit;
+    audioBufferStereo = channelCount > 1;
+
+    if ((*env)->CallStaticIntMethod(env, mActivityClass, midAudioInit, sampleRate, audioBuffer16Bit, audioBufferStereo, desiredBufferFrames) != 0) {
+        /* Error during audio initialization */
+        __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL audio: error on AudioTrack initialization!");
+        return 0;
+    }
+
+    /* Allocating the audio buffer from the Java side and passing it as the return value for audioInit no longer works on
+     * Android >= 4.2 due to a "stale global reference" error. So now we allocate this buffer directly from this side. */
+
+    if (is16Bit) {
+        jshortArray audioBufferLocal = (*env)->NewShortArray(env, desiredBufferFrames * (audioBufferStereo ? 2 : 1));
+        if (audioBufferLocal) {
+            audioBuffer = (*env)->NewGlobalRef(env, audioBufferLocal);
+            (*env)->DeleteLocalRef(env, audioBufferLocal);
+        }
+    }
+    else {
+        jbyteArray audioBufferLocal = (*env)->NewByteArray(env, desiredBufferFrames * (audioBufferStereo ? 2 : 1));
+        if (audioBufferLocal) {
+            audioBuffer = (*env)->NewGlobalRef(env, audioBufferLocal);
+            (*env)->DeleteLocalRef(env, audioBufferLocal);
+        }
+    }
+
+    if (audioBuffer == NULL) {
+        __android_log_print(ANDROID_LOG_WARN, "SDL", "SDL audio: could not allocate an audio buffer!");
+        return 0;
+    }
+
+    jboolean isCopy = JNI_FALSE;
+    if (audioBuffer16Bit) {
+        audioBufferPinned = (*env)->GetShortArrayElements(env, (jshortArray)audioBuffer, &isCopy);
+        audioBufferFrames = (*env)->GetArrayLength(env, (jshortArray)audioBuffer);
+    } else {
+        audioBufferPinned = (*env)->GetByteArrayElements(env, (jbyteArray)audioBuffer, &isCopy);
+        audioBufferFrames = (*env)->GetArrayLength(env, (jbyteArray)audioBuffer);
+    }
+    if (audioBufferStereo) {
+        audioBufferFrames /= 2;
+    }
+
+    return audioBufferFrames;
+}
+
+void * Android_JNI_GetAudioBuffer()
+{
+    return audioBufferPinned;
+}
+
+void Android_JNI_WriteAudioBuffer()
+{
+    JNIEnv *mAudioEnv = Android_JNI_GetEnv();
+
+    if (audioBuffer16Bit) {
+        (*mAudioEnv)->ReleaseShortArrayElements(mAudioEnv, (jshortArray)audioBuffer, (jshort *)audioBufferPinned, JNI_COMMIT);
+        (*mAudioEnv)->CallStaticVoidMethod(mAudioEnv, mActivityClass, midAudioWriteShortBuffer, (jshortArray)audioBuffer);
+    } else {
+        (*mAudioEnv)->ReleaseByteArrayElements(mAudioEnv, (jbyteArray)audioBuffer, (jbyte *)audioBufferPinned, JNI_COMMIT);
+        (*mAudioEnv)->CallStaticVoidMethod(mAudioEnv, mActivityClass, midAudioWriteByteBuffer, (jbyteArray)audioBuffer);
+    }
+
+    /* JNI_COMMIT means the changes are committed to the VM but the buffer remains pinned */
+}
+
+void Android_JNI_CloseAudioDevice()
+{
+    JNIEnv *env = Android_JNI_GetEnv();
+
+    (*env)->CallStaticVoidMethod(env, mActivityClass, midAudioQuit);
+
+    if (audioBuffer) {
+        (*env)->DeleteGlobalRef(env, audioBuffer);
+        audioBuffer = NULL;
+        audioBufferPinned = NULL;
+    }
+}
+
+/* Test for an exception and call SDL_SetError with its detail if one occurs */
+/* If the parameter silent is truthy then SDL_SetError() will not be called. */
+static bool Android_JNI_ExceptionOccurred(bool silent)
+{
+    SDL_assert(LocalReferenceHolder_IsActive());
+    JNIEnv *mEnv = Android_JNI_GetEnv();
+
+    jthrowable exception = (*mEnv)->ExceptionOccurred(mEnv);
+    if (exception != NULL) {
+        jmethodID mid;
+
+        /* Until this happens most JNI operations have undefined behaviour */
+        (*mEnv)->ExceptionClear(mEnv);
+
+        if (!silent) {
+            jclass exceptionClass = (*mEnv)->GetObjectClass(mEnv, exception);
+            jclass classClass = (*mEnv)->FindClass(mEnv, "java/lang/Class");
+
+            mid = (*mEnv)->GetMethodID(mEnv, classClass, "getName", "()Ljava/lang/String;");
+            jstring exceptionName = (jstring)(*mEnv)->CallObjectMethod(mEnv, exceptionClass, mid);
+            const char* exceptionNameUTF8 = (*mEnv)->GetStringUTFChars(mEnv, exceptionName, 0);
+
+            mid = (*mEnv)->GetMethodID(mEnv, exceptionClass, "getMessage", "()Ljava/lang/String;");
+            jstring exceptionMessage = (jstring)(*mEnv)->CallObjectMethod(mEnv, exception, mid);
+
+            if (exceptionMessage != NULL) {
+                const char* exceptionMessageUTF8 = (*mEnv)->GetStringUTFChars(mEnv, exceptionMessage, 0);
+                SDL_SetError("%s: %s", exceptionNameUTF8, exceptionMessageUTF8);
+                (*mEnv)->ReleaseStringUTFChars(mEnv, exceptionMessage, exceptionMessageUTF8);
+            } else {
+                SDL_SetError("%s", exceptionNameUTF8);
+            }
+
+            (*mEnv)->ReleaseStringUTFChars(mEnv, exceptionName, exceptionNameUTF8);
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+static int Internal_Android_JNI_FileOpen(SDL_RWops* ctx)
+{
+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+
+    int result = 0;
+
+    jmethodID mid;
+    jobject context;
+    jobject assetManager;
+    jobject inputStream;
+    jclass channels;
+    jobject readableByteChannel;
+    jstring fileNameJString;
+    jobject fd;
+    jclass fdCls;
+    jfieldID descriptor;
+
+    JNIEnv *mEnv = Android_JNI_GetEnv();
+    if (!LocalReferenceHolder_Init(&refs, mEnv)) {
+        goto failure;
+    }
+
+    fileNameJString = (jstring)ctx->hidden.androidio.fileNameRef;
+    ctx->hidden.androidio.position = 0;
+
+    /* context = SDLActivity.getContext(); */
+    mid = (*mEnv)->GetStaticMethodID(mEnv, mActivityClass,
+            "getContext","()Landroid/content/Context;");
+    context = (*mEnv)->CallStaticObjectMethod(mEnv, mActivityClass, mid);
+
+
+    /* assetManager = context.getAssets(); */
+    mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, context),
+            "getAssets", "()Landroid/content/res/AssetManager;");
+    assetManager = (*mEnv)->CallObjectMethod(mEnv, context, mid);
+
+    /* First let's try opening the file to obtain an AssetFileDescriptor.
+    * This method reads the files directly from the APKs using standard *nix calls
+    */
+    mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, assetManager), "openFd", "(Ljava/lang/String;)Landroid/content/res/AssetFileDescriptor;");
+    inputStream = (*mEnv)->CallObjectMethod(mEnv, assetManager, mid, fileNameJString);
+    if (Android_JNI_ExceptionOccurred(true)) {
+        goto fallback;
+    }
+
+    mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, inputStream), "getStartOffset", "()J");
+    ctx->hidden.androidio.offset = (*mEnv)->CallLongMethod(mEnv, inputStream, mid);
+    if (Android_JNI_ExceptionOccurred(true)) {
+        goto fallback;
+    }
+
+    mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, inputStream), "getDeclaredLength", "()J");
+    ctx->hidden.androidio.size = (*mEnv)->CallLongMethod(mEnv, inputStream, mid);
+    if (Android_JNI_ExceptionOccurred(true)) {
+        goto fallback;
+    }
+
+    mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, inputStream), "getFileDescriptor", "()Ljava/io/FileDescriptor;");
+    fd = (*mEnv)->CallObjectMethod(mEnv, inputStream, mid);
+    fdCls = (*mEnv)->GetObjectClass(mEnv, fd);
+    descriptor = (*mEnv)->GetFieldID(mEnv, fdCls, "descriptor", "I");
+    ctx->hidden.androidio.fd = (*mEnv)->GetIntField(mEnv, fd, descriptor);
+    ctx->hidden.androidio.assetFileDescriptorRef = (*mEnv)->NewGlobalRef(mEnv, inputStream);
+
+    /* Seek to the correct offset in the file. */
+    lseek(ctx->hidden.androidio.fd, (off_t)ctx->hidden.androidio.offset, SEEK_SET);
+
+    if (false) {
+fallback:
+        /* Disabled log message because of spam on the Nexus 7 */
+        /* __android_log_print(ANDROID_LOG_DEBUG, "SDL", "Falling back to legacy InputStream method for opening file"); */
+
+        /* Try the old method using InputStream */
+        ctx->hidden.androidio.assetFileDescriptorRef = NULL;
+
+        /* inputStream = assetManager.open(<filename>); */
+        mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, assetManager),
+                "open", "(Ljava/lang/String;I)Ljava/io/InputStream;");
+        inputStream = (*mEnv)->CallObjectMethod(mEnv, assetManager, mid, fileNameJString, 1 /* ACCESS_RANDOM */);
+        if (Android_JNI_ExceptionOccurred(false)) {
+            goto failure;
+        }
+
+        ctx->hidden.androidio.inputStreamRef = (*mEnv)->NewGlobalRef(mEnv, inputStream);
+
+        /* Despite all the visible documentation on [Asset]InputStream claiming
+         * that the .available() method is not guaranteed to return the entire file
+         * size, comments in <sdk>/samples/<ver>/ApiDemos/src/com/example/ ...
+         * android/apis/content/ReadAsset.java imply that Android's
+         * AssetInputStream.available() /will/ always return the total file size
+        */
+        
+        /* size = inputStream.available(); */
+        mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, inputStream),
+                "available", "()I");
+        ctx->hidden.androidio.size = (long)(*mEnv)->CallIntMethod(mEnv, inputStream, mid);
+        if (Android_JNI_ExceptionOccurred(false)) {
+            goto failure;
+        }
+
+        /* readableByteChannel = Channels.newChannel(inputStream); */
+        channels = (*mEnv)->FindClass(mEnv, "java/nio/channels/Channels");
+        mid = (*mEnv)->GetStaticMethodID(mEnv, channels,
+                "newChannel",
+                "(Ljava/io/InputStream;)Ljava/nio/channels/ReadableByteChannel;");
+        readableByteChannel = (*mEnv)->CallStaticObjectMethod(
+                mEnv, channels, mid, inputStream);
+        if (Android_JNI_ExceptionOccurred(false)) {
+            goto failure;
+        }
+
+        ctx->hidden.androidio.readableByteChannelRef =
+            (*mEnv)->NewGlobalRef(mEnv, readableByteChannel);
+
+        /* Store .read id for reading purposes */
+        mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, readableByteChannel),
+                "read", "(Ljava/nio/ByteBuffer;)I");
+        ctx->hidden.androidio.readMethod = mid;
+    }
+
+    if (false) {
+failure:
+        result = -1;
+
+        (*mEnv)->DeleteGlobalRef(mEnv, (jobject)ctx->hidden.androidio.fileNameRef);
+
+        if(ctx->hidden.androidio.inputStreamRef != NULL) {
+            (*mEnv)->DeleteGlobalRef(mEnv, (jobject)ctx->hidden.androidio.inputStreamRef);
+        }
+
+        if(ctx->hidden.androidio.readableByteChannelRef != NULL) {
+            (*mEnv)->DeleteGlobalRef(mEnv, (jobject)ctx->hidden.androidio.readableByteChannelRef);
+        }
+
+        if(ctx->hidden.androidio.assetFileDescriptorRef != NULL) {
+            (*mEnv)->DeleteGlobalRef(mEnv, (jobject)ctx->hidden.androidio.assetFileDescriptorRef);
+        }
+
+    }
+    
+    LocalReferenceHolder_Cleanup(&refs);
+    return result;
+}
+
+int Android_JNI_FileOpen(SDL_RWops* ctx,
+        const char* fileName, const char* mode)
+{
+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+    JNIEnv *mEnv = Android_JNI_GetEnv();
+    int retval;
+
+    if (!LocalReferenceHolder_Init(&refs, mEnv)) {
+        LocalReferenceHolder_Cleanup(&refs);        
+        return -1;
+    }
+
+    if (!ctx) {
+        LocalReferenceHolder_Cleanup(&refs);
+        return -1;
+    }
+
+    jstring fileNameJString = (*mEnv)->NewStringUTF(mEnv, fileName);
+    ctx->hidden.androidio.fileNameRef = (*mEnv)->NewGlobalRef(mEnv, fileNameJString);
+    ctx->hidden.androidio.inputStreamRef = NULL;
+    ctx->hidden.androidio.readableByteChannelRef = NULL;
+    ctx->hidden.androidio.readMethod = NULL;
+    ctx->hidden.androidio.assetFileDescriptorRef = NULL;
+
+    retval = Internal_Android_JNI_FileOpen(ctx);
+    LocalReferenceHolder_Cleanup(&refs);
+    return retval;
+}
+
+size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer,
+        size_t size, size_t maxnum)
+{
+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+
+    if (ctx->hidden.androidio.assetFileDescriptorRef) {
+        size_t bytesMax = size * maxnum;
+        if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && ctx->hidden.androidio.position + bytesMax > ctx->hidden.androidio.size) {
+            bytesMax = ctx->hidden.androidio.size - ctx->hidden.androidio.position;
+        }
+        size_t result = read(ctx->hidden.androidio.fd, buffer, bytesMax );
+        if (result > 0) {
+            ctx->hidden.androidio.position += result;
+            LocalReferenceHolder_Cleanup(&refs);
+            return result / size;
+        }
+        LocalReferenceHolder_Cleanup(&refs);
+        return 0;
+    } else {
+        jlong bytesRemaining = (jlong) (size * maxnum);
+        jlong bytesMax = (jlong) (ctx->hidden.androidio.size -  ctx->hidden.androidio.position);
+        int bytesRead = 0;
+
+        /* Don't read more bytes than those that remain in the file, otherwise we get an exception */
+        if (bytesRemaining >  bytesMax) bytesRemaining = bytesMax;
+
+        JNIEnv *mEnv = Android_JNI_GetEnv();
+        if (!LocalReferenceHolder_Init(&refs, mEnv)) {
+            LocalReferenceHolder_Cleanup(&refs);            
+            return 0;
+        }
+
+        jobject readableByteChannel = (jobject)ctx->hidden.androidio.readableByteChannelRef;
+        jmethodID readMethod = (jmethodID)ctx->hidden.androidio.readMethod;
+        jobject byteBuffer = (*mEnv)->NewDirectByteBuffer(mEnv, buffer, bytesRemaining);
+
+        while (bytesRemaining > 0) {
+            /* result = readableByteChannel.read(...); */
+            int result = (*mEnv)->CallIntMethod(mEnv, readableByteChannel, readMethod, byteBuffer);
+
+            if (Android_JNI_ExceptionOccurred(false)) {
+                LocalReferenceHolder_Cleanup(&refs);            
+                return 0;
+            }
+
+            if (result < 0) {
+                break;
+            }
+
+            bytesRemaining -= result;
+            bytesRead += result;
+            ctx->hidden.androidio.position += result;
+        }
+        LocalReferenceHolder_Cleanup(&refs);                    
+        return bytesRead / size;
+    }
+}
+
+size_t Android_JNI_FileWrite(SDL_RWops* ctx, const void* buffer,
+        size_t size, size_t num)
+{
+    SDL_SetError("Cannot write to Android package filesystem");
+    return 0;
+}
+
+static int Internal_Android_JNI_FileClose(SDL_RWops* ctx, bool release)
+{
+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+
+    int result = 0;
+    JNIEnv *mEnv = Android_JNI_GetEnv();
+
+    if (!LocalReferenceHolder_Init(&refs, mEnv)) {
+        LocalReferenceHolder_Cleanup(&refs);
+        return SDL_SetError("Failed to allocate enough JVM local references");
+    }
+
+    if (ctx) {
+        if (release) {
+            (*mEnv)->DeleteGlobalRef(mEnv, (jobject)ctx->hidden.androidio.fileNameRef);
+        }
+
+        if (ctx->hidden.androidio.assetFileDescriptorRef) {
+            jobject inputStream = (jobject)ctx->hidden.androidio.assetFileDescriptorRef;
+            jmethodID mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, inputStream),
+                    "close", "()V");
+            (*mEnv)->CallVoidMethod(mEnv, inputStream, mid);
+            (*mEnv)->DeleteGlobalRef(mEnv, (jobject)ctx->hidden.androidio.assetFileDescriptorRef);
+            if (Android_JNI_ExceptionOccurred(false)) {
+                result = -1;
+            }
+        }
+        else {
+            jobject inputStream = (jobject)ctx->hidden.androidio.inputStreamRef;
+
+            /* inputStream.close(); */
+            jmethodID mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, inputStream),
+                    "close", "()V");
+            (*mEnv)->CallVoidMethod(mEnv, inputStream, mid);
+            (*mEnv)->DeleteGlobalRef(mEnv, (jobject)ctx->hidden.androidio.inputStreamRef);
+            (*mEnv)->DeleteGlobalRef(mEnv, (jobject)ctx->hidden.androidio.readableByteChannelRef);
+            if (Android_JNI_ExceptionOccurred(false)) {
+                result = -1;
+            }
+        }
+
+        if (release) {
+            SDL_FreeRW(ctx);
+        }
+    }
+
+    LocalReferenceHolder_Cleanup(&refs);
+    return result;
+}
+
+
+Sint64 Android_JNI_FileSize(SDL_RWops* ctx)
+{
+    return ctx->hidden.androidio.size;
+}
+
+Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence)
+{
+    if (ctx->hidden.androidio.assetFileDescriptorRef) {
+        switch (whence) {
+            case RW_SEEK_SET:
+                if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
+                offset += ctx->hidden.androidio.offset;
+                break;
+            case RW_SEEK_CUR:
+                offset += ctx->hidden.androidio.position;
+                if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
+                offset += ctx->hidden.androidio.offset;
+                break;
+            case RW_SEEK_END:
+                offset = ctx->hidden.androidio.offset + ctx->hidden.androidio.size + offset;
+                break;
+            default:
+                return SDL_SetError("Unknown value for 'whence'");
+        }
+        whence = SEEK_SET;
+
+        off_t ret = lseek(ctx->hidden.androidio.fd, (off_t)offset, SEEK_SET);
+        if (ret == -1) return -1;
+        ctx->hidden.androidio.position = ret - ctx->hidden.androidio.offset;
+    } else {
+        Sint64 newPosition;
+
+        switch (whence) {
+            case RW_SEEK_SET:
+                newPosition = offset;
+                break;
+            case RW_SEEK_CUR:
+                newPosition = ctx->hidden.androidio.position + offset;
+                break;
+            case RW_SEEK_END:
+                newPosition = ctx->hidden.androidio.size + offset;
+                break;
+            default:
+                return SDL_SetError("Unknown value for 'whence'");
+        }
+
+        /* Validate the new position */
+        if (newPosition < 0) {
+            return SDL_Error(SDL_EFSEEK);
+        }
+        if (newPosition > ctx->hidden.androidio.size) {
+            newPosition = ctx->hidden.androidio.size;
+        }
+
+        Sint64 movement = newPosition - ctx->hidden.androidio.position;
+        if (movement > 0) {
+            unsigned char buffer[4096];
+
+            /* The easy case where we're seeking forwards */
+            while (movement > 0) {
+                Sint64 amount = sizeof (buffer);
+                if (amount > movement) {
+                    amount = movement;
+                }
+                size_t result = Android_JNI_FileRead(ctx, buffer, 1, amount);
+                if (result <= 0) {
+                    /* Failed to read/skip the required amount, so fail */
+                    return -1;
+                }
+
+                movement -= result;
+            }
+
+        } else if (movement < 0) {
+            /* We can't seek backwards so we have to reopen the file and seek */
+            /* forwards which obviously isn't very efficient */
+            Internal_Android_JNI_FileClose(ctx, false);
+            Internal_Android_JNI_FileOpen(ctx);
+            Android_JNI_FileSeek(ctx, newPosition, RW_SEEK_SET);
+        }
+    }
+
+    return ctx->hidden.androidio.position;
+
+}
+
+int Android_JNI_FileClose(SDL_RWops* ctx)
+{
+    return Internal_Android_JNI_FileClose(ctx, true);
+}
+
+/* returns a new global reference which needs to be released later */
+static jobject Android_JNI_GetSystemServiceObject(const char* name)
+{
+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+    JNIEnv* env = Android_JNI_GetEnv();
+    jobject retval = NULL;
+
+    if (!LocalReferenceHolder_Init(&refs, env)) {
+        LocalReferenceHolder_Cleanup(&refs);
+        return NULL;
+    }
+
+    jstring service = (*env)->NewStringUTF(env, name);
+
+    jmethodID mid;
+
+    mid = (*env)->GetStaticMethodID(env, mActivityClass, "getContext", "()Landroid/content/Context;");
+    jobject context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
+
+    mid = (*env)->GetMethodID(env, mActivityClass, "getSystemServiceFromUiThread", "(Ljava/lang/String;)Ljava/lang/Object;");
+    jobject manager = (*env)->CallObjectMethod(env, context, mid, service);
+
+    (*env)->DeleteLocalRef(env, service);
+
+    retval = manager ? (*env)->NewGlobalRef(env, manager) : NULL;
+    LocalReferenceHolder_Cleanup(&refs);
+    return retval;
+}
+
+#define SETUP_CLIPBOARD(error) \
+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__); \
+    JNIEnv* env = Android_JNI_GetEnv(); \
+    if (!LocalReferenceHolder_Init(&refs, env)) { \
+        LocalReferenceHolder_Cleanup(&refs); \
+        return error; \
+    } \
+    jobject clipboard = Android_JNI_GetSystemServiceObject("clipboard"); \
+    if (!clipboard) { \
+        LocalReferenceHolder_Cleanup(&refs); \
+        return error; \
+    }
+
+#define CLEANUP_CLIPBOARD() \
+    LocalReferenceHolder_Cleanup(&refs);
+
+int Android_JNI_SetClipboardText(const char* text)
+{
+    SETUP_CLIPBOARD(-1)
+
+    jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "setText", "(Ljava/lang/CharSequence;)V");
+    jstring string = (*env)->NewStringUTF(env, text);
+    (*env)->CallVoidMethod(env, clipboard, mid, string);
+    (*env)->DeleteGlobalRef(env, clipboard);
+    (*env)->DeleteLocalRef(env, string);
+
+    CLEANUP_CLIPBOARD();
+
+    return 0;
+}
+
+char* Android_JNI_GetClipboardText()
+{
+    SETUP_CLIPBOARD(SDL_strdup(""))
+
+    jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "getText", "()Ljava/lang/CharSequence;");
+    jobject sequence = (*env)->CallObjectMethod(env, clipboard, mid);
+    (*env)->DeleteGlobalRef(env, clipboard);
+    if (sequence) {
+        mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, sequence), "toString", "()Ljava/lang/String;");
+        jstring string = (jstring)((*env)->CallObjectMethod(env, sequence, mid));
+        const char* utf = (*env)->GetStringUTFChars(env, string, 0);
+        if (utf) {
+            char* text = SDL_strdup(utf);
+            (*env)->ReleaseStringUTFChars(env, string, utf);
+
+            CLEANUP_CLIPBOARD();
+
+            return text;
+        }
+    }
+
+    CLEANUP_CLIPBOARD();    
+
+    return SDL_strdup("");
+}
+
+SDL_bool Android_JNI_HasClipboardText()
+{
+    SETUP_CLIPBOARD(SDL_FALSE)
+
+    jmethodID mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, clipboard), "hasText", "()Z");
+    jboolean has = (*env)->CallBooleanMethod(env, clipboard, mid);
+    (*env)->DeleteGlobalRef(env, clipboard);
+
+    CLEANUP_CLIPBOARD();
+    
+    return has ? SDL_TRUE : SDL_FALSE;
+}
+
+
+/* returns 0 on success or -1 on error (others undefined then)
+ * returns truthy or falsy value in plugged, charged and battery
+ * returns the value in seconds and percent or -1 if not available
+ */
+int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seconds, int* percent)
+{
+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+    JNIEnv* env = Android_JNI_GetEnv();
+    if (!LocalReferenceHolder_Init(&refs, env)) {
+        LocalReferenceHolder_Cleanup(&refs);
+        return -1;
+    }
+
+    jmethodID mid;
+
+    mid = (*env)->GetStaticMethodID(env, mActivityClass, "getContext", "()Landroid/content/Context;");
+    jobject context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
+
+    jstring action = (*env)->NewStringUTF(env, "android.intent.action.BATTERY_CHANGED");
+
+    jclass cls = (*env)->FindClass(env, "android/content/IntentFilter");
+
+    mid = (*env)->GetMethodID(env, cls, "<init>", "(Ljava/lang/String;)V");
+    jobject filter = (*env)->NewObject(env, cls, mid, action);
+
+    (*env)->DeleteLocalRef(env, action);
+
+    mid = (*env)->GetMethodID(env, mActivityClass, "registerReceiver", "(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;");
+    jobject intent = (*env)->CallObjectMethod(env, context, mid, NULL, filter);
+
+    (*env)->DeleteLocalRef(env, filter);
+
+    cls = (*env)->GetObjectClass(env, intent);
+
+    jstring iname;
+    jmethodID imid = (*env)->GetMethodID(env, cls, "getIntExtra", "(Ljava/lang/String;I)I");
+
+#define GET_INT_EXTRA(var, key) \
+    iname = (*env)->NewStringUTF(env, key); \
+    int var = (*env)->CallIntMethod(env, intent, imid, iname, -1); \
+    (*env)->DeleteLocalRef(env, iname);
+
+    jstring bname;
+    jmethodID bmid = (*env)->GetMethodID(env, cls, "getBooleanExtra", "(Ljava/lang/String;Z)Z");
+
+#define GET_BOOL_EXTRA(var, key) \
+    bname = (*env)->NewStringUTF(env, key); \
+    int var = (*env)->CallBooleanMethod(env, intent, bmid, bname, JNI_FALSE); \
+    (*env)->DeleteLocalRef(env, bname);
+
+    if (plugged) {
+        GET_INT_EXTRA(plug, "plugged") /* == BatteryManager.EXTRA_PLUGGED (API 5) */
+        if (plug == -1) {
+            LocalReferenceHolder_Cleanup(&refs);
+            return -1;
+        }
+        /* 1 == BatteryManager.BATTERY_PLUGGED_AC */
+        /* 2 == BatteryManager.BATTERY_PLUGGED_USB */
+        *plugged = (0 < plug) ? 1 : 0;
+    }
+
+    if (charged) {
+        GET_INT_EXTRA(status, "status") /* == BatteryManager.EXTRA_STATUS (API 5) */
+        if (status == -1) {
+            LocalReferenceHolder_Cleanup(&refs);
+            return -1;
+        }
+        /* 5 == BatteryManager.BATTERY_STATUS_FULL */
+        *charged = (status == 5) ? 1 : 0;
+    }
+
+    if (battery) {
+        GET_BOOL_EXTRA(present, "present") /* == BatteryManager.EXTRA_PRESENT (API 5) */
+        *battery = present ? 1 : 0;
+    }
+
+    if (seconds) {
+        *seconds = -1; /* not possible */
+    }
+
+    if (percent) {
+        GET_INT_EXTRA(level, "level") /* == BatteryManager.EXTRA_LEVEL (API 5) */
+        GET_INT_EXTRA(scale, "scale") /* == BatteryManager.EXTRA_SCALE (API 5) */
+        if ((level == -1) || (scale == -1)) {
+            LocalReferenceHolder_Cleanup(&refs);
+            return -1;
+        }
+        *percent = level * 100 / scale;
+    }
+
+    (*env)->DeleteLocalRef(env, intent);
+
+    LocalReferenceHolder_Cleanup(&refs);
+    return 0;
+}
+
+/* returns number of found touch devices as return value and ids in parameter ids */
+int Android_JNI_GetTouchDeviceIds(int **ids) {
+    JNIEnv *env = Android_JNI_GetEnv();
+    jint sources = 4098; /* == InputDevice.SOURCE_TOUCHSCREEN */
+    jmethodID mid = (*env)->GetStaticMethodID(env, mActivityClass, "inputGetInputDeviceIds", "(I)[I");
+    jintArray array = (jintArray) (*env)->CallStaticObjectMethod(env, mActivityClass, mid, sources);
+    int number = 0;
+    *ids = NULL;
+    if (array) {
+        number = (int) (*env)->GetArrayLength(env, array);
+        if (0 < number) {
+            jint* elements = (*env)->GetIntArrayElements(env, array, NULL);
+            if (elements) {
+                int i;
+                *ids = SDL_malloc(number * sizeof (**ids));
+                for (i = 0; i < number; ++i) { /* not assuming sizeof (jint) == sizeof (int) */
+                    (*ids)[i] = elements[i];
+                }
+                (*env)->ReleaseIntArrayElements(env, array, elements, JNI_ABORT);
+            }
+        }
+        (*env)->DeleteLocalRef(env, array);
+    }
+    return number;
+}
+
+void Android_JNI_PollInputDevices()
+{
+    JNIEnv *env = Android_JNI_GetEnv();
+    (*env)->CallStaticVoidMethod(env, mActivityClass, midPollInputDevices);    
+}
+
+/* sends message to be handled on the UI event dispatch thread */
+int Android_JNI_SendMessage(int command, int param)
+{
+    JNIEnv *env = Android_JNI_GetEnv();
+    if (!env) {
+        return -1;
+    }
+    jmethodID mid = (*env)->GetStaticMethodID(env, mActivityClass, "sendMessage", "(II)Z");
+    if (!mid) {
+        return -1;
+    }
+    jboolean success = (*env)->CallStaticBooleanMethod(env, mActivityClass, mid, command, param);
+    return success ? 0 : -1;
+}
+
+void Android_JNI_ShowTextInput(SDL_Rect *inputRect)
+{
+    JNIEnv *env = Android_JNI_GetEnv();
+    if (!env) {
+        return;
+    }
+
+    jmethodID mid = (*env)->GetStaticMethodID(env, mActivityClass, "showTextInput", "(IIII)Z");
+    if (!mid) {
+        return;
+    }
+    (*env)->CallStaticBooleanMethod(env, mActivityClass, mid,
+                               inputRect->x,
+                               inputRect->y,
+                               inputRect->w,
+                               inputRect->h );
+}
+
+void Android_JNI_HideTextInput()
+{
+    /* has to match Activity constant */
+    const int COMMAND_TEXTEDIT_HIDE = 3;
+    Android_JNI_SendMessage(COMMAND_TEXTEDIT_HIDE, 0);
+}
+
+/*
+//////////////////////////////////////////////////////////////////////////////
+//
+// Functions exposed to SDL applications in SDL_system.h
+//////////////////////////////////////////////////////////////////////////////
+*/
+
+void *SDL_AndroidGetJNIEnv()
+{
+    return Android_JNI_GetEnv();
+}
+
+
+
+void *SDL_AndroidGetActivity()
+{
+    /* See SDL_system.h for caveats on using this function. */
+
+    jmethodID mid;
+
+    JNIEnv *env = Android_JNI_GetEnv();
+    if (!env) {
+        return NULL;
+    }
+
+    /* return SDLActivity.getContext(); */
+    mid = (*env)->GetStaticMethodID(env, mActivityClass,
+            "getContext","()Landroid/content/Context;");
+    return (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
+}
+
+const char * SDL_AndroidGetInternalStoragePath()
+{
+    static char *s_AndroidInternalFilesPath = NULL;
+
+    if (!s_AndroidInternalFilesPath) {
+        struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+        jmethodID mid;
+        jobject context;
+        jobject fileObject;
+        jstring pathString;
+        const char *path;
+
+        JNIEnv *env = Android_JNI_GetEnv();
+        if (!LocalReferenceHolder_Init(&refs, env)) {
+            LocalReferenceHolder_Cleanup(&refs);
+            return NULL;
+        }
+
+        /* context = SDLActivity.getContext(); */
+        mid = (*env)->GetStaticMethodID(env, mActivityClass,
+                "getContext","()Landroid/content/Context;");
+        context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
+
+        /* fileObj = context.getFilesDir(); */
+        mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, context),
+                "getFilesDir", "()Ljava/io/File;");
+        fileObject = (*env)->CallObjectMethod(env, context, mid);
+        if (!fileObject) {
+            SDL_SetError("Couldn't get internal directory");
+            LocalReferenceHolder_Cleanup(&refs);
+            return NULL;
+        }
+
+        /* path = fileObject.getAbsolutePath(); */
+        mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, fileObject),
+                "getAbsolutePath", "()Ljava/lang/String;");
+        pathString = (jstring)(*env)->CallObjectMethod(env, fileObject, mid);
+
+        path = (*env)->GetStringUTFChars(env, pathString, NULL);
+        s_AndroidInternalFilesPath = SDL_strdup(path);
+        (*env)->ReleaseStringUTFChars(env, pathString, path);
+
+        LocalReferenceHolder_Cleanup(&refs);
+    }
+    return s_AndroidInternalFilesPath;
+}
+
+int SDL_AndroidGetExternalStorageState()
+{
+    struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+    jmethodID mid;
+    jclass cls;
+    jstring stateString;
+    const char *state;
+    int stateFlags;
+
+    JNIEnv *env = Android_JNI_GetEnv();
+    if (!LocalReferenceHolder_Init(&refs, env)) {
+        LocalReferenceHolder_Cleanup(&refs);
+        return 0;
+    }
+
+    cls = (*env)->FindClass(env, "android/os/Environment");
+    mid = (*env)->GetStaticMethodID(env, cls,
+            "getExternalStorageState", "()Ljava/lang/String;");
+    stateString = (jstring)(*env)->CallStaticObjectMethod(env, cls, mid);
+
+    state = (*env)->GetStringUTFChars(env, stateString, NULL);
+
+    /* Print an info message so people debugging know the storage state */
+    __android_log_print(ANDROID_LOG_INFO, "SDL", "external storage state: %s", state);
+
+    if (SDL_strcmp(state, "mounted") == 0) {
+        stateFlags = SDL_ANDROID_EXTERNAL_STORAGE_READ |
+                     SDL_ANDROID_EXTERNAL_STORAGE_WRITE;
+    } else if (SDL_strcmp(state, "mounted_ro") == 0) {
+        stateFlags = SDL_ANDROID_EXTERNAL_STORAGE_READ;
+    } else {
+        stateFlags = 0;
+    }
+    (*env)->ReleaseStringUTFChars(env, stateString, state);
+
+    LocalReferenceHolder_Cleanup(&refs);
+    return stateFlags;
+}
+
+const char * SDL_AndroidGetExternalStoragePath()
+{
+    static char *s_AndroidExternalFilesPath = NULL;
+
+    if (!s_AndroidExternalFilesPath) {
+        struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
+        jmethodID mid;
+        jobject context;
+        jobject fileObject;
+        jstring pathString;
+        const char *path;
+
+        JNIEnv *env = Android_JNI_GetEnv();
+        if (!LocalReferenceHolder_Init(&refs, env)) {
+            LocalReferenceHolder_Cleanup(&refs);
+            return NULL;
+        }
+
+        /* context = SDLActivity.getContext(); */
+        mid = (*env)->GetStaticMethodID(env, mActivityClass,
+                "getContext","()Landroid/content/Context;");
+        context = (*env)->CallStaticObjectMethod(env, mActivityClass, mid);
+
+        /* fileObj = context.getExternalFilesDir(); */
+        mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, context),
+                "getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;");
+        fileObject = (*env)->CallObjectMethod(env, context, mid, NULL);
+        if (!fileObject) {
+            SDL_SetError("Couldn't get external directory");
+            LocalReferenceHolder_Cleanup(&refs);
+            return NULL;
+        }
+
+        /* path = fileObject.getAbsolutePath(); */
+        mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, fileObject),
+                "getAbsolutePath", "()Ljava/lang/String;");
+        pathString = (jstring)(*env)->CallObjectMethod(env, fileObject, mid);
+
+        path = (*env)->GetStringUTFChars(env, pathString, NULL);
+        s_AndroidExternalFilesPath = SDL_strdup(path);
+        (*env)->ReleaseStringUTFChars(env, pathString, path);
+
+        LocalReferenceHolder_Cleanup(&refs);
+    }
+    return s_AndroidExternalFilesPath;
+}
+
+#endif /* __ANDROID__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/core/android/SDL_android.h b/Source/3rd Party/sdl/src/core/android/SDL_android.h
new file mode 100644
index 000000000..1294cd9ce
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/android/SDL_android.h	
@@ -0,0 +1,90 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+extern "C" {
+/* *INDENT-ON* */
+#endif
+
+#include <EGL/eglplatform.h>
+#include <android/native_window_jni.h>
+
+#include "SDL_rect.h"
+
+/* Interface from the SDL library into the Android Java activity */
+/* extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion, int red, int green, int blue, int alpha, int buffer, int depth, int stencil, int buffers, int samples);
+extern SDL_bool Android_JNI_DeleteContext(void); */
+extern void Android_JNI_SwapWindow();
+extern void Android_JNI_SetActivityTitle(const char *title);
+extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
+extern void Android_JNI_ShowTextInput(SDL_Rect *inputRect);
+extern void Android_JNI_HideTextInput();
+extern ANativeWindow* Android_JNI_GetNativeWindow(void);
+
+/* Audio support */
+extern int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames);
+extern void* Android_JNI_GetAudioBuffer();
+extern void Android_JNI_WriteAudioBuffer();
+extern void Android_JNI_CloseAudioDevice();
+
+#include "SDL_rwops.h"
+
+int Android_JNI_FileOpen(SDL_RWops* ctx, const char* fileName, const char* mode);
+Sint64 Android_JNI_FileSize(SDL_RWops* ctx);
+Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence);
+size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer, size_t size, size_t maxnum);
+size_t Android_JNI_FileWrite(SDL_RWops* ctx, const void* buffer, size_t size, size_t num);
+int Android_JNI_FileClose(SDL_RWops* ctx);
+
+/* Clipboard support */
+int Android_JNI_SetClipboardText(const char* text);
+char* Android_JNI_GetClipboardText();
+SDL_bool Android_JNI_HasClipboardText();
+
+/* Power support */
+int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seconds, int* percent);
+    
+/* Joystick support */
+void Android_JNI_PollInputDevices();
+
+
+/* Touch support */
+int Android_JNI_GetTouchDeviceIds(int **ids);
+
+/* Threads */
+#include <jni.h>
+JNIEnv *Android_JNI_GetEnv(void);
+int Android_JNI_SetupThread(void);
+
+/* Generic messages */
+int Android_JNI_SendMessage(int command, int param);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+}
+/* *INDENT-ON* */
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/core/linux/SDL_evdev.c b/Source/3rd Party/sdl/src/core/linux/SDL_evdev.c
new file mode 100644
index 000000000..19333f257
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/linux/SDL_evdev.c	
@@ -0,0 +1,805 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_INPUT_LINUXEV
+
+/* This is based on the linux joystick driver */
+/* References: https://www.kernel.org/doc/Documentation/input/input.txt 
+ *             https://www.kernel.org/doc/Documentation/input/event-codes.txt
+ *             /usr/include/linux/input.h
+ *             The evtest application is also useful to debug the protocol
+ */
+
+
+#include "SDL_evdev.h"
+#define _THIS SDL_EVDEV_PrivateData *_this
+static _THIS = NULL;
+
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <limits.h>             /* For the definition of PATH_MAX */
+#include <linux/input.h>
+#ifdef SDL_INPUT_LINUXKD
+#include <linux/kd.h>
+#include <linux/keyboard.h>
+#endif
+
+
+/* We need this to prevent keystrokes from appear in the console */
+#ifndef KDSKBMUTE
+#define KDSKBMUTE 0x4B51
+#endif
+#ifndef KDSKBMODE
+#define KDSKBMODE 0x4B45
+#endif
+#ifndef K_OFF
+#define K_OFF 0x04
+#endif
+
+#include "SDL.h"
+#include "SDL_assert.h"
+#include "SDL_endian.h"
+#include "../../core/linux/SDL_udev.h"
+#include "SDL_scancode.h"
+#include "../../events/SDL_events_c.h"
+
+/* This isn't defined in older Linux kernel headers */
+#ifndef SYN_DROPPED
+#define SYN_DROPPED 3
+#endif
+
+static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode);
+static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item);
+static int SDL_EVDEV_device_removed(const char *devpath);
+
+#if SDL_USE_LIBUDEV
+static int SDL_EVDEV_device_added(const char *devpath);
+void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
+#endif /* SDL_USE_LIBUDEV */
+
+static SDL_Scancode EVDEV_Keycodes[] = {
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_RESERVED        0 */
+    SDL_SCANCODE_ESCAPE,        /*  KEY_ESC         1 */
+    SDL_SCANCODE_1,             /*  KEY_1           2 */
+    SDL_SCANCODE_2,             /*  KEY_2           3 */
+    SDL_SCANCODE_3,             /*  KEY_3           4 */
+    SDL_SCANCODE_4,             /*  KEY_4           5 */
+    SDL_SCANCODE_5,             /*  KEY_5           6 */
+    SDL_SCANCODE_6,             /*  KEY_6           7 */
+    SDL_SCANCODE_7,             /*  KEY_7           8 */
+    SDL_SCANCODE_8,             /*  KEY_8           9 */
+    SDL_SCANCODE_9,             /*  KEY_9           10 */
+    SDL_SCANCODE_0,             /*  KEY_0           11 */
+    SDL_SCANCODE_MINUS,         /*  KEY_MINUS       12 */
+    SDL_SCANCODE_EQUALS,        /*  KEY_EQUAL       13 */
+    SDL_SCANCODE_BACKSPACE,     /*  KEY_BACKSPACE       14 */
+    SDL_SCANCODE_TAB,           /*  KEY_TAB         15 */
+    SDL_SCANCODE_Q,             /*  KEY_Q           16 */
+    SDL_SCANCODE_W,             /*  KEY_W           17 */
+    SDL_SCANCODE_E,             /*  KEY_E           18 */
+    SDL_SCANCODE_R,             /*  KEY_R           19 */
+    SDL_SCANCODE_T,             /*  KEY_T           20 */
+    SDL_SCANCODE_Y,             /*  KEY_Y           21 */
+    SDL_SCANCODE_U,             /*  KEY_U           22 */
+    SDL_SCANCODE_I,             /*  KEY_I           23 */
+    SDL_SCANCODE_O,             /*  KEY_O           24 */
+    SDL_SCANCODE_P,             /*  KEY_P           25 */
+    SDL_SCANCODE_LEFTBRACKET,   /*  KEY_LEFTBRACE       26 */
+    SDL_SCANCODE_RIGHTBRACKET,  /*  KEY_RIGHTBRACE      27 */
+    SDL_SCANCODE_RETURN,        /*  KEY_ENTER       28 */
+    SDL_SCANCODE_LCTRL,         /*  KEY_LEFTCTRL        29 */
+    SDL_SCANCODE_A,             /*  KEY_A           30 */
+    SDL_SCANCODE_S,             /*  KEY_S           31 */
+    SDL_SCANCODE_D,             /*  KEY_D           32 */
+    SDL_SCANCODE_F,             /*  KEY_F           33 */
+    SDL_SCANCODE_G,             /*  KEY_G           34 */
+    SDL_SCANCODE_H,             /*  KEY_H           35 */
+    SDL_SCANCODE_J,             /*  KEY_J           36 */
+    SDL_SCANCODE_K,             /*  KEY_K           37 */
+    SDL_SCANCODE_L,             /*  KEY_L           38 */
+    SDL_SCANCODE_SEMICOLON,     /*  KEY_SEMICOLON       39 */
+    SDL_SCANCODE_APOSTROPHE,    /*  KEY_APOSTROPHE      40 */
+    SDL_SCANCODE_GRAVE,         /*  KEY_GRAVE       41 */
+    SDL_SCANCODE_LSHIFT,        /*  KEY_LEFTSHIFT       42 */
+    SDL_SCANCODE_BACKSLASH,     /*  KEY_BACKSLASH       43 */
+    SDL_SCANCODE_Z,             /*  KEY_Z           44 */
+    SDL_SCANCODE_X,             /*  KEY_X           45 */
+    SDL_SCANCODE_C,             /*  KEY_C           46 */
+    SDL_SCANCODE_V,             /*  KEY_V           47 */
+    SDL_SCANCODE_B,             /*  KEY_B           48 */
+    SDL_SCANCODE_N,             /*  KEY_N           49 */
+    SDL_SCANCODE_M,             /*  KEY_M           50 */
+    SDL_SCANCODE_COMMA,         /*  KEY_COMMA       51 */
+    SDL_SCANCODE_PERIOD,        /*  KEY_DOT         52 */
+    SDL_SCANCODE_SLASH,         /*  KEY_SLASH       53 */
+    SDL_SCANCODE_RSHIFT,        /*  KEY_RIGHTSHIFT      54 */
+    SDL_SCANCODE_KP_MULTIPLY,   /*  KEY_KPASTERISK      55 */
+    SDL_SCANCODE_LALT,          /*  KEY_LEFTALT     56 */
+    SDL_SCANCODE_SPACE,         /*  KEY_SPACE       57 */
+    SDL_SCANCODE_CAPSLOCK,      /*  KEY_CAPSLOCK        58 */
+    SDL_SCANCODE_F1,            /*  KEY_F1          59 */
+    SDL_SCANCODE_F2,            /*  KEY_F2          60 */
+    SDL_SCANCODE_F3,            /*  KEY_F3          61 */
+    SDL_SCANCODE_F4,            /*  KEY_F4          62 */
+    SDL_SCANCODE_F5,            /*  KEY_F5          63 */
+    SDL_SCANCODE_F6,            /*  KEY_F6          64 */
+    SDL_SCANCODE_F7,            /*  KEY_F7          65 */
+    SDL_SCANCODE_F8,            /*  KEY_F8          66 */
+    SDL_SCANCODE_F9,            /*  KEY_F9          67 */
+    SDL_SCANCODE_F10,           /*  KEY_F10         68 */
+    SDL_SCANCODE_NUMLOCKCLEAR,  /*  KEY_NUMLOCK     69 */
+    SDL_SCANCODE_SCROLLLOCK,    /*  KEY_SCROLLLOCK      70 */
+    SDL_SCANCODE_KP_7,          /*  KEY_KP7         71 */
+    SDL_SCANCODE_KP_8,          /*  KEY_KP8         72 */
+    SDL_SCANCODE_KP_9,          /*  KEY_KP9         73 */
+    SDL_SCANCODE_KP_MINUS,      /*  KEY_KPMINUS     74 */
+    SDL_SCANCODE_KP_4,          /*  KEY_KP4         75 */
+    SDL_SCANCODE_KP_5,          /*  KEY_KP5         76 */
+    SDL_SCANCODE_KP_6,          /*  KEY_KP6         77 */
+    SDL_SCANCODE_KP_PLUS,       /*  KEY_KPPLUS      78 */
+    SDL_SCANCODE_KP_1,          /*  KEY_KP1         79 */
+    SDL_SCANCODE_KP_2,          /*  KEY_KP2         80 */
+    SDL_SCANCODE_KP_3,          /*  KEY_KP3         81 */
+    SDL_SCANCODE_KP_0,          /*  KEY_KP0         82 */
+    SDL_SCANCODE_KP_PERIOD,     /*  KEY_KPDOT       83 */
+    SDL_SCANCODE_UNKNOWN,       /*  84 */
+    SDL_SCANCODE_LANG5,         /*  KEY_ZENKAKUHANKAKU  85 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_102ND       86 */
+    SDL_SCANCODE_F11,           /*  KEY_F11         87 */
+    SDL_SCANCODE_F12,           /*  KEY_F12         88 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_RO          89 */
+    SDL_SCANCODE_LANG3,         /*  KEY_KATAKANA        90 */
+    SDL_SCANCODE_LANG4,         /*  KEY_HIRAGANA        91 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_HENKAN      92 */
+    SDL_SCANCODE_LANG3,         /*  KEY_KATAKANAHIRAGANA    93 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_MUHENKAN        94 */
+    SDL_SCANCODE_KP_COMMA,      /*  KEY_KPJPCOMMA       95 */
+    SDL_SCANCODE_KP_ENTER,      /*  KEY_KPENTER     96 */
+    SDL_SCANCODE_RCTRL,         /*  KEY_RIGHTCTRL       97 */
+    SDL_SCANCODE_KP_DIVIDE,     /*  KEY_KPSLASH     98 */
+    SDL_SCANCODE_SYSREQ,        /*  KEY_SYSRQ       99 */
+    SDL_SCANCODE_RALT,          /*  KEY_RIGHTALT        100 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_LINEFEED        101 */
+    SDL_SCANCODE_HOME,          /*  KEY_HOME        102 */
+    SDL_SCANCODE_UP,            /*  KEY_UP          103 */
+    SDL_SCANCODE_PAGEUP,        /*  KEY_PAGEUP      104 */
+    SDL_SCANCODE_LEFT,          /*  KEY_LEFT        105 */
+    SDL_SCANCODE_RIGHT,         /*  KEY_RIGHT       106 */
+    SDL_SCANCODE_END,           /*  KEY_END         107 */
+    SDL_SCANCODE_DOWN,          /*  KEY_DOWN        108 */
+    SDL_SCANCODE_PAGEDOWN,      /*  KEY_PAGEDOWN        109 */
+    SDL_SCANCODE_INSERT,        /*  KEY_INSERT      110 */
+    SDL_SCANCODE_DELETE,        /*  KEY_DELETE      111 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_MACRO       112 */
+    SDL_SCANCODE_MUTE,          /*  KEY_MUTE        113 */
+    SDL_SCANCODE_VOLUMEDOWN,    /*  KEY_VOLUMEDOWN      114 */
+    SDL_SCANCODE_VOLUMEUP,      /*  KEY_VOLUMEUP        115 */
+    SDL_SCANCODE_POWER,         /*  KEY_POWER       116 SC System Power Down */
+    SDL_SCANCODE_KP_EQUALS,     /*  KEY_KPEQUAL     117 */
+    SDL_SCANCODE_KP_MINUS,      /*  KEY_KPPLUSMINUS     118 */
+    SDL_SCANCODE_PAUSE,         /*  KEY_PAUSE       119 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SCALE       120 AL Compiz Scale (Expose) */
+    SDL_SCANCODE_KP_COMMA,      /*  KEY_KPCOMMA     121 */
+    SDL_SCANCODE_LANG1,         /*  KEY_HANGEUL,KEY_HANGUEL 122 */
+    SDL_SCANCODE_LANG2,         /*  KEY_HANJA       123 */
+    SDL_SCANCODE_INTERNATIONAL3,/*  KEY_YEN         124 */
+    SDL_SCANCODE_LGUI,          /*  KEY_LEFTMETA        125 */
+    SDL_SCANCODE_RGUI,          /*  KEY_RIGHTMETA       126 */
+    SDL_SCANCODE_APPLICATION,   /*  KEY_COMPOSE     127 */
+    SDL_SCANCODE_STOP,          /*  KEY_STOP        128 AC Stop */
+    SDL_SCANCODE_AGAIN,         /*  KEY_AGAIN       129 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_PROPS       130 AC Properties */
+    SDL_SCANCODE_UNDO,          /*  KEY_UNDO        131 AC Undo */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_FRONT       132 */
+    SDL_SCANCODE_COPY,          /*  KEY_COPY        133 AC Copy */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_OPEN        134 AC Open */
+    SDL_SCANCODE_PASTE,         /*  KEY_PASTE       135 AC Paste */
+    SDL_SCANCODE_FIND,          /*  KEY_FIND        136 AC Search */
+    SDL_SCANCODE_CUT,           /*  KEY_CUT         137 AC Cut */
+    SDL_SCANCODE_HELP,          /*  KEY_HELP        138 AL Integrated Help Center */
+    SDL_SCANCODE_MENU,          /*  KEY_MENU        139 Menu (show menu) */
+    SDL_SCANCODE_CALCULATOR,    /*  KEY_CALC        140 AL Calculator */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SETUP       141 */
+    SDL_SCANCODE_SLEEP,         /*  KEY_SLEEP       142 SC System Sleep */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_WAKEUP      143 System Wake Up */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_FILE        144 AL Local Machine Browser */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SENDFILE        145 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_DELETEFILE      146 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_XFER        147 */
+    SDL_SCANCODE_APP1,          /*  KEY_PROG1       148 */
+    SDL_SCANCODE_APP1,          /*  KEY_PROG2       149 */
+    SDL_SCANCODE_WWW,           /*  KEY_WWW         150 AL Internet Browser */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_MSDOS       151 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_COFFEE,KEY_SCREENLOCK      152 AL Terminal Lock/Screensaver */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_DIRECTION       153 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_CYCLEWINDOWS    154 */
+    SDL_SCANCODE_MAIL,          /*  KEY_MAIL        155 */
+    SDL_SCANCODE_AC_BOOKMARKS,  /*  KEY_BOOKMARKS       156 AC Bookmarks */
+    SDL_SCANCODE_COMPUTER,      /*  KEY_COMPUTER        157 */
+    SDL_SCANCODE_AC_BACK,       /*  KEY_BACK        158 AC Back */
+    SDL_SCANCODE_AC_FORWARD,    /*  KEY_FORWARD     159 AC Forward */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_CLOSECD     160 */
+    SDL_SCANCODE_EJECT,         /*  KEY_EJECTCD     161 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_EJECTCLOSECD    162 */
+    SDL_SCANCODE_AUDIONEXT,     /*  KEY_NEXTSONG        163 */
+    SDL_SCANCODE_AUDIOPLAY,     /*  KEY_PLAYPAUSE       164 */
+    SDL_SCANCODE_AUDIOPREV,     /*  KEY_PREVIOUSSONG    165 */
+    SDL_SCANCODE_AUDIOSTOP,     /*  KEY_STOPCD      166 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_RECORD      167 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_REWIND      168 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_PHONE       169 Media Select Telephone */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_ISO         170 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_CONFIG      171 AL Consumer Control Configuration */
+    SDL_SCANCODE_AC_HOME,       /*  KEY_HOMEPAGE        172 AC Home */
+    SDL_SCANCODE_AC_REFRESH,    /*  KEY_REFRESH     173 AC Refresh */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_EXIT        174 AC Exit */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_MOVE        175 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_EDIT        176 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SCROLLUP        177 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SCROLLDOWN      178 */
+    SDL_SCANCODE_KP_LEFTPAREN,  /*  KEY_KPLEFTPAREN     179 */
+    SDL_SCANCODE_KP_RIGHTPAREN, /*  KEY_KPRIGHTPAREN    180 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_NEW         181 AC New */
+    SDL_SCANCODE_AGAIN,         /*  KEY_REDO        182 AC Redo/Repeat */
+    SDL_SCANCODE_F13,           /*  KEY_F13         183 */
+    SDL_SCANCODE_F14,           /*  KEY_F14         184 */
+    SDL_SCANCODE_F15,           /*  KEY_F15         185 */
+    SDL_SCANCODE_F16,           /*  KEY_F16         186 */
+    SDL_SCANCODE_F17,           /*  KEY_F17         187 */
+    SDL_SCANCODE_F18,           /*  KEY_F18         188 */
+    SDL_SCANCODE_F19,           /*  KEY_F19         189 */
+    SDL_SCANCODE_F20,           /*  KEY_F20         190 */
+    SDL_SCANCODE_F21,           /*  KEY_F21         191 */
+    SDL_SCANCODE_F22,           /*  KEY_F22         192 */
+    SDL_SCANCODE_F23,           /*  KEY_F23         193 */
+    SDL_SCANCODE_F24,           /*  KEY_F24         194 */
+    SDL_SCANCODE_UNKNOWN,       /*  195 */
+    SDL_SCANCODE_UNKNOWN,       /*  196 */
+    SDL_SCANCODE_UNKNOWN,       /*  197 */
+    SDL_SCANCODE_UNKNOWN,       /*  198 */
+    SDL_SCANCODE_UNKNOWN,       /*  199 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_PLAYCD      200 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_PAUSECD     201 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_PROG3       202 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_PROG4       203 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_DASHBOARD       204 AL Dashboard */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SUSPEND     205 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_CLOSE       206 AC Close */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_PLAY        207 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_FASTFORWARD     208 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_BASSBOOST       209 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_PRINT       210 AC Print */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_HP          211 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_CAMERA      212 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SOUND       213 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_QUESTION        214 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_EMAIL       215 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_CHAT        216 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SEARCH      217 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_CONNECT     218 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_FINANCE     219 AL Checkbook/Finance */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SPORT       220 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SHOP        221 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_ALTERASE        222 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_CANCEL      223 AC Cancel */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_BRIGHTNESSDOWN  224 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_BRIGHTNESSUP    225 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_MEDIA       226 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SWITCHVIDEOMODE 227 Cycle between available video outputs (Monitor/LCD/TV-out/etc) */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_KBDILLUMTOGGLE  228 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_KBDILLUMDOWN    229 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_KBDILLUMUP      230 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SEND        231 AC Send */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_REPLY       232 AC Reply */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_FORWARDMAIL     233 AC Forward Msg */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_SAVE        234 AC Save */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_DOCUMENTS       235 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_BATTERY     236  */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_BLUETOOTH       237 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_WLAN        238 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_UWB         239 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_UNKNOWN     240 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_VIDEO_NEXT      241 drive next video source */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_VIDEO_PREV      242 drive previous video source */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_BRIGHTNESS_CYCLE    243 brightness up, after max is min */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_BRIGHTNESS_ZERO 244 brightness off, use ambient */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_DISPLAY_OFF     245 display device to off state */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_WIMAX       246 */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_RFKILL      247 Key that controls all radios */
+    SDL_SCANCODE_UNKNOWN,       /*  KEY_MICMUTE     248 Mute / unmute the microphone */
+};
+
+static Uint8 EVDEV_MouseButtons[] = {
+    SDL_BUTTON_LEFT,            /*  BTN_LEFT        0x110 */
+    SDL_BUTTON_RIGHT,           /*  BTN_RIGHT       0x111 */
+    SDL_BUTTON_MIDDLE,          /*  BTN_MIDDLE      0x112 */
+    SDL_BUTTON_X1,              /*  BTN_SIDE        0x113 */
+    SDL_BUTTON_X2,              /*  BTN_EXTRA       0x114 */
+    SDL_BUTTON_X2 + 1,          /*  BTN_FORWARD     0x115 */
+    SDL_BUTTON_X2 + 2,          /*  BTN_BACK        0x116 */
+    SDL_BUTTON_X2 + 3           /*  BTN_TASK        0x117 */
+};
+
+static char* EVDEV_consoles[] = {
+    "/proc/self/fd/0",
+    "/dev/tty",
+    "/dev/tty0",
+    "/dev/tty1",
+    "/dev/tty2",
+    "/dev/tty3",
+    "/dev/tty4",
+    "/dev/tty5",
+    "/dev/tty6",
+    "/dev/vc/0",
+    "/dev/console"
+};
+
+#define IS_CONSOLE(fd) isatty (fd) && ioctl(fd, KDGKBTYPE, &arg) == 0 && ((arg == KB_101) || (arg == KB_84))
+
+static int SDL_EVDEV_get_console_fd(void)
+{
+    int fd, i;
+    char arg = 0;
+    
+    /* Try a few consoles to see which one we have read access to */
+    
+    for( i = 0; i < SDL_arraysize(EVDEV_consoles); i++) {
+        fd = open(EVDEV_consoles[i], O_RDONLY);
+        if (fd >= 0) {
+            if (IS_CONSOLE(fd)) return fd;
+            close(fd);
+        }
+    }
+    
+    /* Try stdin, stdout, stderr */
+    
+    for( fd = 0; fd < 3; fd++) {
+        if (IS_CONSOLE(fd)) return fd;
+    }
+    
+    /* We won't be able to send SDL_TEXTINPUT events */
+    return -1;
+}
+
+/* Prevent keystrokes from reaching the tty */
+static int SDL_EVDEV_mute_keyboard(int tty, int *kb_mode)
+{
+    char arg;
+    
+    *kb_mode = 0; /* FIXME: Is this a sane default in case KDGKBMODE fails? */
+    if (!IS_CONSOLE(tty)) {
+        return SDL_SetError("Tried to mute an invalid tty");
+    }
+    ioctl(tty, KDGKBMODE, kb_mode); /* It's not fatal if this fails */
+    if (ioctl(tty, KDSKBMUTE, 1) && ioctl(tty, KDSKBMODE, K_OFF)) {
+        return SDL_SetError("EVDEV: Failed muting keyboard");
+    }
+    
+    return 0;  
+}
+
+/* Restore the keyboard mode for given tty */
+static void SDL_EVDEV_unmute_keyboard(int tty, int kb_mode)
+{
+    if (ioctl(tty, KDSKBMUTE, 0) && ioctl(tty, KDSKBMODE, kb_mode)) {
+        SDL_Log("EVDEV: Failed restoring keyboard mode");
+    }
+}
+
+/* Read /sys/class/tty/tty0/active and open the tty */
+static int SDL_EVDEV_get_active_tty()
+{
+    int fd, len;
+    char ttyname[NAME_MAX + 1];
+    char ttypath[PATH_MAX+1] = "/dev/";
+    char arg;
+    
+    fd = open("/sys/class/tty/tty0/active", O_RDONLY);
+    if (fd < 0) {
+        return SDL_SetError("Could not determine which tty is active");
+    }
+    
+    len = read(fd, ttyname, NAME_MAX);
+    close(fd);
+    
+    if (len <= 0) {
+        return SDL_SetError("Could not read which tty is active");
+    }
+    
+    if (ttyname[len-1] == '\n') {
+        ttyname[len-1] = '\0';
+    }
+    else {
+        ttyname[len] = '\0';
+    }
+    
+    SDL_strlcat(ttypath, ttyname, PATH_MAX);
+    fd = open(ttypath, O_RDWR | O_NOCTTY);
+    if (fd < 0) {
+        return SDL_SetError("Could not open tty: %s", ttypath);
+    }
+    
+    if (!IS_CONSOLE(fd)) {
+        close(fd);
+        return SDL_SetError("Invalid tty obtained: %s", ttypath);
+    }
+
+    return fd;  
+}
+
+int
+SDL_EVDEV_Init(void)
+{
+    int retval = 0;
+    
+    if (_this == NULL) {
+        
+        _this = (SDL_EVDEV_PrivateData *) SDL_calloc(1, sizeof(*_this));
+        if(_this == NULL) {
+            return SDL_OutOfMemory();
+        }
+
+#if SDL_USE_LIBUDEV
+        if (SDL_UDEV_Init() < 0) {
+            SDL_free(_this);
+            _this = NULL;
+            return -1;
+        }
+
+        /* Set up the udev callback */
+        if ( SDL_UDEV_AddCallback(SDL_EVDEV_udev_callback) < 0) {
+            SDL_EVDEV_Quit();
+            return -1;
+        }
+        
+        /* Force a scan to build the initial device list */
+        SDL_UDEV_Scan();
+#else
+        /* TODO: Scan the devices manually, like a caveman */
+#endif /* SDL_USE_LIBUDEV */
+        
+        /* We need a physical terminal (not PTS) to be able to translate key code to symbols via the kernel tables */
+        _this->console_fd = SDL_EVDEV_get_console_fd();
+        
+        /* Mute the keyboard so keystrokes only generate evdev events and do not leak through to the console */
+        _this->tty = STDIN_FILENO;
+        if (SDL_EVDEV_mute_keyboard(_this->tty, &_this->kb_mode) < 0) {
+            /* stdin is not a tty, probably we were launched remotely, so we try to disable the active tty */
+            _this->tty = SDL_EVDEV_get_active_tty();
+            if (_this->tty >= 0) {
+                if (SDL_EVDEV_mute_keyboard(_this->tty, &_this->kb_mode) < 0) {
+                    close(_this->tty);
+                    _this->tty = -1;
+                }
+            }
+        }
+    }
+    
+    _this->ref_count += 1;
+    
+    return retval;
+}
+
+void
+SDL_EVDEV_Quit(void)
+{
+    if (_this == NULL) {
+        return;
+    }
+    
+    _this->ref_count -= 1;
+    
+    if (_this->ref_count < 1) {
+        
+#if SDL_USE_LIBUDEV
+        SDL_UDEV_DelCallback(SDL_EVDEV_udev_callback);
+        SDL_UDEV_Quit();
+#endif /* SDL_USE_LIBUDEV */
+       
+        if (_this->console_fd >= 0) {
+            close(_this->console_fd);
+        }
+        
+        if (_this->tty >= 0) {
+            SDL_EVDEV_unmute_keyboard(_this->tty, _this->kb_mode);
+            close(_this->tty);
+        }
+        
+        /* Remove existing devices */
+        while(_this->first != NULL) {
+            SDL_EVDEV_device_removed(_this->first->path);
+        }
+        
+        SDL_assert(_this->first == NULL);
+        SDL_assert(_this->last == NULL);
+        SDL_assert(_this->numdevices == 0);
+        
+        SDL_free(_this);
+        _this = NULL;
+    }
+}
+
+#if SDL_USE_LIBUDEV
+void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath)
+{
+    if (devpath == NULL) {
+        return;
+    }
+    
+    if (!(udev_class & (SDL_UDEV_DEVICE_MOUSE|SDL_UDEV_DEVICE_KEYBOARD))) {
+        return;
+    }
+
+    switch( udev_type ) {
+    case SDL_UDEV_DEVICEADDED:
+        SDL_EVDEV_device_added(devpath);
+        break;
+            
+    case SDL_UDEV_DEVICEREMOVED:
+        SDL_EVDEV_device_removed(devpath);
+        break;
+            
+    default:
+        break;
+    }
+}
+
+#endif /* SDL_USE_LIBUDEV */
+
+void 
+SDL_EVDEV_Poll(void)
+{
+    struct input_event events[32];
+    int i, len;
+    SDL_evdevlist_item *item;
+    SDL_Scancode scan_code;
+    int mouse_button;
+    SDL_Mouse *mouse;
+#ifdef SDL_INPUT_LINUXKD
+    Uint16 modstate;
+    struct kbentry kbe;
+    static char keysym[8];
+    char *end;
+    Uint32 kval;
+#endif
+
+#if SDL_USE_LIBUDEV
+    SDL_UDEV_Poll();
+#endif
+
+    mouse = SDL_GetMouse();
+
+    for (item = _this->first; item != NULL; item = item->next) {
+        while ((len = read(item->fd, events, (sizeof events))) > 0) {
+            len /= sizeof(events[0]);
+            for (i = 0; i < len; ++i) {
+                switch (events[i].type) {
+                case EV_KEY:
+                    if (events[i].code >= BTN_MOUSE && events[i].code < BTN_MOUSE + SDL_arraysize(EVDEV_MouseButtons)) {
+                        mouse_button = events[i].code - BTN_MOUSE;
+                        if (events[i].value == 0) {
+                            SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_RELEASED, EVDEV_MouseButtons[mouse_button]);
+                        } else if (events[i].value == 1) {
+                            SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_PRESSED, EVDEV_MouseButtons[mouse_button]);
+                        }
+                        break;
+                    }
+
+                    /* Probably keyboard */
+                    scan_code = SDL_EVDEV_translate_keycode(events[i].code);
+                    if (scan_code != SDL_SCANCODE_UNKNOWN) {
+                        if (events[i].value == 0) {
+                            SDL_SendKeyboardKey(SDL_RELEASED, scan_code);
+                        } else if (events[i].value == 1 || events[i].value == 2 /* Key repeated */ ) {
+                            SDL_SendKeyboardKey(SDL_PRESSED, scan_code);
+#ifdef SDL_INPUT_LINUXKD
+                            if (_this->console_fd >= 0) {
+                                kbe.kb_index = events[i].code;
+                                /* Convert the key to an UTF-8 char */
+                                /* Ref: http://www.linuxjournal.com/article/2783 */
+                                modstate = SDL_GetModState();
+                                kbe.kb_table = 0;
+                                
+                                /* Ref: http://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching */
+                                kbe.kb_table |= -( (modstate & KMOD_LCTRL) != 0) & (1 << KG_CTRLL | 1 << KG_CTRL);
+                                kbe.kb_table |= -( (modstate & KMOD_RCTRL) != 0) & (1 << KG_CTRLR | 1 << KG_CTRL);
+                                kbe.kb_table |= -( (modstate & KMOD_LSHIFT) != 0) & (1 << KG_SHIFTL | 1 << KG_SHIFT);
+                                kbe.kb_table |= -( (modstate & KMOD_RSHIFT) != 0) & (1 << KG_SHIFTR | 1 << KG_SHIFT);
+                                kbe.kb_table |= -( (modstate & KMOD_LALT) != 0) & (1 << KG_ALT);
+                                kbe.kb_table |= -( (modstate & KMOD_RALT) != 0) & (1 << KG_ALTGR);
+
+                                if (ioctl(_this->console_fd, KDGKBENT, (unsigned long)&kbe) == 0 && 
+                                    ((KTYP(kbe.kb_value) == KT_LATIN) || (KTYP(kbe.kb_value) == KT_ASCII) || (KTYP(kbe.kb_value) == KT_LETTER))) 
+                                {
+                                    kval = KVAL(kbe.kb_value);
+                                    
+                                    /* While there's a KG_CAPSSHIFT symbol, it's not useful to build the table index with it
+                                     * because 1 << KG_CAPSSHIFT overflows the 8 bits of kb_table 
+                                     * So, we do the CAPS LOCK logic here. Note that isalpha depends on the locale!
+                                     */
+                                    if ( modstate & KMOD_CAPS && isalpha(kval) ) {
+                                        if ( isupper(kval) ) {
+                                            kval = tolower(kval);
+                                        } else {
+                                            kval = toupper(kval);
+                                        }
+                                    }
+                                     
+                                    /* Convert to UTF-8 and send */
+                                    end = SDL_UCS4ToUTF8( kval, keysym);
+                                    *end = '\0';
+                                    SDL_SendKeyboardText(keysym);
+                                }
+                            }
+#endif /* SDL_INPUT_LINUXKD */
+                        }
+                    }
+                    break;
+                case EV_ABS:
+                    switch(events[i].code) {
+                    case ABS_X:
+                        SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_FALSE, events[i].value, mouse->y);
+                        break;
+                    case ABS_Y:
+                        SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_FALSE, mouse->x, events[i].value);
+                        break;
+                    default:
+                        break;
+                    }
+                    break;
+                case EV_REL:
+                    switch(events[i].code) {
+                    case REL_X:
+                        SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_TRUE, events[i].value, 0);
+                        break;
+                    case REL_Y:
+                        SDL_SendMouseMotion(mouse->focus, mouse->mouseID, SDL_TRUE, 0, events[i].value);
+                        break;
+                    case REL_WHEEL:
+                        SDL_SendMouseWheel(mouse->focus, mouse->mouseID, 0, events[i].value);
+                        break;
+                    case REL_HWHEEL:
+                        SDL_SendMouseWheel(mouse->focus, mouse->mouseID, events[i].value, 0);
+                        break;
+                    default:
+                        break;
+                    }
+                    break;
+                case EV_SYN:
+                    switch (events[i].code) {
+                    case SYN_DROPPED:
+                        SDL_EVDEV_sync_device(item);
+                        break;
+                    default:
+                        break;
+                    }
+                    break;
+                }
+            }
+        }    
+    }
+}
+
+static SDL_Scancode
+SDL_EVDEV_translate_keycode(int keycode)
+{
+    SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;
+
+    if (keycode < SDL_arraysize(EVDEV_Keycodes)) {
+        scancode = EVDEV_Keycodes[keycode];
+    }
+    if (scancode == SDL_SCANCODE_UNKNOWN) {
+        SDL_Log("The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list <sdl@libsdl.org> EVDEV KeyCode %d \n", keycode);
+    }
+    return scancode;
+}
+
+static void
+SDL_EVDEV_sync_device(SDL_evdevlist_item *item) 
+{
+    /* TODO: get full state of device and report whatever is required */
+}
+
+#if SDL_USE_LIBUDEV
+static int
+SDL_EVDEV_device_added(const char *devpath)
+{
+    SDL_evdevlist_item *item;
+
+    /* Check to make sure it's not already in list. */
+    for (item = _this->first; item != NULL; item = item->next) {
+        if (strcmp(devpath, item->path) == 0) {
+            return -1;  /* already have this one */
+        }
+    }
+    
+    item = (SDL_evdevlist_item *) SDL_calloc(1, sizeof (SDL_evdevlist_item));
+    if (item == NULL) {
+        return SDL_OutOfMemory();
+    }
+
+    item->fd = open(devpath, O_RDONLY, 0);
+    if (item->fd < 0) {
+        SDL_free(item);
+        return SDL_SetError("Unable to open %s", devpath);
+    }
+    
+    item->path = SDL_strdup(devpath);
+    if (item->path == NULL) {
+        close(item->fd);
+        SDL_free(item);
+        return SDL_OutOfMemory();
+    }
+    
+    /* Non blocking read mode */
+    fcntl(item->fd, F_SETFL, O_NONBLOCK);
+    
+    if (_this->last == NULL) {
+        _this->first = _this->last = item;
+    } else {
+        _this->last->next = item;
+        _this->last = item;
+    }
+    
+    SDL_EVDEV_sync_device(item);
+    
+    return _this->numdevices++;
+}
+#endif /* SDL_USE_LIBUDEV */
+
+static int
+SDL_EVDEV_device_removed(const char *devpath)
+{
+    SDL_evdevlist_item *item;
+    SDL_evdevlist_item *prev = NULL;
+
+    for (item = _this->first; item != NULL; item = item->next) {
+        /* found it, remove it. */
+        if ( strcmp(devpath, item->path) ==0 ) {
+            if (prev != NULL) {
+                prev->next = item->next;
+            } else {
+                SDL_assert(_this->first == item);
+                _this->first = item->next;
+            }
+            if (item == _this->last) {
+                _this->last = prev;
+            }
+            close(item->fd);
+            SDL_free(item->path);
+            SDL_free(item);
+            _this->numdevices--;
+            return 0;
+        }
+        prev = item;
+    }
+
+    return -1;
+}
+
+
+#endif /* SDL_INPUT_LINUXEV */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/core/linux/SDL_evdev.h b/Source/3rd Party/sdl/src/core/linux/SDL_evdev.h
new file mode 100644
index 000000000..f6398ea58
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/linux/SDL_evdev.h	
@@ -0,0 +1,59 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_evdev_h
+#define _SDL_evdev_h
+
+#ifdef SDL_INPUT_LINUXEV
+
+#include "SDL_events.h"
+#include <sys/stat.h>
+
+typedef struct SDL_evdevlist_item
+{
+    char *path;
+    int fd;
+    struct SDL_evdevlist_item *next;
+} SDL_evdevlist_item;
+
+typedef struct SDL_EVDEV_PrivateData
+{
+    SDL_evdevlist_item *first;
+    SDL_evdevlist_item *last;
+    int numdevices;
+    int ref_count;
+    int console_fd;
+    int kb_mode;
+    int tty;
+} SDL_EVDEV_PrivateData;
+
+extern int SDL_EVDEV_Init(void);
+extern void SDL_EVDEV_Quit(void);
+extern void SDL_EVDEV_Poll(void);
+
+
+#endif /* SDL_INPUT_LINUXEV */
+
+#endif /* _SDL_evdev_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/core/linux/SDL_udev.c b/Source/3rd Party/sdl/src/core/linux/SDL_udev.c
new file mode 100644
index 000000000..da03b7332
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/linux/SDL_udev.c	
@@ -0,0 +1,398 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* 
+ * To list the properties of a device, try something like:
+ * udevadm info -a -n snd/hwC0D0 (for a sound card)
+ * udevadm info --query=all -n input/event3 (for a keyboard, mouse, etc)
+ * udevadm info --query=property -n input/event2
+ */
+
+#include "SDL_udev.h"
+
+#ifdef SDL_USE_LIBUDEV
+
+static char* SDL_UDEV_LIBS[] = { "libudev.so.1", "libudev.so.0" };
+
+#define _THIS SDL_UDEV_PrivateData *_this
+static _THIS = NULL;
+
+#include "SDL.h"
+
+static SDL_bool SDL_UDEV_load_sym(const char *fn, void **addr);
+static int SDL_UDEV_load_syms(void);
+static SDL_bool SDL_UDEV_hotplug_update_available(void);
+static void device_event(SDL_UDEV_deviceevent type, struct udev_device *dev);
+
+static SDL_bool
+SDL_UDEV_load_sym(const char *fn, void **addr)
+{
+    *addr = SDL_LoadFunction(_this->udev_handle, fn);
+    if (*addr == NULL) {
+        /* Don't call SDL_SetError(): SDL_LoadFunction already did. */
+        return SDL_FALSE;
+    }
+
+    return SDL_TRUE;
+}
+
+static int
+SDL_UDEV_load_syms(void)
+{
+    /* cast funcs to char* first, to please GCC's strict aliasing rules. */
+    #define SDL_UDEV_SYM(x) \
+        if (!SDL_UDEV_load_sym(#x, (void **) (char *) & _this->x)) return -1
+
+    SDL_UDEV_SYM(udev_device_get_action);
+    SDL_UDEV_SYM(udev_device_get_devnode);
+    SDL_UDEV_SYM(udev_device_get_subsystem);
+    SDL_UDEV_SYM(udev_device_get_property_value);
+    SDL_UDEV_SYM(udev_device_new_from_syspath);
+    SDL_UDEV_SYM(udev_device_unref);
+    SDL_UDEV_SYM(udev_enumerate_add_match_property);
+    SDL_UDEV_SYM(udev_enumerate_add_match_subsystem);
+    SDL_UDEV_SYM(udev_enumerate_get_list_entry);
+    SDL_UDEV_SYM(udev_enumerate_new);
+    SDL_UDEV_SYM(udev_enumerate_scan_devices);
+    SDL_UDEV_SYM(udev_enumerate_unref);
+    SDL_UDEV_SYM(udev_list_entry_get_name);
+    SDL_UDEV_SYM(udev_list_entry_get_next);
+    SDL_UDEV_SYM(udev_monitor_enable_receiving);
+    SDL_UDEV_SYM(udev_monitor_filter_add_match_subsystem_devtype);
+    SDL_UDEV_SYM(udev_monitor_get_fd);
+    SDL_UDEV_SYM(udev_monitor_new_from_netlink);
+    SDL_UDEV_SYM(udev_monitor_receive_device);
+    SDL_UDEV_SYM(udev_monitor_unref);
+    SDL_UDEV_SYM(udev_new);
+    SDL_UDEV_SYM(udev_unref);
+    SDL_UDEV_SYM(udev_device_new_from_devnum);
+    SDL_UDEV_SYM(udev_device_get_devnum);
+    #undef SDL_UDEV_SYM
+
+    return 0;
+}
+
+static SDL_bool
+SDL_UDEV_hotplug_update_available(void)
+{
+    if (_this->udev_mon != NULL) {
+        const int fd = _this->udev_monitor_get_fd(_this->udev_mon);
+        fd_set fds;
+        struct timeval tv;
+
+        FD_ZERO(&fds);
+        FD_SET(fd, &fds);
+        tv.tv_sec = 0;
+        tv.tv_usec = 0;
+        if ((select(fd+1, &fds, NULL, NULL, &tv) > 0) && (FD_ISSET(fd, &fds))) {
+            return SDL_TRUE;
+        }
+    }
+    return SDL_FALSE;
+}
+
+
+int
+SDL_UDEV_Init(void)
+{
+    int retval = 0;
+    
+    if (_this == NULL) {
+        _this = (SDL_UDEV_PrivateData *) SDL_calloc(1, sizeof(*_this));
+        if(_this == NULL) {
+            return SDL_OutOfMemory();
+        }
+        
+        retval = SDL_UDEV_LoadLibrary();
+        if (retval < 0) {
+            SDL_UDEV_Quit();
+            return retval;
+        }
+        
+        /* Set up udev monitoring 
+         * Listen for input devices (mouse, keyboard, joystick, etc) and sound devices
+         */
+        
+        _this->udev = _this->udev_new();
+        if (_this->udev == NULL) {
+            SDL_UDEV_Quit();
+            return SDL_SetError("udev_new() failed");
+        }
+
+        _this->udev_mon = _this->udev_monitor_new_from_netlink(_this->udev, "udev");
+        if (_this->udev_mon == NULL) {
+            SDL_UDEV_Quit();
+            return SDL_SetError("udev_monitor_new_from_netlink() failed");
+        }
+        
+        _this->udev_monitor_filter_add_match_subsystem_devtype(_this->udev_mon, "input", NULL);
+        _this->udev_monitor_filter_add_match_subsystem_devtype(_this->udev_mon, "sound", NULL);
+        _this->udev_monitor_enable_receiving(_this->udev_mon);
+        
+        /* Do an initial scan of existing devices */
+        SDL_UDEV_Scan();
+
+    }
+    
+    _this->ref_count += 1;
+    
+    return retval;
+}
+
+void
+SDL_UDEV_Quit(void)
+{
+    SDL_UDEV_CallbackList *item;
+    
+    if (_this == NULL) {
+        return;
+    }
+    
+    _this->ref_count -= 1;
+    
+    if (_this->ref_count < 1) {
+        
+        if (_this->udev_mon != NULL) {
+            _this->udev_monitor_unref(_this->udev_mon);
+            _this->udev_mon = NULL;
+        }
+        if (_this->udev != NULL) {
+            _this->udev_unref(_this->udev);
+            _this->udev = NULL;
+        }
+        
+        /* Remove existing devices */
+        while (_this->first != NULL) {
+            item = _this->first;
+            _this->first = _this->first->next;
+            SDL_free(item);
+        }
+        
+        SDL_UDEV_UnloadLibrary();
+        SDL_free(_this);
+        _this = NULL;
+    }
+}
+
+void
+SDL_UDEV_Scan(void)
+{
+    struct udev_enumerate *enumerate = NULL;
+    struct udev_list_entry *devs = NULL;
+    struct udev_list_entry *item = NULL;  
+    
+    if (_this == NULL) {
+        return;
+    }
+   
+    enumerate = _this->udev_enumerate_new(_this->udev);
+    if (enumerate == NULL) {
+        SDL_UDEV_Quit();
+        SDL_SetError("udev_monitor_new_from_netlink() failed");
+        return;
+    }
+    
+    _this->udev_enumerate_add_match_subsystem(enumerate, "input");
+    _this->udev_enumerate_add_match_subsystem(enumerate, "sound");
+    
+    _this->udev_enumerate_scan_devices(enumerate);
+    devs = _this->udev_enumerate_get_list_entry(enumerate);
+    for (item = devs; item; item = _this->udev_list_entry_get_next(item)) {
+        const char *path = _this->udev_list_entry_get_name(item);
+        struct udev_device *dev = _this->udev_device_new_from_syspath(_this->udev, path);
+        if (dev != NULL) {
+            device_event(SDL_UDEV_DEVICEADDED, dev);
+            _this->udev_device_unref(dev);
+        }
+    }
+
+    _this->udev_enumerate_unref(enumerate);
+}
+
+
+void
+SDL_UDEV_UnloadLibrary(void)
+{
+    if (_this == NULL) {
+        return;
+    }
+    
+    if (_this->udev_handle != NULL) {
+        SDL_UnloadObject(_this->udev_handle);
+        _this->udev_handle = NULL;
+    }
+}
+
+int
+SDL_UDEV_LoadLibrary(void)
+{
+    int retval = 0, i;
+    
+    if (_this == NULL) {
+        return SDL_SetError("UDEV not initialized");
+    }
+    
+   
+    if (_this->udev_handle == NULL) {
+        for( i = 0 ; i < SDL_arraysize(SDL_UDEV_LIBS); i++) {
+            _this->udev_handle = SDL_LoadObject(SDL_UDEV_LIBS[i]);
+            if (_this->udev_handle != NULL) {
+                retval = SDL_UDEV_load_syms();
+                if (retval < 0) {
+                    SDL_UDEV_UnloadLibrary();
+                }
+                else {
+                    break;
+                }
+            }
+        }
+        
+        if (_this->udev_handle == NULL) {
+            retval = -1;
+            /* Don't call SDL_SetError(): SDL_LoadObject already did. */
+        }
+    }
+
+    return retval;
+}
+
+static void 
+device_event(SDL_UDEV_deviceevent type, struct udev_device *dev) 
+{
+    const char *subsystem;
+    const char *val = NULL;
+    int devclass = 0;
+    const char *path;
+    SDL_UDEV_CallbackList *item;
+    
+    path = _this->udev_device_get_devnode(dev);
+    if (path == NULL) {
+        return;
+    }
+    
+    subsystem = _this->udev_device_get_subsystem(dev);
+    if (SDL_strcmp(subsystem, "sound") == 0) {
+        devclass = SDL_UDEV_DEVICE_SOUND;
+    } else if (SDL_strcmp(subsystem, "input") == 0) {
+        val = _this->udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK");
+        if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+            devclass |= SDL_UDEV_DEVICE_JOYSTICK;
+        }
+        
+        val = _this->udev_device_get_property_value(dev, "ID_INPUT_MOUSE");
+        if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+            devclass |= SDL_UDEV_DEVICE_MOUSE;
+        }
+
+        val = _this->udev_device_get_property_value(dev, "ID_INPUT_KEYBOARD");
+        if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+            devclass |= SDL_UDEV_DEVICE_KEYBOARD;
+        }
+
+        if (devclass == 0) {
+            return;
+        }
+    } else {
+        return;
+    }
+    
+    /* Process callbacks */
+    for (item = _this->first; item != NULL; item = item->next) {
+        item->callback(type, devclass, path);
+    }
+}
+
+void 
+SDL_UDEV_Poll(void)
+{
+    struct udev_device *dev = NULL;
+    const char *action = NULL;
+
+    if (_this == NULL) {
+        return;
+    }
+
+    while (SDL_UDEV_hotplug_update_available()) {
+        dev = _this->udev_monitor_receive_device(_this->udev_mon);
+        if (dev == NULL) {
+            break;
+        }
+        action = _this->udev_device_get_action(dev);
+
+        if (SDL_strcmp(action, "add") == 0) {
+            device_event(SDL_UDEV_DEVICEADDED, dev);
+        } else if (SDL_strcmp(action, "remove") == 0) {
+            device_event(SDL_UDEV_DEVICEREMOVED, dev);
+        }
+        
+        _this->udev_device_unref(dev);
+    }
+}
+
+int 
+SDL_UDEV_AddCallback(SDL_UDEV_Callback cb)
+{
+    SDL_UDEV_CallbackList *item;
+    item = (SDL_UDEV_CallbackList *) SDL_calloc(1, sizeof (SDL_UDEV_CallbackList));
+    if (item == NULL) {
+        return SDL_OutOfMemory();
+    }
+    
+    item->callback = cb;
+
+    if (_this->last == NULL) {
+        _this->first = _this->last = item;
+    } else {
+        _this->last->next = item;
+        _this->last = item;
+    }
+    
+    return 1;
+}
+
+void 
+SDL_UDEV_DelCallback(SDL_UDEV_Callback cb)
+{
+    SDL_UDEV_CallbackList *item;
+    SDL_UDEV_CallbackList *prev = NULL;
+
+    for (item = _this->first; item != NULL; item = item->next) {
+        /* found it, remove it. */
+        if (item->callback == cb) {
+            if (prev != NULL) {
+                prev->next = item->next;
+            } else {
+                SDL_assert(_this->first == item);
+                _this->first = item->next;
+            }
+            if (item == _this->last) {
+                _this->last = prev;
+            }
+            SDL_free(item);
+            return;
+        }
+        prev = item;
+    }
+    
+}
+
+
+#endif /* SDL_USE_LIBUDEV */
diff --git a/Source/3rd Party/sdl/src/core/linux/SDL_udev.h b/Source/3rd Party/sdl/src/core/linux/SDL_udev.h
new file mode 100644
index 000000000..9a8782a76
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/linux/SDL_udev.h	
@@ -0,0 +1,115 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_udev_h
+#define _SDL_udev_h
+
+#if HAVE_LIBUDEV_H
+
+#ifndef SDL_USE_LIBUDEV
+#define SDL_USE_LIBUDEV 1
+#endif
+
+#include "SDL_loadso.h"
+#include "SDL_events.h"
+#include <libudev.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+/**
+ *  \brief Device type
+ */
+
+typedef enum
+{
+    SDL_UDEV_DEVICEADDED = 0x0001,
+    SDL_UDEV_DEVICEREMOVED
+} SDL_UDEV_deviceevent;
+
+/* A device can be any combination of these classes */
+typedef enum
+{
+    SDL_UDEV_DEVICE_MOUSE       = 0x0001,
+    SDL_UDEV_DEVICE_KEYBOARD    = 0x0002,
+    SDL_UDEV_DEVICE_JOYSTICK    = 0x0004,
+    SDL_UDEV_DEVICE_SOUND       = 0x0008
+} SDL_UDEV_deviceclass;
+
+typedef void (*SDL_UDEV_Callback)(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
+
+typedef struct SDL_UDEV_CallbackList {
+    SDL_UDEV_Callback callback;
+    struct SDL_UDEV_CallbackList *next;
+} SDL_UDEV_CallbackList;
+
+typedef struct SDL_UDEV_PrivateData
+{
+    const char *udev_library;
+    void *udev_handle;
+    struct udev *udev;
+    struct udev_monitor *udev_mon;
+    int ref_count;
+    SDL_UDEV_CallbackList *first, *last;
+    
+    /* Function pointers */
+    const char *(*udev_device_get_action)(struct udev_device *);
+    const char *(*udev_device_get_devnode)(struct udev_device *);
+    const char *(*udev_device_get_subsystem)(struct udev_device *);
+    const char *(*udev_device_get_property_value)(struct udev_device *, const char *);
+    struct udev_device *(*udev_device_new_from_syspath)(struct udev *, const char *);
+    void (*udev_device_unref)(struct udev_device *);
+    int (*udev_enumerate_add_match_property)(struct udev_enumerate *, const char *, const char *);
+    int (*udev_enumerate_add_match_subsystem)(struct udev_enumerate *, const char *);
+    struct udev_list_entry *(*udev_enumerate_get_list_entry)(struct udev_enumerate *);
+    struct udev_enumerate *(*udev_enumerate_new)(struct udev *);
+    int (*udev_enumerate_scan_devices)(struct udev_enumerate *);
+    void (*udev_enumerate_unref)(struct udev_enumerate *);
+    const char *(*udev_list_entry_get_name)(struct udev_list_entry *);
+    struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *);
+    int (*udev_monitor_enable_receiving)(struct udev_monitor *);
+    int (*udev_monitor_filter_add_match_subsystem_devtype)(struct udev_monitor *, const char *, const char *);
+    int (*udev_monitor_get_fd)(struct udev_monitor *);
+    struct udev_monitor *(*udev_monitor_new_from_netlink)(struct udev *, const char *);
+    struct udev_device *(*udev_monitor_receive_device)(struct udev_monitor *);
+    void (*udev_monitor_unref)(struct udev_monitor *);
+    struct udev *(*udev_new)(void);
+    void (*udev_unref)(struct udev *);
+    struct udev_device * (*udev_device_new_from_devnum)(struct udev *udev, char type, dev_t devnum);
+    dev_t (*udev_device_get_devnum) (struct udev_device *udev_device);
+} SDL_UDEV_PrivateData;
+
+extern int SDL_UDEV_Init(void);
+extern void SDL_UDEV_Quit(void);
+extern void SDL_UDEV_UnloadLibrary(void);
+extern int SDL_UDEV_LoadLibrary(void);
+extern void SDL_UDEV_Poll(void);
+extern void SDL_UDEV_Scan(void);
+extern int SDL_UDEV_AddCallback(SDL_UDEV_Callback cb);
+extern void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb);
+
+
+
+
+#endif /* HAVE_LIBUDEV_H */
+
+#endif /* _SDL_udev_h */
diff --git a/Source/3rd Party/sdl/src/core/windows/SDL_windows.c b/Source/3rd Party/sdl/src/core/windows/SDL_windows.c
new file mode 100644
index 000000000..16934d5e1
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/windows/SDL_windows.c	
@@ -0,0 +1,93 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if defined(__WIN32__) || defined(__WINRT__)
+
+#include "SDL_windows.h"
+#include "SDL_error.h"
+#include "SDL_assert.h"
+
+#include <objbase.h>  /* for CoInitialize/CoUninitialize (Win32 only) */
+
+/* Sets an error message based on GetLastError() */
+int
+WIN_SetErrorFromHRESULT(const char *prefix, HRESULT hr)
+{
+    TCHAR buffer[1024];
+    char *message;
+    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, hr, 0,
+                  buffer, SDL_arraysize(buffer), NULL);
+    message = WIN_StringToUTF8(buffer);
+    SDL_SetError("%s%s%s", prefix ? prefix : "", prefix ? ": " : "", message);
+    SDL_free(message);
+    return -1;
+}
+
+/* Sets an error message based on GetLastError() */
+int
+WIN_SetError(const char *prefix)
+{
+    return WIN_SetErrorFromHRESULT(prefix, GetLastError());
+}
+
+HRESULT
+WIN_CoInitialize(void)
+{
+    /* SDL handles any threading model, so initialize with the default, which
+       is compatible with OLE and if that doesn't work, try multi-threaded mode.
+
+       If you need multi-threaded mode, call CoInitializeEx() before SDL_Init()
+    */
+#ifdef __WINRT__
+    /* DLudwig: On WinRT, it is assumed that COM was initialized in main().
+       CoInitializeEx is available (not CoInitialize though), however
+       on WinRT, main() is typically declared with the [MTAThread]
+       attribute, which, AFAIK, should initialize COM.
+    */
+    return S_OK;
+#else
+    HRESULT hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+    if (hr == RPC_E_CHANGED_MODE) {
+        hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    }
+
+    /* S_FALSE means success, but someone else already initialized. */
+    /* You still need to call CoUninitialize in this case! */
+    if (hr == S_FALSE) {
+        return S_OK;
+    }
+
+    return hr;
+#endif
+}
+
+void
+WIN_CoUninitialize(void)
+{
+#ifndef __WINRT__
+    CoUninitialize();
+#endif
+}
+
+#endif /* __WIN32__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/core/windows/SDL_windows.h b/Source/3rd Party/sdl/src/core/windows/SDL_windows.h
new file mode 100644
index 000000000..f92cb950a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/windows/SDL_windows.h	
@@ -0,0 +1,61 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* This is an include file for windows.h with the SDL build settings */
+
+#ifndef _INCLUDED_WINDOWS_H
+#define _INCLUDED_WINDOWS_H
+
+#if defined(__WIN32__)
+//#define WIN32_LEAN_AND_MEAN
+#define STRICT
+#ifndef UNICODE
+#define UNICODE 1
+#endif
+#undef _WIN32_WINNT
+#define _WIN32_WINNT  0x501   /* Need 0x410 for AlphaBlend() and 0x500 for EnumDisplayDevices(), 0x501 for raw input */
+#endif
+
+#include <windows.h>
+
+/* Routines to convert from UTF8 to native Windows text */
+#if UNICODE
+#define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "UTF-16LE", (char *)(S), (SDL_wcslen(S)+1)*sizeof(WCHAR))
+#define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UTF-16LE", "UTF-8", (char *)(S), SDL_strlen(S)+1)
+#else
+/* !!! FIXME: UTF8ToString() can just be a SDL_strdup() here. */
+#define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)(S), (SDL_strlen(S)+1))
+#define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)(S), SDL_strlen(S)+1)
+#endif
+
+/* Sets an error message based on a given HRESULT */
+extern int WIN_SetErrorFromHRESULT(const char *prefix, HRESULT hr);
+
+/* Sets an error message based on GetLastError(). Always return -1. */
+extern int WIN_SetError(const char *prefix);
+
+/* Wrap up the oddities of CoInitialize() into a common function. */
+extern HRESULT WIN_CoInitialize(void);
+extern void WIN_CoUninitialize(void);
+
+#endif /* _INCLUDED_WINDOWS_H */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_common.cpp b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_common.cpp
new file mode 100644
index 000000000..0758ad922
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_common.cpp	
@@ -0,0 +1,37 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "SDL_system.h"
+#include "SDL_winrtapp_direct3d.h"
+#include "SDL_winrtapp_xaml.h"
+
+int (*WINRT_SDLAppEntryPoint)(int, char **) = NULL;
+
+extern "C" DECLSPEC int
+SDL_WinRTRunApp(int (*mainFunction)(int, char **), void * xamlBackgroundPanel)
+{
+    if (xamlBackgroundPanel) {
+        return SDL_WinRTInitXAMLApp(mainFunction, xamlBackgroundPanel);
+    } else {
+        return SDL_WinRTInitNonXAMLApp(mainFunction);
+    }
+}
diff --git a/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_common.h b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_common.h
new file mode 100644
index 000000000..e49e615e8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_common.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_winrtapp_common_h
+#define _SDL_winrtapp_common_h
+
+/* A pointer to the app's C-style main() function (which is a different
+   function than the WinRT app's actual entry point).
+ */
+extern int (*WINRT_SDLAppEntryPoint)(int, char **);
+
+#endif // ifndef _SDL_winrtapp_common_h
diff --git a/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp
new file mode 100644
index 000000000..2fd20a89d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_direct3d.cpp	
@@ -0,0 +1,699 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* Standard C++11 includes */
+#include <functional>
+#include <string>
+#include <sstream>
+using namespace std;
+
+
+/* Windows includes */
+#include "ppltasks.h"
+using namespace concurrency;
+using namespace Windows::ApplicationModel;
+using namespace Windows::ApplicationModel::Core;
+using namespace Windows::ApplicationModel::Activation;
+using namespace Windows::Devices::Input;
+using namespace Windows::Graphics::Display;
+using namespace Windows::Foundation;
+using namespace Windows::System;
+using namespace Windows::UI::Core;
+using namespace Windows::UI::Input;
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+using namespace Windows::Phone::UI::Input;
+#endif
+
+
+/* SDL includes */
+extern "C" {
+#include "../../SDL_internal.h"
+#include "SDL_assert.h"
+#include "SDL_events.h"
+#include "SDL_hints.h"
+#include "SDL_log.h"
+#include "SDL_main.h"
+#include "SDL_stdinc.h"
+#include "SDL_render.h"
+#include "../../video/SDL_sysvideo.h"
+//#include "../../SDL_hints_c.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_windowevents_c.h"
+#include "../../render/SDL_sysrender.h"
+#include "../windows/SDL_windows.h"
+}
+
+#include "../../video/winrt/SDL_winrtevents_c.h"
+#include "../../video/winrt/SDL_winrtvideo_cpp.h"
+#include "SDL_winrtapp_common.h"
+#include "SDL_winrtapp_direct3d.h"
+
+
+// Compile-time debugging options:
+// To enable, uncomment; to disable, comment them out.
+//#define LOG_POINTER_EVENTS 1
+//#define LOG_WINDOW_EVENTS 1
+//#define LOG_ORIENTATION_EVENTS 1
+
+
+// HACK, DLudwig: record a reference to the global, WinRT 'app'/view.
+// SDL/WinRT will use this throughout its code.
+//
+// TODO, WinRT: consider replacing SDL_WinRTGlobalApp with something
+// non-global, such as something created inside
+// SDL_InitSubSystem(SDL_INIT_VIDEO), or something inside
+// SDL_CreateWindow().
+SDL_WinRTApp ^ SDL_WinRTGlobalApp = nullptr;
+
+ref class SDLApplicationSource sealed : Windows::ApplicationModel::Core::IFrameworkViewSource
+{
+public:
+    virtual Windows::ApplicationModel::Core::IFrameworkView^ CreateView();
+};
+
+IFrameworkView^ SDLApplicationSource::CreateView()
+{
+    // TODO, WinRT: see if this function (CreateView) can ever get called
+    // more than once.  For now, just prevent it from ever assigning
+    // SDL_WinRTGlobalApp more than once.
+    SDL_assert(!SDL_WinRTGlobalApp);
+    SDL_WinRTApp ^ app = ref new SDL_WinRTApp();
+    if (!SDL_WinRTGlobalApp)
+    {
+        SDL_WinRTGlobalApp = app;
+    }
+    return app;
+}
+
+int SDL_WinRTInitNonXAMLApp(int (*mainFunction)(int, char **))
+{
+    WINRT_SDLAppEntryPoint = mainFunction;
+    auto direct3DApplicationSource = ref new SDLApplicationSource();
+    CoreApplication::Run(direct3DApplicationSource);
+    return 0;
+}
+
+static void WINRT_SetDisplayOrientationsPreference(void *userdata, const char *name, const char *oldValue, const char *newValue)
+{
+    SDL_assert(SDL_strcmp(name, SDL_HINT_ORIENTATIONS) == 0);
+
+    // Start with no orientation flags, then add each in as they're parsed
+    // from newValue.
+    unsigned int orientationFlags = 0;
+    if (newValue) {
+        std::istringstream tokenizer(newValue);
+        while (!tokenizer.eof()) {
+            std::string orientationName;
+            std::getline(tokenizer, orientationName, ' ');
+            if (orientationName == "LandscapeLeft") {
+                orientationFlags |= (unsigned int) DisplayOrientations::LandscapeFlipped;
+            } else if (orientationName == "LandscapeRight") {
+                orientationFlags |= (unsigned int) DisplayOrientations::Landscape;
+            } else if (orientationName == "Portrait") {
+                orientationFlags |= (unsigned int) DisplayOrientations::Portrait;
+            } else if (orientationName == "PortraitUpsideDown") {
+                orientationFlags |= (unsigned int) DisplayOrientations::PortraitFlipped;
+            }
+        }
+    }
+
+    // If no valid orientation flags were specified, use a reasonable set of defaults:
+    if (!orientationFlags) {
+        // TODO, WinRT: consider seeing if an app's default orientation flags can be found out via some API call(s).
+        orientationFlags = (unsigned int) ( \
+            DisplayOrientations::Landscape |
+            DisplayOrientations::LandscapeFlipped |
+            DisplayOrientations::Portrait |
+            DisplayOrientations::PortraitFlipped);
+    }
+
+    // Set the orientation/rotation preferences.  Please note that this does
+    // not constitute a 100%-certain lock of a given set of possible
+    // orientations.  According to Microsoft's documentation on WinRT [1]
+    // when a device is not capable of being rotated, Windows may ignore
+    // the orientation preferences, and stick to what the device is capable of
+    // displaying.
+    //
+    // [1] Documentation on the 'InitialRotationPreference' setting for a
+    // Windows app's manifest file describes how some orientation/rotation
+    // preferences may be ignored.  See
+    // http://msdn.microsoft.com/en-us/library/windows/apps/hh700343.aspx
+    // for details.  Microsoft's "Display orientation sample" also gives an
+    // outline of how Windows treats device rotation
+    // (http://code.msdn.microsoft.com/Display-Orientation-Sample-19a58e93).
+#if NTDDI_VERSION > NTDDI_WIN8
+    DisplayInformation::AutoRotationPreferences = (DisplayOrientations) orientationFlags;
+#else
+    DisplayProperties::AutoRotationPreferences = (DisplayOrientations) orientationFlags;
+#endif
+}
+
+static void
+WINRT_ProcessWindowSizeChange()
+{
+    // Make the new window size be the one true fullscreen mode.
+    // This change was initially done, in part, to allow the Direct3D 11.1
+    // renderer to receive window-resize events as a device rotates.
+    // Before, rotating a device from landscape, to portrait, and then
+    // back to landscape would cause the Direct3D 11.1 swap buffer to
+    // not get resized appropriately.  SDL would, on the rotation from
+    // landscape to portrait, re-resize the SDL window to it's initial
+    // size (landscape).  On the subsequent rotation, SDL would drop the
+    // window-resize event as it appeared the SDL window didn't change
+    // size, and the Direct3D 11.1 renderer wouldn't resize its swap
+    // chain.
+    SDL_DisplayMode newDisplayMode;
+    if (WINRT_CalcDisplayModeUsingNativeWindow(&newDisplayMode) != 0) {
+        return;
+    }
+
+    // Make note of the old display mode, and it's old driverdata.
+    SDL_DisplayMode oldDisplayMode;
+    SDL_zero(oldDisplayMode);
+    if (WINRT_GlobalSDLVideoDevice) {
+        oldDisplayMode = WINRT_GlobalSDLVideoDevice->displays[0].desktop_mode;
+    }
+
+    // Setup the new display mode in the appropriate spots.
+    if (WINRT_GlobalSDLVideoDevice) {
+        // Make a full copy of the display mode for display_modes[0],
+        // one with with a separately malloced 'driverdata' field.
+        // SDL_VideoQuit(), if called, will attempt to free the driverdata
+        // fields in 'desktop_mode' and each entry in the 'display_modes'
+        // array.
+        if (WINRT_GlobalSDLVideoDevice->displays[0].display_modes[0].driverdata) {
+            // Free the previous mode's memory
+            SDL_free(WINRT_GlobalSDLVideoDevice->displays[0].display_modes[0].driverdata);
+            WINRT_GlobalSDLVideoDevice->displays[0].display_modes[0].driverdata = NULL;
+        }
+        if (WINRT_DuplicateDisplayMode(&(WINRT_GlobalSDLVideoDevice->displays[0].display_modes[0]), &newDisplayMode) != 0) {
+            // Uh oh, something went wrong.  A malloc call probably failed.
+            SDL_free(newDisplayMode.driverdata);
+            return;
+        }
+
+        // Install 'newDisplayMode' into 'current_mode' and 'desktop_mode'.
+        WINRT_GlobalSDLVideoDevice->displays[0].current_mode = newDisplayMode;
+        WINRT_GlobalSDLVideoDevice->displays[0].desktop_mode = newDisplayMode;
+    }
+
+    if (WINRT_GlobalSDLWindow) {
+        // Send a window-resize event to the rest of SDL, and to apps:
+        SDL_SendWindowEvent(
+            WINRT_GlobalSDLWindow,
+            SDL_WINDOWEVENT_RESIZED,
+            newDisplayMode.w,
+            newDisplayMode.h);
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+        // HACK: On Windows Phone, make sure that orientation changes from
+        // Landscape to LandscapeFlipped, Portrait to PortraitFlipped,
+        // or vice-versa on either of those two, lead to the Direct3D renderer
+        // getting updated.
+        const DisplayOrientations oldOrientation = ((SDL_DisplayModeData *)oldDisplayMode.driverdata)->currentOrientation;
+        const DisplayOrientations newOrientation = ((SDL_DisplayModeData *)newDisplayMode.driverdata)->currentOrientation;
+
+        if ((oldOrientation == DisplayOrientations::Landscape && newOrientation == DisplayOrientations::LandscapeFlipped) ||
+            (oldOrientation == DisplayOrientations::LandscapeFlipped && newOrientation == DisplayOrientations::Landscape) ||
+            (oldOrientation == DisplayOrientations::Portrait && newOrientation == DisplayOrientations::PortraitFlipped) ||
+            (oldOrientation == DisplayOrientations::PortraitFlipped && newOrientation == DisplayOrientations::Portrait))
+        {
+            // One of the reasons this event is getting sent out is because SDL
+            // will ignore requests to send out SDL_WINDOWEVENT_RESIZED events
+            // if and when the event size doesn't change (and the Direct3D 11.1
+            // renderer doesn't get the memo).
+            //
+            // Make sure that the display/window size really didn't change.  If
+            // it did, then a SDL_WINDOWEVENT_SIZE_CHANGED event got sent, and
+            // the Direct3D 11.1 renderer picked it up, presumably.
+            if (oldDisplayMode.w == newDisplayMode.w &&
+                oldDisplayMode.h == newDisplayMode.h)
+            {
+                SDL_SendWindowEvent(
+                    WINRT_GlobalSDLWindow,
+                    SDL_WINDOWEVENT_SIZE_CHANGED,
+                    newDisplayMode.w,
+                    newDisplayMode.h);
+            }
+        }
+#endif
+    }
+    
+    // Finally, free the 'driverdata' field of the old 'desktop_mode'.
+    if (oldDisplayMode.driverdata) {
+        SDL_free(oldDisplayMode.driverdata);
+        oldDisplayMode.driverdata = NULL;
+    }
+}
+
+SDL_WinRTApp::SDL_WinRTApp() :
+    m_windowClosed(false),
+    m_windowVisible(true)
+{
+}
+
+void SDL_WinRTApp::Initialize(CoreApplicationView^ applicationView)
+{
+    applicationView->Activated +=
+        ref new TypedEventHandler<CoreApplicationView^, IActivatedEventArgs^>(this, &SDL_WinRTApp::OnActivated);
+
+    CoreApplication::Suspending +=
+        ref new EventHandler<SuspendingEventArgs^>(this, &SDL_WinRTApp::OnSuspending);
+
+    CoreApplication::Resuming +=
+        ref new EventHandler<Platform::Object^>(this, &SDL_WinRTApp::OnResuming);
+
+    CoreApplication::Exiting +=
+        ref new EventHandler<Platform::Object^>(this, &SDL_WinRTApp::OnExiting);
+}
+
+#if NTDDI_VERSION > NTDDI_WIN8
+void SDL_WinRTApp::OnOrientationChanged(DisplayInformation^ sender, Object^ args)
+#else
+void SDL_WinRTApp::OnOrientationChanged(Object^ sender)
+#endif
+{
+#if LOG_ORIENTATION_EVENTS==1
+    CoreWindow^ window = CoreWindow::GetForCurrentThread();
+    if (window) {
+        SDL_Log("%s, current orientation=%d, native orientation=%d, auto rot. pref=%d, CoreWindow Size={%f,%f}\n",
+            __FUNCTION__,
+            (int)DisplayProperties::CurrentOrientation,
+            (int)DisplayProperties::NativeOrientation,
+            (int)DisplayProperties::AutoRotationPreferences,
+            window->Bounds.Width,
+            window->Bounds.Height);
+    } else {
+        SDL_Log("%s, current orientation=%d, native orientation=%d, auto rot. pref=%d\n",
+            __FUNCTION__,
+            (int)DisplayProperties::CurrentOrientation,
+            (int)DisplayProperties::NativeOrientation,
+            (int)DisplayProperties::AutoRotationPreferences);
+    }
+#endif
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    // On Windows Phone, treat an orientation change as a change in window size.
+    // The native window's size doesn't seem to change, however SDL will simulate
+    // a window size change.
+    WINRT_ProcessWindowSizeChange();
+#endif
+}
+
+void SDL_WinRTApp::SetWindow(CoreWindow^ window)
+{
+#if LOG_WINDOW_EVENTS==1
+    SDL_Log("%s, current orientation=%d, native orientation=%d, auto rot. pref=%d, window Size={%f,%f}\n",
+        __FUNCTION__,
+        (int)DisplayProperties::CurrentOrientation,
+        (int)DisplayProperties::NativeOrientation,
+        (int)DisplayProperties::AutoRotationPreferences,
+        window->Bounds.Width,
+        window->Bounds.Height);
+#endif
+
+    window->SizeChanged += 
+        ref new TypedEventHandler<CoreWindow^, WindowSizeChangedEventArgs^>(this, &SDL_WinRTApp::OnWindowSizeChanged);
+
+    window->VisibilityChanged +=
+        ref new TypedEventHandler<CoreWindow^, VisibilityChangedEventArgs^>(this, &SDL_WinRTApp::OnVisibilityChanged);
+
+    window->Closed += 
+        ref new TypedEventHandler<CoreWindow^, CoreWindowEventArgs^>(this, &SDL_WinRTApp::OnWindowClosed);
+
+#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
+    window->PointerCursor = ref new CoreCursor(CoreCursorType::Arrow, 0);
+#endif
+
+    window->PointerPressed +=
+        ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &SDL_WinRTApp::OnPointerPressed);
+
+    window->PointerMoved +=
+        ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &SDL_WinRTApp::OnPointerMoved);
+
+    window->PointerReleased +=
+        ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &SDL_WinRTApp::OnPointerReleased);
+
+    window->PointerWheelChanged +=
+        ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &SDL_WinRTApp::OnPointerWheelChanged);
+
+#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
+    // Retrieves relative-only mouse movements:
+    Windows::Devices::Input::MouseDevice::GetForCurrentView()->MouseMoved +=
+        ref new TypedEventHandler<MouseDevice^, MouseEventArgs^>(this, &SDL_WinRTApp::OnMouseMoved);
+#endif
+
+    window->KeyDown +=
+        ref new TypedEventHandler<CoreWindow^, KeyEventArgs^>(this, &SDL_WinRTApp::OnKeyDown);
+
+    window->KeyUp +=
+        ref new TypedEventHandler<CoreWindow^, KeyEventArgs^>(this, &SDL_WinRTApp::OnKeyUp);
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    HardwareButtons::BackPressed +=
+        ref new EventHandler<BackPressedEventArgs^>(this, &SDL_WinRTApp::OnBackButtonPressed);
+#endif
+
+#if NTDDI_VERSION > NTDDI_WIN8
+    DisplayInformation::GetForCurrentView()->OrientationChanged +=
+        ref new TypedEventHandler<Windows::Graphics::Display::DisplayInformation^, Object^>(this, &SDL_WinRTApp::OnOrientationChanged);
+#else
+    DisplayProperties::OrientationChanged +=
+        ref new DisplayPropertiesEventHandler(this, &SDL_WinRTApp::OnOrientationChanged);
+#endif
+
+    // Register the hint, SDL_HINT_ORIENTATIONS, with SDL.
+    // TODO, WinRT: see if an app's default orientation can be found out via WinRT API(s), then set the initial value of SDL_HINT_ORIENTATIONS accordingly.
+    SDL_AddHintCallback(SDL_HINT_ORIENTATIONS, WINRT_SetDisplayOrientationsPreference, NULL);
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP  // for Windows 8/8.1/RT apps... (and not Phone apps)
+    // Make sure we know when a user has opened the app's settings pane.
+    // This is needed in order to display a privacy policy, which needs
+    // to be done for network-enabled apps, as per Windows Store requirements.
+    using namespace Windows::UI::ApplicationSettings;
+    SettingsPane::GetForCurrentView()->CommandsRequested +=
+        ref new TypedEventHandler<SettingsPane^, SettingsPaneCommandsRequestedEventArgs^>
+            (this, &SDL_WinRTApp::OnSettingsPaneCommandsRequested);
+#endif
+}
+
+void SDL_WinRTApp::Load(Platform::String^ entryPoint)
+{
+}
+
+void SDL_WinRTApp::Run()
+{
+    SDL_SetMainReady();
+    if (WINRT_SDLAppEntryPoint)
+    {
+        // TODO, WinRT: pass the C-style main() a reasonably realistic
+        // representation of command line arguments.
+        int argc = 0;
+        char **argv = NULL;
+        WINRT_SDLAppEntryPoint(argc, argv);
+    }
+}
+
+void SDL_WinRTApp::PumpEvents()
+{
+    if (!m_windowClosed)
+    {
+        if (m_windowVisible)
+        {
+            CoreWindow::GetForCurrentThread()->Dispatcher->ProcessEvents(CoreProcessEventsOption::ProcessAllIfPresent);
+        }
+        else
+        {
+            CoreWindow::GetForCurrentThread()->Dispatcher->ProcessEvents(CoreProcessEventsOption::ProcessOneAndAllPending);
+        }
+    }
+}
+
+void SDL_WinRTApp::Uninitialize()
+{
+}
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+void SDL_WinRTApp::OnSettingsPaneCommandsRequested(
+    Windows::UI::ApplicationSettings::SettingsPane ^p,
+    Windows::UI::ApplicationSettings::SettingsPaneCommandsRequestedEventArgs ^args)
+{
+    using namespace Platform;
+    using namespace Windows::UI::ApplicationSettings;
+    using namespace Windows::UI::Popups;
+
+    String ^privacyPolicyURL = nullptr;     // a URL to an app's Privacy Policy
+    String ^privacyPolicyLabel = nullptr;   // label/link text
+    const char *tmpHintValue = NULL;        // SDL_GetHint-retrieved value, used immediately
+    wchar_t *tmpStr = NULL;                 // used for UTF8 to UCS2 conversion
+
+    // Setup a 'Privacy Policy' link, if one is available (via SDL_GetHint):
+    tmpHintValue = SDL_GetHint(SDL_HINT_WINRT_PRIVACY_POLICY_URL);
+    if (tmpHintValue && tmpHintValue[0] != '\0') {
+        // Convert the privacy policy's URL to UCS2:
+        tmpStr = WIN_UTF8ToString(tmpHintValue);
+        privacyPolicyURL = ref new String(tmpStr);
+        SDL_free(tmpStr);
+
+        // Optionally retrieve custom label-text for the link.  If this isn't
+        // available, a default value will be used instead.
+        tmpHintValue = SDL_GetHint(SDL_HINT_WINRT_PRIVACY_POLICY_LABEL);
+        if (tmpHintValue && tmpHintValue[0] != '\0') {
+            tmpStr = WIN_UTF8ToString(tmpHintValue);
+            privacyPolicyLabel = ref new String(tmpStr);
+            SDL_free(tmpStr);
+        } else {
+            privacyPolicyLabel = ref new String(L"Privacy Policy");
+        }
+
+        // Register the link, along with a handler to be called if and when it is
+        // clicked:
+        auto cmd = ref new SettingsCommand(L"privacyPolicy", privacyPolicyLabel,
+            ref new UICommandInvokedHandler([=](IUICommand ^) {
+                Windows::System::Launcher::LaunchUriAsync(ref new Uri(privacyPolicyURL));
+        }));
+        args->Request->ApplicationCommands->Append(cmd);
+    }
+}
+#endif // if WINAPI_FAMILY == WINAPI_FAMILY_APP
+
+void SDL_WinRTApp::OnWindowSizeChanged(CoreWindow^ sender, WindowSizeChangedEventArgs^ args)
+{
+#if LOG_WINDOW_EVENTS==1
+    SDL_Log("%s, size={%f,%f}, current orientation=%d, native orientation=%d, auto rot. pref=%d, WINRT_GlobalSDLWindow?=%s\n",
+        __FUNCTION__,
+        args->Size.Width, args->Size.Height,
+        (int)DisplayProperties::CurrentOrientation,
+        (int)DisplayProperties::NativeOrientation,
+        (int)DisplayProperties::AutoRotationPreferences,
+        (WINRT_GlobalSDLWindow ? "yes" : "no"));
+#endif
+
+    WINRT_ProcessWindowSizeChange();
+}
+
+void SDL_WinRTApp::OnVisibilityChanged(CoreWindow^ sender, VisibilityChangedEventArgs^ args)
+{
+#if LOG_WINDOW_EVENTS==1
+    SDL_Log("%s, visible?=%s, WINRT_GlobalSDLWindow?=%s\n",
+        __FUNCTION__,
+        (args->Visible ? "yes" : "no"),
+        (WINRT_GlobalSDLWindow ? "yes" : "no"));
+#endif
+
+    m_windowVisible = args->Visible;
+    if (WINRT_GlobalSDLWindow) {
+        SDL_bool wasSDLWindowSurfaceValid = WINRT_GlobalSDLWindow->surface_valid;
+
+        if (args->Visible) {
+            SDL_SendWindowEvent(WINRT_GlobalSDLWindow, SDL_WINDOWEVENT_SHOWN, 0, 0);
+        } else {
+            SDL_SendWindowEvent(WINRT_GlobalSDLWindow, SDL_WINDOWEVENT_HIDDEN, 0, 0);
+        }
+
+        // HACK: Prevent SDL's window-hide handling code, which currently
+        // triggers a fake window resize (possibly erronously), from
+        // marking the SDL window's surface as invalid.
+        //
+        // A better solution to this probably involves figuring out if the
+        // fake window resize can be prevented.
+        WINRT_GlobalSDLWindow->surface_valid = wasSDLWindowSurfaceValid;
+    }
+}
+
+void SDL_WinRTApp::OnWindowClosed(CoreWindow^ sender, CoreWindowEventArgs^ args)
+{
+#if LOG_WINDOW_EVENTS==1
+    SDL_Log("%s\n", __FUNCTION__);
+#endif
+    m_windowClosed = true;
+}
+
+void SDL_WinRTApp::OnActivated(CoreApplicationView^ applicationView, IActivatedEventArgs^ args)
+{
+    CoreWindow::GetForCurrentThread()->Activate();
+}
+
+static int SDLCALL RemoveAppSuspendAndResumeEvents(void * userdata, SDL_Event * event)
+{
+    if (event->type == SDL_WINDOWEVENT)
+    {
+        switch (event->window.event)
+        {
+            case SDL_WINDOWEVENT_MINIMIZED:
+            case SDL_WINDOWEVENT_RESTORED:
+                // Return 0 to indicate that the event should be removed from the
+                // event queue:
+                return 0;
+            default:
+                break;
+        }
+    }
+
+    // Return 1 to indicate that the event should stay in the event queue:
+    return 1;
+}
+
+void SDL_WinRTApp::OnSuspending(Platform::Object^ sender, SuspendingEventArgs^ args)
+{
+    // Save app state asynchronously after requesting a deferral. Holding a deferral
+    // indicates that the application is busy performing suspending operations. Be
+    // aware that a deferral may not be held indefinitely. After about five seconds,
+    // the app will be forced to exit.
+    SuspendingDeferral^ deferral = args->SuspendingOperation->GetDeferral();
+    create_task([this, deferral]()
+    {
+        // Send a window-minimized event immediately to observers.
+        // CoreDispatcher::ProcessEvents, which is the backbone on which
+        // SDL_WinRTApp::PumpEvents is built, will not return to its caller
+        // once it sends out a suspend event.  Any events posted to SDL's
+        // event queue won't get received until the WinRT app is resumed.
+        // SDL_AddEventWatch() may be used to receive app-suspend events on
+        // WinRT.
+        //
+        // In order to prevent app-suspend events from being received twice:
+        // first via a callback passed to SDL_AddEventWatch, and second via
+        // SDL's event queue, the event will be sent to SDL, then immediately
+        // removed from the queue.
+        if (WINRT_GlobalSDLWindow)
+        {
+            SDL_SendWindowEvent(WINRT_GlobalSDLWindow, SDL_WINDOWEVENT_MINIMIZED, 0, 0);   // TODO: see if SDL_WINDOWEVENT_SIZE_CHANGED should be getting triggered here (it is, currently)
+            SDL_FilterEvents(RemoveAppSuspendAndResumeEvents, 0);
+        }
+
+        SDL_SendAppEvent(SDL_APP_WILLENTERBACKGROUND);
+        SDL_SendAppEvent(SDL_APP_DIDENTERBACKGROUND);
+
+        deferral->Complete();
+    });
+}
+
+void SDL_WinRTApp::OnResuming(Platform::Object^ sender, Platform::Object^ args)
+{
+    SDL_SendAppEvent(SDL_APP_WILLENTERFOREGROUND);
+    SDL_SendAppEvent(SDL_APP_DIDENTERFOREGROUND);
+
+    // Restore any data or state that was unloaded on suspend. By default, data
+    // and state are persisted when resuming from suspend. Note that this event
+    // does not occur if the app was previously terminated.
+    if (WINRT_GlobalSDLWindow)
+    {
+        SDL_SendWindowEvent(WINRT_GlobalSDLWindow, SDL_WINDOWEVENT_RESTORED, 0, 0);    // TODO: see if SDL_WINDOWEVENT_SIZE_CHANGED should be getting triggered here (it is, currently)
+
+        // Remove the app-resume event from the queue, as is done with the
+        // app-suspend event.
+        //
+        // TODO, WinRT: consider posting this event to the queue even though
+        // its counterpart, the app-suspend event, effectively has to be
+        // processed immediately.
+        SDL_FilterEvents(RemoveAppSuspendAndResumeEvents, 0);
+    }
+}
+
+void SDL_WinRTApp::OnExiting(Platform::Object^ sender, Platform::Object^ args)
+{
+    SDL_SendAppEvent(SDL_APP_TERMINATING);
+}
+
+static void
+WINRT_LogPointerEvent(const char * header, Windows::UI::Core::PointerEventArgs ^ args, Windows::Foundation::Point transformedPoint)
+{
+    Windows::UI::Input::PointerPoint ^ pt = args->CurrentPoint;
+    SDL_Log("%s: Position={%f,%f}, Transformed Pos={%f, %f}, MouseWheelDelta=%d, FrameId=%d, PointerId=%d, SDL button=%d\n",
+        header,
+        pt->Position.X, pt->Position.Y,
+        transformedPoint.X, transformedPoint.Y,
+        pt->Properties->MouseWheelDelta,
+        pt->FrameId,
+        pt->PointerId,
+        WINRT_GetSDLButtonForPointerPoint(pt));
+}
+
+void SDL_WinRTApp::OnPointerPressed(CoreWindow^ sender, PointerEventArgs^ args)
+{
+#if LOG_POINTER_EVENTS
+    WINRT_LogPointerEvent("pointer pressed", args, WINRT_TransformCursorPosition(WINRT_GlobalSDLWindow, args->CurrentPoint->Position, TransformToSDLWindowSize));
+#endif
+
+    WINRT_ProcessPointerPressedEvent(WINRT_GlobalSDLWindow, args->CurrentPoint);
+}
+
+void SDL_WinRTApp::OnPointerMoved(CoreWindow^ sender, PointerEventArgs^ args)
+{
+#if LOG_POINTER_EVENTS
+    WINRT_LogPointerEvent("pointer moved", args, WINRT_TransformCursorPosition(WINRT_GlobalSDLWindow, args->CurrentPoint->Position, TransformToSDLWindowSize));
+#endif
+
+    WINRT_ProcessPointerMovedEvent(WINRT_GlobalSDLWindow, args->CurrentPoint);
+}
+
+void SDL_WinRTApp::OnPointerReleased(CoreWindow^ sender, PointerEventArgs^ args)
+{
+#if LOG_POINTER_EVENTS
+    WINRT_LogPointerEvent("pointer released", args, WINRT_TransformCursorPosition(WINRT_GlobalSDLWindow, args->CurrentPoint->Position, TransformToSDLWindowSize));
+#endif
+
+    WINRT_ProcessPointerReleasedEvent(WINRT_GlobalSDLWindow, args->CurrentPoint);
+}
+
+void SDL_WinRTApp::OnPointerWheelChanged(CoreWindow^ sender, PointerEventArgs^ args)
+{
+#if LOG_POINTER_EVENTS
+    WINRT_LogPointerEvent("pointer wheel changed", args, WINRT_TransformCursorPosition(WINRT_GlobalSDLWindow, args->CurrentPoint->Position, TransformToSDLWindowSize));
+#endif
+
+    WINRT_ProcessPointerWheelChangedEvent(WINRT_GlobalSDLWindow, args->CurrentPoint);
+}
+
+void SDL_WinRTApp::OnMouseMoved(MouseDevice^ mouseDevice, MouseEventArgs^ args)
+{
+    WINRT_ProcessMouseMovedEvent(WINRT_GlobalSDLWindow, args);
+}
+
+void SDL_WinRTApp::OnKeyDown(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args)
+{
+    WINRT_ProcessKeyDownEvent(args);
+}
+
+void SDL_WinRTApp::OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args)
+{
+    WINRT_ProcessKeyUpEvent(args);
+}
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+void SDL_WinRTApp::OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args)
+{
+    SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_AC_BACK);
+    SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_AC_BACK);
+
+    const char *hint = SDL_GetHint(SDL_HINT_WINRT_HANDLE_BACK_BUTTON);
+    if (hint) {
+        if (*hint == '1') {
+            args->Handled = true;
+        }
+    }
+}
+#endif
+
diff --git a/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_direct3d.h b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_direct3d.h
new file mode 100644
index 000000000..6dc9a6c85
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_direct3d.h	
@@ -0,0 +1,80 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include <Windows.h>
+
+extern int SDL_WinRTInitNonXAMLApp(int (*mainFunction)(int, char **));
+
+ref class SDL_WinRTApp sealed : public Windows::ApplicationModel::Core::IFrameworkView
+{
+public:
+    SDL_WinRTApp();
+    
+    // IFrameworkView Methods.
+    virtual void Initialize(Windows::ApplicationModel::Core::CoreApplicationView^ applicationView);
+    virtual void SetWindow(Windows::UI::Core::CoreWindow^ window);
+    virtual void Load(Platform::String^ entryPoint);
+    virtual void Run();
+    virtual void Uninitialize();
+
+internal:
+    // SDL-specific methods
+    void PumpEvents();
+
+protected:
+    // Event Handlers.
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP  // for Windows 8/8.1/RT apps... (and not Phone apps)
+    void OnSettingsPaneCommandsRequested(
+        Windows::UI::ApplicationSettings::SettingsPane ^p,
+        Windows::UI::ApplicationSettings::SettingsPaneCommandsRequestedEventArgs ^args);
+#endif // if WINAPI_FAMILY == WINAPI_FAMILY_APP
+
+#if NTDDI_VERSION > NTDDI_WIN8
+    void OnOrientationChanged(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args);
+#else
+    void OnOrientationChanged(Platform::Object^ sender);
+#endif
+    void OnWindowSizeChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::WindowSizeChangedEventArgs^ args);
+    void OnLogicalDpiChanged(Platform::Object^ sender);
+    void OnActivated(Windows::ApplicationModel::Core::CoreApplicationView^ applicationView, Windows::ApplicationModel::Activation::IActivatedEventArgs^ args);
+    void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ args);
+    void OnResuming(Platform::Object^ sender, Platform::Object^ args);
+    void OnExiting(Platform::Object^ sender, Platform::Object^ args);
+    void OnWindowClosed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::CoreWindowEventArgs^ args);
+    void OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::VisibilityChangedEventArgs^ args);
+    void OnPointerPressed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
+    void OnPointerReleased(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
+    void OnPointerWheelChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
+    void OnPointerMoved(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
+    void OnMouseMoved(Windows::Devices::Input::MouseDevice^ mouseDevice, Windows::Devices::Input::MouseEventArgs^ args);
+    void OnKeyDown(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);
+    void OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    void OnBackButtonPressed(Platform::Object^ sender, Windows::Phone::UI::Input::BackPressedEventArgs^ args);
+#endif
+
+private:
+    bool m_windowClosed;
+    bool m_windowVisible;
+};
+
+extern SDL_WinRTApp ^ SDL_WinRTGlobalApp;
diff --git a/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp
new file mode 100644
index 000000000..38694e11e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_xaml.cpp	
@@ -0,0 +1,160 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* Windows includes */
+#include <agile.h>
+#include <Windows.h>
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+#include <windows.ui.xaml.media.dxinterop.h>
+#endif
+
+
+/* SDL includes */
+#include "../../SDL_internal.h"
+#include "SDL.h"
+#include "../../video/winrt/SDL_winrtevents_c.h"
+#include "../../video/winrt/SDL_winrtvideo_cpp.h"
+#include "SDL_winrtapp_common.h"
+#include "SDL_winrtapp_xaml.h"
+
+
+
+/* SDL-internal globals: */
+SDL_bool WINRT_XAMLWasEnabled = SDL_FALSE;
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+extern "C"
+ISwapChainBackgroundPanelNative * WINRT_GlobalSwapChainBackgroundPanelNative = NULL;
+static Windows::Foundation::EventRegistrationToken	WINRT_XAMLAppEventToken;
+#endif
+
+
+/*
+ * Input event handlers (XAML)
+ */
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+
+static void
+WINRT_OnPointerPressedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
+{
+    WINRT_ProcessPointerPressedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
+}
+
+static void
+WINRT_OnPointerMovedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
+{
+    WINRT_ProcessPointerMovedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
+}
+
+static void
+WINRT_OnPointerReleasedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
+{
+    WINRT_ProcessPointerReleasedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
+}
+
+static void
+WINRT_OnPointerWheelChangedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
+{
+    WINRT_ProcessPointerWheelChangedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
+}
+
+#endif // WINAPI_FAMILY == WINAPI_FAMILY_APP
+
+
+/*
+ * XAML-to-SDL Rendering Callback
+ */
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+
+static void
+WINRT_OnRenderViaXAML(_In_ Platform::Object^ sender, _In_ Platform::Object^ args)
+{
+    WINRT_CycleXAMLThread();
+}
+
+#endif // WINAPI_FAMILY == WINAPI_FAMILY_APP
+
+
+/*
+ * SDL + XAML Initialization
+ */
+
+int
+SDL_WinRTInitXAMLApp(int (*mainFunction)(int, char **), void * backgroundPanelAsIInspectable)
+{
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    return SDL_SetError("XAML support is not yet available in Windows Phone.");
+#else
+    // Declare C++/CX namespaces:
+    using namespace Platform;
+    using namespace Windows::Foundation;
+    using namespace Windows::UI::Core;
+    using namespace Windows::UI::Xaml;
+    using namespace Windows::UI::Xaml::Controls;
+    using namespace Windows::UI::Xaml::Input;
+    using namespace Windows::UI::Xaml::Media;
+
+    // Make sure we have a valid XAML element (to draw onto):
+    if ( ! backgroundPanelAsIInspectable) {
+        return SDL_SetError("'backgroundPanelAsIInspectable' can't be NULL");
+    }
+
+    Platform::Object ^ backgroundPanel = reinterpret_cast<Object ^>((IInspectable *) backgroundPanelAsIInspectable);
+    SwapChainBackgroundPanel ^swapChainBackgroundPanel = dynamic_cast<SwapChainBackgroundPanel ^>(backgroundPanel);
+    if ( ! swapChainBackgroundPanel) {
+        return SDL_SetError("An unknown or unsupported type of XAML control was specified.");
+    }
+
+    // Setup event handlers:
+    swapChainBackgroundPanel->PointerPressed += ref new PointerEventHandler(WINRT_OnPointerPressedViaXAML);
+    swapChainBackgroundPanel->PointerReleased += ref new PointerEventHandler(WINRT_OnPointerReleasedViaXAML);
+    swapChainBackgroundPanel->PointerWheelChanged += ref new PointerEventHandler(WINRT_OnPointerWheelChangedViaXAML);
+    swapChainBackgroundPanel->PointerMoved += ref new PointerEventHandler(WINRT_OnPointerMovedViaXAML);
+
+    // Setup for rendering:
+    IInspectable *panelInspectable = (IInspectable*) reinterpret_cast<IInspectable*>(swapChainBackgroundPanel);
+    panelInspectable->QueryInterface(__uuidof(ISwapChainBackgroundPanelNative), (void **)&WINRT_GlobalSwapChainBackgroundPanelNative);
+
+    WINRT_XAMLAppEventToken = CompositionTarget::Rendering::add(ref new EventHandler<Object^>(WINRT_OnRenderViaXAML));
+
+    // Make sure the app is ready to call the SDL-centric main() function:
+    WINRT_SDLAppEntryPoint = mainFunction;
+    SDL_SetMainReady();
+
+    // Make sure video-init knows that we're initializing XAML:
+    SDL_bool oldXAMLWasEnabledValue = WINRT_XAMLWasEnabled;
+    WINRT_XAMLWasEnabled = SDL_TRUE;
+
+    // Make sure video modes are detected now, while we still have access to the WinRT
+    // CoreWindow.  WinRT will not allow the app's CoreWindow to be accessed via the
+    // SDL/WinRT thread.
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) {
+        // SDL_InitSubSystem will, on error, set the SDL error.  Let that propogate to
+        // the caller to here:
+        WINRT_XAMLWasEnabled = oldXAMLWasEnabledValue;
+        return -1;
+    }
+
+    // All done, for now.
+    return 0;
+#endif // WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP  /  else
+}
diff --git a/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_xaml.h b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_xaml.h
new file mode 100644
index 000000000..2296475b0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/core/winrt/SDL_winrtapp_xaml.h	
@@ -0,0 +1,33 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_winrtapp_xaml_h
+#define _SDL_winrtapp_xaml_h
+
+#include "SDL_types.h"
+
+#ifdef __cplusplus
+extern SDL_bool WINRT_XAMLWasEnabled;
+extern int SDL_WinRTInitXAMLApp(int (*mainFunction)(int, char **), void * backgroundPanelAsIInspectable);
+#endif // ifdef __cplusplus
+
+#endif // ifndef _SDL_winrtapp_xaml_h
diff --git a/Source/3rd Party/sdl/src/cpuinfo/SDL_cpuinfo.c b/Source/3rd Party/sdl/src/cpuinfo/SDL_cpuinfo.c
new file mode 100644
index 000000000..6a529ae01
--- /dev/null
+++ b/Source/3rd Party/sdl/src/cpuinfo/SDL_cpuinfo.c	
@@ -0,0 +1,727 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#ifdef TEST_MAIN
+#include "SDL_config.h"
+#else
+#include "../SDL_internal.h"
+#endif
+
+#if defined(__WIN32__)
+#include "../core/windows/SDL_windows.h"
+#endif
+
+/* CPU feature detection for SDL */
+
+#include "SDL_cpuinfo.h"
+
+#ifdef HAVE_SYSCONF
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYSCTLBYNAME
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))
+#include <sys/sysctl.h>         /* For AltiVec check */
+#elif defined(__OpenBSD__) && defined(__powerpc__)
+#include <sys/param.h>
+#include <sys/sysctl.h> /* For AltiVec check */
+#include <machine/cpu.h>
+#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP
+#include <signal.h>
+#include <setjmp.h>
+#endif
+
+#define CPU_HAS_RDTSC   0x00000001
+#define CPU_HAS_ALTIVEC 0x00000002
+#define CPU_HAS_MMX     0x00000004
+#define CPU_HAS_3DNOW   0x00000008
+#define CPU_HAS_SSE     0x00000010
+#define CPU_HAS_SSE2    0x00000020
+#define CPU_HAS_SSE3    0x00000040
+#define CPU_HAS_SSE41   0x00000100
+#define CPU_HAS_SSE42   0x00000200
+#define CPU_HAS_AVX     0x00000400
+
+#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ && !__OpenBSD__
+/* This is the brute force way of detecting instruction sets...
+   the idea is borrowed from the libmpeg2 library - thanks!
+ */
+static jmp_buf jmpbuf;
+static void
+illegal_instruction(int sig)
+{
+    longjmp(jmpbuf, 1);
+}
+#endif /* HAVE_SETJMP */
+
+static SDL_INLINE int
+CPU_haveCPUID(void)
+{
+    int has_CPUID = 0;
+/* *INDENT-OFF* */
+#if defined(__GNUC__) && defined(i386)
+    __asm__ (
+"        pushfl                      # Get original EFLAGS             \n"
+"        popl    %%eax                                                 \n"
+"        movl    %%eax,%%ecx                                           \n"
+"        xorl    $0x200000,%%eax     # Flip ID bit in EFLAGS           \n"
+"        pushl   %%eax               # Save new EFLAGS value on stack  \n"
+"        popfl                       # Replace current EFLAGS value    \n"
+"        pushfl                      # Get new EFLAGS                  \n"
+"        popl    %%eax               # Store new EFLAGS in EAX         \n"
+"        xorl    %%ecx,%%eax         # Can not toggle ID bit,          \n"
+"        jz      1f                  # Processor=80486                 \n"
+"        movl    $1,%0               # We have CPUID support           \n"
+"1:                                                                    \n"
+    : "=m" (has_CPUID)
+    :
+    : "%eax", "%ecx"
+    );
+#elif defined(__GNUC__) && defined(__x86_64__)
+/* Technically, if this is being compiled under __x86_64__ then it has 
+   CPUid by definition.  But it's nice to be able to prove it.  :)      */
+    __asm__ (
+"        pushfq                      # Get original EFLAGS             \n"
+"        popq    %%rax                                                 \n"
+"        movq    %%rax,%%rcx                                           \n"
+"        xorl    $0x200000,%%eax     # Flip ID bit in EFLAGS           \n"
+"        pushq   %%rax               # Save new EFLAGS value on stack  \n"
+"        popfq                       # Replace current EFLAGS value    \n"
+"        pushfq                      # Get new EFLAGS                  \n"
+"        popq    %%rax               # Store new EFLAGS in EAX         \n"
+"        xorl    %%ecx,%%eax         # Can not toggle ID bit,          \n"
+"        jz      1f                  # Processor=80486                 \n"
+"        movl    $1,%0               # We have CPUID support           \n"
+"1:                                                                    \n"
+    : "=m" (has_CPUID)
+    :
+    : "%rax", "%rcx"
+    );
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+    __asm {
+        pushfd                      ; Get original EFLAGS
+        pop     eax
+        mov     ecx, eax
+        xor     eax, 200000h        ; Flip ID bit in EFLAGS
+        push    eax                 ; Save new EFLAGS value on stack
+        popfd                       ; Replace current EFLAGS value
+        pushfd                      ; Get new EFLAGS
+        pop     eax                 ; Store new EFLAGS in EAX
+        xor     eax, ecx            ; Can not toggle ID bit,
+        jz      done                ; Processor=80486
+        mov     has_CPUID,1         ; We have CPUID support
+done:
+    }
+#elif defined(_MSC_VER) && defined(_M_X64)
+    has_CPUID = 1;
+#elif defined(__sun) && defined(__i386)
+    __asm (
+"       pushfl                 \n"
+"       popl    %eax           \n"
+"       movl    %eax,%ecx      \n"
+"       xorl    $0x200000,%eax \n"
+"       pushl   %eax           \n"
+"       popfl                  \n"
+"       pushfl                 \n"
+"       popl    %eax           \n"
+"       xorl    %ecx,%eax      \n"
+"       jz      1f             \n"
+"       movl    $1,-8(%ebp)    \n"
+"1:                            \n"
+    );
+#elif defined(__sun) && defined(__amd64)
+    __asm (
+"       pushfq                 \n"
+"       popq    %rax           \n"
+"       movq    %rax,%rcx      \n"
+"       xorl    $0x200000,%eax \n"
+"       pushq   %rax           \n"
+"       popfq                  \n"
+"       pushfq                 \n"
+"       popq    %rax           \n"
+"       xorl    %ecx,%eax      \n"
+"       jz      1f             \n"
+"       movl    $1,-8(%rbp)    \n"
+"1:                            \n"
+    );
+#endif
+/* *INDENT-ON* */
+    return has_CPUID;
+}
+
+#if defined(__GNUC__) && defined(i386)
+#define cpuid(func, a, b, c, d) \
+    __asm__ __volatile__ ( \
+"        pushl %%ebx        \n" \
+"        cpuid              \n" \
+"        movl %%ebx, %%esi  \n" \
+"        popl %%ebx         \n" : \
+            "=a" (a), "=S" (b), "=c" (c), "=d" (d) : "a" (func))
+#elif defined(__GNUC__) && defined(__x86_64__)
+#define cpuid(func, a, b, c, d) \
+    __asm__ __volatile__ ( \
+"        pushq %%rbx        \n" \
+"        cpuid              \n" \
+"        movq %%rbx, %%rsi  \n" \
+"        popq %%rbx         \n" : \
+            "=a" (a), "=S" (b), "=c" (c), "=d" (d) : "a" (func))
+#elif (defined(_MSC_VER) && defined(_M_IX86)) || defined(__WATCOMC__)
+#define cpuid(func, a, b, c, d) \
+    __asm { \
+        __asm mov eax, func \
+        __asm cpuid \
+        __asm mov a, eax \
+        __asm mov b, ebx \
+        __asm mov c, ecx \
+        __asm mov d, edx \
+}
+#elif defined(_MSC_VER) && defined(_M_X64)
+#define cpuid(func, a, b, c, d) \
+{ \
+    int CPUInfo[4]; \
+    __cpuid(CPUInfo, func); \
+    a = CPUInfo[0]; \
+    b = CPUInfo[1]; \
+    c = CPUInfo[2]; \
+    d = CPUInfo[3]; \
+}
+#else
+#define cpuid(func, a, b, c, d) \
+    a = b = c = d = 0
+#endif
+
+static SDL_INLINE int
+CPU_getCPUIDFeatures(void)
+{
+    int features = 0;
+    int a, b, c, d;
+
+    cpuid(0, a, b, c, d);
+    if (a >= 1) {
+        cpuid(1, a, b, c, d);
+        features = d;
+    }
+    return features;
+}
+
+static SDL_INLINE int
+CPU_haveRDTSC(void)
+{
+    if (CPU_haveCPUID()) {
+        return (CPU_getCPUIDFeatures() & 0x00000010);
+    }
+    return 0;
+}
+
+static SDL_INLINE int
+CPU_haveAltiVec(void)
+{
+    volatile int altivec = 0;
+#if (defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))) || (defined(__OpenBSD__) && defined(__powerpc__))
+#ifdef __OpenBSD__
+    int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
+#else
+    int selectors[2] = { CTL_HW, HW_VECTORUNIT };
+#endif
+    int hasVectorUnit = 0;
+    size_t length = sizeof(hasVectorUnit);
+    int error = sysctl(selectors, 2, &hasVectorUnit, &length, NULL, 0);
+    if (0 == error)
+        altivec = (hasVectorUnit != 0);
+#elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP
+    void (*handler) (int sig);
+    handler = signal(SIGILL, illegal_instruction);
+    if (setjmp(jmpbuf) == 0) {
+        asm volatile ("mtspr 256, %0\n\t" "vand %%v0, %%v0, %%v0"::"r" (-1));
+        altivec = 1;
+    }
+    signal(SIGILL, handler);
+#endif
+    return altivec;
+}
+
+static SDL_INLINE int
+CPU_haveMMX(void)
+{
+    if (CPU_haveCPUID()) {
+        return (CPU_getCPUIDFeatures() & 0x00800000);
+    }
+    return 0;
+}
+
+static SDL_INLINE int
+CPU_have3DNow(void)
+{
+    if (CPU_haveCPUID()) {
+        int a, b, c, d;
+
+        cpuid(0x80000000, a, b, c, d);
+        if (a >= 0x80000001) {
+            cpuid(0x80000001, a, b, c, d);
+            return (d & 0x80000000);
+        }
+    }
+    return 0;
+}
+
+static SDL_INLINE int
+CPU_haveSSE(void)
+{
+    if (CPU_haveCPUID()) {
+        return (CPU_getCPUIDFeatures() & 0x02000000);
+    }
+    return 0;
+}
+
+static SDL_INLINE int
+CPU_haveSSE2(void)
+{
+    if (CPU_haveCPUID()) {
+        return (CPU_getCPUIDFeatures() & 0x04000000);
+    }
+    return 0;
+}
+
+static SDL_INLINE int
+CPU_haveSSE3(void)
+{
+    if (CPU_haveCPUID()) {
+        int a, b, c, d;
+
+        cpuid(0, a, b, c, d);
+        if (a >= 1) {
+            cpuid(1, a, b, c, d);
+            return (c & 0x00000001);
+        }
+    }
+    return 0;
+}
+
+static SDL_INLINE int
+CPU_haveSSE41(void)
+{
+    if (CPU_haveCPUID()) {
+        int a, b, c, d;
+
+        cpuid(1, a, b, c, d);
+        if (a >= 1) {
+            cpuid(1, a, b, c, d);
+            return (c & 0x00080000);
+        }
+    }
+    return 0;
+}
+
+static SDL_INLINE int
+CPU_haveSSE42(void)
+{
+    if (CPU_haveCPUID()) {
+        int a, b, c, d;
+
+        cpuid(1, a, b, c, d);
+        if (a >= 1) {
+            cpuid(1, a, b, c, d);
+            return (c & 0x00100000);
+        }
+    }
+    return 0;
+}
+
+static SDL_INLINE int
+CPU_haveAVX(void)
+{
+    if (CPU_haveCPUID()) {
+        int a, b, c, d;
+
+        cpuid(1, a, b, c, d);
+        if (a >= 1) {
+            cpuid(1, a, b, c, d);
+            return (c & 0x10000000);
+        }
+    }
+    return 0;
+}
+
+static int SDL_CPUCount = 0;
+
+int
+SDL_GetCPUCount(void)
+{
+    if (!SDL_CPUCount) {
+#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)
+        if (SDL_CPUCount <= 0) {
+            SDL_CPUCount = (int)sysconf(_SC_NPROCESSORS_ONLN);
+        }
+#endif
+#ifdef HAVE_SYSCTLBYNAME
+        if (SDL_CPUCount <= 0) {
+            size_t size = sizeof(SDL_CPUCount);
+            sysctlbyname("hw.ncpu", &SDL_CPUCount, &size, NULL, 0);
+        }
+#endif
+#ifdef __WIN32__
+        if (SDL_CPUCount <= 0) {
+            SYSTEM_INFO info;
+            GetSystemInfo(&info);
+            SDL_CPUCount = info.dwNumberOfProcessors;
+        }
+#endif
+        /* There has to be at least 1, right? :) */
+        if (SDL_CPUCount <= 0) {
+            SDL_CPUCount = 1;
+        }
+    }
+    return SDL_CPUCount;
+}
+
+/* Oh, such a sweet sweet trick, just not very useful. :) */
+static const char *
+SDL_GetCPUType(void)
+{
+    static char SDL_CPUType[13];
+
+    if (!SDL_CPUType[0]) {
+        int i = 0;
+        int a, b, c, d;
+
+        if (CPU_haveCPUID()) {
+            cpuid(0x00000000, a, b, c, d);
+            SDL_CPUType[i++] = (char)(b & 0xff); b >>= 8;
+            SDL_CPUType[i++] = (char)(b & 0xff); b >>= 8;
+            SDL_CPUType[i++] = (char)(b & 0xff); b >>= 8;
+            SDL_CPUType[i++] = (char)(b & 0xff); b >>= 8;
+            SDL_CPUType[i++] = (char)(d & 0xff); d >>= 8;
+            SDL_CPUType[i++] = (char)(d & 0xff); d >>= 8;
+            SDL_CPUType[i++] = (char)(d & 0xff); d >>= 8;
+            SDL_CPUType[i++] = (char)(d & 0xff); d >>= 8;
+            SDL_CPUType[i++] = (char)(c & 0xff); c >>= 8;
+            SDL_CPUType[i++] = (char)(c & 0xff); c >>= 8;
+            SDL_CPUType[i++] = (char)(c & 0xff); c >>= 8;
+            SDL_CPUType[i++] = (char)(c & 0xff); c >>= 8;
+        }
+        if (!SDL_CPUType[0]) {
+            SDL_strlcpy(SDL_CPUType, "Unknown", sizeof(SDL_CPUType));
+        }
+    }
+    return SDL_CPUType;
+}
+
+
+#ifdef TEST_MAIN  /* !!! FIXME: only used for test at the moment. */
+static const char *
+SDL_GetCPUName(void)
+{
+    static char SDL_CPUName[48];
+
+    if (!SDL_CPUName[0]) {
+        int i = 0;
+        int a, b, c, d;
+
+        if (CPU_haveCPUID()) {
+            cpuid(0x80000000, a, b, c, d);
+            if (a >= 0x80000004) {
+                cpuid(0x80000002, a, b, c, d);
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                cpuid(0x80000003, a, b, c, d);
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                cpuid(0x80000004, a, b, c, d);
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(a & 0xff); a >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(b & 0xff); b >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(c & 0xff); c >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+                SDL_CPUName[i++] = (char)(d & 0xff); d >>= 8;
+            }
+        }
+        if (!SDL_CPUName[0]) {
+            SDL_strlcpy(SDL_CPUName, "Unknown", sizeof(SDL_CPUName));
+        }
+    }
+    return SDL_CPUName;
+}
+#endif
+
+int
+SDL_GetCPUCacheLineSize(void)
+{
+    const char *cpuType = SDL_GetCPUType();
+
+    if (SDL_strcmp(cpuType, "GenuineIntel") == 0) {
+        int a, b, c, d;
+
+        cpuid(0x00000001, a, b, c, d);
+        return (((b >> 8) & 0xff) * 8);
+    } else if (SDL_strcmp(cpuType, "AuthenticAMD") == 0) {
+        int a, b, c, d;
+
+        cpuid(0x80000005, a, b, c, d);
+        return (c & 0xff);
+    } else {
+        /* Just make a guess here... */
+        return SDL_CACHELINE_SIZE;
+    }
+}
+
+static Uint32 SDL_CPUFeatures = 0xFFFFFFFF;
+
+static Uint32
+SDL_GetCPUFeatures(void)
+{
+    if (SDL_CPUFeatures == 0xFFFFFFFF) {
+        SDL_CPUFeatures = 0;
+        if (CPU_haveRDTSC()) {
+            SDL_CPUFeatures |= CPU_HAS_RDTSC;
+        }
+        if (CPU_haveAltiVec()) {
+            SDL_CPUFeatures |= CPU_HAS_ALTIVEC;
+        }
+        if (CPU_haveMMX()) {
+            SDL_CPUFeatures |= CPU_HAS_MMX;
+        }
+        if (CPU_have3DNow()) {
+            SDL_CPUFeatures |= CPU_HAS_3DNOW;
+        }
+        if (CPU_haveSSE()) {
+            SDL_CPUFeatures |= CPU_HAS_SSE;
+        }
+        if (CPU_haveSSE2()) {
+            SDL_CPUFeatures |= CPU_HAS_SSE2;
+        }
+        if (CPU_haveSSE3()) {
+            SDL_CPUFeatures |= CPU_HAS_SSE3;
+        }
+        if (CPU_haveSSE41()) {
+            SDL_CPUFeatures |= CPU_HAS_SSE41;
+        }
+        if (CPU_haveSSE42()) {
+            SDL_CPUFeatures |= CPU_HAS_SSE42;
+        }
+        if (CPU_haveAVX()) {
+            SDL_CPUFeatures |= CPU_HAS_AVX;
+        }
+    }
+    return SDL_CPUFeatures;
+}
+
+SDL_bool
+SDL_HasRDTSC(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_RDTSC) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_HasAltiVec(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_ALTIVEC) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_HasMMX(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_MMX) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_Has3DNow(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_3DNOW) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_HasSSE(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_SSE) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_HasSSE2(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_SSE2) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_HasSSE3(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_SSE3) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_HasSSE41(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_SSE41) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_HasSSE42(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_SSE42) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_HasAVX(void)
+{
+    if (SDL_GetCPUFeatures() & CPU_HAS_AVX) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+static int SDL_SystemRAM = 0;
+
+int
+SDL_GetSystemRAM(void)
+{
+    if (!SDL_SystemRAM) {
+#if defined(HAVE_SYSCONF) && defined(_SC_PHYS_PAGES) && defined(_SC_PAGESIZE)
+        if (SDL_SystemRAM <= 0) {
+            SDL_SystemRAM = (int)((Sint64)sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / (1024*1024));
+        }
+#endif
+#ifdef HAVE_SYSCTLBYNAME
+        if (SDL_SystemRAM <= 0) {
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#ifdef HW_REALMEM
+            int mib[2] = {CTL_HW, HW_REALMEM};
+#else
+            /* might only report up to 2 GiB */
+            int mib[2] = {CTL_HW, HW_PHYSMEM};
+#endif /* HW_REALMEM */
+#else
+            int mib[2] = {CTL_HW, HW_MEMSIZE};
+#endif /* __FreeBSD__ || __FreeBSD_kernel__ */
+            Uint64 memsize = 0;
+            size_t len = sizeof(memsize);
+            
+            if (sysctl(mib, 2, &memsize, &len, NULL, 0) == 0) {
+                SDL_SystemRAM = (int)(memsize / (1024*1024));
+            }
+        }
+#endif
+#ifdef __WIN32__
+        if (SDL_SystemRAM <= 0) {
+            MEMORYSTATUSEX stat;
+            stat.dwLength = sizeof(stat);
+            if (GlobalMemoryStatusEx(&stat)) {
+                SDL_SystemRAM = (int)(stat.ullTotalPhys / (1024 * 1024));
+            }
+        }
+#endif
+    }
+    return SDL_SystemRAM;
+}
+
+
+#ifdef TEST_MAIN
+
+#include <stdio.h>
+
+int
+main()
+{
+    printf("CPU count: %d\n", SDL_GetCPUCount());
+    printf("CPU type: %s\n", SDL_GetCPUType());
+    printf("CPU name: %s\n", SDL_GetCPUName());
+    printf("CacheLine size: %d\n", SDL_GetCPUCacheLineSize());
+    printf("RDTSC: %d\n", SDL_HasRDTSC());
+    printf("Altivec: %d\n", SDL_HasAltiVec());
+    printf("MMX: %d\n", SDL_HasMMX());
+    printf("3DNow: %d\n", SDL_Has3DNow());
+    printf("SSE: %d\n", SDL_HasSSE());
+    printf("SSE2: %d\n", SDL_HasSSE2());
+    printf("SSE3: %d\n", SDL_HasSSE3());
+    printf("SSE4.1: %d\n", SDL_HasSSE41());
+    printf("SSE4.2: %d\n", SDL_HasSSE42());
+    printf("AVX: %d\n", SDL_HasAVX());
+    printf("RAM: %d MB\n", SDL_GetSystemRAM());
+    return 0;
+}
+
+#endif /* TEST_MAIN */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/dynapi/SDL_dynapi.c b/Source/3rd Party/sdl/src/dynapi/SDL_dynapi.c
new file mode 100644
index 000000000..220ec9ba2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/dynapi/SDL_dynapi.c	
@@ -0,0 +1,302 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_config.h"
+#include "SDL_dynapi.h"
+
+#if SDL_DYNAMIC_API
+
+#include "SDL.h"
+
+/* !!! FIXME: Shouldn't these be included in SDL.h? */
+#include "SDL_shape.h"
+#include "SDL_syswm.h"
+
+/* This is the version of the dynamic API. This doesn't match the SDL version
+   and should not change until there's been a major revamp in API/ABI.
+   So 2.0.5 adds functions over 2.0.4? This number doesn't change;
+   the sizeof (jump_table) changes instead. But 2.1.0 changes how a function
+   works in an incompatible way or removes a function? This number changes,
+   since sizeof (jump_table) isn't sufficient anymore. It's likely
+   we'll forget to bump every time we add a function, so this is the
+   failsafe switch for major API change decisions. Respect it and use it
+   sparingly. */
+#define SDL_DYNAPI_VERSION 1
+
+static void SDL_InitDynamicAPI(void);
+
+
+/* BE CAREFUL CALLING ANY SDL CODE IN HERE, IT WILL BLOW UP.
+   Even self-contained stuff might call SDL_Error and break everything. */
+
+
+/* behold, the macro salsa! */
+
+/* !!! FIXME: ...disabled...until we write it.  :) */
+#define DISABLE_JUMP_MAGIC 1
+
+#if DISABLE_JUMP_MAGIC
+/* Can't use the macro for varargs nonsense. This is atrocious. */
+#define SDL_DYNAPI_VARARGS_LOGFN(_static, name, initcall, logname, prio) \
+    _static void SDL_Log##logname##name(int category, const char *fmt, ...) { \
+        va_list ap; initcall; va_start(ap, fmt); \
+        jump_table.SDL_LogMessageV(category, SDL_LOG_PRIORITY_##prio, fmt, ap); \
+        va_end(ap); \
+    }
+
+#define SDL_DYNAPI_VARARGS(_static, name, initcall) \
+    _static int SDL_SetError##name(const char *fmt, ...) { \
+        char buf[512]; /* !!! FIXME: dynamic allocation */ \
+        va_list ap; initcall; va_start(ap, fmt); \
+        jump_table.SDL_vsnprintf(buf, sizeof (buf), fmt, ap); \
+        va_end(ap); \
+        return jump_table.SDL_SetError("%s", buf); \
+    } \
+    _static int SDL_sscanf##name(const char *buf, const char *fmt, ...) { \
+        int retval; va_list ap; initcall; va_start(ap, fmt); \
+        retval = jump_table.SDL_vsscanf(buf, fmt, ap); \
+        va_end(ap); \
+        return retval; \
+    } \
+    _static int SDL_snprintf##name(char *buf, size_t buflen, const char *fmt, ...) { \
+        int retval; va_list ap; initcall; va_start(ap, fmt); \
+        retval = jump_table.SDL_vsnprintf(buf, buflen, fmt, ap); \
+        va_end(ap); \
+        return retval; \
+    } \
+    _static void SDL_Log##name(const char *fmt, ...) { \
+        va_list ap; initcall; va_start(ap, fmt); \
+        jump_table.SDL_LogMessageV(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO, fmt, ap); \
+        va_end(ap); \
+    } \
+    _static void SDL_LogMessage##name(int category, SDL_LogPriority priority, const char *fmt, ...) { \
+        va_list ap; initcall; va_start(ap, fmt); \
+        jump_table.SDL_LogMessageV(category, priority, fmt, ap); \
+        va_end(ap); \
+    } \
+    SDL_DYNAPI_VARARGS_LOGFN(_static, name, initcall, Verbose, VERBOSE) \
+    SDL_DYNAPI_VARARGS_LOGFN(_static, name, initcall, Debug, DEBUG) \
+    SDL_DYNAPI_VARARGS_LOGFN(_static, name, initcall, Info, INFO) \
+    SDL_DYNAPI_VARARGS_LOGFN(_static, name, initcall, Warn, WARN) \
+    SDL_DYNAPI_VARARGS_LOGFN(_static, name, initcall, Error, ERROR) \
+    SDL_DYNAPI_VARARGS_LOGFN(_static, name, initcall, Critical, CRITICAL)
+#endif
+
+
+/* Typedefs for function pointers for jump table, and predeclare funcs */
+/* The DEFAULT funcs will init jump table and then call real function. */
+/* The REAL funcs are the actual functions, name-mangled to not clash. */
+#define SDL_DYNAPI_PROC(rc,fn,params,args,ret) \
+    typedef rc (*SDL_DYNAPIFN_##fn) params; \
+    static rc fn##_DEFAULT params; \
+    extern rc fn##_REAL params;
+#include "SDL_dynapi_procs.h"
+#undef SDL_DYNAPI_PROC
+
+/* The jump table! */
+typedef struct {
+    #define SDL_DYNAPI_PROC(rc,fn,params,args,ret) SDL_DYNAPIFN_##fn fn;
+    #include "SDL_dynapi_procs.h"
+    #undef SDL_DYNAPI_PROC
+} SDL_DYNAPI_jump_table;
+
+/* Predeclare the default functions for initializing the jump table. */
+#define SDL_DYNAPI_PROC(rc,fn,params,args,ret) static rc fn##_DEFAULT params;
+#include "SDL_dynapi_procs.h"
+#undef SDL_DYNAPI_PROC
+
+/* The actual jump table. */
+static SDL_DYNAPI_jump_table jump_table = {
+    #define SDL_DYNAPI_PROC(rc,fn,params,args,ret) fn##_DEFAULT,
+    #include "SDL_dynapi_procs.h"
+    #undef SDL_DYNAPI_PROC
+};
+
+/* Default functions init the function table then call right thing. */
+#if DISABLE_JUMP_MAGIC
+#define SDL_DYNAPI_PROC(rc,fn,params,args,ret) \
+    static rc fn##_DEFAULT params { \
+        SDL_InitDynamicAPI(); \
+        ret jump_table.fn args; \
+    }
+#define SDL_DYNAPI_PROC_NO_VARARGS 1
+#include "SDL_dynapi_procs.h"
+#undef SDL_DYNAPI_PROC
+#undef SDL_DYNAPI_PROC_NO_VARARGS
+SDL_DYNAPI_VARARGS(static, _DEFAULT, SDL_InitDynamicAPI())
+#else
+/* !!! FIXME: need the jump magic. */
+#error Write me.
+#endif
+
+/* Public API functions to jump into the jump table. */
+#if DISABLE_JUMP_MAGIC
+#define SDL_DYNAPI_PROC(rc,fn,params,args,ret) \
+    rc fn params { ret jump_table.fn args; }
+#define SDL_DYNAPI_PROC_NO_VARARGS 1
+#include "SDL_dynapi_procs.h"
+#undef SDL_DYNAPI_PROC
+#undef SDL_DYNAPI_PROC_NO_VARARGS
+SDL_DYNAPI_VARARGS(,,)
+#else
+/* !!! FIXME: need the jump magic. */
+#error Write me.
+#endif
+
+
+
+/* Here's the exported entry point that fills in the jump table. */
+/*  Use specific types when an "int" might suffice to keep this sane. */
+typedef Sint32 (SDLCALL *SDL_DYNAPI_ENTRYFN)(Uint32 apiver, void *table, Uint32 tablesize);
+extern DECLSPEC Sint32 SDLCALL SDL_DYNAPI_entry(Uint32, void *, Uint32);
+
+Sint32
+SDL_DYNAPI_entry(Uint32 apiver, void *table, Uint32 tablesize)
+{
+    SDL_DYNAPI_jump_table *output_jump_table = (SDL_DYNAPI_jump_table *) table;
+
+    if (apiver != SDL_DYNAPI_VERSION) {
+        /* !!! FIXME: can maybe handle older versions? */
+        return -1;  /* not compatible. */
+    } else if (tablesize > sizeof (jump_table)) {
+        return -1;  /* newer version of SDL with functions we can't provide. */
+    }
+
+    /* Init our jump table first. */
+    #define SDL_DYNAPI_PROC(rc,fn,params,args,ret) jump_table.fn = fn##_REAL;
+    #include "SDL_dynapi_procs.h"
+    #undef SDL_DYNAPI_PROC
+
+    /* Then the external table... */
+    if (output_jump_table != &jump_table) {
+        jump_table.SDL_memcpy(output_jump_table, &jump_table, tablesize);
+    }
+
+    /* Safe to call SDL functions now; jump table is initialized! */
+
+    return 0;  /* success! */
+}
+
+
+/* Obviously we can't use SDL_LoadObject() to load SDL.  :)  */
+/* Also obviously, we never close the loaded library. */
+#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
+{
+    HANDLE lib = LoadLibraryA(fname);
+    return lib ? GetProcAddress(lib, sym) : NULL;
+}
+
+#elif defined(__HAIKU__)
+#include <os/kernel/image.h>
+static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
+{
+    image_id lib = load_add_on(fname);
+    void *retval = NULL;
+    if ((lib < 0) || (get_image_symbol(lib, sym, B_SYMBOL_TYPE_TEXT, &retval) != B_NO_ERROR)) {
+        retval = NULL;
+    }
+    return retval;
+}
+#elif defined(unix) || defined(__unix__) || defined(__APPLE__)
+#include <dlfcn.h>
+static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
+{
+    void *lib = dlopen(fname, RTLD_NOW | RTLD_LOCAL);
+    return lib ? dlsym(lib, sym) : NULL;
+}
+#else
+#error Please define your platform.
+#endif
+
+
+static void
+SDL_InitDynamicAPILocked(void)
+{
+    const char *libname = SDL_getenv_REAL("SDL_DYNAMIC_API");
+    SDL_DYNAPI_ENTRYFN entry = SDL_DYNAPI_entry;  /* funcs from here by default. */
+
+    if (libname) {
+        entry = (SDL_DYNAPI_ENTRYFN) get_sdlapi_entry(libname, "SDL_DYNAPI_entry");
+        if (!entry) {
+            /* !!! FIXME: fail to startup here instead? */
+            /* !!! FIXME: definitely warn user. */
+            /* Just fill in the function pointers from this library. */
+            entry = SDL_DYNAPI_entry;
+        }
+    }
+
+    if (entry(SDL_DYNAPI_VERSION, &jump_table, sizeof (jump_table)) < 0) {
+        /* !!! FIXME: fail to startup here instead? */
+        /* !!! FIXME: definitely warn user. */
+        /* Just fill in the function pointers from this library. */
+        if (entry != SDL_DYNAPI_entry) {
+            if (!SDL_DYNAPI_entry(SDL_DYNAPI_VERSION, &jump_table, sizeof (jump_table))) {
+                /* !!! FIXME: now we're screwed. Should definitely abort now. */
+            }
+        }
+    }
+
+    /* we intentionally never close the newly-loaded lib, of course. */
+}
+
+static void
+SDL_InitDynamicAPI(void)
+{
+    /* So the theory is that every function in the jump table defaults to
+     *  calling this function, and then replaces itself with a version that
+     *  doesn't call this function anymore. But it's possible that, in an
+     *  extreme corner case, you can have a second thread hit this function
+     *  while the jump table is being initialized by the first.
+     * In this case, a spinlock is really painful compared to what spinlocks
+     *  _should_ be used for, but this would only happen once, and should be
+     *  insanely rare, as you would have to spin a thread outside of SDL (as
+     *  SDL_CreateThread() would also call this function before building the
+     *  new thread).
+     */
+    static volatile SDL_bool already_initialized = SDL_FALSE;
+
+    /* SDL_AtomicLock calls SDL mutex functions to emulate if
+       SDL_ATOMIC_DISABLED, which we can't do here, so in such a
+       configuration, you're on your own. */
+    #if !SDL_ATOMIC_DISABLED
+    static SDL_SpinLock lock = 0;
+    SDL_AtomicLock_REAL(&lock);
+    #endif
+
+    if (!already_initialized) {
+        SDL_InitDynamicAPILocked();
+        already_initialized = SDL_TRUE;
+    }
+
+    #if !SDL_ATOMIC_DISABLED
+    SDL_AtomicUnlock_REAL(&lock);
+    #endif
+}
+
+#endif  /* SDL_DYNAMIC_API */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/dynapi/SDL_dynapi.h b/Source/3rd Party/sdl/src/dynapi/SDL_dynapi.h
new file mode 100644
index 000000000..d318552f0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/dynapi/SDL_dynapi.h	
@@ -0,0 +1,56 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_dynapi_h
+#define _SDL_dynapi_h
+
+/* IMPORTANT:
+   This is the master switch to disabling the dynamic API. We made it so you
+   have to hand-edit an internal source file in SDL to turn it off; you
+   can do it if you want it badly enough, but hopefully you won't want to.
+   You should understand the ramifications of turning this off: it makes it
+   hard to update your SDL in the field, and impossible if you've statically
+   linked SDL into your app. Understand that platforms change, and if we can't
+   drop in an updated SDL, your application can definitely break some time
+   in the future, even if it's fine today.
+   To be sure, as new system-level video and audio APIs are introduced, an
+   updated SDL can transparently take advantage of them, but your program will
+   not without this feature. Think hard before turning it off.
+*/
+#ifdef SDL_DYNAMIC_API  /* Tried to force it on the command line? */
+#error Nope, you have to edit this file to force this off.
+#endif
+
+#ifdef __APPLE__
+#include "TargetConditionals.h"
+#endif
+
+#if TARGET_OS_IPHONE  /* probably not useful on iOS. */
+#define SDL_DYNAMIC_API 0
+#elif SDL_BUILDING_WINRT /* probaly not useful on WinRT, given current .dll loading restrictions */
+#define SDL_DYNAMIC_API 0
+#else   /* everyone else. */
+#define SDL_DYNAMIC_API 1
+#endif
+
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/dynapi/SDL_dynapi_overrides.h b/Source/3rd Party/sdl/src/dynapi/SDL_dynapi_overrides.h
new file mode 100644
index 000000000..5ae7927f2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/dynapi/SDL_dynapi_overrides.h	
@@ -0,0 +1,577 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* vi: set ts=4 sw=4 expandtab: */
+
+/* DO NOT EDIT THIS FILE BY HAND. It is autogenerated by gendynapi.pl. */
+
+#if !SDL_DYNAMIC_API
+#error You should not be here.
+#endif
+
+/* so annoying. */
+#if defined(__thumb__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__))
+#define SDL_MemoryBarrierRelease SDL_MemoryBarrierRelease_REAL
+#define SDL_MemoryBarrierAcquire SDL_MemoryBarrierAcquire_REAL
+#endif
+
+#define SDL_SetError SDL_SetError_REAL
+#define SDL_Log SDL_Log_REAL
+#define SDL_LogVerbose SDL_LogVerbose_REAL
+#define SDL_LogDebug SDL_LogDebug_REAL
+#define SDL_LogInfo SDL_LogInfo_REAL
+#define SDL_LogWarn SDL_LogWarn_REAL
+#define SDL_LogError SDL_LogError_REAL
+#define SDL_LogCritical SDL_LogCritical_REAL
+#define SDL_LogMessage SDL_LogMessage_REAL
+#define SDL_sscanf SDL_sscanf_REAL
+#define SDL_snprintf SDL_snprintf_REAL
+#define SDL_CreateThread SDL_CreateThread_REAL
+#define SDL_RWFromFP SDL_RWFromFP_REAL
+#define SDL_RegisterApp SDL_RegisterApp_REAL
+#define SDL_UnregisterApp SDL_UnregisterApp_REAL
+#define SDL_Direct3D9GetAdapterIndex SDL_Direct3D9GetAdapterIndex_REAL
+#define SDL_RenderGetD3D9Device SDL_RenderGetD3D9Device_REAL
+#define SDL_iPhoneSetAnimationCallback SDL_iPhoneSetAnimationCallback_REAL
+#define SDL_iPhoneSetEventPump SDL_iPhoneSetEventPump_REAL
+#define SDL_AndroidGetJNIEnv SDL_AndroidGetJNIEnv_REAL
+#define SDL_AndroidGetActivity SDL_AndroidGetActivity_REAL
+#define SDL_AndroidGetInternalStoragePath SDL_AndroidGetInternalStoragePath_REAL
+#define SDL_AndroidGetExternalStorageState SDL_AndroidGetExternalStorageState_REAL
+#define SDL_AndroidGetExternalStoragePath SDL_AndroidGetExternalStoragePath_REAL
+#define SDL_Init SDL_Init_REAL
+#define SDL_InitSubSystem SDL_InitSubSystem_REAL
+#define SDL_QuitSubSystem SDL_QuitSubSystem_REAL
+#define SDL_WasInit SDL_WasInit_REAL
+#define SDL_Quit SDL_Quit_REAL
+#define SDL_ReportAssertion SDL_ReportAssertion_REAL
+#define SDL_SetAssertionHandler SDL_SetAssertionHandler_REAL
+#define SDL_GetAssertionReport SDL_GetAssertionReport_REAL
+#define SDL_ResetAssertionReport SDL_ResetAssertionReport_REAL
+#define SDL_AtomicTryLock SDL_AtomicTryLock_REAL
+#define SDL_AtomicLock SDL_AtomicLock_REAL
+#define SDL_AtomicUnlock SDL_AtomicUnlock_REAL
+#define SDL_AtomicCAS SDL_AtomicCAS_REAL
+#define SDL_AtomicSet SDL_AtomicSet_REAL
+#define SDL_AtomicGet SDL_AtomicGet_REAL
+#define SDL_AtomicAdd SDL_AtomicAdd_REAL
+#define SDL_AtomicCASPtr SDL_AtomicCASPtr_REAL
+#define SDL_AtomicSetPtr SDL_AtomicSetPtr_REAL
+#define SDL_AtomicGetPtr SDL_AtomicGetPtr_REAL
+#define SDL_GetNumAudioDrivers SDL_GetNumAudioDrivers_REAL
+#define SDL_GetAudioDriver SDL_GetAudioDriver_REAL
+#define SDL_AudioInit SDL_AudioInit_REAL
+#define SDL_AudioQuit SDL_AudioQuit_REAL
+#define SDL_GetCurrentAudioDriver SDL_GetCurrentAudioDriver_REAL
+#define SDL_OpenAudio SDL_OpenAudio_REAL
+#define SDL_GetNumAudioDevices SDL_GetNumAudioDevices_REAL
+#define SDL_GetAudioDeviceName SDL_GetAudioDeviceName_REAL
+#define SDL_OpenAudioDevice SDL_OpenAudioDevice_REAL
+#define SDL_GetAudioStatus SDL_GetAudioStatus_REAL
+#define SDL_GetAudioDeviceStatus SDL_GetAudioDeviceStatus_REAL
+#define SDL_PauseAudio SDL_PauseAudio_REAL
+#define SDL_PauseAudioDevice SDL_PauseAudioDevice_REAL
+#define SDL_LoadWAV_RW SDL_LoadWAV_RW_REAL
+#define SDL_FreeWAV SDL_FreeWAV_REAL
+#define SDL_BuildAudioCVT SDL_BuildAudioCVT_REAL
+#define SDL_ConvertAudio SDL_ConvertAudio_REAL
+#define SDL_MixAudio SDL_MixAudio_REAL
+#define SDL_MixAudioFormat SDL_MixAudioFormat_REAL
+#define SDL_LockAudio SDL_LockAudio_REAL
+#define SDL_LockAudioDevice SDL_LockAudioDevice_REAL
+#define SDL_UnlockAudio SDL_UnlockAudio_REAL
+#define SDL_UnlockAudioDevice SDL_UnlockAudioDevice_REAL
+#define SDL_CloseAudio SDL_CloseAudio_REAL
+#define SDL_CloseAudioDevice SDL_CloseAudioDevice_REAL
+#define SDL_SetClipboardText SDL_SetClipboardText_REAL
+#define SDL_GetClipboardText SDL_GetClipboardText_REAL
+#define SDL_HasClipboardText SDL_HasClipboardText_REAL
+#define SDL_GetCPUCount SDL_GetCPUCount_REAL
+#define SDL_GetCPUCacheLineSize SDL_GetCPUCacheLineSize_REAL
+#define SDL_HasRDTSC SDL_HasRDTSC_REAL
+#define SDL_HasAltiVec SDL_HasAltiVec_REAL
+#define SDL_HasMMX SDL_HasMMX_REAL
+#define SDL_Has3DNow SDL_Has3DNow_REAL
+#define SDL_HasSSE SDL_HasSSE_REAL
+#define SDL_HasSSE2 SDL_HasSSE2_REAL
+#define SDL_HasSSE3 SDL_HasSSE3_REAL
+#define SDL_HasSSE41 SDL_HasSSE41_REAL
+#define SDL_HasSSE42 SDL_HasSSE42_REAL
+#define SDL_GetSystemRAM SDL_GetSystemRAM_REAL
+#define SDL_GetError SDL_GetError_REAL
+#define SDL_ClearError SDL_ClearError_REAL
+#define SDL_Error SDL_Error_REAL
+#define SDL_PumpEvents SDL_PumpEvents_REAL
+#define SDL_PeepEvents SDL_PeepEvents_REAL
+#define SDL_HasEvent SDL_HasEvent_REAL
+#define SDL_HasEvents SDL_HasEvents_REAL
+#define SDL_FlushEvent SDL_FlushEvent_REAL
+#define SDL_FlushEvents SDL_FlushEvents_REAL
+#define SDL_PollEvent SDL_PollEvent_REAL
+#define SDL_WaitEvent SDL_WaitEvent_REAL
+#define SDL_WaitEventTimeout SDL_WaitEventTimeout_REAL
+#define SDL_PushEvent SDL_PushEvent_REAL
+#define SDL_SetEventFilter SDL_SetEventFilter_REAL
+#define SDL_GetEventFilter SDL_GetEventFilter_REAL
+#define SDL_AddEventWatch SDL_AddEventWatch_REAL
+#define SDL_DelEventWatch SDL_DelEventWatch_REAL
+#define SDL_FilterEvents SDL_FilterEvents_REAL
+#define SDL_EventState SDL_EventState_REAL
+#define SDL_RegisterEvents SDL_RegisterEvents_REAL
+#define SDL_GetBasePath SDL_GetBasePath_REAL
+#define SDL_GetPrefPath SDL_GetPrefPath_REAL
+#define SDL_GameControllerAddMapping SDL_GameControllerAddMapping_REAL
+#define SDL_GameControllerMappingForGUID SDL_GameControllerMappingForGUID_REAL
+#define SDL_GameControllerMapping SDL_GameControllerMapping_REAL
+#define SDL_IsGameController SDL_IsGameController_REAL
+#define SDL_GameControllerNameForIndex SDL_GameControllerNameForIndex_REAL
+#define SDL_GameControllerOpen SDL_GameControllerOpen_REAL
+#define SDL_GameControllerName SDL_GameControllerName_REAL
+#define SDL_GameControllerGetAttached SDL_GameControllerGetAttached_REAL
+#define SDL_GameControllerGetJoystick SDL_GameControllerGetJoystick_REAL
+#define SDL_GameControllerEventState SDL_GameControllerEventState_REAL
+#define SDL_GameControllerUpdate SDL_GameControllerUpdate_REAL
+#define SDL_GameControllerGetAxisFromString SDL_GameControllerGetAxisFromString_REAL
+#define SDL_GameControllerGetStringForAxis SDL_GameControllerGetStringForAxis_REAL
+#define SDL_GameControllerGetBindForAxis SDL_GameControllerGetBindForAxis_REAL
+#define SDL_GameControllerGetAxis SDL_GameControllerGetAxis_REAL
+#define SDL_GameControllerGetButtonFromString SDL_GameControllerGetButtonFromString_REAL
+#define SDL_GameControllerGetStringForButton SDL_GameControllerGetStringForButton_REAL
+#define SDL_GameControllerGetBindForButton SDL_GameControllerGetBindForButton_REAL
+#define SDL_GameControllerGetButton SDL_GameControllerGetButton_REAL
+#define SDL_GameControllerClose SDL_GameControllerClose_REAL
+#define SDL_RecordGesture SDL_RecordGesture_REAL
+#define SDL_SaveAllDollarTemplates SDL_SaveAllDollarTemplates_REAL
+#define SDL_SaveDollarTemplate SDL_SaveDollarTemplate_REAL
+#define SDL_LoadDollarTemplates SDL_LoadDollarTemplates_REAL
+#define SDL_NumHaptics SDL_NumHaptics_REAL
+#define SDL_HapticName SDL_HapticName_REAL
+#define SDL_HapticOpen SDL_HapticOpen_REAL
+#define SDL_HapticOpened SDL_HapticOpened_REAL
+#define SDL_HapticIndex SDL_HapticIndex_REAL
+#define SDL_MouseIsHaptic SDL_MouseIsHaptic_REAL
+#define SDL_HapticOpenFromMouse SDL_HapticOpenFromMouse_REAL
+#define SDL_JoystickIsHaptic SDL_JoystickIsHaptic_REAL
+#define SDL_HapticOpenFromJoystick SDL_HapticOpenFromJoystick_REAL
+#define SDL_HapticClose SDL_HapticClose_REAL
+#define SDL_HapticNumEffects SDL_HapticNumEffects_REAL
+#define SDL_HapticNumEffectsPlaying SDL_HapticNumEffectsPlaying_REAL
+#define SDL_HapticQuery SDL_HapticQuery_REAL
+#define SDL_HapticNumAxes SDL_HapticNumAxes_REAL
+#define SDL_HapticEffectSupported SDL_HapticEffectSupported_REAL
+#define SDL_HapticNewEffect SDL_HapticNewEffect_REAL
+#define SDL_HapticUpdateEffect SDL_HapticUpdateEffect_REAL
+#define SDL_HapticRunEffect SDL_HapticRunEffect_REAL
+#define SDL_HapticStopEffect SDL_HapticStopEffect_REAL
+#define SDL_HapticDestroyEffect SDL_HapticDestroyEffect_REAL
+#define SDL_HapticGetEffectStatus SDL_HapticGetEffectStatus_REAL
+#define SDL_HapticSetGain SDL_HapticSetGain_REAL
+#define SDL_HapticSetAutocenter SDL_HapticSetAutocenter_REAL
+#define SDL_HapticPause SDL_HapticPause_REAL
+#define SDL_HapticUnpause SDL_HapticUnpause_REAL
+#define SDL_HapticStopAll SDL_HapticStopAll_REAL
+#define SDL_HapticRumbleSupported SDL_HapticRumbleSupported_REAL
+#define SDL_HapticRumbleInit SDL_HapticRumbleInit_REAL
+#define SDL_HapticRumblePlay SDL_HapticRumblePlay_REAL
+#define SDL_HapticRumbleStop SDL_HapticRumbleStop_REAL
+#define SDL_SetHintWithPriority SDL_SetHintWithPriority_REAL
+#define SDL_SetHint SDL_SetHint_REAL
+#define SDL_GetHint SDL_GetHint_REAL
+#define SDL_AddHintCallback SDL_AddHintCallback_REAL
+#define SDL_DelHintCallback SDL_DelHintCallback_REAL
+#define SDL_ClearHints SDL_ClearHints_REAL
+#define SDL_NumJoysticks SDL_NumJoysticks_REAL
+#define SDL_JoystickNameForIndex SDL_JoystickNameForIndex_REAL
+#define SDL_JoystickOpen SDL_JoystickOpen_REAL
+#define SDL_JoystickName SDL_JoystickName_REAL
+#define SDL_JoystickGetDeviceGUID SDL_JoystickGetDeviceGUID_REAL
+#define SDL_JoystickGetGUID SDL_JoystickGetGUID_REAL
+#define SDL_JoystickGetGUIDString SDL_JoystickGetGUIDString_REAL
+#define SDL_JoystickGetGUIDFromString SDL_JoystickGetGUIDFromString_REAL
+#define SDL_JoystickGetAttached SDL_JoystickGetAttached_REAL
+#define SDL_JoystickInstanceID SDL_JoystickInstanceID_REAL
+#define SDL_JoystickNumAxes SDL_JoystickNumAxes_REAL
+#define SDL_JoystickNumBalls SDL_JoystickNumBalls_REAL
+#define SDL_JoystickNumHats SDL_JoystickNumHats_REAL
+#define SDL_JoystickNumButtons SDL_JoystickNumButtons_REAL
+#define SDL_JoystickUpdate SDL_JoystickUpdate_REAL
+#define SDL_JoystickEventState SDL_JoystickEventState_REAL
+#define SDL_JoystickGetAxis SDL_JoystickGetAxis_REAL
+#define SDL_JoystickGetHat SDL_JoystickGetHat_REAL
+#define SDL_JoystickGetBall SDL_JoystickGetBall_REAL
+#define SDL_JoystickGetButton SDL_JoystickGetButton_REAL
+#define SDL_JoystickClose SDL_JoystickClose_REAL
+#define SDL_GetKeyboardFocus SDL_GetKeyboardFocus_REAL
+#define SDL_GetKeyboardState SDL_GetKeyboardState_REAL
+#define SDL_GetModState SDL_GetModState_REAL
+#define SDL_SetModState SDL_SetModState_REAL
+#define SDL_GetKeyFromScancode SDL_GetKeyFromScancode_REAL
+#define SDL_GetScancodeFromKey SDL_GetScancodeFromKey_REAL
+#define SDL_GetScancodeName SDL_GetScancodeName_REAL
+#define SDL_GetScancodeFromName SDL_GetScancodeFromName_REAL
+#define SDL_GetKeyName SDL_GetKeyName_REAL
+#define SDL_GetKeyFromName SDL_GetKeyFromName_REAL
+#define SDL_StartTextInput SDL_StartTextInput_REAL
+#define SDL_IsTextInputActive SDL_IsTextInputActive_REAL
+#define SDL_StopTextInput SDL_StopTextInput_REAL
+#define SDL_SetTextInputRect SDL_SetTextInputRect_REAL
+#define SDL_HasScreenKeyboardSupport SDL_HasScreenKeyboardSupport_REAL
+#define SDL_IsScreenKeyboardShown SDL_IsScreenKeyboardShown_REAL
+#define SDL_LoadObject SDL_LoadObject_REAL
+#define SDL_LoadFunction SDL_LoadFunction_REAL
+#define SDL_UnloadObject SDL_UnloadObject_REAL
+#define SDL_LogSetAllPriority SDL_LogSetAllPriority_REAL
+#define SDL_LogSetPriority SDL_LogSetPriority_REAL
+#define SDL_LogGetPriority SDL_LogGetPriority_REAL
+#define SDL_LogResetPriorities SDL_LogResetPriorities_REAL
+#define SDL_LogMessageV SDL_LogMessageV_REAL
+#define SDL_LogGetOutputFunction SDL_LogGetOutputFunction_REAL
+#define SDL_LogSetOutputFunction SDL_LogSetOutputFunction_REAL
+#define SDL_SetMainReady SDL_SetMainReady_REAL
+#define SDL_ShowMessageBox SDL_ShowMessageBox_REAL
+#define SDL_ShowSimpleMessageBox SDL_ShowSimpleMessageBox_REAL
+#define SDL_GetMouseFocus SDL_GetMouseFocus_REAL
+#define SDL_GetMouseState SDL_GetMouseState_REAL
+#define SDL_GetRelativeMouseState SDL_GetRelativeMouseState_REAL
+#define SDL_WarpMouseInWindow SDL_WarpMouseInWindow_REAL
+#define SDL_SetRelativeMouseMode SDL_SetRelativeMouseMode_REAL
+#define SDL_GetRelativeMouseMode SDL_GetRelativeMouseMode_REAL
+#define SDL_CreateCursor SDL_CreateCursor_REAL
+#define SDL_CreateColorCursor SDL_CreateColorCursor_REAL
+#define SDL_CreateSystemCursor SDL_CreateSystemCursor_REAL
+#define SDL_SetCursor SDL_SetCursor_REAL
+#define SDL_GetCursor SDL_GetCursor_REAL
+#define SDL_GetDefaultCursor SDL_GetDefaultCursor_REAL
+#define SDL_FreeCursor SDL_FreeCursor_REAL
+#define SDL_ShowCursor SDL_ShowCursor_REAL
+#define SDL_CreateMutex SDL_CreateMutex_REAL
+#define SDL_LockMutex SDL_LockMutex_REAL
+#define SDL_TryLockMutex SDL_TryLockMutex_REAL
+#define SDL_UnlockMutex SDL_UnlockMutex_REAL
+#define SDL_DestroyMutex SDL_DestroyMutex_REAL
+#define SDL_CreateSemaphore SDL_CreateSemaphore_REAL
+#define SDL_DestroySemaphore SDL_DestroySemaphore_REAL
+#define SDL_SemWait SDL_SemWait_REAL
+#define SDL_SemTryWait SDL_SemTryWait_REAL
+#define SDL_SemWaitTimeout SDL_SemWaitTimeout_REAL
+#define SDL_SemPost SDL_SemPost_REAL
+#define SDL_SemValue SDL_SemValue_REAL
+#define SDL_CreateCond SDL_CreateCond_REAL
+#define SDL_DestroyCond SDL_DestroyCond_REAL
+#define SDL_CondSignal SDL_CondSignal_REAL
+#define SDL_CondBroadcast SDL_CondBroadcast_REAL
+#define SDL_CondWait SDL_CondWait_REAL
+#define SDL_CondWaitTimeout SDL_CondWaitTimeout_REAL
+#define SDL_GetPixelFormatName SDL_GetPixelFormatName_REAL
+#define SDL_PixelFormatEnumToMasks SDL_PixelFormatEnumToMasks_REAL
+#define SDL_MasksToPixelFormatEnum SDL_MasksToPixelFormatEnum_REAL
+#define SDL_AllocFormat SDL_AllocFormat_REAL
+#define SDL_FreeFormat SDL_FreeFormat_REAL
+#define SDL_AllocPalette SDL_AllocPalette_REAL
+#define SDL_SetPixelFormatPalette SDL_SetPixelFormatPalette_REAL
+#define SDL_SetPaletteColors SDL_SetPaletteColors_REAL
+#define SDL_FreePalette SDL_FreePalette_REAL
+#define SDL_MapRGB SDL_MapRGB_REAL
+#define SDL_MapRGBA SDL_MapRGBA_REAL
+#define SDL_GetRGB SDL_GetRGB_REAL
+#define SDL_GetRGBA SDL_GetRGBA_REAL
+#define SDL_CalculateGammaRamp SDL_CalculateGammaRamp_REAL
+#define SDL_GetPlatform SDL_GetPlatform_REAL
+#define SDL_GetPowerInfo SDL_GetPowerInfo_REAL
+#define SDL_HasIntersection SDL_HasIntersection_REAL
+#define SDL_IntersectRect SDL_IntersectRect_REAL
+#define SDL_UnionRect SDL_UnionRect_REAL
+#define SDL_EnclosePoints SDL_EnclosePoints_REAL
+#define SDL_IntersectRectAndLine SDL_IntersectRectAndLine_REAL
+#define SDL_GetNumRenderDrivers SDL_GetNumRenderDrivers_REAL
+#define SDL_GetRenderDriverInfo SDL_GetRenderDriverInfo_REAL
+#define SDL_CreateWindowAndRenderer SDL_CreateWindowAndRenderer_REAL
+#define SDL_CreateRenderer SDL_CreateRenderer_REAL
+#define SDL_CreateSoftwareRenderer SDL_CreateSoftwareRenderer_REAL
+#define SDL_GetRenderer SDL_GetRenderer_REAL
+#define SDL_GetRendererInfo SDL_GetRendererInfo_REAL
+#define SDL_GetRendererOutputSize SDL_GetRendererOutputSize_REAL
+#define SDL_CreateTexture SDL_CreateTexture_REAL
+#define SDL_CreateTextureFromSurface SDL_CreateTextureFromSurface_REAL
+#define SDL_QueryTexture SDL_QueryTexture_REAL
+#define SDL_SetTextureColorMod SDL_SetTextureColorMod_REAL
+#define SDL_GetTextureColorMod SDL_GetTextureColorMod_REAL
+#define SDL_SetTextureAlphaMod SDL_SetTextureAlphaMod_REAL
+#define SDL_GetTextureAlphaMod SDL_GetTextureAlphaMod_REAL
+#define SDL_SetTextureBlendMode SDL_SetTextureBlendMode_REAL
+#define SDL_GetTextureBlendMode SDL_GetTextureBlendMode_REAL
+#define SDL_UpdateTexture SDL_UpdateTexture_REAL
+#define SDL_UpdateYUVTexture SDL_UpdateYUVTexture_REAL
+#define SDL_LockTexture SDL_LockTexture_REAL
+#define SDL_UnlockTexture SDL_UnlockTexture_REAL
+#define SDL_RenderTargetSupported SDL_RenderTargetSupported_REAL
+#define SDL_SetRenderTarget SDL_SetRenderTarget_REAL
+#define SDL_GetRenderTarget SDL_GetRenderTarget_REAL
+#define SDL_RenderSetLogicalSize SDL_RenderSetLogicalSize_REAL
+#define SDL_RenderGetLogicalSize SDL_RenderGetLogicalSize_REAL
+#define SDL_RenderSetViewport SDL_RenderSetViewport_REAL
+#define SDL_RenderGetViewport SDL_RenderGetViewport_REAL
+#define SDL_RenderSetClipRect SDL_RenderSetClipRect_REAL
+#define SDL_RenderGetClipRect SDL_RenderGetClipRect_REAL
+#define SDL_RenderSetScale SDL_RenderSetScale_REAL
+#define SDL_RenderGetScale SDL_RenderGetScale_REAL
+#define SDL_SetRenderDrawColor SDL_SetRenderDrawColor_REAL
+#define SDL_GetRenderDrawColor SDL_GetRenderDrawColor_REAL
+#define SDL_SetRenderDrawBlendMode SDL_SetRenderDrawBlendMode_REAL
+#define SDL_GetRenderDrawBlendMode SDL_GetRenderDrawBlendMode_REAL
+#define SDL_RenderClear SDL_RenderClear_REAL
+#define SDL_RenderDrawPoint SDL_RenderDrawPoint_REAL
+#define SDL_RenderDrawPoints SDL_RenderDrawPoints_REAL
+#define SDL_RenderDrawLine SDL_RenderDrawLine_REAL
+#define SDL_RenderDrawLines SDL_RenderDrawLines_REAL
+#define SDL_RenderDrawRect SDL_RenderDrawRect_REAL
+#define SDL_RenderDrawRects SDL_RenderDrawRects_REAL
+#define SDL_RenderFillRect SDL_RenderFillRect_REAL
+#define SDL_RenderFillRects SDL_RenderFillRects_REAL
+#define SDL_RenderCopy SDL_RenderCopy_REAL
+#define SDL_RenderCopyEx SDL_RenderCopyEx_REAL
+#define SDL_RenderReadPixels SDL_RenderReadPixels_REAL
+#define SDL_RenderPresent SDL_RenderPresent_REAL
+#define SDL_DestroyTexture SDL_DestroyTexture_REAL
+#define SDL_DestroyRenderer SDL_DestroyRenderer_REAL
+#define SDL_GL_BindTexture SDL_GL_BindTexture_REAL
+#define SDL_GL_UnbindTexture SDL_GL_UnbindTexture_REAL
+#define SDL_RWFromFile SDL_RWFromFile_REAL
+#define SDL_RWFromMem SDL_RWFromMem_REAL
+#define SDL_RWFromConstMem SDL_RWFromConstMem_REAL
+#define SDL_AllocRW SDL_AllocRW_REAL
+#define SDL_FreeRW SDL_FreeRW_REAL
+#define SDL_ReadU8 SDL_ReadU8_REAL
+#define SDL_ReadLE16 SDL_ReadLE16_REAL
+#define SDL_ReadBE16 SDL_ReadBE16_REAL
+#define SDL_ReadLE32 SDL_ReadLE32_REAL
+#define SDL_ReadBE32 SDL_ReadBE32_REAL
+#define SDL_ReadLE64 SDL_ReadLE64_REAL
+#define SDL_ReadBE64 SDL_ReadBE64_REAL
+#define SDL_WriteU8 SDL_WriteU8_REAL
+#define SDL_WriteLE16 SDL_WriteLE16_REAL
+#define SDL_WriteBE16 SDL_WriteBE16_REAL
+#define SDL_WriteLE32 SDL_WriteLE32_REAL
+#define SDL_WriteBE32 SDL_WriteBE32_REAL
+#define SDL_WriteLE64 SDL_WriteLE64_REAL
+#define SDL_WriteBE64 SDL_WriteBE64_REAL
+#define SDL_CreateShapedWindow SDL_CreateShapedWindow_REAL
+#define SDL_IsShapedWindow SDL_IsShapedWindow_REAL
+#define SDL_SetWindowShape SDL_SetWindowShape_REAL
+#define SDL_GetShapedWindowMode SDL_GetShapedWindowMode_REAL
+#define SDL_malloc SDL_malloc_REAL
+#define SDL_calloc SDL_calloc_REAL
+#define SDL_realloc SDL_realloc_REAL
+#define SDL_free SDL_free_REAL
+#define SDL_getenv SDL_getenv_REAL
+#define SDL_setenv SDL_setenv_REAL
+#define SDL_qsort SDL_qsort_REAL
+#define SDL_abs SDL_abs_REAL
+#define SDL_isdigit SDL_isdigit_REAL
+#define SDL_isspace SDL_isspace_REAL
+#define SDL_toupper SDL_toupper_REAL
+#define SDL_tolower SDL_tolower_REAL
+#define SDL_memset SDL_memset_REAL
+#define SDL_memcpy SDL_memcpy_REAL
+#define SDL_memmove SDL_memmove_REAL
+#define SDL_memcmp SDL_memcmp_REAL
+#define SDL_wcslen SDL_wcslen_REAL
+#define SDL_wcslcpy SDL_wcslcpy_REAL
+#define SDL_wcslcat SDL_wcslcat_REAL
+#define SDL_strlen SDL_strlen_REAL
+#define SDL_strlcpy SDL_strlcpy_REAL
+#define SDL_utf8strlcpy SDL_utf8strlcpy_REAL
+#define SDL_strlcat SDL_strlcat_REAL
+#define SDL_strdup SDL_strdup_REAL
+#define SDL_strrev SDL_strrev_REAL
+#define SDL_strupr SDL_strupr_REAL
+#define SDL_strlwr SDL_strlwr_REAL
+#define SDL_strchr SDL_strchr_REAL
+#define SDL_strrchr SDL_strrchr_REAL
+#define SDL_strstr SDL_strstr_REAL
+#define SDL_itoa SDL_itoa_REAL
+#define SDL_uitoa SDL_uitoa_REAL
+#define SDL_ltoa SDL_ltoa_REAL
+#define SDL_ultoa SDL_ultoa_REAL
+#define SDL_lltoa SDL_lltoa_REAL
+#define SDL_ulltoa SDL_ulltoa_REAL
+#define SDL_atoi SDL_atoi_REAL
+#define SDL_atof SDL_atof_REAL
+#define SDL_strtol SDL_strtol_REAL
+#define SDL_strtoul SDL_strtoul_REAL
+#define SDL_strtoll SDL_strtoll_REAL
+#define SDL_strtoull SDL_strtoull_REAL
+#define SDL_strtod SDL_strtod_REAL
+#define SDL_strcmp SDL_strcmp_REAL
+#define SDL_strncmp SDL_strncmp_REAL
+#define SDL_strcasecmp SDL_strcasecmp_REAL
+#define SDL_strncasecmp SDL_strncasecmp_REAL
+#define SDL_vsnprintf SDL_vsnprintf_REAL
+#define SDL_acos SDL_acos_REAL
+#define SDL_asin SDL_asin_REAL
+#define SDL_atan SDL_atan_REAL
+#define SDL_atan2 SDL_atan2_REAL
+#define SDL_ceil SDL_ceil_REAL
+#define SDL_copysign SDL_copysign_REAL
+#define SDL_cos SDL_cos_REAL
+#define SDL_cosf SDL_cosf_REAL
+#define SDL_fabs SDL_fabs_REAL
+#define SDL_floor SDL_floor_REAL
+#define SDL_log SDL_log_REAL
+#define SDL_pow SDL_pow_REAL
+#define SDL_scalbn SDL_scalbn_REAL
+#define SDL_sin SDL_sin_REAL
+#define SDL_sinf SDL_sinf_REAL
+#define SDL_sqrt SDL_sqrt_REAL
+#define SDL_iconv_open SDL_iconv_open_REAL
+#define SDL_iconv_close SDL_iconv_close_REAL
+#define SDL_iconv SDL_iconv_REAL
+#define SDL_iconv_string SDL_iconv_string_REAL
+#define SDL_CreateRGBSurface SDL_CreateRGBSurface_REAL
+#define SDL_CreateRGBSurfaceFrom SDL_CreateRGBSurfaceFrom_REAL
+#define SDL_FreeSurface SDL_FreeSurface_REAL
+#define SDL_SetSurfacePalette SDL_SetSurfacePalette_REAL
+#define SDL_LockSurface SDL_LockSurface_REAL
+#define SDL_UnlockSurface SDL_UnlockSurface_REAL
+#define SDL_LoadBMP_RW SDL_LoadBMP_RW_REAL
+#define SDL_SaveBMP_RW SDL_SaveBMP_RW_REAL
+#define SDL_SetSurfaceRLE SDL_SetSurfaceRLE_REAL
+#define SDL_SetColorKey SDL_SetColorKey_REAL
+#define SDL_GetColorKey SDL_GetColorKey_REAL
+#define SDL_SetSurfaceColorMod SDL_SetSurfaceColorMod_REAL
+#define SDL_GetSurfaceColorMod SDL_GetSurfaceColorMod_REAL
+#define SDL_SetSurfaceAlphaMod SDL_SetSurfaceAlphaMod_REAL
+#define SDL_GetSurfaceAlphaMod SDL_GetSurfaceAlphaMod_REAL
+#define SDL_SetSurfaceBlendMode SDL_SetSurfaceBlendMode_REAL
+#define SDL_GetSurfaceBlendMode SDL_GetSurfaceBlendMode_REAL
+#define SDL_SetClipRect SDL_SetClipRect_REAL
+#define SDL_GetClipRect SDL_GetClipRect_REAL
+#define SDL_ConvertSurface SDL_ConvertSurface_REAL
+#define SDL_ConvertSurfaceFormat SDL_ConvertSurfaceFormat_REAL
+#define SDL_ConvertPixels SDL_ConvertPixels_REAL
+#define SDL_FillRect SDL_FillRect_REAL
+#define SDL_FillRects SDL_FillRects_REAL
+#define SDL_UpperBlit SDL_UpperBlit_REAL
+#define SDL_LowerBlit SDL_LowerBlit_REAL
+#define SDL_SoftStretch SDL_SoftStretch_REAL
+#define SDL_UpperBlitScaled SDL_UpperBlitScaled_REAL
+#define SDL_LowerBlitScaled SDL_LowerBlitScaled_REAL
+#define SDL_GetWindowWMInfo SDL_GetWindowWMInfo_REAL
+#define SDL_GetThreadName SDL_GetThreadName_REAL
+#define SDL_ThreadID SDL_ThreadID_REAL
+#define SDL_GetThreadID SDL_GetThreadID_REAL
+#define SDL_SetThreadPriority SDL_SetThreadPriority_REAL
+#define SDL_WaitThread SDL_WaitThread_REAL
+#define SDL_DetachThread SDL_DetachThread_REAL
+#define SDL_TLSCreate SDL_TLSCreate_REAL
+#define SDL_TLSGet SDL_TLSGet_REAL
+#define SDL_TLSSet SDL_TLSSet_REAL
+#define SDL_GetTicks SDL_GetTicks_REAL
+#define SDL_GetPerformanceCounter SDL_GetPerformanceCounter_REAL
+#define SDL_GetPerformanceFrequency SDL_GetPerformanceFrequency_REAL
+#define SDL_Delay SDL_Delay_REAL
+#define SDL_AddTimer SDL_AddTimer_REAL
+#define SDL_RemoveTimer SDL_RemoveTimer_REAL
+#define SDL_GetNumTouchDevices SDL_GetNumTouchDevices_REAL
+#define SDL_GetTouchDevice SDL_GetTouchDevice_REAL
+#define SDL_GetNumTouchFingers SDL_GetNumTouchFingers_REAL
+#define SDL_GetTouchFinger SDL_GetTouchFinger_REAL
+#define SDL_GetVersion SDL_GetVersion_REAL
+#define SDL_GetRevision SDL_GetRevision_REAL
+#define SDL_GetRevisionNumber SDL_GetRevisionNumber_REAL
+#define SDL_GetNumVideoDrivers SDL_GetNumVideoDrivers_REAL
+#define SDL_GetVideoDriver SDL_GetVideoDriver_REAL
+#define SDL_VideoInit SDL_VideoInit_REAL
+#define SDL_VideoQuit SDL_VideoQuit_REAL
+#define SDL_GetCurrentVideoDriver SDL_GetCurrentVideoDriver_REAL
+#define SDL_GetNumVideoDisplays SDL_GetNumVideoDisplays_REAL
+#define SDL_GetDisplayName SDL_GetDisplayName_REAL
+#define SDL_GetDisplayBounds SDL_GetDisplayBounds_REAL
+#define SDL_GetNumDisplayModes SDL_GetNumDisplayModes_REAL
+#define SDL_GetDisplayMode SDL_GetDisplayMode_REAL
+#define SDL_GetDesktopDisplayMode SDL_GetDesktopDisplayMode_REAL
+#define SDL_GetCurrentDisplayMode SDL_GetCurrentDisplayMode_REAL
+#define SDL_GetClosestDisplayMode SDL_GetClosestDisplayMode_REAL
+#define SDL_GetWindowDisplayIndex SDL_GetWindowDisplayIndex_REAL
+#define SDL_SetWindowDisplayMode SDL_SetWindowDisplayMode_REAL
+#define SDL_GetWindowDisplayMode SDL_GetWindowDisplayMode_REAL
+#define SDL_GetWindowPixelFormat SDL_GetWindowPixelFormat_REAL
+#define SDL_CreateWindow SDL_CreateWindow_REAL
+#define SDL_CreateWindowFrom SDL_CreateWindowFrom_REAL
+#define SDL_GetWindowID SDL_GetWindowID_REAL
+#define SDL_GetWindowFromID SDL_GetWindowFromID_REAL
+#define SDL_GetWindowFlags SDL_GetWindowFlags_REAL
+#define SDL_SetWindowTitle SDL_SetWindowTitle_REAL
+#define SDL_GetWindowTitle SDL_GetWindowTitle_REAL
+#define SDL_SetWindowIcon SDL_SetWindowIcon_REAL
+#define SDL_SetWindowData SDL_SetWindowData_REAL
+#define SDL_GetWindowData SDL_GetWindowData_REAL
+#define SDL_SetWindowPosition SDL_SetWindowPosition_REAL
+#define SDL_GetWindowPosition SDL_GetWindowPosition_REAL
+#define SDL_SetWindowSize SDL_SetWindowSize_REAL
+#define SDL_GetWindowSize SDL_GetWindowSize_REAL
+#define SDL_SetWindowMinimumSize SDL_SetWindowMinimumSize_REAL
+#define SDL_GetWindowMinimumSize SDL_GetWindowMinimumSize_REAL
+#define SDL_SetWindowMaximumSize SDL_SetWindowMaximumSize_REAL
+#define SDL_GetWindowMaximumSize SDL_GetWindowMaximumSize_REAL
+#define SDL_SetWindowBordered SDL_SetWindowBordered_REAL
+#define SDL_ShowWindow SDL_ShowWindow_REAL
+#define SDL_HideWindow SDL_HideWindow_REAL
+#define SDL_RaiseWindow SDL_RaiseWindow_REAL
+#define SDL_MaximizeWindow SDL_MaximizeWindow_REAL
+#define SDL_MinimizeWindow SDL_MinimizeWindow_REAL
+#define SDL_RestoreWindow SDL_RestoreWindow_REAL
+#define SDL_SetWindowFullscreen SDL_SetWindowFullscreen_REAL
+#define SDL_GetWindowSurface SDL_GetWindowSurface_REAL
+#define SDL_UpdateWindowSurface SDL_UpdateWindowSurface_REAL
+#define SDL_UpdateWindowSurfaceRects SDL_UpdateWindowSurfaceRects_REAL
+#define SDL_SetWindowGrab SDL_SetWindowGrab_REAL
+#define SDL_GetWindowGrab SDL_GetWindowGrab_REAL
+#define SDL_SetWindowBrightness SDL_SetWindowBrightness_REAL
+#define SDL_GetWindowBrightness SDL_GetWindowBrightness_REAL
+#define SDL_SetWindowGammaRamp SDL_SetWindowGammaRamp_REAL
+#define SDL_GetWindowGammaRamp SDL_GetWindowGammaRamp_REAL
+#define SDL_DestroyWindow SDL_DestroyWindow_REAL
+#define SDL_IsScreenSaverEnabled SDL_IsScreenSaverEnabled_REAL
+#define SDL_EnableScreenSaver SDL_EnableScreenSaver_REAL
+#define SDL_DisableScreenSaver SDL_DisableScreenSaver_REAL
+#define SDL_GL_LoadLibrary SDL_GL_LoadLibrary_REAL
+#define SDL_GL_GetProcAddress SDL_GL_GetProcAddress_REAL
+#define SDL_GL_UnloadLibrary SDL_GL_UnloadLibrary_REAL
+#define SDL_GL_ExtensionSupported SDL_GL_ExtensionSupported_REAL
+#define SDL_GL_SetAttribute SDL_GL_SetAttribute_REAL
+#define SDL_GL_GetAttribute SDL_GL_GetAttribute_REAL
+#define SDL_GL_CreateContext SDL_GL_CreateContext_REAL
+#define SDL_GL_MakeCurrent SDL_GL_MakeCurrent_REAL
+#define SDL_GL_GetCurrentWindow SDL_GL_GetCurrentWindow_REAL
+#define SDL_GL_GetCurrentContext SDL_GL_GetCurrentContext_REAL
+#define SDL_GL_GetDrawableSize SDL_GL_GetDrawableSize_REAL
+#define SDL_GL_SetSwapInterval SDL_GL_SetSwapInterval_REAL
+#define SDL_GL_GetSwapInterval SDL_GL_GetSwapInterval_REAL
+#define SDL_GL_SwapWindow SDL_GL_SwapWindow_REAL
+#define SDL_GL_DeleteContext SDL_GL_DeleteContext_REAL
+#define SDL_vsscanf SDL_vsscanf_REAL
+#define SDL_GameControllerAddMappingsFromRW SDL_GameControllerAddMappingsFromRW_REAL
+#define SDL_GL_ResetAttributes SDL_GL_ResetAttributes_REAL
+#define SDL_HasAVX SDL_HasAVX_REAL
+#define SDL_GetDefaultAssertionHandler SDL_GetDefaultAssertionHandler_REAL
+#define SDL_GetAssertionHandler SDL_GetAssertionHandler_REAL
+#define SDL_DXGIGetOutputInfo SDL_DXGIGetOutputInfo_REAL
diff --git a/Source/3rd Party/sdl/src/dynapi/SDL_dynapi_procs.h b/Source/3rd Party/sdl/src/dynapi/SDL_dynapi_procs.h
new file mode 100644
index 000000000..301aff38a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/dynapi/SDL_dynapi_procs.h	
@@ -0,0 +1,608 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* vi: set ts=4 sw=4 expandtab: */
+
+/*
+   DO NOT EDIT THIS FILE BY HAND. It is autogenerated by gendynapi.pl.
+   NEVER REARRANGE THIS FILE, THE ORDER IS ABI LAW.
+   Changing this file means bumping SDL_DYNAPI_VERSION. You can safely add
+   new items to the end of the file, though.
+   Also, this file gets included multiple times, don't add #pragma once, etc.
+*/
+
+/* direct jump magic can use these, the rest needs special code. */
+#if !SDL_DYNAPI_PROC_NO_VARARGS
+SDL_DYNAPI_PROC(int,SDL_SetError,(const char *a, ...),(a),return)
+SDL_DYNAPI_PROC(void,SDL_Log,(const char *a, ...),(a),)
+SDL_DYNAPI_PROC(void,SDL_LogVerbose,(int a, const char *b, ...),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_LogDebug,(int a, const char *b, ...),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_LogInfo,(int a, const char *b, ...),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_LogWarn,(int a, const char *b, ...),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_LogError,(int a, const char *b, ...),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_LogCritical,(int a, const char *b, ...),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_LogMessage,(int a, SDL_LogPriority b, const char *c, ...),(a,b,c),)
+SDL_DYNAPI_PROC(int,SDL_sscanf,(const char *a, const char *b, ...),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_snprintf,(char *a, size_t b, const char *c, ...),(a,b,c),return)
+#endif
+
+#ifdef SDL_CreateThread
+#undef SDL_CreateThread
+#endif
+
+#if defined(__WIN32__) && !defined(HAVE_LIBC)
+SDL_DYNAPI_PROC(SDL_Thread*,SDL_CreateThread,(SDL_ThreadFunction a, const char *b, void *c, pfnSDL_CurrentBeginThread d, pfnSDL_CurrentEndThread e),(a,b,c,d,e),return)
+#else
+SDL_DYNAPI_PROC(SDL_Thread*,SDL_CreateThread,(SDL_ThreadFunction a, const char *b, void *c),(a,b,c),return)
+#endif
+
+#ifdef HAVE_STDIO_H
+SDL_DYNAPI_PROC(SDL_RWops*,SDL_RWFromFP,(FILE *a, SDL_bool b),(a,b),return)
+#else
+SDL_DYNAPI_PROC(SDL_RWops*,SDL_RWFromFP,(void *a, SDL_bool b),(a,b),return)
+#endif
+
+/* so annoying. */
+#if defined(__thumb__) && (defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__))
+SDL_DYNAPI_PROC(void,SDL_MemoryBarrierRelease,(void),(),)
+SDL_DYNAPI_PROC(void,SDL_MemoryBarrierAcquire,(void),(),)
+#endif
+
+#ifdef __WIN32__
+SDL_DYNAPI_PROC(int,SDL_RegisterApp,(char *a, Uint32 b, void *c),(a,b,c),return)
+SDL_DYNAPI_PROC(void,SDL_UnregisterApp,(void),(),)
+SDL_DYNAPI_PROC(int,SDL_Direct3D9GetAdapterIndex,(int a),(a),return)
+SDL_DYNAPI_PROC(IDirect3DDevice9*,SDL_RenderGetD3D9Device,(SDL_Renderer *a),(a),return)
+#endif
+
+#if defined(__IPHONEOS__) && __IPHONEOS__
+SDL_DYNAPI_PROC(int,SDL_iPhoneSetAnimationCallback,(SDL_Window *a, int b, void c, void *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(void,SDL_iPhoneSetEventPump,(SDL_bool a),(a),)
+#endif
+
+#if defined(__ANDROID__) && __ANDROID__
+SDL_DYNAPI_PROC(void*,SDL_AndroidGetJNIEnv,(void),(),return)
+SDL_DYNAPI_PROC(void*,SDL_AndroidGetActivity,(void),(),return)
+SDL_DYNAPI_PROC(const char*,SDL_AndroidGetInternalStoragePath,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_AndroidGetExternalStorageState,(void),(),return)
+SDL_DYNAPI_PROC(const char*,SDL_AndroidGetExternalStoragePath,(void),(),return)
+#endif
+
+SDL_DYNAPI_PROC(int,SDL_Init,(Uint32 a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_InitSubSystem,(Uint32 a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_QuitSubSystem,(Uint32 a),(a),)
+SDL_DYNAPI_PROC(Uint32,SDL_WasInit,(Uint32 a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_Quit,(void),(),)
+SDL_DYNAPI_PROC(SDL_assert_state,SDL_ReportAssertion,(SDL_assert_data *a, const char *b, const char *c, int d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(void,SDL_SetAssertionHandler,(SDL_AssertionHandler a, void *b),(a,b),)
+SDL_DYNAPI_PROC(const SDL_assert_data*,SDL_GetAssertionReport,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_ResetAssertionReport,(void),(),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_AtomicTryLock,(SDL_SpinLock *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_AtomicLock,(SDL_SpinLock *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_AtomicUnlock,(SDL_SpinLock *a),(a),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_AtomicCAS,(SDL_atomic_t *a, int b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_AtomicSet,(SDL_atomic_t *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_AtomicGet,(SDL_atomic_t *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_AtomicAdd,(SDL_atomic_t *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_AtomicCASPtr,(void **a, void *b, void *c),(a,b,c),return)
+SDL_DYNAPI_PROC(void*,SDL_AtomicSetPtr,(void **a, void *b),(a,b),return)
+SDL_DYNAPI_PROC(void*,SDL_AtomicGetPtr,(void **a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GetNumAudioDrivers,(void),(),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetAudioDriver,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_AudioInit,(const char *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_AudioQuit,(void),(),)
+SDL_DYNAPI_PROC(const char*,SDL_GetCurrentAudioDriver,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_OpenAudio,(SDL_AudioSpec *a, SDL_AudioSpec *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetNumAudioDevices,(int a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetAudioDeviceName,(int a, int b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_AudioDeviceID,SDL_OpenAudioDevice,(const char *a, int b, const SDL_AudioSpec *c, SDL_AudioSpec *d, int e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(SDL_AudioStatus,SDL_GetAudioStatus,(void),(),return)
+SDL_DYNAPI_PROC(SDL_AudioStatus,SDL_GetAudioDeviceStatus,(SDL_AudioDeviceID a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_PauseAudio,(int a),(a),)
+SDL_DYNAPI_PROC(void,SDL_PauseAudioDevice,(SDL_AudioDeviceID a, int b),(a,b),)
+SDL_DYNAPI_PROC(SDL_AudioSpec*,SDL_LoadWAV_RW,(SDL_RWops *a, int b, SDL_AudioSpec *c, Uint8 **d, Uint32 *e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(void,SDL_FreeWAV,(Uint8 *a),(a),)
+SDL_DYNAPI_PROC(int,SDL_BuildAudioCVT,(SDL_AudioCVT *a, SDL_AudioFormat b, Uint8 c, int d, SDL_AudioFormat e, Uint8 f, int g),(a,b,c,d,e,f,g),return)
+SDL_DYNAPI_PROC(int,SDL_ConvertAudio,(SDL_AudioCVT *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_MixAudio,(Uint8 *a, const Uint8 *b, Uint32 c, int d),(a,b,c,d),)
+SDL_DYNAPI_PROC(void,SDL_MixAudioFormat,(Uint8 *a, const Uint8 *b, SDL_AudioFormat c, Uint32 d, int e),(a,b,c,d,e),)
+SDL_DYNAPI_PROC(void,SDL_LockAudio,(void),(),)
+SDL_DYNAPI_PROC(void,SDL_LockAudioDevice,(SDL_AudioDeviceID a),(a),)
+SDL_DYNAPI_PROC(void,SDL_UnlockAudio,(void),(),)
+SDL_DYNAPI_PROC(void,SDL_UnlockAudioDevice,(SDL_AudioDeviceID a),(a),)
+SDL_DYNAPI_PROC(void,SDL_CloseAudio,(void),(),)
+SDL_DYNAPI_PROC(void,SDL_CloseAudioDevice,(SDL_AudioDeviceID a),(a),)
+SDL_DYNAPI_PROC(int,SDL_SetClipboardText,(const char *a),(a),return)
+SDL_DYNAPI_PROC(char*,SDL_GetClipboardText,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasClipboardText,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_GetCPUCount,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_GetCPUCacheLineSize,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasRDTSC,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasAltiVec,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasMMX,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_Has3DNow,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE2,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE3,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE41,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasSSE42,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_GetSystemRAM,(void),(),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetError,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_ClearError,(void),(),)
+SDL_DYNAPI_PROC(int,SDL_Error,(SDL_errorcode a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_PumpEvents,(void),(),)
+SDL_DYNAPI_PROC(int,SDL_PeepEvents,(SDL_Event *a, int b, SDL_eventaction c, Uint32 d, Uint32 e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasEvent,(Uint32 a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasEvents,(Uint32 a, Uint32 b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_FlushEvent,(Uint32 a),(a),)
+SDL_DYNAPI_PROC(void,SDL_FlushEvents,(Uint32 a, Uint32 b),(a,b),)
+SDL_DYNAPI_PROC(int,SDL_PollEvent,(SDL_Event *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_WaitEvent,(SDL_Event *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_WaitEventTimeout,(SDL_Event *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_PushEvent,(SDL_Event *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_SetEventFilter,(SDL_EventFilter a, void *b),(a,b),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_GetEventFilter,(SDL_EventFilter *a, void **b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_AddEventWatch,(SDL_EventFilter a, void *b),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_DelEventWatch,(SDL_EventFilter a, void *b),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_FilterEvents,(SDL_EventFilter a, void *b),(a,b),)
+SDL_DYNAPI_PROC(Uint8,SDL_EventState,(Uint32 a, int b),(a,b),return)
+SDL_DYNAPI_PROC(Uint32,SDL_RegisterEvents,(int a),(a),return)
+SDL_DYNAPI_PROC(char*,SDL_GetBasePath,(void),(),return)
+SDL_DYNAPI_PROC(char*,SDL_GetPrefPath,(const char *a, const char *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GameControllerAddMapping,(const char *a),(a),return)
+SDL_DYNAPI_PROC(char*,SDL_GameControllerMappingForGUID,(SDL_JoystickGUID a),(a),return)
+SDL_DYNAPI_PROC(char*,SDL_GameControllerMapping,(SDL_GameController *a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_IsGameController,(int a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GameControllerNameForIndex,(int a),(a),return)
+SDL_DYNAPI_PROC(SDL_GameController*,SDL_GameControllerOpen,(int a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GameControllerName,(SDL_GameController *a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_GameControllerGetAttached,(SDL_GameController *a),(a),return)
+SDL_DYNAPI_PROC(SDL_Joystick*,SDL_GameControllerGetJoystick,(SDL_GameController *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GameControllerEventState,(int a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_GameControllerUpdate,(void),(),)
+SDL_DYNAPI_PROC(SDL_GameControllerAxis,SDL_GameControllerGetAxisFromString,(const char *a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GameControllerGetStringForAxis,(SDL_GameControllerAxis a),(a),return)
+SDL_DYNAPI_PROC(SDL_GameControllerButtonBind,SDL_GameControllerGetBindForAxis,(SDL_GameController *a, SDL_GameControllerAxis b),(a,b),return)
+SDL_DYNAPI_PROC(Sint16,SDL_GameControllerGetAxis,(SDL_GameController *a, SDL_GameControllerAxis b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_GameControllerButton,SDL_GameControllerGetButtonFromString,(const char *a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GameControllerGetStringForButton,(SDL_GameControllerButton a),(a),return)
+SDL_DYNAPI_PROC(SDL_GameControllerButtonBind,SDL_GameControllerGetBindForButton,(SDL_GameController *a, SDL_GameControllerButton b),(a,b),return)
+SDL_DYNAPI_PROC(Uint8,SDL_GameControllerGetButton,(SDL_GameController *a, SDL_GameControllerButton b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_GameControllerClose,(SDL_GameController *a),(a),)
+SDL_DYNAPI_PROC(int,SDL_RecordGesture,(SDL_TouchID a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SaveAllDollarTemplates,(SDL_RWops *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SaveDollarTemplate,(SDL_GestureID a, SDL_RWops *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_LoadDollarTemplates,(SDL_TouchID a, SDL_RWops *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_NumHaptics,(void),(),return)
+SDL_DYNAPI_PROC(const char*,SDL_HapticName,(int a),(a),return)
+SDL_DYNAPI_PROC(SDL_Haptic*,SDL_HapticOpen,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticOpened,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticIndex,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_MouseIsHaptic,(void),(),return)
+SDL_DYNAPI_PROC(SDL_Haptic*,SDL_HapticOpenFromMouse,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_JoystickIsHaptic,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(SDL_Haptic*,SDL_HapticOpenFromJoystick,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_HapticClose,(SDL_Haptic *a),(a),)
+SDL_DYNAPI_PROC(int,SDL_HapticNumEffects,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticNumEffectsPlaying,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(unsigned int,SDL_HapticQuery,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticNumAxes,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticEffectSupported,(SDL_Haptic *a, SDL_HapticEffect *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_HapticNewEffect,(SDL_Haptic *a, SDL_HapticEffect *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_HapticUpdateEffect,(SDL_Haptic *a, int b, SDL_HapticEffect *c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_HapticRunEffect,(SDL_Haptic *a, int b, Uint32 c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_HapticStopEffect,(SDL_Haptic *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_HapticDestroyEffect,(SDL_Haptic *a, int b),(a,b),)
+SDL_DYNAPI_PROC(int,SDL_HapticGetEffectStatus,(SDL_Haptic *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_HapticSetGain,(SDL_Haptic *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_HapticSetAutocenter,(SDL_Haptic *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_HapticPause,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticUnpause,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticStopAll,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticRumbleSupported,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticRumbleInit,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_HapticRumblePlay,(SDL_Haptic *a, float b, Uint32 c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_HapticRumbleStop,(SDL_Haptic *a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_SetHintWithPriority,(const char *a, const char *b, SDL_HintPriority c),(a,b,c),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_SetHint,(const char *a, const char *b),(a,b),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetHint,(const char *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_AddHintCallback,(const char *a, SDL_HintCallback b, void *c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_DelHintCallback,(const char *a, SDL_HintCallback b, void *c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_ClearHints,(void),(),)
+SDL_DYNAPI_PROC(int,SDL_NumJoysticks,(void),(),return)
+SDL_DYNAPI_PROC(const char*,SDL_JoystickNameForIndex,(int a),(a),return)
+SDL_DYNAPI_PROC(SDL_Joystick*,SDL_JoystickOpen,(int a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_JoystickName,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_JoystickGetDeviceGUID,(int a),(a),return)
+SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_JoystickGetGUID,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_JoystickGetGUIDString,(SDL_JoystickGUID a, char *b, int c),(a,b,c),)
+SDL_DYNAPI_PROC(SDL_JoystickGUID,SDL_JoystickGetGUIDFromString,(const char *a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_JoystickGetAttached,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(SDL_JoystickID,SDL_JoystickInstanceID,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_JoystickNumAxes,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_JoystickNumBalls,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_JoystickNumHats,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_JoystickNumButtons,(SDL_Joystick *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_JoystickUpdate,(void),(),)
+SDL_DYNAPI_PROC(int,SDL_JoystickEventState,(int a),(a),return)
+SDL_DYNAPI_PROC(Sint16,SDL_JoystickGetAxis,(SDL_Joystick *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(Uint8,SDL_JoystickGetHat,(SDL_Joystick *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_JoystickGetBall,(SDL_Joystick *a, int b, int *c, int *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(Uint8,SDL_JoystickGetButton,(SDL_Joystick *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_JoystickClose,(SDL_Joystick *a),(a),)
+SDL_DYNAPI_PROC(SDL_Window*,SDL_GetKeyboardFocus,(void),(),return)
+SDL_DYNAPI_PROC(const Uint8*,SDL_GetKeyboardState,(int *a),(a),return)
+SDL_DYNAPI_PROC(SDL_Keymod,SDL_GetModState,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_SetModState,(SDL_Keymod a),(a),)
+SDL_DYNAPI_PROC(SDL_Keycode,SDL_GetKeyFromScancode,(SDL_Scancode a),(a),return)
+SDL_DYNAPI_PROC(SDL_Scancode,SDL_GetScancodeFromKey,(SDL_Keycode a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetScancodeName,(SDL_Scancode a),(a),return)
+SDL_DYNAPI_PROC(SDL_Scancode,SDL_GetScancodeFromName,(const char *a),(a),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetKeyName,(SDL_Keycode a),(a),return)
+SDL_DYNAPI_PROC(SDL_Keycode,SDL_GetKeyFromName,(const char *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_StartTextInput,(void),(),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_IsTextInputActive,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_StopTextInput,(void),(),)
+SDL_DYNAPI_PROC(void,SDL_SetTextInputRect,(SDL_Rect *a),(a),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasScreenKeyboardSupport,(void),(),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_IsScreenKeyboardShown,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(void*,SDL_LoadObject,(const char *a),(a),return)
+SDL_DYNAPI_PROC(void*,SDL_LoadFunction,(void *a, const char *b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_UnloadObject,(void *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_LogSetAllPriority,(SDL_LogPriority a),(a),)
+SDL_DYNAPI_PROC(void,SDL_LogSetPriority,(int a, SDL_LogPriority b),(a,b),)
+SDL_DYNAPI_PROC(SDL_LogPriority,SDL_LogGetPriority,(int a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_LogResetPriorities,(void),(),)
+SDL_DYNAPI_PROC(void,SDL_LogMessageV,(int a, SDL_LogPriority b, const char *c, va_list d),(a,b,c,d),)
+SDL_DYNAPI_PROC(void,SDL_LogGetOutputFunction,(SDL_LogOutputFunction *a, void **b),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_LogSetOutputFunction,(SDL_LogOutputFunction a, void *b),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_SetMainReady,(void),(),)
+SDL_DYNAPI_PROC(int,SDL_ShowMessageBox,(const SDL_MessageBoxData *a, int *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_ShowSimpleMessageBox,(Uint32 a, const char *b, const char *c, SDL_Window *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(SDL_Window*,SDL_GetMouseFocus,(void),(),return)
+SDL_DYNAPI_PROC(Uint32,SDL_GetMouseState,(int *a, int *b),(a,b),return)
+SDL_DYNAPI_PROC(Uint32,SDL_GetRelativeMouseState,(int *a, int *b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_WarpMouseInWindow,(SDL_Window *a, int b, int c),(a,b,c),)
+SDL_DYNAPI_PROC(int,SDL_SetRelativeMouseMode,(SDL_bool a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_GetRelativeMouseMode,(void),(),return)
+SDL_DYNAPI_PROC(SDL_Cursor*,SDL_CreateCursor,(const Uint8 *a, const Uint8 *b, int c, int d, int e, int f),(a,b,c,d,e,f),return)
+SDL_DYNAPI_PROC(SDL_Cursor*,SDL_CreateColorCursor,(SDL_Surface *a, int b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(SDL_Cursor*,SDL_CreateSystemCursor,(SDL_SystemCursor a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_SetCursor,(SDL_Cursor *a),(a),)
+SDL_DYNAPI_PROC(SDL_Cursor*,SDL_GetCursor,(void),(),return)
+SDL_DYNAPI_PROC(SDL_Cursor*,SDL_GetDefaultCursor,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_FreeCursor,(SDL_Cursor *a),(a),)
+SDL_DYNAPI_PROC(int,SDL_ShowCursor,(int a),(a),return)
+SDL_DYNAPI_PROC(SDL_mutex*,SDL_CreateMutex,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_LockMutex,(SDL_mutex *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_TryLockMutex,(SDL_mutex *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_UnlockMutex,(SDL_mutex *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_DestroyMutex,(SDL_mutex *a),(a),)
+SDL_DYNAPI_PROC(SDL_sem*,SDL_CreateSemaphore,(Uint32 a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_DestroySemaphore,(SDL_sem *a),(a),)
+SDL_DYNAPI_PROC(int,SDL_SemWait,(SDL_sem *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SemTryWait,(SDL_sem *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SemWaitTimeout,(SDL_sem *a, Uint32 b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_SemPost,(SDL_sem *a),(a),return)
+SDL_DYNAPI_PROC(Uint32,SDL_SemValue,(SDL_sem *a),(a),return)
+SDL_DYNAPI_PROC(SDL_cond*,SDL_CreateCond,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_DestroyCond,(SDL_cond *a),(a),)
+SDL_DYNAPI_PROC(int,SDL_CondSignal,(SDL_cond *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_CondBroadcast,(SDL_cond *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_CondWait,(SDL_cond *a, SDL_mutex *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_CondWaitTimeout,(SDL_cond *a, SDL_mutex *b, Uint32 c),(a,b,c),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetPixelFormatName,(Uint32 a),(a),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_PixelFormatEnumToMasks,(Uint32 a, int *b, Uint32 *c, Uint32 *d, Uint32 *e, Uint32 *f),(a,b,c,d,e,f),return)
+SDL_DYNAPI_PROC(Uint32,SDL_MasksToPixelFormatEnum,(int a, Uint32 b, Uint32 c, Uint32 d, Uint32 e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(SDL_PixelFormat*,SDL_AllocFormat,(Uint32 a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_FreeFormat,(SDL_PixelFormat *a),(a),)
+SDL_DYNAPI_PROC(SDL_Palette*,SDL_AllocPalette,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SetPixelFormatPalette,(SDL_PixelFormat *a, SDL_Palette *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_SetPaletteColors,(SDL_Palette *a, const SDL_Color *b, int c, int d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(void,SDL_FreePalette,(SDL_Palette *a),(a),)
+SDL_DYNAPI_PROC(Uint32,SDL_MapRGB,(const SDL_PixelFormat *a, Uint8 b, Uint8 c, Uint8 d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(Uint32,SDL_MapRGBA,(const SDL_PixelFormat *a, Uint8 b, Uint8 c, Uint8 d, Uint8 e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(void,SDL_GetRGB,(Uint32 a, const SDL_PixelFormat *b, Uint8 *c, Uint8 *d, Uint8 *e),(a,b,c,d,e),)
+SDL_DYNAPI_PROC(void,SDL_GetRGBA,(Uint32 a, const SDL_PixelFormat *b, Uint8 *c, Uint8 *d, Uint8 *e, Uint8 *f),(a,b,c,d,e,f),)
+SDL_DYNAPI_PROC(void,SDL_CalculateGammaRamp,(float a, Uint16 *b),(a,b),)
+SDL_DYNAPI_PROC(const char*,SDL_GetPlatform,(void),(),return)
+SDL_DYNAPI_PROC(SDL_PowerState,SDL_GetPowerInfo,(int *a, int *b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasIntersection,(const SDL_Rect *a, const SDL_Rect *b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_IntersectRect,(const SDL_Rect *a, const SDL_Rect *b, SDL_Rect *c),(a,b,c),return)
+SDL_DYNAPI_PROC(void,SDL_UnionRect,(const SDL_Rect *a, const SDL_Rect *b, SDL_Rect *c),(a,b,c),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_EnclosePoints,(const SDL_Point *a, int b, const SDL_Rect *c, SDL_Rect *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_IntersectRectAndLine,(const SDL_Rect *a, int *b, int *c, int *d, int *e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(int,SDL_GetNumRenderDrivers,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_GetRenderDriverInfo,(int a, SDL_RendererInfo *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_CreateWindowAndRenderer,(int a, int b, Uint32 c, SDL_Window **d, SDL_Renderer **e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(SDL_Renderer*,SDL_CreateRenderer,(SDL_Window *a, int b, Uint32 c),(a,b,c),return)
+SDL_DYNAPI_PROC(SDL_Renderer*,SDL_CreateSoftwareRenderer,(SDL_Surface *a),(a),return)
+SDL_DYNAPI_PROC(SDL_Renderer*,SDL_GetRenderer,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GetRendererInfo,(SDL_Renderer *a, SDL_RendererInfo *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetRendererOutputSize,(SDL_Renderer *a, int *b, int *c),(a,b,c),return)
+SDL_DYNAPI_PROC(SDL_Texture*,SDL_CreateTexture,(SDL_Renderer *a, Uint32 b, int c, int d, int e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(SDL_Texture*,SDL_CreateTextureFromSurface,(SDL_Renderer *a, SDL_Surface *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_QueryTexture,(SDL_Texture *a, Uint32 *b, int *c, int *d, int *e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(int,SDL_SetTextureColorMod,(SDL_Texture *a, Uint8 b, Uint8 c, Uint8 d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_GetTextureColorMod,(SDL_Texture *a, Uint8 *b, Uint8 *c, Uint8 *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_SetTextureAlphaMod,(SDL_Texture *a, Uint8 b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetTextureAlphaMod,(SDL_Texture *a, Uint8 *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_SetTextureBlendMode,(SDL_Texture *a, SDL_BlendMode b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetTextureBlendMode,(SDL_Texture *a, SDL_BlendMode *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_UpdateTexture,(SDL_Texture *a, const SDL_Rect *b, const void *c, int d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_UpdateYUVTexture,(SDL_Texture *a, const SDL_Rect *b, const Uint8 *c, int d, const Uint8 *e, int f, const Uint8 *g, int h),(a,b,c,d,e,f,g,h),return)
+SDL_DYNAPI_PROC(int,SDL_LockTexture,(SDL_Texture *a, const SDL_Rect *b, void **c, int *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(void,SDL_UnlockTexture,(SDL_Texture *a),(a),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_RenderTargetSupported,(SDL_Renderer *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SetRenderTarget,(SDL_Renderer *a, SDL_Texture *b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_Texture*,SDL_GetRenderTarget,(SDL_Renderer *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_RenderSetLogicalSize,(SDL_Renderer *a, int b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(void,SDL_RenderGetLogicalSize,(SDL_Renderer *a, int *b, int *c),(a,b,c),)
+SDL_DYNAPI_PROC(int,SDL_RenderSetViewport,(SDL_Renderer *a, const SDL_Rect *b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_RenderGetViewport,(SDL_Renderer *a, SDL_Rect *b),(a,b),)
+SDL_DYNAPI_PROC(int,SDL_RenderSetClipRect,(SDL_Renderer *a, const SDL_Rect *b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_RenderGetClipRect,(SDL_Renderer *a, SDL_Rect *b),(a,b),)
+SDL_DYNAPI_PROC(int,SDL_RenderSetScale,(SDL_Renderer *a, float b, float c),(a,b,c),return)
+SDL_DYNAPI_PROC(void,SDL_RenderGetScale,(SDL_Renderer *a, float *b, float *c),(a,b,c),)
+SDL_DYNAPI_PROC(int,SDL_SetRenderDrawColor,(SDL_Renderer *a, Uint8 b, Uint8 c, Uint8 d, Uint8 e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(int,SDL_GetRenderDrawColor,(SDL_Renderer *a, Uint8 *b, Uint8 *c, Uint8 *d, Uint8 *e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(int,SDL_SetRenderDrawBlendMode,(SDL_Renderer *a, SDL_BlendMode b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetRenderDrawBlendMode,(SDL_Renderer *a, SDL_BlendMode *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_RenderClear,(SDL_Renderer *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_RenderDrawPoint,(SDL_Renderer *a, int b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_RenderDrawPoints,(SDL_Renderer *a, const SDL_Point *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_RenderDrawLine,(SDL_Renderer *a, int b, int c, int d, int e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(int,SDL_RenderDrawLines,(SDL_Renderer *a, const SDL_Point *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_RenderDrawRect,(SDL_Renderer *a, const SDL_Rect *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_RenderDrawRects,(SDL_Renderer *a, const SDL_Rect *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_RenderFillRect,(SDL_Renderer *a, const SDL_Rect *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_RenderFillRects,(SDL_Renderer *a, const SDL_Rect *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_RenderCopy,(SDL_Renderer *a, SDL_Texture *b, const SDL_Rect *c, const SDL_Rect *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_RenderCopyEx,(SDL_Renderer *a, SDL_Texture *b, const SDL_Rect *c, const SDL_Rect *d, const double e, const SDL_Point *f, const SDL_RendererFlip g),(a,b,c,d,e,f,g),return)
+SDL_DYNAPI_PROC(int,SDL_RenderReadPixels,(SDL_Renderer *a, const SDL_Rect *b, Uint32 c, void *d, int e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(void,SDL_RenderPresent,(SDL_Renderer *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_DestroyTexture,(SDL_Texture *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_DestroyRenderer,(SDL_Renderer *a),(a),)
+SDL_DYNAPI_PROC(int,SDL_GL_BindTexture,(SDL_Texture *a, float *b, float *c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_GL_UnbindTexture,(SDL_Texture *a),(a),return)
+SDL_DYNAPI_PROC(SDL_RWops*,SDL_RWFromFile,(const char *a, const char *b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_RWops*,SDL_RWFromMem,(void *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_RWops*,SDL_RWFromConstMem,(const void *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_RWops*,SDL_AllocRW,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_FreeRW,(SDL_RWops *a),(a),)
+SDL_DYNAPI_PROC(Uint8,SDL_ReadU8,(SDL_RWops *a),(a),return)
+SDL_DYNAPI_PROC(Uint16,SDL_ReadLE16,(SDL_RWops *a),(a),return)
+SDL_DYNAPI_PROC(Uint16,SDL_ReadBE16,(SDL_RWops *a),(a),return)
+SDL_DYNAPI_PROC(Uint32,SDL_ReadLE32,(SDL_RWops *a),(a),return)
+SDL_DYNAPI_PROC(Uint32,SDL_ReadBE32,(SDL_RWops *a),(a),return)
+SDL_DYNAPI_PROC(Uint64,SDL_ReadLE64,(SDL_RWops *a),(a),return)
+SDL_DYNAPI_PROC(Uint64,SDL_ReadBE64,(SDL_RWops *a),(a),return)
+SDL_DYNAPI_PROC(size_t,SDL_WriteU8,(SDL_RWops *a, Uint8 b),(a,b),return)
+SDL_DYNAPI_PROC(size_t,SDL_WriteLE16,(SDL_RWops *a, Uint16 b),(a,b),return)
+SDL_DYNAPI_PROC(size_t,SDL_WriteBE16,(SDL_RWops *a, Uint16 b),(a,b),return)
+SDL_DYNAPI_PROC(size_t,SDL_WriteLE32,(SDL_RWops *a, Uint32 b),(a,b),return)
+SDL_DYNAPI_PROC(size_t,SDL_WriteBE32,(SDL_RWops *a, Uint32 b),(a,b),return)
+SDL_DYNAPI_PROC(size_t,SDL_WriteLE64,(SDL_RWops *a, Uint64 b),(a,b),return)
+SDL_DYNAPI_PROC(size_t,SDL_WriteBE64,(SDL_RWops *a, Uint64 b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_Window*,SDL_CreateShapedWindow,(const char *a, unsigned int b, unsigned int c, unsigned int d, unsigned int e, Uint32 f),(a,b,c,d,e,f),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_IsShapedWindow,(const SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SetWindowShape,(SDL_Window *a, SDL_Surface *b, SDL_WindowShapeMode *c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_GetShapedWindowMode,(SDL_Window *a, SDL_WindowShapeMode *b),(a,b),return)
+SDL_DYNAPI_PROC(void*,SDL_malloc,(size_t a),(a),return)
+SDL_DYNAPI_PROC(void*,SDL_calloc,(size_t a, size_t b),(a,b),return)
+SDL_DYNAPI_PROC(void*,SDL_realloc,(void *a, size_t b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_free,(void *a),(a),)
+SDL_DYNAPI_PROC(char*,SDL_getenv,(const char *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_setenv,(const char *a, const char *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(void,SDL_qsort,(void *a, size_t b, size_t c, int (*d)(const void *, const void *)),(a,b,c,d),)
+SDL_DYNAPI_PROC(int,SDL_abs,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_isdigit,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_isspace,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_toupper,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_tolower,(int a),(a),return)
+SDL_DYNAPI_PROC(void*,SDL_memset,(void *a, int b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(void*,SDL_memcpy,(void *a, const void *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(void*,SDL_memmove,(void *a, const void *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_memcmp,(const void *a, const void *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(size_t,SDL_wcslen,(const wchar_t *a),(a),return)
+SDL_DYNAPI_PROC(size_t,SDL_wcslcpy,(wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(size_t,SDL_wcslcat,(wchar_t *a, const wchar_t *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(size_t,SDL_strlen,(const char *a),(a),return)
+SDL_DYNAPI_PROC(size_t,SDL_strlcpy,(char *a, const char *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(size_t,SDL_utf8strlcpy,(char *a, const char *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(size_t,SDL_strlcat,(char *a, const char *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(char*,SDL_strdup,(const char *a),(a),return)
+SDL_DYNAPI_PROC(char*,SDL_strrev,(char *a),(a),return)
+SDL_DYNAPI_PROC(char*,SDL_strupr,(char *a),(a),return)
+SDL_DYNAPI_PROC(char*,SDL_strlwr,(char *a),(a),return)
+SDL_DYNAPI_PROC(char*,SDL_strchr,(const char *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(char*,SDL_strrchr,(const char *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(char*,SDL_strstr,(const char *a, const char *b),(a,b),return)
+SDL_DYNAPI_PROC(char*,SDL_itoa,(int a, char *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(char*,SDL_uitoa,(unsigned int a, char *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(char*,SDL_ltoa,(long a, char *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(char*,SDL_ultoa,(unsigned long a, char *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(char*,SDL_lltoa,(Sint64 a, char *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(char*,SDL_ulltoa,(Uint64 a, char *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_atoi,(const char *a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_atof,(const char *a),(a),return)
+SDL_DYNAPI_PROC(long,SDL_strtol,(const char *a, char **b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(unsigned long,SDL_strtoul,(const char *a, char **b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(Sint64,SDL_strtoll,(const char *a, char **b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(Uint64,SDL_strtoull,(const char *a, char **b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(double,SDL_strtod,(const char *a, char **b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_strcmp,(const char *a, const char *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_strncmp,(const char *a, const char *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_strcasecmp,(const char *a, const char *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_strncasecmp,(const char *a, const char *b, size_t c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_vsnprintf,(char *a, size_t b, const char *c, va_list d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(double,SDL_acos,(double a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_asin,(double a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_atan,(double a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_atan2,(double a, double b),(a,b),return)
+SDL_DYNAPI_PROC(double,SDL_ceil,(double a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_copysign,(double a, double b),(a,b),return)
+SDL_DYNAPI_PROC(double,SDL_cos,(double a),(a),return)
+SDL_DYNAPI_PROC(float,SDL_cosf,(float a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_fabs,(double a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_floor,(double a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_log,(double a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_pow,(double a, double b),(a,b),return)
+SDL_DYNAPI_PROC(double,SDL_scalbn,(double a, int b),(a,b),return)
+SDL_DYNAPI_PROC(double,SDL_sin,(double a),(a),return)
+SDL_DYNAPI_PROC(float,SDL_sinf,(float a),(a),return)
+SDL_DYNAPI_PROC(double,SDL_sqrt,(double a),(a),return)
+SDL_DYNAPI_PROC(SDL_iconv_t,SDL_iconv_open,(const char *a, const char *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_iconv_close,(SDL_iconv_t a),(a),return)
+SDL_DYNAPI_PROC(size_t,SDL_iconv,(SDL_iconv_t a, const char **b, size_t *c, char **d, size_t *e),(a,b,c,d,e),return)
+SDL_DYNAPI_PROC(char*,SDL_iconv_string,(const char *a, const char *b, const char *c, size_t d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(SDL_Surface*,SDL_CreateRGBSurface,(Uint32 a, int b, int c, int d, Uint32 e, Uint32 f, Uint32 g, Uint32 h),(a,b,c,d,e,f,g,h),return)
+SDL_DYNAPI_PROC(SDL_Surface*,SDL_CreateRGBSurfaceFrom,(void *a, int b, int c, int d, int e, Uint32 f, Uint32 g, Uint32 h, Uint32 i),(a,b,c,d,e,f,g,h,i),return)
+SDL_DYNAPI_PROC(void,SDL_FreeSurface,(SDL_Surface *a),(a),)
+SDL_DYNAPI_PROC(int,SDL_SetSurfacePalette,(SDL_Surface *a, SDL_Palette *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_LockSurface,(SDL_Surface *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_UnlockSurface,(SDL_Surface *a),(a),)
+SDL_DYNAPI_PROC(SDL_Surface*,SDL_LoadBMP_RW,(SDL_RWops *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_SaveBMP_RW,(SDL_Surface *a, SDL_RWops *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_SetSurfaceRLE,(SDL_Surface *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_SetColorKey,(SDL_Surface *a, int b, Uint32 c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_GetColorKey,(SDL_Surface *a, Uint32 *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_SetSurfaceColorMod,(SDL_Surface *a, Uint8 b, Uint8 c, Uint8 d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_GetSurfaceColorMod,(SDL_Surface *a, Uint8 *b, Uint8 *c, Uint8 *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_SetSurfaceAlphaMod,(SDL_Surface *a, Uint8 b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetSurfaceAlphaMod,(SDL_Surface *a, Uint8 *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_SetSurfaceBlendMode,(SDL_Surface *a, SDL_BlendMode b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetSurfaceBlendMode,(SDL_Surface *a, SDL_BlendMode *b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_SetClipRect,(SDL_Surface *a, const SDL_Rect *b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_GetClipRect,(SDL_Surface *a, SDL_Rect *b),(a,b),)
+SDL_DYNAPI_PROC(SDL_Surface*,SDL_ConvertSurface,(SDL_Surface *a, const SDL_PixelFormat *b, Uint32 c),(a,b,c),return)
+SDL_DYNAPI_PROC(SDL_Surface*,SDL_ConvertSurfaceFormat,(SDL_Surface *a, Uint32 b, Uint32 c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_ConvertPixels,(int a, int b, Uint32 c, const void *d, int e, Uint32 f, void *g, int h),(a,b,c,d,e,f,g,h),return)
+SDL_DYNAPI_PROC(int,SDL_FillRect,(SDL_Surface *a, const SDL_Rect *b, Uint32 c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_FillRects,(SDL_Surface *a, const SDL_Rect *b, int c, Uint32 d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_UpperBlit,(SDL_Surface *a, const SDL_Rect *b, SDL_Surface *c, SDL_Rect *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_LowerBlit,(SDL_Surface *a, SDL_Rect *b, SDL_Surface *c, SDL_Rect *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_SoftStretch,(SDL_Surface *a, const SDL_Rect *b, SDL_Surface *c, const SDL_Rect *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_UpperBlitScaled,(SDL_Surface *a, const SDL_Rect *b, SDL_Surface *c, SDL_Rect *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_LowerBlitScaled,(SDL_Surface *a, SDL_Rect *b, SDL_Surface *c, SDL_Rect *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_GetWindowWMInfo,(SDL_Window *a, SDL_SysWMinfo *b),(a,b),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetThreadName,(SDL_Thread *a),(a),return)
+SDL_DYNAPI_PROC(SDL_threadID,SDL_ThreadID,(void),(),return)
+SDL_DYNAPI_PROC(SDL_threadID,SDL_GetThreadID,(SDL_Thread *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SetThreadPriority,(SDL_ThreadPriority a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_WaitThread,(SDL_Thread *a, int *b),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_DetachThread,(SDL_Thread *a),(a),)
+SDL_DYNAPI_PROC(SDL_TLSID,SDL_TLSCreate,(void),(),return)
+SDL_DYNAPI_PROC(void*,SDL_TLSGet,(SDL_TLSID a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_TLSSet,(SDL_TLSID a, const void *b, void (*c)(void*)),(a,b,c),return)
+SDL_DYNAPI_PROC(Uint32,SDL_GetTicks,(void),(),return)
+SDL_DYNAPI_PROC(Uint64,SDL_GetPerformanceCounter,(void),(),return)
+SDL_DYNAPI_PROC(Uint64,SDL_GetPerformanceFrequency,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_Delay,(Uint32 a),(a),)
+SDL_DYNAPI_PROC(SDL_TimerID,SDL_AddTimer,(Uint32 a, SDL_TimerCallback b, void *c),(a,b,c),return)
+SDL_DYNAPI_PROC(SDL_bool,SDL_RemoveTimer,(SDL_TimerID a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GetNumTouchDevices,(void),(),return)
+SDL_DYNAPI_PROC(SDL_TouchID,SDL_GetTouchDevice,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GetNumTouchFingers,(SDL_TouchID a),(a),return)
+SDL_DYNAPI_PROC(SDL_Finger*,SDL_GetTouchFinger,(SDL_TouchID a, int b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_GetVersion,(SDL_version *a),(a),)
+SDL_DYNAPI_PROC(const char*,SDL_GetRevision,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_GetRevisionNumber,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_GetNumVideoDrivers,(void),(),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetVideoDriver,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_VideoInit,(const char *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_VideoQuit,(void),(),)
+SDL_DYNAPI_PROC(const char*,SDL_GetCurrentVideoDriver,(void),(),return)
+SDL_DYNAPI_PROC(int,SDL_GetNumVideoDisplays,(void),(),return)
+SDL_DYNAPI_PROC(const char*,SDL_GetDisplayName,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GetDisplayBounds,(int a, SDL_Rect *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetNumDisplayModes,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GetDisplayMode,(int a, int b, SDL_DisplayMode *c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_GetDesktopDisplayMode,(int a, SDL_DisplayMode *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetCurrentDisplayMode,(int a, SDL_DisplayMode *b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_DisplayMode*,SDL_GetClosestDisplayMode,(int a, const SDL_DisplayMode *b, SDL_DisplayMode *c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_GetWindowDisplayIndex,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SetWindowDisplayMode,(SDL_Window *a, const SDL_DisplayMode *b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GetWindowDisplayMode,(SDL_Window *a, SDL_DisplayMode *b),(a,b),return)
+SDL_DYNAPI_PROC(Uint32,SDL_GetWindowPixelFormat,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(SDL_Window*,SDL_CreateWindow,(const char *a, int b, int c, int d, int e, Uint32 f),(a,b,c,d,e,f),return)
+SDL_DYNAPI_PROC(SDL_Window*,SDL_CreateWindowFrom,(const void *a),(a),return)
+SDL_DYNAPI_PROC(Uint32,SDL_GetWindowID,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(SDL_Window*,SDL_GetWindowFromID,(Uint32 a),(a),return)
+SDL_DYNAPI_PROC(Uint32,SDL_GetWindowFlags,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_SetWindowTitle,(SDL_Window *a, const char *b),(a,b),)
+SDL_DYNAPI_PROC(const char*,SDL_GetWindowTitle,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_SetWindowIcon,(SDL_Window *a, SDL_Surface *b),(a,b),)
+SDL_DYNAPI_PROC(void*,SDL_SetWindowData,(SDL_Window *a, const char *b, void *c),(a,b,c),return)
+SDL_DYNAPI_PROC(void*,SDL_GetWindowData,(SDL_Window *a, const char *b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_SetWindowPosition,(SDL_Window *a, int b, int c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_GetWindowPosition,(SDL_Window *a, int *b, int *c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_SetWindowSize,(SDL_Window *a, int b, int c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_GetWindowSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_SetWindowMinimumSize,(SDL_Window *a, int b, int c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_GetWindowMinimumSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_SetWindowMaximumSize,(SDL_Window *a, int b, int c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_GetWindowMaximumSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
+SDL_DYNAPI_PROC(void,SDL_SetWindowBordered,(SDL_Window *a, SDL_bool b),(a,b),)
+SDL_DYNAPI_PROC(void,SDL_ShowWindow,(SDL_Window *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_HideWindow,(SDL_Window *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_RaiseWindow,(SDL_Window *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_MaximizeWindow,(SDL_Window *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_MinimizeWindow,(SDL_Window *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_RestoreWindow,(SDL_Window *a),(a),)
+SDL_DYNAPI_PROC(int,SDL_SetWindowFullscreen,(SDL_Window *a, Uint32 b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_Surface*,SDL_GetWindowSurface,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_UpdateWindowSurface,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_UpdateWindowSurfaceRects,(SDL_Window *a, const SDL_Rect *b, int c),(a,b,c),return)
+SDL_DYNAPI_PROC(void,SDL_SetWindowGrab,(SDL_Window *a, SDL_bool b),(a,b),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_GetWindowGrab,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SetWindowBrightness,(SDL_Window *a, float b),(a,b),return)
+SDL_DYNAPI_PROC(float,SDL_GetWindowBrightness,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_SetWindowGammaRamp,(SDL_Window *a, const Uint16 *b, const Uint16 *c, const Uint16 *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(int,SDL_GetWindowGammaRamp,(SDL_Window *a, Uint16 *b, Uint16 *c, Uint16 *d),(a,b,c,d),return)
+SDL_DYNAPI_PROC(void,SDL_DestroyWindow,(SDL_Window *a),(a),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_IsScreenSaverEnabled,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_EnableScreenSaver,(void),(),)
+SDL_DYNAPI_PROC(void,SDL_DisableScreenSaver,(void),(),)
+SDL_DYNAPI_PROC(int,SDL_GL_LoadLibrary,(const char *a),(a),return)
+SDL_DYNAPI_PROC(void*,SDL_GL_GetProcAddress,(const char *a),(a),return)
+SDL_DYNAPI_PROC(void,SDL_GL_UnloadLibrary,(void),(),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_GL_ExtensionSupported,(const char *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GL_SetAttribute,(SDL_GLattr a, int b),(a,b),return)
+SDL_DYNAPI_PROC(int,SDL_GL_GetAttribute,(SDL_GLattr a, int *b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_GLContext,SDL_GL_CreateContext,(SDL_Window *a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GL_MakeCurrent,(SDL_Window *a, SDL_GLContext b),(a,b),return)
+SDL_DYNAPI_PROC(SDL_Window*,SDL_GL_GetCurrentWindow,(void),(),return)
+SDL_DYNAPI_PROC(SDL_GLContext,SDL_GL_GetCurrentContext,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_GL_GetDrawableSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
+SDL_DYNAPI_PROC(int,SDL_GL_SetSwapInterval,(int a),(a),return)
+SDL_DYNAPI_PROC(int,SDL_GL_GetSwapInterval,(void),(),return)
+SDL_DYNAPI_PROC(void,SDL_GL_SwapWindow,(SDL_Window *a),(a),)
+SDL_DYNAPI_PROC(void,SDL_GL_DeleteContext,(SDL_GLContext a),(a),)
+SDL_DYNAPI_PROC(int,SDL_vsscanf,(const char *a, const char *b, va_list c),(a,b,c),return)
+SDL_DYNAPI_PROC(int,SDL_GameControllerAddMappingsFromRW,(SDL_RWops *a, int b),(a,b),return)
+SDL_DYNAPI_PROC(void,SDL_GL_ResetAttributes,(void),(),)
+SDL_DYNAPI_PROC(SDL_bool,SDL_HasAVX,(void),(),return)
+SDL_DYNAPI_PROC(SDL_AssertionHandler,SDL_GetDefaultAssertionHandler,(void),(),return)
+SDL_DYNAPI_PROC(SDL_AssertionHandler,SDL_GetAssertionHandler,(void **a),(a),return)
+#ifdef __WIN32__
+SDL_DYNAPI_PROC(void,SDL_DXGIGetOutputInfo,(int a,int *b, int *c),(a,b,c),)
+#endif
diff --git a/Source/3rd Party/sdl/src/dynapi/gendynapi.pl b/Source/3rd Party/sdl/src/dynapi/gendynapi.pl
new file mode 100644
index 000000000..091a08c7a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/dynapi/gendynapi.pl	
@@ -0,0 +1,141 @@
+#!/usr/bin/perl -w
+
+#  Simple DirectMedia Layer
+#  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+#
+#  This software is provided 'as-is', without any express or implied
+#  warranty.  In no event will the authors be held liable for any damages
+#  arising from the use of this software.
+#
+#  Permission is granted to anyone to use this software for any purpose,
+#  including commercial applications, and to alter it and redistribute it
+#  freely, subject to the following restrictions:
+#
+#  1. The origin of this software must not be misrepresented; you must not
+#     claim that you wrote the original software. If you use this software
+#     in a product, an acknowledgment in the product documentation would be
+#     appreciated but is not required.
+#  2. Altered source versions must be plainly marked as such, and must not be
+#     misrepresented as being the original software.
+#  3. This notice may not be removed or altered from any source distribution.
+
+# WHAT IS THIS?
+#  When you add a public API to SDL, please run this script, make sure the
+#  output looks sane (hg diff, it adds to existing files), and commit it.
+#  It keeps the dynamic API jump table operating correctly.
+
+# If you wanted this to be readable, you shouldn't have used perl.
+
+use warnings;
+use strict;
+use File::Basename;
+
+chdir(dirname(__FILE__) . '/../..');
+my $sdl_dynapi_procs_h = "src/dynapi/SDL_dynapi_procs.h";
+my $sdl_dynapi_overrides_h = "src/dynapi/SDL_dynapi_overrides.h";
+
+my %existing = ();
+if (-f $sdl_dynapi_procs_h) {
+    open(SDL_DYNAPI_PROCS_H, '<', $sdl_dynapi_procs_h) or die("Can't open $sdl_dynapi_procs_h: $!\n");
+    while (<SDL_DYNAPI_PROCS_H>) {
+        if (/\ASDL_DYNAPI_PROC\(.*?,(.*?),/) {
+            $existing{$1} = 1;
+        }
+    }
+    close(SDL_DYNAPI_PROCS_H)
+}
+
+open(SDL_DYNAPI_PROCS_H, '>>', $sdl_dynapi_procs_h) or die("Can't open $sdl_dynapi_procs_h: $!\n");
+open(SDL_DYNAPI_OVERRIDES_H, '>>', $sdl_dynapi_overrides_h) or die("Can't open $sdl_dynapi_overrides_h: $!\n");
+
+opendir(HEADERS, 'include') or die("Can't open include dir: $!\n");
+while (readdir(HEADERS)) {
+    next if not /\.h\Z/;
+    my $header = "include/$_";
+    open(HEADER, '<', $header) or die("Can't open $header: $!\n");
+    while (<HEADER>) {
+        chomp;
+        next if not /\A\s*extern\s+DECLSPEC/;
+        my $decl = "$_ ";
+        if (not $decl =~ /\)\s*;/) {
+            while (<HEADER>) {
+                chomp;
+                s/\A\s+//;
+                s/\s+\Z//;
+                $decl .= "$_ ";
+                last if /\)\s*;/;
+            }
+        }
+
+        $decl =~ s/\s+\Z//;
+        #print("DECL: [$decl]\n");
+
+        if ($decl =~ /\A\s*extern\s+DECLSPEC\s+(const\s+|)(unsigned\s+|)(.*?)\s*(\*?)\s*SDLCALL\s+(.*?)\s*\((.*?)\);/) {
+            my $rc = "$1$2$3$4";
+            my $fn = $5;
+
+            next if $existing{$fn};   # already slotted into the jump table.
+
+            my @params = split(',', $6);
+
+            #print("rc == '$rc', fn == '$fn', params == '$params'\n");
+
+            my $retstr = ($rc eq 'void') ? '' : 'return';
+            my $paramstr = '(';
+            my $argstr = '(';
+            my $i = 0;
+            foreach (@params) {
+                my $str = $_;
+                $str =~ s/\A\s+//;
+                $str =~ s/\s+\Z//;
+                #print("1PARAM: $str\n");
+                if ($str eq 'void') {
+                    $paramstr .= 'void';
+                } elsif ($str eq '...') {
+                    if ($i > 0) {
+                        $paramstr .= ', ';
+                    }
+                    $paramstr .= $str;
+                } elsif ($str =~ /\A\s*((const\s+|)(unsigned\s+|)([a-zA-Z0-9_]*)\s*([\*\s]*))\s*(.*?)\Z/) {
+                    #print("PARSED: [$1], [$2], [$3], [$4], [$5]\n");
+                    my $type = $1;
+                    my $var = $6;
+                    $type =~ s/\A\s+//;
+                    $type =~ s/\s+\Z//;
+                    $var =~ s/\A\s+//;
+                    $var =~ s/\s+\Z//;
+                    $type =~ s/\s*\*\Z/*/g;
+                    $type =~ s/\s*(\*+)\Z/ $1/;
+                    #print("SPLIT: ($type, $var)\n");
+                    my $name = chr(ord('a') + $i);
+                    if ($i > 0) {
+                        $paramstr .= ', ';
+                        $argstr .= ',';
+                    }
+                    my $spc = ($type =~ /\*\Z/) ? '' : ' ';
+                    $paramstr .= "$type$spc$name";
+                    $argstr .= "$name";
+                }
+                $i++;
+            }
+
+            $paramstr = '(void' if ($i == 0);  # Just to make this consistent.
+
+            $paramstr .= ')';
+            $argstr .= ')';
+
+            print("NEW: $decl\n");
+            print SDL_DYNAPI_PROCS_H "SDL_DYNAPI_PROC($rc,$fn,$paramstr,$argstr,$retstr)\n";
+            print SDL_DYNAPI_OVERRIDES_H "#define $fn ${fn}_REAL\n";
+        } else {
+            print("Failed to parse decl [$decl]!\n");
+        }
+    }
+    close(HEADER);
+}
+closedir(HEADERS);
+
+close(SDL_DYNAPI_PROCS_H);
+close(SDL_DYNAPI_OVERRIDES_H);
+
+# vi: set ts=4 sw=4 expandtab:
diff --git a/Source/3rd Party/sdl/src/events/SDL_clipboardevents.c b/Source/3rd Party/sdl/src/events/SDL_clipboardevents.c
new file mode 100644
index 000000000..3ef7bed26
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_clipboardevents.c	
@@ -0,0 +1,46 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Clipboard event handling code for SDL */
+
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+#include "SDL_clipboardevents_c.h"
+
+
+int
+SDL_SendClipboardUpdate(void)
+{
+    int posted;
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(SDL_CLIPBOARDUPDATE) == SDL_ENABLE) {
+        SDL_Event event;
+        event.type = SDL_CLIPBOARDUPDATE;
+
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    return (posted);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_clipboardevents_c.h b/Source/3rd Party/sdl/src/events/SDL_clipboardevents_c.h
new file mode 100644
index 000000000..c71da2a47
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_clipboardevents_c.h	
@@ -0,0 +1,30 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_clipboardevents_c_h
+#define _SDL_clipboardevents_c_h
+
+extern int SDL_SendClipboardUpdate(void);
+
+#endif /* _SDL_clipboardevents_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_dropevents.c b/Source/3rd Party/sdl/src/events/SDL_dropevents.c
new file mode 100644
index 000000000..4830d14f8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_dropevents.c	
@@ -0,0 +1,46 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Drag and drop event handling code for SDL */
+
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+#include "SDL_dropevents_c.h"
+
+
+int
+SDL_SendDropFile(const char *file)
+{
+    int posted;
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(SDL_DROPFILE) == SDL_ENABLE) {
+        SDL_Event event;
+        event.type = SDL_DROPFILE;
+        event.drop.file = SDL_strdup(file);
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    return (posted);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_dropevents_c.h b/Source/3rd Party/sdl/src/events/SDL_dropevents_c.h
new file mode 100644
index 000000000..cb5e1dc57
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_dropevents_c.h	
@@ -0,0 +1,30 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_dropevents_c_h
+#define _SDL_dropevents_c_h
+
+extern int SDL_SendDropFile(const char *file);
+
+#endif /* _SDL_dropevents_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_events.c b/Source/3rd Party/sdl/src/events/SDL_events.c
new file mode 100644
index 000000000..7a98c3021
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_events.c	
@@ -0,0 +1,651 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* General event handling code for SDL */
+
+#include "SDL.h"
+#include "SDL_events.h"
+#include "SDL_syswm.h"
+#include "SDL_thread.h"
+#include "SDL_events_c.h"
+#include "../timer/SDL_timer_c.h"
+#if !SDL_JOYSTICK_DISABLED
+#include "../joystick/SDL_joystick_c.h"
+#endif
+#include "../video/SDL_sysvideo.h"
+
+/* An arbitrary limit so we don't have unbounded growth */
+#define SDL_MAX_QUEUED_EVENTS   65535
+
+/* Public data -- the event filter */
+SDL_EventFilter SDL_EventOK = NULL;
+void *SDL_EventOKParam;
+
+typedef struct SDL_EventWatcher {
+    SDL_EventFilter callback;
+    void *userdata;
+    struct SDL_EventWatcher *next;
+} SDL_EventWatcher;
+
+static SDL_EventWatcher *SDL_event_watchers = NULL;
+
+typedef struct {
+    Uint32 bits[8];
+} SDL_DisabledEventBlock;
+
+static SDL_DisabledEventBlock *SDL_disabled_events[256];
+static Uint32 SDL_userevents = SDL_USEREVENT;
+
+/* Private data -- event queue */
+typedef struct _SDL_EventEntry
+{
+    SDL_Event event;
+    SDL_SysWMmsg msg;
+    struct _SDL_EventEntry *prev;
+    struct _SDL_EventEntry *next;
+} SDL_EventEntry;
+
+typedef struct _SDL_SysWMEntry
+{
+    SDL_SysWMmsg msg;
+    struct _SDL_SysWMEntry *next;
+} SDL_SysWMEntry;
+
+static struct
+{
+    SDL_mutex *lock;
+    volatile SDL_bool active;
+    volatile int count;
+    SDL_EventEntry *head;
+    SDL_EventEntry *tail;
+    SDL_EventEntry *free;
+    SDL_SysWMEntry *wmmsg_used;
+    SDL_SysWMEntry *wmmsg_free;
+} SDL_EventQ = { NULL, SDL_TRUE };
+
+
+static SDL_INLINE SDL_bool
+SDL_ShouldPollJoystick()
+{
+#if !SDL_JOYSTICK_DISABLED
+    if ((!SDL_disabled_events[SDL_JOYAXISMOTION >> 8] ||
+         SDL_JoystickEventState(SDL_QUERY)) &&
+        SDL_PrivateJoystickNeedsPolling()) {
+        return SDL_TRUE;
+    }
+#endif
+    return SDL_FALSE;
+}
+
+/* Public functions */
+
+void
+SDL_StopEventLoop(void)
+{
+    int i;
+    SDL_EventEntry *entry;
+    SDL_SysWMEntry *wmmsg;
+
+    if (SDL_EventQ.lock) {
+        SDL_LockMutex(SDL_EventQ.lock);
+    }
+
+    SDL_EventQ.active = SDL_FALSE;
+
+    /* Clean out EventQ */
+    for (entry = SDL_EventQ.head; entry; ) {
+        SDL_EventEntry *next = entry->next;
+        SDL_free(entry);
+        entry = next;
+    }
+    for (entry = SDL_EventQ.free; entry; ) {
+        SDL_EventEntry *next = entry->next;
+        SDL_free(entry);
+        entry = next;
+    }
+    for (wmmsg = SDL_EventQ.wmmsg_used; wmmsg; ) {
+        SDL_SysWMEntry *next = wmmsg->next;
+        SDL_free(wmmsg);
+        wmmsg = next;
+    }
+    for (wmmsg = SDL_EventQ.wmmsg_free; wmmsg; ) {
+        SDL_SysWMEntry *next = wmmsg->next;
+        SDL_free(wmmsg);
+        wmmsg = next;
+    }
+    SDL_EventQ.count = 0;
+    SDL_EventQ.head = NULL;
+    SDL_EventQ.tail = NULL;
+    SDL_EventQ.free = NULL;
+    SDL_EventQ.wmmsg_used = NULL;
+    SDL_EventQ.wmmsg_free = NULL;
+
+    /* Clear disabled event state */
+    for (i = 0; i < SDL_arraysize(SDL_disabled_events); ++i) {
+        SDL_free(SDL_disabled_events[i]);
+        SDL_disabled_events[i] = NULL;
+    }
+
+    while (SDL_event_watchers) {
+        SDL_EventWatcher *tmp = SDL_event_watchers;
+        SDL_event_watchers = tmp->next;
+        SDL_free(tmp);
+    }
+    SDL_EventOK = NULL;
+
+    if (SDL_EventQ.lock) {
+        SDL_UnlockMutex(SDL_EventQ.lock);
+        SDL_DestroyMutex(SDL_EventQ.lock);
+        SDL_EventQ.lock = NULL;
+    }
+}
+
+/* This function (and associated calls) may be called more than once */
+int
+SDL_StartEventLoop(void)
+{
+    /* We'll leave the event queue alone, since we might have gotten
+       some important events at launch (like SDL_DROPFILE)
+
+       FIXME: Does this introduce any other bugs with events at startup?
+     */
+
+    /* Create the lock and set ourselves active */
+#if !SDL_THREADS_DISABLED
+    if (!SDL_EventQ.lock) {
+        SDL_EventQ.lock = SDL_CreateMutex();
+    }
+    if (SDL_EventQ.lock == NULL) {
+        return (-1);
+    }
+#endif /* !SDL_THREADS_DISABLED */
+
+    /* Process most event types */
+    SDL_EventState(SDL_TEXTINPUT, SDL_DISABLE);
+    SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE);
+    SDL_EventState(SDL_SYSWMEVENT, SDL_DISABLE);
+
+    SDL_EventQ.active = SDL_TRUE;
+
+    return (0);
+}
+
+
+/* Add an event to the event queue -- called with the queue locked */
+static int
+SDL_AddEvent(SDL_Event * event)
+{
+    SDL_EventEntry *entry;
+
+    if (SDL_EventQ.count >= SDL_MAX_QUEUED_EVENTS) {
+        SDL_SetError("Event queue is full (%d events)", SDL_EventQ.count);
+        return 0;
+    }
+
+    if (SDL_EventQ.free == NULL) {
+        entry = (SDL_EventEntry *)SDL_malloc(sizeof(*entry));
+        if (!entry) {
+            return 0;
+        }
+    } else {
+        entry = SDL_EventQ.free;
+        SDL_EventQ.free = entry->next;
+    }
+
+    entry->event = *event;
+    if (event->type == SDL_SYSWMEVENT) {
+        entry->msg = *event->syswm.msg;
+        entry->event.syswm.msg = &entry->msg;
+    }
+
+    if (SDL_EventQ.tail) {
+        SDL_EventQ.tail->next = entry;
+        entry->prev = SDL_EventQ.tail;
+        SDL_EventQ.tail = entry;
+        entry->next = NULL;
+    } else {
+        SDL_assert(!SDL_EventQ.head);
+        SDL_EventQ.head = entry;
+        SDL_EventQ.tail = entry;
+        entry->prev = NULL;
+        entry->next = NULL;
+    }
+    ++SDL_EventQ.count;
+
+    return 1;
+}
+
+/* Remove an event from the queue -- called with the queue locked */
+static void
+SDL_CutEvent(SDL_EventEntry *entry)
+{
+    if (entry->prev) {
+        entry->prev->next = entry->next;
+    }
+    if (entry->next) {
+        entry->next->prev = entry->prev;
+    }
+
+    if (entry == SDL_EventQ.head) {
+        SDL_assert(entry->prev == NULL);
+        SDL_EventQ.head = entry->next;
+    }
+    if (entry == SDL_EventQ.tail) {
+        SDL_assert(entry->next == NULL);
+        SDL_EventQ.tail = entry->prev;
+    }
+
+    entry->next = SDL_EventQ.free;
+    SDL_EventQ.free = entry;
+    SDL_assert(SDL_EventQ.count > 0);
+    --SDL_EventQ.count;
+}
+
+/* Lock the event queue, take a peep at it, and unlock it */
+int
+SDL_PeepEvents(SDL_Event * events, int numevents, SDL_eventaction action,
+               Uint32 minType, Uint32 maxType)
+{
+    int i, used;
+
+    /* Don't look after we've quit */
+    if (!SDL_EventQ.active) {
+        /* We get a few spurious events at shutdown, so don't warn then */
+        if (action != SDL_ADDEVENT) {
+            SDL_SetError("The event system has been shut down");
+        }
+        return (-1);
+    }
+    /* Lock the event queue */
+    used = 0;
+    if (!SDL_EventQ.lock || SDL_LockMutex(SDL_EventQ.lock) == 0) {
+        if (action == SDL_ADDEVENT) {
+            for (i = 0; i < numevents; ++i) {
+                used += SDL_AddEvent(&events[i]);
+            }
+        } else {
+            SDL_EventEntry *entry, *next;
+            SDL_SysWMEntry *wmmsg, *wmmsg_next;
+            SDL_Event tmpevent;
+            Uint32 type;
+
+            /* If 'events' is NULL, just see if they exist */
+            if (events == NULL) {
+                action = SDL_PEEKEVENT;
+                numevents = 1;
+                events = &tmpevent;
+            }
+
+            /* Clean out any used wmmsg data
+               FIXME: Do we want to retain the data for some period of time?
+             */
+            for (wmmsg = SDL_EventQ.wmmsg_used; wmmsg; wmmsg = wmmsg_next) {
+                wmmsg_next = wmmsg->next;
+                wmmsg->next = SDL_EventQ.wmmsg_free;
+                SDL_EventQ.wmmsg_free = wmmsg;
+            }
+            SDL_EventQ.wmmsg_used = NULL;
+
+            for (entry = SDL_EventQ.head; entry && used < numevents; entry = next) {
+                next = entry->next;
+                type = entry->event.type;
+                if (minType <= type && type <= maxType) {
+                    events[used] = entry->event;
+                    if (entry->event.type == SDL_SYSWMEVENT) {
+                        /* We need to copy the wmmsg somewhere safe.
+                           For now we'll guarantee it's valid at least until
+                           the next call to SDL_PeepEvents()
+                         */
+                        SDL_SysWMEntry *wmmsg;
+                        if (SDL_EventQ.wmmsg_free) {
+                            wmmsg = SDL_EventQ.wmmsg_free;
+                            SDL_EventQ.wmmsg_free = wmmsg->next;
+                        } else {
+                            wmmsg = (SDL_SysWMEntry *)SDL_malloc(sizeof(*wmmsg));
+                        }
+                        wmmsg->msg = *entry->event.syswm.msg;
+                        wmmsg->next = SDL_EventQ.wmmsg_used;
+                        SDL_EventQ.wmmsg_used = wmmsg;
+                        events[used].syswm.msg = &wmmsg->msg;
+                    }
+                    ++used;
+
+                    if (action == SDL_GETEVENT) {
+                        SDL_CutEvent(entry);
+                    }
+                }
+            }
+        }
+        SDL_UnlockMutex(SDL_EventQ.lock);
+    } else {
+        return SDL_SetError("Couldn't lock event queue");
+    }
+    return (used);
+}
+
+SDL_bool
+SDL_HasEvent(Uint32 type)
+{
+    return (SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, type, type) > 0);
+}
+
+SDL_bool
+SDL_HasEvents(Uint32 minType, Uint32 maxType)
+{
+    return (SDL_PeepEvents(NULL, 0, SDL_PEEKEVENT, minType, maxType) > 0);
+}
+
+void
+SDL_FlushEvent(Uint32 type)
+{
+    SDL_FlushEvents(type, type);
+}
+
+void
+SDL_FlushEvents(Uint32 minType, Uint32 maxType)
+{
+    /* Don't look after we've quit */
+    if (!SDL_EventQ.active) {
+        return;
+    }
+
+    /* Make sure the events are current */
+#if 0
+    /* Actually, we can't do this since we might be flushing while processing
+       a resize event, and calling this might trigger further resize events.
+    */
+    SDL_PumpEvents();
+#endif
+
+    /* Lock the event queue */
+    if (SDL_LockMutex(SDL_EventQ.lock) == 0) {
+        SDL_EventEntry *entry, *next;
+        Uint32 type;
+        for (entry = SDL_EventQ.head; entry; entry = next) {
+            next = entry->next;
+            type = entry->event.type;
+            if (minType <= type && type <= maxType) {
+                SDL_CutEvent(entry);
+            }
+        }
+        SDL_UnlockMutex(SDL_EventQ.lock);
+    }
+}
+
+/* Run the system dependent event loops */
+void
+SDL_PumpEvents(void)
+{
+    SDL_VideoDevice *_this = SDL_GetVideoDevice();
+
+    /* Get events from the video subsystem */
+    if (_this) {
+        _this->PumpEvents(_this);
+    }
+#if !SDL_JOYSTICK_DISABLED
+    /* Check for joystick state change */
+    if (SDL_ShouldPollJoystick()) {
+        SDL_JoystickUpdate();
+    }
+#endif
+}
+
+/* Public functions */
+
+int
+SDL_PollEvent(SDL_Event * event)
+{
+    return SDL_WaitEventTimeout(event, 0);
+}
+
+int
+SDL_WaitEvent(SDL_Event * event)
+{
+    return SDL_WaitEventTimeout(event, -1);
+}
+
+int
+SDL_WaitEventTimeout(SDL_Event * event, int timeout)
+{
+    Uint32 expiration = 0;
+
+    if (timeout > 0)
+        expiration = SDL_GetTicks() + timeout;
+
+    for (;;) {
+        SDL_PumpEvents();
+        switch (SDL_PeepEvents(event, 1, SDL_GETEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT)) {
+        case -1:
+            return 0;
+        case 1:
+            return 1;
+        case 0:
+            if (timeout == 0) {
+                /* Polling and no events, just return */
+                return 0;
+            }
+            if (timeout > 0 && SDL_TICKS_PASSED(SDL_GetTicks(), expiration)) {
+                /* Timeout expired and no events */
+                return 0;
+            }
+            SDL_Delay(10);
+            break;
+        }
+    }
+}
+
+int
+SDL_PushEvent(SDL_Event * event)
+{
+    SDL_EventWatcher *curr;
+
+    event->common.timestamp = SDL_GetTicks();
+
+    if (SDL_EventOK && !SDL_EventOK(SDL_EventOKParam, event)) {
+        return 0;
+    }
+
+    for (curr = SDL_event_watchers; curr; curr = curr->next) {
+        curr->callback(curr->userdata, event);
+    }
+
+    if (SDL_PeepEvents(event, 1, SDL_ADDEVENT, 0, 0) <= 0) {
+        return -1;
+    }
+
+    SDL_GestureProcessEvent(event);
+
+    return 1;
+}
+
+void
+SDL_SetEventFilter(SDL_EventFilter filter, void *userdata)
+{
+    /* Set filter and discard pending events */
+    SDL_EventOK = NULL;
+    SDL_FlushEvents(SDL_FIRSTEVENT, SDL_LASTEVENT);
+    SDL_EventOKParam = userdata;
+    SDL_EventOK = filter;
+}
+
+SDL_bool
+SDL_GetEventFilter(SDL_EventFilter * filter, void **userdata)
+{
+    if (filter) {
+        *filter = SDL_EventOK;
+    }
+    if (userdata) {
+        *userdata = SDL_EventOKParam;
+    }
+    return SDL_EventOK ? SDL_TRUE : SDL_FALSE;
+}
+
+/* FIXME: This is not thread-safe yet */
+void
+SDL_AddEventWatch(SDL_EventFilter filter, void *userdata)
+{
+    SDL_EventWatcher *watcher, *tail;
+
+    watcher = (SDL_EventWatcher *)SDL_malloc(sizeof(*watcher));
+    if (!watcher) {
+        /* Uh oh... */
+        return;
+    }
+
+    /* create the watcher */
+    watcher->callback = filter;
+    watcher->userdata = userdata;
+    watcher->next = NULL;
+
+    /* add the watcher to the end of the list */
+    if (SDL_event_watchers) {
+        for (tail = SDL_event_watchers; tail->next; tail = tail->next) {
+            continue;
+        }
+        tail->next = watcher;
+    } else {
+        SDL_event_watchers = watcher;
+    }
+}
+
+/* FIXME: This is not thread-safe yet */
+void
+SDL_DelEventWatch(SDL_EventFilter filter, void *userdata)
+{
+    SDL_EventWatcher *prev = NULL;
+    SDL_EventWatcher *curr;
+
+    for (curr = SDL_event_watchers; curr; prev = curr, curr = curr->next) {
+        if (curr->callback == filter && curr->userdata == userdata) {
+            if (prev) {
+                prev->next = curr->next;
+            } else {
+                SDL_event_watchers = curr->next;
+            }
+            SDL_free(curr);
+            break;
+        }
+    }
+}
+
+void
+SDL_FilterEvents(SDL_EventFilter filter, void *userdata)
+{
+    if (SDL_LockMutex(SDL_EventQ.lock) == 0) {
+        SDL_EventEntry *entry, *next;
+        for (entry = SDL_EventQ.head; entry; entry = next) {
+            next = entry->next;
+            if (!filter(userdata, &entry->event)) {
+                SDL_CutEvent(entry);
+            }
+        }
+        SDL_UnlockMutex(SDL_EventQ.lock);
+    }
+}
+
+Uint8
+SDL_EventState(Uint32 type, int state)
+{
+    Uint8 current_state;
+    Uint8 hi = ((type >> 8) & 0xff);
+    Uint8 lo = (type & 0xff);
+
+    if (SDL_disabled_events[hi] &&
+        (SDL_disabled_events[hi]->bits[lo/32] & (1 << (lo&31)))) {
+        current_state = SDL_DISABLE;
+    } else {
+        current_state = SDL_ENABLE;
+    }
+
+    if (state != current_state)
+    {
+        switch (state) {
+        case SDL_DISABLE:
+            /* Disable this event type and discard pending events */
+            if (!SDL_disabled_events[hi]) {
+                SDL_disabled_events[hi] = (SDL_DisabledEventBlock*) SDL_calloc(1, sizeof(SDL_DisabledEventBlock));
+                if (!SDL_disabled_events[hi]) {
+                    /* Out of memory, nothing we can do... */
+                    break;
+                }
+            }
+            SDL_disabled_events[hi]->bits[lo/32] |= (1 << (lo&31));
+            SDL_FlushEvent(type);
+            break;
+        case SDL_ENABLE:
+            SDL_disabled_events[hi]->bits[lo/32] &= ~(1 << (lo&31));
+            break;
+        default:
+            /* Querying state... */
+            break;
+        }
+    }
+
+    return current_state;
+}
+
+Uint32
+SDL_RegisterEvents(int numevents)
+{
+    Uint32 event_base;
+
+    if ((numevents > 0) && (SDL_userevents+numevents <= SDL_LASTEVENT)) {
+        event_base = SDL_userevents;
+        SDL_userevents += numevents;
+    } else {
+        event_base = (Uint32)-1;
+    }
+    return event_base;
+}
+
+int
+SDL_SendAppEvent(SDL_EventType eventType)
+{
+    int posted;
+
+    posted = 0;
+    if (SDL_GetEventState(eventType) == SDL_ENABLE) {
+        SDL_Event event;
+        event.type = eventType;
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    return (posted);
+}
+
+int
+SDL_SendSysWMEvent(SDL_SysWMmsg * message)
+{
+    int posted;
+
+    posted = 0;
+    if (SDL_GetEventState(SDL_SYSWMEVENT) == SDL_ENABLE) {
+        SDL_Event event;
+        SDL_memset(&event, 0, sizeof(event));
+        event.type = SDL_SYSWMEVENT;
+        event.syswm.msg = message;
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    /* Update internal event state */
+    return (posted);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_events_c.h b/Source/3rd Party/sdl/src/events/SDL_events_c.h
new file mode 100644
index 000000000..11d6e304d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_events_c.h	
@@ -0,0 +1,50 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Useful functions and variables from SDL_events.c */
+#include "SDL_events.h"
+#include "SDL_thread.h"
+#include "SDL_clipboardevents_c.h"
+#include "SDL_dropevents_c.h"
+#include "SDL_gesture_c.h"
+#include "SDL_keyboard_c.h"
+#include "SDL_mouse_c.h"
+#include "SDL_touch_c.h"
+#include "SDL_windowevents_c.h"
+
+/* Start and stop the event processing loop */
+extern int SDL_StartEventLoop(void);
+extern void SDL_StopEventLoop(void);
+extern void SDL_QuitInterrupt(void);
+
+extern int SDL_SendAppEvent(SDL_EventType eventType);
+extern int SDL_SendSysWMEvent(SDL_SysWMmsg * message);
+
+extern int SDL_QuitInit(void);
+extern int SDL_SendQuit(void);
+extern void SDL_QuitQuit(void);
+
+/* The event filter function */
+extern SDL_EventFilter SDL_EventOK;
+extern void *SDL_EventOKParam;
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_gesture.c b/Source/3rd Party/sdl/src/events/SDL_gesture.c
new file mode 100644
index 000000000..a47ab7d13
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_gesture.c	
@@ -0,0 +1,639 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../SDL_internal.h"
+
+/* General mouse handling code for SDL */
+
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+#include "SDL_gesture_c.h"
+
+#if !defined(__PSP__)
+#include <memory.h>
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+
+/* TODO: Replace with malloc */
+
+#define MAXPATHSIZE 1024
+
+#define DOLLARNPOINTS 64
+#define DOLLARSIZE 256
+
+#define ENABLE_DOLLAR
+
+#define PHI 0.618033989
+
+typedef struct {
+    float x,y;
+} SDL_FloatPoint;
+
+typedef struct {
+    float length;
+
+    int numPoints;
+    SDL_FloatPoint p[MAXPATHSIZE];
+} SDL_DollarPath;
+
+typedef struct {
+    SDL_FloatPoint path[DOLLARNPOINTS];
+    unsigned long hash;
+} SDL_DollarTemplate;
+
+typedef struct {
+    SDL_TouchID id;
+    SDL_FloatPoint centroid;
+    SDL_DollarPath dollarPath;
+    Uint16 numDownFingers;
+
+    int numDollarTemplates;
+    SDL_DollarTemplate *dollarTemplate;
+
+    SDL_bool recording;
+} SDL_GestureTouch;
+
+SDL_GestureTouch *SDL_gestureTouch;
+int SDL_numGestureTouches = 0;
+SDL_bool recordAll;
+
+#if 0
+static void PrintPath(SDL_FloatPoint *path)
+{
+    int i;
+    printf("Path:");
+    for (i=0; i<DOLLARNPOINTS; i++) {
+        printf(" (%f,%f)",path[i].x,path[i].y);
+    }
+    printf("\n");
+}
+#endif
+
+int SDL_RecordGesture(SDL_TouchID touchId)
+{
+    int i;
+    if (touchId < 0) recordAll = SDL_TRUE;
+    for (i = 0; i < SDL_numGestureTouches; i++) {
+        if ((touchId < 0) || (SDL_gestureTouch[i].id == touchId)) {
+            SDL_gestureTouch[i].recording = SDL_TRUE;
+            if (touchId >= 0)
+                return 1;
+        }
+    }
+    return (touchId < 0);
+}
+
+static unsigned long SDL_HashDollar(SDL_FloatPoint* points)
+{
+    unsigned long hash = 5381;
+    int i;
+    for (i = 0; i < DOLLARNPOINTS; i++) {
+        hash = ((hash<<5) + hash) + (unsigned long)points[i].x;
+        hash = ((hash<<5) + hash) + (unsigned long)points[i].y;
+    }
+    return hash;
+}
+
+
+static int SaveTemplate(SDL_DollarTemplate *templ, SDL_RWops *dst)
+{
+    if (dst == NULL) return 0;
+
+    /* No Longer storing the Hash, rehash on load */
+    /* if (SDL_RWops.write(dst, &(templ->hash), sizeof(templ->hash), 1) != 1) return 0; */
+
+    if (SDL_RWwrite(dst, templ->path,
+                    sizeof(templ->path[0]),DOLLARNPOINTS) != DOLLARNPOINTS)
+        return 0;
+
+    return 1;
+}
+
+
+int SDL_SaveAllDollarTemplates(SDL_RWops *dst)
+{
+    int i,j,rtrn = 0;
+    for (i = 0; i < SDL_numGestureTouches; i++) {
+        SDL_GestureTouch* touch = &SDL_gestureTouch[i];
+        for (j = 0; j < touch->numDollarTemplates; j++) {
+            rtrn += SaveTemplate(&touch->dollarTemplate[i], dst);
+        }
+    }
+    return rtrn;
+}
+
+int SDL_SaveDollarTemplate(SDL_GestureID gestureId, SDL_RWops *dst)
+{
+    int i,j;
+    for (i = 0; i < SDL_numGestureTouches; i++) {
+        SDL_GestureTouch* touch = &SDL_gestureTouch[i];
+        for (j = 0; j < touch->numDollarTemplates; j++) {
+            if (touch->dollarTemplate[i].hash == gestureId) {
+                return SaveTemplate(&touch->dollarTemplate[i], dst);
+            }
+        }
+    }
+    return SDL_SetError("Unknown gestureId");
+}
+
+/* path is an already sampled set of points
+Returns the index of the gesture on success, or -1 */
+static int SDL_AddDollarGesture_one(SDL_GestureTouch* inTouch, SDL_FloatPoint* path)
+{
+    SDL_DollarTemplate* dollarTemplate;
+    SDL_DollarTemplate *templ;
+    int index;
+
+    index = inTouch->numDollarTemplates;
+    dollarTemplate =
+        (SDL_DollarTemplate *)SDL_realloc(inTouch->dollarTemplate,
+                                          (index + 1) *
+                                          sizeof(SDL_DollarTemplate));
+    if (!dollarTemplate) {
+        return SDL_OutOfMemory();
+    }
+    inTouch->dollarTemplate = dollarTemplate;
+
+    templ = &inTouch->dollarTemplate[index];
+    SDL_memcpy(templ->path, path, DOLLARNPOINTS*sizeof(SDL_FloatPoint));
+    templ->hash = SDL_HashDollar(templ->path);
+    inTouch->numDollarTemplates++;
+
+    return index;
+}
+
+static int SDL_AddDollarGesture(SDL_GestureTouch* inTouch, SDL_FloatPoint* path)
+{
+    int index = -1;
+    int i = 0;
+    if (inTouch == NULL) {
+        if (SDL_numGestureTouches == 0) return -1;
+        for (i = 0; i < SDL_numGestureTouches; i++) {
+            inTouch = &SDL_gestureTouch[i];
+            index = SDL_AddDollarGesture_one(inTouch, path);
+            if (index < 0)
+                return -1;
+        }
+        /* Use the index of the last one added. */
+        return index;
+    }
+    return SDL_AddDollarGesture_one(inTouch, path);
+}
+
+int SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src)
+{
+    int i,loaded = 0;
+    SDL_GestureTouch *touch = NULL;
+    if (src == NULL) return 0;
+    if (touchId >= 0) {
+        for (i = 0; i < SDL_numGestureTouches; i++)
+            if (SDL_gestureTouch[i].id == touchId)
+                touch = &SDL_gestureTouch[i];
+        if (touch == NULL) return -1;
+    }
+
+    while (1) {
+        SDL_DollarTemplate templ;
+
+        if (SDL_RWread(src,templ.path,sizeof(templ.path[0]),DOLLARNPOINTS) <
+           DOLLARNPOINTS) break;
+
+        if (touchId >= 0) {
+            /* printf("Adding loaded gesture to 1 touch\n"); */
+            if (SDL_AddDollarGesture(touch, templ.path) >= 0)
+                loaded++;
+        }
+        else {
+            /* printf("Adding to: %i touches\n",SDL_numGestureTouches); */
+            for (i = 0; i < SDL_numGestureTouches; i++) {
+                touch = &SDL_gestureTouch[i];
+                /* printf("Adding loaded gesture to + touches\n"); */
+                /* TODO: What if this fails? */
+                SDL_AddDollarGesture(touch,templ.path);
+            }
+            loaded++;
+        }
+    }
+
+    return loaded;
+}
+
+
+static float dollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ,float ang)
+{
+    /*  SDL_FloatPoint p[DOLLARNPOINTS]; */
+    float dist = 0;
+    SDL_FloatPoint p;
+    int i;
+    for (i = 0; i < DOLLARNPOINTS; i++) {
+        p.x = (float)(points[i].x * SDL_cos(ang) - points[i].y * SDL_sin(ang));
+        p.y = (float)(points[i].x * SDL_sin(ang) + points[i].y * SDL_cos(ang));
+        dist += (float)(SDL_sqrt((p.x-templ[i].x)*(p.x-templ[i].x)+
+                                 (p.y-templ[i].y)*(p.y-templ[i].y)));
+    }
+    return dist/DOLLARNPOINTS;
+
+}
+
+static float bestDollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ)
+{
+    /*------------BEGIN DOLLAR BLACKBOX------------------
+      -TRANSLATED DIRECTLY FROM PSUDEO-CODE AVAILABLE AT-
+      -"http://depts.washington.edu/aimgroup/proj/dollar/"
+    */
+    double ta = -M_PI/4;
+    double tb = M_PI/4;
+    double dt = M_PI/90;
+    float x1 = (float)(PHI*ta + (1-PHI)*tb);
+    float f1 = dollarDifference(points,templ,x1);
+    float x2 = (float)((1-PHI)*ta + PHI*tb);
+    float f2 = dollarDifference(points,templ,x2);
+    while (SDL_fabs(ta-tb) > dt) {
+        if (f1 < f2) {
+            tb = x2;
+            x2 = x1;
+            f2 = f1;
+            x1 = (float)(PHI*ta + (1-PHI)*tb);
+            f1 = dollarDifference(points,templ,x1);
+        }
+        else {
+            ta = x1;
+            x1 = x2;
+            f1 = f2;
+            x2 = (float)((1-PHI)*ta + PHI*tb);
+            f2 = dollarDifference(points,templ,x2);
+        }
+    }
+    /*
+      if (f1 <= f2)
+          printf("Min angle (x1): %f\n",x1);
+      else if (f1 >  f2)
+          printf("Min angle (x2): %f\n",x2);
+    */
+    return SDL_min(f1,f2);
+}
+
+/* DollarPath contains raw points, plus (possibly) the calculated length */
+static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
+{
+    int i;
+    float interval;
+    float dist;
+    int numPoints = 0;
+    SDL_FloatPoint centroid;
+    float xmin,xmax,ymin,ymax;
+    float ang;
+    float w,h;
+    float length = path->length;
+
+    /* Calculate length if it hasn't already been done */
+    if (length <= 0) {
+        for (i=1;i < path->numPoints; i++) {
+            float dx = path->p[i  ].x - path->p[i-1].x;
+            float dy = path->p[i  ].y - path->p[i-1].y;
+            length += (float)(SDL_sqrt(dx*dx+dy*dy));
+        }
+    }
+
+    /* Resample */
+    interval = length/(DOLLARNPOINTS - 1);
+    dist = interval;
+
+    centroid.x = 0;centroid.y = 0;
+
+    /* printf("(%f,%f)\n",path->p[path->numPoints-1].x,path->p[path->numPoints-1].y); */
+    for (i = 1; i < path->numPoints; i++) {
+        float d = (float)(SDL_sqrt((path->p[i-1].x-path->p[i].x)*(path->p[i-1].x-path->p[i].x)+
+                                   (path->p[i-1].y-path->p[i].y)*(path->p[i-1].y-path->p[i].y)));
+        /* printf("d = %f dist = %f/%f\n",d,dist,interval); */
+        while (dist + d > interval) {
+            points[numPoints].x = path->p[i-1].x +
+                ((interval-dist)/d)*(path->p[i].x-path->p[i-1].x);
+            points[numPoints].y = path->p[i-1].y +
+                ((interval-dist)/d)*(path->p[i].y-path->p[i-1].y);
+            centroid.x += points[numPoints].x;
+            centroid.y += points[numPoints].y;
+            numPoints++;
+
+            dist -= interval;
+        }
+        dist += d;
+    }
+    if (numPoints < DOLLARNPOINTS-1) {
+        SDL_SetError("ERROR: NumPoints = %i\n",numPoints);
+        return 0;
+    }
+    /* copy the last point */
+    points[DOLLARNPOINTS-1] = path->p[path->numPoints-1];
+    numPoints = DOLLARNPOINTS;
+
+    centroid.x /= numPoints;
+    centroid.y /= numPoints;
+
+    /* printf("Centroid (%f,%f)",centroid.x,centroid.y); */
+    /* Rotate Points so point 0 is left of centroid and solve for the bounding box */
+    xmin = centroid.x;
+    xmax = centroid.x;
+    ymin = centroid.y;
+    ymax = centroid.y;
+
+    ang = (float)(SDL_atan2(centroid.y - points[0].y,
+                            centroid.x - points[0].x));
+
+    for (i = 0; i<numPoints; i++) {
+        float px = points[i].x;
+        float py = points[i].y;
+        points[i].x = (float)((px - centroid.x)*SDL_cos(ang) -
+                              (py - centroid.y)*SDL_sin(ang) + centroid.x);
+        points[i].y = (float)((px - centroid.x)*SDL_sin(ang) +
+                              (py - centroid.y)*SDL_cos(ang) + centroid.y);
+
+
+        if (points[i].x < xmin) xmin = points[i].x;
+        if (points[i].x > xmax) xmax = points[i].x;
+        if (points[i].y < ymin) ymin = points[i].y;
+        if (points[i].y > ymax) ymax = points[i].y;
+    }
+
+    /* Scale points to DOLLARSIZE, and translate to the origin */
+    w = xmax-xmin;
+    h = ymax-ymin;
+
+    for (i=0; i<numPoints; i++) {
+        points[i].x = (points[i].x - centroid.x)*DOLLARSIZE/w;
+        points[i].y = (points[i].y - centroid.y)*DOLLARSIZE/h;
+    }
+    return numPoints;
+}
+
+static float dollarRecognize(const SDL_DollarPath *path,int *bestTempl,SDL_GestureTouch* touch)
+{
+    SDL_FloatPoint points[DOLLARNPOINTS];
+    int i;
+    float bestDiff = 10000;
+
+    SDL_memset(points, 0, sizeof(points));
+
+    dollarNormalize(path,points);
+
+    /* PrintPath(points); */
+    *bestTempl = -1;
+    for (i = 0; i < touch->numDollarTemplates; i++) {
+        float diff = bestDollarDifference(points,touch->dollarTemplate[i].path);
+        if (diff < bestDiff) {bestDiff = diff; *bestTempl = i;}
+    }
+    return bestDiff;
+}
+
+int SDL_GestureAddTouch(SDL_TouchID touchId)
+{
+    SDL_GestureTouch *gestureTouch = (SDL_GestureTouch *)SDL_realloc(SDL_gestureTouch,
+                                                                     (SDL_numGestureTouches + 1) *
+                                                                     sizeof(SDL_GestureTouch));
+
+    if (!gestureTouch) {
+        return SDL_OutOfMemory();
+    }
+
+    SDL_gestureTouch = gestureTouch;
+
+    SDL_zero(SDL_gestureTouch[SDL_numGestureTouches]);
+    SDL_gestureTouch[SDL_numGestureTouches].id = touchId;
+    SDL_numGestureTouches++;
+    return 0;
+}
+
+static SDL_GestureTouch * SDL_GetGestureTouch(SDL_TouchID id)
+{
+    int i;
+    for (i = 0; i < SDL_numGestureTouches; i++) {
+        /* printf("%i ?= %i\n",SDL_gestureTouch[i].id,id); */
+        if (SDL_gestureTouch[i].id == id)
+            return &SDL_gestureTouch[i];
+    }
+    return NULL;
+}
+
+int SDL_SendGestureMulti(SDL_GestureTouch* touch,float dTheta,float dDist)
+{
+    SDL_Event event;
+    event.mgesture.type = SDL_MULTIGESTURE;
+    event.mgesture.touchId = touch->id;
+    event.mgesture.x = touch->centroid.x;
+    event.mgesture.y = touch->centroid.y;
+    event.mgesture.dTheta = dTheta;
+    event.mgesture.dDist = dDist;
+    event.mgesture.numFingers = touch->numDownFingers;
+    return SDL_PushEvent(&event) > 0;
+}
+
+static int SDL_SendGestureDollar(SDL_GestureTouch* touch,
+                          SDL_GestureID gestureId,float error)
+{
+    SDL_Event event;
+    event.dgesture.type = SDL_DOLLARGESTURE;
+    event.dgesture.touchId = touch->id;
+    event.mgesture.x = touch->centroid.x;
+    event.mgesture.y = touch->centroid.y;
+    event.dgesture.gestureId = gestureId;
+    event.dgesture.error = error;
+    /* A finger came up to trigger this event. */
+    event.dgesture.numFingers = touch->numDownFingers + 1;
+    return SDL_PushEvent(&event) > 0;
+}
+
+
+static int SDL_SendDollarRecord(SDL_GestureTouch* touch,SDL_GestureID gestureId)
+{
+    SDL_Event event;
+    event.dgesture.type = SDL_DOLLARRECORD;
+    event.dgesture.touchId = touch->id;
+    event.dgesture.gestureId = gestureId;
+    return SDL_PushEvent(&event) > 0;
+}
+
+
+void SDL_GestureProcessEvent(SDL_Event* event)
+{
+    float x,y;
+    SDL_FloatPoint path[DOLLARNPOINTS];
+    int index;
+    int i;
+    float pathDx, pathDy;
+    SDL_FloatPoint lastP;
+    SDL_FloatPoint lastCentroid;
+    float lDist;
+    float Dist;
+    float dtheta;
+    float dDist;
+
+    if (event->type == SDL_FINGERMOTION ||
+        event->type == SDL_FINGERDOWN ||
+        event->type == SDL_FINGERUP) {
+        SDL_GestureTouch* inTouch = SDL_GetGestureTouch(event->tfinger.touchId);
+
+        /* Shouldn't be possible */
+        if (inTouch == NULL) return;
+
+        x = event->tfinger.x;
+        y = event->tfinger.y;
+
+        /* Finger Up */
+        if (event->type == SDL_FINGERUP) {
+            inTouch->numDownFingers--;
+
+#ifdef ENABLE_DOLLAR
+            if (inTouch->recording) {
+                inTouch->recording = SDL_FALSE;
+                dollarNormalize(&inTouch->dollarPath,path);
+                /* PrintPath(path); */
+                if (recordAll) {
+                    index = SDL_AddDollarGesture(NULL,path);
+                    for (i = 0; i < SDL_numGestureTouches; i++)
+                        SDL_gestureTouch[i].recording = SDL_FALSE;
+                }
+                else {
+                    index = SDL_AddDollarGesture(inTouch,path);
+                }
+
+                if (index >= 0) {
+                    SDL_SendDollarRecord(inTouch,inTouch->dollarTemplate[index].hash);
+                }
+                else {
+                    SDL_SendDollarRecord(inTouch,-1);
+                }
+            }
+            else {
+                int bestTempl;
+                float error;
+                error = dollarRecognize(&inTouch->dollarPath,
+                                        &bestTempl,inTouch);
+                if (bestTempl >= 0){
+                    /* Send Event */
+                    unsigned long gestureId = inTouch->dollarTemplate[bestTempl].hash;
+                    SDL_SendGestureDollar(inTouch,gestureId,error);
+                    /* printf ("%s\n",);("Dollar error: %f\n",error); */
+                }
+            }
+#endif
+            /* inTouch->gestureLast[j] = inTouch->gestureLast[inTouch->numDownFingers]; */
+            if (inTouch->numDownFingers > 0) {
+                inTouch->centroid.x = (inTouch->centroid.x*(inTouch->numDownFingers+1)-
+                                       x)/inTouch->numDownFingers;
+                inTouch->centroid.y = (inTouch->centroid.y*(inTouch->numDownFingers+1)-
+                                       y)/inTouch->numDownFingers;
+            }
+        }
+        else if (event->type == SDL_FINGERMOTION) {
+            float dx = event->tfinger.dx;
+            float dy = event->tfinger.dy;
+#ifdef ENABLE_DOLLAR
+            SDL_DollarPath* path = &inTouch->dollarPath;
+            if (path->numPoints < MAXPATHSIZE) {
+                path->p[path->numPoints].x = inTouch->centroid.x;
+                path->p[path->numPoints].y = inTouch->centroid.y;
+                pathDx =
+                    (path->p[path->numPoints].x-path->p[path->numPoints-1].x);
+                pathDy =
+                    (path->p[path->numPoints].y-path->p[path->numPoints-1].y);
+                path->length += (float)SDL_sqrt(pathDx*pathDx + pathDy*pathDy);
+                path->numPoints++;
+            }
+#endif
+            lastP.x = x - dx;
+            lastP.y = y - dy;
+            lastCentroid = inTouch->centroid;
+
+            inTouch->centroid.x += dx/inTouch->numDownFingers;
+            inTouch->centroid.y += dy/inTouch->numDownFingers;
+            /* printf("Centrid : (%f,%f)\n",inTouch->centroid.x,inTouch->centroid.y); */
+            if (inTouch->numDownFingers > 1) {
+                SDL_FloatPoint lv; /* Vector from centroid to last x,y position */
+                SDL_FloatPoint v; /* Vector from centroid to current x,y position */
+                /* lv = inTouch->gestureLast[j].cv; */
+                lv.x = lastP.x - lastCentroid.x;
+                lv.y = lastP.y - lastCentroid.y;
+                lDist = (float)SDL_sqrt(lv.x*lv.x + lv.y*lv.y);
+                /* printf("lDist = %f\n",lDist); */
+                v.x = x - inTouch->centroid.x;
+                v.y = y - inTouch->centroid.y;
+                /* inTouch->gestureLast[j].cv = v; */
+                Dist = (float)SDL_sqrt(v.x*v.x+v.y*v.y);
+                /* SDL_cos(dTheta) = (v . lv)/(|v| * |lv|) */
+
+                /* Normalize Vectors to simplify angle calculation */
+                lv.x/=lDist;
+                lv.y/=lDist;
+                v.x/=Dist;
+                v.y/=Dist;
+                dtheta = (float)SDL_atan2(lv.x*v.y - lv.y*v.x,lv.x*v.x + lv.y*v.y);
+
+                dDist = (Dist - lDist);
+                if (lDist == 0) {dDist = 0;dtheta = 0;} /* To avoid impossible values */
+
+                /* inTouch->gestureLast[j].dDist = dDist;
+                inTouch->gestureLast[j].dtheta = dtheta;
+
+                printf("dDist = %f, dTheta = %f\n",dDist,dtheta);
+                gdtheta = gdtheta*.9 + dtheta*.1;
+                gdDist  =  gdDist*.9 +  dDist*.1
+                knob.r += dDist/numDownFingers;
+                knob.ang += dtheta;
+                printf("thetaSum = %f, distSum = %f\n",gdtheta,gdDist);
+                printf("id: %i dTheta = %f, dDist = %f\n",j,dtheta,dDist); */
+                SDL_SendGestureMulti(inTouch,dtheta,dDist);
+            }
+            else {
+                /* inTouch->gestureLast[j].dDist = 0;
+                inTouch->gestureLast[j].dtheta = 0;
+                inTouch->gestureLast[j].cv.x = 0;
+                inTouch->gestureLast[j].cv.y = 0; */
+            }
+            /* inTouch->gestureLast[j].f.p.x = x;
+            inTouch->gestureLast[j].f.p.y = y;
+            break;
+            pressure? */
+        }
+
+        if (event->type == SDL_FINGERDOWN) {
+
+            inTouch->numDownFingers++;
+            inTouch->centroid.x = (inTouch->centroid.x*(inTouch->numDownFingers - 1)+
+                                   x)/inTouch->numDownFingers;
+            inTouch->centroid.y = (inTouch->centroid.y*(inTouch->numDownFingers - 1)+
+                                   y)/inTouch->numDownFingers;
+            /* printf("Finger Down: (%f,%f). Centroid: (%f,%f\n",x,y,
+                 inTouch->centroid.x,inTouch->centroid.y); */
+
+#ifdef ENABLE_DOLLAR
+            inTouch->dollarPath.length = 0;
+            inTouch->dollarPath.p[0].x = x;
+            inTouch->dollarPath.p[0].y = y;
+            inTouch->dollarPath.numPoints = 1;
+#endif
+        }
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_gesture_c.h b/Source/3rd Party/sdl/src/events/SDL_gesture_c.h
new file mode 100644
index 000000000..3f1ed9b15
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_gesture_c.h	
@@ -0,0 +1,34 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_gesture_c_h
+#define _SDL_gesture_c_h
+
+extern int SDL_GestureAddTouch(SDL_TouchID touchId);
+
+extern void SDL_GestureProcessEvent(SDL_Event* event);
+
+extern int SDL_RecordGesture(SDL_TouchID touchId);
+
+#endif /* _SDL_gesture_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_keyboard.c b/Source/3rd Party/sdl/src/events/SDL_keyboard.c
new file mode 100644
index 000000000..d5443893b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_keyboard.c	
@@ -0,0 +1,1013 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* General keyboard handling code for SDL */
+
+#include "SDL_timer.h"
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+#include "../video/SDL_sysvideo.h"
+
+
+/* #define DEBUG_KEYBOARD */
+
+/* Global keyboard information */
+
+typedef struct SDL_Keyboard SDL_Keyboard;
+
+struct SDL_Keyboard
+{
+    /* Data common to all keyboards */
+    SDL_Window *focus;
+    Uint16 modstate;
+    Uint8 keystate[SDL_NUM_SCANCODES];
+    SDL_Keycode keymap[SDL_NUM_SCANCODES];
+};
+
+static SDL_Keyboard SDL_keyboard;
+
+static const SDL_Keycode SDL_default_keymap[SDL_NUM_SCANCODES] = {
+    0, 0, 0, 0,
+    'a',
+    'b',
+    'c',
+    'd',
+    'e',
+    'f',
+    'g',
+    'h',
+    'i',
+    'j',
+    'k',
+    'l',
+    'm',
+    'n',
+    'o',
+    'p',
+    'q',
+    'r',
+    's',
+    't',
+    'u',
+    'v',
+    'w',
+    'x',
+    'y',
+    'z',
+    '1',
+    '2',
+    '3',
+    '4',
+    '5',
+    '6',
+    '7',
+    '8',
+    '9',
+    '0',
+    SDLK_RETURN,
+    SDLK_ESCAPE,
+    SDLK_BACKSPACE,
+    SDLK_TAB,
+    SDLK_SPACE,
+    '-',
+    '=',
+    '[',
+    ']',
+    '\\',
+    '#',
+    ';',
+    '\'',
+    '`',
+    ',',
+    '.',
+    '/',
+    SDLK_CAPSLOCK,
+    SDLK_F1,
+    SDLK_F2,
+    SDLK_F3,
+    SDLK_F4,
+    SDLK_F5,
+    SDLK_F6,
+    SDLK_F7,
+    SDLK_F8,
+    SDLK_F9,
+    SDLK_F10,
+    SDLK_F11,
+    SDLK_F12,
+    SDLK_PRINTSCREEN,
+    SDLK_SCROLLLOCK,
+    SDLK_PAUSE,
+    SDLK_INSERT,
+    SDLK_HOME,
+    SDLK_PAGEUP,
+    SDLK_DELETE,
+    SDLK_END,
+    SDLK_PAGEDOWN,
+    SDLK_RIGHT,
+    SDLK_LEFT,
+    SDLK_DOWN,
+    SDLK_UP,
+    SDLK_NUMLOCKCLEAR,
+    SDLK_KP_DIVIDE,
+    SDLK_KP_MULTIPLY,
+    SDLK_KP_MINUS,
+    SDLK_KP_PLUS,
+    SDLK_KP_ENTER,
+    SDLK_KP_1,
+    SDLK_KP_2,
+    SDLK_KP_3,
+    SDLK_KP_4,
+    SDLK_KP_5,
+    SDLK_KP_6,
+    SDLK_KP_7,
+    SDLK_KP_8,
+    SDLK_KP_9,
+    SDLK_KP_0,
+    SDLK_KP_PERIOD,
+    0,
+    SDLK_APPLICATION,
+    SDLK_POWER,
+    SDLK_KP_EQUALS,
+    SDLK_F13,
+    SDLK_F14,
+    SDLK_F15,
+    SDLK_F16,
+    SDLK_F17,
+    SDLK_F18,
+    SDLK_F19,
+    SDLK_F20,
+    SDLK_F21,
+    SDLK_F22,
+    SDLK_F23,
+    SDLK_F24,
+    SDLK_EXECUTE,
+    SDLK_HELP,
+    SDLK_MENU,
+    SDLK_SELECT,
+    SDLK_STOP,
+    SDLK_AGAIN,
+    SDLK_UNDO,
+    SDLK_CUT,
+    SDLK_COPY,
+    SDLK_PASTE,
+    SDLK_FIND,
+    SDLK_MUTE,
+    SDLK_VOLUMEUP,
+    SDLK_VOLUMEDOWN,
+    0, 0, 0,
+    SDLK_KP_COMMA,
+    SDLK_KP_EQUALSAS400,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    SDLK_ALTERASE,
+    SDLK_SYSREQ,
+    SDLK_CANCEL,
+    SDLK_CLEAR,
+    SDLK_PRIOR,
+    SDLK_RETURN2,
+    SDLK_SEPARATOR,
+    SDLK_OUT,
+    SDLK_OPER,
+    SDLK_CLEARAGAIN,
+    SDLK_CRSEL,
+    SDLK_EXSEL,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    SDLK_KP_00,
+    SDLK_KP_000,
+    SDLK_THOUSANDSSEPARATOR,
+    SDLK_DECIMALSEPARATOR,
+    SDLK_CURRENCYUNIT,
+    SDLK_CURRENCYSUBUNIT,
+    SDLK_KP_LEFTPAREN,
+    SDLK_KP_RIGHTPAREN,
+    SDLK_KP_LEFTBRACE,
+    SDLK_KP_RIGHTBRACE,
+    SDLK_KP_TAB,
+    SDLK_KP_BACKSPACE,
+    SDLK_KP_A,
+    SDLK_KP_B,
+    SDLK_KP_C,
+    SDLK_KP_D,
+    SDLK_KP_E,
+    SDLK_KP_F,
+    SDLK_KP_XOR,
+    SDLK_KP_POWER,
+    SDLK_KP_PERCENT,
+    SDLK_KP_LESS,
+    SDLK_KP_GREATER,
+    SDLK_KP_AMPERSAND,
+    SDLK_KP_DBLAMPERSAND,
+    SDLK_KP_VERTICALBAR,
+    SDLK_KP_DBLVERTICALBAR,
+    SDLK_KP_COLON,
+    SDLK_KP_HASH,
+    SDLK_KP_SPACE,
+    SDLK_KP_AT,
+    SDLK_KP_EXCLAM,
+    SDLK_KP_MEMSTORE,
+    SDLK_KP_MEMRECALL,
+    SDLK_KP_MEMCLEAR,
+    SDLK_KP_MEMADD,
+    SDLK_KP_MEMSUBTRACT,
+    SDLK_KP_MEMMULTIPLY,
+    SDLK_KP_MEMDIVIDE,
+    SDLK_KP_PLUSMINUS,
+    SDLK_KP_CLEAR,
+    SDLK_KP_CLEARENTRY,
+    SDLK_KP_BINARY,
+    SDLK_KP_OCTAL,
+    SDLK_KP_DECIMAL,
+    SDLK_KP_HEXADECIMAL,
+    0, 0,
+    SDLK_LCTRL,
+    SDLK_LSHIFT,
+    SDLK_LALT,
+    SDLK_LGUI,
+    SDLK_RCTRL,
+    SDLK_RSHIFT,
+    SDLK_RALT,
+    SDLK_RGUI,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    SDLK_MODE,
+    SDLK_AUDIONEXT,
+    SDLK_AUDIOPREV,
+    SDLK_AUDIOSTOP,
+    SDLK_AUDIOPLAY,
+    SDLK_AUDIOMUTE,
+    SDLK_MEDIASELECT,
+    SDLK_WWW,
+    SDLK_MAIL,
+    SDLK_CALCULATOR,
+    SDLK_COMPUTER,
+    SDLK_AC_SEARCH,
+    SDLK_AC_HOME,
+    SDLK_AC_BACK,
+    SDLK_AC_FORWARD,
+    SDLK_AC_STOP,
+    SDLK_AC_REFRESH,
+    SDLK_AC_BOOKMARKS,
+    SDLK_BRIGHTNESSDOWN,
+    SDLK_BRIGHTNESSUP,
+    SDLK_DISPLAYSWITCH,
+    SDLK_KBDILLUMTOGGLE,
+    SDLK_KBDILLUMDOWN,
+    SDLK_KBDILLUMUP,
+    SDLK_EJECT,
+    SDLK_SLEEP,
+};
+
+static const char *SDL_scancode_names[SDL_NUM_SCANCODES] = {
+    NULL, NULL, NULL, NULL,
+    "A",
+    "B",
+    "C",
+    "D",
+    "E",
+    "F",
+    "G",
+    "H",
+    "I",
+    "J",
+    "K",
+    "L",
+    "M",
+    "N",
+    "O",
+    "P",
+    "Q",
+    "R",
+    "S",
+    "T",
+    "U",
+    "V",
+    "W",
+    "X",
+    "Y",
+    "Z",
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+    "0",
+    "Return",
+    "Escape",
+    "Backspace",
+    "Tab",
+    "Space",
+    "-",
+    "=",
+    "[",
+    "]",
+    "\\",
+    "#",
+    ";",
+    "'",
+    "`",
+    ",",
+    ".",
+    "/",
+    "CapsLock",
+    "F1",
+    "F2",
+    "F3",
+    "F4",
+    "F5",
+    "F6",
+    "F7",
+    "F8",
+    "F9",
+    "F10",
+    "F11",
+    "F12",
+    "PrintScreen",
+    "ScrollLock",
+    "Pause",
+    "Insert",
+    "Home",
+    "PageUp",
+    "Delete",
+    "End",
+    "PageDown",
+    "Right",
+    "Left",
+    "Down",
+    "Up",
+    "Numlock",
+    "Keypad /",
+    "Keypad *",
+    "Keypad -",
+    "Keypad +",
+    "Keypad Enter",
+    "Keypad 1",
+    "Keypad 2",
+    "Keypad 3",
+    "Keypad 4",
+    "Keypad 5",
+    "Keypad 6",
+    "Keypad 7",
+    "Keypad 8",
+    "Keypad 9",
+    "Keypad 0",
+    "Keypad .",
+    NULL,
+    "Application",
+    "Power",
+    "Keypad =",
+    "F13",
+    "F14",
+    "F15",
+    "F16",
+    "F17",
+    "F18",
+    "F19",
+    "F20",
+    "F21",
+    "F22",
+    "F23",
+    "F24",
+    "Execute",
+    "Help",
+    "Menu",
+    "Select",
+    "Stop",
+    "Again",
+    "Undo",
+    "Cut",
+    "Copy",
+    "Paste",
+    "Find",
+    "Mute",
+    "VolumeUp",
+    "VolumeDown",
+    NULL, NULL, NULL,
+    "Keypad ,",
+    "Keypad = (AS400)",
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL, NULL, NULL,
+    "AltErase",
+    "SysReq",
+    "Cancel",
+    "Clear",
+    "Prior",
+    "Return",
+    "Separator",
+    "Out",
+    "Oper",
+    "Clear / Again",
+    "CrSel",
+    "ExSel",
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    "Keypad 00",
+    "Keypad 000",
+    "ThousandsSeparator",
+    "DecimalSeparator",
+    "CurrencyUnit",
+    "CurrencySubUnit",
+    "Keypad (",
+    "Keypad )",
+    "Keypad {",
+    "Keypad }",
+    "Keypad Tab",
+    "Keypad Backspace",
+    "Keypad A",
+    "Keypad B",
+    "Keypad C",
+    "Keypad D",
+    "Keypad E",
+    "Keypad F",
+    "Keypad XOR",
+    "Keypad ^",
+    "Keypad %",
+    "Keypad <",
+    "Keypad >",
+    "Keypad &",
+    "Keypad &&",
+    "Keypad |",
+    "Keypad ||",
+    "Keypad :",
+    "Keypad #",
+    "Keypad Space",
+    "Keypad @",
+    "Keypad !",
+    "Keypad MemStore",
+    "Keypad MemRecall",
+    "Keypad MemClear",
+    "Keypad MemAdd",
+    "Keypad MemSubtract",
+    "Keypad MemMultiply",
+    "Keypad MemDivide",
+    "Keypad +/-",
+    "Keypad Clear",
+    "Keypad ClearEntry",
+    "Keypad Binary",
+    "Keypad Octal",
+    "Keypad Decimal",
+    "Keypad Hexadecimal",
+    NULL, NULL,
+    "Left Ctrl",
+    "Left Shift",
+    "Left Alt",
+    "Left GUI",
+    "Right Ctrl",
+    "Right Shift",
+    "Right Alt",
+    "Right GUI",
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+    NULL,
+    "ModeSwitch",
+    "AudioNext",
+    "AudioPrev",
+    "AudioStop",
+    "AudioPlay",
+    "AudioMute",
+    "MediaSelect",
+    "WWW",
+    "Mail",
+    "Calculator",
+    "Computer",
+    "AC Search",
+    "AC Home",
+    "AC Back",
+    "AC Forward",
+    "AC Stop",
+    "AC Refresh",
+    "AC Bookmarks",
+    "BrightnessDown",
+    "BrightnessUp",
+    "DisplaySwitch",
+    "KBDIllumToggle",
+    "KBDIllumDown",
+    "KBDIllumUp",
+    "Eject",
+    "Sleep",
+};
+
+/* Taken from SDL_iconv() */
+char *
+SDL_UCS4ToUTF8(Uint32 ch, char *dst)
+{
+    Uint8 *p = (Uint8 *) dst;
+    if (ch <= 0x7F) {
+        *p = (Uint8) ch;
+        ++dst;
+    } else if (ch <= 0x7FF) {
+        p[0] = 0xC0 | (Uint8) ((ch >> 6) & 0x1F);
+        p[1] = 0x80 | (Uint8) (ch & 0x3F);
+        dst += 2;
+    } else if (ch <= 0xFFFF) {
+        p[0] = 0xE0 | (Uint8) ((ch >> 12) & 0x0F);
+        p[1] = 0x80 | (Uint8) ((ch >> 6) & 0x3F);
+        p[2] = 0x80 | (Uint8) (ch & 0x3F);
+        dst += 3;
+    } else if (ch <= 0x1FFFFF) {
+        p[0] = 0xF0 | (Uint8) ((ch >> 18) & 0x07);
+        p[1] = 0x80 | (Uint8) ((ch >> 12) & 0x3F);
+        p[2] = 0x80 | (Uint8) ((ch >> 6) & 0x3F);
+        p[3] = 0x80 | (Uint8) (ch & 0x3F);
+        dst += 4;
+    } else if (ch <= 0x3FFFFFF) {
+        p[0] = 0xF8 | (Uint8) ((ch >> 24) & 0x03);
+        p[1] = 0x80 | (Uint8) ((ch >> 18) & 0x3F);
+        p[2] = 0x80 | (Uint8) ((ch >> 12) & 0x3F);
+        p[3] = 0x80 | (Uint8) ((ch >> 6) & 0x3F);
+        p[4] = 0x80 | (Uint8) (ch & 0x3F);
+        dst += 5;
+    } else {
+        p[0] = 0xFC | (Uint8) ((ch >> 30) & 0x01);
+        p[1] = 0x80 | (Uint8) ((ch >> 24) & 0x3F);
+        p[2] = 0x80 | (Uint8) ((ch >> 18) & 0x3F);
+        p[3] = 0x80 | (Uint8) ((ch >> 12) & 0x3F);
+        p[4] = 0x80 | (Uint8) ((ch >> 6) & 0x3F);
+        p[5] = 0x80 | (Uint8) (ch & 0x3F);
+        dst += 6;
+    }
+    return dst;
+}
+
+/* Public functions */
+int
+SDL_KeyboardInit(void)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+
+    /* Set the default keymap */
+    SDL_memcpy(keyboard->keymap, SDL_default_keymap, sizeof(SDL_default_keymap));
+    return (0);
+}
+
+void
+SDL_ResetKeyboard(void)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+    SDL_Scancode scancode;
+
+#ifdef DEBUG_KEYBOARD
+    printf("Resetting keyboard\n");
+#endif
+    for (scancode = 0; scancode < SDL_NUM_SCANCODES; ++scancode) {
+        if (keyboard->keystate[scancode] == SDL_PRESSED) {
+            SDL_SendKeyboardKey(SDL_RELEASED, scancode);
+        }
+    }
+}
+
+void
+SDL_GetDefaultKeymap(SDL_Keycode * keymap)
+{
+    SDL_memcpy(keymap, SDL_default_keymap, sizeof(SDL_default_keymap));
+}
+
+void
+SDL_SetKeymap(int start, SDL_Keycode * keys, int length)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+
+    if (start < 0 || start + length > SDL_NUM_SCANCODES) {
+        return;
+    }
+
+    SDL_memcpy(&keyboard->keymap[start], keys, sizeof(*keys) * length);
+}
+
+void
+SDL_SetScancodeName(SDL_Scancode scancode, const char *name)
+{
+    SDL_scancode_names[scancode] = name;
+}
+
+SDL_Window *
+SDL_GetKeyboardFocus(void)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+
+    return keyboard->focus;
+}
+
+void
+SDL_SetKeyboardFocus(SDL_Window * window)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+
+    if (keyboard->focus && !window) {
+        /* We won't get anymore keyboard messages, so reset keyboard state */
+        SDL_ResetKeyboard();
+    }
+
+    /* See if the current window has lost focus */
+    if (keyboard->focus && keyboard->focus != window) {
+        SDL_SendWindowEvent(keyboard->focus, SDL_WINDOWEVENT_FOCUS_LOST,
+                            0, 0);
+
+        /* Ensures IME compositions are committed */
+        if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
+            SDL_VideoDevice *video = SDL_GetVideoDevice();
+            if (video && video->StopTextInput) {
+                video->StopTextInput(video);
+            }
+        }
+    }
+
+    keyboard->focus = window;
+
+    if (keyboard->focus) {
+        SDL_SendWindowEvent(keyboard->focus, SDL_WINDOWEVENT_FOCUS_GAINED,
+                            0, 0);
+
+        if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
+            SDL_VideoDevice *video = SDL_GetVideoDevice();
+            if (video && video->StartTextInput) {
+                video->StartTextInput(video);
+            }
+        }
+    }
+}
+
+int
+SDL_SendKeyboardKey(Uint8 state, SDL_Scancode scancode)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+    int posted;
+    Uint16 modstate;
+    Uint32 type;
+    Uint8 repeat;
+
+    if (!scancode) {
+        return 0;
+    }
+#ifdef DEBUG_KEYBOARD
+    printf("The '%s' key has been %s\n", SDL_GetScancodeName(scancode),
+           state == SDL_PRESSED ? "pressed" : "released");
+#endif
+    if (state == SDL_PRESSED) {
+        modstate = keyboard->modstate;
+        switch (scancode) {
+        case SDL_SCANCODE_NUMLOCKCLEAR:
+            keyboard->modstate ^= KMOD_NUM;
+            break;
+        case SDL_SCANCODE_CAPSLOCK:
+            keyboard->modstate ^= KMOD_CAPS;
+            break;
+        case SDL_SCANCODE_LCTRL:
+            keyboard->modstate |= KMOD_LCTRL;
+            break;
+        case SDL_SCANCODE_RCTRL:
+            keyboard->modstate |= KMOD_RCTRL;
+            break;
+        case SDL_SCANCODE_LSHIFT:
+            keyboard->modstate |= KMOD_LSHIFT;
+            break;
+        case SDL_SCANCODE_RSHIFT:
+            keyboard->modstate |= KMOD_RSHIFT;
+            break;
+        case SDL_SCANCODE_LALT:
+            keyboard->modstate |= KMOD_LALT;
+            break;
+        case SDL_SCANCODE_RALT:
+            keyboard->modstate |= KMOD_RALT;
+            break;
+        case SDL_SCANCODE_LGUI:
+            keyboard->modstate |= KMOD_LGUI;
+            break;
+        case SDL_SCANCODE_RGUI:
+            keyboard->modstate |= KMOD_RGUI;
+            break;
+        case SDL_SCANCODE_MODE:
+            keyboard->modstate |= KMOD_MODE;
+            break;
+        default:
+            break;
+        }
+    } else {
+        switch (scancode) {
+        case SDL_SCANCODE_NUMLOCKCLEAR:
+        case SDL_SCANCODE_CAPSLOCK:
+            break;
+        case SDL_SCANCODE_LCTRL:
+            keyboard->modstate &= ~KMOD_LCTRL;
+            break;
+        case SDL_SCANCODE_RCTRL:
+            keyboard->modstate &= ~KMOD_RCTRL;
+            break;
+        case SDL_SCANCODE_LSHIFT:
+            keyboard->modstate &= ~KMOD_LSHIFT;
+            break;
+        case SDL_SCANCODE_RSHIFT:
+            keyboard->modstate &= ~KMOD_RSHIFT;
+            break;
+        case SDL_SCANCODE_LALT:
+            keyboard->modstate &= ~KMOD_LALT;
+            break;
+        case SDL_SCANCODE_RALT:
+            keyboard->modstate &= ~KMOD_RALT;
+            break;
+        case SDL_SCANCODE_LGUI:
+            keyboard->modstate &= ~KMOD_LGUI;
+            break;
+        case SDL_SCANCODE_RGUI:
+            keyboard->modstate &= ~KMOD_RGUI;
+            break;
+        case SDL_SCANCODE_MODE:
+            keyboard->modstate &= ~KMOD_MODE;
+            break;
+        default:
+            break;
+        }
+        modstate = keyboard->modstate;
+    }
+
+    /* Figure out what type of event this is */
+    switch (state) {
+    case SDL_PRESSED:
+        type = SDL_KEYDOWN;
+        break;
+    case SDL_RELEASED:
+        type = SDL_KEYUP;
+        break;
+    default:
+        /* Invalid state -- bail */
+        return 0;
+    }
+
+    /* Drop events that don't change state */
+    repeat = (state && keyboard->keystate[scancode]);
+    if (keyboard->keystate[scancode] == state && !repeat) {
+#if 0
+        printf("Keyboard event didn't change state - dropped!\n");
+#endif
+        return 0;
+    }
+
+    /* Update internal keyboard state */
+    keyboard->keystate[scancode] = state;
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(type) == SDL_ENABLE) {
+        SDL_Event event;
+        event.key.type = type;
+        event.key.state = state;
+        event.key.repeat = repeat;
+        event.key.keysym.scancode = scancode;
+        event.key.keysym.sym = keyboard->keymap[scancode];
+        event.key.keysym.mod = modstate;
+        event.key.windowID = keyboard->focus ? keyboard->focus->id : 0;
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    return (posted);
+}
+
+int
+SDL_SendKeyboardText(const char *text)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+    int posted;
+
+    /* Don't post text events for unprintable characters */
+    if ((unsigned char)*text < ' ' || *text == 127) {
+        return 0;
+    }
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE) {
+        SDL_Event event;
+        event.text.type = SDL_TEXTINPUT;
+        event.text.windowID = keyboard->focus ? keyboard->focus->id : 0;
+        SDL_utf8strlcpy(event.text.text, text, SDL_arraysize(event.text.text));
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    return (posted);
+}
+
+int
+SDL_SendEditingText(const char *text, int start, int length)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+    int posted;
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(SDL_TEXTEDITING) == SDL_ENABLE) {
+        SDL_Event event;
+        event.edit.type = SDL_TEXTEDITING;
+        event.edit.windowID = keyboard->focus ? keyboard->focus->id : 0;
+        event.edit.start = start;
+        event.edit.length = length;
+        SDL_utf8strlcpy(event.edit.text, text, SDL_arraysize(event.edit.text));
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    return (posted);
+}
+
+void
+SDL_KeyboardQuit(void)
+{
+}
+
+const Uint8 *
+SDL_GetKeyboardState(int *numkeys)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+
+    if (numkeys != (int *) 0) {
+        *numkeys = SDL_NUM_SCANCODES;
+    }
+    return keyboard->keystate;
+}
+
+SDL_Keymod
+SDL_GetModState(void)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+
+    return keyboard->modstate;
+}
+
+void
+SDL_SetModState(SDL_Keymod modstate)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+
+    keyboard->modstate = modstate;
+}
+
+SDL_Keycode
+SDL_GetKeyFromScancode(SDL_Scancode scancode)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+
+    if (scancode < SDL_SCANCODE_UNKNOWN || scancode >= SDL_NUM_SCANCODES) {
+          SDL_InvalidParamError("scancode");
+          return 0;
+    }
+
+    return keyboard->keymap[scancode];
+}
+
+SDL_Scancode
+SDL_GetScancodeFromKey(SDL_Keycode key)
+{
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+    SDL_Scancode scancode;
+
+    for (scancode = SDL_SCANCODE_UNKNOWN; scancode < SDL_NUM_SCANCODES;
+         ++scancode) {
+        if (keyboard->keymap[scancode] == key) {
+            return scancode;
+        }
+    }
+    return SDL_SCANCODE_UNKNOWN;
+}
+
+const char *
+SDL_GetScancodeName(SDL_Scancode scancode)
+{
+    const char *name;
+    if (scancode < SDL_SCANCODE_UNKNOWN || scancode >= SDL_NUM_SCANCODES) {
+          SDL_InvalidParamError("scancode");
+          return "";
+    }
+
+    name = SDL_scancode_names[scancode];
+    if (name)
+        return name;
+    else
+        return "";
+}
+
+SDL_Scancode SDL_GetScancodeFromName(const char *name)
+{
+    int i;
+
+    if (!name || !*name) {
+            SDL_InvalidParamError("name");
+        return SDL_SCANCODE_UNKNOWN;
+    }
+
+    for (i = 0; i < SDL_arraysize(SDL_scancode_names); ++i) {
+        if (!SDL_scancode_names[i]) {
+            continue;
+        }
+        if (SDL_strcasecmp(name, SDL_scancode_names[i]) == 0) {
+            return (SDL_Scancode)i;
+        }
+    }
+
+    SDL_InvalidParamError("name");
+    return SDL_SCANCODE_UNKNOWN;
+}
+
+const char *
+SDL_GetKeyName(SDL_Keycode key)
+{
+    static char name[8];
+    char *end;
+
+    if (key & SDLK_SCANCODE_MASK) {
+        return
+            SDL_GetScancodeName((SDL_Scancode) (key & ~SDLK_SCANCODE_MASK));
+    }
+
+    switch (key) {
+    case SDLK_RETURN:
+        return SDL_GetScancodeName(SDL_SCANCODE_RETURN);
+    case SDLK_ESCAPE:
+        return SDL_GetScancodeName(SDL_SCANCODE_ESCAPE);
+    case SDLK_BACKSPACE:
+        return SDL_GetScancodeName(SDL_SCANCODE_BACKSPACE);
+    case SDLK_TAB:
+        return SDL_GetScancodeName(SDL_SCANCODE_TAB);
+    case SDLK_SPACE:
+        return SDL_GetScancodeName(SDL_SCANCODE_SPACE);
+    case SDLK_DELETE:
+        return SDL_GetScancodeName(SDL_SCANCODE_DELETE);
+    default:
+        /* Unaccented letter keys on latin keyboards are normally
+           labeled in upper case (and probably on others like Greek or
+           Cyrillic too, so if you happen to know for sure, please
+           adapt this). */
+        if (key >= 'a' && key <= 'z') {
+            key -= 32;
+        }
+
+        end = SDL_UCS4ToUTF8((Uint32) key, name);
+        *end = '\0';
+        return name;
+    }
+}
+
+SDL_Keycode
+SDL_GetKeyFromName(const char *name)
+{
+    SDL_Keycode key;
+
+        /* Check input */
+        if (name == NULL) return SDLK_UNKNOWN;
+
+    /* If it's a single UTF-8 character, then that's the keycode itself */
+    key = *(const unsigned char *)name;
+    if (key >= 0xF0) {
+        if (SDL_strlen(name) == 4) {
+            int i = 0;
+            key  = (Uint16)(name[i]&0x07) << 18;
+            key |= (Uint16)(name[++i]&0x3F) << 12;
+            key |= (Uint16)(name[++i]&0x3F) << 6;
+            key |= (Uint16)(name[++i]&0x3F);
+            return key;
+        }
+        return SDLK_UNKNOWN;
+    } else if (key >= 0xE0) {
+        if (SDL_strlen(name) == 3) {
+            int i = 0;
+            key  = (Uint16)(name[i]&0x0F) << 12;
+            key |= (Uint16)(name[++i]&0x3F) << 6;
+            key |= (Uint16)(name[++i]&0x3F);
+            return key;
+        }
+        return SDLK_UNKNOWN;
+    } else if (key >= 0xC0) {
+        if (SDL_strlen(name) == 2) {
+            int i = 0;
+            key  = (Uint16)(name[i]&0x1F) << 6;
+            key |= (Uint16)(name[++i]&0x3F);
+            return key;
+        }
+        return SDLK_UNKNOWN;
+    } else {
+        if (SDL_strlen(name) == 1) {
+            if (key >= 'A' && key <= 'Z') {
+                key += 32;
+            }
+            return key;
+        }
+
+        /* Get the scancode for this name, and the associated keycode */
+        return SDL_default_keymap[SDL_GetScancodeFromName(name)];
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_keyboard_c.h b/Source/3rd Party/sdl/src/events/SDL_keyboard_c.h
new file mode 100644
index 000000000..05b525382
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_keyboard_c.h	
@@ -0,0 +1,67 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_keyboard_c_h
+#define _SDL_keyboard_c_h
+
+#include "SDL_keycode.h"
+#include "SDL_events.h"
+
+/* Initialize the keyboard subsystem */
+extern int SDL_KeyboardInit(void);
+
+/* Clear the state of the keyboard */
+extern void SDL_ResetKeyboard(void);
+
+/* Get the default keymap */
+extern void SDL_GetDefaultKeymap(SDL_Keycode * keymap);
+
+/* Set the mapping of scancode to key codes */
+extern void SDL_SetKeymap(int start, SDL_Keycode * keys, int length);
+
+/* Set a platform-dependent key name, overriding the default platform-agnostic
+   name. Encoded as UTF-8. The string is not copied, thus the pointer given to
+   this function must stay valid forever (or at least until the call to
+   VideoQuit()). */
+extern void SDL_SetScancodeName(SDL_Scancode scancode, const char *name);
+
+/* Set the keyboard focus window */
+extern void SDL_SetKeyboardFocus(SDL_Window * window);
+
+/* Send a keyboard key event */
+extern int SDL_SendKeyboardKey(Uint8 state, SDL_Scancode scancode);
+
+/* Send keyboard text input */
+extern int SDL_SendKeyboardText(const char *text);
+
+/* Send editing text for selected range from start to end */
+extern int SDL_SendEditingText(const char *text, int start, int end);
+
+/* Shutdown the keyboard subsystem */
+extern void SDL_KeyboardQuit(void);
+
+/* Convert to UTF-8 */
+extern char *SDL_UCS4ToUTF8(Uint32 ch, char *dst);
+
+#endif /* _SDL_keyboard_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_mouse.c b/Source/3rd Party/sdl/src/events/SDL_mouse.c
new file mode 100644
index 000000000..236b8c540
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_mouse.c	
@@ -0,0 +1,810 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* General mouse handling code for SDL */
+
+#include "SDL_assert.h"
+#include "SDL_hints.h"
+#include "SDL_timer.h"
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+#include "default_cursor.h"
+#include "../video/SDL_sysvideo.h"
+
+/* #define DEBUG_MOUSE */
+
+/* The mouse state */
+static SDL_Mouse SDL_mouse;
+static Uint32 SDL_double_click_time = 500;
+static int SDL_double_click_radius = 1;
+
+static int
+SDL_PrivateSendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relative, int x, int y);
+
+/* Public functions */
+int
+SDL_MouseInit(void)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    mouse->cursor_shown = SDL_TRUE;
+
+    return (0);
+}
+
+void
+SDL_SetDefaultCursor(SDL_Cursor * cursor)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    mouse->def_cursor = cursor;
+    if (!mouse->cur_cursor) {
+        SDL_SetCursor(cursor);
+    }
+}
+
+SDL_Mouse *
+SDL_GetMouse(void)
+{
+    return &SDL_mouse;
+}
+
+void
+SDL_SetDoubleClickTime(Uint32 interval)
+{
+    SDL_double_click_time = interval;
+}
+
+SDL_Window *
+SDL_GetMouseFocus(void)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    return mouse->focus;
+}
+
+void
+SDL_ResetMouse(void)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    Uint8 i;
+
+#ifdef DEBUG_MOUSE
+    printf("Resetting mouse\n");
+#endif
+    for (i = 1; i <= sizeof(mouse->buttonstate)*8; ++i) {
+        if (mouse->buttonstate & SDL_BUTTON(i)) {
+            SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_RELEASED, i);
+        }
+    }
+    SDL_assert(mouse->buttonstate == 0);
+}
+
+void
+SDL_SetMouseFocus(SDL_Window * window)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    if (mouse->focus == window) {
+        return;
+    }
+
+    /* Actually, this ends up being a bad idea, because most operating
+       systems have an implicit grab when you press the mouse button down
+       so you can drag things out of the window and then get the mouse up
+       when it happens.  So, #if 0...
+    */
+#if 0
+    if (mouse->focus && !window) {
+        /* We won't get anymore mouse messages, so reset mouse state */
+        SDL_ResetMouse();
+    }
+#endif
+
+    /* See if the current window has lost focus */
+    if (mouse->focus) {
+        SDL_SendWindowEvent(mouse->focus, SDL_WINDOWEVENT_LEAVE, 0, 0);
+    }
+
+    mouse->focus = window;
+
+    if (mouse->focus) {
+        SDL_SendWindowEvent(mouse->focus, SDL_WINDOWEVENT_ENTER, 0, 0);
+    }
+
+    /* Update cursor visibility */
+    SDL_SetCursor(NULL);
+}
+
+/* Check to see if we need to synthesize focus events */
+static SDL_bool
+SDL_UpdateMouseFocus(SDL_Window * window, int x, int y, Uint32 buttonstate)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    int w, h;
+    SDL_bool inWindow;
+
+    SDL_GetWindowSize(window, &w, &h);
+    if (x < 0 || y < 0 || x >= w || y >= h) {
+        inWindow = SDL_FALSE;
+    } else {
+        inWindow = SDL_TRUE;
+    }
+
+/* Linux doesn't give you mouse events outside your window unless you grab
+   the pointer.
+
+   Windows doesn't give you mouse events outside your window unless you call
+   SetCapture().
+
+   Both of these are slightly scary changes, so for now we'll punt and if the
+   mouse leaves the window you'll lose mouse focus and reset button state.
+*/
+#ifdef SUPPORT_DRAG_OUTSIDE_WINDOW
+    if (!inWindow && !buttonstate) {
+#else
+    if (!inWindow) {
+#endif
+        if (window == mouse->focus) {
+#ifdef DEBUG_MOUSE
+            printf("Mouse left window, synthesizing move & focus lost event\n");
+#endif
+            SDL_PrivateSendMouseMotion(window, mouse->mouseID, 0, x, y);
+            SDL_SetMouseFocus(NULL);
+        }
+        return SDL_FALSE;
+    }
+
+    if (window != mouse->focus) {
+#ifdef DEBUG_MOUSE
+         printf("Mouse entered window, synthesizing focus gain & move event\n");
+#endif
+         SDL_SetMouseFocus(window);
+         SDL_PrivateSendMouseMotion(window, mouse->mouseID, 0, x, y);
+    }
+    return SDL_TRUE;
+}
+
+int
+SDL_SendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relative, int x, int y)
+{
+    if (window && !relative) {
+        SDL_Mouse *mouse = SDL_GetMouse();
+        if (!SDL_UpdateMouseFocus(window, x, y, mouse->buttonstate)) {
+            return 0;
+        }
+    }
+
+    return SDL_PrivateSendMouseMotion(window, mouseID, relative, x, y);
+}
+
+static int
+SDL_PrivateSendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relative, int x, int y)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    int posted;
+    int xrel;
+    int yrel;
+    int x_max = 0, y_max = 0;
+
+    if (mouse->relative_mode_warp) {
+        int center_x = 0, center_y = 0;
+        SDL_GetWindowSize(window, &center_x, &center_y);
+        center_x /= 2;
+        center_y /= 2;
+        if (x == center_x && y == center_y) {
+            mouse->last_x = center_x;
+            mouse->last_y = center_y;
+            return 0;
+        }
+        SDL_WarpMouseInWindow(window, center_x, center_y);
+    }
+
+    if (relative) {
+        xrel = x;
+        yrel = y;
+        x = (mouse->last_x + xrel);
+        y = (mouse->last_y + yrel);
+    } else {
+        xrel = x - mouse->last_x;
+        yrel = y - mouse->last_y;
+    }
+
+    /* Drop events that don't change state */
+    if (!xrel && !yrel) {
+#ifdef DEBUG_MOUSE
+        printf("Mouse event didn't change state - dropped!\n");
+#endif
+        return 0;
+    }
+
+    /* Update internal mouse coordinates */
+    if (!mouse->relative_mode) {
+        mouse->x = x;
+        mouse->y = y;
+    } else {
+        mouse->x += xrel;
+        mouse->y += yrel;
+    }
+
+    SDL_GetWindowSize(mouse->focus, &x_max, &y_max);
+    --x_max;
+    --y_max;
+
+    /* make sure that the pointers find themselves inside the windows */
+    if (mouse->x > x_max) {
+        mouse->x = x_max;
+    }
+    if (mouse->x < 0) {
+        mouse->x = 0;
+    }
+
+    if (mouse->y > y_max) {
+        mouse->y = y_max;
+    }
+    if (mouse->y < 0) {
+        mouse->y = 0;
+    }
+
+    mouse->xdelta += xrel;
+    mouse->ydelta += yrel;
+
+    /* Move the mouse cursor, if needed */
+    if (mouse->cursor_shown && !mouse->relative_mode &&
+        mouse->MoveCursor && mouse->cur_cursor) {
+        mouse->MoveCursor(mouse->cur_cursor);
+    }
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(SDL_MOUSEMOTION) == SDL_ENABLE) {
+        SDL_Event event;
+        event.motion.type = SDL_MOUSEMOTION;
+        event.motion.windowID = mouse->focus ? mouse->focus->id : 0;
+        event.motion.which = mouseID;
+        event.motion.state = mouse->buttonstate;
+        event.motion.x = mouse->x;
+        event.motion.y = mouse->y;
+        event.motion.xrel = xrel;
+        event.motion.yrel = yrel;
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    /* Use unclamped values if we're getting events outside the window */
+    mouse->last_x = x;
+    mouse->last_y = y;
+    return posted;
+}
+
+static SDL_MouseClickState *GetMouseClickState(SDL_Mouse *mouse, Uint8 button)
+{
+    if (button >= mouse->num_clickstates) {
+        int i, count = button + 1;
+        mouse->clickstate = (SDL_MouseClickState *)SDL_realloc(mouse->clickstate, count * sizeof(*mouse->clickstate));
+        if (!mouse->clickstate) {
+            return NULL;
+        }
+
+        for (i = mouse->num_clickstates; i < count; ++i) {
+            SDL_zero(mouse->clickstate[i]);
+        }
+        mouse->num_clickstates = count;
+    }
+    return &mouse->clickstate[button];
+}
+
+int
+SDL_SendMouseButton(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 button)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    int posted;
+    Uint32 type;
+    Uint32 buttonstate = mouse->buttonstate;
+    SDL_MouseClickState *clickstate = GetMouseClickState(mouse, button);
+    Uint8 click_count;
+
+    /* Figure out which event to perform */
+    switch (state) {
+    case SDL_PRESSED:
+        type = SDL_MOUSEBUTTONDOWN;
+        buttonstate |= SDL_BUTTON(button);
+        break;
+    case SDL_RELEASED:
+        type = SDL_MOUSEBUTTONUP;
+        buttonstate &= ~SDL_BUTTON(button);
+        break;
+    default:
+        /* Invalid state -- bail */
+        return 0;
+    }
+
+    /* We do this after calculating buttonstate so button presses gain focus */
+    if (window && state == SDL_PRESSED) {
+        SDL_UpdateMouseFocus(window, mouse->x, mouse->y, buttonstate);
+    }
+
+    if (buttonstate == mouse->buttonstate) {
+        /* Ignore this event, no state change */
+        return 0;
+    }
+    mouse->buttonstate = buttonstate;
+
+    if (clickstate) {
+        if (state == SDL_PRESSED) {
+            Uint32 now = SDL_GetTicks();
+
+            if (SDL_TICKS_PASSED(now, clickstate->last_timestamp + SDL_double_click_time) ||
+                SDL_abs(mouse->x - clickstate->last_x) > SDL_double_click_radius ||
+                SDL_abs(mouse->y - clickstate->last_y) > SDL_double_click_radius) {
+                clickstate->click_count = 0;
+            }
+            clickstate->last_timestamp = now;
+            clickstate->last_x = mouse->x;
+            clickstate->last_y = mouse->y;
+            if (clickstate->click_count < 255) {
+                ++clickstate->click_count;
+            }
+        }
+        click_count = clickstate->click_count;
+    } else {
+        click_count = 1;
+    }
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(type) == SDL_ENABLE) {
+        SDL_Event event;
+        event.type = type;
+        event.button.windowID = mouse->focus ? mouse->focus->id : 0;
+        event.button.which = mouseID;
+        event.button.state = state;
+        event.button.button = button;
+        event.button.clicks = click_count;
+        event.button.x = mouse->x;
+        event.button.y = mouse->y;
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+
+    /* We do this after dispatching event so button releases can lose focus */
+    if (window && state == SDL_RELEASED) {
+        SDL_UpdateMouseFocus(window, mouse->x, mouse->y, buttonstate);
+    }
+
+    return posted;
+}
+
+int
+SDL_SendMouseWheel(SDL_Window * window, SDL_MouseID mouseID, int x, int y)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    int posted;
+
+    if (window) {
+        SDL_SetMouseFocus(window);
+    }
+
+    if (!x && !y) {
+        return 0;
+    }
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(SDL_MOUSEWHEEL) == SDL_ENABLE) {
+        SDL_Event event;
+        event.type = SDL_MOUSEWHEEL;
+        event.wheel.windowID = mouse->focus ? mouse->focus->id : 0;
+        event.wheel.which = mouseID;
+        event.wheel.x = x;
+        event.wheel.y = y;
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    return posted;
+}
+
+void
+SDL_MouseQuit(void)
+{
+    SDL_Cursor *cursor, *next;
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    SDL_SetRelativeMouseMode(SDL_FALSE);
+    SDL_ShowCursor(1);
+
+    cursor = mouse->cursors;
+    while (cursor) {
+        next = cursor->next;
+        SDL_FreeCursor(cursor);
+        cursor = next;
+    }
+
+    if (mouse->def_cursor && mouse->FreeCursor) {
+        mouse->FreeCursor(mouse->def_cursor);
+    }
+
+    if (mouse->clickstate) {
+        SDL_free(mouse->clickstate);
+    }
+
+    SDL_zerop(mouse);
+}
+
+Uint32
+SDL_GetMouseState(int *x, int *y)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    if (x) {
+        *x = mouse->x;
+    }
+    if (y) {
+        *y = mouse->y;
+    }
+    return mouse->buttonstate;
+}
+
+Uint32
+SDL_GetRelativeMouseState(int *x, int *y)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    if (x) {
+        *x = mouse->xdelta;
+    }
+    if (y) {
+        *y = mouse->ydelta;
+    }
+    mouse->xdelta = 0;
+    mouse->ydelta = 0;
+    return mouse->buttonstate;
+}
+
+void
+SDL_WarpMouseInWindow(SDL_Window * window, int x, int y)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    if ( window == NULL )
+        window = mouse->focus;
+
+    if ( window == NULL )
+        return;
+
+    if (mouse->WarpMouse) {
+        mouse->WarpMouse(window, x, y);
+    } else {
+        SDL_SendMouseMotion(window, mouse->mouseID, 0, x, y);
+    }
+}
+
+static SDL_bool
+ShouldUseRelativeModeWarp(SDL_Mouse *mouse)
+{
+    const char *hint;
+
+    if (!mouse->SetRelativeMouseMode) {
+        return SDL_TRUE;
+    }
+
+    hint = SDL_GetHint(SDL_HINT_MOUSE_RELATIVE_MODE_WARP);
+    if (hint) {
+        if (*hint == '0') {
+            return SDL_FALSE;
+        } else {
+            return SDL_TRUE;
+        }
+    }
+    return SDL_FALSE;
+}
+
+int
+SDL_SetRelativeMouseMode(SDL_bool enabled)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    SDL_Window *focusWindow = SDL_GetKeyboardFocus();
+
+    if (enabled == mouse->relative_mode) {
+        return 0;
+    }
+
+    if (enabled && focusWindow) {
+        /* Center it in the focused window to prevent clicks from going through
+         * to background windows.
+         */
+        SDL_SetMouseFocus(focusWindow);
+        SDL_WarpMouseInWindow(focusWindow, focusWindow->w/2, focusWindow->h/2);
+    }
+
+    /* Set the relative mode */
+    if (!enabled && mouse->relative_mode_warp) {
+        mouse->relative_mode_warp = SDL_FALSE;
+    } else if (enabled && ShouldUseRelativeModeWarp(mouse)) {
+        mouse->relative_mode_warp = SDL_TRUE;
+    } else if (mouse->SetRelativeMouseMode(enabled) < 0) {
+        if (enabled) {
+            // Fall back to warp mode if native relative mode failed
+            mouse->relative_mode_warp = SDL_TRUE;
+        }
+    }
+    mouse->relative_mode = enabled;
+
+    if (mouse->focus) {
+        SDL_UpdateWindowGrab(mouse->focus);
+
+        /* Put the cursor back to where the application expects it */
+        if (!enabled) {
+            SDL_WarpMouseInWindow(mouse->focus, mouse->x, mouse->y);
+        }
+    }
+
+    /* Flush pending mouse motion - ideally we would pump events, but that's not always safe */
+    SDL_FlushEvent(SDL_MOUSEMOTION);
+
+    /* Update cursor visibility */
+    SDL_SetCursor(NULL);
+
+    return 0;
+}
+
+SDL_bool
+SDL_GetRelativeMouseMode()
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    return mouse->relative_mode;
+}
+
+SDL_Cursor *
+SDL_CreateCursor(const Uint8 * data, const Uint8 * mask,
+                 int w, int h, int hot_x, int hot_y)
+{
+    SDL_Surface *surface;
+    SDL_Cursor *cursor;
+    int x, y;
+    Uint32 *pixel;
+    Uint8 datab = 0, maskb = 0;
+    const Uint32 black = 0xFF000000;
+    const Uint32 white = 0xFFFFFFFF;
+    const Uint32 transparent = 0x00000000;
+
+    /* Make sure the width is a multiple of 8 */
+    w = ((w + 7) & ~7);
+
+    /* Create the surface from a bitmap */
+    surface = SDL_CreateRGBSurface(0, w, h, 32,
+                                   0x00FF0000,
+                                   0x0000FF00,
+                                   0x000000FF,
+                                   0xFF000000);
+    if (!surface) {
+        return NULL;
+    }
+    for (y = 0; y < h; ++y) {
+        pixel = (Uint32 *) ((Uint8 *) surface->pixels + y * surface->pitch);
+        for (x = 0; x < w; ++x) {
+            if ((x % 8) == 0) {
+                datab = *data++;
+                maskb = *mask++;
+            }
+            if (maskb & 0x80) {
+                *pixel++ = (datab & 0x80) ? black : white;
+            } else {
+                *pixel++ = (datab & 0x80) ? black : transparent;
+            }
+            datab <<= 1;
+            maskb <<= 1;
+        }
+    }
+
+    cursor = SDL_CreateColorCursor(surface, hot_x, hot_y);
+
+    SDL_FreeSurface(surface);
+
+    return cursor;
+}
+
+SDL_Cursor *
+SDL_CreateColorCursor(SDL_Surface *surface, int hot_x, int hot_y)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    SDL_Surface *temp = NULL;
+    SDL_Cursor *cursor;
+
+    if (!surface) {
+        SDL_SetError("Passed NULL cursor surface");
+        return NULL;
+    }
+
+    if (!mouse->CreateCursor) {
+        SDL_SetError("Cursors are not currently supported");
+        return NULL;
+    }
+
+    /* Sanity check the hot spot */
+    if ((hot_x < 0) || (hot_y < 0) ||
+        (hot_x >= surface->w) || (hot_y >= surface->h)) {
+        SDL_SetError("Cursor hot spot doesn't lie within cursor");
+        return NULL;
+    }
+
+    if (surface->format->format != SDL_PIXELFORMAT_ARGB8888) {
+        temp = SDL_ConvertSurfaceFormat(surface, SDL_PIXELFORMAT_ARGB8888, 0);
+        if (!temp) {
+            return NULL;
+        }
+        surface = temp;
+    }
+
+    cursor = mouse->CreateCursor(surface, hot_x, hot_y);
+    if (cursor) {
+        cursor->next = mouse->cursors;
+        mouse->cursors = cursor;
+    }
+
+    SDL_FreeSurface(temp);
+
+    return cursor;
+}
+
+SDL_Cursor *
+SDL_CreateSystemCursor(SDL_SystemCursor id)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    SDL_Cursor *cursor;
+
+    if (!mouse->CreateSystemCursor) {
+        SDL_SetError("CreateSystemCursor is not currently supported");
+        return NULL;
+    }
+
+    cursor = mouse->CreateSystemCursor(id);
+    if (cursor) {
+        cursor->next = mouse->cursors;
+        mouse->cursors = cursor;
+    }
+
+    return cursor;
+}
+
+/* SDL_SetCursor(NULL) can be used to force the cursor redraw,
+   if this is desired for any reason.  This is used when setting
+   the video mode and when the SDL window gains the mouse focus.
+ */
+void
+SDL_SetCursor(SDL_Cursor * cursor)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    /* Set the new cursor */
+    if (cursor) {
+        /* Make sure the cursor is still valid for this mouse */
+        if (cursor != mouse->def_cursor) {
+            SDL_Cursor *found;
+            for (found = mouse->cursors; found; found = found->next) {
+                if (found == cursor) {
+                    break;
+                }
+            }
+            if (!found) {
+                SDL_SetError("Cursor not associated with the current mouse");
+                return;
+            }
+        }
+        mouse->cur_cursor = cursor;
+    } else {
+        if (mouse->focus) {
+            cursor = mouse->cur_cursor;
+        } else {
+            cursor = mouse->def_cursor;
+        }
+    }
+
+    if (cursor && mouse->cursor_shown && !mouse->relative_mode) {
+        if (mouse->ShowCursor) {
+            mouse->ShowCursor(cursor);
+        }
+    } else {
+        if (mouse->ShowCursor) {
+            mouse->ShowCursor(NULL);
+        }
+    }
+}
+
+SDL_Cursor *
+SDL_GetCursor(void)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    if (!mouse) {
+        return NULL;
+    }
+    return mouse->cur_cursor;
+}
+
+SDL_Cursor *
+SDL_GetDefaultCursor(void)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    if (!mouse) {
+        return NULL;
+    }
+    return mouse->def_cursor;
+}
+
+void
+SDL_FreeCursor(SDL_Cursor * cursor)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    SDL_Cursor *curr, *prev;
+
+    if (!cursor) {
+        return;
+    }
+
+    if (cursor == mouse->def_cursor) {
+        return;
+    }
+    if (cursor == mouse->cur_cursor) {
+        SDL_SetCursor(mouse->def_cursor);
+    }
+
+    for (prev = NULL, curr = mouse->cursors; curr;
+         prev = curr, curr = curr->next) {
+        if (curr == cursor) {
+            if (prev) {
+                prev->next = curr->next;
+            } else {
+                mouse->cursors = curr->next;
+            }
+
+            if (mouse->FreeCursor) {
+                mouse->FreeCursor(curr);
+            }
+            return;
+        }
+    }
+}
+
+int
+SDL_ShowCursor(int toggle)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    SDL_bool shown;
+
+    if (!mouse) {
+        return 0;
+    }
+
+    shown = mouse->cursor_shown;
+    if (toggle >= 0) {
+        if (toggle) {
+            mouse->cursor_shown = SDL_TRUE;
+        } else {
+            mouse->cursor_shown = SDL_FALSE;
+        }
+        if (mouse->cursor_shown != shown) {
+            SDL_SetCursor(NULL);
+        }
+    }
+    return shown;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_mouse_c.h b/Source/3rd Party/sdl/src/events/SDL_mouse_c.h
new file mode 100644
index 000000000..e0d917cbc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_mouse_c.h	
@@ -0,0 +1,121 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_mouse_c_h
+#define _SDL_mouse_c_h
+
+#include "SDL_mouse.h"
+
+typedef Uint32 SDL_MouseID;
+
+struct SDL_Cursor
+{
+    struct SDL_Cursor *next;
+    void *driverdata;
+};
+
+typedef struct
+{
+    int last_x, last_y;
+    Uint32 last_timestamp;
+    Uint8 click_count;
+} SDL_MouseClickState;
+
+typedef struct
+{
+    /* Create a cursor from a surface */
+    SDL_Cursor *(*CreateCursor) (SDL_Surface * surface, int hot_x, int hot_y);
+
+    /* Create a system cursor */
+    SDL_Cursor *(*CreateSystemCursor) (SDL_SystemCursor id);
+
+    /* Show the specified cursor, or hide if cursor is NULL */
+    int (*ShowCursor) (SDL_Cursor * cursor);
+
+    /* This is called when a mouse motion event occurs */
+    void (*MoveCursor) (SDL_Cursor * cursor);
+
+    /* Free a window manager cursor */
+    void (*FreeCursor) (SDL_Cursor * cursor);
+
+    /* Warp the mouse to (x,y) */
+    void (*WarpMouse) (SDL_Window * window, int x, int y);
+
+    /* Set relative mode */
+    int (*SetRelativeMouseMode) (SDL_bool enabled);
+
+    /* Data common to all mice */
+    SDL_MouseID mouseID;
+    SDL_Window *focus;
+    int x;
+    int y;
+    int xdelta;
+    int ydelta;
+    int last_x, last_y;         /* the last reported x and y coordinates */
+    Uint32 buttonstate;
+    SDL_bool relative_mode;
+    SDL_bool relative_mode_warp;
+
+    /* Data for double-click tracking */
+    int num_clickstates;
+    SDL_MouseClickState *clickstate;
+
+    SDL_Cursor *cursors;
+    SDL_Cursor *def_cursor;
+    SDL_Cursor *cur_cursor;
+    SDL_bool cursor_shown;
+
+    /* Driver-dependent data. */
+    void *driverdata;
+} SDL_Mouse;
+
+
+/* Initialize the mouse subsystem */
+extern int SDL_MouseInit(void);
+
+/* Get the mouse state structure */
+SDL_Mouse *SDL_GetMouse(void);
+
+/* Set the default double-click interval */
+extern void SDL_SetDoubleClickTime(Uint32 interval);
+
+/* Set the default mouse cursor */
+extern void SDL_SetDefaultCursor(SDL_Cursor * cursor);
+
+/* Set the mouse focus window */
+extern void SDL_SetMouseFocus(SDL_Window * window);
+
+/* Send a mouse motion event */
+extern int SDL_SendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relative, int x, int y);
+
+/* Send a mouse button event */
+extern int SDL_SendMouseButton(SDL_Window * window, SDL_MouseID mouseID, Uint8 state, Uint8 button);
+
+/* Send a mouse wheel event */
+extern int SDL_SendMouseWheel(SDL_Window * window, SDL_MouseID mouseID, int x, int y);
+
+/* Shutdown the mouse subsystem */
+extern void SDL_MouseQuit(void);
+
+#endif /* _SDL_mouse_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_quit.c b/Source/3rd Party/sdl/src/events/SDL_quit.c
new file mode 100644
index 000000000..db7af98fa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_quit.c	
@@ -0,0 +1,120 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* General quit handling code for SDL */
+
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+
+
+#ifdef HAVE_SIGNAL_H
+static void
+SDL_HandleSIG(int sig)
+{
+    /* Reset the signal handler */
+    signal(sig, SDL_HandleSIG);
+
+    /* Signal a quit interrupt */
+    SDL_SendQuit();
+}
+#endif /* HAVE_SIGNAL_H */
+
+/* Public functions */
+int
+SDL_QuitInit(void)
+{
+#ifdef HAVE_SIGACTION
+    struct sigaction action;
+    sigaction(SIGINT, NULL, &action);
+#ifdef HAVE_SA_SIGACTION
+    if ( action.sa_handler == SIG_DFL && action.sa_sigaction == (void*)SIG_DFL ) {
+#else
+    if ( action.sa_handler == SIG_DFL ) {
+#endif
+        action.sa_handler = SDL_HandleSIG;
+        sigaction(SIGINT, &action, NULL);
+    }
+    sigaction(SIGTERM, NULL, &action);
+
+#ifdef HAVE_SA_SIGACTION
+    if ( action.sa_handler == SIG_DFL && action.sa_sigaction == (void*)SIG_DFL ) {
+#else
+    if ( action.sa_handler == SIG_DFL ) {
+#endif
+        action.sa_handler = SDL_HandleSIG;
+        sigaction(SIGTERM, &action, NULL);
+    }
+#elif HAVE_SIGNAL_H
+    void (*ohandler) (int);
+
+    /* Both SIGINT and SIGTERM are translated into quit interrupts */
+    ohandler = signal(SIGINT, SDL_HandleSIG);
+    if (ohandler != SIG_DFL)
+        signal(SIGINT, ohandler);
+    ohandler = signal(SIGTERM, SDL_HandleSIG);
+    if (ohandler != SIG_DFL)
+        signal(SIGTERM, ohandler);
+#endif /* HAVE_SIGNAL_H */
+
+    /* That's it! */
+    return (0);
+}
+
+void
+SDL_QuitQuit(void)
+{
+#ifdef HAVE_SIGACTION
+    struct sigaction action;
+    sigaction(SIGINT, NULL, &action);
+    if ( action.sa_handler == SDL_HandleSIG ) {
+        action.sa_handler = SIG_DFL;
+        sigaction(SIGINT, &action, NULL);
+    }
+    sigaction(SIGTERM, NULL, &action);
+    if ( action.sa_handler == SDL_HandleSIG ) {
+        action.sa_handler = SIG_DFL;
+        sigaction(SIGTERM, &action, NULL);
+    }
+#elif HAVE_SIGNAL_H
+    void (*ohandler) (int);
+
+    ohandler = signal(SIGINT, SIG_DFL);
+    if (ohandler != SDL_HandleSIG)
+        signal(SIGINT, ohandler);
+    ohandler = signal(SIGTERM, SIG_DFL);
+    if (ohandler != SDL_HandleSIG)
+        signal(SIGTERM, ohandler);
+#endif /* HAVE_SIGNAL_H */
+}
+
+/* This function returns 1 if it's okay to close the application window */
+int
+SDL_SendQuit(void)
+{
+    return SDL_SendAppEvent(SDL_QUIT);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_sysevents.h b/Source/3rd Party/sdl/src/events/SDL_sysevents.h
new file mode 100644
index 000000000..a5be7bc31
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_sysevents.h	
@@ -0,0 +1,36 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "../video/SDL_sysvideo.h"
+
+/* Useful functions and variables from SDL_sysevents.c */
+
+#if defined(__HAIKU__)
+/* The Haiku event loops run in a separate thread */
+#define MUST_THREAD_EVENTS
+#endif
+
+#ifdef __WIN32__              /* Windows doesn't allow a separate event thread */
+#define CANT_THREAD_EVENTS
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_touch.c b/Source/3rd Party/sdl/src/events/SDL_touch.c
new file mode 100644
index 000000000..14a337a9a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_touch.c	
@@ -0,0 +1,362 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* General touch handling code for SDL */
+
+#include "SDL_assert.h"
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+
+
+static int SDL_num_touch = 0;
+static SDL_Touch **SDL_touchDevices = NULL;
+
+
+/* Public functions */
+int
+SDL_TouchInit(void)
+{
+    return (0);
+}
+
+int
+SDL_GetNumTouchDevices(void)
+{
+    return SDL_num_touch;
+}
+
+SDL_TouchID
+SDL_GetTouchDevice(int index)
+{
+    if (index < 0 || index >= SDL_num_touch) {
+        SDL_SetError("Unknown touch device");
+        return 0;
+    }
+    return SDL_touchDevices[index]->id;
+}
+
+static int
+SDL_GetTouchIndex(SDL_TouchID id)
+{
+    int index;
+    SDL_Touch *touch;
+
+    for (index = 0; index < SDL_num_touch; ++index) {
+        touch = SDL_touchDevices[index];
+        if (touch->id == id) {
+            return index;
+        }
+    }
+    return -1;
+}
+
+SDL_Touch *
+SDL_GetTouch(SDL_TouchID id)
+{
+    int index = SDL_GetTouchIndex(id);
+    if (index < 0 || index >= SDL_num_touch) {
+        SDL_SetError("Unknown touch device");
+        return NULL;
+    }
+    return SDL_touchDevices[index];
+}
+
+static int
+SDL_GetFingerIndex(const SDL_Touch * touch, SDL_FingerID fingerid)
+{
+    int index;
+    for (index = 0; index < touch->num_fingers; ++index) {
+        if (touch->fingers[index]->id == fingerid) {
+            return index;
+        }
+    }
+    return -1;
+}
+
+SDL_Finger *
+SDL_GetFinger(const SDL_Touch * touch, SDL_FingerID id)
+{
+    int index = SDL_GetFingerIndex(touch, id);
+    if (index < 0 || index >= touch->num_fingers) {
+        return NULL;
+    }
+    return touch->fingers[index];
+}
+
+int
+SDL_GetNumTouchFingers(SDL_TouchID touchID)
+{
+    SDL_Touch *touch = SDL_GetTouch(touchID);
+    if (touch) {
+        return touch->num_fingers;
+    }
+    return 0;
+}
+
+SDL_Finger *
+SDL_GetTouchFinger(SDL_TouchID touchID, int index)
+{
+    SDL_Touch *touch = SDL_GetTouch(touchID);
+    if (!touch) {
+        return NULL;
+    }
+    if (index < 0 || index >= touch->num_fingers) {
+        SDL_SetError("Unknown touch finger");
+        return NULL;
+    }
+    return touch->fingers[index];
+}
+
+int
+SDL_AddTouch(SDL_TouchID touchID, const char *name)
+{
+    SDL_Touch **touchDevices;
+    int index;
+
+    index = SDL_GetTouchIndex(touchID);
+    if (index >= 0) {
+        return index;
+    }
+
+    /* Add the touch to the list of touch */
+    touchDevices = (SDL_Touch **) SDL_realloc(SDL_touchDevices,
+                                      (SDL_num_touch + 1) * sizeof(*touchDevices));
+    if (!touchDevices) {
+        return SDL_OutOfMemory();
+    }
+
+    SDL_touchDevices = touchDevices;
+    index = SDL_num_touch++;
+
+    SDL_touchDevices[index] = (SDL_Touch *) SDL_malloc(sizeof(*SDL_touchDevices[index]));
+    if (!SDL_touchDevices[index]) {
+        return SDL_OutOfMemory();
+    }
+
+    /* we're setting the touch properties */
+    SDL_touchDevices[index]->id = touchID;
+    SDL_touchDevices[index]->num_fingers = 0;
+    SDL_touchDevices[index]->max_fingers = 0;
+    SDL_touchDevices[index]->fingers = NULL;
+
+    /* Record this touch device for gestures */
+    /* We could do this on the fly in the gesture code if we wanted */
+    SDL_GestureAddTouch(touchID);
+
+    return index;
+}
+
+static int
+SDL_AddFinger(SDL_Touch *touch, SDL_FingerID fingerid, float x, float y, float pressure)
+{
+    SDL_Finger *finger;
+
+    if (touch->num_fingers == touch->max_fingers) {
+        SDL_Finger **new_fingers;
+        new_fingers = (SDL_Finger **)SDL_realloc(touch->fingers, (touch->max_fingers+1)*sizeof(*touch->fingers));
+        if (!new_fingers) {
+            return SDL_OutOfMemory();
+        }
+        touch->fingers = new_fingers;
+        touch->fingers[touch->max_fingers] = (SDL_Finger *)SDL_malloc(sizeof(*finger));
+        if (!touch->fingers[touch->max_fingers]) {
+            return SDL_OutOfMemory();
+        }
+        touch->max_fingers++;
+    }
+
+    finger = touch->fingers[touch->num_fingers++];
+    finger->id = fingerid;
+    finger->x = x;
+    finger->y = y;
+    finger->pressure = pressure;
+    return 0;
+}
+
+static int
+SDL_DelFinger(SDL_Touch* touch, SDL_FingerID fingerid)
+{
+    SDL_Finger *temp;
+
+    int index = SDL_GetFingerIndex(touch, fingerid);
+    if (index < 0) {
+        return -1;
+    }
+
+    touch->num_fingers--;
+    temp = touch->fingers[index];
+    touch->fingers[index] = touch->fingers[touch->num_fingers];
+    touch->fingers[touch->num_fingers] = temp;
+    return 0;
+}
+
+int
+SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid,
+              SDL_bool down, float x, float y, float pressure)
+{
+    int posted;
+    SDL_Finger *finger;
+
+    SDL_Touch* touch = SDL_GetTouch(id);
+    if (!touch) {
+        return -1;
+    }
+
+    finger = SDL_GetFinger(touch, fingerid);
+    if (down) {
+        if (finger) {
+            /* This finger is already down */
+            return 0;
+        }
+
+        if (SDL_AddFinger(touch, fingerid, x, y, pressure) < 0) {
+            return 0;
+        }
+
+        posted = 0;
+        if (SDL_GetEventState(SDL_FINGERDOWN) == SDL_ENABLE) {
+            SDL_Event event;
+            event.tfinger.type = SDL_FINGERDOWN;
+            event.tfinger.touchId = id;
+            event.tfinger.fingerId = fingerid;
+            event.tfinger.x = x;
+            event.tfinger.y = y;
+            event.tfinger.dx = 0;
+            event.tfinger.dy = 0;
+            event.tfinger.pressure = pressure;
+            posted = (SDL_PushEvent(&event) > 0);
+        }
+    } else {
+        if (!finger) {
+            /* This finger is already up */
+            return 0;
+        }
+
+        posted = 0;
+        if (SDL_GetEventState(SDL_FINGERUP) == SDL_ENABLE) {
+            SDL_Event event;
+            event.tfinger.type = SDL_FINGERUP;
+            event.tfinger.touchId =  id;
+            event.tfinger.fingerId = fingerid;
+            /* I don't trust the coordinates passed on fingerUp */
+            event.tfinger.x = finger->x;
+            event.tfinger.y = finger->y;
+            event.tfinger.dx = 0;
+            event.tfinger.dy = 0;
+            event.tfinger.pressure = pressure;
+            posted = (SDL_PushEvent(&event) > 0);
+        }
+
+        SDL_DelFinger(touch, fingerid);
+    }
+    return posted;
+}
+
+int
+SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid,
+                    float x, float y, float pressure)
+{
+    SDL_Touch *touch;
+    SDL_Finger *finger;
+    int posted;
+    float xrel, yrel, prel;
+
+    touch = SDL_GetTouch(id);
+    if (!touch) {
+        return -1;
+    }
+
+    finger = SDL_GetFinger(touch,fingerid);
+    if (!finger) {
+        return SDL_SendTouch(id, fingerid, SDL_TRUE, x, y, pressure);
+    }
+
+    xrel = x - finger->x;
+    yrel = y - finger->y;
+    prel = pressure - finger->pressure;
+
+    /* Drop events that don't change state */
+    if (!xrel && !yrel && !prel) {
+#if 0
+        printf("Touch event didn't change state - dropped!\n");
+#endif
+        return 0;
+    }
+
+    /* Update internal touch coordinates */
+    finger->x = x;
+    finger->y = y;
+    finger->pressure = pressure;
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(SDL_FINGERMOTION) == SDL_ENABLE) {
+        SDL_Event event;
+        event.tfinger.type = SDL_FINGERMOTION;
+        event.tfinger.touchId = id;
+        event.tfinger.fingerId = fingerid;
+        event.tfinger.x = x;
+        event.tfinger.y = y;
+        event.tfinger.dx = xrel;
+        event.tfinger.dy = yrel;
+        event.tfinger.pressure = pressure;
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+    return posted;
+}
+
+void
+SDL_DelTouch(SDL_TouchID id)
+{
+    int i;
+    int index = SDL_GetTouchIndex(id);
+    SDL_Touch *touch = SDL_GetTouch(id);
+
+    if (!touch) {
+        return;
+    }
+
+    for (i = 0; i < touch->max_fingers; ++i) {
+        SDL_free(touch->fingers[i]);
+    }
+    SDL_free(touch->fingers);
+    SDL_free(touch);
+
+    SDL_num_touch--;
+    SDL_touchDevices[index] = SDL_touchDevices[SDL_num_touch];
+}
+
+void
+SDL_TouchQuit(void)
+{
+    int i;
+
+    for (i = SDL_num_touch; i--; ) {
+        SDL_DelTouch(SDL_touchDevices[i]->id);
+    }
+    SDL_assert(SDL_num_touch == 0);
+
+    SDL_free(SDL_touchDevices);
+    SDL_touchDevices = NULL;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_touch_c.h b/Source/3rd Party/sdl/src/events/SDL_touch_c.h
new file mode 100644
index 000000000..f9781789c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_touch_c.h	
@@ -0,0 +1,61 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+#include "../../include/SDL_touch.h"
+
+#ifndef _SDL_touch_c_h
+#define _SDL_touch_c_h
+
+typedef struct SDL_Touch
+{
+    SDL_TouchID id;
+    int num_fingers;
+    int max_fingers;
+    SDL_Finger** fingers;
+} SDL_Touch;
+
+
+/* Initialize the touch subsystem */
+extern int SDL_TouchInit(void);
+
+/* Add a touch, returning the index of the touch, or -1 if there was an error. */
+extern int SDL_AddTouch(SDL_TouchID id, const char *name);
+
+/* Get the touch with a given id */
+extern SDL_Touch *SDL_GetTouch(SDL_TouchID id);
+
+/* Send a touch down/up event for a touch */
+extern int SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid,
+                         SDL_bool down, float x, float y, float pressure);
+
+/* Send a touch motion event for a touch */
+extern int SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid,
+                               float x, float y, float pressure);
+
+/* Remove a touch */
+extern void SDL_DelTouch(SDL_TouchID id);
+
+/* Shutdown the touch subsystem */
+extern void SDL_TouchQuit(void);
+
+#endif /* _SDL_touch_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_windowevents.c b/Source/3rd Party/sdl/src/events/SDL_windowevents.c
new file mode 100644
index 000000000..146cbc540
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_windowevents.c	
@@ -0,0 +1,210 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Window event handling code for SDL */
+
+#include "SDL_events.h"
+#include "SDL_events_c.h"
+#include "SDL_mouse_c.h"
+#include "../video/SDL_sysvideo.h"
+
+
+static int
+RemovePendingResizedEvents(void * userdata, SDL_Event *event)
+{
+    SDL_Event *new_event = (SDL_Event *)userdata;
+
+    if (event->type == SDL_WINDOWEVENT &&
+        event->window.event == SDL_WINDOWEVENT_RESIZED &&
+        event->window.windowID == new_event->window.windowID) {
+        /* We're about to post a new size event, drop the old one */
+        return 0;
+    }
+    return 1;
+}
+
+static int
+RemovePendingSizeChangedEvents(void * userdata, SDL_Event *event)
+{
+    SDL_Event *new_event = (SDL_Event *)userdata;
+
+    if (event->type == SDL_WINDOWEVENT &&
+        event->window.event == SDL_WINDOWEVENT_SIZE_CHANGED &&
+        event->window.windowID == new_event->window.windowID) {
+        /* We're about to post a new size event, drop the old one */
+        return 0;
+    }
+    return 1;
+}
+
+static int
+RemovePendingMoveEvents(void * userdata, SDL_Event *event)
+{
+    SDL_Event *new_event = (SDL_Event *)userdata;
+
+    if (event->type == SDL_WINDOWEVENT &&
+        event->window.event == SDL_WINDOWEVENT_MOVED &&
+        event->window.windowID == new_event->window.windowID) {
+        /* We're about to post a new move event, drop the old one */
+        return 0;
+    }
+    return 1;
+}
+
+int
+SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent, int data1,
+                    int data2)
+{
+    int posted;
+
+    if (!window) {
+        return 0;
+    }
+    switch (windowevent) {
+    case SDL_WINDOWEVENT_SHOWN:
+        if (window->flags & SDL_WINDOW_SHOWN) {
+            return 0;
+        }
+        window->flags &= ~SDL_WINDOW_HIDDEN;
+        window->flags |= SDL_WINDOW_SHOWN;
+        SDL_OnWindowShown(window);
+        break;
+    case SDL_WINDOWEVENT_HIDDEN:
+        if (!(window->flags & SDL_WINDOW_SHOWN)) {
+            return 0;
+        }
+        window->flags &= ~SDL_WINDOW_SHOWN;
+        window->flags |= SDL_WINDOW_HIDDEN;
+        SDL_OnWindowHidden(window);
+        break;
+    case SDL_WINDOWEVENT_MOVED:
+        if (SDL_WINDOWPOS_ISUNDEFINED(data1) ||
+            SDL_WINDOWPOS_ISUNDEFINED(data2)) {
+            return 0;
+        }
+        if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
+            window->windowed.x = data1;
+            window->windowed.y = data2;
+        }
+        if (data1 == window->x && data2 == window->y) {
+            return 0;
+        }
+        window->x = data1;
+        window->y = data2;
+        break;
+    case SDL_WINDOWEVENT_RESIZED:
+        if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
+            window->windowed.w = data1;
+            window->windowed.h = data2;
+        }
+        if (data1 == window->w && data2 == window->h) {
+            return 0;
+        }
+        window->w = data1;
+        window->h = data2;
+        SDL_OnWindowResized(window);
+        break;
+    case SDL_WINDOWEVENT_MINIMIZED:
+        if (window->flags & SDL_WINDOW_MINIMIZED) {
+            return 0;
+        }
+        window->flags |= SDL_WINDOW_MINIMIZED;
+        SDL_OnWindowMinimized(window);
+        break;
+    case SDL_WINDOWEVENT_MAXIMIZED:
+        if (window->flags & SDL_WINDOW_MAXIMIZED) {
+            return 0;
+        }
+        window->flags |= SDL_WINDOW_MAXIMIZED;
+        break;
+    case SDL_WINDOWEVENT_RESTORED:
+        if (!(window->flags & (SDL_WINDOW_MINIMIZED | SDL_WINDOW_MAXIMIZED))) {
+            return 0;
+        }
+        window->flags &= ~(SDL_WINDOW_MINIMIZED | SDL_WINDOW_MAXIMIZED);
+        SDL_OnWindowRestored(window);
+        break;
+    case SDL_WINDOWEVENT_ENTER:
+        if (window->flags & SDL_WINDOW_MOUSE_FOCUS) {
+            return 0;
+        }
+        window->flags |= SDL_WINDOW_MOUSE_FOCUS;
+        SDL_OnWindowEnter(window);
+        break;
+    case SDL_WINDOWEVENT_LEAVE:
+        if (!(window->flags & SDL_WINDOW_MOUSE_FOCUS)) {
+            return 0;
+        }
+        window->flags &= ~SDL_WINDOW_MOUSE_FOCUS;
+        SDL_OnWindowLeave(window);
+        break;
+    case SDL_WINDOWEVENT_FOCUS_GAINED:
+        if (window->flags & SDL_WINDOW_INPUT_FOCUS) {
+            return 0;
+        }
+        window->flags |= SDL_WINDOW_INPUT_FOCUS;
+        SDL_OnWindowFocusGained(window);
+        break;
+    case SDL_WINDOWEVENT_FOCUS_LOST:
+        if (!(window->flags & SDL_WINDOW_INPUT_FOCUS)) {
+            return 0;
+        }
+        window->flags &= ~SDL_WINDOW_INPUT_FOCUS;
+        SDL_OnWindowFocusLost(window);
+        break;
+    }
+
+    /* Post the event, if desired */
+    posted = 0;
+    if (SDL_GetEventState(SDL_WINDOWEVENT) == SDL_ENABLE) {
+        SDL_Event event;
+        event.type = SDL_WINDOWEVENT;
+        event.window.event = windowevent;
+        event.window.data1 = data1;
+        event.window.data2 = data2;
+        event.window.windowID = window->id;
+
+        /* Fixes queue overflow with resize events that aren't processed */
+        if (windowevent == SDL_WINDOWEVENT_RESIZED) {
+            SDL_FilterEvents(RemovePendingResizedEvents, &event);
+        }
+        if (windowevent == SDL_WINDOWEVENT_SIZE_CHANGED) {
+            SDL_FilterEvents(RemovePendingSizeChangedEvents, &event);
+        }
+        if (windowevent == SDL_WINDOWEVENT_MOVED) {
+            SDL_FilterEvents(RemovePendingMoveEvents, &event);
+        }
+
+        posted = (SDL_PushEvent(&event) > 0);
+    }
+
+    if (windowevent == SDL_WINDOWEVENT_CLOSE) {
+        if ( !window->prev && !window->next ) {
+            /* This is the last window in the list so send the SDL_QUIT event */
+            SDL_SendQuit();
+        }
+    }
+
+    return (posted);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/SDL_windowevents_c.h b/Source/3rd Party/sdl/src/events/SDL_windowevents_c.h
new file mode 100644
index 000000000..9ad34a342
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/SDL_windowevents_c.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_windowevents_c_h
+#define _SDL_windowevents_c_h
+
+extern int SDL_SendWindowEvent(SDL_Window * window, Uint8 windowevent,
+                               int data1, int data2);
+
+#endif /* _SDL_windowevents_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/blank_cursor.h b/Source/3rd Party/sdl/src/events/blank_cursor.h
new file mode 100644
index 000000000..423fa1386
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/blank_cursor.h	
@@ -0,0 +1,33 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * A default blank 8x8 cursor                                                */
+
+#define BLANK_CWIDTH    8
+#define BLANK_CHEIGHT   8
+#define BLANK_CHOTX 0
+#define BLANK_CHOTY 0
+
+static const unsigned char blank_cdata[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+static const unsigned char blank_cmask[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/default_cursor.h b/Source/3rd Party/sdl/src/events/default_cursor.h
new file mode 100644
index 000000000..6e09380ef
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/default_cursor.h	
@@ -0,0 +1,114 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Default cursor - it happens to be the Mac cursor, but could be anything   */
+
+#define DEFAULT_CWIDTH  16
+#define DEFAULT_CHEIGHT 16
+#define DEFAULT_CHOTX   0
+#define DEFAULT_CHOTY   0
+
+/* Added a real MacOS cursor, at the request of Luc-Olivier de Charri�re */
+#define USE_MACOS_CURSOR
+
+#ifdef USE_MACOS_CURSOR
+
+static const unsigned char default_cdata[] = {
+    0x00, 0x00,
+    0x40, 0x00,
+    0x60, 0x00,
+    0x70, 0x00,
+    0x78, 0x00,
+    0x7C, 0x00,
+    0x7E, 0x00,
+    0x7F, 0x00,
+    0x7F, 0x80,
+    0x7C, 0x00,
+    0x6C, 0x00,
+    0x46, 0x00,
+    0x06, 0x00,
+    0x03, 0x00,
+    0x03, 0x00,
+    0x00, 0x00
+};
+
+static const unsigned char default_cmask[] = {
+    0xC0, 0x00,
+    0xE0, 0x00,
+    0xF0, 0x00,
+    0xF8, 0x00,
+    0xFC, 0x00,
+    0xFE, 0x00,
+    0xFF, 0x00,
+    0xFF, 0x80,
+    0xFF, 0xC0,
+    0xFF, 0xE0,
+    0xFE, 0x00,
+    0xEF, 0x00,
+    0xCF, 0x00,
+    0x87, 0x80,
+    0x07, 0x80,
+    0x03, 0x00
+};
+
+#else
+
+static const unsigned char default_cdata[] = {
+    0x00, 0x00,
+    0x40, 0x00,
+    0x60, 0x00,
+    0x70, 0x00,
+    0x78, 0x00,
+    0x7C, 0x00,
+    0x7E, 0x00,
+    0x7F, 0x00,
+    0x7F, 0x80,
+    0x7C, 0x00,
+    0x6C, 0x00,
+    0x46, 0x00,
+    0x06, 0x00,
+    0x03, 0x00,
+    0x03, 0x00,
+    0x00, 0x00
+};
+
+static const unsigned char default_cmask[] = {
+    0x40, 0x00,
+    0xE0, 0x00,
+    0xF0, 0x00,
+    0xF8, 0x00,
+    0xFC, 0x00,
+    0xFE, 0x00,
+    0xFF, 0x00,
+    0xFF, 0x80,
+    0xFF, 0xC0,
+    0xFF, 0x80,
+    0xFE, 0x00,
+    0xEF, 0x00,
+    0x4F, 0x00,
+    0x07, 0x80,
+    0x07, 0x80,
+    0x03, 0x00
+};
+
+#endif /* TRUE_MACINTOSH_CURSOR */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/events/scancodes_darwin.h b/Source/3rd Party/sdl/src/events/scancodes_darwin.h
new file mode 100644
index 000000000..42fcbdfa2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/scancodes_darwin.h	
@@ -0,0 +1,159 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* Mac virtual key code to SDL scancode mapping table
+   Sources:
+   - Inside Macintosh: Text <http://developer.apple.com/documentation/mac/Text/Text-571.html>
+   - Apple USB keyboard driver source <http://darwinsource.opendarwin.org/10.4.6.ppc/IOHIDFamily-172.8/IOHIDFamily/Cosmo_USB2ADB.c>
+   - experimentation on various ADB and USB ISO keyboards and one ADB ANSI keyboard
+*/
+/* *INDENT-OFF* */
+static const SDL_Scancode darwin_scancode_table[] = {
+    /*   0 */   SDL_SCANCODE_A,
+    /*   1 */   SDL_SCANCODE_S,
+    /*   2 */   SDL_SCANCODE_D,
+    /*   3 */   SDL_SCANCODE_F,
+    /*   4 */   SDL_SCANCODE_H,
+    /*   5 */   SDL_SCANCODE_G,
+    /*   6 */   SDL_SCANCODE_Z,
+    /*   7 */   SDL_SCANCODE_X,
+    /*   8 */   SDL_SCANCODE_C,
+    /*   9 */   SDL_SCANCODE_V,
+    /*  10 */   SDL_SCANCODE_NONUSBACKSLASH, /* SDL_SCANCODE_NONUSBACKSLASH on ANSI and JIS keyboards (if this key would exist there), SDL_SCANCODE_GRAVE on ISO. (The USB keyboard driver actually translates these usage codes to different virtual key codes depending on whether the keyboard is ISO/ANSI/JIS. That's why you have to help it identify the keyboard type when you plug in a PC USB keyboard. It's a historical thing - ADB keyboards are wired this way.) */
+    /*  11 */   SDL_SCANCODE_B,
+    /*  12 */   SDL_SCANCODE_Q,
+    /*  13 */   SDL_SCANCODE_W,
+    /*  14 */   SDL_SCANCODE_E,
+    /*  15 */   SDL_SCANCODE_R,
+    /*  16 */   SDL_SCANCODE_Y,
+    /*  17 */   SDL_SCANCODE_T,
+    /*  18 */   SDL_SCANCODE_1,
+    /*  19 */   SDL_SCANCODE_2,
+    /*  20 */   SDL_SCANCODE_3,
+    /*  21 */   SDL_SCANCODE_4,
+    /*  22 */   SDL_SCANCODE_6,
+    /*  23 */   SDL_SCANCODE_5,
+    /*  24 */   SDL_SCANCODE_EQUALS,
+    /*  25 */   SDL_SCANCODE_9,
+    /*  26 */   SDL_SCANCODE_7,
+    /*  27 */   SDL_SCANCODE_MINUS,
+    /*  28 */   SDL_SCANCODE_8,
+    /*  29 */   SDL_SCANCODE_0,
+    /*  30 */   SDL_SCANCODE_RIGHTBRACKET,
+    /*  31 */   SDL_SCANCODE_O,
+    /*  32 */   SDL_SCANCODE_U,
+    /*  33 */   SDL_SCANCODE_LEFTBRACKET,
+    /*  34 */   SDL_SCANCODE_I,
+    /*  35 */   SDL_SCANCODE_P,
+    /*  36 */   SDL_SCANCODE_RETURN,
+    /*  37 */   SDL_SCANCODE_L,
+    /*  38 */   SDL_SCANCODE_J,
+    /*  39 */   SDL_SCANCODE_APOSTROPHE,
+    /*  40 */   SDL_SCANCODE_K,
+    /*  41 */   SDL_SCANCODE_SEMICOLON,
+    /*  42 */   SDL_SCANCODE_BACKSLASH,
+    /*  43 */   SDL_SCANCODE_COMMA,
+    /*  44 */   SDL_SCANCODE_SLASH,
+    /*  45 */   SDL_SCANCODE_N,
+    /*  46 */   SDL_SCANCODE_M,
+    /*  47 */   SDL_SCANCODE_PERIOD,
+    /*  48 */   SDL_SCANCODE_TAB,
+    /*  49 */   SDL_SCANCODE_SPACE,
+    /*  50 */   SDL_SCANCODE_GRAVE, /* SDL_SCANCODE_GRAVE on ANSI and JIS keyboards, SDL_SCANCODE_NONUSBACKSLASH on ISO (see comment about virtual key code 10 above) */
+    /*  51 */   SDL_SCANCODE_BACKSPACE,
+    /*  52 */   SDL_SCANCODE_KP_ENTER, /* keyboard enter on portables */
+    /*  53 */   SDL_SCANCODE_ESCAPE,
+    /*  54 */   SDL_SCANCODE_RGUI,
+    /*  55 */   SDL_SCANCODE_LGUI,
+    /*  56 */   SDL_SCANCODE_LSHIFT,
+    /*  57 */   SDL_SCANCODE_CAPSLOCK,
+    /*  58 */   SDL_SCANCODE_LALT,
+    /*  59 */   SDL_SCANCODE_LCTRL,
+    /*  60 */   SDL_SCANCODE_RSHIFT,
+    /*  61 */   SDL_SCANCODE_RALT,
+    /*  62 */   SDL_SCANCODE_RCTRL,
+    /*  63 */   SDL_SCANCODE_RGUI, /* fn on portables, acts as a hardware-level modifier already, so we don't generate events for it, also XK_Meta_R */
+    /*  64 */   SDL_SCANCODE_F17,
+    /*  65 */   SDL_SCANCODE_KP_PERIOD,
+    /*  66 */   SDL_SCANCODE_UNKNOWN, /* unknown (unused?) */
+    /*  67 */   SDL_SCANCODE_KP_MULTIPLY,
+    /*  68 */   SDL_SCANCODE_UNKNOWN, /* unknown (unused?) */
+    /*  69 */   SDL_SCANCODE_KP_PLUS,
+    /*  70 */   SDL_SCANCODE_UNKNOWN, /* unknown (unused?) */
+    /*  71 */   SDL_SCANCODE_NUMLOCKCLEAR,
+    /*  72 */   SDL_SCANCODE_VOLUMEUP,
+    /*  73 */   SDL_SCANCODE_VOLUMEDOWN,
+    /*  74 */   SDL_SCANCODE_MUTE,
+    /*  75 */   SDL_SCANCODE_KP_DIVIDE,
+    /*  76 */   SDL_SCANCODE_KP_ENTER, /* keypad enter on external keyboards, fn-return on portables */
+    /*  77 */   SDL_SCANCODE_UNKNOWN, /* unknown (unused?) */
+    /*  78 */   SDL_SCANCODE_KP_MINUS,
+    /*  79 */   SDL_SCANCODE_F18,
+    /*  80 */   SDL_SCANCODE_F19,
+    /*  81 */   SDL_SCANCODE_KP_EQUALS,
+    /*  82 */   SDL_SCANCODE_KP_0,
+    /*  83 */   SDL_SCANCODE_KP_1,
+    /*  84 */   SDL_SCANCODE_KP_2,
+    /*  85 */   SDL_SCANCODE_KP_3,
+    /*  86 */   SDL_SCANCODE_KP_4,
+    /*  87 */   SDL_SCANCODE_KP_5,
+    /*  88 */   SDL_SCANCODE_KP_6,
+    /*  89 */   SDL_SCANCODE_KP_7,
+    /*  90 */   SDL_SCANCODE_UNKNOWN, /* unknown (unused?) */
+    /*  91 */   SDL_SCANCODE_KP_8,
+    /*  92 */   SDL_SCANCODE_KP_9,
+    /*  93 */   SDL_SCANCODE_INTERNATIONAL3, /* Cosmo_USB2ADB.c says "Yen (JIS)" */
+    /*  94 */   SDL_SCANCODE_INTERNATIONAL1, /* Cosmo_USB2ADB.c says "Ro (JIS)" */
+    /*  95 */   SDL_SCANCODE_KP_COMMA, /* Cosmo_USB2ADB.c says ", JIS only" */
+    /*  96 */   SDL_SCANCODE_F5,
+    /*  97 */   SDL_SCANCODE_F6,
+    /*  98 */   SDL_SCANCODE_F7,
+    /*  99 */   SDL_SCANCODE_F3,
+    /* 100 */   SDL_SCANCODE_F8,
+    /* 101 */   SDL_SCANCODE_F9,
+    /* 102 */   SDL_SCANCODE_LANG2, /* Cosmo_USB2ADB.c says "Eisu" */
+    /* 103 */   SDL_SCANCODE_F11,
+    /* 104 */   SDL_SCANCODE_LANG1, /* Cosmo_USB2ADB.c says "Kana" */
+    /* 105 */   SDL_SCANCODE_PRINTSCREEN, /* On ADB keyboards, this key is labeled "F13/print screen". Problem: USB has different usage codes for these two functions. On Apple USB keyboards, the key is labeled "F13" and sends the F13 usage code (SDL_SCANCODE_F13). I decided to use SDL_SCANCODE_PRINTSCREEN here nevertheless since SDL applications are more likely to assume the presence of a print screen key than an F13 key. */
+    /* 106 */   SDL_SCANCODE_F16,
+    /* 107 */   SDL_SCANCODE_SCROLLLOCK, /* F14/scroll lock, see comment about F13/print screen above */
+    /* 108 */   SDL_SCANCODE_UNKNOWN, /* unknown (unused?) */
+    /* 109 */   SDL_SCANCODE_F10,
+    /* 110 */   SDL_SCANCODE_APPLICATION, /* windows contextual menu key, fn-enter on portables */
+    /* 111 */   SDL_SCANCODE_F12,
+    /* 112 */   SDL_SCANCODE_UNKNOWN, /* unknown (unused?) */
+    /* 113 */   SDL_SCANCODE_PAUSE, /* F15/pause, see comment about F13/print screen above */
+    /* 114 */   SDL_SCANCODE_INSERT, /* the key is actually labeled "help" on Apple keyboards, and works as such in Mac OS, but it sends the "insert" usage code even on Apple USB keyboards */
+    /* 115 */   SDL_SCANCODE_HOME,
+    /* 116 */   SDL_SCANCODE_PAGEUP,
+    /* 117 */   SDL_SCANCODE_DELETE,
+    /* 118 */   SDL_SCANCODE_F4,
+    /* 119 */   SDL_SCANCODE_END,
+    /* 120 */   SDL_SCANCODE_F2,
+    /* 121 */   SDL_SCANCODE_PAGEDOWN,
+    /* 122 */   SDL_SCANCODE_F1,
+    /* 123 */   SDL_SCANCODE_LEFT,
+    /* 124 */   SDL_SCANCODE_RIGHT,
+    /* 125 */   SDL_SCANCODE_DOWN,
+    /* 126 */   SDL_SCANCODE_UP,
+    /* 127 */   SDL_SCANCODE_POWER
+};
+/* *INDENT-ON* */
diff --git a/Source/3rd Party/sdl/src/events/scancodes_linux.h b/Source/3rd Party/sdl/src/events/scancodes_linux.h
new file mode 100644
index 000000000..dbf7a7a5b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/scancodes_linux.h	
@@ -0,0 +1,263 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../include/SDL_scancode.h"
+
+/* Linux virtual key code to SDL_Keycode mapping table
+   Sources:
+   - Linux kernel source input.h
+*/
+/* *INDENT-OFF* */
+static SDL_Scancode const linux_scancode_table[] = {
+    /*  0 */    SDL_SCANCODE_UNKNOWN,
+    /*  1 */    SDL_SCANCODE_ESCAPE,
+    /*  2 */    SDL_SCANCODE_1,
+    /*  3 */    SDL_SCANCODE_2,
+    /*  4 */    SDL_SCANCODE_3,
+    /*  5 */    SDL_SCANCODE_4,
+    /*  6 */    SDL_SCANCODE_5,
+    /*  7 */    SDL_SCANCODE_6,
+    /*  8 */    SDL_SCANCODE_7,
+    /*  9 */    SDL_SCANCODE_8,
+    /*  10 */    SDL_SCANCODE_9,
+    /*  11 */    SDL_SCANCODE_0,
+    /*  12 */    SDL_SCANCODE_MINUS,
+    /*  13 */    SDL_SCANCODE_EQUALS,
+    /*  14 */    SDL_SCANCODE_BACKSPACE,
+    /*  15 */    SDL_SCANCODE_TAB,
+    /*  16 */    SDL_SCANCODE_Q,
+    /*  17 */    SDL_SCANCODE_W,
+    /*  18 */    SDL_SCANCODE_E,
+    /*  19 */    SDL_SCANCODE_R,
+    /*  20 */    SDL_SCANCODE_T,
+    /*  21 */    SDL_SCANCODE_Y,
+    /*  22 */    SDL_SCANCODE_U,
+    /*  23 */    SDL_SCANCODE_I,
+    /*  24 */    SDL_SCANCODE_O,
+    /*  25 */    SDL_SCANCODE_P,
+    /*  26 */    SDL_SCANCODE_LEFTBRACKET,
+    /*  27 */    SDL_SCANCODE_RIGHTBRACKET,
+    /*  28 */    SDL_SCANCODE_RETURN,
+    /*  29 */    SDL_SCANCODE_LCTRL,
+    /*  30 */    SDL_SCANCODE_A,
+    /*  31 */    SDL_SCANCODE_S,
+    /*  32 */    SDL_SCANCODE_D,
+    /*  33 */    SDL_SCANCODE_F,
+    /*  34 */    SDL_SCANCODE_G,
+    /*  35 */    SDL_SCANCODE_H,
+    /*  36 */    SDL_SCANCODE_J,
+    /*  37 */    SDL_SCANCODE_K,
+    /*  38 */    SDL_SCANCODE_L,
+    /*  39 */    SDL_SCANCODE_SEMICOLON,
+    /*  40 */    SDL_SCANCODE_APOSTROPHE,
+    /*  41 */    SDL_SCANCODE_GRAVE,
+    /*  42 */    SDL_SCANCODE_LSHIFT,
+    /*  43 */    SDL_SCANCODE_BACKSLASH,
+    /*  44 */    SDL_SCANCODE_Z,
+    /*  45 */    SDL_SCANCODE_X,
+    /*  46 */    SDL_SCANCODE_C,
+    /*  47 */    SDL_SCANCODE_V,
+    /*  48 */    SDL_SCANCODE_B,
+    /*  49 */    SDL_SCANCODE_N,
+    /*  50 */    SDL_SCANCODE_M,
+    /*  51 */    SDL_SCANCODE_COMMA,
+    /*  52 */    SDL_SCANCODE_PERIOD,
+    /*  53 */    SDL_SCANCODE_SLASH,
+    /*  54 */    SDL_SCANCODE_RSHIFT,
+    /*  55 */    SDL_SCANCODE_KP_MULTIPLY,
+    /*  56 */    SDL_SCANCODE_LALT,
+    /*  57 */    SDL_SCANCODE_SPACE,
+    /*  58 */    SDL_SCANCODE_CAPSLOCK,
+    /*  59 */    SDL_SCANCODE_F1,
+    /*  60 */    SDL_SCANCODE_F2,
+    /*  61 */    SDL_SCANCODE_F3,
+    /*  62 */    SDL_SCANCODE_F4,
+    /*  63 */    SDL_SCANCODE_F5,
+    /*  64 */    SDL_SCANCODE_F6,
+    /*  65 */    SDL_SCANCODE_F7,
+    /*  66 */    SDL_SCANCODE_F8,
+    /*  67 */    SDL_SCANCODE_F9,
+    /*  68 */    SDL_SCANCODE_F10,
+    /*  69 */    SDL_SCANCODE_NUMLOCKCLEAR,
+    /*  70 */    SDL_SCANCODE_SCROLLLOCK,
+    /*  71 */    SDL_SCANCODE_KP_7,
+    /*  72 */    SDL_SCANCODE_KP_8,
+    /*  73 */    SDL_SCANCODE_KP_9,
+    /*  74 */    SDL_SCANCODE_KP_MINUS,
+    /*  75 */    SDL_SCANCODE_KP_4,
+    /*  76 */    SDL_SCANCODE_KP_5,
+    /*  77 */    SDL_SCANCODE_KP_6,
+    /*  78 */    SDL_SCANCODE_KP_PLUS,
+    /*  79 */    SDL_SCANCODE_KP_1,
+    /*  80 */    SDL_SCANCODE_KP_2,
+    /*  81 */    SDL_SCANCODE_KP_3,
+    /*  82 */    SDL_SCANCODE_KP_0,
+    /*  83 */    SDL_SCANCODE_KP_PERIOD,
+    0,
+    /*  85 */    SDL_SCANCODE_UNKNOWN, /* KEY_ZENKAKUHANKAKU */
+    /*  86 */    SDL_SCANCODE_NONUSBACKSLASH, /* KEY_102ND */
+    /*  87 */    SDL_SCANCODE_F11,
+    /*  88 */    SDL_SCANCODE_F12,
+    /*  89 */    SDL_SCANCODE_INTERNATIONAL1, /* KEY_RO */
+    /*  90 */    SDL_SCANCODE_LANG3, /* KEY_KATAKANA */
+    /*  91 */    SDL_SCANCODE_LANG4, /* KEY_HIRAGANA */
+    /*  92 */    SDL_SCANCODE_INTERNATIONAL4, /* KEY_HENKAN */
+    /*  93 */    SDL_SCANCODE_INTERNATIONAL2, /* KEY_KATAKANAHIRAGANA */
+    /*  94 */    SDL_SCANCODE_INTERNATIONAL5, /* KEY_MUHENKAN */
+    /*  95 */    SDL_SCANCODE_INTERNATIONAL5, /* KEY_KPJPCOMMA */
+    /*  96 */    SDL_SCANCODE_KP_ENTER,
+    /*  97 */    SDL_SCANCODE_RCTRL,
+    /*  98 */    SDL_SCANCODE_KP_DIVIDE,
+    /*  99 */    SDL_SCANCODE_SYSREQ,
+    /*  100 */    SDL_SCANCODE_RALT,
+    /*  101 */    SDL_SCANCODE_UNKNOWN, /* KEY_LINEFEED */
+    /*  102 */    SDL_SCANCODE_HOME,
+    /*  103 */    SDL_SCANCODE_UP,
+    /*  104 */    SDL_SCANCODE_PAGEUP,
+    /*  105 */    SDL_SCANCODE_LEFT,
+    /*  106 */    SDL_SCANCODE_RIGHT,
+    /*  107 */    SDL_SCANCODE_END,
+    /*  108 */    SDL_SCANCODE_DOWN,
+    /*  109 */    SDL_SCANCODE_PAGEDOWN,
+    /*  110 */    SDL_SCANCODE_INSERT,
+    /*  111 */    SDL_SCANCODE_DELETE,
+    /*  112 */    SDL_SCANCODE_UNKNOWN, /* KEY_MACRO */
+    /*  113 */    SDL_SCANCODE_MUTE,
+    /*  114 */    SDL_SCANCODE_VOLUMEDOWN,
+    /*  115 */    SDL_SCANCODE_VOLUMEUP,
+    /*  116 */    SDL_SCANCODE_POWER,
+    /*  117 */    SDL_SCANCODE_KP_EQUALS,
+    /*  118 */    SDL_SCANCODE_KP_PLUSMINUS,
+    /*  119 */    SDL_SCANCODE_PAUSE,
+    0,
+    /*  121 */    SDL_SCANCODE_KP_COMMA,
+    /*  122 */    SDL_SCANCODE_LANG1, /* KEY_HANGUEL */
+    /*  123 */    SDL_SCANCODE_LANG2, /* KEY_HANJA */
+    /*  124 */    SDL_SCANCODE_INTERNATIONAL3, /* KEY_YEN */
+    /*  125 */    SDL_SCANCODE_LGUI,
+    /*  126 */    SDL_SCANCODE_RGUI,
+    /*  127 */    SDL_SCANCODE_UNKNOWN, /* KEY_COMPOSE */
+    /*  128 */    SDL_SCANCODE_STOP,
+    /*  129 */    SDL_SCANCODE_AGAIN,
+    /*  130 */    SDL_SCANCODE_UNKNOWN, /* KEY_PROPS */
+    /*  131 */    SDL_SCANCODE_UNDO,
+    /*  132 */    SDL_SCANCODE_UNKNOWN, /* KEY_FRONT */
+    /*  133 */    SDL_SCANCODE_COPY,
+    /*  134 */    SDL_SCANCODE_UNKNOWN, /* KEY_OPEN */
+    /*  135 */    SDL_SCANCODE_PASTE,
+    /*  136 */    SDL_SCANCODE_FIND,
+    /*  137 */    SDL_SCANCODE_CUT,
+    /*  138 */    SDL_SCANCODE_HELP,
+    /*  139 */    SDL_SCANCODE_MENU,
+    /*  140 */    SDL_SCANCODE_CALCULATOR,
+    /*  141 */    SDL_SCANCODE_UNKNOWN, /* KEY_SETUP */
+    /*  142 */    SDL_SCANCODE_SLEEP,
+    /*  143 */    SDL_SCANCODE_UNKNOWN, /* KEY_WAKEUP */
+    /*  144 */    SDL_SCANCODE_UNKNOWN, /* KEY_FILE */
+    /*  145 */    SDL_SCANCODE_UNKNOWN, /* KEY_SENDFILE */
+    /*  146 */    SDL_SCANCODE_UNKNOWN, /* KEY_DELETEFILE */
+    /*  147 */    SDL_SCANCODE_UNKNOWN, /* KEY_XFER */
+    /*  148 */    SDL_SCANCODE_UNKNOWN, /* KEY_PROG1 */
+    /*  149 */    SDL_SCANCODE_UNKNOWN, /* KEY_PROG2 */
+    /*  150 */    SDL_SCANCODE_UNKNOWN, /* KEY_WWW */
+    /*  151 */    SDL_SCANCODE_UNKNOWN, /* KEY_MSDOS */
+    /*  152 */    SDL_SCANCODE_UNKNOWN, /* KEY_COFFEE */
+    /*  153 */    SDL_SCANCODE_UNKNOWN, /* KEY_DIRECTION */
+    /*  154 */    SDL_SCANCODE_UNKNOWN, /* KEY_CYCLEWINDOWS */
+    /*  155 */    SDL_SCANCODE_MAIL,
+    /*  156 */    SDL_SCANCODE_AC_BOOKMARKS,
+    /*  157 */    SDL_SCANCODE_COMPUTER,
+    /*  158 */    SDL_SCANCODE_AC_BACK,
+    /*  159 */    SDL_SCANCODE_AC_FORWARD,
+    /*  160 */    SDL_SCANCODE_UNKNOWN, /* KEY_CLOSECD */
+    /*  161 */    SDL_SCANCODE_EJECT, /* KEY_EJECTCD */
+    /*  162 */    SDL_SCANCODE_UNKNOWN, /* KEY_EJECTCLOSECD */
+    /*  163 */    SDL_SCANCODE_AUDIONEXT, /* KEY_NEXTSONG */
+    /*  164 */    SDL_SCANCODE_AUDIOPLAY, /* KEY_PLAYPAUSE */
+    /*  165 */    SDL_SCANCODE_AUDIOPREV, /* KEY_PREVIOUSSONG */
+    /*  166 */    SDL_SCANCODE_UNKNOWN, /* KEY_STOPCD */
+    /*  167 */    SDL_SCANCODE_UNKNOWN, /* KEY_RECORD */
+    /*  168 */    SDL_SCANCODE_UNKNOWN, /* KEY_REWIND */
+    /*  169 */    SDL_SCANCODE_UNKNOWN, /* KEY_PHONE */
+    /*  170 */    SDL_SCANCODE_UNKNOWN, /* KEY_ISO */
+    /*  171 */    SDL_SCANCODE_UNKNOWN, /* KEY_CONFIG */
+    /*  172 */    SDL_SCANCODE_AC_HOME,
+    /*  173 */    SDL_SCANCODE_AC_REFRESH,
+    /*  174 */    SDL_SCANCODE_UNKNOWN, /* KEY_EXIT */
+    /*  175 */    SDL_SCANCODE_UNKNOWN, /* KEY_MOVE */
+    /*  176 */    SDL_SCANCODE_UNKNOWN, /* KEY_EDIT */
+    /*  177 */    SDL_SCANCODE_UNKNOWN, /* KEY_SCROLLUP */
+    /*  178 */    SDL_SCANCODE_UNKNOWN, /* KEY_SCROLLDOWN */
+    /*  179 */    SDL_SCANCODE_KP_LEFTPAREN,
+    /*  180 */    SDL_SCANCODE_KP_RIGHTPAREN,
+    /*  181 */    SDL_SCANCODE_UNKNOWN, /* KEY_NEW */
+    /*  182 */    SDL_SCANCODE_UNKNOWN, /* KEY_REDO */
+    /*  183 */    SDL_SCANCODE_F13,
+    /*  184 */    SDL_SCANCODE_F14,
+    /*  185 */    SDL_SCANCODE_F15,
+    /*  186 */    SDL_SCANCODE_F16,
+    /*  187 */    SDL_SCANCODE_F17,
+    /*  188 */    SDL_SCANCODE_F18,
+    /*  189 */    SDL_SCANCODE_F19,
+    /*  190 */    SDL_SCANCODE_F20,
+    /*  191 */    SDL_SCANCODE_F21,
+    /*  192 */    SDL_SCANCODE_F22,
+    /*  193 */    SDL_SCANCODE_F23,
+    /*  194 */    SDL_SCANCODE_F24,
+    0, 0, 0, 0,
+    /*  200 */    SDL_SCANCODE_UNKNOWN, /* KEY_PLAYCD */
+    /*  201 */    SDL_SCANCODE_UNKNOWN, /* KEY_PAUSECD */
+    /*  202 */    SDL_SCANCODE_UNKNOWN, /* KEY_PROG3 */
+    /*  203 */    SDL_SCANCODE_UNKNOWN, /* KEY_PROG4 */
+    0,
+    /*  205 */    SDL_SCANCODE_UNKNOWN, /* KEY_SUSPEND */
+    /*  206 */    SDL_SCANCODE_UNKNOWN, /* KEY_CLOSE */
+    /*  207 */    SDL_SCANCODE_UNKNOWN, /* KEY_PLAY */
+    /*  208 */    SDL_SCANCODE_UNKNOWN, /* KEY_FASTFORWARD */
+    /*  209 */    SDL_SCANCODE_UNKNOWN, /* KEY_BASSBOOST */
+    /*  210 */    SDL_SCANCODE_UNKNOWN, /* KEY_PRINT */
+    /*  211 */    SDL_SCANCODE_UNKNOWN, /* KEY_HP */
+    /*  212 */    SDL_SCANCODE_UNKNOWN, /* KEY_CAMERA */
+    /*  213 */    SDL_SCANCODE_UNKNOWN, /* KEY_SOUND */
+    /*  214 */    SDL_SCANCODE_UNKNOWN, /* KEY_QUESTION */
+    /*  215 */    SDL_SCANCODE_UNKNOWN, /* KEY_EMAIL */
+    /*  216 */    SDL_SCANCODE_UNKNOWN, /* KEY_CHAT */
+    /*  217 */    SDL_SCANCODE_AC_SEARCH,
+    /*  218 */    SDL_SCANCODE_UNKNOWN, /* KEY_CONNECT */
+    /*  219 */    SDL_SCANCODE_UNKNOWN, /* KEY_FINANCE */
+    /*  220 */    SDL_SCANCODE_UNKNOWN, /* KEY_SPORT */
+    /*  221 */    SDL_SCANCODE_UNKNOWN, /* KEY_SHOP */
+    /*  222 */    SDL_SCANCODE_ALTERASE,
+    /*  223 */    SDL_SCANCODE_CANCEL,
+    /*  224 */    SDL_SCANCODE_BRIGHTNESSDOWN,
+    /*  225 */    SDL_SCANCODE_BRIGHTNESSUP,
+    /*  226 */    SDL_SCANCODE_UNKNOWN, /* KEY_MEDIA */
+    /*  227 */    SDL_SCANCODE_DISPLAYSWITCH, /* KEY_SWITCHVIDEOMODE */
+    /*  228 */    SDL_SCANCODE_KBDILLUMTOGGLE,
+    /*  229 */    SDL_SCANCODE_KBDILLUMDOWN,
+    /*  230 */    SDL_SCANCODE_KBDILLUMUP,
+    /*  231 */    SDL_SCANCODE_UNKNOWN, /* KEY_SEND */
+    /*  232 */    SDL_SCANCODE_UNKNOWN, /* KEY_REPLY */
+    /*  233 */    SDL_SCANCODE_UNKNOWN, /* KEY_FORWARDMAIL */
+    /*  234 */    SDL_SCANCODE_UNKNOWN, /* KEY_SAVE */
+    /*  235 */    SDL_SCANCODE_UNKNOWN, /* KEY_DOCUMENTS */
+    /*  236 */    SDL_SCANCODE_UNKNOWN, /* KEY_BATTERY */
+};
+/* *INDENT-ON* */
diff --git a/Source/3rd Party/sdl/src/events/scancodes_windows.h b/Source/3rd Party/sdl/src/events/scancodes_windows.h
new file mode 100644
index 000000000..fa894e481
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/scancodes_windows.h	
@@ -0,0 +1,55 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../include/SDL_scancode.h"
+
+/* Windows scancode to SDL scancode mapping table */
+/* derived from Microsoft scan code document, http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/scancode.doc */
+
+/* *INDENT-OFF* */
+static const SDL_Scancode windows_scancode_table[] = 
+{ 
+	/*	0						1							2							3							4						5							6							7 */
+	/*	8						9							A							B							C						D							E							F */
+	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_ESCAPE,		SDL_SCANCODE_1,				SDL_SCANCODE_2,				SDL_SCANCODE_3,			SDL_SCANCODE_4,				SDL_SCANCODE_5,				SDL_SCANCODE_6,			/* 0 */
+	SDL_SCANCODE_7,				SDL_SCANCODE_8,				SDL_SCANCODE_9,				SDL_SCANCODE_0,				SDL_SCANCODE_MINUS,		SDL_SCANCODE_EQUALS,		SDL_SCANCODE_BACKSPACE,		SDL_SCANCODE_TAB,		/* 0 */
+
+	SDL_SCANCODE_Q,				SDL_SCANCODE_W,				SDL_SCANCODE_E,				SDL_SCANCODE_R,				SDL_SCANCODE_T,			SDL_SCANCODE_Y,				SDL_SCANCODE_U,				SDL_SCANCODE_I,			/* 1 */
+	SDL_SCANCODE_O,				SDL_SCANCODE_P,				SDL_SCANCODE_LEFTBRACKET,	SDL_SCANCODE_RIGHTBRACKET,	SDL_SCANCODE_RETURN,	SDL_SCANCODE_LCTRL,			SDL_SCANCODE_A,				SDL_SCANCODE_S,			/* 1 */
+
+	SDL_SCANCODE_D,				SDL_SCANCODE_F,				SDL_SCANCODE_G,				SDL_SCANCODE_H,				SDL_SCANCODE_J,			SDL_SCANCODE_K,				SDL_SCANCODE_L,				SDL_SCANCODE_SEMICOLON,	/* 2 */
+	SDL_SCANCODE_APOSTROPHE,	SDL_SCANCODE_GRAVE,			SDL_SCANCODE_LSHIFT,		SDL_SCANCODE_BACKSLASH,		SDL_SCANCODE_Z,			SDL_SCANCODE_X,				SDL_SCANCODE_C,				SDL_SCANCODE_V,			/* 2 */
+
+	SDL_SCANCODE_B,				SDL_SCANCODE_N,				SDL_SCANCODE_M,				SDL_SCANCODE_COMMA,			SDL_SCANCODE_PERIOD,	SDL_SCANCODE_SLASH,			SDL_SCANCODE_RSHIFT,		SDL_SCANCODE_PRINTSCREEN,/* 3 */
+	SDL_SCANCODE_LALT,			SDL_SCANCODE_SPACE,			SDL_SCANCODE_CAPSLOCK,		SDL_SCANCODE_F1,			SDL_SCANCODE_F2,		SDL_SCANCODE_F3,			SDL_SCANCODE_F4,			SDL_SCANCODE_F5,		/* 3 */
+
+	SDL_SCANCODE_F6,			SDL_SCANCODE_F7,			SDL_SCANCODE_F8,			SDL_SCANCODE_F9,			SDL_SCANCODE_F10,		SDL_SCANCODE_NUMLOCKCLEAR,	SDL_SCANCODE_SCROLLLOCK,	SDL_SCANCODE_HOME,		/* 4 */
+	SDL_SCANCODE_UP,			SDL_SCANCODE_PAGEUP,		SDL_SCANCODE_KP_MINUS,		SDL_SCANCODE_LEFT,			SDL_SCANCODE_KP_5,		SDL_SCANCODE_RIGHT,			SDL_SCANCODE_KP_PLUS,		SDL_SCANCODE_END,		/* 4 */
+
+	SDL_SCANCODE_DOWN,			SDL_SCANCODE_PAGEDOWN,		SDL_SCANCODE_INSERT,		SDL_SCANCODE_DELETE,		SDL_SCANCODE_UNKNOWN,	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_NONUSBACKSLASH,SDL_SCANCODE_F11,		/* 5 */
+	SDL_SCANCODE_F12,			SDL_SCANCODE_PAUSE,			SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_LGUI,			SDL_SCANCODE_RGUI,		SDL_SCANCODE_APPLICATION,	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,	/* 5 */
+
+	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_F13,		SDL_SCANCODE_F14,			SDL_SCANCODE_F15,			SDL_SCANCODE_F16,		/* 6 */
+	SDL_SCANCODE_F17,			SDL_SCANCODE_F18,			SDL_SCANCODE_F19,			SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,	/* 6 */
+	
+	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,	/* 7 */
+	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN	/* 7 */
+};
+/* *INDENT-ON* */
diff --git a/Source/3rd Party/sdl/src/events/scancodes_xfree86.h b/Source/3rd Party/sdl/src/events/scancodes_xfree86.h
new file mode 100644
index 000000000..8b10c3d90
--- /dev/null
+++ b/Source/3rd Party/sdl/src/events/scancodes_xfree86.h	
@@ -0,0 +1,421 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../include/SDL_scancode.h"
+
+/* XFree86 key code to SDL scancode mapping table
+   Sources:
+   - atKeyNames.h from XFree86 source code
+*/
+/* *INDENT-OFF* */
+static const SDL_Scancode xfree86_scancode_table[] = {
+    /*  0 */    SDL_SCANCODE_UNKNOWN,
+    /*  1 */    SDL_SCANCODE_ESCAPE,
+    /*  2 */    SDL_SCANCODE_1,
+    /*  3 */    SDL_SCANCODE_2,
+    /*  4 */    SDL_SCANCODE_3,
+    /*  5 */    SDL_SCANCODE_4,
+    /*  6 */    SDL_SCANCODE_5,
+    /*  7 */    SDL_SCANCODE_6,
+    /*  8 */    SDL_SCANCODE_7,
+    /*  9 */    SDL_SCANCODE_8,
+    /*  10 */   SDL_SCANCODE_9,
+    /*  11 */   SDL_SCANCODE_0,
+    /*  12 */   SDL_SCANCODE_MINUS,
+    /*  13 */   SDL_SCANCODE_EQUALS,
+    /*  14 */   SDL_SCANCODE_BACKSPACE,
+    /*  15 */   SDL_SCANCODE_TAB,
+    /*  16 */   SDL_SCANCODE_Q,
+    /*  17 */   SDL_SCANCODE_W,
+    /*  18 */   SDL_SCANCODE_E,
+    /*  19 */   SDL_SCANCODE_R,
+    /*  20 */   SDL_SCANCODE_T,
+    /*  21 */   SDL_SCANCODE_Y,
+    /*  22 */   SDL_SCANCODE_U,
+    /*  23 */   SDL_SCANCODE_I,
+    /*  24 */   SDL_SCANCODE_O,
+    /*  25 */   SDL_SCANCODE_P,
+    /*  26 */   SDL_SCANCODE_LEFTBRACKET,
+    /*  27 */   SDL_SCANCODE_RIGHTBRACKET,
+    /*  28 */   SDL_SCANCODE_RETURN,
+    /*  29 */   SDL_SCANCODE_LCTRL,
+    /*  30 */   SDL_SCANCODE_A,
+    /*  31 */   SDL_SCANCODE_S,
+    /*  32 */   SDL_SCANCODE_D,
+    /*  33 */   SDL_SCANCODE_F,
+    /*  34 */   SDL_SCANCODE_G,
+    /*  35 */   SDL_SCANCODE_H,
+    /*  36 */   SDL_SCANCODE_J,
+    /*  37 */   SDL_SCANCODE_K,
+    /*  38 */   SDL_SCANCODE_L,
+    /*  39 */   SDL_SCANCODE_SEMICOLON,
+    /*  40 */   SDL_SCANCODE_APOSTROPHE,
+    /*  41 */   SDL_SCANCODE_GRAVE,
+    /*  42 */   SDL_SCANCODE_LSHIFT,
+    /*  43 */   SDL_SCANCODE_BACKSLASH,
+    /*  44 */   SDL_SCANCODE_Z,
+    /*  45 */   SDL_SCANCODE_X,
+    /*  46 */   SDL_SCANCODE_C,
+    /*  47 */   SDL_SCANCODE_V,
+    /*  48 */   SDL_SCANCODE_B,
+    /*  49 */   SDL_SCANCODE_N,
+    /*  50 */   SDL_SCANCODE_M,
+    /*  51 */   SDL_SCANCODE_COMMA,
+    /*  52 */   SDL_SCANCODE_PERIOD,
+    /*  53 */   SDL_SCANCODE_SLASH,
+    /*  54 */   SDL_SCANCODE_RSHIFT,
+    /*  55 */   SDL_SCANCODE_KP_MULTIPLY,
+    /*  56 */   SDL_SCANCODE_LALT,
+    /*  57 */   SDL_SCANCODE_SPACE,
+    /*  58 */   SDL_SCANCODE_CAPSLOCK,
+    /*  59 */   SDL_SCANCODE_F1,
+    /*  60 */   SDL_SCANCODE_F2,
+    /*  61 */   SDL_SCANCODE_F3,
+    /*  62 */   SDL_SCANCODE_F4,
+    /*  63 */   SDL_SCANCODE_F5,
+    /*  64 */   SDL_SCANCODE_F6,
+    /*  65 */   SDL_SCANCODE_F7,
+    /*  66 */   SDL_SCANCODE_F8,
+    /*  67 */   SDL_SCANCODE_F9,
+    /*  68 */   SDL_SCANCODE_F10,
+    /*  69 */   SDL_SCANCODE_NUMLOCKCLEAR,
+    /*  70 */   SDL_SCANCODE_SCROLLLOCK,
+    /*  71 */   SDL_SCANCODE_KP_7,
+    /*  72 */   SDL_SCANCODE_KP_8,
+    /*  73 */   SDL_SCANCODE_KP_9,
+    /*  74 */   SDL_SCANCODE_KP_MINUS,
+    /*  75 */   SDL_SCANCODE_KP_4,
+    /*  76 */   SDL_SCANCODE_KP_5,
+    /*  77 */   SDL_SCANCODE_KP_6,
+    /*  78 */   SDL_SCANCODE_KP_PLUS,
+    /*  79 */   SDL_SCANCODE_KP_1,
+    /*  80 */   SDL_SCANCODE_KP_2,
+    /*  81 */   SDL_SCANCODE_KP_3,
+    /*  82 */   SDL_SCANCODE_KP_0,
+    /*  83 */   SDL_SCANCODE_KP_PERIOD,
+    /*  84 */   SDL_SCANCODE_SYSREQ,
+    /*  85 */   SDL_SCANCODE_MODE,
+    /*  86 */   SDL_SCANCODE_NONUSBACKSLASH,
+    /*  87 */   SDL_SCANCODE_F11,
+    /*  88 */   SDL_SCANCODE_F12,
+    /*  89 */   SDL_SCANCODE_HOME,
+    /*  90 */   SDL_SCANCODE_UP,
+    /*  91 */   SDL_SCANCODE_PAGEUP,
+    /*  92 */   SDL_SCANCODE_LEFT,
+    /*  93 */   SDL_SCANCODE_BRIGHTNESSDOWN, /* on PowerBook G4 / KEY_Begin */
+    /*  94 */   SDL_SCANCODE_RIGHT,
+    /*  95 */   SDL_SCANCODE_END,
+    /*  96 */   SDL_SCANCODE_DOWN,
+    /*  97 */   SDL_SCANCODE_PAGEDOWN,
+    /*  98 */   SDL_SCANCODE_INSERT,
+    /*  99 */   SDL_SCANCODE_DELETE,
+    /*  100 */  SDL_SCANCODE_KP_ENTER,
+    /*  101 */  SDL_SCANCODE_RCTRL,
+    /*  102 */  SDL_SCANCODE_PAUSE,
+    /*  103 */  SDL_SCANCODE_PRINTSCREEN,
+    /*  104 */  SDL_SCANCODE_KP_DIVIDE,
+    /*  105 */  SDL_SCANCODE_RALT,
+    /*  106 */  SDL_SCANCODE_UNKNOWN, /* BREAK */
+    /*  107 */  SDL_SCANCODE_LGUI,
+    /*  108 */  SDL_SCANCODE_RGUI,
+    /*  109 */  SDL_SCANCODE_APPLICATION,
+    /*  110 */  SDL_SCANCODE_F13,
+    /*  111 */  SDL_SCANCODE_F14,
+    /*  112 */  SDL_SCANCODE_F15,
+    /*  113 */  SDL_SCANCODE_F16,
+    /*  114 */  SDL_SCANCODE_F17,
+    /*  115 */  SDL_SCANCODE_UNKNOWN,
+    /*  116 */  SDL_SCANCODE_UNKNOWN, /* is translated to XK_ISO_Level3_Shift by my X server, but I have no keyboard that generates this code, so I don't know what the correct SDL_SCANCODE_* for it is */
+    /*  117 */  SDL_SCANCODE_UNKNOWN,
+    /*  118 */  SDL_SCANCODE_KP_EQUALS,
+    /*  119 */  SDL_SCANCODE_UNKNOWN,
+    /*  120 */  SDL_SCANCODE_UNKNOWN,
+    /*  121 */  SDL_SCANCODE_UNKNOWN,
+    /*  122 */  SDL_SCANCODE_UNKNOWN,
+    /*  123 */  SDL_SCANCODE_UNKNOWN,
+    /*  124 */  SDL_SCANCODE_UNKNOWN,
+    /*  125 */  SDL_SCANCODE_INTERNATIONAL3, /* Yen */
+    /*  126 */  SDL_SCANCODE_UNKNOWN,
+    /*  127 */  SDL_SCANCODE_UNKNOWN,
+    /*  128 */  SDL_SCANCODE_UNKNOWN,
+    /*  129 */  SDL_SCANCODE_UNKNOWN,
+    /*  130 */  SDL_SCANCODE_UNKNOWN,
+    /*  131 */  SDL_SCANCODE_UNKNOWN,
+    /*  132 */  SDL_SCANCODE_POWER,
+    /*  133 */  SDL_SCANCODE_MUTE,
+    /*  134 */  SDL_SCANCODE_VOLUMEDOWN,
+    /*  135 */  SDL_SCANCODE_VOLUMEUP,
+    /*  136 */  SDL_SCANCODE_HELP,
+    /*  137 */  SDL_SCANCODE_STOP,
+    /*  138 */  SDL_SCANCODE_AGAIN,
+    /*  139 */  SDL_SCANCODE_UNKNOWN, /* PROPS */
+    /*  140 */  SDL_SCANCODE_UNDO,
+    /*  141 */  SDL_SCANCODE_UNKNOWN, /* FRONT */
+    /*  142 */  SDL_SCANCODE_COPY,
+    /*  143 */  SDL_SCANCODE_UNKNOWN, /* OPEN */
+    /*  144 */  SDL_SCANCODE_PASTE,
+    /*  145 */  SDL_SCANCODE_FIND,
+    /*  146 */  SDL_SCANCODE_CUT,
+};
+
+/* for wireless usb keyboard (manufacturer TRUST) without numpad. */
+static const SDL_Scancode xfree86_scancode_table2[] = {
+    /*  0 */    SDL_SCANCODE_UNKNOWN,
+    /*  1 */    SDL_SCANCODE_ESCAPE,
+    /*  2 */    SDL_SCANCODE_1,
+    /*  3 */    SDL_SCANCODE_2,
+    /*  4 */    SDL_SCANCODE_3,
+    /*  5 */    SDL_SCANCODE_4,
+    /*  6 */    SDL_SCANCODE_5,
+    /*  7 */    SDL_SCANCODE_6,
+    /*  8 */    SDL_SCANCODE_7,
+    /*  9 */    SDL_SCANCODE_8,
+    /*  10 */   SDL_SCANCODE_9,
+    /*  11 */   SDL_SCANCODE_0,
+    /*  12 */   SDL_SCANCODE_MINUS,
+    /*  13 */   SDL_SCANCODE_EQUALS,
+    /*  14 */   SDL_SCANCODE_BACKSPACE,
+    /*  15 */   SDL_SCANCODE_TAB,
+    /*  16 */   SDL_SCANCODE_Q,
+    /*  17 */   SDL_SCANCODE_W,
+    /*  18 */   SDL_SCANCODE_E,
+    /*  19 */   SDL_SCANCODE_R,
+    /*  20 */   SDL_SCANCODE_T,
+    /*  21 */   SDL_SCANCODE_Y,
+    /*  22 */   SDL_SCANCODE_U,
+    /*  23 */   SDL_SCANCODE_I,
+    /*  24 */   SDL_SCANCODE_O,
+    /*  25 */   SDL_SCANCODE_P,
+    /*  26 */   SDL_SCANCODE_LEFTBRACKET,
+    /*  27 */   SDL_SCANCODE_RIGHTBRACKET,
+    /*  28 */   SDL_SCANCODE_RETURN,
+    /*  29 */   SDL_SCANCODE_LCTRL,
+    /*  30 */   SDL_SCANCODE_A,
+    /*  31 */   SDL_SCANCODE_S,
+    /*  32 */   SDL_SCANCODE_D,
+    /*  33 */   SDL_SCANCODE_F,
+    /*  34 */   SDL_SCANCODE_G,
+    /*  35 */   SDL_SCANCODE_H,
+    /*  36 */   SDL_SCANCODE_J,
+    /*  37 */   SDL_SCANCODE_K,
+    /*  38 */   SDL_SCANCODE_L,
+    /*  39 */   SDL_SCANCODE_SEMICOLON,
+    /*  40 */   SDL_SCANCODE_APOSTROPHE,
+    /*  41 */   SDL_SCANCODE_GRAVE,
+    /*  42 */   SDL_SCANCODE_LSHIFT,
+    /*  43 */   SDL_SCANCODE_BACKSLASH,
+    /*  44 */   SDL_SCANCODE_Z,
+    /*  45 */   SDL_SCANCODE_X,
+    /*  46 */   SDL_SCANCODE_C,
+    /*  47 */   SDL_SCANCODE_V,
+    /*  48 */   SDL_SCANCODE_B,
+    /*  49 */   SDL_SCANCODE_N,
+    /*  50 */   SDL_SCANCODE_M,
+    /*  51 */   SDL_SCANCODE_COMMA,
+    /*  52 */   SDL_SCANCODE_PERIOD,
+    /*  53 */   SDL_SCANCODE_SLASH,
+    /*  54 */   SDL_SCANCODE_RSHIFT,
+    /*  55 */   SDL_SCANCODE_KP_MULTIPLY,
+    /*  56 */   SDL_SCANCODE_LALT,
+    /*  57 */   SDL_SCANCODE_SPACE,
+    /*  58 */   SDL_SCANCODE_CAPSLOCK,
+    /*  59 */   SDL_SCANCODE_F1,
+    /*  60 */   SDL_SCANCODE_F2,
+    /*  61 */   SDL_SCANCODE_F3,
+    /*  62 */   SDL_SCANCODE_F4,
+    /*  63 */   SDL_SCANCODE_F5,
+    /*  64 */   SDL_SCANCODE_F6,
+    /*  65 */   SDL_SCANCODE_F7,
+    /*  66 */   SDL_SCANCODE_F8,
+    /*  67 */   SDL_SCANCODE_F9,
+    /*  68 */   SDL_SCANCODE_F10,
+    /*  69 */   SDL_SCANCODE_NUMLOCKCLEAR,
+    /*  70 */   SDL_SCANCODE_SCROLLLOCK,
+    /*  71 */   SDL_SCANCODE_KP_7,
+    /*  72 */   SDL_SCANCODE_KP_8,
+    /*  73 */   SDL_SCANCODE_KP_9,
+    /*  74 */   SDL_SCANCODE_KP_MINUS,
+    /*  75 */   SDL_SCANCODE_KP_4,
+    /*  76 */   SDL_SCANCODE_KP_5,
+    /*  77 */   SDL_SCANCODE_KP_6,
+    /*  78 */   SDL_SCANCODE_KP_PLUS,
+    /*  79 */   SDL_SCANCODE_KP_1,
+    /*  80 */   SDL_SCANCODE_KP_2,
+    /*  81 */   SDL_SCANCODE_KP_3,
+    /*  82 */   SDL_SCANCODE_KP_0,
+    /*  83 */   SDL_SCANCODE_KP_PERIOD,
+    /*  84 */   SDL_SCANCODE_SYSREQ,    /* ???? */
+    /*  85 */   SDL_SCANCODE_MODE,      /* ???? */
+    /*  86 */   SDL_SCANCODE_NONUSBACKSLASH,
+    /*  87 */   SDL_SCANCODE_F11,
+    /*  88 */   SDL_SCANCODE_F12,
+    /*  89 */   SDL_SCANCODE_UNKNOWN,
+    /*  90 */   SDL_SCANCODE_UNKNOWN,   /* Katakana */
+    /*  91 */   SDL_SCANCODE_UNKNOWN,   /* Hiragana */
+    /*  92 */   SDL_SCANCODE_UNKNOWN,   /* Henkan_Mode */
+    /*  93 */   SDL_SCANCODE_UNKNOWN,   /* Hiragana_Katakana */
+    /*  94 */   SDL_SCANCODE_UNKNOWN,   /* Muhenkan */
+    /*  95 */   SDL_SCANCODE_UNKNOWN,
+    /*  96 */   SDL_SCANCODE_KP_ENTER,
+    /*  97 */   SDL_SCANCODE_RCTRL,
+    /*  98 */   SDL_SCANCODE_KP_DIVIDE,
+    /*  99 */   SDL_SCANCODE_PRINTSCREEN,
+    /* 100 */   SDL_SCANCODE_RALT,      /* ISO_Level3_Shift, ALTGR, RALT */
+    /* 101 */   SDL_SCANCODE_UNKNOWN,   /* Linefeed */
+    /* 102 */   SDL_SCANCODE_HOME,
+    /* 103 */   SDL_SCANCODE_UP,
+    /* 104 */   SDL_SCANCODE_PAGEUP,
+    /* 105 */   SDL_SCANCODE_LEFT,
+    /* 106 */   SDL_SCANCODE_RIGHT,
+    /* 107 */   SDL_SCANCODE_END,
+    /* 108 */   SDL_SCANCODE_DOWN,
+    /* 109 */   SDL_SCANCODE_PAGEDOWN,
+    /* 110 */   SDL_SCANCODE_INSERT,
+    /* 111 */   SDL_SCANCODE_DELETE,
+    /* 112 */   SDL_SCANCODE_UNKNOWN,
+    /* 113 */   SDL_SCANCODE_MUTE,
+    /* 114 */   SDL_SCANCODE_VOLUMEDOWN,
+    /* 115 */   SDL_SCANCODE_VOLUMEUP,
+    /* 116 */   SDL_SCANCODE_POWER,
+    /* 117 */   SDL_SCANCODE_KP_EQUALS,
+    /* 118 */   SDL_SCANCODE_UNKNOWN,   /* plusminus */
+    /* 119 */   SDL_SCANCODE_PAUSE,
+    /* 120 */   SDL_SCANCODE_UNKNOWN,   /* XF86LaunchA */
+    /* 121 */   SDL_SCANCODE_UNKNOWN,   /* KP_Decimal */
+    /* 122 */   SDL_SCANCODE_UNKNOWN,   /* Hangul */
+    /* 123 */   SDL_SCANCODE_UNKNOWN,   /* Hangul_Hanja */
+    /* 124 */   SDL_SCANCODE_UNKNOWN,
+    /* 125 */   SDL_SCANCODE_LGUI,
+    /* 126 */   SDL_SCANCODE_RGUI,
+    /* 127 */   SDL_SCANCODE_APPLICATION,
+    /* 128 */   SDL_SCANCODE_CANCEL,
+    /* 129 */   SDL_SCANCODE_AGAIN,
+    /* 130 */   SDL_SCANCODE_UNKNOWN,   /* SunProps */
+    /* 131 */   SDL_SCANCODE_UNDO,
+    /* 132 */   SDL_SCANCODE_UNKNOWN,   /* SunFront */
+    /* 133 */   SDL_SCANCODE_COPY,
+    /* 134 */   SDL_SCANCODE_UNKNOWN,   /* SunOpen */
+    /* 135 */   SDL_SCANCODE_PASTE,
+    /* 136 */   SDL_SCANCODE_FIND,
+    /* 137 */   SDL_SCANCODE_CUT,
+    /* 138 */   SDL_SCANCODE_HELP,
+    /* 139 */   SDL_SCANCODE_UNKNOWN,   /* XF86MenuKB */
+    /* 140 */   SDL_SCANCODE_CALCULATOR,
+    /* 141 */   SDL_SCANCODE_UNKNOWN,
+    /* 142 */   SDL_SCANCODE_SLEEP,
+    /* 143 */   SDL_SCANCODE_UNKNOWN,   /* XF86WakeUp */
+    /* 144 */   SDL_SCANCODE_UNKNOWN,   /* XF86Explorer */
+    /* 145 */   SDL_SCANCODE_UNKNOWN,   /* XF86Send */
+    /* 146 */   SDL_SCANCODE_UNKNOWN,
+    /* 147 */   SDL_SCANCODE_UNKNOWN,   /* XF86Xfer */
+    /* 148 */   SDL_SCANCODE_APP1,      /* XF86Launch1 */
+    /* 149 */   SDL_SCANCODE_APP2,      /* XF86Launch2 */
+    /* 150 */   SDL_SCANCODE_WWW,
+    /* 151 */   SDL_SCANCODE_UNKNOWN,   /* XF86DOS */
+    /* 152 */   SDL_SCANCODE_UNKNOWN,   /* XF86ScreenSaver */
+    /* 153 */   SDL_SCANCODE_UNKNOWN,
+    /* 154 */   SDL_SCANCODE_UNKNOWN,   /* XF86RotateWindows */
+    /* 155 */   SDL_SCANCODE_MAIL,
+    /* 156 */   SDL_SCANCODE_AC_BOOKMARKS,   /* XF86Favorites */
+    /* 157 */   SDL_SCANCODE_COMPUTER,
+    /* 158 */   SDL_SCANCODE_AC_BACK,
+    /* 159 */   SDL_SCANCODE_AC_FORWARD,
+    /* 160 */   SDL_SCANCODE_UNKNOWN,
+    /* 161 */   SDL_SCANCODE_EJECT,
+    /* 162 */   SDL_SCANCODE_EJECT,
+    /* 163 */   SDL_SCANCODE_AUDIONEXT,
+    /* 164 */   SDL_SCANCODE_AUDIOPLAY,
+    /* 165 */   SDL_SCANCODE_AUDIOPREV,
+    /* 166 */   SDL_SCANCODE_AUDIOSTOP,
+    /* 167 */   SDL_SCANCODE_UNKNOWN,   /* XF86AudioRecord */
+    /* 168 */   SDL_SCANCODE_UNKNOWN,   /* XF86AudioRewind */
+    /* 169 */   SDL_SCANCODE_UNKNOWN,   /* XF86Phone */
+    /* 170 */   SDL_SCANCODE_UNKNOWN,
+    /* 171 */   SDL_SCANCODE_F13,       /* XF86Tools */
+    /* 172 */   SDL_SCANCODE_AC_HOME,
+    /* 173 */   SDL_SCANCODE_AC_REFRESH,
+    /* 174 */   SDL_SCANCODE_UNKNOWN,   /* XF86Close */
+    /* 175 */   SDL_SCANCODE_UNKNOWN,
+    /* 176 */   SDL_SCANCODE_UNKNOWN,
+    /* 177 */   SDL_SCANCODE_UNKNOWN,   /* XF86ScrollUp */
+    /* 178 */   SDL_SCANCODE_UNKNOWN,   /* XF86ScrollDown */
+    /* 179 */   SDL_SCANCODE_UNKNOWN,   /* parenleft */
+    /* 180 */   SDL_SCANCODE_UNKNOWN,   /* parenright */
+    /* 181 */   SDL_SCANCODE_UNKNOWN,   /* XF86New */
+    /* 182 */   SDL_SCANCODE_AGAIN,
+    /* 183 */   SDL_SCANCODE_F13,       /* XF86Tools */
+    /* 184 */   SDL_SCANCODE_F14,       /* XF86Launch5 */
+    /* 185 */   SDL_SCANCODE_F15,       /* XF86Launch6 */
+    /* 186 */   SDL_SCANCODE_F16,       /* XF86Launch7 */
+    /* 187 */   SDL_SCANCODE_F17,       /* XF86Launch8 */
+    /* 188 */   SDL_SCANCODE_F18,       /* XF86Launch9 */
+    /* 189 */   SDL_SCANCODE_F19,       /* null keysym */
+    /* 190 */   SDL_SCANCODE_UNKNOWN,
+    /* 191 */   SDL_SCANCODE_UNKNOWN,
+    /* 192 */   SDL_SCANCODE_UNKNOWN,   /* XF86TouchpadToggle */
+    /* 193 */   SDL_SCANCODE_UNKNOWN,
+    /* 194 */   SDL_SCANCODE_UNKNOWN,
+    /* 195 */   SDL_SCANCODE_MODE,
+    /* 196 */   SDL_SCANCODE_UNKNOWN,
+    /* 197 */   SDL_SCANCODE_UNKNOWN,
+    /* 198 */   SDL_SCANCODE_UNKNOWN,
+    /* 199 */   SDL_SCANCODE_UNKNOWN,
+    /* 200 */   SDL_SCANCODE_AUDIOPLAY,
+    /* 201 */   SDL_SCANCODE_UNKNOWN,   /* XF86AudioPause */
+    /* 202 */   SDL_SCANCODE_UNKNOWN,   /* XF86Launch3 */
+    /* 203 */   SDL_SCANCODE_UNKNOWN,   /* XF86Launch4 */
+    /* 204 */   SDL_SCANCODE_UNKNOWN,   /* XF86LaunchB */
+    /* 205 */   SDL_SCANCODE_UNKNOWN,   /* XF86Suspend */
+    /* 206 */   SDL_SCANCODE_UNKNOWN,   /* XF86Close */
+    /* 207 */   SDL_SCANCODE_AUDIOPLAY,
+    /* 208 */   SDL_SCANCODE_AUDIONEXT,
+    /* 209 */   SDL_SCANCODE_UNKNOWN,
+    /* 210 */   SDL_SCANCODE_PRINTSCREEN,
+    /* 211 */   SDL_SCANCODE_UNKNOWN,
+    /* 212 */   SDL_SCANCODE_UNKNOWN,   /* XF86WebCam */
+    /* 213 */   SDL_SCANCODE_UNKNOWN,
+    /* 214 */   SDL_SCANCODE_UNKNOWN,
+    /* 215 */   SDL_SCANCODE_MAIL,
+    /* 216 */   SDL_SCANCODE_UNKNOWN,
+    /* 217 */   SDL_SCANCODE_AC_SEARCH,
+    /* 218 */   SDL_SCANCODE_UNKNOWN,
+    /* 219 */   SDL_SCANCODE_UNKNOWN,   /* XF86Finance */
+    /* 220 */   SDL_SCANCODE_UNKNOWN,
+    /* 221 */   SDL_SCANCODE_UNKNOWN,   /* XF86Shop */
+    /* 222 */   SDL_SCANCODE_UNKNOWN,
+    /* 223 */   SDL_SCANCODE_STOP,
+    /* 224 */   SDL_SCANCODE_BRIGHTNESSDOWN,
+    /* 225 */   SDL_SCANCODE_BRIGHTNESSUP,
+    /* 226 */   SDL_SCANCODE_MEDIASELECT,
+    /* 227 */   SDL_SCANCODE_DISPLAYSWITCH,
+    /* 228 */   SDL_SCANCODE_KBDILLUMTOGGLE,
+    /* 229 */   SDL_SCANCODE_KBDILLUMDOWN,
+    /* 230 */   SDL_SCANCODE_KBDILLUMUP,
+    /* 231 */   SDL_SCANCODE_UNKNOWN,   /* XF86Send */
+    /* 232 */   SDL_SCANCODE_UNKNOWN,   /* XF86Reply */
+    /* 233 */   SDL_SCANCODE_UNKNOWN,   /* XF86MailForward */
+    /* 234 */   SDL_SCANCODE_UNKNOWN,   /* XF86Save */
+    /* 235 */   SDL_SCANCODE_UNKNOWN,   /* XF86Documents */
+    /* 236 */   SDL_SCANCODE_UNKNOWN,   /* XF86Battery */
+    /* 237 */   SDL_SCANCODE_UNKNOWN,   /* XF86Bluetooth */
+    /* 238 */   SDL_SCANCODE_UNKNOWN,   /* XF86WLAN */
+};
+
+/* *INDENT-ON* */
diff --git a/Source/3rd Party/sdl/src/file/SDL_rwops.c b/Source/3rd Party/sdl/src/file/SDL_rwops.c
new file mode 100644
index 000000000..afa35d062
--- /dev/null
+++ b/Source/3rd Party/sdl/src/file/SDL_rwops.c	
@@ -0,0 +1,765 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+/* Need this so Linux systems define fseek64o, ftell64o and off64_t */
+#define _LARGEFILE64_SOURCE
+#include "../SDL_internal.h"
+
+#if defined(__WIN32__)
+#include "../core/windows/SDL_windows.h"
+#endif
+
+
+/* This file provides a general interface for SDL to read and write
+   data sources.  It can easily be extended to files, memory, etc.
+*/
+
+#include "SDL_endian.h"
+#include "SDL_rwops.h"
+
+#ifdef __APPLE__
+#include "cocoa/SDL_rwopsbundlesupport.h"
+#endif /* __APPLE__ */
+
+#ifdef ANDROID
+#include "../core/android/SDL_android.h"
+#include "SDL_system.h"
+#endif
+
+#ifdef __WIN32__
+
+/* Functions to read/write Win32 API file pointers */
+
+#ifndef INVALID_SET_FILE_POINTER
+#define INVALID_SET_FILE_POINTER 0xFFFFFFFF
+#endif
+
+#define READAHEAD_BUFFER_SIZE   1024
+
+static int SDLCALL
+windows_file_open(SDL_RWops * context, const char *filename, const char *mode)
+{
+    UINT old_error_mode;
+    HANDLE h;
+    DWORD r_right, w_right;
+    DWORD must_exist, truncate;
+    int a_mode;
+
+    if (!context)
+        return -1;              /* failed (invalid call) */
+
+    context->hidden.windowsio.h = INVALID_HANDLE_VALUE;   /* mark this as unusable */
+    context->hidden.windowsio.buffer.data = NULL;
+    context->hidden.windowsio.buffer.size = 0;
+    context->hidden.windowsio.buffer.left = 0;
+
+    /* "r" = reading, file must exist */
+    /* "w" = writing, truncate existing, file may not exist */
+    /* "r+"= reading or writing, file must exist            */
+    /* "a" = writing, append file may not exist             */
+    /* "a+"= append + read, file may not exist              */
+    /* "w+" = read, write, truncate. file may not exist    */
+
+    must_exist = (SDL_strchr(mode, 'r') != NULL) ? OPEN_EXISTING : 0;
+    truncate = (SDL_strchr(mode, 'w') != NULL) ? CREATE_ALWAYS : 0;
+    r_right = (SDL_strchr(mode, '+') != NULL
+               || must_exist) ? GENERIC_READ : 0;
+    a_mode = (SDL_strchr(mode, 'a') != NULL) ? OPEN_ALWAYS : 0;
+    w_right = (a_mode || SDL_strchr(mode, '+')
+               || truncate) ? GENERIC_WRITE : 0;
+
+    if (!r_right && !w_right)   /* inconsistent mode */
+        return -1;              /* failed (invalid call) */
+
+    context->hidden.windowsio.buffer.data =
+        (char *) SDL_malloc(READAHEAD_BUFFER_SIZE);
+    if (!context->hidden.windowsio.buffer.data) {
+        return SDL_OutOfMemory();
+    }
+    /* Do not open a dialog box if failure */
+    old_error_mode =
+        SetErrorMode(SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
+
+    {
+        LPTSTR tstr = WIN_UTF8ToString(filename);
+        h = CreateFile(tstr, (w_right | r_right),
+                       (w_right) ? 0 : FILE_SHARE_READ, NULL,
+                       (must_exist | truncate | a_mode),
+                       FILE_ATTRIBUTE_NORMAL, NULL);
+        SDL_free(tstr);
+    }
+
+    /* restore old behavior */
+    SetErrorMode(old_error_mode);
+
+    if (h == INVALID_HANDLE_VALUE) {
+        SDL_free(context->hidden.windowsio.buffer.data);
+        context->hidden.windowsio.buffer.data = NULL;
+        SDL_SetError("Couldn't open %s", filename);
+        return -2;              /* failed (CreateFile) */
+    }
+    context->hidden.windowsio.h = h;
+    context->hidden.windowsio.append = a_mode ? SDL_TRUE : SDL_FALSE;
+
+    return 0;                   /* ok */
+}
+
+static Sint64 SDLCALL
+windows_file_size(SDL_RWops * context)
+{
+    LARGE_INTEGER size;
+
+    if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE) {
+        return SDL_SetError("windows_file_size: invalid context/file not opened");
+    }
+
+    if (!GetFileSizeEx(context->hidden.windowsio.h, &size)) {
+        return WIN_SetError("windows_file_size");
+    }
+
+    return size.QuadPart;
+}
+
+static Sint64 SDLCALL
+windows_file_seek(SDL_RWops * context, Sint64 offset, int whence)
+{
+    DWORD windowswhence;
+    LARGE_INTEGER windowsoffset;
+
+    if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE) {
+        return SDL_SetError("windows_file_seek: invalid context/file not opened");
+    }
+
+    /* FIXME: We may be able to satisfy the seek within buffered data */
+    if (whence == RW_SEEK_CUR && context->hidden.windowsio.buffer.left) {
+        offset -= (long)context->hidden.windowsio.buffer.left;
+    }
+    context->hidden.windowsio.buffer.left = 0;
+
+    switch (whence) {
+    case RW_SEEK_SET:
+        windowswhence = FILE_BEGIN;
+        break;
+    case RW_SEEK_CUR:
+        windowswhence = FILE_CURRENT;
+        break;
+    case RW_SEEK_END:
+        windowswhence = FILE_END;
+        break;
+    default:
+        return SDL_SetError("windows_file_seek: Unknown value for 'whence'");
+    }
+
+    windowsoffset.QuadPart = offset;
+    if (!SetFilePointerEx(context->hidden.windowsio.h, windowsoffset, &windowsoffset, windowswhence)) {
+        return WIN_SetError("windows_file_seek");
+    }
+    return windowsoffset.QuadPart;
+}
+
+static size_t SDLCALL
+windows_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
+{
+    size_t total_need;
+    size_t total_read = 0;
+    size_t read_ahead;
+    DWORD byte_read;
+
+    total_need = size * maxnum;
+
+    if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE
+        || !total_need)
+        return 0;
+
+    if (context->hidden.windowsio.buffer.left > 0) {
+        void *data = (char *) context->hidden.windowsio.buffer.data +
+            context->hidden.windowsio.buffer.size -
+            context->hidden.windowsio.buffer.left;
+        read_ahead =
+            SDL_min(total_need, context->hidden.windowsio.buffer.left);
+        SDL_memcpy(ptr, data, read_ahead);
+        context->hidden.windowsio.buffer.left -= read_ahead;
+
+        if (read_ahead == total_need) {
+            return maxnum;
+        }
+        ptr = (char *) ptr + read_ahead;
+        total_need -= read_ahead;
+        total_read += read_ahead;
+    }
+
+    if (total_need < READAHEAD_BUFFER_SIZE) {
+        if (!ReadFile
+            (context->hidden.windowsio.h, context->hidden.windowsio.buffer.data,
+             READAHEAD_BUFFER_SIZE, &byte_read, NULL)) {
+            SDL_Error(SDL_EFREAD);
+            return 0;
+        }
+        read_ahead = SDL_min(total_need, (int) byte_read);
+        SDL_memcpy(ptr, context->hidden.windowsio.buffer.data, read_ahead);
+        context->hidden.windowsio.buffer.size = byte_read;
+        context->hidden.windowsio.buffer.left = byte_read - read_ahead;
+        total_read += read_ahead;
+    } else {
+        if (!ReadFile
+            (context->hidden.windowsio.h, ptr, (DWORD)total_need, &byte_read, NULL)) {
+            SDL_Error(SDL_EFREAD);
+            return 0;
+        }
+        total_read += byte_read;
+    }
+    return (total_read / size);
+}
+
+static size_t SDLCALL
+windows_file_write(SDL_RWops * context, const void *ptr, size_t size,
+                 size_t num)
+{
+
+    size_t total_bytes;
+    DWORD byte_written;
+    size_t nwritten;
+
+    total_bytes = size * num;
+
+    if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE
+        || total_bytes <= 0 || !size)
+        return 0;
+
+    if (context->hidden.windowsio.buffer.left) {
+        SetFilePointer(context->hidden.windowsio.h,
+                       -(LONG)context->hidden.windowsio.buffer.left, NULL,
+                       FILE_CURRENT);
+        context->hidden.windowsio.buffer.left = 0;
+    }
+
+    /* if in append mode, we must go to the EOF before write */
+    if (context->hidden.windowsio.append) {
+        if (SetFilePointer(context->hidden.windowsio.h, 0L, NULL, FILE_END) ==
+            INVALID_SET_FILE_POINTER) {
+            SDL_Error(SDL_EFWRITE);
+            return 0;
+        }
+    }
+
+    if (!WriteFile
+        (context->hidden.windowsio.h, ptr, (DWORD)total_bytes, &byte_written, NULL)) {
+        SDL_Error(SDL_EFWRITE);
+        return 0;
+    }
+
+    nwritten = byte_written / size;
+    return nwritten;
+}
+
+static int SDLCALL
+windows_file_close(SDL_RWops * context)
+{
+
+    if (context) {
+        if (context->hidden.windowsio.h != INVALID_HANDLE_VALUE) {
+            CloseHandle(context->hidden.windowsio.h);
+            context->hidden.windowsio.h = INVALID_HANDLE_VALUE;   /* to be sure */
+        }
+        SDL_free(context->hidden.windowsio.buffer.data);
+        context->hidden.windowsio.buffer.data = NULL;
+        SDL_FreeRW(context);
+    }
+    return 0;
+}
+#endif /* __WIN32__ */
+
+#ifdef HAVE_STDIO_H
+
+/* Functions to read/write stdio file pointers */
+
+static Sint64 SDLCALL
+stdio_size(SDL_RWops * context)
+{
+    Sint64 pos, size;
+
+    pos = SDL_RWseek(context, 0, RW_SEEK_CUR);
+    if (pos < 0) {
+        return -1;
+    }
+    size = SDL_RWseek(context, 0, RW_SEEK_END);
+
+    SDL_RWseek(context, pos, RW_SEEK_SET);
+    return size;
+}
+
+static Sint64 SDLCALL
+stdio_seek(SDL_RWops * context, Sint64 offset, int whence)
+{
+#ifdef HAVE_FSEEKO64
+    if (fseeko64(context->hidden.stdio.fp, (off64_t)offset, whence) == 0) {
+        return ftello64(context->hidden.stdio.fp);
+    }
+#elif defined(HAVE_FSEEKO)
+    if (fseeko(context->hidden.stdio.fp, (off_t)offset, whence) == 0) {
+        return ftello(context->hidden.stdio.fp);
+    }
+#elif defined(HAVE__FSEEKI64)
+    if (_fseeki64(context->hidden.stdio.fp, offset, whence) == 0) {
+        return _ftelli64(context->hidden.stdio.fp);
+    }
+#else
+    if (fseek(context->hidden.stdio.fp, offset, whence) == 0) {
+        return ftell(context->hidden.stdio.fp);
+    }
+#endif
+    return SDL_Error(SDL_EFSEEK);
+}
+
+static size_t SDLCALL
+stdio_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
+{
+    size_t nread;
+
+    nread = fread(ptr, size, maxnum, context->hidden.stdio.fp);
+    if (nread == 0 && ferror(context->hidden.stdio.fp)) {
+        SDL_Error(SDL_EFREAD);
+    }
+    return nread;
+}
+
+static size_t SDLCALL
+stdio_write(SDL_RWops * context, const void *ptr, size_t size, size_t num)
+{
+    size_t nwrote;
+
+    nwrote = fwrite(ptr, size, num, context->hidden.stdio.fp);
+    if (nwrote == 0 && ferror(context->hidden.stdio.fp)) {
+        SDL_Error(SDL_EFWRITE);
+    }
+    return nwrote;
+}
+
+static int SDLCALL
+stdio_close(SDL_RWops * context)
+{
+    int status = 0;
+    if (context) {
+        if (context->hidden.stdio.autoclose) {
+            /* WARNING:  Check the return value here! */
+            if (fclose(context->hidden.stdio.fp) != 0) {
+                status = SDL_Error(SDL_EFWRITE);
+            }
+        }
+        SDL_FreeRW(context);
+    }
+    return status;
+}
+#endif /* !HAVE_STDIO_H */
+
+/* Functions to read/write memory pointers */
+
+static Sint64 SDLCALL
+mem_size(SDL_RWops * context)
+{
+    return (Sint64)(context->hidden.mem.stop - context->hidden.mem.base);
+}
+
+static Sint64 SDLCALL
+mem_seek(SDL_RWops * context, Sint64 offset, int whence)
+{
+    Uint8 *newpos;
+
+    switch (whence) {
+    case RW_SEEK_SET:
+        newpos = context->hidden.mem.base + offset;
+        break;
+    case RW_SEEK_CUR:
+        newpos = context->hidden.mem.here + offset;
+        break;
+    case RW_SEEK_END:
+        newpos = context->hidden.mem.stop + offset;
+        break;
+    default:
+        return SDL_SetError("Unknown value for 'whence'");
+    }
+    if (newpos < context->hidden.mem.base) {
+        newpos = context->hidden.mem.base;
+    }
+    if (newpos > context->hidden.mem.stop) {
+        newpos = context->hidden.mem.stop;
+    }
+    context->hidden.mem.here = newpos;
+    return (Sint64)(context->hidden.mem.here - context->hidden.mem.base);
+}
+
+static size_t SDLCALL
+mem_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum)
+{
+    size_t total_bytes;
+    size_t mem_available;
+
+    total_bytes = (maxnum * size);
+    if ((maxnum <= 0) || (size <= 0)
+        || ((total_bytes / maxnum) != (size_t) size)) {
+        return 0;
+    }
+
+    mem_available = (context->hidden.mem.stop - context->hidden.mem.here);
+    if (total_bytes > mem_available) {
+        total_bytes = mem_available;
+    }
+
+    SDL_memcpy(ptr, context->hidden.mem.here, total_bytes);
+    context->hidden.mem.here += total_bytes;
+
+    return (total_bytes / size);
+}
+
+static size_t SDLCALL
+mem_write(SDL_RWops * context, const void *ptr, size_t size, size_t num)
+{
+    if ((context->hidden.mem.here + (num * size)) > context->hidden.mem.stop) {
+        num = (context->hidden.mem.stop - context->hidden.mem.here) / size;
+    }
+    SDL_memcpy(context->hidden.mem.here, ptr, num * size);
+    context->hidden.mem.here += num * size;
+    return num;
+}
+
+static size_t SDLCALL
+mem_writeconst(SDL_RWops * context, const void *ptr, size_t size, size_t num)
+{
+    SDL_SetError("Can't write to read-only memory");
+    return 0;
+}
+
+static int SDLCALL
+mem_close(SDL_RWops * context)
+{
+    if (context) {
+        SDL_FreeRW(context);
+    }
+    return 0;
+}
+
+
+/* Functions to create SDL_RWops structures from various data sources */
+
+SDL_RWops *
+SDL_RWFromFile(const char *file, const char *mode)
+{
+    SDL_RWops *rwops = NULL;
+    if (!file || !*file || !mode || !*mode) {
+        SDL_SetError("SDL_RWFromFile(): No file or no mode specified");
+        return NULL;
+    }
+#if defined(ANDROID)
+#ifdef HAVE_STDIO_H
+    /* Try to open the file on the filesystem first */
+    if (*file == '/') {
+        FILE *fp = fopen(file, mode);
+        if (fp) {
+            return SDL_RWFromFP(fp, 1);
+        }
+    } else {
+        /* Try opening it from internal storage if it's a relative path */
+        char *path;
+        FILE *fp;
+
+        path = SDL_stack_alloc(char, PATH_MAX);
+        if (path) {
+            SDL_snprintf(path, PATH_MAX, "%s/%s",
+                         SDL_AndroidGetInternalStoragePath(), file);
+            fp = fopen(path, mode);
+            SDL_stack_free(path);
+            if (fp) {
+                return SDL_RWFromFP(fp, 1);
+            }
+        }
+    }
+#endif /* HAVE_STDIO_H */
+
+    /* Try to open the file from the asset system */
+    rwops = SDL_AllocRW();
+    if (!rwops)
+        return NULL;            /* SDL_SetError already setup by SDL_AllocRW() */
+    if (Android_JNI_FileOpen(rwops, file, mode) < 0) {
+        SDL_FreeRW(rwops);
+        return NULL;
+    }
+    rwops->size = Android_JNI_FileSize;
+    rwops->seek = Android_JNI_FileSeek;
+    rwops->read = Android_JNI_FileRead;
+    rwops->write = Android_JNI_FileWrite;
+    rwops->close = Android_JNI_FileClose;
+    rwops->type = SDL_RWOPS_JNIFILE;
+
+#elif defined(__WIN32__)
+    rwops = SDL_AllocRW();
+    if (!rwops)
+        return NULL;            /* SDL_SetError already setup by SDL_AllocRW() */
+    if (windows_file_open(rwops, file, mode) < 0) {
+        SDL_FreeRW(rwops);
+        return NULL;
+    }
+    rwops->size = windows_file_size;
+    rwops->seek = windows_file_seek;
+    rwops->read = windows_file_read;
+    rwops->write = windows_file_write;
+    rwops->close = windows_file_close;
+    rwops->type = SDL_RWOPS_WINFILE;
+
+#elif HAVE_STDIO_H
+    {
+        #ifdef __APPLE__
+        FILE *fp = SDL_OpenFPFromBundleOrFallback(file, mode);
+        #elif __WINRT__
+        FILE *fp = NULL;
+        fopen_s(&fp, file, mode);
+        #else
+        FILE *fp = fopen(file, mode);
+        #endif
+        if (fp == NULL) {
+            SDL_SetError("Couldn't open %s", file);
+        } else {
+            rwops = SDL_RWFromFP(fp, 1);
+        }
+    }
+#else
+    SDL_SetError("SDL not compiled with stdio support");
+#endif /* !HAVE_STDIO_H */
+
+    return rwops;
+}
+
+#ifdef HAVE_STDIO_H
+SDL_RWops *
+SDL_RWFromFP(FILE * fp, SDL_bool autoclose)
+{
+    SDL_RWops *rwops = NULL;
+
+    rwops = SDL_AllocRW();
+    if (rwops != NULL) {
+        rwops->size = stdio_size;
+        rwops->seek = stdio_seek;
+        rwops->read = stdio_read;
+        rwops->write = stdio_write;
+        rwops->close = stdio_close;
+        rwops->hidden.stdio.fp = fp;
+        rwops->hidden.stdio.autoclose = autoclose;
+        rwops->type = SDL_RWOPS_STDFILE;
+    }
+    return rwops;
+}
+#else
+SDL_RWops *
+SDL_RWFromFP(void * fp, SDL_bool autoclose)
+{
+    SDL_SetError("SDL not compiled with stdio support");
+    return NULL;
+}
+#endif /* HAVE_STDIO_H */
+
+SDL_RWops *
+SDL_RWFromMem(void *mem, int size)
+{
+    SDL_RWops *rwops = NULL;
+    if (!mem) {
+      SDL_InvalidParamError("mem");
+      return rwops;
+    }
+    if (!size) {
+      SDL_InvalidParamError("size");
+      return rwops;
+    }
+
+    rwops = SDL_AllocRW();
+    if (rwops != NULL) {
+        rwops->size = mem_size;
+        rwops->seek = mem_seek;
+        rwops->read = mem_read;
+        rwops->write = mem_write;
+        rwops->close = mem_close;
+        rwops->hidden.mem.base = (Uint8 *) mem;
+        rwops->hidden.mem.here = rwops->hidden.mem.base;
+        rwops->hidden.mem.stop = rwops->hidden.mem.base + size;
+        rwops->type = SDL_RWOPS_MEMORY;
+    }
+    return rwops;
+}
+
+SDL_RWops *
+SDL_RWFromConstMem(const void *mem, int size)
+{
+    SDL_RWops *rwops = NULL;
+    if (!mem) {
+      SDL_InvalidParamError("mem");
+      return rwops;
+    }
+    if (!size) {
+      SDL_InvalidParamError("size");
+      return rwops;
+    }
+
+    rwops = SDL_AllocRW();
+    if (rwops != NULL) {
+        rwops->size = mem_size;
+        rwops->seek = mem_seek;
+        rwops->read = mem_read;
+        rwops->write = mem_writeconst;
+        rwops->close = mem_close;
+        rwops->hidden.mem.base = (Uint8 *) mem;
+        rwops->hidden.mem.here = rwops->hidden.mem.base;
+        rwops->hidden.mem.stop = rwops->hidden.mem.base + size;
+        rwops->type = SDL_RWOPS_MEMORY_RO;
+    }
+    return rwops;
+}
+
+SDL_RWops *
+SDL_AllocRW(void)
+{
+    SDL_RWops *area;
+
+    area = (SDL_RWops *) SDL_malloc(sizeof *area);
+    if (area == NULL) {
+        SDL_OutOfMemory();
+    } else {
+        area->type = SDL_RWOPS_UNKNOWN;
+    }
+    return area;
+}
+
+void
+SDL_FreeRW(SDL_RWops * area)
+{
+    SDL_free(area);
+}
+
+/* Functions for dynamically reading and writing endian-specific values */
+
+Uint8
+SDL_ReadU8(SDL_RWops * src)
+{
+    Uint8 value = 0;
+
+    SDL_RWread(src, &value, sizeof (value), 1);
+    return value;
+}
+
+Uint16
+SDL_ReadLE16(SDL_RWops * src)
+{
+    Uint16 value = 0;
+
+    SDL_RWread(src, &value, sizeof (value), 1);
+    return SDL_SwapLE16(value);
+}
+
+Uint16
+SDL_ReadBE16(SDL_RWops * src)
+{
+    Uint16 value = 0;
+
+    SDL_RWread(src, &value, sizeof (value), 1);
+    return SDL_SwapBE16(value);
+}
+
+Uint32
+SDL_ReadLE32(SDL_RWops * src)
+{
+    Uint32 value = 0;
+
+    SDL_RWread(src, &value, sizeof (value), 1);
+    return SDL_SwapLE32(value);
+}
+
+Uint32
+SDL_ReadBE32(SDL_RWops * src)
+{
+    Uint32 value = 0;
+
+    SDL_RWread(src, &value, sizeof (value), 1);
+    return SDL_SwapBE32(value);
+}
+
+Uint64
+SDL_ReadLE64(SDL_RWops * src)
+{
+    Uint64 value = 0;
+
+    SDL_RWread(src, &value, sizeof (value), 1);
+    return SDL_SwapLE64(value);
+}
+
+Uint64
+SDL_ReadBE64(SDL_RWops * src)
+{
+    Uint64 value = 0;
+
+    SDL_RWread(src, &value, sizeof (value), 1);
+    return SDL_SwapBE64(value);
+}
+
+size_t
+SDL_WriteU8(SDL_RWops * dst, Uint8 value)
+{
+    return SDL_RWwrite(dst, &value, sizeof (value), 1);
+}
+
+size_t
+SDL_WriteLE16(SDL_RWops * dst, Uint16 value)
+{
+    const Uint16 swapped = SDL_SwapLE16(value);
+    return SDL_RWwrite(dst, &swapped, sizeof (swapped), 1);
+}
+
+size_t
+SDL_WriteBE16(SDL_RWops * dst, Uint16 value)
+{
+    const Uint16 swapped = SDL_SwapBE16(value);
+    return SDL_RWwrite(dst, &swapped, sizeof (swapped), 1);
+}
+
+size_t
+SDL_WriteLE32(SDL_RWops * dst, Uint32 value)
+{
+    const Uint32 swapped = SDL_SwapLE32(value);
+    return SDL_RWwrite(dst, &swapped, sizeof (swapped), 1);
+}
+
+size_t
+SDL_WriteBE32(SDL_RWops * dst, Uint32 value)
+{
+    const Uint32 swapped = SDL_SwapBE32(value);
+    return SDL_RWwrite(dst, &swapped, sizeof (swapped), 1);
+}
+
+size_t
+SDL_WriteLE64(SDL_RWops * dst, Uint64 value)
+{
+    const Uint64 swapped = SDL_SwapLE64(value);
+    return SDL_RWwrite(dst, &swapped, sizeof (swapped), 1);
+}
+
+size_t
+SDL_WriteBE64(SDL_RWops * dst, Uint64 value)
+{
+    const Uint64 swapped = SDL_SwapBE64(value);
+    return SDL_RWwrite(dst, &swapped, sizeof (swapped), 1);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h b/Source/3rd Party/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h
new file mode 100644
index 000000000..9a8a9662c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/file/cocoa/SDL_rwopsbundlesupport.h	
@@ -0,0 +1,30 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifdef __APPLE__
+
+#include <stdio.h>
+
+#ifndef SDL_rwopsbundlesupport_h
+#define SDL_rwopsbundlesupport_h
+FILE* SDL_OpenFPFromBundleOrFallback(const char *file, const char *mode);
+#endif
+#endif
diff --git a/Source/3rd Party/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m b/Source/3rd Party/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m
new file mode 100644
index 000000000..682bd74a9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/file/cocoa/SDL_rwopsbundlesupport.m	
@@ -0,0 +1,70 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef __APPLE__
+#import <Foundation/Foundation.h>
+
+#include "SDL_rwopsbundlesupport.h"
+
+/* For proper OS X applications, the resources are contained inside the application bundle.
+ So the strategy is to first check the application bundle for the file, then fallback to the current working directory.
+ Note: One additional corner-case is if the resource is in a framework's resource bundle instead of the app.
+ We might want to use bundle identifiers, e.g. org.libsdl.sdl to get the bundle for the framework,
+ but we would somehow need to know what the bundle identifiers we need to search are.
+ Also, note the bundle layouts are different for iPhone and Mac.
+*/
+FILE* SDL_OpenFPFromBundleOrFallback(const char *file, const char *mode)
+{
+    FILE* fp = NULL;
+
+    /* If the file mode is writable, skip all the bundle stuff because generally the bundle is read-only. */
+    if(strcmp("r", mode) && strcmp("rb", mode))
+    {
+        return fopen(file, mode);
+    }
+
+    NSAutoreleasePool* autorelease_pool = [[NSAutoreleasePool alloc] init];
+
+
+    NSFileManager* file_manager = [NSFileManager defaultManager];
+    NSString* resource_path = [[NSBundle mainBundle] resourcePath];
+
+    NSString* ns_string_file_component = [file_manager stringWithFileSystemRepresentation:file length:strlen(file)];
+
+    NSString* full_path_with_file_to_try = [resource_path stringByAppendingPathComponent:ns_string_file_component];
+    if([file_manager fileExistsAtPath:full_path_with_file_to_try])
+    {
+        fp = fopen([full_path_with_file_to_try fileSystemRepresentation], mode);
+    }
+    else
+    {
+        fp = fopen(file, mode);
+    }
+
+    [autorelease_pool drain];
+
+    return fp;
+}
+
+#endif /* __MACOSX__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m b/Source/3rd Party/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m
new file mode 100644
index 000000000..adcebd68b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/filesystem/cocoa/SDL_sysfilesystem.m	
@@ -0,0 +1,105 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_FILESYSTEM_COCOA
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines                                */
+
+#include <Foundation/Foundation.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
+#include "SDL_filesystem.h"
+
+char *
+SDL_GetBasePath(void)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSBundle *bundle = [NSBundle mainBundle];
+    const char* baseType = [[[bundle infoDictionary] objectForKey:@"SDL_FILESYSTEM_BASE_DIR_TYPE"] UTF8String];
+    const char *base = NULL;
+    char *retval = NULL;
+    if (baseType == NULL) {
+        baseType = "resource";
+    }
+    if (SDL_strcasecmp(baseType, "bundle")==0) {
+        base = [[bundle bundlePath] fileSystemRepresentation];
+    } else if (SDL_strcasecmp(baseType, "parent")==0) {
+        base = [[[bundle bundlePath] stringByDeletingLastPathComponent] fileSystemRepresentation];
+    } else {
+        /* this returns the exedir for non-bundled  and the resourceDir for bundled apps */
+        base = [[bundle resourcePath] fileSystemRepresentation];
+    }
+    if (base) {
+        const size_t len = SDL_strlen(base) + 2;
+        retval = (char *) SDL_malloc(len);
+        if (retval == NULL) {
+            SDL_OutOfMemory();
+        } else {
+            SDL_snprintf(retval, len, "%s/", base);
+        }
+    }
+
+    [pool release];
+    return retval;
+}
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSArray *array = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+    char *retval = NULL;
+
+    if ([array count] > 0) {  /* we only want the first item in the list. */
+        NSString *str = [array objectAtIndex:0];
+        const char *base = [str fileSystemRepresentation];
+        if (base) {
+            const size_t len = SDL_strlen(base) + SDL_strlen(org) + SDL_strlen(app) + 4;
+            retval = (char *) SDL_malloc(len);
+            if (retval == NULL) {
+                SDL_OutOfMemory();
+            } else {
+                char *ptr;
+                SDL_snprintf(retval, len, "%s/%s/%s/", base, org, app);
+                for (ptr = retval+1; *ptr; ptr++) {
+                    if (*ptr == '/') {
+                        *ptr = '\0';
+                        mkdir(retval, 0700);
+                        *ptr = '/';
+                    }
+                }
+                mkdir(retval, 0700);
+            }
+        }
+    }
+
+    [pool release];
+    return retval;
+}
+
+#endif /* SDL_FILESYSTEM_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/filesystem/dummy/SDL_sysfilesystem.c b/Source/3rd Party/sdl/src/filesystem/dummy/SDL_sysfilesystem.c
new file mode 100644
index 000000000..7e860939a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/filesystem/dummy/SDL_sysfilesystem.c	
@@ -0,0 +1,47 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_FILESYSTEM_DUMMY
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines                                */
+
+#include "SDL_error.h"
+#include "SDL_filesystem.h"
+
+char *
+SDL_GetBasePath(void)
+{
+    SDL_Unsupported();
+    return NULL;
+}
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+    SDL_Unsupported();
+    return NULL;
+}
+
+#endif /* SDL_FILESYSTEM_DUMMY */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc b/Source/3rd Party/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc
new file mode 100644
index 000000000..b83d4d0a1
--- /dev/null
+++ b/Source/3rd Party/sdl/src/filesystem/haiku/SDL_sysfilesystem.cc	
@@ -0,0 +1,93 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_FILESYSTEM_HAIKU
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines                                */
+
+#include <os/kernel/image.h>
+#include <os/storage/Directory.h>
+#include <os/storage/Entry.h>
+#include <os/storage/Path.h>
+
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
+#include "SDL_assert.h"
+#include "SDL_filesystem.h"
+
+char *
+SDL_GetBasePath(void)
+{
+    image_info info;
+    int32 cookie = 0;
+
+    while (get_next_image_info(0, &cookie, &info) == B_OK) {
+        if (info.type == B_APP_IMAGE) {
+            break;
+        }
+    }
+
+    BEntry entry(info.name, true);
+    BPath path;
+    status_t rc = entry.GetPath(&path);  /* (path) now has binary's path. */
+    SDL_assert(rc == B_OK);
+    rc = path.GetParent(&path); /* chop filename, keep directory. */
+    SDL_assert(rc == B_OK);
+    const char *str = path.Path();
+    SDL_assert(str != NULL);
+
+    const size_t len = SDL_strlen(str);
+    char *retval = (char *) SDL_malloc(len + 2);
+    if (!retval) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    SDL_memcpy(retval, str, len);
+    retval[len] = '/';
+    retval[len+1] = '\0';
+    return retval;
+}
+
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+    // !!! FIXME: is there a better way to do this?
+    const char *home = SDL_getenv("HOME");
+    const char *append = "config/settings/";
+    const size_t len = SDL_strlen(home) + SDL_strlen(append) + SDL_strlen(org) + SDL_strlen(app) + 3;
+    char *retval = (char *) SDL_malloc(len);
+    if (!retval) {
+        SDL_OutOfMemory();
+    } else {
+        SDL_snprintf(retval, len, "%s%s%s/%s/", home, append, org, app);
+        create_directory(retval, 0700);  // Haiku api: creates missing dirs
+    }
+
+    return retval;
+}
+
+#endif /* SDL_FILESYSTEM_HAIKU */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/filesystem/unix/SDL_sysfilesystem.c b/Source/3rd Party/sdl/src/filesystem/unix/SDL_sysfilesystem.c
new file mode 100644
index 000000000..0349476eb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/filesystem/unix/SDL_sysfilesystem.c	
@@ -0,0 +1,210 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_FILESYSTEM_UNIX
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines                                */
+
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <limits.h>
+
+#ifdef __FREEBSD__
+#include <sys/sysctl.h>
+#endif
+
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
+#include "SDL_filesystem.h"
+
+static char *
+readSymLink(const char *path)
+{
+    char *retval = NULL;
+    ssize_t len = 64;
+    ssize_t rc = -1;
+
+    while (1)
+    {
+        char *ptr = (char *) SDL_realloc(retval, (size_t) len);
+        if (ptr == NULL) {
+            SDL_OutOfMemory();
+            break;
+        }
+
+        retval = ptr;
+
+        rc = readlink(path, retval, len);
+        if (rc == -1) {
+            break;  /* not a symlink, i/o error, etc. */
+        } else if (rc < len) {
+            retval[rc] = '\0';  /* readlink doesn't null-terminate. */
+            return retval;  /* we're good to go. */
+        }
+
+        len *= 2;  /* grow buffer, try again. */
+    }
+
+    SDL_free(retval);
+    return NULL;
+}
+
+
+char *
+SDL_GetBasePath(void)
+{
+    char *retval = NULL;
+
+#if defined(__FREEBSD__)
+    char fullpath[PATH_MAX];
+    size_t buflen = sizeof (fullpath);
+    const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+    if (sysctl(mib, SDL_arraysize(mib), fullpath, &buflen, NULL, 0) != -1) {
+        retval = SDL_strdup(fullpath);
+        if (!retval) {
+            SDL_OutOfMemory();
+            return NULL;
+        }
+    }
+#elif defined(__SOLARIS__)
+    const char *path = getexecname();
+    if ((path != NULL) && (path[0] == '/')) { /* must be absolute path... */
+        retval = SDL_strdup(path);
+        if (!retval) {
+            SDL_OutOfMemory();
+            return NULL;
+        }
+    }
+#endif
+
+    /* is a Linux-style /proc filesystem available? */
+    if (!retval && (access("/proc", F_OK) == 0)) {
+#if defined(__FREEBSD__)
+        retval = readSymLink("/proc/curproc/file");
+#elif defined(__NETBSD__)
+        retval = readSymLink("/proc/curproc/exe");
+#else
+        retval = readSymLink("/proc/self/exe");  /* linux. */
+#endif
+        if (retval == NULL) {
+            /* older kernels don't have /proc/self ... try PID version... */
+            char path[64];
+            const int rc = (int) SDL_snprintf(path, sizeof(path),
+                                              "/proc/%llu/exe",
+                                              (unsigned long long) getpid());
+            if ( (rc > 0) && (rc < sizeof(path)) ) {
+                retval = readSymLink(path);
+            }
+        }
+    }
+
+    /* If we had access to argv[0] here, we could check it for a path,
+        or troll through $PATH looking for it, too. */
+
+    if (retval != NULL) { /* chop off filename. */
+        char *ptr = SDL_strrchr(retval, '/');
+        if (ptr != NULL) {
+            *(ptr+1) = '\0';
+        } else {  /* shouldn't happen, but just in case... */
+            SDL_free(retval);
+            retval = NULL;
+        }
+    }
+
+    if (retval != NULL) {
+        /* try to shrink buffer... */
+        char *ptr = (char *) SDL_realloc(retval, strlen(retval) + 1);
+        if (ptr != NULL)
+            retval = ptr;  /* oh well if it failed. */
+    }
+
+    return retval;
+}
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+    /*
+     * We use XDG's base directory spec, even if you're not on Linux.
+     *  This isn't strictly correct, but the results are relatively sane
+     *  in any case.
+     *
+     * http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+     */
+    const char *envr = SDL_getenv("XDG_DATA_HOME");
+    const char *append;
+    char *retval = NULL;
+    char *ptr = NULL;
+    size_t len = 0;
+
+    if (!envr) {
+        /* You end up with "$HOME/.local/share/Game Name 2" */
+        envr = SDL_getenv("HOME");
+        if (!envr) {
+            /* we could take heroic measures with /etc/passwd, but oh well. */
+            SDL_SetError("neither XDG_DATA_HOME nor HOME environment is set");
+            return NULL;
+        }
+        append = "/.local/share/";
+    } else {
+        append = "/";
+    }
+
+    len = SDL_strlen(envr);
+    if (envr[len - 1] == '/')
+        append += 1;
+
+    len += SDL_strlen(append) + SDL_strlen(org) + SDL_strlen(app) + 3;
+    retval = (char *) SDL_malloc(len);
+    if (!retval) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    SDL_snprintf(retval, len, "%s%s%s/%s/", envr, append, org, app);
+
+    for (ptr = retval+1; *ptr; ptr++) {
+        if (*ptr == '/') {
+            *ptr = '\0';
+            if (mkdir(retval, 0700) != 0 && errno != EEXIST)
+                goto error;
+            *ptr = '/';
+        }
+    }
+    if (mkdir(retval, 0700) != 0 && errno != EEXIST) {
+error:
+        SDL_SetError("Couldn't create directory '%s': ", retval, strerror(errno));
+        SDL_free(retval);
+        return NULL;
+    }
+
+    return retval;
+}
+
+#endif /* SDL_FILESYSTEM_UNIX */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/filesystem/windows/SDL_sysfilesystem.c b/Source/3rd Party/sdl/src/filesystem/windows/SDL_sysfilesystem.c
new file mode 100644
index 000000000..2791fb39a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/filesystem/windows/SDL_sysfilesystem.c	
@@ -0,0 +1,140 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_FILESYSTEM_WINDOWS
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines                                */
+
+#include "../../core/windows/SDL_windows.h"
+#include <shlobj.h>
+
+#include "SDL_assert.h"
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
+#include "SDL_filesystem.h"
+
+char *
+SDL_GetBasePath(void)
+{
+    TCHAR path[MAX_PATH];
+    const DWORD len = GetModuleFileName(NULL, path, SDL_arraysize(path));
+    size_t i;
+
+    SDL_assert(len < SDL_arraysize(path));
+
+    if (len == 0) {
+        WIN_SetError("Couldn't locate our .exe");
+        return NULL;
+    }
+
+    for (i = len-1; i > 0; i--) {
+        if (path[i] == '\\') {
+            break;
+        }
+    }
+
+    SDL_assert(i > 0); /* Should have been an absolute path. */
+    path[i+1] = '\0';  /* chop off filename. */
+    return WIN_StringToUTF8(path);
+}
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+    /*
+     * Vista and later has a new API for this, but SHGetFolderPath works there,
+     *  and apparently just wraps the new API. This is the new way to do it:
+     *
+     *     SHGetKnownFolderPath(FOLDERID_RoamingAppData, KF_FLAG_CREATE,
+     *                          NULL, &wszPath);
+     */
+
+    WCHAR path[MAX_PATH];
+    char *retval = NULL;
+    WCHAR* worg = NULL;
+    WCHAR* wapp = NULL;
+    size_t new_wpath_len = 0;
+    BOOL api_result = FALSE;
+
+    if (!SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, 0, path))) {
+        WIN_SetError("Couldn't locate our prefpath");
+        return NULL;
+    }
+
+    worg = WIN_UTF8ToString(org);
+    if (worg == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    wapp = WIN_UTF8ToString(app);
+    if (wapp == NULL) {
+        SDL_free(worg);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    new_wpath_len = lstrlenW(worg) + lstrlenW(wapp) + lstrlenW(path) + 3;
+
+    if ((new_wpath_len + 1) > MAX_PATH) {
+        SDL_free(worg);
+        SDL_free(wapp);
+        WIN_SetError("Path too long.");
+        return NULL;
+    }
+
+    lstrcatW(path, L"\\");
+    lstrcatW(path, worg);
+    SDL_free(worg);
+
+    api_result = CreateDirectoryW(path, NULL);
+    if (api_result == FALSE) {
+        if (GetLastError() != ERROR_ALREADY_EXISTS) {
+            SDL_free(wapp);
+            WIN_SetError("Couldn't create a prefpath.");
+            return NULL;
+        }
+    }
+
+    lstrcatW(path, L"\\");
+    lstrcatW(path, wapp);
+    SDL_free(wapp);
+
+    api_result = CreateDirectoryW(path, NULL);
+    if (api_result == FALSE) {
+        if (GetLastError() != ERROR_ALREADY_EXISTS) {
+            WIN_SetError("Couldn't create a prefpath.");
+            return NULL;
+        }
+    }
+
+    lstrcatW(path, L"\\");
+
+    retval = WIN_StringToUTF8(path);
+
+    return retval;
+}
+
+#endif /* SDL_FILESYSTEM_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp b/Source/3rd Party/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp
new file mode 100644
index 000000000..48c21e10b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/filesystem/winrt/SDL_sysfilesystem.cpp	
@@ -0,0 +1,174 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* TODO, WinRT: include copyright info in SDL_winrtpaths.cpp
+   TODO, WinRT: remove the need to compile this with C++/CX (/ZW) extensions, and if possible, without C++ at all
+*/
+
+#ifdef __WINRT__
+
+extern "C" {
+#include "SDL_filesystem.h"
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
+#include "SDL_system.h"
+#include "../../core/windows/SDL_windows.h"
+}
+
+#include <string>
+#include <unordered_map>
+
+using namespace std;
+using namespace Windows::Storage;
+
+extern "C" const wchar_t *
+SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType)
+{
+    switch (pathType) {
+        case SDL_WINRT_PATH_INSTALLED_LOCATION:
+        {
+            static wstring path;
+            if (path.empty()) {
+                path = Windows::ApplicationModel::Package::Current->InstalledLocation->Path->Data();
+            }
+            return path.c_str();
+        }
+
+        case SDL_WINRT_PATH_LOCAL_FOLDER:
+        {
+            static wstring path;
+            if (path.empty()) {
+                path = ApplicationData::Current->LocalFolder->Path->Data();
+            }
+            return path.c_str();
+        }
+
+#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
+        case SDL_WINRT_PATH_ROAMING_FOLDER:
+        {
+            static wstring path;
+            if (path.empty()) {
+                path = ApplicationData::Current->RoamingFolder->Path->Data();
+            }
+            return path.c_str();
+        }
+
+        case SDL_WINRT_PATH_TEMP_FOLDER:
+        {
+            static wstring path;
+            if (path.empty()) {
+                path = ApplicationData::Current->TemporaryFolder->Path->Data();
+            }
+            return path.c_str();
+        }
+#endif
+
+        default:
+            break;
+    }
+
+    SDL_Unsupported();
+    return NULL;
+}
+
+extern "C" const char *
+SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType)
+{
+    typedef unordered_map<SDL_WinRT_Path, string> UTF8PathMap;
+    static UTF8PathMap utf8Paths;
+
+    UTF8PathMap::iterator searchResult = utf8Paths.find(pathType);
+    if (searchResult != utf8Paths.end()) {
+        return searchResult->second.c_str();
+    }
+
+    const wchar_t * ucs2Path = SDL_WinRTGetFSPathUNICODE(pathType);
+    if (!ucs2Path) {
+        return NULL;
+    }
+
+    char * utf8Path = WIN_StringToUTF8(ucs2Path);
+    utf8Paths[pathType] = utf8Path;
+    SDL_free(utf8Path);
+    return utf8Paths[pathType].c_str();
+}
+
+extern "C" char *
+SDL_GetBasePath(void)
+{
+    const char * srcPath = SDL_WinRTGetFSPathUTF8(SDL_WINRT_PATH_INSTALLED_LOCATION);
+    size_t destPathLen;
+    char * destPath = NULL;
+
+    if (!srcPath) {
+        SDL_SetError("Couldn't locate our basepath: %s", SDL_GetError());
+        return NULL;
+    }
+
+    destPathLen = SDL_strlen(srcPath) + 2;
+    destPath = (char *) SDL_malloc(destPathLen);
+    if (!destPath) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    SDL_snprintf(destPath, destPathLen, "%s\\", srcPath);
+    return destPath;
+}
+
+extern "C" char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+    /* WinRT note: The 'SHGetFolderPath' API that is used in Windows 7 and
+     * earlier is not available on WinRT or Windows Phone.  WinRT provides
+     * a similar API, but SHGetFolderPath can't be called, at least not
+     * without violating Microsoft's app-store requirements.
+     */
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    /* A 'Roaming' folder is not available in Windows Phone 8, however a 'Local' folder is. */
+    const char * srcPath = SDL_WinRTGetFSPathUTF8(SDL_WINRT_PATH_LOCAL_FOLDER);
+#else
+    /* A 'Roaming' folder is available on Windows 8 and 8.1.  Use that. */
+    const char * srcPath = SDL_WinRTGetFSPathUTF8(SDL_WINRT_PATH_ROAMING_FOLDER);
+#endif
+
+    size_t destPathLen;
+    char * destPath = NULL;
+
+    if (!srcPath) {
+        SDL_SetError("Couldn't locate our basepath: %s", SDL_GetError());
+        return NULL;
+    }
+
+    destPathLen = SDL_strlen(srcPath) + SDL_strlen(org) + SDL_strlen(app) + 4;
+    destPath = (char *) SDL_malloc(destPathLen);
+    if (!destPath) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    SDL_snprintf(destPath, destPathLen, "%s\\%s\\%s\\", srcPath, org, app);
+    return destPath;
+}
+
+#endif /* __WINRT__ */
diff --git a/Source/3rd Party/sdl/src/haptic/SDL_haptic.c b/Source/3rd Party/sdl/src/haptic/SDL_haptic.c
new file mode 100644
index 000000000..fbfe14f3b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/haptic/SDL_haptic.c	
@@ -0,0 +1,847 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_syshaptic.h"
+#include "SDL_haptic_c.h"
+#include "../joystick/SDL_joystick_c.h" /* For SDL_PrivateJoystickValid */
+#include "SDL_assert.h"
+
+SDL_Haptic *SDL_haptics = NULL;
+
+
+/*
+ * Initializes the Haptic devices.
+ */
+int
+SDL_HapticInit(void)
+{
+    int status;
+
+    status = SDL_SYS_HapticInit();
+    if (status >= 0) {
+        status = 0;
+    }
+
+    return status;
+}
+
+
+/*
+ * Checks to see if the haptic device is valid
+ */
+static int
+ValidHaptic(SDL_Haptic * haptic)
+{
+    int valid;
+    SDL_Haptic *hapticlist;
+
+    valid = 0;
+    if (haptic != NULL) {
+        hapticlist = SDL_haptics;
+        while ( hapticlist )
+        {
+            if (hapticlist == haptic) {
+                valid = 1;
+                break;
+            }
+            hapticlist = hapticlist->next;
+        }
+    }
+
+    /* Create the error here. */
+    if (valid == 0) {
+        SDL_SetError("Haptic: Invalid haptic device identifier");
+    }
+
+    return valid;
+}
+
+
+/*
+ * Returns the number of available devices.
+ */
+int
+SDL_NumHaptics(void)
+{
+    return SDL_SYS_NumHaptics();
+}
+
+
+/*
+ * Gets the name of a Haptic device by index.
+ */
+const char *
+SDL_HapticName(int device_index)
+{
+    if ((device_index < 0) || (device_index >= SDL_NumHaptics())) {
+        SDL_SetError("Haptic: There are %d haptic devices available",
+                     SDL_NumHaptics());
+        return NULL;
+    }
+    return SDL_SYS_HapticName(device_index);
+}
+
+
+/*
+ * Opens a Haptic device.
+ */
+SDL_Haptic *
+SDL_HapticOpen(int device_index)
+{
+    SDL_Haptic *haptic;
+    SDL_Haptic *hapticlist;
+
+    if ((device_index < 0) || (device_index >= SDL_NumHaptics())) {
+        SDL_SetError("Haptic: There are %d haptic devices available",
+                     SDL_NumHaptics());
+        return NULL;
+    }
+
+    hapticlist = SDL_haptics;
+    /* If the haptic is already open, return it
+    * TODO: Should we create haptic instance IDs like the Joystick API?
+    */
+    while ( hapticlist )
+    {
+        if (device_index == hapticlist->index) {
+            haptic = hapticlist;
+            ++haptic->ref_count;
+            return haptic;
+        }
+        hapticlist = hapticlist->next;
+    }
+
+    /* Create the haptic device */
+    haptic = (SDL_Haptic *) SDL_malloc((sizeof *haptic));
+    if (haptic == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    /* Initialize the haptic device */
+    SDL_memset(haptic, 0, (sizeof *haptic));
+    haptic->rumble_id = -1;
+    haptic->index = device_index;
+    if (SDL_SYS_HapticOpen(haptic) < 0) {
+        SDL_free(haptic);
+        return NULL;
+    }
+
+    /* Add haptic to list */
+    ++haptic->ref_count;
+    /* Link the haptic in the list */
+    haptic->next = SDL_haptics;
+    SDL_haptics = haptic;
+
+    /* Disable autocenter and set gain to max. */
+    if (haptic->supported & SDL_HAPTIC_GAIN)
+        SDL_HapticSetGain(haptic, 100);
+    if (haptic->supported & SDL_HAPTIC_AUTOCENTER)
+        SDL_HapticSetAutocenter(haptic, 0);
+
+    return haptic;
+}
+
+
+/*
+ * Returns 1 if the device has been opened.
+ */
+int
+SDL_HapticOpened(int device_index)
+{
+    int opened;
+    SDL_Haptic *hapticlist;
+
+    /* Make sure it's valid. */
+    if ((device_index < 0) || (device_index >= SDL_NumHaptics())) {
+        SDL_SetError("Haptic: There are %d haptic devices available",
+                     SDL_NumHaptics());
+        return 0;
+    }
+
+    opened = 0;
+    hapticlist = SDL_haptics;
+    /* TODO Should this use an instance ID? */
+    while ( hapticlist )
+    {
+        if (hapticlist->index == (Uint8) device_index) {
+            opened = 1;
+            break;
+        }
+        hapticlist = hapticlist->next;
+    }
+    return opened;
+}
+
+
+/*
+ * Returns the index to a haptic device.
+ */
+int
+SDL_HapticIndex(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    return haptic->index;
+}
+
+
+/*
+ * Returns SDL_TRUE if mouse is haptic, SDL_FALSE if it isn't.
+ */
+int
+SDL_MouseIsHaptic(void)
+{
+    if (SDL_SYS_HapticMouse() < 0)
+        return SDL_FALSE;
+    return SDL_TRUE;
+}
+
+
+/*
+ * Returns the haptic device if mouse is haptic or NULL elsewise.
+ */
+SDL_Haptic *
+SDL_HapticOpenFromMouse(void)
+{
+    int device_index;
+
+    device_index = SDL_SYS_HapticMouse();
+
+    if (device_index < 0) {
+        SDL_SetError("Haptic: Mouse isn't a haptic device.");
+        return NULL;
+    }
+
+    return SDL_HapticOpen(device_index);
+}
+
+
+/*
+ * Returns SDL_TRUE if joystick has haptic features.
+ */
+int
+SDL_JoystickIsHaptic(SDL_Joystick * joystick)
+{
+    int ret;
+
+    /* Must be a valid joystick */
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return -1;
+    }
+
+    ret = SDL_SYS_JoystickIsHaptic(joystick);
+
+    if (ret > 0)
+        return SDL_TRUE;
+    else if (ret == 0)
+        return SDL_FALSE;
+    else
+        return -1;
+}
+
+
+/*
+ * Opens a haptic device from a joystick.
+ */
+SDL_Haptic *
+SDL_HapticOpenFromJoystick(SDL_Joystick * joystick)
+{
+    SDL_Haptic *haptic;
+    SDL_Haptic *hapticlist;
+
+    /* Make sure there is room. */
+    if (SDL_NumHaptics() <= 0) {
+        SDL_SetError("Haptic: There are %d haptic devices available",
+                     SDL_NumHaptics());
+        return NULL;
+    }
+
+    /* Must be a valid joystick */
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        SDL_SetError("Haptic: Joystick isn't valid.");
+        return NULL;
+    }
+
+    /* Joystick must be haptic */
+    if (SDL_SYS_JoystickIsHaptic(joystick) <= 0) {
+        SDL_SetError("Haptic: Joystick isn't a haptic device.");
+        return NULL;
+    }
+
+    hapticlist = SDL_haptics;
+    /* Check to see if joystick's haptic is already open */
+    while ( hapticlist )
+    {
+        if (SDL_SYS_JoystickSameHaptic(hapticlist, joystick)) {
+            haptic = hapticlist;
+            ++haptic->ref_count;
+            return haptic;
+        }
+        hapticlist = hapticlist->next;
+    }
+
+    /* Create the haptic device */
+    haptic = (SDL_Haptic *) SDL_malloc((sizeof *haptic));
+    if (haptic == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    /* Initialize the haptic device */
+    SDL_memset(haptic, 0, sizeof(SDL_Haptic));
+    haptic->rumble_id = -1;
+    if (SDL_SYS_HapticOpenFromJoystick(haptic, joystick) < 0) {
+        SDL_free(haptic);
+        return NULL;
+    }
+
+    /* Add haptic to list */
+    ++haptic->ref_count;
+    /* Link the haptic in the list */
+    haptic->next = SDL_haptics;
+    SDL_haptics = haptic;
+
+    return haptic;
+}
+
+
+/*
+ * Closes a SDL_Haptic device.
+ */
+void
+SDL_HapticClose(SDL_Haptic * haptic)
+{
+    int i;
+    SDL_Haptic *hapticlist;
+    SDL_Haptic *hapticlistprev;
+
+    /* Must be valid */
+    if (!ValidHaptic(haptic)) {
+        return;
+    }
+
+    /* Check if it's still in use */
+    if (--haptic->ref_count < 0) {
+        return;
+    }
+
+    /* Close it, properly removing effects if needed */
+    for (i = 0; i < haptic->neffects; i++) {
+        if (haptic->effects[i].hweffect != NULL) {
+            SDL_HapticDestroyEffect(haptic, i);
+        }
+    }
+    SDL_SYS_HapticClose(haptic);
+
+    /* Remove from the list */
+    hapticlist = SDL_haptics;
+    hapticlistprev = NULL;
+    while ( hapticlist )
+    {
+        if (haptic == hapticlist)
+        {
+            if ( hapticlistprev )
+            {
+                /* unlink this entry */
+                hapticlistprev->next = hapticlist->next;
+            }
+            else
+            {
+                SDL_haptics = haptic->next;
+            }
+
+            break;
+        }
+        hapticlistprev = hapticlist;
+        hapticlist = hapticlist->next;
+    }
+
+    /* Free */
+    SDL_free(haptic);
+}
+
+/*
+ * Cleans up after the subsystem.
+ */
+void
+SDL_HapticQuit(void)
+{
+    SDL_SYS_HapticQuit();
+    SDL_assert(SDL_haptics == NULL);
+    SDL_haptics = NULL;
+}
+
+/*
+ * Returns the number of effects a haptic device has.
+ */
+int
+SDL_HapticNumEffects(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    return haptic->neffects;
+}
+
+
+/*
+ * Returns the number of effects a haptic device can play.
+ */
+int
+SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    return haptic->nplaying;
+}
+
+
+/*
+ * Returns supported effects by the device.
+ */
+unsigned int
+SDL_HapticQuery(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return 0; /* same as if no effects were supported */
+    }
+
+    return haptic->supported;
+}
+
+
+/*
+ * Returns the number of axis on the device.
+ */
+int
+SDL_HapticNumAxes(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    return haptic->naxes;
+}
+
+/*
+ * Checks to see if the device can support the effect.
+ */
+int
+SDL_HapticEffectSupported(SDL_Haptic * haptic, SDL_HapticEffect * effect)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    if ((haptic->supported & effect->type) != 0)
+        return SDL_TRUE;
+    return SDL_FALSE;
+}
+
+/*
+ * Creates a new haptic effect.
+ */
+int
+SDL_HapticNewEffect(SDL_Haptic * haptic, SDL_HapticEffect * effect)
+{
+    int i;
+
+    /* Check for device validity. */
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    /* Check to see if effect is supported */
+    if (SDL_HapticEffectSupported(haptic, effect) == SDL_FALSE) {
+        return SDL_SetError("Haptic: Effect not supported by haptic device.");
+    }
+
+    /* See if there's a free slot */
+    for (i = 0; i < haptic->neffects; i++) {
+        if (haptic->effects[i].hweffect == NULL) {
+
+            /* Now let the backend create the real effect */
+            if (SDL_SYS_HapticNewEffect(haptic, &haptic->effects[i], effect)
+                != 0) {
+                return -1;      /* Backend failed to create effect */
+            }
+
+            SDL_memcpy(&haptic->effects[i].effect, effect,
+                       sizeof(SDL_HapticEffect));
+            return i;
+        }
+    }
+
+    return SDL_SetError("Haptic: Device has no free space left.");
+}
+
+/*
+ * Checks to see if an effect is valid.
+ */
+static int
+ValidEffect(SDL_Haptic * haptic, int effect)
+{
+    if ((effect < 0) || (effect >= haptic->neffects)) {
+        SDL_SetError("Haptic: Invalid effect identifier.");
+        return 0;
+    }
+    return 1;
+}
+
+/*
+ * Updates an effect.
+ */
+int
+SDL_HapticUpdateEffect(SDL_Haptic * haptic, int effect,
+                       SDL_HapticEffect * data)
+{
+    if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
+        return -1;
+    }
+
+    /* Can't change type dynamically. */
+    if (data->type != haptic->effects[effect].effect.type) {
+        return SDL_SetError("Haptic: Updating effect type is illegal.");
+    }
+
+    /* Updates the effect */
+    if (SDL_SYS_HapticUpdateEffect(haptic, &haptic->effects[effect], data) <
+        0) {
+        return -1;
+    }
+
+    SDL_memcpy(&haptic->effects[effect].effect, data,
+               sizeof(SDL_HapticEffect));
+    return 0;
+}
+
+
+/*
+ * Runs the haptic effect on the device.
+ */
+int
+SDL_HapticRunEffect(SDL_Haptic * haptic, int effect, Uint32 iterations)
+{
+    if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
+        return -1;
+    }
+
+    /* Run the effect */
+    if (SDL_SYS_HapticRunEffect(haptic, &haptic->effects[effect], iterations)
+        < 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+/*
+ * Stops the haptic effect on the device.
+ */
+int
+SDL_HapticStopEffect(SDL_Haptic * haptic, int effect)
+{
+    if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
+        return -1;
+    }
+
+    /* Stop the effect */
+    if (SDL_SYS_HapticStopEffect(haptic, &haptic->effects[effect]) < 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+/*
+ * Gets rid of a haptic effect.
+ */
+void
+SDL_HapticDestroyEffect(SDL_Haptic * haptic, int effect)
+{
+    if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
+        return;
+    }
+
+    /* Not allocated */
+    if (haptic->effects[effect].hweffect == NULL) {
+        return;
+    }
+
+    SDL_SYS_HapticDestroyEffect(haptic, &haptic->effects[effect]);
+}
+
+/*
+ * Gets the status of a haptic effect.
+ */
+int
+SDL_HapticGetEffectStatus(SDL_Haptic * haptic, int effect)
+{
+    if (!ValidHaptic(haptic) || !ValidEffect(haptic, effect)) {
+        return -1;
+    }
+
+    if ((haptic->supported & SDL_HAPTIC_STATUS) == 0) {
+        return SDL_SetError("Haptic: Device does not support status queries.");
+    }
+
+    return SDL_SYS_HapticGetEffectStatus(haptic, &haptic->effects[effect]);
+}
+
+/*
+ * Sets the global gain of the device.
+ */
+int
+SDL_HapticSetGain(SDL_Haptic * haptic, int gain)
+{
+    const char *env;
+    int real_gain, max_gain;
+
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    if ((haptic->supported & SDL_HAPTIC_GAIN) == 0) {
+        return SDL_SetError("Haptic: Device does not support setting gain.");
+    }
+
+    if ((gain < 0) || (gain > 100)) {
+        return SDL_SetError("Haptic: Gain must be between 0 and 100.");
+    }
+
+    /* We use the envvar to get the maximum gain. */
+    env = SDL_getenv("SDL_HAPTIC_GAIN_MAX");
+    if (env != NULL) {
+        max_gain = SDL_atoi(env);
+
+        /* Check for sanity. */
+        if (max_gain < 0)
+            max_gain = 0;
+        else if (max_gain > 100)
+            max_gain = 100;
+
+        /* We'll scale it linearly with SDL_HAPTIC_GAIN_MAX */
+        real_gain = (gain * max_gain) / 100;
+    } else {
+        real_gain = gain;
+    }
+
+    if (SDL_SYS_HapticSetGain(haptic, real_gain) < 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+/*
+ * Makes the device autocenter, 0 disables.
+ */
+int
+SDL_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    if ((haptic->supported & SDL_HAPTIC_AUTOCENTER) == 0) {
+        return SDL_SetError("Haptic: Device does not support setting autocenter.");
+    }
+
+    if ((autocenter < 0) || (autocenter > 100)) {
+        return SDL_SetError("Haptic: Autocenter must be between 0 and 100.");
+    }
+
+    if (SDL_SYS_HapticSetAutocenter(haptic, autocenter) < 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+/*
+ * Pauses the haptic device.
+ */
+int
+SDL_HapticPause(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    if ((haptic->supported & SDL_HAPTIC_PAUSE) == 0) {
+        return SDL_SetError("Haptic: Device does not support setting pausing.");
+    }
+
+    return SDL_SYS_HapticPause(haptic);
+}
+
+/*
+ * Unpauses the haptic device.
+ */
+int
+SDL_HapticUnpause(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    if ((haptic->supported & SDL_HAPTIC_PAUSE) == 0) {
+        return 0;               /* Not going to be paused, so we pretend it's unpaused. */
+    }
+
+    return SDL_SYS_HapticUnpause(haptic);
+}
+
+/*
+ * Stops all the currently playing effects.
+ */
+int
+SDL_HapticStopAll(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    return SDL_SYS_HapticStopAll(haptic);
+}
+
+/*
+ * Checks to see if rumble is supported.
+ */
+int
+SDL_HapticRumbleSupported(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    /* Most things can use SINE, but XInput only has LEFTRIGHT. */
+    return ((haptic->supported & (SDL_HAPTIC_SINE|SDL_HAPTIC_LEFTRIGHT)) != 0);
+}
+
+/*
+ * Initializes the haptic device for simple rumble playback.
+ */
+int
+SDL_HapticRumbleInit(SDL_Haptic * haptic)
+{
+    SDL_HapticEffect *efx = &haptic->rumble_effect;
+
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    /* Already allocated. */
+    if (haptic->rumble_id >= 0) {
+        return 0;
+    }
+
+    SDL_zerop(efx);
+    if (haptic->supported & SDL_HAPTIC_SINE) {
+        efx->type = SDL_HAPTIC_SINE;
+        efx->periodic.period = 1000;
+        efx->periodic.magnitude = 0x4000;
+        efx->periodic.length = 5000;
+        efx->periodic.attack_length = 0;
+        efx->periodic.fade_length = 0;
+    } else if (haptic->supported & SDL_HAPTIC_LEFTRIGHT) {  /* XInput? */
+        efx->type = SDL_HAPTIC_LEFTRIGHT;
+        efx->leftright.length = 5000;
+        efx->leftright.large_magnitude = 0x4000;
+        efx->leftright.small_magnitude = 0x4000;
+    } else {
+        return SDL_SetError("Device doesn't support rumble");
+    }
+
+    haptic->rumble_id = SDL_HapticNewEffect(haptic, &haptic->rumble_effect);
+    if (haptic->rumble_id >= 0) {
+        return 0;
+    }
+    return -1;
+}
+
+/*
+ * Runs simple rumble on a haptic device
+ */
+int
+SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length)
+{
+    SDL_HapticEffect *efx;
+    Sint16 magnitude;
+
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    if (haptic->rumble_id < 0) {
+        return SDL_SetError("Haptic: Rumble effect not initialized on haptic device");
+    }
+
+    /* Clamp strength. */
+    if (strength > 1.0f) {
+        strength = 1.0f;
+    } else if (strength < 0.0f) {
+        strength = 0.0f;
+    }
+    magnitude = (Sint16)(32767.0f*strength);
+
+    efx = &haptic->rumble_effect;
+    if (efx->type == SDL_HAPTIC_SINE) {
+        efx->periodic.magnitude = magnitude;
+        efx->periodic.length = length;
+    } else if (efx->type == SDL_HAPTIC_LEFTRIGHT) {
+        efx->leftright.small_magnitude = efx->leftright.large_magnitude = magnitude;
+        efx->leftright.length = length;
+    } else {
+        SDL_assert(0 && "This should have been caught elsewhere");
+    }
+
+    if (SDL_HapticUpdateEffect(haptic, haptic->rumble_id, &haptic->rumble_effect) < 0) {
+        return -1;
+    }
+
+    return SDL_HapticRunEffect(haptic, haptic->rumble_id, 1);
+}
+
+/*
+ * Stops the simple rumble on a haptic device.
+ */
+int
+SDL_HapticRumbleStop(SDL_Haptic * haptic)
+{
+    if (!ValidHaptic(haptic)) {
+        return -1;
+    }
+
+    if (haptic->rumble_id < 0) {
+        return SDL_SetError("Haptic: Rumble effect not initialized on haptic device");
+    }
+
+    return SDL_HapticStopEffect(haptic, haptic->rumble_id);
+}
+
diff --git a/Source/3rd Party/sdl/src/haptic/SDL_haptic_c.h b/Source/3rd Party/sdl/src/haptic/SDL_haptic_c.h
new file mode 100644
index 000000000..b318fff11
--- /dev/null
+++ b/Source/3rd Party/sdl/src/haptic/SDL_haptic_c.h	
@@ -0,0 +1,25 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+extern int SDL_HapticInit(void);
+extern void SDL_HapticQuit(void);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/haptic/SDL_syshaptic.h b/Source/3rd Party/sdl/src/haptic/SDL_syshaptic.h
new file mode 100644
index 000000000..b2918beb9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/haptic/SDL_syshaptic.h	
@@ -0,0 +1,210 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../SDL_internal.h"
+
+#include "SDL_haptic.h"
+
+
+/*
+ * Number of haptic devices on the system.
+ */
+extern Uint8 SDL_numhaptics;
+
+
+struct haptic_effect
+{
+    SDL_HapticEffect effect;    /* The current event */
+    struct haptic_hweffect *hweffect;   /* The hardware behind the event */
+};
+
+/*
+ * The real SDL_Haptic struct.
+ */
+struct _SDL_Haptic
+{
+    Uint8 index;                /* Stores index it is attached to */
+
+    struct haptic_effect *effects;      /* Allocated effects */
+    int neffects;               /* Maximum amount of effects */
+    int nplaying;               /* Maximum amount of effects to play at the same time */
+    unsigned int supported;     /* Supported effects */
+    int naxes;                  /* Number of axes on the device. */
+
+    struct haptic_hwdata *hwdata;       /* Driver dependent */
+    int ref_count;              /* Count for multiple opens */
+
+    int rumble_id;              /* ID of rumble effect for simple rumble API. */
+    SDL_HapticEffect rumble_effect; /* Rumble effect. */
+    struct _SDL_Haptic *next; /* pointer to next haptic we have allocated */
+};
+
+/*
+ * Scans the system for haptic devices.
+ *
+ * Returns number of devices on success, -1 on error.
+ */
+extern int SDL_SYS_HapticInit(void);
+
+/* Function to return the number of haptic devices plugged in right now */
+extern int SDL_SYS_NumHaptics();
+
+/*
+ * Gets the device dependent name of the haptic device
+ */
+extern const char *SDL_SYS_HapticName(int index);
+
+/*
+ * Opens the haptic device for usage.  The haptic device should have
+ * the index value set previously.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticOpen(SDL_Haptic * haptic);
+
+/*
+ * Returns the index of the haptic core pointer or -1 if none is found.
+ */
+int SDL_SYS_HapticMouse(void);
+
+/*
+ * Checks to see if the joystick has haptic capabilities.
+ *
+ * Returns >0 if haptic capabilities are detected, 0 if haptic
+ * capabilities aren't detected and -1 on error.
+ */
+extern int SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick);
+
+/*
+ * Opens the haptic device for usage using the same device as
+ * the joystick.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic,
+                                          SDL_Joystick * joystick);
+/*
+ * Checks to see if haptic device and joystick device are the same.
+ *
+ * Returns 1 if they are the same, 0 if they aren't.
+ */
+extern int SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic,
+                                      SDL_Joystick * joystick);
+
+/*
+ * Closes a haptic device after usage.
+ */
+extern void SDL_SYS_HapticClose(SDL_Haptic * haptic);
+
+/*
+ * Performs a cleanup on the haptic subsystem.
+ */
+extern void SDL_SYS_HapticQuit(void);
+
+/*
+ * Creates a new haptic effect on the haptic device using base
+ * as a template for the effect.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticNewEffect(SDL_Haptic * haptic,
+                                   struct haptic_effect *effect,
+                                   SDL_HapticEffect * base);
+
+/*
+ * Updates the haptic effect on the haptic device using data
+ * as a template.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
+                                      struct haptic_effect *effect,
+                                      SDL_HapticEffect * data);
+
+/*
+ * Runs the effect on the haptic device.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticRunEffect(SDL_Haptic * haptic,
+                                   struct haptic_effect *effect,
+                                   Uint32 iterations);
+
+/*
+ * Stops the effect on the haptic device.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticStopEffect(SDL_Haptic * haptic,
+                                    struct haptic_effect *effect);
+
+/*
+ * Cleanups up the effect on the haptic device.
+ */
+extern void SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic,
+                                        struct haptic_effect *effect);
+
+/*
+ * Queries the device for the status of effect.
+ *
+ * Returns 0 if device is stopped, >0 if device is playing and
+ * -1 on error.
+ */
+extern int SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
+                                         struct haptic_effect *effect);
+
+/*
+ * Sets the global gain of the haptic device.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain);
+
+/*
+ * Sets the autocenter feature of the haptic device.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter);
+
+/*
+ * Pauses the haptic device.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticPause(SDL_Haptic * haptic);
+
+/*
+ * Unpauses the haptic device.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticUnpause(SDL_Haptic * haptic);
+
+/*
+ * Stops all the currently playing haptic effects on the device.
+ *
+ * Returns 0 on success, -1 on error.
+ */
+extern int SDL_SYS_HapticStopAll(SDL_Haptic * haptic);
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/haptic/darwin/SDL_syshaptic.c b/Source/3rd Party/sdl/src/haptic/darwin/SDL_syshaptic.c
new file mode 100644
index 000000000..14beb6c86
--- /dev/null
+++ b/Source/3rd Party/sdl/src/haptic/darwin/SDL_syshaptic.c	
@@ -0,0 +1,1409 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_HAPTIC_IOKIT
+
+#include "SDL_assert.h"
+#include "SDL_haptic.h"
+#include "../SDL_syshaptic.h"
+#include "SDL_joystick.h"
+#include "../../joystick/SDL_sysjoystick.h"     /* For the real SDL_Joystick */
+#include "../../joystick/darwin/SDL_sysjoystick_c.h"    /* For joystick hwdata */
+#include "SDL_syshaptic_c.h"
+
+#include <IOKit/IOKitLib.h>
+#include <IOKit/hid/IOHIDKeys.h>
+#include <IOKit/hid/IOHIDUsageTables.h>
+#include <ForceFeedback/ForceFeedback.h>
+#include <ForceFeedback/ForceFeedbackConstants.h>
+
+#ifndef IO_OBJECT_NULL
+#define IO_OBJECT_NULL  ((io_service_t)0)
+#endif
+
+/*
+ * List of available haptic devices.
+ */
+typedef struct SDL_hapticlist_item
+{
+    char name[256];             /* Name of the device. */
+
+    io_service_t dev;           /* Node we use to create the device. */
+    SDL_Haptic *haptic;         /* Haptic currently associated with it. */
+
+    /* Usage pages for determining if it's a mouse or not. */
+    long usage;
+    long usagePage;
+
+    struct SDL_hapticlist_item *next;
+} SDL_hapticlist_item;
+
+
+/*
+ * Haptic system hardware data.
+ */
+struct haptic_hwdata
+{
+    FFDeviceObjectReference device;     /* Hardware device. */
+    UInt8 axes[3];
+};
+
+
+/*
+ * Haptic system effect data.
+ */
+struct haptic_hweffect
+{
+    FFEffectObjectReference ref;        /* Reference. */
+    struct FFEFFECT effect;     /* Hardware effect. */
+};
+
+/*
+ * Prototypes.
+ */
+static void SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type);
+static int HIDGetDeviceProduct(io_service_t dev, char *name);
+
+static SDL_hapticlist_item *SDL_hapticlist = NULL;
+static SDL_hapticlist_item *SDL_hapticlist_tail = NULL;
+static int numhaptics = -1;
+
+/*
+ * Like strerror but for force feedback errors.
+ */
+static const char *
+FFStrError(HRESULT err)
+{
+    switch (err) {
+    case FFERR_DEVICEFULL:
+        return "device full";
+        /* This should be valid, but for some reason isn't defined... */
+        /* case FFERR_DEVICENOTREG:
+           return "device not registered"; */
+    case FFERR_DEVICEPAUSED:
+        return "device paused";
+    case FFERR_DEVICERELEASED:
+        return "device released";
+    case FFERR_EFFECTPLAYING:
+        return "effect playing";
+    case FFERR_EFFECTTYPEMISMATCH:
+        return "effect type mismatch";
+    case FFERR_EFFECTTYPENOTSUPPORTED:
+        return "effect type not supported";
+    case FFERR_GENERIC:
+        return "undetermined error";
+    case FFERR_HASEFFECTS:
+        return "device has effects";
+    case FFERR_INCOMPLETEEFFECT:
+        return "incomplete effect";
+    case FFERR_INTERNAL:
+        return "internal fault";
+    case FFERR_INVALIDDOWNLOADID:
+        return "invalid download id";
+    case FFERR_INVALIDPARAM:
+        return "invalid parameter";
+    case FFERR_MOREDATA:
+        return "more data";
+    case FFERR_NOINTERFACE:
+        return "interface not supported";
+    case FFERR_NOTDOWNLOADED:
+        return "effect is not downloaded";
+    case FFERR_NOTINITIALIZED:
+        return "object has not been initialized";
+    case FFERR_OUTOFMEMORY:
+        return "out of memory";
+    case FFERR_UNPLUGGED:
+        return "device is unplugged";
+    case FFERR_UNSUPPORTED:
+        return "function call unsupported";
+    case FFERR_UNSUPPORTEDAXIS:
+        return "axis unsupported";
+
+    default:
+        return "unknown error";
+    }
+}
+
+
+/*
+ * Initializes the haptic subsystem.
+ */
+int
+SDL_SYS_HapticInit(void)
+{
+    IOReturn result;
+    io_iterator_t iter;
+    CFDictionaryRef match;
+    io_service_t device;
+
+    if (numhaptics != -1) {
+        return SDL_SetError("Haptic subsystem already initialized!");
+    }
+    numhaptics = 0;
+
+    /* Get HID devices. */
+    match = IOServiceMatching(kIOHIDDeviceKey);
+    if (match == NULL) {
+        return SDL_SetError("Haptic: Failed to get IOServiceMatching.");
+    }
+
+    /* Now search I/O Registry for matching devices. */
+    result = IOServiceGetMatchingServices(kIOMasterPortDefault, match, &iter);
+    if (result != kIOReturnSuccess) {
+        return SDL_SetError("Haptic: Couldn't create a HID object iterator.");
+    }
+    /* IOServiceGetMatchingServices consumes dictionary. */
+
+    if (!IOIteratorIsValid(iter)) {     /* No iterator. */
+        return 0;
+    }
+
+    while ((device = IOIteratorNext(iter)) != IO_OBJECT_NULL) {
+        MacHaptic_MaybeAddDevice(device);
+        /* always release as the AddDevice will retain IF it's a forcefeedback device */
+        IOObjectRelease(device);
+    }
+    IOObjectRelease(iter);
+
+    return numhaptics;
+}
+
+int
+SDL_SYS_NumHaptics()
+{
+    return numhaptics;
+}
+
+static SDL_hapticlist_item *
+HapticByDevIndex(int device_index)
+{
+    SDL_hapticlist_item *item = SDL_hapticlist;
+
+    if ((device_index < 0) || (device_index >= numhaptics)) {
+        return NULL;
+    }
+
+    while (device_index > 0) {
+        SDL_assert(item != NULL);
+        --device_index;
+        item = item->next;
+    }
+
+    return item;
+}
+
+int
+MacHaptic_MaybeAddDevice( io_object_t device )
+{
+    IOReturn result;
+    CFMutableDictionaryRef hidProperties;
+    CFTypeRef refCF;
+    SDL_hapticlist_item *item;
+
+    if (numhaptics == -1) {
+        return -1; /* not initialized. We'll pick these up on enumeration if we init later. */
+    }
+
+    /* Check for force feedback. */
+    if (FFIsForceFeedback(device) != FF_OK) {
+        return -1;
+    }
+
+    /* Make sure we don't already have it */
+    for (item = SDL_hapticlist; item ; item = item->next)
+    {
+        if (IOObjectIsEqualTo((io_object_t) item->dev, device)) {
+            /* Already added */
+            return -1;
+        }
+    }
+
+    item = (SDL_hapticlist_item *)SDL_calloc(1, sizeof(SDL_hapticlist_item));
+    if (item == NULL) {
+        return SDL_SetError("Could not allocate haptic storage");
+    }
+
+    /* retain it as we are going to keep it around a while */
+    IOObjectRetain(device);
+
+    /* Set basic device data. */
+    HIDGetDeviceProduct(device, item->name);
+    item->dev = device;
+
+    /* Set usage pages. */
+    hidProperties = 0;
+    refCF = 0;
+    result = IORegistryEntryCreateCFProperties(device,
+                                               &hidProperties,
+                                               kCFAllocatorDefault,
+                                               kNilOptions);
+    if ((result == KERN_SUCCESS) && hidProperties) {
+        refCF =
+        CFDictionaryGetValue(hidProperties,
+                             CFSTR(kIOHIDPrimaryUsagePageKey));
+        if (refCF) {
+            if (!CFNumberGetValue(refCF, kCFNumberLongType,
+                                  &item->usagePage))
+                SDL_SetError
+                ("Haptic: Recieving device's usage page.");
+            refCF =
+            CFDictionaryGetValue(hidProperties,
+                                 CFSTR(kIOHIDPrimaryUsageKey));
+            if (refCF) {
+                if (!CFNumberGetValue(refCF, kCFNumberLongType,
+                                      &item->usage))
+                    SDL_SetError("Haptic: Recieving device's usage.");
+            }
+        }
+        CFRelease(hidProperties);
+    }
+
+    if (SDL_hapticlist_tail == NULL) {
+        SDL_hapticlist = SDL_hapticlist_tail = item;
+    } else {
+        SDL_hapticlist_tail->next = item;
+        SDL_hapticlist_tail = item;
+    }
+
+    /* Device has been added. */
+    ++numhaptics;
+
+    return numhaptics;
+}
+
+int
+MacHaptic_MaybeRemoveDevice( io_object_t device )
+{
+    SDL_hapticlist_item *item;
+    SDL_hapticlist_item *prev = NULL;
+
+    if (numhaptics == -1) {
+        return -1; /* not initialized. ignore this. */
+    }
+
+    for (item = SDL_hapticlist; item != NULL; item = item->next) {
+        /* found it, remove it. */
+        if (IOObjectIsEqualTo((io_object_t) item->dev, device)) {
+            const int retval = item->haptic ? item->haptic->index : -1;
+
+            if (prev != NULL) {
+                prev->next = item->next;
+            } else {
+                SDL_assert(SDL_hapticlist == item);
+                SDL_hapticlist = item->next;
+            }
+            if (item == SDL_hapticlist_tail) {
+                SDL_hapticlist_tail = prev;
+            }
+
+            /* Need to decrement the haptic count */
+            --numhaptics;
+            /* !!! TODO: Send a haptic remove event? */
+
+            IOObjectRelease(item->dev);
+            SDL_free(item);
+            return retval;
+        }
+        prev = item;
+    }
+
+    return -1;
+}
+
+/*
+ * Return the name of a haptic device, does not need to be opened.
+ */
+const char *
+SDL_SYS_HapticName(int index)
+{
+    SDL_hapticlist_item *item;
+    item = HapticByDevIndex(index);
+    return item->name;
+}
+
+/*
+ * Gets the device's product name.
+ */
+static int
+HIDGetDeviceProduct(io_service_t dev, char *name)
+{
+    CFMutableDictionaryRef hidProperties, usbProperties;
+    io_registry_entry_t parent1, parent2;
+    kern_return_t ret;
+
+    hidProperties = usbProperties = 0;
+
+    ret = IORegistryEntryCreateCFProperties(dev, &hidProperties,
+                                            kCFAllocatorDefault, kNilOptions);
+    if ((ret != KERN_SUCCESS) || !hidProperties) {
+        return SDL_SetError("Haptic: Unable to create CFProperties.");
+    }
+
+    /* Mac OS X currently is not mirroring all USB properties to HID page so need to look at USB device page also
+     * get dictionary for USB properties: step up two levels and get CF dictionary for USB properties
+     */
+    if ((KERN_SUCCESS ==
+         IORegistryEntryGetParentEntry(dev, kIOServicePlane, &parent1))
+        && (KERN_SUCCESS ==
+            IORegistryEntryGetParentEntry(parent1, kIOServicePlane, &parent2))
+        && (KERN_SUCCESS ==
+            IORegistryEntryCreateCFProperties(parent2, &usbProperties,
+                                              kCFAllocatorDefault,
+                                              kNilOptions))) {
+        if (usbProperties) {
+            CFTypeRef refCF = 0;
+            /* get device info
+             * try hid dictionary first, if fail then go to USB dictionary
+             */
+
+
+            /* Get product name */
+            refCF =
+                CFDictionaryGetValue(hidProperties, CFSTR(kIOHIDProductKey));
+            if (!refCF)
+                refCF =
+                    CFDictionaryGetValue(usbProperties,
+                                         CFSTR("USB Product Name"));
+            if (refCF) {
+                if (!CFStringGetCString(refCF, name, 256,
+                                        CFStringGetSystemEncoding())) {
+                    return SDL_SetError
+                        ("Haptic: CFStringGetCString error retrieving pDevice->product.");
+                }
+            }
+
+            CFRelease(usbProperties);
+        } else {
+            return SDL_SetError
+                ("Haptic: IORegistryEntryCreateCFProperties failed to create usbProperties.");
+        }
+
+        /* Release stuff. */
+        if (kIOReturnSuccess != IOObjectRelease(parent2)) {
+            SDL_SetError("Haptic: IOObjectRelease error with parent2.");
+        }
+        if (kIOReturnSuccess != IOObjectRelease(parent1)) {
+            SDL_SetError("Haptic: IOObjectRelease error with parent1.");
+        }
+    } else {
+        return SDL_SetError("Haptic: Error getting registry entries.");
+    }
+
+    return 0;
+}
+
+
+#define FF_TEST(ff, s) \
+if (features.supportedEffects & (ff)) supported |= (s)
+/*
+ * Gets supported features.
+ */
+static unsigned int
+GetSupportedFeatures(SDL_Haptic * haptic)
+{
+    HRESULT ret;
+    FFDeviceObjectReference device;
+    FFCAPABILITIES features;
+    unsigned int supported;
+    Uint32 val;
+
+    device = haptic->hwdata->device;
+
+    ret = FFDeviceGetForceFeedbackCapabilities(device, &features);
+    if (ret != FF_OK) {
+        return SDL_SetError("Haptic: Unable to get device's supported features.");
+    }
+
+    supported = 0;
+
+    /* Get maximum effects. */
+    haptic->neffects = features.storageCapacity;
+    haptic->nplaying = features.playbackCapacity;
+
+    /* Test for effects. */
+    FF_TEST(FFCAP_ET_CONSTANTFORCE, SDL_HAPTIC_CONSTANT);
+    FF_TEST(FFCAP_ET_RAMPFORCE, SDL_HAPTIC_RAMP);
+    /* !!! FIXME: put this back when we have more bits in 2.1 */
+    /* FF_TEST(FFCAP_ET_SQUARE, SDL_HAPTIC_SQUARE); */
+    FF_TEST(FFCAP_ET_SINE, SDL_HAPTIC_SINE);
+    FF_TEST(FFCAP_ET_TRIANGLE, SDL_HAPTIC_TRIANGLE);
+    FF_TEST(FFCAP_ET_SAWTOOTHUP, SDL_HAPTIC_SAWTOOTHUP);
+    FF_TEST(FFCAP_ET_SAWTOOTHDOWN, SDL_HAPTIC_SAWTOOTHDOWN);
+    FF_TEST(FFCAP_ET_SPRING, SDL_HAPTIC_SPRING);
+    FF_TEST(FFCAP_ET_DAMPER, SDL_HAPTIC_DAMPER);
+    FF_TEST(FFCAP_ET_INERTIA, SDL_HAPTIC_INERTIA);
+    FF_TEST(FFCAP_ET_FRICTION, SDL_HAPTIC_FRICTION);
+    FF_TEST(FFCAP_ET_CUSTOMFORCE, SDL_HAPTIC_CUSTOM);
+
+    /* Check if supports gain. */
+    ret = FFDeviceGetForceFeedbackProperty(device, FFPROP_FFGAIN,
+                                           &val, sizeof(val));
+    if (ret == FF_OK)
+        supported |= SDL_HAPTIC_GAIN;
+    else if (ret != FFERR_UNSUPPORTED) {
+        return SDL_SetError("Haptic: Unable to get if device supports gain: %s.",
+                            FFStrError(ret));
+    }
+
+    /* Checks if supports autocenter. */
+    ret = FFDeviceGetForceFeedbackProperty(device, FFPROP_AUTOCENTER,
+                                           &val, sizeof(val));
+    if (ret == FF_OK)
+        supported |= SDL_HAPTIC_AUTOCENTER;
+    else if (ret != FFERR_UNSUPPORTED) {
+        return SDL_SetError
+            ("Haptic: Unable to get if device supports autocenter: %s.",
+             FFStrError(ret));
+    }
+
+    /* Check for axes, we have an artificial limit on axes */
+    haptic->naxes = ((features.numFfAxes) > 3) ? 3 : features.numFfAxes;
+    /* Actually store the axes we want to use */
+    SDL_memcpy(haptic->hwdata->axes, features.ffAxes,
+               haptic->naxes * sizeof(Uint8));
+
+    /* Always supported features. */
+    supported |= SDL_HAPTIC_STATUS | SDL_HAPTIC_PAUSE;
+
+    haptic->supported = supported;
+    return 0;;
+}
+
+
+/*
+ * Opens the haptic device from the file descriptor.
+ */
+static int
+SDL_SYS_HapticOpenFromService(SDL_Haptic * haptic, io_service_t service)
+{
+    HRESULT ret;
+    int ret2;
+
+    /* Allocate the hwdata */
+    haptic->hwdata = (struct haptic_hwdata *)
+        SDL_malloc(sizeof(*haptic->hwdata));
+    if (haptic->hwdata == NULL) {
+        SDL_OutOfMemory();
+        goto creat_err;
+    }
+    SDL_memset(haptic->hwdata, 0, sizeof(*haptic->hwdata));
+
+    /* Open the device */
+    ret = FFCreateDevice(service, &haptic->hwdata->device);
+    if (ret != FF_OK) {
+        SDL_SetError("Haptic: Unable to create device from service: %s.",
+                     FFStrError(ret));
+        goto creat_err;
+    }
+
+    /* Get supported features. */
+    ret2 = GetSupportedFeatures(haptic);
+    if (ret2 < 0) {
+        goto open_err;
+    }
+
+
+    /* Reset and then enable actuators. */
+    ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
+                                           FFSFFC_RESET);
+    if (ret != FF_OK) {
+        SDL_SetError("Haptic: Unable to reset device: %s.", FFStrError(ret));
+        goto open_err;
+    }
+    ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
+                                           FFSFFC_SETACTUATORSON);
+    if (ret != FF_OK) {
+        SDL_SetError("Haptic: Unable to enable actuators: %s.",
+                     FFStrError(ret));
+        goto open_err;
+    }
+
+
+    /* Allocate effects memory. */
+    haptic->effects = (struct haptic_effect *)
+        SDL_malloc(sizeof(struct haptic_effect) * haptic->neffects);
+    if (haptic->effects == NULL) {
+        SDL_OutOfMemory();
+        goto open_err;
+    }
+    /* Clear the memory */
+    SDL_memset(haptic->effects, 0,
+               sizeof(struct haptic_effect) * haptic->neffects);
+
+    return 0;
+
+    /* Error handling */
+  open_err:
+    FFReleaseDevice(haptic->hwdata->device);
+  creat_err:
+    if (haptic->hwdata != NULL) {
+        free(haptic->hwdata);
+        haptic->hwdata = NULL;
+    }
+    return -1;
+
+}
+
+
+/*
+ * Opens a haptic device for usage.
+ */
+int
+SDL_SYS_HapticOpen(SDL_Haptic * haptic)
+{
+    SDL_hapticlist_item *item;
+    item = HapticByDevIndex(haptic->index);
+
+    return SDL_SYS_HapticOpenFromService(haptic, item->dev);
+}
+
+
+/*
+ * Opens a haptic device from first mouse it finds for usage.
+ */
+int
+SDL_SYS_HapticMouse(void)
+{
+    int device_index = 0;
+    SDL_hapticlist_item *item;
+
+    for (item = SDL_hapticlist; item; item = item->next) {
+        if ((item->usagePage == kHIDPage_GenericDesktop) &&
+            (item->usage == kHIDUsage_GD_Mouse)) {
+            return device_index;
+        }
+        ++device_index;
+    }
+
+    return -1;
+}
+
+
+/*
+ * Checks to see if a joystick has haptic features.
+ */
+int
+SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
+{
+    if (joystick->hwdata->ffservice != 0)
+        return SDL_TRUE;
+    return SDL_FALSE;
+}
+
+
+/*
+ * Checks to see if the haptic device and joystick are in reality the same.
+ */
+int
+SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    if (IOObjectIsEqualTo((io_object_t) ((size_t)haptic->hwdata->device),
+                          joystick->hwdata->ffservice))
+        return 1;
+    return 0;
+}
+
+
+/*
+ * Opens a SDL_Haptic from a SDL_Joystick.
+ */
+int
+SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    int device_index = 0;
+    SDL_hapticlist_item *item;
+
+    for (item = SDL_hapticlist; item; item = item->next) {
+        if (IOObjectIsEqualTo((io_object_t) item->dev,
+                             joystick->hwdata->ffservice)) {
+           haptic->index = device_index;
+           break;
+        }
+        ++device_index;
+    }
+
+    return SDL_SYS_HapticOpenFromService(haptic, joystick->hwdata->ffservice);
+}
+
+
+/*
+ * Closes the haptic device.
+ */
+void
+SDL_SYS_HapticClose(SDL_Haptic * haptic)
+{
+    if (haptic->hwdata) {
+
+        /* Free Effects. */
+        SDL_free(haptic->effects);
+        haptic->effects = NULL;
+        haptic->neffects = 0;
+
+        /* Clean up */
+        FFReleaseDevice(haptic->hwdata->device);
+
+        /* Free */
+        SDL_free(haptic->hwdata);
+        haptic->hwdata = NULL;
+    }
+}
+
+
+/*
+ * Clean up after system specific haptic stuff
+ */
+void
+SDL_SYS_HapticQuit(void)
+{
+    SDL_hapticlist_item *item;
+    SDL_hapticlist_item *next = NULL;
+
+    for (item = SDL_hapticlist; item; item = next) {
+        next = item->next;
+        /* Opened and not closed haptics are leaked, this is on purpose.
+         * Close your haptic devices after usage. */
+
+        /* Free the io_service_t */
+        IOObjectRelease(item->dev);
+        SDL_free(item);
+    }
+    numhaptics = -1;
+}
+
+
+/*
+ * Converts an SDL trigger button to an FFEFFECT trigger button.
+ */
+static DWORD
+FFGetTriggerButton(Uint16 button)
+{
+    DWORD dwTriggerButton;
+
+    dwTriggerButton = FFEB_NOTRIGGER;
+
+    if (button != 0) {
+        dwTriggerButton = FFJOFS_BUTTON(button - 1);
+    }
+
+    return dwTriggerButton;
+}
+
+
+/*
+ * Sets the direction.
+ */
+static int
+SDL_SYS_SetDirection(FFEFFECT * effect, SDL_HapticDirection * dir, int naxes)
+{
+    LONG *rglDir;
+
+    /* Handle no axes a part. */
+    if (naxes == 0) {
+        effect->dwFlags |= FFEFF_SPHERICAL;     /* Set as default. */
+        effect->rglDirection = NULL;
+        return 0;
+    }
+
+    /* Has axes. */
+    rglDir = SDL_malloc(sizeof(LONG) * naxes);
+    if (rglDir == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(rglDir, 0, sizeof(LONG) * naxes);
+    effect->rglDirection = rglDir;
+
+    switch (dir->type) {
+    case SDL_HAPTIC_POLAR:
+        effect->dwFlags |= FFEFF_POLAR;
+        rglDir[0] = dir->dir[0];
+        return 0;
+    case SDL_HAPTIC_CARTESIAN:
+        effect->dwFlags |= FFEFF_CARTESIAN;
+        rglDir[0] = dir->dir[0];
+        if (naxes > 1)
+            rglDir[1] = dir->dir[1];
+        if (naxes > 2)
+            rglDir[2] = dir->dir[2];
+        return 0;
+    case SDL_HAPTIC_SPHERICAL:
+        effect->dwFlags |= FFEFF_SPHERICAL;
+        rglDir[0] = dir->dir[0];
+        if (naxes > 1)
+            rglDir[1] = dir->dir[1];
+        if (naxes > 2)
+            rglDir[2] = dir->dir[2];
+        return 0;
+
+    default:
+        return SDL_SetError("Haptic: Unknown direction type.");
+    }
+}
+
+
+/* Clamps and converts. */
+#define CCONVERT(x)   (((x) > 0x7FFF) ? 10000 : ((x)*10000) / 0x7FFF)
+/* Just converts. */
+#define CONVERT(x)    (((x)*10000) / 0x7FFF)
+/*
+ * Creates the FFEFFECT from a SDL_HapticEffect.
+ */
+static int
+SDL_SYS_ToFFEFFECT(SDL_Haptic * haptic, FFEFFECT * dest,
+                   SDL_HapticEffect * src)
+{
+    int i;
+    FFCONSTANTFORCE *constant;
+    FFPERIODIC *periodic;
+    FFCONDITION *condition;     /* Actually an array of conditions - one per axis. */
+    FFRAMPFORCE *ramp;
+    FFCUSTOMFORCE *custom;
+    FFENVELOPE *envelope;
+    SDL_HapticConstant *hap_constant;
+    SDL_HapticPeriodic *hap_periodic;
+    SDL_HapticCondition *hap_condition;
+    SDL_HapticRamp *hap_ramp;
+    SDL_HapticCustom *hap_custom;
+    DWORD *axes;
+
+    /* Set global stuff. */
+    SDL_memset(dest, 0, sizeof(FFEFFECT));
+    dest->dwSize = sizeof(FFEFFECT);    /* Set the structure size. */
+    dest->dwSamplePeriod = 0;   /* Not used by us. */
+    dest->dwGain = 10000;       /* Gain is set globally, not locally. */
+    dest->dwFlags = FFEFF_OBJECTOFFSETS;        /* Seems obligatory. */
+
+    /* Envelope. */
+    envelope = SDL_malloc(sizeof(FFENVELOPE));
+    if (envelope == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(envelope, 0, sizeof(FFENVELOPE));
+    dest->lpEnvelope = envelope;
+    envelope->dwSize = sizeof(FFENVELOPE);      /* Always should be this. */
+
+    /* Axes. */
+    dest->cAxes = haptic->naxes;
+    if (dest->cAxes > 0) {
+        axes = SDL_malloc(sizeof(DWORD) * dest->cAxes);
+        if (axes == NULL) {
+            return SDL_OutOfMemory();
+        }
+        axes[0] = haptic->hwdata->axes[0];      /* Always at least one axis. */
+        if (dest->cAxes > 1) {
+            axes[1] = haptic->hwdata->axes[1];
+        }
+        if (dest->cAxes > 2) {
+            axes[2] = haptic->hwdata->axes[2];
+        }
+        dest->rgdwAxes = axes;
+    }
+
+
+    /* The big type handling switch, even bigger then Linux's version. */
+    switch (src->type) {
+    case SDL_HAPTIC_CONSTANT:
+        hap_constant = &src->constant;
+        constant = SDL_malloc(sizeof(FFCONSTANTFORCE));
+        if (constant == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(constant, 0, sizeof(FFCONSTANTFORCE));
+
+        /* Specifics */
+        constant->lMagnitude = CONVERT(hap_constant->level);
+        dest->cbTypeSpecificParams = sizeof(FFCONSTANTFORCE);
+        dest->lpvTypeSpecificParams = constant;
+
+        /* Generics */
+        dest->dwDuration = hap_constant->length * 1000; /* In microseconds. */
+        dest->dwTriggerButton = FFGetTriggerButton(hap_constant->button);
+        dest->dwTriggerRepeatInterval = hap_constant->interval;
+        dest->dwStartDelay = hap_constant->delay * 1000;        /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_constant->direction, dest->cAxes)
+            < 0) {
+            return -1;
+        }
+
+        /* Envelope */
+        if ((hap_constant->attack_length == 0)
+            && (hap_constant->fade_length == 0)) {
+            SDL_free(envelope);
+            dest->lpEnvelope = NULL;
+        } else {
+            envelope->dwAttackLevel = CCONVERT(hap_constant->attack_level);
+            envelope->dwAttackTime = hap_constant->attack_length * 1000;
+            envelope->dwFadeLevel = CCONVERT(hap_constant->fade_level);
+            envelope->dwFadeTime = hap_constant->fade_length * 1000;
+        }
+
+        break;
+
+    case SDL_HAPTIC_SINE:
+    /* !!! FIXME: put this back when we have more bits in 2.1 */
+    /* case SDL_HAPTIC_SQUARE: */
+    case SDL_HAPTIC_TRIANGLE:
+    case SDL_HAPTIC_SAWTOOTHUP:
+    case SDL_HAPTIC_SAWTOOTHDOWN:
+        hap_periodic = &src->periodic;
+        periodic = SDL_malloc(sizeof(FFPERIODIC));
+        if (periodic == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(periodic, 0, sizeof(FFPERIODIC));
+
+        /* Specifics */
+        periodic->dwMagnitude = CONVERT(hap_periodic->magnitude);
+        periodic->lOffset = CONVERT(hap_periodic->offset);
+        periodic->dwPhase = hap_periodic->phase;
+        periodic->dwPeriod = hap_periodic->period * 1000;
+        dest->cbTypeSpecificParams = sizeof(FFPERIODIC);
+        dest->lpvTypeSpecificParams = periodic;
+
+        /* Generics */
+        dest->dwDuration = hap_periodic->length * 1000; /* In microseconds. */
+        dest->dwTriggerButton = FFGetTriggerButton(hap_periodic->button);
+        dest->dwTriggerRepeatInterval = hap_periodic->interval;
+        dest->dwStartDelay = hap_periodic->delay * 1000;        /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_periodic->direction, dest->cAxes)
+            < 0) {
+            return -1;
+        }
+
+        /* Envelope */
+        if ((hap_periodic->attack_length == 0)
+            && (hap_periodic->fade_length == 0)) {
+            SDL_free(envelope);
+            dest->lpEnvelope = NULL;
+        } else {
+            envelope->dwAttackLevel = CCONVERT(hap_periodic->attack_level);
+            envelope->dwAttackTime = hap_periodic->attack_length * 1000;
+            envelope->dwFadeLevel = CCONVERT(hap_periodic->fade_level);
+            envelope->dwFadeTime = hap_periodic->fade_length * 1000;
+        }
+
+        break;
+
+    case SDL_HAPTIC_SPRING:
+    case SDL_HAPTIC_DAMPER:
+    case SDL_HAPTIC_INERTIA:
+    case SDL_HAPTIC_FRICTION:
+        hap_condition = &src->condition;
+        condition = SDL_malloc(sizeof(FFCONDITION) * dest->cAxes);
+        if (condition == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(condition, 0, sizeof(FFCONDITION));
+
+        /* Specifics */
+        for (i = 0; i < dest->cAxes; i++) {
+            condition[i].lOffset = CONVERT(hap_condition->center[i]);
+            condition[i].lPositiveCoefficient =
+                CONVERT(hap_condition->right_coeff[i]);
+            condition[i].lNegativeCoefficient =
+                CONVERT(hap_condition->left_coeff[i]);
+            condition[i].dwPositiveSaturation =
+                CCONVERT(hap_condition->right_sat[i]);
+            condition[i].dwNegativeSaturation =
+                CCONVERT(hap_condition->left_sat[i]);
+            condition[i].lDeadBand = CCONVERT(hap_condition->deadband[i]);
+        }
+        dest->cbTypeSpecificParams = sizeof(FFCONDITION) * dest->cAxes;
+        dest->lpvTypeSpecificParams = condition;
+
+        /* Generics */
+        dest->dwDuration = hap_condition->length * 1000;        /* In microseconds. */
+        dest->dwTriggerButton = FFGetTriggerButton(hap_condition->button);
+        dest->dwTriggerRepeatInterval = hap_condition->interval;
+        dest->dwStartDelay = hap_condition->delay * 1000;       /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_condition->direction, dest->cAxes)
+            < 0) {
+            return -1;
+        }
+
+        /* Envelope - Not actually supported by most CONDITION implementations. */
+        SDL_free(dest->lpEnvelope);
+        dest->lpEnvelope = NULL;
+
+        break;
+
+    case SDL_HAPTIC_RAMP:
+        hap_ramp = &src->ramp;
+        ramp = SDL_malloc(sizeof(FFRAMPFORCE));
+        if (ramp == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(ramp, 0, sizeof(FFRAMPFORCE));
+
+        /* Specifics */
+        ramp->lStart = CONVERT(hap_ramp->start);
+        ramp->lEnd = CONVERT(hap_ramp->end);
+        dest->cbTypeSpecificParams = sizeof(FFRAMPFORCE);
+        dest->lpvTypeSpecificParams = ramp;
+
+        /* Generics */
+        dest->dwDuration = hap_ramp->length * 1000;     /* In microseconds. */
+        dest->dwTriggerButton = FFGetTriggerButton(hap_ramp->button);
+        dest->dwTriggerRepeatInterval = hap_ramp->interval;
+        dest->dwStartDelay = hap_ramp->delay * 1000;    /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_ramp->direction, dest->cAxes) < 0) {
+            return -1;
+        }
+
+        /* Envelope */
+        if ((hap_ramp->attack_length == 0) && (hap_ramp->fade_length == 0)) {
+            SDL_free(envelope);
+            dest->lpEnvelope = NULL;
+        } else {
+            envelope->dwAttackLevel = CCONVERT(hap_ramp->attack_level);
+            envelope->dwAttackTime = hap_ramp->attack_length * 1000;
+            envelope->dwFadeLevel = CCONVERT(hap_ramp->fade_level);
+            envelope->dwFadeTime = hap_ramp->fade_length * 1000;
+        }
+
+        break;
+
+    case SDL_HAPTIC_CUSTOM:
+        hap_custom = &src->custom;
+        custom = SDL_malloc(sizeof(FFCUSTOMFORCE));
+        if (custom == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(custom, 0, sizeof(FFCUSTOMFORCE));
+
+        /* Specifics */
+        custom->cChannels = hap_custom->channels;
+        custom->dwSamplePeriod = hap_custom->period * 1000;
+        custom->cSamples = hap_custom->samples;
+        custom->rglForceData =
+            SDL_malloc(sizeof(LONG) * custom->cSamples * custom->cChannels);
+        for (i = 0; i < hap_custom->samples * hap_custom->channels; i++) {      /* Copy data. */
+            custom->rglForceData[i] = CCONVERT(hap_custom->data[i]);
+        }
+        dest->cbTypeSpecificParams = sizeof(FFCUSTOMFORCE);
+        dest->lpvTypeSpecificParams = custom;
+
+        /* Generics */
+        dest->dwDuration = hap_custom->length * 1000;   /* In microseconds. */
+        dest->dwTriggerButton = FFGetTriggerButton(hap_custom->button);
+        dest->dwTriggerRepeatInterval = hap_custom->interval;
+        dest->dwStartDelay = hap_custom->delay * 1000;  /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_custom->direction, dest->cAxes) <
+            0) {
+            return -1;
+        }
+
+        /* Envelope */
+        if ((hap_custom->attack_length == 0)
+            && (hap_custom->fade_length == 0)) {
+            SDL_free(envelope);
+            dest->lpEnvelope = NULL;
+        } else {
+            envelope->dwAttackLevel = CCONVERT(hap_custom->attack_level);
+            envelope->dwAttackTime = hap_custom->attack_length * 1000;
+            envelope->dwFadeLevel = CCONVERT(hap_custom->fade_level);
+            envelope->dwFadeTime = hap_custom->fade_length * 1000;
+        }
+
+        break;
+
+
+    default:
+        return SDL_SetError("Haptic: Unknown effect type.");
+    }
+
+    return 0;
+}
+
+
+/*
+ * Frees an FFEFFECT allocated by SDL_SYS_ToFFEFFECT.
+ */
+static void
+SDL_SYS_HapticFreeFFEFFECT(FFEFFECT * effect, int type)
+{
+    FFCUSTOMFORCE *custom;
+
+    SDL_free(effect->lpEnvelope);
+    effect->lpEnvelope = NULL;
+    SDL_free(effect->rgdwAxes);
+    effect->rgdwAxes = NULL;
+    if (effect->lpvTypeSpecificParams != NULL) {
+        if (type == SDL_HAPTIC_CUSTOM) {        /* Must free the custom data. */
+            custom = (FFCUSTOMFORCE *) effect->lpvTypeSpecificParams;
+            SDL_free(custom->rglForceData);
+            custom->rglForceData = NULL;
+        }
+        SDL_free(effect->lpvTypeSpecificParams);
+        effect->lpvTypeSpecificParams = NULL;
+    }
+    SDL_free(effect->rglDirection);
+    effect->rglDirection = NULL;
+}
+
+
+/*
+ * Gets the effect type from the generic SDL haptic effect wrapper.
+ */
+CFUUIDRef
+SDL_SYS_HapticEffectType(Uint16 type)
+{
+    switch (type) {
+    case SDL_HAPTIC_CONSTANT:
+        return kFFEffectType_ConstantForce_ID;
+
+    case SDL_HAPTIC_RAMP:
+        return kFFEffectType_RampForce_ID;
+
+    /* !!! FIXME: put this back when we have more bits in 2.1 */
+    /* case SDL_HAPTIC_SQUARE:
+        return kFFEffectType_Square_ID; */
+
+    case SDL_HAPTIC_SINE:
+        return kFFEffectType_Sine_ID;
+
+    case SDL_HAPTIC_TRIANGLE:
+        return kFFEffectType_Triangle_ID;
+
+    case SDL_HAPTIC_SAWTOOTHUP:
+        return kFFEffectType_SawtoothUp_ID;
+
+    case SDL_HAPTIC_SAWTOOTHDOWN:
+        return kFFEffectType_SawtoothDown_ID;
+
+    case SDL_HAPTIC_SPRING:
+        return kFFEffectType_Spring_ID;
+
+    case SDL_HAPTIC_DAMPER:
+        return kFFEffectType_Damper_ID;
+
+    case SDL_HAPTIC_INERTIA:
+        return kFFEffectType_Inertia_ID;
+
+    case SDL_HAPTIC_FRICTION:
+        return kFFEffectType_Friction_ID;
+
+    case SDL_HAPTIC_CUSTOM:
+        return kFFEffectType_CustomForce_ID;
+
+    default:
+        SDL_SetError("Haptic: Unknown effect type.");
+        return NULL;
+    }
+}
+
+
+/*
+ * Creates a new haptic effect.
+ */
+int
+SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
+                        SDL_HapticEffect * base)
+{
+    HRESULT ret;
+    CFUUIDRef type;
+
+    /* Alloc the effect. */
+    effect->hweffect = (struct haptic_hweffect *)
+        SDL_malloc(sizeof(struct haptic_hweffect));
+    if (effect->hweffect == NULL) {
+        SDL_OutOfMemory();
+        goto err_hweffect;
+    }
+
+    /* Get the type. */
+    type = SDL_SYS_HapticEffectType(base->type);
+    if (type == NULL) {
+        goto err_hweffect;
+    }
+
+    /* Get the effect. */
+    if (SDL_SYS_ToFFEFFECT(haptic, &effect->hweffect->effect, base) < 0) {
+        goto err_effectdone;
+    }
+
+    /* Create the actual effect. */
+    ret = FFDeviceCreateEffect(haptic->hwdata->device, type,
+                               &effect->hweffect->effect,
+                               &effect->hweffect->ref);
+    if (ret != FF_OK) {
+        SDL_SetError("Haptic: Unable to create effect: %s.", FFStrError(ret));
+        goto err_effectdone;
+    }
+
+    return 0;
+
+  err_effectdone:
+    SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect, base->type);
+  err_hweffect:
+    SDL_free(effect->hweffect);
+    effect->hweffect = NULL;
+    return -1;
+}
+
+
+/*
+ * Updates an effect.
+ */
+int
+SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
+                           struct haptic_effect *effect,
+                           SDL_HapticEffect * data)
+{
+    HRESULT ret;
+    FFEffectParameterFlag flags;
+    FFEFFECT temp;
+
+    /* Get the effect. */
+    SDL_memset(&temp, 0, sizeof(FFEFFECT));
+    if (SDL_SYS_ToFFEFFECT(haptic, &temp, data) < 0) {
+        goto err_update;
+    }
+
+    /* Set the flags.  Might be worthwhile to diff temp with loaded effect and
+     *  only change those parameters. */
+    flags = FFEP_DIRECTION |
+        FFEP_DURATION |
+        FFEP_ENVELOPE |
+        FFEP_STARTDELAY |
+        FFEP_TRIGGERBUTTON |
+        FFEP_TRIGGERREPEATINTERVAL | FFEP_TYPESPECIFICPARAMS;
+
+    /* Create the actual effect. */
+    ret = FFEffectSetParameters(effect->hweffect->ref, &temp, flags);
+    if (ret != FF_OK) {
+        SDL_SetError("Haptic: Unable to update effect: %s.", FFStrError(ret));
+        goto err_update;
+    }
+
+    /* Copy it over. */
+    SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect, data->type);
+    SDL_memcpy(&effect->hweffect->effect, &temp, sizeof(FFEFFECT));
+
+    return 0;
+
+  err_update:
+    SDL_SYS_HapticFreeFFEFFECT(&temp, data->type);
+    return -1;
+}
+
+
+/*
+ * Runs an effect.
+ */
+int
+SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
+                        Uint32 iterations)
+{
+    HRESULT ret;
+    Uint32 iter;
+
+    /* Check if it's infinite. */
+    if (iterations == SDL_HAPTIC_INFINITY) {
+        iter = FF_INFINITE;
+    } else
+        iter = iterations;
+
+    /* Run the effect. */
+    ret = FFEffectStart(effect->hweffect->ref, iter, 0);
+    if (ret != FF_OK) {
+        return SDL_SetError("Haptic: Unable to run the effect: %s.",
+                            FFStrError(ret));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Stops an effect.
+ */
+int
+SDL_SYS_HapticStopEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    HRESULT ret;
+
+    ret = FFEffectStop(effect->hweffect->ref);
+    if (ret != FF_OK) {
+        return SDL_SetError("Haptic: Unable to stop the effect: %s.",
+                            FFStrError(ret));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Frees the effect.
+ */
+void
+SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    HRESULT ret;
+
+    ret =
+        FFDeviceReleaseEffect(haptic->hwdata->device, effect->hweffect->ref);
+    if (ret != FF_OK) {
+        SDL_SetError("Haptic: Error removing the effect from the device: %s.",
+                     FFStrError(ret));
+    }
+    SDL_SYS_HapticFreeFFEFFECT(&effect->hweffect->effect,
+                               effect->effect.type);
+    SDL_free(effect->hweffect);
+    effect->hweffect = NULL;
+}
+
+
+/*
+ * Gets the status of a haptic effect.
+ */
+int
+SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
+                              struct haptic_effect *effect)
+{
+    HRESULT ret;
+    FFEffectStatusFlag status;
+
+    ret = FFEffectGetEffectStatus(effect->hweffect->ref, &status);
+    if (ret != FF_OK) {
+        SDL_SetError("Haptic: Unable to get effect status: %s.",
+                     FFStrError(ret));
+        return -1;
+    }
+
+    if (status == 0)
+        return SDL_FALSE;
+    return SDL_TRUE;            /* Assume it's playing or emulated. */
+}
+
+
+/*
+ * Sets the gain.
+ */
+int
+SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain)
+{
+    HRESULT ret;
+    Uint32 val;
+
+    val = gain * 100;           /* Mac OS X uses 0 to 10,000 */
+    ret =
+        FFDeviceSetForceFeedbackProperty(haptic->hwdata->device,
+                                         FFPROP_FFGAIN, &val);
+    if (ret != FF_OK) {
+        return SDL_SetError("Haptic: Error setting gain: %s.", FFStrError(ret));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Sets the autocentering.
+ */
+int
+SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
+{
+    HRESULT ret;
+    Uint32 val;
+
+    /* Mac OS X only has 0 (off) and 1 (on) */
+    if (autocenter == 0)
+        val = 0;
+    else
+        val = 1;
+
+    ret = FFDeviceSetForceFeedbackProperty(haptic->hwdata->device,
+                                           FFPROP_AUTOCENTER, &val);
+    if (ret != FF_OK) {
+        return SDL_SetError("Haptic: Error setting autocenter: %s.",
+                            FFStrError(ret));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Pauses the device.
+ */
+int
+SDL_SYS_HapticPause(SDL_Haptic * haptic)
+{
+    HRESULT ret;
+
+    ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
+                                           FFSFFC_PAUSE);
+    if (ret != FF_OK) {
+        return SDL_SetError("Haptic: Error pausing device: %s.", FFStrError(ret));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Unpauses the device.
+ */
+int
+SDL_SYS_HapticUnpause(SDL_Haptic * haptic)
+{
+    HRESULT ret;
+
+    ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
+                                           FFSFFC_CONTINUE);
+    if (ret != FF_OK) {
+        return SDL_SetError("Haptic: Error pausing device: %s.", FFStrError(ret));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Stops all currently playing effects.
+ */
+int
+SDL_SYS_HapticStopAll(SDL_Haptic * haptic)
+{
+    HRESULT ret;
+
+    ret = FFDeviceSendForceFeedbackCommand(haptic->hwdata->device,
+                                           FFSFFC_STOPALL);
+    if (ret != FF_OK) {
+        return SDL_SetError("Haptic: Error stopping device: %s.", FFStrError(ret));
+    }
+
+    return 0;
+}
+
+
+#endif /* SDL_HAPTIC_IOKIT */
diff --git a/Source/3rd Party/sdl/src/haptic/darwin/SDL_syshaptic_c.h b/Source/3rd Party/sdl/src/haptic/darwin/SDL_syshaptic_c.h
new file mode 100644
index 000000000..f80720717
--- /dev/null
+++ b/Source/3rd Party/sdl/src/haptic/darwin/SDL_syshaptic_c.h	
@@ -0,0 +1,26 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+extern int MacHaptic_MaybeAddDevice( io_object_t device );
+extern int MacHaptic_MaybeRemoveDevice( io_object_t device );
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/haptic/dummy/SDL_syshaptic.c b/Source/3rd Party/sdl/src/haptic/dummy/SDL_syshaptic.c
new file mode 100644
index 000000000..09839c6de
--- /dev/null
+++ b/Source/3rd Party/sdl/src/haptic/dummy/SDL_syshaptic.c	
@@ -0,0 +1,184 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if defined(SDL_HAPTIC_DUMMY) || defined(SDL_HAPTIC_DISABLED)
+
+#include "SDL_haptic.h"
+#include "../SDL_syshaptic.h"
+
+
+static int
+SDL_SYS_LogicError(void)
+{
+    return SDL_SetError("Logic error: No haptic devices available.");
+}
+
+
+int
+SDL_SYS_HapticInit(void)
+{
+    return 0;
+}
+
+int
+SDL_SYS_NumHaptics(void)
+{
+    return 0;
+}
+
+const char *
+SDL_SYS_HapticName(int index)
+{
+    SDL_SYS_LogicError();
+    return NULL;
+}
+
+
+int
+SDL_SYS_HapticOpen(SDL_Haptic * haptic)
+{
+    return SDL_SYS_LogicError();
+}
+
+
+int
+SDL_SYS_HapticMouse(void)
+{
+    return -1;
+}
+
+
+int
+SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
+{
+    return 0;
+}
+
+
+int
+SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    return SDL_SYS_LogicError();
+}
+
+
+int
+SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    return 0;
+}
+
+
+void
+SDL_SYS_HapticClose(SDL_Haptic * haptic)
+{
+    return;
+}
+
+
+void
+SDL_SYS_HapticQuit(void)
+{
+    return;
+}
+
+
+int
+SDL_SYS_HapticNewEffect(SDL_Haptic * haptic,
+                        struct haptic_effect *effect, SDL_HapticEffect * base)
+{
+    return SDL_SYS_LogicError();
+}
+
+
+int
+SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
+                           struct haptic_effect *effect,
+                           SDL_HapticEffect * data)
+{
+    return SDL_SYS_LogicError();
+}
+
+
+int
+SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
+                        Uint32 iterations)
+{
+    return SDL_SYS_LogicError();
+}
+
+
+int
+SDL_SYS_HapticStopEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    return SDL_SYS_LogicError();
+}
+
+
+void
+SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    SDL_SYS_LogicError();
+    return;
+}
+
+
+int
+SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
+                              struct haptic_effect *effect)
+{
+    return SDL_SYS_LogicError();
+}
+
+
+int
+SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain)
+{
+    return SDL_SYS_LogicError();
+}
+
+
+int
+SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
+{
+    return SDL_SYS_LogicError();
+}
+
+int
+SDL_SYS_HapticPause(SDL_Haptic * haptic)
+{
+    return SDL_SYS_LogicError();
+}
+
+int
+SDL_SYS_HapticUnpause(SDL_Haptic * haptic)
+{
+    return SDL_SYS_LogicError();
+}
+
+int
+SDL_SYS_HapticStopAll(SDL_Haptic * haptic)
+{
+    return SDL_SYS_LogicError();
+}
+
+#endif /* SDL_HAPTIC_DUMMY || SDL_HAPTIC_DISABLED */
diff --git a/Source/3rd Party/sdl/src/haptic/linux/SDL_syshaptic.c b/Source/3rd Party/sdl/src/haptic/linux/SDL_syshaptic.c
new file mode 100644
index 000000000..281a9316b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/haptic/linux/SDL_syshaptic.c	
@@ -0,0 +1,1162 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_HAPTIC_LINUX
+
+#include "SDL_assert.h"
+#include "SDL_haptic.h"
+#include "../SDL_syshaptic.h"
+#include "SDL_joystick.h"
+#include "../../joystick/SDL_sysjoystick.h"     /* For the real SDL_Joystick */
+#include "../../joystick/linux/SDL_sysjoystick_c.h"     /* For joystick hwdata */
+#include "../../core/linux/SDL_udev.h"
+
+#include <unistd.h>             /* close */
+#include <linux/input.h>        /* Force feedback linux stuff. */
+#include <fcntl.h>              /* O_RDWR */
+#include <limits.h>             /* INT_MAX */
+#include <errno.h>              /* errno, strerror */
+#include <math.h>               /* atan2 */
+#include <sys/stat.h>           /* stat */
+
+/* Just in case. */
+#ifndef M_PI
+#  define M_PI     3.14159265358979323846
+#endif
+
+
+#define MAX_HAPTICS  32         /* It's doubtful someone has more then 32 evdev */
+
+static int MaybeAddDevice(const char *path);
+#if SDL_USE_LIBUDEV
+static int MaybeRemoveDevice(const char *path);
+void haptic_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
+#endif /* SDL_USE_LIBUDEV */
+
+/*
+ * List of available haptic devices.
+ */
+typedef struct SDL_hapticlist_item
+{
+    char *fname;                /* Dev path name (like /dev/input/event1) */
+    SDL_Haptic *haptic;         /* Associated haptic. */
+    struct SDL_hapticlist_item *next;
+} SDL_hapticlist_item;
+
+
+/*
+ * Haptic system hardware data.
+ */
+struct haptic_hwdata
+{
+    int fd;                     /* File descriptor of the device. */
+    char *fname;                /* Points to the name in SDL_hapticlist. */
+};
+
+
+/*
+ * Haptic system effect data.
+ */
+struct haptic_hweffect
+{
+    struct ff_effect effect;    /* The linux kernel effect structure. */
+};
+
+static SDL_hapticlist_item *SDL_hapticlist = NULL;
+static SDL_hapticlist_item *SDL_hapticlist_tail = NULL;
+static int numhaptics = 0;
+
+#define test_bit(nr, addr) \
+   (((1UL << ((nr) & 31)) & (((const unsigned int *) addr)[(nr) >> 5])) != 0)
+#define EV_TEST(ev,f) \
+   if (test_bit((ev), features)) ret |= (f);
+/*
+ * Test whether a device has haptic properties.
+ * Returns available properties or 0 if there are none.
+ */
+static int
+EV_IsHaptic(int fd)
+{
+    unsigned int ret;
+    unsigned long features[1 + FF_MAX / sizeof(unsigned long)];
+
+    /* Ask device for what it has. */
+    ret = 0;
+    if (ioctl(fd, EVIOCGBIT(EV_FF, sizeof(features)), features) < 0) {
+        return SDL_SetError("Haptic: Unable to get device's features: %s",
+                            strerror(errno));
+    }
+
+    /* Convert supported features to SDL_HAPTIC platform-neutral features. */
+    EV_TEST(FF_CONSTANT, SDL_HAPTIC_CONSTANT);
+    EV_TEST(FF_SINE, SDL_HAPTIC_SINE);
+    /* !!! FIXME: put this back when we have more bits in 2.1 */
+    /* EV_TEST(FF_SQUARE, SDL_HAPTIC_SQUARE); */
+    EV_TEST(FF_TRIANGLE, SDL_HAPTIC_TRIANGLE);
+    EV_TEST(FF_SAW_UP, SDL_HAPTIC_SAWTOOTHUP);
+    EV_TEST(FF_SAW_DOWN, SDL_HAPTIC_SAWTOOTHDOWN);
+    EV_TEST(FF_RAMP, SDL_HAPTIC_RAMP);
+    EV_TEST(FF_SPRING, SDL_HAPTIC_SPRING);
+    EV_TEST(FF_FRICTION, SDL_HAPTIC_FRICTION);
+    EV_TEST(FF_DAMPER, SDL_HAPTIC_DAMPER);
+    EV_TEST(FF_INERTIA, SDL_HAPTIC_INERTIA);
+    EV_TEST(FF_CUSTOM, SDL_HAPTIC_CUSTOM);
+    EV_TEST(FF_GAIN, SDL_HAPTIC_GAIN);
+    EV_TEST(FF_AUTOCENTER, SDL_HAPTIC_AUTOCENTER);
+    EV_TEST(FF_RUMBLE, SDL_HAPTIC_LEFTRIGHT);
+
+    /* Return what it supports. */
+    return ret;
+}
+
+
+/*
+ * Tests whether a device is a mouse or not.
+ */
+static int
+EV_IsMouse(int fd)
+{
+    unsigned long argp[40];
+
+    /* Ask for supported features. */
+    if (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(argp)), argp) < 0) {
+        return -1;
+    }
+
+    /* Currently we only test for BTN_MOUSE which can give fake positives. */
+    if (test_bit(BTN_MOUSE, argp) != 0) {
+        return 1;
+    }
+
+    return 0;
+}
+
+/*
+ * Initializes the haptic subsystem by finding available devices.
+ */
+int
+SDL_SYS_HapticInit(void)
+{
+    const char joydev_pattern[] = "/dev/input/event%d";
+    char path[PATH_MAX];
+    int i, j;
+
+    /*
+     * Limit amount of checks to MAX_HAPTICS since we may or may not have
+     * permission to some or all devices.
+     */
+    i = 0;
+    for (j = 0; j < MAX_HAPTICS; ++j) {
+
+        snprintf(path, PATH_MAX, joydev_pattern, i++);
+        MaybeAddDevice(path);
+    }
+
+#if SDL_USE_LIBUDEV
+    if (SDL_UDEV_Init() < 0) {
+        return SDL_SetError("Could not initialize UDEV");
+    }
+
+    if ( SDL_UDEV_AddCallback(haptic_udev_callback) < 0) {
+        SDL_UDEV_Quit();
+        return SDL_SetError("Could not setup haptic <-> udev callback");
+    }
+#endif /* SDL_USE_LIBUDEV */
+
+    return numhaptics;
+}
+
+int
+SDL_SYS_NumHaptics()
+{
+    return numhaptics;
+}
+
+static SDL_hapticlist_item *
+HapticByDevIndex(int device_index)
+{
+    SDL_hapticlist_item *item = SDL_hapticlist;
+
+    if ((device_index < 0) || (device_index >= numhaptics)) {
+        return NULL;
+    }
+
+    while (device_index > 0) {
+        SDL_assert(item != NULL);
+        --device_index;
+        item = item->next;
+    }
+
+    return item;
+}
+
+#if SDL_USE_LIBUDEV
+void haptic_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath)
+{
+    if (devpath == NULL || !(udev_class & SDL_UDEV_DEVICE_JOYSTICK)) {
+        return;
+    }
+
+    switch( udev_type )
+    {
+        case SDL_UDEV_DEVICEADDED:
+            MaybeAddDevice(devpath);
+            break;
+
+        case SDL_UDEV_DEVICEREMOVED:
+            MaybeRemoveDevice(devpath);
+            break;
+
+        default:
+            break;
+    }
+
+}
+#endif /* SDL_USE_LIBUDEV */
+
+static int
+MaybeAddDevice(const char *path)
+{
+    dev_t dev_nums[MAX_HAPTICS];
+    struct stat sb;
+    int fd;
+    int k;
+    int duplicate;
+    int success;
+    SDL_hapticlist_item *item;
+
+
+    if (path == NULL) {
+        return -1;
+    }
+
+    /* check to see if file exists */
+    if (stat(path, &sb) != 0) {
+        return -1;
+    }
+
+    /* check for duplicates */
+    duplicate = 0;
+    for (k = 0; (k < numhaptics) && !duplicate; ++k) {
+        if (sb.st_rdev == dev_nums[k]) {
+            duplicate = 1;
+        }
+    }
+    if (duplicate) {
+        return -1;
+    }
+
+    /* try to open */
+    fd = open(path, O_RDWR, 0);
+    if (fd < 0) {
+        return -1;
+    }
+
+#ifdef DEBUG_INPUT_EVENTS
+    printf("Checking %s\n", path);
+#endif
+
+    /* see if it works */
+    success = EV_IsHaptic(fd);
+    close(fd);
+    if (success <= 0) {
+        return -1;
+    }
+
+    item = (SDL_hapticlist_item *) SDL_calloc(1, sizeof (SDL_hapticlist_item));
+    if (item == NULL) {
+        return -1;
+    }
+
+    item->fname = SDL_strdup(path);
+    if ( (item->fname == NULL) ) {
+        SDL_free(item->fname);
+        SDL_free(item);
+        return -1;
+    }
+
+    /* TODO: should we add instance IDs? */
+    if (SDL_hapticlist_tail == NULL) {
+        SDL_hapticlist = SDL_hapticlist_tail = item;
+    } else {
+        SDL_hapticlist_tail->next = item;
+        SDL_hapticlist_tail = item;
+    }
+
+    dev_nums[numhaptics] = sb.st_rdev;
+
+    ++numhaptics;
+
+    /* !!! TODO: Send a haptic add event? */
+
+    return numhaptics;
+}
+
+#if SDL_USE_LIBUDEV
+static int
+MaybeRemoveDevice(const char* path)
+{
+    SDL_hapticlist_item *item;
+    SDL_hapticlist_item *prev = NULL;
+
+    if (path == NULL) {
+        return -1;
+    }
+
+    for (item = SDL_hapticlist; item != NULL; item = item->next) {
+        /* found it, remove it. */
+        if (SDL_strcmp(path, item->fname) == 0) {
+            const int retval = item->haptic ? item->haptic->index : -1;
+
+            if (prev != NULL) {
+                prev->next = item->next;
+            } else {
+                SDL_assert(SDL_hapticlist == item);
+                SDL_hapticlist = item->next;
+            }
+            if (item == SDL_hapticlist_tail) {
+                SDL_hapticlist_tail = prev;
+            }
+
+            /* Need to decrement the haptic count */
+            --numhaptics;
+            /* !!! TODO: Send a haptic remove event? */
+
+            SDL_free(item->fname);
+            SDL_free(item);
+            return retval;
+        }
+        prev = item;
+    }
+
+    return -1;
+}
+#endif /* SDL_USE_LIBUDEV */
+
+/*
+ * Gets the name from a file descriptor.
+ */
+static const char *
+SDL_SYS_HapticNameFromFD(int fd)
+{
+    static char namebuf[128];
+
+    /* We use the evdev name ioctl. */
+    if (ioctl(fd, EVIOCGNAME(sizeof(namebuf)), namebuf) <= 0) {
+        return NULL;
+    }
+
+    return namebuf;
+}
+
+
+/*
+ * Return the name of a haptic device, does not need to be opened.
+ */
+const char *
+SDL_SYS_HapticName(int index)
+{
+    SDL_hapticlist_item *item;
+    int fd;
+    const char *name;
+
+    item = HapticByDevIndex(index);
+    /* Open the haptic device. */
+    name = NULL;
+    fd = open(item->fname, O_RDONLY, 0);
+
+    if (fd >= 0) {
+
+        name = SDL_SYS_HapticNameFromFD(fd);
+        if (name == NULL) {
+            /* No name found, return device character device */
+            name = item->fname;
+        }
+    }
+    close(fd);
+
+    return name;
+}
+
+
+/*
+ * Opens the haptic device from the file descriptor.
+ */
+static int
+SDL_SYS_HapticOpenFromFD(SDL_Haptic * haptic, int fd)
+{
+    /* Allocate the hwdata */
+    haptic->hwdata = (struct haptic_hwdata *)
+        SDL_malloc(sizeof(*haptic->hwdata));
+    if (haptic->hwdata == NULL) {
+        SDL_OutOfMemory();
+        goto open_err;
+    }
+    SDL_memset(haptic->hwdata, 0, sizeof(*haptic->hwdata));
+
+    /* Set the data. */
+    haptic->hwdata->fd = fd;
+    haptic->supported = EV_IsHaptic(fd);
+    haptic->naxes = 2;          /* Hardcoded for now, not sure if it's possible to find out. */
+
+    /* Set the effects */
+    if (ioctl(fd, EVIOCGEFFECTS, &haptic->neffects) < 0) {
+        SDL_SetError("Haptic: Unable to query device memory: %s",
+                     strerror(errno));
+        goto open_err;
+    }
+    haptic->nplaying = haptic->neffects;        /* Linux makes no distinction. */
+    haptic->effects = (struct haptic_effect *)
+        SDL_malloc(sizeof(struct haptic_effect) * haptic->neffects);
+    if (haptic->effects == NULL) {
+        SDL_OutOfMemory();
+        goto open_err;
+    }
+    /* Clear the memory */
+    SDL_memset(haptic->effects, 0,
+               sizeof(struct haptic_effect) * haptic->neffects);
+
+    return 0;
+
+    /* Error handling */
+  open_err:
+    close(fd);
+    if (haptic->hwdata != NULL) {
+        free(haptic->hwdata);
+        haptic->hwdata = NULL;
+    }
+    return -1;
+}
+
+
+/*
+ * Opens a haptic device for usage.
+ */
+int
+SDL_SYS_HapticOpen(SDL_Haptic * haptic)
+{
+    int fd;
+    int ret;
+    SDL_hapticlist_item *item;
+
+    item = HapticByDevIndex(haptic->index);
+    /* Open the character device */
+    fd = open(item->fname, O_RDWR, 0);
+    if (fd < 0) {
+        return SDL_SetError("Haptic: Unable to open %s: %s",
+                            item->fname, strerror(errno));
+    }
+
+    /* Try to create the haptic. */
+    ret = SDL_SYS_HapticOpenFromFD(haptic, fd); /* Already closes on error. */
+    if (ret < 0) {
+        return -1;
+    }
+
+    /* Set the fname. */
+    haptic->hwdata->fname = item->fname;
+    return 0;
+}
+
+
+/*
+ * Opens a haptic device from first mouse it finds for usage.
+ */
+int
+SDL_SYS_HapticMouse(void)
+{
+    int fd;
+    int device_index = 0;
+    SDL_hapticlist_item *item;
+
+    for (item = SDL_hapticlist; item; item = item->next) {
+        /* Open the device. */
+        fd = open(item->fname, O_RDWR, 0);
+        if (fd < 0) {
+            return SDL_SetError("Haptic: Unable to open %s: %s",
+                                item->fname, strerror(errno));
+        }
+
+        /* Is it a mouse? */
+        if (EV_IsMouse(fd)) {
+            close(fd);
+            return device_index;
+        }
+
+        close(fd);
+
+        ++device_index;
+    }
+
+    return -1;
+}
+
+
+/*
+ * Checks to see if a joystick has haptic features.
+ */
+int
+SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
+{
+    return EV_IsHaptic(joystick->hwdata->fd);
+}
+
+
+/*
+ * Checks to see if the haptic device and joystick are in reality the same.
+ */
+int
+SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    /* We are assuming Linux is using evdev which should trump the old
+     * joystick methods. */
+    if (SDL_strcmp(joystick->hwdata->fname, haptic->hwdata->fname) == 0) {
+        return 1;
+    }
+    return 0;
+}
+
+
+/*
+ * Opens a SDL_Haptic from a SDL_Joystick.
+ */
+int
+SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    int device_index = 0;
+    int fd;
+    int ret;
+    SDL_hapticlist_item *item;
+
+
+    /* Find the joystick in the haptic list. */
+    for (item = SDL_hapticlist; item; item = item->next) {
+        if (SDL_strcmp(item->fname, joystick->hwdata->fname) == 0) {
+            haptic->index = device_index;
+            break;
+        }
+        ++device_index;
+    }
+    if (device_index >= MAX_HAPTICS) {
+        return SDL_SetError("Haptic: Joystick doesn't have Haptic capabilities");
+    }
+
+    fd = open(joystick->hwdata->fname, O_RDWR, 0);
+    if (fd < 0) {
+        return SDL_SetError("Haptic: Unable to open %s: %s",
+                            joystick->hwdata->fname, strerror(errno));
+    }
+    ret = SDL_SYS_HapticOpenFromFD(haptic, fd); /* Already closes on error. */
+    if (ret < 0) {
+        return -1;
+    }
+
+    haptic->hwdata->fname = item->fname;
+    return 0;
+}
+
+
+/*
+ * Closes the haptic device.
+ */
+void
+SDL_SYS_HapticClose(SDL_Haptic * haptic)
+{
+    if (haptic->hwdata) {
+
+        /* Free effects. */
+        SDL_free(haptic->effects);
+        haptic->effects = NULL;
+        haptic->neffects = 0;
+
+        /* Clean up */
+        close(haptic->hwdata->fd);
+
+        /* Free */
+        SDL_free(haptic->hwdata);
+        haptic->hwdata = NULL;
+    }
+
+    /* Clear the rest. */
+    SDL_memset(haptic, 0, sizeof(SDL_Haptic));
+}
+
+
+/*
+ * Clean up after system specific haptic stuff
+ */
+void
+SDL_SYS_HapticQuit(void)
+{
+    SDL_hapticlist_item *item = NULL;
+    SDL_hapticlist_item *next = NULL;
+
+    for (item = SDL_hapticlist; item; item = next) {
+        next = item->next;
+        /* Opened and not closed haptics are leaked, this is on purpose.
+         * Close your haptic devices after usage. */
+        SDL_free(item->fname);
+        item->fname = NULL;
+    }
+
+#if SDL_USE_LIBUDEV
+    SDL_UDEV_DelCallback(haptic_udev_callback);
+    SDL_UDEV_Quit();
+#endif /* SDL_USE_LIBUDEV */
+
+    numhaptics = 0;
+}
+
+
+/*
+ * Converts an SDL button to a ff_trigger button.
+ */
+static Uint16
+SDL_SYS_ToButton(Uint16 button)
+{
+    Uint16 ff_button;
+
+    ff_button = 0;
+
+    /*
+     * Not sure what the proper syntax is because this actually isn't implemented
+     * in the current kernel from what I've seen (2.6.26).
+     */
+    if (button != 0) {
+        ff_button = BTN_GAMEPAD + button - 1;
+    }
+
+    return ff_button;
+}
+
+
+/*
+ * Returns the ff_effect usable direction from a SDL_HapticDirection.
+ */
+static Uint16
+SDL_SYS_ToDirection(SDL_HapticDirection * dir)
+{
+    Uint32 tmp;
+    float f;                    /* Ideally we'd use fixed point math instead of floats... */
+
+    switch (dir->type) {
+    case SDL_HAPTIC_POLAR:
+        /* Linux directions start from south.
+                (and range from 0 to 0xFFFF)
+                   Quoting include/linux/input.h, line 926:
+                   Direction of the effect is encoded as follows:
+                        0 deg -> 0x0000 (down)
+                        90 deg -> 0x4000 (left)
+                        180 deg -> 0x8000 (up)
+                        270 deg -> 0xC000 (right)
+                    */
+        tmp = (((18000 + dir->dir[0]) % 36000) * 0xFFFF) / 36000; /* convert to range [0,0xFFFF] */
+        return (Uint16) tmp;
+
+       case SDL_HAPTIC_SPHERICAL:
+            /*
+                We convert to polar, because that's the only supported direction on Linux.
+                The first value of a spherical direction is practically the same as a
+                Polar direction, except that we have to add 90 degrees. It is the angle
+                from EAST {1,0} towards SOUTH {0,1}.
+                --> add 9000
+                --> finally add 18000 and convert to [0,0xFFFF] as in case SDL_HAPTIC_POLAR.
+            */
+            tmp = ((dir->dir[0]) + 9000) % 36000;    /* Convert to polars */
+        tmp = (((18000 + tmp) % 36000) * 0xFFFF) / 36000; /* convert to range [0,0xFFFF] */
+        return (Uint16) tmp;
+
+    case SDL_HAPTIC_CARTESIAN:
+        f = atan2(dir->dir[1], dir->dir[0]);
+                    /*
+                      atan2 takes the parameters: Y-axis-value and X-axis-value (in that order)
+                       - Y-axis-value is the second coordinate (from center to SOUTH)
+                       - X-axis-value is the first coordinate (from center to EAST)
+                        We add 36000, because atan2 also returns negative values. Then we practically
+                        have the first spherical value. Therefore we proceed as in case
+                        SDL_HAPTIC_SPHERICAL and add another 9000 to get the polar value.
+                      --> add 45000 in total
+                      --> finally add 18000 and convert to [0,0xFFFF] as in case SDL_HAPTIC_POLAR.
+                    */
+                tmp = (((int) (f * 18000. / M_PI)) + 45000) % 36000;
+        tmp = (((18000 + tmp) % 36000) * 0xFFFF) / 36000; /* convert to range [0,0xFFFF] */
+        return (Uint16) tmp;
+
+    default:
+        return (Uint16) SDL_SetError("Haptic: Unsupported direction type.");
+    }
+
+    return 0;
+}
+
+
+#define  CLAMP(x)    (((x) > 32767) ? 32767 : x)
+/*
+ * Initializes the Linux effect struct from a haptic_effect.
+ * Values above 32767 (for unsigned) are unspecified so we must clamp.
+ */
+static int
+SDL_SYS_ToFFEffect(struct ff_effect *dest, SDL_HapticEffect * src)
+{
+    Uint32 tmp;
+    SDL_HapticConstant *constant;
+    SDL_HapticPeriodic *periodic;
+    SDL_HapticCondition *condition;
+    SDL_HapticRamp *ramp;
+    SDL_HapticLeftRight *leftright;
+
+    /* Clear up */
+    SDL_memset(dest, 0, sizeof(struct ff_effect));
+
+    switch (src->type) {
+    case SDL_HAPTIC_CONSTANT:
+        constant = &src->constant;
+
+        /* Header */
+        dest->type = FF_CONSTANT;
+        dest->direction = SDL_SYS_ToDirection(&constant->direction);
+        if (dest->direction == (Uint16) - 1)
+            return -1;
+
+        /* Replay */
+        dest->replay.length = (constant->length == SDL_HAPTIC_INFINITY) ?
+            0 : CLAMP(constant->length);
+        dest->replay.delay = CLAMP(constant->delay);
+
+        /* Trigger */
+        dest->trigger.button = SDL_SYS_ToButton(constant->button);
+        dest->trigger.interval = CLAMP(constant->interval);
+
+        /* Constant */
+        dest->u.constant.level = constant->level;
+
+        /* Envelope */
+        dest->u.constant.envelope.attack_length =
+            CLAMP(constant->attack_length);
+        dest->u.constant.envelope.attack_level =
+            CLAMP(constant->attack_level);
+        dest->u.constant.envelope.fade_length = CLAMP(constant->fade_length);
+        dest->u.constant.envelope.fade_level = CLAMP(constant->fade_level);
+
+        break;
+
+    case SDL_HAPTIC_SINE:
+    /* !!! FIXME: put this back when we have more bits in 2.1 */
+    /* case SDL_HAPTIC_SQUARE: */
+    case SDL_HAPTIC_TRIANGLE:
+    case SDL_HAPTIC_SAWTOOTHUP:
+    case SDL_HAPTIC_SAWTOOTHDOWN:
+        periodic = &src->periodic;
+
+        /* Header */
+        dest->type = FF_PERIODIC;
+        dest->direction = SDL_SYS_ToDirection(&periodic->direction);
+        if (dest->direction == (Uint16) - 1)
+            return -1;
+
+        /* Replay */
+        dest->replay.length = (periodic->length == SDL_HAPTIC_INFINITY) ?
+            0 : CLAMP(periodic->length);
+        dest->replay.delay = CLAMP(periodic->delay);
+
+        /* Trigger */
+        dest->trigger.button = SDL_SYS_ToButton(periodic->button);
+        dest->trigger.interval = CLAMP(periodic->interval);
+
+        /* Periodic */
+        if (periodic->type == SDL_HAPTIC_SINE)
+            dest->u.periodic.waveform = FF_SINE;
+        /* !!! FIXME: put this back when we have more bits in 2.1 */
+        /* else if (periodic->type == SDL_HAPTIC_SQUARE)
+            dest->u.periodic.waveform = FF_SQUARE; */
+        else if (periodic->type == SDL_HAPTIC_TRIANGLE)
+            dest->u.periodic.waveform = FF_TRIANGLE;
+        else if (periodic->type == SDL_HAPTIC_SAWTOOTHUP)
+            dest->u.periodic.waveform = FF_SAW_UP;
+        else if (periodic->type == SDL_HAPTIC_SAWTOOTHDOWN)
+            dest->u.periodic.waveform = FF_SAW_DOWN;
+        dest->u.periodic.period = CLAMP(periodic->period);
+        dest->u.periodic.magnitude = periodic->magnitude;
+        dest->u.periodic.offset = periodic->offset;
+        /* Phase is calculated based of offset from period and then clamped. */
+        tmp = ((periodic->phase % 36000) * dest->u.periodic.period) / 36000;
+        dest->u.periodic.phase = CLAMP(tmp);
+
+        /* Envelope */
+        dest->u.periodic.envelope.attack_length =
+            CLAMP(periodic->attack_length);
+        dest->u.periodic.envelope.attack_level =
+            CLAMP(periodic->attack_level);
+        dest->u.periodic.envelope.fade_length = CLAMP(periodic->fade_length);
+        dest->u.periodic.envelope.fade_level = CLAMP(periodic->fade_level);
+
+        break;
+
+    case SDL_HAPTIC_SPRING:
+    case SDL_HAPTIC_DAMPER:
+    case SDL_HAPTIC_INERTIA:
+    case SDL_HAPTIC_FRICTION:
+        condition = &src->condition;
+
+        /* Header */
+        if (condition->type == SDL_HAPTIC_SPRING)
+            dest->type = FF_SPRING;
+        else if (condition->type == SDL_HAPTIC_DAMPER)
+            dest->type = FF_DAMPER;
+        else if (condition->type == SDL_HAPTIC_INERTIA)
+            dest->type = FF_INERTIA;
+        else if (condition->type == SDL_HAPTIC_FRICTION)
+            dest->type = FF_FRICTION;
+        dest->direction = 0;    /* Handled by the condition-specifics. */
+
+        /* Replay */
+        dest->replay.length = (condition->length == SDL_HAPTIC_INFINITY) ?
+            0 : CLAMP(condition->length);
+        dest->replay.delay = CLAMP(condition->delay);
+
+        /* Trigger */
+        dest->trigger.button = SDL_SYS_ToButton(condition->button);
+        dest->trigger.interval = CLAMP(condition->interval);
+
+        /* Condition */
+        /* X axis */
+        dest->u.condition[0].right_saturation =
+            CLAMP(condition->right_sat[0]);
+        dest->u.condition[0].left_saturation = CLAMP(condition->left_sat[0]);
+        dest->u.condition[0].right_coeff = condition->right_coeff[0];
+        dest->u.condition[0].left_coeff = condition->left_coeff[0];
+        dest->u.condition[0].deadband = CLAMP(condition->deadband[0]);
+        dest->u.condition[0].center = condition->center[0];
+        /* Y axis */
+        dest->u.condition[1].right_saturation =
+            CLAMP(condition->right_sat[1]);
+        dest->u.condition[1].left_saturation = CLAMP(condition->left_sat[1]);
+        dest->u.condition[1].right_coeff = condition->right_coeff[1];
+        dest->u.condition[1].left_coeff = condition->left_coeff[1];
+        dest->u.condition[1].deadband = CLAMP(condition->deadband[1]);
+        dest->u.condition[1].center = condition->center[1];
+
+        /*
+         * There is no envelope in the linux force feedback api for conditions.
+         */
+
+        break;
+
+    case SDL_HAPTIC_RAMP:
+        ramp = &src->ramp;
+
+        /* Header */
+        dest->type = FF_RAMP;
+        dest->direction = SDL_SYS_ToDirection(&ramp->direction);
+        if (dest->direction == (Uint16) - 1)
+            return -1;
+
+        /* Replay */
+        dest->replay.length = (ramp->length == SDL_HAPTIC_INFINITY) ?
+            0 : CLAMP(ramp->length);
+        dest->replay.delay = CLAMP(ramp->delay);
+
+        /* Trigger */
+        dest->trigger.button = SDL_SYS_ToButton(ramp->button);
+        dest->trigger.interval = CLAMP(ramp->interval);
+
+        /* Ramp */
+        dest->u.ramp.start_level = ramp->start;
+        dest->u.ramp.end_level = ramp->end;
+
+        /* Envelope */
+        dest->u.ramp.envelope.attack_length = CLAMP(ramp->attack_length);
+        dest->u.ramp.envelope.attack_level = CLAMP(ramp->attack_level);
+        dest->u.ramp.envelope.fade_length = CLAMP(ramp->fade_length);
+        dest->u.ramp.envelope.fade_level = CLAMP(ramp->fade_level);
+
+        break;
+
+    case SDL_HAPTIC_LEFTRIGHT:
+        leftright = &src->leftright;
+
+        /* Header */
+        dest->type = FF_RUMBLE;
+        dest->direction = 0;
+
+        /* Replay */
+        dest->replay.length = (leftright->length == SDL_HAPTIC_INFINITY) ?
+            0 : CLAMP(leftright->length);
+
+        /* Trigger */
+        dest->trigger.button = 0;
+        dest->trigger.interval = 0;
+
+        /* Rumble */
+        dest->u.rumble.strong_magnitude = leftright->large_magnitude;
+        dest->u.rumble.weak_magnitude = leftright->small_magnitude;
+
+        break;
+
+
+    default:
+        return SDL_SetError("Haptic: Unknown effect type.");
+    }
+
+    return 0;
+}
+
+
+/*
+ * Creates a new haptic effect.
+ */
+int
+SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
+                        SDL_HapticEffect * base)
+{
+    struct ff_effect *linux_effect;
+
+    /* Allocate the hardware effect */
+    effect->hweffect = (struct haptic_hweffect *)
+        SDL_malloc(sizeof(struct haptic_hweffect));
+    if (effect->hweffect == NULL) {
+        return SDL_OutOfMemory();
+    }
+
+    /* Prepare the ff_effect */
+    linux_effect = &effect->hweffect->effect;
+    if (SDL_SYS_ToFFEffect(linux_effect, base) != 0) {
+        goto new_effect_err;
+    }
+    linux_effect->id = -1;      /* Have the kernel give it an id */
+
+    /* Upload the effect */
+    if (ioctl(haptic->hwdata->fd, EVIOCSFF, linux_effect) < 0) {
+        SDL_SetError("Haptic: Error uploading effect to the device: %s",
+                     strerror(errno));
+        goto new_effect_err;
+    }
+
+    return 0;
+
+  new_effect_err:
+    free(effect->hweffect);
+    effect->hweffect = NULL;
+    return -1;
+}
+
+
+/*
+ * Updates an effect.
+ *
+ * Note: Dynamically updating the direction can in some cases force
+ * the effect to restart and run once.
+ */
+int
+SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
+                           struct haptic_effect *effect,
+                           SDL_HapticEffect * data)
+{
+    struct ff_effect linux_effect;
+
+    /* Create the new effect */
+    if (SDL_SYS_ToFFEffect(&linux_effect, data) != 0) {
+        return -1;
+    }
+    linux_effect.id = effect->hweffect->effect.id;
+
+    /* See if it can be uploaded. */
+    if (ioctl(haptic->hwdata->fd, EVIOCSFF, &linux_effect) < 0) {
+        return SDL_SetError("Haptic: Error updating the effect: %s",
+                            strerror(errno));
+    }
+
+    /* Copy the new effect into memory. */
+    SDL_memcpy(&effect->hweffect->effect, &linux_effect,
+               sizeof(struct ff_effect));
+
+    return effect->hweffect->effect.id;
+}
+
+
+/*
+ * Runs an effect.
+ */
+int
+SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
+                        Uint32 iterations)
+{
+    struct input_event run;
+
+    /* Prepare to run the effect */
+    run.type = EV_FF;
+    run.code = effect->hweffect->effect.id;
+    /* We don't actually have infinity here, so we just do INT_MAX which is pretty damn close. */
+    run.value = (iterations > INT_MAX) ? INT_MAX : iterations;
+
+    if (write(haptic->hwdata->fd, (const void *) &run, sizeof(run)) < 0) {
+        return SDL_SetError("Haptic: Unable to run the effect: %s", strerror(errno));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Stops an effect.
+ */
+int
+SDL_SYS_HapticStopEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    struct input_event stop;
+
+    stop.type = EV_FF;
+    stop.code = effect->hweffect->effect.id;
+    stop.value = 0;
+
+    if (write(haptic->hwdata->fd, (const void *) &stop, sizeof(stop)) < 0) {
+        return SDL_SetError("Haptic: Unable to stop the effect: %s",
+                            strerror(errno));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Frees the effect.
+ */
+void
+SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    if (ioctl(haptic->hwdata->fd, EVIOCRMFF, effect->hweffect->effect.id) < 0) {
+        SDL_SetError("Haptic: Error removing the effect from the device: %s",
+                     strerror(errno));
+    }
+    SDL_free(effect->hweffect);
+    effect->hweffect = NULL;
+}
+
+
+/*
+ * Gets the status of a haptic effect.
+ */
+int
+SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
+                              struct haptic_effect *effect)
+{
+#if 0                           /* Not supported atm. */
+    struct input_event ie;
+
+    ie.type = EV_FF;
+    ie.type = EV_FF_STATUS;
+    ie.code = effect->hweffect->effect.id;
+
+    if (write(haptic->hwdata->fd, &ie, sizeof(ie)) < 0) {
+        return SDL_SetError("Haptic: Error getting device status.");
+    }
+
+    return 0;
+#endif
+
+    return -1;
+}
+
+
+/*
+ * Sets the gain.
+ */
+int
+SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain)
+{
+    struct input_event ie;
+
+    ie.type = EV_FF;
+    ie.code = FF_GAIN;
+    ie.value = (0xFFFFUL * gain) / 100;
+
+    if (write(haptic->hwdata->fd, &ie, sizeof(ie)) < 0) {
+        return SDL_SetError("Haptic: Error setting gain: %s", strerror(errno));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Sets the autocentering.
+ */
+int
+SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
+{
+    struct input_event ie;
+
+    ie.type = EV_FF;
+    ie.code = FF_AUTOCENTER;
+    ie.value = (0xFFFFUL * autocenter) / 100;
+
+    if (write(haptic->hwdata->fd, &ie, sizeof(ie)) < 0) {
+        return SDL_SetError("Haptic: Error setting autocenter: %s", strerror(errno));
+    }
+
+    return 0;
+}
+
+
+/*
+ * Pausing is not supported atm by linux.
+ */
+int
+SDL_SYS_HapticPause(SDL_Haptic * haptic)
+{
+    return -1;
+}
+
+
+/*
+ * Unpausing is not supported atm by linux.
+ */
+int
+SDL_SYS_HapticUnpause(SDL_Haptic * haptic)
+{
+    return -1;
+}
+
+
+/*
+ * Stops all the currently playing effects.
+ */
+int
+SDL_SYS_HapticStopAll(SDL_Haptic * haptic)
+{
+    int i, ret;
+
+    /* Linux does not support this natively so we have to loop. */
+    for (i = 0; i < haptic->neffects; i++) {
+        if (haptic->effects[i].hweffect != NULL) {
+            ret = SDL_SYS_HapticStopEffect(haptic, &haptic->effects[i]);
+            if (ret < 0) {
+                return SDL_SetError
+                    ("Haptic: Error while trying to stop all playing effects.");
+            }
+        }
+    }
+    return 0;
+}
+
+
+#endif /* SDL_HAPTIC_LINUX */
diff --git a/Source/3rd Party/sdl/src/haptic/windows/SDL_syshaptic.c b/Source/3rd Party/sdl/src/haptic/windows/SDL_syshaptic.c
new file mode 100644
index 000000000..a4b5e4264
--- /dev/null
+++ b/Source/3rd Party/sdl/src/haptic/windows/SDL_syshaptic.c	
@@ -0,0 +1,1792 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_HAPTIC_DINPUT
+
+#include "SDL_assert.h"
+#include "SDL_thread.h"
+#include "SDL_mutex.h"
+#include "SDL_timer.h"
+#include "SDL_hints.h"
+#include "SDL_haptic.h"
+#include "../SDL_syshaptic.h"
+#include "SDL_joystick.h"
+#include "../../joystick/SDL_sysjoystick.h"     /* For the real SDL_Joystick */
+#include "../../joystick/windows/SDL_dxjoystick_c.h"      /* For joystick hwdata */
+
+#include "SDL_syshaptic_c.h"
+
+/*
+ * List of available haptic devices.
+ */
+typedef struct SDL_hapticlist_item
+{
+    DIDEVICEINSTANCE instance;
+    char *name;
+    SDL_Haptic *haptic;
+    DIDEVCAPS capabilities;
+    Uint8 bXInputHaptic; /* Supports force feedback via XInput. */
+    Uint8 userid; /* XInput userid index for this joystick */
+    struct SDL_hapticlist_item *next;
+} SDL_hapticlist_item;
+
+
+/*
+ * Haptic system hardware data.
+ */
+struct haptic_hwdata
+{
+    LPDIRECTINPUTDEVICE8 device;
+    DWORD axes[3];              /* Axes to use. */
+    SDL_bool is_joystick;       /* Device is loaded as joystick. */
+    Uint8 bXInputHaptic; /* Supports force feedback via XInput. */
+    Uint8 userid; /* XInput userid index for this joystick */
+    SDL_Thread *thread;
+    SDL_mutex *mutex;
+    volatile Uint32 stopTicks;
+    volatile int stopThread;
+};
+
+
+/*
+ * Haptic system effect data.
+ */
+struct haptic_hweffect
+{
+    DIEFFECT effect;
+    LPDIRECTINPUTEFFECT ref;
+    XINPUT_VIBRATION vibration;
+};
+
+
+/*
+ * Internal stuff.
+ */
+static SDL_bool coinitialized = SDL_FALSE;
+static LPDIRECTINPUT8 dinput = NULL;
+static SDL_bool loaded_xinput = SDL_FALSE;
+static SDL_hapticlist_item *SDL_hapticlist = NULL;
+static SDL_hapticlist_item *SDL_hapticlist_tail = NULL;
+static int numhaptics = 0;
+
+/*
+ * External stuff.
+ */
+extern HWND SDL_HelperWindow;
+
+
+/*
+ * Prototypes.
+ */
+static int DI_SetError(const char *str, HRESULT err);
+static int DI_GUIDIsSame(const GUID * a, const GUID * b);
+static int SDL_SYS_HapticOpenFromInstance(SDL_Haptic * haptic,
+                                          DIDEVICEINSTANCE instance);
+static int SDL_SYS_HapticOpenFromDevice8(SDL_Haptic * haptic,
+                                         LPDIRECTINPUTDEVICE8 device8,
+                                         SDL_bool is_joystick);
+static int SDL_SYS_HapticOpenFromXInput(SDL_Haptic * haptic, const Uint8 userid);
+static DWORD DIGetTriggerButton(Uint16 button);
+static int SDL_SYS_SetDirection(DIEFFECT * effect, SDL_HapticDirection * dir,
+                                int naxes);
+static int SDL_SYS_ToDIEFFECT(SDL_Haptic * haptic, DIEFFECT * dest,
+                              SDL_HapticEffect * src);
+static void SDL_SYS_HapticFreeDIEFFECT(DIEFFECT * effect, int type);
+static REFGUID SDL_SYS_HapticEffectType(SDL_HapticEffect * effect);
+static int SDLCALL SDL_RunXInputHaptic(void *arg);
+
+/* Callbacks. */
+static BOOL CALLBACK EnumHapticsCallback(const DIDEVICEINSTANCE *
+                                         pdidInstance, VOID * pContext);
+static BOOL CALLBACK DI_EffectCallback(LPCDIEFFECTINFO pei, LPVOID pv);
+
+
+/*
+ * Like SDL_SetError but for DX error codes.
+ */
+static int
+DI_SetError(const char *str, HRESULT err)
+{
+    /*
+       SDL_SetError("Haptic: %s - %s: %s", str,
+       DXGetErrorString8A(err), DXGetErrorDescription8A(err));
+     */
+    return SDL_SetError("Haptic error %s", str);
+}
+
+
+/*
+ * Checks to see if two GUID are the same.
+ */
+static int
+DI_GUIDIsSame(const GUID * a, const GUID * b)
+{
+    return (SDL_memcmp(a, b, sizeof (GUID)) == 0);
+}
+
+
+/*
+ * Initializes the haptic subsystem.
+ */
+int
+SDL_SYS_HapticInit(void)
+{
+    const char *env = SDL_GetHint(SDL_HINT_XINPUT_ENABLED);
+    HRESULT ret;
+    HINSTANCE instance;
+
+    if (dinput != NULL) {       /* Already open. */
+        return SDL_SetError("Haptic: SubSystem already open.");
+    }
+
+    ret = WIN_CoInitialize();
+    if (FAILED(ret)) {
+        return DI_SetError("Coinitialize", ret);
+    }
+
+    coinitialized = SDL_TRUE;
+
+    ret = CoCreateInstance(&CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER,
+                           &IID_IDirectInput8, (LPVOID) & dinput);
+    if (FAILED(ret)) {
+        SDL_SYS_HapticQuit();
+        return DI_SetError("CoCreateInstance", ret);
+    }
+
+    /* Because we used CoCreateInstance, we need to Initialize it, first. */
+    instance = GetModuleHandle(NULL);
+    if (instance == NULL) {
+        SDL_SYS_HapticQuit();
+        return SDL_SetError("GetModuleHandle() failed with error code %d.",
+                            GetLastError());
+    }
+    ret = IDirectInput8_Initialize(dinput, instance, DIRECTINPUT_VERSION);
+    if (FAILED(ret)) {
+        SDL_SYS_HapticQuit();
+        return DI_SetError("Initializing DirectInput device", ret);
+    }
+
+    /* Look for haptic devices. */
+    ret = IDirectInput8_EnumDevices(dinput,
+                                   0,
+                                   EnumHapticsCallback,
+                                   NULL,
+                                   DIEDFL_FORCEFEEDBACK |
+                                   DIEDFL_ATTACHEDONLY);
+    if (FAILED(ret)) {
+        SDL_SYS_HapticQuit();
+        return DI_SetError("Enumerating DirectInput devices", ret);
+    }
+
+    if (!env || SDL_atoi(env)) {
+        loaded_xinput = (WIN_LoadXInputDLL() == 0);
+    }
+
+    if (loaded_xinput) {
+        DWORD i;
+        for (i = 0; i < SDL_XINPUT_MAX_DEVICES; i++) {
+            XInputHaptic_MaybeAddDevice(i);
+        }
+    }
+
+    return numhaptics;
+}
+
+
+int
+DirectInputHaptic_MaybeAddDevice(const DIDEVICEINSTANCE * pdidInstance)
+{
+    HRESULT ret;
+    LPDIRECTINPUTDEVICE8 device;
+    const DWORD needflags = DIDC_ATTACHED | DIDC_FORCEFEEDBACK;
+    DIDEVCAPS capabilities;
+    SDL_hapticlist_item *item = NULL;
+
+    if (dinput == NULL) {
+        return -1;  /* not initialized. We'll pick these up on enumeration if we init later. */
+    }
+
+    /* Make sure we don't already have it */
+    for (item = SDL_hapticlist; item; item = item->next) {
+        if ( (!item->bXInputHaptic) && (SDL_memcmp(&item->instance, pdidInstance, sizeof (*pdidInstance)) == 0) ) {
+            return -1;  /* Already added */
+        }
+    }
+
+    /* Open the device */
+    ret = IDirectInput8_CreateDevice(dinput, &pdidInstance->guidInstance, &device, NULL);
+    if (FAILED(ret)) {
+        /* DI_SetError("Creating DirectInput device",ret); */
+        return -1;
+    }
+
+    /* Get capabilities. */
+    SDL_zero(capabilities);
+    capabilities.dwSize = sizeof (DIDEVCAPS);
+    ret = IDirectInputDevice8_GetCapabilities(device, &capabilities);
+    IDirectInputDevice8_Release(device);
+    if (FAILED(ret)) {
+        /* DI_SetError("Getting device capabilities",ret); */
+        return -1;
+    }
+
+    if ((capabilities.dwFlags & needflags) != needflags) {
+        return -1;  /* not a device we can use. */
+    }
+
+    item = (SDL_hapticlist_item *)SDL_calloc(1, sizeof(SDL_hapticlist_item));
+    if (item == NULL) {
+        return SDL_OutOfMemory();
+    }
+
+    item->name = WIN_StringToUTF8(pdidInstance->tszProductName);
+    if (!item->name) {
+        SDL_free(item);
+        return -1;
+    }
+
+    /* Copy the instance over, useful for creating devices. */
+    SDL_memcpy(&item->instance, pdidInstance, sizeof (DIDEVICEINSTANCE));
+    SDL_memcpy(&item->capabilities, &capabilities, sizeof (capabilities));
+
+    if (SDL_hapticlist_tail == NULL) {
+        SDL_hapticlist = SDL_hapticlist_tail = item;
+    } else {
+        SDL_hapticlist_tail->next = item;
+        SDL_hapticlist_tail = item;
+    }
+
+    /* Device has been added. */
+    ++numhaptics;
+
+    return numhaptics;
+}
+
+
+int
+DirectInputHaptic_MaybeRemoveDevice(const DIDEVICEINSTANCE * pdidInstance)
+{
+    SDL_hapticlist_item *item;
+    SDL_hapticlist_item *prev = NULL;
+
+    if (dinput == NULL) {
+        return -1;  /* not initialized, ignore this. */
+    }
+
+    for (item = SDL_hapticlist; item != NULL; item = item->next) {
+        if ( (!item->bXInputHaptic) && (SDL_memcmp(&item->instance, pdidInstance, sizeof (*pdidInstance)) == 0) ) {
+            /* found it, remove it. */
+            const int retval = item->haptic ? item->haptic->index : -1;
+            if (prev != NULL) {
+                prev->next = item->next;
+            } else {
+                SDL_assert(SDL_hapticlist == item);
+                SDL_hapticlist = item->next;
+            }
+            if (item == SDL_hapticlist_tail) {
+                SDL_hapticlist_tail = prev;
+            }
+            --numhaptics;
+            /* !!! TODO: Send a haptic remove event? */
+            SDL_free(item);
+            return retval;
+        }
+        prev = item;
+    }
+
+    return -1;
+}
+
+
+int
+XInputHaptic_MaybeAddDevice(const DWORD dwUserid)
+{
+    const Uint8 userid = (Uint8) dwUserid;
+    XINPUT_CAPABILITIES caps;
+    const SDL_bool bIs14OrLater = (SDL_XInputVersion >= ((1<<16)|4));
+    SDL_hapticlist_item *item;
+
+    if ((!loaded_xinput) || (dwUserid >= SDL_XINPUT_MAX_DEVICES)) {
+        return -1;
+    }
+
+    /* Make sure we don't already have it */
+    for (item = SDL_hapticlist; item; item = item->next) {
+        if ((item->bXInputHaptic) && (item->userid == userid)) {
+            return -1;  /* Already added */
+        }
+    }
+
+    if (XINPUTGETCAPABILITIES(dwUserid, XINPUT_FLAG_GAMEPAD, &caps) != ERROR_SUCCESS) {
+        return -1;  /* maybe controller isn't plugged in. */
+    }
+
+    /* XInput < 1.4 is probably only for original XBox360 controllers,
+        which don't offer the flag, and always have force feedback */
+    if ( (bIs14OrLater) && ((caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) == 0) ) {
+        return -1;  /* no force feedback on this device. */
+    }
+
+    item = (SDL_hapticlist_item *)SDL_malloc( sizeof(SDL_hapticlist_item));
+    if (item == NULL) {
+        return SDL_OutOfMemory();
+    }
+
+    SDL_zerop(item);
+
+    /* !!! FIXME: I'm not bothering to query for a real name right now (can we even?) */
+    {
+        char buf[64];
+        SDL_snprintf(buf, sizeof (buf), "XInput Controller #%u", (unsigned int) (userid+1));
+        item->name = SDL_strdup(buf);
+    }
+
+    if (!item->name) {
+        SDL_free(item);
+        return -1;
+    }
+
+    /* Copy the instance over, useful for creating devices. */
+    item->bXInputHaptic = 1;
+    item->userid = userid;
+
+    if (SDL_hapticlist_tail == NULL) {
+        SDL_hapticlist = SDL_hapticlist_tail = item;
+    } else {
+        SDL_hapticlist_tail->next = item;
+        SDL_hapticlist_tail = item;
+    }
+
+    /* Device has been added. */
+    ++numhaptics;
+
+    return numhaptics;
+}
+
+
+int
+XInputHaptic_MaybeRemoveDevice(const DWORD dwUserid)
+{
+    const Uint8 userid = (Uint8) dwUserid;
+    SDL_hapticlist_item *item;
+    SDL_hapticlist_item *prev = NULL;
+
+    if ((!loaded_xinput) || (dwUserid >= SDL_XINPUT_MAX_DEVICES)) {
+        return -1;
+    }
+
+    for (item = SDL_hapticlist; item != NULL; item = item->next) {
+        if ((item->bXInputHaptic) && (item->userid == userid)) {
+            /* found it, remove it. */
+            const int retval = item->haptic ? item->haptic->index : -1;
+            if (prev != NULL) {
+                prev->next = item->next;
+            } else {
+                SDL_assert(SDL_hapticlist == item);
+                SDL_hapticlist = item->next;
+            }
+            if (item == SDL_hapticlist_tail) {
+                SDL_hapticlist_tail = prev;
+            }
+            --numhaptics;
+            /* !!! TODO: Send a haptic remove event? */
+            SDL_free(item);
+            return retval;
+        }
+        prev = item;
+    }
+
+    return -1;
+}
+
+
+/*
+ * Callback to find the haptic devices.
+ */
+static BOOL CALLBACK
+EnumHapticsCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
+{
+    (void) pContext;
+    DirectInputHaptic_MaybeAddDevice(pdidInstance);
+    return DIENUM_CONTINUE;  /* continue enumerating */
+}
+
+
+int
+SDL_SYS_NumHaptics()
+{
+    return numhaptics;
+}
+
+static SDL_hapticlist_item *
+HapticByDevIndex(int device_index)
+{
+    SDL_hapticlist_item *item = SDL_hapticlist;
+
+    if ((device_index < 0) || (device_index >= numhaptics)) {
+        return NULL;
+    }
+
+    while (device_index > 0) {
+        SDL_assert(item != NULL);
+        --device_index;
+        item = item->next;
+    }
+
+    return item;
+}
+
+/*
+ * Return the name of a haptic device, does not need to be opened.
+ */
+const char *
+SDL_SYS_HapticName(int index)
+{
+    SDL_hapticlist_item *item = HapticByDevIndex(index);
+    return item->name;
+}
+
+
+/*
+ * Callback to get all supported effects.
+ */
+#define EFFECT_TEST(e,s)               \
+if (DI_GUIDIsSame(&pei->guid, &(e)))   \
+   haptic->supported |= (s)
+static BOOL CALLBACK
+DI_EffectCallback(LPCDIEFFECTINFO pei, LPVOID pv)
+{
+    /* Prepare the haptic device. */
+    SDL_Haptic *haptic = (SDL_Haptic *) pv;
+
+    /* Get supported. */
+    EFFECT_TEST(GUID_Spring, SDL_HAPTIC_SPRING);
+    EFFECT_TEST(GUID_Damper, SDL_HAPTIC_DAMPER);
+    EFFECT_TEST(GUID_Inertia, SDL_HAPTIC_INERTIA);
+    EFFECT_TEST(GUID_Friction, SDL_HAPTIC_FRICTION);
+    EFFECT_TEST(GUID_ConstantForce, SDL_HAPTIC_CONSTANT);
+    EFFECT_TEST(GUID_CustomForce, SDL_HAPTIC_CUSTOM);
+    EFFECT_TEST(GUID_Sine, SDL_HAPTIC_SINE);
+    /* !!! FIXME: put this back when we have more bits in 2.1 */
+    /* EFFECT_TEST(GUID_Square, SDL_HAPTIC_SQUARE); */
+    EFFECT_TEST(GUID_Triangle, SDL_HAPTIC_TRIANGLE);
+    EFFECT_TEST(GUID_SawtoothUp, SDL_HAPTIC_SAWTOOTHUP);
+    EFFECT_TEST(GUID_SawtoothDown, SDL_HAPTIC_SAWTOOTHDOWN);
+    EFFECT_TEST(GUID_RampForce, SDL_HAPTIC_RAMP);
+
+    /* Check for more. */
+    return DIENUM_CONTINUE;
+}
+
+
+/*
+ * Callback to get supported axes.
+ */
+static BOOL CALLBACK
+DI_DeviceObjectCallback(LPCDIDEVICEOBJECTINSTANCE dev, LPVOID pvRef)
+{
+    SDL_Haptic *haptic = (SDL_Haptic *) pvRef;
+
+    if ((dev->dwType & DIDFT_AXIS) && (dev->dwFlags & DIDOI_FFACTUATOR)) {
+
+        haptic->hwdata->axes[haptic->naxes] = dev->dwOfs;
+        haptic->naxes++;
+
+        /* Currently using the artificial limit of 3 axes. */
+        if (haptic->naxes >= 3) {
+            return DIENUM_STOP;
+        }
+    }
+
+    return DIENUM_CONTINUE;
+}
+
+
+/*
+ * Opens the haptic device from the file descriptor.
+ *
+ *    Steps:
+ *       - Open temporary DirectInputDevice interface.
+ *       - Create DirectInputDevice8 interface.
+ *       - Release DirectInputDevice interface.
+ *       - Call SDL_SYS_HapticOpenFromDevice8
+ */
+static int
+SDL_SYS_HapticOpenFromInstance(SDL_Haptic * haptic, DIDEVICEINSTANCE instance)
+{
+    HRESULT ret;
+    int ret2;
+    LPDIRECTINPUTDEVICE8 device;
+    LPDIRECTINPUTDEVICE8 device8;
+
+    /* Open the device */
+    ret = IDirectInput8_CreateDevice(dinput, &instance.guidInstance,
+                                    &device, NULL);
+    if (FAILED(ret)) {
+        DI_SetError("Creating DirectInput device", ret);
+        return -1;
+    }
+
+    /* Now get the IDirectInputDevice8 interface, instead. */
+    ret = IDirectInputDevice8_QueryInterface(device,
+                                            &IID_IDirectInputDevice8,
+                                            (LPVOID *) &device8);
+    /* Done with the temporary one now. */
+    IDirectInputDevice8_Release(device);
+    if (FAILED(ret)) {
+        DI_SetError("Querying DirectInput interface", ret);
+        return -1;
+    }
+
+    ret2 = SDL_SYS_HapticOpenFromDevice8(haptic, device8, SDL_FALSE);
+    if (ret2 < 0) {
+        IDirectInputDevice8_Release(device8);
+        return -1;
+    }
+
+    return 0;
+}
+
+static int
+SDL_SYS_HapticOpenFromXInput(SDL_Haptic *haptic, const Uint8 userid)
+{
+    char threadName[32];
+    XINPUT_VIBRATION vibration = { 0, 0 };  /* stop any current vibration */
+    XINPUTSETSTATE(userid, &vibration);
+
+    haptic->supported = SDL_HAPTIC_LEFTRIGHT;
+
+    haptic->neffects = 1;
+    haptic->nplaying = 1;
+
+    /* Prepare effects memory. */
+    haptic->effects = (struct haptic_effect *)
+        SDL_malloc(sizeof(struct haptic_effect) * haptic->neffects);
+    if (haptic->effects == NULL) {
+        return SDL_OutOfMemory();
+    }
+    /* Clear the memory */
+    SDL_memset(haptic->effects, 0,
+               sizeof(struct haptic_effect) * haptic->neffects);
+
+    haptic->hwdata = (struct haptic_hwdata *) SDL_malloc(sizeof(*haptic->hwdata));
+    if (haptic->hwdata == NULL) {
+        SDL_free(haptic->effects);
+        haptic->effects = NULL;
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(haptic->hwdata, 0, sizeof(*haptic->hwdata));
+
+    haptic->hwdata->bXInputHaptic = 1;
+    haptic->hwdata->userid = userid;
+
+    haptic->hwdata->mutex = SDL_CreateMutex();
+    if (haptic->hwdata->mutex == NULL) {
+        SDL_free(haptic->effects);
+        SDL_free(haptic->hwdata);
+        haptic->effects = NULL;
+        return SDL_SetError("Couldn't create XInput haptic mutex");
+    }
+
+    SDL_snprintf(threadName, sizeof (threadName), "SDLXInputDev%d", (int) userid);
+
+#if defined(__WIN32__) && !defined(HAVE_LIBC)  /* !!! FIXME: this is nasty. */
+    #undef SDL_CreateThread
+    #if SDL_DYNAMIC_API
+    haptic->hwdata->thread = SDL_CreateThread_REAL(SDL_RunXInputHaptic, threadName, haptic->hwdata, NULL, NULL);
+    #else
+    haptic->hwdata->thread = SDL_CreateThread(SDL_RunXInputHaptic, threadName, haptic->hwdata, NULL, NULL);
+    #endif
+#else
+    haptic->hwdata->thread = SDL_CreateThread(SDL_RunXInputHaptic, threadName, haptic->hwdata);
+#endif
+    if (haptic->hwdata->thread == NULL) {
+        SDL_DestroyMutex(haptic->hwdata->mutex);
+        SDL_free(haptic->effects);
+        SDL_free(haptic->hwdata);
+        haptic->effects = NULL;
+        return SDL_SetError("Couldn't create XInput haptic thread");
+    }
+
+    return 0;
+ }
+
+/*
+ * Opens the haptic device from the file descriptor.
+ *
+ *    Steps:
+ *       - Set cooperative level.
+ *       - Set data format.
+ *       - Acquire exclusiveness.
+ *       - Reset actuators.
+ *       - Get supported features.
+ */
+static int
+SDL_SYS_HapticOpenFromDevice8(SDL_Haptic * haptic,
+                              LPDIRECTINPUTDEVICE8 device8, SDL_bool is_joystick)
+{
+    HRESULT ret;
+    DIPROPDWORD dipdw;
+
+    /* Allocate the hwdata */
+    haptic->hwdata = (struct haptic_hwdata *)SDL_malloc(sizeof(*haptic->hwdata));
+    if (haptic->hwdata == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(haptic->hwdata, 0, sizeof(*haptic->hwdata));
+
+    /* We'll use the device8 from now on. */
+    haptic->hwdata->device = device8;
+    haptic->hwdata->is_joystick = is_joystick;
+
+    /* Grab it exclusively to use force feedback stuff. */
+    ret = IDirectInputDevice8_SetCooperativeLevel(haptic->hwdata->device,
+                                                  SDL_HelperWindow,
+                                                  DISCL_EXCLUSIVE |
+                                                  DISCL_BACKGROUND);
+    if (FAILED(ret)) {
+        DI_SetError("Setting cooperative level to exclusive", ret);
+        goto acquire_err;
+    }
+
+    /* Set data format. */
+    ret = IDirectInputDevice8_SetDataFormat(haptic->hwdata->device,
+                                            &c_dfDIJoystick2);
+    if (FAILED(ret)) {
+        DI_SetError("Setting data format", ret);
+        goto acquire_err;
+    }
+
+    /* Get number of axes. */
+    ret = IDirectInputDevice8_EnumObjects(haptic->hwdata->device,
+                                          DI_DeviceObjectCallback,
+                                          haptic, DIDFT_AXIS);
+    if (FAILED(ret)) {
+        DI_SetError("Getting device axes", ret);
+        goto acquire_err;
+    }
+
+    /* Acquire the device. */
+    ret = IDirectInputDevice8_Acquire(haptic->hwdata->device);
+    if (FAILED(ret)) {
+        DI_SetError("Acquiring DirectInput device", ret);
+        goto acquire_err;
+    }
+
+    /* Reset all actuators - just in case. */
+    ret = IDirectInputDevice8_SendForceFeedbackCommand(haptic->hwdata->device,
+                                                       DISFFC_RESET);
+    if (FAILED(ret)) {
+        DI_SetError("Resetting device", ret);
+        goto acquire_err;
+    }
+
+    /* Enabling actuators. */
+    ret = IDirectInputDevice8_SendForceFeedbackCommand(haptic->hwdata->device,
+                                                       DISFFC_SETACTUATORSON);
+    if (FAILED(ret)) {
+        DI_SetError("Enabling actuators", ret);
+        goto acquire_err;
+    }
+
+    /* Get supported effects. */
+    ret = IDirectInputDevice8_EnumEffects(haptic->hwdata->device,
+                                          DI_EffectCallback, haptic,
+                                          DIEFT_ALL);
+    if (FAILED(ret)) {
+        DI_SetError("Enumerating supported effects", ret);
+        goto acquire_err;
+    }
+    if (haptic->supported == 0) {       /* Error since device supports nothing. */
+        SDL_SetError("Haptic: Internal error on finding supported effects.");
+        goto acquire_err;
+    }
+
+    /* Check autogain and autocenter. */
+    dipdw.diph.dwSize = sizeof(DIPROPDWORD);
+    dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+    dipdw.diph.dwObj = 0;
+    dipdw.diph.dwHow = DIPH_DEVICE;
+    dipdw.dwData = 10000;
+    ret = IDirectInputDevice8_SetProperty(haptic->hwdata->device,
+                                          DIPROP_FFGAIN, &dipdw.diph);
+    if (!FAILED(ret)) {         /* Gain is supported. */
+        haptic->supported |= SDL_HAPTIC_GAIN;
+    }
+    dipdw.diph.dwObj = 0;
+    dipdw.diph.dwHow = DIPH_DEVICE;
+    dipdw.dwData = DIPROPAUTOCENTER_OFF;
+    ret = IDirectInputDevice8_SetProperty(haptic->hwdata->device,
+                                          DIPROP_AUTOCENTER, &dipdw.diph);
+    if (!FAILED(ret)) {         /* Autocenter is supported. */
+        haptic->supported |= SDL_HAPTIC_AUTOCENTER;
+    }
+
+    /* Status is always supported. */
+    haptic->supported |= SDL_HAPTIC_STATUS | SDL_HAPTIC_PAUSE;
+
+    /* Check maximum effects. */
+    haptic->neffects = 128;     /* This is not actually supported as thus under windows,
+                                   there is no way to tell the number of EFFECTS that a
+                                   device can hold, so we'll just use a "random" number
+                                   instead and put warnings in SDL_haptic.h */
+    haptic->nplaying = 128;     /* Even more impossible to get this then neffects. */
+
+    /* Prepare effects memory. */
+    haptic->effects = (struct haptic_effect *)
+        SDL_malloc(sizeof(struct haptic_effect) * haptic->neffects);
+    if (haptic->effects == NULL) {
+        SDL_OutOfMemory();
+        goto acquire_err;
+    }
+    /* Clear the memory */
+    SDL_memset(haptic->effects, 0,
+               sizeof(struct haptic_effect) * haptic->neffects);
+
+    return 0;
+
+    /* Error handling */
+  acquire_err:
+    IDirectInputDevice8_Unacquire(haptic->hwdata->device);
+    return -1;
+
+}
+
+
+/*
+ * Opens a haptic device for usage.
+ */
+int
+SDL_SYS_HapticOpen(SDL_Haptic * haptic)
+{
+    SDL_hapticlist_item *item = HapticByDevIndex(haptic->index);
+    return (item->bXInputHaptic) ? SDL_SYS_HapticOpenFromXInput(haptic, item->userid) : SDL_SYS_HapticOpenFromInstance(haptic, item->instance);
+}
+
+
+/*
+ * Opens a haptic device from first mouse it finds for usage.
+ */
+int
+SDL_SYS_HapticMouse(void)
+{
+    SDL_hapticlist_item *item;
+    int index = 0;
+
+    /* Grab the first mouse haptic device we find. */
+    for (item = SDL_hapticlist; item != NULL; item = item->next) {
+        SDL_assert(index >= 0);
+        if (item->capabilities.dwDevType == DI8DEVCLASS_POINTER ) {
+            return index;
+        }
+        ++index;
+    }
+
+    return -1;
+}
+
+
+/*
+ * Checks to see if a joystick has haptic features.
+ */
+int
+SDL_SYS_JoystickIsHaptic(SDL_Joystick * joystick)
+{
+    const struct joystick_hwdata *hwdata = joystick->hwdata;
+    return ( (hwdata->bXInputHaptic) ||
+             ((hwdata->Capabilities.dwFlags & DIDC_FORCEFEEDBACK) != 0) );
+}
+
+
+/*
+ * Checks to see if the haptic device and joystick are in reality the same.
+ */
+int
+SDL_SYS_JoystickSameHaptic(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    if (joystick->hwdata->bXInputHaptic != haptic->hwdata->bXInputHaptic) {
+        return 0;  /* one is XInput, one is not; not the same device. */
+    } else if (joystick->hwdata->bXInputHaptic) {  /* XInput */
+        return (haptic->hwdata->userid == joystick->hwdata->userid);
+    } else {  /* DirectInput */
+        HRESULT ret;
+        DIDEVICEINSTANCE hap_instance, joy_instance;
+
+        hap_instance.dwSize = sizeof(DIDEVICEINSTANCE);
+        joy_instance.dwSize = sizeof(DIDEVICEINSTANCE);
+
+        /* Get the device instances. */
+        ret = IDirectInputDevice8_GetDeviceInfo(haptic->hwdata->device,
+                                            &hap_instance);
+        if (FAILED(ret)) {
+            return 0;
+        }
+        ret = IDirectInputDevice8_GetDeviceInfo(joystick->hwdata->InputDevice,
+                                                &joy_instance);
+        if (FAILED(ret)) {
+            return 0;
+        }
+
+        if (DI_GUIDIsSame(&hap_instance.guidInstance, &joy_instance.guidInstance))
+            return 1;
+    }
+
+    return 0;
+}
+
+
+/*
+ * Opens a SDL_Haptic from a SDL_Joystick.
+ */
+int
+SDL_SYS_HapticOpenFromJoystick(SDL_Haptic * haptic, SDL_Joystick * joystick)
+{
+    SDL_hapticlist_item *item;
+    int index = 0;
+
+    /* Since it comes from a joystick we have to try to match it with a haptic device on our haptic list. */
+    if (joystick->hwdata->bXInputDevice) {
+        const Uint8 userid = joystick->hwdata->userid;
+        for (item = SDL_hapticlist; item != NULL; item = item->next) {
+            if ((item->bXInputHaptic) && (item->userid == userid)) {
+                SDL_assert(joystick->hwdata->bXInputHaptic);
+                haptic->index = index;
+                return SDL_SYS_HapticOpenFromXInput(haptic, userid);
+            }
+            ++index;
+        }
+    } else {
+        HRESULT idret;
+        DIDEVICEINSTANCE joy_instance;
+
+        joy_instance.dwSize = sizeof(DIDEVICEINSTANCE);
+        idret = IDirectInputDevice8_GetDeviceInfo(joystick->hwdata->InputDevice, &joy_instance);
+        if (FAILED(idret)) {
+            return -1;
+        }
+
+        for (item = SDL_hapticlist; item != NULL; item = item->next) {
+            if (DI_GUIDIsSame(&item->instance.guidInstance, &joy_instance.guidInstance)) {
+                haptic->index = index;
+                return SDL_SYS_HapticOpenFromDevice8(haptic, joystick->hwdata->InputDevice, SDL_TRUE);
+            }
+            ++index;
+        }
+    }
+
+    /* No match to our haptic list */
+    return -1;
+}
+
+
+/*
+ * Closes the haptic device.
+ */
+void
+SDL_SYS_HapticClose(SDL_Haptic * haptic)
+{
+    if (haptic->hwdata) {
+
+        /* Free effects. */
+        SDL_free(haptic->effects);
+        haptic->effects = NULL;
+        haptic->neffects = 0;
+
+        /* Clean up */
+        if (haptic->hwdata->bXInputHaptic) {
+            haptic->hwdata->stopThread = 1;
+            SDL_WaitThread(haptic->hwdata->thread, NULL);
+            SDL_DestroyMutex(haptic->hwdata->mutex);
+        } else {
+            IDirectInputDevice8_Unacquire(haptic->hwdata->device);
+            /* Only release if isn't grabbed by a joystick. */
+            if (haptic->hwdata->is_joystick == 0) {
+                IDirectInputDevice8_Release(haptic->hwdata->device);
+            }
+        }
+
+        /* Free */
+        SDL_free(haptic->hwdata);
+        haptic->hwdata = NULL;
+    }
+}
+
+
+/*
+ * Clean up after system specific haptic stuff
+ */
+void
+SDL_SYS_HapticQuit(void)
+{
+    SDL_hapticlist_item *item;
+    SDL_hapticlist_item *next = NULL;
+    SDL_Haptic *hapticitem = NULL;
+
+    extern SDL_Haptic *SDL_haptics;
+    for (hapticitem = SDL_haptics; hapticitem; hapticitem = hapticitem->next) {
+        if ((hapticitem->hwdata->bXInputHaptic) && (hapticitem->hwdata->thread)) {
+            /* we _have_ to stop the thread before we free the XInput DLL! */
+            hapticitem->hwdata->stopThread = 1;
+            SDL_WaitThread(hapticitem->hwdata->thread, NULL);
+            hapticitem->hwdata->thread = NULL;
+        }
+    }
+
+    for (item = SDL_hapticlist; item; item = next) {
+        /* Opened and not closed haptics are leaked, this is on purpose.
+         * Close your haptic devices after usage. */
+        /* !!! FIXME: (...is leaking on purpose a good idea?) */
+        next = item->next;
+        SDL_free(item->name);
+        SDL_free(item);
+    }
+
+    if (loaded_xinput) {
+        WIN_UnloadXInputDLL();
+        loaded_xinput = SDL_FALSE;
+    }
+
+    if (dinput != NULL) {
+        IDirectInput8_Release(dinput);
+        dinput = NULL;
+    }
+
+    if (coinitialized) {
+        WIN_CoUninitialize();
+        coinitialized = SDL_FALSE;
+    }
+}
+
+
+/*
+ * Converts an SDL trigger button to an DIEFFECT trigger button.
+ */
+static DWORD
+DIGetTriggerButton(Uint16 button)
+{
+    DWORD dwTriggerButton;
+
+    dwTriggerButton = DIEB_NOTRIGGER;
+
+    if (button != 0) {
+        dwTriggerButton = DIJOFS_BUTTON(button - 1);
+    }
+
+    return dwTriggerButton;
+}
+
+
+/*
+ * Sets the direction.
+ */
+static int
+SDL_SYS_SetDirection(DIEFFECT * effect, SDL_HapticDirection * dir, int naxes)
+{
+    LONG *rglDir;
+
+    /* Handle no axes a part. */
+    if (naxes == 0) {
+        effect->dwFlags |= DIEFF_SPHERICAL;     /* Set as default. */
+        effect->rglDirection = NULL;
+        return 0;
+    }
+
+    /* Has axes. */
+    rglDir = SDL_malloc(sizeof(LONG) * naxes);
+    if (rglDir == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(rglDir, 0, sizeof(LONG) * naxes);
+    effect->rglDirection = rglDir;
+
+    switch (dir->type) {
+    case SDL_HAPTIC_POLAR:
+        effect->dwFlags |= DIEFF_POLAR;
+        rglDir[0] = dir->dir[0];
+        return 0;
+    case SDL_HAPTIC_CARTESIAN:
+        effect->dwFlags |= DIEFF_CARTESIAN;
+        rglDir[0] = dir->dir[0];
+        if (naxes > 1)
+            rglDir[1] = dir->dir[1];
+        if (naxes > 2)
+            rglDir[2] = dir->dir[2];
+        return 0;
+    case SDL_HAPTIC_SPHERICAL:
+        effect->dwFlags |= DIEFF_SPHERICAL;
+        rglDir[0] = dir->dir[0];
+        if (naxes > 1)
+            rglDir[1] = dir->dir[1];
+        if (naxes > 2)
+            rglDir[2] = dir->dir[2];
+        return 0;
+
+    default:
+        return SDL_SetError("Haptic: Unknown direction type.");
+    }
+}
+
+#define CONVERT(x)   (((x) > 0x7FFF) ? 10000 : ((x)*10000) / 0x7FFF)
+/*
+ * Creates the DIEFFECT from a SDL_HapticEffect.
+ */
+static int
+SDL_SYS_ToDIEFFECT(SDL_Haptic * haptic, DIEFFECT * dest,
+                   SDL_HapticEffect * src)
+{
+    int i;
+    DICONSTANTFORCE *constant;
+    DIPERIODIC *periodic;
+    DICONDITION *condition;     /* Actually an array of conditions - one per axis. */
+    DIRAMPFORCE *ramp;
+    DICUSTOMFORCE *custom;
+    DIENVELOPE *envelope;
+    SDL_HapticConstant *hap_constant;
+    SDL_HapticPeriodic *hap_periodic;
+    SDL_HapticCondition *hap_condition;
+    SDL_HapticRamp *hap_ramp;
+    SDL_HapticCustom *hap_custom;
+    DWORD *axes;
+
+    /* Set global stuff. */
+    SDL_memset(dest, 0, sizeof(DIEFFECT));
+    dest->dwSize = sizeof(DIEFFECT);    /* Set the structure size. */
+    dest->dwSamplePeriod = 0;   /* Not used by us. */
+    dest->dwGain = 10000;       /* Gain is set globally, not locally. */
+    dest->dwFlags = DIEFF_OBJECTOFFSETS;        /* Seems obligatory. */
+
+    /* Envelope. */
+    envelope = SDL_malloc(sizeof(DIENVELOPE));
+    if (envelope == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(envelope, 0, sizeof(DIENVELOPE));
+    dest->lpEnvelope = envelope;
+    envelope->dwSize = sizeof(DIENVELOPE);      /* Always should be this. */
+
+    /* Axes. */
+    dest->cAxes = haptic->naxes;
+    if (dest->cAxes > 0) {
+        axes = SDL_malloc(sizeof(DWORD) * dest->cAxes);
+        if (axes == NULL) {
+            return SDL_OutOfMemory();
+        }
+        axes[0] = haptic->hwdata->axes[0];      /* Always at least one axis. */
+        if (dest->cAxes > 1) {
+            axes[1] = haptic->hwdata->axes[1];
+        }
+        if (dest->cAxes > 2) {
+            axes[2] = haptic->hwdata->axes[2];
+        }
+        dest->rgdwAxes = axes;
+    }
+
+
+    /* The big type handling switch, even bigger then Linux's version. */
+    switch (src->type) {
+    case SDL_HAPTIC_CONSTANT:
+        hap_constant = &src->constant;
+        constant = SDL_malloc(sizeof(DICONSTANTFORCE));
+        if (constant == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(constant, 0, sizeof(DICONSTANTFORCE));
+
+        /* Specifics */
+        constant->lMagnitude = CONVERT(hap_constant->level);
+        dest->cbTypeSpecificParams = sizeof(DICONSTANTFORCE);
+        dest->lpvTypeSpecificParams = constant;
+
+        /* Generics */
+        dest->dwDuration = hap_constant->length * 1000; /* In microseconds. */
+        dest->dwTriggerButton = DIGetTriggerButton(hap_constant->button);
+        dest->dwTriggerRepeatInterval = hap_constant->interval;
+        dest->dwStartDelay = hap_constant->delay * 1000;        /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_constant->direction, dest->cAxes)
+            < 0) {
+            return -1;
+        }
+
+        /* Envelope */
+        if ((hap_constant->attack_length == 0)
+            && (hap_constant->fade_length == 0)) {
+            SDL_free(dest->lpEnvelope);
+            dest->lpEnvelope = NULL;
+        } else {
+            envelope->dwAttackLevel = CONVERT(hap_constant->attack_level);
+            envelope->dwAttackTime = hap_constant->attack_length * 1000;
+            envelope->dwFadeLevel = CONVERT(hap_constant->fade_level);
+            envelope->dwFadeTime = hap_constant->fade_length * 1000;
+        }
+
+        break;
+
+    case SDL_HAPTIC_SINE:
+    /* !!! FIXME: put this back when we have more bits in 2.1 */
+    /* case SDL_HAPTIC_SQUARE: */
+    case SDL_HAPTIC_TRIANGLE:
+    case SDL_HAPTIC_SAWTOOTHUP:
+    case SDL_HAPTIC_SAWTOOTHDOWN:
+        hap_periodic = &src->periodic;
+        periodic = SDL_malloc(sizeof(DIPERIODIC));
+        if (periodic == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(periodic, 0, sizeof(DIPERIODIC));
+
+        /* Specifics */
+        periodic->dwMagnitude = CONVERT(hap_periodic->magnitude);
+        periodic->lOffset = CONVERT(hap_periodic->offset);
+        periodic->dwPhase = hap_periodic->phase;
+        periodic->dwPeriod = hap_periodic->period * 1000;
+        dest->cbTypeSpecificParams = sizeof(DIPERIODIC);
+        dest->lpvTypeSpecificParams = periodic;
+
+        /* Generics */
+        dest->dwDuration = hap_periodic->length * 1000; /* In microseconds. */
+        dest->dwTriggerButton = DIGetTriggerButton(hap_periodic->button);
+        dest->dwTriggerRepeatInterval = hap_periodic->interval;
+        dest->dwStartDelay = hap_periodic->delay * 1000;        /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_periodic->direction, dest->cAxes)
+            < 0) {
+            return -1;
+        }
+
+        /* Envelope */
+        if ((hap_periodic->attack_length == 0)
+            && (hap_periodic->fade_length == 0)) {
+            SDL_free(dest->lpEnvelope);
+            dest->lpEnvelope = NULL;
+        } else {
+            envelope->dwAttackLevel = CONVERT(hap_periodic->attack_level);
+            envelope->dwAttackTime = hap_periodic->attack_length * 1000;
+            envelope->dwFadeLevel = CONVERT(hap_periodic->fade_level);
+            envelope->dwFadeTime = hap_periodic->fade_length * 1000;
+        }
+
+        break;
+
+    case SDL_HAPTIC_SPRING:
+    case SDL_HAPTIC_DAMPER:
+    case SDL_HAPTIC_INERTIA:
+    case SDL_HAPTIC_FRICTION:
+        hap_condition = &src->condition;
+        condition = SDL_malloc(sizeof(DICONDITION) * dest->cAxes);
+        if (condition == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(condition, 0, sizeof(DICONDITION));
+
+        /* Specifics */
+        for (i = 0; i < (int) dest->cAxes; i++) {
+            condition[i].lOffset = CONVERT(hap_condition->center[i]);
+            condition[i].lPositiveCoefficient =
+                CONVERT(hap_condition->right_coeff[i]);
+            condition[i].lNegativeCoefficient =
+                CONVERT(hap_condition->left_coeff[i]);
+            condition[i].dwPositiveSaturation =
+                CONVERT(hap_condition->right_sat[i]);
+            condition[i].dwNegativeSaturation =
+                CONVERT(hap_condition->left_sat[i]);
+            condition[i].lDeadBand = CONVERT(hap_condition->deadband[i]);
+        }
+        dest->cbTypeSpecificParams = sizeof(DICONDITION) * dest->cAxes;
+        dest->lpvTypeSpecificParams = condition;
+
+        /* Generics */
+        dest->dwDuration = hap_condition->length * 1000;        /* In microseconds. */
+        dest->dwTriggerButton = DIGetTriggerButton(hap_condition->button);
+        dest->dwTriggerRepeatInterval = hap_condition->interval;
+        dest->dwStartDelay = hap_condition->delay * 1000;       /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_condition->direction, dest->cAxes)
+            < 0) {
+            return -1;
+        }
+
+        /* Envelope - Not actually supported by most CONDITION implementations. */
+        SDL_free(dest->lpEnvelope);
+        dest->lpEnvelope = NULL;
+
+        break;
+
+    case SDL_HAPTIC_RAMP:
+        hap_ramp = &src->ramp;
+        ramp = SDL_malloc(sizeof(DIRAMPFORCE));
+        if (ramp == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(ramp, 0, sizeof(DIRAMPFORCE));
+
+        /* Specifics */
+        ramp->lStart = CONVERT(hap_ramp->start);
+        ramp->lEnd = CONVERT(hap_ramp->end);
+        dest->cbTypeSpecificParams = sizeof(DIRAMPFORCE);
+        dest->lpvTypeSpecificParams = ramp;
+
+        /* Generics */
+        dest->dwDuration = hap_ramp->length * 1000;     /* In microseconds. */
+        dest->dwTriggerButton = DIGetTriggerButton(hap_ramp->button);
+        dest->dwTriggerRepeatInterval = hap_ramp->interval;
+        dest->dwStartDelay = hap_ramp->delay * 1000;    /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_ramp->direction, dest->cAxes) < 0) {
+            return -1;
+        }
+
+        /* Envelope */
+        if ((hap_ramp->attack_length == 0) && (hap_ramp->fade_length == 0)) {
+            SDL_free(dest->lpEnvelope);
+            dest->lpEnvelope = NULL;
+        } else {
+            envelope->dwAttackLevel = CONVERT(hap_ramp->attack_level);
+            envelope->dwAttackTime = hap_ramp->attack_length * 1000;
+            envelope->dwFadeLevel = CONVERT(hap_ramp->fade_level);
+            envelope->dwFadeTime = hap_ramp->fade_length * 1000;
+        }
+
+        break;
+
+    case SDL_HAPTIC_CUSTOM:
+        hap_custom = &src->custom;
+        custom = SDL_malloc(sizeof(DICUSTOMFORCE));
+        if (custom == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(custom, 0, sizeof(DICUSTOMFORCE));
+
+        /* Specifics */
+        custom->cChannels = hap_custom->channels;
+        custom->dwSamplePeriod = hap_custom->period * 1000;
+        custom->cSamples = hap_custom->samples;
+        custom->rglForceData =
+            SDL_malloc(sizeof(LONG) * custom->cSamples * custom->cChannels);
+        for (i = 0; i < hap_custom->samples * hap_custom->channels; i++) {      /* Copy data. */
+            custom->rglForceData[i] = CONVERT(hap_custom->data[i]);
+        }
+        dest->cbTypeSpecificParams = sizeof(DICUSTOMFORCE);
+        dest->lpvTypeSpecificParams = custom;
+
+        /* Generics */
+        dest->dwDuration = hap_custom->length * 1000;   /* In microseconds. */
+        dest->dwTriggerButton = DIGetTriggerButton(hap_custom->button);
+        dest->dwTriggerRepeatInterval = hap_custom->interval;
+        dest->dwStartDelay = hap_custom->delay * 1000;  /* In microseconds. */
+
+        /* Direction. */
+        if (SDL_SYS_SetDirection(dest, &hap_custom->direction, dest->cAxes) <
+            0) {
+            return -1;
+        }
+
+        /* Envelope */
+        if ((hap_custom->attack_length == 0)
+            && (hap_custom->fade_length == 0)) {
+            SDL_free(dest->lpEnvelope);
+            dest->lpEnvelope = NULL;
+        } else {
+            envelope->dwAttackLevel = CONVERT(hap_custom->attack_level);
+            envelope->dwAttackTime = hap_custom->attack_length * 1000;
+            envelope->dwFadeLevel = CONVERT(hap_custom->fade_level);
+            envelope->dwFadeTime = hap_custom->fade_length * 1000;
+        }
+
+        break;
+
+
+    default:
+        return SDL_SetError("Haptic: Unknown effect type.");
+    }
+
+    return 0;
+}
+
+
+/*
+ * Frees an DIEFFECT allocated by SDL_SYS_ToDIEFFECT.
+ */
+static void
+SDL_SYS_HapticFreeDIEFFECT(DIEFFECT * effect, int type)
+{
+    DICUSTOMFORCE *custom;
+
+    SDL_free(effect->lpEnvelope);
+    effect->lpEnvelope = NULL;
+    SDL_free(effect->rgdwAxes);
+    effect->rgdwAxes = NULL;
+    if (effect->lpvTypeSpecificParams != NULL) {
+        if (type == SDL_HAPTIC_CUSTOM) {        /* Must free the custom data. */
+            custom = (DICUSTOMFORCE *) effect->lpvTypeSpecificParams;
+            SDL_free(custom->rglForceData);
+            custom->rglForceData = NULL;
+        }
+        SDL_free(effect->lpvTypeSpecificParams);
+        effect->lpvTypeSpecificParams = NULL;
+    }
+    SDL_free(effect->rglDirection);
+    effect->rglDirection = NULL;
+}
+
+
+/*
+ * Gets the effect type from the generic SDL haptic effect wrapper.
+ */
+static REFGUID
+SDL_SYS_HapticEffectType(SDL_HapticEffect * effect)
+{
+    switch (effect->type) {
+    case SDL_HAPTIC_CONSTANT:
+        return &GUID_ConstantForce;
+
+    case SDL_HAPTIC_RAMP:
+        return &GUID_RampForce;
+
+    /* !!! FIXME: put this back when we have more bits in 2.1 */
+    /* case SDL_HAPTIC_SQUARE:
+        return &GUID_Square; */
+
+    case SDL_HAPTIC_SINE:
+        return &GUID_Sine;
+
+    case SDL_HAPTIC_TRIANGLE:
+        return &GUID_Triangle;
+
+    case SDL_HAPTIC_SAWTOOTHUP:
+        return &GUID_SawtoothUp;
+
+    case SDL_HAPTIC_SAWTOOTHDOWN:
+        return &GUID_SawtoothDown;
+
+    case SDL_HAPTIC_SPRING:
+        return &GUID_Spring;
+
+    case SDL_HAPTIC_DAMPER:
+        return &GUID_Damper;
+
+    case SDL_HAPTIC_INERTIA:
+        return &GUID_Inertia;
+
+    case SDL_HAPTIC_FRICTION:
+        return &GUID_Friction;
+
+    case SDL_HAPTIC_CUSTOM:
+        return &GUID_CustomForce;
+
+    default:
+        return NULL;
+    }
+}
+
+
+/*
+ * Creates a new haptic effect.
+ */
+int
+SDL_SYS_HapticNewEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
+                        SDL_HapticEffect * base)
+{
+    HRESULT ret;
+    REFGUID type = SDL_SYS_HapticEffectType(base);
+
+    if ((type == NULL) && (!haptic->hwdata->bXInputHaptic)) {
+        SDL_SetError("Haptic: Unknown effect type.");
+        goto err_hweffect;
+    }
+
+    /* Alloc the effect. */
+    effect->hweffect = (struct haptic_hweffect *)
+        SDL_malloc(sizeof(struct haptic_hweffect));
+    if (effect->hweffect == NULL) {
+        SDL_OutOfMemory();
+        goto err_hweffect;
+    }
+
+    SDL_zerop(effect->hweffect);
+
+    if (haptic->hwdata->bXInputHaptic) {
+        SDL_assert(base->type == SDL_HAPTIC_LEFTRIGHT);  /* should catch this at higher level */
+        return SDL_SYS_HapticUpdateEffect(haptic, effect, base);
+    }
+
+    /* Get the effect. */
+    if (SDL_SYS_ToDIEFFECT(haptic, &effect->hweffect->effect, base) < 0) {
+        goto err_effectdone;
+    }
+
+    /* Create the actual effect. */
+    ret = IDirectInputDevice8_CreateEffect(haptic->hwdata->device, type,
+                                           &effect->hweffect->effect,
+                                           &effect->hweffect->ref, NULL);
+    if (FAILED(ret)) {
+        DI_SetError("Unable to create effect", ret);
+        goto err_effectdone;
+    }
+
+    return 0;
+
+  err_effectdone:
+    SDL_SYS_HapticFreeDIEFFECT(&effect->hweffect->effect, base->type);
+  err_hweffect:
+    SDL_free(effect->hweffect);
+    effect->hweffect = NULL;
+    return -1;
+}
+
+
+/*
+ * Updates an effect.
+ */
+int
+SDL_SYS_HapticUpdateEffect(SDL_Haptic * haptic,
+                           struct haptic_effect *effect,
+                           SDL_HapticEffect * data)
+{
+    HRESULT ret;
+    DWORD flags;
+    DIEFFECT temp;
+
+    if (haptic->hwdata->bXInputHaptic) {
+        XINPUT_VIBRATION *vib = &effect->hweffect->vibration;
+        SDL_assert(data->type == SDL_HAPTIC_LEFTRIGHT);
+        vib->wLeftMotorSpeed = data->leftright.large_magnitude;
+        vib->wRightMotorSpeed = data->leftright.small_magnitude;
+        SDL_LockMutex(haptic->hwdata->mutex);
+        if (haptic->hwdata->stopTicks) {  /* running right now? Update it. */
+            XINPUTSETSTATE(haptic->hwdata->userid, vib);
+        }
+        SDL_UnlockMutex(haptic->hwdata->mutex);
+        return 0;
+    }
+
+    /* Get the effect. */
+    SDL_memset(&temp, 0, sizeof(DIEFFECT));
+    if (SDL_SYS_ToDIEFFECT(haptic, &temp, data) < 0) {
+        goto err_update;
+    }
+
+    /* Set the flags.  Might be worthwhile to diff temp with loaded effect and
+     *  only change those parameters. */
+    flags = DIEP_DIRECTION |
+        DIEP_DURATION |
+        DIEP_ENVELOPE |
+        DIEP_STARTDELAY |
+        DIEP_TRIGGERBUTTON |
+        DIEP_TRIGGERREPEATINTERVAL | DIEP_TYPESPECIFICPARAMS;
+
+    /* Create the actual effect. */
+    ret =
+        IDirectInputEffect_SetParameters(effect->hweffect->ref, &temp, flags);
+    if (FAILED(ret)) {
+        DI_SetError("Unable to update effect", ret);
+        goto err_update;
+    }
+
+    /* Copy it over. */
+    SDL_SYS_HapticFreeDIEFFECT(&effect->hweffect->effect, data->type);
+    SDL_memcpy(&effect->hweffect->effect, &temp, sizeof(DIEFFECT));
+
+    return 0;
+
+  err_update:
+    SDL_SYS_HapticFreeDIEFFECT(&temp, data->type);
+    return -1;
+}
+
+
+/*
+ * Runs an effect.
+ */
+int
+SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
+                        Uint32 iterations)
+{
+    HRESULT ret;
+    DWORD iter;
+
+    if (haptic->hwdata->bXInputHaptic) {
+        XINPUT_VIBRATION *vib = &effect->hweffect->vibration;
+        SDL_assert(effect->effect.type == SDL_HAPTIC_LEFTRIGHT);  /* should catch this at higher level */
+        SDL_LockMutex(haptic->hwdata->mutex);
+        if(effect->effect.leftright.length == SDL_HAPTIC_INFINITY || iterations == SDL_HAPTIC_INFINITY) {
+            haptic->hwdata->stopTicks = SDL_HAPTIC_INFINITY;
+        } else if ((!effect->effect.leftright.length) || (!iterations)) {
+            /* do nothing. Effect runs for zero milliseconds. */
+        } else {
+            haptic->hwdata->stopTicks = SDL_GetTicks() + (effect->effect.leftright.length * iterations);
+            if ((haptic->hwdata->stopTicks == SDL_HAPTIC_INFINITY) || (haptic->hwdata->stopTicks == 0)) {
+                haptic->hwdata->stopTicks = 1;  /* fix edge cases. */
+            }
+        }
+        SDL_UnlockMutex(haptic->hwdata->mutex);
+        return (XINPUTSETSTATE(haptic->hwdata->userid, vib) == ERROR_SUCCESS) ? 0 : -1;
+    }
+
+    /* Check if it's infinite. */
+    if (iterations == SDL_HAPTIC_INFINITY) {
+        iter = INFINITE;
+    } else
+        iter = iterations;
+
+    /* Run the effect. */
+    ret = IDirectInputEffect_Start(effect->hweffect->ref, iter, 0);
+    if (FAILED(ret)) {
+        return DI_SetError("Running the effect", ret);
+    }
+
+    return 0;
+}
+
+
+/*
+ * Stops an effect.
+ */
+int
+SDL_SYS_HapticStopEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    HRESULT ret;
+
+    if (haptic->hwdata->bXInputHaptic) {
+        XINPUT_VIBRATION vibration = { 0, 0 };
+        SDL_LockMutex(haptic->hwdata->mutex);
+        haptic->hwdata->stopTicks = 0;
+        SDL_UnlockMutex(haptic->hwdata->mutex);
+        return (XINPUTSETSTATE(haptic->hwdata->userid, &vibration) == ERROR_SUCCESS) ? 0 : -1;
+    }
+
+    ret = IDirectInputEffect_Stop(effect->hweffect->ref);
+    if (FAILED(ret)) {
+        return DI_SetError("Unable to stop effect", ret);
+    }
+
+    return 0;
+}
+
+
+/*
+ * Frees the effect.
+ */
+void
+SDL_SYS_HapticDestroyEffect(SDL_Haptic * haptic, struct haptic_effect *effect)
+{
+    HRESULT ret;
+
+    if (haptic->hwdata->bXInputHaptic) {
+        SDL_SYS_HapticStopEffect(haptic, effect);
+    } else {
+        ret = IDirectInputEffect_Unload(effect->hweffect->ref);
+        if (FAILED(ret)) {
+            DI_SetError("Removing effect from the device", ret);
+        }
+        SDL_SYS_HapticFreeDIEFFECT(&effect->hweffect->effect,
+                                   effect->effect.type);
+    }
+    SDL_free(effect->hweffect);
+    effect->hweffect = NULL;
+}
+
+
+/*
+ * Gets the status of a haptic effect.
+ */
+int
+SDL_SYS_HapticGetEffectStatus(SDL_Haptic * haptic,
+                              struct haptic_effect *effect)
+{
+    HRESULT ret;
+    DWORD status;
+
+    ret = IDirectInputEffect_GetEffectStatus(effect->hweffect->ref, &status);
+    if (FAILED(ret)) {
+        return DI_SetError("Getting effect status", ret);
+    }
+
+    if (status == 0)
+        return SDL_FALSE;
+    return SDL_TRUE;
+}
+
+
+/*
+ * Sets the gain.
+ */
+int
+SDL_SYS_HapticSetGain(SDL_Haptic * haptic, int gain)
+{
+    HRESULT ret;
+    DIPROPDWORD dipdw;
+
+    /* Create the weird structure thingy. */
+    dipdw.diph.dwSize = sizeof(DIPROPDWORD);
+    dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+    dipdw.diph.dwObj = 0;
+    dipdw.diph.dwHow = DIPH_DEVICE;
+    dipdw.dwData = gain * 100;  /* 0 to 10,000 */
+
+    /* Try to set the autocenter. */
+    ret = IDirectInputDevice8_SetProperty(haptic->hwdata->device,
+                                          DIPROP_FFGAIN, &dipdw.diph);
+    if (FAILED(ret)) {
+        return DI_SetError("Setting gain", ret);
+    }
+
+    return 0;
+}
+
+
+/*
+ * Sets the autocentering.
+ */
+int
+SDL_SYS_HapticSetAutocenter(SDL_Haptic * haptic, int autocenter)
+{
+    HRESULT ret;
+    DIPROPDWORD dipdw;
+
+    /* Create the weird structure thingy. */
+    dipdw.diph.dwSize = sizeof(DIPROPDWORD);
+    dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+    dipdw.diph.dwObj = 0;
+    dipdw.diph.dwHow = DIPH_DEVICE;
+    dipdw.dwData = (autocenter == 0) ? DIPROPAUTOCENTER_OFF :
+        DIPROPAUTOCENTER_ON;
+
+    /* Try to set the autocenter. */
+    ret = IDirectInputDevice8_SetProperty(haptic->hwdata->device,
+                                          DIPROP_AUTOCENTER, &dipdw.diph);
+    if (FAILED(ret)) {
+        return DI_SetError("Setting autocenter", ret);
+    }
+
+    return 0;
+}
+
+
+/*
+ * Pauses the device.
+ */
+int
+SDL_SYS_HapticPause(SDL_Haptic * haptic)
+{
+    HRESULT ret;
+
+    /* Pause the device. */
+    ret = IDirectInputDevice8_SendForceFeedbackCommand(haptic->hwdata->device,
+                                                       DISFFC_PAUSE);
+    if (FAILED(ret)) {
+        return DI_SetError("Pausing the device", ret);
+    }
+
+    return 0;
+}
+
+
+/*
+ * Pauses the device.
+ */
+int
+SDL_SYS_HapticUnpause(SDL_Haptic * haptic)
+{
+    HRESULT ret;
+
+    /* Unpause the device. */
+    ret = IDirectInputDevice8_SendForceFeedbackCommand(haptic->hwdata->device,
+                                                       DISFFC_CONTINUE);
+    if (FAILED(ret)) {
+        return DI_SetError("Pausing the device", ret);
+    }
+
+    return 0;
+}
+
+
+/*
+ * Stops all the playing effects on the device.
+ */
+int
+SDL_SYS_HapticStopAll(SDL_Haptic * haptic)
+{
+    HRESULT ret;
+
+    if (haptic->hwdata->bXInputHaptic) {
+        XINPUT_VIBRATION vibration = { 0, 0 };
+        SDL_LockMutex(haptic->hwdata->mutex);
+        haptic->hwdata->stopTicks = 0;
+        SDL_UnlockMutex(haptic->hwdata->mutex);
+        return (XINPUTSETSTATE(haptic->hwdata->userid, &vibration) == ERROR_SUCCESS) ? 0 : -1;
+    }
+
+    /* Try to stop the effects. */
+    ret = IDirectInputDevice8_SendForceFeedbackCommand(haptic->hwdata->device,
+                                                       DISFFC_STOPALL);
+    if (FAILED(ret)) {
+        return DI_SetError("Stopping the device", ret);
+    }
+
+    return 0;
+}
+
+
+/* !!! FIXME: this is a hack, remove this later. */
+/* Since XInput doesn't offer a way to vibrate for X time, we hook into
+ *  SDL_PumpEvents() to check if it's time to stop vibrating with some
+ *  frequency.
+ * In practice, this works for 99% of use cases. But in an ideal world,
+ *  we do this in a separate thread so that:
+ *    - we aren't bound to when the app chooses to pump the event queue.
+ *    - we aren't adding more polling to the event queue
+ *    - we can emulate all the haptic effects correctly (start on a delay,
+ *      mix multiple effects, etc).
+ *
+ * Mostly, this is here to get rumbling to work, and all the other features
+ *  are absent in the XInput path for now.  :(
+ */
+static int SDLCALL
+SDL_RunXInputHaptic(void *arg)
+{
+    struct haptic_hwdata *hwdata = (struct haptic_hwdata *) arg;
+
+    while (!hwdata->stopThread) {
+        SDL_Delay(50);
+        SDL_LockMutex(hwdata->mutex);
+        /* If we're currently running and need to stop... */
+        if (hwdata->stopTicks) {
+            if ((hwdata->stopTicks != SDL_HAPTIC_INFINITY) && SDL_TICKS_PASSED(SDL_GetTicks(), hwdata->stopTicks)) {
+                XINPUT_VIBRATION vibration = { 0, 0 };
+                hwdata->stopTicks = 0;
+                XINPUTSETSTATE(hwdata->userid, &vibration);
+            }
+        }
+        SDL_UnlockMutex(hwdata->mutex);
+    }
+
+    return 0;
+}
+
+#endif /* SDL_HAPTIC_DINPUT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/haptic/windows/SDL_syshaptic_c.h b/Source/3rd Party/sdl/src/haptic/windows/SDL_syshaptic_c.h
new file mode 100644
index 000000000..1e0fa190d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/haptic/windows/SDL_syshaptic_c.h	
@@ -0,0 +1,28 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+extern int DirectInputHaptic_MaybeAddDevice(const DIDEVICEINSTANCE *pdidInstance);
+extern int DirectInputHaptic_MaybeRemoveDevice(const DIDEVICEINSTANCE *pdidInstance);
+extern int XInputHaptic_MaybeAddDevice(const DWORD dwUserid);
+extern int XInputHaptic_MaybeRemoveDevice(const DWORD dwUserid);
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/joystick/SDL_gamecontroller.c b/Source/3rd Party/sdl/src/joystick/SDL_gamecontroller.c
new file mode 100644
index 000000000..8361b29fb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/SDL_gamecontroller.c	
@@ -0,0 +1,1333 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This is the game controller API for Simple DirectMedia Layer */
+
+#include "SDL_events.h"
+#include "SDL_assert.h"
+#include "SDL_sysjoystick.h"
+#include "SDL_hints.h"
+#include "SDL_gamecontrollerdb.h"
+
+#if !SDL_EVENTS_DISABLED
+#include "../events/SDL_events_c.h"
+#endif
+#define ABS(_x) ((_x) < 0 ? -(_x) : (_x))
+
+#define SDL_CONTROLLER_PLATFORM_FIELD "platform:"
+
+/* a list of currently opened game controllers */
+static SDL_GameController *SDL_gamecontrollers = NULL;
+
+/* keep track of the hat and mask value that transforms this hat movement into a button/axis press */
+struct _SDL_HatMapping
+{
+    int hat;
+    Uint8 mask;
+};
+
+#define k_nMaxReverseEntries 20
+
+/**
+ * We are encoding the "HAT" as 0xhm. where h == hat ID and m == mask
+ * MAX 4 hats supported
+ */
+#define k_nMaxHatEntries 0x3f + 1
+
+/* our in memory mapping db between joystick objects and controller mappings */
+struct _SDL_ControllerMapping
+{
+    SDL_JoystickGUID guid;
+    const char *name;
+
+    /* mapping of axis/button id to controller version */
+    int axes[SDL_CONTROLLER_AXIS_MAX];
+    int buttonasaxis[SDL_CONTROLLER_AXIS_MAX];
+
+    int buttons[SDL_CONTROLLER_BUTTON_MAX];
+    int axesasbutton[SDL_CONTROLLER_BUTTON_MAX];
+    struct _SDL_HatMapping hatasbutton[SDL_CONTROLLER_BUTTON_MAX];
+
+    /* reverse mapping, joystick indices to buttons */
+    SDL_GameControllerAxis raxes[k_nMaxReverseEntries];
+    SDL_GameControllerAxis rbuttonasaxis[k_nMaxReverseEntries];
+
+    SDL_GameControllerButton rbuttons[k_nMaxReverseEntries];
+    SDL_GameControllerButton raxesasbutton[k_nMaxReverseEntries];
+    SDL_GameControllerButton rhatasbutton[k_nMaxHatEntries];
+
+};
+
+
+/* our hard coded list of mapping support */
+typedef struct _ControllerMapping_t
+{
+    SDL_JoystickGUID guid;
+    char *name;
+    char *mapping;
+    struct _ControllerMapping_t *next;
+} ControllerMapping_t;
+
+static ControllerMapping_t *s_pSupportedControllers = NULL;
+#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT)
+static ControllerMapping_t *s_pXInputMapping = NULL;
+#endif
+
+/* The SDL game controller structure */
+struct _SDL_GameController
+{
+    SDL_Joystick *joystick; /* underlying joystick device */
+    int ref_count;
+    Uint8 hatState[4]; /* the current hat state for this controller */
+    struct _SDL_ControllerMapping mapping; /* the mapping object for this controller */
+    struct _SDL_GameController *next; /* pointer to next game controller we have allocated */
+};
+
+
+int SDL_PrivateGameControllerAxis(SDL_GameController * gamecontroller, SDL_GameControllerAxis axis, Sint16 value);
+int SDL_PrivateGameControllerButton(SDL_GameController * gamecontroller, SDL_GameControllerButton button, Uint8 state);
+
+/*
+ * Event filter to fire controller events from joystick ones
+ */
+int SDL_GameControllerEventWatcher(void *userdata, SDL_Event * event)
+{
+    switch( event->type )
+    {
+    case SDL_JOYAXISMOTION:
+        {
+            SDL_GameController *controllerlist;
+
+            if ( event->jaxis.axis >= k_nMaxReverseEntries ) break;
+
+            controllerlist = SDL_gamecontrollers;
+            while ( controllerlist )
+            {
+                if ( controllerlist->joystick->instance_id == event->jaxis.which )
+                {
+                    if ( controllerlist->mapping.raxes[event->jaxis.axis] >= 0 ) /* simple axis to axis, send it through */
+                    {
+                        SDL_GameControllerAxis axis = controllerlist->mapping.raxes[event->jaxis.axis];
+                        Sint16 value = event->jaxis.value;
+                        switch (axis)
+                        {
+                            case SDL_CONTROLLER_AXIS_TRIGGERLEFT:
+                            case SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
+                                /* Shift it to be 0 - 32767. */
+                                value = value / 2 + 16384;
+                            default:
+                                break;
+                        }
+                        SDL_PrivateGameControllerAxis( controllerlist, axis, value );
+                    }
+                    else if ( controllerlist->mapping.raxesasbutton[event->jaxis.axis] >= 0 ) /* simulate an axis as a button */
+                    {
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.raxesasbutton[event->jaxis.axis], ABS(event->jaxis.value) > 32768/2 ? SDL_PRESSED : SDL_RELEASED );
+                    }
+                    break;
+                }
+                controllerlist = controllerlist->next;
+            }
+        }
+        break;
+    case SDL_JOYBUTTONDOWN:
+    case SDL_JOYBUTTONUP:
+        {
+            SDL_GameController *controllerlist;
+
+            if ( event->jbutton.button >= k_nMaxReverseEntries ) break;
+
+            controllerlist = SDL_gamecontrollers;
+            while ( controllerlist )
+            {
+                if ( controllerlist->joystick->instance_id == event->jbutton.which )
+                {
+                    if ( controllerlist->mapping.rbuttons[event->jbutton.button] >= 0 ) /* simple button as button */
+                    {
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.rbuttons[event->jbutton.button], event->jbutton.state );
+                    }
+                    else if ( controllerlist->mapping.rbuttonasaxis[event->jbutton.button] >= 0 ) /* an button pretending to be an axis */
+                    {
+                        SDL_PrivateGameControllerAxis( controllerlist, controllerlist->mapping.rbuttonasaxis[event->jbutton.button], event->jbutton.state > 0 ? 32767 : 0 );
+                    }
+                    break;
+                }
+                controllerlist = controllerlist->next;
+            }
+        }
+        break;
+    case SDL_JOYHATMOTION:
+        {
+            SDL_GameController *controllerlist;
+
+            if ( event->jhat.hat >= 4 ) break;
+
+            controllerlist = SDL_gamecontrollers;
+            while ( controllerlist )
+            {
+                if ( controllerlist->joystick->instance_id == event->jhat.which )
+                {
+                    Uint8 bSame = controllerlist->hatState[event->jhat.hat] & event->jhat.value;
+                    /* Get list of removed bits (button release) */
+                    Uint8 bChanged = controllerlist->hatState[event->jhat.hat] ^ bSame;
+                    /* the hat idx in the high nibble */
+                    int bHighHat = event->jhat.hat << 4;
+
+                    if ( bChanged & SDL_HAT_DOWN )
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.rhatasbutton[bHighHat | SDL_HAT_DOWN], SDL_RELEASED );
+                    if ( bChanged & SDL_HAT_UP )
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.rhatasbutton[bHighHat | SDL_HAT_UP], SDL_RELEASED );
+                    if ( bChanged & SDL_HAT_LEFT )
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.rhatasbutton[bHighHat | SDL_HAT_LEFT], SDL_RELEASED );
+                    if ( bChanged & SDL_HAT_RIGHT )
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.rhatasbutton[bHighHat | SDL_HAT_RIGHT], SDL_RELEASED );
+
+                    /* Get list of added bits (button press) */
+                    bChanged = event->jhat.value ^ bSame;
+
+                    if ( bChanged & SDL_HAT_DOWN )
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.rhatasbutton[bHighHat | SDL_HAT_DOWN], SDL_PRESSED );
+                    if ( bChanged & SDL_HAT_UP )
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.rhatasbutton[bHighHat | SDL_HAT_UP], SDL_PRESSED );
+                    if ( bChanged & SDL_HAT_LEFT )
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.rhatasbutton[bHighHat | SDL_HAT_LEFT], SDL_PRESSED );
+                    if ( bChanged & SDL_HAT_RIGHT )
+                        SDL_PrivateGameControllerButton( controllerlist, controllerlist->mapping.rhatasbutton[bHighHat | SDL_HAT_RIGHT], SDL_PRESSED );
+
+                    /* update our state cache */
+                    controllerlist->hatState[event->jhat.hat] = event->jhat.value;
+
+                    break;
+                }
+                controllerlist = controllerlist->next;
+            }
+        }
+        break;
+    case SDL_JOYDEVICEADDED:
+        {
+            if ( SDL_IsGameController(event->jdevice.which ) )
+            {
+                SDL_Event deviceevent;
+                deviceevent.type = SDL_CONTROLLERDEVICEADDED;
+                deviceevent.cdevice.which = event->jdevice.which;
+                SDL_PushEvent(&deviceevent);
+            }
+        }
+        break;
+    case SDL_JOYDEVICEREMOVED:
+        {
+            SDL_GameController *controllerlist = SDL_gamecontrollers;
+            while ( controllerlist )
+            {
+                if ( controllerlist->joystick->instance_id == event->jdevice.which )
+                {
+                    SDL_Event deviceevent;
+                    deviceevent.type = SDL_CONTROLLERDEVICEREMOVED;
+                    deviceevent.cdevice.which = event->jdevice.which;
+                    SDL_PushEvent(&deviceevent);
+                    break;
+                }
+                controllerlist = controllerlist->next;
+            }
+        }
+        break;
+    default:
+        break;
+    }
+
+    return 1;
+}
+
+/*
+ * Helper function to scan the mappings database for a controller with the specified GUID
+ */
+ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickGUID *guid)
+{
+    ControllerMapping_t *pSupportedController = s_pSupportedControllers;
+    while ( pSupportedController )
+    {
+        if ( !SDL_memcmp( guid, &pSupportedController->guid, sizeof(*guid) ) )
+        {
+            return pSupportedController;
+        }
+        pSupportedController = pSupportedController->next;
+    }
+    return NULL;
+}
+
+/*
+ * Helper function to determine pre-calculated offset to certain joystick mappings
+ */
+ControllerMapping_t *SDL_PrivateGetControllerMapping(int device_index)
+{
+#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT)
+    if ( SDL_SYS_IsXInputDeviceIndex(device_index) && s_pXInputMapping )
+    {
+        return s_pXInputMapping;
+    }
+    else
+#endif
+    {
+        SDL_JoystickGUID jGUID = SDL_JoystickGetDeviceGUID( device_index );
+        return SDL_PrivateGetControllerMappingForGUID(&jGUID);
+    }
+}
+
+static const char* map_StringForControllerAxis[] = {
+    "leftx",
+    "lefty",
+    "rightx",
+    "righty",
+    "lefttrigger",
+    "righttrigger",
+    NULL
+};
+
+/*
+ * convert a string to its enum equivalent
+ */
+SDL_GameControllerAxis SDL_GameControllerGetAxisFromString( const char *pchString )
+{
+    int entry;
+    if ( !pchString || !pchString[0] )
+        return SDL_CONTROLLER_AXIS_INVALID;
+
+    for ( entry = 0; map_StringForControllerAxis[entry]; ++entry)
+    {
+        if ( !SDL_strcasecmp( pchString, map_StringForControllerAxis[entry] ) )
+            return entry;
+    }
+    return SDL_CONTROLLER_AXIS_INVALID;
+}
+
+/*
+ * convert an enum to its string equivalent
+ */
+const char* SDL_GameControllerGetStringForAxis( SDL_GameControllerAxis axis )
+{
+    if (axis > SDL_CONTROLLER_AXIS_INVALID && axis < SDL_CONTROLLER_AXIS_MAX)
+    {
+        return map_StringForControllerAxis[axis];
+    }
+    return NULL;
+}
+
+static const char* map_StringForControllerButton[] = {
+    "a",
+    "b",
+    "x",
+    "y",
+    "back",
+    "guide",
+    "start",
+    "leftstick",
+    "rightstick",
+    "leftshoulder",
+    "rightshoulder",
+    "dpup",
+    "dpdown",
+    "dpleft",
+    "dpright",
+    NULL
+};
+
+/*
+ * convert a string to its enum equivalent
+ */
+SDL_GameControllerButton SDL_GameControllerGetButtonFromString( const char *pchString )
+{
+    int entry;
+    if ( !pchString || !pchString[0] )
+        return SDL_CONTROLLER_BUTTON_INVALID;
+
+    for ( entry = 0; map_StringForControllerButton[entry]; ++entry)
+    {
+        if ( !SDL_strcasecmp( pchString, map_StringForControllerButton[entry] ) )
+        return entry;
+    }
+    return SDL_CONTROLLER_BUTTON_INVALID;
+}
+
+/*
+ * convert an enum to its string equivalent
+ */
+const char* SDL_GameControllerGetStringForButton( SDL_GameControllerButton axis )
+{
+    if (axis > SDL_CONTROLLER_BUTTON_INVALID && axis < SDL_CONTROLLER_BUTTON_MAX)
+    {
+        return map_StringForControllerButton[axis];
+    }
+    return NULL;
+}
+
+/*
+ * given a controller button name and a joystick name update our mapping structure with it
+ */
+void SDL_PrivateGameControllerParseButton( const char *szGameButton, const char *szJoystickButton, struct _SDL_ControllerMapping *pMapping )
+{
+    int iSDLButton = 0;
+    SDL_GameControllerButton button;
+    SDL_GameControllerAxis axis;
+    button = SDL_GameControllerGetButtonFromString( szGameButton );
+    axis = SDL_GameControllerGetAxisFromString( szGameButton );
+    iSDLButton = SDL_atoi( &szJoystickButton[1] );
+
+    if ( szJoystickButton[0] == 'a' )
+    {
+        if ( iSDLButton >= k_nMaxReverseEntries )
+        {
+            SDL_SetError("Axis index too large: %d", iSDLButton );
+            return;
+        }
+        if ( axis != SDL_CONTROLLER_AXIS_INVALID )
+        {
+            pMapping->axes[ axis ] = iSDLButton;
+            pMapping->raxes[ iSDLButton ] = axis;
+        }
+        else if ( button != SDL_CONTROLLER_BUTTON_INVALID )
+        {
+            pMapping->axesasbutton[ button ] = iSDLButton;
+            pMapping->raxesasbutton[ iSDLButton ] = button;
+        }
+        else
+        {
+            SDL_assert( !"How did we get here?" );
+        }
+
+    }
+    else if ( szJoystickButton[0] == 'b' )
+    {
+        if ( iSDLButton >= k_nMaxReverseEntries )
+        {
+            SDL_SetError("Button index too large: %d", iSDLButton );
+            return;
+        }
+        if ( button != SDL_CONTROLLER_BUTTON_INVALID )
+        {
+            pMapping->buttons[ button ] = iSDLButton;
+            pMapping->rbuttons[ iSDLButton ] = button;
+        }
+        else if ( axis != SDL_CONTROLLER_AXIS_INVALID )
+        {
+            pMapping->buttonasaxis[ axis ] = iSDLButton;
+            pMapping->rbuttonasaxis[ iSDLButton ] = axis;
+        }
+        else
+        {
+            SDL_assert( !"How did we get here?" );
+        }
+    }
+    else if ( szJoystickButton[0] == 'h' )
+    {
+        int hat = SDL_atoi( &szJoystickButton[1] );
+        int mask = SDL_atoi( &szJoystickButton[3] );
+        if (hat >= 4) {
+            SDL_SetError("Hat index too large: %d", iSDLButton );
+        }
+
+        if ( button != SDL_CONTROLLER_BUTTON_INVALID )
+        {
+            int ridx;
+            pMapping->hatasbutton[ button ].hat = hat;
+            pMapping->hatasbutton[ button ].mask = mask;
+            ridx = (hat << 4) | mask;
+            pMapping->rhatasbutton[ ridx ] = button;
+        }
+        else if ( axis != SDL_CONTROLLER_AXIS_INVALID )
+        {
+            SDL_assert( !"Support hat as axis" );
+        }
+        else
+        {
+            SDL_assert( !"How did we get here?" );
+        }
+    }
+}
+
+
+/*
+ * given a controller mapping string update our mapping object
+ */
+static void
+SDL_PrivateGameControllerParseControllerConfigString( struct _SDL_ControllerMapping *pMapping, const char *pchString )
+{
+    char szGameButton[20];
+    char szJoystickButton[20];
+    SDL_bool bGameButton = SDL_TRUE;
+    int i = 0;
+    const char *pchPos = pchString;
+
+    SDL_memset( szGameButton, 0x0, sizeof(szGameButton) );
+    SDL_memset( szJoystickButton, 0x0, sizeof(szJoystickButton) );
+
+    while ( pchPos && *pchPos )
+    {
+        if ( *pchPos == ':' )
+        {
+            i = 0;
+            bGameButton = SDL_FALSE;
+        }
+        else if ( *pchPos == ' ' )
+        {
+
+        }
+        else if ( *pchPos == ',' )
+        {
+            i = 0;
+            bGameButton = SDL_TRUE;
+            SDL_PrivateGameControllerParseButton( szGameButton, szJoystickButton, pMapping );
+            SDL_memset( szGameButton, 0x0, sizeof(szGameButton) );
+            SDL_memset( szJoystickButton, 0x0, sizeof(szJoystickButton) );
+
+        }
+        else if ( bGameButton )
+        {
+            if ( i >=  sizeof(szGameButton))
+            {
+                SDL_SetError( "Button name too large: %s", szGameButton );
+                return;
+            }
+            szGameButton[i] = *pchPos;
+            i++;
+        }
+        else
+        {
+            if ( i >=  sizeof(szJoystickButton))
+            {
+                SDL_SetError( "Joystick button name too large: %s", szJoystickButton );
+                return;
+            }
+            szJoystickButton[i] = *pchPos;
+            i++;
+        }
+        pchPos++;
+    }
+
+    SDL_PrivateGameControllerParseButton( szGameButton, szJoystickButton, pMapping );
+
+}
+
+/*
+ * Make a new button mapping struct
+ */
+void SDL_PrivateLoadButtonMapping( struct _SDL_ControllerMapping *pMapping, SDL_JoystickGUID guid, const char *pchName, const char *pchMapping )
+{
+    int j;
+
+    pMapping->guid = guid;
+    pMapping->name = pchName;
+
+    /* set all the button mappings to non defaults */
+    for ( j = 0; j < SDL_CONTROLLER_AXIS_MAX; j++ )
+    {
+        pMapping->axes[j] = -1;
+        pMapping->buttonasaxis[j] = -1;
+    }
+    for ( j = 0; j < SDL_CONTROLLER_BUTTON_MAX; j++ )
+    {
+        pMapping->buttons[j] = -1;
+        pMapping->axesasbutton[j] = -1;
+        pMapping->hatasbutton[j].hat = -1;
+    }
+
+    for ( j = 0; j < k_nMaxReverseEntries; j++ )
+    {
+        pMapping->raxes[j] = SDL_CONTROLLER_AXIS_INVALID;
+        pMapping->rbuttonasaxis[j] = SDL_CONTROLLER_AXIS_INVALID;
+        pMapping->rbuttons[j] = SDL_CONTROLLER_BUTTON_INVALID;
+        pMapping->raxesasbutton[j] = SDL_CONTROLLER_BUTTON_INVALID;
+    }
+
+    for (j = 0; j < k_nMaxHatEntries; j++)
+    {
+        pMapping->rhatasbutton[j] = SDL_CONTROLLER_BUTTON_INVALID;
+    }
+
+    SDL_PrivateGameControllerParseControllerConfigString( pMapping, pchMapping );
+}
+
+
+/*
+ * grab the guid string from a mapping string
+ */
+char *SDL_PrivateGetControllerGUIDFromMappingString( const char *pMapping )
+{
+    const char *pFirstComma = SDL_strchr( pMapping, ',' );
+    if ( pFirstComma )
+    {
+        char *pchGUID = SDL_malloc( pFirstComma - pMapping + 1 );
+        if ( !pchGUID )
+        {
+            SDL_OutOfMemory();
+            return NULL;
+        }
+        SDL_memcpy( pchGUID, pMapping, pFirstComma - pMapping );
+        pchGUID[ pFirstComma - pMapping ] = 0;
+        return pchGUID;
+    }
+    return NULL;
+}
+
+
+/*
+ * grab the name string from a mapping string
+ */
+char *SDL_PrivateGetControllerNameFromMappingString( const char *pMapping )
+{
+    const char *pFirstComma, *pSecondComma;
+    char *pchName;
+
+    pFirstComma = SDL_strchr( pMapping, ',' );
+    if ( !pFirstComma )
+        return NULL;
+
+    pSecondComma = SDL_strchr( pFirstComma + 1, ',' );
+    if ( !pSecondComma )
+        return NULL;
+
+    pchName = SDL_malloc( pSecondComma - pFirstComma );
+    if ( !pchName )
+    {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    SDL_memcpy( pchName, pFirstComma + 1, pSecondComma - pFirstComma );
+    pchName[ pSecondComma - pFirstComma - 1 ] = 0;
+    return pchName;
+}
+
+
+/*
+ * grab the button mapping string from a mapping string
+ */
+char *SDL_PrivateGetControllerMappingFromMappingString( const char *pMapping )
+{
+    const char *pFirstComma, *pSecondComma;
+
+    pFirstComma = SDL_strchr( pMapping, ',' );
+    if ( !pFirstComma )
+        return NULL;
+
+    pSecondComma = SDL_strchr( pFirstComma + 1, ',' );
+    if ( !pSecondComma )
+        return NULL;
+
+    return SDL_strdup(pSecondComma + 1); /* mapping is everything after the 3rd comma */
+}
+
+void SDL_PrivateGameControllerRefreshMapping( ControllerMapping_t *pControllerMapping )
+{
+    SDL_GameController *gamecontrollerlist = SDL_gamecontrollers;
+    while ( gamecontrollerlist )
+    {
+        if ( !SDL_memcmp( &gamecontrollerlist->mapping.guid, &pControllerMapping->guid, sizeof(pControllerMapping->guid) ) )
+        {
+            SDL_Event event;
+            event.type = SDL_CONTROLLERDEVICEREMAPPED;
+            event.cdevice.which = gamecontrollerlist->joystick->instance_id;
+            SDL_PushEvent(&event);
+
+            /* Not really threadsafe.  Should this lock access within SDL_GameControllerEventWatcher? */
+            SDL_PrivateLoadButtonMapping(&gamecontrollerlist->mapping, pControllerMapping->guid, pControllerMapping->name, pControllerMapping->mapping);
+        }
+
+        gamecontrollerlist = gamecontrollerlist->next;
+    }
+}
+
+/*
+ * Add or update an entry into the Mappings Database
+ */
+int
+SDL_GameControllerAddMappingsFromRW( SDL_RWops * rw, int freerw )
+{
+    const char *platform = SDL_GetPlatform();
+    int controllers = 0;
+    char *buf, *line, *line_end, *tmp, *comma, line_platform[64];
+    size_t db_size, platform_len;
+    
+    if (rw == NULL) {
+        return SDL_SetError("Invalid RWops");
+    }
+    db_size = (size_t)SDL_RWsize(rw);
+    
+    buf = (char *)SDL_malloc(db_size + 1);
+    if (buf == NULL) {
+        if (freerw) {
+            SDL_RWclose(rw);
+        }
+        return SDL_SetError("Could allocate space to not read DB into memory");
+    }
+    
+    if (SDL_RWread(rw, buf, db_size, 1) != 1) {
+        if (freerw) {
+            SDL_RWclose(rw);
+        }
+        SDL_free(buf);
+        return SDL_SetError("Could not read DB");
+    }
+    
+    if (freerw) {
+        SDL_RWclose(rw);
+    }
+    
+    buf[db_size] = '\0';
+    line = buf;
+    
+    while (line < buf + db_size) {
+        line_end = SDL_strchr( line, '\n' );
+        if (line_end != NULL) {
+            *line_end = '\0';
+        }
+        else {
+            line_end = buf + db_size;
+        }
+        
+        /* Extract and verify the platform */
+        tmp = SDL_strstr(line, SDL_CONTROLLER_PLATFORM_FIELD);
+        if ( tmp != NULL ) {
+            tmp += SDL_strlen(SDL_CONTROLLER_PLATFORM_FIELD);
+            comma = SDL_strchr(tmp, ',');
+            if (comma != NULL) {
+                platform_len = comma - tmp + 1;
+                if (platform_len + 1 < SDL_arraysize(line_platform)) {
+                    SDL_strlcpy(line_platform, tmp, platform_len);
+                    if(SDL_strncasecmp(line_platform, platform, platform_len) == 0
+                        && SDL_GameControllerAddMapping(line) > 0) {
+                        controllers++;
+                    }
+                }
+            }
+        }
+        
+        line = line_end + 1;
+    }
+
+    SDL_free(buf);
+    return controllers;
+}
+
+/*
+ * Add or update an entry into the Mappings Database
+ */
+int
+SDL_GameControllerAddMapping( const char *mappingString )
+{
+    char *pchGUID;
+    char *pchName;
+    char *pchMapping;
+    SDL_JoystickGUID jGUID;
+    ControllerMapping_t *pControllerMapping;
+#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT)
+    SDL_bool is_xinput_mapping = SDL_FALSE;
+#endif
+
+    pchGUID = SDL_PrivateGetControllerGUIDFromMappingString( mappingString );
+    if (!pchGUID) {
+        return SDL_SetError("Couldn't parse GUID from %s", mappingString);
+    }
+#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT)
+    if ( !SDL_strcasecmp( pchGUID, "xinput" ) ) {
+        is_xinput_mapping = SDL_TRUE;
+    }
+#endif
+    jGUID = SDL_JoystickGetGUIDFromString(pchGUID);
+    SDL_free(pchGUID);
+
+    pchName = SDL_PrivateGetControllerNameFromMappingString( mappingString );
+    if (!pchName) {
+        return SDL_SetError("Couldn't parse name from %s", mappingString);
+    }
+
+    pchMapping = SDL_PrivateGetControllerMappingFromMappingString( mappingString );
+    if (!pchMapping) {
+        SDL_free( pchName );
+        return SDL_SetError("Couldn't parse %s", mappingString);
+    }
+
+    pControllerMapping = SDL_PrivateGetControllerMappingForGUID(&jGUID);
+
+    if (pControllerMapping) {
+        /* Update existing mapping */
+        SDL_free( pControllerMapping->name );
+        pControllerMapping->name = pchName;
+        SDL_free( pControllerMapping->mapping );
+        pControllerMapping->mapping = pchMapping;
+        /* refresh open controllers */
+        SDL_PrivateGameControllerRefreshMapping( pControllerMapping );
+        return 0;
+    } else {
+        pControllerMapping = SDL_malloc( sizeof(*pControllerMapping) );
+        if (!pControllerMapping) {
+            SDL_free( pchName );
+            SDL_free( pchMapping );
+            return SDL_OutOfMemory();
+        }
+#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT)
+        if ( is_xinput_mapping )
+        {
+            s_pXInputMapping = pControllerMapping;
+        }
+#endif
+        pControllerMapping->guid = jGUID;
+        pControllerMapping->name = pchName;
+        pControllerMapping->mapping = pchMapping;
+        pControllerMapping->next = s_pSupportedControllers;
+        s_pSupportedControllers = pControllerMapping;
+        return 1;
+    }
+}
+
+/*
+ * Get the mapping string for this GUID
+ */
+char *
+SDL_GameControllerMappingForGUID( SDL_JoystickGUID guid )
+{
+    char *pMappingString = NULL;
+    ControllerMapping_t *mapping = SDL_PrivateGetControllerMappingForGUID(&guid);
+    if (mapping) {
+        char pchGUID[33];
+        size_t needed;
+        SDL_JoystickGetGUIDString(guid, pchGUID, sizeof(pchGUID));
+        /* allocate enough memory for GUID + ',' + name + ',' + mapping + \0 */
+        needed = SDL_strlen(pchGUID) + 1 + SDL_strlen(mapping->name) + 1 + SDL_strlen(mapping->mapping) + 1;
+        pMappingString = SDL_malloc( needed );
+        SDL_snprintf( pMappingString, needed, "%s,%s,%s", pchGUID, mapping->name, mapping->mapping );
+    }
+    return pMappingString;
+}
+
+/*
+ * Get the mapping string for this device
+ */
+char *
+SDL_GameControllerMapping( SDL_GameController * gamecontroller )
+{
+    return SDL_GameControllerMappingForGUID( gamecontroller->mapping.guid );
+}
+
+static void
+SDL_GameControllerLoadHints()
+{
+    const char *hint = SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG);
+    if ( hint && hint[0] ) {
+        size_t nchHints = SDL_strlen( hint );
+        char *pUserMappings = SDL_malloc( nchHints + 1 );
+        char *pTempMappings = pUserMappings;
+        SDL_memcpy( pUserMappings, hint, nchHints );
+        pUserMappings[nchHints] = '\0';
+        while ( pUserMappings ) {
+            char *pchNewLine = NULL;
+
+            pchNewLine = SDL_strchr( pUserMappings, '\n' );
+            if ( pchNewLine )
+                *pchNewLine = '\0';
+
+            SDL_GameControllerAddMapping( pUserMappings );
+
+            if ( pchNewLine )
+                pUserMappings = pchNewLine + 1;
+            else
+                pUserMappings = NULL;
+        }
+        SDL_free(pTempMappings);
+    }
+}
+
+/*
+ * Initialize the game controller system, mostly load our DB of controller config mappings
+ */
+int
+SDL_GameControllerInit(void)
+{
+    int i = 0;
+    const char *pMappingString = NULL;
+    s_pSupportedControllers = NULL;
+    pMappingString = s_ControllerMappings[i];
+    while ( pMappingString ) {
+        SDL_GameControllerAddMapping( pMappingString );
+
+        i++;
+        pMappingString = s_ControllerMappings[i];
+    }
+
+    /* load in any user supplied config */
+    SDL_GameControllerLoadHints();
+
+    /* watch for joy events and fire controller ones if needed */
+    SDL_AddEventWatch( SDL_GameControllerEventWatcher, NULL );
+
+    /* Send added events for controllers currently attached */
+    for (i = 0; i < SDL_NumJoysticks(); ++i) {
+        if (SDL_IsGameController(i)) {
+            SDL_Event deviceevent;
+            deviceevent.type = SDL_CONTROLLERDEVICEADDED;
+            deviceevent.cdevice.which = i;
+            SDL_PushEvent(&deviceevent);
+        }
+    }
+
+    return (0);
+}
+
+
+/*
+ * Get the implementation dependent name of a controller
+ */
+const char *
+SDL_GameControllerNameForIndex(int device_index)
+{
+    ControllerMapping_t *pSupportedController =  SDL_PrivateGetControllerMapping(device_index);
+    if ( pSupportedController )
+    {
+        return pSupportedController->name;
+    }
+    return NULL;
+}
+
+
+/*
+ * Return 1 if the joystick at this device index is a supported controller
+ */
+SDL_bool
+SDL_IsGameController(int device_index)
+{
+    ControllerMapping_t *pSupportedController =  SDL_PrivateGetControllerMapping(device_index);
+    if ( pSupportedController )
+    {
+        return SDL_TRUE;
+    }
+
+    return SDL_FALSE;
+}
+
+/*
+ * Open a controller for use - the index passed as an argument refers to
+ * the N'th controller on the system.  This index is the value which will
+ * identify this controller in future controller events.
+ *
+ * This function returns a controller identifier, or NULL if an error occurred.
+ */
+SDL_GameController *
+SDL_GameControllerOpen(int device_index)
+{
+    SDL_GameController *gamecontroller;
+    SDL_GameController *gamecontrollerlist;
+    ControllerMapping_t *pSupportedController = NULL;
+
+    if ((device_index < 0) || (device_index >= SDL_NumJoysticks())) {
+        SDL_SetError("There are %d joysticks available", SDL_NumJoysticks());
+        return (NULL);
+    }
+
+    gamecontrollerlist = SDL_gamecontrollers;
+    /* If the controller is already open, return it */
+    while ( gamecontrollerlist )
+    {
+        if ( SDL_SYS_GetInstanceIdOfDeviceIndex(device_index) == gamecontrollerlist->joystick->instance_id ) {
+                gamecontroller = gamecontrollerlist;
+                ++gamecontroller->ref_count;
+                return (gamecontroller);
+        }
+        gamecontrollerlist = gamecontrollerlist->next;
+    }
+
+    /* Find a controller mapping */
+    pSupportedController =  SDL_PrivateGetControllerMapping(device_index);
+    if ( !pSupportedController ) {
+        SDL_SetError("Couldn't find mapping for device (%d)", device_index );
+        return (NULL);
+    }
+
+    /* Create and initialize the joystick */
+    gamecontroller = (SDL_GameController *) SDL_malloc((sizeof *gamecontroller));
+    if (gamecontroller == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    SDL_memset(gamecontroller, 0, (sizeof *gamecontroller));
+    gamecontroller->joystick = SDL_JoystickOpen(device_index);
+    if ( !gamecontroller->joystick ) {
+        SDL_free(gamecontroller);
+        return NULL;
+    }
+
+    SDL_PrivateLoadButtonMapping( &gamecontroller->mapping, pSupportedController->guid, pSupportedController->name, pSupportedController->mapping );
+
+    /* Add joystick to list */
+    ++gamecontroller->ref_count;
+    /* Link the joystick in the list */
+    gamecontroller->next = SDL_gamecontrollers;
+    SDL_gamecontrollers = gamecontroller;
+
+    SDL_SYS_JoystickUpdate( gamecontroller->joystick );
+
+    return (gamecontroller);
+}
+
+/*
+ * Manually pump for controller updates.
+ */
+void
+SDL_GameControllerUpdate(void)
+{
+    /* Just for API completeness; the joystick API does all the work. */
+    SDL_JoystickUpdate();
+}
+
+
+/*
+ * Get the current state of an axis control on a controller
+ */
+Sint16
+SDL_GameControllerGetAxis(SDL_GameController * gamecontroller, SDL_GameControllerAxis axis)
+{
+    if ( !gamecontroller )
+        return 0;
+
+    if (gamecontroller->mapping.axes[axis] >= 0 )
+    {
+        Sint16 value = ( SDL_JoystickGetAxis( gamecontroller->joystick, gamecontroller->mapping.axes[axis]) );
+        switch (axis)
+        {
+            case SDL_CONTROLLER_AXIS_TRIGGERLEFT:
+            case SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
+                /* Shift it to be 0 - 32767. */
+                value = value / 2 + 16384;
+            default:
+                break;
+        }
+        return value;
+    }
+    else if (gamecontroller->mapping.buttonasaxis[axis] >= 0 )
+    {
+        Uint8 value;
+        value = SDL_JoystickGetButton( gamecontroller->joystick, gamecontroller->mapping.buttonasaxis[axis] );
+        if ( value > 0 )
+            return 32767;
+        return 0;
+    }
+    return 0;
+}
+
+
+/*
+ * Get the current state of a button on a controller
+ */
+Uint8
+SDL_GameControllerGetButton(SDL_GameController * gamecontroller, SDL_GameControllerButton button)
+{
+    if ( !gamecontroller )
+        return 0;
+
+    if ( gamecontroller->mapping.buttons[button] >= 0 )
+    {
+        return ( SDL_JoystickGetButton( gamecontroller->joystick, gamecontroller->mapping.buttons[button] ) );
+    }
+    else if ( gamecontroller->mapping.axesasbutton[button] >= 0 )
+    {
+        Sint16 value;
+        value = SDL_JoystickGetAxis( gamecontroller->joystick, gamecontroller->mapping.axesasbutton[button] );
+        if ( ABS(value) > 32768/2 )
+            return 1;
+        return 0;
+    }
+    else if ( gamecontroller->mapping.hatasbutton[button].hat >= 0 )
+    {
+        Uint8 value;
+        value = SDL_JoystickGetHat( gamecontroller->joystick, gamecontroller->mapping.hatasbutton[button].hat );
+
+        if ( value & gamecontroller->mapping.hatasbutton[button].mask )
+            return 1;
+        return 0;
+    }
+
+    return 0;
+}
+
+/*
+ * Return if the joystick in question is currently attached to the system,
+ *  \return 0 if not plugged in, 1 if still present.
+ */
+SDL_bool
+SDL_GameControllerGetAttached( SDL_GameController * gamecontroller )
+{
+    if ( !gamecontroller )
+        return SDL_FALSE;
+
+    return SDL_JoystickGetAttached(gamecontroller->joystick);
+}
+
+
+/*
+ * Get the number of multi-dimensional axis controls on a joystick
+ */
+const char *
+SDL_GameControllerName(SDL_GameController * gamecontroller)
+{
+    if ( !gamecontroller )
+        return NULL;
+
+    return (gamecontroller->mapping.name);
+}
+
+
+/*
+ * Get the joystick for this controller
+ */
+SDL_Joystick *SDL_GameControllerGetJoystick(SDL_GameController * gamecontroller)
+{
+    if ( !gamecontroller )
+        return NULL;
+
+    return gamecontroller->joystick;
+}
+
+/**
+ * Get the SDL joystick layer binding for this controller axis mapping
+ */
+SDL_GameControllerButtonBind SDL_GameControllerGetBindForAxis(SDL_GameController * gamecontroller, SDL_GameControllerAxis axis)
+{
+    SDL_GameControllerButtonBind bind;
+    SDL_memset( &bind, 0x0, sizeof(bind) );
+
+    if ( !gamecontroller || axis == SDL_CONTROLLER_AXIS_INVALID )
+        return bind;
+
+    if (gamecontroller->mapping.axes[axis] >= 0 )
+    {
+        bind.bindType = SDL_CONTROLLER_BINDTYPE_AXIS;
+        bind.value.button = gamecontroller->mapping.axes[axis];
+    }
+    else if (gamecontroller->mapping.buttonasaxis[axis] >= 0 )
+    {
+        bind.bindType = SDL_CONTROLLER_BINDTYPE_BUTTON;
+        bind.value.button = gamecontroller->mapping.buttonasaxis[axis];
+    }
+
+    return bind;
+}
+
+
+/**
+ * Get the SDL joystick layer binding for this controller button mapping
+ */
+SDL_GameControllerButtonBind SDL_GameControllerGetBindForButton(SDL_GameController * gamecontroller, SDL_GameControllerButton button)
+{
+    SDL_GameControllerButtonBind bind;
+    SDL_memset( &bind, 0x0, sizeof(bind) );
+
+    if ( !gamecontroller || button == SDL_CONTROLLER_BUTTON_INVALID )
+        return bind;
+
+    if ( gamecontroller->mapping.buttons[button] >= 0 )
+    {
+        bind.bindType = SDL_CONTROLLER_BINDTYPE_BUTTON;
+        bind.value.button = gamecontroller->mapping.buttons[button];
+    }
+    else if ( gamecontroller->mapping.axesasbutton[button] >= 0 )
+    {
+        bind.bindType = SDL_CONTROLLER_BINDTYPE_AXIS;
+        bind.value.axis = gamecontroller->mapping.axesasbutton[button];
+    }
+    else if ( gamecontroller->mapping.hatasbutton[button].hat >= 0 )
+    {
+        bind.bindType = SDL_CONTROLLER_BINDTYPE_HAT;
+        bind.value.hat.hat = gamecontroller->mapping.hatasbutton[button].hat;
+        bind.value.hat.hat_mask = gamecontroller->mapping.hatasbutton[button].mask;
+    }
+
+    return bind;
+}
+
+
+/*
+ * Close a joystick previously opened with SDL_JoystickOpen()
+ */
+void
+SDL_GameControllerClose(SDL_GameController * gamecontroller)
+{
+    SDL_GameController *gamecontrollerlist, *gamecontrollerlistprev;
+
+    if ( !gamecontroller )
+        return;
+
+    /* First decrement ref count */
+    if (--gamecontroller->ref_count > 0) {
+        return;
+    }
+
+    SDL_JoystickClose( gamecontroller->joystick );
+
+    gamecontrollerlist = SDL_gamecontrollers;
+    gamecontrollerlistprev = NULL;
+    while ( gamecontrollerlist )
+    {
+        if (gamecontroller == gamecontrollerlist)
+        {
+            if ( gamecontrollerlistprev )
+            {
+                /* unlink this entry */
+                gamecontrollerlistprev->next = gamecontrollerlist->next;
+            }
+            else
+            {
+                SDL_gamecontrollers = gamecontroller->next;
+            }
+
+            break;
+        }
+        gamecontrollerlistprev = gamecontrollerlist;
+        gamecontrollerlist = gamecontrollerlist->next;
+    }
+
+    SDL_free(gamecontroller);
+}
+
+
+/*
+ * Quit the controller subsystem
+ */
+void
+SDL_GameControllerQuit(void)
+{
+    ControllerMapping_t *pControllerMap;
+    while ( SDL_gamecontrollers )
+    {
+        SDL_gamecontrollers->ref_count = 1;
+        SDL_GameControllerClose(SDL_gamecontrollers);
+    }
+
+    while ( s_pSupportedControllers )
+    {
+        pControllerMap = s_pSupportedControllers;
+        s_pSupportedControllers = s_pSupportedControllers->next;
+        SDL_free( pControllerMap->name );
+        SDL_free( pControllerMap->mapping );
+        SDL_free( pControllerMap );
+    }
+
+    SDL_DelEventWatch( SDL_GameControllerEventWatcher, NULL );
+
+}
+
+/*
+ * Event filter to transform joystick events into appropriate game controller ones
+ */
+int
+SDL_PrivateGameControllerAxis(SDL_GameController * gamecontroller, SDL_GameControllerAxis axis, Sint16 value)
+{
+    int posted;
+
+    /* translate the event, if desired */
+    posted = 0;
+#if !SDL_EVENTS_DISABLED
+    if (SDL_GetEventState(SDL_CONTROLLERAXISMOTION) == SDL_ENABLE) {
+        SDL_Event event;
+        event.type = SDL_CONTROLLERAXISMOTION;
+        event.caxis.which = gamecontroller->joystick->instance_id;
+        event.caxis.axis = axis;
+        event.caxis.value = value;
+        posted = SDL_PushEvent(&event) == 1;
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+    return (posted);
+}
+
+
+/*
+ * Event filter to transform joystick events into appropriate game controller ones
+ */
+int
+SDL_PrivateGameControllerButton(SDL_GameController * gamecontroller, SDL_GameControllerButton button, Uint8 state)
+{
+    int posted;
+#if !SDL_EVENTS_DISABLED
+    SDL_Event event;
+
+    if ( button == SDL_CONTROLLER_BUTTON_INVALID )
+        return (0);
+
+    switch (state) {
+    case SDL_PRESSED:
+        event.type = SDL_CONTROLLERBUTTONDOWN;
+        break;
+    case SDL_RELEASED:
+        event.type = SDL_CONTROLLERBUTTONUP;
+        break;
+    default:
+        /* Invalid state -- bail */
+        return (0);
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+
+    /* translate the event, if desired */
+    posted = 0;
+#if !SDL_EVENTS_DISABLED
+    if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+        event.cbutton.which = gamecontroller->joystick->instance_id;
+        event.cbutton.button = button;
+        event.cbutton.state = state;
+        posted = SDL_PushEvent(&event) == 1;
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+    return (posted);
+}
+
+/*
+ * Turn off controller events
+ */
+int
+SDL_GameControllerEventState(int state)
+{
+#if SDL_EVENTS_DISABLED
+    return SDL_IGNORE;
+#else
+    const Uint32 event_list[] = {
+        SDL_CONTROLLERAXISMOTION, SDL_CONTROLLERBUTTONDOWN, SDL_CONTROLLERBUTTONUP,
+        SDL_CONTROLLERDEVICEADDED, SDL_CONTROLLERDEVICEREMOVED, SDL_CONTROLLERDEVICEREMAPPED,
+    };
+    unsigned int i;
+
+    switch (state) {
+    case SDL_QUERY:
+        state = SDL_IGNORE;
+        for (i = 0; i < SDL_arraysize(event_list); ++i) {
+            state = SDL_EventState(event_list[i], SDL_QUERY);
+            if (state == SDL_ENABLE) {
+                break;
+            }
+        }
+        break;
+    default:
+        for (i = 0; i < SDL_arraysize(event_list); ++i) {
+            SDL_EventState(event_list[i], state);
+        }
+        break;
+    }
+    return (state);
+#endif /* SDL_EVENTS_DISABLED */
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/SDL_gamecontrollerdb.h b/Source/3rd Party/sdl/src/joystick/SDL_gamecontrollerdb.h
new file mode 100644
index 000000000..34630ca6b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/SDL_gamecontrollerdb.h	
@@ -0,0 +1,76 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+
+/* Default mappings we support
+
+   The easiest way to generate a new mapping is to start Steam in Big Picture
+   mode, configure your joystick and then look in config/config.vdf in your
+   Steam installation directory for the "SDL_GamepadBind" entry.
+   
+   Alternatively, you can use the app located in test/controllermap
+ */
+static const char *s_ControllerMappings [] =
+{
+#ifdef SDL_JOYSTICK_DINPUT
+    "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
+    "ffff0000000000000000504944564944,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,",
+    "6d0416c2000000000000504944564944,Generic DirectInput Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
+	"6d0419c2000000000000504944564944,Logitech F710 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", /* Guide button doesn't seem to be sent in DInput mode. */
+    "4d6963726f736f66742050432d6a6f79,OUYA Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:b13,rightx:a5,righty:a4,x:b1,y:b2,",
+    "88880803000000000000504944564944,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b9,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b0,y:b3,",
+    "4c056802000000000000504944564944,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
+    "25090500000000000000504944564944,PS3 DualShock,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,",
+    "4c05c405000000000000504944564944,PS4 Controller,a:a3,a:b1,b:b2,back:b8,dpdown:h0.0,dpdown:h0.4,dpleft:h0.8,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,guide:b12,leftshoulder:b4,leftshoulder:h0.0,leftstick:b10,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightshoulder:b6,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:a4,x:b0,y:b3,",
+    "xinput,X360 Controller,a:b10,b:b11,back:b5,dpdown:b1,dpleft:b2,dpright:b3,dpup:b0,guide:b14,leftshoulder:b8,leftstick:b6,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b7,righttrigger:a5,rightx:a2,righty:a3,start:b4,x:b12,y:b13,",
+#elif defined(SDL_JOYSTICK_XINPUT)
+    "xinput,X360 Controller,a:b10,b:b11,back:b5,dpdown:b1,dpleft:b2,dpright:b3,dpup:b0,guide:b14,leftshoulder:b8,leftstick:b6,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b7,righttrigger:a5,rightx:a2,righty:a3,start:b4,x:b12,y:b13,",
+#elif defined(__MACOSX__)
+    "0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,",
+    "6d0400000000000016c2000000000000,Logitech F310 Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", /* Guide button doesn't seem to be sent in DInput mode. */
+    "6d0400000000000018c2000000000000,Logitech F510 Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
+    "6d040000000000001fc2000000000000,Logitech F710 Gamepad (XInput),a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,",
+    "6d0400000000000019c2000000000000,Logitech Wireless Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", /* This includes F710 in DInput mode and the "Logitech Cordless RumblePad 2", at the very least. */
+    "4c050000000000006802000000000000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
+    "4c05000000000000c405000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
+    "5e040000000000008e02000000000000,X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,",
+#elif defined(__LINUX__)
+    "0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,",
+    "03000000ba2200002010000001010000,Jess Technology USB Game Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,",
+    "030000006d04000019c2000010010000,Logitech Cordless RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,",
+    "030000006d0400001dc2000014400000,Logitech F310 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+    "030000006d0400001ec2000020200000,Logitech F510 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+    "030000006d04000019c2000011010000,Logitech F710 Gamepad (DInput),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", /* Guide button doesn't seem to be sent in DInput mode. */
+    "030000006d0400001fc2000005030000,Logitech F710 Gamepad (XInput),a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+"050000003620000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,platform:Linux,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,",
+    "030000004c0500006802000011010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,",
+    "030000004c050000c405000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,",
+    "03000000de280000ff11000001000000,Valve Streaming Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+    "030000005e0400008e02000014010000,X360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+    "030000005e0400008e02000010010000,X360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+    "030000005e0400001907000000010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+    "030000005e0400009102000007010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+#endif
+    NULL
+};
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/SDL_joystick.c b/Source/3rd Party/sdl/src/joystick/SDL_joystick.c
new file mode 100644
index 000000000..062ece333
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/SDL_joystick.c	
@@ -0,0 +1,854 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This is the joystick API for Simple DirectMedia Layer */
+
+#include "SDL.h"
+#include "SDL_events.h"
+#include "SDL_sysjoystick.h"
+#include "SDL_assert.h"
+#include "SDL_hints.h"
+
+#if !SDL_EVENTS_DISABLED
+#include "../events/SDL_events_c.h"
+#endif
+
+static SDL_bool SDL_joystick_allows_background_events = SDL_FALSE;
+static SDL_Joystick *SDL_joysticks = NULL;
+static SDL_Joystick *SDL_updating_joystick = NULL;
+
+static void
+SDL_JoystickAllowBackgroundEventsChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
+{
+    if (hint && *hint == '1') {
+        SDL_joystick_allows_background_events = SDL_TRUE;
+    } else {
+        SDL_joystick_allows_background_events = SDL_FALSE;
+    }
+}
+
+int
+SDL_JoystickInit(void)
+{
+    int status;
+
+    /* See if we should allow joystick events while in the background */
+    SDL_AddHintCallback(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS,
+                        SDL_JoystickAllowBackgroundEventsChanged, NULL);
+
+#if !SDL_EVENTS_DISABLED
+    if (SDL_InitSubSystem(SDL_INIT_EVENTS) < 0) {
+        return -1;
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+
+    status = SDL_SYS_JoystickInit();
+    if (status >= 0) {
+        status = 0;
+    }
+    return (status);
+}
+
+/*
+ * Count the number of joysticks attached to the system
+ */
+int
+SDL_NumJoysticks(void)
+{
+    return SDL_SYS_NumJoysticks();
+}
+
+/*
+ * Get the implementation dependent name of a joystick
+ */
+const char *
+SDL_JoystickNameForIndex(int device_index)
+{
+    if ((device_index < 0) || (device_index >= SDL_NumJoysticks())) {
+        SDL_SetError("There are %d joysticks available", SDL_NumJoysticks());
+        return (NULL);
+    }
+    return (SDL_SYS_JoystickNameForDeviceIndex(device_index));
+}
+
+/*
+ * Open a joystick for use - the index passed as an argument refers to
+ * the N'th joystick on the system.  This index is the value which will
+ * identify this joystick in future joystick events.
+ *
+ * This function returns a joystick identifier, or NULL if an error occurred.
+ */
+SDL_Joystick *
+SDL_JoystickOpen(int device_index)
+{
+    SDL_Joystick *joystick;
+    SDL_Joystick *joysticklist;
+    const char *joystickname = NULL;
+
+    if ((device_index < 0) || (device_index >= SDL_NumJoysticks())) {
+        SDL_SetError("There are %d joysticks available", SDL_NumJoysticks());
+        return (NULL);
+    }
+
+    joysticklist = SDL_joysticks;
+    /* If the joystick is already open, return it
+    * it is important that we have a single joystick * for each instance id
+    */
+    while ( joysticklist )
+    {
+        if ( SDL_SYS_GetInstanceIdOfDeviceIndex(device_index) == joysticklist->instance_id ) {
+                joystick = joysticklist;
+                ++joystick->ref_count;
+                return (joystick);
+        }
+        joysticklist = joysticklist->next;
+    }
+
+    /* Create and initialize the joystick */
+    joystick = (SDL_Joystick *) SDL_malloc((sizeof *joystick));
+    if (joystick == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    SDL_memset(joystick, 0, (sizeof *joystick));
+    if (SDL_SYS_JoystickOpen(joystick, device_index) < 0) {
+        SDL_free(joystick);
+        return NULL;
+    }
+
+    joystickname = SDL_SYS_JoystickNameForDeviceIndex( device_index );
+    if ( joystickname )
+        joystick->name = SDL_strdup( joystickname );
+    else
+        joystick->name = NULL;
+
+    if (joystick->naxes > 0) {
+        joystick->axes = (Sint16 *) SDL_malloc
+            (joystick->naxes * sizeof(Sint16));
+    }
+    if (joystick->nhats > 0) {
+        joystick->hats = (Uint8 *) SDL_malloc
+            (joystick->nhats * sizeof(Uint8));
+    }
+    if (joystick->nballs > 0) {
+        joystick->balls = (struct balldelta *) SDL_malloc
+            (joystick->nballs * sizeof(*joystick->balls));
+    }
+    if (joystick->nbuttons > 0) {
+        joystick->buttons = (Uint8 *) SDL_malloc
+            (joystick->nbuttons * sizeof(Uint8));
+    }
+    if (((joystick->naxes > 0) && !joystick->axes)
+        || ((joystick->nhats > 0) && !joystick->hats)
+        || ((joystick->nballs > 0) && !joystick->balls)
+        || ((joystick->nbuttons > 0) && !joystick->buttons)) {
+        SDL_OutOfMemory();
+        SDL_JoystickClose(joystick);
+        return NULL;
+    }
+    if (joystick->axes) {
+        SDL_memset(joystick->axes, 0, joystick->naxes * sizeof(Sint16));
+    }
+    if (joystick->hats) {
+        SDL_memset(joystick->hats, 0, joystick->nhats * sizeof(Uint8));
+    }
+    if (joystick->balls) {
+        SDL_memset(joystick->balls, 0,
+            joystick->nballs * sizeof(*joystick->balls));
+    }
+    if (joystick->buttons) {
+        SDL_memset(joystick->buttons, 0, joystick->nbuttons * sizeof(Uint8));
+    }
+
+    /* Add joystick to list */
+    ++joystick->ref_count;
+    /* Link the joystick in the list */
+    joystick->next = SDL_joysticks;
+    SDL_joysticks = joystick;
+
+    SDL_SYS_JoystickUpdate( joystick );
+
+    return (joystick);
+}
+
+
+/*
+ * Checks to make sure the joystick is valid.
+ */
+int
+SDL_PrivateJoystickValid(SDL_Joystick * joystick)
+{
+    int valid;
+
+    if ( joystick == NULL ) {
+        SDL_SetError("Joystick hasn't been opened yet");
+        valid = 0;
+    } else {
+        valid = 1;
+    }
+
+    if ( joystick && joystick->closed )
+    {
+        valid = 0;
+    }
+
+    return valid;
+}
+
+/*
+ * Get the number of multi-dimensional axis controls on a joystick
+ */
+int
+SDL_JoystickNumAxes(SDL_Joystick * joystick)
+{
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (-1);
+    }
+    return (joystick->naxes);
+}
+
+/*
+ * Get the number of hats on a joystick
+ */
+int
+SDL_JoystickNumHats(SDL_Joystick * joystick)
+{
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (-1);
+    }
+    return (joystick->nhats);
+}
+
+/*
+ * Get the number of trackballs on a joystick
+ */
+int
+SDL_JoystickNumBalls(SDL_Joystick * joystick)
+{
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (-1);
+    }
+    return (joystick->nballs);
+}
+
+/*
+ * Get the number of buttons on a joystick
+ */
+int
+SDL_JoystickNumButtons(SDL_Joystick * joystick)
+{
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (-1);
+    }
+    return (joystick->nbuttons);
+}
+
+/*
+ * Get the current state of an axis control on a joystick
+ */
+Sint16
+SDL_JoystickGetAxis(SDL_Joystick * joystick, int axis)
+{
+    Sint16 state;
+
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (0);
+    }
+    if (axis < joystick->naxes) {
+        state = joystick->axes[axis];
+    } else {
+        SDL_SetError("Joystick only has %d axes", joystick->naxes);
+        state = 0;
+    }
+    return (state);
+}
+
+/*
+ * Get the current state of a hat on a joystick
+ */
+Uint8
+SDL_JoystickGetHat(SDL_Joystick * joystick, int hat)
+{
+    Uint8 state;
+
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (0);
+    }
+    if (hat < joystick->nhats) {
+        state = joystick->hats[hat];
+    } else {
+        SDL_SetError("Joystick only has %d hats", joystick->nhats);
+        state = 0;
+    }
+    return (state);
+}
+
+/*
+ * Get the ball axis change since the last poll
+ */
+int
+SDL_JoystickGetBall(SDL_Joystick * joystick, int ball, int *dx, int *dy)
+{
+    int retval;
+
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (-1);
+    }
+
+    retval = 0;
+    if (ball < joystick->nballs) {
+        if (dx) {
+            *dx = joystick->balls[ball].dx;
+        }
+        if (dy) {
+            *dy = joystick->balls[ball].dy;
+        }
+        joystick->balls[ball].dx = 0;
+        joystick->balls[ball].dy = 0;
+    } else {
+        return SDL_SetError("Joystick only has %d balls", joystick->nballs);
+    }
+    return (retval);
+}
+
+/*
+ * Get the current state of a button on a joystick
+ */
+Uint8
+SDL_JoystickGetButton(SDL_Joystick * joystick, int button)
+{
+    Uint8 state;
+
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (0);
+    }
+    if (button < joystick->nbuttons) {
+        state = joystick->buttons[button];
+    } else {
+        SDL_SetError("Joystick only has %d buttons", joystick->nbuttons);
+        state = 0;
+    }
+    return (state);
+}
+
+/*
+ * Return if the joystick in question is currently attached to the system,
+ *  \return SDL_FALSE if not plugged in, SDL_TRUE if still present.
+ */
+SDL_bool
+SDL_JoystickGetAttached(SDL_Joystick * joystick)
+{
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return SDL_FALSE;
+    }
+
+    return SDL_SYS_JoystickAttached(joystick);
+}
+
+/*
+ * Get the instance id for this opened joystick
+ */
+SDL_JoystickID
+SDL_JoystickInstanceID(SDL_Joystick * joystick)
+{
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (-1);
+    }
+
+    return (joystick->instance_id);
+}
+
+/*
+ * Get the friendly name of this joystick
+ */
+const char *
+SDL_JoystickName(SDL_Joystick * joystick)
+{
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        return (NULL);
+    }
+
+    return (joystick->name);
+}
+
+/*
+ * Close a joystick previously opened with SDL_JoystickOpen()
+ */
+void
+SDL_JoystickClose(SDL_Joystick * joystick)
+{
+    SDL_Joystick *joysticklist;
+    SDL_Joystick *joysticklistprev;
+
+    if (!joystick) {
+        return;
+    }
+
+    /* First decrement ref count */
+    if (--joystick->ref_count > 0) {
+        return;
+    }
+
+    if (joystick == SDL_updating_joystick) {
+        return;
+    }
+
+    SDL_SYS_JoystickClose(joystick);
+
+    joysticklist = SDL_joysticks;
+    joysticklistprev = NULL;
+    while ( joysticklist )
+    {
+        if (joystick == joysticklist)
+        {
+            if ( joysticklistprev )
+            {
+                /* unlink this entry */
+                joysticklistprev->next = joysticklist->next;
+            }
+            else
+            {
+                SDL_joysticks = joystick->next;
+            }
+
+            break;
+        }
+        joysticklistprev = joysticklist;
+        joysticklist = joysticklist->next;
+    }
+
+    SDL_free(joystick->name);
+
+    /* Free the data associated with this joystick */
+    SDL_free(joystick->axes);
+    SDL_free(joystick->hats);
+    SDL_free(joystick->balls);
+    SDL_free(joystick->buttons);
+    SDL_free(joystick);
+}
+
+void
+SDL_JoystickQuit(void)
+{
+    /* Make sure we're not getting called in the middle of updating joysticks */
+    SDL_assert(!SDL_updating_joystick);
+
+    /* Stop the event polling */
+    while ( SDL_joysticks )
+    {
+        SDL_joysticks->ref_count = 1;
+        SDL_JoystickClose(SDL_joysticks);
+    }
+
+    /* Quit the joystick setup */
+    SDL_SYS_JoystickQuit();
+
+#if !SDL_EVENTS_DISABLED
+    SDL_QuitSubSystem(SDL_INIT_EVENTS);
+#endif
+}
+
+
+static SDL_bool
+SDL_PrivateJoystickShouldIgnoreEvent()
+{
+    if (SDL_joystick_allows_background_events)
+    {
+        return SDL_FALSE;
+    }
+
+    if (SDL_WasInit(SDL_INIT_VIDEO)) {
+        if (SDL_GetKeyboardFocus() == NULL) {
+            /* Video is initialized and we don't have focus, ignore the event. */
+            return SDL_TRUE;
+        } else {
+            return SDL_FALSE;
+        }
+    }
+
+    /* Video subsystem wasn't initialized, always allow the event */
+    return SDL_FALSE;
+}
+
+/* These are global for SDL_sysjoystick.c and SDL_events.c */
+
+int
+SDL_PrivateJoystickAxis(SDL_Joystick * joystick, Uint8 axis, Sint16 value)
+{
+    int posted;
+
+    /* Make sure we're not getting garbage events */
+    if (axis >= joystick->naxes) {
+        return 0;
+    }
+
+    /* Update internal joystick state */
+    if (value == joystick->axes[axis]) {
+        return 0;
+    }
+    joystick->axes[axis] = value;
+
+    /* We ignore events if we don't have keyboard focus, except for centering
+     * events.
+     */
+    if (SDL_PrivateJoystickShouldIgnoreEvent()) {
+        if (!(joystick->closed && joystick->uncentered)) {
+            return 0;
+        }
+    }
+
+    /* Post the event, if desired */
+    posted = 0;
+#if !SDL_EVENTS_DISABLED
+    if (SDL_GetEventState(SDL_JOYAXISMOTION) == SDL_ENABLE) {
+        SDL_Event event;
+        event.type = SDL_JOYAXISMOTION;
+        event.jaxis.which = joystick->instance_id;
+        event.jaxis.axis = axis;
+        event.jaxis.value = value;
+        posted = SDL_PushEvent(&event) == 1;
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+    return (posted);
+}
+
+int
+SDL_PrivateJoystickHat(SDL_Joystick * joystick, Uint8 hat, Uint8 value)
+{
+    int posted;
+
+    /* Make sure we're not getting garbage events */
+    if (hat >= joystick->nhats) {
+        return 0;
+    }
+
+    /* Update internal joystick state */
+    joystick->hats[hat] = value;
+
+    /* We ignore events if we don't have keyboard focus, except for centering
+     * events.
+     */
+    if (SDL_PrivateJoystickShouldIgnoreEvent()) {
+        if (!(joystick->closed && joystick->uncentered)) {
+            return 0;
+        }
+    }
+
+
+    /* Post the event, if desired */
+    posted = 0;
+#if !SDL_EVENTS_DISABLED
+    if (SDL_GetEventState(SDL_JOYHATMOTION) == SDL_ENABLE) {
+        SDL_Event event;
+        event.jhat.type = SDL_JOYHATMOTION;
+        event.jhat.which = joystick->instance_id;
+        event.jhat.hat = hat;
+        event.jhat.value = value;
+        posted = SDL_PushEvent(&event) == 1;
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+    return (posted);
+}
+
+int
+SDL_PrivateJoystickBall(SDL_Joystick * joystick, Uint8 ball,
+                        Sint16 xrel, Sint16 yrel)
+{
+    int posted;
+
+    /* Make sure we're not getting garbage events */
+    if (ball >= joystick->nballs) {
+        return 0;
+    }
+
+    /* We ignore events if we don't have keyboard focus. */
+    if (SDL_PrivateJoystickShouldIgnoreEvent()) {
+        return 0;
+    }
+
+    /* Update internal mouse state */
+    joystick->balls[ball].dx += xrel;
+    joystick->balls[ball].dy += yrel;
+
+    /* Post the event, if desired */
+    posted = 0;
+#if !SDL_EVENTS_DISABLED
+    if (SDL_GetEventState(SDL_JOYBALLMOTION) == SDL_ENABLE) {
+        SDL_Event event;
+        event.jball.type = SDL_JOYBALLMOTION;
+        event.jball.which = joystick->instance_id;
+        event.jball.ball = ball;
+        event.jball.xrel = xrel;
+        event.jball.yrel = yrel;
+        posted = SDL_PushEvent(&event) == 1;
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+    return (posted);
+}
+
+int
+SDL_PrivateJoystickButton(SDL_Joystick * joystick, Uint8 button, Uint8 state)
+{
+    int posted;
+#if !SDL_EVENTS_DISABLED
+    SDL_Event event;
+
+    switch (state) {
+    case SDL_PRESSED:
+        event.type = SDL_JOYBUTTONDOWN;
+        break;
+    case SDL_RELEASED:
+        event.type = SDL_JOYBUTTONUP;
+        break;
+    default:
+        /* Invalid state -- bail */
+        return (0);
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+
+    /* Make sure we're not getting garbage events */
+    if (button >= joystick->nbuttons) {
+        return 0;
+    }
+
+    /* We ignore events if we don't have keyboard focus, except for button
+     * release. */
+    if (state == SDL_PRESSED && SDL_PrivateJoystickShouldIgnoreEvent()) {
+        return 0;
+    }
+
+    /* Update internal joystick state */
+    joystick->buttons[button] = state;
+
+    /* Post the event, if desired */
+    posted = 0;
+#if !SDL_EVENTS_DISABLED
+    if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+        event.jbutton.which = joystick->instance_id;
+        event.jbutton.button = button;
+        event.jbutton.state = state;
+        posted = SDL_PushEvent(&event) == 1;
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+    return (posted);
+}
+
+void
+SDL_JoystickUpdate(void)
+{
+    SDL_Joystick *joystick;
+
+    joystick = SDL_joysticks;
+    while ( joystick )
+    {
+        SDL_Joystick *joysticknext;
+        /* save off the next pointer, the Update call may cause a joystick removed event
+         * and cause our joystick pointer to be freed
+         */
+        joysticknext = joystick->next;
+
+        SDL_updating_joystick = joystick;
+
+        SDL_SYS_JoystickUpdate( joystick );
+
+        if ( joystick->closed && joystick->uncentered )
+        {
+            int i;
+
+            /* Tell the app that everything is centered/unpressed...  */
+            for (i = 0; i < joystick->naxes; i++)
+                SDL_PrivateJoystickAxis(joystick, i, 0);
+
+            for (i = 0; i < joystick->nbuttons; i++)
+                SDL_PrivateJoystickButton(joystick, i, 0);
+
+            for (i = 0; i < joystick->nhats; i++)
+                SDL_PrivateJoystickHat(joystick, i, SDL_HAT_CENTERED);
+
+            joystick->uncentered = 0;
+        }
+
+        SDL_updating_joystick = NULL;
+
+        /* If the joystick was closed while updating, free it here */
+        if ( joystick->ref_count <= 0 ) {
+            SDL_JoystickClose(joystick);
+        }
+
+        joystick = joysticknext;
+    }
+
+    /* this needs to happen AFTER walking the joystick list above, so that any
+       dangling hardware data from removed devices can be free'd
+     */
+    SDL_SYS_JoystickDetect();
+}
+
+int
+SDL_JoystickEventState(int state)
+{
+#if SDL_EVENTS_DISABLED
+    return SDL_DISABLE;
+#else
+    const Uint32 event_list[] = {
+        SDL_JOYAXISMOTION, SDL_JOYBALLMOTION, SDL_JOYHATMOTION,
+        SDL_JOYBUTTONDOWN, SDL_JOYBUTTONUP, SDL_JOYDEVICEADDED, SDL_JOYDEVICEREMOVED
+    };
+    unsigned int i;
+
+    switch (state) {
+    case SDL_QUERY:
+        state = SDL_DISABLE;
+        for (i = 0; i < SDL_arraysize(event_list); ++i) {
+            state = SDL_EventState(event_list[i], SDL_QUERY);
+            if (state == SDL_ENABLE) {
+                break;
+            }
+        }
+        break;
+    default:
+        for (i = 0; i < SDL_arraysize(event_list); ++i) {
+            SDL_EventState(event_list[i], state);
+        }
+        break;
+    }
+    return (state);
+#endif /* SDL_EVENTS_DISABLED */
+}
+
+/* return 1 if you want to run the joystick update loop this frame, used by hotplug support */
+SDL_bool
+SDL_PrivateJoystickNeedsPolling()
+{
+    if (SDL_joysticks != NULL) {
+        return SDL_TRUE;
+    } else {
+        return SDL_SYS_JoystickNeedsPolling();
+    }
+}
+
+
+/* return the guid for this index */
+SDL_JoystickGUID SDL_JoystickGetDeviceGUID(int device_index)
+{
+    if ((device_index < 0) || (device_index >= SDL_NumJoysticks())) {
+        SDL_JoystickGUID emptyGUID;
+        SDL_SetError("There are %d joysticks available", SDL_NumJoysticks());
+        SDL_zero( emptyGUID );
+        return emptyGUID;
+    }
+    return SDL_SYS_JoystickGetDeviceGUID( device_index );
+}
+
+/* return the guid for this opened device */
+SDL_JoystickGUID SDL_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    if (!SDL_PrivateJoystickValid(joystick)) {
+        SDL_JoystickGUID emptyGUID;
+        SDL_zero( emptyGUID );
+        return emptyGUID;
+    }
+    return SDL_SYS_JoystickGetGUID( joystick );
+}
+
+/* convert the guid to a printable string */
+void SDL_JoystickGetGUIDString( SDL_JoystickGUID guid, char *pszGUID, int cbGUID )
+{
+    static const char k_rgchHexToASCII[] = "0123456789abcdef";
+    int i;
+
+    if ((pszGUID == NULL) || (cbGUID <= 0)) {
+        return;
+    }
+
+    for ( i = 0; i < sizeof(guid.data) && i < (cbGUID-1)/2; i++ )
+    {
+        /* each input byte writes 2 ascii chars, and might write a null byte. */
+        /* If we don't have room for next input byte, stop */
+        unsigned char c = guid.data[i];
+
+        *pszGUID++ = k_rgchHexToASCII[ c >> 4 ];
+        *pszGUID++ = k_rgchHexToASCII[ c & 0x0F ];
+    }
+    *pszGUID = '\0';
+}
+
+
+/*-----------------------------------------------------------------------------
+ * Purpose: Returns the 4 bit nibble for a hex character
+ * Input  : c -
+ * Output : unsigned char
+ *-----------------------------------------------------------------------------*/
+static unsigned char nibble( char c )
+{
+    if ( ( c >= '0' ) &&
+        ( c <= '9' ) )
+    {
+        return (unsigned char)(c - '0');
+    }
+
+    if ( ( c >= 'A' ) &&
+        ( c <= 'F' ) )
+    {
+        return (unsigned char)(c - 'A' + 0x0a);
+    }
+
+    if ( ( c >= 'a' ) &&
+        ( c <= 'f' ) )
+    {
+        return (unsigned char)(c - 'a' + 0x0a);
+    }
+
+    /* received an invalid character, and no real way to return an error */
+    /* AssertMsg1( false, "Q_nibble invalid hex character '%c' ", c ); */
+    return 0;
+}
+
+
+/* convert the string version of a joystick guid to the struct */
+SDL_JoystickGUID SDL_JoystickGetGUIDFromString(const char *pchGUID)
+{
+    SDL_JoystickGUID guid;
+    int maxoutputbytes= sizeof(guid);
+    size_t len = SDL_strlen( pchGUID );
+    Uint8 *p;
+    size_t i;
+
+    /* Make sure it's even */
+    len = ( len ) & ~0x1;
+
+    SDL_memset( &guid, 0x00, sizeof(guid) );
+
+    p = (Uint8 *)&guid;
+    for ( i = 0;
+        ( i < len ) && ( ( p - (Uint8 *)&guid ) < maxoutputbytes );
+        i+=2, p++ )
+    {
+        *p = ( nibble( pchGUID[i] ) << 4 ) | nibble( pchGUID[i+1] );
+    }
+
+    return guid;
+}
+
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/SDL_joystick_c.h b/Source/3rd Party/sdl/src/joystick/SDL_joystick_c.h
new file mode 100644
index 000000000..bb0c0205a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/SDL_joystick_c.h	
@@ -0,0 +1,51 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Useful functions and variables from SDL_joystick.c */
+#include "SDL_joystick.h"
+
+/* Initialization and shutdown functions */
+extern int SDL_JoystickInit(void);
+extern void SDL_JoystickQuit(void);
+
+/* Initialization and shutdown functions */
+extern int SDL_GameControllerInit(void);
+extern void SDL_GameControllerQuit(void);
+
+
+/* Internal event queueing functions */
+extern int SDL_PrivateJoystickAxis(SDL_Joystick * joystick,
+                                   Uint8 axis, Sint16 value);
+extern int SDL_PrivateJoystickBall(SDL_Joystick * joystick,
+                                   Uint8 ball, Sint16 xrel, Sint16 yrel);
+extern int SDL_PrivateJoystickHat(SDL_Joystick * joystick,
+                                  Uint8 hat, Uint8 value);
+extern int SDL_PrivateJoystickButton(SDL_Joystick * joystick,
+                                     Uint8 button, Uint8 state);
+
+/* Helper function to let lower sys layer tell the event system if the joystick code needs to think */
+extern SDL_bool SDL_PrivateJoystickNeedsPolling();
+
+/* Internal sanity checking functions */
+extern int SDL_PrivateJoystickValid(SDL_Joystick * joystick);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/SDL_sysjoystick.h b/Source/3rd Party/sdl/src/joystick/SDL_sysjoystick.h
new file mode 100644
index 000000000..818509d67
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/SDL_sysjoystick.h	
@@ -0,0 +1,117 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This is the system specific header for the SDL joystick API */
+
+#include "SDL_joystick.h"
+#include "SDL_joystick_c.h"
+
+/* The SDL joystick structure */
+struct _SDL_Joystick
+{
+    SDL_JoystickID instance_id; /* Device instance, monotonically increasing from 0 */
+    char *name;                 /* Joystick name - system dependent */
+
+    int naxes;                  /* Number of axis controls on the joystick */
+    Sint16 *axes;               /* Current axis states */
+
+    int nhats;                  /* Number of hats on the joystick */
+    Uint8 *hats;                /* Current hat states */
+
+    int nballs;                 /* Number of trackballs on the joystick */
+    struct balldelta {
+        int dx;
+        int dy;
+    } *balls;                   /* Current ball motion deltas */
+
+    int nbuttons;               /* Number of buttons on the joystick */
+    Uint8 *buttons;             /* Current button states */
+
+    struct joystick_hwdata *hwdata;     /* Driver dependent information */
+
+    int ref_count;              /* Reference count for multiple opens */
+
+    Uint8 closed;               /* 1 if this device is no longer valid */
+    Uint8 uncentered;           /* 1 if this device needs to have its state reset to 0 */
+    struct _SDL_Joystick *next; /* pointer to next joystick we have allocated */
+};
+
+/* Function to scan the system for joysticks.
+ * Joystick 0 should be the system default joystick.
+ * This function should return the number of available joysticks, or -1
+ * on an unrecoverable fatal error.
+ */
+extern int SDL_SYS_JoystickInit(void);
+
+/* Function to return the number of joystick devices plugged in right now */
+extern int SDL_SYS_NumJoysticks();
+
+/* Function to cause any queued joystick insertions to be processed */
+extern void SDL_SYS_JoystickDetect();
+
+/* Function to determine if the joystick loop needs to run right now */
+extern SDL_bool SDL_SYS_JoystickNeedsPolling();
+
+/* Function to get the device-dependent name of a joystick */
+extern const char *SDL_SYS_JoystickNameForDeviceIndex(int device_index);
+
+/* Function to get the current instance id of the joystick located at device_index */
+extern SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index);
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+extern int SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index);
+
+/* Function to query if the joystick is currently attached
+ *   It returns 1 if attached, 0 otherwise.
+ */
+extern SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick * joystick);
+
+/* Function to update the state of a joystick - called as a device poll.
+ * This function shouldn't update the joystick structure directly,
+ * but instead should call SDL_PrivateJoystick*() to deliver events
+ * and update joystick device state.
+ */
+extern void SDL_SYS_JoystickUpdate(SDL_Joystick * joystick);
+
+/* Function to close a joystick after use */
+extern void SDL_SYS_JoystickClose(SDL_Joystick * joystick);
+
+/* Function to perform any system-specific joystick related cleanup */
+extern void SDL_SYS_JoystickQuit(void);
+
+/* Function to return the stable GUID for a plugged in device */
+extern SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID(int device_index);
+
+/* Function to return the stable GUID for a opened joystick */
+extern SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick);
+
+#if defined(SDL_JOYSTICK_DINPUT) || defined(SDL_JOYSTICK_XINPUT)
+/* Function to get the current instance id of the joystick located at device_index */
+extern SDL_bool SDL_SYS_IsXInputDeviceIndex( int device_index );
+extern SDL_bool SDL_SYS_IsXInputJoystick(SDL_Joystick * joystick);
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/android/SDL_sysjoystick.c b/Source/3rd Party/sdl/src/joystick/android/SDL_sysjoystick.c
new file mode 100644
index 000000000..422c5f5f4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/android/SDL_sysjoystick.c	
@@ -0,0 +1,582 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifdef SDL_JOYSTICK_ANDROID
+
+#include <stdio.h>              /* For the definition of NULL */
+#include "SDL_error.h"
+#include "SDL_events.h"
+
+#if !SDL_EVENTS_DISABLED
+#include "../../events/SDL_events_c.h"
+#endif
+
+#include "SDL_joystick.h"
+#include "SDL_hints.h"
+#include "SDL_assert.h"
+#include "SDL_timer.h"
+#include "SDL_log.h"
+#include "SDL_sysjoystick_c.h"
+#include "../SDL_joystick_c.h"
+#include "../../core/android/SDL_android.h"
+
+#include "android/keycodes.h"
+
+/* As of platform android-14, android/keycodes.h is missing these defines */
+#ifndef AKEYCODE_BUTTON_1
+#define AKEYCODE_BUTTON_1 188
+#define AKEYCODE_BUTTON_2 189
+#define AKEYCODE_BUTTON_3 190
+#define AKEYCODE_BUTTON_4 191
+#define AKEYCODE_BUTTON_5 192
+#define AKEYCODE_BUTTON_6 193
+#define AKEYCODE_BUTTON_7 194
+#define AKEYCODE_BUTTON_8 195
+#define AKEYCODE_BUTTON_9 196
+#define AKEYCODE_BUTTON_10 197
+#define AKEYCODE_BUTTON_11 198
+#define AKEYCODE_BUTTON_12 199
+#define AKEYCODE_BUTTON_13 200
+#define AKEYCODE_BUTTON_14 201
+#define AKEYCODE_BUTTON_15 202
+#define AKEYCODE_BUTTON_16 203
+#endif
+
+#define ANDROID_ACCELEROMETER_NAME "Android Accelerometer"
+#define ANDROID_ACCELEROMETER_DEVICE_ID INT_MIN
+#define ANDROID_MAX_NBUTTONS 36
+
+static SDL_joylist_item * JoystickByDeviceId(int device_id);
+
+static SDL_joylist_item *SDL_joylist = NULL;
+static SDL_joylist_item *SDL_joylist_tail = NULL;
+static int numjoysticks = 0;
+static int instance_counter = 0;
+
+
+/* Function to convert Android keyCodes into SDL ones.
+ * This code manipulation is done to get a sequential list of codes.
+ * FIXME: This is only suited for the case where we use a fixed number of buttons determined by ANDROID_MAX_NBUTTONS
+ */
+static int
+keycode_to_SDL(int keycode)
+{
+    /* FIXME: If this function gets too unwiedly in the future, replace with a lookup table */
+    int button = 0;
+    switch(keycode) 
+    {
+        /* Some gamepad buttons (API 9) */
+        case AKEYCODE_BUTTON_A:
+            button = SDL_CONTROLLER_BUTTON_A;
+            break;
+        case AKEYCODE_BUTTON_B:
+            button = SDL_CONTROLLER_BUTTON_B;
+            break;
+        case AKEYCODE_BUTTON_X:
+            button = SDL_CONTROLLER_BUTTON_X;
+            break;
+        case AKEYCODE_BUTTON_Y:
+            button = SDL_CONTROLLER_BUTTON_Y;
+            break;
+        case AKEYCODE_BUTTON_L1:
+            button = SDL_CONTROLLER_BUTTON_LEFTSHOULDER;
+            break;
+        case AKEYCODE_BUTTON_R1:
+            button = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER;
+            break;
+        case AKEYCODE_BUTTON_THUMBL:
+            button = SDL_CONTROLLER_BUTTON_LEFTSTICK;
+            break;
+        case AKEYCODE_BUTTON_THUMBR:
+            button = SDL_CONTROLLER_BUTTON_RIGHTSTICK;
+            break;
+        case AKEYCODE_BUTTON_START:
+            button = SDL_CONTROLLER_BUTTON_START;
+            break;
+        case AKEYCODE_BUTTON_SELECT:
+            button = SDL_CONTROLLER_BUTTON_BACK;
+            break;
+        case AKEYCODE_BUTTON_MODE:
+            button = SDL_CONTROLLER_BUTTON_GUIDE;
+            break;
+        case AKEYCODE_BUTTON_L2:
+            button = SDL_CONTROLLER_BUTTON_MAX; /* Not supported by GameController */
+            break;
+        case AKEYCODE_BUTTON_R2:
+            button = SDL_CONTROLLER_BUTTON_MAX+1; /* Not supported by GameController */
+            break;
+        case AKEYCODE_BUTTON_C:
+            button = SDL_CONTROLLER_BUTTON_MAX+2; /* Not supported by GameController */
+            break;
+        case AKEYCODE_BUTTON_Z:
+            button = SDL_CONTROLLER_BUTTON_MAX+3; /* Not supported by GameController */
+            break;
+                        
+        /* D-Pad key codes (API 1) */
+        case AKEYCODE_DPAD_UP:
+            button = SDL_CONTROLLER_BUTTON_DPAD_UP;
+            break;
+        case AKEYCODE_DPAD_DOWN:
+            button = SDL_CONTROLLER_BUTTON_DPAD_DOWN;
+            break;
+        case AKEYCODE_DPAD_LEFT:
+            button = SDL_CONTROLLER_BUTTON_DPAD_LEFT;
+            break;
+        case AKEYCODE_DPAD_RIGHT:
+            button = SDL_CONTROLLER_BUTTON_DPAD_RIGHT;
+            break;
+        case AKEYCODE_DPAD_CENTER:
+            button = SDL_CONTROLLER_BUTTON_MAX+4; /* Not supported by GameController */
+            break;
+
+        /* More gamepad buttons (API 12), these get mapped to 20...35*/
+        case AKEYCODE_BUTTON_1:
+        case AKEYCODE_BUTTON_2:
+        case AKEYCODE_BUTTON_3:
+        case AKEYCODE_BUTTON_4:
+        case AKEYCODE_BUTTON_5:
+        case AKEYCODE_BUTTON_6:
+        case AKEYCODE_BUTTON_7:
+        case AKEYCODE_BUTTON_8:
+        case AKEYCODE_BUTTON_9:
+        case AKEYCODE_BUTTON_10:
+        case AKEYCODE_BUTTON_11:
+        case AKEYCODE_BUTTON_12:
+        case AKEYCODE_BUTTON_13:
+        case AKEYCODE_BUTTON_14:
+        case AKEYCODE_BUTTON_15:
+        case AKEYCODE_BUTTON_16:
+            button = keycode - AKEYCODE_BUTTON_1 + SDL_CONTROLLER_BUTTON_MAX + 5;
+            break;
+            
+        default:
+            return -1;
+            break;
+    }
+    
+    /* This is here in case future generations, probably with six fingers per hand, 
+     * happily add new cases up above and forget to update the max number of buttons. 
+     */
+    SDL_assert(button < ANDROID_MAX_NBUTTONS);
+    return button;
+    
+}
+
+int
+Android_OnPadDown(int device_id, int keycode)
+{
+    SDL_joylist_item *item;
+    int button = keycode_to_SDL(keycode);
+    if (button >= 0) {
+        item = JoystickByDeviceId(device_id);
+        if (item && item->joystick) {
+            SDL_PrivateJoystickButton(item->joystick, button , SDL_PRESSED);
+        }
+        return 0;
+    }
+    
+    return -1;
+}
+
+int
+Android_OnPadUp(int device_id, int keycode)
+{
+    SDL_joylist_item *item;
+    int button = keycode_to_SDL(keycode);
+    if (button >= 0) {
+        item = JoystickByDeviceId(device_id);
+        if (item && item->joystick) {
+            SDL_PrivateJoystickButton(item->joystick, button, SDL_RELEASED);
+        }
+        return 0;
+    }
+    
+    return -1;
+}
+
+int
+Android_OnJoy(int device_id, int axis, float value)
+{
+    /* Android gives joy info normalized as [-1.0, 1.0] or [0.0, 1.0] */
+    SDL_joylist_item *item = JoystickByDeviceId(device_id);
+    if (item && item->joystick) {
+        SDL_PrivateJoystickAxis(item->joystick, axis, (Sint16) (32767.*value) );
+    }
+    
+    return 0;
+}
+
+int
+Android_OnHat(int device_id, int hat_id, int x, int y)
+{
+    const Uint8 position_map[3][3] = {
+        {SDL_HAT_LEFTUP, SDL_HAT_UP, SDL_HAT_RIGHTUP},
+        {SDL_HAT_LEFT, SDL_HAT_CENTERED, SDL_HAT_RIGHT},
+        {SDL_HAT_LEFTDOWN, SDL_HAT_DOWN, SDL_HAT_RIGHTDOWN}
+    };
+
+    if (x >= -1 && x <=1 && y >= -1 && y <= 1) {
+        SDL_joylist_item *item = JoystickByDeviceId(device_id);
+        if (item && item->joystick) {
+            SDL_PrivateJoystickHat(item->joystick, hat_id, position_map[y+1][x+1] );
+        }
+        return 0;
+    }
+
+    return -1;
+}
+
+
+int
+Android_AddJoystick(int device_id, const char *name, SDL_bool is_accelerometer, int nbuttons, int naxes, int nhats, int nballs)
+{
+    SDL_JoystickGUID guid;
+    SDL_joylist_item *item;
+#if !SDL_EVENTS_DISABLED
+    SDL_Event event;
+#endif
+    
+    if(JoystickByDeviceId(device_id) != NULL || name == NULL) {
+        return -1;
+    }
+    
+    /* the GUID is just the first 16 chars of the name for now */
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+
+    item = (SDL_joylist_item *) SDL_malloc(sizeof (SDL_joylist_item));
+    if (item == NULL) {
+        return -1;
+    }
+
+    SDL_zerop(item);
+    item->guid = guid;
+    item->device_id = device_id;
+    item->name = SDL_strdup(name);
+    if ( item->name == NULL ) {
+         SDL_free(item);
+         return -1;
+    }
+    
+    item->is_accelerometer = is_accelerometer;
+    if (nbuttons > -1) {
+        item->nbuttons = nbuttons;
+    }
+    else {
+        item->nbuttons = ANDROID_MAX_NBUTTONS;
+    }
+    item->naxes = naxes;
+    item->nhats = nhats;
+    item->nballs = nballs;
+    item->device_instance = instance_counter++;
+    if (SDL_joylist_tail == NULL) {
+        SDL_joylist = SDL_joylist_tail = item;
+    } else {
+        SDL_joylist_tail->next = item;
+        SDL_joylist_tail = item;
+    }
+
+    /* Need to increment the joystick count before we post the event */
+    ++numjoysticks;
+
+#if !SDL_EVENTS_DISABLED
+    event.type = SDL_JOYDEVICEADDED;
+
+    if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+        event.jdevice.which = (numjoysticks - 1);
+        if ( (SDL_EventOK == NULL) ||
+             (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
+            SDL_PushEvent(&event);
+        }
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+
+    SDL_Log("Added joystick %s with device_id %d", name, device_id);
+
+    return numjoysticks;
+}
+
+int 
+Android_RemoveJoystick(int device_id)
+{
+    SDL_joylist_item *item = SDL_joylist;
+    SDL_joylist_item *prev = NULL;
+#if !SDL_EVENTS_DISABLED
+    SDL_Event event;
+#endif
+    
+    /* Don't call JoystickByDeviceId here or there'll be an infinite loop! */
+    while (item != NULL) {
+        if (item->device_id == device_id) {
+            break;
+        }
+        prev = item;
+        item = item->next;
+    }
+    
+    if (item == NULL) {
+        return -1;
+    }
+
+    const int retval = item->device_instance;
+    if (item->joystick) {
+        item->joystick->hwdata = NULL;
+    }
+        
+    if (prev != NULL) {
+        prev->next = item->next;
+    } else {
+        SDL_assert(SDL_joylist == item);
+        SDL_joylist = item->next;
+    }
+    if (item == SDL_joylist_tail) {
+        SDL_joylist_tail = prev;
+    }
+
+    /* Need to decrement the joystick count before we post the event */
+    --numjoysticks;
+
+#if !SDL_EVENTS_DISABLED
+    event.type = SDL_JOYDEVICEREMOVED;
+
+    if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+        event.jdevice.which = item->device_instance;
+        if ( (SDL_EventOK == NULL) ||
+             (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
+            SDL_PushEvent(&event);
+        }
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+
+    SDL_Log("Removed joystick with device_id %d", device_id);
+    
+    SDL_free(item->name);
+    SDL_free(item);
+    return retval;
+}
+
+
+int
+SDL_SYS_JoystickInit(void)
+{
+    const char *hint;
+    SDL_SYS_JoystickDetect();
+    
+    hint = SDL_GetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK);
+    if (!hint || SDL_atoi(hint)) {
+        /* Default behavior, accelerometer as joystick */
+        Android_AddJoystick(ANDROID_ACCELEROMETER_DEVICE_ID, ANDROID_ACCELEROMETER_NAME, SDL_TRUE, 0, 3, 0, 0);
+    }
+   
+    return (numjoysticks);
+
+}
+
+int SDL_SYS_NumJoysticks()
+{
+    return numjoysticks;
+}
+
+void SDL_SYS_JoystickDetect()
+{
+    /* Support for device connect/disconnect is API >= 16 only,
+     * so we poll every three seconds
+     * Ref: http://developer.android.com/reference/android/hardware/input/InputManager.InputDeviceListener.html
+     */
+    static Uint32 timeout = 0;
+    if (SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) {
+        timeout = SDL_GetTicks() + 3000;
+        Android_JNI_PollInputDevices();
+    }
+}
+
+SDL_bool SDL_SYS_JoystickNeedsPolling()
+{
+    return SDL_TRUE;
+}
+
+static SDL_joylist_item *
+JoystickByDevIndex(int device_index)
+{
+    SDL_joylist_item *item = SDL_joylist;
+
+    if ((device_index < 0) || (device_index >= numjoysticks)) {
+        return NULL;
+    }
+
+    while (device_index > 0) {
+        SDL_assert(item != NULL);
+        device_index--;
+        item = item->next;
+    }
+
+    return item;
+}
+
+static SDL_joylist_item *
+JoystickByDeviceId(int device_id)
+{
+    SDL_joylist_item *item = SDL_joylist;
+
+    while (item != NULL) {
+        if (item->device_id == device_id) {
+            return item;
+        }
+        item = item->next;
+    }
+    
+    /* Joystick not found, try adding it */
+    SDL_SYS_JoystickDetect();
+    
+    while (item != NULL) {
+        if (item->device_id == device_id) {
+            return item;
+        }
+        item = item->next;
+    }
+
+    return NULL;
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char *
+SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    return JoystickByDevIndex(device_index)->name;
+}
+
+/* Function to perform the mapping from device index to the instance id for this index */
+SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    return JoystickByDevIndex(device_index)->device_instance;
+}
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+int
+SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+{
+    SDL_joylist_item *item = JoystickByDevIndex(device_index);
+
+    if (item == NULL ) {
+        return SDL_SetError("No such device");
+    }
+    
+    if (item->joystick != NULL) {
+        return SDL_SetError("Joystick already opened");
+    }
+
+    joystick->instance_id = item->device_instance;
+    joystick->hwdata = (struct joystick_hwdata *) item;
+    item->joystick = joystick;
+    joystick->nhats = item->nhats;
+    joystick->nballs = item->nballs;
+    joystick->nbuttons = item->nbuttons;
+    joystick->naxes = item->naxes;
+
+    return (0);
+}
+
+/* Function to determine is this joystick is attached to the system right now */
+SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
+{
+    return !joystick->closed && (joystick->hwdata != NULL);
+}
+
+void
+SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+{
+    int i;
+    Sint16 value;
+    float values[3];
+    SDL_joylist_item *item = SDL_joylist;
+
+    while (item) {
+        if (item->is_accelerometer) {
+            if (item->joystick) {
+                if (Android_JNI_GetAccelerometerValues(values)) {
+                    for ( i = 0; i < 3; i++ ) {
+                        value = (Sint16)(values[i] * 32767.0f);
+                        SDL_PrivateJoystickAxis(item->joystick, i, value);
+                    }
+                }
+            }
+            break;
+        }
+        item = item->next;
+    }
+}
+
+/* Function to close a joystick after use */
+void
+SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+{
+    if (joystick->hwdata) {
+        ((SDL_joylist_item*)joystick->hwdata)->joystick = NULL;
+        joystick->hwdata = NULL;
+    }
+    joystick->closed = 1;
+}
+
+/* Function to perform any system-specific joystick related cleanup */
+void
+SDL_SYS_JoystickQuit(void)
+{
+    SDL_joylist_item *item = NULL;
+    SDL_joylist_item *next = NULL;
+
+    for (item = SDL_joylist; item; item = next) {
+        next = item->next;
+        SDL_free(item->name);
+        SDL_free(item);
+    }
+
+    SDL_joylist = SDL_joylist_tail = NULL;
+
+    numjoysticks = 0;
+    instance_counter = 0;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    return JoystickByDevIndex(device_index)->guid;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    SDL_JoystickGUID guid;
+    
+    if (joystick->hwdata != NULL) {
+        return ((SDL_joylist_item*)joystick->hwdata)->guid;
+    }
+    
+    SDL_zero(guid);
+    return guid;
+}
+
+#endif /* SDL_JOYSTICK_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/android/SDL_sysjoystick_c.h b/Source/3rd Party/sdl/src/joystick/android/SDL_sysjoystick_c.h
new file mode 100644
index 000000000..3d56b0b99
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/android/SDL_sysjoystick_c.h	
@@ -0,0 +1,52 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+ 
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ 
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ 
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#include "SDL_config.h"
+
+#ifdef SDL_JOYSTICK_ANDROID
+#include "../SDL_sysjoystick.h"
+
+extern int Android_OnPadDown(int device_id, int keycode);
+extern int Android_OnPadUp(int device_id, int keycode);
+extern int Android_OnJoy(int device_id, int axisnum, float value);
+extern int Android_OnHat(int device_id, int hat_id, int x, int y);
+extern int Android_AddJoystick(int device_id, const char *name, SDL_bool is_accelerometer, int nbuttons, int naxes, int nhats, int nballs);
+extern int Android_RemoveJoystick(int device_id);
+
+/* A linked list of available joysticks */
+typedef struct SDL_joylist_item
+{
+    int device_instance;
+    int device_id; /* Android's device id */
+    char *name;   /* "SideWinder 3D Pro" or whatever */
+    SDL_JoystickGUID guid;
+    SDL_bool is_accelerometer;
+    SDL_Joystick *joystick;
+    int nbuttons, naxes, nhats, nballs;
+    
+    struct SDL_joylist_item *next;
+} SDL_joylist_item;
+
+typedef SDL_joylist_item joystick_hwdata;
+
+#endif /* SDL_JOYSTICK_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/bsd/SDL_sysjoystick.c b/Source/3rd Party/sdl/src/joystick/bsd/SDL_sysjoystick.c
new file mode 100644
index 000000000..2a09f923d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/bsd/SDL_sysjoystick.c	
@@ -0,0 +1,660 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_JOYSTICK_USBHID
+
+/*
+ * Joystick driver for the uhid(4) interface found in OpenBSD,
+ * NetBSD and FreeBSD.
+ *
+ * Maintainer: <vedge at csoft.org>
+ */
+
+#include <sys/param.h>
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#ifndef __FreeBSD_kernel_version
+#define __FreeBSD_kernel_version __FreeBSD_version
+#endif
+
+#if defined(HAVE_USB_H)
+#include <usb.h>
+#endif
+#ifdef __DragonFly__
+#include <bus/usb/usb.h>
+#include <bus/usb/usbhid.h>
+#else
+#include <dev/usb/usb.h>
+#include <dev/usb/usbhid.h>
+#endif
+
+#if defined(HAVE_USBHID_H)
+#include <usbhid.h>
+#elif defined(HAVE_LIBUSB_H)
+#include <libusb.h>
+#elif defined(HAVE_LIBUSBHID_H)
+#include <libusbhid.h>
+#endif
+
+#if defined(__FREEBSD__) || defined(__FreeBSD_kernel__)
+#ifndef __DragonFly__
+#include <osreldate.h>
+#endif
+#if __FreeBSD_kernel_version > 800063
+#include <dev/usb/usb_ioctl.h>
+#endif
+#include <sys/joystick.h>
+#endif
+
+#if SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
+#include <machine/joystick.h>
+#endif
+
+#include "SDL_joystick.h"
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
+
+#define MAX_UHID_JOYS   16
+#define MAX_JOY_JOYS    2
+#define MAX_JOYS    (MAX_UHID_JOYS + MAX_JOY_JOYS)
+
+
+struct report
+{
+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000)
+    void *buf; /* Buffer */
+#elif defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
+    struct usb_gen_descriptor *buf; /* Buffer */
+#else
+    struct usb_ctl_report *buf; /* Buffer */
+#endif
+    size_t size;                /* Buffer size */
+    int rid;                    /* Report ID */
+    enum
+    {
+        SREPORT_UNINIT,
+        SREPORT_CLEAN,
+        SREPORT_DIRTY
+    } status;
+};
+
+static struct
+{
+    int uhid_report;
+    hid_kind_t kind;
+    const char *name;
+} const repinfo[] = {
+    {UHID_INPUT_REPORT, hid_input, "input"},
+    {UHID_OUTPUT_REPORT, hid_output, "output"},
+    {UHID_FEATURE_REPORT, hid_feature, "feature"}
+};
+
+enum
+{
+    REPORT_INPUT = 0,
+    REPORT_OUTPUT = 1,
+    REPORT_FEATURE = 2
+};
+
+enum
+{
+    JOYAXE_X,
+    JOYAXE_Y,
+    JOYAXE_Z,
+    JOYAXE_SLIDER,
+    JOYAXE_WHEEL,
+    JOYAXE_RX,
+    JOYAXE_RY,
+    JOYAXE_RZ,
+    JOYAXE_count
+};
+
+struct joystick_hwdata
+{
+    int fd;
+    char *path;
+    enum
+    {
+        BSDJOY_UHID,            /* uhid(4) */
+        BSDJOY_JOY              /* joy(4) */
+    } type;
+    struct report_desc *repdesc;
+    struct report inreport;
+    int axis_map[JOYAXE_count]; /* map present JOYAXE_* to 0,1,.. */
+};
+
+static char *joynames[MAX_JOYS];
+static char *joydevnames[MAX_JOYS];
+
+static int report_alloc(struct report *, struct report_desc *, int);
+static void report_free(struct report *);
+
+#if defined(USBHID_UCR_DATA) || (defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version <= 800063)
+#define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
+#elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000))
+#define REP_BUF_DATA(rep) ((rep)->buf)
+#elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
+#define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
+#else
+#define REP_BUF_DATA(rep) ((rep)->buf->data)
+#endif
+
+static int SDL_SYS_numjoysticks = 0;
+
+int
+SDL_SYS_JoystickInit(void)
+{
+    char s[16];
+    int i, fd;
+
+    SDL_SYS_numjoysticks = 0;
+
+    SDL_memset(joynames, 0, sizeof(joynames));
+    SDL_memset(joydevnames, 0, sizeof(joydevnames));
+
+    for (i = 0; i < MAX_UHID_JOYS; i++) {
+        SDL_Joystick nj;
+
+        SDL_snprintf(s, SDL_arraysize(s), "/dev/uhid%d", i);
+
+        joynames[SDL_SYS_numjoysticks] = strdup(s);
+
+        if (SDL_SYS_JoystickOpen(&nj, SDL_SYS_numjoysticks) == 0) {
+            SDL_SYS_JoystickClose(&nj);
+            SDL_SYS_numjoysticks++;
+        } else {
+            SDL_free(joynames[SDL_SYS_numjoysticks]);
+            joynames[SDL_SYS_numjoysticks] = NULL;
+        }
+    }
+    for (i = 0; i < MAX_JOY_JOYS; i++) {
+        SDL_snprintf(s, SDL_arraysize(s), "/dev/joy%d", i);
+        fd = open(s, O_RDONLY);
+        if (fd != -1) {
+            joynames[SDL_SYS_numjoysticks++] = strdup(s);
+            close(fd);
+        }
+    }
+
+    /* Read the default USB HID usage table. */
+    hid_init(NULL);
+
+    return (SDL_SYS_numjoysticks);
+}
+
+int SDL_SYS_NumJoysticks()
+{
+    return SDL_SYS_numjoysticks;
+}
+
+void SDL_SYS_JoystickDetect()
+{
+}
+
+SDL_bool SDL_SYS_JoystickNeedsPolling()
+{
+    return SDL_FALSE;
+}
+
+const char *
+SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    if (joydevnames[device_index] != NULL) {
+        return (joydevnames[device_index]);
+    }
+    return (joynames[device_index]);
+}
+
+/* Function to perform the mapping from device index to the instance id for this index */
+SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    return device_index;
+}
+
+static int
+usage_to_joyaxe(unsigned usage)
+{
+    int joyaxe;
+    switch (usage) {
+    case HUG_X:
+        joyaxe = JOYAXE_X;
+        break;
+    case HUG_Y:
+        joyaxe = JOYAXE_Y;
+        break;
+    case HUG_Z:
+        joyaxe = JOYAXE_Z;
+        break;
+    case HUG_SLIDER:
+        joyaxe = JOYAXE_SLIDER;
+        break;
+    case HUG_WHEEL:
+        joyaxe = JOYAXE_WHEEL;
+        break;
+    case HUG_RX:
+        joyaxe = JOYAXE_RX;
+        break;
+    case HUG_RY:
+        joyaxe = JOYAXE_RY;
+        break;
+    case HUG_RZ:
+        joyaxe = JOYAXE_RZ;
+        break;
+    default:
+        joyaxe = -1;
+    }
+    return joyaxe;
+}
+
+static unsigned
+hatval_to_sdl(Sint32 hatval)
+{
+    static const unsigned hat_dir_map[8] = {
+        SDL_HAT_UP, SDL_HAT_RIGHTUP, SDL_HAT_RIGHT, SDL_HAT_RIGHTDOWN,
+        SDL_HAT_DOWN, SDL_HAT_LEFTDOWN, SDL_HAT_LEFT, SDL_HAT_LEFTUP
+    };
+    unsigned result;
+    if ((hatval & 7) == hatval)
+        result = hat_dir_map[hatval];
+    else
+        result = SDL_HAT_CENTERED;
+    return result;
+}
+
+
+int
+SDL_SYS_JoystickOpen(SDL_Joystick * joy, int device_index)
+{
+    char *path = joynames[device_index];
+    struct joystick_hwdata *hw;
+    struct hid_item hitem;
+    struct hid_data *hdata;
+    struct report *rep;
+    int fd;
+    int i;
+
+    fd = open(path, O_RDONLY);
+    if (fd == -1) {
+        return SDL_SetError("%s: %s", path, strerror(errno));
+    }
+
+    joy->instance_id = device_index;
+    hw = (struct joystick_hwdata *)
+        SDL_malloc(sizeof(struct joystick_hwdata));
+    if (hw == NULL) {
+        close(fd);
+        return SDL_OutOfMemory();
+    }
+    joy->hwdata = hw;
+    hw->fd = fd;
+    hw->path = strdup(path);
+    if (!SDL_strncmp(path, "/dev/joy", 8)) {
+        hw->type = BSDJOY_JOY;
+        joy->naxes = 2;
+        joy->nbuttons = 2;
+        joy->nhats = 0;
+        joy->nballs = 0;
+        joydevnames[device_index] = strdup("Gameport joystick");
+        goto usbend;
+    } else {
+        hw->type = BSDJOY_UHID;
+    }
+
+    {
+        int ax;
+        for (ax = 0; ax < JOYAXE_count; ax++)
+            hw->axis_map[ax] = -1;
+    }
+    hw->repdesc = hid_get_report_desc(fd);
+    if (hw->repdesc == NULL) {
+        SDL_SetError("%s: USB_GET_REPORT_DESC: %s", hw->path,
+                     strerror(errno));
+        goto usberr;
+    }
+    rep = &hw->inreport;
+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063) || defined(__FreeBSD_kernel__)
+    rep->rid = hid_get_report_id(fd);
+    if (rep->rid < 0) {
+#else
+    if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) {
+#endif
+        rep->rid = -1;          /* XXX */
+    }
+    if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {
+        goto usberr;
+    }
+    if (rep->size <= 0) {
+        SDL_SetError("%s: Input report descriptor has invalid length",
+                     hw->path);
+        goto usberr;
+    }
+#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111) || defined(__FreeBSD_kernel__)
+    hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid);
+#else
+    hdata = hid_start_parse(hw->repdesc, 1 << hid_input);
+#endif
+    if (hdata == NULL) {
+        SDL_SetError("%s: Cannot start HID parser", hw->path);
+        goto usberr;
+    }
+    joy->naxes = 0;
+    joy->nbuttons = 0;
+    joy->nhats = 0;
+    joy->nballs = 0;
+    for (i = 0; i < JOYAXE_count; i++)
+        hw->axis_map[i] = -1;
+
+    while (hid_get_item(hdata, &hitem) > 0) {
+        char *sp;
+        const char *s;
+
+        switch (hitem.kind) {
+        case hid_collection:
+            switch (HID_PAGE(hitem.usage)) {
+            case HUP_GENERIC_DESKTOP:
+                switch (HID_USAGE(hitem.usage)) {
+                case HUG_JOYSTICK:
+                case HUG_GAME_PAD:
+                    s = hid_usage_in_page(hitem.usage);
+                    sp = SDL_malloc(SDL_strlen(s) + 5);
+                    SDL_snprintf(sp, SDL_strlen(s) + 5, "%s (%d)",
+                                 s, device_index);
+                    joydevnames[device_index] = sp;
+                }
+            }
+            break;
+        case hid_input:
+            switch (HID_PAGE(hitem.usage)) {
+            case HUP_GENERIC_DESKTOP:
+                {
+                    unsigned usage = HID_USAGE(hitem.usage);
+                    int joyaxe = usage_to_joyaxe(usage);
+                    if (joyaxe >= 0) {
+                        hw->axis_map[joyaxe] = 1;
+                    } else if (usage == HUG_HAT_SWITCH) {
+                        joy->nhats++;
+                    }
+                    break;
+                }
+            case HUP_BUTTON:
+                joy->nbuttons++;
+                break;
+            default:
+                break;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    hid_end_parse(hdata);
+    for (i = 0; i < JOYAXE_count; i++)
+        if (hw->axis_map[i] > 0)
+            hw->axis_map[i] = joy->naxes++;
+
+  usbend:
+    /* The poll blocks the event thread. */
+    fcntl(fd, F_SETFL, O_NONBLOCK);
+
+    return (0);
+  usberr:
+    close(hw->fd);
+    SDL_free(hw->path);
+    SDL_free(hw);
+    return (-1);
+}
+
+/* Function to determine is this joystick is attached to the system right now */
+SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
+{
+    return SDL_TRUE;
+}
+
+void
+SDL_SYS_JoystickUpdate(SDL_Joystick * joy)
+{
+    struct hid_item hitem;
+    struct hid_data *hdata;
+    struct report *rep;
+    int nbutton, naxe = -1;
+    Sint32 v;
+
+#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__)
+    struct joystick gameport;
+    static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
+
+    if (joy->hwdata->type == BSDJOY_JOY) {
+        while (read(joy->hwdata->fd, &gameport, sizeof gameport) == sizeof gameport) {
+            if (abs(x - gameport.x) > 8) {
+                x = gameport.x;
+                if (x < xmin) {
+                    xmin = x;
+                }
+                if (x > xmax) {
+                    xmax = x;
+                }
+                if (xmin == xmax) {
+                    xmin--;
+                    xmax++;
+                }
+                v = (Sint32) x;
+                v -= (xmax + xmin + 1) / 2;
+                v *= 32768 / ((xmax - xmin + 1) / 2);
+                SDL_PrivateJoystickAxis(joy, 0, v);
+            }
+            if (abs(y - gameport.y) > 8) {
+                y = gameport.y;
+                if (y < ymin) {
+                    ymin = y;
+                }
+                if (y > ymax) {
+                    ymax = y;
+                }
+                if (ymin == ymax) {
+                    ymin--;
+                    ymax++;
+                }
+                v = (Sint32) y;
+                v -= (ymax + ymin + 1) / 2;
+                v *= 32768 / ((ymax - ymin + 1) / 2);
+                SDL_PrivateJoystickAxis(joy, 1, v);
+            }
+            if (gameport.b1 != joy->buttons[0]) {
+                SDL_PrivateJoystickButton(joy, 0, gameport.b1);
+            }
+            if (gameport.b2 != joy->buttons[1]) {
+                SDL_PrivateJoystickButton(joy, 1, gameport.b2);
+            }
+        }
+        return;
+    }
+#endif /* defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
+
+    rep = &joy->hwdata->inreport;
+
+    while (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) == rep->size) {
+#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111) || defined(__FreeBSD_kernel__)
+        hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
+#else
+        hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
+#endif
+        if (hdata == NULL) {
+            /*fprintf(stderr, "%s: Cannot start HID parser\n", joy->hwdata->path);*/
+            continue;
+        }
+
+        for (nbutton = 0; hid_get_item(hdata, &hitem) > 0;) {
+            switch (hitem.kind) {
+            case hid_input:
+                switch (HID_PAGE(hitem.usage)) {
+                case HUP_GENERIC_DESKTOP:
+                    {
+                        unsigned usage = HID_USAGE(hitem.usage);
+                        int joyaxe = usage_to_joyaxe(usage);
+                        if (joyaxe >= 0) {
+                            naxe = joy->hwdata->axis_map[joyaxe];
+                            /* scaleaxe */
+                            v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
+                            v -= (hitem.logical_maximum +
+                                  hitem.logical_minimum + 1) / 2;
+                            v *= 32768 /
+                                ((hitem.logical_maximum -
+                                  hitem.logical_minimum + 1) / 2);
+                            if (v != joy->axes[naxe]) {
+                                SDL_PrivateJoystickAxis(joy, naxe, v);
+                            }
+                        } else if (usage == HUG_HAT_SWITCH) {
+                            v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
+                            SDL_PrivateJoystickHat(joy, 0,
+                                                   hatval_to_sdl(v) -
+                                                   hitem.logical_minimum);
+                        }
+                        break;
+                    }
+                case HUP_BUTTON:
+                    v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
+                    if (joy->buttons[nbutton] != v) {
+                        SDL_PrivateJoystickButton(joy, nbutton, v);
+                    }
+                    nbutton++;
+                    break;
+                default:
+                    continue;
+                }
+                break;
+            default:
+                break;
+            }
+        }
+        hid_end_parse(hdata);
+    }
+}
+
+/* Function to close a joystick after use */
+void
+SDL_SYS_JoystickClose(SDL_Joystick * joy)
+{
+    if (SDL_strncmp(joy->hwdata->path, "/dev/joy", 8)) {
+        report_free(&joy->hwdata->inreport);
+        hid_dispose_report_desc(joy->hwdata->repdesc);
+    }
+    close(joy->hwdata->fd);
+    SDL_free(joy->hwdata->path);
+    SDL_free(joy->hwdata);
+
+    return;
+}
+
+void
+SDL_SYS_JoystickQuit(void)
+{
+    int i;
+
+    for (i = 0; i < MAX_JOYS; i++) {
+        SDL_free(joynames[i]);
+        SDL_free(joydevnames[i]);
+    }
+
+    return;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = joystick->name;
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+static int
+report_alloc(struct report *r, struct report_desc *rd, int repind)
+{
+    int len;
+
+#ifdef __DragonFly__
+    len = hid_report_size(rd, r->rid, repinfo[repind].kind);
+#elif __FREEBSD__
+# if (__FreeBSD_kernel_version >= 460000) || defined(__FreeBSD_kernel__)
+#  if (__FreeBSD_kernel_version <= 500111)
+    len = hid_report_size(rd, r->rid, repinfo[repind].kind);
+#  else
+    len = hid_report_size(rd, repinfo[repind].kind, r->rid);
+#  endif
+# else
+    len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
+# endif
+#else
+# ifdef USBHID_NEW
+    len = hid_report_size(rd, repinfo[repind].kind, r->rid);
+# else
+    len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
+# endif
+#endif
+
+    if (len < 0) {
+        return SDL_SetError("Negative HID report size");
+    }
+    r->size = len;
+
+    if (r->size > 0) {
+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000)
+        r->buf = SDL_malloc(r->size);
+#else
+        r->buf = SDL_malloc(sizeof(*r->buf) - sizeof(REP_BUF_DATA(r)) +
+                            r->size);
+#endif
+        if (r->buf == NULL) {
+            return SDL_OutOfMemory();
+        }
+    } else {
+        r->buf = NULL;
+    }
+
+    r->status = SREPORT_CLEAN;
+    return 0;
+}
+
+static void
+report_free(struct report *r)
+{
+    SDL_free(r->buf);
+    r->status = SREPORT_UNINIT;
+}
+
+#endif /* SDL_JOYSTICK_USBHID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/darwin/SDL_sysjoystick.c b/Source/3rd Party/sdl/src/joystick/darwin/SDL_sysjoystick.c
new file mode 100644
index 000000000..bdface777
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/darwin/SDL_sysjoystick.c	
@@ -0,0 +1,824 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_JOYSTICK_IOKIT
+
+#include <IOKit/hid/IOHIDLib.h>
+
+/* For force feedback testing. */
+#include <ForceFeedback/ForceFeedback.h>
+#include <ForceFeedback/ForceFeedbackConstants.h>
+
+#include "SDL_joystick.h"
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
+#include "SDL_sysjoystick_c.h"
+#include "SDL_events.h"
+#include "../../haptic/darwin/SDL_syshaptic_c.h"    /* For haptic hot plugging */
+#if !SDL_EVENTS_DISABLED
+#include "../../events/SDL_events_c.h"
+#endif
+
+/* The base object of the HID Manager API */
+static IOHIDManagerRef hidman = NULL;
+
+/* Linked list of all available devices */
+static recDevice *gpDeviceList = NULL;
+
+/* if SDL_TRUE then a device was added since the last update call */
+static SDL_bool s_bDeviceAdded = SDL_FALSE;
+static SDL_bool s_bDeviceRemoved = SDL_FALSE;
+
+/* static incrementing counter for new joystick devices seen on the system. Devices should start with index 0 */
+static int s_joystick_instance_id = -1;
+
+
+static void
+FreeElementList(recElement *pElement)
+{
+    while (pElement) {
+        recElement *pElementNext = pElement->pNext;
+        SDL_free(pElement);
+        pElement = pElementNext;
+    }
+}
+
+static recDevice *
+FreeDevice(recDevice *removeDevice)
+{
+    recDevice *pDeviceNext = NULL;
+    if (removeDevice) {
+        /* save next device prior to disposing of this device */
+        pDeviceNext = removeDevice->pNext;
+
+        if ( gpDeviceList == removeDevice ) {
+            gpDeviceList = pDeviceNext;
+        } else {
+            recDevice *device = gpDeviceList;
+            while (device->pNext != removeDevice) {
+                device = device->pNext;
+            }
+            device->pNext = pDeviceNext;
+        }
+        removeDevice->pNext = NULL;
+
+        /* free element lists */
+        FreeElementList(removeDevice->firstAxis);
+        FreeElementList(removeDevice->firstButton);
+        FreeElementList(removeDevice->firstHat);
+
+        SDL_free(removeDevice);
+    }
+    return pDeviceNext;
+}
+
+static SInt32
+GetHIDElementState(recDevice *pDevice, recElement *pElement)
+{
+    SInt32 value = 0;
+
+    if (pDevice && pElement) {
+        IOHIDValueRef valueRef;
+        if (IOHIDDeviceGetValue(pDevice->deviceRef, pElement->elementRef, &valueRef) == kIOReturnSuccess) {
+            value = (SInt32) IOHIDValueGetIntegerValue(valueRef);
+
+            /* record min and max for auto calibration */
+            if (value < pElement->minReport) {
+                pElement->minReport = value;
+            }
+            if (value > pElement->maxReport) {
+                pElement->maxReport = value;
+            }
+        }
+    }
+
+    return value;
+}
+
+static SInt32
+GetHIDScaledCalibratedState(recDevice * pDevice, recElement * pElement, SInt32 min, SInt32 max)
+{
+    const float deviceScale = max - min;
+    const float readScale = pElement->maxReport - pElement->minReport;
+    const SInt32 value = GetHIDElementState(pDevice, pElement);
+    if (readScale == 0) {
+        return value;           /* no scaling at all */
+    }
+    return ((value - pElement->minReport) * deviceScale / readScale) + min;
+}
+
+
+static void
+JoystickDeviceWasRemovedCallback(void *ctx, IOReturn result, void *sender)
+{
+    recDevice *device = (recDevice *) ctx;
+    device->removed = 1;
+#if SDL_HAPTIC_IOKIT
+    MacHaptic_MaybeRemoveDevice(device->ffservice);
+#endif
+    s_bDeviceRemoved = SDL_TRUE;
+}
+
+
+static void AddHIDElement(const void *value, void *parameter);
+
+/* Call AddHIDElement() on all elements in an array of IOHIDElementRefs */
+static void
+AddHIDElements(CFArrayRef array, recDevice *pDevice)
+{
+    const CFRange range = { 0, CFArrayGetCount(array) };
+    CFArrayApplyFunction(array, range, AddHIDElement, pDevice);
+}
+
+static SDL_bool
+ElementAlreadyAdded(const IOHIDElementCookie cookie, const recElement *listitem) {
+    while (listitem) {
+        if (listitem->cookie == cookie) {
+            return SDL_TRUE;
+        }
+        listitem = listitem->pNext;
+    }
+    return SDL_FALSE;
+}
+
+/* See if we care about this HID element, and if so, note it in our recDevice. */
+static void
+AddHIDElement(const void *value, void *parameter)
+{
+    recDevice *pDevice = (recDevice *) parameter;
+    IOHIDElementRef refElement = (IOHIDElementRef) value;
+    const CFTypeID elementTypeID = refElement ? CFGetTypeID(refElement) : 0;
+
+    if (refElement && (elementTypeID == IOHIDElementGetTypeID())) {
+        const IOHIDElementCookie cookie = IOHIDElementGetCookie(refElement);
+        const uint32_t usagePage = IOHIDElementGetUsagePage(refElement);
+        const uint32_t usage = IOHIDElementGetUsage(refElement);
+        recElement *element = NULL;
+        recElement **headElement = NULL;
+
+        /* look at types of interest */
+        switch (IOHIDElementGetType(refElement)) {
+            case kIOHIDElementTypeInput_Misc:
+            case kIOHIDElementTypeInput_Button:
+            case kIOHIDElementTypeInput_Axis: {
+                switch (usagePage) {    /* only interested in kHIDPage_GenericDesktop and kHIDPage_Button */
+                    case kHIDPage_GenericDesktop:
+                        switch (usage) {
+                            case kHIDUsage_GD_X:
+                            case kHIDUsage_GD_Y:
+                            case kHIDUsage_GD_Z:
+                            case kHIDUsage_GD_Rx:
+                            case kHIDUsage_GD_Ry:
+                            case kHIDUsage_GD_Rz:
+                            case kHIDUsage_GD_Slider:
+                            case kHIDUsage_GD_Dial:
+                            case kHIDUsage_GD_Wheel:
+                                if (!ElementAlreadyAdded(cookie, pDevice->firstAxis)) {
+                                    element = (recElement *) SDL_calloc(1, sizeof (recElement));
+                                    if (element) {
+                                        pDevice->axes++;
+                                        headElement = &(pDevice->firstAxis);
+                                    }
+                                }
+                                break;
+
+                            case kHIDUsage_GD_Hatswitch:
+                                if (!ElementAlreadyAdded(cookie, pDevice->firstHat)) {
+                                    element = (recElement *) SDL_calloc(1, sizeof (recElement));
+                                    if (element) {
+                                        pDevice->hats++;
+                                        headElement = &(pDevice->firstHat);
+                                    }
+                                }
+                                break;
+                        }
+                        break;
+
+                    case kHIDPage_Simulation:
+                        switch (usage) {
+                            case kHIDUsage_Sim_Rudder:
+                            case kHIDUsage_Sim_Throttle:
+                                if (!ElementAlreadyAdded(cookie, pDevice->firstAxis)) {
+                                    element = (recElement *) SDL_calloc(1, sizeof (recElement));
+                                    if (element) {
+                                        pDevice->axes++;
+                                        headElement = &(pDevice->firstAxis);
+                                    }
+                                }
+                                break;
+
+                            default:
+                                break;
+                        }
+                        break;
+
+                    case kHIDPage_Button:
+                        if (!ElementAlreadyAdded(cookie, pDevice->firstButton)) {
+                            element = (recElement *) SDL_calloc(1, sizeof (recElement));
+                            if (element) {
+                                pDevice->buttons++;
+                                headElement = &(pDevice->firstButton);
+                            }
+                        }
+                        break;
+
+                    default:
+                        break;
+                }
+            }
+            break;
+
+            case kIOHIDElementTypeCollection: {
+                CFArrayRef array = IOHIDElementGetChildren(refElement);
+                if (array) {
+                    AddHIDElements(array, pDevice);
+                }
+            }
+            break;
+
+            default:
+                break;
+        }
+
+        if (element && headElement) {       /* add to list */
+            recElement *elementPrevious = NULL;
+            recElement *elementCurrent = *headElement;
+            while (elementCurrent && usage >= elementCurrent->usage) {
+                elementPrevious = elementCurrent;
+                elementCurrent = elementCurrent->pNext;
+            }
+            if (elementPrevious) {
+                elementPrevious->pNext = element;
+            } else {
+                *headElement = element;
+            }
+
+            element->elementRef = refElement;
+            element->usagePage = usagePage;
+            element->usage = usage;
+            element->pNext = elementCurrent;
+
+            element->minReport = element->min = (SInt32) IOHIDElementGetLogicalMin(refElement);
+            element->maxReport = element->max = (SInt32) IOHIDElementGetLogicalMax(refElement);
+            element->cookie = IOHIDElementGetCookie(refElement);
+
+            pDevice->elements++;
+        }
+    }
+}
+
+static SDL_bool
+GetDeviceInfo(IOHIDDeviceRef hidDevice, recDevice *pDevice)
+{
+    Uint32 *guid32 = NULL;
+    CFTypeRef refCF = NULL;
+    CFArrayRef array = NULL;
+
+    /* get usage page and usage */
+    refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDPrimaryUsagePageKey));
+    if (refCF) {
+        CFNumberGetValue(refCF, kCFNumberSInt32Type, &pDevice->usagePage);
+    }
+    if (pDevice->usagePage != kHIDPage_GenericDesktop) {
+        return SDL_FALSE; /* Filter device list to non-keyboard/mouse stuff */
+    }
+
+    refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDPrimaryUsageKey));
+    if (refCF) {
+        CFNumberGetValue(refCF, kCFNumberSInt32Type, &pDevice->usage);
+    }
+
+    if ((pDevice->usage != kHIDUsage_GD_Joystick &&
+         pDevice->usage != kHIDUsage_GD_GamePad &&
+         pDevice->usage != kHIDUsage_GD_MultiAxisController)) {
+        return SDL_FALSE; /* Filter device list to non-keyboard/mouse stuff */
+    }
+
+    pDevice->deviceRef = hidDevice;
+
+    /* get device name */
+    refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDProductKey));
+    if (!refCF) {
+        /* Maybe we can't get "AwesomeJoystick2000", but we can get "Logitech"? */
+        refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDManufacturerKey));
+    }
+    if ((!refCF) || (!CFStringGetCString(refCF, pDevice->product, sizeof (pDevice->product), kCFStringEncodingUTF8))) {
+        SDL_strlcpy(pDevice->product, "Unidentified joystick", sizeof (pDevice->product));
+    }
+
+    refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDVendorIDKey));
+    if (refCF) {
+        CFNumberGetValue(refCF, kCFNumberSInt32Type, &pDevice->guid.data[0]);
+    }
+
+    refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDProductIDKey));
+    if (refCF) {
+        CFNumberGetValue(refCF, kCFNumberSInt32Type, &pDevice->guid.data[8]);
+    }
+
+    /* Check to make sure we have a vendor and product ID
+       If we don't, use the same algorithm as the Linux code for Bluetooth devices */
+    guid32 = (Uint32*)pDevice->guid.data;
+    if (!guid32[0] && !guid32[1]) {
+        /* If we don't have a vendor and product ID this is probably a Bluetooth device */
+        const Uint16 BUS_BLUETOOTH = 0x05;
+        Uint16 *guid16 = (Uint16 *)guid32;
+        *guid16++ = BUS_BLUETOOTH;
+        *guid16++ = 0;
+        SDL_strlcpy((char*)guid16, pDevice->product, sizeof(pDevice->guid.data) - 4);
+    }
+
+    array = IOHIDDeviceCopyMatchingElements(hidDevice, NULL, kIOHIDOptionsTypeNone);
+    if (array) {
+        AddHIDElements(array, pDevice);
+        CFRelease(array);
+    }
+
+    return SDL_TRUE;
+}
+
+
+static void
+JoystickDeviceWasAddedCallback(void *ctx, IOReturn res, void *sender, IOHIDDeviceRef ioHIDDeviceObject)
+{
+    if (res != kIOReturnSuccess) {
+        return;
+    }
+
+    recDevice *device = (recDevice *) SDL_calloc(1, sizeof(recDevice));
+
+    if (!device) {
+        SDL_OutOfMemory();
+        return;
+    }
+
+    if (!GetDeviceInfo(ioHIDDeviceObject, device)) {
+        SDL_free(device);
+        return;   /* not a device we care about, probably. */
+    }
+
+    /* Get notified when this device is disconnected. */
+    IOHIDDeviceRegisterRemovalCallback(ioHIDDeviceObject, JoystickDeviceWasRemovedCallback, device);
+    IOHIDDeviceScheduleWithRunLoop(ioHIDDeviceObject, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+
+    /* Allocate an instance ID for this device */
+    device->instance_id = ++s_joystick_instance_id;
+
+    /* We have to do some storage of the io_service_t for SDL_HapticOpenFromJoystick */
+    if (IOHIDDeviceGetService != NULL) {  /* weak reference: available in 10.6 and later. */
+        const io_service_t ioservice = IOHIDDeviceGetService(ioHIDDeviceObject);
+        if ((ioservice) && (FFIsForceFeedback(ioservice) == FF_OK)) {
+            device->ffservice = ioservice;
+#if SDL_HAPTIC_IOKIT
+            MacHaptic_MaybeAddDevice(ioservice);
+#endif
+        }
+    }
+
+    device->send_open_event = 1;
+    s_bDeviceAdded = SDL_TRUE;
+
+    /* Add device to the end of the list */
+    if ( !gpDeviceList )
+    {
+        gpDeviceList = device;
+    }
+    else
+    {
+        recDevice *curdevice;
+
+        curdevice = gpDeviceList;
+        while ( curdevice->pNext )
+        {
+            curdevice = curdevice->pNext;
+        }
+        curdevice->pNext = device;
+    }
+}
+
+static SDL_bool
+ConfigHIDManager(CFArrayRef matchingArray)
+{
+    CFRunLoopRef runloop = CFRunLoopGetCurrent();
+
+    /* Run in a custom RunLoop mode just while initializing,
+       so we can detect sticks without messing with everything else. */
+    CFStringRef tempRunLoopMode = CFSTR("SDLJoystickInit");
+
+    if (IOHIDManagerOpen(hidman, kIOHIDOptionsTypeNone) != kIOReturnSuccess) {
+        return SDL_FALSE;
+    }
+
+    IOHIDManagerRegisterDeviceMatchingCallback(hidman, JoystickDeviceWasAddedCallback, NULL);
+    IOHIDManagerScheduleWithRunLoop(hidman, runloop, tempRunLoopMode);
+    IOHIDManagerSetDeviceMatchingMultiple(hidman, matchingArray);
+
+    while (CFRunLoopRunInMode(tempRunLoopMode,0,TRUE)==kCFRunLoopRunHandledSource) {
+        /* no-op. Callback fires once per existing device. */
+    }
+
+    /* Put this in the normal RunLoop mode now, for future hotplug events. */
+    IOHIDManagerUnscheduleFromRunLoop(hidman, runloop, tempRunLoopMode);
+    IOHIDManagerScheduleWithRunLoop(hidman, runloop, kCFRunLoopDefaultMode);
+
+    return SDL_TRUE;  /* good to go. */
+}
+
+
+static CFDictionaryRef
+CreateHIDDeviceMatchDictionary(const UInt32 page, const UInt32 usage, int *okay)
+{
+    CFDictionaryRef retval = NULL;
+    CFNumberRef pageNumRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
+    CFNumberRef usageNumRef = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &usage);
+    const void *keys[2] = { (void *) CFSTR(kIOHIDDeviceUsagePageKey), (void *) CFSTR(kIOHIDDeviceUsageKey) };
+    const void *vals[2] = { (void *) pageNumRef, (void *) usageNumRef };
+
+    if (pageNumRef && usageNumRef) {
+        retval = CFDictionaryCreate(kCFAllocatorDefault, keys, vals, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    }
+
+    if (pageNumRef) {
+        CFRelease(pageNumRef);
+    }
+    if (usageNumRef) {
+        CFRelease(usageNumRef);
+    }
+
+    if (!retval) {
+        *okay = 0;
+    }
+
+    return retval;
+}
+
+static SDL_bool
+CreateHIDManager(void)
+{
+    SDL_bool retval = SDL_FALSE;
+    int okay = 1;
+    const void *vals[] = {
+        (void *) CreateHIDDeviceMatchDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick, &okay),
+        (void *) CreateHIDDeviceMatchDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad, &okay),
+        (void *) CreateHIDDeviceMatchDictionary(kHIDPage_GenericDesktop, kHIDUsage_GD_MultiAxisController, &okay),
+    };
+    const size_t numElements = SDL_arraysize(vals);
+    CFArrayRef array = okay ? CFArrayCreate(kCFAllocatorDefault, vals, numElements, &kCFTypeArrayCallBacks) : NULL;
+    size_t i;
+
+    for (i = 0; i < numElements; i++) {
+        if (vals[i]) {
+            CFRelease((CFTypeRef) vals[i]);
+        }
+    }
+
+    if (array) {
+        hidman = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone);
+        if (hidman != NULL) {
+            retval = ConfigHIDManager(array);
+        }
+        CFRelease(array);
+    }
+
+    return retval;
+}
+
+
+/* Function to scan the system for joysticks.
+ * Joystick 0 should be the system default joystick.
+ * This function should return the number of available joysticks, or -1
+ * on an unrecoverable fatal error.
+ */
+int
+SDL_SYS_JoystickInit(void)
+{
+    if (gpDeviceList) {
+        return SDL_SetError("Joystick: Device list already inited.");
+    }
+
+    if (!CreateHIDManager()) {
+        return SDL_SetError("Joystick: Couldn't initialize HID Manager");
+    }
+
+    return SDL_SYS_NumJoysticks();
+}
+
+/* Function to return the number of joystick devices plugged in right now */
+int
+SDL_SYS_NumJoysticks()
+{
+    recDevice *device = gpDeviceList;
+    int nJoySticks = 0;
+
+    while (device) {
+        if (!device->removed) {
+            nJoySticks++;
+        }
+        device = device->pNext;
+    }
+
+    return nJoySticks;
+}
+
+/* Function to cause any queued joystick insertions to be processed
+ */
+void
+SDL_SYS_JoystickDetect()
+{
+    if (s_bDeviceAdded || s_bDeviceRemoved) {
+        recDevice *device = gpDeviceList;
+        s_bDeviceAdded = SDL_FALSE;
+        s_bDeviceRemoved = SDL_FALSE;
+        int device_index = 0;
+        /* send notifications */
+        while (device) {
+            if (device->send_open_event) {
+                device->send_open_event = 0;
+/* !!! FIXME: why isn't there an SDL_PrivateJoyDeviceAdded()? */
+#if !SDL_EVENTS_DISABLED
+                SDL_Event event;
+                event.type = SDL_JOYDEVICEADDED;
+
+                if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+                    event.jdevice.which = device_index;
+                    if ((SDL_EventOK == NULL)
+                        || (*SDL_EventOK) (SDL_EventOKParam, &event)) {
+                        SDL_PushEvent(&event);
+                    }
+                }
+#endif /* !SDL_EVENTS_DISABLED */
+
+            }
+
+            if (device->removed) {
+                const int instance_id = device->instance_id;
+                device = FreeDevice(device);
+
+/* !!! FIXME: why isn't there an SDL_PrivateJoyDeviceRemoved()? */
+#if !SDL_EVENTS_DISABLED
+                SDL_Event event;
+                event.type = SDL_JOYDEVICEREMOVED;
+
+                if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+                    event.jdevice.which = instance_id;
+                    if ((SDL_EventOK == NULL)
+                        || (*SDL_EventOK) (SDL_EventOKParam, &event)) {
+                        SDL_PushEvent(&event);
+                    }
+                }
+#endif /* !SDL_EVENTS_DISABLED */
+
+            } else {
+                device = device->pNext;
+                device_index++;
+            }
+        }
+    }
+}
+
+SDL_bool
+SDL_SYS_JoystickNeedsPolling()
+{
+    return s_bDeviceAdded || s_bDeviceRemoved;
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char *
+SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    recDevice *device = gpDeviceList;
+
+    while (device_index-- > 0) {
+        device = device->pNext;
+    }
+
+    return device->product;
+}
+
+/* Function to return the instance id of the joystick at device_index
+ */
+SDL_JoystickID
+SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    recDevice *device = gpDeviceList;
+    int index;
+
+    for (index = device_index; index > 0; index--) {
+        device = device->pNext;
+    }
+
+    return device->instance_id;
+}
+
+/* Function to open a joystick for use.
+ * The joystick to open is specified by the index field of the joystick.
+ * This should fill the nbuttons and naxes fields of the joystick structure.
+ * It returns 0, or -1 if there is an error.
+ */
+int
+SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+{
+    recDevice *device = gpDeviceList;
+    int index;
+
+    for (index = device_index; index > 0; index--) {
+        device = device->pNext;
+    }
+
+    joystick->instance_id = device->instance_id;
+    joystick->hwdata = device;
+    joystick->name = device->product;
+
+    joystick->naxes = device->axes;
+    joystick->nhats = device->hats;
+    joystick->nballs = 0;
+    joystick->nbuttons = device->buttons;
+    return 0;
+}
+
+/* Function to query if the joystick is currently attached
+ *   It returns 1 if attached, 0 otherwise.
+ */
+SDL_bool
+SDL_SYS_JoystickAttached(SDL_Joystick * joystick)
+{
+    recDevice *device = gpDeviceList;
+
+    while (device) {
+        if (joystick->instance_id == device->instance_id) {
+            return SDL_TRUE;
+        }
+        device = device->pNext;
+    }
+
+    return SDL_FALSE;
+}
+
+/* Function to update the state of a joystick - called as a device poll.
+ * This function shouldn't update the joystick structure directly,
+ * but instead should call SDL_PrivateJoystick*() to deliver events
+ * and update joystick device state.
+ */
+void
+SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+{
+    recDevice *device = joystick->hwdata;
+    recElement *element;
+    SInt32 value, range;
+    int i;
+
+    if (!device) {
+        return;
+    }
+
+    if (device->removed) {      /* device was unplugged; ignore it. */
+        joystick->closed = 1;
+        joystick->uncentered = 1;
+        joystick->hwdata = NULL;
+        return;
+    }
+
+    element = device->firstAxis;
+    i = 0;
+    while (element) {
+        value = GetHIDScaledCalibratedState(device, element, -32768, 32767);
+        if (value != joystick->axes[i]) {
+            SDL_PrivateJoystickAxis(joystick, i, value);
+        }
+        element = element->pNext;
+        ++i;
+    }
+
+    element = device->firstButton;
+    i = 0;
+    while (element) {
+        value = GetHIDElementState(device, element);
+        if (value > 1) {          /* handle pressure-sensitive buttons */
+            value = 1;
+        }
+        if (value != joystick->buttons[i]) {
+            SDL_PrivateJoystickButton(joystick, i, value);
+        }
+        element = element->pNext;
+        ++i;
+    }
+
+    element = device->firstHat;
+    i = 0;
+    while (element) {
+        Uint8 pos = 0;
+
+        range = (element->max - element->min + 1);
+        value = GetHIDElementState(device, element) - element->min;
+        if (range == 4) {         /* 4 position hatswitch - scale up value */
+            value *= 2;
+        } else if (range != 8) {    /* Neither a 4 nor 8 positions - fall back to default position (centered) */
+            value = -1;
+        }
+        switch (value) {
+        case 0:
+            pos = SDL_HAT_UP;
+            break;
+        case 1:
+            pos = SDL_HAT_RIGHTUP;
+            break;
+        case 2:
+            pos = SDL_HAT_RIGHT;
+            break;
+        case 3:
+            pos = SDL_HAT_RIGHTDOWN;
+            break;
+        case 4:
+            pos = SDL_HAT_DOWN;
+            break;
+        case 5:
+            pos = SDL_HAT_LEFTDOWN;
+            break;
+        case 6:
+            pos = SDL_HAT_LEFT;
+            break;
+        case 7:
+            pos = SDL_HAT_LEFTUP;
+            break;
+        default:
+            /* Every other value is mapped to center. We do that because some
+             * joysticks use 8 and some 15 for this value, and apparently
+             * there are even more variants out there - so we try to be generous.
+             */
+            pos = SDL_HAT_CENTERED;
+            break;
+        }
+
+        if (pos != joystick->hats[i]) {
+            SDL_PrivateJoystickHat(joystick, i, pos);
+        }
+
+        element = element->pNext;
+        ++i;
+    }
+}
+
+/* Function to close a joystick after use */
+void
+SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+{
+    joystick->closed = 1;
+}
+
+/* Function to perform any system-specific joystick related cleanup */
+void
+SDL_SYS_JoystickQuit(void)
+{
+    while (FreeDevice(gpDeviceList)) {
+        /* spin */
+    }
+
+    if (hidman) {
+        IOHIDManagerClose(hidman, kIOHIDOptionsTypeNone);
+        CFRelease(hidman);
+        hidman = NULL;
+    }
+
+    s_bDeviceAdded = s_bDeviceRemoved = SDL_FALSE;
+}
+
+
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    recDevice *device = gpDeviceList;
+    int index;
+
+    for (index = device_index; index > 0; index--) {
+        device = device->pNext;
+    }
+
+    return device->guid;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick *joystick)
+{
+    return joystick->hwdata->guid;
+}
+
+#endif /* SDL_JOYSTICK_IOKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/darwin/SDL_sysjoystick_c.h b/Source/3rd Party/sdl/src/joystick/darwin/SDL_sysjoystick_c.h
new file mode 100644
index 000000000..0a15ba18d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/darwin/SDL_sysjoystick_c.h	
@@ -0,0 +1,73 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef SDL_JOYSTICK_IOKIT_H
+
+#include <IOKit/hid/IOHIDLib.h>
+
+struct recElement
+{
+    IOHIDElementRef elementRef;
+    IOHIDElementCookie cookie;
+    uint32_t usagePage, usage;      /* HID usage */
+    SInt32 min;                   /* reported min value possible */
+    SInt32 max;                   /* reported max value possible */
+
+    /* runtime variables used for auto-calibration */
+    SInt32 minReport;             /* min returned value */
+    SInt32 maxReport;             /* max returned value */
+
+    struct recElement *pNext;   /* next element in list */
+};
+typedef struct recElement recElement;
+
+struct joystick_hwdata
+{
+    IOHIDDeviceRef deviceRef;   /* HIDManager device handle */
+    io_service_t ffservice;     /* Interface for force feedback, 0 = no ff */
+
+    char product[256];          /* name of product */
+    uint32_t usage;                 /* usage page from IOUSBHID Parser.h which defines general usage */
+    uint32_t usagePage;             /* usage within above page from IOUSBHID Parser.h which defines specific usage */
+
+    int axes;                  /* number of axis (calculated, not reported by device) */
+    int buttons;               /* number of buttons (calculated, not reported by device) */
+    int hats;                  /* number of hat switches (calculated, not reported by device) */
+    int elements;              /* number of total elements (should be total of above) (calculated, not reported by device) */
+
+    recElement *firstAxis;
+    recElement *firstButton;
+    recElement *firstHat;
+
+    int removed;
+    int uncentered;
+
+    int instance_id;
+    SDL_JoystickGUID guid;
+    Uint8 send_open_event;      /* 1 if we need to send an Added event for this device */
+
+    struct joystick_hwdata *pNext;      /* next device */
+};
+typedef struct joystick_hwdata recDevice;
+
+
+#endif /* SDL_JOYSTICK_IOKIT_H */
diff --git a/Source/3rd Party/sdl/src/joystick/dummy/SDL_sysjoystick.c b/Source/3rd Party/sdl/src/joystick/dummy/SDL_sysjoystick.c
new file mode 100644
index 000000000..0d45b6ce2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/dummy/SDL_sysjoystick.c	
@@ -0,0 +1,133 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if defined(SDL_JOYSTICK_DUMMY) || defined(SDL_JOYSTICK_DISABLED)
+
+/* This is the dummy implementation of the SDL joystick API */
+
+#include "SDL_joystick.h"
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
+
+/* Function to scan the system for joysticks.
+ * It should return 0, or -1 on an unrecoverable fatal error.
+ */
+int
+SDL_SYS_JoystickInit(void)
+{
+    return (0);
+}
+
+int SDL_SYS_NumJoysticks()
+{
+    return 0;
+}
+
+void SDL_SYS_JoystickDetect()
+{
+}
+
+SDL_bool SDL_SYS_JoystickNeedsPolling()
+{
+    return SDL_FALSE;
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char *
+SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    SDL_SetError("Logic error: No joysticks available");
+    return (NULL);
+}
+
+/* Function to perform the mapping from device index to the instance id for this index */
+SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    return device_index;
+}
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+int
+SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+{
+    return SDL_SetError("Logic error: No joysticks available");
+}
+
+/* Function to determine is this joystick is attached to the system right now */
+SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
+{
+    return SDL_TRUE;
+}
+
+/* Function to update the state of a joystick - called as a device poll.
+ * This function shouldn't update the joystick structure directly,
+ * but instead should call SDL_PrivateJoystick*() to deliver events
+ * and update joystick device state.
+ */
+void
+SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+{
+    return;
+}
+
+/* Function to close a joystick after use */
+void
+SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+{
+    return;
+}
+
+/* Function to perform any system-specific joystick related cleanup */
+void
+SDL_SYS_JoystickQuit(void)
+{
+    return;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = joystick->name;
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+#endif /* SDL_JOYSTICK_DUMMY || SDL_JOYSTICK_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/haiku/SDL_haikujoystick.cc b/Source/3rd Party/sdl/src/joystick/haiku/SDL_haikujoystick.cc
new file mode 100644
index 000000000..95757bc1d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/haiku/SDL_haikujoystick.cc	
@@ -0,0 +1,281 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_JOYSTICK_HAIKU
+
+/* This is the Haiku implementation of the SDL joystick API */
+
+#include <os/support/String.h>
+#include <os/device/Joystick.h>
+
+extern "C"
+{
+
+#include "SDL_joystick.h"
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
+
+
+/* The maximum number of joysticks we'll detect */
+#define MAX_JOYSTICKS	16
+
+/* A list of available joysticks */
+    static char *SDL_joyport[MAX_JOYSTICKS];
+    static char *SDL_joyname[MAX_JOYSTICKS];
+
+/* The private structure used to keep track of a joystick */
+    struct joystick_hwdata
+    {
+        BJoystick *stick;
+        uint8 *new_hats;
+        int16 *new_axes;
+    };
+
+    static int SDL_SYS_numjoysticks = 0;
+
+/* Function to scan the system for joysticks.
+ * This function should set SDL_numjoysticks to the number of available
+ * joysticks.  Joystick 0 should be the system default joystick.
+ * It should return 0, or -1 on an unrecoverable fatal error.
+ */
+    int SDL_SYS_JoystickInit(void)
+    {
+        BJoystick joystick;
+        int i;
+        int32 nports;
+        char name[B_OS_NAME_LENGTH];
+
+        /* Search for attached joysticks */
+          nports = joystick.CountDevices();
+          SDL_SYS_numjoysticks = 0;
+          SDL_memset(SDL_joyport, 0, (sizeof SDL_joyport));
+          SDL_memset(SDL_joyname, 0, (sizeof SDL_joyname));
+        for (i = 0; (SDL_SYS_numjoysticks < MAX_JOYSTICKS) && (i < nports); ++i)
+        {
+            if (joystick.GetDeviceName(i, name) == B_OK) {
+                if (joystick.Open(name) != B_ERROR) {
+                    BString stick_name;
+                      joystick.GetControllerName(&stick_name);
+                      SDL_joyport[SDL_SYS_numjoysticks] = strdup(name);
+                      SDL_joyname[SDL_SYS_numjoysticks] = strdup(stick_name.String());
+                      SDL_SYS_numjoysticks++;
+                      joystick.Close();
+                }
+            }
+        }
+        return (SDL_SYS_numjoysticks);
+    }
+
+    int SDL_SYS_NumJoysticks()
+    {
+        return SDL_SYS_numjoysticks;
+    }
+
+    void SDL_SYS_JoystickDetect()
+    {
+    }
+
+    SDL_bool SDL_SYS_JoystickNeedsPolling()
+    {
+        return SDL_FALSE;
+    }
+
+/* Function to get the device-dependent name of a joystick */
+    const char *SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+    {
+        return SDL_joyname[device_index];
+    }
+
+/* Function to perform the mapping from device index to the instance id for this index */
+    SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+    {
+        return device_index;
+    }
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+    int SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+    {
+        BJoystick *stick;
+
+        /* Create the joystick data structure */
+        joystick->instance_id = device_index;
+        joystick->hwdata = (struct joystick_hwdata *)
+            SDL_malloc(sizeof(*joystick->hwdata));
+        if (joystick->hwdata == NULL) {
+            return SDL_OutOfMemory();
+        }
+        SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata));
+        stick = new BJoystick;
+        joystick->hwdata->stick = stick;
+
+        /* Open the requested joystick for use */
+        if (stick->Open(SDL_joyport[device_index]) == B_ERROR) {
+            SDL_SYS_JoystickClose(joystick);
+            return SDL_SetError("Unable to open joystick");
+        }
+
+        /* Set the joystick to calibrated mode */
+        stick->EnableCalibration();
+
+        /* Get the number of buttons, hats, and axes on the joystick */
+        joystick->nbuttons = stick->CountButtons();
+        joystick->naxes = stick->CountAxes();
+        joystick->nhats = stick->CountHats();
+
+        joystick->hwdata->new_axes = (int16 *)
+            SDL_malloc(joystick->naxes * sizeof(int16));
+        joystick->hwdata->new_hats = (uint8 *)
+            SDL_malloc(joystick->nhats * sizeof(uint8));
+        if (!joystick->hwdata->new_hats || !joystick->hwdata->new_axes) {
+            SDL_SYS_JoystickClose(joystick);
+            return SDL_OutOfMemory();
+        }
+
+        /* We're done! */
+        return (0);
+    }
+
+/* Function to determine is this joystick is attached to the system right now */
+    SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
+    {
+        return SDL_TRUE;
+    }
+
+/* Function to update the state of a joystick - called as a device poll.
+ * This function shouldn't update the joystick structure directly,
+ * but instead should call SDL_PrivateJoystick*() to deliver events
+ * and update joystick device state.
+ */
+    void SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+    {
+        static const Uint8 hat_map[9] = {
+            SDL_HAT_CENTERED,
+            SDL_HAT_UP,
+            SDL_HAT_RIGHTUP,
+            SDL_HAT_RIGHT,
+            SDL_HAT_RIGHTDOWN,
+            SDL_HAT_DOWN,
+            SDL_HAT_LEFTDOWN,
+            SDL_HAT_LEFT,
+            SDL_HAT_LEFTUP
+        };
+        const int JITTER = (32768 / 10);        /* 10% jitter threshold (ok?) */
+
+        BJoystick *stick;
+        int i, change;
+        int16 *axes;
+        uint8 *hats;
+        uint32 buttons;
+
+        /* Set up data pointers */
+        stick = joystick->hwdata->stick;
+        axes = joystick->hwdata->new_axes;
+        hats = joystick->hwdata->new_hats;
+
+        /* Get the new joystick state */
+        stick->Update();
+        stick->GetAxisValues(axes);
+        stick->GetHatValues(hats);
+        buttons = stick->ButtonValues();
+
+        /* Generate axis motion events */
+        for (i = 0; i < joystick->naxes; ++i) {
+            change = ((int32) axes[i] - joystick->axes[i]);
+            if ((change > JITTER) || (change < -JITTER)) {
+                SDL_PrivateJoystickAxis(joystick, i, axes[i]);
+            }
+        }
+
+        /* Generate hat change events */
+        for (i = 0; i < joystick->nhats; ++i) {
+            if (hats[i] != joystick->hats[i]) {
+                SDL_PrivateJoystickHat(joystick, i, hat_map[hats[i]]);
+            }
+        }
+
+        /* Generate button events */
+        for (i = 0; i < joystick->nbuttons; ++i) {
+            if ((buttons & 0x01) != joystick->buttons[i]) {
+                SDL_PrivateJoystickButton(joystick, i, (buttons & 0x01));
+            }
+            buttons >>= 1;
+        }
+    }
+
+/* Function to close a joystick after use */
+    void SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+    {
+        if (joystick->hwdata) {
+            joystick->hwdata->stick->Close();
+            delete joystick->hwdata->stick;
+            SDL_free(joystick->hwdata->new_hats);
+            SDL_free(joystick->hwdata->new_axes);
+            SDL_free(joystick->hwdata);
+            joystick->hwdata = NULL;
+        }
+    }
+
+/* Function to perform any system-specific joystick related cleanup */
+    void SDL_SYS_JoystickQuit(void)
+    {
+        int i;
+
+        for (i = 0; SDL_joyport[i]; ++i) {
+            SDL_free(SDL_joyport[i]);
+        }
+        SDL_joyport[0] = NULL;
+
+        for (i = 0; SDL_joyname[i]; ++i) {
+            SDL_free(SDL_joyname[i]);
+        }
+        SDL_joyname[0] = NULL;
+    }
+
+    SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+    {
+        SDL_JoystickGUID guid;
+        /* the GUID is just the first 16 chars of the name for now */
+        const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
+        SDL_zero( guid );
+        SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+        return guid;
+    }
+
+    SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+    {
+        SDL_JoystickGUID guid;
+        /* the GUID is just the first 16 chars of the name for now */
+        const char *name = joystick->name;
+        SDL_zero( guid );
+        SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+        return guid;
+    }
+
+};                              // extern "C"
+
+#endif /* SDL_JOYSTICK_HAIKU */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/iphoneos/SDLUIAccelerationDelegate.h b/Source/3rd Party/sdl/src/joystick/iphoneos/SDLUIAccelerationDelegate.h
new file mode 100644
index 000000000..bb3e0d61f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/iphoneos/SDLUIAccelerationDelegate.h	
@@ -0,0 +1,44 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#import <UIKit/UIKit.h>
+#import <SDL_types.h>
+
+/* *INDENT-OFF* */
+@interface SDLUIAccelerationDelegate: NSObject <UIAccelerometerDelegate> {
+
+	UIAccelerationValue x, y, z;
+	BOOL isRunning;
+	BOOL hasNewData;
+	
+}
+
++(SDLUIAccelerationDelegate *)sharedDelegate;
+-(void)accelerometer:(UIAccelerometer *)accelerometer didAccelerate:(UIAcceleration *)acceleration;
+-(void)getLastOrientation:(Sint16 *)data;
+-(void)startup;
+-(void)shutdown;
+-(BOOL)isRunning;
+-(BOOL)hasNewData;
+-(void)setHasNewData:(BOOL)value;
+
+@end
+/* *INDENT-ON* */
diff --git a/Source/3rd Party/sdl/src/joystick/iphoneos/SDLUIAccelerationDelegate.m b/Source/3rd Party/sdl/src/joystick/iphoneos/SDLUIAccelerationDelegate.m
new file mode 100644
index 000000000..a099fcf38
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/iphoneos/SDLUIAccelerationDelegate.m	
@@ -0,0 +1,141 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#import "SDLUIAccelerationDelegate.h"
+/* needed for SDL_IPHONE_MAX_GFORCE macro */
+#import "../../../include/SDL_config_iphoneos.h"
+
+static SDLUIAccelerationDelegate *sharedDelegate=nil;
+
+@implementation SDLUIAccelerationDelegate
+
+/*
+    Returns a shared instance of the SDLUIAccelerationDelegate, creating the shared delegate if it doesn't exist yet.
+*/
++(SDLUIAccelerationDelegate *)sharedDelegate {
+    if (sharedDelegate == nil) {
+        sharedDelegate = [[SDLUIAccelerationDelegate alloc] init];
+    }
+    return sharedDelegate;
+}
+/*
+    UIAccelerometerDelegate delegate method.  Invoked by the UIAccelerometer instance when it has new data for us.
+    We just take the data and mark that we have new data available so that the joystick system will pump it to the
+    events system when SDL_SYS_JoystickUpdate is called.
+*/
+-(void)accelerometer:(UIAccelerometer *)accelerometer didAccelerate:(UIAcceleration *)acceleration {
+
+    x = acceleration.x;
+    y = acceleration.y;
+    z = acceleration.z;
+
+    hasNewData = YES;
+}
+/*
+    getLastOrientation -- put last obtained accelerometer data into Sint16 array
+
+    Called from the joystick system when it needs the accelerometer data.
+    Function grabs the last data sent to the accelerometer and converts it
+    from floating point to Sint16, which is what the joystick system expects.
+
+    To do the conversion, the data is first clamped onto the interval
+    [-SDL_IPHONE_MAX_G_FORCE, SDL_IPHONE_MAX_G_FORCE], then the data is multiplied
+    by MAX_SINT16 so that it is mapped to the full range of an Sint16.
+
+    You can customize the clamped range of this function by modifying the
+    SDL_IPHONE_MAX_GFORCE macro in SDL_config_iphoneos.h.
+
+    Once converted to Sint16, the accelerometer data no longer has coherent units.
+    You can convert the data back to units of g-force by multiplying it
+    in your application's code by SDL_IPHONE_MAX_GFORCE / 0x7FFF.
+ */
+-(void)getLastOrientation:(Sint16 *)data {
+
+    #define MAX_SINT16 0x7FFF
+
+    /* clamp the data */
+    if (x > SDL_IPHONE_MAX_GFORCE) x = SDL_IPHONE_MAX_GFORCE;
+    else if (x < -SDL_IPHONE_MAX_GFORCE) x = -SDL_IPHONE_MAX_GFORCE;
+    if (y > SDL_IPHONE_MAX_GFORCE) y = SDL_IPHONE_MAX_GFORCE;
+    else if (y < -SDL_IPHONE_MAX_GFORCE) y = -SDL_IPHONE_MAX_GFORCE;
+    if (z > SDL_IPHONE_MAX_GFORCE) z = SDL_IPHONE_MAX_GFORCE;
+    else if (z < -SDL_IPHONE_MAX_GFORCE) z = -SDL_IPHONE_MAX_GFORCE;
+
+    /* pass in data mapped to range of SInt16 */
+    data[0] = (x / SDL_IPHONE_MAX_GFORCE) * MAX_SINT16;
+    data[1] = (y / SDL_IPHONE_MAX_GFORCE) * MAX_SINT16;
+    data[2] = (z / SDL_IPHONE_MAX_GFORCE) * MAX_SINT16;
+
+}
+
+/*
+    Initialize SDLUIAccelerationDelegate.  Since we don't have any data yet,
+    just set our last received data to zero, and indicate we don't have any;
+*/
+-(id)init {
+    self = [super init];
+    x = y = z = 0.0;
+    hasNewData = NO;
+    return self;
+}
+
+-(void)dealloc {
+    sharedDelegate = nil;
+    [self shutdown];
+    [super dealloc];
+}
+
+/*
+    Lets our delegate start receiving accelerometer updates.
+*/
+-(void)startup {
+    [UIAccelerometer sharedAccelerometer].delegate = self;
+    isRunning = YES;
+}
+/*
+    Stops our delegate from receiving accelerometer updates.
+*/
+-(void)shutdown {
+    if ([UIAccelerometer sharedAccelerometer].delegate == self) {
+        [UIAccelerometer sharedAccelerometer].delegate = nil;
+    }
+    isRunning = NO;
+}
+/*
+    Our we currently receiving accelerometer updates?
+*/
+-(BOOL)isRunning {
+    return isRunning;
+}
+/*
+    Do we have any data that hasn't been pumped into SDL's event system?
+*/
+-(BOOL)hasNewData {
+    return hasNewData;
+}
+/*
+    When the joystick system grabs the new data, it sets this to NO.
+*/
+-(void)setHasNewData:(BOOL)value {
+    hasNewData = value;
+}
+
+@end
diff --git a/Source/3rd Party/sdl/src/joystick/iphoneos/SDL_sysjoystick.m b/Source/3rd Party/sdl/src/joystick/iphoneos/SDL_sysjoystick.m
new file mode 100644
index 000000000..b89bd78ed
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/iphoneos/SDL_sysjoystick.m	
@@ -0,0 +1,153 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* This is the iOS implementation of the SDL joystick API */
+
+#include "SDL_joystick.h"
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
+#import "SDLUIAccelerationDelegate.h"
+
+const char *accelerometerName = "iPhone accelerometer";
+
+/* Function to scan the system for joysticks.
+ * This function should set SDL_numjoysticks to the number of available
+ * joysticks.  Joystick 0 should be the system default joystick.
+ * It should return 0, or -1 on an unrecoverable fatal error.
+ */
+int
+SDL_SYS_JoystickInit(void)
+{
+    return (1);
+}
+
+int SDL_SYS_NumJoysticks()
+{
+    return 1;
+}
+
+void SDL_SYS_JoystickDetect()
+{
+}
+
+SDL_bool SDL_SYS_JoystickNeedsPolling()
+{
+    return SDL_FALSE;
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char *
+SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    return accelerometerName;
+}
+
+/* Function to perform the mapping from device index to the instance id for this index */
+SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    return device_index;
+}
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+int
+SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+{
+    joystick->naxes = 3;
+    joystick->nhats = 0;
+    joystick->nballs = 0;
+    joystick->nbuttons = 0;
+    [[SDLUIAccelerationDelegate sharedDelegate] startup];
+    return 0;
+}
+
+/* Function to determine is this joystick is attached to the system right now */
+SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
+{
+    return SDL_TRUE;
+}
+
+/* Function to update the state of a joystick - called as a device poll.
+ * This function shouldn't update the joystick structure directly,
+ * but instead should call SDL_PrivateJoystick*() to deliver events
+ * and update joystick device state.
+ */
+void
+SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+{
+
+    Sint16 orientation[3];
+
+    if ([[SDLUIAccelerationDelegate sharedDelegate] hasNewData]) {
+
+        [[SDLUIAccelerationDelegate sharedDelegate] getLastOrientation: orientation];
+        [[SDLUIAccelerationDelegate sharedDelegate] setHasNewData: NO];
+
+        SDL_PrivateJoystickAxis(joystick, 0, orientation[0]);
+        SDL_PrivateJoystickAxis(joystick, 1, -orientation[1]);
+        SDL_PrivateJoystickAxis(joystick, 2, orientation[2]);
+
+    }
+
+    return;
+}
+
+/* Function to close a joystick after use */
+void
+SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+{
+    if ([[SDLUIAccelerationDelegate sharedDelegate] isRunning]) {
+        [[SDLUIAccelerationDelegate sharedDelegate] shutdown];
+    }
+    SDL_SetError("No joystick open with that index");
+}
+
+/* Function to perform any system-specific joystick related cleanup */
+void
+SDL_SYS_JoystickQuit(void)
+{
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = joystick->name;
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/linux/SDL_sysjoystick.c b/Source/3rd Party/sdl/src/joystick/linux/SDL_sysjoystick.c
new file mode 100644
index 000000000..c37a22d58
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/linux/SDL_sysjoystick.c	
@@ -0,0 +1,894 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_JOYSTICK_LINUX
+
+#ifndef SDL_INPUT_LINUXEV
+#error SDL now requires a Linux 2.4+ kernel with /dev/input/event support.
+#endif
+
+/* This is the Linux implementation of the SDL joystick API */
+
+#include <sys/stat.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <limits.h>             /* For the definition of PATH_MAX */
+#include <linux/joystick.h>
+
+#include "SDL_assert.h"
+#include "SDL_joystick.h"
+#include "SDL_endian.h"
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
+#include "SDL_sysjoystick_c.h"
+
+/* !!! FIXME: move this somewhere else. */
+#if !SDL_EVENTS_DISABLED
+#include "../../events/SDL_events_c.h"
+#endif
+
+/* This isn't defined in older Linux kernel headers */
+#ifndef SYN_DROPPED
+#define SYN_DROPPED 3
+#endif
+
+#include "../../core/linux/SDL_udev.h"
+
+static int MaybeAddDevice(const char *path);
+#if SDL_USE_LIBUDEV
+static int MaybeRemoveDevice(const char *path);
+void joystick_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
+#endif /* SDL_USE_LIBUDEV */
+
+
+/* A linked list of available joysticks */
+typedef struct SDL_joylist_item
+{
+    int device_instance;
+    char *path;   /* "/dev/input/event2" or whatever */
+    char *name;   /* "SideWinder 3D Pro" or whatever */
+    SDL_JoystickGUID guid;
+    dev_t devnum;
+    struct joystick_hwdata *hwdata;
+    struct SDL_joylist_item *next;
+} SDL_joylist_item;
+
+static SDL_joylist_item *SDL_joylist = NULL;
+static SDL_joylist_item *SDL_joylist_tail = NULL;
+static int numjoysticks = 0;
+static int instance_counter = 0;
+
+#define test_bit(nr, addr) \
+    (((1UL << ((nr) % (sizeof(long) * 8))) & ((addr)[(nr) / (sizeof(long) * 8)])) != 0)
+#define NBITS(x) ((((x)-1)/(sizeof(long) * 8))+1)
+
+static int
+IsJoystick(int fd, char *namebuf, const size_t namebuflen, SDL_JoystickGUID *guid)
+{
+    struct input_id inpid;
+    Uint16 *guid16 = (Uint16 *) ((char *) &guid->data);
+
+#if !SDL_USE_LIBUDEV
+    /* When udev is enabled we only get joystick devices here, so there's no need to test them */
+    unsigned long evbit[NBITS(EV_MAX)] = { 0 };
+    unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
+    unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
+
+    if ((ioctl(fd, EVIOCGBIT(0, sizeof(evbit)), evbit) < 0) ||
+        (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) < 0) ||
+        (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) < 0)) {
+        return (0);
+    }
+
+    if (!(test_bit(EV_KEY, evbit) && test_bit(EV_ABS, evbit) &&
+          test_bit(ABS_X, absbit) && test_bit(ABS_Y, absbit))) {
+        return 0;
+    }
+#endif
+
+    if (ioctl(fd, EVIOCGNAME(namebuflen), namebuf) < 0) {
+        return 0;
+    }
+
+    if (ioctl(fd, EVIOCGID, &inpid) < 0) {
+        return 0;
+    }
+
+#ifdef DEBUG_JOYSTICK
+    printf("Joystick: %s, bustype = %d, vendor = 0x%x, product = 0x%x, version = %d\n", namebuf, inpid.bustype, inpid.vendor, inpid.product, inpid.version);
+#endif
+
+    SDL_memset(guid->data, 0, sizeof(guid->data));
+
+    /* We only need 16 bits for each of these; space them out to fill 128. */
+    /* Byteswap so devices get same GUID on little/big endian platforms. */
+    *(guid16++) = SDL_SwapLE16(inpid.bustype);
+    *(guid16++) = 0;
+
+    if (inpid.vendor && inpid.product && inpid.version) {
+        *(guid16++) = SDL_SwapLE16(inpid.vendor);
+        *(guid16++) = 0;
+        *(guid16++) = SDL_SwapLE16(inpid.product);
+        *(guid16++) = 0;
+        *(guid16++) = SDL_SwapLE16(inpid.version);
+        *(guid16++) = 0;
+    } else {
+        SDL_strlcpy((char*)guid16, namebuf, sizeof(guid->data) - 4);
+    }
+
+    return 1;
+}
+
+#if SDL_USE_LIBUDEV
+void joystick_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath)
+{
+    if (devpath == NULL || !(udev_class & SDL_UDEV_DEVICE_JOYSTICK)) {
+        return;
+    }
+    
+    switch( udev_type )
+    {
+        case SDL_UDEV_DEVICEADDED:
+            MaybeAddDevice(devpath);
+            break;
+            
+        case SDL_UDEV_DEVICEREMOVED:
+            MaybeRemoveDevice(devpath);
+            break;
+            
+        default:
+            break;
+    }
+    
+}
+#endif /* SDL_USE_LIBUDEV */
+
+
+/* !!! FIXME: I would love to dump this code and use libudev instead. */
+static int
+MaybeAddDevice(const char *path)
+{
+    struct stat sb;
+    int fd = -1;
+    int isstick = 0;
+    char namebuf[128];
+    SDL_JoystickGUID guid;
+    SDL_joylist_item *item;
+#if !SDL_EVENTS_DISABLED
+    SDL_Event event;
+#endif
+
+    if (path == NULL) {
+        return -1;
+    }
+
+    if (stat(path, &sb) == -1) {
+        return -1;
+    }
+
+    /* Check to make sure it's not already in list. */
+    for (item = SDL_joylist; item != NULL; item = item->next) {
+        if (sb.st_rdev == item->devnum) {
+            return -1;  /* already have this one */
+        }
+    }
+
+    fd = open(path, O_RDONLY, 0);
+    if (fd < 0) {
+        return -1;
+    }
+
+#ifdef DEBUG_INPUT_EVENTS
+    printf("Checking %s\n", path);
+#endif
+
+    isstick = IsJoystick(fd, namebuf, sizeof (namebuf), &guid);
+    close(fd);
+    if (!isstick) {
+        return -1;
+    }
+
+    item = (SDL_joylist_item *) SDL_malloc(sizeof (SDL_joylist_item));
+    if (item == NULL) {
+        return -1;
+    }
+
+    SDL_zerop(item);
+    item->devnum = sb.st_rdev;
+    item->path = SDL_strdup(path);
+    item->name = SDL_strdup(namebuf);
+    item->guid = guid;
+
+    if ( (item->path == NULL) || (item->name == NULL) ) {
+         SDL_free(item->path);
+         SDL_free(item->name);
+         SDL_free(item);
+         return -1;
+    }
+
+    item->device_instance = instance_counter++;
+    if (SDL_joylist_tail == NULL) {
+        SDL_joylist = SDL_joylist_tail = item;
+    } else {
+        SDL_joylist_tail->next = item;
+        SDL_joylist_tail = item;
+    }
+
+    /* Need to increment the joystick count before we post the event */
+    ++numjoysticks;
+
+    /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceAdded() function? */
+#if !SDL_EVENTS_DISABLED
+    event.type = SDL_JOYDEVICEADDED;
+
+    if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+        event.jdevice.which = (numjoysticks - 1);
+        if ( (SDL_EventOK == NULL) ||
+             (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
+            SDL_PushEvent(&event);
+        }
+    }
+#endif /* !SDL_EVENTS_DISABLED */
+
+    return numjoysticks;
+}
+
+#if SDL_USE_LIBUDEV
+/* !!! FIXME: I would love to dump this code and use libudev instead. */
+static int
+MaybeRemoveDevice(const char *path)
+{
+    SDL_joylist_item *item;
+    SDL_joylist_item *prev = NULL;
+#if !SDL_EVENTS_DISABLED
+    SDL_Event event;
+#endif
+
+    if (path == NULL) {
+        return -1;
+    }
+
+    for (item = SDL_joylist; item != NULL; item = item->next) {
+        /* found it, remove it. */
+        if (SDL_strcmp(path, item->path) == 0) {
+            const int retval = item->device_instance;
+            if (item->hwdata) {
+                item->hwdata->item = NULL;
+            }
+            if (prev != NULL) {
+                prev->next = item->next;
+            } else {
+                SDL_assert(SDL_joylist == item);
+                SDL_joylist = item->next;
+            }
+            if (item == SDL_joylist_tail) {
+                SDL_joylist_tail = prev;
+            }
+
+            /* Need to decrement the joystick count before we post the event */
+            --numjoysticks;
+
+            /* !!! FIXME: Move this to an SDL_PrivateJoyDeviceRemoved() function? */
+#if !SDL_EVENTS_DISABLED
+            event.type = SDL_JOYDEVICEREMOVED;
+
+            if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+                event.jdevice.which = item->device_instance;
+                if ( (SDL_EventOK == NULL) ||
+                     (*SDL_EventOK) (SDL_EventOKParam, &event) ) {
+                    SDL_PushEvent(&event);
+                }
+            }
+#endif /* !SDL_EVENTS_DISABLED */
+
+            SDL_free(item->path);
+            SDL_free(item->name);
+            SDL_free(item);
+            return retval;
+        }
+        prev = item;
+    }
+
+    return -1;
+}
+#endif
+
+static int
+JoystickInitWithoutUdev(void)
+{
+    int i;
+    char path[PATH_MAX];
+
+    /* !!! FIXME: only finds sticks if they're called /dev/input/event[0..31] */
+    /* !!! FIXME:  we could at least readdir() through /dev/input...? */
+    /* !!! FIXME:  (or delete this and rely on libudev?) */
+    for (i = 0; i < 32; i++) {
+        SDL_snprintf(path, SDL_arraysize(path), "/dev/input/event%d", i);
+        MaybeAddDevice(path);
+    }
+
+    return numjoysticks;
+}
+
+
+#if SDL_USE_LIBUDEV
+static int
+JoystickInitWithUdev(void)
+{
+
+    if (SDL_UDEV_Init() < 0) {
+        return SDL_SetError("Could not initialize UDEV");
+    }
+
+    /* Set up the udev callback */
+    if ( SDL_UDEV_AddCallback(joystick_udev_callback) < 0) {
+        SDL_UDEV_Quit();
+        return SDL_SetError("Could not set up joystick <-> udev callback");
+    }
+    
+    /* Force a scan to build the initial device list */
+    SDL_UDEV_Scan();
+
+    return numjoysticks;
+}
+#endif
+
+int
+SDL_SYS_JoystickInit(void)
+{
+    /* First see if the user specified one or more joysticks to use */
+    if (SDL_getenv("SDL_JOYSTICK_DEVICE") != NULL) {
+        char *envcopy, *envpath, *delim;
+        envcopy = SDL_strdup(SDL_getenv("SDL_JOYSTICK_DEVICE"));
+        envpath = envcopy;
+        while (envpath != NULL) {
+            delim = SDL_strchr(envpath, ':');
+            if (delim != NULL) {
+                *delim++ = '\0';
+            }
+            MaybeAddDevice(envpath);
+            envpath = delim;
+        }
+        SDL_free(envcopy);
+    }
+
+#if SDL_USE_LIBUDEV
+    return JoystickInitWithUdev();
+#endif
+
+    return JoystickInitWithoutUdev();
+}
+
+int SDL_SYS_NumJoysticks()
+{
+    return numjoysticks;
+}
+
+void SDL_SYS_JoystickDetect()
+{
+#if SDL_USE_LIBUDEV
+    SDL_UDEV_Poll();
+#endif
+    
+}
+
+SDL_bool SDL_SYS_JoystickNeedsPolling()
+{
+#if SDL_USE_LIBUDEV
+    return SDL_TRUE;
+#endif
+    
+    return SDL_FALSE;
+}
+
+static SDL_joylist_item *
+JoystickByDevIndex(int device_index)
+{
+    SDL_joylist_item *item = SDL_joylist;
+
+    if ((device_index < 0) || (device_index >= numjoysticks)) {
+        return NULL;
+    }
+
+    while (device_index > 0) {
+        SDL_assert(item != NULL);
+        device_index--;
+        item = item->next;
+    }
+
+    return item;
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char *
+SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    return JoystickByDevIndex(device_index)->name;
+}
+
+/* Function to perform the mapping from device index to the instance id for this index */
+SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    return JoystickByDevIndex(device_index)->device_instance;
+}
+
+static int
+allocate_hatdata(SDL_Joystick * joystick)
+{
+    int i;
+
+    joystick->hwdata->hats =
+        (struct hwdata_hat *) SDL_malloc(joystick->nhats *
+                                         sizeof(struct hwdata_hat));
+    if (joystick->hwdata->hats == NULL) {
+        return (-1);
+    }
+    for (i = 0; i < joystick->nhats; ++i) {
+        joystick->hwdata->hats[i].axis[0] = 1;
+        joystick->hwdata->hats[i].axis[1] = 1;
+    }
+    return (0);
+}
+
+static int
+allocate_balldata(SDL_Joystick * joystick)
+{
+    int i;
+
+    joystick->hwdata->balls =
+        (struct hwdata_ball *) SDL_malloc(joystick->nballs *
+                                          sizeof(struct hwdata_ball));
+    if (joystick->hwdata->balls == NULL) {
+        return (-1);
+    }
+    for (i = 0; i < joystick->nballs; ++i) {
+        joystick->hwdata->balls[i].axis[0] = 0;
+        joystick->hwdata->balls[i].axis[1] = 0;
+    }
+    return (0);
+}
+
+static void
+ConfigJoystick(SDL_Joystick * joystick, int fd)
+{
+    int i, t;
+    unsigned long keybit[NBITS(KEY_MAX)] = { 0 };
+    unsigned long absbit[NBITS(ABS_MAX)] = { 0 };
+    unsigned long relbit[NBITS(REL_MAX)] = { 0 };
+
+    /* See if this device uses the new unified event API */
+    if ((ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybit)), keybit) >= 0) &&
+        (ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) >= 0) &&
+        (ioctl(fd, EVIOCGBIT(EV_REL, sizeof(relbit)), relbit) >= 0)) {
+
+        /* Get the number of buttons, axes, and other thingamajigs */
+        for (i = BTN_JOYSTICK; i < KEY_MAX; ++i) {
+            if (test_bit(i, keybit)) {
+#ifdef DEBUG_INPUT_EVENTS
+                printf("Joystick has button: 0x%x\n", i);
+#endif
+                joystick->hwdata->key_map[i - BTN_MISC] = joystick->nbuttons;
+                ++joystick->nbuttons;
+            }
+        }
+        for (i = BTN_MISC; i < BTN_JOYSTICK; ++i) {
+            if (test_bit(i, keybit)) {
+#ifdef DEBUG_INPUT_EVENTS
+                printf("Joystick has button: 0x%x\n", i);
+#endif
+                joystick->hwdata->key_map[i - BTN_MISC] = joystick->nbuttons;
+                ++joystick->nbuttons;
+            }
+        }
+        for (i = 0; i < ABS_MISC; ++i) {
+            /* Skip hats */
+            if (i == ABS_HAT0X) {
+                i = ABS_HAT3Y;
+                continue;
+            }
+            if (test_bit(i, absbit)) {
+                struct input_absinfo absinfo;
+
+                if (ioctl(fd, EVIOCGABS(i), &absinfo) < 0) {
+                    continue;
+                }
+#ifdef DEBUG_INPUT_EVENTS
+                printf("Joystick has absolute axis: 0x%.2x\n", i);
+                printf("Values = { %d, %d, %d, %d, %d }\n",
+                       absinfo.value, absinfo.minimum, absinfo.maximum,
+                       absinfo.fuzz, absinfo.flat);
+#endif /* DEBUG_INPUT_EVENTS */
+                joystick->hwdata->abs_map[i] = joystick->naxes;
+                if (absinfo.minimum == absinfo.maximum) {
+                    joystick->hwdata->abs_correct[i].used = 0;
+                } else {
+                    joystick->hwdata->abs_correct[i].used = 1;
+                    joystick->hwdata->abs_correct[i].coef[0] =
+                        (absinfo.maximum + absinfo.minimum) - 2 * absinfo.flat;
+                    joystick->hwdata->abs_correct[i].coef[1] =
+                        (absinfo.maximum + absinfo.minimum) + 2 * absinfo.flat;
+                    t = ((absinfo.maximum - absinfo.minimum) - 4 * absinfo.flat);
+                    if (t != 0) {
+                        joystick->hwdata->abs_correct[i].coef[2] =
+                            (1 << 28) / t;
+                    } else {
+                        joystick->hwdata->abs_correct[i].coef[2] = 0;
+                    }
+                }
+                ++joystick->naxes;
+            }
+        }
+        for (i = ABS_HAT0X; i <= ABS_HAT3Y; i += 2) {
+            if (test_bit(i, absbit) || test_bit(i + 1, absbit)) {
+                struct input_absinfo absinfo;
+
+                if (ioctl(fd, EVIOCGABS(i), &absinfo) < 0) {
+                    continue;
+                }
+#ifdef DEBUG_INPUT_EVENTS
+                printf("Joystick has hat %d\n", (i - ABS_HAT0X) / 2);
+                printf("Values = { %d, %d, %d, %d, %d }\n",
+                       absinfo.value, absinfo.minimum, absinfo.maximum,
+                       absinfo.fuzz, absinfo.flat);
+#endif /* DEBUG_INPUT_EVENTS */
+                ++joystick->nhats;
+            }
+        }
+        if (test_bit(REL_X, relbit) || test_bit(REL_Y, relbit)) {
+            ++joystick->nballs;
+        }
+
+        /* Allocate data to keep track of these thingamajigs */
+        if (joystick->nhats > 0) {
+            if (allocate_hatdata(joystick) < 0) {
+                joystick->nhats = 0;
+            }
+        }
+        if (joystick->nballs > 0) {
+            if (allocate_balldata(joystick) < 0) {
+                joystick->nballs = 0;
+            }
+        }
+    }
+}
+
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+int
+SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+{
+    SDL_joylist_item *item = JoystickByDevIndex(device_index);
+    char *fname = NULL;
+    int fd = -1;
+
+    if (item == NULL) {
+        return SDL_SetError("No such device");
+    }
+
+    fname = item->path;
+    fd = open(fname, O_RDONLY, 0);
+    if (fd < 0) {
+        return SDL_SetError("Unable to open %s", fname);
+    }
+
+    joystick->instance_id = item->device_instance;
+    joystick->hwdata = (struct joystick_hwdata *)
+        SDL_malloc(sizeof(*joystick->hwdata));
+    if (joystick->hwdata == NULL) {
+        close(fd);
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata));
+    joystick->hwdata->item = item;
+    joystick->hwdata->guid = item->guid;
+    joystick->hwdata->fd = fd;
+    joystick->hwdata->fname = SDL_strdup(item->path);
+    if (joystick->hwdata->fname == NULL) {
+        SDL_free(joystick->hwdata);
+        joystick->hwdata = NULL;
+        close(fd);
+        return SDL_OutOfMemory();
+    }
+
+    SDL_assert(item->hwdata == NULL);
+    item->hwdata = joystick->hwdata;
+
+    /* Set the joystick to non-blocking read mode */
+    fcntl(fd, F_SETFL, O_NONBLOCK);
+
+    /* Get the number of buttons and axes on the joystick */
+    ConfigJoystick(joystick, fd);
+
+    /* mark joystick as fresh and ready */
+    joystick->hwdata->fresh = 1;
+
+    return (0);
+}
+
+/* Function to determine is this joystick is attached to the system right now */
+SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
+{
+    return !joystick->closed && (joystick->hwdata->item != NULL);
+}
+
+static SDL_INLINE void
+HandleHat(SDL_Joystick * stick, Uint8 hat, int axis, int value)
+{
+    struct hwdata_hat *the_hat;
+    const Uint8 position_map[3][3] = {
+        {SDL_HAT_LEFTUP, SDL_HAT_UP, SDL_HAT_RIGHTUP},
+        {SDL_HAT_LEFT, SDL_HAT_CENTERED, SDL_HAT_RIGHT},
+        {SDL_HAT_LEFTDOWN, SDL_HAT_DOWN, SDL_HAT_RIGHTDOWN}
+    };
+
+    the_hat = &stick->hwdata->hats[hat];
+    if (value < 0) {
+        value = 0;
+    } else if (value == 0) {
+        value = 1;
+    } else if (value > 0) {
+        value = 2;
+    }
+    if (value != the_hat->axis[axis]) {
+        the_hat->axis[axis] = value;
+        SDL_PrivateJoystickHat(stick, hat,
+                               position_map[the_hat->
+                                            axis[1]][the_hat->axis[0]]);
+    }
+}
+
+static SDL_INLINE void
+HandleBall(SDL_Joystick * stick, Uint8 ball, int axis, int value)
+{
+    stick->hwdata->balls[ball].axis[axis] += value;
+}
+
+
+static SDL_INLINE int
+AxisCorrect(SDL_Joystick * joystick, int which, int value)
+{
+    struct axis_correct *correct;
+
+    correct = &joystick->hwdata->abs_correct[which];
+    if (correct->used) {
+        value *= 2;
+        if (value > correct->coef[0]) {
+            if (value < correct->coef[1]) {
+                return 0;
+            }
+            value -= correct->coef[1];
+        } else {
+            value -= correct->coef[0];
+        }
+        value *= correct->coef[2];
+        value >>= 13;
+    }
+
+    /* Clamp and return */
+    if (value < -32768)
+        return -32768;
+    if (value > 32767)
+        return 32767;
+
+    return value;
+}
+
+static SDL_INLINE void
+PollAllValues(SDL_Joystick * joystick)
+{
+    struct input_absinfo absinfo;
+    int a, b = 0;
+
+    /* Poll all axis */
+    for (a = ABS_X; b < ABS_MAX; a++) {
+        switch (a) {
+        case ABS_HAT0X:
+        case ABS_HAT0Y:
+        case ABS_HAT1X:
+        case ABS_HAT1Y:
+        case ABS_HAT2X:
+        case ABS_HAT2Y:
+        case ABS_HAT3X:
+        case ABS_HAT3Y:
+            /* ingore hats */
+            break;
+        default:
+            if (joystick->hwdata->abs_correct[b].used) {
+                if (ioctl(joystick->hwdata->fd, EVIOCGABS(a), &absinfo) >= 0) {
+                    absinfo.value = AxisCorrect(joystick, b, absinfo.value);
+
+#ifdef DEBUG_INPUT_EVENTS
+                    printf("Joystick : Re-read Axis %d (%d) val= %d\n",
+                        joystick->hwdata->abs_map[b], a, absinfo.value);
+#endif
+                    SDL_PrivateJoystickAxis(joystick,
+                            joystick->hwdata->abs_map[b],
+                            absinfo.value);
+                }
+            }
+            b++;
+        }
+    }
+}
+
+static SDL_INLINE void
+HandleInputEvents(SDL_Joystick * joystick)
+{
+    struct input_event events[32];
+    int i, len;
+    int code;
+
+    if (joystick->hwdata->fresh) {
+        PollAllValues(joystick);
+        joystick->hwdata->fresh = 0;
+    }
+
+    while ((len = read(joystick->hwdata->fd, events, (sizeof events))) > 0) {
+        len /= sizeof(events[0]);
+        for (i = 0; i < len; ++i) {
+            code = events[i].code;
+            switch (events[i].type) {
+            case EV_KEY:
+                if (code >= BTN_MISC) {
+                    code -= BTN_MISC;
+                    SDL_PrivateJoystickButton(joystick,
+                                              joystick->hwdata->key_map[code],
+                                              events[i].value);
+                }
+                break;
+            case EV_ABS:
+                if (code >= ABS_MISC) {
+                    break;
+                }
+
+                switch (code) {
+                case ABS_HAT0X:
+                case ABS_HAT0Y:
+                case ABS_HAT1X:
+                case ABS_HAT1Y:
+                case ABS_HAT2X:
+                case ABS_HAT2Y:
+                case ABS_HAT3X:
+                case ABS_HAT3Y:
+                    code -= ABS_HAT0X;
+                    HandleHat(joystick, code / 2, code % 2, events[i].value);
+                    break;
+                default:
+                    events[i].value =
+                        AxisCorrect(joystick, code, events[i].value);
+                    SDL_PrivateJoystickAxis(joystick,
+                                            joystick->hwdata->abs_map[code],
+                                            events[i].value);
+                    break;
+                }
+                break;
+            case EV_REL:
+                switch (code) {
+                case REL_X:
+                case REL_Y:
+                    code -= REL_X;
+                    HandleBall(joystick, code / 2, code % 2, events[i].value);
+                    break;
+                default:
+                    break;
+                }
+                break;
+            case EV_SYN:
+                switch (code) {
+                case SYN_DROPPED :
+#ifdef DEBUG_INPUT_EVENTS
+                    printf("Event SYN_DROPPED detected\n");
+#endif
+                    PollAllValues(joystick);
+                    break;
+                default:
+                    break;
+                }
+            default:
+                break;
+            }
+        }
+    }
+}
+
+void
+SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+{
+    int i;
+
+    HandleInputEvents(joystick);
+
+    /* Deliver ball motion updates */
+    for (i = 0; i < joystick->nballs; ++i) {
+        int xrel, yrel;
+
+        xrel = joystick->hwdata->balls[i].axis[0];
+        yrel = joystick->hwdata->balls[i].axis[1];
+        if (xrel || yrel) {
+            joystick->hwdata->balls[i].axis[0] = 0;
+            joystick->hwdata->balls[i].axis[1] = 0;
+            SDL_PrivateJoystickBall(joystick, (Uint8) i, xrel, yrel);
+        }
+    }
+}
+
+/* Function to close a joystick after use */
+void
+SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+{
+    if (joystick->hwdata) {
+        close(joystick->hwdata->fd);
+        if (joystick->hwdata->item) {
+            joystick->hwdata->item->hwdata = NULL;
+        }
+        SDL_free(joystick->hwdata->hats);
+        SDL_free(joystick->hwdata->balls);
+        SDL_free(joystick->hwdata->fname);
+        SDL_free(joystick->hwdata);
+        joystick->hwdata = NULL;
+    }
+    joystick->closed = 1;
+}
+
+/* Function to perform any system-specific joystick related cleanup */
+void
+SDL_SYS_JoystickQuit(void)
+{
+    SDL_joylist_item *item = NULL;
+    SDL_joylist_item *next = NULL;
+
+    for (item = SDL_joylist; item; item = next) {
+        next = item->next;
+        SDL_free(item->path);
+        SDL_free(item->name);
+        SDL_free(item);
+    }
+
+    SDL_joylist = SDL_joylist_tail = NULL;
+
+    numjoysticks = 0;
+    instance_counter = 0;
+
+#if SDL_USE_LIBUDEV
+    SDL_UDEV_DelCallback(joystick_udev_callback);
+    SDL_UDEV_Quit();
+#endif
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    return JoystickByDevIndex(device_index)->guid;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    return joystick->hwdata->guid;
+}
+
+#endif /* SDL_JOYSTICK_LINUX */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/linux/SDL_sysjoystick_c.h b/Source/3rd Party/sdl/src/joystick/linux/SDL_sysjoystick_c.h
new file mode 100644
index 000000000..16d16e26b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/linux/SDL_sysjoystick_c.h	
@@ -0,0 +1,57 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <linux/input.h>
+
+struct SDL_joylist_item;
+
+/* The private structure used to keep track of a joystick */
+struct joystick_hwdata
+{
+    int fd;
+    struct SDL_joylist_item *item;
+    SDL_JoystickGUID guid;
+    char *fname;                /* Used in haptic subsystem */
+
+    /* The current Linux joystick driver maps hats to two axes */
+    struct hwdata_hat
+    {
+        int axis[2];
+    } *hats;
+    /* The current Linux joystick driver maps balls to two axes */
+    struct hwdata_ball
+    {
+        int axis[2];
+    } *balls;
+
+    /* Support for the Linux 2.4 unified input interface */
+    Uint8 key_map[KEY_MAX - BTN_MISC];
+    Uint8 abs_map[ABS_MAX];
+    struct axis_correct
+    {
+        int used;
+        int coef[3];
+    } abs_correct[ABS_MAX];
+
+    int fresh;
+};
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/psp/SDL_sysjoystick.c b/Source/3rd Party/sdl/src/joystick/psp/SDL_sysjoystick.c
new file mode 100644
index 000000000..d01489bb8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/psp/SDL_sysjoystick.c	
@@ -0,0 +1,274 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* This is the PSP implementation of the SDL joystick API */
+#include <pspctrl.h>
+#include <pspkernel.h>
+
+#include <stdio.h>      /* For the definition of NULL */
+#include <stdlib.h>
+
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
+
+#include "SDL_events.h"
+#include "SDL_error.h"
+#include "SDL_thread.h"
+#include "SDL_mutex.h"
+#include "SDL_timer.h"
+
+/* Current pad state */
+static SceCtrlData pad = { .Lx = 0, .Ly = 0, .Buttons = 0 };
+static SDL_sem *pad_sem = NULL;
+static SDL_Thread *thread = NULL;
+static int running = 0;
+static const enum PspCtrlButtons button_map[] = {
+    PSP_CTRL_TRIANGLE, PSP_CTRL_CIRCLE, PSP_CTRL_CROSS, PSP_CTRL_SQUARE,
+    PSP_CTRL_LTRIGGER, PSP_CTRL_RTRIGGER,
+    PSP_CTRL_DOWN, PSP_CTRL_LEFT, PSP_CTRL_UP, PSP_CTRL_RIGHT,
+    PSP_CTRL_SELECT, PSP_CTRL_START, PSP_CTRL_HOME, PSP_CTRL_HOLD };
+static int analog_map[256];  /* Map analog inputs to -32768 -> 32767 */
+
+typedef struct
+{
+  int x;
+  int y;
+} point;
+
+/* 4 points define the bezier-curve. */
+static point a = { 0, 0 };
+static point b = { 50, 0  };
+static point c = { 78, 32767 };
+static point d = { 128, 32767 };
+
+/* simple linear interpolation between two points */
+static SDL_INLINE void lerp (point *dest, point *a, point *b, float t)
+{
+    dest->x = a->x + (b->x - a->x)*t;
+    dest->y = a->y + (b->y - a->y)*t;
+}
+
+/* evaluate a point on a bezier-curve. t goes from 0 to 1.0 */
+static int calc_bezier_y(float t)
+{
+    point ab, bc, cd, abbc, bccd, dest;
+    lerp (&ab, &a, &b, t);           /* point between a and b */
+    lerp (&bc, &b, &c, t);           /* point between b and c */
+    lerp (&cd, &c, &d, t);           /* point between c and d */
+    lerp (&abbc, &ab, &bc, t);       /* point between ab and bc */
+    lerp (&bccd, &bc, &cd, t);       /* point between bc and cd */
+    lerp (&dest, &abbc, &bccd, t);   /* point on the bezier-curve */
+    return dest.y;
+}
+
+/*
+ * Collect pad data about once per frame
+ */
+int JoystickUpdate(void *data)
+{
+    while (running) {
+        SDL_SemWait(pad_sem);
+        sceCtrlPeekBufferPositive(&pad, 1);
+        SDL_SemPost(pad_sem);
+        /* Delay 1/60th of a second */
+        sceKernelDelayThread(1000000 / 60);
+    }
+    return 0;
+}
+
+
+
+/* Function to scan the system for joysticks.
+ * This function should set SDL_numjoysticks to the number of available
+ * joysticks.  Joystick 0 should be the system default joystick.
+ * It should return number of joysticks, or -1 on an unrecoverable fatal error.
+ */
+int SDL_SYS_JoystickInit(void)
+{
+    int i;
+
+/*  SDL_numjoysticks = 1; */
+
+    /* Setup input */
+    sceCtrlSetSamplingCycle(0);
+    sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG);
+
+    /* Start thread to read data */
+    if((pad_sem =  SDL_CreateSemaphore(1)) == NULL) {
+        return SDL_SetError("Can't create input semaphore");
+    }
+    running = 1;
+    if((thread = SDL_CreateThread(JoystickUpdate, "JoySitckThread",NULL)) == NULL) {
+        return SDL_SetError("Can't create input thread");
+    }
+
+    /* Create an accurate map from analog inputs (0 to 255)
+       to SDL joystick positions (-32768 to 32767) */
+    for (i = 0; i < 128; i++)
+    {
+        float t = (float)i/127.0f;
+        analog_map[i+128] = calc_bezier_y(t);
+        analog_map[127-i] = -1 * analog_map[i+128];
+    }
+
+    return 1;
+}
+
+int SDL_SYS_NumJoysticks()
+{
+    return 1;
+}
+
+void SDL_SYS_JoystickDetect()
+{
+}
+
+SDL_bool SDL_SYS_JoystickNeedsPolling()
+{
+    return SDL_FALSE;
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char * SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    return "PSP builtin joypad";
+}
+
+/* Function to perform the mapping from device index to the instance id for this index */
+SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    return device_index;
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char *SDL_SYS_JoystickName(int index)
+{
+    if (index == 0)
+        return "PSP controller";
+
+    SDL_SetError("No joystick available with that index");
+    return(NULL);
+}
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+int SDL_SYS_JoystickOpen(SDL_Joystick *joystick, int device_index)
+{
+    joystick->nbuttons = 14;
+    joystick->naxes = 2;
+    joystick->nhats = 0;
+
+    return 0;
+}
+
+/* Function to determine is this joystick is attached to the system right now */
+SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
+{
+    return SDL_TRUE;
+}
+/* Function to update the state of a joystick - called as a device poll.
+ * This function shouldn't update the joystick structure directly,
+ * but instead should call SDL_PrivateJoystick*() to deliver events
+ * and update joystick device state.
+ */
+
+void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick)
+{
+    int i;
+    enum PspCtrlButtons buttons;
+    enum PspCtrlButtons changed;
+    unsigned char x, y;
+    static enum PspCtrlButtons old_buttons = 0;
+    static unsigned char old_x = 0, old_y = 0;
+
+    SDL_SemWait(pad_sem);
+    buttons = pad.Buttons;
+    x = pad.Lx;
+    y = pad.Ly;
+    SDL_SemPost(pad_sem);
+
+    /* Axes */
+    if(old_x != x) {
+        SDL_PrivateJoystickAxis(joystick, 0, analog_map[x]);
+        old_x = x;
+    }
+    if(old_y != y) {
+        SDL_PrivateJoystickAxis(joystick, 1, analog_map[y]);
+        old_y = y;
+    }
+
+    /* Buttons */
+    changed = old_buttons ^ buttons;
+    old_buttons = buttons;
+    if(changed) {
+        for(i=0; i<sizeof(button_map)/sizeof(button_map[0]); i++) {
+            if(changed & button_map[i]) {
+                SDL_PrivateJoystickButton(
+                    joystick, i,
+                    (buttons & button_map[i]) ?
+                    SDL_PRESSED : SDL_RELEASED);
+            }
+        }
+    }
+
+    sceKernelDelayThread(0);
+}
+
+/* Function to close a joystick after use */
+void SDL_SYS_JoystickClose(SDL_Joystick *joystick)
+{
+    /* Do nothing. */
+}
+
+/* Function to perform any system-specific joystick related cleanup */
+void SDL_SYS_JoystickQuit(void)
+{
+    /* Cleanup Threads and Semaphore. */
+    running = 0;
+    SDL_WaitThread(thread, NULL);
+    SDL_DestroySemaphore(pad_sem);
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = joystick->name;
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+/* vim: ts=4 sw=4
+ */
diff --git a/Source/3rd Party/sdl/src/joystick/sort_controllers.py b/Source/3rd Party/sdl/src/joystick/sort_controllers.py
new file mode 100644
index 000000000..03b857a02
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/sort_controllers.py	
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+#
+# Script to sort the game controller database entries in SDL_gamecontroller.c
+
+import re
+
+
+filename = "SDL_gamecontrollerdb.h"
+input = open(filename)
+output = open(filename + ".new", "w")
+parsing_controllers = False
+controllers = []
+controller_guids = {}
+split_pattern = re.compile(r'([^"]*")([^,]*,)([^,]*,)([^"]*)(".*)')
+
+def save_controller(line):
+    global controllers
+    match = split_pattern.match(line)
+    entry = [ match.group(1), match.group(2), match.group(3) ]
+    bindings = sorted(match.group(4).split(","))
+    if (bindings[0] == ""):
+        bindings.pop(0)
+    entry.extend(",".join(bindings) + ",")
+    entry.append(match.group(5))
+    controllers.append(entry)
+
+def write_controllers():
+    global controllers
+    global controller_guids
+    for entry in sorted(controllers, key=lambda entry: entry[2]):
+        line = "".join(entry) + "\n"
+        if not line.endswith(",\n") and not line.endswith("*/\n"):
+            print "Warning: '%s' is missing a comma at the end of the line" % (line)
+        if (entry[1] in controller_guids):
+            print "Warning: entry '%s' is duplicate of entry '%s'" % (entry[2], controller_guids[entry[1]][2])
+        controller_guids[entry[1]] = entry
+
+        output.write(line)
+    controllers = []
+    controller_guids = {}
+
+for line in input:
+    if ( parsing_controllers ):
+        if (line.startswith("{")):
+            output.write(line)
+        elif (line.startswith("#endif")):
+            parsing_controllers = False
+            write_controllers()
+            output.write(line)
+        elif (line.startswith("#")):
+            print "Parsing " + line.strip()
+            write_controllers()
+            output.write(line)
+        else:
+            save_controller(line)
+    else:
+        if (line.startswith("static const char *s_ControllerMappings")):
+            parsing_controllers = True
+
+        output.write(line)
+
+output.close()
+print "Finished writing %s.new" % filename
diff --git a/Source/3rd Party/sdl/src/joystick/windows/SDL_dxjoystick.c b/Source/3rd Party/sdl/src/joystick/windows/SDL_dxjoystick.c
new file mode 100644
index 000000000..3c009746b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/windows/SDL_dxjoystick.c	
@@ -0,0 +1,1683 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_JOYSTICK_DINPUT
+
+/* DirectInput joystick driver; written by Glenn Maynard, based on Andrei de
+ * A. Formiga's WINMM driver.
+ *
+ * Hats and sliders are completely untested; the app I'm writing this for mostly
+ * doesn't use them and I don't own any joysticks with them.
+ *
+ * We don't bother to use event notification here.  It doesn't seem to work
+ * with polled devices, and it's fine to call IDirectInputDevice8_GetDeviceData and
+ * let it return 0 events. */
+
+#include "SDL_error.h"
+#include "SDL_assert.h"
+#include "SDL_events.h"
+#include "SDL_thread.h"
+#include "SDL_timer.h"
+#include "SDL_mutex.h"
+#include "SDL_events.h"
+#include "SDL_hints.h"
+#include "SDL_joystick.h"
+#include "../SDL_sysjoystick.h"
+#if !SDL_EVENTS_DISABLED
+#include "../../events/SDL_events_c.h"
+#endif
+
+#define INITGUID /* Only set here, if set twice will cause mingw32 to break. */
+#include "SDL_dxjoystick_c.h"
+
+#if SDL_HAPTIC_DINPUT
+#include "../../haptic/windows/SDL_syshaptic_c.h"    /* For haptic hot plugging */
+#endif
+
+#ifndef DIDFT_OPTIONAL
+#define DIDFT_OPTIONAL      0x80000000
+#endif
+
+DEFINE_GUID(GUID_DEVINTERFACE_HID, 0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30);
+
+
+#define INPUT_QSIZE 32      /* Buffer up to 32 input messages */
+#define AXIS_MIN    -32768  /* minimum value for axis coordinate */
+#define AXIS_MAX    32767   /* maximum value for axis coordinate */
+#define JOY_AXIS_THRESHOLD  (((AXIS_MAX)-(AXIS_MIN))/100)   /* 1% motion */
+
+/* external variables referenced. */
+extern HWND SDL_HelperWindow;
+
+
+/* local variables */
+static SDL_bool coinitialized = SDL_FALSE;
+static LPDIRECTINPUT8 dinput = NULL;
+static SDL_bool s_bDeviceAdded = SDL_FALSE;
+static SDL_bool s_bDeviceRemoved = SDL_FALSE;
+static SDL_JoystickID s_nInstanceID = -1;
+static SDL_cond *s_condJoystickThread = NULL;
+static SDL_mutex *s_mutexJoyStickEnum = NULL;
+static SDL_Thread *s_threadJoystick = NULL;
+static SDL_bool s_bJoystickThreadQuit = SDL_FALSE;
+static SDL_bool s_bXInputEnabled = SDL_TRUE;
+
+XInputGetState_t SDL_XInputGetState = NULL;
+XInputSetState_t SDL_XInputSetState = NULL;
+XInputGetCapabilities_t SDL_XInputGetCapabilities = NULL;
+DWORD SDL_XInputVersion = 0;
+
+static HANDLE s_pXInputDLL = 0;
+static int s_XInputDLLRefCount = 0;
+
+int
+WIN_LoadXInputDLL(void)
+{
+    DWORD version = 0;
+
+    if (s_pXInputDLL) {
+        SDL_assert(s_XInputDLLRefCount > 0);
+        s_XInputDLLRefCount++;
+        return 0;  /* already loaded */
+    }
+
+    version = (1 << 16) | 4;
+    s_pXInputDLL = LoadLibrary( L"XInput1_4.dll" );  /* 1.4 Ships with Windows 8. */
+    if (!s_pXInputDLL) {
+        version = (1 << 16) | 3;
+        s_pXInputDLL = LoadLibrary( L"XInput1_3.dll" );  /* 1.3 Ships with Vista and Win7, can be installed as a redistributable component. */
+    }
+    if (!s_pXInputDLL) {
+        s_pXInputDLL = LoadLibrary( L"bin\\XInput1_3.dll" );
+    }
+    if (!s_pXInputDLL) {
+        return -1;
+    }
+
+    SDL_assert(s_XInputDLLRefCount == 0);
+    SDL_XInputVersion = version;
+    s_XInputDLLRefCount = 1;
+
+    /* 100 is the ordinal for _XInputGetStateEx, which returns the same struct as XinputGetState, but with extra data in wButtons for the guide button, we think... */
+    SDL_XInputGetState = (XInputGetState_t)GetProcAddress( (HMODULE)s_pXInputDLL, (LPCSTR)100 );
+    SDL_XInputSetState = (XInputSetState_t)GetProcAddress( (HMODULE)s_pXInputDLL, "XInputSetState" );
+    SDL_XInputGetCapabilities = (XInputGetCapabilities_t)GetProcAddress( (HMODULE)s_pXInputDLL, "XInputGetCapabilities" );
+    if ( !SDL_XInputGetState || !SDL_XInputSetState || !SDL_XInputGetCapabilities ) {
+        WIN_UnloadXInputDLL();
+        return -1;
+    }
+
+    return 0;
+}
+
+void
+WIN_UnloadXInputDLL(void)
+{
+    if ( s_pXInputDLL ) {
+        SDL_assert(s_XInputDLLRefCount > 0);
+        if (--s_XInputDLLRefCount == 0) {
+            FreeLibrary( s_pXInputDLL );
+            s_pXInputDLL = NULL;
+        }
+    } else {
+        SDL_assert(s_XInputDLLRefCount == 0);
+    }
+}
+
+
+extern HRESULT(WINAPI * DInputCreate) (HINSTANCE hinst, DWORD dwVersion,
+                                       LPDIRECTINPUT * ppDI,
+                                       LPUNKNOWN punkOuter);
+struct JoyStick_DeviceData_
+{
+    SDL_JoystickGUID guid;
+    DIDEVICEINSTANCE dxdevice;
+    char *joystickname;
+    Uint8 send_add_event;
+    SDL_JoystickID nInstanceID;
+    SDL_bool bXInputDevice;
+    Uint8 XInputUserId;
+    struct JoyStick_DeviceData_ *pNext;
+};
+
+typedef struct JoyStick_DeviceData_ JoyStick_DeviceData;
+
+static JoyStick_DeviceData *SYS_Joystick;    /* array to hold joystick ID values */
+
+/* local prototypes */
+static int SetDIerror(const char *function, HRESULT code);
+static BOOL CALLBACK EnumJoysticksCallback(const DIDEVICEINSTANCE *
+                                           pdidInstance, VOID * pContext);
+static BOOL CALLBACK EnumDevObjectsCallback(LPCDIDEVICEOBJECTINSTANCE dev,
+                                            LPVOID pvRef);
+static void SortDevObjects(SDL_Joystick *joystick);
+static Uint8 TranslatePOV(DWORD value);
+static int SDL_PrivateJoystickAxis_Int(SDL_Joystick * joystick, Uint8 axis,
+                                       Sint16 value);
+static int SDL_PrivateJoystickHat_Int(SDL_Joystick * joystick, Uint8 hat,
+                                      Uint8 value);
+static int SDL_PrivateJoystickButton_Int(SDL_Joystick * joystick,
+                                         Uint8 button, Uint8 state);
+
+/* Taken from Wine - Thanks! */
+DIOBJECTDATAFORMAT dfDIJoystick2[] = {
+  { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_POV,DIJOFS_POV(0),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
+  { &GUID_POV,DIJOFS_POV(1),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
+  { &GUID_POV,DIJOFS_POV(2),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
+  { &GUID_POV,DIJOFS_POV(3),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(0),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(1),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(2),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(3),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(4),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(5),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(6),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(7),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(8),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(9),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(10),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(11),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(12),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(13),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(14),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(15),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(16),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(17),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(18),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(19),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(20),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(21),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(22),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(23),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(24),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(25),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(26),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(27),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(28),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(29),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(30),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(31),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(32),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(33),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(34),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(35),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(36),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(37),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(38),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(39),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(40),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(41),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(42),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(43),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(44),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(45),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(46),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(47),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(48),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(49),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(50),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(51),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(52),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(53),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(54),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(55),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(56),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(57),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(58),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(59),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(60),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(61),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(62),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(63),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(64),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(65),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(66),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(67),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(68),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(69),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(70),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(71),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(72),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(73),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(74),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(75),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(76),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(77),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(78),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(79),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(80),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(81),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(82),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(83),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(84),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(85),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(86),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(87),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(88),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(89),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(90),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(91),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(92),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(93),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(94),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(95),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(96),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(97),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(98),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(99),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(100),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(101),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(102),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(103),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(104),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(105),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(106),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(107),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(108),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(109),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(110),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(111),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(112),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(113),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(114),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(115),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(116),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(117),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(118),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(119),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(120),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(121),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(122),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(123),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(124),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(125),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(126),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { NULL,DIJOFS_BUTTON(127),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0},
+  { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lVX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lVY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lVZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lVRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lVRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lVRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglVSlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglVSlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lAX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lAY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lAZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lARx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lARy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lARz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglASlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglASlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lFX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lFY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lFZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lFRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lFRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lFRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglFSlider[0]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+  { &GUID_Slider,FIELD_OFFSET(DIJOYSTATE2,rglFSlider[1]),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0},
+};
+
+const DIDATAFORMAT c_dfDIJoystick2 = {
+    sizeof(DIDATAFORMAT),
+    sizeof(DIOBJECTDATAFORMAT),
+    DIDF_ABSAXIS,
+    sizeof(DIJOYSTATE2),
+    SDL_arraysize(dfDIJoystick2),
+    dfDIJoystick2
+};
+
+
+/* Convert a DirectInput return code to a text message */
+static int
+SetDIerror(const char *function, HRESULT code)
+{
+    /*
+    return SDL_SetError("%s() [%s]: %s", function,
+                 DXGetErrorString9A(code), DXGetErrorDescription9A(code));
+     */
+    return SDL_SetError("%s() DirectX error %d", function, code);
+}
+
+
+#define SAFE_RELEASE(p)                             \
+{                                                   \
+    if (p) {                                        \
+        (p)->lpVtbl->Release((p));                  \
+        (p) = 0;                                    \
+    }                                               \
+}
+
+DEFINE_GUID(IID_ValveStreamingGamepad,  MAKELONG( 0x28DE, 0x11FF ),0x0000,0x0000,0x00,0x00,0x50,0x49,0x44,0x56,0x49,0x44);
+DEFINE_GUID(IID_X360WiredGamepad,  MAKELONG( 0x045E, 0x02A1 ),0x0000,0x0000,0x00,0x00,0x50,0x49,0x44,0x56,0x49,0x44);
+DEFINE_GUID(IID_X360WirelessGamepad,  MAKELONG( 0x045E, 0x028E ),0x0000,0x0000,0x00,0x00,0x50,0x49,0x44,0x56,0x49,0x44);
+
+static PRAWINPUTDEVICELIST SDL_RawDevList = NULL;
+static UINT SDL_RawDevListCount = 0;
+
+static SDL_bool
+SDL_IsXInputDevice( const GUID* pGuidProductFromDirectInput )
+{
+    static const GUID *s_XInputProductGUID[] = {
+        &IID_ValveStreamingGamepad,
+        &IID_X360WiredGamepad,   /* Microsoft's wired X360 controller for Windows. */
+        &IID_X360WirelessGamepad /* Microsoft's wireless X360 controller for Windows. */
+    };
+
+    size_t iDevice;
+    UINT i;
+
+    if (!s_bXInputEnabled) {
+        return SDL_FALSE;
+    }
+
+    /* Check for well known XInput device GUIDs */
+    /* This lets us skip RAWINPUT for popular devices. Also, we need to do this for the Valve Streaming Gamepad because it's virtualized and doesn't show up in the device list. */
+    for ( iDevice = 0; iDevice < SDL_arraysize(s_XInputProductGUID); ++iDevice ) {
+        if (SDL_memcmp(pGuidProductFromDirectInput, s_XInputProductGUID[iDevice], sizeof(GUID)) == 0) {
+            return SDL_TRUE;
+        }
+    }
+
+    /* Go through RAWINPUT (WinXP and later) to find HID devices. */
+    /* Cache this if we end up using it. */
+    if (SDL_RawDevList == NULL) {
+        if ((GetRawInputDeviceList(NULL, &SDL_RawDevListCount, sizeof (RAWINPUTDEVICELIST)) == -1) || (!SDL_RawDevListCount)) {
+            return SDL_FALSE;  /* oh well. */
+        }
+
+        SDL_RawDevList = (PRAWINPUTDEVICELIST) SDL_malloc(sizeof (RAWINPUTDEVICELIST) * SDL_RawDevListCount);
+        if (SDL_RawDevList == NULL) {
+            SDL_OutOfMemory();
+            return SDL_FALSE;
+        }
+
+        if (GetRawInputDeviceList(SDL_RawDevList, &SDL_RawDevListCount, sizeof (RAWINPUTDEVICELIST)) == -1) {
+             SDL_free(SDL_RawDevList);
+             SDL_RawDevList = NULL;
+             return SDL_FALSE;  /* oh well. */
+        }
+    }
+
+    for (i = 0; i < SDL_RawDevListCount; i++) {
+        RID_DEVICE_INFO rdi;
+        char devName[128];
+        UINT rdiSize = sizeof (rdi);
+        UINT nameSize = SDL_arraysize(devName);
+
+        rdi.cbSize = sizeof (rdi);
+        if ( (SDL_RawDevList[i].dwType == RIM_TYPEHID) &&
+             (GetRawInputDeviceInfoA(SDL_RawDevList[i].hDevice, RIDI_DEVICEINFO, &rdi, &rdiSize) != ((UINT)-1)) &&
+             (MAKELONG(rdi.hid.dwVendorId, rdi.hid.dwProductId) == ((LONG)pGuidProductFromDirectInput->Data1)) &&
+             (GetRawInputDeviceInfoA(SDL_RawDevList[i].hDevice, RIDI_DEVICENAME, devName, &nameSize) != ((UINT)-1)) &&
+             (SDL_strstr(devName, "IG_") != NULL) ) {
+             return SDL_TRUE;
+        }
+    }
+
+    return SDL_FALSE;
+}
+
+
+static SDL_bool s_bWindowsDeviceChanged = SDL_FALSE;
+
+/* windowproc for our joystick detect thread message only window, to detect any USB device addition/removal
+ */
+LRESULT CALLBACK SDL_PrivateJoystickDetectProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)    {
+    switch (message)    {
+    case WM_DEVICECHANGE:
+        switch (wParam) {
+        case DBT_DEVICEARRIVAL:
+            if (((DEV_BROADCAST_HDR*)lParam)->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE)    {
+                s_bWindowsDeviceChanged = SDL_TRUE;
+            }
+            break;
+        case DBT_DEVICEREMOVECOMPLETE:
+            if (((DEV_BROADCAST_HDR*)lParam)->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE)    {
+                s_bWindowsDeviceChanged = SDL_TRUE;
+            }
+            break;
+        }
+        return 0;
+    }
+
+    return DefWindowProc (hwnd, message, wParam, lParam);
+}
+
+
+DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, \
+    0xC0, 0x4F, 0xB9, 0x51, 0xED);
+
+/* Function/thread to scan the system for joysticks.
+ */
+static int
+SDL_JoystickThread(void *_data)
+{
+    HWND messageWindow = 0;
+    HDEVNOTIFY hNotify = 0;
+    DEV_BROADCAST_DEVICEINTERFACE dbh;
+    SDL_bool bOpenedXInputDevices[SDL_XINPUT_MAX_DEVICES];
+    WNDCLASSEX wincl;
+
+    SDL_zero(bOpenedXInputDevices);
+
+    WIN_CoInitialize();
+
+    SDL_memset( &wincl, 0x0, sizeof(wincl) );
+    wincl.hInstance = GetModuleHandle( NULL );
+    wincl.lpszClassName = L"Message";
+    wincl.lpfnWndProc = SDL_PrivateJoystickDetectProc;      /* This function is called by windows */
+    wincl.cbSize = sizeof (WNDCLASSEX);
+
+    if (!RegisterClassEx (&wincl))
+    {
+        return SDL_SetError("Failed to create register class for joystick autodetect.", GetLastError());
+    }
+
+    messageWindow = (HWND)CreateWindowEx( 0,  L"Message", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL );
+    if ( !messageWindow )
+    {
+        return SDL_SetError("Failed to create message window for joystick autodetect.", GetLastError());
+    }
+
+    SDL_zero(dbh);
+
+    dbh.dbcc_size = sizeof(dbh);
+    dbh.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
+    dbh.dbcc_classguid = GUID_DEVINTERFACE_HID;
+
+    hNotify = RegisterDeviceNotification( messageWindow, &dbh, DEVICE_NOTIFY_WINDOW_HANDLE );
+    if ( !hNotify )
+    {
+        return SDL_SetError("Failed to create notify device for joystick autodetect.", GetLastError());
+    }
+
+    SDL_LockMutex( s_mutexJoyStickEnum );
+    while ( s_bJoystickThreadQuit == SDL_FALSE )
+    {
+        MSG messages;
+        SDL_bool bXInputChanged = SDL_FALSE;
+
+        SDL_CondWaitTimeout( s_condJoystickThread, s_mutexJoyStickEnum, 300 );
+
+        while ( s_bJoystickThreadQuit == SDL_FALSE && PeekMessage(&messages, messageWindow, 0, 0, PM_NOREMOVE) )
+        {
+            if ( GetMessage(&messages, messageWindow, 0, 0) != 0 )  {
+                TranslateMessage(&messages);
+                DispatchMessage(&messages);
+            }
+        }
+
+        if ( s_bXInputEnabled && XINPUTGETCAPABILITIES ) {
+            /* scan for any change in XInput devices */
+            Uint8 userId;
+            for (userId = 0; userId < SDL_XINPUT_MAX_DEVICES; userId++) {
+                XINPUT_CAPABILITIES capabilities;
+                const DWORD result = XINPUTGETCAPABILITIES( userId, XINPUT_FLAG_GAMEPAD, &capabilities );
+                const SDL_bool available = (result == ERROR_SUCCESS);
+                if (bOpenedXInputDevices[userId] != available) {
+                    bXInputChanged = SDL_TRUE;
+                    bOpenedXInputDevices[userId] = available;
+                }
+            }
+        }
+
+        if (s_bWindowsDeviceChanged || bXInputChanged) {
+            SDL_UnlockMutex( s_mutexJoyStickEnum );  /* let main thread go while we SDL_Delay(). */
+            SDL_Delay( 300 ); /* wait for direct input to find out about this device */
+            SDL_LockMutex( s_mutexJoyStickEnum );
+
+            s_bDeviceRemoved = SDL_TRUE;
+            s_bDeviceAdded = SDL_TRUE;
+            s_bWindowsDeviceChanged = SDL_FALSE;
+        }
+    }
+    SDL_UnlockMutex( s_mutexJoyStickEnum );
+
+    if ( hNotify )
+        UnregisterDeviceNotification( hNotify );
+
+    if ( messageWindow )
+        DestroyWindow( messageWindow );
+
+    UnregisterClass( wincl.lpszClassName, wincl.hInstance );
+    messageWindow = 0;
+    WIN_CoUninitialize();
+    return 1;
+}
+
+
+/* Function to scan the system for joysticks.
+ * This function should set SDL_numjoysticks to the number of available
+ * joysticks.  Joystick 0 should be the system default joystick.
+ * It should return 0, or -1 on an unrecoverable fatal error.
+ */
+int
+SDL_SYS_JoystickInit(void)
+{
+    HRESULT result;
+    HINSTANCE instance;
+    const char *env = SDL_GetHint(SDL_HINT_XINPUT_ENABLED);
+    if (env && !SDL_atoi(env)) {
+        s_bXInputEnabled = SDL_FALSE;
+    }
+
+    result = WIN_CoInitialize();
+    if (FAILED(result)) {
+        return SetDIerror("CoInitialize", result);
+    }
+
+    coinitialized = SDL_TRUE;
+
+    result = CoCreateInstance(&CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER,
+                              &IID_IDirectInput8, (LPVOID)&dinput);
+
+    if (FAILED(result)) {
+        SDL_SYS_JoystickQuit();
+        return SetDIerror("CoCreateInstance", result);
+    }
+
+    /* Because we used CoCreateInstance, we need to Initialize it, first. */
+    instance = GetModuleHandle(NULL);
+    if (instance == NULL) {
+        SDL_SYS_JoystickQuit();
+        return SDL_SetError("GetModuleHandle() failed with error code %d.", GetLastError());
+    }
+    result = IDirectInput8_Initialize(dinput, instance, DIRECTINPUT_VERSION);
+
+    if (FAILED(result)) {
+        SDL_SYS_JoystickQuit();
+        return SetDIerror("IDirectInput::Initialize", result);
+    }
+
+    if ((s_bXInputEnabled) && (WIN_LoadXInputDLL() == -1)) {
+        s_bXInputEnabled = SDL_FALSE;  /* oh well. */
+    }
+
+    s_mutexJoyStickEnum = SDL_CreateMutex();
+    s_condJoystickThread = SDL_CreateCond();
+    s_bDeviceAdded = SDL_TRUE; /* force a scan of the system for joysticks this first time */
+
+    SDL_SYS_JoystickDetect();
+
+    if ( !s_threadJoystick )
+    {
+        s_bJoystickThreadQuit = SDL_FALSE;
+        /* spin up the thread to detect hotplug of devices */
+#if defined(__WIN32__) && !defined(HAVE_LIBC)
+#undef SDL_CreateThread
+#if SDL_DYNAMIC_API
+        s_threadJoystick= SDL_CreateThread_REAL( SDL_JoystickThread, "SDL_joystick", NULL, NULL, NULL );
+#else
+        s_threadJoystick= SDL_CreateThread( SDL_JoystickThread, "SDL_joystick", NULL, NULL, NULL );
+#endif
+#else
+        s_threadJoystick = SDL_CreateThread( SDL_JoystickThread, "SDL_joystick", NULL );
+#endif
+    }
+        return SDL_SYS_NumJoysticks();
+}
+
+/* return the number of joysticks that are connected right now */
+int SDL_SYS_NumJoysticks()
+{
+    int nJoysticks = 0;
+    JoyStick_DeviceData *device = SYS_Joystick;
+    while ( device )
+    {
+        nJoysticks++;
+        device = device->pNext;
+    }
+
+    return nJoysticks;
+}
+
+/* helper function for direct input, gets called for each connected joystick */
+static BOOL CALLBACK
+    EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
+{
+    JoyStick_DeviceData *pNewJoystick;
+    JoyStick_DeviceData *pPrevJoystick = NULL;
+
+    if (SDL_IsXInputDevice( &pdidInstance->guidProduct )) {
+        return DIENUM_CONTINUE;  /* ignore XInput devices here, keep going. */
+    }
+
+    pNewJoystick = *(JoyStick_DeviceData **)pContext;
+    while ( pNewJoystick )
+    {
+        if ( !SDL_memcmp( &pNewJoystick->dxdevice.guidInstance, &pdidInstance->guidInstance, sizeof(pNewJoystick->dxdevice.guidInstance) ) )
+        {
+            /* if we are replacing the front of the list then update it */
+            if ( pNewJoystick == *(JoyStick_DeviceData **)pContext )
+            {
+                *(JoyStick_DeviceData **)pContext = pNewJoystick->pNext;
+            }
+            else if ( pPrevJoystick )
+            {
+                pPrevJoystick->pNext = pNewJoystick->pNext;
+            }
+
+            pNewJoystick->pNext = SYS_Joystick;
+            SYS_Joystick = pNewJoystick;
+
+            return DIENUM_CONTINUE; /* already have this joystick loaded, just keep going */
+        }
+
+        pPrevJoystick = pNewJoystick;
+        pNewJoystick = pNewJoystick->pNext;
+    }
+
+    pNewJoystick = (JoyStick_DeviceData *)SDL_malloc( sizeof(JoyStick_DeviceData) );
+    if (!pNewJoystick) {
+        return DIENUM_CONTINUE; /* better luck next time? */
+    }
+
+    SDL_zerop(pNewJoystick);
+    pNewJoystick->joystickname = WIN_StringToUTF8(pdidInstance->tszProductName);
+    if (!pNewJoystick->joystickname) {
+        SDL_free(pNewJoystick);
+        return DIENUM_CONTINUE; /* better luck next time? */
+    }
+
+    SDL_memcpy(&(pNewJoystick->dxdevice), pdidInstance,
+        sizeof(DIDEVICEINSTANCE));
+
+    pNewJoystick->XInputUserId = INVALID_XINPUT_USERID;
+    pNewJoystick->send_add_event = 1;
+    pNewJoystick->nInstanceID = ++s_nInstanceID;
+    SDL_memcpy( &pNewJoystick->guid, &pdidInstance->guidProduct, sizeof(pNewJoystick->guid) );
+    pNewJoystick->pNext = SYS_Joystick;
+    SYS_Joystick = pNewJoystick;
+
+    s_bDeviceAdded = SDL_TRUE;
+
+    return DIENUM_CONTINUE; /* get next device, please */
+}
+
+static void
+AddXInputDevice(const Uint8 userid, JoyStick_DeviceData **pContext)
+{
+    char name[32];
+    JoyStick_DeviceData *pPrevJoystick = NULL;
+    JoyStick_DeviceData *pNewJoystick = *pContext;
+
+    while (pNewJoystick) {
+        if ((pNewJoystick->bXInputDevice) && (pNewJoystick->XInputUserId == userid)) {
+            /* if we are replacing the front of the list then update it */
+            if (pNewJoystick == *pContext) {
+                *pContext = pNewJoystick->pNext;
+            } else if (pPrevJoystick) {
+                pPrevJoystick->pNext = pNewJoystick->pNext;
+            }
+
+            pNewJoystick->pNext = SYS_Joystick;
+            SYS_Joystick = pNewJoystick;
+            return;   /* already in the list. */
+        }
+
+        pPrevJoystick = pNewJoystick;
+        pNewJoystick = pNewJoystick->pNext;
+    }
+
+    pNewJoystick = (JoyStick_DeviceData *) SDL_malloc(sizeof (JoyStick_DeviceData));
+    if (!pNewJoystick) {
+        return; /* better luck next time? */
+    }
+    SDL_zerop(pNewJoystick);
+
+    SDL_snprintf(name, sizeof (name), "XInput Controller #%u", ((unsigned int) userid) + 1);
+    pNewJoystick->joystickname = SDL_strdup(name);
+    if (!pNewJoystick->joystickname) {
+        SDL_free(pNewJoystick);
+        return; /* better luck next time? */
+    }
+
+    pNewJoystick->bXInputDevice = SDL_TRUE;
+    pNewJoystick->XInputUserId = userid;
+    pNewJoystick->send_add_event = 1;
+    pNewJoystick->nInstanceID = ++s_nInstanceID;
+    pNewJoystick->pNext = SYS_Joystick;
+    SYS_Joystick = pNewJoystick;
+
+    s_bDeviceAdded = SDL_TRUE;
+}
+
+static void
+EnumXInputDevices(JoyStick_DeviceData **pContext)
+{
+    if (s_bXInputEnabled) {
+        int iuserid;
+        /* iterate in reverse, so these are in the final list in ascending numeric order. */
+        for (iuserid = SDL_XINPUT_MAX_DEVICES-1; iuserid >= 0; iuserid--) {
+            const Uint8 userid = (Uint8) iuserid;
+            XINPUT_CAPABILITIES capabilities;
+            if (XINPUTGETCAPABILITIES(userid, XINPUT_FLAG_GAMEPAD, &capabilities) == ERROR_SUCCESS) {
+                /* Current version of XInput mistakenly returns 0 as the Type. Ignore it and ensure the subtype is a gamepad. */
+                /* !!! FIXME: we might want to support steering wheels or guitars or whatever later. */
+                if (capabilities.SubType == XINPUT_DEVSUBTYPE_GAMEPAD) {
+                    AddXInputDevice(userid, pContext);
+                }
+            }
+        }
+    }
+}
+
+
+/* detect any new joysticks being inserted into the system */
+void SDL_SYS_JoystickDetect()
+{
+    JoyStick_DeviceData *pCurList = NULL;
+    /* only enum the devices if the joystick thread told us something changed */
+    if ( s_bDeviceAdded || s_bDeviceRemoved )
+    {
+        SDL_LockMutex( s_mutexJoyStickEnum );
+
+        s_bDeviceAdded = SDL_FALSE;
+        s_bDeviceRemoved = SDL_FALSE;
+
+        pCurList = SYS_Joystick;
+        SYS_Joystick = NULL;
+
+        /* Look for DirectInput joysticks, wheels, head trackers, gamepads, etc.. */
+        IDirectInput8_EnumDevices(dinput,
+            DI8DEVCLASS_GAMECTRL,
+            EnumJoysticksCallback,
+            &pCurList, DIEDFL_ATTACHEDONLY);
+
+        SDL_free(SDL_RawDevList);  /* in case we used this in DirectInput enumerator. */
+        SDL_RawDevList = NULL;
+        SDL_RawDevListCount = 0;
+
+        /* Look for XInput devices. Do this last, so they're first in the final list. */
+        EnumXInputDevices(&pCurList);
+
+        SDL_UnlockMutex( s_mutexJoyStickEnum );
+    }
+
+    if ( pCurList )
+    {
+        while ( pCurList )
+        {
+            JoyStick_DeviceData *pListNext = NULL;
+
+#if SDL_HAPTIC_DINPUT
+            if (pCurList->bXInputDevice) {
+                XInputHaptic_MaybeRemoveDevice(pCurList->XInputUserId);
+            } else {
+                DirectInputHaptic_MaybeRemoveDevice(&pCurList->dxdevice);
+            }
+#endif
+
+#if !SDL_EVENTS_DISABLED
+            {
+            SDL_Event event;
+            event.type = SDL_JOYDEVICEREMOVED;
+
+            if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+                event.jdevice.which = pCurList->nInstanceID;
+                if ((SDL_EventOK == NULL)
+                    || (*SDL_EventOK) (SDL_EventOKParam, &event)) {
+                        SDL_PushEvent(&event);
+                }
+            }
+            }
+#endif /* !SDL_EVENTS_DISABLED */
+
+            pListNext = pCurList->pNext;
+            SDL_free(pCurList->joystickname);
+            SDL_free(pCurList);
+            pCurList = pListNext;
+        }
+
+    }
+
+    if ( s_bDeviceAdded )
+    {
+        JoyStick_DeviceData *pNewJoystick;
+        int device_index = 0;
+        s_bDeviceAdded = SDL_FALSE;
+        pNewJoystick = SYS_Joystick;
+        while ( pNewJoystick )
+        {
+            if ( pNewJoystick->send_add_event )
+            {
+#if SDL_HAPTIC_DINPUT
+                if (pNewJoystick->bXInputDevice) {
+                    XInputHaptic_MaybeAddDevice(pNewJoystick->XInputUserId);
+                } else {
+                    DirectInputHaptic_MaybeAddDevice(&pNewJoystick->dxdevice);
+                }
+#endif
+
+#if !SDL_EVENTS_DISABLED
+                {
+                SDL_Event event;
+                event.type = SDL_JOYDEVICEADDED;
+
+                if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+                    event.jdevice.which = device_index;
+                    if ((SDL_EventOK == NULL)
+                        || (*SDL_EventOK) (SDL_EventOKParam, &event)) {
+                            SDL_PushEvent(&event);
+                    }
+                }
+                }
+#endif /* !SDL_EVENTS_DISABLED */
+                pNewJoystick->send_add_event = 0;
+            }
+            device_index++;
+            pNewJoystick = pNewJoystick->pNext;
+        }
+    }
+}
+
+/* we need to poll if we have pending hotplug device changes or connected devices */
+SDL_bool SDL_SYS_JoystickNeedsPolling()
+{
+    /* we have a new device or one was pulled, we need to think this frame please */
+    if ( s_bDeviceAdded || s_bDeviceRemoved )
+        return SDL_TRUE;
+
+    return SDL_FALSE;
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char *
+SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    JoyStick_DeviceData *device = SYS_Joystick;
+
+    for (; device_index > 0; device_index--)
+        device = device->pNext;
+
+    return device->joystickname;
+}
+
+/* Function to perform the mapping between current device instance and this joysticks instance id */
+SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    JoyStick_DeviceData *device = SYS_Joystick;
+    int index;
+
+    for (index = device_index; index > 0; index--)
+        device = device->pNext;
+
+    return device->nInstanceID;
+}
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+int
+SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+{
+    HRESULT result;
+    JoyStick_DeviceData *joystickdevice = SYS_Joystick;
+
+    for (; device_index > 0; device_index--)
+        joystickdevice = joystickdevice->pNext;
+
+    /* allocate memory for system specific hardware data */
+    joystick->instance_id = joystickdevice->nInstanceID;
+    joystick->closed = 0;
+    joystick->hwdata =
+        (struct joystick_hwdata *) SDL_malloc(sizeof(struct joystick_hwdata));
+    if (joystick->hwdata == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_zerop(joystick->hwdata);
+
+    if (joystickdevice->bXInputDevice) {
+        const SDL_bool bIs14OrLater = (SDL_XInputVersion >= ((1<<16)|4));
+        const Uint8 userId = joystickdevice->XInputUserId;
+        XINPUT_CAPABILITIES capabilities;
+
+        SDL_assert(s_bXInputEnabled);
+        SDL_assert(XINPUTGETCAPABILITIES);
+        SDL_assert(userId >= 0);
+        SDL_assert(userId < SDL_XINPUT_MAX_DEVICES);
+
+        joystick->hwdata->bXInputDevice = SDL_TRUE;
+
+        if (XINPUTGETCAPABILITIES(userId, XINPUT_FLAG_GAMEPAD, &capabilities) != ERROR_SUCCESS) {
+            SDL_free(joystick->hwdata);
+            joystick->hwdata = NULL;
+            return SDL_SetError("Failed to obtain XInput device capabilities. Device disconnected?");
+        } else {
+            /* Current version of XInput mistakenly returns 0 as the Type. Ignore it and ensure the subtype is a gamepad. */
+            SDL_assert(capabilities.SubType == XINPUT_DEVSUBTYPE_GAMEPAD);
+            if ((!bIs14OrLater) || (capabilities.Flags & XINPUT_CAPS_FFB_SUPPORTED)) {
+                joystick->hwdata->bXInputHaptic = SDL_TRUE;
+            }
+            joystick->hwdata->userid = userId;
+
+            /* The XInput API has a hard coded button/axis mapping, so we just match it */
+            joystick->naxes = 6;
+            joystick->nbuttons = 15;
+            joystick->nballs = 0;
+            joystick->nhats = 0;
+		}
+    } else {  /* use DirectInput, not XInput. */
+        LPDIRECTINPUTDEVICE8 device;
+        DIPROPDWORD dipdw;
+
+        joystick->hwdata->buffered = 1;
+        joystick->hwdata->removed = 0;
+        joystick->hwdata->Capabilities.dwSize = sizeof(DIDEVCAPS);
+        joystick->hwdata->guid = joystickdevice->guid;
+
+        SDL_zero(dipdw);
+        dipdw.diph.dwSize = sizeof(DIPROPDWORD);
+        dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+
+        result =
+            IDirectInput8_CreateDevice(dinput,
+                                      &(joystickdevice->dxdevice.guidInstance), &device, NULL);
+        if (FAILED(result)) {
+            return SetDIerror("IDirectInput::CreateDevice", result);
+        }
+
+        /* Now get the IDirectInputDevice8 interface, instead. */
+        result = IDirectInputDevice8_QueryInterface(device,
+                                                   &IID_IDirectInputDevice8,
+                                                   (LPVOID *) & joystick->
+                                                   hwdata->InputDevice);
+        /* We are done with this object.  Use the stored one from now on. */
+        IDirectInputDevice8_Release(device);
+
+        if (FAILED(result)) {
+            return SetDIerror("IDirectInputDevice8::QueryInterface", result);
+        }
+
+        /* Acquire shared access. Exclusive access is required for forces,
+         * though. */
+        result =
+            IDirectInputDevice8_SetCooperativeLevel(joystick->hwdata->
+                                                    InputDevice, SDL_HelperWindow,
+                                                    DISCL_NONEXCLUSIVE |
+                                                    DISCL_BACKGROUND);
+        if (FAILED(result)) {
+            return SetDIerror("IDirectInputDevice8::SetCooperativeLevel", result);
+        }
+
+        /* Use the extended data structure: DIJOYSTATE2. */
+        result =
+            IDirectInputDevice8_SetDataFormat(joystick->hwdata->InputDevice,
+                                              &c_dfDIJoystick2);
+        if (FAILED(result)) {
+            return SetDIerror("IDirectInputDevice8::SetDataFormat", result);
+        }
+
+        /* Get device capabilities */
+        result =
+            IDirectInputDevice8_GetCapabilities(joystick->hwdata->InputDevice,
+                                                &joystick->hwdata->Capabilities);
+
+        if (FAILED(result)) {
+            return SetDIerror("IDirectInputDevice8::GetCapabilities", result);
+        }
+
+        /* Force capable? */
+        if (joystick->hwdata->Capabilities.dwFlags & DIDC_FORCEFEEDBACK) {
+
+            result = IDirectInputDevice8_Acquire(joystick->hwdata->InputDevice);
+
+            if (FAILED(result)) {
+                return SetDIerror("IDirectInputDevice8::Acquire", result);
+            }
+
+            /* reset all accuators. */
+            result =
+                IDirectInputDevice8_SendForceFeedbackCommand(joystick->hwdata->
+                                                             InputDevice,
+                                                             DISFFC_RESET);
+
+            /* Not necessarily supported, ignore if not supported.
+            if (FAILED(result)) {
+                return SetDIerror("IDirectInputDevice8::SendForceFeedbackCommand", result);
+            }
+            */
+
+            result = IDirectInputDevice8_Unacquire(joystick->hwdata->InputDevice);
+
+            if (FAILED(result)) {
+                return SetDIerror("IDirectInputDevice8::Unacquire", result);
+            }
+
+            /* Turn on auto-centering for a ForceFeedback device (until told
+             * otherwise). */
+            dipdw.diph.dwObj = 0;
+            dipdw.diph.dwHow = DIPH_DEVICE;
+            dipdw.dwData = DIPROPAUTOCENTER_ON;
+
+            result =
+                IDirectInputDevice8_SetProperty(joystick->hwdata->InputDevice,
+                                                DIPROP_AUTOCENTER, &dipdw.diph);
+
+            /* Not necessarily supported, ignore if not supported.
+            if (FAILED(result)) {
+                return SetDIerror("IDirectInputDevice8::SetProperty", result);
+            }
+            */
+        }
+
+        /* What buttons and axes does it have? */
+        IDirectInputDevice8_EnumObjects(joystick->hwdata->InputDevice,
+                                        EnumDevObjectsCallback, joystick,
+                                        DIDFT_BUTTON | DIDFT_AXIS | DIDFT_POV);
+
+        /* Reorder the input objects. Some devices do not report the X axis as
+         * the first axis, for example. */
+        SortDevObjects(joystick);
+
+        dipdw.diph.dwObj = 0;
+        dipdw.diph.dwHow = DIPH_DEVICE;
+        dipdw.dwData = INPUT_QSIZE;
+
+        /* Set the buffer size */
+        result =
+            IDirectInputDevice8_SetProperty(joystick->hwdata->InputDevice,
+                                            DIPROP_BUFFERSIZE, &dipdw.diph);
+
+        if (result == DI_POLLEDDEVICE) {
+            /* This device doesn't support buffering, so we're forced
+             * to use less reliable polling. */
+            joystick->hwdata->buffered = 0;
+        } else if (FAILED(result)) {
+            return SetDIerror("IDirectInputDevice8::SetProperty", result);
+        }
+    }
+    return (0);
+}
+
+/* return true if this joystick is plugged in right now */
+SDL_bool SDL_SYS_JoystickAttached( SDL_Joystick * joystick )
+{
+    return joystick->closed == 0 && joystick->hwdata->removed == 0;
+}
+
+
+/* Sort using the data offset into the DInput struct.
+ * This gives a reasonable ordering for the inputs. */
+static int
+SortDevFunc(const void *a, const void *b)
+{
+    const input_t *inputA = (const input_t*)a;
+    const input_t *inputB = (const input_t*)b;
+
+    if (inputA->ofs < inputB->ofs)
+        return -1;
+    if (inputA->ofs > inputB->ofs)
+        return 1;
+    return 0;
+}
+
+/* Sort the input objects and recalculate the indices for each input. */
+static void
+SortDevObjects(SDL_Joystick *joystick)
+{
+    input_t *inputs = joystick->hwdata->Inputs;
+    int nButtons = 0;
+    int nHats = 0;
+    int nAxis = 0;
+    int n;
+
+    SDL_qsort(inputs, joystick->hwdata->NumInputs, sizeof(input_t), SortDevFunc);
+
+    for (n = 0; n < joystick->hwdata->NumInputs; n++)
+    {
+        switch (inputs[n].type)
+        {
+        case BUTTON:
+            inputs[n].num = nButtons;
+            nButtons++;
+            break;
+
+        case HAT:
+            inputs[n].num = nHats;
+            nHats++;
+            break;
+
+        case AXIS:
+            inputs[n].num = nAxis;
+            nAxis++;
+            break;
+        }
+    }
+}
+
+static BOOL CALLBACK
+EnumDevObjectsCallback(LPCDIDEVICEOBJECTINSTANCE dev, LPVOID pvRef)
+{
+    SDL_Joystick *joystick = (SDL_Joystick *) pvRef;
+    HRESULT result;
+    input_t *in = &joystick->hwdata->Inputs[joystick->hwdata->NumInputs];
+
+    if (dev->dwType & DIDFT_BUTTON) {
+        in->type = BUTTON;
+        in->num = joystick->nbuttons;
+        in->ofs = DIJOFS_BUTTON( in->num );
+        joystick->nbuttons++;
+    } else if (dev->dwType & DIDFT_POV) {
+        in->type = HAT;
+        in->num = joystick->nhats;
+        in->ofs = DIJOFS_POV( in->num );
+        joystick->nhats++;
+    } else if (dev->dwType & DIDFT_AXIS) {
+        DIPROPRANGE diprg;
+        DIPROPDWORD dilong;
+
+        in->type = AXIS;
+        in->num = joystick->naxes;
+        /* work our the axis this guy maps too, thanks for the code icculus! */
+        if ( !SDL_memcmp( &dev->guidType, &GUID_XAxis, sizeof(dev->guidType) ) )
+            in->ofs = DIJOFS_X;
+        else if ( !SDL_memcmp( &dev->guidType, &GUID_YAxis, sizeof(dev->guidType) ) )
+            in->ofs = DIJOFS_Y;
+        else if ( !SDL_memcmp( &dev->guidType, &GUID_ZAxis, sizeof(dev->guidType) ) )
+            in->ofs = DIJOFS_Z;
+        else if ( !SDL_memcmp( &dev->guidType, &GUID_RxAxis, sizeof(dev->guidType) ) )
+            in->ofs = DIJOFS_RX;
+        else if ( !SDL_memcmp( &dev->guidType, &GUID_RyAxis, sizeof(dev->guidType) ) )
+            in->ofs = DIJOFS_RY;
+        else if ( !SDL_memcmp( &dev->guidType, &GUID_RzAxis, sizeof(dev->guidType) ) )
+            in->ofs = DIJOFS_RZ;
+        else if ( !SDL_memcmp( &dev->guidType, &GUID_Slider, sizeof(dev->guidType) ) )
+        {
+            in->ofs = DIJOFS_SLIDER( joystick->hwdata->NumSliders );
+            ++joystick->hwdata->NumSliders;
+        }
+        else
+        {
+             return DIENUM_CONTINUE; /* not an axis we can grok */
+        }
+
+        diprg.diph.dwSize = sizeof(diprg);
+        diprg.diph.dwHeaderSize = sizeof(diprg.diph);
+        diprg.diph.dwObj = dev->dwType;
+        diprg.diph.dwHow = DIPH_BYID;
+        diprg.lMin = AXIS_MIN;
+        diprg.lMax = AXIS_MAX;
+
+        result =
+            IDirectInputDevice8_SetProperty(joystick->hwdata->InputDevice,
+                                            DIPROP_RANGE, &diprg.diph);
+        if (FAILED(result)) {
+            return DIENUM_CONTINUE;     /* don't use this axis */
+        }
+
+        /* Set dead zone to 0. */
+        dilong.diph.dwSize = sizeof(dilong);
+        dilong.diph.dwHeaderSize = sizeof(dilong.diph);
+        dilong.diph.dwObj = dev->dwType;
+        dilong.diph.dwHow = DIPH_BYID;
+        dilong.dwData = 0;
+        result =
+            IDirectInputDevice8_SetProperty(joystick->hwdata->InputDevice,
+                                            DIPROP_DEADZONE, &dilong.diph);
+        if (FAILED(result)) {
+            return DIENUM_CONTINUE;     /* don't use this axis */
+        }
+
+        joystick->naxes++;
+    } else {
+        /* not supported at this time */
+        return DIENUM_CONTINUE;
+    }
+
+    joystick->hwdata->NumInputs++;
+
+    if (joystick->hwdata->NumInputs == MAX_INPUTS) {
+        return DIENUM_STOP;     /* too many */
+    }
+
+    return DIENUM_CONTINUE;
+}
+
+/* Function to update the state of a joystick - called as a device poll.
+ * This function shouldn't update the joystick structure directly,
+ * but instead should call SDL_PrivateJoystick*() to deliver events
+ * and update joystick device state.
+ */
+void
+SDL_SYS_JoystickUpdate_Polled(SDL_Joystick * joystick)
+{
+    DIJOYSTATE2 state;
+    HRESULT result;
+    int i;
+
+    result =
+        IDirectInputDevice8_GetDeviceState(joystick->hwdata->InputDevice,
+                                           sizeof(DIJOYSTATE2), &state);
+    if (result == DIERR_INPUTLOST || result == DIERR_NOTACQUIRED) {
+        IDirectInputDevice8_Acquire(joystick->hwdata->InputDevice);
+        result =
+            IDirectInputDevice8_GetDeviceState(joystick->hwdata->InputDevice,
+                                               sizeof(DIJOYSTATE2), &state);
+    }
+
+    if ( result != DI_OK )
+    {
+        joystick->hwdata->send_remove_event = 1;
+        joystick->hwdata->removed = 1;
+        return;
+    }
+
+    /* Set each known axis, button and POV. */
+    for (i = 0; i < joystick->hwdata->NumInputs; ++i) {
+        const input_t *in = &joystick->hwdata->Inputs[i];
+
+        switch (in->type) {
+        case AXIS:
+            switch (in->ofs) {
+            case DIJOFS_X:
+                SDL_PrivateJoystickAxis_Int(joystick, in->num,
+                                            (Sint16) state.lX);
+                break;
+            case DIJOFS_Y:
+                SDL_PrivateJoystickAxis_Int(joystick, in->num,
+                                            (Sint16) state.lY);
+                break;
+            case DIJOFS_Z:
+                SDL_PrivateJoystickAxis_Int(joystick, in->num,
+                                            (Sint16) state.lZ);
+                break;
+            case DIJOFS_RX:
+                SDL_PrivateJoystickAxis_Int(joystick, in->num,
+                                            (Sint16) state.lRx);
+                break;
+            case DIJOFS_RY:
+                SDL_PrivateJoystickAxis_Int(joystick, in->num,
+                                            (Sint16) state.lRy);
+                break;
+            case DIJOFS_RZ:
+                SDL_PrivateJoystickAxis_Int(joystick, in->num,
+                                            (Sint16) state.lRz);
+                break;
+            case DIJOFS_SLIDER(0):
+                SDL_PrivateJoystickAxis_Int(joystick, in->num,
+                                            (Sint16) state.rglSlider[0]);
+                break;
+            case DIJOFS_SLIDER(1):
+                SDL_PrivateJoystickAxis_Int(joystick, in->num,
+                                            (Sint16) state.rglSlider[1]);
+                break;
+            }
+
+            break;
+
+        case BUTTON:
+            SDL_PrivateJoystickButton_Int(joystick, in->num,
+                                          (Uint8) (state.
+                                                   rgbButtons[in->ofs -
+                                                              DIJOFS_BUTTON0]
+                                                   ? SDL_PRESSED :
+                                                   SDL_RELEASED));
+            break;
+        case HAT:
+            {
+                Uint8 pos = TranslatePOV(state.rgdwPOV[in->ofs -
+                                                       DIJOFS_POV(0)]);
+                SDL_PrivateJoystickHat_Int(joystick, in->num, pos);
+                break;
+            }
+        }
+    }
+}
+
+void
+SDL_SYS_JoystickUpdate_Buffered(SDL_Joystick * joystick)
+{
+    int i;
+    HRESULT result;
+    DWORD numevents;
+    DIDEVICEOBJECTDATA evtbuf[INPUT_QSIZE];
+
+    numevents = INPUT_QSIZE;
+    result =
+        IDirectInputDevice8_GetDeviceData(joystick->hwdata->InputDevice,
+                                          sizeof(DIDEVICEOBJECTDATA), evtbuf,
+                                          &numevents, 0);
+    if (result == DIERR_INPUTLOST || result == DIERR_NOTACQUIRED) {
+        IDirectInputDevice8_Acquire(joystick->hwdata->InputDevice);
+        result =
+            IDirectInputDevice8_GetDeviceData(joystick->hwdata->InputDevice,
+                                              sizeof(DIDEVICEOBJECTDATA),
+                                              evtbuf, &numevents, 0);
+    }
+
+    /* Handle the events or punt */
+    if (FAILED(result))
+    {
+        joystick->hwdata->send_remove_event = 1;
+        joystick->hwdata->removed = 1;
+        return;
+    }
+
+    for (i = 0; i < (int) numevents; ++i) {
+        int j;
+
+        for (j = 0; j < joystick->hwdata->NumInputs; ++j) {
+            const input_t *in = &joystick->hwdata->Inputs[j];
+
+            if (evtbuf[i].dwOfs != in->ofs)
+                continue;
+
+            switch (in->type) {
+            case AXIS:
+                SDL_PrivateJoystickAxis(joystick, in->num,
+                                        (Sint16) evtbuf[i].dwData);
+                break;
+            case BUTTON:
+                SDL_PrivateJoystickButton(joystick, in->num,
+                                          (Uint8) (evtbuf[i].
+                                                   dwData ? SDL_PRESSED :
+                                                   SDL_RELEASED));
+                break;
+            case HAT:
+                {
+                    Uint8 pos = TranslatePOV(evtbuf[i].dwData);
+                    SDL_PrivateJoystickHat(joystick, in->num, pos);
+                }
+            }
+        }
+    }
+}
+
+
+/* Function to return > 0 if a bit array of buttons differs after applying a mask
+*/
+int ButtonChanged( int ButtonsNow, int ButtonsPrev, int ButtonMask )
+{
+    return ( ButtonsNow & ButtonMask ) != ( ButtonsPrev & ButtonMask );
+}
+
+/* Function to update the state of a XInput style joystick.
+*/
+void
+SDL_SYS_JoystickUpdate_XInput(SDL_Joystick * joystick)
+{
+    HRESULT result;
+
+    if ( !XINPUTGETSTATE )
+        return;
+
+    result = XINPUTGETSTATE( joystick->hwdata->userid, &joystick->hwdata->XInputState[joystick->hwdata->currentXInputSlot] );
+    if ( result == ERROR_DEVICE_NOT_CONNECTED )
+    {
+        joystick->hwdata->send_remove_event = 1;
+        joystick->hwdata->removed = 1;
+        return;
+    }
+
+    /* only fire events if the data changed from last time */
+    if ( joystick->hwdata->XInputState[joystick->hwdata->currentXInputSlot].dwPacketNumber != 0
+        && joystick->hwdata->XInputState[joystick->hwdata->currentXInputSlot].dwPacketNumber != joystick->hwdata->XInputState[joystick->hwdata->currentXInputSlot^1].dwPacketNumber )
+    {
+        XINPUT_STATE_EX *pXInputState = &joystick->hwdata->XInputState[joystick->hwdata->currentXInputSlot];
+        XINPUT_STATE_EX *pXInputStatePrev = &joystick->hwdata->XInputState[joystick->hwdata->currentXInputSlot ^ 1];
+
+        /* !!! FIXME: why isn't this just using SDL_PrivateJoystickAxis_Int()? */
+        SDL_PrivateJoystickAxis( joystick, 0, (Sint16)pXInputState->Gamepad.sThumbLX );
+        SDL_PrivateJoystickAxis( joystick, 1, (Sint16)(-SDL_max(-32767, pXInputState->Gamepad.sThumbLY)) );
+        SDL_PrivateJoystickAxis( joystick, 2, (Sint16)pXInputState->Gamepad.sThumbRX );
+        SDL_PrivateJoystickAxis( joystick, 3, (Sint16)(-SDL_max(-32767, pXInputState->Gamepad.sThumbRY)) );
+        SDL_PrivateJoystickAxis( joystick, 4, (Sint16)(((int)pXInputState->Gamepad.bLeftTrigger*65535/255) - 32768));
+        SDL_PrivateJoystickAxis( joystick, 5, (Sint16)(((int)pXInputState->Gamepad.bRightTrigger*65535/255) - 32768));
+
+        /* !!! FIXME: why isn't this just using SDL_PrivateJoystickButton_Int(), instead of keeping these two alternating state buffers? */
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_DPAD_UP ) )
+            SDL_PrivateJoystickButton(joystick, 0, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP ? SDL_PRESSED :  SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_DPAD_DOWN ) )
+            SDL_PrivateJoystickButton(joystick, 1, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN ? SDL_PRESSED :    SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_DPAD_LEFT ) )
+            SDL_PrivateJoystickButton(joystick, 2, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT ? SDL_PRESSED :    SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_DPAD_RIGHT ) )
+            SDL_PrivateJoystickButton(joystick, 3, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT ? SDL_PRESSED :   SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_START ) )
+            SDL_PrivateJoystickButton(joystick, 4, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_START ? SDL_PRESSED :    SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_BACK ) )
+            SDL_PrivateJoystickButton(joystick, 5, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_BACK ? SDL_PRESSED : SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_LEFT_THUMB ) )
+            SDL_PrivateJoystickButton(joystick, 6, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB ? SDL_PRESSED :   SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_RIGHT_THUMB ) )
+            SDL_PrivateJoystickButton(joystick, 7, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB ? SDL_PRESSED :  SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_LEFT_SHOULDER ) )
+            SDL_PrivateJoystickButton(joystick, 8, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_SHOULDER ? SDL_PRESSED :    SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_RIGHT_SHOULDER ) )
+            SDL_PrivateJoystickButton(joystick, 9, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_SHOULDER ? SDL_PRESSED :   SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_A ) )
+            SDL_PrivateJoystickButton(joystick, 10, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_A ? SDL_PRESSED :   SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_B ) )
+            SDL_PrivateJoystickButton(joystick, 11, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_B ? SDL_PRESSED :   SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_X ) )
+            SDL_PrivateJoystickButton(joystick, 12, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_X ? SDL_PRESSED :   SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_Y ) )
+            SDL_PrivateJoystickButton(joystick, 13, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_Y ? SDL_PRESSED :   SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons,  0x400 ) )
+            SDL_PrivateJoystickButton(joystick, 14, pXInputState->Gamepad.wButtons & 0x400 ? SDL_PRESSED :  SDL_RELEASED ); /* 0x400 is the undocumented code for the guide button */
+
+        joystick->hwdata->currentXInputSlot ^= 1;
+
+    }
+}
+
+
+static Uint8
+TranslatePOV(DWORD value)
+{
+    const int HAT_VALS[] = {
+        SDL_HAT_UP,
+        SDL_HAT_UP | SDL_HAT_RIGHT,
+        SDL_HAT_RIGHT,
+        SDL_HAT_DOWN | SDL_HAT_RIGHT,
+        SDL_HAT_DOWN,
+        SDL_HAT_DOWN | SDL_HAT_LEFT,
+        SDL_HAT_LEFT,
+        SDL_HAT_UP | SDL_HAT_LEFT
+    };
+
+    if (LOWORD(value) == 0xFFFF)
+        return SDL_HAT_CENTERED;
+
+    /* Round the value up: */
+    value += 4500 / 2;
+    value %= 36000;
+    value /= 4500;
+
+    if (value >= 8)
+        return SDL_HAT_CENTERED;        /* shouldn't happen */
+
+    return HAT_VALS[value];
+}
+
+/* SDL_PrivateJoystick* doesn't discard duplicate events, so we need to
+ * do it. */
+/* !!! FIXME: SDL_PrivateJoystickAxis _does_ discard duplicate events now. Ditch this code. */
+static int
+SDL_PrivateJoystickAxis_Int(SDL_Joystick * joystick, Uint8 axis, Sint16 value)
+{
+    if (joystick->axes[axis] != value)
+        return SDL_PrivateJoystickAxis(joystick, axis, value);
+    return 0;
+}
+
+static int
+SDL_PrivateJoystickHat_Int(SDL_Joystick * joystick, Uint8 hat, Uint8 value)
+{
+    if (joystick->hats[hat] != value)
+        return SDL_PrivateJoystickHat(joystick, hat, value);
+    return 0;
+}
+
+static int
+SDL_PrivateJoystickButton_Int(SDL_Joystick * joystick, Uint8 button,
+                              Uint8 state)
+{
+    if (joystick->buttons[button] != state)
+        return SDL_PrivateJoystickButton(joystick, button, state);
+    return 0;
+}
+
+void
+SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+{
+    HRESULT result;
+
+    if ( joystick->closed || !joystick->hwdata )
+        return;
+
+    if (joystick->hwdata->bXInputDevice)
+    {
+        SDL_SYS_JoystickUpdate_XInput(joystick);
+    }
+    else
+    {
+        result = IDirectInputDevice8_Poll(joystick->hwdata->InputDevice);
+        if (result == DIERR_INPUTLOST || result == DIERR_NOTACQUIRED) {
+            IDirectInputDevice8_Acquire(joystick->hwdata->InputDevice);
+            IDirectInputDevice8_Poll(joystick->hwdata->InputDevice);
+        }
+
+        if (joystick->hwdata->buffered)
+            SDL_SYS_JoystickUpdate_Buffered(joystick);
+        else
+            SDL_SYS_JoystickUpdate_Polled(joystick);
+    }
+
+    if ( joystick->hwdata->removed )
+    {
+        joystick->closed = 1;
+        joystick->uncentered = 1;
+    }
+}
+
+/* Function to close a joystick after use */
+void
+SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+{
+    if (!joystick->hwdata->bXInputDevice) {
+        IDirectInputDevice8_Unacquire(joystick->hwdata->InputDevice);
+        IDirectInputDevice8_Release(joystick->hwdata->InputDevice);
+    }
+
+    /* free system specific hardware data */
+    SDL_free(joystick->hwdata);
+
+    joystick->closed = 1;
+}
+
+/* Function to perform any system-specific joystick related cleanup */
+void
+SDL_SYS_JoystickQuit(void)
+{
+    JoyStick_DeviceData *device = SYS_Joystick;
+
+    while ( device )
+    {
+        JoyStick_DeviceData *device_next = device->pNext;
+        SDL_free(device->joystickname);
+        SDL_free(device);
+        device = device_next;
+    }
+    SYS_Joystick = NULL;
+
+    if ( s_threadJoystick )
+    {
+        SDL_LockMutex( s_mutexJoyStickEnum );
+        s_bJoystickThreadQuit = SDL_TRUE;
+        SDL_CondBroadcast( s_condJoystickThread ); /* signal the joystick thread to quit */
+        SDL_UnlockMutex( s_mutexJoyStickEnum );
+        SDL_WaitThread( s_threadJoystick, NULL ); /* wait for it to bugger off */
+
+        SDL_DestroyMutex( s_mutexJoyStickEnum );
+        SDL_DestroyCond( s_condJoystickThread );
+        s_condJoystickThread= NULL;
+        s_mutexJoyStickEnum = NULL;
+        s_threadJoystick = NULL;
+    }
+
+    if (dinput != NULL) {
+        IDirectInput8_Release(dinput);
+        dinput = NULL;
+    }
+
+    if (coinitialized) {
+        WIN_CoUninitialize();
+        coinitialized = SDL_FALSE;
+    }
+
+    if (s_bXInputEnabled) {
+        WIN_UnloadXInputDLL();
+    }
+}
+
+/* return the stable device guid for this device index */
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    JoyStick_DeviceData *device = SYS_Joystick;
+    int index;
+
+    for (index = device_index; index > 0; index--)
+        device = device->pNext;
+
+    return device->guid;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    return joystick->hwdata->guid;
+}
+
+/* return SDL_TRUE if this device is using XInput */
+SDL_bool SDL_SYS_IsXInputDeviceIndex(int device_index)
+{
+    JoyStick_DeviceData *device = SYS_Joystick;
+    int index;
+
+    for (index = device_index; index > 0; index--)
+        device = device->pNext;
+
+    return device->bXInputDevice;
+}
+
+/* return SDL_TRUE if this device was opened with XInput */
+SDL_bool SDL_SYS_IsXInputJoystick(SDL_Joystick * joystick)
+{
+	return joystick->hwdata->bXInputDevice;
+}
+
+#endif /* SDL_JOYSTICK_DINPUT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/windows/SDL_dxjoystick_c.h b/Source/3rd Party/sdl/src/joystick/windows/SDL_dxjoystick_c.h
new file mode 100644
index 000000000..2808fed56
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/windows/SDL_dxjoystick_c.h	
@@ -0,0 +1,150 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef SDL_JOYSTICK_DINPUT_H
+
+/* DirectInput joystick driver; written by Glenn Maynard, based on Andrei de
+ * A. Formiga's WINMM driver.
+ *
+ * Hats and sliders are completely untested; the app I'm writing this for mostly
+ * doesn't use them and I don't own any joysticks with them.
+ *
+ * We don't bother to use event notification here.  It doesn't seem to work
+ * with polled devices, and it's fine to call IDirectInputDevice2_GetDeviceData and
+ * let it return 0 events. */
+
+#include "../../core/windows/SDL_windows.h"
+
+#define DIRECTINPUT_VERSION 0x0800      /* Need version 7 for force feedback. Need version 8 so IDirectInput8_EnumDevices doesn't leak like a sieve... */
+#include <dinput.h>
+#define COBJMACROS
+#include <wbemcli.h>
+#include <oleauto.h>
+#include <xinput.h>
+#include <devguid.h>
+#include <dbt.h>
+
+
+#ifndef XUSER_MAX_COUNT
+#define XUSER_MAX_COUNT 4
+#endif
+#ifndef XUSER_INDEX_ANY
+#define XUSER_INDEX_ANY     0x000000FF
+#endif
+#ifndef XINPUT_CAPS_FFB_SUPPORTED
+#define XINPUT_CAPS_FFB_SUPPORTED 0x0001
+#endif
+
+
+/* typedef's for XInput structs we use */
+typedef struct
+{
+    WORD wButtons;
+    BYTE bLeftTrigger;
+    BYTE bRightTrigger;
+    SHORT sThumbLX;
+    SHORT sThumbLY;
+    SHORT sThumbRX;
+    SHORT sThumbRY;
+    DWORD dwPaddingReserved;
+} XINPUT_GAMEPAD_EX;
+
+typedef struct
+{
+    DWORD dwPacketNumber;
+    XINPUT_GAMEPAD_EX Gamepad;
+} XINPUT_STATE_EX;
+
+/* Forward decl's for XInput API's we load dynamically and use if available */
+typedef DWORD (WINAPI *XInputGetState_t)
+    (
+    DWORD         dwUserIndex,  /* [in] Index of the gamer associated with the device */
+    XINPUT_STATE_EX* pState     /* [out] Receives the current state */
+    );
+
+typedef DWORD (WINAPI *XInputSetState_t)
+    (
+    DWORD             dwUserIndex,  /* [in] Index of the gamer associated with the device */
+    XINPUT_VIBRATION* pVibration    /* [in, out] The vibration information to send to the controller */
+    );
+
+typedef DWORD (WINAPI *XInputGetCapabilities_t)
+    (
+    DWORD                dwUserIndex,   /* [in] Index of the gamer associated with the device */
+    DWORD                dwFlags,       /* [in] Input flags that identify the device type */
+    XINPUT_CAPABILITIES* pCapabilities  /* [out] Receives the capabilities */
+    );
+
+extern int WIN_LoadXInputDLL(void);
+extern void WIN_UnloadXInputDLL(void);
+
+extern XInputGetState_t SDL_XInputGetState;
+extern XInputSetState_t SDL_XInputSetState;
+extern XInputGetCapabilities_t SDL_XInputGetCapabilities;
+extern DWORD SDL_XInputVersion;  /* ((major << 16) & 0xFF00) | (minor & 0xFF) */
+
+#define XINPUTGETSTATE          SDL_XInputGetState
+#define XINPUTSETSTATE          SDL_XInputSetState
+#define XINPUTGETCAPABILITIES   SDL_XInputGetCapabilities
+#define INVALID_XINPUT_USERID   XUSER_INDEX_ANY
+#define SDL_XINPUT_MAX_DEVICES  XUSER_MAX_COUNT
+
+#define MAX_INPUTS  256     /* each joystick can have up to 256 inputs */
+
+
+/* local types */
+typedef enum Type
+{ BUTTON, AXIS, HAT } Type;
+
+typedef struct input_t
+{
+    /* DirectInput offset for this input type: */
+    DWORD ofs;
+
+    /* Button, axis or hat: */
+    Type type;
+
+    /* SDL input offset: */
+    Uint8 num;
+} input_t;
+
+/* The private structure used to keep track of a joystick */
+struct joystick_hwdata
+{
+    LPDIRECTINPUTDEVICE8 InputDevice;
+    DIDEVCAPS Capabilities;
+    int buffered;
+    SDL_JoystickGUID guid;
+
+    input_t Inputs[MAX_INPUTS];
+    int NumInputs;
+    int NumSliders;
+    Uint8 removed;
+    Uint8 send_remove_event;
+    Uint8 bXInputDevice; /* 1 if this device supports using the xinput API rather than DirectInput */
+    Uint8 bXInputHaptic; /* Supports force feedback via XInput. */
+    Uint8 userid; /* XInput userid index for this joystick */
+    Uint8 currentXInputSlot; /* the current position to write to in XInputState below, used so we can compare old and new values */
+    XINPUT_STATE_EX XInputState[2];
+};
+
+#endif /* SDL_JOYSTICK_DINPUT_H */
diff --git a/Source/3rd Party/sdl/src/joystick/windows/SDL_mmjoystick.c b/Source/3rd Party/sdl/src/joystick/windows/SDL_mmjoystick.c
new file mode 100644
index 000000000..c28ed91b5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/windows/SDL_mmjoystick.c	
@@ -0,0 +1,475 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_JOYSTICK_WINMM
+
+/* Win32 MultiMedia Joystick driver, contributed by Andrei de A. Formiga */
+
+#include "../../core/windows/SDL_windows.h"
+#include <mmsystem.h>
+#include <regstr.h>
+
+#include "SDL_events.h"
+#include "SDL_joystick.h"
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
+
+#ifdef REGSTR_VAL_JOYOEMNAME 
+#undef REGSTR_VAL_JOYOEMNAME 
+#endif
+#define REGSTR_VAL_JOYOEMNAME "OEMName"
+
+#define MAX_JOYSTICKS   16
+#define MAX_AXES    6       /* each joystick can have up to 6 axes */
+#define MAX_BUTTONS 32      /* and 32 buttons                      */
+#define AXIS_MIN    -32768  /* minimum value for axis coordinate */
+#define AXIS_MAX    32767   /* maximum value for axis coordinate */
+/* limit axis to 256 possible positions to filter out noise */
+#define JOY_AXIS_THRESHOLD      (((AXIS_MAX)-(AXIS_MIN))/256)
+#define JOY_BUTTON_FLAG(n)  (1<<n)
+
+
+/* array to hold joystick ID values */
+static UINT SYS_JoystickID[MAX_JOYSTICKS];
+static JOYCAPSA SYS_Joystick[MAX_JOYSTICKS];
+static char *SYS_JoystickName[MAX_JOYSTICKS];
+
+/* The private structure used to keep track of a joystick */
+struct joystick_hwdata
+{
+    /* joystick ID */
+    UINT id;
+
+    /* values used to translate device-specific coordinates into
+       SDL-standard ranges */
+    struct _transaxis
+    {
+        int offset;
+        float scale;
+    } transaxis[6];
+};
+
+/* Convert a Windows Multimedia API return code to a text message */
+static void SetMMerror(char *function, int code);
+
+
+static char *
+GetJoystickName(int index, const char *szRegKey)
+{
+    /* added 7/24/2004 by Eckhard Stolberg */
+    /*
+       see if there is a joystick for the current
+       index (1-16) listed in the registry
+     */
+    char *name = NULL;
+    HKEY hTopKey;
+    HKEY hKey;
+    DWORD regsize;
+    LONG regresult;
+    char regkey[256];
+    char regvalue[256];
+    char regname[256];
+
+    SDL_snprintf(regkey, SDL_arraysize(regkey), "%s\\%s\\%s",
+                 REGSTR_PATH_JOYCONFIG, szRegKey, REGSTR_KEY_JOYCURR);
+    hTopKey = HKEY_LOCAL_MACHINE;
+    regresult = RegOpenKeyExA(hTopKey, regkey, 0, KEY_READ, &hKey);
+    if (regresult != ERROR_SUCCESS) {
+        hTopKey = HKEY_CURRENT_USER;
+        regresult = RegOpenKeyExA(hTopKey, regkey, 0, KEY_READ, &hKey);
+    }
+    if (regresult != ERROR_SUCCESS) {
+        return NULL;
+    }
+
+    /* find the registry key name for the joystick's properties */
+    regsize = sizeof(regname);
+    SDL_snprintf(regvalue, SDL_arraysize(regvalue), "Joystick%d%s", index + 1,
+                 REGSTR_VAL_JOYOEMNAME);
+    regresult =
+        RegQueryValueExA(hKey, regvalue, 0, 0, (LPBYTE) regname, &regsize);
+    RegCloseKey(hKey);
+
+    if (regresult != ERROR_SUCCESS) {
+        return NULL;
+    }
+
+    /* open that registry key */
+    SDL_snprintf(regkey, SDL_arraysize(regkey), "%s\\%s", REGSTR_PATH_JOYOEM,
+                 regname);
+    regresult = RegOpenKeyExA(hTopKey, regkey, 0, KEY_READ, &hKey);
+    if (regresult != ERROR_SUCCESS) {
+        return NULL;
+    }
+
+    /* find the size for the OEM name text */
+    regsize = sizeof(regvalue);
+    regresult =
+        RegQueryValueExA(hKey, REGSTR_VAL_JOYOEMNAME, 0, 0, NULL, &regsize);
+    if (regresult == ERROR_SUCCESS) {
+        /* allocate enough memory for the OEM name text ... */
+        name = (char *) SDL_malloc(regsize);
+        if (name) {
+            /* ... and read it from the registry */
+            regresult = RegQueryValueExA(hKey,
+                                         REGSTR_VAL_JOYOEMNAME, 0, 0,
+                                         (LPBYTE) name, &regsize);
+        }
+    }
+    RegCloseKey(hKey);
+
+    return (name);
+}
+
+static int SDL_SYS_numjoysticks = 0;
+
+/* Function to scan the system for joysticks.
+ * This function should set SDL_numjoysticks to the number of available
+ * joysticks.  Joystick 0 should be the system default joystick.
+ * It should return 0, or -1 on an unrecoverable fatal error.
+ */
+int
+SDL_SYS_JoystickInit(void)
+{
+    int i;
+    int maxdevs;
+    JOYINFOEX joyinfo;
+    JOYCAPSA joycaps;
+    MMRESULT result;
+
+    /* Reset the joystick ID & name mapping tables */
+    for (i = 0; i < MAX_JOYSTICKS; ++i) {
+        SYS_JoystickID[i] = 0;
+        SYS_JoystickName[i] = NULL;
+    }
+
+    /* Loop over all potential joystick devices */
+    SDL_SYS_numjoysticks = 0;
+    maxdevs = joyGetNumDevs();
+    for (i = JOYSTICKID1; i < maxdevs && SDL_SYS_numjoysticks < MAX_JOYSTICKS; ++i) {
+
+        joyinfo.dwSize = sizeof(joyinfo);
+        joyinfo.dwFlags = JOY_RETURNALL;
+        result = joyGetPosEx(i, &joyinfo);
+        if (result == JOYERR_NOERROR) {
+            result = joyGetDevCapsA(i, &joycaps, sizeof(joycaps));
+            if (result == JOYERR_NOERROR) {
+                SYS_JoystickID[SDL_SYS_numjoysticks] = i;
+                SYS_Joystick[SDL_SYS_numjoysticks] = joycaps;
+                SYS_JoystickName[SDL_SYS_numjoysticks] =
+                    GetJoystickName(i, joycaps.szRegKey);
+                SDL_SYS_numjoysticks++;
+            }
+        }
+    }
+    return (SDL_SYS_numjoysticks);
+}
+
+int SDL_SYS_NumJoysticks()
+{
+    return SDL_SYS_numjoysticks;
+}
+
+void SDL_SYS_JoystickDetect()
+{
+}
+
+SDL_bool SDL_SYS_JoystickNeedsPolling()
+{
+    return SDL_FALSE;
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char *
+SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    if (SYS_JoystickName[device_index] != NULL) {
+        return (SYS_JoystickName[device_index]);
+    } else {
+        return (SYS_Joystick[device_index].szPname);
+    }
+}
+
+/* Function to perform the mapping from device index to the instance id for this index */
+SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    return device_index;
+}
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+int
+SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+{
+    int index, i;
+    int caps_flags[MAX_AXES - 2] =
+        { JOYCAPS_HASZ, JOYCAPS_HASR, JOYCAPS_HASU, JOYCAPS_HASV };
+    int axis_min[MAX_AXES], axis_max[MAX_AXES];
+
+
+    /* shortcut */
+    index = device_index;
+    axis_min[0] = SYS_Joystick[index].wXmin;
+    axis_max[0] = SYS_Joystick[index].wXmax;
+    axis_min[1] = SYS_Joystick[index].wYmin;
+    axis_max[1] = SYS_Joystick[index].wYmax;
+    axis_min[2] = SYS_Joystick[index].wZmin;
+    axis_max[2] = SYS_Joystick[index].wZmax;
+    axis_min[3] = SYS_Joystick[index].wRmin;
+    axis_max[3] = SYS_Joystick[index].wRmax;
+    axis_min[4] = SYS_Joystick[index].wUmin;
+    axis_max[4] = SYS_Joystick[index].wUmax;
+    axis_min[5] = SYS_Joystick[index].wVmin;
+    axis_max[5] = SYS_Joystick[index].wVmax;
+
+    /* allocate memory for system specific hardware data */
+    joystick->instance_id = device_index;
+    joystick->hwdata =
+        (struct joystick_hwdata *) SDL_malloc(sizeof(*joystick->hwdata));
+    if (joystick->hwdata == NULL) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata));
+
+    /* set hardware data */
+    joystick->hwdata->id = SYS_JoystickID[index];
+    for (i = 0; i < MAX_AXES; ++i) {
+        if ((i < 2) || (SYS_Joystick[index].wCaps & caps_flags[i - 2])) {
+            joystick->hwdata->transaxis[i].offset = AXIS_MIN - axis_min[i];
+            joystick->hwdata->transaxis[i].scale =
+                (float) (AXIS_MAX - AXIS_MIN) / (axis_max[i] - axis_min[i]);
+        } else {
+            joystick->hwdata->transaxis[i].offset = 0;
+            joystick->hwdata->transaxis[i].scale = 1.0; /* Just in case */
+        }
+    }
+
+    /* fill nbuttons, naxes, and nhats fields */
+    joystick->nbuttons = SYS_Joystick[index].wNumButtons;
+    joystick->naxes = SYS_Joystick[index].wNumAxes;
+    if (SYS_Joystick[index].wCaps & JOYCAPS_HASPOV) {
+        joystick->nhats = 1;
+    } else {
+        joystick->nhats = 0;
+    }
+    return (0);
+}
+
+/* Function to determine is this joystick is attached to the system right now */
+SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
+{
+    return SDL_TRUE;
+}
+
+static Uint8
+TranslatePOV(DWORD value)
+{
+    Uint8 pos;
+
+    pos = SDL_HAT_CENTERED;
+    if (value != JOY_POVCENTERED) {
+        if ((value > JOY_POVLEFT) || (value < JOY_POVRIGHT)) {
+            pos |= SDL_HAT_UP;
+        }
+        if ((value > JOY_POVFORWARD) && (value < JOY_POVBACKWARD)) {
+            pos |= SDL_HAT_RIGHT;
+        }
+        if ((value > JOY_POVRIGHT) && (value < JOY_POVLEFT)) {
+            pos |= SDL_HAT_DOWN;
+        }
+        if (value > JOY_POVBACKWARD) {
+            pos |= SDL_HAT_LEFT;
+        }
+    }
+    return (pos);
+}
+
+/* Function to update the state of a joystick - called as a device poll.
+ * This function shouldn't update the joystick structure directly,
+ * but instead should call SDL_PrivateJoystick*() to deliver events
+ * and update joystick device state.
+ */
+void
+SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+{
+    MMRESULT result;
+    int i;
+    DWORD flags[MAX_AXES] = { JOY_RETURNX, JOY_RETURNY, JOY_RETURNZ,
+        JOY_RETURNR, JOY_RETURNU, JOY_RETURNV
+    };
+    DWORD pos[MAX_AXES];
+    struct _transaxis *transaxis;
+    int value, change;
+    JOYINFOEX joyinfo;
+
+    joyinfo.dwSize = sizeof(joyinfo);
+    joyinfo.dwFlags = JOY_RETURNALL | JOY_RETURNPOVCTS;
+    if (!joystick->hats) {
+        joyinfo.dwFlags &= ~(JOY_RETURNPOV | JOY_RETURNPOVCTS);
+    }
+    result = joyGetPosEx(joystick->hwdata->id, &joyinfo);
+    if (result != JOYERR_NOERROR) {
+        SetMMerror("joyGetPosEx", result);
+        return;
+    }
+
+    /* joystick motion events */
+    pos[0] = joyinfo.dwXpos;
+    pos[1] = joyinfo.dwYpos;
+    pos[2] = joyinfo.dwZpos;
+    pos[3] = joyinfo.dwRpos;
+    pos[4] = joyinfo.dwUpos;
+    pos[5] = joyinfo.dwVpos;
+
+    transaxis = joystick->hwdata->transaxis;
+    for (i = 0; i < joystick->naxes; i++) {
+        if (joyinfo.dwFlags & flags[i]) {
+            value =
+                (int) (((float) pos[i] +
+                        transaxis[i].offset) * transaxis[i].scale);
+            change = (value - joystick->axes[i]);
+            if ((change < -JOY_AXIS_THRESHOLD)
+                || (change > JOY_AXIS_THRESHOLD)) {
+                SDL_PrivateJoystickAxis(joystick, (Uint8) i, (Sint16) value);
+            }
+        }
+    }
+
+    /* joystick button events */
+    if (joyinfo.dwFlags & JOY_RETURNBUTTONS) {
+        for (i = 0; i < joystick->nbuttons; ++i) {
+            if (joyinfo.dwButtons & JOY_BUTTON_FLAG(i)) {
+                if (!joystick->buttons[i]) {
+                    SDL_PrivateJoystickButton(joystick, (Uint8) i,
+                                              SDL_PRESSED);
+                }
+            } else {
+                if (joystick->buttons[i]) {
+                    SDL_PrivateJoystickButton(joystick, (Uint8) i,
+                                              SDL_RELEASED);
+                }
+            }
+        }
+    }
+
+    /* joystick hat events */
+    if (joyinfo.dwFlags & JOY_RETURNPOV) {
+        Uint8 pos;
+
+        pos = TranslatePOV(joyinfo.dwPOV);
+        if (pos != joystick->hats[0]) {
+            SDL_PrivateJoystickHat(joystick, 0, pos);
+        }
+    }
+}
+
+/* Function to close a joystick after use */
+void
+SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+{
+    /* free system specific hardware data */
+    SDL_free(joystick->hwdata);
+    joystick->hwdata = NULL;
+}
+
+/* Function to perform any system-specific joystick related cleanup */
+void
+SDL_SYS_JoystickQuit(void)
+{
+    int i;
+    for (i = 0; i < MAX_JOYSTICKS; i++) {
+        SDL_free(SYS_JoystickName[i]);
+        SYS_JoystickName[i] = NULL;
+    }
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    SDL_JoystickGUID guid;
+    /* the GUID is just the first 16 chars of the name for now */
+    const char *name = joystick->name;
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+
+/* implementation functions */
+void
+SetMMerror(char *function, int code)
+{
+    static char *error;
+    static char errbuf[1024];
+
+    errbuf[0] = 0;
+    switch (code) {
+    case MMSYSERR_NODRIVER:
+        error = "Joystick driver not present";
+        break;
+
+    case MMSYSERR_INVALPARAM:
+    case JOYERR_PARMS:
+        error = "Invalid parameter(s)";
+        break;
+
+    case MMSYSERR_BADDEVICEID:
+        error = "Bad device ID";
+        break;
+
+    case JOYERR_UNPLUGGED:
+        error = "Joystick not attached";
+        break;
+
+    case JOYERR_NOCANDO:
+        error = "Can't capture joystick input";
+        break;
+
+    default:
+        SDL_snprintf(errbuf, SDL_arraysize(errbuf),
+                     "%s: Unknown Multimedia system error: 0x%x",
+                     function, code);
+        break;
+    }
+
+    if (!errbuf[0]) {
+        SDL_snprintf(errbuf, SDL_arraysize(errbuf), "%s: %s", function,
+                     error);
+    }
+    SDL_SetError("%s", errbuf);
+}
+
+#endif /* SDL_JOYSTICK_WINMM */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/joystick/winrt/SDL_xinputjoystick.c b/Source/3rd Party/sdl/src/joystick/winrt/SDL_xinputjoystick.c
new file mode 100644
index 000000000..00005080f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/joystick/winrt/SDL_xinputjoystick.c	
@@ -0,0 +1,537 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_JOYSTICK_XINPUT
+
+/* SDL_xinputjoystick.c implements an XInput-only joystick and game controller
+   backend that is suitable for use on WinRT.  SDL's DirectInput backend, also
+   XInput-capable, was not used as DirectInput is not available on WinRT (or,
+   at least, it isn't a public API).  Some portions of this XInput backend
+   may copy parts of the XInput-using code from the DirectInput backend.
+   Refactoring the common parts into one location may be good to-do at some
+   point.
+
+   TODO, WinRT: add hotplug support for XInput based game controllers
+*/
+
+#include "SDL_joystick.h"
+#include "../SDL_sysjoystick.h"
+#include "../SDL_joystick_c.h"
+#include "SDL_events.h"
+#include "../../events/SDL_events_c.h"
+#include "SDL_timer.h"
+
+#include <Windows.h>
+#include <Xinput.h>
+
+struct joystick_hwdata {
+    //Uint8 bXInputHaptic; // Supports force feedback via XInput.
+    DWORD userIndex;    // The XInput device index, in the range [0, XUSER_MAX_COUNT-1] (probably [0,3]).
+    XINPUT_STATE XInputState;   // the last-read in XInputState, kept around to compare old and new values
+    SDL_bool isDeviceConnected; // was the device connected (on the last detection-polling, or during backend-initialization)?
+    SDL_bool isDeviceConnectionEventPending;    // was a device added, and is the associated add-event pending?
+    SDL_bool isDeviceRemovalEventPending;   // was the device removed, and is the associated remove-event pending?
+};
+
+/* Keep track of data on all XInput devices, regardless of whether or not
+   they've been opened (via SDL_JoystickOpen).
+ */
+static struct joystick_hwdata g_XInputData[XUSER_MAX_COUNT];
+
+/* Device detection can be extremely costly performance-wise, in some cases.
+   In particular, if no devices are connected, calls to detect a single device,
+   via either XInputGetState() or XInputGetCapabilities(), can take upwards of
+   20 ms on a 1st generation Surface RT, more if devices are detected across
+   all of of XInput's four device slots.  WinRT and XInput do not appear to
+   have callback-based APIs to notify an app when a device is connected, at
+   least as of Windows 8.1.  The synchronous XInput calls must be used.
+
+   Once a device is connected, calling XInputGetState() is a much less costly
+   operation, with individual calls costing well under 1 ms, and often under
+   0.1 ms [on a 1st gen Surface RT].
+
+   With XInput's performance limitations in mind, a separate device-detection
+   thread will be utilized (by SDL) to try to move costly XInput calls off the
+   main thread.  Polling of active devices still, however, occurs on the main
+   thread.
+ */
+static SDL_Thread * g_DeviceDetectionThread = NULL;
+static SDL_mutex * g_DeviceInfoLock = NULL;
+static SDL_bool g_DeviceDetectionQuit = SDL_FALSE;
+
+/* Main function for the device-detection thread.
+ */
+static int
+DeviceDetectionThreadMain(void * _data)
+{
+    DWORD result;
+    XINPUT_CAPABILITIES tempXInputCaps;
+    int i;
+
+    while (1) {
+        /* See if the device-detection thread is being asked to shutdown.
+         */
+        SDL_LockMutex(g_DeviceInfoLock);
+        if (g_DeviceDetectionQuit) {
+            SDL_UnlockMutex(g_DeviceInfoLock);
+            break;
+        }
+        SDL_UnlockMutex(g_DeviceInfoLock);
+
+        /* Add a short delay to prevent the device-detection thread from eating
+           up too much CPU time:
+         */
+        SDL_Delay(300);
+
+        /* TODO, WinRT: try making the device-detection thread wakeup sooner from its CPU-preserving SDL_Delay, if the thread was asked to quit.
+         */
+
+        /* See if any new devices are connected. */
+        SDL_LockMutex(g_DeviceInfoLock);
+        for (i = 0; i < XUSER_MAX_COUNT; ++i) {
+            if (!g_XInputData[i].isDeviceConnected &&
+                !g_XInputData[i].isDeviceConnectionEventPending &&
+                !g_XInputData[i].isDeviceRemovalEventPending)
+            {
+                SDL_UnlockMutex(g_DeviceInfoLock);
+                result = XInputGetCapabilities(i, 0, &tempXInputCaps);
+                SDL_LockMutex(g_DeviceInfoLock);
+                if (result == ERROR_SUCCESS) {
+                    /* Yes, a device is connected.  Mark it as such.
+                       Others will be told about this (via an
+                       SDL_JOYDEVICEADDED event) in the next call to
+                       SDL_SYS_JoystickDetect.
+                     */
+                    g_XInputData[i].isDeviceConnected = SDL_TRUE;
+                    g_XInputData[i].isDeviceConnectionEventPending = SDL_TRUE;
+                }
+            }
+        }
+        SDL_UnlockMutex(g_DeviceInfoLock);
+    }
+
+    return 0;
+}
+
+/* Function to scan the system for joysticks.
+ * It should return 0, or -1 on an unrecoverable fatal error.
+ */
+int
+SDL_SYS_JoystickInit(void)
+{
+    HRESULT result = S_OK;
+    XINPUT_STATE tempXInputState;
+    int i;
+
+    SDL_zero(g_XInputData);
+
+    /* Make initial notes on whether or not devices are connected (or not).
+     */
+    for (i = 0; i < XUSER_MAX_COUNT; ++i) {
+        result = XInputGetState(i, &tempXInputState);
+        if (result == ERROR_SUCCESS) {
+            g_XInputData[i].isDeviceConnected = SDL_TRUE;
+        }
+    }
+
+    /* Start up the device-detection thread.
+     */
+    g_DeviceDetectionQuit = SDL_FALSE;
+    g_DeviceInfoLock = SDL_CreateMutex();
+    g_DeviceDetectionThread = SDL_CreateThread(DeviceDetectionThreadMain, "SDL_joystick", NULL);
+
+    return (0);
+}
+
+int SDL_SYS_NumJoysticks()
+{
+    int joystickCount = 0;
+    DWORD i;
+
+    /* Iterate through each possible XInput device and see if something
+       was connected (at joystick init, or during the last polling).
+     */
+    SDL_LockMutex(g_DeviceInfoLock);
+    for (i = 0; i < XUSER_MAX_COUNT; ++i) {
+        if (g_XInputData[i].isDeviceConnected) {
+            ++joystickCount;
+        }
+    }
+    SDL_UnlockMutex(g_DeviceInfoLock);
+
+    return joystickCount;
+}
+
+void SDL_SYS_JoystickDetect()
+{
+    DWORD i;
+    SDL_Event event;
+
+    /* Iterate through each possible XInput device, seeing if any devices
+       have been connected, or if they were removed.
+     */
+    SDL_LockMutex(g_DeviceInfoLock);
+    for (i = 0; i < XUSER_MAX_COUNT; ++i) {
+        /* See if any new devices are connected. */
+        if (g_XInputData[i].isDeviceConnectionEventPending) {
+#if !SDL_EVENTS_DISABLED
+            SDL_zero(event);
+            event.type = SDL_JOYDEVICEADDED;
+                
+            if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+                event.jdevice.which = i;
+                if ((SDL_EventOK == NULL)
+                    || (*SDL_EventOK) (SDL_EventOKParam, &event)) {
+                    SDL_PushEvent(&event);
+                }
+            }
+#endif
+            g_XInputData[i].isDeviceConnectionEventPending = SDL_FALSE;
+        } else if (g_XInputData[i].isDeviceRemovalEventPending) {
+            /* A device was previously marked as removed (by
+               SDL_SYS_JoystickUpdate).  Tell others about the device removal.
+            */
+
+            g_XInputData[i].isDeviceRemovalEventPending = SDL_FALSE;
+
+#if !SDL_EVENTS_DISABLED
+            SDL_zero(event);
+            event.type = SDL_JOYDEVICEREMOVED;
+                
+            if (SDL_GetEventState(event.type) == SDL_ENABLE) {
+                event.jdevice.which = i; //joystick->hwdata->userIndex;
+                if ((SDL_EventOK == NULL)
+                    || (*SDL_EventOK) (SDL_EventOKParam, &event)) {
+                    SDL_PushEvent(&event);
+                }
+            }
+#endif
+        }
+    }
+    SDL_UnlockMutex(g_DeviceInfoLock);
+}
+
+SDL_bool SDL_SYS_JoystickNeedsPolling()
+{
+    /* Since XInput, or WinRT, provides any events to indicate when a game
+       controller gets connected, and instead indicates device availability
+       solely through polling, we'll poll (for new devices).
+     */
+    return SDL_TRUE;
+}
+
+/* Internal function to retreive device capabilities.
+   This function will return an SDL-standard value of 0 on success
+   (a device is connected, and data on it was retrieved), or -1
+   on failure (no device was connected, or some other error
+   occurred.  SDL_SetError() will be invoked to set an appropriate
+   error message.
+ */
+static int
+SDL_XInput_GetDeviceCapabilities(int device_index, XINPUT_CAPABILITIES * pDeviceCaps)
+{
+    HRESULT dwResult;
+
+    /* Make sure that the device index is a valid one.  If not, return to the
+       caller with an error.
+     */
+    if (device_index < 0 || device_index >= XUSER_MAX_COUNT) {
+        return SDL_SetError("invalid/unavailable device index");
+    }
+
+    /* See if a device exists, and if so, what its capabilities are.  If a
+       device is not available, return to the caller with an error.
+     */
+    switch ((dwResult = XInputGetCapabilities(device_index, 0, pDeviceCaps))) {
+        case ERROR_SUCCESS:
+            /* A device is available, and its capabilities were retrieved! */
+            return 0;
+        case ERROR_DEVICE_NOT_CONNECTED:
+            return SDL_SetError("no device is connected at joystick index, %d", device_index);
+        default:
+            return SDL_SetError("an unknown error occurred when retrieving info on a device at joystick index, %d", device_index);
+    }
+}
+
+/* Function to get the device-dependent name of a joystick */
+const char *
+SDL_SYS_JoystickNameForDeviceIndex(int device_index)
+{
+    XINPUT_CAPABILITIES deviceCaps;
+
+    if (SDL_XInput_GetDeviceCapabilities(device_index, &deviceCaps) != 0) {
+        /* Uh oh.  Device capabilities couldn't be retrieved.  Return to the
+           caller.  SDL_SetError() has already been invoked (with relevant
+           information).
+         */
+        return NULL;
+    }
+
+    switch (deviceCaps.SubType) {
+        default:
+            if (deviceCaps.Type == XINPUT_DEVTYPE_GAMEPAD) {
+                return "Undefined game controller";
+            } else {
+                return "Undefined controller";
+            }
+        case XINPUT_DEVSUBTYPE_UNKNOWN:
+            if (deviceCaps.Type == XINPUT_DEVTYPE_GAMEPAD) {
+                return "Unknown game controller";
+            } else {
+                return "Unknown controller";
+            }
+        case XINPUT_DEVSUBTYPE_GAMEPAD:
+            return "Gamepad controller";
+        case XINPUT_DEVSUBTYPE_WHEEL:
+            return "Racing wheel controller";
+        case XINPUT_DEVSUBTYPE_ARCADE_STICK:
+            return "Arcade stick controller";
+        case XINPUT_DEVSUBTYPE_FLIGHT_STICK:
+            return "Flight stick controller";
+        case XINPUT_DEVSUBTYPE_DANCE_PAD:
+            return "Dance pad controller";
+        case XINPUT_DEVSUBTYPE_GUITAR:
+            return "Guitar controller";
+        case XINPUT_DEVSUBTYPE_GUITAR_ALTERNATE:
+            return "Guitar controller, Alternate";
+        case XINPUT_DEVSUBTYPE_GUITAR_BASS:
+            return "Guitar controller, Bass";
+        case XINPUT_DEVSUBTYPE_DRUM_KIT:
+            return "Drum controller";
+        case XINPUT_DEVSUBTYPE_ARCADE_PAD:
+            return "Arcade pad controller";
+    }
+}
+
+/* Function to perform the mapping from device index to the instance id for this index */
+SDL_JoystickID SDL_SYS_GetInstanceIdOfDeviceIndex(int device_index)
+{
+    return device_index;
+}
+
+/* Function to open a joystick for use.
+   The joystick to open is specified by the index field of the joystick.
+   This should fill the nbuttons and naxes fields of the joystick structure.
+   It returns 0, or -1 if there is an error.
+ */
+int
+SDL_SYS_JoystickOpen(SDL_Joystick * joystick, int device_index)
+{
+    XINPUT_CAPABILITIES deviceCaps;
+
+    if (SDL_XInput_GetDeviceCapabilities(device_index, &deviceCaps) != 0) {
+        /* Uh oh.  Device capabilities couldn't be retrieved.  Return to the
+           caller.  SDL_SetError() has already been invoked (with relevant
+           information).
+         */
+        return -1;
+    }
+
+    /* For now, only game pads are supported.  If the device is something other
+       than that, return an error to the caller.
+     */
+    if (deviceCaps.Type != XINPUT_DEVTYPE_GAMEPAD) {
+        return SDL_SetError("a device is connected (at joystick index, %d), but it is of an unknown device type (deviceCaps.Flags=%ul)",
+            device_index, (unsigned int)deviceCaps.Flags);
+    }
+
+    /* Create the joystick data structure */
+    joystick->instance_id = device_index;
+    joystick->hwdata = &g_XInputData[device_index];
+
+    // The XInput API has a hard coded button/axis mapping, so we just match it
+    joystick->naxes = 6;
+    joystick->nbuttons = 15;
+    joystick->nballs = 0;
+    joystick->nhats = 0;
+
+    /* We're done! */
+    return (0);
+}
+
+/* Function to determine is this joystick is attached to the system right now */
+SDL_bool SDL_SYS_JoystickAttached(SDL_Joystick *joystick)
+{
+    SDL_bool isDeviceConnected;
+    SDL_LockMutex(g_DeviceInfoLock);
+    isDeviceConnected = joystick->hwdata->isDeviceConnected;
+    SDL_UnlockMutex(g_DeviceInfoLock);
+    return isDeviceConnected;
+}
+
+/* Function to return > 0 if a bit array of buttons differs after applying a mask
+*/
+static int ButtonChanged( int ButtonsNow, int ButtonsPrev, int ButtonMask )
+{
+    return ( ButtonsNow & ButtonMask ) != ( ButtonsPrev & ButtonMask );
+}
+
+/* Function to update the state of a joystick - called as a device poll.
+ * This function shouldn't update the joystick structure directly,
+ * but instead should call SDL_PrivateJoystick*() to deliver events
+ * and update joystick device state.
+ */
+void
+SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
+{
+    HRESULT result;
+    XINPUT_STATE prevXInputState;
+
+    SDL_LockMutex(g_DeviceInfoLock);
+
+    /* Before polling for new data, make note of the old data */
+    prevXInputState = joystick->hwdata->XInputState;
+
+    /* Poll for new data */
+    result = XInputGetState(joystick->hwdata->userIndex, &joystick->hwdata->XInputState);
+    if (result == ERROR_DEVICE_NOT_CONNECTED) {
+        if (joystick->hwdata->isDeviceConnected) {
+            joystick->hwdata->isDeviceConnected = SDL_FALSE;
+            joystick->hwdata->isDeviceRemovalEventPending = SDL_TRUE;
+            /* TODO, WinRT: make sure isDeviceRemovalEventPending gets cleared as appropriate, and that quick re-plugs don't cause trouble */
+        }
+        SDL_UnlockMutex(g_DeviceInfoLock);
+        return;
+    }
+
+    /* Make sure the device is marked as connected */
+    joystick->hwdata->isDeviceConnected = SDL_TRUE;
+
+    // only fire events if the data changed from last time
+    if ( joystick->hwdata->XInputState.dwPacketNumber != 0 
+        && joystick->hwdata->XInputState.dwPacketNumber != prevXInputState.dwPacketNumber )
+    {
+        XINPUT_STATE *pXInputState = &joystick->hwdata->XInputState;
+        XINPUT_STATE *pXInputStatePrev = &prevXInputState;
+
+        SDL_PrivateJoystickAxis(joystick, 0, (Sint16)pXInputState->Gamepad.sThumbLX );
+        SDL_PrivateJoystickAxis(joystick, 1, (Sint16)(-1*pXInputState->Gamepad.sThumbLY-1) );
+        SDL_PrivateJoystickAxis(joystick, 2, (Sint16)pXInputState->Gamepad.sThumbRX );
+        SDL_PrivateJoystickAxis(joystick, 3, (Sint16)(-1*pXInputState->Gamepad.sThumbRY-1) );
+        SDL_PrivateJoystickAxis(joystick, 4, (Sint16)((int)pXInputState->Gamepad.bLeftTrigger*32767/255) );
+        SDL_PrivateJoystickAxis(joystick, 5, (Sint16)((int)pXInputState->Gamepad.bRightTrigger*32767/255) );
+
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_DPAD_UP ) )
+            SDL_PrivateJoystickButton(joystick, 0, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_UP ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_DPAD_DOWN ) )
+            SDL_PrivateJoystickButton(joystick, 1, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_DOWN ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_DPAD_LEFT ) )
+            SDL_PrivateJoystickButton(joystick, 2, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_LEFT ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_DPAD_RIGHT ) )
+            SDL_PrivateJoystickButton(joystick, 3, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_DPAD_RIGHT ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_START ) )
+            SDL_PrivateJoystickButton(joystick, 4, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_START ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_BACK ) )
+            SDL_PrivateJoystickButton(joystick, 5, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_BACK ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_LEFT_THUMB ) )
+            SDL_PrivateJoystickButton(joystick, 6, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_THUMB ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_RIGHT_THUMB ) )
+            SDL_PrivateJoystickButton(joystick, 7, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_THUMB ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_LEFT_SHOULDER ) )
+            SDL_PrivateJoystickButton(joystick, 8, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_LEFT_SHOULDER ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_RIGHT_SHOULDER ) )
+            SDL_PrivateJoystickButton(joystick, 9, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_RIGHT_SHOULDER ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_A ) )
+            SDL_PrivateJoystickButton(joystick, 10, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_A ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_B ) )
+            SDL_PrivateJoystickButton(joystick, 11, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_B ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_X ) )
+            SDL_PrivateJoystickButton(joystick, 12, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_X ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons, XINPUT_GAMEPAD_Y ) )
+            SDL_PrivateJoystickButton(joystick, 13, pXInputState->Gamepad.wButtons & XINPUT_GAMEPAD_Y ? SDL_PRESSED :	SDL_RELEASED );
+        if ( ButtonChanged( pXInputState->Gamepad.wButtons, pXInputStatePrev->Gamepad.wButtons,  0x400 ) )
+            SDL_PrivateJoystickButton(joystick, 14, pXInputState->Gamepad.wButtons & 0x400 ? SDL_PRESSED :	SDL_RELEASED ); // 0x400 is the undocumented code for the guide button
+    }
+
+    SDL_UnlockMutex(g_DeviceInfoLock);
+}
+
+/* Function to close a joystick after use */
+void
+SDL_SYS_JoystickClose(SDL_Joystick * joystick)
+{
+    /* Clear cached button data on the joystick */
+    SDL_LockMutex(g_DeviceInfoLock);
+    SDL_zero(joystick->hwdata->XInputState);
+    SDL_UnlockMutex(g_DeviceInfoLock);
+
+    /* There's need to free 'hwdata', as it's a pointer to a global array.
+       The field will be cleared anyways, just to indicate that it's not
+       currently needed.
+     */
+    joystick->hwdata = NULL;
+}
+
+/* Function to perform any system-specific joystick related cleanup */
+void
+SDL_SYS_JoystickQuit(void)
+{
+    /* Tell the joystick detection thread to stop, then wait for it to finish */
+    SDL_LockMutex(g_DeviceInfoLock);
+    g_DeviceDetectionQuit = SDL_TRUE;
+    SDL_UnlockMutex(g_DeviceInfoLock);
+    SDL_WaitThread(g_DeviceDetectionThread, NULL);
+
+    /* Clean up device-detection stuff */
+    SDL_DestroyMutex(g_DeviceInfoLock);
+    g_DeviceInfoLock = NULL;
+    g_DeviceDetectionThread = NULL;
+    g_DeviceDetectionQuit = SDL_FALSE;
+
+    return;
+}
+
+SDL_JoystickGUID SDL_SYS_JoystickGetDeviceGUID( int device_index )
+{
+    SDL_JoystickGUID guid;
+    // the GUID is just the first 16 chars of the name for now
+    const char *name = SDL_SYS_JoystickNameForDeviceIndex( device_index );
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+
+SDL_JoystickGUID SDL_SYS_JoystickGetGUID(SDL_Joystick * joystick)
+{
+    SDL_JoystickGUID guid;
+    // the GUID is just the first 16 chars of the name for now
+    const char *name = joystick->name;
+    SDL_zero( guid );
+    SDL_memcpy( &guid, name, SDL_min( sizeof(guid), SDL_strlen( name ) ) );
+    return guid;
+}
+
+SDL_bool SDL_SYS_IsXInputDeviceIndex(int device_index)
+{
+    /* The XInput-capable DirectInput joystick backend implements the same
+       function (SDL_SYS_IsXInputDeviceIndex), however in that case, not all
+       joystick devices are XInput devices.  In this case, with the
+       WinRT-enabled XInput-only backend, all "joystick" devices are XInput
+       devices.
+     */
+    return SDL_TRUE;
+}
+
+#endif /* SDL_JOYSTICK_XINPUT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/libm/e_atan2.c b/Source/3rd Party/sdl/src/libm/e_atan2.c
new file mode 100644
index 000000000..f7b91a3e1
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/e_atan2.c	
@@ -0,0 +1,116 @@
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+/* __ieee754_atan2(y,x)
+ * Method :
+ *	1. Reduce y to positive by atan2(y,x)=-atan2(-y,x).
+ *	2. Reduce x to positive by (if x and y are unexceptional):
+ *		ARG (x+iy) = arctan(y/x)   	   ... if x > 0,
+ *		ARG (x+iy) = pi - arctan[y/(-x)]   ... if x < 0,
+ *
+ * Special cases:
+ *
+ *	ATAN2((anything), NaN ) is NaN;
+ *	ATAN2(NAN , (anything) ) is NaN;
+ *	ATAN2(+-0, +(anything but NaN)) is +-0  ;
+ *	ATAN2(+-0, -(anything but NaN)) is +-pi ;
+ *	ATAN2(+-(anything but 0 and NaN), 0) is +-pi/2;
+ *	ATAN2(+-(anything but INF and NaN), +INF) is +-0 ;
+ *	ATAN2(+-(anything but INF and NaN), -INF) is +-pi;
+ *	ATAN2(+-INF,+INF ) is +-pi/4 ;
+ *	ATAN2(+-INF,-INF ) is +-3pi/4;
+ *	ATAN2(+-INF, (anything but,0,NaN, and INF)) is +-pi/2;
+ *
+ * Constants:
+ * The hexadecimal values are the intended ones for the following
+ * constants. The decimal values may be used, provided that the
+ * compiler will convert from decimal to binary accurately enough
+ * to produce the hexadecimal values shown.
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+static const double
+tiny  = 1.0e-300,
+zero  = 0.0,
+pi_o_4  = 7.8539816339744827900E-01, /* 0x3FE921FB, 0x54442D18 */
+pi_o_2  = 1.5707963267948965580E+00, /* 0x3FF921FB, 0x54442D18 */
+pi      = 3.1415926535897931160E+00, /* 0x400921FB, 0x54442D18 */
+pi_lo   = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */
+
+double attribute_hidden __ieee754_atan2(double y, double x)
+{
+	double z;
+	int32_t k,m,hx,hy,ix,iy;
+	u_int32_t lx,ly;
+
+	EXTRACT_WORDS(hx,lx,x);
+	ix = hx&0x7fffffff;
+	EXTRACT_WORDS(hy,ly,y);
+	iy = hy&0x7fffffff;
+	if(((ix|((lx|-(int32_t)lx)>>31))>0x7ff00000)||
+	   ((iy|((ly|-(int32_t)ly)>>31))>0x7ff00000))	/* x or y is NaN */
+	   return x+y;
+	if(((hx-0x3ff00000)|lx)==0) return atan(y);   /* x=1.0 */
+	m = ((hy>>31)&1)|((hx>>30)&2);	/* 2*sign(x)+sign(y) */
+
+    /* when y = 0 */
+	if((iy|ly)==0) {
+	    switch(m) {
+		case 0:
+		case 1: return y; 	/* atan(+-0,+anything)=+-0 */
+		case 2: return  pi+tiny;/* atan(+0,-anything) = pi */
+		case 3: return -pi-tiny;/* atan(-0,-anything) =-pi */
+	    }
+	}
+    /* when x = 0 */
+	if((ix|lx)==0) return (hy<0)?  -pi_o_2-tiny: pi_o_2+tiny;
+
+    /* when x is INF */
+	if(ix==0x7ff00000) {
+	    if(iy==0x7ff00000) {
+		switch(m) {
+		    case 0: return  pi_o_4+tiny;/* atan(+INF,+INF) */
+		    case 1: return -pi_o_4-tiny;/* atan(-INF,+INF) */
+		    case 2: return  3.0*pi_o_4+tiny;/* atan(+INF,-INF) */
+		    case 3: return -3.0*pi_o_4-tiny;/* atan(-INF,-INF) */
+		}
+	    } else {
+		switch(m) {
+		    case 0: return  zero  ;	/* atan(+...,+INF) */
+		    case 1: return -zero  ;	/* atan(-...,+INF) */
+		    case 2: return  pi+tiny  ;	/* atan(+...,-INF) */
+		    case 3: return -pi-tiny  ;	/* atan(-...,-INF) */
+		}
+	    }
+	}
+    /* when y is INF */
+	if(iy==0x7ff00000) return (hy<0)? -pi_o_2-tiny: pi_o_2+tiny;
+
+    /* compute y/x */
+	k = (iy-ix)>>20;
+	if(k > 60) z=pi_o_2+0.5*pi_lo; 	/* |y/x| >  2**60 */
+	else if(hx<0&&k<-60) z=0.0; 	/* |y|/x < -2**60 */
+	else z=atan(fabs(y/x));		/* safe to do y/x */
+	switch (m) {
+	    case 0: return       z  ;	/* atan(+,+) */
+	    case 1: {
+	    	      u_int32_t zh;
+		      GET_HIGH_WORD(zh,z);
+		      SET_HIGH_WORD(z,zh ^ 0x80000000);
+		    }
+		    return       z  ;	/* atan(-,+) */
+	    case 2: return  pi-(z-pi_lo);/* atan(+,-) */
+	    default: /* case 3 */
+	    	    return  (z-pi_lo)-pi;/* atan(-,-) */
+	}
+}
diff --git a/Source/3rd Party/sdl/src/libm/e_log.c b/Source/3rd Party/sdl/src/libm/e_log.c
new file mode 100644
index 000000000..da64138cd
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/e_log.c	
@@ -0,0 +1,167 @@
+/* @(#)e_log.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: e_log.c,v 1.8 1995/05/10 20:45:49 jtc Exp $";
+#endif
+
+/* __ieee754_log(x)
+ * Return the logrithm of x
+ *
+ * Method :
+ *   1. Argument Reduction: find k and f such that
+ *			x = 2^k * (1+f),
+ *	   where  sqrt(2)/2 < 1+f < sqrt(2) .
+ *
+ *   2. Approximation of log(1+f).
+ *	Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s)
+ *		 = 2s + 2/3 s**3 + 2/5 s**5 + .....,
+ *	     	 = 2s + s*R
+ *      We use a special Reme algorithm on [0,0.1716] to generate
+ * 	a polynomial of degree 14 to approximate R The maximum error
+ *	of this polynomial approximation is bounded by 2**-58.45. In
+ *	other words,
+ *		        2      4      6      8      10      12      14
+ *	    R(z) ~ Lg1*s +Lg2*s +Lg3*s +Lg4*s +Lg5*s  +Lg6*s  +Lg7*s
+ *  	(the values of Lg1 to Lg7 are listed in the program)
+ *	and
+ *	    |      2          14          |     -58.45
+ *	    | Lg1*s +...+Lg7*s    -  R(z) | <= 2
+ *	    |                             |
+ *	Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2.
+ *	In order to guarantee error in log below 1ulp, we compute log
+ *	by
+ *		log(1+f) = f - s*(f - R)	(if f is not too large)
+ *		log(1+f) = f - (hfsq - s*(hfsq+R)).	(better accuracy)
+ *
+ *	3. Finally,  log(x) = k*ln2 + log(1+f).
+ *			    = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo)))
+ *	   Here ln2 is split into two floating point number:
+ *			ln2_hi + ln2_lo,
+ *	   where n*ln2_hi is always exact for |n| < 2000.
+ *
+ * Special cases:
+ *	log(x) is NaN with signal if x < 0 (including -INF) ;
+ *	log(+INF) is +INF; log(0) is -INF with signal;
+ *	log(NaN) is that NaN with no signal.
+ *
+ * Accuracy:
+ *	according to an error analysis, the error is always less than
+ *	1 ulp (unit in the last place).
+ *
+ * Constants:
+ * The hexadecimal values are the intended ones for the following
+ * constants. The decimal values may be used, provided that the
+ * compiler will convert from decimal to binary accurately enough
+ * to produce the hexadecimal values shown.
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+#ifdef __STDC__
+static const double
+#else
+static double
+#endif
+  ln2_hi = 6.93147180369123816490e-01,  /* 3fe62e42 fee00000 */
+    ln2_lo = 1.90821492927058770002e-10,        /* 3dea39ef 35793c76 */
+    two54 = 1.80143985094819840000e+16, /* 43500000 00000000 */
+    Lg1 = 6.666666666666735130e-01,     /* 3FE55555 55555593 */
+    Lg2 = 3.999999999940941908e-01,     /* 3FD99999 9997FA04 */
+    Lg3 = 2.857142874366239149e-01,     /* 3FD24924 94229359 */
+    Lg4 = 2.222219843214978396e-01,     /* 3FCC71C5 1D8E78AF */
+    Lg5 = 1.818357216161805012e-01,     /* 3FC74664 96CB03DE */
+    Lg6 = 1.531383769920937332e-01,     /* 3FC39A09 D078C69F */
+    Lg7 = 1.479819860511658591e-01;     /* 3FC2F112 DF3E5244 */
+
+#ifdef __STDC__
+static const double zero = 0.0;
+#else
+static double zero = 0.0;
+#endif
+
+#ifdef __STDC__
+double attribute_hidden
+__ieee754_log(double x)
+#else
+double attribute_hidden
+__ieee754_log(x)
+     double x;
+#endif
+{
+    double hfsq, f, s, z, R, w, t1, t2, dk;
+    int32_t k, hx, i, j;
+    u_int32_t lx;
+
+    EXTRACT_WORDS(hx, lx, x);
+
+    k = 0;
+    if (hx < 0x00100000) {      /* x < 2**-1022  */
+        if (((hx & 0x7fffffff) | lx) == 0)
+            return -two54 / zero;       /* log(+-0)=-inf */
+        if (hx < 0)
+            return (x - x) / zero;      /* log(-#) = NaN */
+        k -= 54;
+        x *= two54;             /* subnormal number, scale up x */
+        GET_HIGH_WORD(hx, x);
+    }
+    if (hx >= 0x7ff00000)
+        return x + x;
+    k += (hx >> 20) - 1023;
+    hx &= 0x000fffff;
+    i = (hx + 0x95f64) & 0x100000;
+    SET_HIGH_WORD(x, hx | (i ^ 0x3ff00000));    /* normalize x or x/2 */
+    k += (i >> 20);
+    f = x - 1.0;
+    if ((0x000fffff & (2 + hx)) < 3) {  /* |f| < 2**-20 */
+        if (f == zero) {
+            if (k == 0)
+                return zero;
+            else {
+                dk = (double) k;
+                return dk * ln2_hi + dk * ln2_lo;
+            }
+        }
+        R = f * f * (0.5 - 0.33333333333333333 * f);
+        if (k == 0)
+            return f - R;
+        else {
+            dk = (double) k;
+            return dk * ln2_hi - ((R - dk * ln2_lo) - f);
+        }
+    }
+    s = f / (2.0 + f);
+    dk = (double) k;
+    z = s * s;
+    i = hx - 0x6147a;
+    w = z * z;
+    j = 0x6b851 - hx;
+    t1 = w * (Lg2 + w * (Lg4 + w * Lg6));
+    t2 = z * (Lg1 + w * (Lg3 + w * (Lg5 + w * Lg7)));
+    i |= j;
+    R = t2 + t1;
+    if (i > 0) {
+        hfsq = 0.5 * f * f;
+        if (k == 0)
+            return f - (hfsq - s * (hfsq + R));
+        else
+            return dk * ln2_hi - ((hfsq - (s * (hfsq + R) + dk * ln2_lo)) -
+                                  f);
+    } else {
+        if (k == 0)
+            return f - s * (f - R);
+        else
+            return dk * ln2_hi - ((s * (f - R) - dk * ln2_lo) - f);
+    }
+}
diff --git a/Source/3rd Party/sdl/src/libm/e_pow.c b/Source/3rd Party/sdl/src/libm/e_pow.c
new file mode 100644
index 000000000..686da2e55
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/e_pow.c	
@@ -0,0 +1,342 @@
+/* @(#)e_pow.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static char rcsid[] = "$NetBSD: e_pow.c,v 1.9 1995/05/12 04:57:32 jtc Exp $";
+#endif
+
+/* __ieee754_pow(x,y) return x**y
+ *
+ *		      n
+ * Method:  Let x =  2   * (1+f)
+ *	1. Compute and return log2(x) in two pieces:
+ *		log2(x) = w1 + w2,
+ *	   where w1 has 53-24 = 29 bit trailing zeros.
+ *	2. Perform y*log2(x) = n+y' by simulating muti-precision
+ *	   arithmetic, where |y'|<=0.5.
+ *	3. Return x**y = 2**n*exp(y'*log2)
+ *
+ * Special cases:
+ *	1.  (anything) ** 0  is 1
+ *	2.  (anything) ** 1  is itself
+ *	3.  (anything) ** NAN is NAN
+ *	4.  NAN ** (anything except 0) is NAN
+ *	5.  +-(|x| > 1) **  +INF is +INF
+ *	6.  +-(|x| > 1) **  -INF is +0
+ *	7.  +-(|x| < 1) **  +INF is +0
+ *	8.  +-(|x| < 1) **  -INF is +INF
+ *	9.  +-1         ** +-INF is NAN
+ *	10. +0 ** (+anything except 0, NAN)               is +0
+ *	11. -0 ** (+anything except 0, NAN, odd integer)  is +0
+ *	12. +0 ** (-anything except 0, NAN)               is +INF
+ *	13. -0 ** (-anything except 0, NAN, odd integer)  is +INF
+ *	14. -0 ** (odd integer) = -( +0 ** (odd integer) )
+ *	15. +INF ** (+anything except 0,NAN) is +INF
+ *	16. +INF ** (-anything except 0,NAN) is +0
+ *	17. -INF ** (anything)  = -0 ** (-anything)
+ *	18. (-anything) ** (integer) is (-1)**(integer)*(+anything**integer)
+ *	19. (-anything except 0 and inf) ** (non-integer) is NAN
+ *
+ * Accuracy:
+ *	pow(x,y) returns x**y nearly rounded. In particular
+ *			pow(integer,integer)
+ *	always returns the correct integer provided it is
+ *	representable.
+ *
+ * Constants :
+ * The hexadecimal values are the intended ones for the following
+ * constants. The decimal values may be used, provided that the
+ * compiler will convert from decimal to binary accurately enough
+ * to produce the hexadecimal values shown.
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+libm_hidden_proto(scalbn)
+    libm_hidden_proto(fabs)
+#ifdef __STDC__
+     static const double
+#else
+     static double
+#endif
+       bp[] = { 1.0, 1.5, }, dp_h[] = {
+     0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */
+
+         dp_l[] = {
+     0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */
+
+         zero = 0.0, one = 1.0, two = 2.0, two53 = 9007199254740992.0,  /* 0x43400000, 0x00000000 */
+         huge_val = 1.0e300, tiny = 1.0e-300,
+         /* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */
+         L1 = 5.99999999999994648725e-01,       /* 0x3FE33333, 0x33333303 */
+         L2 = 4.28571428578550184252e-01,       /* 0x3FDB6DB6, 0xDB6FABFF */
+         L3 = 3.33333329818377432918e-01,       /* 0x3FD55555, 0x518F264D */
+         L4 = 2.72728123808534006489e-01,       /* 0x3FD17460, 0xA91D4101 */
+         L5 = 2.30660745775561754067e-01,       /* 0x3FCD864A, 0x93C9DB65 */
+         L6 = 2.06975017800338417784e-01,       /* 0x3FCA7E28, 0x4A454EEF */
+         P1 = 1.66666666666666019037e-01,       /* 0x3FC55555, 0x5555553E */
+         P2 = -2.77777777770155933842e-03,      /* 0xBF66C16C, 0x16BEBD93 */
+         P3 = 6.61375632143793436117e-05,       /* 0x3F11566A, 0xAF25DE2C */
+         P4 = -1.65339022054652515390e-06,      /* 0xBEBBBD41, 0xC5D26BF1 */
+         P5 = 4.13813679705723846039e-08,       /* 0x3E663769, 0x72BEA4D0 */
+         lg2 = 6.93147180559945286227e-01,      /* 0x3FE62E42, 0xFEFA39EF */
+         lg2_h = 6.93147182464599609375e-01,    /* 0x3FE62E43, 0x00000000 */
+         lg2_l = -1.90465429995776804525e-09,   /* 0xBE205C61, 0x0CA86C39 */
+         ovt = 8.0085662595372944372e-0017,     /* -(1024-log2(ovfl+.5ulp)) */
+         cp = 9.61796693925975554329e-01,       /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */
+         cp_h = 9.61796700954437255859e-01,     /* 0x3FEEC709, 0xE0000000 =(float)cp */
+         cp_l = -7.02846165095275826516e-09,    /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h */
+         ivln2 = 1.44269504088896338700e+00,    /* 0x3FF71547, 0x652B82FE =1/ln2 */
+         ivln2_h = 1.44269502162933349609e+00,  /* 0x3FF71547, 0x60000000 =24b 1/ln2 */
+         ivln2_l = 1.92596299112661746887e-08;  /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail */
+
+#ifdef __STDC__
+     double attribute_hidden __ieee754_pow(double x, double y)
+#else
+     double attribute_hidden __ieee754_pow(x, y)
+     double x, y;
+#endif
+     {
+         double z, ax, z_h, z_l, p_h, p_l;
+         double y1, t1, t2, r, s, t, u, v, w;
+         int32_t i, j, k, yisint, n;
+         int32_t hx, hy, ix, iy;
+         u_int32_t lx, ly;
+
+         EXTRACT_WORDS(hx, lx, x);
+         EXTRACT_WORDS(hy, ly, y);
+         ix = hx & 0x7fffffff;
+         iy = hy & 0x7fffffff;
+
+         /* y==zero: x**0 = 1 */
+         if ((iy | ly) == 0)
+             return one;
+
+         /* +-NaN return x+y */
+         if (ix > 0x7ff00000 || ((ix == 0x7ff00000) && (lx != 0)) ||
+             iy > 0x7ff00000 || ((iy == 0x7ff00000) && (ly != 0)))
+             return x + y;
+
+         /* determine if y is an odd int when x < 0
+          * yisint = 0       ... y is not an integer
+          * yisint = 1       ... y is an odd int
+          * yisint = 2       ... y is an even int
+          */
+         yisint = 0;
+         if (hx < 0) {
+             if (iy >= 0x43400000)
+                 yisint = 2;    /* even integer y */
+             else if (iy >= 0x3ff00000) {
+                 k = (iy >> 20) - 0x3ff;        /* exponent */
+                 if (k > 20) {
+                     j = ly >> (52 - k);
+                     if ((j << (52 - k)) == ly)
+                         yisint = 2 - (j & 1);
+                 } else if (ly == 0) {
+                     j = iy >> (20 - k);
+                     if ((j << (20 - k)) == iy)
+                         yisint = 2 - (j & 1);
+                 }
+             }
+         }
+
+         /* special value of y */
+         if (ly == 0) {
+             if (iy == 0x7ff00000) {    /* y is +-inf */
+                 if (((ix - 0x3ff00000) | lx) == 0)
+                     return y - y;      /* inf**+-1 is NaN */
+                 else if (ix >= 0x3ff00000)     /* (|x|>1)**+-inf = inf,0 */
+                     return (hy >= 0) ? y : zero;
+                 else           /* (|x|<1)**-,+inf = inf,0 */
+                     return (hy < 0) ? -y : zero;
+             }
+             if (iy == 0x3ff00000) {    /* y is  +-1 */
+                 if (hy < 0)
+                     return one / x;
+                 else
+                     return x;
+             }
+             if (hy == 0x40000000)
+                 return x * x;  /* y is  2 */
+             if (hy == 0x3fe00000) {    /* y is  0.5 */
+                 if (hx >= 0)   /* x >= +0 */
+                     return __ieee754_sqrt(x);
+             }
+         }
+
+         ax = fabs(x);
+         /* special value of x */
+         if (lx == 0) {
+             if (ix == 0x7ff00000 || ix == 0 || ix == 0x3ff00000) {
+                 z = ax;        /* x is +-0,+-inf,+-1 */
+                 if (hy < 0)
+                     z = one / z;       /* z = (1/|x|) */
+                 if (hx < 0) {
+                     if (((ix - 0x3ff00000) | yisint) == 0) {
+                         z = (z - z) / (z - z); /* (-1)**non-int is NaN */
+                     } else if (yisint == 1)
+                         z = -z;        /* (x<0)**odd = -(|x|**odd) */
+                 }
+                 return z;
+             }
+         }
+
+         /* (x<0)**(non-int) is NaN */
+         if (((((u_int32_t) hx >> 31) - 1) | yisint) == 0)
+             return (x - x) / (x - x);
+
+         /* |y| is huge */
+         if (iy > 0x41e00000) { /* if |y| > 2**31 */
+             if (iy > 0x43f00000) {     /* if |y| > 2**64, must o/uflow */
+                 if (ix <= 0x3fefffff)
+                     return (hy < 0) ? huge_val * huge_val : tiny * tiny;
+                 if (ix >= 0x3ff00000)
+                     return (hy > 0) ? huge_val * huge_val : tiny * tiny;
+             }
+             /* over/underflow if x is not close to one */
+             if (ix < 0x3fefffff)
+                 return (hy < 0) ? huge_val * huge_val : tiny * tiny;
+             if (ix > 0x3ff00000)
+                 return (hy > 0) ? huge_val * huge_val : tiny * tiny;
+             /* now |1-x| is tiny <= 2**-20, suffice to compute
+                log(x) by x-x^2/2+x^3/3-x^4/4 */
+             t = x - 1;         /* t has 20 trailing zeros */
+             w = (t * t) * (0.5 - t * (0.3333333333333333333333 - t * 0.25));
+             u = ivln2_h * t;   /* ivln2_h has 21 sig. bits */
+             v = t * ivln2_l - w * ivln2;
+             t1 = u + v;
+             SET_LOW_WORD(t1, 0);
+             t2 = v - (t1 - u);
+         } else {
+             double s2, s_h, s_l, t_h, t_l;
+             n = 0;
+             /* take care subnormal number */
+             if (ix < 0x00100000) {
+                 ax *= two53;
+                 n -= 53;
+                 GET_HIGH_WORD(ix, ax);
+             }
+             n += ((ix) >> 20) - 0x3ff;
+             j = ix & 0x000fffff;
+             /* determine interval */
+             ix = j | 0x3ff00000;       /* normalize ix */
+             if (j <= 0x3988E)
+                 k = 0;         /* |x|<sqrt(3/2) */
+             else if (j < 0xBB67A)
+                 k = 1;         /* |x|<sqrt(3)   */
+             else {
+                 k = 0;
+                 n += 1;
+                 ix -= 0x00100000;
+             }
+             SET_HIGH_WORD(ax, ix);
+
+             /* compute s = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */
+             u = ax - bp[k];    /* bp[0]=1.0, bp[1]=1.5 */
+             v = one / (ax + bp[k]);
+             s = u * v;
+             s_h = s;
+             SET_LOW_WORD(s_h, 0);
+             /* t_h=ax+bp[k] High */
+             t_h = zero;
+             SET_HIGH_WORD(t_h,
+                           ((ix >> 1) | 0x20000000) + 0x00080000 + (k << 18));
+             t_l = ax - (t_h - bp[k]);
+             s_l = v * ((u - s_h * t_h) - s_h * t_l);
+             /* compute log(ax) */
+             s2 = s * s;
+             r = s2 * s2 * (L1 +
+                            s2 * (L2 +
+                                  s2 * (L3 +
+                                        s2 * (L4 + s2 * (L5 + s2 * L6)))));
+             r += s_l * (s_h + s);
+             s2 = s_h * s_h;
+             t_h = 3.0 + s2 + r;
+             SET_LOW_WORD(t_h, 0);
+             t_l = r - ((t_h - 3.0) - s2);
+             /* u+v = s*(1+...) */
+             u = s_h * t_h;
+             v = s_l * t_h + t_l * s;
+             /* 2/(3log2)*(s+...) */
+             p_h = u + v;
+             SET_LOW_WORD(p_h, 0);
+             p_l = v - (p_h - u);
+             z_h = cp_h * p_h;  /* cp_h+cp_l = 2/(3*log2) */
+             z_l = cp_l * p_h + p_l * cp + dp_l[k];
+             /* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */
+             t = (double) n;
+             t1 = (((z_h + z_l) + dp_h[k]) + t);
+             SET_LOW_WORD(t1, 0);
+             t2 = z_l - (((t1 - t) - dp_h[k]) - z_h);
+         }
+
+         s = one;               /* s (sign of result -ve**odd) = -1 else = 1 */
+         if (((((u_int32_t) hx >> 31) - 1) | (yisint - 1)) == 0)
+             s = -one;          /* (-ve)**(odd int) */
+
+         /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */
+         y1 = y;
+         SET_LOW_WORD(y1, 0);
+         p_l = (y - y1) * t1 + y * t2;
+         p_h = y1 * t1;
+         z = p_l + p_h;
+         EXTRACT_WORDS(j, i, z);
+         if (j >= 0x40900000) { /* z >= 1024 */
+             if (((j - 0x40900000) | i) != 0)   /* if z > 1024 */
+                 return s * huge_val * huge_val;        /* overflow */
+             else {
+                 if (p_l + ovt > z - p_h)
+                     return s * huge_val * huge_val;    /* overflow */
+             }
+         } else if ((j & 0x7fffffff) >= 0x4090cc00) {   /* z <= -1075 */
+             if (((j - 0xc090cc00) | i) != 0)   /* z < -1075 */
+                 return s * tiny * tiny;        /* underflow */
+             else {
+                 if (p_l <= z - p_h)
+                     return s * tiny * tiny;    /* underflow */
+             }
+         }
+         /*
+          * compute 2**(p_h+p_l)
+          */
+         i = j & 0x7fffffff;
+         k = (i >> 20) - 0x3ff;
+         n = 0;
+         if (i > 0x3fe00000) {  /* if |z| > 0.5, set n = [z+0.5] */
+             n = j + (0x00100000 >> (k + 1));
+             k = ((n & 0x7fffffff) >> 20) - 0x3ff;      /* new k for n */
+             t = zero;
+             SET_HIGH_WORD(t, n & ~(0x000fffff >> k));
+             n = ((n & 0x000fffff) | 0x00100000) >> (20 - k);
+             if (j < 0)
+                 n = -n;
+             p_h -= t;
+         }
+         t = p_l + p_h;
+         SET_LOW_WORD(t, 0);
+         u = t * lg2_h;
+         v = (p_l - (t - p_h)) * lg2 + t * lg2_l;
+         z = u + v;
+         w = v - (z - u);
+         t = z * z;
+         t1 = z - t * (P1 + t * (P2 + t * (P3 + t * (P4 + t * P5))));
+         r = (z * t1) / (t1 - two) - (w + z * w);
+         z = one - (r - z);
+         GET_HIGH_WORD(j, z);
+         j += (n << 20);
+         if ((j >> 20) <= 0)
+             z = scalbn(z, n);  /* subnormal output */
+         else
+             SET_HIGH_WORD(z, j);
+         return s * z;
+     }
diff --git a/Source/3rd Party/sdl/src/libm/e_rem_pio2.c b/Source/3rd Party/sdl/src/libm/e_rem_pio2.c
new file mode 100644
index 000000000..a8ffe3142
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/e_rem_pio2.c	
@@ -0,0 +1,201 @@
+/* @(#)e_rem_pio2.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: e_rem_pio2.c,v 1.8 1995/05/10 20:46:02 jtc Exp $";
+#endif
+
+/* __ieee754_rem_pio2(x,y)
+ *
+ * return the remainder of x rem pi/2 in y[0]+y[1]
+ * use __kernel_rem_pio2()
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+libm_hidden_proto(fabs)
+
+/*
+ * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi
+ */
+#ifdef __STDC__
+     static const int32_t two_over_pi[] = {
+#else
+     static int32_t two_over_pi[] = {
+#endif
+         0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62,
+         0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, 0x246E3A,
+         0x424DD2, 0xE00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129,
+         0xA73EE8, 0x8235F5, 0x2EBB44, 0x84E99C, 0x7026B4, 0x5F7E41,
+         0x3991D6, 0x398353, 0x39F49C, 0x845F8B, 0xBDF928, 0x3B1FF8,
+         0x97FFDE, 0x05980F, 0xEF2F11, 0x8B5A0A, 0x6D1F6D, 0x367ECF,
+         0x27CB09, 0xB74F46, 0x3F669E, 0x5FEA2D, 0x7527BA, 0xC7EBE5,
+         0xF17B3D, 0x0739F7, 0x8A5292, 0xEA6BFB, 0x5FB11F, 0x8D5D08,
+         0x560330, 0x46FC7B, 0x6BABF0, 0xCFBC20, 0x9AF436, 0x1DA9E3,
+         0x91615E, 0xE61B08, 0x659985, 0x5F14A0, 0x68408D, 0xFFD880,
+         0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B,
+     };
+
+#ifdef __STDC__
+static const int32_t npio2_hw[] = {
+#else
+static int32_t npio2_hw[] = {
+#endif
+    0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C,
+    0x4025FDBB, 0x402921FB, 0x402C463A, 0x402F6A7A, 0x4031475C, 0x4032D97C,
+    0x40346B9C, 0x4035FDBB, 0x40378FDB, 0x403921FB, 0x403AB41B, 0x403C463A,
+    0x403DD85A, 0x403F6A7A, 0x40407E4C, 0x4041475C, 0x4042106C, 0x4042D97C,
+    0x4043A28C, 0x40446B9C, 0x404534AC, 0x4045FDBB, 0x4046C6CB, 0x40478FDB,
+    0x404858EB, 0x404921FB,
+};
+
+/*
+ * invpio2:  53 bits of 2/pi
+ * pio2_1:   first  33 bit of pi/2
+ * pio2_1t:  pi/2 - pio2_1
+ * pio2_2:   second 33 bit of pi/2
+ * pio2_2t:  pi/2 - (pio2_1+pio2_2)
+ * pio2_3:   third  33 bit of pi/2
+ * pio2_3t:  pi/2 - (pio2_1+pio2_2+pio2_3)
+ */
+
+#ifdef __STDC__
+static const double
+#else
+static double
+#endif
+  zero = 0.00000000000000000000e+00,    /* 0x00000000, 0x00000000 */
+    half = 5.00000000000000000000e-01,  /* 0x3FE00000, 0x00000000 */
+    two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */
+    invpio2 = 6.36619772367581382433e-01,       /* 0x3FE45F30, 0x6DC9C883 */
+    pio2_1 = 1.57079632673412561417e+00,        /* 0x3FF921FB, 0x54400000 */
+    pio2_1t = 6.07710050650619224932e-11,       /* 0x3DD0B461, 0x1A626331 */
+    pio2_2 = 6.07710050630396597660e-11,        /* 0x3DD0B461, 0x1A600000 */
+    pio2_2t = 2.02226624879595063154e-21,       /* 0x3BA3198A, 0x2E037073 */
+    pio2_3 = 2.02226624871116645580e-21,        /* 0x3BA3198A, 0x2E000000 */
+    pio2_3t = 8.47842766036889956997e-32;       /* 0x397B839A, 0x252049C1 */
+
+#ifdef __STDC__
+int32_t attribute_hidden
+__ieee754_rem_pio2(double x, double *y)
+#else
+int32_t attribute_hidden
+__ieee754_rem_pio2(x, y)
+     double x, y[];
+#endif
+{
+    double z = 0.0, w, t, r, fn;
+    double tx[3];
+    int32_t e0, i, j, nx, n, ix, hx;
+    u_int32_t low;
+
+    GET_HIGH_WORD(hx, x);       /* high word of x */
+    ix = hx & 0x7fffffff;
+    if (ix <= 0x3fe921fb) {     /* |x| ~<= pi/4 , no need for reduction */
+        y[0] = x;
+        y[1] = 0;
+        return 0;
+    }
+    if (ix < 0x4002d97c) {      /* |x| < 3pi/4, special case with n=+-1 */
+        if (hx > 0) {
+            z = x - pio2_1;
+            if (ix != 0x3ff921fb) {     /* 33+53 bit pi is good enough */
+                y[0] = z - pio2_1t;
+                y[1] = (z - y[0]) - pio2_1t;
+            } else {            /* near pi/2, use 33+33+53 bit pi */
+                z -= pio2_2;
+                y[0] = z - pio2_2t;
+                y[1] = (z - y[0]) - pio2_2t;
+            }
+            return 1;
+        } else {                /* negative x */
+            z = x + pio2_1;
+            if (ix != 0x3ff921fb) {     /* 33+53 bit pi is good enough */
+                y[0] = z + pio2_1t;
+                y[1] = (z - y[0]) + pio2_1t;
+            } else {            /* near pi/2, use 33+33+53 bit pi */
+                z += pio2_2;
+                y[0] = z + pio2_2t;
+                y[1] = (z - y[0]) + pio2_2t;
+            }
+            return -1;
+        }
+    }
+    if (ix <= 0x413921fb) {     /* |x| ~<= 2^19*(pi/2), medium size */
+        t = fabs(x);
+        n = (int32_t) (t * invpio2 + half);
+        fn = (double) n;
+        r = t - fn * pio2_1;
+        w = fn * pio2_1t;       /* 1st round good to 85 bit */
+        if (n < 32 && ix != npio2_hw[n - 1]) {
+            y[0] = r - w;       /* quick check no cancellation */
+        } else {
+            u_int32_t high;
+            j = ix >> 20;
+            y[0] = r - w;
+            GET_HIGH_WORD(high, y[0]);
+            i = j - ((high >> 20) & 0x7ff);
+            if (i > 16) {       /* 2nd iteration needed, good to 118 */
+                t = r;
+                w = fn * pio2_2;
+                r = t - w;
+                w = fn * pio2_2t - ((t - r) - w);
+                y[0] = r - w;
+                GET_HIGH_WORD(high, y[0]);
+                i = j - ((high >> 20) & 0x7ff);
+                if (i > 49) {   /* 3rd iteration need, 151 bits acc */
+                    t = r;      /* will cover all possible cases */
+                    w = fn * pio2_3;
+                    r = t - w;
+                    w = fn * pio2_3t - ((t - r) - w);
+                    y[0] = r - w;
+                }
+            }
+        }
+        y[1] = (r - y[0]) - w;
+        if (hx < 0) {
+            y[0] = -y[0];
+            y[1] = -y[1];
+            return -n;
+        } else
+            return n;
+    }
+    /*
+     * all other (large) arguments
+     */
+    if (ix >= 0x7ff00000) {     /* x is inf or NaN */
+        y[0] = y[1] = x - x;
+        return 0;
+    }
+    /* set z = scalbn(|x|,ilogb(x)-23) */
+    GET_LOW_WORD(low, x);
+    SET_LOW_WORD(z, low);
+    e0 = (ix >> 20) - 1046;     /* e0 = ilogb(z)-23; */
+    SET_HIGH_WORD(z, ix - ((int32_t) (e0 << 20)));
+    for (i = 0; i < 2; i++) {
+        tx[i] = (double) ((int32_t) (z));
+        z = (z - tx[i]) * two24;
+    }
+    tx[2] = z;
+    nx = 3;
+    while (tx[nx - 1] == zero)
+        nx--;                   /* skip zero term */
+    n = __kernel_rem_pio2(tx, y, e0, nx, 2, two_over_pi);
+    if (hx < 0) {
+        y[0] = -y[0];
+        y[1] = -y[1];
+        return -n;
+    }
+    return n;
+}
diff --git a/Source/3rd Party/sdl/src/libm/e_sqrt.c b/Source/3rd Party/sdl/src/libm/e_sqrt.c
new file mode 100644
index 000000000..b8b8bec6f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/e_sqrt.c	
@@ -0,0 +1,464 @@
+/* @(#)e_sqrt.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: e_sqrt.c,v 1.8 1995/05/10 20:46:17 jtc Exp $";
+#endif
+
+/* __ieee754_sqrt(x)
+ * Return correctly rounded sqrt.
+ *           ------------------------------------------
+ *	     |  Use the hardware sqrt if you have one |
+ *           ------------------------------------------
+ * Method:
+ *   Bit by bit method using integer arithmetic. (Slow, but portable)
+ *   1. Normalization
+ *	Scale x to y in [1,4) with even powers of 2:
+ *	find an integer k such that  1 <= (y=x*2^(2k)) < 4, then
+ *		sqrt(x) = 2^k * sqrt(y)
+ *   2. Bit by bit computation
+ *	Let q  = sqrt(y) truncated to i bit after binary point (q = 1),
+ *	     i							 0
+ *                                     i+1         2
+ *	    s  = 2*q , and	y  =  2   * ( y - q  ).		(1)
+ *	     i      i            i                 i
+ *
+ *	To compute q    from q , one checks whether
+ *		    i+1       i
+ *
+ *			      -(i+1) 2
+ *			(q + 2      ) <= y.			(2)
+ *     			  i
+ *							      -(i+1)
+ *	If (2) is false, then q   = q ; otherwise q   = q  + 2      .
+ *		 	       i+1   i             i+1   i
+ *
+ *	With some algebric manipulation, it is not difficult to see
+ *	that (2) is equivalent to
+ *                             -(i+1)
+ *			s  +  2       <= y			(3)
+ *			 i                i
+ *
+ *	The advantage of (3) is that s  and y  can be computed by
+ *				      i      i
+ *	the following recurrence formula:
+ *	    if (3) is false
+ *
+ *	    s     =  s  ,	y    = y   ;			(4)
+ *	     i+1      i		 i+1    i
+ *
+ *	    otherwise,
+ *                         -i                     -(i+1)
+ *	    s	  =  s  + 2  ,  y    = y  -  s  - 2  		(5)
+ *           i+1      i          i+1    i     i
+ *
+ *	One may easily use induction to prove (4) and (5).
+ *	Note. Since the left hand side of (3) contain only i+2 bits,
+ *	      it does not necessary to do a full (53-bit) comparison
+ *	      in (3).
+ *   3. Final rounding
+ *	After generating the 53 bits result, we compute one more bit.
+ *	Together with the remainder, we can decide whether the
+ *	result is exact, bigger than 1/2ulp, or less than 1/2ulp
+ *	(it will never equal to 1/2ulp).
+ *	The rounding mode can be detected by checking whether
+ *	huge + tiny is equal to huge, and whether huge - tiny is
+ *	equal to huge for some floating point number "huge" and "tiny".
+ *
+ * Special cases:
+ *	sqrt(+-0) = +-0 	... exact
+ *	sqrt(inf) = inf
+ *	sqrt(-ve) = NaN		... with invalid signal
+ *	sqrt(NaN) = NaN		... with invalid signal for signaling NaN
+ *
+ * Other methods : see the appended file at the end of the program below.
+ *---------------
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+#ifdef __STDC__
+static const double one = 1.0, tiny = 1.0e-300;
+#else
+static double one = 1.0, tiny = 1.0e-300;
+#endif
+
+#ifdef __STDC__
+double attribute_hidden
+__ieee754_sqrt(double x)
+#else
+double attribute_hidden
+__ieee754_sqrt(x)
+     double x;
+#endif
+{
+    double z;
+    int32_t sign = (int) 0x80000000;
+    int32_t ix0, s0, q, m, t, i;
+    u_int32_t r, t1, s1, ix1, q1;
+
+    EXTRACT_WORDS(ix0, ix1, x);
+
+    /* take care of Inf and NaN */
+    if ((ix0 & 0x7ff00000) == 0x7ff00000) {
+        return x * x + x;       /* sqrt(NaN)=NaN, sqrt(+inf)=+inf
+                                   sqrt(-inf)=sNaN */
+    }
+    /* take care of zero */
+    if (ix0 <= 0) {
+        if (((ix0 & (~sign)) | ix1) == 0)
+            return x;           /* sqrt(+-0) = +-0 */
+        else if (ix0 < 0)
+            return (x - x) / (x - x);   /* sqrt(-ve) = sNaN */
+    }
+    /* normalize x */
+    m = (ix0 >> 20);
+    if (m == 0) {               /* subnormal x */
+        while (ix0 == 0) {
+            m -= 21;
+            ix0 |= (ix1 >> 11);
+            ix1 <<= 21;
+        }
+        for (i = 0; (ix0 & 0x00100000) == 0; i++)
+            ix0 <<= 1;
+        m -= i - 1;
+        ix0 |= (ix1 >> (32 - i));
+        ix1 <<= i;
+    }
+    m -= 1023;                  /* unbias exponent */
+    ix0 = (ix0 & 0x000fffff) | 0x00100000;
+    if (m & 1) {                /* odd m, double x to make it even */
+        ix0 += ix0 + ((ix1 & sign) >> 31);
+        ix1 += ix1;
+    }
+    m >>= 1;                    /* m = [m/2] */
+
+    /* generate sqrt(x) bit by bit */
+    ix0 += ix0 + ((ix1 & sign) >> 31);
+    ix1 += ix1;
+    q = q1 = s0 = s1 = 0;       /* [q,q1] = sqrt(x) */
+    r = 0x00200000;             /* r = moving bit from right to left */
+
+    while (r != 0) {
+        t = s0 + r;
+        if (t <= ix0) {
+            s0 = t + r;
+            ix0 -= t;
+            q += r;
+        }
+        ix0 += ix0 + ((ix1 & sign) >> 31);
+        ix1 += ix1;
+        r >>= 1;
+    }
+
+    r = sign;
+    while (r != 0) {
+        t1 = s1 + r;
+        t = s0;
+        if ((t < ix0) || ((t == ix0) && (t1 <= ix1))) {
+            s1 = t1 + r;
+            if (((t1 & sign) == sign) && (s1 & sign) == 0)
+                s0 += 1;
+            ix0 -= t;
+            if (ix1 < t1)
+                ix0 -= 1;
+            ix1 -= t1;
+            q1 += r;
+        }
+        ix0 += ix0 + ((ix1 & sign) >> 31);
+        ix1 += ix1;
+        r >>= 1;
+    }
+
+    /* use floating add to find out rounding direction */
+    if ((ix0 | ix1) != 0) {
+        z = one - tiny;         /* trigger inexact flag */
+        if (z >= one) {
+            z = one + tiny;
+            if (q1 == (u_int32_t) 0xffffffff) {
+                q1 = 0;
+                q += 1;
+            } else if (z > one) {
+                if (q1 == (u_int32_t) 0xfffffffe)
+                    q += 1;
+                q1 += 2;
+            } else
+                q1 += (q1 & 1);
+        }
+    }
+    ix0 = (q >> 1) + 0x3fe00000;
+    ix1 = q1 >> 1;
+    if ((q & 1) == 1)
+        ix1 |= sign;
+    ix0 += (m << 20);
+    INSERT_WORDS(z, ix0, ix1);
+    return z;
+}
+
+/*
+Other methods  (use floating-point arithmetic)
+-------------
+(This is a copy of a drafted paper by Prof W. Kahan
+and K.C. Ng, written in May, 1986)
+
+	Two algorithms are given here to implement sqrt(x)
+	(IEEE double precision arithmetic) in software.
+	Both supply sqrt(x) correctly rounded. The first algorithm (in
+	Section A) uses newton iterations and involves four divisions.
+	The second one uses reciproot iterations to avoid division, but
+	requires more multiplications. Both algorithms need the ability
+	to chop results of arithmetic operations instead of round them,
+	and the INEXACT flag to indicate when an arithmetic operation
+	is executed exactly with no roundoff error, all part of the
+	standard (IEEE 754-1985). The ability to perform shift, add,
+	subtract and logical AND operations upon 32-bit words is needed
+	too, though not part of the standard.
+
+A.  sqrt(x) by Newton Iteration
+
+   (1)	Initial approximation
+
+	Let x0 and x1 be the leading and the trailing 32-bit words of
+	a floating point number x (in IEEE double format) respectively
+
+	    1    11		     52				  ...widths
+	   ------------------------------------------------------
+	x: |s|	  e     |	      f				|
+	   ------------------------------------------------------
+	      msb    lsb  msb				      lsb ...order
+
+
+	     ------------------------  	     ------------------------
+	x0:  |s|   e    |    f1     |	 x1: |          f2           |
+	     ------------------------  	     ------------------------
+
+	By performing shifts and subtracts on x0 and x1 (both regarded
+	as integers), we obtain an 8-bit approximation of sqrt(x) as
+	follows.
+
+		k  := (x0>>1) + 0x1ff80000;
+		y0 := k - T1[31&(k>>15)].	... y ~ sqrt(x) to 8 bits
+	Here k is a 32-bit integer and T1[] is an integer array containing
+	correction terms. Now magically the floating value of y (y's
+	leading 32-bit word is y0, the value of its trailing word is 0)
+	approximates sqrt(x) to almost 8-bit.
+
+	Value of T1:
+	static int T1[32]= {
+	0,	1024,	3062,	5746,	9193,	13348,	18162,	23592,
+	29598,	36145,	43202,	50740,	58733,	67158,	75992,	85215,
+	83599,	71378,	60428,	50647,	41945,	34246,	27478,	21581,
+	16499,	12183,	8588,	5674,	3403,	1742,	661,	130,};
+
+    (2)	Iterative refinement
+
+	Apply Heron's rule three times to y, we have y approximates
+	sqrt(x) to within 1 ulp (Unit in the Last Place):
+
+		y := (y+x/y)/2		... almost 17 sig. bits
+		y := (y+x/y)/2		... almost 35 sig. bits
+		y := y-(y-x/y)/2	... within 1 ulp
+
+
+	Remark 1.
+	    Another way to improve y to within 1 ulp is:
+
+		y := (y+x/y)		... almost 17 sig. bits to 2*sqrt(x)
+		y := y - 0x00100006	... almost 18 sig. bits to sqrt(x)
+
+				2
+			    (x-y )*y
+		y := y + 2* ----------	...within 1 ulp
+			       2
+			     3y  + x
+
+
+	This formula has one division fewer than the one above; however,
+	it requires more multiplications and additions. Also x must be
+	scaled in advance to avoid spurious overflow in evaluating the
+	expression 3y*y+x. Hence it is not recommended uless division
+	is slow. If division is very slow, then one should use the
+	reciproot algorithm given in section B.
+
+    (3) Final adjustment
+
+	By twiddling y's last bit it is possible to force y to be
+	correctly rounded according to the prevailing rounding mode
+	as follows. Let r and i be copies of the rounding mode and
+	inexact flag before entering the square root program. Also we
+	use the expression y+-ulp for the next representable floating
+	numbers (up and down) of y. Note that y+-ulp = either fixed
+	point y+-1, or multiply y by nextafter(1,+-inf) in chopped
+	mode.
+
+		I := FALSE;	... reset INEXACT flag I
+		R := RZ;	... set rounding mode to round-toward-zero
+		z := x/y;	... chopped quotient, possibly inexact
+		If(not I) then {	... if the quotient is exact
+		    if(z=y) {
+		        I := i;	 ... restore inexact flag
+		        R := r;  ... restore rounded mode
+		        return sqrt(x):=y.
+		    } else {
+			z := z - ulp;	... special rounding
+		    }
+		}
+		i := TRUE;		... sqrt(x) is inexact
+		If (r=RN) then z=z+ulp	... rounded-to-nearest
+		If (r=RP) then {	... round-toward-+inf
+		    y = y+ulp; z=z+ulp;
+		}
+		y := y+z;		... chopped sum
+		y0:=y0-0x00100000;	... y := y/2 is correctly rounded.
+	        I := i;	 		... restore inexact flag
+	        R := r;  		... restore rounded mode
+	        return sqrt(x):=y.
+
+    (4)	Special cases
+
+	Square root of +inf, +-0, or NaN is itself;
+	Square root of a negative number is NaN with invalid signal.
+
+
+B.  sqrt(x) by Reciproot Iteration
+
+   (1)	Initial approximation
+
+	Let x0 and x1 be the leading and the trailing 32-bit words of
+	a floating point number x (in IEEE double format) respectively
+	(see section A). By performing shifs and subtracts on x0 and y0,
+	we obtain a 7.8-bit approximation of 1/sqrt(x) as follows.
+
+	    k := 0x5fe80000 - (x0>>1);
+	    y0:= k - T2[63&(k>>14)].	... y ~ 1/sqrt(x) to 7.8 bits
+
+	Here k is a 32-bit integer and T2[] is an integer array
+	containing correction terms. Now magically the floating
+	value of y (y's leading 32-bit word is y0, the value of
+	its trailing word y1 is set to zero) approximates 1/sqrt(x)
+	to almost 7.8-bit.
+
+	Value of T2:
+	static int T2[64]= {
+	0x1500,	0x2ef8,	0x4d67,	0x6b02,	0x87be,	0xa395,	0xbe7a,	0xd866,
+	0xf14a,	0x1091b,0x11fcd,0x13552,0x14999,0x15c98,0x16e34,0x17e5f,
+	0x18d03,0x19a01,0x1a545,0x1ae8a,0x1b5c4,0x1bb01,0x1bfde,0x1c28d,
+	0x1c2de,0x1c0db,0x1ba73,0x1b11c,0x1a4b5,0x1953d,0x18266,0x16be0,
+	0x1683e,0x179d8,0x18a4d,0x19992,0x1a789,0x1b445,0x1bf61,0x1c989,
+	0x1d16d,0x1d77b,0x1dddf,0x1e2ad,0x1e5bf,0x1e6e8,0x1e654,0x1e3cd,
+	0x1df2a,0x1d635,0x1cb16,0x1be2c,0x1ae4e,0x19bde,0x1868e,0x16e2e,
+	0x1527f,0x1334a,0x11051,0xe951,	0xbe01,	0x8e0d,	0x5924,	0x1edd,};
+
+    (2)	Iterative refinement
+
+	Apply Reciproot iteration three times to y and multiply the
+	result by x to get an approximation z that matches sqrt(x)
+	to about 1 ulp. To be exact, we will have
+		-1ulp < sqrt(x)-z<1.0625ulp.
+
+	... set rounding mode to Round-to-nearest
+	   y := y*(1.5-0.5*x*y*y)	... almost 15 sig. bits to 1/sqrt(x)
+	   y := y*((1.5-2^-30)+0.5*x*y*y)... about 29 sig. bits to 1/sqrt(x)
+	... special arrangement for better accuracy
+	   z := x*y			... 29 bits to sqrt(x), with z*y<1
+	   z := z + 0.5*z*(1-z*y)	... about 1 ulp to sqrt(x)
+
+	Remark 2. The constant 1.5-2^-30 is chosen to bias the error so that
+	(a) the term z*y in the final iteration is always less than 1;
+	(b) the error in the final result is biased upward so that
+		-1 ulp < sqrt(x) - z < 1.0625 ulp
+	    instead of |sqrt(x)-z|<1.03125ulp.
+
+    (3)	Final adjustment
+
+	By twiddling y's last bit it is possible to force y to be
+	correctly rounded according to the prevailing rounding mode
+	as follows. Let r and i be copies of the rounding mode and
+	inexact flag before entering the square root program. Also we
+	use the expression y+-ulp for the next representable floating
+	numbers (up and down) of y. Note that y+-ulp = either fixed
+	point y+-1, or multiply y by nextafter(1,+-inf) in chopped
+	mode.
+
+	R := RZ;		... set rounding mode to round-toward-zero
+	switch(r) {
+	    case RN:		... round-to-nearest
+	       if(x<= z*(z-ulp)...chopped) z = z - ulp; else
+	       if(x<= z*(z+ulp)...chopped) z = z; else z = z+ulp;
+	       break;
+	    case RZ:case RM:	... round-to-zero or round-to--inf
+	       R:=RP;		... reset rounding mod to round-to-+inf
+	       if(x<z*z ... rounded up) z = z - ulp; else
+	       if(x>=(z+ulp)*(z+ulp) ...rounded up) z = z+ulp;
+	       break;
+	    case RP:		... round-to-+inf
+	       if(x>(z+ulp)*(z+ulp)...chopped) z = z+2*ulp; else
+	       if(x>z*z ...chopped) z = z+ulp;
+	       break;
+	}
+
+	Remark 3. The above comparisons can be done in fixed point. For
+	example, to compare x and w=z*z chopped, it suffices to compare
+	x1 and w1 (the trailing parts of x and w), regarding them as
+	two's complement integers.
+
+	...Is z an exact square root?
+	To determine whether z is an exact square root of x, let z1 be the
+	trailing part of z, and also let x0 and x1 be the leading and
+	trailing parts of x.
+
+	If ((z1&0x03ffffff)!=0)	... not exact if trailing 26 bits of z!=0
+	    I := 1;		... Raise Inexact flag: z is not exact
+	else {
+	    j := 1 - [(x0>>20)&1]	... j = logb(x) mod 2
+	    k := z1 >> 26;		... get z's 25-th and 26-th
+					    fraction bits
+	    I := i or (k&j) or ((k&(j+j+1))!=(x1&3));
+	}
+	R:= r		... restore rounded mode
+	return sqrt(x):=z.
+
+	If multiplication is cheaper then the foregoing red tape, the
+	Inexact flag can be evaluated by
+
+	    I := i;
+	    I := (z*z!=x) or I.
+
+	Note that z*z can overwrite I; this value must be sensed if it is
+	True.
+
+	Remark 4. If z*z = x exactly, then bit 25 to bit 0 of z1 must be
+	zero.
+
+		    --------------------
+		z1: |        f2        |
+		    --------------------
+		bit 31		   bit 0
+
+	Further more, bit 27 and 26 of z1, bit 0 and 1 of x1, and the odd
+	or even of logb(x) have the following relations:
+
+	-------------------------------------------------
+	bit 27,26 of z1		bit 1,0 of x1	logb(x)
+	-------------------------------------------------
+	00			00		odd and even
+	01			01		even
+	10			10		odd
+	10			00		even
+	11			01		even
+	-------------------------------------------------
+
+    (4)	Special cases (see (4) of Section A).
+
+ */
diff --git a/Source/3rd Party/sdl/src/libm/k_cos.c b/Source/3rd Party/sdl/src/libm/k_cos.c
new file mode 100644
index 000000000..64c50e3fb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/k_cos.c	
@@ -0,0 +1,100 @@
+/* @(#)k_cos.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: k_cos.c,v 1.8 1995/05/10 20:46:22 jtc Exp $";
+#endif
+
+/*
+ * __kernel_cos( x,  y )
+ * kernel cos function on [-pi/4, pi/4], pi/4 ~ 0.785398164
+ * Input x is assumed to be bounded by ~pi/4 in magnitude.
+ * Input y is the tail of x.
+ *
+ * Algorithm
+ *	1. Since cos(-x) = cos(x), we need only to consider positive x.
+ *	2. if x < 2^-27 (hx<0x3e400000 0), return 1 with inexact if x!=0.
+ *	3. cos(x) is approximated by a polynomial of degree 14 on
+ *	   [0,pi/4]
+ *		  	                 4            14
+ *	   	cos(x) ~ 1 - x*x/2 + C1*x + ... + C6*x
+ *	   where the remez error is
+ *
+ * 	|              2     4     6     8     10    12     14 |     -58
+ * 	|cos(x)-(1-.5*x +C1*x +C2*x +C3*x +C4*x +C5*x  +C6*x  )| <= 2
+ * 	|    					               |
+ *
+ * 	               4     6     8     10    12     14
+ *	4. let r = C1*x +C2*x +C3*x +C4*x +C5*x  +C6*x  , then
+ *	       cos(x) = 1 - x*x/2 + r
+ *	   since cos(x+y) ~ cos(x) - sin(x)*y
+ *			  ~ cos(x) - x*y,
+ *	   a correction term is necessary in cos(x) and hence
+ *		cos(x+y) = 1 - (x*x/2 - (r - x*y))
+ *	   For better accuracy when x > 0.3, let qx = |x|/4 with
+ *	   the last 32 bits mask off, and if x > 0.78125, let qx = 0.28125.
+ *	   Then
+ *		cos(x+y) = (1-qx) - ((x*x/2-qx) - (r-x*y)).
+ *	   Note that 1-qx and (x*x/2-qx) is EXACT here, and the
+ *	   magnitude of the latter is at least a quarter of x*x/2,
+ *	   thus, reducing the rounding error in the subtraction.
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+#ifdef __STDC__
+static const double
+#else
+static double
+#endif
+  one = 1.00000000000000000000e+00,     /* 0x3FF00000, 0x00000000 */
+    C1 = 4.16666666666666019037e-02,    /* 0x3FA55555, 0x5555554C */
+    C2 = -1.38888888888741095749e-03,   /* 0xBF56C16C, 0x16C15177 */
+    C3 = 2.48015872894767294178e-05,    /* 0x3EFA01A0, 0x19CB1590 */
+    C4 = -2.75573143513906633035e-07,   /* 0xBE927E4F, 0x809C52AD */
+    C5 = 2.08757232129817482790e-09,    /* 0x3E21EE9E, 0xBDB4B1C4 */
+    C6 = -1.13596475577881948265e-11;   /* 0xBDA8FAE9, 0xBE8838D4 */
+
+#ifdef __STDC__
+double attribute_hidden
+__kernel_cos(double x, double y)
+#else
+double attribute_hidden
+__kernel_cos(x, y)
+     double x, y;
+#endif
+{
+    double a, hz, z, r, qx;
+    int32_t ix;
+    GET_HIGH_WORD(ix, x);
+    ix &= 0x7fffffff;           /* ix = |x|'s high word */
+    if (ix < 0x3e400000) {      /* if x < 2**27 */
+        if (((int) x) == 0)
+            return one;         /* generate inexact */
+    }
+    z = x * x;
+    r = z * (C1 + z * (C2 + z * (C3 + z * (C4 + z * (C5 + z * C6)))));
+    if (ix < 0x3FD33333)        /* if |x| < 0.3 */
+        return one - (0.5 * z - (z * r - x * y));
+    else {
+        if (ix > 0x3fe90000) {  /* x > 0.78125 */
+            qx = 0.28125;
+        } else {
+            INSERT_WORDS(qx, ix - 0x00200000, 0);       /* x/4 */
+        }
+        hz = 0.5 * z - qx;
+        a = one - qx;
+        return a - (hz - (z * r - x * y));
+    }
+}
diff --git a/Source/3rd Party/sdl/src/libm/k_rem_pio2.c b/Source/3rd Party/sdl/src/libm/k_rem_pio2.c
new file mode 100644
index 000000000..f881d35d6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/k_rem_pio2.c	
@@ -0,0 +1,358 @@
+/* @(#)k_rem_pio2.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: k_rem_pio2.c,v 1.7 1995/05/10 20:46:25 jtc Exp $";
+#endif
+
+/*
+ * __kernel_rem_pio2(x,y,e0,nx,prec,ipio2)
+ * double x[],y[]; int e0,nx,prec; int ipio2[];
+ *
+ * __kernel_rem_pio2 return the last three digits of N with
+ *		y = x - N*pi/2
+ * so that |y| < pi/2.
+ *
+ * The method is to compute the integer (mod 8) and fraction parts of
+ * (2/pi)*x without doing the full multiplication. In general we
+ * skip the part of the product that are known to be a huge integer (
+ * more accurately, = 0 mod 8 ). Thus the number of operations are
+ * independent of the exponent of the input.
+ *
+ * (2/pi) is represented by an array of 24-bit integers in ipio2[].
+ *
+ * Input parameters:
+ * 	x[]	The input value (must be positive) is broken into nx
+ *		pieces of 24-bit integers in double precision format.
+ *		x[i] will be the i-th 24 bit of x. The scaled exponent
+ *		of x[0] is given in input parameter e0 (i.e., x[0]*2^e0
+ *		match x's up to 24 bits.
+ *
+ *		Example of breaking a double positive z into x[0]+x[1]+x[2]:
+ *			e0 = ilogb(z)-23
+ *			z  = scalbn(z,-e0)
+ *		for i = 0,1,2
+ *			x[i] = floor(z)
+ *			z    = (z-x[i])*2**24
+ *
+ *
+ *	y[]	ouput result in an array of double precision numbers.
+ *		The dimension of y[] is:
+ *			24-bit  precision	1
+ *			53-bit  precision	2
+ *			64-bit  precision	2
+ *			113-bit precision	3
+ *		The actual value is the sum of them. Thus for 113-bit
+ *		precison, one may have to do something like:
+ *
+ *		long double t,w,r_head, r_tail;
+ *		t = (long double)y[2] + (long double)y[1];
+ *		w = (long double)y[0];
+ *		r_head = t+w;
+ *		r_tail = w - (r_head - t);
+ *
+ *	e0	The exponent of x[0]
+ *
+ *	nx	dimension of x[]
+ *
+ *  	prec	an integer indicating the precision:
+ *			0	24  bits (single)
+ *			1	53  bits (double)
+ *			2	64  bits (extended)
+ *			3	113 bits (quad)
+ *
+ *	ipio2[]
+ *		integer array, contains the (24*i)-th to (24*i+23)-th
+ *		bit of 2/pi after binary point. The corresponding
+ *		floating value is
+ *
+ *			ipio2[i] * 2^(-24(i+1)).
+ *
+ * External function:
+ *	double scalbn(), floor();
+ *
+ *
+ * Here is the description of some local variables:
+ *
+ * 	jk	jk+1 is the initial number of terms of ipio2[] needed
+ *		in the computation. The recommended value is 2,3,4,
+ *		6 for single, double, extended,and quad.
+ *
+ * 	jz	local integer variable indicating the number of
+ *		terms of ipio2[] used.
+ *
+ *	jx	nx - 1
+ *
+ *	jv	index for pointing to the suitable ipio2[] for the
+ *		computation. In general, we want
+ *			( 2^e0*x[0] * ipio2[jv-1]*2^(-24jv) )/8
+ *		is an integer. Thus
+ *			e0-3-24*jv >= 0 or (e0-3)/24 >= jv
+ *		Hence jv = max(0,(e0-3)/24).
+ *
+ *	jp	jp+1 is the number of terms in PIo2[] needed, jp = jk.
+ *
+ * 	q[]	double array with integral value, representing the
+ *		24-bits chunk of the product of x and 2/pi.
+ *
+ *	q0	the corresponding exponent of q[0]. Note that the
+ *		exponent for q[i] would be q0-24*i.
+ *
+ *	PIo2[]	double precision array, obtained by cutting pi/2
+ *		into 24 bits chunks.
+ *
+ *	f[]	ipio2[] in floating point
+ *
+ *	iq[]	integer array by breaking up q[] in 24-bits chunk.
+ *
+ *	fq[]	final product of x*(2/pi) in fq[0],..,fq[jk]
+ *
+ *	ih	integer. If >0 it indicates q[] is >= 0.5, hence
+ *		it also indicates the *sign* of the result.
+ *
+ */
+
+
+/*
+ * Constants:
+ * The hexadecimal values are the intended ones for the following
+ * constants. The decimal values may be used, provided that the
+ * compiler will convert from decimal to binary accurately enough
+ * to produce the hexadecimal values shown.
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+libm_hidden_proto(scalbn)
+    libm_hidden_proto(floor)
+#ifdef __STDC__
+     static const int init_jk[] = { 2, 3, 4, 6 };       /* initial value for jk */
+#else
+     static int init_jk[] = { 2, 3, 4, 6 };
+#endif
+
+#ifdef __STDC__
+static const double PIo2[] = {
+#else
+static double PIo2[] = {
+#endif
+    1.57079625129699707031e+00, /* 0x3FF921FB, 0x40000000 */
+    7.54978941586159635335e-08, /* 0x3E74442D, 0x00000000 */
+    5.39030252995776476554e-15, /* 0x3CF84698, 0x80000000 */
+    3.28200341580791294123e-22, /* 0x3B78CC51, 0x60000000 */
+    1.27065575308067607349e-29, /* 0x39F01B83, 0x80000000 */
+    1.22933308981111328932e-36, /* 0x387A2520, 0x40000000 */
+    2.73370053816464559624e-44, /* 0x36E38222, 0x80000000 */
+    2.16741683877804819444e-51, /* 0x3569F31D, 0x00000000 */
+};
+
+#ifdef __STDC__
+static const double
+#else
+static double
+#endif
+  zero = 0.0, one = 1.0, two24 = 1.67772160000000000000e+07,    /* 0x41700000, 0x00000000 */
+    twon24 = 5.96046447753906250000e-08;        /* 0x3E700000, 0x00000000 */
+
+#ifdef __STDC__
+int attribute_hidden
+__kernel_rem_pio2(double *x, double *y, int e0, int nx, int prec,
+                  const int32_t * ipio2)
+#else
+int attribute_hidden
+__kernel_rem_pio2(x, y, e0, nx, prec, ipio2)
+     double x[], y[];
+     int e0, nx, prec;
+     int32_t ipio2[];
+#endif
+{
+    int32_t jz, jx, jv, jp, jk, carry, n, iq[20], i, j, k, m, q0, ih;
+    double z, fw, f[20], fq[20], q[20];
+
+    /* initialize jk */
+    jk = init_jk[prec];
+    jp = jk;
+
+    /* determine jx,jv,q0, note that 3>q0 */
+    jx = nx - 1;
+    jv = (e0 - 3) / 24;
+    if (jv < 0)
+        jv = 0;
+    q0 = e0 - 24 * (jv + 1);
+
+    /* set up f[0] to f[jx+jk] where f[jx+jk] = ipio2[jv+jk] */
+    j = jv - jx;
+    m = jx + jk;
+    for (i = 0; i <= m; i++, j++)
+        f[i] = (j < 0) ? zero : (double) ipio2[j];
+
+    /* compute q[0],q[1],...q[jk] */
+    for (i = 0; i <= jk; i++) {
+        for (j = 0, fw = 0.0; j <= jx; j++)
+            fw += x[j] * f[jx + i - j];
+        q[i] = fw;
+    }
+
+    jz = jk;
+  recompute:
+    /* distill q[] into iq[] reversingly */
+    for (i = 0, j = jz, z = q[jz]; j > 0; i++, j--) {
+        fw = (double) ((int32_t) (twon24 * z));
+        iq[i] = (int32_t) (z - two24 * fw);
+        z = q[j - 1] + fw;
+    }
+
+    /* compute n */
+    z = scalbn(z, q0);          /* actual value of z */
+    z -= 8.0 * floor(z * 0.125);        /* trim off integer >= 8 */
+    n = (int32_t) z;
+    z -= (double) n;
+    ih = 0;
+    if (q0 > 0) {               /* need iq[jz-1] to determine n */
+        i = (iq[jz - 1] >> (24 - q0));
+        n += i;
+        iq[jz - 1] -= i << (24 - q0);
+        ih = iq[jz - 1] >> (23 - q0);
+    } else if (q0 == 0)
+        ih = iq[jz - 1] >> 23;
+    else if (z >= 0.5)
+        ih = 2;
+
+    if (ih > 0) {               /* q > 0.5 */
+        n += 1;
+        carry = 0;
+        for (i = 0; i < jz; i++) {      /* compute 1-q */
+            j = iq[i];
+            if (carry == 0) {
+                if (j != 0) {
+                    carry = 1;
+                    iq[i] = 0x1000000 - j;
+                }
+            } else
+                iq[i] = 0xffffff - j;
+        }
+        if (q0 > 0) {           /* rare case: chance is 1 in 12 */
+            switch (q0) {
+            case 1:
+                iq[jz - 1] &= 0x7fffff;
+                break;
+            case 2:
+                iq[jz - 1] &= 0x3fffff;
+                break;
+            }
+        }
+        if (ih == 2) {
+            z = one - z;
+            if (carry != 0)
+                z -= scalbn(one, q0);
+        }
+    }
+
+    /* check if recomputation is needed */
+    if (z == zero) {
+        j = 0;
+        for (i = jz - 1; i >= jk; i--)
+            j |= iq[i];
+        if (j == 0) {           /* need recomputation */
+            for (k = 1; iq[jk - k] == 0; k++);  /* k = no. of terms needed */
+
+            for (i = jz + 1; i <= jz + k; i++) {        /* add q[jz+1] to q[jz+k] */
+                f[jx + i] = (double) ipio2[jv + i];
+                for (j = 0, fw = 0.0; j <= jx; j++)
+                    fw += x[j] * f[jx + i - j];
+                q[i] = fw;
+            }
+            jz += k;
+            goto recompute;
+        }
+    }
+
+    /* chop off zero terms */
+    if (z == 0.0) {
+        jz -= 1;
+        q0 -= 24;
+        while (iq[jz] == 0) {
+            jz--;
+            q0 -= 24;
+        }
+    } else {                    /* break z into 24-bit if necessary */
+        z = scalbn(z, -q0);
+        if (z >= two24) {
+            fw = (double) ((int32_t) (twon24 * z));
+            iq[jz] = (int32_t) (z - two24 * fw);
+            jz += 1;
+            q0 += 24;
+            iq[jz] = (int32_t) fw;
+        } else
+            iq[jz] = (int32_t) z;
+    }
+
+    /* convert integer "bit" chunk to floating-point value */
+    fw = scalbn(one, q0);
+    for (i = jz; i >= 0; i--) {
+        q[i] = fw * (double) iq[i];
+        fw *= twon24;
+    }
+
+    /* compute PIo2[0,...,jp]*q[jz,...,0] */
+    for (i = jz; i >= 0; i--) {
+        for (fw = 0.0, k = 0; k <= jp && k <= jz - i; k++)
+            fw += PIo2[k] * q[i + k];
+        fq[jz - i] = fw;
+    }
+
+    /* compress fq[] into y[] */
+    switch (prec) {
+    case 0:
+        fw = 0.0;
+        for (i = jz; i >= 0; i--)
+            fw += fq[i];
+        y[0] = (ih == 0) ? fw : -fw;
+        break;
+    case 1:
+    case 2:
+        fw = 0.0;
+        for (i = jz; i >= 0; i--)
+            fw += fq[i];
+        y[0] = (ih == 0) ? fw : -fw;
+        fw = fq[0] - fw;
+        for (i = 1; i <= jz; i++)
+            fw += fq[i];
+        y[1] = (ih == 0) ? fw : -fw;
+        break;
+    case 3:                    /* painful */
+        for (i = jz; i > 0; i--) {
+            fw = fq[i - 1] + fq[i];
+            fq[i] += fq[i - 1] - fw;
+            fq[i - 1] = fw;
+        }
+        for (i = jz; i > 1; i--) {
+            fw = fq[i - 1] + fq[i];
+            fq[i] += fq[i - 1] - fw;
+            fq[i - 1] = fw;
+        }
+        for (fw = 0.0, i = jz; i >= 2; i--)
+            fw += fq[i];
+        if (ih == 0) {
+            y[0] = fq[0];
+            y[1] = fq[1];
+            y[2] = fw;
+        } else {
+            y[0] = -fq[0];
+            y[1] = -fq[1];
+            y[2] = -fw;
+        }
+    }
+    return n & 7;
+}
diff --git a/Source/3rd Party/sdl/src/libm/k_sin.c b/Source/3rd Party/sdl/src/libm/k_sin.c
new file mode 100644
index 000000000..60881575a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/k_sin.c	
@@ -0,0 +1,87 @@
+/* @(#)k_sin.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: k_sin.c,v 1.8 1995/05/10 20:46:31 jtc Exp $";
+#endif
+
+/* __kernel_sin( x, y, iy)
+ * kernel sin function on [-pi/4, pi/4], pi/4 ~ 0.7854
+ * Input x is assumed to be bounded by ~pi/4 in magnitude.
+ * Input y is the tail of x.
+ * Input iy indicates whether y is 0. (if iy=0, y assume to be 0).
+ *
+ * Algorithm
+ *	1. Since sin(-x) = -sin(x), we need only to consider positive x.
+ *	2. if x < 2^-27 (hx<0x3e400000 0), return x with inexact if x!=0.
+ *	3. sin(x) is approximated by a polynomial of degree 13 on
+ *	   [0,pi/4]
+ *		  	         3            13
+ *	   	sin(x) ~ x + S1*x + ... + S6*x
+ *	   where
+ *
+ * 	|sin(x)         2     4     6     8     10     12  |     -58
+ * 	|----- - (1+S1*x +S2*x +S3*x +S4*x +S5*x  +S6*x   )| <= 2
+ * 	|  x 					           |
+ *
+ *	4. sin(x+y) = sin(x) + sin'(x')*y
+ *		    ~ sin(x) + (1-x*x/2)*y
+ *	   For better accuracy, let
+ *		     3      2      2      2      2
+ *		r = x *(S2+x *(S3+x *(S4+x *(S5+x *S6))))
+ *	   then                   3    2
+ *		sin(x) = x + (S1*x + (x *(r-y/2)+y))
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+#ifdef __STDC__
+static const double
+#else
+static double
+#endif
+  half = 5.00000000000000000000e-01,    /* 0x3FE00000, 0x00000000 */
+    S1 = -1.66666666666666324348e-01,   /* 0xBFC55555, 0x55555549 */
+    S2 = 8.33333333332248946124e-03,    /* 0x3F811111, 0x1110F8A6 */
+    S3 = -1.98412698298579493134e-04,   /* 0xBF2A01A0, 0x19C161D5 */
+    S4 = 2.75573137070700676789e-06,    /* 0x3EC71DE3, 0x57B1FE7D */
+    S5 = -2.50507602534068634195e-08,   /* 0xBE5AE5E6, 0x8A2B9CEB */
+    S6 = 1.58969099521155010221e-10;    /* 0x3DE5D93A, 0x5ACFD57C */
+
+#ifdef __STDC__
+double attribute_hidden
+__kernel_sin(double x, double y, int iy)
+#else
+double attribute_hidden
+__kernel_sin(x, y, iy)
+     double x, y;
+     int iy;                    /* iy=0 if y is zero */
+#endif
+{
+    double z, r, v;
+    int32_t ix;
+    GET_HIGH_WORD(ix, x);
+    ix &= 0x7fffffff;           /* high word of x */
+    if (ix < 0x3e400000) {      /* |x| < 2**-27 */
+        if ((int) x == 0)
+            return x;
+    }                           /* generate inexact */
+    z = x * x;
+    v = z * x;
+    r = S2 + z * (S3 + z * (S4 + z * (S5 + z * S6)));
+    if (iy == 0)
+        return x + v * (S1 + z * r);
+    else
+        return x - ((z * (half * y - v * r) - y) - v * S1);
+}
diff --git a/Source/3rd Party/sdl/src/libm/math_libm.h b/Source/3rd Party/sdl/src/libm/math_libm.h
new file mode 100644
index 000000000..20432bd28
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/math_libm.h	
@@ -0,0 +1,37 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Math routines from uClibc: http://www.uclibc.org */
+
+double SDL_uclibc_atan(double x);
+double SDL_uclibc_atan2(double y, double x);    
+double SDL_uclibc_copysign(double x, double y);       
+double SDL_uclibc_cos(double x);         
+double SDL_uclibc_fabs(double x);        
+double SDL_uclibc_floor(double x);
+double SDL_uclibc_log(double x);
+double SDL_uclibc_pow(double x, double y);    
+double SDL_uclibc_scalbn(double x, int n);
+double SDL_uclibc_sin(double x);
+double SDL_uclibc_sqrt(double x);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/libm/math_private.h b/Source/3rd Party/sdl/src/libm/math_private.h
new file mode 100644
index 000000000..6ab0f35fd
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/math_private.h	
@@ -0,0 +1,220 @@
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+/*
+ * from: @(#)fdlibm.h 5.1 93/09/24
+ * $Id: math_private.h,v 1.3 2004/02/09 07:10:38 andersen Exp $
+ */
+
+#ifndef _MATH_PRIVATE_H_
+#define _MATH_PRIVATE_H_
+
+/* #include <endian.h> */
+#include "SDL_endian.h"
+/* #include <sys/types.h> */
+
+#define attribute_hidden
+#define libm_hidden_proto(x)
+#define libm_hidden_def(x)
+
+#ifndef __HAIKU__ /* already defined in a system header. */
+typedef unsigned int u_int32_t;
+#endif
+
+#define atan            SDL_uclibc_atan
+#define __ieee754_atan2 SDL_uclibc_atan2
+#define copysign        SDL_uclibc_copysign
+#define cos             SDL_uclibc_cos
+#define fabs            SDL_uclibc_fabs
+#define floor           SDL_uclibc_floor
+#define __ieee754_log   SDL_uclibc_log
+#define __ieee754_pow   SDL_uclibc_pow
+#define scalbn          SDL_uclibc_scalbn
+#define sin             SDL_uclibc_sin
+#define __ieee754_sqrt  SDL_uclibc_sqrt
+
+/* The original fdlibm code used statements like:
+	n0 = ((*(int*)&one)>>29)^1;		* index of high word *
+	ix0 = *(n0+(int*)&x);			* high word of x *
+	ix1 = *((1-n0)+(int*)&x);		* low word of x *
+   to dig two 32 bit words out of the 64 bit IEEE floating point
+   value.  That is non-ANSI, and, moreover, the gcc instruction
+   scheduler gets it wrong.  We instead use the following macros.
+   Unlike the original code, we determine the endianness at compile
+   time, not at run time; I don't see much benefit to selecting
+   endianness at run time.  */
+
+/* A union which permits us to convert between a double and two 32 bit
+   ints.  */
+
+/*
+ * Math on arm is special:
+ * For FPA, float words are always big-endian.
+ * For VFP, floats words follow the memory system mode.
+ */
+
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+
+typedef union
+{
+    double value;
+    struct
+    {
+        u_int32_t msw;
+        u_int32_t lsw;
+    } parts;
+} ieee_double_shape_type;
+
+#else
+
+typedef union
+{
+    double value;
+    struct
+    {
+        u_int32_t lsw;
+        u_int32_t msw;
+    } parts;
+} ieee_double_shape_type;
+
+#endif
+
+/* Get two 32 bit ints from a double.  */
+
+#define EXTRACT_WORDS(ix0,ix1,d)				\
+do {								\
+  ieee_double_shape_type ew_u;					\
+  ew_u.value = (d);						\
+  (ix0) = ew_u.parts.msw;					\
+  (ix1) = ew_u.parts.lsw;					\
+} while (0)
+
+/* Get the more significant 32 bit int from a double.  */
+
+#define GET_HIGH_WORD(i,d)					\
+do {								\
+  ieee_double_shape_type gh_u;					\
+  gh_u.value = (d);						\
+  (i) = gh_u.parts.msw;						\
+} while (0)
+
+/* Get the less significant 32 bit int from a double.  */
+
+#define GET_LOW_WORD(i,d)					\
+do {								\
+  ieee_double_shape_type gl_u;					\
+  gl_u.value = (d);						\
+  (i) = gl_u.parts.lsw;						\
+} while (0)
+
+/* Set a double from two 32 bit ints.  */
+
+#define INSERT_WORDS(d,ix0,ix1)					\
+do {								\
+  ieee_double_shape_type iw_u;					\
+  iw_u.parts.msw = (ix0);					\
+  iw_u.parts.lsw = (ix1);					\
+  (d) = iw_u.value;						\
+} while (0)
+
+/* Set the more significant 32 bits of a double from an int.  */
+
+#define SET_HIGH_WORD(d,v)					\
+do {								\
+  ieee_double_shape_type sh_u;					\
+  sh_u.value = (d);						\
+  sh_u.parts.msw = (v);						\
+  (d) = sh_u.value;						\
+} while (0)
+
+/* Set the less significant 32 bits of a double from an int.  */
+
+#define SET_LOW_WORD(d,v)					\
+do {								\
+  ieee_double_shape_type sl_u;					\
+  sl_u.value = (d);						\
+  sl_u.parts.lsw = (v);						\
+  (d) = sl_u.value;						\
+} while (0)
+
+/* A union which permits us to convert between a float and a 32 bit
+   int.  */
+
+typedef union
+{
+    float value;
+    u_int32_t word;
+} ieee_float_shape_type;
+
+/* Get a 32 bit int from a float.  */
+
+#define GET_FLOAT_WORD(i,d)					\
+do {								\
+  ieee_float_shape_type gf_u;					\
+  gf_u.value = (d);						\
+  (i) = gf_u.word;						\
+} while (0)
+
+/* Set a float from a 32 bit int.  */
+
+#define SET_FLOAT_WORD(d,i)					\
+do {								\
+  ieee_float_shape_type sf_u;					\
+  sf_u.word = (i);						\
+  (d) = sf_u.value;						\
+} while (0)
+
+/* ieee style elementary functions */
+extern double
+__ieee754_sqrt(double)
+    attribute_hidden;
+     extern double __ieee754_acos(double) attribute_hidden;
+     extern double __ieee754_acosh(double) attribute_hidden;
+     extern double __ieee754_log(double) attribute_hidden;
+     extern double __ieee754_atanh(double) attribute_hidden;
+     extern double __ieee754_asin(double) attribute_hidden;
+     extern double __ieee754_atan2(double, double) attribute_hidden;
+     extern double __ieee754_exp(double) attribute_hidden;
+     extern double __ieee754_cosh(double) attribute_hidden;
+     extern double __ieee754_fmod(double, double) attribute_hidden;
+     extern double __ieee754_pow(double, double) attribute_hidden;
+     extern double __ieee754_lgamma_r(double, int *) attribute_hidden;
+     extern double __ieee754_gamma_r(double, int *) attribute_hidden;
+     extern double __ieee754_lgamma(double) attribute_hidden;
+     extern double __ieee754_gamma(double) attribute_hidden;
+     extern double __ieee754_log10(double) attribute_hidden;
+     extern double __ieee754_sinh(double) attribute_hidden;
+     extern double __ieee754_hypot(double, double) attribute_hidden;
+     extern double __ieee754_j0(double) attribute_hidden;
+     extern double __ieee754_j1(double) attribute_hidden;
+     extern double __ieee754_y0(double) attribute_hidden;
+     extern double __ieee754_y1(double) attribute_hidden;
+     extern double __ieee754_jn(int, double) attribute_hidden;
+     extern double __ieee754_yn(int, double) attribute_hidden;
+     extern double __ieee754_remainder(double, double) attribute_hidden;
+     extern int __ieee754_rem_pio2(double, double *) attribute_hidden;
+#if defined(_SCALB_INT)
+     extern double __ieee754_scalb(double, int) attribute_hidden;
+#else
+     extern double __ieee754_scalb(double, double) attribute_hidden;
+#endif
+
+/* fdlibm kernel function */
+#ifndef _IEEE_LIBM
+     extern double __kernel_standard(double, double, int) attribute_hidden;
+#endif
+     extern double __kernel_sin(double, double, int) attribute_hidden;
+     extern double __kernel_cos(double, double) attribute_hidden;
+     extern double __kernel_tan(double, double, int) attribute_hidden;
+     extern int __kernel_rem_pio2(double *, double *, int, int, int,
+                                  const int *) attribute_hidden;
+
+#endif /* _MATH_PRIVATE_H_ */
diff --git a/Source/3rd Party/sdl/src/libm/s_atan.c b/Source/3rd Party/sdl/src/libm/s_atan.c
new file mode 100644
index 000000000..970ea4dbf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/s_atan.c	
@@ -0,0 +1,115 @@
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+/* atan(x)
+ * Method
+ *   1. Reduce x to positive by atan(x) = -atan(-x).
+ *   2. According to the integer k=4t+0.25 chopped, t=x, the argument
+ *      is further reduced to one of the following intervals and the
+ *      arctangent of t is evaluated by the corresponding formula:
+ *
+ *      [0,7/16]      atan(x) = t-t^3*(a1+t^2*(a2+...(a10+t^2*a11)...)
+ *      [7/16,11/16]  atan(x) = atan(1/2) + atan( (t-0.5)/(1+t/2) )
+ *      [11/16.19/16] atan(x) = atan( 1 ) + atan( (t-1)/(1+t) )
+ *      [19/16,39/16] atan(x) = atan(3/2) + atan( (t-1.5)/(1+1.5t) )
+ *      [39/16,INF]   atan(x) = atan(INF) + atan( -1/t )
+ *
+ * Constants:
+ * The hexadecimal values are the intended ones for the following
+ * constants. The decimal values may be used, provided that the
+ * compiler will convert from decimal to binary accurately enough
+ * to produce the hexadecimal values shown.
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+static const double atanhi[] = {
+  4.63647609000806093515e-01, /* atan(0.5)hi 0x3FDDAC67, 0x0561BB4F */
+  7.85398163397448278999e-01, /* atan(1.0)hi 0x3FE921FB, 0x54442D18 */
+  9.82793723247329054082e-01, /* atan(1.5)hi 0x3FEF730B, 0xD281F69B */
+  1.57079632679489655800e+00, /* atan(inf)hi 0x3FF921FB, 0x54442D18 */
+};
+
+static const double atanlo[] = {
+  2.26987774529616870924e-17, /* atan(0.5)lo 0x3C7A2B7F, 0x222F65E2 */
+  3.06161699786838301793e-17, /* atan(1.0)lo 0x3C81A626, 0x33145C07 */
+  1.39033110312309984516e-17, /* atan(1.5)lo 0x3C700788, 0x7AF0CBBD */
+  6.12323399573676603587e-17, /* atan(inf)lo 0x3C91A626, 0x33145C07 */
+};
+
+static const double aT[] = {
+  3.33333333333329318027e-01, /* 0x3FD55555, 0x5555550D */
+ -1.99999999998764832476e-01, /* 0xBFC99999, 0x9998EBC4 */
+  1.42857142725034663711e-01, /* 0x3FC24924, 0x920083FF */
+ -1.11111104054623557880e-01, /* 0xBFBC71C6, 0xFE231671 */
+  9.09088713343650656196e-02, /* 0x3FB745CD, 0xC54C206E */
+ -7.69187620504482999495e-02, /* 0xBFB3B0F2, 0xAF749A6D */
+  6.66107313738753120669e-02, /* 0x3FB10D66, 0xA0D03D51 */
+ -5.83357013379057348645e-02, /* 0xBFADDE2D, 0x52DEFD9A */
+  4.97687799461593236017e-02, /* 0x3FA97B4B, 0x24760DEB */
+ -3.65315727442169155270e-02, /* 0xBFA2B444, 0x2C6A6C2F */
+  1.62858201153657823623e-02, /* 0x3F90AD3A, 0xE322DA11 */
+};
+
+static const double
+one   = 1.0,
+huge   = 1.0e300;
+
+double atan(double x)
+{
+	double w,s1,s2,z;
+	int32_t ix,hx,id;
+
+	GET_HIGH_WORD(hx,x);
+	ix = hx&0x7fffffff;
+	if(ix>=0x44100000) {	/* if |x| >= 2^66 */
+	    u_int32_t low;
+	    GET_LOW_WORD(low,x);
+	    if(ix>0x7ff00000||
+		(ix==0x7ff00000&&(low!=0)))
+		return x+x;		/* NaN */
+	    if(hx>0) return  atanhi[3]+atanlo[3];
+	    else     return -atanhi[3]-atanlo[3];
+	} if (ix < 0x3fdc0000) {	/* |x| < 0.4375 */
+	    if (ix < 0x3e200000) {	/* |x| < 2^-29 */
+		if(huge+x>one) return x;	/* raise inexact */
+	    }
+	    id = -1;
+	} else {
+	x = fabs(x);
+	if (ix < 0x3ff30000) {		/* |x| < 1.1875 */
+	    if (ix < 0x3fe60000) {	/* 7/16 <=|x|<11/16 */
+		id = 0; x = (2.0*x-one)/(2.0+x);
+	    } else {			/* 11/16<=|x|< 19/16 */
+		id = 1; x  = (x-one)/(x+one);
+	    }
+	} else {
+	    if (ix < 0x40038000) {	/* |x| < 2.4375 */
+		id = 2; x  = (x-1.5)/(one+1.5*x);
+	    } else {			/* 2.4375 <= |x| < 2^66 */
+		id = 3; x  = -1.0/x;
+	    }
+	}}
+    /* end of argument reduction */
+	z = x*x;
+	w = z*z;
+    /* break sum from i=0 to 10 aT[i]z**(i+1) into odd and even poly */
+	s1 = z*(aT[0]+w*(aT[2]+w*(aT[4]+w*(aT[6]+w*(aT[8]+w*aT[10])))));
+	s2 = w*(aT[1]+w*(aT[3]+w*(aT[5]+w*(aT[7]+w*aT[9]))));
+	if (id<0) return x - x*(s1+s2);
+	else {
+	    z = atanhi[id] - ((x*(s1+s2) - atanlo[id]) - x);
+	    return (hx<0)? -z:z;
+	}
+}
+libm_hidden_def(atan)
+
diff --git a/Source/3rd Party/sdl/src/libm/s_copysign.c b/Source/3rd Party/sdl/src/libm/s_copysign.c
new file mode 100644
index 000000000..afd43e9a7
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/s_copysign.c	
@@ -0,0 +1,42 @@
+/* @(#)s_copysign.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $";
+#endif
+
+/*
+ * copysign(double x, double y)
+ * copysign(x,y) returns a value with the magnitude of x and
+ * with the sign bit of y.
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+libm_hidden_proto(copysign)
+#ifdef __STDC__
+     double copysign(double x, double y)
+#else
+     double copysign(x, y)
+     double x, y;
+#endif
+{
+    u_int32_t hx, hy;
+    GET_HIGH_WORD(hx, x);
+    GET_HIGH_WORD(hy, y);
+    SET_HIGH_WORD(x, (hx & 0x7fffffff) | (hy & 0x80000000));
+    return x;
+}
+
+libm_hidden_def(copysign)
diff --git a/Source/3rd Party/sdl/src/libm/s_cos.c b/Source/3rd Party/sdl/src/libm/s_cos.c
new file mode 100644
index 000000000..66b156c9f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/s_cos.c	
@@ -0,0 +1,91 @@
+/* @(#)s_cos.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: s_cos.c,v 1.7 1995/05/10 20:47:02 jtc Exp $";
+#endif
+
+/* cos(x)
+ * Return cosine function of x.
+ *
+ * kernel function:
+ *	__kernel_sin		... sine function on [-pi/4,pi/4]
+ *	__kernel_cos		... cosine function on [-pi/4,pi/4]
+ *	__ieee754_rem_pio2	... argument reduction routine
+ *
+ * Method.
+ *      Let S,C and T denote the sin, cos and tan respectively on
+ *	[-PI/4, +PI/4]. Reduce the argument x to y1+y2 = x-k*pi/2
+ *	in [-pi/4 , +pi/4], and let n = k mod 4.
+ *	We have
+ *
+ *          n        sin(x)      cos(x)        tan(x)
+ *     ----------------------------------------------------------
+ *	    0	       S	   C		 T
+ *	    1	       C	  -S		-1/T
+ *	    2	      -S	  -C		 T
+ *	    3	      -C	   S		-1/T
+ *     ----------------------------------------------------------
+ *
+ * Special cases:
+ *      Let trig be any of sin, cos, or tan.
+ *      trig(+-INF)  is NaN, with signals;
+ *      trig(NaN)    is that NaN;
+ *
+ * Accuracy:
+ *	TRIG(x) returns trig(x) nearly rounded
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+libm_hidden_proto(cos)
+#ifdef __STDC__
+     double cos(double x)
+#else
+     double cos(x)
+     double x;
+#endif
+{
+    double y[2], z = 0.0;
+    int32_t n, ix;
+
+    /* High word of x. */
+    GET_HIGH_WORD(ix, x);
+
+    /* |x| ~< pi/4 */
+    ix &= 0x7fffffff;
+    if (ix <= 0x3fe921fb)
+        return __kernel_cos(x, z);
+
+    /* cos(Inf or NaN) is NaN */
+    else if (ix >= 0x7ff00000)
+        return x - x;
+
+    /* argument reduction needed */
+    else {
+        n = __ieee754_rem_pio2(x, y);
+        switch (n & 3) {
+        case 0:
+            return __kernel_cos(y[0], y[1]);
+        case 1:
+            return -__kernel_sin(y[0], y[1], 1);
+        case 2:
+            return -__kernel_cos(y[0], y[1]);
+        default:
+            return __kernel_sin(y[0], y[1], 1);
+        }
+    }
+}
+
+libm_hidden_def(cos)
diff --git a/Source/3rd Party/sdl/src/libm/s_fabs.c b/Source/3rd Party/sdl/src/libm/s_fabs.c
new file mode 100644
index 000000000..5cf0c3977
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/s_fabs.c	
@@ -0,0 +1,39 @@
+/* @(#)s_fabs.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: s_fabs.c,v 1.7 1995/05/10 20:47:13 jtc Exp $";
+#endif
+
+/*
+ * fabs(x) returns the absolute value of x.
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+libm_hidden_proto(fabs)
+#ifdef __STDC__
+     double fabs(double x)
+#else
+     double fabs(x)
+     double x;
+#endif
+{
+    u_int32_t high;
+    GET_HIGH_WORD(high, x);
+    SET_HIGH_WORD(x, high & 0x7fffffff);
+    return x;
+}
+
+libm_hidden_def(fabs)
diff --git a/Source/3rd Party/sdl/src/libm/s_floor.c b/Source/3rd Party/sdl/src/libm/s_floor.c
new file mode 100644
index 000000000..b553d3038
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/s_floor.c	
@@ -0,0 +1,96 @@
+/* @(#)s_floor.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: s_floor.c,v 1.8 1995/05/10 20:47:20 jtc Exp $";
+#endif
+
+/*
+ * floor(x)
+ * Return x rounded toward -inf to integral value
+ * Method:
+ *	Bit twiddling.
+ * Exception:
+ *	Inexact flag raised if x not equal to floor(x).
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+#ifdef __STDC__
+static const double huge_val = 1.0e300;
+#else
+static double huge_val = 1.0e300;
+#endif
+
+libm_hidden_proto(floor)
+#ifdef __STDC__
+     double floor(double x)
+#else
+     double floor(x)
+     double x;
+#endif
+{
+    int32_t i0, i1, j0;
+    u_int32_t i, j;
+    EXTRACT_WORDS(i0, i1, x);
+    j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
+    if (j0 < 20) {
+        if (j0 < 0) {           /* raise inexact if x != 0 */
+            if (huge_val + x > 0.0) {       /* return 0*sign(x) if |x|<1 */
+                if (i0 >= 0) {
+                    i0 = i1 = 0;
+                } else if (((i0 & 0x7fffffff) | i1) != 0) {
+                    i0 = 0xbff00000;
+                    i1 = 0;
+                }
+            }
+        } else {
+            i = (0x000fffff) >> j0;
+            if (((i0 & i) | i1) == 0)
+                return x;       /* x is integral */
+            if (huge_val + x > 0.0) {       /* raise inexact flag */
+                if (i0 < 0)
+                    i0 += (0x00100000) >> j0;
+                i0 &= (~i);
+                i1 = 0;
+            }
+        }
+    } else if (j0 > 51) {
+        if (j0 == 0x400)
+            return x + x;       /* inf or NaN */
+        else
+            return x;           /* x is integral */
+    } else {
+        i = ((u_int32_t) (0xffffffff)) >> (j0 - 20);
+        if ((i1 & i) == 0)
+            return x;           /* x is integral */
+        if (huge_val + x > 0.0) {   /* raise inexact flag */
+            if (i0 < 0) {
+                if (j0 == 20)
+                    i0 += 1;
+                else {
+                    j = i1 + (1 << (52 - j0));
+                    if (j < (u_int32_t) i1)
+                        i0 += 1;        /* got a carry */
+                    i1 = j;
+                }
+            }
+            i1 &= (~i);
+        }
+    }
+    INSERT_WORDS(x, i0, i1);
+    return x;
+}
+
+libm_hidden_def(floor)
diff --git a/Source/3rd Party/sdl/src/libm/s_scalbn.c b/Source/3rd Party/sdl/src/libm/s_scalbn.c
new file mode 100644
index 000000000..f824e926d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/s_scalbn.c	
@@ -0,0 +1,79 @@
+/* @(#)s_scalbn.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: s_scalbn.c,v 1.8 1995/05/10 20:48:08 jtc Exp $";
+#endif
+
+/*
+ * scalbn (double x, int n)
+ * scalbn(x,n) returns x* 2**n  computed by  exponent
+ * manipulation rather than by actually performing an
+ * exponentiation or a multiplication.
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+libm_hidden_proto(copysign)
+#ifdef __STDC__
+     static const double
+#else
+     static double
+#endif
+       two54 = 1.80143985094819840000e+16,      /* 0x43500000, 0x00000000 */
+         twom54 = 5.55111512312578270212e-17,   /* 0x3C900000, 0x00000000 */
+         huge_val = 1.0e+300, tiny = 1.0e-300;
+
+libm_hidden_proto(scalbn)
+#ifdef __STDC__
+     double scalbn(double x, int n)
+#else
+     double scalbn(x, n)
+     double x;
+     int n;
+#endif
+{
+    int32_t k, hx, lx;
+    EXTRACT_WORDS(hx, lx, x);
+    k = (hx & 0x7ff00000) >> 20;        /* extract exponent */
+    if (k == 0) {               /* 0 or subnormal x */
+        if ((lx | (hx & 0x7fffffff)) == 0)
+            return x;           /* +-0 */
+        x *= two54;
+        GET_HIGH_WORD(hx, x);
+        k = ((hx & 0x7ff00000) >> 20) - 54;
+        if (n < -50000)
+            return tiny * x;    /* underflow */
+    }
+    if (k == 0x7ff)
+        return x + x;           /* NaN or Inf */
+    k = k + n;
+    if (k > 0x7fe)
+        return huge_val * copysign(huge_val, x);        /* overflow  */
+    if (k > 0) {                /* normal result */
+        SET_HIGH_WORD(x, (hx & 0x800fffff) | (k << 20));
+        return x;
+    }
+    if (k <= -54) {
+        if (n > 50000)          /* in case integer overflow in n+k */
+            return huge_val * copysign(huge_val, x);    /* overflow */
+        else
+            return tiny * copysign(tiny, x);    /* underflow */
+    }
+    k += 54;                    /* subnormal result */
+    SET_HIGH_WORD(x, (hx & 0x800fffff) | (k << 20));
+    return x * twom54;
+}
+
+libm_hidden_def(scalbn)
diff --git a/Source/3rd Party/sdl/src/libm/s_sin.c b/Source/3rd Party/sdl/src/libm/s_sin.c
new file mode 100644
index 000000000..771176619
--- /dev/null
+++ b/Source/3rd Party/sdl/src/libm/s_sin.c	
@@ -0,0 +1,91 @@
+/* @(#)s_sin.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static const char rcsid[] =
+    "$NetBSD: s_sin.c,v 1.7 1995/05/10 20:48:15 jtc Exp $";
+#endif
+
+/* sin(x)
+ * Return sine function of x.
+ *
+ * kernel function:
+ *	__kernel_sin		... sine function on [-pi/4,pi/4]
+ *	__kernel_cos		... cose function on [-pi/4,pi/4]
+ *	__ieee754_rem_pio2	... argument reduction routine
+ *
+ * Method.
+ *      Let S,C and T denote the sin, cos and tan respectively on
+ *	[-PI/4, +PI/4]. Reduce the argument x to y1+y2 = x-k*pi/2
+ *	in [-pi/4 , +pi/4], and let n = k mod 4.
+ *	We have
+ *
+ *          n        sin(x)      cos(x)        tan(x)
+ *     ----------------------------------------------------------
+ *	    0	       S	   C		 T
+ *	    1	       C	  -S		-1/T
+ *	    2	      -S	  -C		 T
+ *	    3	      -C	   S		-1/T
+ *     ----------------------------------------------------------
+ *
+ * Special cases:
+ *      Let trig be any of sin, cos, or tan.
+ *      trig(+-INF)  is NaN, with signals;
+ *      trig(NaN)    is that NaN;
+ *
+ * Accuracy:
+ *	TRIG(x) returns trig(x) nearly rounded
+ */
+
+#include "math_libm.h"
+#include "math_private.h"
+
+libm_hidden_proto(sin)
+#ifdef __STDC__
+     double sin(double x)
+#else
+     double sin(x)
+     double x;
+#endif
+{
+    double y[2], z = 0.0;
+    int32_t n, ix;
+
+    /* High word of x. */
+    GET_HIGH_WORD(ix, x);
+
+    /* |x| ~< pi/4 */
+    ix &= 0x7fffffff;
+    if (ix <= 0x3fe921fb)
+        return __kernel_sin(x, z, 0);
+
+    /* sin(Inf or NaN) is NaN */
+    else if (ix >= 0x7ff00000)
+        return x - x;
+
+    /* argument reduction needed */
+    else {
+        n = __ieee754_rem_pio2(x, y);
+        switch (n & 3) {
+        case 0:
+            return __kernel_sin(y[0], y[1], 1);
+        case 1:
+            return __kernel_cos(y[0], y[1]);
+        case 2:
+            return -__kernel_sin(y[0], y[1], 1);
+        default:
+            return -__kernel_cos(y[0], y[1]);
+        }
+    }
+}
+
+libm_hidden_def(sin)
diff --git a/Source/3rd Party/sdl/src/loadso/dlopen/SDL_sysloadso.c b/Source/3rd Party/sdl/src/loadso/dlopen/SDL_sysloadso.c
new file mode 100644
index 000000000..db8422221
--- /dev/null
+++ b/Source/3rd Party/sdl/src/loadso/dlopen/SDL_sysloadso.c	
@@ -0,0 +1,74 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_LOADSO_DLOPEN
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent library loading routines                           */
+
+#include <stdio.h>
+#include <dlfcn.h>
+
+#include "SDL_loadso.h"
+
+void *
+SDL_LoadObject(const char *sofile)
+{
+    void *handle = dlopen(sofile, RTLD_NOW|RTLD_LOCAL);
+    const char *loaderror = (char *) dlerror();
+    if (handle == NULL) {
+        SDL_SetError("Failed loading %s: %s", sofile, loaderror);
+    }
+    return (handle);
+}
+
+void *
+SDL_LoadFunction(void *handle, const char *name)
+{
+    void *symbol = dlsym(handle, name);
+    if (symbol == NULL) {
+        /* append an underscore for platforms that need that. */
+        size_t len = 1 + SDL_strlen(name) + 1;
+        char *_name = SDL_stack_alloc(char, len);
+        _name[0] = '_';
+        SDL_strlcpy(&_name[1], name, len);
+        symbol = dlsym(handle, _name);
+        SDL_stack_free(_name);
+        if (symbol == NULL) {
+            SDL_SetError("Failed loading %s: %s", name,
+                         (const char *) dlerror());
+        }
+    }
+    return (symbol);
+}
+
+void
+SDL_UnloadObject(void *handle)
+{
+    if (handle != NULL) {
+        dlclose(handle);
+    }
+}
+
+#endif /* SDL_LOADSO_DLOPEN */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/loadso/dummy/SDL_sysloadso.c b/Source/3rd Party/sdl/src/loadso/dummy/SDL_sysloadso.c
new file mode 100644
index 000000000..0dfb90b0c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/loadso/dummy/SDL_sysloadso.c	
@@ -0,0 +1,54 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if defined(SDL_LOADSO_DUMMY) || defined(SDL_LOADSO_DISABLED)
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent library loading routines                           */
+
+#include "SDL_loadso.h"
+
+void *
+SDL_LoadObject(const char *sofile)
+{
+    const char *loaderror = "SDL_LoadObject() not implemented";
+    SDL_SetError("Failed loading %s: %s", sofile, loaderror);
+    return (NULL);
+}
+
+void *
+SDL_LoadFunction(void *handle, const char *name)
+{
+    const char *loaderror = "SDL_LoadFunction() not implemented";
+    SDL_SetError("Failed loading %s: %s", name, loaderror);
+    return (NULL);
+}
+
+void
+SDL_UnloadObject(void *handle)
+{
+    /* no-op. */
+}
+
+#endif /* SDL_LOADSO_DUMMY || SDL_LOADSO_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/loadso/haiku/SDL_sysloadso.c b/Source/3rd Party/sdl/src/loadso/haiku/SDL_sysloadso.c
new file mode 100644
index 000000000..c8bba670f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/loadso/haiku/SDL_sysloadso.c	
@@ -0,0 +1,71 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_LOADSO_HAIKU
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent library loading routines                           */
+
+#include <stdio.h>
+#include <os/kernel/image.h>
+
+#include "SDL_loadso.h"
+
+void *
+SDL_LoadObject(const char *sofile)
+{
+    void *handle = NULL;
+    image_id library_id = load_add_on(sofile);
+    if (library_id < 0) {
+        SDL_SetError(strerror((int) library_id));
+    } else {
+        handle = (void *) (library_id);
+    }
+    return (handle);
+}
+
+void *
+SDL_LoadFunction(void *handle, const char *name)
+{
+    void *sym = NULL;
+    image_id library_id = (image_id) handle;
+    status_t rc =
+        get_image_symbol(library_id, name, B_SYMBOL_TYPE_TEXT, &sym);
+    if (rc != B_NO_ERROR) {
+        SDL_SetError(strerror(rc));
+    }
+    return (sym);
+}
+
+void
+SDL_UnloadObject(void *handle)
+{
+    image_id library_id;
+    if (handle != NULL) {
+        library_id = (image_id) handle;
+        unload_add_on(library_id);
+    }
+}
+
+#endif /* SDL_LOADSO_HAIKU */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/loadso/windows/SDL_sysloadso.c b/Source/3rd Party/sdl/src/loadso/windows/SDL_sysloadso.c
new file mode 100644
index 000000000..4d32b0985
--- /dev/null
+++ b/Source/3rd Party/sdl/src/loadso/windows/SDL_sysloadso.c	
@@ -0,0 +1,80 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_LOADSO_WINDOWS
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent library loading routines                           */
+
+#include "../../core/windows/SDL_windows.h"
+
+#include "SDL_loadso.h"
+
+void *
+SDL_LoadObject(const char *sofile)
+{
+    LPTSTR tstr = WIN_UTF8ToString(sofile);
+#ifdef __WINRT__
+    /* WinRT only publically supports LoadPackagedLibrary() for loading .dll
+       files.  LoadLibrary() is a private API, and not available for apps
+       (that can be published to MS' Windows Store.)
+    */
+    void *handle = (void *) LoadPackagedLibrary(tstr, 0);
+#else
+    void *handle = (void *) LoadLibrary(tstr);
+#endif
+    SDL_free(tstr);
+
+    /* Generate an error message if all loads failed */
+    if (handle == NULL) {
+        char errbuf[512];
+        SDL_strlcpy(errbuf, "Failed loading ", SDL_arraysize(errbuf));
+        SDL_strlcat(errbuf, sofile, SDL_arraysize(errbuf));
+        WIN_SetError(errbuf);
+    }
+    return handle;
+}
+
+void *
+SDL_LoadFunction(void *handle, const char *name)
+{
+    void *symbol = (void *) GetProcAddress((HMODULE) handle, name);
+    if (symbol == NULL) {
+        char errbuf[512];
+        SDL_strlcpy(errbuf, "Failed loading ", SDL_arraysize(errbuf));
+        SDL_strlcat(errbuf, name, SDL_arraysize(errbuf));
+        WIN_SetError(errbuf);
+    }
+    return symbol;
+}
+
+void
+SDL_UnloadObject(void *handle)
+{
+    if (handle != NULL) {
+        FreeLibrary((HMODULE) handle);
+    }
+}
+
+#endif /* SDL_LOADSO_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/main/android/SDL_android_main.c b/Source/3rd Party/sdl/src/main/android/SDL_android_main.c
new file mode 100644
index 000000000..f932f317e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/main/android/SDL_android_main.c	
@@ -0,0 +1,40 @@
+/*
+    SDL_android_main.c, placed in the public domain by Sam Lantinga  3/13/14
+*/
+#include "../../SDL_internal.h"
+
+#ifdef __ANDROID__
+
+/* Include the SDL main definition header */
+#include "SDL_main.h"
+
+/*******************************************************************************
+                 Functions called by JNI
+*******************************************************************************/
+#include <jni.h>
+
+/* Called before SDL_main() to initialize JNI bindings in SDL library */
+extern void SDL_Android_Init(JNIEnv* env, jclass cls);
+
+/* Start up the SDL app */
+void Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject obj)
+{
+    /* This interface could expand with ABI negotiation, calbacks, etc. */
+    SDL_Android_Init(env, cls);
+
+    SDL_SetMainReady();
+
+    /* Run the application code! */
+    int status;
+    char *argv[2];
+    argv[0] = SDL_strdup("SDL_app");
+    argv[1] = NULL;
+    status = SDL_main(1, argv);
+
+    /* Do not issue an exit or the whole application will terminate instead of just the SDL thread */
+    /* exit(status); */
+}
+
+#endif /* __ANDROID__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/main/dummy/SDL_dummy_main.c b/Source/3rd Party/sdl/src/main/dummy/SDL_dummy_main.c
new file mode 100644
index 000000000..0174136b2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/main/dummy/SDL_dummy_main.c	
@@ -0,0 +1,28 @@
+/*
+    SDL_dummy_main.c, placed in the public domain by Sam Lantinga  3/13/14
+*/
+#include "../../SDL_internal.h"
+
+/* Include the SDL main definition header */
+#include "SDL_main.h"
+
+#ifdef main
+#undef main
+int
+main(int argc, char *argv[])
+{
+    return (SDL_main(argc, argv));
+}
+#else
+/* Nothing to do on this platform */
+int
+SDL_main_stub_symbol(void);
+
+int
+SDL_main_stub_symbol(void)
+{
+    return 0;
+}
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/main/haiku/SDL_BApp.h b/Source/3rd Party/sdl/src/main/haiku/SDL_BApp.h
new file mode 100644
index 000000000..1e4a0f550
--- /dev/null
+++ b/Source/3rd Party/sdl/src/main/haiku/SDL_BApp.h	
@@ -0,0 +1,380 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef SDL_BAPP_H
+#define SDL_BAPP_H
+
+#include <InterfaceKit.h>
+#include <OpenGLKit.h>
+
+#include "../../video/haiku/SDL_bkeyboard.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../../SDL_internal.h"
+
+#include "SDL_video.h"
+
+/* Local includes */
+#include "../../events/SDL_events_c.h"
+#include "../../video/haiku/SDL_bkeyboard.h"
+#include "../../video/haiku/SDL_bframebuffer.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <vector>
+
+
+
+
+/* Forward declarations */
+class SDL_BWin;
+
+/* Message constants */
+enum ToSDL {
+    /* Intercepted by BWindow on its way to BView */
+    BAPP_MOUSE_MOVED,
+    BAPP_MOUSE_BUTTON,
+    BAPP_MOUSE_WHEEL,
+    BAPP_KEY,
+    BAPP_REPAINT,           /* from _UPDATE_ */
+    /* From BWindow */
+    BAPP_MAXIMIZE,          /* from B_ZOOM */
+    BAPP_MINIMIZE,
+    BAPP_RESTORE,           /* TODO: IMPLEMENT! */
+    BAPP_SHOW,
+    BAPP_HIDE,
+    BAPP_MOUSE_FOCUS,       /* caused by MOUSE_MOVE */
+    BAPP_KEYBOARD_FOCUS,    /* from WINDOW_ACTIVATED */
+    BAPP_WINDOW_CLOSE_REQUESTED,
+    BAPP_WINDOW_MOVED,
+    BAPP_WINDOW_RESIZED,
+    BAPP_SCREEN_CHANGED
+};
+
+
+
+/* Create a descendant of BApplication */
+class SDL_BApp : public BApplication {
+public:
+    SDL_BApp(const char* signature) :
+        BApplication(signature) {
+        _current_context = NULL;
+    }
+
+
+    virtual ~SDL_BApp() {
+    }
+
+
+
+        /* Event-handling functions */
+    virtual void MessageReceived(BMessage* message) {
+        /* Sort out SDL-related messages */
+        switch ( message->what ) {
+        case BAPP_MOUSE_MOVED:
+            _HandleMouseMove(message);
+            break;
+
+        case BAPP_MOUSE_BUTTON:
+            _HandleMouseButton(message);
+            break;
+
+        case BAPP_MOUSE_WHEEL:
+            _HandleMouseWheel(message);
+            break;
+
+        case BAPP_KEY:
+            _HandleKey(message);
+            break;
+
+        case BAPP_REPAINT:
+            _HandleBasicWindowEvent(message, SDL_WINDOWEVENT_EXPOSED);
+            break;
+
+        case BAPP_MAXIMIZE:
+            _HandleBasicWindowEvent(message, SDL_WINDOWEVENT_MAXIMIZED);
+            break;
+
+        case BAPP_MINIMIZE:
+            _HandleBasicWindowEvent(message, SDL_WINDOWEVENT_MINIMIZED);
+            break;
+
+        case BAPP_SHOW:
+            _HandleBasicWindowEvent(message, SDL_WINDOWEVENT_SHOWN);
+            break;
+
+        case BAPP_HIDE:
+            _HandleBasicWindowEvent(message, SDL_WINDOWEVENT_HIDDEN);
+            break;
+
+        case BAPP_MOUSE_FOCUS:
+            _HandleMouseFocus(message);
+            break;
+
+        case BAPP_KEYBOARD_FOCUS:
+            _HandleKeyboardFocus(message);
+            break;
+
+        case BAPP_WINDOW_CLOSE_REQUESTED:
+            _HandleBasicWindowEvent(message, SDL_WINDOWEVENT_CLOSE);
+            break;
+
+        case BAPP_WINDOW_MOVED:
+            _HandleWindowMoved(message);
+            break;
+
+        case BAPP_WINDOW_RESIZED:
+            _HandleWindowResized(message);
+            break;
+
+        case BAPP_SCREEN_CHANGED:
+            /* TODO: Handle screen resize or workspace change */
+            break;
+
+        default:
+           BApplication::MessageReceived(message);
+           break;
+        }
+    }
+
+    /* Window creation/destruction methods */
+    int32 GetID(SDL_Window *win) {
+        int32 i;
+        for(i = 0; i < _GetNumWindowSlots(); ++i) {
+            if( GetSDLWindow(i) == NULL ) {
+                _SetSDLWindow(win, i);
+                return i;
+            }
+        }
+
+        /* Expand the vector if all slots are full */
+        if( i == _GetNumWindowSlots() ) {
+            _PushBackWindow(win);
+            return i;
+        }
+
+        /* TODO: error handling */
+        return 0;
+    }
+
+    /* FIXME: Bad coding practice, but I can't include SDL_BWin.h here.  Is
+       there another way to do this? */
+    void ClearID(SDL_BWin *bwin); /* Defined in SDL_BeApp.cc */
+
+
+    SDL_Window *GetSDLWindow(int32 winID) {
+        return _window_map[winID];
+    }
+
+    void SetCurrentContext(BGLView *newContext) {
+        if(_current_context)
+            _current_context->UnlockGL();
+        _current_context = newContext;
+        _current_context->LockGL();
+    }
+private:
+    /* Event management */
+    void _HandleBasicWindowEvent(BMessage *msg, int32 sdlEventType) {
+        SDL_Window *win;
+        int32 winID;
+        if(
+            !_GetWinID(msg, &winID)
+        ) {
+            return;
+        }
+        win = GetSDLWindow(winID);
+        SDL_SendWindowEvent(win, sdlEventType, 0, 0);
+    }
+
+    void _HandleMouseMove(BMessage *msg) {
+        SDL_Window *win;
+        int32 winID;
+        int32 x = 0, y = 0;
+        if(
+            !_GetWinID(msg, &winID) ||
+            msg->FindInt32("x", &x) != B_OK || /* x movement */
+            msg->FindInt32("y", &y) != B_OK    /* y movement */
+        ) {
+            return;
+        }
+        win = GetSDLWindow(winID);
+        SDL_SendMouseMotion(win, 0, 0, x, y);
+
+        /* Tell the application that the mouse passed over, redraw needed */
+        BE_UpdateWindowFramebuffer(NULL,win,NULL,-1);
+    }
+
+    void _HandleMouseButton(BMessage *msg) {
+        SDL_Window *win;
+        int32 winID;
+        int32 button, state;    /* left/middle/right, pressed/released */
+        if(
+            !_GetWinID(msg, &winID) ||
+            msg->FindInt32("button-id", &button) != B_OK ||
+            msg->FindInt32("button-state", &state) != B_OK
+        ) {
+            return;
+        }
+        win = GetSDLWindow(winID);
+        SDL_SendMouseButton(win, 0, state, button);
+    }
+
+    void _HandleMouseWheel(BMessage *msg) {
+        SDL_Window *win;
+        int32 winID;
+        int32 xTicks, yTicks;
+        if(
+            !_GetWinID(msg, &winID) ||
+            msg->FindInt32("xticks", &xTicks) != B_OK ||
+            msg->FindInt32("yticks", &yTicks) != B_OK
+        ) {
+            return;
+        }
+        win = GetSDLWindow(winID);
+        SDL_SendMouseWheel(win, 0, xTicks, yTicks);
+    }
+
+    void _HandleKey(BMessage *msg) {
+        int32 scancode, state;  /* scancode, pressed/released */
+        if(
+            msg->FindInt32("key-state", &state) != B_OK ||
+            msg->FindInt32("key-scancode", &scancode) != B_OK
+        ) {
+            return;
+        }
+
+        /* Make sure this isn't a repeated event (key pressed and held) */
+        if(state == SDL_PRESSED && BE_GetKeyState(scancode) == SDL_PRESSED) {
+            return;
+        }
+        BE_SetKeyState(scancode, state);
+        SDL_SendKeyboardKey(state, BE_GetScancodeFromBeKey(scancode));
+    }
+
+    void _HandleMouseFocus(BMessage *msg) {
+        SDL_Window *win;
+        int32 winID;
+        bool bSetFocus; /* If false, lose focus */
+        if(
+            !_GetWinID(msg, &winID) ||
+            msg->FindBool("focusGained", &bSetFocus) != B_OK
+        ) {
+            return;
+        }
+        win = GetSDLWindow(winID);
+        if(bSetFocus) {
+            SDL_SetMouseFocus(win);
+        } else if(SDL_GetMouseFocus() == win) {
+            /* Only lose all focus if this window was the current focus */
+            SDL_SetMouseFocus(NULL);
+        }
+    }
+
+    void _HandleKeyboardFocus(BMessage *msg) {
+        SDL_Window *win;
+        int32 winID;
+        bool bSetFocus; /* If false, lose focus */
+        if(
+            !_GetWinID(msg, &winID) ||
+            msg->FindBool("focusGained", &bSetFocus) != B_OK
+        ) {
+            return;
+        }
+        win = GetSDLWindow(winID);
+        if(bSetFocus) {
+            SDL_SetKeyboardFocus(win);
+        } else if(SDL_GetKeyboardFocus() == win) {
+            /* Only lose all focus if this window was the current focus */
+            SDL_SetKeyboardFocus(NULL);
+        }
+    }
+
+    void _HandleWindowMoved(BMessage *msg) {
+        SDL_Window *win;
+        int32 winID;
+        int32 xPos, yPos;
+        /* Get the window id and new x/y position of the window */
+        if(
+            !_GetWinID(msg, &winID) ||
+            msg->FindInt32("window-x", &xPos) != B_OK ||
+            msg->FindInt32("window-y", &yPos) != B_OK
+        ) {
+            return;
+        }
+        win = GetSDLWindow(winID);
+        SDL_SendWindowEvent(win, SDL_WINDOWEVENT_MOVED, xPos, yPos);
+    }
+
+    void _HandleWindowResized(BMessage *msg) {
+        SDL_Window *win;
+        int32 winID;
+        int32 w, h;
+        /* Get the window id ]and new x/y position of the window */
+        if(
+            !_GetWinID(msg, &winID) ||
+            msg->FindInt32("window-w", &w) != B_OK ||
+            msg->FindInt32("window-h", &h) != B_OK
+        ) {
+            return;
+        }
+        win = GetSDLWindow(winID);
+        SDL_SendWindowEvent(win, SDL_WINDOWEVENT_RESIZED, w, h);
+    }
+
+    bool _GetWinID(BMessage *msg, int32 *winID) {
+        return msg->FindInt32("window-id", winID) == B_OK;
+    }
+
+
+
+    /* Vector functions: Wraps vector stuff in case we need to change
+       implementation */
+    void _SetSDLWindow(SDL_Window *win, int32 winID) {
+        _window_map[winID] = win;
+    }
+
+    int32 _GetNumWindowSlots() {
+        return _window_map.size();
+    }
+
+
+    void _PopBackWindow() {
+        _window_map.pop_back();
+    }
+
+    void _PushBackWindow(SDL_Window *win) {
+        _window_map.push_back(win);
+    }
+
+
+    /* Members */
+    std::vector<SDL_Window*> _window_map; /* Keeps track of SDL_Windows by index-id */
+
+    display_mode *_saved_mode;
+    BGLView      *_current_context;
+};
+
+#endif
diff --git a/Source/3rd Party/sdl/src/main/haiku/SDL_BeApp.cc b/Source/3rd Party/sdl/src/main/haiku/SDL_BeApp.cc
new file mode 100644
index 000000000..d471887fa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/main/haiku/SDL_BeApp.cc	
@@ -0,0 +1,136 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if defined(__HAIKU__)
+
+/* Handle the BeApp specific portions of the application */
+
+#include <AppKit.h>
+#include <storage/Path.h>
+#include <storage/Entry.h>
+#include <unistd.h>
+
+#include "SDL_BApp.h"	/* SDL_BApp class definition */
+#include "SDL_BeApp.h"
+#include "SDL_thread.h"
+#include "SDL_timer.h"
+#include "SDL_error.h"
+
+#include "../../video/haiku/SDL_BWin.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Flag to tell whether or not the Be application is active or not */
+int SDL_BeAppActive = 0;
+static SDL_Thread *SDL_AppThread = NULL;
+
+static int
+StartBeApp(void *unused)
+{
+    BApplication *App;
+
+    App = new SDL_BApp("application/x-SDL-executable");
+
+    App->Run();
+    delete App;
+    return (0);
+}
+
+/* Initialize the Be Application, if it's not already started */
+int
+SDL_InitBeApp(void)
+{
+    /* Create the BApplication that handles appserver interaction */
+    if (SDL_BeAppActive <= 0) {
+        SDL_AppThread = SDL_CreateThread(StartBeApp, "SDLApplication", NULL);
+        if (SDL_AppThread == NULL) {
+            return SDL_SetError("Couldn't create BApplication thread");
+        }
+
+        /* Change working directory to that of executable */
+        app_info info;
+        if (B_OK == be_app->GetAppInfo(&info)) {
+            entry_ref ref = info.ref;
+            BEntry entry;
+            if (B_OK == entry.SetTo(&ref)) {
+                BPath path;
+                if (B_OK == path.SetTo(&entry)) {
+                    if (B_OK == path.GetParent(&path)) {
+                        chdir(path.Path());
+                    }
+                }
+            }
+        }
+
+        do {
+            SDL_Delay(10);
+        } while ((be_app == NULL) || be_app->IsLaunching());
+
+        /* Mark the application active */
+        SDL_BeAppActive = 0;
+    }
+
+    /* Increment the application reference count */
+    ++SDL_BeAppActive;
+
+    /* The app is running, and we're ready to go */
+    return (0);
+}
+
+/* Quit the Be Application, if there's nothing left to do */
+void
+SDL_QuitBeApp(void)
+{
+    /* Decrement the application reference count */
+    --SDL_BeAppActive;
+
+    /* If the reference count reached zero, clean up the app */
+    if (SDL_BeAppActive == 0) {
+        if (SDL_AppThread != NULL) {
+            if (be_app != NULL) {       /* Not tested */
+                be_app->PostMessage(B_QUIT_REQUESTED);
+            }
+            SDL_WaitThread(SDL_AppThread, NULL);
+            SDL_AppThread = NULL;
+        }
+        /* be_app should now be NULL since be_app has quit */
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/* SDL_BApp functions */
+void SDL_BApp::ClearID(SDL_BWin *bwin) {
+	_SetSDLWindow(NULL, bwin->GetID());
+	int32 i = _GetNumWindowSlots() - 1;
+	while(i >= 0 && GetSDLWindow(i) == NULL) {
+		_PopBackWindow();
+		--i;
+	}
+}
+
+#endif /* __HAIKU__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/main/haiku/SDL_BeApp.h b/Source/3rd Party/sdl/src/main/haiku/SDL_BeApp.h
new file mode 100644
index 000000000..f4399c819
--- /dev/null
+++ b/Source/3rd Party/sdl/src/main/haiku/SDL_BeApp.h	
@@ -0,0 +1,40 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* Handle the BeApp specific portions of the application */
+
+/* Initialize the Be Application, if it's not already started */
+extern int SDL_InitBeApp(void);
+
+/* Quit the Be Application, if there's nothing left to do */
+extern void SDL_QuitBeApp(void);
+
+/* Flag to tell whether the app is active or not */
+extern int SDL_BeAppActive;
+/* vi: set ts=4 sw=4 expandtab: */
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/Source/3rd Party/sdl/src/main/psp/SDL_psp_main.c b/Source/3rd Party/sdl/src/main/psp/SDL_psp_main.c
new file mode 100644
index 000000000..d79135dbc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/main/psp/SDL_psp_main.c	
@@ -0,0 +1,63 @@
+/*
+    SDL_psp_main.c, placed in the public domain by Sam Lantinga  3/13/14
+*/
+
+#include "SDL_main.h"
+#include <pspkernel.h>
+#include <pspdebug.h>
+#include <pspsdk.h>
+#include <pspthreadman.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+/* If application's main() is redefined as SDL_main, and libSDLmain is
+   linked, then this file will create the standard exit callback,
+   define the PSP_MODULE_INFO macro, and exit back to the browser when
+   the program is finished.
+
+   You can still override other parameters in your own code if you
+   desire, such as PSP_HEAP_SIZE_KB, PSP_MAIN_THREAD_ATTR,
+   PSP_MAIN_THREAD_STACK_SIZE, etc.
+*/
+
+PSP_MODULE_INFO("SDL App", 0, 1, 1);
+
+int sdl_psp_exit_callback(int arg1, int arg2, void *common)
+{
+    exit(0);
+    return 0;
+}
+
+int sdl_psp_callback_thread(SceSize args, void *argp)
+{
+    int cbid;
+    cbid = sceKernelCreateCallback("Exit Callback",
+                       sdl_psp_exit_callback, NULL);
+    sceKernelRegisterExitCallback(cbid);
+    sceKernelSleepThreadCB();
+    return 0;
+}
+
+int sdl_psp_setup_callbacks(void)
+{
+    int thid = 0;
+    thid = sceKernelCreateThread("update_thread",
+                     sdl_psp_callback_thread, 0x11, 0xFA0, 0, 0);
+    if(thid >= 0)
+        sceKernelStartThread(thid, 0, 0);
+    return thid;
+}
+
+int main(int argc, char *argv[])
+{
+    pspDebugScreenInit();
+    sdl_psp_setup_callbacks();
+
+    /* Register sceKernelExitGame() to be called when we exit */
+    atexit(sceKernelExitGame);
+
+    SDL_SetMainReady();
+
+    (void)SDL_main(argc, argv);
+    return 0;
+}
diff --git a/Source/3rd Party/sdl/src/main/windows/SDL_windows_main.c b/Source/3rd Party/sdl/src/main/windows/SDL_windows_main.c
new file mode 100644
index 000000000..8c8ccab6b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/main/windows/SDL_windows_main.c	
@@ -0,0 +1,189 @@
+/*
+    SDL_windows_main.c, placed in the public domain by Sam Lantinga  4/13/98
+
+    The WinMain function -- calls your program's main() function
+*/
+#include "SDL_config.h"
+
+#ifdef __WIN32__
+
+/* Include this so we define UNICODE properly */
+#include "../../core/windows/SDL_windows.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/* Include the SDL main definition header */
+#include "SDL.h"
+#include "SDL_main.h"
+
+#ifdef main
+#  undef main
+#endif /* main */
+
+static void
+UnEscapeQuotes(char *arg)
+{
+    char *last = NULL;
+
+    while (*arg) {
+        if (*arg == '"' && (last != NULL && *last == '\\')) {
+            char *c_curr = arg;
+            char *c_last = last;
+
+            while (*c_curr) {
+                *c_last = *c_curr;
+                c_last = c_curr;
+                c_curr++;
+            }
+            *c_last = '\0';
+        }
+        last = arg;
+        arg++;
+    }
+}
+
+/* Parse a command line buffer into arguments */
+static int
+ParseCommandLine(char *cmdline, char **argv)
+{
+    char *bufp;
+    char *lastp = NULL;
+    int argc, last_argc;
+
+    argc = last_argc = 0;
+    for (bufp = cmdline; *bufp;) {
+        /* Skip leading whitespace */
+        while (SDL_isspace(*bufp)) {
+            ++bufp;
+        }
+        /* Skip over argument */
+        if (*bufp == '"') {
+            ++bufp;
+            if (*bufp) {
+                if (argv) {
+                    argv[argc] = bufp;
+                }
+                ++argc;
+            }
+            /* Skip over word */
+            lastp = bufp;
+            while (*bufp && (*bufp != '"' || *lastp == '\\')) {
+                lastp = bufp;
+                ++bufp;
+            }
+        } else {
+            if (*bufp) {
+                if (argv) {
+                    argv[argc] = bufp;
+                }
+                ++argc;
+            }
+            /* Skip over word */
+            while (*bufp && !SDL_isspace(*bufp)) {
+                ++bufp;
+            }
+        }
+        if (*bufp) {
+            if (argv) {
+                *bufp = '\0';
+            }
+            ++bufp;
+        }
+
+        /* Strip out \ from \" sequences */
+        if (argv && last_argc != argc) {
+            UnEscapeQuotes(argv[last_argc]);
+        }
+        last_argc = argc;
+    }
+    if (argv) {
+        argv[argc] = NULL;
+    }
+    return (argc);
+}
+
+/* Show an error message */
+static void
+ShowError(const char *title, const char *message)
+{
+/* If USE_MESSAGEBOX is defined, you need to link with user32.lib */
+#ifdef USE_MESSAGEBOX
+    MessageBox(NULL, message, title, MB_ICONEXCLAMATION | MB_OK);
+#else
+    fprintf(stderr, "%s: %s\n", title, message);
+#endif
+}
+
+/* Pop up an out of memory message, returns to Windows */
+static BOOL
+OutOfMemory(void)
+{
+    ShowError("Fatal Error", "Out of memory - aborting");
+    return FALSE;
+}
+
+#if defined(_MSC_VER)
+/* The VC++ compiler needs main defined */
+#define console_main main
+#endif
+
+/* This is where execution begins [console apps] */
+int
+console_main(int argc, char *argv[])
+{
+    int status;
+
+    SDL_SetMainReady();
+
+    /* Run the application main() code */
+    status = SDL_main(argc, argv);
+
+    /* Exit cleanly, calling atexit() functions */
+    exit(status);
+
+    /* Hush little compiler, don't you cry... */
+    return 0;
+}
+
+/* This is where execution begins [windowed apps] */
+int WINAPI
+WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
+{
+    char **argv;
+    int argc;
+    char *cmdline;
+
+    /* Grab the command line */
+    TCHAR *text = GetCommandLine();
+#if UNICODE
+    cmdline = SDL_iconv_string("UTF-8", "UCS-2-INTERNAL", (char *)(text), (SDL_wcslen(text)+1)*sizeof(WCHAR));
+#else
+    cmdline = SDL_strdup(text);
+#endif
+    if (cmdline == NULL) {
+        return OutOfMemory();
+    }
+
+    /* Parse it into argv and argc */
+    argc = ParseCommandLine(cmdline, NULL);
+    argv = SDL_stack_alloc(char *, argc + 1);
+    if (argv == NULL) {
+        return OutOfMemory();
+    }
+    ParseCommandLine(cmdline, argv);
+
+    /* Run the main program */
+    console_main(argc, argv);
+
+    SDL_stack_free(argv);
+
+    SDL_free(cmdline);
+
+    /* Hush little compiler, don't you cry... */
+    return 0;
+}
+
+#endif /* __WIN32__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/main/windows/version.rc b/Source/3rd Party/sdl/src/main/windows/version.rc
new file mode 100644
index 000000000..129221029
--- /dev/null
+++ b/Source/3rd Party/sdl/src/main/windows/version.rc	
@@ -0,0 +1,38 @@
+
+#include "winresrc.h"
+
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 2,0,3,0
+ PRODUCTVERSION 2,0,3,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "\0"
+            VALUE "FileDescription", "SDL\0"
+            VALUE "FileVersion", "2, 0, 3, 0\0"
+            VALUE "InternalName", "SDL\0"
+            VALUE "LegalCopyright", "Copyright � 2014 Sam Lantinga\0"
+            VALUE "OriginalFilename", "SDL2.dll\0"
+            VALUE "ProductName", "Simple DirectMedia Layer\0"
+            VALUE "ProductVersion", "2, 0, 3, 0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/Source/3rd Party/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp b/Source/3rd Party/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp
new file mode 100644
index 000000000..ce5e82473
--- /dev/null
+++ b/Source/3rd Party/sdl/src/main/winrt/SDL_winrt_main_NonXAML.cpp	
@@ -0,0 +1,59 @@
+/*
+    SDL_winrt_main_NonXAML.cpp, placed in the public domain by David Ludwig  3/13/14
+*/
+
+#include "SDL_main.h"
+#include <wrl.h>
+
+/* At least one file in any SDL/WinRT app appears to require compilation
+   with C++/CX, otherwise a Windows Metadata file won't get created, and
+   an APPX0702 build error can appear shortly after linking.
+
+   The following set of preprocessor code forces this file to be compiled
+   as C++/CX, which appears to cause Visual C++ 2012's build tools to
+   create this .winmd file, and will help allow builds of SDL/WinRT apps
+   to proceed without error.
+
+   If other files in an app's project enable C++/CX compilation, then it might
+   be possible for SDL_winrt_main_NonXAML.cpp to be compiled without /ZW,
+   for Visual C++'s build tools to create a winmd file, and for the app to
+   build without APPX0702 errors.  In this case, if
+   SDL_WINRT_METADATA_FILE_AVAILABLE is defined as a C/C++ macro, then
+   the #error (to force C++/CX compilation) will be disabled.
+
+   Please note that /ZW can be specified on a file-by-file basis.  To do this,
+   right click on the file in Visual C++, click Properties, then change the
+   setting through the dialog that comes up.
+*/
+#ifndef SDL_WINRT_METADATA_FILE_AVAILABLE
+#ifndef __cplusplus_winrt
+#error SDL_winrt_main_NonXAML.cpp must be compiled with /ZW, otherwise build errors due to missing .winmd files can occur.
+#endif
+#endif
+
+/* Prevent MSVC++ from warning about threading models when defining our
+   custom WinMain.  The threading model will instead be set via a direct
+   call to Windows::Foundation::Initialize (rather than via an attributed
+   function).
+
+   To note, this warning (C4447) does not seem to come up unless this file
+   is compiled with C++/CX enabled (via the /ZW compiler flag).
+*/
+#ifdef _MSC_VER
+#pragma warning(disable:4447)
+#endif
+
+/* Make sure the function to initialize the Windows Runtime gets linked in. */
+#ifdef _MSC_VER
+#pragma comment(lib, "runtimeobject.lib")
+#endif
+
+int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+    if (FAILED(Windows::Foundation::Initialize(RO_INIT_MULTITHREADED))) {
+        return 1;
+    }
+
+    SDL_WinRTRunApp(SDL_main, NULL);
+    return 0;
+}
diff --git a/Source/3rd Party/sdl/src/power/SDL_power.c b/Source/3rd Party/sdl/src/power/SDL_power.c
new file mode 100644
index 000000000..10f8355f4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/SDL_power.c	
@@ -0,0 +1,120 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+#include "SDL_power.h"
+
+/*
+ * Returns SDL_TRUE if we have a definitive answer.
+ * SDL_FALSE to try next implementation.
+ */
+typedef SDL_bool
+    (*SDL_GetPowerInfo_Impl) (SDL_PowerState * state, int *seconds,
+                              int *percent);
+
+SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *, int *, int *);
+SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *, int *, int *);
+SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState *, int *, int *);
+SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState *, int *, int *);
+SDL_bool SDL_GetPowerInfo_Haiku(SDL_PowerState *, int *, int *);
+SDL_bool SDL_GetPowerInfo_UIKit(SDL_PowerState *, int *, int *);
+SDL_bool SDL_GetPowerInfo_Android(SDL_PowerState *, int *, int *);
+SDL_bool SDL_GetPowerInfo_PSP(SDL_PowerState *, int *, int *);
+SDL_bool SDL_GetPowerInfo_WinRT(SDL_PowerState *, int *, int *);
+
+#ifndef SDL_POWER_DISABLED
+#ifdef SDL_POWER_HARDWIRED
+/* This is for things that _never_ have a battery */
+static SDL_bool
+SDL_GetPowerInfo_Hardwired(SDL_PowerState * state, int *seconds, int *percent)
+{
+    *seconds = -1;
+    *percent = -1;
+    *state = SDL_POWERSTATE_NO_BATTERY;
+    return SDL_TRUE;
+}
+#endif
+#endif
+
+
+static SDL_GetPowerInfo_Impl implementations[] = {
+#ifndef SDL_POWER_DISABLED
+#ifdef SDL_POWER_LINUX          /* in order of preference. More than could work. */
+    SDL_GetPowerInfo_Linux_proc_acpi,
+    SDL_GetPowerInfo_Linux_proc_apm,
+#endif
+#ifdef SDL_POWER_WINDOWS        /* handles Win32, Win64, PocketPC. */
+    SDL_GetPowerInfo_Windows,
+#endif
+#ifdef SDL_POWER_UIKIT          /* handles iPhone/iPad/etc */
+    SDL_GetPowerInfo_UIKit,
+#endif
+#ifdef SDL_POWER_MACOSX         /* handles Mac OS X, Darwin. */
+    SDL_GetPowerInfo_MacOSX,
+#endif
+#ifdef SDL_POWER_HAIKU          /* with BeOS euc.jp apm driver. Does this work on Haiku? */
+    SDL_GetPowerInfo_Haiku,
+#endif
+#ifdef SDL_POWER_ANDROID        /* handles Android. */
+    SDL_GetPowerInfo_Android,
+#endif
+#ifdef SDL_POWER_PSP        /* handles PSP. */
+    SDL_GetPowerInfo_PSP,
+#endif
+#ifdef SDL_POWER_WINRT          /* handles WinRT */
+    SDL_GetPowerInfo_WinRT,
+#endif
+
+#ifdef SDL_POWER_HARDWIRED
+    SDL_GetPowerInfo_Hardwired,
+#endif
+#endif
+};
+
+SDL_PowerState
+SDL_GetPowerInfo(int *seconds, int *percent)
+{
+    const int total = sizeof(implementations) / sizeof(implementations[0]);
+    int _seconds, _percent;
+    SDL_PowerState retval;
+    int i;
+
+    /* Make these never NULL for platform-specific implementations. */
+    if (seconds == NULL) {
+        seconds = &_seconds;
+    }
+
+    if (percent == NULL) {
+        percent = &_percent;
+    }
+
+    for (i = 0; i < total; i++) {
+        if (implementations[i] (&retval, seconds, percent)) {
+            return retval;
+        }
+    }
+
+    /* nothing was definitive. */
+    *seconds = -1;
+    *percent = -1;
+    return SDL_POWERSTATE_UNKNOWN;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/power/android/SDL_syspower.c b/Source/3rd Party/sdl/src/power/android/SDL_syspower.c
new file mode 100644
index 000000000..e363731d3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/android/SDL_syspower.c	
@@ -0,0 +1,63 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef SDL_POWER_DISABLED
+#if SDL_POWER_ANDROID
+
+#include "SDL_power.h"
+
+#include "../../core/android/SDL_android.h"
+
+SDL_bool
+SDL_GetPowerInfo_Android(SDL_PowerState * state, int *seconds, int *percent)
+{
+    int battery;
+    int plugged;
+    int charged;
+
+    if (Android_JNI_GetPowerInfo(&plugged, &charged, &battery, seconds, percent) != -1) {
+        if (plugged) {
+            if (charged) {
+                *state = SDL_POWERSTATE_CHARGED;
+            } else if (battery) {
+                *state = SDL_POWERSTATE_CHARGING;
+            } else {
+                *state = SDL_POWERSTATE_NO_BATTERY;
+                *seconds = -1;
+                *percent = -1;
+            }
+        } else {
+            *state = SDL_POWERSTATE_ON_BATTERY;
+        }
+    } else {
+        *state = SDL_POWERSTATE_UNKNOWN;
+        *seconds = -1;
+        *percent = -1;
+    }
+
+    return SDL_TRUE;
+}
+
+#endif /* SDL_POWER_ANDROID */
+#endif /* SDL_POWER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/power/haiku/SDL_syspower.c b/Source/3rd Party/sdl/src/power/haiku/SDL_syspower.c
new file mode 100644
index 000000000..aaf61e8b7
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/haiku/SDL_syspower.c	
@@ -0,0 +1,126 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* !!! FIXME: does this thing even work on Haiku? */
+#ifndef SDL_POWER_DISABLED
+#if SDL_POWER_HAIKU
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <drivers/Drivers.h>
+
+/* These values are from apm.h ... */
+#define APM_DEVICE_PATH "/dev/misc/apm"
+#define APM_FUNC_OFFSET 0x5300
+#define APM_FUNC_GET_POWER_STATUS 10
+#define APM_DEVICE_ALL 1
+#define APM_BIOS_CALL (B_DEVICE_OP_CODES_END + 3)
+
+#include "SDL_power.h"
+
+SDL_bool
+SDL_GetPowerInfo_Haiku(SDL_PowerState * state, int *seconds, int *percent)
+{
+    const int fd = open("/dev/misc/apm", O_RDONLY);
+    SDL_bool need_details = SDL_FALSE;
+    uint16 regs[6];
+    uint8 ac_status;
+    uint8 battery_status;
+    uint8 battery_flags;
+    uint8 battery_life;
+    uint32 battery_time;
+    int rc;
+
+    if (fd == -1) {
+        return SDL_FALSE;       /* maybe some other method will work? */
+    }
+
+    memset(regs, '\0', sizeof(regs));
+    regs[0] = APM_FUNC_OFFSET + APM_FUNC_GET_POWER_STATUS;
+    regs[1] = APM_DEVICE_ALL;
+    rc = ioctl(fd, APM_BIOS_CALL, regs);
+    close(fd);
+
+    if (rc < 0) {
+        return SDL_FALSE;
+    }
+
+    ac_status = regs[1] >> 8;
+    battery_status = regs[1] & 0xFF;
+    battery_flags = regs[2] >> 8;
+    battery_life = regs[2] & 0xFF;
+    battery_time = (uint32) regs[3];
+
+    /* in theory, _something_ should be set in battery_flags, right? */
+    if (battery_flags == 0x00) {        /* older APM BIOS? Less fields. */
+        battery_time = 0xFFFF;
+        if (battery_status == 0xFF) {
+            battery_flags = 0xFF;
+        } else {
+            battery_flags = (1 << battery_status);
+        }
+    }
+
+    if ((battery_time != 0xFFFF) && (battery_time & (1 << 15))) {
+        /* time is in minutes, not seconds */
+        battery_time = (battery_time & 0x7FFF) * 60;
+    }
+
+    if (battery_flags == 0xFF) {        /* unknown state */
+        *state = SDL_POWERSTATE_UNKNOWN;
+    } else if (battery_flags & (1 << 7)) {      /* no battery */
+        *state = SDL_POWERSTATE_NO_BATTERY;
+    } else if (battery_flags & (1 << 3)) {      /* charging */
+        *state = SDL_POWERSTATE_CHARGING;
+        need_details = SDL_TRUE;
+    } else if (ac_status == 1) {
+        *state = SDL_POWERSTATE_CHARGED;        /* on AC, not charging. */
+        need_details = SDL_TRUE;
+    } else {
+        *state = SDL_POWERSTATE_ON_BATTERY;     /* not on AC. */
+        need_details = SDL_TRUE;
+    }
+
+    *percent = -1;
+    *seconds = -1;
+    if (need_details) {
+        const int pct = (int) battery_life;
+        const int secs = (int) battery_time;
+
+        if (pct != 255) {       /* 255 == unknown */
+            *percent = (pct > 100) ? 100 : pct; /* clamp between 0%, 100% */
+        }
+        if (secs != 0xFFFF) {   /* 0xFFFF == unknown */
+            *seconds = secs;
+        }
+    }
+
+    return SDL_TRUE;            /* the definitive answer if APM driver replied. */
+}
+
+#endif /* SDL_POWER_HAIKU */
+#endif /* SDL_POWER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/power/linux/SDL_syspower.c b/Source/3rd Party/sdl/src/power/linux/SDL_syspower.c
new file mode 100644
index 000000000..05eb200b4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/linux/SDL_syspower.c	
@@ -0,0 +1,429 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef SDL_POWER_DISABLED
+#if SDL_POWER_LINUX
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <fcntl.h>
+
+#include "SDL_power.h"
+
+static const char *proc_apm_path = "/proc/apm";
+static const char *proc_acpi_battery_path = "/proc/acpi/battery";
+static const char *proc_acpi_ac_adapter_path = "/proc/acpi/ac_adapter";
+
+static int open_acpi_file(const char *base, const char *node, const char *key)
+{
+    const size_t pathlen = strlen(base) + strlen(node) + strlen(key) + 3;
+    char *path = (char *) alloca(pathlen);
+    if (path == NULL) {
+        return -1;  /* oh well. */
+    }
+
+    snprintf(path, pathlen, "%s/%s/%s", base, node, key);
+    return open(path, O_RDONLY);
+}
+
+
+static SDL_bool
+load_acpi_file(const char *base, const char *node, const char *key,
+               char *buf, size_t buflen)
+{
+    ssize_t br = 0;
+    const int fd = open_acpi_file(base, node, key);
+    if (fd == -1) {
+        return SDL_FALSE;
+    }
+    br = read(fd, buf, buflen-1);
+    close(fd);
+    if (br < 0) {
+        return SDL_FALSE;
+    }
+    buf[br] = '\0';             /* null-terminate the string. */
+    return SDL_TRUE;
+}
+
+
+static SDL_bool
+make_proc_acpi_key_val(char **_ptr, char **_key, char **_val)
+{
+    char *ptr = *_ptr;
+
+    while (*ptr == ' ') {
+        ptr++;  /* skip whitespace. */
+    }
+
+    if (*ptr == '\0') {
+        return SDL_FALSE;  /* EOF. */
+    }
+
+    *_key = ptr;
+
+    while ((*ptr != ':') && (*ptr != '\0')) {
+        ptr++;
+    }
+
+    if (*ptr == '\0') {
+        return SDL_FALSE;  /* (unexpected) EOF. */
+    }
+
+    *(ptr++) = '\0';  /* terminate the key. */
+
+    while ((*ptr == ' ') && (*ptr != '\0')) {
+        ptr++;  /* skip whitespace. */
+    }
+
+    if (*ptr == '\0') {
+        return SDL_FALSE;  /* (unexpected) EOF. */
+    }
+
+    *_val = ptr;
+
+    while ((*ptr != '\n') && (*ptr != '\0')) {
+        ptr++;
+    }
+
+    if (*ptr != '\0') {
+        *(ptr++) = '\0';  /* terminate the value. */
+    }
+
+    *_ptr = ptr;  /* store for next time. */
+    return SDL_TRUE;
+}
+
+static void
+check_proc_acpi_battery(const char * node, SDL_bool * have_battery,
+                        SDL_bool * charging, int *seconds, int *percent)
+{
+    const char *base = proc_acpi_battery_path;
+    char info[1024];
+    char state[1024];
+    char *ptr = NULL;
+    char *key = NULL;
+    char *val = NULL;
+    SDL_bool charge = SDL_FALSE;
+    SDL_bool choose = SDL_FALSE;
+    int maximum = -1;
+    int remaining = -1;
+    int secs = -1;
+    int pct = -1;
+
+    if (!load_acpi_file(base, node, "state", state, sizeof (state))) {
+        return;
+    } else if (!load_acpi_file(base, node, "info", info, sizeof (info))) {
+        return;
+    }
+
+    ptr = &state[0];
+    while (make_proc_acpi_key_val(&ptr, &key, &val)) {
+        if (strcmp(key, "present") == 0) {
+            if (strcmp(val, "yes") == 0) {
+                *have_battery = SDL_TRUE;
+            }
+        } else if (strcmp(key, "charging state") == 0) {
+            /* !!! FIXME: what exactly _does_ charging/discharging mean? */
+            if (strcmp(val, "charging/discharging") == 0) {
+                charge = SDL_TRUE;
+            } else if (strcmp(val, "charging") == 0) {
+                charge = SDL_TRUE;
+            }
+        } else if (strcmp(key, "remaining capacity") == 0) {
+            char *endptr = NULL;
+            const int cvt = (int) strtol(val, &endptr, 10);
+            if (*endptr == ' ') {
+                remaining = cvt;
+            }
+        }
+    }
+
+    ptr = &info[0];
+    while (make_proc_acpi_key_val(&ptr, &key, &val)) {
+        if (strcmp(key, "design capacity") == 0) {
+            char *endptr = NULL;
+            const int cvt = (int) strtol(val, &endptr, 10);
+            if (*endptr == ' ') {
+                maximum = cvt;
+            }
+        }
+    }
+
+    if ((maximum >= 0) && (remaining >= 0)) {
+        pct = (int) ((((float) remaining) / ((float) maximum)) * 100.0f);
+        if (pct < 0) {
+            pct = 0;
+        } else if (pct > 100) {
+            pct = 100;
+        }
+    }
+
+    /* !!! FIXME: calculate (secs). */
+
+    /*
+     * We pick the battery that claims to have the most minutes left.
+     *  (failing a report of minutes, we'll take the highest percent.)
+     */
+    if ((secs < 0) && (*seconds < 0)) {
+        if ((pct < 0) && (*percent < 0)) {
+            choose = SDL_TRUE;  /* at least we know there's a battery. */
+        }
+        if (pct > *percent) {
+            choose = SDL_TRUE;
+        }
+    } else if (secs > *seconds) {
+        choose = SDL_TRUE;
+    }
+
+    if (choose) {
+        *seconds = secs;
+        *percent = pct;
+        *charging = charge;
+    }
+}
+
+static void
+check_proc_acpi_ac_adapter(const char * node, SDL_bool * have_ac)
+{
+    const char *base = proc_acpi_ac_adapter_path;
+    char state[256];
+    char *ptr = NULL;
+    char *key = NULL;
+    char *val = NULL;
+
+    if (!load_acpi_file(base, node, "state", state, sizeof (state))) {
+        return;
+    }
+
+    ptr = &state[0];
+    while (make_proc_acpi_key_val(&ptr, &key, &val)) {
+        if (strcmp(key, "state") == 0) {
+            if (strcmp(val, "on-line") == 0) {
+                *have_ac = SDL_TRUE;
+            }
+        }
+    }
+}
+
+
+SDL_bool
+SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState * state,
+                                 int *seconds, int *percent)
+{
+    struct dirent *dent = NULL;
+    DIR *dirp = NULL;
+    SDL_bool have_battery = SDL_FALSE;
+    SDL_bool have_ac = SDL_FALSE;
+    SDL_bool charging = SDL_FALSE;
+
+    *seconds = -1;
+    *percent = -1;
+    *state = SDL_POWERSTATE_UNKNOWN;
+
+    dirp = opendir(proc_acpi_battery_path);
+    if (dirp == NULL) {
+        return SDL_FALSE;  /* can't use this interface. */
+    } else {
+        while ((dent = readdir(dirp)) != NULL) {
+            const char *node = dent->d_name;
+            check_proc_acpi_battery(node, &have_battery, &charging,
+                                    seconds, percent);
+        }
+        closedir(dirp);
+    }
+
+    dirp = opendir(proc_acpi_ac_adapter_path);
+    if (dirp == NULL) {
+        return SDL_FALSE;  /* can't use this interface. */
+    } else {
+        while ((dent = readdir(dirp)) != NULL) {
+            const char *node = dent->d_name;
+            check_proc_acpi_ac_adapter(node, &have_ac);
+        }
+        closedir(dirp);
+    }
+
+    if (!have_battery) {
+        *state = SDL_POWERSTATE_NO_BATTERY;
+    } else if (charging) {
+        *state = SDL_POWERSTATE_CHARGING;
+    } else if (have_ac) {
+        *state = SDL_POWERSTATE_CHARGED;
+    } else {
+        *state = SDL_POWERSTATE_ON_BATTERY;
+    }
+
+    return SDL_TRUE;   /* definitive answer. */
+}
+
+
+static SDL_bool
+next_string(char **_ptr, char **_str)
+{
+    char *ptr = *_ptr;
+    char *str = *_str;
+
+    while (*ptr == ' ') {       /* skip any spaces... */
+        ptr++;
+    }
+
+    if (*ptr == '\0') {
+        return SDL_FALSE;
+    }
+
+    str = ptr;
+    while ((*ptr != ' ') && (*ptr != '\n') && (*ptr != '\0'))
+        ptr++;
+
+    if (*ptr != '\0')
+        *(ptr++) = '\0';
+
+    *_str = str;
+    *_ptr = ptr;
+    return SDL_TRUE;
+}
+
+static SDL_bool
+int_string(char *str, int *val)
+{
+    char *endptr = NULL;
+    *val = (int) strtol(str, &endptr, 0);
+    return ((*str != '\0') && (*endptr == '\0'));
+}
+
+/* http://lxr.linux.no/linux+v2.6.29/drivers/char/apm-emulation.c */
+SDL_bool
+SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState * state,
+                                int *seconds, int *percent)
+{
+    SDL_bool need_details = SDL_FALSE;
+    int ac_status = 0;
+    int battery_status = 0;
+    int battery_flag = 0;
+    int battery_percent = 0;
+    int battery_time = 0;
+    const int fd = open(proc_apm_path, O_RDONLY);
+    char buf[128];
+    char *ptr = &buf[0];
+    char *str = NULL;
+    ssize_t br;
+
+    if (fd == -1) {
+        return SDL_FALSE;       /* can't use this interface. */
+    }
+
+    br = read(fd, buf, sizeof (buf) - 1);
+    close(fd);
+
+    if (br < 0) {
+        return SDL_FALSE;
+    }
+
+    buf[br] = '\0';             /* null-terminate the string. */
+    if (!next_string(&ptr, &str)) {     /* driver version */
+        return SDL_FALSE;
+    }
+    if (!next_string(&ptr, &str)) {     /* BIOS version */
+        return SDL_FALSE;
+    }
+    if (!next_string(&ptr, &str)) {     /* APM flags */
+        return SDL_FALSE;
+    }
+
+    if (!next_string(&ptr, &str)) {     /* AC line status */
+        return SDL_FALSE;
+    } else if (!int_string(str, &ac_status)) {
+        return SDL_FALSE;
+    }
+
+    if (!next_string(&ptr, &str)) {     /* battery status */
+        return SDL_FALSE;
+    } else if (!int_string(str, &battery_status)) {
+        return SDL_FALSE;
+    }
+    if (!next_string(&ptr, &str)) {     /* battery flag */
+        return SDL_FALSE;
+    } else if (!int_string(str, &battery_flag)) {
+        return SDL_FALSE;
+    }
+    if (!next_string(&ptr, &str)) {     /* remaining battery life percent */
+        return SDL_FALSE;
+    }
+    if (str[strlen(str) - 1] == '%') {
+        str[strlen(str) - 1] = '\0';
+    }
+    if (!int_string(str, &battery_percent)) {
+        return SDL_FALSE;
+    }
+
+    if (!next_string(&ptr, &str)) {     /* remaining battery life time */
+        return SDL_FALSE;
+    } else if (!int_string(str, &battery_time)) {
+        return SDL_FALSE;
+    }
+
+    if (!next_string(&ptr, &str)) {     /* remaining battery life time units */
+        return SDL_FALSE;
+    } else if (strcmp(str, "min") == 0) {
+        battery_time *= 60;
+    }
+
+    if (battery_flag == 0xFF) { /* unknown state */
+        *state = SDL_POWERSTATE_UNKNOWN;
+    } else if (battery_flag & (1 << 7)) {       /* no battery */
+        *state = SDL_POWERSTATE_NO_BATTERY;
+    } else if (battery_flag & (1 << 3)) {       /* charging */
+        *state = SDL_POWERSTATE_CHARGING;
+        need_details = SDL_TRUE;
+    } else if (ac_status == 1) {
+        *state = SDL_POWERSTATE_CHARGED;        /* on AC, not charging. */
+        need_details = SDL_TRUE;
+    } else {
+        *state = SDL_POWERSTATE_ON_BATTERY;
+        need_details = SDL_TRUE;
+    }
+
+    *percent = -1;
+    *seconds = -1;
+    if (need_details) {
+        const int pct = battery_percent;
+        const int secs = battery_time;
+
+        if (pct >= 0) {         /* -1 == unknown */
+            *percent = (pct > 100) ? 100 : pct; /* clamp between 0%, 100% */
+        }
+        if (secs >= 0) {        /* -1 == unknown */
+            *seconds = secs;
+        }
+    }
+
+    return SDL_TRUE;
+}
+
+#endif /* SDL_POWER_LINUX */
+#endif /* SDL_POWER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/power/macosx/SDL_syspower.c b/Source/3rd Party/sdl/src/power/macosx/SDL_syspower.c
new file mode 100644
index 000000000..9bcacafde
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/macosx/SDL_syspower.c	
@@ -0,0 +1,192 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef SDL_POWER_DISABLED
+#if SDL_POWER_MACOSX
+
+#include <Carbon/Carbon.h>
+#include <IOKit/ps/IOPowerSources.h>
+#include <IOKit/ps/IOPSKeys.h>
+
+#include "SDL_power.h"
+
+/* Carbon is so verbose... */
+#define STRMATCH(a,b) (CFStringCompare(a, b, 0) == kCFCompareEqualTo)
+#define GETVAL(k,v) \
+    CFDictionaryGetValueIfPresent(dict, CFSTR(k), (const void **) v)
+
+/* Note that AC power sources also include a laptop battery it is charging. */
+static void
+checkps(CFDictionaryRef dict, SDL_bool * have_ac, SDL_bool * have_battery,
+        SDL_bool * charging, int *seconds, int *percent)
+{
+    CFStringRef strval;         /* don't CFRelease() this. */
+    CFBooleanRef bval;
+    CFNumberRef numval;
+    SDL_bool charge = SDL_FALSE;
+    SDL_bool choose = SDL_FALSE;
+    SDL_bool is_ac = SDL_FALSE;
+    int secs = -1;
+    int maxpct = -1;
+    int pct = -1;
+
+    if ((GETVAL(kIOPSIsPresentKey, &bval)) && (bval == kCFBooleanFalse)) {
+        return;                 /* nothing to see here. */
+    }
+
+    if (!GETVAL(kIOPSPowerSourceStateKey, &strval)) {
+        return;
+    }
+
+    if (STRMATCH(strval, CFSTR(kIOPSACPowerValue))) {
+        is_ac = *have_ac = SDL_TRUE;
+    } else if (!STRMATCH(strval, CFSTR(kIOPSBatteryPowerValue))) {
+        return;                 /* not a battery? */
+    }
+
+    if ((GETVAL(kIOPSIsChargingKey, &bval)) && (bval == kCFBooleanTrue)) {
+        charge = SDL_TRUE;
+    }
+
+    if (GETVAL(kIOPSMaxCapacityKey, &numval)) {
+        SInt32 val = -1;
+        CFNumberGetValue(numval, kCFNumberSInt32Type, &val);
+        if (val > 0) {
+            *have_battery = SDL_TRUE;
+            maxpct = (int) val;
+        }
+    }
+
+    if (GETVAL(kIOPSMaxCapacityKey, &numval)) {
+        SInt32 val = -1;
+        CFNumberGetValue(numval, kCFNumberSInt32Type, &val);
+        if (val > 0) {
+            *have_battery = SDL_TRUE;
+            maxpct = (int) val;
+        }
+    }
+
+    if (GETVAL(kIOPSTimeToEmptyKey, &numval)) {
+        SInt32 val = -1;
+        CFNumberGetValue(numval, kCFNumberSInt32Type, &val);
+
+        /* Mac OS X reports 0 minutes until empty if you're plugged in. :( */
+        if ((val == 0) && (is_ac)) {
+            val = -1;           /* !!! FIXME: calc from timeToFull and capacity? */
+        }
+
+        secs = (int) val;
+        if (secs > 0) {
+            secs *= 60;         /* value is in minutes, so convert to seconds. */
+        }
+    }
+
+    if (GETVAL(kIOPSCurrentCapacityKey, &numval)) {
+        SInt32 val = -1;
+        CFNumberGetValue(numval, kCFNumberSInt32Type, &val);
+        pct = (int) val;
+    }
+
+    if ((pct > 0) && (maxpct > 0)) {
+        pct = (int) ((((double) pct) / ((double) maxpct)) * 100.0);
+    }
+
+    if (pct > 100) {
+        pct = 100;
+    }
+
+    /*
+     * We pick the battery that claims to have the most minutes left.
+     *  (failing a report of minutes, we'll take the highest percent.)
+     */
+    if ((secs < 0) && (*seconds < 0)) {
+        if ((pct < 0) && (*percent < 0)) {
+            choose = SDL_TRUE;  /* at least we know there's a battery. */
+        }
+        if (pct > *percent) {
+            choose = SDL_TRUE;
+        }
+    } else if (secs > *seconds) {
+        choose = SDL_TRUE;
+    }
+
+    if (choose) {
+        *seconds = secs;
+        *percent = pct;
+        *charging = charge;
+    }
+}
+
+#undef GETVAL
+#undef STRMATCH
+
+
+SDL_bool
+SDL_GetPowerInfo_MacOSX(SDL_PowerState * state, int *seconds, int *percent)
+{
+    CFTypeRef blob = IOPSCopyPowerSourcesInfo();
+
+    *seconds = -1;
+    *percent = -1;
+    *state = SDL_POWERSTATE_UNKNOWN;
+
+    if (blob != NULL) {
+        CFArrayRef list = IOPSCopyPowerSourcesList(blob);
+        if (list != NULL) {
+            /* don't CFRelease() the list items, or dictionaries! */
+            SDL_bool have_ac = SDL_FALSE;
+            SDL_bool have_battery = SDL_FALSE;
+            SDL_bool charging = SDL_FALSE;
+            const CFIndex total = CFArrayGetCount(list);
+            CFIndex i;
+            for (i = 0; i < total; i++) {
+                CFTypeRef ps = (CFTypeRef) CFArrayGetValueAtIndex(list, i);
+                CFDictionaryRef dict =
+                    IOPSGetPowerSourceDescription(blob, ps);
+                if (dict != NULL) {
+                    checkps(dict, &have_ac, &have_battery, &charging,
+                            seconds, percent);
+                }
+            }
+
+            if (!have_battery) {
+                *state = SDL_POWERSTATE_NO_BATTERY;
+            } else if (charging) {
+                *state = SDL_POWERSTATE_CHARGING;
+            } else if (have_ac) {
+                *state = SDL_POWERSTATE_CHARGED;
+            } else {
+                *state = SDL_POWERSTATE_ON_BATTERY;
+            }
+
+            CFRelease(list);
+        }
+        CFRelease(blob);
+    }
+
+    return SDL_TRUE;            /* always the definitive answer on Mac OS X. */
+}
+
+#endif /* SDL_POWER_MACOSX */
+#endif /* SDL_POWER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/power/psp/SDL_syspower.c b/Source/3rd Party/sdl/src/power/psp/SDL_syspower.c
new file mode 100644
index 000000000..b28a68cfc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/psp/SDL_syspower.c	
@@ -0,0 +1,68 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef SDL_POWER_DISABLED
+#if SDL_POWER_PSP
+
+#include "SDL_power.h"
+#include <psppower.h>
+
+
+SDL_bool
+SDL_GetPowerInfo_PSP(SDL_PowerState * state, int *seconds,
+                            int *percent)
+{
+    int battery = scePowerIsBatteryExist();
+    int plugged = scePowerIsPowerOnline();
+    int charging = scePowerIsBatteryCharging();
+
+    *state = SDL_POWERSTATE_UNKNOWN;
+    *seconds = -1;
+    *percent = -1;
+
+    if (!battery) {
+        *state = SDL_POWERSTATE_NO_BATTERY;
+        *seconds = -1;
+        *percent = -1;
+    } else if (charging) {
+        *state = SDL_POWERSTATE_CHARGING;
+        *percent = scePowerGetBatteryLifePercent();
+        *seconds = scePowerGetBatteryLifeTime()*60;
+    } else if (plugged) {
+        *state = SDL_POWERSTATE_CHARGED;
+        *percent = scePowerGetBatteryLifePercent();
+        *seconds = scePowerGetBatteryLifeTime()*60;
+    } else {
+        *state = SDL_POWERSTATE_ON_BATTERY;
+        *percent = scePowerGetBatteryLifePercent();
+        *seconds = scePowerGetBatteryLifeTime()*60;
+    }
+
+
+    return SDL_TRUE;            /* always the definitive answer on PSP. */
+}
+
+#endif /* SDL_POWER_PSP */
+#endif /* SDL_POWER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/power/uikit/SDL_syspower.h b/Source/3rd Party/sdl/src/power/uikit/SDL_syspower.h
new file mode 100644
index 000000000..581c358df
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/uikit/SDL_syspower.h	
@@ -0,0 +1,32 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_POWER_UIKIT
+
+#include "SDL_power.h"
+
+void SDL_UIKit_UpdateBatteryMonitoring(void);
+SDL_bool SDL_GetPowerInfo_UIKit(SDL_PowerState * state, int *seconds, int *percent);
+
+#endif /* SDL_POWER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/power/uikit/SDL_syspower.m b/Source/3rd Party/sdl/src/power/uikit/SDL_syspower.m
new file mode 100644
index 000000000..60c42745a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/uikit/SDL_syspower.m	
@@ -0,0 +1,97 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef SDL_POWER_DISABLED
+#if SDL_POWER_UIKIT
+
+#import <UIKit/UIKit.h>
+
+#include "SDL_power.h"
+#include "SDL_timer.h"
+#include "SDL_assert.h"
+#include "SDL_syspower.h"
+
+/* turn off the battery monitor if it's been more than X ms since last check. */
+static const int BATTERY_MONITORING_TIMEOUT = 3000;
+static Uint32 SDL_UIKitLastPowerInfoQuery = 0;
+
+void
+SDL_UIKit_UpdateBatteryMonitoring(void)
+{
+    if (SDL_UIKitLastPowerInfoQuery) {
+        if (SDL_TICKS_PASSED(SDL_GetTicks(), SDL_UIKitLastPowerInfoQuery + BATTERY_MONITORING_TIMEOUT)) {
+            UIDevice *uidev = [UIDevice currentDevice];
+            SDL_assert([uidev isBatteryMonitoringEnabled] == YES);
+            [uidev setBatteryMonitoringEnabled:NO];
+            SDL_UIKitLastPowerInfoQuery = 0;
+        }
+    }
+}
+
+SDL_bool
+SDL_GetPowerInfo_UIKit(SDL_PowerState * state, int *seconds, int *percent)
+{
+    UIDevice *uidev = [UIDevice currentDevice];
+
+    if (!SDL_UIKitLastPowerInfoQuery) {
+        SDL_assert([uidev isBatteryMonitoringEnabled] == NO);
+        [uidev setBatteryMonitoringEnabled:YES];
+    }
+
+    /* UIKit_GL_SwapWindow() (etc) will check this and disable the battery
+     *  monitoring if the app hasn't queried it in the last X seconds.
+     *  Apparently monitoring the battery burns battery life.  :)
+     *  Apple's docs say not to monitor the battery unless you need it.
+     */
+    SDL_UIKitLastPowerInfoQuery = SDL_GetTicks();
+
+    *seconds = -1;   /* no API to estimate this in UIKit. */
+
+    switch ([uidev batteryState])
+    {
+        case UIDeviceBatteryStateCharging:
+            *state = SDL_POWERSTATE_CHARGING;
+            break;
+
+        case UIDeviceBatteryStateFull:
+            *state = SDL_POWERSTATE_CHARGED;
+            break;
+
+        case UIDeviceBatteryStateUnplugged:
+            *state = SDL_POWERSTATE_ON_BATTERY;
+            break;
+
+        case UIDeviceBatteryStateUnknown:
+        default:
+            *state = SDL_POWERSTATE_UNKNOWN;
+            break;
+    }
+
+    const float level = [uidev batteryLevel];
+    *percent = ( (level < 0.0f) ? -1 : ((int) ((level * 100) + 0.5f)) );
+    return SDL_TRUE;            /* always the definitive answer on iOS. */
+}
+
+#endif /* SDL_POWER_UIKIT */
+#endif /* SDL_POWER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/power/windows/SDL_syspower.c b/Source/3rd Party/sdl/src/power/windows/SDL_syspower.c
new file mode 100644
index 000000000..0a247ba02
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/windows/SDL_syspower.c	
@@ -0,0 +1,76 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef SDL_POWER_DISABLED
+#if SDL_POWER_WINDOWS
+
+#include "../../core/windows/SDL_windows.h"
+
+#include "SDL_power.h"
+
+SDL_bool
+SDL_GetPowerInfo_Windows(SDL_PowerState * state, int *seconds, int *percent)
+{
+    SYSTEM_POWER_STATUS status;
+    SDL_bool need_details = SDL_FALSE;
+
+    /* This API should exist back to Win95. */
+    if (!GetSystemPowerStatus(&status))
+    {
+        /* !!! FIXME: push GetLastError() into SDL_GetError() */
+        *state = SDL_POWERSTATE_UNKNOWN;
+    } else if (status.BatteryFlag == 0xFF) {    /* unknown state */
+        *state = SDL_POWERSTATE_UNKNOWN;
+    } else if (status.BatteryFlag & (1 << 7)) { /* no battery */
+        *state = SDL_POWERSTATE_NO_BATTERY;
+    } else if (status.BatteryFlag & (1 << 3)) { /* charging */
+        *state = SDL_POWERSTATE_CHARGING;
+        need_details = SDL_TRUE;
+    } else if (status.ACLineStatus == 1) {
+        *state = SDL_POWERSTATE_CHARGED;        /* on AC, not charging. */
+        need_details = SDL_TRUE;
+    } else {
+        *state = SDL_POWERSTATE_ON_BATTERY;     /* not on AC. */
+        need_details = SDL_TRUE;
+    }
+
+    *percent = -1;
+    *seconds = -1;
+    if (need_details) {
+        const int pct = (int) status.BatteryLifePercent;
+        const int secs = (int) status.BatteryLifeTime;
+
+        if (pct != 255) {       /* 255 == unknown */
+            *percent = (pct > 100) ? 100 : pct; /* clamp between 0%, 100% */
+        }
+        if (secs != 0xFFFFFFFF) {       /* ((DWORD)-1) == unknown */
+            *seconds = secs;
+        }
+    }
+
+    return SDL_TRUE;            /* always the definitive answer on Windows. */
+}
+
+#endif /* SDL_POWER_WINDOWS */
+#endif /* SDL_POWER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/power/winrt/SDL_syspower.cpp b/Source/3rd Party/sdl/src/power/winrt/SDL_syspower.cpp
new file mode 100644
index 000000000..8804aec77
--- /dev/null
+++ b/Source/3rd Party/sdl/src/power/winrt/SDL_syspower.cpp	
@@ -0,0 +1,44 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef SDL_POWER_DISABLED
+#if SDL_POWER_WINRT
+
+#include "SDL_power.h"
+
+extern "C"
+SDL_bool
+SDL_GetPowerInfo_WinRT(SDL_PowerState * state, int *seconds, int *percent)
+{
+    /* TODO, WinRT: Battery info is available on at least one WinRT platform (Windows Phone 8).  Implement SDL_GetPowerInfo_WinRT as appropriate. */
+    /* Notes:
+         - the Win32 function, GetSystemPowerStatus, is not available for use on WinRT
+         - Windows Phone 8 has a 'Battery' class, which is documented as available for C++
+             - More info on WP8's Battery class can be found at http://msdn.microsoft.com/library/windowsphone/develop/jj207231
+    */
+    return SDL_FALSE;
+}
+
+#endif /* SDL_POWER_WINRT */
+#endif /* SDL_POWER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/SDL_d3dmath.c b/Source/3rd Party/sdl/src/render/SDL_d3dmath.c
new file mode 100644
index 000000000..df1dc0ba9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/SDL_d3dmath.c	
@@ -0,0 +1,131 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+#include "SDL_stdinc.h"
+
+#include "SDL_d3dmath.h"
+
+/* Direct3D matrix math functions */
+
+Float4X4 MatrixIdentity()
+{
+    Float4X4 m;
+    SDL_zero(m);
+    m._11 = 1.0f;
+    m._22 = 1.0f;
+    m._33 = 1.0f;
+    m._44 = 1.0f;
+    return m;
+}
+
+Float4X4 MatrixMultiply(Float4X4 M1, Float4X4 M2)
+{
+    Float4X4 m;
+    m._11 = M1._11 * M2._11 + M1._12 * M2._21 + M1._13 * M2._31 + M1._14 * M2._41;
+    m._12 = M1._11 * M2._12 + M1._12 * M2._22 + M1._13 * M2._32 + M1._14 * M2._42;
+    m._13 = M1._11 * M2._13 + M1._12 * M2._23 + M1._13 * M2._33 + M1._14 * M2._43;
+    m._14 = M1._11 * M2._14 + M1._12 * M2._24 + M1._13 * M2._34 + M1._14 * M2._44;
+    m._21 = M1._21 * M2._11 + M1._22 * M2._21 + M1._23 * M2._31 + M1._24 * M2._41;
+    m._22 = M1._21 * M2._12 + M1._22 * M2._22 + M1._23 * M2._32 + M1._24 * M2._42;
+    m._23 = M1._21 * M2._13 + M1._22 * M2._23 + M1._23 * M2._33 + M1._24 * M2._43;
+    m._24 = M1._21 * M2._14 + M1._22 * M2._24 + M1._23 * M2._34 + M1._24 * M2._44;
+    m._31 = M1._31 * M2._11 + M1._32 * M2._21 + M1._33 * M2._31 + M1._34 * M2._41;
+    m._32 = M1._31 * M2._12 + M1._32 * M2._22 + M1._33 * M2._32 + M1._34 * M2._42;
+    m._33 = M1._31 * M2._13 + M1._32 * M2._23 + M1._33 * M2._33 + M1._34 * M2._43;
+    m._34 = M1._31 * M2._14 + M1._32 * M2._24 + M1._33 * M2._34 + M1._34 * M2._44;
+    m._41 = M1._41 * M2._11 + M1._42 * M2._21 + M1._43 * M2._31 + M1._44 * M2._41;
+    m._42 = M1._41 * M2._12 + M1._42 * M2._22 + M1._43 * M2._32 + M1._44 * M2._42;
+    m._43 = M1._41 * M2._13 + M1._42 * M2._23 + M1._43 * M2._33 + M1._44 * M2._43;
+    m._44 = M1._41 * M2._14 + M1._42 * M2._24 + M1._43 * M2._34 + M1._44 * M2._44;
+    return m;
+}
+
+Float4X4 MatrixScaling(float x, float y, float z)
+{
+    Float4X4 m;
+    SDL_zero(m);
+    m._11 = x;
+    m._22 = y;
+    m._33 = z;
+    m._44 = 1.0f;
+    return m;
+}
+
+Float4X4 MatrixTranslation(float x, float y, float z)
+{
+    Float4X4 m;
+    SDL_zero(m);
+    m._11 = 1.0f;
+    m._22 = 1.0f;
+    m._33 = 1.0f;
+    m._44 = 1.0f;
+    m._41 = x;
+    m._42 = y;
+    m._43 = z;
+    return m;
+}
+
+Float4X4 MatrixRotationX(float r)
+{
+    float sinR = SDL_sinf(r);
+    float cosR = SDL_cosf(r);
+    Float4X4 m;
+    SDL_zero(m);
+    m._11 = 1.0f;
+    m._22 = cosR;
+    m._23 = sinR;
+    m._32 = -sinR;
+    m._33 = cosR;
+    m._44 = 1.0f;
+    return m;
+}
+
+Float4X4 MatrixRotationY(float r)
+{
+    float sinR = SDL_sinf(r);
+    float cosR = SDL_cosf(r);
+    Float4X4 m;
+    SDL_zero(m);
+    m._11 = cosR;
+    m._13 = -sinR;
+    m._22 = 1.0f;
+    m._31 = sinR;
+    m._33 = cosR;
+    m._44 = 1.0f;
+    return m;
+}
+
+Float4X4 MatrixRotationZ(float r)
+{
+    float sinR = SDL_sinf(r);
+    float cosR = SDL_cosf(r);
+    Float4X4 m;
+    SDL_zero(m);
+    m._11 = cosR;
+    m._12 = sinR;
+    m._21 = -sinR;
+    m._22 = cosR;
+    m._33 = 1.0f;
+    m._44 = 1.0f;
+    return m;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/SDL_d3dmath.h b/Source/3rd Party/sdl/src/render/SDL_d3dmath.h
new file mode 100644
index 000000000..206c4350c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/SDL_d3dmath.h	
@@ -0,0 +1,69 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+
+/* Direct3D matrix math functions */
+
+typedef struct
+{
+    float x;
+    float y;
+} Float2;
+
+typedef struct
+{
+    float x;
+    float y;
+    float z;
+} Float3;
+
+typedef struct
+{
+    float x;
+    float y;
+    float z;
+    float w;
+} Float4;
+
+typedef struct
+{
+    union {
+        struct {
+            float _11, _12, _13, _14;
+            float _21, _22, _23, _24;
+            float _31, _32, _33, _34;
+            float _41, _42, _43, _44;
+        };
+        float m[4][4];
+    };
+} Float4X4;
+
+
+Float4X4 MatrixIdentity();
+Float4X4 MatrixMultiply(Float4X4 M1, Float4X4 M2);
+Float4X4 MatrixScaling(float x, float y, float z);
+Float4X4 MatrixTranslation(float x, float y, float z);
+Float4X4 MatrixRotationX(float r);
+Float4X4 MatrixRotationY(float r);
+Float4X4 MatrixRotationZ(float r);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/SDL_render.c b/Source/3rd Party/sdl/src/render/SDL_render.c
new file mode 100644
index 000000000..1547668f3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/SDL_render.c	
@@ -0,0 +1,1891 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* The SDL 2D rendering system */
+
+#include "SDL_assert.h"
+#include "SDL_hints.h"
+#include "SDL_log.h"
+#include "SDL_render.h"
+#include "SDL_sysrender.h"
+#include "software/SDL_render_sw_c.h"
+
+
+#define SDL_WINDOWRENDERDATA    "_SDL_WindowRenderData"
+
+#define CHECK_RENDERER_MAGIC(renderer, retval) \
+    if (!renderer || renderer->magic != &renderer_magic) { \
+        SDL_SetError("Invalid renderer"); \
+        return retval; \
+    }
+
+#define CHECK_TEXTURE_MAGIC(texture, retval) \
+    if (!texture || texture->magic != &texture_magic) { \
+        SDL_SetError("Invalid texture"); \
+        return retval; \
+    }
+
+
+#if !SDL_RENDER_DISABLED
+static const SDL_RenderDriver *render_drivers[] = {
+#if SDL_VIDEO_RENDER_D3D
+    &D3D_RenderDriver,
+#endif
+#if SDL_VIDEO_RENDER_D3D11
+    &D3D11_RenderDriver,
+#endif
+#if SDL_VIDEO_RENDER_OGL
+    &GL_RenderDriver,
+#endif
+#if SDL_VIDEO_RENDER_OGL_ES2
+    &GLES2_RenderDriver,
+#endif
+#if SDL_VIDEO_RENDER_OGL_ES
+    &GLES_RenderDriver,
+#endif
+#if SDL_VIDEO_RENDER_DIRECTFB
+    &DirectFB_RenderDriver,
+#endif
+#if SDL_VIDEO_RENDER_PSP
+    &PSP_RenderDriver,
+#endif
+    &SW_RenderDriver
+};
+#endif /* !SDL_RENDER_DISABLED */
+
+static char renderer_magic;
+static char texture_magic;
+
+static int UpdateLogicalSize(SDL_Renderer *renderer);
+
+int
+SDL_GetNumRenderDrivers(void)
+{
+#if !SDL_RENDER_DISABLED
+    return SDL_arraysize(render_drivers);
+#else
+    return 0;
+#endif
+}
+
+int
+SDL_GetRenderDriverInfo(int index, SDL_RendererInfo * info)
+{
+#if !SDL_RENDER_DISABLED
+    if (index < 0 || index >= SDL_GetNumRenderDrivers()) {
+        return SDL_SetError("index must be in the range of 0 - %d",
+                            SDL_GetNumRenderDrivers() - 1);
+    }
+    *info = render_drivers[index]->info;
+    return 0;
+#else
+    return SDL_SetError("SDL not built with rendering support");
+#endif
+}
+
+static int
+SDL_RendererEventWatch(void *userdata, SDL_Event *event)
+{
+    SDL_Renderer *renderer = (SDL_Renderer *)userdata;
+
+    if (event->type == SDL_WINDOWEVENT) {
+        SDL_Window *window = SDL_GetWindowFromID(event->window.windowID);
+        if (window == renderer->window) {
+            if (renderer->WindowEvent) {
+                renderer->WindowEvent(renderer, &event->window);
+            }
+
+            if (event->window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
+                if (renderer->logical_w) {
+                    UpdateLogicalSize(renderer);
+                } else {
+                    /* Window was resized, reset viewport */
+                    int w, h;
+
+                    if (renderer->GetOutputSize) {
+                        renderer->GetOutputSize(renderer, &w, &h);
+                    } else {
+                        SDL_GetWindowSize(renderer->window, &w, &h);
+                    }
+
+                    if (renderer->target) {
+                        renderer->viewport_backup.x = 0;
+                        renderer->viewport_backup.y = 0;
+                        renderer->viewport_backup.w = w;
+                        renderer->viewport_backup.h = h;
+                    } else {
+                        renderer->viewport.x = 0;
+                        renderer->viewport.y = 0;
+                        renderer->viewport.w = w;
+                        renderer->viewport.h = h;
+                        renderer->UpdateViewport(renderer);
+                    }
+                }
+            } else if (event->window.event == SDL_WINDOWEVENT_HIDDEN) {
+                renderer->hidden = SDL_TRUE;
+            } else if (event->window.event == SDL_WINDOWEVENT_SHOWN) {
+                if (!(SDL_GetWindowFlags(window) & SDL_WINDOW_MINIMIZED)) {
+                    renderer->hidden = SDL_FALSE;
+                }
+            } else if (event->window.event == SDL_WINDOWEVENT_MINIMIZED) {
+                renderer->hidden = SDL_TRUE;
+            } else if (event->window.event == SDL_WINDOWEVENT_RESTORED) {
+                if (!(SDL_GetWindowFlags(window) & SDL_WINDOW_HIDDEN)) {
+                    renderer->hidden = SDL_FALSE;
+                }
+            }
+        }
+    } else if (event->type == SDL_MOUSEMOTION) {
+        if (renderer->logical_w) {
+            event->motion.x -= renderer->viewport.x;
+            event->motion.y -= renderer->viewport.y;
+            event->motion.x = (int)(event->motion.x / renderer->scale.x);
+            event->motion.y = (int)(event->motion.y / renderer->scale.y);
+            if (event->motion.xrel > 0) {
+                event->motion.xrel = SDL_max(1, (int)(event->motion.xrel / renderer->scale.x));
+            } else if (event->motion.xrel < 0) {
+                event->motion.xrel = SDL_min(-1, (int)(event->motion.xrel / renderer->scale.x));
+            }
+            if (event->motion.yrel > 0) {
+                event->motion.yrel = SDL_max(1, (int)(event->motion.yrel / renderer->scale.y));
+            } else if (event->motion.yrel < 0) {
+                event->motion.yrel = SDL_min(-1, (int)(event->motion.yrel / renderer->scale.y));
+            }
+        }
+    } else if (event->type == SDL_MOUSEBUTTONDOWN ||
+               event->type == SDL_MOUSEBUTTONUP) {
+        if (renderer->logical_w) {
+            event->button.x -= renderer->viewport.x;
+            event->button.y -= renderer->viewport.y;
+            event->button.x = (int)(event->button.x / renderer->scale.x);
+            event->button.y = (int)(event->button.y / renderer->scale.y);
+        }
+    }
+    return 0;
+}
+
+int
+SDL_CreateWindowAndRenderer(int width, int height, Uint32 window_flags,
+                            SDL_Window **window, SDL_Renderer **renderer)
+{
+    *window = SDL_CreateWindow(NULL, SDL_WINDOWPOS_UNDEFINED,
+                                     SDL_WINDOWPOS_UNDEFINED,
+                                     width, height, window_flags);
+    if (!*window) {
+        *renderer = NULL;
+        return -1;
+    }
+
+    *renderer = SDL_CreateRenderer(*window, -1, 0);
+    if (!*renderer) {
+        return -1;
+    }
+
+    return 0;
+}
+
+SDL_Renderer *
+SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags)
+{
+#if !SDL_RENDER_DISABLED
+    SDL_Renderer *renderer = NULL;
+    int n = SDL_GetNumRenderDrivers();
+    const char *hint;
+
+    if (!window) {
+        SDL_SetError("Invalid window");
+        return NULL;
+    }
+
+    if (SDL_GetRenderer(window)) {
+        SDL_SetError("Renderer already associated with window");
+        return NULL;
+    }
+
+    hint = SDL_GetHint(SDL_HINT_RENDER_VSYNC);
+    if (hint) {
+        if (*hint == '0') {
+            flags &= ~SDL_RENDERER_PRESENTVSYNC;
+        } else {
+            flags |= SDL_RENDERER_PRESENTVSYNC;
+        }
+    }
+
+    if (index < 0) {
+        hint = SDL_GetHint(SDL_HINT_RENDER_DRIVER);
+        if (hint) {
+            for (index = 0; index < n; ++index) {
+                const SDL_RenderDriver *driver = render_drivers[index];
+
+                if (SDL_strcasecmp(hint, driver->info.name) == 0) {
+                    /* Create a new renderer instance */
+                    renderer = driver->CreateRenderer(window, flags);
+                    break;
+                }
+            }
+        }
+
+        if (!renderer) {
+            for (index = 0; index < n; ++index) {
+                const SDL_RenderDriver *driver = render_drivers[index];
+
+                if ((driver->info.flags & flags) == flags) {
+                    /* Create a new renderer instance */
+                    renderer = driver->CreateRenderer(window, flags);
+                    if (renderer) {
+                        /* Yay, we got one! */
+                        break;
+                    }
+                }
+            }
+        }
+        if (index == n) {
+            SDL_SetError("Couldn't find matching render driver");
+            return NULL;
+        }
+    } else {
+        if (index >= SDL_GetNumRenderDrivers()) {
+            SDL_SetError("index must be -1 or in the range of 0 - %d",
+                         SDL_GetNumRenderDrivers() - 1);
+            return NULL;
+        }
+        /* Create a new renderer instance */
+        renderer = render_drivers[index]->CreateRenderer(window, flags);
+    }
+
+    if (renderer) {
+        renderer->magic = &renderer_magic;
+        renderer->window = window;
+        renderer->scale.x = 1.0f;
+        renderer->scale.y = 1.0f;
+
+        if (SDL_GetWindowFlags(window) & (SDL_WINDOW_HIDDEN|SDL_WINDOW_MINIMIZED)) {
+            renderer->hidden = SDL_TRUE;
+        } else {
+            renderer->hidden = SDL_FALSE;
+        }
+
+        SDL_SetWindowData(window, SDL_WINDOWRENDERDATA, renderer);
+
+        SDL_RenderSetViewport(renderer, NULL);
+
+        SDL_AddEventWatch(SDL_RendererEventWatch, renderer);
+
+        SDL_LogInfo(SDL_LOG_CATEGORY_RENDER,
+                    "Created renderer: %s", renderer->info.name);
+    }
+    return renderer;
+#else
+    SDL_SetError("SDL not built with rendering support");
+    return NULL;
+#endif
+}
+
+SDL_Renderer *
+SDL_CreateSoftwareRenderer(SDL_Surface * surface)
+{
+#if !SDL_RENDER_DISABLED
+    SDL_Renderer *renderer;
+
+    renderer = SW_CreateRendererForSurface(surface);
+
+    if (renderer) {
+        renderer->magic = &renderer_magic;
+        renderer->scale.x = 1.0f;
+        renderer->scale.y = 1.0f;
+
+        SDL_RenderSetViewport(renderer, NULL);
+    }
+    return renderer;
+#else
+    SDL_SetError("SDL not built with rendering support");
+    return NULL;
+#endif /* !SDL_RENDER_DISABLED */
+}
+
+SDL_Renderer *
+SDL_GetRenderer(SDL_Window * window)
+{
+    return (SDL_Renderer *)SDL_GetWindowData(window, SDL_WINDOWRENDERDATA);
+}
+
+int
+SDL_GetRendererInfo(SDL_Renderer * renderer, SDL_RendererInfo * info)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    *info = renderer->info;
+    return 0;
+}
+
+int
+SDL_GetRendererOutputSize(SDL_Renderer * renderer, int *w, int *h)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    if (renderer->target) {
+        return SDL_QueryTexture(renderer->target, NULL, NULL, w, h);
+    } else if (renderer->GetOutputSize) {
+        return renderer->GetOutputSize(renderer, w, h);
+    } else if (renderer->window) {
+        SDL_GetWindowSize(renderer->window, w, h);
+        return 0;
+    } else {
+        /* This should never happen */
+        return SDL_SetError("Renderer doesn't support querying output size");
+    }
+}
+
+static SDL_bool
+IsSupportedFormat(SDL_Renderer * renderer, Uint32 format)
+{
+    Uint32 i;
+
+    for (i = 0; i < renderer->info.num_texture_formats; ++i) {
+        if (renderer->info.texture_formats[i] == format) {
+            return SDL_TRUE;
+        }
+    }
+    return SDL_FALSE;
+}
+
+static Uint32
+GetClosestSupportedFormat(SDL_Renderer * renderer, Uint32 format)
+{
+    Uint32 i;
+
+    if (SDL_ISPIXELFORMAT_FOURCC(format)) {
+        /* Look for an exact match */
+        for (i = 0; i < renderer->info.num_texture_formats; ++i) {
+            if (renderer->info.texture_formats[i] == format) {
+                return renderer->info.texture_formats[i];
+            }
+        }
+    } else {
+        SDL_bool hasAlpha = SDL_ISPIXELFORMAT_ALPHA(format);
+
+        /* We just want to match the first format that has the same channels */
+        for (i = 0; i < renderer->info.num_texture_formats; ++i) {
+            if (!SDL_ISPIXELFORMAT_FOURCC(renderer->info.texture_formats[i]) &&
+                SDL_ISPIXELFORMAT_ALPHA(renderer->info.texture_formats[i]) == hasAlpha) {
+                return renderer->info.texture_formats[i];
+            }
+        }
+    }
+    return renderer->info.texture_formats[0];
+}
+
+SDL_Texture *
+SDL_CreateTexture(SDL_Renderer * renderer, Uint32 format, int access, int w, int h)
+{
+    SDL_Texture *texture;
+
+    CHECK_RENDERER_MAGIC(renderer, NULL);
+
+    if (!format) {
+        format = renderer->info.texture_formats[0];
+    }
+    if (SDL_ISPIXELFORMAT_INDEXED(format)) {
+        SDL_SetError("Palettized textures are not supported");
+        return NULL;
+    }
+    if (w <= 0 || h <= 0) {
+        SDL_SetError("Texture dimensions can't be 0");
+        return NULL;
+    }
+    if ((renderer->info.max_texture_width && w > renderer->info.max_texture_width) ||
+        (renderer->info.max_texture_height && h > renderer->info.max_texture_height)) {
+        SDL_SetError("Texture dimensions are limited to %dx%d", renderer->info.max_texture_width, renderer->info.max_texture_height);
+        return NULL;
+    }
+    texture = (SDL_Texture *) SDL_calloc(1, sizeof(*texture));
+    if (!texture) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    texture->magic = &texture_magic;
+    texture->format = format;
+    texture->access = access;
+    texture->w = w;
+    texture->h = h;
+    texture->r = 255;
+    texture->g = 255;
+    texture->b = 255;
+    texture->a = 255;
+    texture->renderer = renderer;
+    texture->next = renderer->textures;
+    if (renderer->textures) {
+        renderer->textures->prev = texture;
+    }
+    renderer->textures = texture;
+
+    if (IsSupportedFormat(renderer, format)) {
+        if (renderer->CreateTexture(renderer, texture) < 0) {
+            SDL_DestroyTexture(texture);
+            return 0;
+        }
+    } else {
+        texture->native = SDL_CreateTexture(renderer,
+                                GetClosestSupportedFormat(renderer, format),
+                                access, w, h);
+        if (!texture->native) {
+            SDL_DestroyTexture(texture);
+            return NULL;
+        }
+
+        /* Swap textures to have texture before texture->native in the list */
+        texture->native->next = texture->next;
+        if (texture->native->next) {
+            texture->native->next->prev = texture->native;
+        }
+        texture->prev = texture->native->prev;
+        if (texture->prev) {
+            texture->prev->next = texture;
+        }
+        texture->native->prev = texture;
+        texture->next = texture->native;
+        renderer->textures = texture;
+
+        if (SDL_ISPIXELFORMAT_FOURCC(texture->format)) {
+            texture->yuv = SDL_SW_CreateYUVTexture(format, w, h);
+            if (!texture->yuv) {
+                SDL_DestroyTexture(texture);
+                return NULL;
+            }
+        } else if (access == SDL_TEXTUREACCESS_STREAMING) {
+            /* The pitch is 4 byte aligned */
+            texture->pitch = (((w * SDL_BYTESPERPIXEL(format)) + 3) & ~3);
+            texture->pixels = SDL_calloc(1, texture->pitch * h);
+            if (!texture->pixels) {
+                SDL_DestroyTexture(texture);
+                return NULL;
+            }
+        }
+    }
+    return texture;
+}
+
+SDL_Texture *
+SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface)
+{
+    const SDL_PixelFormat *fmt;
+    SDL_bool needAlpha;
+    Uint32 i;
+    Uint32 format;
+    SDL_Texture *texture;
+
+    CHECK_RENDERER_MAGIC(renderer, NULL);
+
+    if (!surface) {
+        SDL_SetError("SDL_CreateTextureFromSurface() passed NULL surface");
+        return NULL;
+    }
+
+    /* See what the best texture format is */
+    fmt = surface->format;
+    if (fmt->Amask || SDL_GetColorKey(surface, NULL) == 0) {
+        needAlpha = SDL_TRUE;
+    } else {
+        needAlpha = SDL_FALSE;
+    }
+    format = renderer->info.texture_formats[0];
+    for (i = 0; i < renderer->info.num_texture_formats; ++i) {
+        if (!SDL_ISPIXELFORMAT_FOURCC(renderer->info.texture_formats[i]) &&
+            SDL_ISPIXELFORMAT_ALPHA(renderer->info.texture_formats[i]) == needAlpha) {
+            format = renderer->info.texture_formats[i];
+            break;
+        }
+    }
+
+    texture = SDL_CreateTexture(renderer, format, SDL_TEXTUREACCESS_STATIC,
+                                surface->w, surface->h);
+    if (!texture) {
+        return NULL;
+    }
+
+    if (format == surface->format->format) {
+        if (SDL_MUSTLOCK(surface)) {
+            SDL_LockSurface(surface);
+            SDL_UpdateTexture(texture, NULL, surface->pixels, surface->pitch);
+            SDL_UnlockSurface(surface);
+        } else {
+            SDL_UpdateTexture(texture, NULL, surface->pixels, surface->pitch);
+        }
+    } else {
+        SDL_PixelFormat *dst_fmt;
+        SDL_Surface *temp = NULL;
+
+        /* Set up a destination surface for the texture update */
+        dst_fmt = SDL_AllocFormat(format);
+        temp = SDL_ConvertSurface(surface, dst_fmt, 0);
+        SDL_FreeFormat(dst_fmt);
+        if (temp) {
+            SDL_UpdateTexture(texture, NULL, temp->pixels, temp->pitch);
+            SDL_FreeSurface(temp);
+        } else {
+            SDL_DestroyTexture(texture);
+            return NULL;
+        }
+    }
+
+    {
+        Uint8 r, g, b, a;
+        SDL_BlendMode blendMode;
+
+        SDL_GetSurfaceColorMod(surface, &r, &g, &b);
+        SDL_SetTextureColorMod(texture, r, g, b);
+
+        SDL_GetSurfaceAlphaMod(surface, &a);
+        SDL_SetTextureAlphaMod(texture, a);
+
+        if (SDL_GetColorKey(surface, NULL) == 0) {
+            /* We converted to a texture with alpha format */
+            SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND);
+        } else {
+            SDL_GetSurfaceBlendMode(surface, &blendMode);
+            SDL_SetTextureBlendMode(texture, blendMode);
+        }
+    }
+    return texture;
+}
+
+int
+SDL_QueryTexture(SDL_Texture * texture, Uint32 * format, int *access,
+                 int *w, int *h)
+{
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    if (format) {
+        *format = texture->format;
+    }
+    if (access) {
+        *access = texture->access;
+    }
+    if (w) {
+        *w = texture->w;
+    }
+    if (h) {
+        *h = texture->h;
+    }
+    return 0;
+}
+
+int
+SDL_SetTextureColorMod(SDL_Texture * texture, Uint8 r, Uint8 g, Uint8 b)
+{
+    SDL_Renderer *renderer;
+
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    renderer = texture->renderer;
+    if (r < 255 || g < 255 || b < 255) {
+        texture->modMode |= SDL_TEXTUREMODULATE_COLOR;
+    } else {
+        texture->modMode &= ~SDL_TEXTUREMODULATE_COLOR;
+    }
+    texture->r = r;
+    texture->g = g;
+    texture->b = b;
+    if (texture->native) {
+        return SDL_SetTextureColorMod(texture->native, r, g, b);
+    } else if (renderer->SetTextureColorMod) {
+        return renderer->SetTextureColorMod(renderer, texture);
+    } else {
+        return 0;
+    }
+}
+
+int
+SDL_GetTextureColorMod(SDL_Texture * texture, Uint8 * r, Uint8 * g,
+                       Uint8 * b)
+{
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    if (r) {
+        *r = texture->r;
+    }
+    if (g) {
+        *g = texture->g;
+    }
+    if (b) {
+        *b = texture->b;
+    }
+    return 0;
+}
+
+int
+SDL_SetTextureAlphaMod(SDL_Texture * texture, Uint8 alpha)
+{
+    SDL_Renderer *renderer;
+
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    renderer = texture->renderer;
+    if (alpha < 255) {
+        texture->modMode |= SDL_TEXTUREMODULATE_ALPHA;
+    } else {
+        texture->modMode &= ~SDL_TEXTUREMODULATE_ALPHA;
+    }
+    texture->a = alpha;
+    if (texture->native) {
+        return SDL_SetTextureAlphaMod(texture->native, alpha);
+    } else if (renderer->SetTextureAlphaMod) {
+        return renderer->SetTextureAlphaMod(renderer, texture);
+    } else {
+        return 0;
+    }
+}
+
+int
+SDL_GetTextureAlphaMod(SDL_Texture * texture, Uint8 * alpha)
+{
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    if (alpha) {
+        *alpha = texture->a;
+    }
+    return 0;
+}
+
+int
+SDL_SetTextureBlendMode(SDL_Texture * texture, SDL_BlendMode blendMode)
+{
+    SDL_Renderer *renderer;
+
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    renderer = texture->renderer;
+    texture->blendMode = blendMode;
+    if (texture->native) {
+        return SDL_SetTextureBlendMode(texture->native, blendMode);
+    } else if (renderer->SetTextureBlendMode) {
+        return renderer->SetTextureBlendMode(renderer, texture);
+    } else {
+        return 0;
+    }
+}
+
+int
+SDL_GetTextureBlendMode(SDL_Texture * texture, SDL_BlendMode *blendMode)
+{
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    if (blendMode) {
+        *blendMode = texture->blendMode;
+    }
+    return 0;
+}
+
+static int
+SDL_UpdateTextureYUV(SDL_Texture * texture, const SDL_Rect * rect,
+                     const void *pixels, int pitch)
+{
+    SDL_Texture *native = texture->native;
+    SDL_Rect full_rect;
+
+    if (SDL_SW_UpdateYUVTexture(texture->yuv, rect, pixels, pitch) < 0) {
+        return -1;
+    }
+
+    full_rect.x = 0;
+    full_rect.y = 0;
+    full_rect.w = texture->w;
+    full_rect.h = texture->h;
+    rect = &full_rect;
+
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        /* We can lock the texture and copy to it */
+        void *native_pixels;
+        int native_pitch;
+
+        if (SDL_LockTexture(native, rect, &native_pixels, &native_pitch) < 0) {
+            return -1;
+        }
+        SDL_SW_CopyYUVToRGB(texture->yuv, rect, native->format,
+                            rect->w, rect->h, native_pixels, native_pitch);
+        SDL_UnlockTexture(native);
+    } else {
+        /* Use a temporary buffer for updating */
+        void *temp_pixels;
+        int temp_pitch;
+
+        temp_pitch = (((rect->w * SDL_BYTESPERPIXEL(native->format)) + 3) & ~3);
+        temp_pixels = SDL_malloc(rect->h * temp_pitch);
+        if (!temp_pixels) {
+            return SDL_OutOfMemory();
+        }
+        SDL_SW_CopyYUVToRGB(texture->yuv, rect, native->format,
+                            rect->w, rect->h, temp_pixels, temp_pitch);
+        SDL_UpdateTexture(native, rect, temp_pixels, temp_pitch);
+        SDL_free(temp_pixels);
+    }
+    return 0;
+}
+
+static int
+SDL_UpdateTextureNative(SDL_Texture * texture, const SDL_Rect * rect,
+                        const void *pixels, int pitch)
+{
+    SDL_Texture *native = texture->native;
+
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        /* We can lock the texture and copy to it */
+        void *native_pixels;
+        int native_pitch;
+
+        if (SDL_LockTexture(native, rect, &native_pixels, &native_pitch) < 0) {
+            return -1;
+        }
+        SDL_ConvertPixels(rect->w, rect->h,
+                          texture->format, pixels, pitch,
+                          native->format, native_pixels, native_pitch);
+        SDL_UnlockTexture(native);
+    } else {
+        /* Use a temporary buffer for updating */
+        void *temp_pixels;
+        int temp_pitch;
+
+        temp_pitch = (((rect->w * SDL_BYTESPERPIXEL(native->format)) + 3) & ~3);
+        temp_pixels = SDL_malloc(rect->h * temp_pitch);
+        if (!temp_pixels) {
+            return SDL_OutOfMemory();
+        }
+        SDL_ConvertPixels(rect->w, rect->h,
+                          texture->format, pixels, pitch,
+                          native->format, temp_pixels, temp_pitch);
+        SDL_UpdateTexture(native, rect, temp_pixels, temp_pitch);
+        SDL_free(temp_pixels);
+    }
+    return 0;
+}
+
+int
+SDL_UpdateTexture(SDL_Texture * texture, const SDL_Rect * rect,
+                  const void *pixels, int pitch)
+{
+    SDL_Renderer *renderer;
+    SDL_Rect full_rect;
+
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    if (!pixels) {
+        return SDL_InvalidParamError("pixels");
+    }
+    if (!pitch) {
+        return SDL_InvalidParamError("pitch");
+    }
+
+    if (!rect) {
+        full_rect.x = 0;
+        full_rect.y = 0;
+        full_rect.w = texture->w;
+        full_rect.h = texture->h;
+        rect = &full_rect;
+    }
+
+    if (texture->yuv) {
+        return SDL_UpdateTextureYUV(texture, rect, pixels, pitch);
+    } else if (texture->native) {
+        return SDL_UpdateTextureNative(texture, rect, pixels, pitch);
+    } else {
+        renderer = texture->renderer;
+        return renderer->UpdateTexture(renderer, texture, rect, pixels, pitch);
+    }
+}
+
+static int
+SDL_UpdateTextureYUVPlanar(SDL_Texture * texture, const SDL_Rect * rect,
+                           const Uint8 *Yplane, int Ypitch,
+                           const Uint8 *Uplane, int Upitch,
+                           const Uint8 *Vplane, int Vpitch)
+{
+    SDL_Texture *native = texture->native;
+    SDL_Rect full_rect;
+
+    if (SDL_SW_UpdateYUVTexturePlanar(texture->yuv, rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch) < 0) {
+        return -1;
+    }
+
+    full_rect.x = 0;
+    full_rect.y = 0;
+    full_rect.w = texture->w;
+    full_rect.h = texture->h;
+    rect = &full_rect;
+
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        /* We can lock the texture and copy to it */
+        void *native_pixels;
+        int native_pitch;
+
+        if (SDL_LockTexture(native, rect, &native_pixels, &native_pitch) < 0) {
+            return -1;
+        }
+        SDL_SW_CopyYUVToRGB(texture->yuv, rect, native->format,
+                            rect->w, rect->h, native_pixels, native_pitch);
+        SDL_UnlockTexture(native);
+    } else {
+        /* Use a temporary buffer for updating */
+        void *temp_pixels;
+        int temp_pitch;
+
+        temp_pitch = (((rect->w * SDL_BYTESPERPIXEL(native->format)) + 3) & ~3);
+        temp_pixels = SDL_malloc(rect->h * temp_pitch);
+        if (!temp_pixels) {
+            return SDL_OutOfMemory();
+        }
+        SDL_SW_CopyYUVToRGB(texture->yuv, rect, native->format,
+                            rect->w, rect->h, temp_pixels, temp_pitch);
+        SDL_UpdateTexture(native, rect, temp_pixels, temp_pitch);
+        SDL_free(temp_pixels);
+    }
+    return 0;
+}
+
+int SDL_UpdateYUVTexture(SDL_Texture * texture, const SDL_Rect * rect,
+                         const Uint8 *Yplane, int Ypitch,
+                         const Uint8 *Uplane, int Upitch,
+                         const Uint8 *Vplane, int Vpitch)
+{
+    SDL_Renderer *renderer;
+    SDL_Rect full_rect;
+
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    if (!Yplane) {
+        return SDL_InvalidParamError("Yplane");
+    }
+    if (!Ypitch) {
+        return SDL_InvalidParamError("Ypitch");
+    }
+    if (!Uplane) {
+        return SDL_InvalidParamError("Uplane");
+    }
+    if (!Upitch) {
+        return SDL_InvalidParamError("Upitch");
+    }
+    if (!Vplane) {
+        return SDL_InvalidParamError("Vplane");
+    }
+    if (!Vpitch) {
+        return SDL_InvalidParamError("Vpitch");
+    }
+
+    if (texture->format != SDL_PIXELFORMAT_YV12 &&
+        texture->format != SDL_PIXELFORMAT_IYUV) {
+        return SDL_SetError("Texture format must by YV12 or IYUV");
+    }
+
+    if (!rect) {
+        full_rect.x = 0;
+        full_rect.y = 0;
+        full_rect.w = texture->w;
+        full_rect.h = texture->h;
+        rect = &full_rect;
+    }
+
+    if (texture->yuv) {
+        return SDL_UpdateTextureYUVPlanar(texture, rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch);
+    } else {
+        SDL_assert(!texture->native);
+        renderer = texture->renderer;
+        SDL_assert(renderer->UpdateTextureYUV);
+		if (renderer->UpdateTextureYUV) {
+			return renderer->UpdateTextureYUV(renderer, texture, rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch);
+		} else {
+			return SDL_Unsupported();
+		}
+	}
+}
+
+static int
+SDL_LockTextureYUV(SDL_Texture * texture, const SDL_Rect * rect,
+                   void **pixels, int *pitch)
+{
+    return SDL_SW_LockYUVTexture(texture->yuv, rect, pixels, pitch);
+}
+
+static int
+SDL_LockTextureNative(SDL_Texture * texture, const SDL_Rect * rect,
+                      void **pixels, int *pitch)
+{
+    texture->locked_rect = *rect;
+    *pixels = (void *) ((Uint8 *) texture->pixels +
+                        rect->y * texture->pitch +
+                        rect->x * SDL_BYTESPERPIXEL(texture->format));
+    *pitch = texture->pitch;
+    return 0;
+}
+
+int
+SDL_LockTexture(SDL_Texture * texture, const SDL_Rect * rect,
+                void **pixels, int *pitch)
+{
+    SDL_Renderer *renderer;
+    SDL_Rect full_rect;
+
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    if (texture->access != SDL_TEXTUREACCESS_STREAMING) {
+        return SDL_SetError("SDL_LockTexture(): texture must be streaming");
+    }
+
+    if (!rect) {
+        full_rect.x = 0;
+        full_rect.y = 0;
+        full_rect.w = texture->w;
+        full_rect.h = texture->h;
+        rect = &full_rect;
+    }
+
+    if (texture->yuv) {
+        return SDL_LockTextureYUV(texture, rect, pixels, pitch);
+    } else if (texture->native) {
+        return SDL_LockTextureNative(texture, rect, pixels, pitch);
+    } else {
+        renderer = texture->renderer;
+        return renderer->LockTexture(renderer, texture, rect, pixels, pitch);
+    }
+}
+
+static void
+SDL_UnlockTextureYUV(SDL_Texture * texture)
+{
+    SDL_Texture *native = texture->native;
+    void *native_pixels;
+    int native_pitch;
+    SDL_Rect rect;
+
+    rect.x = 0;
+    rect.y = 0;
+    rect.w = texture->w;
+    rect.h = texture->h;
+
+    if (SDL_LockTexture(native, &rect, &native_pixels, &native_pitch) < 0) {
+        return;
+    }
+    SDL_SW_CopyYUVToRGB(texture->yuv, &rect, native->format,
+                        rect.w, rect.h, native_pixels, native_pitch);
+    SDL_UnlockTexture(native);
+}
+
+static void
+SDL_UnlockTextureNative(SDL_Texture * texture)
+{
+    SDL_Texture *native = texture->native;
+    void *native_pixels;
+    int native_pitch;
+    const SDL_Rect *rect = &texture->locked_rect;
+    const void* pixels = (void *) ((Uint8 *) texture->pixels +
+                        rect->y * texture->pitch +
+                        rect->x * SDL_BYTESPERPIXEL(texture->format));
+    int pitch = texture->pitch;
+
+    if (SDL_LockTexture(native, rect, &native_pixels, &native_pitch) < 0) {
+        return;
+    }
+    SDL_ConvertPixels(rect->w, rect->h,
+                      texture->format, pixels, pitch,
+                      native->format, native_pixels, native_pitch);
+    SDL_UnlockTexture(native);
+}
+
+void
+SDL_UnlockTexture(SDL_Texture * texture)
+{
+    SDL_Renderer *renderer;
+
+    CHECK_TEXTURE_MAGIC(texture, );
+
+    if (texture->access != SDL_TEXTUREACCESS_STREAMING) {
+        return;
+    }
+    if (texture->yuv) {
+        SDL_UnlockTextureYUV(texture);
+    } else if (texture->native) {
+        SDL_UnlockTextureNative(texture);
+    } else {
+        renderer = texture->renderer;
+        renderer->UnlockTexture(renderer, texture);
+    }
+}
+
+SDL_bool
+SDL_RenderTargetSupported(SDL_Renderer *renderer)
+{
+    if (!renderer || !renderer->SetRenderTarget) {
+        return SDL_FALSE;
+    }
+    return (renderer->info.flags & SDL_RENDERER_TARGETTEXTURE) != 0;
+}
+
+int
+SDL_SetRenderTarget(SDL_Renderer *renderer, SDL_Texture *texture)
+{
+    if (!SDL_RenderTargetSupported(renderer)) {
+        return SDL_Unsupported();
+    }
+    if (texture == renderer->target) {
+        /* Nothing to do! */
+        return 0;
+    }
+
+    /* texture == NULL is valid and means reset the target to the window */
+    if (texture) {
+        CHECK_TEXTURE_MAGIC(texture, -1);
+        if (renderer != texture->renderer) {
+            return SDL_SetError("Texture was not created with this renderer");
+        }
+        if (texture->access != SDL_TEXTUREACCESS_TARGET) {
+            return SDL_SetError("Texture not created with SDL_TEXTUREACCESS_TARGET");
+        }
+        if (texture->native) {
+            /* Always render to the native texture */
+            texture = texture->native;
+        }
+    }
+
+    if (texture && !renderer->target) {
+        /* Make a backup of the viewport */
+        renderer->viewport_backup = renderer->viewport;
+        renderer->clip_rect_backup = renderer->clip_rect;
+        renderer->scale_backup = renderer->scale;
+        renderer->logical_w_backup = renderer->logical_w;
+        renderer->logical_h_backup = renderer->logical_h;
+    }
+    renderer->target = texture;
+
+    if (renderer->SetRenderTarget(renderer, texture) < 0) {
+        return -1;
+    }
+
+    if (texture) {
+        renderer->viewport.x = 0;
+        renderer->viewport.y = 0;
+        renderer->viewport.w = texture->w;
+        renderer->viewport.h = texture->h;
+        renderer->scale.x = 1.0f;
+        renderer->scale.y = 1.0f;
+        renderer->logical_w = texture->w;
+        renderer->logical_h = texture->h;
+    } else {
+        renderer->viewport = renderer->viewport_backup;
+        renderer->clip_rect = renderer->clip_rect_backup;
+        renderer->scale = renderer->scale_backup;
+        renderer->logical_w = renderer->logical_w_backup;
+        renderer->logical_h = renderer->logical_h_backup;
+    }
+    if (renderer->UpdateViewport(renderer) < 0) {
+        return -1;
+    }
+    if (renderer->UpdateClipRect(renderer) < 0) {
+        return -1;
+    }
+
+    /* All set! */
+    return 0;
+}
+
+SDL_Texture *
+SDL_GetRenderTarget(SDL_Renderer *renderer)
+{
+    return renderer->target;
+}
+
+static int
+UpdateLogicalSize(SDL_Renderer *renderer)
+{
+    int w, h;
+    float want_aspect;
+    float real_aspect;
+    float scale;
+    SDL_Rect viewport;
+
+    if (SDL_GetRendererOutputSize(renderer, &w, &h) < 0) {
+        return -1;
+    }
+
+    want_aspect = (float)renderer->logical_w / renderer->logical_h;
+    real_aspect = (float)w / h;
+
+    /* Clear the scale because we're setting viewport in output coordinates */
+    SDL_RenderSetScale(renderer, 1.0f, 1.0f);
+
+    if (SDL_fabs(want_aspect-real_aspect) < 0.0001) {
+        /* The aspect ratios are the same, just scale appropriately */
+        scale = (float)w / renderer->logical_w;
+        SDL_RenderSetViewport(renderer, NULL);
+    } else if (want_aspect > real_aspect) {
+        /* We want a wider aspect ratio than is available - letterbox it */
+        scale = (float)w / renderer->logical_w;
+        viewport.x = 0;
+        viewport.w = w;
+        viewport.h = (int)SDL_ceil(renderer->logical_h * scale);
+        viewport.y = (h - viewport.h) / 2;
+        SDL_RenderSetViewport(renderer, &viewport);
+    } else {
+        /* We want a narrower aspect ratio than is available - use side-bars */
+        scale = (float)h / renderer->logical_h;
+        viewport.y = 0;
+        viewport.h = h;
+        viewport.w = (int)SDL_ceil(renderer->logical_w * scale);
+        viewport.x = (w - viewport.w) / 2;
+        SDL_RenderSetViewport(renderer, &viewport);
+    }
+
+    /* Set the new scale */
+    SDL_RenderSetScale(renderer, scale, scale);
+
+    return 0;
+}
+
+int
+SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    if (!w || !h) {
+        /* Clear any previous logical resolution */
+        renderer->logical_w = 0;
+        renderer->logical_h = 0;
+        SDL_RenderSetViewport(renderer, NULL);
+        SDL_RenderSetScale(renderer, 1.0f, 1.0f);
+        return 0;
+    }
+
+    renderer->logical_w = w;
+    renderer->logical_h = h;
+
+    return UpdateLogicalSize(renderer);
+}
+
+void
+SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h)
+{
+    CHECK_RENDERER_MAGIC(renderer, );
+
+    if (w) {
+        *w = renderer->logical_w;
+    }
+    if (h) {
+        *h = renderer->logical_h;
+    }
+}
+
+int
+SDL_RenderSetViewport(SDL_Renderer * renderer, const SDL_Rect * rect)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    if (rect) {
+        renderer->viewport.x = (int)SDL_floor(rect->x * renderer->scale.x);
+        renderer->viewport.y = (int)SDL_floor(rect->y * renderer->scale.y);
+        renderer->viewport.w = (int)SDL_ceil(rect->w * renderer->scale.x);
+        renderer->viewport.h = (int)SDL_ceil(rect->h * renderer->scale.y);
+    } else {
+        renderer->viewport.x = 0;
+        renderer->viewport.y = 0;
+        if (SDL_GetRendererOutputSize(renderer, &renderer->viewport.w, &renderer->viewport.h) < 0) {
+            return -1;
+        }
+    }
+    return renderer->UpdateViewport(renderer);
+}
+
+void
+SDL_RenderGetViewport(SDL_Renderer * renderer, SDL_Rect * rect)
+{
+    CHECK_RENDERER_MAGIC(renderer, );
+
+    if (rect) {
+        rect->x = (int)(renderer->viewport.x / renderer->scale.x);
+        rect->y = (int)(renderer->viewport.y / renderer->scale.y);
+        rect->w = (int)(renderer->viewport.w / renderer->scale.x);
+        rect->h = (int)(renderer->viewport.h / renderer->scale.y);
+    }
+}
+
+int
+SDL_RenderSetClipRect(SDL_Renderer * renderer, const SDL_Rect * rect)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1)
+
+    if (rect) {
+        renderer->clip_rect.x = (int)SDL_floor(rect->x * renderer->scale.x);
+        renderer->clip_rect.y = (int)SDL_floor(rect->y * renderer->scale.y);
+        renderer->clip_rect.w = (int)SDL_ceil(rect->w * renderer->scale.x);
+        renderer->clip_rect.h = (int)SDL_ceil(rect->h * renderer->scale.y);
+    } else {
+        SDL_zero(renderer->clip_rect);
+    }
+    return renderer->UpdateClipRect(renderer);
+}
+
+void
+SDL_RenderGetClipRect(SDL_Renderer * renderer, SDL_Rect * rect)
+{
+    CHECK_RENDERER_MAGIC(renderer, )
+
+    if (rect) {
+        rect->x = (int)(renderer->clip_rect.x / renderer->scale.x);
+        rect->y = (int)(renderer->clip_rect.y / renderer->scale.y);
+        rect->w = (int)(renderer->clip_rect.w / renderer->scale.x);
+        rect->h = (int)(renderer->clip_rect.h / renderer->scale.y);
+    }
+}
+
+int
+SDL_RenderSetScale(SDL_Renderer * renderer, float scaleX, float scaleY)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    renderer->scale.x = scaleX;
+    renderer->scale.y = scaleY;
+    return 0;
+}
+
+void
+SDL_RenderGetScale(SDL_Renderer * renderer, float *scaleX, float *scaleY)
+{
+    CHECK_RENDERER_MAGIC(renderer, );
+
+    if (scaleX) {
+        *scaleX = renderer->scale.x;
+    }
+    if (scaleY) {
+        *scaleY = renderer->scale.y;
+    }
+}
+
+int
+SDL_SetRenderDrawColor(SDL_Renderer * renderer,
+                       Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    renderer->r = r;
+    renderer->g = g;
+    renderer->b = b;
+    renderer->a = a;
+    return 0;
+}
+
+int
+SDL_GetRenderDrawColor(SDL_Renderer * renderer,
+                       Uint8 * r, Uint8 * g, Uint8 * b, Uint8 * a)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    if (r) {
+        *r = renderer->r;
+    }
+    if (g) {
+        *g = renderer->g;
+    }
+    if (b) {
+        *b = renderer->b;
+    }
+    if (a) {
+        *a = renderer->a;
+    }
+    return 0;
+}
+
+int
+SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    renderer->blendMode = blendMode;
+    return 0;
+}
+
+int
+SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer, SDL_BlendMode *blendMode)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    *blendMode = renderer->blendMode;
+    return 0;
+}
+
+int
+SDL_RenderClear(SDL_Renderer * renderer)
+{
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    /* Don't draw while we're hidden */
+    if (renderer->hidden) {
+        return 0;
+    }
+    return renderer->RenderClear(renderer);
+}
+
+int
+SDL_RenderDrawPoint(SDL_Renderer * renderer, int x, int y)
+{
+    SDL_Point point;
+
+    point.x = x;
+    point.y = y;
+    return SDL_RenderDrawPoints(renderer, &point, 1);
+}
+
+static int
+RenderDrawPointsWithRects(SDL_Renderer * renderer,
+                     const SDL_Point * points, int count)
+{
+    SDL_FRect *frects;
+    int i;
+    int status;
+
+    frects = SDL_stack_alloc(SDL_FRect, count);
+    if (!frects) {
+        return SDL_OutOfMemory();
+    }
+    for (i = 0; i < count; ++i) {
+        frects[i].x = points[i].x * renderer->scale.x;
+        frects[i].y = points[i].y * renderer->scale.y;
+        frects[i].w = renderer->scale.x;
+        frects[i].h = renderer->scale.y;
+    }
+
+    status = renderer->RenderFillRects(renderer, frects, count);
+
+    SDL_stack_free(frects);
+
+    return status;
+}
+
+int
+SDL_RenderDrawPoints(SDL_Renderer * renderer,
+                     const SDL_Point * points, int count)
+{
+    SDL_FPoint *fpoints;
+    int i;
+    int status;
+
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    if (!points) {
+        return SDL_SetError("SDL_RenderDrawPoints(): Passed NULL points");
+    }
+    if (count < 1) {
+        return 0;
+    }
+    /* Don't draw while we're hidden */
+    if (renderer->hidden) {
+        return 0;
+    }
+
+    if (renderer->scale.x != 1.0f || renderer->scale.y != 1.0f) {
+        return RenderDrawPointsWithRects(renderer, points, count);
+    }
+
+    fpoints = SDL_stack_alloc(SDL_FPoint, count);
+    if (!fpoints) {
+        return SDL_OutOfMemory();
+    }
+    for (i = 0; i < count; ++i) {
+        fpoints[i].x = points[i].x * renderer->scale.x;
+        fpoints[i].y = points[i].y * renderer->scale.y;
+    }
+
+    status = renderer->RenderDrawPoints(renderer, fpoints, count);
+
+    SDL_stack_free(fpoints);
+
+    return status;
+}
+
+int
+SDL_RenderDrawLine(SDL_Renderer * renderer, int x1, int y1, int x2, int y2)
+{
+    SDL_Point points[2];
+
+    points[0].x = x1;
+    points[0].y = y1;
+    points[1].x = x2;
+    points[1].y = y2;
+    return SDL_RenderDrawLines(renderer, points, 2);
+}
+
+static int
+RenderDrawLinesWithRects(SDL_Renderer * renderer,
+                     const SDL_Point * points, int count)
+{
+    SDL_FRect *frect;
+    SDL_FRect *frects;
+    SDL_FPoint fpoints[2];
+    int i, nrects;
+    int status;
+
+    frects = SDL_stack_alloc(SDL_FRect, count-1);
+    if (!frects) {
+        return SDL_OutOfMemory();
+    }
+
+    status = 0;
+    nrects = 0;
+    for (i = 0; i < count-1; ++i) {
+        if (points[i].x == points[i+1].x) {
+            int minY = SDL_min(points[i].y, points[i+1].y);
+            int maxY = SDL_max(points[i].y, points[i+1].y);
+
+            frect = &frects[nrects++];
+            frect->x = points[i].x * renderer->scale.x;
+            frect->y = minY * renderer->scale.y;
+            frect->w = renderer->scale.x;
+            frect->h = (maxY - minY + 1) * renderer->scale.y;
+        } else if (points[i].y == points[i+1].y) {
+            int minX = SDL_min(points[i].x, points[i+1].x);
+            int maxX = SDL_max(points[i].x, points[i+1].x);
+
+            frect = &frects[nrects++];
+            frect->x = minX * renderer->scale.x;
+            frect->y = points[i].y * renderer->scale.y;
+            frect->w = (maxX - minX + 1) * renderer->scale.x;
+            frect->h = renderer->scale.y;
+        } else {
+            /* FIXME: We can't use a rect for this line... */
+            fpoints[0].x = points[i].x * renderer->scale.x;
+            fpoints[0].y = points[i].y * renderer->scale.y;
+            fpoints[1].x = points[i+1].x * renderer->scale.x;
+            fpoints[1].y = points[i+1].y * renderer->scale.y;
+            status += renderer->RenderDrawLines(renderer, fpoints, 2);
+        }
+    }
+
+    status += renderer->RenderFillRects(renderer, frects, nrects);
+
+    SDL_stack_free(frects);
+
+    if (status < 0) {
+        status = -1;
+    }
+    return status;
+}
+
+int
+SDL_RenderDrawLines(SDL_Renderer * renderer,
+                    const SDL_Point * points, int count)
+{
+    SDL_FPoint *fpoints;
+    int i;
+    int status;
+
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    if (!points) {
+        return SDL_SetError("SDL_RenderDrawLines(): Passed NULL points");
+    }
+    if (count < 2) {
+        return 0;
+    }
+    /* Don't draw while we're hidden */
+    if (renderer->hidden) {
+        return 0;
+    }
+
+    if (renderer->scale.x != 1.0f || renderer->scale.y != 1.0f) {
+        return RenderDrawLinesWithRects(renderer, points, count);
+    }
+
+    fpoints = SDL_stack_alloc(SDL_FPoint, count);
+    if (!fpoints) {
+        return SDL_OutOfMemory();
+    }
+    for (i = 0; i < count; ++i) {
+        fpoints[i].x = points[i].x * renderer->scale.x;
+        fpoints[i].y = points[i].y * renderer->scale.y;
+    }
+
+    status = renderer->RenderDrawLines(renderer, fpoints, count);
+
+    SDL_stack_free(fpoints);
+
+    return status;
+}
+
+int
+SDL_RenderDrawRect(SDL_Renderer * renderer, const SDL_Rect * rect)
+{
+    SDL_Rect full_rect;
+    SDL_Point points[5];
+
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    /* If 'rect' == NULL, then outline the whole surface */
+    if (!rect) {
+        SDL_RenderGetViewport(renderer, &full_rect);
+        full_rect.x = 0;
+        full_rect.y = 0;
+        rect = &full_rect;
+    }
+
+    points[0].x = rect->x;
+    points[0].y = rect->y;
+    points[1].x = rect->x+rect->w-1;
+    points[1].y = rect->y;
+    points[2].x = rect->x+rect->w-1;
+    points[2].y = rect->y+rect->h-1;
+    points[3].x = rect->x;
+    points[3].y = rect->y+rect->h-1;
+    points[4].x = rect->x;
+    points[4].y = rect->y;
+    return SDL_RenderDrawLines(renderer, points, 5);
+}
+
+int
+SDL_RenderDrawRects(SDL_Renderer * renderer,
+                    const SDL_Rect * rects, int count)
+{
+    int i;
+
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    if (!rects) {
+        return SDL_SetError("SDL_RenderDrawRects(): Passed NULL rects");
+    }
+    if (count < 1) {
+        return 0;
+    }
+
+    /* Don't draw while we're hidden */
+    if (renderer->hidden) {
+        return 0;
+    }
+    for (i = 0; i < count; ++i) {
+        if (SDL_RenderDrawRect(renderer, &rects[i]) < 0) {
+            return -1;
+        }
+    }
+    return 0;
+}
+
+int
+SDL_RenderFillRect(SDL_Renderer * renderer, const SDL_Rect * rect)
+{
+    SDL_Rect full_rect = { 0, 0, 0, 0 };
+
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    /* If 'rect' == NULL, then outline the whole surface */
+    if (!rect) {
+        SDL_RenderGetViewport(renderer, &full_rect);
+        full_rect.x = 0;
+        full_rect.y = 0;
+        rect = &full_rect;
+    }
+    return SDL_RenderFillRects(renderer, rect, 1);
+}
+
+int
+SDL_RenderFillRects(SDL_Renderer * renderer,
+                    const SDL_Rect * rects, int count)
+{
+    SDL_FRect *frects;
+    int i;
+    int status;
+
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    if (!rects) {
+        return SDL_SetError("SDL_RenderFillRects(): Passed NULL rects");
+    }
+    if (count < 1) {
+        return 0;
+    }
+    /* Don't draw while we're hidden */
+    if (renderer->hidden) {
+        return 0;
+    }
+
+    frects = SDL_stack_alloc(SDL_FRect, count);
+    if (!frects) {
+        return SDL_OutOfMemory();
+    }
+    for (i = 0; i < count; ++i) {
+        frects[i].x = rects[i].x * renderer->scale.x;
+        frects[i].y = rects[i].y * renderer->scale.y;
+        frects[i].w = rects[i].w * renderer->scale.x;
+        frects[i].h = rects[i].h * renderer->scale.y;
+    }
+
+    status = renderer->RenderFillRects(renderer, frects, count);
+
+    SDL_stack_free(frects);
+
+    return status;
+}
+
+int
+SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+               const SDL_Rect * srcrect, const SDL_Rect * dstrect)
+{
+    SDL_Rect real_srcrect = { 0, 0, 0, 0 };
+    SDL_Rect real_dstrect = { 0, 0, 0, 0 };
+    SDL_FRect frect;
+
+    CHECK_RENDERER_MAGIC(renderer, -1);
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    if (renderer != texture->renderer) {
+        return SDL_SetError("Texture was not created with this renderer");
+    }
+
+    real_srcrect.x = 0;
+    real_srcrect.y = 0;
+    real_srcrect.w = texture->w;
+    real_srcrect.h = texture->h;
+    if (srcrect) {
+        if (!SDL_IntersectRect(srcrect, &real_srcrect, &real_srcrect)) {
+            return 0;
+        }
+    }
+
+    SDL_RenderGetViewport(renderer, &real_dstrect);
+    real_dstrect.x = 0;
+    real_dstrect.y = 0;
+    if (dstrect) {
+        if (!SDL_HasIntersection(dstrect, &real_dstrect)) {
+            return 0;
+        }
+        real_dstrect = *dstrect;
+    }
+
+    if (texture->native) {
+        texture = texture->native;
+    }
+
+    /* Don't draw while we're hidden */
+    if (renderer->hidden) {
+        return 0;
+    }
+
+    frect.x = real_dstrect.x * renderer->scale.x;
+    frect.y = real_dstrect.y * renderer->scale.y;
+    frect.w = real_dstrect.w * renderer->scale.x;
+    frect.h = real_dstrect.h * renderer->scale.y;
+
+    return renderer->RenderCopy(renderer, texture, &real_srcrect, &frect);
+}
+
+
+int
+SDL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+               const SDL_Rect * srcrect, const SDL_Rect * dstrect,
+               const double angle, const SDL_Point *center, const SDL_RendererFlip flip)
+{
+    SDL_Rect real_srcrect = { 0, 0, 0, 0 };
+    SDL_Rect real_dstrect = { 0, 0, 0, 0 };
+    SDL_Point real_center;
+    SDL_FRect frect;
+    SDL_FPoint fcenter;
+
+    CHECK_RENDERER_MAGIC(renderer, -1);
+    CHECK_TEXTURE_MAGIC(texture, -1);
+
+    if (renderer != texture->renderer) {
+        return SDL_SetError("Texture was not created with this renderer");
+    }
+    if (!renderer->RenderCopyEx) {
+        return SDL_SetError("Renderer does not support RenderCopyEx");
+    }
+
+    real_srcrect.x = 0;
+    real_srcrect.y = 0;
+    real_srcrect.w = texture->w;
+    real_srcrect.h = texture->h;
+    if (srcrect) {
+        if (!SDL_IntersectRect(srcrect, &real_srcrect, &real_srcrect)) {
+            return 0;
+        }
+    }
+
+    /* We don't intersect the dstrect with the viewport as RenderCopy does because of potential rotation clipping issues... TODO: should we? */
+    if (dstrect) {
+        real_dstrect = *dstrect;
+    } else {
+        SDL_RenderGetViewport(renderer, &real_dstrect);
+        real_dstrect.x = 0;
+        real_dstrect.y = 0;
+    }
+
+    if (texture->native) {
+        texture = texture->native;
+    }
+
+    if(center) real_center = *center;
+    else {
+        real_center.x = real_dstrect.w/2;
+        real_center.y = real_dstrect.h/2;
+    }
+
+    frect.x = real_dstrect.x * renderer->scale.x;
+    frect.y = real_dstrect.y * renderer->scale.y;
+    frect.w = real_dstrect.w * renderer->scale.x;
+    frect.h = real_dstrect.h * renderer->scale.y;
+
+    fcenter.x = real_center.x * renderer->scale.x;
+    fcenter.y = real_center.y * renderer->scale.y;
+
+    return renderer->RenderCopyEx(renderer, texture, &real_srcrect, &frect, angle, &fcenter, flip);
+}
+
+int
+SDL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                     Uint32 format, void * pixels, int pitch)
+{
+    SDL_Rect real_rect;
+
+    CHECK_RENDERER_MAGIC(renderer, -1);
+
+    if (!renderer->RenderReadPixels) {
+        return SDL_Unsupported();
+    }
+
+    if (!format) {
+        format = SDL_GetWindowPixelFormat(renderer->window);
+    }
+
+    real_rect.x = renderer->viewport.x;
+    real_rect.y = renderer->viewport.y;
+    real_rect.w = renderer->viewport.w;
+    real_rect.h = renderer->viewport.h;
+    if (rect) {
+        if (!SDL_IntersectRect(rect, &real_rect, &real_rect)) {
+            return 0;
+        }
+        if (real_rect.y > rect->y) {
+            pixels = (Uint8 *)pixels + pitch * (real_rect.y - rect->y);
+        }
+        if (real_rect.x > rect->x) {
+            int bpp = SDL_BYTESPERPIXEL(format);
+            pixels = (Uint8 *)pixels + bpp * (real_rect.x - rect->x);
+        }
+    }
+
+    return renderer->RenderReadPixels(renderer, &real_rect,
+                                      format, pixels, pitch);
+}
+
+void
+SDL_RenderPresent(SDL_Renderer * renderer)
+{
+    CHECK_RENDERER_MAGIC(renderer, );
+
+    /* Don't draw while we're hidden */
+    if (renderer->hidden) {
+        return;
+    }
+    renderer->RenderPresent(renderer);
+}
+
+void
+SDL_DestroyTexture(SDL_Texture * texture)
+{
+    SDL_Renderer *renderer;
+
+    CHECK_TEXTURE_MAGIC(texture, );
+
+    renderer = texture->renderer;
+    if (texture == renderer->target) {
+        SDL_SetRenderTarget(renderer, NULL);
+    }
+
+    texture->magic = NULL;
+
+    if (texture->next) {
+        texture->next->prev = texture->prev;
+    }
+    if (texture->prev) {
+        texture->prev->next = texture->next;
+    } else {
+        renderer->textures = texture->next;
+    }
+
+    if (texture->native) {
+        SDL_DestroyTexture(texture->native);
+    }
+    if (texture->yuv) {
+        SDL_SW_DestroyYUVTexture(texture->yuv);
+    }
+    SDL_free(texture->pixels);
+
+    renderer->DestroyTexture(renderer, texture);
+    SDL_free(texture);
+}
+
+void
+SDL_DestroyRenderer(SDL_Renderer * renderer)
+{
+    CHECK_RENDERER_MAGIC(renderer, );
+
+    SDL_DelEventWatch(SDL_RendererEventWatch, renderer);
+
+    /* Free existing textures for this renderer */
+    while (renderer->textures) {
+        SDL_DestroyTexture(renderer->textures);
+    }
+
+    if (renderer->window) {
+        SDL_SetWindowData(renderer->window, SDL_WINDOWRENDERDATA, NULL);
+    }
+
+    /* It's no longer magical... */
+    renderer->magic = NULL;
+
+    /* Free the renderer instance */
+    renderer->DestroyRenderer(renderer);
+}
+
+int SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh)
+{
+    SDL_Renderer *renderer;
+
+    CHECK_TEXTURE_MAGIC(texture, -1);
+    renderer = texture->renderer;
+    if (texture->native) {
+        return SDL_GL_BindTexture(texture->native, texw, texh);
+    } else if (renderer && renderer->GL_BindTexture) {
+        return renderer->GL_BindTexture(renderer, texture, texw, texh);
+    } else {
+        return SDL_Unsupported();
+    }
+}
+
+int SDL_GL_UnbindTexture(SDL_Texture *texture)
+{
+    SDL_Renderer *renderer;
+
+    CHECK_TEXTURE_MAGIC(texture, -1);
+    renderer = texture->renderer;
+    if (texture->native) {
+        return SDL_GL_UnbindTexture(texture->native);
+    } else if (renderer && renderer->GL_UnbindTexture) {
+        return renderer->GL_UnbindTexture(renderer, texture);
+    }
+
+    return SDL_Unsupported();
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/SDL_sysrender.h b/Source/3rd Party/sdl/src/render/SDL_sysrender.h
new file mode 100644
index 000000000..5098d34fa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/SDL_sysrender.h	
@@ -0,0 +1,198 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_sysrender_h
+#define _SDL_sysrender_h
+
+#include "SDL_render.h"
+#include "SDL_events.h"
+#include "SDL_yuv_sw_c.h"
+
+/* The SDL 2D rendering system */
+
+typedef struct SDL_RenderDriver SDL_RenderDriver;
+
+typedef struct
+{
+    float x;
+    float y;
+} SDL_FPoint;
+
+typedef struct
+{
+    float x;
+    float y;
+    float w;
+    float h;
+} SDL_FRect;
+
+/* Define the SDL texture structure */
+struct SDL_Texture
+{
+    const void *magic;
+    Uint32 format;              /**< The pixel format of the texture */
+    int access;                 /**< SDL_TextureAccess */
+    int w;                      /**< The width of the texture */
+    int h;                      /**< The height of the texture */
+    int modMode;                /**< The texture modulation mode */
+    SDL_BlendMode blendMode;    /**< The texture blend mode */
+    Uint8 r, g, b, a;           /**< Texture modulation values */
+
+    SDL_Renderer *renderer;
+
+    /* Support for formats not supported directly by the renderer */
+    SDL_Texture *native;
+    SDL_SW_YUVTexture *yuv;
+    void *pixels;
+    int pitch;
+    SDL_Rect locked_rect;
+
+    void *driverdata;           /**< Driver specific texture representation */
+
+    SDL_Texture *prev;
+    SDL_Texture *next;
+};
+
+/* Define the SDL renderer structure */
+struct SDL_Renderer
+{
+    const void *magic;
+
+    void (*WindowEvent) (SDL_Renderer * renderer, const SDL_WindowEvent *event);
+    int (*GetOutputSize) (SDL_Renderer * renderer, int *w, int *h);
+    int (*CreateTexture) (SDL_Renderer * renderer, SDL_Texture * texture);
+    int (*SetTextureColorMod) (SDL_Renderer * renderer,
+                               SDL_Texture * texture);
+    int (*SetTextureAlphaMod) (SDL_Renderer * renderer,
+                               SDL_Texture * texture);
+    int (*SetTextureBlendMode) (SDL_Renderer * renderer,
+                                SDL_Texture * texture);
+    int (*UpdateTexture) (SDL_Renderer * renderer, SDL_Texture * texture,
+                          const SDL_Rect * rect, const void *pixels,
+                          int pitch);
+    int (*UpdateTextureYUV) (SDL_Renderer * renderer, SDL_Texture * texture,
+                            const SDL_Rect * rect,
+                            const Uint8 *Yplane, int Ypitch,
+                            const Uint8 *Uplane, int Upitch,
+                            const Uint8 *Vplane, int Vpitch);
+    int (*LockTexture) (SDL_Renderer * renderer, SDL_Texture * texture,
+                        const SDL_Rect * rect, void **pixels, int *pitch);
+    void (*UnlockTexture) (SDL_Renderer * renderer, SDL_Texture * texture);
+    int (*SetRenderTarget) (SDL_Renderer * renderer, SDL_Texture * texture);
+    int (*UpdateViewport) (SDL_Renderer * renderer);
+    int (*UpdateClipRect) (SDL_Renderer * renderer);
+    int (*RenderClear) (SDL_Renderer * renderer);
+    int (*RenderDrawPoints) (SDL_Renderer * renderer, const SDL_FPoint * points,
+                             int count);
+    int (*RenderDrawLines) (SDL_Renderer * renderer, const SDL_FPoint * points,
+                            int count);
+    int (*RenderFillRects) (SDL_Renderer * renderer, const SDL_FRect * rects,
+                            int count);
+    int (*RenderCopy) (SDL_Renderer * renderer, SDL_Texture * texture,
+                       const SDL_Rect * srcrect, const SDL_FRect * dstrect);
+    int (*RenderCopyEx) (SDL_Renderer * renderer, SDL_Texture * texture,
+                       const SDL_Rect * srcquad, const SDL_FRect * dstrect,
+                       const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip);
+    int (*RenderReadPixels) (SDL_Renderer * renderer, const SDL_Rect * rect,
+                             Uint32 format, void * pixels, int pitch);
+    void (*RenderPresent) (SDL_Renderer * renderer);
+    void (*DestroyTexture) (SDL_Renderer * renderer, SDL_Texture * texture);
+
+    void (*DestroyRenderer) (SDL_Renderer * renderer);
+
+    int (*GL_BindTexture) (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh);
+    int (*GL_UnbindTexture) (SDL_Renderer * renderer, SDL_Texture *texture);
+
+    /* The current renderer info */
+    SDL_RendererInfo info;
+
+    /* The window associated with the renderer */
+    SDL_Window *window;
+    SDL_bool hidden;
+
+    /* The logical resolution for rendering */
+    int logical_w;
+    int logical_h;
+    int logical_w_backup;
+    int logical_h_backup;
+
+    /* The drawable area within the window */
+    SDL_Rect viewport;
+    SDL_Rect viewport_backup;
+
+    /* The clip rectangle within the window */
+    SDL_Rect clip_rect;
+    SDL_Rect clip_rect_backup;
+
+    /* The render output coordinate scale */
+    SDL_FPoint scale;
+    SDL_FPoint scale_backup;
+
+    /* The list of textures */
+    SDL_Texture *textures;
+    SDL_Texture *target;
+
+    Uint8 r, g, b, a;                   /**< Color for drawing operations values */
+    SDL_BlendMode blendMode;            /**< The drawing blend mode */
+
+    void *driverdata;
+};
+
+/* Define the SDL render driver structure */
+struct SDL_RenderDriver
+{
+    SDL_Renderer *(*CreateRenderer) (SDL_Window * window, Uint32 flags);
+
+    /* Info about the renderer capabilities */
+    SDL_RendererInfo info;
+};
+
+#if !SDL_RENDER_DISABLED
+
+#if SDL_VIDEO_RENDER_D3D
+extern SDL_RenderDriver D3D_RenderDriver;
+#endif
+#if SDL_VIDEO_RENDER_D3D11
+extern SDL_RenderDriver D3D11_RenderDriver;
+#endif
+#if SDL_VIDEO_RENDER_OGL
+extern SDL_RenderDriver GL_RenderDriver;
+#endif
+#if SDL_VIDEO_RENDER_OGL_ES2
+extern SDL_RenderDriver GLES2_RenderDriver;
+#endif
+#if SDL_VIDEO_RENDER_OGL_ES
+extern SDL_RenderDriver GLES_RenderDriver;
+#endif
+#if SDL_VIDEO_RENDER_DIRECTFB
+extern SDL_RenderDriver DirectFB_RenderDriver;
+#endif
+#if SDL_VIDEO_RENDER_PSP
+extern SDL_RenderDriver PSP_RenderDriver;
+#endif
+extern SDL_RenderDriver SW_RenderDriver;
+
+#endif /* !SDL_RENDER_DISABLED */
+
+#endif /* _SDL_sysrender_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/SDL_yuv_mmx.c b/Source/3rd Party/sdl/src/render/SDL_yuv_mmx.c
new file mode 100644
index 000000000..e4ae4acbd
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/SDL_yuv_mmx.c	
@@ -0,0 +1,431 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
+
+#include "SDL_stdinc.h"
+
+#include "mmx.h"
+
+/* *INDENT-OFF* */
+
+static mmx_t MMX_0080w    = { .ud = {0x00800080, 0x00800080} };
+static mmx_t MMX_00FFw    = { .ud = {0x00ff00ff, 0x00ff00ff} };
+static mmx_t MMX_FF00w    = { .ud = {0xff00ff00, 0xff00ff00} };
+
+static mmx_t MMX_Ycoeff   = { .uw = {0x004a, 0x004a, 0x004a, 0x004a} };
+
+static mmx_t MMX_UbluRGB  = { .uw = {0x0072, 0x0072, 0x0072, 0x0072} };
+static mmx_t MMX_VredRGB  = { .uw = {0x0059, 0x0059, 0x0059, 0x0059} };
+static mmx_t MMX_UgrnRGB  = { .uw = {0xffea, 0xffea, 0xffea, 0xffea} };
+static mmx_t MMX_VgrnRGB  = { .uw = {0xffd2, 0xffd2, 0xffd2, 0xffd2} };
+
+static mmx_t MMX_Ublu5x5  = { .uw = {0x0081, 0x0081, 0x0081, 0x0081} };
+static mmx_t MMX_Vred5x5  = { .uw = {0x0066, 0x0066, 0x0066, 0x0066} };
+static mmx_t MMX_Ugrn565  = { .uw = {0xffe8, 0xffe8, 0xffe8, 0xffe8} };
+static mmx_t MMX_Vgrn565  = { .uw = {0xffcd, 0xffcd, 0xffcd, 0xffcd} };
+
+static mmx_t MMX_red565   = { .uw = {0xf800, 0xf800, 0xf800, 0xf800} };
+static mmx_t MMX_grn565   = { .uw = {0x07e0, 0x07e0, 0x07e0, 0x07e0} };
+
+/**
+   This MMX assembler is my first assembler/MMX program ever.
+   Thus it maybe buggy.
+   Send patches to:
+   mvogt@rhrk.uni-kl.de
+
+   After it worked fine I have "obfuscated" the code a bit to have
+   more parallism in the MMX units. This means I moved
+   initilisation around and delayed other instruction.
+   Performance measurement did not show that this brought any advantage
+   but in theory it _should_ be faster this way.
+
+   The overall performanve gain to the C based dither was 30%-40%.
+   The MMX routine calculates 256bit=8RGB values in each cycle
+   (4 for row1 & 4 for row2)
+
+   The red/green/blue.. coefficents are taken from the mpeg_play
+   player. They look nice, but I dont know if you can have
+   better values, to avoid integer rounding errors.
+
+
+   IMPORTANT:
+   ==========
+
+   It is a requirement that the cr/cb/lum are 8 byte aligned and
+   the out are 16byte aligned or you will/may get segfaults
+
+*/
+
+void ColorRGBDitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix,
+                              unsigned char *lum, unsigned char *cr,
+                              unsigned char *cb, unsigned char *out,
+                              int rows, int cols, int mod )
+{
+    Uint32 *row1;
+    Uint32 *row2;
+
+    unsigned char* y = lum +cols*rows;    /* Pointer to the end */
+    int x = 0;
+    row1 = (Uint32 *)out;                 /* 32 bit target */
+    row2 = (Uint32 *)out+cols+mod;        /* start of second row */
+    mod = (mod+cols+mod)*4;               /* increment for row1 in byte */
+
+    __asm__ __volatile__ (
+        /* tap dance to workaround the inability to use %%ebx at will... */
+        /*  move one thing to the stack... */
+        "pushl $0\n"  /* save a slot on the stack. */
+        "pushl %%ebx\n"  /* save %%ebx. */
+        "movl %0, %%ebx\n"  /* put the thing in ebx. */
+        "movl %%ebx,4(%%esp)\n"  /* put the thing in the stack slot. */
+        "popl %%ebx\n"  /* get back %%ebx (the PIC register). */
+
+        ".align 8\n"
+        "1:\n"
+
+        /* create Cr (result in mm1) */
+        "pushl %%ebx\n"
+        "movl 4(%%esp),%%ebx\n"
+        "movd (%%ebx),%%mm1\n"   /*         0  0  0  0  v3 v2 v1 v0 */
+        "popl %%ebx\n"
+        "pxor %%mm7,%%mm7\n"      /*         00 00 00 00 00 00 00 00 */
+        "movd (%2), %%mm2\n"           /*    0  0  0  0 l3 l2 l1 l0 */
+        "punpcklbw %%mm7,%%mm1\n" /*         0  v3 0  v2 00 v1 00 v0 */
+        "punpckldq %%mm1,%%mm1\n" /*         00 v1 00 v0 00 v1 00 v0 */
+        "psubw %9,%%mm1\n"        /* mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 */
+
+        /* create Cr_g (result in mm0) */
+        "movq %%mm1,%%mm0\n"           /* r1 r1 r0 r0 r1 r1 r0 r0 */
+        "pmullw %10,%%mm0\n"           /* red*-46dec=0.7136*64 */
+        "pmullw %11,%%mm1\n"           /* red*89dec=1.4013*64 */
+        "psraw  $6, %%mm0\n"           /* red=red/64 */
+        "psraw  $6, %%mm1\n"           /* red=red/64 */
+
+        /* create L1 L2 (result in mm2,mm4) */
+        /* L2=lum+cols */
+        "movq (%2,%4),%%mm3\n"         /*    0  0  0  0 L3 L2 L1 L0 */
+        "punpckldq %%mm3,%%mm2\n"      /*   L3 L2 L1 L0 l3 l2 l1 l0 */
+        "movq %%mm2,%%mm4\n"           /*   L3 L2 L1 L0 l3 l2 l1 l0 */
+        "pand %12,%%mm2\n"             /*   L3 0  L1  0 l3  0 l1  0 */
+        "pand %13,%%mm4\n"             /*   0  L2  0 L0  0 l2  0 l0 */
+        "psrlw $8,%%mm2\n"             /*   0  L3  0 L1  0 l3  0 l1 */
+
+        /* create R (result in mm6) */
+        "movq %%mm2,%%mm5\n"           /*   0 L3  0 L1  0 l3  0 l1 */
+        "movq %%mm4,%%mm6\n"           /*   0 L2  0 L0  0 l2  0 l0 */
+        "paddsw  %%mm1, %%mm5\n"       /* lum1+red:x R3 x R1 x r3 x r1 */
+        "paddsw  %%mm1, %%mm6\n"       /* lum1+red:x R2 x R0 x r2 x r0 */
+        "packuswb %%mm5,%%mm5\n"       /*  R3 R1 r3 r1 R3 R1 r3 r1 */
+        "packuswb %%mm6,%%mm6\n"       /*  R2 R0 r2 r0 R2 R0 r2 r0 */
+        "pxor %%mm7,%%mm7\n"      /*         00 00 00 00 00 00 00 00 */
+        "punpcklbw %%mm5,%%mm6\n"      /*  R3 R2 R1 R0 r3 r2 r1 r0 */
+
+        /* create Cb (result in mm1) */
+        "movd (%1), %%mm1\n"      /*         0  0  0  0  u3 u2 u1 u0 */
+        "punpcklbw %%mm7,%%mm1\n" /*         0  u3 0  u2 00 u1 00 u0 */
+        "punpckldq %%mm1,%%mm1\n" /*         00 u1 00 u0 00 u1 00 u0 */
+        "psubw %9,%%mm1\n"        /* mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 */
+
+        /* create Cb_g (result in mm5) */
+        "movq %%mm1,%%mm5\n"            /* u1 u1 u0 u0 u1 u1 u0 u0 */
+        "pmullw %14,%%mm5\n"            /* blue*-109dec=1.7129*64 */
+        "pmullw %15,%%mm1\n"            /* blue*114dec=1.78125*64 */
+        "psraw  $6, %%mm5\n"            /* blue=red/64 */
+        "psraw  $6, %%mm1\n"            /* blue=blue/64 */
+
+        /* create G (result in mm7) */
+        "movq %%mm2,%%mm3\n"      /*   0  L3  0 L1  0 l3  0 l1 */
+        "movq %%mm4,%%mm7\n"      /*   0  L2  0 L0  0 l2  0 l1 */
+        "paddsw  %%mm5, %%mm3\n"  /* lum1+Cb_g:x G3t x G1t x g3t x g1t */
+        "paddsw  %%mm5, %%mm7\n"  /* lum1+Cb_g:x G2t x G0t x g2t x g0t */
+        "paddsw  %%mm0, %%mm3\n"  /* lum1+Cr_g:x G3  x G1  x g3  x g1 */
+        "paddsw  %%mm0, %%mm7\n"  /* lum1+blue:x G2  x G0  x g2  x g0 */
+        "packuswb %%mm3,%%mm3\n"  /* G3 G1 g3 g1 G3 G1 g3 g1 */
+        "packuswb %%mm7,%%mm7\n"  /* G2 G0 g2 g0 G2 G0 g2 g0 */
+        "punpcklbw %%mm3,%%mm7\n" /* G3 G2 G1 G0 g3 g2 g1 g0 */
+
+        /* create B (result in mm5) */
+        "movq %%mm2,%%mm3\n"         /*   0  L3  0 L1  0 l3  0 l1 */
+        "movq %%mm4,%%mm5\n"         /*   0  L2  0 L0  0 l2  0 l1 */
+        "paddsw  %%mm1, %%mm3\n"     /* lum1+blue:x B3 x B1 x b3 x b1 */
+        "paddsw  %%mm1, %%mm5\n"     /* lum1+blue:x B2 x B0 x b2 x b0 */
+        "packuswb %%mm3,%%mm3\n"     /* B3 B1 b3 b1 B3 B1 b3 b1 */
+        "packuswb %%mm5,%%mm5\n"     /* B2 B0 b2 b0 B2 B0 b2 b0 */
+        "punpcklbw %%mm3,%%mm5\n"    /* B3 B2 B1 B0 b3 b2 b1 b0 */
+
+        /* fill destination row1 (needed are mm6=Rr,mm7=Gg,mm5=Bb) */
+
+        "pxor %%mm2,%%mm2\n"           /*  0  0  0  0  0  0  0  0 */
+        "pxor %%mm4,%%mm4\n"           /*  0  0  0  0  0  0  0  0 */
+        "movq %%mm6,%%mm1\n"           /* R3 R2 R1 R0 r3 r2 r1 r0 */
+        "movq %%mm5,%%mm3\n"           /* B3 B2 B1 B0 b3 b2 b1 b0 */
+
+        /* process lower lum */
+        "punpcklbw %%mm4,%%mm1\n"      /*  0 r3  0 r2  0 r1  0 r0 */
+        "punpcklbw %%mm4,%%mm3\n"      /*  0 b3  0 b2  0 b1  0 b0 */
+        "movq %%mm1,%%mm2\n"           /*  0 r3  0 r2  0 r1  0 r0 */
+        "movq %%mm3,%%mm0\n"           /*  0 b3  0 b2  0 b1  0 b0 */
+        "punpcklwd %%mm1,%%mm3\n"      /*  0 r1  0 b1  0 r0  0 b0 */
+        "punpckhwd %%mm2,%%mm0\n"      /*  0 r3  0 b3  0 r2  0 b2 */
+
+        "pxor %%mm2,%%mm2\n"           /*  0  0  0  0  0  0  0  0 */
+        "movq %%mm7,%%mm1\n"           /* G3 G2 G1 G0 g3 g2 g1 g0 */
+        "punpcklbw %%mm1,%%mm2\n"      /* g3  0 g2  0 g1  0 g0  0 */
+        "punpcklwd %%mm4,%%mm2\n"      /*  0  0 g1  0  0  0 g0  0 */
+        "por %%mm3, %%mm2\n"          /*  0 r1 g1 b1  0 r0 g0 b0 */
+        "movq %%mm2,(%3)\n"          /* wrote out ! row1 */
+
+        "pxor %%mm2,%%mm2\n"           /*  0  0  0  0  0  0  0  0 */
+        "punpcklbw %%mm1,%%mm4\n"      /* g3  0 g2  0 g1  0 g0  0 */
+        "punpckhwd %%mm2,%%mm4\n"      /*  0  0 g3  0  0  0 g2  0 */
+        "por %%mm0, %%mm4\n"          /*  0 r3 g3 b3  0 r2 g2 b2 */
+        "movq %%mm4,8(%3)\n"         /* wrote out ! row1 */
+
+        /* fill destination row2 (needed are mm6=Rr,mm7=Gg,mm5=Bb) */
+        /* this can be done "destructive" */
+        "pxor %%mm2,%%mm2\n"           /*  0  0  0  0  0  0  0  0 */
+        "punpckhbw %%mm2,%%mm6\n"      /*  0 R3  0 R2  0 R1  0 R0 */
+        "punpckhbw %%mm1,%%mm5\n"      /* G3 B3 G2 B2 G1 B1 G0 B0 */
+        "movq %%mm5,%%mm1\n"           /* G3 B3 G2 B2 G1 B1 G0 B0 */
+        "punpcklwd %%mm6,%%mm1\n"      /*  0 R1 G1 B1  0 R0 G0 B0 */
+        "movq %%mm1,(%5)\n"          /* wrote out ! row2 */
+        "punpckhwd %%mm6,%%mm5\n"      /*  0 R3 G3 B3  0 R2 G2 B2 */
+        "movq %%mm5,8(%5)\n"         /* wrote out ! row2 */
+
+        "addl $4,%2\n"            /* lum+4 */
+        "leal 16(%3),%3\n"        /* row1+16 */
+        "leal 16(%5),%5\n"        /* row2+16 */
+        "addl $2,(%%esp)\n"        /* cr+2 */
+        "addl $2,%1\n"           /* cb+2 */
+
+        "addl $4,%6\n"            /* x+4 */
+        "cmpl %4,%6\n"
+
+        "jl 1b\n"
+        "addl %4,%2\n" /* lum += cols */
+        "addl %8,%3\n" /* row1+= mod */
+        "addl %8,%5\n" /* row2+= mod */
+        "movl $0,%6\n" /* x=0 */
+        "cmpl %7,%2\n"
+        "jl 1b\n"
+
+        "addl $4,%%esp\n"  /* get rid of the stack slot we reserved. */
+        "emms\n"  /* reset MMX registers. */
+        :
+        : "m" (cr), "r"(cb),"r"(lum),
+          "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
+          "m"(MMX_0080w),"m"(MMX_VgrnRGB),"m"(MMX_VredRGB),
+          "m"(MMX_FF00w),"m"(MMX_00FFw),"m"(MMX_UgrnRGB),
+          "m"(MMX_UbluRGB)
+    );
+}
+
+void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix,
+                             unsigned char *lum, unsigned char *cr,
+                             unsigned char *cb, unsigned char *out,
+                             int rows, int cols, int mod )
+{
+    Uint16 *row1;
+    Uint16 *row2;
+
+    unsigned char* y = lum +cols*rows;    /* Pointer to the end */
+    int x = 0;
+    row1 = (Uint16 *)out;                 /* 16 bit target */
+    row2 = (Uint16 *)out+cols+mod;        /* start of second row  */
+    mod = (mod+cols+mod)*2;               /* increment for row1 in byte */
+
+    __asm__ __volatile__(
+        /* tap dance to workaround the inability to use %%ebx at will... */
+        /*  move one thing to the stack... */
+        "pushl $0\n"  /* save a slot on the stack. */
+        "pushl %%ebx\n"  /* save %%ebx. */
+        "movl %0, %%ebx\n"  /* put the thing in ebx. */
+        "movl %%ebx, 4(%%esp)\n"  /* put the thing in the stack slot. */
+        "popl %%ebx\n"  /* get back %%ebx (the PIC register). */
+
+        ".align 8\n"
+        "1:\n"
+
+        "movd           (%1),                   %%mm0\n" /* 4 Cb         0  0  0  0 u3 u2 u1 u0 */
+        "pxor           %%mm7,                  %%mm7\n"
+        "pushl %%ebx\n"
+        "movl 4(%%esp), %%ebx\n"
+        "movd (%%ebx), %%mm1\n"   /* 4 Cr                0  0  0  0 v3 v2 v1 v0 */
+        "popl %%ebx\n"
+
+        "punpcklbw      %%mm7,                  %%mm0\n" /* 4 W cb   0 u3  0 u2  0 u1  0 u0 */
+        "punpcklbw      %%mm7,                  %%mm1\n" /* 4 W cr   0 v3  0 v2  0 v1  0 v0 */
+        "psubw          %9,                     %%mm0\n"
+        "psubw          %9,                     %%mm1\n"
+        "movq           %%mm0,                  %%mm2\n" /* Cb                   0 u3  0 u2  0 u1  0 u0 */
+        "movq           %%mm1,                  %%mm3\n" /* Cr */
+        "pmullw         %10,                    %%mm2\n" /* Cb2green 0 R3  0 R2  0 R1  0 R0 */
+        "movq           (%2),                   %%mm6\n" /* L1      l7 L6 L5 L4 L3 L2 L1 L0 */
+        "pmullw         %11,                    %%mm0\n" /* Cb2blue */
+        "pand           %12,                    %%mm6\n" /* L1      00 L6 00 L4 00 L2 00 L0 */
+        "pmullw         %13,                    %%mm3\n" /* Cr2green */
+        "movq           (%2),                   %%mm7\n" /* L2 */
+        "pmullw         %14,                    %%mm1\n" /* Cr2red */
+        "psrlw          $8,                     %%mm7\n"        /* L2           00 L7 00 L5 00 L3 00 L1 */
+        "pmullw         %15,                    %%mm6\n" /* lum1 */
+        "paddw          %%mm3,                  %%mm2\n" /* Cb2green + Cr2green == green */
+        "pmullw         %15,                    %%mm7\n" /* lum2 */
+
+        "movq           %%mm6,                  %%mm4\n" /* lum1 */
+        "paddw          %%mm0,                  %%mm6\n" /* lum1 +blue 00 B6 00 B4 00 B2 00 B0 */
+        "movq           %%mm4,                  %%mm5\n" /* lum1 */
+        "paddw          %%mm1,                  %%mm4\n" /* lum1 +red  00 R6 00 R4 00 R2 00 R0 */
+        "paddw          %%mm2,                  %%mm5\n" /* lum1 +green 00 G6 00 G4 00 G2 00 G0 */
+        "psraw          $6,                     %%mm4\n" /* R1 0 .. 64 */
+        "movq           %%mm7,                  %%mm3\n" /* lum2                       00 L7 00 L5 00 L3 00 L1 */
+        "psraw          $6,                     %%mm5\n" /* G1  - .. + */
+        "paddw          %%mm0,                  %%mm7\n" /* Lum2 +blue 00 B7 00 B5 00 B3 00 B1 */
+        "psraw          $6,                     %%mm6\n" /* B1         0 .. 64 */
+        "packuswb       %%mm4,                  %%mm4\n" /* R1 R1 */
+        "packuswb       %%mm5,                  %%mm5\n" /* G1 G1 */
+        "packuswb       %%mm6,                  %%mm6\n" /* B1 B1 */
+        "punpcklbw      %%mm4,                  %%mm4\n"
+        "punpcklbw      %%mm5,                  %%mm5\n"
+
+        "pand           %16,                    %%mm4\n"
+        "psllw          $3,                     %%mm5\n" /* GREEN       1 */
+        "punpcklbw      %%mm6,                  %%mm6\n"
+        "pand           %17,                    %%mm5\n"
+        "pand           %16,                    %%mm6\n"
+        "por            %%mm5,                  %%mm4\n" /* */
+        "psrlw          $11,                    %%mm6\n" /* BLUE        1 */
+        "movq           %%mm3,                  %%mm5\n" /* lum2 */
+        "paddw          %%mm1,                  %%mm3\n" /* lum2 +red      00 R7 00 R5 00 R3 00 R1 */
+        "paddw          %%mm2,                  %%mm5\n" /* lum2 +green 00 G7 00 G5 00 G3 00 G1 */
+        "psraw          $6,                     %%mm3\n" /* R2 */
+        "por            %%mm6,                  %%mm4\n" /* MM4 */
+        "psraw          $6,                     %%mm5\n" /* G2 */
+        "movq           (%2, %4),               %%mm6\n" /* L3 load lum2 */
+        "psraw          $6,                     %%mm7\n"
+        "packuswb       %%mm3,                  %%mm3\n"
+        "packuswb       %%mm5,                  %%mm5\n"
+        "packuswb       %%mm7,                  %%mm7\n"
+        "pand           %12,                    %%mm6\n" /* L3 */
+        "punpcklbw      %%mm3,                  %%mm3\n"
+        "punpcklbw      %%mm5,                  %%mm5\n"
+        "pmullw         %15,                    %%mm6\n" /* lum3 */
+        "punpcklbw      %%mm7,                  %%mm7\n"
+        "psllw          $3,                     %%mm5\n" /* GREEN 2 */
+        "pand           %16,                    %%mm7\n"
+        "pand           %16,                    %%mm3\n"
+        "psrlw          $11,                    %%mm7\n" /* BLUE  2 */
+        "pand           %17,                    %%mm5\n"
+        "por            %%mm7,                  %%mm3\n"
+        "movq           (%2,%4),                %%mm7\n" /* L4 load lum2 */
+        "por            %%mm5,                  %%mm3\n"
+        "psrlw          $8,                     %%mm7\n" /* L4 */
+        "movq           %%mm4,                  %%mm5\n"
+        "punpcklwd      %%mm3,                  %%mm4\n"
+        "pmullw         %15,                    %%mm7\n" /* lum4 */
+        "punpckhwd      %%mm3,                  %%mm5\n"
+
+        "movq           %%mm4,                  (%3)\n"  /* write row1 */
+        "movq           %%mm5,                  8(%3)\n" /* write row1 */
+
+        "movq           %%mm6,                  %%mm4\n" /* Lum3 */
+        "paddw          %%mm0,                  %%mm6\n" /* Lum3 +blue */
+
+        "movq           %%mm4,                  %%mm5\n" /* Lum3 */
+        "paddw          %%mm1,                  %%mm4\n" /* Lum3 +red */
+        "paddw          %%mm2,                  %%mm5\n" /* Lum3 +green */
+        "psraw          $6,                     %%mm4\n"
+        "movq           %%mm7,                  %%mm3\n" /* Lum4 */
+        "psraw          $6,                     %%mm5\n"
+        "paddw          %%mm0,                  %%mm7\n" /* Lum4 +blue */
+        "psraw          $6,                     %%mm6\n" /* Lum3 +blue */
+        "movq           %%mm3,                  %%mm0\n" /* Lum4 */
+        "packuswb       %%mm4,                  %%mm4\n"
+        "paddw          %%mm1,                  %%mm3\n" /* Lum4 +red */
+        "packuswb       %%mm5,                  %%mm5\n"
+        "paddw          %%mm2,                  %%mm0\n" /* Lum4 +green */
+        "packuswb       %%mm6,                  %%mm6\n"
+        "punpcklbw      %%mm4,                  %%mm4\n"
+        "punpcklbw      %%mm5,                  %%mm5\n"
+        "punpcklbw      %%mm6,                  %%mm6\n"
+        "psllw          $3,                     %%mm5\n" /* GREEN 3 */
+        "pand           %16,                    %%mm4\n"
+        "psraw          $6,                     %%mm3\n" /* psr 6 */
+        "psraw          $6,                     %%mm0\n"
+        "pand           %16,                    %%mm6\n" /* BLUE */
+        "pand           %17,                    %%mm5\n"
+        "psrlw          $11,                    %%mm6\n" /* BLUE  3 */
+        "por            %%mm5,                  %%mm4\n"
+        "psraw          $6,                     %%mm7\n"
+        "por            %%mm6,                  %%mm4\n"
+        "packuswb       %%mm3,                  %%mm3\n"
+        "packuswb       %%mm0,                  %%mm0\n"
+        "packuswb       %%mm7,                  %%mm7\n"
+        "punpcklbw      %%mm3,                  %%mm3\n"
+        "punpcklbw      %%mm0,                  %%mm0\n"
+        "punpcklbw      %%mm7,                  %%mm7\n"
+        "pand           %16,                    %%mm3\n"
+        "pand           %16,                    %%mm7\n" /* BLUE */
+        "psllw          $3,                     %%mm0\n" /* GREEN 4 */
+        "psrlw          $11,                    %%mm7\n"
+        "pand           %17,                    %%mm0\n"
+        "por            %%mm7,                  %%mm3\n"
+        "por            %%mm0,                  %%mm3\n"
+
+        "movq           %%mm4,                  %%mm5\n"
+
+        "punpcklwd      %%mm3,                  %%mm4\n"
+        "punpckhwd      %%mm3,                  %%mm5\n"
+
+        "movq           %%mm4,                  (%5)\n"
+        "movq           %%mm5,                  8(%5)\n"
+
+        "addl           $8,                     %6\n"
+        "addl           $8,                     %2\n"
+        "addl           $4,                     (%%esp)\n"
+        "addl           $4,                     %1\n"
+        "cmpl           %4,                     %6\n"
+        "leal           16(%3),                 %3\n"
+        "leal           16(%5),%5\n" /* row2+16 */
+
+        "jl             1b\n"
+        "addl           %4,     %2\n" /* lum += cols */
+        "addl           %8,     %3\n" /* row1+= mod */
+        "addl           %8,     %5\n" /* row2+= mod */
+        "movl           $0,     %6\n" /* x=0 */
+        "cmpl           %7,     %2\n"
+        "jl             1b\n"
+        "addl $4, %%esp\n"  /* get rid of the stack slot we reserved. */
+        "emms\n"
+        :
+        : "m" (cr), "r"(cb),"r"(lum),
+          "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod),
+          "m"(MMX_0080w),"m"(MMX_Ugrn565),"m"(MMX_Ublu5x5),
+          "m"(MMX_00FFw),"m"(MMX_Vgrn565),"m"(MMX_Vred5x5),
+          "m"(MMX_Ycoeff),"m"(MMX_red565),"m"(MMX_grn565)
+    );
+}
+
+/* *INDENT-ON* */
+
+#endif /* GCC3 i386 inline assembly */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/SDL_yuv_sw.c b/Source/3rd Party/sdl/src/render/SDL_yuv_sw.c
new file mode 100644
index 000000000..af685b9d4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/SDL_yuv_sw.c	
@@ -0,0 +1,1400 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This is the software implementation of the YUV texture support */
+
+/* This code was derived from code carrying the following copyright notices:
+
+ * Copyright (c) 1995 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice and the following
+ * two paragraphs appear in all copies of this software.
+ *
+ * IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ * CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+ * Copyright (c) 1995 Erik Corry
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement is
+ * hereby granted, provided that the above copyright notice and the following
+ * two paragraphs appear in all copies of this software.
+ *
+ * IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+ * SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+ * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ERIK CORRY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+ * BASIS, AND ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+ * Portions of this software Copyright (c) 1995 Brown University.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose, without fee, and without written agreement
+ * is hereby granted, provided that the above copyright notice and the
+ * following two paragraphs appear in all copies of this software.
+ *
+ * IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
+ * OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
+ * UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * BROWN UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+ * BASIS, AND BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
+ * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+
+#include "SDL_assert.h"
+#include "SDL_video.h"
+#include "SDL_cpuinfo.h"
+#include "SDL_yuv_sw_c.h"
+
+
+/* The colorspace conversion functions */
+
+#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
+extern void Color565DitherYV12MMX1X(int *colortab, Uint32 * rgb_2_pix,
+                                    unsigned char *lum, unsigned char *cr,
+                                    unsigned char *cb, unsigned char *out,
+                                    int rows, int cols, int mod);
+extern void ColorRGBDitherYV12MMX1X(int *colortab, Uint32 * rgb_2_pix,
+                                    unsigned char *lum, unsigned char *cr,
+                                    unsigned char *cb, unsigned char *out,
+                                    int rows, int cols, int mod);
+#endif
+
+static void
+Color16DitherYV12Mod1X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned short *row1;
+    unsigned short *row2;
+    unsigned char *lum2;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    row1 = (unsigned short *) out;
+    row2 = row1 + cols + mod;
+    lum2 = lum + cols;
+
+    mod += cols + mod;
+
+    y = rows / 2;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            ++cr;
+            ++cb;
+
+            L = *lum++;
+            *row1++ = (unsigned short) (rgb_2_pix[L + cr_r] |
+                                        rgb_2_pix[L + crb_g] |
+                                        rgb_2_pix[L + cb_b]);
+
+            L = *lum++;
+            *row1++ = (unsigned short) (rgb_2_pix[L + cr_r] |
+                                        rgb_2_pix[L + crb_g] |
+                                        rgb_2_pix[L + cb_b]);
+
+
+            /* Now, do second row.  */
+
+            L = *lum2++;
+            *row2++ = (unsigned short) (rgb_2_pix[L + cr_r] |
+                                        rgb_2_pix[L + crb_g] |
+                                        rgb_2_pix[L + cb_b]);
+
+            L = *lum2++;
+            *row2++ = (unsigned short) (rgb_2_pix[L + cr_r] |
+                                        rgb_2_pix[L + crb_g] |
+                                        rgb_2_pix[L + cb_b]);
+        }
+
+        /*
+         * These values are at the start of the next line, (due
+         * to the ++'s above),but they need to be at the start
+         * of the line after that.
+         */
+        lum += cols;
+        lum2 += cols;
+        row1 += mod;
+        row2 += mod;
+    }
+}
+
+static void
+Color24DitherYV12Mod1X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int value;
+    unsigned char *row1;
+    unsigned char *row2;
+    unsigned char *lum2;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    row1 = out;
+    row2 = row1 + cols * 3 + mod * 3;
+    lum2 = lum + cols;
+
+    mod += cols + mod;
+    mod *= 3;
+
+    y = rows / 2;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            ++cr;
+            ++cb;
+
+            L = *lum++;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            *row1++ = (value) & 0xFF;
+            *row1++ = (value >> 8) & 0xFF;
+            *row1++ = (value >> 16) & 0xFF;
+
+            L = *lum++;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            *row1++ = (value) & 0xFF;
+            *row1++ = (value >> 8) & 0xFF;
+            *row1++ = (value >> 16) & 0xFF;
+
+
+            /* Now, do second row.  */
+
+            L = *lum2++;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            *row2++ = (value) & 0xFF;
+            *row2++ = (value >> 8) & 0xFF;
+            *row2++ = (value >> 16) & 0xFF;
+
+            L = *lum2++;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            *row2++ = (value) & 0xFF;
+            *row2++ = (value >> 8) & 0xFF;
+            *row2++ = (value >> 16) & 0xFF;
+        }
+
+        /*
+         * These values are at the start of the next line, (due
+         * to the ++'s above),but they need to be at the start
+         * of the line after that.
+         */
+        lum += cols;
+        lum2 += cols;
+        row1 += mod;
+        row2 += mod;
+    }
+}
+
+static void
+Color32DitherYV12Mod1X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int *row1;
+    unsigned int *row2;
+    unsigned char *lum2;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    row1 = (unsigned int *) out;
+    row2 = row1 + cols + mod;
+    lum2 = lum + cols;
+
+    mod += cols + mod;
+
+    y = rows / 2;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            ++cr;
+            ++cb;
+
+            L = *lum++;
+            *row1++ = (rgb_2_pix[L + cr_r] |
+                       rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+
+            L = *lum++;
+            *row1++ = (rgb_2_pix[L + cr_r] |
+                       rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+
+
+            /* Now, do second row.  */
+
+            L = *lum2++;
+            *row2++ = (rgb_2_pix[L + cr_r] |
+                       rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+
+            L = *lum2++;
+            *row2++ = (rgb_2_pix[L + cr_r] |
+                       rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+        }
+
+        /*
+         * These values are at the start of the next line, (due
+         * to the ++'s above),but they need to be at the start
+         * of the line after that.
+         */
+        lum += cols;
+        lum2 += cols;
+        row1 += mod;
+        row2 += mod;
+    }
+}
+
+/*
+ * In this function I make use of a nasty trick. The tables have the lower
+ * 16 bits replicated in the upper 16. This means I can write ints and get
+ * the horisontal doubling for free (almost).
+ */
+static void
+Color16DitherYV12Mod2X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int *row1 = (unsigned int *) out;
+    const int next_row = cols + (mod / 2);
+    unsigned int *row2 = row1 + 2 * next_row;
+    unsigned char *lum2;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    lum2 = lum + cols;
+
+    mod = (next_row * 3) + (mod / 2);
+
+    y = rows / 2;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            ++cr;
+            ++cb;
+
+            L = *lum++;
+            row1[0] = row1[next_row] = (rgb_2_pix[L + cr_r] |
+                                        rgb_2_pix[L + crb_g] |
+                                        rgb_2_pix[L + cb_b]);
+            row1++;
+
+            L = *lum++;
+            row1[0] = row1[next_row] = (rgb_2_pix[L + cr_r] |
+                                        rgb_2_pix[L + crb_g] |
+                                        rgb_2_pix[L + cb_b]);
+            row1++;
+
+
+            /* Now, do second row. */
+
+            L = *lum2++;
+            row2[0] = row2[next_row] = (rgb_2_pix[L + cr_r] |
+                                        rgb_2_pix[L + crb_g] |
+                                        rgb_2_pix[L + cb_b]);
+            row2++;
+
+            L = *lum2++;
+            row2[0] = row2[next_row] = (rgb_2_pix[L + cr_r] |
+                                        rgb_2_pix[L + crb_g] |
+                                        rgb_2_pix[L + cb_b]);
+            row2++;
+        }
+
+        /*
+         * These values are at the start of the next line, (due
+         * to the ++'s above),but they need to be at the start
+         * of the line after that.
+         */
+        lum += cols;
+        lum2 += cols;
+        row1 += mod;
+        row2 += mod;
+    }
+}
+
+static void
+Color24DitherYV12Mod2X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int value;
+    unsigned char *row1 = out;
+    const int next_row = (cols * 2 + mod) * 3;
+    unsigned char *row2 = row1 + 2 * next_row;
+    unsigned char *lum2;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    lum2 = lum + cols;
+
+    mod = next_row * 3 + mod * 3;
+
+    y = rows / 2;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            ++cr;
+            ++cb;
+
+            L = *lum++;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row1[0 + 0] = row1[3 + 0] = row1[next_row + 0] =
+                row1[next_row + 3 + 0] = (value) & 0xFF;
+            row1[0 + 1] = row1[3 + 1] = row1[next_row + 1] =
+                row1[next_row + 3 + 1] = (value >> 8) & 0xFF;
+            row1[0 + 2] = row1[3 + 2] = row1[next_row + 2] =
+                row1[next_row + 3 + 2] = (value >> 16) & 0xFF;
+            row1 += 2 * 3;
+
+            L = *lum++;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row1[0 + 0] = row1[3 + 0] = row1[next_row + 0] =
+                row1[next_row + 3 + 0] = (value) & 0xFF;
+            row1[0 + 1] = row1[3 + 1] = row1[next_row + 1] =
+                row1[next_row + 3 + 1] = (value >> 8) & 0xFF;
+            row1[0 + 2] = row1[3 + 2] = row1[next_row + 2] =
+                row1[next_row + 3 + 2] = (value >> 16) & 0xFF;
+            row1 += 2 * 3;
+
+
+            /* Now, do second row. */
+
+            L = *lum2++;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row2[0 + 0] = row2[3 + 0] = row2[next_row + 0] =
+                row2[next_row + 3 + 0] = (value) & 0xFF;
+            row2[0 + 1] = row2[3 + 1] = row2[next_row + 1] =
+                row2[next_row + 3 + 1] = (value >> 8) & 0xFF;
+            row2[0 + 2] = row2[3 + 2] = row2[next_row + 2] =
+                row2[next_row + 3 + 2] = (value >> 16) & 0xFF;
+            row2 += 2 * 3;
+
+            L = *lum2++;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row2[0 + 0] = row2[3 + 0] = row2[next_row + 0] =
+                row2[next_row + 3 + 0] = (value) & 0xFF;
+            row2[0 + 1] = row2[3 + 1] = row2[next_row + 1] =
+                row2[next_row + 3 + 1] = (value >> 8) & 0xFF;
+            row2[0 + 2] = row2[3 + 2] = row2[next_row + 2] =
+                row2[next_row + 3 + 2] = (value >> 16) & 0xFF;
+            row2 += 2 * 3;
+        }
+
+        /*
+         * These values are at the start of the next line, (due
+         * to the ++'s above),but they need to be at the start
+         * of the line after that.
+         */
+        lum += cols;
+        lum2 += cols;
+        row1 += mod;
+        row2 += mod;
+    }
+}
+
+static void
+Color32DitherYV12Mod2X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int *row1 = (unsigned int *) out;
+    const int next_row = cols * 2 + mod;
+    unsigned int *row2 = row1 + 2 * next_row;
+    unsigned char *lum2;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    lum2 = lum + cols;
+
+    mod = (next_row * 3) + mod;
+
+    y = rows / 2;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            ++cr;
+            ++cb;
+
+            L = *lum++;
+            row1[0] = row1[1] = row1[next_row] = row1[next_row + 1] =
+                (rgb_2_pix[L + cr_r] |
+                 rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row1 += 2;
+
+            L = *lum++;
+            row1[0] = row1[1] = row1[next_row] = row1[next_row + 1] =
+                (rgb_2_pix[L + cr_r] |
+                 rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row1 += 2;
+
+
+            /* Now, do second row. */
+
+            L = *lum2++;
+            row2[0] = row2[1] = row2[next_row] = row2[next_row + 1] =
+                (rgb_2_pix[L + cr_r] |
+                 rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row2 += 2;
+
+            L = *lum2++;
+            row2[0] = row2[1] = row2[next_row] = row2[next_row + 1] =
+                (rgb_2_pix[L + cr_r] |
+                 rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row2 += 2;
+        }
+
+        /*
+         * These values are at the start of the next line, (due
+         * to the ++'s above),but they need to be at the start
+         * of the line after that.
+         */
+        lum += cols;
+        lum2 += cols;
+        row1 += mod;
+        row2 += mod;
+    }
+}
+
+static void
+Color16DitherYUY2Mod1X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned short *row;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    row = (unsigned short *) out;
+
+    y = rows;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            cr += 4;
+            cb += 4;
+
+            L = *lum;
+            lum += 2;
+            *row++ = (unsigned short) (rgb_2_pix[L + cr_r] |
+                                       rgb_2_pix[L + crb_g] |
+                                       rgb_2_pix[L + cb_b]);
+
+            L = *lum;
+            lum += 2;
+            *row++ = (unsigned short) (rgb_2_pix[L + cr_r] |
+                                       rgb_2_pix[L + crb_g] |
+                                       rgb_2_pix[L + cb_b]);
+
+        }
+
+        row += mod;
+    }
+}
+
+static void
+Color24DitherYUY2Mod1X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int value;
+    unsigned char *row;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    row = (unsigned char *) out;
+    mod *= 3;
+    y = rows;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            cr += 4;
+            cb += 4;
+
+            L = *lum;
+            lum += 2;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            *row++ = (value) & 0xFF;
+            *row++ = (value >> 8) & 0xFF;
+            *row++ = (value >> 16) & 0xFF;
+
+            L = *lum;
+            lum += 2;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            *row++ = (value) & 0xFF;
+            *row++ = (value >> 8) & 0xFF;
+            *row++ = (value >> 16) & 0xFF;
+
+        }
+        row += mod;
+    }
+}
+
+static void
+Color32DitherYUY2Mod1X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int *row;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    row = (unsigned int *) out;
+    y = rows;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            cr += 4;
+            cb += 4;
+
+            L = *lum;
+            lum += 2;
+            *row++ = (rgb_2_pix[L + cr_r] |
+                      rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+
+            L = *lum;
+            lum += 2;
+            *row++ = (rgb_2_pix[L + cr_r] |
+                      rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+
+
+        }
+        row += mod;
+    }
+}
+
+/*
+ * In this function I make use of a nasty trick. The tables have the lower
+ * 16 bits replicated in the upper 16. This means I can write ints and get
+ * the horisontal doubling for free (almost).
+ */
+static void
+Color16DitherYUY2Mod2X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int *row = (unsigned int *) out;
+    const int next_row = cols + (mod / 2);
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+
+    y = rows;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            cr += 4;
+            cb += 4;
+
+            L = *lum;
+            lum += 2;
+            row[0] = row[next_row] = (rgb_2_pix[L + cr_r] |
+                                      rgb_2_pix[L + crb_g] |
+                                      rgb_2_pix[L + cb_b]);
+            row++;
+
+            L = *lum;
+            lum += 2;
+            row[0] = row[next_row] = (rgb_2_pix[L + cr_r] |
+                                      rgb_2_pix[L + crb_g] |
+                                      rgb_2_pix[L + cb_b]);
+            row++;
+
+        }
+        row += next_row;
+    }
+}
+
+static void
+Color24DitherYUY2Mod2X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int value;
+    unsigned char *row = out;
+    const int next_row = (cols * 2 + mod) * 3;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+    y = rows;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            cr += 4;
+            cb += 4;
+
+            L = *lum;
+            lum += 2;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row[0 + 0] = row[3 + 0] = row[next_row + 0] =
+                row[next_row + 3 + 0] = (value) & 0xFF;
+            row[0 + 1] = row[3 + 1] = row[next_row + 1] =
+                row[next_row + 3 + 1] = (value >> 8) & 0xFF;
+            row[0 + 2] = row[3 + 2] = row[next_row + 2] =
+                row[next_row + 3 + 2] = (value >> 16) & 0xFF;
+            row += 2 * 3;
+
+            L = *lum;
+            lum += 2;
+            value = (rgb_2_pix[L + cr_r] |
+                     rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row[0 + 0] = row[3 + 0] = row[next_row + 0] =
+                row[next_row + 3 + 0] = (value) & 0xFF;
+            row[0 + 1] = row[3 + 1] = row[next_row + 1] =
+                row[next_row + 3 + 1] = (value >> 8) & 0xFF;
+            row[0 + 2] = row[3 + 2] = row[next_row + 2] =
+                row[next_row + 3 + 2] = (value >> 16) & 0xFF;
+            row += 2 * 3;
+
+        }
+        row += next_row;
+    }
+}
+
+static void
+Color32DitherYUY2Mod2X(int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod)
+{
+    unsigned int *row = (unsigned int *) out;
+    const int next_row = cols * 2 + mod;
+    int x, y;
+    int cr_r;
+    int crb_g;
+    int cb_b;
+    int cols_2 = cols / 2;
+    mod += mod;
+    y = rows;
+    while (y--) {
+        x = cols_2;
+        while (x--) {
+            register int L;
+
+            cr_r = 0 * 768 + 256 + colortab[*cr + 0 * 256];
+            crb_g = 1 * 768 + 256 + colortab[*cr + 1 * 256]
+                + colortab[*cb + 2 * 256];
+            cb_b = 2 * 768 + 256 + colortab[*cb + 3 * 256];
+            cr += 4;
+            cb += 4;
+
+            L = *lum;
+            lum += 2;
+            row[0] = row[1] = row[next_row] = row[next_row + 1] =
+                (rgb_2_pix[L + cr_r] |
+                 rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row += 2;
+
+            L = *lum;
+            lum += 2;
+            row[0] = row[1] = row[next_row] = row[next_row + 1] =
+                (rgb_2_pix[L + cr_r] |
+                 rgb_2_pix[L + crb_g] | rgb_2_pix[L + cb_b]);
+            row += 2;
+
+
+        }
+
+        row += next_row;
+    }
+}
+
+/*
+ * How many 1 bits are there in the Uint32.
+ * Low performance, do not call often.
+ */
+static int
+number_of_bits_set(Uint32 a)
+{
+    if (!a)
+        return 0;
+    if (a & 1)
+        return 1 + number_of_bits_set(a >> 1);
+    return (number_of_bits_set(a >> 1));
+}
+
+/*
+ * How many 0 bits are there at least significant end of Uint32.
+ * Low performance, do not call often.
+ */
+static int
+free_bits_at_bottom(Uint32 a)
+{
+    /* assume char is 8 bits */
+    if (!a)
+        return sizeof(Uint32) * 8;
+    if (((Sint32) a) & 1l)
+        return 0;
+    return 1 + free_bits_at_bottom(a >> 1);
+}
+
+static int
+SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
+{
+    Uint32 *r_2_pix_alloc;
+    Uint32 *g_2_pix_alloc;
+    Uint32 *b_2_pix_alloc;
+    int i;
+    int bpp;
+    Uint32 Rmask, Gmask, Bmask, Amask;
+
+    if (!SDL_PixelFormatEnumToMasks
+        (target_format, &bpp, &Rmask, &Gmask, &Bmask, &Amask) || bpp < 15) {
+        return SDL_SetError("Unsupported YUV destination format");
+    }
+
+    swdata->target_format = target_format;
+    r_2_pix_alloc = &swdata->rgb_2_pix[0 * 768];
+    g_2_pix_alloc = &swdata->rgb_2_pix[1 * 768];
+    b_2_pix_alloc = &swdata->rgb_2_pix[2 * 768];
+
+    /*
+     * Set up entries 0-255 in rgb-to-pixel value tables.
+     */
+    for (i = 0; i < 256; ++i) {
+        r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(Rmask));
+        r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(Rmask);
+        r_2_pix_alloc[i + 256] |= Amask;
+        g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(Gmask));
+        g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(Gmask);
+        g_2_pix_alloc[i + 256] |= Amask;
+        b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(Bmask));
+        b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(Bmask);
+        b_2_pix_alloc[i + 256] |= Amask;
+    }
+
+    /*
+     * If we have 16-bit output depth, then we double the value
+     * in the top word. This means that we can write out both
+     * pixels in the pixel doubling mode with one op. It is
+     * harmless in the normal case as storing a 32-bit value
+     * through a short pointer will lose the top bits anyway.
+     */
+    if (SDL_BYTESPERPIXEL(target_format) == 2) {
+        for (i = 0; i < 256; ++i) {
+            r_2_pix_alloc[i + 256] |= (r_2_pix_alloc[i + 256]) << 16;
+            g_2_pix_alloc[i + 256] |= (g_2_pix_alloc[i + 256]) << 16;
+            b_2_pix_alloc[i + 256] |= (b_2_pix_alloc[i + 256]) << 16;
+        }
+    }
+
+    /*
+     * Spread out the values we have to the rest of the array so that
+     * we do not need to check for overflow.
+     */
+    for (i = 0; i < 256; ++i) {
+        r_2_pix_alloc[i] = r_2_pix_alloc[256];
+        r_2_pix_alloc[i + 512] = r_2_pix_alloc[511];
+        g_2_pix_alloc[i] = g_2_pix_alloc[256];
+        g_2_pix_alloc[i + 512] = g_2_pix_alloc[511];
+        b_2_pix_alloc[i] = b_2_pix_alloc[256];
+        b_2_pix_alloc[i + 512] = b_2_pix_alloc[511];
+    }
+
+    /* You have chosen wisely... */
+    switch (swdata->format) {
+    case SDL_PIXELFORMAT_YV12:
+    case SDL_PIXELFORMAT_IYUV:
+        if (SDL_BYTESPERPIXEL(target_format) == 2) {
+#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
+            /* inline assembly functions */
+            if (SDL_HasMMX() && (Rmask == 0xF800) &&
+                (Gmask == 0x07E0) && (Bmask == 0x001F)
+                && (swdata->w & 15) == 0) {
+/* printf("Using MMX 16-bit 565 dither\n"); */
+                swdata->Display1X = Color565DitherYV12MMX1X;
+            } else {
+/* printf("Using C 16-bit dither\n"); */
+                swdata->Display1X = Color16DitherYV12Mod1X;
+            }
+#else
+            swdata->Display1X = Color16DitherYV12Mod1X;
+#endif
+            swdata->Display2X = Color16DitherYV12Mod2X;
+        }
+        if (SDL_BYTESPERPIXEL(target_format) == 3) {
+            swdata->Display1X = Color24DitherYV12Mod1X;
+            swdata->Display2X = Color24DitherYV12Mod2X;
+        }
+        if (SDL_BYTESPERPIXEL(target_format) == 4) {
+#if (__GNUC__ > 2) && defined(__i386__) && __OPTIMIZE__ && SDL_ASSEMBLY_ROUTINES
+            /* inline assembly functions */
+            if (SDL_HasMMX() && (Rmask == 0x00FF0000) &&
+                (Gmask == 0x0000FF00) &&
+                (Bmask == 0x000000FF) && (swdata->w & 15) == 0) {
+/* printf("Using MMX 32-bit dither\n"); */
+                swdata->Display1X = ColorRGBDitherYV12MMX1X;
+            } else {
+/* printf("Using C 32-bit dither\n"); */
+                swdata->Display1X = Color32DitherYV12Mod1X;
+            }
+#else
+            swdata->Display1X = Color32DitherYV12Mod1X;
+#endif
+            swdata->Display2X = Color32DitherYV12Mod2X;
+        }
+        break;
+    case SDL_PIXELFORMAT_YUY2:
+    case SDL_PIXELFORMAT_UYVY:
+    case SDL_PIXELFORMAT_YVYU:
+        if (SDL_BYTESPERPIXEL(target_format) == 2) {
+            swdata->Display1X = Color16DitherYUY2Mod1X;
+            swdata->Display2X = Color16DitherYUY2Mod2X;
+        }
+        if (SDL_BYTESPERPIXEL(target_format) == 3) {
+            swdata->Display1X = Color24DitherYUY2Mod1X;
+            swdata->Display2X = Color24DitherYUY2Mod2X;
+        }
+        if (SDL_BYTESPERPIXEL(target_format) == 4) {
+            swdata->Display1X = Color32DitherYUY2Mod1X;
+            swdata->Display2X = Color32DitherYUY2Mod2X;
+        }
+        break;
+    default:
+        /* We should never get here (caught above) */
+        break;
+    }
+
+    SDL_FreeSurface(swdata->display);
+    swdata->display = NULL;
+    return 0;
+}
+
+SDL_SW_YUVTexture *
+SDL_SW_CreateYUVTexture(Uint32 format, int w, int h)
+{
+    SDL_SW_YUVTexture *swdata;
+    int *Cr_r_tab;
+    int *Cr_g_tab;
+    int *Cb_g_tab;
+    int *Cb_b_tab;
+    int i;
+    int CR, CB;
+
+    switch (format) {
+    case SDL_PIXELFORMAT_YV12:
+    case SDL_PIXELFORMAT_IYUV:
+    case SDL_PIXELFORMAT_YUY2:
+    case SDL_PIXELFORMAT_UYVY:
+    case SDL_PIXELFORMAT_YVYU:
+        break;
+    default:
+        SDL_SetError("Unsupported YUV format");
+        return NULL;
+    }
+
+    swdata = (SDL_SW_YUVTexture *) SDL_calloc(1, sizeof(*swdata));
+    if (!swdata) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    swdata->format = format;
+    swdata->target_format = SDL_PIXELFORMAT_UNKNOWN;
+    swdata->w = w;
+    swdata->h = h;
+    swdata->pixels = (Uint8 *) SDL_malloc(w * h * 2);
+    swdata->colortab = (int *) SDL_malloc(4 * 256 * sizeof(int));
+    swdata->rgb_2_pix = (Uint32 *) SDL_malloc(3 * 768 * sizeof(Uint32));
+    if (!swdata->pixels || !swdata->colortab || !swdata->rgb_2_pix) {
+        SDL_SW_DestroyYUVTexture(swdata);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    /* Generate the tables for the display surface */
+    Cr_r_tab = &swdata->colortab[0 * 256];
+    Cr_g_tab = &swdata->colortab[1 * 256];
+    Cb_g_tab = &swdata->colortab[2 * 256];
+    Cb_b_tab = &swdata->colortab[3 * 256];
+    for (i = 0; i < 256; i++) {
+        /* Gamma correction (luminescence table) and chroma correction
+           would be done here.  See the Berkeley mpeg_play sources.
+         */
+        CB = CR = (i - 128);
+        Cr_r_tab[i] = (int) ((0.419 / 0.299) * CR);
+        Cr_g_tab[i] = (int) (-(0.299 / 0.419) * CR);
+        Cb_g_tab[i] = (int) (-(0.114 / 0.331) * CB);
+        Cb_b_tab[i] = (int) ((0.587 / 0.331) * CB);
+    }
+
+    /* Find the pitch and offset values for the overlay */
+    switch (format) {
+    case SDL_PIXELFORMAT_YV12:
+    case SDL_PIXELFORMAT_IYUV:
+        swdata->pitches[0] = w;
+        swdata->pitches[1] = swdata->pitches[0] / 2;
+        swdata->pitches[2] = swdata->pitches[0] / 2;
+        swdata->planes[0] = swdata->pixels;
+        swdata->planes[1] = swdata->planes[0] + swdata->pitches[0] * h;
+        swdata->planes[2] = swdata->planes[1] + swdata->pitches[1] * h / 2;
+        break;
+    case SDL_PIXELFORMAT_YUY2:
+    case SDL_PIXELFORMAT_UYVY:
+    case SDL_PIXELFORMAT_YVYU:
+        swdata->pitches[0] = w * 2;
+        swdata->planes[0] = swdata->pixels;
+        break;
+    default:
+        SDL_assert(0 && "We should never get here (caught above)");
+        break;
+    }
+
+    /* We're all done.. */
+    return (swdata);
+}
+
+int
+SDL_SW_QueryYUVTexturePixels(SDL_SW_YUVTexture * swdata, void **pixels,
+                             int *pitch)
+{
+    *pixels = swdata->planes[0];
+    *pitch = swdata->pitches[0];
+    return 0;
+}
+
+int
+SDL_SW_UpdateYUVTexture(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
+                        const void *pixels, int pitch)
+{
+    switch (swdata->format) {
+    case SDL_PIXELFORMAT_YV12:
+    case SDL_PIXELFORMAT_IYUV:
+        if (rect->x == 0 && rect->y == 0 &&
+            rect->w == swdata->w && rect->h == swdata->h) {
+                SDL_memcpy(swdata->pixels, pixels,
+                           (swdata->h * swdata->w) + (swdata->h * swdata->w) / 2);
+        } else {
+            Uint8 *src, *dst;
+            int row;
+            size_t length;
+
+            /* Copy the Y plane */
+            src = (Uint8 *) pixels;
+            dst = swdata->pixels + rect->y * swdata->w + rect->x;
+            length = rect->w;
+            for (row = 0; row < rect->h; ++row) {
+                SDL_memcpy(dst, src, length);
+                src += pitch;
+                dst += swdata->w;
+            }
+
+            /* Copy the next plane */
+            src = (Uint8 *) pixels + rect->h * pitch;
+            dst = swdata->pixels + swdata->h * swdata->w;
+            dst += rect->y/2 * swdata->w/2 + rect->x/2;
+            length = rect->w / 2;
+            for (row = 0; row < rect->h/2; ++row) {
+                SDL_memcpy(dst, src, length);
+                src += pitch/2;
+                dst += swdata->w/2;
+            }
+
+            /* Copy the next plane */
+            src = (Uint8 *) pixels + rect->h * pitch + (rect->h * pitch) / 4;
+            dst = swdata->pixels + swdata->h * swdata->w +
+                  (swdata->h * swdata->w) / 4;
+            dst += rect->y/2 * swdata->w/2 + rect->x/2;
+            length = rect->w / 2;
+            for (row = 0; row < rect->h/2; ++row) {
+                SDL_memcpy(dst, src, length);
+                src += pitch/2;
+                dst += swdata->w/2;
+            }
+        }
+        break;
+    case SDL_PIXELFORMAT_YUY2:
+    case SDL_PIXELFORMAT_UYVY:
+    case SDL_PIXELFORMAT_YVYU:
+        {
+            Uint8 *src, *dst;
+            int row;
+            size_t length;
+
+            src = (Uint8 *) pixels;
+            dst =
+                swdata->planes[0] + rect->y * swdata->pitches[0] +
+                rect->x * 2;
+            length = rect->w * 2;
+            for (row = 0; row < rect->h; ++row) {
+                SDL_memcpy(dst, src, length);
+                src += pitch;
+                dst += swdata->pitches[0];
+            }
+        }
+        break;
+    }
+    return 0;
+}
+
+int
+SDL_SW_UpdateYUVTexturePlanar(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
+                              const Uint8 *Yplane, int Ypitch,
+                              const Uint8 *Uplane, int Upitch,
+                              const Uint8 *Vplane, int Vpitch)
+{
+    const Uint8 *src;
+    Uint8 *dst;
+    int row;
+    size_t length;
+
+    /* Copy the Y plane */
+    src = Yplane;
+    dst = swdata->pixels + rect->y * swdata->w + rect->x;
+    length = rect->w;
+    for (row = 0; row < rect->h; ++row) {
+        SDL_memcpy(dst, src, length);
+        src += Ypitch;
+        dst += swdata->w;
+    }
+
+    /* Copy the U plane */
+    src = Uplane;
+    if (swdata->format == SDL_PIXELFORMAT_IYUV) {
+        dst = swdata->pixels + swdata->h * swdata->w;
+    } else {
+        dst = swdata->pixels + swdata->h * swdata->w +
+              (swdata->h * swdata->w) / 4;
+    }
+    dst += rect->y/2 * swdata->w/2 + rect->x/2;
+    length = rect->w / 2;
+    for (row = 0; row < rect->h/2; ++row) {
+        SDL_memcpy(dst, src, length);
+        src += Upitch;
+        dst += swdata->w/2;
+    }
+
+    /* Copy the V plane */
+    src = Vplane;
+    if (swdata->format == SDL_PIXELFORMAT_YV12) {
+        dst = swdata->pixels + swdata->h * swdata->w;
+    } else {
+        dst = swdata->pixels + swdata->h * swdata->w +
+              (swdata->h * swdata->w) / 4;
+    }
+    dst += rect->y/2 * swdata->w/2 + rect->x/2;
+    length = rect->w / 2;
+    for (row = 0; row < rect->h/2; ++row) {
+        SDL_memcpy(dst, src, length);
+        src += Vpitch;
+        dst += swdata->w/2;
+    }
+    return 0;
+}
+
+int
+SDL_SW_LockYUVTexture(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
+                      void **pixels, int *pitch)
+{
+    switch (swdata->format) {
+    case SDL_PIXELFORMAT_YV12:
+    case SDL_PIXELFORMAT_IYUV:
+        if (rect
+            && (rect->x != 0 || rect->y != 0 || rect->w != swdata->w
+                || rect->h != swdata->h)) {
+            return SDL_SetError
+                ("YV12 and IYUV textures only support full surface locks");
+        }
+        break;
+    }
+
+    if (rect) {
+        *pixels = swdata->planes[0] + rect->y * swdata->pitches[0] + rect->x * 2;
+    } else {
+        *pixels = swdata->planes[0];
+    }
+    *pitch = swdata->pitches[0];
+    return 0;
+}
+
+void
+SDL_SW_UnlockYUVTexture(SDL_SW_YUVTexture * swdata)
+{
+}
+
+int
+SDL_SW_CopyYUVToRGB(SDL_SW_YUVTexture * swdata, const SDL_Rect * srcrect,
+                    Uint32 target_format, int w, int h, void *pixels,
+                    int pitch)
+{
+    int stretch;
+    int scale_2x;
+    Uint8 *lum, *Cr, *Cb;
+    int mod;
+
+    /* Make sure we're set up to display in the desired format */
+    if (target_format != swdata->target_format) {
+        if (SDL_SW_SetupYUVDisplay(swdata, target_format) < 0) {
+            return -1;
+        }
+    }
+
+    stretch = 0;
+    scale_2x = 0;
+    if (srcrect->x || srcrect->y || srcrect->w < swdata->w
+        || srcrect->h < swdata->h) {
+        /* The source rectangle has been clipped.
+           Using a scratch surface is easier than adding clipped
+           source support to all the blitters, plus that would
+           slow them down in the general unclipped case.
+         */
+        stretch = 1;
+    } else if ((srcrect->w != w) || (srcrect->h != h)) {
+        if ((w == 2 * srcrect->w) && (h == 2 * srcrect->h)) {
+            scale_2x = 1;
+        } else {
+            stretch = 1;
+        }
+    }
+    if (stretch) {
+        int bpp;
+        Uint32 Rmask, Gmask, Bmask, Amask;
+
+        if (swdata->display) {
+            swdata->display->w = w;
+            swdata->display->h = h;
+            swdata->display->pixels = pixels;
+            swdata->display->pitch = pitch;
+        } else {
+            /* This must have succeeded in SDL_SW_SetupYUVDisplay() earlier */
+            SDL_PixelFormatEnumToMasks(target_format, &bpp, &Rmask, &Gmask,
+                                       &Bmask, &Amask);
+            swdata->display =
+                SDL_CreateRGBSurfaceFrom(pixels, w, h, bpp, pitch, Rmask,
+                                         Gmask, Bmask, Amask);
+            if (!swdata->display) {
+                return (-1);
+            }
+        }
+        if (!swdata->stretch) {
+            /* This must have succeeded in SDL_SW_SetupYUVDisplay() earlier */
+            SDL_PixelFormatEnumToMasks(target_format, &bpp, &Rmask, &Gmask,
+                                       &Bmask, &Amask);
+            swdata->stretch =
+                SDL_CreateRGBSurface(0, swdata->w, swdata->h, bpp, Rmask,
+                                     Gmask, Bmask, Amask);
+            if (!swdata->stretch) {
+                return (-1);
+            }
+        }
+        pixels = swdata->stretch->pixels;
+        pitch = swdata->stretch->pitch;
+    }
+    switch (swdata->format) {
+    case SDL_PIXELFORMAT_YV12:
+        lum = swdata->planes[0];
+        Cr = swdata->planes[1];
+        Cb = swdata->planes[2];
+        break;
+    case SDL_PIXELFORMAT_IYUV:
+        lum = swdata->planes[0];
+        Cr = swdata->planes[2];
+        Cb = swdata->planes[1];
+        break;
+    case SDL_PIXELFORMAT_YUY2:
+        lum = swdata->planes[0];
+        Cr = lum + 3;
+        Cb = lum + 1;
+        break;
+    case SDL_PIXELFORMAT_UYVY:
+        lum = swdata->planes[0] + 1;
+        Cr = lum + 1;
+        Cb = lum - 1;
+        break;
+    case SDL_PIXELFORMAT_YVYU:
+        lum = swdata->planes[0];
+        Cr = lum + 1;
+        Cb = lum + 3;
+        break;
+    default:
+        return SDL_SetError("Unsupported YUV format in copy");
+    }
+    mod = (pitch / SDL_BYTESPERPIXEL(target_format));
+
+    if (scale_2x) {
+        mod -= (swdata->w * 2);
+        swdata->Display2X(swdata->colortab, swdata->rgb_2_pix,
+                          lum, Cr, Cb, pixels, swdata->h, swdata->w, mod);
+    } else {
+        mod -= swdata->w;
+        swdata->Display1X(swdata->colortab, swdata->rgb_2_pix,
+                          lum, Cr, Cb, pixels, swdata->h, swdata->w, mod);
+    }
+    if (stretch) {
+        SDL_Rect rect = *srcrect;
+        SDL_SoftStretch(swdata->stretch, &rect, swdata->display, NULL);
+    }
+    return 0;
+}
+
+void
+SDL_SW_DestroyYUVTexture(SDL_SW_YUVTexture * swdata)
+{
+    if (swdata) {
+        SDL_free(swdata->pixels);
+        SDL_free(swdata->colortab);
+        SDL_free(swdata->rgb_2_pix);
+        SDL_FreeSurface(swdata->stretch);
+        SDL_FreeSurface(swdata->display);
+        SDL_free(swdata);
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/SDL_yuv_sw_c.h b/Source/3rd Party/sdl/src/render/SDL_yuv_sw_c.h
new file mode 100644
index 000000000..6b4044b6d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/SDL_yuv_sw_c.h	
@@ -0,0 +1,72 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+
+/* This is the software implementation of the YUV texture support */
+
+struct SDL_SW_YUVTexture
+{
+    Uint32 format;
+    Uint32 target_format;
+    int w, h;
+    Uint8 *pixels;
+    int *colortab;
+    Uint32 *rgb_2_pix;
+    void (*Display1X) (int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod);
+    void (*Display2X) (int *colortab, Uint32 * rgb_2_pix,
+                       unsigned char *lum, unsigned char *cr,
+                       unsigned char *cb, unsigned char *out,
+                       int rows, int cols, int mod);
+
+    /* These are just so we don't have to allocate them separately */
+    Uint16 pitches[3];
+    Uint8 *planes[3];
+
+    /* This is a temporary surface in case we have to stretch copy */
+    SDL_Surface *stretch;
+    SDL_Surface *display;
+};
+
+typedef struct SDL_SW_YUVTexture SDL_SW_YUVTexture;
+
+SDL_SW_YUVTexture *SDL_SW_CreateYUVTexture(Uint32 format, int w, int h);
+int SDL_SW_QueryYUVTexturePixels(SDL_SW_YUVTexture * swdata, void **pixels,
+                                 int *pitch);
+int SDL_SW_UpdateYUVTexture(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
+                            const void *pixels, int pitch);
+int SDL_SW_UpdateYUVTexturePlanar(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
+                                  const Uint8 *Yplane, int Ypitch,
+                                  const Uint8 *Uplane, int Upitch,
+                                  const Uint8 *Vplane, int Vpitch);
+int SDL_SW_LockYUVTexture(SDL_SW_YUVTexture * swdata, const SDL_Rect * rect,
+                          void **pixels, int *pitch);
+void SDL_SW_UnlockYUVTexture(SDL_SW_YUVTexture * swdata);
+int SDL_SW_CopyYUVToRGB(SDL_SW_YUVTexture * swdata, const SDL_Rect * srcrect,
+                        Uint32 target_format, int w, int h, void *pixels,
+                        int pitch);
+void SDL_SW_DestroyYUVTexture(SDL_SW_YUVTexture * swdata);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/direct3d/SDL_render_d3d.c b/Source/3rd Party/sdl/src/render/direct3d/SDL_render_d3d.c
new file mode 100644
index 000000000..24482818d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/direct3d/SDL_render_d3d.c	
@@ -0,0 +1,1889 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "SDL_render.h"
+#include "SDL_system.h"
+
+#if SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED
+
+#include "../../core/windows/SDL_windows.h"
+
+#include "SDL_hints.h"
+#include "SDL_loadso.h"
+#include "SDL_syswm.h"
+#include "../SDL_sysrender.h"
+#include "../SDL_d3dmath.h"
+#include "../../video/windows/SDL_windowsvideo.h"
+
+#if SDL_VIDEO_RENDER_D3D
+#define D3D_DEBUG_INFO
+#include <d3d9.h>
+#endif
+
+
+#ifdef ASSEMBLE_SHADER
+/**************************************************************************
+ * ID3DXBuffer:
+ * ------------
+ * The buffer object is used by D3DX to return arbitrary size data.
+ *
+ * GetBufferPointer -
+ *    Returns a pointer to the beginning of the buffer.
+ *
+ * GetBufferSize -
+ *    Returns the size of the buffer, in bytes.
+ **************************************************************************/
+
+typedef interface ID3DXBuffer ID3DXBuffer;
+typedef interface ID3DXBuffer *LPD3DXBUFFER;
+
+/* {8BA5FB08-5195-40e2-AC58-0D989C3A0102} */
+DEFINE_GUID(IID_ID3DXBuffer,
+0x8ba5fb08, 0x5195, 0x40e2, 0xac, 0x58, 0xd, 0x98, 0x9c, 0x3a, 0x1, 0x2);
+
+#undef INTERFACE
+#define INTERFACE ID3DXBuffer
+
+typedef interface ID3DXBuffer {
+    const struct ID3DXBufferVtbl FAR* lpVtbl;
+} ID3DXBuffer;
+typedef const struct ID3DXBufferVtbl ID3DXBufferVtbl;
+const struct ID3DXBufferVtbl
+{
+    /* IUnknown */
+    STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
+    STDMETHOD_(ULONG, AddRef)(THIS) PURE;
+    STDMETHOD_(ULONG, Release)(THIS) PURE;
+
+    /* ID3DXBuffer */
+    STDMETHOD_(LPVOID, GetBufferPointer)(THIS) PURE;
+    STDMETHOD_(DWORD, GetBufferSize)(THIS) PURE;
+};
+
+HRESULT WINAPI
+    D3DXAssembleShader(
+        LPCSTR                          pSrcData,
+        UINT                            SrcDataLen,
+        CONST LPVOID*                   pDefines,
+        LPVOID                          pInclude,
+        DWORD                           Flags,
+        LPD3DXBUFFER*                   ppShader,
+        LPD3DXBUFFER*                   ppErrorMsgs);
+
+static void PrintShaderData(LPDWORD shader_data, DWORD shader_size)
+{
+    OutputDebugStringA("const DWORD shader_data[] = {\n\t");
+    {
+        SDL_bool newline = SDL_FALSE;
+        unsigned i;
+        for (i = 0; i < shader_size / sizeof(DWORD); ++i) {
+            char dword[11];
+            if (i > 0) {
+                if ((i%6) == 0) {
+                    newline = SDL_TRUE;
+                }
+                if (newline) {
+                    OutputDebugStringA(",\n    ");
+                    newline = SDL_FALSE;
+                } else {
+                    OutputDebugStringA(", ");
+                }
+            }
+            SDL_snprintf(dword, sizeof(dword), "0x%8.8x", shader_data[i]);
+            OutputDebugStringA(dword);
+        }
+        OutputDebugStringA("\n};\n");
+    }
+}
+
+#endif /* ASSEMBLE_SHADER */
+
+
+/* Direct3D renderer implementation */
+
+static SDL_Renderer *D3D_CreateRenderer(SDL_Window * window, Uint32 flags);
+static void D3D_WindowEvent(SDL_Renderer * renderer,
+                            const SDL_WindowEvent *event);
+static int D3D_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int D3D_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                             const SDL_Rect * rect, const void *pixels,
+                             int pitch);
+static int D3D_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+                                const SDL_Rect * rect,
+                                const Uint8 *Yplane, int Ypitch,
+                                const Uint8 *Uplane, int Upitch,
+                                const Uint8 *Vplane, int Vpitch);
+static int D3D_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                           const SDL_Rect * rect, void **pixels, int *pitch);
+static void D3D_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int D3D_SetRenderTargetInternal(SDL_Renderer * renderer, SDL_Texture * texture);
+static int D3D_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture);
+static int D3D_UpdateViewport(SDL_Renderer * renderer);
+static int D3D_UpdateClipRect(SDL_Renderer * renderer);
+static int D3D_RenderClear(SDL_Renderer * renderer);
+static int D3D_RenderDrawPoints(SDL_Renderer * renderer,
+                                const SDL_FPoint * points, int count);
+static int D3D_RenderDrawLines(SDL_Renderer * renderer,
+                               const SDL_FPoint * points, int count);
+static int D3D_RenderFillRects(SDL_Renderer * renderer,
+                               const SDL_FRect * rects, int count);
+static int D3D_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                          const SDL_Rect * srcrect, const SDL_FRect * dstrect);
+static int D3D_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                          const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                          const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip);
+static int D3D_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                                Uint32 format, void * pixels, int pitch);
+static void D3D_RenderPresent(SDL_Renderer * renderer);
+static void D3D_DestroyTexture(SDL_Renderer * renderer,
+                               SDL_Texture * texture);
+static void D3D_DestroyRenderer(SDL_Renderer * renderer);
+
+
+SDL_RenderDriver D3D_RenderDriver = {
+    D3D_CreateRenderer,
+    {
+     "direct3d",
+     (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE),
+     1,
+     {SDL_PIXELFORMAT_ARGB8888},
+     0,
+     0}
+};
+
+typedef struct
+{
+    void* d3dDLL;
+    IDirect3D9 *d3d;
+    IDirect3DDevice9 *device;
+    UINT adapter;
+    D3DPRESENT_PARAMETERS pparams;
+    SDL_bool updateSize;
+    SDL_bool beginScene;
+    SDL_bool enableSeparateAlphaBlend;
+    D3DTEXTUREFILTERTYPE scaleMode[8];
+    IDirect3DSurface9 *defaultRenderTarget;
+    IDirect3DSurface9 *currentRenderTarget;
+    void* d3dxDLL;
+    LPDIRECT3DPIXELSHADER9 ps_yuv;
+} D3D_RenderData;
+
+typedef struct
+{
+    IDirect3DTexture9 *texture;
+    D3DTEXTUREFILTERTYPE scaleMode;
+
+    /* YV12 texture support */
+    SDL_bool yuv;
+    IDirect3DTexture9 *utexture;
+    IDirect3DTexture9 *vtexture;
+    Uint8 *pixels;
+    int pitch;
+    SDL_Rect locked_rect;
+} D3D_TextureData;
+
+typedef struct
+{
+    float x, y, z;
+    DWORD color;
+    float u, v;
+} Vertex;
+
+static int
+D3D_SetError(const char *prefix, HRESULT result)
+{
+    const char *error;
+
+    switch (result) {
+    case D3DERR_WRONGTEXTUREFORMAT:
+        error = "WRONGTEXTUREFORMAT";
+        break;
+    case D3DERR_UNSUPPORTEDCOLOROPERATION:
+        error = "UNSUPPORTEDCOLOROPERATION";
+        break;
+    case D3DERR_UNSUPPORTEDCOLORARG:
+        error = "UNSUPPORTEDCOLORARG";
+        break;
+    case D3DERR_UNSUPPORTEDALPHAOPERATION:
+        error = "UNSUPPORTEDALPHAOPERATION";
+        break;
+    case D3DERR_UNSUPPORTEDALPHAARG:
+        error = "UNSUPPORTEDALPHAARG";
+        break;
+    case D3DERR_TOOMANYOPERATIONS:
+        error = "TOOMANYOPERATIONS";
+        break;
+    case D3DERR_CONFLICTINGTEXTUREFILTER:
+        error = "CONFLICTINGTEXTUREFILTER";
+        break;
+    case D3DERR_UNSUPPORTEDFACTORVALUE:
+        error = "UNSUPPORTEDFACTORVALUE";
+        break;
+    case D3DERR_CONFLICTINGRENDERSTATE:
+        error = "CONFLICTINGRENDERSTATE";
+        break;
+    case D3DERR_UNSUPPORTEDTEXTUREFILTER:
+        error = "UNSUPPORTEDTEXTUREFILTER";
+        break;
+    case D3DERR_CONFLICTINGTEXTUREPALETTE:
+        error = "CONFLICTINGTEXTUREPALETTE";
+        break;
+    case D3DERR_DRIVERINTERNALERROR:
+        error = "DRIVERINTERNALERROR";
+        break;
+    case D3DERR_NOTFOUND:
+        error = "NOTFOUND";
+        break;
+    case D3DERR_MOREDATA:
+        error = "MOREDATA";
+        break;
+    case D3DERR_DEVICELOST:
+        error = "DEVICELOST";
+        break;
+    case D3DERR_DEVICENOTRESET:
+        error = "DEVICENOTRESET";
+        break;
+    case D3DERR_NOTAVAILABLE:
+        error = "NOTAVAILABLE";
+        break;
+    case D3DERR_OUTOFVIDEOMEMORY:
+        error = "OUTOFVIDEOMEMORY";
+        break;
+    case D3DERR_INVALIDDEVICE:
+        error = "INVALIDDEVICE";
+        break;
+    case D3DERR_INVALIDCALL:
+        error = "INVALIDCALL";
+        break;
+    case D3DERR_DRIVERINVALIDCALL:
+        error = "DRIVERINVALIDCALL";
+        break;
+    case D3DERR_WASSTILLDRAWING:
+        error = "WASSTILLDRAWING";
+        break;
+    default:
+        error = "UNKNOWN";
+        break;
+    }
+    return SDL_SetError("%s: %s", prefix, error);
+}
+
+static D3DFORMAT
+PixelFormatToD3DFMT(Uint32 format)
+{
+    switch (format) {
+    case SDL_PIXELFORMAT_RGB565:
+        return D3DFMT_R5G6B5;
+    case SDL_PIXELFORMAT_RGB888:
+        return D3DFMT_X8R8G8B8;
+    case SDL_PIXELFORMAT_ARGB8888:
+        return D3DFMT_A8R8G8B8;
+    case SDL_PIXELFORMAT_YV12:
+    case SDL_PIXELFORMAT_IYUV:
+        return D3DFMT_L8;
+    default:
+        return D3DFMT_UNKNOWN;
+    }
+}
+
+static Uint32
+D3DFMTToPixelFormat(D3DFORMAT format)
+{
+    switch (format) {
+    case D3DFMT_R5G6B5:
+        return SDL_PIXELFORMAT_RGB565;
+    case D3DFMT_X8R8G8B8:
+        return SDL_PIXELFORMAT_RGB888;
+    case D3DFMT_A8R8G8B8:
+        return SDL_PIXELFORMAT_ARGB8888;
+    default:
+        return SDL_PIXELFORMAT_UNKNOWN;
+    }
+}
+
+static void
+D3D_InitRenderState(D3D_RenderData *data)
+{
+    D3DMATRIX matrix;
+
+    IDirect3DDevice9 *device = data->device;
+
+    IDirect3DDevice9_SetVertexShader(device, NULL);
+    IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX1);
+    IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE);
+    IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE);
+    IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE);
+
+    /* Enable color modulation by diffuse color */
+    IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP,
+                                          D3DTOP_MODULATE);
+    IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1,
+                                          D3DTA_TEXTURE);
+    IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG2,
+                                          D3DTA_DIFFUSE);
+
+    /* Enable alpha modulation by diffuse alpha */
+    IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP,
+                                          D3DTOP_MODULATE);
+    IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1,
+                                          D3DTA_TEXTURE);
+    IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG2,
+                                          D3DTA_DIFFUSE);
+
+    /* Enable separate alpha blend function, if possible */
+    if (data->enableSeparateAlphaBlend) {
+        IDirect3DDevice9_SetRenderState(device, D3DRS_SEPARATEALPHABLENDENABLE, TRUE);
+    }
+
+    /* Disable second texture stage, since we're done */
+    IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP,
+                                          D3DTOP_DISABLE);
+    IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_ALPHAOP,
+                                          D3DTOP_DISABLE);
+
+    /* Set an identity world and view matrix */
+    matrix.m[0][0] = 1.0f;
+    matrix.m[0][1] = 0.0f;
+    matrix.m[0][2] = 0.0f;
+    matrix.m[0][3] = 0.0f;
+    matrix.m[1][0] = 0.0f;
+    matrix.m[1][1] = 1.0f;
+    matrix.m[1][2] = 0.0f;
+    matrix.m[1][3] = 0.0f;
+    matrix.m[2][0] = 0.0f;
+    matrix.m[2][1] = 0.0f;
+    matrix.m[2][2] = 1.0f;
+    matrix.m[2][3] = 0.0f;
+    matrix.m[3][0] = 0.0f;
+    matrix.m[3][1] = 0.0f;
+    matrix.m[3][2] = 0.0f;
+    matrix.m[3][3] = 1.0f;
+    IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &matrix);
+    IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &matrix);
+
+    /* Reset our current scale mode */
+    SDL_memset(data->scaleMode, 0xFF, sizeof(data->scaleMode));
+
+    /* Start the render with beginScene */
+    data->beginScene = SDL_TRUE;
+}
+
+static int
+D3D_Reset(SDL_Renderer * renderer)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    HRESULT result;
+    SDL_Texture *texture;
+
+    /* Release the default render target before reset */
+    if (data->defaultRenderTarget) {
+        IDirect3DSurface9_Release(data->defaultRenderTarget);
+        data->defaultRenderTarget = NULL;
+    }
+    if (data->currentRenderTarget != NULL) {
+        IDirect3DSurface9_Release(data->currentRenderTarget);
+        data->currentRenderTarget = NULL;
+    }
+
+    /* Release application render targets */
+    for (texture = renderer->textures; texture; texture = texture->next) {
+        if (texture->access == SDL_TEXTUREACCESS_TARGET) {
+            D3D_DestroyTexture(renderer, texture);
+        }
+    }
+
+    result = IDirect3DDevice9_Reset(data->device, &data->pparams);
+    if (FAILED(result)) {
+        if (result == D3DERR_DEVICELOST) {
+            /* Don't worry about it, we'll reset later... */
+            return 0;
+        } else {
+            return D3D_SetError("Reset()", result);
+        }
+    }
+
+    /* Allocate application render targets */
+    for (texture = renderer->textures; texture; texture = texture->next) {
+        if (texture->access == SDL_TEXTUREACCESS_TARGET) {
+            D3D_CreateTexture(renderer, texture);
+        }
+    }
+
+    IDirect3DDevice9_GetRenderTarget(data->device, 0, &data->defaultRenderTarget);
+    D3D_InitRenderState(data);
+    D3D_SetRenderTargetInternal(renderer, renderer->target);
+    D3D_UpdateViewport(renderer);
+
+    /* Let the application know that render targets were reset */
+    {
+        SDL_Event event;
+        event.type = SDL_RENDER_TARGETS_RESET;
+        SDL_PushEvent(&event);
+    }
+
+    return 0;
+}
+
+static int
+D3D_ActivateRenderer(SDL_Renderer * renderer)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    HRESULT result;
+
+    if (data->updateSize) {
+        SDL_Window *window = renderer->window;
+        int w, h;
+
+        SDL_GetWindowSize(window, &w, &h);
+        data->pparams.BackBufferWidth = w;
+        data->pparams.BackBufferHeight = h;
+        if (SDL_GetWindowFlags(window) & SDL_WINDOW_FULLSCREEN) {
+            data->pparams.BackBufferFormat =
+                PixelFormatToD3DFMT(SDL_GetWindowPixelFormat(window));
+        } else {
+            data->pparams.BackBufferFormat = D3DFMT_UNKNOWN;
+        }
+        if (D3D_Reset(renderer) < 0) {
+            return -1;
+        }
+
+        data->updateSize = SDL_FALSE;
+    }
+    if (data->beginScene) {
+        result = IDirect3DDevice9_BeginScene(data->device);
+        if (result == D3DERR_DEVICELOST) {
+            if (D3D_Reset(renderer) < 0) {
+                return -1;
+            }
+            result = IDirect3DDevice9_BeginScene(data->device);
+        }
+        if (FAILED(result)) {
+            return D3D_SetError("BeginScene()", result);
+        }
+        data->beginScene = SDL_FALSE;
+    }
+    return 0;
+}
+
+SDL_Renderer *
+D3D_CreateRenderer(SDL_Window * window, Uint32 flags)
+{
+    SDL_Renderer *renderer;
+    D3D_RenderData *data;
+    SDL_SysWMinfo windowinfo;
+    HRESULT result;
+    const char *hint;
+    D3DPRESENT_PARAMETERS pparams;
+    IDirect3DSwapChain9 *chain;
+    D3DCAPS9 caps;
+    DWORD device_flags;
+    Uint32 window_flags;
+    int w, h;
+    SDL_DisplayMode fullscreen_mode;
+    int displayIndex;
+
+    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
+    if (!renderer) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    data = (D3D_RenderData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        SDL_free(renderer);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    if (!D3D_LoadDLL(&data->d3dDLL, &data->d3d)) {
+        SDL_free(renderer);
+        SDL_free(data);
+        SDL_SetError("Unable to create Direct3D interface");
+        return NULL;
+    }
+
+    renderer->WindowEvent = D3D_WindowEvent;
+    renderer->CreateTexture = D3D_CreateTexture;
+    renderer->UpdateTexture = D3D_UpdateTexture;
+    renderer->UpdateTextureYUV = D3D_UpdateTextureYUV;
+    renderer->LockTexture = D3D_LockTexture;
+    renderer->UnlockTexture = D3D_UnlockTexture;
+    renderer->SetRenderTarget = D3D_SetRenderTarget;
+    renderer->UpdateViewport = D3D_UpdateViewport;
+    renderer->UpdateClipRect = D3D_UpdateClipRect;
+    renderer->RenderClear = D3D_RenderClear;
+    renderer->RenderDrawPoints = D3D_RenderDrawPoints;
+    renderer->RenderDrawLines = D3D_RenderDrawLines;
+    renderer->RenderFillRects = D3D_RenderFillRects;
+    renderer->RenderCopy = D3D_RenderCopy;
+    renderer->RenderCopyEx = D3D_RenderCopyEx;
+    renderer->RenderReadPixels = D3D_RenderReadPixels;
+    renderer->RenderPresent = D3D_RenderPresent;
+    renderer->DestroyTexture = D3D_DestroyTexture;
+    renderer->DestroyRenderer = D3D_DestroyRenderer;
+    renderer->info = D3D_RenderDriver.info;
+    renderer->info.flags = (SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE);
+    renderer->driverdata = data;
+
+    SDL_VERSION(&windowinfo.version);
+    SDL_GetWindowWMInfo(window, &windowinfo);
+
+    window_flags = SDL_GetWindowFlags(window);
+    SDL_GetWindowSize(window, &w, &h);
+    SDL_GetWindowDisplayMode(window, &fullscreen_mode);
+
+    SDL_zero(pparams);
+    pparams.hDeviceWindow = windowinfo.info.win.window;
+    pparams.BackBufferWidth = w;
+    pparams.BackBufferHeight = h;
+    if (window_flags & SDL_WINDOW_FULLSCREEN) {
+        pparams.BackBufferFormat =
+            PixelFormatToD3DFMT(fullscreen_mode.format);
+    } else {
+        pparams.BackBufferFormat = D3DFMT_UNKNOWN;
+    }
+    pparams.BackBufferCount = 1;
+    pparams.SwapEffect = D3DSWAPEFFECT_DISCARD;
+
+    if (window_flags & SDL_WINDOW_FULLSCREEN) {
+        if ((window_flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP)  {
+            pparams.Windowed = TRUE;
+            pparams.FullScreen_RefreshRateInHz = 0;
+        } else {
+            pparams.Windowed = FALSE;
+            pparams.FullScreen_RefreshRateInHz = fullscreen_mode.refresh_rate;
+        }
+    } else {
+        pparams.Windowed = TRUE;
+        pparams.FullScreen_RefreshRateInHz = 0;
+    }
+    if (flags & SDL_RENDERER_PRESENTVSYNC) {
+        pparams.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
+    } else {
+        pparams.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
+    }
+
+    /* Get the adapter for the display that the window is on */
+    displayIndex = SDL_GetWindowDisplayIndex(window);
+    data->adapter = SDL_Direct3D9GetAdapterIndex(displayIndex);
+
+    IDirect3D9_GetDeviceCaps(data->d3d, data->adapter, D3DDEVTYPE_HAL, &caps);
+
+    device_flags = D3DCREATE_FPU_PRESERVE;
+    if (caps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) {
+        device_flags |= D3DCREATE_HARDWARE_VERTEXPROCESSING;
+    } else {
+        device_flags |= D3DCREATE_SOFTWARE_VERTEXPROCESSING;
+    }
+
+    hint = SDL_GetHint(SDL_HINT_RENDER_DIRECT3D_THREADSAFE);
+    if (hint && SDL_atoi(hint)) {
+        device_flags |= D3DCREATE_MULTITHREADED;
+    }
+
+    result = IDirect3D9_CreateDevice(data->d3d, data->adapter,
+                                     D3DDEVTYPE_HAL,
+                                     pparams.hDeviceWindow,
+                                     device_flags,
+                                     &pparams, &data->device);
+    if (FAILED(result)) {
+        D3D_DestroyRenderer(renderer);
+        D3D_SetError("CreateDevice()", result);
+        return NULL;
+    }
+
+    /* Get presentation parameters to fill info */
+    result = IDirect3DDevice9_GetSwapChain(data->device, 0, &chain);
+    if (FAILED(result)) {
+        D3D_DestroyRenderer(renderer);
+        D3D_SetError("GetSwapChain()", result);
+        return NULL;
+    }
+    result = IDirect3DSwapChain9_GetPresentParameters(chain, &pparams);
+    if (FAILED(result)) {
+        IDirect3DSwapChain9_Release(chain);
+        D3D_DestroyRenderer(renderer);
+        D3D_SetError("GetPresentParameters()", result);
+        return NULL;
+    }
+    IDirect3DSwapChain9_Release(chain);
+    if (pparams.PresentationInterval == D3DPRESENT_INTERVAL_ONE) {
+        renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
+    }
+    data->pparams = pparams;
+
+    IDirect3DDevice9_GetDeviceCaps(data->device, &caps);
+    renderer->info.max_texture_width = caps.MaxTextureWidth;
+    renderer->info.max_texture_height = caps.MaxTextureHeight;
+    if (caps.NumSimultaneousRTs >= 2) {
+        renderer->info.flags |= SDL_RENDERER_TARGETTEXTURE;
+    }
+
+    if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_SEPARATEALPHABLEND) {
+        data->enableSeparateAlphaBlend = SDL_TRUE;
+    }
+
+    /* Store the default render target */
+    IDirect3DDevice9_GetRenderTarget(data->device, 0, &data->defaultRenderTarget );
+    data->currentRenderTarget = NULL;
+
+    /* Set up parameters for rendering */
+    D3D_InitRenderState(data);
+
+    if (caps.MaxSimultaneousTextures >= 3)
+    {
+#ifdef ASSEMBLE_SHADER
+        /* This shader was created by running the following HLSL through the fxc compiler
+           and then tuning the generated assembly.
+
+           fxc /T fx_4_0 /O3 /Gfa /Fc yuv.fxc yuv.fx
+
+           --- yuv.fx ---
+           Texture2D g_txY;
+           Texture2D g_txU;
+           Texture2D g_txV;
+
+           SamplerState samLinear
+           {
+               Filter = ANISOTROPIC;
+               AddressU = Clamp;
+               AddressV = Clamp;
+               MaxAnisotropy = 1;
+           };
+
+           struct VS_OUTPUT
+           {
+                float2 TextureUV  : TEXCOORD0;
+           };
+
+           struct PS_OUTPUT
+           {
+                float4 RGBAColor : SV_Target;
+           };
+
+           PS_OUTPUT YUV420( VS_OUTPUT In ) 
+           {
+               const float3 offset = {-0.0625, -0.5, -0.5};
+               const float3 Rcoeff = {1.164,  0.000,  1.596};
+               const float3 Gcoeff = {1.164, -0.391, -0.813};
+               const float3 Bcoeff = {1.164,  2.018,  0.000};
+
+               PS_OUTPUT Output;
+               float2 TextureUV = In.TextureUV;
+
+               float3 yuv;
+               yuv.x = g_txY.Sample( samLinear, TextureUV ).r;
+               yuv.y = g_txU.Sample( samLinear, TextureUV ).r;
+               yuv.z = g_txV.Sample( samLinear, TextureUV ).r;
+
+               yuv += offset;
+               Output.RGBAColor.r = dot(yuv, Rcoeff);
+               Output.RGBAColor.g = dot(yuv, Gcoeff);
+               Output.RGBAColor.b = dot(yuv, Bcoeff);
+               Output.RGBAColor.a = 1.0f;
+
+               return Output;
+           }
+
+           technique10 RenderYUV420
+           {
+               pass P0
+               {
+                    SetPixelShader( CompileShader( ps_4_0_level_9_0, YUV420() ) );
+               }
+           }
+        */
+        const char *shader_text =
+            "ps_2_0\n"
+            "def c0, -0.0625, -0.5, -0.5, 1\n"
+            "def c1, 1.16400003, 0, 1.59599996, 0\n"
+            "def c2, 1.16400003, -0.391000003, -0.813000023, 0\n"
+            "def c3, 1.16400003, 2.01799989, 0, 0\n"
+            "dcl t0.xy\n"
+            "dcl v0.xyzw\n"
+            "dcl_2d s0\n"
+            "dcl_2d s1\n"
+            "dcl_2d s2\n"
+            "texld r0, t0, s0\n"
+            "texld r1, t0, s1\n"
+            "texld r2, t0, s2\n"
+            "mov r0.y, r1.x\n"
+            "mov r0.z, r2.x\n"
+            "add r0.xyz, r0, c0\n"
+            "dp3 r1.x, r0, c1\n"
+            "dp3 r1.y, r0, c2\n"
+            "dp2add r1.z, r0, c3, c3.z\n"   /* Logically this is "dp3 r1.z, r0, c3" but the optimizer did its magic */
+            "mov r1.w, c0.w\n"
+            "mul r0, r1, v0\n"              /* Not in the HLSL, multiply by vertex color */
+            "mov oC0, r0\n"
+        ;
+        LPD3DXBUFFER pCode;
+        LPD3DXBUFFER pErrorMsgs;
+        LPDWORD shader_data = NULL;
+        DWORD   shader_size = 0;
+        result = D3DXAssembleShader(shader_text, SDL_strlen(shader_text), NULL, NULL, 0, &pCode, &pErrorMsgs);
+        if (!FAILED(result)) {
+            shader_data = (DWORD*)pCode->lpVtbl->GetBufferPointer(pCode);
+            shader_size = pCode->lpVtbl->GetBufferSize(pCode);
+            PrintShaderData(shader_data, shader_size);
+        } else {
+            const char *error = (const char *)pErrorMsgs->lpVtbl->GetBufferPointer(pErrorMsgs);
+            SDL_SetError("Couldn't assemble shader: %s", error);
+        }
+#else
+        const DWORD shader_data[] = {
+            0xffff0200, 0x05000051, 0xa00f0000, 0xbd800000, 0xbf000000, 0xbf000000,
+            0x3f800000, 0x05000051, 0xa00f0001, 0x3f94fdf4, 0x00000000, 0x3fcc49ba,
+            0x00000000, 0x05000051, 0xa00f0002, 0x3f94fdf4, 0xbec83127, 0xbf5020c5,
+            0x00000000, 0x05000051, 0xa00f0003, 0x3f94fdf4, 0x400126e9, 0x00000000,
+            0x00000000, 0x0200001f, 0x80000000, 0xb0030000, 0x0200001f, 0x80000000,
+            0x900f0000, 0x0200001f, 0x90000000, 0xa00f0800, 0x0200001f, 0x90000000,
+            0xa00f0801, 0x0200001f, 0x90000000, 0xa00f0802, 0x03000042, 0x800f0000,
+            0xb0e40000, 0xa0e40800, 0x03000042, 0x800f0001, 0xb0e40000, 0xa0e40801,
+            0x03000042, 0x800f0002, 0xb0e40000, 0xa0e40802, 0x02000001, 0x80020000,
+            0x80000001, 0x02000001, 0x80040000, 0x80000002, 0x03000002, 0x80070000,
+            0x80e40000, 0xa0e40000, 0x03000008, 0x80010001, 0x80e40000, 0xa0e40001,
+            0x03000008, 0x80020001, 0x80e40000, 0xa0e40002, 0x0400005a, 0x80040001,
+            0x80e40000, 0xa0e40003, 0xa0aa0003, 0x02000001, 0x80080001, 0xa0ff0000,
+            0x03000005, 0x800f0000, 0x80e40001, 0x90e40000, 0x02000001, 0x800f0800,
+            0x80e40000, 0x0000ffff
+        };
+#endif
+        if (shader_data != NULL) {
+            result = IDirect3DDevice9_CreatePixelShader(data->device, shader_data, &data->ps_yuv);
+            if (!FAILED(result)) {
+                renderer->info.texture_formats[renderer->info.num_texture_formats++] = SDL_PIXELFORMAT_YV12;
+                renderer->info.texture_formats[renderer->info.num_texture_formats++] = SDL_PIXELFORMAT_IYUV;
+            } else {
+                D3D_SetError("CreatePixelShader()", result);
+            }
+        }
+    }
+
+    return renderer;
+}
+
+static void
+D3D_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+
+    if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
+        data->updateSize = SDL_TRUE;
+    }
+}
+
+static D3DTEXTUREFILTERTYPE
+GetScaleQuality(void)
+{
+    const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY);
+
+    if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
+        return D3DTEXF_POINT;
+    } else /* if (*hint == '1' || SDL_strcasecmp(hint, "linear") == 0) */ {
+        return D3DTEXF_LINEAR;
+    }
+}
+
+static int
+D3D_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    D3D_RenderData *renderdata = (D3D_RenderData *) renderer->driverdata;
+    D3D_TextureData *data;
+    D3DPOOL pool;
+    DWORD usage;
+    HRESULT result;
+
+    data = (D3D_TextureData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+    data->scaleMode = GetScaleQuality();
+
+    texture->driverdata = data;
+
+#ifdef USE_DYNAMIC_TEXTURE
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        pool = D3DPOOL_DEFAULT;
+        usage = D3DUSAGE_DYNAMIC;
+    } else
+#endif
+    if (texture->access == SDL_TEXTUREACCESS_TARGET) {
+        /* D3DPOOL_MANAGED does not work with D3DUSAGE_RENDERTARGET */
+        pool = D3DPOOL_DEFAULT;
+        usage = D3DUSAGE_RENDERTARGET;
+    } else {
+        pool = D3DPOOL_MANAGED;
+        usage = 0;
+    }
+
+    result =
+        IDirect3DDevice9_CreateTexture(renderdata->device, texture->w,
+                                       texture->h, 1, usage,
+                                       PixelFormatToD3DFMT(texture->format),
+                                       pool, &data->texture, NULL);
+    if (FAILED(result)) {
+        return D3D_SetError("CreateTexture()", result);
+    }
+
+    if (texture->format == SDL_PIXELFORMAT_YV12 ||
+        texture->format == SDL_PIXELFORMAT_IYUV) {
+        data->yuv = SDL_TRUE;
+
+        result =
+            IDirect3DDevice9_CreateTexture(renderdata->device, texture->w / 2,
+                                           texture->h / 2, 1, usage,
+                                           PixelFormatToD3DFMT(texture->format),
+                                           pool, &data->utexture, NULL);
+        if (FAILED(result)) {
+            return D3D_SetError("CreateTexture()", result);
+        }
+
+        result =
+            IDirect3DDevice9_CreateTexture(renderdata->device, texture->w / 2,
+                                           texture->h / 2, 1, usage,
+                                           PixelFormatToD3DFMT(texture->format),
+                                           pool, &data->vtexture, NULL);
+        if (FAILED(result)) {
+            return D3D_SetError("CreateTexture()", result);
+        }
+    }
+
+    return 0;
+}
+
+static int
+D3D_UpdateTextureInternal(IDirect3DTexture9 *texture, Uint32 format, SDL_bool full_texture, int x, int y, int w, int h, const void *pixels, int pitch)
+{
+    RECT d3drect;
+    D3DLOCKED_RECT locked;
+    const Uint8 *src;
+    Uint8 *dst;
+    int row, length;
+    HRESULT result;
+
+    if (full_texture) {
+        result = IDirect3DTexture9_LockRect(texture, 0, &locked, NULL, D3DLOCK_DISCARD);
+    } else {
+        d3drect.left = x;
+        d3drect.right = x + w;
+        d3drect.top = y;
+        d3drect.bottom = y + h;
+        result = IDirect3DTexture9_LockRect(texture, 0, &locked, &d3drect, 0);
+    }
+
+    if (FAILED(result)) {
+        return D3D_SetError("LockRect()", result);
+    }
+
+    src = (const Uint8 *)pixels;
+    dst = locked.pBits;
+    length = w * SDL_BYTESPERPIXEL(format);
+    if (length == pitch && length == locked.Pitch) {
+        SDL_memcpy(dst, src, length*h);
+    } else {
+        if (length > pitch) {
+            length = pitch;
+        }
+        if (length > locked.Pitch) {
+            length = locked.Pitch;
+        }
+        for (row = 0; row < h; ++row) {
+            SDL_memcpy(dst, src, length);
+            src += pitch;
+            dst += locked.Pitch;
+        }
+    }
+    IDirect3DTexture9_UnlockRect(texture, 0);
+
+    return 0;
+}
+
+static int
+D3D_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                  const SDL_Rect * rect, const void *pixels, int pitch)
+{
+    D3D_TextureData *data = (D3D_TextureData *) texture->driverdata;
+    SDL_bool full_texture = SDL_FALSE;
+
+#ifdef USE_DYNAMIC_TEXTURE
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING &&
+        rect->x == 0 && rect->y == 0 &&
+        rect->w == texture->w && rect->h == texture->h) {
+        full_texture = SDL_TRUE;
+    }
+#endif
+
+    if (!data) {
+        SDL_SetError("Texture is not currently available");
+        return -1;
+    }
+
+    if (D3D_UpdateTextureInternal(data->texture, texture->format, full_texture, rect->x, rect->y, rect->w, rect->h, pixels, pitch) < 0) {
+        return -1;
+    }
+
+    if (data->yuv) {
+        /* Skip to the correct offset into the next texture */
+        pixels = (const void*)((const Uint8*)pixels + rect->h * pitch);
+
+        if (D3D_UpdateTextureInternal(texture->format == SDL_PIXELFORMAT_YV12 ? data->vtexture : data->utexture, texture->format, full_texture, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, pixels, pitch / 2) < 0) {
+            return -1;
+        }
+
+        /* Skip to the correct offset into the next texture */
+        pixels = (const void*)((const Uint8*)pixels + (rect->h * pitch)/4);
+        if (D3D_UpdateTextureInternal(texture->format == SDL_PIXELFORMAT_YV12 ? data->utexture : data->vtexture, texture->format, full_texture, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, pixels, pitch / 2) < 0) {
+            return -1;
+        }
+    }
+    return 0;
+}
+
+static int
+D3D_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+                     const SDL_Rect * rect,
+                     const Uint8 *Yplane, int Ypitch,
+                     const Uint8 *Uplane, int Upitch,
+                     const Uint8 *Vplane, int Vpitch)
+{
+    D3D_TextureData *data = (D3D_TextureData *) texture->driverdata;
+    SDL_bool full_texture = SDL_FALSE;
+
+#ifdef USE_DYNAMIC_TEXTURE
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING &&
+        rect->x == 0 && rect->y == 0 &&
+        rect->w == texture->w && rect->h == texture->h) {
+            full_texture = SDL_TRUE;
+    }
+#endif
+
+    if (!data) {
+        SDL_SetError("Texture is not currently available");
+        return -1;
+    }
+
+    if (D3D_UpdateTextureInternal(data->texture, texture->format, full_texture, rect->x, rect->y, rect->w, rect->h, Yplane, Ypitch) < 0) {
+        return -1;
+    }
+    if (D3D_UpdateTextureInternal(data->utexture, texture->format, full_texture, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, Uplane, Upitch) < 0) {
+        return -1;
+    }
+    if (D3D_UpdateTextureInternal(data->vtexture, texture->format, full_texture, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, Vplane, Vpitch) < 0) {
+        return -1;
+    }
+    return 0;
+}
+
+static int
+D3D_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                const SDL_Rect * rect, void **pixels, int *pitch)
+{
+    D3D_TextureData *data = (D3D_TextureData *) texture->driverdata;
+    RECT d3drect;
+    D3DLOCKED_RECT locked;
+    HRESULT result;
+
+    if (!data) {
+        SDL_SetError("Texture is not currently available");
+        return -1;
+    }
+
+    if (data->yuv) {
+        /* It's more efficient to upload directly... */
+        if (!data->pixels) {
+            data->pitch = texture->w;
+            data->pixels = (Uint8 *)SDL_malloc((texture->h * data->pitch * 3) / 2);
+            if (!data->pixels) {
+                return SDL_OutOfMemory();
+            }
+        }
+        data->locked_rect = *rect;
+        *pixels =
+            (void *) ((Uint8 *) data->pixels + rect->y * data->pitch +
+                      rect->x * SDL_BYTESPERPIXEL(texture->format));
+        *pitch = data->pitch;
+    } else {
+        d3drect.left = rect->x;
+        d3drect.right = rect->x + rect->w;
+        d3drect.top = rect->y;
+        d3drect.bottom = rect->y + rect->h;
+
+        result = IDirect3DTexture9_LockRect(data->texture, 0, &locked, &d3drect, 0);
+        if (FAILED(result)) {
+            return D3D_SetError("LockRect()", result);
+        }
+        *pixels = locked.pBits;
+        *pitch = locked.Pitch;
+    }
+    return 0;
+}
+
+static void
+D3D_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    D3D_TextureData *data = (D3D_TextureData *) texture->driverdata;
+
+    if (!data) {
+        return;
+    }
+
+    if (data->yuv) {
+        const SDL_Rect *rect = &data->locked_rect;
+        void *pixels =
+            (void *) ((Uint8 *) data->pixels + rect->y * data->pitch +
+                      rect->x * SDL_BYTESPERPIXEL(texture->format));
+        D3D_UpdateTexture(renderer, texture, rect, pixels, data->pitch);
+    } else {
+        IDirect3DTexture9_UnlockRect(data->texture, 0);
+    }
+}
+
+static int
+D3D_SetRenderTargetInternal(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    D3D_TextureData *texturedata;
+    HRESULT result;
+
+    /* Release the previous render target if it wasn't the default one */
+    if (data->currentRenderTarget != NULL) {
+        IDirect3DSurface9_Release(data->currentRenderTarget);
+        data->currentRenderTarget = NULL;
+    }
+
+    if (texture == NULL) {
+        IDirect3DDevice9_SetRenderTarget(data->device, 0, data->defaultRenderTarget);
+        return 0;
+    }
+
+    texturedata = (D3D_TextureData *)texture->driverdata;
+    if (!texturedata) {
+        SDL_SetError("Texture is not currently available");
+        return -1;
+    }
+
+    result = IDirect3DTexture9_GetSurfaceLevel(texturedata->texture, 0, &data->currentRenderTarget);
+    if(FAILED(result)) {
+        return D3D_SetError("GetSurfaceLevel()", result);
+    }
+    result = IDirect3DDevice9_SetRenderTarget(data->device, 0, data->currentRenderTarget);
+    if(FAILED(result)) {
+        return D3D_SetError("SetRenderTarget()", result);
+    }
+
+    return 0;
+}
+
+static int
+D3D_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    D3D_ActivateRenderer(renderer);
+
+    return D3D_SetRenderTargetInternal(renderer, texture);
+}
+
+static int
+D3D_UpdateViewport(SDL_Renderer * renderer)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    D3DVIEWPORT9 viewport;
+    D3DMATRIX matrix;
+
+    /* Set the viewport */
+    viewport.X = renderer->viewport.x;
+    viewport.Y = renderer->viewport.y;
+    viewport.Width = renderer->viewport.w;
+    viewport.Height = renderer->viewport.h;
+    viewport.MinZ = 0.0f;
+    viewport.MaxZ = 1.0f;
+    IDirect3DDevice9_SetViewport(data->device, &viewport);
+
+    /* Set an orthographic projection matrix */
+    if (renderer->viewport.w && renderer->viewport.h) {
+        matrix.m[0][0] = 2.0f / renderer->viewport.w;
+        matrix.m[0][1] = 0.0f;
+        matrix.m[0][2] = 0.0f;
+        matrix.m[0][3] = 0.0f;
+        matrix.m[1][0] = 0.0f;
+        matrix.m[1][1] = -2.0f / renderer->viewport.h;
+        matrix.m[1][2] = 0.0f;
+        matrix.m[1][3] = 0.0f;
+        matrix.m[2][0] = 0.0f;
+        matrix.m[2][1] = 0.0f;
+        matrix.m[2][2] = 1.0f;
+        matrix.m[2][3] = 0.0f;
+        matrix.m[3][0] = -1.0f;
+        matrix.m[3][1] = 1.0f;
+        matrix.m[3][2] = 0.0f;
+        matrix.m[3][3] = 1.0f;
+        IDirect3DDevice9_SetTransform(data->device, D3DTS_PROJECTION, &matrix);
+    }
+
+    return 0;
+}
+
+static int
+D3D_UpdateClipRect(SDL_Renderer * renderer)
+{
+    const SDL_Rect *rect = &renderer->clip_rect;
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    RECT r;
+    HRESULT result;
+
+    if (!SDL_RectEmpty(rect)) {
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_SCISSORTESTENABLE, TRUE);
+        r.left = rect->x;
+        r.top = rect->y;
+        r.right = rect->x + rect->w;
+        r.bottom = rect->y + rect->h;
+
+        result = IDirect3DDevice9_SetScissorRect(data->device, &r);
+        if (result != D3D_OK) {
+            D3D_SetError("SetScissor()", result);
+            return -1;
+        }
+    } else {
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_SCISSORTESTENABLE, FALSE);
+    }
+    return 0;
+}
+
+static int
+D3D_RenderClear(SDL_Renderer * renderer)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    DWORD color;
+    HRESULT result;
+    int BackBufferWidth, BackBufferHeight;
+
+    if (D3D_ActivateRenderer(renderer) < 0) {
+        return -1;
+    }
+
+    color = D3DCOLOR_ARGB(renderer->a, renderer->r, renderer->g, renderer->b);
+
+    if (renderer->target) {
+        BackBufferWidth = renderer->target->w;
+        BackBufferHeight = renderer->target->h;
+    } else {
+        BackBufferWidth = data->pparams.BackBufferWidth;
+        BackBufferHeight = data->pparams.BackBufferHeight;
+    }
+
+    /* Don't reset the viewport if we don't have to! */
+    if (!renderer->viewport.x && !renderer->viewport.y &&
+        renderer->viewport.w == BackBufferWidth &&
+        renderer->viewport.h == BackBufferHeight) {
+        result = IDirect3DDevice9_Clear(data->device, 0, NULL, D3DCLEAR_TARGET, color, 0.0f, 0);
+    } else {
+        D3DVIEWPORT9 viewport;
+
+        /* Clear is defined to clear the entire render target */
+        viewport.X = 0;
+        viewport.Y = 0;
+        viewport.Width = BackBufferWidth;
+        viewport.Height = BackBufferHeight;
+        viewport.MinZ = 0.0f;
+        viewport.MaxZ = 1.0f;
+        IDirect3DDevice9_SetViewport(data->device, &viewport);
+
+        result = IDirect3DDevice9_Clear(data->device, 0, NULL, D3DCLEAR_TARGET, color, 0.0f, 0);
+
+        /* Reset the viewport */
+        viewport.X = renderer->viewport.x;
+        viewport.Y = renderer->viewport.y;
+        viewport.Width = renderer->viewport.w;
+        viewport.Height = renderer->viewport.h;
+        viewport.MinZ = 0.0f;
+        viewport.MaxZ = 1.0f;
+        IDirect3DDevice9_SetViewport(data->device, &viewport);
+    }
+
+    if (FAILED(result)) {
+        return D3D_SetError("Clear()", result);
+    }
+    return 0;
+}
+
+static void
+D3D_SetBlendMode(D3D_RenderData * data, int blendMode)
+{
+    switch (blendMode) {
+    case SDL_BLENDMODE_NONE:
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_ALPHABLENDENABLE,
+                                        FALSE);
+        break;
+    case SDL_BLENDMODE_BLEND:
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_ALPHABLENDENABLE,
+                                        TRUE);
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_SRCBLEND,
+                                        D3DBLEND_SRCALPHA);
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_DESTBLEND,
+                                        D3DBLEND_INVSRCALPHA);
+        if (data->enableSeparateAlphaBlend) {
+            IDirect3DDevice9_SetRenderState(data->device, D3DRS_SRCBLENDALPHA,
+                                            D3DBLEND_ONE);
+            IDirect3DDevice9_SetRenderState(data->device, D3DRS_DESTBLENDALPHA,
+                                            D3DBLEND_INVSRCALPHA);
+        }
+        break;
+    case SDL_BLENDMODE_ADD:
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_ALPHABLENDENABLE,
+                                        TRUE);
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_SRCBLEND,
+                                        D3DBLEND_SRCALPHA);
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_DESTBLEND,
+                                        D3DBLEND_ONE);
+        if (data->enableSeparateAlphaBlend) {
+            IDirect3DDevice9_SetRenderState(data->device, D3DRS_SRCBLENDALPHA,
+                                            D3DBLEND_ZERO);
+            IDirect3DDevice9_SetRenderState(data->device, D3DRS_DESTBLENDALPHA,
+                                            D3DBLEND_ONE);
+        }
+        break;
+    case SDL_BLENDMODE_MOD:
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_ALPHABLENDENABLE,
+                                        TRUE);
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_SRCBLEND,
+                                        D3DBLEND_ZERO);
+        IDirect3DDevice9_SetRenderState(data->device, D3DRS_DESTBLEND,
+                                        D3DBLEND_SRCCOLOR);
+        if (data->enableSeparateAlphaBlend) {
+            IDirect3DDevice9_SetRenderState(data->device, D3DRS_SRCBLENDALPHA,
+                                            D3DBLEND_ZERO);
+            IDirect3DDevice9_SetRenderState(data->device, D3DRS_DESTBLENDALPHA,
+                                            D3DBLEND_ONE);
+        }
+        break;
+    }
+}
+
+static int
+D3D_RenderDrawPoints(SDL_Renderer * renderer, const SDL_FPoint * points,
+                     int count)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    DWORD color;
+    Vertex *vertices;
+    int i;
+    HRESULT result;
+
+    if (D3D_ActivateRenderer(renderer) < 0) {
+        return -1;
+    }
+
+    D3D_SetBlendMode(data, renderer->blendMode);
+
+    result =
+        IDirect3DDevice9_SetTexture(data->device, 0,
+                                    (IDirect3DBaseTexture9 *) 0);
+    if (FAILED(result)) {
+        return D3D_SetError("SetTexture()", result);
+    }
+
+    color = D3DCOLOR_ARGB(renderer->a, renderer->r, renderer->g, renderer->b);
+
+    vertices = SDL_stack_alloc(Vertex, count);
+    for (i = 0; i < count; ++i) {
+        vertices[i].x = points[i].x;
+        vertices[i].y = points[i].y;
+        vertices[i].z = 0.0f;
+        vertices[i].color = color;
+        vertices[i].u = 0.0f;
+        vertices[i].v = 0.0f;
+    }
+    result =
+        IDirect3DDevice9_DrawPrimitiveUP(data->device, D3DPT_POINTLIST, count,
+                                         vertices, sizeof(*vertices));
+    SDL_stack_free(vertices);
+    if (FAILED(result)) {
+        return D3D_SetError("DrawPrimitiveUP()", result);
+    }
+    return 0;
+}
+
+static int
+D3D_RenderDrawLines(SDL_Renderer * renderer, const SDL_FPoint * points,
+                    int count)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    DWORD color;
+    Vertex *vertices;
+    int i;
+    HRESULT result;
+
+    if (D3D_ActivateRenderer(renderer) < 0) {
+        return -1;
+    }
+
+    D3D_SetBlendMode(data, renderer->blendMode);
+
+    result =
+        IDirect3DDevice9_SetTexture(data->device, 0,
+                                    (IDirect3DBaseTexture9 *) 0);
+    if (FAILED(result)) {
+        return D3D_SetError("SetTexture()", result);
+    }
+
+    color = D3DCOLOR_ARGB(renderer->a, renderer->r, renderer->g, renderer->b);
+
+    vertices = SDL_stack_alloc(Vertex, count);
+    for (i = 0; i < count; ++i) {
+        vertices[i].x = points[i].x;
+        vertices[i].y = points[i].y;
+        vertices[i].z = 0.0f;
+        vertices[i].color = color;
+        vertices[i].u = 0.0f;
+        vertices[i].v = 0.0f;
+    }
+    result =
+        IDirect3DDevice9_DrawPrimitiveUP(data->device, D3DPT_LINESTRIP, count-1,
+                                         vertices, sizeof(*vertices));
+
+    /* DirectX 9 has the same line rasterization semantics as GDI,
+       so we need to close the endpoint of the line */
+    if (count == 2 ||
+        points[0].x != points[count-1].x || points[0].y != points[count-1].y) {
+        vertices[0].x = points[count-1].x;
+        vertices[0].y = points[count-1].y;
+        result = IDirect3DDevice9_DrawPrimitiveUP(data->device, D3DPT_POINTLIST, 1, vertices, sizeof(*vertices));
+    }
+
+    SDL_stack_free(vertices);
+    if (FAILED(result)) {
+        return D3D_SetError("DrawPrimitiveUP()", result);
+    }
+    return 0;
+}
+
+static int
+D3D_RenderFillRects(SDL_Renderer * renderer, const SDL_FRect * rects,
+                    int count)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    DWORD color;
+    int i;
+    float minx, miny, maxx, maxy;
+    Vertex vertices[4];
+    HRESULT result;
+
+    if (D3D_ActivateRenderer(renderer) < 0) {
+        return -1;
+    }
+
+    D3D_SetBlendMode(data, renderer->blendMode);
+
+    result =
+        IDirect3DDevice9_SetTexture(data->device, 0,
+                                    (IDirect3DBaseTexture9 *) 0);
+    if (FAILED(result)) {
+        return D3D_SetError("SetTexture()", result);
+    }
+
+    color = D3DCOLOR_ARGB(renderer->a, renderer->r, renderer->g, renderer->b);
+
+    for (i = 0; i < count; ++i) {
+        const SDL_FRect *rect = &rects[i];
+
+        minx = rect->x;
+        miny = rect->y;
+        maxx = rect->x + rect->w;
+        maxy = rect->y + rect->h;
+
+        vertices[0].x = minx;
+        vertices[0].y = miny;
+        vertices[0].z = 0.0f;
+        vertices[0].color = color;
+        vertices[0].u = 0.0f;
+        vertices[0].v = 0.0f;
+
+        vertices[1].x = maxx;
+        vertices[1].y = miny;
+        vertices[1].z = 0.0f;
+        vertices[1].color = color;
+        vertices[1].u = 0.0f;
+        vertices[1].v = 0.0f;
+
+        vertices[2].x = maxx;
+        vertices[2].y = maxy;
+        vertices[2].z = 0.0f;
+        vertices[2].color = color;
+        vertices[2].u = 0.0f;
+        vertices[2].v = 0.0f;
+
+        vertices[3].x = minx;
+        vertices[3].y = maxy;
+        vertices[3].z = 0.0f;
+        vertices[3].color = color;
+        vertices[3].u = 0.0f;
+        vertices[3].v = 0.0f;
+
+        result =
+            IDirect3DDevice9_DrawPrimitiveUP(data->device, D3DPT_TRIANGLEFAN,
+                                             2, vertices, sizeof(*vertices));
+        if (FAILED(result)) {
+            return D3D_SetError("DrawPrimitiveUP()", result);
+        }
+    }
+    return 0;
+}
+
+static void
+D3D_UpdateTextureScaleMode(D3D_RenderData *data, D3D_TextureData *texturedata, unsigned index)
+{
+    if (texturedata->scaleMode != data->scaleMode[index]) {
+        IDirect3DDevice9_SetSamplerState(data->device, index, D3DSAMP_MINFILTER,
+                                         texturedata->scaleMode);
+        IDirect3DDevice9_SetSamplerState(data->device, index, D3DSAMP_MAGFILTER,
+                                         texturedata->scaleMode);
+        data->scaleMode[index] = texturedata->scaleMode;
+    }
+}
+
+static int
+D3D_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+               const SDL_Rect * srcrect, const SDL_FRect * dstrect)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    D3D_TextureData *texturedata;
+    LPDIRECT3DPIXELSHADER9 shader = NULL;
+    float minx, miny, maxx, maxy;
+    float minu, maxu, minv, maxv;
+    DWORD color;
+    Vertex vertices[4];
+    HRESULT result;
+
+    if (D3D_ActivateRenderer(renderer) < 0) {
+        return -1;
+    }
+
+    texturedata = (D3D_TextureData *)texture->driverdata;
+    if (!texturedata) {
+        SDL_SetError("Texture is not currently available");
+        return -1;
+    }
+
+    minx = dstrect->x - 0.5f;
+    miny = dstrect->y - 0.5f;
+    maxx = dstrect->x + dstrect->w - 0.5f;
+    maxy = dstrect->y + dstrect->h - 0.5f;
+
+    minu = (float) srcrect->x / texture->w;
+    maxu = (float) (srcrect->x + srcrect->w) / texture->w;
+    minv = (float) srcrect->y / texture->h;
+    maxv = (float) (srcrect->y + srcrect->h) / texture->h;
+
+    color = D3DCOLOR_ARGB(texture->a, texture->r, texture->g, texture->b);
+
+    vertices[0].x = minx;
+    vertices[0].y = miny;
+    vertices[0].z = 0.0f;
+    vertices[0].color = color;
+    vertices[0].u = minu;
+    vertices[0].v = minv;
+
+    vertices[1].x = maxx;
+    vertices[1].y = miny;
+    vertices[1].z = 0.0f;
+    vertices[1].color = color;
+    vertices[1].u = maxu;
+    vertices[1].v = minv;
+
+    vertices[2].x = maxx;
+    vertices[2].y = maxy;
+    vertices[2].z = 0.0f;
+    vertices[2].color = color;
+    vertices[2].u = maxu;
+    vertices[2].v = maxv;
+
+    vertices[3].x = minx;
+    vertices[3].y = maxy;
+    vertices[3].z = 0.0f;
+    vertices[3].color = color;
+    vertices[3].u = minu;
+    vertices[3].v = maxv;
+
+    D3D_SetBlendMode(data, texture->blendMode);
+
+    D3D_UpdateTextureScaleMode(data, texturedata, 0);
+
+    result =
+        IDirect3DDevice9_SetTexture(data->device, 0, (IDirect3DBaseTexture9 *)
+                                    texturedata->texture);
+    if (FAILED(result)) {
+        return D3D_SetError("SetTexture()", result);
+    }
+
+    if (texturedata->yuv) {
+        shader = data->ps_yuv;
+
+        D3D_UpdateTextureScaleMode(data, texturedata, 1);
+        D3D_UpdateTextureScaleMode(data, texturedata, 2);
+
+        result =
+            IDirect3DDevice9_SetTexture(data->device, 1, (IDirect3DBaseTexture9 *)
+                                        texturedata->utexture);
+        if (FAILED(result)) {
+            return D3D_SetError("SetTexture()", result);
+        }
+
+        result =
+            IDirect3DDevice9_SetTexture(data->device, 2, (IDirect3DBaseTexture9 *)
+                                        texturedata->vtexture);
+        if (FAILED(result)) {
+            return D3D_SetError("SetTexture()", result);
+        }
+    }
+
+    if (shader) {
+        result = IDirect3DDevice9_SetPixelShader(data->device, shader);
+        if (FAILED(result)) {
+            return D3D_SetError("SetShader()", result);
+        }
+    }
+    result =
+        IDirect3DDevice9_DrawPrimitiveUP(data->device, D3DPT_TRIANGLEFAN, 2,
+                                         vertices, sizeof(*vertices));
+    if (FAILED(result)) {
+        return D3D_SetError("DrawPrimitiveUP()", result);
+    }
+    if (shader) {
+        result = IDirect3DDevice9_SetPixelShader(data->device, NULL);
+        if (FAILED(result)) {
+            return D3D_SetError("SetShader()", result);
+        }
+    }
+    return 0;
+}
+
+
+static int
+D3D_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+               const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+               const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    D3D_TextureData *texturedata;
+    LPDIRECT3DPIXELSHADER9 shader = NULL;
+    float minx, miny, maxx, maxy;
+    float minu, maxu, minv, maxv;
+    float centerx, centery;
+    DWORD color;
+    Vertex vertices[4];
+    Float4X4 modelMatrix;
+    HRESULT result;
+
+    if (D3D_ActivateRenderer(renderer) < 0) {
+        return -1;
+    }
+
+    texturedata = (D3D_TextureData *)texture->driverdata;
+    if (!texturedata) {
+        SDL_SetError("Texture is not currently available");
+        return -1;
+    }
+
+    centerx = center->x;
+    centery = center->y;
+
+    if (flip & SDL_FLIP_HORIZONTAL) {
+        minx = dstrect->w - centerx - 0.5f;
+        maxx = -centerx - 0.5f;
+    }
+    else {
+        minx = -centerx - 0.5f;
+        maxx = dstrect->w - centerx - 0.5f;
+    }
+
+    if (flip & SDL_FLIP_VERTICAL) {
+        miny = dstrect->h - centery - 0.5f;
+        maxy = -centery - 0.5f;
+    }
+    else {
+        miny = -centery - 0.5f;
+        maxy = dstrect->h - centery - 0.5f;
+    }
+
+    minu = (float) srcrect->x / texture->w;
+    maxu = (float) (srcrect->x + srcrect->w) / texture->w;
+    minv = (float) srcrect->y / texture->h;
+    maxv = (float) (srcrect->y + srcrect->h) / texture->h;
+
+    color = D3DCOLOR_ARGB(texture->a, texture->r, texture->g, texture->b);
+
+    vertices[0].x = minx;
+    vertices[0].y = miny;
+    vertices[0].z = 0.0f;
+    vertices[0].color = color;
+    vertices[0].u = minu;
+    vertices[0].v = minv;
+
+    vertices[1].x = maxx;
+    vertices[1].y = miny;
+    vertices[1].z = 0.0f;
+    vertices[1].color = color;
+    vertices[1].u = maxu;
+    vertices[1].v = minv;
+
+    vertices[2].x = maxx;
+    vertices[2].y = maxy;
+    vertices[2].z = 0.0f;
+    vertices[2].color = color;
+    vertices[2].u = maxu;
+    vertices[2].v = maxv;
+
+    vertices[3].x = minx;
+    vertices[3].y = maxy;
+    vertices[3].z = 0.0f;
+    vertices[3].color = color;
+    vertices[3].u = minu;
+    vertices[3].v = maxv;
+
+    D3D_SetBlendMode(data, texture->blendMode);
+
+    /* Rotate and translate */
+    modelMatrix = MatrixMultiply(
+            MatrixRotationZ((float)(M_PI * (float) angle / 180.0f)),
+            MatrixTranslation(dstrect->x + center->x, dstrect->y + center->y, 0)
+            );
+    IDirect3DDevice9_SetTransform(data->device, D3DTS_VIEW, (D3DMATRIX*)&modelMatrix);
+
+    D3D_UpdateTextureScaleMode(data, texturedata, 0);
+
+    result =
+        IDirect3DDevice9_SetTexture(data->device, 0, (IDirect3DBaseTexture9 *)
+                                    texturedata->texture);
+    if (FAILED(result)) {
+        return D3D_SetError("SetTexture()", result);
+    }
+
+    if (texturedata->yuv) {
+        shader = data->ps_yuv;
+
+        D3D_UpdateTextureScaleMode(data, texturedata, 1);
+        D3D_UpdateTextureScaleMode(data, texturedata, 2);
+
+        result =
+            IDirect3DDevice9_SetTexture(data->device, 1, (IDirect3DBaseTexture9 *)
+                                        texturedata->utexture);
+        if (FAILED(result)) {
+            return D3D_SetError("SetTexture()", result);
+        }
+
+        result =
+            IDirect3DDevice9_SetTexture(data->device, 2, (IDirect3DBaseTexture9 *)
+                                        texturedata->vtexture);
+        if (FAILED(result)) {
+            return D3D_SetError("SetTexture()", result);
+        }
+    }
+
+    if (shader) {
+        result = IDirect3DDevice9_SetPixelShader(data->device, shader);
+        if (FAILED(result)) {
+            return D3D_SetError("SetShader()", result);
+        }
+    }
+    result =
+        IDirect3DDevice9_DrawPrimitiveUP(data->device, D3DPT_TRIANGLEFAN, 2,
+                                         vertices, sizeof(*vertices));
+    if (FAILED(result)) {
+        return D3D_SetError("DrawPrimitiveUP()", result);
+    }
+    if (shader) {
+        result = IDirect3DDevice9_SetPixelShader(data->device, NULL);
+        if (FAILED(result)) {
+            return D3D_SetError("SetShader()", result);
+        }
+    }
+
+    modelMatrix = MatrixIdentity();
+    IDirect3DDevice9_SetTransform(data->device, D3DTS_VIEW, (D3DMATRIX*)&modelMatrix);
+    return 0;
+}
+
+static int
+D3D_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                     Uint32 format, void * pixels, int pitch)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    D3DSURFACE_DESC desc;
+    LPDIRECT3DSURFACE9 backBuffer;
+    LPDIRECT3DSURFACE9 surface;
+    RECT d3drect;
+    D3DLOCKED_RECT locked;
+    HRESULT result;
+
+    result = IDirect3DDevice9_GetBackBuffer(data->device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backBuffer);
+    if (FAILED(result)) {
+        return D3D_SetError("GetBackBuffer()", result);
+    }
+
+    result = IDirect3DSurface9_GetDesc(backBuffer, &desc);
+    if (FAILED(result)) {
+        IDirect3DSurface9_Release(backBuffer);
+        return D3D_SetError("GetDesc()", result);
+    }
+
+    result = IDirect3DDevice9_CreateOffscreenPlainSurface(data->device, desc.Width, desc.Height, desc.Format, D3DPOOL_SYSTEMMEM, &surface, NULL);
+    if (FAILED(result)) {
+        IDirect3DSurface9_Release(backBuffer);
+        return D3D_SetError("CreateOffscreenPlainSurface()", result);
+    }
+
+    result = IDirect3DDevice9_GetRenderTargetData(data->device, backBuffer, surface);
+    if (FAILED(result)) {
+        IDirect3DSurface9_Release(surface);
+        IDirect3DSurface9_Release(backBuffer);
+        return D3D_SetError("GetRenderTargetData()", result);
+    }
+
+    d3drect.left = rect->x;
+    d3drect.right = rect->x + rect->w;
+    d3drect.top = rect->y;
+    d3drect.bottom = rect->y + rect->h;
+
+    result = IDirect3DSurface9_LockRect(surface, &locked, &d3drect, D3DLOCK_READONLY);
+    if (FAILED(result)) {
+        IDirect3DSurface9_Release(surface);
+        IDirect3DSurface9_Release(backBuffer);
+        return D3D_SetError("LockRect()", result);
+    }
+
+    SDL_ConvertPixels(rect->w, rect->h,
+                      D3DFMTToPixelFormat(desc.Format), locked.pBits, locked.Pitch,
+                      format, pixels, pitch);
+
+    IDirect3DSurface9_UnlockRect(surface);
+
+    IDirect3DSurface9_Release(surface);
+    IDirect3DSurface9_Release(backBuffer);
+
+    return 0;
+}
+
+static void
+D3D_RenderPresent(SDL_Renderer * renderer)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+    HRESULT result;
+
+    if (!data->beginScene) {
+        IDirect3DDevice9_EndScene(data->device);
+        data->beginScene = SDL_TRUE;
+    }
+
+    result = IDirect3DDevice9_TestCooperativeLevel(data->device);
+    if (result == D3DERR_DEVICELOST) {
+        /* We'll reset later */
+        return;
+    }
+    if (result == D3DERR_DEVICENOTRESET) {
+        D3D_Reset(renderer);
+    }
+    result = IDirect3DDevice9_Present(data->device, NULL, NULL, NULL, NULL);
+    if (FAILED(result)) {
+        D3D_SetError("Present()", result);
+    }
+}
+
+static void
+D3D_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    D3D_TextureData *data = (D3D_TextureData *) texture->driverdata;
+
+    if (!data) {
+        return;
+    }
+    if (data->texture) {
+        IDirect3DTexture9_Release(data->texture);
+    }
+    if (data->utexture) {
+        IDirect3DTexture9_Release(data->utexture);
+    }
+    if (data->vtexture) {
+        IDirect3DTexture9_Release(data->vtexture);
+    }
+    SDL_free(data->pixels);
+    SDL_free(data);
+    texture->driverdata = NULL;
+}
+
+static void
+D3D_DestroyRenderer(SDL_Renderer * renderer)
+{
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+
+    if (data) {
+        /* Release the render target */
+        if (data->defaultRenderTarget) {
+            IDirect3DSurface9_Release(data->defaultRenderTarget);
+            data->defaultRenderTarget = NULL;
+        }
+        if (data->currentRenderTarget != NULL) {
+            IDirect3DSurface9_Release(data->currentRenderTarget);
+            data->currentRenderTarget = NULL;
+        }
+        if (data->ps_yuv) {
+            IDirect3DPixelShader9_Release(data->ps_yuv);
+        }
+        if (data->device) {
+            IDirect3DDevice9_Release(data->device);
+        }
+        if (data->d3d) {
+            IDirect3D9_Release(data->d3d);
+            SDL_UnloadObject(data->d3dDLL);
+        }
+        SDL_free(data);
+    }
+    SDL_free(renderer);
+}
+#endif /* SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED */
+
+#ifdef __WIN32__
+/* This function needs to always exist on Windows, for the Dynamic API. */
+IDirect3DDevice9 *
+SDL_RenderGetD3D9Device(SDL_Renderer * renderer)
+{
+    IDirect3DDevice9 *device = NULL;
+
+#if SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED
+    D3D_RenderData *data = (D3D_RenderData *) renderer->driverdata;
+
+    // Make sure that this is a D3D renderer
+    if (renderer->DestroyRenderer != D3D_DestroyRenderer) {
+        SDL_SetError("Renderer is not a D3D renderer");
+        return NULL;
+    }
+
+    device = data->device;
+    if (device) {
+        IDirect3DDevice9_AddRef(device);
+    }
+#endif /* SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED */
+
+    return device;
+}
+#endif /* __WIN32__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/direct3d11/SDL_render_d3d11.c b/Source/3rd Party/sdl/src/render/direct3d11/SDL_render_d3d11.c
new file mode 100644
index 000000000..dbffd5053
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/direct3d11/SDL_render_d3d11.c	
@@ -0,0 +1,2879 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+
+#define COBJMACROS
+#include "../../core/windows/SDL_windows.h"
+#include "SDL_hints.h"
+#include "SDL_loadso.h"
+#include "SDL_syswm.h"
+#include "../SDL_sysrender.h"
+#include "../SDL_d3dmath.h"
+
+#include <d3d11_1.h>
+
+
+#ifdef __WINRT__
+
+#include "SDL_render_winrt.h"
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+#include <windows.ui.xaml.media.dxinterop.h>
+/* TODO, WinRT, XAML: get the ISwapChainBackgroundPanelNative from something other than a global var */
+extern ISwapChainBackgroundPanelNative * WINRT_GlobalSwapChainBackgroundPanelNative;
+#endif  /* WINAPI_FAMILY == WINAPI_FAMILY_APP */
+
+#endif  /* __WINRT__ */
+
+
+#define SAFE_RELEASE(X) if ((X)) { IUnknown_Release(SDL_static_cast(IUnknown*, X)); X = NULL; }
+
+
+/* Vertex shader, common values */
+typedef struct
+{
+    Float4X4 model;
+    Float4X4 projectionAndView;
+} VertexShaderConstants;
+
+/* Per-vertex data */
+typedef struct
+{
+    Float3 pos;
+    Float2 tex;
+    Float4 color;
+} VertexPositionColor;
+
+/* Per-texture data */
+typedef struct
+{
+    ID3D11Texture2D *mainTexture;
+    ID3D11ShaderResourceView *mainTextureResourceView;
+    ID3D11RenderTargetView *mainTextureRenderTargetView;
+    ID3D11Texture2D *stagingTexture;
+    int lockedTexturePositionX;
+    int lockedTexturePositionY;
+    D3D11_FILTER scaleMode;
+
+    /* YV12 texture support */
+    SDL_bool yuv;
+    ID3D11Texture2D *mainTextureU;
+    ID3D11ShaderResourceView *mainTextureResourceViewU;
+    ID3D11Texture2D *mainTextureV;
+    ID3D11ShaderResourceView *mainTextureResourceViewV;
+    Uint8 *pixels;
+    int pitch;
+    SDL_Rect locked_rect;
+} D3D11_TextureData;
+
+/* Private renderer data */
+typedef struct
+{
+    void *hDXGIMod;
+    void *hD3D11Mod;
+    IDXGIFactory2 *dxgiFactory;
+    IDXGIAdapter *dxgiAdapter;
+    ID3D11Device1 *d3dDevice;
+    ID3D11DeviceContext1 *d3dContext;
+    IDXGISwapChain1 *swapChain;
+    DXGI_SWAP_EFFECT swapEffect;
+    ID3D11RenderTargetView *mainRenderTargetView;
+    ID3D11RenderTargetView *currentOffscreenRenderTargetView;
+    ID3D11InputLayout *inputLayout;
+    ID3D11Buffer *vertexBuffer;
+    ID3D11VertexShader *vertexShader;
+    ID3D11PixelShader *colorPixelShader;
+    ID3D11PixelShader *texturePixelShader;
+    ID3D11PixelShader *yuvPixelShader;
+    ID3D11BlendState *blendModeBlend;
+    ID3D11BlendState *blendModeAdd;
+    ID3D11BlendState *blendModeMod;
+    ID3D11SamplerState *nearestPixelSampler;
+    ID3D11SamplerState *linearSampler;
+    D3D_FEATURE_LEVEL featureLevel;
+
+    /* Rasterizers */
+    ID3D11RasterizerState *mainRasterizer;
+    ID3D11RasterizerState *clippedRasterizer;
+
+    /* Vertex buffer constants */
+    VertexShaderConstants vertexShaderConstantsData;
+    ID3D11Buffer *vertexShaderConstants;
+
+    /* Cached renderer properties */
+    DXGI_MODE_ROTATION rotation;
+    ID3D11RenderTargetView *currentRenderTargetView;
+    ID3D11RasterizerState *currentRasterizerState;
+    ID3D11BlendState *currentBlendState;
+    ID3D11PixelShader *currentShader;
+    ID3D11ShaderResourceView *currentShaderResource;
+    ID3D11SamplerState *currentSampler;
+} D3D11_RenderData;
+
+
+/* Defined here so we don't have to include uuid.lib */
+static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } };
+static const GUID IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } };
+static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } };
+static const GUID IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } };
+static const GUID IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } };
+static const GUID IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } };
+
+/* Direct3D 11.x shaders
+
+   SDL's shaders are compiled into SDL itself, to simplify distribution.
+
+   All Direct3D 11.x shaders were compiled with the following:
+
+   fxc /E"main" /T "<TYPE>" /Fo"<OUTPUT FILE>" "<INPUT FILE>"
+
+     Variables:
+     - <TYPE>: the type of shader.  A table of utilized shader types is
+       listed below.
+     - <OUTPUT FILE>: where to store compiled output
+     - <INPUT FILE>: where to read shader source code from
+
+     Shader types:
+     - ps_4_0_level_9_1: Pixel shader for Windows 8+, including Windows RT
+     - vs_4_0_level_9_1: Vertex shader for Windows 8+, including Windows RT
+     - ps_4_0_level_9_3: Pixel shader for Windows Phone 8
+     - vs_4_0_level_9_3: Vertex shader for Windows Phone 8
+   
+
+   Shader object code was converted to a list of DWORDs via the following
+   *nix style command (available separately from Windows + MSVC):
+
+     hexdump -v -e '6/4 "0x%08.8x, " "\n"' <FILE>
+  */
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#define D3D11_USE_SHADER_MODEL_4_0_level_9_3
+#else
+#define D3D11_USE_SHADER_MODEL_4_0_level_9_1
+#endif
+
+/* The color-only-rendering pixel shader:
+
+   --- D3D11_PixelShader_Colors.hlsl ---
+   struct PixelShaderInput
+   {
+       float4 pos : SV_POSITION;
+       float2 tex : TEXCOORD0;
+       float4 color : COLOR0;
+   };
+
+   float4 main(PixelShaderInput input) : SV_TARGET
+   {
+       return input.color;
+   }
+*/
+#if defined(D3D11_USE_SHADER_MODEL_4_0_level_9_1)
+static const DWORD D3D11_PixelShader_Colors[] = {
+    0x43425844, 0xd74c28fe, 0xa1eb8804, 0x269d512a, 0x7699723d, 0x00000001,
+    0x00000240, 0x00000006, 0x00000038, 0x00000084, 0x000000c4, 0x00000140,
+    0x00000198, 0x0000020c, 0x396e6f41, 0x00000044, 0x00000044, 0xffff0200,
+    0x00000020, 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000,
+    0x00240000, 0xffff0200, 0x0200001f, 0x80000000, 0xb00f0001, 0x02000001,
+    0x800f0800, 0xb0e40001, 0x0000ffff, 0x52444853, 0x00000038, 0x00000040,
+    0x0000000e, 0x03001062, 0x001010f2, 0x00000002, 0x03000065, 0x001020f2,
+    0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000002,
+    0x0100003e, 0x54415453, 0x00000074, 0x00000002, 0x00000000, 0x00000000,
+    0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x46454452, 0x00000050, 0x00000000, 0x00000000,
+    0x00000000, 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d,
+    0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072,
+    0x6c69706d, 0x39207265, 0x2e30332e, 0x30303239, 0x3336312e, 0xab003438,
+    0x4e475349, 0x0000006c, 0x00000003, 0x00000008, 0x00000050, 0x00000000,
+    0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000,
+    0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000065, 0x00000000,
+    0x00000000, 0x00000003, 0x00000002, 0x00000f0f, 0x505f5653, 0x5449534f,
+    0x004e4f49, 0x43584554, 0x44524f4f, 0x4c4f4300, 0xab00524f, 0x4e47534f,
+    0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+    0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054
+};
+#elif defined(D3D11_USE_SHADER_MODEL_4_0_level_9_3)
+static const DWORD D3D11_PixelShader_Colors[] = {
+    0x43425844, 0x93f6ccfc, 0x5f919270, 0x7a11aa4f, 0x9148e931, 0x00000001,
+    0x00000240, 0x00000006, 0x00000038, 0x00000084, 0x000000c4, 0x00000140,
+    0x00000198, 0x0000020c, 0x396e6f41, 0x00000044, 0x00000044, 0xffff0200,
+    0x00000020, 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000,
+    0x00240000, 0xffff0201, 0x0200001f, 0x80000000, 0xb00f0001, 0x02000001,
+    0x800f0800, 0xb0e40001, 0x0000ffff, 0x52444853, 0x00000038, 0x00000040,
+    0x0000000e, 0x03001062, 0x001010f2, 0x00000002, 0x03000065, 0x001020f2,
+    0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000002,
+    0x0100003e, 0x54415453, 0x00000074, 0x00000002, 0x00000000, 0x00000000,
+    0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x46454452, 0x00000050, 0x00000000, 0x00000000,
+    0x00000000, 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d,
+    0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072,
+    0x6c69706d, 0x39207265, 0x2e30332e, 0x30303239, 0x3336312e, 0xab003438,
+    0x4e475349, 0x0000006c, 0x00000003, 0x00000008, 0x00000050, 0x00000000,
+    0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000,
+    0x00000000, 0x00000003, 0x00000001, 0x00000003, 0x00000065, 0x00000000,
+    0x00000000, 0x00000003, 0x00000002, 0x00000f0f, 0x505f5653, 0x5449534f,
+    0x004e4f49, 0x43584554, 0x44524f4f, 0x4c4f4300, 0xab00524f, 0x4e47534f,
+    0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+    0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054
+};
+#else
+#error "An appropriate 'colors' pixel shader is not defined."
+#endif
+
+/* The texture-rendering pixel shader:
+
+    --- D3D11_PixelShader_Textures.hlsl ---
+    Texture2D theTexture : register(t0);
+    SamplerState theSampler : register(s0);
+
+    struct PixelShaderInput
+    {
+        float4 pos : SV_POSITION;
+        float2 tex : TEXCOORD0;
+        float4 color : COLOR0;
+    };
+
+    float4 main(PixelShaderInput input) : SV_TARGET
+    {
+        return theTexture.Sample(theSampler, input.tex) * input.color;
+    }
+*/
+#if defined(D3D11_USE_SHADER_MODEL_4_0_level_9_1)
+static const DWORD D3D11_PixelShader_Textures[] = {
+    0x43425844, 0x6299b59f, 0x155258f2, 0x873ab86a, 0xfcbb6dcd, 0x00000001,
+    0x00000330, 0x00000006, 0x00000038, 0x000000c0, 0x0000015c, 0x000001d8,
+    0x00000288, 0x000002fc, 0x396e6f41, 0x00000080, 0x00000080, 0xffff0200,
+    0x00000058, 0x00000028, 0x00280000, 0x00280000, 0x00280000, 0x00240001,
+    0x00280000, 0x00000000, 0xffff0200, 0x0200001f, 0x80000000, 0xb0030000,
+    0x0200001f, 0x80000000, 0xb00f0001, 0x0200001f, 0x90000000, 0xa00f0800,
+    0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, 0x03000005, 0x800f0000,
+    0x80e40000, 0xb0e40001, 0x02000001, 0x800f0800, 0x80e40000, 0x0000ffff,
+    0x52444853, 0x00000094, 0x00000040, 0x00000025, 0x0300005a, 0x00106000,
+    0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x03001062,
+    0x00101032, 0x00000001, 0x03001062, 0x001010f2, 0x00000002, 0x03000065,
+    0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x09000045, 0x001000f2,
+    0x00000000, 0x00101046, 0x00000001, 0x00107e46, 0x00000000, 0x00106000,
+    0x00000000, 0x07000038, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000,
+    0x00101e46, 0x00000002, 0x0100003e, 0x54415453, 0x00000074, 0x00000003,
+    0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000000,
+    0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x46454452, 0x000000a8,
+    0x00000000, 0x00000000, 0x00000002, 0x0000001c, 0xffff0400, 0x00000100,
+    0x00000072, 0x0000005c, 0x00000003, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000001, 0x00000001, 0x00000067, 0x00000002, 0x00000005,
+    0x00000004, 0xffffffff, 0x00000000, 0x00000001, 0x0000000d, 0x53656874,
+    0x6c706d61, 0x74007265, 0x65546568, 0x72757478, 0x694d0065, 0x736f7263,
+    0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43,
+    0x72656c69, 0x332e3920, 0x32392e30, 0x312e3030, 0x34383336, 0xababab00,
+    0x4e475349, 0x0000006c, 0x00000003, 0x00000008, 0x00000050, 0x00000000,
+    0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000,
+    0x00000000, 0x00000003, 0x00000001, 0x00000303, 0x00000065, 0x00000000,
+    0x00000000, 0x00000003, 0x00000002, 0x00000f0f, 0x505f5653, 0x5449534f,
+    0x004e4f49, 0x43584554, 0x44524f4f, 0x4c4f4300, 0xab00524f, 0x4e47534f,
+    0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+    0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054
+};
+#elif defined(D3D11_USE_SHADER_MODEL_4_0_level_9_3)
+static const DWORD D3D11_PixelShader_Textures[] = {
+    0x43425844, 0x5876569a, 0x01b6c87e, 0x8447454f, 0xc7f3ef10, 0x00000001,
+    0x00000330, 0x00000006, 0x00000038, 0x000000c0, 0x0000015c, 0x000001d8,
+    0x00000288, 0x000002fc, 0x396e6f41, 0x00000080, 0x00000080, 0xffff0200,
+    0x00000058, 0x00000028, 0x00280000, 0x00280000, 0x00280000, 0x00240001,
+    0x00280000, 0x00000000, 0xffff0201, 0x0200001f, 0x80000000, 0xb0030000,
+    0x0200001f, 0x80000000, 0xb00f0001, 0x0200001f, 0x90000000, 0xa00f0800,
+    0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800, 0x03000005, 0x800f0000,
+    0x80e40000, 0xb0e40001, 0x02000001, 0x800f0800, 0x80e40000, 0x0000ffff,
+    0x52444853, 0x00000094, 0x00000040, 0x00000025, 0x0300005a, 0x00106000,
+    0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x03001062,
+    0x00101032, 0x00000001, 0x03001062, 0x001010f2, 0x00000002, 0x03000065,
+    0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x09000045, 0x001000f2,
+    0x00000000, 0x00101046, 0x00000001, 0x00107e46, 0x00000000, 0x00106000,
+    0x00000000, 0x07000038, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000,
+    0x00101e46, 0x00000002, 0x0100003e, 0x54415453, 0x00000074, 0x00000003,
+    0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000000,
+    0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x46454452, 0x000000a8,
+    0x00000000, 0x00000000, 0x00000002, 0x0000001c, 0xffff0400, 0x00000100,
+    0x00000072, 0x0000005c, 0x00000003, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000001, 0x00000001, 0x00000067, 0x00000002, 0x00000005,
+    0x00000004, 0xffffffff, 0x00000000, 0x00000001, 0x0000000d, 0x53656874,
+    0x6c706d61, 0x74007265, 0x65546568, 0x72757478, 0x694d0065, 0x736f7263,
+    0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43,
+    0x72656c69, 0x332e3920, 0x32392e30, 0x312e3030, 0x34383336, 0xababab00,
+    0x4e475349, 0x0000006c, 0x00000003, 0x00000008, 0x00000050, 0x00000000,
+    0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000,
+    0x00000000, 0x00000003, 0x00000001, 0x00000303, 0x00000065, 0x00000000,
+    0x00000000, 0x00000003, 0x00000002, 0x00000f0f, 0x505f5653, 0x5449534f,
+    0x004e4f49, 0x43584554, 0x44524f4f, 0x4c4f4300, 0xab00524f, 0x4e47534f,
+    0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+    0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054
+};
+#else
+#error "An appropriate 'textures' pixel shader is not defined"
+#endif
+
+/* The yuv-rendering pixel shader:
+
+    --- D3D11_PixelShader_YUV.hlsl ---
+    Texture2D theTextureY : register(t0);
+    Texture2D theTextureU : register(t1);
+    Texture2D theTextureV : register(t2);
+    SamplerState theSampler : register(s0);
+
+    struct PixelShaderInput
+    {
+        float4 pos : SV_POSITION;
+        float2 tex : TEXCOORD0;
+        float4 color : COLOR0;
+    };
+
+    float4 main(PixelShaderInput input) : SV_TARGET
+    {
+        const float3 offset = {-0.0625, -0.5, -0.5};
+        const float3 Rcoeff = {1.164,  0.000,  1.596};
+        const float3 Gcoeff = {1.164, -0.391, -0.813};
+        const float3 Bcoeff = {1.164,  2.018,  0.000};
+
+        float4 Output;
+
+        float3 yuv;
+        yuv.x = theTextureY.Sample(theSampler, input.tex).r;
+        yuv.y = theTextureU.Sample(theSampler, input.tex).r;
+        yuv.z = theTextureV.Sample(theSampler, input.tex).r;
+
+        yuv += offset;
+        Output.r = dot(yuv, Rcoeff);
+        Output.g = dot(yuv, Gcoeff);
+        Output.b = dot(yuv, Bcoeff);
+        Output.a = 1.0f;
+
+        return Output * input.color;
+    }
+
+*/
+#if defined(D3D11_USE_SHADER_MODEL_4_0_level_9_1)
+static const DWORD D3D11_PixelShader_YUV[] = {
+    0x43425844, 0x04e69cba, 0x74ce6dd2, 0x7fcf84cb, 0x3003d677, 0x00000001,
+    0x000005e8, 0x00000006, 0x00000038, 0x000001dc, 0x000003bc, 0x00000438,
+    0x00000540, 0x000005b4, 0x396e6f41, 0x0000019c, 0x0000019c, 0xffff0200,
+    0x0000016c, 0x00000030, 0x00300000, 0x00300000, 0x00300000, 0x00240003,
+    0x00300000, 0x00000000, 0x00010001, 0x00020002, 0xffff0200, 0x05000051,
+    0xa00f0000, 0xbd800000, 0xbf000000, 0xbf000000, 0x3f800000, 0x05000051,
+    0xa00f0001, 0x3f94fdf4, 0x3fcc49ba, 0x00000000, 0x00000000, 0x05000051,
+    0xa00f0002, 0x3f94fdf4, 0xbec83127, 0xbf5020c5, 0x00000000, 0x05000051,
+    0xa00f0003, 0x3f94fdf4, 0x400126e9, 0x00000000, 0x00000000, 0x0200001f,
+    0x80000000, 0xb0030000, 0x0200001f, 0x80000000, 0xb00f0001, 0x0200001f,
+    0x90000000, 0xa00f0800, 0x0200001f, 0x90000000, 0xa00f0801, 0x0200001f,
+    0x90000000, 0xa00f0802, 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40800,
+    0x03000042, 0x800f0001, 0xb0e40000, 0xa0e40801, 0x03000042, 0x800f0002,
+    0xb0e40000, 0xa0e40802, 0x02000001, 0x80020000, 0x80000001, 0x02000001,
+    0x80040000, 0x80000002, 0x03000002, 0x80070000, 0x80e40000, 0xa0e40000,
+    0x03000005, 0x80080000, 0x80000000, 0xa0000001, 0x04000004, 0x80010001,
+    0x80aa0000, 0xa0550001, 0x80ff0000, 0x03000008, 0x80020001, 0x80e40000,
+    0xa0e40002, 0x0400005a, 0x80040001, 0x80e40000, 0xa0e40003, 0xa0aa0003,
+    0x02000001, 0x80080001, 0xa0ff0000, 0x03000005, 0x800f0000, 0x80e40001,
+    0xb0e40001, 0x02000001, 0x800f0800, 0x80e40000, 0x0000ffff, 0x52444853,
+    0x000001d8, 0x00000040, 0x00000076, 0x0300005a, 0x00106000, 0x00000000,
+    0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, 0x00107000,
+    0x00000001, 0x00005555, 0x04001858, 0x00107000, 0x00000002, 0x00005555,
+    0x03001062, 0x00101032, 0x00000001, 0x03001062, 0x001010f2, 0x00000002,
+    0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x09000045,
+    0x001000f2, 0x00000000, 0x00101046, 0x00000001, 0x00107e46, 0x00000000,
+    0x00106000, 0x00000000, 0x09000045, 0x001000f2, 0x00000001, 0x00101046,
+    0x00000001, 0x00107e46, 0x00000001, 0x00106000, 0x00000000, 0x05000036,
+    0x00100022, 0x00000000, 0x0010000a, 0x00000001, 0x09000045, 0x001000f2,
+    0x00000001, 0x00101046, 0x00000001, 0x00107e46, 0x00000002, 0x00106000,
+    0x00000000, 0x05000036, 0x00100042, 0x00000000, 0x0010000a, 0x00000001,
+    0x0a000000, 0x00100072, 0x00000000, 0x00100246, 0x00000000, 0x00004002,
+    0xbd800000, 0xbf000000, 0xbf000000, 0x00000000, 0x0a00000f, 0x00100012,
+    0x00000001, 0x00100086, 0x00000000, 0x00004002, 0x3f94fdf4, 0x3fcc49ba,
+    0x00000000, 0x00000000, 0x0a000010, 0x00100022, 0x00000001, 0x00100246,
+    0x00000000, 0x00004002, 0x3f94fdf4, 0xbec83127, 0xbf5020c5, 0x00000000,
+    0x0a00000f, 0x00100042, 0x00000001, 0x00100046, 0x00000000, 0x00004002,
+    0x3f94fdf4, 0x400126e9, 0x00000000, 0x00000000, 0x05000036, 0x00100082,
+    0x00000001, 0x00004001, 0x3f800000, 0x07000038, 0x001020f2, 0x00000000,
+    0x00100e46, 0x00000001, 0x00101e46, 0x00000002, 0x0100003e, 0x54415453,
+    0x00000074, 0x0000000c, 0x00000002, 0x00000000, 0x00000003, 0x00000005,
+    0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x46454452, 0x00000100, 0x00000000, 0x00000000, 0x00000004, 0x0000001c,
+    0xffff0400, 0x00000100, 0x000000cb, 0x0000009c, 0x00000003, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x000000a7,
+    0x00000002, 0x00000005, 0x00000004, 0xffffffff, 0x00000000, 0x00000001,
+    0x0000000d, 0x000000b3, 0x00000002, 0x00000005, 0x00000004, 0xffffffff,
+    0x00000001, 0x00000001, 0x0000000d, 0x000000bf, 0x00000002, 0x00000005,
+    0x00000004, 0xffffffff, 0x00000002, 0x00000001, 0x0000000d, 0x53656874,
+    0x6c706d61, 0x74007265, 0x65546568, 0x72757478, 0x74005965, 0x65546568,
+    0x72757478, 0x74005565, 0x65546568, 0x72757478, 0x4d005665, 0x6f726369,
+    0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, 0x6d6f4320,
+    0x656c6970, 0x2e362072, 0x36392e33, 0x312e3030, 0x34383336, 0xababab00,
+    0x4e475349, 0x0000006c, 0x00000003, 0x00000008, 0x00000050, 0x00000000,
+    0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000,
+    0x00000000, 0x00000003, 0x00000001, 0x00000303, 0x00000065, 0x00000000,
+    0x00000000, 0x00000003, 0x00000002, 0x00000f0f, 0x505f5653, 0x5449534f,
+    0x004e4f49, 0x43584554, 0x44524f4f, 0x4c4f4300, 0xab00524f, 0x4e47534f,
+    0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000,
+    0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054
+};
+#elif defined(D3D11_USE_SHADER_MODEL_4_0_level_9_3)
+static const DWORD D3D11_PixelShader_YUV[] = {
+    0x43425844, 0xe6d969fc, 0x63cac33c, 0xa4926502, 0x5d788135, 0x00000001,
+    0x000005c0, 0x00000006, 0x00000038, 0x000001b4, 0x00000394, 0x00000410,
+    0x00000518, 0x0000058c, 0x396e6f41, 0x00000174, 0x00000174, 0xffff0200,
+    0x00000144, 0x00000030, 0x00300000, 0x00300000, 0x00300000, 0x00240003,
+    0x00300000, 0x00000000, 0x00010001, 0x00020002, 0xffff0201, 0x05000051,
+    0xa00f0000, 0xbd800000, 0xbf000000, 0x3f800000, 0x00000000, 0x05000051,
+    0xa00f0001, 0x3f94fdf4, 0x3fcc49ba, 0x00000000, 0x400126e9, 0x05000051,
+    0xa00f0002, 0x3f94fdf4, 0xbec83127, 0xbf5020c5, 0x00000000, 0x0200001f,
+    0x80000000, 0xb0030000, 0x0200001f, 0x80000000, 0xb00f0001, 0x0200001f,
+    0x90000000, 0xa00f0800, 0x0200001f, 0x90000000, 0xa00f0801, 0x0200001f,
+    0x90000000, 0xa00f0802, 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40801,
+    0x03000042, 0x800f0001, 0xb0e40000, 0xa0e40800, 0x02000001, 0x80020001,
+    0x80000000, 0x03000042, 0x800f0000, 0xb0e40000, 0xa0e40802, 0x02000001,
+    0x80040001, 0x80000000, 0x03000002, 0x80070000, 0x80e40001, 0xa0d40000,
+    0x0400005a, 0x80010001, 0x80e80000, 0xa0e40001, 0xa0aa0001, 0x03000008,
+    0x80020001, 0x80e40000, 0xa0e40002, 0x0400005a, 0x80040001, 0x80e40000,
+    0xa0ec0001, 0xa0aa0001, 0x02000001, 0x80080001, 0xa0aa0000, 0x03000005,
+    0x800f0000, 0x80e40001, 0xb0e40001, 0x02000001, 0x800f0800, 0x80e40000,
+    0x0000ffff, 0x52444853, 0x000001d8, 0x00000040, 0x00000076, 0x0300005a,
+    0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555,
+    0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x04001858, 0x00107000,
+    0x00000002, 0x00005555, 0x03001062, 0x00101032, 0x00000001, 0x03001062,
+    0x001010f2, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x02000068,
+    0x00000002, 0x09000045, 0x001000f2, 0x00000000, 0x00101046, 0x00000001,
+    0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x09000045, 0x001000f2,
+    0x00000001, 0x00101046, 0x00000001, 0x00107e46, 0x00000001, 0x00106000,
+    0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x0010000a, 0x00000001,
+    0x09000045, 0x001000f2, 0x00000001, 0x00101046, 0x00000001, 0x00107e46,
+    0x00000002, 0x00106000, 0x00000000, 0x05000036, 0x00100042, 0x00000000,
+    0x0010000a, 0x00000001, 0x0a000000, 0x00100072, 0x00000000, 0x00100246,
+    0x00000000, 0x00004002, 0xbd800000, 0xbf000000, 0xbf000000, 0x00000000,
+    0x0a00000f, 0x00100012, 0x00000001, 0x00100086, 0x00000000, 0x00004002,
+    0x3f94fdf4, 0x3fcc49ba, 0x00000000, 0x00000000, 0x0a000010, 0x00100022,
+    0x00000001, 0x00100246, 0x00000000, 0x00004002, 0x3f94fdf4, 0xbec83127,
+    0xbf5020c5, 0x00000000, 0x0a00000f, 0x00100042, 0x00000001, 0x00100046,
+    0x00000000, 0x00004002, 0x3f94fdf4, 0x400126e9, 0x00000000, 0x00000000,
+    0x05000036, 0x00100082, 0x00000001, 0x00004001, 0x3f800000, 0x07000038,
+    0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x00101e46, 0x00000002,
+    0x0100003e, 0x54415453, 0x00000074, 0x0000000c, 0x00000002, 0x00000000,
+    0x00000003, 0x00000005, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x46454452, 0x00000100, 0x00000000, 0x00000000,
+    0x00000004, 0x0000001c, 0xffff0400, 0x00000100, 0x000000cb, 0x0000009c,
+    0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001,
+    0x00000001, 0x000000a7, 0x00000002, 0x00000005, 0x00000004, 0xffffffff,
+    0x00000000, 0x00000001, 0x0000000d, 0x000000b3, 0x00000002, 0x00000005,
+    0x00000004, 0xffffffff, 0x00000001, 0x00000001, 0x0000000d, 0x000000bf,
+    0x00000002, 0x00000005, 0x00000004, 0xffffffff, 0x00000002, 0x00000001,
+    0x0000000d, 0x53656874, 0x6c706d61, 0x74007265, 0x65546568, 0x72757478,
+    0x74005965, 0x65546568, 0x72757478, 0x74005565, 0x65546568, 0x72757478,
+    0x4d005665, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c,
+    0x72656461, 0x6d6f4320, 0x656c6970, 0x2e362072, 0x36392e33, 0x312e3030,
+    0x34383336, 0xababab00, 0x4e475349, 0x0000006c, 0x00000003, 0x00000008,
+    0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f,
+    0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000303,
+    0x00000065, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000f0f,
+    0x505f5653, 0x5449534f, 0x004e4f49, 0x43584554, 0x44524f4f, 0x4c4f4300,
+    0xab00524f, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020,
+    0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653,
+    0x45475241, 0xabab0054
+};
+#else
+#error "An appropriate 'yuv' pixel shader is not defined."
+#endif
+
+/* The sole vertex shader:
+
+   --- D3D11_VertexShader.hlsl ---
+   #pragma pack_matrix( row_major )
+
+   cbuffer VertexShaderConstants : register(b0)
+   {
+       matrix model;
+       matrix projectionAndView;
+   };
+
+   struct VertexShaderInput
+   {
+       float3 pos : POSITION;
+       float2 tex : TEXCOORD0;
+       float4 color : COLOR0;
+   };
+
+   struct VertexShaderOutput
+   {
+       float4 pos : SV_POSITION;
+       float2 tex : TEXCOORD0;
+       float4 color : COLOR0;
+   };
+
+   VertexShaderOutput main(VertexShaderInput input)
+   {
+       VertexShaderOutput output;
+       float4 pos = float4(input.pos, 1.0f);
+
+       // Transform the vertex position into projected space.
+       pos = mul(pos, model);
+       pos = mul(pos, projectionAndView);
+       output.pos = pos;
+
+       // Pass through texture coordinates and color values without transformation
+       output.tex = input.tex;
+       output.color = input.color;
+
+       return output;
+   }
+*/
+#if defined(D3D11_USE_SHADER_MODEL_4_0_level_9_1)
+static const DWORD D3D11_VertexShader[] = {
+    0x43425844, 0x62dfae5f, 0x3e8bd8df, 0x9ec97127, 0x5044eefb, 0x00000001,
+    0x00000598, 0x00000006, 0x00000038, 0x0000016c, 0x00000334, 0x000003b0,
+    0x000004b4, 0x00000524, 0x396e6f41, 0x0000012c, 0x0000012c, 0xfffe0200,
+    0x000000f8, 0x00000034, 0x00240001, 0x00300000, 0x00300000, 0x00240000,
+    0x00300001, 0x00000000, 0x00010008, 0x00000000, 0x00000000, 0xfffe0200,
+    0x0200001f, 0x80000005, 0x900f0000, 0x0200001f, 0x80010005, 0x900f0001,
+    0x0200001f, 0x80020005, 0x900f0002, 0x03000005, 0x800f0000, 0x90550000,
+    0xa0e40002, 0x04000004, 0x800f0000, 0x90000000, 0xa0e40001, 0x80e40000,
+    0x04000004, 0x800f0000, 0x90aa0000, 0xa0e40003, 0x80e40000, 0x03000002,
+    0x800f0000, 0x80e40000, 0xa0e40004, 0x03000005, 0x800f0001, 0x80550000,
+    0xa0e40006, 0x04000004, 0x800f0001, 0x80000000, 0xa0e40005, 0x80e40001,
+    0x04000004, 0x800f0001, 0x80aa0000, 0xa0e40007, 0x80e40001, 0x04000004,
+    0x800f0000, 0x80ff0000, 0xa0e40008, 0x80e40001, 0x04000004, 0xc0030000,
+    0x80ff0000, 0xa0e40000, 0x80e40000, 0x02000001, 0xc00c0000, 0x80e40000,
+    0x02000001, 0xe0030000, 0x90e40001, 0x02000001, 0xe00f0001, 0x90e40002,
+    0x0000ffff, 0x52444853, 0x000001c0, 0x00010040, 0x00000070, 0x04000059,
+    0x00208e46, 0x00000000, 0x00000008, 0x0300005f, 0x00101072, 0x00000000,
+    0x0300005f, 0x00101032, 0x00000001, 0x0300005f, 0x001010f2, 0x00000002,
+    0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102032,
+    0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x02000068, 0x00000002,
+    0x08000038, 0x001000f2, 0x00000000, 0x00101556, 0x00000000, 0x00208e46,
+    0x00000000, 0x00000001, 0x0a000032, 0x001000f2, 0x00000000, 0x00101006,
+    0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000,
+    0x0a000032, 0x001000f2, 0x00000000, 0x00101aa6, 0x00000000, 0x00208e46,
+    0x00000000, 0x00000002, 0x00100e46, 0x00000000, 0x08000000, 0x001000f2,
+    0x00000000, 0x00100e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000003,
+    0x08000038, 0x001000f2, 0x00000001, 0x00100556, 0x00000000, 0x00208e46,
+    0x00000000, 0x00000005, 0x0a000032, 0x001000f2, 0x00000001, 0x00100006,
+    0x00000000, 0x00208e46, 0x00000000, 0x00000004, 0x00100e46, 0x00000001,
+    0x0a000032, 0x001000f2, 0x00000001, 0x00100aa6, 0x00000000, 0x00208e46,
+    0x00000000, 0x00000006, 0x00100e46, 0x00000001, 0x0a000032, 0x001020f2,
+    0x00000000, 0x00100ff6, 0x00000000, 0x00208e46, 0x00000000, 0x00000007,
+    0x00100e46, 0x00000001, 0x05000036, 0x00102032, 0x00000001, 0x00101046,
+    0x00000001, 0x05000036, 0x001020f2, 0x00000002, 0x00101e46, 0x00000002,
+    0x0100003e, 0x54415453, 0x00000074, 0x0000000b, 0x00000002, 0x00000000,
+    0x00000006, 0x00000003, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x46454452, 0x000000fc, 0x00000001, 0x00000054,
+    0x00000001, 0x0000001c, 0xfffe0400, 0x00000100, 0x000000c6, 0x0000003c,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001,
+    0x00000001, 0x74726556, 0x68537865, 0x72656461, 0x736e6f43, 0x746e6174,
+    0xabab0073, 0x0000003c, 0x00000002, 0x0000006c, 0x00000080, 0x00000000,
+    0x00000000, 0x0000009c, 0x00000000, 0x00000040, 0x00000002, 0x000000a4,
+    0x00000000, 0x000000b4, 0x00000040, 0x00000040, 0x00000002, 0x000000a4,
+    0x00000000, 0x65646f6d, 0xabab006c, 0x00030002, 0x00040004, 0x00000000,
+    0x00000000, 0x6a6f7270, 0x69746365, 0x6e416e6f, 0x65695664, 0x694d0077,
+    0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, 0x20726564,
+    0x706d6f43, 0x72656c69, 0x332e3920, 0x32392e30, 0x312e3030, 0x34383336,
+    0xababab00, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050,
+    0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000707, 0x00000059,
+    0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000303, 0x00000062,
+    0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000f0f, 0x49534f50,
+    0x4e4f4954, 0x58455400, 0x524f4f43, 0x4f430044, 0x00524f4c, 0x4e47534f,
+    0x0000006c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001,
+    0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000,
+    0x00000003, 0x00000001, 0x00000c03, 0x00000065, 0x00000000, 0x00000000,
+    0x00000003, 0x00000002, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49,
+    0x43584554, 0x44524f4f, 0x4c4f4300, 0xab00524f
+};
+#elif defined(D3D11_USE_SHADER_MODEL_4_0_level_9_3)
+static const DWORD D3D11_VertexShader[] = {
+    0x43425844, 0x01a24e41, 0x696af551, 0x4b2a87d1, 0x82ea03f6, 0x00000001,
+    0x00000598, 0x00000006, 0x00000038, 0x0000016c, 0x00000334, 0x000003b0,
+    0x000004b4, 0x00000524, 0x396e6f41, 0x0000012c, 0x0000012c, 0xfffe0200,
+    0x000000f8, 0x00000034, 0x00240001, 0x00300000, 0x00300000, 0x00240000,
+    0x00300001, 0x00000000, 0x00010008, 0x00000000, 0x00000000, 0xfffe0201,
+    0x0200001f, 0x80000005, 0x900f0000, 0x0200001f, 0x80010005, 0x900f0001,
+    0x0200001f, 0x80020005, 0x900f0002, 0x03000005, 0x800f0000, 0x90550000,
+    0xa0e40002, 0x04000004, 0x800f0000, 0x90000000, 0xa0e40001, 0x80e40000,
+    0x04000004, 0x800f0000, 0x90aa0000, 0xa0e40003, 0x80e40000, 0x03000002,
+    0x800f0000, 0x80e40000, 0xa0e40004, 0x03000005, 0x800f0001, 0x80550000,
+    0xa0e40006, 0x04000004, 0x800f0001, 0x80000000, 0xa0e40005, 0x80e40001,
+    0x04000004, 0x800f0001, 0x80aa0000, 0xa0e40007, 0x80e40001, 0x04000004,
+    0x800f0000, 0x80ff0000, 0xa0e40008, 0x80e40001, 0x04000004, 0xc0030000,
+    0x80ff0000, 0xa0e40000, 0x80e40000, 0x02000001, 0xc00c0000, 0x80e40000,
+    0x02000001, 0xe0030000, 0x90e40001, 0x02000001, 0xe00f0001, 0x90e40002,
+    0x0000ffff, 0x52444853, 0x000001c0, 0x00010040, 0x00000070, 0x04000059,
+    0x00208e46, 0x00000000, 0x00000008, 0x0300005f, 0x00101072, 0x00000000,
+    0x0300005f, 0x00101032, 0x00000001, 0x0300005f, 0x001010f2, 0x00000002,
+    0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102032,
+    0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x02000068, 0x00000002,
+    0x08000038, 0x001000f2, 0x00000000, 0x00101556, 0x00000000, 0x00208e46,
+    0x00000000, 0x00000001, 0x0a000032, 0x001000f2, 0x00000000, 0x00101006,
+    0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000,
+    0x0a000032, 0x001000f2, 0x00000000, 0x00101aa6, 0x00000000, 0x00208e46,
+    0x00000000, 0x00000002, 0x00100e46, 0x00000000, 0x08000000, 0x001000f2,
+    0x00000000, 0x00100e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000003,
+    0x08000038, 0x001000f2, 0x00000001, 0x00100556, 0x00000000, 0x00208e46,
+    0x00000000, 0x00000005, 0x0a000032, 0x001000f2, 0x00000001, 0x00100006,
+    0x00000000, 0x00208e46, 0x00000000, 0x00000004, 0x00100e46, 0x00000001,
+    0x0a000032, 0x001000f2, 0x00000001, 0x00100aa6, 0x00000000, 0x00208e46,
+    0x00000000, 0x00000006, 0x00100e46, 0x00000001, 0x0a000032, 0x001020f2,
+    0x00000000, 0x00100ff6, 0x00000000, 0x00208e46, 0x00000000, 0x00000007,
+    0x00100e46, 0x00000001, 0x05000036, 0x00102032, 0x00000001, 0x00101046,
+    0x00000001, 0x05000036, 0x001020f2, 0x00000002, 0x00101e46, 0x00000002,
+    0x0100003e, 0x54415453, 0x00000074, 0x0000000b, 0x00000002, 0x00000000,
+    0x00000006, 0x00000003, 0x00000000, 0x00000000, 0x00000001, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x46454452, 0x000000fc, 0x00000001, 0x00000054,
+    0x00000001, 0x0000001c, 0xfffe0400, 0x00000100, 0x000000c6, 0x0000003c,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001,
+    0x00000001, 0x74726556, 0x68537865, 0x72656461, 0x736e6f43, 0x746e6174,
+    0xabab0073, 0x0000003c, 0x00000002, 0x0000006c, 0x00000080, 0x00000000,
+    0x00000000, 0x0000009c, 0x00000000, 0x00000040, 0x00000002, 0x000000a4,
+    0x00000000, 0x000000b4, 0x00000040, 0x00000040, 0x00000002, 0x000000a4,
+    0x00000000, 0x65646f6d, 0xabab006c, 0x00030002, 0x00040004, 0x00000000,
+    0x00000000, 0x6a6f7270, 0x69746365, 0x6e416e6f, 0x65695664, 0x694d0077,
+    0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, 0x20726564,
+    0x706d6f43, 0x72656c69, 0x332e3920, 0x32392e30, 0x312e3030, 0x34383336,
+    0xababab00, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050,
+    0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000707, 0x00000059,
+    0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000303, 0x00000062,
+    0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000f0f, 0x49534f50,
+    0x4e4f4954, 0x58455400, 0x524f4f43, 0x4f430044, 0x00524f4c, 0x4e47534f,
+    0x0000006c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001,
+    0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000,
+    0x00000003, 0x00000001, 0x00000c03, 0x00000065, 0x00000000, 0x00000000,
+    0x00000003, 0x00000002, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49,
+    0x43584554, 0x44524f4f, 0x4c4f4300, 0xab00524f
+};
+#else
+#error "An appropriate vertex shader is not defined."
+#endif
+
+
+/* Direct3D 11.1 renderer implementation */
+static SDL_Renderer *D3D11_CreateRenderer(SDL_Window * window, Uint32 flags);
+static void D3D11_WindowEvent(SDL_Renderer * renderer,
+                            const SDL_WindowEvent *event);
+static int D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int D3D11_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                             const SDL_Rect * rect, const void *srcPixels,
+                             int srcPitch);
+static int D3D11_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+                                  const SDL_Rect * rect,
+                                  const Uint8 *Yplane, int Ypitch,
+                                  const Uint8 *Uplane, int Upitch,
+                                  const Uint8 *Vplane, int Vpitch);
+static int D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                             const SDL_Rect * rect, void **pixels, int *pitch);
+static void D3D11_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int D3D11_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture);
+static int D3D11_UpdateViewport(SDL_Renderer * renderer);
+static int D3D11_UpdateClipRect(SDL_Renderer * renderer);
+static int D3D11_RenderClear(SDL_Renderer * renderer);
+static int D3D11_RenderDrawPoints(SDL_Renderer * renderer,
+                                  const SDL_FPoint * points, int count);
+static int D3D11_RenderDrawLines(SDL_Renderer * renderer,
+                                 const SDL_FPoint * points, int count);
+static int D3D11_RenderFillRects(SDL_Renderer * renderer,
+                                 const SDL_FRect * rects, int count);
+static int D3D11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                            const SDL_Rect * srcrect, const SDL_FRect * dstrect);
+static int D3D11_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                              const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                              const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip);
+static int D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                                  Uint32 format, void * pixels, int pitch);
+static void D3D11_RenderPresent(SDL_Renderer * renderer);
+static void D3D11_DestroyTexture(SDL_Renderer * renderer,
+                                 SDL_Texture * texture);
+static void D3D11_DestroyRenderer(SDL_Renderer * renderer);
+
+/* Direct3D 11.1 Internal Functions */
+static HRESULT D3D11_CreateDeviceResources(SDL_Renderer * renderer);
+static HRESULT D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer);
+static HRESULT D3D11_UpdateForWindowSizeChange(SDL_Renderer * renderer);
+static HRESULT D3D11_HandleDeviceLost(SDL_Renderer * renderer);
+static void D3D11_ReleaseMainRenderTargetView(SDL_Renderer * renderer);
+
+SDL_RenderDriver D3D11_RenderDriver = {
+    D3D11_CreateRenderer,
+    {
+        "direct3d11",
+        (
+            SDL_RENDERER_ACCELERATED |
+            SDL_RENDERER_PRESENTVSYNC |
+            SDL_RENDERER_TARGETTEXTURE
+        ),                          /* flags.  see SDL_RendererFlags */
+        4,                          /* num_texture_formats */
+        {                           /* texture_formats */
+            SDL_PIXELFORMAT_ARGB8888,
+            SDL_PIXELFORMAT_RGB888,
+            SDL_PIXELFORMAT_YV12,
+            SDL_PIXELFORMAT_IYUV
+        },
+        0,                          /* max_texture_width: will be filled in later */
+        0                           /* max_texture_height: will be filled in later */
+    }
+};
+
+
+static Uint32
+DXGIFormatToSDLPixelFormat(DXGI_FORMAT dxgiFormat) {
+    switch (dxgiFormat) {
+        case DXGI_FORMAT_B8G8R8A8_UNORM:
+            return SDL_PIXELFORMAT_ARGB8888;
+        case DXGI_FORMAT_B8G8R8X8_UNORM:
+            return SDL_PIXELFORMAT_RGB888;
+        default:
+            return SDL_PIXELFORMAT_UNKNOWN;
+    }
+}
+
+static DXGI_FORMAT
+SDLPixelFormatToDXGIFormat(Uint32 sdlFormat)
+{
+    switch (sdlFormat) {
+        case SDL_PIXELFORMAT_ARGB8888:
+            return DXGI_FORMAT_B8G8R8A8_UNORM;
+        case SDL_PIXELFORMAT_RGB888:
+            return DXGI_FORMAT_B8G8R8X8_UNORM;
+        case SDL_PIXELFORMAT_YV12:
+        case SDL_PIXELFORMAT_IYUV:
+            return DXGI_FORMAT_R8_UNORM;
+        default:
+            return DXGI_FORMAT_UNKNOWN;
+    }
+}
+
+SDL_Renderer *
+D3D11_CreateRenderer(SDL_Window * window, Uint32 flags)
+{
+    SDL_Renderer *renderer;
+    D3D11_RenderData *data;
+
+    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
+    if (!renderer) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    data = (D3D11_RenderData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    renderer->WindowEvent = D3D11_WindowEvent;
+    renderer->CreateTexture = D3D11_CreateTexture;
+    renderer->UpdateTexture = D3D11_UpdateTexture;
+    renderer->UpdateTextureYUV = D3D11_UpdateTextureYUV;
+    renderer->LockTexture = D3D11_LockTexture;
+    renderer->UnlockTexture = D3D11_UnlockTexture;
+    renderer->SetRenderTarget = D3D11_SetRenderTarget;
+    renderer->UpdateViewport = D3D11_UpdateViewport;
+    renderer->UpdateClipRect = D3D11_UpdateClipRect;
+    renderer->RenderClear = D3D11_RenderClear;
+    renderer->RenderDrawPoints = D3D11_RenderDrawPoints;
+    renderer->RenderDrawLines = D3D11_RenderDrawLines;
+    renderer->RenderFillRects = D3D11_RenderFillRects;
+    renderer->RenderCopy = D3D11_RenderCopy;
+    renderer->RenderCopyEx = D3D11_RenderCopyEx;
+    renderer->RenderReadPixels = D3D11_RenderReadPixels;
+    renderer->RenderPresent = D3D11_RenderPresent;
+    renderer->DestroyTexture = D3D11_DestroyTexture;
+    renderer->DestroyRenderer = D3D11_DestroyRenderer;
+    renderer->info = D3D11_RenderDriver.info;
+    renderer->info.flags = (SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE);
+    renderer->driverdata = data;
+
+    if ((flags & SDL_RENDERER_PRESENTVSYNC)) {
+        renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
+    }
+
+    /* HACK: make sure the SDL_Renderer references the SDL_Window data now, in
+     * order to give init functions access to the underlying window handle:
+     */
+    renderer->window = window;
+
+    /* Initialize Direct3D resources */
+    if (FAILED(D3D11_CreateDeviceResources(renderer))) {
+        D3D11_DestroyRenderer(renderer);
+        return NULL;
+    }
+    if (FAILED(D3D11_CreateWindowSizeDependentResources(renderer))) {
+        D3D11_DestroyRenderer(renderer);
+        return NULL;
+    }
+
+    return renderer;
+}
+
+static void
+D3D11_DestroyRenderer(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+
+    if (data) {
+        SAFE_RELEASE(data->dxgiFactory);
+        SAFE_RELEASE(data->dxgiAdapter);
+        SAFE_RELEASE(data->d3dDevice);
+        SAFE_RELEASE(data->d3dContext);
+        SAFE_RELEASE(data->swapChain);
+        SAFE_RELEASE(data->mainRenderTargetView);
+        SAFE_RELEASE(data->currentOffscreenRenderTargetView);
+        SAFE_RELEASE(data->inputLayout);
+        SAFE_RELEASE(data->vertexBuffer);
+        SAFE_RELEASE(data->vertexShader);
+        SAFE_RELEASE(data->colorPixelShader);
+        SAFE_RELEASE(data->texturePixelShader);
+        SAFE_RELEASE(data->yuvPixelShader);
+        SAFE_RELEASE(data->blendModeBlend);
+        SAFE_RELEASE(data->blendModeAdd);
+        SAFE_RELEASE(data->blendModeMod);
+        SAFE_RELEASE(data->nearestPixelSampler);
+        SAFE_RELEASE(data->linearSampler);
+        SAFE_RELEASE(data->mainRasterizer);
+        SAFE_RELEASE(data->clippedRasterizer);
+        SAFE_RELEASE(data->vertexShaderConstants);
+
+        if (data->hD3D11Mod) {
+            SDL_UnloadObject(data->hD3D11Mod);
+        }
+        if (data->hDXGIMod) {
+            SDL_UnloadObject(data->hDXGIMod);
+        }
+        SDL_free(data);
+    }
+    SDL_free(renderer);
+}
+
+static HRESULT
+D3D11_CreateBlendMode(SDL_Renderer * renderer,
+                      BOOL enableBlending,
+                      D3D11_BLEND srcBlend,
+                      D3D11_BLEND destBlend,
+                      D3D11_BLEND srcBlendAlpha,
+                      D3D11_BLEND destBlendAlpha,
+                      ID3D11BlendState ** blendStateOutput)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+    HRESULT result = S_OK;
+
+    D3D11_BLEND_DESC blendDesc;
+    SDL_zero(blendDesc);
+    blendDesc.AlphaToCoverageEnable = FALSE;
+    blendDesc.IndependentBlendEnable = FALSE;
+    blendDesc.RenderTarget[0].BlendEnable = enableBlending;
+    blendDesc.RenderTarget[0].SrcBlend = srcBlend;
+    blendDesc.RenderTarget[0].DestBlend = destBlend;
+    blendDesc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD;
+    blendDesc.RenderTarget[0].SrcBlendAlpha = srcBlendAlpha;
+    blendDesc.RenderTarget[0].DestBlendAlpha = destBlendAlpha;
+    blendDesc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD;
+    blendDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL;
+    result = ID3D11Device_CreateBlendState(data->d3dDevice, &blendDesc, blendStateOutput);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBlendState", result);
+        return result;
+    }
+
+    return S_OK;
+}
+
+/* Create resources that depend on the device. */
+static HRESULT
+D3D11_CreateDeviceResources(SDL_Renderer * renderer)
+{
+    typedef HRESULT(WINAPI *PFN_CREATE_DXGI_FACTORY)(REFIID riid, void **ppFactory);
+    PFN_CREATE_DXGI_FACTORY CreateDXGIFactoryFunc;
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+    PFN_D3D11_CREATE_DEVICE D3D11CreateDeviceFunc;
+    IDXGIAdapter *d3dAdapter = NULL;
+    ID3D11Device *d3dDevice = NULL;
+    ID3D11DeviceContext *d3dContext = NULL;
+    IDXGIDevice1 *dxgiDevice = NULL;
+    HRESULT result = S_OK;
+    UINT creationFlags;
+    const char *hint;
+
+    /* This array defines the set of DirectX hardware feature levels this app will support.
+     * Note the ordering should be preserved.
+     * Don't forget to declare your application's minimum required feature level in its
+     * description.  All applications are assumed to support 9.1 unless otherwise stated.
+     */
+    D3D_FEATURE_LEVEL featureLevels[] = 
+    {
+        D3D_FEATURE_LEVEL_11_1,
+        D3D_FEATURE_LEVEL_11_0,
+        D3D_FEATURE_LEVEL_10_1,
+        D3D_FEATURE_LEVEL_10_0,
+        D3D_FEATURE_LEVEL_9_3,
+        D3D_FEATURE_LEVEL_9_2,
+        D3D_FEATURE_LEVEL_9_1
+    };
+
+    /* Declare how the input layout for SDL's vertex shader will be setup: */
+    const D3D11_INPUT_ELEMENT_DESC vertexDesc[] = 
+    {
+        { "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+        { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+        { "COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 20, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+    };
+
+    D3D11_BUFFER_DESC constantBufferDesc;
+    D3D11_SAMPLER_DESC samplerDesc;
+    D3D11_RASTERIZER_DESC rasterDesc;
+
+#ifdef __WINRT__
+    CreateDXGIFactoryFunc = CreateDXGIFactory1;
+    D3D11CreateDeviceFunc = D3D11CreateDevice;
+#else
+    data->hDXGIMod = SDL_LoadObject("dxgi.dll");
+    if (!data->hDXGIMod) {
+        result = E_FAIL;
+        goto done;
+    }
+
+    CreateDXGIFactoryFunc = (PFN_CREATE_DXGI_FACTORY)SDL_LoadFunction(data->hDXGIMod, "CreateDXGIFactory");
+    if (!CreateDXGIFactoryFunc) {
+        result = E_FAIL;
+        goto done;
+    }
+
+    data->hD3D11Mod = SDL_LoadObject("d3d11.dll");
+    if (!data->hD3D11Mod) {
+        result = E_FAIL;
+        goto done;
+    }
+
+    D3D11CreateDeviceFunc = (PFN_D3D11_CREATE_DEVICE)SDL_LoadFunction(data->hD3D11Mod, "D3D11CreateDevice");
+    if (!D3D11CreateDeviceFunc) {
+        result = E_FAIL;
+        goto done;
+    }
+#endif /* __WINRT__ */
+
+    result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", CreateDXGIFactory", result);
+        goto done;
+    }
+
+    /* FIXME: Should we use the default adapter? */
+    result = IDXGIFactory2_EnumAdapters(data->dxgiFactory, 0, &data->dxgiAdapter);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result);
+        goto done;
+    }
+
+    /* This flag adds support for surfaces with a different color channel ordering
+     * than the API default. It is required for compatibility with Direct2D.
+     */
+    creationFlags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
+
+    /* Make sure Direct3D's debugging feature gets used, if the app requests it. */
+    hint = SDL_GetHint(SDL_HINT_RENDER_DIRECT3D11_DEBUG);
+    if (hint && SDL_atoi(hint) > 0) {
+        creationFlags |= D3D11_CREATE_DEVICE_DEBUG;
+    }
+
+    /* Create the Direct3D 11 API device object and a corresponding context. */
+    result = D3D11CreateDeviceFunc(
+        data->dxgiAdapter,
+        D3D_DRIVER_TYPE_UNKNOWN,
+        NULL,
+        creationFlags, /* Set set debug and Direct2D compatibility flags. */
+        featureLevels, /* List of feature levels this app can support. */
+        SDL_arraysize(featureLevels),
+        D3D11_SDK_VERSION, /* Always set this to D3D11_SDK_VERSION for Windows Store apps. */
+        &d3dDevice, /* Returns the Direct3D device created. */
+        &data->featureLevel, /* Returns feature level of device created. */
+        &d3dContext /* Returns the device immediate context. */
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result);
+        goto done;
+    }
+
+    result = ID3D11Device_QueryInterface(d3dDevice, &IID_ID3D11Device1, &data->d3dDevice);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to ID3D11Device1", result);
+        goto done;
+    }
+
+    result = ID3D11DeviceContext_QueryInterface(d3dContext, &IID_ID3D11DeviceContext1, &data->d3dContext);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext to ID3D11DeviceContext1", result);
+        goto done;
+    }
+
+    result = ID3D11Device_QueryInterface(d3dDevice, &IID_IDXGIDevice1, &dxgiDevice);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to IDXGIDevice1", result);
+        goto done;
+    }
+
+    /* Ensure that DXGI does not queue more than one frame at a time. This both reduces latency and
+     * ensures that the application will only render after each VSync, minimizing power consumption.
+     */
+    result = IDXGIDevice1_SetMaximumFrameLatency(dxgiDevice, 1);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIDevice1::SetMaximumFrameLatency", result);
+        goto done;
+    }
+
+    /* Make note of the maximum texture size
+     * Max texture sizes are documented on MSDN, at:
+     * http://msdn.microsoft.com/en-us/library/windows/apps/ff476876.aspx
+     */
+    switch (data->featureLevel) {
+        case D3D_FEATURE_LEVEL_11_1:
+        case D3D_FEATURE_LEVEL_11_0:
+            renderer->info.max_texture_width = renderer->info.max_texture_height = 16384;
+            break;
+
+        case D3D_FEATURE_LEVEL_10_1:
+        case D3D_FEATURE_LEVEL_10_0:
+            renderer->info.max_texture_width = renderer->info.max_texture_height = 8192;
+            break;
+
+        case D3D_FEATURE_LEVEL_9_3:
+            renderer->info.max_texture_width = renderer->info.max_texture_height = 4096;
+            break;
+
+        case D3D_FEATURE_LEVEL_9_2:
+        case D3D_FEATURE_LEVEL_9_1:
+            renderer->info.max_texture_width = renderer->info.max_texture_height = 2048;
+            break;
+
+        default:
+            SDL_SetError(__FUNCTION__ ", Unexpected feature level: %d", data->featureLevel);
+            result = E_FAIL;
+            goto done;
+    }
+
+    /* Load in SDL's one and only vertex shader: */
+    result = ID3D11Device_CreateVertexShader(data->d3dDevice,
+        D3D11_VertexShader,
+        sizeof(D3D11_VertexShader),
+        NULL,
+        &data->vertexShader
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateVertexShader", result);
+        goto done;
+    }
+
+    /* Create an input layout for SDL's vertex shader: */
+    result = ID3D11Device_CreateInputLayout(data->d3dDevice,
+        vertexDesc,
+        ARRAYSIZE(vertexDesc),
+        D3D11_VertexShader,
+        sizeof(D3D11_VertexShader),
+        &data->inputLayout
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateInputLayout", result);
+        goto done;
+    }
+
+    /* Load in SDL's pixel shaders */
+    result = ID3D11Device_CreatePixelShader(data->d3dDevice,
+        D3D11_PixelShader_Colors,
+        sizeof(D3D11_PixelShader_Colors),
+        NULL,
+        &data->colorPixelShader
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['color' shader]", result);
+        goto done;
+    }
+
+    result = ID3D11Device_CreatePixelShader(data->d3dDevice,
+        D3D11_PixelShader_Textures,
+        sizeof(D3D11_PixelShader_Textures),
+        NULL,
+        &data->texturePixelShader
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['textures' shader]", result);
+        goto done;
+    }
+
+    result = ID3D11Device_CreatePixelShader(data->d3dDevice,
+        D3D11_PixelShader_YUV,
+        sizeof(D3D11_PixelShader_YUV),
+        NULL,
+        &data->yuvPixelShader
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['yuv' shader]", result);
+        goto done;
+    }
+
+    /* Setup space to hold vertex shader constants: */
+    SDL_zero(constantBufferDesc);
+    constantBufferDesc.ByteWidth = sizeof(VertexShaderConstants);
+    constantBufferDesc.Usage = D3D11_USAGE_DEFAULT;
+    constantBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
+    result = ID3D11Device_CreateBuffer(data->d3dDevice,
+        &constantBufferDesc,
+        NULL,
+        &data->vertexShaderConstants
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex shader constants]", result);
+        goto done;
+    }
+
+    /* Create samplers to use when drawing textures: */
+    SDL_zero(samplerDesc);
+    samplerDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
+    samplerDesc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
+    samplerDesc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
+    samplerDesc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
+    samplerDesc.MipLODBias = 0.0f;
+    samplerDesc.MaxAnisotropy = 1;
+    samplerDesc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
+    samplerDesc.MinLOD = 0.0f;
+    samplerDesc.MaxLOD = D3D11_FLOAT32_MAX;
+    result = ID3D11Device_CreateSamplerState(data->d3dDevice,
+        &samplerDesc,
+        &data->nearestPixelSampler
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [nearest-pixel filter]", result);
+        goto done;
+    }
+
+    samplerDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+    result = ID3D11Device_CreateSamplerState(data->d3dDevice,
+        &samplerDesc,
+        &data->linearSampler
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [linear filter]", result);
+        goto done;
+    }
+
+    /* Setup Direct3D rasterizer states */
+    SDL_zero(rasterDesc);
+    rasterDesc.AntialiasedLineEnable = FALSE;
+    rasterDesc.CullMode = D3D11_CULL_NONE;
+    rasterDesc.DepthBias = 0;
+    rasterDesc.DepthBiasClamp = 0.0f;
+    rasterDesc.DepthClipEnable = TRUE;
+    rasterDesc.FillMode = D3D11_FILL_SOLID;
+    rasterDesc.FrontCounterClockwise = FALSE;
+    rasterDesc.MultisampleEnable = FALSE;
+    rasterDesc.ScissorEnable = FALSE;
+    rasterDesc.SlopeScaledDepthBias = 0.0f;
+    result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->mainRasterizer);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [main rasterizer]", result);
+        goto done;
+    }
+
+    rasterDesc.ScissorEnable = TRUE;
+    result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->clippedRasterizer);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [clipped rasterizer]", result);
+        goto done;
+    }
+
+    /* Create blending states: */
+    result = D3D11_CreateBlendMode(
+        renderer,
+        TRUE,
+        D3D11_BLEND_SRC_ALPHA,          /* srcBlend */
+        D3D11_BLEND_INV_SRC_ALPHA,      /* destBlend */
+        D3D11_BLEND_ONE,                /* srcBlendAlpha */
+        D3D11_BLEND_INV_SRC_ALPHA,      /* destBlendAlpha */
+        &data->blendModeBlend);
+    if (FAILED(result)) {
+        /* D3D11_CreateBlendMode will set the SDL error, if it fails */
+        goto done;
+    }
+
+    result = D3D11_CreateBlendMode(
+        renderer,
+        TRUE,
+        D3D11_BLEND_SRC_ALPHA,          /* srcBlend */
+        D3D11_BLEND_ONE,                /* destBlend */
+        D3D11_BLEND_ZERO,               /* srcBlendAlpha */
+        D3D11_BLEND_ONE,                /* destBlendAlpha */
+        &data->blendModeAdd);
+    if (FAILED(result)) {
+        /* D3D11_CreateBlendMode will set the SDL error, if it fails */
+        goto done;
+    }
+
+    result = D3D11_CreateBlendMode(
+        renderer,
+        TRUE,
+        D3D11_BLEND_ZERO,               /* srcBlend */
+        D3D11_BLEND_SRC_COLOR,          /* destBlend */
+        D3D11_BLEND_ZERO,               /* srcBlendAlpha */
+        D3D11_BLEND_ONE,                /* destBlendAlpha */
+        &data->blendModeMod);
+    if (FAILED(result)) {
+        /* D3D11_CreateBlendMode will set the SDL error, if it fails */
+        goto done;
+    }
+
+    /* Setup render state that doesn't change */
+    ID3D11DeviceContext_IASetInputLayout(data->d3dContext, data->inputLayout);
+    ID3D11DeviceContext_VSSetShader(data->d3dContext, data->vertexShader, NULL, 0);
+    ID3D11DeviceContext_VSSetConstantBuffers(data->d3dContext, 0, 1, &data->vertexShaderConstants);
+
+done:
+    SAFE_RELEASE(d3dDevice);
+    SAFE_RELEASE(d3dContext);
+    SAFE_RELEASE(dxgiDevice);
+    return result;
+}
+
+#ifdef __WIN32__
+
+static DXGI_MODE_ROTATION
+D3D11_GetCurrentRotation()
+{
+    /* FIXME */
+    return DXGI_MODE_ROTATION_IDENTITY;
+}
+
+#endif /* __WIN32__ */
+
+static BOOL
+D3D11_IsDisplayRotated90Degrees(DXGI_MODE_ROTATION rotation)
+{
+    switch (rotation) {
+        case DXGI_MODE_ROTATION_ROTATE90:
+        case DXGI_MODE_ROTATION_ROTATE270:
+            return TRUE;
+        default:
+            return FALSE;
+    }
+}
+
+static int
+D3D11_GetViewportAlignedD3DRect(SDL_Renderer * renderer, const SDL_Rect * sdlRect, D3D11_RECT * outRect)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+    switch (data->rotation) {
+        case DXGI_MODE_ROTATION_IDENTITY:
+            outRect->left = sdlRect->x;
+            outRect->right = sdlRect->x + sdlRect->w;
+            outRect->top = sdlRect->y;
+            outRect->bottom = sdlRect->y + sdlRect->h;
+            break;
+        case DXGI_MODE_ROTATION_ROTATE270:
+            outRect->left = sdlRect->y;
+            outRect->right = sdlRect->y + sdlRect->h;
+            outRect->top = renderer->viewport.w - sdlRect->x - sdlRect->w;
+            outRect->bottom = renderer->viewport.w - sdlRect->x;
+            break;
+        case DXGI_MODE_ROTATION_ROTATE180:
+            outRect->left = renderer->viewport.w - sdlRect->x - sdlRect->w;
+            outRect->right = renderer->viewport.w - sdlRect->x;
+            outRect->top = renderer->viewport.h - sdlRect->y - sdlRect->h;
+            outRect->bottom = renderer->viewport.h - sdlRect->y;
+            break;
+        case DXGI_MODE_ROTATION_ROTATE90:
+            outRect->left = renderer->viewport.h - sdlRect->y - sdlRect->h;
+            outRect->right = renderer->viewport.h - sdlRect->y;
+            outRect->top = sdlRect->x;
+            outRect->bottom = sdlRect->x + sdlRect->h;
+            break;
+        default:
+            return SDL_SetError("The physical display is in an unknown or unsupported rotation");
+    }
+    return 0;
+}
+
+static HRESULT
+D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *)renderer->driverdata;
+#ifdef __WINRT__
+    IUnknown *coreWindow = D3D11_GetCoreWindowFromSDLRenderer(renderer);
+    const BOOL usingXAML = (coreWindow == NULL);
+#else
+    IUnknown *coreWindow = NULL;
+    const BOOL usingXAML = FALSE;
+#endif
+    HRESULT result = S_OK;
+
+    /* Create a swap chain using the same adapter as the existing Direct3D device. */
+    DXGI_SWAP_CHAIN_DESC1 swapChainDesc;
+    SDL_zero(swapChainDesc);
+    swapChainDesc.Width = w;
+    swapChainDesc.Height = h;
+    swapChainDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; /* This is the most common swap chain format. */
+    swapChainDesc.Stereo = FALSE;
+    swapChainDesc.SampleDesc.Count = 1; /* Don't use multi-sampling. */
+    swapChainDesc.SampleDesc.Quality = 0;
+    swapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
+    swapChainDesc.BufferCount = 2; /* Use double-buffering to minimize latency. */
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    swapChainDesc.Scaling = DXGI_SCALING_STRETCH; /* On phone, only stretch and aspect-ratio stretch scaling are allowed. */
+    swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; /* On phone, no swap effects are supported. */
+#else
+    if (usingXAML) {
+        swapChainDesc.Scaling = DXGI_SCALING_STRETCH;
+    } else {
+        swapChainDesc.Scaling = DXGI_SCALING_NONE;
+    }
+    swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; /* All Windows Store apps must use this SwapEffect. */
+#endif
+    swapChainDesc.Flags = 0;
+
+    if (coreWindow) {
+        result = IDXGIFactory2_CreateSwapChainForCoreWindow(data->dxgiFactory,
+            (IUnknown *)data->d3dDevice,
+            coreWindow,
+            &swapChainDesc,
+            NULL, /* Allow on all displays. */
+            &data->swapChain
+            );
+        if (FAILED(result)) {
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForCoreWindow", result);
+            goto done;
+        }
+    } else if (usingXAML) {
+        result = IDXGIFactory2_CreateSwapChainForComposition(data->dxgiFactory,
+            (IUnknown *)data->d3dDevice,
+            &swapChainDesc,
+            NULL,
+            &data->swapChain);
+        if (FAILED(result)) {
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForComposition", result);
+            goto done;
+        }
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+        result = ISwapChainBackgroundPanelNative_SetSwapChain(WINRT_GlobalSwapChainBackgroundPanelNative, (IDXGISwapChain *) data->swapChain);
+        if (FAILED(result)) {
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ISwapChainBackgroundPanelNative::SetSwapChain", result);
+            goto done;
+        }
+#else
+        SDL_SetError(__FUNCTION__ ", XAML support is not yet available for Windows Phone");
+        result = E_FAIL;
+        goto done;
+#endif
+    } else {
+#ifdef __WIN32__
+        SDL_SysWMinfo windowinfo;
+        SDL_VERSION(&windowinfo.version);
+        SDL_GetWindowWMInfo(renderer->window, &windowinfo);
+
+        result = IDXGIFactory2_CreateSwapChainForHwnd(data->dxgiFactory,
+            (IUnknown *)data->d3dDevice,
+            windowinfo.info.win.window,
+            &swapChainDesc,
+            NULL,
+            NULL, /* Allow on all displays. */
+            &data->swapChain
+            );
+        if (FAILED(result)) {
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForHwnd", result);
+            goto done;
+        }
+#else
+        SDL_SetError(__FUNCTION__", Unable to find something to attach a swap chain to");
+        goto done;
+#endif  /* ifdef __WIN32__ / else */
+    }
+    data->swapEffect = swapChainDesc.SwapEffect;
+
+done:
+    SAFE_RELEASE(coreWindow);
+    return result;
+}
+
+
+/* Initialize all resources that change when the window's size changes. */
+static HRESULT
+D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *)renderer->driverdata;
+    ID3D11Texture2D *backBuffer = NULL;
+    HRESULT result = S_OK;
+    int w, h;
+
+    /* Release the previous render target view */
+    D3D11_ReleaseMainRenderTargetView(renderer);
+
+    /* The width and height of the swap chain must be based on the display's
+     * non-rotated size.
+     */
+    SDL_GetWindowSize(renderer->window, &w, &h);
+    data->rotation = D3D11_GetCurrentRotation();
+    if (D3D11_IsDisplayRotated90Degrees(data->rotation)) {
+        int tmp = w;
+        w = h;
+        h = tmp;
+    }
+
+    if (data->swapChain) {
+        /* IDXGISwapChain::ResizeBuffers is not available on Windows Phone 8. */
+#if !defined(__WINRT__) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP)
+        /* If the swap chain already exists, resize it. */
+        result = IDXGISwapChain_ResizeBuffers(data->swapChain,
+            0,
+            w, h,
+            DXGI_FORMAT_UNKNOWN,
+            0
+            );
+        if (FAILED(result)) {
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::ResizeBuffers", result);
+            goto done;
+        }
+#endif
+    } else {
+        result = D3D11_CreateSwapChain(renderer, w, h);
+        if (FAILED(result)) {
+            goto done;
+        }
+    }
+    
+#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
+    /* Set the proper rotation for the swap chain, and generate the
+     * 3D matrix transformation for rendering to the rotated swap chain.
+     *
+     * To note, the call for this, IDXGISwapChain1::SetRotation, is not necessary
+     * on Windows Phone, nor is it supported there.  It's only needed in Windows 8/RT.
+     */
+    if (data->swapEffect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL) {
+        result = IDXGISwapChain1_SetRotation(data->swapChain, data->rotation);
+        if (FAILED(result)) {
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::SetRotation", result);
+            goto done;
+        }
+    }
+#endif
+
+    result = IDXGISwapChain_GetBuffer(data->swapChain,
+        0,
+        &IID_ID3D11Texture2D,
+        &backBuffer
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::GetBuffer [back-buffer]", result);
+        goto done;
+    }
+
+    /* Create a render target view of the swap chain back buffer. */
+    result = ID3D11Device_CreateRenderTargetView(data->d3dDevice,
+        (ID3D11Resource *)backBuffer,
+        NULL,
+        &data->mainRenderTargetView
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device::CreateRenderTargetView", result);
+        goto done;
+    }
+
+    if (D3D11_UpdateViewport(renderer) != 0) {
+        /* D3D11_UpdateViewport will set the SDL error if it fails. */
+        result = E_FAIL;
+        goto done;
+    }
+
+done:
+    SAFE_RELEASE(backBuffer);
+    return result;
+}
+
+/* This method is called when the window's size changes. */
+static HRESULT
+D3D11_UpdateForWindowSizeChange(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *)renderer->driverdata;
+    return D3D11_CreateWindowSizeDependentResources(renderer);
+}
+
+HRESULT
+D3D11_HandleDeviceLost(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+    HRESULT result = S_OK;
+
+    /* FIXME: Need to release all resources - all textures are invalid! */
+
+    result = D3D11_CreateDeviceResources(renderer);
+    if (FAILED(result)) {
+        /* D3D11_CreateDeviceResources will set the SDL error */
+        return result;
+    }
+
+    result = D3D11_UpdateForWindowSizeChange(renderer);
+    if (FAILED(result)) {
+        /* D3D11_UpdateForWindowSizeChange will set the SDL error */
+        return result;
+    }
+
+    return S_OK;
+}
+
+static void
+D3D11_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
+{
+    if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
+        D3D11_UpdateForWindowSizeChange(renderer);
+    }
+}
+
+static D3D11_FILTER
+GetScaleQuality(void)
+{
+    const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY);
+    if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
+        return D3D11_FILTER_MIN_MAG_MIP_POINT;
+    } else /* if (*hint == '1' || SDL_strcasecmp(hint, "linear") == 0) */ {
+        return D3D11_FILTER_MIN_MAG_MIP_LINEAR;
+    }
+}
+
+static int
+D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    D3D11_TextureData *textureData;
+    HRESULT result;
+    DXGI_FORMAT textureFormat = SDLPixelFormatToDXGIFormat(texture->format);
+    D3D11_TEXTURE2D_DESC textureDesc;
+    D3D11_SHADER_RESOURCE_VIEW_DESC resourceViewDesc;
+
+    if (textureFormat == SDL_PIXELFORMAT_UNKNOWN) {
+        return SDL_SetError("%s, An unsupported SDL pixel format (0x%x) was specified",
+            __FUNCTION__, texture->format);
+    }
+
+    textureData = (D3D11_TextureData*) SDL_calloc(1, sizeof(*textureData));
+    if (!textureData) {
+        SDL_OutOfMemory();
+        return -1;
+    }
+    textureData->scaleMode = GetScaleQuality();
+
+    texture->driverdata = textureData;
+
+    SDL_zero(textureDesc);
+    textureDesc.Width = texture->w;
+    textureDesc.Height = texture->h;
+    textureDesc.MipLevels = 1;
+    textureDesc.ArraySize = 1;
+    textureDesc.Format = textureFormat;
+    textureDesc.SampleDesc.Count = 1;
+    textureDesc.SampleDesc.Quality = 0;
+    textureDesc.MiscFlags = 0;
+
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        textureDesc.Usage = D3D11_USAGE_DYNAMIC;
+        textureDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+    } else {
+        textureDesc.Usage = D3D11_USAGE_DEFAULT;
+        textureDesc.CPUAccessFlags = 0;
+    }
+
+    if (texture->access == SDL_TEXTUREACCESS_TARGET) {
+        textureDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET;
+    } else {
+        textureDesc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+    }
+
+    result = ID3D11Device_CreateTexture2D(rendererData->d3dDevice,
+        &textureDesc,
+        NULL,
+        &textureData->mainTexture
+        );
+    if (FAILED(result)) {
+        D3D11_DestroyTexture(renderer, texture);
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result);
+        return -1;
+    }
+
+    if (texture->format == SDL_PIXELFORMAT_YV12 ||
+        texture->format == SDL_PIXELFORMAT_IYUV) {
+        textureData->yuv = SDL_TRUE;
+
+        textureDesc.Width /= 2;
+        textureDesc.Height /= 2;
+
+        result = ID3D11Device_CreateTexture2D(rendererData->d3dDevice,
+            &textureDesc,
+            NULL,
+            &textureData->mainTextureU
+            );
+        if (FAILED(result)) {
+            D3D11_DestroyTexture(renderer, texture);
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result);
+            return -1;
+        }
+
+        result = ID3D11Device_CreateTexture2D(rendererData->d3dDevice,
+            &textureDesc,
+            NULL,
+            &textureData->mainTextureV
+            );
+        if (FAILED(result)) {
+            D3D11_DestroyTexture(renderer, texture);
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result);
+            return -1;
+        }
+    }
+
+    resourceViewDesc.Format = textureDesc.Format;
+    resourceViewDesc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D;
+    resourceViewDesc.Texture2D.MostDetailedMip = 0;
+    resourceViewDesc.Texture2D.MipLevels = textureDesc.MipLevels;
+    result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice,
+        (ID3D11Resource *)textureData->mainTexture,
+        &resourceViewDesc,
+        &textureData->mainTextureResourceView
+        );
+    if (FAILED(result)) {
+        D3D11_DestroyTexture(renderer, texture);
+        WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result);
+        return -1;
+    }
+
+    if (textureData->yuv) {
+        result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice,
+            (ID3D11Resource *)textureData->mainTextureU,
+            &resourceViewDesc,
+            &textureData->mainTextureResourceViewU
+            );
+        if (FAILED(result)) {
+            D3D11_DestroyTexture(renderer, texture);
+            WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result);
+            return -1;
+        }
+        result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice,
+            (ID3D11Resource *)textureData->mainTextureV,
+            &resourceViewDesc,
+            &textureData->mainTextureResourceViewV
+            );
+        if (FAILED(result)) {
+            D3D11_DestroyTexture(renderer, texture);
+            WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result);
+            return -1;
+        }
+    }
+
+    if (texture->access & SDL_TEXTUREACCESS_TARGET) {
+        D3D11_RENDER_TARGET_VIEW_DESC renderTargetViewDesc;
+        renderTargetViewDesc.Format = textureDesc.Format;
+        renderTargetViewDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
+        renderTargetViewDesc.Texture2D.MipSlice = 0;
+
+        result = ID3D11Device_CreateRenderTargetView(rendererData->d3dDevice,
+            (ID3D11Resource *)textureData->mainTexture,
+            &renderTargetViewDesc,
+            &textureData->mainTextureRenderTargetView);
+        if (FAILED(result)) {
+            D3D11_DestroyTexture(renderer, texture);
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRenderTargetView", result);
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+static void
+D3D11_DestroyTexture(SDL_Renderer * renderer,
+                     SDL_Texture * texture)
+{
+    D3D11_TextureData *data = (D3D11_TextureData *)texture->driverdata;
+
+    if (!data) {
+        return;
+    }
+
+    SAFE_RELEASE(data->mainTexture);
+    SAFE_RELEASE(data->mainTextureResourceView);
+    SAFE_RELEASE(data->mainTextureRenderTargetView);
+    SAFE_RELEASE(data->stagingTexture);
+    SAFE_RELEASE(data->mainTextureU);
+    SAFE_RELEASE(data->mainTextureResourceViewU);
+    SAFE_RELEASE(data->mainTextureV);
+    SAFE_RELEASE(data->mainTextureResourceViewV);
+    SDL_free(data->pixels);
+    SDL_free(data);
+    texture->driverdata = NULL;
+}
+
+static int
+D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *texture, Uint32 format, int x, int y, int w, int h, const void *pixels, int pitch)
+{
+    ID3D11Texture2D *stagingTexture;
+    const Uint8 *src;
+    Uint8 *dst;
+    int row;
+    UINT length;
+    HRESULT result;
+    D3D11_TEXTURE2D_DESC stagingTextureDesc;
+    D3D11_MAPPED_SUBRESOURCE textureMemory;
+
+    /* Create a 'staging' texture, which will be used to write to a portion of the main texture. */
+    ID3D11Texture2D_GetDesc(texture, &stagingTextureDesc);
+    stagingTextureDesc.Width = w;
+    stagingTextureDesc.Height = h;
+    stagingTextureDesc.BindFlags = 0;
+    stagingTextureDesc.MiscFlags = 0;
+    stagingTextureDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+    stagingTextureDesc.Usage = D3D11_USAGE_STAGING;
+    result = ID3D11Device_CreateTexture2D(rendererData->d3dDevice,
+        &stagingTextureDesc,
+        NULL,
+        &stagingTexture);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result);
+        return -1;
+    }
+
+    /* Get a write-only pointer to data in the staging texture: */
+    result = ID3D11DeviceContext_Map(rendererData->d3dContext,
+        (ID3D11Resource *)stagingTexture,
+        0,
+        D3D11_MAP_WRITE,
+        0,
+        &textureMemory
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result);
+        SAFE_RELEASE(stagingTexture);
+        return -1;
+    }
+
+    src = (const Uint8 *)pixels;
+    dst = textureMemory.pData;
+    length = w * SDL_BYTESPERPIXEL(format);
+    if (length == pitch && length == textureMemory.RowPitch) {
+        SDL_memcpy(dst, src, length*h);
+    } else {
+        if (length > (UINT)pitch) {
+            length = pitch;
+        }
+        if (length > textureMemory.RowPitch) {
+            length = textureMemory.RowPitch;
+        }
+        for (row = 0; row < h; ++row) {
+            SDL_memcpy(dst, src, length);
+            src += pitch;
+            dst += textureMemory.RowPitch;
+        }
+    }
+
+    /* Commit the pixel buffer's changes back to the staging texture: */
+    ID3D11DeviceContext_Unmap(rendererData->d3dContext,
+        (ID3D11Resource *)stagingTexture,
+        0);
+
+    /* Copy the staging texture's contents back to the texture: */
+    ID3D11DeviceContext_CopySubresourceRegion(rendererData->d3dContext,
+        (ID3D11Resource *)texture,
+        0,
+        x,
+        y,
+        0,
+        (ID3D11Resource *)stagingTexture,
+        0,
+        NULL);
+
+    SAFE_RELEASE(stagingTexture);
+
+    return 0;
+}
+
+static int
+D3D11_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                    const SDL_Rect * rect, const void * srcPixels,
+                    int srcPitch)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *)renderer->driverdata;
+    D3D11_TextureData *textureData = (D3D11_TextureData *)texture->driverdata;
+
+    if (!textureData) {
+        SDL_SetError("Texture is not currently available");
+        return -1;
+    }
+
+    if (D3D11_UpdateTextureInternal(rendererData, textureData->mainTexture, texture->format, rect->x, rect->y, rect->w, rect->h, srcPixels, srcPitch) < 0) {
+        return -1;
+    }
+
+    if (textureData->yuv) {
+        /* Skip to the correct offset into the next texture */
+        srcPixels = (const void*)((const Uint8*)srcPixels + rect->h * srcPitch);
+
+        if (D3D11_UpdateTextureInternal(rendererData, texture->format == SDL_PIXELFORMAT_YV12 ? textureData->mainTextureV : textureData->mainTextureU, texture->format, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, srcPixels, srcPitch / 2) < 0) {
+            return -1;
+        }
+
+        /* Skip to the correct offset into the next texture */
+        srcPixels = (const void*)((const Uint8*)srcPixels + (rect->h * srcPitch) / 4);
+        if (D3D11_UpdateTextureInternal(rendererData, texture->format == SDL_PIXELFORMAT_YV12 ? textureData->mainTextureU : textureData->mainTextureV, texture->format, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, srcPixels, srcPitch / 2) < 0) {
+            return -1;
+        }
+    }
+    return 0;
+}
+
+static int
+D3D11_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+                       const SDL_Rect * rect,
+                       const Uint8 *Yplane, int Ypitch,
+                       const Uint8 *Uplane, int Upitch,
+                       const Uint8 *Vplane, int Vpitch)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *)renderer->driverdata;
+    D3D11_TextureData *textureData = (D3D11_TextureData *)texture->driverdata;
+
+    if (!textureData) {
+        SDL_SetError("Texture is not currently available");
+        return -1;
+    }
+
+    if (D3D11_UpdateTextureInternal(rendererData, textureData->mainTexture, texture->format, rect->x, rect->y, rect->w, rect->h, Yplane, Ypitch) < 0) {
+        return -1;
+    }
+    if (D3D11_UpdateTextureInternal(rendererData, textureData->mainTextureU, texture->format, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, Uplane, Upitch) < 0) {
+        return -1;
+    }
+    if (D3D11_UpdateTextureInternal(rendererData, textureData->mainTextureV, texture->format, rect->x / 2, rect->y / 2, rect->w / 2, rect->h / 2, Vplane, Vpitch) < 0) {
+        return -1;
+    }
+    return 0;
+}
+
+static int
+D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                  const SDL_Rect * rect, void **pixels, int *pitch)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
+    HRESULT result = S_OK;
+    D3D11_TEXTURE2D_DESC stagingTextureDesc;
+    D3D11_MAPPED_SUBRESOURCE textureMemory;
+
+    if (!textureData) {
+        SDL_SetError("Texture is not currently available");
+        return -1;
+    }
+
+    if (textureData->yuv) {
+        /* It's more efficient to upload directly... */
+        if (!textureData->pixels) {
+            textureData->pitch = texture->w;
+            textureData->pixels = (Uint8 *)SDL_malloc((texture->h * textureData->pitch * 3) / 2);
+            if (!textureData->pixels) {
+                return SDL_OutOfMemory();
+            }
+        }
+        textureData->locked_rect = *rect;
+        *pixels =
+            (void *)((Uint8 *)textureData->pixels + rect->y * textureData->pitch +
+            rect->x * SDL_BYTESPERPIXEL(texture->format));
+        *pitch = textureData->pitch;
+        return 0;
+    }
+
+    if (textureData->stagingTexture) {
+        return SDL_SetError("texture is already locked");
+    }
+    
+    /* Create a 'staging' texture, which will be used to write to a portion
+     * of the main texture.  This is necessary, as Direct3D 11.1 does not
+     * have the ability to write a CPU-bound pixel buffer to a rectangular
+     * subrect of a texture.  Direct3D 11.1 can, however, write a pixel
+     * buffer to an entire texture, hence the use of a staging texture.
+     *
+     * TODO, WinRT: consider avoiding the use of a staging texture in D3D11_LockTexture if/when the entire texture is being updated
+     */
+    ID3D11Texture2D_GetDesc(textureData->mainTexture, &stagingTextureDesc);
+    stagingTextureDesc.Width = rect->w;
+    stagingTextureDesc.Height = rect->h;
+    stagingTextureDesc.BindFlags = 0;
+    stagingTextureDesc.MiscFlags = 0;
+    stagingTextureDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+    stagingTextureDesc.Usage = D3D11_USAGE_STAGING;
+    result = ID3D11Device_CreateTexture2D(rendererData->d3dDevice,
+        &stagingTextureDesc,
+        NULL,
+        &textureData->stagingTexture);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result);
+        return -1;
+    }
+
+    /* Get a write-only pointer to data in the staging texture: */
+    result = ID3D11DeviceContext_Map(rendererData->d3dContext,
+        (ID3D11Resource *)textureData->stagingTexture,
+        0,
+        D3D11_MAP_WRITE,
+        0,
+        &textureMemory
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result);
+        SAFE_RELEASE(textureData->stagingTexture);
+        return -1;
+    }
+
+    /* Make note of where the staging texture will be written to 
+     * (on a call to SDL_UnlockTexture):
+     */
+    textureData->lockedTexturePositionX = rect->x;
+    textureData->lockedTexturePositionY = rect->y;
+
+    /* Make sure the caller has information on the texture's pixel buffer,
+     * then return:
+     */
+    *pixels = textureMemory.pData;
+    *pitch = textureMemory.RowPitch;
+    return 0;
+}
+
+static void
+D3D11_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
+    
+    if (!textureData) {
+        return;
+    }
+
+    if (textureData->yuv) {
+        const SDL_Rect *rect = &textureData->locked_rect;
+        void *pixels =
+            (void *) ((Uint8 *) textureData->pixels + rect->y * textureData->pitch +
+                      rect->x * SDL_BYTESPERPIXEL(texture->format));
+        D3D11_UpdateTexture(renderer, texture, rect, pixels, textureData->pitch);
+        return;
+    }
+
+    /* Commit the pixel buffer's changes back to the staging texture: */
+    ID3D11DeviceContext_Unmap(rendererData->d3dContext,
+        (ID3D11Resource *)textureData->stagingTexture,
+        0);
+
+    /* Copy the staging texture's contents back to the main texture: */
+    ID3D11DeviceContext_CopySubresourceRegion(rendererData->d3dContext,
+        (ID3D11Resource *)textureData->mainTexture,
+        0,
+        textureData->lockedTexturePositionX,
+        textureData->lockedTexturePositionY,
+        0,
+        (ID3D11Resource *)textureData->stagingTexture,
+        0,
+        NULL);
+
+    SAFE_RELEASE(textureData->stagingTexture);
+}
+
+static int
+D3D11_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    D3D11_TextureData *textureData = NULL;
+
+    if (texture == NULL) {
+        rendererData->currentOffscreenRenderTargetView = NULL;
+        return 0;
+    }
+
+    textureData = (D3D11_TextureData *) texture->driverdata;
+
+    if (!textureData->mainTextureRenderTargetView) {
+        return SDL_SetError("specified texture is not a render target");
+    }
+
+    rendererData->currentOffscreenRenderTargetView = textureData->mainTextureRenderTargetView;
+
+    return 0;
+}
+
+static void
+D3D11_SetModelMatrix(SDL_Renderer *renderer, const Float4X4 *matrix)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *)renderer->driverdata;
+
+    if (matrix) {
+        data->vertexShaderConstantsData.model = *matrix;
+    } else {
+        data->vertexShaderConstantsData.model = MatrixIdentity();
+    }
+
+    ID3D11DeviceContext_UpdateSubresource(data->d3dContext,
+        (ID3D11Resource *)data->vertexShaderConstants,
+        0,
+        NULL,
+        &data->vertexShaderConstantsData,
+        0,
+        0
+        );
+}
+
+static int
+D3D11_UpdateViewport(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+    Float4X4 projection;
+    Float4X4 view;
+    SDL_FRect orientationAlignedViewport;
+    BOOL swapDimensions;
+    D3D11_VIEWPORT viewport;
+
+    if (renderer->viewport.w == 0 || renderer->viewport.h == 0) {
+        /* If the viewport is empty, assume that it is because
+         * SDL_CreateRenderer is calling it, and will call it again later
+         * with a non-empty viewport.
+         */
+        return 0;
+    }
+
+    /* Make sure the SDL viewport gets rotated to that of the physical display's rotation.
+     * Keep in mind here that the Y-axis will be been inverted (from Direct3D's
+     * default coordinate system) so rotations will be done in the opposite
+     * direction of the DXGI_MODE_ROTATION enumeration.
+     */
+    switch (data->rotation) {
+        case DXGI_MODE_ROTATION_IDENTITY:
+            projection = MatrixIdentity();
+            break;
+        case DXGI_MODE_ROTATION_ROTATE270:
+            projection = MatrixRotationZ(SDL_static_cast(float, M_PI * 0.5f));
+            break;
+        case DXGI_MODE_ROTATION_ROTATE180:
+            projection = MatrixRotationZ(SDL_static_cast(float, M_PI));
+            break;
+        case DXGI_MODE_ROTATION_ROTATE90:
+            projection = MatrixRotationZ(SDL_static_cast(float, -M_PI * 0.5f));
+            break;
+        default:
+            return SDL_SetError("An unknown DisplayOrientation is being used");
+    }
+
+    /* Update the view matrix */
+    view.m[0][0] = 2.0f / renderer->viewport.w;
+    view.m[0][1] = 0.0f;
+    view.m[0][2] = 0.0f;
+    view.m[0][3] = 0.0f;
+    view.m[1][0] = 0.0f;
+    view.m[1][1] = -2.0f / renderer->viewport.h;
+    view.m[1][2] = 0.0f;
+    view.m[1][3] = 0.0f;
+    view.m[2][0] = 0.0f;
+    view.m[2][1] = 0.0f;
+    view.m[2][2] = 1.0f;
+    view.m[2][3] = 0.0f;
+    view.m[3][0] = -1.0f;
+    view.m[3][1] = 1.0f;
+    view.m[3][2] = 0.0f;
+    view.m[3][3] = 1.0f;
+
+    /* Combine the projection + view matrix together now, as both only get
+     * set here (as of this writing, on Dec 26, 2013).  When done, store it
+     * for eventual transfer to the GPU.
+     */
+    data->vertexShaderConstantsData.projectionAndView = MatrixMultiply(
+            view,
+            projection);
+
+    /* Reset the model matrix */
+    D3D11_SetModelMatrix(renderer, NULL);
+
+    /* Update the Direct3D viewport, which seems to be aligned to the
+     * swap buffer's coordinate space, which is always in either
+     * a landscape mode, for all Windows 8/RT devices, or a portrait mode,
+     * for Windows Phone devices.
+     */
+    swapDimensions = D3D11_IsDisplayRotated90Degrees(data->rotation);
+    if (swapDimensions) {
+        orientationAlignedViewport.x = (float) renderer->viewport.y;
+        orientationAlignedViewport.y = (float) renderer->viewport.x;
+        orientationAlignedViewport.w = (float) renderer->viewport.h;
+        orientationAlignedViewport.h = (float) renderer->viewport.w;
+    } else {
+        orientationAlignedViewport.x = (float) renderer->viewport.x;
+        orientationAlignedViewport.y = (float) renderer->viewport.y;
+        orientationAlignedViewport.w = (float) renderer->viewport.w;
+        orientationAlignedViewport.h = (float) renderer->viewport.h;
+    }
+    /* TODO, WinRT: get custom viewports working with non-Landscape modes (Portrait, PortraitFlipped, and LandscapeFlipped) */
+
+    viewport.TopLeftX = orientationAlignedViewport.x;
+    viewport.TopLeftY = orientationAlignedViewport.y;
+    viewport.Width = orientationAlignedViewport.w;
+    viewport.Height = orientationAlignedViewport.h;
+    viewport.MinDepth = 0.0f;
+    viewport.MaxDepth = 1.0f;
+    ID3D11DeviceContext_RSSetViewports(data->d3dContext, 1, &viewport);
+
+    return 0;
+}
+
+static int
+D3D11_UpdateClipRect(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+    const SDL_Rect *rect = &renderer->clip_rect;
+
+    if (SDL_RectEmpty(rect)) {
+        ID3D11DeviceContext_RSSetScissorRects(data->d3dContext, 0, NULL);
+    } else {
+        D3D11_RECT scissorRect;
+        if (D3D11_GetViewportAlignedD3DRect(renderer, rect, &scissorRect) != 0) {
+            /* D3D11_GetViewportAlignedD3DRect will have set the SDL error */
+            return -1;
+        }
+        ID3D11DeviceContext_RSSetScissorRects(data->d3dContext, 1, &scissorRect);
+    }
+
+    return 0;
+}
+
+static void
+D3D11_ReleaseMainRenderTargetView(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *)renderer->driverdata;
+    ID3D11DeviceContext_OMSetRenderTargets(data->d3dContext, 0, NULL, NULL);
+    SAFE_RELEASE(data->mainRenderTargetView);
+}
+
+static ID3D11RenderTargetView *
+D3D11_GetCurrentRenderTargetView(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+    if (data->currentOffscreenRenderTargetView) {
+        return data->currentOffscreenRenderTargetView;
+    } else {
+        return data->mainRenderTargetView;
+    }
+}
+
+static int
+D3D11_RenderClear(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+    const float colorRGBA[] = {
+        (renderer->r / 255.0f),
+        (renderer->g / 255.0f),
+        (renderer->b / 255.0f),
+        (renderer->a / 255.0f)
+    };
+    ID3D11DeviceContext_ClearRenderTargetView(data->d3dContext,
+        D3D11_GetCurrentRenderTargetView(renderer),
+        colorRGBA
+        );
+    return 0;
+}
+
+static int
+D3D11_UpdateVertexBuffer(SDL_Renderer *renderer,
+                         const void * vertexData, size_t dataSizeInBytes)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    D3D11_BUFFER_DESC vertexBufferDesc;
+    HRESULT result = S_OK;
+    D3D11_SUBRESOURCE_DATA vertexBufferData;
+    const UINT stride = sizeof(VertexPositionColor);
+    const UINT offset = 0;
+
+    if (rendererData->vertexBuffer) {
+        ID3D11Buffer_GetDesc(rendererData->vertexBuffer, &vertexBufferDesc);
+    } else {
+        SDL_zero(vertexBufferDesc);
+    }
+
+    if (rendererData->vertexBuffer && vertexBufferDesc.ByteWidth >= dataSizeInBytes) {
+        D3D11_MAPPED_SUBRESOURCE mappedResource;
+        result = ID3D11DeviceContext_Map(rendererData->d3dContext,
+            (ID3D11Resource *)rendererData->vertexBuffer,
+            0,
+            D3D11_MAP_WRITE_DISCARD,
+            0,
+            &mappedResource
+            );
+        if (FAILED(result)) {
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [vertex buffer]", result);
+            return -1;
+        }
+        SDL_memcpy(mappedResource.pData, vertexData, dataSizeInBytes);
+        ID3D11DeviceContext_Unmap(rendererData->d3dContext, (ID3D11Resource *)rendererData->vertexBuffer, 0);
+    } else {
+        SAFE_RELEASE(rendererData->vertexBuffer);
+
+        vertexBufferDesc.ByteWidth = dataSizeInBytes;
+        vertexBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
+        vertexBufferDesc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+        vertexBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
+
+        SDL_zero(vertexBufferData);
+        vertexBufferData.pSysMem = vertexData;
+        vertexBufferData.SysMemPitch = 0;
+        vertexBufferData.SysMemSlicePitch = 0;
+
+        result = ID3D11Device_CreateBuffer(rendererData->d3dDevice,
+            &vertexBufferDesc,
+            &vertexBufferData,
+            &rendererData->vertexBuffer
+            );
+        if (FAILED(result)) {
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex buffer]", result);
+            return -1;
+        }
+
+        ID3D11DeviceContext_IASetVertexBuffers(rendererData->d3dContext,
+            0,
+            1,
+            &rendererData->vertexBuffer,
+            &stride,
+            &offset
+            );
+    }
+
+    return 0;
+}
+
+static void
+D3D11_RenderStartDrawOp(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *)renderer->driverdata;
+    ID3D11RasterizerState *rasterizerState;
+    ID3D11RenderTargetView *renderTargetView = D3D11_GetCurrentRenderTargetView(renderer);
+    if (renderTargetView != rendererData->currentRenderTargetView) {
+        ID3D11DeviceContext_OMSetRenderTargets(rendererData->d3dContext,
+            1,
+            &renderTargetView,
+            NULL
+            );
+        rendererData->currentRenderTargetView = renderTargetView;
+    }
+
+    if (SDL_RectEmpty(&renderer->clip_rect)) {
+        rasterizerState = rendererData->mainRasterizer;
+    } else {
+        rasterizerState = rendererData->clippedRasterizer;
+    }
+    if (rasterizerState != rendererData->currentRasterizerState) {
+        ID3D11DeviceContext_RSSetState(rendererData->d3dContext, rasterizerState);
+        rendererData->currentRasterizerState = rasterizerState;
+    }
+}
+
+static void
+D3D11_RenderSetBlendMode(SDL_Renderer * renderer, SDL_BlendMode blendMode)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *)renderer->driverdata;
+    ID3D11BlendState *blendState = NULL;
+    switch (blendMode) {
+    case SDL_BLENDMODE_BLEND:
+        blendState = rendererData->blendModeBlend;
+        break;
+    case SDL_BLENDMODE_ADD:
+        blendState = rendererData->blendModeAdd;
+        break;
+    case SDL_BLENDMODE_MOD:
+        blendState = rendererData->blendModeMod;
+        break;
+    case SDL_BLENDMODE_NONE:
+        blendState = NULL;
+        break;
+    }
+    if (blendState != rendererData->currentBlendState) {
+        ID3D11DeviceContext_OMSetBlendState(rendererData->d3dContext, blendState, 0, 0xFFFFFFFF);
+        rendererData->currentBlendState = blendState;
+    }
+}
+
+static void
+D3D11_SetPixelShader(SDL_Renderer * renderer,
+                     ID3D11PixelShader * shader,
+                     int numShaderResources,
+                     ID3D11ShaderResourceView ** shaderResources,
+                     ID3D11SamplerState * sampler)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    ID3D11ShaderResourceView *shaderResource;
+    if (shader != rendererData->currentShader) {
+        ID3D11DeviceContext_PSSetShader(rendererData->d3dContext, shader, NULL, 0);
+        rendererData->currentShader = shader;
+    }
+    if (numShaderResources > 0) {
+        shaderResource = shaderResources[0];
+    } else {
+        shaderResource = NULL;
+    }
+    if (shaderResource != rendererData->currentShaderResource) {
+        ID3D11DeviceContext_PSSetShaderResources(rendererData->d3dContext, 0, numShaderResources, shaderResources);
+        rendererData->currentShaderResource = shaderResource;
+    }
+    if (sampler != rendererData->currentSampler) {
+        ID3D11DeviceContext_PSSetSamplers(rendererData->d3dContext, 0, 1, &sampler);
+        rendererData->currentSampler = sampler;
+    }
+}
+
+static void
+D3D11_RenderFinishDrawOp(SDL_Renderer * renderer,
+                         D3D11_PRIMITIVE_TOPOLOGY primitiveTopology,
+                         UINT vertexCount)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+
+    ID3D11DeviceContext_IASetPrimitiveTopology(rendererData->d3dContext, primitiveTopology);
+    ID3D11DeviceContext_Draw(rendererData->d3dContext, vertexCount, 0);
+}
+
+static int
+D3D11_RenderDrawPoints(SDL_Renderer * renderer,
+                       const SDL_FPoint * points, int count)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    float r, g, b, a;
+    VertexPositionColor *vertices;
+    int i;
+
+    r = (float)(renderer->r / 255.0f);
+    g = (float)(renderer->g / 255.0f);
+    b = (float)(renderer->b / 255.0f);
+    a = (float)(renderer->a / 255.0f);
+
+    vertices = SDL_stack_alloc(VertexPositionColor, count);
+    for (i = 0; i < min(count, 128); ++i) {
+        const VertexPositionColor v = { { points[i].x, points[i].y, 0.0f }, { 0.0f, 0.0f }, { r, g, b, a } };
+        vertices[i] = v;
+    }
+
+    D3D11_RenderStartDrawOp(renderer);
+    D3D11_RenderSetBlendMode(renderer, renderer->blendMode);
+    if (D3D11_UpdateVertexBuffer(renderer, vertices, (unsigned int)count * sizeof(VertexPositionColor)) != 0) {
+        SDL_stack_free(vertices);
+        return -1;
+    }
+
+    D3D11_SetPixelShader(
+        renderer,
+        rendererData->colorPixelShader,
+        0,
+        NULL,
+        NULL);
+
+    D3D11_RenderFinishDrawOp(renderer, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST, count);
+    SDL_stack_free(vertices);
+    return 0;
+}
+
+static int
+D3D11_RenderDrawLines(SDL_Renderer * renderer,
+                      const SDL_FPoint * points, int count)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    float r, g, b, a;
+    VertexPositionColor *vertices;
+    int i;
+
+    r = (float)(renderer->r / 255.0f);
+    g = (float)(renderer->g / 255.0f);
+    b = (float)(renderer->b / 255.0f);
+    a = (float)(renderer->a / 255.0f);
+
+    vertices = SDL_stack_alloc(VertexPositionColor, count);
+    for (i = 0; i < count; ++i) {
+        const VertexPositionColor v = { { points[i].x, points[i].y, 0.0f }, { 0.0f, 0.0f }, { r, g, b, a } };
+        vertices[i] = v;
+    }
+
+    D3D11_RenderStartDrawOp(renderer);
+    D3D11_RenderSetBlendMode(renderer, renderer->blendMode);
+    if (D3D11_UpdateVertexBuffer(renderer, vertices, (unsigned int)count * sizeof(VertexPositionColor)) != 0) {
+        SDL_stack_free(vertices);
+        return -1;
+    }
+
+    D3D11_SetPixelShader(
+        renderer,
+        rendererData->colorPixelShader,
+        0,
+        NULL,
+        NULL);
+
+    D3D11_RenderFinishDrawOp(renderer, D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP, count);
+    SDL_stack_free(vertices);
+    return 0;
+}
+
+static int
+D3D11_RenderFillRects(SDL_Renderer * renderer,
+                      const SDL_FRect * rects, int count)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    float r, g, b, a;
+    int i;
+
+    r = (float)(renderer->r / 255.0f);
+    g = (float)(renderer->g / 255.0f);
+    b = (float)(renderer->b / 255.0f);
+    a = (float)(renderer->a / 255.0f);
+
+    for (i = 0; i < count; ++i) {
+        VertexPositionColor vertices[] = {
+            { { rects[i].x, rects[i].y, 0.0f },                             { 0.0f, 0.0f}, {r, g, b, a} },
+            { { rects[i].x, rects[i].y + rects[i].h, 0.0f },                { 0.0f, 0.0f }, { r, g, b, a } },
+            { { rects[i].x + rects[i].w, rects[i].y, 0.0f },                { 0.0f, 0.0f }, { r, g, b, a } },
+            { { rects[i].x + rects[i].w, rects[i].y + rects[i].h, 0.0f },   { 0.0f, 0.0f }, { r, g, b, a } },
+        };
+
+        D3D11_RenderStartDrawOp(renderer);
+        D3D11_RenderSetBlendMode(renderer, renderer->blendMode);
+        if (D3D11_UpdateVertexBuffer(renderer, vertices, sizeof(vertices)) != 0) {
+            return -1;
+        }
+
+        D3D11_SetPixelShader(
+            renderer,
+            rendererData->colorPixelShader,
+            0,
+            NULL,
+            NULL);
+
+        D3D11_RenderFinishDrawOp(renderer, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, SDL_arraysize(vertices));
+    }
+
+    return 0;
+}
+
+static ID3D11SamplerState *
+D3D11_RenderGetSampler(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
+
+    switch (textureData->scaleMode) {
+    case D3D11_FILTER_MIN_MAG_MIP_POINT:
+        return rendererData->nearestPixelSampler;
+    case D3D11_FILTER_MIN_MAG_MIP_LINEAR:
+        return rendererData->linearSampler;
+    default:
+        return NULL;
+    }
+}
+
+static int
+D3D11_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                 const SDL_Rect * srcrect, const SDL_FRect * dstrect)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
+    float minu, maxu, minv, maxv;
+    Float4 color;
+    VertexPositionColor vertices[4];
+    ID3D11SamplerState *textureSampler;
+
+    D3D11_RenderStartDrawOp(renderer);
+    D3D11_RenderSetBlendMode(renderer, texture->blendMode);
+
+    minu = (float) srcrect->x / texture->w;
+    maxu = (float) (srcrect->x + srcrect->w) / texture->w;
+    minv = (float) srcrect->y / texture->h;
+    maxv = (float) (srcrect->y + srcrect->h) / texture->h;
+
+    color.x = 1.0f;     /* red */
+    color.y = 1.0f;     /* green */
+    color.z = 1.0f;     /* blue */
+    color.w = 1.0f;     /* alpha */
+    if (texture->modMode & SDL_TEXTUREMODULATE_COLOR) {
+        color.x = (float)(texture->r / 255.0f);     /* red */
+        color.y = (float)(texture->g / 255.0f);     /* green */
+        color.z = (float)(texture->b / 255.0f);     /* blue */
+    }
+    if (texture->modMode & SDL_TEXTUREMODULATE_ALPHA) {
+        color.w = (float)(texture->a / 255.0f);     /* alpha */
+    }
+
+    vertices[0].pos.x = dstrect->x;
+    vertices[0].pos.y = dstrect->y;
+    vertices[0].pos.z = 0.0f;
+    vertices[0].tex.x = minu;
+    vertices[0].tex.y = minv;
+    vertices[0].color = color;
+
+    vertices[1].pos.x = dstrect->x;
+    vertices[1].pos.y = dstrect->y + dstrect->h;
+    vertices[1].pos.z = 0.0f;
+    vertices[1].tex.x = minu;
+    vertices[1].tex.y = maxv;
+    vertices[1].color = color;
+
+    vertices[2].pos.x = dstrect->x + dstrect->w;
+    vertices[2].pos.y = dstrect->y;
+    vertices[2].pos.z = 0.0f;
+    vertices[2].tex.x = maxu;
+    vertices[2].tex.y = minv;
+    vertices[2].color = color;
+
+    vertices[3].pos.x = dstrect->x + dstrect->w;
+    vertices[3].pos.y = dstrect->y + dstrect->h;
+    vertices[3].pos.z = 0.0f;
+    vertices[3].tex.x = maxu;
+    vertices[3].tex.y = maxv;
+    vertices[3].color = color;
+
+    if (D3D11_UpdateVertexBuffer(renderer, vertices, sizeof(vertices)) != 0) {
+        return -1;
+    }
+
+    textureSampler = D3D11_RenderGetSampler(renderer, texture);
+    if (textureData->yuv) {
+        ID3D11ShaderResourceView *shaderResources[] = {
+            textureData->mainTextureResourceView,
+            textureData->mainTextureResourceViewU,
+            textureData->mainTextureResourceViewV
+        };
+        D3D11_SetPixelShader(
+            renderer,
+            rendererData->yuvPixelShader,
+            SDL_arraysize(shaderResources),
+            shaderResources,
+            textureSampler);
+    } else {
+        D3D11_SetPixelShader(
+            renderer,
+            rendererData->texturePixelShader,
+            1,
+            &textureData->mainTextureResourceView,
+            textureSampler);
+    }
+
+    D3D11_RenderFinishDrawOp(renderer, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, sizeof(vertices) / sizeof(VertexPositionColor));
+
+    return 0;
+}
+
+static int
+D3D11_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                   const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                   const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip)
+{
+    D3D11_RenderData *rendererData = (D3D11_RenderData *) renderer->driverdata;
+    D3D11_TextureData *textureData = (D3D11_TextureData *) texture->driverdata;
+    float minu, maxu, minv, maxv;
+    Float4 color;
+    Float4X4 modelMatrix;
+    float minx, maxx, miny, maxy;
+    VertexPositionColor vertices[4];
+    ID3D11SamplerState *textureSampler;
+
+    D3D11_RenderStartDrawOp(renderer);
+    D3D11_RenderSetBlendMode(renderer, texture->blendMode);
+
+    minu = (float) srcrect->x / texture->w;
+    maxu = (float) (srcrect->x + srcrect->w) / texture->w;
+    minv = (float) srcrect->y / texture->h;
+    maxv = (float) (srcrect->y + srcrect->h) / texture->h;
+
+    color.x = 1.0f;     /* red */
+    color.y = 1.0f;     /* green */
+    color.z = 1.0f;     /* blue */
+    color.w = 1.0f;     /* alpha */
+    if (texture->modMode & SDL_TEXTUREMODULATE_COLOR) {
+        color.x = (float)(texture->r / 255.0f);     /* red */
+        color.y = (float)(texture->g / 255.0f);     /* green */
+        color.z = (float)(texture->b / 255.0f);     /* blue */
+    }
+    if (texture->modMode & SDL_TEXTUREMODULATE_ALPHA) {
+        color.w = (float)(texture->a / 255.0f);     /* alpha */
+    }
+
+    if (flip & SDL_FLIP_HORIZONTAL) {
+        float tmp = maxu;
+        maxu = minu;
+        minu = tmp;
+    }
+    if (flip & SDL_FLIP_VERTICAL) {
+        float tmp = maxv;
+        maxv = minv;
+        minv = tmp;
+    }
+
+    modelMatrix = MatrixMultiply(
+            MatrixRotationZ((float)(M_PI * (float) angle / 180.0f)),
+            MatrixTranslation(dstrect->x + center->x, dstrect->y + center->y, 0)
+            );
+    D3D11_SetModelMatrix(renderer, &modelMatrix);
+
+    minx = -center->x;
+    maxx = dstrect->w - center->x;
+    miny = -center->y;
+    maxy = dstrect->h - center->y;
+
+    vertices[0].pos.x = minx;
+    vertices[0].pos.y = miny;
+    vertices[0].pos.z = 0.0f;
+    vertices[0].tex.x = minu;
+    vertices[0].tex.y = minv;
+    vertices[0].color = color;
+    
+    vertices[1].pos.x = minx;
+    vertices[1].pos.y = maxy;
+    vertices[1].pos.z = 0.0f;
+    vertices[1].tex.x = minu;
+    vertices[1].tex.y = maxv;
+    vertices[1].color = color;
+    
+    vertices[2].pos.x = maxx;
+    vertices[2].pos.y = miny;
+    vertices[2].pos.z = 0.0f;
+    vertices[2].tex.x = maxu;
+    vertices[2].tex.y = minv;
+    vertices[2].color = color;
+    
+    vertices[3].pos.x = maxx;
+    vertices[3].pos.y = maxy;
+    vertices[3].pos.z = 0.0f;
+    vertices[3].tex.x = maxu;
+    vertices[3].tex.y = maxv;
+    vertices[3].color = color;
+
+    if (D3D11_UpdateVertexBuffer(renderer, vertices, sizeof(vertices)) != 0) {
+        return -1;
+    }
+
+    textureSampler = D3D11_RenderGetSampler(renderer, texture);
+    if (textureData->yuv) {
+        ID3D11ShaderResourceView *shaderResources[] = {
+            textureData->mainTextureResourceView,
+            textureData->mainTextureResourceViewU,
+            textureData->mainTextureResourceViewV
+        };
+        D3D11_SetPixelShader(
+            renderer,
+            rendererData->yuvPixelShader,
+            SDL_arraysize(shaderResources),
+            shaderResources,
+            textureSampler);
+    } else {
+        D3D11_SetPixelShader(
+            renderer,
+            rendererData->texturePixelShader,
+            1,
+            &textureData->mainTextureResourceView,
+            textureSampler);
+    }
+
+    D3D11_RenderFinishDrawOp(renderer, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP, sizeof(vertices) / sizeof(VertexPositionColor));
+
+    D3D11_SetModelMatrix(renderer, NULL);
+
+    return 0;
+}
+
+static int
+D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                       Uint32 format, void * pixels, int pitch)
+{
+    D3D11_RenderData * data = (D3D11_RenderData *) renderer->driverdata;
+    ID3D11Texture2D *backBuffer = NULL;
+    ID3D11Texture2D *stagingTexture = NULL;
+    HRESULT result;
+    int status = -1;
+    D3D11_TEXTURE2D_DESC stagingTextureDesc;
+    D3D11_RECT srcRect;
+    D3D11_BOX srcBox;
+    D3D11_MAPPED_SUBRESOURCE textureMemory;
+
+    /* Retrieve a pointer to the back buffer: */
+    result = IDXGISwapChain_GetBuffer(data->swapChain,
+        0,
+        &IID_ID3D11Texture2D,
+        &backBuffer
+        );
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::GetBuffer [get back buffer]", result);
+        goto done;
+    }
+
+    /* Create a staging texture to copy the screen's data to: */
+    ID3D11Texture2D_GetDesc(backBuffer, &stagingTextureDesc);
+    stagingTextureDesc.Width = rect->w;
+    stagingTextureDesc.Height = rect->h;
+    stagingTextureDesc.BindFlags = 0;
+    stagingTextureDesc.MiscFlags = 0;
+    stagingTextureDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+    stagingTextureDesc.Usage = D3D11_USAGE_STAGING;
+    result = ID3D11Device_CreateTexture2D(data->d3dDevice,
+        &stagingTextureDesc,
+        NULL,
+        &stagingTexture);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result);
+        goto done;
+    }
+
+    /* Copy the desired portion of the back buffer to the staging texture: */
+    if (D3D11_GetViewportAlignedD3DRect(renderer, rect, &srcRect) != 0) {
+        /* D3D11_GetViewportAlignedD3DRect will have set the SDL error */
+        goto done;
+    }
+
+    srcBox.left = srcRect.left;
+    srcBox.right = srcRect.right;
+    srcBox.top = srcRect.top;
+    srcBox.bottom = srcRect.bottom;
+    srcBox.front = 0;
+    srcBox.back = 1;
+    ID3D11DeviceContext_CopySubresourceRegion(data->d3dContext,
+        (ID3D11Resource *)stagingTexture,
+        0,
+        0, 0, 0,
+        (ID3D11Resource *)backBuffer,
+        0,
+        &srcBox);
+
+    /* Map the staging texture's data to CPU-accessible memory: */
+    result = ID3D11DeviceContext_Map(data->d3dContext,
+        (ID3D11Resource *)stagingTexture,
+        0,
+        D3D11_MAP_READ,
+        0,
+        &textureMemory);
+    if (FAILED(result)) {
+        WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result);
+        goto done;
+    }
+
+    /* Copy the data into the desired buffer, converting pixels to the
+     * desired format at the same time:
+     */
+    if (SDL_ConvertPixels(
+        rect->w, rect->h,
+        DXGIFormatToSDLPixelFormat(stagingTextureDesc.Format),
+        textureMemory.pData,
+        textureMemory.RowPitch,
+        format,
+        pixels,
+        pitch) != 0) {
+        /* When SDL_ConvertPixels fails, it'll have already set the format.
+         * Get the error message, and attach some extra data to it.
+         */
+        char errorMessage[1024];
+        SDL_snprintf(errorMessage, sizeof(errorMessage), __FUNCTION__ ", Convert Pixels failed: %s", SDL_GetError());
+        SDL_SetError(errorMessage);
+        goto done;
+    }
+
+    /* Unmap the texture: */
+    ID3D11DeviceContext_Unmap(data->d3dContext,
+        (ID3D11Resource *)stagingTexture,
+        0);
+
+    status = 0;
+
+done:
+    SAFE_RELEASE(backBuffer);
+    SAFE_RELEASE(stagingTexture);
+    return status;
+}
+
+static void
+D3D11_RenderPresent(SDL_Renderer * renderer)
+{
+    D3D11_RenderData *data = (D3D11_RenderData *) renderer->driverdata;
+    UINT syncInterval;
+    UINT presentFlags;
+    HRESULT result;
+    DXGI_PRESENT_PARAMETERS parameters;
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    syncInterval = 1;
+    presentFlags = 0;
+    result = IDXGISwapChain_Present(data->swapChain, syncInterval, presentFlags);
+#else
+    if (renderer->info.flags & SDL_RENDERER_PRESENTVSYNC) {
+        syncInterval = 1;
+        presentFlags = 0;
+    } else {
+        syncInterval = 0;
+        presentFlags = DXGI_PRESENT_DO_NOT_WAIT;
+    }
+
+    /* The application may optionally specify "dirty" or "scroll"
+     * rects to improve efficiency in certain scenarios.
+     * This option is not available on Windows Phone 8, to note.
+     */
+    SDL_zero(parameters);
+    result = IDXGISwapChain1_Present1(data->swapChain, syncInterval, presentFlags, &parameters);
+#endif
+
+    /* Discard the contents of the render target.
+     * This is a valid operation only when the existing contents will be entirely
+     * overwritten. If dirty or scroll rects are used, this call should be removed.
+     */
+    ID3D11DeviceContext1_DiscardView(data->d3dContext, (ID3D11View*)data->mainRenderTargetView);
+
+    /* When the present flips, it unbinds the current view, so bind it again on the next draw call */
+    data->currentRenderTargetView = NULL;
+
+    if (FAILED(result) && result != DXGI_ERROR_WAS_STILL_DRAWING) {
+        /* If the device was removed either by a disconnect or a driver upgrade, we 
+         * must recreate all device resources.
+         *
+         * TODO, WinRT: consider throwing an exception if D3D11_RenderPresent fails, especially if there is a way to salvage debug info from users' machines
+         */
+        if ( result == DXGI_ERROR_DEVICE_REMOVED ) {
+            D3D11_HandleDeviceLost(renderer);
+        } else if (result == DXGI_ERROR_INVALID_CALL) {
+            /* We probably went through a fullscreen <-> windowed transition */
+            D3D11_CreateWindowSizeDependentResources(renderer);
+        } else {
+            WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::Present", result);
+        }
+    }
+}
+
+#endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/direct3d11/SDL_render_winrt.cpp b/Source/3rd Party/sdl/src/render/direct3d11/SDL_render_winrt.cpp
new file mode 100644
index 000000000..9ed67fd29
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/direct3d11/SDL_render_winrt.cpp	
@@ -0,0 +1,119 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+
+#include "SDL_syswm.h"
+extern "C" {
+#include "../SDL_sysrender.h"
+}
+
+#include <windows.ui.core.h>
+#include <windows.graphics.display.h>
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+#include <windows.ui.xaml.media.dxinterop.h>
+#endif
+
+using namespace Windows::UI::Core;
+using namespace Windows::Graphics::Display;
+
+#include <DXGI.h>
+
+#include "SDL_render_winrt.h"
+
+
+extern "C" void *
+D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer)
+{
+    SDL_Window * sdlWindow = renderer->window;
+    if ( ! renderer->window ) {
+        return NULL;
+    }
+
+    SDL_SysWMinfo sdlWindowInfo;
+    SDL_VERSION(&sdlWindowInfo.version);
+    if ( ! SDL_GetWindowWMInfo(sdlWindow, &sdlWindowInfo) ) {
+        return NULL;
+    }
+
+    if (sdlWindowInfo.subsystem != SDL_SYSWM_WINRT) {
+        return NULL;
+    }
+
+    if (!sdlWindowInfo.info.winrt.window) {
+        return NULL;
+    }
+
+    ABI::Windows::UI::Core::ICoreWindow *coreWindow = NULL;
+    if (FAILED(sdlWindowInfo.info.winrt.window->QueryInterface(&coreWindow))) {
+        return NULL;
+    }
+
+    IUnknown *coreWindowAsIUnknown = NULL;
+    coreWindow->QueryInterface(&coreWindowAsIUnknown);
+    coreWindow->Release();
+
+    return coreWindowAsIUnknown;
+}
+
+extern "C" DXGI_MODE_ROTATION
+D3D11_GetCurrentRotation()
+{
+#if NTDDI_VERSION > NTDDI_WIN8
+    const DisplayOrientations currentOrientation = DisplayInformation::GetForCurrentView()->CurrentOrientation;
+#else
+    const DisplayOrientations currentOrientation = DisplayProperties::CurrentOrientation;
+#endif
+
+    switch (currentOrientation) {
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    /* Windows Phone rotations */
+    case DisplayOrientations::Landscape:
+        return DXGI_MODE_ROTATION_ROTATE90;
+    case DisplayOrientations::Portrait:
+        return DXGI_MODE_ROTATION_IDENTITY;
+    case DisplayOrientations::LandscapeFlipped:
+        return DXGI_MODE_ROTATION_ROTATE270;
+    case DisplayOrientations::PortraitFlipped:
+        return DXGI_MODE_ROTATION_ROTATE180;
+#else
+    /* Non-Windows-Phone rotations (ex: Windows 8, Windows RT) */
+    case DisplayOrientations::Landscape:
+        return DXGI_MODE_ROTATION_IDENTITY;
+    case DisplayOrientations::Portrait:
+        return DXGI_MODE_ROTATION_ROTATE270;
+    case DisplayOrientations::LandscapeFlipped:
+        return DXGI_MODE_ROTATION_ROTATE180;
+    case DisplayOrientations::PortraitFlipped:
+        return DXGI_MODE_ROTATION_ROTATE90;
+#endif /* WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP */
+    }
+
+    return DXGI_MODE_ROTATION_IDENTITY;
+}
+
+
+#endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/direct3d11/SDL_render_winrt.h b/Source/3rd Party/sdl/src/render/direct3d11/SDL_render_winrt.h
new file mode 100644
index 000000000..66a3220d8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/direct3d11/SDL_render_winrt.h	
@@ -0,0 +1,40 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED
+
+#include "SDL_render.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void * D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer);
+DXGI_MODE_ROTATION D3D11_GetCurrentRotation();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/mmx.h b/Source/3rd Party/sdl/src/render/mmx.h
new file mode 100644
index 000000000..3bd00ac23
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/mmx.h	
@@ -0,0 +1,642 @@
+/*	mmx.h
+
+	MultiMedia eXtensions GCC interface library for IA32.
+
+	To use this library, simply include this header file
+	and compile with GCC.  You MUST have inlining enabled
+	in order for mmx_ok() to work; this can be done by
+	simply using -O on the GCC command line.
+
+	Compiling with -DMMX_TRACE will cause detailed trace
+	output to be sent to stderr for each mmx operation.
+	This adds lots of code, and obviously slows execution to
+	a crawl, but can be very useful for debugging.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY
+	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
+	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR ANY PARTICULAR PURPOSE.
+
+	1997-99 by H. Dietz and R. Fisher
+
+ Notes:
+	It appears that the latest gas has the pand problem fixed, therefore
+	  I'll undefine BROKEN_PAND by default.
+*/
+
+#ifndef _MMX_H
+#define _MMX_H
+
+
+/*	Warning:  at this writing, the version of GAS packaged
+	with most Linux distributions does not handle the
+	parallel AND operation mnemonic correctly.  If the
+	symbol BROKEN_PAND is defined, a slower alternative
+	coding will be used.  If execution of mmxtest results
+	in an illegal instruction fault, define this symbol.
+*/
+#undef	BROKEN_PAND
+
+
+/*	The type of an value that fits in an MMX register
+	(note that long long constant values MUST be suffixed
+	 by LL and unsigned long long values by ULL, lest
+	 they be truncated by the compiler)
+*/
+typedef union
+{
+    long long q;                /* Quadword (64-bit) value */
+    unsigned long long uq;      /* Unsigned Quadword */
+    int d[2];                   /* 2 Doubleword (32-bit) values */
+    unsigned int ud[2];         /* 2 Unsigned Doubleword */
+    short w[4];                 /* 4 Word (16-bit) values */
+    unsigned short uw[4];       /* 4 Unsigned Word */
+    char b[8];                  /* 8 Byte (8-bit) values */
+    unsigned char ub[8];        /* 8 Unsigned Byte */
+    float s[2];                 /* Single-precision (32-bit) value */
+} __attribute__ ((aligned(8))) mmx_t;   /* On an 8-byte (64-bit) boundary */
+
+
+#if 0
+/*	Function to test if multimedia instructions are supported...
+*/
+inline extern int
+mm_support(void)
+{
+    /* Returns 1 if MMX instructions are supported,
+       3 if Cyrix MMX and Extended MMX instructions are supported
+       5 if AMD MMX and 3DNow! instructions are supported
+       0 if hardware does not support any of these
+     */
+    register int rval = 0;
+
+    __asm__ __volatile__(
+                            /* See if CPUID instruction is supported ... */
+                            /* ... Get copies of EFLAGS into eax and ecx */
+                            "pushf\n\t"
+                            "popl %%eax\n\t" "movl %%eax, %%ecx\n\t"
+                            /* ... Toggle the ID bit in one copy and store */
+                            /*     to the EFLAGS reg */
+                            "xorl $0x200000, %%eax\n\t"
+                            "push %%eax\n\t" "popf\n\t"
+                            /* ... Get the (hopefully modified) EFLAGS */
+                            "pushf\n\t" "popl %%eax\n\t"
+                            /* ... Compare and test result */
+                            "xorl %%eax, %%ecx\n\t" "testl $0x200000, %%ecx\n\t" "jz NotSupported1\n\t" /* CPUID not supported */
+                            /* Get standard CPUID information, and
+                               go to a specific vendor section */
+                            "movl $0, %%eax\n\t" "cpuid\n\t"
+                            /* Check for Intel */
+                            "cmpl $0x756e6547, %%ebx\n\t"
+                            "jne TryAMD\n\t"
+                            "cmpl $0x49656e69, %%edx\n\t"
+                            "jne TryAMD\n\t"
+                            "cmpl $0x6c65746e, %%ecx\n"
+                            "jne TryAMD\n\t" "jmp Intel\n\t"
+                            /* Check for AMD */
+                            "\nTryAMD:\n\t"
+                            "cmpl $0x68747541, %%ebx\n\t"
+                            "jne TryCyrix\n\t"
+                            "cmpl $0x69746e65, %%edx\n\t"
+                            "jne TryCyrix\n\t"
+                            "cmpl $0x444d4163, %%ecx\n"
+                            "jne TryCyrix\n\t" "jmp AMD\n\t"
+                            /* Check for Cyrix */
+                            "\nTryCyrix:\n\t"
+                            "cmpl $0x69727943, %%ebx\n\t"
+                            "jne NotSupported2\n\t"
+                            "cmpl $0x736e4978, %%edx\n\t"
+                            "jne NotSupported3\n\t"
+                            "cmpl $0x64616574, %%ecx\n\t"
+                            "jne NotSupported4\n\t"
+                            /* Drop through to Cyrix... */
+                            /* Cyrix Section */
+                            /* See if extended CPUID level 80000001 is supported */
+                            /* The value of CPUID/80000001 for the 6x86MX is undefined
+                               according to the Cyrix CPU Detection Guide (Preliminary
+                               Rev. 1.01 table 1), so we'll check the value of eax for
+                               CPUID/0 to see if standard CPUID level 2 is supported.
+                               According to the table, the only CPU which supports level
+                               2 is also the only one which supports extended CPUID levels.
+                             */
+                            "cmpl $0x2, %%eax\n\t" "jne MMXtest\n\t"    /* Use standard CPUID instead */
+                            /* Extended CPUID supported (in theory), so get extended
+                               features */
+                            "movl $0x80000001, %%eax\n\t" "cpuid\n\t" "testl $0x00800000, %%eax\n\t"    /* Test for MMX */
+                            "jz NotSupported5\n\t"      /* MMX not supported */
+                            "testl $0x01000000, %%eax\n\t"      /* Test for Ext'd MMX */
+                            "jnz EMMXSupported\n\t" "movl $1, %0:\n\n\t"        /* MMX Supported */
+                            "jmp Return\n\n" "EMMXSupported:\n\t" "movl $3, %0:\n\n\t"  /* EMMX and MMX Supported */
+                            "jmp Return\n\t"
+                            /* AMD Section */
+                            "AMD:\n\t"
+                            /* See if extended CPUID is supported */
+                            "movl $0x80000000, %%eax\n\t" "cpuid\n\t" "cmpl $0x80000000, %%eax\n\t" "jl MMXtest\n\t"    /* Use standard CPUID instead */
+                            /* Extended CPUID supported, so get extended features */
+                            "movl $0x80000001, %%eax\n\t" "cpuid\n\t" "testl $0x00800000, %%edx\n\t"    /* Test for MMX */
+                            "jz NotSupported6\n\t"      /* MMX not supported */
+                            "testl $0x80000000, %%edx\n\t"      /* Test for 3DNow! */
+                            "jnz ThreeDNowSupported\n\t" "movl $1, %0:\n\n\t"   /* MMX Supported */
+                            "jmp Return\n\n" "ThreeDNowSupported:\n\t" "movl $5, %0:\n\n\t"     /* 3DNow! and MMX Supported */
+                            "jmp Return\n\t"
+                            /* Intel Section */
+                            "Intel:\n\t"
+                            /* Check for MMX */
+                            "MMXtest:\n\t" "movl $1, %%eax\n\t" "cpuid\n\t" "testl $0x00800000, %%edx\n\t"      /* Test for MMX */
+                            "jz NotSupported7\n\t"      /* MMX Not supported */
+                            "movl $1, %0:\n\n\t"        /* MMX Supported */
+                            "jmp Return\n\t"
+                            /* Nothing supported */
+                            "\nNotSupported1:\n\t" "#movl $101, %0:\n\n\t" "\nNotSupported2:\n\t" "#movl $102, %0:\n\n\t" "\nNotSupported3:\n\t" "#movl $103, %0:\n\n\t" "\nNotSupported4:\n\t" "#movl $104, %0:\n\n\t" "\nNotSupported5:\n\t" "#movl $105, %0:\n\n\t" "\nNotSupported6:\n\t" "#movl $106, %0:\n\n\t" "\nNotSupported7:\n\t" "#movl $107, %0:\n\n\t" "movl $0, %0:\n\n\t" "Return:\n\t":"=a"(rval):     /* no input */
+                            :"eax", "ebx", "ecx", "edx");
+
+    /* Return */
+    return (rval);
+}
+
+/*	Function to test if mmx instructions are supported...
+*/
+inline extern int
+mmx_ok(void)
+{
+    /* Returns 1 if MMX instructions are supported, 0 otherwise */
+    return (mm_support() & 0x1);
+}
+#endif
+
+/*	Helper functions for the instruction macros that follow...
+	(note that memory-to-register, m2r, instructions are nearly
+	 as efficient as register-to-register, r2r, instructions;
+	 however, memory-to-memory instructions are really simulated
+	 as a convenience, and are only 1/3 as efficient)
+*/
+#ifdef	MMX_TRACE
+
+/*	Include the stuff for printing a trace to stderr...
+*/
+
+#define	mmx_i2r(op, imm, reg) \
+	{ \
+		mmx_t mmx_trace; \
+		mmx_trace.uq = (imm); \
+		printf(#op "_i2r(" #imm "=0x%08x%08x, ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		printf(#reg "=0x%08x%08x) => ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		__asm__ __volatile__ (#op " %0, %%" #reg \
+				      : /* nothing */ \
+				      : "X" (imm)); \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		printf(#reg "=0x%08x%08x\n", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+	}
+
+#define	mmx_m2r(op, mem, reg) \
+	{ \
+		mmx_t mmx_trace; \
+		mmx_trace = (mem); \
+		printf(#op "_m2r(" #mem "=0x%08x%08x, ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		printf(#reg "=0x%08x%08x) => ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		__asm__ __volatile__ (#op " %0, %%" #reg \
+				      : /* nothing */ \
+				      : "X" (mem)); \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		printf(#reg "=0x%08x%08x\n", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+	}
+
+#define	mmx_r2m(op, reg, mem) \
+	{ \
+		mmx_t mmx_trace; \
+		__asm__ __volatile__ ("movq %%" #reg ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		printf(#op "_r2m(" #reg "=0x%08x%08x, ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		mmx_trace = (mem); \
+		printf(#mem "=0x%08x%08x) => ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		__asm__ __volatile__ (#op " %%" #reg ", %0" \
+				      : "=X" (mem) \
+				      : /* nothing */ ); \
+		mmx_trace = (mem); \
+		printf(#mem "=0x%08x%08x\n", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+	}
+
+#define	mmx_r2r(op, regs, regd) \
+	{ \
+		mmx_t mmx_trace; \
+		__asm__ __volatile__ ("movq %%" #regs ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		printf(#op "_r2r(" #regs "=0x%08x%08x, ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		__asm__ __volatile__ ("movq %%" #regd ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		printf(#regd "=0x%08x%08x) => ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		__asm__ __volatile__ (#op " %" #regs ", %" #regd); \
+		__asm__ __volatile__ ("movq %%" #regd ", %0" \
+				      : "=X" (mmx_trace) \
+				      : /* nothing */ ); \
+		printf(#regd "=0x%08x%08x\n", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+	}
+
+#define	mmx_m2m(op, mems, memd) \
+	{ \
+		mmx_t mmx_trace; \
+		mmx_trace = (mems); \
+		printf(#op "_m2m(" #mems "=0x%08x%08x, ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		mmx_trace = (memd); \
+		printf(#memd "=0x%08x%08x) => ", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+		__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
+				      #op " %1, %%mm0\n\t" \
+				      "movq %%mm0, %0" \
+				      : "=X" (memd) \
+				      : "X" (mems)); \
+		mmx_trace = (memd); \
+		printf(#memd "=0x%08x%08x\n", \
+			mmx_trace.d[1], mmx_trace.d[0]); \
+	}
+
+#else
+
+/*	These macros are a lot simpler without the tracing...
+*/
+
+#define	mmx_i2r(op, imm, reg) \
+	__asm__ __volatile__ (#op " %0, %%" #reg \
+			      : /* nothing */ \
+			      : "X" (imm) )
+
+#define	mmx_m2r(op, mem, reg) \
+	__asm__ __volatile__ (#op " %0, %%" #reg \
+			      : /* nothing */ \
+			      : "m" (mem))
+
+#define	mmx_r2m(op, reg, mem) \
+	__asm__ __volatile__ (#op " %%" #reg ", %0" \
+			      : "=m" (mem) \
+			      : /* nothing */ )
+
+#define	mmx_r2r(op, regs, regd) \
+	__asm__ __volatile__ (#op " %" #regs ", %" #regd)
+
+#define	mmx_m2m(op, mems, memd) \
+	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
+			      #op " %1, %%mm0\n\t" \
+			      "movq %%mm0, %0" \
+			      : "=X" (memd) \
+			      : "X" (mems))
+
+#endif
+
+
+/*	1x64 MOVe Quadword
+	(this is both a load and a store...
+	 in fact, it is the only way to store)
+*/
+#define	movq_m2r(var, reg)	mmx_m2r(movq, var, reg)
+#define	movq_r2m(reg, var)	mmx_r2m(movq, reg, var)
+#define	movq_r2r(regs, regd)	mmx_r2r(movq, regs, regd)
+#define	movq(vars, vard) \
+	__asm__ __volatile__ ("movq %1, %%mm0\n\t" \
+			      "movq %%mm0, %0" \
+			      : "=X" (vard) \
+			      : "X" (vars))
+
+
+/*	1x32 MOVe Doubleword
+	(like movq, this is both load and store...
+	 but is most useful for moving things between
+	 mmx registers and ordinary registers)
+*/
+#define	movd_m2r(var, reg)	mmx_m2r(movd, var, reg)
+#define	movd_r2m(reg, var)	mmx_r2m(movd, reg, var)
+#define	movd_r2r(regs, regd)	mmx_r2r(movd, regs, regd)
+#define	movd(vars, vard) \
+	__asm__ __volatile__ ("movd %1, %%mm0\n\t" \
+			      "movd %%mm0, %0" \
+			      : "=X" (vard) \
+			      : "X" (vars))
+
+
+/*	2x32, 4x16, and 8x8 Parallel ADDs
+*/
+#define	paddd_m2r(var, reg)	mmx_m2r(paddd, var, reg)
+#define	paddd_r2r(regs, regd)	mmx_r2r(paddd, regs, regd)
+#define	paddd(vars, vard)	mmx_m2m(paddd, vars, vard)
+
+#define	paddw_m2r(var, reg)	mmx_m2r(paddw, var, reg)
+#define	paddw_r2r(regs, regd)	mmx_r2r(paddw, regs, regd)
+#define	paddw(vars, vard)	mmx_m2m(paddw, vars, vard)
+
+#define	paddb_m2r(var, reg)	mmx_m2r(paddb, var, reg)
+#define	paddb_r2r(regs, regd)	mmx_r2r(paddb, regs, regd)
+#define	paddb(vars, vard)	mmx_m2m(paddb, vars, vard)
+
+
+/*	4x16 and 8x8 Parallel ADDs using Saturation arithmetic
+*/
+#define	paddsw_m2r(var, reg)	mmx_m2r(paddsw, var, reg)
+#define	paddsw_r2r(regs, regd)	mmx_r2r(paddsw, regs, regd)
+#define	paddsw(vars, vard)	mmx_m2m(paddsw, vars, vard)
+
+#define	paddsb_m2r(var, reg)	mmx_m2r(paddsb, var, reg)
+#define	paddsb_r2r(regs, regd)	mmx_r2r(paddsb, regs, regd)
+#define	paddsb(vars, vard)	mmx_m2m(paddsb, vars, vard)
+
+
+/*	4x16 and 8x8 Parallel ADDs using Unsigned Saturation arithmetic
+*/
+#define	paddusw_m2r(var, reg)	mmx_m2r(paddusw, var, reg)
+#define	paddusw_r2r(regs, regd)	mmx_r2r(paddusw, regs, regd)
+#define	paddusw(vars, vard)	mmx_m2m(paddusw, vars, vard)
+
+#define	paddusb_m2r(var, reg)	mmx_m2r(paddusb, var, reg)
+#define	paddusb_r2r(regs, regd)	mmx_r2r(paddusb, regs, regd)
+#define	paddusb(vars, vard)	mmx_m2m(paddusb, vars, vard)
+
+
+/*	2x32, 4x16, and 8x8 Parallel SUBs
+*/
+#define	psubd_m2r(var, reg)	mmx_m2r(psubd, var, reg)
+#define	psubd_r2r(regs, regd)	mmx_r2r(psubd, regs, regd)
+#define	psubd(vars, vard)	mmx_m2m(psubd, vars, vard)
+
+#define	psubw_m2r(var, reg)	mmx_m2r(psubw, var, reg)
+#define	psubw_r2r(regs, regd)	mmx_r2r(psubw, regs, regd)
+#define	psubw(vars, vard)	mmx_m2m(psubw, vars, vard)
+
+#define	psubb_m2r(var, reg)	mmx_m2r(psubb, var, reg)
+#define	psubb_r2r(regs, regd)	mmx_r2r(psubb, regs, regd)
+#define	psubb(vars, vard)	mmx_m2m(psubb, vars, vard)
+
+
+/*	4x16 and 8x8 Parallel SUBs using Saturation arithmetic
+*/
+#define	psubsw_m2r(var, reg)	mmx_m2r(psubsw, var, reg)
+#define	psubsw_r2r(regs, regd)	mmx_r2r(psubsw, regs, regd)
+#define	psubsw(vars, vard)	mmx_m2m(psubsw, vars, vard)
+
+#define	psubsb_m2r(var, reg)	mmx_m2r(psubsb, var, reg)
+#define	psubsb_r2r(regs, regd)	mmx_r2r(psubsb, regs, regd)
+#define	psubsb(vars, vard)	mmx_m2m(psubsb, vars, vard)
+
+
+/*	4x16 and 8x8 Parallel SUBs using Unsigned Saturation arithmetic
+*/
+#define	psubusw_m2r(var, reg)	mmx_m2r(psubusw, var, reg)
+#define	psubusw_r2r(regs, regd)	mmx_r2r(psubusw, regs, regd)
+#define	psubusw(vars, vard)	mmx_m2m(psubusw, vars, vard)
+
+#define	psubusb_m2r(var, reg)	mmx_m2r(psubusb, var, reg)
+#define	psubusb_r2r(regs, regd)	mmx_r2r(psubusb, regs, regd)
+#define	psubusb(vars, vard)	mmx_m2m(psubusb, vars, vard)
+
+
+/*	4x16 Parallel MULs giving Low 4x16 portions of results
+*/
+#define	pmullw_m2r(var, reg)	mmx_m2r(pmullw, var, reg)
+#define	pmullw_r2r(regs, regd)	mmx_r2r(pmullw, regs, regd)
+#define	pmullw(vars, vard)	mmx_m2m(pmullw, vars, vard)
+
+
+/*	4x16 Parallel MULs giving High 4x16 portions of results
+*/
+#define	pmulhw_m2r(var, reg)	mmx_m2r(pmulhw, var, reg)
+#define	pmulhw_r2r(regs, regd)	mmx_r2r(pmulhw, regs, regd)
+#define	pmulhw(vars, vard)	mmx_m2m(pmulhw, vars, vard)
+
+
+/*	4x16->2x32 Parallel Mul-ADD
+	(muls like pmullw, then adds adjacent 16-bit fields
+	 in the multiply result to make the final 2x32 result)
+*/
+#define	pmaddwd_m2r(var, reg)	mmx_m2r(pmaddwd, var, reg)
+#define	pmaddwd_r2r(regs, regd)	mmx_r2r(pmaddwd, regs, regd)
+#define	pmaddwd(vars, vard)	mmx_m2m(pmaddwd, vars, vard)
+
+
+/*	1x64 bitwise AND
+*/
+#ifdef	BROKEN_PAND
+#define	pand_m2r(var, reg) \
+	{ \
+		mmx_m2r(pandn, (mmx_t) -1LL, reg); \
+		mmx_m2r(pandn, var, reg); \
+	}
+#define	pand_r2r(regs, regd) \
+	{ \
+		mmx_m2r(pandn, (mmx_t) -1LL, regd); \
+		mmx_r2r(pandn, regs, regd) \
+	}
+#define	pand(vars, vard) \
+	{ \
+		movq_m2r(vard, mm0); \
+		mmx_m2r(pandn, (mmx_t) -1LL, mm0); \
+		mmx_m2r(pandn, vars, mm0); \
+		movq_r2m(mm0, vard); \
+	}
+#else
+#define	pand_m2r(var, reg)	mmx_m2r(pand, var, reg)
+#define	pand_r2r(regs, regd)	mmx_r2r(pand, regs, regd)
+#define	pand(vars, vard)	mmx_m2m(pand, vars, vard)
+#endif
+
+
+/*	1x64 bitwise AND with Not the destination
+*/
+#define	pandn_m2r(var, reg)	mmx_m2r(pandn, var, reg)
+#define	pandn_r2r(regs, regd)	mmx_r2r(pandn, regs, regd)
+#define	pandn(vars, vard)	mmx_m2m(pandn, vars, vard)
+
+
+/*	1x64 bitwise OR
+*/
+#define	por_m2r(var, reg)	mmx_m2r(por, var, reg)
+#define	por_r2r(regs, regd)	mmx_r2r(por, regs, regd)
+#define	por(vars, vard)	mmx_m2m(por, vars, vard)
+
+
+/*	1x64 bitwise eXclusive OR
+*/
+#define	pxor_m2r(var, reg)	mmx_m2r(pxor, var, reg)
+#define	pxor_r2r(regs, regd)	mmx_r2r(pxor, regs, regd)
+#define	pxor(vars, vard)	mmx_m2m(pxor, vars, vard)
+
+
+/*	2x32, 4x16, and 8x8 Parallel CoMPare for EQuality
+	(resulting fields are either 0 or -1)
+*/
+#define	pcmpeqd_m2r(var, reg)	mmx_m2r(pcmpeqd, var, reg)
+#define	pcmpeqd_r2r(regs, regd)	mmx_r2r(pcmpeqd, regs, regd)
+#define	pcmpeqd(vars, vard)	mmx_m2m(pcmpeqd, vars, vard)
+
+#define	pcmpeqw_m2r(var, reg)	mmx_m2r(pcmpeqw, var, reg)
+#define	pcmpeqw_r2r(regs, regd)	mmx_r2r(pcmpeqw, regs, regd)
+#define	pcmpeqw(vars, vard)	mmx_m2m(pcmpeqw, vars, vard)
+
+#define	pcmpeqb_m2r(var, reg)	mmx_m2r(pcmpeqb, var, reg)
+#define	pcmpeqb_r2r(regs, regd)	mmx_r2r(pcmpeqb, regs, regd)
+#define	pcmpeqb(vars, vard)	mmx_m2m(pcmpeqb, vars, vard)
+
+
+/*	2x32, 4x16, and 8x8 Parallel CoMPare for Greater Than
+	(resulting fields are either 0 or -1)
+*/
+#define	pcmpgtd_m2r(var, reg)	mmx_m2r(pcmpgtd, var, reg)
+#define	pcmpgtd_r2r(regs, regd)	mmx_r2r(pcmpgtd, regs, regd)
+#define	pcmpgtd(vars, vard)	mmx_m2m(pcmpgtd, vars, vard)
+
+#define	pcmpgtw_m2r(var, reg)	mmx_m2r(pcmpgtw, var, reg)
+#define	pcmpgtw_r2r(regs, regd)	mmx_r2r(pcmpgtw, regs, regd)
+#define	pcmpgtw(vars, vard)	mmx_m2m(pcmpgtw, vars, vard)
+
+#define	pcmpgtb_m2r(var, reg)	mmx_m2r(pcmpgtb, var, reg)
+#define	pcmpgtb_r2r(regs, regd)	mmx_r2r(pcmpgtb, regs, regd)
+#define	pcmpgtb(vars, vard)	mmx_m2m(pcmpgtb, vars, vard)
+
+
+/*	1x64, 2x32, and 4x16 Parallel Shift Left Logical
+*/
+#define	psllq_i2r(imm, reg)	mmx_i2r(psllq, imm, reg)
+#define	psllq_m2r(var, reg)	mmx_m2r(psllq, var, reg)
+#define	psllq_r2r(regs, regd)	mmx_r2r(psllq, regs, regd)
+#define	psllq(vars, vard)	mmx_m2m(psllq, vars, vard)
+
+#define	pslld_i2r(imm, reg)	mmx_i2r(pslld, imm, reg)
+#define	pslld_m2r(var, reg)	mmx_m2r(pslld, var, reg)
+#define	pslld_r2r(regs, regd)	mmx_r2r(pslld, regs, regd)
+#define	pslld(vars, vard)	mmx_m2m(pslld, vars, vard)
+
+#define	psllw_i2r(imm, reg)	mmx_i2r(psllw, imm, reg)
+#define	psllw_m2r(var, reg)	mmx_m2r(psllw, var, reg)
+#define	psllw_r2r(regs, regd)	mmx_r2r(psllw, regs, regd)
+#define	psllw(vars, vard)	mmx_m2m(psllw, vars, vard)
+
+
+/*	1x64, 2x32, and 4x16 Parallel Shift Right Logical
+*/
+#define	psrlq_i2r(imm, reg)	mmx_i2r(psrlq, imm, reg)
+#define	psrlq_m2r(var, reg)	mmx_m2r(psrlq, var, reg)
+#define	psrlq_r2r(regs, regd)	mmx_r2r(psrlq, regs, regd)
+#define	psrlq(vars, vard)	mmx_m2m(psrlq, vars, vard)
+
+#define	psrld_i2r(imm, reg)	mmx_i2r(psrld, imm, reg)
+#define	psrld_m2r(var, reg)	mmx_m2r(psrld, var, reg)
+#define	psrld_r2r(regs, regd)	mmx_r2r(psrld, regs, regd)
+#define	psrld(vars, vard)	mmx_m2m(psrld, vars, vard)
+
+#define	psrlw_i2r(imm, reg)	mmx_i2r(psrlw, imm, reg)
+#define	psrlw_m2r(var, reg)	mmx_m2r(psrlw, var, reg)
+#define	psrlw_r2r(regs, regd)	mmx_r2r(psrlw, regs, regd)
+#define	psrlw(vars, vard)	mmx_m2m(psrlw, vars, vard)
+
+
+/*	2x32 and 4x16 Parallel Shift Right Arithmetic
+*/
+#define	psrad_i2r(imm, reg)	mmx_i2r(psrad, imm, reg)
+#define	psrad_m2r(var, reg)	mmx_m2r(psrad, var, reg)
+#define	psrad_r2r(regs, regd)	mmx_r2r(psrad, regs, regd)
+#define	psrad(vars, vard)	mmx_m2m(psrad, vars, vard)
+
+#define	psraw_i2r(imm, reg)	mmx_i2r(psraw, imm, reg)
+#define	psraw_m2r(var, reg)	mmx_m2r(psraw, var, reg)
+#define	psraw_r2r(regs, regd)	mmx_r2r(psraw, regs, regd)
+#define	psraw(vars, vard)	mmx_m2m(psraw, vars, vard)
+
+
+/*	2x32->4x16 and 4x16->8x8 PACK and Signed Saturate
+	(packs source and dest fields into dest in that order)
+*/
+#define	packssdw_m2r(var, reg)	mmx_m2r(packssdw, var, reg)
+#define	packssdw_r2r(regs, regd) mmx_r2r(packssdw, regs, regd)
+#define	packssdw(vars, vard)	mmx_m2m(packssdw, vars, vard)
+
+#define	packsswb_m2r(var, reg)	mmx_m2r(packsswb, var, reg)
+#define	packsswb_r2r(regs, regd) mmx_r2r(packsswb, regs, regd)
+#define	packsswb(vars, vard)	mmx_m2m(packsswb, vars, vard)
+
+
+/*	4x16->8x8 PACK and Unsigned Saturate
+	(packs source and dest fields into dest in that order)
+*/
+#define	packuswb_m2r(var, reg)	mmx_m2r(packuswb, var, reg)
+#define	packuswb_r2r(regs, regd) mmx_r2r(packuswb, regs, regd)
+#define	packuswb(vars, vard)	mmx_m2m(packuswb, vars, vard)
+
+
+/*	2x32->1x64, 4x16->2x32, and 8x8->4x16 UNPaCK Low
+	(interleaves low half of dest with low half of source
+	 as padding in each result field)
+*/
+#define	punpckldq_m2r(var, reg)	mmx_m2r(punpckldq, var, reg)
+#define	punpckldq_r2r(regs, regd) mmx_r2r(punpckldq, regs, regd)
+#define	punpckldq(vars, vard)	mmx_m2m(punpckldq, vars, vard)
+
+#define	punpcklwd_m2r(var, reg)	mmx_m2r(punpcklwd, var, reg)
+#define	punpcklwd_r2r(regs, regd) mmx_r2r(punpcklwd, regs, regd)
+#define	punpcklwd(vars, vard)	mmx_m2m(punpcklwd, vars, vard)
+
+#define	punpcklbw_m2r(var, reg)	mmx_m2r(punpcklbw, var, reg)
+#define	punpcklbw_r2r(regs, regd) mmx_r2r(punpcklbw, regs, regd)
+#define	punpcklbw(vars, vard)	mmx_m2m(punpcklbw, vars, vard)
+
+
+/*	2x32->1x64, 4x16->2x32, and 8x8->4x16 UNPaCK High
+	(interleaves high half of dest with high half of source
+	 as padding in each result field)
+*/
+#define	punpckhdq_m2r(var, reg)	mmx_m2r(punpckhdq, var, reg)
+#define	punpckhdq_r2r(regs, regd) mmx_r2r(punpckhdq, regs, regd)
+#define	punpckhdq(vars, vard)	mmx_m2m(punpckhdq, vars, vard)
+
+#define	punpckhwd_m2r(var, reg)	mmx_m2r(punpckhwd, var, reg)
+#define	punpckhwd_r2r(regs, regd) mmx_r2r(punpckhwd, regs, regd)
+#define	punpckhwd(vars, vard)	mmx_m2m(punpckhwd, vars, vard)
+
+#define	punpckhbw_m2r(var, reg)	mmx_m2r(punpckhbw, var, reg)
+#define	punpckhbw_r2r(regs, regd) mmx_r2r(punpckhbw, regs, regd)
+#define	punpckhbw(vars, vard)	mmx_m2m(punpckhbw, vars, vard)
+
+
+/*	Empty MMx State
+	(used to clean-up when going from mmx to float use
+	 of the registers that are shared by both; note that
+	 there is no float-to-mmx operation needed, because
+	 only the float tag word info is corruptible)
+*/
+#ifdef	MMX_TRACE
+
+#define	emms() \
+	{ \
+		printf("emms()\n"); \
+		__asm__ __volatile__ ("emms"); \
+	}
+
+#else
+
+#define	emms()			__asm__ __volatile__ ("emms")
+
+#endif
+
+#endif
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/opengl/SDL_glfuncs.h b/Source/3rd Party/sdl/src/render/opengl/SDL_glfuncs.h
new file mode 100644
index 000000000..fefbdd268
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengl/SDL_glfuncs.h	
@@ -0,0 +1,477 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* list of OpenGL functions sorted alphabetically
+   If you need to use a GL function from the SDL video subsystem,
+   change its entry from SDL_PROC_UNUSED to SDL_PROC and rebuild.
+*/
+#define SDL_PROC_UNUSED(ret,func,params)
+
+SDL_PROC_UNUSED(void, glAccum, (GLenum, GLfloat))
+SDL_PROC_UNUSED(void, glAlphaFunc, (GLenum, GLclampf))
+SDL_PROC_UNUSED(GLboolean, glAreTexturesResident,
+                (GLsizei, const GLuint *, GLboolean *))
+SDL_PROC_UNUSED(void, glArrayElement, (GLint))
+SDL_PROC(void, glBegin, (GLenum))
+SDL_PROC(void, glBindTexture, (GLenum, GLuint))
+SDL_PROC_UNUSED(void, glBitmap,
+                (GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat,
+                 const GLubyte *))
+SDL_PROC(void, glBlendFunc, (GLenum, GLenum))
+SDL_PROC(void, glBlendFuncSeparate, (GLenum, GLenum, GLenum, GLenum))
+SDL_PROC_UNUSED(void, glCallList, (GLuint))
+SDL_PROC_UNUSED(void, glCallLists, (GLsizei, GLenum, const GLvoid *))
+SDL_PROC(void, glClear, (GLbitfield))
+SDL_PROC_UNUSED(void, glClearAccum, (GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC(void, glClearColor, (GLclampf, GLclampf, GLclampf, GLclampf))
+SDL_PROC_UNUSED(void, glClearDepth, (GLclampd))
+SDL_PROC_UNUSED(void, glClearIndex, (GLfloat))
+SDL_PROC_UNUSED(void, glClearStencil, (GLint))
+SDL_PROC_UNUSED(void, glClipPlane, (GLenum, const GLdouble *))
+SDL_PROC_UNUSED(void, glColor3b, (GLbyte, GLbyte, GLbyte))
+SDL_PROC_UNUSED(void, glColor3bv, (const GLbyte *))
+SDL_PROC_UNUSED(void, glColor3d, (GLdouble, GLdouble, GLdouble))
+SDL_PROC_UNUSED(void, glColor3dv, (const GLdouble *))
+SDL_PROC_UNUSED(void, glColor3f, (GLfloat, GLfloat, GLfloat))
+SDL_PROC(void, glColor3fv, (const GLfloat *))
+SDL_PROC_UNUSED(void, glColor3i, (GLint, GLint, GLint))
+SDL_PROC_UNUSED(void, glColor3iv, (const GLint *))
+SDL_PROC_UNUSED(void, glColor3s, (GLshort, GLshort, GLshort))
+SDL_PROC_UNUSED(void, glColor3sv, (const GLshort *))
+SDL_PROC_UNUSED(void, glColor3ub, (GLubyte, GLubyte, GLubyte))
+SDL_PROC_UNUSED(void, glColor3ubv, (const GLubyte *))
+SDL_PROC_UNUSED(void, glColor3ui, (GLuint, GLuint, GLuint))
+SDL_PROC_UNUSED(void, glColor3uiv, (const GLuint *))
+SDL_PROC_UNUSED(void, glColor3us, (GLushort, GLushort, GLushort))
+SDL_PROC_UNUSED(void, glColor3usv, (const GLushort *))
+SDL_PROC_UNUSED(void, glColor4b, (GLbyte, GLbyte, GLbyte, GLbyte))
+SDL_PROC_UNUSED(void, glColor4bv, (const GLbyte *))
+SDL_PROC_UNUSED(void, glColor4d, (GLdouble, GLdouble, GLdouble, GLdouble))
+SDL_PROC_UNUSED(void, glColor4dv, (const GLdouble *))
+SDL_PROC(void, glColor4f, (GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC_UNUSED(void, glColor4fv, (const GLfloat *))
+SDL_PROC_UNUSED(void, glColor4i, (GLint, GLint, GLint, GLint))
+SDL_PROC_UNUSED(void, glColor4iv, (const GLint *))
+SDL_PROC_UNUSED(void, glColor4s, (GLshort, GLshort, GLshort, GLshort))
+SDL_PROC_UNUSED(void, glColor4sv, (const GLshort *))
+SDL_PROC_UNUSED(void, glColor4ub,
+                (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha))
+SDL_PROC_UNUSED(void, glColor4ubv, (const GLubyte * v))
+SDL_PROC_UNUSED(void, glColor4ui,
+                (GLuint red, GLuint green, GLuint blue, GLuint alpha))
+SDL_PROC_UNUSED(void, glColor4uiv, (const GLuint * v))
+SDL_PROC_UNUSED(void, glColor4us,
+                (GLushort red, GLushort green, GLushort blue, GLushort alpha))
+SDL_PROC_UNUSED(void, glColor4usv, (const GLushort * v))
+SDL_PROC_UNUSED(void, glColorMask,
+                (GLboolean red, GLboolean green, GLboolean blue,
+                 GLboolean alpha))
+SDL_PROC_UNUSED(void, glColorMaterial, (GLenum face, GLenum mode))
+SDL_PROC_UNUSED(void, glColorPointer,
+                (GLint size, GLenum type, GLsizei stride,
+                 const GLvoid * pointer))
+SDL_PROC_UNUSED(void, glCopyPixels,
+                (GLint x, GLint y, GLsizei width, GLsizei height,
+                 GLenum type))
+SDL_PROC_UNUSED(void, glCopyTexImage1D,
+                (GLenum target, GLint level, GLenum internalFormat, GLint x,
+                 GLint y, GLsizei width, GLint border))
+SDL_PROC_UNUSED(void, glCopyTexImage2D,
+                (GLenum target, GLint level, GLenum internalFormat, GLint x,
+                 GLint y, GLsizei width, GLsizei height, GLint border))
+SDL_PROC_UNUSED(void, glCopyTexSubImage1D,
+                (GLenum target, GLint level, GLint xoffset, GLint x, GLint y,
+                 GLsizei width))
+SDL_PROC_UNUSED(void, glCopyTexSubImage2D,
+                (GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                 GLint x, GLint y, GLsizei width, GLsizei height))
+SDL_PROC_UNUSED(void, glCullFace, (GLenum mode))
+SDL_PROC_UNUSED(void, glDeleteLists, (GLuint list, GLsizei range))
+SDL_PROC(void, glDeleteTextures, (GLsizei n, const GLuint * textures))
+SDL_PROC(void, glDepthFunc, (GLenum func))
+SDL_PROC_UNUSED(void, glDepthMask, (GLboolean flag))
+SDL_PROC_UNUSED(void, glDepthRange, (GLclampd zNear, GLclampd zFar))
+SDL_PROC(void, glDisable, (GLenum cap))
+SDL_PROC_UNUSED(void, glDisableClientState, (GLenum array))
+SDL_PROC_UNUSED(void, glDrawArrays, (GLenum mode, GLint first, GLsizei count))
+SDL_PROC_UNUSED(void, glDrawBuffer, (GLenum mode))
+SDL_PROC_UNUSED(void, glDrawElements,
+                (GLenum mode, GLsizei count, GLenum type,
+                 const GLvoid * indices))
+SDL_PROC(void, glDrawPixels,
+         (GLsizei width, GLsizei height, GLenum format, GLenum type,
+          const GLvoid * pixels))
+SDL_PROC_UNUSED(void, glEdgeFlag, (GLboolean flag))
+SDL_PROC_UNUSED(void, glEdgeFlagPointer,
+                (GLsizei stride, const GLvoid * pointer))
+SDL_PROC_UNUSED(void, glEdgeFlagv, (const GLboolean * flag))
+SDL_PROC(void, glEnable, (GLenum cap))
+SDL_PROC_UNUSED(void, glEnableClientState, (GLenum array))
+SDL_PROC(void, glEnd, (void))
+SDL_PROC_UNUSED(void, glEndList, (void))
+SDL_PROC_UNUSED(void, glEvalCoord1d, (GLdouble u))
+SDL_PROC_UNUSED(void, glEvalCoord1dv, (const GLdouble * u))
+SDL_PROC_UNUSED(void, glEvalCoord1f, (GLfloat u))
+SDL_PROC_UNUSED(void, glEvalCoord1fv, (const GLfloat * u))
+SDL_PROC_UNUSED(void, glEvalCoord2d, (GLdouble u, GLdouble v))
+SDL_PROC_UNUSED(void, glEvalCoord2dv, (const GLdouble * u))
+SDL_PROC_UNUSED(void, glEvalCoord2f, (GLfloat u, GLfloat v))
+SDL_PROC_UNUSED(void, glEvalCoord2fv, (const GLfloat * u))
+SDL_PROC_UNUSED(void, glEvalMesh1, (GLenum mode, GLint i1, GLint i2))
+SDL_PROC_UNUSED(void, glEvalMesh2,
+                (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2))
+SDL_PROC_UNUSED(void, glEvalPoint1, (GLint i))
+SDL_PROC_UNUSED(void, glEvalPoint2, (GLint i, GLint j))
+SDL_PROC_UNUSED(void, glFeedbackBuffer,
+                (GLsizei size, GLenum type, GLfloat * buffer))
+SDL_PROC_UNUSED(void, glFinish, (void))
+SDL_PROC_UNUSED(void, glFlush, (void))
+SDL_PROC_UNUSED(void, glFogf, (GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glFogfv, (GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glFogi, (GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glFogiv, (GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glFrontFace, (GLenum mode))
+SDL_PROC_UNUSED(void, glFrustum,
+                (GLdouble left, GLdouble right, GLdouble bottom,
+                 GLdouble top, GLdouble zNear, GLdouble zFar))
+SDL_PROC_UNUSED(GLuint, glGenLists, (GLsizei range))
+SDL_PROC(void, glGenTextures, (GLsizei n, GLuint * textures))
+SDL_PROC_UNUSED(void, glGetBooleanv, (GLenum pname, GLboolean * params))
+SDL_PROC_UNUSED(void, glGetClipPlane, (GLenum plane, GLdouble * equation))
+SDL_PROC_UNUSED(void, glGetDoublev, (GLenum pname, GLdouble * params))
+SDL_PROC(GLenum, glGetError, (void))
+SDL_PROC_UNUSED(void, glGetFloatv, (GLenum pname, GLfloat * params))
+SDL_PROC(void, glGetIntegerv, (GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetLightfv,
+                (GLenum light, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetLightiv,
+                (GLenum light, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetMapdv, (GLenum target, GLenum query, GLdouble * v))
+SDL_PROC_UNUSED(void, glGetMapfv, (GLenum target, GLenum query, GLfloat * v))
+SDL_PROC_UNUSED(void, glGetMapiv, (GLenum target, GLenum query, GLint * v))
+SDL_PROC_UNUSED(void, glGetMaterialfv,
+                (GLenum face, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetMaterialiv,
+                (GLenum face, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetPixelMapfv, (GLenum map, GLfloat * values))
+SDL_PROC_UNUSED(void, glGetPixelMapuiv, (GLenum map, GLuint * values))
+SDL_PROC_UNUSED(void, glGetPixelMapusv, (GLenum map, GLushort * values))
+SDL_PROC(void, glGetPointerv, (GLenum pname, GLvoid * *params))
+SDL_PROC_UNUSED(void, glGetPolygonStipple, (GLubyte * mask))
+SDL_PROC(const GLubyte *, glGetString, (GLenum name))
+SDL_PROC_UNUSED(void, glGetTexEnvfv,
+                (GLenum target, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetTexEnviv,
+                (GLenum target, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetTexGendv,
+                (GLenum coord, GLenum pname, GLdouble * params))
+SDL_PROC_UNUSED(void, glGetTexGenfv,
+                (GLenum coord, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetTexGeniv,
+                (GLenum coord, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetTexImage,
+                (GLenum target, GLint level, GLenum format, GLenum type,
+                 GLvoid * pixels))
+SDL_PROC_UNUSED(void, glGetTexLevelParameterfv,
+                (GLenum target, GLint level, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetTexLevelParameteriv,
+                (GLenum target, GLint level, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glGetTexParameterfv,
+                (GLenum target, GLenum pname, GLfloat * params))
+SDL_PROC_UNUSED(void, glGetTexParameteriv,
+                (GLenum target, GLenum pname, GLint * params))
+SDL_PROC_UNUSED(void, glHint, (GLenum target, GLenum mode))
+SDL_PROC_UNUSED(void, glIndexMask, (GLuint mask))
+SDL_PROC_UNUSED(void, glIndexPointer,
+                (GLenum type, GLsizei stride, const GLvoid * pointer))
+SDL_PROC_UNUSED(void, glIndexd, (GLdouble c))
+SDL_PROC_UNUSED(void, glIndexdv, (const GLdouble * c))
+SDL_PROC_UNUSED(void, glIndexf, (GLfloat c))
+SDL_PROC_UNUSED(void, glIndexfv, (const GLfloat * c))
+SDL_PROC_UNUSED(void, glIndexi, (GLint c))
+SDL_PROC_UNUSED(void, glIndexiv, (const GLint * c))
+SDL_PROC_UNUSED(void, glIndexs, (GLshort c))
+SDL_PROC_UNUSED(void, glIndexsv, (const GLshort * c))
+SDL_PROC_UNUSED(void, glIndexub, (GLubyte c))
+SDL_PROC_UNUSED(void, glIndexubv, (const GLubyte * c))
+SDL_PROC_UNUSED(void, glInitNames, (void))
+SDL_PROC_UNUSED(void, glInterleavedArrays,
+                (GLenum format, GLsizei stride, const GLvoid * pointer))
+SDL_PROC_UNUSED(GLboolean, glIsEnabled, (GLenum cap))
+SDL_PROC_UNUSED(GLboolean, glIsList, (GLuint list))
+SDL_PROC_UNUSED(GLboolean, glIsTexture, (GLuint texture))
+SDL_PROC_UNUSED(void, glLightModelf, (GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glLightModelfv, (GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glLightModeli, (GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glLightModeliv, (GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glLightf, (GLenum light, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glLightfv,
+                (GLenum light, GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glLighti, (GLenum light, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glLightiv,
+                (GLenum light, GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glLineStipple, (GLint factor, GLushort pattern))
+SDL_PROC(void, glLineWidth, (GLfloat width))
+SDL_PROC_UNUSED(void, glListBase, (GLuint base))
+SDL_PROC(void, glLoadIdentity, (void))
+SDL_PROC_UNUSED(void, glLoadMatrixd, (const GLdouble * m))
+SDL_PROC_UNUSED(void, glLoadMatrixf, (const GLfloat * m))
+SDL_PROC_UNUSED(void, glLoadName, (GLuint name))
+SDL_PROC_UNUSED(void, glLogicOp, (GLenum opcode))
+SDL_PROC_UNUSED(void, glMap1d,
+                (GLenum target, GLdouble u1, GLdouble u2, GLint stride,
+                 GLint order, const GLdouble * points))
+SDL_PROC_UNUSED(void, glMap1f,
+                (GLenum target, GLfloat u1, GLfloat u2, GLint stride,
+                 GLint order, const GLfloat * points))
+SDL_PROC_UNUSED(void, glMap2d,
+                (GLenum target, GLdouble u1, GLdouble u2, GLint ustride,
+                 GLint uorder, GLdouble v1, GLdouble v2, GLint vstride,
+                 GLint vorder, const GLdouble * points))
+SDL_PROC_UNUSED(void, glMap2f,
+                (GLenum target, GLfloat u1, GLfloat u2, GLint ustride,
+                 GLint uorder, GLfloat v1, GLfloat v2, GLint vstride,
+                 GLint vorder, const GLfloat * points))
+SDL_PROC_UNUSED(void, glMapGrid1d, (GLint un, GLdouble u1, GLdouble u2))
+SDL_PROC_UNUSED(void, glMapGrid1f, (GLint un, GLfloat u1, GLfloat u2))
+SDL_PROC_UNUSED(void, glMapGrid2d,
+                (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1,
+                 GLdouble v2))
+SDL_PROC_UNUSED(void, glMapGrid2f,
+                (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1,
+                 GLfloat v2))
+SDL_PROC_UNUSED(void, glMaterialf, (GLenum face, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glMaterialfv,
+                (GLenum face, GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glMateriali, (GLenum face, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glMaterialiv,
+                (GLenum face, GLenum pname, const GLint * params))
+SDL_PROC(void, glMatrixMode, (GLenum mode))
+SDL_PROC_UNUSED(void, glMultMatrixd, (const GLdouble * m))
+SDL_PROC_UNUSED(void, glMultMatrixf, (const GLfloat * m))
+SDL_PROC_UNUSED(void, glNewList, (GLuint list, GLenum mode))
+SDL_PROC_UNUSED(void, glNormal3b, (GLbyte nx, GLbyte ny, GLbyte nz))
+SDL_PROC_UNUSED(void, glNormal3bv, (const GLbyte * v))
+SDL_PROC_UNUSED(void, glNormal3d, (GLdouble nx, GLdouble ny, GLdouble nz))
+SDL_PROC_UNUSED(void, glNormal3dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glNormal3f, (GLfloat nx, GLfloat ny, GLfloat nz))
+SDL_PROC_UNUSED(void, glNormal3fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glNormal3i, (GLint nx, GLint ny, GLint nz))
+SDL_PROC_UNUSED(void, glNormal3iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glNormal3s, (GLshort nx, GLshort ny, GLshort nz))
+SDL_PROC_UNUSED(void, glNormal3sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glNormalPointer,
+                (GLenum type, GLsizei stride, const GLvoid * pointer))
+SDL_PROC(void, glOrtho,
+         (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top,
+          GLdouble zNear, GLdouble zFar))
+SDL_PROC_UNUSED(void, glPassThrough, (GLfloat token))
+SDL_PROC_UNUSED(void, glPixelMapfv,
+                (GLenum map, GLsizei mapsize, const GLfloat * values))
+SDL_PROC_UNUSED(void, glPixelMapuiv,
+                (GLenum map, GLsizei mapsize, const GLuint * values))
+SDL_PROC_UNUSED(void, glPixelMapusv,
+                (GLenum map, GLsizei mapsize, const GLushort * values))
+SDL_PROC_UNUSED(void, glPixelStoref, (GLenum pname, GLfloat param))
+SDL_PROC(void, glPixelStorei, (GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glPixelTransferf, (GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glPixelTransferi, (GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glPixelZoom, (GLfloat xfactor, GLfloat yfactor))
+SDL_PROC(void, glPointSize, (GLfloat size))
+SDL_PROC_UNUSED(void, glPolygonMode, (GLenum face, GLenum mode))
+SDL_PROC_UNUSED(void, glPolygonOffset, (GLfloat factor, GLfloat units))
+SDL_PROC_UNUSED(void, glPolygonStipple, (const GLubyte * mask))
+SDL_PROC_UNUSED(void, glPopAttrib, (void))
+SDL_PROC_UNUSED(void, glPopClientAttrib, (void))
+SDL_PROC(void, glPopMatrix, (void))
+SDL_PROC_UNUSED(void, glPopName, (void))
+SDL_PROC_UNUSED(void, glPrioritizeTextures,
+                (GLsizei n, const GLuint * textures,
+                 const GLclampf * priorities))
+SDL_PROC_UNUSED(void, glPushAttrib, (GLbitfield mask))
+SDL_PROC_UNUSED(void, glPushClientAttrib, (GLbitfield mask))
+SDL_PROC(void, glPushMatrix, (void))
+SDL_PROC_UNUSED(void, glPushName, (GLuint name))
+SDL_PROC_UNUSED(void, glRasterPos2d, (GLdouble x, GLdouble y))
+SDL_PROC_UNUSED(void, glRasterPos2dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glRasterPos2f, (GLfloat x, GLfloat y))
+SDL_PROC_UNUSED(void, glRasterPos2fv, (const GLfloat * v))
+SDL_PROC(void, glRasterPos2i, (GLint x, GLint y))
+SDL_PROC_UNUSED(void, glRasterPos2iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glRasterPos2s, (GLshort x, GLshort y))
+SDL_PROC_UNUSED(void, glRasterPos2sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glRasterPos3d, (GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC_UNUSED(void, glRasterPos3dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glRasterPos3f, (GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC_UNUSED(void, glRasterPos3fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glRasterPos3i, (GLint x, GLint y, GLint z))
+SDL_PROC_UNUSED(void, glRasterPos3iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glRasterPos3s, (GLshort x, GLshort y, GLshort z))
+SDL_PROC_UNUSED(void, glRasterPos3sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glRasterPos4d,
+                (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
+SDL_PROC_UNUSED(void, glRasterPos4dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glRasterPos4f,
+                (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
+SDL_PROC_UNUSED(void, glRasterPos4fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glRasterPos4i, (GLint x, GLint y, GLint z, GLint w))
+SDL_PROC_UNUSED(void, glRasterPos4iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glRasterPos4s,
+                (GLshort x, GLshort y, GLshort z, GLshort w))
+SDL_PROC_UNUSED(void, glRasterPos4sv, (const GLshort * v))
+SDL_PROC(void, glReadBuffer, (GLenum mode))
+SDL_PROC(void, glReadPixels,
+         (GLint x, GLint y, GLsizei width, GLsizei height,
+          GLenum format, GLenum type, GLvoid * pixels))
+SDL_PROC_UNUSED(void, glRectd,
+                (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2))
+SDL_PROC_UNUSED(void, glRectdv, (const GLdouble * v1, const GLdouble * v2))
+SDL_PROC(void, glRectf,
+                (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2))
+SDL_PROC_UNUSED(void, glRectfv, (const GLfloat * v1, const GLfloat * v2))
+SDL_PROC_UNUSED(void, glRecti, (GLint x1, GLint y1, GLint x2, GLint y2))
+SDL_PROC_UNUSED(void, glRectiv, (const GLint * v1, const GLint * v2))
+SDL_PROC_UNUSED(void, glRects,
+                (GLshort x1, GLshort y1, GLshort x2, GLshort y2))
+SDL_PROC_UNUSED(void, glRectsv, (const GLshort * v1, const GLshort * v2))
+SDL_PROC_UNUSED(GLint, glRenderMode, (GLenum mode))
+SDL_PROC(void, glRotated,
+                (GLdouble angle, GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC(void, glRotatef,
+                (GLfloat angle, GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC_UNUSED(void, glScaled, (GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC_UNUSED(void, glScalef, (GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC(void, glScissor, (GLint x, GLint y, GLsizei width, GLsizei height))
+SDL_PROC_UNUSED(void, glSelectBuffer, (GLsizei size, GLuint * buffer))
+SDL_PROC(void, glShadeModel, (GLenum mode))
+SDL_PROC_UNUSED(void, glStencilFunc, (GLenum func, GLint ref, GLuint mask))
+SDL_PROC_UNUSED(void, glStencilMask, (GLuint mask))
+SDL_PROC_UNUSED(void, glStencilOp, (GLenum fail, GLenum zfail, GLenum zpass))
+SDL_PROC_UNUSED(void, glTexCoord1d, (GLdouble s))
+SDL_PROC_UNUSED(void, glTexCoord1dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glTexCoord1f, (GLfloat s))
+SDL_PROC_UNUSED(void, glTexCoord1fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glTexCoord1i, (GLint s))
+SDL_PROC_UNUSED(void, glTexCoord1iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glTexCoord1s, (GLshort s))
+SDL_PROC_UNUSED(void, glTexCoord1sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glTexCoord2d, (GLdouble s, GLdouble t))
+SDL_PROC_UNUSED(void, glTexCoord2dv, (const GLdouble * v))
+SDL_PROC(void, glTexCoord2f, (GLfloat s, GLfloat t))
+SDL_PROC_UNUSED(void, glTexCoord2fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glTexCoord2i, (GLint s, GLint t))
+SDL_PROC_UNUSED(void, glTexCoord2iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glTexCoord2s, (GLshort s, GLshort t))
+SDL_PROC_UNUSED(void, glTexCoord2sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glTexCoord3d, (GLdouble s, GLdouble t, GLdouble r))
+SDL_PROC_UNUSED(void, glTexCoord3dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glTexCoord3f, (GLfloat s, GLfloat t, GLfloat r))
+SDL_PROC_UNUSED(void, glTexCoord3fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glTexCoord3i, (GLint s, GLint t, GLint r))
+SDL_PROC_UNUSED(void, glTexCoord3iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glTexCoord3s, (GLshort s, GLshort t, GLshort r))
+SDL_PROC_UNUSED(void, glTexCoord3sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glTexCoord4d,
+                (GLdouble s, GLdouble t, GLdouble r, GLdouble q))
+SDL_PROC_UNUSED(void, glTexCoord4dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glTexCoord4f,
+                (GLfloat s, GLfloat t, GLfloat r, GLfloat q))
+SDL_PROC_UNUSED(void, glTexCoord4fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glTexCoord4i, (GLint s, GLint t, GLint r, GLint q))
+SDL_PROC_UNUSED(void, glTexCoord4iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glTexCoord4s,
+                (GLshort s, GLshort t, GLshort r, GLshort q))
+SDL_PROC_UNUSED(void, glTexCoord4sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glTexCoordPointer,
+                (GLint size, GLenum type, GLsizei stride,
+                 const GLvoid * pointer))
+SDL_PROC(void, glTexEnvf, (GLenum target, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glTexEnvfv,
+                (GLenum target, GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glTexEnvi, (GLenum target, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glTexEnviv,
+                (GLenum target, GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glTexGend, (GLenum coord, GLenum pname, GLdouble param))
+SDL_PROC_UNUSED(void, glTexGendv,
+                (GLenum coord, GLenum pname, const GLdouble * params))
+SDL_PROC_UNUSED(void, glTexGenf, (GLenum coord, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glTexGenfv,
+                (GLenum coord, GLenum pname, const GLfloat * params))
+SDL_PROC_UNUSED(void, glTexGeni, (GLenum coord, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glTexGeniv,
+                (GLenum coord, GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glTexImage1D,
+                (GLenum target, GLint level, GLint internalformat,
+                 GLsizei width, GLint border, GLenum format, GLenum type,
+                 const GLvoid * pixels))
+SDL_PROC(void, glTexImage2D,
+         (GLenum target, GLint level, GLint internalformat, GLsizei width,
+          GLsizei height, GLint border, GLenum format, GLenum type,
+          const GLvoid * pixels))
+SDL_PROC_UNUSED(void, glTexParameterf,
+                (GLenum target, GLenum pname, GLfloat param))
+SDL_PROC_UNUSED(void, glTexParameterfv,
+                (GLenum target, GLenum pname, const GLfloat * params))
+SDL_PROC(void, glTexParameteri, (GLenum target, GLenum pname, GLint param))
+SDL_PROC_UNUSED(void, glTexParameteriv,
+                (GLenum target, GLenum pname, const GLint * params))
+SDL_PROC_UNUSED(void, glTexSubImage1D,
+                (GLenum target, GLint level, GLint xoffset, GLsizei width,
+                 GLenum format, GLenum type, const GLvoid * pixels))
+SDL_PROC(void, glTexSubImage2D,
+         (GLenum target, GLint level, GLint xoffset, GLint yoffset,
+          GLsizei width, GLsizei height, GLenum format, GLenum type,
+          const GLvoid * pixels))
+SDL_PROC_UNUSED(void, glTranslated, (GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC(void, glTranslatef, (GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC_UNUSED(void, glVertex2d, (GLdouble x, GLdouble y))
+SDL_PROC_UNUSED(void, glVertex2dv, (const GLdouble * v))
+SDL_PROC(void, glVertex2f, (GLfloat x, GLfloat y))
+SDL_PROC_UNUSED(void, glVertex2fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glVertex2i, (GLint x, GLint y))
+SDL_PROC_UNUSED(void, glVertex2iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glVertex2s, (GLshort x, GLshort y))
+SDL_PROC_UNUSED(void, glVertex2sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glVertex3d, (GLdouble x, GLdouble y, GLdouble z))
+SDL_PROC_UNUSED(void, glVertex3dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glVertex3f, (GLfloat x, GLfloat y, GLfloat z))
+SDL_PROC(void, glVertex3fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glVertex3i, (GLint x, GLint y, GLint z))
+SDL_PROC_UNUSED(void, glVertex3iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glVertex3s, (GLshort x, GLshort y, GLshort z))
+SDL_PROC_UNUSED(void, glVertex3sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glVertex4d,
+                (GLdouble x, GLdouble y, GLdouble z, GLdouble w))
+SDL_PROC_UNUSED(void, glVertex4dv, (const GLdouble * v))
+SDL_PROC_UNUSED(void, glVertex4f,
+                (GLfloat x, GLfloat y, GLfloat z, GLfloat w))
+SDL_PROC_UNUSED(void, glVertex4fv, (const GLfloat * v))
+SDL_PROC_UNUSED(void, glVertex4i, (GLint x, GLint y, GLint z, GLint w))
+SDL_PROC_UNUSED(void, glVertex4iv, (const GLint * v))
+SDL_PROC_UNUSED(void, glVertex4s,
+                (GLshort x, GLshort y, GLshort z, GLshort w))
+SDL_PROC_UNUSED(void, glVertex4sv, (const GLshort * v))
+SDL_PROC_UNUSED(void, glVertexPointer,
+                (GLint size, GLenum type, GLsizei stride,
+                 const GLvoid * pointer))
+SDL_PROC(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/opengl/SDL_render_gl.c b/Source/3rd Party/sdl/src/render/opengl/SDL_render_gl.c
new file mode 100644
index 000000000..8a0e377b3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengl/SDL_render_gl.c	
@@ -0,0 +1,1503 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED
+
+#include "SDL_hints.h"
+#include "SDL_log.h"
+#include "SDL_opengl.h"
+#include "../SDL_sysrender.h"
+#include "SDL_shaders_gl.h"
+
+#ifdef __MACOSX__
+#include <OpenGL/OpenGL.h>
+#endif
+
+/* To prevent unnecessary window recreation, 
+ * these should match the defaults selected in SDL_GL_ResetAttributes 
+ */
+
+#define RENDERER_CONTEXT_MAJOR 2
+#define RENDERER_CONTEXT_MINOR 1
+
+/* OpenGL renderer implementation */
+
+/* Details on optimizing the texture path on Mac OS X:
+   http://developer.apple.com/library/mac/#documentation/GraphicsImaging/Conceptual/OpenGL-MacProgGuide/opengl_texturedata/opengl_texturedata.html
+*/
+
+/* Used to re-create the window with OpenGL capability */
+extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
+
+static const float inv255f = 1.0f / 255.0f;
+
+static SDL_Renderer *GL_CreateRenderer(SDL_Window * window, Uint32 flags);
+static void GL_WindowEvent(SDL_Renderer * renderer,
+                           const SDL_WindowEvent *event);
+static int GL_GetOutputSize(SDL_Renderer * renderer, int *w, int *h);
+static int GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int GL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                            const SDL_Rect * rect, const void *pixels,
+                            int pitch);
+static int GL_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+                               const SDL_Rect * rect,
+                               const Uint8 *Yplane, int Ypitch,
+                               const Uint8 *Uplane, int Upitch,
+                               const Uint8 *Vplane, int Vpitch);
+static int GL_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                          const SDL_Rect * rect, void **pixels, int *pitch);
+static void GL_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int GL_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture);
+static int GL_UpdateViewport(SDL_Renderer * renderer);
+static int GL_UpdateClipRect(SDL_Renderer * renderer);
+static int GL_RenderClear(SDL_Renderer * renderer);
+static int GL_RenderDrawPoints(SDL_Renderer * renderer,
+                               const SDL_FPoint * points, int count);
+static int GL_RenderDrawLines(SDL_Renderer * renderer,
+                              const SDL_FPoint * points, int count);
+static int GL_RenderFillRects(SDL_Renderer * renderer,
+                              const SDL_FRect * rects, int count);
+static int GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                         const SDL_Rect * srcrect, const SDL_FRect * dstrect);
+static int GL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                         const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                         const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip);
+static int GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                               Uint32 pixel_format, void * pixels, int pitch);
+static void GL_RenderPresent(SDL_Renderer * renderer);
+static void GL_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static void GL_DestroyRenderer(SDL_Renderer * renderer);
+static int GL_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh);
+static int GL_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture);
+
+SDL_RenderDriver GL_RenderDriver = {
+    GL_CreateRenderer,
+    {
+     "opengl",
+     (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE),
+     1,
+     {SDL_PIXELFORMAT_ARGB8888},
+     0,
+     0}
+};
+
+typedef struct GL_FBOList GL_FBOList;
+
+struct GL_FBOList
+{
+    Uint32 w, h;
+    GLuint FBO;
+    GL_FBOList *next;
+};
+
+typedef struct
+{
+    SDL_GLContext context;
+
+    SDL_bool debug_enabled;
+    SDL_bool GL_ARB_debug_output_supported;
+    int errors;
+    char **error_messages;
+    GLDEBUGPROCARB next_error_callback;
+    GLvoid *next_error_userparam;
+
+    SDL_bool GL_ARB_texture_rectangle_supported;
+    struct {
+        GL_Shader shader;
+        Uint32 color;
+        int blendMode;
+    } current;
+
+    SDL_bool GL_EXT_framebuffer_object_supported;
+    GL_FBOList *framebuffers;
+
+    /* OpenGL functions */
+#define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
+#include "SDL_glfuncs.h"
+#undef SDL_PROC
+
+    /* Multitexture support */
+    SDL_bool GL_ARB_multitexture_supported;
+    PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
+    GLint num_texture_units;
+
+    PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
+    PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
+    PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
+    PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
+    PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
+
+    /* Shader support */
+    GL_ShaderContext *shaders;
+
+} GL_RenderData;
+
+typedef struct
+{
+    GLuint texture;
+    GLenum type;
+    GLfloat texw;
+    GLfloat texh;
+    GLenum format;
+    GLenum formattype;
+    void *pixels;
+    int pitch;
+    SDL_Rect locked_rect;
+
+    /* YV12 texture support */
+    SDL_bool yuv;
+    GLuint utexture;
+    GLuint vtexture;
+
+    GL_FBOList *fbo;
+} GL_TextureData;
+
+SDL_FORCE_INLINE const char*
+GL_TranslateError (GLenum error)
+{
+#define GL_ERROR_TRANSLATE(e) case e: return #e;
+    switch (error) {
+    GL_ERROR_TRANSLATE(GL_INVALID_ENUM)
+    GL_ERROR_TRANSLATE(GL_INVALID_VALUE)
+    GL_ERROR_TRANSLATE(GL_INVALID_OPERATION)
+    GL_ERROR_TRANSLATE(GL_OUT_OF_MEMORY)
+    GL_ERROR_TRANSLATE(GL_NO_ERROR)
+    GL_ERROR_TRANSLATE(GL_STACK_OVERFLOW)
+    GL_ERROR_TRANSLATE(GL_STACK_UNDERFLOW)
+    GL_ERROR_TRANSLATE(GL_TABLE_TOO_LARGE)
+    default:
+        return "UNKNOWN";
+}
+#undef GL_ERROR_TRANSLATE
+}
+
+SDL_FORCE_INLINE void
+GL_ClearErrors(SDL_Renderer *renderer)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+
+    if (!data->debug_enabled)
+    {
+        return;
+    }
+    if (data->GL_ARB_debug_output_supported) {
+        if (data->errors) {
+            int i;
+            for (i = 0; i < data->errors; ++i) {
+                SDL_free(data->error_messages[i]);
+            }
+            SDL_free(data->error_messages);
+
+            data->errors = 0;
+            data->error_messages = NULL;
+        }
+    } else {
+        while (data->glGetError() != GL_NO_ERROR) {
+            continue;
+        }
+    }
+}
+
+SDL_FORCE_INLINE int
+GL_CheckAllErrors (const char *prefix, SDL_Renderer *renderer, const char *file, int line, const char *function)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    int ret = 0;
+
+    if (!data->debug_enabled)
+    {
+        return 0;
+    }
+    if (data->GL_ARB_debug_output_supported) {
+        if (data->errors) {
+            int i;
+            for (i = 0; i < data->errors; ++i) {
+                SDL_SetError("%s: %s (%d): %s %s", prefix, file, line, function, data->error_messages[i]);
+                ret = -1;
+            }
+            GL_ClearErrors(renderer);
+        }
+    } else {
+        /* check gl errors (can return multiple errors) */
+        for (;;) {
+            GLenum error = data->glGetError();
+            if (error != GL_NO_ERROR) {
+                if (prefix == NULL || prefix[0] == '\0') {
+                    prefix = "generic";
+                }
+                SDL_SetError("%s: %s (%d): %s %s (0x%X)", prefix, file, line, function, GL_TranslateError(error), error);
+                ret = -1;
+            } else {
+                break;
+            }
+        }
+    }
+    return ret;
+}
+
+#if 0
+#define GL_CheckError(prefix, renderer)
+#elif defined(_MSC_VER)
+#define GL_CheckError(prefix, renderer) GL_CheckAllErrors(prefix, renderer, __FILE__, __LINE__, __FUNCTION__)
+#else
+#define GL_CheckError(prefix, renderer) GL_CheckAllErrors(prefix, renderer, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+#endif
+
+static int
+GL_LoadFunctions(GL_RenderData * data)
+{
+#ifdef __SDL_NOGETPROCADDR__
+#define SDL_PROC(ret,func,params) data->func=func;
+#else
+#define SDL_PROC(ret,func,params) \
+    do { \
+        data->func = SDL_GL_GetProcAddress(#func); \
+        if ( ! data->func ) { \
+            return SDL_SetError("Couldn't load GL function %s: %s\n", #func, SDL_GetError()); \
+        } \
+    } while ( 0 );
+#endif /* __SDL_NOGETPROCADDR__ */
+
+#include "SDL_glfuncs.h"
+#undef SDL_PROC
+    return 0;
+}
+
+static SDL_GLContext SDL_CurrentContext = NULL;
+
+static int
+GL_ActivateRenderer(SDL_Renderer * renderer)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+
+    if (SDL_CurrentContext != data->context) {
+        if (SDL_GL_MakeCurrent(renderer->window, data->context) < 0) {
+            return -1;
+        }
+        SDL_CurrentContext = data->context;
+
+        GL_UpdateViewport(renderer);
+    }
+
+    GL_ClearErrors(renderer);
+
+    return 0;
+}
+
+/* This is called if we need to invalidate all of the SDL OpenGL state */
+static void
+GL_ResetState(SDL_Renderer *renderer)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+
+    if (SDL_CurrentContext == data->context) {
+        GL_UpdateViewport(renderer);
+    } else {
+        GL_ActivateRenderer(renderer);
+    }
+
+    data->current.shader = SHADER_NONE;
+    data->current.color = 0;
+    data->current.blendMode = -1;
+
+    data->glDisable(GL_DEPTH_TEST);
+    data->glDisable(GL_CULL_FACE);
+    /* This ended up causing video discrepancies between OpenGL and Direct3D */
+    /* data->glEnable(GL_LINE_SMOOTH); */
+
+    data->glMatrixMode(GL_MODELVIEW);
+    data->glLoadIdentity();
+
+    GL_CheckError("", renderer);
+}
+
+static void APIENTRY
+GL_HandleDebugMessage(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char *message, void *userParam)
+{
+    SDL_Renderer *renderer = (SDL_Renderer *) userParam;
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+
+    if (type == GL_DEBUG_TYPE_ERROR_ARB) {
+        /* Record this error */
+        ++data->errors;
+        data->error_messages = SDL_realloc(data->error_messages, data->errors * sizeof(*data->error_messages));
+        if (data->error_messages) {
+            data->error_messages[data->errors-1] = SDL_strdup(message);
+        }
+    }
+
+    /* If there's another error callback, pass it along, otherwise log it */
+    if (data->next_error_callback) {
+        data->next_error_callback(source, type, id, severity, length, message, data->next_error_userparam);
+    } else {
+        if (type == GL_DEBUG_TYPE_ERROR_ARB) {
+            SDL_LogError(SDL_LOG_CATEGORY_RENDER, "%s", message);
+        } else {
+            SDL_LogDebug(SDL_LOG_CATEGORY_RENDER, "%s", message);
+        }
+    }
+}
+
+static GL_FBOList *
+GL_GetFBO(GL_RenderData *data, Uint32 w, Uint32 h)
+{
+    GL_FBOList *result = data->framebuffers;
+
+    while (result && ((result->w != w) || (result->h != h))) {
+        result = result->next;
+    }
+
+    if (!result) {
+        result = SDL_malloc(sizeof(GL_FBOList));
+        if (result) {
+            result->w = w;
+            result->h = h;
+            data->glGenFramebuffersEXT(1, &result->FBO);
+            result->next = data->framebuffers;
+            data->framebuffers = result;
+        }
+    }
+    return result;
+}
+
+SDL_Renderer *
+GL_CreateRenderer(SDL_Window * window, Uint32 flags)
+{
+    SDL_Renderer *renderer;
+    GL_RenderData *data;
+    const char *hint;
+    GLint value;
+    Uint32 window_flags;
+    int profile_mask, major, minor;
+
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask);
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major);
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor);
+    
+    window_flags = SDL_GetWindowFlags(window);
+    if (!(window_flags & SDL_WINDOW_OPENGL) ||
+        profile_mask == SDL_GL_CONTEXT_PROFILE_ES || major != RENDERER_CONTEXT_MAJOR || minor != RENDERER_CONTEXT_MINOR) {
+        
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, 0);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, RENDERER_CONTEXT_MAJOR);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, RENDERER_CONTEXT_MINOR);
+
+        if (SDL_RecreateWindow(window, window_flags | SDL_WINDOW_OPENGL) < 0) {
+            /* Uh oh, better try to put it back... */
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profile_mask);
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, major);
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minor);
+            SDL_RecreateWindow(window, window_flags);
+            return NULL;
+        }
+    }
+
+    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
+    if (!renderer) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    data = (GL_RenderData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        GL_DestroyRenderer(renderer);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    renderer->WindowEvent = GL_WindowEvent;
+    renderer->GetOutputSize = GL_GetOutputSize;
+    renderer->CreateTexture = GL_CreateTexture;
+    renderer->UpdateTexture = GL_UpdateTexture;
+    renderer->UpdateTextureYUV = GL_UpdateTextureYUV;
+    renderer->LockTexture = GL_LockTexture;
+    renderer->UnlockTexture = GL_UnlockTexture;
+    renderer->SetRenderTarget = GL_SetRenderTarget;
+    renderer->UpdateViewport = GL_UpdateViewport;
+    renderer->UpdateClipRect = GL_UpdateClipRect;
+    renderer->RenderClear = GL_RenderClear;
+    renderer->RenderDrawPoints = GL_RenderDrawPoints;
+    renderer->RenderDrawLines = GL_RenderDrawLines;
+    renderer->RenderFillRects = GL_RenderFillRects;
+    renderer->RenderCopy = GL_RenderCopy;
+    renderer->RenderCopyEx = GL_RenderCopyEx;
+    renderer->RenderReadPixels = GL_RenderReadPixels;
+    renderer->RenderPresent = GL_RenderPresent;
+    renderer->DestroyTexture = GL_DestroyTexture;
+    renderer->DestroyRenderer = GL_DestroyRenderer;
+    renderer->GL_BindTexture = GL_BindTexture;
+    renderer->GL_UnbindTexture = GL_UnbindTexture;
+    renderer->info = GL_RenderDriver.info;
+    renderer->info.flags = (SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE);
+    renderer->driverdata = data;
+    renderer->window = window;
+
+    data->context = SDL_GL_CreateContext(window);
+    if (!data->context) {
+        GL_DestroyRenderer(renderer);
+        return NULL;
+    }
+    if (SDL_GL_MakeCurrent(window, data->context) < 0) {
+        GL_DestroyRenderer(renderer);
+        return NULL;
+    }
+
+    if (GL_LoadFunctions(data) < 0) {
+        GL_DestroyRenderer(renderer);
+        return NULL;
+    }
+
+#ifdef __MACOSX__
+    /* Enable multi-threaded rendering */
+    /* Disabled until Ryan finishes his VBO/PBO code...
+       CGLEnable(CGLGetCurrentContext(), kCGLCEMPEngine);
+     */
+#endif
+
+    if (flags & SDL_RENDERER_PRESENTVSYNC) {
+        SDL_GL_SetSwapInterval(1);
+    } else {
+        SDL_GL_SetSwapInterval(0);
+    }
+    if (SDL_GL_GetSwapInterval() > 0) {
+        renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
+    }
+
+    /* Check for debug output support */
+    if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_FLAGS, &value) == 0 &&
+        (value & SDL_GL_CONTEXT_DEBUG_FLAG)) {
+        data->debug_enabled = SDL_TRUE;
+    }
+    if (data->debug_enabled && SDL_GL_ExtensionSupported("GL_ARB_debug_output")) {
+        PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARBFunc = (PFNGLDEBUGMESSAGECALLBACKARBPROC) SDL_GL_GetProcAddress("glDebugMessageCallbackARB");
+
+        data->GL_ARB_debug_output_supported = SDL_TRUE;
+        data->glGetPointerv(GL_DEBUG_CALLBACK_FUNCTION_ARB, (GLvoid **)&data->next_error_callback);
+        data->glGetPointerv(GL_DEBUG_CALLBACK_USER_PARAM_ARB, &data->next_error_userparam);
+        glDebugMessageCallbackARBFunc(GL_HandleDebugMessage, renderer);
+
+        /* Make sure our callback is called when errors actually happen */
+        data->glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
+    }
+
+    if (SDL_GL_ExtensionSupported("GL_ARB_texture_rectangle")
+        || SDL_GL_ExtensionSupported("GL_EXT_texture_rectangle")) {
+        data->GL_ARB_texture_rectangle_supported = SDL_TRUE;
+        data->glGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB, &value);
+        renderer->info.max_texture_width = value;
+        renderer->info.max_texture_height = value;
+    } else {
+        data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
+        renderer->info.max_texture_width = value;
+        renderer->info.max_texture_height = value;
+    }
+
+    /* Check for multitexture support */
+    if (SDL_GL_ExtensionSupported("GL_ARB_multitexture")) {
+        data->glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC) SDL_GL_GetProcAddress("glActiveTextureARB");
+        if (data->glActiveTextureARB) {
+            data->GL_ARB_multitexture_supported = SDL_TRUE;
+            data->glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &data->num_texture_units);
+        }
+    }
+
+    /* Check for shader support */
+    hint = SDL_GetHint(SDL_HINT_RENDER_OPENGL_SHADERS);
+    if (!hint || *hint != '0') {
+        data->shaders = GL_CreateShaderContext();
+    }
+    SDL_LogInfo(SDL_LOG_CATEGORY_RENDER, "OpenGL shaders: %s",
+                data->shaders ? "ENABLED" : "DISABLED");
+
+    /* We support YV12 textures using 3 textures and a shader */
+    if (data->shaders && data->num_texture_units >= 3) {
+        renderer->info.texture_formats[renderer->info.num_texture_formats++] = SDL_PIXELFORMAT_YV12;
+        renderer->info.texture_formats[renderer->info.num_texture_formats++] = SDL_PIXELFORMAT_IYUV;
+    }
+
+#ifdef __MACOSX__
+    renderer->info.texture_formats[renderer->info.num_texture_formats++] = SDL_PIXELFORMAT_UYVY;
+#endif
+
+    if (SDL_GL_ExtensionSupported("GL_EXT_framebuffer_object")) {
+        data->GL_EXT_framebuffer_object_supported = SDL_TRUE;
+        data->glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)
+            SDL_GL_GetProcAddress("glGenFramebuffersEXT");
+        data->glDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC)
+            SDL_GL_GetProcAddress("glDeleteFramebuffersEXT");
+        data->glFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)
+            SDL_GL_GetProcAddress("glFramebufferTexture2DEXT");
+        data->glBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)
+            SDL_GL_GetProcAddress("glBindFramebufferEXT");
+        data->glCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)
+            SDL_GL_GetProcAddress("glCheckFramebufferStatusEXT");
+        renderer->info.flags |= SDL_RENDERER_TARGETTEXTURE;
+    }
+    data->framebuffers = NULL;
+
+    /* Set up parameters for rendering */
+    GL_ResetState(renderer);
+
+    return renderer;
+}
+
+static void
+GL_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
+{
+    if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED ||
+        event->event == SDL_WINDOWEVENT_SHOWN ||
+        event->event == SDL_WINDOWEVENT_HIDDEN) {
+        /* Rebind the context to the window area and update matrices */
+        SDL_CurrentContext = NULL;
+    }
+}
+
+static int
+GL_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
+{
+    SDL_GL_GetDrawableSize(renderer->window, w, h);
+
+    return 0;
+}
+
+SDL_FORCE_INLINE int
+power_of_2(int input)
+{
+    int value = 1;
+
+    while (value < input) {
+        value <<= 1;
+    }
+    return value;
+}
+
+SDL_FORCE_INLINE SDL_bool
+convert_format(GL_RenderData *renderdata, Uint32 pixel_format,
+               GLint* internalFormat, GLenum* format, GLenum* type)
+{
+    switch (pixel_format) {
+    case SDL_PIXELFORMAT_ARGB8888:
+        *internalFormat = GL_RGBA8;
+        *format = GL_BGRA;
+        *type = GL_UNSIGNED_INT_8_8_8_8_REV;
+        break;
+    case SDL_PIXELFORMAT_YV12:
+    case SDL_PIXELFORMAT_IYUV:
+        *internalFormat = GL_LUMINANCE;
+        *format = GL_LUMINANCE;
+        *type = GL_UNSIGNED_BYTE;
+        break;
+#ifdef __MACOSX__
+    case SDL_PIXELFORMAT_UYVY:
+		*internalFormat = GL_RGB8;
+		*format = GL_YCBCR_422_APPLE;
+		*type = GL_UNSIGNED_SHORT_8_8_APPLE;
+		break;
+#endif
+    default:
+        return SDL_FALSE;
+    }
+    return SDL_TRUE;
+}
+
+static GLenum
+GetScaleQuality(void)
+{
+    const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY);
+
+    if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
+        return GL_NEAREST;
+    } else {
+        return GL_LINEAR;
+    }
+}
+
+static int
+GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    GL_RenderData *renderdata = (GL_RenderData *) renderer->driverdata;
+    GL_TextureData *data;
+    GLint internalFormat;
+    GLenum format, type;
+    int texture_w, texture_h;
+    GLenum scaleMode;
+
+    GL_ActivateRenderer(renderer);
+
+    if (!convert_format(renderdata, texture->format, &internalFormat,
+                        &format, &type)) {
+        return SDL_SetError("Texture format %s not supported by OpenGL",
+                            SDL_GetPixelFormatName(texture->format));
+    }
+
+    data = (GL_TextureData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        size_t size;
+        data->pitch = texture->w * SDL_BYTESPERPIXEL(texture->format);
+        size = texture->h * data->pitch;
+        if (texture->format == SDL_PIXELFORMAT_YV12 ||
+            texture->format == SDL_PIXELFORMAT_IYUV) {
+            /* Need to add size for the U and V planes */
+            size += (2 * (texture->h * data->pitch) / 4);
+        }
+        data->pixels = SDL_calloc(1, size);
+        if (!data->pixels) {
+            SDL_free(data);
+            return SDL_OutOfMemory();
+        }
+    }
+
+    if (texture->access == SDL_TEXTUREACCESS_TARGET) {
+        data->fbo = GL_GetFBO(renderdata, texture->w, texture->h);
+    } else {
+        data->fbo = NULL;
+    }
+
+    GL_CheckError("", renderer);
+    renderdata->glGenTextures(1, &data->texture);
+    if (GL_CheckError("glGenTexures()", renderer) < 0) {
+        SDL_free(data);
+        return -1;
+    }
+    texture->driverdata = data;
+
+    if ((renderdata->GL_ARB_texture_rectangle_supported)
+        /* && texture->access != SDL_TEXTUREACCESS_TARGET */){
+        data->type = GL_TEXTURE_RECTANGLE_ARB;
+        texture_w = texture->w;
+        texture_h = texture->h;
+        data->texw = (GLfloat) texture_w;
+        data->texh = (GLfloat) texture_h;
+    } else {
+        data->type = GL_TEXTURE_2D;
+        texture_w = power_of_2(texture->w);
+        texture_h = power_of_2(texture->h);
+        data->texw = (GLfloat) (texture->w) / texture_w;
+        data->texh = (GLfloat) texture->h / texture_h;
+    }
+
+    data->format = format;
+    data->formattype = type;
+    scaleMode = GetScaleQuality();
+    renderdata->glEnable(data->type);
+    renderdata->glBindTexture(data->type, data->texture);
+    renderdata->glTexParameteri(data->type, GL_TEXTURE_MIN_FILTER, scaleMode);
+    renderdata->glTexParameteri(data->type, GL_TEXTURE_MAG_FILTER, scaleMode);
+    /* According to the spec, CLAMP_TO_EDGE is the default for TEXTURE_RECTANGLE
+       and setting it causes an INVALID_ENUM error in the latest NVidia drivers.
+    */
+    if (data->type != GL_TEXTURE_RECTANGLE_ARB) {
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_S,
+                                    GL_CLAMP_TO_EDGE);
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_T,
+                                    GL_CLAMP_TO_EDGE);
+    }
+#ifdef __MACOSX__
+#ifndef GL_TEXTURE_STORAGE_HINT_APPLE
+#define GL_TEXTURE_STORAGE_HINT_APPLE       0x85BC
+#endif
+#ifndef STORAGE_CACHED_APPLE
+#define STORAGE_CACHED_APPLE                0x85BE
+#endif
+#ifndef STORAGE_SHARED_APPLE
+#define STORAGE_SHARED_APPLE                0x85BF
+#endif
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_STORAGE_HINT_APPLE,
+                                    GL_STORAGE_SHARED_APPLE);
+    } else {
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_STORAGE_HINT_APPLE,
+                                    GL_STORAGE_CACHED_APPLE);
+    }
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING
+        && texture->format == SDL_PIXELFORMAT_ARGB8888
+        && (texture->w % 8) == 0) {
+        renderdata->glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);
+        renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+        renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH,
+                          (data->pitch / SDL_BYTESPERPIXEL(texture->format)));
+        renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w,
+                                 texture_h, 0, format, type, data->pixels);
+        renderdata->glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE);
+    }
+    else
+#endif
+    {
+        renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w,
+                                 texture_h, 0, format, type, NULL);
+    }
+    renderdata->glDisable(data->type);
+    if (GL_CheckError("glTexImage2D()", renderer) < 0) {
+        return -1;
+    }
+
+    if (texture->format == SDL_PIXELFORMAT_YV12 ||
+        texture->format == SDL_PIXELFORMAT_IYUV) {
+        data->yuv = SDL_TRUE;
+
+        renderdata->glGenTextures(1, &data->utexture);
+        renderdata->glGenTextures(1, &data->vtexture);
+        renderdata->glEnable(data->type);
+
+        renderdata->glBindTexture(data->type, data->utexture);
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_MIN_FILTER,
+                                    scaleMode);
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_MAG_FILTER,
+                                    scaleMode);
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_S,
+                                    GL_CLAMP_TO_EDGE);
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_T,
+                                    GL_CLAMP_TO_EDGE);
+        renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w/2,
+                                 texture_h/2, 0, format, type, NULL);
+
+        renderdata->glBindTexture(data->type, data->vtexture);
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_MIN_FILTER,
+                                    scaleMode);
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_MAG_FILTER,
+                                    scaleMode);
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_S,
+                                    GL_CLAMP_TO_EDGE);
+        renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_T,
+                                    GL_CLAMP_TO_EDGE);
+        renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w/2,
+                                 texture_h/2, 0, format, type, NULL);
+
+        renderdata->glDisable(data->type);
+    }
+
+    return GL_CheckError("", renderer);
+}
+
+static int
+GL_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                 const SDL_Rect * rect, const void *pixels, int pitch)
+{
+    GL_RenderData *renderdata = (GL_RenderData *) renderer->driverdata;
+    GL_TextureData *data = (GL_TextureData *) texture->driverdata;
+
+    GL_ActivateRenderer(renderer);
+
+    renderdata->glEnable(data->type);
+    renderdata->glBindTexture(data->type, data->texture);
+    renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH,
+                              (pitch / SDL_BYTESPERPIXEL(texture->format)));
+    renderdata->glTexSubImage2D(data->type, 0, rect->x, rect->y, rect->w,
+                                rect->h, data->format, data->formattype,
+                                pixels);
+    if (data->yuv) {
+        renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH, (pitch / 2));
+
+        /* Skip to the correct offset into the next texture */
+        pixels = (const void*)((const Uint8*)pixels + rect->h * pitch);
+        if (texture->format == SDL_PIXELFORMAT_YV12) {
+            renderdata->glBindTexture(data->type, data->vtexture);
+        } else {
+            renderdata->glBindTexture(data->type, data->utexture);
+        }
+        renderdata->glTexSubImage2D(data->type, 0, rect->x/2, rect->y/2,
+                                    rect->w/2, rect->h/2,
+                                    data->format, data->formattype, pixels);
+
+        /* Skip to the correct offset into the next texture */
+        pixels = (const void*)((const Uint8*)pixels + (rect->h * pitch)/4);
+        if (texture->format == SDL_PIXELFORMAT_YV12) {
+            renderdata->glBindTexture(data->type, data->utexture);
+        } else {
+            renderdata->glBindTexture(data->type, data->vtexture);
+        }
+        renderdata->glTexSubImage2D(data->type, 0, rect->x/2, rect->y/2,
+                                    rect->w/2, rect->h/2,
+                                    data->format, data->formattype, pixels);
+    }
+    renderdata->glDisable(data->type);
+
+    return GL_CheckError("glTexSubImage2D()", renderer);
+}
+
+static int
+GL_UpdateTextureYUV(SDL_Renderer * renderer, SDL_Texture * texture,
+                    const SDL_Rect * rect,
+                    const Uint8 *Yplane, int Ypitch,
+                    const Uint8 *Uplane, int Upitch,
+                    const Uint8 *Vplane, int Vpitch)
+{
+    GL_RenderData *renderdata = (GL_RenderData *) renderer->driverdata;
+    GL_TextureData *data = (GL_TextureData *) texture->driverdata;
+
+    GL_ActivateRenderer(renderer);
+
+    renderdata->glEnable(data->type);
+    renderdata->glBindTexture(data->type, data->texture);
+    renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH, Ypitch);
+    renderdata->glTexSubImage2D(data->type, 0, rect->x, rect->y, rect->w,
+                                rect->h, data->format, data->formattype,
+                                Yplane);
+
+    renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH, Upitch);
+    renderdata->glBindTexture(data->type, data->utexture);
+    renderdata->glTexSubImage2D(data->type, 0, rect->x/2, rect->y/2,
+                                rect->w/2, rect->h/2,
+                                data->format, data->formattype, Uplane);
+
+    renderdata->glPixelStorei(GL_UNPACK_ROW_LENGTH, Vpitch);
+    renderdata->glBindTexture(data->type, data->vtexture);
+    renderdata->glTexSubImage2D(data->type, 0, rect->x/2, rect->y/2,
+                                rect->w/2, rect->h/2,
+                                data->format, data->formattype, Vplane);
+    renderdata->glDisable(data->type);
+
+    return GL_CheckError("glTexSubImage2D()", renderer);
+}
+
+static int
+GL_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+               const SDL_Rect * rect, void **pixels, int *pitch)
+{
+    GL_TextureData *data = (GL_TextureData *) texture->driverdata;
+
+    data->locked_rect = *rect;
+    *pixels =
+        (void *) ((Uint8 *) data->pixels + rect->y * data->pitch +
+                  rect->x * SDL_BYTESPERPIXEL(texture->format));
+    *pitch = data->pitch;
+    return 0;
+}
+
+static void
+GL_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    GL_TextureData *data = (GL_TextureData *) texture->driverdata;
+    const SDL_Rect *rect;
+    void *pixels;
+
+    rect = &data->locked_rect;
+    pixels =
+        (void *) ((Uint8 *) data->pixels + rect->y * data->pitch +
+                  rect->x * SDL_BYTESPERPIXEL(texture->format));
+    GL_UpdateTexture(renderer, texture, rect, pixels, data->pitch);
+}
+
+static int
+GL_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    GL_TextureData *texturedata;
+    GLenum status;
+
+    GL_ActivateRenderer(renderer);
+
+    if (texture == NULL) {
+        data->glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+        return 0;
+    }
+
+    texturedata = (GL_TextureData *) texture->driverdata;
+    data->glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, texturedata->fbo->FBO);
+    /* TODO: check if texture pixel format allows this operation */
+    data->glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, texturedata->type, texturedata->texture, 0);
+    /* Check FBO status */
+    status = data->glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+    if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+        return SDL_SetError("glFramebufferTexture2DEXT() failed");
+    }
+    return 0;
+}
+
+static int
+GL_UpdateViewport(SDL_Renderer * renderer)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+
+    if (SDL_CurrentContext != data->context) {
+        /* We'll update the viewport after we rebind the context */
+        return 0;
+    }
+
+    if (renderer->target) {
+        data->glViewport(renderer->viewport.x, renderer->viewport.y,
+                         renderer->viewport.w, renderer->viewport.h);
+    } else {
+        int w, h;
+
+        SDL_GetRendererOutputSize(renderer, &w, &h);
+        data->glViewport(renderer->viewport.x, (h - renderer->viewport.y - renderer->viewport.h),
+                         renderer->viewport.w, renderer->viewport.h);
+    }
+
+    data->glMatrixMode(GL_PROJECTION);
+    data->glLoadIdentity();
+    if (renderer->viewport.w && renderer->viewport.h) {
+        if (renderer->target) {
+            data->glOrtho((GLdouble) 0,
+                          (GLdouble) renderer->viewport.w,
+                          (GLdouble) 0,
+                          (GLdouble) renderer->viewport.h,
+                           0.0, 1.0);
+        } else {
+            data->glOrtho((GLdouble) 0,
+                          (GLdouble) renderer->viewport.w,
+                          (GLdouble) renderer->viewport.h,
+                          (GLdouble) 0,
+                           0.0, 1.0);
+        }
+    }
+    return GL_CheckError("", renderer);
+}
+
+static int
+GL_UpdateClipRect(SDL_Renderer * renderer)
+{
+    const SDL_Rect *rect = &renderer->clip_rect;
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+
+    if (!SDL_RectEmpty(rect)) {
+        data->glEnable(GL_SCISSOR_TEST);
+        data->glScissor(rect->x, renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
+    } else {
+        data->glDisable(GL_SCISSOR_TEST);
+    }
+    return 0;
+}
+
+static void
+GL_SetShader(GL_RenderData * data, GL_Shader shader)
+{
+    if (data->shaders && shader != data->current.shader) {
+        GL_SelectShader(data->shaders, shader);
+        data->current.shader = shader;
+    }
+}
+
+static void
+GL_SetColor(GL_RenderData * data, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b);
+
+    if (color != data->current.color) {
+        data->glColor4f((GLfloat) r * inv255f,
+                        (GLfloat) g * inv255f,
+                        (GLfloat) b * inv255f,
+                        (GLfloat) a * inv255f);
+        data->current.color = color;
+    }
+}
+
+static void
+GL_SetBlendMode(GL_RenderData * data, int blendMode)
+{
+    if (blendMode != data->current.blendMode) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_NONE:
+            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+            data->glDisable(GL_BLEND);
+            break;
+        case SDL_BLENDMODE_BLEND:
+            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            data->glEnable(GL_BLEND);
+            data->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+            break;
+        case SDL_BLENDMODE_ADD:
+            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            data->glEnable(GL_BLEND);
+            data->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ZERO, GL_ONE);
+            break;
+        case SDL_BLENDMODE_MOD:
+            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            data->glEnable(GL_BLEND);
+            data->glBlendFuncSeparate(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE);
+            break;
+        }
+        data->current.blendMode = blendMode;
+    }
+}
+
+static void
+GL_SetDrawingState(SDL_Renderer * renderer)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+
+    GL_ActivateRenderer(renderer);
+
+    GL_SetColor(data, renderer->r,
+                      renderer->g,
+                      renderer->b,
+                      renderer->a);
+
+    GL_SetBlendMode(data, renderer->blendMode);
+
+    GL_SetShader(data, SHADER_SOLID);
+}
+
+static int
+GL_RenderClear(SDL_Renderer * renderer)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+
+    GL_ActivateRenderer(renderer);
+
+    data->glClearColor((GLfloat) renderer->r * inv255f,
+                       (GLfloat) renderer->g * inv255f,
+                       (GLfloat) renderer->b * inv255f,
+                       (GLfloat) renderer->a * inv255f);
+
+    data->glClear(GL_COLOR_BUFFER_BIT);
+
+    return 0;
+}
+
+static int
+GL_RenderDrawPoints(SDL_Renderer * renderer, const SDL_FPoint * points,
+                    int count)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    int i;
+
+    GL_SetDrawingState(renderer);
+
+    data->glBegin(GL_POINTS);
+    for (i = 0; i < count; ++i) {
+        data->glVertex2f(0.5f + points[i].x, 0.5f + points[i].y);
+    }
+    data->glEnd();
+
+    return 0;
+}
+
+static int
+GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_FPoint * points,
+                   int count)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    int i;
+
+    GL_SetDrawingState(renderer);
+
+    if (count > 2 &&
+        points[0].x == points[count-1].x && points[0].y == points[count-1].y) {
+        data->glBegin(GL_LINE_LOOP);
+        /* GL_LINE_LOOP takes care of the final segment */
+        --count;
+        for (i = 0; i < count; ++i) {
+            data->glVertex2f(0.5f + points[i].x, 0.5f + points[i].y);
+        }
+        data->glEnd();
+    } else {
+#if defined(__MACOSX__) || defined(__WIN32__)
+#else
+        int x1, y1, x2, y2;
+#endif
+
+        data->glBegin(GL_LINE_STRIP);
+        for (i = 0; i < count; ++i) {
+            data->glVertex2f(0.5f + points[i].x, 0.5f + points[i].y);
+        }
+        data->glEnd();
+
+        /* The line is half open, so we need one more point to complete it.
+         * http://www.opengl.org/documentation/specs/version1.1/glspec1.1/node47.html
+         * If we have to, we can use vertical line and horizontal line textures
+         * for vertical and horizontal lines, and then create custom textures
+         * for diagonal lines and software render those.  It's terrible, but at
+         * least it would be pixel perfect.
+         */
+        data->glBegin(GL_POINTS);
+#if defined(__MACOSX__) || defined(__WIN32__)
+        /* Mac OS X and Windows seem to always leave the last point open */
+        data->glVertex2f(0.5f + points[count-1].x, 0.5f + points[count-1].y);
+#else
+        /* Linux seems to leave the right-most or bottom-most point open */
+        x1 = points[0].x;
+        y1 = points[0].y;
+        x2 = points[count-1].x;
+        y2 = points[count-1].y;
+
+        if (x1 > x2) {
+            data->glVertex2f(0.5f + x1, 0.5f + y1);
+        } else if (x2 > x1) {
+            data->glVertex2f(0.5f + x2, 0.5f + y2);
+        }
+        if (y1 > y2) {
+            data->glVertex2f(0.5f + x1, 0.5f + y1);
+        } else if (y2 > y1) {
+            data->glVertex2f(0.5f + x2, 0.5f + y2);
+        }
+#endif
+        data->glEnd();
+    }
+    return GL_CheckError("", renderer);
+}
+
+static int
+GL_RenderFillRects(SDL_Renderer * renderer, const SDL_FRect * rects, int count)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    int i;
+
+    GL_SetDrawingState(renderer);
+
+    for (i = 0; i < count; ++i) {
+        const SDL_FRect *rect = &rects[i];
+
+        data->glRectf(rect->x, rect->y, rect->x + rect->w, rect->y + rect->h);
+    }
+    return GL_CheckError("", renderer);
+}
+
+static int
+GL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+              const SDL_Rect * srcrect, const SDL_FRect * dstrect)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    GL_TextureData *texturedata = (GL_TextureData *) texture->driverdata;
+    GLfloat minx, miny, maxx, maxy;
+    GLfloat minu, maxu, minv, maxv;
+
+    GL_ActivateRenderer(renderer);
+
+    data->glEnable(texturedata->type);
+    if (texturedata->yuv) {
+        data->glActiveTextureARB(GL_TEXTURE2_ARB);
+        data->glBindTexture(texturedata->type, texturedata->vtexture);
+
+        data->glActiveTextureARB(GL_TEXTURE1_ARB);
+        data->glBindTexture(texturedata->type, texturedata->utexture);
+
+        data->glActiveTextureARB(GL_TEXTURE0_ARB);
+    }
+    data->glBindTexture(texturedata->type, texturedata->texture);
+
+    if (texture->modMode) {
+        GL_SetColor(data, texture->r, texture->g, texture->b, texture->a);
+    } else {
+        GL_SetColor(data, 255, 255, 255, 255);
+    }
+
+    GL_SetBlendMode(data, texture->blendMode);
+
+    if (texturedata->yuv) {
+        GL_SetShader(data, SHADER_YV12);
+    } else {
+        GL_SetShader(data, SHADER_RGB);
+    }
+
+    minx = dstrect->x;
+    miny = dstrect->y;
+    maxx = dstrect->x + dstrect->w;
+    maxy = dstrect->y + dstrect->h;
+
+    minu = (GLfloat) srcrect->x / texture->w;
+    minu *= texturedata->texw;
+    maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w;
+    maxu *= texturedata->texw;
+    minv = (GLfloat) srcrect->y / texture->h;
+    minv *= texturedata->texh;
+    maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h;
+    maxv *= texturedata->texh;
+
+    data->glBegin(GL_TRIANGLE_STRIP);
+    data->glTexCoord2f(minu, minv);
+    data->glVertex2f(minx, miny);
+    data->glTexCoord2f(maxu, minv);
+    data->glVertex2f(maxx, miny);
+    data->glTexCoord2f(minu, maxv);
+    data->glVertex2f(minx, maxy);
+    data->glTexCoord2f(maxu, maxv);
+    data->glVertex2f(maxx, maxy);
+    data->glEnd();
+
+    data->glDisable(texturedata->type);
+
+    return GL_CheckError("", renderer);
+}
+
+static int
+GL_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+              const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+              const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    GL_TextureData *texturedata = (GL_TextureData *) texture->driverdata;
+    GLfloat minx, miny, maxx, maxy;
+    GLfloat centerx, centery;
+    GLfloat minu, maxu, minv, maxv;
+
+    GL_ActivateRenderer(renderer);
+
+    data->glEnable(texturedata->type);
+    if (texturedata->yuv) {
+        data->glActiveTextureARB(GL_TEXTURE2_ARB);
+        data->glBindTexture(texturedata->type, texturedata->vtexture);
+
+        data->glActiveTextureARB(GL_TEXTURE1_ARB);
+        data->glBindTexture(texturedata->type, texturedata->utexture);
+
+        data->glActiveTextureARB(GL_TEXTURE0_ARB);
+    }
+    data->glBindTexture(texturedata->type, texturedata->texture);
+
+    if (texture->modMode) {
+        GL_SetColor(data, texture->r, texture->g, texture->b, texture->a);
+    } else {
+        GL_SetColor(data, 255, 255, 255, 255);
+    }
+
+    GL_SetBlendMode(data, texture->blendMode);
+
+    if (texturedata->yuv) {
+        GL_SetShader(data, SHADER_YV12);
+    } else {
+        GL_SetShader(data, SHADER_RGB);
+    }
+
+    centerx = center->x;
+    centery = center->y;
+
+    if (flip & SDL_FLIP_HORIZONTAL) {
+        minx =  dstrect->w - centerx;
+        maxx = -centerx;
+    }
+    else {
+        minx = -centerx;
+        maxx =  dstrect->w - centerx;
+    }
+
+    if (flip & SDL_FLIP_VERTICAL) {
+        miny =  dstrect->h - centery;
+        maxy = -centery;
+    }
+    else {
+        miny = -centery;
+        maxy =  dstrect->h - centery;
+    }
+
+    minu = (GLfloat) srcrect->x / texture->w;
+    minu *= texturedata->texw;
+    maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w;
+    maxu *= texturedata->texw;
+    minv = (GLfloat) srcrect->y / texture->h;
+    minv *= texturedata->texh;
+    maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h;
+    maxv *= texturedata->texh;
+
+    /* Translate to flip, rotate, translate to position */
+    data->glPushMatrix();
+    data->glTranslatef((GLfloat)dstrect->x + centerx, (GLfloat)dstrect->y + centery, (GLfloat)0.0);
+    data->glRotated(angle, (GLdouble)0.0, (GLdouble)0.0, (GLdouble)1.0);
+
+    data->glBegin(GL_TRIANGLE_STRIP);
+    data->glTexCoord2f(minu, minv);
+    data->glVertex2f(minx, miny);
+    data->glTexCoord2f(maxu, minv);
+    data->glVertex2f(maxx, miny);
+    data->glTexCoord2f(minu, maxv);
+    data->glVertex2f(minx, maxy);
+    data->glTexCoord2f(maxu, maxv);
+    data->glVertex2f(maxx, maxy);
+    data->glEnd();
+    data->glPopMatrix();
+
+    data->glDisable(texturedata->type);
+
+    return GL_CheckError("", renderer);
+}
+
+static int
+GL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                    Uint32 pixel_format, void * pixels, int pitch)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    Uint32 temp_format = SDL_PIXELFORMAT_ARGB8888;
+    void *temp_pixels;
+    int temp_pitch;
+    GLint internalFormat;
+    GLenum format, type;
+    Uint8 *src, *dst, *tmp;
+    int w, h, length, rows;
+    int status;
+
+    GL_ActivateRenderer(renderer);
+
+    temp_pitch = rect->w * SDL_BYTESPERPIXEL(temp_format);
+    temp_pixels = SDL_malloc(rect->h * temp_pitch);
+    if (!temp_pixels) {
+        return SDL_OutOfMemory();
+    }
+
+    convert_format(data, temp_format, &internalFormat, &format, &type);
+
+    SDL_GetRendererOutputSize(renderer, &w, &h);
+
+    data->glPixelStorei(GL_PACK_ALIGNMENT, 1);
+    data->glPixelStorei(GL_PACK_ROW_LENGTH,
+                        (temp_pitch / SDL_BYTESPERPIXEL(temp_format)));
+
+    data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h,
+                       format, type, temp_pixels);
+
+    if (GL_CheckError("glReadPixels()", renderer) < 0) {
+        return -1;
+    }
+
+    /* Flip the rows to be top-down */
+    length = rect->w * SDL_BYTESPERPIXEL(temp_format);
+    src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch;
+    dst = (Uint8*)temp_pixels;
+    tmp = SDL_stack_alloc(Uint8, length);
+    rows = rect->h / 2;
+    while (rows--) {
+        SDL_memcpy(tmp, dst, length);
+        SDL_memcpy(dst, src, length);
+        SDL_memcpy(src, tmp, length);
+        dst += temp_pitch;
+        src -= temp_pitch;
+    }
+    SDL_stack_free(tmp);
+
+    status = SDL_ConvertPixels(rect->w, rect->h,
+                               temp_format, temp_pixels, temp_pitch,
+                               pixel_format, pixels, pitch);
+    SDL_free(temp_pixels);
+
+    return status;
+}
+
+static void
+GL_RenderPresent(SDL_Renderer * renderer)
+{
+    GL_ActivateRenderer(renderer);
+
+    SDL_GL_SwapWindow(renderer->window);
+}
+
+static void
+GL_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    GL_RenderData *renderdata = (GL_RenderData *) renderer->driverdata;
+    GL_TextureData *data = (GL_TextureData *) texture->driverdata;
+
+    GL_ActivateRenderer(renderer);
+
+    if (!data) {
+        return;
+    }
+    if (data->texture) {
+        renderdata->glDeleteTextures(1, &data->texture);
+    }
+    if (data->yuv) {
+        renderdata->glDeleteTextures(1, &data->utexture);
+        renderdata->glDeleteTextures(1, &data->vtexture);
+    }
+    SDL_free(data->pixels);
+    SDL_free(data);
+    texture->driverdata = NULL;
+}
+
+static void
+GL_DestroyRenderer(SDL_Renderer * renderer)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+
+    if (data) {
+        GL_ClearErrors(renderer);
+        if (data->GL_ARB_debug_output_supported) {
+            PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARBFunc = (PFNGLDEBUGMESSAGECALLBACKARBPROC) SDL_GL_GetProcAddress("glDebugMessageCallbackARB");
+
+            /* Uh oh, we don't have a safe way of removing ourselves from the callback chain, if it changed after we set our callback. */
+            /* For now, just always replace the callback with the original one */
+            glDebugMessageCallbackARBFunc(data->next_error_callback, data->next_error_userparam);
+        }
+        if (data->shaders) {
+            GL_DestroyShaderContext(data->shaders);
+        }
+        if (data->context) {
+            while (data->framebuffers) {
+                GL_FBOList *nextnode = data->framebuffers->next;
+                /* delete the framebuffer object */
+                data->glDeleteFramebuffersEXT(1, &data->framebuffers->FBO);
+                GL_CheckError("", renderer);
+                SDL_free(data->framebuffers);
+                data->framebuffers = nextnode;
+            }
+            SDL_GL_DeleteContext(data->context);
+        }
+        SDL_free(data);
+    }
+    SDL_free(renderer);
+}
+
+static int
+GL_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    GL_TextureData *texturedata = (GL_TextureData *) texture->driverdata;
+    GL_ActivateRenderer(renderer);
+
+    data->glEnable(texturedata->type);
+    if (texturedata->yuv) {
+        data->glActiveTextureARB(GL_TEXTURE2_ARB);
+        data->glBindTexture(texturedata->type, texturedata->vtexture);
+
+        data->glActiveTextureARB(GL_TEXTURE1_ARB);
+        data->glBindTexture(texturedata->type, texturedata->utexture);
+
+        data->glActiveTextureARB(GL_TEXTURE0_ARB);
+    }
+    data->glBindTexture(texturedata->type, texturedata->texture);
+
+    if(texw) *texw = (float)texturedata->texw;
+    if(texh) *texh = (float)texturedata->texh;
+
+    return 0;
+}
+
+static int
+GL_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture)
+{
+    GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
+    GL_TextureData *texturedata = (GL_TextureData *) texture->driverdata;
+    GL_ActivateRenderer(renderer);
+
+    if (texturedata->yuv) {
+        data->glActiveTextureARB(GL_TEXTURE2_ARB);
+        data->glDisable(texturedata->type);
+
+        data->glActiveTextureARB(GL_TEXTURE1_ARB);
+        data->glDisable(texturedata->type);
+
+        data->glActiveTextureARB(GL_TEXTURE0_ARB);
+    }
+
+    data->glDisable(texturedata->type);
+
+    return 0;
+}
+
+#endif /* SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/opengl/SDL_shaders_gl.c b/Source/3rd Party/sdl/src/render/opengl/SDL_shaders_gl.c
new file mode 100644
index 000000000..8b15298f0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengl/SDL_shaders_gl.c	
@@ -0,0 +1,358 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED
+
+#include "SDL_stdinc.h"
+#include "SDL_log.h"
+#include "SDL_opengl.h"
+#include "SDL_video.h"
+#include "SDL_shaders_gl.h"
+
+/* OpenGL shader implementation */
+
+/* #define DEBUG_SHADERS */
+
+typedef struct
+{
+    GLhandleARB program;
+    GLhandleARB vert_shader;
+    GLhandleARB frag_shader;
+} GL_ShaderData;
+
+struct GL_ShaderContext
+{
+    GLenum (*glGetError)(void);
+
+    PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
+    PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
+    PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
+    PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
+    PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
+    PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
+    PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
+    PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB;
+    PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
+    PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
+    PFNGLUNIFORM1IARBPROC glUniform1iARB;
+    PFNGLUNIFORM1FARBPROC glUniform1fARB;
+    PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
+
+    SDL_bool GL_ARB_texture_rectangle_supported;
+
+    GL_ShaderData shaders[NUM_SHADERS];
+};
+
+/*
+ * NOTE: Always use sampler2D, etc here. We'll #define them to the
+ *  texture_rectangle versions if we choose to use that extension.
+ */
+static const char *shader_source[NUM_SHADERS][2] =
+{
+    /* SHADER_NONE */
+    { NULL, NULL },
+
+    /* SHADER_SOLID */
+    {
+        /* vertex shader */
+"varying vec4 v_color;\n"
+"\n"
+"void main()\n"
+"{\n"
+"    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
+"    v_color = gl_Color;\n"
+"}",
+        /* fragment shader */
+"varying vec4 v_color;\n"
+"\n"
+"void main()\n"
+"{\n"
+"    gl_FragColor = v_color;\n"
+"}"
+    },
+
+    /* SHADER_RGB */
+    {
+        /* vertex shader */
+"varying vec4 v_color;\n"
+"varying vec2 v_texCoord;\n"
+"\n"
+"void main()\n"
+"{\n"
+"    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
+"    v_color = gl_Color;\n"
+"    v_texCoord = vec2(gl_MultiTexCoord0);\n"
+"}",
+        /* fragment shader */
+"varying vec4 v_color;\n"
+"varying vec2 v_texCoord;\n"
+"uniform sampler2D tex0;\n"
+"\n"
+"void main()\n"
+"{\n"
+"    gl_FragColor = texture2D(tex0, v_texCoord) * v_color;\n"
+"}"
+    },
+
+    /* SHADER_YV12 */
+    {
+        /* vertex shader */
+"varying vec4 v_color;\n"
+"varying vec2 v_texCoord;\n"
+"\n"
+"void main()\n"
+"{\n"
+"    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
+"    v_color = gl_Color;\n"
+"    v_texCoord = vec2(gl_MultiTexCoord0);\n"
+"}",
+        /* fragment shader */
+"varying vec4 v_color;\n"
+"varying vec2 v_texCoord;\n"
+"uniform sampler2D tex0; // Y \n"
+"uniform sampler2D tex1; // U \n"
+"uniform sampler2D tex2; // V \n"
+"\n"
+"// YUV offset \n"
+"const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n"
+"\n"
+"// RGB coefficients \n"
+"const vec3 Rcoeff = vec3(1.164,  0.000,  1.596);\n"
+"const vec3 Gcoeff = vec3(1.164, -0.391, -0.813);\n"
+"const vec3 Bcoeff = vec3(1.164,  2.018,  0.000);\n"
+"\n"
+"void main()\n"
+"{\n"
+"    vec2 tcoord;\n"
+"    vec3 yuv, rgb;\n"
+"\n"
+"    // Get the Y value \n"
+"    tcoord = v_texCoord;\n"
+"    yuv.x = texture2D(tex0, tcoord).r;\n"
+"\n"
+"    // Get the U and V values \n"
+"    tcoord *= 0.5;\n"
+"    yuv.y = texture2D(tex1, tcoord).r;\n"
+"    yuv.z = texture2D(tex2, tcoord).r;\n"
+"\n"
+"    // Do the color transform \n"
+"    yuv += offset;\n"
+"    rgb.r = dot(yuv, Rcoeff);\n"
+"    rgb.g = dot(yuv, Gcoeff);\n"
+"    rgb.b = dot(yuv, Bcoeff);\n"
+"\n"
+"    // That was easy. :) \n"
+"    gl_FragColor = vec4(rgb, 1.0) * v_color;\n"
+"}"
+    },
+};
+
+static SDL_bool
+CompileShader(GL_ShaderContext *ctx, GLhandleARB shader, const char *defines, const char *source)
+{
+    GLint status;
+    const char *sources[2];
+
+    sources[0] = defines;
+    sources[1] = source;
+
+    ctx->glShaderSourceARB(shader, SDL_arraysize(sources), sources, NULL);
+    ctx->glCompileShaderARB(shader);
+    ctx->glGetObjectParameterivARB(shader, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+    if (status == 0) {
+        GLint length;
+        char *info;
+
+        ctx->glGetObjectParameterivARB(shader, GL_OBJECT_INFO_LOG_LENGTH_ARB, &length);
+        info = SDL_stack_alloc(char, length+1);
+        ctx->glGetInfoLogARB(shader, length, NULL, info);
+        SDL_LogError(SDL_LOG_CATEGORY_RENDER,
+            "Failed to compile shader:\n%s%s\n%s", defines, source, info);
+#ifdef DEBUG_SHADERS
+        fprintf(stderr,
+            "Failed to compile shader:\n%s%s\n%s", defines, source, info);
+#endif
+        SDL_stack_free(info);
+
+        return SDL_FALSE;
+    } else {
+        return SDL_TRUE;
+    }
+}
+
+static SDL_bool
+CompileShaderProgram(GL_ShaderContext *ctx, int index, GL_ShaderData *data)
+{
+    const int num_tmus_bound = 4;
+    const char *vert_defines = "";
+    const char *frag_defines = "";
+    int i;
+    GLint location;
+
+    if (index == SHADER_NONE) {
+        return SDL_TRUE;
+    }
+
+    ctx->glGetError();
+
+    /* Make sure we use the correct sampler type for our texture type */
+    if (ctx->GL_ARB_texture_rectangle_supported) {
+        frag_defines =
+"#define sampler2D sampler2DRect\n"
+"#define texture2D texture2DRect\n";
+    }
+
+    /* Create one program object to rule them all */
+    data->program = ctx->glCreateProgramObjectARB();
+
+    /* Create the vertex shader */
+    data->vert_shader = ctx->glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
+    if (!CompileShader(ctx, data->vert_shader, vert_defines, shader_source[index][0])) {
+        return SDL_FALSE;
+    }
+
+    /* Create the fragment shader */
+    data->frag_shader = ctx->glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
+    if (!CompileShader(ctx, data->frag_shader, frag_defines, shader_source[index][1])) {
+        return SDL_FALSE;
+    }
+
+    /* ... and in the darkness bind them */
+    ctx->glAttachObjectARB(data->program, data->vert_shader);
+    ctx->glAttachObjectARB(data->program, data->frag_shader);
+    ctx->glLinkProgramARB(data->program);
+
+    /* Set up some uniform variables */
+    ctx->glUseProgramObjectARB(data->program);
+    for (i = 0; i < num_tmus_bound; ++i) {
+        char tex_name[10];
+        SDL_snprintf(tex_name, SDL_arraysize(tex_name), "tex%d", i);
+        location = ctx->glGetUniformLocationARB(data->program, tex_name);
+        if (location >= 0) {
+            ctx->glUniform1iARB(location, i);
+        }
+    }
+    ctx->glUseProgramObjectARB(0);
+
+    return (ctx->glGetError() == GL_NO_ERROR);
+}
+
+static void
+DestroyShaderProgram(GL_ShaderContext *ctx, GL_ShaderData *data)
+{
+    ctx->glDeleteObjectARB(data->vert_shader);
+    ctx->glDeleteObjectARB(data->frag_shader);
+    ctx->glDeleteObjectARB(data->program);
+}
+
+GL_ShaderContext *
+GL_CreateShaderContext()
+{
+    GL_ShaderContext *ctx;
+    SDL_bool shaders_supported;
+    int i;
+
+    ctx = (GL_ShaderContext *)SDL_calloc(1, sizeof(*ctx));
+    if (!ctx) {
+        return NULL;
+    }
+
+    if (SDL_GL_ExtensionSupported("GL_ARB_texture_rectangle")
+        || SDL_GL_ExtensionSupported("GL_EXT_texture_rectangle")) {
+        ctx->GL_ARB_texture_rectangle_supported = SDL_TRUE;
+    }
+
+    /* Check for shader support */
+    shaders_supported = SDL_FALSE;
+    if (SDL_GL_ExtensionSupported("GL_ARB_shader_objects") &&
+        SDL_GL_ExtensionSupported("GL_ARB_shading_language_100") &&
+        SDL_GL_ExtensionSupported("GL_ARB_vertex_shader") &&
+        SDL_GL_ExtensionSupported("GL_ARB_fragment_shader")) {
+        ctx->glGetError = (GLenum (*)(void)) SDL_GL_GetProcAddress("glGetError");
+        ctx->glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC) SDL_GL_GetProcAddress("glAttachObjectARB");
+        ctx->glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC) SDL_GL_GetProcAddress("glCompileShaderARB");
+        ctx->glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC) SDL_GL_GetProcAddress("glCreateProgramObjectARB");
+        ctx->glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC) SDL_GL_GetProcAddress("glCreateShaderObjectARB");
+        ctx->glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC) SDL_GL_GetProcAddress("glDeleteObjectARB");
+        ctx->glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC) SDL_GL_GetProcAddress("glGetInfoLogARB");
+        ctx->glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC) SDL_GL_GetProcAddress("glGetObjectParameterivARB");
+        ctx->glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC) SDL_GL_GetProcAddress("glGetUniformLocationARB");
+        ctx->glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC) SDL_GL_GetProcAddress("glLinkProgramARB");
+        ctx->glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC) SDL_GL_GetProcAddress("glShaderSourceARB");
+        ctx->glUniform1iARB = (PFNGLUNIFORM1IARBPROC) SDL_GL_GetProcAddress("glUniform1iARB");
+        ctx->glUniform1fARB = (PFNGLUNIFORM1FARBPROC) SDL_GL_GetProcAddress("glUniform1fARB");
+        ctx->glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC) SDL_GL_GetProcAddress("glUseProgramObjectARB");
+        if (ctx->glGetError &&
+            ctx->glAttachObjectARB &&
+            ctx->glCompileShaderARB &&
+            ctx->glCreateProgramObjectARB &&
+            ctx->glCreateShaderObjectARB &&
+            ctx->glDeleteObjectARB &&
+            ctx->glGetInfoLogARB &&
+            ctx->glGetObjectParameterivARB &&
+            ctx->glGetUniformLocationARB &&
+            ctx->glLinkProgramARB &&
+            ctx->glShaderSourceARB &&
+            ctx->glUniform1iARB &&
+            ctx->glUniform1fARB &&
+            ctx->glUseProgramObjectARB) {
+            shaders_supported = SDL_TRUE;
+        }
+    }
+
+    if (!shaders_supported) {
+        SDL_free(ctx);
+        return NULL;
+    }
+
+    /* Compile all the shaders */
+    for (i = 0; i < NUM_SHADERS; ++i) {
+        if (!CompileShaderProgram(ctx, i, &ctx->shaders[i])) {
+            GL_DestroyShaderContext(ctx);
+            return NULL;
+        }
+    }
+
+    /* We're done! */
+    return ctx;
+}
+
+void
+GL_SelectShader(GL_ShaderContext *ctx, GL_Shader shader)
+{
+    ctx->glUseProgramObjectARB(ctx->shaders[shader].program);
+}
+
+void
+GL_DestroyShaderContext(GL_ShaderContext *ctx)
+{
+    int i;
+
+    for (i = 0; i < NUM_SHADERS; ++i) {
+        DestroyShaderProgram(ctx, &ctx->shaders[i]);
+    }
+    SDL_free(ctx);
+}
+
+#endif /* SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/opengl/SDL_shaders_gl.h b/Source/3rd Party/sdl/src/render/opengl/SDL_shaders_gl.h
new file mode 100644
index 000000000..fdd4db7fc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengl/SDL_shaders_gl.h	
@@ -0,0 +1,39 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* OpenGL shader implementation */
+
+typedef enum {
+    SHADER_NONE,
+    SHADER_SOLID,
+    SHADER_RGB,
+    SHADER_YV12,
+    NUM_SHADERS
+} GL_Shader;
+
+typedef struct GL_ShaderContext GL_ShaderContext;
+
+extern GL_ShaderContext * GL_CreateShaderContext();
+extern void GL_SelectShader(GL_ShaderContext *ctx, GL_Shader shader);
+extern void GL_DestroyShaderContext(GL_ShaderContext *ctx);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/opengles/SDL_glesfuncs.h b/Source/3rd Party/sdl/src/render/opengles/SDL_glesfuncs.h
new file mode 100644
index 000000000..6dc197a63
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengles/SDL_glesfuncs.h	
@@ -0,0 +1,63 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+SDL_PROC(void, glBindTexture, (GLenum, GLuint))
+SDL_PROC(void, glBlendFunc, (GLenum, GLenum))
+SDL_PROC_OES(void, glBlendFuncSeparateOES, (GLenum, GLenum, GLenum, GLenum))
+SDL_PROC(void, glClear, (GLbitfield))
+SDL_PROC(void, glClearColor, (GLclampf, GLclampf, GLclampf, GLclampf))
+SDL_PROC(void, glColor4f, (GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC(void, glDeleteTextures, (GLsizei, const GLuint *))
+SDL_PROC(void, glDisable, (GLenum))
+SDL_PROC(void, glDisableClientState, (GLenum array))
+SDL_PROC(void, glDrawArrays, (GLenum, GLint, GLsizei))
+SDL_PROC_OES(void, glDrawTexfOES, (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC(void, glEnable, (GLenum))
+SDL_PROC(void, glEnableClientState, (GLenum))
+SDL_PROC(void, glFinish, (void))
+SDL_PROC_OES(void, glGenFramebuffersOES, (GLsizei, GLuint *))
+SDL_PROC(void, glGenTextures, (GLsizei, GLuint *))
+SDL_PROC(GLenum, glGetError, (void))
+SDL_PROC(void, glGetIntegerv, (GLenum, GLint *))
+SDL_PROC(void, glLoadIdentity, (void))
+SDL_PROC(void, glMatrixMode, (GLenum))
+SDL_PROC(void, glOrthof, (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC(void, glPixelStorei, (GLenum, GLint))
+SDL_PROC(void, glReadPixels, (GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid*))
+SDL_PROC(void, glScissor, (GLint, GLint, GLsizei, GLsizei))
+SDL_PROC(void, glTexCoordPointer, (GLint, GLenum, GLsizei, const GLvoid *))
+SDL_PROC(void, glTexEnvf, (GLenum, GLenum, GLfloat))
+SDL_PROC(void, glTexImage2D, (GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *))
+SDL_PROC(void, glTexParameteri, (GLenum, GLenum, GLint))
+SDL_PROC(void, glTexParameteriv, (GLenum, GLenum, const GLint *))
+SDL_PROC(void, glTexSubImage2D, (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *))
+SDL_PROC(void, glVertexPointer, (GLint, GLenum, GLsizei, const GLvoid *))
+SDL_PROC(void, glViewport, (GLint, GLint, GLsizei, GLsizei))
+SDL_PROC_OES(void, glBindFramebufferOES, (GLenum, GLuint))
+SDL_PROC_OES(void, glFramebufferTexture2DOES, (GLenum, GLenum, GLenum, GLuint, GLint))
+SDL_PROC_OES(GLenum, glCheckFramebufferStatusOES, (GLenum))
+SDL_PROC(void, glPushMatrix, (void))
+SDL_PROC(void, glTranslatef, (GLfloat, GLfloat, GLfloat))
+SDL_PROC(void, glRotatef, (GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC(void, glPopMatrix, (void))
+SDL_PROC_OES(void, glDeleteFramebuffersOES, (GLsizei, const GLuint*))
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/opengles/SDL_render_gles.c b/Source/3rd Party/sdl/src/render/opengles/SDL_render_gles.c
new file mode 100644
index 000000000..43a07a4b1
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengles/SDL_render_gles.c	
@@ -0,0 +1,1186 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_OGL_ES && !SDL_RENDER_DISABLED
+
+#include "SDL_hints.h"
+#include "SDL_opengles.h"
+#include "../SDL_sysrender.h"
+
+/* To prevent unnecessary window recreation, 
+ * these should match the defaults selected in SDL_GL_ResetAttributes 
+ */
+
+#define RENDERER_CONTEXT_MAJOR 1
+#define RENDERER_CONTEXT_MINOR 1
+
+#if defined(SDL_VIDEO_DRIVER_PANDORA)
+
+/* Empty function stub to get OpenGL ES 1.x support without  */
+/* OpenGL ES extension GL_OES_draw_texture supported         */
+GL_API void GL_APIENTRY
+glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
+{
+    return;
+}
+
+#endif /* PANDORA */
+
+/* OpenGL ES 1.1 renderer implementation, based on the OpenGL renderer */
+
+/* Used to re-create the window with OpenGL ES capability */
+extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
+
+static const float inv255f = 1.0f / 255.0f;
+
+static SDL_Renderer *GLES_CreateRenderer(SDL_Window * window, Uint32 flags);
+static void GLES_WindowEvent(SDL_Renderer * renderer,
+                             const SDL_WindowEvent *event);
+static int GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                              const SDL_Rect * rect, const void *pixels,
+                              int pitch);
+static int GLES_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                            const SDL_Rect * rect, void **pixels, int *pitch);
+static void GLES_UnlockTexture(SDL_Renderer * renderer,
+                               SDL_Texture * texture);
+static int GLES_SetRenderTarget(SDL_Renderer * renderer,
+                                 SDL_Texture * texture);
+static int GLES_UpdateViewport(SDL_Renderer * renderer);
+static int GLES_UpdateClipRect(SDL_Renderer * renderer);
+static int GLES_RenderClear(SDL_Renderer * renderer);
+static int GLES_RenderDrawPoints(SDL_Renderer * renderer,
+                                 const SDL_FPoint * points, int count);
+static int GLES_RenderDrawLines(SDL_Renderer * renderer,
+                                const SDL_FPoint * points, int count);
+static int GLES_RenderFillRects(SDL_Renderer * renderer,
+                                const SDL_FRect * rects, int count);
+static int GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                           const SDL_Rect * srcrect,
+                           const SDL_FRect * dstrect);
+static int GLES_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                         const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                         const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip);
+static int GLES_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                    Uint32 pixel_format, void * pixels, int pitch);
+static void GLES_RenderPresent(SDL_Renderer * renderer);
+static void GLES_DestroyTexture(SDL_Renderer * renderer,
+                                SDL_Texture * texture);
+static void GLES_DestroyRenderer(SDL_Renderer * renderer);
+static int GLES_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh);
+static int GLES_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture);
+
+typedef struct GLES_FBOList GLES_FBOList;
+
+struct GLES_FBOList
+{
+   Uint32 w, h;
+   GLuint FBO;
+   GLES_FBOList *next;
+};
+
+
+SDL_RenderDriver GLES_RenderDriver = {
+    GLES_CreateRenderer,
+    {
+     "opengles",
+     (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC),
+     1,
+     {SDL_PIXELFORMAT_ABGR8888},
+     0,
+     0}
+};
+
+typedef struct
+{
+    SDL_GLContext context;
+    struct {
+        Uint32 color;
+        int blendMode;
+        SDL_bool tex_coords;
+    } current;
+
+#define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
+#define SDL_PROC_OES SDL_PROC
+#include "SDL_glesfuncs.h"
+#undef SDL_PROC
+#undef SDL_PROC_OES
+    SDL_bool GL_OES_framebuffer_object_supported;
+    GLES_FBOList *framebuffers;
+    GLuint window_framebuffer;
+
+    SDL_bool useDrawTexture;
+    SDL_bool GL_OES_draw_texture_supported;
+    SDL_bool GL_OES_blend_func_separate_supported;
+} GLES_RenderData;
+
+typedef struct
+{
+    GLuint texture;
+    GLenum type;
+    GLfloat texw;
+    GLfloat texh;
+    GLenum format;
+    GLenum formattype;
+    void *pixels;
+    int pitch;
+    GLES_FBOList *fbo;
+} GLES_TextureData;
+
+static int
+GLES_SetError(const char *prefix, GLenum result)
+{
+    const char *error;
+
+    switch (result) {
+    case GL_NO_ERROR:
+        error = "GL_NO_ERROR";
+        break;
+    case GL_INVALID_ENUM:
+        error = "GL_INVALID_ENUM";
+        break;
+    case GL_INVALID_VALUE:
+        error = "GL_INVALID_VALUE";
+        break;
+    case GL_INVALID_OPERATION:
+        error = "GL_INVALID_OPERATION";
+        break;
+    case GL_STACK_OVERFLOW:
+        error = "GL_STACK_OVERFLOW";
+        break;
+    case GL_STACK_UNDERFLOW:
+        error = "GL_STACK_UNDERFLOW";
+        break;
+    case GL_OUT_OF_MEMORY:
+        error = "GL_OUT_OF_MEMORY";
+        break;
+    default:
+        error = "UNKNOWN";
+        break;
+    }
+    return SDL_SetError("%s: %s", prefix, error);
+}
+
+static int GLES_LoadFunctions(GLES_RenderData * data)
+{
+#if SDL_VIDEO_DRIVER_UIKIT
+#define __SDL_NOGETPROCADDR__
+#elif SDL_VIDEO_DRIVER_ANDROID
+#define __SDL_NOGETPROCADDR__
+#elif SDL_VIDEO_DRIVER_PANDORA
+#define __SDL_NOGETPROCADDR__
+#endif
+
+#ifdef __SDL_NOGETPROCADDR__
+#define SDL_PROC(ret,func,params) data->func=func;
+#define SDL_PROC_OES(ret,func,params) data->func=func;
+#else
+#define SDL_PROC(ret,func,params) \
+    do { \
+        data->func = SDL_GL_GetProcAddress(#func); \
+        if ( ! data->func ) { \
+            return SDL_SetError("Couldn't load GLES function %s: %s\n", #func, SDL_GetError()); \
+        } \
+    } while ( 0 );
+#define SDL_PROC_OES(ret,func,params) \
+    do { \
+        data->func = SDL_GL_GetProcAddress(#func); \
+    } while ( 0 );    
+#endif /* _SDL_NOGETPROCADDR_ */
+
+#include "SDL_glesfuncs.h"
+#undef SDL_PROC
+#undef SDL_PROC_OES
+    return 0;
+}
+
+static SDL_GLContext SDL_CurrentContext = NULL;
+
+GLES_FBOList *
+GLES_GetFBO(GLES_RenderData *data, Uint32 w, Uint32 h)
+{
+   GLES_FBOList *result = data->framebuffers;
+   while ((result) && ((result->w != w) || (result->h != h)) )
+   {
+       result = result->next;
+   }
+   if (result == NULL)
+   {
+       result = SDL_malloc(sizeof(GLES_FBOList));
+       result->w = w;
+       result->h = h;
+       data->glGenFramebuffersOES(1, &result->FBO);
+       result->next = data->framebuffers;
+       data->framebuffers = result;
+   }
+   return result;
+}
+
+
+static int
+GLES_ActivateRenderer(SDL_Renderer * renderer)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+
+    if (SDL_CurrentContext != data->context) {
+        if (SDL_GL_MakeCurrent(renderer->window, data->context) < 0) {
+            return -1;
+        }
+        SDL_CurrentContext = data->context;
+
+        GLES_UpdateViewport(renderer);
+    }
+    return 0;
+}
+
+/* This is called if we need to invalidate all of the SDL OpenGL state */
+static void
+GLES_ResetState(SDL_Renderer *renderer)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+
+    if (SDL_CurrentContext == data->context) {
+        GLES_UpdateViewport(renderer);
+    } else {
+        GLES_ActivateRenderer(renderer);
+    }
+
+    data->current.color = 0;
+    data->current.blendMode = -1;
+    data->current.tex_coords = SDL_FALSE;
+
+    data->glDisable(GL_DEPTH_TEST);
+    data->glDisable(GL_CULL_FACE);
+
+    data->glMatrixMode(GL_MODELVIEW);
+    data->glLoadIdentity();
+
+    data->glEnableClientState(GL_VERTEX_ARRAY);
+    data->glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+
+SDL_Renderer *
+GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
+{
+
+    SDL_Renderer *renderer;
+    GLES_RenderData *data;
+    GLint value;
+    Uint32 windowFlags;
+    int profile_mask, major, minor;
+
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask);
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major);
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor);
+
+    windowFlags = SDL_GetWindowFlags(window);
+    if (!(windowFlags & SDL_WINDOW_OPENGL) ||
+        profile_mask != SDL_GL_CONTEXT_PROFILE_ES || major != RENDERER_CONTEXT_MAJOR || minor != RENDERER_CONTEXT_MINOR) {
+
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, RENDERER_CONTEXT_MAJOR);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, RENDERER_CONTEXT_MINOR);
+
+        if (SDL_RecreateWindow(window, windowFlags | SDL_WINDOW_OPENGL) < 0) {
+            /* Uh oh, better try to put it back... */
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profile_mask);
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, major);
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minor);
+            SDL_RecreateWindow(window, windowFlags);
+            return NULL;
+        }
+    }
+
+    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
+    if (!renderer) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    data = (GLES_RenderData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        GLES_DestroyRenderer(renderer);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    renderer->WindowEvent = GLES_WindowEvent;
+    renderer->CreateTexture = GLES_CreateTexture;
+    renderer->UpdateTexture = GLES_UpdateTexture;
+    renderer->LockTexture = GLES_LockTexture;
+    renderer->UnlockTexture = GLES_UnlockTexture;
+    renderer->SetRenderTarget = GLES_SetRenderTarget;
+    renderer->UpdateViewport = GLES_UpdateViewport;
+    renderer->UpdateClipRect = GLES_UpdateClipRect;
+    renderer->RenderClear = GLES_RenderClear;
+    renderer->RenderDrawPoints = GLES_RenderDrawPoints;
+    renderer->RenderDrawLines = GLES_RenderDrawLines;
+    renderer->RenderFillRects = GLES_RenderFillRects;
+    renderer->RenderCopy = GLES_RenderCopy;
+    renderer->RenderCopyEx = GLES_RenderCopyEx;
+    renderer->RenderReadPixels = GLES_RenderReadPixels;
+    renderer->RenderPresent = GLES_RenderPresent;
+    renderer->DestroyTexture = GLES_DestroyTexture;
+    renderer->DestroyRenderer = GLES_DestroyRenderer;
+    renderer->GL_BindTexture = GLES_BindTexture;
+    renderer->GL_UnbindTexture = GLES_UnbindTexture;
+    renderer->info = GLES_RenderDriver.info;
+    renderer->info.flags = SDL_RENDERER_ACCELERATED;
+    renderer->driverdata = data;
+    renderer->window = window;
+
+    data->context = SDL_GL_CreateContext(window);
+    if (!data->context) {
+        GLES_DestroyRenderer(renderer);
+        return NULL;
+    }
+    if (SDL_GL_MakeCurrent(window, data->context) < 0) {
+        GLES_DestroyRenderer(renderer);
+        return NULL;
+    }
+
+    if (GLES_LoadFunctions(data) < 0) {
+        GLES_DestroyRenderer(renderer);
+        return NULL;
+    }
+
+    if (flags & SDL_RENDERER_PRESENTVSYNC) {
+        SDL_GL_SetSwapInterval(1);
+    } else {
+        SDL_GL_SetSwapInterval(0);
+    }
+    if (SDL_GL_GetSwapInterval() > 0) {
+        renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
+    }
+
+#if SDL_VIDEO_DRIVER_PANDORA
+    data->GL_OES_draw_texture_supported = SDL_FALSE;
+    data->useDrawTexture = SDL_FALSE;
+#else
+    if (SDL_GL_ExtensionSupported("GL_OES_draw_texture")) {
+        data->GL_OES_draw_texture_supported = SDL_TRUE;
+        data->useDrawTexture = SDL_TRUE;
+    } else {
+        data->GL_OES_draw_texture_supported = SDL_FALSE;
+        data->useDrawTexture = SDL_FALSE;
+    }
+#endif
+
+    value = 0;
+    data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
+    renderer->info.max_texture_width = value;
+    value = 0;
+    data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
+    renderer->info.max_texture_height = value;
+
+    /* Android does not report GL_OES_framebuffer_object but the functionality seems to be there anyway */
+    if (SDL_GL_ExtensionSupported("GL_OES_framebuffer_object") || data->glGenFramebuffersOES) {
+        data->GL_OES_framebuffer_object_supported = SDL_TRUE;
+        renderer->info.flags |= SDL_RENDERER_TARGETTEXTURE;
+
+        value = 0;
+        data->glGetIntegerv(GL_FRAMEBUFFER_BINDING_OES, &value);
+        data->window_framebuffer = (GLuint)value;
+    }
+    data->framebuffers = NULL;
+
+    if (SDL_GL_ExtensionSupported("GL_OES_blend_func_separate")) {
+        data->GL_OES_blend_func_separate_supported = SDL_TRUE;
+    }
+
+    /* Set up parameters for rendering */
+    GLES_ResetState(renderer);
+
+    return renderer;
+}
+
+static void
+GLES_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+
+    if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED ||
+        event->event == SDL_WINDOWEVENT_SHOWN ||
+        event->event == SDL_WINDOWEVENT_HIDDEN) {
+        /* Rebind the context to the window area and update matrices */
+        SDL_CurrentContext = NULL;
+    }
+
+    if (event->event == SDL_WINDOWEVENT_MINIMIZED) {
+        /* According to Apple documentation, we need to finish drawing NOW! */
+        data->glFinish();
+    }
+}
+
+static SDL_INLINE int
+power_of_2(int input)
+{
+    int value = 1;
+
+    while (value < input) {
+        value <<= 1;
+    }
+    return value;
+}
+
+static GLenum
+GetScaleQuality(void)
+{
+    const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY);
+
+    if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
+        return GL_NEAREST;
+    } else {
+        return GL_LINEAR;
+    }
+}
+
+static int
+GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata;
+    GLES_TextureData *data;
+    GLint internalFormat;
+    GLenum format, type;
+    int texture_w, texture_h;
+    GLenum scaleMode;
+    GLenum result;
+
+    GLES_ActivateRenderer(renderer);
+
+    switch (texture->format) {
+    case SDL_PIXELFORMAT_ABGR8888:
+        internalFormat = GL_RGBA;
+        format = GL_RGBA;
+        type = GL_UNSIGNED_BYTE;
+        break;
+    default:
+        return SDL_SetError("Texture format not supported");
+    }
+
+    data = (GLES_TextureData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        data->pitch = texture->w * SDL_BYTESPERPIXEL(texture->format);
+        data->pixels = SDL_calloc(1, texture->h * data->pitch);
+        if (!data->pixels) {
+            SDL_free(data);
+            return SDL_OutOfMemory();
+        }
+    }
+
+    
+    if (texture->access == SDL_TEXTUREACCESS_TARGET) {
+        if (!renderdata->GL_OES_framebuffer_object_supported) {
+            SDL_free(data);
+            return SDL_SetError("GL_OES_framebuffer_object not supported");
+        }
+        data->fbo = GLES_GetFBO(renderer->driverdata, texture->w, texture->h);
+    } else {
+        data->fbo = NULL;
+    }
+    
+
+    renderdata->glGetError();
+    renderdata->glEnable(GL_TEXTURE_2D);
+    renderdata->glGenTextures(1, &data->texture);
+    result = renderdata->glGetError();
+    if (result != GL_NO_ERROR) {
+        SDL_free(data);
+        return GLES_SetError("glGenTextures()", result);
+    }
+
+    data->type = GL_TEXTURE_2D;
+    /* no NPOV textures allowed in OpenGL ES (yet) */
+    texture_w = power_of_2(texture->w);
+    texture_h = power_of_2(texture->h);
+    data->texw = (GLfloat) texture->w / texture_w;
+    data->texh = (GLfloat) texture->h / texture_h;
+
+    data->format = format;
+    data->formattype = type;
+    scaleMode = GetScaleQuality();
+    renderdata->glBindTexture(data->type, data->texture);
+    renderdata->glTexParameteri(data->type, GL_TEXTURE_MIN_FILTER, scaleMode);
+    renderdata->glTexParameteri(data->type, GL_TEXTURE_MAG_FILTER, scaleMode);
+    renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+    renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w,
+                             texture_h, 0, format, type, NULL);
+    renderdata->glDisable(GL_TEXTURE_2D);
+
+    result = renderdata->glGetError();
+    if (result != GL_NO_ERROR) {
+        SDL_free(data);
+        return GLES_SetError("glTexImage2D()", result);
+    }
+    
+    texture->driverdata = data;
+    return 0;
+}
+
+static int
+GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                   const SDL_Rect * rect, const void *pixels, int pitch)
+{
+    GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata;
+    GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
+    Uint8 *blob = NULL;
+    Uint8 *src;
+    int srcPitch;
+    int y;
+
+    GLES_ActivateRenderer(renderer);
+
+    /* Bail out if we're supposed to update an empty rectangle */
+    if (rect->w <= 0 || rect->h <= 0)
+        return 0;
+
+    /* Reformat the texture data into a tightly packed array */
+    srcPitch = rect->w * SDL_BYTESPERPIXEL(texture->format);
+    src = (Uint8 *)pixels;
+    if (pitch != srcPitch) {
+        blob = (Uint8 *)SDL_malloc(srcPitch * rect->h);
+        if (!blob) {
+            return SDL_OutOfMemory();
+        }
+        src = blob;
+        for (y = 0; y < rect->h; ++y) {
+            SDL_memcpy(src, pixels, srcPitch);
+            src += srcPitch;
+            pixels = (Uint8 *)pixels + pitch;
+        }
+        src = blob;
+    }
+
+    /* Create a texture subimage with the supplied data */
+    renderdata->glGetError();
+    renderdata->glEnable(data->type);
+    renderdata->glBindTexture(data->type, data->texture);
+    renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    renderdata->glTexSubImage2D(data->type,
+                    0,
+                    rect->x,
+                    rect->y,
+                    rect->w,
+                    rect->h,
+                    data->format,
+                    data->formattype,
+                    src);
+    SDL_free(blob);
+
+    if (renderdata->glGetError() != GL_NO_ERROR)
+    {
+        return SDL_SetError("Failed to update texture");
+    }
+    return 0;
+}
+
+static int
+GLES_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                 const SDL_Rect * rect, void **pixels, int *pitch)
+{
+    GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
+
+    *pixels =
+        (void *) ((Uint8 *) data->pixels + rect->y * data->pitch +
+                  rect->x * SDL_BYTESPERPIXEL(texture->format));
+    *pitch = data->pitch;
+    return 0;
+}
+
+static void
+GLES_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
+    SDL_Rect rect;
+
+    /* We do whole texture updates, at least for now */
+    rect.x = 0;
+    rect.y = 0;
+    rect.w = texture->w;
+    rect.h = texture->h;
+    GLES_UpdateTexture(renderer, texture, &rect, data->pixels, data->pitch);
+}
+
+static int
+GLES_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+    GLES_TextureData *texturedata = NULL;
+    GLenum status;
+
+    GLES_ActivateRenderer(renderer);
+    
+    if (!data->GL_OES_framebuffer_object_supported) {
+        return SDL_SetError("Can't enable render target support in this renderer");
+    }
+
+    if (texture == NULL) {
+        data->glBindFramebufferOES(GL_FRAMEBUFFER_OES, data->window_framebuffer);
+        return 0;
+    }
+
+    texturedata = (GLES_TextureData *) texture->driverdata;
+    data->glBindFramebufferOES(GL_FRAMEBUFFER_OES, texturedata->fbo->FBO);
+    /* TODO: check if texture pixel format allows this operation */
+    data->glFramebufferTexture2DOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, texturedata->type, texturedata->texture, 0);
+    /* Check FBO status */
+    status = data->glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES);
+    if (status != GL_FRAMEBUFFER_COMPLETE_OES) {
+        return SDL_SetError("glFramebufferTexture2DOES() failed");
+    }
+    return 0;
+}
+
+static int
+GLES_UpdateViewport(SDL_Renderer * renderer)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+
+    if (SDL_CurrentContext != data->context) {
+        /* We'll update the viewport after we rebind the context */
+        return 0;
+    }
+
+    data->glViewport(renderer->viewport.x, renderer->viewport.y,
+               renderer->viewport.w, renderer->viewport.h);
+
+    if (renderer->viewport.w && renderer->viewport.h) {
+        data->glMatrixMode(GL_PROJECTION);
+        data->glLoadIdentity();
+        data->glOrthof((GLfloat) 0,
+                 (GLfloat) renderer->viewport.w,
+                 (GLfloat) renderer->viewport.h,
+                 (GLfloat) 0, 0.0, 1.0);
+    }
+    return 0;
+}
+
+static int
+GLES_UpdateClipRect(SDL_Renderer * renderer)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+    const SDL_Rect *rect = &renderer->clip_rect;
+
+    if (SDL_CurrentContext != data->context) {
+        /* We'll update the clip rect after we rebind the context */
+        return 0;
+    }
+
+    if (!SDL_RectEmpty(rect)) {
+        data->glEnable(GL_SCISSOR_TEST);
+        data->glScissor(rect->x, renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
+    } else {
+        data->glDisable(GL_SCISSOR_TEST);
+    }
+    return 0;
+}
+
+static void
+GLES_SetColor(GLES_RenderData * data, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    Uint32 color = ((a << 24) | (r << 16) | (g << 8) | b);
+
+    if (color != data->current.color) {
+        data->glColor4f((GLfloat) r * inv255f,
+                        (GLfloat) g * inv255f,
+                        (GLfloat) b * inv255f,
+                        (GLfloat) a * inv255f);
+        data->current.color = color;
+    }
+}
+
+static void
+GLES_SetBlendMode(GLES_RenderData * data, int blendMode)
+{
+    if (blendMode != data->current.blendMode) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_NONE:
+            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+            data->glDisable(GL_BLEND);
+            break;
+        case SDL_BLENDMODE_BLEND:
+            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            data->glEnable(GL_BLEND);
+            if (data->GL_OES_blend_func_separate_supported) {
+                data->glBlendFuncSeparateOES(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+            } else {
+                data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+            }
+            break;
+        case SDL_BLENDMODE_ADD:
+            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            data->glEnable(GL_BLEND);
+            if (data->GL_OES_blend_func_separate_supported) {
+                data->glBlendFuncSeparateOES(GL_SRC_ALPHA, GL_ONE, GL_ZERO, GL_ONE);
+            } else {
+                data->glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+            }
+            break;
+        case SDL_BLENDMODE_MOD:
+            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+            data->glEnable(GL_BLEND);
+            if (data->GL_OES_blend_func_separate_supported) {
+                data->glBlendFuncSeparateOES(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE);
+            } else {
+                data->glBlendFunc(GL_ZERO, GL_SRC_COLOR);
+            }
+            break;
+        }
+        data->current.blendMode = blendMode;
+    }
+}
+
+static void
+GLES_SetTexCoords(GLES_RenderData * data, SDL_bool enabled)
+{
+    if (enabled != data->current.tex_coords) {
+        if (enabled) {
+            data->glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        } else {
+            data->glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        }
+        data->current.tex_coords = enabled;
+    }
+}
+
+static void
+GLES_SetDrawingState(SDL_Renderer * renderer)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+
+    GLES_ActivateRenderer(renderer);
+
+    GLES_SetColor(data, (GLfloat) renderer->r,
+                        (GLfloat) renderer->g,
+                        (GLfloat) renderer->b,
+                        (GLfloat) renderer->a);
+
+    GLES_SetBlendMode(data, renderer->blendMode);
+
+    GLES_SetTexCoords(data, SDL_FALSE);
+}
+
+static int
+GLES_RenderClear(SDL_Renderer * renderer)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+
+    GLES_ActivateRenderer(renderer);
+
+    data->glClearColor((GLfloat) renderer->r * inv255f,
+                 (GLfloat) renderer->g * inv255f,
+                 (GLfloat) renderer->b * inv255f,
+                 (GLfloat) renderer->a * inv255f);
+
+    data->glClear(GL_COLOR_BUFFER_BIT);
+
+    return 0;
+}
+
+static int
+GLES_RenderDrawPoints(SDL_Renderer * renderer, const SDL_FPoint * points,
+                      int count)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+
+    GLES_SetDrawingState(renderer);
+
+    data->glVertexPointer(2, GL_FLOAT, 0, points);
+    data->glDrawArrays(GL_POINTS, 0, count);
+
+    return 0;
+}
+
+static int
+GLES_RenderDrawLines(SDL_Renderer * renderer, const SDL_FPoint * points,
+                     int count)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+
+    GLES_SetDrawingState(renderer);
+
+    data->glVertexPointer(2, GL_FLOAT, 0, points);
+    if (count > 2 &&
+        points[0].x == points[count-1].x && points[0].y == points[count-1].y) {
+        /* GL_LINE_LOOP takes care of the final segment */
+        --count;
+        data->glDrawArrays(GL_LINE_LOOP, 0, count);
+    } else {
+        data->glDrawArrays(GL_LINE_STRIP, 0, count);
+        /* We need to close the endpoint of the line */
+        data->glDrawArrays(GL_POINTS, count-1, 1);
+    }
+
+    return 0;
+}
+
+static int
+GLES_RenderFillRects(SDL_Renderer * renderer, const SDL_FRect * rects,
+                     int count)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+    int i;
+
+    GLES_SetDrawingState(renderer);
+
+    for (i = 0; i < count; ++i) {
+        const SDL_FRect *rect = &rects[i];
+        GLfloat minx = rect->x;
+        GLfloat maxx = rect->x + rect->w;
+        GLfloat miny = rect->y;
+        GLfloat maxy = rect->y + rect->h;
+        GLfloat vertices[8];
+        vertices[0] = minx;
+        vertices[1] = miny;
+        vertices[2] = maxx;
+        vertices[3] = miny;
+        vertices[4] = minx;
+        vertices[5] = maxy;
+        vertices[6] = maxx;
+        vertices[7] = maxy;
+
+        data->glVertexPointer(2, GL_FLOAT, 0, vertices);
+        data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+    }
+
+    return 0;
+}
+
+static int
+GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                const SDL_Rect * srcrect, const SDL_FRect * dstrect)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+    GLES_TextureData *texturedata = (GLES_TextureData *) texture->driverdata;
+    GLfloat minx, miny, maxx, maxy;
+    GLfloat minu, maxu, minv, maxv;
+    GLfloat vertices[8];
+    GLfloat texCoords[8];
+
+    GLES_ActivateRenderer(renderer);
+
+    data->glEnable(GL_TEXTURE_2D);
+
+    data->glBindTexture(texturedata->type, texturedata->texture);
+
+    if (texture->modMode) {
+        GLES_SetColor(data, texture->r, texture->g, texture->b, texture->a);
+    } else {
+        GLES_SetColor(data, 255, 255, 255, 255);
+    }
+
+    GLES_SetBlendMode(data, texture->blendMode);
+
+    GLES_SetTexCoords(data, SDL_TRUE);
+
+    if (data->GL_OES_draw_texture_supported && data->useDrawTexture) {
+        /* this code is a little funny because the viewport is upside down vs SDL's coordinate system */
+        GLint cropRect[4];
+        int w, h;
+        SDL_Window *window = renderer->window;
+
+        SDL_GetWindowSize(window, &w, &h);
+        if (renderer->target) {
+            cropRect[0] = srcrect->x;
+            cropRect[1] = srcrect->y;
+            cropRect[2] = srcrect->w;
+            cropRect[3] = srcrect->h;
+            data->glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES,
+                                   cropRect);
+            data->glDrawTexfOES(renderer->viewport.x + dstrect->x, renderer->viewport.y + dstrect->y, 0,
+                                dstrect->w, dstrect->h);
+        } else {
+            cropRect[0] = srcrect->x;
+            cropRect[1] = srcrect->y + srcrect->h;
+            cropRect[2] = srcrect->w;
+            cropRect[3] = -srcrect->h;
+            data->glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES,
+                                   cropRect);
+            data->glDrawTexfOES(renderer->viewport.x + dstrect->x,
+                        h - (renderer->viewport.y + dstrect->y) - dstrect->h, 0,
+                        dstrect->w, dstrect->h);
+        }
+    } else {
+
+        minx = dstrect->x;
+        miny = dstrect->y;
+        maxx = dstrect->x + dstrect->w;
+        maxy = dstrect->y + dstrect->h;
+
+        minu = (GLfloat) srcrect->x / texture->w;
+        minu *= texturedata->texw;
+        maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w;
+        maxu *= texturedata->texw;
+        minv = (GLfloat) srcrect->y / texture->h;
+        minv *= texturedata->texh;
+        maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h;
+        maxv *= texturedata->texh;
+
+        vertices[0] = minx;
+        vertices[1] = miny;
+        vertices[2] = maxx;
+        vertices[3] = miny;
+        vertices[4] = minx;
+        vertices[5] = maxy;
+        vertices[6] = maxx;
+        vertices[7] = maxy;
+
+        texCoords[0] = minu;
+        texCoords[1] = minv;
+        texCoords[2] = maxu;
+        texCoords[3] = minv;
+        texCoords[4] = minu;
+        texCoords[5] = maxv;
+        texCoords[6] = maxu;
+        texCoords[7] = maxv;
+
+        data->glVertexPointer(2, GL_FLOAT, 0, vertices);
+        data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
+        data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+    }
+    data->glDisable(GL_TEXTURE_2D);
+
+    return 0;
+}
+
+static int
+GLES_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip)
+{
+
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+    GLES_TextureData *texturedata = (GLES_TextureData *) texture->driverdata;
+    GLfloat minx, miny, maxx, maxy;
+    GLfloat minu, maxu, minv, maxv;
+    GLfloat centerx, centery;
+    GLfloat vertices[8];
+    GLfloat texCoords[8];
+
+
+    GLES_ActivateRenderer(renderer);
+
+    data->glEnable(GL_TEXTURE_2D);
+
+    data->glBindTexture(texturedata->type, texturedata->texture);
+
+    if (texture->modMode) {
+        GLES_SetColor(data, texture->r, texture->g, texture->b, texture->a);
+    } else {
+        GLES_SetColor(data, 255, 255, 255, 255);
+    }
+
+    GLES_SetBlendMode(data, texture->blendMode);
+
+    GLES_SetTexCoords(data, SDL_TRUE);
+
+    centerx = center->x;
+    centery = center->y;
+
+    /* Rotate and translate */
+    data->glPushMatrix();
+    data->glTranslatef(dstrect->x + centerx, dstrect->y + centery, 0.0f);
+    data->glRotatef((GLfloat)angle, 0.0f, 0.0f, 1.0f);
+
+    if (flip & SDL_FLIP_HORIZONTAL) {
+        minx =  dstrect->w - centerx;
+        maxx = -centerx;
+    } else {
+        minx = -centerx;
+        maxx = dstrect->w - centerx;
+    }
+
+    if (flip & SDL_FLIP_VERTICAL) {
+        miny = dstrect->h - centery;
+        maxy = -centery;
+    } else {
+        miny = -centery;
+        maxy = dstrect->h - centery;
+    }
+
+    minu = (GLfloat) srcrect->x / texture->w;
+    minu *= texturedata->texw;
+    maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w;
+    maxu *= texturedata->texw;
+    minv = (GLfloat) srcrect->y / texture->h;
+    minv *= texturedata->texh;
+    maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h;
+    maxv *= texturedata->texh;
+
+    vertices[0] = minx;
+    vertices[1] = miny;
+    vertices[2] = maxx;
+    vertices[3] = miny;
+    vertices[4] = minx;
+    vertices[5] = maxy;
+    vertices[6] = maxx;
+    vertices[7] = maxy;
+
+    texCoords[0] = minu;
+    texCoords[1] = minv;
+    texCoords[2] = maxu;
+    texCoords[3] = minv;
+    texCoords[4] = minu;
+    texCoords[5] = maxv;
+    texCoords[6] = maxu;
+    texCoords[7] = maxv;
+    data->glVertexPointer(2, GL_FLOAT, 0, vertices);
+    data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
+    data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+    data->glPopMatrix();
+    data->glDisable(GL_TEXTURE_2D);
+
+    return 0;
+}
+
+static int
+GLES_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                    Uint32 pixel_format, void * pixels, int pitch)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+    Uint32 temp_format = SDL_PIXELFORMAT_ABGR8888;
+    void *temp_pixels;
+    int temp_pitch;
+    Uint8 *src, *dst, *tmp;
+    int w, h, length, rows;
+    int status;
+
+    GLES_ActivateRenderer(renderer);
+
+    temp_pitch = rect->w * SDL_BYTESPERPIXEL(temp_format);
+    temp_pixels = SDL_malloc(rect->h * temp_pitch);
+    if (!temp_pixels) {
+        return SDL_OutOfMemory();
+    }
+
+    SDL_GetRendererOutputSize(renderer, &w, &h);
+
+    data->glPixelStorei(GL_PACK_ALIGNMENT, 1);
+
+    data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h,
+                       GL_RGBA, GL_UNSIGNED_BYTE, temp_pixels);
+
+    /* Flip the rows to be top-down */
+    length = rect->w * SDL_BYTESPERPIXEL(temp_format);
+    src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch;
+    dst = (Uint8*)temp_pixels;
+    tmp = SDL_stack_alloc(Uint8, length);
+    rows = rect->h / 2;
+    while (rows--) {
+        SDL_memcpy(tmp, dst, length);
+        SDL_memcpy(dst, src, length);
+        SDL_memcpy(src, tmp, length);
+        dst += temp_pitch;
+        src -= temp_pitch;
+    }
+    SDL_stack_free(tmp);
+
+    status = SDL_ConvertPixels(rect->w, rect->h,
+                               temp_format, temp_pixels, temp_pitch,
+                               pixel_format, pixels, pitch);
+    SDL_free(temp_pixels);
+
+    return status;
+}
+
+static void
+GLES_RenderPresent(SDL_Renderer * renderer)
+{
+    GLES_ActivateRenderer(renderer);
+
+    SDL_GL_SwapWindow(renderer->window);
+}
+
+static void
+GLES_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata;
+
+    GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
+
+    GLES_ActivateRenderer(renderer);
+
+    if (!data) {
+        return;
+    }
+    if (data->texture) {
+        renderdata->glDeleteTextures(1, &data->texture);
+    }
+    SDL_free(data->pixels);
+    SDL_free(data);
+    texture->driverdata = NULL;
+}
+
+static void
+GLES_DestroyRenderer(SDL_Renderer * renderer)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+
+    if (data) {
+        if (data->context) {
+            while (data->framebuffers) {
+               GLES_FBOList *nextnode = data->framebuffers->next;
+               data->glDeleteFramebuffersOES(1, &data->framebuffers->FBO);
+               SDL_free(data->framebuffers);
+               data->framebuffers = nextnode;
+            }
+            SDL_GL_DeleteContext(data->context);
+        }
+        SDL_free(data);
+    }
+    SDL_free(renderer);
+}
+
+static int GLES_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+    GLES_TextureData *texturedata = (GLES_TextureData *) texture->driverdata;
+    GLES_ActivateRenderer(renderer);
+
+    data->glEnable(GL_TEXTURE_2D);
+    data->glBindTexture(texturedata->type, texturedata->texture);
+
+    if(texw) *texw = (float)texturedata->texw;
+    if(texh) *texh = (float)texturedata->texh;
+
+    return 0;
+}
+
+static int GLES_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture)
+{
+    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
+    GLES_TextureData *texturedata = (GLES_TextureData *) texture->driverdata;
+    GLES_ActivateRenderer(renderer);
+    data->glDisable(texturedata->type);
+
+    return 0;
+}
+
+#endif /* SDL_VIDEO_RENDER_OGL_ES && !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/opengles2/SDL_gles2funcs.h b/Source/3rd Party/sdl/src/render/opengles2/SDL_gles2funcs.h
new file mode 100644
index 000000000..c2a20f7db
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengles2/SDL_gles2funcs.h	
@@ -0,0 +1,71 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+SDL_PROC(void, glActiveTexture, (GLenum))
+SDL_PROC(void, glAttachShader, (GLuint, GLuint))
+SDL_PROC(void, glBindAttribLocation, (GLuint, GLuint, const char *))
+SDL_PROC(void, glBindTexture, (GLenum, GLuint))
+SDL_PROC(void, glBlendFuncSeparate, (GLenum, GLenum, GLenum, GLenum))
+SDL_PROC(void, glClear, (GLbitfield))
+SDL_PROC(void, glClearColor, (GLclampf, GLclampf, GLclampf, GLclampf))
+SDL_PROC(void, glCompileShader, (GLuint))
+SDL_PROC(GLuint, glCreateProgram, (void))
+SDL_PROC(GLuint, glCreateShader, (GLenum))
+SDL_PROC(void, glDeleteProgram, (GLuint))
+SDL_PROC(void, glDeleteShader, (GLuint))
+SDL_PROC(void, glDeleteTextures, (GLsizei, const GLuint *))
+SDL_PROC(void, glDisable, (GLenum))
+SDL_PROC(void, glDisableVertexAttribArray, (GLuint))
+SDL_PROC(void, glDrawArrays, (GLenum, GLint, GLsizei))
+SDL_PROC(void, glEnable, (GLenum))
+SDL_PROC(void, glEnableVertexAttribArray, (GLuint))
+SDL_PROC(void, glFinish, (void))
+SDL_PROC(void, glGenFramebuffers, (GLsizei, GLuint *))
+SDL_PROC(void, glGenTextures, (GLsizei, GLuint *))
+SDL_PROC(void, glGetBooleanv, (GLenum, GLboolean *))
+SDL_PROC(const GLubyte *, glGetString, (GLenum))
+SDL_PROC(GLenum, glGetError, (void))
+SDL_PROC(void, glGetIntegerv, (GLenum, GLint *))
+SDL_PROC(void, glGetProgramiv, (GLuint, GLenum, GLint *))
+SDL_PROC(void, glGetShaderInfoLog, (GLuint, GLsizei, GLsizei *, char *))
+SDL_PROC(void, glGetShaderiv, (GLuint, GLenum, GLint *))
+SDL_PROC(GLint, glGetUniformLocation, (GLuint, const char *))
+SDL_PROC(void, glLinkProgram, (GLuint))
+SDL_PROC(void, glPixelStorei, (GLenum, GLint))
+SDL_PROC(void, glReadPixels, (GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid*))
+SDL_PROC(void, glScissor, (GLint, GLint, GLsizei, GLsizei))
+SDL_PROC(void, glShaderBinary, (GLsizei, const GLuint *, GLenum, const void *, GLsizei))
+SDL_PROC(void, glShaderSource, (GLuint, GLsizei, const char **, const GLint *))
+SDL_PROC(void, glTexImage2D, (GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const void *))
+SDL_PROC(void, glTexParameteri, (GLenum, GLenum, GLint))
+SDL_PROC(void, glTexSubImage2D, (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *))
+SDL_PROC(void, glUniform1i, (GLint, GLint))
+SDL_PROC(void, glUniform4f, (GLint, GLfloat, GLfloat, GLfloat, GLfloat))
+SDL_PROC(void, glUniformMatrix4fv, (GLint, GLsizei, GLboolean, const GLfloat *))
+SDL_PROC(void, glUseProgram, (GLuint))
+SDL_PROC(void, glVertexAttribPointer, (GLuint, GLint, GLenum, GLboolean, GLsizei, const void *))
+SDL_PROC(void, glViewport, (GLint, GLint, GLsizei, GLsizei))
+SDL_PROC(void, glBindFramebuffer, (GLenum, GLuint))
+SDL_PROC(void, glFramebufferTexture2D, (GLenum, GLenum, GLenum, GLuint, GLint))
+SDL_PROC(GLenum, glCheckFramebufferStatus, (GLenum))
+SDL_PROC(void, glDeleteFramebuffers, (GLsizei, const GLuint *))
+SDL_PROC(GLint, glGetAttribLocation, (GLuint, const GLchar *))
+ 
diff --git a/Source/3rd Party/sdl/src/render/opengles2/SDL_render_gles2.c b/Source/3rd Party/sdl/src/render/opengles2/SDL_render_gles2.c
new file mode 100644
index 000000000..44484783f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengles2/SDL_render_gles2.c	
@@ -0,0 +1,1897 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_OGL_ES2 && !SDL_RENDER_DISABLED
+
+#include "SDL_hints.h"
+#include "SDL_opengles2.h"
+#include "../SDL_sysrender.h"
+#include "../../video/SDL_blit.h"
+#include "SDL_shaders_gles2.h"
+
+/* To prevent unnecessary window recreation, 
+ * these should match the defaults selected in SDL_GL_ResetAttributes 
+ */
+#define RENDERER_CONTEXT_MAJOR 2
+#define RENDERER_CONTEXT_MINOR 0
+
+/* Used to re-create the window with OpenGL ES capability */
+extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
+
+/*************************************************************************************************
+ * Bootstrap data                                                                                *
+ *************************************************************************************************/
+
+static SDL_Renderer *GLES2_CreateRenderer(SDL_Window *window, Uint32 flags);
+
+SDL_RenderDriver GLES2_RenderDriver = {
+    GLES2_CreateRenderer,
+    {
+        "opengles2",
+        (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE),
+        4,
+        {SDL_PIXELFORMAT_ABGR8888,
+        SDL_PIXELFORMAT_ARGB8888,
+        SDL_PIXELFORMAT_RGB888,
+        SDL_PIXELFORMAT_BGR888},
+        0,
+        0
+    }
+};
+
+/*************************************************************************************************
+ * Context structures                                                                            *
+ *************************************************************************************************/
+
+typedef struct GLES2_FBOList GLES2_FBOList;
+
+struct GLES2_FBOList
+{
+   Uint32 w, h;
+   GLuint FBO;
+   GLES2_FBOList *next;
+};
+
+typedef struct GLES2_TextureData
+{
+    GLenum texture;
+    GLenum texture_type;
+    GLenum pixel_format;
+    GLenum pixel_type;
+    void *pixel_data;
+    size_t pitch;
+    GLES2_FBOList *fbo;
+} GLES2_TextureData;
+
+typedef struct GLES2_ShaderCacheEntry
+{
+    GLuint id;
+    GLES2_ShaderType type;
+    const GLES2_ShaderInstance *instance;
+    int references;
+    Uint8 modulation_r, modulation_g, modulation_b, modulation_a;
+    struct GLES2_ShaderCacheEntry *prev;
+    struct GLES2_ShaderCacheEntry *next;
+} GLES2_ShaderCacheEntry;
+
+typedef struct GLES2_ShaderCache
+{
+    int count;
+    GLES2_ShaderCacheEntry *head;
+} GLES2_ShaderCache;
+
+typedef struct GLES2_ProgramCacheEntry
+{
+    GLuint id;
+    SDL_BlendMode blend_mode;
+    GLES2_ShaderCacheEntry *vertex_shader;
+    GLES2_ShaderCacheEntry *fragment_shader;
+    GLuint uniform_locations[16];
+    Uint8 color_r, color_g, color_b, color_a;
+    Uint8 modulation_r, modulation_g, modulation_b, modulation_a;
+    GLfloat projection[4][4];
+    struct GLES2_ProgramCacheEntry *prev;
+    struct GLES2_ProgramCacheEntry *next;
+} GLES2_ProgramCacheEntry;
+
+typedef struct GLES2_ProgramCache
+{
+    int count;
+    GLES2_ProgramCacheEntry *head;
+    GLES2_ProgramCacheEntry *tail;
+} GLES2_ProgramCache;
+
+typedef enum
+{
+    GLES2_ATTRIBUTE_POSITION = 0,
+    GLES2_ATTRIBUTE_TEXCOORD = 1,
+    GLES2_ATTRIBUTE_ANGLE = 2,
+    GLES2_ATTRIBUTE_CENTER = 3,
+} GLES2_Attribute;
+
+typedef enum
+{
+    GLES2_UNIFORM_PROJECTION,
+    GLES2_UNIFORM_TEXTURE,
+    GLES2_UNIFORM_MODULATION,
+    GLES2_UNIFORM_COLOR
+} GLES2_Uniform;
+
+typedef enum
+{
+    GLES2_IMAGESOURCE_SOLID,
+    GLES2_IMAGESOURCE_TEXTURE_ABGR,
+    GLES2_IMAGESOURCE_TEXTURE_ARGB,
+    GLES2_IMAGESOURCE_TEXTURE_RGB,
+    GLES2_IMAGESOURCE_TEXTURE_BGR
+} GLES2_ImageSource;
+
+typedef struct GLES2_DriverContext
+{
+    SDL_GLContext *context;
+
+    SDL_bool debug_enabled;
+
+    struct {
+        int blendMode;
+        SDL_bool tex_coords;
+    } current;
+
+#define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
+#include "SDL_gles2funcs.h"
+#undef SDL_PROC
+    GLES2_FBOList *framebuffers;
+    GLuint window_framebuffer;
+
+    int shader_format_count;
+    GLenum *shader_formats;
+    GLES2_ShaderCache shader_cache;
+    GLES2_ProgramCache program_cache;
+    GLES2_ProgramCacheEntry *current_program;
+    Uint8 clear_r, clear_g, clear_b, clear_a;
+} GLES2_DriverContext;
+
+#define GLES2_MAX_CACHED_PROGRAMS 8
+
+
+SDL_FORCE_INLINE const char*
+GL_TranslateError (GLenum error)
+{
+#define GL_ERROR_TRANSLATE(e) case e: return #e;
+    switch (error) {
+    GL_ERROR_TRANSLATE(GL_INVALID_ENUM)
+    GL_ERROR_TRANSLATE(GL_INVALID_VALUE)
+    GL_ERROR_TRANSLATE(GL_INVALID_OPERATION)
+    GL_ERROR_TRANSLATE(GL_OUT_OF_MEMORY)
+    GL_ERROR_TRANSLATE(GL_NO_ERROR)
+    default:
+        return "UNKNOWN";
+}
+#undef GL_ERROR_TRANSLATE
+}
+
+SDL_FORCE_INLINE void
+GL_ClearErrors(SDL_Renderer *renderer)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *) renderer->driverdata;
+
+    if (!data->debug_enabled)
+    {
+        return;
+    }
+    while (data->glGetError() != GL_NO_ERROR) {
+        continue;
+    }
+}
+
+SDL_FORCE_INLINE int
+GL_CheckAllErrors (const char *prefix, SDL_Renderer *renderer, const char *file, int line, const char *function)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *) renderer->driverdata;
+    int ret = 0;
+
+    if (!data->debug_enabled)
+    {
+        return 0;
+    }
+    /* check gl errors (can return multiple errors) */
+    for (;;) {
+        GLenum error = data->glGetError();
+        if (error != GL_NO_ERROR) {
+            if (prefix == NULL || prefix[0] == '\0') {
+                prefix = "generic";
+            }
+            SDL_SetError("%s: %s (%d): %s %s (0x%X)", prefix, file, line, function, GL_TranslateError(error), error);
+            ret = -1;
+        } else {
+            break;
+        }
+    }
+    return ret;
+}
+
+#if 0
+#define GL_CheckError(prefix, renderer)
+#elif defined(_MSC_VER)
+#define GL_CheckError(prefix, renderer) GL_CheckAllErrors(prefix, renderer, __FILE__, __LINE__, __FUNCTION__)
+#else
+#define GL_CheckError(prefix, renderer) GL_CheckAllErrors(prefix, renderer, __FILE__, __LINE__, __PRETTY_FUNCTION__)
+#endif
+
+
+/*************************************************************************************************
+ * Renderer state APIs                                                                           *
+ *************************************************************************************************/
+
+static int GLES2_ActivateRenderer(SDL_Renderer *renderer);
+static void GLES2_WindowEvent(SDL_Renderer * renderer,
+                              const SDL_WindowEvent *event);
+static int GLES2_UpdateViewport(SDL_Renderer * renderer);
+static void GLES2_DestroyRenderer(SDL_Renderer *renderer);
+static int GLES2_SetOrthographicProjection(SDL_Renderer *renderer);
+
+
+static SDL_GLContext SDL_CurrentContext = NULL;
+
+static int GLES2_LoadFunctions(GLES2_DriverContext * data)
+{
+#if SDL_VIDEO_DRIVER_UIKIT
+#define __SDL_NOGETPROCADDR__
+#elif SDL_VIDEO_DRIVER_ANDROID
+#define __SDL_NOGETPROCADDR__
+#elif SDL_VIDEO_DRIVER_PANDORA
+#define __SDL_NOGETPROCADDR__
+#endif
+
+#if defined __SDL_NOGETPROCADDR__
+#define SDL_PROC(ret,func,params) data->func=func;
+#else
+#define SDL_PROC(ret,func,params) \
+    do { \
+        data->func = SDL_GL_GetProcAddress(#func); \
+        if ( ! data->func ) { \
+            return SDL_SetError("Couldn't load GLES2 function %s: %s\n", #func, SDL_GetError()); \
+        } \
+    } while ( 0 );
+#endif /* _SDL_NOGETPROCADDR_ */
+
+#include "SDL_gles2funcs.h"
+#undef SDL_PROC
+    return 0;
+}
+
+GLES2_FBOList *
+GLES2_GetFBO(GLES2_DriverContext *data, Uint32 w, Uint32 h)
+{
+   GLES2_FBOList *result = data->framebuffers;
+   while ((result) && ((result->w != w) || (result->h != h)) )
+   {
+       result = result->next;
+   }
+   if (result == NULL)
+   {
+       result = SDL_malloc(sizeof(GLES2_FBOList));
+       result->w = w;
+       result->h = h;
+       data->glGenFramebuffers(1, &result->FBO);
+       result->next = data->framebuffers;
+       data->framebuffers = result;
+   }
+   return result;
+}
+
+static int
+GLES2_ActivateRenderer(SDL_Renderer * renderer)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+
+    if (SDL_CurrentContext != data->context) {
+        /* Null out the current program to ensure we set it again */
+        data->current_program = NULL;
+
+        if (SDL_GL_MakeCurrent(renderer->window, data->context) < 0) {
+            return -1;
+        }
+        SDL_CurrentContext = data->context;
+
+        GLES2_UpdateViewport(renderer);
+    }
+
+    GL_ClearErrors(renderer);
+
+    return 0;
+}
+
+static void
+GLES2_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+
+    if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED ||
+        event->event == SDL_WINDOWEVENT_SHOWN ||
+        event->event == SDL_WINDOWEVENT_HIDDEN) {
+        /* Rebind the context to the window area */
+        SDL_CurrentContext = NULL;
+    }
+
+    if (event->event == SDL_WINDOWEVENT_MINIMIZED) {
+        /* According to Apple documentation, we need to finish drawing NOW! */
+        data->glFinish();
+    }
+}
+
+static int
+GLES2_UpdateViewport(SDL_Renderer * renderer)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+
+    if (SDL_CurrentContext != data->context) {
+        /* We'll update the viewport after we rebind the context */
+        return 0;
+    }
+
+    data->glViewport(renderer->viewport.x, renderer->viewport.y,
+               renderer->viewport.w, renderer->viewport.h);
+
+    if (data->current_program) {
+        GLES2_SetOrthographicProjection(renderer);
+    }
+    return GL_CheckError("", renderer);
+}
+
+static int
+GLES2_UpdateClipRect(SDL_Renderer * renderer)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    const SDL_Rect *rect = &renderer->clip_rect;
+
+    if (SDL_CurrentContext != data->context) {
+        /* We'll update the clip rect after we rebind the context */
+        return 0;
+    }
+
+    if (!SDL_RectEmpty(rect)) {
+        data->glEnable(GL_SCISSOR_TEST);
+        data->glScissor(rect->x, renderer->viewport.h - rect->y - rect->h, rect->w, rect->h);
+    } else {
+        data->glDisable(GL_SCISSOR_TEST);
+    }
+    return 0;
+}
+
+static void
+GLES2_DestroyRenderer(SDL_Renderer *renderer)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+
+    /* Deallocate everything */
+    if (data) {
+        GLES2_ActivateRenderer(renderer);
+
+        {
+            GLES2_ShaderCacheEntry *entry;
+            GLES2_ShaderCacheEntry *next;
+            entry = data->shader_cache.head;
+            while (entry)
+            {
+                data->glDeleteShader(entry->id);
+                next = entry->next;
+                SDL_free(entry);
+                entry = next;
+            }
+        }
+        {
+            GLES2_ProgramCacheEntry *entry;
+            GLES2_ProgramCacheEntry *next;
+            entry = data->program_cache.head;
+            while (entry) {
+                data->glDeleteProgram(entry->id);
+                next = entry->next;
+                SDL_free(entry);
+                entry = next;
+            }
+        }
+        if (data->context) {
+            while (data->framebuffers) {
+                GLES2_FBOList *nextnode = data->framebuffers->next;
+                data->glDeleteFramebuffers(1, &data->framebuffers->FBO);
+                GL_CheckError("", renderer);
+                SDL_free(data->framebuffers);
+                data->framebuffers = nextnode;
+            }
+            SDL_GL_DeleteContext(data->context);
+        }
+        SDL_free(data->shader_formats);
+        SDL_free(data);
+    }
+    SDL_free(renderer);
+}
+
+/*************************************************************************************************
+ * Texture APIs                                                                                  *
+ *************************************************************************************************/
+
+static int GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture);
+static int GLES2_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
+                               const void *pixels, int pitch);
+static int GLES2_LockTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
+                             void **pixels, int *pitch);
+static void GLES2_UnlockTexture(SDL_Renderer *renderer, SDL_Texture *texture);
+static int GLES2_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture);
+static void GLES2_DestroyTexture(SDL_Renderer *renderer, SDL_Texture *texture);
+
+static GLenum
+GetScaleQuality(void)
+{
+    const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY);
+
+    if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
+        return GL_NEAREST;
+    } else {
+        return GL_LINEAR;
+    }
+}
+
+static int
+GLES2_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture)
+{
+    GLES2_DriverContext *renderdata = (GLES2_DriverContext *)renderer->driverdata;
+    GLES2_TextureData *data;
+    GLenum format;
+    GLenum type;
+    GLenum scaleMode;
+
+    GLES2_ActivateRenderer(renderer);
+
+    /* Determine the corresponding GLES texture format params */
+    switch (texture->format)
+    {
+    case SDL_PIXELFORMAT_ABGR8888:
+    case SDL_PIXELFORMAT_ARGB8888:
+    case SDL_PIXELFORMAT_BGR888:
+    case SDL_PIXELFORMAT_RGB888:
+        format = GL_RGBA;
+        type = GL_UNSIGNED_BYTE;
+        break;
+    default:
+        return SDL_SetError("Texture format not supported");
+    }
+
+    /* Allocate a texture struct */
+    data = (GLES2_TextureData *)SDL_calloc(1, sizeof(GLES2_TextureData));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+    data->texture = 0;
+    data->texture_type = GL_TEXTURE_2D;
+    data->pixel_format = format;
+    data->pixel_type = type;
+    scaleMode = GetScaleQuality();
+
+    /* Allocate a blob for image renderdata */
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        data->pitch = texture->w * SDL_BYTESPERPIXEL(texture->format);
+        data->pixel_data = SDL_calloc(1, data->pitch * texture->h);
+        if (!data->pixel_data) {
+            SDL_free(data);
+            return SDL_OutOfMemory();
+        }
+    }
+
+    /* Allocate the texture */
+    GL_CheckError("", renderer);
+    renderdata->glGenTextures(1, &data->texture);
+    if (GL_CheckError("glGenTexures()", renderer) < 0) {
+        return -1;
+    }
+    texture->driverdata = data;
+    renderdata->glBindTexture(data->texture_type, data->texture);
+    renderdata->glTexParameteri(data->texture_type, GL_TEXTURE_MIN_FILTER, scaleMode);
+    renderdata->glTexParameteri(data->texture_type, GL_TEXTURE_MAG_FILTER, scaleMode);
+    renderdata->glTexParameteri(data->texture_type, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    renderdata->glTexParameteri(data->texture_type, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    renderdata->glTexImage2D(data->texture_type, 0, format, texture->w, texture->h, 0, format, type, NULL);
+    if (GL_CheckError("glTexImage2D()", renderer) < 0) {
+        return -1;
+    }
+
+    if (texture->access == SDL_TEXTUREACCESS_TARGET) {
+       data->fbo = GLES2_GetFBO(renderer->driverdata, texture->w, texture->h);
+    } else {
+       data->fbo = NULL;
+    }
+
+    return GL_CheckError("", renderer);
+}
+
+static int
+GLES2_UpdateTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
+                    const void *pixels, int pitch)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
+    Uint8 *blob = NULL;
+    Uint8 *src;
+    int srcPitch;
+    int y;
+
+    GLES2_ActivateRenderer(renderer);
+
+    /* Bail out if we're supposed to update an empty rectangle */
+    if (rect->w <= 0 || rect->h <= 0)
+        return 0;
+
+    /* Reformat the texture data into a tightly packed array */
+    srcPitch = rect->w * SDL_BYTESPERPIXEL(texture->format);
+    src = (Uint8 *)pixels;
+    if (pitch != srcPitch) {
+        blob = (Uint8 *)SDL_malloc(srcPitch * rect->h);
+        if (!blob) {
+            return SDL_OutOfMemory();
+        }
+        src = blob;
+        for (y = 0; y < rect->h; ++y)
+        {
+            SDL_memcpy(src, pixels, srcPitch);
+            src += srcPitch;
+            pixels = (Uint8 *)pixels + pitch;
+        }
+        src = blob;
+    }
+
+    /* Create a texture subimage with the supplied data */
+    data->glBindTexture(tdata->texture_type, tdata->texture);
+    data->glTexSubImage2D(tdata->texture_type,
+                    0,
+                    rect->x,
+                    rect->y,
+                    rect->w,
+                    rect->h,
+                    tdata->pixel_format,
+                    tdata->pixel_type,
+                    src);
+    SDL_free(blob);
+
+    return GL_CheckError("glTexSubImage2D()", renderer);
+}
+
+static int
+GLES2_LockTexture(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *rect,
+                  void **pixels, int *pitch)
+{
+    GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
+
+    /* Retrieve the buffer/pitch for the specified region */
+    *pixels = (Uint8 *)tdata->pixel_data +
+              (tdata->pitch * rect->y) +
+              (rect->x * SDL_BYTESPERPIXEL(texture->format));
+    *pitch = tdata->pitch;
+
+    return 0;
+}
+
+static void
+GLES2_UnlockTexture(SDL_Renderer *renderer, SDL_Texture *texture)
+{
+    GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
+    SDL_Rect rect;
+
+    /* We do whole texture updates, at least for now */
+    rect.x = 0;
+    rect.y = 0;
+    rect.w = texture->w;
+    rect.h = texture->h;
+    GLES2_UpdateTexture(renderer, texture, &rect, tdata->pixel_data, tdata->pitch);
+}
+
+static int
+GLES2_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *) renderer->driverdata;
+    GLES2_TextureData *texturedata = NULL;
+    GLenum status;
+
+    if (texture == NULL) {
+        data->glBindFramebuffer(GL_FRAMEBUFFER, data->window_framebuffer);
+    } else {
+        texturedata = (GLES2_TextureData *) texture->driverdata;
+        data->glBindFramebuffer(GL_FRAMEBUFFER, texturedata->fbo->FBO);
+        /* TODO: check if texture pixel format allows this operation */
+        data->glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, texturedata->texture_type, texturedata->texture, 0);
+        /* Check FBO status */
+        status = data->glCheckFramebufferStatus(GL_FRAMEBUFFER);
+        if (status != GL_FRAMEBUFFER_COMPLETE) {
+            return SDL_SetError("glFramebufferTexture2D() failed");
+        }
+    }
+    return 0;
+}
+
+static void
+GLES2_DestroyTexture(SDL_Renderer *renderer, SDL_Texture *texture)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
+
+    GLES2_ActivateRenderer(renderer);
+
+    /* Destroy the texture */
+    if (tdata)
+    {
+        data->glDeleteTextures(1, &tdata->texture);
+        SDL_free(tdata->pixel_data);
+        SDL_free(tdata);
+        texture->driverdata = NULL;
+    }
+}
+
+/*************************************************************************************************
+ * Shader management functions                                                                   *
+ *************************************************************************************************/
+
+static GLES2_ShaderCacheEntry *GLES2_CacheShader(SDL_Renderer *renderer, GLES2_ShaderType type,
+                                                 SDL_BlendMode blendMode);
+static void GLES2_EvictShader(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *entry);
+static GLES2_ProgramCacheEntry *GLES2_CacheProgram(SDL_Renderer *renderer,
+                                                   GLES2_ShaderCacheEntry *vertex,
+                                                   GLES2_ShaderCacheEntry *fragment,
+                                                   SDL_BlendMode blendMode);
+static int GLES2_SelectProgram(SDL_Renderer *renderer, GLES2_ImageSource source,
+                               SDL_BlendMode blendMode);
+
+static GLES2_ProgramCacheEntry *
+GLES2_CacheProgram(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *vertex,
+                   GLES2_ShaderCacheEntry *fragment, SDL_BlendMode blendMode)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLES2_ProgramCacheEntry *entry;
+    GLES2_ShaderCacheEntry *shaderEntry;
+    GLint linkSuccessful;
+
+    /* Check if we've already cached this program */
+    entry = data->program_cache.head;
+    while (entry)
+    {
+        if (entry->vertex_shader == vertex && entry->fragment_shader == fragment)
+            break;
+        entry = entry->next;
+    }
+    if (entry)
+    {
+        if (data->program_cache.head != entry)
+        {
+            if (entry->next)
+                entry->next->prev = entry->prev;
+            if (entry->prev)
+                entry->prev->next = entry->next;
+            entry->prev = NULL;
+            entry->next = data->program_cache.head;
+            data->program_cache.head->prev = entry;
+            data->program_cache.head = entry;
+        }
+        return entry;
+    }
+
+    /* Create a program cache entry */
+    entry = (GLES2_ProgramCacheEntry *)SDL_calloc(1, sizeof(GLES2_ProgramCacheEntry));
+    if (!entry)
+    {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    entry->vertex_shader = vertex;
+    entry->fragment_shader = fragment;
+    entry->blend_mode = blendMode;
+
+    /* Create the program and link it */
+    entry->id = data->glCreateProgram();
+    data->glAttachShader(entry->id, vertex->id);
+    data->glAttachShader(entry->id, fragment->id);
+    data->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_POSITION, "a_position");
+    data->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_TEXCOORD, "a_texCoord");
+    data->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_ANGLE, "a_angle");
+    data->glBindAttribLocation(entry->id, GLES2_ATTRIBUTE_CENTER, "a_center");
+    data->glLinkProgram(entry->id);
+    data->glGetProgramiv(entry->id, GL_LINK_STATUS, &linkSuccessful);
+    if (!linkSuccessful)
+    {
+        data->glDeleteProgram(entry->id);
+        SDL_free(entry);
+        SDL_SetError("Failed to link shader program");
+        return NULL;
+    }
+
+    /* Predetermine locations of uniform variables */
+    entry->uniform_locations[GLES2_UNIFORM_PROJECTION] =
+        data->glGetUniformLocation(entry->id, "u_projection");
+    entry->uniform_locations[GLES2_UNIFORM_TEXTURE] =
+        data->glGetUniformLocation(entry->id, "u_texture");
+    entry->uniform_locations[GLES2_UNIFORM_MODULATION] =
+        data->glGetUniformLocation(entry->id, "u_modulation");
+    entry->uniform_locations[GLES2_UNIFORM_COLOR] =
+        data->glGetUniformLocation(entry->id, "u_color");
+
+    entry->modulation_r = entry->modulation_g = entry->modulation_b = entry->modulation_a = 255;
+    entry->color_r = entry->color_g = entry->color_b = entry->color_a = 255;
+
+    data->glUseProgram(entry->id);
+    data->glUniformMatrix4fv(entry->uniform_locations[GLES2_UNIFORM_PROJECTION], 1, GL_FALSE, (GLfloat *)entry->projection);
+    data->glUniform1i(entry->uniform_locations[GLES2_UNIFORM_TEXTURE], 0);  /* always texture unit 0. */
+    data->glUniform4f(entry->uniform_locations[GLES2_UNIFORM_MODULATION], 1.0f, 1.0f, 1.0f, 1.0f);
+    data->glUniform4f(entry->uniform_locations[GLES2_UNIFORM_COLOR], 1.0f, 1.0f, 1.0f, 1.0f);
+
+    /* Cache the linked program */
+    if (data->program_cache.head)
+    {
+        entry->next = data->program_cache.head;
+        data->program_cache.head->prev = entry;
+    }
+    else
+    {
+        data->program_cache.tail = entry;
+    }
+    data->program_cache.head = entry;
+    ++data->program_cache.count;
+
+    /* Increment the refcount of the shaders we're using */
+    ++vertex->references;
+    ++fragment->references;
+
+    /* Evict the last entry from the cache if we exceed the limit */
+    if (data->program_cache.count > GLES2_MAX_CACHED_PROGRAMS)
+    {
+        shaderEntry = data->program_cache.tail->vertex_shader;
+        if (--shaderEntry->references <= 0)
+            GLES2_EvictShader(renderer, shaderEntry);
+        shaderEntry = data->program_cache.tail->fragment_shader;
+        if (--shaderEntry->references <= 0)
+            GLES2_EvictShader(renderer, shaderEntry);
+        data->glDeleteProgram(data->program_cache.tail->id);
+        data->program_cache.tail = data->program_cache.tail->prev;
+        SDL_free(data->program_cache.tail->next);
+        data->program_cache.tail->next = NULL;
+        --data->program_cache.count;
+    }
+    return entry;
+}
+
+static GLES2_ShaderCacheEntry *
+GLES2_CacheShader(SDL_Renderer *renderer, GLES2_ShaderType type, SDL_BlendMode blendMode)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    const GLES2_Shader *shader;
+    const GLES2_ShaderInstance *instance = NULL;
+    GLES2_ShaderCacheEntry *entry = NULL;
+    GLint compileSuccessful = GL_FALSE;
+    int i, j;
+
+    /* Find the corresponding shader */
+    shader = GLES2_GetShader(type, blendMode);
+    if (!shader)
+    {
+        SDL_SetError("No shader matching the requested characteristics was found");
+        return NULL;
+    }
+
+    /* Find a matching shader instance that's supported on this hardware */
+    for (i = 0; i < shader->instance_count && !instance; ++i)
+    {
+        for (j = 0; j < data->shader_format_count && !instance; ++j)
+        {
+            if (!shader->instances)
+                continue;
+            if (!shader->instances[i])
+                continue;
+            if (shader->instances[i]->format != data->shader_formats[j])
+                continue;
+            instance = shader->instances[i];
+        }
+    }
+    if (!instance)
+    {
+        SDL_SetError("The specified shader cannot be loaded on the current platform");
+        return NULL;
+    }
+
+    /* Check if we've already cached this shader */
+    entry = data->shader_cache.head;
+    while (entry)
+    {
+        if (entry->instance == instance)
+            break;
+        entry = entry->next;
+    }
+    if (entry)
+        return entry;
+
+    /* Create a shader cache entry */
+    entry = (GLES2_ShaderCacheEntry *)SDL_calloc(1, sizeof(GLES2_ShaderCacheEntry));
+    if (!entry)
+    {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    entry->type = type;
+    entry->instance = instance;
+
+    /* Compile or load the selected shader instance */
+    entry->id = data->glCreateShader(instance->type);
+    if (instance->format == (GLenum)-1)
+    {
+        data->glShaderSource(entry->id, 1, (const char **)&instance->data, NULL);
+        data->glCompileShader(entry->id);
+        data->glGetShaderiv(entry->id, GL_COMPILE_STATUS, &compileSuccessful);
+    }
+    else
+    {
+        data->glShaderBinary(1, &entry->id, instance->format, instance->data, instance->length);
+        compileSuccessful = GL_TRUE;
+    }
+    if (!compileSuccessful)
+    {
+        char *info = NULL;
+        int length = 0;
+
+        data->glGetShaderiv(entry->id, GL_INFO_LOG_LENGTH, &length);
+        if (length > 0) {
+            info = SDL_stack_alloc(char, length);
+            if (info) {
+                data->glGetShaderInfoLog(entry->id, length, &length, info);
+            }
+        }
+        if (info) {
+            SDL_SetError("Failed to load the shader: %s", info);
+            SDL_stack_free(info);
+        } else {
+            SDL_SetError("Failed to load the shader");
+        }
+        data->glDeleteShader(entry->id);
+        SDL_free(entry);
+        return NULL;
+    }
+
+    /* Link the shader entry in at the front of the cache */
+    if (data->shader_cache.head)
+    {
+        entry->next = data->shader_cache.head;
+        data->shader_cache.head->prev = entry;
+    }
+    data->shader_cache.head = entry;
+    ++data->shader_cache.count;
+    return entry;
+}
+
+static void
+GLES2_EvictShader(SDL_Renderer *renderer, GLES2_ShaderCacheEntry *entry)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+
+    /* Unlink the shader from the cache */
+    if (entry->next)
+        entry->next->prev = entry->prev;
+    if (entry->prev)
+        entry->prev->next = entry->next;
+    if (data->shader_cache.head == entry)
+        data->shader_cache.head = entry->next;
+    --data->shader_cache.count;
+
+    /* Deallocate the shader */
+    data->glDeleteShader(entry->id);
+    SDL_free(entry);
+}
+
+static int
+GLES2_SelectProgram(SDL_Renderer *renderer, GLES2_ImageSource source, SDL_BlendMode blendMode)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLES2_ShaderCacheEntry *vertex = NULL;
+    GLES2_ShaderCacheEntry *fragment = NULL;
+    GLES2_ShaderType vtype, ftype;
+    GLES2_ProgramCacheEntry *program;
+
+    /* Select an appropriate shader pair for the specified modes */
+    vtype = GLES2_SHADER_VERTEX_DEFAULT;
+    switch (source)
+    {
+    case GLES2_IMAGESOURCE_SOLID:
+        ftype = GLES2_SHADER_FRAGMENT_SOLID_SRC;
+        break;
+    case GLES2_IMAGESOURCE_TEXTURE_ABGR:
+        ftype = GLES2_SHADER_FRAGMENT_TEXTURE_ABGR_SRC;
+        break;
+    case GLES2_IMAGESOURCE_TEXTURE_ARGB:
+        ftype = GLES2_SHADER_FRAGMENT_TEXTURE_ARGB_SRC;
+        break;
+    case GLES2_IMAGESOURCE_TEXTURE_RGB:
+        ftype = GLES2_SHADER_FRAGMENT_TEXTURE_RGB_SRC;
+        break;
+    case GLES2_IMAGESOURCE_TEXTURE_BGR:
+        ftype = GLES2_SHADER_FRAGMENT_TEXTURE_BGR_SRC;
+        break;
+    default:
+        goto fault;
+    }
+
+    /* Load the requested shaders */
+    vertex = GLES2_CacheShader(renderer, vtype, blendMode);
+    if (!vertex)
+        goto fault;
+    fragment = GLES2_CacheShader(renderer, ftype, blendMode);
+    if (!fragment)
+        goto fault;
+
+    /* Check if we need to change programs at all */
+    if (data->current_program &&
+        data->current_program->vertex_shader == vertex &&
+        data->current_program->fragment_shader == fragment)
+        return 0;
+
+    /* Generate a matching program */
+    program = GLES2_CacheProgram(renderer, vertex, fragment, blendMode);
+    if (!program)
+        goto fault;
+
+    /* Select that program in OpenGL */
+    data->glUseProgram(program->id);
+
+    /* Set the current program */
+    data->current_program = program;
+
+    /* Activate an orthographic projection */
+    if (GLES2_SetOrthographicProjection(renderer) < 0)
+        goto fault;
+
+    /* Clean up and return */
+    return 0;
+fault:
+    if (vertex && vertex->references <= 0)
+        GLES2_EvictShader(renderer, vertex);
+    if (fragment && fragment->references <= 0)
+        GLES2_EvictShader(renderer, fragment);
+    data->current_program = NULL;
+    return -1;
+}
+
+static int
+GLES2_SetOrthographicProjection(SDL_Renderer *renderer)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLfloat projection[4][4];
+
+    if (!renderer->viewport.w || !renderer->viewport.h) {
+        return 0;
+    }
+
+    /* Prepare an orthographic projection */
+    projection[0][0] = 2.0f / renderer->viewport.w;
+    projection[0][1] = 0.0f;
+    projection[0][2] = 0.0f;
+    projection[0][3] = 0.0f;
+    projection[1][0] = 0.0f;
+    if (renderer->target) {
+        projection[1][1] = 2.0f / renderer->viewport.h;
+    } else {
+        projection[1][1] = -2.0f / renderer->viewport.h;
+    }
+    projection[1][2] = 0.0f;
+    projection[1][3] = 0.0f;
+    projection[2][0] = 0.0f;
+    projection[2][1] = 0.0f;
+    projection[2][2] = 0.0f;
+    projection[2][3] = 0.0f;
+    projection[3][0] = -1.0f;
+    if (renderer->target) {
+        projection[3][1] = -1.0f;
+    } else {
+        projection[3][1] = 1.0f;
+    }
+    projection[3][2] = 0.0f;
+    projection[3][3] = 1.0f;
+
+    /* Set the projection matrix */
+    if (SDL_memcmp(data->current_program->projection, projection, sizeof (projection)) != 0) {
+        const GLuint locProjection = data->current_program->uniform_locations[GLES2_UNIFORM_PROJECTION];
+        data->glUniformMatrix4fv(locProjection, 1, GL_FALSE, (GLfloat *)projection);
+        SDL_memcpy(data->current_program->projection, projection, sizeof (projection));
+    }
+
+    return 0;
+}
+
+/*************************************************************************************************
+ * Rendering functions                                                                           *
+ *************************************************************************************************/
+
+static const float inv255f = 1.0f / 255.0f;
+
+static int GLES2_RenderClear(SDL_Renderer *renderer);
+static int GLES2_RenderDrawPoints(SDL_Renderer *renderer, const SDL_FPoint *points, int count);
+static int GLES2_RenderDrawLines(SDL_Renderer *renderer, const SDL_FPoint *points, int count);
+static int GLES2_RenderFillRects(SDL_Renderer *renderer, const SDL_FRect *rects, int count);
+static int GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *srcrect,
+                            const SDL_FRect *dstrect);
+static int GLES2_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                         const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                         const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip);
+static int GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                    Uint32 pixel_format, void * pixels, int pitch);
+static void GLES2_RenderPresent(SDL_Renderer *renderer);
+
+static SDL_bool
+CompareColors(Uint8 r1, Uint8 g1, Uint8 b1, Uint8 a1,
+              Uint8 r2, Uint8 g2, Uint8 b2, Uint8 a2)
+{
+    Uint32 Pixel1, Pixel2;
+    RGBA8888_FROM_RGBA(Pixel1, r1, g1, b1, a1);
+    RGBA8888_FROM_RGBA(Pixel2, r2, g2, b2, a2);
+    return (Pixel1 == Pixel2);
+}
+
+static int
+GLES2_RenderClear(SDL_Renderer * renderer)
+{
+    Uint8 r, g, b, a;
+
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+
+    GLES2_ActivateRenderer(renderer);
+
+    if (!CompareColors(data->clear_r, data->clear_g, data->clear_b, data->clear_a,
+                        renderer->r, renderer->g, renderer->b, renderer->a)) {
+
+       /* Select the color to clear with */
+       g = renderer->g;
+       a = renderer->a;
+   
+       if (renderer->target &&
+            (renderer->target->format == SDL_PIXELFORMAT_ARGB8888 ||
+             renderer->target->format == SDL_PIXELFORMAT_RGB888)) {
+           r = renderer->b;
+           b = renderer->r;
+        } else {
+           r = renderer->r;
+           b = renderer->b;
+        }
+
+        data->glClearColor((GLfloat) r * inv255f,
+                     (GLfloat) g * inv255f,
+                     (GLfloat) b * inv255f,
+                     (GLfloat) a * inv255f);
+        data->clear_r = renderer->r;
+        data->clear_g = renderer->g;
+        data->clear_b = renderer->b;
+        data->clear_a = renderer->a;
+    }
+
+    data->glClear(GL_COLOR_BUFFER_BIT);
+
+    return 0;
+}
+
+static void
+GLES2_SetBlendMode(GLES2_DriverContext *data, int blendMode)
+{
+    if (blendMode != data->current.blendMode) {
+        switch (blendMode) {
+        default:
+        case SDL_BLENDMODE_NONE:
+            data->glDisable(GL_BLEND);
+            break;
+        case SDL_BLENDMODE_BLEND:
+            data->glEnable(GL_BLEND);
+            data->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+            break;
+        case SDL_BLENDMODE_ADD:
+            data->glEnable(GL_BLEND);
+            data->glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ZERO, GL_ONE);
+            break;
+        case SDL_BLENDMODE_MOD:
+            data->glEnable(GL_BLEND);
+            data->glBlendFuncSeparate(GL_ZERO, GL_SRC_COLOR, GL_ZERO, GL_ONE);
+            break;
+        }
+        data->current.blendMode = blendMode;
+    }
+}
+
+static void
+GLES2_SetTexCoords(GLES2_DriverContext * data, SDL_bool enabled)
+{
+    if (enabled != data->current.tex_coords) {
+        if (enabled) {
+            data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_TEXCOORD);
+        } else {
+            data->glDisableVertexAttribArray(GLES2_ATTRIBUTE_TEXCOORD);
+        }
+        data->current.tex_coords = enabled;
+    }
+}
+
+static int
+GLES2_SetDrawingState(SDL_Renderer * renderer)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    const int blendMode = renderer->blendMode;
+    GLES2_ProgramCacheEntry *program;
+    Uint8 r, g, b, a;
+
+    GLES2_ActivateRenderer(renderer);
+
+    GLES2_SetBlendMode(data, blendMode);
+
+    GLES2_SetTexCoords(data, SDL_FALSE);
+
+    /* Activate an appropriate shader and set the projection matrix */
+    if (GLES2_SelectProgram(renderer, GLES2_IMAGESOURCE_SOLID, blendMode) < 0) {
+        return -1;
+    }
+
+    /* Select the color to draw with */
+    g = renderer->g;
+    a = renderer->a;
+
+    if (renderer->target &&
+         (renderer->target->format == SDL_PIXELFORMAT_ARGB8888 ||
+         renderer->target->format == SDL_PIXELFORMAT_RGB888)) {
+        r = renderer->b;
+        b = renderer->r;
+     } else {
+        r = renderer->r;
+        b = renderer->b;
+     }
+
+    program = data->current_program;
+    if (!CompareColors(program->color_r, program->color_g, program->color_b, program->color_a, r, g, b, a)) {
+        /* Select the color to draw with */
+        data->glUniform4f(program->uniform_locations[GLES2_UNIFORM_COLOR], r * inv255f, g * inv255f, b * inv255f, a * inv255f);
+        program->color_r = r;
+        program->color_g = g;
+        program->color_b = b;
+        program->color_a = a;
+    }
+
+    return 0;
+}
+
+static int
+GLES2_RenderDrawPoints(SDL_Renderer *renderer, const SDL_FPoint *points, int count)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLfloat *vertices;
+    int idx;
+
+    if (GLES2_SetDrawingState(renderer) < 0) {
+        return -1;
+    }
+
+    /* Emit the specified vertices as points */
+    vertices = SDL_stack_alloc(GLfloat, count * 2);
+    for (idx = 0; idx < count; ++idx) {
+        GLfloat x = points[idx].x + 0.5f;
+        GLfloat y = points[idx].y + 0.5f;
+
+        vertices[idx * 2] = x;
+        vertices[(idx * 2) + 1] = y;
+    }
+    data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+    data->glDrawArrays(GL_POINTS, 0, count);
+    SDL_stack_free(vertices);
+    return 0;
+}
+
+static int
+GLES2_RenderDrawLines(SDL_Renderer *renderer, const SDL_FPoint *points, int count)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLfloat *vertices;
+    int idx;
+
+    if (GLES2_SetDrawingState(renderer) < 0) {
+        return -1;
+    }
+
+    /* Emit a line strip including the specified vertices */
+    vertices = SDL_stack_alloc(GLfloat, count * 2);
+    for (idx = 0; idx < count; ++idx) {
+        GLfloat x = points[idx].x + 0.5f;
+        GLfloat y = points[idx].y + 0.5f;
+
+        vertices[idx * 2] = x;
+        vertices[(idx * 2) + 1] = y;
+    }
+    data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+    data->glDrawArrays(GL_LINE_STRIP, 0, count);
+
+    /* We need to close the endpoint of the line */
+    if (count == 2 ||
+        points[0].x != points[count-1].x || points[0].y != points[count-1].y) {
+        data->glDrawArrays(GL_POINTS, count-1, 1);
+    }
+    SDL_stack_free(vertices);
+
+    return GL_CheckError("", renderer);
+}
+
+static int
+GLES2_RenderFillRects(SDL_Renderer *renderer, const SDL_FRect *rects, int count)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLfloat vertices[8];
+    int idx;
+
+    if (GLES2_SetDrawingState(renderer) < 0) {
+        return -1;
+    }
+
+    /* Emit a line loop for each rectangle */
+    for (idx = 0; idx < count; ++idx) {
+        const SDL_FRect *rect = &rects[idx];
+
+        GLfloat xMin = rect->x;
+        GLfloat xMax = (rect->x + rect->w);
+        GLfloat yMin = rect->y;
+        GLfloat yMax = (rect->y + rect->h);
+
+        vertices[0] = xMin;
+        vertices[1] = yMin;
+        vertices[2] = xMax;
+        vertices[3] = yMin;
+        vertices[4] = xMin;
+        vertices[5] = yMax;
+        vertices[6] = xMax;
+        vertices[7] = yMax;
+        data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+        data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+    }
+    return GL_CheckError("", renderer);
+}
+
+static int
+GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *srcrect,
+                 const SDL_FRect *dstrect)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
+    GLES2_ImageSource sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
+    SDL_BlendMode blendMode;
+    GLfloat vertices[8];
+    GLfloat texCoords[8];
+    GLES2_ProgramCacheEntry *program;
+    Uint8 r, g, b, a;
+
+    GLES2_ActivateRenderer(renderer);
+
+    /* Activate an appropriate shader and set the projection matrix */
+    blendMode = texture->blendMode;
+    if (renderer->target) {
+        /* Check if we need to do color mapping between the source and render target textures */
+        if (renderer->target->format != texture->format) {
+            switch (texture->format)
+            {
+            case SDL_PIXELFORMAT_ABGR8888:
+                switch (renderer->target->format)
+                {
+                    case SDL_PIXELFORMAT_ARGB8888:
+                    case SDL_PIXELFORMAT_RGB888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                    case SDL_PIXELFORMAT_BGR888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
+                        break;
+                }
+                break;
+            case SDL_PIXELFORMAT_ARGB8888:
+                switch (renderer->target->format)
+                {
+                    case SDL_PIXELFORMAT_ABGR8888:
+                    case SDL_PIXELFORMAT_BGR888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                    case SDL_PIXELFORMAT_RGB888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
+                        break;
+                }
+                break;
+            case SDL_PIXELFORMAT_BGR888:
+                switch (renderer->target->format)
+                {
+                    case SDL_PIXELFORMAT_ABGR8888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+                        break;
+                    case SDL_PIXELFORMAT_ARGB8888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
+                        break;
+                    case SDL_PIXELFORMAT_RGB888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                }
+                break;
+            case SDL_PIXELFORMAT_RGB888:
+                switch (renderer->target->format)
+                {
+                    case SDL_PIXELFORMAT_ABGR8888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                    case SDL_PIXELFORMAT_ARGB8888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+                        break;
+                    case SDL_PIXELFORMAT_BGR888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                }
+                break;
+            }
+        }
+        else sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;   /* Texture formats match, use the non color mapping shader (even if the formats are not ABGR) */
+    }
+    else {
+        switch (texture->format)
+        {
+            case SDL_PIXELFORMAT_ABGR8888:
+                sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
+                break;
+            case SDL_PIXELFORMAT_ARGB8888:
+                sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                break;
+            case SDL_PIXELFORMAT_BGR888:
+                sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+                break;
+            case SDL_PIXELFORMAT_RGB888:
+                sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
+                break;
+            default:
+                return -1;
+        }
+    }
+
+    if (GLES2_SelectProgram(renderer, sourceType, blendMode) < 0) {
+        return -1;
+    }
+
+    /* Select the target texture */
+    data->glBindTexture(tdata->texture_type, tdata->texture);
+
+    /* Configure color modulation */
+    g = texture->g;
+    a = texture->a;
+
+    if (renderer->target &&
+        (renderer->target->format == SDL_PIXELFORMAT_ARGB8888 ||
+         renderer->target->format == SDL_PIXELFORMAT_RGB888)) {
+        r = texture->b;
+        b = texture->r;
+    } else {
+        r = texture->r;
+        b = texture->b;
+    }
+
+    program = data->current_program;
+
+    if (!CompareColors(program->modulation_r, program->modulation_g, program->modulation_b, program->modulation_a, r, g, b, a)) {
+        data->glUniform4f(program->uniform_locations[GLES2_UNIFORM_MODULATION], r * inv255f, g * inv255f, b * inv255f, a * inv255f);
+        program->modulation_r = r;
+        program->modulation_g = g;
+        program->modulation_b = b;
+        program->modulation_a = a;
+    }
+
+    /* Configure texture blending */
+    GLES2_SetBlendMode(data, blendMode);
+
+    GLES2_SetTexCoords(data, SDL_TRUE);
+
+    /* Emit the textured quad */
+    vertices[0] = dstrect->x;
+    vertices[1] = dstrect->y;
+    vertices[2] = (dstrect->x + dstrect->w);
+    vertices[3] = dstrect->y;
+    vertices[4] = dstrect->x;
+    vertices[5] = (dstrect->y + dstrect->h);
+    vertices[6] = (dstrect->x + dstrect->w);
+    vertices[7] = (dstrect->y + dstrect->h);
+    data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+    texCoords[0] = srcrect->x / (GLfloat)texture->w;
+    texCoords[1] = srcrect->y / (GLfloat)texture->h;
+    texCoords[2] = (srcrect->x + srcrect->w) / (GLfloat)texture->w;
+    texCoords[3] = srcrect->y / (GLfloat)texture->h;
+    texCoords[4] = srcrect->x / (GLfloat)texture->w;
+    texCoords[5] = (srcrect->y + srcrect->h) / (GLfloat)texture->h;
+    texCoords[6] = (srcrect->x + srcrect->w) / (GLfloat)texture->w;
+    texCoords[7] = (srcrect->y + srcrect->h) / (GLfloat)texture->h;
+    data->glVertexAttribPointer(GLES2_ATTRIBUTE_TEXCOORD, 2, GL_FLOAT, GL_FALSE, 0, texCoords);
+    data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+    return GL_CheckError("", renderer);
+}
+
+static int
+GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *srcrect,
+                 const SDL_FRect *dstrect, const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLES2_TextureData *tdata = (GLES2_TextureData *)texture->driverdata;
+    GLES2_ImageSource sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
+    GLES2_ProgramCacheEntry *program;
+    Uint8 r, g, b, a;
+    SDL_BlendMode blendMode;
+    GLfloat vertices[8];
+    GLfloat texCoords[8];
+    GLfloat translate[8];
+    GLfloat fAngle[4];
+    GLfloat tmp;
+
+    GLES2_ActivateRenderer(renderer);
+
+    data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_CENTER);
+    data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE);
+    fAngle[0] = fAngle[1] = fAngle[2] = fAngle[3] = (GLfloat)(360.0f - angle);
+    /* Calculate the center of rotation */
+    translate[0] = translate[2] = translate[4] = translate[6] = (center->x + dstrect->x);
+    translate[1] = translate[3] = translate[5] = translate[7] = (center->y + dstrect->y);
+
+    /* Activate an appropriate shader and set the projection matrix */
+    blendMode = texture->blendMode;
+    if (renderer->target) {
+        /* Check if we need to do color mapping between the source and render target textures */
+        if (renderer->target->format != texture->format) {
+            switch (texture->format)
+            {
+            case SDL_PIXELFORMAT_ABGR8888:
+                switch (renderer->target->format)
+                {
+                    case SDL_PIXELFORMAT_ARGB8888:
+                    case SDL_PIXELFORMAT_RGB888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                    case SDL_PIXELFORMAT_BGR888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
+                        break;
+                }
+                break;
+            case SDL_PIXELFORMAT_ARGB8888:
+                switch (renderer->target->format)
+                {
+                    case SDL_PIXELFORMAT_ABGR8888:
+                    case SDL_PIXELFORMAT_BGR888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                    case SDL_PIXELFORMAT_RGB888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
+                        break;
+                }
+                break;
+            case SDL_PIXELFORMAT_BGR888:
+                switch (renderer->target->format)
+                {
+                    case SDL_PIXELFORMAT_ABGR8888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+                        break;
+                    case SDL_PIXELFORMAT_ARGB8888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
+                        break;
+                    case SDL_PIXELFORMAT_RGB888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                }
+                break;
+            case SDL_PIXELFORMAT_RGB888:
+                switch (renderer->target->format)
+                {
+                    case SDL_PIXELFORMAT_ABGR8888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                    case SDL_PIXELFORMAT_ARGB8888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+                        break;
+                    case SDL_PIXELFORMAT_BGR888:
+                        sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                        break;
+                }
+                break;
+            }
+        }
+        else sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;   /* Texture formats match, use the non color mapping shader (even if the formats are not ABGR) */
+    }
+    else {
+        switch (texture->format)
+        {
+            case SDL_PIXELFORMAT_ABGR8888:
+                sourceType = GLES2_IMAGESOURCE_TEXTURE_ABGR;
+                break;
+            case SDL_PIXELFORMAT_ARGB8888:
+                sourceType = GLES2_IMAGESOURCE_TEXTURE_ARGB;
+                break;
+            case SDL_PIXELFORMAT_BGR888:
+                sourceType = GLES2_IMAGESOURCE_TEXTURE_BGR;
+                break;
+            case SDL_PIXELFORMAT_RGB888:
+                sourceType = GLES2_IMAGESOURCE_TEXTURE_RGB;
+                break;
+            default:
+                return -1;
+        }
+    }
+    if (GLES2_SelectProgram(renderer, sourceType, blendMode) < 0)
+        return -1;
+
+    /* Select the target texture */
+    data->glBindTexture(tdata->texture_type, tdata->texture);
+
+    /* Configure color modulation */
+    /* !!! FIXME: grep for glUniform4f(), move that stuff to a subroutine, it's a lot of copy/paste. */
+    g = texture->g;
+    a = texture->a;
+
+    if (renderer->target &&
+        (renderer->target->format == SDL_PIXELFORMAT_ARGB8888 ||
+         renderer->target->format == SDL_PIXELFORMAT_RGB888)) {
+        r = texture->b;
+        b = texture->r;
+    } else {
+        r = texture->r;
+        b = texture->b;
+    }
+
+    program = data->current_program;
+
+    if (!CompareColors(program->modulation_r, program->modulation_g, program->modulation_b, program->modulation_a, r, g, b, a)) {
+        data->glUniform4f(program->uniform_locations[GLES2_UNIFORM_MODULATION], r * inv255f, g * inv255f, b * inv255f, a * inv255f);
+        program->modulation_r = r;
+        program->modulation_g = g;
+        program->modulation_b = b;
+        program->modulation_a = a;
+    }
+
+    /* Configure texture blending */
+    GLES2_SetBlendMode(data, blendMode);
+
+    GLES2_SetTexCoords(data, SDL_TRUE);
+
+    /* Emit the textured quad */
+    vertices[0] = dstrect->x;
+    vertices[1] = dstrect->y;
+    vertices[2] = (dstrect->x + dstrect->w);
+    vertices[3] = dstrect->y;
+    vertices[4] = dstrect->x;
+    vertices[5] = (dstrect->y + dstrect->h);
+    vertices[6] = (dstrect->x + dstrect->w);
+    vertices[7] = (dstrect->y + dstrect->h);
+    if (flip & SDL_FLIP_HORIZONTAL) {
+        tmp = vertices[0];
+        vertices[0] = vertices[4] = vertices[2];
+        vertices[2] = vertices[6] = tmp;
+    }
+    if (flip & SDL_FLIP_VERTICAL) {
+        tmp = vertices[1];
+        vertices[1] = vertices[3] = vertices[5];
+        vertices[5] = vertices[7] = tmp;
+    }
+
+    data->glVertexAttribPointer(GLES2_ATTRIBUTE_ANGLE, 1, GL_FLOAT, GL_FALSE, 0, &fAngle);
+    data->glVertexAttribPointer(GLES2_ATTRIBUTE_CENTER, 2, GL_FLOAT, GL_FALSE, 0, translate);
+    data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);
+
+    texCoords[0] = srcrect->x / (GLfloat)texture->w;
+    texCoords[1] = srcrect->y / (GLfloat)texture->h;
+    texCoords[2] = (srcrect->x + srcrect->w) / (GLfloat)texture->w;
+    texCoords[3] = srcrect->y / (GLfloat)texture->h;
+    texCoords[4] = srcrect->x / (GLfloat)texture->w;
+    texCoords[5] = (srcrect->y + srcrect->h) / (GLfloat)texture->h;
+    texCoords[6] = (srcrect->x + srcrect->w) / (GLfloat)texture->w;
+    texCoords[7] = (srcrect->y + srcrect->h) / (GLfloat)texture->h;
+    data->glVertexAttribPointer(GLES2_ATTRIBUTE_TEXCOORD, 2, GL_FLOAT, GL_FALSE, 0, texCoords);
+    data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+    data->glDisableVertexAttribArray(GLES2_ATTRIBUTE_CENTER);
+    data->glDisableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE);
+
+    return GL_CheckError("", renderer);
+}
+
+static int
+GLES2_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                    Uint32 pixel_format, void * pixels, int pitch)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    Uint32 temp_format = SDL_PIXELFORMAT_ABGR8888;
+    void *temp_pixels;
+    int temp_pitch;
+    Uint8 *src, *dst, *tmp;
+    int w, h, length, rows;
+    int status;
+
+    GLES2_ActivateRenderer(renderer);
+
+    temp_pitch = rect->w * SDL_BYTESPERPIXEL(temp_format);
+    temp_pixels = SDL_malloc(rect->h * temp_pitch);
+    if (!temp_pixels) {
+        return SDL_OutOfMemory();
+    }
+
+    SDL_GetRendererOutputSize(renderer, &w, &h);
+
+    data->glReadPixels(rect->x, (h-rect->y)-rect->h, rect->w, rect->h,
+                       GL_RGBA, GL_UNSIGNED_BYTE, temp_pixels);
+    if (GL_CheckError("glReadPixels()", renderer) < 0) {
+        return -1;
+    }
+
+    /* Flip the rows to be top-down */
+    length = rect->w * SDL_BYTESPERPIXEL(temp_format);
+    src = (Uint8*)temp_pixels + (rect->h-1)*temp_pitch;
+    dst = (Uint8*)temp_pixels;
+    tmp = SDL_stack_alloc(Uint8, length);
+    rows = rect->h / 2;
+    while (rows--) {
+        SDL_memcpy(tmp, dst, length);
+        SDL_memcpy(dst, src, length);
+        SDL_memcpy(src, tmp, length);
+        dst += temp_pitch;
+        src -= temp_pitch;
+    }
+    SDL_stack_free(tmp);
+
+    status = SDL_ConvertPixels(rect->w, rect->h,
+                               temp_format, temp_pixels, temp_pitch,
+                               pixel_format, pixels, pitch);
+    SDL_free(temp_pixels);
+
+    return status;
+}
+
+static void
+GLES2_RenderPresent(SDL_Renderer *renderer)
+{
+    GLES2_ActivateRenderer(renderer);
+
+    /* Tell the video driver to swap buffers */
+    SDL_GL_SwapWindow(renderer->window);
+}
+
+
+/*************************************************************************************************
+ * Bind/unbinding of textures
+ *************************************************************************************************/
+static int GLES2_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh);
+static int GLES2_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture);
+
+static int GLES2_BindTexture (SDL_Renderer * renderer, SDL_Texture *texture, float *texw, float *texh)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLES2_TextureData *texturedata = (GLES2_TextureData *)texture->driverdata;
+    GLES2_ActivateRenderer(renderer);
+
+    data->glBindTexture(texturedata->texture_type, texturedata->texture);
+
+    if(texw) *texw = 1.0;
+    if(texh) *texh = 1.0;
+
+    return 0;
+}
+
+static int GLES2_UnbindTexture (SDL_Renderer * renderer, SDL_Texture *texture)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata;
+    GLES2_TextureData *texturedata = (GLES2_TextureData *)texture->driverdata;
+    GLES2_ActivateRenderer(renderer);
+
+    data->glBindTexture(texturedata->texture_type, 0);
+
+    return 0;
+}
+
+
+/*************************************************************************************************
+ * Renderer instantiation                                                                        *
+ *************************************************************************************************/
+
+#define GL_NVIDIA_PLATFORM_BINARY_NV 0x890B
+
+static void
+GLES2_ResetState(SDL_Renderer *renderer)
+{
+    GLES2_DriverContext *data = (GLES2_DriverContext *) renderer->driverdata;
+
+    if (SDL_CurrentContext == data->context) {
+        GLES2_UpdateViewport(renderer);
+    } else {
+        GLES2_ActivateRenderer(renderer);
+    }
+
+    data->current.blendMode = -1;
+    data->current.tex_coords = SDL_FALSE;
+
+    data->glActiveTexture(GL_TEXTURE0);
+    data->glPixelStorei(GL_PACK_ALIGNMENT, 1);
+    data->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
+    data->glClearColor((GLfloat) data->clear_r * inv255f,
+                        (GLfloat) data->clear_g * inv255f,
+                        (GLfloat) data->clear_b * inv255f,
+                        (GLfloat) data->clear_a * inv255f);
+
+    data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_POSITION);
+    data->glDisableVertexAttribArray(GLES2_ATTRIBUTE_TEXCOORD);
+
+    GL_CheckError("", renderer);
+}
+
+static SDL_Renderer *
+GLES2_CreateRenderer(SDL_Window *window, Uint32 flags)
+{
+    SDL_Renderer *renderer;
+    GLES2_DriverContext *data;
+    GLint nFormats;
+#ifndef ZUNE_HD
+    GLboolean hasCompiler;
+#endif
+    Uint32 windowFlags;
+    GLint window_framebuffer;
+    GLint value;
+    int profile_mask, major, minor;
+
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profile_mask);
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major);
+    SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor);
+
+    windowFlags = SDL_GetWindowFlags(window);
+    if (!(windowFlags & SDL_WINDOW_OPENGL) ||
+        profile_mask != SDL_GL_CONTEXT_PROFILE_ES || major != RENDERER_CONTEXT_MAJOR || minor != RENDERER_CONTEXT_MINOR) {
+        
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, RENDERER_CONTEXT_MAJOR);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, RENDERER_CONTEXT_MINOR);
+
+        if (SDL_RecreateWindow(window, windowFlags | SDL_WINDOW_OPENGL) < 0) {
+            /* Uh oh, better try to put it back... */
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profile_mask);
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, major);
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minor);
+            SDL_RecreateWindow(window, windowFlags);
+            return NULL;
+        }
+    }
+
+    /* Create the renderer struct */
+    renderer = (SDL_Renderer *)SDL_calloc(1, sizeof(SDL_Renderer));
+    if (!renderer) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    data = (GLES2_DriverContext *)SDL_calloc(1, sizeof(GLES2_DriverContext));
+    if (!data) {
+        GLES2_DestroyRenderer(renderer);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    renderer->info = GLES2_RenderDriver.info;
+    renderer->info.flags = (SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE);
+    renderer->driverdata = data;
+    renderer->window = window;
+
+    /* Create an OpenGL ES 2.0 context */
+    data->context = SDL_GL_CreateContext(window);
+    if (!data->context)
+    {
+        GLES2_DestroyRenderer(renderer);
+        return NULL;
+    }
+    if (SDL_GL_MakeCurrent(window, data->context) < 0) {
+        GLES2_DestroyRenderer(renderer);
+        return NULL;
+    }
+
+    if (GLES2_LoadFunctions(data) < 0) {
+        GLES2_DestroyRenderer(renderer);
+        return NULL;
+    }
+
+#if __WINRT__
+    /* DLudwig, 2013-11-29: ANGLE for WinRT doesn't seem to work unless VSync
+     * is turned on.  Not doing so will freeze the screen's contents to that
+     * of the first drawn frame.
+     */
+    flags |= SDL_RENDERER_PRESENTVSYNC;
+#endif
+
+    if (flags & SDL_RENDERER_PRESENTVSYNC) {
+        SDL_GL_SetSwapInterval(1);
+    } else {
+        SDL_GL_SetSwapInterval(0);
+    }
+    if (SDL_GL_GetSwapInterval() > 0) {
+        renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
+    }
+
+    /* Check for debug output support */
+    if (SDL_GL_GetAttribute(SDL_GL_CONTEXT_FLAGS, &value) == 0 &&
+        (value & SDL_GL_CONTEXT_DEBUG_FLAG)) {
+        data->debug_enabled = SDL_TRUE;
+    }
+
+    value = 0;
+    data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
+    renderer->info.max_texture_width = value;
+    value = 0;
+    data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
+    renderer->info.max_texture_height = value;
+
+    /* Determine supported shader formats */
+    /* HACK: glGetInteger is broken on the Zune HD's compositor, so we just hardcode this */
+#ifdef ZUNE_HD
+    nFormats = 1;
+#else /* !ZUNE_HD */
+    data->glGetIntegerv(GL_NUM_SHADER_BINARY_FORMATS, &nFormats);
+    data->glGetBooleanv(GL_SHADER_COMPILER, &hasCompiler);
+    if (hasCompiler)
+        ++nFormats;
+#endif /* ZUNE_HD */
+    data->shader_formats = (GLenum *)SDL_calloc(nFormats, sizeof(GLenum));
+    if (!data->shader_formats)
+    {
+        GLES2_DestroyRenderer(renderer);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    data->shader_format_count = nFormats;
+#ifdef ZUNE_HD
+    data->shader_formats[0] = GL_NVIDIA_PLATFORM_BINARY_NV;
+#else /* !ZUNE_HD */
+    data->glGetIntegerv(GL_SHADER_BINARY_FORMATS, (GLint *)data->shader_formats);
+    if (hasCompiler)
+        data->shader_formats[nFormats - 1] = (GLenum)-1;
+#endif /* ZUNE_HD */
+
+    data->framebuffers = NULL;
+    data->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &window_framebuffer);
+    data->window_framebuffer = (GLuint)window_framebuffer;
+
+    /* Populate the function pointers for the module */
+    renderer->WindowEvent         = &GLES2_WindowEvent;
+    renderer->CreateTexture       = &GLES2_CreateTexture;
+    renderer->UpdateTexture       = &GLES2_UpdateTexture;
+    renderer->LockTexture         = &GLES2_LockTexture;
+    renderer->UnlockTexture       = &GLES2_UnlockTexture;
+    renderer->SetRenderTarget     = &GLES2_SetRenderTarget;
+    renderer->UpdateViewport      = &GLES2_UpdateViewport;
+    renderer->UpdateClipRect      = &GLES2_UpdateClipRect;
+    renderer->RenderClear         = &GLES2_RenderClear;
+    renderer->RenderDrawPoints    = &GLES2_RenderDrawPoints;
+    renderer->RenderDrawLines     = &GLES2_RenderDrawLines;
+    renderer->RenderFillRects     = &GLES2_RenderFillRects;
+    renderer->RenderCopy          = &GLES2_RenderCopy;
+    renderer->RenderCopyEx        = &GLES2_RenderCopyEx;
+    renderer->RenderReadPixels    = &GLES2_RenderReadPixels;
+    renderer->RenderPresent       = &GLES2_RenderPresent;
+    renderer->DestroyTexture      = &GLES2_DestroyTexture;
+    renderer->DestroyRenderer     = &GLES2_DestroyRenderer;
+    renderer->GL_BindTexture      = &GLES2_BindTexture;
+    renderer->GL_UnbindTexture    = &GLES2_UnbindTexture;
+
+    GLES2_ResetState(renderer);
+
+    return renderer;
+}
+
+#endif /* SDL_VIDEO_RENDER_OGL_ES2 && !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/opengles2/SDL_shaders_gles2.c b/Source/3rd Party/sdl/src/render/opengles2/SDL_shaders_gles2.c
new file mode 100644
index 000000000..3b16cc3df
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengles2/SDL_shaders_gles2.c	
@@ -0,0 +1,785 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_OGL_ES2 && !SDL_RENDER_DISABLED
+
+#include "SDL_video.h"
+#include "SDL_opengles2.h"
+#include "SDL_shaders_gles2.h"
+#include "SDL_stdinc.h"
+
+/*************************************************************************************************
+ * Vertex/fragment shader source                                                                 *
+ *************************************************************************************************/
+
+static const Uint8 GLES2_VertexSrc_Default_[] = " \
+    uniform mat4 u_projection; \
+    attribute vec2 a_position; \
+    attribute vec2 a_texCoord; \
+    attribute float a_angle; \
+    attribute vec2 a_center; \
+    varying vec2 v_texCoord; \
+    \
+    void main() \
+    { \
+        float angle = radians(a_angle); \
+        float c = cos(angle); \
+        float s = sin(angle); \
+        mat2 rotationMatrix = mat2(c, -s, s, c); \
+        vec2 position = rotationMatrix * (a_position - a_center) + a_center; \
+        v_texCoord = a_texCoord; \
+        gl_Position = u_projection * vec4(position, 0.0, 1.0);\
+        gl_PointSize = 1.0; \
+    } \
+";
+
+static const Uint8 GLES2_FragmentSrc_SolidSrc_[] = " \
+    precision mediump float; \
+    uniform vec4 u_color; \
+    \
+    void main() \
+    { \
+        gl_FragColor = u_color; \
+    } \
+";
+
+static const Uint8 GLES2_FragmentSrc_TextureABGRSrc_[] = " \
+    precision mediump float; \
+    uniform sampler2D u_texture; \
+    uniform vec4 u_modulation; \
+    varying vec2 v_texCoord; \
+    \
+    void main() \
+    { \
+        gl_FragColor = texture2D(u_texture, v_texCoord); \
+        gl_FragColor *= u_modulation; \
+    } \
+";
+
+/* ARGB to ABGR conversion */
+static const Uint8 GLES2_FragmentSrc_TextureARGBSrc_[] = " \
+    precision mediump float; \
+    uniform sampler2D u_texture; \
+    uniform vec4 u_modulation; \
+    varying vec2 v_texCoord; \
+    \
+    void main() \
+    { \
+        vec4 abgr = texture2D(u_texture, v_texCoord); \
+        gl_FragColor = abgr; \
+        gl_FragColor.r = abgr.b; \
+        gl_FragColor.b = abgr.r; \
+        gl_FragColor *= u_modulation; \
+    } \
+";
+
+/* RGB to ABGR conversion */
+static const Uint8 GLES2_FragmentSrc_TextureRGBSrc_[] = " \
+    precision mediump float; \
+    uniform sampler2D u_texture; \
+    uniform vec4 u_modulation; \
+    varying vec2 v_texCoord; \
+    \
+    void main() \
+    { \
+        vec4 abgr = texture2D(u_texture, v_texCoord); \
+        gl_FragColor = abgr; \
+        gl_FragColor.r = abgr.b; \
+        gl_FragColor.b = abgr.r; \
+        gl_FragColor.a = 1.0; \
+        gl_FragColor *= u_modulation; \
+    } \
+";
+
+/* BGR to ABGR conversion */
+static const Uint8 GLES2_FragmentSrc_TextureBGRSrc_[] = " \
+    precision mediump float; \
+    uniform sampler2D u_texture; \
+    uniform vec4 u_modulation; \
+    varying vec2 v_texCoord; \
+    \
+    void main() \
+    { \
+        vec4 abgr = texture2D(u_texture, v_texCoord); \
+        gl_FragColor = abgr; \
+        gl_FragColor.a = 1.0; \
+        gl_FragColor *= u_modulation; \
+    } \
+";
+
+static const GLES2_ShaderInstance GLES2_VertexSrc_Default = {
+    GL_VERTEX_SHADER,
+    GLES2_SOURCE_SHADER,
+    sizeof(GLES2_VertexSrc_Default_),
+    GLES2_VertexSrc_Default_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentSrc_SolidSrc = {
+    GL_FRAGMENT_SHADER,
+    GLES2_SOURCE_SHADER,
+    sizeof(GLES2_FragmentSrc_SolidSrc_),
+    GLES2_FragmentSrc_SolidSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentSrc_TextureABGRSrc = {
+    GL_FRAGMENT_SHADER,
+    GLES2_SOURCE_SHADER,
+    sizeof(GLES2_FragmentSrc_TextureABGRSrc_),
+    GLES2_FragmentSrc_TextureABGRSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentSrc_TextureARGBSrc = {
+    GL_FRAGMENT_SHADER,
+    GLES2_SOURCE_SHADER,
+    sizeof(GLES2_FragmentSrc_TextureARGBSrc_),
+    GLES2_FragmentSrc_TextureARGBSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentSrc_TextureRGBSrc = {
+    GL_FRAGMENT_SHADER,
+    GLES2_SOURCE_SHADER,
+    sizeof(GLES2_FragmentSrc_TextureRGBSrc_),
+    GLES2_FragmentSrc_TextureRGBSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentSrc_TextureBGRSrc = {
+    GL_FRAGMENT_SHADER,
+    GLES2_SOURCE_SHADER,
+    sizeof(GLES2_FragmentSrc_TextureBGRSrc_),
+    GLES2_FragmentSrc_TextureBGRSrc_
+};
+
+/*************************************************************************************************
+ * Vertex/fragment shader binaries (NVIDIA Tegra 1/2)                                            *
+ *************************************************************************************************/
+
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+
+#define GL_NVIDIA_PLATFORM_BINARY_NV 0x890B
+
+static const Uint8 GLES2_VertexTegra_Default_[] = {
+    243, 193, 1, 142, 31, 109, 131, 38, 6, 0, 1, 0, 5, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 73, 0,
+    0, 0, 46, 0, 0, 0, 48, 0, 0, 0, 2, 0, 0, 0, 85, 0, 0, 0, 2, 0, 0, 0, 24, 0, 0, 0, 3, 0, 0, 0,
+    91, 0, 0, 0, 1, 0, 0, 0, 16, 0, 0, 0, 5, 0, 0, 0, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 95, 0, 0, 0, 1, 0, 0, 0, 28, 0, 0, 0,
+    13, 0, 0, 0, 102, 0, 0, 0, 2, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 16, 0, 0, 0, 104, 0, 0, 0, 1, 0, 0, 0, 32, 0, 0, 0, 17, 0, 0, 0, 112, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 112, 0, 0, 0, 80, 0, 0, 0, 80, 0, 0, 0, 19, 0, 0, 0, 132, 0,
+    0, 0, 104, 0, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 110, 70, 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 97,
+    95, 112, 111, 115, 105, 116, 105, 111, 110, 0, 97, 95, 116, 101, 120, 67, 111, 111, 114, 100,
+    0, 118, 95, 116, 101, 120, 67, 111, 111, 114, 100, 0, 117, 95, 112, 114, 111, 106, 101, 99,
+    116, 105, 111, 110, 0, 0, 0, 0, 0, 0, 0, 82, 139, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 80, 139, 0,
+    0, 1, 0, 0, 0, 22, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 33, 0, 0, 0, 92, 139, 0, 0,
+    1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 240, 0, 0, 0, 0, 0, 0, 1, 0,
+    0, 0, 64, 0, 0, 0, 80, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 193, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 66, 24, 0, 6, 34, 108, 28,
+    0, 0, 42, 16, 128, 0, 195, 192, 6, 129, 252, 255, 65, 96, 108, 28, 0, 0, 0, 0, 0, 1, 195, 192,
+    6, 1, 252, 255, 33, 96, 108, 156, 31, 64, 8, 1, 64, 0, 131, 192, 6, 1, 156, 159, 65, 96, 108,
+    28, 0, 0, 85, 32, 0, 1, 195, 192, 6, 1, 252, 255, 33, 96, 108, 156, 31, 64, 0, 64, 64, 0, 131,
+    192, 134, 1, 152, 31, 65, 96, 108, 156, 31, 64, 127, 48, 0, 1, 195, 192, 6, 129, 129, 255, 33,
+    96
+};
+
+static const Uint8 GLES2_FragmentTegra_None_SolidSrc_[] = {
+    155, 191, 159, 1, 47, 109, 131, 38, 6, 0, 1, 0, 5, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 73, 0,
+    0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 75,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0,
+    75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 75, 0, 0, 0, 1, 0, 0, 0, 28, 0, 0, 0, 13, 0,
+    0, 0, 82, 0, 0, 0, 2, 0, 0, 0, 8, 0, 0, 0, 14, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    22, 0, 0, 0, 84, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 23, 0, 0, 0, 92, 0, 0, 0, 1, 0, 0, 0, 4,
+    0, 0, 0, 15, 0, 0, 0, 93, 0, 0, 0, 1, 0, 0, 0, 80, 0, 0, 0, 17, 0, 0, 0, 113, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 113, 0, 0,
+    0, 108, 0, 0, 0, 108, 0, 0, 0, 20, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0,
+    0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 110, 70, 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 117, 95, 99, 111, 108, 111, 114, 0, 0, 0, 0, 0, 82, 139, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 241, 0, 0, 0, 240, 0, 0,
+    0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 0, 0,
+    0, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 21, 32, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 20, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 82, 50, 48, 45, 66, 73, 78, 1,
+    0, 0, 0, 1, 0, 0, 0, 1, 0, 65, 37, 0, 0, 0, 0, 1, 0, 0, 21, 0, 0, 0, 0, 1, 0, 1, 38, 0, 0, 0,
+    0, 1, 0, 1, 39, 0, 0, 0, 0, 1, 0, 1, 40, 1, 0, 0, 0, 8, 0, 4, 40, 0, 40, 0, 0, 0, 242, 65, 63,
+    192, 200, 0, 0, 0, 242, 65, 63, 128, 168, 0, 0, 0, 242, 65, 63, 64, 72, 0, 0, 0, 242, 65, 63,
+    1, 0, 6, 40, 0, 0, 0, 0, 1, 0, 1, 41, 5, 0, 2, 0
+};
+
+static const Uint8 GLES2_FragmentTegra_Alpha_SolidSrc_[] = {
+    169, 153, 195, 28, 47, 109, 131, 38, 6, 0, 1, 0, 5, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 73, 0,
+    0, 0, 8, 0, 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 75,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0,
+    75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 75, 0, 0, 0, 1, 0, 0, 0, 28, 0, 0, 0, 13, 0,
+    0, 0, 82, 0, 0, 0, 2, 0, 0, 0, 8, 0, 0, 0, 14, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    22, 0, 0, 0, 84, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 23, 0, 0, 0, 92, 0, 0, 0, 1, 0, 0, 0, 4,
+    0, 0, 0, 15, 0, 0, 0, 93, 0, 0, 0, 1, 0, 0, 0, 80, 0, 0, 0, 17, 0, 0, 0, 113, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 113, 0, 0,
+    0, 220, 0, 0, 0, 220, 0, 0, 0, 20, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0,
+    0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 110, 70, 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 117, 95, 99, 111, 108, 111, 114, 0, 0, 0, 0, 0, 82, 139, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 48, 0, 0, 0, 0, 0, 0, 118, 118, 17, 241, 0, 0, 0, 240, 0,
+    0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 0,
+    0, 0, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 3, 0, 0, 0, 21, 32, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 82, 50, 48, 45, 66, 73, 78,
+    1, 0, 0, 0, 3, 0, 0, 0, 3, 0, 65, 37, 8, 0, 129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 21, 0,
+    0, 0, 0, 3, 0, 1, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 39, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 3, 0, 1, 40, 1, 0, 0, 0, 5, 0, 0, 0, 9, 0, 0, 0, 24, 0, 4, 40, 232, 231, 15,
+    0, 0, 242, 65, 62, 194, 72, 1, 0, 0, 250, 65, 63, 194, 40, 1, 0, 0, 250, 65, 63, 192, 168, 1,
+    0, 0, 242, 1, 64, 192, 168, 1, 0, 0, 242, 1, 68, 168, 32, 0, 0, 0, 50, 64, 0, 192, 168, 15,
+    0, 0, 242, 1, 66, 168, 64, 0, 16, 0, 242, 65, 1, 232, 231, 15, 0, 0, 242, 65, 62, 168, 160,
+    0, 0, 0, 50, 64, 2, 104, 192, 0, 0, 36, 48, 66, 4, 232, 231, 15, 0, 0, 242, 65, 62, 3, 0, 6,
+    40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 1, 41, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 2, 0
+};
+
+static const Uint8 GLES2_FragmentTegra_Additive_SolidSrc_[] = {
+    59, 71, 42, 17, 47, 109, 131, 38, 6, 0, 1, 0, 5, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 73, 0, 0,
+    0, 8, 0, 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 75,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0,
+    75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 75, 0, 0, 0, 1, 0, 0, 0, 28, 0, 0, 0, 13, 0,
+    0, 0, 82, 0, 0, 0, 2, 0, 0, 0, 8, 0, 0, 0, 14, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    22, 0, 0, 0, 84, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 23, 0, 0, 0, 92, 0, 0, 0, 1, 0, 0, 0, 4,
+    0, 0, 0, 15, 0, 0, 0, 93, 0, 0, 0, 1, 0, 0, 0, 80, 0, 0, 0, 17, 0, 0, 0, 113, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 113, 0, 0,
+    0, 108, 0, 0, 0, 108, 0, 0, 0, 20, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0,
+    0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 110, 70, 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 117, 95, 99, 111, 108, 111, 114, 0, 0, 0, 0, 0, 82, 139, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 48, 0, 0, 0, 0, 0, 0, 22, 22, 17, 241, 0, 0, 0, 240, 0,
+    0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 0,
+    0, 0, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 21, 32, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 82, 50, 48, 45, 66, 73, 78,
+    1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 65, 37, 8, 0, 129, 0, 1, 0, 0, 21, 0, 0, 0, 0, 1, 0, 1, 38, 0,
+    0, 0, 0, 1, 0, 1, 39, 0, 0, 0, 0, 1, 0, 1, 40, 1, 0, 0, 0, 8, 0, 4, 40, 192, 200, 0, 0, 0, 26,
+    0, 70, 192, 40, 0, 0, 0, 2, 0, 64, 192, 72, 0, 0, 0, 10, 0, 66, 192, 168, 0, 0, 0, 18, 0, 68,
+    1, 0, 6, 40, 0, 0, 0, 0, 1, 0, 1, 41, 5, 0, 2, 0
+};
+
+static const Uint8 GLES2_FragmentTegra_Modulated_SolidSrc_[] = {
+    37, 191, 49, 17, 47, 109, 131, 38, 6, 0, 1, 0, 5, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 73, 0, 0,
+    0, 8, 0, 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 75,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0,
+    75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 75, 0, 0, 0, 1, 0, 0, 0, 28, 0, 0, 0, 13, 0,
+    0, 0, 82, 0, 0, 0, 2, 0, 0, 0, 8, 0, 0, 0, 14, 0, 0, 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    22, 0, 0, 0, 84, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 23, 0, 0, 0, 92, 0, 0, 0, 1, 0, 0, 0, 4,
+    0, 0, 0, 15, 0, 0, 0, 93, 0, 0, 0, 1, 0, 0, 0, 80, 0, 0, 0, 17, 0, 0, 0, 113, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 113, 0, 0,
+    0, 108, 0, 0, 0, 108, 0, 0, 0, 20, 0, 0, 0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0,
+    0, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 110, 70, 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 117, 95, 99, 111, 108, 111, 114, 0, 0, 0, 0, 0, 82, 139, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 48, 0, 0, 0, 0, 0, 0, 32, 32, 17, 241, 0, 0, 0, 240, 0,
+    0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 0,
+    0, 0, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 21, 32, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 82, 50, 48, 45, 66, 73, 78,
+    1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 65, 37, 8, 0, 129, 0, 1, 0, 0, 21, 0, 0, 0, 0, 1, 0, 1, 38, 0,
+    0, 0, 0, 1, 0, 1, 39, 0, 0, 0, 0, 1, 0, 1, 40, 1, 0, 0, 0, 8, 0, 4, 40, 104, 192, 0, 0, 0, 242,
+    1, 70, 8, 32, 0, 0, 0, 242, 1, 64, 40, 64, 0, 0, 0, 242, 1, 66, 72, 160, 0, 0, 0, 242, 1, 68,
+    1, 0, 6, 40, 0, 0, 0, 0, 1, 0, 1, 41, 5, 0, 2, 0
+};
+
+static const Uint8 GLES2_FragmentTegra_None_TextureSrc_[] = {
+    220, 217, 41, 211, 47, 109, 131, 38, 6, 0, 1, 0, 5, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 73, 0,
+    0, 0, 34, 0, 0, 0, 36, 0, 0, 0, 2, 0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0,
+    82, 0, 0, 0, 1, 0, 0, 0, 20, 0, 0, 0, 6, 0, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0,
+    0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 87, 0, 0, 0, 2, 0, 0, 0, 56, 0, 0, 0,
+    13, 0, 0, 0, 101, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 14, 0, 0, 0, 105, 0, 0, 0, 1, 0, 0, 0, 4,
+    0, 0, 0, 22, 0, 0, 0, 106, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 23, 0, 0, 0, 114, 0, 0, 0, 1, 0,
+    0, 0, 4, 0, 0, 0, 15, 0, 0, 0, 115, 0, 0, 0, 1, 0, 0, 0, 80, 0, 0, 0, 17, 0, 0, 0, 135, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 135,
+    0, 0, 0, 120, 0, 0, 0, 120, 0, 0, 0, 20, 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21,
+    0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 110, 70, 73, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 118, 95, 116, 101, 120, 67, 111, 111, 114, 100, 0, 117, 95, 109, 111, 100, 117, 108,
+    97, 116, 105, 111, 110, 0, 117, 95, 116, 101, 120, 116, 117, 114, 101, 0, 0, 0, 0, 0, 0, 0,
+    2, 0, 0, 0, 0, 0, 0, 0, 220, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 82, 139, 0, 0, 1, 0, 0, 0, 1,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 94, 139, 0, 0, 1, 0, 0, 0, 1, 0, 0,
+    0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 5, 48, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 0, 0, 0, 241, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240,
+    0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 1, 0,
+    0, 0, 1, 0, 0, 0, 21, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0,
+    0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 65, 82, 50, 48, 45, 66, 73, 78, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 65, 37, 0, 0, 0, 0, 1, 0,
+    0, 21, 0, 0, 0, 0, 1, 0, 1, 38, 1, 0, 0, 0, 2, 0, 4, 38, 186, 81, 78, 16, 2, 1, 0, 0, 1, 0,
+    1, 39, 0, 4, 0, 0, 1, 0, 1, 40, 1, 0, 0, 0, 8, 0, 4, 40, 104, 192, 0, 0, 0, 242, 1, 70, 8, 32,
+    0, 0, 0, 242, 1, 64, 40, 64, 0, 0, 0, 242, 1, 66, 72, 160, 0, 0, 0, 242, 1, 68, 1, 0, 6, 40,
+    0, 0, 0, 0, 1, 0, 1, 41, 5, 0, 2, 0
+};
+
+static const Uint8 GLES2_FragmentTegra_Alpha_TextureSrc_[] = {
+    71, 202, 114, 229, 47, 109, 131, 38, 6, 0, 1, 0, 5, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 73, 0,
+    0, 0, 34, 0, 0, 0, 36, 0, 0, 0, 2, 0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0,
+    82, 0, 0, 0, 1, 0, 0, 0, 20, 0, 0, 0, 6, 0, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0,
+    0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 87, 0, 0, 0, 2, 0, 0, 0, 56, 0, 0, 0,
+    13, 0, 0, 0, 101, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 14, 0, 0, 0, 105, 0, 0, 0, 1, 0, 0, 0, 4,
+    0, 0, 0, 22, 0, 0, 0, 106, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 23, 0, 0, 0, 114, 0, 0, 0, 1, 0,
+    0, 0, 4, 0, 0, 0, 15, 0, 0, 0, 115, 0, 0, 0, 1, 0, 0, 0, 80, 0, 0, 0, 17, 0, 0, 0, 135, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 135,
+    0, 0, 0, 176, 0, 0, 0, 176, 0, 0, 0, 20, 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21,
+    0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 110, 70, 73, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 118, 95, 116, 101, 120, 67, 111, 111, 114, 100, 0, 117, 95, 109, 111, 100, 117, 108,
+    97, 116, 105, 111, 110, 0, 117, 95, 116, 101, 120, 116, 117, 114, 101, 0, 0, 0, 0, 0, 0, 0,
+    2, 0, 0, 0, 0, 0, 0, 0, 220, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 82, 139, 0, 0, 1, 0, 0, 0, 1,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 94, 139, 0, 0, 1, 0, 0, 0, 1, 0, 0,
+    0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 5, 48, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 118, 118, 17, 241, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0,
+    240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 2, 0, 0, 0,
+    1, 0, 0, 0, 2, 0, 0, 0, 21, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 16, 0, 0, 0, 16,
+    0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 65, 82, 50, 48, 45, 66, 73, 78, 1, 0, 0, 0, 2, 0, 0, 0, 2, 0, 65, 37, 0, 0, 0, 0,
+    8, 0, 129, 0, 1, 0, 0, 21, 0, 0, 0, 0, 2, 0, 1, 38, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 38, 186,
+    81, 78, 16, 2, 1, 0, 0, 2, 0, 1, 39, 0, 4, 0, 0, 0, 0, 0, 0, 2, 0, 1, 40, 1, 0, 0, 0, 5, 0,
+    0, 0, 16, 0, 4, 40, 40, 160, 1, 0, 0, 242, 1, 66, 8, 192, 1, 0, 0, 242, 1, 64, 104, 32, 1, 0,
+    0, 242, 1, 70, 72, 64, 1, 0, 0, 242, 1, 68, 154, 192, 0, 0, 37, 34, 64, 3, 8, 32, 0, 0, 5, 58,
+    208, 4, 40, 64, 0, 0, 5, 50, 208, 4, 72, 160, 0, 0, 37, 42, 208, 4, 2, 0, 6, 40, 0, 0, 0, 0,
+    0, 0, 0, 0, 2, 0, 1, 41, 0, 0, 0, 0, 5, 0, 2, 0
+};
+
+static const Uint8 GLES2_FragmentTegra_Additive_TextureSrc_[] = {
+    161, 234, 193, 234, 47, 109, 131, 38, 6, 0, 1, 0, 5, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 73, 0,
+    0, 0, 34, 0, 0, 0, 36, 0, 0, 0, 2, 0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0,
+    82, 0, 0, 0, 1, 0, 0, 0, 20, 0, 0, 0, 6, 0, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0,
+    0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 87, 0, 0, 0, 2, 0, 0, 0, 56, 0, 0, 0,
+    13, 0, 0, 0, 101, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 14, 0, 0, 0, 105, 0, 0, 0, 1, 0, 0, 0, 4,
+    0, 0, 0, 22, 0, 0, 0, 106, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 23, 0, 0, 0, 114, 0, 0, 0, 1, 0,
+    0, 0, 4, 0, 0, 0, 15, 0, 0, 0, 115, 0, 0, 0, 1, 0, 0, 0, 80, 0, 0, 0, 17, 0, 0, 0, 135, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 135,
+    0, 0, 0, 176, 0, 0, 0, 176, 0, 0, 0, 20, 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21,
+    0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 110, 70, 73, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 118, 95, 116, 101, 120, 67, 111, 111, 114, 100, 0, 117, 95, 109, 111, 100, 117, 108,
+    97, 116, 105, 111, 110, 0, 117, 95, 116, 101, 120, 116, 117, 114, 101, 0, 0, 0, 0, 0, 0, 0,
+    2, 0, 0, 0, 0, 0, 0, 0, 220, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 82, 139, 0, 0, 1, 0, 0, 0, 1,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 94, 139, 0, 0, 1, 0, 0, 0, 1, 0, 0,
+    0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 5, 48, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 22, 22, 17, 241, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240,
+    0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 2, 0, 0, 0, 1, 0,
+    0, 0, 2, 0, 0, 0, 21, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0,
+    0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 65, 82, 50, 48, 45, 66, 73, 78, 1, 0, 0, 0, 2, 0, 0, 0, 2, 0, 65, 37, 0, 0, 0, 0, 8, 0,
+    129, 0, 1, 0, 0, 21, 0, 0, 0, 0, 2, 0, 1, 38, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 38, 186, 81,
+    78, 16, 2, 1, 0, 0, 2, 0, 1, 39, 0, 4, 0, 0, 0, 0, 0, 0, 2, 0, 1, 40, 1, 0, 0, 0, 5, 0, 0, 0,
+    16, 0, 4, 40, 40, 160, 1, 0, 0, 242, 1, 66, 104, 32, 1, 0, 0, 242, 1, 70, 8, 192, 1, 0, 0, 242,
+    1, 64, 72, 64, 1, 0, 0, 242, 1, 68, 136, 192, 0, 0, 0, 26, 64, 4, 136, 32, 0, 0, 0, 2, 64, 7,
+    136, 64, 0, 0, 0, 10, 64, 6, 136, 160, 0, 0, 0, 18, 64, 5, 2, 0, 6, 40, 0, 0, 0, 0, 0, 0, 0,
+    0, 2, 0, 1, 41, 0, 0, 0, 0, 5, 0, 2, 0
+};
+
+static const Uint8 GLES2_FragmentTegra_Modulated_TextureSrc_[] = {
+    75, 132, 201, 227, 47, 109, 131, 38, 6, 0, 1, 0, 5, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 73, 0,
+    0, 0, 34, 0, 0, 0, 36, 0, 0, 0, 2, 0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0,
+    82, 0, 0, 0, 1, 0, 0, 0, 20, 0, 0, 0, 6, 0, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0,
+    0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 87, 0, 0, 0, 2, 0, 0, 0, 56, 0, 0, 0,
+    13, 0, 0, 0, 101, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 14, 0, 0, 0, 105, 0, 0, 0, 1, 0, 0, 0, 4,
+    0, 0, 0, 22, 0, 0, 0, 106, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 23, 0, 0, 0, 114, 0, 0, 0, 1, 0,
+    0, 0, 4, 0, 0, 0, 15, 0, 0, 0, 115, 0, 0, 0, 1, 0, 0, 0, 80, 0, 0, 0, 17, 0, 0, 0, 135, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 135,
+    0, 0, 0, 176, 0, 0, 0, 176, 0, 0, 0, 20, 0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21,
+    0, 0, 0, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 97, 110, 70, 73, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 118, 95, 116, 101, 120, 67, 111, 111, 114, 100, 0, 117, 95, 109, 111, 100, 117, 108,
+    97, 116, 105, 111, 110, 0, 117, 95, 116, 101, 120, 116, 117, 114, 101, 0, 0, 0, 0, 0, 0, 0,
+    2, 0, 0, 0, 0, 0, 0, 0, 220, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 82, 139, 0, 0, 1, 0, 0, 0, 1,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 94, 139, 0, 0, 1, 0, 0, 0, 1, 0, 0,
+    0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 5, 48, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 1, 32, 32, 17, 241, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 240,
+    0, 0, 0, 240, 0, 0, 0, 240, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 7, 0, 0, 0, 2, 0, 0, 0, 1, 0,
+    0, 0, 2, 0, 0, 0, 21, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0,
+    0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 65, 82, 50, 48, 45, 66, 73, 78, 1, 0, 0, 0, 2, 0, 0, 0, 2, 0, 65, 37, 0, 0, 0, 0, 8, 0,
+    129, 0, 1, 0, 0, 21, 0, 0, 0, 0, 2, 0, 1, 38, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 4, 38, 186, 81,
+    78, 16, 2, 1, 0, 0, 2, 0, 1, 39, 0, 4, 0, 0, 0, 0, 0, 0, 2, 0, 1, 40, 1, 0, 0, 0, 5, 0, 0, 0,
+    16, 0, 4, 40, 40, 160, 1, 0, 0, 242, 1, 66, 8, 192, 1, 0, 0, 242, 1, 64, 104, 32, 1, 0, 0, 242,
+    1, 70, 72, 64, 1, 0, 0, 242, 1, 68, 104, 192, 0, 0, 0, 242, 65, 4, 232, 32, 0, 0, 0, 242, 65,
+    0, 40, 64, 0, 0, 0, 242, 65, 6, 72, 160, 0, 0, 0, 242, 65, 5, 2, 0, 6, 40, 0, 0, 0, 0, 0, 0,
+    0, 0, 2, 0, 1, 41, 0, 0, 0, 0, 5, 0, 2, 0
+};
+
+static const GLES2_ShaderInstance GLES2_VertexTegra_Default = {
+    GL_VERTEX_SHADER,
+    GL_NVIDIA_PLATFORM_BINARY_NV,
+    sizeof(GLES2_VertexTegra_Default_),
+    GLES2_VertexTegra_Default_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentTegra_None_SolidSrc = {
+    GL_FRAGMENT_SHADER,
+    GL_NVIDIA_PLATFORM_BINARY_NV,
+    sizeof(GLES2_FragmentTegra_None_SolidSrc_),
+    GLES2_FragmentTegra_None_SolidSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentTegra_Alpha_SolidSrc = {
+    GL_FRAGMENT_SHADER,
+    GL_NVIDIA_PLATFORM_BINARY_NV,
+    sizeof(GLES2_FragmentTegra_Alpha_SolidSrc_),
+    GLES2_FragmentTegra_Alpha_SolidSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentTegra_Additive_SolidSrc = {
+    GL_FRAGMENT_SHADER,
+    GL_NVIDIA_PLATFORM_BINARY_NV,
+    sizeof(GLES2_FragmentTegra_Additive_SolidSrc_),
+    GLES2_FragmentTegra_Additive_SolidSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentTegra_Modulated_SolidSrc = {
+    GL_FRAGMENT_SHADER,
+    GL_NVIDIA_PLATFORM_BINARY_NV,
+    sizeof(GLES2_FragmentTegra_Modulated_SolidSrc_),
+    GLES2_FragmentTegra_Modulated_SolidSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentTegra_None_TextureSrc = {
+    GL_FRAGMENT_SHADER,
+    GL_NVIDIA_PLATFORM_BINARY_NV,
+    sizeof(GLES2_FragmentTegra_None_TextureSrc_),
+    GLES2_FragmentTegra_None_TextureSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentTegra_Alpha_TextureSrc = {
+    GL_FRAGMENT_SHADER,
+    GL_NVIDIA_PLATFORM_BINARY_NV,
+    sizeof(GLES2_FragmentTegra_Alpha_TextureSrc_),
+    GLES2_FragmentTegra_Alpha_TextureSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentTegra_Additive_TextureSrc = {
+    GL_FRAGMENT_SHADER,
+    GL_NVIDIA_PLATFORM_BINARY_NV,
+    sizeof(GLES2_FragmentTegra_Additive_TextureSrc_),
+    GLES2_FragmentTegra_Additive_TextureSrc_
+};
+
+static const GLES2_ShaderInstance GLES2_FragmentTegra_Modulated_TextureSrc = {
+    GL_FRAGMENT_SHADER,
+    GL_NVIDIA_PLATFORM_BINARY_NV,
+    sizeof(GLES2_FragmentTegra_Modulated_TextureSrc_),
+    GLES2_FragmentTegra_Modulated_TextureSrc_
+};
+
+#endif /* GLES2_INCLUDE_NVIDIA_SHADERS */
+
+/*************************************************************************************************
+ * Vertex/fragment shader definitions                                                            *
+ *************************************************************************************************/
+
+static GLES2_Shader GLES2_VertexShader_Default = {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+    2,
+#else
+    1,
+#endif
+    {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+        &GLES2_VertexTegra_Default,
+#endif
+        &GLES2_VertexSrc_Default
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_None_SolidSrc = {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+    2,
+#else
+    1,
+#endif
+    {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+        &GLES2_FragmentTegra_None_SolidSrc,
+#endif
+        &GLES2_FragmentSrc_SolidSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Alpha_SolidSrc = {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+    2,
+#else
+    1,
+#endif
+    {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+        &GLES2_FragmentTegra_Alpha_SolidSrc,
+#endif
+        &GLES2_FragmentSrc_SolidSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Additive_SolidSrc = {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+    2,
+#else
+    1,
+#endif
+    {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+        &GLES2_FragmentTegra_Additive_SolidSrc,
+#endif
+        &GLES2_FragmentSrc_SolidSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Modulated_SolidSrc = {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+    2,
+#else
+    1,
+#endif
+    {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+        &GLES2_FragmentTegra_Modulated_SolidSrc,
+#endif
+        &GLES2_FragmentSrc_SolidSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_None_TextureABGRSrc = {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+    2,
+#else
+    1,
+#endif
+    {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+        &GLES2_FragmentTegra_None_TextureSrc,
+#endif
+        &GLES2_FragmentSrc_TextureABGRSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Alpha_TextureABGRSrc = {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+    2,
+#else
+    1,
+#endif
+    {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+        &GLES2_FragmentTegra_Alpha_TextureSrc,
+#endif
+        &GLES2_FragmentSrc_TextureABGRSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Additive_TextureABGRSrc = {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+    2,
+#else
+    1,
+#endif
+    {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+        &GLES2_FragmentTegra_Additive_TextureSrc,
+#endif
+        &GLES2_FragmentSrc_TextureABGRSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Modulated_TextureABGRSrc = {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+    2,
+#else
+    1,
+#endif
+    {
+#if GLES2_INCLUDE_NVIDIA_SHADERS
+        &GLES2_FragmentTegra_Modulated_TextureSrc,
+#endif
+        &GLES2_FragmentSrc_TextureABGRSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_None_TextureARGBSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureARGBSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Alpha_TextureARGBSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureARGBSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Additive_TextureARGBSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureARGBSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Modulated_TextureARGBSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureARGBSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_None_TextureRGBSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureRGBSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Alpha_TextureRGBSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureRGBSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Additive_TextureRGBSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureRGBSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Modulated_TextureRGBSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureRGBSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_None_TextureBGRSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureBGRSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Alpha_TextureBGRSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureBGRSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Additive_TextureBGRSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureBGRSrc
+    }
+};
+
+static GLES2_Shader GLES2_FragmentShader_Modulated_TextureBGRSrc = {
+    1,
+    {
+        &GLES2_FragmentSrc_TextureBGRSrc
+    }
+};
+
+/*************************************************************************************************
+ * Shader selector                                                                               *
+ *************************************************************************************************/
+
+const GLES2_Shader *GLES2_GetShader(GLES2_ShaderType type, SDL_BlendMode blendMode)
+{
+    switch (type)
+    {
+    case GLES2_SHADER_VERTEX_DEFAULT:
+        return &GLES2_VertexShader_Default;
+    case GLES2_SHADER_FRAGMENT_SOLID_SRC:
+    switch (blendMode)
+    {
+    case SDL_BLENDMODE_NONE:
+        return &GLES2_FragmentShader_None_SolidSrc;
+    case SDL_BLENDMODE_BLEND:
+        return &GLES2_FragmentShader_Alpha_SolidSrc;
+    case SDL_BLENDMODE_ADD:
+        return &GLES2_FragmentShader_Additive_SolidSrc;
+    case SDL_BLENDMODE_MOD:
+        return &GLES2_FragmentShader_Modulated_SolidSrc;
+    default:
+        return NULL;
+    }
+    case GLES2_SHADER_FRAGMENT_TEXTURE_ABGR_SRC:
+        switch (blendMode)
+    {
+        case SDL_BLENDMODE_NONE:
+            return &GLES2_FragmentShader_None_TextureABGRSrc;
+        case SDL_BLENDMODE_BLEND:
+            return &GLES2_FragmentShader_Alpha_TextureABGRSrc;
+        case SDL_BLENDMODE_ADD:
+            return &GLES2_FragmentShader_Additive_TextureABGRSrc;
+        case SDL_BLENDMODE_MOD:
+            return &GLES2_FragmentShader_Modulated_TextureABGRSrc;
+        default:
+            return NULL;
+    }
+    case GLES2_SHADER_FRAGMENT_TEXTURE_ARGB_SRC:
+        switch (blendMode)
+    {
+        case SDL_BLENDMODE_NONE:
+            return &GLES2_FragmentShader_None_TextureARGBSrc;
+        case SDL_BLENDMODE_BLEND:
+            return &GLES2_FragmentShader_Alpha_TextureARGBSrc;
+        case SDL_BLENDMODE_ADD:
+            return &GLES2_FragmentShader_Additive_TextureARGBSrc;
+        case SDL_BLENDMODE_MOD:
+            return &GLES2_FragmentShader_Modulated_TextureARGBSrc;
+        default:
+            return NULL;
+    }
+
+    case GLES2_SHADER_FRAGMENT_TEXTURE_RGB_SRC:
+        switch (blendMode)
+    {
+        case SDL_BLENDMODE_NONE:
+            return &GLES2_FragmentShader_None_TextureRGBSrc;
+        case SDL_BLENDMODE_BLEND:
+            return &GLES2_FragmentShader_Alpha_TextureRGBSrc;
+        case SDL_BLENDMODE_ADD:
+            return &GLES2_FragmentShader_Additive_TextureRGBSrc;
+        case SDL_BLENDMODE_MOD:
+            return &GLES2_FragmentShader_Modulated_TextureRGBSrc;
+        default:
+            return NULL;
+    }
+
+    case GLES2_SHADER_FRAGMENT_TEXTURE_BGR_SRC:
+        switch (blendMode)
+    {
+        case SDL_BLENDMODE_NONE:
+            return &GLES2_FragmentShader_None_TextureBGRSrc;
+        case SDL_BLENDMODE_BLEND:
+            return &GLES2_FragmentShader_Alpha_TextureBGRSrc;
+        case SDL_BLENDMODE_ADD:
+            return &GLES2_FragmentShader_Additive_TextureBGRSrc;
+        case SDL_BLENDMODE_MOD:
+            return &GLES2_FragmentShader_Modulated_TextureBGRSrc;
+        default:
+            return NULL;
+    }
+
+    default:
+        return NULL;
+    }
+}
+
+#endif /* SDL_VIDEO_RENDER_OGL_ES2 && !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/opengles2/SDL_shaders_gles2.h b/Source/3rd Party/sdl/src/render/opengles2/SDL_shaders_gles2.h
new file mode 100644
index 000000000..77c75c9f1
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/opengles2/SDL_shaders_gles2.h	
@@ -0,0 +1,60 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_OGL_ES2
+
+#ifndef SDL_shaderdata_h_
+#define SDL_shaderdata_h_
+
+typedef struct GLES2_ShaderInstance
+{
+    GLenum type;
+    GLenum format;
+    int length;
+    const void *data;
+} GLES2_ShaderInstance;
+
+typedef struct GLES2_Shader
+{
+    int instance_count;
+    const GLES2_ShaderInstance *instances[4];
+} GLES2_Shader;
+
+typedef enum
+{
+    GLES2_SHADER_VERTEX_DEFAULT,
+    GLES2_SHADER_FRAGMENT_SOLID_SRC,
+    GLES2_SHADER_FRAGMENT_TEXTURE_ABGR_SRC,
+    GLES2_SHADER_FRAGMENT_TEXTURE_ARGB_SRC,
+    GLES2_SHADER_FRAGMENT_TEXTURE_BGR_SRC,
+    GLES2_SHADER_FRAGMENT_TEXTURE_RGB_SRC
+} GLES2_ShaderType;
+
+#define GLES2_SOURCE_SHADER (GLenum)-1
+
+const GLES2_Shader *GLES2_GetShader(GLES2_ShaderType type, SDL_BlendMode blendMode);
+
+#endif /* SDL_shaderdata_h_ */
+
+#endif /* SDL_VIDEO_RENDER_OGL_ES2 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/psp/SDL_render_psp.c b/Source/3rd Party/sdl/src/render/psp/SDL_render_psp.c
new file mode 100644
index 000000000..cdd13e822
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/psp/SDL_render_psp.c	
@@ -0,0 +1,1020 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_RENDER_PSP
+
+#include "SDL_hints.h"
+#include "../SDL_sysrender.h"
+
+#include <pspkernel.h>
+#include <pspdisplay.h>
+#include <pspgu.h>
+#include <pspgum.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include <pspge.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <vram.h>
+
+
+
+
+/* PSP renderer implementation, based on the PGE  */
+
+
+extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
+
+
+static SDL_Renderer *PSP_CreateRenderer(SDL_Window * window, Uint32 flags);
+static void PSP_WindowEvent(SDL_Renderer * renderer,
+                             const SDL_WindowEvent *event);
+static int PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int PSP_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                              const SDL_Rect * rect, const void *pixels,
+                              int pitch);
+static int PSP_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                            const SDL_Rect * rect, void **pixels, int *pitch);
+static void PSP_UnlockTexture(SDL_Renderer * renderer,
+                               SDL_Texture * texture);
+static int PSP_SetRenderTarget(SDL_Renderer * renderer,
+                                 SDL_Texture * texture);
+static int PSP_UpdateViewport(SDL_Renderer * renderer);
+static int PSP_RenderClear(SDL_Renderer * renderer);
+static int PSP_RenderDrawPoints(SDL_Renderer * renderer,
+                                 const SDL_FPoint * points, int count);
+static int PSP_RenderDrawLines(SDL_Renderer * renderer,
+                                const SDL_FPoint * points, int count);
+static int PSP_RenderFillRects(SDL_Renderer * renderer,
+                                const SDL_FRect * rects, int count);
+static int PSP_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                           const SDL_Rect * srcrect,
+                           const SDL_FRect * dstrect);
+static int PSP_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                    Uint32 pixel_format, void * pixels, int pitch);
+static int PSP_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                         const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                         const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip);
+static void PSP_RenderPresent(SDL_Renderer * renderer);
+static void PSP_DestroyTexture(SDL_Renderer * renderer,
+                                SDL_Texture * texture);
+static void PSP_DestroyRenderer(SDL_Renderer * renderer);
+
+/*
+SDL_RenderDriver PSP_RenderDriver = {
+    PSP_CreateRenderer,
+    {
+     "PSP",
+     (SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE),
+     1,
+     {SDL_PIXELFORMAT_ABGR8888},
+     0,
+     0}
+};
+*/
+SDL_RenderDriver PSP_RenderDriver = {
+    .CreateRenderer = PSP_CreateRenderer,
+    .info = {
+        .name = "PSP",
+        .flags = SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE,
+        .num_texture_formats = 4,
+        .texture_formats = { [0] = SDL_PIXELFORMAT_BGR565,
+                                                 [1] = SDL_PIXELFORMAT_ABGR1555,
+                                                 [2] = SDL_PIXELFORMAT_ABGR4444,
+                                                 [3] = SDL_PIXELFORMAT_ABGR8888,
+        },
+        .max_texture_width = 512,
+        .max_texture_height = 512,
+     }
+};
+
+#define PSP_SCREEN_WIDTH    480
+#define PSP_SCREEN_HEIGHT   272
+
+#define PSP_FRAME_BUFFER_WIDTH  512
+#define PSP_FRAME_BUFFER_SIZE   (PSP_FRAME_BUFFER_WIDTH*PSP_SCREEN_HEIGHT)
+
+static unsigned int __attribute__((aligned(16))) DisplayList[262144];
+
+
+#define COL5650(r,g,b,a)    ((r>>3) | ((g>>2)<<5) | ((b>>3)<<11))
+#define COL5551(r,g,b,a)    ((r>>3) | ((g>>3)<<5) | ((b>>3)<<10) | (a>0?0x7000:0))
+#define COL4444(r,g,b,a)    ((r>>4) | ((g>>4)<<4) | ((b>>4)<<8) | ((a>>4)<<12))
+#define COL8888(r,g,b,a)    ((r) | ((g)<<8) | ((b)<<16) | ((a)<<24))
+
+
+typedef struct
+{
+    void*           frontbuffer ;
+    void*           backbuffer ;
+    SDL_bool        initialized ;
+    SDL_bool        displayListAvail ;
+    unsigned int    psm ;
+    unsigned int    bpp ;
+
+    SDL_bool        vsync;
+    unsigned int    currentColor;
+    int             currentBlendMode;
+
+} PSP_RenderData;
+
+
+typedef struct
+{
+    void                *data;                              /**< Image data. */
+    unsigned int        size;                               /**< Size of data in bytes. */
+    unsigned int        width;                              /**< Image width. */
+    unsigned int        height;                             /**< Image height. */
+    unsigned int        textureWidth;                       /**< Texture width (power of two). */
+    unsigned int        textureHeight;                      /**< Texture height (power of two). */
+    unsigned int        bits;                               /**< Image bits per pixel. */
+    unsigned int        format;                             /**< Image format - one of ::pgePixelFormat. */
+    unsigned int        pitch;
+    SDL_bool            swizzled;                           /**< Is image swizzled. */
+
+} PSP_TextureData;
+
+typedef struct
+{
+    float   x, y, z;
+} VertV;
+
+
+typedef struct
+{
+    float   u, v;
+    float   x, y, z;
+
+} VertTV;
+
+
+/* Return next power of 2 */
+static int
+TextureNextPow2(unsigned int w)
+{
+    if(w == 0)
+        return 0;
+
+    unsigned int n = 2;
+
+    while(w > n)
+        n <<= 1;
+
+    return n;
+}
+
+
+static int
+GetScaleQuality(void)
+{
+    const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY);
+
+    if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
+        return GU_NEAREST; /* GU_NEAREST good for tile-map */
+    } else {
+        return GU_LINEAR; /* GU_LINEAR good for scaling */
+    }
+}
+
+static int
+PixelFormatToPSPFMT(Uint32 format)
+{
+    switch (format) {
+    case SDL_PIXELFORMAT_BGR565:
+        return GU_PSM_5650;
+    case SDL_PIXELFORMAT_ABGR1555:
+        return GU_PSM_5551;
+    case SDL_PIXELFORMAT_ABGR4444:
+        return GU_PSM_4444;
+    case SDL_PIXELFORMAT_ABGR8888:
+        return GU_PSM_8888;
+    default:
+        return GU_PSM_8888;
+    }
+}
+
+void
+StartDrawing(SDL_Renderer * renderer)
+{
+    PSP_RenderData *data = (PSP_RenderData *) renderer->driverdata;
+    if(data->displayListAvail)
+        return;
+
+    sceGuStart(GU_DIRECT, DisplayList);
+    data->displayListAvail = SDL_TRUE;
+}
+
+
+int
+TextureSwizzle(PSP_TextureData *psp_texture)
+{
+    if(psp_texture->swizzled)
+        return 1;
+
+    int bytewidth = psp_texture->textureWidth*(psp_texture->bits>>3);
+    int height = psp_texture->size / bytewidth;
+
+    int rowblocks = (bytewidth>>4);
+    int rowblocksadd = (rowblocks-1)<<7;
+    unsigned int blockaddress = 0;
+    unsigned int *src = (unsigned int*) psp_texture->data;
+
+    unsigned char *data = NULL;
+    data = malloc(psp_texture->size);
+
+    int j;
+
+    for(j = 0; j < height; j++, blockaddress += 16)
+    {
+        unsigned int *block;
+
+        block = (unsigned int*)&data[blockaddress];
+
+        int i;
+
+        for(i = 0; i < rowblocks; i++)
+        {
+            *block++ = *src++;
+            *block++ = *src++;
+            *block++ = *src++;
+            *block++ = *src++;
+            block += 28;
+        }
+
+        if((j & 0x7) == 0x7)
+            blockaddress += rowblocksadd;
+    }
+
+    free(psp_texture->data);
+    psp_texture->data = data;
+    psp_texture->swizzled = SDL_TRUE;
+
+    return 1;
+}
+int TextureUnswizzle(PSP_TextureData *psp_texture)
+{
+    if(!psp_texture->swizzled)
+        return 1;
+
+    int blockx, blocky;
+
+    int bytewidth = psp_texture->textureWidth*(psp_texture->bits>>3);
+    int height = psp_texture->size / bytewidth;
+
+    int widthblocks = bytewidth/16;
+    int heightblocks = height/8;
+
+    int dstpitch = (bytewidth - 16)/4;
+    int dstrow = bytewidth * 8;
+
+    unsigned int *src = (unsigned int*) psp_texture->data;
+
+    unsigned char *data = NULL;
+
+    data = malloc(psp_texture->size);
+
+    if(!data)
+        return 0;
+
+    sceKernelDcacheWritebackAll();
+
+    int j;
+
+    unsigned char *ydst = (unsigned char *)data;
+
+    for(blocky = 0; blocky < heightblocks; ++blocky)
+    {
+        unsigned char *xdst = ydst;
+
+        for(blockx = 0; blockx < widthblocks; ++blockx)
+        {
+            unsigned int *block;
+
+            block = (unsigned int*)xdst;
+
+            for(j = 0; j < 8; ++j)
+            {
+                *(block++) = *(src++);
+                *(block++) = *(src++);
+                *(block++) = *(src++);
+                *(block++) = *(src++);
+                block += dstpitch;
+            }
+
+            xdst += 16;
+        }
+
+        ydst += dstrow;
+    }
+
+    free(psp_texture->data);
+
+    psp_texture->data = data;
+
+    psp_texture->swizzled = SDL_FALSE;
+
+    return 1;
+}
+
+SDL_Renderer *
+PSP_CreateRenderer(SDL_Window * window, Uint32 flags)
+{
+
+    SDL_Renderer *renderer;
+    PSP_RenderData *data;
+        int pixelformat;
+    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
+    if (!renderer) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    data = (PSP_RenderData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        PSP_DestroyRenderer(renderer);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+
+    renderer->WindowEvent = PSP_WindowEvent;
+    renderer->CreateTexture = PSP_CreateTexture;
+    renderer->UpdateTexture = PSP_UpdateTexture;
+    renderer->LockTexture = PSP_LockTexture;
+    renderer->UnlockTexture = PSP_UnlockTexture;
+    renderer->SetRenderTarget = PSP_SetRenderTarget;
+    renderer->UpdateViewport = PSP_UpdateViewport;
+    renderer->RenderClear = PSP_RenderClear;
+    renderer->RenderDrawPoints = PSP_RenderDrawPoints;
+    renderer->RenderDrawLines = PSP_RenderDrawLines;
+    renderer->RenderFillRects = PSP_RenderFillRects;
+    renderer->RenderCopy = PSP_RenderCopy;
+    renderer->RenderReadPixels = PSP_RenderReadPixels;
+    renderer->RenderCopyEx = PSP_RenderCopyEx;
+    renderer->RenderPresent = PSP_RenderPresent;
+    renderer->DestroyTexture = PSP_DestroyTexture;
+    renderer->DestroyRenderer = PSP_DestroyRenderer;
+    renderer->info = PSP_RenderDriver.info;
+    renderer->info.flags = (SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE);
+    renderer->driverdata = data;
+    renderer->window = window;
+
+    if (data->initialized != SDL_FALSE)
+        return 0;
+    data->initialized = SDL_TRUE;
+
+    if (flags & SDL_RENDERER_PRESENTVSYNC) {
+        data->vsync = SDL_TRUE;
+    } else {
+        data->vsync = SDL_FALSE;
+    }
+
+    pixelformat=PixelFormatToPSPFMT(SDL_GetWindowPixelFormat(window));
+    switch(pixelformat)
+    {
+        case GU_PSM_4444:
+        case GU_PSM_5650:
+        case GU_PSM_5551:
+            data->frontbuffer = (unsigned int *)(PSP_FRAME_BUFFER_SIZE<<1);
+            data->backbuffer =  (unsigned int *)(0);
+            data->bpp = 2;
+            data->psm = pixelformat;
+            break;
+        default:
+            data->frontbuffer = (unsigned int *)(PSP_FRAME_BUFFER_SIZE<<2);
+            data->backbuffer =  (unsigned int *)(0);
+            data->bpp = 4;
+            data->psm = GU_PSM_8888;
+            break;
+    }
+
+    sceGuInit();
+    /* setup GU */
+    sceGuStart(GU_DIRECT, DisplayList);
+    sceGuDrawBuffer(data->psm, data->frontbuffer, PSP_FRAME_BUFFER_WIDTH);
+    sceGuDispBuffer(PSP_SCREEN_WIDTH, PSP_SCREEN_HEIGHT, data->backbuffer, PSP_FRAME_BUFFER_WIDTH);
+
+
+    sceGuOffset(2048 - (PSP_SCREEN_WIDTH>>1), 2048 - (PSP_SCREEN_HEIGHT>>1));
+    sceGuViewport(2048, 2048, PSP_SCREEN_WIDTH, PSP_SCREEN_HEIGHT);
+
+    data->frontbuffer = vabsptr(data->frontbuffer);
+    data->backbuffer = vabsptr(data->backbuffer);
+
+    /* Scissoring */
+    sceGuScissor(0, 0, PSP_SCREEN_WIDTH, PSP_SCREEN_HEIGHT);
+    sceGuEnable(GU_SCISSOR_TEST);
+
+    /* Backface culling */
+    sceGuFrontFace(GU_CCW);
+    sceGuEnable(GU_CULL_FACE);
+
+    /* Texturing */
+    sceGuEnable(GU_TEXTURE_2D);
+    sceGuShadeModel(GU_SMOOTH);
+    sceGuTexWrap(GU_REPEAT, GU_REPEAT);
+
+    /* Blending */
+    sceGuEnable(GU_BLEND);
+    sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_ONE_MINUS_SRC_ALPHA, 0, 0);
+
+    sceGuTexFilter(GU_LINEAR,GU_LINEAR);
+
+    sceGuFinish();
+    sceGuSync(0,0);
+    sceDisplayWaitVblankStartCB();
+    sceGuDisplay(GU_TRUE);
+
+    return renderer;
+}
+
+static void
+PSP_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
+{
+
+}
+
+
+static int
+PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+/*      PSP_RenderData *renderdata = (PSP_RenderData *) renderer->driverdata; */
+    PSP_TextureData* psp_texture = (PSP_TextureData*) SDL_calloc(1, sizeof(*psp_texture));;
+
+    if(!psp_texture)
+        return -1;
+
+    psp_texture->swizzled = SDL_FALSE;
+    psp_texture->width = texture->w;
+    psp_texture->height = texture->h;
+    psp_texture->textureHeight = TextureNextPow2(texture->h);
+    psp_texture->textureWidth = TextureNextPow2(texture->w);
+    psp_texture->format = PixelFormatToPSPFMT(texture->format);
+
+    switch(psp_texture->format)
+    {
+        case GU_PSM_5650:
+        case GU_PSM_5551:
+        case GU_PSM_4444:
+            psp_texture->bits = 16;
+            break;
+
+        case GU_PSM_8888:
+            psp_texture->bits = 32;
+            break;
+
+        default:
+            return -1;
+    }
+
+    psp_texture->pitch = psp_texture->textureWidth * SDL_BYTESPERPIXEL(texture->format);
+    psp_texture->size = psp_texture->textureHeight*psp_texture->pitch;
+    psp_texture->data = SDL_calloc(1, psp_texture->size);
+
+    if(!psp_texture->data)
+    {
+        SDL_free(psp_texture);
+        return SDL_OutOfMemory();
+    }
+    texture->driverdata = psp_texture;
+
+    return 0;
+}
+
+
+void
+TextureActivate(SDL_Texture * texture)
+{
+    PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata;
+    int scaleMode = GetScaleQuality();
+
+    /* Swizzling is useless with small textures. */
+    if (texture->w >= 16 || texture->h >= 16)
+    {
+        TextureSwizzle(psp_texture);
+    }
+
+    sceGuEnable(GU_TEXTURE_2D);
+    sceGuTexWrap(GU_REPEAT, GU_REPEAT);
+    sceGuTexMode(psp_texture->format, 0, 0, psp_texture->swizzled);
+    sceGuTexFilter(scaleMode, scaleMode); /* GU_NEAREST good for tile-map */
+                                          /* GU_LINEAR good for scaling */
+    sceGuTexImage(0, psp_texture->textureWidth, psp_texture->textureHeight, psp_texture->textureWidth, psp_texture->data);
+    sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
+}
+
+
+static int
+PSP_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                   const SDL_Rect * rect, const void *pixels, int pitch)
+{
+/*  PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata; */
+    const Uint8 *src;
+    Uint8 *dst;
+    int row, length,dpitch;
+    src = pixels;
+
+    PSP_LockTexture(renderer, texture,rect,(void **)&dst, &dpitch);
+    length = rect->w * SDL_BYTESPERPIXEL(texture->format);
+    if (length == pitch && length == dpitch) {
+        SDL_memcpy(dst, src, length*rect->h);
+    } else {
+        for (row = 0; row < rect->h; ++row) {
+            SDL_memcpy(dst, src, length);
+            src += pitch;
+            dst += dpitch;
+        }
+    }
+
+    sceKernelDcacheWritebackAll();
+    return 0;
+}
+
+static int
+PSP_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                 const SDL_Rect * rect, void **pixels, int *pitch)
+{
+    PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata;
+
+    *pixels =
+        (void *) ((Uint8 *) psp_texture->data + rect->y * psp_texture->pitch +
+                  rect->x * SDL_BYTESPERPIXEL(texture->format));
+    *pitch = psp_texture->pitch;
+    return 0;
+}
+
+static void
+PSP_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata;
+    SDL_Rect rect;
+
+    /* We do whole texture updates, at least for now */
+    rect.x = 0;
+    rect.y = 0;
+    rect.w = texture->w;
+    rect.h = texture->h;
+    PSP_UpdateTexture(renderer, texture, &rect, psp_texture->data, psp_texture->pitch);
+}
+
+static int
+PSP_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+
+    return 0;
+}
+
+static int
+PSP_UpdateViewport(SDL_Renderer * renderer)
+{
+
+    return 0;
+}
+
+
+static void
+PSP_SetBlendMode(SDL_Renderer * renderer, int blendMode)
+{
+    PSP_RenderData *data = (PSP_RenderData *) renderer->driverdata;
+    if (blendMode != data-> currentBlendMode) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_NONE:
+                sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
+                sceGuDisable(GU_BLEND);
+            break;
+        case SDL_BLENDMODE_BLEND:
+                sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
+                sceGuEnable(GU_BLEND);
+                sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_ONE_MINUS_SRC_ALPHA, 0, 0 );
+            break;
+        case SDL_BLENDMODE_ADD:
+                sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
+                sceGuEnable(GU_BLEND);
+                sceGuBlendFunc(GU_ADD, GU_SRC_ALPHA, GU_FIX, 0, 0x00FFFFFF );
+            break;
+        case SDL_BLENDMODE_MOD:
+                sceGuTexFunc(GU_TFX_MODULATE , GU_TCC_RGBA);
+                sceGuEnable(GU_BLEND);
+                sceGuBlendFunc( GU_ADD, GU_FIX, GU_SRC_COLOR, 0, 0);
+            break;
+        }
+        data->currentBlendMode = blendMode;
+    }
+}
+
+
+
+static int
+PSP_RenderClear(SDL_Renderer * renderer)
+{
+    /* start list */
+    StartDrawing(renderer);
+    int color = renderer->a << 24 | renderer->b << 16 | renderer->g << 8 | renderer->r;
+    sceGuClearColor(color);
+    sceGuClearDepth(0);
+    sceGuClear(GU_COLOR_BUFFER_BIT|GU_DEPTH_BUFFER_BIT|GU_FAST_CLEAR_BIT);
+
+    return 0;
+}
+
+static int
+PSP_RenderDrawPoints(SDL_Renderer * renderer, const SDL_FPoint * points,
+                      int count)
+{
+    int color = renderer->a << 24 | renderer->b << 16 | renderer->g << 8 | renderer->r;
+    int i;
+    StartDrawing(renderer);
+    VertV* vertices = (VertV*)sceGuGetMemory(count*sizeof(VertV));
+
+    for (i = 0; i < count; ++i) {
+            vertices[i].x = points[i].x;
+            vertices[i].y = points[i].y;
+            vertices[i].z = 0.0f;
+    }
+    sceGuDisable(GU_TEXTURE_2D);
+    sceGuColor(color);
+    sceGuShadeModel(GU_FLAT);
+    sceGuDrawArray(GU_POINTS, GU_VERTEX_32BITF|GU_TRANSFORM_2D, count, 0, vertices);
+    sceGuShadeModel(GU_SMOOTH);
+    sceGuEnable(GU_TEXTURE_2D);
+
+    return 0;
+}
+
+static int
+PSP_RenderDrawLines(SDL_Renderer * renderer, const SDL_FPoint * points,
+                     int count)
+{
+    int color = renderer->a << 24 | renderer->b << 16 | renderer->g << 8 | renderer->r;
+    int i;
+    StartDrawing(renderer);
+    VertV* vertices = (VertV*)sceGuGetMemory(count*sizeof(VertV));
+
+    for (i = 0; i < count; ++i) {
+            vertices[i].x = points[i].x;
+            vertices[i].y = points[i].y;
+            vertices[i].z = 0.0f;
+    }
+
+    sceGuDisable(GU_TEXTURE_2D);
+    sceGuColor(color);
+    sceGuShadeModel(GU_FLAT);
+    sceGuDrawArray(GU_LINE_STRIP, GU_VERTEX_32BITF|GU_TRANSFORM_2D, count, 0, vertices);
+    sceGuShadeModel(GU_SMOOTH);
+    sceGuEnable(GU_TEXTURE_2D);
+
+    return 0;
+}
+
+static int
+PSP_RenderFillRects(SDL_Renderer * renderer, const SDL_FRect * rects,
+                     int count)
+{
+    int color = renderer->a << 24 | renderer->b << 16 | renderer->g << 8 | renderer->r;
+    int i;
+    StartDrawing(renderer);
+
+    for (i = 0; i < count; ++i) {
+        const SDL_FRect *rect = &rects[i];
+        VertV* vertices = (VertV*)sceGuGetMemory((sizeof(VertV)<<1));
+        vertices[0].x = rect->x;
+        vertices[0].y = rect->y;
+        vertices[0].z = 0.0f;
+
+        vertices[1].x = rect->x + rect->w;
+        vertices[1].y = rect->y + rect->h;
+        vertices[1].z = 0.0f;
+
+        sceGuDisable(GU_TEXTURE_2D);
+        sceGuColor(color);
+        sceGuShadeModel(GU_FLAT);
+        sceGuDrawArray(GU_SPRITES, GU_VERTEX_32BITF|GU_TRANSFORM_2D, 2, 0, vertices);
+        sceGuShadeModel(GU_SMOOTH);
+        sceGuEnable(GU_TEXTURE_2D);
+    }
+
+    return 0;
+}
+
+
+#define PI   3.14159265358979f
+
+#define radToDeg(x) ((x)*180.f/PI)
+#define degToRad(x) ((x)*PI/180.f)
+
+float MathAbs(float x)
+{
+    float result;
+
+    __asm__ volatile (
+        "mtv      %1, S000\n"
+        "vabs.s   S000, S000\n"
+        "mfv      %0, S000\n"
+    : "=r"(result) : "r"(x));
+
+    return result;
+}
+
+void MathSincos(float r, float *s, float *c)
+{
+    __asm__ volatile (
+        "mtv      %2, S002\n"
+        "vcst.s   S003, VFPU_2_PI\n"
+        "vmul.s   S002, S002, S003\n"
+        "vrot.p   C000, S002, [s, c]\n"
+        "mfv      %0, S000\n"
+        "mfv      %1, S001\n"
+    : "=r"(*s), "=r"(*c): "r"(r));
+}
+
+void Swap(float *a, float *b)
+{
+    float n=*a;
+    *a = *b;
+    *b = n;
+}
+
+static int
+PSP_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                const SDL_Rect * srcrect, const SDL_FRect * dstrect)
+{
+    float x, y, width, height;
+    float u0, v0, u1, v1;
+    unsigned char alpha;
+
+    x = dstrect->x;
+    y = dstrect->y;
+    width = dstrect->w;
+    height = dstrect->h;
+
+    u0 = srcrect->x;
+    v0 = srcrect->y;
+    u1 = srcrect->x + srcrect->w;
+    v1 = srcrect->y + srcrect->h;
+
+    alpha = texture->a;
+
+    StartDrawing(renderer);
+    TextureActivate(texture);
+    PSP_SetBlendMode(renderer, renderer->blendMode);
+
+    if(alpha != 255)
+    {
+        sceGuTexFunc(GU_TFX_MODULATE, GU_TCC_RGBA);
+        sceGuColor(GU_RGBA(255, 255, 255, alpha));
+    }else{
+        sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
+        sceGuColor(0xFFFFFFFF);
+    }
+
+    if((MathAbs(u1) - MathAbs(u0)) < 64.0f)
+    {
+        VertTV* vertices = (VertTV*)sceGuGetMemory((sizeof(VertTV))<<1);
+
+        vertices[0].u = u0;
+        vertices[0].v = v0;
+        vertices[0].x = x;
+        vertices[0].y = y;
+        vertices[0].z = 0;
+
+        vertices[1].u = u1;
+        vertices[1].v = v1;
+        vertices[1].x = x + width;
+        vertices[1].y = y + height;
+        vertices[1].z = 0;
+
+        sceGuDrawArray(GU_SPRITES, GU_TEXTURE_32BITF|GU_VERTEX_32BITF|GU_TRANSFORM_2D, 2, 0, vertices);
+    }
+    else
+    {
+        float start, end;
+        float curU = u0;
+        float curX = x;
+        float endX = x + width;
+        float slice = 64.0f;
+        float ustep = (u1 - u0)/width * slice;
+
+        if(ustep < 0.0f)
+            ustep = -ustep;
+
+        for(start = 0, end = width; start < end; start += slice)
+        {
+            VertTV* vertices = (VertTV*)sceGuGetMemory((sizeof(VertTV))<<1);
+
+            float polyWidth = ((curX + slice) > endX) ? (endX - curX) : slice;
+            float sourceWidth = ((curU + ustep) > u1) ? (u1 - curU) : ustep;
+
+            vertices[0].u = curU;
+            vertices[0].v = v0;
+            vertices[0].x = curX;
+            vertices[0].y = y;
+            vertices[0].z = 0;
+
+            curU += sourceWidth;
+            curX += polyWidth;
+
+            vertices[1].u = curU;
+            vertices[1].v = v1;
+            vertices[1].x = curX;
+            vertices[1].y = (y + height);
+            vertices[1].z = 0;
+
+            sceGuDrawArray(GU_SPRITES, GU_TEXTURE_32BITF|GU_VERTEX_32BITF|GU_TRANSFORM_2D, 2, 0, vertices);
+        }
+    }
+
+    if(alpha != 255)
+        sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
+    return 0;
+}
+
+static int
+PSP_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                    Uint32 pixel_format, void * pixels, int pitch)
+
+{
+        return 0;
+}
+
+
+static int
+PSP_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip)
+{
+    float x, y, width, height;
+    float u0, v0, u1, v1;
+    unsigned char alpha;
+    float centerx, centery;
+
+    x = dstrect->x;
+    y = dstrect->y;
+    width = dstrect->w;
+    height = dstrect->h;
+
+    u0 = srcrect->x;
+    v0 = srcrect->y;
+    u1 = srcrect->x + srcrect->w;
+    v1 = srcrect->y + srcrect->h;
+
+    centerx = center->x;
+    centery = center->y;
+
+    alpha = texture->a;
+
+    StartDrawing(renderer);
+    TextureActivate(texture);
+    PSP_SetBlendMode(renderer, renderer->blendMode);
+
+    if(alpha != 255)
+    {
+        sceGuTexFunc(GU_TFX_MODULATE, GU_TCC_RGBA);
+        sceGuColor(GU_RGBA(255, 255, 255, alpha));
+    }else{
+        sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
+        sceGuColor(0xFFFFFFFF);
+    }
+
+/*      x += width * 0.5f; */
+/*      y += height * 0.5f; */
+    x += centerx;
+    y += centery;
+
+    float c, s;
+
+    MathSincos(degToRad(angle), &s, &c);
+
+/*      width *= 0.5f; */
+/*      height *= 0.5f; */
+    width  -= centerx;
+    height -= centery;
+
+
+    float cw = c*width;
+    float sw = s*width;
+    float ch = c*height;
+    float sh = s*height;
+
+    VertTV* vertices = (VertTV*)sceGuGetMemory(sizeof(VertTV)<<2);
+
+    vertices[0].u = u0;
+    vertices[0].v = v0;
+    vertices[0].x = x - cw + sh;
+    vertices[0].y = y - sw - ch;
+    vertices[0].z = 0;
+
+    vertices[1].u = u0;
+    vertices[1].v = v1;
+    vertices[1].x = x - cw - sh;
+    vertices[1].y = y - sw + ch;
+    vertices[1].z = 0;
+
+    vertices[2].u = u1;
+    vertices[2].v = v1;
+    vertices[2].x = x + cw - sh;
+    vertices[2].y = y + sw + ch;
+    vertices[2].z = 0;
+
+    vertices[3].u = u1;
+    vertices[3].v = v0;
+    vertices[3].x = x + cw + sh;
+    vertices[3].y = y + sw - ch;
+    vertices[3].z = 0;
+
+    if (flip & SDL_FLIP_HORIZONTAL) {
+                Swap(&vertices[0].v, &vertices[2].v);
+                Swap(&vertices[1].v, &vertices[3].v);
+    }
+    if (flip & SDL_FLIP_VERTICAL) {
+                Swap(&vertices[0].u, &vertices[2].u);
+                Swap(&vertices[1].u, &vertices[3].u);
+    }
+
+    sceGuDrawArray(GU_TRIANGLE_FAN, GU_TEXTURE_32BITF|GU_VERTEX_32BITF|GU_TRANSFORM_2D, 4, 0, vertices);
+
+    if(alpha != 255)
+        sceGuTexFunc(GU_TFX_REPLACE, GU_TCC_RGBA);
+    return 0;
+}
+
+static void
+PSP_RenderPresent(SDL_Renderer * renderer)
+{
+    PSP_RenderData *data = (PSP_RenderData *) renderer->driverdata;
+    if(!data->displayListAvail)
+        return;
+
+    data->displayListAvail = SDL_FALSE;
+    sceGuFinish();
+    sceGuSync(0,0);
+
+/*  if(data->vsync) */
+        sceDisplayWaitVblankStart();
+
+    data->backbuffer = data->frontbuffer;
+    data->frontbuffer = vabsptr(sceGuSwapBuffers());
+
+}
+
+static void
+PSP_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    PSP_RenderData *renderdata = (PSP_RenderData *) renderer->driverdata;
+    PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata;
+
+    if (renderdata == 0)
+        return;
+
+    if(psp_texture == 0)
+        return;
+
+    SDL_free(psp_texture->data);
+    SDL_free(psp_texture);
+    texture->driverdata = NULL;
+}
+
+static void
+PSP_DestroyRenderer(SDL_Renderer * renderer)
+{
+    PSP_RenderData *data = (PSP_RenderData *) renderer->driverdata;
+    if (data) {
+        if (!data->initialized)
+            return;
+
+        StartDrawing(renderer);
+
+        sceGuTerm();
+/*      vfree(data->backbuffer); */
+/*      vfree(data->frontbuffer); */
+
+        data->initialized = SDL_FALSE;
+        data->displayListAvail = SDL_FALSE;
+        SDL_free(data);
+    }
+    SDL_free(renderer);
+}
+
+#endif /* SDL_VIDEO_RENDER_PSP */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_blendfillrect.c b/Source/3rd Party/sdl/src/render/software/SDL_blendfillrect.c
new file mode 100644
index 000000000..cb184d634
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_blendfillrect.c	
@@ -0,0 +1,336 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if !SDL_RENDER_DISABLED
+
+#include "SDL_draw.h"
+#include "SDL_blendfillrect.h"
+
+
+static int
+SDL_BlendFillRect_RGB555(SDL_Surface * dst, const SDL_Rect * rect,
+                         SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    unsigned inva = 0xff - a;
+
+    switch (blendMode) {
+    case SDL_BLENDMODE_BLEND:
+        FILLRECT(Uint16, DRAW_SETPIXEL_BLEND_RGB555);
+        break;
+    case SDL_BLENDMODE_ADD:
+        FILLRECT(Uint16, DRAW_SETPIXEL_ADD_RGB555);
+        break;
+    case SDL_BLENDMODE_MOD:
+        FILLRECT(Uint16, DRAW_SETPIXEL_MOD_RGB555);
+        break;
+    default:
+        FILLRECT(Uint16, DRAW_SETPIXEL_RGB555);
+        break;
+    }
+    return 0;
+}
+
+static int
+SDL_BlendFillRect_RGB565(SDL_Surface * dst, const SDL_Rect * rect,
+                         SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    unsigned inva = 0xff - a;
+
+    switch (blendMode) {
+    case SDL_BLENDMODE_BLEND:
+        FILLRECT(Uint16, DRAW_SETPIXEL_BLEND_RGB565);
+        break;
+    case SDL_BLENDMODE_ADD:
+        FILLRECT(Uint16, DRAW_SETPIXEL_ADD_RGB565);
+        break;
+    case SDL_BLENDMODE_MOD:
+        FILLRECT(Uint16, DRAW_SETPIXEL_MOD_RGB565);
+        break;
+    default:
+        FILLRECT(Uint16, DRAW_SETPIXEL_RGB565);
+        break;
+    }
+    return 0;
+}
+
+static int
+SDL_BlendFillRect_RGB888(SDL_Surface * dst, const SDL_Rect * rect,
+                         SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    unsigned inva = 0xff - a;
+
+    switch (blendMode) {
+    case SDL_BLENDMODE_BLEND:
+        FILLRECT(Uint32, DRAW_SETPIXEL_BLEND_RGB888);
+        break;
+    case SDL_BLENDMODE_ADD:
+        FILLRECT(Uint32, DRAW_SETPIXEL_ADD_RGB888);
+        break;
+    case SDL_BLENDMODE_MOD:
+        FILLRECT(Uint32, DRAW_SETPIXEL_MOD_RGB888);
+        break;
+    default:
+        FILLRECT(Uint32, DRAW_SETPIXEL_RGB888);
+        break;
+    }
+    return 0;
+}
+
+static int
+SDL_BlendFillRect_ARGB8888(SDL_Surface * dst, const SDL_Rect * rect,
+                           SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    unsigned inva = 0xff - a;
+
+    switch (blendMode) {
+    case SDL_BLENDMODE_BLEND:
+        FILLRECT(Uint32, DRAW_SETPIXEL_BLEND_ARGB8888);
+        break;
+    case SDL_BLENDMODE_ADD:
+        FILLRECT(Uint32, DRAW_SETPIXEL_ADD_ARGB8888);
+        break;
+    case SDL_BLENDMODE_MOD:
+        FILLRECT(Uint32, DRAW_SETPIXEL_MOD_ARGB8888);
+        break;
+    default:
+        FILLRECT(Uint32, DRAW_SETPIXEL_ARGB8888);
+        break;
+    }
+    return 0;
+}
+
+static int
+SDL_BlendFillRect_RGB(SDL_Surface * dst, const SDL_Rect * rect,
+                      SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    SDL_PixelFormat *fmt = dst->format;
+    unsigned inva = 0xff - a;
+
+    switch (fmt->BytesPerPixel) {
+    case 2:
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            FILLRECT(Uint16, DRAW_SETPIXEL_BLEND_RGB);
+            break;
+        case SDL_BLENDMODE_ADD:
+            FILLRECT(Uint16, DRAW_SETPIXEL_ADD_RGB);
+            break;
+        case SDL_BLENDMODE_MOD:
+            FILLRECT(Uint16, DRAW_SETPIXEL_MOD_RGB);
+            break;
+        default:
+            FILLRECT(Uint16, DRAW_SETPIXEL_RGB);
+            break;
+        }
+        return 0;
+    case 4:
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            FILLRECT(Uint32, DRAW_SETPIXEL_BLEND_RGB);
+            break;
+        case SDL_BLENDMODE_ADD:
+            FILLRECT(Uint32, DRAW_SETPIXEL_ADD_RGB);
+            break;
+        case SDL_BLENDMODE_MOD:
+            FILLRECT(Uint32, DRAW_SETPIXEL_MOD_RGB);
+            break;
+        default:
+            FILLRECT(Uint32, DRAW_SETPIXEL_RGB);
+            break;
+        }
+        return 0;
+    default:
+        return SDL_Unsupported();
+    }
+}
+
+static int
+SDL_BlendFillRect_RGBA(SDL_Surface * dst, const SDL_Rect * rect,
+                       SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    SDL_PixelFormat *fmt = dst->format;
+    unsigned inva = 0xff - a;
+
+    switch (fmt->BytesPerPixel) {
+    case 4:
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            FILLRECT(Uint32, DRAW_SETPIXEL_BLEND_RGBA);
+            break;
+        case SDL_BLENDMODE_ADD:
+            FILLRECT(Uint32, DRAW_SETPIXEL_ADD_RGBA);
+            break;
+        case SDL_BLENDMODE_MOD:
+            FILLRECT(Uint32, DRAW_SETPIXEL_MOD_RGBA);
+            break;
+        default:
+            FILLRECT(Uint32, DRAW_SETPIXEL_RGBA);
+            break;
+        }
+        return 0;
+    default:
+        return SDL_Unsupported();
+    }
+}
+
+int
+SDL_BlendFillRect(SDL_Surface * dst, const SDL_Rect * rect,
+                  SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    SDL_Rect clipped;
+
+    if (!dst) {
+        return SDL_SetError("Passed NULL destination surface");
+    }
+
+    /* This function doesn't work on surfaces < 8 bpp */
+    if (dst->format->BitsPerPixel < 8) {
+        return SDL_SetError("SDL_BlendFillRect(): Unsupported surface format");
+    }
+
+    /* If 'rect' == NULL, then fill the whole surface */
+    if (rect) {
+        /* Perform clipping */
+        if (!SDL_IntersectRect(rect, &dst->clip_rect, &clipped)) {
+            return 0;
+        }
+        rect = &clipped;
+    } else {
+        rect = &dst->clip_rect;
+    }
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(r, a);
+        g = DRAW_MUL(g, a);
+        b = DRAW_MUL(b, a);
+    }
+
+    switch (dst->format->BitsPerPixel) {
+    case 15:
+        switch (dst->format->Rmask) {
+        case 0x7C00:
+            return SDL_BlendFillRect_RGB555(dst, rect, blendMode, r, g, b, a);
+        }
+        break;
+    case 16:
+        switch (dst->format->Rmask) {
+        case 0xF800:
+            return SDL_BlendFillRect_RGB565(dst, rect, blendMode, r, g, b, a);
+        }
+        break;
+    case 32:
+        switch (dst->format->Rmask) {
+        case 0x00FF0000:
+            if (!dst->format->Amask) {
+                return SDL_BlendFillRect_RGB888(dst, rect, blendMode, r, g, b, a);
+            } else {
+                return SDL_BlendFillRect_ARGB8888(dst, rect, blendMode, r, g, b, a);
+            }
+            break;
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (!dst->format->Amask) {
+        return SDL_BlendFillRect_RGB(dst, rect, blendMode, r, g, b, a);
+    } else {
+        return SDL_BlendFillRect_RGBA(dst, rect, blendMode, r, g, b, a);
+    }
+}
+
+int
+SDL_BlendFillRects(SDL_Surface * dst, const SDL_Rect * rects, int count,
+                   SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    SDL_Rect rect;
+    int i;
+    int (*func)(SDL_Surface * dst, const SDL_Rect * rect,
+                SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) = NULL;
+    int status = 0;
+
+    if (!dst) {
+        return SDL_SetError("Passed NULL destination surface");
+    }
+
+    /* This function doesn't work on surfaces < 8 bpp */
+    if (dst->format->BitsPerPixel < 8) {
+        return SDL_SetError("SDL_BlendFillRects(): Unsupported surface format");
+    }
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(r, a);
+        g = DRAW_MUL(g, a);
+        b = DRAW_MUL(b, a);
+    }
+
+    /* FIXME: Does this function pointer slow things down significantly? */
+    switch (dst->format->BitsPerPixel) {
+    case 15:
+        switch (dst->format->Rmask) {
+        case 0x7C00:
+            func = SDL_BlendFillRect_RGB555;
+        }
+        break;
+    case 16:
+        switch (dst->format->Rmask) {
+        case 0xF800:
+            func = SDL_BlendFillRect_RGB565;
+        }
+        break;
+    case 32:
+        switch (dst->format->Rmask) {
+        case 0x00FF0000:
+            if (!dst->format->Amask) {
+                func = SDL_BlendFillRect_RGB888;
+            } else {
+                func = SDL_BlendFillRect_ARGB8888;
+            }
+            break;
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (!func) {
+        if (!dst->format->Amask) {
+            func = SDL_BlendFillRect_RGB;
+        } else {
+            func = SDL_BlendFillRect_RGBA;
+        }
+    }
+
+    for (i = 0; i < count; ++i) {
+        /* Perform clipping */
+        if (!SDL_IntersectRect(&rects[i], &dst->clip_rect, &rect)) {
+            continue;
+        }
+        status = func(dst, &rect, blendMode, r, g, b, a);
+    }
+    return status;
+}
+
+#endif /* !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_blendfillrect.h b/Source/3rd Party/sdl/src/render/software/SDL_blendfillrect.h
new file mode 100644
index 000000000..297c839e1
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_blendfillrect.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+
+extern int SDL_BlendFillRect(SDL_Surface * dst, const SDL_Rect * rect, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+extern int SDL_BlendFillRects(SDL_Surface * dst, const SDL_Rect * rects, int count, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_blendline.c b/Source/3rd Party/sdl/src/render/software/SDL_blendline.c
new file mode 100644
index 000000000..02d748d5f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_blendline.c	
@@ -0,0 +1,777 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if !SDL_RENDER_DISABLED
+
+#include "SDL_draw.h"
+#include "SDL_blendline.h"
+#include "SDL_blendpoint.h"
+
+
+static void
+SDL_BlendLine_RGB2(SDL_Surface * dst, int x1, int y1, int x2, int y2,
+                   SDL_BlendMode blendMode, Uint8 _r, Uint8 _g, Uint8 _b, Uint8 _a,
+                   SDL_bool draw_end)
+{
+    const SDL_PixelFormat *fmt = dst->format;
+    unsigned r, g, b, a, inva;
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(_r, _a);
+        g = DRAW_MUL(_g, _a);
+        b = DRAW_MUL(_b, _a);
+        a = _a;
+    } else {
+        r = _r;
+        g = _g;
+        b = _b;
+        a = _a;
+    }
+    inva = (a ^ 0xff);
+
+    if (y1 == y2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            HLINE(Uint16, DRAW_SETPIXEL_BLEND_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            HLINE(Uint16, DRAW_SETPIXEL_ADD_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            HLINE(Uint16, DRAW_SETPIXEL_MOD_RGB, draw_end);
+            break;
+        default:
+            HLINE(Uint16, DRAW_SETPIXEL_RGB, draw_end);
+            break;
+        }
+    } else if (x1 == x2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            VLINE(Uint16, DRAW_SETPIXEL_BLEND_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            VLINE(Uint16, DRAW_SETPIXEL_ADD_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            VLINE(Uint16, DRAW_SETPIXEL_MOD_RGB, draw_end);
+            break;
+        default:
+            VLINE(Uint16, DRAW_SETPIXEL_RGB, draw_end);
+            break;
+        }
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DLINE(Uint16, DRAW_SETPIXEL_BLEND_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DLINE(Uint16, DRAW_SETPIXEL_ADD_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DLINE(Uint16, DRAW_SETPIXEL_MOD_RGB, draw_end);
+            break;
+        default:
+            DLINE(Uint16, DRAW_SETPIXEL_RGB, draw_end);
+            break;
+        }
+    } else {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY2_BLEND_RGB, DRAW_SETPIXELXY2_BLEND_RGB,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY2_ADD_RGB, DRAW_SETPIXELXY2_ADD_RGB,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY2_MOD_RGB, DRAW_SETPIXELXY2_MOD_RGB,
+                   draw_end);
+            break;
+        default:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY2_RGB, DRAW_SETPIXELXY2_BLEND_RGB,
+                   draw_end);
+            break;
+        }
+    }
+}
+
+static void
+SDL_BlendLine_RGB555(SDL_Surface * dst, int x1, int y1, int x2, int y2,
+                     SDL_BlendMode blendMode, Uint8 _r, Uint8 _g, Uint8 _b, Uint8 _a,
+                     SDL_bool draw_end)
+{
+    unsigned r, g, b, a, inva;
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(_r, _a);
+        g = DRAW_MUL(_g, _a);
+        b = DRAW_MUL(_b, _a);
+        a = _a;
+    } else {
+        r = _r;
+        g = _g;
+        b = _b;
+        a = _a;
+    }
+    inva = (a ^ 0xff);
+
+    if (y1 == y2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            HLINE(Uint16, DRAW_SETPIXEL_BLEND_RGB555, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            HLINE(Uint16, DRAW_SETPIXEL_ADD_RGB555, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            HLINE(Uint16, DRAW_SETPIXEL_MOD_RGB555, draw_end);
+            break;
+        default:
+            HLINE(Uint16, DRAW_SETPIXEL_RGB555, draw_end);
+            break;
+        }
+    } else if (x1 == x2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            VLINE(Uint16, DRAW_SETPIXEL_BLEND_RGB555, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            VLINE(Uint16, DRAW_SETPIXEL_ADD_RGB555, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            VLINE(Uint16, DRAW_SETPIXEL_MOD_RGB555, draw_end);
+            break;
+        default:
+            VLINE(Uint16, DRAW_SETPIXEL_RGB555, draw_end);
+            break;
+        }
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DLINE(Uint16, DRAW_SETPIXEL_BLEND_RGB555, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DLINE(Uint16, DRAW_SETPIXEL_ADD_RGB555, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DLINE(Uint16, DRAW_SETPIXEL_MOD_RGB555, draw_end);
+            break;
+        default:
+            DLINE(Uint16, DRAW_SETPIXEL_RGB555, draw_end);
+            break;
+        }
+    } else {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_BLEND_RGB555, DRAW_SETPIXELXY_BLEND_RGB555,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_ADD_RGB555, DRAW_SETPIXELXY_ADD_RGB555,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_MOD_RGB555, DRAW_SETPIXELXY_MOD_RGB555,
+                   draw_end);
+            break;
+        default:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_RGB555, DRAW_SETPIXELXY_BLEND_RGB555,
+                   draw_end);
+            break;
+        }
+    }
+}
+
+static void
+SDL_BlendLine_RGB565(SDL_Surface * dst, int x1, int y1, int x2, int y2,
+                     SDL_BlendMode blendMode, Uint8 _r, Uint8 _g, Uint8 _b, Uint8 _a,
+                     SDL_bool draw_end)
+{
+    unsigned r, g, b, a, inva;
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(_r, _a);
+        g = DRAW_MUL(_g, _a);
+        b = DRAW_MUL(_b, _a);
+        a = _a;
+    } else {
+        r = _r;
+        g = _g;
+        b = _b;
+        a = _a;
+    }
+    inva = (a ^ 0xff);
+
+    if (y1 == y2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            HLINE(Uint16, DRAW_SETPIXEL_BLEND_RGB565, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            HLINE(Uint16, DRAW_SETPIXEL_ADD_RGB565, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            HLINE(Uint16, DRAW_SETPIXEL_MOD_RGB565, draw_end);
+            break;
+        default:
+            HLINE(Uint16, DRAW_SETPIXEL_RGB565, draw_end);
+            break;
+        }
+    } else if (x1 == x2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            VLINE(Uint16, DRAW_SETPIXEL_BLEND_RGB565, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            VLINE(Uint16, DRAW_SETPIXEL_ADD_RGB565, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            VLINE(Uint16, DRAW_SETPIXEL_MOD_RGB565, draw_end);
+            break;
+        default:
+            VLINE(Uint16, DRAW_SETPIXEL_RGB565, draw_end);
+            break;
+        }
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DLINE(Uint16, DRAW_SETPIXEL_BLEND_RGB565, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DLINE(Uint16, DRAW_SETPIXEL_ADD_RGB565, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DLINE(Uint16, DRAW_SETPIXEL_MOD_RGB565, draw_end);
+            break;
+        default:
+            DLINE(Uint16, DRAW_SETPIXEL_RGB565, draw_end);
+            break;
+        }
+    } else {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_BLEND_RGB565, DRAW_SETPIXELXY_BLEND_RGB565,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_ADD_RGB565, DRAW_SETPIXELXY_ADD_RGB565,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_MOD_RGB565, DRAW_SETPIXELXY_MOD_RGB565,
+                   draw_end);
+            break;
+        default:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_RGB565, DRAW_SETPIXELXY_BLEND_RGB565,
+                   draw_end);
+            break;
+        }
+    }
+}
+
+static void
+SDL_BlendLine_RGB4(SDL_Surface * dst, int x1, int y1, int x2, int y2,
+                   SDL_BlendMode blendMode, Uint8 _r, Uint8 _g, Uint8 _b, Uint8 _a,
+                   SDL_bool draw_end)
+{
+    const SDL_PixelFormat *fmt = dst->format;
+    unsigned r, g, b, a, inva;
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(_r, _a);
+        g = DRAW_MUL(_g, _a);
+        b = DRAW_MUL(_b, _a);
+        a = _a;
+    } else {
+        r = _r;
+        g = _g;
+        b = _b;
+        a = _a;
+    }
+    inva = (a ^ 0xff);
+
+    if (y1 == y2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            HLINE(Uint32, DRAW_SETPIXEL_BLEND_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            HLINE(Uint32, DRAW_SETPIXEL_ADD_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            HLINE(Uint32, DRAW_SETPIXEL_MOD_RGB, draw_end);
+            break;
+        default:
+            HLINE(Uint32, DRAW_SETPIXEL_RGB, draw_end);
+            break;
+        }
+    } else if (x1 == x2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            VLINE(Uint32, DRAW_SETPIXEL_BLEND_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            VLINE(Uint32, DRAW_SETPIXEL_ADD_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            VLINE(Uint32, DRAW_SETPIXEL_MOD_RGB, draw_end);
+            break;
+        default:
+            VLINE(Uint32, DRAW_SETPIXEL_RGB, draw_end);
+            break;
+        }
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DLINE(Uint32, DRAW_SETPIXEL_BLEND_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DLINE(Uint32, DRAW_SETPIXEL_ADD_RGB, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DLINE(Uint32, DRAW_SETPIXEL_MOD_RGB, draw_end);
+            break;
+        default:
+            DLINE(Uint32, DRAW_SETPIXEL_RGB, draw_end);
+            break;
+        }
+    } else {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY4_BLEND_RGB, DRAW_SETPIXELXY4_BLEND_RGB,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY4_ADD_RGB, DRAW_SETPIXELXY4_ADD_RGB,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY4_MOD_RGB, DRAW_SETPIXELXY4_MOD_RGB,
+                   draw_end);
+            break;
+        default:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY4_RGB, DRAW_SETPIXELXY4_BLEND_RGB,
+                   draw_end);
+            break;
+        }
+    }
+}
+
+static void
+SDL_BlendLine_RGBA4(SDL_Surface * dst, int x1, int y1, int x2, int y2,
+                    SDL_BlendMode blendMode, Uint8 _r, Uint8 _g, Uint8 _b, Uint8 _a,
+                    SDL_bool draw_end)
+{
+    const SDL_PixelFormat *fmt = dst->format;
+    unsigned r, g, b, a, inva;
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(_r, _a);
+        g = DRAW_MUL(_g, _a);
+        b = DRAW_MUL(_b, _a);
+        a = _a;
+    } else {
+        r = _r;
+        g = _g;
+        b = _b;
+        a = _a;
+    }
+    inva = (a ^ 0xff);
+
+    if (y1 == y2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            HLINE(Uint32, DRAW_SETPIXEL_BLEND_RGBA, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            HLINE(Uint32, DRAW_SETPIXEL_ADD_RGBA, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            HLINE(Uint32, DRAW_SETPIXEL_MOD_RGBA, draw_end);
+            break;
+        default:
+            HLINE(Uint32, DRAW_SETPIXEL_RGBA, draw_end);
+            break;
+        }
+    } else if (x1 == x2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            VLINE(Uint32, DRAW_SETPIXEL_BLEND_RGBA, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            VLINE(Uint32, DRAW_SETPIXEL_ADD_RGBA, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            VLINE(Uint32, DRAW_SETPIXEL_MOD_RGBA, draw_end);
+            break;
+        default:
+            VLINE(Uint32, DRAW_SETPIXEL_RGBA, draw_end);
+            break;
+        }
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DLINE(Uint32, DRAW_SETPIXEL_BLEND_RGBA, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DLINE(Uint32, DRAW_SETPIXEL_ADD_RGBA, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DLINE(Uint32, DRAW_SETPIXEL_MOD_RGBA, draw_end);
+            break;
+        default:
+            DLINE(Uint32, DRAW_SETPIXEL_RGBA, draw_end);
+            break;
+        }
+    } else {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY4_BLEND_RGBA, DRAW_SETPIXELXY4_BLEND_RGBA,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY4_ADD_RGBA, DRAW_SETPIXELXY4_ADD_RGBA,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY4_MOD_RGBA, DRAW_SETPIXELXY4_MOD_RGBA,
+                   draw_end);
+            break;
+        default:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY4_RGBA, DRAW_SETPIXELXY4_BLEND_RGBA,
+                   draw_end);
+            break;
+        }
+    }
+}
+
+static void
+SDL_BlendLine_RGB888(SDL_Surface * dst, int x1, int y1, int x2, int y2,
+                     SDL_BlendMode blendMode, Uint8 _r, Uint8 _g, Uint8 _b, Uint8 _a,
+                     SDL_bool draw_end)
+{
+    unsigned r, g, b, a, inva;
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(_r, _a);
+        g = DRAW_MUL(_g, _a);
+        b = DRAW_MUL(_b, _a);
+        a = _a;
+    } else {
+        r = _r;
+        g = _g;
+        b = _b;
+        a = _a;
+    }
+    inva = (a ^ 0xff);
+
+    if (y1 == y2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            HLINE(Uint32, DRAW_SETPIXEL_BLEND_RGB888, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            HLINE(Uint32, DRAW_SETPIXEL_ADD_RGB888, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            HLINE(Uint32, DRAW_SETPIXEL_MOD_RGB888, draw_end);
+            break;
+        default:
+            HLINE(Uint32, DRAW_SETPIXEL_RGB888, draw_end);
+            break;
+        }
+    } else if (x1 == x2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            VLINE(Uint32, DRAW_SETPIXEL_BLEND_RGB888, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            VLINE(Uint32, DRAW_SETPIXEL_ADD_RGB888, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            VLINE(Uint32, DRAW_SETPIXEL_MOD_RGB888, draw_end);
+            break;
+        default:
+            VLINE(Uint32, DRAW_SETPIXEL_RGB888, draw_end);
+            break;
+        }
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DLINE(Uint32, DRAW_SETPIXEL_BLEND_RGB888, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DLINE(Uint32, DRAW_SETPIXEL_ADD_RGB888, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DLINE(Uint32, DRAW_SETPIXEL_MOD_RGB888, draw_end);
+            break;
+        default:
+            DLINE(Uint32, DRAW_SETPIXEL_RGB888, draw_end);
+            break;
+        }
+    } else {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_BLEND_RGB888, DRAW_SETPIXELXY_BLEND_RGB888,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_ADD_RGB888, DRAW_SETPIXELXY_ADD_RGB888,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_MOD_RGB888, DRAW_SETPIXELXY_MOD_RGB888,
+                   draw_end);
+            break;
+        default:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_RGB888, DRAW_SETPIXELXY_BLEND_RGB888,
+                   draw_end);
+            break;
+        }
+    }
+}
+
+static void
+SDL_BlendLine_ARGB8888(SDL_Surface * dst, int x1, int y1, int x2, int y2,
+                       SDL_BlendMode blendMode, Uint8 _r, Uint8 _g, Uint8 _b, Uint8 _a,
+                       SDL_bool draw_end)
+{
+    unsigned r, g, b, a, inva;
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(_r, _a);
+        g = DRAW_MUL(_g, _a);
+        b = DRAW_MUL(_b, _a);
+        a = _a;
+    } else {
+        r = _r;
+        g = _g;
+        b = _b;
+        a = _a;
+    }
+    inva = (a ^ 0xff);
+
+    if (y1 == y2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            HLINE(Uint32, DRAW_SETPIXEL_BLEND_ARGB8888, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            HLINE(Uint32, DRAW_SETPIXEL_ADD_ARGB8888, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            HLINE(Uint32, DRAW_SETPIXEL_MOD_ARGB8888, draw_end);
+            break;
+        default:
+            HLINE(Uint32, DRAW_SETPIXEL_ARGB8888, draw_end);
+            break;
+        }
+    } else if (x1 == x2) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            VLINE(Uint32, DRAW_SETPIXEL_BLEND_ARGB8888, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            VLINE(Uint32, DRAW_SETPIXEL_ADD_ARGB8888, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            VLINE(Uint32, DRAW_SETPIXEL_MOD_ARGB8888, draw_end);
+            break;
+        default:
+            VLINE(Uint32, DRAW_SETPIXEL_ARGB8888, draw_end);
+            break;
+        }
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DLINE(Uint32, DRAW_SETPIXEL_BLEND_ARGB8888, draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DLINE(Uint32, DRAW_SETPIXEL_ADD_ARGB8888, draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DLINE(Uint32, DRAW_SETPIXEL_MOD_ARGB8888, draw_end);
+            break;
+        default:
+            DLINE(Uint32, DRAW_SETPIXEL_ARGB8888, draw_end);
+            break;
+        }
+    } else {
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_BLEND_ARGB8888, DRAW_SETPIXELXY_BLEND_ARGB8888,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_ADD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_ADD_ARGB8888, DRAW_SETPIXELXY_ADD_ARGB8888,
+                   draw_end);
+            break;
+        case SDL_BLENDMODE_MOD:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_MOD_ARGB8888, DRAW_SETPIXELXY_MOD_ARGB8888,
+                   draw_end);
+            break;
+        default:
+            AALINE(x1, y1, x2, y2,
+                   DRAW_SETPIXELXY_ARGB8888, DRAW_SETPIXELXY_BLEND_ARGB8888,
+                   draw_end);
+            break;
+        }
+    }
+}
+
+typedef void (*BlendLineFunc) (SDL_Surface * dst,
+                               int x1, int y1, int x2, int y2,
+                               SDL_BlendMode blendMode,
+                               Uint8 r, Uint8 g, Uint8 b, Uint8 a,
+                               SDL_bool draw_end);
+
+static BlendLineFunc
+SDL_CalculateBlendLineFunc(const SDL_PixelFormat * fmt)
+{
+    switch (fmt->BytesPerPixel) {
+    case 2:
+        if (fmt->Rmask == 0x7C00) {
+            return SDL_BlendLine_RGB555;
+        } else if (fmt->Rmask == 0xF800) {
+            return SDL_BlendLine_RGB565;
+        } else {
+            return SDL_BlendLine_RGB2;
+        }
+        break;
+    case 4:
+        if (fmt->Rmask == 0x00FF0000) {
+            if (fmt->Amask) {
+                return SDL_BlendLine_ARGB8888;
+            } else {
+                return SDL_BlendLine_RGB888;
+            }
+        } else {
+            if (fmt->Amask) {
+                return SDL_BlendLine_RGBA4;
+            } else {
+                return SDL_BlendLine_RGB4;
+            }
+        }
+    }
+    return NULL;
+}
+
+int
+SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2,
+              SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    BlendLineFunc func;
+
+    if (!dst) {
+        return SDL_SetError("SDL_BlendLine(): Passed NULL destination surface");
+    }
+
+    func = SDL_CalculateBlendLineFunc(dst->format);
+    if (!func) {
+        return SDL_SetError("SDL_BlendLine(): Unsupported surface format");
+    }
+
+    /* Perform clipping */
+    /* FIXME: We don't actually want to clip, as it may change line slope */
+    if (!SDL_IntersectRectAndLine(&dst->clip_rect, &x1, &y1, &x2, &y2)) {
+        return 0;
+    }
+
+    func(dst, x1, y1, x2, y2, blendMode, r, g, b, a, SDL_TRUE);
+    return 0;
+}
+
+int
+SDL_BlendLines(SDL_Surface * dst, const SDL_Point * points, int count,
+               SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    int i;
+    int x1, y1;
+    int x2, y2;
+    SDL_bool draw_end;
+    BlendLineFunc func;
+
+    if (!dst) {
+        return SDL_SetError("SDL_BlendLines(): Passed NULL destination surface");
+    }
+
+    func = SDL_CalculateBlendLineFunc(dst->format);
+    if (!func) {
+        return SDL_SetError("SDL_BlendLines(): Unsupported surface format");
+    }
+
+    for (i = 1; i < count; ++i) {
+        x1 = points[i-1].x;
+        y1 = points[i-1].y;
+        x2 = points[i].x;
+        y2 = points[i].y;
+
+        /* Perform clipping */
+        /* FIXME: We don't actually want to clip, as it may change line slope */
+        if (!SDL_IntersectRectAndLine(&dst->clip_rect, &x1, &y1, &x2, &y2)) {
+            continue;
+        }
+
+        /* Draw the end if it was clipped */
+        draw_end = (x2 != points[i].x || y2 != points[i].y);
+
+        func(dst, x1, y1, x2, y2, blendMode, r, g, b, a, draw_end);
+    }
+    if (points[0].x != points[count-1].x || points[0].y != points[count-1].y) {
+        SDL_BlendPoint(dst, points[count-1].x, points[count-1].y,
+                       blendMode, r, g, b, a);
+    }
+    return 0;
+}
+
+#endif /* !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_blendline.h b/Source/3rd Party/sdl/src/render/software/SDL_blendline.h
new file mode 100644
index 000000000..14a7c18a5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_blendline.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+
+extern int SDL_BlendLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+extern int SDL_BlendLines(SDL_Surface * dst, const SDL_Point * points, int count, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_blendpoint.c b/Source/3rd Party/sdl/src/render/software/SDL_blendpoint.c
new file mode 100644
index 000000000..dab135600
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_blendpoint.c	
@@ -0,0 +1,343 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if !SDL_RENDER_DISABLED
+
+#include "SDL_draw.h"
+#include "SDL_blendpoint.h"
+
+
+static int
+SDL_BlendPoint_RGB555(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r,
+                      Uint8 g, Uint8 b, Uint8 a)
+{
+    unsigned inva = 0xff - a;
+
+    switch (blendMode) {
+    case SDL_BLENDMODE_BLEND:
+        DRAW_SETPIXELXY_BLEND_RGB555(x, y);
+        break;
+    case SDL_BLENDMODE_ADD:
+        DRAW_SETPIXELXY_ADD_RGB555(x, y);
+        break;
+    case SDL_BLENDMODE_MOD:
+        DRAW_SETPIXELXY_MOD_RGB555(x, y);
+        break;
+    default:
+        DRAW_SETPIXELXY_RGB555(x, y);
+        break;
+    }
+    return 0;
+}
+
+static int
+SDL_BlendPoint_RGB565(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r,
+                      Uint8 g, Uint8 b, Uint8 a)
+{
+    unsigned inva = 0xff - a;
+
+    switch (blendMode) {
+    case SDL_BLENDMODE_BLEND:
+        DRAW_SETPIXELXY_BLEND_RGB565(x, y);
+        break;
+    case SDL_BLENDMODE_ADD:
+        DRAW_SETPIXELXY_ADD_RGB565(x, y);
+        break;
+    case SDL_BLENDMODE_MOD:
+        DRAW_SETPIXELXY_MOD_RGB565(x, y);
+        break;
+    default:
+        DRAW_SETPIXELXY_RGB565(x, y);
+        break;
+    }
+    return 0;
+}
+
+static int
+SDL_BlendPoint_RGB888(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r,
+                      Uint8 g, Uint8 b, Uint8 a)
+{
+    unsigned inva = 0xff - a;
+
+    switch (blendMode) {
+    case SDL_BLENDMODE_BLEND:
+        DRAW_SETPIXELXY_BLEND_RGB888(x, y);
+        break;
+    case SDL_BLENDMODE_ADD:
+        DRAW_SETPIXELXY_ADD_RGB888(x, y);
+        break;
+    case SDL_BLENDMODE_MOD:
+        DRAW_SETPIXELXY_MOD_RGB888(x, y);
+        break;
+    default:
+        DRAW_SETPIXELXY_RGB888(x, y);
+        break;
+    }
+    return 0;
+}
+
+static int
+SDL_BlendPoint_ARGB8888(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode,
+                        Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    unsigned inva = 0xff - a;
+
+    switch (blendMode) {
+    case SDL_BLENDMODE_BLEND:
+        DRAW_SETPIXELXY_BLEND_ARGB8888(x, y);
+        break;
+    case SDL_BLENDMODE_ADD:
+        DRAW_SETPIXELXY_ADD_ARGB8888(x, y);
+        break;
+    case SDL_BLENDMODE_MOD:
+        DRAW_SETPIXELXY_MOD_ARGB8888(x, y);
+        break;
+    default:
+        DRAW_SETPIXELXY_ARGB8888(x, y);
+        break;
+    }
+    return 0;
+}
+
+static int
+SDL_BlendPoint_RGB(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r,
+                   Uint8 g, Uint8 b, Uint8 a)
+{
+    SDL_PixelFormat *fmt = dst->format;
+    unsigned inva = 0xff - a;
+
+    switch (fmt->BytesPerPixel) {
+    case 2:
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DRAW_SETPIXELXY2_BLEND_RGB(x, y);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DRAW_SETPIXELXY2_ADD_RGB(x, y);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DRAW_SETPIXELXY2_MOD_RGB(x, y);
+            break;
+        default:
+            DRAW_SETPIXELXY2_RGB(x, y);
+            break;
+        }
+        return 0;
+    case 4:
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DRAW_SETPIXELXY4_BLEND_RGB(x, y);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DRAW_SETPIXELXY4_ADD_RGB(x, y);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DRAW_SETPIXELXY4_MOD_RGB(x, y);
+            break;
+        default:
+            DRAW_SETPIXELXY4_RGB(x, y);
+            break;
+        }
+        return 0;
+    default:
+        return SDL_Unsupported();
+    }
+}
+
+static int
+SDL_BlendPoint_RGBA(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r,
+                    Uint8 g, Uint8 b, Uint8 a)
+{
+    SDL_PixelFormat *fmt = dst->format;
+    unsigned inva = 0xff - a;
+
+    switch (fmt->BytesPerPixel) {
+    case 4:
+        switch (blendMode) {
+        case SDL_BLENDMODE_BLEND:
+            DRAW_SETPIXELXY4_BLEND_RGBA(x, y);
+            break;
+        case SDL_BLENDMODE_ADD:
+            DRAW_SETPIXELXY4_ADD_RGBA(x, y);
+            break;
+        case SDL_BLENDMODE_MOD:
+            DRAW_SETPIXELXY4_MOD_RGBA(x, y);
+            break;
+        default:
+            DRAW_SETPIXELXY4_RGBA(x, y);
+            break;
+        }
+        return 0;
+    default:
+        return SDL_Unsupported();
+    }
+}
+
+int
+SDL_BlendPoint(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r,
+               Uint8 g, Uint8 b, Uint8 a)
+{
+    if (!dst) {
+        return SDL_SetError("Passed NULL destination surface");
+    }
+
+    /* This function doesn't work on surfaces < 8 bpp */
+    if (dst->format->BitsPerPixel < 8) {
+        return SDL_SetError("SDL_BlendPoint(): Unsupported surface format");
+    }
+
+    /* Perform clipping */
+    if (x < dst->clip_rect.x || y < dst->clip_rect.y ||
+        x >= (dst->clip_rect.x + dst->clip_rect.w) ||
+        y >= (dst->clip_rect.y + dst->clip_rect.h)) {
+        return 0;
+    }
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(r, a);
+        g = DRAW_MUL(g, a);
+        b = DRAW_MUL(b, a);
+    }
+
+    switch (dst->format->BitsPerPixel) {
+    case 15:
+        switch (dst->format->Rmask) {
+        case 0x7C00:
+            return SDL_BlendPoint_RGB555(dst, x, y, blendMode, r, g, b, a);
+        }
+        break;
+    case 16:
+        switch (dst->format->Rmask) {
+        case 0xF800:
+            return SDL_BlendPoint_RGB565(dst, x, y, blendMode, r, g, b, a);
+        }
+        break;
+    case 32:
+        switch (dst->format->Rmask) {
+        case 0x00FF0000:
+            if (!dst->format->Amask) {
+                return SDL_BlendPoint_RGB888(dst, x, y, blendMode, r, g, b,
+                                             a);
+            } else {
+                return SDL_BlendPoint_ARGB8888(dst, x, y, blendMode, r, g, b,
+                                               a);
+            }
+            break;
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (!dst->format->Amask) {
+        return SDL_BlendPoint_RGB(dst, x, y, blendMode, r, g, b, a);
+    } else {
+        return SDL_BlendPoint_RGBA(dst, x, y, blendMode, r, g, b, a);
+    }
+}
+
+int
+SDL_BlendPoints(SDL_Surface * dst, const SDL_Point * points, int count,
+                SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    int minx, miny;
+    int maxx, maxy;
+    int i;
+    int x, y;
+    int (*func)(SDL_Surface * dst, int x, int y,
+                SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a) = NULL;
+    int status = 0;
+
+    if (!dst) {
+        return SDL_SetError("Passed NULL destination surface");
+    }
+
+    /* This function doesn't work on surfaces < 8 bpp */
+    if (dst->format->BitsPerPixel < 8) {
+        return SDL_SetError("SDL_BlendPoints(): Unsupported surface format");
+    }
+
+    if (blendMode == SDL_BLENDMODE_BLEND || blendMode == SDL_BLENDMODE_ADD) {
+        r = DRAW_MUL(r, a);
+        g = DRAW_MUL(g, a);
+        b = DRAW_MUL(b, a);
+    }
+
+    /* FIXME: Does this function pointer slow things down significantly? */
+    switch (dst->format->BitsPerPixel) {
+    case 15:
+        switch (dst->format->Rmask) {
+        case 0x7C00:
+            func = SDL_BlendPoint_RGB555;
+            break;
+        }
+        break;
+    case 16:
+        switch (dst->format->Rmask) {
+        case 0xF800:
+            func = SDL_BlendPoint_RGB565;
+            break;
+        }
+        break;
+    case 32:
+        switch (dst->format->Rmask) {
+        case 0x00FF0000:
+            if (!dst->format->Amask) {
+                func = SDL_BlendPoint_RGB888;
+            } else {
+                func = SDL_BlendPoint_ARGB8888;
+            }
+            break;
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (!func) {
+        if (!dst->format->Amask) {
+            func = SDL_BlendPoint_RGB;
+        } else {
+            func = SDL_BlendPoint_RGBA;
+        }
+    }
+
+    minx = dst->clip_rect.x;
+    maxx = dst->clip_rect.x + dst->clip_rect.w - 1;
+    miny = dst->clip_rect.y;
+    maxy = dst->clip_rect.y + dst->clip_rect.h - 1;
+
+    for (i = 0; i < count; ++i) {
+        x = points[i].x;
+        y = points[i].y;
+
+        if (x < minx || x > maxx || y < miny || y > maxy) {
+            continue;
+        }
+        status = func(dst, x, y, blendMode, r, g, b, a);
+    }
+    return status;
+}
+
+#endif /* !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_blendpoint.h b/Source/3rd Party/sdl/src/render/software/SDL_blendpoint.h
new file mode 100644
index 000000000..72eaf7b87
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_blendpoint.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+
+extern int SDL_BlendPoint(SDL_Surface * dst, int x, int y, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+extern int SDL_BlendPoints(SDL_Surface * dst, const SDL_Point * points, int count, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_draw.h b/Source/3rd Party/sdl/src/render/software/SDL_draw.h
new file mode 100644
index 000000000..ba2ec311c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_draw.h	
@@ -0,0 +1,575 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "../../video/SDL_blit.h"
+
+/* This code assumes that r, g, b, a are the source color,
+ * and in the blend and add case, the RGB values are premultiplied by a.
+ */
+
+#define DRAW_MUL(_a, _b) (((unsigned)(_a)*(_b))/255)
+
+#define DRAW_FASTSETPIXEL(type) \
+    *pixel = (type) color
+
+#define DRAW_FASTSETPIXEL1 DRAW_FASTSETPIXEL(Uint8)
+#define DRAW_FASTSETPIXEL2 DRAW_FASTSETPIXEL(Uint16)
+#define DRAW_FASTSETPIXEL4 DRAW_FASTSETPIXEL(Uint32)
+
+#define DRAW_FASTSETPIXELXY(x, y, type, bpp, color) \
+    *(type *)((Uint8 *)dst->pixels + (y) * dst->pitch \
+                                   + (x) * bpp) = (type) color
+
+#define DRAW_FASTSETPIXELXY1(x, y) DRAW_FASTSETPIXELXY(x, y, Uint8, 1, color)
+#define DRAW_FASTSETPIXELXY2(x, y) DRAW_FASTSETPIXELXY(x, y, Uint16, 2, color)
+#define DRAW_FASTSETPIXELXY4(x, y) DRAW_FASTSETPIXELXY(x, y, Uint32, 4, color)
+
+#define DRAW_SETPIXEL(setpixel) \
+do { \
+    unsigned sr = r, sg = g, sb = b, sa = a; (void) sa; \
+    setpixel; \
+} while (0)
+
+#define DRAW_SETPIXEL_BLEND(getpixel, setpixel) \
+do { \
+    unsigned sr, sg, sb, sa; (void) sa; \
+    getpixel; \
+    sr = DRAW_MUL(inva, sr) + r; \
+    sg = DRAW_MUL(inva, sg) + g; \
+    sb = DRAW_MUL(inva, sb) + b; \
+    setpixel; \
+} while (0)
+
+#define DRAW_SETPIXEL_ADD(getpixel, setpixel) \
+do { \
+    unsigned sr, sg, sb, sa; (void) sa; \
+    getpixel; \
+    sr += r; if (sr > 0xff) sr = 0xff; \
+    sg += g; if (sg > 0xff) sg = 0xff; \
+    sb += b; if (sb > 0xff) sb = 0xff; \
+    setpixel; \
+} while (0)
+
+#define DRAW_SETPIXEL_MOD(getpixel, setpixel) \
+do { \
+    unsigned sr, sg, sb, sa; (void) sa; \
+    getpixel; \
+    sr = DRAW_MUL(sr, r); \
+    sg = DRAW_MUL(sg, g); \
+    sb = DRAW_MUL(sb, b); \
+    setpixel; \
+} while (0)
+
+#define DRAW_SETPIXELXY(x, y, type, bpp, op) \
+do { \
+    type *pixel = (type *)((Uint8 *)dst->pixels + (y) * dst->pitch \
+                                                + (x) * bpp); \
+    op; \
+} while (0)
+
+/*
+ * Define draw operators for RGB555
+ */
+
+#define DRAW_SETPIXEL_RGB555 \
+    DRAW_SETPIXEL(RGB555_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXEL_BLEND_RGB555 \
+    DRAW_SETPIXEL_BLEND(RGB_FROM_RGB555(*pixel, sr, sg, sb), \
+                        RGB555_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXEL_ADD_RGB555 \
+    DRAW_SETPIXEL_ADD(RGB_FROM_RGB555(*pixel, sr, sg, sb), \
+                      RGB555_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXEL_MOD_RGB555 \
+    DRAW_SETPIXEL_MOD(RGB_FROM_RGB555(*pixel, sr, sg, sb), \
+                      RGB555_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXELXY_RGB555(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_RGB555)
+
+#define DRAW_SETPIXELXY_BLEND_RGB555(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_BLEND_RGB555)
+
+#define DRAW_SETPIXELXY_ADD_RGB555(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_ADD_RGB555)
+
+#define DRAW_SETPIXELXY_MOD_RGB555(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_MOD_RGB555)
+
+/*
+ * Define draw operators for RGB565
+ */
+
+#define DRAW_SETPIXEL_RGB565 \
+    DRAW_SETPIXEL(RGB565_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXEL_BLEND_RGB565 \
+    DRAW_SETPIXEL_BLEND(RGB_FROM_RGB565(*pixel, sr, sg, sb), \
+                        RGB565_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXEL_ADD_RGB565 \
+    DRAW_SETPIXEL_ADD(RGB_FROM_RGB565(*pixel, sr, sg, sb), \
+                      RGB565_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXEL_MOD_RGB565 \
+    DRAW_SETPIXEL_MOD(RGB_FROM_RGB565(*pixel, sr, sg, sb), \
+                      RGB565_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXELXY_RGB565(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_RGB565)
+
+#define DRAW_SETPIXELXY_BLEND_RGB565(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_BLEND_RGB565)
+
+#define DRAW_SETPIXELXY_ADD_RGB565(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_ADD_RGB565)
+
+#define DRAW_SETPIXELXY_MOD_RGB565(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_MOD_RGB565)
+
+/*
+ * Define draw operators for RGB888
+ */
+
+#define DRAW_SETPIXEL_RGB888 \
+    DRAW_SETPIXEL(RGB888_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXEL_BLEND_RGB888 \
+    DRAW_SETPIXEL_BLEND(RGB_FROM_RGB888(*pixel, sr, sg, sb), \
+                        RGB888_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXEL_ADD_RGB888 \
+    DRAW_SETPIXEL_ADD(RGB_FROM_RGB888(*pixel, sr, sg, sb), \
+                      RGB888_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXEL_MOD_RGB888 \
+    DRAW_SETPIXEL_MOD(RGB_FROM_RGB888(*pixel, sr, sg, sb), \
+                      RGB888_FROM_RGB(*pixel, sr, sg, sb))
+
+#define DRAW_SETPIXELXY_RGB888(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_RGB888)
+
+#define DRAW_SETPIXELXY_BLEND_RGB888(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_BLEND_RGB888)
+
+#define DRAW_SETPIXELXY_ADD_RGB888(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_ADD_RGB888)
+
+#define DRAW_SETPIXELXY_MOD_RGB888(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_MOD_RGB888)
+
+/*
+ * Define draw operators for ARGB8888
+ */
+
+#define DRAW_SETPIXEL_ARGB8888 \
+    DRAW_SETPIXEL(ARGB8888_FROM_RGBA(*pixel, sr, sg, sb, sa))
+
+#define DRAW_SETPIXEL_BLEND_ARGB8888 \
+    DRAW_SETPIXEL_BLEND(RGBA_FROM_ARGB8888(*pixel, sr, sg, sb, sa), \
+                        ARGB8888_FROM_RGBA(*pixel, sr, sg, sb, sa))
+
+#define DRAW_SETPIXEL_ADD_ARGB8888 \
+    DRAW_SETPIXEL_ADD(RGBA_FROM_ARGB8888(*pixel, sr, sg, sb, sa), \
+                      ARGB8888_FROM_RGBA(*pixel, sr, sg, sb, sa))
+
+#define DRAW_SETPIXEL_MOD_ARGB8888 \
+    DRAW_SETPIXEL_MOD(RGBA_FROM_ARGB8888(*pixel, sr, sg, sb, sa), \
+                      ARGB8888_FROM_RGBA(*pixel, sr, sg, sb, sa))
+
+#define DRAW_SETPIXELXY_ARGB8888(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_ARGB8888)
+
+#define DRAW_SETPIXELXY_BLEND_ARGB8888(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_BLEND_ARGB8888)
+
+#define DRAW_SETPIXELXY_ADD_ARGB8888(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_ADD_ARGB8888)
+
+#define DRAW_SETPIXELXY_MOD_ARGB8888(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_MOD_ARGB8888)
+
+/*
+ * Define draw operators for general RGB
+ */
+
+#define DRAW_SETPIXEL_RGB \
+    DRAW_SETPIXEL(PIXEL_FROM_RGB(*pixel, fmt, sr, sg, sb))
+
+#define DRAW_SETPIXEL_BLEND_RGB \
+    DRAW_SETPIXEL_BLEND(RGB_FROM_PIXEL(*pixel, fmt, sr, sg, sb), \
+                        PIXEL_FROM_RGB(*pixel, fmt, sr, sg, sb))
+
+#define DRAW_SETPIXEL_ADD_RGB \
+    DRAW_SETPIXEL_ADD(RGB_FROM_PIXEL(*pixel, fmt, sr, sg, sb), \
+                      PIXEL_FROM_RGB(*pixel, fmt, sr, sg, sb))
+
+#define DRAW_SETPIXEL_MOD_RGB \
+    DRAW_SETPIXEL_MOD(RGB_FROM_PIXEL(*pixel, fmt, sr, sg, sb), \
+                      PIXEL_FROM_RGB(*pixel, fmt, sr, sg, sb))
+
+#define DRAW_SETPIXELXY2_RGB(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_RGB)
+
+#define DRAW_SETPIXELXY4_RGB(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_RGB)
+
+#define DRAW_SETPIXELXY2_BLEND_RGB(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_BLEND_RGB)
+
+#define DRAW_SETPIXELXY4_BLEND_RGB(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_BLEND_RGB)
+
+#define DRAW_SETPIXELXY2_ADD_RGB(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_ADD_RGB)
+
+#define DRAW_SETPIXELXY4_ADD_RGB(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_ADD_RGB)
+
+#define DRAW_SETPIXELXY2_MOD_RGB(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint16, 2, DRAW_SETPIXEL_MOD_RGB)
+
+#define DRAW_SETPIXELXY4_MOD_RGB(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_MOD_RGB)
+
+
+/*
+ * Define draw operators for general RGBA
+ */
+
+#define DRAW_SETPIXEL_RGBA \
+    DRAW_SETPIXEL(PIXEL_FROM_RGBA(*pixel, fmt, sr, sg, sb, sa))
+
+#define DRAW_SETPIXEL_BLEND_RGBA \
+    DRAW_SETPIXEL_BLEND(RGBA_FROM_PIXEL(*pixel, fmt, sr, sg, sb, sa), \
+                        PIXEL_FROM_RGBA(*pixel, fmt, sr, sg, sb, sa))
+
+#define DRAW_SETPIXEL_ADD_RGBA \
+    DRAW_SETPIXEL_ADD(RGBA_FROM_PIXEL(*pixel, fmt, sr, sg, sb, sa), \
+                      PIXEL_FROM_RGBA(*pixel, fmt, sr, sg, sb, sa))
+
+#define DRAW_SETPIXEL_MOD_RGBA \
+    DRAW_SETPIXEL_MOD(RGBA_FROM_PIXEL(*pixel, fmt, sr, sg, sb, sa), \
+                      PIXEL_FROM_RGBA(*pixel, fmt, sr, sg, sb, sa))
+
+#define DRAW_SETPIXELXY4_RGBA(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_RGBA)
+
+#define DRAW_SETPIXELXY4_BLEND_RGBA(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_BLEND_RGBA)
+
+#define DRAW_SETPIXELXY4_ADD_RGBA(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_ADD_RGBA)
+
+#define DRAW_SETPIXELXY4_MOD_RGBA(x, y) \
+    DRAW_SETPIXELXY(x, y, Uint32, 4, DRAW_SETPIXEL_MOD_RGBA)
+
+/*
+ * Define line drawing macro
+ */
+
+#define ABS(_x) ((_x) < 0 ? -(_x) : (_x))
+
+/* Horizontal line */
+#define HLINE(type, op, draw_end) \
+{ \
+    int length; \
+    int pitch = (dst->pitch / dst->format->BytesPerPixel); \
+    type *pixel; \
+    if (x1 <= x2) { \
+        pixel = (type *)dst->pixels + y1 * pitch + x1; \
+        length = draw_end ? (x2-x1+1) : (x2-x1); \
+    } else { \
+        pixel = (type *)dst->pixels + y1 * pitch + x2; \
+        if (!draw_end) { \
+            ++pixel; \
+        } \
+        length = draw_end ? (x1-x2+1) : (x1-x2); \
+    } \
+    while (length--) { \
+        op; \
+        ++pixel; \
+    } \
+}
+
+/* Vertical line */
+#define VLINE(type, op, draw_end) \
+{ \
+    int length; \
+    int pitch = (dst->pitch / dst->format->BytesPerPixel); \
+    type *pixel; \
+    if (y1 <= y2) { \
+        pixel = (type *)dst->pixels + y1 * pitch + x1; \
+        length = draw_end ? (y2-y1+1) : (y2-y1); \
+    } else { \
+        pixel = (type *)dst->pixels + y2 * pitch + x1; \
+        if (!draw_end) { \
+            pixel += pitch; \
+        } \
+        length = draw_end ? (y1-y2+1) : (y1-y2); \
+    } \
+    while (length--) { \
+        op; \
+        pixel += pitch; \
+    } \
+}
+
+/* Diagonal line */
+#define DLINE(type, op, draw_end) \
+{ \
+    int length; \
+    int pitch = (dst->pitch / dst->format->BytesPerPixel); \
+    type *pixel; \
+    if (y1 <= y2) { \
+        pixel = (type *)dst->pixels + y1 * pitch + x1; \
+        if (x1 <= x2) { \
+            ++pitch; \
+        } else { \
+            --pitch; \
+        } \
+        length = (y2-y1); \
+    } else { \
+        pixel = (type *)dst->pixels + y2 * pitch + x2; \
+        if (x2 <= x1) { \
+            ++pitch; \
+        } else { \
+            --pitch; \
+        } \
+        if (!draw_end) { \
+            pixel += pitch; \
+        } \
+        length = (y1-y2); \
+    } \
+    if (draw_end) { \
+        ++length; \
+    } \
+    while (length--) { \
+        op; \
+        pixel += pitch; \
+    } \
+}
+
+/* Bresenham's line algorithm */
+#define BLINE(x1, y1, x2, y2, op, draw_end) \
+{ \
+    int i, deltax, deltay, numpixels; \
+    int d, dinc1, dinc2; \
+    int x, xinc1, xinc2; \
+    int y, yinc1, yinc2; \
+ \
+    deltax = ABS(x2 - x1); \
+    deltay = ABS(y2 - y1); \
+ \
+    if (deltax >= deltay) { \
+        numpixels = deltax + 1; \
+        d = (2 * deltay) - deltax; \
+        dinc1 = deltay * 2; \
+        dinc2 = (deltay - deltax) * 2; \
+        xinc1 = 1; \
+        xinc2 = 1; \
+        yinc1 = 0; \
+        yinc2 = 1; \
+    } else { \
+        numpixels = deltay + 1; \
+        d = (2 * deltax) - deltay; \
+        dinc1 = deltax * 2; \
+        dinc2 = (deltax - deltay) * 2; \
+        xinc1 = 0; \
+        xinc2 = 1; \
+        yinc1 = 1; \
+        yinc2 = 1; \
+    } \
+ \
+    if (x1 > x2) { \
+        xinc1 = -xinc1; \
+        xinc2 = -xinc2; \
+    } \
+    if (y1 > y2) { \
+        yinc1 = -yinc1; \
+        yinc2 = -yinc2; \
+    } \
+ \
+    x = x1; \
+    y = y1; \
+ \
+    if (!draw_end) { \
+        --numpixels; \
+    } \
+    for (i = 0; i < numpixels; ++i) { \
+        op(x, y); \
+        if (d < 0) { \
+            d += dinc1; \
+            x += xinc1; \
+            y += yinc1; \
+        } else { \
+            d += dinc2; \
+            x += xinc2; \
+            y += yinc2; \
+        } \
+    } \
+}
+
+/* Xiaolin Wu's line algorithm, based on Michael Abrash's implementation */
+#define WULINE(x1, y1, x2, y2, opaque_op, blend_op, draw_end) \
+{ \
+    Uint16 ErrorAdj, ErrorAcc; \
+    Uint16 ErrorAccTemp, Weighting; \
+    int DeltaX, DeltaY, Temp, XDir; \
+    unsigned r, g, b, a, inva; \
+ \
+    /* Draw the initial pixel, which is always exactly intersected by \
+       the line and so needs no weighting */ \
+    opaque_op(x1, y1); \
+ \
+    /* Draw the final pixel, which is always exactly intersected by the line \
+       and so needs no weighting */ \
+    if (draw_end) { \
+        opaque_op(x2, y2); \
+    } \
+ \
+    /* Make sure the line runs top to bottom */ \
+    if (y1 > y2) { \
+        Temp = y1; y1 = y2; y2 = Temp; \
+        Temp = x1; x1 = x2; x2 = Temp; \
+    } \
+    DeltaY = y2 - y1; \
+ \
+    if ((DeltaX = x2 - x1) >= 0) { \
+        XDir = 1; \
+    } else { \
+        XDir = -1; \
+        DeltaX = -DeltaX; /* make DeltaX positive */ \
+    } \
+ \
+    /* line is not horizontal, diagonal, or vertical */ \
+    ErrorAcc = 0;  /* initialize the line error accumulator to 0 */ \
+ \
+    /* Is this an X-major or Y-major line? */ \
+    if (DeltaY > DeltaX) { \
+        /* Y-major line; calculate 16-bit fixed-point fractional part of a \
+          pixel that X advances each time Y advances 1 pixel, truncating the \
+          result so that we won't overrun the endpoint along the X axis */ \
+        ErrorAdj = ((unsigned long) DeltaX << 16) / (unsigned long) DeltaY; \
+        /* Draw all pixels other than the first and last */ \
+        while (--DeltaY) { \
+            ErrorAccTemp = ErrorAcc;   /* remember currrent accumulated error */ \
+            ErrorAcc += ErrorAdj;      /* calculate error for next pixel */ \
+            if (ErrorAcc <= ErrorAccTemp) { \
+                /* The error accumulator turned over, so advance the X coord */ \
+                x1 += XDir; \
+            } \
+            y1++; /* Y-major, so always advance Y */ \
+            /* The IntensityBits most significant bits of ErrorAcc give us the \
+             intensity weighting for this pixel, and the complement of the \
+             weighting for the paired pixel */ \
+            Weighting = ErrorAcc >> 8; \
+            { \
+                a = DRAW_MUL(_a, (Weighting ^ 255)); \
+                r = DRAW_MUL(_r, a); \
+                g = DRAW_MUL(_g, a); \
+                b = DRAW_MUL(_b, a); \
+                inva = (a ^ 0xFF); \
+                blend_op(x1, y1); \
+            } \
+            { \
+                a = DRAW_MUL(_a, Weighting); \
+                r = DRAW_MUL(_r, a); \
+                g = DRAW_MUL(_g, a); \
+                b = DRAW_MUL(_b, a); \
+                inva = (a ^ 0xFF); \
+                blend_op(x1 + XDir, y1); \
+            } \
+        } \
+    } else { \
+        /* X-major line; calculate 16-bit fixed-point fractional part of a \
+           pixel that Y advances each time X advances 1 pixel, truncating the \
+           result to avoid overrunning the endpoint along the X axis */ \
+        ErrorAdj = ((unsigned long) DeltaY << 16) / (unsigned long) DeltaX; \
+        /* Draw all pixels other than the first and last */ \
+        while (--DeltaX) { \
+            ErrorAccTemp = ErrorAcc;   /* remember currrent accumulated error */ \
+            ErrorAcc += ErrorAdj;      /* calculate error for next pixel */ \
+            if (ErrorAcc <= ErrorAccTemp) { \
+                /* The error accumulator turned over, so advance the Y coord */ \
+                y1++; \
+            } \
+            x1 += XDir; /* X-major, so always advance X */ \
+            /* The IntensityBits most significant bits of ErrorAcc give us the \
+              intensity weighting for this pixel, and the complement of the \
+              weighting for the paired pixel */ \
+            Weighting = ErrorAcc >> 8; \
+            { \
+                a = DRAW_MUL(_a, (Weighting ^ 255)); \
+                r = DRAW_MUL(_r, a); \
+                g = DRAW_MUL(_g, a); \
+                b = DRAW_MUL(_b, a); \
+                inva = (a ^ 0xFF); \
+                blend_op(x1, y1); \
+            } \
+            { \
+                a = DRAW_MUL(_a, Weighting); \
+                r = DRAW_MUL(_r, a); \
+                g = DRAW_MUL(_g, a); \
+                b = DRAW_MUL(_b, a); \
+                inva = (a ^ 0xFF); \
+                blend_op(x1, y1 + 1); \
+            } \
+        } \
+    } \
+}
+
+#ifdef AA_LINES
+#define AALINE(x1, y1, x2, y2, opaque_op, blend_op, draw_end) \
+            WULINE(x1, y1, x2, y2, opaque_op, blend_op, draw_end)
+#else
+#define AALINE(x1, y1, x2, y2, opaque_op, blend_op, draw_end) \
+            BLINE(x1, y1, x2, y2, opaque_op, draw_end)
+#endif
+
+/*
+ * Define fill rect macro
+ */
+
+#define FILLRECT(type, op) \
+do { \
+    int width = rect->w; \
+    int height = rect->h; \
+    int pitch = (dst->pitch / dst->format->BytesPerPixel); \
+    int skip = pitch - width; \
+    type *pixel = (type *)dst->pixels + rect->y * pitch + rect->x; \
+    while (height--) { \
+        { int n = (width+3)/4; \
+            switch (width & 3) { \
+            case 0: do {   op; pixel++; \
+            case 3:        op; pixel++; \
+            case 2:        op; pixel++; \
+            case 1:        op; pixel++; \
+                    } while ( --n > 0 ); \
+            } \
+        } \
+        pixel += skip; \
+    } \
+} while (0)
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_drawline.c b/Source/3rd Party/sdl/src/render/software/SDL_drawline.c
new file mode 100644
index 000000000..1ff84a46d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_drawline.c	
@@ -0,0 +1,209 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if !SDL_RENDER_DISABLED
+
+#include "SDL_draw.h"
+#include "SDL_drawline.h"
+#include "SDL_drawpoint.h"
+
+
+static void
+SDL_DrawLine1(SDL_Surface * dst, int x1, int y1, int x2, int y2, Uint32 color,
+              SDL_bool draw_end)
+{
+    if (y1 == y2) {
+        int length;
+        int pitch = (dst->pitch / dst->format->BytesPerPixel);
+        Uint8 *pixel;
+        if (x1 <= x2) {
+            pixel = (Uint8 *)dst->pixels + y1 * pitch + x1;
+            length = draw_end ? (x2-x1+1) : (x2-x1);
+        } else {
+            pixel = (Uint8 *)dst->pixels + y1 * pitch + x2;
+            if (!draw_end) {
+                ++pixel;
+            }
+            length = draw_end ? (x1-x2+1) : (x1-x2);
+        }
+        SDL_memset(pixel, color, length);
+    } else if (x1 == x2) {
+        VLINE(Uint8, DRAW_FASTSETPIXEL1, draw_end);
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        DLINE(Uint8, DRAW_FASTSETPIXEL1, draw_end);
+    } else {
+        BLINE(x1, y1, x2, y2, DRAW_FASTSETPIXELXY1, draw_end);
+    }
+}
+
+static void
+SDL_DrawLine2(SDL_Surface * dst, int x1, int y1, int x2, int y2, Uint32 color,
+              SDL_bool draw_end)
+{
+    if (y1 == y2) {
+        HLINE(Uint16, DRAW_FASTSETPIXEL2, draw_end);
+    } else if (x1 == x2) {
+        VLINE(Uint16, DRAW_FASTSETPIXEL2, draw_end);
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        DLINE(Uint16, DRAW_FASTSETPIXEL2, draw_end);
+    } else {
+        Uint8 _r, _g, _b, _a;
+        const SDL_PixelFormat * fmt = dst->format;
+        SDL_GetRGBA(color, fmt, &_r, &_g, &_b, &_a);
+        if (fmt->Rmask == 0x7C00) {
+            AALINE(x1, y1, x2, y2,
+                   DRAW_FASTSETPIXELXY2, DRAW_SETPIXELXY_BLEND_RGB555,
+                   draw_end);
+        } else if (fmt->Rmask == 0xF800) {
+            AALINE(x1, y1, x2, y2,
+                   DRAW_FASTSETPIXELXY2, DRAW_SETPIXELXY_BLEND_RGB565,
+                   draw_end);
+        } else {
+            AALINE(x1, y1, x2, y2,
+                   DRAW_FASTSETPIXELXY2, DRAW_SETPIXELXY2_BLEND_RGB,
+                   draw_end);
+        }
+    }
+}
+
+static void
+SDL_DrawLine4(SDL_Surface * dst, int x1, int y1, int x2, int y2, Uint32 color,
+              SDL_bool draw_end)
+{
+    if (y1 == y2) {
+        HLINE(Uint32, DRAW_FASTSETPIXEL4, draw_end);
+    } else if (x1 == x2) {
+        VLINE(Uint32, DRAW_FASTSETPIXEL4, draw_end);
+    } else if (ABS(x1 - x2) == ABS(y1 - y2)) {
+        DLINE(Uint32, DRAW_FASTSETPIXEL4, draw_end);
+    } else {
+        Uint8 _r, _g, _b, _a;
+        const SDL_PixelFormat * fmt = dst->format;
+        SDL_GetRGBA(color, fmt, &_r, &_g, &_b, &_a);
+        if (fmt->Rmask == 0x00FF0000) {
+            if (!fmt->Amask) {
+                AALINE(x1, y1, x2, y2,
+                       DRAW_FASTSETPIXELXY4, DRAW_SETPIXELXY_BLEND_RGB888,
+                       draw_end);
+            } else {
+                AALINE(x1, y1, x2, y2,
+                       DRAW_FASTSETPIXELXY4, DRAW_SETPIXELXY_BLEND_ARGB8888,
+                       draw_end);
+            }
+        } else {
+            AALINE(x1, y1, x2, y2,
+                   DRAW_FASTSETPIXELXY4, DRAW_SETPIXELXY4_BLEND_RGB,
+                   draw_end);
+        }
+    }
+}
+
+typedef void (*DrawLineFunc) (SDL_Surface * dst,
+                              int x1, int y1, int x2, int y2,
+                              Uint32 color, SDL_bool draw_end);
+
+static DrawLineFunc
+SDL_CalculateDrawLineFunc(const SDL_PixelFormat * fmt)
+{
+    switch (fmt->BytesPerPixel) {
+    case 1:
+        if (fmt->BitsPerPixel < 8) {
+            break;
+        }
+        return SDL_DrawLine1;
+    case 2:
+        return SDL_DrawLine2;
+    case 4:
+        return SDL_DrawLine4;
+    }
+    return NULL;
+}
+
+int
+SDL_DrawLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, Uint32 color)
+{
+    DrawLineFunc func;
+
+    if (!dst) {
+        return SDL_SetError("SDL_DrawLine(): Passed NULL destination surface");
+    }
+
+    func = SDL_CalculateDrawLineFunc(dst->format);
+    if (!func) {
+        return SDL_SetError("SDL_DrawLine(): Unsupported surface format");
+    }
+
+    /* Perform clipping */
+    /* FIXME: We don't actually want to clip, as it may change line slope */
+    if (!SDL_IntersectRectAndLine(&dst->clip_rect, &x1, &y1, &x2, &y2)) {
+        return 0;
+    }
+
+    func(dst, x1, y1, x2, y2, color, SDL_TRUE);
+    return 0;
+}
+
+int
+SDL_DrawLines(SDL_Surface * dst, const SDL_Point * points, int count,
+              Uint32 color)
+{
+    int i;
+    int x1, y1;
+    int x2, y2;
+    SDL_bool draw_end;
+    DrawLineFunc func;
+
+    if (!dst) {
+        return SDL_SetError("SDL_DrawLines(): Passed NULL destination surface");
+    }
+
+    func = SDL_CalculateDrawLineFunc(dst->format);
+    if (!func) {
+        return SDL_SetError("SDL_DrawLines(): Unsupported surface format");
+    }
+
+    for (i = 1; i < count; ++i) {
+        x1 = points[i-1].x;
+        y1 = points[i-1].y;
+        x2 = points[i].x;
+        y2 = points[i].y;
+
+        /* Perform clipping */
+        /* FIXME: We don't actually want to clip, as it may change line slope */
+        if (!SDL_IntersectRectAndLine(&dst->clip_rect, &x1, &y1, &x2, &y2)) {
+            continue;
+        }
+
+        /* Draw the end if it was clipped */
+        draw_end = (x2 != points[i].x || y2 != points[i].y);
+
+        func(dst, x1, y1, x2, y2, color, draw_end);
+    }
+    if (points[0].x != points[count-1].x || points[0].y != points[count-1].y) {
+        SDL_DrawPoint(dst, points[count-1].x, points[count-1].y, color);
+    }
+    return 0;
+}
+
+#endif /* !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_drawline.h b/Source/3rd Party/sdl/src/render/software/SDL_drawline.h
new file mode 100644
index 000000000..e3378ae8f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_drawline.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+
+extern int SDL_DrawLine(SDL_Surface * dst, int x1, int y1, int x2, int y2, Uint32 color);
+extern int SDL_DrawLines(SDL_Surface * dst, const SDL_Point * points, int count, Uint32 color);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_drawpoint.c b/Source/3rd Party/sdl/src/render/software/SDL_drawpoint.c
new file mode 100644
index 000000000..3f2de86c1
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_drawpoint.c	
@@ -0,0 +1,114 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if !SDL_RENDER_DISABLED
+
+#include "SDL_draw.h"
+#include "SDL_drawpoint.h"
+
+
+int
+SDL_DrawPoint(SDL_Surface * dst, int x, int y, Uint32 color)
+{
+    if (!dst) {
+        return SDL_SetError("Passed NULL destination surface");
+    }
+
+    /* This function doesn't work on surfaces < 8 bpp */
+    if (dst->format->BitsPerPixel < 8) {
+        return SDL_SetError("SDL_DrawPoint(): Unsupported surface format");
+    }
+
+    /* Perform clipping */
+    if (x < dst->clip_rect.x || y < dst->clip_rect.y ||
+        x >= (dst->clip_rect.x + dst->clip_rect.w) ||
+        y >= (dst->clip_rect.y + dst->clip_rect.h)) {
+        return 0;
+    }
+
+    switch (dst->format->BytesPerPixel) {
+    case 1:
+        DRAW_FASTSETPIXELXY1(x, y);
+        break;
+    case 2:
+        DRAW_FASTSETPIXELXY2(x, y);
+        break;
+    case 3:
+        return SDL_Unsupported();
+    case 4:
+        DRAW_FASTSETPIXELXY4(x, y);
+        break;
+    }
+    return 0;
+}
+
+int
+SDL_DrawPoints(SDL_Surface * dst, const SDL_Point * points, int count,
+               Uint32 color)
+{
+    int minx, miny;
+    int maxx, maxy;
+    int i;
+    int x, y;
+
+    if (!dst) {
+        return SDL_SetError("Passed NULL destination surface");
+    }
+
+    /* This function doesn't work on surfaces < 8 bpp */
+    if (dst->format->BitsPerPixel < 8) {
+        return SDL_SetError("SDL_DrawPoints(): Unsupported surface format");
+    }
+
+    minx = dst->clip_rect.x;
+    maxx = dst->clip_rect.x + dst->clip_rect.w - 1;
+    miny = dst->clip_rect.y;
+    maxy = dst->clip_rect.y + dst->clip_rect.h - 1;
+
+    for (i = 0; i < count; ++i) {
+        x = points[i].x;
+        y = points[i].y;
+
+        if (x < minx || x > maxx || y < miny || y > maxy) {
+            continue;
+        }
+
+        switch (dst->format->BytesPerPixel) {
+        case 1:
+            DRAW_FASTSETPIXELXY1(x, y);
+            break;
+        case 2:
+            DRAW_FASTSETPIXELXY2(x, y);
+            break;
+        case 3:
+            return SDL_Unsupported();
+        case 4:
+            DRAW_FASTSETPIXELXY4(x, y);
+            break;
+        }
+    }
+    return 0;
+}
+
+#endif /* !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_drawpoint.h b/Source/3rd Party/sdl/src/render/software/SDL_drawpoint.h
new file mode 100644
index 000000000..96933d616
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_drawpoint.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+
+extern int SDL_DrawPoint(SDL_Surface * dst, int x, int y, Uint32 color);
+extern int SDL_DrawPoints(SDL_Surface * dst, const SDL_Point * points, int count, Uint32 color);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_render_sw.c b/Source/3rd Party/sdl/src/render/software/SDL_render_sw.c
new file mode 100644
index 000000000..f0eb768f5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_render_sw.c	
@@ -0,0 +1,727 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if !SDL_RENDER_DISABLED
+
+#include "../SDL_sysrender.h"
+#include "SDL_render_sw_c.h"
+#include "SDL_hints.h"
+
+#include "SDL_draw.h"
+#include "SDL_blendfillrect.h"
+#include "SDL_blendline.h"
+#include "SDL_blendpoint.h"
+#include "SDL_drawline.h"
+#include "SDL_drawpoint.h"
+#include "SDL_rotate.h"
+
+/* SDL surface based renderer implementation */
+
+static SDL_Renderer *SW_CreateRenderer(SDL_Window * window, Uint32 flags);
+static void SW_WindowEvent(SDL_Renderer * renderer,
+                           const SDL_WindowEvent *event);
+static int SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h);
+static int SW_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int SW_SetTextureColorMod(SDL_Renderer * renderer,
+                                 SDL_Texture * texture);
+static int SW_SetTextureAlphaMod(SDL_Renderer * renderer,
+                                 SDL_Texture * texture);
+static int SW_SetTextureBlendMode(SDL_Renderer * renderer,
+                                  SDL_Texture * texture);
+static int SW_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                            const SDL_Rect * rect, const void *pixels,
+                            int pitch);
+static int SW_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                          const SDL_Rect * rect, void **pixels, int *pitch);
+static void SW_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static int SW_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture);
+static int SW_UpdateViewport(SDL_Renderer * renderer);
+static int SW_UpdateClipRect(SDL_Renderer * renderer);
+static int SW_RenderClear(SDL_Renderer * renderer);
+static int SW_RenderDrawPoints(SDL_Renderer * renderer,
+                               const SDL_FPoint * points, int count);
+static int SW_RenderDrawLines(SDL_Renderer * renderer,
+                              const SDL_FPoint * points, int count);
+static int SW_RenderFillRects(SDL_Renderer * renderer,
+                              const SDL_FRect * rects, int count);
+static int SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                         const SDL_Rect * srcrect, const SDL_FRect * dstrect);
+static int SW_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                          const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                          const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip);
+static int SW_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                               Uint32 format, void * pixels, int pitch);
+static void SW_RenderPresent(SDL_Renderer * renderer);
+static void SW_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture);
+static void SW_DestroyRenderer(SDL_Renderer * renderer);
+
+
+SDL_RenderDriver SW_RenderDriver = {
+    SW_CreateRenderer,
+    {
+     "software",
+     SDL_RENDERER_SOFTWARE | SDL_RENDERER_TARGETTEXTURE,
+     8,
+     {
+      SDL_PIXELFORMAT_RGB555,
+      SDL_PIXELFORMAT_RGB565,
+      SDL_PIXELFORMAT_RGB888,
+      SDL_PIXELFORMAT_BGR888,
+      SDL_PIXELFORMAT_ARGB8888,
+      SDL_PIXELFORMAT_RGBA8888,
+      SDL_PIXELFORMAT_ABGR8888,
+      SDL_PIXELFORMAT_BGRA8888
+     },
+     0,
+     0}
+};
+
+typedef struct
+{
+    SDL_Surface *surface;
+    SDL_Surface *window;
+} SW_RenderData;
+
+
+static SDL_Surface *
+SW_ActivateRenderer(SDL_Renderer * renderer)
+{
+    SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
+
+    if (!data->surface) {
+        data->surface = data->window;
+    }
+    if (!data->surface) {
+        SDL_Surface *surface = SDL_GetWindowSurface(renderer->window);
+        if (surface) {
+            data->surface = data->window = surface;
+
+            SW_UpdateViewport(renderer);
+            SW_UpdateClipRect(renderer);
+        }
+    }
+    return data->surface;
+}
+
+SDL_Renderer *
+SW_CreateRendererForSurface(SDL_Surface * surface)
+{
+    SDL_Renderer *renderer;
+    SW_RenderData *data;
+
+    if (!surface) {
+        SDL_SetError("Can't create renderer for NULL surface");
+        return NULL;
+    }
+
+    renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
+    if (!renderer) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    data = (SW_RenderData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        SW_DestroyRenderer(renderer);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    data->surface = surface;
+
+    renderer->WindowEvent = SW_WindowEvent;
+    renderer->GetOutputSize = SW_GetOutputSize;
+    renderer->CreateTexture = SW_CreateTexture;
+    renderer->SetTextureColorMod = SW_SetTextureColorMod;
+    renderer->SetTextureAlphaMod = SW_SetTextureAlphaMod;
+    renderer->SetTextureBlendMode = SW_SetTextureBlendMode;
+    renderer->UpdateTexture = SW_UpdateTexture;
+    renderer->LockTexture = SW_LockTexture;
+    renderer->UnlockTexture = SW_UnlockTexture;
+    renderer->SetRenderTarget = SW_SetRenderTarget;
+    renderer->UpdateViewport = SW_UpdateViewport;
+    renderer->UpdateClipRect = SW_UpdateClipRect;
+    renderer->RenderClear = SW_RenderClear;
+    renderer->RenderDrawPoints = SW_RenderDrawPoints;
+    renderer->RenderDrawLines = SW_RenderDrawLines;
+    renderer->RenderFillRects = SW_RenderFillRects;
+    renderer->RenderCopy = SW_RenderCopy;
+    renderer->RenderCopyEx = SW_RenderCopyEx;
+    renderer->RenderReadPixels = SW_RenderReadPixels;
+    renderer->RenderPresent = SW_RenderPresent;
+    renderer->DestroyTexture = SW_DestroyTexture;
+    renderer->DestroyRenderer = SW_DestroyRenderer;
+    renderer->info = SW_RenderDriver.info;
+    renderer->driverdata = data;
+
+    SW_ActivateRenderer(renderer);
+
+    return renderer;
+}
+
+SDL_Renderer *
+SW_CreateRenderer(SDL_Window * window, Uint32 flags)
+{
+    SDL_Surface *surface;
+
+    surface = SDL_GetWindowSurface(window);
+    if (!surface) {
+        return NULL;
+    }
+    return SW_CreateRendererForSurface(surface);
+}
+
+static void
+SW_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
+{
+    SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
+
+    if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
+        data->surface = NULL;
+        data->window = NULL;
+    }
+}
+
+static int
+SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
+{
+    SDL_Surface *surface = SW_ActivateRenderer(renderer);
+
+    if (surface) {
+        if (w) {
+            *w = surface->w;
+        }
+        if (h) {
+            *h = surface->h;
+        }
+        return 0;
+    } else {
+        SDL_SetError("Software renderer doesn't have an output surface");
+        return -1;
+    }
+}
+
+static int
+SW_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    int bpp;
+    Uint32 Rmask, Gmask, Bmask, Amask;
+
+    if (!SDL_PixelFormatEnumToMasks
+        (texture->format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) {
+        return SDL_SetError("Unknown texture format");
+    }
+
+    texture->driverdata =
+        SDL_CreateRGBSurface(0, texture->w, texture->h, bpp, Rmask, Gmask,
+                             Bmask, Amask);
+    SDL_SetSurfaceColorMod(texture->driverdata, texture->r, texture->g,
+                           texture->b);
+    SDL_SetSurfaceAlphaMod(texture->driverdata, texture->a);
+    SDL_SetSurfaceBlendMode(texture->driverdata, texture->blendMode);
+
+    if (texture->access == SDL_TEXTUREACCESS_STATIC) {
+        SDL_SetSurfaceRLE(texture->driverdata, 1);
+    }
+
+    if (!texture->driverdata) {
+        return -1;
+    }
+    return 0;
+}
+
+static int
+SW_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+    return SDL_SetSurfaceColorMod(surface, texture->r, texture->g,
+                                  texture->b);
+}
+
+static int
+SW_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+    return SDL_SetSurfaceAlphaMod(surface, texture->a);
+}
+
+static int
+SW_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+    return SDL_SetSurfaceBlendMode(surface, texture->blendMode);
+}
+
+static int
+SW_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                 const SDL_Rect * rect, const void *pixels, int pitch)
+{
+    SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+    Uint8 *src, *dst;
+    int row;
+    size_t length;
+
+    if(SDL_MUSTLOCK(surface))
+        SDL_LockSurface(surface);
+    src = (Uint8 *) pixels;
+    dst = (Uint8 *) surface->pixels +
+                        rect->y * surface->pitch +
+                        rect->x * surface->format->BytesPerPixel;
+    length = rect->w * surface->format->BytesPerPixel;
+    for (row = 0; row < rect->h; ++row) {
+        SDL_memcpy(dst, src, length);
+        src += pitch;
+        dst += surface->pitch;
+    }
+    if(SDL_MUSTLOCK(surface))
+        SDL_UnlockSurface(surface);
+    return 0;
+}
+
+static int
+SW_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+               const SDL_Rect * rect, void **pixels, int *pitch)
+{
+    SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+
+    *pixels =
+        (void *) ((Uint8 *) surface->pixels + rect->y * surface->pitch +
+                  rect->x * surface->format->BytesPerPixel);
+    *pitch = surface->pitch;
+    return 0;
+}
+
+static void
+SW_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+}
+
+static int
+SW_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
+
+    if (texture ) {
+        data->surface = (SDL_Surface *) texture->driverdata;
+    } else {
+        data->surface = data->window;
+    }
+    return 0;
+}
+
+static int
+SW_UpdateViewport(SDL_Renderer * renderer)
+{
+    SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
+    SDL_Surface *surface = data->surface;
+
+    if (!surface) {
+        /* We'll update the viewport after we recreate the surface */
+        return 0;
+    }
+
+    SDL_SetClipRect(data->surface, &renderer->viewport);
+    return 0;
+}
+
+static int
+SW_UpdateClipRect(SDL_Renderer * renderer)
+{
+    SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
+    SDL_Surface *surface = data->surface;
+    const SDL_Rect *rect = &renderer->clip_rect;
+
+    if (surface) {
+        if (!SDL_RectEmpty(rect)) {
+            SDL_SetClipRect(surface, rect);
+        } else {
+            SDL_SetClipRect(surface, NULL);
+        }
+    }
+    return 0;
+}
+
+static int
+SW_RenderClear(SDL_Renderer * renderer)
+{
+    SDL_Surface *surface = SW_ActivateRenderer(renderer);
+    Uint32 color;
+    SDL_Rect clip_rect;
+
+    if (!surface) {
+        return -1;
+    }
+
+    color = SDL_MapRGBA(surface->format,
+                        renderer->r, renderer->g, renderer->b, renderer->a);
+
+    /* By definition the clear ignores the clip rect */
+    clip_rect = surface->clip_rect;
+    SDL_SetClipRect(surface, NULL);
+    SDL_FillRect(surface, NULL, color);
+    SDL_SetClipRect(surface, &clip_rect);
+    return 0;
+}
+
+static int
+SW_RenderDrawPoints(SDL_Renderer * renderer, const SDL_FPoint * points,
+                    int count)
+{
+    SDL_Surface *surface = SW_ActivateRenderer(renderer);
+    SDL_Point *final_points;
+    int i, status;
+
+    if (!surface) {
+        return -1;
+    }
+
+    final_points = SDL_stack_alloc(SDL_Point, count);
+    if (!final_points) {
+        return SDL_OutOfMemory();
+    }
+    if (renderer->viewport.x || renderer->viewport.y) {
+        int x = renderer->viewport.x;
+        int y = renderer->viewport.y;
+
+        for (i = 0; i < count; ++i) {
+            final_points[i].x = (int)(x + points[i].x);
+            final_points[i].y = (int)(y + points[i].y);
+        }
+    } else {
+        for (i = 0; i < count; ++i) {
+            final_points[i].x = (int)points[i].x;
+            final_points[i].y = (int)points[i].y;
+        }
+    }
+
+    /* Draw the points! */
+    if (renderer->blendMode == SDL_BLENDMODE_NONE) {
+        Uint32 color = SDL_MapRGBA(surface->format,
+                                   renderer->r, renderer->g, renderer->b,
+                                   renderer->a);
+
+        status = SDL_DrawPoints(surface, final_points, count, color);
+    } else {
+        status = SDL_BlendPoints(surface, final_points, count,
+                                renderer->blendMode,
+                                renderer->r, renderer->g, renderer->b,
+                                renderer->a);
+    }
+    SDL_stack_free(final_points);
+
+    return status;
+}
+
+static int
+SW_RenderDrawLines(SDL_Renderer * renderer, const SDL_FPoint * points,
+                   int count)
+{
+    SDL_Surface *surface = SW_ActivateRenderer(renderer);
+    SDL_Point *final_points;
+    int i, status;
+
+    if (!surface) {
+        return -1;
+    }
+
+    final_points = SDL_stack_alloc(SDL_Point, count);
+    if (!final_points) {
+        return SDL_OutOfMemory();
+    }
+    if (renderer->viewport.x || renderer->viewport.y) {
+        int x = renderer->viewport.x;
+        int y = renderer->viewport.y;
+
+        for (i = 0; i < count; ++i) {
+            final_points[i].x = (int)(x + points[i].x);
+            final_points[i].y = (int)(y + points[i].y);
+        }
+    } else {
+        for (i = 0; i < count; ++i) {
+            final_points[i].x = (int)points[i].x;
+            final_points[i].y = (int)points[i].y;
+        }
+    }
+
+    /* Draw the lines! */
+    if (renderer->blendMode == SDL_BLENDMODE_NONE) {
+        Uint32 color = SDL_MapRGBA(surface->format,
+                                   renderer->r, renderer->g, renderer->b,
+                                   renderer->a);
+
+        status = SDL_DrawLines(surface, final_points, count, color);
+    } else {
+        status = SDL_BlendLines(surface, final_points, count,
+                                renderer->blendMode,
+                                renderer->r, renderer->g, renderer->b,
+                                renderer->a);
+    }
+    SDL_stack_free(final_points);
+
+    return status;
+}
+
+static int
+SW_RenderFillRects(SDL_Renderer * renderer, const SDL_FRect * rects, int count)
+{
+    SDL_Surface *surface = SW_ActivateRenderer(renderer);
+    SDL_Rect *final_rects;
+    int i, status;
+
+    if (!surface) {
+        return -1;
+    }
+
+    final_rects = SDL_stack_alloc(SDL_Rect, count);
+    if (!final_rects) {
+        return SDL_OutOfMemory();
+    }
+    if (renderer->viewport.x || renderer->viewport.y) {
+        int x = renderer->viewport.x;
+        int y = renderer->viewport.y;
+
+        for (i = 0; i < count; ++i) {
+            final_rects[i].x = (int)(x + rects[i].x);
+            final_rects[i].y = (int)(y + rects[i].y);
+            final_rects[i].w = SDL_max((int)rects[i].w, 1);
+            final_rects[i].h = SDL_max((int)rects[i].h, 1);
+        }
+    } else {
+        for (i = 0; i < count; ++i) {
+            final_rects[i].x = (int)rects[i].x;
+            final_rects[i].y = (int)rects[i].y;
+            final_rects[i].w = SDL_max((int)rects[i].w, 1);
+            final_rects[i].h = SDL_max((int)rects[i].h, 1);
+        }
+    }
+
+    if (renderer->blendMode == SDL_BLENDMODE_NONE) {
+        Uint32 color = SDL_MapRGBA(surface->format,
+                                   renderer->r, renderer->g, renderer->b,
+                                   renderer->a);
+        status = SDL_FillRects(surface, final_rects, count, color);
+    } else {
+        status = SDL_BlendFillRects(surface, final_rects, count,
+                                    renderer->blendMode,
+                                    renderer->r, renderer->g, renderer->b,
+                                    renderer->a);
+    }
+    SDL_stack_free(final_rects);
+
+    return status;
+}
+
+static int
+SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+              const SDL_Rect * srcrect, const SDL_FRect * dstrect)
+{
+    SDL_Surface *surface = SW_ActivateRenderer(renderer);
+    SDL_Surface *src = (SDL_Surface *) texture->driverdata;
+    SDL_Rect final_rect;
+
+    if (!surface) {
+        return -1;
+    }
+
+    if (renderer->viewport.x || renderer->viewport.y) {
+        final_rect.x = (int)(renderer->viewport.x + dstrect->x);
+        final_rect.y = (int)(renderer->viewport.y + dstrect->y);
+    } else {
+        final_rect.x = (int)dstrect->x;
+        final_rect.y = (int)dstrect->y;
+    }
+    final_rect.w = (int)dstrect->w;
+    final_rect.h = (int)dstrect->h;
+
+    if ( srcrect->w == final_rect.w && srcrect->h == final_rect.h ) {
+        return SDL_BlitSurface(src, srcrect, surface, &final_rect);
+    } else {
+        return SDL_BlitScaled(src, srcrect, surface, &final_rect);
+    }
+}
+
+static int
+GetScaleQuality(void)
+{
+    const char *hint = SDL_GetHint(SDL_HINT_RENDER_SCALE_QUALITY);
+
+    if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+
+static int
+SW_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
+                const SDL_Rect * srcrect, const SDL_FRect * dstrect,
+                const double angle, const SDL_FPoint * center, const SDL_RendererFlip flip)
+{
+    SDL_Surface *surface = SW_ActivateRenderer(renderer);
+    SDL_Surface *src = (SDL_Surface *) texture->driverdata;
+    SDL_Rect final_rect, tmp_rect;
+    SDL_Surface *surface_rotated, *surface_scaled;
+    Uint32 colorkey;
+    int retval, dstwidth, dstheight, abscenterx, abscentery;
+    double cangle, sangle, px, py, p1x, p1y, p2x, p2y, p3x, p3y, p4x, p4y;
+
+    if (!surface) {
+        return -1;
+    }
+
+    if (renderer->viewport.x || renderer->viewport.y) {
+        final_rect.x = (int)(renderer->viewport.x + dstrect->x);
+        final_rect.y = (int)(renderer->viewport.y + dstrect->y);
+    } else {
+        final_rect.x = (int)dstrect->x;
+        final_rect.y = (int)dstrect->y;
+    }
+    final_rect.w = (int)dstrect->w;
+    final_rect.h = (int)dstrect->h;
+
+    surface_scaled = SDL_CreateRGBSurface(SDL_SWSURFACE, final_rect.w, final_rect.h, src->format->BitsPerPixel,
+                                          src->format->Rmask, src->format->Gmask,
+                                          src->format->Bmask, src->format->Amask );
+    if (surface_scaled) {
+        SDL_GetColorKey(src, &colorkey);
+        SDL_SetColorKey(surface_scaled, SDL_TRUE, colorkey);
+        tmp_rect = final_rect;
+        tmp_rect.x = 0;
+        tmp_rect.y = 0;
+
+        retval = SDL_BlitScaled(src, srcrect, surface_scaled, &tmp_rect);
+        if (!retval) {
+            SDLgfx_rotozoomSurfaceSizeTrig(tmp_rect.w, tmp_rect.h, -angle, &dstwidth, &dstheight, &cangle, &sangle);
+            surface_rotated = SDLgfx_rotateSurface(surface_scaled, -angle, dstwidth/2, dstheight/2, GetScaleQuality(), flip & SDL_FLIP_HORIZONTAL, flip & SDL_FLIP_VERTICAL, dstwidth, dstheight, cangle, sangle);
+            if(surface_rotated) {
+                /* Find out where the new origin is by rotating the four final_rect points around the center and then taking the extremes */
+                abscenterx = final_rect.x + (int)center->x;
+                abscentery = final_rect.y + (int)center->y;
+                /* Compensate the angle inversion to match the behaviour of the other backends */
+                sangle = -sangle;
+
+                /* Top Left */
+                px = final_rect.x - abscenterx;
+                py = final_rect.y - abscentery;
+                p1x = px * cangle - py * sangle + abscenterx;
+                p1y = px * sangle + py * cangle + abscentery;
+
+                /* Top Right */
+                px = final_rect.x + final_rect.w - abscenterx;
+                py = final_rect.y - abscentery;
+                p2x = px * cangle - py * sangle + abscenterx;
+                p2y = px * sangle + py * cangle + abscentery;
+
+                /* Bottom Left */
+                px = final_rect.x - abscenterx;
+                py = final_rect.y + final_rect.h - abscentery;
+                p3x = px * cangle - py * sangle + abscenterx;
+                p3y = px * sangle + py * cangle + abscentery;
+
+                /* Bottom Right */
+                px = final_rect.x + final_rect.w - abscenterx;
+                py = final_rect.y + final_rect.h - abscentery;
+                p4x = px * cangle - py * sangle + abscenterx;
+                p4y = px * sangle + py * cangle + abscentery;
+
+                tmp_rect.x = (int)MIN(MIN(p1x, p2x), MIN(p3x, p4x));
+                tmp_rect.y = (int)MIN(MIN(p1y, p2y), MIN(p3y, p4y));
+                tmp_rect.w = dstwidth;
+                tmp_rect.h = dstheight;
+
+                retval = SDL_BlitSurface(surface_rotated, NULL, surface, &tmp_rect);
+                SDL_FreeSurface(surface_scaled);
+                SDL_FreeSurface(surface_rotated);
+                return retval;
+            }
+        }
+        return retval;
+    }
+
+    return -1;
+}
+
+static int
+SW_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                    Uint32 format, void * pixels, int pitch)
+{
+    SDL_Surface *surface = SW_ActivateRenderer(renderer);
+    Uint32 src_format;
+    void *src_pixels;
+    SDL_Rect final_rect;
+
+    if (!surface) {
+        return -1;
+    }
+
+    if (renderer->viewport.x || renderer->viewport.y) {
+        final_rect.x = renderer->viewport.x + rect->x;
+        final_rect.y = renderer->viewport.y + rect->y;
+        final_rect.w = rect->w;
+        final_rect.h = rect->h;
+        rect = &final_rect;
+    }
+
+    if (rect->x < 0 || rect->x+rect->w > surface->w ||
+        rect->y < 0 || rect->y+rect->h > surface->h) {
+        return SDL_SetError("Tried to read outside of surface bounds");
+    }
+
+    src_format = surface->format->format;
+    src_pixels = (void*)((Uint8 *) surface->pixels +
+                    rect->y * surface->pitch +
+                    rect->x * surface->format->BytesPerPixel);
+
+    return SDL_ConvertPixels(rect->w, rect->h,
+                             src_format, src_pixels, surface->pitch,
+                             format, pixels, pitch);
+}
+
+static void
+SW_RenderPresent(SDL_Renderer * renderer)
+{
+    SDL_Window *window = renderer->window;
+
+    if (window) {
+        SDL_UpdateWindowSurface(window);
+    }
+}
+
+static void
+SW_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    SDL_Surface *surface = (SDL_Surface *) texture->driverdata;
+
+    SDL_FreeSurface(surface);
+}
+
+static void
+SW_DestroyRenderer(SDL_Renderer * renderer)
+{
+    SW_RenderData *data = (SW_RenderData *) renderer->driverdata;
+
+    SDL_free(data);
+    SDL_free(renderer);
+}
+
+#endif /* !SDL_RENDER_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_render_sw_c.h b/Source/3rd Party/sdl/src/render/software/SDL_render_sw_c.h
new file mode 100644
index 000000000..81cb656c9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_render_sw_c.h	
@@ -0,0 +1,24 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+extern SDL_Renderer * SW_CreateRendererForSurface(SDL_Surface * surface);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_rotate.c b/Source/3rd Party/sdl/src/render/software/SDL_rotate.c
new file mode 100644
index 000000000..f29d70d4f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_rotate.c	
@@ -0,0 +1,501 @@
+/*
+
+SDL_rotate.c: rotates 32bit or 8bit surfaces
+
+Shamelessly stolen from SDL_gfx by Andreas Schiffler. Original copyright follows:
+
+Copyright (C) 2001-2011  Andreas Schiffler
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+   1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+   3. This notice may not be removed or altered from any source
+   distribution.
+
+Andreas Schiffler -- aschiffler at ferzkopp dot net
+
+*/
+#include "../../SDL_internal.h"
+
+#if defined(__WIN32__)
+#include "../../core/windows/SDL_windows.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "SDL.h"
+#include "SDL_rotate.h"
+
+/* ---- Internally used structures */
+
+/* !
+\brief A 32 bit RGBA pixel.
+*/
+typedef struct tColorRGBA {
+    Uint8 r;
+    Uint8 g;
+    Uint8 b;
+    Uint8 a;
+} tColorRGBA;
+
+/* !
+\brief A 8bit Y/palette pixel.
+*/
+typedef struct tColorY {
+    Uint8 y;
+} tColorY;
+
+/* !
+\brief Returns maximum of two numbers a and b.
+*/
+#define MAX(a,b)    (((a) > (b)) ? (a) : (b))
+
+/* !
+\brief Number of guard rows added to destination surfaces.
+
+This is a simple but effective workaround for observed issues.
+These rows allocate extra memory and are then hidden from the surface.
+Rows are added to the end of destination surfaces when they are allocated.
+This catches any potential overflows which seem to happen with
+just the right src image dimensions and scale/rotation and can lead
+to a situation where the program can segfault.
+*/
+#define GUARD_ROWS (2)
+
+/* !
+\brief Lower limit of absolute zoom factor or rotation degrees.
+*/
+#define VALUE_LIMIT 0.001
+
+/* !
+\brief Returns colorkey info for a surface
+*/
+static Uint32
+_colorkey(SDL_Surface *src)
+{
+    Uint32 key = 0;
+    SDL_GetColorKey(src, &key);
+    return key;
+}
+
+
+/* !
+\brief Internal target surface sizing function for rotations with trig result return.
+
+\param width The source surface width.
+\param height The source surface height.
+\param angle The angle to rotate in degrees.
+\param dstwidth The calculated width of the destination surface.
+\param dstheight The calculated height of the destination surface.
+\param cangle The sine of the angle
+\param sangle The cosine of the angle
+
+*/
+void
+SDLgfx_rotozoomSurfaceSizeTrig(int width, int height, double angle,
+                               int *dstwidth, int *dstheight,
+                               double *cangle, double *sangle)
+{
+    double x, y, cx, cy, sx, sy;
+    double radangle;
+    int dstwidthhalf, dstheighthalf;
+
+    /*
+    * Determine destination width and height by rotating a centered source box
+    */
+    radangle = angle * (M_PI / 180.0);
+    *sangle = SDL_sin(radangle);
+    *cangle = SDL_cos(radangle);
+    x = (double)(width / 2);
+    y = (double)(height / 2);
+    cx = *cangle * x;
+    cy = *cangle * y;
+    sx = *sangle * x;
+    sy = *sangle * y;
+
+    dstwidthhalf = MAX((int)
+        SDL_ceil(MAX(MAX(MAX(SDL_fabs(cx + sy), SDL_fabs(cx - sy)), SDL_fabs(-cx + sy)), SDL_fabs(-cx - sy))), 1);
+    dstheighthalf = MAX((int)
+        SDL_ceil(MAX(MAX(MAX(SDL_fabs(sx + cy), SDL_fabs(sx - cy)), SDL_fabs(-sx + cy)), SDL_fabs(-sx - cy))), 1);
+    *dstwidth = 2 * dstwidthhalf;
+    *dstheight = 2 * dstheighthalf;
+}
+
+
+/* !
+\brief Internal 32 bit rotozoomer with optional anti-aliasing.
+
+Rotates and zooms 32 bit RGBA/ABGR 'src' surface to 'dst' surface based on the control
+parameters by scanning the destination surface and applying optionally anti-aliasing
+by bilinear interpolation.
+Assumes src and dst surfaces are of 32 bit depth.
+Assumes dst surface was allocated with the correct dimensions.
+
+\param src Source surface.
+\param dst Destination surface.
+\param cx Horizontal center coordinate.
+\param cy Vertical center coordinate.
+\param isin Integer version of sine of angle.
+\param icos Integer version of cosine of angle.
+\param flipx Flag indicating horizontal mirroring should be applied.
+\param flipy Flag indicating vertical mirroring should be applied.
+\param smooth Flag indicating anti-aliasing should be used.
+*/
+static void
+_transformSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy, int smooth)
+{
+    int x, y, t1, t2, dx, dy, xd, yd, sdx, sdy, ax, ay, ex, ey, sw, sh;
+    tColorRGBA c00, c01, c10, c11, cswap;
+    tColorRGBA *pc, *sp;
+    int gap;
+
+    /*
+    * Variable setup
+    */
+    xd = ((src->w - dst->w) << 15);
+    yd = ((src->h - dst->h) << 15);
+    ax = (cx << 16) - (icos * cx);
+    ay = (cy << 16) - (isin * cx);
+    sw = src->w - 1;
+    sh = src->h - 1;
+    pc = (tColorRGBA*) dst->pixels;
+    gap = dst->pitch - dst->w * 4;
+
+    /*
+    * Switch between interpolating and non-interpolating code
+    */
+    if (smooth) {
+        for (y = 0; y < dst->h; y++) {
+            dy = cy - y;
+            sdx = (ax + (isin * dy)) + xd;
+            sdy = (ay - (icos * dy)) + yd;
+            for (x = 0; x < dst->w; x++) {
+                dx = (sdx >> 16);
+                dy = (sdy >> 16);
+                if (flipx) dx = sw - dx;
+                if (flipy) dy = sh - dy;
+                if ((dx > -1) && (dy > -1) && (dx < (src->w-1)) && (dy < (src->h-1))) {
+                    sp = (tColorRGBA *)src->pixels;;
+                    sp += ((src->pitch/4) * dy);
+                    sp += dx;
+                    c00 = *sp;
+                    sp += 1;
+                    c01 = *sp;
+                    sp += (src->pitch/4);
+                    c11 = *sp;
+                    sp -= 1;
+                    c10 = *sp;
+                    if (flipx) {
+                        cswap = c00; c00=c01; c01=cswap;
+                        cswap = c10; c10=c11; c11=cswap;
+                    }
+                    if (flipy) {
+                        cswap = c00; c00=c10; c10=cswap;
+                        cswap = c01; c01=c11; c11=cswap;
+                    }
+                    /*
+                    * Interpolate colors
+                    */
+                    ex = (sdx & 0xffff);
+                    ey = (sdy & 0xffff);
+                    t1 = ((((c01.r - c00.r) * ex) >> 16) + c00.r) & 0xff;
+                    t2 = ((((c11.r - c10.r) * ex) >> 16) + c10.r) & 0xff;
+                    pc->r = (((t2 - t1) * ey) >> 16) + t1;
+                    t1 = ((((c01.g - c00.g) * ex) >> 16) + c00.g) & 0xff;
+                    t2 = ((((c11.g - c10.g) * ex) >> 16) + c10.g) & 0xff;
+                    pc->g = (((t2 - t1) * ey) >> 16) + t1;
+                    t1 = ((((c01.b - c00.b) * ex) >> 16) + c00.b) & 0xff;
+                    t2 = ((((c11.b - c10.b) * ex) >> 16) + c10.b) & 0xff;
+                    pc->b = (((t2 - t1) * ey) >> 16) + t1;
+                    t1 = ((((c01.a - c00.a) * ex) >> 16) + c00.a) & 0xff;
+                    t2 = ((((c11.a - c10.a) * ex) >> 16) + c10.a) & 0xff;
+                    pc->a = (((t2 - t1) * ey) >> 16) + t1;
+                }
+                sdx += icos;
+                sdy += isin;
+                pc++;
+            }
+            pc = (tColorRGBA *) ((Uint8 *) pc + gap);
+        }
+    } else {
+        for (y = 0; y < dst->h; y++) {
+            dy = cy - y;
+            sdx = (ax + (isin * dy)) + xd;
+            sdy = (ay - (icos * dy)) + yd;
+            for (x = 0; x < dst->w; x++) {
+                dx = (short) (sdx >> 16);
+                dy = (short) (sdy >> 16);
+                if (flipx) dx = (src->w-1)-dx;
+                if (flipy) dy = (src->h-1)-dy;
+                if ((dx >= 0) && (dy >= 0) && (dx < src->w) && (dy < src->h)) {
+                    sp = (tColorRGBA *) ((Uint8 *) src->pixels + src->pitch * dy);
+                    sp += dx;
+                    *pc = *sp;
+                }
+                sdx += icos;
+                sdy += isin;
+                pc++;
+            }
+            pc = (tColorRGBA *) ((Uint8 *) pc + gap);
+        }
+    }
+}
+
+/* !
+
+\brief Rotates and zooms 8 bit palette/Y 'src' surface to 'dst' surface without smoothing.
+
+Rotates and zooms 8 bit RGBA/ABGR 'src' surface to 'dst' surface based on the control
+parameters by scanning the destination surface.
+Assumes src and dst surfaces are of 8 bit depth.
+Assumes dst surface was allocated with the correct dimensions.
+
+\param src Source surface.
+\param dst Destination surface.
+\param cx Horizontal center coordinate.
+\param cy Vertical center coordinate.
+\param isin Integer version of sine of angle.
+\param icos Integer version of cosine of angle.
+\param flipx Flag indicating horizontal mirroring should be applied.
+\param flipy Flag indicating vertical mirroring should be applied.
+*/
+static void
+transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy)
+{
+    int x, y, dx, dy, xd, yd, sdx, sdy, ax, ay;
+    tColorY *pc, *sp;
+    int gap;
+
+    /*
+    * Variable setup
+    */
+    xd = ((src->w - dst->w) << 15);
+    yd = ((src->h - dst->h) << 15);
+    ax = (cx << 16) - (icos * cx);
+    ay = (cy << 16) - (isin * cx);
+    pc = (tColorY*) dst->pixels;
+    gap = dst->pitch - dst->w;
+    /*
+    * Clear surface to colorkey
+    */
+    SDL_memset(pc, (int)(_colorkey(src) & 0xff), dst->pitch * dst->h);
+    /*
+    * Iterate through destination surface
+    */
+    for (y = 0; y < dst->h; y++) {
+        dy = cy - y;
+        sdx = (ax + (isin * dy)) + xd;
+        sdy = (ay - (icos * dy)) + yd;
+        for (x = 0; x < dst->w; x++) {
+            dx = (short) (sdx >> 16);
+            dy = (short) (sdy >> 16);
+            if (flipx) dx = (src->w-1)-dx;
+            if (flipy) dy = (src->h-1)-dy;
+            if ((dx >= 0) && (dy >= 0) && (dx < src->w) && (dy < src->h)) {
+                sp = (tColorY *) (src->pixels);
+                sp += (src->pitch * dy + dx);
+                *pc = *sp;
+            }
+            sdx += icos;
+            sdy += isin;
+            pc++;
+        }
+        pc += gap;
+    }
+}
+
+
+/* !
+\brief Rotates and zooms a surface with different horizontal and vertival scaling factors and optional anti-aliasing.
+
+Rotates a 32bit or 8bit 'src' surface to newly created 'dst' surface.
+'angle' is the rotation in degrees, 'centerx' and 'centery' the rotation center. If 'smooth' is set
+then the destination 32bit surface is anti-aliased. If the surface is not 8bit
+or 32bit RGBA/ABGR it will be converted into a 32bit RGBA format on the fly.
+
+\param src The surface to rotozoom.
+\param angle The angle to rotate in degrees.
+\param centerx The horizontal coordinate of the center of rotation
+\param zoomy The vertical coordinate of the center of rotation
+\param smooth Antialiasing flag; set to SMOOTHING_ON to enable.
+\param flipx Set to 1 to flip the image horizontally
+\param flipy Set to 1 to flip the image vertically
+\param dstwidth The destination surface width
+\param dstheight The destination surface height
+\param cangle The angle cosine
+\param sangle The angle sine
+\return The new rotated surface.
+
+*/
+
+SDL_Surface *
+SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, int smooth, int flipx, int flipy, int dstwidth, int dstheight, double cangle, double sangle)
+{
+    SDL_Surface *rz_src;
+    SDL_Surface *rz_dst;
+    int is32bit;
+    int i, src_converted;
+    Uint8 r,g,b;
+    Uint32 colorkey = 0;
+    int colorKeyAvailable = 0;
+    double sangleinv, cangleinv;
+
+    /*
+    * Sanity check
+    */
+    if (src == NULL)
+        return (NULL);
+
+    if (src->flags & SDL_TRUE/* SDL_SRCCOLORKEY */)
+    {
+        colorkey = _colorkey(src);
+        SDL_GetRGB(colorkey, src->format, &r, &g, &b);
+        colorKeyAvailable = 1;
+    }
+    /*
+    * Determine if source surface is 32bit or 8bit
+    */
+    is32bit = (src->format->BitsPerPixel == 32);
+    if ((is32bit) || (src->format->BitsPerPixel == 8)) {
+        /*
+        * Use source surface 'as is'
+        */
+        rz_src = src;
+        src_converted = 0;
+    } else {
+        /*
+        * New source surface is 32bit with a defined RGBA ordering
+        */
+        rz_src =
+            SDL_CreateRGBSurface(SDL_SWSURFACE, src->w, src->h, 32,
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+            0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000
+#else
+            0xff000000,  0x00ff0000, 0x0000ff00, 0x000000ff
+#endif
+            );
+        if(colorKeyAvailable)
+            SDL_SetColorKey(src, 0, 0);
+
+        SDL_BlitSurface(src, NULL, rz_src, NULL);
+
+        if(colorKeyAvailable)
+            SDL_SetColorKey(src, SDL_TRUE /* SDL_SRCCOLORKEY */, colorkey);
+        src_converted = 1;
+        is32bit = 1;
+    }
+
+
+    /* Determine target size */
+    /* _rotozoomSurfaceSizeTrig(rz_src->w, rz_src->h, angle, &dstwidth, &dstheight, &cangle, &sangle); */
+
+    /*
+    * Calculate target factors from sin/cos and zoom
+    */
+    sangleinv = sangle*65536.0;
+    cangleinv = cangle*65536.0;
+
+    /*
+    * Alloc space to completely contain the rotated surface
+    */
+    rz_dst = NULL;
+    if (is32bit) {
+        /*
+        * Target surface is 32bit with source RGBA/ABGR ordering
+        */
+        rz_dst =
+            SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight + GUARD_ROWS, 32,
+            rz_src->format->Rmask, rz_src->format->Gmask,
+            rz_src->format->Bmask, rz_src->format->Amask);
+    } else {
+        /*
+        * Target surface is 8bit
+        */
+        rz_dst = SDL_CreateRGBSurface(SDL_SWSURFACE, dstwidth, dstheight + GUARD_ROWS, 8, 0, 0, 0, 0);
+    }
+
+    /* Check target */
+    if (rz_dst == NULL)
+        return NULL;
+
+    /* Adjust for guard rows */
+    rz_dst->h = dstheight;
+
+    if (colorKeyAvailable == 1){
+        colorkey = SDL_MapRGB(rz_dst->format, r, g, b);
+
+        SDL_FillRect(rz_dst, NULL, colorkey );
+    }
+
+    /*
+    * Lock source surface
+    */
+    if (SDL_MUSTLOCK(rz_src)) {
+        SDL_LockSurface(rz_src);
+    }
+
+    /*
+    * Check which kind of surface we have
+    */
+    if (is32bit) {
+        /*
+        * Call the 32bit transformation routine to do the rotation (using alpha)
+        */
+        _transformSurfaceRGBA(rz_src, rz_dst, centerx, centery,
+            (int) (sangleinv), (int) (cangleinv),
+            flipx, flipy,
+            smooth);
+        /*
+        * Turn on source-alpha support
+        */
+        /* SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255); */
+        SDL_SetColorKey(rz_dst, /* SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
+    } else {
+        /*
+        * Copy palette and colorkey info
+        */
+        for (i = 0; i < rz_src->format->palette->ncolors; i++) {
+            rz_dst->format->palette->colors[i] = rz_src->format->palette->colors[i];
+        }
+        rz_dst->format->palette->ncolors = rz_src->format->palette->ncolors;
+        /*
+        * Call the 8bit transformation routine to do the rotation
+        */
+        transformSurfaceY(rz_src, rz_dst, centerx, centery,
+            (int) (sangleinv), (int) (cangleinv),
+            flipx, flipy);
+        SDL_SetColorKey(rz_dst, /* SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
+    }
+    /*
+    * Unlock source surface
+    */
+    if (SDL_MUSTLOCK(rz_src)) {
+        SDL_UnlockSurface(rz_src);
+    }
+
+    /*
+    * Cleanup temp surface
+    */
+    if (src_converted) {
+        SDL_FreeSurface(rz_src);
+    }
+
+    /*
+    * Return destination surface
+    */
+    return (rz_dst);
+}
diff --git a/Source/3rd Party/sdl/src/render/software/SDL_rotate.h b/Source/3rd Party/sdl/src/render/software/SDL_rotate.h
new file mode 100644
index 000000000..e92c3b77f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/render/software/SDL_rotate.h	
@@ -0,0 +1,28 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef MIN
+#define MIN(a,b)    (((a) < (b)) ? (a) : (b))
+#endif
+
+extern SDL_Surface *SDLgfx_rotateSurface(SDL_Surface * src, double angle, int centerx, int centery, int smooth, int flipx, int flipy, int dstwidth, int dstheight, double cangle, double sangle);
+extern void SDLgfx_rotozoomSurfaceSizeTrig(int width, int height, double angle, int *dstwidth, int *dstheight, double *cangle, double *sangle);
+
diff --git a/Source/3rd Party/sdl/src/stdlib/SDL_getenv.c b/Source/3rd Party/sdl/src/stdlib/SDL_getenv.c
new file mode 100644
index 000000000..449211064
--- /dev/null
+++ b/Source/3rd Party/sdl/src/stdlib/SDL_getenv.c	
@@ -0,0 +1,272 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#if defined(__WIN32__)
+#include "../core/windows/SDL_windows.h"
+#endif
+
+#include "SDL_stdinc.h"
+
+#if defined(__WIN32__) && (!defined(HAVE_SETENV) || !defined(HAVE_GETENV))
+/* Note this isn't thread-safe! */
+static char *SDL_envmem = NULL; /* Ugh, memory leak */
+static size_t SDL_envmemlen = 0;
+#endif
+
+/* Put a variable into the environment */
+#if defined(HAVE_SETENV)
+int
+SDL_setenv(const char *name, const char *value, int overwrite)
+{
+    return setenv(name, value, overwrite);
+}
+#elif defined(__WIN32__)
+int
+SDL_setenv(const char *name, const char *value, int overwrite)
+{
+    if (!overwrite) {
+        char ch = 0;
+        const size_t len = GetEnvironmentVariableA(name, &ch, sizeof (ch));
+        if (len > 0) {
+            return 0;  /* asked not to overwrite existing value. */
+        }
+    }
+    if (!SetEnvironmentVariableA(name, *value ? value : NULL)) {
+        return -1;
+    }
+    return 0;
+}
+/* We have a real environment table, but no real setenv? Fake it w/ putenv. */
+#elif (defined(HAVE_GETENV) && defined(HAVE_PUTENV) && !defined(HAVE_SETENV))
+int
+SDL_setenv(const char *name, const char *value, int overwrite)
+{
+    size_t len;
+    char *new_variable;
+
+    if (getenv(name) != NULL) {
+        if (overwrite) {
+            unsetenv(name);
+        } else {
+            return 0;  /* leave the existing one there. */
+        }
+    }
+
+    /* This leaks. Sorry. Get a better OS so we don't have to do this. */
+    len = SDL_strlen(name) + SDL_strlen(value) + 2;
+    new_variable = (char *) SDL_malloc(len);
+    if (!new_variable) {
+        return (-1);
+    }
+
+    SDL_snprintf(new_variable, len, "%s=%s", name, value);
+    return putenv(new_variable);
+}
+#else /* roll our own */
+static char **SDL_env = (char **) 0;
+int
+SDL_setenv(const char *name, const char *value, int overwrite)
+{
+    int added;
+    int len, i;
+    char **new_env;
+    char *new_variable;
+
+    /* A little error checking */
+    if (!name || !value) {
+        return (-1);
+    }
+
+    /* See if it already exists */
+    if (!overwrite && SDL_getenv(name)) {
+        return 0;
+    }
+
+    /* Allocate memory for the variable */
+    len = SDL_strlen(name) + SDL_strlen(value) + 2;
+    new_variable = (char *) SDL_malloc(len);
+    if (!new_variable) {
+        return (-1);
+    }
+
+    SDL_snprintf(new_variable, len, "%s=%s", name, value);
+    value = new_variable + SDL_strlen(name) + 1;
+    name = new_variable;
+
+    /* Actually put it into the environment */
+    added = 0;
+    i = 0;
+    if (SDL_env) {
+        /* Check to see if it's already there... */
+        len = (value - name);
+        for (; SDL_env[i]; ++i) {
+            if (SDL_strncmp(SDL_env[i], name, len) == 0) {
+                break;
+            }
+        }
+        /* If we found it, just replace the entry */
+        if (SDL_env[i]) {
+            SDL_free(SDL_env[i]);
+            SDL_env[i] = new_variable;
+            added = 1;
+        }
+    }
+
+    /* Didn't find it in the environment, expand and add */
+    if (!added) {
+        new_env = SDL_realloc(SDL_env, (i + 2) * sizeof(char *));
+        if (new_env) {
+            SDL_env = new_env;
+            SDL_env[i++] = new_variable;
+            SDL_env[i++] = (char *) 0;
+            added = 1;
+        } else {
+            SDL_free(new_variable);
+        }
+    }
+    return (added ? 0 : -1);
+}
+#endif
+
+/* Retrieve a variable named "name" from the environment */
+#if defined(HAVE_GETENV)
+char *
+SDL_getenv(const char *name)
+{
+    return getenv(name);
+}
+#elif defined(__WIN32__)
+char *
+SDL_getenv(const char *name)
+{
+    size_t bufferlen;
+
+    bufferlen =
+        GetEnvironmentVariableA(name, SDL_envmem, (DWORD) SDL_envmemlen);
+    if (bufferlen == 0) {
+        return NULL;
+    }
+    if (bufferlen > SDL_envmemlen) {
+        char *newmem = (char *) SDL_realloc(SDL_envmem, bufferlen);
+        if (newmem == NULL) {
+            return NULL;
+        }
+        SDL_envmem = newmem;
+        SDL_envmemlen = bufferlen;
+        GetEnvironmentVariableA(name, SDL_envmem, (DWORD) SDL_envmemlen);
+    }
+    return SDL_envmem;
+}
+#else
+char *
+SDL_getenv(const char *name)
+{
+    int len, i;
+    char *value;
+
+    value = (char *) 0;
+    if (SDL_env) {
+        len = SDL_strlen(name);
+        for (i = 0; SDL_env[i] && !value; ++i) {
+            if ((SDL_strncmp(SDL_env[i], name, len) == 0) &&
+                (SDL_env[i][len] == '=')) {
+                value = &SDL_env[i][len + 1];
+            }
+        }
+    }
+    return value;
+}
+#endif
+
+
+#ifdef TEST_MAIN
+#include <stdio.h>
+
+int
+main(int argc, char *argv[])
+{
+    char *value;
+
+    printf("Checking for non-existent variable... ");
+    fflush(stdout);
+    if (!SDL_getenv("EXISTS")) {
+        printf("okay\n");
+    } else {
+        printf("failed\n");
+    }
+    printf("Setting FIRST=VALUE1 in the environment... ");
+    fflush(stdout);
+    if (SDL_setenv("FIRST", "VALUE1", 0) == 0) {
+        printf("okay\n");
+    } else {
+        printf("failed\n");
+    }
+    printf("Getting FIRST from the environment... ");
+    fflush(stdout);
+    value = SDL_getenv("FIRST");
+    if (value && (SDL_strcmp(value, "VALUE1") == 0)) {
+        printf("okay\n");
+    } else {
+        printf("failed\n");
+    }
+    printf("Setting SECOND=VALUE2 in the environment... ");
+    fflush(stdout);
+    if (SDL_setenv("SECOND", "VALUE2", 0) == 0) {
+        printf("okay\n");
+    } else {
+        printf("failed\n");
+    }
+    printf("Getting SECOND from the environment... ");
+    fflush(stdout);
+    value = SDL_getenv("SECOND");
+    if (value && (SDL_strcmp(value, "VALUE2") == 0)) {
+        printf("okay\n");
+    } else {
+        printf("failed\n");
+    }
+    printf("Setting FIRST=NOVALUE in the environment... ");
+    fflush(stdout);
+    if (SDL_setenv("FIRST", "NOVALUE", 1) == 0) {
+        printf("okay\n");
+    } else {
+        printf("failed\n");
+    }
+    printf("Getting FIRST from the environment... ");
+    fflush(stdout);
+    value = SDL_getenv("FIRST");
+    if (value && (SDL_strcmp(value, "NOVALUE") == 0)) {
+        printf("okay\n");
+    } else {
+        printf("failed\n");
+    }
+    printf("Checking for non-existent variable... ");
+    fflush(stdout);
+    if (!SDL_getenv("EXISTS")) {
+        printf("okay\n");
+    } else {
+        printf("failed\n");
+    }
+    return (0);
+}
+#endif /* TEST_MAIN */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/stdlib/SDL_iconv.c b/Source/3rd Party/sdl/src/stdlib/SDL_iconv.c
new file mode 100644
index 000000000..c314bf682
--- /dev/null
+++ b/Source/3rd Party/sdl/src/stdlib/SDL_iconv.c	
@@ -0,0 +1,924 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This file contains portable iconv functions for SDL */
+
+#include "SDL_stdinc.h"
+#include "SDL_endian.h"
+
+#ifdef HAVE_ICONV
+
+/* Depending on which standard the iconv() was implemented with,
+   iconv() may or may not use const char ** for the inbuf param.
+   If we get this wrong, it's just a warning, so no big deal.
+*/
+#if defined(_XGP6) || defined(__APPLE__) || \
+    (defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)))
+#define ICONV_INBUF_NONCONST
+#endif
+
+#include <errno.h>
+
+SDL_COMPILE_TIME_ASSERT(iconv_t, sizeof (iconv_t) <= sizeof (SDL_iconv_t));
+
+SDL_iconv_t
+SDL_iconv_open(const char *tocode, const char *fromcode)
+{
+    return (SDL_iconv_t) ((size_t) iconv_open(tocode, fromcode));
+}
+
+int
+SDL_iconv_close(SDL_iconv_t cd)
+{
+    return iconv_close((iconv_t) ((size_t) cd));
+}
+
+size_t
+SDL_iconv(SDL_iconv_t cd,
+          const char **inbuf, size_t * inbytesleft,
+          char **outbuf, size_t * outbytesleft)
+{
+    size_t retCode;
+#ifdef ICONV_INBUF_NONCONST
+    retCode = iconv((iconv_t) ((size_t) cd), (char **) inbuf, inbytesleft, outbuf, outbytesleft);
+#else
+    retCode = iconv((iconv_t) ((size_t) cd), inbuf, inbytesleft, outbuf, outbytesleft);
+#endif
+    if (retCode == (size_t) - 1) {
+        switch (errno) {
+        case E2BIG:
+            return SDL_ICONV_E2BIG;
+        case EILSEQ:
+            return SDL_ICONV_EILSEQ;
+        case EINVAL:
+            return SDL_ICONV_EINVAL;
+        default:
+            return SDL_ICONV_ERROR;
+        }
+    }
+    return retCode;
+}
+
+#else
+
+/* Lots of useful information on Unicode at:
+	http://www.cl.cam.ac.uk/~mgk25/unicode.html
+*/
+
+#define UNICODE_BOM	0xFEFF
+
+#define UNKNOWN_ASCII	'?'
+#define UNKNOWN_UNICODE	0xFFFD
+
+enum
+{
+    ENCODING_UNKNOWN,
+    ENCODING_ASCII,
+    ENCODING_LATIN1,
+    ENCODING_UTF8,
+    ENCODING_UTF16,             /* Needs byte order marker */
+    ENCODING_UTF16BE,
+    ENCODING_UTF16LE,
+    ENCODING_UTF32,             /* Needs byte order marker */
+    ENCODING_UTF32BE,
+    ENCODING_UTF32LE,
+    ENCODING_UCS2BE,
+    ENCODING_UCS2LE,
+    ENCODING_UCS4BE,
+    ENCODING_UCS4LE,
+};
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+#define ENCODING_UTF16NATIVE	ENCODING_UTF16BE
+#define ENCODING_UTF32NATIVE	ENCODING_UTF32BE
+#define ENCODING_UCS2NATIVE     ENCODING_UCS2BE
+#define ENCODING_UCS4NATIVE     ENCODING_UCS4BE
+#else
+#define ENCODING_UTF16NATIVE	ENCODING_UTF16LE
+#define ENCODING_UTF32NATIVE	ENCODING_UTF32LE
+#define ENCODING_UCS2NATIVE     ENCODING_UCS2LE
+#define ENCODING_UCS4NATIVE     ENCODING_UCS4LE
+#endif
+
+struct _SDL_iconv_t
+{
+    int src_fmt;
+    int dst_fmt;
+};
+
+static struct
+{
+    const char *name;
+    int format;
+} encodings[] = {
+/* *INDENT-OFF* */
+    { "ASCII", ENCODING_ASCII },
+    { "US-ASCII", ENCODING_ASCII },
+    { "8859-1", ENCODING_LATIN1 },
+    { "ISO-8859-1", ENCODING_LATIN1 },
+    { "UTF8", ENCODING_UTF8 },
+    { "UTF-8", ENCODING_UTF8 },
+    { "UTF16", ENCODING_UTF16 },
+    { "UTF-16", ENCODING_UTF16 },
+    { "UTF16BE", ENCODING_UTF16BE },
+    { "UTF-16BE", ENCODING_UTF16BE },
+    { "UTF16LE", ENCODING_UTF16LE },
+    { "UTF-16LE", ENCODING_UTF16LE },
+    { "UTF32", ENCODING_UTF32 },
+    { "UTF-32", ENCODING_UTF32 },
+    { "UTF32BE", ENCODING_UTF32BE },
+    { "UTF-32BE", ENCODING_UTF32BE },
+    { "UTF32LE", ENCODING_UTF32LE },
+    { "UTF-32LE", ENCODING_UTF32LE },
+    { "UCS2", ENCODING_UCS2BE },
+    { "UCS-2", ENCODING_UCS2BE },
+    { "UCS-2LE", ENCODING_UCS2LE },
+    { "UCS-2BE", ENCODING_UCS2BE },
+    { "UCS-2-INTERNAL", ENCODING_UCS2NATIVE },
+    { "UCS4", ENCODING_UCS4BE },
+    { "UCS-4", ENCODING_UCS4BE },
+    { "UCS-4LE", ENCODING_UCS4LE },
+    { "UCS-4BE", ENCODING_UCS4BE },
+    { "UCS-4-INTERNAL", ENCODING_UCS4NATIVE },
+/* *INDENT-ON* */
+};
+
+static const char *
+getlocale(char *buffer, size_t bufsize)
+{
+    const char *lang;
+    char *ptr;
+
+    lang = SDL_getenv("LC_ALL");
+    if (!lang) {
+        lang = SDL_getenv("LC_CTYPE");
+    }
+    if (!lang) {
+        lang = SDL_getenv("LC_MESSAGES");
+    }
+    if (!lang) {
+        lang = SDL_getenv("LANG");
+    }
+    if (!lang || !*lang || SDL_strcmp(lang, "C") == 0) {
+        lang = "ASCII";
+    }
+
+    /* We need to trim down strings like "en_US.UTF-8@blah" to "UTF-8" */
+    ptr = SDL_strchr(lang, '.');
+    if (ptr != NULL) {
+        lang = ptr + 1;
+    }
+
+    SDL_strlcpy(buffer, lang, bufsize);
+    ptr = SDL_strchr(buffer, '@');
+    if (ptr != NULL) {
+        *ptr = '\0';            /* chop end of string. */
+    }
+
+    return buffer;
+}
+
+SDL_iconv_t
+SDL_iconv_open(const char *tocode, const char *fromcode)
+{
+    int src_fmt = ENCODING_UNKNOWN;
+    int dst_fmt = ENCODING_UNKNOWN;
+    int i;
+    char fromcode_buffer[64];
+    char tocode_buffer[64];
+
+    if (!fromcode || !*fromcode) {
+        fromcode = getlocale(fromcode_buffer, sizeof(fromcode_buffer));
+    }
+    if (!tocode || !*tocode) {
+        tocode = getlocale(tocode_buffer, sizeof(tocode_buffer));
+    }
+    for (i = 0; i < SDL_arraysize(encodings); ++i) {
+        if (SDL_strcasecmp(fromcode, encodings[i].name) == 0) {
+            src_fmt = encodings[i].format;
+            if (dst_fmt != ENCODING_UNKNOWN) {
+                break;
+            }
+        }
+        if (SDL_strcasecmp(tocode, encodings[i].name) == 0) {
+            dst_fmt = encodings[i].format;
+            if (src_fmt != ENCODING_UNKNOWN) {
+                break;
+            }
+        }
+    }
+    if (src_fmt != ENCODING_UNKNOWN && dst_fmt != ENCODING_UNKNOWN) {
+        SDL_iconv_t cd = (SDL_iconv_t) SDL_malloc(sizeof(*cd));
+        if (cd) {
+            cd->src_fmt = src_fmt;
+            cd->dst_fmt = dst_fmt;
+            return cd;
+        }
+    }
+    return (SDL_iconv_t) - 1;
+}
+
+size_t
+SDL_iconv(SDL_iconv_t cd,
+          const char **inbuf, size_t * inbytesleft,
+          char **outbuf, size_t * outbytesleft)
+{
+    /* For simplicity, we'll convert everything to and from UCS-4 */
+    const char *src;
+    char *dst;
+    size_t srclen, dstlen;
+    Uint32 ch = 0;
+    size_t total;
+
+    if (!inbuf || !*inbuf) {
+        /* Reset the context */
+        return 0;
+    }
+    if (!outbuf || !*outbuf || !outbytesleft || !*outbytesleft) {
+        return SDL_ICONV_E2BIG;
+    }
+    src = *inbuf;
+    srclen = (inbytesleft ? *inbytesleft : 0);
+    dst = *outbuf;
+    dstlen = *outbytesleft;
+
+    switch (cd->src_fmt) {
+    case ENCODING_UTF16:
+        /* Scan for a byte order marker */
+        {
+            Uint8 *p = (Uint8 *) src;
+            size_t n = srclen / 2;
+            while (n) {
+                if (p[0] == 0xFF && p[1] == 0xFE) {
+                    cd->src_fmt = ENCODING_UTF16BE;
+                    break;
+                } else if (p[0] == 0xFE && p[1] == 0xFF) {
+                    cd->src_fmt = ENCODING_UTF16LE;
+                    break;
+                }
+                p += 2;
+                --n;
+            }
+            if (n == 0) {
+                /* We can't tell, default to host order */
+                cd->src_fmt = ENCODING_UTF16NATIVE;
+            }
+        }
+        break;
+    case ENCODING_UTF32:
+        /* Scan for a byte order marker */
+        {
+            Uint8 *p = (Uint8 *) src;
+            size_t n = srclen / 4;
+            while (n) {
+                if (p[0] == 0xFF && p[1] == 0xFE &&
+                    p[2] == 0x00 && p[3] == 0x00) {
+                    cd->src_fmt = ENCODING_UTF32BE;
+                    break;
+                } else if (p[0] == 0x00 && p[1] == 0x00 &&
+                           p[2] == 0xFE && p[3] == 0xFF) {
+                    cd->src_fmt = ENCODING_UTF32LE;
+                    break;
+                }
+                p += 4;
+                --n;
+            }
+            if (n == 0) {
+                /* We can't tell, default to host order */
+                cd->src_fmt = ENCODING_UTF32NATIVE;
+            }
+        }
+        break;
+    }
+
+    switch (cd->dst_fmt) {
+    case ENCODING_UTF16:
+        /* Default to host order, need to add byte order marker */
+        if (dstlen < 2) {
+            return SDL_ICONV_E2BIG;
+        }
+        *(Uint16 *) dst = UNICODE_BOM;
+        dst += 2;
+        dstlen -= 2;
+        cd->dst_fmt = ENCODING_UTF16NATIVE;
+        break;
+    case ENCODING_UTF32:
+        /* Default to host order, need to add byte order marker */
+        if (dstlen < 4) {
+            return SDL_ICONV_E2BIG;
+        }
+        *(Uint32 *) dst = UNICODE_BOM;
+        dst += 4;
+        dstlen -= 4;
+        cd->dst_fmt = ENCODING_UTF32NATIVE;
+        break;
+    }
+
+    total = 0;
+    while (srclen > 0) {
+        /* Decode a character */
+        switch (cd->src_fmt) {
+        case ENCODING_ASCII:
+            {
+                Uint8 *p = (Uint8 *) src;
+                ch = (Uint32) (p[0] & 0x7F);
+                ++src;
+                --srclen;
+            }
+            break;
+        case ENCODING_LATIN1:
+            {
+                Uint8 *p = (Uint8 *) src;
+                ch = (Uint32) p[0];
+                ++src;
+                --srclen;
+            }
+            break;
+        case ENCODING_UTF8:    /* RFC 3629 */
+            {
+                Uint8 *p = (Uint8 *) src;
+                size_t left = 0;
+                SDL_bool overlong = SDL_FALSE;
+                if (p[0] >= 0xFC) {
+                    if ((p[0] & 0xFE) != 0xFC) {
+                        /* Skip illegal sequences
+                           return SDL_ICONV_EILSEQ;
+                         */
+                        ch = UNKNOWN_UNICODE;
+                    } else {
+                        if (p[0] == 0xFC && srclen > 1 && (p[1] & 0xFC) == 0x80) {
+                            overlong = SDL_TRUE;
+                        }
+                        ch = (Uint32) (p[0] & 0x01);
+                        left = 5;
+                    }
+                } else if (p[0] >= 0xF8) {
+                    if ((p[0] & 0xFC) != 0xF8) {
+                        /* Skip illegal sequences
+                           return SDL_ICONV_EILSEQ;
+                         */
+                        ch = UNKNOWN_UNICODE;
+                    } else {
+                        if (p[0] == 0xF8 && srclen > 1 && (p[1] & 0xF8) == 0x80) {
+                            overlong = SDL_TRUE;
+                        }
+                        ch = (Uint32) (p[0] & 0x03);
+                        left = 4;
+                    }
+                } else if (p[0] >= 0xF0) {
+                    if ((p[0] & 0xF8) != 0xF0) {
+                        /* Skip illegal sequences
+                           return SDL_ICONV_EILSEQ;
+                         */
+                        ch = UNKNOWN_UNICODE;
+                    } else {
+                        if (p[0] == 0xF0 && srclen > 1 && (p[1] & 0xF0) == 0x80) {
+                            overlong = SDL_TRUE;
+                        }
+                        ch = (Uint32) (p[0] & 0x07);
+                        left = 3;
+                    }
+                } else if (p[0] >= 0xE0) {
+                    if ((p[0] & 0xF0) != 0xE0) {
+                        /* Skip illegal sequences
+                           return SDL_ICONV_EILSEQ;
+                         */
+                        ch = UNKNOWN_UNICODE;
+                    } else {
+                        if (p[0] == 0xE0 && srclen > 1 && (p[1] & 0xE0) == 0x80) {
+                            overlong = SDL_TRUE;
+                        }
+                        ch = (Uint32) (p[0] & 0x0F);
+                        left = 2;
+                    }
+                } else if (p[0] >= 0xC0) {
+                    if ((p[0] & 0xE0) != 0xC0) {
+                        /* Skip illegal sequences
+                           return SDL_ICONV_EILSEQ;
+                         */
+                        ch = UNKNOWN_UNICODE;
+                    } else {
+                        if ((p[0] & 0xDE) == 0xC0) {
+                            overlong = SDL_TRUE;
+                        }
+                        ch = (Uint32) (p[0] & 0x1F);
+                        left = 1;
+                    }
+                } else {
+                    if ((p[0] & 0x80) != 0x00) {
+                        /* Skip illegal sequences
+                           return SDL_ICONV_EILSEQ;
+                         */
+                        ch = UNKNOWN_UNICODE;
+                    } else {
+                        ch = (Uint32) p[0];
+                    }
+                }
+                ++src;
+                --srclen;
+                if (srclen < left) {
+                    return SDL_ICONV_EINVAL;
+                }
+                while (left--) {
+                    ++p;
+                    if ((p[0] & 0xC0) != 0x80) {
+                        /* Skip illegal sequences
+                           return SDL_ICONV_EILSEQ;
+                         */
+                        ch = UNKNOWN_UNICODE;
+                        break;
+                    }
+                    ch <<= 6;
+                    ch |= (p[0] & 0x3F);
+                    ++src;
+                    --srclen;
+                }
+                if (overlong) {
+                    /* Potential security risk
+                       return SDL_ICONV_EILSEQ;
+                     */
+                    ch = UNKNOWN_UNICODE;
+                }
+                if ((ch >= 0xD800 && ch <= 0xDFFF) ||
+                    (ch == 0xFFFE || ch == 0xFFFF) || ch > 0x10FFFF) {
+                    /* Skip illegal sequences
+                       return SDL_ICONV_EILSEQ;
+                     */
+                    ch = UNKNOWN_UNICODE;
+                }
+            }
+            break;
+        case ENCODING_UTF16BE: /* RFC 2781 */
+            {
+                Uint8 *p = (Uint8 *) src;
+                Uint16 W1, W2;
+                if (srclen < 2) {
+                    return SDL_ICONV_EINVAL;
+                }
+                W1 = ((Uint16) p[0] << 8) | (Uint16) p[1];
+                src += 2;
+                srclen -= 2;
+                if (W1 < 0xD800 || W1 > 0xDFFF) {
+                    ch = (Uint32) W1;
+                    break;
+                }
+                if (W1 > 0xDBFF) {
+                    /* Skip illegal sequences
+                       return SDL_ICONV_EILSEQ;
+                     */
+                    ch = UNKNOWN_UNICODE;
+                    break;
+                }
+                if (srclen < 2) {
+                    return SDL_ICONV_EINVAL;
+                }
+                p = (Uint8 *) src;
+                W2 = ((Uint16) p[0] << 8) | (Uint16) p[1];
+                src += 2;
+                srclen -= 2;
+                if (W2 < 0xDC00 || W2 > 0xDFFF) {
+                    /* Skip illegal sequences
+                       return SDL_ICONV_EILSEQ;
+                     */
+                    ch = UNKNOWN_UNICODE;
+                    break;
+                }
+                ch = (((Uint32) (W1 & 0x3FF) << 10) |
+                      (Uint32) (W2 & 0x3FF)) + 0x10000;
+            }
+            break;
+        case ENCODING_UTF16LE: /* RFC 2781 */
+            {
+                Uint8 *p = (Uint8 *) src;
+                Uint16 W1, W2;
+                if (srclen < 2) {
+                    return SDL_ICONV_EINVAL;
+                }
+                W1 = ((Uint16) p[1] << 8) | (Uint16) p[0];
+                src += 2;
+                srclen -= 2;
+                if (W1 < 0xD800 || W1 > 0xDFFF) {
+                    ch = (Uint32) W1;
+                    break;
+                }
+                if (W1 > 0xDBFF) {
+                    /* Skip illegal sequences
+                       return SDL_ICONV_EILSEQ;
+                     */
+                    ch = UNKNOWN_UNICODE;
+                    break;
+                }
+                if (srclen < 2) {
+                    return SDL_ICONV_EINVAL;
+                }
+                p = (Uint8 *) src;
+                W2 = ((Uint16) p[1] << 8) | (Uint16) p[0];
+                src += 2;
+                srclen -= 2;
+                if (W2 < 0xDC00 || W2 > 0xDFFF) {
+                    /* Skip illegal sequences
+                       return SDL_ICONV_EILSEQ;
+                     */
+                    ch = UNKNOWN_UNICODE;
+                    break;
+                }
+                ch = (((Uint32) (W1 & 0x3FF) << 10) |
+                      (Uint32) (W2 & 0x3FF)) + 0x10000;
+            }
+            break;
+        case ENCODING_UCS2LE:
+            {
+                Uint8 *p = (Uint8 *) src;
+                if (srclen < 2) {
+                    return SDL_ICONV_EINVAL;
+                }
+                ch = ((Uint32) p[1] << 8) | (Uint32) p[0];
+                src += 2;
+                srclen -= 2;
+            }
+            break;
+        case ENCODING_UCS2BE:
+            {
+                Uint8 *p = (Uint8 *) src;
+                if (srclen < 2) {
+                    return SDL_ICONV_EINVAL;
+                }
+                ch = ((Uint32) p[0] << 8) | (Uint32) p[1];
+                src += 2;
+                srclen -= 2;
+            }
+            break;
+        case ENCODING_UCS4BE:
+        case ENCODING_UTF32BE:
+            {
+                Uint8 *p = (Uint8 *) src;
+                if (srclen < 4) {
+                    return SDL_ICONV_EINVAL;
+                }
+                ch = ((Uint32) p[0] << 24) |
+                    ((Uint32) p[1] << 16) |
+                    ((Uint32) p[2] << 8) | (Uint32) p[3];
+                src += 4;
+                srclen -= 4;
+            }
+            break;
+        case ENCODING_UCS4LE:
+        case ENCODING_UTF32LE:
+            {
+                Uint8 *p = (Uint8 *) src;
+                if (srclen < 4) {
+                    return SDL_ICONV_EINVAL;
+                }
+                ch = ((Uint32) p[3] << 24) |
+                    ((Uint32) p[2] << 16) |
+                    ((Uint32) p[1] << 8) | (Uint32) p[0];
+                src += 4;
+                srclen -= 4;
+            }
+            break;
+        }
+
+        /* Encode a character */
+        switch (cd->dst_fmt) {
+        case ENCODING_ASCII:
+            {
+                Uint8 *p = (Uint8 *) dst;
+                if (dstlen < 1) {
+                    return SDL_ICONV_E2BIG;
+                }
+                if (ch > 0x7F) {
+                    *p = UNKNOWN_ASCII;
+                } else {
+                    *p = (Uint8) ch;
+                }
+                ++dst;
+                --dstlen;
+            }
+            break;
+        case ENCODING_LATIN1:
+            {
+                Uint8 *p = (Uint8 *) dst;
+                if (dstlen < 1) {
+                    return SDL_ICONV_E2BIG;
+                }
+                if (ch > 0xFF) {
+                    *p = UNKNOWN_ASCII;
+                } else {
+                    *p = (Uint8) ch;
+                }
+                ++dst;
+                --dstlen;
+            }
+            break;
+        case ENCODING_UTF8:    /* RFC 3629 */
+            {
+                Uint8 *p = (Uint8 *) dst;
+                if (ch > 0x10FFFF) {
+                    ch = UNKNOWN_UNICODE;
+                }
+                if (ch <= 0x7F) {
+                    if (dstlen < 1) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    *p = (Uint8) ch;
+                    ++dst;
+                    --dstlen;
+                } else if (ch <= 0x7FF) {
+                    if (dstlen < 2) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    p[0] = 0xC0 | (Uint8) ((ch >> 6) & 0x1F);
+                    p[1] = 0x80 | (Uint8) (ch & 0x3F);
+                    dst += 2;
+                    dstlen -= 2;
+                } else if (ch <= 0xFFFF) {
+                    if (dstlen < 3) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    p[0] = 0xE0 | (Uint8) ((ch >> 12) & 0x0F);
+                    p[1] = 0x80 | (Uint8) ((ch >> 6) & 0x3F);
+                    p[2] = 0x80 | (Uint8) (ch & 0x3F);
+                    dst += 3;
+                    dstlen -= 3;
+                } else if (ch <= 0x1FFFFF) {
+                    if (dstlen < 4) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    p[0] = 0xF0 | (Uint8) ((ch >> 18) & 0x07);
+                    p[1] = 0x80 | (Uint8) ((ch >> 12) & 0x3F);
+                    p[2] = 0x80 | (Uint8) ((ch >> 6) & 0x3F);
+                    p[3] = 0x80 | (Uint8) (ch & 0x3F);
+                    dst += 4;
+                    dstlen -= 4;
+                } else if (ch <= 0x3FFFFFF) {
+                    if (dstlen < 5) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    p[0] = 0xF8 | (Uint8) ((ch >> 24) & 0x03);
+                    p[1] = 0x80 | (Uint8) ((ch >> 18) & 0x3F);
+                    p[2] = 0x80 | (Uint8) ((ch >> 12) & 0x3F);
+                    p[3] = 0x80 | (Uint8) ((ch >> 6) & 0x3F);
+                    p[4] = 0x80 | (Uint8) (ch & 0x3F);
+                    dst += 5;
+                    dstlen -= 5;
+                } else {
+                    if (dstlen < 6) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    p[0] = 0xFC | (Uint8) ((ch >> 30) & 0x01);
+                    p[1] = 0x80 | (Uint8) ((ch >> 24) & 0x3F);
+                    p[2] = 0x80 | (Uint8) ((ch >> 18) & 0x3F);
+                    p[3] = 0x80 | (Uint8) ((ch >> 12) & 0x3F);
+                    p[4] = 0x80 | (Uint8) ((ch >> 6) & 0x3F);
+                    p[5] = 0x80 | (Uint8) (ch & 0x3F);
+                    dst += 6;
+                    dstlen -= 6;
+                }
+            }
+            break;
+        case ENCODING_UTF16BE: /* RFC 2781 */
+            {
+                Uint8 *p = (Uint8 *) dst;
+                if (ch > 0x10FFFF) {
+                    ch = UNKNOWN_UNICODE;
+                }
+                if (ch < 0x10000) {
+                    if (dstlen < 2) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    p[0] = (Uint8) (ch >> 8);
+                    p[1] = (Uint8) ch;
+                    dst += 2;
+                    dstlen -= 2;
+                } else {
+                    Uint16 W1, W2;
+                    if (dstlen < 4) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    ch = ch - 0x10000;
+                    W1 = 0xD800 | (Uint16) ((ch >> 10) & 0x3FF);
+                    W2 = 0xDC00 | (Uint16) (ch & 0x3FF);
+                    p[0] = (Uint8) (W1 >> 8);
+                    p[1] = (Uint8) W1;
+                    p[2] = (Uint8) (W2 >> 8);
+                    p[3] = (Uint8) W2;
+                    dst += 4;
+                    dstlen -= 4;
+                }
+            }
+            break;
+        case ENCODING_UTF16LE: /* RFC 2781 */
+            {
+                Uint8 *p = (Uint8 *) dst;
+                if (ch > 0x10FFFF) {
+                    ch = UNKNOWN_UNICODE;
+                }
+                if (ch < 0x10000) {
+                    if (dstlen < 2) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    p[1] = (Uint8) (ch >> 8);
+                    p[0] = (Uint8) ch;
+                    dst += 2;
+                    dstlen -= 2;
+                } else {
+                    Uint16 W1, W2;
+                    if (dstlen < 4) {
+                        return SDL_ICONV_E2BIG;
+                    }
+                    ch = ch - 0x10000;
+                    W1 = 0xD800 | (Uint16) ((ch >> 10) & 0x3FF);
+                    W2 = 0xDC00 | (Uint16) (ch & 0x3FF);
+                    p[1] = (Uint8) (W1 >> 8);
+                    p[0] = (Uint8) W1;
+                    p[3] = (Uint8) (W2 >> 8);
+                    p[2] = (Uint8) W2;
+                    dst += 4;
+                    dstlen -= 4;
+                }
+            }
+            break;
+        case ENCODING_UCS2BE:
+            {
+                Uint8 *p = (Uint8 *) dst;
+                if (ch > 0xFFFF) {
+                    ch = UNKNOWN_UNICODE;
+                }
+                if (dstlen < 2) {
+                    return SDL_ICONV_E2BIG;
+                }
+                p[0] = (Uint8) (ch >> 8);
+                p[1] = (Uint8) ch;
+                dst += 2;
+                dstlen -= 2;
+            }
+            break;
+        case ENCODING_UCS2LE:
+            {
+                Uint8 *p = (Uint8 *) dst;
+                if (ch > 0xFFFF) {
+                    ch = UNKNOWN_UNICODE;
+                }
+                if (dstlen < 2) {
+                    return SDL_ICONV_E2BIG;
+                }
+                p[1] = (Uint8) (ch >> 8);
+                p[0] = (Uint8) ch;
+                dst += 2;
+                dstlen -= 2;
+            }
+            break;
+        case ENCODING_UTF32BE:
+            if (ch > 0x10FFFF) {
+                ch = UNKNOWN_UNICODE;
+            }
+        case ENCODING_UCS4BE:
+            if (ch > 0x7FFFFFFF) {
+                ch = UNKNOWN_UNICODE;
+            }
+            {
+                Uint8 *p = (Uint8 *) dst;
+                if (dstlen < 4) {
+                    return SDL_ICONV_E2BIG;
+                }
+                p[0] = (Uint8) (ch >> 24);
+                p[1] = (Uint8) (ch >> 16);
+                p[2] = (Uint8) (ch >> 8);
+                p[3] = (Uint8) ch;
+                dst += 4;
+                dstlen -= 4;
+            }
+            break;
+        case ENCODING_UTF32LE:
+            if (ch > 0x10FFFF) {
+                ch = UNKNOWN_UNICODE;
+            }
+        case ENCODING_UCS4LE:
+            if (ch > 0x7FFFFFFF) {
+                ch = UNKNOWN_UNICODE;
+            }
+            {
+                Uint8 *p = (Uint8 *) dst;
+                if (dstlen < 4) {
+                    return SDL_ICONV_E2BIG;
+                }
+                p[3] = (Uint8) (ch >> 24);
+                p[2] = (Uint8) (ch >> 16);
+                p[1] = (Uint8) (ch >> 8);
+                p[0] = (Uint8) ch;
+                dst += 4;
+                dstlen -= 4;
+            }
+            break;
+        }
+
+        /* Update state */
+        *inbuf = src;
+        *inbytesleft = srclen;
+        *outbuf = dst;
+        *outbytesleft = dstlen;
+        ++total;
+    }
+    return total;
+}
+
+int
+SDL_iconv_close(SDL_iconv_t cd)
+{
+    if (cd != (SDL_iconv_t)-1) {
+        SDL_free(cd);
+    }
+    return 0;
+}
+
+#endif /* !HAVE_ICONV */
+
+char *
+SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf,
+                 size_t inbytesleft)
+{
+    SDL_iconv_t cd;
+    char *string;
+    size_t stringsize;
+    char *outbuf;
+    size_t outbytesleft;
+    size_t retCode = 0;
+
+    cd = SDL_iconv_open(tocode, fromcode);
+    if (cd == (SDL_iconv_t) - 1) {
+        /* See if we can recover here (fixes iconv on Solaris 11) */
+        if (!tocode || !*tocode) {
+            tocode = "UTF-8";
+        }
+        if (!fromcode || !*fromcode) {
+            fromcode = "UTF-8";
+        }
+        cd = SDL_iconv_open(tocode, fromcode);
+    }
+    if (cd == (SDL_iconv_t) - 1) {
+        return NULL;
+    }
+
+    stringsize = inbytesleft > 4 ? inbytesleft : 4;
+    string = SDL_malloc(stringsize);
+    if (!string) {
+        SDL_iconv_close(cd);
+        return NULL;
+    }
+    outbuf = string;
+    outbytesleft = stringsize;
+    SDL_memset(outbuf, 0, 4);
+
+    while (inbytesleft > 0) {
+        retCode = SDL_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
+        switch (retCode) {
+        case SDL_ICONV_E2BIG:
+            {
+                char *oldstring = string;
+                stringsize *= 2;
+                string = SDL_realloc(string, stringsize);
+                if (!string) {
+                    SDL_iconv_close(cd);
+                    return NULL;
+                }
+                outbuf = string + (outbuf - oldstring);
+                outbytesleft = stringsize - (outbuf - string);
+                SDL_memset(outbuf, 0, 4);
+            }
+            break;
+        case SDL_ICONV_EILSEQ:
+            /* Try skipping some input data - not perfect, but... */
+            ++inbuf;
+            --inbytesleft;
+            break;
+        case SDL_ICONV_EINVAL:
+        case SDL_ICONV_ERROR:
+            /* We can't continue... */
+            inbytesleft = 0;
+            break;
+        }
+    }
+    SDL_iconv_close(cd);
+
+    return string;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/stdlib/SDL_malloc.c b/Source/3rd Party/sdl/src/stdlib/SDL_malloc.c
new file mode 100644
index 000000000..fa1346025
--- /dev/null
+++ b/Source/3rd Party/sdl/src/stdlib/SDL_malloc.c	
@@ -0,0 +1,5258 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This file contains portable memory management functions for SDL */
+
+#include "SDL_stdinc.h"
+
+#if defined(HAVE_MALLOC)
+
+void *SDL_malloc(size_t size)
+{
+    return malloc(size);
+}
+
+void *SDL_calloc(size_t nmemb, size_t size)
+{
+    return calloc(nmemb, size);
+}
+
+void *SDL_realloc(void *ptr, size_t size)
+{
+    return realloc(ptr, size);
+}
+
+void SDL_free(void *ptr)
+{
+    free(ptr);
+}
+
+#else  /* the rest of this is a LOT of tapdancing to implement malloc. :) */
+
+#define LACKS_SYS_TYPES_H
+#define LACKS_STDIO_H
+#define LACKS_STRINGS_H
+#define LACKS_STRING_H
+#define LACKS_STDLIB_H
+#define ABORT
+
+/*
+  This is a version (aka dlmalloc) of malloc/free/realloc written by
+  Doug Lea and released to the public domain, as explained at
+  http://creativecommons.org/licenses/publicdomain.  Send questions,
+  comments, complaints, performance data, etc to dl@cs.oswego.edu
+
+* Version 2.8.3 Thu Sep 22 11:16:15 2005  Doug Lea  (dl at gee)
+
+   Note: There may be an updated version of this malloc obtainable at
+           ftp://gee.cs.oswego.edu/pub/misc/malloc.c
+         Check before installing!
+
+* Quickstart
+
+  This library is all in one file to simplify the most common usage:
+  ftp it, compile it (-O3), and link it into another program. All of
+  the compile-time options default to reasonable values for use on
+  most platforms.  You might later want to step through various
+  compile-time and dynamic tuning options.
+
+  For convenience, an include file for code using this malloc is at:
+     ftp://gee.cs.oswego.edu/pub/misc/malloc-2.8.3.h
+  You don't really need this .h file unless you call functions not
+  defined in your system include files.  The .h file contains only the
+  excerpts from this file needed for using this malloc on ANSI C/C++
+  systems, so long as you haven't changed compile-time options about
+  naming and tuning parameters.  If you do, then you can create your
+  own malloc.h that does include all settings by cutting at the point
+  indicated below. Note that you may already by default be using a C
+  library containing a malloc that is based on some version of this
+  malloc (for example in linux). You might still want to use the one
+  in this file to customize settings or to avoid overheads associated
+  with library versions.
+
+* Vital statistics:
+
+  Supported pointer/size_t representation:       4 or 8 bytes
+       size_t MUST be an unsigned type of the same width as
+       pointers. (If you are using an ancient system that declares
+       size_t as a signed type, or need it to be a different width
+       than pointers, you can use a previous release of this malloc
+       (e.g. 2.7.2) supporting these.)
+
+  Alignment:                                     8 bytes (default)
+       This suffices for nearly all current machines and C compilers.
+       However, you can define MALLOC_ALIGNMENT to be wider than this
+       if necessary (up to 128bytes), at the expense of using more space.
+
+  Minimum overhead per allocated chunk:   4 or  8 bytes (if 4byte sizes)
+                                          8 or 16 bytes (if 8byte sizes)
+       Each malloced chunk has a hidden word of overhead holding size
+       and status information, and additional cross-check word
+       if FOOTERS is defined.
+
+  Minimum allocated size: 4-byte ptrs:  16 bytes    (including overhead)
+                          8-byte ptrs:  32 bytes    (including overhead)
+
+       Even a request for zero bytes (i.e., malloc(0)) returns a
+       pointer to something of the minimum allocatable size.
+       The maximum overhead wastage (i.e., number of extra bytes
+       allocated than were requested in malloc) is less than or equal
+       to the minimum size, except for requests >= mmap_threshold that
+       are serviced via mmap(), where the worst case wastage is about
+       32 bytes plus the remainder from a system page (the minimal
+       mmap unit); typically 4096 or 8192 bytes.
+
+  Security: static-safe; optionally more or less
+       The "security" of malloc refers to the ability of malicious
+       code to accentuate the effects of errors (for example, freeing
+       space that is not currently malloc'ed or overwriting past the
+       ends of chunks) in code that calls malloc.  This malloc
+       guarantees not to modify any memory locations below the base of
+       heap, i.e., static variables, even in the presence of usage
+       errors.  The routines additionally detect most improper frees
+       and reallocs.  All this holds as long as the static bookkeeping
+       for malloc itself is not corrupted by some other means.  This
+       is only one aspect of security -- these checks do not, and
+       cannot, detect all possible programming errors.
+
+       If FOOTERS is defined nonzero, then each allocated chunk
+       carries an additional check word to verify that it was malloced
+       from its space.  These check words are the same within each
+       execution of a program using malloc, but differ across
+       executions, so externally crafted fake chunks cannot be
+       freed. This improves security by rejecting frees/reallocs that
+       could corrupt heap memory, in addition to the checks preventing
+       writes to statics that are always on.  This may further improve
+       security at the expense of time and space overhead.  (Note that
+       FOOTERS may also be worth using with MSPACES.)
+
+       By default detected errors cause the program to abort (calling
+       "abort()"). You can override this to instead proceed past
+       errors by defining PROCEED_ON_ERROR.  In this case, a bad free
+       has no effect, and a malloc that encounters a bad address
+       caused by user overwrites will ignore the bad address by
+       dropping pointers and indices to all known memory. This may
+       be appropriate for programs that should continue if at all
+       possible in the face of programming errors, although they may
+       run out of memory because dropped memory is never reclaimed.
+
+       If you don't like either of these options, you can define
+       CORRUPTION_ERROR_ACTION and USAGE_ERROR_ACTION to do anything
+       else. And if if you are sure that your program using malloc has
+       no errors or vulnerabilities, you can define INSECURE to 1,
+       which might (or might not) provide a small performance improvement.
+
+  Thread-safety: NOT thread-safe unless USE_LOCKS defined
+       When USE_LOCKS is defined, each public call to malloc, free,
+       etc is surrounded with either a pthread mutex or a win32
+       spinlock (depending on WIN32). This is not especially fast, and
+       can be a major bottleneck.  It is designed only to provide
+       minimal protection in concurrent environments, and to provide a
+       basis for extensions.  If you are using malloc in a concurrent
+       program, consider instead using ptmalloc, which is derived from
+       a version of this malloc. (See http://www.malloc.de).
+
+  System requirements: Any combination of MORECORE and/or MMAP/MUNMAP
+       This malloc can use unix sbrk or any emulation (invoked using
+       the CALL_MORECORE macro) and/or mmap/munmap or any emulation
+       (invoked using CALL_MMAP/CALL_MUNMAP) to get and release system
+       memory.  On most unix systems, it tends to work best if both
+       MORECORE and MMAP are enabled.  On Win32, it uses emulations
+       based on VirtualAlloc. It also uses common C library functions
+       like memset.
+
+  Compliance: I believe it is compliant with the Single Unix Specification
+       (See http://www.unix.org). Also SVID/XPG, ANSI C, and probably
+       others as well.
+
+* Overview of algorithms
+
+  This is not the fastest, most space-conserving, most portable, or
+  most tunable malloc ever written. However it is among the fastest
+  while also being among the most space-conserving, portable and
+  tunable.  Consistent balance across these factors results in a good
+  general-purpose allocator for malloc-intensive programs.
+
+  In most ways, this malloc is a best-fit allocator. Generally, it
+  chooses the best-fitting existing chunk for a request, with ties
+  broken in approximately least-recently-used order. (This strategy
+  normally maintains low fragmentation.) However, for requests less
+  than 256bytes, it deviates from best-fit when there is not an
+  exactly fitting available chunk by preferring to use space adjacent
+  to that used for the previous small request, as well as by breaking
+  ties in approximately most-recently-used order. (These enhance
+  locality of series of small allocations.)  And for very large requests
+  (>= 256Kb by default), it relies on system memory mapping
+  facilities, if supported.  (This helps avoid carrying around and
+  possibly fragmenting memory used only for large chunks.)
+
+  All operations (except malloc_stats and mallinfo) have execution
+  times that are bounded by a constant factor of the number of bits in
+  a size_t, not counting any clearing in calloc or copying in realloc,
+  or actions surrounding MORECORE and MMAP that have times
+  proportional to the number of non-contiguous regions returned by
+  system allocation routines, which is often just 1.
+
+  The implementation is not very modular and seriously overuses
+  macros. Perhaps someday all C compilers will do as good a job
+  inlining modular code as can now be done by brute-force expansion,
+  but now, enough of them seem not to.
+
+  Some compilers issue a lot of warnings about code that is
+  dead/unreachable only on some platforms, and also about intentional
+  uses of negation on unsigned types. All known cases of each can be
+  ignored.
+
+  For a longer but out of date high-level description, see
+     http://gee.cs.oswego.edu/dl/html/malloc.html
+
+* MSPACES
+  If MSPACES is defined, then in addition to malloc, free, etc.,
+  this file also defines mspace_malloc, mspace_free, etc. These
+  are versions of malloc routines that take an "mspace" argument
+  obtained using create_mspace, to control all internal bookkeeping.
+  If ONLY_MSPACES is defined, only these versions are compiled.
+  So if you would like to use this allocator for only some allocations,
+  and your system malloc for others, you can compile with
+  ONLY_MSPACES and then do something like...
+    static mspace mymspace = create_mspace(0,0); // for example
+    #define mymalloc(bytes)  mspace_malloc(mymspace, bytes)
+
+  (Note: If you only need one instance of an mspace, you can instead
+  use "USE_DL_PREFIX" to relabel the global malloc.)
+
+  You can similarly create thread-local allocators by storing
+  mspaces as thread-locals. For example:
+    static __thread mspace tlms = 0;
+    void*  tlmalloc(size_t bytes) {
+      if (tlms == 0) tlms = create_mspace(0, 0);
+      return mspace_malloc(tlms, bytes);
+    }
+    void  tlfree(void* mem) { mspace_free(tlms, mem); }
+
+  Unless FOOTERS is defined, each mspace is completely independent.
+  You cannot allocate from one and free to another (although
+  conformance is only weakly checked, so usage errors are not always
+  caught). If FOOTERS is defined, then each chunk carries around a tag
+  indicating its originating mspace, and frees are directed to their
+  originating spaces.
+
+ -------------------------  Compile-time options ---------------------------
+
+Be careful in setting #define values for numerical constants of type
+size_t. On some systems, literal values are not automatically extended
+to size_t precision unless they are explicitly casted.
+
+WIN32                    default: defined if _WIN32 defined
+  Defining WIN32 sets up defaults for MS environment and compilers.
+  Otherwise defaults are for unix.
+
+MALLOC_ALIGNMENT         default: (size_t)8
+  Controls the minimum alignment for malloc'ed chunks.  It must be a
+  power of two and at least 8, even on machines for which smaller
+  alignments would suffice. It may be defined as larger than this
+  though. Note however that code and data structures are optimized for
+  the case of 8-byte alignment.
+
+MSPACES                  default: 0 (false)
+  If true, compile in support for independent allocation spaces.
+  This is only supported if HAVE_MMAP is true.
+
+ONLY_MSPACES             default: 0 (false)
+  If true, only compile in mspace versions, not regular versions.
+
+USE_LOCKS                default: 0 (false)
+  Causes each call to each public routine to be surrounded with
+  pthread or WIN32 mutex lock/unlock. (If set true, this can be
+  overridden on a per-mspace basis for mspace versions.)
+
+FOOTERS                  default: 0
+  If true, provide extra checking and dispatching by placing
+  information in the footers of allocated chunks. This adds
+  space and time overhead.
+
+INSECURE                 default: 0
+  If true, omit checks for usage errors and heap space overwrites.
+
+USE_DL_PREFIX            default: NOT defined
+  Causes compiler to prefix all public routines with the string 'dl'.
+  This can be useful when you only want to use this malloc in one part
+  of a program, using your regular system malloc elsewhere.
+
+ABORT                    default: defined as abort()
+  Defines how to abort on failed checks.  On most systems, a failed
+  check cannot die with an "assert" or even print an informative
+  message, because the underlying print routines in turn call malloc,
+  which will fail again.  Generally, the best policy is to simply call
+  abort(). It's not very useful to do more than this because many
+  errors due to overwriting will show up as address faults (null, odd
+  addresses etc) rather than malloc-triggered checks, so will also
+  abort.  Also, most compilers know that abort() does not return, so
+  can better optimize code conditionally calling it.
+
+PROCEED_ON_ERROR           default: defined as 0 (false)
+  Controls whether detected bad addresses cause them to bypassed
+  rather than aborting. If set, detected bad arguments to free and
+  realloc are ignored. And all bookkeeping information is zeroed out
+  upon a detected overwrite of freed heap space, thus losing the
+  ability to ever return it from malloc again, but enabling the
+  application to proceed. If PROCEED_ON_ERROR is defined, the
+  static variable malloc_corruption_error_count is compiled in
+  and can be examined to see if errors have occurred. This option
+  generates slower code than the default abort policy.
+
+DEBUG                    default: NOT defined
+  The DEBUG setting is mainly intended for people trying to modify
+  this code or diagnose problems when porting to new platforms.
+  However, it may also be able to better isolate user errors than just
+  using runtime checks.  The assertions in the check routines spell
+  out in more detail the assumptions and invariants underlying the
+  algorithms.  The checking is fairly extensive, and will slow down
+  execution noticeably. Calling malloc_stats or mallinfo with DEBUG
+  set will attempt to check every non-mmapped allocated and free chunk
+  in the course of computing the summaries.
+
+ABORT_ON_ASSERT_FAILURE   default: defined as 1 (true)
+  Debugging assertion failures can be nearly impossible if your
+  version of the assert macro causes malloc to be called, which will
+  lead to a cascade of further failures, blowing the runtime stack.
+  ABORT_ON_ASSERT_FAILURE cause assertions failures to call abort(),
+  which will usually make debugging easier.
+
+MALLOC_FAILURE_ACTION     default: sets errno to ENOMEM, or no-op on win32
+  The action to take before "return 0" when malloc fails to be able to
+  return memory because there is none available.
+
+HAVE_MORECORE             default: 1 (true) unless win32 or ONLY_MSPACES
+  True if this system supports sbrk or an emulation of it.
+
+MORECORE                  default: sbrk
+  The name of the sbrk-style system routine to call to obtain more
+  memory.  See below for guidance on writing custom MORECORE
+  functions. The type of the argument to sbrk/MORECORE varies across
+  systems.  It cannot be size_t, because it supports negative
+  arguments, so it is normally the signed type of the same width as
+  size_t (sometimes declared as "intptr_t").  It doesn't much matter
+  though. Internally, we only call it with arguments less than half
+  the max value of a size_t, which should work across all reasonable
+  possibilities, although sometimes generating compiler warnings.  See
+  near the end of this file for guidelines for creating a custom
+  version of MORECORE.
+
+MORECORE_CONTIGUOUS       default: 1 (true)
+  If true, take advantage of fact that consecutive calls to MORECORE
+  with positive arguments always return contiguous increasing
+  addresses.  This is true of unix sbrk. It does not hurt too much to
+  set it true anyway, since malloc copes with non-contiguities.
+  Setting it false when definitely non-contiguous saves time
+  and possibly wasted space it would take to discover this though.
+
+MORECORE_CANNOT_TRIM      default: NOT defined
+  True if MORECORE cannot release space back to the system when given
+  negative arguments. This is generally necessary only if you are
+  using a hand-crafted MORECORE function that cannot handle negative
+  arguments.
+
+HAVE_MMAP                 default: 1 (true)
+  True if this system supports mmap or an emulation of it.  If so, and
+  HAVE_MORECORE is not true, MMAP is used for all system
+  allocation. If set and HAVE_MORECORE is true as well, MMAP is
+  primarily used to directly allocate very large blocks. It is also
+  used as a backup strategy in cases where MORECORE fails to provide
+  space from system. Note: A single call to MUNMAP is assumed to be
+  able to unmap memory that may have be allocated using multiple calls
+  to MMAP, so long as they are adjacent.
+
+HAVE_MREMAP               default: 1 on linux, else 0
+  If true realloc() uses mremap() to re-allocate large blocks and
+  extend or shrink allocation spaces.
+
+MMAP_CLEARS               default: 1 on unix
+  True if mmap clears memory so calloc doesn't need to. This is true
+  for standard unix mmap using /dev/zero.
+
+USE_BUILTIN_FFS            default: 0 (i.e., not used)
+  Causes malloc to use the builtin ffs() function to compute indices.
+  Some compilers may recognize and intrinsify ffs to be faster than the
+  supplied C version. Also, the case of x86 using gcc is special-cased
+  to an asm instruction, so is already as fast as it can be, and so
+  this setting has no effect. (On most x86s, the asm version is only
+  slightly faster than the C version.)
+
+malloc_getpagesize         default: derive from system includes, or 4096.
+  The system page size. To the extent possible, this malloc manages
+  memory from the system in page-size units.  This may be (and
+  usually is) a function rather than a constant. This is ignored
+  if WIN32, where page size is determined using getSystemInfo during
+  initialization.
+
+USE_DEV_RANDOM             default: 0 (i.e., not used)
+  Causes malloc to use /dev/random to initialize secure magic seed for
+  stamping footers. Otherwise, the current time is used.
+
+NO_MALLINFO                default: 0
+  If defined, don't compile "mallinfo". This can be a simple way
+  of dealing with mismatches between system declarations and
+  those in this file.
+
+MALLINFO_FIELD_TYPE        default: size_t
+  The type of the fields in the mallinfo struct. This was originally
+  defined as "int" in SVID etc, but is more usefully defined as
+  size_t. The value is used only if  HAVE_USR_INCLUDE_MALLOC_H is not set
+
+REALLOC_ZERO_BYTES_FREES    default: not defined
+  This should be set if a call to realloc with zero bytes should
+  be the same as a call to free. Some people think it should. Otherwise,
+  since this malloc returns a unique pointer for malloc(0), so does
+  realloc(p, 0).
+
+LACKS_UNISTD_H, LACKS_FCNTL_H, LACKS_SYS_PARAM_H, LACKS_SYS_MMAN_H
+LACKS_STRINGS_H, LACKS_STRING_H, LACKS_SYS_TYPES_H,  LACKS_ERRNO_H
+LACKS_STDLIB_H                default: NOT defined unless on WIN32
+  Define these if your system does not have these header files.
+  You might need to manually insert some of the declarations they provide.
+
+DEFAULT_GRANULARITY        default: page size if MORECORE_CONTIGUOUS,
+                                system_info.dwAllocationGranularity in WIN32,
+                                otherwise 64K.
+      Also settable using mallopt(M_GRANULARITY, x)
+  The unit for allocating and deallocating memory from the system.  On
+  most systems with contiguous MORECORE, there is no reason to
+  make this more than a page. However, systems with MMAP tend to
+  either require or encourage larger granularities.  You can increase
+  this value to prevent system allocation functions to be called so
+  often, especially if they are slow.  The value must be at least one
+  page and must be a power of two.  Setting to 0 causes initialization
+  to either page size or win32 region size.  (Note: In previous
+  versions of malloc, the equivalent of this option was called
+  "TOP_PAD")
+
+DEFAULT_TRIM_THRESHOLD    default: 2MB
+      Also settable using mallopt(M_TRIM_THRESHOLD, x)
+  The maximum amount of unused top-most memory to keep before
+  releasing via malloc_trim in free().  Automatic trimming is mainly
+  useful in long-lived programs using contiguous MORECORE.  Because
+  trimming via sbrk can be slow on some systems, and can sometimes be
+  wasteful (in cases where programs immediately afterward allocate
+  more large chunks) the value should be high enough so that your
+  overall system performance would improve by releasing this much
+  memory.  As a rough guide, you might set to a value close to the
+  average size of a process (program) running on your system.
+  Releasing this much memory would allow such a process to run in
+  memory.  Generally, it is worth tuning trim thresholds when a
+  program undergoes phases where several large chunks are allocated
+  and released in ways that can reuse each other's storage, perhaps
+  mixed with phases where there are no such chunks at all. The trim
+  value must be greater than page size to have any useful effect.  To
+  disable trimming completely, you can set to MAX_SIZE_T. Note that the trick
+  some people use of mallocing a huge space and then freeing it at
+  program startup, in an attempt to reserve system memory, doesn't
+  have the intended effect under automatic trimming, since that memory
+  will immediately be returned to the system.
+
+DEFAULT_MMAP_THRESHOLD       default: 256K
+      Also settable using mallopt(M_MMAP_THRESHOLD, x)
+  The request size threshold for using MMAP to directly service a
+  request. Requests of at least this size that cannot be allocated
+  using already-existing space will be serviced via mmap.  (If enough
+  normal freed space already exists it is used instead.)  Using mmap
+  segregates relatively large chunks of memory so that they can be
+  individually obtained and released from the host system. A request
+  serviced through mmap is never reused by any other request (at least
+  not directly; the system may just so happen to remap successive
+  requests to the same locations).  Segregating space in this way has
+  the benefits that: Mmapped space can always be individually released
+  back to the system, which helps keep the system level memory demands
+  of a long-lived program low.  Also, mapped memory doesn't become
+  `locked' between other chunks, as can happen with normally allocated
+  chunks, which means that even trimming via malloc_trim would not
+  release them.  However, it has the disadvantage that the space
+  cannot be reclaimed, consolidated, and then used to service later
+  requests, as happens with normal chunks.  The advantages of mmap
+  nearly always outweigh disadvantages for "large" chunks, but the
+  value of "large" may vary across systems.  The default is an
+  empirically derived value that works well in most systems. You can
+  disable mmap by setting to MAX_SIZE_T.
+
+*/
+
+#ifndef WIN32
+#ifdef _WIN32
+#define WIN32 1
+#endif /* _WIN32 */
+#endif /* WIN32 */
+#ifdef WIN32
+//#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#define HAVE_MMAP 1
+#define HAVE_MORECORE 0
+#define LACKS_UNISTD_H
+#define LACKS_SYS_PARAM_H
+#define LACKS_SYS_MMAN_H
+#define LACKS_STRING_H
+#define LACKS_STRINGS_H
+#define LACKS_SYS_TYPES_H
+#define LACKS_ERRNO_H
+#define LACKS_FCNTL_H
+#define MALLOC_FAILURE_ACTION
+#define MMAP_CLEARS 0           /* WINCE and some others apparently don't clear */
+#endif /* WIN32 */
+
+#if defined(DARWIN) || defined(_DARWIN)
+/* Mac OSX docs advise not to use sbrk; it seems better to use mmap */
+#ifndef HAVE_MORECORE
+#define HAVE_MORECORE 0
+#define HAVE_MMAP 1
+#endif /* HAVE_MORECORE */
+#endif /* DARWIN */
+
+#ifndef LACKS_SYS_TYPES_H
+#include <sys/types.h>          /* For size_t */
+#endif /* LACKS_SYS_TYPES_H */
+
+/* The maximum possible size_t value has all bits set */
+#define MAX_SIZE_T           (~(size_t)0)
+
+#ifndef ONLY_MSPACES
+#define ONLY_MSPACES 0
+#endif /* ONLY_MSPACES */
+#ifndef MSPACES
+#if ONLY_MSPACES
+#define MSPACES 1
+#else /* ONLY_MSPACES */
+#define MSPACES 0
+#endif /* ONLY_MSPACES */
+#endif /* MSPACES */
+#ifndef MALLOC_ALIGNMENT
+#define MALLOC_ALIGNMENT ((size_t)8U)
+#endif /* MALLOC_ALIGNMENT */
+#ifndef FOOTERS
+#define FOOTERS 0
+#endif /* FOOTERS */
+#ifndef ABORT
+#define ABORT  abort()
+#endif /* ABORT */
+#ifndef ABORT_ON_ASSERT_FAILURE
+#define ABORT_ON_ASSERT_FAILURE 1
+#endif /* ABORT_ON_ASSERT_FAILURE */
+#ifndef PROCEED_ON_ERROR
+#define PROCEED_ON_ERROR 0
+#endif /* PROCEED_ON_ERROR */
+#ifndef USE_LOCKS
+#define USE_LOCKS 0
+#endif /* USE_LOCKS */
+#ifndef INSECURE
+#define INSECURE 0
+#endif /* INSECURE */
+#ifndef HAVE_MMAP
+#define HAVE_MMAP 1
+#endif /* HAVE_MMAP */
+#ifndef MMAP_CLEARS
+#define MMAP_CLEARS 1
+#endif /* MMAP_CLEARS */
+#ifndef HAVE_MREMAP
+#ifdef linux
+#define HAVE_MREMAP 1
+#else /* linux */
+#define HAVE_MREMAP 0
+#endif /* linux */
+#endif /* HAVE_MREMAP */
+#ifndef MALLOC_FAILURE_ACTION
+#define MALLOC_FAILURE_ACTION  errno = ENOMEM;
+#endif /* MALLOC_FAILURE_ACTION */
+#ifndef HAVE_MORECORE
+#if ONLY_MSPACES
+#define HAVE_MORECORE 0
+#else /* ONLY_MSPACES */
+#define HAVE_MORECORE 1
+#endif /* ONLY_MSPACES */
+#endif /* HAVE_MORECORE */
+#if !HAVE_MORECORE
+#define MORECORE_CONTIGUOUS 0
+#else /* !HAVE_MORECORE */
+#ifndef MORECORE
+#define MORECORE sbrk
+#endif /* MORECORE */
+#ifndef MORECORE_CONTIGUOUS
+#define MORECORE_CONTIGUOUS 1
+#endif /* MORECORE_CONTIGUOUS */
+#endif /* HAVE_MORECORE */
+#ifndef DEFAULT_GRANULARITY
+#if MORECORE_CONTIGUOUS
+#define DEFAULT_GRANULARITY (0) /* 0 means to compute in init_mparams */
+#else /* MORECORE_CONTIGUOUS */
+#define DEFAULT_GRANULARITY ((size_t)64U * (size_t)1024U)
+#endif /* MORECORE_CONTIGUOUS */
+#endif /* DEFAULT_GRANULARITY */
+#ifndef DEFAULT_TRIM_THRESHOLD
+#ifndef MORECORE_CANNOT_TRIM
+#define DEFAULT_TRIM_THRESHOLD ((size_t)2U * (size_t)1024U * (size_t)1024U)
+#else /* MORECORE_CANNOT_TRIM */
+#define DEFAULT_TRIM_THRESHOLD MAX_SIZE_T
+#endif /* MORECORE_CANNOT_TRIM */
+#endif /* DEFAULT_TRIM_THRESHOLD */
+#ifndef DEFAULT_MMAP_THRESHOLD
+#if HAVE_MMAP
+#define DEFAULT_MMAP_THRESHOLD ((size_t)256U * (size_t)1024U)
+#else /* HAVE_MMAP */
+#define DEFAULT_MMAP_THRESHOLD MAX_SIZE_T
+#endif /* HAVE_MMAP */
+#endif /* DEFAULT_MMAP_THRESHOLD */
+#ifndef USE_BUILTIN_FFS
+#define USE_BUILTIN_FFS 0
+#endif /* USE_BUILTIN_FFS */
+#ifndef USE_DEV_RANDOM
+#define USE_DEV_RANDOM 0
+#endif /* USE_DEV_RANDOM */
+#ifndef NO_MALLINFO
+#define NO_MALLINFO 0
+#endif /* NO_MALLINFO */
+#ifndef MALLINFO_FIELD_TYPE
+#define MALLINFO_FIELD_TYPE size_t
+#endif /* MALLINFO_FIELD_TYPE */
+
+#define memset  SDL_memset
+#define memcpy  SDL_memcpy
+#define malloc  SDL_malloc
+#define calloc  SDL_calloc
+#define realloc SDL_realloc
+#define free    SDL_free
+
+/*
+  mallopt tuning options.  SVID/XPG defines four standard parameter
+  numbers for mallopt, normally defined in malloc.h.  None of these
+  are used in this malloc, so setting them has no effect. But this
+  malloc does support the following options.
+*/
+
+#define M_TRIM_THRESHOLD     (-1)
+#define M_GRANULARITY        (-2)
+#define M_MMAP_THRESHOLD     (-3)
+
+/* ------------------------ Mallinfo declarations ------------------------ */
+
+#if !NO_MALLINFO
+/*
+  This version of malloc supports the standard SVID/XPG mallinfo
+  routine that returns a struct containing usage properties and
+  statistics. It should work on any system that has a
+  /usr/include/malloc.h defining struct mallinfo.  The main
+  declaration needed is the mallinfo struct that is returned (by-copy)
+  by mallinfo().  The malloinfo struct contains a bunch of fields that
+  are not even meaningful in this version of malloc.  These fields are
+  are instead filled by mallinfo() with other numbers that might be of
+  interest.
+
+  HAVE_USR_INCLUDE_MALLOC_H should be set if you have a
+  /usr/include/malloc.h file that includes a declaration of struct
+  mallinfo.  If so, it is included; else a compliant version is
+  declared below.  These must be precisely the same for mallinfo() to
+  work.  The original SVID version of this struct, defined on most
+  systems with mallinfo, declares all fields as ints. But some others
+  define as unsigned long. If your system defines the fields using a
+  type of different width than listed here, you MUST #include your
+  system version and #define HAVE_USR_INCLUDE_MALLOC_H.
+*/
+
+/* #define HAVE_USR_INCLUDE_MALLOC_H */
+
+#ifdef HAVE_USR_INCLUDE_MALLOC_H
+#include "/usr/include/malloc.h"
+#else /* HAVE_USR_INCLUDE_MALLOC_H */
+
+struct mallinfo
+{
+    MALLINFO_FIELD_TYPE arena;  /* non-mmapped space allocated from system */
+    MALLINFO_FIELD_TYPE ordblks;        /* number of free chunks */
+    MALLINFO_FIELD_TYPE smblks; /* always 0 */
+    MALLINFO_FIELD_TYPE hblks;  /* always 0 */
+    MALLINFO_FIELD_TYPE hblkhd; /* space in mmapped regions */
+    MALLINFO_FIELD_TYPE usmblks;        /* maximum total allocated space */
+    MALLINFO_FIELD_TYPE fsmblks;        /* always 0 */
+    MALLINFO_FIELD_TYPE uordblks;       /* total allocated space */
+    MALLINFO_FIELD_TYPE fordblks;       /* total free space */
+    MALLINFO_FIELD_TYPE keepcost;       /* releasable (via malloc_trim) space */
+};
+
+#endif /* HAVE_USR_INCLUDE_MALLOC_H */
+#endif /* NO_MALLINFO */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif                          /* __cplusplus */
+
+#if !ONLY_MSPACES
+
+/* ------------------- Declarations of public routines ------------------- */
+
+#ifndef USE_DL_PREFIX
+#define dlcalloc               calloc
+#define dlfree                 free
+#define dlmalloc               malloc
+#define dlmemalign             memalign
+#define dlrealloc              realloc
+#define dlvalloc               valloc
+#define dlpvalloc              pvalloc
+#define dlmallinfo             mallinfo
+#define dlmallopt              mallopt
+#define dlmalloc_trim          malloc_trim
+#define dlmalloc_stats         malloc_stats
+#define dlmalloc_usable_size   malloc_usable_size
+#define dlmalloc_footprint     malloc_footprint
+#define dlmalloc_max_footprint malloc_max_footprint
+#define dlindependent_calloc   independent_calloc
+#define dlindependent_comalloc independent_comalloc
+#endif                          /* USE_DL_PREFIX */
+
+
+/*
+  malloc(size_t n)
+  Returns a pointer to a newly allocated chunk of at least n bytes, or
+  null if no space is available, in which case errno is set to ENOMEM
+  on ANSI C systems.
+
+  If n is zero, malloc returns a minimum-sized chunk. (The minimum
+  size is 16 bytes on most 32bit systems, and 32 bytes on 64bit
+  systems.)  Note that size_t is an unsigned type, so calls with
+  arguments that would be negative if signed are interpreted as
+  requests for huge amounts of space, which will often fail. The
+  maximum supported value of n differs across systems, but is in all
+  cases less than the maximum representable value of a size_t.
+*/
+    void *dlmalloc(size_t);
+
+/*
+  free(void* p)
+  Releases the chunk of memory pointed to by p, that had been previously
+  allocated using malloc or a related routine such as realloc.
+  It has no effect if p is null. If p was not malloced or already
+  freed, free(p) will by default cause the current program to abort.
+*/
+    void dlfree(void *);
+
+/*
+  calloc(size_t n_elements, size_t element_size);
+  Returns a pointer to n_elements * element_size bytes, with all locations
+  set to zero.
+*/
+    void *dlcalloc(size_t, size_t);
+
+/*
+  realloc(void* p, size_t n)
+  Returns a pointer to a chunk of size n that contains the same data
+  as does chunk p up to the minimum of (n, p's size) bytes, or null
+  if no space is available.
+
+  The returned pointer may or may not be the same as p. The algorithm
+  prefers extending p in most cases when possible, otherwise it
+  employs the equivalent of a malloc-copy-free sequence.
+
+  If p is null, realloc is equivalent to malloc.
+
+  If space is not available, realloc returns null, errno is set (if on
+  ANSI) and p is NOT freed.
+
+  if n is for fewer bytes than already held by p, the newly unused
+  space is lopped off and freed if possible.  realloc with a size
+  argument of zero (re)allocates a minimum-sized chunk.
+
+  The old unix realloc convention of allowing the last-free'd chunk
+  to be used as an argument to realloc is not supported.
+*/
+
+    void *dlrealloc(void *, size_t);
+
+/*
+  memalign(size_t alignment, size_t n);
+  Returns a pointer to a newly allocated chunk of n bytes, aligned
+  in accord with the alignment argument.
+
+  The alignment argument should be a power of two. If the argument is
+  not a power of two, the nearest greater power is used.
+  8-byte alignment is guaranteed by normal malloc calls, so don't
+  bother calling memalign with an argument of 8 or less.
+
+  Overreliance on memalign is a sure way to fragment space.
+*/
+    void *dlmemalign(size_t, size_t);
+
+/*
+  valloc(size_t n);
+  Equivalent to memalign(pagesize, n), where pagesize is the page
+  size of the system. If the pagesize is unknown, 4096 is used.
+*/
+    void *dlvalloc(size_t);
+
+/*
+  mallopt(int parameter_number, int parameter_value)
+  Sets tunable parameters The format is to provide a
+  (parameter-number, parameter-value) pair.  mallopt then sets the
+  corresponding parameter to the argument value if it can (i.e., so
+  long as the value is meaningful), and returns 1 if successful else
+  0.  SVID/XPG/ANSI defines four standard param numbers for mallopt,
+  normally defined in malloc.h.  None of these are use in this malloc,
+  so setting them has no effect. But this malloc also supports other
+  options in mallopt. See below for details.  Briefly, supported
+  parameters are as follows (listed defaults are for "typical"
+  configurations).
+
+  Symbol            param #  default    allowed param values
+  M_TRIM_THRESHOLD     -1   2*1024*1024   any   (MAX_SIZE_T disables)
+  M_GRANULARITY        -2     page size   any power of 2 >= page size
+  M_MMAP_THRESHOLD     -3      256*1024   any   (or 0 if no MMAP support)
+*/
+    int dlmallopt(int, int);
+
+/*
+  malloc_footprint();
+  Returns the number of bytes obtained from the system.  The total
+  number of bytes allocated by malloc, realloc etc., is less than this
+  value. Unlike mallinfo, this function returns only a precomputed
+  result, so can be called frequently to monitor memory consumption.
+  Even if locks are otherwise defined, this function does not use them,
+  so results might not be up to date.
+*/
+    size_t dlmalloc_footprint(void);
+
+/*
+  malloc_max_footprint();
+  Returns the maximum number of bytes obtained from the system. This
+  value will be greater than current footprint if deallocated space
+  has been reclaimed by the system. The peak number of bytes allocated
+  by malloc, realloc etc., is less than this value. Unlike mallinfo,
+  this function returns only a precomputed result, so can be called
+  frequently to monitor memory consumption.  Even if locks are
+  otherwise defined, this function does not use them, so results might
+  not be up to date.
+*/
+    size_t dlmalloc_max_footprint(void);
+
+#if !NO_MALLINFO
+/*
+  mallinfo()
+  Returns (by copy) a struct containing various summary statistics:
+
+  arena:     current total non-mmapped bytes allocated from system
+  ordblks:   the number of free chunks
+  smblks:    always zero.
+  hblks:     current number of mmapped regions
+  hblkhd:    total bytes held in mmapped regions
+  usmblks:   the maximum total allocated space. This will be greater
+                than current total if trimming has occurred.
+  fsmblks:   always zero
+  uordblks:  current total allocated space (normal or mmapped)
+  fordblks:  total free space
+  keepcost:  the maximum number of bytes that could ideally be released
+               back to system via malloc_trim. ("ideally" means that
+               it ignores page restrictions etc.)
+
+  Because these fields are ints, but internal bookkeeping may
+  be kept as longs, the reported values may wrap around zero and
+  thus be inaccurate.
+*/
+    struct mallinfo dlmallinfo(void);
+#endif                          /* NO_MALLINFO */
+
+/*
+  independent_calloc(size_t n_elements, size_t element_size, void* chunks[]);
+
+  independent_calloc is similar to calloc, but instead of returning a
+  single cleared space, it returns an array of pointers to n_elements
+  independent elements that can hold contents of size elem_size, each
+  of which starts out cleared, and can be independently freed,
+  realloc'ed etc. The elements are guaranteed to be adjacently
+  allocated (this is not guaranteed to occur with multiple callocs or
+  mallocs), which may also improve cache locality in some
+  applications.
+
+  The "chunks" argument is optional (i.e., may be null, which is
+  probably the most typical usage). If it is null, the returned array
+  is itself dynamically allocated and should also be freed when it is
+  no longer needed. Otherwise, the chunks array must be of at least
+  n_elements in length. It is filled in with the pointers to the
+  chunks.
+
+  In either case, independent_calloc returns this pointer array, or
+  null if the allocation failed.  If n_elements is zero and "chunks"
+  is null, it returns a chunk representing an array with zero elements
+  (which should be freed if not wanted).
+
+  Each element must be individually freed when it is no longer
+  needed. If you'd like to instead be able to free all at once, you
+  should instead use regular calloc and assign pointers into this
+  space to represent elements.  (In this case though, you cannot
+  independently free elements.)
+
+  independent_calloc simplifies and speeds up implementations of many
+  kinds of pools.  It may also be useful when constructing large data
+  structures that initially have a fixed number of fixed-sized nodes,
+  but the number is not known at compile time, and some of the nodes
+  may later need to be freed. For example:
+
+  struct Node { int item; struct Node* next; };
+
+  struct Node* build_list() {
+    struct Node** pool;
+    int n = read_number_of_nodes_needed();
+    if (n <= 0) return 0;
+    pool = (struct Node**)(independent_calloc(n, sizeof(struct Node), 0);
+    if (pool == 0) die();
+    // organize into a linked list...
+    struct Node* first = pool[0];
+    for (i = 0; i < n-1; ++i)
+      pool[i]->next = pool[i+1];
+    free(pool);     // Can now free the array (or not, if it is needed later)
+    return first;
+  }
+*/
+    void **dlindependent_calloc(size_t, size_t, void **);
+
+/*
+  independent_comalloc(size_t n_elements, size_t sizes[], void* chunks[]);
+
+  independent_comalloc allocates, all at once, a set of n_elements
+  chunks with sizes indicated in the "sizes" array.    It returns
+  an array of pointers to these elements, each of which can be
+  independently freed, realloc'ed etc. The elements are guaranteed to
+  be adjacently allocated (this is not guaranteed to occur with
+  multiple callocs or mallocs), which may also improve cache locality
+  in some applications.
+
+  The "chunks" argument is optional (i.e., may be null). If it is null
+  the returned array is itself dynamically allocated and should also
+  be freed when it is no longer needed. Otherwise, the chunks array
+  must be of at least n_elements in length. It is filled in with the
+  pointers to the chunks.
+
+  In either case, independent_comalloc returns this pointer array, or
+  null if the allocation failed.  If n_elements is zero and chunks is
+  null, it returns a chunk representing an array with zero elements
+  (which should be freed if not wanted).
+
+  Each element must be individually freed when it is no longer
+  needed. If you'd like to instead be able to free all at once, you
+  should instead use a single regular malloc, and assign pointers at
+  particular offsets in the aggregate space. (In this case though, you
+  cannot independently free elements.)
+
+  independent_comallac differs from independent_calloc in that each
+  element may have a different size, and also that it does not
+  automatically clear elements.
+
+  independent_comalloc can be used to speed up allocation in cases
+  where several structs or objects must always be allocated at the
+  same time.  For example:
+
+  struct Head { ... }
+  struct Foot { ... }
+
+  void send_message(char* msg) {
+    int msglen = strlen(msg);
+    size_t sizes[3] = { sizeof(struct Head), msglen, sizeof(struct Foot) };
+    void* chunks[3];
+    if (independent_comalloc(3, sizes, chunks) == 0)
+      die();
+    struct Head* head = (struct Head*)(chunks[0]);
+    char*        body = (char*)(chunks[1]);
+    struct Foot* foot = (struct Foot*)(chunks[2]);
+    // ...
+  }
+
+  In general though, independent_comalloc is worth using only for
+  larger values of n_elements. For small values, you probably won't
+  detect enough difference from series of malloc calls to bother.
+
+  Overuse of independent_comalloc can increase overall memory usage,
+  since it cannot reuse existing noncontiguous small chunks that
+  might be available for some of the elements.
+*/
+    void **dlindependent_comalloc(size_t, size_t *, void **);
+
+
+/*
+  pvalloc(size_t n);
+  Equivalent to valloc(minimum-page-that-holds(n)), that is,
+  round up n to nearest pagesize.
+ */
+    void *dlpvalloc(size_t);
+
+/*
+  malloc_trim(size_t pad);
+
+  If possible, gives memory back to the system (via negative arguments
+  to sbrk) if there is unused memory at the `high' end of the malloc
+  pool or in unused MMAP segments. You can call this after freeing
+  large blocks of memory to potentially reduce the system-level memory
+  requirements of a program. However, it cannot guarantee to reduce
+  memory. Under some allocation patterns, some large free blocks of
+  memory will be locked between two used chunks, so they cannot be
+  given back to the system.
+
+  The `pad' argument to malloc_trim represents the amount of free
+  trailing space to leave untrimmed. If this argument is zero, only
+  the minimum amount of memory to maintain internal data structures
+  will be left. Non-zero arguments can be supplied to maintain enough
+  trailing space to service future expected allocations without having
+  to re-obtain memory from the system.
+
+  Malloc_trim returns 1 if it actually released any memory, else 0.
+*/
+    int dlmalloc_trim(size_t);
+
+/*
+  malloc_usable_size(void* p);
+
+  Returns the number of bytes you can actually use in
+  an allocated chunk, which may be more than you requested (although
+  often not) due to alignment and minimum size constraints.
+  You can use this many bytes without worrying about
+  overwriting other allocated objects. This is not a particularly great
+  programming practice. malloc_usable_size can be more useful in
+  debugging and assertions, for example:
+
+  p = malloc(n);
+  assert(malloc_usable_size(p) >= 256);
+*/
+    size_t dlmalloc_usable_size(void *);
+
+/*
+  malloc_stats();
+  Prints on stderr the amount of space obtained from the system (both
+  via sbrk and mmap), the maximum amount (which may be more than
+  current if malloc_trim and/or munmap got called), and the current
+  number of bytes allocated via malloc (or realloc, etc) but not yet
+  freed. Note that this is the number of bytes allocated, not the
+  number requested. It will be larger than the number requested
+  because of alignment and bookkeeping overhead. Because it includes
+  alignment wastage as being in use, this figure may be greater than
+  zero even when no user-level chunks are allocated.
+
+  The reported current and maximum system memory can be inaccurate if
+  a program makes other calls to system memory allocation functions
+  (normally sbrk) outside of malloc.
+
+  malloc_stats prints only the most commonly interesting statistics.
+  More information can be obtained by calling mallinfo.
+*/
+    void dlmalloc_stats(void);
+
+#endif                          /* ONLY_MSPACES */
+
+#if MSPACES
+
+/*
+  mspace is an opaque type representing an independent
+  region of space that supports mspace_malloc, etc.
+*/
+    typedef void *mspace;
+
+/*
+  create_mspace creates and returns a new independent space with the
+  given initial capacity, or, if 0, the default granularity size.  It
+  returns null if there is no system memory available to create the
+  space.  If argument locked is non-zero, the space uses a separate
+  lock to control access. The capacity of the space will grow
+  dynamically as needed to service mspace_malloc requests.  You can
+  control the sizes of incremental increases of this space by
+  compiling with a different DEFAULT_GRANULARITY or dynamically
+  setting with mallopt(M_GRANULARITY, value).
+*/
+    mspace create_mspace(size_t capacity, int locked);
+
+/*
+  destroy_mspace destroys the given space, and attempts to return all
+  of its memory back to the system, returning the total number of
+  bytes freed. After destruction, the results of access to all memory
+  used by the space become undefined.
+*/
+    size_t destroy_mspace(mspace msp);
+
+/*
+  create_mspace_with_base uses the memory supplied as the initial base
+  of a new mspace. Part (less than 128*sizeof(size_t) bytes) of this
+  space is used for bookkeeping, so the capacity must be at least this
+  large. (Otherwise 0 is returned.) When this initial space is
+  exhausted, additional memory will be obtained from the system.
+  Destroying this space will deallocate all additionally allocated
+  space (if possible) but not the initial base.
+*/
+    mspace create_mspace_with_base(void *base, size_t capacity, int locked);
+
+/*
+  mspace_malloc behaves as malloc, but operates within
+  the given space.
+*/
+    void *mspace_malloc(mspace msp, size_t bytes);
+
+/*
+  mspace_free behaves as free, but operates within
+  the given space.
+
+  If compiled with FOOTERS==1, mspace_free is not actually needed.
+  free may be called instead of mspace_free because freed chunks from
+  any space are handled by their originating spaces.
+*/
+    void mspace_free(mspace msp, void *mem);
+
+/*
+  mspace_realloc behaves as realloc, but operates within
+  the given space.
+
+  If compiled with FOOTERS==1, mspace_realloc is not actually
+  needed.  realloc may be called instead of mspace_realloc because
+  realloced chunks from any space are handled by their originating
+  spaces.
+*/
+    void *mspace_realloc(mspace msp, void *mem, size_t newsize);
+
+/*
+  mspace_calloc behaves as calloc, but operates within
+  the given space.
+*/
+    void *mspace_calloc(mspace msp, size_t n_elements, size_t elem_size);
+
+/*
+  mspace_memalign behaves as memalign, but operates within
+  the given space.
+*/
+    void *mspace_memalign(mspace msp, size_t alignment, size_t bytes);
+
+/*
+  mspace_independent_calloc behaves as independent_calloc, but
+  operates within the given space.
+*/
+    void **mspace_independent_calloc(mspace msp, size_t n_elements,
+                                     size_t elem_size, void *chunks[]);
+
+/*
+  mspace_independent_comalloc behaves as independent_comalloc, but
+  operates within the given space.
+*/
+    void **mspace_independent_comalloc(mspace msp, size_t n_elements,
+                                       size_t sizes[], void *chunks[]);
+
+/*
+  mspace_footprint() returns the number of bytes obtained from the
+  system for this space.
+*/
+    size_t mspace_footprint(mspace msp);
+
+/*
+  mspace_max_footprint() returns the peak number of bytes obtained from the
+  system for this space.
+*/
+    size_t mspace_max_footprint(mspace msp);
+
+
+#if !NO_MALLINFO
+/*
+  mspace_mallinfo behaves as mallinfo, but reports properties of
+  the given space.
+*/
+    struct mallinfo mspace_mallinfo(mspace msp);
+#endif                          /* NO_MALLINFO */
+
+/*
+  mspace_malloc_stats behaves as malloc_stats, but reports
+  properties of the given space.
+*/
+    void mspace_malloc_stats(mspace msp);
+
+/*
+  mspace_trim behaves as malloc_trim, but
+  operates within the given space.
+*/
+    int mspace_trim(mspace msp, size_t pad);
+
+/*
+  An alias for mallopt.
+*/
+    int mspace_mallopt(int, int);
+
+#endif                          /* MSPACES */
+
+#ifdef __cplusplus
+};                              /* end of extern "C" */
+#endif /* __cplusplus */
+
+/*
+  ========================================================================
+  To make a fully customizable malloc.h header file, cut everything
+  above this line, put into file malloc.h, edit to suit, and #include it
+  on the next line, as well as in programs that use this malloc.
+  ========================================================================
+*/
+
+/* #include "malloc.h" */
+
+/*------------------------------ internal #includes ---------------------- */
+
+#ifdef _MSC_VER
+#pragma warning( disable : 4146 )       /* no "unsigned" warnings */
+#endif /* _MSC_VER */
+
+#ifndef LACKS_STDIO_H
+#include <stdio.h>              /* for printing in malloc_stats */
+#endif
+
+#ifndef LACKS_ERRNO_H
+#include <errno.h>              /* for MALLOC_FAILURE_ACTION */
+#endif /* LACKS_ERRNO_H */
+#if FOOTERS
+#include <time.h>               /* for magic initialization */
+#endif /* FOOTERS */
+#ifndef LACKS_STDLIB_H
+#include <stdlib.h>             /* for abort() */
+#endif /* LACKS_STDLIB_H */
+#ifdef DEBUG
+#if ABORT_ON_ASSERT_FAILURE
+#define assert(x) if(!(x)) ABORT
+#else /* ABORT_ON_ASSERT_FAILURE */
+#include <assert.h>
+#endif /* ABORT_ON_ASSERT_FAILURE */
+#else /* DEBUG */
+#define assert(x)
+#endif /* DEBUG */
+#ifndef LACKS_STRING_H
+#include <string.h>             /* for memset etc */
+#endif /* LACKS_STRING_H */
+#if USE_BUILTIN_FFS
+#ifndef LACKS_STRINGS_H
+#include <strings.h>            /* for ffs */
+#endif /* LACKS_STRINGS_H */
+#endif /* USE_BUILTIN_FFS */
+#if HAVE_MMAP
+#ifndef LACKS_SYS_MMAN_H
+#include <sys/mman.h>           /* for mmap */
+#endif /* LACKS_SYS_MMAN_H */
+#ifndef LACKS_FCNTL_H
+#include <fcntl.h>
+#endif /* LACKS_FCNTL_H */
+#endif /* HAVE_MMAP */
+#if HAVE_MORECORE
+#ifndef LACKS_UNISTD_H
+#include <unistd.h>             /* for sbrk */
+#else /* LACKS_UNISTD_H */
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+extern void *sbrk(ptrdiff_t);
+#endif /* FreeBSD etc */
+#endif /* LACKS_UNISTD_H */
+#endif /* HAVE_MMAP */
+
+#ifndef WIN32
+#ifndef malloc_getpagesize
+#  ifdef _SC_PAGESIZE           /* some SVR4 systems omit an underscore */
+#    ifndef _SC_PAGE_SIZE
+#      define _SC_PAGE_SIZE _SC_PAGESIZE
+#    endif
+#  endif
+#  ifdef _SC_PAGE_SIZE
+#    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
+#  else
+#    if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
+extern size_t getpagesize();
+#      define malloc_getpagesize getpagesize()
+#    else
+#      ifdef WIN32              /* use supplied emulation of getpagesize */
+#        define malloc_getpagesize getpagesize()
+#      else
+#        ifndef LACKS_SYS_PARAM_H
+#          include <sys/param.h>
+#        endif
+#        ifdef EXEC_PAGESIZE
+#          define malloc_getpagesize EXEC_PAGESIZE
+#        else
+#          ifdef NBPG
+#            ifndef CLSIZE
+#              define malloc_getpagesize NBPG
+#            else
+#              define malloc_getpagesize (NBPG * CLSIZE)
+#            endif
+#          else
+#            ifdef NBPC
+#              define malloc_getpagesize NBPC
+#            else
+#              ifdef PAGESIZE
+#                define malloc_getpagesize PAGESIZE
+#              else /* just guess */
+#                define malloc_getpagesize ((size_t)4096U)
+#              endif
+#            endif
+#          endif
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+#endif
+
+/* ------------------- size_t and alignment properties -------------------- */
+
+/* The byte and bit size of a size_t */
+#define SIZE_T_SIZE         (sizeof(size_t))
+#define SIZE_T_BITSIZE      (sizeof(size_t) << 3)
+
+/* Some constants coerced to size_t */
+/* Annoying but necessary to avoid errors on some plaftorms */
+#define SIZE_T_ZERO         ((size_t)0)
+#define SIZE_T_ONE          ((size_t)1)
+#define SIZE_T_TWO          ((size_t)2)
+#define TWO_SIZE_T_SIZES    (SIZE_T_SIZE<<1)
+#define FOUR_SIZE_T_SIZES   (SIZE_T_SIZE<<2)
+#define SIX_SIZE_T_SIZES    (FOUR_SIZE_T_SIZES+TWO_SIZE_T_SIZES)
+#define HALF_MAX_SIZE_T     (MAX_SIZE_T / 2U)
+
+/* The bit mask value corresponding to MALLOC_ALIGNMENT */
+#define CHUNK_ALIGN_MASK    (MALLOC_ALIGNMENT - SIZE_T_ONE)
+
+/* True if address a has acceptable alignment */
+#define is_aligned(A)       (((size_t)((A)) & (CHUNK_ALIGN_MASK)) == 0)
+
+/* the number of bytes to offset an address to align it */
+#define align_offset(A)\
+ ((((size_t)(A) & CHUNK_ALIGN_MASK) == 0)? 0 :\
+  ((MALLOC_ALIGNMENT - ((size_t)(A) & CHUNK_ALIGN_MASK)) & CHUNK_ALIGN_MASK))
+
+/* -------------------------- MMAP preliminaries ------------------------- */
+
+/*
+   If HAVE_MORECORE or HAVE_MMAP are false, we just define calls and
+   checks to fail so compiler optimizer can delete code rather than
+   using so many "#if"s.
+*/
+
+
+/* MORECORE and MMAP must return MFAIL on failure */
+#define MFAIL                ((void*)(MAX_SIZE_T))
+#define CMFAIL               ((char*)(MFAIL))   /* defined for convenience */
+
+#if !HAVE_MMAP
+#define IS_MMAPPED_BIT       (SIZE_T_ZERO)
+#define USE_MMAP_BIT         (SIZE_T_ZERO)
+#define CALL_MMAP(s)         MFAIL
+#define CALL_MUNMAP(a, s)    (-1)
+#define DIRECT_MMAP(s)       MFAIL
+
+#else /* HAVE_MMAP */
+#define IS_MMAPPED_BIT       (SIZE_T_ONE)
+#define USE_MMAP_BIT         (SIZE_T_ONE)
+
+#ifndef WIN32
+#define CALL_MUNMAP(a, s)    munmap((a), (s))
+#define MMAP_PROT            (PROT_READ|PROT_WRITE)
+#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
+#define MAP_ANONYMOUS        MAP_ANON
+#endif /* MAP_ANON */
+#ifdef MAP_ANONYMOUS
+#define MMAP_FLAGS           (MAP_PRIVATE|MAP_ANONYMOUS)
+#define CALL_MMAP(s)         mmap(0, (s), MMAP_PROT, MMAP_FLAGS, -1, 0)
+#else /* MAP_ANONYMOUS */
+/*
+   Nearly all versions of mmap support MAP_ANONYMOUS, so the following
+   is unlikely to be needed, but is supplied just in case.
+*/
+#define MMAP_FLAGS           (MAP_PRIVATE)
+static int dev_zero_fd = -1;    /* Cached file descriptor for /dev/zero. */
+#define CALL_MMAP(s) ((dev_zero_fd < 0) ? \
+           (dev_zero_fd = open("/dev/zero", O_RDWR), \
+            mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0)) : \
+            mmap(0, (s), MMAP_PROT, MMAP_FLAGS, dev_zero_fd, 0))
+#endif /* MAP_ANONYMOUS */
+
+#define DIRECT_MMAP(s)       CALL_MMAP(s)
+#else /* WIN32 */
+
+/* Win32 MMAP via VirtualAlloc */
+static void *
+win32mmap(size_t size)
+{
+    void *ptr =
+        VirtualAlloc(0, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
+    return (ptr != 0) ? ptr : MFAIL;
+}
+
+/* For direct MMAP, use MEM_TOP_DOWN to minimize interference */
+static void *
+win32direct_mmap(size_t size)
+{
+    void *ptr = VirtualAlloc(0, size, MEM_RESERVE | MEM_COMMIT | MEM_TOP_DOWN,
+                             PAGE_READWRITE);
+    return (ptr != 0) ? ptr : MFAIL;
+}
+
+/* This function supports releasing coalesed segments */
+static int
+win32munmap(void *ptr, size_t size)
+{
+    MEMORY_BASIC_INFORMATION minfo;
+    char *cptr = ptr;
+    while (size) {
+        if (VirtualQuery(cptr, &minfo, sizeof(minfo)) == 0)
+            return -1;
+        if (minfo.BaseAddress != cptr || minfo.AllocationBase != cptr ||
+            minfo.State != MEM_COMMIT || minfo.RegionSize > size)
+            return -1;
+        if (VirtualFree(cptr, 0, MEM_RELEASE) == 0)
+            return -1;
+        cptr += minfo.RegionSize;
+        size -= minfo.RegionSize;
+    }
+    return 0;
+}
+
+#define CALL_MMAP(s)         win32mmap(s)
+#define CALL_MUNMAP(a, s)    win32munmap((a), (s))
+#define DIRECT_MMAP(s)       win32direct_mmap(s)
+#endif /* WIN32 */
+#endif /* HAVE_MMAP */
+
+#if HAVE_MMAP && HAVE_MREMAP
+#define CALL_MREMAP(addr, osz, nsz, mv) mremap((addr), (osz), (nsz), (mv))
+#else /* HAVE_MMAP && HAVE_MREMAP */
+#define CALL_MREMAP(addr, osz, nsz, mv) MFAIL
+#endif /* HAVE_MMAP && HAVE_MREMAP */
+
+#if HAVE_MORECORE
+#define CALL_MORECORE(S)     MORECORE(S)
+#else /* HAVE_MORECORE */
+#define CALL_MORECORE(S)     MFAIL
+#endif /* HAVE_MORECORE */
+
+/* mstate bit set if continguous morecore disabled or failed */
+#define USE_NONCONTIGUOUS_BIT (4U)
+
+/* segment bit set in create_mspace_with_base */
+#define EXTERN_BIT            (8U)
+
+
+/* --------------------------- Lock preliminaries ------------------------ */
+
+#if USE_LOCKS
+
+/*
+  When locks are defined, there are up to two global locks:
+
+  * If HAVE_MORECORE, morecore_mutex protects sequences of calls to
+    MORECORE.  In many cases sys_alloc requires two calls, that should
+    not be interleaved with calls by other threads.  This does not
+    protect against direct calls to MORECORE by other threads not
+    using this lock, so there is still code to cope the best we can on
+    interference.
+
+  * magic_init_mutex ensures that mparams.magic and other
+    unique mparams values are initialized only once.
+*/
+
+#ifndef WIN32
+/* By default use posix locks */
+#include <pthread.h>
+#define MLOCK_T pthread_mutex_t
+#define INITIAL_LOCK(l)      pthread_mutex_init(l, NULL)
+#define ACQUIRE_LOCK(l)      pthread_mutex_lock(l)
+#define RELEASE_LOCK(l)      pthread_mutex_unlock(l)
+
+#if HAVE_MORECORE
+static MLOCK_T morecore_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* HAVE_MORECORE */
+
+static MLOCK_T magic_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+#else /* WIN32 */
+/*
+   Because lock-protected regions have bounded times, and there
+   are no recursive lock calls, we can use simple spinlocks.
+*/
+
+#define MLOCK_T long
+static int
+win32_acquire_lock(MLOCK_T * sl)
+{
+    for (;;) {
+#ifdef InterlockedCompareExchangePointer
+        if (!InterlockedCompareExchange(sl, 1, 0))
+            return 0;
+#else /* Use older void* version */
+        if (!InterlockedCompareExchange((void **) sl, (void *) 1, (void *) 0))
+            return 0;
+#endif /* InterlockedCompareExchangePointer */
+        Sleep(0);
+    }
+}
+
+static void
+win32_release_lock(MLOCK_T * sl)
+{
+    InterlockedExchange(sl, 0);
+}
+
+#define INITIAL_LOCK(l)      *(l)=0
+#define ACQUIRE_LOCK(l)      win32_acquire_lock(l)
+#define RELEASE_LOCK(l)      win32_release_lock(l)
+#if HAVE_MORECORE
+static MLOCK_T morecore_mutex;
+#endif /* HAVE_MORECORE */
+static MLOCK_T magic_init_mutex;
+#endif /* WIN32 */
+
+#define USE_LOCK_BIT               (2U)
+#else /* USE_LOCKS */
+#define USE_LOCK_BIT               (0U)
+#define INITIAL_LOCK(l)
+#endif /* USE_LOCKS */
+
+#if USE_LOCKS && HAVE_MORECORE
+#define ACQUIRE_MORECORE_LOCK()    ACQUIRE_LOCK(&morecore_mutex);
+#define RELEASE_MORECORE_LOCK()    RELEASE_LOCK(&morecore_mutex);
+#else /* USE_LOCKS && HAVE_MORECORE */
+#define ACQUIRE_MORECORE_LOCK()
+#define RELEASE_MORECORE_LOCK()
+#endif /* USE_LOCKS && HAVE_MORECORE */
+
+#if USE_LOCKS
+#define ACQUIRE_MAGIC_INIT_LOCK()  ACQUIRE_LOCK(&magic_init_mutex);
+#define RELEASE_MAGIC_INIT_LOCK()  RELEASE_LOCK(&magic_init_mutex);
+#else /* USE_LOCKS */
+#define ACQUIRE_MAGIC_INIT_LOCK()
+#define RELEASE_MAGIC_INIT_LOCK()
+#endif /* USE_LOCKS */
+
+
+/* -----------------------  Chunk representations ------------------------ */
+
+/*
+  (The following includes lightly edited explanations by Colin Plumb.)
+
+  The malloc_chunk declaration below is misleading (but accurate and
+  necessary).  It declares a "view" into memory allowing access to
+  necessary fields at known offsets from a given base.
+
+  Chunks of memory are maintained using a `boundary tag' method as
+  originally described by Knuth.  (See the paper by Paul Wilson
+  ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a survey of such
+  techniques.)  Sizes of free chunks are stored both in the front of
+  each chunk and at the end.  This makes consolidating fragmented
+  chunks into bigger chunks fast.  The head fields also hold bits
+  representing whether chunks are free or in use.
+
+  Here are some pictures to make it clearer.  They are "exploded" to
+  show that the state of a chunk can be thought of as extending from
+  the high 31 bits of the head field of its header through the
+  prev_foot and PINUSE_BIT bit of the following chunk header.
+
+  A chunk that's in use looks like:
+
+   chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+           | Size of previous chunk (if P = 1)                             |
+           +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P|
+         | Size of this chunk                                         1| +-+
+   mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |                                                               |
+         +-                                                             -+
+         |                                                               |
+         +-                                                             -+
+         |                                                               :
+         +-      size - sizeof(size_t) available payload bytes          -+
+         :                                                               |
+ chunk-> +-                                                             -+
+         |                                                               |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |1|
+       | Size of next chunk (may or may not be in use)               | +-+
+ mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+    And if it's free, it looks like this:
+
+   chunk-> +-                                                             -+
+           | User payload (must be in use, or we would have merged!)       |
+           +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |P|
+         | Size of this chunk                                         0| +-+
+   mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         | Next pointer                                                  |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         | Prev pointer                                                  |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         |                                                               :
+         +-      size - sizeof(struct chunk) unused bytes               -+
+         :                                                               |
+ chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         | Size of this chunk                                            |
+         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |0|
+       | Size of next chunk (must be in use, or we would have merged)| +-+
+ mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+       |                                                               :
+       +- User payload                                                -+
+       :                                                               |
+       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+                                                                     |0|
+                                                                     +-+
+  Note that since we always merge adjacent free chunks, the chunks
+  adjacent to a free chunk must be in use.
+
+  Given a pointer to a chunk (which can be derived trivially from the
+  payload pointer) we can, in O(1) time, find out whether the adjacent
+  chunks are free, and if so, unlink them from the lists that they
+  are on and merge them with the current chunk.
+
+  Chunks always begin on even word boundaries, so the mem portion
+  (which is returned to the user) is also on an even word boundary, and
+  thus at least double-word aligned.
+
+  The P (PINUSE_BIT) bit, stored in the unused low-order bit of the
+  chunk size (which is always a multiple of two words), is an in-use
+  bit for the *previous* chunk.  If that bit is *clear*, then the
+  word before the current chunk size contains the previous chunk
+  size, and can be used to find the front of the previous chunk.
+  The very first chunk allocated always has this bit set, preventing
+  access to non-existent (or non-owned) memory. If pinuse is set for
+  any given chunk, then you CANNOT determine the size of the
+  previous chunk, and might even get a memory addressing fault when
+  trying to do so.
+
+  The C (CINUSE_BIT) bit, stored in the unused second-lowest bit of
+  the chunk size redundantly records whether the current chunk is
+  inuse. This redundancy enables usage checks within free and realloc,
+  and reduces indirection when freeing and consolidating chunks.
+
+  Each freshly allocated chunk must have both cinuse and pinuse set.
+  That is, each allocated chunk borders either a previously allocated
+  and still in-use chunk, or the base of its memory arena. This is
+  ensured by making all allocations from the the `lowest' part of any
+  found chunk.  Further, no free chunk physically borders another one,
+  so each free chunk is known to be preceded and followed by either
+  inuse chunks or the ends of memory.
+
+  Note that the `foot' of the current chunk is actually represented
+  as the prev_foot of the NEXT chunk. This makes it easier to
+  deal with alignments etc but can be very confusing when trying
+  to extend or adapt this code.
+
+  The exceptions to all this are
+
+     1. The special chunk `top' is the top-most available chunk (i.e.,
+        the one bordering the end of available memory). It is treated
+        specially.  Top is never included in any bin, is used only if
+        no other chunk is available, and is released back to the
+        system if it is very large (see M_TRIM_THRESHOLD).  In effect,
+        the top chunk is treated as larger (and thus less well
+        fitting) than any other available chunk.  The top chunk
+        doesn't update its trailing size field since there is no next
+        contiguous chunk that would have to index off it. However,
+        space is still allocated for it (TOP_FOOT_SIZE) to enable
+        separation or merging when space is extended.
+
+     3. Chunks allocated via mmap, which have the lowest-order bit
+        (IS_MMAPPED_BIT) set in their prev_foot fields, and do not set
+        PINUSE_BIT in their head fields.  Because they are allocated
+        one-by-one, each must carry its own prev_foot field, which is
+        also used to hold the offset this chunk has within its mmapped
+        region, which is needed to preserve alignment. Each mmapped
+        chunk is trailed by the first two fields of a fake next-chunk
+        for sake of usage checks.
+
+*/
+
+struct malloc_chunk
+{
+    size_t prev_foot;           /* Size of previous chunk (if free).  */
+    size_t head;                /* Size and inuse bits. */
+    struct malloc_chunk *fd;    /* double links -- used only if free. */
+    struct malloc_chunk *bk;
+};
+
+typedef struct malloc_chunk mchunk;
+typedef struct malloc_chunk *mchunkptr;
+typedef struct malloc_chunk *sbinptr;   /* The type of bins of chunks */
+typedef size_t bindex_t;        /* Described below */
+typedef unsigned int binmap_t;  /* Described below */
+typedef unsigned int flag_t;    /* The type of various bit flag sets */
+
+/* ------------------- Chunks sizes and alignments ----------------------- */
+
+#define MCHUNK_SIZE         (sizeof(mchunk))
+
+#if FOOTERS
+#define CHUNK_OVERHEAD      (TWO_SIZE_T_SIZES)
+#else /* FOOTERS */
+#define CHUNK_OVERHEAD      (SIZE_T_SIZE)
+#endif /* FOOTERS */
+
+/* MMapped chunks need a second word of overhead ... */
+#define MMAP_CHUNK_OVERHEAD (TWO_SIZE_T_SIZES)
+/* ... and additional padding for fake next-chunk at foot */
+#define MMAP_FOOT_PAD       (FOUR_SIZE_T_SIZES)
+
+/* The smallest size we can malloc is an aligned minimal chunk */
+#define MIN_CHUNK_SIZE\
+  ((MCHUNK_SIZE + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK)
+
+/* conversion from malloc headers to user pointers, and back */
+#define chunk2mem(p)        ((void*)((char*)(p)       + TWO_SIZE_T_SIZES))
+#define mem2chunk(mem)      ((mchunkptr)((char*)(mem) - TWO_SIZE_T_SIZES))
+/* chunk associated with aligned address A */
+#define align_as_chunk(A)   (mchunkptr)((A) + align_offset(chunk2mem(A)))
+
+/* Bounds on request (not chunk) sizes. */
+#define MAX_REQUEST         ((-MIN_CHUNK_SIZE) << 2)
+#define MIN_REQUEST         (MIN_CHUNK_SIZE - CHUNK_OVERHEAD - SIZE_T_ONE)
+
+/* pad request bytes into a usable size */
+#define pad_request(req) \
+   (((req) + CHUNK_OVERHEAD + CHUNK_ALIGN_MASK) & ~CHUNK_ALIGN_MASK)
+
+/* pad request, checking for minimum (but not maximum) */
+#define request2size(req) \
+  (((req) < MIN_REQUEST)? MIN_CHUNK_SIZE : pad_request(req))
+
+
+/* ------------------ Operations on head and foot fields ----------------- */
+
+/*
+  The head field of a chunk is or'ed with PINUSE_BIT when previous
+  adjacent chunk in use, and or'ed with CINUSE_BIT if this chunk is in
+  use. If the chunk was obtained with mmap, the prev_foot field has
+  IS_MMAPPED_BIT set, otherwise holding the offset of the base of the
+  mmapped region to the base of the chunk.
+*/
+
+#define PINUSE_BIT          (SIZE_T_ONE)
+#define CINUSE_BIT          (SIZE_T_TWO)
+#define INUSE_BITS          (PINUSE_BIT|CINUSE_BIT)
+
+/* Head value for fenceposts */
+#define FENCEPOST_HEAD      (INUSE_BITS|SIZE_T_SIZE)
+
+/* extraction of fields from head words */
+#define cinuse(p)           ((p)->head & CINUSE_BIT)
+#define pinuse(p)           ((p)->head & PINUSE_BIT)
+#define chunksize(p)        ((p)->head & ~(INUSE_BITS))
+
+#define clear_pinuse(p)     ((p)->head &= ~PINUSE_BIT)
+#define clear_cinuse(p)     ((p)->head &= ~CINUSE_BIT)
+
+/* Treat space at ptr +/- offset as a chunk */
+#define chunk_plus_offset(p, s)  ((mchunkptr)(((char*)(p)) + (s)))
+#define chunk_minus_offset(p, s) ((mchunkptr)(((char*)(p)) - (s)))
+
+/* Ptr to next or previous physical malloc_chunk. */
+#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->head & ~INUSE_BITS)))
+#define prev_chunk(p) ((mchunkptr)( ((char*)(p)) - ((p)->prev_foot) ))
+
+/* extract next chunk's pinuse bit */
+#define next_pinuse(p)  ((next_chunk(p)->head) & PINUSE_BIT)
+
+/* Get/set size at footer */
+#define get_foot(p, s)  (((mchunkptr)((char*)(p) + (s)))->prev_foot)
+#define set_foot(p, s)  (((mchunkptr)((char*)(p) + (s)))->prev_foot = (s))
+
+/* Set size, pinuse bit, and foot */
+#define set_size_and_pinuse_of_free_chunk(p, s)\
+  ((p)->head = (s|PINUSE_BIT), set_foot(p, s))
+
+/* Set size, pinuse bit, foot, and clear next pinuse */
+#define set_free_with_pinuse(p, s, n)\
+  (clear_pinuse(n), set_size_and_pinuse_of_free_chunk(p, s))
+
+#define is_mmapped(p)\
+  (!((p)->head & PINUSE_BIT) && ((p)->prev_foot & IS_MMAPPED_BIT))
+
+/* Get the internal overhead associated with chunk p */
+#define overhead_for(p)\
+ (is_mmapped(p)? MMAP_CHUNK_OVERHEAD : CHUNK_OVERHEAD)
+
+/* Return true if malloced space is not necessarily cleared */
+#if MMAP_CLEARS
+#define calloc_must_clear(p) (!is_mmapped(p))
+#else /* MMAP_CLEARS */
+#define calloc_must_clear(p) (1)
+#endif /* MMAP_CLEARS */
+
+/* ---------------------- Overlaid data structures ----------------------- */
+
+/*
+  When chunks are not in use, they are treated as nodes of either
+  lists or trees.
+
+  "Small"  chunks are stored in circular doubly-linked lists, and look
+  like this:
+
+    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Size of previous chunk                            |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    `head:' |             Size of chunk, in bytes                         |P|
+      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Forward pointer to next chunk in list             |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Back pointer to previous chunk in list            |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Unused space (may be 0 bytes long)                .
+            .                                                               .
+            .                                                               |
+nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    `foot:' |             Size of chunk, in bytes                           |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+  Larger chunks are kept in a form of bitwise digital trees (aka
+  tries) keyed on chunksizes.  Because malloc_tree_chunks are only for
+  free chunks greater than 256 bytes, their size doesn't impose any
+  constraints on user chunk sizes.  Each node looks like:
+
+    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Size of previous chunk                            |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    `head:' |             Size of chunk, in bytes                         |P|
+      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Forward pointer to next chunk of same size        |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Back pointer to previous chunk of same size       |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Pointer to left child (child[0])                  |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Pointer to right child (child[1])                 |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Pointer to parent                                 |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             bin index of this chunk                           |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+            |             Unused space                                      .
+            .                                                               |
+nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    `foot:' |             Size of chunk, in bytes                           |
+            +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+  Each tree holding treenodes is a tree of unique chunk sizes.  Chunks
+  of the same size are arranged in a circularly-linked list, with only
+  the oldest chunk (the next to be used, in our FIFO ordering)
+  actually in the tree.  (Tree members are distinguished by a non-null
+  parent pointer.)  If a chunk with the same size an an existing node
+  is inserted, it is linked off the existing node using pointers that
+  work in the same way as fd/bk pointers of small chunks.
+
+  Each tree contains a power of 2 sized range of chunk sizes (the
+  smallest is 0x100 <= x < 0x180), which is is divided in half at each
+  tree level, with the chunks in the smaller half of the range (0x100
+  <= x < 0x140 for the top nose) in the left subtree and the larger
+  half (0x140 <= x < 0x180) in the right subtree.  This is, of course,
+  done by inspecting individual bits.
+
+  Using these rules, each node's left subtree contains all smaller
+  sizes than its right subtree.  However, the node at the root of each
+  subtree has no particular ordering relationship to either.  (The
+  dividing line between the subtree sizes is based on trie relation.)
+  If we remove the last chunk of a given size from the interior of the
+  tree, we need to replace it with a leaf node.  The tree ordering
+  rules permit a node to be replaced by any leaf below it.
+
+  The smallest chunk in a tree (a common operation in a best-fit
+  allocator) can be found by walking a path to the leftmost leaf in
+  the tree.  Unlike a usual binary tree, where we follow left child
+  pointers until we reach a null, here we follow the right child
+  pointer any time the left one is null, until we reach a leaf with
+  both child pointers null. The smallest chunk in the tree will be
+  somewhere along that path.
+
+  The worst case number of steps to add, find, or remove a node is
+  bounded by the number of bits differentiating chunks within
+  bins. Under current bin calculations, this ranges from 6 up to 21
+  (for 32 bit sizes) or up to 53 (for 64 bit sizes). The typical case
+  is of course much better.
+*/
+
+struct malloc_tree_chunk
+{
+    /* The first four fields must be compatible with malloc_chunk */
+    size_t prev_foot;
+    size_t head;
+    struct malloc_tree_chunk *fd;
+    struct malloc_tree_chunk *bk;
+
+    struct malloc_tree_chunk *child[2];
+    struct malloc_tree_chunk *parent;
+    bindex_t index;
+};
+
+typedef struct malloc_tree_chunk tchunk;
+typedef struct malloc_tree_chunk *tchunkptr;
+typedef struct malloc_tree_chunk *tbinptr;      /* The type of bins of trees */
+
+/* A little helper macro for trees */
+#define leftmost_child(t) ((t)->child[0] != 0? (t)->child[0] : (t)->child[1])
+
+/* ----------------------------- Segments -------------------------------- */
+
+/*
+  Each malloc space may include non-contiguous segments, held in a
+  list headed by an embedded malloc_segment record representing the
+  top-most space. Segments also include flags holding properties of
+  the space. Large chunks that are directly allocated by mmap are not
+  included in this list. They are instead independently created and
+  destroyed without otherwise keeping track of them.
+
+  Segment management mainly comes into play for spaces allocated by
+  MMAP.  Any call to MMAP might or might not return memory that is
+  adjacent to an existing segment.  MORECORE normally contiguously
+  extends the current space, so this space is almost always adjacent,
+  which is simpler and faster to deal with. (This is why MORECORE is
+  used preferentially to MMAP when both are available -- see
+  sys_alloc.)  When allocating using MMAP, we don't use any of the
+  hinting mechanisms (inconsistently) supported in various
+  implementations of unix mmap, or distinguish reserving from
+  committing memory. Instead, we just ask for space, and exploit
+  contiguity when we get it.  It is probably possible to do
+  better than this on some systems, but no general scheme seems
+  to be significantly better.
+
+  Management entails a simpler variant of the consolidation scheme
+  used for chunks to reduce fragmentation -- new adjacent memory is
+  normally prepended or appended to an existing segment. However,
+  there are limitations compared to chunk consolidation that mostly
+  reflect the fact that segment processing is relatively infrequent
+  (occurring only when getting memory from system) and that we
+  don't expect to have huge numbers of segments:
+
+  * Segments are not indexed, so traversal requires linear scans.  (It
+    would be possible to index these, but is not worth the extra
+    overhead and complexity for most programs on most platforms.)
+  * New segments are only appended to old ones when holding top-most
+    memory; if they cannot be prepended to others, they are held in
+    different segments.
+
+  Except for the top-most segment of an mstate, each segment record
+  is kept at the tail of its segment. Segments are added by pushing
+  segment records onto the list headed by &mstate.seg for the
+  containing mstate.
+
+  Segment flags control allocation/merge/deallocation policies:
+  * If EXTERN_BIT set, then we did not allocate this segment,
+    and so should not try to deallocate or merge with others.
+    (This currently holds only for the initial segment passed
+    into create_mspace_with_base.)
+  * If IS_MMAPPED_BIT set, the segment may be merged with
+    other surrounding mmapped segments and trimmed/de-allocated
+    using munmap.
+  * If neither bit is set, then the segment was obtained using
+    MORECORE so can be merged with surrounding MORECORE'd segments
+    and deallocated/trimmed using MORECORE with negative arguments.
+*/
+
+struct malloc_segment
+{
+    char *base;                 /* base address */
+    size_t size;                /* allocated size */
+    struct malloc_segment *next;        /* ptr to next segment */
+    flag_t sflags;              /* mmap and extern flag */
+};
+
+#define is_mmapped_segment(S)  ((S)->sflags & IS_MMAPPED_BIT)
+#define is_extern_segment(S)   ((S)->sflags & EXTERN_BIT)
+
+typedef struct malloc_segment msegment;
+typedef struct malloc_segment *msegmentptr;
+
+/* ---------------------------- malloc_state ----------------------------- */
+
+/*
+   A malloc_state holds all of the bookkeeping for a space.
+   The main fields are:
+
+  Top
+    The topmost chunk of the currently active segment. Its size is
+    cached in topsize.  The actual size of topmost space is
+    topsize+TOP_FOOT_SIZE, which includes space reserved for adding
+    fenceposts and segment records if necessary when getting more
+    space from the system.  The size at which to autotrim top is
+    cached from mparams in trim_check, except that it is disabled if
+    an autotrim fails.
+
+  Designated victim (dv)
+    This is the preferred chunk for servicing small requests that
+    don't have exact fits.  It is normally the chunk split off most
+    recently to service another small request.  Its size is cached in
+    dvsize. The link fields of this chunk are not maintained since it
+    is not kept in a bin.
+
+  SmallBins
+    An array of bin headers for free chunks.  These bins hold chunks
+    with sizes less than MIN_LARGE_SIZE bytes. Each bin contains
+    chunks of all the same size, spaced 8 bytes apart.  To simplify
+    use in double-linked lists, each bin header acts as a malloc_chunk
+    pointing to the real first node, if it exists (else pointing to
+    itself).  This avoids special-casing for headers.  But to avoid
+    waste, we allocate only the fd/bk pointers of bins, and then use
+    repositioning tricks to treat these as the fields of a chunk.
+
+  TreeBins
+    Treebins are pointers to the roots of trees holding a range of
+    sizes. There are 2 equally spaced treebins for each power of two
+    from TREE_SHIFT to TREE_SHIFT+16. The last bin holds anything
+    larger.
+
+  Bin maps
+    There is one bit map for small bins ("smallmap") and one for
+    treebins ("treemap).  Each bin sets its bit when non-empty, and
+    clears the bit when empty.  Bit operations are then used to avoid
+    bin-by-bin searching -- nearly all "search" is done without ever
+    looking at bins that won't be selected.  The bit maps
+    conservatively use 32 bits per map word, even if on 64bit system.
+    For a good description of some of the bit-based techniques used
+    here, see Henry S. Warren Jr's book "Hacker's Delight" (and
+    supplement at http://hackersdelight.org/). Many of these are
+    intended to reduce the branchiness of paths through malloc etc, as
+    well as to reduce the number of memory locations read or written.
+
+  Segments
+    A list of segments headed by an embedded malloc_segment record
+    representing the initial space.
+
+  Address check support
+    The least_addr field is the least address ever obtained from
+    MORECORE or MMAP. Attempted frees and reallocs of any address less
+    than this are trapped (unless INSECURE is defined).
+
+  Magic tag
+    A cross-check field that should always hold same value as mparams.magic.
+
+  Flags
+    Bits recording whether to use MMAP, locks, or contiguous MORECORE
+
+  Statistics
+    Each space keeps track of current and maximum system memory
+    obtained via MORECORE or MMAP.
+
+  Locking
+    If USE_LOCKS is defined, the "mutex" lock is acquired and released
+    around every public call using this mspace.
+*/
+
+/* Bin types, widths and sizes */
+#define NSMALLBINS        (32U)
+#define NTREEBINS         (32U)
+#define SMALLBIN_SHIFT    (3U)
+#define SMALLBIN_WIDTH    (SIZE_T_ONE << SMALLBIN_SHIFT)
+#define TREEBIN_SHIFT     (8U)
+#define MIN_LARGE_SIZE    (SIZE_T_ONE << TREEBIN_SHIFT)
+#define MAX_SMALL_SIZE    (MIN_LARGE_SIZE - SIZE_T_ONE)
+#define MAX_SMALL_REQUEST (MAX_SMALL_SIZE - CHUNK_ALIGN_MASK - CHUNK_OVERHEAD)
+
+struct malloc_state
+{
+    binmap_t smallmap;
+    binmap_t treemap;
+    size_t dvsize;
+    size_t topsize;
+    char *least_addr;
+    mchunkptr dv;
+    mchunkptr top;
+    size_t trim_check;
+    size_t magic;
+    mchunkptr smallbins[(NSMALLBINS + 1) * 2];
+    tbinptr treebins[NTREEBINS];
+    size_t footprint;
+    size_t max_footprint;
+    flag_t mflags;
+#if USE_LOCKS
+    MLOCK_T mutex;              /* locate lock among fields that rarely change */
+#endif                          /* USE_LOCKS */
+    msegment seg;
+};
+
+typedef struct malloc_state *mstate;
+
+/* ------------- Global malloc_state and malloc_params ------------------- */
+
+/*
+  malloc_params holds global properties, including those that can be
+  dynamically set using mallopt. There is a single instance, mparams,
+  initialized in init_mparams.
+*/
+
+struct malloc_params
+{
+    size_t magic;
+    size_t page_size;
+    size_t granularity;
+    size_t mmap_threshold;
+    size_t trim_threshold;
+    flag_t default_mflags;
+};
+
+static struct malloc_params mparams;
+
+/* The global malloc_state used for all non-"mspace" calls */
+static struct malloc_state _gm_;
+#define gm                 (&_gm_)
+#define is_global(M)       ((M) == &_gm_)
+#define is_initialized(M)  ((M)->top != 0)
+
+/* -------------------------- system alloc setup ------------------------- */
+
+/* Operations on mflags */
+
+#define use_lock(M)           ((M)->mflags &   USE_LOCK_BIT)
+#define enable_lock(M)        ((M)->mflags |=  USE_LOCK_BIT)
+#define disable_lock(M)       ((M)->mflags &= ~USE_LOCK_BIT)
+
+#define use_mmap(M)           ((M)->mflags &   USE_MMAP_BIT)
+#define enable_mmap(M)        ((M)->mflags |=  USE_MMAP_BIT)
+#define disable_mmap(M)       ((M)->mflags &= ~USE_MMAP_BIT)
+
+#define use_noncontiguous(M)  ((M)->mflags &   USE_NONCONTIGUOUS_BIT)
+#define disable_contiguous(M) ((M)->mflags |=  USE_NONCONTIGUOUS_BIT)
+
+#define set_lock(M,L)\
+ ((M)->mflags = (L)?\
+  ((M)->mflags | USE_LOCK_BIT) :\
+  ((M)->mflags & ~USE_LOCK_BIT))
+
+/* page-align a size */
+#define page_align(S)\
+ (((S) + (mparams.page_size)) & ~(mparams.page_size - SIZE_T_ONE))
+
+/* granularity-align a size */
+#define granularity_align(S)\
+  (((S) + (mparams.granularity)) & ~(mparams.granularity - SIZE_T_ONE))
+
+#define is_page_aligned(S)\
+   (((size_t)(S) & (mparams.page_size - SIZE_T_ONE)) == 0)
+#define is_granularity_aligned(S)\
+   (((size_t)(S) & (mparams.granularity - SIZE_T_ONE)) == 0)
+
+/*  True if segment S holds address A */
+#define segment_holds(S, A)\
+  ((char*)(A) >= S->base && (char*)(A) < S->base + S->size)
+
+/* Return segment holding given address */
+static msegmentptr
+segment_holding(mstate m, char *addr)
+{
+    msegmentptr sp = &m->seg;
+    for (;;) {
+        if (addr >= sp->base && addr < sp->base + sp->size)
+            return sp;
+        if ((sp = sp->next) == 0)
+            return 0;
+    }
+}
+
+/* Return true if segment contains a segment link */
+static int
+has_segment_link(mstate m, msegmentptr ss)
+{
+    msegmentptr sp = &m->seg;
+    for (;;) {
+        if ((char *) sp >= ss->base && (char *) sp < ss->base + ss->size)
+            return 1;
+        if ((sp = sp->next) == 0)
+            return 0;
+    }
+}
+
+#ifndef MORECORE_CANNOT_TRIM
+#define should_trim(M,s)  ((s) > (M)->trim_check)
+#else /* MORECORE_CANNOT_TRIM */
+#define should_trim(M,s)  (0)
+#endif /* MORECORE_CANNOT_TRIM */
+
+/*
+  TOP_FOOT_SIZE is padding at the end of a segment, including space
+  that may be needed to place segment records and fenceposts when new
+  noncontiguous segments are added.
+*/
+#define TOP_FOOT_SIZE\
+  (align_offset(chunk2mem(0))+pad_request(sizeof(struct malloc_segment))+MIN_CHUNK_SIZE)
+
+
+/* -------------------------------  Hooks -------------------------------- */
+
+/*
+  PREACTION should be defined to return 0 on success, and nonzero on
+  failure. If you are not using locking, you can redefine these to do
+  anything you like.
+*/
+
+#if USE_LOCKS
+
+/* Ensure locks are initialized */
+#define GLOBALLY_INITIALIZE() (mparams.page_size == 0 && init_mparams())
+
+#define PREACTION(M)  ((GLOBALLY_INITIALIZE() || use_lock(M))? ACQUIRE_LOCK(&(M)->mutex) : 0)
+#define POSTACTION(M) { if (use_lock(M)) RELEASE_LOCK(&(M)->mutex); }
+#else /* USE_LOCKS */
+
+#ifndef PREACTION
+#define PREACTION(M) (0)
+#endif /* PREACTION */
+
+#ifndef POSTACTION
+#define POSTACTION(M)
+#endif /* POSTACTION */
+
+#endif /* USE_LOCKS */
+
+/*
+  CORRUPTION_ERROR_ACTION is triggered upon detected bad addresses.
+  USAGE_ERROR_ACTION is triggered on detected bad frees and
+  reallocs. The argument p is an address that might have triggered the
+  fault. It is ignored by the two predefined actions, but might be
+  useful in custom actions that try to help diagnose errors.
+*/
+
+#if PROCEED_ON_ERROR
+
+/* A count of the number of corruption errors causing resets */
+int malloc_corruption_error_count;
+
+/* default corruption action */
+static void reset_on_error(mstate m);
+
+#define CORRUPTION_ERROR_ACTION(m)  reset_on_error(m)
+#define USAGE_ERROR_ACTION(m, p)
+
+#else /* PROCEED_ON_ERROR */
+
+#ifndef CORRUPTION_ERROR_ACTION
+#define CORRUPTION_ERROR_ACTION(m) ABORT
+#endif /* CORRUPTION_ERROR_ACTION */
+
+#ifndef USAGE_ERROR_ACTION
+#define USAGE_ERROR_ACTION(m,p) ABORT
+#endif /* USAGE_ERROR_ACTION */
+
+#endif /* PROCEED_ON_ERROR */
+
+/* -------------------------- Debugging setup ---------------------------- */
+
+#if ! DEBUG
+
+#define check_free_chunk(M,P)
+#define check_inuse_chunk(M,P)
+#define check_malloced_chunk(M,P,N)
+#define check_mmapped_chunk(M,P)
+#define check_malloc_state(M)
+#define check_top_chunk(M,P)
+
+#else /* DEBUG */
+#define check_free_chunk(M,P)       do_check_free_chunk(M,P)
+#define check_inuse_chunk(M,P)      do_check_inuse_chunk(M,P)
+#define check_top_chunk(M,P)        do_check_top_chunk(M,P)
+#define check_malloced_chunk(M,P,N) do_check_malloced_chunk(M,P,N)
+#define check_mmapped_chunk(M,P)    do_check_mmapped_chunk(M,P)
+#define check_malloc_state(M)       do_check_malloc_state(M)
+
+static void do_check_any_chunk(mstate m, mchunkptr p);
+static void do_check_top_chunk(mstate m, mchunkptr p);
+static void do_check_mmapped_chunk(mstate m, mchunkptr p);
+static void do_check_inuse_chunk(mstate m, mchunkptr p);
+static void do_check_free_chunk(mstate m, mchunkptr p);
+static void do_check_malloced_chunk(mstate m, void *mem, size_t s);
+static void do_check_tree(mstate m, tchunkptr t);
+static void do_check_treebin(mstate m, bindex_t i);
+static void do_check_smallbin(mstate m, bindex_t i);
+static void do_check_malloc_state(mstate m);
+static int bin_find(mstate m, mchunkptr x);
+static size_t traverse_and_check(mstate m);
+#endif /* DEBUG */
+
+/* ---------------------------- Indexing Bins ---------------------------- */
+
+#define is_small(s)         (((s) >> SMALLBIN_SHIFT) < NSMALLBINS)
+#define small_index(s)      ((s)  >> SMALLBIN_SHIFT)
+#define small_index2size(i) ((i)  << SMALLBIN_SHIFT)
+#define MIN_SMALL_INDEX     (small_index(MIN_CHUNK_SIZE))
+
+/* addressing by index. See above about smallbin repositioning */
+#define smallbin_at(M, i)   ((sbinptr)((char*)&((M)->smallbins[(i)<<1])))
+#define treebin_at(M,i)     (&((M)->treebins[i]))
+
+/* assign tree index for size S to variable I */
+#if defined(__GNUC__) && defined(i386)
+#define compute_tree_index(S, I)\
+{\
+  size_t X = S >> TREEBIN_SHIFT;\
+  if (X == 0)\
+    I = 0;\
+  else if (X > 0xFFFF)\
+    I = NTREEBINS-1;\
+  else {\
+    unsigned int K;\
+    __asm__("bsrl %1,%0\n\t" : "=r" (K) : "rm"  (X));\
+    I =  (bindex_t)((K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1)));\
+  }\
+}
+#else /* GNUC */
+#define compute_tree_index(S, I)\
+{\
+  size_t X = S >> TREEBIN_SHIFT;\
+  if (X == 0)\
+    I = 0;\
+  else if (X > 0xFFFF)\
+    I = NTREEBINS-1;\
+  else {\
+    unsigned int Y = (unsigned int)X;\
+    unsigned int N = ((Y - 0x100) >> 16) & 8;\
+    unsigned int K = (((Y <<= N) - 0x1000) >> 16) & 4;\
+    N += K;\
+    N += K = (((Y <<= K) - 0x4000) >> 16) & 2;\
+    K = 14 - N + ((Y <<= K) >> 15);\
+    I = (K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1));\
+  }\
+}
+#endif /* GNUC */
+
+/* Bit representing maximum resolved size in a treebin at i */
+#define bit_for_tree_index(i) \
+   (i == NTREEBINS-1)? (SIZE_T_BITSIZE-1) : (((i) >> 1) + TREEBIN_SHIFT - 2)
+
+/* Shift placing maximum resolved bit in a treebin at i as sign bit */
+#define leftshift_for_tree_index(i) \
+   ((i == NTREEBINS-1)? 0 : \
+    ((SIZE_T_BITSIZE-SIZE_T_ONE) - (((i) >> 1) + TREEBIN_SHIFT - 2)))
+
+/* The size of the smallest chunk held in bin with index i */
+#define minsize_for_tree_index(i) \
+   ((SIZE_T_ONE << (((i) >> 1) + TREEBIN_SHIFT)) |  \
+   (((size_t)((i) & SIZE_T_ONE)) << (((i) >> 1) + TREEBIN_SHIFT - 1)))
+
+
+/* ------------------------ Operations on bin maps ----------------------- */
+
+/* bit corresponding to given index */
+#define idx2bit(i)              ((binmap_t)(1) << (i))
+
+/* Mark/Clear bits with given index */
+#define mark_smallmap(M,i)      ((M)->smallmap |=  idx2bit(i))
+#define clear_smallmap(M,i)     ((M)->smallmap &= ~idx2bit(i))
+#define smallmap_is_marked(M,i) ((M)->smallmap &   idx2bit(i))
+
+#define mark_treemap(M,i)       ((M)->treemap  |=  idx2bit(i))
+#define clear_treemap(M,i)      ((M)->treemap  &= ~idx2bit(i))
+#define treemap_is_marked(M,i)  ((M)->treemap  &   idx2bit(i))
+
+/* index corresponding to given bit */
+
+#if defined(__GNUC__) && defined(i386)
+#define compute_bit2idx(X, I)\
+{\
+  unsigned int J;\
+  __asm__("bsfl %1,%0\n\t" : "=r" (J) : "rm" (X));\
+  I = (bindex_t)J;\
+}
+
+#else /* GNUC */
+#if  USE_BUILTIN_FFS
+#define compute_bit2idx(X, I) I = ffs(X)-1
+
+#else /* USE_BUILTIN_FFS */
+#define compute_bit2idx(X, I)\
+{\
+  unsigned int Y = X - 1;\
+  unsigned int K = Y >> (16-4) & 16;\
+  unsigned int N = K;        Y >>= K;\
+  N += K = Y >> (8-3) &  8;  Y >>= K;\
+  N += K = Y >> (4-2) &  4;  Y >>= K;\
+  N += K = Y >> (2-1) &  2;  Y >>= K;\
+  N += K = Y >> (1-0) &  1;  Y >>= K;\
+  I = (bindex_t)(N + Y);\
+}
+#endif /* USE_BUILTIN_FFS */
+#endif /* GNUC */
+
+/* isolate the least set bit of a bitmap */
+#define least_bit(x)         ((x) & -(x))
+
+/* mask with all bits to left of least bit of x on */
+#define left_bits(x)         ((x<<1) | -(x<<1))
+
+/* mask with all bits to left of or equal to least bit of x on */
+#define same_or_left_bits(x) ((x) | -(x))
+
+
+/* ----------------------- Runtime Check Support ------------------------- */
+
+/*
+  For security, the main invariant is that malloc/free/etc never
+  writes to a static address other than malloc_state, unless static
+  malloc_state itself has been corrupted, which cannot occur via
+  malloc (because of these checks). In essence this means that we
+  believe all pointers, sizes, maps etc held in malloc_state, but
+  check all of those linked or offsetted from other embedded data
+  structures.  These checks are interspersed with main code in a way
+  that tends to minimize their run-time cost.
+
+  When FOOTERS is defined, in addition to range checking, we also
+  verify footer fields of inuse chunks, which can be used guarantee
+  that the mstate controlling malloc/free is intact.  This is a
+  streamlined version of the approach described by William Robertson
+  et al in "Run-time Detection of Heap-based Overflows" LISA'03
+  http://www.usenix.org/events/lisa03/tech/robertson.html The footer
+  of an inuse chunk holds the xor of its mstate and a random seed,
+  that is checked upon calls to free() and realloc().  This is
+  (probablistically) unguessable from outside the program, but can be
+  computed by any code successfully malloc'ing any chunk, so does not
+  itself provide protection against code that has already broken
+  security through some other means.  Unlike Robertson et al, we
+  always dynamically check addresses of all offset chunks (previous,
+  next, etc). This turns out to be cheaper than relying on hashes.
+*/
+
+#if !INSECURE
+/* Check if address a is at least as high as any from MORECORE or MMAP */
+#define ok_address(M, a) ((char*)(a) >= (M)->least_addr)
+/* Check if address of next chunk n is higher than base chunk p */
+#define ok_next(p, n)    ((char*)(p) < (char*)(n))
+/* Check if p has its cinuse bit on */
+#define ok_cinuse(p)     cinuse(p)
+/* Check if p has its pinuse bit on */
+#define ok_pinuse(p)     pinuse(p)
+
+#else /* !INSECURE */
+#define ok_address(M, a) (1)
+#define ok_next(b, n)    (1)
+#define ok_cinuse(p)     (1)
+#define ok_pinuse(p)     (1)
+#endif /* !INSECURE */
+
+#if (FOOTERS && !INSECURE)
+/* Check if (alleged) mstate m has expected magic field */
+#define ok_magic(M)      ((M)->magic == mparams.magic)
+#else /* (FOOTERS && !INSECURE) */
+#define ok_magic(M)      (1)
+#endif /* (FOOTERS && !INSECURE) */
+
+
+/* In gcc, use __builtin_expect to minimize impact of checks */
+#if !INSECURE
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define RTCHECK(e)  __builtin_expect(e, 1)
+#else /* GNUC */
+#define RTCHECK(e)  (e)
+#endif /* GNUC */
+#else /* !INSECURE */
+#define RTCHECK(e)  (1)
+#endif /* !INSECURE */
+
+/* macros to set up inuse chunks with or without footers */
+
+#if !FOOTERS
+
+#define mark_inuse_foot(M,p,s)
+
+/* Set cinuse bit and pinuse bit of next chunk */
+#define set_inuse(M,p,s)\
+  ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\
+  ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT)
+
+/* Set cinuse and pinuse of this chunk and pinuse of next chunk */
+#define set_inuse_and_pinuse(M,p,s)\
+  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
+  ((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT)
+
+/* Set size, cinuse and pinuse bit of this chunk */
+#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\
+  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT))
+
+#else /* FOOTERS */
+
+/* Set foot of inuse chunk to be xor of mstate and seed */
+#define mark_inuse_foot(M,p,s)\
+  (((mchunkptr)((char*)(p) + (s)))->prev_foot = ((size_t)(M) ^ mparams.magic))
+
+#define get_mstate_for(p)\
+  ((mstate)(((mchunkptr)((char*)(p) +\
+    (chunksize(p))))->prev_foot ^ mparams.magic))
+
+#define set_inuse(M,p,s)\
+  ((p)->head = (((p)->head & PINUSE_BIT)|s|CINUSE_BIT),\
+  (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT), \
+  mark_inuse_foot(M,p,s))
+
+#define set_inuse_and_pinuse(M,p,s)\
+  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
+  (((mchunkptr)(((char*)(p)) + (s)))->head |= PINUSE_BIT),\
+ mark_inuse_foot(M,p,s))
+
+#define set_size_and_pinuse_of_inuse_chunk(M, p, s)\
+  ((p)->head = (s|PINUSE_BIT|CINUSE_BIT),\
+  mark_inuse_foot(M, p, s))
+
+#endif /* !FOOTERS */
+
+/* ---------------------------- setting mparams -------------------------- */
+
+/* Initialize mparams */
+static int
+init_mparams(void)
+{
+    if (mparams.page_size == 0) {
+        size_t s;
+
+        mparams.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
+        mparams.trim_threshold = DEFAULT_TRIM_THRESHOLD;
+#if MORECORE_CONTIGUOUS
+        mparams.default_mflags = USE_LOCK_BIT | USE_MMAP_BIT;
+#else /* MORECORE_CONTIGUOUS */
+        mparams.default_mflags =
+            USE_LOCK_BIT | USE_MMAP_BIT | USE_NONCONTIGUOUS_BIT;
+#endif /* MORECORE_CONTIGUOUS */
+
+#if (FOOTERS && !INSECURE)
+        {
+#if USE_DEV_RANDOM
+            int fd;
+            unsigned char buf[sizeof(size_t)];
+            /* Try to use /dev/urandom, else fall back on using time */
+            if ((fd = open("/dev/urandom", O_RDONLY)) >= 0 &&
+                read(fd, buf, sizeof(buf)) == sizeof(buf)) {
+                s = *((size_t *) buf);
+                close(fd);
+            } else
+#endif /* USE_DEV_RANDOM */
+                s = (size_t) (time(0) ^ (size_t) 0x55555555U);
+
+            s |= (size_t) 8U;   /* ensure nonzero */
+            s &= ~(size_t) 7U;  /* improve chances of fault for bad values */
+
+        }
+#else /* (FOOTERS && !INSECURE) */
+        s = (size_t) 0x58585858U;
+#endif /* (FOOTERS && !INSECURE) */
+        ACQUIRE_MAGIC_INIT_LOCK();
+        if (mparams.magic == 0) {
+            mparams.magic = s;
+            /* Set up lock for main malloc area */
+            INITIAL_LOCK(&gm->mutex);
+            gm->mflags = mparams.default_mflags;
+        }
+        RELEASE_MAGIC_INIT_LOCK();
+
+#ifndef WIN32
+        mparams.page_size = malloc_getpagesize;
+        mparams.granularity = ((DEFAULT_GRANULARITY != 0) ?
+                               DEFAULT_GRANULARITY : mparams.page_size);
+#else /* WIN32 */
+        {
+            SYSTEM_INFO system_info;
+            GetSystemInfo(&system_info);
+            mparams.page_size = system_info.dwPageSize;
+            mparams.granularity = system_info.dwAllocationGranularity;
+        }
+#endif /* WIN32 */
+
+        /* Sanity-check configuration:
+           size_t must be unsigned and as wide as pointer type.
+           ints must be at least 4 bytes.
+           alignment must be at least 8.
+           Alignment, min chunk size, and page size must all be powers of 2.
+         */
+        if ((sizeof(size_t) != sizeof(char *)) ||
+            (MAX_SIZE_T < MIN_CHUNK_SIZE) ||
+            (sizeof(int) < 4) ||
+            (MALLOC_ALIGNMENT < (size_t) 8U) ||
+            ((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT - SIZE_T_ONE)) != 0) ||
+            ((MCHUNK_SIZE & (MCHUNK_SIZE - SIZE_T_ONE)) != 0) ||
+            ((mparams.granularity & (mparams.granularity - SIZE_T_ONE)) != 0)
+            || ((mparams.page_size & (mparams.page_size - SIZE_T_ONE)) != 0))
+            ABORT;
+    }
+    return 0;
+}
+
+/* support for mallopt */
+static int
+change_mparam(int param_number, int value)
+{
+    size_t val = (size_t) value;
+    init_mparams();
+    switch (param_number) {
+    case M_TRIM_THRESHOLD:
+        mparams.trim_threshold = val;
+        return 1;
+    case M_GRANULARITY:
+        if (val >= mparams.page_size && ((val & (val - 1)) == 0)) {
+            mparams.granularity = val;
+            return 1;
+        } else
+            return 0;
+    case M_MMAP_THRESHOLD:
+        mparams.mmap_threshold = val;
+        return 1;
+    default:
+        return 0;
+    }
+}
+
+#if DEBUG
+/* ------------------------- Debugging Support --------------------------- */
+
+/* Check properties of any chunk, whether free, inuse, mmapped etc  */
+static void
+do_check_any_chunk(mstate m, mchunkptr p)
+{
+    assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
+    assert(ok_address(m, p));
+}
+
+/* Check properties of top chunk */
+static void
+do_check_top_chunk(mstate m, mchunkptr p)
+{
+    msegmentptr sp = segment_holding(m, (char *) p);
+    size_t sz = chunksize(p);
+    assert(sp != 0);
+    assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
+    assert(ok_address(m, p));
+    assert(sz == m->topsize);
+    assert(sz > 0);
+    assert(sz == ((sp->base + sp->size) - (char *) p) - TOP_FOOT_SIZE);
+    assert(pinuse(p));
+    assert(!next_pinuse(p));
+}
+
+/* Check properties of (inuse) mmapped chunks */
+static void
+do_check_mmapped_chunk(mstate m, mchunkptr p)
+{
+    size_t sz = chunksize(p);
+    size_t len = (sz + (p->prev_foot & ~IS_MMAPPED_BIT) + MMAP_FOOT_PAD);
+    assert(is_mmapped(p));
+    assert(use_mmap(m));
+    assert((is_aligned(chunk2mem(p))) || (p->head == FENCEPOST_HEAD));
+    assert(ok_address(m, p));
+    assert(!is_small(sz));
+    assert((len & (mparams.page_size - SIZE_T_ONE)) == 0);
+    assert(chunk_plus_offset(p, sz)->head == FENCEPOST_HEAD);
+    assert(chunk_plus_offset(p, sz + SIZE_T_SIZE)->head == 0);
+}
+
+/* Check properties of inuse chunks */
+static void
+do_check_inuse_chunk(mstate m, mchunkptr p)
+{
+    do_check_any_chunk(m, p);
+    assert(cinuse(p));
+    assert(next_pinuse(p));
+    /* If not pinuse and not mmapped, previous chunk has OK offset */
+    assert(is_mmapped(p) || pinuse(p) || next_chunk(prev_chunk(p)) == p);
+    if (is_mmapped(p))
+        do_check_mmapped_chunk(m, p);
+}
+
+/* Check properties of free chunks */
+static void
+do_check_free_chunk(mstate m, mchunkptr p)
+{
+    size_t sz = p->head & ~(PINUSE_BIT | CINUSE_BIT);
+    mchunkptr next = chunk_plus_offset(p, sz);
+    do_check_any_chunk(m, p);
+    assert(!cinuse(p));
+    assert(!next_pinuse(p));
+    assert(!is_mmapped(p));
+    if (p != m->dv && p != m->top) {
+        if (sz >= MIN_CHUNK_SIZE) {
+            assert((sz & CHUNK_ALIGN_MASK) == 0);
+            assert(is_aligned(chunk2mem(p)));
+            assert(next->prev_foot == sz);
+            assert(pinuse(p));
+            assert(next == m->top || cinuse(next));
+            assert(p->fd->bk == p);
+            assert(p->bk->fd == p);
+        } else                  /* markers are always of size SIZE_T_SIZE */
+            assert(sz == SIZE_T_SIZE);
+    }
+}
+
+/* Check properties of malloced chunks at the point they are malloced */
+static void
+do_check_malloced_chunk(mstate m, void *mem, size_t s)
+{
+    if (mem != 0) {
+        mchunkptr p = mem2chunk(mem);
+        size_t sz = p->head & ~(PINUSE_BIT | CINUSE_BIT);
+        do_check_inuse_chunk(m, p);
+        assert((sz & CHUNK_ALIGN_MASK) == 0);
+        assert(sz >= MIN_CHUNK_SIZE);
+        assert(sz >= s);
+        /* unless mmapped, size is less than MIN_CHUNK_SIZE more than request */
+        assert(is_mmapped(p) || sz < (s + MIN_CHUNK_SIZE));
+    }
+}
+
+/* Check a tree and its subtrees.  */
+static void
+do_check_tree(mstate m, tchunkptr t)
+{
+    tchunkptr head = 0;
+    tchunkptr u = t;
+    bindex_t tindex = t->index;
+    size_t tsize = chunksize(t);
+    bindex_t idx;
+    compute_tree_index(tsize, idx);
+    assert(tindex == idx);
+    assert(tsize >= MIN_LARGE_SIZE);
+    assert(tsize >= minsize_for_tree_index(idx));
+    assert((idx == NTREEBINS - 1)
+           || (tsize < minsize_for_tree_index((idx + 1))));
+
+    do {                        /* traverse through chain of same-sized nodes */
+        do_check_any_chunk(m, ((mchunkptr) u));
+        assert(u->index == tindex);
+        assert(chunksize(u) == tsize);
+        assert(!cinuse(u));
+        assert(!next_pinuse(u));
+        assert(u->fd->bk == u);
+        assert(u->bk->fd == u);
+        if (u->parent == 0) {
+            assert(u->child[0] == 0);
+            assert(u->child[1] == 0);
+        } else {
+            assert(head == 0);  /* only one node on chain has parent */
+            head = u;
+            assert(u->parent != u);
+            assert(u->parent->child[0] == u ||
+                   u->parent->child[1] == u ||
+                   *((tbinptr *) (u->parent)) == u);
+            if (u->child[0] != 0) {
+                assert(u->child[0]->parent == u);
+                assert(u->child[0] != u);
+                do_check_tree(m, u->child[0]);
+            }
+            if (u->child[1] != 0) {
+                assert(u->child[1]->parent == u);
+                assert(u->child[1] != u);
+                do_check_tree(m, u->child[1]);
+            }
+            if (u->child[0] != 0 && u->child[1] != 0) {
+                assert(chunksize(u->child[0]) < chunksize(u->child[1]));
+            }
+        }
+        u = u->fd;
+    } while (u != t);
+    assert(head != 0);
+}
+
+/*  Check all the chunks in a treebin.  */
+static void
+do_check_treebin(mstate m, bindex_t i)
+{
+    tbinptr *tb = treebin_at(m, i);
+    tchunkptr t = *tb;
+    int empty = (m->treemap & (1U << i)) == 0;
+    if (t == 0)
+        assert(empty);
+    if (!empty)
+        do_check_tree(m, t);
+}
+
+/*  Check all the chunks in a smallbin.  */
+static void
+do_check_smallbin(mstate m, bindex_t i)
+{
+    sbinptr b = smallbin_at(m, i);
+    mchunkptr p = b->bk;
+    unsigned int empty = (m->smallmap & (1U << i)) == 0;
+    if (p == b)
+        assert(empty);
+    if (!empty) {
+        for (; p != b; p = p->bk) {
+            size_t size = chunksize(p);
+            mchunkptr q;
+            /* each chunk claims to be free */
+            do_check_free_chunk(m, p);
+            /* chunk belongs in bin */
+            assert(small_index(size) == i);
+            assert(p->bk == b || chunksize(p->bk) == chunksize(p));
+            /* chunk is followed by an inuse chunk */
+            q = next_chunk(p);
+            if (q->head != FENCEPOST_HEAD)
+                do_check_inuse_chunk(m, q);
+        }
+    }
+}
+
+/* Find x in a bin. Used in other check functions. */
+static int
+bin_find(mstate m, mchunkptr x)
+{
+    size_t size = chunksize(x);
+    if (is_small(size)) {
+        bindex_t sidx = small_index(size);
+        sbinptr b = smallbin_at(m, sidx);
+        if (smallmap_is_marked(m, sidx)) {
+            mchunkptr p = b;
+            do {
+                if (p == x)
+                    return 1;
+            } while ((p = p->fd) != b);
+        }
+    } else {
+        bindex_t tidx;
+        compute_tree_index(size, tidx);
+        if (treemap_is_marked(m, tidx)) {
+            tchunkptr t = *treebin_at(m, tidx);
+            size_t sizebits = size << leftshift_for_tree_index(tidx);
+            while (t != 0 && chunksize(t) != size) {
+                t = t->child[(sizebits >> (SIZE_T_BITSIZE - SIZE_T_ONE)) & 1];
+                sizebits <<= 1;
+            }
+            if (t != 0) {
+                tchunkptr u = t;
+                do {
+                    if (u == (tchunkptr) x)
+                        return 1;
+                } while ((u = u->fd) != t);
+            }
+        }
+    }
+    return 0;
+}
+
+/* Traverse each chunk and check it; return total */
+static size_t
+traverse_and_check(mstate m)
+{
+    size_t sum = 0;
+    if (is_initialized(m)) {
+        msegmentptr s = &m->seg;
+        sum += m->topsize + TOP_FOOT_SIZE;
+        while (s != 0) {
+            mchunkptr q = align_as_chunk(s->base);
+            mchunkptr lastq = 0;
+            assert(pinuse(q));
+            while (segment_holds(s, q) &&
+                   q != m->top && q->head != FENCEPOST_HEAD) {
+                sum += chunksize(q);
+                if (cinuse(q)) {
+                    assert(!bin_find(m, q));
+                    do_check_inuse_chunk(m, q);
+                } else {
+                    assert(q == m->dv || bin_find(m, q));
+                    assert(lastq == 0 || cinuse(lastq));        /* Not 2 consecutive free */
+                    do_check_free_chunk(m, q);
+                }
+                lastq = q;
+                q = next_chunk(q);
+            }
+            s = s->next;
+        }
+    }
+    return sum;
+}
+
+/* Check all properties of malloc_state. */
+static void
+do_check_malloc_state(mstate m)
+{
+    bindex_t i;
+    size_t total;
+    /* check bins */
+    for (i = 0; i < NSMALLBINS; ++i)
+        do_check_smallbin(m, i);
+    for (i = 0; i < NTREEBINS; ++i)
+        do_check_treebin(m, i);
+
+    if (m->dvsize != 0) {       /* check dv chunk */
+        do_check_any_chunk(m, m->dv);
+        assert(m->dvsize == chunksize(m->dv));
+        assert(m->dvsize >= MIN_CHUNK_SIZE);
+        assert(bin_find(m, m->dv) == 0);
+    }
+
+    if (m->top != 0) {          /* check top chunk */
+        do_check_top_chunk(m, m->top);
+        assert(m->topsize == chunksize(m->top));
+        assert(m->topsize > 0);
+        assert(bin_find(m, m->top) == 0);
+    }
+
+    total = traverse_and_check(m);
+    assert(total <= m->footprint);
+    assert(m->footprint <= m->max_footprint);
+}
+#endif /* DEBUG */
+
+/* ----------------------------- statistics ------------------------------ */
+
+#if !NO_MALLINFO
+static struct mallinfo
+internal_mallinfo(mstate m)
+{
+    struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+    if (!PREACTION(m)) {
+        check_malloc_state(m);
+        if (is_initialized(m)) {
+            size_t nfree = SIZE_T_ONE;  /* top always free */
+            size_t mfree = m->topsize + TOP_FOOT_SIZE;
+            size_t sum = mfree;
+            msegmentptr s = &m->seg;
+            while (s != 0) {
+                mchunkptr q = align_as_chunk(s->base);
+                while (segment_holds(s, q) &&
+                       q != m->top && q->head != FENCEPOST_HEAD) {
+                    size_t sz = chunksize(q);
+                    sum += sz;
+                    if (!cinuse(q)) {
+                        mfree += sz;
+                        ++nfree;
+                    }
+                    q = next_chunk(q);
+                }
+                s = s->next;
+            }
+
+            nm.arena = sum;
+            nm.ordblks = nfree;
+            nm.hblkhd = m->footprint - sum;
+            nm.usmblks = m->max_footprint;
+            nm.uordblks = m->footprint - mfree;
+            nm.fordblks = mfree;
+            nm.keepcost = m->topsize;
+        }
+
+        POSTACTION(m);
+    }
+    return nm;
+}
+#endif /* !NO_MALLINFO */
+
+static void
+internal_malloc_stats(mstate m)
+{
+    if (!PREACTION(m)) {
+        size_t maxfp = 0;
+        size_t fp = 0;
+        size_t used = 0;
+        check_malloc_state(m);
+        if (is_initialized(m)) {
+            msegmentptr s = &m->seg;
+            maxfp = m->max_footprint;
+            fp = m->footprint;
+            used = fp - (m->topsize + TOP_FOOT_SIZE);
+
+            while (s != 0) {
+                mchunkptr q = align_as_chunk(s->base);
+                while (segment_holds(s, q) &&
+                       q != m->top && q->head != FENCEPOST_HEAD) {
+                    if (!cinuse(q))
+                        used -= chunksize(q);
+                    q = next_chunk(q);
+                }
+                s = s->next;
+            }
+        }
+#ifndef LACKS_STDIO_H
+        fprintf(stderr, "max system bytes = %10lu\n",
+                (unsigned long) (maxfp));
+        fprintf(stderr, "system bytes     = %10lu\n", (unsigned long) (fp));
+        fprintf(stderr, "in use bytes     = %10lu\n", (unsigned long) (used));
+#endif
+
+        POSTACTION(m);
+    }
+}
+
+/* ----------------------- Operations on smallbins ----------------------- */
+
+/*
+  Various forms of linking and unlinking are defined as macros.  Even
+  the ones for trees, which are very long but have very short typical
+  paths.  This is ugly but reduces reliance on inlining support of
+  compilers.
+*/
+
+/* Link a free chunk into a smallbin  */
+#define insert_small_chunk(M, P, S) {\
+  bindex_t I  = small_index(S);\
+  mchunkptr B = smallbin_at(M, I);\
+  mchunkptr F = B;\
+  assert(S >= MIN_CHUNK_SIZE);\
+  if (!smallmap_is_marked(M, I))\
+    mark_smallmap(M, I);\
+  else if (RTCHECK(ok_address(M, B->fd)))\
+    F = B->fd;\
+  else {\
+    CORRUPTION_ERROR_ACTION(M);\
+  }\
+  B->fd = P;\
+  F->bk = P;\
+  P->fd = F;\
+  P->bk = B;\
+}
+
+/* Unlink a chunk from a smallbin  */
+#define unlink_small_chunk(M, P, S) {\
+  mchunkptr F = P->fd;\
+  mchunkptr B = P->bk;\
+  bindex_t I = small_index(S);\
+  assert(P != B);\
+  assert(P != F);\
+  assert(chunksize(P) == small_index2size(I));\
+  if (F == B)\
+    clear_smallmap(M, I);\
+  else if (RTCHECK((F == smallbin_at(M,I) || ok_address(M, F)) &&\
+                   (B == smallbin_at(M,I) || ok_address(M, B)))) {\
+    F->bk = B;\
+    B->fd = F;\
+  }\
+  else {\
+    CORRUPTION_ERROR_ACTION(M);\
+  }\
+}
+
+/* Unlink the first chunk from a smallbin */
+#define unlink_first_small_chunk(M, B, P, I) {\
+  mchunkptr F = P->fd;\
+  assert(P != B);\
+  assert(P != F);\
+  assert(chunksize(P) == small_index2size(I));\
+  if (B == F)\
+    clear_smallmap(M, I);\
+  else if (RTCHECK(ok_address(M, F))) {\
+    B->fd = F;\
+    F->bk = B;\
+  }\
+  else {\
+    CORRUPTION_ERROR_ACTION(M);\
+  }\
+}
+
+/* Replace dv node, binning the old one */
+/* Used only when dvsize known to be small */
+#define replace_dv(M, P, S) {\
+  size_t DVS = M->dvsize;\
+  if (DVS != 0) {\
+    mchunkptr DV = M->dv;\
+    assert(is_small(DVS));\
+    insert_small_chunk(M, DV, DVS);\
+  }\
+  M->dvsize = S;\
+  M->dv = P;\
+}
+
+/* ------------------------- Operations on trees ------------------------- */
+
+/* Insert chunk into tree */
+#define insert_large_chunk(M, X, S) {\
+  tbinptr* H;\
+  bindex_t I;\
+  compute_tree_index(S, I);\
+  H = treebin_at(M, I);\
+  X->index = I;\
+  X->child[0] = X->child[1] = 0;\
+  if (!treemap_is_marked(M, I)) {\
+    mark_treemap(M, I);\
+    *H = X;\
+    X->parent = (tchunkptr)H;\
+    X->fd = X->bk = X;\
+  }\
+  else {\
+    tchunkptr T = *H;\
+    size_t K = S << leftshift_for_tree_index(I);\
+    for (;;) {\
+      if (chunksize(T) != S) {\
+        tchunkptr* C = &(T->child[(K >> (SIZE_T_BITSIZE-SIZE_T_ONE)) & 1]);\
+        K <<= 1;\
+        if (*C != 0)\
+          T = *C;\
+        else if (RTCHECK(ok_address(M, C))) {\
+          *C = X;\
+          X->parent = T;\
+          X->fd = X->bk = X;\
+          break;\
+        }\
+        else {\
+          CORRUPTION_ERROR_ACTION(M);\
+          break;\
+        }\
+      }\
+      else {\
+        tchunkptr F = T->fd;\
+        if (RTCHECK(ok_address(M, T) && ok_address(M, F))) {\
+          T->fd = F->bk = X;\
+          X->fd = F;\
+          X->bk = T;\
+          X->parent = 0;\
+          break;\
+        }\
+        else {\
+          CORRUPTION_ERROR_ACTION(M);\
+          break;\
+        }\
+      }\
+    }\
+  }\
+}
+
+/*
+  Unlink steps:
+
+  1. If x is a chained node, unlink it from its same-sized fd/bk links
+     and choose its bk node as its replacement.
+  2. If x was the last node of its size, but not a leaf node, it must
+     be replaced with a leaf node (not merely one with an open left or
+     right), to make sure that lefts and rights of descendents
+     correspond properly to bit masks.  We use the rightmost descendent
+     of x.  We could use any other leaf, but this is easy to locate and
+     tends to counteract removal of leftmosts elsewhere, and so keeps
+     paths shorter than minimally guaranteed.  This doesn't loop much
+     because on average a node in a tree is near the bottom.
+  3. If x is the base of a chain (i.e., has parent links) relink
+     x's parent and children to x's replacement (or null if none).
+*/
+
+#define unlink_large_chunk(M, X) {\
+  tchunkptr XP = X->parent;\
+  tchunkptr R;\
+  if (X->bk != X) {\
+    tchunkptr F = X->fd;\
+    R = X->bk;\
+    if (RTCHECK(ok_address(M, F))) {\
+      F->bk = R;\
+      R->fd = F;\
+    }\
+    else {\
+      CORRUPTION_ERROR_ACTION(M);\
+    }\
+  }\
+  else {\
+    tchunkptr* RP;\
+    if (((R = *(RP = &(X->child[1]))) != 0) ||\
+        ((R = *(RP = &(X->child[0]))) != 0)) {\
+      tchunkptr* CP;\
+      while ((*(CP = &(R->child[1])) != 0) ||\
+             (*(CP = &(R->child[0])) != 0)) {\
+        R = *(RP = CP);\
+      }\
+      if (RTCHECK(ok_address(M, RP)))\
+        *RP = 0;\
+      else {\
+        CORRUPTION_ERROR_ACTION(M);\
+      }\
+    }\
+  }\
+  if (XP != 0) {\
+    tbinptr* H = treebin_at(M, X->index);\
+    if (X == *H) {\
+      if ((*H = R) == 0) \
+        clear_treemap(M, X->index);\
+    }\
+    else if (RTCHECK(ok_address(M, XP))) {\
+      if (XP->child[0] == X) \
+        XP->child[0] = R;\
+      else \
+        XP->child[1] = R;\
+    }\
+    else\
+      CORRUPTION_ERROR_ACTION(M);\
+    if (R != 0) {\
+      if (RTCHECK(ok_address(M, R))) {\
+        tchunkptr C0, C1;\
+        R->parent = XP;\
+        if ((C0 = X->child[0]) != 0) {\
+          if (RTCHECK(ok_address(M, C0))) {\
+            R->child[0] = C0;\
+            C0->parent = R;\
+          }\
+          else\
+            CORRUPTION_ERROR_ACTION(M);\
+        }\
+        if ((C1 = X->child[1]) != 0) {\
+          if (RTCHECK(ok_address(M, C1))) {\
+            R->child[1] = C1;\
+            C1->parent = R;\
+          }\
+          else\
+            CORRUPTION_ERROR_ACTION(M);\
+        }\
+      }\
+      else\
+        CORRUPTION_ERROR_ACTION(M);\
+    }\
+  }\
+}
+
+/* Relays to large vs small bin operations */
+
+#define insert_chunk(M, P, S)\
+  if (is_small(S)) insert_small_chunk(M, P, S)\
+  else { tchunkptr TP = (tchunkptr)(P); insert_large_chunk(M, TP, S); }
+
+#define unlink_chunk(M, P, S)\
+  if (is_small(S)) unlink_small_chunk(M, P, S)\
+  else { tchunkptr TP = (tchunkptr)(P); unlink_large_chunk(M, TP); }
+
+
+/* Relays to internal calls to malloc/free from realloc, memalign etc */
+
+#if ONLY_MSPACES
+#define internal_malloc(m, b) mspace_malloc(m, b)
+#define internal_free(m, mem) mspace_free(m,mem);
+#else /* ONLY_MSPACES */
+#if MSPACES
+#define internal_malloc(m, b)\
+   (m == gm)? dlmalloc(b) : mspace_malloc(m, b)
+#define internal_free(m, mem)\
+   if (m == gm) dlfree(mem); else mspace_free(m,mem);
+#else /* MSPACES */
+#define internal_malloc(m, b) dlmalloc(b)
+#define internal_free(m, mem) dlfree(mem)
+#endif /* MSPACES */
+#endif /* ONLY_MSPACES */
+
+/* -----------------------  Direct-mmapping chunks ----------------------- */
+
+/*
+  Directly mmapped chunks are set up with an offset to the start of
+  the mmapped region stored in the prev_foot field of the chunk. This
+  allows reconstruction of the required argument to MUNMAP when freed,
+  and also allows adjustment of the returned chunk to meet alignment
+  requirements (especially in memalign).  There is also enough space
+  allocated to hold a fake next chunk of size SIZE_T_SIZE to maintain
+  the PINUSE bit so frees can be checked.
+*/
+
+/* Malloc using mmap */
+static void *
+mmap_alloc(mstate m, size_t nb)
+{
+    size_t mmsize =
+        granularity_align(nb + SIX_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
+    if (mmsize > nb) {          /* Check for wrap around 0 */
+        char *mm = (char *) (DIRECT_MMAP(mmsize));
+        if (mm != CMFAIL) {
+            size_t offset = align_offset(chunk2mem(mm));
+            size_t psize = mmsize - offset - MMAP_FOOT_PAD;
+            mchunkptr p = (mchunkptr) (mm + offset);
+            p->prev_foot = offset | IS_MMAPPED_BIT;
+            (p)->head = (psize | CINUSE_BIT);
+            mark_inuse_foot(m, p, psize);
+            chunk_plus_offset(p, psize)->head = FENCEPOST_HEAD;
+            chunk_plus_offset(p, psize + SIZE_T_SIZE)->head = 0;
+
+            if (mm < m->least_addr)
+                m->least_addr = mm;
+            if ((m->footprint += mmsize) > m->max_footprint)
+                m->max_footprint = m->footprint;
+            assert(is_aligned(chunk2mem(p)));
+            check_mmapped_chunk(m, p);
+            return chunk2mem(p);
+        }
+    }
+    return 0;
+}
+
+/* Realloc using mmap */
+static mchunkptr
+mmap_resize(mstate m, mchunkptr oldp, size_t nb)
+{
+    size_t oldsize = chunksize(oldp);
+    if (is_small(nb))           /* Can't shrink mmap regions below small size */
+        return 0;
+    /* Keep old chunk if big enough but not too big */
+    if (oldsize >= nb + SIZE_T_SIZE &&
+        (oldsize - nb) <= (mparams.granularity << 1))
+        return oldp;
+    else {
+        size_t offset = oldp->prev_foot & ~IS_MMAPPED_BIT;
+        size_t oldmmsize = oldsize + offset + MMAP_FOOT_PAD;
+        size_t newmmsize = granularity_align(nb + SIX_SIZE_T_SIZES +
+                                             CHUNK_ALIGN_MASK);
+        char *cp = (char *) CALL_MREMAP((char *) oldp - offset,
+                                        oldmmsize, newmmsize, 1);
+        if (cp != CMFAIL) {
+            mchunkptr newp = (mchunkptr) (cp + offset);
+            size_t psize = newmmsize - offset - MMAP_FOOT_PAD;
+            newp->head = (psize | CINUSE_BIT);
+            mark_inuse_foot(m, newp, psize);
+            chunk_plus_offset(newp, psize)->head = FENCEPOST_HEAD;
+            chunk_plus_offset(newp, psize + SIZE_T_SIZE)->head = 0;
+
+            if (cp < m->least_addr)
+                m->least_addr = cp;
+            if ((m->footprint += newmmsize - oldmmsize) > m->max_footprint)
+                m->max_footprint = m->footprint;
+            check_mmapped_chunk(m, newp);
+            return newp;
+        }
+    }
+    return 0;
+}
+
+/* -------------------------- mspace management -------------------------- */
+
+/* Initialize top chunk and its size */
+static void
+init_top(mstate m, mchunkptr p, size_t psize)
+{
+    /* Ensure alignment */
+    size_t offset = align_offset(chunk2mem(p));
+    p = (mchunkptr) ((char *) p + offset);
+    psize -= offset;
+
+    m->top = p;
+    m->topsize = psize;
+    p->head = psize | PINUSE_BIT;
+    /* set size of fake trailing chunk holding overhead space only once */
+    chunk_plus_offset(p, psize)->head = TOP_FOOT_SIZE;
+    m->trim_check = mparams.trim_threshold;     /* reset on each update */
+}
+
+/* Initialize bins for a new mstate that is otherwise zeroed out */
+static void
+init_bins(mstate m)
+{
+    /* Establish circular links for smallbins */
+    bindex_t i;
+    for (i = 0; i < NSMALLBINS; ++i) {
+        sbinptr bin = smallbin_at(m, i);
+        bin->fd = bin->bk = bin;
+    }
+}
+
+#if PROCEED_ON_ERROR
+
+/* default corruption action */
+static void
+reset_on_error(mstate m)
+{
+    int i;
+    ++malloc_corruption_error_count;
+    /* Reinitialize fields to forget about all memory */
+    m->smallbins = m->treebins = 0;
+    m->dvsize = m->topsize = 0;
+    m->seg.base = 0;
+    m->seg.size = 0;
+    m->seg.next = 0;
+    m->top = m->dv = 0;
+    for (i = 0; i < NTREEBINS; ++i)
+        *treebin_at(m, i) = 0;
+    init_bins(m);
+}
+#endif /* PROCEED_ON_ERROR */
+
+/* Allocate chunk and prepend remainder with chunk in successor base. */
+static void *
+prepend_alloc(mstate m, char *newbase, char *oldbase, size_t nb)
+{
+    mchunkptr p = align_as_chunk(newbase);
+    mchunkptr oldfirst = align_as_chunk(oldbase);
+    size_t psize = (char *) oldfirst - (char *) p;
+    mchunkptr q = chunk_plus_offset(p, nb);
+    size_t qsize = psize - nb;
+    set_size_and_pinuse_of_inuse_chunk(m, p, nb);
+
+    assert((char *) oldfirst > (char *) q);
+    assert(pinuse(oldfirst));
+    assert(qsize >= MIN_CHUNK_SIZE);
+
+    /* consolidate remainder with first chunk of old base */
+    if (oldfirst == m->top) {
+        size_t tsize = m->topsize += qsize;
+        m->top = q;
+        q->head = tsize | PINUSE_BIT;
+        check_top_chunk(m, q);
+    } else if (oldfirst == m->dv) {
+        size_t dsize = m->dvsize += qsize;
+        m->dv = q;
+        set_size_and_pinuse_of_free_chunk(q, dsize);
+    } else {
+        if (!cinuse(oldfirst)) {
+            size_t nsize = chunksize(oldfirst);
+            unlink_chunk(m, oldfirst, nsize);
+            oldfirst = chunk_plus_offset(oldfirst, nsize);
+            qsize += nsize;
+        }
+        set_free_with_pinuse(q, qsize, oldfirst);
+        insert_chunk(m, q, qsize);
+        check_free_chunk(m, q);
+    }
+
+    check_malloced_chunk(m, chunk2mem(p), nb);
+    return chunk2mem(p);
+}
+
+
+/* Add a segment to hold a new noncontiguous region */
+static void
+add_segment(mstate m, char *tbase, size_t tsize, flag_t mmapped)
+{
+    /* Determine locations and sizes of segment, fenceposts, old top */
+    char *old_top = (char *) m->top;
+    msegmentptr oldsp = segment_holding(m, old_top);
+    char *old_end = oldsp->base + oldsp->size;
+    size_t ssize = pad_request(sizeof(struct malloc_segment));
+    char *rawsp = old_end - (ssize + FOUR_SIZE_T_SIZES + CHUNK_ALIGN_MASK);
+    size_t offset = align_offset(chunk2mem(rawsp));
+    char *asp = rawsp + offset;
+    char *csp = (asp < (old_top + MIN_CHUNK_SIZE)) ? old_top : asp;
+    mchunkptr sp = (mchunkptr) csp;
+    msegmentptr ss = (msegmentptr) (chunk2mem(sp));
+    mchunkptr tnext = chunk_plus_offset(sp, ssize);
+    mchunkptr p = tnext;
+    int nfences = 0;
+
+    /* reset top to new space */
+    init_top(m, (mchunkptr) tbase, tsize - TOP_FOOT_SIZE);
+
+    /* Set up segment record */
+    assert(is_aligned(ss));
+    set_size_and_pinuse_of_inuse_chunk(m, sp, ssize);
+    *ss = m->seg;               /* Push current record */
+    m->seg.base = tbase;
+    m->seg.size = tsize;
+    m->seg.sflags = mmapped;
+    m->seg.next = ss;
+
+    /* Insert trailing fenceposts */
+    for (;;) {
+        mchunkptr nextp = chunk_plus_offset(p, SIZE_T_SIZE);
+        p->head = FENCEPOST_HEAD;
+        ++nfences;
+        if ((char *) (&(nextp->head)) < old_end)
+            p = nextp;
+        else
+            break;
+    }
+    assert(nfences >= 2);
+
+    /* Insert the rest of old top into a bin as an ordinary free chunk */
+    if (csp != old_top) {
+        mchunkptr q = (mchunkptr) old_top;
+        size_t psize = csp - old_top;
+        mchunkptr tn = chunk_plus_offset(q, psize);
+        set_free_with_pinuse(q, psize, tn);
+        insert_chunk(m, q, psize);
+    }
+
+    check_top_chunk(m, m->top);
+}
+
+/* -------------------------- System allocation -------------------------- */
+
+/* Get memory from system using MORECORE or MMAP */
+static void *
+sys_alloc(mstate m, size_t nb)
+{
+    char *tbase = CMFAIL;
+    size_t tsize = 0;
+    flag_t mmap_flag = 0;
+
+    init_mparams();
+
+    /* Directly map large chunks */
+    if (use_mmap(m) && nb >= mparams.mmap_threshold) {
+        void *mem = mmap_alloc(m, nb);
+        if (mem != 0)
+            return mem;
+    }
+
+    /*
+       Try getting memory in any of three ways (in most-preferred to
+       least-preferred order):
+       1. A call to MORECORE that can normally contiguously extend memory.
+       (disabled if not MORECORE_CONTIGUOUS or not HAVE_MORECORE or
+       or main space is mmapped or a previous contiguous call failed)
+       2. A call to MMAP new space (disabled if not HAVE_MMAP).
+       Note that under the default settings, if MORECORE is unable to
+       fulfill a request, and HAVE_MMAP is true, then mmap is
+       used as a noncontiguous system allocator. This is a useful backup
+       strategy for systems with holes in address spaces -- in this case
+       sbrk cannot contiguously expand the heap, but mmap may be able to
+       find space.
+       3. A call to MORECORE that cannot usually contiguously extend memory.
+       (disabled if not HAVE_MORECORE)
+     */
+
+    if (MORECORE_CONTIGUOUS && !use_noncontiguous(m)) {
+        char *br = CMFAIL;
+        msegmentptr ss =
+            (m->top == 0) ? 0 : segment_holding(m, (char *) m->top);
+        size_t asize = 0;
+        ACQUIRE_MORECORE_LOCK();
+
+        if (ss == 0) {          /* First time through or recovery */
+            char *base = (char *) CALL_MORECORE(0);
+            if (base != CMFAIL) {
+                asize =
+                    granularity_align(nb + TOP_FOOT_SIZE + MALLOC_ALIGNMENT +
+                                      SIZE_T_ONE);
+                /* Adjust to end on a page boundary */
+                if (!is_page_aligned(base))
+                    asize += (page_align((size_t) base) - (size_t) base);
+                /* Can't call MORECORE if size is negative when treated as signed */
+                if (asize < HALF_MAX_SIZE_T &&
+                    (br = (char *) (CALL_MORECORE(asize))) == base) {
+                    tbase = base;
+                    tsize = asize;
+                }
+            }
+        } else {
+            /* Subtract out existing available top space from MORECORE request. */
+            asize =
+                granularity_align(nb - m->topsize + TOP_FOOT_SIZE +
+                                  MALLOC_ALIGNMENT + SIZE_T_ONE);
+            /* Use mem here only if it did continuously extend old space */
+            if (asize < HALF_MAX_SIZE_T &&
+                (br =
+                 (char *) (CALL_MORECORE(asize))) == ss->base + ss->size) {
+                tbase = br;
+                tsize = asize;
+            }
+        }
+
+        if (tbase == CMFAIL) {  /* Cope with partial failure */
+            if (br != CMFAIL) { /* Try to use/extend the space we did get */
+                if (asize < HALF_MAX_SIZE_T &&
+                    asize < nb + TOP_FOOT_SIZE + SIZE_T_ONE) {
+                    size_t esize =
+                        granularity_align(nb + TOP_FOOT_SIZE +
+                                          MALLOC_ALIGNMENT + SIZE_T_ONE -
+                                          asize);
+                    if (esize < HALF_MAX_SIZE_T) {
+                        char *end = (char *) CALL_MORECORE(esize);
+                        if (end != CMFAIL)
+                            asize += esize;
+                        else {  /* Can't use; try to release */
+                            end = (char *) CALL_MORECORE(-asize);
+                            br = CMFAIL;
+                        }
+                    }
+                }
+            }
+            if (br != CMFAIL) { /* Use the space we did get */
+                tbase = br;
+                tsize = asize;
+            } else
+                disable_contiguous(m);  /* Don't try contiguous path in the future */
+        }
+
+        RELEASE_MORECORE_LOCK();
+    }
+
+    if (HAVE_MMAP && tbase == CMFAIL) { /* Try MMAP */
+        size_t req = nb + TOP_FOOT_SIZE + MALLOC_ALIGNMENT + SIZE_T_ONE;
+        size_t rsize = granularity_align(req);
+        if (rsize > nb) {       /* Fail if wraps around zero */
+            char *mp = (char *) (CALL_MMAP(rsize));
+            if (mp != CMFAIL) {
+                tbase = mp;
+                tsize = rsize;
+                mmap_flag = IS_MMAPPED_BIT;
+            }
+        }
+    }
+
+    if (HAVE_MORECORE && tbase == CMFAIL) {     /* Try noncontiguous MORECORE */
+        size_t asize =
+            granularity_align(nb + TOP_FOOT_SIZE + MALLOC_ALIGNMENT +
+                              SIZE_T_ONE);
+        if (asize < HALF_MAX_SIZE_T) {
+            char *br = CMFAIL;
+            char *end = CMFAIL;
+            ACQUIRE_MORECORE_LOCK();
+            br = (char *) (CALL_MORECORE(asize));
+            end = (char *) (CALL_MORECORE(0));
+            RELEASE_MORECORE_LOCK();
+            if (br != CMFAIL && end != CMFAIL && br < end) {
+                size_t ssize = end - br;
+                if (ssize > nb + TOP_FOOT_SIZE) {
+                    tbase = br;
+                    tsize = ssize;
+                }
+            }
+        }
+    }
+
+    if (tbase != CMFAIL) {
+
+        if ((m->footprint += tsize) > m->max_footprint)
+            m->max_footprint = m->footprint;
+
+        if (!is_initialized(m)) {       /* first-time initialization */
+            m->seg.base = m->least_addr = tbase;
+            m->seg.size = tsize;
+            m->seg.sflags = mmap_flag;
+            m->magic = mparams.magic;
+            init_bins(m);
+            if (is_global(m))
+                init_top(m, (mchunkptr) tbase, tsize - TOP_FOOT_SIZE);
+            else {
+                /* Offset top by embedded malloc_state */
+                mchunkptr mn = next_chunk(mem2chunk(m));
+                init_top(m, mn,
+                         (size_t) ((tbase + tsize) - (char *) mn) -
+                         TOP_FOOT_SIZE);
+            }
+        }
+
+        else {
+            /* Try to merge with an existing segment */
+            msegmentptr sp = &m->seg;
+            while (sp != 0 && tbase != sp->base + sp->size)
+                sp = sp->next;
+            if (sp != 0 && !is_extern_segment(sp) && (sp->sflags & IS_MMAPPED_BIT) == mmap_flag && segment_holds(sp, m->top)) { /* append */
+                sp->size += tsize;
+                init_top(m, m->top, m->topsize + tsize);
+            } else {
+                if (tbase < m->least_addr)
+                    m->least_addr = tbase;
+                sp = &m->seg;
+                while (sp != 0 && sp->base != tbase + tsize)
+                    sp = sp->next;
+                if (sp != 0 &&
+                    !is_extern_segment(sp) &&
+                    (sp->sflags & IS_MMAPPED_BIT) == mmap_flag) {
+                    char *oldbase = sp->base;
+                    sp->base = tbase;
+                    sp->size += tsize;
+                    return prepend_alloc(m, tbase, oldbase, nb);
+                } else
+                    add_segment(m, tbase, tsize, mmap_flag);
+            }
+        }
+
+        if (nb < m->topsize) {  /* Allocate from new or extended top space */
+            size_t rsize = m->topsize -= nb;
+            mchunkptr p = m->top;
+            mchunkptr r = m->top = chunk_plus_offset(p, nb);
+            r->head = rsize | PINUSE_BIT;
+            set_size_and_pinuse_of_inuse_chunk(m, p, nb);
+            check_top_chunk(m, m->top);
+            check_malloced_chunk(m, chunk2mem(p), nb);
+            return chunk2mem(p);
+        }
+    }
+
+    MALLOC_FAILURE_ACTION;
+    return 0;
+}
+
+/* -----------------------  system deallocation -------------------------- */
+
+/* Unmap and unlink any mmapped segments that don't contain used chunks */
+static size_t
+release_unused_segments(mstate m)
+{
+    size_t released = 0;
+    msegmentptr pred = &m->seg;
+    msegmentptr sp = pred->next;
+    while (sp != 0) {
+        char *base = sp->base;
+        size_t size = sp->size;
+        msegmentptr next = sp->next;
+        if (is_mmapped_segment(sp) && !is_extern_segment(sp)) {
+            mchunkptr p = align_as_chunk(base);
+            size_t psize = chunksize(p);
+            /* Can unmap if first chunk holds entire segment and not pinned */
+            if (!cinuse(p)
+                && (char *) p + psize >= base + size - TOP_FOOT_SIZE) {
+                tchunkptr tp = (tchunkptr) p;
+                assert(segment_holds(sp, (char *) sp));
+                if (p == m->dv) {
+                    m->dv = 0;
+                    m->dvsize = 0;
+                } else {
+                    unlink_large_chunk(m, tp);
+                }
+                if (CALL_MUNMAP(base, size) == 0) {
+                    released += size;
+                    m->footprint -= size;
+                    /* unlink obsoleted record */
+                    sp = pred;
+                    sp->next = next;
+                } else {        /* back out if cannot unmap */
+                    insert_large_chunk(m, tp, psize);
+                }
+            }
+        }
+        pred = sp;
+        sp = next;
+    }
+    return released;
+}
+
+static int
+sys_trim(mstate m, size_t pad)
+{
+    size_t released = 0;
+    if (pad < MAX_REQUEST && is_initialized(m)) {
+        pad += TOP_FOOT_SIZE;   /* ensure enough room for segment overhead */
+
+        if (m->topsize > pad) {
+            /* Shrink top space in granularity-size units, keeping at least one */
+            size_t unit = mparams.granularity;
+            size_t extra = ((m->topsize - pad + (unit - SIZE_T_ONE)) / unit -
+                            SIZE_T_ONE) * unit;
+            msegmentptr sp = segment_holding(m, (char *) m->top);
+
+            if (!is_extern_segment(sp)) {
+                if (is_mmapped_segment(sp)) {
+                    if (HAVE_MMAP && sp->size >= extra && !has_segment_link(m, sp)) {   /* can't shrink if pinned */
+                        size_t newsize = sp->size - extra;
+                        /* Prefer mremap, fall back to munmap */
+                        if ((CALL_MREMAP(sp->base, sp->size, newsize, 0) !=
+                             MFAIL)
+                            || (CALL_MUNMAP(sp->base + newsize, extra) == 0)) {
+                            released = extra;
+                        }
+                    }
+                } else if (HAVE_MORECORE) {
+                    if (extra >= HALF_MAX_SIZE_T)       /* Avoid wrapping negative */
+                        extra = (HALF_MAX_SIZE_T) + SIZE_T_ONE - unit;
+                    ACQUIRE_MORECORE_LOCK();
+                    {
+                        /* Make sure end of memory is where we last set it. */
+                        char *old_br = (char *) (CALL_MORECORE(0));
+                        if (old_br == sp->base + sp->size) {
+                            char *rel_br = (char *) (CALL_MORECORE(-extra));
+                            char *new_br = (char *) (CALL_MORECORE(0));
+                            if (rel_br != CMFAIL && new_br < old_br)
+                                released = old_br - new_br;
+                        }
+                    }
+                    RELEASE_MORECORE_LOCK();
+                }
+            }
+
+            if (released != 0) {
+                sp->size -= released;
+                m->footprint -= released;
+                init_top(m, m->top, m->topsize - released);
+                check_top_chunk(m, m->top);
+            }
+        }
+
+        /* Unmap any unused mmapped segments */
+        if (HAVE_MMAP)
+            released += release_unused_segments(m);
+
+        /* On failure, disable autotrim to avoid repeated failed future calls */
+        if (released == 0)
+            m->trim_check = MAX_SIZE_T;
+    }
+
+    return (released != 0) ? 1 : 0;
+}
+
+/* ---------------------------- malloc support --------------------------- */
+
+/* allocate a large request from the best fitting chunk in a treebin */
+static void *
+tmalloc_large(mstate m, size_t nb)
+{
+    tchunkptr v = 0;
+    size_t rsize = -nb;         /* Unsigned negation */
+    tchunkptr t;
+    bindex_t idx;
+    compute_tree_index(nb, idx);
+
+    if ((t = *treebin_at(m, idx)) != 0) {
+        /* Traverse tree for this bin looking for node with size == nb */
+        size_t sizebits = nb << leftshift_for_tree_index(idx);
+        tchunkptr rst = 0;      /* The deepest untaken right subtree */
+        for (;;) {
+            tchunkptr rt;
+            size_t trem = chunksize(t) - nb;
+            if (trem < rsize) {
+                v = t;
+                if ((rsize = trem) == 0)
+                    break;
+            }
+            rt = t->child[1];
+            t = t->child[(sizebits >> (SIZE_T_BITSIZE - SIZE_T_ONE)) & 1];
+            if (rt != 0 && rt != t)
+                rst = rt;
+            if (t == 0) {
+                t = rst;        /* set t to least subtree holding sizes > nb */
+                break;
+            }
+            sizebits <<= 1;
+        }
+    }
+
+    if (t == 0 && v == 0) {     /* set t to root of next non-empty treebin */
+        binmap_t leftbits = left_bits(idx2bit(idx)) & m->treemap;
+        if (leftbits != 0) {
+            bindex_t i;
+            binmap_t leastbit = least_bit(leftbits);
+            compute_bit2idx(leastbit, i);
+            t = *treebin_at(m, i);
+        }
+    }
+
+    while (t != 0) {            /* find smallest of tree or subtree */
+        size_t trem = chunksize(t) - nb;
+        if (trem < rsize) {
+            rsize = trem;
+            v = t;
+        }
+        t = leftmost_child(t);
+    }
+
+    /*  If dv is a better fit, return 0 so malloc will use it */
+    if (v != 0 && rsize < (size_t) (m->dvsize - nb)) {
+        if (RTCHECK(ok_address(m, v))) {        /* split */
+            mchunkptr r = chunk_plus_offset(v, nb);
+            assert(chunksize(v) == rsize + nb);
+            if (RTCHECK(ok_next(v, r))) {
+                unlink_large_chunk(m, v);
+                if (rsize < MIN_CHUNK_SIZE)
+                    set_inuse_and_pinuse(m, v, (rsize + nb));
+                else {
+                    set_size_and_pinuse_of_inuse_chunk(m, v, nb);
+                    set_size_and_pinuse_of_free_chunk(r, rsize);
+                    insert_chunk(m, r, rsize);
+                }
+                return chunk2mem(v);
+            }
+        }
+        CORRUPTION_ERROR_ACTION(m);
+    }
+    return 0;
+}
+
+/* allocate a small request from the best fitting chunk in a treebin */
+static void *
+tmalloc_small(mstate m, size_t nb)
+{
+    tchunkptr t, v;
+    size_t rsize;
+    bindex_t i;
+    binmap_t leastbit = least_bit(m->treemap);
+    compute_bit2idx(leastbit, i);
+
+    v = t = *treebin_at(m, i);
+    rsize = chunksize(t) - nb;
+
+    while ((t = leftmost_child(t)) != 0) {
+        size_t trem = chunksize(t) - nb;
+        if (trem < rsize) {
+            rsize = trem;
+            v = t;
+        }
+    }
+
+    if (RTCHECK(ok_address(m, v))) {
+        mchunkptr r = chunk_plus_offset(v, nb);
+        assert(chunksize(v) == rsize + nb);
+        if (RTCHECK(ok_next(v, r))) {
+            unlink_large_chunk(m, v);
+            if (rsize < MIN_CHUNK_SIZE)
+                set_inuse_and_pinuse(m, v, (rsize + nb));
+            else {
+                set_size_and_pinuse_of_inuse_chunk(m, v, nb);
+                set_size_and_pinuse_of_free_chunk(r, rsize);
+                replace_dv(m, r, rsize);
+            }
+            return chunk2mem(v);
+        }
+    }
+
+    CORRUPTION_ERROR_ACTION(m);
+    return 0;
+}
+
+/* --------------------------- realloc support --------------------------- */
+
+static void *
+internal_realloc(mstate m, void *oldmem, size_t bytes)
+{
+    if (bytes >= MAX_REQUEST) {
+        MALLOC_FAILURE_ACTION;
+        return 0;
+    }
+    if (!PREACTION(m)) {
+        mchunkptr oldp = mem2chunk(oldmem);
+        size_t oldsize = chunksize(oldp);
+        mchunkptr next = chunk_plus_offset(oldp, oldsize);
+        mchunkptr newp = 0;
+        void *extra = 0;
+
+        /* Try to either shrink or extend into top. Else malloc-copy-free */
+
+        if (RTCHECK(ok_address(m, oldp) && ok_cinuse(oldp) &&
+                    ok_next(oldp, next) && ok_pinuse(next))) {
+            size_t nb = request2size(bytes);
+            if (is_mmapped(oldp))
+                newp = mmap_resize(m, oldp, nb);
+            else if (oldsize >= nb) {   /* already big enough */
+                size_t rsize = oldsize - nb;
+                newp = oldp;
+                if (rsize >= MIN_CHUNK_SIZE) {
+                    mchunkptr remainder = chunk_plus_offset(newp, nb);
+                    set_inuse(m, newp, nb);
+                    set_inuse(m, remainder, rsize);
+                    extra = chunk2mem(remainder);
+                }
+            } else if (next == m->top && oldsize + m->topsize > nb) {
+                /* Expand into top */
+                size_t newsize = oldsize + m->topsize;
+                size_t newtopsize = newsize - nb;
+                mchunkptr newtop = chunk_plus_offset(oldp, nb);
+                set_inuse(m, oldp, nb);
+                newtop->head = newtopsize | PINUSE_BIT;
+                m->top = newtop;
+                m->topsize = newtopsize;
+                newp = oldp;
+            }
+        } else {
+            USAGE_ERROR_ACTION(m, oldmem);
+            POSTACTION(m);
+            return 0;
+        }
+
+        POSTACTION(m);
+
+        if (newp != 0) {
+            if (extra != 0) {
+                internal_free(m, extra);
+            }
+            check_inuse_chunk(m, newp);
+            return chunk2mem(newp);
+        } else {
+            void *newmem = internal_malloc(m, bytes);
+            if (newmem != 0) {
+                size_t oc = oldsize - overhead_for(oldp);
+                memcpy(newmem, oldmem, (oc < bytes) ? oc : bytes);
+                internal_free(m, oldmem);
+            }
+            return newmem;
+        }
+    }
+    return 0;
+}
+
+/* --------------------------- memalign support -------------------------- */
+
+static void *
+internal_memalign(mstate m, size_t alignment, size_t bytes)
+{
+    if (alignment <= MALLOC_ALIGNMENT)  /* Can just use malloc */
+        return internal_malloc(m, bytes);
+    if (alignment < MIN_CHUNK_SIZE)     /* must be at least a minimum chunk size */
+        alignment = MIN_CHUNK_SIZE;
+    if ((alignment & (alignment - SIZE_T_ONE)) != 0) {  /* Ensure a power of 2 */
+        size_t a = MALLOC_ALIGNMENT << 1;
+        while (a < alignment)
+            a <<= 1;
+        alignment = a;
+    }
+
+    if (bytes >= MAX_REQUEST - alignment) {
+        if (m != 0) {           /* Test isn't needed but avoids compiler warning */
+            MALLOC_FAILURE_ACTION;
+        }
+    } else {
+        size_t nb = request2size(bytes);
+        size_t req = nb + alignment + MIN_CHUNK_SIZE - CHUNK_OVERHEAD;
+        char *mem = (char *) internal_malloc(m, req);
+        if (mem != 0) {
+            void *leader = 0;
+            void *trailer = 0;
+            mchunkptr p = mem2chunk(mem);
+
+            if (PREACTION(m))
+                return 0;
+            if ((((size_t) (mem)) % alignment) != 0) {  /* misaligned */
+                /*
+                   Find an aligned spot inside chunk.  Since we need to give
+                   back leading space in a chunk of at least MIN_CHUNK_SIZE, if
+                   the first calculation places us at a spot with less than
+                   MIN_CHUNK_SIZE leader, we can move to the next aligned spot.
+                   We've allocated enough total room so that this is always
+                   possible.
+                 */
+                char *br = (char *) mem2chunk((size_t) (((size_t) (mem +
+                                                                   alignment -
+                                                                   SIZE_T_ONE))
+                                                        & -alignment));
+                char *pos =
+                    ((size_t) (br - (char *) (p)) >=
+                     MIN_CHUNK_SIZE) ? br : br + alignment;
+                mchunkptr newp = (mchunkptr) pos;
+                size_t leadsize = pos - (char *) (p);
+                size_t newsize = chunksize(p) - leadsize;
+
+                if (is_mmapped(p)) {    /* For mmapped chunks, just adjust offset */
+                    newp->prev_foot = p->prev_foot + leadsize;
+                    newp->head = (newsize | CINUSE_BIT);
+                } else {        /* Otherwise, give back leader, use the rest */
+                    set_inuse(m, newp, newsize);
+                    set_inuse(m, p, leadsize);
+                    leader = chunk2mem(p);
+                }
+                p = newp;
+            }
+
+            /* Give back spare room at the end */
+            if (!is_mmapped(p)) {
+                size_t size = chunksize(p);
+                if (size > nb + MIN_CHUNK_SIZE) {
+                    size_t remainder_size = size - nb;
+                    mchunkptr remainder = chunk_plus_offset(p, nb);
+                    set_inuse(m, p, nb);
+                    set_inuse(m, remainder, remainder_size);
+                    trailer = chunk2mem(remainder);
+                }
+            }
+
+            assert(chunksize(p) >= nb);
+            assert((((size_t) (chunk2mem(p))) % alignment) == 0);
+            check_inuse_chunk(m, p);
+            POSTACTION(m);
+            if (leader != 0) {
+                internal_free(m, leader);
+            }
+            if (trailer != 0) {
+                internal_free(m, trailer);
+            }
+            return chunk2mem(p);
+        }
+    }
+    return 0;
+}
+
+/* ------------------------ comalloc/coalloc support --------------------- */
+
+static void **
+ialloc(mstate m, size_t n_elements, size_t * sizes, int opts, void *chunks[])
+{
+    /*
+       This provides common support for independent_X routines, handling
+       all of the combinations that can result.
+
+       The opts arg has:
+       bit 0 set if all elements are same size (using sizes[0])
+       bit 1 set if elements should be zeroed
+     */
+
+    size_t element_size;        /* chunksize of each element, if all same */
+    size_t contents_size;       /* total size of elements */
+    size_t array_size;          /* request size of pointer array */
+    void *mem;                  /* malloced aggregate space */
+    mchunkptr p;                /* corresponding chunk */
+    size_t remainder_size;      /* remaining bytes while splitting */
+    void **marray;              /* either "chunks" or malloced ptr array */
+    mchunkptr array_chunk;      /* chunk for malloced ptr array */
+    flag_t was_enabled;         /* to disable mmap */
+    size_t size;
+    size_t i;
+
+    /* compute array length, if needed */
+    if (chunks != 0) {
+        if (n_elements == 0)
+            return chunks;      /* nothing to do */
+        marray = chunks;
+        array_size = 0;
+    } else {
+        /* if empty req, must still return chunk representing empty array */
+        if (n_elements == 0)
+            return (void **) internal_malloc(m, 0);
+        marray = 0;
+        array_size = request2size(n_elements * (sizeof(void *)));
+    }
+
+    /* compute total element size */
+    if (opts & 0x1) {           /* all-same-size */
+        element_size = request2size(*sizes);
+        contents_size = n_elements * element_size;
+    } else {                    /* add up all the sizes */
+        element_size = 0;
+        contents_size = 0;
+        for (i = 0; i != n_elements; ++i)
+            contents_size += request2size(sizes[i]);
+    }
+
+    size = contents_size + array_size;
+
+    /*
+       Allocate the aggregate chunk.  First disable direct-mmapping so
+       malloc won't use it, since we would not be able to later
+       free/realloc space internal to a segregated mmap region.
+     */
+    was_enabled = use_mmap(m);
+    disable_mmap(m);
+    mem = internal_malloc(m, size - CHUNK_OVERHEAD);
+    if (was_enabled)
+        enable_mmap(m);
+    if (mem == 0)
+        return 0;
+
+    if (PREACTION(m))
+        return 0;
+    p = mem2chunk(mem);
+    remainder_size = chunksize(p);
+
+    assert(!is_mmapped(p));
+
+    if (opts & 0x2) {           /* optionally clear the elements */
+        memset((size_t *) mem, 0, remainder_size - SIZE_T_SIZE - array_size);
+    }
+
+    /* If not provided, allocate the pointer array as final part of chunk */
+    if (marray == 0) {
+        size_t array_chunk_size;
+        array_chunk = chunk_plus_offset(p, contents_size);
+        array_chunk_size = remainder_size - contents_size;
+        marray = (void **) (chunk2mem(array_chunk));
+        set_size_and_pinuse_of_inuse_chunk(m, array_chunk, array_chunk_size);
+        remainder_size = contents_size;
+    }
+
+    /* split out elements */
+    for (i = 0;; ++i) {
+        marray[i] = chunk2mem(p);
+        if (i != n_elements - 1) {
+            if (element_size != 0)
+                size = element_size;
+            else
+                size = request2size(sizes[i]);
+            remainder_size -= size;
+            set_size_and_pinuse_of_inuse_chunk(m, p, size);
+            p = chunk_plus_offset(p, size);
+        } else {                /* the final element absorbs any overallocation slop */
+            set_size_and_pinuse_of_inuse_chunk(m, p, remainder_size);
+            break;
+        }
+    }
+
+#if DEBUG
+    if (marray != chunks) {
+        /* final element must have exactly exhausted chunk */
+        if (element_size != 0) {
+            assert(remainder_size == element_size);
+        } else {
+            assert(remainder_size == request2size(sizes[i]));
+        }
+        check_inuse_chunk(m, mem2chunk(marray));
+    }
+    for (i = 0; i != n_elements; ++i)
+        check_inuse_chunk(m, mem2chunk(marray[i]));
+
+#endif /* DEBUG */
+
+    POSTACTION(m);
+    return marray;
+}
+
+
+/* -------------------------- public routines ---------------------------- */
+
+#if !ONLY_MSPACES
+
+void *
+dlmalloc(size_t bytes)
+{
+    /*
+       Basic algorithm:
+       If a small request (< 256 bytes minus per-chunk overhead):
+       1. If one exists, use a remainderless chunk in associated smallbin.
+       (Remainderless means that there are too few excess bytes to
+       represent as a chunk.)
+       2. If it is big enough, use the dv chunk, which is normally the
+       chunk adjacent to the one used for the most recent small request.
+       3. If one exists, split the smallest available chunk in a bin,
+       saving remainder in dv.
+       4. If it is big enough, use the top chunk.
+       5. If available, get memory from system and use it
+       Otherwise, for a large request:
+       1. Find the smallest available binned chunk that fits, and use it
+       if it is better fitting than dv chunk, splitting if necessary.
+       2. If better fitting than any binned chunk, use the dv chunk.
+       3. If it is big enough, use the top chunk.
+       4. If request size >= mmap threshold, try to directly mmap this chunk.
+       5. If available, get memory from system and use it
+
+       The ugly goto's here ensure that postaction occurs along all paths.
+     */
+
+    if (!PREACTION(gm)) {
+        void *mem;
+        size_t nb;
+        if (bytes <= MAX_SMALL_REQUEST) {
+            bindex_t idx;
+            binmap_t smallbits;
+            nb = (bytes < MIN_REQUEST) ? MIN_CHUNK_SIZE : pad_request(bytes);
+            idx = small_index(nb);
+            smallbits = gm->smallmap >> idx;
+
+            if ((smallbits & 0x3U) != 0) {      /* Remainderless fit to a smallbin. */
+                mchunkptr b, p;
+                idx += ~smallbits & 1;  /* Uses next bin if idx empty */
+                b = smallbin_at(gm, idx);
+                p = b->fd;
+                assert(chunksize(p) == small_index2size(idx));
+                unlink_first_small_chunk(gm, b, p, idx);
+                set_inuse_and_pinuse(gm, p, small_index2size(idx));
+                mem = chunk2mem(p);
+                check_malloced_chunk(gm, mem, nb);
+                goto postaction;
+            }
+
+            else if (nb > gm->dvsize) {
+                if (smallbits != 0) {   /* Use chunk in next nonempty smallbin */
+                    mchunkptr b, p, r;
+                    size_t rsize;
+                    bindex_t i;
+                    binmap_t leftbits =
+                        (smallbits << idx) & left_bits(idx2bit(idx));
+                    binmap_t leastbit = least_bit(leftbits);
+                    compute_bit2idx(leastbit, i);
+                    b = smallbin_at(gm, i);
+                    p = b->fd;
+                    assert(chunksize(p) == small_index2size(i));
+                    unlink_first_small_chunk(gm, b, p, i);
+                    rsize = small_index2size(i) - nb;
+                    /* Fit here cannot be remainderless if 4byte sizes */
+                    if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
+                        set_inuse_and_pinuse(gm, p, small_index2size(i));
+                    else {
+                        set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
+                        r = chunk_plus_offset(p, nb);
+                        set_size_and_pinuse_of_free_chunk(r, rsize);
+                        replace_dv(gm, r, rsize);
+                    }
+                    mem = chunk2mem(p);
+                    check_malloced_chunk(gm, mem, nb);
+                    goto postaction;
+                }
+
+                else if (gm->treemap != 0
+                         && (mem = tmalloc_small(gm, nb)) != 0) {
+                    check_malloced_chunk(gm, mem, nb);
+                    goto postaction;
+                }
+            }
+        } else if (bytes >= MAX_REQUEST)
+            nb = MAX_SIZE_T;    /* Too big to allocate. Force failure (in sys alloc) */
+        else {
+            nb = pad_request(bytes);
+            if (gm->treemap != 0 && (mem = tmalloc_large(gm, nb)) != 0) {
+                check_malloced_chunk(gm, mem, nb);
+                goto postaction;
+            }
+        }
+
+        if (nb <= gm->dvsize) {
+            size_t rsize = gm->dvsize - nb;
+            mchunkptr p = gm->dv;
+            if (rsize >= MIN_CHUNK_SIZE) {      /* split dv */
+                mchunkptr r = gm->dv = chunk_plus_offset(p, nb);
+                gm->dvsize = rsize;
+                set_size_and_pinuse_of_free_chunk(r, rsize);
+                set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
+            } else {            /* exhaust dv */
+                size_t dvs = gm->dvsize;
+                gm->dvsize = 0;
+                gm->dv = 0;
+                set_inuse_and_pinuse(gm, p, dvs);
+            }
+            mem = chunk2mem(p);
+            check_malloced_chunk(gm, mem, nb);
+            goto postaction;
+        }
+
+        else if (nb < gm->topsize) {    /* Split top */
+            size_t rsize = gm->topsize -= nb;
+            mchunkptr p = gm->top;
+            mchunkptr r = gm->top = chunk_plus_offset(p, nb);
+            r->head = rsize | PINUSE_BIT;
+            set_size_and_pinuse_of_inuse_chunk(gm, p, nb);
+            mem = chunk2mem(p);
+            check_top_chunk(gm, gm->top);
+            check_malloced_chunk(gm, mem, nb);
+            goto postaction;
+        }
+
+        mem = sys_alloc(gm, nb);
+
+      postaction:
+        POSTACTION(gm);
+        return mem;
+    }
+
+    return 0;
+}
+
+void
+dlfree(void *mem)
+{
+    /*
+       Consolidate freed chunks with preceeding or succeeding bordering
+       free chunks, if they exist, and then place in a bin.  Intermixed
+       with special cases for top, dv, mmapped chunks, and usage errors.
+     */
+
+    if (mem != 0) {
+        mchunkptr p = mem2chunk(mem);
+#if FOOTERS
+        mstate fm = get_mstate_for(p);
+        if (!ok_magic(fm)) {
+            USAGE_ERROR_ACTION(fm, p);
+            return;
+        }
+#else /* FOOTERS */
+#define fm gm
+#endif /* FOOTERS */
+        if (!PREACTION(fm)) {
+            check_inuse_chunk(fm, p);
+            if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) {
+                size_t psize = chunksize(p);
+                mchunkptr next = chunk_plus_offset(p, psize);
+                if (!pinuse(p)) {
+                    size_t prevsize = p->prev_foot;
+                    if ((prevsize & IS_MMAPPED_BIT) != 0) {
+                        prevsize &= ~IS_MMAPPED_BIT;
+                        psize += prevsize + MMAP_FOOT_PAD;
+                        if (CALL_MUNMAP((char *) p - prevsize, psize) == 0)
+                            fm->footprint -= psize;
+                        goto postaction;
+                    } else {
+                        mchunkptr prev = chunk_minus_offset(p, prevsize);
+                        psize += prevsize;
+                        p = prev;
+                        if (RTCHECK(ok_address(fm, prev))) {    /* consolidate backward */
+                            if (p != fm->dv) {
+                                unlink_chunk(fm, p, prevsize);
+                            } else if ((next->head & INUSE_BITS) ==
+                                       INUSE_BITS) {
+                                fm->dvsize = psize;
+                                set_free_with_pinuse(p, psize, next);
+                                goto postaction;
+                            }
+                        } else
+                            goto erroraction;
+                    }
+                }
+
+                if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
+                    if (!cinuse(next)) {        /* consolidate forward */
+                        if (next == fm->top) {
+                            size_t tsize = fm->topsize += psize;
+                            fm->top = p;
+                            p->head = tsize | PINUSE_BIT;
+                            if (p == fm->dv) {
+                                fm->dv = 0;
+                                fm->dvsize = 0;
+                            }
+                            if (should_trim(fm, tsize))
+                                sys_trim(fm, 0);
+                            goto postaction;
+                        } else if (next == fm->dv) {
+                            size_t dsize = fm->dvsize += psize;
+                            fm->dv = p;
+                            set_size_and_pinuse_of_free_chunk(p, dsize);
+                            goto postaction;
+                        } else {
+                            size_t nsize = chunksize(next);
+                            psize += nsize;
+                            unlink_chunk(fm, next, nsize);
+                            set_size_and_pinuse_of_free_chunk(p, psize);
+                            if (p == fm->dv) {
+                                fm->dvsize = psize;
+                                goto postaction;
+                            }
+                        }
+                    } else
+                        set_free_with_pinuse(p, psize, next);
+                    insert_chunk(fm, p, psize);
+                    check_free_chunk(fm, p);
+                    goto postaction;
+                }
+            }
+          erroraction:
+            USAGE_ERROR_ACTION(fm, p);
+          postaction:
+            POSTACTION(fm);
+        }
+    }
+#if !FOOTERS
+#undef fm
+#endif /* FOOTERS */
+}
+
+void *
+dlcalloc(size_t n_elements, size_t elem_size)
+{
+    void *mem;
+    size_t req = 0;
+    if (n_elements != 0) {
+        req = n_elements * elem_size;
+        if (((n_elements | elem_size) & ~(size_t) 0xffff) &&
+            (req / n_elements != elem_size))
+            req = MAX_SIZE_T;   /* force downstream failure on overflow */
+    }
+    mem = dlmalloc(req);
+    if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
+        memset(mem, 0, req);
+    return mem;
+}
+
+void *
+dlrealloc(void *oldmem, size_t bytes)
+{
+    if (oldmem == 0)
+        return dlmalloc(bytes);
+#ifdef REALLOC_ZERO_BYTES_FREES
+    if (bytes == 0) {
+        dlfree(oldmem);
+        return 0;
+    }
+#endif /* REALLOC_ZERO_BYTES_FREES */
+    else {
+#if ! FOOTERS
+        mstate m = gm;
+#else /* FOOTERS */
+        mstate m = get_mstate_for(mem2chunk(oldmem));
+        if (!ok_magic(m)) {
+            USAGE_ERROR_ACTION(m, oldmem);
+            return 0;
+        }
+#endif /* FOOTERS */
+        return internal_realloc(m, oldmem, bytes);
+    }
+}
+
+void *
+dlmemalign(size_t alignment, size_t bytes)
+{
+    return internal_memalign(gm, alignment, bytes);
+}
+
+void **
+dlindependent_calloc(size_t n_elements, size_t elem_size, void *chunks[])
+{
+    size_t sz = elem_size;      /* serves as 1-element array */
+    return ialloc(gm, n_elements, &sz, 3, chunks);
+}
+
+void **
+dlindependent_comalloc(size_t n_elements, size_t sizes[], void *chunks[])
+{
+    return ialloc(gm, n_elements, sizes, 0, chunks);
+}
+
+void *
+dlvalloc(size_t bytes)
+{
+    size_t pagesz;
+    init_mparams();
+    pagesz = mparams.page_size;
+    return dlmemalign(pagesz, bytes);
+}
+
+void *
+dlpvalloc(size_t bytes)
+{
+    size_t pagesz;
+    init_mparams();
+    pagesz = mparams.page_size;
+    return dlmemalign(pagesz,
+                      (bytes + pagesz - SIZE_T_ONE) & ~(pagesz - SIZE_T_ONE));
+}
+
+int
+dlmalloc_trim(size_t pad)
+{
+    int result = 0;
+    if (!PREACTION(gm)) {
+        result = sys_trim(gm, pad);
+        POSTACTION(gm);
+    }
+    return result;
+}
+
+size_t
+dlmalloc_footprint(void)
+{
+    return gm->footprint;
+}
+
+size_t
+dlmalloc_max_footprint(void)
+{
+    return gm->max_footprint;
+}
+
+#if !NO_MALLINFO
+struct mallinfo
+dlmallinfo(void)
+{
+    return internal_mallinfo(gm);
+}
+#endif /* NO_MALLINFO */
+
+void
+dlmalloc_stats()
+{
+    internal_malloc_stats(gm);
+}
+
+size_t
+dlmalloc_usable_size(void *mem)
+{
+    if (mem != 0) {
+        mchunkptr p = mem2chunk(mem);
+        if (cinuse(p))
+            return chunksize(p) - overhead_for(p);
+    }
+    return 0;
+}
+
+int
+dlmallopt(int param_number, int value)
+{
+    return change_mparam(param_number, value);
+}
+
+#endif /* !ONLY_MSPACES */
+
+/* ----------------------------- user mspaces ---------------------------- */
+
+#if MSPACES
+
+static mstate
+init_user_mstate(char *tbase, size_t tsize)
+{
+    size_t msize = pad_request(sizeof(struct malloc_state));
+    mchunkptr mn;
+    mchunkptr msp = align_as_chunk(tbase);
+    mstate m = (mstate) (chunk2mem(msp));
+    memset(m, 0, msize);
+    INITIAL_LOCK(&m->mutex);
+    msp->head = (msize | PINUSE_BIT | CINUSE_BIT);
+    m->seg.base = m->least_addr = tbase;
+    m->seg.size = m->footprint = m->max_footprint = tsize;
+    m->magic = mparams.magic;
+    m->mflags = mparams.default_mflags;
+    disable_contiguous(m);
+    init_bins(m);
+    mn = next_chunk(mem2chunk(m));
+    init_top(m, mn, (size_t) ((tbase + tsize) - (char *) mn) - TOP_FOOT_SIZE);
+    check_top_chunk(m, m->top);
+    return m;
+}
+
+mspace
+create_mspace(size_t capacity, int locked)
+{
+    mstate m = 0;
+    size_t msize = pad_request(sizeof(struct malloc_state));
+    init_mparams();             /* Ensure pagesize etc initialized */
+
+    if (capacity < (size_t) - (msize + TOP_FOOT_SIZE + mparams.page_size)) {
+        size_t rs = ((capacity == 0) ? mparams.granularity :
+                     (capacity + TOP_FOOT_SIZE + msize));
+        size_t tsize = granularity_align(rs);
+        char *tbase = (char *) (CALL_MMAP(tsize));
+        if (tbase != CMFAIL) {
+            m = init_user_mstate(tbase, tsize);
+            m->seg.sflags = IS_MMAPPED_BIT;
+            set_lock(m, locked);
+        }
+    }
+    return (mspace) m;
+}
+
+mspace
+create_mspace_with_base(void *base, size_t capacity, int locked)
+{
+    mstate m = 0;
+    size_t msize = pad_request(sizeof(struct malloc_state));
+    init_mparams();             /* Ensure pagesize etc initialized */
+
+    if (capacity > msize + TOP_FOOT_SIZE &&
+        capacity < (size_t) - (msize + TOP_FOOT_SIZE + mparams.page_size)) {
+        m = init_user_mstate((char *) base, capacity);
+        m->seg.sflags = EXTERN_BIT;
+        set_lock(m, locked);
+    }
+    return (mspace) m;
+}
+
+size_t
+destroy_mspace(mspace msp)
+{
+    size_t freed = 0;
+    mstate ms = (mstate) msp;
+    if (ok_magic(ms)) {
+        msegmentptr sp = &ms->seg;
+        while (sp != 0) {
+            char *base = sp->base;
+            size_t size = sp->size;
+            flag_t flag = sp->sflags;
+            sp = sp->next;
+            if ((flag & IS_MMAPPED_BIT) && !(flag & EXTERN_BIT) &&
+                CALL_MUNMAP(base, size) == 0)
+                freed += size;
+        }
+    } else {
+        USAGE_ERROR_ACTION(ms, ms);
+    }
+    return freed;
+}
+
+/*
+  mspace versions of routines are near-clones of the global
+  versions. This is not so nice but better than the alternatives.
+*/
+
+
+void *
+mspace_malloc(mspace msp, size_t bytes)
+{
+    mstate ms = (mstate) msp;
+    if (!ok_magic(ms)) {
+        USAGE_ERROR_ACTION(ms, ms);
+        return 0;
+    }
+    if (!PREACTION(ms)) {
+        void *mem;
+        size_t nb;
+        if (bytes <= MAX_SMALL_REQUEST) {
+            bindex_t idx;
+            binmap_t smallbits;
+            nb = (bytes < MIN_REQUEST) ? MIN_CHUNK_SIZE : pad_request(bytes);
+            idx = small_index(nb);
+            smallbits = ms->smallmap >> idx;
+
+            if ((smallbits & 0x3U) != 0) {      /* Remainderless fit to a smallbin. */
+                mchunkptr b, p;
+                idx += ~smallbits & 1;  /* Uses next bin if idx empty */
+                b = smallbin_at(ms, idx);
+                p = b->fd;
+                assert(chunksize(p) == small_index2size(idx));
+                unlink_first_small_chunk(ms, b, p, idx);
+                set_inuse_and_pinuse(ms, p, small_index2size(idx));
+                mem = chunk2mem(p);
+                check_malloced_chunk(ms, mem, nb);
+                goto postaction;
+            }
+
+            else if (nb > ms->dvsize) {
+                if (smallbits != 0) {   /* Use chunk in next nonempty smallbin */
+                    mchunkptr b, p, r;
+                    size_t rsize;
+                    bindex_t i;
+                    binmap_t leftbits =
+                        (smallbits << idx) & left_bits(idx2bit(idx));
+                    binmap_t leastbit = least_bit(leftbits);
+                    compute_bit2idx(leastbit, i);
+                    b = smallbin_at(ms, i);
+                    p = b->fd;
+                    assert(chunksize(p) == small_index2size(i));
+                    unlink_first_small_chunk(ms, b, p, i);
+                    rsize = small_index2size(i) - nb;
+                    /* Fit here cannot be remainderless if 4byte sizes */
+                    if (SIZE_T_SIZE != 4 && rsize < MIN_CHUNK_SIZE)
+                        set_inuse_and_pinuse(ms, p, small_index2size(i));
+                    else {
+                        set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
+                        r = chunk_plus_offset(p, nb);
+                        set_size_and_pinuse_of_free_chunk(r, rsize);
+                        replace_dv(ms, r, rsize);
+                    }
+                    mem = chunk2mem(p);
+                    check_malloced_chunk(ms, mem, nb);
+                    goto postaction;
+                }
+
+                else if (ms->treemap != 0
+                         && (mem = tmalloc_small(ms, nb)) != 0) {
+                    check_malloced_chunk(ms, mem, nb);
+                    goto postaction;
+                }
+            }
+        } else if (bytes >= MAX_REQUEST)
+            nb = MAX_SIZE_T;    /* Too big to allocate. Force failure (in sys alloc) */
+        else {
+            nb = pad_request(bytes);
+            if (ms->treemap != 0 && (mem = tmalloc_large(ms, nb)) != 0) {
+                check_malloced_chunk(ms, mem, nb);
+                goto postaction;
+            }
+        }
+
+        if (nb <= ms->dvsize) {
+            size_t rsize = ms->dvsize - nb;
+            mchunkptr p = ms->dv;
+            if (rsize >= MIN_CHUNK_SIZE) {      /* split dv */
+                mchunkptr r = ms->dv = chunk_plus_offset(p, nb);
+                ms->dvsize = rsize;
+                set_size_and_pinuse_of_free_chunk(r, rsize);
+                set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
+            } else {            /* exhaust dv */
+                size_t dvs = ms->dvsize;
+                ms->dvsize = 0;
+                ms->dv = 0;
+                set_inuse_and_pinuse(ms, p, dvs);
+            }
+            mem = chunk2mem(p);
+            check_malloced_chunk(ms, mem, nb);
+            goto postaction;
+        }
+
+        else if (nb < ms->topsize) {    /* Split top */
+            size_t rsize = ms->topsize -= nb;
+            mchunkptr p = ms->top;
+            mchunkptr r = ms->top = chunk_plus_offset(p, nb);
+            r->head = rsize | PINUSE_BIT;
+            set_size_and_pinuse_of_inuse_chunk(ms, p, nb);
+            mem = chunk2mem(p);
+            check_top_chunk(ms, ms->top);
+            check_malloced_chunk(ms, mem, nb);
+            goto postaction;
+        }
+
+        mem = sys_alloc(ms, nb);
+
+      postaction:
+        POSTACTION(ms);
+        return mem;
+    }
+
+    return 0;
+}
+
+void
+mspace_free(mspace msp, void *mem)
+{
+    if (mem != 0) {
+        mchunkptr p = mem2chunk(mem);
+#if FOOTERS
+        mstate fm = get_mstate_for(p);
+#else /* FOOTERS */
+        mstate fm = (mstate) msp;
+#endif /* FOOTERS */
+        if (!ok_magic(fm)) {
+            USAGE_ERROR_ACTION(fm, p);
+            return;
+        }
+        if (!PREACTION(fm)) {
+            check_inuse_chunk(fm, p);
+            if (RTCHECK(ok_address(fm, p) && ok_cinuse(p))) {
+                size_t psize = chunksize(p);
+                mchunkptr next = chunk_plus_offset(p, psize);
+                if (!pinuse(p)) {
+                    size_t prevsize = p->prev_foot;
+                    if ((prevsize & IS_MMAPPED_BIT) != 0) {
+                        prevsize &= ~IS_MMAPPED_BIT;
+                        psize += prevsize + MMAP_FOOT_PAD;
+                        if (CALL_MUNMAP((char *) p - prevsize, psize) == 0)
+                            fm->footprint -= psize;
+                        goto postaction;
+                    } else {
+                        mchunkptr prev = chunk_minus_offset(p, prevsize);
+                        psize += prevsize;
+                        p = prev;
+                        if (RTCHECK(ok_address(fm, prev))) {    /* consolidate backward */
+                            if (p != fm->dv) {
+                                unlink_chunk(fm, p, prevsize);
+                            } else if ((next->head & INUSE_BITS) ==
+                                       INUSE_BITS) {
+                                fm->dvsize = psize;
+                                set_free_with_pinuse(p, psize, next);
+                                goto postaction;
+                            }
+                        } else
+                            goto erroraction;
+                    }
+                }
+
+                if (RTCHECK(ok_next(p, next) && ok_pinuse(next))) {
+                    if (!cinuse(next)) {        /* consolidate forward */
+                        if (next == fm->top) {
+                            size_t tsize = fm->topsize += psize;
+                            fm->top = p;
+                            p->head = tsize | PINUSE_BIT;
+                            if (p == fm->dv) {
+                                fm->dv = 0;
+                                fm->dvsize = 0;
+                            }
+                            if (should_trim(fm, tsize))
+                                sys_trim(fm, 0);
+                            goto postaction;
+                        } else if (next == fm->dv) {
+                            size_t dsize = fm->dvsize += psize;
+                            fm->dv = p;
+                            set_size_and_pinuse_of_free_chunk(p, dsize);
+                            goto postaction;
+                        } else {
+                            size_t nsize = chunksize(next);
+                            psize += nsize;
+                            unlink_chunk(fm, next, nsize);
+                            set_size_and_pinuse_of_free_chunk(p, psize);
+                            if (p == fm->dv) {
+                                fm->dvsize = psize;
+                                goto postaction;
+                            }
+                        }
+                    } else
+                        set_free_with_pinuse(p, psize, next);
+                    insert_chunk(fm, p, psize);
+                    check_free_chunk(fm, p);
+                    goto postaction;
+                }
+            }
+          erroraction:
+            USAGE_ERROR_ACTION(fm, p);
+          postaction:
+            POSTACTION(fm);
+        }
+    }
+}
+
+void *
+mspace_calloc(mspace msp, size_t n_elements, size_t elem_size)
+{
+    void *mem;
+    size_t req = 0;
+    mstate ms = (mstate) msp;
+    if (!ok_magic(ms)) {
+        USAGE_ERROR_ACTION(ms, ms);
+        return 0;
+    }
+    if (n_elements != 0) {
+        req = n_elements * elem_size;
+        if (((n_elements | elem_size) & ~(size_t) 0xffff) &&
+            (req / n_elements != elem_size))
+            req = MAX_SIZE_T;   /* force downstream failure on overflow */
+    }
+    mem = internal_malloc(ms, req);
+    if (mem != 0 && calloc_must_clear(mem2chunk(mem)))
+        memset(mem, 0, req);
+    return mem;
+}
+
+void *
+mspace_realloc(mspace msp, void *oldmem, size_t bytes)
+{
+    if (oldmem == 0)
+        return mspace_malloc(msp, bytes);
+#ifdef REALLOC_ZERO_BYTES_FREES
+    if (bytes == 0) {
+        mspace_free(msp, oldmem);
+        return 0;
+    }
+#endif /* REALLOC_ZERO_BYTES_FREES */
+    else {
+#if FOOTERS
+        mchunkptr p = mem2chunk(oldmem);
+        mstate ms = get_mstate_for(p);
+#else /* FOOTERS */
+        mstate ms = (mstate) msp;
+#endif /* FOOTERS */
+        if (!ok_magic(ms)) {
+            USAGE_ERROR_ACTION(ms, ms);
+            return 0;
+        }
+        return internal_realloc(ms, oldmem, bytes);
+    }
+}
+
+void *
+mspace_memalign(mspace msp, size_t alignment, size_t bytes)
+{
+    mstate ms = (mstate) msp;
+    if (!ok_magic(ms)) {
+        USAGE_ERROR_ACTION(ms, ms);
+        return 0;
+    }
+    return internal_memalign(ms, alignment, bytes);
+}
+
+void **
+mspace_independent_calloc(mspace msp, size_t n_elements,
+                          size_t elem_size, void *chunks[])
+{
+    size_t sz = elem_size;      /* serves as 1-element array */
+    mstate ms = (mstate) msp;
+    if (!ok_magic(ms)) {
+        USAGE_ERROR_ACTION(ms, ms);
+        return 0;
+    }
+    return ialloc(ms, n_elements, &sz, 3, chunks);
+}
+
+void **
+mspace_independent_comalloc(mspace msp, size_t n_elements,
+                            size_t sizes[], void *chunks[])
+{
+    mstate ms = (mstate) msp;
+    if (!ok_magic(ms)) {
+        USAGE_ERROR_ACTION(ms, ms);
+        return 0;
+    }
+    return ialloc(ms, n_elements, sizes, 0, chunks);
+}
+
+int
+mspace_trim(mspace msp, size_t pad)
+{
+    int result = 0;
+    mstate ms = (mstate) msp;
+    if (ok_magic(ms)) {
+        if (!PREACTION(ms)) {
+            result = sys_trim(ms, pad);
+            POSTACTION(ms);
+        }
+    } else {
+        USAGE_ERROR_ACTION(ms, ms);
+    }
+    return result;
+}
+
+void
+mspace_malloc_stats(mspace msp)
+{
+    mstate ms = (mstate) msp;
+    if (ok_magic(ms)) {
+        internal_malloc_stats(ms);
+    } else {
+        USAGE_ERROR_ACTION(ms, ms);
+    }
+}
+
+size_t
+mspace_footprint(mspace msp)
+{
+    size_t result;
+    mstate ms = (mstate) msp;
+    if (ok_magic(ms)) {
+        result = ms->footprint;
+    }
+    USAGE_ERROR_ACTION(ms, ms);
+    return result;
+}
+
+
+size_t
+mspace_max_footprint(mspace msp)
+{
+    size_t result;
+    mstate ms = (mstate) msp;
+    if (ok_magic(ms)) {
+        result = ms->max_footprint;
+    }
+    USAGE_ERROR_ACTION(ms, ms);
+    return result;
+}
+
+
+#if !NO_MALLINFO
+struct mallinfo
+mspace_mallinfo(mspace msp)
+{
+    mstate ms = (mstate) msp;
+    if (!ok_magic(ms)) {
+        USAGE_ERROR_ACTION(ms, ms);
+    }
+    return internal_mallinfo(ms);
+}
+#endif /* NO_MALLINFO */
+
+int
+mspace_mallopt(int param_number, int value)
+{
+    return change_mparam(param_number, value);
+}
+
+#endif /* MSPACES */
+
+/* -------------------- Alternative MORECORE functions ------------------- */
+
+/*
+  Guidelines for creating a custom version of MORECORE:
+
+  * For best performance, MORECORE should allocate in multiples of pagesize.
+  * MORECORE may allocate more memory than requested. (Or even less,
+      but this will usually result in a malloc failure.)
+  * MORECORE must not allocate memory when given argument zero, but
+      instead return one past the end address of memory from previous
+      nonzero call.
+  * For best performance, consecutive calls to MORECORE with positive
+      arguments should return increasing addresses, indicating that
+      space has been contiguously extended.
+  * Even though consecutive calls to MORECORE need not return contiguous
+      addresses, it must be OK for malloc'ed chunks to span multiple
+      regions in those cases where they do happen to be contiguous.
+  * MORECORE need not handle negative arguments -- it may instead
+      just return MFAIL when given negative arguments.
+      Negative arguments are always multiples of pagesize. MORECORE
+      must not misinterpret negative args as large positive unsigned
+      args. You can suppress all such calls from even occurring by defining
+      MORECORE_CANNOT_TRIM,
+
+  As an example alternative MORECORE, here is a custom allocator
+  kindly contributed for pre-OSX macOS.  It uses virtually but not
+  necessarily physically contiguous non-paged memory (locked in,
+  present and won't get swapped out).  You can use it by uncommenting
+  this section, adding some #includes, and setting up the appropriate
+  defines above:
+
+      #define MORECORE osMoreCore
+
+  There is also a shutdown routine that should somehow be called for
+  cleanup upon program exit.
+
+  #define MAX_POOL_ENTRIES 100
+  #define MINIMUM_MORECORE_SIZE  (64 * 1024U)
+  static int next_os_pool;
+  void *our_os_pools[MAX_POOL_ENTRIES];
+
+  void *osMoreCore(int size)
+  {
+    void *ptr = 0;
+    static void *sbrk_top = 0;
+
+    if (size > 0)
+    {
+      if (size < MINIMUM_MORECORE_SIZE)
+         size = MINIMUM_MORECORE_SIZE;
+      if (CurrentExecutionLevel() == kTaskLevel)
+         ptr = PoolAllocateResident(size + RM_PAGE_SIZE, 0);
+      if (ptr == 0)
+      {
+        return (void *) MFAIL;
+      }
+      // save ptrs so they can be freed during cleanup
+      our_os_pools[next_os_pool] = ptr;
+      next_os_pool++;
+      ptr = (void *) ((((size_t) ptr) + RM_PAGE_MASK) & ~RM_PAGE_MASK);
+      sbrk_top = (char *) ptr + size;
+      return ptr;
+    }
+    else if (size < 0)
+    {
+      // we don't currently support shrink behavior
+      return (void *) MFAIL;
+    }
+    else
+    {
+      return sbrk_top;
+    }
+  }
+
+  // cleanup any allocated memory pools
+  // called as last thing before shutting down driver
+
+  void osCleanupMem(void)
+  {
+    void **ptr;
+
+    for (ptr = our_os_pools; ptr < &our_os_pools[MAX_POOL_ENTRIES]; ptr++)
+      if (*ptr)
+      {
+         PoolDeallocate(*ptr);
+         *ptr = 0;
+      }
+  }
+
+*/
+
+
+/* -----------------------------------------------------------------------
+History:
+    V2.8.3 Thu Sep 22 11:16:32 2005  Doug Lea  (dl at gee)
+      * Add max_footprint functions
+      * Ensure all appropriate literals are size_t
+      * Fix conditional compilation problem for some #define settings
+      * Avoid concatenating segments with the one provided
+        in create_mspace_with_base
+      * Rename some variables to avoid compiler shadowing warnings
+      * Use explicit lock initialization.
+      * Better handling of sbrk interference.
+      * Simplify and fix segment insertion, trimming and mspace_destroy
+      * Reinstate REALLOC_ZERO_BYTES_FREES option from 2.7.x
+      * Thanks especially to Dennis Flanagan for help on these.
+
+    V2.8.2 Sun Jun 12 16:01:10 2005  Doug Lea  (dl at gee)
+      * Fix memalign brace error.
+
+    V2.8.1 Wed Jun  8 16:11:46 2005  Doug Lea  (dl at gee)
+      * Fix improper #endif nesting in C++
+      * Add explicit casts needed for C++
+
+    V2.8.0 Mon May 30 14:09:02 2005  Doug Lea  (dl at gee)
+      * Use trees for large bins
+      * Support mspaces
+      * Use segments to unify sbrk-based and mmap-based system allocation,
+        removing need for emulation on most platforms without sbrk.
+      * Default safety checks
+      * Optional footer checks. Thanks to William Robertson for the idea.
+      * Internal code refactoring
+      * Incorporate suggestions and platform-specific changes.
+        Thanks to Dennis Flanagan, Colin Plumb, Niall Douglas,
+        Aaron Bachmann,  Emery Berger, and others.
+      * Speed up non-fastbin processing enough to remove fastbins.
+      * Remove useless cfree() to avoid conflicts with other apps.
+      * Remove internal memcpy, memset. Compilers handle builtins better.
+      * Remove some options that no one ever used and rename others.
+
+    V2.7.2 Sat Aug 17 09:07:30 2002  Doug Lea  (dl at gee)
+      * Fix malloc_state bitmap array misdeclaration
+
+    V2.7.1 Thu Jul 25 10:58:03 2002  Doug Lea  (dl at gee)
+      * Allow tuning of FIRST_SORTED_BIN_SIZE
+      * Use PTR_UINT as type for all ptr->int casts. Thanks to John Belmonte.
+      * Better detection and support for non-contiguousness of MORECORE.
+        Thanks to Andreas Mueller, Conal Walsh, and Wolfram Gloger
+      * Bypass most of malloc if no frees. Thanks To Emery Berger.
+      * Fix freeing of old top non-contiguous chunk im sysmalloc.
+      * Raised default trim and map thresholds to 256K.
+      * Fix mmap-related #defines. Thanks to Lubos Lunak.
+      * Fix copy macros; added LACKS_FCNTL_H. Thanks to Neal Walfield.
+      * Branch-free bin calculation
+      * Default trim and mmap thresholds now 256K.
+
+    V2.7.0 Sun Mar 11 14:14:06 2001  Doug Lea  (dl at gee)
+      * Introduce independent_comalloc and independent_calloc.
+        Thanks to Michael Pachos for motivation and help.
+      * Make optional .h file available
+      * Allow > 2GB requests on 32bit systems.
+      * new WIN32 sbrk, mmap, munmap, lock code from <Walter@GeNeSys-e.de>.
+        Thanks also to Andreas Mueller <a.mueller at paradatec.de>,
+        and Anonymous.
+      * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for
+        helping test this.)
+      * memalign: check alignment arg
+      * realloc: don't try to shift chunks backwards, since this
+        leads to  more fragmentation in some programs and doesn't
+        seem to help in any others.
+      * Collect all cases in malloc requiring system memory into sysmalloc
+      * Use mmap as backup to sbrk
+      * Place all internal state in malloc_state
+      * Introduce fastbins (although similar to 2.5.1)
+      * Many minor tunings and cosmetic improvements
+      * Introduce USE_PUBLIC_MALLOC_WRAPPERS, USE_MALLOC_LOCK
+      * Introduce MALLOC_FAILURE_ACTION, MORECORE_CONTIGUOUS
+        Thanks to Tony E. Bennett <tbennett@nvidia.com> and others.
+      * Include errno.h to support default failure action.
+
+    V2.6.6 Sun Dec  5 07:42:19 1999  Doug Lea  (dl at gee)
+      * return null for negative arguments
+      * Added Several WIN32 cleanups from Martin C. Fong <mcfong at yahoo.com>
+         * Add 'LACKS_SYS_PARAM_H' for those systems without 'sys/param.h'
+          (e.g. WIN32 platforms)
+         * Cleanup header file inclusion for WIN32 platforms
+         * Cleanup code to avoid Microsoft Visual C++ compiler complaints
+         * Add 'USE_DL_PREFIX' to quickly allow co-existence with existing
+           memory allocation routines
+         * Set 'malloc_getpagesize' for WIN32 platforms (needs more work)
+         * Use 'assert' rather than 'ASSERT' in WIN32 code to conform to
+           usage of 'assert' in non-WIN32 code
+         * Improve WIN32 'sbrk()' emulation's 'findRegion()' routine to
+           avoid infinite loop
+      * Always call 'fREe()' rather than 'free()'
+
+    V2.6.5 Wed Jun 17 15:57:31 1998  Doug Lea  (dl at gee)
+      * Fixed ordering problem with boundary-stamping
+
+    V2.6.3 Sun May 19 08:17:58 1996  Doug Lea  (dl at gee)
+      * Added pvalloc, as recommended by H.J. Liu
+      * Added 64bit pointer support mainly from Wolfram Gloger
+      * Added anonymously donated WIN32 sbrk emulation
+      * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen
+      * malloc_extend_top: fix mask error that caused wastage after
+        foreign sbrks
+      * Add linux mremap support code from HJ Liu
+
+    V2.6.2 Tue Dec  5 06:52:55 1995  Doug Lea  (dl at gee)
+      * Integrated most documentation with the code.
+      * Add support for mmap, with help from
+        Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
+      * Use last_remainder in more cases.
+      * Pack bins using idea from  colin@nyx10.cs.du.edu
+      * Use ordered bins instead of best-fit threshhold
+      * Eliminate block-local decls to simplify tracing and debugging.
+      * Support another case of realloc via move into top
+      * Fix error occuring when initial sbrk_base not word-aligned.
+      * Rely on page size for units instead of SBRK_UNIT to
+        avoid surprises about sbrk alignment conventions.
+      * Add mallinfo, mallopt. Thanks to Raymond Nijssen
+        (raymond@es.ele.tue.nl) for the suggestion.
+      * Add `pad' argument to malloc_trim and top_pad mallopt parameter.
+      * More precautions for cases where other routines call sbrk,
+        courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
+      * Added macros etc., allowing use in linux libc from
+        H.J. Lu (hjl@gnu.ai.mit.edu)
+      * Inverted this history list
+
+    V2.6.1 Sat Dec  2 14:10:57 1995  Doug Lea  (dl at gee)
+      * Re-tuned and fixed to behave more nicely with V2.6.0 changes.
+      * Removed all preallocation code since under current scheme
+        the work required to undo bad preallocations exceeds
+        the work saved in good cases for most test programs.
+      * No longer use return list or unconsolidated bins since
+        no scheme using them consistently outperforms those that don't
+        given above changes.
+      * Use best fit for very large chunks to prevent some worst-cases.
+      * Added some support for debugging
+
+    V2.6.0 Sat Nov  4 07:05:23 1995  Doug Lea  (dl at gee)
+      * Removed footers when chunks are in use. Thanks to
+        Paul Wilson (wilson@cs.texas.edu) for the suggestion.
+
+    V2.5.4 Wed Nov  1 07:54:51 1995  Doug Lea  (dl at gee)
+      * Added malloc_trim, with help from Wolfram Gloger
+        (wmglo@Dent.MED.Uni-Muenchen.DE).
+
+    V2.5.3 Tue Apr 26 10:16:01 1994  Doug Lea  (dl at g)
+
+    V2.5.2 Tue Apr  5 16:20:40 1994  Doug Lea  (dl at g)
+      * realloc: try to expand in both directions
+      * malloc: swap order of clean-bin strategy;
+      * realloc: only conditionally expand backwards
+      * Try not to scavenge used bins
+      * Use bin counts as a guide to preallocation
+      * Occasionally bin return list chunks in first scan
+      * Add a few optimizations from colin@nyx10.cs.du.edu
+
+    V2.5.1 Sat Aug 14 15:40:43 1993  Doug Lea  (dl at g)
+      * faster bin computation & slightly different binning
+      * merged all consolidations to one part of malloc proper
+         (eliminating old malloc_find_space & malloc_clean_bin)
+      * Scan 2 returns chunks (not just 1)
+      * Propagate failure in realloc if malloc returns 0
+      * Add stuff to allow compilation on non-ANSI compilers
+          from kpv@research.att.com
+
+    V2.5 Sat Aug  7 07:41:59 1993  Doug Lea  (dl at g.oswego.edu)
+      * removed potential for odd address access in prev_chunk
+      * removed dependency on getpagesize.h
+      * misc cosmetics and a bit more internal documentation
+      * anticosmetics: mangled names in macros to evade debugger strangeness
+      * tested on sparc, hp-700, dec-mips, rs6000
+          with gcc & native cc (hp, dec only) allowing
+          Detlefs & Zorn comparison study (in SIGPLAN Notices.)
+
+    Trial version Fri Aug 28 13:14:29 1992  Doug Lea  (dl at g.oswego.edu)
+      * Based loosely on libg++-1.2X malloc. (It retains some of the overall
+         structure of old version,  but most details differ.)
+
+*/
+
+#endif /* !HAVE_MALLOC */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/stdlib/SDL_qsort.c b/Source/3rd Party/sdl/src/stdlib/SDL_qsort.c
new file mode 100644
index 000000000..8329a35e3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/stdlib/SDL_qsort.c	
@@ -0,0 +1,476 @@
+/* qsort.c
+ * (c) 1998 Gareth McCaughan
+ *
+ * This is a drop-in replacement for the C library's |qsort()| routine.
+ *
+ * Features:
+ *   - Median-of-three pivoting (and more)
+ *   - Truncation and final polishing by a single insertion sort
+ *   - Early truncation when no swaps needed in pivoting step
+ *   - Explicit recursion, guaranteed not to overflow
+ *   - A few little wrinkles stolen from the GNU |qsort()|.
+ *   - separate code for non-aligned / aligned / word-size objects
+ *
+ * This code may be reproduced freely provided
+ *   - this file is retained unaltered apart from minor
+ *     changes for portability and efficiency
+ *   - no changes are made to this comment
+ *   - any changes that *are* made are clearly flagged
+ *   - the _ID string below is altered by inserting, after
+ *     the date, the string " altered" followed at your option
+ *     by other material. (Exceptions: you may change the name
+ *     of the exported routine without changing the ID string.
+ *     You may change the values of the macros TRUNC_* and
+ *     PIVOT_THRESHOLD without changing the ID string, provided
+ *     they remain constants with TRUNC_nonaligned, TRUNC_aligned
+ *     and TRUNC_words/WORD_BYTES between 8 and 24, and
+ *     PIVOT_THRESHOLD between 32 and 200.)
+ *
+ * You may use it in anything you like; you may make money
+ * out of it; you may distribute it in object form or as
+ * part of an executable without including source code;
+ * you don't have to credit me. (But it would be nice if
+ * you did.)
+ *
+ * If you find problems with this code, or find ways of
+ * making it significantly faster, please let me know!
+ * My e-mail address, valid as of early 1998 and certainly
+ * OK for at least the next 18 months, is
+ *    gjm11@dpmms.cam.ac.uk
+ * Thanks!
+ *
+ * Gareth McCaughan   Peterhouse   Cambridge   1998
+ */
+#include "../SDL_internal.h"
+
+/*
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+*/
+#include "SDL_stdinc.h"
+#include "SDL_assert.h"
+
+#if defined(HAVE_QSORT)
+void
+SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, const void *))
+{
+    qsort(base, nmemb, size, compare);
+}
+#else
+
+#ifdef assert
+#undef assert
+#endif
+#define assert(X) SDL_assert(X)
+#ifdef malloc
+#undef malloc
+#endif
+#define malloc	SDL_malloc
+#ifdef free
+#undef free
+#endif
+#define free	SDL_free
+#ifdef memcpy
+#undef memcpy
+#endif
+#define memcpy	SDL_memcpy
+#ifdef memmove
+#undef memmove
+#endif
+#define memmove	SDL_memmove
+#ifdef qsort
+#undef qsort
+#endif
+#define qsort	SDL_qsort
+
+static const char _ID[] = "<qsort.c gjm 1.12 1998-03-19>";
+
+/* How many bytes are there per word? (Must be a power of 2,
+ * and must in fact equal sizeof(int).)
+ */
+#define WORD_BYTES sizeof(int)
+
+/* How big does our stack need to be? Answer: one entry per
+ * bit in a |size_t|.
+ */
+#define STACK_SIZE (8*sizeof(size_t))
+
+/* Different situations have slightly different requirements,
+ * and we make life epsilon easier by using different truncation
+ * points for the three different cases.
+ * So far, I have tuned TRUNC_words and guessed that the same
+ * value might work well for the other two cases. Of course
+ * what works well on my machine might work badly on yours.
+ */
+#define TRUNC_nonaligned	12
+#define TRUNC_aligned		12
+#define TRUNC_words		12*WORD_BYTES   /* nb different meaning */
+
+/* We use a simple pivoting algorithm for shortish sub-arrays
+ * and a more complicated one for larger ones. The threshold
+ * is PIVOT_THRESHOLD.
+ */
+#define PIVOT_THRESHOLD 40
+
+typedef struct
+{
+    char *first;
+    char *last;
+} stack_entry;
+#define pushLeft {stack[stacktop].first=ffirst;stack[stacktop++].last=last;}
+#define pushRight {stack[stacktop].first=first;stack[stacktop++].last=llast;}
+#define doLeft {first=ffirst;llast=last;continue;}
+#define doRight {ffirst=first;last=llast;continue;}
+#define pop {if (--stacktop<0) break;\
+  first=ffirst=stack[stacktop].first;\
+  last=llast=stack[stacktop].last;\
+  continue;}
+
+/* Some comments on the implementation.
+ * 1. When we finish partitioning the array into "low"
+ *    and "high", we forget entirely about short subarrays,
+ *    because they'll be done later by insertion sort.
+ *    Doing lots of little insertion sorts might be a win
+ *    on large datasets for locality-of-reference reasons,
+ *    but it makes the code much nastier and increases
+ *    bookkeeping overhead.
+ * 2. We always save the shorter and get to work on the
+ *    longer. This guarantees that every time we push
+ *    an item onto the stack its size is <= 1/2 of that
+ *    of its parent; so the stack can't need more than
+ *    log_2(max-array-size) entries.
+ * 3. We choose a pivot by looking at the first, last
+ *    and middle elements. We arrange them into order
+ *    because it's easy to do that in conjunction with
+ *    choosing the pivot, and it makes things a little
+ *    easier in the partitioning step. Anyway, the pivot
+ *    is the middle of these three. It's still possible
+ *    to construct datasets where the algorithm takes
+ *    time of order n^2, but it simply never happens in
+ *    practice.
+ * 3' Newsflash: On further investigation I find that
+ *    it's easy to construct datasets where median-of-3
+ *    simply isn't good enough. So on large-ish subarrays
+ *    we do a more sophisticated pivoting: we take three
+ *    sets of 3 elements, find their medians, and then
+ *    take the median of those.
+ * 4. We copy the pivot element to a separate place
+ *    because that way we can always do our comparisons
+ *    directly against a pointer to that separate place,
+ *    and don't have to wonder "did we move the pivot
+ *    element?". This makes the inner loop better.
+ * 5. It's possible to make the pivoting even more
+ *    reliable by looking at more candidates when n
+ *    is larger. (Taking this to its logical conclusion
+ *    results in a variant of quicksort that doesn't
+ *    have that n^2 worst case.) However, the overhead
+ *    from the extra bookkeeping means that it's just
+ *    not worth while.
+ * 6. This is pretty clean and portable code. Here are
+ *    all the potential portability pitfalls and problems
+ *    I know of:
+ *      - In one place (the insertion sort) I construct
+ *        a pointer that points just past the end of the
+ *        supplied array, and assume that (a) it won't
+ *        compare equal to any pointer within the array,
+ *        and (b) it will compare equal to a pointer
+ *        obtained by stepping off the end of the array.
+ *        These might fail on some segmented architectures.
+ *      - I assume that there are 8 bits in a |char| when
+ *        computing the size of stack needed. This would
+ *        fail on machines with 9-bit or 16-bit bytes.
+ *      - I assume that if |((int)base&(sizeof(int)-1))==0|
+ *        and |(size&(sizeof(int)-1))==0| then it's safe to
+ *        get at array elements via |int*|s, and that if
+ *        actually |size==sizeof(int)| as well then it's
+ *        safe to treat the elements as |int|s. This might
+ *        fail on systems that convert pointers to integers
+ *        in non-standard ways.
+ *      - I assume that |8*sizeof(size_t)<=INT_MAX|. This
+ *        would be false on a machine with 8-bit |char|s,
+ *        16-bit |int|s and 4096-bit |size_t|s. :-)
+ */
+
+/* The recursion logic is the same in each case: */
+#define Recurse(Trunc)				\
+      { size_t l=last-ffirst,r=llast-first;	\
+        if (l<Trunc) {				\
+          if (r>=Trunc) doRight			\
+          else pop				\
+        }					\
+        else if (l<=r) { pushLeft; doRight }	\
+        else if (r>=Trunc) { pushRight; doLeft }\
+        else doLeft				\
+      }
+
+/* and so is the pivoting logic: */
+#define Pivot(swapper,sz)			\
+  if ((size_t)(last-first)>PIVOT_THRESHOLD*sz) mid=pivot_big(first,mid,last,sz,compare);\
+  else {	\
+    if (compare(first,mid)<0) {			\
+      if (compare(mid,last)>0) {		\
+        swapper(mid,last);			\
+        if (compare(first,mid)>0) swapper(first,mid);\
+      }						\
+    }						\
+    else {					\
+      if (compare(mid,last)>0) swapper(first,last)\
+      else {					\
+        swapper(first,mid);			\
+        if (compare(mid,last)>0) swapper(mid,last);\
+      }						\
+    }						\
+    first+=sz; last-=sz;			\
+  }
+
+#ifdef DEBUG_QSORT
+#include <stdio.h>
+#endif
+
+/* and so is the partitioning logic: */
+#define Partition(swapper,sz) {			\
+  int swapped=0;				\
+  do {						\
+    while (compare(first,pivot)<0) first+=sz;	\
+    while (compare(pivot,last)<0) last-=sz;	\
+    if (first<last) {				\
+      swapper(first,last); swapped=1;		\
+      first+=sz; last-=sz; }			\
+    else if (first==last) { first+=sz; last-=sz; break; }\
+  } while (first<=last);			\
+  if (!swapped) pop				\
+}
+
+/* and so is the pre-insertion-sort operation of putting
+ * the smallest element into place as a sentinel.
+ * Doing this makes the inner loop nicer. I got this
+ * idea from the GNU implementation of qsort().
+ */
+#define PreInsertion(swapper,limit,sz)		\
+  first=base;					\
+  last=first + (nmemb>limit ? limit : nmemb-1)*sz;\
+  while (last!=base) {				\
+    if (compare(first,last)>0) first=last;	\
+    last-=sz; }					\
+  if (first!=base) swapper(first,(char*)base);
+
+/* and so is the insertion sort, in the first two cases: */
+#define Insertion(swapper)			\
+  last=((char*)base)+nmemb*size;		\
+  for (first=((char*)base)+size;first!=last;first+=size) {	\
+    char *test;					\
+    /* Find the right place for |first|.	\
+     * My apologies for var reuse. */		\
+    for (test=first-size;compare(test,first)>0;test-=size) ;	\
+    test+=size;					\
+    if (test!=first) {				\
+      /* Shift everything in [test,first)	\
+       * up by one, and place |first|		\
+       * where |test| is. */			\
+      memcpy(pivot,first,size);			\
+      memmove(test+size,test,first-test);	\
+      memcpy(test,pivot,size);			\
+    }						\
+  }
+
+#define SWAP_nonaligned(a,b) { \
+  register char *aa=(a),*bb=(b); \
+  register size_t sz=size; \
+  do { register char t=*aa; *aa++=*bb; *bb++=t; } while (--sz); }
+
+#define SWAP_aligned(a,b) { \
+  register int *aa=(int*)(a),*bb=(int*)(b); \
+  register size_t sz=size; \
+  do { register int t=*aa;*aa++=*bb; *bb++=t; } while (sz-=WORD_BYTES); }
+
+#define SWAP_words(a,b) { \
+  register int t=*((int*)a); *((int*)a)=*((int*)b); *((int*)b)=t; }
+
+/* ---------------------------------------------------------------------- */
+
+static char *
+pivot_big(char *first, char *mid, char *last, size_t size,
+          int compare(const void *, const void *))
+{
+    size_t d = (((last - first) / size) >> 3) * size;
+    char *m1, *m2, *m3;
+    {
+        char *a = first, *b = first + d, *c = first + 2 * d;
+#ifdef DEBUG_QSORT
+        fprintf(stderr, "< %d %d %d\n", *(int *) a, *(int *) b, *(int *) c);
+#endif
+        m1 = compare(a, b) < 0 ?
+            (compare(b, c) < 0 ? b : (compare(a, c) < 0 ? c : a))
+            : (compare(a, c) < 0 ? a : (compare(b, c) < 0 ? c : b));
+    }
+    {
+        char *a = mid - d, *b = mid, *c = mid + d;
+#ifdef DEBUG_QSORT
+        fprintf(stderr, ". %d %d %d\n", *(int *) a, *(int *) b, *(int *) c);
+#endif
+        m2 = compare(a, b) < 0 ?
+            (compare(b, c) < 0 ? b : (compare(a, c) < 0 ? c : a))
+            : (compare(a, c) < 0 ? a : (compare(b, c) < 0 ? c : b));
+    }
+    {
+        char *a = last - 2 * d, *b = last - d, *c = last;
+#ifdef DEBUG_QSORT
+        fprintf(stderr, "> %d %d %d\n", *(int *) a, *(int *) b, *(int *) c);
+#endif
+        m3 = compare(a, b) < 0 ?
+            (compare(b, c) < 0 ? b : (compare(a, c) < 0 ? c : a))
+            : (compare(a, c) < 0 ? a : (compare(b, c) < 0 ? c : b));
+    }
+#ifdef DEBUG_QSORT
+    fprintf(stderr, "-> %d %d %d\n", *(int *) m1, *(int *) m2, *(int *) m3);
+#endif
+    return compare(m1, m2) < 0 ?
+        (compare(m2, m3) < 0 ? m2 : (compare(m1, m3) < 0 ? m3 : m1))
+        : (compare(m1, m3) < 0 ? m1 : (compare(m2, m3) < 0 ? m3 : m2));
+}
+
+/* ---------------------------------------------------------------------- */
+
+static void
+qsort_nonaligned(void *base, size_t nmemb, size_t size,
+                 int (*compare) (const void *, const void *))
+{
+
+    stack_entry stack[STACK_SIZE];
+    int stacktop = 0;
+    char *first, *last;
+    char *pivot = malloc(size);
+    size_t trunc = TRUNC_nonaligned * size;
+    assert(pivot != 0);
+
+    first = (char *) base;
+    last = first + (nmemb - 1) * size;
+
+    if ((size_t) (last - first) > trunc) {
+        char *ffirst = first, *llast = last;
+        while (1) {
+            /* Select pivot */
+            {
+                char *mid = first + size * ((last - first) / size >> 1);
+                Pivot(SWAP_nonaligned, size);
+                memcpy(pivot, mid, size);
+            }
+            /* Partition. */
+            Partition(SWAP_nonaligned, size);
+            /* Prepare to recurse/iterate. */
+        Recurse(trunc)}
+    }
+    PreInsertion(SWAP_nonaligned, TRUNC_nonaligned, size);
+    Insertion(SWAP_nonaligned);
+    free(pivot);
+}
+
+static void
+qsort_aligned(void *base, size_t nmemb, size_t size,
+              int (*compare) (const void *, const void *))
+{
+
+    stack_entry stack[STACK_SIZE];
+    int stacktop = 0;
+    char *first, *last;
+    char *pivot = malloc(size);
+    size_t trunc = TRUNC_aligned * size;
+    assert(pivot != 0);
+
+    first = (char *) base;
+    last = first + (nmemb - 1) * size;
+
+    if ((size_t) (last - first) > trunc) {
+        char *ffirst = first, *llast = last;
+        while (1) {
+            /* Select pivot */
+            {
+                char *mid = first + size * ((last - first) / size >> 1);
+                Pivot(SWAP_aligned, size);
+                memcpy(pivot, mid, size);
+            }
+            /* Partition. */
+            Partition(SWAP_aligned, size);
+            /* Prepare to recurse/iterate. */
+        Recurse(trunc)}
+    }
+    PreInsertion(SWAP_aligned, TRUNC_aligned, size);
+    Insertion(SWAP_aligned);
+    free(pivot);
+}
+
+static void
+qsort_words(void *base, size_t nmemb,
+            int (*compare) (const void *, const void *))
+{
+
+    stack_entry stack[STACK_SIZE];
+    int stacktop = 0;
+    char *first, *last;
+    char *pivot = malloc(WORD_BYTES);
+    assert(pivot != 0);
+
+    first = (char *) base;
+    last = first + (nmemb - 1) * WORD_BYTES;
+
+    if (last - first > TRUNC_words) {
+        char *ffirst = first, *llast = last;
+        while (1) {
+#ifdef DEBUG_QSORT
+            fprintf(stderr, "Doing %d:%d: ",
+                    (first - (char *) base) / WORD_BYTES,
+                    (last - (char *) base) / WORD_BYTES);
+#endif
+            /* Select pivot */
+            {
+                char *mid =
+                    first + WORD_BYTES * ((last - first) / (2 * WORD_BYTES));
+                Pivot(SWAP_words, WORD_BYTES);
+                *(int *) pivot = *(int *) mid;
+            }
+#ifdef DEBUG_QSORT
+            fprintf(stderr, "pivot=%d\n", *(int *) pivot);
+#endif
+            /* Partition. */
+            Partition(SWAP_words, WORD_BYTES);
+            /* Prepare to recurse/iterate. */
+        Recurse(TRUNC_words)}
+    }
+    PreInsertion(SWAP_words, (TRUNC_words / WORD_BYTES), WORD_BYTES);
+    /* Now do insertion sort. */
+    last = ((char *) base) + nmemb * WORD_BYTES;
+    for (first = ((char *) base) + WORD_BYTES; first != last;
+         first += WORD_BYTES) {
+        /* Find the right place for |first|. My apologies for var reuse */
+        int *pl = (int *) (first - WORD_BYTES), *pr = (int *) first;
+        *(int *) pivot = *(int *) first;
+        for (; compare(pl, pivot) > 0; pr = pl, --pl) {
+            *pr = *pl;
+        }
+        if (pr != (int *) first)
+            *pr = *(int *) pivot;
+    }
+    free(pivot);
+}
+
+/* ---------------------------------------------------------------------- */
+
+void
+qsort(void *base, size_t nmemb, size_t size,
+      int (*compare) (const void *, const void *))
+{
+
+    if (nmemb <= 1)
+        return;
+    if (((uintptr_t) base | size) & (WORD_BYTES - 1))
+        qsort_nonaligned(base, nmemb, size, compare);
+    else if (size != WORD_BYTES)
+        qsort_aligned(base, nmemb, size, compare);
+    else
+        qsort_words(base, nmemb, compare);
+}
+
+#endif /* !SDL_qsort */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/stdlib/SDL_stdlib.c b/Source/3rd Party/sdl/src/stdlib/SDL_stdlib.c
new file mode 100644
index 000000000..8ba8ce01c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/stdlib/SDL_stdlib.c	
@@ -0,0 +1,945 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This file contains portable stdlib functions for SDL */
+
+#include "SDL_stdinc.h"
+#include "../libm/math_libm.h"
+
+
+double
+SDL_atan(double x)
+{
+#ifdef HAVE_ATAN
+    return atan(x);
+#else
+    return SDL_uclibc_atan(x);
+#endif /* HAVE_ATAN */
+}
+
+double
+SDL_atan2(double x, double y)
+{
+#if defined(HAVE_ATAN2)
+    return atan2(x, y);
+#else
+    return SDL_uclibc_atan2(x, y);
+#endif /* HAVE_ATAN2 */
+}
+
+double
+SDL_acos(double val)
+{
+#if defined(HAVE_ACOS)
+    return acos(val);
+#else
+    double result;
+    if (val == -1.0) {
+        result = M_PI;
+    } else {
+        result = SDL_atan(SDL_sqrt(1.0 - val * val) / val);
+        if (result < 0.0)
+        {
+            result += M_PI;
+        }
+    }
+    return result;
+#endif
+}
+
+double
+SDL_asin(double val)
+{
+#if defined(HAVE_ASIN)
+    return asin(val);
+#else
+    double result;
+    if (val == -1.0) {
+        result = -(M_PI / 2.0);
+    } else {
+        result = (M_PI / 2.0) - SDL_acos(val);
+    }
+    return result;
+#endif
+}
+
+double
+SDL_ceil(double x)
+{
+#ifdef HAVE_CEIL
+    return ceil(x);
+#else
+    double integer = SDL_floor(x);
+    double fraction = x - integer;
+    if (fraction > 0.0) {
+        integer += 1.0;
+    }
+    return integer;
+#endif /* HAVE_CEIL */
+}
+
+double
+SDL_copysign(double x, double y)
+{
+#if defined(HAVE_COPYSIGN)
+    return copysign(x, y);
+#elif defined(HAVE__COPYSIGN)
+    return _copysign(x, y);
+#else
+    return SDL_uclibc_copysign(x, y);
+#endif /* HAVE_COPYSIGN */
+}
+
+double
+SDL_cos(double x)
+{
+#if defined(HAVE_COS)
+    return cos(x);
+#else
+    return SDL_uclibc_cos(x);
+#endif /* HAVE_COS */
+}
+
+float
+SDL_cosf(float x)
+{
+#ifdef HAVE_COSF
+    return cosf(x);
+#else
+    return (float)SDL_cos((double)x);
+#endif
+}
+
+double
+SDL_fabs(double x)
+{
+#if defined(HAVE_FABS)
+    return fabs(x); 
+#else
+    return SDL_uclibc_fabs(x);
+#endif /* HAVE_FABS */
+}
+
+double
+SDL_floor(double x)
+{
+#if defined(HAVE_FLOOR)
+    return floor(x);
+#else
+    return SDL_uclibc_floor(x);
+#endif /* HAVE_FLOOR */
+}
+
+double
+SDL_log(double x)
+{
+#if defined(HAVE_LOG)
+    return log(x);
+#else
+    return SDL_uclibc_log(x);
+#endif /* HAVE_LOG */
+}
+
+double
+SDL_pow(double x, double y)
+{
+#if defined(HAVE_POW)
+    return pow(x, y);
+#else
+    return SDL_uclibc_pow(x, y);
+#endif /* HAVE_POW */
+}
+
+double
+SDL_scalbn(double x, int n)
+{
+#if defined(HAVE_SCALBN)
+    return scalbn(x, n);
+#elif defined(HAVE__SCALB)
+    return _scalb(x, n);
+#else
+    return SDL_uclibc_scalbn(x, n);
+#endif /* HAVE_SCALBN */
+}
+
+double
+SDL_sin(double x)
+{
+#if defined(HAVE_SIN)
+    return sin(x);
+#else
+    return SDL_uclibc_sin(x);
+#endif /* HAVE_SIN */
+}
+
+float 
+SDL_sinf(float x)
+{
+#ifdef HAVE_SINF
+    return sinf(x);
+#else
+    return (float)SDL_sin((double)x);
+#endif /* HAVE_SINF */
+}
+
+double
+SDL_sqrt(double x)
+{
+#if defined(HAVE_SQRT)
+    return sqrt(x);
+#else
+    return SDL_uclibc_sqrt(x);
+#endif
+}
+
+int SDL_abs(int x)
+{
+#ifdef HAVE_ABS
+    return abs(x);
+#else
+    return ((x) < 0 ? -(x) : (x));
+#endif
+}
+
+#ifdef HAVE_CTYPE_H
+int SDL_isdigit(int x) { return isdigit(x); }
+int SDL_isspace(int x) { return isspace(x); }
+int SDL_toupper(int x) { return toupper(x); }
+int SDL_tolower(int x) { return tolower(x); }
+#else
+int SDL_isdigit(int x) { return ((x) >= '0') && ((x) <= '9'); }
+int SDL_isspace(int x) { return ((x) == ' ') || ((x) == '\t') || ((x) == '\r') || ((x) == '\n') || ((x) == '\f') || ((x) == '\v'); }
+int SDL_toupper(int x) { return ((x) >= 'a') && ((x) <= 'z') ? ('A'+((x)-'a')) : (x); }
+int SDL_tolower(int x) { return ((x) >= 'A') && ((x) <= 'Z') ? ('a'+((x)-'A')) : (x); }
+#endif
+
+
+#ifndef HAVE_LIBC
+/* These are some C runtime intrinsics that need to be defined */
+
+#if defined(_MSC_VER)
+
+#ifndef __FLTUSED__
+#define __FLTUSED__
+//__declspec(selectany) int _fltused = 1;
+#endif
+
+/* The optimizer on Visual Studio 2010/2012 generates memcpy() calls */
+#if _MSC_VER >= 1600 && defined(_WIN64) && !defined(_DEBUG) && 0 // Disable to fix x64|Release build.
+#include <intrin.h>
+
+#pragma function(memcpy)
+void * memcpy ( void * destination, const void * source, size_t num )
+{
+    const Uint8 *src = (const Uint8 *)source;
+    Uint8 *dst = (Uint8 *)destination;
+    size_t i;
+    
+    /* All WIN64 architectures have SSE, right? */
+    if (!((uintptr_t) src & 15) && !((uintptr_t) dst & 15)) {
+        __m128 values[4];
+        for (i = num / 64; i--;) {
+            _mm_prefetch(src, _MM_HINT_NTA);
+            values[0] = *(__m128 *) (src + 0);
+            values[1] = *(__m128 *) (src + 16);
+            values[2] = *(__m128 *) (src + 32);
+            values[3] = *(__m128 *) (src + 48);
+            _mm_stream_ps((float *) (dst + 0), values[0]);
+            _mm_stream_ps((float *) (dst + 16), values[1]);
+            _mm_stream_ps((float *) (dst + 32), values[2]);
+            _mm_stream_ps((float *) (dst + 48), values[3]);
+            src += 64;
+            dst += 64;
+        }
+        num &= 63;
+    }
+
+    while (num--) {
+        *dst++ = *src++;
+    }
+    return destination;
+}
+#endif /* _MSC_VER == 1600 && defined(_WIN64) && !defined(_DEBUG) */
+
+#ifdef _M_IX86
+
+/* Float to long */
+void
+__declspec(naked)
+_ftol()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        push        ebp
+        mov         ebp,esp
+        sub         esp,20h
+        and         esp,0FFFFFFF0h
+        fld         st(0)
+        fst         dword ptr [esp+18h]
+        fistp       qword ptr [esp+10h]
+        fild        qword ptr [esp+10h]
+        mov         edx,dword ptr [esp+18h]
+        mov         eax,dword ptr [esp+10h]
+        test        eax,eax
+        je          integer_QnaN_or_zero
+arg_is_not_integer_QnaN:
+        fsubp       st(1),st
+        test        edx,edx
+        jns         positive
+        fstp        dword ptr [esp]
+        mov         ecx,dword ptr [esp]
+        xor         ecx,80000000h
+        add         ecx,7FFFFFFFh
+        adc         eax,0
+        mov         edx,dword ptr [esp+14h]
+        adc         edx,0
+        jmp         localexit
+positive:
+        fstp        dword ptr [esp]
+        mov         ecx,dword ptr [esp]
+        add         ecx,7FFFFFFFh
+        sbb         eax,0
+        mov         edx,dword ptr [esp+14h]
+        sbb         edx,0
+        jmp         localexit
+integer_QnaN_or_zero:
+        mov         edx,dword ptr [esp+14h]
+        test        edx,7FFFFFFFh
+        jne         arg_is_not_integer_QnaN
+        fstp        dword ptr [esp+18h]
+        fstp        dword ptr [esp+18h]
+localexit:
+        leave
+        ret
+    }
+    /* *INDENT-ON* */
+}
+
+/*void
+_ftol2_sse()
+{
+    _ftol();
+}*/
+
+/* 64-bit math operators for 32-bit systems */
+void
+__declspec(naked)
+_allmul()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        push        ebp
+        mov         ebp,esp
+        push        edi
+        push        esi
+        push        ebx
+        sub         esp,0Ch
+        mov         eax,dword ptr [ebp+10h]
+        mov         edi,dword ptr [ebp+8]
+        mov         ebx,eax
+        mov         esi,eax
+        sar         esi,1Fh
+        mov         eax,dword ptr [ebp+8]
+        mul         ebx
+        imul        edi,esi
+        mov         ecx,edx
+        mov         dword ptr [ebp-18h],eax
+        mov         edx,dword ptr [ebp+0Ch]
+        add         ecx,edi
+        imul        ebx,edx
+        mov         eax,dword ptr [ebp-18h]
+        lea         ebx,[ebx+ecx]
+        mov         dword ptr [ebp-14h],ebx
+        mov         edx,dword ptr [ebp-14h]
+        add         esp,0Ch
+        pop         ebx
+        pop         esi
+        pop         edi
+        pop         ebp
+        ret         10h
+    }
+    /* *INDENT-ON* */
+}
+
+void
+__declspec(naked)
+_alldiv()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        push        edi
+        push        esi
+        push        ebx
+        xor         edi,edi
+        mov         eax,dword ptr [esp+14h]
+        or          eax,eax
+        jge         L1
+        inc         edi
+        mov         edx,dword ptr [esp+10h]
+        neg         eax
+        neg         edx
+        sbb         eax,0
+        mov         dword ptr [esp+14h],eax
+        mov         dword ptr [esp+10h],edx
+L1:
+        mov         eax,dword ptr [esp+1Ch]
+        or          eax,eax
+        jge         L2
+        inc         edi
+        mov         edx,dword ptr [esp+18h]
+        neg         eax
+        neg         edx
+        sbb         eax,0
+        mov         dword ptr [esp+1Ch],eax
+        mov         dword ptr [esp+18h],edx
+L2:
+        or          eax,eax
+        jne         L3
+        mov         ecx,dword ptr [esp+18h]
+        mov         eax,dword ptr [esp+14h]
+        xor         edx,edx
+        div         ecx
+        mov         ebx,eax
+        mov         eax,dword ptr [esp+10h]
+        div         ecx
+        mov         edx,ebx
+        jmp         L4
+L3:
+        mov         ebx,eax
+        mov         ecx,dword ptr [esp+18h]
+        mov         edx,dword ptr [esp+14h]
+        mov         eax,dword ptr [esp+10h]
+L5:
+        shr         ebx,1
+        rcr         ecx,1
+        shr         edx,1
+        rcr         eax,1
+        or          ebx,ebx
+        jne         L5
+        div         ecx
+        mov         esi,eax
+        mul         dword ptr [esp+1Ch]
+        mov         ecx,eax
+        mov         eax,dword ptr [esp+18h]
+        mul         esi
+        add         edx,ecx
+        jb          L6
+        cmp         edx,dword ptr [esp+14h]
+        ja          L6
+        jb          L7
+        cmp         eax,dword ptr [esp+10h]
+        jbe         L7
+L6:
+        dec         esi
+L7:
+        xor         edx,edx
+        mov         eax,esi
+L4:
+        dec         edi
+        jne         L8
+        neg         edx
+        neg         eax
+        sbb         edx,0
+L8:
+        pop         ebx
+        pop         esi
+        pop         edi
+        ret         10h
+    }
+    /* *INDENT-ON* */
+}
+
+void
+__declspec(naked)
+_aulldiv()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        push        ebx
+        push        esi
+        mov         eax,dword ptr [esp+18h]
+        or          eax,eax
+        jne         L1
+        mov         ecx,dword ptr [esp+14h]
+        mov         eax,dword ptr [esp+10h]
+        xor         edx,edx
+        div         ecx
+        mov         ebx,eax
+        mov         eax,dword ptr [esp+0Ch]
+        div         ecx
+        mov         edx,ebx
+        jmp         L2
+L1:
+        mov         ecx,eax
+        mov         ebx,dword ptr [esp+14h]
+        mov         edx,dword ptr [esp+10h]
+        mov         eax,dword ptr [esp+0Ch]
+L3:
+        shr         ecx,1
+        rcr         ebx,1
+        shr         edx,1
+        rcr         eax,1
+        or          ecx,ecx
+        jne         L3
+        div         ebx
+        mov         esi,eax
+        mul         dword ptr [esp+18h]
+        mov         ecx,eax
+        mov         eax,dword ptr [esp+14h]
+        mul         esi
+        add         edx,ecx
+        jb          L4
+        cmp         edx,dword ptr [esp+10h]
+        ja          L4
+        jb          L5
+        cmp         eax,dword ptr [esp+0Ch]
+        jbe         L5
+L4:
+        dec         esi
+L5:
+        xor         edx,edx
+        mov         eax,esi
+L2:
+        pop         esi
+        pop         ebx
+        ret         10h
+    }
+    /* *INDENT-ON* */
+}
+
+void
+__declspec(naked)
+_allrem()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        push        ebx
+        push        edi
+        xor         edi,edi
+        mov         eax,dword ptr [esp+10h]
+        or          eax,eax
+        jge         L1
+        inc         edi
+        mov         edx,dword ptr [esp+0Ch]
+        neg         eax
+        neg         edx
+        sbb         eax,0
+        mov         dword ptr [esp+10h],eax
+        mov         dword ptr [esp+0Ch],edx
+L1:
+        mov         eax,dword ptr [esp+18h]
+        or          eax,eax
+        jge         L2
+        mov         edx,dword ptr [esp+14h]
+        neg         eax
+        neg         edx
+        sbb         eax,0
+        mov         dword ptr [esp+18h],eax
+        mov         dword ptr [esp+14h],edx
+L2:
+        or          eax,eax
+        jne         L3
+        mov         ecx,dword ptr [esp+14h]
+        mov         eax,dword ptr [esp+10h]
+        xor         edx,edx
+        div         ecx
+        mov         eax,dword ptr [esp+0Ch]
+        div         ecx
+        mov         eax,edx
+        xor         edx,edx
+        dec         edi
+        jns         L4
+        jmp         L8
+L3:
+        mov         ebx,eax
+        mov         ecx,dword ptr [esp+14h]
+        mov         edx,dword ptr [esp+10h]
+        mov         eax,dword ptr [esp+0Ch]
+L5:
+        shr         ebx,1
+        rcr         ecx,1
+        shr         edx,1
+        rcr         eax,1
+        or          ebx,ebx
+        jne         L5
+        div         ecx
+        mov         ecx,eax
+        mul         dword ptr [esp+18h]
+        xchg        eax,ecx
+        mul         dword ptr [esp+14h]
+        add         edx,ecx
+        jb          L6
+        cmp         edx,dword ptr [esp+10h]
+        ja          L6
+        jb          L7
+        cmp         eax,dword ptr [esp+0Ch]
+        jbe         L7
+L6:
+        sub         eax,dword ptr [esp+14h]
+        sbb         edx,dword ptr [esp+18h]
+L7:
+        sub         eax,dword ptr [esp+0Ch]
+        sbb         edx,dword ptr [esp+10h]
+        dec         edi
+        jns         L8
+L4:
+        neg         edx
+        neg         eax
+        sbb         edx,0
+L8:
+        pop         edi
+        pop         ebx
+        ret         10h
+    }
+    /* *INDENT-ON* */
+}
+
+void
+__declspec(naked)
+_aullrem()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        push        ebx
+        mov         eax,dword ptr [esp+14h]
+        or          eax,eax
+        jne         L1
+        mov         ecx,dword ptr [esp+10h]
+        mov         eax,dword ptr [esp+0Ch]
+        xor         edx,edx
+        div         ecx
+        mov         eax,dword ptr [esp+8]
+        div         ecx
+        mov         eax,edx
+        xor         edx,edx
+        jmp         L2
+L1:
+        mov         ecx,eax
+        mov         ebx,dword ptr [esp+10h]
+        mov         edx,dword ptr [esp+0Ch]
+        mov         eax,dword ptr [esp+8]
+L3:
+        shr         ecx,1
+        rcr         ebx,1
+        shr         edx,1
+        rcr         eax,1
+        or          ecx,ecx
+        jne         L3
+        div         ebx
+        mov         ecx,eax
+        mul         dword ptr [esp+14h]
+        xchg        eax,ecx
+        mul         dword ptr [esp+10h]
+        add         edx,ecx
+        jb          L4
+        cmp         edx,dword ptr [esp+0Ch]
+        ja          L4
+        jb          L5
+        cmp         eax,dword ptr [esp+8]
+        jbe         L5
+L4:
+        sub         eax,dword ptr [esp+10h]
+        sbb         edx,dword ptr [esp+14h]
+L5:
+        sub         eax,dword ptr [esp+8]
+        sbb         edx,dword ptr [esp+0Ch]
+        neg         edx
+        neg         eax
+        sbb         edx,0
+L2:
+        pop         ebx
+        ret         10h
+    }
+    /* *INDENT-ON* */
+}
+
+void
+__declspec(naked)
+_alldvrm()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        push        edi
+        push        esi
+        push        ebp
+        xor         edi,edi
+        xor         ebp,ebp
+        mov         eax,dword ptr [esp+14h]
+        or          eax,eax
+        jge         L1
+        inc         edi
+        inc         ebp
+        mov         edx,dword ptr [esp+10h]
+        neg         eax
+        neg         edx
+        sbb         eax,0
+        mov         dword ptr [esp+14h],eax
+        mov         dword ptr [esp+10h],edx
+L1:
+        mov         eax,dword ptr [esp+1Ch]
+        or          eax,eax
+        jge         L2
+        inc         edi
+        mov         edx,dword ptr [esp+18h]
+        neg         eax
+        neg         edx
+        sbb         eax,0
+        mov         dword ptr [esp+1Ch],eax
+        mov         dword ptr [esp+18h],edx
+L2:
+        or          eax,eax
+        jne         L3
+        mov         ecx,dword ptr [esp+18h]
+        mov         eax,dword ptr [esp+14h]
+        xor         edx,edx
+        div         ecx
+        mov         ebx,eax
+        mov         eax,dword ptr [esp+10h]
+        div         ecx
+        mov         esi,eax
+        mov         eax,ebx
+        mul         dword ptr [esp+18h]
+        mov         ecx,eax
+        mov         eax,esi
+        mul         dword ptr [esp+18h]
+        add         edx,ecx
+        jmp         L4
+L3:
+        mov         ebx,eax
+        mov         ecx,dword ptr [esp+18h]
+        mov         edx,dword ptr [esp+14h]
+        mov         eax,dword ptr [esp+10h]
+L5:
+        shr         ebx,1
+        rcr         ecx,1
+        shr         edx,1
+        rcr         eax,1
+        or          ebx,ebx
+        jne         L5
+        div         ecx
+        mov         esi,eax
+        mul         dword ptr [esp+1Ch]
+        mov         ecx,eax
+        mov         eax,dword ptr [esp+18h]
+        mul         esi
+        add         edx,ecx
+        jb          L6
+        cmp         edx,dword ptr [esp+14h]
+        ja          L6
+        jb          L7
+        cmp         eax,dword ptr [esp+10h]
+        jbe         L7
+L6:
+        dec         esi
+        sub         eax,dword ptr [esp+18h]
+        sbb         edx,dword ptr [esp+1Ch]
+L7:
+        xor         ebx,ebx
+L4:
+        sub         eax,dword ptr [esp+10h]
+        sbb         edx,dword ptr [esp+14h]
+        dec         ebp
+        jns         L9
+        neg         edx
+        neg         eax
+        sbb         edx,0
+L9:
+        mov         ecx,edx
+        mov         edx,ebx
+        mov         ebx,ecx
+        mov         ecx,eax
+        mov         eax,esi
+        dec         edi
+        jne         L8
+        neg         edx
+        neg         eax
+        sbb         edx,0
+L8:
+        pop         ebp
+        pop         esi
+        pop         edi
+        ret         10h
+    }
+    /* *INDENT-ON* */
+}
+
+void
+__declspec(naked)
+_aulldvrm()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        push        esi
+        mov         eax,dword ptr [esp+14h]
+        or          eax,eax
+        jne         L1
+        mov         ecx,dword ptr [esp+10h]
+        mov         eax,dword ptr [esp+0Ch]
+        xor         edx,edx
+        div         ecx
+        mov         ebx,eax
+        mov         eax,dword ptr [esp+8]
+        div         ecx
+        mov         esi,eax
+        mov         eax,ebx
+        mul         dword ptr [esp+10h]
+        mov         ecx,eax
+        mov         eax,esi
+        mul         dword ptr [esp+10h]
+        add         edx,ecx
+        jmp         L2
+L1:
+        mov         ecx,eax
+        mov         ebx,dword ptr [esp+10h]
+        mov         edx,dword ptr [esp+0Ch]
+        mov         eax,dword ptr [esp+8]
+L3:
+        shr         ecx,1
+        rcr         ebx,1
+        shr         edx,1
+        rcr         eax,1
+        or          ecx,ecx
+        jne         L3
+        div         ebx
+        mov         esi,eax
+        mul         dword ptr [esp+14h]
+        mov         ecx,eax
+        mov         eax,dword ptr [esp+10h]
+        mul         esi
+        add         edx,ecx
+        jb          L4
+        cmp         edx,dword ptr [esp+0Ch]
+        ja          L4
+        jb          L5
+        cmp         eax,dword ptr [esp+8]
+        jbe         L5
+L4:
+        dec         esi
+        sub         eax,dword ptr [esp+10h]
+        sbb         edx,dword ptr [esp+14h]
+L5:
+        xor         ebx,ebx
+L2:
+        sub         eax,dword ptr [esp+8]
+        sbb         edx,dword ptr [esp+0Ch]
+        neg         edx
+        neg         eax
+        sbb         edx,0
+        mov         ecx,edx
+        mov         edx,ebx
+        mov         ebx,ecx
+        mov         ecx,eax
+        mov         eax,esi
+        pop         esi
+        ret         10h
+    }
+    /* *INDENT-ON* */
+}
+
+void
+__declspec(naked)
+_allshl()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        cmp         cl,40h
+        jae         RETZERO
+        cmp         cl,20h
+        jae         MORE32
+        shld        edx,eax,cl
+        shl         eax,cl
+        ret
+MORE32:
+        mov         edx,eax
+        xor         eax,eax
+        and         cl,1Fh
+        shl         edx,cl
+        ret
+RETZERO:
+        xor         eax,eax
+        xor         edx,edx
+        ret
+    }
+    /* *INDENT-ON* */
+}
+
+void
+__declspec(naked)
+_allshr()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        cmp         cl,40h
+        jae         RETZERO
+        cmp         cl,20h
+        jae         MORE32
+        shrd        eax,edx,cl
+        sar         edx,cl
+        ret
+MORE32:
+        mov         eax,edx
+        xor         edx,edx
+        and         cl,1Fh
+        sar         eax,cl
+        ret
+RETZERO:
+        xor         eax,eax
+        xor         edx,edx
+        ret
+    }
+    /* *INDENT-ON* */
+}
+
+void
+__declspec(naked)
+_aullshr()
+{
+    /* *INDENT-OFF* */
+    __asm {
+        cmp         cl,40h
+        jae         RETZERO
+        cmp         cl,20h
+        jae         MORE32
+        shrd        eax,edx,cl
+        shr         edx,cl
+        ret
+MORE32:
+        mov         eax,edx
+        xor         edx,edx
+        and         cl,1Fh
+        shr         eax,cl
+        ret
+RETZERO:
+        xor         eax,eax
+        xor         edx,edx
+        ret
+    }
+    /* *INDENT-ON* */
+}
+
+#endif /* _M_IX86 */
+
+#endif /* MSC_VER */
+
+#endif /* !HAVE_LIBC */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/stdlib/SDL_string.c b/Source/3rd Party/sdl/src/stdlib/SDL_string.c
new file mode 100644
index 000000000..fb50687cc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/stdlib/SDL_string.c	
@@ -0,0 +1,1635 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This file contains portable string manipulation functions for SDL */
+
+#include "SDL_stdinc.h"
+
+
+#define SDL_isupperhex(X)   (((X) >= 'A') && ((X) <= 'F'))
+#define SDL_islowerhex(X)   (((X) >= 'a') && ((X) <= 'f'))
+
+#define UTF8_IsLeadByte(c) ((c) >= 0xC0 && (c) <= 0xF4)
+#define UTF8_IsTrailingByte(c) ((c) >= 0x80 && (c) <= 0xBF)
+
+static int UTF8_TrailingBytes(unsigned char c)
+{
+    if (c >= 0xC0 && c <= 0xDF)
+        return 1;
+    else if (c >= 0xE0 && c <= 0xEF)
+        return 2;
+    else if (c >= 0xF0 && c <= 0xF4)
+        return 3;
+    else
+        return 0;
+}
+
+#if !defined(HAVE_VSSCANF) || !defined(HAVE_STRTOL)
+static size_t
+SDL_ScanLong(const char *text, int radix, long *valuep)
+{
+    const char *textstart = text;
+    long value = 0;
+    SDL_bool negative = SDL_FALSE;
+
+    if (*text == '-') {
+        negative = SDL_TRUE;
+        ++text;
+    }
+    if (radix == 16 && SDL_strncmp(text, "0x", 2) == 0) {
+        text += 2;
+    }
+    for (;;) {
+        int v;
+        if (SDL_isdigit((unsigned char) *text)) {
+            v = *text - '0';
+        } else if (radix == 16 && SDL_isupperhex(*text)) {
+            v = 10 + (*text - 'A');
+        } else if (radix == 16 && SDL_islowerhex(*text)) {
+            v = 10 + (*text - 'a');
+        } else {
+            break;
+        }
+        value *= radix;
+        value += v;
+        ++text;
+    }
+    if (valuep) {
+        if (negative && value) {
+            *valuep = -value;
+        } else {
+            *valuep = value;
+        }
+    }
+    return (text - textstart);
+}
+#endif
+
+#if !defined(HAVE_VSSCANF) || !defined(HAVE_STRTOUL) || !defined(HAVE_STRTOD)
+static size_t
+SDL_ScanUnsignedLong(const char *text, int radix, unsigned long *valuep)
+{
+    const char *textstart = text;
+    unsigned long value = 0;
+
+    if (radix == 16 && SDL_strncmp(text, "0x", 2) == 0) {
+        text += 2;
+    }
+    for (;;) {
+        int v;
+        if (SDL_isdigit((unsigned char) *text)) {
+            v = *text - '0';
+        } else if (radix == 16 && SDL_isupperhex(*text)) {
+            v = 10 + (*text - 'A');
+        } else if (radix == 16 && SDL_islowerhex(*text)) {
+            v = 10 + (*text - 'a');
+        } else {
+            break;
+        }
+        value *= radix;
+        value += v;
+        ++text;
+    }
+    if (valuep) {
+        *valuep = value;
+    }
+    return (text - textstart);
+}
+#endif
+
+#ifndef HAVE_VSSCANF
+static size_t
+SDL_ScanUintPtrT(const char *text, int radix, uintptr_t * valuep)
+{
+    const char *textstart = text;
+    uintptr_t value = 0;
+
+    if (radix == 16 && SDL_strncmp(text, "0x", 2) == 0) {
+        text += 2;
+    }
+    for (;;) {
+        int v;
+        if (SDL_isdigit((unsigned char) *text)) {
+            v = *text - '0';
+        } else if (radix == 16 && SDL_isupperhex(*text)) {
+            v = 10 + (*text - 'A');
+        } else if (radix == 16 && SDL_islowerhex(*text)) {
+            v = 10 + (*text - 'a');
+        } else {
+            break;
+        }
+        value *= radix;
+        value += v;
+        ++text;
+    }
+    if (valuep) {
+        *valuep = value;
+    }
+    return (text - textstart);
+}
+#endif
+
+#if !defined(HAVE_VSSCANF) || !defined(HAVE_STRTOLL)
+static size_t
+SDL_ScanLongLong(const char *text, int radix, Sint64 * valuep)
+{
+    const char *textstart = text;
+    Sint64 value = 0;
+    SDL_bool negative = SDL_FALSE;
+
+    if (*text == '-') {
+        negative = SDL_TRUE;
+        ++text;
+    }
+    if (radix == 16 && SDL_strncmp(text, "0x", 2) == 0) {
+        text += 2;
+    }
+    for (;;) {
+        int v;
+        if (SDL_isdigit((unsigned char) *text)) {
+            v = *text - '0';
+        } else if (radix == 16 && SDL_isupperhex(*text)) {
+            v = 10 + (*text - 'A');
+        } else if (radix == 16 && SDL_islowerhex(*text)) {
+            v = 10 + (*text - 'a');
+        } else {
+            break;
+        }
+        value *= radix;
+        value += v;
+        ++text;
+    }
+    if (valuep) {
+        if (negative && value) {
+            *valuep = -value;
+        } else {
+            *valuep = value;
+        }
+    }
+    return (text - textstart);
+}
+#endif
+
+#if !defined(HAVE_VSSCANF) || !defined(HAVE_STRTOULL)
+static size_t
+SDL_ScanUnsignedLongLong(const char *text, int radix, Uint64 * valuep)
+{
+    const char *textstart = text;
+    Uint64 value = 0;
+
+    if (radix == 16 && SDL_strncmp(text, "0x", 2) == 0) {
+        text += 2;
+    }
+    for (;;) {
+        int v;
+        if (SDL_isdigit((unsigned char) *text)) {
+            v = *text - '0';
+        } else if (radix == 16 && SDL_isupperhex(*text)) {
+            v = 10 + (*text - 'A');
+        } else if (radix == 16 && SDL_islowerhex(*text)) {
+            v = 10 + (*text - 'a');
+        } else {
+            break;
+        }
+        value *= radix;
+        value += v;
+        ++text;
+    }
+    if (valuep) {
+        *valuep = value;
+    }
+    return (text - textstart);
+}
+#endif
+
+#if !defined(HAVE_VSSCANF) || !defined(HAVE_STRTOD)
+static size_t
+SDL_ScanFloat(const char *text, double *valuep)
+{
+    const char *textstart = text;
+    unsigned long lvalue = 0;
+    double value = 0.0;
+    SDL_bool negative = SDL_FALSE;
+
+    if (*text == '-') {
+        negative = SDL_TRUE;
+        ++text;
+    }
+    text += SDL_ScanUnsignedLong(text, 10, &lvalue);
+    value += lvalue;
+    if (*text == '.') {
+        int mult = 10;
+        ++text;
+        while (SDL_isdigit((unsigned char) *text)) {
+            lvalue = *text - '0';
+            value += (double) lvalue / mult;
+            mult *= 10;
+            ++text;
+        }
+    }
+    if (valuep) {
+        if (negative && value) {
+            *valuep = -value;
+        } else {
+            *valuep = value;
+        }
+    }
+    return (text - textstart);
+}
+#endif
+
+void *
+SDL_memset(void *dst, int c, size_t len)
+{
+#if defined(HAVE_MEMSET)
+    return memset(dst, c, len);
+#else
+    size_t left = (len % 4);
+    Uint32 *dstp4;
+    Uint8 *dstp1;
+    Uint32 value4 = (c | (c << 8) | (c << 16) | (c << 24));
+    Uint8 value1 = (Uint8) c;
+
+    dstp4 = (Uint32 *) dst;
+    len /= 4;
+    while (len--) {
+        *dstp4++ = value4;
+    }
+
+    dstp1 = (Uint8 *) dstp4;
+    switch (left) {
+    case 3:
+        *dstp1++ = value1;
+    case 2:
+        *dstp1++ = value1;
+    case 1:
+        *dstp1++ = value1;
+    }
+
+    return dst;
+#endif /* HAVE_MEMSET */
+}
+
+void *
+SDL_memcpy(void *dst, const void *src, size_t len)
+{
+#ifdef __GNUC__
+    /* Presumably this is well tuned for speed.
+       On my machine this is twice as fast as the C code below.
+     */
+    return __builtin_memcpy(dst, src, len);
+#elif defined(HAVE_MEMCPY)
+    return memcpy(dst, src, len);
+#elif defined(HAVE_BCOPY)
+    bcopy(src, dst, len);
+    return dst;
+#else
+    /* GCC 4.9.0 with -O3 will generate movaps instructions with the loop
+       using Uint32* pointers, so we need to make sure the pointers are
+       aligned before we loop using them.
+     */
+    if (((intptr_t)src & 0x3) || ((intptr_t)dst & 0x3)) {
+        /* Do an unaligned byte copy */
+        Uint8 *srcp1 = (Uint8 *)src;
+        Uint8 *dstp1 = (Uint8 *)dst;
+
+        while (len--) {
+            *dstp1++ = *srcp1++;
+        }
+    } else {
+        size_t left = (len % 4);
+        Uint32 *srcp4, *dstp4;
+        Uint8 *srcp1, *dstp1;
+
+        srcp4 = (Uint32 *) src;
+        dstp4 = (Uint32 *) dst;
+        len /= 4;
+        while (len--) {
+            *dstp4++ = *srcp4++;
+        }
+
+        srcp1 = (Uint8 *) srcp4;
+        dstp1 = (Uint8 *) dstp4;
+        switch (left) {
+        case 3:
+            *dstp1++ = *srcp1++;
+        case 2:
+            *dstp1++ = *srcp1++;
+        case 1:
+            *dstp1++ = *srcp1++;
+        }
+    }
+    return dst;
+#endif /* __GNUC__ */
+}
+
+void *
+SDL_memmove(void *dst, const void *src, size_t len)
+{
+#if defined(HAVE_MEMMOVE)
+    return memmove(dst, src, len);
+#else
+    char *srcp = (char *) src;
+    char *dstp = (char *) dst;
+
+    if (src < dst) {
+        srcp += len - 1;
+        dstp += len - 1;
+        while (len--) {
+            *dstp-- = *srcp--;
+        }
+    } else {
+        while (len--) {
+            *dstp++ = *srcp++;
+        }
+    }
+    return dst;
+#endif /* HAVE_MEMMOVE */
+}
+
+int
+SDL_memcmp(const void *s1, const void *s2, size_t len)
+{
+#if defined(HAVE_MEMCMP)
+    return memcmp(s1, s2, len);
+#else
+    char *s1p = (char *) s1;
+    char *s2p = (char *) s2;
+    while (len--) {
+        if (*s1p != *s2p) {
+            return (*s1p - *s2p);
+        }
+        ++s1p;
+        ++s2p;
+    }
+    return 0;
+#endif /* HAVE_MEMCMP */
+}
+
+size_t
+SDL_strlen(const char *string)
+{
+#if defined(HAVE_STRLEN)
+    return strlen(string);
+#else
+    size_t len = 0;
+    while (*string++) {
+        ++len;
+    }
+    return len;
+#endif /* HAVE_STRLEN */
+}
+
+size_t
+SDL_wcslen(const wchar_t * string)
+{
+#if defined(HAVE_WCSLEN)
+    return wcslen(string);
+#else
+    size_t len = 0;
+    while (*string++) {
+        ++len;
+    }
+    return len;
+#endif /* HAVE_WCSLEN */
+}
+
+size_t
+SDL_wcslcpy(wchar_t *dst, const wchar_t *src, size_t maxlen)
+{
+#if defined(HAVE_WCSLCPY)
+    return wcslcpy(dst, src, maxlen);
+#else
+    size_t srclen = SDL_wcslen(src);
+    if (maxlen > 0) {
+        size_t len = SDL_min(srclen, maxlen - 1);
+        SDL_memcpy(dst, src, len * sizeof(wchar_t));
+        dst[len] = '\0';
+    }
+    return srclen;
+#endif /* HAVE_WCSLCPY */
+}
+
+size_t
+SDL_wcslcat(wchar_t *dst, const wchar_t *src, size_t maxlen)
+{
+#if defined(HAVE_WCSLCAT)
+    return wcslcat(dst, src, maxlen);
+#else
+    size_t dstlen = SDL_wcslen(dst);
+    size_t srclen = SDL_wcslen(src);
+    if (dstlen < maxlen) {
+        SDL_wcslcpy(dst + dstlen, src, maxlen - dstlen);
+    }
+    return dstlen + srclen;
+#endif /* HAVE_WCSLCAT */
+}
+
+size_t
+SDL_strlcpy(char *dst, const char *src, size_t maxlen)
+{
+#if defined(HAVE_STRLCPY)
+    return strlcpy(dst, src, maxlen);
+#else
+    size_t srclen = SDL_strlen(src);
+    if (maxlen > 0) {
+        size_t len = SDL_min(srclen, maxlen - 1);
+        SDL_memcpy(dst, src, len);
+        dst[len] = '\0';
+    }
+    return srclen;
+#endif /* HAVE_STRLCPY */
+}
+
+size_t SDL_utf8strlcpy(char *dst, const char *src, size_t dst_bytes)
+{
+    size_t src_bytes = SDL_strlen(src);
+    size_t bytes = SDL_min(src_bytes, dst_bytes - 1);
+    size_t i = 0;
+    char trailing_bytes = 0;
+    if (bytes)
+    {
+        unsigned char c = (unsigned char)src[bytes - 1];
+        if (UTF8_IsLeadByte(c))
+            --bytes;
+        else if (UTF8_IsTrailingByte(c))
+        {
+            for (i = bytes - 1; i != 0; --i)
+            {
+                c = (unsigned char)src[i];
+                trailing_bytes = UTF8_TrailingBytes(c);
+                if (trailing_bytes)
+                {
+                    if (bytes - i != trailing_bytes + 1)
+                        bytes = i;
+
+                    break;
+                }
+            }
+        }
+        SDL_memcpy(dst, src, bytes);
+    }
+    dst[bytes] = '\0';
+    return bytes;
+}
+
+size_t
+SDL_strlcat(char *dst, const char *src, size_t maxlen)
+{
+#if defined(HAVE_STRLCAT)
+    return strlcat(dst, src, maxlen);
+#else
+    size_t dstlen = SDL_strlen(dst);
+    size_t srclen = SDL_strlen(src);
+    if (dstlen < maxlen) {
+        SDL_strlcpy(dst + dstlen, src, maxlen - dstlen);
+    }
+    return dstlen + srclen;
+#endif /* HAVE_STRLCAT */
+}
+
+char *
+SDL_strdup(const char *string)
+{
+#if defined(HAVE_STRDUP)
+    return strdup(string);
+#else
+    size_t len = SDL_strlen(string) + 1;
+    char *newstr = SDL_malloc(len);
+    if (newstr) {
+        SDL_strlcpy(newstr, string, len);
+    }
+    return newstr;
+#endif /* HAVE_STRDUP */
+}
+
+char *
+SDL_strrev(char *string)
+{
+#if defined(HAVE__STRREV)
+    return _strrev(string);
+#else
+    size_t len = SDL_strlen(string);
+    char *a = &string[0];
+    char *b = &string[len - 1];
+    len /= 2;
+    while (len--) {
+        char c = *a;
+        *a++ = *b;
+        *b-- = c;
+    }
+    return string;
+#endif /* HAVE__STRREV */
+}
+
+char *
+SDL_strupr(char *string)
+{
+#if defined(HAVE__STRUPR)
+    return _strupr(string);
+#else
+    char *bufp = string;
+    while (*bufp) {
+        *bufp = SDL_toupper((unsigned char) *bufp);
+        ++bufp;
+    }
+    return string;
+#endif /* HAVE__STRUPR */
+}
+
+char *
+SDL_strlwr(char *string)
+{
+#if defined(HAVE__STRLWR)
+    return _strlwr(string);
+#else
+    char *bufp = string;
+    while (*bufp) {
+        *bufp = SDL_tolower((unsigned char) *bufp);
+        ++bufp;
+    }
+    return string;
+#endif /* HAVE__STRLWR */
+}
+
+char *
+SDL_strchr(const char *string, int c)
+{
+#ifdef HAVE_STRCHR
+    return SDL_const_cast(char*,strchr(string, c));
+#elif defined(HAVE_INDEX)
+    return SDL_const_cast(char*,index(string, c));
+#else
+    while (*string) {
+        if (*string == c) {
+            return (char *) string;
+        }
+        ++string;
+    }
+    return NULL;
+#endif /* HAVE_STRCHR */
+}
+
+char *
+SDL_strrchr(const char *string, int c)
+{
+#ifdef HAVE_STRRCHR
+    return SDL_const_cast(char*,strrchr(string, c));
+#elif defined(HAVE_RINDEX)
+    return SDL_const_cast(char*,rindex(string, c));
+#else
+    const char *bufp = string + SDL_strlen(string) - 1;
+    while (bufp >= string) {
+        if (*bufp == c) {
+            return (char *) bufp;
+        }
+        --bufp;
+    }
+    return NULL;
+#endif /* HAVE_STRRCHR */
+}
+
+char *
+SDL_strstr(const char *haystack, const char *needle)
+{
+#if defined(HAVE_STRSTR)
+    return SDL_const_cast(char*,strstr(haystack, needle));
+#else
+    size_t length = SDL_strlen(needle);
+    while (*haystack) {
+        if (SDL_strncmp(haystack, needle, length) == 0) {
+            return (char *) haystack;
+        }
+        ++haystack;
+    }
+    return NULL;
+#endif /* HAVE_STRSTR */
+}
+
+#if !defined(HAVE__LTOA) || !defined(HAVE__I64TOA) || \
+    !defined(HAVE__ULTOA) || !defined(HAVE__UI64TOA)
+static const char ntoa_table[] = {
+    '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+    'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+    'U', 'V', 'W', 'X', 'Y', 'Z'
+};
+#endif /* ntoa() conversion table */
+
+char *
+SDL_itoa(int value, char *string, int radix)
+{
+#ifdef HAVE_ITOA
+    return itoa(value, string, radix);
+#else
+    return SDL_ltoa((long)value, string, radix);
+#endif /* HAVE_ITOA */
+}
+
+char *
+SDL_uitoa(unsigned int value, char *string, int radix)
+{
+#ifdef HAVE__UITOA
+    return _uitoa(value, string, radix);
+#else
+    return SDL_ultoa((unsigned long)value, string, radix);
+#endif /* HAVE__UITOA */
+}
+
+char *
+SDL_ltoa(long value, char *string, int radix)
+{
+#if defined(HAVE__LTOA)
+    return _ltoa(value, string, radix);
+#else
+    char *bufp = string;
+
+    if (value < 0) {
+        *bufp++ = '-';
+        SDL_ultoa(-value, bufp, radix);
+    } else {
+        SDL_ultoa(value, bufp, radix);
+    }
+
+    return string;
+#endif /* HAVE__LTOA */
+}
+
+char *
+SDL_ultoa(unsigned long value, char *string, int radix)
+{
+#if defined(HAVE__ULTOA)
+    return _ultoa(value, string, radix);
+#else
+    char *bufp = string;
+
+    if (value) {
+        while (value > 0) {
+            *bufp++ = ntoa_table[value % radix];
+            value /= radix;
+        }
+    } else {
+        *bufp++ = '0';
+    }
+    *bufp = '\0';
+
+    /* The numbers went into the string backwards. :) */
+    SDL_strrev(string);
+
+    return string;
+#endif /* HAVE__ULTOA */
+}
+
+char *
+SDL_lltoa(Sint64 value, char *string, int radix)
+{
+#if defined(HAVE__I64TOA)
+    return _i64toa(value, string, radix);
+#else
+    char *bufp = string;
+
+    if (value < 0) {
+        *bufp++ = '-';
+        SDL_ulltoa(-value, bufp, radix);
+    } else {
+        SDL_ulltoa(value, bufp, radix);
+    }
+
+    return string;
+#endif /* HAVE__I64TOA */
+}
+
+char *
+SDL_ulltoa(Uint64 value, char *string, int radix)
+{
+#if defined(HAVE__UI64TOA)
+    return _ui64toa(value, string, radix);
+#else
+    char *bufp = string;
+
+    if (value) {
+        while (value > 0) {
+            *bufp++ = ntoa_table[value % radix];
+            value /= radix;
+        }
+    } else {
+        *bufp++ = '0';
+    }
+    *bufp = '\0';
+
+    /* The numbers went into the string backwards. :) */
+    SDL_strrev(string);
+
+    return string;
+#endif /* HAVE__UI64TOA */
+}
+
+int SDL_atoi(const char *string)
+{
+#ifdef HAVE_ATOI
+    return atoi(string);
+#else
+    return SDL_strtol(string, NULL, 0);
+#endif /* HAVE_ATOI */
+}
+
+double SDL_atof(const char *string)
+{
+#ifdef HAVE_ATOF
+    return (double) atof(string);
+#else
+    return SDL_strtod(string, NULL);
+#endif /* HAVE_ATOF */
+}
+
+long
+SDL_strtol(const char *string, char **endp, int base)
+{
+#if defined(HAVE_STRTOL)
+    return strtol(string, endp, base);
+#else
+    size_t len;
+    long value;
+
+    if (!base) {
+        if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) {
+            base = 16;
+        } else {
+            base = 10;
+        }
+    }
+
+    len = SDL_ScanLong(string, base, &value);
+    if (endp) {
+        *endp = (char *) string + len;
+    }
+    return value;
+#endif /* HAVE_STRTOL */
+}
+
+unsigned long
+SDL_strtoul(const char *string, char **endp, int base)
+{
+#if defined(HAVE_STRTOUL)
+    return strtoul(string, endp, base);
+#else
+    size_t len;
+    unsigned long value;
+
+    if (!base) {
+        if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) {
+            base = 16;
+        } else {
+            base = 10;
+        }
+    }
+
+    len = SDL_ScanUnsignedLong(string, base, &value);
+    if (endp) {
+        *endp = (char *) string + len;
+    }
+    return value;
+#endif /* HAVE_STRTOUL */
+}
+
+Sint64
+SDL_strtoll(const char *string, char **endp, int base)
+{
+#if defined(HAVE_STRTOLL)
+    return strtoll(string, endp, base);
+#else
+    size_t len;
+    Sint64 value;
+
+    if (!base) {
+        if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) {
+            base = 16;
+        } else {
+            base = 10;
+        }
+    }
+
+    len = SDL_ScanLongLong(string, base, &value);
+    if (endp) {
+        *endp = (char *) string + len;
+    }
+    return value;
+#endif /* HAVE_STRTOLL */
+}
+
+Uint64
+SDL_strtoull(const char *string, char **endp, int base)
+{
+#if defined(HAVE_STRTOULL)
+    return strtoull(string, endp, base);
+#else
+    size_t len;
+    Uint64 value;
+
+    if (!base) {
+        if ((SDL_strlen(string) > 2) && (SDL_strncmp(string, "0x", 2) == 0)) {
+            base = 16;
+        } else {
+            base = 10;
+        }
+    }
+
+    len = SDL_ScanUnsignedLongLong(string, base, &value);
+    if (endp) {
+        *endp = (char *) string + len;
+    }
+    return value;
+#endif /* HAVE_STRTOULL */
+}
+
+double
+SDL_strtod(const char *string, char **endp)
+{
+#if defined(HAVE_STRTOD)
+    return strtod(string, endp);
+#else
+    size_t len;
+    double value;
+
+    len = SDL_ScanFloat(string, &value);
+    if (endp) {
+        *endp = (char *) string + len;
+    }
+    return value;
+#endif /* HAVE_STRTOD */
+}
+
+int
+SDL_strcmp(const char *str1, const char *str2)
+{
+#if defined(HAVE_STRCMP)
+    return strcmp(str1, str2);
+#else
+    while (*str1 && *str2) {
+        if (*str1 != *str2)
+            break;
+        ++str1;
+        ++str2;
+    }
+    return (int) ((unsigned char) *str1 - (unsigned char) *str2);
+#endif /* HAVE_STRCMP */
+}
+
+int
+SDL_strncmp(const char *str1, const char *str2, size_t maxlen)
+{
+#if defined(HAVE_STRNCMP)
+    return strncmp(str1, str2, maxlen);
+#else
+    while (*str1 && *str2 && maxlen) {
+        if (*str1 != *str2)
+            break;
+        ++str1;
+        ++str2;
+        --maxlen;
+    }
+    if (!maxlen) {
+        return 0;
+    }
+    return (int) ((unsigned char) *str1 - (unsigned char) *str2);
+#endif /* HAVE_STRNCMP */
+}
+
+int
+SDL_strcasecmp(const char *str1, const char *str2)
+{
+#ifdef HAVE_STRCASECMP
+    return strcasecmp(str1, str2);
+#elif defined(HAVE__STRICMP)
+    return _stricmp(str1, str2);
+#else
+    char a = 0;
+    char b = 0;
+    while (*str1 && *str2) {
+        a = SDL_toupper((unsigned char) *str1);
+        b = SDL_toupper((unsigned char) *str2);
+        if (a != b)
+            break;
+        ++str1;
+        ++str2;
+    }
+    a = SDL_toupper(*str1);
+    b = SDL_toupper(*str2);
+    return (int) ((unsigned char) a - (unsigned char) b);
+#endif /* HAVE_STRCASECMP */
+}
+
+int
+SDL_strncasecmp(const char *str1, const char *str2, size_t maxlen)
+{
+#ifdef HAVE_STRNCASECMP
+    return strncasecmp(str1, str2, maxlen);
+#elif defined(HAVE__STRNICMP)
+    return _strnicmp(str1, str2, maxlen);
+#else
+    char a = 0;
+    char b = 0;
+    while (*str1 && *str2 && maxlen) {
+        a = SDL_tolower((unsigned char) *str1);
+        b = SDL_tolower((unsigned char) *str2);
+        if (a != b)
+            break;
+        ++str1;
+        ++str2;
+        --maxlen;
+    }
+    if (maxlen == 0) {
+        return 0;
+    } else {
+        a = SDL_tolower((unsigned char) *str1);
+        b = SDL_tolower((unsigned char) *str2);
+        return (int) ((unsigned char) a - (unsigned char) b);
+    }
+#endif /* HAVE_STRNCASECMP */
+}
+
+int
+SDL_sscanf(const char *text, const char *fmt, ...)
+{
+    int rc;
+    va_list ap;
+    va_start(ap, fmt);
+    rc = SDL_vsscanf(text, fmt, ap);
+    va_end(ap);
+    return rc;
+}
+
+#ifdef HAVE_VSSCANF
+int
+SDL_vsscanf(const char *text, const char *fmt, va_list ap)
+{
+    return vsscanf(text, fmt, ap);
+}
+#else
+int
+SDL_vsscanf(const char *text, const char *fmt, va_list ap)
+{
+    int retval = 0;
+
+    while (*fmt) {
+        if (*fmt == ' ') {
+            while (SDL_isspace((unsigned char) *text)) {
+                ++text;
+            }
+            ++fmt;
+            continue;
+        }
+        if (*fmt == '%') {
+            SDL_bool done = SDL_FALSE;
+            long count = 0;
+            int radix = 10;
+            enum
+            {
+                DO_SHORT,
+                DO_INT,
+                DO_LONG,
+                DO_LONGLONG
+            } inttype = DO_INT;
+            SDL_bool suppress = SDL_FALSE;
+
+            ++fmt;
+            if (*fmt == '%') {
+                if (*text == '%') {
+                    ++text;
+                    ++fmt;
+                    continue;
+                }
+                break;
+            }
+            if (*fmt == '*') {
+                suppress = SDL_TRUE;
+                ++fmt;
+            }
+            fmt += SDL_ScanLong(fmt, 10, &count);
+
+            if (*fmt == 'c') {
+                if (!count) {
+                    count = 1;
+                }
+                if (suppress) {
+                    while (count--) {
+                        ++text;
+                    }
+                } else {
+                    char *valuep = va_arg(ap, char *);
+                    while (count--) {
+                        *valuep++ = *text++;
+                    }
+                    ++retval;
+                }
+                continue;
+            }
+
+            while (SDL_isspace((unsigned char) *text)) {
+                ++text;
+            }
+
+            /* FIXME: implement more of the format specifiers */
+            while (!done) {
+                switch (*fmt) {
+                case '*':
+                    suppress = SDL_TRUE;
+                    break;
+                case 'h':
+                    if (inttype > DO_SHORT) {
+                        ++inttype;
+                    }
+                    break;
+                case 'l':
+                    if (inttype < DO_LONGLONG) {
+                        ++inttype;
+                    }
+                    break;
+                case 'I':
+                    if (SDL_strncmp(fmt, "I64", 3) == 0) {
+                        fmt += 2;
+                        inttype = DO_LONGLONG;
+                    }
+                    break;
+                case 'i':
+                    {
+                        int index = 0;
+                        if (text[index] == '-') {
+                            ++index;
+                        }
+                        if (text[index] == '0') {
+                            if (SDL_tolower((unsigned char) text[index + 1]) == 'x') {
+                                radix = 16;
+                            } else {
+                                radix = 8;
+                            }
+                        }
+                    }
+                    /* Fall through to %d handling */
+                case 'd':
+                    if (inttype == DO_LONGLONG) {
+                        Sint64 value;
+                        text += SDL_ScanLongLong(text, radix, &value);
+                        if (!suppress) {
+                            Sint64 *valuep = va_arg(ap, Sint64 *);
+                            *valuep = value;
+                            ++retval;
+                        }
+                    } else {
+                        long value;
+                        text += SDL_ScanLong(text, radix, &value);
+                        if (!suppress) {
+                            switch (inttype) {
+                            case DO_SHORT:
+                                {
+                                    short *valuep = va_arg(ap, short *);
+                                    *valuep = (short) value;
+                                }
+                                break;
+                            case DO_INT:
+                                {
+                                    int *valuep = va_arg(ap, int *);
+                                    *valuep = (int) value;
+                                }
+                                break;
+                            case DO_LONG:
+                                {
+                                    long *valuep = va_arg(ap, long *);
+                                    *valuep = value;
+                                }
+                                break;
+                            case DO_LONGLONG:
+                                /* Handled above */
+                                break;
+                            }
+                            ++retval;
+                        }
+                    }
+                    done = SDL_TRUE;
+                    break;
+                case 'o':
+                    if (radix == 10) {
+                        radix = 8;
+                    }
+                    /* Fall through to unsigned handling */
+                case 'x':
+                case 'X':
+                    if (radix == 10) {
+                        radix = 16;
+                    }
+                    /* Fall through to unsigned handling */
+                case 'u':
+                    if (inttype == DO_LONGLONG) {
+                        Uint64 value;
+                        text += SDL_ScanUnsignedLongLong(text, radix, &value);
+                        if (!suppress) {
+                            Uint64 *valuep = va_arg(ap, Uint64 *);
+                            *valuep = value;
+                            ++retval;
+                        }
+                    } else {
+                        unsigned long value;
+                        text += SDL_ScanUnsignedLong(text, radix, &value);
+                        if (!suppress) {
+                            switch (inttype) {
+                            case DO_SHORT:
+                                {
+                                    short *valuep = va_arg(ap, short *);
+                                    *valuep = (short) value;
+                                }
+                                break;
+                            case DO_INT:
+                                {
+                                    int *valuep = va_arg(ap, int *);
+                                    *valuep = (int) value;
+                                }
+                                break;
+                            case DO_LONG:
+                                {
+                                    long *valuep = va_arg(ap, long *);
+                                    *valuep = value;
+                                }
+                                break;
+                            case DO_LONGLONG:
+                                /* Handled above */
+                                break;
+                            }
+                            ++retval;
+                        }
+                    }
+                    done = SDL_TRUE;
+                    break;
+                case 'p':
+                    {
+                        uintptr_t value;
+                        text += SDL_ScanUintPtrT(text, 16, &value);
+                        if (!suppress) {
+                            void **valuep = va_arg(ap, void **);
+                            *valuep = (void *) value;
+                            ++retval;
+                        }
+                    }
+                    done = SDL_TRUE;
+                    break;
+                case 'f':
+                    {
+                        double value;
+                        text += SDL_ScanFloat(text, &value);
+                        if (!suppress) {
+                            float *valuep = va_arg(ap, float *);
+                            *valuep = (float) value;
+                            ++retval;
+                        }
+                    }
+                    done = SDL_TRUE;
+                    break;
+                case 's':
+                    if (suppress) {
+                        while (!SDL_isspace((unsigned char) *text)) {
+                            ++text;
+                            if (count) {
+                                if (--count == 0) {
+                                    break;
+                                }
+                            }
+                        }
+                    } else {
+                        char *valuep = va_arg(ap, char *);
+                        while (!SDL_isspace((unsigned char) *text)) {
+                            *valuep++ = *text++;
+                            if (count) {
+                                if (--count == 0) {
+                                    break;
+                                }
+                            }
+                        }
+                        *valuep = '\0';
+                        ++retval;
+                    }
+                    done = SDL_TRUE;
+                    break;
+                default:
+                    done = SDL_TRUE;
+                    break;
+                }
+                ++fmt;
+            }
+            continue;
+        }
+        if (*text == *fmt) {
+            ++text;
+            ++fmt;
+            continue;
+        }
+        /* Text didn't match format specifier */
+        break;
+    }
+
+    return retval;
+}
+#endif /* HAVE_VSSCANF */
+
+int
+SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...)
+{
+    va_list ap;
+    int retval;
+
+    va_start(ap, fmt);
+    retval = SDL_vsnprintf(text, maxlen, fmt, ap);
+    va_end(ap);
+
+    return retval;
+}
+
+#ifdef HAVE_VSNPRINTF
+int SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap)
+{
+    return vsnprintf(text, maxlen, fmt, ap);
+}
+#else
+ /* FIXME: implement more of the format specifiers */
+typedef enum
+{
+    SDL_CASE_NOCHANGE,
+    SDL_CASE_LOWER,
+    SDL_CASE_UPPER
+} SDL_letter_case;
+
+typedef struct
+{
+    SDL_bool left_justify;
+    SDL_bool force_sign;
+    SDL_bool force_type;
+    SDL_bool pad_zeroes;
+    SDL_letter_case force_case;
+    int width;
+    int radix;
+    int precision;
+} SDL_FormatInfo;
+
+static size_t
+SDL_PrintString(char *text, size_t maxlen, SDL_FormatInfo *info, const char *string)
+{
+    size_t length = 0;
+
+    if (info && info->width && (size_t)info->width > SDL_strlen(string)) {
+        char fill = info->pad_zeroes ? '0' : ' ';
+        size_t width = info->width - SDL_strlen(string);
+        while (width-- > 0 && maxlen > 0) {
+            *text++ = fill;
+            ++length;
+            --maxlen;
+        }
+    }
+
+    length += SDL_strlcpy(text, string, maxlen);
+
+    if (info) {
+        if (info->force_case == SDL_CASE_LOWER) {
+            SDL_strlwr(text);
+        } else if (info->force_case == SDL_CASE_UPPER) {
+            SDL_strupr(text);
+        }
+    }
+    return length;
+}
+
+static size_t
+SDL_PrintLong(char *text, size_t maxlen, SDL_FormatInfo *info, long value)
+{
+    char num[130];
+
+    SDL_ltoa(value, num, info ? info->radix : 10);
+    return SDL_PrintString(text, maxlen, info, num);
+}
+
+static size_t
+SDL_PrintUnsignedLong(char *text, size_t maxlen, SDL_FormatInfo *info, unsigned long value)
+{
+    char num[130];
+
+    SDL_ultoa(value, num, info ? info->radix : 10);
+    return SDL_PrintString(text, maxlen, info, num);
+}
+
+static size_t
+SDL_PrintLongLong(char *text, size_t maxlen, SDL_FormatInfo *info, Sint64 value)
+{
+    char num[130];
+
+    SDL_lltoa(value, num, info ? info->radix : 10);
+    return SDL_PrintString(text, maxlen, info, num);
+}
+
+static size_t
+SDL_PrintUnsignedLongLong(char *text, size_t maxlen, SDL_FormatInfo *info, Uint64 value)
+{
+    char num[130];
+
+    SDL_ulltoa(value, num, info ? info->radix : 10);
+    return SDL_PrintString(text, maxlen, info, num);
+}
+
+static size_t
+SDL_PrintFloat(char *text, size_t maxlen, SDL_FormatInfo *info, double arg)
+{
+    int width;
+    size_t len;
+    size_t left = maxlen;
+    char *textstart = text;
+
+    if (arg) {
+        /* This isn't especially accurate, but hey, it's easy. :) */
+        unsigned long value;
+
+        if (arg < 0) {
+            if (left > 1) {
+                *text = '-';
+                --left;
+            }
+            ++text;
+            arg = -arg;
+        } else if (info->force_sign) {
+            if (left > 1) {
+                *text = '+';
+                --left;
+            }
+            ++text;
+        }
+        value = (unsigned long) arg;
+        len = SDL_PrintUnsignedLong(text, left, NULL, value);
+        text += len;
+        if (len >= left) {
+            left = SDL_min(left, 1);
+        } else {
+            left -= len;
+        }
+        arg -= value;
+        if (info->precision < 0) {
+            info->precision = 6;
+        }
+        if (info->force_type || info->precision > 0) {
+            int mult = 10;
+            if (left > 1) {
+                *text = '.';
+                --left;
+            }
+            ++text;
+            while (info->precision-- > 0) {
+                value = (unsigned long) (arg * mult);
+                len = SDL_PrintUnsignedLong(text, left, NULL, value);
+                text += len;
+                if (len >= left) {
+                    left = SDL_min(left, 1);
+                } else {
+                    left -= len;
+                }
+                arg -= (double) value / mult;
+                mult *= 10;
+            }
+        }
+    } else {
+        if (left > 1) {
+            *text = '0';
+            --left;
+        }
+        ++text;
+        if (info->force_type) {
+            if (left > 1) {
+                *text = '.';
+                --left;
+            }
+            ++text;
+        }
+    }
+
+    width = info->width - (int)(text - textstart);
+    if (width > 0) {
+        char fill = info->pad_zeroes ? '0' : ' ';
+        char *end = text+left-1;
+        len = (text - textstart);
+        for (len = (text - textstart); len--; ) {
+            if ((textstart+len+width) < end) {
+                *(textstart+len+width) = *(textstart+len);
+            }
+        }
+        len = (size_t)width;
+        text += len;
+        if (len >= left) {
+            left = SDL_min(left, 1);
+        } else {
+            left -= len;
+        }
+        while (len--) {
+            if (textstart+len < end) {
+                textstart[len] = fill;
+            }
+        }
+    }
+
+    return (text - textstart);
+}
+
+int
+SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap)
+{
+    size_t left = maxlen;
+    char *textstart = text;
+
+    while (*fmt) {
+        if (*fmt == '%') {
+            SDL_bool done = SDL_FALSE;
+            size_t len = 0;
+            SDL_bool check_flag;
+            SDL_FormatInfo info;
+            enum
+            {
+                DO_INT,
+                DO_LONG,
+                DO_LONGLONG
+            } inttype = DO_INT;
+
+            SDL_zero(info);
+            info.radix = 10;
+            info.precision = -1;
+
+            check_flag = SDL_TRUE;
+            while (check_flag) {
+                ++fmt;
+                switch (*fmt) {
+                case '-':
+                    info.left_justify = SDL_TRUE;
+                    break;
+                case '+':
+                    info.force_sign = SDL_TRUE;
+                    break;
+                case '#':
+                    info.force_type = SDL_TRUE;
+                    break;
+                case '0':
+                    info.pad_zeroes = SDL_TRUE;
+                    break;
+                default:
+                    check_flag = SDL_FALSE;
+                    break;
+                }
+            }
+
+            if (*fmt >= '0' && *fmt <= '9') {
+                info.width = SDL_strtol(fmt, (char **)&fmt, 0);
+            }
+
+            if (*fmt == '.') {
+                ++fmt;
+                if (*fmt >= '0' && *fmt <= '9') {
+                    info.precision = SDL_strtol(fmt, (char **)&fmt, 0);
+                } else {
+                    info.precision = 0;
+                }
+            }
+
+            while (!done) {
+                switch (*fmt) {
+                case '%':
+                    if (left > 1) {
+                        *text = '%';
+                    }
+                    len = 1;
+                    done = SDL_TRUE;
+                    break;
+                case 'c':
+                    /* char is promoted to int when passed through (...) */
+                    if (left > 1) {
+                        *text = (char) va_arg(ap, int);
+                    }
+                    len = 1;
+                    done = SDL_TRUE;
+                    break;
+                case 'h':
+                    /* short is promoted to int when passed through (...) */
+                    break;
+                case 'l':
+                    if (inttype < DO_LONGLONG) {
+                        ++inttype;
+                    }
+                    break;
+                case 'I':
+                    if (SDL_strncmp(fmt, "I64", 3) == 0) {
+                        fmt += 2;
+                        inttype = DO_LONGLONG;
+                    }
+                    break;
+                case 'i':
+                case 'd':
+                    switch (inttype) {
+                    case DO_INT:
+                        len = SDL_PrintLong(text, left, &info,
+                                            (long) va_arg(ap, int));
+                        break;
+                    case DO_LONG:
+                        len = SDL_PrintLong(text, left, &info,
+                                            va_arg(ap, long));
+                        break;
+                    case DO_LONGLONG:
+                        len = SDL_PrintLongLong(text, left, &info,
+                                                va_arg(ap, Sint64));
+                        break;
+                    }
+                    done = SDL_TRUE;
+                    break;
+                case 'p':
+                case 'x':
+                    info.force_case = SDL_CASE_LOWER;
+                    /* Fall through to 'X' handling */
+                case 'X':
+                    if (info.force_case == SDL_CASE_NOCHANGE) {
+                        info.force_case = SDL_CASE_UPPER;
+                    }
+                    if (info.radix == 10) {
+                        info.radix = 16;
+                    }
+                    if (*fmt == 'p') {
+                        inttype = DO_LONG;
+                    }
+                    /* Fall through to unsigned handling */
+                case 'o':
+                    if (info.radix == 10) {
+                        info.radix = 8;
+                    }
+                    /* Fall through to unsigned handling */
+                case 'u':
+                    info.pad_zeroes = SDL_TRUE;
+                    switch (inttype) {
+                    case DO_INT:
+                        len = SDL_PrintUnsignedLong(text, left, &info,
+                                                    (unsigned long)
+                                                    va_arg(ap, unsigned int));
+                        break;
+                    case DO_LONG:
+                        len = SDL_PrintUnsignedLong(text, left, &info,
+                                                    va_arg(ap, unsigned long));
+                        break;
+                    case DO_LONGLONG:
+                        len = SDL_PrintUnsignedLongLong(text, left, &info,
+                                                        va_arg(ap, Uint64));
+                        break;
+                    }
+                    done = SDL_TRUE;
+                    break;
+                case 'f':
+                    len = SDL_PrintFloat(text, left, &info, va_arg(ap, double));
+                    done = SDL_TRUE;
+                    break;
+                case 's':
+                    len = SDL_PrintString(text, left, &info, va_arg(ap, char *));
+                    done = SDL_TRUE;
+                    break;
+                default:
+                    done = SDL_TRUE;
+                    break;
+                }
+                ++fmt;
+            }
+            text += len;
+            if (len >= left) {
+                left = SDL_min(left, 1);
+            } else {
+                left -= len;
+            }
+        } else {
+            if (left > 1) {
+                *text = *fmt;
+                --left;
+            }
+            ++fmt;
+            ++text;
+        }
+    }
+    if (left > 0) {
+        *text = '\0';
+    }
+    return (int)(text - textstart);
+}
+#endif /* HAVE_VSNPRINTF */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_assert.c b/Source/3rd Party/sdl/src/test/SDL_test_assert.c
new file mode 100644
index 000000000..0a594932b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_assert.c	
@@ -0,0 +1,150 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+
+ Used by the test framework and test cases.
+
+*/
+
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+/* Assert check message format */
+const char *SDLTest_AssertCheckFormat = "Assert '%s': %s";
+
+/* Assert summary message format */
+const char *SDLTest_AssertSummaryFormat = "Assert Summary: Total=%d Passed=%d Failed=%d";
+
+/* ! \brief counts the failed asserts */
+static Uint32 SDLTest_AssertsFailed = 0;
+
+/* ! \brief counts the passed asserts */
+static Uint32 SDLTest_AssertsPassed = 0;
+
+/*
+ *  Assert that logs and break execution flow on failures (i.e. for harness errors).
+ */
+void SDLTest_Assert(int assertCondition, const char *assertDescription, ...)
+{
+        va_list list;
+    char logMessage[SDLTEST_MAX_LOGMESSAGE_LENGTH];
+
+    /* Print assert description into a buffer */
+    SDL_memset(logMessage, 0, SDLTEST_MAX_LOGMESSAGE_LENGTH);
+    va_start(list, assertDescription);
+    SDL_vsnprintf(logMessage, SDLTEST_MAX_LOGMESSAGE_LENGTH - 1, assertDescription, list);
+    va_end(list);
+
+    /* Log, then assert and break on failure */
+    SDL_assert((SDLTest_AssertCheck(assertCondition, logMessage)));
+}
+
+/*
+ * Assert that logs but does not break execution flow on failures (i.e. for test cases).
+ */
+int SDLTest_AssertCheck(int assertCondition, const char *assertDescription, ...)
+{
+    va_list list;
+    char logMessage[SDLTEST_MAX_LOGMESSAGE_LENGTH];
+
+    /* Print assert description into a buffer */
+    SDL_memset(logMessage, 0, SDLTEST_MAX_LOGMESSAGE_LENGTH);
+    va_start(list, assertDescription);
+    SDL_vsnprintf(logMessage, SDLTEST_MAX_LOGMESSAGE_LENGTH - 1, assertDescription, list);
+    va_end(list);
+
+    /* Log pass or fail message */
+    if (assertCondition == ASSERT_FAIL)
+    {
+        SDLTest_AssertsFailed++;
+        SDLTest_LogError(SDLTest_AssertCheckFormat, logMessage, "Failed");
+    }
+    else
+    {
+        SDLTest_AssertsPassed++;
+        SDLTest_Log(SDLTest_AssertCheckFormat, logMessage, "Passed");
+    }
+
+    return assertCondition;
+}
+
+/*
+ * Explicitly passing Assert that logs (i.e. for test cases).
+ */
+void SDLTest_AssertPass(const char *assertDescription, ...)
+{
+    va_list list;
+    char logMessage[SDLTEST_MAX_LOGMESSAGE_LENGTH];
+
+    /* Print assert description into a buffer */
+    SDL_memset(logMessage, 0, SDLTEST_MAX_LOGMESSAGE_LENGTH);
+    va_start(list, assertDescription);
+    SDL_vsnprintf(logMessage, SDLTEST_MAX_LOGMESSAGE_LENGTH - 1, assertDescription, list);
+    va_end(list);
+
+        /* Log pass message */
+    SDLTest_AssertsPassed++;
+    SDLTest_Log(SDLTest_AssertCheckFormat, logMessage, "Pass");
+}
+
+/*
+ * Resets the assert summary counters to zero.
+ */
+void SDLTest_ResetAssertSummary()
+{
+    SDLTest_AssertsPassed = 0;
+    SDLTest_AssertsFailed = 0;
+}
+
+/*
+ * Logs summary of all assertions (total, pass, fail) since last reset
+ * as INFO (failed==0) or ERROR (failed > 0).
+ */
+void SDLTest_LogAssertSummary()
+{
+    Uint32 totalAsserts = SDLTest_AssertsPassed + SDLTest_AssertsFailed;
+    if (SDLTest_AssertsFailed == 0)
+    {
+        SDLTest_Log(SDLTest_AssertSummaryFormat, totalAsserts, SDLTest_AssertsPassed, SDLTest_AssertsFailed);
+    }
+    else
+    {
+        SDLTest_LogError(SDLTest_AssertSummaryFormat, totalAsserts, SDLTest_AssertsPassed, SDLTest_AssertsFailed);
+    }
+}
+
+/*
+ * Converts the current assert state into a test result
+ */
+int SDLTest_AssertSummaryToTestResult()
+{
+    if (SDLTest_AssertsFailed > 0) {
+        return TEST_RESULT_FAILED;
+    } else {
+        if (SDLTest_AssertsPassed > 0) {
+            return TEST_RESULT_PASSED;
+        } else {
+            return TEST_RESULT_NO_ASSERT;
+        }
+    }
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_common.c b/Source/3rd Party/sdl/src/test/SDL_test_common.c
new file mode 100644
index 000000000..9d41a194e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_common.c	
@@ -0,0 +1,1548 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* Ported from original test\common.c file. */
+
+#include "SDL_config.h"
+#include "SDL_test.h"
+
+#include <stdio.h>
+
+#define VIDEO_USAGE \
+"[--video driver] [--renderer driver] [--gldebug] [--info all|video|modes|render|event] [--log all|error|system|audio|video|render|input] [--display N] [--fullscreen | --fullscreen-desktop | --windows N] [--title title] [--icon icon.bmp] [--center | --position X,Y] [--geometry WxH] [--min-geometry WxH] [--max-geometry WxH] [--logical WxH] [--scale N] [--depth N] [--refresh R] [--vsync] [--noframe] [--resize] [--minimize] [--maximize] [--grab] [--allow-highdpi]"
+
+#define AUDIO_USAGE \
+"[--rate N] [--format U8|S8|U16|U16LE|U16BE|S16|S16LE|S16BE] [--channels N] [--samples N]"
+
+SDLTest_CommonState *
+SDLTest_CommonCreateState(char **argv, Uint32 flags)
+{
+    SDLTest_CommonState *state = (SDLTest_CommonState *)SDL_calloc(1, sizeof(*state));
+    if (!state) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    /* Initialize some defaults */
+    state->argv = argv;
+    state->flags = flags;
+    state->window_title = argv[0];
+    state->window_flags = 0;
+    state->window_x = SDL_WINDOWPOS_UNDEFINED;
+    state->window_y = SDL_WINDOWPOS_UNDEFINED;
+    state->window_w = DEFAULT_WINDOW_WIDTH;
+    state->window_h = DEFAULT_WINDOW_HEIGHT;
+    state->num_windows = 1;
+    state->audiospec.freq = 22050;
+    state->audiospec.format = AUDIO_S16;
+    state->audiospec.channels = 2;
+    state->audiospec.samples = 2048;
+
+    /* Set some very sane GL defaults */
+    state->gl_red_size = 3;
+    state->gl_green_size = 3;
+    state->gl_blue_size = 2;
+    state->gl_alpha_size = 0;
+    state->gl_buffer_size = 0;
+    state->gl_depth_size = 16;
+    state->gl_stencil_size = 0;
+    state->gl_double_buffer = 1;
+    state->gl_accum_red_size = 0;
+    state->gl_accum_green_size = 0;
+    state->gl_accum_blue_size = 0;
+    state->gl_accum_alpha_size = 0;
+    state->gl_stereo = 0;
+    state->gl_multisamplebuffers = 0;
+    state->gl_multisamplesamples = 0;
+    state->gl_retained_backing = 1;
+    state->gl_accelerated = -1;
+    state->gl_debug = 0;
+
+    return state;
+}
+
+int
+SDLTest_CommonArg(SDLTest_CommonState * state, int index)
+{
+    char **argv = state->argv;
+
+    if (SDL_strcasecmp(argv[index], "--video") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->videodriver = argv[index];
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--renderer") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->renderdriver = argv[index];
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--gldebug") == 0) {
+        state->gl_debug = 1;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--info") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        if (SDL_strcasecmp(argv[index], "all") == 0) {
+            state->verbose |=
+                (VERBOSE_VIDEO | VERBOSE_MODES | VERBOSE_RENDER |
+                 VERBOSE_EVENT);
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "video") == 0) {
+            state->verbose |= VERBOSE_VIDEO;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "modes") == 0) {
+            state->verbose |= VERBOSE_MODES;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "render") == 0) {
+            state->verbose |= VERBOSE_RENDER;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "event") == 0) {
+            state->verbose |= VERBOSE_EVENT;
+            return 2;
+        }
+        return -1;
+    }
+    if (SDL_strcasecmp(argv[index], "--log") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        if (SDL_strcasecmp(argv[index], "all") == 0) {
+            SDL_LogSetAllPriority(SDL_LOG_PRIORITY_VERBOSE);
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "error") == 0) {
+            SDL_LogSetPriority(SDL_LOG_CATEGORY_ERROR, SDL_LOG_PRIORITY_VERBOSE);
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "system") == 0) {
+            SDL_LogSetPriority(SDL_LOG_CATEGORY_SYSTEM, SDL_LOG_PRIORITY_VERBOSE);
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "audio") == 0) {
+            SDL_LogSetPriority(SDL_LOG_CATEGORY_AUDIO, SDL_LOG_PRIORITY_VERBOSE);
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "video") == 0) {
+            SDL_LogSetPriority(SDL_LOG_CATEGORY_VIDEO, SDL_LOG_PRIORITY_VERBOSE);
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "render") == 0) {
+            SDL_LogSetPriority(SDL_LOG_CATEGORY_RENDER, SDL_LOG_PRIORITY_VERBOSE);
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "input") == 0) {
+            SDL_LogSetPriority(SDL_LOG_CATEGORY_INPUT, SDL_LOG_PRIORITY_VERBOSE);
+            return 2;
+        }
+        return -1;
+    }
+    if (SDL_strcasecmp(argv[index], "--display") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->display = SDL_atoi(argv[index]);
+        if (SDL_WINDOWPOS_ISUNDEFINED(state->window_x)) {
+            state->window_x = SDL_WINDOWPOS_UNDEFINED_DISPLAY(state->display);
+            state->window_y = SDL_WINDOWPOS_UNDEFINED_DISPLAY(state->display);
+        }
+        if (SDL_WINDOWPOS_ISCENTERED(state->window_x)) {
+            state->window_x = SDL_WINDOWPOS_CENTERED_DISPLAY(state->display);
+            state->window_y = SDL_WINDOWPOS_CENTERED_DISPLAY(state->display);
+        }
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--fullscreen") == 0) {
+        state->window_flags |= SDL_WINDOW_FULLSCREEN;
+        state->num_windows = 1;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--fullscreen-desktop") == 0) {
+        state->window_flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
+        state->num_windows = 1;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--allow-highdpi") == 0) {
+        state->window_flags |= SDL_WINDOW_ALLOW_HIGHDPI;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--windows") == 0) {
+        ++index;
+        if (!argv[index] || !SDL_isdigit(*argv[index])) {
+            return -1;
+        }
+        if (!(state->window_flags & SDL_WINDOW_FULLSCREEN)) {
+            state->num_windows = SDL_atoi(argv[index]);
+        }
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--title") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->window_title = argv[index];
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--icon") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->window_icon = argv[index];
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--center") == 0) {
+        state->window_x = SDL_WINDOWPOS_CENTERED;
+        state->window_y = SDL_WINDOWPOS_CENTERED;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--position") == 0) {
+        char *x, *y;
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        x = argv[index];
+        y = argv[index];
+        while (*y && *y != ',') {
+            ++y;
+        }
+        if (!*y) {
+            return -1;
+        }
+        *y++ = '\0';
+        state->window_x = SDL_atoi(x);
+        state->window_y = SDL_atoi(y);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--geometry") == 0) {
+        char *w, *h;
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        w = argv[index];
+        h = argv[index];
+        while (*h && *h != 'x') {
+            ++h;
+        }
+        if (!*h) {
+            return -1;
+        }
+        *h++ = '\0';
+        state->window_w = SDL_atoi(w);
+        state->window_h = SDL_atoi(h);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--min-geometry") == 0) {
+        char *w, *h;
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        w = argv[index];
+        h = argv[index];
+        while (*h && *h != 'x') {
+            ++h;
+        }
+        if (!*h) {
+            return -1;
+        }
+        *h++ = '\0';
+        state->window_minW = SDL_atoi(w);
+        state->window_minH = SDL_atoi(h);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--max-geometry") == 0) {
+        char *w, *h;
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        w = argv[index];
+        h = argv[index];
+        while (*h && *h != 'x') {
+            ++h;
+        }
+        if (!*h) {
+            return -1;
+        }
+        *h++ = '\0';
+        state->window_maxW = SDL_atoi(w);
+        state->window_maxH = SDL_atoi(h);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--logical") == 0) {
+        char *w, *h;
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        w = argv[index];
+        h = argv[index];
+        while (*h && *h != 'x') {
+            ++h;
+        }
+        if (!*h) {
+            return -1;
+        }
+        *h++ = '\0';
+        state->logical_w = SDL_atoi(w);
+        state->logical_h = SDL_atoi(h);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--scale") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->scale = (float)SDL_atof(argv[index]);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--depth") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->depth = SDL_atoi(argv[index]);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--refresh") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->refresh_rate = SDL_atoi(argv[index]);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--vsync") == 0) {
+        state->render_flags |= SDL_RENDERER_PRESENTVSYNC;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--noframe") == 0) {
+        state->window_flags |= SDL_WINDOW_BORDERLESS;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--resize") == 0) {
+        state->window_flags |= SDL_WINDOW_RESIZABLE;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--minimize") == 0) {
+        state->window_flags |= SDL_WINDOW_MINIMIZED;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--maximize") == 0) {
+        state->window_flags |= SDL_WINDOW_MAXIMIZED;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--grab") == 0) {
+        state->window_flags |= SDL_WINDOW_INPUT_GRABBED;
+        return 1;
+    }
+    if (SDL_strcasecmp(argv[index], "--rate") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->audiospec.freq = SDL_atoi(argv[index]);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--format") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        if (SDL_strcasecmp(argv[index], "U8") == 0) {
+            state->audiospec.format = AUDIO_U8;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "S8") == 0) {
+            state->audiospec.format = AUDIO_S8;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "U16") == 0) {
+            state->audiospec.format = AUDIO_U16;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "U16LE") == 0) {
+            state->audiospec.format = AUDIO_U16LSB;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "U16BE") == 0) {
+            state->audiospec.format = AUDIO_U16MSB;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "S16") == 0) {
+            state->audiospec.format = AUDIO_S16;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "S16LE") == 0) {
+            state->audiospec.format = AUDIO_S16LSB;
+            return 2;
+        }
+        if (SDL_strcasecmp(argv[index], "S16BE") == 0) {
+            state->audiospec.format = AUDIO_S16MSB;
+            return 2;
+        }
+        return -1;
+    }
+    if (SDL_strcasecmp(argv[index], "--channels") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->audiospec.channels = (Uint8) SDL_atoi(argv[index]);
+        return 2;
+    }
+    if (SDL_strcasecmp(argv[index], "--samples") == 0) {
+        ++index;
+        if (!argv[index]) {
+            return -1;
+        }
+        state->audiospec.samples = (Uint16) SDL_atoi(argv[index]);
+        return 2;
+    }
+    if ((SDL_strcasecmp(argv[index], "-h") == 0)
+        || (SDL_strcasecmp(argv[index], "--help") == 0)) {
+        /* Print the usage message */
+        return -1;
+    }
+    if (SDL_strcmp(argv[index], "-NSDocumentRevisionsDebugMode") == 0) {
+    /* Debug flag sent by Xcode */
+        return 2;
+    }
+    return 0;
+}
+
+const char *
+SDLTest_CommonUsage(SDLTest_CommonState * state)
+{
+    switch (state->flags & (SDL_INIT_VIDEO | SDL_INIT_AUDIO)) {
+    case SDL_INIT_VIDEO:
+        return VIDEO_USAGE;
+    case SDL_INIT_AUDIO:
+        return AUDIO_USAGE;
+    case (SDL_INIT_VIDEO | SDL_INIT_AUDIO):
+        return VIDEO_USAGE " " AUDIO_USAGE;
+    default:
+        return "";
+    }
+}
+
+static void
+SDLTest_PrintRendererFlag(Uint32 flag)
+{
+    switch (flag) {
+    case SDL_RENDERER_PRESENTVSYNC:
+        fprintf(stderr, "PresentVSync");
+        break;
+    case SDL_RENDERER_ACCELERATED:
+        fprintf(stderr, "Accelerated");
+        break;
+    default:
+        fprintf(stderr, "0x%8.8x", flag);
+        break;
+    }
+}
+
+static void
+SDLTest_PrintPixelFormat(Uint32 format)
+{
+    switch (format) {
+    case SDL_PIXELFORMAT_UNKNOWN:
+        fprintf(stderr, "Unknwon");
+        break;
+    case SDL_PIXELFORMAT_INDEX1LSB:
+        fprintf(stderr, "Index1LSB");
+        break;
+    case SDL_PIXELFORMAT_INDEX1MSB:
+        fprintf(stderr, "Index1MSB");
+        break;
+    case SDL_PIXELFORMAT_INDEX4LSB:
+        fprintf(stderr, "Index4LSB");
+        break;
+    case SDL_PIXELFORMAT_INDEX4MSB:
+        fprintf(stderr, "Index4MSB");
+        break;
+    case SDL_PIXELFORMAT_INDEX8:
+        fprintf(stderr, "Index8");
+        break;
+    case SDL_PIXELFORMAT_RGB332:
+        fprintf(stderr, "RGB332");
+        break;
+    case SDL_PIXELFORMAT_RGB444:
+        fprintf(stderr, "RGB444");
+        break;
+    case SDL_PIXELFORMAT_RGB555:
+        fprintf(stderr, "RGB555");
+        break;
+    case SDL_PIXELFORMAT_BGR555:
+        fprintf(stderr, "BGR555");
+        break;
+    case SDL_PIXELFORMAT_ARGB4444:
+        fprintf(stderr, "ARGB4444");
+        break;
+    case SDL_PIXELFORMAT_ABGR4444:
+        fprintf(stderr, "ABGR4444");
+        break;
+    case SDL_PIXELFORMAT_ARGB1555:
+        fprintf(stderr, "ARGB1555");
+        break;
+    case SDL_PIXELFORMAT_ABGR1555:
+        fprintf(stderr, "ABGR1555");
+        break;
+    case SDL_PIXELFORMAT_RGB565:
+        fprintf(stderr, "RGB565");
+        break;
+    case SDL_PIXELFORMAT_BGR565:
+        fprintf(stderr, "BGR565");
+        break;
+    case SDL_PIXELFORMAT_RGB24:
+        fprintf(stderr, "RGB24");
+        break;
+    case SDL_PIXELFORMAT_BGR24:
+        fprintf(stderr, "BGR24");
+        break;
+    case SDL_PIXELFORMAT_RGB888:
+        fprintf(stderr, "RGB888");
+        break;
+    case SDL_PIXELFORMAT_BGR888:
+        fprintf(stderr, "BGR888");
+        break;
+    case SDL_PIXELFORMAT_ARGB8888:
+        fprintf(stderr, "ARGB8888");
+        break;
+    case SDL_PIXELFORMAT_RGBA8888:
+        fprintf(stderr, "RGBA8888");
+        break;
+    case SDL_PIXELFORMAT_ABGR8888:
+        fprintf(stderr, "ABGR8888");
+        break;
+    case SDL_PIXELFORMAT_BGRA8888:
+        fprintf(stderr, "BGRA8888");
+        break;
+    case SDL_PIXELFORMAT_ARGB2101010:
+        fprintf(stderr, "ARGB2101010");
+        break;
+    case SDL_PIXELFORMAT_YV12:
+        fprintf(stderr, "YV12");
+        break;
+    case SDL_PIXELFORMAT_IYUV:
+        fprintf(stderr, "IYUV");
+        break;
+    case SDL_PIXELFORMAT_YUY2:
+        fprintf(stderr, "YUY2");
+        break;
+    case SDL_PIXELFORMAT_UYVY:
+        fprintf(stderr, "UYVY");
+        break;
+    case SDL_PIXELFORMAT_YVYU:
+        fprintf(stderr, "YVYU");
+        break;
+    default:
+        fprintf(stderr, "0x%8.8x", format);
+        break;
+    }
+}
+
+static void
+SDLTest_PrintRenderer(SDL_RendererInfo * info)
+{
+    int i, count;
+
+    fprintf(stderr, "  Renderer %s:\n", info->name);
+
+    fprintf(stderr, "    Flags: 0x%8.8X", info->flags);
+    fprintf(stderr, " (");
+    count = 0;
+    for (i = 0; i < sizeof(info->flags) * 8; ++i) {
+        Uint32 flag = (1 << i);
+        if (info->flags & flag) {
+            if (count > 0) {
+                fprintf(stderr, " | ");
+            }
+            SDLTest_PrintRendererFlag(flag);
+            ++count;
+        }
+    }
+    fprintf(stderr, ")\n");
+
+    fprintf(stderr, "    Texture formats (%d): ", info->num_texture_formats);
+    for (i = 0; i < (int) info->num_texture_formats; ++i) {
+        if (i > 0) {
+            fprintf(stderr, ", ");
+        }
+        SDLTest_PrintPixelFormat(info->texture_formats[i]);
+    }
+    fprintf(stderr, "\n");
+
+    if (info->max_texture_width || info->max_texture_height) {
+        fprintf(stderr, "    Max Texture Size: %dx%d\n",
+                info->max_texture_width, info->max_texture_height);
+    }
+}
+
+static SDL_Surface *
+SDLTest_LoadIcon(const char *file)
+{
+    SDL_Surface *icon;
+
+    /* Load the icon surface */
+    icon = SDL_LoadBMP(file);
+    if (icon == NULL) {
+        fprintf(stderr, "Couldn't load %s: %s\n", file, SDL_GetError());
+        return (NULL);
+    }
+
+    if (icon->format->palette) {
+        /* Set the colorkey */
+        SDL_SetColorKey(icon, 1, *((Uint8 *) icon->pixels));
+    }
+
+    return (icon);
+}
+
+SDL_bool
+SDLTest_CommonInit(SDLTest_CommonState * state)
+{
+    int i, j, m, n, w, h;
+    SDL_DisplayMode fullscreen_mode;
+
+    if (state->flags & SDL_INIT_VIDEO) {
+        if (state->verbose & VERBOSE_VIDEO) {
+            n = SDL_GetNumVideoDrivers();
+            if (n == 0) {
+                fprintf(stderr, "No built-in video drivers\n");
+            } else {
+                fprintf(stderr, "Built-in video drivers:");
+                for (i = 0; i < n; ++i) {
+                    if (i > 0) {
+                        fprintf(stderr, ",");
+                    }
+                    fprintf(stderr, " %s", SDL_GetVideoDriver(i));
+                }
+                fprintf(stderr, "\n");
+            }
+        }
+        if (SDL_VideoInit(state->videodriver) < 0) {
+            fprintf(stderr, "Couldn't initialize video driver: %s\n",
+                    SDL_GetError());
+            return SDL_FALSE;
+        }
+        if (state->verbose & VERBOSE_VIDEO) {
+            fprintf(stderr, "Video driver: %s\n",
+                    SDL_GetCurrentVideoDriver());
+        }
+
+        /* Upload GL settings */
+        SDL_GL_SetAttribute(SDL_GL_RED_SIZE, state->gl_red_size);
+        SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, state->gl_green_size);
+        SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, state->gl_blue_size);
+        SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, state->gl_alpha_size);
+        SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, state->gl_double_buffer);
+        SDL_GL_SetAttribute(SDL_GL_BUFFER_SIZE, state->gl_buffer_size);
+        SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, state->gl_depth_size);
+        SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, state->gl_stencil_size);
+        SDL_GL_SetAttribute(SDL_GL_ACCUM_RED_SIZE, state->gl_accum_red_size);
+        SDL_GL_SetAttribute(SDL_GL_ACCUM_GREEN_SIZE, state->gl_accum_green_size);
+        SDL_GL_SetAttribute(SDL_GL_ACCUM_BLUE_SIZE, state->gl_accum_blue_size);
+        SDL_GL_SetAttribute(SDL_GL_ACCUM_ALPHA_SIZE, state->gl_accum_alpha_size);
+        SDL_GL_SetAttribute(SDL_GL_STEREO, state->gl_stereo);
+        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, state->gl_multisamplebuffers);
+        SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, state->gl_multisamplesamples);
+        if (state->gl_accelerated >= 0) {
+            SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL,
+                                state->gl_accelerated);
+        }
+        SDL_GL_SetAttribute(SDL_GL_RETAINED_BACKING, state->gl_retained_backing);
+        if (state->gl_major_version) {
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, state->gl_major_version);
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, state->gl_minor_version);
+        }
+        if (state->gl_debug) {
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG);
+        }
+        if (state->gl_profile_mask) {
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, state->gl_profile_mask);
+        }
+
+        if (state->verbose & VERBOSE_MODES) {
+            SDL_Rect bounds;
+            SDL_DisplayMode mode;
+            int bpp;
+            Uint32 Rmask, Gmask, Bmask, Amask;
+#if SDL_VIDEO_DRIVER_WINDOWS
+			int adapterIndex = 0;
+			int outputIndex = 0;
+#endif
+            n = SDL_GetNumVideoDisplays();
+            fprintf(stderr, "Number of displays: %d\n", n);
+            for (i = 0; i < n; ++i) {
+                fprintf(stderr, "Display %d: %s\n", i, SDL_GetDisplayName(i));
+
+                SDL_zero(bounds);
+                SDL_GetDisplayBounds(i, &bounds);
+                fprintf(stderr, "Bounds: %dx%d at %d,%d\n", bounds.w, bounds.h, bounds.x, bounds.y);
+
+                SDL_GetDesktopDisplayMode(i, &mode);
+                SDL_PixelFormatEnumToMasks(mode.format, &bpp, &Rmask, &Gmask,
+                                           &Bmask, &Amask);
+                fprintf(stderr,
+                        "  Current mode: %dx%d@%dHz, %d bits-per-pixel (%s)\n",
+                        mode.w, mode.h, mode.refresh_rate, bpp,
+                        SDL_GetPixelFormatName(mode.format));
+                if (Rmask || Gmask || Bmask) {
+                    fprintf(stderr, "      Red Mask   = 0x%.8x\n", Rmask);
+                    fprintf(stderr, "      Green Mask = 0x%.8x\n", Gmask);
+                    fprintf(stderr, "      Blue Mask  = 0x%.8x\n", Bmask);
+                    if (Amask)
+                        fprintf(stderr, "      Alpha Mask = 0x%.8x\n", Amask);
+                }
+
+                /* Print available fullscreen video modes */
+                m = SDL_GetNumDisplayModes(i);
+                if (m == 0) {
+                    fprintf(stderr, "No available fullscreen video modes\n");
+                } else {
+                    fprintf(stderr, "  Fullscreen video modes:\n");
+                    for (j = 0; j < m; ++j) {
+                        SDL_GetDisplayMode(i, j, &mode);
+                        SDL_PixelFormatEnumToMasks(mode.format, &bpp, &Rmask,
+                                                   &Gmask, &Bmask, &Amask);
+                        fprintf(stderr,
+                                "    Mode %d: %dx%d@%dHz, %d bits-per-pixel (%s)\n",
+                                j, mode.w, mode.h, mode.refresh_rate, bpp,
+                                SDL_GetPixelFormatName(mode.format));
+                        if (Rmask || Gmask || Bmask) {
+                            fprintf(stderr, "        Red Mask   = 0x%.8x\n",
+                                    Rmask);
+                            fprintf(stderr, "        Green Mask = 0x%.8x\n",
+                                    Gmask);
+                            fprintf(stderr, "        Blue Mask  = 0x%.8x\n",
+                                    Bmask);
+                            if (Amask)
+                                fprintf(stderr,
+                                        "        Alpha Mask = 0x%.8x\n",
+                                        Amask);
+                        }
+                    }
+                }
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+				/* Print the D3D9 adapter index */
+				adapterIndex = SDL_Direct3D9GetAdapterIndex( i );
+				fprintf( stderr, "D3D9 Adapter Index: %d", adapterIndex );
+
+				/* Print the DXGI adapter and output indices */
+				SDL_DXGIGetOutputInfo(i, &adapterIndex, &outputIndex);
+				fprintf( stderr, "DXGI Adapter Index: %d  Output Index: %d", adapterIndex, outputIndex );
+#endif
+            }
+        }
+
+        if (state->verbose & VERBOSE_RENDER) {
+            SDL_RendererInfo info;
+
+            n = SDL_GetNumRenderDrivers();
+            if (n == 0) {
+                fprintf(stderr, "No built-in render drivers\n");
+            } else {
+                fprintf(stderr, "Built-in render drivers:\n");
+                for (i = 0; i < n; ++i) {
+                    SDL_GetRenderDriverInfo(i, &info);
+                    SDLTest_PrintRenderer(&info);
+                }
+            }
+        }
+
+        SDL_zero(fullscreen_mode);
+        switch (state->depth) {
+        case 8:
+            fullscreen_mode.format = SDL_PIXELFORMAT_INDEX8;
+            break;
+        case 15:
+            fullscreen_mode.format = SDL_PIXELFORMAT_RGB555;
+            break;
+        case 16:
+            fullscreen_mode.format = SDL_PIXELFORMAT_RGB565;
+            break;
+        case 24:
+            fullscreen_mode.format = SDL_PIXELFORMAT_RGB24;
+            break;
+        default:
+            fullscreen_mode.format = SDL_PIXELFORMAT_RGB888;
+            break;
+        }
+        fullscreen_mode.refresh_rate = state->refresh_rate;
+
+        state->windows =
+            (SDL_Window **) SDL_malloc(state->num_windows *
+                                        sizeof(*state->windows));
+        state->renderers =
+            (SDL_Renderer **) SDL_malloc(state->num_windows *
+                                        sizeof(*state->renderers));
+        state->targets =
+            (SDL_Texture **) SDL_malloc(state->num_windows *
+                                        sizeof(*state->targets));
+        if (!state->windows || !state->renderers) {
+            fprintf(stderr, "Out of memory!\n");
+            return SDL_FALSE;
+        }
+        for (i = 0; i < state->num_windows; ++i) {
+            char title[1024];
+
+            if (state->num_windows > 1) {
+                SDL_snprintf(title, SDL_arraysize(title), "%s %d",
+                             state->window_title, i + 1);
+            } else {
+                SDL_strlcpy(title, state->window_title, SDL_arraysize(title));
+            }
+            state->windows[i] =
+                SDL_CreateWindow(title, state->window_x, state->window_y,
+                                 state->window_w, state->window_h,
+                                 state->window_flags);
+            if (!state->windows[i]) {
+                fprintf(stderr, "Couldn't create window: %s\n",
+                        SDL_GetError());
+                return SDL_FALSE;
+            }
+            if (state->window_minW || state->window_minH) {
+                SDL_SetWindowMinimumSize(state->windows[i], state->window_minW, state->window_minH);
+            }
+            if (state->window_maxW || state->window_maxH) {
+                SDL_SetWindowMaximumSize(state->windows[i], state->window_maxW, state->window_maxH);
+            }
+            SDL_GetWindowSize(state->windows[i], &w, &h);
+            if (!(state->window_flags & SDL_WINDOW_RESIZABLE) &&
+                (w != state->window_w || h != state->window_h)) {
+                printf("Window requested size %dx%d, got %dx%d\n", state->window_w, state->window_h, w, h);
+                state->window_w = w;
+                state->window_h = h;
+            }
+            if (SDL_SetWindowDisplayMode(state->windows[i], &fullscreen_mode) < 0) {
+                fprintf(stderr, "Can't set up fullscreen display mode: %s\n",
+                        SDL_GetError());
+                return SDL_FALSE;
+            }
+
+            if (state->window_icon) {
+                SDL_Surface *icon = SDLTest_LoadIcon(state->window_icon);
+                if (icon) {
+                    SDL_SetWindowIcon(state->windows[i], icon);
+                    SDL_FreeSurface(icon);
+                }
+            }
+
+            SDL_ShowWindow(state->windows[i]);
+
+            state->renderers[i] = NULL;
+            state->targets[i] = NULL;
+
+            if (!state->skip_renderer
+                && (state->renderdriver
+                    || !(state->window_flags & SDL_WINDOW_OPENGL))) {
+                m = -1;
+                if (state->renderdriver) {
+                    SDL_RendererInfo info;
+                    n = SDL_GetNumRenderDrivers();
+                    for (j = 0; j < n; ++j) {
+                        SDL_GetRenderDriverInfo(j, &info);
+                        if (SDL_strcasecmp(info.name, state->renderdriver) ==
+                            0) {
+                            m = j;
+                            break;
+                        }
+                    }
+                    if (m == n) {
+                        fprintf(stderr,
+                                "Couldn't find render driver named %s",
+                                state->renderdriver);
+                        return SDL_FALSE;
+                    }
+                }
+                state->renderers[i] = SDL_CreateRenderer(state->windows[i],
+                                            m, state->render_flags);
+                if (!state->renderers[i]) {
+                    fprintf(stderr, "Couldn't create renderer: %s\n",
+                            SDL_GetError());
+                    return SDL_FALSE;
+                }
+                if (state->logical_w && state->logical_h) {
+                    SDL_RenderSetLogicalSize(state->renderers[i], state->logical_w, state->logical_h);
+                } else if (state->scale) {
+                    SDL_RenderSetScale(state->renderers[i], state->scale, state->scale);
+                }
+                if (state->verbose & VERBOSE_RENDER) {
+                    SDL_RendererInfo info;
+
+                    fprintf(stderr, "Current renderer:\n");
+                    SDL_GetRendererInfo(state->renderers[i], &info);
+                    SDLTest_PrintRenderer(&info);
+                }
+            }
+        }
+    }
+
+    if (state->flags & SDL_INIT_AUDIO) {
+        if (state->verbose & VERBOSE_AUDIO) {
+            n = SDL_GetNumAudioDrivers();
+            if (n == 0) {
+                fprintf(stderr, "No built-in audio drivers\n");
+            } else {
+                fprintf(stderr, "Built-in audio drivers:");
+                for (i = 0; i < n; ++i) {
+                    if (i > 0) {
+                        fprintf(stderr, ",");
+                    }
+                    fprintf(stderr, " %s", SDL_GetAudioDriver(i));
+                }
+                fprintf(stderr, "\n");
+            }
+        }
+        if (SDL_AudioInit(state->audiodriver) < 0) {
+            fprintf(stderr, "Couldn't initialize audio driver: %s\n",
+                    SDL_GetError());
+            return SDL_FALSE;
+        }
+        if (state->verbose & VERBOSE_VIDEO) {
+            fprintf(stderr, "Audio driver: %s\n",
+                    SDL_GetCurrentAudioDriver());
+        }
+
+        if (SDL_OpenAudio(&state->audiospec, NULL) < 0) {
+            fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
+            return SDL_FALSE;
+        }
+    }
+
+    return SDL_TRUE;
+}
+
+static const char *
+ControllerAxisName(const SDL_GameControllerAxis axis)
+{
+    switch (axis)
+    {
+#define AXIS_CASE(ax) case SDL_CONTROLLER_AXIS_##ax: return #ax
+        AXIS_CASE(INVALID);
+        AXIS_CASE(LEFTX);
+        AXIS_CASE(LEFTY);
+        AXIS_CASE(RIGHTX);
+        AXIS_CASE(RIGHTY);
+        AXIS_CASE(TRIGGERLEFT);
+        AXIS_CASE(TRIGGERRIGHT);
+#undef AXIS_CASE
+default: return "???";
+    }
+}
+
+static const char *
+ControllerButtonName(const SDL_GameControllerButton button)
+{
+    switch (button)
+    {
+#define BUTTON_CASE(btn) case SDL_CONTROLLER_BUTTON_##btn: return #btn
+        BUTTON_CASE(INVALID);
+        BUTTON_CASE(A);
+        BUTTON_CASE(B);
+        BUTTON_CASE(X);
+        BUTTON_CASE(Y);
+        BUTTON_CASE(BACK);
+        BUTTON_CASE(GUIDE);
+        BUTTON_CASE(START);
+        BUTTON_CASE(LEFTSTICK);
+        BUTTON_CASE(RIGHTSTICK);
+        BUTTON_CASE(LEFTSHOULDER);
+        BUTTON_CASE(RIGHTSHOULDER);
+        BUTTON_CASE(DPAD_UP);
+        BUTTON_CASE(DPAD_DOWN);
+        BUTTON_CASE(DPAD_LEFT);
+        BUTTON_CASE(DPAD_RIGHT);
+#undef BUTTON_CASE
+default: return "???";
+    }
+}
+
+static void
+SDLTest_PrintEvent(SDL_Event * event)
+{
+    if ((event->type == SDL_MOUSEMOTION) || (event->type == SDL_FINGERMOTION)) {
+        /* Mouse and finger motion are really spammy */
+        return;
+    }
+
+    switch (event->type) {
+    case SDL_WINDOWEVENT:
+        switch (event->window.event) {
+        case SDL_WINDOWEVENT_SHOWN:
+            SDL_Log("SDL EVENT: Window %d shown", event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_HIDDEN:
+            SDL_Log("SDL EVENT: Window %d hidden", event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_EXPOSED:
+            SDL_Log("SDL EVENT: Window %d exposed", event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_MOVED:
+            SDL_Log("SDL EVENT: Window %d moved to %d,%d",
+                    event->window.windowID, event->window.data1,
+                    event->window.data2);
+            break;
+        case SDL_WINDOWEVENT_RESIZED:
+            SDL_Log("SDL EVENT: Window %d resized to %dx%d",
+                    event->window.windowID, event->window.data1,
+                    event->window.data2);
+            break;
+        case SDL_WINDOWEVENT_SIZE_CHANGED:
+            SDL_Log("SDL EVENT: Window %d changed size to %dx%d",
+                    event->window.windowID, event->window.data1,
+                    event->window.data2);
+            break;
+        case SDL_WINDOWEVENT_MINIMIZED:
+            SDL_Log("SDL EVENT: Window %d minimized", event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_MAXIMIZED:
+            SDL_Log("SDL EVENT: Window %d maximized", event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_RESTORED:
+            SDL_Log("SDL EVENT: Window %d restored", event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_ENTER:
+            SDL_Log("SDL EVENT: Mouse entered window %d",
+                    event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_LEAVE:
+            SDL_Log("SDL EVENT: Mouse left window %d", event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_FOCUS_GAINED:
+            SDL_Log("SDL EVENT: Window %d gained keyboard focus",
+                    event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_FOCUS_LOST:
+            SDL_Log("SDL EVENT: Window %d lost keyboard focus",
+                    event->window.windowID);
+            break;
+        case SDL_WINDOWEVENT_CLOSE:
+            SDL_Log("SDL EVENT: Window %d closed", event->window.windowID);
+            break;
+        default:
+            SDL_Log("SDL EVENT: Window %d got unknown event %d",
+                    event->window.windowID, event->window.event);
+            break;
+        }
+        break;
+    case SDL_KEYDOWN:
+        SDL_Log("SDL EVENT: Keyboard: key pressed  in window %d: scancode 0x%08X = %s, keycode 0x%08X = %s",
+                event->key.windowID,
+                event->key.keysym.scancode,
+                SDL_GetScancodeName(event->key.keysym.scancode),
+                event->key.keysym.sym, SDL_GetKeyName(event->key.keysym.sym));
+        break;
+    case SDL_KEYUP:
+        SDL_Log("SDL EVENT: Keyboard: key released in window %d: scancode 0x%08X = %s, keycode 0x%08X = %s",
+                event->key.windowID,
+                event->key.keysym.scancode,
+                SDL_GetScancodeName(event->key.keysym.scancode),
+                event->key.keysym.sym, SDL_GetKeyName(event->key.keysym.sym));
+        break;
+    case SDL_TEXTINPUT:
+        SDL_Log("SDL EVENT: Keyboard: text input \"%s\" in window %d",
+                event->text.text, event->text.windowID);
+        break;
+    case SDL_MOUSEMOTION:
+        SDL_Log("SDL EVENT: Mouse: moved to %d,%d (%d,%d) in window %d",
+                event->motion.x, event->motion.y,
+                event->motion.xrel, event->motion.yrel,
+                event->motion.windowID);
+        break;
+    case SDL_MOUSEBUTTONDOWN:
+        SDL_Log("SDL EVENT: Mouse: button %d pressed at %d,%d with click count %d in window %d",
+                event->button.button, event->button.x, event->button.y, event->button.clicks,
+                event->button.windowID);
+        break;
+    case SDL_MOUSEBUTTONUP:
+        SDL_Log("SDL EVENT: Mouse: button %d released at %d,%d with click count %d in window %d",
+                event->button.button, event->button.x, event->button.y, event->button.clicks,
+                event->button.windowID);
+        break;
+    case SDL_MOUSEWHEEL:
+        SDL_Log("SDL EVENT: Mouse: wheel scrolled %d in x and %d in y in window %d",
+                event->wheel.x, event->wheel.y, event->wheel.windowID);
+        break;
+    case SDL_JOYDEVICEADDED:
+        SDL_Log("SDL EVENT: Joystick index %d attached",
+            event->jdevice.which);
+        break;
+    case SDL_JOYDEVICEREMOVED:
+        SDL_Log("SDL EVENT: Joystick %d removed",
+            event->jdevice.which);
+        break;
+    case SDL_JOYBALLMOTION:
+        SDL_Log("SDL EVENT: Joystick %d: ball %d moved by %d,%d",
+                event->jball.which, event->jball.ball, event->jball.xrel,
+                event->jball.yrel);
+        break;
+    case SDL_JOYHATMOTION:
+        {
+            const char *position = "UNKNOWN";
+            switch (event->jhat.value) {
+            case SDL_HAT_CENTERED:
+                position = "CENTER";
+                break;
+            case SDL_HAT_UP:
+                position = "UP";
+                break;
+            case SDL_HAT_RIGHTUP:
+                position = "RIGHTUP";
+                break;
+            case SDL_HAT_RIGHT:
+                position = "RIGHT";
+                break;
+            case SDL_HAT_RIGHTDOWN:
+                position = "RIGHTDOWN";
+                break;
+            case SDL_HAT_DOWN:
+                position = "DOWN";
+                break;
+            case SDL_HAT_LEFTDOWN:
+                position = "LEFTDOWN";
+                break;
+            case SDL_HAT_LEFT:
+                position = "LEFT";
+                break;
+            case SDL_HAT_LEFTUP:
+                position = "LEFTUP";
+                break;
+            }
+            SDL_Log("SDL EVENT: Joystick %d: hat %d moved to %s", event->jhat.which,
+                event->jhat.hat, position);
+        }
+        break;
+    case SDL_JOYBUTTONDOWN:
+        SDL_Log("SDL EVENT: Joystick %d: button %d pressed",
+                event->jbutton.which, event->jbutton.button);
+        break;
+    case SDL_JOYBUTTONUP:
+        SDL_Log("SDL EVENT: Joystick %d: button %d released",
+                event->jbutton.which, event->jbutton.button);
+        break;
+    case SDL_CONTROLLERDEVICEADDED:
+        SDL_Log("SDL EVENT: Controller index %d attached",
+            event->cdevice.which);
+        break;
+    case SDL_CONTROLLERDEVICEREMOVED:
+        SDL_Log("SDL EVENT: Controller %d removed",
+            event->cdevice.which);
+        break;
+    case SDL_CONTROLLERAXISMOTION:
+        SDL_Log("SDL EVENT: Controller %d axis %d ('%s') value: %d",
+            event->caxis.which,
+            event->caxis.axis,
+            ControllerAxisName((SDL_GameControllerAxis)event->caxis.axis),
+            event->caxis.value);
+        break;
+    case SDL_CONTROLLERBUTTONDOWN:
+        SDL_Log("SDL EVENT: Controller %d button %d ('%s') down",
+            event->cbutton.which, event->cbutton.button,
+            ControllerButtonName((SDL_GameControllerButton)event->cbutton.button));
+        break;
+    case SDL_CONTROLLERBUTTONUP:
+        SDL_Log("SDL EVENT: Controller %d button %d ('%s') up",
+            event->cbutton.which, event->cbutton.button,
+            ControllerButtonName((SDL_GameControllerButton)event->cbutton.button));
+        break;
+    case SDL_CLIPBOARDUPDATE:
+        SDL_Log("SDL EVENT: Clipboard updated");
+        break;
+
+    case SDL_FINGERDOWN:
+    case SDL_FINGERUP:
+        SDL_Log("SDL EVENT: Finger: %s touch=%ld, finger=%ld, x=%f, y=%f, dx=%f, dy=%f, pressure=%f",
+                (event->type == SDL_FINGERDOWN) ? "down" : "up",
+                (long) event->tfinger.touchId,
+                (long) event->tfinger.fingerId,
+                event->tfinger.x, event->tfinger.y,
+                event->tfinger.dx, event->tfinger.dy, event->tfinger.pressure);
+        break;
+
+    case SDL_QUIT:
+        SDL_Log("SDL EVENT: Quit requested");
+        break;
+    case SDL_USEREVENT:
+        SDL_Log("SDL EVENT: User event %d", event->user.code);
+        break;
+    default:
+        SDL_Log("Unknown event %d", event->type);
+        break;
+    }
+}
+
+static void
+SDLTest_ScreenShot(SDL_Renderer *renderer)
+{
+    SDL_Rect viewport;
+    SDL_Surface *surface;
+
+    if (!renderer) {
+        return;
+    }
+
+    SDL_RenderGetViewport(renderer, &viewport);
+    surface = SDL_CreateRGBSurface(0, viewport.w, viewport.h, 24,
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+                    0x00FF0000, 0x0000FF00, 0x000000FF,
+#else
+                    0x000000FF, 0x0000FF00, 0x00FF0000,
+#endif
+                    0x00000000);
+    if (!surface) {
+        fprintf(stderr, "Couldn't create surface: %s\n", SDL_GetError());
+        return;
+    }
+
+    if (SDL_RenderReadPixels(renderer, NULL, surface->format->format,
+                             surface->pixels, surface->pitch) < 0) {
+        fprintf(stderr, "Couldn't read screen: %s\n", SDL_GetError());
+        SDL_free(surface);
+        return;
+    }
+
+    if (SDL_SaveBMP(surface, "screenshot.bmp") < 0) {
+        fprintf(stderr, "Couldn't save screenshot.bmp: %s\n", SDL_GetError());
+        SDL_free(surface);
+        return;
+    }
+}
+
+static void
+FullscreenTo(int index, int windowId)
+{
+    Uint32 flags;
+    struct SDL_Rect rect = { 0, 0, 0, 0 };
+    SDL_Window *window = SDL_GetWindowFromID(windowId);
+    if (!window) {
+        return;
+    }
+
+    SDL_GetDisplayBounds( index, &rect );
+
+    flags = SDL_GetWindowFlags(window);
+    if (flags & SDL_WINDOW_FULLSCREEN) {
+        SDL_SetWindowFullscreen( window, SDL_FALSE );
+        SDL_Delay( 15 );
+    }
+
+    SDL_SetWindowPosition( window, rect.x, rect.y );
+    SDL_SetWindowFullscreen( window, SDL_TRUE );
+}
+
+void
+SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done)
+{
+    int i;
+    static SDL_MouseMotionEvent lastEvent;
+
+    if (state->verbose & VERBOSE_EVENT) {
+        SDLTest_PrintEvent(event);
+    }
+
+    switch (event->type) {
+    case SDL_WINDOWEVENT:
+        switch (event->window.event) {
+        case SDL_WINDOWEVENT_CLOSE:
+            {
+                SDL_Window *window = SDL_GetWindowFromID(event->window.windowID);
+                if (window) {
+                    for (i = 0; i < state->num_windows; ++i) {
+                        if (window == state->windows[i]) {
+                            if (state->targets[i]) {
+                                SDL_DestroyTexture(state->targets[i]);
+                                state->targets[i] = NULL;
+                            }
+                            if (state->renderers[i]) {
+                                SDL_DestroyRenderer(state->renderers[i]);
+                                state->renderers[i] = NULL;
+                            }
+                            SDL_DestroyWindow(state->windows[i]);
+                            state->windows[i] = NULL;
+                            break;
+                        }
+                    }
+                }
+            }
+            break;
+        }
+        break;
+    case SDL_KEYDOWN: {
+        SDL_bool withControl = !!(event->key.keysym.mod & KMOD_CTRL);
+        SDL_bool withShift = !!(event->key.keysym.mod & KMOD_SHIFT);
+        SDL_bool withAlt = !!(event->key.keysym.mod & KMOD_ALT);
+
+        switch (event->key.keysym.sym) {
+            /* Add hotkeys here */
+        case SDLK_PRINTSCREEN: {
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    for (i = 0; i < state->num_windows; ++i) {
+                        if (window == state->windows[i]) {
+                            SDLTest_ScreenShot(state->renderers[i]);
+                        }
+                    }
+                }
+            }
+            break;
+        case SDLK_EQUALS:
+            if (withControl) {
+                /* Ctrl-+ double the size of the window */
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    int w, h;
+                    SDL_GetWindowSize(window, &w, &h);
+                    SDL_SetWindowSize(window, w*2, h*2);
+                }
+            }
+            break;
+        case SDLK_MINUS:
+            if (withControl) {
+                /* Ctrl-- half the size of the window */
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    int w, h;
+                    SDL_GetWindowSize(window, &w, &h);
+                    SDL_SetWindowSize(window, w/2, h/2);
+                }
+            }
+            break;
+        case SDLK_c:
+            if (withControl) {
+                /* Ctrl-C copy awesome text! */
+                SDL_SetClipboardText("SDL rocks!\nYou know it!");
+                printf("Copied text to clipboard\n");
+            }
+            if (withAlt) {
+                /* Alt-C toggle a render clip rectangle */
+                for (i = 0; i < state->num_windows; ++i) {
+                    int w, h;
+                    if (state->renderers[i]) {
+                        SDL_Rect clip;
+                        SDL_GetWindowSize(state->windows[i], &w, &h);
+                        SDL_RenderGetClipRect(state->renderers[i], &clip);
+                        if (SDL_RectEmpty(&clip)) {
+                            clip.x = w/4;
+                            clip.y = h/4;
+                            clip.w = w/2;
+                            clip.h = h/2;
+                            SDL_RenderSetClipRect(state->renderers[i], &clip);
+                        } else {
+                            SDL_RenderSetClipRect(state->renderers[i], NULL);
+                        }
+                    }
+                }
+            }
+            break;
+        case SDLK_v:
+            if (withControl) {
+                /* Ctrl-V paste awesome text! */
+                char *text = SDL_GetClipboardText();
+                if (*text) {
+                    printf("Clipboard: %s\n", text);
+                } else {
+                    printf("Clipboard is empty\n");
+                }
+                SDL_free(text);
+            }
+            break;
+        case SDLK_g:
+            if (withControl) {
+                /* Ctrl-G toggle grab */
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    SDL_SetWindowGrab(window, !SDL_GetWindowGrab(window) ? SDL_TRUE : SDL_FALSE);
+                }
+            }
+            break;
+        case SDLK_m:
+            if (withControl) {
+                /* Ctrl-M maximize */
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    Uint32 flags = SDL_GetWindowFlags(window);
+                    if (flags & SDL_WINDOW_MAXIMIZED) {
+                        SDL_RestoreWindow(window);
+                    } else {
+                        SDL_MaximizeWindow(window);
+                    }
+                }
+            }
+            break;
+        case SDLK_r:
+            if (withControl) {
+                /* Ctrl-R toggle mouse relative mode */
+                SDL_SetRelativeMouseMode(!SDL_GetRelativeMouseMode() ? SDL_TRUE : SDL_FALSE);
+            }
+            break;
+        case SDLK_z:
+            if (withControl) {
+                /* Ctrl-Z minimize */
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    SDL_MinimizeWindow(window);
+                }
+            }
+            break;
+        case SDLK_RETURN:
+            if (withControl) {
+                /* Ctrl-Enter toggle fullscreen */
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    Uint32 flags = SDL_GetWindowFlags(window);
+                    if (flags & SDL_WINDOW_FULLSCREEN) {
+                        SDL_SetWindowFullscreen(window, SDL_FALSE);
+                    } else {
+                        SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN);
+                    }
+                }
+            } else if (withAlt) {
+                /* Alt-Enter toggle fullscreen desktop */
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    Uint32 flags = SDL_GetWindowFlags(window);
+                    if (flags & SDL_WINDOW_FULLSCREEN) {
+                        SDL_SetWindowFullscreen(window, SDL_FALSE);
+                    } else {
+                        SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
+                    }
+                }
+            } else if (withShift) {
+                /* Shift-Enter toggle fullscreen desktop / fullscreen */
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    Uint32 flags = SDL_GetWindowFlags(window);
+                    if ((flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) {
+                        SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN);
+                    } else {
+                        SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
+                    }
+                }
+            }
+
+            break;
+        case SDLK_b:
+            if (withControl) {
+                /* Ctrl-B toggle window border */
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                if (window) {
+                    const Uint32 flags = SDL_GetWindowFlags(window);
+                    const SDL_bool b = ((flags & SDL_WINDOW_BORDERLESS) != 0) ? SDL_TRUE : SDL_FALSE;
+                    SDL_SetWindowBordered(window, b);
+                }
+            }
+            break;
+        case SDLK_0:
+            if (withControl) {
+                SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+                SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, "Test Message", "You're awesome!", window);
+            }
+            break;
+        case SDLK_1:
+            if (withControl) {
+                FullscreenTo(0, event->key.windowID);
+            }
+            break;
+        case SDLK_2:
+            if (withControl) {
+                FullscreenTo(1, event->key.windowID);
+            }
+            break;
+        case SDLK_ESCAPE:
+            *done = 1;
+            break;
+        case SDLK_SPACE:
+        {
+            char message[256];
+            SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
+
+            SDL_snprintf(message, sizeof(message), "(%i, %i), rel (%i, %i)\n", lastEvent.x, lastEvent.y, lastEvent.xrel, lastEvent.yrel);
+            SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, "Last mouse position", message, window);
+            break;
+        }
+        default:
+            break;
+        }
+        break;
+    }
+    case SDL_QUIT:
+        *done = 1;
+        break;
+    case SDL_MOUSEMOTION:
+        lastEvent = event->motion;
+        break;
+    }
+}
+
+void
+SDLTest_CommonQuit(SDLTest_CommonState * state)
+{
+    int i;
+
+    SDL_free(state->windows);
+    if (state->targets) {
+        for (i = 0; i < state->num_windows; ++i) {
+            if (state->targets[i]) {
+                SDL_DestroyTexture(state->targets[i]);
+            }
+        }
+        SDL_free(state->targets);
+    }
+    if (state->renderers) {
+        for (i = 0; i < state->num_windows; ++i) {
+            if (state->renderers[i]) {
+                SDL_DestroyRenderer(state->renderers[i]);
+            }
+        }
+        SDL_free(state->renderers);
+    }
+    if (state->flags & SDL_INIT_VIDEO) {
+        SDL_VideoQuit();
+    }
+    if (state->flags & SDL_INIT_AUDIO) {
+        SDL_AudioQuit();
+    }
+    SDL_free(state);
+    SDL_Quit();
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_compare.c b/Source/3rd Party/sdl/src/test/SDL_test_compare.c
new file mode 100644
index 000000000..de7041662
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_compare.c	
@@ -0,0 +1,107 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+
+ Based on automated SDL_Surface tests originally written by Edgar Simo 'bobbens'.
+
+ Rewritten for test lib by Andreas Schiffler.
+
+*/
+
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+
+/* Counter for _CompareSurface calls; used for filename creation when comparisons fail */
+static int _CompareSurfaceCount = 0;
+
+/* Compare surfaces */
+int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface, int allowable_error)
+{
+   int ret;
+   int i,j;
+   int bpp, bpp_reference;
+   Uint8 *p, *p_reference;
+   int dist;
+   Uint8 R, G, B, A;
+   Uint8 Rd, Gd, Bd, Ad;
+   char imageFilename[128];
+   char referenceFilename[128];
+
+   /* Validate input surfaces */
+   if (surface == NULL || referenceSurface == NULL) {
+      return -1;
+   }
+
+   /* Make sure surface size is the same. */
+   if ((surface->w != referenceSurface->w) || (surface->h != referenceSurface->h)) {
+      return -2;
+   }
+
+   /* Sanitize input value */
+   if (allowable_error<0) {
+      allowable_error = 0;
+   }
+
+   SDL_LockSurface( surface );
+   SDL_LockSurface( referenceSurface );
+
+   ret = 0;
+   bpp = surface->format->BytesPerPixel;
+   bpp_reference = referenceSurface->format->BytesPerPixel;
+   /* Compare image - should be same format. */
+   for (j=0; j<surface->h; j++) {
+      for (i=0; i<surface->w; i++) {
+         p  = (Uint8 *)surface->pixels + j * surface->pitch + i * bpp;
+         p_reference = (Uint8 *)referenceSurface->pixels + j * referenceSurface->pitch + i * bpp_reference;
+
+         SDL_GetRGBA(*(Uint32*)p, surface->format, &R, &G, &B, &A);
+         SDL_GetRGBA(*(Uint32*)p_reference, referenceSurface->format, &Rd, &Gd, &Bd, &Ad);
+
+         dist = 0;
+         dist += (R-Rd)*(R-Rd);
+         dist += (G-Gd)*(G-Gd);
+         dist += (B-Bd)*(B-Bd);
+
+         /* Allow some difference in blending accuracy */
+         if (dist > allowable_error) {
+            ret++;
+         }
+      }
+   }
+
+   SDL_UnlockSurface( surface );
+   SDL_UnlockSurface( referenceSurface );
+
+   /* Save test image and reference for analysis on failures */
+   _CompareSurfaceCount++;
+   if (ret != 0) {
+      SDL_snprintf(imageFilename, 127, "CompareSurfaces%04d_TestOutput.bmp", _CompareSurfaceCount);
+      SDL_SaveBMP(surface, imageFilename);
+      SDL_snprintf(referenceFilename, 127, "CompareSurfaces%04d_Reference.bmp", _CompareSurfaceCount);
+      SDL_SaveBMP(referenceSurface, referenceFilename);
+      SDLTest_LogError("Surfaces from failed comparison saved as '%s' and '%s'", imageFilename, referenceFilename);
+   }
+
+   return ret;
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_crc32.c b/Source/3rd Party/sdl/src/test/SDL_test_crc32.c
new file mode 100644
index 000000000..dafe72296
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_crc32.c	
@@ -0,0 +1,165 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+
+ Used by the test execution component.
+ Original source code contributed by A. Schiffler for GSOC project.
+
+*/
+
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+
+int SDLTest_Crc32Init(SDLTest_Crc32Context *crcContext)
+{
+  int i,j;
+  CrcUint32 c;
+
+  /* Sanity check context pointer */
+  if (crcContext==NULL) {
+   return -1;
+  }
+
+  /*
+   * Build auxiliary table for parallel byte-at-a-time CRC-32
+   */
+#ifdef ORIGINAL_METHOD
+  for (i = 0; i < 256; ++i) {
+    for (c = i << 24, j = 8; j > 0; --j) {
+      c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY : (c << 1);
+    }
+    crcContext->crc32_table[i] = c;
+  }
+#else
+  for (i=0; i<256; i++) {
+   c = i;
+   for (j=8; j>0; j--) {
+    if (c & 1) {
+     c = (c >> 1) ^ CRC32_POLY;
+    } else {
+     c >>= 1;
+    }
+   }
+   crcContext->crc32_table[i] = c;
+  }
+#endif
+
+  return 0;
+}
+
+/* Complete CRC32 calculation on a memory block */
+
+int SDLTest_Crc32Calc(SDLTest_Crc32Context * crcContext, CrcUint8 *inBuf, CrcUint32 inLen, CrcUint32 *crc32)
+{
+  if (SDLTest_Crc32CalcStart(crcContext,crc32)) {
+   return -1;
+  }
+
+  if (SDLTest_Crc32CalcBuffer(crcContext, inBuf, inLen, crc32)) {
+   return -1;
+  }
+
+  if (SDLTest_Crc32CalcEnd(crcContext, crc32)) {
+   return -1;
+  }
+
+  return 0;
+}
+
+/* Start crc calculation */
+
+int SDLTest_Crc32CalcStart(SDLTest_Crc32Context * crcContext, CrcUint32 *crc32)
+{
+  /* Sanity check pointers */
+  if (crcContext==NULL) {
+   *crc32=0;
+   return -1;
+  }
+
+  /*
+   * Preload shift register, per CRC-32 spec
+   */
+  *crc32 = 0xffffffff;
+
+  return 0;
+}
+
+/* Finish crc calculation */
+
+int SDLTest_Crc32CalcEnd(SDLTest_Crc32Context * crcContext, CrcUint32 *crc32)
+{
+  /* Sanity check pointers */
+  if (crcContext==NULL) {
+   *crc32=0;
+   return -1;
+  }
+
+  /*
+   * Return complement, per CRC-32 spec
+   */
+  *crc32 = (~(*crc32));
+
+  return 0;
+}
+
+/* Include memory block in crc */
+
+int SDLTest_Crc32CalcBuffer(SDLTest_Crc32Context * crcContext, CrcUint8 *inBuf, CrcUint32 inLen, CrcUint32 *crc32)
+{
+  CrcUint8    *p;
+  register CrcUint32    crc;
+
+  if (crcContext==NULL) {
+   *crc32=0;
+   return -1;
+  }
+
+  if (inBuf==NULL) {
+   return -1;
+  }
+
+  /*
+   * Calculate CRC from data
+   */
+  crc = *crc32;
+  for (p = inBuf; inLen > 0; ++p, --inLen) {
+#ifdef ORIGINAL_METHOD
+    crc = (crc << 8) ^ crcContext->crc32_table[(crc >> 24) ^ *p];
+#else
+    crc = ((crc >> 8) & 0x00FFFFFF) ^ crcContext->crc32_table[ (crc ^ *p) & 0xFF ];
+#endif
+  }
+  *crc32 = crc;
+
+  return 0;
+}
+
+int SDLTest_Crc32Done(SDLTest_Crc32Context * crcContext)
+{
+  if (crcContext==NULL) {
+     return -1;
+  }
+
+  return 0;
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_font.c b/Source/3rd Party/sdl/src/test/SDL_test_font.c
new file mode 100644
index 000000000..a6bc40cef
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_font.c	
@@ -0,0 +1,3238 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+/* ---- 8x8 font definition ---- */
+
+/* Originally part of SDL2_gfx */
+
+/* ZLIB (c) A. Schiffler 2012 */
+
+#define SDL_TESTFONTDATAMAX (8*256)
+
+static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
+
+    /*
+    * 0 0x00 '^@'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 1 0x01 '^A'
+    */
+    0x7e,           /* 01111110 */
+    0x81,           /* 10000001 */
+    0xa5,           /* 10100101 */
+    0x81,           /* 10000001 */
+    0xbd,           /* 10111101 */
+    0x99,           /* 10011001 */
+    0x81,           /* 10000001 */
+    0x7e,           /* 01111110 */
+
+    /*
+    * 2 0x02 '^B'
+    */
+    0x7e,           /* 01111110 */
+    0xff,           /* 11111111 */
+    0xdb,           /* 11011011 */
+    0xff,           /* 11111111 */
+    0xc3,           /* 11000011 */
+    0xe7,           /* 11100111 */
+    0xff,           /* 11111111 */
+    0x7e,           /* 01111110 */
+
+    /*
+    * 3 0x03 '^C'
+    */
+    0x6c,           /* 01101100 */
+    0xfe,           /* 11111110 */
+    0xfe,           /* 11111110 */
+    0xfe,           /* 11111110 */
+    0x7c,           /* 01111100 */
+    0x38,           /* 00111000 */
+    0x10,           /* 00010000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 4 0x04 '^D'
+    */
+    0x10,           /* 00010000 */
+    0x38,           /* 00111000 */
+    0x7c,           /* 01111100 */
+    0xfe,           /* 11111110 */
+    0x7c,           /* 01111100 */
+    0x38,           /* 00111000 */
+    0x10,           /* 00010000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 5 0x05 '^E'
+    */
+    0x38,           /* 00111000 */
+    0x7c,           /* 01111100 */
+    0x38,           /* 00111000 */
+    0xfe,           /* 11111110 */
+    0xfe,           /* 11111110 */
+    0xd6,           /* 11010110 */
+    0x10,           /* 00010000 */
+    0x38,           /* 00111000 */
+
+    /*
+    * 6 0x06 '^F'
+    */
+    0x10,           /* 00010000 */
+    0x38,           /* 00111000 */
+    0x7c,           /* 01111100 */
+    0xfe,           /* 11111110 */
+    0xfe,           /* 11111110 */
+    0x7c,           /* 01111100 */
+    0x10,           /* 00010000 */
+    0x38,           /* 00111000 */
+
+    /*
+    * 7 0x07 '^G'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 8 0x08 '^H'
+    */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xe7,           /* 11100111 */
+    0xc3,           /* 11000011 */
+    0xc3,           /* 11000011 */
+    0xe7,           /* 11100111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+
+    /*
+    * 9 0x09 '^I'
+    */
+    0x00,           /* 00000000 */
+    0x3c,           /* 00111100 */
+    0x66,           /* 01100110 */
+    0x42,           /* 01000010 */
+    0x42,           /* 01000010 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 10 0x0a '^J'
+    */
+    0xff,           /* 11111111 */
+    0xc3,           /* 11000011 */
+    0x99,           /* 10011001 */
+    0xbd,           /* 10111101 */
+    0xbd,           /* 10111101 */
+    0x99,           /* 10011001 */
+    0xc3,           /* 11000011 */
+    0xff,           /* 11111111 */
+
+    /*
+    * 11 0x0b '^K'
+    */
+    0x0f,           /* 00001111 */
+    0x07,           /* 00000111 */
+    0x0f,           /* 00001111 */
+    0x7d,           /* 01111101 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x78,           /* 01111000 */
+
+    /*
+    * 12 0x0c '^L'
+    */
+    0x3c,           /* 00111100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 13 0x0d '^M'
+    */
+    0x3f,           /* 00111111 */
+    0x33,           /* 00110011 */
+    0x3f,           /* 00111111 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x70,           /* 01110000 */
+    0xf0,           /* 11110000 */
+    0xe0,           /* 11100000 */
+
+    /*
+    * 14 0x0e '^N'
+    */
+    0x7f,           /* 01111111 */
+    0x63,           /* 01100011 */
+    0x7f,           /* 01111111 */
+    0x63,           /* 01100011 */
+    0x63,           /* 01100011 */
+    0x67,           /* 01100111 */
+    0xe6,           /* 11100110 */
+    0xc0,           /* 11000000 */
+
+    /*
+    * 15 0x0f '^O'
+    */
+    0x18,           /* 00011000 */
+    0xdb,           /* 11011011 */
+    0x3c,           /* 00111100 */
+    0xe7,           /* 11100111 */
+    0xe7,           /* 11100111 */
+    0x3c,           /* 00111100 */
+    0xdb,           /* 11011011 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 16 0x10 '^P'
+    */
+    0x80,           /* 10000000 */
+    0xe0,           /* 11100000 */
+    0xf8,           /* 11111000 */
+    0xfe,           /* 11111110 */
+    0xf8,           /* 11111000 */
+    0xe0,           /* 11100000 */
+    0x80,           /* 10000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 17 0x11 '^Q'
+    */
+    0x02,           /* 00000010 */
+    0x0e,           /* 00001110 */
+    0x3e,           /* 00111110 */
+    0xfe,           /* 11111110 */
+    0x3e,           /* 00111110 */
+    0x0e,           /* 00001110 */
+    0x02,           /* 00000010 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 18 0x12 '^R'
+    */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 19 0x13 '^S'
+    */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x00,           /* 00000000 */
+    0x66,           /* 01100110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 20 0x14 '^T'
+    */
+    0x7f,           /* 01111111 */
+    0xdb,           /* 11011011 */
+    0xdb,           /* 11011011 */
+    0x7b,           /* 01111011 */
+    0x1b,           /* 00011011 */
+    0x1b,           /* 00011011 */
+    0x1b,           /* 00011011 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 21 0x15 '^U'
+    */
+    0x3e,           /* 00111110 */
+    0x61,           /* 01100001 */
+    0x3c,           /* 00111100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0x86,           /* 10000110 */
+    0x7c,           /* 01111100 */
+
+    /*
+    * 22 0x16 '^V'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x7e,           /* 01111110 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 23 0x17 '^W'
+    */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0xff,           /* 11111111 */
+
+    /*
+    * 24 0x18 '^X'
+    */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 25 0x19 '^Y'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 26 0x1a '^Z'
+    */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0xfe,           /* 11111110 */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 27 0x1b '^['
+    */
+    0x00,           /* 00000000 */
+    0x30,           /* 00110000 */
+    0x60,           /* 01100000 */
+    0xfe,           /* 11111110 */
+    0x60,           /* 01100000 */
+    0x30,           /* 00110000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 28 0x1c '^\'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 29 0x1d '^]'
+    */
+    0x00,           /* 00000000 */
+    0x24,           /* 00100100 */
+    0x66,           /* 01100110 */
+    0xff,           /* 11111111 */
+    0x66,           /* 01100110 */
+    0x24,           /* 00100100 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 30 0x1e '^^'
+    */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x7e,           /* 01111110 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 31 0x1f '^_'
+    */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0x7e,           /* 01111110 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 32 0x20 ' '
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 33 0x21 '!'
+    */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 34 0x22 '"'
+    */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x24,           /* 00100100 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 35 0x23 '#'
+    */
+    0x6c,           /* 01101100 */
+    0x6c,           /* 01101100 */
+    0xfe,           /* 11111110 */
+    0x6c,           /* 01101100 */
+    0xfe,           /* 11111110 */
+    0x6c,           /* 01101100 */
+    0x6c,           /* 01101100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 36 0x24 '$'
+    */
+    0x18,           /* 00011000 */
+    0x3e,           /* 00111110 */
+    0x60,           /* 01100000 */
+    0x3c,           /* 00111100 */
+    0x06,           /* 00000110 */
+    0x7c,           /* 01111100 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 37 0x25 '%'
+    */
+    0x00,           /* 00000000 */
+    0xc6,           /* 11000110 */
+    0xcc,           /* 11001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x66,           /* 01100110 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 38 0x26 '&'
+    */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x76,           /* 01110110 */
+    0xdc,           /* 11011100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 39 0x27 '''
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 40 0x28 '('
+    */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 41 0x29 ')'
+    */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 42 0x2a '*'
+    */
+    0x00,           /* 00000000 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0xff,           /* 11111111 */
+    0x3c,           /* 00111100 */
+    0x66,           /* 01100110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 43 0x2b '+'
+    */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 44 0x2c ','
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+
+    /*
+    * 45 0x2d '-'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 46 0x2e '.'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 47 0x2f '/'
+    */
+    0x06,           /* 00000110 */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x60,           /* 01100000 */
+    0xc0,           /* 11000000 */
+    0x80,           /* 10000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 48 0x30 '0'
+    */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0xd6,           /* 11010110 */
+    0xc6,           /* 11000110 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 49 0x31 '1'
+    */
+    0x18,           /* 00011000 */
+    0x38,           /* 00111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 50 0x32 '2'
+    */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0x06,           /* 00000110 */
+    0x1c,           /* 00011100 */
+    0x30,           /* 00110000 */
+    0x66,           /* 01100110 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 51 0x33 '3'
+    */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0x06,           /* 00000110 */
+    0x3c,           /* 00111100 */
+    0x06,           /* 00000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 52 0x34 '4'
+    */
+    0x1c,           /* 00011100 */
+    0x3c,           /* 00111100 */
+    0x6c,           /* 01101100 */
+    0xcc,           /* 11001100 */
+    0xfe,           /* 11111110 */
+    0x0c,           /* 00001100 */
+    0x1e,           /* 00011110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 53 0x35 '5'
+    */
+    0xfe,           /* 11111110 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0xfc,           /* 11111100 */
+    0x06,           /* 00000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 54 0x36 '6'
+    */
+    0x38,           /* 00111000 */
+    0x60,           /* 01100000 */
+    0xc0,           /* 11000000 */
+    0xfc,           /* 11111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 55 0x37 '7'
+    */
+    0xfe,           /* 11111110 */
+    0xc6,           /* 11000110 */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 56 0x38 '8'
+    */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 57 0x39 '9'
+    */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7e,           /* 01111110 */
+    0x06,           /* 00000110 */
+    0x0c,           /* 00001100 */
+    0x78,           /* 01111000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 58 0x3a ':'
+    */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 59 0x3b ';'
+    */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+
+    /*
+    * 60 0x3c '<'
+    */
+    0x06,           /* 00000110 */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x06,           /* 00000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 61 0x3d '='
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 62 0x3e '>'
+    */
+    0x60,           /* 01100000 */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x60,           /* 01100000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 63 0x3f '?'
+    */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 64 0x40 '@'
+    */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xde,           /* 11011110 */
+    0xde,           /* 11011110 */
+    0xde,           /* 11011110 */
+    0xc0,           /* 11000000 */
+    0x78,           /* 01111000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 65 0x41 'A'
+    */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 66 0x42 'B'
+    */
+    0xfc,           /* 11111100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x7c,           /* 01111100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0xfc,           /* 11111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 67 0x43 'C'
+    */
+    0x3c,           /* 00111100 */
+    0x66,           /* 01100110 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 68 0x44 'D'
+    */
+    0xf8,           /* 11111000 */
+    0x6c,           /* 01101100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x6c,           /* 01101100 */
+    0xf8,           /* 11111000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 69 0x45 'E'
+    */
+    0xfe,           /* 11111110 */
+    0x62,           /* 01100010 */
+    0x68,           /* 01101000 */
+    0x78,           /* 01111000 */
+    0x68,           /* 01101000 */
+    0x62,           /* 01100010 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 70 0x46 'F'
+    */
+    0xfe,           /* 11111110 */
+    0x62,           /* 01100010 */
+    0x68,           /* 01101000 */
+    0x78,           /* 01111000 */
+    0x68,           /* 01101000 */
+    0x60,           /* 01100000 */
+    0xf0,           /* 11110000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 71 0x47 'G'
+    */
+    0x3c,           /* 00111100 */
+    0x66,           /* 01100110 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0xce,           /* 11001110 */
+    0x66,           /* 01100110 */
+    0x3a,           /* 00111010 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 72 0x48 'H'
+    */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 73 0x49 'I'
+    */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 74 0x4a 'J'
+    */
+    0x1e,           /* 00011110 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x78,           /* 01111000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 75 0x4b 'K'
+    */
+    0xe6,           /* 11100110 */
+    0x66,           /* 01100110 */
+    0x6c,           /* 01101100 */
+    0x78,           /* 01111000 */
+    0x6c,           /* 01101100 */
+    0x66,           /* 01100110 */
+    0xe6,           /* 11100110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 76 0x4c 'L'
+    */
+    0xf0,           /* 11110000 */
+    0x60,           /* 01100000 */
+    0x60,           /* 01100000 */
+    0x60,           /* 01100000 */
+    0x62,           /* 01100010 */
+    0x66,           /* 01100110 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 77 0x4d 'M'
+    */
+    0xc6,           /* 11000110 */
+    0xee,           /* 11101110 */
+    0xfe,           /* 11111110 */
+    0xfe,           /* 11111110 */
+    0xd6,           /* 11010110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 78 0x4e 'N'
+    */
+    0xc6,           /* 11000110 */
+    0xe6,           /* 11100110 */
+    0xf6,           /* 11110110 */
+    0xde,           /* 11011110 */
+    0xce,           /* 11001110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 79 0x4f 'O'
+    */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 80 0x50 'P'
+    */
+    0xfc,           /* 11111100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x7c,           /* 01111100 */
+    0x60,           /* 01100000 */
+    0x60,           /* 01100000 */
+    0xf0,           /* 11110000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 81 0x51 'Q'
+    */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xce,           /* 11001110 */
+    0x7c,           /* 01111100 */
+    0x0e,           /* 00001110 */
+
+    /*
+    * 82 0x52 'R'
+    */
+    0xfc,           /* 11111100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x7c,           /* 01111100 */
+    0x6c,           /* 01101100 */
+    0x66,           /* 01100110 */
+    0xe6,           /* 11100110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 83 0x53 'S'
+    */
+    0x3c,           /* 00111100 */
+    0x66,           /* 01100110 */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 84 0x54 'T'
+    */
+    0x7e,           /* 01111110 */
+    0x7e,           /* 01111110 */
+    0x5a,           /* 01011010 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 85 0x55 'U'
+    */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 86 0x56 'V'
+    */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 87 0x57 'W'
+    */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xd6,           /* 11010110 */
+    0xd6,           /* 11010110 */
+    0xfe,           /* 11111110 */
+    0x6c,           /* 01101100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 88 0x58 'X'
+    */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 89 0x59 'Y'
+    */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 90 0x5a 'Z'
+    */
+    0xfe,           /* 11111110 */
+    0xc6,           /* 11000110 */
+    0x8c,           /* 10001100 */
+    0x18,           /* 00011000 */
+    0x32,           /* 00110010 */
+    0x66,           /* 01100110 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 91 0x5b '['
+    */
+    0x3c,           /* 00111100 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 92 0x5c '\'
+    */
+    0xc0,           /* 11000000 */
+    0x60,           /* 01100000 */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x06,           /* 00000110 */
+    0x02,           /* 00000010 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 93 0x5d ']'
+    */
+    0x3c,           /* 00111100 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 94 0x5e '^'
+    */
+    0x10,           /* 00010000 */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 95 0x5f '_'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+
+    /*
+    * 96 0x60 '`'
+    */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 97 0x61 'a'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x78,           /* 01111000 */
+    0x0c,           /* 00001100 */
+    0x7c,           /* 01111100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 98 0x62 'b'
+    */
+    0xe0,           /* 11100000 */
+    0x60,           /* 01100000 */
+    0x7c,           /* 01111100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0xdc,           /* 11011100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 99 0x63 'c'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc0,           /* 11000000 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 100 0x64 'd'
+    */
+    0x1c,           /* 00011100 */
+    0x0c,           /* 00001100 */
+    0x7c,           /* 01111100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 101 0x65 'e'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc0,           /* 11000000 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 102 0x66 'f'
+    */
+    0x3c,           /* 00111100 */
+    0x66,           /* 01100110 */
+    0x60,           /* 01100000 */
+    0xf8,           /* 11111000 */
+    0x60,           /* 01100000 */
+    0x60,           /* 01100000 */
+    0xf0,           /* 11110000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 103 0x67 'g'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x76,           /* 01110110 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x7c,           /* 01111100 */
+    0x0c,           /* 00001100 */
+    0xf8,           /* 11111000 */
+
+    /*
+    * 104 0x68 'h'
+    */
+    0xe0,           /* 11100000 */
+    0x60,           /* 01100000 */
+    0x6c,           /* 01101100 */
+    0x76,           /* 01110110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0xe6,           /* 11100110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 105 0x69 'i'
+    */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x38,           /* 00111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 106 0x6a 'j'
+    */
+    0x06,           /* 00000110 */
+    0x00,           /* 00000000 */
+    0x06,           /* 00000110 */
+    0x06,           /* 00000110 */
+    0x06,           /* 00000110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+
+    /*
+    * 107 0x6b 'k'
+    */
+    0xe0,           /* 11100000 */
+    0x60,           /* 01100000 */
+    0x66,           /* 01100110 */
+    0x6c,           /* 01101100 */
+    0x78,           /* 01111000 */
+    0x6c,           /* 01101100 */
+    0xe6,           /* 11100110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 108 0x6c 'l'
+    */
+    0x38,           /* 00111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 109 0x6d 'm'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xec,           /* 11101100 */
+    0xfe,           /* 11111110 */
+    0xd6,           /* 11010110 */
+    0xd6,           /* 11010110 */
+    0xd6,           /* 11010110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 110 0x6e 'n'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xdc,           /* 11011100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 111 0x6f 'o'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 112 0x70 'p'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xdc,           /* 11011100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x7c,           /* 01111100 */
+    0x60,           /* 01100000 */
+    0xf0,           /* 11110000 */
+
+    /*
+    * 113 0x71 'q'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x76,           /* 01110110 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x7c,           /* 01111100 */
+    0x0c,           /* 00001100 */
+    0x1e,           /* 00011110 */
+
+    /*
+    * 114 0x72 'r'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xdc,           /* 11011100 */
+    0x76,           /* 01110110 */
+    0x60,           /* 01100000 */
+    0x60,           /* 01100000 */
+    0xf0,           /* 11110000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 115 0x73 's'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0xc0,           /* 11000000 */
+    0x7c,           /* 01111100 */
+    0x06,           /* 00000110 */
+    0xfc,           /* 11111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 116 0x74 't'
+    */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0xfc,           /* 11111100 */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x36,           /* 00110110 */
+    0x1c,           /* 00011100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 117 0x75 'u'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 118 0x76 'v'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 119 0x77 'w'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xc6,           /* 11000110 */
+    0xd6,           /* 11010110 */
+    0xd6,           /* 11010110 */
+    0xfe,           /* 11111110 */
+    0x6c,           /* 01101100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 120 0x78 'x'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xc6,           /* 11000110 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 121 0x79 'y'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7e,           /* 01111110 */
+    0x06,           /* 00000110 */
+    0xfc,           /* 11111100 */
+
+    /*
+    * 122 0x7a 'z'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x4c,           /* 01001100 */
+    0x18,           /* 00011000 */
+    0x32,           /* 00110010 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 123 0x7b '{'
+    */
+    0x0e,           /* 00001110 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x70,           /* 01110000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x0e,           /* 00001110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 124 0x7c '|'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 125 0x7d '}'
+    */
+    0x70,           /* 01110000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x0e,           /* 00001110 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x70,           /* 01110000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 126 0x7e '~'
+    */
+    0x76,           /* 01110110 */
+    0xdc,           /* 11011100 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 127 0x7f ''
+    */
+    0x00,           /* 00000000 */
+    0x10,           /* 00010000 */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 128 0x80 '�'
+    */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x0c,           /* 00001100 */
+    0x78,           /* 01111000 */
+
+    /*
+    * 129 0x81 '�'
+    */
+    0xcc,           /* 11001100 */
+    0x00,           /* 00000000 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 130 0x82 '�'
+    */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc0,           /* 11000000 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 131 0x83 '�'
+    */
+    0x7c,           /* 01111100 */
+    0x82,           /* 10000010 */
+    0x78,           /* 01111000 */
+    0x0c,           /* 00001100 */
+    0x7c,           /* 01111100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 132 0x84 '�'
+    */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+    0x78,           /* 01111000 */
+    0x0c,           /* 00001100 */
+    0x7c,           /* 01111100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 133 0x85 '�'
+    */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x78,           /* 01111000 */
+    0x0c,           /* 00001100 */
+    0x7c,           /* 01111100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 134 0x86 '�'
+    */
+    0x30,           /* 00110000 */
+    0x30,           /* 00110000 */
+    0x78,           /* 01111000 */
+    0x0c,           /* 00001100 */
+    0x7c,           /* 01111100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 135 0x87 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0x7e,           /* 01111110 */
+    0x0c,           /* 00001100 */
+    0x38,           /* 00111000 */
+
+    /*
+    * 136 0x88 '�'
+    */
+    0x7c,           /* 01111100 */
+    0x82,           /* 10000010 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc0,           /* 11000000 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 137 0x89 '�'
+    */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc0,           /* 11000000 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 138 0x8a '�'
+    */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc0,           /* 11000000 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 139 0x8b '�'
+    */
+    0x66,           /* 01100110 */
+    0x00,           /* 00000000 */
+    0x38,           /* 00111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 140 0x8c '�'
+    */
+    0x7c,           /* 01111100 */
+    0x82,           /* 10000010 */
+    0x38,           /* 00111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 141 0x8d '�'
+    */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x38,           /* 00111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 142 0x8e '�'
+    */
+    0xc6,           /* 11000110 */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 143 0x8f '�'
+    */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 144 0x90 '�'
+    */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0xfe,           /* 11111110 */
+    0xc0,           /* 11000000 */
+    0xf8,           /* 11111000 */
+    0xc0,           /* 11000000 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 145 0x91 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0xd8,           /* 11011000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 146 0x92 '�'
+    */
+    0x3e,           /* 00111110 */
+    0x6c,           /* 01101100 */
+    0xcc,           /* 11001100 */
+    0xfe,           /* 11111110 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xce,           /* 11001110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 147 0x93 '�'
+    */
+    0x7c,           /* 01111100 */
+    0x82,           /* 10000010 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 148 0x94 '�'
+    */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 149 0x95 '�'
+    */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 150 0x96 '�'
+    */
+    0x78,           /* 01111000 */
+    0x84,           /* 10000100 */
+    0x00,           /* 00000000 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 151 0x97 '�'
+    */
+    0x60,           /* 01100000 */
+    0x30,           /* 00110000 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 152 0x98 '�'
+    */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7e,           /* 01111110 */
+    0x06,           /* 00000110 */
+    0xfc,           /* 11111100 */
+
+    /*
+    * 153 0x99 '�'
+    */
+    0xc6,           /* 11000110 */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 154 0x9a '�'
+    */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 155 0x9b '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 156 0x9c '�'
+    */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0x64,           /* 01100100 */
+    0xf0,           /* 11110000 */
+    0x60,           /* 01100000 */
+    0x66,           /* 01100110 */
+    0xfc,           /* 11111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 157 0x9d '�'
+    */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 158 0x9e '�'
+    */
+    0xf8,           /* 11111000 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xfa,           /* 11111010 */
+    0xc6,           /* 11000110 */
+    0xcf,           /* 11001111 */
+    0xc6,           /* 11000110 */
+    0xc7,           /* 11000111 */
+
+    /*
+    * 159 0x9f '�'
+    */
+    0x0e,           /* 00001110 */
+    0x1b,           /* 00011011 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0xd8,           /* 11011000 */
+    0x70,           /* 01110000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 160 0xa0 '�'
+    */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x78,           /* 01111000 */
+    0x0c,           /* 00001100 */
+    0x7c,           /* 01111100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 161 0xa1 '�'
+    */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x38,           /* 00111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 162 0xa2 '�'
+    */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 163 0xa3 '�'
+    */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 164 0xa4 '�'
+    */
+    0x76,           /* 01110110 */
+    0xdc,           /* 11011100 */
+    0x00,           /* 00000000 */
+    0xdc,           /* 11011100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 165 0xa5 '�'
+    */
+    0x76,           /* 01110110 */
+    0xdc,           /* 11011100 */
+    0x00,           /* 00000000 */
+    0xe6,           /* 11100110 */
+    0xf6,           /* 11110110 */
+    0xde,           /* 11011110 */
+    0xce,           /* 11001110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 166 0xa6 '�'
+    */
+    0x3c,           /* 00111100 */
+    0x6c,           /* 01101100 */
+    0x6c,           /* 01101100 */
+    0x3e,           /* 00111110 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 167 0xa7 '�'
+    */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x00,           /* 00000000 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 168 0xa8 '�'
+    */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x63,           /* 01100011 */
+    0x3e,           /* 00111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 169 0xa9 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xfe,           /* 11111110 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 170 0xaa '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xfe,           /* 11111110 */
+    0x06,           /* 00000110 */
+    0x06,           /* 00000110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 171 0xab '�'
+    */
+    0x63,           /* 01100011 */
+    0xe6,           /* 11100110 */
+    0x6c,           /* 01101100 */
+    0x7e,           /* 01111110 */
+    0x33,           /* 00110011 */
+    0x66,           /* 01100110 */
+    0xcc,           /* 11001100 */
+    0x0f,           /* 00001111 */
+
+    /*
+    * 172 0xac '�'
+    */
+    0x63,           /* 01100011 */
+    0xe6,           /* 11100110 */
+    0x6c,           /* 01101100 */
+    0x7a,           /* 01111010 */
+    0x36,           /* 00110110 */
+    0x6a,           /* 01101010 */
+    0xdf,           /* 11011111 */
+    0x06,           /* 00000110 */
+
+    /*
+    * 173 0xad '�'
+    */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 174 0xae '�'
+    */
+    0x00,           /* 00000000 */
+    0x33,           /* 00110011 */
+    0x66,           /* 01100110 */
+    0xcc,           /* 11001100 */
+    0x66,           /* 01100110 */
+    0x33,           /* 00110011 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 175 0xaf '�'
+    */
+    0x00,           /* 00000000 */
+    0xcc,           /* 11001100 */
+    0x66,           /* 01100110 */
+    0x33,           /* 00110011 */
+    0x66,           /* 01100110 */
+    0xcc,           /* 11001100 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 176 0xb0 '�'
+    */
+    0x22,           /* 00100010 */
+    0x88,           /* 10001000 */
+    0x22,           /* 00100010 */
+    0x88,           /* 10001000 */
+    0x22,           /* 00100010 */
+    0x88,           /* 10001000 */
+    0x22,           /* 00100010 */
+    0x88,           /* 10001000 */
+
+    /*
+    * 177 0xb1 '�'
+    */
+    0x55,           /* 01010101 */
+    0xaa,           /* 10101010 */
+    0x55,           /* 01010101 */
+    0xaa,           /* 10101010 */
+    0x55,           /* 01010101 */
+    0xaa,           /* 10101010 */
+    0x55,           /* 01010101 */
+    0xaa,           /* 10101010 */
+
+    /*
+    * 178 0xb2 '�'
+    */
+    0x77,           /* 01110111 */
+    0xdd,           /* 11011101 */
+    0x77,           /* 01110111 */
+    0xdd,           /* 11011101 */
+    0x77,           /* 01110111 */
+    0xdd,           /* 11011101 */
+    0x77,           /* 01110111 */
+    0xdd,           /* 11011101 */
+
+    /*
+    * 179 0xb3 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 180 0xb4 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0xf8,           /* 11111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 181 0xb5 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0xf8,           /* 11111000 */
+    0x18,           /* 00011000 */
+    0xf8,           /* 11111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 182 0xb6 '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0xf6,           /* 11110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 183 0xb7 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xfe,           /* 11111110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 184 0xb8 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xf8,           /* 11111000 */
+    0x18,           /* 00011000 */
+    0xf8,           /* 11111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 185 0xb9 '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0xf6,           /* 11110110 */
+    0x06,           /* 00000110 */
+    0xf6,           /* 11110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 186 0xba '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 187 0xbb '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xfe,           /* 11111110 */
+    0x06,           /* 00000110 */
+    0xf6,           /* 11110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 188 0xbc '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0xf6,           /* 11110110 */
+    0x06,           /* 00000110 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 189 0xbd '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 190 0xbe '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0xf8,           /* 11111000 */
+    0x18,           /* 00011000 */
+    0xf8,           /* 11111000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 191 0xbf '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xf8,           /* 11111000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 192 0xc0 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x1f,           /* 00011111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 193 0xc1 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 194 0xc2 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 195 0xc3 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x1f,           /* 00011111 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 196 0xc4 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 197 0xc5 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0xff,           /* 11111111 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 198 0xc6 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x1f,           /* 00011111 */
+    0x18,           /* 00011000 */
+    0x1f,           /* 00011111 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 199 0xc7 '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x37,           /* 00110111 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 200 0xc8 '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x37,           /* 00110111 */
+    0x30,           /* 00110000 */
+    0x3f,           /* 00111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 201 0xc9 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x3f,           /* 00111111 */
+    0x30,           /* 00110000 */
+    0x37,           /* 00110111 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 202 0xca '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0xf7,           /* 11110111 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 203 0xcb '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0xf7,           /* 11110111 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 204 0xcc '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x37,           /* 00110111 */
+    0x30,           /* 00110000 */
+    0x37,           /* 00110111 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 205 0xcd '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 206 0xce '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0xf7,           /* 11110111 */
+    0x00,           /* 00000000 */
+    0xf7,           /* 11110111 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 207 0xcf '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 208 0xd0 '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 209 0xd1 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 210 0xd2 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 211 0xd3 '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x3f,           /* 00111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 212 0xd4 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x1f,           /* 00011111 */
+    0x18,           /* 00011000 */
+    0x1f,           /* 00011111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 213 0xd5 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x1f,           /* 00011111 */
+    0x18,           /* 00011000 */
+    0x1f,           /* 00011111 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 214 0xd6 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x3f,           /* 00111111 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 215 0xd7 '�'
+    */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0xff,           /* 11111111 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+
+    /*
+    * 216 0xd8 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0xff,           /* 11111111 */
+    0x18,           /* 00011000 */
+    0xff,           /* 11111111 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 217 0xd9 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0xf8,           /* 11111000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 218 0xda '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x1f,           /* 00011111 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 219 0xdb '�'
+    */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+
+    /*
+    * 220 0xdc '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+
+    /*
+    * 221 0xdd '�'
+    */
+    0xf0,           /* 11110000 */
+    0xf0,           /* 11110000 */
+    0xf0,           /* 11110000 */
+    0xf0,           /* 11110000 */
+    0xf0,           /* 11110000 */
+    0xf0,           /* 11110000 */
+    0xf0,           /* 11110000 */
+    0xf0,           /* 11110000 */
+
+    /*
+    * 222 0xde '�'
+    */
+    0x0f,           /* 00001111 */
+    0x0f,           /* 00001111 */
+    0x0f,           /* 00001111 */
+    0x0f,           /* 00001111 */
+    0x0f,           /* 00001111 */
+    0x0f,           /* 00001111 */
+    0x0f,           /* 00001111 */
+    0x0f,           /* 00001111 */
+
+    /*
+    * 223 0xdf '�'
+    */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0xff,           /* 11111111 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 224 0xe0 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x76,           /* 01110110 */
+    0xdc,           /* 11011100 */
+    0xc8,           /* 11001000 */
+    0xdc,           /* 11011100 */
+    0x76,           /* 01110110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 225 0xe1 '�'
+    */
+    0x78,           /* 01111000 */
+    0xcc,           /* 11001100 */
+    0xcc,           /* 11001100 */
+    0xd8,           /* 11011000 */
+    0xcc,           /* 11001100 */
+    0xc6,           /* 11000110 */
+    0xcc,           /* 11001100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 226 0xe2 '�'
+    */
+    0xfe,           /* 11111110 */
+    0xc6,           /* 11000110 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0xc0,           /* 11000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 227 0xe3 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0xfe,           /* 11111110 */
+    0x6c,           /* 01101100 */
+    0x6c,           /* 01101100 */
+    0x6c,           /* 01101100 */
+    0x6c,           /* 01101100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 228 0xe4 '�'
+    */
+    0xfe,           /* 11111110 */
+    0xc6,           /* 11000110 */
+    0x60,           /* 01100000 */
+    0x30,           /* 00110000 */
+    0x60,           /* 01100000 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 229 0xe5 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0xd8,           /* 11011000 */
+    0xd8,           /* 11011000 */
+    0xd8,           /* 11011000 */
+    0x70,           /* 01110000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 230 0xe6 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x7c,           /* 01111100 */
+    0xc0,           /* 11000000 */
+
+    /*
+    * 231 0xe7 '�'
+    */
+    0x00,           /* 00000000 */
+    0x76,           /* 01110110 */
+    0xdc,           /* 11011100 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 232 0xe8 '�'
+    */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x3c,           /* 00111100 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+
+    /*
+    * 233 0xe9 '�'
+    */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0xfe,           /* 11111110 */
+    0xc6,           /* 11000110 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 234 0xea '�'
+    */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x6c,           /* 01101100 */
+    0x6c,           /* 01101100 */
+    0xee,           /* 11101110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 235 0xeb '�'
+    */
+    0x0e,           /* 00001110 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x3e,           /* 00111110 */
+    0x66,           /* 01100110 */
+    0x66,           /* 01100110 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 236 0xec '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0xdb,           /* 11011011 */
+    0xdb,           /* 11011011 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 237 0xed '�'
+    */
+    0x06,           /* 00000110 */
+    0x0c,           /* 00001100 */
+    0x7e,           /* 01111110 */
+    0xdb,           /* 11011011 */
+    0xdb,           /* 11011011 */
+    0x7e,           /* 01111110 */
+    0x60,           /* 01100000 */
+    0xc0,           /* 11000000 */
+
+    /*
+    * 238 0xee '�'
+    */
+    0x1e,           /* 00011110 */
+    0x30,           /* 00110000 */
+    0x60,           /* 01100000 */
+    0x7e,           /* 01111110 */
+    0x60,           /* 01100000 */
+    0x30,           /* 00110000 */
+    0x1e,           /* 00011110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 239 0xef '�'
+    */
+    0x00,           /* 00000000 */
+    0x7c,           /* 01111100 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0xc6,           /* 11000110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 240 0xf0 '�'
+    */
+    0x00,           /* 00000000 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+    0xfe,           /* 11111110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 241 0xf1 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x7e,           /* 01111110 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 242 0xf2 '�'
+    */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 243 0xf3 '�'
+    */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x18,           /* 00011000 */
+    0x0c,           /* 00001100 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 244 0xf4 '�'
+    */
+    0x0e,           /* 00001110 */
+    0x1b,           /* 00011011 */
+    0x1b,           /* 00011011 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+
+    /*
+    * 245 0xf5 '�'
+    */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0xd8,           /* 11011000 */
+    0xd8,           /* 11011000 */
+    0x70,           /* 01110000 */
+
+    /*
+    * 246 0xf6 '�'
+    */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x7e,           /* 01111110 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 247 0xf7 '�'
+    */
+    0x00,           /* 00000000 */
+    0x76,           /* 01110110 */
+    0xdc,           /* 11011100 */
+    0x00,           /* 00000000 */
+    0x76,           /* 01110110 */
+    0xdc,           /* 11011100 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 248 0xf8 '�'
+    */
+    0x38,           /* 00111000 */
+    0x6c,           /* 01101100 */
+    0x6c,           /* 01101100 */
+    0x38,           /* 00111000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 249 0xf9 '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 250 0xfa '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x18,           /* 00011000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 251 0xfb '�'
+    */
+    0x0f,           /* 00001111 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0x0c,           /* 00001100 */
+    0xec,           /* 11101100 */
+    0x6c,           /* 01101100 */
+    0x3c,           /* 00111100 */
+    0x1c,           /* 00011100 */
+
+    /*
+    * 252 0xfc '�'
+    */
+    0x6c,           /* 01101100 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x36,           /* 00110110 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 253 0xfd '�'
+    */
+    0x78,           /* 01111000 */
+    0x0c,           /* 00001100 */
+    0x18,           /* 00011000 */
+    0x30,           /* 00110000 */
+    0x7c,           /* 01111100 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 254 0xfe '�'
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x3c,           /* 00111100 */
+    0x3c,           /* 00111100 */
+    0x3c,           /* 00111100 */
+    0x3c,           /* 00111100 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+    /*
+    * 255 0xff ' '
+    */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+    0x00,           /* 00000000 */
+
+};
+
+
+/* ---- Character */
+
+/*!
+\brief Global cache for 8x8 pixel font textures created at runtime.
+*/
+static SDL_Texture *SDLTest_CharTextureCache[256];
+
+int SDLTest_DrawCharacter(SDL_Renderer *renderer, int x, int y, char c)
+{
+	const Uint32 charWidth = FONT_CHARACTER_SIZE;
+	const Uint32 charHeight = FONT_CHARACTER_SIZE;
+	const Uint32 charSize = FONT_CHARACTER_SIZE;
+    SDL_Rect srect;
+    SDL_Rect drect;
+    int result;
+    Uint32 ix, iy;
+    const unsigned char *charpos;
+    Uint8 *curpos;
+    Uint8 patt, mask;
+    Uint8 *linepos;
+    Uint32 pitch;
+    SDL_Surface *character;
+    Uint32 ci;
+    Uint8 r, g, b, a;
+
+    /*
+    * Setup source rectangle
+    */
+    srect.x = 0;
+    srect.y = 0;
+    srect.w = charWidth;
+    srect.h = charHeight;
+
+    /*
+    * Setup destination rectangle
+    */
+    drect.x = x;
+    drect.y = y;
+    drect.w = charWidth;
+    drect.h = charHeight;
+
+    /* Character index in cache */
+    ci = (unsigned char)c;
+
+    /*
+    * Create new charWidth x charHeight bitmap surface if not already present.
+    */
+    if (SDLTest_CharTextureCache[ci] == NULL) {
+        /*
+        * Redraw character into surface
+        */
+        character = SDL_CreateRGBSurface(SDL_SWSURFACE,
+            charWidth, charHeight, 32,
+            0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
+        if (character == NULL) {
+            return (-1);
+        }
+
+        charpos = SDLTest_FontData + ci * charSize;
+        linepos = (Uint8 *)character->pixels;
+        pitch = character->pitch;
+
+        /*
+        * Drawing loop
+        */
+        patt = 0;
+        for (iy = 0; iy < charWidth; iy++) {
+            mask = 0x00;
+            curpos = linepos;
+            for (ix = 0; ix < charWidth; ix++) {
+                if (!(mask >>= 1)) {
+                    patt = *charpos++;
+                    mask = 0x80;
+                }
+                if (patt & mask) {
+                    *(Uint32 *)curpos = 0xffffffff;
+                } else {
+                    *(Uint32 *)curpos = 0;
+                }
+                curpos += 4;
+            }
+            linepos += pitch;
+        }
+
+        /* Convert temp surface into texture */
+        SDLTest_CharTextureCache[ci] = SDL_CreateTextureFromSurface(renderer, character);
+        SDL_FreeSurface(character);
+
+        /*
+        * Check pointer
+        */
+        if (SDLTest_CharTextureCache[ci] == NULL) {
+            return (-1);
+        }
+    }
+
+    /*
+    * Set color
+    */
+    result = 0;
+    result |= SDL_GetRenderDrawColor(renderer, &r, &g, &b, &a);
+    result |= SDL_SetTextureColorMod(SDLTest_CharTextureCache[ci], r, g, b);
+    result |= SDL_SetTextureAlphaMod(SDLTest_CharTextureCache[ci], a);
+
+    /*
+    * Draw texture onto destination
+    */
+    result |= SDL_RenderCopy(renderer, SDLTest_CharTextureCache[ci], &srect, &drect);
+
+    return (result);
+}
+
+int SDLTest_DrawString(SDL_Renderer * renderer, int x, int y, const char *s)
+{
+	const Uint32 charWidth = FONT_CHARACTER_SIZE;
+    int result = 0;
+    int curx = x;
+    int cury = y;
+    const char *curchar = s;
+
+    while (*curchar && !result) {
+        result |= SDLTest_DrawCharacter(renderer, curx, cury, *curchar);
+        curx += charWidth;
+        curchar++;
+    }
+
+    return (result);
+}
+
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_fuzzer.c b/Source/3rd Party/sdl/src/test/SDL_test_fuzzer.c
new file mode 100644
index 000000000..963fc10b8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_fuzzer.c	
@@ -0,0 +1,524 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+
+  Data generators for fuzzing test data in a reproducible way.
+
+*/
+
+#include "SDL_config.h"
+
+/* Visual Studio 2008 doesn't have stdint.h */
+#if defined(_MSC_VER) && _MSC_VER <= 1500
+#define UINT8_MAX   ~(Uint8)0
+#define UINT16_MAX  ~(Uint16)0
+#define UINT32_MAX  ~(Uint32)0
+#define UINT64_MAX  ~(Uint64)0
+#else
+#include <stdint.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <float.h>
+
+#include "SDL_test.h"
+
+/**
+ * Counter for fuzzer invocations
+ */
+static int fuzzerInvocationCounter = 0;
+
+/**
+ * Context for shared random number generator
+ */
+static SDLTest_RandomContext rndContext;
+
+/*
+ * Note: doxygen documentation markup for functions is in the header file.
+ */
+
+void
+SDLTest_FuzzerInit(Uint64 execKey)
+{
+    Uint32 a = (execKey >> 32) & 0x00000000FFFFFFFF;
+    Uint32 b = execKey & 0x00000000FFFFFFFF;
+    SDL_memset((void *)&rndContext, 0, sizeof(SDLTest_RandomContext));
+    SDLTest_RandomInit(&rndContext, a, b);
+    fuzzerInvocationCounter = 0;
+}
+
+int
+SDLTest_GetFuzzerInvocationCount()
+{
+    return fuzzerInvocationCounter;
+}
+
+Uint8
+SDLTest_RandomUint8()
+{
+    fuzzerInvocationCounter++;
+
+    return (Uint8) SDLTest_RandomInt(&rndContext) & 0x000000FF;
+}
+
+Sint8
+SDLTest_RandomSint8()
+{
+    fuzzerInvocationCounter++;
+
+    return (Sint8) SDLTest_RandomInt(&rndContext) & 0x000000FF;
+}
+
+Uint16
+SDLTest_RandomUint16()
+{
+    fuzzerInvocationCounter++;
+
+    return (Uint16) SDLTest_RandomInt(&rndContext) & 0x0000FFFF;
+}
+
+Sint16
+SDLTest_RandomSint16()
+{
+    fuzzerInvocationCounter++;
+
+    return (Sint16) SDLTest_RandomInt(&rndContext) & 0x0000FFFF;
+}
+
+Sint32
+SDLTest_RandomSint32()
+{
+    fuzzerInvocationCounter++;
+
+    return (Sint32) SDLTest_RandomInt(&rndContext);
+}
+
+Uint32
+SDLTest_RandomUint32()
+{
+    fuzzerInvocationCounter++;
+
+    return (Uint32) SDLTest_RandomInt(&rndContext);
+}
+
+Uint64
+SDLTest_RandomUint64()
+{
+    Uint64 value = 0;
+    Uint32 *vp = (void *)&value;
+
+    fuzzerInvocationCounter++;
+
+    vp[0] = SDLTest_RandomSint32();
+    vp[1] = SDLTest_RandomSint32();
+
+    return value;
+}
+
+Sint64
+SDLTest_RandomSint64()
+{
+    Uint64 value = 0;
+    Uint32 *vp = (void *)&value;
+
+    fuzzerInvocationCounter++;
+
+    vp[0] = SDLTest_RandomSint32();
+    vp[1] = SDLTest_RandomSint32();
+
+    return value;
+}
+
+
+
+Sint32
+SDLTest_RandomIntegerInRange(Sint32 pMin, Sint32 pMax)
+{
+    Sint64 min = pMin;
+    Sint64 max = pMax;
+    Sint64 temp;
+    Sint64 number;
+
+    if(pMin > pMax) {
+        temp = min;
+        min = max;
+        max = temp;
+    } else if(pMin == pMax) {
+        return (Sint32)min;
+    }
+
+    number = SDLTest_RandomUint32();
+    /* invocation count increment in preceeding call */
+
+    return (Sint32)((number % ((max + 1) - min)) + min);
+}
+
+/* !
+ * Generates a unsigned boundary value between the given boundaries.
+ * Boundary values are inclusive. See the examples below.
+ * If boundary2 < boundary1, the values are swapped.
+ * If boundary1 == boundary2, value of boundary1 will be returned
+ *
+ * Generating boundary values for Uint8:
+ * BoundaryValues(UINT8_MAX, 10, 20, True) -> [10,11,19,20]
+ * BoundaryValues(UINT8_MAX, 10, 20, False) -> [9,21]
+ * BoundaryValues(UINT8_MAX, 0, 15, True) -> [0, 1, 14, 15]
+ * BoundaryValues(UINT8_MAX, 0, 15, False) -> [16]
+ * BoundaryValues(UINT8_MAX, 0, 0xFF, False) -> [0], error set
+ *
+ * Generator works the same for other types of unsigned integers.
+ *
+ * \param maxValue The biggest value that is acceptable for this data type.
+ *                  For instance, for Uint8 -> 255, Uint16 -> 65536 etc.
+ * \param boundary1 defines lower boundary
+ * \param boundary2 defines upper boundary
+ * \param validDomain Generate only for valid domain (for the data type)
+ *
+ * \returns Returns a random boundary value for the domain or 0 in case of error
+ */
+Uint64
+SDLTest_GenerateUnsignedBoundaryValues(const Uint64 maxValue, Uint64 boundary1, Uint64 boundary2, SDL_bool validDomain)
+{
+        Uint64 b1, b2;
+    Uint64 delta;
+    Uint64 tempBuf[4];
+    Uint8 index;
+
+        /* Maybe swap */
+    if (boundary1 > boundary2) {
+        b1 = boundary2;
+        b2 = boundary1;
+    } else {
+        b1 = boundary1;
+        b2 = boundary2;
+        }
+
+    index = 0;
+    if (validDomain == SDL_TRUE) {
+            if (b1 == b2) {
+                return b1;
+            }
+
+            /* Generate up to 4 values within bounds */
+            delta = b2 - b1;
+            if (delta < 4) {
+                do {
+                tempBuf[index] = b1 + index;
+                index++;
+                    } while (index < delta);
+            } else {
+          tempBuf[index] = b1;
+          index++;
+          tempBuf[index] = b1 + 1;
+          index++;
+          tempBuf[index] = b2 - 1;
+          index++;
+          tempBuf[index] = b2;
+          index++;
+            }
+        } else {
+            /* Generate up to 2 values outside of bounds */
+        if (b1 > 0) {
+            tempBuf[index] = b1 - 1;
+            index++;
+        }
+
+        if (b2 < maxValue) {
+            tempBuf[index] = b2 + 1;
+            index++;
+        }
+    }
+
+    if (index == 0) {
+        /* There are no valid boundaries */
+        SDL_Unsupported();
+        return 0;
+    }
+
+    return tempBuf[SDLTest_RandomUint8() % index];
+}
+
+
+Uint8
+SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_bool validDomain)
+{
+    /* max value for Uint8 */
+    const Uint64 maxValue = UCHAR_MAX;
+    return (Uint8)SDLTest_GenerateUnsignedBoundaryValues(maxValue,
+                (Uint64) boundary1, (Uint64) boundary2,
+                validDomain);
+}
+
+Uint16
+SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL_bool validDomain)
+{
+    /* max value for Uint16 */
+    const Uint64 maxValue = USHRT_MAX;
+    return (Uint16)SDLTest_GenerateUnsignedBoundaryValues(maxValue,
+                (Uint64) boundary1, (Uint64) boundary2,
+                validDomain);
+}
+
+Uint32
+SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL_bool validDomain)
+{
+    /* max value for Uint32 */
+    #if ((ULONG_MAX) == (UINT_MAX))
+      const Uint64 maxValue = ULONG_MAX;
+        #else
+      const Uint64 maxValue = UINT_MAX;
+        #endif
+    return (Uint32)SDLTest_GenerateUnsignedBoundaryValues(maxValue,
+                (Uint64) boundary1, (Uint64) boundary2,
+                validDomain);
+}
+
+Uint64
+SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL_bool validDomain)
+{
+    /* max value for Uint64 */
+    const Uint64 maxValue = ULLONG_MAX;
+    return SDLTest_GenerateUnsignedBoundaryValues(maxValue,
+                (Uint64) boundary1, (Uint64) boundary2,
+                validDomain);
+}
+
+/* !
+ * Generates a signed boundary value between the given boundaries.
+ * Boundary values are inclusive. See the examples below.
+ * If boundary2 < boundary1, the values are swapped.
+ * If boundary1 == boundary2, value of boundary1 will be returned
+ *
+ * Generating boundary values for Sint8:
+ * SignedBoundaryValues(SCHAR_MIN, SCHAR_MAX, -10, 20, True) -> [-10,-9,19,20]
+ * SignedBoundaryValues(SCHAR_MIN, SCHAR_MAX, -10, 20, False) -> [-11,21]
+ * SignedBoundaryValues(SCHAR_MIN, SCHAR_MAX, -30, -15, True) -> [-30, -29, -16, -15]
+ * SignedBoundaryValues(SCHAR_MIN, SCHAR_MAX, -127, 15, False) -> [16]
+ * SignedBoundaryValues(SCHAR_MIN, SCHAR_MAX, -127, 127, False) -> [0], error set
+ *
+ * Generator works the same for other types of signed integers.
+ *
+ * \param minValue The smallest value that is acceptable for this data type.
+ *                  For instance, for Uint8 -> -127, etc.
+ * \param maxValue The biggest value that is acceptable for this data type.
+ *                  For instance, for Uint8 -> 127, etc.
+ * \param boundary1 defines lower boundary
+ * \param boundary2 defines upper boundary
+ * \param validDomain Generate only for valid domain (for the data type)
+ *
+ * \returns Returns a random boundary value for the domain or 0 in case of error
+ */
+Sint64
+SDLTest_GenerateSignedBoundaryValues(const Sint64 minValue, const Sint64 maxValue, Sint64 boundary1, Sint64 boundary2, SDL_bool validDomain)
+{
+        Sint64 b1, b2;
+    Sint64 delta;
+    Sint64 tempBuf[4];
+    Uint8 index;
+
+        /* Maybe swap */
+    if (boundary1 > boundary2) {
+        b1 = boundary2;
+        b2 = boundary1;
+    } else {
+        b1 = boundary1;
+        b2 = boundary2;
+        }
+
+    index = 0;
+    if (validDomain == SDL_TRUE) {
+            if (b1 == b2) {
+                return b1;
+            }
+
+            /* Generate up to 4 values within bounds */
+            delta = b2 - b1;
+            if (delta < 4) {
+                do {
+                tempBuf[index] = b1 + index;
+                index++;
+                    } while (index < delta);
+            } else {
+          tempBuf[index] = b1;
+          index++;
+          tempBuf[index] = b1 + 1;
+          index++;
+          tempBuf[index] = b2 - 1;
+          index++;
+          tempBuf[index] = b2;
+          index++;
+            }
+        } else {
+            /* Generate up to 2 values outside of bounds */
+        if (b1 > minValue) {
+            tempBuf[index] = b1 - 1;
+            index++;
+        }
+
+        if (b2 < maxValue) {
+            tempBuf[index] = b2 + 1;
+            index++;
+        }
+    }
+
+    if (index == 0) {
+        /* There are no valid boundaries */
+        SDL_Unsupported();
+        return minValue;
+    }
+
+    return tempBuf[SDLTest_RandomUint8() % index];
+}
+
+
+Sint8
+SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_bool validDomain)
+{
+    /* min & max values for Sint8 */
+    const Sint64 maxValue = SCHAR_MAX;
+    const Sint64 minValue = SCHAR_MIN;
+    return (Sint8)SDLTest_GenerateSignedBoundaryValues(minValue, maxValue,
+                (Sint64) boundary1, (Sint64) boundary2,
+                validDomain);
+}
+
+Sint16
+SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL_bool validDomain)
+{
+    /* min & max values for Sint16 */
+    const Sint64 maxValue = SHRT_MAX;
+    const Sint64 minValue = SHRT_MIN;
+    return (Sint16)SDLTest_GenerateSignedBoundaryValues(minValue, maxValue,
+                (Sint64) boundary1, (Sint64) boundary2,
+                validDomain);
+}
+
+Sint32
+SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL_bool validDomain)
+{
+    /* min & max values for Sint32 */
+    #if ((ULONG_MAX) == (UINT_MAX))
+      const Sint64 maxValue = LONG_MAX;
+      const Sint64 minValue = LONG_MIN;
+        #else
+      const Sint64 maxValue = INT_MAX;
+      const Sint64 minValue = INT_MIN;
+        #endif
+    return (Sint32)SDLTest_GenerateSignedBoundaryValues(minValue, maxValue,
+                (Sint64) boundary1, (Sint64) boundary2,
+                validDomain);
+}
+
+Sint64
+SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL_bool validDomain)
+{
+    /* min & max values for Sint64 */
+    const Sint64 maxValue = LLONG_MAX;
+    const Sint64 minValue = LLONG_MIN;
+    return SDLTest_GenerateSignedBoundaryValues(minValue, maxValue,
+                boundary1, boundary2,
+                validDomain);
+}
+
+float
+SDLTest_RandomUnitFloat()
+{
+    return (float) SDLTest_RandomUint32() / UINT_MAX;
+}
+
+float
+SDLTest_RandomFloat()
+{
+        return (float) (SDLTest_RandomUnitDouble() * (double)2.0 * (double)FLT_MAX - (double)(FLT_MAX));
+}
+
+double
+SDLTest_RandomUnitDouble()
+{
+    return (double) (SDLTest_RandomUint64() >> 11) * (1.0/9007199254740992.0);
+}
+
+double
+SDLTest_RandomDouble()
+{
+    double r = 0.0;
+    double s = 1.0;
+    do {
+      s /= UINT_MAX + 1.0;
+      r += (double)SDLTest_RandomInt(&rndContext) * s;
+    } while (s > DBL_EPSILON);
+
+    fuzzerInvocationCounter++;
+
+    return r;
+}
+
+
+char *
+SDLTest_RandomAsciiString()
+{
+    return SDLTest_RandomAsciiStringWithMaximumLength(255);
+}
+
+char *
+SDLTest_RandomAsciiStringWithMaximumLength(int maxLength)
+{
+    int size;
+
+    if(maxLength < 1) {
+                SDL_InvalidParamError("maxLength");
+        return NULL;
+    }
+
+    size = (SDLTest_RandomUint32() % (maxLength + 1));
+
+    return SDLTest_RandomAsciiStringOfSize(size);
+}
+
+char *
+SDLTest_RandomAsciiStringOfSize(int size)
+{
+    char *string;
+    int counter;
+
+
+    if(size < 1) {
+                SDL_InvalidParamError("size");
+        return NULL;
+    }
+
+    string = (char *)SDL_malloc((size + 1) * sizeof(char));
+    if (string==NULL) {
+      return NULL;
+        }
+
+    for(counter = 0; counter < size; ++counter) {
+        string[counter] = (char)SDLTest_RandomIntegerInRange(32, 126);
+    }
+
+    string[counter] = '\0';
+
+    fuzzerInvocationCounter++;
+
+    return string;
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_harness.c b/Source/3rd Party/sdl/src/test/SDL_test_harness.c
new file mode 100644
index 000000000..93f8dd703
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_harness.c	
@@ -0,0 +1,675 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+/* Invalid test name/description message format */
+const char *SDLTest_InvalidNameFormat = "(Invalid)";
+
+/* Log summary message format */
+const char *SDLTest_LogSummaryFormat = "%s Summary: Total=%d Passed=%d Failed=%d Skipped=%d";
+
+/* Final result message format */
+const char *SDLTest_FinalResultFormat = ">>> %s '%s': %s\n";
+
+/* ! \brief Timeout for single test case execution */
+static Uint32 SDLTest_TestCaseTimeout = 3600;
+
+/**
+* Generates a random run seed string for the harness. The generated seed
+* will contain alphanumeric characters (0-9A-Z).
+*
+* Note: The returned string needs to be deallocated by the caller.
+*
+* \param length The length of the seed string to generate
+*
+* \returns The generated seed string
+*/
+char *
+SDLTest_GenerateRunSeed(const int length)
+{
+    char *seed = NULL;
+    SDLTest_RandomContext randomContext;
+    int counter;
+
+    /* Sanity check input */
+    if (length <= 0) {
+        SDLTest_LogError("The length of the harness seed must be >0.");
+        return NULL;
+    }
+
+    /* Allocate output buffer */
+    seed = (char *)SDL_malloc((length + 1) * sizeof(char));
+    if (seed == NULL) {
+        SDLTest_LogError("SDL_malloc for run seed output buffer failed.");
+        SDL_Error(SDL_ENOMEM);
+        return NULL;
+    }
+
+    /* Generate a random string of alphanumeric characters */
+    SDLTest_RandomInitTime(&randomContext);
+    for (counter = 0; counter < length; counter++) {
+        unsigned int number = SDLTest_Random(&randomContext);
+        char ch = (char) (number % (91 - 48)) + 48;
+        if (ch >= 58 && ch <= 64) {
+            ch = 65;
+        }
+        seed[counter] = ch;
+    }
+    seed[length] = '\0';
+
+    return seed;
+}
+
+/**
+* Generates an execution key for the fuzzer.
+*
+* \param runSeed        The run seed to use
+* \param suiteName      The name of the test suite
+* \param testName       The name of the test
+* \param iteration      The iteration count
+*
+* \returns The generated execution key to initialize the fuzzer with.
+*
+*/
+Uint64
+SDLTest_GenerateExecKey(char *runSeed, char *suiteName, char *testName, int iteration)
+{
+    SDLTest_Md5Context md5Context;
+    Uint64 *keys;
+    char iterationString[16];
+    Uint32 runSeedLength;
+    Uint32 suiteNameLength;
+    Uint32 testNameLength;
+    Uint32 iterationStringLength;
+    Uint32 entireStringLength;
+    char *buffer;
+
+    if (runSeed == NULL || runSeed[0] == '\0') {
+        SDLTest_LogError("Invalid runSeed string.");
+        return -1;
+    }
+
+    if (suiteName == NULL || suiteName[0] == '\0') {
+        SDLTest_LogError("Invalid suiteName string.");
+        return -1;
+    }
+
+    if (testName == NULL || testName[0] == '\0') {
+        SDLTest_LogError("Invalid testName string.");
+        return -1;
+    }
+
+    if (iteration <= 0) {
+        SDLTest_LogError("Invalid iteration count.");
+        return -1;
+    }
+
+    /* Convert iteration number into a string */
+    SDL_memset(iterationString, 0, sizeof(iterationString));
+    SDL_snprintf(iterationString, sizeof(iterationString) - 1, "%d", iteration);
+
+    /* Combine the parameters into single string */
+    runSeedLength = SDL_strlen(runSeed);
+    suiteNameLength = SDL_strlen(suiteName);
+    testNameLength = SDL_strlen(testName);
+    iterationStringLength = SDL_strlen(iterationString);
+    entireStringLength  = runSeedLength + suiteNameLength + testNameLength + iterationStringLength + 1;
+    buffer = (char *)SDL_malloc(entireStringLength);
+    if (buffer == NULL) {
+        SDLTest_LogError("Failed to allocate buffer for execKey generation.");
+        SDL_Error(SDL_ENOMEM);
+        return 0;
+    }
+    SDL_snprintf(buffer, entireStringLength, "%s%s%s%d", runSeed, suiteName, testName, iteration);
+
+    /* Hash string and use half of the digest as 64bit exec key */
+    SDLTest_Md5Init(&md5Context);
+    SDLTest_Md5Update(&md5Context, (unsigned char *)buffer, entireStringLength);
+    SDLTest_Md5Final(&md5Context);
+    SDL_free(buffer);
+    keys = (Uint64 *)md5Context.digest;
+
+    return keys[0];
+}
+
+/**
+* \brief Set timeout handler for test.
+*
+* Note: SDL_Init(SDL_INIT_TIMER) will be called if it wasn't done so before.
+*
+* \param timeout Timeout interval in seconds.
+* \param callback Function that will be called after timeout has elapsed.
+*
+* \return Timer id or -1 on failure.
+*/
+SDL_TimerID
+SDLTest_SetTestTimeout(int timeout, void (*callback)())
+{
+    Uint32 timeoutInMilliseconds;
+    SDL_TimerID timerID;
+
+    if (callback == NULL) {
+        SDLTest_LogError("Timeout callback can't be NULL");
+        return -1;
+    }
+
+    if (timeout < 0) {
+        SDLTest_LogError("Timeout value must be bigger than zero.");
+        return -1;
+    }
+
+    /* Init SDL timer if not initialized before */
+    if (SDL_WasInit(SDL_INIT_TIMER) == 0) {
+        if (SDL_InitSubSystem(SDL_INIT_TIMER)) {
+            SDLTest_LogError("Failed to init timer subsystem: %s", SDL_GetError());
+            return -1;
+        }
+    }
+
+    /* Set timer */
+    timeoutInMilliseconds = timeout * 1000;
+    timerID = SDL_AddTimer(timeoutInMilliseconds, (SDL_TimerCallback)callback, 0x0);
+    if (timerID == 0) {
+        SDLTest_LogError("Creation of SDL timer failed: %s", SDL_GetError());
+        return -1;
+    }
+
+    return timerID;
+}
+
+/**
+* \brief Timeout handler. Aborts test run and exits harness process.
+*/
+void
+    SDLTest_BailOut()
+{
+    SDLTest_LogError("TestCaseTimeout timer expired. Aborting test run.");
+    exit(TEST_ABORTED); /* bail out from the test */
+}
+
+/**
+* \brief Execute a test using the given execution key.
+*
+* \param testSuite Suite containing the test case.
+* \param testCase Case to execute.
+* \param execKey Execution key for the fuzzer.
+*
+* \returns Test case result.
+*/
+int
+SDLTest_RunTest(SDLTest_TestSuiteReference *testSuite, SDLTest_TestCaseReference *testCase, Uint64 execKey)
+{
+    SDL_TimerID timer = 0;
+    int testCaseResult = 0;
+    int testResult = 0;
+    int fuzzerCount;
+
+    if (testSuite==NULL || testCase==NULL || testSuite->name==NULL || testCase->name==NULL)
+    {
+        SDLTest_LogError("Setup failure: testSuite or testCase references NULL");
+        return TEST_RESULT_SETUP_FAILURE;
+    }
+
+    if (!testCase->enabled)
+    {
+        SDLTest_Log((char *)SDLTest_FinalResultFormat, "Test", testCase->name, "Skipped (Disabled)");
+        return TEST_RESULT_SKIPPED;
+    }
+
+
+    /* Initialize fuzzer */
+    SDLTest_FuzzerInit(execKey);
+
+    /* Reset assert tracker */
+    SDLTest_ResetAssertSummary();
+
+    /* Set timeout timer */
+    timer = SDLTest_SetTestTimeout(SDLTest_TestCaseTimeout, SDLTest_BailOut);
+
+    /* Maybe run suite initalizer function */
+    if (testSuite->testSetUp) {
+        testSuite->testSetUp(0x0);
+        if (SDLTest_AssertSummaryToTestResult() == TEST_RESULT_FAILED) {
+            SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Suite Setup", testSuite->name, "Failed");
+            return TEST_RESULT_SETUP_FAILURE;
+        }
+    }
+
+    /* Run test case function */
+    testCaseResult = testCase->testCase(0x0);
+
+    /* Convert test execution result into harness result */
+    if (testCaseResult == TEST_SKIPPED) {
+        /* Test was programatically skipped */
+        testResult = TEST_RESULT_SKIPPED;
+    } else if (testCaseResult == TEST_STARTED) {
+        /* Test did not return a TEST_COMPLETED value; assume it failed */
+        testResult = TEST_RESULT_FAILED;
+    } else if (testCaseResult == TEST_ABORTED) {
+        /* Test was aborted early; assume it failed */
+        testResult = TEST_RESULT_FAILED;
+    } else {
+        /* Perform failure analysis based on asserts */
+        testResult = SDLTest_AssertSummaryToTestResult();
+    }
+
+    /* Maybe run suite cleanup function (ignore failed asserts) */
+    if (testSuite->testTearDown) {
+        testSuite->testTearDown(0x0);
+    }
+
+    /* Cancel timeout timer */
+    if (timer) {
+        SDL_RemoveTimer(timer);
+    }
+
+    /* Report on asserts and fuzzer usage */
+    fuzzerCount = SDLTest_GetFuzzerInvocationCount();
+    if (fuzzerCount > 0) {
+        SDLTest_Log("Fuzzer invocations: %d", fuzzerCount);
+    }
+
+    /* Final log based on test execution result */
+    if (testCaseResult == TEST_SKIPPED) {
+        /* Test was programatically skipped */
+        SDLTest_Log((char *)SDLTest_FinalResultFormat, "Test", testCase->name, "Skipped (Programmatically)");
+    } else if (testCaseResult == TEST_STARTED) {
+        /* Test did not return a TEST_COMPLETED value; assume it failed */
+        SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Test", testCase->name, "Failed (test started, but did not return TEST_COMPLETED)");
+    } else if (testCaseResult == TEST_ABORTED) {
+        /* Test was aborted early; assume it failed */
+        SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Test", testCase->name, "Failed (Aborted)");
+    } else {
+        SDLTest_LogAssertSummary();
+    }
+
+    return testResult;
+}
+
+/* Prints summary of all suites/tests contained in the given reference */
+void SDLTest_LogTestSuiteSummary(SDLTest_TestSuiteReference *testSuites)
+{
+    int suiteCounter;
+    int testCounter;
+    SDLTest_TestSuiteReference *testSuite;
+    SDLTest_TestCaseReference *testCase;
+
+    /* Loop over all suites */
+    suiteCounter = 0;
+    while(&testSuites[suiteCounter]) {
+        testSuite=&testSuites[suiteCounter];
+        suiteCounter++;
+        SDLTest_Log("Test Suite %i - %s\n", suiteCounter,
+            (testSuite->name) ? testSuite->name : SDLTest_InvalidNameFormat);
+
+        /* Loop over all test cases */
+        testCounter = 0;
+        while(testSuite->testCases[testCounter])
+        {
+            testCase=(SDLTest_TestCaseReference *)testSuite->testCases[testCounter];
+            testCounter++;
+            SDLTest_Log("  Test Case %i - %s: %s", testCounter,
+                (testCase->name) ? testCase->name : SDLTest_InvalidNameFormat,
+                (testCase->description) ? testCase->description : SDLTest_InvalidNameFormat);
+        }
+    }
+}
+
+/* Gets a timer value in seconds */
+float GetClock()
+{
+    float currentClock = (float)clock();
+    return currentClock / (float)CLOCKS_PER_SEC;
+}
+
+/**
+* \brief Execute a test suite using the given run seed and execution key.
+*
+* The filter string is matched to the suite name (full comparison) to select a single suite,
+* or if no suite matches, it is matched to the test names (full comparison) to select a single test.
+*
+* \param testSuites Suites containing the test case.
+* \param userRunSeed Custom run seed provided by user, or NULL to autogenerate one.
+* \param userExecKey Custom execution key provided by user, or 0 to autogenerate one.
+* \param filter Filter specification. NULL disables. Case sensitive.
+* \param testIterations Number of iterations to run each test case.
+*
+* \returns Test run result; 0 when all tests passed, 1 if any tests failed.
+*/
+int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *userRunSeed, Uint64 userExecKey, const char *filter, int testIterations)
+{
+    int totalNumberOfTests = 0;
+    int failedNumberOfTests = 0;
+    int suiteCounter;
+    int testCounter;
+    int iterationCounter;
+    SDLTest_TestSuiteReference *testSuite;
+    SDLTest_TestCaseReference *testCase;
+    const char *runSeed = NULL;
+    char *currentSuiteName;
+    char *currentTestName;
+    Uint64 execKey;
+    float runStartSeconds;
+    float suiteStartSeconds;
+    float testStartSeconds;
+    float runEndSeconds;
+    float suiteEndSeconds;
+    float testEndSeconds;
+    float runtime;
+    int suiteFilter = 0;
+    char *suiteFilterName = NULL;
+    int testFilter = 0;
+    char *testFilterName = NULL;
+    int testResult = 0;
+    int runResult = 0;
+    Uint32 totalTestFailedCount = 0;
+    Uint32 totalTestPassedCount = 0;
+    Uint32 totalTestSkippedCount = 0;
+    Uint32 testFailedCount = 0;
+    Uint32 testPassedCount = 0;
+    Uint32 testSkippedCount = 0;
+    Uint32 countSum = 0;
+    char *logFormat = (char *)SDLTest_LogSummaryFormat;
+    SDLTest_TestCaseReference **failedTests;
+
+    /* Sanitize test iterations */
+    if (testIterations < 1) {
+        testIterations = 1;
+    }
+
+    /* Generate run see if we don't have one already */
+    if (userRunSeed == NULL || userRunSeed[0] == '\0') {
+        runSeed = SDLTest_GenerateRunSeed(16);
+        if (runSeed == NULL) {
+            SDLTest_LogError("Generating a random seed failed");
+            return 2;
+        }
+    } else {
+        runSeed = userRunSeed;
+    }
+
+
+    /* Reset per-run counters */
+    totalTestFailedCount = 0;
+    totalTestPassedCount = 0;
+    totalTestSkippedCount = 0;
+
+    /* Take time - run start */
+    runStartSeconds = GetClock();
+
+    /* Log run with fuzzer parameters */
+    SDLTest_Log("::::: Test Run /w seed '%s' started\n", runSeed);
+
+	/* Count the total number of tests */
+    suiteCounter = 0;
+    while (testSuites[suiteCounter]) {
+        testSuite=(SDLTest_TestSuiteReference *)testSuites[suiteCounter];
+        suiteCounter++;
+        testCounter = 0;
+        while (testSuite->testCases[testCounter])
+        {
+            testCounter++;
+			totalNumberOfTests++;
+		}
+	}
+
+	/* Pre-allocate an array for tracking failed tests (potentially all test cases) */
+	failedTests = (SDLTest_TestCaseReference **)SDL_malloc(totalNumberOfTests * sizeof(SDLTest_TestCaseReference *));
+	if (failedTests == NULL) {	
+	   SDLTest_LogError("Unable to allocate cache for failed tests");
+           SDL_Error(SDL_ENOMEM);	   
+           return -1;
+	}
+
+    /* Initialize filtering */
+    if (filter != NULL && filter[0] != '\0') {
+        /* Loop over all suites to check if we have a filter match */
+        suiteCounter = 0;
+        while (testSuites[suiteCounter] && suiteFilter == 0) {
+            testSuite=(SDLTest_TestSuiteReference *)testSuites[suiteCounter];
+            suiteCounter++;
+            if (testSuite->name != NULL && SDL_strcmp(filter, testSuite->name) == 0) {
+                /* Matched a suite name */
+                suiteFilter = 1;
+                suiteFilterName = testSuite->name;
+                SDLTest_Log("Filtering: running only suite '%s'", suiteFilterName);
+                break;
+            }
+
+            /* Within each suite, loop over all test cases to check if we have a filter match */
+            testCounter = 0;
+            while (testSuite->testCases[testCounter] && testFilter == 0)
+            {
+                testCase=(SDLTest_TestCaseReference *)testSuite->testCases[testCounter];
+                testCounter++;
+                if (testCase->name != NULL && SDL_strcmp(filter, testCase->name) == 0) {
+                    /* Matched a test name */
+                    suiteFilter = 1;
+                    suiteFilterName = testSuite->name;
+                    testFilter = 1;
+                    testFilterName = testCase->name;
+                    SDLTest_Log("Filtering: running only test '%s' in suite '%s'", testFilterName, suiteFilterName);
+                    break;
+                }
+            }
+        }
+
+        if (suiteFilter == 0 && testFilter == 0) {
+            SDLTest_LogError("Filter '%s' did not match any test suite/case.", filter);
+            SDLTest_Log("Exit code: 2");
+            return 2;
+        }
+    }
+
+    /* Loop over all suites */
+    suiteCounter = 0;
+    while(testSuites[suiteCounter]) {
+        testSuite=(SDLTest_TestSuiteReference *)testSuites[suiteCounter];
+        currentSuiteName = (char *)((testSuite->name) ? testSuite->name : SDLTest_InvalidNameFormat);
+        suiteCounter++;
+
+        /* Filter suite if flag set and we have a name */
+        if (suiteFilter == 1 && suiteFilterName != NULL && testSuite->name != NULL &&
+            SDL_strcmp(suiteFilterName, testSuite->name) != 0) {
+                /* Skip suite */
+                SDLTest_Log("===== Test Suite %i: '%s' skipped\n",
+                    suiteCounter,
+                    currentSuiteName);
+        } else {
+
+            /* Reset per-suite counters */
+            testFailedCount = 0;
+            testPassedCount = 0;
+            testSkippedCount = 0;
+
+            /* Take time - suite start */
+            suiteStartSeconds = GetClock();
+
+            /* Log suite started */
+            SDLTest_Log("===== Test Suite %i: '%s' started\n",
+                suiteCounter,
+                currentSuiteName);
+
+            /* Loop over all test cases */
+            testCounter = 0;
+            while(testSuite->testCases[testCounter])
+            {
+                testCase=(SDLTest_TestCaseReference *)testSuite->testCases[testCounter];
+                currentTestName = (char *)((testCase->name) ? testCase->name : SDLTest_InvalidNameFormat);
+                testCounter++;
+
+                /* Filter tests if flag set and we have a name */
+                if (testFilter == 1 && testFilterName != NULL && testCase->name != NULL &&
+                    SDL_strcmp(testFilterName, testCase->name) != 0) {
+                        /* Skip test */
+                        SDLTest_Log("===== Test Case %i.%i: '%s' skipped\n",
+                            suiteCounter,
+                            testCounter,
+                            currentTestName);
+                } else {
+                    /* Override 'disabled' flag if we specified a test filter (i.e. force run for debugging) */
+                    if (testFilter == 1 && !testCase->enabled) {
+                        SDLTest_Log("Force run of disabled test since test filter was set");
+                        testCase->enabled = 1;
+                    }
+
+                    /* Take time - test start */
+                    testStartSeconds = GetClock();
+
+                    /* Log test started */
+                    SDLTest_Log("----- Test Case %i.%i: '%s' started",
+                        suiteCounter,
+                        testCounter,
+                        currentTestName);
+                    if (testCase->description != NULL && testCase->description[0] != '\0') {
+                        SDLTest_Log("Test Description: '%s'",
+                            (testCase->description) ? testCase->description : SDLTest_InvalidNameFormat);
+                    }
+
+                    /* Loop over all iterations */
+                    iterationCounter = 0;
+                    while(iterationCounter < testIterations)
+                    {
+                        iterationCounter++;
+
+                        if (userExecKey != 0) {
+                            execKey = userExecKey;
+                        } else {
+                            execKey = SDLTest_GenerateExecKey((char *)runSeed, testSuite->name, testCase->name, iterationCounter);
+                        }
+
+                        SDLTest_Log("Test Iteration %i: execKey %llu", iterationCounter, execKey);
+                        testResult = SDLTest_RunTest(testSuite, testCase, execKey);
+
+                        if (testResult == TEST_RESULT_PASSED) {
+                            testPassedCount++;
+                            totalTestPassedCount++;
+                        } else if (testResult == TEST_RESULT_SKIPPED) {
+                            testSkippedCount++;
+                            totalTestSkippedCount++;
+                        } else {
+                            testFailedCount++;
+                            totalTestFailedCount++;
+                        }
+                    }
+
+                    /* Take time - test end */
+                    testEndSeconds = GetClock();
+                    runtime = testEndSeconds - testStartSeconds;
+                    if (runtime < 0.0f) runtime = 0.0f;
+
+                    if (testIterations > 1) {
+                        /* Log test runtime */
+                        SDLTest_Log("Runtime of %i iterations: %.1f sec", testIterations, runtime);
+                        SDLTest_Log("Average Test runtime: %.5f sec", runtime / (float)testIterations);
+                    } else {
+                        /* Log test runtime */
+                        SDLTest_Log("Total Test runtime: %.1f sec", runtime);
+                    }
+
+                    /* Log final test result */
+                    switch (testResult) {
+                    case TEST_RESULT_PASSED:
+                        SDLTest_Log((char *)SDLTest_FinalResultFormat, "Test", currentTestName, "Passed");
+                        break;
+                    case TEST_RESULT_FAILED:
+                        SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Test", currentTestName, "Failed");
+                        break;
+                    case TEST_RESULT_NO_ASSERT:
+                        SDLTest_LogError((char *)SDLTest_FinalResultFormat,"Test", currentTestName, "No Asserts");
+                        break;
+                    }
+
+                    /* Collect failed test case references for repro-step display */
+                    if (testResult == TEST_RESULT_FAILED) {
+                        failedTests[failedNumberOfTests] = testCase;
+                        failedNumberOfTests++;
+                    }
+                }
+            }
+
+            /* Take time - suite end */
+            suiteEndSeconds = GetClock();
+            runtime = suiteEndSeconds - suiteStartSeconds;
+            if (runtime < 0.0f) runtime = 0.0f;
+
+            /* Log suite runtime */
+            SDLTest_Log("Total Suite runtime: %.1f sec", runtime);
+
+            /* Log summary and final Suite result */
+            countSum = testPassedCount + testFailedCount + testSkippedCount;
+            if (testFailedCount == 0)
+            {
+                SDLTest_Log(logFormat, "Suite", countSum, testPassedCount, testFailedCount, testSkippedCount);
+                SDLTest_Log((char *)SDLTest_FinalResultFormat, "Suite", currentSuiteName, "Passed");
+            }
+            else
+            {
+                SDLTest_LogError(logFormat, "Suite", countSum, testPassedCount, testFailedCount, testSkippedCount);
+                SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Suite", currentSuiteName, "Failed");
+            }
+
+        }
+    }
+
+    /* Take time - run end */
+    runEndSeconds = GetClock();
+    runtime = runEndSeconds - runStartSeconds;
+    if (runtime < 0.0f) runtime = 0.0f;
+
+    /* Log total runtime */
+    SDLTest_Log("Total Run runtime: %.1f sec", runtime);
+
+    /* Log summary and final run result */
+    countSum = totalTestPassedCount + totalTestFailedCount + totalTestSkippedCount;
+    if (totalTestFailedCount == 0)
+    {
+        runResult = 0;
+        SDLTest_Log(logFormat, "Run", countSum, totalTestPassedCount, totalTestFailedCount, totalTestSkippedCount);
+        SDLTest_Log((char *)SDLTest_FinalResultFormat, "Run /w seed", runSeed, "Passed");
+    }
+    else
+    {
+        runResult = 1;
+        SDLTest_LogError(logFormat, "Run", countSum, totalTestPassedCount, totalTestFailedCount, totalTestSkippedCount);
+        SDLTest_LogError((char *)SDLTest_FinalResultFormat, "Run /w seed", runSeed, "Failed");
+    }
+
+    /* Print repro steps for failed tests */
+    if (failedNumberOfTests > 0) {
+        SDLTest_Log("Harness input to repro failures:");
+        for (testCounter = 0; testCounter < failedNumberOfTests; testCounter++) {
+          SDLTest_Log(" --seed %s --filter %s", runSeed, failedTests[testCounter]->name);
+        }
+    }
+    SDL_free(failedTests);
+
+    SDLTest_Log("Exit code: %d", runResult);
+    return runResult;
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_imageBlit.c b/Source/3rd Party/sdl/src/test/SDL_test_imageBlit.c
new file mode 100644
index 000000000..d4c74fb42
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_imageBlit.c	
@@ -0,0 +1,1557 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+/* GIMP RGB C-Source image dump (blit.c) */
+
+const SDLTest_SurfaceImage_t SDLTest_imageBlit = {
+  80, 60, 3,
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377"
+  "\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0"
+  "\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0"
+  "\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0"
+  "\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0"
+  "\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0"
+  "\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0"
+  "\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0"
+  "\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0"
+  "\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0"
+  "\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\0\0\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0"
+  "\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0"
+  "\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0"
+  "\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0"
+  "\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0"
+  "\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0"
+  "\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377"
+  "\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0"
+  "\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377"
+  "\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0"
+  "\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0"
+  "\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0"
+  "\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0"
+  "\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0"
+  "\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\0\377\377\0"
+  "\377\377\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377"
+  "\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0",
+};
+
+/**
+ * \brief Returns the Blit test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImageBlit()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imageBlit.pixel_data,
+        SDLTest_imageBlit.width,
+        SDLTest_imageBlit.height,
+        SDLTest_imageBlit.bytes_per_pixel * 8,
+        SDLTest_imageBlit.width * SDLTest_imageBlit.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
+
+const SDLTest_SurfaceImage_t SDLTest_imageBlitColor = {
+  80, 60, 3,
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\0\0\24\0\0\0\0\0\0"
+  "\0\0(\0\0(\0\0\0\0\0\0\0\0<\0\0<\0\0\0\0\0\0\0\0P\0\0P\0\0\0\0\0\0\0\0d\0"
+  "\0d\0\0\0\0\0\0\0\0x\0\0x\0\0\0\0\0\0\0\0\214\0\0\214\0\0\0\0\0\0\0\0\240"
+  "\0\0\240\0\0\0\0\0\0\0\0\264\0\0\264\0\0\0\0\0\0\0\0\310\0\0\310\0\0\0\0"
+  "\0\0\0\0\334\0\0\334\0\0\0\0\0\0\0\0\360\0\0\360\0\0\360\0\0\360\0\0\360"
+  "\0\0\360\0\0\360\0\0\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\0\0\24\0\0\24\0\0\0\0\0(\0\0"
+  "(\0\0(\0\0\0\0\0<\0\0<\0\0<\0\0\0\0\0P\0\0P\0\0P\0\0\0\0\0d\0\0d\0\0d\0\0"
+  "\0\0\0x\0\0x\0\0x\0\0\0\0\0\214\0\0\214\0\0\214\0\0\0\0\0\240\0\0\240\0\0"
+  "\240\0\0\0\0\0\264\0\0\264\0\0\264\0\0\0\0\0\310\0\0\310\0\0\310\0\0\0\0"
+  "\0\334\0\0\334\0\0\334\0\0\0\0\0\360\0\0\360\0\0\360\0\0\360\0\0\360\0\0"
+  "\360\0\0\360\0\0\360\0\0\360\0\0\360\0\0\360\0\0\360\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\0\0\24\0\0\24\0\0\0"
+  "\0\0(\0\0(\0\0(\0\0\0\0\0<\0\0<\0\0<\0\0\0\0\0P\0\0P\0\0P\0\0\0\0\0d\0\0"
+  "d\0\0d\0\0\0\0\0x\0\0x\0\0x\0\0\0\0\0\214\0\0\214\0\0\214\0\0\0\0\0\240\0"
+  "\0\240\0\0\240\0\0\0\0\0\264\0\0\264\0\0\264\0\0\0\0\0\310\0\0\310\0\0\310"
+  "\0\0\0\0\0\334\0\0\334\0\0\334\0\0\0\0\0\360\0\0\360\0\0\360\0\0\360\0\0"
+  "\360\0\0\360\0\0\360\0\0\360\0\0\360\0\0\360\0\0\360\0\0\360\0\0\360\0\0"
+  "\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\360\0\0\360\0\0\360\0\0\360\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$\0\0$\0\0\0\0\0\0\0\0$\24\0"
+  "$\24\0\0\0\0\0\0\0$(\0$(\0\0\0\0\0\0\0$<\0$<\0\0\0\0\0\0\0$P\0$P\0\0\0\0"
+  "\0\0\0$d\0$d\0\0\0\0\0\0\0$x\0$x\0\0\0\0\0\0\0$\214\0$\214\0\0\0\0\0\0\0"
+  "$\240\0$\240\0\0\0\0\0\0\0$\264\0$\264\0\0\0\0\0\0\0$\310\0$\310\0\0\0\0"
+  "\0\0\0$\334\0$\334\0\0\0\0\0\0\0$\360\0$\360\0$\360\0$\360\0$\360\0$\360"
+  "\0$\360\0$\360\0\0\0\0\0\0\0\0\360\0\0\360\0\0\360\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0$\0\0$\0\0$\0\0\0\0\0$\24\0$\24\0$\24\0\0\0\0$(\0$(\0$(\0\0\0\0"
+  "$<\0$<\0$<\0\0\0\0$P\0$P\0$P\0\0\0\0$d\0$d\0$d\0\0\0\0$x\0$x\0$x\0\0\0\0"
+  "$\214\0$\214\0$\214\0\0\0\0$\240\0$\240\0$\240\0\0\0\0$\264\0$\264\0$\264"
+  "\0\0\0\0$\310\0$\310\0$\310\0\0\0\0$\334\0$\334\0$\334\0\0\0\0$\360\0$\360"
+  "\0$\360\0$\360\0$\360\0$\360\0$\360\0$\360\0$\360\0$\360\0$\360\0$\360\0"
+  "\0\0\0\0\360\0\0\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$\0\0$\0\0$\0\0\0\0\0$\24\0"
+  "$\24\0$\24\0\0\0\0$(\0$(\0$(\0\0\0\0$<\0$<\0$<\0\0\0\0$P\0$P\0$P\0\0\0\0"
+  "$d\0$d\0$d\0\0\0\0$x\0$x\0$x\0\0\0\0$\214\0$\214\0$\214\0\0\0\0$\240\0$\240"
+  "\0$\240\0\0\0\0$\264\0$\264\0$\264\0\0\0\0$\310\0$\310\0$\310\0\0\0\0$\334"
+  "\0$\334\0$\334\0\0\0\0$\360\0$\360\0$\360\0$\360\0$\360\0$\360\0$\360\0$"
+  "\360\0$\360\0$\360\0$\360\0$\360\0$\360\0$\360\0\0\0\0\0\360\0\0\360\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0$\0\0$\0\0$\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0$\360\0$\360\0$\360\0$\360\0\0\0\0\0\360\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$\0\0$\0\0$\0\0\0\0"
+  "\0\0\0\0H\0\0H\0\0\0\0\0\0\0\0H\24\0H\24\0\0\0\0\0\0\0H(\0H(\0\0\0\0\0\0"
+  "\0H<\0H<\0\0\0\0\0\0\0HP\0HP\0\0\0\0\0\0\0Hd\0Hd\0\0\0\0\0\0\0Hx\0Hx\0\0"
+  "\0\0\0\0\0H\214\0H\214\0\0\0\0\0\0\0H\240\0H\240\0\0\0\0\0\0\0H\264\0H\264"
+  "\0\0\0\0\0\0\0H\310\0H\310\0\0\0\0\0\0\0H\334\0H\334\0\0\0\0\0\0\0H\360\0"
+  "H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0\0\0\0\0\0\0$\360\0$\360"
+  "\0$\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0$\0\0$\0\0\0\0\0H\0\0H\0\0H\0\0\0\0\0H\24\0H\24\0H\24"
+  "\0\0\0\0H(\0H(\0H(\0\0\0\0H<\0H<\0H<\0\0\0\0HP\0HP\0HP\0\0\0\0Hd\0Hd\0Hd"
+  "\0\0\0\0Hx\0Hx\0Hx\0\0\0\0H\214\0H\214\0H\214\0\0\0\0H\240\0H\240\0H\240"
+  "\0\0\0\0H\264\0H\264\0H\264\0\0\0\0H\310\0H\310\0H\310\0\0\0\0H\334\0H\334"
+  "\0H\334\0\0\0\0H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0H"
+  "\360\0H\360\0H\360\0H\360\0\0\0\0$\360\0$\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0$\0\0$\0\0\0\0\0H\0\0"
+  "H\0\0H\0\0\0\0\0H\24\0H\24\0H\24\0\0\0\0H(\0H(\0H(\0\0\0\0H<\0H<\0H<\0\0"
+  "\0\0HP\0HP\0HP\0\0\0\0Hd\0Hd\0Hd\0\0\0\0Hx\0Hx\0Hx\0\0\0\0H\214\0H\214\0"
+  "H\214\0\0\0\0H\240\0H\240\0H\240\0\0\0\0H\264\0H\264\0H\264\0\0\0\0H\310"
+  "\0H\310\0H\310\0\0\0\0H\334\0H\334\0H\334\0\0\0\0H\360\0H\360\0H\360\0H\360"
+  "\0H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0H\360\0"
+  "\0\0\0$\360\0$\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0$\0\0\0\0\0H\0\0H\0\0H\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0H\360\0H\360\0H\360\0H\360\0\0\0\0$\360\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0H\0\0H\0\0H\0\0\0\0\0\0\0\0l\0\0l\0\0\0\0\0\0\0\0l\24\0l\24\0\0\0\0\0\0"
+  "\0l(\0l(\0\0\0\0\0\0\0l<\0l<\0\0\0\0\0\0\0lP\0lP\0\0\0\0\0\0\0ld\0ld\0\0"
+  "\0\0\0\0\0lx\0lx\0\0\0\0\0\0\0l\214\0l\214\0\0\0\0\0\0\0l\240\0l\240\0\0"
+  "\0\0\0\0\0l\264\0l\264\0\0\0\0\0\0\0l\310\0l\310\0\0\0\0\0\0\0l\334\0l\334"
+  "\0\0\0\0\0\0\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360\0\0"
+  "\0\0\0\0\0H\360\0H\360\0H\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0H\0\0H\0\0\0\0\0l\0\0l\0\0l\0\0"
+  "\0\0\0l\24\0l\24\0l\24\0\0\0\0l(\0l(\0l(\0\0\0\0l<\0l<\0l<\0\0\0\0lP\0lP"
+  "\0lP\0\0\0\0ld\0ld\0ld\0\0\0\0lx\0lx\0lx\0\0\0\0l\214\0l\214\0l\214\0\0\0"
+  "\0l\240\0l\240\0l\240\0\0\0\0l\264\0l\264\0l\264\0\0\0\0l\310\0l\310\0l\310"
+  "\0\0\0\0l\334\0l\334\0l\334\0\0\0\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360"
+  "\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360\0\0\0\0H\360\0H\360\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0H\0"
+  "\0H\0\0\0\0\0l\0\0l\0\0l\0\0\0\0\0l\24\0l\24\0l\24\0\0\0\0l(\0l(\0l(\0\0"
+  "\0\0l<\0l<\0l<\0\0\0\0lP\0lP\0lP\0\0\0\0ld\0ld\0ld\0\0\0\0lx\0lx\0lx\0\0"
+  "\0\0l\214\0l\214\0l\214\0\0\0\0l\240\0l\240\0l\240\0\0\0\0l\264\0l\264\0"
+  "l\264\0\0\0\0l\310\0l\310\0l\310\0\0\0\0l\334\0l\334\0l\334\0\0\0\0l\360"
+  "\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360\0l\360\0"
+  "l\360\0l\360\0l\360\0\0\0\0H\360\0H\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0H\0\0\0\0\0l\0\0l\0\0l\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0l\360\0l\360\0l\360\0l\360"
+  "\0\0\0\0H\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0l\0\0l\0\0l\0\0\0\0\0\0\0\0\220\0\0\220\0\0\0\0\0\0\0"
+  "\0\220\24\0\220\24\0\0\0\0\0\0\0\220(\0\220(\0\0\0\0\0\0\0\220<\0\220<\0"
+  "\0\0\0\0\0\0\220P\0\220P\0\0\0\0\0\0\0\220d\0\220d\0\0\0\0\0\0\0\220x\0\220"
+  "x\0\0\0\0\0\0\0\220\214\0\220\214\0\0\0\0\0\0\0\220\240\0\220\240\0\0\0\0"
+  "\0\0\0\220\264\0\220\264\0\0\0\0\0\0\0\220\310\0\220\310\0\0\0\0\0\0\0\220"
+  "\334\0\220\334\0\0\0\0\0\0\0\220\360\0\220\360\0\220\360\0\220\360\0\220"
+  "\360\0\220\360\0\220\360\0\220\360\0\0\0\0\0\0\0l\360\0l\360\0l\360\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0l\0\0l\0\0\0\0\0\220\0\0\220\0\0\220\0\0\0\0\0\220\24\0\220\24\0"
+  "\220\24\0\0\0\0\220(\0\220(\0\220(\0\0\0\0\220<\0\220<\0\220<\0\0\0\0\220"
+  "P\0\220P\0\220P\0\0\0\0\220d\0\220d\0\220d\0\0\0\0\220x\0\220x\0\220x\0\0"
+  "\0\0\220\214\0\220\214\0\220\214\0\0\0\0\220\240\0\220\240\0\220\240\0\0"
+  "\0\0\220\264\0\220\264\0\220\264\0\0\0\0\220\310\0\220\310\0\220\310\0\0"
+  "\0\0\220\334\0\220\334\0\220\334\0\0\0\0\220\360\0\220\360\0\220\360\0\220"
+  "\360\0\220\360\0\220\360\0\220\360\0\220\360\0\220\360\0\220\360\0\220\360"
+  "\0\220\360\0\0\0\0l\360\0l\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0l\0\0l\0\0\0\0\0\220\0\0\220\0\0\220"
+  "\0\0\0\0\0\220\24\0\220\24\0\220\24\0\0\0\0\220(\0\220(\0\220(\0\0\0\0\220"
+  "<\0\220<\0\220<\0\0\0\0\220P\0\220P\0\220P\0\0\0\0\220d\0\220d\0\220d\0\0"
+  "\0\0\220x\0\220x\0\220x\0\0\0\0\220\214\0\220\214\0\220\214\0\0\0\0\220\240"
+  "\0\220\240\0\220\240\0\0\0\0\220\264\0\220\264\0\220\264\0\0\0\0\220\310"
+  "\0\220\310\0\220\310\0\0\0\0\220\334\0\220\334\0\220\334\0\0\0\0\220\360"
+  "\0\220\360\0\220\360\0\220\360\0\220\360\0\220\360\0\220\360\0\220\360\0"
+  "\220\360\0\220\360\0\220\360\0\220\360\0\220\360\0\220\360\0\0\0\0l\360\0"
+  "l\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0l\0\0\0\0\0\220\0\0\220\0\0\220\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\220\360\0\220\360\0\220\360\0\220\360\0\0\0\0l\360"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\220\0\0\220\0\0\220\0\0\0\0\0\0\0\0\264\0\0\264\0\0\0\0\0\0\0\0"
+  "\264\24\0\264\24\0\0\0\0\0\0\0\264(\0\264(\0\0\0\0\0\0\0\264<\0\264<\0\0"
+  "\0\0\0\0\0\264P\0\264P\0\0\0\0\0\0\0\264d\0\264d\0\0\0\0\0\0\0\264x\0\264"
+  "x\0\0\0\0\0\0\0\264\214\0\264\214\0\0\0\0\0\0\0\264\240\0\264\240\0\0\0\0"
+  "\0\0\0\264\264\0\264\264\0\0\0\0\0\0\0\264\310\0\264\310\0\0\0\0\0\0\0\264"
+  "\334\0\264\334\0\0\0\0\0\0\0\264\360\0\264\360\0\264\360\0\264\360\0\264"
+  "\360\0\264\360\0\264\360\0\264\360\0\0\0\0\0\0\0\220\360\0\220\360\0\220"
+  "\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\220\0\0\220\0\0\0\0\0\264\0\0\264\0\0\264\0\0\0\0\0\264"
+  "\24\0\264\24\0\264\24\0\0\0\0\264(\0\264(\0\264(\0\0\0\0\264<\0\264<\0\264"
+  "<\0\0\0\0\264P\0\264P\0\264P\0\0\0\0\264d\0\264d\0\264d\0\0\0\0\264x\0\264"
+  "x\0\264x\0\0\0\0\264\214\0\264\214\0\264\214\0\0\0\0\264\240\0\264\240\0"
+  "\264\240\0\0\0\0\264\264\0\264\264\0\264\264\0\0\0\0\264\310\0\264\310\0"
+  "\264\310\0\0\0\0\264\334\0\264\334\0\264\334\0\0\0\0\264\360\0\264\360\0"
+  "\264\360\0\264\360\0\264\360\0\264\360\0\264\360\0\264\360\0\264\360\0\264"
+  "\360\0\264\360\0\264\360\0\0\0\0\220\360\0\220\360\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\220\0\0\220\0"
+  "\0\0\0\0\264\0\0\264\0\0\264\0\0\0\0\0\264\24\0\264\24\0\264\24\0\0\0\0\264"
+  "(\0\264(\0\264(\0\0\0\0\264<\0\264<\0\264<\0\0\0\0\264P\0\264P\0\264P\0\0"
+  "\0\0\264d\0\264d\0\264d\0\0\0\0\264x\0\264x\0\264x\0\0\0\0\264\214\0\264"
+  "\214\0\264\214\0\0\0\0\264\240\0\264\240\0\264\240\0\0\0\0\264\264\0\264"
+  "\264\0\264\264\0\0\0\0\264\310\0\264\310\0\264\310\0\0\0\0\264\334\0\264"
+  "\334\0\264\334\0\0\0\0\264\360\0\264\360\0\264\360\0\264\360\0\264\360\0"
+  "\264\360\0\264\360\0\264\360\0\264\360\0\264\360\0\264\360\0\264\360\0\264"
+  "\360\0\264\360\0\0\0\0\220\360\0\220\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\220\0\0\0\0\0\264\0\0\264\0\0"
+  "\264\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\264\360\0"
+  "\264\360\0\264\360\0\264\360\0\0\0\0\220\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\264\0\0\264\0\0\264"
+  "\0\0\0\0\0\0\0\0\330\0\0\330\0\0\0\0\0\0\0\0\330\24\0\330\24\0\0\0\0\0\0"
+  "\0\330(\0\330(\0\0\0\0\0\0\0\330<\0\330<\0\0\0\0\0\0\0\330P\0\330P\0\0\0"
+  "\0\0\0\0\330d\0\330d\0\0\0\0\0\0\0\330x\0\330x\0\0\0\0\0\0\0\330\214\0\330"
+  "\214\0\0\0\0\0\0\0\330\240\0\330\240\0\0\0\0\0\0\0\330\264\0\330\264\0\0"
+  "\0\0\0\0\0\330\310\0\330\310\0\0\0\0\0\0\0\330\334\0\330\334\0\0\0\0\0\0"
+  "\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0"
+  "\330\360\0\0\0\0\0\0\0\264\360\0\264\360\0\264\360\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\264\0\0"
+  "\264\0\0\0\0\0\330\0\0\330\0\0\330\0\0\0\0\0\330\24\0\330\24\0\330\24\0\0"
+  "\0\0\330(\0\330(\0\330(\0\0\0\0\330<\0\330<\0\330<\0\0\0\0\330P\0\330P\0"
+  "\330P\0\0\0\0\330d\0\330d\0\330d\0\0\0\0\330x\0\330x\0\330x\0\0\0\0\330\214"
+  "\0\330\214\0\330\214\0\0\0\0\330\240\0\330\240\0\330\240\0\0\0\0\330\264"
+  "\0\330\264\0\330\264\0\0\0\0\330\310\0\330\310\0\330\310\0\0\0\0\330\334"
+  "\0\330\334\0\330\334\0\0\0\0\330\360\0\330\360\0\330\360\0\330\360\0\330"
+  "\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360"
+  "\0\0\0\0\264\360\0\264\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\264\0\0\264\0\0\0\0\0\330\0\0\330\0\0"
+  "\330\0\0\0\0\0\330\24\0\330\24\0\330\24\0\0\0\0\330(\0\330(\0\330(\0\0\0"
+  "\0\330<\0\330<\0\330<\0\0\0\0\330P\0\330P\0\330P\0\0\0\0\330d\0\330d\0\330"
+  "d\0\0\0\0\330x\0\330x\0\330x\0\0\0\0\330\214\0\330\214\0\330\214\0\0\0\0"
+  "\330\240\0\330\240\0\330\240\0\0\0\0\330\264\0\330\264\0\330\264\0\0\0\0"
+  "\330\310\0\330\310\0\330\310\0\0\0\0\330\334\0\330\334\0\330\334\0\0\0\0"
+  "\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330"
+  "\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0\330\360\0\0\0\0"
+  "\264\360\0\264\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\264\0\0\0\0\0\330\0\0\330\0\0\330\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\330\360\0\330\360\0\330\360\0\330"
+  "\360\0\0\0\0\264\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\330\0\0\330\0\0\330\0\0\0\0\0\0\0\0\374\0\0"
+  "\374\0\0\0\0\0\0\0\0\374\24\0\374\24\0\0\0\0\0\0\0\374(\0\374(\0\0\0\0\0"
+  "\0\0\374<\0\374<\0\0\0\0\0\0\0\374P\0\374P\0\0\0\0\0\0\0\374d\0\374d\0\0"
+  "\0\0\0\0\0\374x\0\374x\0\0\0\0\0\0\0\374\214\0\374\214\0\0\0\0\0\0\0\374"
+  "\240\0\374\240\0\0\0\0\0\0\0\374\264\0\374\264\0\0\0\0\0\0\0\374\310\0\374"
+  "\310\0\0\0\0\0\0\0\374\334\0\374\334\0\0\0\0\0\0\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\330"
+  "\360\0\330\360\0\330\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\330\0\0\330\0\0\0\0\0\374\0\0\374"
+  "\0\0\374\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0\374(\0\374(\0"
+  "\0\0\0\374<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0\0\374d\0\374d"
+  "\0\374d\0\0\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374\214\0\374\214\0"
+  "\0\0\0\374\240\0\374\240\0\374\240\0\0\0\0\374\264\0\374\264\0\374\264\0"
+  "\0\0\0\374\310\0\374\310\0\374\310\0\0\0\0\374\334\0\374\334\0\374\334\0"
+  "\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\330\360\0\330"
+  "\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\330\0\0\330\0\0\0\0\0\374\0\0\374\0\0\374\0\0\0\0\0\374\24\0"
+  "\374\24\0\374\24\0\0\0\0\374(\0\374(\0\374(\0\0\0\0\374<\0\374<\0\374<\0"
+  "\0\0\0\374P\0\374P\0\374P\0\0\0\0\374d\0\374d\0\374d\0\0\0\0\374x\0\374x"
+  "\0\374x\0\0\0\0\374\214\0\374\214\0\374\214\0\0\0\0\374\240\0\374\240\0\374"
+  "\240\0\0\0\0\374\264\0\374\264\0\374\264\0\0\0\0\374\310\0\374\310\0\374"
+  "\310\0\0\0\0\374\334\0\374\334\0\374\334\0\0\0\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\330\360\0\330\360\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\330"
+  "\0\0\0\0\0\374\0\0\374\0\0\374\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0"
+  "\374(\0\374(\0\374(\0\0\0\0\374<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374"
+  "P\0\0\0\0\374d\0\374d\0\374d\0\0\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0"
+  "\374\214\0\374\214\0\0\0\0\374\240\0\374\240\0\374\240\0\0\0\0\374\264\0"
+  "\374\264\0\374\264\0\0\0\0\374\310\0\374\310\0\374\310\0\0\0\0\374\334\0"
+  "\374\334\0\374\334\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\330\360\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374"
+  "\0\0\374\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0\374(\0\374(\0"
+  "\0\0\0\374<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0\0\374d\0\374d"
+  "\0\374d\0\0\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374\214\0\374\214\0"
+  "\0\0\0\374\240\0\374\240\0\374\240\0\0\0\0\374\264\0\374\264\0\374\264\0"
+  "\0\0\0\374\310\0\374\310\0\374\310\0\0\0\0\374\334\0\374\334\0\374\334\0"
+  "\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374\0\0\374"
+  "\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0\374(\0\374(\0\0\0\0\374"
+  "<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0\0\374d\0\374d\0\374d\0\0"
+  "\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374\214\0\374\214\0\0\0\0\374\240"
+  "\0\374\240\0\374\240\0\0\0\0\374\264\0\374\264\0\374\264\0\0\0\0\374\310"
+  "\0\374\310\0\374\310\0\0\0\0\374\334\0\374\334\0\374\334\0\0\0\0\374\360"
+  "\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\374\0\0\374\0\0\374\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0\374"
+  "(\0\374(\0\0\0\0\374<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0\0\374"
+  "d\0\374d\0\374d\0\0\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374\214\0\374"
+  "\214\0\0\0\0\374\240\0\374\240\0\374\240\0\0\0\0\374\264\0\374\264\0\374"
+  "\264\0\0\0\0\374\310\0\374\310\0\374\310\0\0\0\0\374\334\0\374\334\0\374"
+  "\334\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\374\334"
+  "\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\374\334\0\0"
+  "\0\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374\0\0\374\0\0\0\0"
+  "\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0\374(\0\374(\0\0\0\0\374<\0\374"
+  "<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0\0\374d\0\374d\0\374d\0\0\0\0\374"
+  "x\0\374x\0\374x\0\0\0\0\374\214\0\374\214\0\374\214\0\0\0\0\374\240\0\374"
+  "\240\0\374\240\0\0\0\0\374\264\0\374\264\0\374\264\0\0\0\0\374\310\0\374"
+  "\310\0\374\310\0\0\0\0\374\334\0\374\334\0\374\334\0\0\0\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\374\0\0\374\0\0\374\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374"
+  "(\0\374(\0\374(\0\0\0\0\374<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0"
+  "\0\0\374d\0\374d\0\374d\0\0\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374"
+  "\214\0\374\214\0\0\0\0\374\240\0\374\240\0\374\240\0\0\0\0\374\264\0\374"
+  "\264\0\374\264\0\0\0\0\374\310\0\374\310\0\374\310\0\0\0\0\374\334\0\374"
+  "\334\0\374\334\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\374\0\0\374\0\0\374\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0"
+  "\374(\0\374(\0\0\0\0\374<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0"
+  "\0\374d\0\374d\0\374d\0\0\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374\214"
+  "\0\374\214\0\0\0\0\374\240\0\374\240\0\374\240\0\0\0\0\374\264\0\374\264"
+  "\0\374\264\0\0\0\0\374\310\0\374\310\0\374\310\0\0\0\0\374\334\0\374\334"
+  "\0\374\334\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\374\0\0\374\0\0\374\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0\374"
+  "(\0\374(\0\0\0\0\374<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0\0\374"
+  "d\0\374d\0\374d\0\0\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374\214\0\374"
+  "\214\0\0\0\0\374\240\0\374\240\0\374\240\0\0\0\0\374\264\0\374\264\0\374"
+  "\264\0\0\0\0\374\310\0\374\310\0\374\310\0\0\0\0\374\334\0\374\334\0\374"
+  "\334\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374"
+  "\0\0\374\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0\374(\0\374(\0"
+  "\0\0\0\374<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0\0\374d\0\374d"
+  "\0\374d\0\0\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374\214\0\374\214\0"
+  "\0\0\0\374\240\0\374\240\0\374\240\0\0\0\0\374\264\0\374\264\0\374\264\0"
+  "\0\0\0\374\310\0\374\310\0\374\310\0\0\0\0\374\334\0\374\334\0\374\334\0"
+  "\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374\0\0\374"
+  "\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0\374(\0\374(\0\0\0\0\374"
+  "<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0\0\374d\0\374d\0\374d\0\0"
+  "\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374\214\0\374\214\0\0\0\0\374\240"
+  "\0\374\240\0\374\240\0\0\0\0\374\264\0\374\264\0\374\264\0\0\0\0\374\310"
+  "\0\374\310\0\374\310\0\0\0\0\374\334\0\374\334\0\374\334\0\0\0\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374\0\0\374"
+  "\0\0\0\0\0\374\24\0\374\24\0\374\24\0\0\0\0\374(\0\374(\0\374(\0\0\0\0\374"
+  "<\0\374<\0\374<\0\0\0\0\374P\0\374P\0\374P\0\0\0\0\374d\0\374d\0\374d\0\0"
+  "\0\0\374x\0\374x\0\374x\0\0\0\0\374\214\0\374\214\0\374\214\0\0\0\0\374\240"
+  "\0\374\240\0\374\240\0\0\0\0\374\264\0\374\264\0\374\264\0\0\0\0\374\310"
+  "\0\374\310\0\374\310\0\0\0\0\374\334\0\374\334\0\374\334\0\0\0\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374\0\0\0\0\0\0\0\0\374\24"
+  "\0\374\24\0\0\0\0\0\0\0\374(\0\374(\0\0\0\0\0\0\0\374<\0\374<\0\0\0\0\0\0"
+  "\0\374P\0\374P\0\0\0\0\0\0\0\374d\0\374d\0\0\0\0\0\0\0\374x\0\374x\0\0\0"
+  "\0\0\0\0\374\214\0\374\214\0\0\0\0\0\0\0\374\240\0\374\240\0\0\0\0\0\0\0"
+  "\374\264\0\374\264\0\0\0\0\0\0\0\374\310\0\374\310\0\0\0\0\0\0\0\374\334"
+  "\0\374\334\0\0\0\0\0\0\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\0"
+  "\0\0\0\0\0\0\0\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374\0\0\0"
+  "\0\0\0\0\0\374\24\0\374\24\0\0\0\0\0\0\0\374(\0\374(\0\0\0\0\0\0\0\374<\0"
+  "\374<\0\0\0\0\0\0\0\374P\0\374P\0\0\0\0\0\0\0\374d\0\374d\0\0\0\0\0\0\0\374"
+  "x\0\374x\0\0\0\0\0\0\0\374\214\0\374\214\0\0\0\0\0\0\0\374\240\0\374\240"
+  "\0\0\0\0\0\0\0\374\264\0\374\264\0\0\0\0\0\0\0\374\310\0\374\310\0\0\0\0"
+  "\0\0\0\374\334\0\374\334\0\0\0\0\0\0\0\374\360\0\374\360\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374"
+  "\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374\0\0\0\0\0\0\0\0\374\24\0"
+  "\374\24\0\0\0\0\0\0\0\374(\0\374(\0\0\0\0\0\0\0\374<\0\374<\0\0\0\0\0\0\0"
+  "\374P\0\374P\0\0\0\0\0\0\0\374d\0\374d\0\0\0\0\0\0\0\374x\0\374x\0\0\0\0"
+  "\0\0\0\374\214\0\374\214\0\0\0\0\0\0\0\374\240\0\374\240\0\0\0\0\0\0\0\374"
+  "\264\0\374\264\0\0\0\0\0\0\0\374\310\0\374\310\0\0\0\0\0\0\0\374\334\0\374"
+  "\334\0\0\0\0\0\0\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\374\0\0\374\0\0\374\0\0\0\0\0\374\24\0\374\24\0\374\24\0"
+  "\0\0\0\374(\0\374(\0\374(\0\0\0\0\374<\0\374<\0\374<\0\0\0\0\374P\0\374P"
+  "\0\374P\0\0\0\0\374d\0\374d\0\374d\0\0\0\0\374x\0\374x\0\374x\0\0\0\0\374"
+  "\214\0\374\214\0\374\214\0\0\0\0\374\240\0\374\240\0\374\240\0\0\0\0\374"
+  "\264\0\374\264\0\374\264\0\0\0\0\374\310\0\374\310\0\374\310\0\0\0\0\374"
+  "\334\0\374\334\0\374\334\0\0\0\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\0\0\374\0\0\0\0\0\0\0\0"
+  "\374\24\0\374\24\0\0\0\0\0\0\0\374(\0\374(\0\0\0\0\0\0\0\374<\0\374<\0\0"
+  "\0\0\0\0\0\374P\0\374P\0\0\0\0\0\0\0\374d\0\374d\0\0\0\0\0\0\0\374x\0\374"
+  "x\0\0\0\0\0\0\0\374\214\0\374\214\0\0\0\0\0\0\0\374\240\0\374\240\0\0\0\0"
+  "\0\0\0\374\264\0\374\264\0\0\0\0\0\0\0\374\310\0\374\310\0\0\0\0\0\0\0\374"
+  "\334\0\374\334\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+};
+
+/**
+ * \brief Returns the BlitColor test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImageBlitColor()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imageBlitColor.pixel_data,
+        SDLTest_imageBlitColor.width,
+        SDLTest_imageBlitColor.height,
+        SDLTest_imageBlitColor.bytes_per_pixel * 8,
+        SDLTest_imageBlitColor.width * SDLTest_imageBlitColor.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
+
+const SDLTest_SurfaceImage_t SDLTest_imageBlitAlpha = {
+  80, 60, 3,
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0\24\24\0\20\20\0"
+  "\20\20\0""88\0""88\0**\0**\0ZZ\0ZZ\0==\0==\0yy\0yy\0II\0II\0\224\224\0\224"
+  "\224\0NN\0NN\0\254\254\0\254\254\0MM\0MM\0\302\302\0\302\302\0HH\0HH\0\324"
+  "\324\0\324\324\0>>\0>>\0\343\343\0\343\343\0""00\0""00\0\356\356\0\356\356"
+  "\0\40\40\0\40\40\0\367\367\0\367\367\0\16\16\0\16\16\0\374\374\0\374\374"
+  "\0\374\374\0\374\374\0\360\360\0\360\360\0\360\360\0\360\360\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\24\24\0\24\24\0\24\24\0\20\20\0""88\0""88\0""88\0**\0ff\0ff\0ff\0FF\0"
+  "\215\215\0\215\215\0\215\215\0UU\0\255\255\0\255\255\0\255\255\0[[\0\306"
+  "\306\0\306\306\0\306\306\0YY\0\331\331\0\331\331\0\331\331\0PP\0\350\350"
+  "\0\350\350\0\350\350\0DD\0\362\362\0\362\362\0\362\362\0""44\0\370\370\0"
+  "\370\370\0\370\370\0\"\"\0\374\374\0\374\374\0\374\374\0\16\16\0\376\376"
+  "\0\376\376\0\376\376\0\376\376\0\374\374\0\374\374\0\374\374\0\374\374\0"
+  "\360\360\0\360\360\0\360\360\0\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0\24\24\0\24\24\0\20\20\0""88\0"
+  """88\0""88\0**\0ff\0ff\0ff\0FF\0\226\226\0\226\226\0\215\215\0UU\0\271\271"
+  "\0\271\271\0\255\255\0[[\0\323\323\0\323\323\0\306\306\0YY\0\345\345\0\345"
+  "\345\0\331\331\0PP\0\360\360\0\360\360\0\350\350\0DD\0\370\370\0\370\370"
+  "\0\362\362\0""44\0\374\374\0\374\374\0\370\370\0\"\"\0\376\376\0\376\376"
+  "\0\374\374\0\16\16\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376"
+  "\376\0\374\374\0\374\374\0\374\374\0\374\374\0\360\360\0\360\360\0\360\360"
+  "\0\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24"
+  "\0\24\24\0\24\24\0\20\20\0""33\0""33\0""33\0&&\0OO\0OO\0OO\0""55\0``\0``"
+  "\0``\0::\0``\0``\0``\0""22\0WW\0WW\0WW\0''\0II\0II\0II\0\33\33\0""99\0""9"
+  "9\0""99\0\20\20\0))\0))\0))\0\10\10\0\33\33\0\33\33\0\33\33\0\3\3\0\17\17"
+  "\0\17\17\0\17\17\0\0\0\0\7\7\0\7\7\0\7\7\0\7\7\0\2\2\0\2\2\0\2\2\0\2\2\0"
+  "\16\16\0\16\16\0\16\16\0\16\16\0\360\360\0\360\360\0\360\360\0\360\360\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0\24\24\0\24\24\0\16\16"
+  "\0""33\0GG\0GG\0""00\0``\0\210\210\0\210\210\0TT\0\204\204\0\263\263\0\263"
+  "\263\0ee\0\222\222\0\315\315\0\312\312\0gg\0\216\216\0\331\331\0\327\327"
+  "\0cc\0\202\202\0\340\340\0\337\337\0YY\0qq\0\345\345\0\344\344\0NN\0^^\0"
+  "\352\352\0\352\352\0@@\0JJ\0\357\357\0\357\357\0""11\0""66\0\364\364\0\364"
+  "\364\0\40\40\0\"\"\0\371\371\0\371\371\0\16\16\0\16\16\0\375\375\0\375\375"
+  "\0\376\376\0\376\376\0\362\362\0\362\362\0\376\376\0\376\376\0\16\16\0\16"
+  "\16\0\360\360\0\360\360\0\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24"
+  "\24\0\24\24\0\22\22\0\24\24\0""88\0""88\0//\0BB\0pp\0pp\0UU\0ss\0\242\242"
+  "\0\242\242\0oo\0\230\230\0\306\306\0\306\306\0ww\0\265\265\0\335\335\0\335"
+  "\335\0ss\0\313\313\0\353\353\0\353\353\0ii\0\333\333\0\364\364\0\364\364"
+  "\0ZZ\0\351\351\0\371\371\0\371\371\0II\0\362\362\0\374\374\0\374\374\0""6"
+  "6\0\370\370\0\376\376\0\376\376\0\"\"\0\374\374\0\376\376\0\376\376\0\16"
+  "\16\0\376\376\0\376\376\0\376\376\0\376\376\0\375\375\0\376\376\0\376\376"
+  "\0\376\376\0\360\360\0\360\360\0\360\360\0\360\360\0\16\16\0\360\360\0\360"
+  "\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0\24\24\0\22\22\0\"\"\0""88\0"
+  """88\0//\0OO\0pp\0pp\0WW\0\203\203\0\242\242\0\242\242\0qq\0\256\256\0\312"
+  "\312\0\301\301\0||\0\313\313\0\342\342\0\325\325\0yy\0\336\336\0\360\360"
+  "\0\342\342\0mm\0\353\353\0\367\367\0\354\354\0\\\\\0\363\363\0\373\373\0"
+  "\362\362\0JJ\0\371\371\0\375\375\0\367\367\0""66\0\374\374\0\376\376\0\373"
+  "\373\0\"\"\0\376\376\0\376\376\0\375\375\0\16\16\0\376\376\0\376\376\0\376"
+  "\376\0\376\376\0\376\376\0\376\376\0\375\375\0\376\376\0\376\376\0\375\375"
+  "\0\360\360\0\374\374\0\360\360\0\376\376\0\16\16\0\360\360\0\360\360\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\24\24\0\22\22\0&&\0\"\"\0""88\0//\0PP\0HH\0gg\0NN"
+  "\0pp\0ee\0}}\0VV\0{{\0oo\0\202\202\0NN\0qq\0jj\0vv\0>>\0``\0\\\\\0cc\0,,"
+  "\0MM\0KK\0OO\0\35\35\0::\0""99\0;;\0\21\21\0**\0))\0**\0\10\10\0\33\33\0"
+  "\33\33\0\33\33\0\3\3\0\17\17\0\17\17\0\17\17\0\0\0\0\7\7\0\7\7\0\7\7\0\7"
+  "\7\0\2\2\0\2\2\0\2\2\0\2\2\0\16\16\0\16\16\0\16\16\0\16\16\0\360\360\0\360"
+  "\360\0\376\376\0\376\376\0\16\16\0\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22\22"
+  "\0&&\0&&\0\"\"\0""66\0[[\0oo\0ee\0``\0\220\220\0\270\270\0\250\250\0xx\0"
+  "\250\250\0\327\327\0\311\311\0zz\0\246\246\0\341\341\0\325\325\0rr\0\230"
+  "\230\0\343\343\0\334\334\0gg\0\205\205\0\344\344\0\340\340\0[[\0rr\0\346"
+  "\346\0\344\344\0NN\0^^\0\352\352\0\352\352\0AA\0JJ\0\357\357\0\357\357\0"
+  """11\0""66\0\364\364\0\364\364\0\40\40\0\"\"\0\371\371\0\371\371\0\16\16"
+  "\0\16\16\0\375\375\0\375\375\0\376\376\0\376\376\0\362\362\0\362\362\0\376"
+  "\376\0\376\376\0\16\16\0\16\16\0\376\376\0\376\376\0\376\376\0\16\16\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\22\22\0&&\0&&\0\37\37\0;;\0``\0``\0HH\0qq\0\237\237"
+  "\0\237\237\0nn\0\227\227\0\306\306\0\306\306\0}}\0\254\254\0\334\334\0\334"
+  "\334\0}}\0\275\275\0\347\347\0\347\347\0vv\0\316\316\0\357\357\0\357\357"
+  "\0ii\0\334\334\0\365\365\0\365\365\0ZZ\0\351\351\0\371\371\0\371\371\0II"
+  "\0\362\362\0\374\374\0\374\374\0""66\0\370\370\0\376\376\0\376\376\0\"\""
+  "\0\374\374\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376\0\376\376\0\376"
+  "\376\0\375\375\0\376\376\0\376\376\0\376\376\0\360\360\0\360\360\0\360\360"
+  "\0\360\360\0\16\16\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "&&\0&&\0##\0--\0``\0``\0TT\0cc\0\237\237\0\231\231\0||\0\223\223\0\306\306"
+  "\0\301\301\0\217\217\0\267\267\0\336\336\0\322\322\0\220\220\0\317\317\0"
+  "\352\352\0\334\334\0\202\202\0\337\337\0\362\362\0\345\345\0qq\0\353\353"
+  "\0\370\370\0\354\354\0^^\0\363\363\0\373\373\0\362\362\0JJ\0\371\371\0\375"
+  "\375\0\367\367\0""66\0\374\374\0\376\376\0\373\373\0\"\"\0\376\376\0\376"
+  "\376\0\375\375\0\16\16\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376"
+  "\0\376\376\0\375\375\0\376\376\0\376\376\0\375\375\0\360\360\0\376\376\0"
+  "\360\360\0\376\376\0\16\16\0\376\376\0\376\376\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "&&\0##\0""77\0--\0``\0PP\0nn\0[[\0\222\222\0kk\0\211\211\0qq\0\231\231\0"
+  "ff\0\210\210\0uu\0\217\217\0UU\0vv\0ll\0zz\0@@\0aa\0]]\0dd\0,,\0MM\0KK\0"
+  "OO\0\35\35\0::\0""99\0;;\0\21\21\0**\0))\0**\0\10\10\0\33\33\0\33\33\0\33"
+  "\33\0\3\3\0\17\17\0\17\17\0\17\17\0\0\0\0\7\7\0\7\7\0\7\7\0\7\7\0\2\2\0\2"
+  "\2\0\2\2\0\2\2\0\16\16\0\16\16\0\16\16\0\16\16\0\360\360\0\360\360\0\376"
+  "\376\0\376\376\0\16\16\0\376\376\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0##\0""77\0""77"
+  "\0--\0UU\0zz\0\216\216\0ww\0}}\0\254\254\0\324\324\0\264\264\0\207\207\0"
+  "\266\266\0\345\345\0\316\316\0\177\177\0\254\254\0\346\346\0\326\326\0rr"
+  "\0\231\231\0\344\344\0\334\334\0gg\0\206\206\0\344\344\0\340\340\0[[\0rr"
+  "\0\346\346\0\344\344\0NN\0^^\0\352\352\0\352\352\0AA\0JJ\0\357\357\0\357"
+  "\357\0""11\0""66\0\364\364\0\364\364\0\40\40\0\"\"\0\371\371\0\371\371\0"
+  "\16\16\0\16\16\0\375\375\0\375\375\0\376\376\0\376\376\0\362\362\0\362\362"
+  "\0\376\376\0\376\376\0\16\16\0\16\16\0\376\376\0\376\376\0\376\376\0\16\16"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\22\22\0""77\0""77\0--\0CC\0~~\0~~\0\\\\\0||\0"
+  "\274\274\0\274\274\0||\0\235\235\0\325\325\0\325\325\0\204\204\0\256\256"
+  "\0\340\340\0\340\340\0\177\177\0\275\275\0\351\351\0\351\351\0vv\0\316\316"
+  "\0\360\360\0\360\360\0ii\0\334\334\0\365\365\0\365\365\0ZZ\0\351\351\0\371"
+  "\371\0\371\371\0II\0\362\362\0\374\374\0\374\374\0""66\0\370\370\0\376\376"
+  "\0\376\376\0\"\"\0\374\374\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376"
+  "\0\376\376\0\376\376\0\375\375\0\376\376\0\376\376\0\376\376\0\360\360\0"
+  "\360\360\0\360\360\0\360\360\0\16\16\0\376\376\0\376\376\0\16\16\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0&&\0""77\0""22\0--\0``\0vv\0pp\0gg\0\243\243\0\255\255"
+  "\0\225\225\0\231\231\0\311\311\0\314\314\0\235\235\0\271\271\0\337\337\0"
+  "\326\326\0\224\224\0\320\320\0\352\352\0\336\336\0\204\204\0\337\337\0\362"
+  "\362\0\345\345\0qq\0\353\353\0\370\370\0\354\354\0^^\0\363\363\0\373\373"
+  "\0\362\362\0JJ\0\371\371\0\375\375\0\367\367\0""66\0\374\374\0\376\376\0"
+  "\373\373\0\"\"\0\376\376\0\376\376\0\375\375\0\16\16\0\376\376\0\376\376"
+  "\0\376\376\0\376\376\0\376\376\0\376\376\0\375\375\0\376\376\0\376\376\0"
+  "\375\375\0\360\360\0\376\376\0\360\360\0\376\376\0\16\16\0\376\376\0\376"
+  "\376\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0&&\0##\0FF\0""99\0``\0PP\0\200\200\0dd\0\222"
+  "\222\0kk\0\222\222\0vv\0\231\231\0ff\0\213\213\0ww\0\217\217\0UU\0xx\0mm"
+  "\0zz\0@@\0bb\0]]\0dd\0,,\0MM\0KK\0OO\0\35\35\0::\0""99\0;;\0\21\21\0**\0"
+  "))\0**\0\10\10\0\33\33\0\33\33\0\33\33\0\3\3\0\17\17\0\17\17\0\17\17\0\0"
+  "\0\0\7\7\0\7\7\0\7\7\0\7\7\0\2\2\0\2\2\0\2\2\0\2\2\0\16\16\0\16\16\0\16\16"
+  "\0\16\16\0\360\360\0\360\360\0\376\376\0\376\376\0\16\16\0\376\376\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0##\0""77\0""77\0""99\0^^\0zz\0\216\216\0\201\201\0\203"
+  "\203\0\254\254\0\324\324\0\271\271\0\211\211\0\266\266\0\345\345\0\317\317"
+  "\0\200\200\0\254\254\0\346\346\0\326\326\0ss\0\231\231\0\344\344\0\334\334"
+  "\0gg\0\206\206\0\344\344\0\340\340\0[[\0rr\0\346\346\0\344\344\0NN\0^^\0"
+  "\352\352\0\352\352\0AA\0JJ\0\357\357\0\357\357\0""11\0""66\0\364\364\0\364"
+  "\364\0\40\40\0\"\"\0\371\371\0\371\371\0\16\16\0\16\16\0\375\375\0\375\375"
+  "\0\376\376\0\376\376\0\362\362\0\362\362\0\376\376\0\376\376\0\16\16\0\16"
+  "\16\0\376\376\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22\22"
+  "\0""77\0""77\0--\0MM\0\210\210\0\210\210\0\\\\\0\202\202\0\302\302\0\302"
+  "\302\0||\0\240\240\0\330\330\0\330\330\0\204\204\0\257\257\0\341\341\0\341"
+  "\341\0\177\177\0\275\275\0\351\351\0\351\351\0vv\0\316\316\0\360\360\0\360"
+  "\360\0ii\0\334\334\0\365\365\0\365\365\0ZZ\0\351\351\0\371\371\0\371\371"
+  "\0II\0\362\362\0\374\374\0\374\374\0""66\0\370\370\0\376\376\0\376\376\0"
+  "\"\"\0\374\374\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376\0\376\376"
+  "\0\376\376\0\375\375\0\376\376\0\376\376\0\376\376\0\360\360\0\360\360\0"
+  "\360\360\0\360\360\0\16\16\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0&&\0""77\0""22\0--\0``\0vv\0xx\0kk\0\245\245\0\257\257\0\235\235"
+  "\0\234\234\0\312\312\0\315\315\0\241\241\0\272\272\0\337\337\0\326\326\0"
+  "\225\225\0\320\320\0\352\352\0\336\336\0\204\204\0\337\337\0\362\362\0\345"
+  "\345\0qq\0\353\353\0\370\370\0\354\354\0^^\0\363\363\0\373\373\0\362\362"
+  "\0JJ\0\371\371\0\375\375\0\367\367\0""66\0\374\374\0\376\376\0\373\373\0"
+  "\"\"\0\376\376\0\376\376\0\375\375\0\16\16\0\376\376\0\376\376\0\376\376"
+  "\0\376\376\0\376\376\0\376\376\0\375\375\0\376\376\0\376\376\0\375\375\0"
+  "\360\360\0\376\376\0\360\360\0\376\376\0\16\16\0\376\376\0\376\376\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0&&\0##\0FF\0""99\0``\0PP\0\200\200\0dd\0\222\222\0kk"
+  "\0\222\222\0vv\0\231\231\0ff\0\213\213\0ww\0\217\217\0UU\0xx\0mm\0zz\0@@"
+  "\0bb\0]]\0dd\0,,\0MM\0KK\0OO\0\35\35\0::\0""99\0;;\0\21\21\0**\0))\0**\0"
+  "\10\10\0\33\33\0\33\33\0\33\33\0\3\3\0\17\17\0\17\17\0\17\17\0\0\0\0\7\7"
+  "\0\7\7\0\7\7\0\7\7\0\2\2\0\2\2\0\2\2\0\2\2\0\16\16\0\16\16\0\16\16\0\16\16"
+  "\0\360\360\0\360\360\0\376\376\0\376\376\0\16\16\0\376\376\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0##\0""77\0""77\0""99\0^^\0zz\0\216\216\0\201\201\0\203\203\0"
+  "\254\254\0\324\324\0\271\271\0\211\211\0\266\266\0\345\345\0\317\317\0\200"
+  "\200\0\254\254\0\346\346\0\326\326\0ss\0\231\231\0\344\344\0\334\334\0gg"
+  "\0\206\206\0\344\344\0\340\340\0[[\0rr\0\346\346\0\344\344\0NN\0^^\0\352"
+  "\352\0\352\352\0AA\0JJ\0\357\357\0\357\357\0""11\0""66\0\364\364\0\364\364"
+  "\0\40\40\0\"\"\0\371\371\0\371\371\0\16\16\0\16\16\0\375\375\0\375\375\0"
+  "\376\376\0\376\376\0\362\362\0\362\362\0\376\376\0\376\376\0\16\16\0\16\16"
+  "\0\376\376\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22\22\0"
+  """77\0""77\0--\0MM\0\210\210\0\210\210\0\\\\\0\202\202\0\302\302\0\302\302"
+  "\0||\0\240\240\0\330\330\0\330\330\0\204\204\0\257\257\0\341\341\0\341\341"
+  "\0\177\177\0\275\275\0\351\351\0\351\351\0vv\0\316\316\0\360\360\0\360\360"
+  "\0ii\0\334\334\0\365\365\0\365\365\0ZZ\0\351\351\0\371\371\0\371\371\0II"
+  "\0\362\362\0\374\374\0\374\374\0""66\0\370\370\0\376\376\0\376\376\0\"\""
+  "\0\374\374\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376\0\376\376\0\376"
+  "\376\0\375\375\0\376\376\0\376\376\0\376\376\0\360\360\0\360\360\0\360\360"
+  "\0\360\360\0\16\16\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "&&\0""77\0""22\0--\0``\0vv\0xx\0kk\0\245\245\0\257\257\0\235\235\0\234\234"
+  "\0\312\312\0\315\315\0\241\241\0\272\272\0\337\337\0\326\326\0\225\225\0"
+  "\320\320\0\352\352\0\336\336\0\204\204\0\337\337\0\362\362\0\345\345\0qq"
+  "\0\353\353\0\370\370\0\354\354\0^^\0\363\363\0\373\373\0\362\362\0JJ\0\371"
+  "\371\0\375\375\0\367\367\0""66\0\374\374\0\376\376\0\373\373\0\"\"\0\376"
+  "\376\0\376\376\0\375\375\0\16\16\0\376\376\0\376\376\0\376\376\0\376\376"
+  "\0\376\376\0\376\376\0\375\375\0\376\376\0\376\376\0\375\375\0\360\360\0"
+  "\376\376\0\360\360\0\376\376\0\16\16\0\376\376\0\376\376\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0&&\0##\0FF\0""99\0``\0PP\0\200\200\0dd\0\222\222\0kk\0\222\222"
+  "\0vv\0\231\231\0ff\0\213\213\0ww\0\217\217\0UU\0xx\0mm\0zz\0@@\0bb\0]]\0"
+  "dd\0,,\0MM\0KK\0OO\0\35\35\0::\0""99\0;;\0\21\21\0**\0))\0**\0\10\10\0\33"
+  "\33\0\33\33\0\33\33\0\3\3\0\17\17\0\17\17\0\17\17\0\0\0\0\7\7\0\7\7\0\7\7"
+  "\0\7\7\0\2\2\0\2\2\0\2\2\0\2\2\0\16\16\0\16\16\0\16\16\0\16\16\0\360\360"
+  "\0\360\360\0\376\376\0\376\376\0\16\16\0\376\376\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0##\0""77\0""77\0""99\0^^\0zz\0\216\216\0\201\201\0\203\203\0\254\254\0"
+  "\324\324\0\271\271\0\211\211\0\266\266\0\345\345\0\317\317\0\200\200\0\254"
+  "\254\0\346\346\0\326\326\0ss\0\231\231\0\344\344\0\334\334\0gg\0\206\206"
+  "\0\344\344\0\340\340\0[[\0rr\0\346\346\0\344\344\0NN\0^^\0\352\352\0\352"
+  "\352\0AA\0JJ\0\357\357\0\357\357\0""11\0""66\0\364\364\0\364\364\0\40\40"
+  "\0\"\"\0\371\371\0\371\371\0\16\16\0\16\16\0\375\375\0\375\375\0\376\376"
+  "\0\376\376\0\362\362\0\362\362\0\376\376\0\376\376\0\16\16\0\16\16\0\376"
+  "\376\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22\22\0""77\0"
+  """77\0--\0MM\0\210\210\0\210\210\0\\\\\0\202\202\0\302\302\0\302\302\0||"
+  "\0\240\240\0\330\330\0\330\330\0\204\204\0\257\257\0\341\341\0\341\341\0"
+  "\177\177\0\275\275\0\351\351\0\351\351\0vv\0\316\316\0\360\360\0\360\360"
+  "\0ii\0\334\334\0\365\365\0\365\365\0ZZ\0\351\351\0\371\371\0\371\371\0II"
+  "\0\362\362\0\374\374\0\374\374\0""66\0\370\370\0\376\376\0\376\376\0\"\""
+  "\0\374\374\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376\0\376\376\0\376"
+  "\376\0\375\375\0\376\376\0\376\376\0\376\376\0\360\360\0\360\360\0\360\360"
+  "\0\360\360\0\16\16\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "&&\0""77\0""22\0--\0``\0vv\0xx\0kk\0\245\245\0\257\257\0\235\235\0\234\234"
+  "\0\312\312\0\315\315\0\241\241\0\272\272\0\337\337\0\326\326\0\225\225\0"
+  "\320\320\0\352\352\0\336\336\0\204\204\0\337\337\0\362\362\0\345\345\0qq"
+  "\0\353\353\0\370\370\0\354\354\0^^\0\363\363\0\373\373\0\362\362\0JJ\0\371"
+  "\371\0\375\375\0\367\367\0""66\0\374\374\0\376\376\0\373\373\0\"\"\0\376"
+  "\376\0\376\376\0\375\375\0\16\16\0\376\376\0\376\376\0\376\376\0\376\376"
+  "\0\376\376\0\376\376\0\375\375\0\376\376\0\376\376\0\375\375\0\360\360\0"
+  "\376\376\0\360\360\0\376\376\0\16\16\0\376\376\0\376\376\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0&&\0##\0FF\0""99\0``\0PP\0\200\200\0dd\0\222\222\0kk\0\222\222"
+  "\0vv\0\231\231\0ff\0\213\213\0ww\0\217\217\0UU\0xx\0mm\0zz\0@@\0bb\0]]\0"
+  "dd\0,,\0MM\0KK\0OO\0\35\35\0::\0""99\0;;\0\21\21\0**\0))\0**\0\10\10\0\33"
+  "\33\0\33\33\0\33\33\0\3\3\0\17\17\0\17\17\0\17\17\0\0\0\0\7\7\0\7\7\0\7\7"
+  "\0\7\7\0\2\2\0\2\2\0\2\2\0\2\2\0\16\16\0\16\16\0\16\16\0\16\16\0\360\360"
+  "\0\360\360\0\376\376\0\376\376\0\16\16\0\376\376\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0##\0""77\0""77\0""99\0^^\0zz\0\216\216\0\201\201\0\203\203\0\254\254\0"
+  "\324\324\0\271\271\0\211\211\0\266\266\0\345\345\0\317\317\0\200\200\0\254"
+  "\254\0\346\346\0\326\326\0ss\0\231\231\0\344\344\0\334\334\0gg\0\206\206"
+  "\0\344\344\0\340\340\0[[\0rr\0\346\346\0\344\344\0NN\0^^\0\352\352\0\352"
+  "\352\0AA\0JJ\0\357\357\0\357\357\0""11\0""66\0\364\364\0\364\364\0\40\40"
+  "\0\"\"\0\371\371\0\371\371\0\16\16\0\16\16\0\375\375\0\375\375\0\376\376"
+  "\0\376\376\0\362\362\0\362\362\0\376\376\0\376\376\0\16\16\0\16\16\0\376"
+  "\376\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22\22\0""77\0"
+  """77\0--\0MM\0\210\210\0\210\210\0\\\\\0\202\202\0\302\302\0\302\302\0||"
+  "\0\240\240\0\330\330\0\330\330\0\204\204\0\257\257\0\341\341\0\341\341\0"
+  "\177\177\0\275\275\0\351\351\0\351\351\0vv\0\316\316\0\360\360\0\360\360"
+  "\0ii\0\334\334\0\365\365\0\365\365\0ZZ\0\351\351\0\371\371\0\371\371\0II"
+  "\0\362\362\0\374\374\0\374\374\0""66\0\370\370\0\376\376\0\376\376\0\"\""
+  "\0\374\374\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376\0\376\376\0\376"
+  "\376\0\375\375\0\376\376\0\376\376\0\376\376\0\360\360\0\360\360\0\360\360"
+  "\0\360\360\0\16\16\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "&&\0""77\0""22\0--\0``\0vv\0xx\0kk\0\245\245\0\257\257\0\235\235\0\234\234"
+  "\0\312\312\0\315\315\0\241\241\0\272\272\0\337\337\0\326\326\0\225\225\0"
+  "\320\320\0\352\352\0\336\336\0\204\204\0\337\337\0\362\362\0\345\345\0qq"
+  "\0\353\353\0\370\370\0\354\354\0^^\0\363\363\0\373\373\0\362\362\0JJ\0\371"
+  "\371\0\375\375\0\367\367\0""66\0\374\374\0\376\376\0\373\373\0\"\"\0\376"
+  "\376\0\376\376\0\375\375\0\16\16\0\376\376\0\376\376\0\376\376\0\376\376"
+  "\0\376\376\0\376\376\0\375\375\0\376\376\0\376\376\0\375\375\0\360\360\0"
+  "\376\376\0\360\360\0\376\376\0\16\16\0\376\376\0\376\376\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0&&\0##\0FF\0""99\0``\0PP\0\213\213\0mm\0\237\237\0uu\0\275\275"
+  "\0\232\232\0\306\306\0\204\204\0\331\331\0\272\272\0\336\336\0\205\205\0"
+  "\345\345\0\320\320\0\352\352\0{{\0\355\355\0\337\337\0\362\362\0mm\0\363"
+  "\363\0\353\353\0\370\370\0\\\\\0\367\367\0\363\363\0\373\373\0II\0\373\373"
+  "\0\371\371\0\375\375\0""66\0\375\375\0\374\374\0\376\376\0\"\"\0\376\376"
+  "\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376\0\376\376\0\376\376\0\376"
+  "\376\0\376\376\0\376\376\0\376\376\0\375\375\0\376\376\0\375\375\0\375\375"
+  "\0\360\360\0\360\360\0\376\376\0\376\376\0\16\16\0\376\376\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0##\0""77\0""77\0""99\0gg\0\205\205\0\205\205\0ww\0\224\224\0"
+  "\310\310\0\310\310\0\247\247\0\240\240\0\354\354\0\354\354\0\306\306\0\227"
+  "\227\0\372\372\0\372\372\0\325\325\0\205\205\0\375\375\0\375\375\0\342\342"
+  "\0rr\0\376\376\0\376\376\0\354\354\0^^\0\376\376\0\376\376\0\363\363\0JJ"
+  "\0\376\376\0\376\376\0\370\370\0""66\0\376\376\0\376\376\0\374\374\0\"\""
+  "\0\376\376\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376\0\376\376\0\376"
+  "\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\375\375"
+  "\0\376\376\0\376\376\0\376\376\0\362\362\0\376\376\0\376\376\0\376\376\0"
+  "\16\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\22\22\0""77\0""77\0""11\0>>\0~~\0~~\0bb"
+  "\0__\0\261\261\0\261\261\0\212\212\0``\0\277\277\0\277\277\0\230\230\0SS"
+  "\0\275\275\0\275\275\0\233\233\0@@\0\273\273\0\273\273\0\240\240\0//\0\274"
+  "\274\0\274\274\0\252\252\0!!\0\301\301\0\301\301\0\266\266\0\25\25\0\311"
+  "\311\0\311\311\0\303\303\0\14\14\0\324\324\0\324\324\0\322\322\0\6\6\0\342"
+  "\342\0\342\342\0\341\341\0\1\1\0\361\361\0\361\361\0\361\361\0\15\15\0\15"
+  "\15\0\15\15\0\15\15\0\362\362\0\362\362\0\362\362\0\360\360\0\16\16\0\16"
+  "\16\0\16\16\0\2\2\0\376\376\0\376\376\0\376\376\0\16\16\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0&&\0""77\0""77\0\34\34\0SS\0kk\0\206\206\0BB\0\214\214\0\232\232"
+  "\0\302\302\0YY\0\250\250\0\255\255\0\340\340\0XX\0\264\264\0\264\264\0\355"
+  "\355\0SS\0\265\265\0\266\266\0\364\364\0JJ\0\270\270\0\272\272\0\371\371"
+  "\0AA\0\277\277\0\300\300\0\374\374\0""66\0\310\310\0\311\311\0\375\375\0"
+  "**\0\324\324\0\324\324\0\376\376\0\34\34\0\341\341\0\342\342\0\376\376\0"
+  "\15\15\0\361\361\0\361\361\0\376\376\0\361\361\0\15\15\0\15\15\0\376\376"
+  "\0\15\15\0\361\361\0\361\361\0\373\373\0\362\362\0\15\15\0\16\16\0\376\376"
+  "\0\16\16\0\361\361\0\376\376\0\376\376\0\376\376\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0&&\0&&\0""77\0))\0SS\0SS\0kk\0DD\0\205\205\0}}\0\222\222\0WW\0\241\241"
+  "\0\230\230\0\245\245\0XX\0\261\261\0\252\252\0\261\261\0SS\0\264\264\0\263"
+  "\263\0\265\265\0JJ\0\270\270\0\271\271\0\272\272\0AA\0\276\276\0\300\300"
+  "\0\300\300\0""66\0\310\310\0\311\311\0\311\311\0**\0\324\324\0\324\324\0"
+  "\324\324\0\34\34\0\341\341\0\342\342\0\342\342\0\15\15\0\361\361\0\361\361"
+  "\0\361\361\0\361\361\0\15\15\0\15\15\0\15\15\0\15\15\0\361\361\0\361\361"
+  "\0\361\361\0\362\362\0\15\15\0\16\16\0\16\16\0\16\16\0\361\361\0\376\376"
+  "\0\376\376\0\376\376\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0&&\0&&\0&&\0))\0pp\0cc\0cc"
+  "\0QQ\0\261\261\0\244\244\0\244\244\0ll\0\335\335\0\323\323\0\323\323\0ww"
+  "\0\364\364\0\356\356\0\356\356\0ss\0\370\370\0\371\371\0\371\371\0ii\0\372"
+  "\372\0\375\375\0\375\375\0YY\0\374\374\0\376\376\0\376\376\0HH\0\375\375"
+  "\0\376\376\0\376\376\0""66\0\376\376\0\376\376\0\376\376\0\"\"\0\376\376"
+  "\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376\0\376\376\0\376\376\0\376"
+  "\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376"
+  "\0\375\375\0\376\376\0\376\376\0\376\376\0\361\361\0\376\376\0\376\376\0"
+  "\376\376\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0&&\0&&\0\40\40\0QQ\0pp\0pp\0KK"
+  "\0\215\215\0\261\261\0\261\261\0pp\0\274\274\0\337\337\0\337\337\0\200\200"
+  "\0\332\332\0\364\364\0\364\364\0}}\0\350\350\0\373\373\0\373\373\0oo\0\361"
+  "\361\0\375\375\0\375\375\0]]\0\367\367\0\376\376\0\376\376\0JJ\0\373\373"
+  "\0\376\376\0\376\376\0""66\0\375\375\0\376\376\0\376\376\0\"\"\0\376\376"
+  "\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376\0\376\376\0\376\376\0\376"
+  "\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376"
+  "\0\375\375\0\376\376\0\376\376\0\376\376\0\361\361\0\376\376\0\376\376\0"
+  "\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0&&\0&&\0\20\20\0""88\0WW\0pp\0"
+  "==\0ss\0\212\212\0\252\252\0dd\0\250\250\0\264\264\0\312\312\0rr\0\313\313"
+  "\0\315\315\0\331\331\0rr\0\340\340\0\331\331\0\340\340\0hh\0\355\355\0\341"
+  "\341\0\345\345\0YY\0\366\366\0\350\350\0\352\352\0HH\0\372\372\0\356\356"
+  "\0\357\357\0""66\0\375\375\0\364\364\0\364\364\0\"\"\0\376\376\0\371\371"
+  "\0\371\371\0\16\16\0\376\376\0\375\375\0\375\375\0\376\376\0\376\376\0\361"
+  "\361\0\362\362\0\376\376\0\376\376\0\16\16\0\16\16\0\376\376\0\375\375\0"
+  "\376\376\0\375\375\0\374\374\0\360\360\0\376\376\0\376\376\0\360\360\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\24\24\0\24\24\0&&\0\40\40\0""88\0""88\0WW\0BB\0ff"
+  "\0ZZ\0}}\0^^\0\226\226\0\201\201\0\241\241\0nn\0\301\301\0\246\246\0\277"
+  "\277\0rr\0\333\333\0\301\301\0\321\321\0ii\0\353\353\0\323\323\0\335\335"
+  "\0[[\0\365\365\0\341\341\0\346\346\0II\0\372\372\0\353\353\0\356\356\0""6"
+  "6\0\375\375\0\363\363\0\364\364\0\"\"\0\376\376\0\371\371\0\371\371\0\16"
+  "\16\0\376\376\0\375\375\0\375\375\0\376\376\0\376\376\0\361\361\0\361\361"
+  "\0\376\376\0\376\376\0\16\16\0\16\16\0\376\376\0\374\374\0\375\375\0\374"
+  "\374\0\374\374\0\361\361\0\376\376\0\360\360\0\360\360\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\24\24\0\24\24\0\24\24\0\40\40\0HH\0""88\0""88\0BB\0~~\0ff\0ff\0"
+  "^^\0\256\256\0\226\226\0\226\226\0qq\0\325\325\0\277\277\0\277\277\0ss\0"
+  "\350\350\0\331\331\0\331\331\0jj\0\363\363\0\353\353\0\353\353\0[[\0\371"
+  "\371\0\365\365\0\365\365\0II\0\374\374\0\372\372\0\372\372\0""66\0\375\375"
+  "\0\375\375\0\375\375\0\"\"\0\376\376\0\376\376\0\376\376\0\16\16\0\376\376"
+  "\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0"
+  "\376\376\0\376\376\0\376\376\0\376\376\0\374\374\0\374\374\0\374\374\0\376"
+  "\376\0\361\361\0\360\360\0\360\360\0\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\24\24\0\24\24\0\24\24\0\40\40\0HH\0HH\0""88\0BB\0~~\0~~\0ff\0^^\0\263"
+  "\263\0\263\263\0\231\231\0nn\0\330\330\0\330\330\0\274\274\0pp\0\353\353"
+  "\0\353\353\0\324\324\0hh\0\365\365\0\365\365\0\345\345\0ZZ\0\373\373\0\373"
+  "\373\0\361\361\0II\0\375\375\0\375\375\0\370\370\0""66\0\376\376\0\376\376"
+  "\0\374\374\0\"\"\0\376\376\0\376\376\0\376\376\0\16\16\0\376\376\0\376\376"
+  "\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0\376\376\0"
+  "\376\376\0\374\374\0\374\374\0\376\376\0\376\376\0\361\361\0\360\360\0\360"
+  "\360\0\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0\24\24\0\0\0"
+  "\0\0\0\0((\0HH\0\40\40\0\25\25\0QQ\0\207\207\0KK\0--\0}}\0\262\262\0bb\0"
+  """44\0\235\235\0\320\320\0ff\0""00\0\257\257\0\341\341\0cc\0))\0\272\272"
+  "\0\354\354\0ZZ\0\37\37\0\303\303\0\363\363\0OO\0\26\26\0\314\314\0\370\370"
+  "\0AA\0\15\15\0\326\326\0\373\373\0""22\0\6\6\0\343\343\0\375\375\0!!\0\1"
+  "\1\0\362\362\0\376\376\0\16\16\0\16\16\0\16\16\0\375\375\0\375\375\0\375"
+  "\375\0\376\376\0\362\362\0\360\360\0\361\361\0\376\376\0\14\14\0\0\0\0\0"
+  "\0\0\360\360\0\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24"
+  "\0\24\24\0\0\0\0\0\0\0((\0((\0\0\0\0\0\0\0<<\0<<\0\0\0\0\0\0\0PP\0PP\0\10"
+  "\10\0\4\4\0dd\0dd\0\14\14\0\6\6\0xx\0xx\0\14\14\0\5\5\0\214\214\0\214\214"
+  "\0\13\13\0\4\4\0\240\240\0\240\240\0\10\10\0\2\2\0\264\264\0\264\264\0\5"
+  "\5\0\1\1\0\310\310\0\310\310\0\3\3\0\0\0\0\334\334\0\334\334\0\1\1\0\0\0"
+  "\0\360\360\0\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\1\1\0\1\1\0\0\0\0\0\0\0\14"
+  "\14\0\14\14\0\0\0\0\0\0\0\360\360\0\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0\24\24\0\0\0\0\0\0\0((\0((\0\0\0\0\0\0"
+  "\0<<\0<<\0\0\0\0\0\0\0XX\0XX\0\0\0\0\0\0\0pp\0pp\0\0\0\0\0\0\0\204\204\0"
+  "\204\204\0\0\0\0\0\0\0\227\227\0\227\227\0\0\0\0\0\0\0\250\250\0\250\250"
+  "\0\0\0\0\0\0\0\271\271\0\271\271\0\0\0\0\0\0\0\313\313\0\313\313\0\0\0\0"
+  "\0\0\0\335\335\0\335\335\0\0\0\0\0\0\0\360\360\0\360\360\0\0\0\0\0\0\0\1"
+  "\1\0\1\1\0\0\0\0\0\0\0\14\14\0\14\14\0\0\0\0\0\0\0\360\360\0\360\360\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0"
+  "\24\24\0\24\24\0\0\0\0((\0((\0((\0\0\0\0<<\0HH\0HH\0\10\10\0PP\0dd\0dd\0"
+  "\14\14\0dd\0||\0||\0\14\14\0xx\0\221\221\0\221\221\0\13\13\0\214\214\0\243"
+  "\243\0\243\243\0\10\10\0\240\240\0\264\264\0\264\264\0\5\5\0\264\264\0\303"
+  "\303\0\303\303\0\3\3\0\310\310\0\322\322\0\322\322\0\1\1\0\334\334\0\341"
+  "\341\0\341\341\0\0\0\0\360\360\0\361\361\0\361\361\0\1\1\0\0\0\0\14\14\0"
+  "\14\14\0\14\14\0\0\0\0\360\360\0\360\360\0\360\360\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\24\24\0"
+  "\24\24\0\20\20\0\20\20\0""88\0""88\0**\0**\0ZZ\0ZZ\0==\0==\0yy\0yy\0II\0"
+  "II\0\224\224\0\224\224\0NN\0NN\0\254\254\0\254\254\0MM\0MM\0\302\302\0\302"
+  "\302\0HH\0HH\0\324\324\0\324\324\0>>\0>>\0\343\343\0\343\343\0""00\0""00"
+  "\0\356\356\0\356\356\0\40\40\0\40\40\0\367\367\0\367\367\0\16\16\0\16\16"
+  "\0\374\374\0\374\374\0\374\374\0\374\374\0\360\360\0\360\360\0\360\360\0"
+  "\360\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+};
+
+/**
+ * \brief Returns the BlitAlpha test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImageBlitAlpha()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imageBlitAlpha.pixel_data,
+        SDLTest_imageBlitAlpha.width,
+        SDLTest_imageBlitAlpha.height,
+        SDLTest_imageBlitAlpha.bytes_per_pixel * 8,
+        SDLTest_imageBlitAlpha.width * SDLTest_imageBlitAlpha.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_imageBlitBlend.c b/Source/3rd Party/sdl/src/test/SDL_test_imageBlitBlend.c
new file mode 100644
index 000000000..f849d730d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_imageBlitBlend.c	
@@ -0,0 +1,2843 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+/* GIMP RGB C-Source image dump (alpha.c) */
+
+const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendAdd = {
+  80, 60, 3,
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0dd\0\310\310\0\310\310\0\310\310\0\310"
+  "\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310"
+  "\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0"
+  "\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310"
+  "\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310"
+  "\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0"
+  "\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310"
+  "\310\0dd\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0dd\0dd\0dd\0dd\0\310\310\0\310\310\0\310\310\0\310\310\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310"
+  "\0\310\310\0\310\310\0\310\310\0dd\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0dd\0\310\310\0\310\310\0\310\310\0\310\310"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\310\310\0\310\310\0\310\310\0\310\310\0dd\0dd\0dd"
+  "\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0dd\0\310\310\0\310\310\0"
+  "\310\310\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0\310"
+  "\310\0\310\310\0\310\310\0dd\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0"
+  "dd\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0"
+  "dd\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0dd\0\310\310\0\310\310\0\310\310"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\310\310\0\310\310\0\310\310\0dd\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd"
+  "\0\310\310\0\310\310\0\310\310\0\310\310\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310"
+  "\310\0\310\310\0\310\310\0\310\310\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0\310\310\0\310\310"
+  "\0\310\310\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310"
+  "\310\0\310\310\0\310\310\0\310\310\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\310\310\0\310\310\0\310"
+  "\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\310\310\0\310\310\0\310\310\0dd\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\310\310\0\310"
+  "\310\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\310\310\0\310\310\0\310\310\0dd\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310"
+  "\0\310\310\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0\310\310"
+  "\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\310\310\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\310\310\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0dd\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310"
+  "\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\310\310\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\310\310\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0dd\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\310\310\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\310\310\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0dd\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310"
+  "\310\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310"
+  "\310\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310"
+  "\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310"
+  "\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\310"
+  "\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0\310"
+  "\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\377\377\0\377\377\0\310\310"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\310\310\0\377\377\0\377\377\0\310\310\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\310\0\310\310"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0\310\310"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\310\310\0\310\310\0\310\310\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310"
+  "\0\310\310\0\310\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0dd\0\310\310\0\310\310\0\310\310\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310"
+  "\310\0\310\310\0\310\310\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\310\310\0\310\310\0dd\0\310\310\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\310\310\0"
+  "dd\0\310\310\0\310\310\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0\310\310\0\310\310\0\310\310\0\310\310"
+  "\0\377\377\0\377\377\0\377\377\0\310\310\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\310\310\0\377\377\0\377\377\0\377\377\0\310\310\0\310\310\0\310"
+  "\310\0\310\310\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0\310\310\0\377\377\0\310\310\0\310\310"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\310\310\0\310\310\0\377\377\0\310\310\0dd"
+  "\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0dd\0dd\0dd\0\310\310\0\377\377\0\377\377\0\310\310\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\310\310\0\377\377\0\377\377\0\310\310\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd"
+  "\0\0\0\0\0\0\0dd\0\377\377\0\310\310\0\310\310\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\310\310\0\310\310\0\377\377\0dd\0\0"
+  "\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0"
+  "\0\0dd\0dd\0\0\0\0\0\0\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0"
+  "dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0"
+  "dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0dd\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0"
+  "dd\0dd\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0\0\0\0"
+  "\0\0\0dd\0dd\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0\310\310\0\310\310\0\0\0\0"
+  "\0\0\0\310\310\0\310\310\0\0\0\0\0\0\0\310\310\0\310\310\0\0\0\0\0\0\0\310"
+  "\310\0\310\310\0\0\0\0\0\0\0\310\310\0\310\310\0\0\0\0\0\0\0\310\310\0\310"
+  "\310\0\0\0\0\0\0\0\310\310\0\310\310\0\0\0\0\0\0\0\310\310\0\310\310\0\0"
+  "\0\0\0\0\0\310\310\0\310\310\0\0\0\0\0\0\0\310\310\0\310\310\0\0\0\0\0\0"
+  "\0dd\0dd\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0\0\0\0dd\0dd\0dd\0\0\0\0dd\0\310\310\0\310"
+  "\310\0dd\0dd\0\310\310\0\310\310\0dd\0dd\0\310\310\0\310\310\0dd\0dd\0\310"
+  "\310\0\310\310\0dd\0dd\0\310\310\0\310\310\0dd\0dd\0\310\310\0\310\310\0"
+  "dd\0dd\0\310\310\0\310\310\0dd\0dd\0\310\310\0\310\310\0dd\0dd\0\310\310"
+  "\0\310\310\0dd\0dd\0\310\310\0\310\310\0dd\0dd\0\310\310\0\310\310\0dd\0"
+  "\0\0\0dd\0dd\0dd\0\0\0\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0dd\0\310\310\0\310\310\0\310\310\0\310"
+  "\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310"
+  "\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0"
+  "\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310"
+  "\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310"
+  "\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0"
+  "\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310\310\0\310"
+  "\310\0dd\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+};
+
+/**
+ * \brief Returns the BlitBlendAdd test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImageBlitBlendAdd()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imageBlitBlendAdd.pixel_data,
+        SDLTest_imageBlitBlendAdd.width,
+        SDLTest_imageBlitBlendAdd.height,
+        SDLTest_imageBlitBlendAdd.bytes_per_pixel * 8,
+        SDLTest_imageBlitBlendAdd.width * SDLTest_imageBlitBlendAdd.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
+
+const SDLTest_SurfaceImage_t SDLTest_imageBlitBlend = {
+  80, 60, 3,
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0<<\0<<\0\240\240\0\240\240\0aa\0aa\0\240"
+  "\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0"
+  "aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240\240"
+  "\0\240\240\0aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0aa\0"
+  "aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240"
+  "\240\0\240\240\0\240\240\0dd\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0<<\0\240\240\0\240\240\0\240\240"
+  "\0aa\0\305\305\0\305\305\0\305\305\0ww\0\305\305\0\305\305\0\305\305\0ww"
+  "\0\305\305\0\305\305\0\305\305\0ww\0\305\305\0\305\305\0\305\305\0ww\0\305"
+  "\305\0\305\305\0\305\305\0ww\0\305\305\0\305\305\0\305\305\0ww\0\305\305"
+  "\0\305\305\0\305\305\0ww\0\305\305\0\305\305\0\305\305\0ww\0\305\305\0\305"
+  "\305\0\305\305\0ww\0\305\305\0\305\305\0\305\305\0ww\0\305\305\0\305\305"
+  "\0\305\305\0\305\305\0\240\240\0\240\240\0\240\240\0\240\240\0dd\0dd\0dd"
+  "\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0<<\0\240\240"
+  "\0\240\240\0\240\240\0aa\0\305\305\0\305\305\0\305\305\0ww\0\333\333\0\333"
+  "\333\0\305\305\0ww\0\333\333\0\333\333\0\305\305\0ww\0\333\333\0\333\333"
+  "\0\305\305\0ww\0\333\333\0\333\333\0\305\305\0ww\0\333\333\0\333\333\0\305"
+  "\305\0ww\0\333\333\0\333\333\0\305\305\0ww\0\333\333\0\333\333\0\305\305"
+  "\0ww\0\333\333\0\333\333\0\305\305\0ww\0\333\333\0\333\333\0\305\305\0ww"
+  "\0\333\333\0\333\333\0\305\305\0\305\305\0\305\305\0\305\305\0\240\240\0"
+  "\240\240\0\240\240\0\240\240\0dd\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0dd\0dd\0dd\0<<\0aa\0aa\0aa\0::\0HH\0HH\0HH\0++\0PP\0PP\0PP\0""00\0PP"
+  "\0PP\0PP\0""00\0PP\0PP\0PP\0""00\0PP\0PP\0PP\0""00\0PP\0PP\0PP\0""00\0PP"
+  "\0PP\0PP\0""00\0PP\0PP\0PP\0""00\0PP\0PP\0PP\0""00\0PP\0PP\0PP\0""00\0PP"
+  "\0PP\0PP\0PP\0HH\0HH\0HH\0HH\0aa\0aa\0aa\0aa\0dd\0dd\0dd\0dd\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0dd\0dd\0dd\0$$\0aa\0\305\305\0\305\305\0``\0\205\205\0\351\351\0"
+  "\351\351\0||\0\222\222\0\321\321\0\321\321\0\177\177\0\225\225\0\324\324"
+  "\0\321\321\0\177\177\0\225\225\0\324\324\0\321\321\0\177\177\0\225\225\0"
+  "\324\324\0\321\321\0\177\177\0\225\225\0\324\324\0\321\321\0\177\177\0\225"
+  "\225\0\324\324\0\321\321\0\177\177\0\225\225\0\324\324\0\321\321\0\177\177"
+  "\0\225\225\0\324\324\0\321\321\0\177\177\0\225\225\0\324\324\0\321\321\0"
+  "\177\177\0\225\225\0\324\324\0\321\321\0\222\222\0\222\222\0\321\321\0\314"
+  "\314\0\351\351\0\351\351\0\254\254\0\236\236\0\305\305\0\305\305\0aa\0<<"
+  "\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0<<\0dd\0\240\240\0\240\240\0aa\0\255\255"
+  "\0\322\322\0\322\322\0\177\177\0\315\315\0\343\343\0\343\343\0\211\211\0"
+  "\313\313\0\346\346\0\346\346\0\211\211\0\313\313\0\346\346\0\346\346\0\211"
+  "\211\0\313\313\0\346\346\0\346\346\0\211\211\0\313\313\0\346\346\0\346\346"
+  "\0\211\211\0\313\313\0\346\346\0\346\346\0\211\211\0\313\313\0\346\346\0"
+  "\346\346\0\211\211\0\313\313\0\346\346\0\346\346\0\211\211\0\313\313\0\346"
+  "\346\0\346\346\0\211\211\0\313\313\0\346\346\0\346\346\0\211\211\0\320\320"
+  "\0\327\327\0\327\327\0\322\322\0\276\276\0\322\322\0\322\322\0\305\305\0"
+  "yy\0\210\210\0\210\210\0dd\0<<\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0<<\0\210\210\0\240"
+  "\240\0\240\240\0aa\0\266\266\0\322\322\0\322\322\0\205\205\0\327\327\0\343"
+  "\343\0\343\343\0\215\215\0\346\346\0\357\357\0\331\331\0\222\222\0\347\347"
+  "\0\357\357\0\331\331\0\222\222\0\347\347\0\357\357\0\331\331\0\222\222\0"
+  "\347\347\0\357\357\0\331\331\0\222\222\0\347\347\0\357\357\0\331\331\0\222"
+  "\222\0\347\347\0\357\357\0\331\331\0\222\222\0\347\347\0\357\357\0\331\331"
+  "\0\222\222\0\347\347\0\357\357\0\331\331\0\222\222\0\347\347\0\357\357\0"
+  "\331\331\0\222\222\0\357\357\0\346\346\0\320\320\0\351\351\0\327\327\0\343"
+  "\343\0\276\276\0\333\333\0\322\322\0\266\266\0yy\0\240\240\0\210\210\0\240"
+  "\240\0<<\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0dd\0<<\0\240\240\0\210\210\0\240\240\0aa\0ww\0nn\0\177"
+  "\177\0MM\0SS\0OO\0SS\0""22\0WW\0TT\0XX\0""55\0UU\0UU\0XX\0""55\0UU\0UU\0"
+  "XX\0""55\0UU\0UU\0XX\0""55\0UU\0UU\0XX\0""55\0UU\0UU\0XX\0""55\0UU\0UU\0"
+  "XX\0""55\0UU\0UU\0XX\0""55\0UU\0UU\0XX\0""55\0UU\0XX\0TT\0TT\0LL\0OO\0SS"
+  "\0SS\0ss\0\177\177\0nn\0nn\0yy\0\210\210\0\240\240\0\240\240\0<<\0dd\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0<<"
+  "\0\240\240\0\240\240\0\210\210\0HH\0\205\205\0\351\351\0\333\333\0pp\0\225"
+  "\225\0\371\371\0\363\363\0\202\202\0\231\231\0\330\330\0\325\325\0\203\203"
+  "\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0"
+  "\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324"
+  "\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331"
+  "\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0"
+  "\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\325\325\0\231\231\0\231"
+  "\231\0\330\330\0\323\323\0\371\371\0\371\371\0\274\274\0\257\257\0\351\351"
+  "\0\351\351\0\205\205\0``\0\240\240\0\240\240\0\240\240\0<<\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0<<\0\240\240"
+  "\0\240\240\0RR\0\207\207\0\304\304\0\304\304\0nn\0\275\275\0\343\343\0\343"
+  "\343\0\205\205\0\324\324\0\352\352\0\352\352\0\214\214\0\316\316\0\352\352"
+  "\0\352\352\0\213\213\0\316\316\0\352\352\0\352\352\0\213\213\0\316\316\0"
+  "\352\352\0\352\352\0\213\213\0\316\316\0\352\352\0\352\352\0\213\213\0\316"
+  "\316\0\352\352\0\352\352\0\213\213\0\316\316\0\352\352\0\352\352\0\213\213"
+  "\0\316\316\0\352\352\0\352\352\0\213\213\0\316\316\0\352\352\0\352\352\0"
+  "\213\213\0\316\316\0\352\352\0\352\352\0\214\214\0\324\324\0\336\336\0\336"
+  "\336\0\331\331\0\310\310\0\343\343\0\343\343\0\325\325\0\217\217\0\254\254"
+  "\0\254\254\0\207\207\0aa\0\240\240\0\240\240\0<<\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0\240\240\0aa"
+  "\0\225\225\0\304\304\0\304\304\0\205\205\0\276\276\0\343\343\0\340\340\0"
+  "\222\222\0\333\333\0\352\352\0\351\351\0\226\226\0\347\347\0\362\362\0\333"
+  "\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361"
+  "\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0"
+  "\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351"
+  "\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230"
+  "\0\351\351\0\361\361\0\333\333\0\230\230\0\362\362\0\351\351\0\323\323\0"
+  "\366\366\0\336\336\0\351\351\0\304\304\0\351\351\0\343\343\0\304\304\0\217"
+  "\217\0\333\333\0\254\254\0\266\266\0aa\0\240\240\0\240\240\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0aa"
+  "\0\305\305\0\225\225\0\304\304\0ww\0\205\205\0ss\0\211\211\0RR\0VV\0PP\0"
+  "VV\0""33\0XX\0UU\0YY\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0YY\0UU\0UU\0MM\0QQ\0UU\0UU\0ww\0\211\211"
+  "\0ww\0||\0\217\217\0\254\254\0\266\266\0\305\305\0aa\0\240\240\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0aa\0\305"
+  "\305\0\305\305\0\225\225\0UU\0\222\222\0\366\366\0\340\340\0tt\0\231\231"
+  "\0\375\375\0\364\364\0\203\203\0\231\231\0\331\331\0\326\326\0\203\203\0"
+  "\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203"
+  "\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324"
+  "\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0"
+  "\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331"
+  "\331\0\324\324\0\203\203\0\231\231\0\331\331\0\326\326\0\231\231\0\231\231"
+  "\0\331\331\0\324\324\0\373\373\0\375\375\0\300\300\0\263\263\0\361\361\0"
+  "\366\366\0\222\222\0mm\0\266\266\0\305\305\0\305\305\0aa\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0<<\0\305\305\0"
+  "\305\305\0``\0\214\214\0\321\321\0\321\321\0rr\0\277\277\0\346\346\0\346"
+  "\346\0\206\206\0\324\324\0\353\353\0\353\353\0\215\215\0\316\316\0\353\353"
+  "\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0"
+  "\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316"
+  "\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213"
+  "\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0"
+  "\213\213\0\316\316\0\353\353\0\353\353\0\215\215\0\324\324\0\337\337\0\337"
+  "\337\0\331\331\0\312\312\0\346\346\0\346\346\0\330\330\0\224\224\0\271\271"
+  "\0\271\271\0\217\217\0nn\0\305\305\0\305\305\0<<\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0\305\305\0ww"
+  "\0\225\225\0\304\304\0\314\314\0\222\222\0\277\277\0\343\343\0\342\342\0"
+  "\226\226\0\333\333\0\352\352\0\351\351\0\227\227\0\350\350\0\362\362\0\333"
+  "\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361"
+  "\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0"
+  "\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351"
+  "\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230"
+  "\0\351\351\0\361\361\0\333\333\0\230\230\0\362\362\0\351\351\0\323\323\0"
+  "\370\370\0\336\336\0\352\352\0\306\306\0\354\354\0\344\344\0\305\305\0\227"
+  "\227\0\343\343\0\254\254\0\266\266\0ww\0\305\305\0\240\240\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0aa"
+  "\0\333\333\0\236\236\0\304\304\0ww\0\210\210\0tt\0\211\211\0RR\0VV\0PP\0"
+  "VV\0""33\0XX\0UU\0YY\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0YY\0UU\0UU\0MM\0QQ\0UU\0UU\0ww\0\211\211"
+  "\0ww\0}}\0\217\217\0\254\254\0\276\276\0\333\333\0aa\0\240\240\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0aa\0\305"
+  "\305\0\305\305\0\236\236\0XX\0\222\222\0\366\366\0\341\341\0tt\0\231\231"
+  "\0\375\375\0\364\364\0\203\203\0\231\231\0\331\331\0\326\326\0\203\203\0"
+  "\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203"
+  "\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324"
+  "\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0"
+  "\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331"
+  "\331\0\324\324\0\203\203\0\231\231\0\331\331\0\326\326\0\231\231\0\231\231"
+  "\0\331\331\0\324\324\0\373\373\0\375\375\0\300\300\0\263\263\0\361\361\0"
+  "\366\366\0\222\222\0pp\0\276\276\0\305\305\0\305\305\0aa\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0<<\0\305\305\0"
+  "\305\305\0``\0\217\217\0\324\324\0\324\324\0rr\0\300\300\0\347\347\0\347"
+  "\347\0\206\206\0\324\324\0\353\353\0\353\353\0\215\215\0\316\316\0\353\353"
+  "\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0"
+  "\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316"
+  "\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213"
+  "\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0"
+  "\213\213\0\316\316\0\353\353\0\353\353\0\215\215\0\324\324\0\337\337\0\337"
+  "\337\0\332\332\0\312\312\0\347\347\0\347\347\0\330\330\0\224\224\0\274\274"
+  "\0\274\274\0\222\222\0nn\0\305\305\0\305\305\0<<\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0\305\305\0ww"
+  "\0\225\225\0\304\304\0\314\314\0\225\225\0\300\300\0\344\344\0\342\342\0"
+  "\226\226\0\333\333\0\352\352\0\351\351\0\227\227\0\350\350\0\362\362\0\333"
+  "\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361"
+  "\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0"
+  "\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351"
+  "\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230"
+  "\0\351\351\0\361\361\0\333\333\0\230\230\0\362\362\0\351\351\0\323\323\0"
+  "\370\370\0\337\337\0\352\352\0\306\306\0\355\355\0\345\345\0\306\306\0\231"
+  "\231\0\343\343\0\254\254\0\266\266\0ww\0\305\305\0\240\240\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0aa"
+  "\0\333\333\0\236\236\0\304\304\0ww\0\210\210\0tt\0\211\211\0RR\0VV\0PP\0"
+  "VV\0""33\0XX\0UU\0YY\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0YY\0UU\0UU\0MM\0QQ\0UU\0UU\0ww\0\211\211"
+  "\0ww\0}}\0\217\217\0\254\254\0\276\276\0\333\333\0aa\0\240\240\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0aa\0\305"
+  "\305\0\305\305\0\236\236\0XX\0\222\222\0\366\366\0\341\341\0tt\0\231\231"
+  "\0\375\375\0\364\364\0\203\203\0\231\231\0\331\331\0\326\326\0\203\203\0"
+  "\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203"
+  "\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324"
+  "\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0"
+  "\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331"
+  "\331\0\324\324\0\203\203\0\231\231\0\331\331\0\326\326\0\231\231\0\231\231"
+  "\0\331\331\0\324\324\0\373\373\0\375\375\0\300\300\0\263\263\0\361\361\0"
+  "\366\366\0\222\222\0pp\0\276\276\0\305\305\0\305\305\0aa\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0<<\0\305\305\0"
+  "\305\305\0``\0\217\217\0\324\324\0\324\324\0rr\0\300\300\0\347\347\0\347"
+  "\347\0\206\206\0\324\324\0\353\353\0\353\353\0\215\215\0\316\316\0\353\353"
+  "\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0"
+  "\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316"
+  "\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213"
+  "\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0"
+  "\213\213\0\316\316\0\353\353\0\353\353\0\215\215\0\324\324\0\337\337\0\337"
+  "\337\0\332\332\0\312\312\0\347\347\0\347\347\0\330\330\0\224\224\0\274\274"
+  "\0\274\274\0\222\222\0nn\0\305\305\0\305\305\0<<\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0\305\305\0ww"
+  "\0\225\225\0\304\304\0\314\314\0\225\225\0\300\300\0\344\344\0\342\342\0"
+  "\226\226\0\333\333\0\352\352\0\351\351\0\227\227\0\350\350\0\362\362\0\333"
+  "\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361"
+  "\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0"
+  "\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351"
+  "\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230"
+  "\0\351\351\0\361\361\0\333\333\0\230\230\0\362\362\0\351\351\0\323\323\0"
+  "\370\370\0\337\337\0\352\352\0\306\306\0\355\355\0\345\345\0\306\306\0\231"
+  "\231\0\343\343\0\254\254\0\266\266\0ww\0\305\305\0\240\240\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0aa"
+  "\0\333\333\0\236\236\0\304\304\0ww\0\210\210\0tt\0\211\211\0RR\0VV\0PP\0"
+  "VV\0""33\0XX\0UU\0YY\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0YY\0UU\0UU\0MM\0QQ\0UU\0UU\0ww\0\211\211"
+  "\0ww\0}}\0\217\217\0\254\254\0\276\276\0\333\333\0aa\0\240\240\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0aa\0\305"
+  "\305\0\305\305\0\236\236\0XX\0\222\222\0\366\366\0\341\341\0tt\0\231\231"
+  "\0\375\375\0\364\364\0\203\203\0\231\231\0\331\331\0\326\326\0\203\203\0"
+  "\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203"
+  "\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324"
+  "\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0"
+  "\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331"
+  "\331\0\324\324\0\203\203\0\231\231\0\331\331\0\326\326\0\231\231\0\231\231"
+  "\0\331\331\0\324\324\0\373\373\0\375\375\0\300\300\0\263\263\0\361\361\0"
+  "\366\366\0\222\222\0pp\0\276\276\0\305\305\0\305\305\0aa\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0<<\0\305\305\0"
+  "\305\305\0``\0\217\217\0\324\324\0\324\324\0rr\0\300\300\0\347\347\0\347"
+  "\347\0\206\206\0\324\324\0\353\353\0\353\353\0\215\215\0\316\316\0\353\353"
+  "\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0"
+  "\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316"
+  "\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213"
+  "\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0"
+  "\213\213\0\316\316\0\353\353\0\353\353\0\215\215\0\324\324\0\337\337\0\337"
+  "\337\0\332\332\0\312\312\0\347\347\0\347\347\0\330\330\0\224\224\0\274\274"
+  "\0\274\274\0\222\222\0nn\0\305\305\0\305\305\0<<\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0\305\305\0ww"
+  "\0\225\225\0\304\304\0\314\314\0\225\225\0\300\300\0\344\344\0\342\342\0"
+  "\226\226\0\333\333\0\352\352\0\351\351\0\227\227\0\350\350\0\362\362\0\333"
+  "\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361"
+  "\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0"
+  "\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351"
+  "\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230"
+  "\0\351\351\0\361\361\0\333\333\0\230\230\0\362\362\0\351\351\0\323\323\0"
+  "\370\370\0\337\337\0\352\352\0\306\306\0\355\355\0\345\345\0\306\306\0\231"
+  "\231\0\343\343\0\254\254\0\266\266\0ww\0\305\305\0\240\240\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0aa"
+  "\0\333\333\0\236\236\0\304\304\0ww\0\210\210\0tt\0\211\211\0RR\0VV\0PP\0"
+  "VV\0""33\0XX\0UU\0YY\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0XX\0""66\0UU\0UU\0"
+  "XX\0""66\0UU\0UU\0XX\0""66\0UU\0YY\0UU\0UU\0MM\0QQ\0UU\0UU\0ww\0\211\211"
+  "\0ww\0}}\0\217\217\0\254\254\0\276\276\0\333\333\0aa\0\240\240\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0aa\0\305"
+  "\305\0\305\305\0\236\236\0XX\0\222\222\0\366\366\0\341\341\0tt\0\231\231"
+  "\0\375\375\0\364\364\0\203\203\0\231\231\0\331\331\0\326\326\0\203\203\0"
+  "\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203"
+  "\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0\324\324"
+  "\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331\331\0"
+  "\324\324\0\203\203\0\231\231\0\331\331\0\324\324\0\203\203\0\231\231\0\331"
+  "\331\0\324\324\0\203\203\0\231\231\0\331\331\0\326\326\0\231\231\0\231\231"
+  "\0\331\331\0\324\324\0\373\373\0\375\375\0\300\300\0\263\263\0\361\361\0"
+  "\366\366\0\222\222\0pp\0\276\276\0\305\305\0\305\305\0aa\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0<<\0\305\305\0"
+  "\305\305\0``\0\217\217\0\324\324\0\324\324\0rr\0\300\300\0\347\347\0\347"
+  "\347\0\206\206\0\324\324\0\353\353\0\353\353\0\215\215\0\316\316\0\353\353"
+  "\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0"
+  "\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213\0\316"
+  "\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0\213\213"
+  "\0\316\316\0\353\353\0\353\353\0\213\213\0\316\316\0\353\353\0\353\353\0"
+  "\213\213\0\316\316\0\353\353\0\353\353\0\215\215\0\324\324\0\337\337\0\337"
+  "\337\0\332\332\0\312\312\0\347\347\0\347\347\0\330\330\0\224\224\0\274\274"
+  "\0\274\274\0\222\222\0nn\0\305\305\0\305\305\0<<\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0\305\305\0ww"
+  "\0\225\225\0\304\304\0\314\314\0\225\225\0\300\300\0\344\344\0\342\342\0"
+  "\226\226\0\333\333\0\352\352\0\351\351\0\227\227\0\350\350\0\362\362\0\333"
+  "\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361"
+  "\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351\351\0"
+  "\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230\0\351"
+  "\351\0\361\361\0\333\333\0\230\230\0\351\351\0\361\361\0\333\333\0\230\230"
+  "\0\351\351\0\361\361\0\333\333\0\230\230\0\362\362\0\351\351\0\323\323\0"
+  "\370\370\0\337\337\0\352\352\0\306\306\0\355\355\0\345\345\0\306\306\0\231"
+  "\231\0\343\343\0\254\254\0\266\266\0ww\0\305\305\0\240\240\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0aa"
+  "\0\333\333\0\236\236\0\304\304\0ww\0\340\340\0\300\300\0\343\343\0\210\210"
+  "\0\354\354\0\333\333\0\352\352\0\215\215\0\361\361\0\350\350\0\362\362\0"
+  "\223\223\0\351\351\0\351\351\0\361\361\0\223\223\0\351\351\0\351\351\0\361"
+  "\361\0\223\223\0\351\351\0\351\351\0\361\361\0\223\223\0\351\351\0\351\351"
+  "\0\361\361\0\223\223\0\351\351\0\351\351\0\361\361\0\223\223\0\351\351\0"
+  "\351\351\0\361\361\0\223\223\0\351\351\0\351\351\0\361\361\0\223\223\0\351"
+  "\351\0\351\351\0\361\361\0\223\223\0\351\351\0\362\362\0\351\351\0\351\351"
+  "\0\323\323\0\336\336\0\351\351\0\351\351\0\304\304\0\343\343\0\305\305\0"
+  "\317\317\0\217\217\0\254\254\0\276\276\0\333\333\0aa\0\240\240\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0aa\0\305"
+  "\305\0\305\305\0\236\236\0\222\222\0\361\361\0\361\361\0\316\316\0\230\230"
+  "\0\373\373\0\373\373\0\344\344\0\231\231\0\375\375\0\375\375\0\357\357\0"
+  "\231\231\0\375\375\0\375\375\0\347\347\0\231\231\0\375\375\0\375\375\0\347"
+  "\347\0\231\231\0\375\375\0\375\375\0\347\347\0\231\231\0\375\375\0\375\375"
+  "\0\347\347\0\231\231\0\375\375\0\375\375\0\347\347\0\231\231\0\375\375\0"
+  "\375\375\0\347\347\0\231\231\0\375\375\0\375\375\0\347\347\0\231\231\0\375"
+  "\375\0\375\375\0\347\347\0\231\231\0\375\375\0\375\375\0\360\360\0\373\373"
+  "\0\375\375\0\375\375\0\347\347\0\367\367\0\373\373\0\373\373\0\326\326\0"
+  "\351\351\0\361\361\0\361\361\0\271\271\0\276\276\0\305\305\0\305\305\0aa"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0<<\0\305\305\0\305\305\0\236\236\0HH\0\271\271\0\271\271\0\224\224\0VV"
+  "\0\277\277\0\277\277\0\251\251\0DD\0\252\252\0\252\252\0\235\235\0FF\0\253"
+  "\253\0\253\253\0\224\224\0EE\0\253\253\0\253\253\0\224\224\0EE\0\253\253"
+  "\0\253\253\0\224\224\0EE\0\253\253\0\253\253\0\224\224\0EE\0\253\253\0\253"
+  "\253\0\224\224\0EE\0\253\253\0\253\253\0\224\224\0EE\0\253\253\0\253\253"
+  "\0\224\224\0EE\0\253\253\0\253\253\0\224\224\0EE\0\253\253\0\253\253\0\235"
+  "\235\0rr\0uu\0uu\0^^\0\272\272\0\277\277\0\277\277\0\230\230\0\205\205\0"
+  "\222\222\0\222\222\0MM\0\266\266\0\305\305\0\305\305\0<<\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0\305"
+  "\305\0\305\305\0RR\0\236\236\0\254\254\0\361\361\0VV\0\267\267\0\263\263"
+  "\0\356\356\0ee\0\247\247\0\244\244\0\356\356\0^^\0\251\251\0\247\247\0\365"
+  "\365\0bb\0\242\242\0\247\247\0\365\365\0bb\0\242\242\0\247\247\0\365\365"
+  "\0bb\0\242\242\0\247\247\0\365\365\0bb\0\242\242\0\247\247\0\365\365\0bb"
+  "\0\242\242\0\247\247\0\365\365\0bb\0\242\242\0\247\247\0\365\365\0bb\0\242"
+  "\242\0\247\247\0\365\365\0bb\0\242\242\0\247\247\0\365\365\0\252\252\0ee"
+  "\0jj\0\345\345\0tt\0\246\246\0\251\251\0\321\321\0\272\272\0ff\0\222\222"
+  "\0\322\322\0ww\0\210\210\0\305\305\0\305\305\0\240\240\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0\240\240"
+  "\0\305\305\0``\0\236\236\0\236\236\0\254\254\0VV\0\264\264\0\254\254\0\261"
+  "\261\0dd\0\246\246\0\240\240\0\243\243\0^^\0\251\251\0\246\246\0\246\246"
+  "\0bb\0\242\242\0\246\246\0\246\246\0bb\0\242\242\0\246\246\0\246\246\0bb"
+  "\0\242\242\0\246\246\0\246\246\0bb\0\242\242\0\246\246\0\246\246\0bb\0\242"
+  "\242\0\246\246\0\246\246\0bb\0\242\242\0\246\246\0\246\246\0bb\0\242\242"
+  "\0\246\246\0\246\246\0bb\0\242\242\0\246\246\0\246\246\0\251\251\0dd\0hh"
+  "\0hh\0pp\0\243\243\0\240\240\0\236\236\0\264\264\0cc\0\177\177\0ww\0ww\0"
+  "\225\225\0\305\305\0\240\240\0\240\240\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\240\240\0\240\240\0\240\240\0``"
+  "\0\351\351\0\333\333\0\333\333\0||\0\366\366\0\361\361\0\361\361\0\211\211"
+  "\0\373\373\0\371\371\0\371\371\0\221\221\0\375\375\0\374\374\0\374\374\0"
+  "\224\224\0\365\365\0\374\374\0\374\374\0\224\224\0\365\365\0\374\374\0\374"
+  "\374\0\224\224\0\365\365\0\374\374\0\374\374\0\224\224\0\365\365\0\374\374"
+  "\0\374\374\0\224\224\0\365\365\0\374\374\0\374\374\0\224\224\0\365\365\0"
+  "\374\374\0\374\374\0\224\224\0\365\365\0\374\374\0\374\374\0\224\224\0\365"
+  "\365\0\374\374\0\374\374\0\375\375\0\356\356\0\371\371\0\371\371\0\372\372"
+  "\0\340\340\0\361\361\0\361\361\0\364\364\0\307\307\0\333\333\0\333\333\0"
+  "\351\351\0\225\225\0\240\240\0\240\240\0\240\240\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\240\240\0\240\240"
+  "\0aa\0\304\304\0\351\351\0\351\351\0\205\205\0\340\340\0\366\366\0\366\366"
+  "\0\222\222\0\355\355\0\373\373\0\373\373\0\227\227\0\364\364\0\375\375\0"
+  "\375\375\0\230\230\0\360\360\0\375\375\0\375\375\0\230\230\0\360\360\0\375"
+  "\375\0\375\375\0\230\230\0\360\360\0\375\375\0\375\375\0\230\230\0\360\360"
+  "\0\375\375\0\375\375\0\230\230\0\360\360\0\375\375\0\375\375\0\230\230\0"
+  "\360\360\0\375\375\0\375\375\0\230\230\0\360\360\0\375\375\0\375\375\0\230"
+  "\230\0\360\360\0\375\375\0\375\375\0\373\373\0\356\356\0\373\373\0\373\373"
+  "\0\367\367\0\340\340\0\364\364\0\364\364\0\354\354\0\304\304\0\351\351\0"
+  "\351\351\0\322\322\0\210\210\0\240\240\0\240\240\0dd\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0\240\240\0\240"
+  "\240\0<<\0\240\240\0\305\305\0\351\351\0ww\0\320\320\0\301\301\0\324\324"
+  "\0\211\211\0\345\345\0\316\316\0\324\324\0\217\217\0\356\356\0\323\323\0"
+  "\326\326\0\223\223\0\354\354\0\323\323\0\326\326\0\223\223\0\354\354\0\323"
+  "\323\0\326\326\0\223\223\0\354\354\0\323\323\0\326\326\0\223\223\0\354\354"
+  "\0\323\323\0\326\326\0\223\223\0\354\354\0\323\323\0\326\326\0\223\223\0"
+  "\354\354\0\323\323\0\326\326\0\223\223\0\354\354\0\323\323\0\326\326\0\223"
+  "\223\0\354\354\0\323\323\0\326\326\0\362\362\0\344\344\0\261\261\0\272\272"
+  "\0\364\364\0\340\340\0\225\225\0\205\205\0\340\340\0\276\276\0\351\351\0"
+  "\266\266\0\240\240\0dd\0\240\240\0\240\240\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0\240\240\0aa\0\240"
+  "\240\0\240\240\0\305\305\0ww\0\305\305\0\240\240\0\266\266\0\205\205\0\333"
+  "\333\0\266\266\0\304\304\0\215\215\0\352\352\0\305\305\0\314\314\0\222\222"
+  "\0\352\352\0\305\305\0\314\314\0\222\222\0\352\352\0\305\305\0\314\314\0"
+  "\222\222\0\352\352\0\305\305\0\314\314\0\222\222\0\352\352\0\305\305\0\314"
+  "\314\0\222\222\0\352\352\0\305\305\0\314\314\0\222\222\0\352\352\0\305\305"
+  "\0\314\314\0\222\222\0\352\352\0\305\305\0\314\314\0\222\222\0\352\352\0"
+  "\305\305\0\314\314\0\361\361\0\335\335\0\242\242\0\236\236\0\333\333\0\312"
+  "\312\0ii\0aa\0\305\305\0\255\255\0\266\266\0\240\240\0\240\240\0\210\210"
+  "\0\240\240\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0aa\0\305\305\0\240\240\0\240\240\0ww\0\333"
+  "\333\0\305\305\0\305\305\0\205\205\0\351\351\0\333\333\0\333\333\0\217\217"
+  "\0\363\363\0\351\351\0\351\351\0\223\223\0\357\357\0\351\351\0\351\351\0"
+  "\223\223\0\357\357\0\351\351\0\351\351\0\223\223\0\357\357\0\351\351\0\351"
+  "\351\0\223\223\0\357\357\0\351\351\0\351\351\0\223\223\0\357\357\0\351\351"
+  "\0\351\351\0\223\223\0\357\357\0\351\351\0\351\351\0\223\223\0\357\357\0"
+  "\351\351\0\351\351\0\223\223\0\357\357\0\351\351\0\351\351\0\363\363\0\345"
+  "\345\0\333\333\0\333\333\0\340\340\0\312\312\0\305\305\0\305\305\0\322\322"
+  "\0\255\255\0\240\240\0\240\240\0\305\305\0\210\210\0dd\0dd\0dd\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd"
+  "\0dd\0dd\0aa\0\305\305\0\305\305\0\240\240\0ww\0\333\333\0\333\333\0\305"
+  "\305\0\205\205\0\355\355\0\355\355\0\336\336\0\215\215\0\364\364\0\364\364"
+  "\0\335\335\0\215\215\0\364\364\0\364\364\0\335\335\0\215\215\0\364\364\0"
+  "\364\364\0\335\335\0\215\215\0\364\364\0\364\364\0\335\335\0\215\215\0\364"
+  "\364\0\364\364\0\335\335\0\215\215\0\364\364\0\364\364\0\335\335\0\215\215"
+  "\0\364\364\0\364\364\0\335\335\0\215\215\0\364\364\0\364\364\0\335\335\0"
+  "\215\215\0\364\364\0\364\364\0\335\335\0\351\351\0\355\355\0\355\355\0\312"
+  "\312\0\305\305\0\322\322\0\322\322\0\255\255\0\240\240\0\305\305\0\305\305"
+  "\0\210\210\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0dd\0\305\305\0aa"
+  "\0""11\0\225\225\0\351\351\0\205\205\0HH\0\254\254\0\333\333\0ww\0BB\0\264"
+  "\264\0\340\340\0nn\0BB\0\264\264\0\340\340\0nn\0BB\0\264\264\0\340\340\0"
+  "nn\0BB\0\264\264\0\340\340\0nn\0BB\0\264\264\0\340\340\0nn\0BB\0\264\264"
+  "\0\340\340\0nn\0BB\0\264\264\0\340\340\0nn\0BB\0\264\264\0\340\340\0nn\0"
+  "BB\0\264\264\0\340\340\0nn\0nn\0\205\205\0\314\314\0\266\266\0\304\304\0"
+  "\351\351\0\236\236\0yy\0\210\210\0\305\305\0<<\0\0\0\0\0\0\0dd\0dd\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0"
+  "\0dd\0dd\0\25\25\0\14\14\0dd\0dd\0\25\25\0\14\14\0dd\0dd\0\25\25\0\14\14"
+  "\0dd\0dd\0\25\25\0\14\14\0dd\0dd\0\25\25\0\14\14\0dd\0dd\0\25\25\0\14\14"
+  "\0dd\0dd\0\25\25\0\14\14\0dd\0dd\0\25\25\0\14\14\0dd\0dd\0\25\25\0\14\14"
+  "\0dd\0dd\0\25\25\0\25\25\0\0\0\0\0\0\0$$\0$$\0\0\0\0\0\0\0<<\0<<\0\0\0\0"
+  "\0\0\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0dd\0dd\0"
+  "\0\0\0\0\0\0dd\0dd\0\0\0\0\0\0\0yy\0yy\0\0\0\0\0\0\0yy\0yy\0\0\0\0\0\0\0"
+  "yy\0yy\0\0\0\0\0\0\0yy\0yy\0\0\0\0\0\0\0yy\0yy\0\0\0\0\0\0\0yy\0yy\0\0\0"
+  "\0\0\0\0yy\0yy\0\0\0\0\0\0\0yy\0yy\0\0\0\0\0\0\0yy\0yy\0\0\0\0\0\0\0yy\0"
+  "yy\0\0\0\0\0\0\0$$\0$$\0\0\0\0\0\0\0<<\0<<\0\0\0\0\0\0\0dd\0dd\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0dd\0dd\0dd\0\0\0\0dd\0dd\0dd\0\0\0\0dd"
+  "\0\210\210\0\210\210\0\25\25\0dd\0\210\210\0\210\210\0\25\25\0dd\0\210\210"
+  "\0\210\210\0\25\25\0dd\0\210\210\0\210\210\0\25\25\0dd\0\210\210\0\210\210"
+  "\0\25\25\0dd\0\210\210\0\210\210\0\25\25\0dd\0\210\210\0\210\210\0\25\25"
+  "\0dd\0\210\210\0\210\210\0\25\25\0dd\0\210\210\0\210\210\0\25\25\0dd\0\210"
+  "\210\0\210\210\0\25\25\0dd\0\210\210\0\210\210\0$$\0\0\0\0<<\0<<\0<<\0\0"
+  "\0\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0dd\0dd\0<<\0<<\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0aa\0"
+  "aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240"
+  "\240\0aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240"
+  "\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0"
+  "aa\0aa\0\240\240\0\240\240\0aa\0aa\0\240\240\0\240\240\0\240\240\0\240\240"
+  "\0dd\0dd\0dd\0dd\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+};
+
+/**
+ * \brief Returns the BlitBlend test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImageBlitBlend()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imageBlitBlend.pixel_data,
+        SDLTest_imageBlitBlend.width,
+        SDLTest_imageBlitBlend.height,
+        SDLTest_imageBlitBlend.bytes_per_pixel * 8,
+        SDLTest_imageBlitBlend.width * SDLTest_imageBlitBlend.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
+
+const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendMod = {
+  80, 60, 3,
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+};
+
+/**
+ * \brief Returns the BlitBlendMod test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImageBlitBlendMod()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imageBlitBlendMod.pixel_data,
+        SDLTest_imageBlitBlendMod.width,
+        SDLTest_imageBlitBlendMod.height,
+        SDLTest_imageBlitBlendMod.bytes_per_pixel * 8,
+        SDLTest_imageBlitBlendMod.width * SDLTest_imageBlitBlendMod.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
+
+const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendNone = {
+  80, 60, 3,
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\0\0\0\0\0\0\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\0"
+  "\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\377\0\0\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\377\0\0\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\0\0\0\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\0\0\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0"
+  "\377\377\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377"
+  "\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377\377\0\377\377"
+  "\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\0\0\0\377\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0\0\0\0\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\0\0\0\377\377\0\377"
+  "\377\0\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\0\377\377\0"
+  "\377\377\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\0\0\0\0\0\0\377\377\0\377\377\0\377\377\0\377"
+  "\377\0\377\377\0\377\377\0\377\377\0\377\377\0\0\0\0\0\0\0\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377",
+};
+
+/**
+ * \brief Returns the BlitBlendNone test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImageBlitBlendNone()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imageBlitBlendNone.pixel_data,
+        SDLTest_imageBlitBlendNone.width,
+        SDLTest_imageBlitBlendNone.height,
+        SDLTest_imageBlitBlendNone.bytes_per_pixel * 8,
+        SDLTest_imageBlitBlendNone.width * SDLTest_imageBlitBlendNone.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
+
+const SDLTest_SurfaceImage_t SDLTest_imageBlitBlendAll = {
+  80, 60, 3,
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\4\0\0\0\0\0\0\0"
+  "\0\11\0\0\11\0\0\0\0\0\0\0\0\16\0\0\16\0\0\0\0\0\0\0\0\11\0\0\11\0\0\0\0"
+  "\0\0\0\0\14\0\0\14\0\0\0\0\0\0\0\0\17\0\0\17\0\0\0\0\0\0\0\0\21\0\0\21\0"
+  "\0\0\0\0\0\0\0K\0\0K\0\0\0\0\0\0\0\0T\0\0T\0\0\0\0\0\0\0\0^\0\0^\0\0\0\0"
+  "\0\0\0\0g\0\0g\0\0\0\0\0\0\0\0\317\0\0\317\0\0\317\0\0\317\0\0\317\0\0\317"
+  "\0\0\317\0\0\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\4\0\0\4\0\0\0\0\0\11\0\0\11\0\0\11"
+  "\0\0\0\0\0\16\0\0\16\0\0\16\0\0\0\0\0\22\0\0\22\0\0\11\0\0\0\0\0\14\0\0\14"
+  "\0\0\14\0\0\0\0\0\17\0\0\17\0\0\17\0\0\0\0\0\21\0\0\21\0\0\21\0\0\0\0\0\24"
+  "\0\0\24\0\0K\0\0\0\0\0T\0\0T\0\0T\0\0\0\0\0^\0\0^\0\0^\0\0\0\0\0g\0\0g\0"
+  "\0g\0\0\0\0\0q\0\0q\0\0\317\0\0\317\0\0\317\0\0\317\0\0\317\0\0\317\0\0\317"
+  "\0\0\317\0\0\317\0\0\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\4\0\0\4\0\0\4\0\0\0\0\0\11\0\0\11\0\0\11\0\0\0\0\0"
+  "\16\0\0\16\0\0\16\0\0\0\0\0\22\0\0\22\0\0\22\0\0\0\0\0\14\0\0\14\0\0\14\0"
+  "\0\0\0\0\17\0\0\17\0\0\17\0\0\0\0\0\21\0\0\21\0\0\21\0\0\0\0\0\24\0\0\24"
+  "\0\0\24\0\0\0\0\0T\0\0T\0\0T\0\0\0\0\0^\0\0^\0\0^\0\0\0\0\0g\0\0g\0\0g\0"
+  "\0\0\0\0q\0\0q\0\0q\0\0\317\0\0\317\0\0\317\0\0\317\0\0\317\0\0\317\0\0\317"
+  "\0\0\317\0\0\317\0\0\317\0\0\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\4\0\0\4\0\0\4\0\0\0\0\0\10\0\0\10\0\0\10\0\0\0\0\0\15"
+  "\0\0\15\0\0\15\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\16\0\0\16\0\0\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0J\0\0J\0\0J\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\317"
+  "\0\0\317\0\0\317\0\0\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\1\0\0\0\0\0\0\0\0\1\0\0\1\0\0\1\0\0\1"
+  "\0\0\4\0\0\4\0\0\0\0\0\0\0\0\7\0\0\7\0\0\0\0\0\0\0\0&\0\0&\0\0\32\0\0\32"
+  "\0\0&\0\0&\0\0&\0\0&\0\0C\0\0C\0\0\0\0\0\0\0\0^\0\0^\0\0\0\0\0\0\0\17\251"
+  "\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0\0\0\0\0"
+  "\0\0\0\317\0\0\317\0\0\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\6\2\0\6\2\0\0\1\0\0\0\0\0\1\0\0\1\0\0\1\0\0\1\0\0\1\0\0\1\0\0"
+  "\17\0\0\0\0\0\4\0\0\11\0\0\11\0\0\0\0\6+\0\6+\0\0&\0\0\32\0\0&\0\0&\0\0&"
+  "\0\0&\0\0""5\0\0""5\0\2\210\0\0\0\0\0C\0\0|\0\0|\0\0\0\0\17\251\0\17\251"
+  "\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251"
+  "\0$\360\0$\360\0\0\0\0\0\317\0\0\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1"
+  "\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\1\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\6\2\0\6\2\0\6\2\0\0\0\0\0\1\0\0\1\0\0\1\0\0\1\0\0\1\0\0\1"
+  "\0\0\1\0\0\0\0\0\17\0\0\17\0\0\4\0\0\0\0\6+\0\6+\0\6+\0\0\32\0\0&\0\0&\0"
+  "\0&\0\0&\0\0""5\0\0""5\0\0""5\0\0\0\0\2\210\0\2\210\0\0C\0\0\0\0\17\251\0"
+  "\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0\17\251\0"
+  "\17\251\0\17\251\0$\360\0$\360\0$\360\0\0\0\0\0\317\0\0\317\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\1\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "$\360\0$\360\0$\360\0$\360\0\0\0\0\0\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0"
+  "\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\14\1\0\14\1\0\14\1"
+  "\0\14\1\0\15\1\0\15\1\0\0\0\0\0\0\0\14\2\0\14\2\0\14\2\0\14\2\0\16\2\0\16"
+  "\2\0\0\0\0\0\0\0\14!\0\14!\0\14!\0\14!\0\17(\0\17(\0\0\0\0\0\0\0\14+\0\14"
+  "+\0\14+\0\14+\0\20""9\0\20""9\0\0\0\0\0\0\0\36\215\0\36\215\0\36\215\0\36"
+  "\215\0(\264\0(\264\0\0\0\0\0\0\0\36\251\0\36\251\0\36\251\0\36\251\0\36\251"
+  "\0\36\251\0\36\251\0\36\251\0\0\0\0\0\0\0$\360\0$\360\0$\360\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\1\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\36\3"
+  "\0\36\3\0\14\1\0\14\1\0\15\1\0\15\1\0\15\1\0\0\0\0\14\2\0\14\2\0\14\2\0\14"
+  "\2\0\16\2\0\16\2\0\16\2\0\0\0\0\14\3\0\14\3\0\14!\0\14!\0\17(\0\17(\0\17"
+  "(\0\0\0\0\14+\0\14+\0\14+\0\14+\0\20""9\0\20""9\0\20""9\0\0\0\0\14""7\0\14"
+  """7\0\36\215\0\36\215\0(\264\0(\264\0(\264\0\0\0\0\36\251\0\36\251\0\36\251"
+  "\0\36\251\0\36\251\0\36\251\0\36\251\0\36\251\0\36\251\0\36\251\0H\360\0"
+  "H\360\0\0\0\0$\360\0$\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\1\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\36\3\0\36\3\0\36\3\0\14\1\0\15\1\0\15\1\0\15\1"
+  "\0\0\0\0\14\2\0\14\2\0\14\2\0\14\2\0\16\2\0\16\2\0\16\2\0\0\0\0\14\3\0\14"
+  "\3\0\14\3\0\14!\0\17(\0\17(\0\17(\0\0\0\0\14+\0\14+\0\14+\0\14+\0\20""9\0"
+  "\20""9\0\20""9\0\0\0\0\14""7\0\14""7\0\14""7\0\36\215\0(\264\0(\264\0(\264"
+  "\0\0\0\0\36\251\0\36\251\0\36\251\0\36\251\0\36\251\0\36\251\0\36\251\0\36"
+  "\251\0\36\251\0\36\251\0\36\251\0H\360\0H\360\0H\360\0\0\0\0$\360\0$\360"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\13\1\0\13\1\0\13\1\0\13\1\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\11!\0"
+  "\11!\0\11!\0\11!\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\23n\0\23n\0\23n\0\23n\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0H\360\0H\360\0H\360\0H\360\0\0\0\0$\360\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\1\0\1\1\0\0\0\0\0\0\0\0\0\0\0\0\0\25\0\0\25\0\0\25\0\0\27\0"
+  "\0\13\0\0\13\0\0\1\0\0\11\0\0\4\0\0\4\0\0\0\0\0\0\0\0\25\3\0\25\3\0\0\0\0"
+  "\0\0\0\25\3\0\25\3\0\25\3\0\25\3\0\3\1\0\3\1\0\2\1\0\7\5\0\7\3\0\7\3\0\0"
+  "\0\0\0\0\0\25""4\0\25""4\0\0\0\0\0\0\0\25""4\0\25""4\0\25""4\0\25""4\0\20"
+  "\35\0\20\35\0\11\22\0\23F\0\34""6\0\34""6\0\0\0\0\0\0\0L\317\0L\317\0L\317"
+  "\0L\317\0L\317\0L\317\0L\317\0L\317\0\0\0\0\0\0\0""2\317\0""2\317\0""2\317"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\1\0\0\0\0\0\0\0\0\0\0\25\0\0\25"
+  "\0\0\25\0\0\4\0\0\5\0\0\2\0\0\1\0\0\4\0\0\14\0\0\14\0\0\0\0\0\37\7\0\37\7"
+  "\0\25\3\0\0\0\0\25\3\0\25\3\0\25\3\0\25\3\0\37\6\0\37\6\0\15\4\0\11\3\0\7"
+  "\3\0\14\10\0\14\10\0\0\0\0\25\16\0\25\16\0\25""4\0\0\0\0\25""4\0\25""4\0"
+  "\25""4\0\25""4\0&Q\0&Q\0&Q\0\31""5\0\34""6\0&j\0&j\0\0\0\0""5q\0""5q\0L\317"
+  "\0L\317\0L\317\0L\317\0L\317\0L\317\0L\317\0L\317\0L\317\0L\317\0\0\0\0""2"
+  "\317\0""2\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\1\1\0\0\0\0\0\0\0\25\0"
+  "\0\25\0\0\25\0\0\31\1\0\5\0\0\5\0\0\2\0\0\4\0\0\14\0\0\14\0\0\0\0\0\37\7"
+  "\0\37\7\0\37\7\0\0\0\0\25\3\0\25\3\0\25\3\0\25\3\0\37\6\0\37\6\0\37\6\0\11"
+  "\3\0\16\6\0\16\6\0\7\3\0\0\0\0\25\16\0\25\16\0\25\16\0\0\0\0\25""4\0\25""4"
+  "\0\25""4\0\25""4\0&Q\0&Q\0&Q\0\31""5\0+X\0+X\0\34""6\0\0\0\0""5q\0""5q\0"
+  """5q\0L\317\0L\317\0L\317\0L\317\0L\317\0L\317\0L\317\0L\317\0L\317\0L\317"
+  "\0L\317\0\0\0\0""2\317\0""2\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0"
+  "\0\0\0\0\25\0\0\25\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0L\317\0L\317\0L\317\0L\317"
+  "\0\0\0\0""2\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0e\4\0e\4\0\0\0\0\0\0\0e\11\0e\11\0\0\0\0\0\0\0e\16\0e\16\0\0\0\0\0\0"
+  "\0G\11\0G\11\0\0\0\0\0\0\0G\14\0G\14\0\0\0\0\0\0\0G\17\0G\17\0\0\0\0\0\0"
+  "\0G\21\0G\21\0\0\0\0\0\0\0GK\0GK\0\0\0\0\0\0\0GT\0GT\0\0\0\0\0\0\0G^\0G^"
+  "\0\0\0\0\0\0\0Gg\0Gg\0\0\0\0\0\0\0e\317\0e\317\0e\317\0e\317\0e\317\0e\317"
+  "\0e\317\0e\317\0\0\0\0\0\0\0L\317\0L\317\0L\317\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\1\0\0\0\0\0\0\0\0e\4\0e\4\0e\4\0\0\0\0e\11\0e\11\0e\11\0\0\0"
+  "\0e\16\0e\16\0e\16\0\0\0\0e\22\0e\22\0G\11\0\0\0\0G\14\0G\14\0G\14\0\0\0"
+  "\0G\17\0G\17\0G\17\0\0\0\0G\21\0G\21\0G\21\0\0\0\0G\24\0G\24\0GK\0\0\0\0"
+  "GT\0GT\0GT\0\0\0\0G^\0G^\0G^\0\0\0\0Gg\0Gg\0Gg\0\0\0\0Gq\0Gq\0e\317\0e\317"
+  "\0e\317\0e\317\0e\317\0e\317\0e\317\0e\317\0e\317\0e\317\0\0\0\0L\317\0L"
+  "\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0\0\0\0\0e\4\0e\4\0e\4\0\0\0"
+  "\0e\11\0e\11\0e\11\0\0\0\0e\16\0e\16\0e\16\0\0\0\0e\22\0e\22\0e\22\0\0\0"
+  "\0G\14\0G\14\0G\14\0\0\0\0G\17\0G\17\0G\17\0\0\0\0G\21\0G\21\0G\21\0\0\0"
+  "\0G\24\0G\24\0G\24\0\0\0\0GT\0GT\0GT\0\0\0\0G^\0G^\0G^\0\0\0\0Gg\0Gg\0Gg"
+  "\0\0\0\0Gq\0Gq\0Gq\0e\317\0e\317\0e\317\0e\317\0e\317\0e\317\0e\317\0e\317"
+  "\0e\317\0e\317\0e\317\0\0\0\0L\317\0L\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0e\4\0e\4\0e\4\0\0\0\0b\10\0b\10\0b\10\0\0\0\0b\15\0b\15\0b\15\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0<\16\0<\16\0<\16\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0""2J\0""2J\0""2J\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0e\317\0e\317\0e\317\0e"
+  "\317\0\0\0\0L\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\216\1\0c\0\0c\0\0\0\0\0"
+  "`\0\0c\0\0c\0\0\2\0\0c\1\0i\0\0i\0\0\0\0\0\0\0\0e\0\0e\0\0\0\0\0\0\0\0{\1"
+  "\0{\1\0f\0\0f\0\0z\1\0z\1\0z\1\0z\1\0)\4\0)\4\0\0\0\0\0\0\0Q\7\0Q\7\0\0\0"
+  "\0\0\0\0{&\0{&\0W\32\0W\32\0z&\0z&\0z&\0z&\0IC\0IC\0\0\0\0\0\0\0X^\0X^\0"
+  "\0\0\0\0\0\0\261\251\0\261\251\0\261\251\0\261\251\0\261\251\0\261\251\0"
+  "\261\251\0\261\251\0\0\0\0\0\0\0e\317\0e\317\0e\317\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\216\1\0c\0\0`\0\0\2\0\0c\0\0c\0\0c\0\0\12\0\0k\1\0i\0\0"
+  "\0\0\0\11\0\0i\0\0i\0\0\0\0\0\256\2\0\256\2\0{\1\0f\0\0z\1\0z\1\0z\1\0z\1"
+  "\0\221\1\0\221\1\0\221\17\0\0\0\0)\4\0c\11\0c\11\0\0\0\0\256+\0\256+\0{&"
+  "\0W\32\0z&\0z&\0z&\0z&\0\2415\0\2415\0\243\210\0\0\0\0IC\0{|\0{|\0\0\0\0"
+  "\261\251\0\261\251\0\261\251\0\261\251\0\261\251\0\261\251\0\261\251\0\261"
+  "\251\0\261\251\0\261\251\0\264\360\0\264\360\0\0\0\0e\317\0e\317\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\216\1\0\216\1\0`\0\0\2\0\0c\0\0c\0\0c\0\0\12\0\0"
+  "k\1\0k\1\0\0\0\0\11\0\0i\0\0i\0\0\0\0\0\256\2\0\256\2\0\256\2\0f\0\0z\1\0"
+  "z\1\0z\1\0z\1\0\221\1\0\221\1\0\221\1\0\0\0\0\221\17\0\221\17\0)\4\0\0\0"
+  "\0\256+\0\256+\0\256+\0W\32\0z&\0z&\0z&\0z&\0\2415\0\2415\0\2415\0\0\0\0"
+  "\243\210\0\243\210\0IC\0\0\0\0\261\251\0\261\251\0\261\251\0\261\251\0\261"
+  "\251\0\261\251\0\261\251\0\261\251\0\261\251\0\261\251\0\261\251\0\264\360"
+  "\0\264\360\0\264\360\0\0\0\0e\317\0e\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\216\1"
+  "\0\211\1\0c\0\0\2\0\0c\0\0c\0\0k\0\0\12\0\0k\1\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\264\360\0\264\360"
+  "\0\264\360\0\264\360\0\0\0\0e\317\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\211\1\0\216\1"
+  "\0c\0\0\2\0\0c\0\0k\0\0q\0\0\20\0\0\0\0\0\0\0\0\322\1\0\322\1\0\322\1\0\322"
+  "\1\0\346\1\0\346\1\0\0\0\0\0\0\0\322\2\0\322\2\0\322\2\0\322\2\0\363\2\0"
+  "\363\2\0\0\0\0\0\0\0\322!\0\322!\0\322!\0\322!\0\371(\0\371(\0\0\0\0\0\0"
+  "\0\322+\0\322+\0\322+\0\322+\0\3719\0\3719\0\0\0\0\0\0\0\325\215\0\325\215"
+  "\0\325\215\0\325\215\0\374\264\0\374\264\0\0\0\0\0\0\0\325\251\0\325\251"
+  "\0\325\251\0\325\251\0\325\251\0\325\251\0\325\251\0\325\251\0\0\0\0\0\0"
+  "\0\264\360\0\264\360\0\264\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\211\1\0\216"
+  "\1\0c\0\0\2\0\0f\0\0m\0\0m\0\0\0\0\0\325\3\0\325\3\0\322\1\0\322\1\0\346"
+  "\1\0\346\1\0\346\1\0\0\0\0\322\2\0\322\2\0\322\2\0\322\2\0\363\2\0\363\2"
+  "\0\363\2\0\0\0\0\322\3\0\322\3\0\322!\0\322!\0\371(\0\371(\0\371(\0\0\0\0"
+  "\322+\0\322+\0\322+\0\322+\0\3719\0\3719\0\3719\0\0\0\0\3227\0\3227\0\325"
+  "\215\0\325\215\0\374\264\0\374\264\0\374\264\0\0\0\0\325\251\0\325\251\0"
+  "\325\251\0\325\251\0\325\251\0\325\251\0\325\251\0\325\251\0\325\251\0\325"
+  "\251\0\330\360\0\330\360\0\0\0\0\264\360\0\264\360\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\216\1\0\216\1\0c\0\0\10\0\0m\0\0m\0\0\0\0\0\325\3\0\325\3\0\325"
+  "\3\0\322\1\0\346\1\0\346\1\0\346\1\0\0\0\0\322\2\0\322\2\0\322\2\0\322\2"
+  "\0\363\2\0\363\2\0\363\2\0\0\0\0\322\3\0\322\3\0\322\3\0\322!\0\371(\0\371"
+  "(\0\371(\0\0\0\0\322+\0\322+\0\322+\0\322+\0\3719\0\3719\0\3719\0\0\0\0\322"
+  "7\0\3227\0\3227\0\325\215\0\374\264\0\374\264\0\374\264\0\0\0\0\325\251\0"
+  "\325\251\0\325\251\0\325\251\0\325\251\0\325\251\0\325\251\0\325\251\0\325"
+  "\251\0\325\251\0\325\251\0\330\360\0\330\360\0\330\360\0\0\0\0\264\360\0"
+  "\264\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\216\1\0\216\1\0i\0\0\10\0\0m\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\275\1\0\275\1\0\275\1\0"
+  "\275\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\244!\0\244!\0\244!\0\244!\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\213n\0\213n\0\213n\0\213n\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\330\360\0\330\360\0\330\360\0\330"
+  "\360\0\0\0\0\264\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\216\1\0\224\1\0i\0\0\10\0"
+  "\0\0\0\0\0\0\0\325\3\0\325\3\0\325\3\0\351\3\0\365\1\0\365\1\0\14\0\0\313"
+  "\2\0#\2\0#\2\0\0\0\0\0\0\0\371\37\0\371\37\0\0\0\0\0\0\0\371\37\0\371\37"
+  "\0\371\37\0\371\37\0.\17\0.\17\0#\14\0\304-\0Y!\0Y!\0\0\0\0\0\0\0\371p\0"
+  "\371p\0\0\0\0\0\0\0\371p\0\371p\0\371p\0\371p\0O>\0O>\0""3(\0\247\227\0\211"
+  "s\0\211s\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\330\360\0\330\360\0\330\360\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\224\1\0i\0\0\0\0\0\0\0\0\325\3\0\325"
+  "\3\0\325\3\0\17\2\0\"\2\0!\0\0\35\0\0#\2\0\342\4\0\342\4\0\0\0\0\371\37\0"
+  "\371\37\0\371\37\0\0\0\0\371\37\0\371\37\0\371\37\0\371\37\0\3775\0\3775"
+  "\0\374%\0\304\34\0Y!\0\373C\0\373C\0\0\0\0\371p\0\371p\0\371p\0\0\0\0\371"
+  "p\0\371p\0\371p\0\371p\0\377\256\0\377\256\0\377\256\0\247q\0\211s\0\375"
+  "\342\0\375\342\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\0"
+  "\0\0\330\360\0\330\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\12\0\0\224\1\0\0\0"
+  "\0\0\0\0\325\3\0\325\3\0\325\3\0\344\5\0\"\2\0\"\2\0\200\0\0#\2\0\342\4\0"
+  "\342\4\0\0\0\0\371\37\0\371\37\0\371\37\0\0\0\0\371\37\0\371\37\0\371\37"
+  "\0\371\37\0\3775\0\3775\0\3775\0\304\34\0\3732\0\3732\0Y!\0\0\0\0\371p\0"
+  "\371p\0\371p\0\0\0\0\371p\0\371p\0\371p\0\371p\0\377\256\0\377\256\0\377"
+  "\256\0\247q\0\375\274\0\375\274\0\211s\0\0\0\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\330\360\0\330\360\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\12\0\0\0\0\0i\0\0\0\0\0\325\3\0\325\3\0\344\5\0\344\5"
+  "\0\"\2\0\36\1\0""4\2\0#\2\0\342\4\0\0\0\0\371\37\0\371\37\0\371\37\0\0\0"
+  "\0\371\37\0\371\37\0\371\37\0\371\37\0\3775\0\3775\0\3775\0\307)\0\3732\0"
+  "\3732\0\3732\0\0\0\0\371p\0\371p\0\371p\0\0\0\0\371p\0\371p\0\371p\0\371"
+  "p\0\377\256\0\377\256\0\377\256\0\247q\0\375\274\0\375\274\0\375\274\0\0"
+  "\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\0\0\0\330\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\12\0\0"
+  "\10\0\0\0\0\0\325\3\0\344\5\0\344\5\0\344\5\0\340\4\0\367\11\0\364\3\0#\2"
+  "\0\0\0\0\371\37\0\371\37\0\371\37\0\0\0\0\371\37\0\371\37\0\371\37\0\371"
+  "\37\0\3775\0\3775\0\3775\0\307)\0\376G\0\3732\0\3732\0\0\0\0\371p\0\371p"
+  "\0\371p\0\0\0\0\371p\0\371p\0\371p\0\371p\0\377\256\0\377\256\0\377\256\0"
+  "\247q\0\375\274\0\375\274\0\375\274\0\0\0\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\12\0\0\10\0\0\0\0\0\0\0\0\17\2\0\17"
+  "\2\0\17\2\0\323\2\0\352\7\0\347\2\0\26\1\0\0\0\0\371\37\0\371\37\0\371\37"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0/\26\0/\26\0/\26\0\0\0\0""7\36\0""6\25\0"
+  """6\25\0\0\0\0\371p\0\371p\0\371p\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0O>\0O>\0"
+  "O>\0\0\0\0VK\0VK\0VK\0\0\0\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0\12\0"
+  "\0\10\0\0\0\0\0\17\2\0\17\2\0\344\5\0\15\1\0\352\7\0\352\7\0\347\2\0\0\0"
+  "\0\371\37\0\371\37\0\371\37\0\0\0\0\0\0\0\0\0\0\362\4\0\0\0\0/\26\0/\26\0"
+  "\3775\0$\21\0""7\36\0""7\36\0\3672\0\0\0\0\371p\0\371p\0\371p\0\0\0\0\0\0"
+  "\0\0\0\0\370A\0\0\0\0O>\0O>\0\377\256\0""3(\0VK\0VK\0\372\264\0\0\0\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\341\271\0\0\0\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\343\350\0\0\0\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0\5\0\0\10\0\0\0\0"
+  "\0\17\2\0\17\2\0\17\2\0\15\1\0\352\7\0\352\7\0\347\2\0\0\0\0\371\37\0\371"
+  "\37\0\371\37\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0/\26\0/\26\0/\26\0$\21\0""7\36"
+  "\0""7\36\0""6\25\0\0\0\0\371p\0\371p\0\371p\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0O>\0O>\0O>\0""3(\0VK\0VK\0VK\0\0\0\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\5\0\0\5\0\0\5\0\0\0\0\0\344\5\0\344\5\0\344\5\0\316\4\0\367"
+  "\11\0\367\11\0\364\3\0\0\0\0\371\37\0\371\37\0\371\37\0\0\0\0\371\37\0\371"
+  "\37\0\371\37\0\371\37\0\3775\0\3775\0\3775\0\307)\0\376G\0\376G\0\3732\0"
+  "\0\0\0\371p\0\371p\0\371p\0\0\0\0\371p\0\371p\0\371p\0\371p\0\377\256\0\377"
+  "\256\0\377\256\0\247q\0\375\274\0\375\274\0\375\274\0\0\0\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5"
+  "\0\0\5\0\0\5\0\0\17\2\0\344\5\0\344\5\0\316\4\0\345\11\0\367\11\0\364\3\0"
+  "\0\0\0\371\37\0\371\37\0\371\37\0\0\0\0\371\37\0\371\37\0\371\37\0\371\37"
+  "\0\3775\0\3775\0\3775\0\307)\0\376G\0\376G\0\3732\0\0\0\0\371p\0\371p\0\371"
+  "p\0\0\0\0\371p\0\371p\0\371p\0\371p\0\377\256\0\377\256\0\377\256\0\247q"
+  "\0\375\274\0\375\274\0\375\274\0\0\0\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0\5\0\0\0\0\0\17\2"
+  "\0\344\5\0\344\5\0\15\1\0$\6\0$\6\0#\2\0\0\0\0\371\37\0\371\37\0\371\37\0"
+  "\0\0\0\371\37\0\371\37\0\371\37\0\371\37\0\3775\0/\26\0/\26\0\307)\0\376"
+  "G\0[/\0Y!\0\0\0\0\371p\0\371p\0\371p\0\0\0\0\371p\0\371p\0\371p\0\371p\0"
+  "\377\256\0O>\0O>\0\247q\0\375\274\0\211s\0\211s\0\0\0\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0"
+  "\5\0\0\17\2\0\17\2\0\344\5\0\316\4\0$\6\0$\6\0#\2\0\0\0\0\371\37\0\371\37"
+  "\0\371\37\0\0\0\0\371\37\0\371\37\0\371\37\0\371\37\0\3775\0/\26\0/\26\0"
+  "\307)\0\376G\0[/\0Y!\0\0\0\0\371p\0\371p\0\371p\0\0\0\0\371p\0\371p\0\371"
+  "p\0\371p\0\377\256\0O>\0O>\0\247q\0\375\274\0\211s\0\211s\0\0\0\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\5\0\0\24\2\0\17\2\0\17\2\0\316\4\0\345\11\0$\6\0#\2\0\0\0\0\371"
+  "\37\0\371\37\0\371\37\0\0\0\0\371\37\0\371\37\0\371\37\0\371\37\0\3775\0"
+  "\3775\0\3775\0\307)\0\376G\0\376G\0\3732\0\0\0\0\371p\0\371p\0\371p\0\0\0"
+  "\0\371p\0\371p\0\371p\0\371p\0\377\256\0\377\256\0\377\256\0\247q\0\375\274"
+  "\0\375\274\0\375\274\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0"
+  "\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5\0\0\24\2\0\24"
+  "\2\0\17\2\0\316\4\0\345\11\0\342\3\0#\2\0\0\0\0\371\37\0\371\37\0\371\37"
+  "\0\0\0\0\371\37\0\371\37\0\371\37\0\371\37\0\3775\0\3775\0\3775\0\307)\0"
+  "\376G\0\3732\0\3732\0\0\0\0\371p\0\371p\0\371p\0\0\0\0\371p\0\371p\0\371"
+  "p\0\371p\0\377\256\0\377\256\0\377\256\0\247q\0\375\274\0\375\274\0\375\274"
+  "\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\17\2\0\24\2\0\5\0\0\0\0\0\27\5\0\342\3\0\313"
+  "\1\0\0\0\0\371\37\0\371\37\0\0\0\0\0\0\0\0\0\0\371\37\0\0\0\0\0\0\0/\26\0"
+  "\3775\0\371\37\0\302\30\0\3716\0Y!\0#\14\0\0\0\0\371p\0\371p\0\0\0\0\0\0"
+  "\0\0\0\0\371p\0\0\0\0\0\0\0O>\0\377\256\0\371p\0\243I\0\371\224\0\211s\0"
+  """3(\0\0\0\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360\0\374"
+  "\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0"
+  "\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\17\2\0\17\2\0\0\0\0\0\0\0\26\1\0\26\1\0\0\0\0\0\0\0\371"
+  "\37\0\371\37\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0/\26\0/\26\0\0\0\0\0\0"
+  "\0""6\25\0""6\25\0\0\0\0\0\0\0\371p\0\371p\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0O>\0O>\0\0\0\0\0\0\0VK\0VK\0\0\0\0\0\0\0\374\360\0\374\360\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374"
+  "\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\17\2\0\17\2\0\0\0\0\0\0\0\26\1\0\26\1\0\0\0\0\0\0"
+  "\0\371\37\0\371\37\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0/\26\0/\26\0\0\0"
+  "\0\0\0\0""6\25\0""6\25\0\0\0\0\0\0\0\371p\0\371p\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0O>\0O>\0\0\0\0\0\0\0VK\0VK\0\0\0\0\0\0\0\374\360\0\374\360"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0"
+  "\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\17\2\0\17\2\0\16\0\0\0\0\0\26\1\0\26\1\0\26"
+  "\1\0\0\0\0\371\37\0\371\37\0\371\37\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0/\26\0"
+  "/\26\0.\17\0\0\0\0""6\25\0""6\25\0""6\25\0\0\0\0\371p\0\371p\0\371p\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0O>\0O>\0O>\0\0\0\0VK\0VK\0VK\0\0\0\0\374\360\0"
+  "\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\374\360\0\374\360"
+  "\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\16\0\0\16\0\0\14\0\0\14"
+  "\0\0#\2\0#\2\0\0\0\0\0\0\0\371\37\0\371\37\0\0\0\0\0\0\0\371\37\0\371\37"
+  "\0\371\37\0\371\37\0.\17\0.\17\0#\14\0#\14\0Y!\0Y!\0\0\0\0\0\0\0\371p\0\371"
+  "p\0\0\0\0\0\0\0\371p\0\371p\0\371p\0\371p\0O>\0O>\0""3(\0""3(\0\211s\0\211"
+  "s\0\0\0\0\0\0\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360\0\374\360"
+  "\0\374\360\0\374\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+};
+
+/**
+ * \brief Returns the BlitBlendAll test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImageBlitBlendAll()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imageBlitBlendAll.pixel_data,
+        SDLTest_imageBlitBlendAll.width,
+        SDLTest_imageBlitBlendAll.height,
+        SDLTest_imageBlitBlendAll.bytes_per_pixel * 8,
+        SDLTest_imageBlitBlendAll.width * SDLTest_imageBlitBlendAll.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_imageFace.c b/Source/3rd Party/sdl/src/test/SDL_test_imageFace.c
new file mode 100644
index 000000000..74fa8341d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_imageFace.c	
@@ -0,0 +1,246 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+/* GIMP RGBA C-Source image dump (face.c) */
+
+const SDLTest_SurfaceImage_t SDLTest_imageFace = {
+  32, 32, 4,
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\0\0\0\377\0\0\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\0\0\0\377\0\0\0\377\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\0\0\0\377\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\0\0\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\0\0\0\377\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\0\0\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\0\0\0\377\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\0\0\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\0\0\0\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\0\0\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\0\0\0\377\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\0\0\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\0\0\0\377\0\0\0\377"
+  "\377\377\377\0\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\0\0\0\377\0\0\0\377\377\377\377\0\0\0\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\0\0\0\377\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\0\0\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\0\0\0\377\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\0\0\0\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\0\0\0\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\0\0\0\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\0\0\0\377\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\0\0\0\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\0\0\0"
+  "\377\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\0\0\0"
+  "\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\0"
+  "\0\0\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\0\0\0\377\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\0\0\0\377\377\377\0\377\377\377\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\377\377\0\377\377\377\0\377\0\0\0\377\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\0\0\0\377\377\377\0\377\377\377\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\377\377\0\377\377\377\0\377\0\0\0\377\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\0\0\0\377\377\377\0\377\377"
+  "\377\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377\0\377\377\377\0\377\0\0\0"
+  "\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\0\0\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\0\0\0\377\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\0\0\0\377\0\0\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\0\0\0\377\0\0\0\377\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0"
+  "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377"
+  "\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377"
+  "\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0"
+  "\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377\377\377\0\377"
+  "\377\377\0\377\377\377\0",
+};
+
+/**
+ * \brief Returns the Face test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImageFace()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imageFace.pixel_data,
+        SDLTest_imageFace.width,
+        SDLTest_imageFace.height,
+        SDLTest_imageFace.bytes_per_pixel * 8,
+        SDLTest_imageFace.width * SDLTest_imageFace.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
+
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_imagePrimitives.c b/Source/3rd Party/sdl/src/test/SDL_test_imagePrimitives.c
new file mode 100644
index 000000000..d2aafcbe3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_imagePrimitives.c	
@@ -0,0 +1,512 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+/* GIMP RGB C-Source image dump (primitives.c) */
+
+const SDLTest_SurfaceImage_t SDLTest_imagePrimitives = {
+  80, 60, 3,
+  "\5ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15"
+  "I\310\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310"
+  "\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310\0"
+  "\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310\0\0\0\15I\310\0\0"
+  "\0\5ii\0\0\0\5ii\0\0\0\3\1\1\0\0\0\5\2\1\0\0\0\7\3\2\0\0\0\11\4\3\0\0\0\13"
+  "\5\3\0\0\0\15\6\4\0\0\0\17\7\5\0\0\0\21\10\5\0\0\0\23\11\6\0\0\0\25\12\7"
+  "\0\0\0\27\13\7\0\0\0\31\14\10\0\0\0\33\15\11\0\0\0\35\16\11\0\0\0\37\17\12"
+  "\0\0\0!\20\13\0\0\0#\21\13\0\0\0%\22\14\0\0\0'\23\15\15I\310)\24\15\15I\310"
+  "+\25\16\15I\310-\26\17\15I\310/\27\17\15I\3101\30\20\15I\3103\31\21\15I\310"
+  "5\32\21\15I\3107\33\22\15I\3109\34\23\15I\310;\35\23\15I\310=\36\24\15I\310"
+  "?\37\25\15I\310A\40\25\15I\310C!\26\15I\310E\"\27\15I\310G#\27\15I\310I$"
+  "\30\15I\310K%\31\15I\310M&\31\5iiO'\32\0\0\0\0\0\0\5ii\0\0\0\10\4\2\0\0\0"
+  "\14\6\4\0\0\0\20\10\5\0\0\0\24\12\6\0\0\0\30\14\10\0\0\0\34\16\11\0\0\0\40"
+  "\20\12\0\0\0$\22\14\0\0\0(\24\15\0\0\0,\26\16\0\0\0""0\30\20\0\0\0""4\32"
+  "\21\0\0\0""8\34\22\0\0\0<\36\24\0\0\0@\40\25\0\0\0D\"\26\0\0\0H$\30\0\0\0"
+  "L&\31\0\0\0P(\32\15I\310T*\34\15I\310X,\35\15I\310\\.\36\15I\310`0\40\15"
+  "I\310d2!\15I\310h4\"\15I\310l6$\15I\310p8%\15I\310t:&\15I\310x<(\15I\310"
+  "|>)\15I\310\200@*\15I\310\204B,\15I\310\210D-\15I\310\214F.\15I\310\220H"
+  "0\15I\310\224J1\15I\310\230L2\5ii\234N4\15I\310\0\0\0\0\0\0\0\0\0\5ii\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\5ii"
+  "\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\5ii\15I\310\15I\310\15I\310\15I\310"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\5ii\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\5ii\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5ii\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\5ii\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\5ii\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\5ii\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d"
+  "\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\5ii\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\5ii\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d"
+  "\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\5ii\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310"
+  "\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d"
+  "\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d"
+  "\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5"
+  "ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d"
+  "\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d"
+  "\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0"
+  "\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0"
+  "\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0"
+  "\0\377\0\0\377\0\0\377\0\0\377\0\5ii\0\377\0\0\377\0\0\377\0\0\377\0\0\377"
+  "\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0""77\5\0\377\0\0\377\0\0\377\0"
+  "\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\5ii\0\377\0\0\377\0\0\377"
+  "\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377"
+  "\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377"
+  "\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\377\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5"
+  "ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d"
+  "\310\0d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5i"
+  "i\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310"
+  "\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\310\0d\310\0d\5ii\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310"
+  "\0d\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\310\0d\310\0d\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d77\5\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\5ii\310\0d\310\0d\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\310\0d\5ii\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d77\5\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\5ii\310\0d\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15"
+  "I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\5ii\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d7"
+  "7\5\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0"
+  "d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310"
+  "\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\310\0d\5ii\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0""77\5\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\5ii\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""77\5\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\5ii\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5ii\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""77\5\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\5ii\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0""77\5\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\5ii\15I\310"
+  "\15I\310\15I\310\15I\310\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\5"
+  "ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""77\5\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\5ii\15I\310\15I\310\15I\310"
+  "\15I\310\15I\310\0\0\0\0\0\0\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""77\5\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\5ii\15I\310\15I\310\15I\310\15I\310\0\0\0\0"
+  "\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0""77\5\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\5ii\15I\310\15I\310\15I\310\0\0\0\0\0\0\5ii\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""77\5\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\5ii"
+  "\15I\310\15I\310\0\0\0\5ii\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""77\5\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\5ii\15I\310\5ii\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0""77\5\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I\310\15I"
+  "\310\15I\310\15I\310\15I\310\15I\310\5ii",
+};
+
+/**
+ * \brief Returns the Primitives test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImagePrimitives()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imagePrimitives.pixel_data,
+        SDLTest_imagePrimitives.width,
+        SDLTest_imagePrimitives.height,
+        SDLTest_imagePrimitives.bytes_per_pixel * 8,
+        SDLTest_imagePrimitives.width * SDLTest_imagePrimitives.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_imagePrimitivesBlend.c b/Source/3rd Party/sdl/src/test/SDL_test_imagePrimitivesBlend.c
new file mode 100644
index 000000000..cfe189a05
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_imagePrimitivesBlend.c	
@@ -0,0 +1,694 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+/* GIMP RGB C-Source image dump (alpha.c) */
+
+const SDLTest_SurfaceImage_t SDLTest_imagePrimitivesBlend = {
+  80, 60, 3,
+  "\260e\15\222\356/\37\313\15\36\330\17K\3745D\3471\0\20\0D\3502D\3502<\321"
+  ",\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\0-\0\377\377"
+  "\377\377\377\377\311\324\311\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\0H\0\377\377\377\377\377\377\256\307\256\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\0c\0\377\377\377\377\377\377"
+  "\223\300\223\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\0~\0\377\377\377\377\377\377x\277x\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\0\231\0\377\377\377\377\377\377]\303]\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\0\264\0\377\377\377\377\377"
+  "\377B\316B\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\0"
+  "\317\0\377\377\377\377\377\377'\335'\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\0\352\0\377\377\377#\262\6\260d\15\260e\15\224\357"
+  "/&\262\6\34\300\5.\314\22\40\315\12[\3747M\332/\27\331\12\27\331\12K\374"
+  "5K\3745K\3745D\3471D\3471D\3471D\3471D\3471D\3502D\3502D\3502D\3502D\350"
+  "2D\3502D\3502D\3502D\3502D\3502\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377,\372\27\273\3465\327"
+  "Q.\260d\15\213\213\40\241\3601\200\366*=\265\13?\301\25s\375<Y\316-X\320"
+  "-!\315\13]\3749]\3749O\3321O\3321P\3342P\3342P\3342\371\377\364\371\377\364"
+  "\371\377\364\371\377\364\371\377\364\362\375\360\362\375\360\362\375\360"
+  "\362\375\360\362\375\360D\3471D\3471D\3471D\3502D\3502D\3502D\3502D\3502"
+  "D\3502D\3502D\3502D\3502D\3502D\3502D\3502D\3502D\3502D\3502D\3502D\3502"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "K\3745&\262\6\213\213\40\11\2\0\260`\15\241~#m}\11\273\363AQ\247\15S\266"
+  "\31\212\373@e\302,\4\33\2s\375<\\\3161M\260*\\\3202X\320-\366\377\354\364"
+  "\377\352O\3321\3""5\2O\3321O\3321<\261&P\3342P\3342S\3655\377\377\377\377"
+  "\377\377\14Z\14\377\377\377\377\377\377\234\302\231\371\377\364\362\375\360"
+  "\367\377\365\362\375\360\362\375\360\13t\13\362\375\360\362\375\360\177\275"
+  "~\362\375\360\362\375\360\370\377\366\362\375\360\377\377\377\14\220\14\377"
+  "\377\377D\3502\"\267\33D\3502D\3502K\3779D\3502D\3502\3\233\2D\3502D\350"
+  "2\34\303\26D\3502D\3502L\377:D\3502D\3502\3\264\2D\3502D\3502\25\323\22\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\14\341\14\377\377"
+  "\377\377\377\377\40\353\40\377\377\377D\3471\34\300\5e\247\33\356\336?\277"
+  "f)\260P\17\260i\16\356\336?\331\353C\274\363GQ\247\15\243\370Cp\270)\212"
+  "\373@h\3021h\3042c\304+\364\377\336\\\3161\\\3161\\\3202\\\3202\\\3202\377"
+  "\377\377\364\377\352\364\377\352\346\371\342\346\371\342O\3321O\3321P\334"
+  "2P\3342P\3342P\3342P\3342P\3342\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\362\375\360\362\375\360\362\375\360\362\375\360\362\375"
+  "\360\362\375\360\362\375\360\362\375\360\362\375\360\362\375\360\362\375"
+  "\360\362\375\360\362\375\360\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377D\3502D\3502D\3502D\3502D\3502D\3502D\3502D\3502D\3502D\3502D\3502\40"
+  "\315\12=\265\13f\230\14\237y\15\274Y\17\327Q.\260X\14\243\177$\220\214\""
+  "\215\235*\274\363G\177\252+\243\370Cu\2661p\270)\367\377\324h\3021h\3021"
+  "h\3042\364\377\336\364\377\336\335\364\323\\\3161\\\3161\\\3202\\\3202\\"
+  "\3202\377\377\377\377\377\377\364\377\352\364\377\352\346\371\342\346\371"
+  "\342\346\371\342\346\371\342O\3321P\3342P\3342P\3342P\3342P\3342P\3342P\334"
+  "2\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\362\375\360\362\375\360"
+  "\362\375\360\362\375\360\362\375\360\362\375\360\362\375\360\362\375\360"
+  "\362\375\360\362\375\360\362\375\360\362\375\360\362\375\360\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\6\0\4[\3747?\301\25N\241\14\331\353C\243\177$\275Z\21\377\254W\260Q\17\30"
+  "\26\7\370\343N\201\210\16|\213-\274\363G\200\2521\202\263+\243\370Cu\266"
+  "1\12&\4\367\377\324h\3021S\241)h\3042h\3042\377\377\377\364\377\336\335\364"
+  "\323\24M\23\\\3161\\\3202C\245(\\\3202\\\3202\377\377\377\377\377\377\377"
+  "\377\377\30l\30\346\371\342\346\371\342\207\273\205\346\371\342\346\371\342"
+  "\361\377\355\377\377\377P\3342\7t\4P\3342P\3342/\260\"P\3342P\3342^\377@"
+  "\377\377\377\377\377\377\30\242\30\377\377\377\377\377\377d\306d\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\30\275\30\377\377\377"
+  "\377\377\377K\322K\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\30\330\30\362\375\360\362\375\3601\3431\362\375\360\362\375\360\377"
+  "\377\377\362\375\360D\3502M\332/s\375<>\265\14\177\252+\201\210\16\245\204"
+  "*\377\314U\312\\,\224'\11\260i\17\244\210\40\232\2211\331\353J\215\2351\377"
+  "\377\276\200\2521\200\2542\375\377\310u\2661t\2702t\2702\367\377\324\325"
+  "\355\305h\3021h\3042h\3042\377\377\377\377\377\377\364\377\336\335\364\323"
+  "\335\364\323\335\364\323\\\3202\\\3202\\\3202\\\3202\\\3202\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\346\371\342\346\371\342\346"
+  "\371\342\346\371\342\346\371\342\346\371\342\346\371\342\377\377\377\377"
+  "\377\377P\3342P\3342P\3342P\3342P\3342P\3342P\3342P\3342\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\27\331\12Y\316-h\3021\243\370Cg\230\15\230\224\"\245"
+  "\204*\377\314U\310J\21\327Q.\260b\21\245\2041\370\343N\230\2242\331\353J"
+  "\214\2402\377\377\276\200\2521\200\2542\375\377\310\317\344\266u\2661t\270"
+  "2\377\377\377\367\377\324\325\355\305h\3021h\3042h\3042h\3042\377\377\377"
+  "\377\377\377\364\377\336\335\364\323\335\364\323\335\364\323\335\364\323"
+  "\\\3202\\\3202\\\3202\\\3202\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\346\371\342\346\371"
+  "\342\346\371\342\346\371\342\346\371\342\346\371\342\377\377\377\377\377"
+  "\377\377\377\377\377\377\377P\3342P\3342P\3342P\3342P\3342P\3342P\3342P\334"
+  "2\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377K\3745!\315\13d\304,p\270)\177\252+\23\13\6\232\2211\245\204"
+  "1\347\270O\377\277Y\324<\22\265V\24\377\330Q\244\210\40#(\13\230\224\"\331"
+  "\353Ju\211.\377\377\276\200\2521\210\273:\200\2542\375\377\310\20""3\6u\266"
+  "1t\2702\271\307\271\367\377\324\325\355\305\341\377\321h\3021h\3042\16L\7"
+  "h\3042\377\377\377\242\300\242\377\377\377\335\364\323\355\377\343\335\364"
+  "\323\335\364\323\14f\7\\\3202\\\3202>\250*\\\3202\377\377\377\377\377\377"
+  "\377\377\377\377\377\377$\231$\377\377\377\377\377\377s\303s\377\377\377"
+  "\346\371\342\376\377\372\346\371\342\346\371\342\40\257\37\346\371\342\346"
+  "\371\342\\\316\\\377\377\377\377\377\377\377\377\377\377\377\377P\3342\13"
+  "\262\7P\3342P\3342*\327%P\3342P\3342o\377Q\377\377\377\377\377\377$\352$"
+  "\377\377\377\377\377\377K\3745]\3749s\375<\212\373@\243\370C\274\363G\331"
+  "\353J\370\343N\377\330Q\377\314U\377\277Y\377\260\\\224(\11\260|\36\245\204"
+  "1\377\377\250\232\2211\230\224\"\215\2351\214\2402\377\377\276\312\332\250"
+  "\200\2521\200\2542\377\377\377\317\344\266u\2661t\2702t\2702\377\377\377"
+  "\377\377\377\325\355\305\325\355\305\325\355\305h\3042h\3042h\3042\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\335\364\323\335\364\323\335\364"
+  "\323\335\364\323\335\364\323\\\3202\\\3202\\\3202\\\3202\\\3202\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\346\371\342\346\371\342"
+  "\346\371\342\346\371\342\346\371\342\346\371\342\346\371\342\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377P\3342P\3342"
+  "P\3342P\3342\377\377\377K\3745O\3321\\\3161h\3021t\2702~\254'\214\240%\377"
+  "\377\262\370\343N\377\330Q\262x1\277l1\312`1\327R.\260X\23\377\330Q\244\210"
+  "2\377\377\250\230\2242\377\377\262\215\2351\214\2402\377\377\377\312\332"
+  "\250\200\2521\200\2542\377\377\377\375\377\310\317\344\266u\2661t\2702t\270"
+  "2\377\377\377\377\377\377\325\355\305\325\355\305\325\355\305h\3042h\304"
+  "2h\3042h\3042\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\335\364\323\335\364\323\335\364\323\335\364\323\377\377\377\\\3202\\\320"
+  "2\\\3202\\\3202\\\3202\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\346\371\342\346\371\342\346\371\342\346"
+  "\371\342\346\371\342\346\371\342\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377D\3471O\3321\21\7\11c\304+\367\377\324o\2520\200\252"
+  "1\214\2402\235\226'\377\377\250\377\330Q!\20\11\277l1\310d2\266?\33\224("
+  "\11\260|\36\257\217;\377\377\250\232\2211\34$\11\377\377\262\215\2351q\206"
+  "0\377\377\377\312\332\250\217\303@\200\2542\200\25420Z0\317\344\266\317\344"
+  "\266X\2260t\2702t\2702\377\377\377\377\377\377\325\355\305(l%\325\355\305"
+  "\325\355\305K\2410h\3042h\3042\377\377\377\377\377\377\377\377\3770\2200"
+  "\377\377\377\377\377\377t\274p\335\364\323\335\364\323\373\377\361\377\377"
+  "\377\377\377\377\21\213\11\\\3202\\\3202<\274/\\\3202\377\377\377\377\377"
+  "\377\377\377\377\377\377\3770\3060\377\377\377\377\377\377V\330V\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\3770\3410\346\371\342\346"
+  "\371\342>\352>\346\371\342\377\377\377D\3471P\3342\364\377\352s\375<h\302"
+  "1t\2702~\254'\377\377\276\215\2351\230\2242\244\210\40\377\377\234\262x1"
+  "\277l1\310W\32\377\260\\\327T1\260|2\377\330Q\244\2102\377\377\250\232\221"
+  "1\230\2242\377\377\262\215\2351\214\2402\377\377\377\377\377\276\312\332"
+  "\250\200\2542\200\2542\377\377\377\375\377\310\317\344\266\317\344\266t\270"
+  "2t\2702t\2702\377\377\377\377\377\377\377\377\377\325\355\305\325\355\305"
+  "\325\355\305h\3042h\3042h\3042h\3042\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\335\364\323\335\364\323\335\364\323"
+  "\335\364\323\335\364\323\377\377\377\377\377\377\\\3202\\\3202\\\3202\\\320"
+  "2\\\3202\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377D\3471P\3342\364\377\352\\\3161h\3042\367"
+  "\377\324u\2661\200\2542\214\240%\377\377\262\232\2211\244\2102\377\377\234"
+  "\262x1\274p2\377\337\207\377\260\\\327T1\227/\14\377\377\234\245\2041\244"
+  "\2102\307\300\213\230\2242\377\377\377\377\377\262\215\2351\214\2402\377"
+  "\377\377\377\377\276\312\332\250\200\2542\200\2542\377\377\377\377\377\377"
+  "\317\344\266\317\344\266\317\344\266t\2702t\2702\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\325\355\305\325\355\305\325\355\305\377\377\377"
+  "h\3042h\3042h\3042h\3042\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\335\364\323\335\364\323\335\364\323"
+  "\335\364\323\377\377\377\377\377\377\377\377\377\\\3202\\\3202\\\3202\\\320"
+  "2\\\3202\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377<\0<D\3502\371\377\364N\3221\\\3202\364\377"
+  "\336l\3035t\2702\375\377\310\36\22\13\214\2402\377\377\262\214\2012\244\210"
+  "2\377\377\234\274\177;\274p2\377\337\207/\24\13\324X2\227/\14\222l3\307\260"
+  "|\244\2102\377\377\270\232\2211\230\2242<Q<\310\316\231\215\2351o\2065\377"
+  "\377\377\377\377\276\341\377\277\200\2521\200\2542\36H\13\377\377\377\377"
+  "\377\377\213\260}\317\344\266t\2702\221\366Ot\2702\377\377\377<\207<\377"
+  "\377\377\377\377\377}\270v\325\355\305\325\355\305\371\377\351\377\377\377"
+  "h\3042\30|\13h\3042\377\377\377|\306|\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377<\275<\335\364\323\335\364\323_\317]\335\364\323"
+  "\335\364\323\377\377\377\377\377\377\377\377\377\25\260\13\\\3202\\\3202"
+  ">\3369\\\3202\377\377\377\377\377\377\377\377\377\377\377\377D\3502\371\377"
+  "\364O\3321\\\3202\364\377\336h\3042\367\377\324u\2661\200\2542\377\377\276"
+  "\215\2351\230\2242\307\300\213\244\2102\377\377\234\262x1\274p2\377\337\207"
+  "\312`1\324E\30\327T1\260|2\377\377\234\245\2041\244\2102\377\377\250\232"
+  "\2211\230\2242\377\377\377\310\316\231\215\2351\214\2402\377\377\377\377"
+  "\377\377\312\332\250\312\332\250\200\2542\200\2542\377\377\377\377\377\377"
+  "\317\344\266\317\344\266\317\344\266t\2702t\2702t\2702\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\325\355\305\325\355\305\325\355"
+  "\305\377\377\377h\3042h\3042h\3042h\3042\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\335\364\323\335\364\323\335\364\323\335\364\323\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\\\3202\\\3202\\\3202\377\377\377D\3502\371\377"
+  "\364O\3321\377\377\377\\\3161h\3042\367\377\324t\2702\375\377\310\200\252"
+  "1\377\377\377\215\2351\230\2242\377\377\250\244\2102\377\377\234\262x1\274"
+  "p2\316\214_\310d2\377\310|\327T1\227/\14\377\377\377\307\260|\244\2102\377"
+  "\377\377\307\300\213\230\2242\230\2242\377\377\377\310\316\231\214\2402\214"
+  "\2402\377\377\377\377\377\377\312\332\250\312\332\250\200\2542\200\2542\377"
+  "\377\377\377\377\377\377\377\377\317\344\266\317\344\266\317\344\266t\270"
+  "2t\2702t\2702\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\325\355\305\325\355\305\325\355\305\377\377\377\377\377\377h\3042h\3042"
+  "h\3042\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\335\364\323\335\364"
+  "\323\335\364\323\335\364\323\377\377\377\377\377\377\377\377\377\377\377"
+  "\377D\3502\371\377\364R\3344\364\377\352\\\3161H\22Hh\3021\377\377\377o\244"
+  "2\200\2542\312\332\250\226\245<\377\377\262\230\2242H-/\245\2041\377\377"
+  "\377\233i5\274p2\277l1\331sC\377\310|\324X2*\15\3\260|2\377\377\234\206s"
+  "7\244\2102\377\377\250\340\337\244\230\2242\377\377\377Hc2\310\316\231\214"
+  "\2402n\211:\377\377\377\377\377\377\353\377\311\312\332\250\200\2542$T\16"
+  "\377\377\377\377\377\377\236\277\236\377\377\377\317\344\266\367\377\336"
+  "\377\377\377t\2702\40n\16t\2702\377\377\377\212\303\212\377\377\377\377\377"
+  "\377\377\377\377\325\355\305\325\355\305<\2477\377\377\377\377\377\377O\276"
+  "Ah\3042h\3042\237\377i\377\377\377\377\377\377H\317H\377\377\377\377\377"
+  "\377c\335c\377\377\377\377\377\377\377\377\377\377\377\377\335\364\323>\337"
+  ";\335\364\323\377\377\377D\3502\362\375\360P\3342\346\371\342\\\3202\364"
+  "\377\336h\3042\367\377\324t\2702\375\377\310\200\2542\377\377\276\214\240"
+  "2\377\377\262\232\2211\377\377\377\245\2041\377\377\377\262x1\377\377\377"
+  "\277l1\310d2\312`1\324X2\327T1\260|2\377\377\377\307\260|\244\2102\377\377"
+  "\377\307\300\213\232\2211\230\2242\377\377\377\377\377\262\310\316\231\214"
+  "\2402\214\2402\377\377\377\377\377\377\312\332\250\312\332\250\200\2542\200"
+  "\2542\200\2542\377\377\377\377\377\377\377\377\377\317\344\266\317\344\266"
+  "\317\344\266\377\377\377t\2702t\2702t\2702\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\325\355\305\325\355\305\325\355\305\325\355"
+  "\305\377\377\377\377\377\377h\3042h\3042h\3042h\3042\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377D\3502\362\375\360P\3342\346\371\342\\\3202\335"
+  "\364\323h\3042\325\355\305t\2702\317\344\266\377\377\377\200\2521\377\377"
+  "\377\215\2351\377\377\377\232\2211\377\377\377\245\2041\377\377\377\262x"
+  "1\377\377\377\277l1\377\377\377\312`1\377\310|\327T1\227/\14\377\377\377"
+  "\307\260|\244\2102\244\2102\377\377\377\307\300\213\230\2242\230\2242\377"
+  "\377\377\310\316\231\310\316\231\214\2402\214\2402\377\377\377\377\377\377"
+  "\312\332\250\312\332\250\377\377\377\200\2542\200\2542\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\317\344\266\317\344\266\377\377\377\377\377"
+  "\377t\2702t\2702\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\325\355\305\325\355\305\325\355\305\377\377"
+  "\377\377\377\377\377\377\377h\3042h\3042h\3042\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377D\3502\362\375\360"
+  "T\11TO\3321\377\377\377Z\3002\377\377\377h\3042\377\377\334t\2702\375\377"
+  "\310*\30\20\312\332\250\214\2402\262\260\214\230\2242\307\300\213\377\377"
+  "\377\245\2041\377\377\377:\35\20\377\377\377\277l1\316\264w\310d2\377\310"
+  "|\356qL\227/\14\260|2TZ3\307\260|\244\2102\274\302\274\307\300\213\307\300"
+  "\213\273\301U\377\377\377\377\377\377A^2\310\316\231\214\2402o\216B\377\377"
+  "\377\377\377\377\366\377\324\312\332\250\312\332\250*a\20\200\2542\377\377"
+  "\377\230\301\230\377\377\377\377\377\377\377\377\353\317\344\266\317\344"
+  "\266T\253Tt\2702t\2702]\265I\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377T\306T\377\377\377\325\355\305l\324i\325\355\305\377\377"
+  "\377\377\377\377\377\377\377h\3042\"\254\20h\3042h\3042b\353b\377\377\377"
+  "\377\377\377D\3502\362\375\360\377\377\377O\3321\377\377\377\\\3202\364\377"
+  "\336h\3042\325\355\305t\2702\317\344\266\377\377\377\200\2521\377\377\377"
+  "\214\2402\377\377\262\230\2242\307\300\213\244\2102\307\260|\377\377\377"
+  "\262x1\377\377\377\274p2\377\337\207\310d2\377\310|\324X2\333bB\260|2\377"
+  "\377\377\307\260|\244\2102\244\2102\377\377\377\307\300\213\232\2211\230"
+  "\2242\377\377\377\377\377\377\310\316\231\310\316\231\214\2402\214\2402\377"
+  "\377\377\377\377\377\377\377\377\312\332\250\312\332\250\200\2542\200\254"
+  "2\200\2542\377\377\377\377\377\377\377\377\377\377\377\377\317\344\266\317"
+  "\344\266\317\344\266\377\377\377t\2702t\2702t\2702\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\325\355\305"
+  "\325\355\305\325\355\305\325\355\305\377\377\377\377\377\377\377\377\377"
+  "h\3042h\3042\377\377\377\377\377\377D\3471\377\377\377P\3342\364\377\352"
+  "\\\3202\335\364\323\377\377\377h\3021\377\377\377t\2702\375\377\310\200\254"
+  "2\312\332\250\377\377\377\215\2351\377\377\377\230\2242\377\377\250\244\210"
+  "2\307\260|\377\377\377\262x1\377\377\377\274p2\377\337\207\310d2\323xQ\324"
+  "X2\327T1\227/\14\260|2\377\377\234\307\260|\244\2102\377\377\377\377\377"
+  "\377\307\300\213\230\2242\230\2242\377\377\377\377\377\377\310\316\231\310"
+  "\316\231\214\2402\214\2402\377\377\377\377\377\377\377\377\377\312\332\250"
+  "\312\332\250\377\377\377\200\2542\200\2542\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\317\344\266\317\344\266\377\377\377\377\377"
+  "\377t\2702t\2702t\2702\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\325\355\305\325\355\305\325"
+  "\355\305\377\377\377\377\377\377`\0`\377\377\377D\3471\371\366\371P\3342"
+  "\346\371\342\377\377\377\\\3161\377\377\377'\24\22\325\355\305t\2702\276"
+  "\310\251\377\377\377\200\2542\377\377\316\214\2402\310\316\231`6`\230\224"
+  "2\377\377\250\222u<\307\260|\377\377\377\315\214L\377\377\377\274p2M,#\310"
+  "d2\312`1\306\304\306\324X2\333bB\325\242W\377\377\377\307\260|=9\22\244\210"
+  "2\377\377\377\227\234w\307\300\213\230\2242\307\322a\377\377\377\377\377"
+  "\377Km9\310\316\231\214\2402r\226K\377\377\377\377\377\377\377\377\377\312"
+  "\332\250\312\332\250`\242`\200\2542\200\2542\224\306\224\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\317\344\266M\250D\317\344\266\377\377\377"
+  "\203\322\203t\2702t\2702\301\377\177\377\377\377\377\377\377`\330`\377\377"
+  "\377\377\377\377r\344r\377\377\377\377\377\377\377\377\377\325\355\305\377"
+  "\377\377\377\377\377D\3502\371\377\364P\3342\346\371\342\377\377\377\\\320"
+  "2\364\377\336h\3042\325\355\305\377\377\377t\2702\317\344\266\200\2542\312"
+  "\332\250\377\377\377\214\2402\310\316\231\230\2242\307\300\213\377\377\377"
+  "\244\2102\307\260|\377\377\377\200U0\220^\377\7\4/\227U[\246]\377\255Q1\377"
+  "\242y\10\3/\306M@\6\4/{^\377mVvmVv\6\5/h\\\377h\\\377\\U\204\12\12\360\5"
+  "\5/VX\377VX\377\12\12\360LR\221\12\12\360\5\6/\214\2402\377\377\377\377\377"
+  "\377\377\377\377\312\332\250\312\332\250\377\377\377\200\2542\200\2542\200"
+  "\2542\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\317\344"
+  "\266\317\344\266\317\344\266\377\377\377\377\377\377t\2702t\2702\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377D\3502\362\375\360P\3342\346\371"
+  "\342\377\377\377\\\3202\335\364\323\377\377\377h\3042\367\377\324t\2702\317"
+  "\344\266\377\377\377\200\2542\312\332\250\377\377\377\214\2402\377\377\262"
+  "\230\2242\307\300\213\377\377\377\244\2102\307\260|{^\377\200U0\220^\377"
+  "\7\4/\227U[\246]\377\7\3/\377\242y\236\37""2\306M0\210%\14T-2{^\377mVv\6"
+  "\5/\6\5/h\\\377\\U\204\\U\204\5\5/\5\5/VX\377VX\377LR\221LR\221\377\377\377"
+  "\214\2402\214\2402\377\377\377\377\377\377\377\377\377\312\332\250\312\332"
+  "\250\312\332\250\377\377\377\200\2542\200\2542\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\317\344\266\317\344\266\377"
+  "\377\377\377\377\377t\2702t\2702t\2702\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377D\3502\365\375\363\377\377"
+  "\377O\3321l\22l\\\3202\335\364\323\357\346\357h\3042\325\355\305\377\377"
+  "\377t\2702\317\344\266l-l\200\2521\377\377\377\204\211=\310\316\231\377\377"
+  "\377\262\243L\307\300\213\377\377\377E&\25mVv{^\377ySB\220^\377\7\4/\275"
+  "t\201\246]\377\7\3/I\37!\277Z\377\10\3/\237YQ\6\4/{^\377\236\213\247mVv\6"
+  "\5/,-lh\\\377\\U\204dow\5\5/\5\5/\222\251\377VX\377\310\316\231T{@\377\377"
+  "\377\214\2402w\240V\377\377\377\377\377\377\377\377\377\377\377\377\312\332"
+  "\250U\231G\377\377\377\200\2542q\270\\\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377l\317l\317\344\266\317\344\266z\330v\377\377\377"
+  "\377\377\377\323\377\221t\2702t\2702l\352l\377\377\377\377\377\377\377\377"
+  "\377D\3502\362\375\360\377\377\377P\3342\346\371\342\377\377\377\\\3202\364"
+  "\377\336h\3042\325\355\305\377\377\377t\2702\317\344\266\377\377\377\200"
+  "\2542\312\332\250\377\377\377\214\2402\310\316\231\377\377\377\230\2242\307"
+  "\300\213\377\377\377\6\5/mVv{^\377\200U0\220^\377\7\4/\227U[\246]\377\7\3"
+  "/\255RN\277Z\377\10\3/\306M@\6\4/{^\377{^\377mVv\6\5/\6\5/h\\\377h\\\377"
+  "\\U\204\12\12\360\5\5/\12\12\360\377\377\377\377\377\377\310\316\231\310"
+  "\316\231\377\377\377\214\2402\214\2402\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\312\332\250\312\332\250\377\377\377\200\2542\200\2542\200\254"
+  "2\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\317\344\266\317\344\266\317\344\266\377\377\377\377\377\377t\2702t\2702"
+  "\377\377\377\377\377\377D\3502\362\375\360\377\377\377P\3342\346\371\342"
+  "\377\377\377\\\3202\335\364\323\377\377\377h\3042\325\355\305\377\377\377"
+  "t\2702\317\344\266\377\377\377\200\2542\312\332\250\377\377\377\214\2402"
+  "\310\316\231\377\377\377\230\2242\307\300\213h\\\377\6\5/mVv{^\377\200U0"
+  "\220^\377\7\4/\227U[\246]\377\7\3/\255RN\277Z\377\10\3/\306M@\6\4/\6\4/{"
+  "^\377mVvmVv\6\5/\12\12\360h\\\377\\U\204\\U\204\5\5/\230\2242\377\377\377"
+  "\377\377\377\377\377\377\310\316\231\310\316\231\377\377\377\214\2402\214"
+  "\2402\377\377\377\377\377\377\377\377\377\377\377\377\312\332\250\312\332"
+  "\250\377\377\377\377\377\377\200\2542\200\2542\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\317\344\266\317"
+  "\344\266\377\377\377\377\377\377\377\377\377\377\377\377D\3502q\10p\377\377"
+  "\377P\3342\335\350\332\377\377\377\\\3202\351\366\337\377\377\377h\3042d"
+  "!\\\377\377\377t\2702\277\302\252\377\377\377\200\2542\343\345\301\377\377"
+  "\377\214\2402^2H\377\377\377\230\2242\257\235\204h\\\377\6\5/\223o\234{^"
+  "\377\6\4/<\36""1\377\252\215j)2\211XK\377\250\203\202$2\337~c\377\242y\236"
+  "\37""2]#\26\306M@\6\4/ym\274{^\377mVvELn\6\5/h\\\37703x\\U\204\307\300\213"
+  "\204\226\\\230\2242\377\377\377\377\377\377\377\377\377\310\316\231^\212"
+  "H\377\377\377\214\2402}\256b\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\312\332\250_\251O\377\377\377\377\377\377y\310j\200\2542\377\377\377"
+  "\377\377\377\377\377\377\377\377\377x\341x\377\377\377\377\377\377\177\350"
+  "|\317\344\266\377\377\377\377\377\377D\3502\362\375\360\377\377\377P\334"
+  "2\346\371\342\377\377\377\\\3202\335\364\323\377\377\377\377\377\377h\304"
+  "2\325\355\305\377\377\377t\2702\317\344\266\377\377\377\200\2542\312\332"
+  "\250\377\377\377\214\2402\310\316\231\377\377\377\230\2242\\U\204h\\\377"
+  "\6\5/mVv{^\377\6\4/\12\12\360\201Vi\220^\377\7\4/\227U[\246]\377\7\3/\255"
+  "RN\277Z\377\10\3/\306M@\6\4/\12\12\360{^\377mVvmVv\6\5/\12\12\360h\\\377"
+  "\377\377\377\307\300\213\377\377\377\230\2242\230\2242\377\377\377\377\377"
+  "\377\377\377\377\310\316\231\310\316\231\377\377\377\214\2402\214\2402\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\312\332\250\312\332\250\312"
+  "\332\250\377\377\377\200\2542\200\2542\200\2542\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377D\350"
+  "2\362\375\360\377\377\377P\3342\377\377\377\346\371\342\377\377\377\\\320"
+  "2\335\364\323\377\377\377h\3042\325\355\305\377\377\377t\2702\317\344\266"
+  "\377\377\377\200\2542\377\377\377\312\332\250\377\377\377\214\2402\310\316"
+  "\231\377\377\377\5\5/\\U\204h\\\377\6\5/mVv{^\377\6\4/\12\12\360\201Vi\220"
+  "^\377\7\4/\227U[\246]\377\7\3/\255RN\277Z\377\10\3/\306M@\6\4/\6\4/{^\377"
+  "\12\12\360mVv\6\5/\6\5/\377\377\377\377\377\377\307\300\213\307\300\213\377"
+  "\377\377\230\2242\377\377\377\377\377\377\377\377\377\377\377\377\310\316"
+  "\231\310\316\231\377\377\377\214\2402\214\2402\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\312\332\250\312\332\250\377\377\377\377"
+  "\377\377\200\2542\200\2542\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\204\0\204\377\377\377D\3502\355\364\353\377\377\377\377\377\377Y\335;\346"
+  "\371\342\377\377\377/\26\31\335\364\323\377\377\377k\255<\325\355\305\377"
+  "\377\377\377\377\377t\2702\317\344\266\2046\204\200\2542\312\332\250\340"
+  "\317\340\214\2402\310\316\231\377\377\377VX\377\5\5//\33Dh\\\377\6\5/tVz"
+  "{^\377\6\4/=0\377\201Vi\220^\377\3\1\30\227U[\246]\377?6U\255RN\277Z\377"
+  "\337]s\306M0\306M@\3\2\30{^\377{^\377yv}mVv\244\2102\377\377\377\377\377"
+  "\377\377\377\377gyG\307\300\213\230\2242\212\242h\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\310\316\231g\230O\377\377\377\214\2402\205\274q"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377h\270V\312\332"
+  "\250\377\377\377\222\344\222\200\2542\200\2542\377\377\377\377\377\377\377"
+  "\377\377\377\377\377D\3502\362\375\360\377\377\377\377\377\377P\3342\346"
+  "\371\342\377\377\377\\\3202\335\364\323\377\377\377\377\377\377h\3042\325"
+  "\355\305\377\377\377t\2702\317\344\266\377\377\377\377\377\377\200\2542\312"
+  "\332\250\377\377\377\214\2402\310\316\231VX\377\12\12\360\5\5/\\U\204h\\"
+  "\377\6\5/mVv{^\377\6\4/\12\12\360\201Vi\220^\377\7\4/\227U[\246]\377\7\3"
+  "/\255RN\255RN\277Z\377\10\3/\306M@\6\4/\12\12\360{^\377\12\12\360\307\260"
+  "|\244\2102\244\2102\377\377\377\377\377\377\377\377\377\307\300\213\377\377"
+  "\377\230\2242\230\2242\377\377\377\377\377\377\377\377\377\377\377\377\310"
+  "\316\231\377\377\377\377\377\377\214\2402\214\2402\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\312\332\250\312\332\250\377\377\377"
+  "\377\377\377\200\2542\200\2542\377\377\377\377\377\377D\3502\377\377\377"
+  "\362\375\360\377\377\377P\3342\346\371\342\377\377\377\\\3202\377\377\377"
+  "\335\364\323\377\377\377h\3042\325\355\305\377\377\377\377\377\377t\2702"
+  "\317\344\266\377\377\377\200\2542\312\332\250\377\377\377\377\377\377\214"
+  "\2402LR\221VX\377\5\5/\\U\204\12\12\360h\\\377\6\5/mVv{^\377\6\4/\12\12\360"
+  "\201Vi\220^\377\7\4/\227U[\246]\377\7\3/\7\3/\255RN\277Z\377\10\3/\306M@"
+  "\6\4/\6\4/{^\377\377\377\377\307\260|\377\377\377\244\2102\377\377\377\377"
+  "\377\377\377\377\377\307\300\213\307\300\213\377\377\377\230\2242\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\310\316\231\310\316\231\377\377"
+  "\377\377\377\377\214\2402\214\2402\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\312\332\250\312\332\250\377\377\377\377\377\377\377"
+  "\377\377\377\377\377D\3502\377\377\377\362\375\360\377\377\377-\17\34\346"
+  "\371\342\377\377\377\363\346\363\\\3202\335\364\323\377\377\377h\3042\377"
+  "\377\377x)o\377\377\377t\2702\301\276\255\377\377\377\377\377\377\243\273"
+  "U\312\332\250\377\377\377O-\34\12\12\360LR\221gU\333\5\5/\\U\204<)\377h\\"
+  "\377\6\5/=!B{^\377\6\4/A2\306\201Vi\220^\377I9q\227U[\246]\377]-\220\7\3"
+  "/\255RN\245q\304\10\3/\306M0\377\236\221\6\4/\377\377\377\220\231\220\307"
+  "\260|\307\260|\226\227m\244\2102\377\377\377\377\377\377\377\377\377\307"
+  "\300\213p\207N\230\2242\230\2242\254\316\254\377\377\377\377\377\377\377"
+  "\377\377\310\316\231\310\316\231\220\317\220\377\377\377\214\2402\216\316"
+  "\200\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377r\310^\312"
+  "\332\250\377\377\377\377\377\377\377\377\377D\3502\362\375\360\377\377\377"
+  "P\3342\377\377\377\346\371\342\377\377\377\\\3202\335\364\323\377\377\377"
+  "\377\377\377h\3042\325\355\305\377\377\377\377\377\377t\2702\317\344\266"
+  "\377\377\377\200\2542\377\377\377\312\332\250\377\377\377\5\6/LR\221\12\12"
+  "\360VX\377\5\5/\\U\204h\\\377\12\12\360\6\5/mVv{^\377\6\4/\12\12\360\201"
+  "Vi\220^\377\7\4/\227U[\12\12\360\246]\377\7\3/\255RN\277Z\377\277Z\377\10"
+  "\3/\306M@\260|2\260|2\377\377\377\377\377\377\307\260|\377\377\377\244\210"
+  "2\377\377\377\377\377\377\377\377\377\377\377\377\307\300\213\377\377\377"
+  "\230\2242\230\2242\377\377\377\377\377\377\377\377\377\377\377\377\310\316"
+  "\231\310\316\231\377\377\377\377\377\377\214\2402\214\2402\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377D\3502\362\375\360\377\377\377P\3342\377\377\377\346\371\342\377"
+  "\377\377\\\3202\377\377\377\335\364\323\377\377\377h\3042\325\355\305\377"
+  "\377\377\377\377\377t\2702\317\344\266\377\377\377\377\377\377\200\2542\312"
+  "\332\250\377\377\377\12\12\360\5\6/LR\221VX\377\12\12\360\5\5/\\U\204h\\"
+  "\377\6\5/\12\12\360mVv{^\377\6\4/\12\12\360\201Vi\220^\377\7\4/\227U[\227"
+  "U[\246]\377\7\3/\255RN\12\12\360\277Z\377\10\3/\333bB\377\377\377\260|2\377"
+  "\377\377\377\377\377\307\260|\307\260|\244\2102\244\2102\377\377\377\377"
+  "\377\377\377\377\377\307\300\213\307\300\213\377\377\377\230\2242\230\224"
+  "2\377\377\377\377\377\377\377\377\377\377\377\377\310\316\231\310\316\231"
+  "\377\377\377\377\377\377\214\2402\214\2402\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377)\10\36\362\375\360\377\377\377\370"
+  "\356\370P\3342\346\371\342\377\377\377\377\377\377\\\3202\207\"\201\377\377"
+  "\377\377\377\377p\250D\325\355\305\377\377\377\377\377\377t\2702\317\344"
+  "\266\234?\234\200\2542\377\377\377\274\260\244FS\377\5\6/;#\377LR\221VX\377"
+  "\3\1\34\12\12\360\\U\204{^\330\6\5/\12\12\360\257\203\270{^\377\6\4/\6\4"
+  "\222\201Vi\220^\377P@d\12\12\360\227U[\370\244\377\7\3/\255RNi./\277Z\377"
+  "\324X2\264\202w\333bB\260|2\377\377\377\377\377\377\377\377\377yvK\377\377"
+  "\377\244\2102\236\247|\377\377\377\377\377\377\377\377\377\307\300\213\307"
+  "\300\213\234\306\234\230\2242\377\377\377\256\330\256\377\377\377\377\377"
+  "\377\377\377\377\310\316\231\310\316\231\234\341\234\377\377\377\214\240"
+  "2\232\343\223\377\377\377\377\377\377\377\377\377\377\377\377D\3502\362\375"
+  "\360\377\377\377\377\377\377P\3342\346\371\342\377\377\377\377\377\377\\"
+  "\3202\335\364\323\377\377\377\377\377\377h\3042\325\355\305\377\377\377\377"
+  "\377\377t\2702\317\344\266\377\377\377\377\377\377\200\2542\312\332\250\12"
+  "\12\360FS\377\5\6/LR\221\12\12\360RW\255\3\5\35\6\11\224ZT\\d[\261\3\4\35"
+  "\6\11\224lVTw]\264\4\4\35\6\11\224\200VN\214]\270\4\3\35\6\11\224\226UG\242"
+  "\\\274\4\3\35\4\3\35\254R@\377\377\311\203U\36\203U\36\323a:my\36my\36\377"
+  "\377\276\377\377\276\243\255X\243\255X\236\371\236e\204\36\236\371\236\374"
+  "\377\273\236\371\236\236\371\236\234\275`\236\371\236^\220\36^\220\36\236"
+  "\371\236\352\377\267\352\377\267\236\371\236\236\371\236\310\316\231\310"
+  "\316\231\377\377\377\377\377\377\214\2402\377\377\377\377\377\377\377\377"
+  "\377D\3502\362\375\360\377\377\377\377\377\377P\3342\346\371\342\377\377"
+  "\377\377\377\377\\\3202\377\377\377\335\364\323\377\377\377h\3042\377\377"
+  "\377\325\355\305\377\377\377t\2702\377\377\377\317\344\266\377\377\377\377"
+  "\377\377\200\2542<L\237FS\377\12\12\360\5\6/LR\221\6\11\224RW\255\3\5\35"
+  "ZT\\\6\11\224d[\261\3\4\35\6\11\224lVTw]\264\4\4\35\6\11\224\200VN\214]\270"
+  "\4\3\35\4\3\35\226UG\242\\\274\6\11\224\4\3\35\304wB\377\377\311\377\377"
+  "\311\203U\36\323a:\236\371\236my\36\236\371\236\377\377\276\236\371\236\243"
+  "\255X\236\371\236e\204\36e\204\36\374\377\273\374\377\273\236\371\236\234"
+  "\275`\234\275`\236\371\236^\220\36^\220\36\236\371\236\352\377\267\352\377"
+  "\267\377\377\377\377\377\377\310\316\231\310\316\231\377\377\377\250\0\250"
+  "\377\377\377\377\377\377F\3375\362\375\360\377\377\377\377\377\377P\3342"
+  "\377\377\377\227\32\224\377\377\377\\\3202\362\340\362\335\364\323\377\377"
+  "\377\377\377\377h\3042\325\355\305\2506\250\377\377\377t\2702\304\272\262"
+  "\377\377\377\377\377\377\257\300a\12\12\360<L\237.\32\250\5\6/\12\12\360"
+  "jSzRW\255\6\11\224D+^ZT\\\6\11\224A&t\3\4\35lVTP9\235w]\264\4\4\35YG\347"
+  "\200VN\214]\270\3\4a\4\3\35\226UG\244y\257\6\11\224{a\36\377\322\246\236"
+  "\371\236\377\377\311V6\23\323a:\323a:\223\231y\236\371\236\377\377\276\377"
+  "\377\377\243\255X\243\255Xh\270he\204\36\236\371\236\272\322\253\374\377"
+  "\273\236\371\236\377\377\350\236\371\236\236\371\236=y\23\236\371\236\236"
+  "\371\236\262\344\262\377\377\377\377\377\377\377\377\377\310\316\231\377"
+  "\377\377\377\377\377\377\377\377D\3502\362\375\360\377\377\377\377\377\377"
+  "P\3342\377\377\377\346\371\342\377\377\377\377\377\377\\\3202\335\364\323"
+  "\377\377\377\377\377\377h\3042\325\355\305\377\377\377\377\377\377t\2702"
+  "\377\377\377\317\344\266\377\377\377\377\377\377\5\6/<L\237\12\12\360FS\377"
+  "\5\6/\6\11\224JQbRW\255\6\11\224\3\5\35ZT\\d[\261\6\11\224\3\4\35lVT\6\11"
+  "\224w]\264\4\4\35\6\11\224\200VN\214]\270\6\11\224\4\3\35\226UG\242\\\274"
+  "\377\377\306{a\36\304wB\304wB\377\377\311\203U\36\203U\36\323a:my\36my\36"
+  "\377\377\276\377\377\276\236\371\236\243\255X\236\371\236e\204\36e\204\36"
+  "\236\371\236\374\377\273\236\371\236\234\275`\234\275`\236\371\236^\220\36"
+  "^\220\36\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377D\3502\362\375\360\377\377\377\377\377\377"
+  "P\3342\377\377\377\346\371\342\377\377\377\377\377\377\\\3202\335\364\323"
+  "\377\377\377\377\377\377h\3042\377\377\377\325\355\305\377\377\377\377\377"
+  "\377t\2702\317\344\266\377\377\377\377\377\377\5\6/\12\12\360<L\237FS\377"
+  "\12\12\360\3\5\35JQb\6\11\224RW\255\3\5\35\6\11\224ZT\\d[\261\6\11\224\3"
+  "\4\35lVT\6\11\224w]\264\4\4\35\6\11\224\200VN\214]\270\6\11\224\4\3\35\226"
+  "UG\236\371\236\377\377\306{a\36\236\371\236\304wB\377\377\311\236\371\236"
+  "\203U\36\323a:\236\371\236my\36\236\371\236\377\377\276\236\371\236\243\255"
+  "X\243\255X\236\371\236e\204\36\236\371\236\374\377\273\374\377\273\236\371"
+  "\236\234\275`\234\275`\236\371\236\230\2242\230\2242\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377J\3508\377\377\377\362"
+  "\375\360\264\22\264\377\377\377P\3342\340\340\335\377\377\377\377\377\377"
+  "u\325K\377\377\377\335\364\323\264-\264\377\377\377h\3042\315\305\301\377"
+  "\377\377\377\377\377\240\307^\377\377\377\317\344\266\264H\264\12\12\360"
+  "\5\6/aL\245\12\12\360FS\377E(\323\3\5\35JQb\4\3hRW\255\3\5\35O2\241ZT\\d"
+  "[\261X>\346\3\4\35lVT\4\4hw]\264\4\4\35aK\244\200VN\214]\270kZ\371\4\3\35"
+  "\270\212Io\225o\377\377\306{a\36\253\300\253\304wB\377\377\311\377\377\377"
+  "\203U\36\323a:\224D(my\36\236\371\236\307\316\266\377\377\276\236\371\236"
+  "\377\377\343\236\371\236e\204\36Gk\25\236\371\236\374\377\273\260\334\260"
+  "\236\371\236\234\275`\377\377\377\377\377\377\230\2242k\207#\377\377\377"
+  "\377\377\377\377\377\377\377\377\377D\3502\377\377\377\362\375\360\377\377"
+  "\377\377\377\377P\3342\346\371\342\377\377\377\377\377\377\\\3202\377\377"
+  "\377\335\364\323\377\377\377\377\377\377h\3042\377\377\377\325\355\305\377"
+  "\377\377\377\377\377t\2702\317\344\266\377\377\3778L\377\12\12\360\5\6/<"
+  "L\237\12\12\360BR\252\3\5\35\6\11\224JQbRW\255\6\11\224\3\5\35ZT\\\6\11\224"
+  "d[\261\6\11\224\3\4\35lVT\6\11\224w]\264\4\4\35\6\11\224\200VN\214]\270\6"
+  "\11\224tm\36\270\212I\270\212I\377\377\306{a\36{a\36\304wB\236\371\236\377"
+  "\377\311\203U\36\236\371\236\323a:my\36my\36\236\371\236\377\377\276\236"
+  "\371\236\243\255X\243\255X\236\371\236e\204\36\236\371\236\374\377\273\374"
+  "\377\273\236\371\236\307\300\213\307\300\213\377\377\377\377\377\377\230"
+  "\2242\377\377\377\377\377\377\377\377\377D\3502\377\377\377\362\375\360\377"
+  "\377\377\377\377\377P\3342\377\377\377\346\371\342\377\377\377\377\377\377"
+  "\\\3202\335\364\323\377\377\377\377\377\377\377\377\377h\3042\325\355\305"
+  "\377\377\377\377\377\377t\2702\377\377\377\317\344\2668L\377\12\12\360\5"
+  "\6/\12\12\360<L\237BR\252\6\11\224\3\5\35JQb\6\11\224RW\255\6\11\224\3\5"
+  "\35ZT\\\6\11\224d[\261\3\4\35\6\11\224lVT\6\11\224w]\264\4\4\35\6\11\224"
+  "\200VN\214]\270\236\371\236tm\36\236\371\236\270\212I\377\377\306\236\371"
+  "\236{a\36\304wB\236\371\236\377\377\311\203U\36\203U\36\323a:\236\371\236"
+  "my\36\236\371\236\377\377\276\377\377\276\236\371\236\243\255X\236\371\236"
+  "e\204\36e\204\36\236\371\236\374\377\273\377\377\377\377\377\377\307\300"
+  "\213\307\300\213\377\377\377\377\377\377\377\377\377\377\377\3773\10%\377"
+  "\377\377\362\375\360\372\356\372\377\377\377P\3342\377\377\377\346\371\342"
+  "\377\377\377\300$\300\\\3202\377\377\377\327\317\316\377\377\377\377\377"
+  "\377\220\317Z\377\377\377\325\355\305\300?\300\377\377\377t\2702\312\267"
+  "\270\12\12\3608L\377F#\377\5\6/<L\237\4\3oBR\252\6\11\224K)[JQb\6\11\224"
+  "\243\204\376\3\5\35\6\11\224C&E\6\11\224d[\261_@l\6\11\224lVTkP\371w]\264"
+  "\4\4\35\4\5o\200VN\377\377\302\262\276\262tm\36\236\371\236\377\360\302\377"
+  "\377\306\236\371\236\\A\26\304wB\304wB\322\312\302\236\371\236\203U\36\377"
+  "\355\310\323a:my\36R]\26\236\371\236\377\377\276\270\326\270\243\255X\236"
+  "\371\236\377\377\377e\204\36\236\371\236\300\341\300\377\377\377\377\377"
+  "\377\305\353\305\307\300\213\377\377\377\377\377\377\377\377\377D\3502\377"
+  "\377\377\362\375\360\377\377\377\377\377\377P\3342\377\377\377\346\371\342"
+  "\377\377\377\377\377\377\\\3202\377\377\377\335\364\323\377\377\377\377\377"
+  "\377h\3042\377\377\377\325\355\305\377\377\377\377\377\377t\2702\377\377"
+  "\3770E\254\12\12\3608L\377\5\6/\12\12\360:Lj\6\11\224BR\252\3\5\35\6\11\224"
+  "JQb\6\11\224RW\255\3\5\35\6\11\224ZT\\\6\11\224d[\261\3\4\35\6\11\224lVT"
+  "\6\11\224w]\264\4\4\35\6\11\224\255\235Q\377\377\302\377\377\302tm\36\236"
+  "\371\236\270\212I\377\377\306\377\377\306{a\36\236\371\236\304wB\377\377"
+  "\311\377\377\311\203U\36\236\371\236\323a:\236\371\236my\36\236\371\236\377"
+  "\377\276\236\371\236\243\255X\243\255X\236\371\236e\204\36\244\2102\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377D\3502\377\377\377\362\375\360\377\377\377\377\377\377P\3342\377\377"
+  "\377\346\371\342\377\377\377\377\377\377\377\377\377\\\3202\335\364\323\377"
+  "\377\377\377\377\377\377\377\377h\3042\325\355\305\377\377\377\377\377\377"
+  "\377\377\377t\2702\317\344\266\377\377\377\377\377\377\377\377\377\200\254"
+  "2\236\371\236\222\326p\332\377\264\236\371\236V\234\36\236\371\236\226\312"
+  "g\352\377\267\236\371\236^\220\36\236\371\236\234\275`\374\377\273\236\371"
+  "\236e\204\36\236\371\236\243\255X\377\377\276\236\371\236my\36\236\371\236"
+  "\255\235Q\236\371\236\377\377\302tm\36\236\371\236\270\212I\236\371\236\377"
+  "\377\306{a\36\236\371\236\304wB\236\371\236\377\377\311\203U\36\203U\36\323"
+  "a:\236\371\236my\36\236\371\236\377\377\276\377\377\276\236\371\236\243\255"
+  "X\236\371\236\377\377\377\244\2102\377\377\377\377\377\377\377\377\377\314"
+  "\0\314\377\377\377\377\377\377H\3377\377\377\377\362\375\360\377\377\377"
+  "\377\377\377\377\377\377@\27(\346\371\342\377\377\377\367\340\367\377\377"
+  "\377\\\3202\377\377\377\335\364\323\377\377\377\3146\314h\3042\377\377\377"
+  "\322\301\306\377\377\377\377\377\377\255\314k\377\377\377\317\344\266\314"
+  "Q\314\377\377\377\200\2542\256\300\256\222\326p\236\371\236\377\377\377\236"
+  "\371\236V\234\36xUR\236\371\236\352\377\267\262\273\262^\220\36\234\275`"
+  "\377\377\377\374\377\273\236\371\236PE\30\236\371\236\243\255X\342\300\305"
+  "\236\371\236my\36\377\377\377\255\235Q\236\371\236\314\242\233tm\36\236\371"
+  "\236\304\237\240\236\371\236\377\377\306\377\340\256{a\36\304wB~\270~\377"
+  "\377\311\236\371\236\273\254\244\323a:\323a:\377\377\303my\36\236\371\236"
+  "\314\330\230\236\371\236\243\255X\313\332\302\377\377\377\244\2102\377\377"
+  "\355\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377D\3502\362"
+  "\375\360\377\377\377\377\377\377\377\377\377P\3342\377\377\377\346\371\342"
+  "\377\377\377\377\377\377\\\3202\377\377\377\335\364\323\377\377\377\377\377"
+  "\377h\3042\377\377\377\325\355\305\377\377\377\377\377\377\377\377\377t\270"
+  "2\317\344\266\377\377\377\377\377\377\377\377\377O\247\36\236\371\236\222"
+  "\326p\332\377\264\236\371\236V\234\36\236\371\236\226\312g\236\371\236\352"
+  "\377\267\236\371\236^\220\36\234\275`\236\371\236\374\377\273\236\371\236"
+  "e\204\36\236\371\236\243\255X\377\377\276\236\371\236my\36\236\371\236\255"
+  "\235Q\236\371\236\377\377\302tm\36\236\371\236\270\212I\236\371\236\377\377"
+  "\306\236\371\236{a\36\304wB\304wB\377\377\311\236\371\236\203U\36\236\371"
+  "\236\323a:\236\371\236my\36\236\371\236\377\377\276\377\377\276\377\377\377"
+  "\307\260|\377\377\377\377\377\377\244\2102\377\377\377\377\377\377\377\377"
+  "\377\377\377\377D\3502\362\375\360\377\377\377\377\377\377\377\377\377P\334"
+  "2\377\377\377\346\371\342\377\377\377\377\377\377\\\3202\377\377\377\335"
+  "\364\323\377\377\377\377\377\377\377\377\377h\3042\377\377\377\325\355\305"
+  "\377\377\377\377\377\377t\2702\377\377\377\317\344\266\377\377\377\377\377"
+  "\377\236\371\236O\247\36\222\326p\236\371\236\332\377\264\236\371\236V\234"
+  "\36\236\371\236\226\312g\236\371\236\352\377\267^\220\36\236\371\236\234"
+  "\275`\236\371\236\374\377\273\236\371\236e\204\36\236\371\236\243\255X\377"
+  "\377\276\236\371\236my\36\236\371\236\255\235Q\236\371\236\377\377\302tm"
+  "\36tm\36\270\212I\236\371\236\377\377\306\236\371\236{a\36\236\371\236\304"
+  "wB\377\377\311\377\377\311\203U\36\236\371\236\323a:\236\371\236my\36\236"
+  "\371\236\236\371\236\377\377\377\377\377\377\307\260|\307\260|\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377D\3502\362\375\360\330\22"
+  "\330\377\377\377\377\377\377]\306B\377\377\377\346\371\342\377\377\377\377"
+  "\377\377\377\377\377M$*\335\364\323\377\377\377\366\324\366\377\377\377h"
+  "\3042\377\377\377\325\355\305\377\377\377\330H\330\377\377\377t\2702\321"
+  "\264\300\377\377\377\377\377\377\352\377\352O\247\36\236\371\236{S^\236\371"
+  "\236\332\377\264\266\274\266V\234\36\226\312g\377\377\377\352\377\267\236"
+  "\371\236OG\31\236\371\236\234\275`\274\274\274\374\377\273\236\371\236\336"
+  "\325\227\243\255X\236\371\236\330\231\240\236\371\236my\36\302\300\302\255"
+  "\235Q\236\371\236\377\377\377\236\371\236tm\36\233a=\236\371\236\377\377"
+  "\306\310\314\310{a\36\236\371\236\377\377\351\236\371\236\377\377\311nE\31"
+  "\203U\36\323a:\326\304\276my\36my\36\377\377\377\377\377\377\377\377\377"
+  "\330\352\330\307\260|\377\377\377\377\377\377\377\377\377\377\377\377D\350"
+  "2\377\377\377\362\375\360\377\377\377\377\377\377P\3342\377\377\377\346\371"
+  "\342\377\377\377\377\377\377\377\377\377\\\3202\377\377\377\335\364\323\377"
+  "\377\377\377\377\377\377\377\377h\3042\325\355\305\377\377\377\377\377\377"
+  "\377\377\377t\2702\377\377\377\317\344\266\377\377\377\377\377\377\377\377"
+  "\377\200\2542\377\377\377\312\332\250\377\377\377\377\377\377\214\2402\377"
+  "\377\377\310\316\231\377\377\377\377\377\377\377\377\377\230\2242\377\377"
+  "\377\307\300\213\377\377\377\377\377\377\244\2102\377\377\377\307\260|\377"
+  "\377\377\377\377\377\377\377\377\260|2\377\377\377\312\237n\377\377\377\377"
+  "\377\377\377\377\377\274p2\316\214_\316\214_\377\377\377\377\377\377\310"
+  "d2\377\377\377\323xQ\377\377\377\377\377\377\377\377\377\324X2\377\377\377"
+  "\333bB\377\377\377\260|2\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\377\377\377\377\377\377\377\377\377D\3502\377\377\377\362\375"
+  "\360\377\377\377\377\377\377P\3342\377\377\377\346\371\342\377\377\377\377"
+  "\377\377\377\377\377\\\3202\377\377\377\335\364\323\377\377\377\377\377\377"
+  "\377\377\377h\3042\377\377\377\325\355\305\377\377\377\377\377\377\377\377"
+  "\377t\2702\317\344\266\377\377\377\377\377\377\377\377\377\200\2542\377\377"
+  "\377\312\332\250\377\377\377\377\377\377\377\377\377\214\2402\377\377\377"
+  "\310\316\231\377\377\377\377\377\377\377\377\377\230\2242\377\377\377\307"
+  "\300\213\377\377\377\377\377\377\244\2102\377\377\377\307\260|\377\377\377"
+  "\377\377\377\377\377\377\260|2\377\377\377\312\237n\377\377\377\377\377\377"
+  "\377\377\377\274p2\377\377\377\316\214_\377\377\377\377\377\377\310d2\310"
+  "d2\323xQ\377\377\377\377\377\377\377\377\377\324X2\377\377\377\333bB\377"
+  "\377\377\260|2\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
+  "\377\377\377\344\11\344D\3502\377\377\377\360\354\357\377\377\377\377\377"
+  "\377\377\377\377P\3342\377\377\377\315#\312\377\377\377\377\377\377s\262"
+  "Q\377\377\377\335\364\323\377\377\377\377\377\377\377\377\377\\0,\377\377"
+  "\377\325\355\305\367\313\367\377\377\377\377\377\377\274\321z\377\377\377"
+  "\317\344\266\344Z\344\377\377\377\377\377\377\246\217v\377\377\377\312\332"
+  "\250\377\377\377\377\377\377\377\377\377}I,\377\377\377\310\316\231\361\277"
+  "\361\377\377\377\230\2242\377\377\377\307\300\213\377\377\377\344\220\344"
+  "\377\377\377\244\2102\356\301\356\307\260|\377\377\377\377\377\377\377\377"
+  "\377\260|2\344\253\344\312\237n\377\377\377\353\312\353\377\377\377\274p"
+  "2\377\377\377\316\214_\377\377\377\344\306\344\377\377\377\310d2\340\276"
+  "\310\323xQ\377\377\377\377\377\377\324X2\324X2\303V;\333bB\260|2\337\340"
+  "\325\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377D\3502\377"
+  "\377\377\362\375\360\377\377\377\377\377\377\377\377\377P\3342\377\377\377"
+  "\346\371\342\377\377\377\377\377\377\377\377\377\\\3202\377\377\377\335\364"
+  "\323\377\377\377\377\377\377\377\377\377h\3042\377\377\377\325\355\305\377"
+  "\377\377\377\377\377\377\377\377t\2702\317\344\266\377\377\377\377\377\377"
+  "\377\377\377\200\2542\377\377\377\312\332\250\377\377\377\377\377\377\377"
+  "\377\377\214\2402\377\377\377\310\316\231\377\377\377\377\377\377\377\377"
+  "\377\230\2242\377\377\377\307\300\213\377\377\377\377\377\377\377\377\377"
+  "\244\2102\377\377\377\307\260|\377\377\377\377\377\377\377\377\377\260|2"
+  "\377\377\377\312\237n\377\377\377\377\377\377\377\377\377\274p2\377\377\377"
+  "\316\214_\377\377\377\377\377\377\377\377\377\310d2\377\377\377\323xQ\377"
+  "\377\377\377\377\377\377\377\377\324X2\377\377\377\333bB\377\377\377\260"
+  "|2\377\377\377\377\377\377\377\377\377\377\377\377D\3502\377\377\377\362"
+  "\375\360\377\377\377\377\377\377\377\377\377P\3342\377\377\377\346\371\342"
+  "\377\377\377\377\377\377\377\377\377\\\3202\377\377\377\335\364\323\377\377"
+  "\377\377\377\377\377\377\377h\3042\377\377\377\325\355\305\377\377\377\377"
+  "\377\377\377\377\377t\2702\377\377\377\317\344\266\377\377\377\377\377\377"
+  "\377\377\377\200\2542\377\377\377\312\332\250\377\377\377\377\377\377\377"
+  "\377\377\214\2402\377\377\377\310\316\231\377\377\377\377\377\377\377\377"
+  "\377\230\2242\377\377\377\307\300\213\377\377\377\377\377\377\377\377\377"
+  "\244\2102\377\377\377\307\260|\377\377\377\377\377\377\377\377\377\260|2"
+  "\377\377\377\312\237n\377\377\377\377\377\377\377\377\377\274p2\377\377\377"
+  "\316\214_\377\377\377\377\377\377\377\377\377\310d2\377\377\377\323xQ\377"
+  "\377\377\377\377\377\377\377\377\324X2\377\377\377\333bB\377\377\377",
+};
+
+/**
+ * \brief Returns the PrimitivesBlend test image as SDL_Surface.
+ */
+SDL_Surface *SDLTest_ImagePrimitivesBlend()
+{
+   SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(
+        (void*)SDLTest_imagePrimitivesBlend.pixel_data,
+        SDLTest_imagePrimitivesBlend.width,
+        SDLTest_imagePrimitivesBlend.height,
+        SDLTest_imagePrimitivesBlend.bytes_per_pixel * 8,
+        SDLTest_imagePrimitivesBlend.width * SDLTest_imagePrimitivesBlend.bytes_per_pixel,
+#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
+         0xff000000, /* Red bit mask. */
+         0x00ff0000, /* Green bit mask. */
+         0x0000ff00, /* Blue bit mask. */
+         0x000000ff  /* Alpha bit mask. */
+#else
+         0x000000ff, /* Red bit mask. */
+         0x0000ff00, /* Green bit mask. */
+         0x00ff0000, /* Blue bit mask. */
+         0xff000000  /* Alpha bit mask. */
+#endif
+         );
+   return surface;
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_log.c b/Source/3rd Party/sdl/src/test/SDL_test_log.c
new file mode 100644
index 000000000..9a083074c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_log.c	
@@ -0,0 +1,102 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+
+ Used by the test framework and test cases.
+
+*/
+
+/* quiet windows compiler warnings */
+#define _CRT_SECURE_NO_WARNINGS
+
+#include "SDL_config.h"
+
+#include <stdarg.h> /* va_list */
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#include "SDL.h"
+
+#include "SDL_test.h"
+
+/* !
+ * Converts unix timestamp to its ascii representation in localtime
+ *
+ * Note: Uses a static buffer internally, so the return value
+ * isn't valid after the next call of this function. If you
+ * want to retain the return value, make a copy of it.
+ *
+ * \param timestamp A Timestamp, i.e. time(0)
+ *
+ * \return Ascii representation of the timestamp in localtime in the format '08/23/01 14:55:02'
+ */
+char *SDLTest_TimestampToString(const time_t timestamp)
+{
+    time_t copy;
+    static char buffer[64];
+    struct tm *local;
+    const char *fmt = "%x %X";
+
+    SDL_memset(buffer, 0, sizeof(buffer));
+    copy = timestamp;
+    local = localtime(&copy);
+    strftime(buffer, sizeof(buffer), fmt, local);
+
+    return buffer;
+}
+
+/*
+ * Prints given message with a timestamp in the TEST category and INFO priority.
+ */
+void SDLTest_Log(const char *fmt, ...)
+{
+    va_list list;
+    char logMessage[SDLTEST_MAX_LOGMESSAGE_LENGTH];
+
+    /* Print log message into a buffer */
+    SDL_memset(logMessage, 0, SDLTEST_MAX_LOGMESSAGE_LENGTH);
+    va_start(list, fmt);
+    SDL_vsnprintf(logMessage, SDLTEST_MAX_LOGMESSAGE_LENGTH - 1, fmt, list);
+    va_end(list);
+
+    /* Log with timestamp and newline */
+    SDL_LogMessage(SDL_LOG_CATEGORY_TEST, SDL_LOG_PRIORITY_INFO, " %s: %s", SDLTest_TimestampToString(time(0)), logMessage);
+}
+
+/*
+ * Prints given message with a timestamp in the TEST category and the ERROR priority.
+ */
+void SDLTest_LogError(const char *fmt, ...)
+{
+    va_list list;
+    char logMessage[SDLTEST_MAX_LOGMESSAGE_LENGTH];
+
+    /* Print log message into a buffer */
+    SDL_memset(logMessage, 0, SDLTEST_MAX_LOGMESSAGE_LENGTH);
+    va_start(list, fmt);
+    SDL_vsnprintf(logMessage, SDLTEST_MAX_LOGMESSAGE_LENGTH - 1, fmt, list);
+    va_end(list);
+
+    /* Log with timestamp and newline */
+    SDL_LogMessage(SDL_LOG_CATEGORY_TEST, SDL_LOG_PRIORITY_ERROR, "%s: %s", SDLTest_TimestampToString(time(0)), logMessage);
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_md5.c b/Source/3rd Party/sdl/src/test/SDL_test_md5.c
new file mode 100644
index 000000000..8467ccbc4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_md5.c	
@@ -0,0 +1,336 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+ ***********************************************************************
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 1/91 SRD,AJ,BSK,JT Reference C ver., 7/10 constant corr. **
+ ***********************************************************************
+ */
+
+/*
+ ***********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved.  **
+ **                                                                   **
+ ** License to copy and use this software is granted provided that    **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message-     **
+ ** Digest Algorithm" in all material mentioning or referencing this  **
+ ** software or this function.                                        **
+ **                                                                   **
+ ** License is also granted to make and use derivative works          **
+ ** provided that such works are identified as "derived from the RSA  **
+ ** Data Security, Inc. MD5 Message-Digest Algorithm" in all          **
+ ** material mentioning or referencing the derived work.              **
+ **                                                                   **
+ ** RSA Data Security, Inc. makes no representations concerning       **
+ ** either the merchantability of this software or the suitability    **
+ ** of this software for any particular purpose.  It is provided "as  **
+ ** is" without express or implied warranty of any kind.              **
+ **                                                                   **
+ ** These notices must be retained in any copies of any part of this  **
+ ** documentation and/or software.                                    **
+ ***********************************************************************
+ */
+
+#include "SDL_config.h"
+
+#include "SDL_test.h"
+
+/* Forward declaration of static helper function */
+static void SDLTest_Md5Transform(MD5UINT4 * buf, MD5UINT4 * in);
+
+static unsigned char MD5PADDING[64] = {
+  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+/* F, G, H and I are basic MD5 functions */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
+
+/* Rotation is separate from addition to prevent recomputation */
+#define FF(a, b, c, d, x, s, ac) \
+  {(a) += F ((b), (c), (d)) + (x) + (MD5UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) \
+  {(a) += G ((b), (c), (d)) + (x) + (MD5UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) \
+  {(a) += H ((b), (c), (d)) + (x) + (MD5UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) \
+  {(a) += I ((b), (c), (d)) + (x) + (MD5UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+
+/*
+  The routine MD5Init initializes the message-digest context
+  mdContext. All fields are set to zero.
+*/
+
+void SDLTest_Md5Init(SDLTest_Md5Context * mdContext)
+{
+  if (mdContext==NULL) return;
+
+  mdContext->i[0] = mdContext->i[1] = (MD5UINT4) 0;
+
+  /*
+   * Load magic initialization constants.
+   */
+  mdContext->buf[0] = (MD5UINT4) 0x67452301;
+  mdContext->buf[1] = (MD5UINT4) 0xefcdab89;
+  mdContext->buf[2] = (MD5UINT4) 0x98badcfe;
+  mdContext->buf[3] = (MD5UINT4) 0x10325476;
+}
+
+/*
+ The routine MD5Update updates the message-digest context to
+ account for the presence of each of the characters inBuf[0..inLen-1]
+ in the message whose digest is being computed.
+*/
+
+void SDLTest_Md5Update(SDLTest_Md5Context * mdContext, unsigned char *inBuf,
+          unsigned int inLen)
+{
+  MD5UINT4  in[16];
+  int       mdi;
+  unsigned int i, ii;
+
+  if (mdContext == NULL) return;
+  if (inBuf == NULL || inLen < 1) return;
+
+  /*
+   * compute number of bytes mod 64
+   */
+  mdi = (int) ((mdContext->i[0] >> 3) & 0x3F);
+
+  /*
+   * update number of bits
+   */
+  if ((mdContext->i[0] + ((MD5UINT4) inLen << 3)) < mdContext->i[0])
+    mdContext->i[1]++;
+  mdContext->i[0] += ((MD5UINT4) inLen << 3);
+  mdContext->i[1] += ((MD5UINT4) inLen >> 29);
+
+  while (inLen--) {
+    /*
+     * add new character to buffer, increment mdi
+     */
+    mdContext->in[mdi++] = *inBuf++;
+
+    /*
+     * transform if necessary
+     */
+    if (mdi == 0x40) {
+      for (i = 0, ii = 0; i < 16; i++, ii += 4)
+    in[i] = (((MD5UINT4) mdContext->in[ii + 3]) << 24) |
+      (((MD5UINT4) mdContext->in[ii + 2]) << 16) |
+      (((MD5UINT4) mdContext->in[ii + 1]) << 8) |
+      ((MD5UINT4) mdContext->in[ii]);
+      SDLTest_Md5Transform(mdContext->buf, in);
+      mdi = 0;
+    }
+  }
+}
+
+/*
+ The routine MD5Final terminates the message-digest computation and
+ ends with the desired message digest in mdContext->digest[0...15].
+*/
+
+void SDLTest_Md5Final(SDLTest_Md5Context * mdContext)
+{
+  MD5UINT4  in[16];
+  int       mdi;
+  unsigned int i, ii;
+  unsigned int padLen;
+
+  if (mdContext == NULL) return;
+
+  /*
+   * save number of bits
+   */
+  in[14] = mdContext->i[0];
+  in[15] = mdContext->i[1];
+
+  /*
+   * compute number of bytes mod 64
+   */
+  mdi = (int) ((mdContext->i[0] >> 3) & 0x3F);
+
+  /*
+   * pad out to 56 mod 64
+   */
+  padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
+  SDLTest_Md5Update(mdContext, MD5PADDING, padLen);
+
+  /*
+   * append length in bits and transform
+   */
+  for (i = 0, ii = 0; i < 14; i++, ii += 4)
+    in[i] = (((MD5UINT4) mdContext->in[ii + 3]) << 24) |
+      (((MD5UINT4) mdContext->in[ii + 2]) << 16) |
+      (((MD5UINT4) mdContext->in[ii + 1]) << 8) |
+      ((MD5UINT4) mdContext->in[ii]);
+  SDLTest_Md5Transform(mdContext->buf, in);
+
+  /*
+   * store buffer in digest
+   */
+  for (i = 0, ii = 0; i < 4; i++, ii += 4) {
+    mdContext->digest[ii] = (unsigned char) (mdContext->buf[i] & 0xFF);
+    mdContext->digest[ii + 1] =
+      (unsigned char) ((mdContext->buf[i] >> 8) & 0xFF);
+    mdContext->digest[ii + 2] =
+      (unsigned char) ((mdContext->buf[i] >> 16) & 0xFF);
+    mdContext->digest[ii + 3] =
+      (unsigned char) ((mdContext->buf[i] >> 24) & 0xFF);
+  }
+}
+
+/* Basic MD5 step. Transforms buf based on in.
+ */
+static void SDLTest_Md5Transform(MD5UINT4 * buf, MD5UINT4 * in)
+{
+  MD5UINT4  a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+
+  /*
+   * Round 1
+   */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+  FF(a, b, c, d, in[0], S11, 3614090360u);  /* 1 */
+  FF(d, a, b, c, in[1], S12, 3905402710u);  /* 2 */
+  FF(c, d, a, b, in[2], S13, 606105819u);   /* 3 */
+  FF(b, c, d, a, in[3], S14, 3250441966u);  /* 4 */
+  FF(a, b, c, d, in[4], S11, 4118548399u);  /* 5 */
+  FF(d, a, b, c, in[5], S12, 1200080426u);  /* 6 */
+  FF(c, d, a, b, in[6], S13, 2821735955u);  /* 7 */
+  FF(b, c, d, a, in[7], S14, 4249261313u);  /* 8 */
+  FF(a, b, c, d, in[8], S11, 1770035416u);  /* 9 */
+  FF(d, a, b, c, in[9], S12, 2336552879u);  /* 10 */
+  FF(c, d, a, b, in[10], S13, 4294925233u); /* 11 */
+  FF(b, c, d, a, in[11], S14, 2304563134u); /* 12 */
+  FF(a, b, c, d, in[12], S11, 1804603682u); /* 13 */
+  FF(d, a, b, c, in[13], S12, 4254626195u); /* 14 */
+  FF(c, d, a, b, in[14], S13, 2792965006u); /* 15 */
+  FF(b, c, d, a, in[15], S14, 1236535329u); /* 16 */
+
+  /*
+   * Round 2
+   */
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+  GG(a, b, c, d, in[1], S21, 4129170786u);  /* 17 */
+  GG(d, a, b, c, in[6], S22, 3225465664u);  /* 18 */
+  GG(c, d, a, b, in[11], S23, 643717713u);  /* 19 */
+  GG(b, c, d, a, in[0], S24, 3921069994u);  /* 20 */
+  GG(a, b, c, d, in[5], S21, 3593408605u);  /* 21 */
+  GG(d, a, b, c, in[10], S22, 38016083u);   /* 22 */
+  GG(c, d, a, b, in[15], S23, 3634488961u); /* 23 */
+  GG(b, c, d, a, in[4], S24, 3889429448u);  /* 24 */
+  GG(a, b, c, d, in[9], S21, 568446438u);   /* 25 */
+  GG(d, a, b, c, in[14], S22, 3275163606u); /* 26 */
+  GG(c, d, a, b, in[3], S23, 4107603335u);  /* 27 */
+  GG(b, c, d, a, in[8], S24, 1163531501u);  /* 28 */
+  GG(a, b, c, d, in[13], S21, 2850285829u); /* 29 */
+  GG(d, a, b, c, in[2], S22, 4243563512u);  /* 30 */
+  GG(c, d, a, b, in[7], S23, 1735328473u);  /* 31 */
+  GG(b, c, d, a, in[12], S24, 2368359562u); /* 32 */
+
+  /*
+   * Round 3
+   */
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+  HH(a, b, c, d, in[5], S31, 4294588738u);  /* 33 */
+  HH(d, a, b, c, in[8], S32, 2272392833u);  /* 34 */
+  HH(c, d, a, b, in[11], S33, 1839030562u); /* 35 */
+  HH(b, c, d, a, in[14], S34, 4259657740u); /* 36 */
+  HH(a, b, c, d, in[1], S31, 2763975236u);  /* 37 */
+  HH(d, a, b, c, in[4], S32, 1272893353u);  /* 38 */
+  HH(c, d, a, b, in[7], S33, 4139469664u);  /* 39 */
+  HH(b, c, d, a, in[10], S34, 3200236656u); /* 40 */
+  HH(a, b, c, d, in[13], S31, 681279174u);  /* 41 */
+  HH(d, a, b, c, in[0], S32, 3936430074u);  /* 42 */
+  HH(c, d, a, b, in[3], S33, 3572445317u);  /* 43 */
+  HH(b, c, d, a, in[6], S34, 76029189u);    /* 44 */
+  HH(a, b, c, d, in[9], S31, 3654602809u);  /* 45 */
+  HH(d, a, b, c, in[12], S32, 3873151461u); /* 46 */
+  HH(c, d, a, b, in[15], S33, 530742520u);  /* 47 */
+  HH(b, c, d, a, in[2], S34, 3299628645u);  /* 48 */
+
+  /*
+   * Round 4
+   */
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+  II(a, b, c, d, in[0], S41, 4096336452u);  /* 49 */
+  II(d, a, b, c, in[7], S42, 1126891415u);  /* 50 */
+  II(c, d, a, b, in[14], S43, 2878612391u); /* 51 */
+  II(b, c, d, a, in[5], S44, 4237533241u);  /* 52 */
+  II(a, b, c, d, in[12], S41, 1700485571u); /* 53 */
+  II(d, a, b, c, in[3], S42, 2399980690u);  /* 54 */
+  II(c, d, a, b, in[10], S43, 4293915773u); /* 55 */
+  II(b, c, d, a, in[1], S44, 2240044497u);  /* 56 */
+  II(a, b, c, d, in[8], S41, 1873313359u);  /* 57 */
+  II(d, a, b, c, in[15], S42, 4264355552u); /* 58 */
+  II(c, d, a, b, in[6], S43, 2734768916u);  /* 59 */
+  II(b, c, d, a, in[13], S44, 1309151649u); /* 60 */
+  II(a, b, c, d, in[4], S41, 4149444226u);  /* 61 */
+  II(d, a, b, c, in[11], S42, 3174756917u); /* 62 */
+  II(c, d, a, b, in[2], S43, 718787259u);   /* 63 */
+  II(b, c, d, a, in[9], S44, 3951481745u);  /* 64 */
+
+  buf[0] += a;
+  buf[1] += b;
+  buf[2] += c;
+  buf[3] += d;
+}
diff --git a/Source/3rd Party/sdl/src/test/SDL_test_random.c b/Source/3rd Party/sdl/src/test/SDL_test_random.c
new file mode 100644
index 000000000..bc434183c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/test/SDL_test_random.c	
@@ -0,0 +1,94 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+
+ A portable "32-bit Multiply with carry" random number generator.
+
+ Used by the fuzzer component.
+ Original source code contributed by A. Schiffler for GSOC project.
+
+*/
+
+#include "SDL_config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+
+#include "SDL_test.h"
+
+/* Initialize random number generator with two integer variables */
+
+void SDLTest_RandomInit(SDLTest_RandomContext * rndContext, unsigned int xi, unsigned int ci)
+{
+  if (rndContext==NULL) return;
+
+  /*
+   * Choose a value for 'a' from this list
+   * 1791398085 1929682203 1683268614 1965537969 1675393560
+   * 1967773755 1517746329 1447497129 1655692410 1606218150
+   * 2051013963 1075433238 1557985959 1781943330 1893513180
+   * 1631296680 2131995753 2083801278 1873196400 1554115554
+   */
+  rndContext->a = 1655692410;
+  rndContext->x = 30903;
+  rndContext->c = 0;
+  if (xi != 0) {
+      rndContext->x = xi;
+  }
+  rndContext->c = ci;
+  rndContext->ah = rndContext->a >> 16;
+  rndContext->al = rndContext->a & 65535;
+}
+
+/* Initialize random number generator from system time */
+
+void SDLTest_RandomInitTime(SDLTest_RandomContext * rndContext)
+{
+  int a, b;
+
+  if (rndContext==NULL) return;
+
+  srand((unsigned int)time(NULL));
+  a=rand();
+  srand(clock());
+  b=rand();
+  SDLTest_RandomInit(rndContext, a, b);
+}
+
+/* Returns random numbers */
+
+unsigned int SDLTest_Random(SDLTest_RandomContext * rndContext)
+{
+  unsigned int xh, xl;
+
+  if (rndContext==NULL) return -1;
+
+  xh = rndContext->x >> 16, xl = rndContext->x & 65535;
+  rndContext->x = rndContext->x * rndContext->a + rndContext->c;
+  rndContext->c =
+    xh * rndContext->ah + ((xh * rndContext->al) >> 16) +
+    ((xl * rndContext->ah) >> 16);
+  if (xl * rndContext->al >= (~rndContext->c + 1))
+    rndContext->c++;
+  return (rndContext->x);
+}
diff --git a/Source/3rd Party/sdl/src/thread/SDL_systhread.h b/Source/3rd Party/sdl/src/thread/SDL_systhread.h
new file mode 100644
index 000000000..9c9409a5b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/SDL_systhread.h	
@@ -0,0 +1,65 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* These are functions that need to be implemented by a port of SDL */
+
+#ifndef _SDL_systhread_h
+#define _SDL_systhread_h
+
+#include "SDL_thread.h"
+#include "SDL_thread_c.h"
+
+/* This function creates a thread, passing args to SDL_RunThread(),
+   saves a system-dependent thread id in thread->id, and returns 0
+   on success.
+*/
+#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+extern int SDL_SYS_CreateThread(SDL_Thread * thread, void *args,
+                                pfnSDL_CurrentBeginThread pfnBeginThread,
+                                pfnSDL_CurrentEndThread pfnEndThread);
+#else
+extern int SDL_SYS_CreateThread(SDL_Thread * thread, void *args);
+#endif
+
+/* This function does any necessary setup in the child thread */
+extern void SDL_SYS_SetupThread(const char *name);
+
+/* This function sets the current thread priority */
+extern int SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority);
+
+/* This function waits for the thread to finish and frees any data
+   allocated by SDL_SYS_CreateThread()
+ */
+extern void SDL_SYS_WaitThread(SDL_Thread * thread);
+
+/* Mark thread as cleaned up as soon as it exits, without joining. */
+extern void SDL_SYS_DetachThread(SDL_Thread * thread);
+
+/* Get the thread local storage for this thread */
+extern SDL_TLSData *SDL_SYS_GetTLSData();
+
+/* Set the thread local storage for this thread */
+extern int SDL_SYS_SetTLSData(SDL_TLSData *data);
+
+#endif /* _SDL_systhread_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/SDL_thread.c b/Source/3rd Party/sdl/src/thread/SDL_thread.c
new file mode 100644
index 000000000..6cd933311
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/SDL_thread.c	
@@ -0,0 +1,456 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* System independent thread management routines for SDL */
+
+#include "SDL_assert.h"
+#include "SDL_thread.h"
+#include "SDL_thread_c.h"
+#include "SDL_systhread.h"
+#include "../SDL_error_c.h"
+
+
+SDL_TLSID
+SDL_TLSCreate()
+{
+    static SDL_atomic_t SDL_tls_id;
+    return SDL_AtomicIncRef(&SDL_tls_id)+1;
+}
+
+void *
+SDL_TLSGet(SDL_TLSID id)
+{
+    SDL_TLSData *storage;
+
+    storage = SDL_SYS_GetTLSData();
+    if (!storage || id == 0 || id > storage->limit) {
+        return NULL;
+    }
+    return storage->array[id-1].data;
+}
+
+int
+SDL_TLSSet(SDL_TLSID id, const void *value, void (*destructor)(void *))
+{
+    SDL_TLSData *storage;
+
+    if (id == 0) {
+        return SDL_InvalidParamError("id");
+    }
+
+    storage = SDL_SYS_GetTLSData();
+    if (!storage || (id > storage->limit)) {
+        unsigned int i, oldlimit, newlimit;
+
+        oldlimit = storage ? storage->limit : 0;
+        newlimit = (id + TLS_ALLOC_CHUNKSIZE);
+        storage = (SDL_TLSData *)SDL_realloc(storage, sizeof(*storage)+(newlimit-1)*sizeof(storage->array[0]));
+        if (!storage) {
+            return SDL_OutOfMemory();
+        }
+        storage->limit = newlimit;
+        for (i = oldlimit; i < newlimit; ++i) {
+            storage->array[i].data = NULL;
+            storage->array[i].destructor = NULL;
+        }
+        if (SDL_SYS_SetTLSData(storage) != 0) {
+            return -1;
+        }
+    }
+
+    storage->array[id-1].data = SDL_const_cast(void*, value);
+    storage->array[id-1].destructor = destructor;
+    return 0;
+}
+
+static void
+SDL_TLSCleanup()
+{
+    SDL_TLSData *storage;
+
+    storage = SDL_SYS_GetTLSData();
+    if (storage) {
+        unsigned int i;
+        for (i = 0; i < storage->limit; ++i) {
+            if (storage->array[i].destructor) {
+                storage->array[i].destructor(storage->array[i].data);
+            }
+        }
+        SDL_SYS_SetTLSData(NULL);
+        SDL_free(storage);
+    }
+}
+
+
+/* This is a generic implementation of thread-local storage which doesn't
+   require additional OS support.
+
+   It is not especially efficient and doesn't clean up thread-local storage
+   as threads exit.  If there is a real OS that doesn't support thread-local
+   storage this implementation should be improved to be production quality.
+*/
+
+typedef struct SDL_TLSEntry {
+    SDL_threadID thread;
+    SDL_TLSData *storage;
+    struct SDL_TLSEntry *next;
+} SDL_TLSEntry;
+
+static SDL_mutex *SDL_generic_TLS_mutex;
+static SDL_TLSEntry *SDL_generic_TLS;
+
+
+SDL_TLSData *
+SDL_Generic_GetTLSData()
+{
+    SDL_threadID thread = SDL_ThreadID();
+    SDL_TLSEntry *entry;
+    SDL_TLSData *storage = NULL;
+
+#if !SDL_THREADS_DISABLED
+    if (!SDL_generic_TLS_mutex) {
+        static SDL_SpinLock tls_lock;
+        SDL_AtomicLock(&tls_lock);
+        if (!SDL_generic_TLS_mutex) {
+            SDL_mutex *mutex = SDL_CreateMutex();
+            SDL_MemoryBarrierRelease();
+            SDL_generic_TLS_mutex = mutex;
+            if (!SDL_generic_TLS_mutex) {
+                SDL_AtomicUnlock(&tls_lock);
+                return NULL;
+            }
+        }
+        SDL_AtomicUnlock(&tls_lock);
+    }
+#endif /* SDL_THREADS_DISABLED */
+
+    SDL_MemoryBarrierAcquire();
+    SDL_LockMutex(SDL_generic_TLS_mutex);
+    for (entry = SDL_generic_TLS; entry; entry = entry->next) {
+        if (entry->thread == thread) {
+            storage = entry->storage;
+            break;
+        }
+    }
+#if !SDL_THREADS_DISABLED
+    SDL_UnlockMutex(SDL_generic_TLS_mutex);
+#endif
+
+    return storage;
+}
+
+int
+SDL_Generic_SetTLSData(SDL_TLSData *storage)
+{
+    SDL_threadID thread = SDL_ThreadID();
+    SDL_TLSEntry *prev, *entry;
+
+    /* SDL_Generic_GetTLSData() is always called first, so we can assume SDL_generic_TLS_mutex */
+    SDL_LockMutex(SDL_generic_TLS_mutex);
+    prev = NULL;
+    for (entry = SDL_generic_TLS; entry; entry = entry->next) {
+        if (entry->thread == thread) {
+            if (storage) {
+                entry->storage = storage;
+            } else {
+                if (prev) {
+                    prev->next = entry->next;
+                } else {
+                    SDL_generic_TLS = entry->next;
+                }
+                SDL_free(entry);
+            }
+            break;
+        }
+        prev = entry;
+    }
+    if (!entry) {
+        entry = (SDL_TLSEntry *)SDL_malloc(sizeof(*entry));
+        if (entry) {
+            entry->thread = thread;
+            entry->storage = storage;
+            entry->next = SDL_generic_TLS;
+            SDL_generic_TLS = entry;
+        }
+    }
+    SDL_UnlockMutex(SDL_generic_TLS_mutex);
+
+    if (!entry) {
+        return SDL_OutOfMemory();
+    }
+    return 0;
+}
+
+/* Routine to get the thread-specific error variable */
+SDL_error *
+SDL_GetErrBuf(void)
+{
+    static SDL_SpinLock tls_lock;
+    static SDL_bool tls_being_created;
+    static SDL_TLSID tls_errbuf;
+    static SDL_error SDL_global_errbuf;
+    const SDL_error *ALLOCATION_IN_PROGRESS = (SDL_error *)-1;
+    SDL_error *errbuf;
+
+    /* tls_being_created is there simply to prevent recursion if SDL_TLSCreate() fails.
+       It also means it's possible for another thread to also use SDL_global_errbuf,
+       but that's very unlikely and hopefully won't cause issues.
+     */
+    if (!tls_errbuf && !tls_being_created) {
+        SDL_AtomicLock(&tls_lock);
+        if (!tls_errbuf) {
+            SDL_TLSID slot;
+            tls_being_created = SDL_TRUE;
+            slot = SDL_TLSCreate();
+            tls_being_created = SDL_FALSE;
+            SDL_MemoryBarrierRelease();
+            tls_errbuf = slot;
+        }
+        SDL_AtomicUnlock(&tls_lock);
+    }
+    if (!tls_errbuf) {
+        return &SDL_global_errbuf;
+    }
+
+    SDL_MemoryBarrierAcquire();
+    errbuf = (SDL_error *)SDL_TLSGet(tls_errbuf);
+    if (errbuf == ALLOCATION_IN_PROGRESS) {
+        return &SDL_global_errbuf;
+    }
+    if (!errbuf) {
+        /* Mark that we're in the middle of allocating our buffer */
+        SDL_TLSSet(tls_errbuf, ALLOCATION_IN_PROGRESS, NULL);
+        errbuf = (SDL_error *)SDL_malloc(sizeof(*errbuf));
+        if (!errbuf) {
+            SDL_TLSSet(tls_errbuf, NULL, NULL);
+            return &SDL_global_errbuf;
+        }
+        SDL_zerop(errbuf);
+        SDL_TLSSet(tls_errbuf, errbuf, SDL_free);
+    }
+    return errbuf;
+}
+
+
+/* Arguments and callback to setup and run the user thread function */
+typedef struct
+{
+    int (SDLCALL * func) (void *);
+    void *data;
+    SDL_Thread *info;
+    SDL_sem *wait;
+} thread_args;
+
+void
+SDL_RunThread(void *data)
+{
+    thread_args *args = (thread_args *) data;
+    int (SDLCALL * userfunc) (void *) = args->func;
+    void *userdata = args->data;
+    SDL_Thread *thread = args->info;
+    int *statusloc = &thread->status;
+
+    /* Perform any system-dependent setup - this function may not fail */
+    SDL_SYS_SetupThread(thread->name);
+
+    /* Get the thread id */
+    thread->threadid = SDL_ThreadID();
+
+    /* Wake up the parent thread */
+    SDL_SemPost(args->wait);
+
+    /* Run the function */
+    *statusloc = userfunc(userdata);
+
+    /* Clean up thread-local storage */
+    SDL_TLSCleanup();
+
+    /* Mark us as ready to be joined (or detached) */
+    if (!SDL_AtomicCAS(&thread->state, SDL_THREAD_STATE_ALIVE, SDL_THREAD_STATE_ZOMBIE)) {
+        /* Clean up if something already detached us. */
+        if (SDL_AtomicCAS(&thread->state, SDL_THREAD_STATE_DETACHED, SDL_THREAD_STATE_CLEANED)) {
+            if (thread->name) {
+                SDL_free(thread->name);
+            }
+            SDL_free(thread);
+        }
+    }
+}
+
+#ifdef SDL_CreateThread
+#undef SDL_CreateThread
+#endif
+#if SDL_DYNAMIC_API
+#define SDL_CreateThread SDL_CreateThread_REAL
+#endif
+
+#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThread(int (SDLCALL * fn) (void *),
+                 const char *name, void *data,
+                 pfnSDL_CurrentBeginThread pfnBeginThread,
+                 pfnSDL_CurrentEndThread pfnEndThread)
+#else
+DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThread(int (SDLCALL * fn) (void *),
+                 const char *name, void *data)
+#endif
+{
+    SDL_Thread *thread;
+    thread_args *args;
+    int ret;
+
+    /* Allocate memory for the thread info structure */
+    thread = (SDL_Thread *) SDL_malloc(sizeof(*thread));
+    if (thread == NULL) {
+        SDL_OutOfMemory();
+        return (NULL);
+    }
+    SDL_zerop(thread);
+    thread->status = -1;
+    SDL_AtomicSet(&thread->state, SDL_THREAD_STATE_ALIVE);
+
+    /* Set up the arguments for the thread */
+    if (name != NULL) {
+        thread->name = SDL_strdup(name);
+        if (thread->name == NULL) {
+            SDL_OutOfMemory();
+            SDL_free(thread);
+            return (NULL);
+        }
+    }
+
+    /* Set up the arguments for the thread */
+    args = (thread_args *) SDL_malloc(sizeof(*args));
+    if (args == NULL) {
+        SDL_OutOfMemory();
+        if (thread->name) {
+            SDL_free(thread->name);
+        }
+        SDL_free(thread);
+        return (NULL);
+    }
+    args->func = fn;
+    args->data = data;
+    args->info = thread;
+    args->wait = SDL_CreateSemaphore(0);
+    if (args->wait == NULL) {
+        if (thread->name) {
+            SDL_free(thread->name);
+        }
+        SDL_free(thread);
+        SDL_free(args);
+        return (NULL);
+    }
+
+    /* Create the thread and go! */
+#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+    ret = SDL_SYS_CreateThread(thread, args, pfnBeginThread, pfnEndThread);
+#else
+    ret = SDL_SYS_CreateThread(thread, args);
+#endif
+    if (ret >= 0) {
+        /* Wait for the thread function to use arguments */
+        SDL_SemWait(args->wait);
+    } else {
+        /* Oops, failed.  Gotta free everything */
+        if (thread->name) {
+            SDL_free(thread->name);
+        }
+        SDL_free(thread);
+        thread = NULL;
+    }
+    SDL_DestroySemaphore(args->wait);
+    SDL_free(args);
+
+    /* Everything is running now */
+    return (thread);
+}
+
+SDL_threadID
+SDL_GetThreadID(SDL_Thread * thread)
+{
+    SDL_threadID id;
+
+    if (thread) {
+        id = thread->threadid;
+    } else {
+        id = SDL_ThreadID();
+    }
+    return id;
+}
+
+const char *
+SDL_GetThreadName(SDL_Thread * thread)
+{
+    if (thread) {
+        return thread->name;
+    } else {
+        return NULL;
+    }
+}
+
+int
+SDL_SetThreadPriority(SDL_ThreadPriority priority)
+{
+    return SDL_SYS_SetThreadPriority(priority);
+}
+
+void
+SDL_WaitThread(SDL_Thread * thread, int *status)
+{
+    if (thread) {
+        SDL_SYS_WaitThread(thread);
+        if (status) {
+            *status = thread->status;
+        }
+        if (thread->name) {
+            SDL_free(thread->name);
+        }
+        SDL_free(thread);
+    }
+}
+
+void
+SDL_DetachThread(SDL_Thread * thread)
+{
+    if (!thread) {
+        return;
+    }
+
+    /* Grab dibs if the state is alive+joinable. */
+    if (SDL_AtomicCAS(&thread->state, SDL_THREAD_STATE_ALIVE, SDL_THREAD_STATE_DETACHED)) {
+        SDL_SYS_DetachThread(thread);
+    } else {
+        /* all other states are pretty final, see where we landed. */
+        const int state = SDL_AtomicGet(&thread->state);
+        if ((state == SDL_THREAD_STATE_DETACHED) || (state == SDL_THREAD_STATE_CLEANED)) {
+            return;  /* already detached (you shouldn't call this twice!) */
+        } else if (state == SDL_THREAD_STATE_ZOMBIE) {
+            SDL_WaitThread(thread, NULL);  /* already done, clean it up. */
+        } else {
+            SDL_assert(0 && "Unexpected thread state");
+        }
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/SDL_thread_c.h b/Source/3rd Party/sdl/src/thread/SDL_thread_c.h
new file mode 100644
index 000000000..85ef5cce2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/SDL_thread_c.h	
@@ -0,0 +1,94 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_thread_c_h
+#define _SDL_thread_c_h
+
+#include "SDL_thread.h"
+
+/* Need the definitions of SYS_ThreadHandle */
+#if SDL_THREADS_DISABLED
+#include "generic/SDL_systhread_c.h"
+#elif SDL_THREAD_PTHREAD
+#include "pthread/SDL_systhread_c.h"
+#elif SDL_THREAD_WINDOWS
+#include "windows/SDL_systhread_c.h"
+#elif SDL_THREAD_PSP
+#include "psp/SDL_systhread_c.h"
+#elif SDL_THREAD_STDCPP
+#include "stdcpp/SDL_systhread_c.h"
+#else
+#error Need thread implementation for this platform
+#include "generic/SDL_systhread_c.h"
+#endif
+#include "../SDL_error_c.h"
+
+typedef enum SDL_ThreadState
+{
+    SDL_THREAD_STATE_ALIVE,
+    SDL_THREAD_STATE_DETACHED,
+    SDL_THREAD_STATE_ZOMBIE,
+    SDL_THREAD_STATE_CLEANED,
+} SDL_ThreadState;
+
+/* This is the system-independent thread info structure */
+struct SDL_Thread
+{
+    SDL_threadID threadid;
+    SYS_ThreadHandle handle;
+    int status;
+    SDL_atomic_t state;  /* SDL_THREAD_STATE_* */
+    SDL_error errbuf;
+    char *name;
+    void *data;
+};
+
+/* This is the function called to run a thread */
+extern void SDL_RunThread(void *data);
+
+/* This is the system-independent thread local storage structure */
+typedef struct {
+    unsigned int limit;
+    struct {
+        void *data;
+        void (*destructor)(void*);
+    } array[1];
+} SDL_TLSData;
+
+/* This is how many TLS entries we allocate at once */
+#define TLS_ALLOC_CHUNKSIZE 4
+
+/* Get cross-platform, slow, thread local storage for this thread.
+   This is only intended as a fallback if getting real thread-local
+   storage fails or isn't supported on this platform.
+ */
+extern SDL_TLSData *SDL_Generic_GetTLSData();
+
+/* Set cross-platform, slow, thread local storage for this thread.
+   This is only intended as a fallback if getting real thread-local
+   storage fails or isn't supported on this platform.
+ */
+extern int SDL_Generic_SetTLSData(SDL_TLSData *data);
+
+#endif /* _SDL_thread_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/generic/SDL_syscond.c b/Source/3rd Party/sdl/src/thread/generic/SDL_syscond.c
new file mode 100644
index 000000000..64cc63400
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/generic/SDL_syscond.c	
@@ -0,0 +1,220 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* An implementation of condition variables using semaphores and mutexes */
+/*
+   This implementation borrows heavily from the BeOS condition variable
+   implementation, written by Christopher Tate and Owen Smith.  Thanks!
+ */
+
+#include "SDL_thread.h"
+
+struct SDL_cond
+{
+    SDL_mutex *lock;
+    int waiting;
+    int signals;
+    SDL_sem *wait_sem;
+    SDL_sem *wait_done;
+};
+
+/* Create a condition variable */
+SDL_cond *
+SDL_CreateCond(void)
+{
+    SDL_cond *cond;
+
+    cond = (SDL_cond *) SDL_malloc(sizeof(SDL_cond));
+    if (cond) {
+        cond->lock = SDL_CreateMutex();
+        cond->wait_sem = SDL_CreateSemaphore(0);
+        cond->wait_done = SDL_CreateSemaphore(0);
+        cond->waiting = cond->signals = 0;
+        if (!cond->lock || !cond->wait_sem || !cond->wait_done) {
+            SDL_DestroyCond(cond);
+            cond = NULL;
+        }
+    } else {
+        SDL_OutOfMemory();
+    }
+    return (cond);
+}
+
+/* Destroy a condition variable */
+void
+SDL_DestroyCond(SDL_cond * cond)
+{
+    if (cond) {
+        if (cond->wait_sem) {
+            SDL_DestroySemaphore(cond->wait_sem);
+        }
+        if (cond->wait_done) {
+            SDL_DestroySemaphore(cond->wait_done);
+        }
+        if (cond->lock) {
+            SDL_DestroyMutex(cond->lock);
+        }
+        SDL_free(cond);
+    }
+}
+
+/* Restart one of the threads that are waiting on the condition variable */
+int
+SDL_CondSignal(SDL_cond * cond)
+{
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    }
+
+    /* If there are waiting threads not already signalled, then
+       signal the condition and wait for the thread to respond.
+     */
+    SDL_LockMutex(cond->lock);
+    if (cond->waiting > cond->signals) {
+        ++cond->signals;
+        SDL_SemPost(cond->wait_sem);
+        SDL_UnlockMutex(cond->lock);
+        SDL_SemWait(cond->wait_done);
+    } else {
+        SDL_UnlockMutex(cond->lock);
+    }
+
+    return 0;
+}
+
+/* Restart all threads that are waiting on the condition variable */
+int
+SDL_CondBroadcast(SDL_cond * cond)
+{
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    }
+
+    /* If there are waiting threads not already signalled, then
+       signal the condition and wait for the thread to respond.
+     */
+    SDL_LockMutex(cond->lock);
+    if (cond->waiting > cond->signals) {
+        int i, num_waiting;
+
+        num_waiting = (cond->waiting - cond->signals);
+        cond->signals = cond->waiting;
+        for (i = 0; i < num_waiting; ++i) {
+            SDL_SemPost(cond->wait_sem);
+        }
+        /* Now all released threads are blocked here, waiting for us.
+           Collect them all (and win fabulous prizes!) :-)
+         */
+        SDL_UnlockMutex(cond->lock);
+        for (i = 0; i < num_waiting; ++i) {
+            SDL_SemWait(cond->wait_done);
+        }
+    } else {
+        SDL_UnlockMutex(cond->lock);
+    }
+
+    return 0;
+}
+
+/* Wait on the condition variable for at most 'ms' milliseconds.
+   The mutex must be locked before entering this function!
+   The mutex is unlocked during the wait, and locked again after the wait.
+
+Typical use:
+
+Thread A:
+    SDL_LockMutex(lock);
+    while ( ! condition ) {
+        SDL_CondWait(cond, lock);
+    }
+    SDL_UnlockMutex(lock);
+
+Thread B:
+    SDL_LockMutex(lock);
+    ...
+    condition = true;
+    ...
+    SDL_CondSignal(cond);
+    SDL_UnlockMutex(lock);
+ */
+int
+SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms)
+{
+    int retval;
+
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    }
+
+    /* Obtain the protection mutex, and increment the number of waiters.
+       This allows the signal mechanism to only perform a signal if there
+       are waiting threads.
+     */
+    SDL_LockMutex(cond->lock);
+    ++cond->waiting;
+    SDL_UnlockMutex(cond->lock);
+
+    /* Unlock the mutex, as is required by condition variable semantics */
+    SDL_UnlockMutex(mutex);
+
+    /* Wait for a signal */
+    if (ms == SDL_MUTEX_MAXWAIT) {
+        retval = SDL_SemWait(cond->wait_sem);
+    } else {
+        retval = SDL_SemWaitTimeout(cond->wait_sem, ms);
+    }
+
+    /* Let the signaler know we have completed the wait, otherwise
+       the signaler can race ahead and get the condition semaphore
+       if we are stopped between the mutex unlock and semaphore wait,
+       giving a deadlock.  See the following URL for details:
+       http://web.archive.org/web/20010914175514/http://www-classic.be.com/aboutbe/benewsletter/volume_III/Issue40.html#Workshop
+     */
+    SDL_LockMutex(cond->lock);
+    if (cond->signals > 0) {
+        /* If we timed out, we need to eat a condition signal */
+        if (retval > 0) {
+            SDL_SemWait(cond->wait_sem);
+        }
+        /* We always notify the signal thread that we are done */
+        SDL_SemPost(cond->wait_done);
+
+        /* Signal handshake complete */
+        --cond->signals;
+    }
+    --cond->waiting;
+    SDL_UnlockMutex(cond->lock);
+
+    /* Lock the mutex, as is required by condition variable semantics */
+    SDL_LockMutex(mutex);
+
+    return retval;
+}
+
+/* Wait on the condition variable forever */
+int
+SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex)
+{
+    return SDL_CondWaitTimeout(cond, mutex, SDL_MUTEX_MAXWAIT);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/generic/SDL_sysmutex.c b/Source/3rd Party/sdl/src/thread/generic/SDL_sysmutex.c
new file mode 100644
index 000000000..ddcc8cdf4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/generic/SDL_sysmutex.c	
@@ -0,0 +1,165 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* An implementation of mutexes using semaphores */
+
+#include "SDL_thread.h"
+#include "SDL_systhread_c.h"
+
+
+struct SDL_mutex
+{
+    int recursive;
+    SDL_threadID owner;
+    SDL_sem *sem;
+};
+
+/* Create a mutex */
+SDL_mutex *
+SDL_CreateMutex(void)
+{
+    SDL_mutex *mutex;
+
+    /* Allocate mutex memory */
+    mutex = (SDL_mutex *) SDL_malloc(sizeof(*mutex));
+    if (mutex) {
+        /* Create the mutex semaphore, with initial value 1 */
+        mutex->sem = SDL_CreateSemaphore(1);
+        mutex->recursive = 0;
+        mutex->owner = 0;
+        if (!mutex->sem) {
+            SDL_free(mutex);
+            mutex = NULL;
+        }
+    } else {
+        SDL_OutOfMemory();
+    }
+    return mutex;
+}
+
+/* Free the mutex */
+void
+SDL_DestroyMutex(SDL_mutex * mutex)
+{
+    if (mutex) {
+        if (mutex->sem) {
+            SDL_DestroySemaphore(mutex->sem);
+        }
+        SDL_free(mutex);
+    }
+}
+
+/* Lock the mutex */
+int
+SDL_LockMutex(SDL_mutex * mutex)
+{
+#if SDL_THREADS_DISABLED
+    return 0;
+#else
+    SDL_threadID this_thread;
+
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    this_thread = SDL_ThreadID();
+    if (mutex->owner == this_thread) {
+        ++mutex->recursive;
+    } else {
+        /* The order of operations is important.
+           We set the locking thread id after we obtain the lock
+           so unlocks from other threads will fail.
+         */
+        SDL_SemWait(mutex->sem);
+        mutex->owner = this_thread;
+        mutex->recursive = 0;
+    }
+
+    return 0;
+#endif /* SDL_THREADS_DISABLED */
+}
+
+/* try Lock the mutex */
+int
+SDL_TryLockMutex(SDL_mutex * mutex)
+{
+#if SDL_THREADS_DISABLED
+    return 0;
+#else
+    int retval = 0;
+    SDL_threadID this_thread;
+
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    this_thread = SDL_ThreadID();
+    if (mutex->owner == this_thread) {
+        ++mutex->recursive;
+    } else {
+        /* The order of operations is important.
+         We set the locking thread id after we obtain the lock
+         so unlocks from other threads will fail.
+         */
+        retval = SDL_SemWait(mutex->sem);
+        if (retval == 0) {
+            mutex->owner = this_thread;
+            mutex->recursive = 0;
+        }
+    }
+
+    return retval;
+#endif /* SDL_THREADS_DISABLED */
+}
+
+/* Unlock the mutex */
+int
+SDL_mutexV(SDL_mutex * mutex)
+{
+#if SDL_THREADS_DISABLED
+    return 0;
+#else
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    /* If we don't own the mutex, we can't unlock it */
+    if (SDL_ThreadID() != mutex->owner) {
+        return SDL_SetError("mutex not owned by this thread");
+    }
+
+    if (mutex->recursive) {
+        --mutex->recursive;
+    } else {
+        /* The order of operations is important.
+           First reset the owner so another thread doesn't lock
+           the mutex and set the ownership before we reset it,
+           then release the lock semaphore.
+         */
+        mutex->owner = 0;
+        SDL_SemPost(mutex->sem);
+    }
+    return 0;
+#endif /* SDL_THREADS_DISABLED */
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/generic/SDL_sysmutex_c.h b/Source/3rd Party/sdl/src/thread/generic/SDL_sysmutex_c.h
new file mode 100644
index 000000000..f868fade8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/generic/SDL_sysmutex_c.h	
@@ -0,0 +1,22 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/generic/SDL_syssem.c b/Source/3rd Party/sdl/src/thread/generic/SDL_syssem.c
new file mode 100644
index 000000000..c7220a2a4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/generic/SDL_syssem.c	
@@ -0,0 +1,217 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* An implementation of semaphores using mutexes and condition variables */
+
+#include "SDL_timer.h"
+#include "SDL_thread.h"
+#include "SDL_systhread_c.h"
+
+
+#if SDL_THREADS_DISABLED
+
+SDL_sem *
+SDL_CreateSemaphore(Uint32 initial_value)
+{
+    SDL_SetError("SDL not built with thread support");
+    return (SDL_sem *) 0;
+}
+
+void
+SDL_DestroySemaphore(SDL_sem * sem)
+{
+}
+
+int
+SDL_SemTryWait(SDL_sem * sem)
+{
+    return SDL_SetError("SDL not built with thread support");
+}
+
+int
+SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
+{
+    return SDL_SetError("SDL not built with thread support");
+}
+
+int
+SDL_SemWait(SDL_sem * sem)
+{
+    return SDL_SetError("SDL not built with thread support");
+}
+
+Uint32
+SDL_SemValue(SDL_sem * sem)
+{
+    return 0;
+}
+
+int
+SDL_SemPost(SDL_sem * sem)
+{
+    return SDL_SetError("SDL not built with thread support");
+}
+
+#else
+
+struct SDL_semaphore
+{
+    Uint32 count;
+    Uint32 waiters_count;
+    SDL_mutex *count_lock;
+    SDL_cond *count_nonzero;
+};
+
+SDL_sem *
+SDL_CreateSemaphore(Uint32 initial_value)
+{
+    SDL_sem *sem;
+
+    sem = (SDL_sem *) SDL_malloc(sizeof(*sem));
+    if (!sem) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    sem->count = initial_value;
+    sem->waiters_count = 0;
+
+    sem->count_lock = SDL_CreateMutex();
+    sem->count_nonzero = SDL_CreateCond();
+    if (!sem->count_lock || !sem->count_nonzero) {
+        SDL_DestroySemaphore(sem);
+        return NULL;
+    }
+
+    return sem;
+}
+
+/* WARNING:
+   You cannot call this function when another thread is using the semaphore.
+*/
+void
+SDL_DestroySemaphore(SDL_sem * sem)
+{
+    if (sem) {
+        sem->count = 0xFFFFFFFF;
+        while (sem->waiters_count > 0) {
+            SDL_CondSignal(sem->count_nonzero);
+            SDL_Delay(10);
+        }
+        SDL_DestroyCond(sem->count_nonzero);
+        if (sem->count_lock) {
+            SDL_LockMutex(sem->count_lock);
+            SDL_UnlockMutex(sem->count_lock);
+            SDL_DestroyMutex(sem->count_lock);
+        }
+        SDL_free(sem);
+    }
+}
+
+int
+SDL_SemTryWait(SDL_sem * sem)
+{
+    int retval;
+
+    if (!sem) {
+        return SDL_SetError("Passed a NULL semaphore");
+    }
+
+    retval = SDL_MUTEX_TIMEDOUT;
+    SDL_LockMutex(sem->count_lock);
+    if (sem->count > 0) {
+        --sem->count;
+        retval = 0;
+    }
+    SDL_UnlockMutex(sem->count_lock);
+
+    return retval;
+}
+
+int
+SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
+{
+    int retval;
+
+    if (!sem) {
+        return SDL_SetError("Passed a NULL semaphore");
+    }
+
+    /* A timeout of 0 is an easy case */
+    if (timeout == 0) {
+        return SDL_SemTryWait(sem);
+    }
+
+    SDL_LockMutex(sem->count_lock);
+    ++sem->waiters_count;
+    retval = 0;
+    while ((sem->count == 0) && (retval != SDL_MUTEX_TIMEDOUT)) {
+        retval = SDL_CondWaitTimeout(sem->count_nonzero,
+                                     sem->count_lock, timeout);
+    }
+    --sem->waiters_count;
+    if (retval == 0) {
+        --sem->count;
+    }
+    SDL_UnlockMutex(sem->count_lock);
+
+    return retval;
+}
+
+int
+SDL_SemWait(SDL_sem * sem)
+{
+    return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT);
+}
+
+Uint32
+SDL_SemValue(SDL_sem * sem)
+{
+    Uint32 value;
+
+    value = 0;
+    if (sem) {
+        SDL_LockMutex(sem->count_lock);
+        value = sem->count;
+        SDL_UnlockMutex(sem->count_lock);
+    }
+    return value;
+}
+
+int
+SDL_SemPost(SDL_sem * sem)
+{
+    if (!sem) {
+        return SDL_SetError("Passed a NULL semaphore");
+    }
+
+    SDL_LockMutex(sem->count_lock);
+    if (sem->waiters_count > 0) {
+        SDL_CondSignal(sem->count_nonzero);
+    }
+    ++sem->count;
+    SDL_UnlockMutex(sem->count_lock);
+
+    return 0;
+}
+
+#endif /* SDL_THREADS_DISABLED */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/generic/SDL_systhread.c b/Source/3rd Party/sdl/src/thread/generic/SDL_systhread.c
new file mode 100644
index 000000000..6cd29f76e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/generic/SDL_systhread.c	
@@ -0,0 +1,71 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* Thread management routines for SDL */
+
+#include "SDL_thread.h"
+#include "../SDL_systhread.h"
+
+#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+int
+SDL_SYS_CreateThread(SDL_Thread * thread, void *args,
+                     pfnSDL_CurrentBeginThread pfnBeginThread,
+                     pfnSDL_CurrentEndThread pfnEndThread)
+#else
+int
+SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
+#endif /* SDL_PASSED_BEGINTHREAD_ENDTHREAD */
+{
+    return SDL_SetError("Threads are not supported on this platform");
+}
+
+void
+SDL_SYS_SetupThread(const char *name)
+{
+    return;
+}
+
+SDL_threadID
+SDL_ThreadID(void)
+{
+    return (0);
+}
+
+int
+SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
+{
+    return (0);
+}
+
+void
+SDL_SYS_WaitThread(SDL_Thread * thread)
+{
+    return;
+}
+
+void
+SDL_SYS_DetachThread(SDL_Thread * thread)
+{
+    return;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/generic/SDL_systhread_c.h b/Source/3rd Party/sdl/src/thread/generic/SDL_systhread_c.h
new file mode 100644
index 000000000..38e8b208e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/generic/SDL_systhread_c.h	
@@ -0,0 +1,26 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* Stub until we implement threads on this platform */
+typedef int SYS_ThreadHandle;
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/generic/SDL_systls.c b/Source/3rd Party/sdl/src/thread/generic/SDL_systls.c
new file mode 100644
index 000000000..b73d901fa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/generic/SDL_systls.c	
@@ -0,0 +1,38 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+#include "../SDL_thread_c.h"
+
+
+SDL_TLSData *
+SDL_SYS_GetTLSData()
+{
+    return SDL_Generic_GetTLSData();
+}
+
+int
+SDL_SYS_SetTLSData(SDL_TLSData *data)
+{
+    return SDL_Generic_SetTLSData(data);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/psp/SDL_syscond.c b/Source/3rd Party/sdl/src/thread/psp/SDL_syscond.c
new file mode 100644
index 000000000..1abd9a3d9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/psp/SDL_syscond.c	
@@ -0,0 +1,220 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* An implementation of condition variables using semaphores and mutexes */
+/*
+   This implementation borrows heavily from the BeOS condition variable
+   implementation, written by Christopher Tate and Owen Smith.  Thanks!
+ */
+
+#include "SDL_thread.h"
+
+struct SDL_cond
+{
+    SDL_mutex *lock;
+    int waiting;
+    int signals;
+    SDL_sem *wait_sem;
+    SDL_sem *wait_done;
+};
+
+/* Create a condition variable */
+SDL_cond *
+SDL_CreateCond(void)
+{
+    SDL_cond *cond;
+
+    cond = (SDL_cond *) SDL_malloc(sizeof(SDL_cond));
+    if (cond) {
+        cond->lock = SDL_CreateMutex();
+        cond->wait_sem = SDL_CreateSemaphore(0);
+        cond->wait_done = SDL_CreateSemaphore(0);
+        cond->waiting = cond->signals = 0;
+        if (!cond->lock || !cond->wait_sem || !cond->wait_done) {
+            SDL_DestroyCond(cond);
+            cond = NULL;
+        }
+    } else {
+        SDL_OutOfMemory();
+    }
+    return (cond);
+}
+
+/* Destroy a condition variable */
+void
+SDL_DestroyCond(SDL_cond * cond)
+{
+    if (cond) {
+        if (cond->wait_sem) {
+            SDL_DestroySemaphore(cond->wait_sem);
+        }
+        if (cond->wait_done) {
+            SDL_DestroySemaphore(cond->wait_done);
+        }
+        if (cond->lock) {
+            SDL_DestroyMutex(cond->lock);
+        }
+        SDL_free(cond);
+    }
+}
+
+/* Restart one of the threads that are waiting on the condition variable */
+int
+SDL_CondSignal(SDL_cond * cond)
+{
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    }
+
+    /* If there are waiting threads not already signalled, then
+       signal the condition and wait for the thread to respond.
+     */
+    SDL_LockMutex(cond->lock);
+    if (cond->waiting > cond->signals) {
+        ++cond->signals;
+        SDL_SemPost(cond->wait_sem);
+        SDL_UnlockMutex(cond->lock);
+        SDL_SemWait(cond->wait_done);
+    } else {
+        SDL_UnlockMutex(cond->lock);
+    }
+
+    return 0;
+}
+
+/* Restart all threads that are waiting on the condition variable */
+int
+SDL_CondBroadcast(SDL_cond * cond)
+{
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    }
+
+    /* If there are waiting threads not already signalled, then
+       signal the condition and wait for the thread to respond.
+     */
+    SDL_LockMutex(cond->lock);
+    if (cond->waiting > cond->signals) {
+        int i, num_waiting;
+
+        num_waiting = (cond->waiting - cond->signals);
+        cond->signals = cond->waiting;
+        for (i = 0; i < num_waiting; ++i) {
+            SDL_SemPost(cond->wait_sem);
+        }
+        /* Now all released threads are blocked here, waiting for us.
+           Collect them all (and win fabulous prizes!) :-)
+         */
+        SDL_UnlockMutex(cond->lock);
+        for (i = 0; i < num_waiting; ++i) {
+            SDL_SemWait(cond->wait_done);
+        }
+    } else {
+        SDL_UnlockMutex(cond->lock);
+    }
+
+    return 0;
+}
+
+/* Wait on the condition variable for at most 'ms' milliseconds.
+   The mutex must be locked before entering this function!
+   The mutex is unlocked during the wait, and locked again after the wait.
+
+Typical use:
+
+Thread A:
+    SDL_LockMutex(lock);
+    while ( ! condition ) {
+        SDL_CondWait(cond, lock);
+    }
+    SDL_UnlockMutex(lock);
+
+Thread B:
+    SDL_LockMutex(lock);
+    ...
+    condition = true;
+    ...
+    SDL_CondSignal(cond);
+    SDL_UnlockMutex(lock);
+ */
+int
+SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms)
+{
+    int retval;
+
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    }
+
+    /* Obtain the protection mutex, and increment the number of waiters.
+       This allows the signal mechanism to only perform a signal if there
+       are waiting threads.
+     */
+    SDL_LockMutex(cond->lock);
+    ++cond->waiting;
+    SDL_UnlockMutex(cond->lock);
+
+    /* Unlock the mutex, as is required by condition variable semantics */
+    SDL_UnlockMutex(mutex);
+
+    /* Wait for a signal */
+    if (ms == SDL_MUTEX_MAXWAIT) {
+        retval = SDL_SemWait(cond->wait_sem);
+    } else {
+        retval = SDL_SemWaitTimeout(cond->wait_sem, ms);
+    }
+
+    /* Let the signaler know we have completed the wait, otherwise
+       the signaler can race ahead and get the condition semaphore
+       if we are stopped between the mutex unlock and semaphore wait,
+       giving a deadlock.  See the following URL for details:
+       http://www-classic.be.com/aboutbe/benewsletter/volume_III/Issue40.html
+     */
+    SDL_LockMutex(cond->lock);
+    if (cond->signals > 0) {
+        /* If we timed out, we need to eat a condition signal */
+        if (retval > 0) {
+            SDL_SemWait(cond->wait_sem);
+        }
+        /* We always notify the signal thread that we are done */
+        SDL_SemPost(cond->wait_done);
+
+        /* Signal handshake complete */
+        --cond->signals;
+    }
+    --cond->waiting;
+    SDL_UnlockMutex(cond->lock);
+
+    /* Lock the mutex, as is required by condition variable semantics */
+    SDL_LockMutex(mutex);
+
+    return retval;
+}
+
+/* Wait on the condition variable forever */
+int
+SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex)
+{
+    return SDL_CondWaitTimeout(cond, mutex, SDL_MUTEX_MAXWAIT);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/psp/SDL_sysmutex.c b/Source/3rd Party/sdl/src/thread/psp/SDL_sysmutex.c
new file mode 100644
index 000000000..478575b32
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/psp/SDL_sysmutex.c	
@@ -0,0 +1,132 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* An implementation of mutexes using semaphores */
+
+#include "SDL_thread.h"
+#include "SDL_systhread_c.h"
+
+
+struct SDL_mutex
+{
+    int recursive;
+    SDL_threadID owner;
+    SDL_sem *sem;
+};
+
+/* Create a mutex */
+SDL_mutex *
+SDL_CreateMutex(void)
+{
+    SDL_mutex *mutex;
+
+    /* Allocate mutex memory */
+    mutex = (SDL_mutex *) SDL_malloc(sizeof(*mutex));
+    if (mutex) {
+        /* Create the mutex semaphore, with initial value 1 */
+        mutex->sem = SDL_CreateSemaphore(1);
+        mutex->recursive = 0;
+        mutex->owner = 0;
+        if (!mutex->sem) {
+            SDL_free(mutex);
+            mutex = NULL;
+        }
+    } else {
+        SDL_OutOfMemory();
+    }
+    return mutex;
+}
+
+/* Free the mutex */
+void
+SDL_DestroyMutex(SDL_mutex * mutex)
+{
+    if (mutex) {
+        if (mutex->sem) {
+            SDL_DestroySemaphore(mutex->sem);
+        }
+        SDL_free(mutex);
+    }
+}
+
+/* Lock the semaphore */
+int
+SDL_mutexP(SDL_mutex * mutex)
+{
+#if SDL_THREADS_DISABLED
+    return 0;
+#else
+    SDL_threadID this_thread;
+
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    this_thread = SDL_ThreadID();
+    if (mutex->owner == this_thread) {
+        ++mutex->recursive;
+    } else {
+        /* The order of operations is important.
+           We set the locking thread id after we obtain the lock
+           so unlocks from other threads will fail.
+         */
+        SDL_SemWait(mutex->sem);
+        mutex->owner = this_thread;
+        mutex->recursive = 0;
+    }
+
+    return 0;
+#endif /* SDL_THREADS_DISABLED */
+}
+
+/* Unlock the mutex */
+int
+SDL_mutexV(SDL_mutex * mutex)
+{
+#if SDL_THREADS_DISABLED
+    return 0;
+#else
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    /* If we don't own the mutex, we can't unlock it */
+    if (SDL_ThreadID() != mutex->owner) {
+        return SDL_SetError("mutex not owned by this thread");
+    }
+
+    if (mutex->recursive) {
+        --mutex->recursive;
+    } else {
+        /* The order of operations is important.
+           First reset the owner so another thread doesn't lock
+           the mutex and set the ownership before we reset it,
+           then release the lock semaphore.
+         */
+        mutex->owner = 0;
+        SDL_SemPost(mutex->sem);
+    }
+    return 0;
+#endif /* SDL_THREADS_DISABLED */
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/psp/SDL_sysmutex_c.h b/Source/3rd Party/sdl/src/thread/psp/SDL_sysmutex_c.h
new file mode 100644
index 000000000..f868fade8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/psp/SDL_sysmutex_c.h	
@@ -0,0 +1,22 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/psp/SDL_syssem.c b/Source/3rd Party/sdl/src/thread/psp/SDL_syssem.c
new file mode 100644
index 000000000..27d3251a2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/psp/SDL_syssem.c	
@@ -0,0 +1,156 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* Semaphore functions for the PSP. */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "SDL_error.h"
+#include "SDL_thread.h"
+
+#include <pspthreadman.h>
+#include <pspkerror.h>
+
+struct SDL_semaphore {
+    SceUID  semid;
+};
+
+
+/* Create a semaphore */
+SDL_sem *SDL_CreateSemaphore(Uint32 initial_value)
+{
+    SDL_sem *sem;
+
+    sem = (SDL_sem *) malloc(sizeof(*sem));
+    if (sem != NULL) {
+        /* TODO: Figure out the limit on the maximum value. */
+        sem->semid = sceKernelCreateSema("SDL sema", 0, initial_value, 255, NULL);
+        if (sem->semid < 0) {
+            SDL_SetError("Couldn't create semaphore");
+            free(sem);
+            sem = NULL;
+        }
+    } else {
+        SDL_OutOfMemory();
+    }
+
+    return sem;
+}
+
+/* Free the semaphore */
+void SDL_DestroySemaphore(SDL_sem *sem)
+{
+    if (sem != NULL) {
+        if (sem->semid > 0) {
+            sceKernelDeleteSema(sem->semid);
+            sem->semid = 0;
+        }
+
+        free(sem);
+    }
+}
+
+/* TODO: This routine is a bit overloaded.
+ * If the timeout is 0 then just poll the semaphore; if it's SDL_MUTEX_MAXWAIT, pass
+ * NULL to sceKernelWaitSema() so that it waits indefinitely; and if the timeout
+ * is specified, convert it to microseconds. */
+int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout)
+{
+    Uint32 *pTimeout;
+       unsigned int res;
+
+    if (sem == NULL) {
+        SDL_SetError("Passed a NULL sem");
+        return 0;
+    }
+
+    if (timeout == 0) {
+        res = sceKernelPollSema(sem->semid, 1);
+        if (res < 0) {
+            return SDL_MUTEX_TIMEDOUT;
+        }
+        return 0;
+    }
+
+    if (timeout == SDL_MUTEX_MAXWAIT) {
+        pTimeout = NULL;
+    } else {
+        timeout *= 1000;  /* Convert to microseconds. */
+        pTimeout = &timeout;
+    }
+
+    res = sceKernelWaitSema(sem->semid, 1, pTimeout);
+       switch (res) {
+               case SCE_KERNEL_ERROR_OK:
+                       return 0;
+               case SCE_KERNEL_ERROR_WAIT_TIMEOUT:
+                       return SDL_MUTEX_TIMEDOUT;
+               default:
+                       return SDL_SetError("WaitForSingleObject() failed");
+    }
+}
+
+int SDL_SemTryWait(SDL_sem *sem)
+{
+    return SDL_SemWaitTimeout(sem, 0);
+}
+
+int SDL_SemWait(SDL_sem *sem)
+{
+    return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT);
+}
+
+/* Returns the current count of the semaphore */
+Uint32 SDL_SemValue(SDL_sem *sem)
+{
+    SceKernelSemaInfo info;
+
+    if (sem == NULL) {
+        SDL_SetError("Passed a NULL sem");
+        return 0;
+    }
+
+    if (sceKernelReferSemaStatus(sem->semid, &info) >= 0) {
+        return info.currentCount;
+    }
+
+    return 0;
+}
+
+int SDL_SemPost(SDL_sem *sem)
+{
+    int res;
+
+    if (sem == NULL) {
+        return SDL_SetError("Passed a NULL sem");
+    }
+
+    res = sceKernelSignalSema(sem->semid, 1);
+    if (res < 0) {
+        return SDL_SetError("sceKernelSignalSema() failed");
+    }
+
+    return 0;
+}
+
+/* vim: ts=4 sw=4
+ */
diff --git a/Source/3rd Party/sdl/src/thread/psp/SDL_systhread.c b/Source/3rd Party/sdl/src/thread/psp/SDL_systhread.c
new file mode 100644
index 000000000..d2fbeeb2f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/psp/SDL_systhread.c	
@@ -0,0 +1,108 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+/* PSP thread management routines for SDL */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "SDL_error.h"
+#include "SDL_thread.h"
+#include "../SDL_systhread.h"
+#include "../SDL_thread_c.h"
+#include <pspkerneltypes.h>
+#include <pspthreadman.h>
+
+
+static int ThreadEntry(SceSize args, void *argp)
+{
+    SDL_RunThread(*(void **) argp);
+    return 0;
+}
+
+int SDL_SYS_CreateThread(SDL_Thread *thread, void *args)
+{
+    SceKernelThreadInfo status;
+    int priority = 32;
+
+    /* Set priority of new thread to the same as the current thread */
+    status.size = sizeof(SceKernelThreadInfo);
+    if (sceKernelReferThreadStatus(sceKernelGetThreadId(), &status) == 0) {
+        priority = status.currentPriority;
+    }
+
+    thread->handle = sceKernelCreateThread("SDL thread", ThreadEntry,
+                           priority, 0x8000,
+                           PSP_THREAD_ATTR_VFPU, NULL);
+    if (thread->handle < 0) {
+        return SDL_SetError("sceKernelCreateThread() failed");
+    }
+
+    sceKernelStartThread(thread->handle, 4, &args);
+    return 0;
+}
+
+void SDL_SYS_SetupThread(const char *name)
+{
+    /* Do nothing. */
+}
+
+SDL_threadID SDL_ThreadID(void)
+{
+    return (SDL_threadID) sceKernelGetThreadId();
+}
+
+void SDL_SYS_WaitThread(SDL_Thread *thread)
+{
+    sceKernelWaitThreadEnd(thread->handle, NULL);
+    sceKernelDeleteThread(thread->handle);
+}
+
+void SDL_SYS_DetachThread(SDL_Thread *thread)
+{
+    /* !!! FIXME: is this correct? */
+    sceKernelDeleteThread(thread->handle);
+}
+
+void SDL_SYS_KillThread(SDL_Thread *thread)
+{
+    sceKernelTerminateDeleteThread(thread->handle);
+}
+
+int SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
+{
+    int value;
+
+    if (priority == SDL_THREAD_PRIORITY_LOW) {
+        value = 19;
+    } else if (priority == SDL_THREAD_PRIORITY_HIGH) {
+        value = -20;
+    } else {
+        value = 0;
+    }
+
+    return sceKernelChangeThreadPriority(sceKernelGetThreadId(),value);
+
+}
+
+/* vim: ts=4 sw=4
+ */
diff --git a/Source/3rd Party/sdl/src/thread/psp/SDL_systhread_c.h b/Source/3rd Party/sdl/src/thread/psp/SDL_systhread_c.h
new file mode 100644
index 000000000..4f9dac249
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/psp/SDL_systhread_c.h	
@@ -0,0 +1,24 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <pspkerneltypes.h>
+
+typedef SceUID SYS_ThreadHandle;
diff --git a/Source/3rd Party/sdl/src/thread/pthread/SDL_syscond.c b/Source/3rd Party/sdl/src/thread/pthread/SDL_syscond.c
new file mode 100644
index 000000000..c15df8632
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/pthread/SDL_syscond.c	
@@ -0,0 +1,148 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include <sys/time.h>
+#include <unistd.h>
+#include <errno.h>
+#include <pthread.h>
+
+#include "SDL_thread.h"
+#include "SDL_sysmutex_c.h"
+
+struct SDL_cond
+{
+    pthread_cond_t cond;
+};
+
+/* Create a condition variable */
+SDL_cond *
+SDL_CreateCond(void)
+{
+    SDL_cond *cond;
+
+    cond = (SDL_cond *) SDL_malloc(sizeof(SDL_cond));
+    if (cond) {
+        if (pthread_cond_init(&cond->cond, NULL) < 0) {
+            SDL_SetError("pthread_cond_init() failed");
+            SDL_free(cond);
+            cond = NULL;
+        }
+    }
+    return (cond);
+}
+
+/* Destroy a condition variable */
+void
+SDL_DestroyCond(SDL_cond * cond)
+{
+    if (cond) {
+        pthread_cond_destroy(&cond->cond);
+        SDL_free(cond);
+    }
+}
+
+/* Restart one of the threads that are waiting on the condition variable */
+int
+SDL_CondSignal(SDL_cond * cond)
+{
+    int retval;
+
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    }
+
+    retval = 0;
+    if (pthread_cond_signal(&cond->cond) != 0) {
+        return SDL_SetError("pthread_cond_signal() failed");
+    }
+    return retval;
+}
+
+/* Restart all threads that are waiting on the condition variable */
+int
+SDL_CondBroadcast(SDL_cond * cond)
+{
+    int retval;
+
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    }
+
+    retval = 0;
+    if (pthread_cond_broadcast(&cond->cond) != 0) {
+        return SDL_SetError("pthread_cond_broadcast() failed");
+    }
+    return retval;
+}
+
+int
+SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms)
+{
+    int retval;
+    struct timeval delta;
+    struct timespec abstime;
+
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    }
+
+    gettimeofday(&delta, NULL);
+
+    abstime.tv_sec = delta.tv_sec + (ms / 1000);
+    abstime.tv_nsec = (delta.tv_usec + (ms % 1000) * 1000) * 1000;
+    if (abstime.tv_nsec > 1000000000) {
+        abstime.tv_sec += 1;
+        abstime.tv_nsec -= 1000000000;
+    }
+
+  tryagain:
+    retval = pthread_cond_timedwait(&cond->cond, &mutex->id, &abstime);
+    switch (retval) {
+    case EINTR:
+        goto tryagain;
+        break;
+    case ETIMEDOUT:
+        retval = SDL_MUTEX_TIMEDOUT;
+        break;
+    case 0:
+        break;
+    default:
+        retval = SDL_SetError("pthread_cond_timedwait() failed");
+    }
+    return retval;
+}
+
+/* Wait on the condition variable, unlocking the provided mutex.
+   The mutex must be locked before entering this function!
+ */
+int
+SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex)
+{
+    if (!cond) {
+        return SDL_SetError("Passed a NULL condition variable");
+    } else if (pthread_cond_wait(&cond->cond, &mutex->id) != 0) {
+        return SDL_SetError("pthread_cond_wait() failed");
+    }
+    return 0;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/pthread/SDL_sysmutex.c b/Source/3rd Party/sdl/src/thread/pthread/SDL_sysmutex.c
new file mode 100644
index 000000000..36bf394cb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/pthread/SDL_sysmutex.c	
@@ -0,0 +1,193 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#define _GNU_SOURCE
+#include <pthread.h>
+#include <errno.h>
+
+#include "SDL_thread.h"
+
+#if !SDL_THREAD_PTHREAD_RECURSIVE_MUTEX && \
+    !SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
+#define FAKE_RECURSIVE_MUTEX 1
+#endif
+
+struct SDL_mutex
+{
+    pthread_mutex_t id;
+#if FAKE_RECURSIVE_MUTEX
+    int recursive;
+    pthread_t owner;
+#endif
+};
+
+SDL_mutex *
+SDL_CreateMutex(void)
+{
+    SDL_mutex *mutex;
+    pthread_mutexattr_t attr;
+
+    /* Allocate the structure */
+    mutex = (SDL_mutex *) SDL_calloc(1, sizeof(*mutex));
+    if (mutex) {
+        pthread_mutexattr_init(&attr);
+#if SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
+        pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+#elif SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
+        pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
+#else
+        /* No extra attributes necessary */
+#endif
+        if (pthread_mutex_init(&mutex->id, &attr) != 0) {
+            SDL_SetError("pthread_mutex_init() failed");
+            SDL_free(mutex);
+            mutex = NULL;
+        }
+    } else {
+        SDL_OutOfMemory();
+    }
+    return (mutex);
+}
+
+void
+SDL_DestroyMutex(SDL_mutex * mutex)
+{
+    if (mutex) {
+        pthread_mutex_destroy(&mutex->id);
+        SDL_free(mutex);
+    }
+}
+
+/* Lock the mutex */
+int
+SDL_LockMutex(SDL_mutex * mutex)
+{
+#if FAKE_RECURSIVE_MUTEX
+    pthread_t this_thread;
+#endif
+
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+#if FAKE_RECURSIVE_MUTEX
+    this_thread = pthread_self();
+    if (mutex->owner == this_thread) {
+        ++mutex->recursive;
+    } else {
+        /* The order of operations is important.
+           We set the locking thread id after we obtain the lock
+           so unlocks from other threads will fail.
+         */
+        if (pthread_mutex_lock(&mutex->id) == 0) {
+            mutex->owner = this_thread;
+            mutex->recursive = 0;
+        } else {
+            return SDL_SetError("pthread_mutex_lock() failed");
+        }
+    }
+#else
+    if (pthread_mutex_lock(&mutex->id) < 0) {
+        return SDL_SetError("pthread_mutex_lock() failed");
+    }
+#endif
+    return 0;
+}
+
+int
+SDL_TryLockMutex(SDL_mutex * mutex)
+{
+    int retval;
+#if FAKE_RECURSIVE_MUTEX
+    pthread_t this_thread;
+#endif
+
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    retval = 0;
+#if FAKE_RECURSIVE_MUTEX
+    this_thread = pthread_self();
+    if (mutex->owner == this_thread) {
+        ++mutex->recursive;
+    } else {
+        /* The order of operations is important.
+         We set the locking thread id after we obtain the lock
+         so unlocks from other threads will fail.
+         */
+        if (pthread_mutex_lock(&mutex->id) == 0) {
+            mutex->owner = this_thread;
+            mutex->recursive = 0;
+        } else if (errno == EBUSY) {
+            retval = SDL_MUTEX_TIMEDOUT;
+        } else {
+            retval = SDL_SetError("pthread_mutex_trylock() failed");
+        }
+    }
+#else
+    if (pthread_mutex_trylock(&mutex->id) != 0) {
+        if (errno == EBUSY) {
+            retval = SDL_MUTEX_TIMEDOUT;
+        } else {
+            retval = SDL_SetError("pthread_mutex_trylock() failed");
+        }
+    }
+#endif
+    return retval;
+}
+
+int
+SDL_UnlockMutex(SDL_mutex * mutex)
+{
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+#if FAKE_RECURSIVE_MUTEX
+    /* We can only unlock the mutex if we own it */
+    if (pthread_self() == mutex->owner) {
+        if (mutex->recursive) {
+            --mutex->recursive;
+        } else {
+            /* The order of operations is important.
+               First reset the owner so another thread doesn't lock
+               the mutex and set the ownership before we reset it,
+               then release the lock semaphore.
+             */
+            mutex->owner = 0;
+            pthread_mutex_unlock(&mutex->id);
+        }
+    } else {
+        return SDL_SetError("mutex not owned by this thread");
+    }
+
+#else
+    if (pthread_mutex_unlock(&mutex->id) < 0) {
+        return SDL_SetError("pthread_mutex_unlock() failed");
+    }
+#endif /* FAKE_RECURSIVE_MUTEX */
+
+    return 0;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/pthread/SDL_sysmutex_c.h b/Source/3rd Party/sdl/src/thread/pthread/SDL_sysmutex_c.h
new file mode 100644
index 000000000..bf69bcd16
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/pthread/SDL_sysmutex_c.h	
@@ -0,0 +1,32 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_mutex_c_h
+#define _SDL_mutex_c_h
+
+struct SDL_mutex
+{
+    pthread_mutex_t id;
+};
+
+#endif /* _SDL_mutex_c_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/pthread/SDL_syssem.c b/Source/3rd Party/sdl/src/thread/pthread/SDL_syssem.c
new file mode 100644
index 000000000..358baff28
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/pthread/SDL_syssem.c	
@@ -0,0 +1,199 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include <errno.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <sys/time.h>
+
+#include "SDL_thread.h"
+#include "SDL_timer.h"
+
+/* Wrapper around POSIX 1003.1b semaphores */
+
+#if defined(__MACOSX__) || defined(__IPHONEOS__)
+/* Mac OS X doesn't support sem_getvalue() as of version 10.4 */
+#include "../generic/SDL_syssem.c"
+#else
+
+struct SDL_semaphore
+{
+    sem_t sem;
+};
+
+/* Create a semaphore, initialized with value */
+SDL_sem *
+SDL_CreateSemaphore(Uint32 initial_value)
+{
+    SDL_sem *sem = (SDL_sem *) SDL_malloc(sizeof(SDL_sem));
+    if (sem) {
+        if (sem_init(&sem->sem, 0, initial_value) < 0) {
+            SDL_SetError("sem_init() failed");
+            SDL_free(sem);
+            sem = NULL;
+        }
+    } else {
+        SDL_OutOfMemory();
+    }
+    return sem;
+}
+
+void
+SDL_DestroySemaphore(SDL_sem * sem)
+{
+    if (sem) {
+        sem_destroy(&sem->sem);
+        SDL_free(sem);
+    }
+}
+
+int
+SDL_SemTryWait(SDL_sem * sem)
+{
+    int retval;
+
+    if (!sem) {
+        return SDL_SetError("Passed a NULL semaphore");
+    }
+    retval = SDL_MUTEX_TIMEDOUT;
+    if (sem_trywait(&sem->sem) == 0) {
+        retval = 0;
+    }
+    return retval;
+}
+
+int
+SDL_SemWait(SDL_sem * sem)
+{
+    int retval;
+
+    if (!sem) {
+        return SDL_SetError("Passed a NULL semaphore");
+    }
+
+    retval = sem_wait(&sem->sem);
+    if (retval < 0) {
+        retval = SDL_SetError("sem_wait() failed");
+    }
+    return retval;
+}
+
+int
+SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
+{
+    int retval;
+#ifdef HAVE_SEM_TIMEDWAIT
+    struct timeval now;
+    struct timespec ts_timeout;
+#else
+    Uint32 end;
+#endif
+
+    if (!sem) {
+        return SDL_SetError("Passed a NULL semaphore");
+    }
+
+    /* Try the easy cases first */
+    if (timeout == 0) {
+        return SDL_SemTryWait(sem);
+    }
+    if (timeout == SDL_MUTEX_MAXWAIT) {
+        return SDL_SemWait(sem);
+    }
+
+#ifdef HAVE_SEM_TIMEDWAIT
+    /* Setup the timeout. sem_timedwait doesn't wait for
+    * a lapse of time, but until we reach a certain time.
+    * This time is now plus the timeout.
+    */
+    gettimeofday(&now, NULL);
+
+    /* Add our timeout to current time */
+    now.tv_usec += (timeout % 1000) * 1000;
+    now.tv_sec += timeout / 1000;
+
+    /* Wrap the second if needed */
+    if ( now.tv_usec >= 1000000 ) {
+        now.tv_usec -= 1000000;
+        now.tv_sec ++;
+    }
+
+    /* Convert to timespec */
+    ts_timeout.tv_sec = now.tv_sec;
+    ts_timeout.tv_nsec = now.tv_usec * 1000;
+
+    /* Wait. */
+    do {
+        retval = sem_timedwait(&sem->sem, &ts_timeout);
+    } while (retval < 0 && errno == EINTR);
+
+    if (retval < 0) {
+        if (errno == ETIMEDOUT) {
+            retval = SDL_MUTEX_TIMEDOUT;
+        } else {
+            SDL_SetError(strerror(errno));
+        }
+    }
+#else
+    end = SDL_GetTicks() + timeout;
+    while ((retval = SDL_SemTryWait(sem)) == SDL_MUTEX_TIMEDOUT) {
+        if (SDL_TICKS_PASSED(SDL_GetTicks(), end)) {
+            break;
+        }
+        SDL_Delay(1);
+    }
+#endif /* HAVE_SEM_TIMEDWAIT */
+
+    return retval;
+}
+
+Uint32
+SDL_SemValue(SDL_sem * sem)
+{
+    int ret = 0;
+    if (sem) {
+        sem_getvalue(&sem->sem, &ret);
+        if (ret < 0) {
+            ret = 0;
+        }
+    }
+    return (Uint32) ret;
+}
+
+int
+SDL_SemPost(SDL_sem * sem)
+{
+    int retval;
+
+    if (!sem) {
+        return SDL_SetError("Passed a NULL semaphore");
+    }
+
+    retval = sem_post(&sem->sem);
+    if (retval < 0) {
+        SDL_SetError("sem_post() failed");
+    }
+    return retval;
+}
+
+#endif /* __MACOSX__ */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/pthread/SDL_systhread.c b/Source/3rd Party/sdl/src/thread/pthread/SDL_systhread.c
new file mode 100644
index 000000000..b570b2abd
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/pthread/SDL_systhread.c	
@@ -0,0 +1,222 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#include <pthread.h>
+
+#if HAVE_PTHREAD_NP_H
+#include <pthread_np.h>
+#endif
+
+#include <signal.h>
+
+#ifdef __LINUX__
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/syscall.h>
+#include <unistd.h>
+#endif /* __LINUX__ */
+
+#if defined(__LINUX__) || defined(__MACOSX__) || defined(__IPHONEOS__)
+#include <dlfcn.h>
+#ifndef RTLD_DEFAULT
+#define RTLD_DEFAULT NULL
+#endif
+#endif
+
+#include "SDL_platform.h"
+#include "SDL_thread.h"
+#include "../SDL_thread_c.h"
+#include "../SDL_systhread.h"
+#ifdef __ANDROID__
+#include "../../core/android/SDL_android.h"
+#endif
+
+#ifdef __HAIKU__
+#include <be/kernel/OS.h>
+#endif
+
+#include "SDL_assert.h"
+
+/* List of signals to mask in the subthreads */
+static const int sig_list[] = {
+    SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGCHLD, SIGWINCH,
+    SIGVTALRM, SIGPROF, 0
+};
+
+static void *
+RunThread(void *data)
+{
+#ifdef __ANDROID__
+    Android_JNI_SetupThread();
+#endif
+    SDL_RunThread(data);
+    return NULL;
+}
+
+#if defined(__MACOSX__) || defined(__IPHONEOS__)
+static SDL_bool checked_setname = SDL_FALSE;
+static int (*ppthread_setname_np)(const char*) = NULL;
+#elif defined(__LINUX__)
+static SDL_bool checked_setname = SDL_FALSE;
+static int (*ppthread_setname_np)(pthread_t, const char*) = NULL;
+#endif
+int
+SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
+{
+    pthread_attr_t type;
+
+    /* do this here before any threads exist, so there's no race condition. */
+    #if defined(__MACOSX__) || defined(__IPHONEOS__) || defined(__LINUX__)
+    if (!checked_setname) {
+        void *fn = dlsym(RTLD_DEFAULT, "pthread_setname_np");
+        #if defined(__MACOSX__) || defined(__IPHONEOS__)
+        ppthread_setname_np = (int(*)(const char*)) fn;
+        #elif defined(__LINUX__)
+        ppthread_setname_np = (int(*)(pthread_t, const char*)) fn;
+        #endif
+        checked_setname = SDL_TRUE;
+    }
+    #endif
+
+    /* Set the thread attributes */
+    if (pthread_attr_init(&type) != 0) {
+        return SDL_SetError("Couldn't initialize pthread attributes");
+    }
+    pthread_attr_setdetachstate(&type, PTHREAD_CREATE_JOINABLE);
+
+    /* Create the thread and go! */
+    if (pthread_create(&thread->handle, &type, RunThread, args) != 0) {
+        return SDL_SetError("Not enough resources to create thread");
+    }
+
+    return 0;
+}
+
+void
+SDL_SYS_SetupThread(const char *name)
+{
+    int i;
+    sigset_t mask;
+
+    if (name != NULL) {
+        #if defined(__MACOSX__) || defined(__IPHONEOS__) || defined(__LINUX__)
+        SDL_assert(checked_setname);
+        if (ppthread_setname_np != NULL) {
+            #if defined(__MACOSX__) || defined(__IPHONEOS__)
+            ppthread_setname_np(name);
+            #elif defined(__LINUX__)
+            ppthread_setname_np(pthread_self(), name);
+            #endif
+        }
+        #elif HAVE_PTHREAD_SETNAME_NP
+            pthread_setname_np(pthread_self(), name);
+        #elif HAVE_PTHREAD_SET_NAME_NP
+            pthread_set_name_np(pthread_self(), name);
+        #elif defined(__HAIKU__)
+            /* The docs say the thread name can't be longer than B_OS_NAME_LENGTH. */
+            char namebuf[B_OS_NAME_LENGTH];
+            SDL_snprintf(namebuf, sizeof (namebuf), "%s", name);
+            namebuf[sizeof (namebuf) - 1] = '\0';
+            rename_thread(find_thread(NULL), namebuf);
+        #endif
+    }
+
+    /* Mask asynchronous signals for this thread */
+    sigemptyset(&mask);
+    for (i = 0; sig_list[i]; ++i) {
+        sigaddset(&mask, sig_list[i]);
+    }
+    pthread_sigmask(SIG_BLOCK, &mask, 0);
+
+#ifdef PTHREAD_CANCEL_ASYNCHRONOUS
+    /* Allow ourselves to be asynchronously cancelled */
+    {
+        int oldstate;
+        pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldstate);
+    }
+#endif
+}
+
+SDL_threadID
+SDL_ThreadID(void)
+{
+    return ((SDL_threadID) pthread_self());
+}
+
+int
+SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
+{
+#ifdef __LINUX__
+    int value;
+
+    if (priority == SDL_THREAD_PRIORITY_LOW) {
+        value = 19;
+    } else if (priority == SDL_THREAD_PRIORITY_HIGH) {
+        value = -20;
+    } else {
+        value = 0;
+    }
+    if (setpriority(PRIO_PROCESS, syscall(SYS_gettid), value) < 0) {
+        /* Note that this fails if you're trying to set high priority
+           and you don't have root permission. BUT DON'T RUN AS ROOT!
+         */
+        return SDL_SetError("setpriority() failed");
+    }
+    return 0;
+#else
+    struct sched_param sched;
+    int policy;
+    pthread_t thread = pthread_self();
+
+    if (pthread_getschedparam(thread, &policy, &sched) < 0) {
+        return SDL_SetError("pthread_getschedparam() failed");
+    }
+    if (priority == SDL_THREAD_PRIORITY_LOW) {
+        sched.sched_priority = sched_get_priority_min(policy);
+    } else if (priority == SDL_THREAD_PRIORITY_HIGH) {
+        sched.sched_priority = sched_get_priority_max(policy);
+    } else {
+        int min_priority = sched_get_priority_min(policy);
+        int max_priority = sched_get_priority_max(policy);
+        sched.sched_priority = (min_priority + (max_priority - min_priority) / 2);
+    }
+    if (pthread_setschedparam(thread, policy, &sched) < 0) {
+        return SDL_SetError("pthread_setschedparam() failed");
+    }
+    return 0;
+#endif /* linux */
+}
+
+void
+SDL_SYS_WaitThread(SDL_Thread * thread)
+{
+    pthread_join(thread->handle, 0);
+}
+
+void
+SDL_SYS_DetachThread(SDL_Thread * thread)
+{
+    pthread_detach(thread->handle);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/pthread/SDL_systhread_c.h b/Source/3rd Party/sdl/src/thread/pthread/SDL_systhread_c.h
new file mode 100644
index 000000000..eedb7d1f5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/pthread/SDL_systhread_c.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include <pthread.h>
+
+typedef pthread_t SYS_ThreadHandle;
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/pthread/SDL_systls.c b/Source/3rd Party/sdl/src/thread/pthread/SDL_systls.c
new file mode 100644
index 000000000..09a279040
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/pthread/SDL_systls.c	
@@ -0,0 +1,69 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+#include "SDL_thread.h"
+#include "../SDL_thread_c.h"
+
+#include <pthread.h>
+
+
+#define INVALID_PTHREAD_KEY ((pthread_key_t)-1)
+
+static pthread_key_t thread_local_storage = INVALID_PTHREAD_KEY;
+static SDL_bool generic_local_storage = SDL_FALSE;
+
+SDL_TLSData *
+SDL_SYS_GetTLSData()
+{
+    if (thread_local_storage == INVALID_PTHREAD_KEY && !generic_local_storage) {
+        static SDL_SpinLock lock;
+        SDL_AtomicLock(&lock);
+        if (thread_local_storage == INVALID_PTHREAD_KEY && !generic_local_storage) {
+            pthread_key_t storage;
+            if (pthread_key_create(&storage, NULL) == 0) {
+                SDL_MemoryBarrierRelease();
+                thread_local_storage = storage;
+            } else {
+                generic_local_storage = SDL_TRUE;
+            }
+        }
+        SDL_AtomicUnlock(&lock);
+    }
+    if (generic_local_storage) {
+        return SDL_Generic_GetTLSData();
+    }
+    SDL_MemoryBarrierAcquire();
+    return (SDL_TLSData *)pthread_getspecific(thread_local_storage);
+}
+
+int
+SDL_SYS_SetTLSData(SDL_TLSData *data)
+{
+    if (generic_local_storage) {
+        return SDL_Generic_SetTLSData(data);
+    }
+    if (pthread_setspecific(thread_local_storage, data) != 0) {
+        return SDL_SetError("pthread_setspecific() failed");
+    }
+    return 0;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/stdcpp/SDL_syscond.cpp b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_syscond.cpp
new file mode 100644
index 000000000..e9da82a3b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_syscond.cpp	
@@ -0,0 +1,164 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+extern "C" {
+#include "SDL_thread.h"
+}
+
+#include <chrono>
+#include <condition_variable>
+#include <ratio>
+#include <system_error>
+
+#include "SDL_sysmutex_c.h"
+
+struct SDL_cond
+{
+    std::condition_variable_any cpp_cond;
+};
+
+/* Create a condition variable */
+extern "C"
+SDL_cond *
+SDL_CreateCond(void)
+{
+    /* Allocate and initialize the condition variable */
+    try {
+        SDL_cond * cond = new SDL_cond;
+        return cond;
+    } catch (std::system_error & ex) {
+        SDL_SetError("unable to create a C++ condition variable: code=%d; %s", ex.code(), ex.what());
+        return NULL;
+    } catch (std::bad_alloc &) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+}
+
+/* Destroy a condition variable */
+extern "C"
+void
+SDL_DestroyCond(SDL_cond * cond)
+{
+    if (cond) {
+        delete cond;
+    }
+}
+
+/* Restart one of the threads that are waiting on the condition variable */
+extern "C"
+int
+SDL_CondSignal(SDL_cond * cond)
+{
+    if (!cond) {
+        SDL_SetError("Passed a NULL condition variable");
+        return -1;
+    }
+
+    cond->cpp_cond.notify_one();
+    return 0;
+}
+
+/* Restart all threads that are waiting on the condition variable */
+extern "C"
+int
+SDL_CondBroadcast(SDL_cond * cond)
+{
+    if (!cond) {
+        SDL_SetError("Passed a NULL condition variable");
+        return -1;
+    }
+
+    cond->cpp_cond.notify_all();
+    return 0;
+}
+
+/* Wait on the condition variable for at most 'ms' milliseconds.
+   The mutex must be locked before entering this function!
+   The mutex is unlocked during the wait, and locked again after the wait.
+
+Typical use:
+
+Thread A:
+    SDL_LockMutex(lock);
+    while ( ! condition ) {
+        SDL_CondWait(cond, lock);
+    }
+    SDL_UnlockMutex(lock);
+
+Thread B:
+    SDL_LockMutex(lock);
+    ...
+    condition = true;
+    ...
+    SDL_CondSignal(cond);
+    SDL_UnlockMutex(lock);
+ */
+extern "C"
+int
+SDL_CondWaitTimeout(SDL_cond * cond, SDL_mutex * mutex, Uint32 ms)
+{
+    if (!cond) {
+        SDL_SetError("Passed a NULL condition variable");
+        return -1;
+    }
+
+    if (!mutex) {
+        SDL_SetError("Passed a NULL mutex variable");
+        return -1;
+    }
+
+    try {
+        std::unique_lock<std::recursive_mutex> cpp_lock(mutex->cpp_mutex, std::defer_lock_t());
+        if (ms == SDL_MUTEX_MAXWAIT) {
+            cond->cpp_cond.wait(
+                cpp_lock
+                );
+            cpp_lock.release();
+            return 0;
+        } else {
+            auto wait_result = cond->cpp_cond.wait_for(
+                cpp_lock,
+                std::chrono::duration<Uint32, std::milli>(ms)
+                );
+            cpp_lock.release();
+            if (wait_result == std::cv_status::timeout) {
+                return SDL_MUTEX_TIMEDOUT;
+            } else {
+                return 0;
+            }
+        }
+    } catch (std::system_error & ex) {
+        SDL_SetError("unable to wait on a C++ condition variable: code=%d; %s", ex.code(), ex.what());
+        return -1;
+    }
+}
+
+/* Wait on the condition variable forever */
+extern "C"
+int
+SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex)
+{
+    return SDL_CondWaitTimeout(cond, mutex, SDL_MUTEX_MAXWAIT);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/stdcpp/SDL_sysmutex.cpp b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_sysmutex.cpp
new file mode 100644
index 000000000..4b60fb1dc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_sysmutex.cpp	
@@ -0,0 +1,111 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+extern "C" {
+#include "SDL_thread.h"
+#include "SDL_systhread_c.h"
+#include "SDL_log.h"
+}
+
+#include <system_error>
+
+#include "SDL_sysmutex_c.h"
+#include <Windows.h>
+
+
+/* Create a mutex */
+extern "C"
+SDL_mutex *
+SDL_CreateMutex(void)
+{
+    /* Allocate and initialize the mutex */
+    try {
+        SDL_mutex * mutex = new SDL_mutex;
+        return mutex;
+    } catch (std::system_error & ex) {
+        SDL_SetError("unable to create a C++ mutex: code=%d; %s", ex.code(), ex.what());
+        return NULL;
+    } catch (std::bad_alloc &) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+}
+
+/* Free the mutex */
+extern "C"
+void
+SDL_DestroyMutex(SDL_mutex * mutex)
+{
+    if (mutex) {
+        delete mutex;
+    }
+}
+
+/* Lock the semaphore */
+extern "C"
+int
+SDL_mutexP(SDL_mutex * mutex)
+{
+    if (mutex == NULL) {
+        SDL_SetError("Passed a NULL mutex");
+        return -1;
+    }
+
+    try {
+        mutex->cpp_mutex.lock();
+        return 0;
+    } catch (std::system_error & ex) {
+        SDL_SetError("unable to lock a C++ mutex: code=%d; %s", ex.code(), ex.what());
+        return -1;
+    }
+}
+
+/* TryLock the mutex */
+int
+SDL_TryLockMutex(SDL_mutex * mutex)
+{
+    int retval = 0;
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    if (mutex->cpp_mutex.try_lock() == false) {
+        retval = SDL_MUTEX_TIMEDOUT;
+    }
+    return retval;
+}
+
+/* Unlock the mutex */
+extern "C"
+int
+SDL_mutexV(SDL_mutex * mutex)
+{
+    if (mutex == NULL) {
+        SDL_SetError("Passed a NULL mutex");
+        return -1;
+    }
+
+    mutex->cpp_mutex.unlock();
+    return 0;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/stdcpp/SDL_sysmutex_c.h b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_sysmutex_c.h
new file mode 100644
index 000000000..6bbd9dcd8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_sysmutex_c.h	
@@ -0,0 +1,30 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#include <mutex>
+
+struct SDL_mutex
+{
+    std::recursive_mutex cpp_mutex;
+};
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/stdcpp/SDL_systhread.cpp b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_systhread.cpp
new file mode 100644
index 000000000..5de700ab6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_systhread.cpp	
@@ -0,0 +1,167 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* Thread management routines for SDL */
+
+extern "C" {
+#include "SDL_thread.h"
+#include "../SDL_thread_c.h"
+#include "../SDL_systhread.h"
+#include "SDL_log.h"
+}
+
+#include <mutex>
+#include <thread>
+#include <system_error>
+
+#ifdef __WINRT__
+#include <Windows.h>
+#endif
+
+static void
+RunThread(void *args)
+{
+    SDL_RunThread(args);
+}
+
+extern "C"
+int
+SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
+{
+    try {
+        std::thread cpp_thread(RunThread, args);
+        thread->handle = (void *) new std::thread(std::move(cpp_thread));
+        return 0;
+    } catch (std::system_error & ex) {
+        SDL_SetError("unable to start a C++ thread: code=%d; %s", ex.code(), ex.what());
+        return -1;
+    } catch (std::bad_alloc &) {
+        SDL_OutOfMemory();
+        return -1;
+    }
+}
+
+extern "C"
+void
+SDL_SYS_SetupThread(const char *name)
+{
+    // Make sure a thread ID gets assigned ASAP, for debugging purposes:
+    SDL_ThreadID();
+    return;
+}
+
+extern "C"
+SDL_threadID
+SDL_ThreadID(void)
+{
+#ifdef __WINRT__
+    return GetCurrentThreadId();
+#else
+    // HACK: Mimick a thread ID, if one isn't otherwise available.
+    static thread_local SDL_threadID current_thread_id = 0;
+    static SDL_threadID next_thread_id = 1;
+    static std::mutex next_thread_id_mutex;
+
+    if (current_thread_id == 0) {
+        std::lock_guard<std::mutex> lock(next_thread_id_mutex);
+        current_thread_id = next_thread_id;
+        ++next_thread_id;
+    }
+
+    return current_thread_id;
+#endif
+}
+
+extern "C"
+int
+SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
+{
+    // Thread priorities do not look to be settable via C++11's thread
+    // interface, at least as of this writing (Nov 2012).  std::thread does
+    // provide access to the OS' native handle, however, and some form of
+    // priority-setting could, in theory, be done through this interface.
+    //
+    // WinRT: UPDATE (Aug 20, 2013): thread priorities cannot be changed
+    // on WinRT, at least not for any thread that's already been created.
+    // WinRT threads appear to be based off of the WinRT class,
+    // ThreadPool, more info on which can be found at:
+    // http://msdn.microsoft.com/en-us/library/windows/apps/windows.system.threading.threadpool.aspx
+    //
+    // For compatibility sake, 0 will be returned here.
+    return (0);
+}
+
+extern "C"
+void
+SDL_SYS_WaitThread(SDL_Thread * thread)
+{
+    if ( ! thread) {
+        return;
+    }
+
+    try {
+        std::thread * cpp_thread = (std::thread *) thread->handle;
+        if (cpp_thread->joinable()) {
+            cpp_thread->join();
+        }
+    } catch (std::system_error &) {
+        // An error occurred when joining the thread.  SDL_WaitThread does not,
+        // however, seem to provide a means to report errors to its callers
+        // though!
+    }
+}
+
+extern "C"
+void
+SDL_SYS_DetachThread(SDL_Thread * thread)
+{
+    if ( ! thread) {
+        return;
+    }
+
+    try {
+        std::thread * cpp_thread = (std::thread *) thread->handle;
+        if (cpp_thread->joinable()) {
+            cpp_thread->detach();
+        }
+    } catch (std::system_error &) {
+        // An error occurred when detaching the thread.  SDL_DetachThread does not,
+        // however, seem to provide a means to report errors to its callers
+        // though!
+    }
+}
+
+extern "C"
+SDL_TLSData *
+SDL_SYS_GetTLSData()
+{
+    return SDL_Generic_GetTLSData();
+}
+
+extern "C"
+int
+SDL_SYS_SetTLSData(SDL_TLSData *data)
+{
+    return SDL_Generic_SetTLSData(data);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/stdcpp/SDL_systhread_c.h b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_systhread_c.h
new file mode 100644
index 000000000..a0a338f5c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/stdcpp/SDL_systhread_c.h	
@@ -0,0 +1,26 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+/* For a thread handle, use a void pointer to a std::thread */
+typedef void * SYS_ThreadHandle;
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/windows/SDL_sysmutex.c b/Source/3rd Party/sdl/src/thread/windows/SDL_sysmutex.c
new file mode 100644
index 000000000..8333e11b4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/windows/SDL_sysmutex.c	
@@ -0,0 +1,106 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_THREAD_WINDOWS
+
+/* Mutex functions using the Win32 API */
+
+#include "../../core/windows/SDL_windows.h"
+
+#include "SDL_mutex.h"
+
+
+struct SDL_mutex
+{
+    CRITICAL_SECTION cs;
+};
+
+/* Create a mutex */
+SDL_mutex *
+SDL_CreateMutex(void)
+{
+    SDL_mutex *mutex;
+
+    /* Allocate mutex memory */
+    mutex = (SDL_mutex *) SDL_malloc(sizeof(*mutex));
+    if (mutex) {
+        /* Initialize */
+        /* On SMP systems, a non-zero spin count generally helps performance */
+        InitializeCriticalSectionAndSpinCount(&mutex->cs, 2000);
+    } else {
+        SDL_OutOfMemory();
+    }
+    return (mutex);
+}
+
+/* Free the mutex */
+void
+SDL_DestroyMutex(SDL_mutex * mutex)
+{
+    if (mutex) {
+        DeleteCriticalSection(&mutex->cs);
+        SDL_free(mutex);
+    }
+}
+
+/* Lock the mutex */
+int
+SDL_LockMutex(SDL_mutex * mutex)
+{
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    EnterCriticalSection(&mutex->cs);
+    return (0);
+}
+
+/* TryLock the mutex */
+int
+SDL_TryLockMutex(SDL_mutex * mutex)
+{
+    int retval = 0;
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    if (TryEnterCriticalSection(&mutex->cs) == 0) {
+        retval = SDL_MUTEX_TIMEDOUT;
+    }
+    return retval;
+}
+
+/* Unlock the mutex */
+int
+SDL_UnlockMutex(SDL_mutex * mutex)
+{
+    if (mutex == NULL) {
+        return SDL_SetError("Passed a NULL mutex");
+    }
+
+    LeaveCriticalSection(&mutex->cs);
+    return (0);
+}
+
+#endif /* SDL_THREAD_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/windows/SDL_syssem.c b/Source/3rd Party/sdl/src/thread/windows/SDL_syssem.c
new file mode 100644
index 000000000..a4f75f5cf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/windows/SDL_syssem.c	
@@ -0,0 +1,148 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_THREAD_WINDOWS
+
+/* Semaphore functions using the Win32 API */
+
+#include "../../core/windows/SDL_windows.h"
+
+#include "SDL_thread.h"
+
+struct SDL_semaphore
+{
+    HANDLE id;
+    LONG count;
+};
+
+
+/* Create a semaphore */
+SDL_sem *
+SDL_CreateSemaphore(Uint32 initial_value)
+{
+    SDL_sem *sem;
+
+    /* Allocate sem memory */
+    sem = (SDL_sem *) SDL_malloc(sizeof(*sem));
+    if (sem) {
+        /* Create the semaphore, with max value 32K */
+        sem->id = CreateSemaphore(NULL, initial_value, 32 * 1024, NULL);
+        sem->count = initial_value;
+        if (!sem->id) {
+            SDL_SetError("Couldn't create semaphore");
+            SDL_free(sem);
+            sem = NULL;
+        }
+    } else {
+        SDL_OutOfMemory();
+    }
+    return (sem);
+}
+
+/* Free the semaphore */
+void
+SDL_DestroySemaphore(SDL_sem * sem)
+{
+    if (sem) {
+        if (sem->id) {
+            CloseHandle(sem->id);
+            sem->id = 0;
+        }
+        SDL_free(sem);
+    }
+}
+
+int
+SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
+{
+    int retval;
+    DWORD dwMilliseconds;
+
+    if (!sem) {
+        return SDL_SetError("Passed a NULL sem");
+    }
+
+    if (timeout == SDL_MUTEX_MAXWAIT) {
+        dwMilliseconds = INFINITE;
+    } else {
+        dwMilliseconds = (DWORD) timeout;
+    }
+    switch (WaitForSingleObject(sem->id, dwMilliseconds)) {
+    case WAIT_OBJECT_0:
+        InterlockedDecrement(&sem->count);
+        retval = 0;
+        break;
+    case WAIT_TIMEOUT:
+        retval = SDL_MUTEX_TIMEDOUT;
+        break;
+    default:
+        retval = SDL_SetError("WaitForSingleObject() failed");
+        break;
+    }
+    return retval;
+}
+
+int
+SDL_SemTryWait(SDL_sem * sem)
+{
+    return SDL_SemWaitTimeout(sem, 0);
+}
+
+int
+SDL_SemWait(SDL_sem * sem)
+{
+    return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT);
+}
+
+/* Returns the current count of the semaphore */
+Uint32
+SDL_SemValue(SDL_sem * sem)
+{
+    if (!sem) {
+        SDL_SetError("Passed a NULL sem");
+        return 0;
+    }
+    return (Uint32)sem->count;
+}
+
+int
+SDL_SemPost(SDL_sem * sem)
+{
+    if (!sem) {
+        return SDL_SetError("Passed a NULL sem");
+    }
+    /* Increase the counter in the first place, because
+     * after a successful release the semaphore may
+     * immediately get destroyed by another thread which
+     * is waiting for this semaphore.
+     */
+    InterlockedIncrement(&sem->count);
+    if (ReleaseSemaphore(sem->id, 1, NULL) == FALSE) {
+        InterlockedDecrement(&sem->count);      /* restore */
+        return SDL_SetError("ReleaseSemaphore() failed");
+    }
+    return 0;
+}
+
+#endif /* SDL_THREAD_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/windows/SDL_systhread.c b/Source/3rd Party/sdl/src/thread/windows/SDL_systhread.c
new file mode 100644
index 000000000..79c40b161
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/windows/SDL_systhread.c	
@@ -0,0 +1,245 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_THREAD_WINDOWS
+
+/* Win32 thread management routines for SDL */
+
+#include "SDL_thread.h"
+#include "../SDL_thread_c.h"
+#include "../SDL_systhread.h"
+#include "SDL_systhread_c.h"
+
+#ifndef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+/* We'll use the C library from this DLL */
+#include <process.h>
+
+/* Cygwin gcc-3 ... MingW64 (even with a i386 host) does this like MSVC. */
+#if (defined(__MINGW32__) && (__GNUC__ < 4))
+typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
+        unsigned (__stdcall *func)(void *), void *arg,
+        unsigned, unsigned *threadID);
+typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
+
+#elif defined(__WATCOMC__)
+/* This is for Watcom targets except OS2 */
+#if __WATCOMC__ < 1240
+#define __watcall
+#endif
+typedef unsigned long (__watcall * pfnSDL_CurrentBeginThread) (void *,
+                                                               unsigned,
+                                                               unsigned
+                                                               (__stdcall *
+                                                                func) (void
+                                                                       *),
+                                                               void *arg,
+                                                               unsigned,
+                                                               unsigned
+                                                               *threadID);
+typedef void (__watcall * pfnSDL_CurrentEndThread) (unsigned code);
+
+#else
+typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned,
+                                                        unsigned (__stdcall *
+                                                                  func) (void
+                                                                         *),
+                                                        void *arg, unsigned,
+                                                        unsigned *threadID);
+typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
+#endif
+#endif /* !SDL_PASSED_BEGINTHREAD_ENDTHREAD */
+
+
+typedef struct ThreadStartParms
+{
+    void *args;
+    pfnSDL_CurrentEndThread pfnCurrentEndThread;
+} tThreadStartParms, *pThreadStartParms;
+
+static DWORD
+RunThread(void *data)
+{
+    pThreadStartParms pThreadParms = (pThreadStartParms) data;
+    pfnSDL_CurrentEndThread pfnEndThread = pThreadParms->pfnCurrentEndThread;
+    void *args = pThreadParms->args;
+    SDL_free(pThreadParms);
+    SDL_RunThread(args);
+    if (pfnEndThread != NULL)
+        pfnEndThread(0);
+    return (0);
+}
+
+static DWORD WINAPI
+RunThreadViaCreateThread(LPVOID data)
+{
+  return RunThread(data);
+}
+
+static unsigned __stdcall
+RunThreadViaBeginThreadEx(void *data)
+{
+  return (unsigned) RunThread(data);
+}
+
+#ifdef SDL_PASSED_BEGINTHREAD_ENDTHREAD
+int
+SDL_SYS_CreateThread(SDL_Thread * thread, void *args,
+                     pfnSDL_CurrentBeginThread pfnBeginThread,
+                     pfnSDL_CurrentEndThread pfnEndThread)
+{
+#elif defined(__CYGWIN__)
+int
+SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
+{
+    pfnSDL_CurrentBeginThread pfnBeginThread = NULL;
+    pfnSDL_CurrentEndThread pfnEndThread = NULL;
+#else
+int
+SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
+{
+    pfnSDL_CurrentBeginThread pfnBeginThread = (pfnSDL_CurrentBeginThread)_beginthreadex;
+    pfnSDL_CurrentEndThread pfnEndThread = (pfnSDL_CurrentEndThread)_endthreadex;
+#endif /* SDL_PASSED_BEGINTHREAD_ENDTHREAD */
+    pThreadStartParms pThreadParms =
+        (pThreadStartParms) SDL_malloc(sizeof(tThreadStartParms));
+    if (!pThreadParms) {
+        return SDL_OutOfMemory();
+    }
+    /* Save the function which we will have to call to clear the RTL of calling app! */
+    pThreadParms->pfnCurrentEndThread = pfnEndThread;
+    /* Also save the real parameters we have to pass to thread function */
+    pThreadParms->args = args;
+
+    if (pfnBeginThread) {
+        unsigned threadid = 0;
+        thread->handle = (SYS_ThreadHandle)
+            ((size_t) pfnBeginThread(NULL, 0, RunThreadViaBeginThreadEx,
+                                     pThreadParms, 0, &threadid));
+    } else {
+        DWORD threadid = 0;
+        thread->handle = CreateThread(NULL, 0, RunThreadViaCreateThread,
+                                      pThreadParms, 0, &threadid);
+    }
+    if (thread->handle == NULL) {
+        return SDL_SetError("Not enough resources to create thread");
+    }
+    return 0;
+}
+
+#if 0  /* !!! FIXME: revisit this later. See https://bugzilla.libsdl.org/show_bug.cgi?id=2089 */
+#ifdef _MSC_VER
+#pragma warning(disable : 4733)
+#pragma pack(push,8)
+typedef struct tagTHREADNAME_INFO
+{
+    DWORD dwType; /* must be 0x1000 */
+    LPCSTR szName; /* pointer to name (in user addr space) */
+    DWORD dwThreadID; /* thread ID (-1=caller thread) */
+    DWORD dwFlags; /* reserved for future use, must be zero */
+} THREADNAME_INFO;
+#pragma pack(pop)
+
+static EXCEPTION_DISPOSITION
+ignore_exception(void *a, void *b, void *c, void *d)
+{
+    return ExceptionContinueExecution;
+}
+#endif
+#endif
+
+void
+SDL_SYS_SetupThread(const char *name)
+{
+    if (name != NULL) {
+        #if 0 /* !!! FIXME: revisit this later. See https://bugzilla.libsdl.org/show_bug.cgi?id=2089 */
+        #if (defined(_MSC_VER) && defined(_M_IX86))
+        /* This magic tells the debugger to name a thread if it's listening.
+            The inline asm sets up SEH (__try/__except) without C runtime
+            support. See Microsoft Systems Journal, January 1997:
+            http://www.microsoft.com/msj/0197/exception/exception.aspx */
+        INT_PTR handler = (INT_PTR) ignore_exception;
+        THREADNAME_INFO inf;
+
+        inf.dwType = 0x1000;
+        inf.szName = name;
+        inf.dwThreadID = (DWORD) -1;
+        inf.dwFlags = 0;
+
+        __asm {   /* set up SEH */
+            push handler
+            push fs:[0]
+            mov fs:[0],esp
+        }
+
+        /* The program itself should ignore this bogus exception. */
+        RaiseException(0x406D1388, 0, sizeof(inf)/sizeof(DWORD), (DWORD*)&inf);
+
+        __asm {  /* tear down SEH. */
+            mov eax,[esp]
+            mov fs:[0], eax
+            add esp, 8
+        }
+        #endif
+        #endif
+    }
+}
+
+SDL_threadID
+SDL_ThreadID(void)
+{
+    return ((SDL_threadID) GetCurrentThreadId());
+}
+
+int
+SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
+{
+    int value;
+
+    if (priority == SDL_THREAD_PRIORITY_LOW) {
+        value = THREAD_PRIORITY_LOWEST;
+    } else if (priority == SDL_THREAD_PRIORITY_HIGH) {
+        value = THREAD_PRIORITY_HIGHEST;
+    } else {
+        value = THREAD_PRIORITY_NORMAL;
+    }
+    if (!SetThreadPriority(GetCurrentThread(), value)) {
+        return WIN_SetError("SetThreadPriority()");
+    }
+    return 0;
+}
+
+void
+SDL_SYS_WaitThread(SDL_Thread * thread)
+{
+    WaitForSingleObject(thread->handle, INFINITE);
+    CloseHandle(thread->handle);
+}
+
+void
+SDL_SYS_DetachThread(SDL_Thread * thread)
+{
+    CloseHandle(thread->handle);
+}
+
+#endif /* SDL_THREAD_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/windows/SDL_systhread_c.h b/Source/3rd Party/sdl/src/thread/windows/SDL_systhread_c.h
new file mode 100644
index 000000000..f3c78e99a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/windows/SDL_systhread_c.h	
@@ -0,0 +1,32 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_systhread_c_h
+#define _SDL_systhread_c_h
+
+#include "../../core/windows/SDL_windows.h"
+
+typedef HANDLE SYS_ThreadHandle;
+
+#endif /* _SDL_systhread_c_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/thread/windows/SDL_systls.c b/Source/3rd Party/sdl/src/thread/windows/SDL_systls.c
new file mode 100644
index 000000000..6ceadaa12
--- /dev/null
+++ b/Source/3rd Party/sdl/src/thread/windows/SDL_systls.c	
@@ -0,0 +1,72 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_THREAD_WINDOWS
+
+#include "../../core/windows/SDL_windows.h"
+
+#include "SDL_thread.h"
+#include "../SDL_thread_c.h"
+
+static DWORD thread_local_storage = TLS_OUT_OF_INDEXES;
+static SDL_bool generic_local_storage = SDL_FALSE;
+
+SDL_TLSData *
+SDL_SYS_GetTLSData()
+{
+    if (thread_local_storage == TLS_OUT_OF_INDEXES && !generic_local_storage) {
+        static SDL_SpinLock lock;
+        SDL_AtomicLock(&lock);
+        if (thread_local_storage == TLS_OUT_OF_INDEXES && !generic_local_storage) {
+            DWORD storage = TlsAlloc();
+            if (storage != TLS_OUT_OF_INDEXES) {
+                SDL_MemoryBarrierRelease();
+                thread_local_storage = storage;
+            } else {
+                generic_local_storage = SDL_TRUE;
+            }
+        }
+        SDL_AtomicUnlock(&lock);
+    }
+    if (generic_local_storage) {
+        return SDL_Generic_GetTLSData();
+    }
+    SDL_MemoryBarrierAcquire();
+    return (SDL_TLSData *)TlsGetValue(thread_local_storage);
+}
+
+int
+SDL_SYS_SetTLSData(SDL_TLSData *data)
+{
+    if (generic_local_storage) {
+        return SDL_Generic_SetTLSData(data);
+    }
+    if (!TlsSetValue(thread_local_storage, data)) {
+        return SDL_SetError("TlsSetValue() failed");
+    }
+    return 0;
+}
+
+#endif /* SDL_THREAD_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/timer/SDL_timer.c b/Source/3rd Party/sdl/src/timer/SDL_timer.c
new file mode 100644
index 000000000..3ec1291b5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/timer/SDL_timer.c	
@@ -0,0 +1,389 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_timer.h"
+#include "SDL_timer_c.h"
+#include "SDL_atomic.h"
+#include "SDL_cpuinfo.h"
+#include "SDL_thread.h"
+
+/* #define DEBUG_TIMERS */
+
+typedef struct _SDL_Timer
+{
+    int timerID;
+    SDL_TimerCallback callback;
+    void *param;
+    Uint32 interval;
+    Uint32 scheduled;
+    volatile SDL_bool canceled;
+    struct _SDL_Timer *next;
+} SDL_Timer;
+
+typedef struct _SDL_TimerMap
+{
+    int timerID;
+    SDL_Timer *timer;
+    struct _SDL_TimerMap *next;
+} SDL_TimerMap;
+
+/* The timers are kept in a sorted list */
+typedef struct {
+    /* Data used by the main thread */
+    SDL_Thread *thread;
+    SDL_atomic_t nextID;
+    SDL_TimerMap *timermap;
+    SDL_mutex *timermap_lock;
+
+    /* Padding to separate cache lines between threads */
+    char cache_pad[SDL_CACHELINE_SIZE];
+
+    /* Data used to communicate with the timer thread */
+    SDL_SpinLock lock;
+    SDL_sem *sem;
+    SDL_Timer * volatile pending;
+    SDL_Timer * volatile freelist;
+    volatile SDL_bool active;
+
+    /* List of timers - this is only touched by the timer thread */
+    SDL_Timer *timers;
+} SDL_TimerData;
+
+static SDL_TimerData SDL_timer_data;
+
+/* The idea here is that any thread might add a timer, but a single
+ * thread manages the active timer queue, sorted by scheduling time.
+ *
+ * Timers are removed by simply setting a canceled flag
+ */
+
+static void
+SDL_AddTimerInternal(SDL_TimerData *data, SDL_Timer *timer)
+{
+    SDL_Timer *prev, *curr;
+
+    prev = NULL;
+    for (curr = data->timers; curr; prev = curr, curr = curr->next) {
+        if ((Sint32)(timer->scheduled-curr->scheduled) < 0) {
+            break;
+        }
+    }
+
+    /* Insert the timer here! */
+    if (prev) {
+        prev->next = timer;
+    } else {
+        data->timers = timer;
+    }
+    timer->next = curr;
+}
+
+static int
+SDL_TimerThread(void *_data)
+{
+    SDL_TimerData *data = (SDL_TimerData *)_data;
+    SDL_Timer *pending;
+    SDL_Timer *current;
+    SDL_Timer *freelist_head = NULL;
+    SDL_Timer *freelist_tail = NULL;
+    Uint32 tick, now, interval, delay;
+
+    /* Threaded timer loop:
+     *  1. Queue timers added by other threads
+     *  2. Handle any timers that should dispatch this cycle
+     *  3. Wait until next dispatch time or new timer arrives
+     */
+    for ( ; ; ) {
+        /* Pending and freelist maintenance */
+        SDL_AtomicLock(&data->lock);
+        {
+            /* Get any timers ready to be queued */
+            pending = data->pending;
+            data->pending = NULL;
+
+            /* Make any unused timer structures available */
+            if (freelist_head) {
+                freelist_tail->next = data->freelist;
+                data->freelist = freelist_head;
+            }
+        }
+        SDL_AtomicUnlock(&data->lock);
+
+        /* Sort the pending timers into our list */
+        while (pending) {
+            current = pending;
+            pending = pending->next;
+            SDL_AddTimerInternal(data, current);
+        }
+        freelist_head = NULL;
+        freelist_tail = NULL;
+
+        /* Check to see if we're still running, after maintenance */
+        if (!data->active) {
+            break;
+        }
+
+        /* Initial delay if there are no timers */
+        delay = SDL_MUTEX_MAXWAIT;
+
+        tick = SDL_GetTicks();
+
+        /* Process all the pending timers for this tick */
+        while (data->timers) {
+            current = data->timers;
+
+            if ((Sint32)(tick-current->scheduled) < 0) {
+                /* Scheduled for the future, wait a bit */
+                delay = (current->scheduled - tick);
+                break;
+            }
+
+            /* We're going to do something with this timer */
+            data->timers = current->next;
+
+            if (current->canceled) {
+                interval = 0;
+            } else {
+                interval = current->callback(current->interval, current->param);
+            }
+
+            if (interval > 0) {
+                /* Reschedule this timer */
+                current->scheduled = tick + interval;
+                SDL_AddTimerInternal(data, current);
+            } else {
+                if (!freelist_head) {
+                    freelist_head = current;
+                }
+                if (freelist_tail) {
+                    freelist_tail->next = current;
+                }
+                freelist_tail = current;
+
+                current->canceled = SDL_TRUE;
+            }
+        }
+
+        /* Adjust the delay based on processing time */
+        now = SDL_GetTicks();
+        interval = (now - tick);
+        if (interval > delay) {
+            delay = 0;
+        } else {
+            delay -= interval;
+        }
+
+        /* Note that each time a timer is added, this will return
+           immediately, but we process the timers added all at once.
+           That's okay, it just means we run through the loop a few
+           extra times.
+         */
+        SDL_SemWaitTimeout(data->sem, delay);
+    }
+    return 0;
+}
+
+int
+SDL_TimerInit(void)
+{
+    SDL_TimerData *data = &SDL_timer_data;
+
+    if (!data->active) {
+        const char *name = "SDLTimer";
+        data->timermap_lock = SDL_CreateMutex();
+        if (!data->timermap_lock) {
+            return -1;
+        }
+
+        data->sem = SDL_CreateSemaphore(0);
+        if (!data->sem) {
+            SDL_DestroyMutex(data->timermap_lock);
+            return -1;
+        }
+
+        data->active = SDL_TRUE;
+        /* !!! FIXME: this is nasty. */
+#if defined(__WIN32__) && !defined(HAVE_LIBC)
+#undef SDL_CreateThread
+#if SDL_DYNAMIC_API
+        data->thread = SDL_CreateThread_REAL(SDL_TimerThread, name, data, NULL, NULL);
+#else
+        data->thread = SDL_CreateThread(SDL_TimerThread, name, data, NULL, NULL);
+#endif
+#else
+        data->thread = SDL_CreateThread(SDL_TimerThread, name, data);
+#endif
+        if (!data->thread) {
+            SDL_TimerQuit();
+            return -1;
+        }
+
+        SDL_AtomicSet(&data->nextID, 1);
+    }
+    return 0;
+}
+
+void
+SDL_TimerQuit(void)
+{
+    SDL_TimerData *data = &SDL_timer_data;
+    SDL_Timer *timer;
+    SDL_TimerMap *entry;
+
+    if (data->active) {
+        data->active = SDL_FALSE;
+
+        /* Shutdown the timer thread */
+        if (data->thread) {
+            SDL_SemPost(data->sem);
+            SDL_WaitThread(data->thread, NULL);
+            data->thread = NULL;
+        }
+
+        SDL_DestroySemaphore(data->sem);
+        data->sem = NULL;
+
+        /* Clean up the timer entries */
+        while (data->timers) {
+            timer = data->timers;
+            data->timers = timer->next;
+            SDL_free(timer);
+        }
+        while (data->freelist) {
+            timer = data->freelist;
+            data->freelist = timer->next;
+            SDL_free(timer);
+        }
+        while (data->timermap) {
+            entry = data->timermap;
+            data->timermap = entry->next;
+            SDL_free(entry);
+        }
+
+        SDL_DestroyMutex(data->timermap_lock);
+        data->timermap_lock = NULL;
+    }
+}
+
+SDL_TimerID
+SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param)
+{
+    SDL_TimerData *data = &SDL_timer_data;
+    SDL_Timer *timer;
+    SDL_TimerMap *entry;
+
+    if (!data->active) {
+        int status = 0;
+
+        SDL_AtomicLock(&data->lock);
+        if (!data->active) {
+            status = SDL_TimerInit();
+        }
+        SDL_AtomicUnlock(&data->lock);
+
+        if (status < 0) {
+            return 0;
+        }
+    }
+
+    SDL_AtomicLock(&data->lock);
+    timer = data->freelist;
+    if (timer) {
+        data->freelist = timer->next;
+    }
+    SDL_AtomicUnlock(&data->lock);
+
+    if (timer) {
+        SDL_RemoveTimer(timer->timerID);
+    } else {
+        timer = (SDL_Timer *)SDL_malloc(sizeof(*timer));
+        if (!timer) {
+            SDL_OutOfMemory();
+            return 0;
+        }
+    }
+    timer->timerID = SDL_AtomicIncRef(&data->nextID);
+    timer->callback = callback;
+    timer->param = param;
+    timer->interval = interval;
+    timer->scheduled = SDL_GetTicks() + interval;
+    timer->canceled = SDL_FALSE;
+
+    entry = (SDL_TimerMap *)SDL_malloc(sizeof(*entry));
+    if (!entry) {
+        SDL_free(timer);
+        SDL_OutOfMemory();
+        return 0;
+    }
+    entry->timer = timer;
+    entry->timerID = timer->timerID;
+
+    SDL_LockMutex(data->timermap_lock);
+    entry->next = data->timermap;
+    data->timermap = entry;
+    SDL_UnlockMutex(data->timermap_lock);
+
+    /* Add the timer to the pending list for the timer thread */
+    SDL_AtomicLock(&data->lock);
+    timer->next = data->pending;
+    data->pending = timer;
+    SDL_AtomicUnlock(&data->lock);
+
+    /* Wake up the timer thread if necessary */
+    SDL_SemPost(data->sem);
+
+    return entry->timerID;
+}
+
+SDL_bool
+SDL_RemoveTimer(SDL_TimerID id)
+{
+    SDL_TimerData *data = &SDL_timer_data;
+    SDL_TimerMap *prev, *entry;
+    SDL_bool canceled = SDL_FALSE;
+
+    /* Find the timer */
+    SDL_LockMutex(data->timermap_lock);
+    prev = NULL;
+    for (entry = data->timermap; entry; prev = entry, entry = entry->next) {
+        if (entry->timerID == id) {
+            if (prev) {
+                prev->next = entry->next;
+            } else {
+                data->timermap = entry->next;
+            }
+            break;
+        }
+    }
+    SDL_UnlockMutex(data->timermap_lock);
+
+    if (entry) {
+        if (!entry->timer->canceled) {
+            entry->timer->canceled = SDL_TRUE;
+            canceled = SDL_TRUE;
+        }
+        SDL_free(entry);
+    }
+    return canceled;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/timer/SDL_timer_c.h b/Source/3rd Party/sdl/src/timer/SDL_timer_c.h
new file mode 100644
index 000000000..8d563cff8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/timer/SDL_timer_c.h	
@@ -0,0 +1,34 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Useful functions and variables from SDL_timer.c */
+#include "SDL_timer.h"
+
+#define ROUND_RESOLUTION(X) \
+    (((X+TIMER_RESOLUTION-1)/TIMER_RESOLUTION)*TIMER_RESOLUTION)
+
+extern void SDL_TicksInit(void);
+extern void SDL_TicksQuit(void);
+extern int SDL_TimerInit(void);
+extern void SDL_TimerQuit(void);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/timer/dummy/SDL_systimer.c b/Source/3rd Party/sdl/src/timer/dummy/SDL_systimer.c
new file mode 100644
index 000000000..57899ae95
--- /dev/null
+++ b/Source/3rd Party/sdl/src/timer/dummy/SDL_systimer.c	
@@ -0,0 +1,75 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if defined(SDL_TIMER_DUMMY) || defined(SDL_TIMERS_DISABLED)
+
+#include "SDL_timer.h"
+
+static SDL_bool ticks_started = SDL_FALSE;
+
+void
+SDL_TicksInit(void)
+{
+    if (ticks_started) {
+        return;
+    }
+    ticks_started = SDL_TRUE;
+}
+
+void
+SDL_TicksQuit(void)
+{
+    ticks_started = SDL_FALSE;
+}
+
+Uint32
+SDL_GetTicks(void)
+{
+    if (!ticks_started) {
+        SDL_TicksInit();
+    }
+
+    SDL_Unsupported();
+    return 0;
+}
+
+Uint64
+SDL_GetPerformanceCounter(void)
+{
+    return SDL_GetTicks();
+}
+
+Uint64
+SDL_GetPerformanceFrequency(void)
+{
+    return 1000;
+}
+
+void
+SDL_Delay(Uint32 ms)
+{
+    SDL_Unsupported();
+}
+
+#endif /* SDL_TIMER_DUMMY || SDL_TIMERS_DISABLED */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/timer/haiku/SDL_systimer.c b/Source/3rd Party/sdl/src/timer/haiku/SDL_systimer.c
new file mode 100644
index 000000000..685f72a82
--- /dev/null
+++ b/Source/3rd Party/sdl/src/timer/haiku/SDL_systimer.c	
@@ -0,0 +1,80 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_TIMER_HAIKU
+
+#include <os/kernel/OS.h>
+
+#include "SDL_timer.h"
+
+static bigtime_t start;
+static SDL_bool ticks_started = SDL_FALSE;
+
+void
+SDL_TicksInit(void)
+{
+    if (ticks_started) {
+        return;
+    }
+    ticks_started = SDL_TRUE;
+
+    /* Set first ticks value */
+    start = system_time();
+}
+
+void
+SDL_TicksQuit(void)
+{
+    ticks_started = SDL_FALSE;
+}
+
+Uint32
+SDL_GetTicks(void)
+{
+    if (!ticks_started) {
+        SDL_TicksInit();
+    }
+
+    return ((system_time() - start) / 1000);
+}
+
+Uint64
+SDL_GetPerformanceCounter(void)
+{
+    return system_time();
+}
+
+Uint64
+SDL_GetPerformanceFrequency(void)
+{
+    return 1000000;
+}
+
+void
+SDL_Delay(Uint32 ms)
+{
+    snooze(ms * 1000);
+}
+
+#endif /* SDL_TIMER_HAIKU */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/timer/psp/SDL_systimer.c b/Source/3rd Party/sdl/src/timer/psp/SDL_systimer.c
new file mode 100644
index 000000000..b706f4495
--- /dev/null
+++ b/Source/3rd Party/sdl/src/timer/psp/SDL_systimer.c	
@@ -0,0 +1,86 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_thread.h"
+#include "SDL_timer.h"
+#include "SDL_error.h"
+#include "../SDL_timer_c.h"
+#include <stdlib.h>
+#include <time.h>
+#include <sys/time.h>
+#include <pspthreadman.h>
+
+static struct timeval start;
+static SDL_bool ticks_started = SDL_FALSE;
+
+void
+SDL_TicksInit(void)
+{
+    if (ticks_started) {
+        return;
+    }
+    ticks_started = SDL_TRUE;
+
+    gettimeofday(&start, NULL);
+}
+
+void
+SDL_TicksQuit(void)
+{
+    ticks_started = SDL_FALSE;
+}
+
+Uint32 SDL_GetTicks(void)
+{
+    if (!ticks_started) {
+        SDL_TicksInit();
+    }
+
+    struct timeval now;
+    Uint32 ticks;
+
+    gettimeofday(&now, NULL);
+    ticks=(now.tv_sec-start.tv_sec)*1000+(now.tv_usec-start.tv_usec)/1000;
+    return(ticks);
+}
+
+Uint64
+SDL_GetPerformanceCounter(void)
+{
+    return SDL_GetTicks();
+}
+
+Uint64
+SDL_GetPerformanceFrequency(void)
+{
+    return 1000;
+}
+
+void SDL_Delay(Uint32 ms)
+{
+    const Uint32 max_delay = 0xffffffffUL / 1000;
+    if(ms > max_delay)
+        ms = max_delay;
+    sceKernelDelayThreadCB(ms * 1000);
+}
+
+/* vim: ts=4 sw=4
+ */
diff --git a/Source/3rd Party/sdl/src/timer/unix/SDL_systimer.c b/Source/3rd Party/sdl/src/timer/unix/SDL_systimer.c
new file mode 100644
index 000000000..0f4c7571e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/timer/unix/SDL_systimer.c	
@@ -0,0 +1,217 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_TIMER_UNIX
+
+#include <stdio.h>
+#include <sys/time.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "SDL_timer.h"
+
+/* The clock_gettime provides monotonous time, so we should use it if
+   it's available. The clock_gettime function is behind ifdef
+   for __USE_POSIX199309
+   Tommi Kyntola (tommi.kyntola@ray.fi) 27/09/2005
+*/
+/* Reworked monotonic clock to not assume the current system has one
+   as not all linux kernels provide a monotonic clock (yeah recent ones
+   probably do)
+   Also added OS X Monotonic clock support
+   Based on work in https://github.com/ThomasHabets/monotonic_clock
+ */
+#if HAVE_NANOSLEEP || HAVE_CLOCK_GETTIME
+#include <time.h>
+#endif
+#ifdef __APPLE__
+#include <mach/mach_time.h>
+#endif
+
+/* The first ticks value of the application */
+#if HAVE_CLOCK_GETTIME
+static struct timespec start_ts;
+#elif defined(__APPLE__)
+static uint64_t start_mach;
+mach_timebase_info_data_t mach_base_info;
+#endif
+static SDL_bool has_monotonic_time = SDL_FALSE;
+static struct timeval start_tv;
+static SDL_bool ticks_started = SDL_FALSE;
+
+void
+SDL_TicksInit(void)
+{
+    if (ticks_started) {
+        return;
+    }
+    ticks_started = SDL_TRUE;
+
+    /* Set first ticks value */
+#if HAVE_CLOCK_GETTIME
+    if (clock_gettime(CLOCK_MONOTONIC, &start_ts) == 0) {
+        has_monotonic_time = SDL_TRUE;
+    } else
+#elif defined(__APPLE__)
+    kern_return_t ret = mach_timebase_info(&mach_base_info);
+    if (ret == 0) {
+        has_monotonic_time = SDL_TRUE;
+        start_mach = mach_absolute_time();
+    } else
+#endif
+    {
+        gettimeofday(&start_tv, NULL);
+    }
+}
+
+void
+SDL_TicksQuit(void)
+{
+    ticks_started = SDL_FALSE;
+}
+
+Uint32
+SDL_GetTicks(void)
+{
+    Uint32 ticks;
+    if (!ticks_started) {
+        SDL_TicksInit();
+    }
+
+    if (has_monotonic_time) {
+#if HAVE_CLOCK_GETTIME
+        struct timespec now;
+        clock_gettime(CLOCK_MONOTONIC, &now);
+        ticks = (now.tv_sec - start_ts.tv_sec) * 1000 + (now.tv_nsec -
+                                                 start_ts.tv_nsec) / 1000000;
+#elif defined(__APPLE__)
+        uint64_t now = mach_absolute_time();
+        ticks = (((now - start_mach) * mach_base_info.numer) / mach_base_info.denom) / 1000000;
+#endif
+    } else {
+        struct timeval now;
+
+        gettimeofday(&now, NULL);
+        ticks =
+            (now.tv_sec - start_tv.tv_sec) * 1000 + (now.tv_usec -
+                                                  start_tv.tv_usec) / 1000;
+    }
+    return (ticks);
+}
+
+Uint64
+SDL_GetPerformanceCounter(void)
+{
+    Uint64 ticks;
+    if (!ticks_started) {
+        SDL_TicksInit();
+    }
+
+    if (has_monotonic_time) {
+#if HAVE_CLOCK_GETTIME
+        struct timespec now;
+
+        clock_gettime(CLOCK_MONOTONIC, &now);
+        ticks = now.tv_sec;
+        ticks *= 1000000000;
+        ticks += now.tv_nsec;
+#elif defined(__APPLE__)
+        ticks = mach_absolute_time();
+#endif
+    } else {
+        struct timeval now;
+
+        gettimeofday(&now, NULL);
+        ticks = now.tv_sec;
+        ticks *= 1000000;
+        ticks += now.tv_usec;
+    }
+    return (ticks);
+}
+
+Uint64
+SDL_GetPerformanceFrequency(void)
+{
+    if (!ticks_started) {
+        SDL_TicksInit();
+    }
+
+    if (has_monotonic_time) {
+#if HAVE_CLOCK_GETTIME
+        return 1000000000;
+#elif defined(__APPLE__)
+        Uint64 freq = mach_base_info.denom;
+        freq *= 1000000000;
+        freq /= mach_base_info.numer;
+        return freq;
+#endif
+    } 
+        
+    return 1000000;
+}
+
+void
+SDL_Delay(Uint32 ms)
+{
+    int was_error;
+
+#if HAVE_NANOSLEEP
+    struct timespec elapsed, tv;
+#else
+    struct timeval tv;
+    Uint32 then, now, elapsed;
+#endif
+
+    /* Set the timeout interval */
+#if HAVE_NANOSLEEP
+    elapsed.tv_sec = ms / 1000;
+    elapsed.tv_nsec = (ms % 1000) * 1000000;
+#else
+    then = SDL_GetTicks();
+#endif
+    do {
+        errno = 0;
+
+#if HAVE_NANOSLEEP
+        tv.tv_sec = elapsed.tv_sec;
+        tv.tv_nsec = elapsed.tv_nsec;
+        was_error = nanosleep(&tv, &elapsed);
+#else
+        /* Calculate the time interval left (in case of interrupt) */
+        now = SDL_GetTicks();
+        elapsed = (now - then);
+        then = now;
+        if (elapsed >= ms) {
+            break;
+        }
+        ms -= elapsed;
+        tv.tv_sec = ms / 1000;
+        tv.tv_usec = (ms % 1000) * 1000;
+
+        was_error = select(0, NULL, NULL, NULL, &tv);
+#endif /* HAVE_NANOSLEEP */
+    } while (was_error && (errno == EINTR));
+}
+
+#endif /* SDL_TIMER_UNIX */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/timer/windows/SDL_systimer.c b/Source/3rd Party/sdl/src/timer/windows/SDL_systimer.c
new file mode 100644
index 000000000..07561636a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/timer/windows/SDL_systimer.c	
@@ -0,0 +1,210 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifdef SDL_TIMER_WINDOWS
+
+#include "../../core/windows/SDL_windows.h"
+#include <mmsystem.h>
+
+#include "SDL_timer.h"
+#include "SDL_hints.h"
+
+
+/* The first (low-resolution) ticks value of the application */
+static DWORD start;
+static BOOL ticks_started = FALSE; 
+
+#ifndef USE_GETTICKCOUNT
+/* Store if a high-resolution performance counter exists on the system */
+static BOOL hires_timer_available;
+/* The first high-resolution ticks value of the application */
+static LARGE_INTEGER hires_start_ticks;
+/* The number of ticks per second of the high-resolution performance counter */
+static LARGE_INTEGER hires_ticks_per_second;
+
+#ifndef __WINRT__
+static void
+timeSetPeriod(UINT uPeriod)
+{
+    static UINT timer_period = 0;
+
+    if (uPeriod != timer_period) {
+        if (timer_period) {
+            timeEndPeriod(timer_period);
+        }
+
+        timer_period = uPeriod;
+
+        if (timer_period) {
+            timeBeginPeriod(timer_period);
+        }
+    }
+}
+
+static void
+SDL_TimerResolutionChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
+{
+    UINT uPeriod;
+
+    /* Unless the hint says otherwise, let's have good sleep precision */
+    if (hint && *hint) {
+        uPeriod = SDL_atoi(hint);
+    } else {
+        uPeriod = 1;
+    }
+    if (uPeriod || oldValue != hint) {
+        timeSetPeriod(uPeriod);
+    }
+}
+#endif /* ifndef __WINRT__ */
+
+#endif /* !USE_GETTICKCOUNT */
+
+void
+SDL_TicksInit(void)
+{
+    if (ticks_started) {
+        return;
+    }
+    ticks_started = SDL_TRUE;
+
+    /* Set first ticks value */
+#ifdef USE_GETTICKCOUNT
+    start = GetTickCount();
+#else
+    /* QueryPerformanceCounter has had problems in the past, but lots of games
+       use it, so we'll rely on it here.
+     */
+    if (QueryPerformanceFrequency(&hires_ticks_per_second) == TRUE) {
+        hires_timer_available = TRUE;
+        QueryPerformanceCounter(&hires_start_ticks);
+    } else {
+        hires_timer_available = FALSE;
+#ifdef __WINRT__
+        start = 0;            /* the timer failed to start! */
+#else
+        timeSetPeriod(1);     /* use 1 ms timer precision */
+        start = timeGetTime();
+
+        SDL_AddHintCallback(SDL_HINT_TIMER_RESOLUTION,
+                            SDL_TimerResolutionChanged, NULL);
+#endif /* __WINRT__ */
+    }
+#endif /* USE_GETTICKCOUNT */
+}
+
+void
+SDL_TicksQuit(void)
+{
+#ifndef USE_GETTICKCOUNT
+    if (!hires_timer_available) {
+#ifndef __WINRT__
+        SDL_DelHintCallback(SDL_HINT_TIMER_RESOLUTION,
+                            SDL_TimerResolutionChanged, NULL);
+
+        timeSetPeriod(0);
+#endif /* __WINRT__ */
+    }
+#endif /* USE_GETTICKCOUNT */
+
+    ticks_started = SDL_FALSE;
+}
+
+Uint32
+SDL_GetTicks(void)
+{
+    DWORD now;
+#ifndef USE_GETTICKCOUNT
+    LARGE_INTEGER hires_now;
+#endif
+
+    if (!ticks_started) {
+        SDL_TicksInit();
+    }
+
+#ifdef USE_GETTICKCOUNT
+    now = GetTickCount();
+#else
+    if (hires_timer_available) {
+        QueryPerformanceCounter(&hires_now);
+
+        hires_now.QuadPart -= hires_start_ticks.QuadPart;
+        hires_now.QuadPart *= 1000;
+        hires_now.QuadPart /= hires_ticks_per_second.QuadPart;
+
+        return (DWORD) hires_now.QuadPart;
+    } else {
+#ifdef __WINRT__
+        now = 0;
+#else
+        now = timeGetTime();
+#endif /* __WINRT__ */
+    }
+#endif
+
+    return (now - start);
+}
+
+Uint64
+SDL_GetPerformanceCounter(void)
+{
+    LARGE_INTEGER counter;
+
+    if (!QueryPerformanceCounter(&counter)) {
+        return SDL_GetTicks();
+    }
+    return counter.QuadPart;
+}
+
+Uint64
+SDL_GetPerformanceFrequency(void)
+{
+    LARGE_INTEGER frequency;
+
+    if (!QueryPerformanceFrequency(&frequency)) {
+        return 1000;
+    }
+    return frequency.QuadPart;
+}
+
+#ifdef __WINRT__
+static void
+Sleep(DWORD timeout)
+{
+    static HANDLE mutex = 0;
+    if ( ! mutex )
+    {
+        mutex = CreateEventEx(0, 0, 0, EVENT_ALL_ACCESS);
+    }
+    WaitForSingleObjectEx(mutex, timeout, FALSE);
+}
+#endif
+
+void
+SDL_Delay(Uint32 ms)
+{
+    Sleep(ms);
+}
+
+#endif /* SDL_TIMER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_RLEaccel.c b/Source/3rd Party/sdl/src/video/SDL_RLEaccel.c
new file mode 100644
index 000000000..a464dec39
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_RLEaccel.c	
@@ -0,0 +1,1566 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/*
+ * RLE encoding for software colorkey and alpha-channel acceleration
+ *
+ * Original version by Sam Lantinga
+ *
+ * Mattias Engdeg�rd (Yorick): Rewrite. New encoding format, encoder and
+ * decoder. Added per-surface alpha blitter. Added per-pixel alpha
+ * format, encoder and blitter.
+ *
+ * Many thanks to Xark and johns for hints, benchmarks and useful comments
+ * leading to this code.
+ *
+ * Welcome to Macro Mayhem.
+ */
+
+/*
+ * The encoding translates the image data to a stream of segments of the form
+ *
+ * <skip> <run> <data>
+ *
+ * where <skip> is the number of transparent pixels to skip,
+ *       <run>  is the number of opaque pixels to blit,
+ * and   <data> are the pixels themselves.
+ *
+ * This basic structure is used both for colorkeyed surfaces, used for simple
+ * binary transparency and for per-surface alpha blending, and for surfaces
+ * with per-pixel alpha. The details differ, however:
+ *
+ * Encoding of colorkeyed surfaces:
+ *
+ *   Encoded pixels always have the same format as the target surface.
+ *   <skip> and <run> are unsigned 8 bit integers, except for 32 bit depth
+ *   where they are 16 bit. This makes the pixel data aligned at all times.
+ *   Segments never wrap around from one scan line to the next.
+ *
+ *   The end of the sequence is marked by a zero <skip>,<run> pair at the *
+ *   beginning of a line.
+ *
+ * Encoding of surfaces with per-pixel alpha:
+ *
+ *   The sequence begins with a struct RLEDestFormat describing the target
+ *   pixel format, to provide reliable un-encoding.
+ *
+ *   Each scan line is encoded twice: First all completely opaque pixels,
+ *   encoded in the target format as described above, and then all
+ *   partially transparent (translucent) pixels (where 1 <= alpha <= 254),
+ *   in the following 32-bit format:
+ *
+ *   For 32-bit targets, each pixel has the target RGB format but with
+ *   the alpha value occupying the highest 8 bits. The <skip> and <run>
+ *   counts are 16 bit.
+ *
+ *   For 16-bit targets, each pixel has the target RGB format, but with
+ *   the middle component (usually green) shifted 16 steps to the left,
+ *   and the hole filled with the 5 most significant bits of the alpha value.
+ *   i.e. if the target has the format         rrrrrggggggbbbbb,
+ *   the encoded pixel will be 00000gggggg00000rrrrr0aaaaabbbbb.
+ *   The <skip> and <run> counts are 8 bit for the opaque lines, 16 bit
+ *   for the translucent lines. Two padding bytes may be inserted
+ *   before each translucent line to keep them 32-bit aligned.
+ *
+ *   The end of the sequence is marked by a zero <skip>,<run> pair at the
+ *   beginning of an opaque line.
+ */
+
+#include "SDL_video.h"
+#include "SDL_sysvideo.h"
+#include "SDL_blit.h"
+#include "SDL_RLEaccel_c.h"
+
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#define PIXEL_COPY(to, from, len, bpp)          \
+    SDL_memcpy(to, from, (size_t)(len) * (bpp))
+
+/*
+ * Various colorkey blit methods, for opaque and per-surface alpha
+ */
+
+#define OPAQUE_BLIT(to, from, length, bpp, alpha)   \
+    PIXEL_COPY(to, from, length, bpp)
+
+/*
+ * For 32bpp pixels on the form 0x00rrggbb:
+ * If we treat the middle component separately, we can process the two
+ * remaining in parallel. This is safe to do because of the gap to the left
+ * of each component, so the bits from the multiplication don't collide.
+ * This can be used for any RGB permutation of course.
+ */
+#define ALPHA_BLIT32_888(to, from, length, bpp, alpha)      \
+    do {                            \
+        int i;                          \
+    Uint32 *src = (Uint32 *)(from);             \
+    Uint32 *dst = (Uint32 *)(to);               \
+    for(i = 0; i < (int)(length); i++) {            \
+        Uint32 s = *src++;                  \
+        Uint32 d = *dst;                    \
+        Uint32 s1 = s & 0xff00ff;               \
+        Uint32 d1 = d & 0xff00ff;               \
+        d1 = (d1 + ((s1 - d1) * alpha >> 8)) & 0xff00ff;    \
+        s &= 0xff00;                    \
+        d &= 0xff00;                    \
+        d = (d + ((s - d) * alpha >> 8)) & 0xff00;      \
+        *dst++ = d1 | d;                    \
+    }                           \
+    } while(0)
+
+/*
+ * For 16bpp pixels we can go a step further: put the middle component
+ * in the high 16 bits of a 32 bit word, and process all three RGB
+ * components at the same time. Since the smallest gap is here just
+ * 5 bits, we have to scale alpha down to 5 bits as well.
+ */
+#define ALPHA_BLIT16_565(to, from, length, bpp, alpha)  \
+    do {                        \
+        int i;                      \
+    Uint16 *src = (Uint16 *)(from);         \
+    Uint16 *dst = (Uint16 *)(to);           \
+    Uint32 ALPHA = alpha >> 3;          \
+    for(i = 0; i < (int)(length); i++) {        \
+        Uint32 s = *src++;              \
+        Uint32 d = *dst;                \
+        s = (s | s << 16) & 0x07e0f81f;     \
+        d = (d | d << 16) & 0x07e0f81f;     \
+        d += (s - d) * ALPHA >> 5;          \
+        d &= 0x07e0f81f;                \
+        *dst++ = (Uint16)(d | d >> 16);         \
+    }                       \
+    } while(0)
+
+#define ALPHA_BLIT16_555(to, from, length, bpp, alpha)  \
+    do {                        \
+        int i;                      \
+    Uint16 *src = (Uint16 *)(from);         \
+    Uint16 *dst = (Uint16 *)(to);           \
+    Uint32 ALPHA = alpha >> 3;          \
+    for(i = 0; i < (int)(length); i++) {        \
+        Uint32 s = *src++;              \
+        Uint32 d = *dst;                \
+        s = (s | s << 16) & 0x03e07c1f;     \
+        d = (d | d << 16) & 0x03e07c1f;     \
+        d += (s - d) * ALPHA >> 5;          \
+        d &= 0x03e07c1f;                \
+        *dst++ = (Uint16)(d | d >> 16);         \
+    }                       \
+    } while(0)
+
+/*
+ * The general slow catch-all function, for remaining depths and formats
+ */
+#define ALPHA_BLIT_ANY(to, from, length, bpp, alpha)            \
+    do {                                \
+        int i;                              \
+    Uint8 *src = from;                      \
+    Uint8 *dst = to;                        \
+    for(i = 0; i < (int)(length); i++) {                \
+        Uint32 s, d;                        \
+        unsigned rs, gs, bs, rd, gd, bd;                \
+        switch(bpp) {                       \
+        case 2:                         \
+        s = *(Uint16 *)src;                 \
+        d = *(Uint16 *)dst;                 \
+        break;                          \
+        case 3:                         \
+        if(SDL_BYTEORDER == SDL_BIG_ENDIAN) {           \
+            s = (src[0] << 16) | (src[1] << 8) | src[2];    \
+            d = (dst[0] << 16) | (dst[1] << 8) | dst[2];    \
+        } else {                        \
+            s = (src[2] << 16) | (src[1] << 8) | src[0];    \
+            d = (dst[2] << 16) | (dst[1] << 8) | dst[0];    \
+        }                           \
+        break;                          \
+        case 4:                         \
+        s = *(Uint32 *)src;                 \
+        d = *(Uint32 *)dst;                 \
+        break;                          \
+        }                               \
+        RGB_FROM_PIXEL(s, fmt, rs, gs, bs);             \
+        RGB_FROM_PIXEL(d, fmt, rd, gd, bd);             \
+        rd += (rs - rd) * alpha >> 8;               \
+        gd += (gs - gd) * alpha >> 8;               \
+        bd += (bs - bd) * alpha >> 8;               \
+        PIXEL_FROM_RGB(d, fmt, rd, gd, bd);             \
+        switch(bpp) {                       \
+        case 2:                         \
+        *(Uint16 *)dst = (Uint16)d;                 \
+        break;                          \
+        case 3:                         \
+        if(SDL_BYTEORDER == SDL_BIG_ENDIAN) {           \
+            dst[0] = (Uint8)(d >> 16);                  \
+            dst[1] = (Uint8)(d >> 8);                   \
+            dst[2] = (Uint8)(d);                        \
+        } else {                        \
+            dst[0] = (Uint8)d;                      \
+            dst[1] = (Uint8)(d >> 8);                   \
+            dst[2] = (Uint8)(d >> 16);                  \
+        }                           \
+        break;                          \
+        case 4:                         \
+        *(Uint32 *)dst = d;                 \
+        break;                          \
+        }                               \
+        src += bpp;                         \
+        dst += bpp;                         \
+    }                               \
+    } while(0)
+
+/*
+ * Special case: 50% alpha (alpha=128)
+ * This is treated specially because it can be optimized very well, and
+ * since it is good for many cases of semi-translucency.
+ * The theory is to do all three components at the same time:
+ * First zero the lowest bit of each component, which gives us room to
+ * add them. Then shift right and add the sum of the lowest bits.
+ */
+#define ALPHA_BLIT32_888_50(to, from, length, bpp, alpha)       \
+    do {                                \
+        int i;                              \
+    Uint32 *src = (Uint32 *)(from);                 \
+    Uint32 *dst = (Uint32 *)(to);                   \
+    for(i = 0; i < (int)(length); i++) {                \
+        Uint32 s = *src++;                      \
+        Uint32 d = *dst;                        \
+        *dst++ = (((s & 0x00fefefe) + (d & 0x00fefefe)) >> 1)   \
+             + (s & d & 0x00010101);                \
+    }                               \
+    } while(0)
+
+/*
+ * For 16bpp, we can actually blend two pixels in parallel, if we take
+ * care to shift before we add, not after.
+ */
+
+/* helper: blend a single 16 bit pixel at 50% */
+#define BLEND16_50(dst, src, mask)          \
+    do {                        \
+    Uint32 s = *src++;              \
+    Uint32 d = *dst;                \
+    *dst++ = (Uint16)((((s & mask) + (d & mask)) >> 1) +    \
+                      (s & d & (~mask & 0xffff)));      \
+    } while(0)
+
+/* basic 16bpp blender. mask is the pixels to keep when adding. */
+#define ALPHA_BLIT16_50(to, from, length, bpp, alpha, mask)     \
+    do {                                \
+    unsigned n = (length);                      \
+    Uint16 *src = (Uint16 *)(from);                 \
+    Uint16 *dst = (Uint16 *)(to);                   \
+    if(((uintptr_t)src ^ (uintptr_t)dst) & 3) {         \
+        /* source and destination not in phase, blit one by one */  \
+        while(n--)                          \
+        BLEND16_50(dst, src, mask);             \
+    } else {                            \
+        if((uintptr_t)src & 3) {                    \
+        /* first odd pixel */                   \
+        BLEND16_50(dst, src, mask);             \
+        n--;                            \
+        }                               \
+        for(; n > 1; n -= 2) {                  \
+        Uint32 s = *(Uint32 *)src;              \
+        Uint32 d = *(Uint32 *)dst;              \
+        *(Uint32 *)dst = ((s & (mask | mask << 16)) >> 1)   \
+                       + ((d & (mask | mask << 16)) >> 1)   \
+                       + (s & d & (~(mask | mask << 16)));  \
+        src += 2;                       \
+        dst += 2;                       \
+        }                               \
+        if(n)                           \
+        BLEND16_50(dst, src, mask); /* last odd pixel */    \
+    }                               \
+    } while(0)
+
+#define ALPHA_BLIT16_565_50(to, from, length, bpp, alpha)   \
+    ALPHA_BLIT16_50(to, from, length, bpp, alpha, 0xf7de)
+
+#define ALPHA_BLIT16_555_50(to, from, length, bpp, alpha)   \
+    ALPHA_BLIT16_50(to, from, length, bpp, alpha, 0xfbde)
+
+#define CHOOSE_BLIT(blitter, alpha, fmt)                \
+    do {                                \
+        if(alpha == 255) {                      \
+        switch(fmt->BytesPerPixel) {                \
+        case 1: blitter(1, Uint8, OPAQUE_BLIT); break;      \
+        case 2: blitter(2, Uint8, OPAQUE_BLIT); break;      \
+        case 3: blitter(3, Uint8, OPAQUE_BLIT); break;      \
+        case 4: blitter(4, Uint16, OPAQUE_BLIT); break;     \
+        }                               \
+    } else {                            \
+        switch(fmt->BytesPerPixel) {                \
+        case 1:                         \
+        /* No 8bpp alpha blitting */                \
+        break;                          \
+                                    \
+        case 2:                         \
+        switch(fmt->Rmask | fmt->Gmask | fmt->Bmask) {      \
+        case 0xffff:                        \
+            if(fmt->Gmask == 0x07e0             \
+               || fmt->Rmask == 0x07e0              \
+               || fmt->Bmask == 0x07e0) {           \
+            if(alpha == 128)                \
+                blitter(2, Uint8, ALPHA_BLIT16_565_50); \
+            else {                      \
+                blitter(2, Uint8, ALPHA_BLIT16_565);    \
+            }                       \
+            } else                      \
+            goto general16;                 \
+            break;                      \
+                                    \
+        case 0x7fff:                        \
+            if(fmt->Gmask == 0x03e0             \
+               || fmt->Rmask == 0x03e0              \
+               || fmt->Bmask == 0x03e0) {           \
+            if(alpha == 128)                \
+                blitter(2, Uint8, ALPHA_BLIT16_555_50); \
+            else {                      \
+                blitter(2, Uint8, ALPHA_BLIT16_555);    \
+            }                       \
+            break;                      \
+            }                           \
+            /* fallthrough */                   \
+                                    \
+        default:                        \
+        general16:                      \
+            blitter(2, Uint8, ALPHA_BLIT_ANY);          \
+        }                           \
+        break;                          \
+                                    \
+        case 3:                         \
+        blitter(3, Uint8, ALPHA_BLIT_ANY);          \
+        break;                          \
+                                    \
+        case 4:                         \
+        if((fmt->Rmask | fmt->Gmask | fmt->Bmask) == 0x00ffffff \
+           && (fmt->Gmask == 0xff00 || fmt->Rmask == 0xff00 \
+               || fmt->Bmask == 0xff00)) {          \
+            if(alpha == 128)                    \
+            blitter(4, Uint16, ALPHA_BLIT32_888_50);    \
+            else                        \
+            blitter(4, Uint16, ALPHA_BLIT32_888);       \
+        } else                          \
+            blitter(4, Uint16, ALPHA_BLIT_ANY);         \
+        break;                          \
+        }                               \
+    }                               \
+    } while(0)
+
+/*
+ * This takes care of the case when the surface is clipped on the left and/or
+ * right. Top clipping has already been taken care of.
+ */
+static void
+RLEClipBlit(int w, Uint8 * srcbuf, SDL_Surface * dst,
+            Uint8 * dstbuf, SDL_Rect * srcrect, unsigned alpha)
+{
+    SDL_PixelFormat *fmt = dst->format;
+
+#define RLECLIPBLIT(bpp, Type, do_blit)                    \
+    do {                                   \
+    int linecount = srcrect->h;                    \
+    int ofs = 0;                               \
+    int left = srcrect->x;                         \
+    int right = left + srcrect->w;                     \
+    dstbuf -= left * bpp;                          \
+    for(;;) {                              \
+        int run;                               \
+        ofs += *(Type *)srcbuf;                    \
+        run = ((Type *)srcbuf)[1];                     \
+        srcbuf += 2 * sizeof(Type);                    \
+        if(run) {                              \
+        /* clip to left and right borders */               \
+        if(ofs < right) {                      \
+            int start = 0;                     \
+            int len = run;                     \
+            int startcol;                      \
+            if(left - ofs > 0) {                   \
+            start = left - ofs;                \
+            len -= start;                      \
+            if(len <= 0)                       \
+                goto nocopy ## bpp ## do_blit;         \
+            }                              \
+            startcol = ofs + start;                \
+            if(len > right - startcol)                 \
+            len = right - startcol;                \
+            do_blit(dstbuf + startcol * bpp, srcbuf + start * bpp, \
+                len, bpp, alpha);                  \
+        }                              \
+        nocopy ## bpp ## do_blit:                      \
+        srcbuf += run * bpp;                       \
+        ofs += run;                        \
+        } else if(!ofs)                        \
+        break;                             \
+        if(ofs == w) {                         \
+        ofs = 0;                           \
+        dstbuf += dst->pitch;                      \
+        if(!--linecount)                       \
+            break;                         \
+        }                                  \
+    }                                  \
+    } while(0)
+
+    CHOOSE_BLIT(RLECLIPBLIT, alpha, fmt);
+
+#undef RLECLIPBLIT
+
+}
+
+
+/* blit a colorkeyed RLE surface */
+int
+SDL_RLEBlit(SDL_Surface * src, SDL_Rect * srcrect,
+            SDL_Surface * dst, SDL_Rect * dstrect)
+{
+    Uint8 *dstbuf;
+    Uint8 *srcbuf;
+    int x, y;
+    int w = src->w;
+    unsigned alpha;
+
+    /* Lock the destination if necessary */
+    if (SDL_MUSTLOCK(dst)) {
+        if (SDL_LockSurface(dst) < 0) {
+            return (-1);
+        }
+    }
+
+    /* Set up the source and destination pointers */
+    x = dstrect->x;
+    y = dstrect->y;
+    dstbuf = (Uint8 *) dst->pixels
+        + y * dst->pitch + x * src->format->BytesPerPixel;
+    srcbuf = (Uint8 *) src->map->data;
+
+    {
+        /* skip lines at the top if necessary */
+        int vskip = srcrect->y;
+        int ofs = 0;
+        if (vskip) {
+
+#define RLESKIP(bpp, Type)          \
+        for(;;) {           \
+            int run;            \
+            ofs += *(Type *)srcbuf; \
+            run = ((Type *)srcbuf)[1];  \
+            srcbuf += sizeof(Type) * 2; \
+            if(run) {           \
+            srcbuf += run * bpp;    \
+            ofs += run;     \
+            } else if(!ofs)     \
+            goto done;      \
+            if(ofs == w) {      \
+            ofs = 0;        \
+            if(!--vskip)        \
+                break;      \
+            }               \
+        }
+
+            switch (src->format->BytesPerPixel) {
+            case 1:
+                RLESKIP(1, Uint8);
+                break;
+            case 2:
+                RLESKIP(2, Uint8);
+                break;
+            case 3:
+                RLESKIP(3, Uint8);
+                break;
+            case 4:
+                RLESKIP(4, Uint16);
+                break;
+            }
+
+#undef RLESKIP
+
+        }
+    }
+
+    alpha = src->map->info.a;
+    /* if left or right edge clipping needed, call clip blit */
+    if (srcrect->x || srcrect->w != src->w) {
+        RLEClipBlit(w, srcbuf, dst, dstbuf, srcrect, alpha);
+    } else {
+        SDL_PixelFormat *fmt = src->format;
+
+#define RLEBLIT(bpp, Type, do_blit)                       \
+        do {                                  \
+        int linecount = srcrect->h;                   \
+        int ofs = 0;                              \
+        for(;;) {                             \
+            unsigned run;                         \
+            ofs += *(Type *)srcbuf;                   \
+            run = ((Type *)srcbuf)[1];                    \
+            srcbuf += 2 * sizeof(Type);                   \
+            if(run) {                             \
+            do_blit(dstbuf + ofs * bpp, srcbuf, run, bpp, alpha); \
+            srcbuf += run * bpp;                      \
+            ofs += run;                       \
+            } else if(!ofs)                       \
+            break;                            \
+            if(ofs == w) {                        \
+            ofs = 0;                          \
+            dstbuf += dst->pitch;                     \
+            if(!--linecount)                      \
+                break;                        \
+            }                                 \
+        }                                 \
+        } while(0)
+
+        CHOOSE_BLIT(RLEBLIT, alpha, fmt);
+
+#undef RLEBLIT
+    }
+
+  done:
+    /* Unlock the destination if necessary */
+    if (SDL_MUSTLOCK(dst)) {
+        SDL_UnlockSurface(dst);
+    }
+    return (0);
+}
+
+#undef OPAQUE_BLIT
+
+/*
+ * Per-pixel blitting macros for translucent pixels:
+ * These use the same techniques as the per-surface blitting macros
+ */
+
+/*
+ * For 32bpp pixels, we have made sure the alpha is stored in the top
+ * 8 bits, so proceed as usual
+ */
+#define BLIT_TRANSL_888(src, dst)               \
+    do {                            \
+        Uint32 s = src;                     \
+    Uint32 d = dst;                     \
+    unsigned alpha = s >> 24;               \
+    Uint32 s1 = s & 0xff00ff;               \
+    Uint32 d1 = d & 0xff00ff;               \
+    d1 = (d1 + ((s1 - d1) * alpha >> 8)) & 0xff00ff;    \
+    s &= 0xff00;                        \
+    d &= 0xff00;                        \
+    d = (d + ((s - d) * alpha >> 8)) & 0xff00;      \
+    dst = d1 | d | 0xff000000;              \
+    } while(0)
+
+/*
+ * For 16bpp pixels, we have stored the 5 most significant alpha bits in
+ * bits 5-10. As before, we can process all 3 RGB components at the same time.
+ */
+#define BLIT_TRANSL_565(src, dst)       \
+    do {                    \
+    Uint32 s = src;             \
+    Uint32 d = dst;             \
+    unsigned alpha = (s & 0x3e0) >> 5;  \
+    s &= 0x07e0f81f;            \
+    d = (d | d << 16) & 0x07e0f81f;     \
+    d += (s - d) * alpha >> 5;      \
+    d &= 0x07e0f81f;            \
+    dst = (Uint16)(d | d >> 16);            \
+    } while(0)
+
+#define BLIT_TRANSL_555(src, dst)       \
+    do {                    \
+    Uint32 s = src;             \
+    Uint32 d = dst;             \
+    unsigned alpha = (s & 0x3e0) >> 5;  \
+    s &= 0x03e07c1f;            \
+    d = (d | d << 16) & 0x03e07c1f;     \
+    d += (s - d) * alpha >> 5;      \
+    d &= 0x03e07c1f;            \
+    dst = (Uint16)(d | d >> 16);            \
+    } while(0)
+
+/* used to save the destination format in the encoding. Designed to be
+   macro-compatible with SDL_PixelFormat but without the unneeded fields */
+typedef struct
+{
+    Uint8 BytesPerPixel;
+    Uint8 padding[3];
+    Uint32 Rmask;
+    Uint32 Gmask;
+    Uint32 Bmask;
+    Uint32 Amask;
+    Uint8 Rloss;
+    Uint8 Gloss;
+    Uint8 Bloss;
+    Uint8 Aloss;
+    Uint8 Rshift;
+    Uint8 Gshift;
+    Uint8 Bshift;
+    Uint8 Ashift;
+} RLEDestFormat;
+
+/* blit a pixel-alpha RLE surface clipped at the right and/or left edges */
+static void
+RLEAlphaClipBlit(int w, Uint8 * srcbuf, SDL_Surface * dst,
+                 Uint8 * dstbuf, SDL_Rect * srcrect)
+{
+    SDL_PixelFormat *df = dst->format;
+    /*
+     * clipped blitter: Ptype is the destination pixel type,
+     * Ctype the translucent count type, and do_blend the macro
+     * to blend one pixel.
+     */
+#define RLEALPHACLIPBLIT(Ptype, Ctype, do_blend)              \
+    do {                                  \
+    int linecount = srcrect->h;                   \
+    int left = srcrect->x;                        \
+    int right = left + srcrect->w;                    \
+    dstbuf -= left * sizeof(Ptype);                   \
+    do {                                  \
+        int ofs = 0;                          \
+        /* blit opaque pixels on one line */              \
+        do {                              \
+        unsigned run;                         \
+        ofs += ((Ctype *)srcbuf)[0];                  \
+        run = ((Ctype *)srcbuf)[1];               \
+        srcbuf += 2 * sizeof(Ctype);                  \
+        if(run) {                         \
+            /* clip to left and right borders */          \
+            int cofs = ofs;                   \
+            int crun = run;                   \
+            if(left - cofs > 0) {                 \
+            crun -= left - cofs;                  \
+            cofs = left;                      \
+            }                             \
+            if(crun > right - cofs)               \
+            crun = right - cofs;                  \
+            if(crun > 0)                      \
+            PIXEL_COPY(dstbuf + cofs * sizeof(Ptype),     \
+                   srcbuf + (cofs - ofs) * sizeof(Ptype), \
+                   (unsigned)crun, sizeof(Ptype));    \
+            srcbuf += run * sizeof(Ptype);            \
+            ofs += run;                       \
+        } else if(!ofs)                       \
+            return;                       \
+        } while(ofs < w);                         \
+        /* skip padding if necessary */               \
+        if(sizeof(Ptype) == 2)                    \
+        srcbuf += (uintptr_t)srcbuf & 2;              \
+        /* blit translucent pixels on the same line */        \
+        ofs = 0;                              \
+        do {                              \
+        unsigned run;                         \
+        ofs += ((Uint16 *)srcbuf)[0];                 \
+        run = ((Uint16 *)srcbuf)[1];                  \
+        srcbuf += 4;                          \
+        if(run) {                         \
+            /* clip to left and right borders */          \
+            int cofs = ofs;                   \
+            int crun = run;                   \
+            if(left - cofs > 0) {                 \
+            crun -= left - cofs;                  \
+            cofs = left;                      \
+            }                             \
+            if(crun > right - cofs)               \
+            crun = right - cofs;                  \
+            if(crun > 0) {                    \
+            Ptype *dst = (Ptype *)dstbuf + cofs;          \
+            Uint32 *src = (Uint32 *)srcbuf + (cofs - ofs);    \
+            int i;                        \
+            for(i = 0; i < crun; i++)             \
+                do_blend(src[i], dst[i]);             \
+            }                             \
+            srcbuf += run * 4;                    \
+            ofs += run;                       \
+        }                             \
+        } while(ofs < w);                         \
+        dstbuf += dst->pitch;                     \
+    } while(--linecount);                         \
+    } while(0)
+
+    switch (df->BytesPerPixel) {
+    case 2:
+        if (df->Gmask == 0x07e0 || df->Rmask == 0x07e0 || df->Bmask == 0x07e0)
+            RLEALPHACLIPBLIT(Uint16, Uint8, BLIT_TRANSL_565);
+        else
+            RLEALPHACLIPBLIT(Uint16, Uint8, BLIT_TRANSL_555);
+        break;
+    case 4:
+        RLEALPHACLIPBLIT(Uint32, Uint16, BLIT_TRANSL_888);
+        break;
+    }
+}
+
+/* blit a pixel-alpha RLE surface */
+int
+SDL_RLEAlphaBlit(SDL_Surface * src, SDL_Rect * srcrect,
+                 SDL_Surface * dst, SDL_Rect * dstrect)
+{
+    int x, y;
+    int w = src->w;
+    Uint8 *srcbuf, *dstbuf;
+    SDL_PixelFormat *df = dst->format;
+
+    /* Lock the destination if necessary */
+    if (SDL_MUSTLOCK(dst)) {
+        if (SDL_LockSurface(dst) < 0) {
+            return -1;
+        }
+    }
+
+    x = dstrect->x;
+    y = dstrect->y;
+    dstbuf = (Uint8 *) dst->pixels + y * dst->pitch + x * df->BytesPerPixel;
+    srcbuf = (Uint8 *) src->map->data + sizeof(RLEDestFormat);
+
+    {
+        /* skip lines at the top if necessary */
+        int vskip = srcrect->y;
+        if (vskip) {
+            int ofs;
+            if (df->BytesPerPixel == 2) {
+                /* the 16/32 interleaved format */
+                do {
+                    /* skip opaque line */
+                    ofs = 0;
+                    do {
+                        int run;
+                        ofs += srcbuf[0];
+                        run = srcbuf[1];
+                        srcbuf += 2;
+                        if (run) {
+                            srcbuf += 2 * run;
+                            ofs += run;
+                        } else if (!ofs)
+                            goto done;
+                    } while (ofs < w);
+
+                    /* skip padding */
+                    srcbuf += (uintptr_t) srcbuf & 2;
+
+                    /* skip translucent line */
+                    ofs = 0;
+                    do {
+                        int run;
+                        ofs += ((Uint16 *) srcbuf)[0];
+                        run = ((Uint16 *) srcbuf)[1];
+                        srcbuf += 4 * (run + 1);
+                        ofs += run;
+                    } while (ofs < w);
+                } while (--vskip);
+            } else {
+                /* the 32/32 interleaved format */
+                vskip <<= 1;    /* opaque and translucent have same format */
+                do {
+                    ofs = 0;
+                    do {
+                        int run;
+                        ofs += ((Uint16 *) srcbuf)[0];
+                        run = ((Uint16 *) srcbuf)[1];
+                        srcbuf += 4;
+                        if (run) {
+                            srcbuf += 4 * run;
+                            ofs += run;
+                        } else if (!ofs)
+                            goto done;
+                    } while (ofs < w);
+                } while (--vskip);
+            }
+        }
+    }
+
+    /* if left or right edge clipping needed, call clip blit */
+    if (srcrect->x || srcrect->w != src->w) {
+        RLEAlphaClipBlit(w, srcbuf, dst, dstbuf, srcrect);
+    } else {
+
+        /*
+         * non-clipped blitter. Ptype is the destination pixel type,
+         * Ctype the translucent count type, and do_blend the
+         * macro to blend one pixel.
+         */
+#define RLEALPHABLIT(Ptype, Ctype, do_blend)                 \
+    do {                                 \
+        int linecount = srcrect->h;                  \
+        do {                             \
+        int ofs = 0;                         \
+        /* blit opaque pixels on one line */             \
+        do {                             \
+            unsigned run;                    \
+            ofs += ((Ctype *)srcbuf)[0];             \
+            run = ((Ctype *)srcbuf)[1];              \
+            srcbuf += 2 * sizeof(Ctype);             \
+            if(run) {                        \
+            PIXEL_COPY(dstbuf + ofs * sizeof(Ptype), srcbuf, \
+                   run, sizeof(Ptype));          \
+            srcbuf += run * sizeof(Ptype);           \
+            ofs += run;                  \
+            } else if(!ofs)                  \
+            goto done;                   \
+        } while(ofs < w);                    \
+        /* skip padding if necessary */              \
+        if(sizeof(Ptype) == 2)                   \
+            srcbuf += (uintptr_t)srcbuf & 2;             \
+        /* blit translucent pixels on the same line */       \
+        ofs = 0;                         \
+        do {                             \
+            unsigned run;                    \
+            ofs += ((Uint16 *)srcbuf)[0];            \
+            run = ((Uint16 *)srcbuf)[1];             \
+            srcbuf += 4;                     \
+            if(run) {                        \
+            Ptype *dst = (Ptype *)dstbuf + ofs;      \
+            unsigned i;                  \
+            for(i = 0; i < run; i++) {           \
+                Uint32 src = *(Uint32 *)srcbuf;      \
+                do_blend(src, *dst);             \
+                srcbuf += 4;                 \
+                dst++;                   \
+            }                        \
+            ofs += run;                  \
+            }                            \
+        } while(ofs < w);                    \
+        dstbuf += dst->pitch;                    \
+        } while(--linecount);                    \
+    } while(0)
+
+        switch (df->BytesPerPixel) {
+        case 2:
+            if (df->Gmask == 0x07e0 || df->Rmask == 0x07e0
+                || df->Bmask == 0x07e0)
+                RLEALPHABLIT(Uint16, Uint8, BLIT_TRANSL_565);
+            else
+                RLEALPHABLIT(Uint16, Uint8, BLIT_TRANSL_555);
+            break;
+        case 4:
+            RLEALPHABLIT(Uint32, Uint16, BLIT_TRANSL_888);
+            break;
+        }
+    }
+
+  done:
+    /* Unlock the destination if necessary */
+    if (SDL_MUSTLOCK(dst)) {
+        SDL_UnlockSurface(dst);
+    }
+    return 0;
+}
+
+/*
+ * Auxiliary functions:
+ * The encoding functions take 32bpp rgb + a, and
+ * return the number of bytes copied to the destination.
+ * The decoding functions copy to 32bpp rgb + a, and
+ * return the number of bytes copied from the source.
+ * These are only used in the encoder and un-RLE code and are therefore not
+ * highly optimised.
+ */
+
+/* encode 32bpp rgb + a into 16bpp rgb, losing alpha */
+static int
+copy_opaque_16(void *dst, Uint32 * src, int n,
+               SDL_PixelFormat * sfmt, SDL_PixelFormat * dfmt)
+{
+    int i;
+    Uint16 *d = dst;
+    for (i = 0; i < n; i++) {
+        unsigned r, g, b;
+        RGB_FROM_PIXEL(*src, sfmt, r, g, b);
+        PIXEL_FROM_RGB(*d, dfmt, r, g, b);
+        src++;
+        d++;
+    }
+    return n * 2;
+}
+
+/* decode opaque pixels from 16bpp to 32bpp rgb + a */
+static int
+uncopy_opaque_16(Uint32 * dst, void *src, int n,
+                 RLEDestFormat * sfmt, SDL_PixelFormat * dfmt)
+{
+    int i;
+    Uint16 *s = src;
+    unsigned alpha = dfmt->Amask ? 255 : 0;
+    for (i = 0; i < n; i++) {
+        unsigned r, g, b;
+        RGB_FROM_PIXEL(*s, sfmt, r, g, b);
+        PIXEL_FROM_RGBA(*dst, dfmt, r, g, b, alpha);
+        s++;
+        dst++;
+    }
+    return n * 2;
+}
+
+
+
+/* encode 32bpp rgb + a into 32bpp G0RAB format for blitting into 565 */
+static int
+copy_transl_565(void *dst, Uint32 * src, int n,
+                SDL_PixelFormat * sfmt, SDL_PixelFormat * dfmt)
+{
+    int i;
+    Uint32 *d = dst;
+    for (i = 0; i < n; i++) {
+        unsigned r, g, b, a;
+        Uint16 pix;
+        RGBA_FROM_8888(*src, sfmt, r, g, b, a);
+        PIXEL_FROM_RGB(pix, dfmt, r, g, b);
+        *d = ((pix & 0x7e0) << 16) | (pix & 0xf81f) | ((a << 2) & 0x7e0);
+        src++;
+        d++;
+    }
+    return n * 4;
+}
+
+/* encode 32bpp rgb + a into 32bpp G0RAB format for blitting into 555 */
+static int
+copy_transl_555(void *dst, Uint32 * src, int n,
+                SDL_PixelFormat * sfmt, SDL_PixelFormat * dfmt)
+{
+    int i;
+    Uint32 *d = dst;
+    for (i = 0; i < n; i++) {
+        unsigned r, g, b, a;
+        Uint16 pix;
+        RGBA_FROM_8888(*src, sfmt, r, g, b, a);
+        PIXEL_FROM_RGB(pix, dfmt, r, g, b);
+        *d = ((pix & 0x3e0) << 16) | (pix & 0xfc1f) | ((a << 2) & 0x3e0);
+        src++;
+        d++;
+    }
+    return n * 4;
+}
+
+/* decode translucent pixels from 32bpp GORAB to 32bpp rgb + a */
+static int
+uncopy_transl_16(Uint32 * dst, void *src, int n,
+                 RLEDestFormat * sfmt, SDL_PixelFormat * dfmt)
+{
+    int i;
+    Uint32 *s = src;
+    for (i = 0; i < n; i++) {
+        unsigned r, g, b, a;
+        Uint32 pix = *s++;
+        a = (pix & 0x3e0) >> 2;
+        pix = (pix & ~0x3e0) | pix >> 16;
+        RGB_FROM_PIXEL(pix, sfmt, r, g, b);
+        PIXEL_FROM_RGBA(*dst, dfmt, r, g, b, a);
+        dst++;
+    }
+    return n * 4;
+}
+
+/* encode 32bpp rgba into 32bpp rgba, keeping alpha (dual purpose) */
+static int
+copy_32(void *dst, Uint32 * src, int n,
+        SDL_PixelFormat * sfmt, SDL_PixelFormat * dfmt)
+{
+    int i;
+    Uint32 *d = dst;
+    for (i = 0; i < n; i++) {
+        unsigned r, g, b, a;
+        RGBA_FROM_8888(*src, sfmt, r, g, b, a);
+        PIXEL_FROM_RGBA(*d, dfmt, r, g, b, a);
+        d++;
+        src++;
+    }
+    return n * 4;
+}
+
+/* decode 32bpp rgba into 32bpp rgba, keeping alpha (dual purpose) */
+static int
+uncopy_32(Uint32 * dst, void *src, int n,
+          RLEDestFormat * sfmt, SDL_PixelFormat * dfmt)
+{
+    int i;
+    Uint32 *s = src;
+    for (i = 0; i < n; i++) {
+        unsigned r, g, b, a;
+        Uint32 pixel = *s++;
+        RGB_FROM_PIXEL(pixel, sfmt, r, g, b);
+        a = pixel >> 24;
+        PIXEL_FROM_RGBA(*dst, dfmt, r, g, b, a);
+        dst++;
+    }
+    return n * 4;
+}
+
+#define ISOPAQUE(pixel, fmt) ((((pixel) & fmt->Amask) >> fmt->Ashift) == 255)
+
+#define ISTRANSL(pixel, fmt)    \
+    ((unsigned)((((pixel) & fmt->Amask) >> fmt->Ashift) - 1U) < 254U)
+
+/* convert surface to be quickly alpha-blittable onto dest, if possible */
+static int
+RLEAlphaSurface(SDL_Surface * surface)
+{
+    SDL_Surface *dest;
+    SDL_PixelFormat *df;
+    int maxsize = 0;
+    int max_opaque_run;
+    int max_transl_run = 65535;
+    unsigned masksum;
+    Uint8 *rlebuf, *dst;
+    int (*copy_opaque) (void *, Uint32 *, int,
+                        SDL_PixelFormat *, SDL_PixelFormat *);
+    int (*copy_transl) (void *, Uint32 *, int,
+                        SDL_PixelFormat *, SDL_PixelFormat *);
+
+    dest = surface->map->dst;
+    if (!dest)
+        return -1;
+    df = dest->format;
+    if (surface->format->BitsPerPixel != 32)
+        return -1;              /* only 32bpp source supported */
+
+    /* find out whether the destination is one we support,
+       and determine the max size of the encoded result */
+    masksum = df->Rmask | df->Gmask | df->Bmask;
+    switch (df->BytesPerPixel) {
+    case 2:
+        /* 16bpp: only support 565 and 555 formats */
+        switch (masksum) {
+        case 0xffff:
+            if (df->Gmask == 0x07e0
+                || df->Rmask == 0x07e0 || df->Bmask == 0x07e0) {
+                copy_opaque = copy_opaque_16;
+                copy_transl = copy_transl_565;
+            } else
+                return -1;
+            break;
+        case 0x7fff:
+            if (df->Gmask == 0x03e0
+                || df->Rmask == 0x03e0 || df->Bmask == 0x03e0) {
+                copy_opaque = copy_opaque_16;
+                copy_transl = copy_transl_555;
+            } else
+                return -1;
+            break;
+        default:
+            return -1;
+        }
+        max_opaque_run = 255;   /* runs stored as bytes */
+
+        /* worst case is alternating opaque and translucent pixels,
+           with room for alignment padding between lines */
+        maxsize = surface->h * (2 + (4 + 2) * (surface->w + 1)) + 2;
+        break;
+    case 4:
+        if (masksum != 0x00ffffff)
+            return -1;          /* requires unused high byte */
+        copy_opaque = copy_32;
+        copy_transl = copy_32;
+        max_opaque_run = 255;   /* runs stored as short ints */
+
+        /* worst case is alternating opaque and translucent pixels */
+        maxsize = surface->h * 2 * 4 * (surface->w + 1) + 4;
+        break;
+    default:
+        return -1;              /* anything else unsupported right now */
+    }
+
+    maxsize += sizeof(RLEDestFormat);
+    rlebuf = (Uint8 *) SDL_malloc(maxsize);
+    if (!rlebuf) {
+        return SDL_OutOfMemory();
+    }
+    {
+        /* save the destination format so we can undo the encoding later */
+        RLEDestFormat *r = (RLEDestFormat *) rlebuf;
+        r->BytesPerPixel = df->BytesPerPixel;
+        r->Rmask = df->Rmask;
+        r->Gmask = df->Gmask;
+        r->Bmask = df->Bmask;
+        r->Amask = df->Amask;
+        r->Rloss = df->Rloss;
+        r->Gloss = df->Gloss;
+        r->Bloss = df->Bloss;
+        r->Aloss = df->Aloss;
+        r->Rshift = df->Rshift;
+        r->Gshift = df->Gshift;
+        r->Bshift = df->Bshift;
+        r->Ashift = df->Ashift;
+    }
+    dst = rlebuf + sizeof(RLEDestFormat);
+
+    /* Do the actual encoding */
+    {
+        int x, y;
+        int h = surface->h, w = surface->w;
+        SDL_PixelFormat *sf = surface->format;
+        Uint32 *src = (Uint32 *) surface->pixels;
+        Uint8 *lastline = dst;  /* end of last non-blank line */
+
+        /* opaque counts are 8 or 16 bits, depending on target depth */
+#define ADD_OPAQUE_COUNTS(n, m)         \
+    if(df->BytesPerPixel == 4) {        \
+        ((Uint16 *)dst)[0] = n;     \
+        ((Uint16 *)dst)[1] = m;     \
+        dst += 4;               \
+    } else {                \
+        dst[0] = n;             \
+        dst[1] = m;             \
+        dst += 2;               \
+    }
+
+        /* translucent counts are always 16 bit */
+#define ADD_TRANSL_COUNTS(n, m)     \
+    (((Uint16 *)dst)[0] = n, ((Uint16 *)dst)[1] = m, dst += 4)
+
+        for (y = 0; y < h; y++) {
+            int runstart, skipstart;
+            int blankline = 0;
+            /* First encode all opaque pixels of a scan line */
+            x = 0;
+            do {
+                int run, skip, len;
+                skipstart = x;
+                while (x < w && !ISOPAQUE(src[x], sf))
+                    x++;
+                runstart = x;
+                while (x < w && ISOPAQUE(src[x], sf))
+                    x++;
+                skip = runstart - skipstart;
+                if (skip == w)
+                    blankline = 1;
+                run = x - runstart;
+                while (skip > max_opaque_run) {
+                    ADD_OPAQUE_COUNTS(max_opaque_run, 0);
+                    skip -= max_opaque_run;
+                }
+                len = MIN(run, max_opaque_run);
+                ADD_OPAQUE_COUNTS(skip, len);
+                dst += copy_opaque(dst, src + runstart, len, sf, df);
+                runstart += len;
+                run -= len;
+                while (run) {
+                    len = MIN(run, max_opaque_run);
+                    ADD_OPAQUE_COUNTS(0, len);
+                    dst += copy_opaque(dst, src + runstart, len, sf, df);
+                    runstart += len;
+                    run -= len;
+                }
+            } while (x < w);
+
+            /* Make sure the next output address is 32-bit aligned */
+            dst += (uintptr_t) dst & 2;
+
+            /* Next, encode all translucent pixels of the same scan line */
+            x = 0;
+            do {
+                int run, skip, len;
+                skipstart = x;
+                while (x < w && !ISTRANSL(src[x], sf))
+                    x++;
+                runstart = x;
+                while (x < w && ISTRANSL(src[x], sf))
+                    x++;
+                skip = runstart - skipstart;
+                blankline &= (skip == w);
+                run = x - runstart;
+                while (skip > max_transl_run) {
+                    ADD_TRANSL_COUNTS(max_transl_run, 0);
+                    skip -= max_transl_run;
+                }
+                len = MIN(run, max_transl_run);
+                ADD_TRANSL_COUNTS(skip, len);
+                dst += copy_transl(dst, src + runstart, len, sf, df);
+                runstart += len;
+                run -= len;
+                while (run) {
+                    len = MIN(run, max_transl_run);
+                    ADD_TRANSL_COUNTS(0, len);
+                    dst += copy_transl(dst, src + runstart, len, sf, df);
+                    runstart += len;
+                    run -= len;
+                }
+                if (!blankline)
+                    lastline = dst;
+            } while (x < w);
+
+            src += surface->pitch >> 2;
+        }
+        dst = lastline;         /* back up past trailing blank lines */
+        ADD_OPAQUE_COUNTS(0, 0);
+    }
+
+#undef ADD_OPAQUE_COUNTS
+#undef ADD_TRANSL_COUNTS
+
+    /* Now that we have it encoded, release the original pixels */
+    if (!(surface->flags & SDL_PREALLOC)) {
+        SDL_free(surface->pixels);
+        surface->pixels = NULL;
+    }
+
+    /* realloc the buffer to release unused memory */
+    {
+        Uint8 *p = SDL_realloc(rlebuf, dst - rlebuf);
+        if (!p)
+            p = rlebuf;
+        surface->map->data = p;
+    }
+
+    return 0;
+}
+
+static Uint32
+getpix_8(Uint8 * srcbuf)
+{
+    return *srcbuf;
+}
+
+static Uint32
+getpix_16(Uint8 * srcbuf)
+{
+    return *(Uint16 *) srcbuf;
+}
+
+static Uint32
+getpix_24(Uint8 * srcbuf)
+{
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+    return srcbuf[0] + (srcbuf[1] << 8) + (srcbuf[2] << 16);
+#else
+    return (srcbuf[0] << 16) + (srcbuf[1] << 8) + srcbuf[2];
+#endif
+}
+
+static Uint32
+getpix_32(Uint8 * srcbuf)
+{
+    return *(Uint32 *) srcbuf;
+}
+
+typedef Uint32(*getpix_func) (Uint8 *);
+
+static const getpix_func getpixes[4] = {
+    getpix_8, getpix_16, getpix_24, getpix_32
+};
+
+static int
+RLEColorkeySurface(SDL_Surface * surface)
+{
+    Uint8 *rlebuf, *dst;
+    int maxn;
+    int y;
+    Uint8 *srcbuf, *lastline;
+    int maxsize = 0;
+    int bpp = surface->format->BytesPerPixel;
+    getpix_func getpix;
+    Uint32 ckey, rgbmask;
+    int w, h;
+
+    /* calculate the worst case size for the compressed surface */
+    switch (bpp) {
+    case 1:
+        /* worst case is alternating opaque and transparent pixels,
+           starting with an opaque pixel */
+        maxsize = surface->h * 3 * (surface->w / 2 + 1) + 2;
+        break;
+    case 2:
+    case 3:
+        /* worst case is solid runs, at most 255 pixels wide */
+        maxsize = surface->h * (2 * (surface->w / 255 + 1)
+                                + surface->w * bpp) + 2;
+        break;
+    case 4:
+        /* worst case is solid runs, at most 65535 pixels wide */
+        maxsize = surface->h * (4 * (surface->w / 65535 + 1)
+                                + surface->w * 4) + 4;
+        break;
+    }
+
+    rlebuf = (Uint8 *) SDL_malloc(maxsize);
+    if (rlebuf == NULL) {
+        return SDL_OutOfMemory();
+    }
+
+    /* Set up the conversion */
+    srcbuf = (Uint8 *) surface->pixels;
+    maxn = bpp == 4 ? 65535 : 255;
+    dst = rlebuf;
+    rgbmask = ~surface->format->Amask;
+    ckey = surface->map->info.colorkey & rgbmask;
+    lastline = dst;
+    getpix = getpixes[bpp - 1];
+    w = surface->w;
+    h = surface->h;
+
+#define ADD_COUNTS(n, m)            \
+    if(bpp == 4) {              \
+        ((Uint16 *)dst)[0] = n;     \
+        ((Uint16 *)dst)[1] = m;     \
+        dst += 4;               \
+    } else {                \
+        dst[0] = n;             \
+        dst[1] = m;             \
+        dst += 2;               \
+    }
+
+    for (y = 0; y < h; y++) {
+        int x = 0;
+        int blankline = 0;
+        do {
+            int run, skip, len;
+            int runstart;
+            int skipstart = x;
+
+            /* find run of transparent, then opaque pixels */
+            while (x < w && (getpix(srcbuf + x * bpp) & rgbmask) == ckey)
+                x++;
+            runstart = x;
+            while (x < w && (getpix(srcbuf + x * bpp) & rgbmask) != ckey)
+                x++;
+            skip = runstart - skipstart;
+            if (skip == w)
+                blankline = 1;
+            run = x - runstart;
+
+            /* encode segment */
+            while (skip > maxn) {
+                ADD_COUNTS(maxn, 0);
+                skip -= maxn;
+            }
+            len = MIN(run, maxn);
+            ADD_COUNTS(skip, len);
+            SDL_memcpy(dst, srcbuf + runstart * bpp, len * bpp);
+            dst += len * bpp;
+            run -= len;
+            runstart += len;
+            while (run) {
+                len = MIN(run, maxn);
+                ADD_COUNTS(0, len);
+                SDL_memcpy(dst, srcbuf + runstart * bpp, len * bpp);
+                dst += len * bpp;
+                runstart += len;
+                run -= len;
+            }
+            if (!blankline)
+                lastline = dst;
+        } while (x < w);
+
+        srcbuf += surface->pitch;
+    }
+    dst = lastline;             /* back up bast trailing blank lines */
+    ADD_COUNTS(0, 0);
+
+#undef ADD_COUNTS
+
+    /* Now that we have it encoded, release the original pixels */
+    if (!(surface->flags & SDL_PREALLOC)) {
+        SDL_free(surface->pixels);
+        surface->pixels = NULL;
+    }
+
+    /* realloc the buffer to release unused memory */
+    {
+        /* If realloc returns NULL, the original block is left intact */
+        Uint8 *p = SDL_realloc(rlebuf, dst - rlebuf);
+        if (!p)
+            p = rlebuf;
+        surface->map->data = p;
+    }
+
+    return (0);
+}
+
+int
+SDL_RLESurface(SDL_Surface * surface)
+{
+    int flags;
+
+    /* Clear any previous RLE conversion */
+    if ((surface->flags & SDL_RLEACCEL) == SDL_RLEACCEL) {
+        SDL_UnRLESurface(surface, 1);
+    }
+
+    /* We don't support RLE encoding of bitmaps */
+    if (surface->format->BitsPerPixel < 8) {
+        return -1;
+    }
+
+    /* Make sure the pixels are available */
+    if (!surface->pixels) {
+        return -1;
+    }
+
+    /* If we don't have colorkey or blending, nothing to do... */
+    flags = surface->map->info.flags;
+    if (!(flags & (SDL_COPY_COLORKEY | SDL_COPY_BLEND))) {
+        return -1;
+    }
+
+    /* Pass on combinations not supported */
+    if ((flags & SDL_COPY_MODULATE_COLOR) ||
+        ((flags & SDL_COPY_MODULATE_ALPHA) && surface->format->Amask) ||
+        (flags & (SDL_COPY_ADD | SDL_COPY_MOD)) ||
+        (flags & SDL_COPY_NEAREST)) {
+        return -1;
+    }
+
+    /* Encode and set up the blit */
+    if (!surface->format->Amask || !(flags & SDL_COPY_BLEND)) {
+        if (!surface->map->identity) {
+            return -1;
+        }
+        if (RLEColorkeySurface(surface) < 0) {
+            return -1;
+        }
+        surface->map->blit = SDL_RLEBlit;
+        surface->map->info.flags |= SDL_COPY_RLE_COLORKEY;
+    } else {
+        if (RLEAlphaSurface(surface) < 0) {
+            return -1;
+        }
+        surface->map->blit = SDL_RLEAlphaBlit;
+        surface->map->info.flags |= SDL_COPY_RLE_ALPHAKEY;
+    }
+
+    /* The surface is now accelerated */
+    surface->flags |= SDL_RLEACCEL;
+
+    return (0);
+}
+
+/*
+ * Un-RLE a surface with pixel alpha
+ * This may not give back exactly the image before RLE-encoding; all
+ * completely transparent pixels will be lost, and color and alpha depth
+ * may have been reduced (when encoding for 16bpp targets).
+ */
+static SDL_bool
+UnRLEAlpha(SDL_Surface * surface)
+{
+    Uint8 *srcbuf;
+    Uint32 *dst;
+    SDL_PixelFormat *sf = surface->format;
+    RLEDestFormat *df = surface->map->data;
+    int (*uncopy_opaque) (Uint32 *, void *, int,
+                          RLEDestFormat *, SDL_PixelFormat *);
+    int (*uncopy_transl) (Uint32 *, void *, int,
+                          RLEDestFormat *, SDL_PixelFormat *);
+    int w = surface->w;
+    int bpp = df->BytesPerPixel;
+
+    if (bpp == 2) {
+        uncopy_opaque = uncopy_opaque_16;
+        uncopy_transl = uncopy_transl_16;
+    } else {
+        uncopy_opaque = uncopy_transl = uncopy_32;
+    }
+
+    surface->pixels = SDL_malloc(surface->h * surface->pitch);
+    if (!surface->pixels) {
+        return (SDL_FALSE);
+    }
+    /* fill background with transparent pixels */
+    SDL_memset(surface->pixels, 0, surface->h * surface->pitch);
+
+    dst = surface->pixels;
+    srcbuf = (Uint8 *) (df + 1);
+    for (;;) {
+        /* copy opaque pixels */
+        int ofs = 0;
+        do {
+            unsigned run;
+            if (bpp == 2) {
+                ofs += srcbuf[0];
+                run = srcbuf[1];
+                srcbuf += 2;
+            } else {
+                ofs += ((Uint16 *) srcbuf)[0];
+                run = ((Uint16 *) srcbuf)[1];
+                srcbuf += 4;
+            }
+            if (run) {
+                srcbuf += uncopy_opaque(dst + ofs, srcbuf, run, df, sf);
+                ofs += run;
+            } else if (!ofs)
+                return (SDL_TRUE);
+        } while (ofs < w);
+
+        /* skip padding if needed */
+        if (bpp == 2)
+            srcbuf += (uintptr_t) srcbuf & 2;
+
+        /* copy translucent pixels */
+        ofs = 0;
+        do {
+            unsigned run;
+            ofs += ((Uint16 *) srcbuf)[0];
+            run = ((Uint16 *) srcbuf)[1];
+            srcbuf += 4;
+            if (run) {
+                srcbuf += uncopy_transl(dst + ofs, srcbuf, run, df, sf);
+                ofs += run;
+            }
+        } while (ofs < w);
+        dst += surface->pitch >> 2;
+    }
+    /* Make the compiler happy */
+    return (SDL_TRUE);
+}
+
+void
+SDL_UnRLESurface(SDL_Surface * surface, int recode)
+{
+    if (surface->flags & SDL_RLEACCEL) {
+        surface->flags &= ~SDL_RLEACCEL;
+
+        if (recode && !(surface->flags & SDL_PREALLOC)) {
+            if (surface->map->info.flags & SDL_COPY_RLE_COLORKEY) {
+                SDL_Rect full;
+
+                /* re-create the original surface */
+                surface->pixels = SDL_malloc(surface->h * surface->pitch);
+                if (!surface->pixels) {
+                    /* Oh crap... */
+                    surface->flags |= SDL_RLEACCEL;
+                    return;
+                }
+
+                /* fill it with the background color */
+                SDL_FillRect(surface, NULL, surface->map->info.colorkey);
+
+                /* now render the encoded surface */
+                full.x = full.y = 0;
+                full.w = surface->w;
+                full.h = surface->h;
+                SDL_RLEBlit(surface, &full, surface, &full);
+            } else {
+                if (!UnRLEAlpha(surface)) {
+                    /* Oh crap... */
+                    surface->flags |= SDL_RLEACCEL;
+                    return;
+                }
+            }
+        }
+        surface->map->info.flags &=
+            ~(SDL_COPY_RLE_COLORKEY | SDL_COPY_RLE_ALPHAKEY);
+
+        SDL_free(surface->map->data);
+        surface->map->data = NULL;
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_RLEaccel_c.h b/Source/3rd Party/sdl/src/video/SDL_RLEaccel_c.h
new file mode 100644
index 000000000..271faa0b7
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_RLEaccel_c.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Useful functions and variables from SDL_RLEaccel.c */
+
+extern int SDL_RLESurface(SDL_Surface * surface);
+extern int SDL_RLEBlit(SDL_Surface * src, SDL_Rect * srcrect,
+                       SDL_Surface * dst, SDL_Rect * dstrect);
+extern int SDL_RLEAlphaBlit(SDL_Surface * src, SDL_Rect * srcrect,
+                            SDL_Surface * dst, SDL_Rect * dstrect);
+extern void SDL_UnRLESurface(SDL_Surface * surface, int recode);
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit.c b/Source/3rd Party/sdl/src/video/SDL_blit.c
new file mode 100644
index 000000000..fe30923bc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit.c	
@@ -0,0 +1,286 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+#include "SDL_sysvideo.h"
+#include "SDL_blit.h"
+#include "SDL_blit_auto.h"
+#include "SDL_blit_copy.h"
+#include "SDL_blit_slow.h"
+#include "SDL_RLEaccel_c.h"
+#include "SDL_pixels_c.h"
+
+/* The general purpose software blit routine */
+static int
+SDL_SoftBlit(SDL_Surface * src, SDL_Rect * srcrect,
+             SDL_Surface * dst, SDL_Rect * dstrect)
+{
+    int okay;
+    int src_locked;
+    int dst_locked;
+
+    /* Everything is okay at the beginning...  */
+    okay = 1;
+
+    /* Lock the destination if it's in hardware */
+    dst_locked = 0;
+    if (SDL_MUSTLOCK(dst)) {
+        if (SDL_LockSurface(dst) < 0) {
+            okay = 0;
+        } else {
+            dst_locked = 1;
+        }
+    }
+    /* Lock the source if it's in hardware */
+    src_locked = 0;
+    if (SDL_MUSTLOCK(src)) {
+        if (SDL_LockSurface(src) < 0) {
+            okay = 0;
+        } else {
+            src_locked = 1;
+        }
+    }
+
+    /* Set up source and destination buffer pointers, and BLIT! */
+    if (okay && !SDL_RectEmpty(srcrect)) {
+        SDL_BlitFunc RunBlit;
+        SDL_BlitInfo *info = &src->map->info;
+
+        /* Set up the blit information */
+        info->src = (Uint8 *) src->pixels +
+            (Uint16) srcrect->y * src->pitch +
+            (Uint16) srcrect->x * info->src_fmt->BytesPerPixel;
+        info->src_w = srcrect->w;
+        info->src_h = srcrect->h;
+        info->src_pitch = src->pitch;
+        info->src_skip =
+            info->src_pitch - info->src_w * info->src_fmt->BytesPerPixel;
+        info->dst =
+            (Uint8 *) dst->pixels + (Uint16) dstrect->y * dst->pitch +
+            (Uint16) dstrect->x * info->dst_fmt->BytesPerPixel;
+        info->dst_w = dstrect->w;
+        info->dst_h = dstrect->h;
+        info->dst_pitch = dst->pitch;
+        info->dst_skip =
+            info->dst_pitch - info->dst_w * info->dst_fmt->BytesPerPixel;
+        RunBlit = (SDL_BlitFunc) src->map->data;
+
+        /* Run the actual software blit */
+        RunBlit(info);
+    }
+
+    /* We need to unlock the surfaces if they're locked */
+    if (dst_locked) {
+        SDL_UnlockSurface(dst);
+    }
+    if (src_locked) {
+        SDL_UnlockSurface(src);
+    }
+    /* Blit is done! */
+    return (okay ? 0 : -1);
+}
+
+#ifdef __MACOSX__
+#include <sys/sysctl.h>
+
+static SDL_bool
+SDL_UseAltivecPrefetch()
+{
+    const char key[] = "hw.l3cachesize";
+    u_int64_t result = 0;
+    size_t typeSize = sizeof(result);
+
+    if (sysctlbyname(key, &result, &typeSize, NULL, 0) == 0 && result > 0) {
+        return SDL_TRUE;
+    } else {
+        return SDL_FALSE;
+    }
+}
+#else
+static SDL_bool
+SDL_UseAltivecPrefetch()
+{
+    /* Just guess G4 */
+    return SDL_TRUE;
+}
+#endif /* __MACOSX__ */
+
+static SDL_BlitFunc
+SDL_ChooseBlitFunc(Uint32 src_format, Uint32 dst_format, int flags,
+                   SDL_BlitFuncEntry * entries)
+{
+    int i, flagcheck;
+    static Uint32 features = 0xffffffff;
+
+    /* Get the available CPU features */
+    if (features == 0xffffffff) {
+        const char *override = SDL_getenv("SDL_BLIT_CPU_FEATURES");
+
+        features = SDL_CPU_ANY;
+
+        /* Allow an override for testing .. */
+        if (override) {
+            SDL_sscanf(override, "%u", &features);
+        } else {
+            if (SDL_HasMMX()) {
+                features |= SDL_CPU_MMX;
+            }
+            if (SDL_Has3DNow()) {
+                features |= SDL_CPU_3DNOW;
+            }
+            if (SDL_HasSSE()) {
+                features |= SDL_CPU_SSE;
+            }
+            if (SDL_HasSSE2()) {
+                features |= SDL_CPU_SSE2;
+            }
+            if (SDL_HasAltiVec()) {
+                if (SDL_UseAltivecPrefetch()) {
+                    features |= SDL_CPU_ALTIVEC_PREFETCH;
+                } else {
+                    features |= SDL_CPU_ALTIVEC_NOPREFETCH;
+                }
+            }
+        }
+    }
+
+    for (i = 0; entries[i].func; ++i) {
+        /* Check for matching pixel formats */
+        if (src_format != entries[i].src_format) {
+            continue;
+        }
+        if (dst_format != entries[i].dst_format) {
+            continue;
+        }
+
+        /* Check modulation flags */
+        flagcheck =
+            (flags & (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA));
+        if ((flagcheck & entries[i].flags) != flagcheck) {
+            continue;
+        }
+
+        /* Check blend flags */
+        flagcheck =
+            (flags &
+             (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD));
+        if ((flagcheck & entries[i].flags) != flagcheck) {
+            continue;
+        }
+
+        /* Check colorkey flag */
+        flagcheck = (flags & SDL_COPY_COLORKEY);
+        if ((flagcheck & entries[i].flags) != flagcheck) {
+            continue;
+        }
+
+        /* Check scaling flags */
+        flagcheck = (flags & SDL_COPY_NEAREST);
+        if ((flagcheck & entries[i].flags) != flagcheck) {
+            continue;
+        }
+
+        /* Check CPU features */
+        flagcheck = entries[i].cpu;
+        if ((flagcheck & features) != flagcheck) {
+            continue;
+        }
+
+        /* We found the best one! */
+        return entries[i].func;
+    }
+    return NULL;
+}
+
+/* Figure out which of many blit routines to set up on a surface */
+int
+SDL_CalculateBlit(SDL_Surface * surface)
+{
+    SDL_BlitFunc blit = NULL;
+    SDL_BlitMap *map = surface->map;
+    SDL_Surface *dst = map->dst;
+
+    /* Clean everything out to start */
+    if ((surface->flags & SDL_RLEACCEL) == SDL_RLEACCEL) {
+        SDL_UnRLESurface(surface, 1);
+    }
+    map->blit = SDL_SoftBlit;
+    map->info.src_fmt = surface->format;
+    map->info.src_pitch = surface->pitch;
+    map->info.dst_fmt = dst->format;
+    map->info.dst_pitch = dst->pitch;
+
+    /* See if we can do RLE acceleration */
+    if (map->info.flags & SDL_COPY_RLE_DESIRED) {
+        if (SDL_RLESurface(surface) == 0) {
+            return 0;
+        }
+    }
+
+    /* Choose a standard blit function */
+    if (map->identity && !(map->info.flags & ~SDL_COPY_RLE_DESIRED)) {
+        blit = SDL_BlitCopy;
+    } else if (surface->format->BitsPerPixel < 8 &&
+               SDL_ISPIXELFORMAT_INDEXED(surface->format->format)) {
+        blit = SDL_CalculateBlit0(surface);
+    } else if (surface->format->BytesPerPixel == 1 &&
+               SDL_ISPIXELFORMAT_INDEXED(surface->format->format)) {
+        blit = SDL_CalculateBlit1(surface);
+    } else if (map->info.flags & SDL_COPY_BLEND) {
+        blit = SDL_CalculateBlitA(surface);
+    } else {
+        blit = SDL_CalculateBlitN(surface);
+    }
+    if (blit == NULL) {
+        Uint32 src_format = surface->format->format;
+        Uint32 dst_format = dst->format->format;
+
+        blit =
+            SDL_ChooseBlitFunc(src_format, dst_format, map->info.flags,
+                               SDL_GeneratedBlitFuncTable);
+    }
+#ifndef TEST_SLOW_BLIT
+    if (blit == NULL)
+#endif
+    {
+        Uint32 src_format = surface->format->format;
+        Uint32 dst_format = dst->format->format;
+
+        if (!SDL_ISPIXELFORMAT_INDEXED(src_format) &&
+            !SDL_ISPIXELFORMAT_FOURCC(src_format) &&
+            !SDL_ISPIXELFORMAT_INDEXED(dst_format) &&
+            !SDL_ISPIXELFORMAT_FOURCC(dst_format)) {
+            blit = SDL_Blit_Slow;
+        }
+    }
+    map->data = blit;
+
+    /* Make sure we have a blit function */
+    if (blit == NULL) {
+        SDL_InvalidateMap(map);
+        return SDL_SetError("Blit combination not supported");
+    }
+
+    return 0;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit.h b/Source/3rd Party/sdl/src/video/SDL_blit.h
new file mode 100644
index 000000000..caf6c00f3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit.h	
@@ -0,0 +1,552 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_blit_h
+#define _SDL_blit_h
+
+#include "SDL_cpuinfo.h"
+#include "SDL_endian.h"
+#include "SDL_surface.h"
+
+/* Table to do pixel byte expansion */
+extern Uint8* SDL_expand_byte[9];
+
+/* SDL blit copy flags */
+#define SDL_COPY_MODULATE_COLOR     0x00000001
+#define SDL_COPY_MODULATE_ALPHA     0x00000002
+#define SDL_COPY_BLEND              0x00000010
+#define SDL_COPY_ADD                0x00000020
+#define SDL_COPY_MOD                0x00000040
+#define SDL_COPY_COLORKEY           0x00000100
+#define SDL_COPY_NEAREST            0x00000200
+#define SDL_COPY_RLE_DESIRED        0x00001000
+#define SDL_COPY_RLE_COLORKEY       0x00002000
+#define SDL_COPY_RLE_ALPHAKEY       0x00004000
+#define SDL_COPY_RLE_MASK           (SDL_COPY_RLE_DESIRED|SDL_COPY_RLE_COLORKEY|SDL_COPY_RLE_ALPHAKEY)
+
+/* SDL blit CPU flags */
+#define SDL_CPU_ANY                 0x00000000
+#define SDL_CPU_MMX                 0x00000001
+#define SDL_CPU_3DNOW               0x00000002
+#define SDL_CPU_SSE                 0x00000004
+#define SDL_CPU_SSE2                0x00000008
+#define SDL_CPU_ALTIVEC_PREFETCH    0x00000010
+#define SDL_CPU_ALTIVEC_NOPREFETCH  0x00000020
+
+typedef struct
+{
+    Uint8 *src;
+    int src_w, src_h;
+    int src_pitch;
+    int src_skip;
+    Uint8 *dst;
+    int dst_w, dst_h;
+    int dst_pitch;
+    int dst_skip;
+    SDL_PixelFormat *src_fmt;
+    SDL_PixelFormat *dst_fmt;
+    Uint8 *table;
+    int flags;
+    Uint32 colorkey;
+    Uint8 r, g, b, a;
+} SDL_BlitInfo;
+
+typedef void (SDLCALL * SDL_BlitFunc) (SDL_BlitInfo * info);
+
+typedef struct
+{
+    Uint32 src_format;
+    Uint32 dst_format;
+    int flags;
+    int cpu;
+    SDL_BlitFunc func;
+} SDL_BlitFuncEntry;
+
+/* Blit mapping definition */
+typedef struct SDL_BlitMap
+{
+    SDL_Surface *dst;
+    int identity;
+    SDL_blit blit;
+    void *data;
+    SDL_BlitInfo info;
+
+    /* the version count matches the destination; mismatch indicates
+       an invalid mapping */
+    Uint32 dst_palette_version;
+    Uint32 src_palette_version;
+} SDL_BlitMap;
+
+/* Functions found in SDL_blit.c */
+extern int SDL_CalculateBlit(SDL_Surface * surface);
+
+/* Functions found in SDL_blit_*.c */
+extern SDL_BlitFunc SDL_CalculateBlit0(SDL_Surface * surface);
+extern SDL_BlitFunc SDL_CalculateBlit1(SDL_Surface * surface);
+extern SDL_BlitFunc SDL_CalculateBlitN(SDL_Surface * surface);
+extern SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface * surface);
+
+/*
+ * Useful macros for blitting routines
+ */
+
+#if defined(__GNUC__)
+#define DECLARE_ALIGNED(t,v,a)  t __attribute__((aligned(a))) v
+#elif defined(_MSC_VER)
+#define DECLARE_ALIGNED(t,v,a)  __declspec(align(a)) t v
+#else
+#define DECLARE_ALIGNED(t,v,a)  t v
+#endif
+
+/* Load pixel of the specified format from a buffer and get its R-G-B values */
+#define RGB_FROM_PIXEL(Pixel, fmt, r, g, b)                             \
+{                                                                       \
+    r = SDL_expand_byte[fmt->Rloss][((Pixel&fmt->Rmask)>>fmt->Rshift)]; \
+    g = SDL_expand_byte[fmt->Gloss][((Pixel&fmt->Gmask)>>fmt->Gshift)]; \
+    b = SDL_expand_byte[fmt->Bloss][((Pixel&fmt->Bmask)>>fmt->Bshift)]; \
+}
+#define RGB_FROM_RGB565(Pixel, r, g, b)                                 \
+    {                                                                   \
+    r = SDL_expand_byte[3][((Pixel&0xF800)>>11)];                       \
+    g = SDL_expand_byte[2][((Pixel&0x07E0)>>5)];                        \
+    b = SDL_expand_byte[3][(Pixel&0x001F)];                             \
+}
+#define RGB_FROM_RGB555(Pixel, r, g, b)                                 \
+{                                                                       \
+    r = SDL_expand_byte[3][((Pixel&0x7C00)>>10)];                       \
+    g = SDL_expand_byte[3][((Pixel&0x03E0)>>5)];                        \
+    b = SDL_expand_byte[3][(Pixel&0x001F)];                             \
+}
+#define RGB_FROM_RGB888(Pixel, r, g, b)                                 \
+{                                                                       \
+    r = ((Pixel&0xFF0000)>>16);                                         \
+    g = ((Pixel&0xFF00)>>8);                                            \
+    b = (Pixel&0xFF);                                                   \
+}
+#define RETRIEVE_RGB_PIXEL(buf, bpp, Pixel)                             \
+do {                                                                    \
+    switch (bpp) {                                                      \
+        case 1:                                                         \
+            Pixel = *((Uint8 *)(buf));                                  \
+        break;                                                          \
+                                                                        \
+        case 2:                                                         \
+            Pixel = *((Uint16 *)(buf));                                 \
+        break;                                                          \
+                                                                        \
+        case 3: {                                                       \
+            Uint8 *B = (Uint8 *)(buf);                                  \
+            if (SDL_BYTEORDER == SDL_LIL_ENDIAN) {                      \
+                Pixel = B[0] + (B[1] << 8) + (B[2] << 16);              \
+            } else {                                                    \
+                Pixel = (B[0] << 16) + (B[1] << 8) + B[2];              \
+            }                                                           \
+        }                                                               \
+        break;                                                          \
+                                                                        \
+        case 4:                                                         \
+            Pixel = *((Uint32 *)(buf));                                 \
+        break;                                                          \
+                                                                        \
+        default:                                                        \
+                Pixel = 0; /* stop gcc complaints */                    \
+        break;                                                          \
+    }                                                                   \
+} while (0)
+
+#define DISEMBLE_RGB(buf, bpp, fmt, Pixel, r, g, b)                     \
+do {                                                                    \
+    switch (bpp) {                                                      \
+        case 1:                                                         \
+            Pixel = *((Uint8 *)(buf));                                  \
+            RGB_FROM_PIXEL(Pixel, fmt, r, g, b);                        \
+        break;                                                          \
+                                                                        \
+        case 2:                                                         \
+            Pixel = *((Uint16 *)(buf));                                 \
+            RGB_FROM_PIXEL(Pixel, fmt, r, g, b);                        \
+        break;                                                          \
+                                                                        \
+        case 3: {                                                       \
+            Pixel = 0;                                                  \
+            if (SDL_BYTEORDER == SDL_LIL_ENDIAN) {                      \
+                r = *((buf)+fmt->Rshift/8);                             \
+                g = *((buf)+fmt->Gshift/8);                             \
+                b = *((buf)+fmt->Bshift/8);                             \
+            } else {                                                    \
+                r = *((buf)+2-fmt->Rshift/8);                           \
+                g = *((buf)+2-fmt->Gshift/8);                           \
+                b = *((buf)+2-fmt->Bshift/8);                           \
+            }                                                           \
+        }                                                               \
+        break;                                                          \
+                                                                        \
+        case 4:                                                         \
+            Pixel = *((Uint32 *)(buf));                                 \
+            RGB_FROM_PIXEL(Pixel, fmt, r, g, b);                        \
+        break;                                                          \
+                                                                        \
+        default:                                                        \
+                /* stop gcc complaints */                               \
+                Pixel = 0;                                              \
+                r = g = b = 0;                                          \
+        break;                                                          \
+    }                                                                   \
+} while (0)
+
+/* Assemble R-G-B values into a specified pixel format and store them */
+#define PIXEL_FROM_RGB(Pixel, fmt, r, g, b)                             \
+{                                                                       \
+    Pixel = ((r>>fmt->Rloss)<<fmt->Rshift)|                             \
+        ((g>>fmt->Gloss)<<fmt->Gshift)|                                 \
+        ((b>>fmt->Bloss)<<fmt->Bshift)|                                 \
+        fmt->Amask;                                                     \
+}
+#define RGB565_FROM_RGB(Pixel, r, g, b)                                 \
+{                                                                       \
+    Pixel = ((r>>3)<<11)|((g>>2)<<5)|(b>>3);                            \
+}
+#define RGB555_FROM_RGB(Pixel, r, g, b)                                 \
+{                                                                       \
+    Pixel = ((r>>3)<<10)|((g>>3)<<5)|(b>>3);                            \
+}
+#define RGB888_FROM_RGB(Pixel, r, g, b)                                 \
+{                                                                       \
+    Pixel = (r<<16)|(g<<8)|b;                                           \
+}
+#define ARGB8888_FROM_RGBA(Pixel, r, g, b, a)                           \
+{                                                                       \
+    Pixel = (a<<24)|(r<<16)|(g<<8)|b;                                   \
+}
+#define RGBA8888_FROM_RGBA(Pixel, r, g, b, a)                           \
+{                                                                       \
+    Pixel = (r<<24)|(g<<16)|(b<<8)|a;                                   \
+}
+#define ABGR8888_FROM_RGBA(Pixel, r, g, b, a)                           \
+{                                                                       \
+    Pixel = (a<<24)|(b<<16)|(g<<8)|r;                                   \
+}
+#define BGRA8888_FROM_RGBA(Pixel, r, g, b, a)                           \
+{                                                                       \
+    Pixel = (b<<24)|(g<<16)|(r<<8)|a;                                   \
+}
+#define ARGB2101010_FROM_RGBA(Pixel, r, g, b, a)                        \
+{                                                                       \
+    r = r ? ((r << 2) | 0x3) : 0;                                       \
+    g = g ? ((g << 2) | 0x3) : 0;                                       \
+    b = b ? ((b << 2) | 0x3) : 0;                                       \
+    a = (a * 3) / 255;                                                  \
+    Pixel = (a<<30)|(r<<20)|(g<<10)|b;                                  \
+}
+#define ASSEMBLE_RGB(buf, bpp, fmt, r, g, b)                            \
+{                                                                       \
+    switch (bpp) {                                                      \
+        case 1: {                                                       \
+            Uint8 Pixel;                                                \
+                                                                        \
+            PIXEL_FROM_RGB(Pixel, fmt, r, g, b);                        \
+            *((Uint8 *)(buf)) = Pixel;                                  \
+        }                                                               \
+        break;                                                          \
+                                                                        \
+        case 2: {                                                       \
+            Uint16 Pixel;                                               \
+                                                                        \
+            PIXEL_FROM_RGB(Pixel, fmt, r, g, b);                        \
+            *((Uint16 *)(buf)) = Pixel;                                 \
+        }                                                               \
+        break;                                                          \
+                                                                        \
+        case 3: {                                                       \
+            if (SDL_BYTEORDER == SDL_LIL_ENDIAN) {                      \
+                *((buf)+fmt->Rshift/8) = r;                             \
+                *((buf)+fmt->Gshift/8) = g;                             \
+                *((buf)+fmt->Bshift/8) = b;                             \
+            } else {                                                    \
+                *((buf)+2-fmt->Rshift/8) = r;                           \
+                *((buf)+2-fmt->Gshift/8) = g;                           \
+                *((buf)+2-fmt->Bshift/8) = b;                           \
+            }                                                           \
+        }                                                               \
+        break;                                                          \
+                                                                        \
+        case 4: {                                                       \
+            Uint32 Pixel;                                               \
+                                                                        \
+            PIXEL_FROM_RGB(Pixel, fmt, r, g, b);                        \
+            *((Uint32 *)(buf)) = Pixel;                                 \
+        }                                                               \
+        break;                                                          \
+    }                                                                   \
+}
+
+/* FIXME: Should we rescale alpha into 0..255 here? */
+#define RGBA_FROM_PIXEL(Pixel, fmt, r, g, b, a)                         \
+{                                                                       \
+    r = SDL_expand_byte[fmt->Rloss][((Pixel&fmt->Rmask)>>fmt->Rshift)]; \
+    g = SDL_expand_byte[fmt->Gloss][((Pixel&fmt->Gmask)>>fmt->Gshift)]; \
+    b = SDL_expand_byte[fmt->Bloss][((Pixel&fmt->Bmask)>>fmt->Bshift)]; \
+    a = SDL_expand_byte[fmt->Aloss][((Pixel&fmt->Amask)>>fmt->Ashift)]; \
+}
+#define RGBA_FROM_8888(Pixel, fmt, r, g, b, a)                          \
+{                                                                       \
+    r = (Pixel&fmt->Rmask)>>fmt->Rshift;                                \
+    g = (Pixel&fmt->Gmask)>>fmt->Gshift;                                \
+    b = (Pixel&fmt->Bmask)>>fmt->Bshift;                                \
+    a = (Pixel&fmt->Amask)>>fmt->Ashift;                                \
+}
+#define RGBA_FROM_RGBA8888(Pixel, r, g, b, a)                           \
+{                                                                       \
+    r = (Pixel>>24);                                                    \
+    g = ((Pixel>>16)&0xFF);                                             \
+    b = ((Pixel>>8)&0xFF);                                              \
+    a = (Pixel&0xFF);                                                   \
+}
+#define RGBA_FROM_ARGB8888(Pixel, r, g, b, a)                           \
+{                                                                       \
+    r = ((Pixel>>16)&0xFF);                                             \
+    g = ((Pixel>>8)&0xFF);                                              \
+    b = (Pixel&0xFF);                                                   \
+    a = (Pixel>>24);                                                    \
+}
+#define RGBA_FROM_ABGR8888(Pixel, r, g, b, a)                           \
+{                                                                       \
+    r = (Pixel&0xFF);                                                   \
+    g = ((Pixel>>8)&0xFF);                                              \
+    b = ((Pixel>>16)&0xFF);                                             \
+    a = (Pixel>>24);                                                    \
+}
+#define RGBA_FROM_BGRA8888(Pixel, r, g, b, a)                           \
+{                                                                       \
+    r = ((Pixel>>8)&0xFF);                                              \
+    g = ((Pixel>>16)&0xFF);                                             \
+    b = (Pixel>>24);                                                    \
+    a = (Pixel&0xFF);                                                   \
+}
+#define RGBA_FROM_ARGB2101010(Pixel, r, g, b, a)                        \
+{                                                                       \
+    r = ((Pixel>>22)&0xFF);                                             \
+    g = ((Pixel>>12)&0xFF);                                             \
+    b = ((Pixel>>2)&0xFF);                                              \
+    a = SDL_expand_byte[6][(Pixel>>30)];                                \
+}
+#define DISEMBLE_RGBA(buf, bpp, fmt, Pixel, r, g, b, a)                 \
+do {                                                                    \
+    switch (bpp) {                                                      \
+        case 1:                                                         \
+            Pixel = *((Uint8 *)(buf));                                  \
+            RGBA_FROM_PIXEL(Pixel, fmt, r, g, b, a);                    \
+        break;                                                          \
+                                                                        \
+        case 2:                                                         \
+            Pixel = *((Uint16 *)(buf));                                 \
+            RGBA_FROM_PIXEL(Pixel, fmt, r, g, b, a);                    \
+        break;                                                          \
+                                                                        \
+        case 3: {                                                       \
+            Pixel = 0;                                                  \
+            if (SDL_BYTEORDER == SDL_LIL_ENDIAN) {                      \
+                r = *((buf)+fmt->Rshift/8);                             \
+                g = *((buf)+fmt->Gshift/8);                             \
+                b = *((buf)+fmt->Bshift/8);                             \
+            } else {                                                    \
+                r = *((buf)+2-fmt->Rshift/8);                           \
+                g = *((buf)+2-fmt->Gshift/8);                           \
+                b = *((buf)+2-fmt->Bshift/8);                           \
+            }                                                           \
+            a = 0xFF;                                                   \
+        }                                                               \
+        break;                                                          \
+                                                                        \
+        case 4:                                                         \
+            Pixel = *((Uint32 *)(buf));                                 \
+            RGBA_FROM_PIXEL(Pixel, fmt, r, g, b, a);                    \
+        break;                                                          \
+                                                                        \
+        default:                                                        \
+            /* stop gcc complaints */                                   \
+            Pixel = 0;                                                  \
+            r = g = b = a = 0;                                          \
+        break;                                                          \
+    }                                                                   \
+} while (0)
+
+/* FIXME: this isn't correct, especially for Alpha (maximum != 255) */
+#define PIXEL_FROM_RGBA(Pixel, fmt, r, g, b, a)                         \
+{                                                                       \
+    Pixel = ((r>>fmt->Rloss)<<fmt->Rshift)|                             \
+        ((g>>fmt->Gloss)<<fmt->Gshift)|                                 \
+        ((b>>fmt->Bloss)<<fmt->Bshift)|                                 \
+        ((a>>fmt->Aloss)<<fmt->Ashift);                                 \
+}
+#define ASSEMBLE_RGBA(buf, bpp, fmt, r, g, b, a)                        \
+{                                                                       \
+    switch (bpp) {                                                      \
+        case 1: {                                                       \
+            Uint8 Pixel;                                                \
+                                                                        \
+            PIXEL_FROM_RGBA(Pixel, fmt, r, g, b, a);                    \
+            *((Uint8 *)(buf)) = Pixel;                                  \
+        }                                                               \
+        break;                                                          \
+                                                                        \
+        case 2: {                                                       \
+            Uint16 Pixel;                                               \
+                                                                        \
+            PIXEL_FROM_RGBA(Pixel, fmt, r, g, b, a);                    \
+            *((Uint16 *)(buf)) = Pixel;                                 \
+        }                                                               \
+        break;                                                          \
+                                                                        \
+        case 3: {                                                       \
+            if (SDL_BYTEORDER == SDL_LIL_ENDIAN) {                      \
+                *((buf)+fmt->Rshift/8) = r;                             \
+                *((buf)+fmt->Gshift/8) = g;                             \
+                *((buf)+fmt->Bshift/8) = b;                             \
+            } else {                                                    \
+                *((buf)+2-fmt->Rshift/8) = r;                           \
+                *((buf)+2-fmt->Gshift/8) = g;                           \
+                *((buf)+2-fmt->Bshift/8) = b;                           \
+            }                                                           \
+        }                                                               \
+        break;                                                          \
+                                                                        \
+        case 4: {                                                       \
+            Uint32 Pixel;                                               \
+                                                                        \
+            PIXEL_FROM_RGBA(Pixel, fmt, r, g, b, a);                    \
+            *((Uint32 *)(buf)) = Pixel;                                 \
+        }                                                               \
+        break;                                                          \
+    }                                                                   \
+}
+
+/* Blend the RGB values of two pixels with an alpha value */
+#define ALPHA_BLEND_RGB(sR, sG, sB, A, dR, dG, dB)                      \
+do {                                                                    \
+    dR = ((((unsigned)(sR-dR)*(unsigned)A)/255)+dR);                    \
+    dG = ((((unsigned)(sG-dG)*(unsigned)A)/255)+dG);                    \
+    dB = ((((unsigned)(sB-dB)*(unsigned)A)/255)+dB);                    \
+} while(0)
+
+
+/* Blend the RGBA values of two pixels */
+#define ALPHA_BLEND_RGBA(sR, sG, sB, sA, dR, dG, dB, dA)                \
+do {                                                                    \
+    dR = ((((unsigned)(sR-dR)*(unsigned)sA)/255)+dR);                   \
+    dG = ((((unsigned)(sG-dG)*(unsigned)sA)/255)+dG);                   \
+    dB = ((((unsigned)(sB-dB)*(unsigned)sA)/255)+dB);                   \
+    dA = ((unsigned)sA+(unsigned)dA-((unsigned)sA*dA)/255);             \
+} while(0)
+
+
+/* This is a very useful loop for optimizing blitters */
+#if defined(_MSC_VER) && (_MSC_VER == 1300)
+/* There's a bug in the Visual C++ 7 optimizer when compiling this code */
+#else
+#define USE_DUFFS_LOOP
+#endif
+#ifdef USE_DUFFS_LOOP
+
+/* 8-times unrolled loop */
+#define DUFFS_LOOP8(pixel_copy_increment, width)                        \
+{ int n = (width+7)/8;                                                  \
+    switch (width & 7) {                                                \
+    case 0: do {    pixel_copy_increment;                               \
+    case 7:     pixel_copy_increment;                                   \
+    case 6:     pixel_copy_increment;                                   \
+    case 5:     pixel_copy_increment;                                   \
+    case 4:     pixel_copy_increment;                                   \
+    case 3:     pixel_copy_increment;                                   \
+    case 2:     pixel_copy_increment;                                   \
+    case 1:     pixel_copy_increment;                                   \
+        } while ( --n > 0 );                                            \
+    }                                                                   \
+}
+
+/* 4-times unrolled loop */
+#define DUFFS_LOOP4(pixel_copy_increment, width)                        \
+{ int n = (width+3)/4;                                                  \
+    switch (width & 3) {                                                \
+    case 0: do {    pixel_copy_increment;                               \
+    case 3:     pixel_copy_increment;                                   \
+    case 2:     pixel_copy_increment;                                   \
+    case 1:     pixel_copy_increment;                                   \
+        } while (--n > 0);                                              \
+    }                                                                   \
+}
+
+/* Use the 8-times version of the loop by default */
+#define DUFFS_LOOP(pixel_copy_increment, width)                         \
+    DUFFS_LOOP8(pixel_copy_increment, width)
+
+/* Special version of Duff's device for even more optimization */
+#define DUFFS_LOOP_124(pixel_copy_increment1,                           \
+                       pixel_copy_increment2,                           \
+                       pixel_copy_increment4, width)                    \
+{ int n = width;                                                        \
+    if (n & 1) {                                                        \
+        pixel_copy_increment1; n -= 1;                                  \
+    }                                                                   \
+    if (n & 2) {                                                        \
+        pixel_copy_increment2; n -= 2;                                  \
+    }                                                                   \
+    if (n & 4) {                                                        \
+        pixel_copy_increment4; n -= 4;                                  \
+    }                                                                   \
+    if (n) {                                                            \
+        n /= 8;                                                         \
+        do {                                                            \
+            pixel_copy_increment4;                                      \
+            pixel_copy_increment4;                                      \
+        } while (--n > 0);                                              \
+    }                                                                   \
+}
+
+#else
+
+/* Don't use Duff's device to unroll loops */
+#define DUFFS_LOOP(pixel_copy_increment, width)                         \
+{ int n;                                                                \
+    for ( n=width; n > 0; --n ) {                                       \
+        pixel_copy_increment;                                           \
+    }                                                                   \
+}
+#define DUFFS_LOOP8(pixel_copy_increment, width)                        \
+    DUFFS_LOOP(pixel_copy_increment, width)
+#define DUFFS_LOOP4(pixel_copy_increment, width)                        \
+    DUFFS_LOOP(pixel_copy_increment, width)
+#define DUFFS_LOOP_124(pixel_copy_increment1,                           \
+                       pixel_copy_increment2,                           \
+                       pixel_copy_increment4, width)                    \
+    DUFFS_LOOP(pixel_copy_increment1, width)
+
+#endif /* USE_DUFFS_LOOP */
+
+/* Prevent Visual C++ 6.0 from printing out stupid warnings */
+#if defined(_MSC_VER) && (_MSC_VER >= 600)
+#pragma warning(disable: 4550)
+#endif
+
+#endif /* _SDL_blit_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_0.c b/Source/3rd Party/sdl/src/video/SDL_blit_0.c
new file mode 100644
index 000000000..a820fb379
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_0.c	
@@ -0,0 +1,483 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+#include "SDL_blit.h"
+
+/* Functions to blit from bitmaps to other surfaces */
+
+static void
+BlitBto1(SDL_BlitInfo * info)
+{
+    int c;
+    int width, height;
+    Uint8 *src, *map, *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = info->src;
+    srcskip = info->src_skip;
+    dst = info->dst;
+    dstskip = info->dst_skip;
+    map = info->table;
+    srcskip += width - (width + 7) / 8;
+
+    if (map) {
+        while (height--) {
+            Uint8 byte = 0, bit;
+            for (c = 0; c < width; ++c) {
+                if ((c & 7) == 0) {
+                    byte = *src++;
+                }
+                bit = (byte & 0x80) >> 7;
+                if (1) {
+                    *dst = map[bit];
+                }
+                dst++;
+                byte <<= 1;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        while (height--) {
+            Uint8 byte = 0, bit;
+            for (c = 0; c < width; ++c) {
+                if ((c & 7) == 0) {
+                    byte = *src++;
+                }
+                bit = (byte & 0x80) >> 7;
+                if (1) {
+                    *dst = bit;
+                }
+                dst++;
+                byte <<= 1;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+}
+
+static void
+BlitBto2(SDL_BlitInfo * info)
+{
+    int c;
+    int width, height;
+    Uint8 *src;
+    Uint16 *map, *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = info->src;
+    srcskip = info->src_skip;
+    dst = (Uint16 *) info->dst;
+    dstskip = info->dst_skip / 2;
+    map = (Uint16 *) info->table;
+    srcskip += width - (width + 7) / 8;
+
+    while (height--) {
+        Uint8 byte = 0, bit;
+        for (c = 0; c < width; ++c) {
+            if ((c & 7) == 0) {
+                byte = *src++;
+            }
+            bit = (byte & 0x80) >> 7;
+            if (1) {
+                *dst = map[bit];
+            }
+            byte <<= 1;
+            dst++;
+        }
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+BlitBto3(SDL_BlitInfo * info)
+{
+    int c, o;
+    int width, height;
+    Uint8 *src, *map, *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = info->src;
+    srcskip = info->src_skip;
+    dst = info->dst;
+    dstskip = info->dst_skip;
+    map = info->table;
+    srcskip += width - (width + 7) / 8;
+
+    while (height--) {
+        Uint8 byte = 0, bit;
+        for (c = 0; c < width; ++c) {
+            if ((c & 7) == 0) {
+                byte = *src++;
+            }
+            bit = (byte & 0x80) >> 7;
+            if (1) {
+                o = bit * 4;
+                dst[0] = map[o++];
+                dst[1] = map[o++];
+                dst[2] = map[o++];
+            }
+            byte <<= 1;
+            dst += 3;
+        }
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+BlitBto4(SDL_BlitInfo * info)
+{
+    int width, height;
+    Uint8 *src;
+    Uint32 *map, *dst;
+    int srcskip, dstskip;
+    int c;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = info->src;
+    srcskip = info->src_skip;
+    dst = (Uint32 *) info->dst;
+    dstskip = info->dst_skip / 4;
+    map = (Uint32 *) info->table;
+    srcskip += width - (width + 7) / 8;
+
+    while (height--) {
+        Uint8 byte = 0, bit;
+        for (c = 0; c < width; ++c) {
+            if ((c & 7) == 0) {
+                byte = *src++;
+            }
+            bit = (byte & 0x80) >> 7;
+            if (1) {
+                *dst = map[bit];
+            }
+            byte <<= 1;
+            dst++;
+        }
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+BlitBto1Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    Uint8 *dst = info->dst;
+    int srcskip = info->src_skip;
+    int dstskip = info->dst_skip;
+    Uint32 ckey = info->colorkey;
+    Uint8 *palmap = info->table;
+    int c;
+
+    /* Set up some basic variables */
+    srcskip += width - (width + 7) / 8;
+
+    if (palmap) {
+        while (height--) {
+            Uint8 byte = 0, bit;
+            for (c = 0; c < width; ++c) {
+                if ((c & 7) == 0) {
+                    byte = *src++;
+                }
+                bit = (byte & 0x80) >> 7;
+                if (bit != ckey) {
+                    *dst = palmap[bit];
+                }
+                dst++;
+                byte <<= 1;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        while (height--) {
+            Uint8 byte = 0, bit;
+            for (c = 0; c < width; ++c) {
+                if ((c & 7) == 0) {
+                    byte = *src++;
+                }
+                bit = (byte & 0x80) >> 7;
+                if (bit != ckey) {
+                    *dst = bit;
+                }
+                dst++;
+                byte <<= 1;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+}
+
+static void
+BlitBto2Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    Uint16 *dstp = (Uint16 *) info->dst;
+    int srcskip = info->src_skip;
+    int dstskip = info->dst_skip;
+    Uint32 ckey = info->colorkey;
+    Uint8 *palmap = info->table;
+    int c;
+
+    /* Set up some basic variables */
+    srcskip += width - (width + 7) / 8;
+    dstskip /= 2;
+
+    while (height--) {
+        Uint8 byte = 0, bit;
+        for (c = 0; c < width; ++c) {
+            if ((c & 7) == 0) {
+                byte = *src++;
+            }
+            bit = (byte & 0x80) >> 7;
+            if (bit != ckey) {
+                *dstp = ((Uint16 *) palmap)[bit];
+            }
+            byte <<= 1;
+            dstp++;
+        }
+        src += srcskip;
+        dstp += dstskip;
+    }
+}
+
+static void
+BlitBto3Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    Uint8 *dst = info->dst;
+    int srcskip = info->src_skip;
+    int dstskip = info->dst_skip;
+    Uint32 ckey = info->colorkey;
+    Uint8 *palmap = info->table;
+    int c;
+
+    /* Set up some basic variables */
+    srcskip += width - (width + 7) / 8;
+
+    while (height--) {
+        Uint8 byte = 0, bit;
+        for (c = 0; c < width; ++c) {
+            if ((c & 7) == 0) {
+                byte = *src++;
+            }
+            bit = (byte & 0x80) >> 7;
+            if (bit != ckey) {
+                SDL_memcpy(dst, &palmap[bit * 4], 3);
+            }
+            byte <<= 1;
+            dst += 3;
+        }
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+BlitBto4Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    Uint32 *dstp = (Uint32 *) info->dst;
+    int srcskip = info->src_skip;
+    int dstskip = info->dst_skip;
+    Uint32 ckey = info->colorkey;
+    Uint8 *palmap = info->table;
+    int c;
+
+    /* Set up some basic variables */
+    srcskip += width - (width + 7) / 8;
+    dstskip /= 4;
+
+    while (height--) {
+        Uint8 byte = 0, bit;
+        for (c = 0; c < width; ++c) {
+            if ((c & 7) == 0) {
+                byte = *src++;
+            }
+            bit = (byte & 0x80) >> 7;
+            if (bit != ckey) {
+                *dstp = ((Uint32 *) palmap)[bit];
+            }
+            byte <<= 1;
+            dstp++;
+        }
+        src += srcskip;
+        dstp += dstskip;
+    }
+}
+
+static void
+BlitBtoNAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    Uint8 *dst = info->dst;
+    int srcskip = info->src_skip;
+    int dstskip = info->dst_skip;
+    const SDL_Color *srcpal = info->src_fmt->palette->colors;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int dstbpp;
+    int c;
+    Uint32 pixel;
+    unsigned sR, sG, sB;
+    unsigned dR, dG, dB, dA;
+    const unsigned A = info->a;
+
+    /* Set up some basic variables */
+    dstbpp = dstfmt->BytesPerPixel;
+    srcskip += width - (width + 7) / 8;
+
+    while (height--) {
+        Uint8 byte = 0, bit;
+        for (c = 0; c < width; ++c) {
+            if ((c & 7) == 0) {
+                byte = *src++;
+            }
+            bit = (byte & 0x80) >> 7;
+            if (1) {
+                sR = srcpal[bit].r;
+                sG = srcpal[bit].g;
+                sB = srcpal[bit].b;
+                DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+                ALPHA_BLEND_RGBA(sR, sG, sB, A, dR, dG, dB, dA);
+                ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
+            }
+            byte <<= 1;
+            dst += dstbpp;
+        }
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+BlitBtoNAlphaKey(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    Uint8 *dst = info->dst;
+    int srcskip = info->src_skip;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    const SDL_Color *srcpal = srcfmt->palette->colors;
+    int dstbpp;
+    int c;
+    Uint32 pixel;
+    unsigned sR, sG, sB;
+    unsigned dR, dG, dB, dA;
+    const unsigned A = info->a;
+    Uint32 ckey = info->colorkey;
+
+    /* Set up some basic variables */
+    dstbpp = dstfmt->BytesPerPixel;
+    srcskip += width - (width + 7) / 8;
+
+    while (height--) {
+        Uint8 byte = 0, bit;
+        for (c = 0; c < width; ++c) {
+            if ((c & 7) == 0) {
+                byte = *src++;
+            }
+            bit = (byte & 0x80) >> 7;
+            if (bit != ckey) {
+                sR = srcpal[bit].r;
+                sG = srcpal[bit].g;
+                sB = srcpal[bit].b;
+                DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+                ALPHA_BLEND_RGBA(sR, sG, sB, A, dR, dG, dB, dA);
+                ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
+            }
+            byte <<= 1;
+            dst += dstbpp;
+        }
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static const SDL_BlitFunc bitmap_blit[] = {
+    (SDL_BlitFunc) NULL, BlitBto1, BlitBto2, BlitBto3, BlitBto4
+};
+
+static const SDL_BlitFunc colorkey_blit[] = {
+    (SDL_BlitFunc) NULL, BlitBto1Key, BlitBto2Key, BlitBto3Key, BlitBto4Key
+};
+
+SDL_BlitFunc
+SDL_CalculateBlit0(SDL_Surface * surface)
+{
+    int which;
+
+    if (surface->format->BitsPerPixel != 1) {
+        /* We don't support sub 8-bit packed pixel modes */
+        return (SDL_BlitFunc) NULL;
+    }
+    if (surface->map->dst->format->BitsPerPixel < 8) {
+        which = 0;
+    } else {
+        which = surface->map->dst->format->BytesPerPixel;
+    }
+    switch (surface->map->info.flags & ~SDL_COPY_RLE_MASK) {
+    case 0:
+        return bitmap_blit[which];
+
+    case SDL_COPY_COLORKEY:
+        return colorkey_blit[which];
+
+    case SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
+        return which >= 2 ? BlitBtoNAlpha : (SDL_BlitFunc) NULL;
+
+    case SDL_COPY_COLORKEY | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
+        return which >= 2 ? BlitBtoNAlphaKey : (SDL_BlitFunc) NULL;
+    }
+    return (SDL_BlitFunc) NULL;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_1.c b/Source/3rd Party/sdl/src/video/SDL_blit_1.c
new file mode 100644
index 000000000..4dfcabda6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_1.c	
@@ -0,0 +1,550 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+#include "SDL_blit.h"
+#include "SDL_sysvideo.h"
+#include "SDL_endian.h"
+
+/* Functions to blit from 8-bit surfaces to other surfaces */
+
+static void
+Blit1to1(SDL_BlitInfo * info)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int width, height;
+    Uint8 *src, *map, *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = info->src;
+    srcskip = info->src_skip;
+    dst = info->dst;
+    dstskip = info->dst_skip;
+    map = info->table;
+
+    while (height--) {
+#ifdef USE_DUFFS_LOOP
+        /* *INDENT-OFF* */
+		DUFFS_LOOP(
+			{
+			  *dst = map[*src];
+			}
+			dst++;
+			src++;
+		, width);
+        /* *INDENT-ON* */
+#else
+        for (c = width; c; --c) {
+            *dst = map[*src];
+            dst++;
+            src++;
+        }
+#endif
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+/* This is now endian dependent */
+#if ( SDL_BYTEORDER == SDL_LIL_ENDIAN )
+#define HI	1
+#define LO	0
+#else /* ( SDL_BYTEORDER == SDL_BIG_ENDIAN ) */
+#define HI	0
+#define LO	1
+#endif
+static void
+Blit1to2(SDL_BlitInfo * info)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int width, height;
+    Uint8 *src, *dst;
+    Uint16 *map;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = info->src;
+    srcskip = info->src_skip;
+    dst = info->dst;
+    dstskip = info->dst_skip;
+    map = (Uint16 *) info->table;
+
+#ifdef USE_DUFFS_LOOP
+    while (height--) {
+		/* *INDENT-OFF* */
+		DUFFS_LOOP(
+		{
+			*(Uint16 *)dst = map[*src++];
+			dst += 2;
+		},
+		width);
+		/* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+#else
+    /* Memory align at 4-byte boundary, if necessary */
+    if ((long) dst & 0x03) {
+        /* Don't do anything if width is 0 */
+        if (width == 0) {
+            return;
+        }
+        --width;
+
+        while (height--) {
+            /* Perform copy alignment */
+            *(Uint16 *) dst = map[*src++];
+            dst += 2;
+
+            /* Copy in 4 pixel chunks */
+            for (c = width / 4; c; --c) {
+                *(Uint32 *) dst = (map[src[HI]] << 16) | (map[src[LO]]);
+                src += 2;
+                dst += 4;
+                *(Uint32 *) dst = (map[src[HI]] << 16) | (map[src[LO]]);
+                src += 2;
+                dst += 4;
+            }
+            /* Get any leftovers */
+            switch (width & 3) {
+            case 3:
+                *(Uint16 *) dst = map[*src++];
+                dst += 2;
+            case 2:
+                *(Uint32 *) dst = (map[src[HI]] << 16) | (map[src[LO]]);
+                src += 2;
+                dst += 4;
+                break;
+            case 1:
+                *(Uint16 *) dst = map[*src++];
+                dst += 2;
+                break;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        while (height--) {
+            /* Copy in 4 pixel chunks */
+            for (c = width / 4; c; --c) {
+                *(Uint32 *) dst = (map[src[HI]] << 16) | (map[src[LO]]);
+                src += 2;
+                dst += 4;
+                *(Uint32 *) dst = (map[src[HI]] << 16) | (map[src[LO]]);
+                src += 2;
+                dst += 4;
+            }
+            /* Get any leftovers */
+            switch (width & 3) {
+            case 3:
+                *(Uint16 *) dst = map[*src++];
+                dst += 2;
+            case 2:
+                *(Uint32 *) dst = (map[src[HI]] << 16) | (map[src[LO]]);
+                src += 2;
+                dst += 4;
+                break;
+            case 1:
+                *(Uint16 *) dst = map[*src++];
+                dst += 2;
+                break;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+#endif /* USE_DUFFS_LOOP */
+}
+
+static void
+Blit1to3(SDL_BlitInfo * info)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int o;
+    int width, height;
+    Uint8 *src, *map, *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = info->src;
+    srcskip = info->src_skip;
+    dst = info->dst;
+    dstskip = info->dst_skip;
+    map = info->table;
+
+    while (height--) {
+#ifdef USE_DUFFS_LOOP
+		/* *INDENT-OFF* */
+		DUFFS_LOOP(
+			{
+				o = *src * 4;
+				dst[0] = map[o++];
+				dst[1] = map[o++];
+				dst[2] = map[o++];
+			}
+			src++;
+			dst += 3;
+		, width);
+		/* *INDENT-ON* */
+#else
+        for (c = width; c; --c) {
+            o = *src * 4;
+            dst[0] = map[o++];
+            dst[1] = map[o++];
+            dst[2] = map[o++];
+            src++;
+            dst += 3;
+        }
+#endif /* USE_DUFFS_LOOP */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+Blit1to4(SDL_BlitInfo * info)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int width, height;
+    Uint8 *src;
+    Uint32 *map, *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = info->src;
+    srcskip = info->src_skip;
+    dst = (Uint32 *) info->dst;
+    dstskip = info->dst_skip / 4;
+    map = (Uint32 *) info->table;
+
+    while (height--) {
+#ifdef USE_DUFFS_LOOP
+		/* *INDENT-OFF* */
+		DUFFS_LOOP(
+			*dst++ = map[*src++];
+		, width);
+		/* *INDENT-ON* */
+#else
+        for (c = width / 4; c; --c) {
+            *dst++ = map[*src++];
+            *dst++ = map[*src++];
+            *dst++ = map[*src++];
+            *dst++ = map[*src++];
+        }
+        switch (width & 3) {
+        case 3:
+            *dst++ = map[*src++];
+        case 2:
+            *dst++ = map[*src++];
+        case 1:
+            *dst++ = map[*src++];
+        }
+#endif /* USE_DUFFS_LOOP */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+Blit1to1Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    Uint8 *palmap = info->table;
+    Uint32 ckey = info->colorkey;
+
+    if (palmap) {
+        while (height--) {
+			/* *INDENT-OFF* */
+			DUFFS_LOOP(
+			{
+				if ( *src != ckey ) {
+				  *dst = palmap[*src];
+				}
+				dst++;
+				src++;
+			},
+			width);
+			/* *INDENT-ON* */
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        while (height--) {
+			/* *INDENT-OFF* */
+			DUFFS_LOOP(
+			{
+				if ( *src != ckey ) {
+				  *dst = *src;
+				}
+				dst++;
+				src++;
+			},
+			width);
+			/* *INDENT-ON* */
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+}
+
+static void
+Blit1to2Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint16 *dstp = (Uint16 *) info->dst;
+    int dstskip = info->dst_skip;
+    Uint16 *palmap = (Uint16 *) info->table;
+    Uint32 ckey = info->colorkey;
+
+    /* Set up some basic variables */
+    dstskip /= 2;
+
+    while (height--) {
+		/* *INDENT-OFF* */
+		DUFFS_LOOP(
+		{
+			if ( *src != ckey ) {
+				*dstp=palmap[*src];
+			}
+			src++;
+			dstp++;
+		},
+		width);
+		/* *INDENT-ON* */
+        src += srcskip;
+        dstp += dstskip;
+    }
+}
+
+static void
+Blit1to3Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    Uint8 *palmap = info->table;
+    Uint32 ckey = info->colorkey;
+    int o;
+
+    while (height--) {
+		/* *INDENT-OFF* */
+		DUFFS_LOOP(
+		{
+			if ( *src != ckey ) {
+				o = *src * 4;
+				dst[0] = palmap[o++];
+				dst[1] = palmap[o++];
+				dst[2] = palmap[o++];
+			}
+			src++;
+			dst += 3;
+		},
+		width);
+		/* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+Blit1to4Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint32 *dstp = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip;
+    Uint32 *palmap = (Uint32 *) info->table;
+    Uint32 ckey = info->colorkey;
+
+    /* Set up some basic variables */
+    dstskip /= 4;
+
+    while (height--) {
+		/* *INDENT-OFF* */
+		DUFFS_LOOP(
+		{
+			if ( *src != ckey ) {
+				*dstp = palmap[*src];
+			}
+			src++;
+			dstp++;
+		},
+		width);
+		/* *INDENT-ON* */
+        src += srcskip;
+        dstp += dstskip;
+    }
+}
+
+static void
+Blit1toNAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    const SDL_Color *srcpal = info->src_fmt->palette->colors;
+    int dstbpp;
+    Uint32 pixel;
+    unsigned sR, sG, sB;
+    unsigned dR, dG, dB, dA;
+    const unsigned A = info->a;
+
+    /* Set up some basic variables */
+    dstbpp = dstfmt->BytesPerPixel;
+
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP4(
+        {
+            sR = srcpal[*src].r;
+            sG = srcpal[*src].g;
+            sB = srcpal[*src].b;
+            DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+            ALPHA_BLEND_RGBA(sR, sG, sB, A, dR, dG, dB, dA);
+            ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
+            src++;
+            dst += dstbpp;
+        },
+        width);
+        /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+Blit1toNAlphaKey(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    const SDL_Color *srcpal = info->src_fmt->palette->colors;
+    Uint32 ckey = info->colorkey;
+    int dstbpp;
+    Uint32 pixel;
+    unsigned sR, sG, sB;
+    unsigned dR, dG, dB, dA;
+    const unsigned A = info->a;
+
+    /* Set up some basic variables */
+    dstbpp = dstfmt->BytesPerPixel;
+
+    while (height--) {
+		/* *INDENT-OFF* */
+		DUFFS_LOOP(
+		{
+			if ( *src != ckey ) {
+				sR = srcpal[*src].r;
+				sG = srcpal[*src].g;
+				sB = srcpal[*src].b;
+				DISEMBLE_RGBA(dst, dstbpp, dstfmt, pixel, dR, dG, dB, dA);
+				ALPHA_BLEND_RGBA(sR, sG, sB, A, dR, dG, dB, dA);
+			  	ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
+			}
+			src++;
+			dst += dstbpp;
+		},
+		width);
+		/* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static const SDL_BlitFunc one_blit[] = {
+    (SDL_BlitFunc) NULL, Blit1to1, Blit1to2, Blit1to3, Blit1to4
+};
+
+static const SDL_BlitFunc one_blitkey[] = {
+    (SDL_BlitFunc) NULL, Blit1to1Key, Blit1to2Key, Blit1to3Key, Blit1to4Key
+};
+
+SDL_BlitFunc
+SDL_CalculateBlit1(SDL_Surface * surface)
+{
+    int which;
+    SDL_PixelFormat *dstfmt;
+
+    dstfmt = surface->map->dst->format;
+    if (dstfmt->BitsPerPixel < 8) {
+        which = 0;
+    } else {
+        which = dstfmt->BytesPerPixel;
+    }
+    switch (surface->map->info.flags & ~SDL_COPY_RLE_MASK) {
+    case 0:
+        return one_blit[which];
+
+    case SDL_COPY_COLORKEY:
+        return one_blitkey[which];
+
+    case SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
+        /* Supporting 8bpp->8bpp alpha is doable but requires lots of
+           tables which consume space and takes time to precompute,
+           so is better left to the user */
+        return which >= 2 ? Blit1toNAlpha : (SDL_BlitFunc) NULL;
+
+    case SDL_COPY_COLORKEY | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
+        return which >= 2 ? Blit1toNAlphaKey : (SDL_BlitFunc) NULL;
+    }
+    return (SDL_BlitFunc) NULL;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_A.c b/Source/3rd Party/sdl/src/video/SDL_blit_A.c
new file mode 100644
index 000000000..31bd0401e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_A.c	
@@ -0,0 +1,1388 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+#include "SDL_blit.h"
+
+/* Functions to perform alpha blended blitting */
+
+/* N->1 blending with per-surface alpha */
+static void
+BlitNto1SurfaceAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    Uint8 *palmap = info->table;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int srcbpp = srcfmt->BytesPerPixel;
+    Uint32 Pixel;
+    unsigned sR, sG, sB;
+    unsigned dR, dG, dB;
+    const unsigned A = info->a;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4(
+	    {
+		DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel, sR, sG, sB);
+		dR = dstfmt->palette->colors[*dst].r;
+		dG = dstfmt->palette->colors[*dst].g;
+		dB = dstfmt->palette->colors[*dst].b;
+		ALPHA_BLEND_RGB(sR, sG, sB, A, dR, dG, dB);
+		dR &= 0xff;
+		dG &= 0xff;
+		dB &= 0xff;
+		/* Pack RGB into 8bit pixel */
+		if ( palmap == NULL ) {
+		    *dst =((dR>>5)<<(3+2))|((dG>>5)<<(2))|((dB>>6)<<(0));
+		} else {
+		    *dst = palmap[((dR>>5)<<(3+2))|((dG>>5)<<(2))|((dB>>6)<<(0))];
+		}
+		dst++;
+		src += srcbpp;
+	    },
+	    width);
+	    /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+/* N->1 blending with pixel alpha */
+static void
+BlitNto1PixelAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    Uint8 *palmap = info->table;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int srcbpp = srcfmt->BytesPerPixel;
+    Uint32 Pixel;
+    unsigned sR, sG, sB, sA;
+    unsigned dR, dG, dB;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4(
+	    {
+		DISEMBLE_RGBA(src,srcbpp,srcfmt,Pixel,sR,sG,sB,sA);
+		dR = dstfmt->palette->colors[*dst].r;
+		dG = dstfmt->palette->colors[*dst].g;
+		dB = dstfmt->palette->colors[*dst].b;
+		ALPHA_BLEND_RGB(sR, sG, sB, sA, dR, dG, dB);
+		dR &= 0xff;
+		dG &= 0xff;
+		dB &= 0xff;
+		/* Pack RGB into 8bit pixel */
+		if ( palmap == NULL ) {
+		    *dst =((dR>>5)<<(3+2))|((dG>>5)<<(2))|((dB>>6)<<(0));
+		} else {
+		    *dst = palmap[((dR>>5)<<(3+2))|((dG>>5)<<(2))|((dB>>6)<<(0))];
+		}
+		dst++;
+		src += srcbpp;
+	    },
+	    width);
+	    /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+/* colorkeyed N->1 blending with per-surface alpha */
+static void
+BlitNto1SurfaceAlphaKey(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    Uint8 *palmap = info->table;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int srcbpp = srcfmt->BytesPerPixel;
+    Uint32 ckey = info->colorkey;
+    Uint32 Pixel;
+    unsigned sR, sG, sB;
+    unsigned dR, dG, dB;
+    const unsigned A = info->a;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP(
+	    {
+		DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel, sR, sG, sB);
+		if ( Pixel != ckey ) {
+		    dR = dstfmt->palette->colors[*dst].r;
+		    dG = dstfmt->palette->colors[*dst].g;
+		    dB = dstfmt->palette->colors[*dst].b;
+		    ALPHA_BLEND_RGB(sR, sG, sB, A, dR, dG, dB);
+		    dR &= 0xff;
+		    dG &= 0xff;
+		    dB &= 0xff;
+		    /* Pack RGB into 8bit pixel */
+		    if ( palmap == NULL ) {
+                *dst =((dR>>5)<<(3+2))|((dG>>5)<<(2))|((dB>>6)<<(0));
+		    } else {
+                *dst = palmap[((dR>>5)<<(3+2))|((dG>>5)<<(2))|((dB>>6)<<(0))];
+		    }
+		}
+		dst++;
+		src += srcbpp;
+	    },
+	    width);
+	    /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+#ifdef __MMX__
+
+/* fast RGB888->(A)RGB888 blending with surface alpha=128 special case */
+static void
+BlitRGBtoRGBSurfaceAlpha128MMX(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint32 *srcp = (Uint32 *) info->src;
+    int srcskip = info->src_skip >> 2;
+    Uint32 *dstp = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip >> 2;
+    Uint32 dalpha = info->dst_fmt->Amask;
+
+    __m64 src1, src2, dst1, dst2, lmask, hmask, dsta;
+
+    hmask = _mm_set_pi32(0x00fefefe, 0x00fefefe);       /* alpha128 mask -> hmask */
+    lmask = _mm_set_pi32(0x00010101, 0x00010101);       /* !alpha128 mask -> lmask */
+    dsta = _mm_set_pi32(dalpha, dalpha);        /* dst alpha mask -> dsta */
+
+    while (height--) {
+        int n = width;
+        if (n & 1) {
+            Uint32 s = *srcp++;
+            Uint32 d = *dstp;
+            *dstp++ = ((((s & 0x00fefefe) + (d & 0x00fefefe)) >> 1)
+                       + (s & d & 0x00010101)) | dalpha;
+            n--;
+        }
+
+        for (n >>= 1; n > 0; --n) {
+            dst1 = *(__m64 *) dstp;     /* 2 x dst -> dst1(ARGBARGB) */
+            dst2 = dst1;        /* 2 x dst -> dst2(ARGBARGB) */
+
+            src1 = *(__m64 *) srcp;     /* 2 x src -> src1(ARGBARGB) */
+            src2 = src1;        /* 2 x src -> src2(ARGBARGB) */
+
+            dst2 = _mm_and_si64(dst2, hmask);   /* dst & mask -> dst2 */
+            src2 = _mm_and_si64(src2, hmask);   /* src & mask -> src2 */
+            src2 = _mm_add_pi32(src2, dst2);    /* dst2 + src2 -> src2 */
+            src2 = _mm_srli_pi32(src2, 1);      /* src2 >> 1 -> src2 */
+
+            dst1 = _mm_and_si64(dst1, src1);    /* src & dst -> dst1 */
+            dst1 = _mm_and_si64(dst1, lmask);   /* dst1 & !mask -> dst1 */
+            dst1 = _mm_add_pi32(dst1, src2);    /* src2 + dst1 -> dst1 */
+            dst1 = _mm_or_si64(dst1, dsta);     /* dsta(full alpha) | dst1 -> dst1 */
+
+            *(__m64 *) dstp = dst1;     /* dst1 -> 2 x dst pixels */
+            dstp += 2;
+            srcp += 2;
+        }
+
+        srcp += srcskip;
+        dstp += dstskip;
+    }
+    _mm_empty();
+}
+
+/* fast RGB888->(A)RGB888 blending with surface alpha */
+static void
+BlitRGBtoRGBSurfaceAlphaMMX(SDL_BlitInfo * info)
+{
+    SDL_PixelFormat *df = info->dst_fmt;
+    Uint32 chanmask;
+    unsigned alpha = info->a;
+
+    if (alpha == 128 && (df->Rmask | df->Gmask | df->Bmask) == 0x00FFFFFF) {
+        /* only call a128 version when R,G,B occupy lower bits */
+        BlitRGBtoRGBSurfaceAlpha128MMX(info);
+    } else {
+        int width = info->dst_w;
+        int height = info->dst_h;
+        Uint32 *srcp = (Uint32 *) info->src;
+        int srcskip = info->src_skip >> 2;
+        Uint32 *dstp = (Uint32 *) info->dst;
+        int dstskip = info->dst_skip >> 2;
+        Uint32 dalpha = df->Amask;
+        Uint32 amult;
+
+        __m64 src1, src2, dst1, dst2, mm_alpha, mm_zero, dsta;
+
+        mm_zero = _mm_setzero_si64();   /* 0 -> mm_zero */
+        /* form the alpha mult */
+        amult = alpha | (alpha << 8);
+        amult = amult | (amult << 16);
+        chanmask =
+            (0xff << df->Rshift) | (0xff << df->
+                                    Gshift) | (0xff << df->Bshift);
+        mm_alpha = _mm_set_pi32(0, amult & chanmask);   /* 0000AAAA -> mm_alpha, minus 1 chan */
+        mm_alpha = _mm_unpacklo_pi8(mm_alpha, mm_zero); /* 0A0A0A0A -> mm_alpha, minus 1 chan */
+        /* at this point mm_alpha can be 000A0A0A or 0A0A0A00 or another combo */
+        dsta = _mm_set_pi32(dalpha, dalpha);    /* dst alpha mask -> dsta */
+
+        while (height--) {
+            int n = width;
+            if (n & 1) {
+                /* One Pixel Blend */
+                src2 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src2 (0000ARGB) */
+                src2 = _mm_unpacklo_pi8(src2, mm_zero); /* 0A0R0G0B -> src2 */
+
+                dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB) */
+                dst1 = _mm_unpacklo_pi8(dst1, mm_zero); /* 0A0R0G0B -> dst1 */
+
+                src2 = _mm_sub_pi16(src2, dst1);        /* src2 - dst2 -> src2 */
+                src2 = _mm_mullo_pi16(src2, mm_alpha);  /* src2 * alpha -> src2 */
+                src2 = _mm_srli_pi16(src2, 8);  /* src2 >> 8 -> src2 */
+                dst1 = _mm_add_pi8(src2, dst1); /* src2 + dst1 -> dst1 */
+
+                dst1 = _mm_packs_pu16(dst1, mm_zero);   /* 0000ARGB -> dst1 */
+                dst1 = _mm_or_si64(dst1, dsta); /* dsta | dst1 -> dst1 */
+                *dstp = _mm_cvtsi64_si32(dst1); /* dst1 -> pixel */
+
+                ++srcp;
+                ++dstp;
+
+                n--;
+            }
+
+            for (n >>= 1; n > 0; --n) {
+                /* Two Pixels Blend */
+                src1 = *(__m64 *) srcp; /* 2 x src -> src1(ARGBARGB) */
+                src2 = src1;    /* 2 x src -> src2(ARGBARGB) */
+                src1 = _mm_unpacklo_pi8(src1, mm_zero); /* low - 0A0R0G0B -> src1 */
+                src2 = _mm_unpackhi_pi8(src2, mm_zero); /* high - 0A0R0G0B -> src2 */
+
+                dst1 = *(__m64 *) dstp; /* 2 x dst -> dst1(ARGBARGB) */
+                dst2 = dst1;    /* 2 x dst -> dst2(ARGBARGB) */
+                dst1 = _mm_unpacklo_pi8(dst1, mm_zero); /* low - 0A0R0G0B -> dst1 */
+                dst2 = _mm_unpackhi_pi8(dst2, mm_zero); /* high - 0A0R0G0B -> dst2 */
+
+                src1 = _mm_sub_pi16(src1, dst1);        /* src1 - dst1 -> src1 */
+                src1 = _mm_mullo_pi16(src1, mm_alpha);  /* src1 * alpha -> src1 */
+                src1 = _mm_srli_pi16(src1, 8);  /* src1 >> 8 -> src1 */
+                dst1 = _mm_add_pi8(src1, dst1); /* src1 + dst1(dst1) -> dst1 */
+
+                src2 = _mm_sub_pi16(src2, dst2);        /* src2 - dst2 -> src2 */
+                src2 = _mm_mullo_pi16(src2, mm_alpha);  /* src2 * alpha -> src2 */
+                src2 = _mm_srli_pi16(src2, 8);  /* src2 >> 8 -> src2 */
+                dst2 = _mm_add_pi8(src2, dst2); /* src2 + dst2(dst2) -> dst2 */
+
+                dst1 = _mm_packs_pu16(dst1, dst2);      /* 0A0R0G0B(res1), 0A0R0G0B(res2) -> dst1(ARGBARGB) */
+                dst1 = _mm_or_si64(dst1, dsta); /* dsta | dst1 -> dst1 */
+
+                *(__m64 *) dstp = dst1; /* dst1 -> 2 x pixel */
+
+                srcp += 2;
+                dstp += 2;
+            }
+            srcp += srcskip;
+            dstp += dstskip;
+        }
+        _mm_empty();
+    }
+}
+
+/* fast ARGB888->(A)RGB888 blending with pixel alpha */
+static void
+BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint32 *srcp = (Uint32 *) info->src;
+    int srcskip = info->src_skip >> 2;
+    Uint32 *dstp = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip >> 2;
+    SDL_PixelFormat *sf = info->src_fmt;
+    Uint32 amask = sf->Amask;
+    Uint32 ashift = sf->Ashift;
+    Uint64 multmask, multmask2;
+
+    __m64 src1, dst1, mm_alpha, mm_zero, mm_alpha2;
+
+    mm_zero = _mm_setzero_si64();       /* 0 -> mm_zero */
+    multmask = 0x00FF;
+	multmask <<= (ashift * 2);
+	multmask2 = 0x00FF00FF00FF00FF;
+
+    while (height--) {
+		/* *INDENT-OFF* */
+		DUFFS_LOOP4({
+		Uint32 alpha = *srcp & amask;
+		if (alpha == 0) {
+			/* do nothing */
+		} else if (alpha == amask) {
+			*dstp = *srcp;
+		} else {
+			src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB) */
+			src1 = _mm_unpacklo_pi8(src1, mm_zero); /* 0A0R0G0B -> src1 */
+
+			dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB) */
+			dst1 = _mm_unpacklo_pi8(dst1, mm_zero); /* 0A0R0G0B -> dst1 */
+
+			mm_alpha = _mm_cvtsi32_si64(alpha); /* alpha -> mm_alpha (0000000A) */
+			mm_alpha = _mm_srli_si64(mm_alpha, ashift); /* mm_alpha >> ashift -> mm_alpha(0000000A) */
+			mm_alpha = _mm_unpacklo_pi16(mm_alpha, mm_alpha); /* 00000A0A -> mm_alpha */
+			mm_alpha2 = _mm_unpacklo_pi32(mm_alpha, mm_alpha); /* 0A0A0A0A -> mm_alpha2 */
+			mm_alpha = _mm_or_si64(mm_alpha2, *(__m64 *) & multmask);	/* 0F0A0A0A -> mm_alpha */
+			mm_alpha2 = _mm_xor_si64(mm_alpha2, *(__m64 *) & multmask2);	/* 255 - mm_alpha -> mm_alpha */
+
+			/* blend */		    
+			src1 = _mm_mullo_pi16(src1, mm_alpha);
+			src1 = _mm_srli_pi16(src1, 8);
+			dst1 = _mm_mullo_pi16(dst1, mm_alpha2);
+			dst1 = _mm_srli_pi16(dst1, 8);
+			dst1 = _mm_add_pi16(src1, dst1);
+			dst1 = _mm_packs_pu16(dst1, mm_zero);
+			
+			*dstp = _mm_cvtsi64_si32(dst1); /* dst1 -> pixel */
+		}
+		++srcp;
+		++dstp;
+	    }, width);
+		/* *INDENT-ON* */
+        srcp += srcskip;
+        dstp += dstskip;
+    }
+    _mm_empty();
+}
+
+#endif /* __MMX__ */
+
+/* fast RGB888->(A)RGB888 blending with surface alpha=128 special case */
+static void
+BlitRGBtoRGBSurfaceAlpha128(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint32 *srcp = (Uint32 *) info->src;
+    int srcskip = info->src_skip >> 2;
+    Uint32 *dstp = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip >> 2;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4({
+		    Uint32 s = *srcp++;
+		    Uint32 d = *dstp;
+		    *dstp++ = ((((s & 0x00fefefe) + (d & 0x00fefefe)) >> 1)
+			       + (s & d & 0x00010101)) | 0xff000000;
+	    }, width);
+	    /* *INDENT-ON* */
+        srcp += srcskip;
+        dstp += dstskip;
+    }
+}
+
+/* fast RGB888->(A)RGB888 blending with surface alpha */
+static void
+BlitRGBtoRGBSurfaceAlpha(SDL_BlitInfo * info)
+{
+    unsigned alpha = info->a;
+    if (alpha == 128) {
+        BlitRGBtoRGBSurfaceAlpha128(info);
+    } else {
+        int width = info->dst_w;
+        int height = info->dst_h;
+        Uint32 *srcp = (Uint32 *) info->src;
+        int srcskip = info->src_skip >> 2;
+        Uint32 *dstp = (Uint32 *) info->dst;
+        int dstskip = info->dst_skip >> 2;
+        Uint32 s;
+        Uint32 d;
+        Uint32 s1;
+        Uint32 d1;
+
+        while (height--) {
+			/* *INDENT-OFF* */
+			DUFFS_LOOP4({
+				s = *srcp;
+				d = *dstp;
+				s1 = s & 0xff00ff;
+				d1 = d & 0xff00ff;
+				d1 = (d1 + ((s1 - d1) * alpha >> 8))
+				     & 0xff00ff;
+				s &= 0xff00;
+				d &= 0xff00;
+				d = (d + ((s - d) * alpha >> 8)) & 0xff00;
+				*dstp = d1 | d | 0xff000000;
+				++srcp;
+				++dstp;
+			}, width);
+			/* *INDENT-ON* */
+            srcp += srcskip;
+            dstp += dstskip;
+        }
+    }
+}
+
+/* fast ARGB888->(A)RGB888 blending with pixel alpha */
+static void
+BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint32 *srcp = (Uint32 *) info->src;
+    int srcskip = info->src_skip >> 2;
+    Uint32 *dstp = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip >> 2;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4({
+		Uint32 dalpha;
+		Uint32 d;
+		Uint32 s1;
+		Uint32 d1;
+		Uint32 s = *srcp;
+		Uint32 alpha = s >> 24;
+		/* FIXME: Here we special-case opaque alpha since the
+		   compositioning used (>>8 instead of /255) doesn't handle
+		   it correctly. Also special-case alpha=0 for speed?
+		   Benchmark this! */
+		if (alpha) {
+		  if (alpha == SDL_ALPHA_OPAQUE) {
+			  *dstp = *srcp;
+		  } else {
+		    /*
+		     * take out the middle component (green), and process
+		     * the other two in parallel. One multiply less.
+		     */
+		    d = *dstp;
+			dalpha = d >> 24;
+		    s1 = s & 0xff00ff;
+		    d1 = d & 0xff00ff;
+		    d1 = (d1 + ((s1 - d1) * alpha >> 8)) & 0xff00ff;
+		    s &= 0xff00;
+		    d &= 0xff00;
+		    d = (d + ((s - d) * alpha >> 8)) & 0xff00;
+			dalpha = alpha + (dalpha * (alpha ^ 0xFF) >> 8);
+		    *dstp = d1 | d | (dalpha << 24);
+		  }
+		}
+		++srcp;
+		++dstp;
+	    }, width);
+	    /* *INDENT-ON* */
+        srcp += srcskip;
+        dstp += dstskip;
+    }
+}
+
+#ifdef __3dNOW__
+/* fast (as in MMX with prefetch) ARGB888->(A)RGB888 blending with pixel alpha */
+static void
+BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint32 *srcp = (Uint32 *) info->src;
+    int srcskip = info->src_skip >> 2;
+    Uint32 *dstp = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip >> 2;
+    SDL_PixelFormat *sf = info->src_fmt;
+    Uint32 amask = sf->Amask;
+    Uint32 ashift = sf->Ashift;
+    Uint64 multmask, multmask2;
+
+    __m64 src1, dst1, mm_alpha, mm_zero, mm_alpha2;
+
+    mm_zero = _mm_setzero_si64();       /* 0 -> mm_zero */
+    multmask = 0x00FF;
+    multmask <<= (ashift * 2);
+    multmask2 = 0x00FF00FF00FF00FF;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4({
+		Uint32 alpha;
+
+		_m_prefetch(srcp + 16);
+		_m_prefetch(dstp + 16);
+
+		alpha = *srcp & amask;
+		if (alpha == 0) {
+			/* do nothing */
+		} else if (alpha == amask) {
+			*dstp = *srcp;
+		} else {
+			src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB) */
+			src1 = _mm_unpacklo_pi8(src1, mm_zero); /* 0A0R0G0B -> src1 */
+
+			dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB) */
+			dst1 = _mm_unpacklo_pi8(dst1, mm_zero); /* 0A0R0G0B -> dst1 */
+
+			mm_alpha = _mm_cvtsi32_si64(alpha); /* alpha -> mm_alpha (0000000A) */
+			mm_alpha = _mm_srli_si64(mm_alpha, ashift); /* mm_alpha >> ashift -> mm_alpha(0000000A) */
+			mm_alpha = _mm_unpacklo_pi16(mm_alpha, mm_alpha); /* 00000A0A -> mm_alpha */
+			mm_alpha2 = _mm_unpacklo_pi32(mm_alpha, mm_alpha); /* 0A0A0A0A -> mm_alpha2 */
+			mm_alpha = _mm_or_si64(mm_alpha2, *(__m64 *) & multmask);	/* 0F0A0A0A -> mm_alpha */
+			mm_alpha2 = _mm_xor_si64(mm_alpha2, *(__m64 *) & multmask2);	/* 255 - mm_alpha -> mm_alpha */
+
+
+			/* blend */		    
+			src1 = _mm_mullo_pi16(src1, mm_alpha);
+			src1 = _mm_srli_pi16(src1, 8);
+			dst1 = _mm_mullo_pi16(dst1, mm_alpha2);
+			dst1 = _mm_srli_pi16(dst1, 8);
+			dst1 = _mm_add_pi16(src1, dst1);
+			dst1 = _mm_packs_pu16(dst1, mm_zero);
+			
+			*dstp = _mm_cvtsi64_si32(dst1); /* dst1 -> pixel */
+		}
+		++srcp;
+		++dstp;
+	    }, width);
+	    /* *INDENT-ON* */
+        srcp += srcskip;
+        dstp += dstskip;
+    }
+    _mm_empty();
+}
+
+#endif /* __MMX__ */
+
+/* 16bpp special case for per-surface alpha=50%: blend 2 pixels in parallel */
+
+/* blend a single 16 bit pixel at 50% */
+#define BLEND16_50(d, s, mask)						\
+	((((s & mask) + (d & mask)) >> 1) + (s & d & (~mask & 0xffff)))
+
+/* blend two 16 bit pixels at 50% */
+#define BLEND2x16_50(d, s, mask)					     \
+	(((s & (mask | mask << 16)) >> 1) + ((d & (mask | mask << 16)) >> 1) \
+	 + (s & d & (~(mask | mask << 16))))
+
+static void
+Blit16to16SurfaceAlpha128(SDL_BlitInfo * info, Uint16 mask)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint16 *srcp = (Uint16 *) info->src;
+    int srcskip = info->src_skip >> 1;
+    Uint16 *dstp = (Uint16 *) info->dst;
+    int dstskip = info->dst_skip >> 1;
+
+    while (height--) {
+        if (((uintptr_t) srcp ^ (uintptr_t) dstp) & 2) {
+            /*
+             * Source and destination not aligned, pipeline it.
+             * This is mostly a win for big blits but no loss for
+             * small ones
+             */
+            Uint32 prev_sw;
+            int w = width;
+
+            /* handle odd destination */
+            if ((uintptr_t) dstp & 2) {
+                Uint16 d = *dstp, s = *srcp;
+                *dstp = BLEND16_50(d, s, mask);
+                dstp++;
+                srcp++;
+                w--;
+            }
+            srcp++;             /* srcp is now 32-bit aligned */
+
+            /* bootstrap pipeline with first halfword */
+            prev_sw = ((Uint32 *) srcp)[-1];
+
+            while (w > 1) {
+                Uint32 sw, dw, s;
+                sw = *(Uint32 *) srcp;
+                dw = *(Uint32 *) dstp;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+                s = (prev_sw << 16) + (sw >> 16);
+#else
+                s = (prev_sw >> 16) + (sw << 16);
+#endif
+                prev_sw = sw;
+                *(Uint32 *) dstp = BLEND2x16_50(dw, s, mask);
+                dstp += 2;
+                srcp += 2;
+                w -= 2;
+            }
+
+            /* final pixel if any */
+            if (w) {
+                Uint16 d = *dstp, s;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+                s = (Uint16) prev_sw;
+#else
+                s = (Uint16) (prev_sw >> 16);
+#endif
+                *dstp = BLEND16_50(d, s, mask);
+                srcp++;
+                dstp++;
+            }
+            srcp += srcskip - 1;
+            dstp += dstskip;
+        } else {
+            /* source and destination are aligned */
+            int w = width;
+
+            /* first odd pixel? */
+            if ((uintptr_t) srcp & 2) {
+                Uint16 d = *dstp, s = *srcp;
+                *dstp = BLEND16_50(d, s, mask);
+                srcp++;
+                dstp++;
+                w--;
+            }
+            /* srcp and dstp are now 32-bit aligned */
+
+            while (w > 1) {
+                Uint32 sw = *(Uint32 *) srcp;
+                Uint32 dw = *(Uint32 *) dstp;
+                *(Uint32 *) dstp = BLEND2x16_50(dw, sw, mask);
+                srcp += 2;
+                dstp += 2;
+                w -= 2;
+            }
+
+            /* last odd pixel? */
+            if (w) {
+                Uint16 d = *dstp, s = *srcp;
+                *dstp = BLEND16_50(d, s, mask);
+                srcp++;
+                dstp++;
+            }
+            srcp += srcskip;
+            dstp += dstskip;
+        }
+    }
+}
+
+#ifdef __MMX__
+
+/* fast RGB565->RGB565 blending with surface alpha */
+static void
+Blit565to565SurfaceAlphaMMX(SDL_BlitInfo * info)
+{
+    unsigned alpha = info->a;
+    if (alpha == 128) {
+        Blit16to16SurfaceAlpha128(info, 0xf7de);
+    } else {
+        int width = info->dst_w;
+        int height = info->dst_h;
+        Uint16 *srcp = (Uint16 *) info->src;
+        int srcskip = info->src_skip >> 1;
+        Uint16 *dstp = (Uint16 *) info->dst;
+        int dstskip = info->dst_skip >> 1;
+        Uint32 s, d;
+
+        __m64 src1, dst1, src2, dst2, gmask, bmask, mm_res, mm_alpha;
+
+        alpha &= ~(1 + 2 + 4);  /* cut alpha to get the exact same behaviour */
+        mm_alpha = _mm_set_pi32(0, alpha);      /* 0000000A -> mm_alpha */
+        alpha >>= 3;            /* downscale alpha to 5 bits */
+
+        mm_alpha = _mm_unpacklo_pi16(mm_alpha, mm_alpha);       /* 00000A0A -> mm_alpha */
+        mm_alpha = _mm_unpacklo_pi32(mm_alpha, mm_alpha);       /* 0A0A0A0A -> mm_alpha */
+        /* position alpha to allow for mullo and mulhi on diff channels
+           to reduce the number of operations */
+        mm_alpha = _mm_slli_si64(mm_alpha, 3);
+
+        /* Setup the 565 color channel masks */
+        gmask = _mm_set_pi32(0x07E007E0, 0x07E007E0);   /* MASKGREEN -> gmask */
+        bmask = _mm_set_pi32(0x001F001F, 0x001F001F);   /* MASKBLUE -> bmask */
+
+        while (height--) {
+			/* *INDENT-OFF* */
+			DUFFS_LOOP_124(
+			{
+				s = *srcp++;
+				d = *dstp;
+				/*
+				 * shift out the middle component (green) to
+				 * the high 16 bits, and process all three RGB
+				 * components at the same time.
+				 */
+				s = (s | s << 16) & 0x07e0f81f;
+				d = (d | d << 16) & 0x07e0f81f;
+				d += (s - d) * alpha >> 5;
+				d &= 0x07e0f81f;
+				*dstp++ = (Uint16)(d | d >> 16);
+			},{
+				s = *srcp++;
+				d = *dstp;
+				/*
+				 * shift out the middle component (green) to
+				 * the high 16 bits, and process all three RGB
+				 * components at the same time.
+				 */
+				s = (s | s << 16) & 0x07e0f81f;
+				d = (d | d << 16) & 0x07e0f81f;
+				d += (s - d) * alpha >> 5;
+				d &= 0x07e0f81f;
+				*dstp++ = (Uint16)(d | d >> 16);
+				s = *srcp++;
+				d = *dstp;
+				/*
+				 * shift out the middle component (green) to
+				 * the high 16 bits, and process all three RGB
+				 * components at the same time.
+				 */
+				s = (s | s << 16) & 0x07e0f81f;
+				d = (d | d << 16) & 0x07e0f81f;
+				d += (s - d) * alpha >> 5;
+				d &= 0x07e0f81f;
+				*dstp++ = (Uint16)(d | d >> 16);
+			},{
+				src1 = *(__m64*)srcp; /* 4 src pixels -> src1 */
+				dst1 = *(__m64*)dstp; /* 4 dst pixels -> dst1 */
+
+				/* red */
+				src2 = src1;
+				src2 = _mm_srli_pi16(src2, 11); /* src2 >> 11 -> src2 [000r 000r 000r 000r] */
+
+				dst2 = dst1;
+				dst2 = _mm_srli_pi16(dst2, 11); /* dst2 >> 11 -> dst2 [000r 000r 000r 000r] */
+
+				/* blend */
+				src2 = _mm_sub_pi16(src2, dst2);/* src - dst -> src2 */
+				src2 = _mm_mullo_pi16(src2, mm_alpha); /* src2 * alpha -> src2 */
+				src2 = _mm_srli_pi16(src2, 11); /* src2 >> 11 -> src2 */
+				dst2 = _mm_add_pi16(src2, dst2); /* src2 + dst2 -> dst2 */
+				dst2 = _mm_slli_pi16(dst2, 11); /* dst2 << 11 -> dst2 */
+
+				mm_res = dst2; /* RED -> mm_res */
+
+				/* green -- process the bits in place */
+				src2 = src1;
+				src2 = _mm_and_si64(src2, gmask); /* src & MASKGREEN -> src2 */
+
+				dst2 = dst1;
+				dst2 = _mm_and_si64(dst2, gmask); /* dst & MASKGREEN -> dst2 */
+
+				/* blend */
+				src2 = _mm_sub_pi16(src2, dst2);/* src - dst -> src2 */
+				src2 = _mm_mulhi_pi16(src2, mm_alpha); /* src2 * alpha -> src2 */
+				src2 = _mm_slli_pi16(src2, 5); /* src2 << 5 -> src2 */
+				dst2 = _mm_add_pi16(src2, dst2); /* src2 + dst2 -> dst2 */
+
+				mm_res = _mm_or_si64(mm_res, dst2); /* RED | GREEN -> mm_res */
+
+				/* blue */
+				src2 = src1;
+				src2 = _mm_and_si64(src2, bmask); /* src & MASKBLUE -> src2[000b 000b 000b 000b] */
+
+				dst2 = dst1;
+				dst2 = _mm_and_si64(dst2, bmask); /* dst & MASKBLUE -> dst2[000b 000b 000b 000b] */
+
+				/* blend */
+				src2 = _mm_sub_pi16(src2, dst2);/* src - dst -> src2 */
+				src2 = _mm_mullo_pi16(src2, mm_alpha); /* src2 * alpha -> src2 */
+				src2 = _mm_srli_pi16(src2, 11); /* src2 >> 11 -> src2 */
+				dst2 = _mm_add_pi16(src2, dst2); /* src2 + dst2 -> dst2 */
+				dst2 = _mm_and_si64(dst2, bmask); /* dst2 & MASKBLUE -> dst2 */
+
+				mm_res = _mm_or_si64(mm_res, dst2); /* RED | GREEN | BLUE -> mm_res */
+
+				*(__m64*)dstp = mm_res; /* mm_res -> 4 dst pixels */
+
+				srcp += 4;
+				dstp += 4;
+			}, width);
+			/* *INDENT-ON* */
+            srcp += srcskip;
+            dstp += dstskip;
+        }
+        _mm_empty();
+    }
+}
+
+/* fast RGB555->RGB555 blending with surface alpha */
+static void
+Blit555to555SurfaceAlphaMMX(SDL_BlitInfo * info)
+{
+    unsigned alpha = info->a;
+    if (alpha == 128) {
+        Blit16to16SurfaceAlpha128(info, 0xfbde);
+    } else {
+        int width = info->dst_w;
+        int height = info->dst_h;
+        Uint16 *srcp = (Uint16 *) info->src;
+        int srcskip = info->src_skip >> 1;
+        Uint16 *dstp = (Uint16 *) info->dst;
+        int dstskip = info->dst_skip >> 1;
+        Uint32 s, d;
+
+        __m64 src1, dst1, src2, dst2, rmask, gmask, bmask, mm_res, mm_alpha;
+
+        alpha &= ~(1 + 2 + 4);  /* cut alpha to get the exact same behaviour */
+        mm_alpha = _mm_set_pi32(0, alpha);      /* 0000000A -> mm_alpha */
+        alpha >>= 3;            /* downscale alpha to 5 bits */
+
+        mm_alpha = _mm_unpacklo_pi16(mm_alpha, mm_alpha);       /* 00000A0A -> mm_alpha */
+        mm_alpha = _mm_unpacklo_pi32(mm_alpha, mm_alpha);       /* 0A0A0A0A -> mm_alpha */
+        /* position alpha to allow for mullo and mulhi on diff channels
+           to reduce the number of operations */
+        mm_alpha = _mm_slli_si64(mm_alpha, 3);
+
+        /* Setup the 555 color channel masks */
+        rmask = _mm_set_pi32(0x7C007C00, 0x7C007C00);   /* MASKRED -> rmask */
+        gmask = _mm_set_pi32(0x03E003E0, 0x03E003E0);   /* MASKGREEN -> gmask */
+        bmask = _mm_set_pi32(0x001F001F, 0x001F001F);   /* MASKBLUE -> bmask */
+
+        while (height--) {
+			/* *INDENT-OFF* */
+			DUFFS_LOOP_124(
+			{
+				s = *srcp++;
+				d = *dstp;
+				/*
+				 * shift out the middle component (green) to
+				 * the high 16 bits, and process all three RGB
+				 * components at the same time.
+				 */
+				s = (s | s << 16) & 0x03e07c1f;
+				d = (d | d << 16) & 0x03e07c1f;
+				d += (s - d) * alpha >> 5;
+				d &= 0x03e07c1f;
+				*dstp++ = (Uint16)(d | d >> 16);
+			},{
+				s = *srcp++;
+				d = *dstp;
+				/*
+				 * shift out the middle component (green) to
+				 * the high 16 bits, and process all three RGB
+				 * components at the same time.
+				 */
+				s = (s | s << 16) & 0x03e07c1f;
+				d = (d | d << 16) & 0x03e07c1f;
+				d += (s - d) * alpha >> 5;
+				d &= 0x03e07c1f;
+				*dstp++ = (Uint16)(d | d >> 16);
+			        s = *srcp++;
+				d = *dstp;
+				/*
+				 * shift out the middle component (green) to
+				 * the high 16 bits, and process all three RGB
+				 * components at the same time.
+				 */
+				s = (s | s << 16) & 0x03e07c1f;
+				d = (d | d << 16) & 0x03e07c1f;
+				d += (s - d) * alpha >> 5;
+				d &= 0x03e07c1f;
+				*dstp++ = (Uint16)(d | d >> 16);
+			},{
+				src1 = *(__m64*)srcp; /* 4 src pixels -> src1 */
+				dst1 = *(__m64*)dstp; /* 4 dst pixels -> dst1 */
+
+				/* red -- process the bits in place */
+				src2 = src1;
+				src2 = _mm_and_si64(src2, rmask); /* src & MASKRED -> src2 */
+
+				dst2 = dst1;
+				dst2 = _mm_and_si64(dst2, rmask); /* dst & MASKRED -> dst2 */
+
+				/* blend */
+				src2 = _mm_sub_pi16(src2, dst2);/* src - dst -> src2 */
+				src2 = _mm_mulhi_pi16(src2, mm_alpha); /* src2 * alpha -> src2 */
+				src2 = _mm_slli_pi16(src2, 5); /* src2 << 5 -> src2 */
+				dst2 = _mm_add_pi16(src2, dst2); /* src2 + dst2 -> dst2 */
+				dst2 = _mm_and_si64(dst2, rmask); /* dst2 & MASKRED -> dst2 */
+
+				mm_res = dst2; /* RED -> mm_res */
+				
+				/* green -- process the bits in place */
+				src2 = src1;
+				src2 = _mm_and_si64(src2, gmask); /* src & MASKGREEN -> src2 */
+
+				dst2 = dst1;
+				dst2 = _mm_and_si64(dst2, gmask); /* dst & MASKGREEN -> dst2 */
+
+				/* blend */
+				src2 = _mm_sub_pi16(src2, dst2);/* src - dst -> src2 */
+				src2 = _mm_mulhi_pi16(src2, mm_alpha); /* src2 * alpha -> src2 */
+				src2 = _mm_slli_pi16(src2, 5); /* src2 << 5 -> src2 */
+				dst2 = _mm_add_pi16(src2, dst2); /* src2 + dst2 -> dst2 */
+
+				mm_res = _mm_or_si64(mm_res, dst2); /* RED | GREEN -> mm_res */
+
+				/* blue */
+				src2 = src1; /* src -> src2 */
+				src2 = _mm_and_si64(src2, bmask); /* src & MASKBLUE -> src2[000b 000b 000b 000b] */
+
+				dst2 = dst1; /* dst -> dst2 */
+				dst2 = _mm_and_si64(dst2, bmask); /* dst & MASKBLUE -> dst2[000b 000b 000b 000b] */
+
+				/* blend */
+				src2 = _mm_sub_pi16(src2, dst2);/* src - dst -> src2 */
+				src2 = _mm_mullo_pi16(src2, mm_alpha); /* src2 * alpha -> src2 */
+				src2 = _mm_srli_pi16(src2, 11); /* src2 >> 11 -> src2 */
+				dst2 = _mm_add_pi16(src2, dst2); /* src2 + dst2 -> dst2 */
+				dst2 = _mm_and_si64(dst2, bmask); /* dst2 & MASKBLUE -> dst2 */
+
+				mm_res = _mm_or_si64(mm_res, dst2); /* RED | GREEN | BLUE -> mm_res */
+
+				*(__m64*)dstp = mm_res; /* mm_res -> 4 dst pixels */
+
+				srcp += 4;
+				dstp += 4;
+			}, width);
+			/* *INDENT-ON* */
+            srcp += srcskip;
+            dstp += dstskip;
+        }
+        _mm_empty();
+    }
+}
+
+#endif /* __MMX__ */
+
+/* fast RGB565->RGB565 blending with surface alpha */
+static void
+Blit565to565SurfaceAlpha(SDL_BlitInfo * info)
+{
+    unsigned alpha = info->a;
+    if (alpha == 128) {
+        Blit16to16SurfaceAlpha128(info, 0xf7de);
+    } else {
+        int width = info->dst_w;
+        int height = info->dst_h;
+        Uint16 *srcp = (Uint16 *) info->src;
+        int srcskip = info->src_skip >> 1;
+        Uint16 *dstp = (Uint16 *) info->dst;
+        int dstskip = info->dst_skip >> 1;
+        alpha >>= 3;            /* downscale alpha to 5 bits */
+
+        while (height--) {
+			/* *INDENT-OFF* */
+			DUFFS_LOOP4({
+				Uint32 s = *srcp++;
+				Uint32 d = *dstp;
+				/*
+				 * shift out the middle component (green) to
+				 * the high 16 bits, and process all three RGB
+				 * components at the same time.
+				 */
+				s = (s | s << 16) & 0x07e0f81f;
+				d = (d | d << 16) & 0x07e0f81f;
+				d += (s - d) * alpha >> 5;
+				d &= 0x07e0f81f;
+				*dstp++ = (Uint16)(d | d >> 16);
+			}, width);
+			/* *INDENT-ON* */
+            srcp += srcskip;
+            dstp += dstskip;
+        }
+    }
+}
+
+/* fast RGB555->RGB555 blending with surface alpha */
+static void
+Blit555to555SurfaceAlpha(SDL_BlitInfo * info)
+{
+    unsigned alpha = info->a;   /* downscale alpha to 5 bits */
+    if (alpha == 128) {
+        Blit16to16SurfaceAlpha128(info, 0xfbde);
+    } else {
+        int width = info->dst_w;
+        int height = info->dst_h;
+        Uint16 *srcp = (Uint16 *) info->src;
+        int srcskip = info->src_skip >> 1;
+        Uint16 *dstp = (Uint16 *) info->dst;
+        int dstskip = info->dst_skip >> 1;
+        alpha >>= 3;            /* downscale alpha to 5 bits */
+
+        while (height--) {
+			/* *INDENT-OFF* */
+			DUFFS_LOOP4({
+				Uint32 s = *srcp++;
+				Uint32 d = *dstp;
+				/*
+				 * shift out the middle component (green) to
+				 * the high 16 bits, and process all three RGB
+				 * components at the same time.
+				 */
+				s = (s | s << 16) & 0x03e07c1f;
+				d = (d | d << 16) & 0x03e07c1f;
+				d += (s - d) * alpha >> 5;
+				d &= 0x03e07c1f;
+				*dstp++ = (Uint16)(d | d >> 16);
+			}, width);
+			/* *INDENT-ON* */
+            srcp += srcskip;
+            dstp += dstskip;
+        }
+    }
+}
+
+/* fast ARGB8888->RGB565 blending with pixel alpha */
+static void
+BlitARGBto565PixelAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint32 *srcp = (Uint32 *) info->src;
+    int srcskip = info->src_skip >> 2;
+    Uint16 *dstp = (Uint16 *) info->dst;
+    int dstskip = info->dst_skip >> 1;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4({
+		Uint32 s = *srcp;
+		unsigned alpha = s >> 27; /* downscale alpha to 5 bits */
+		/* FIXME: Here we special-case opaque alpha since the
+		   compositioning used (>>8 instead of /255) doesn't handle
+		   it correctly. Also special-case alpha=0 for speed?
+		   Benchmark this! */
+		if(alpha) {   
+		  if(alpha == (SDL_ALPHA_OPAQUE >> 3)) {
+		    *dstp = (Uint16)((s >> 8 & 0xf800) + (s >> 5 & 0x7e0) + (s >> 3  & 0x1f));
+		  } else {
+		    Uint32 d = *dstp;
+		    /*
+		     * convert source and destination to G0RAB65565
+		     * and blend all components at the same time
+		     */
+		    s = ((s & 0xfc00) << 11) + (s >> 8 & 0xf800)
+		      + (s >> 3 & 0x1f);
+		    d = (d | d << 16) & 0x07e0f81f;
+		    d += (s - d) * alpha >> 5;
+		    d &= 0x07e0f81f;
+		    *dstp = (Uint16)(d | d >> 16);
+		  }
+		}
+		srcp++;
+		dstp++;
+	    }, width);
+	    /* *INDENT-ON* */
+        srcp += srcskip;
+        dstp += dstskip;
+    }
+}
+
+/* fast ARGB8888->RGB555 blending with pixel alpha */
+static void
+BlitARGBto555PixelAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint32 *srcp = (Uint32 *) info->src;
+    int srcskip = info->src_skip >> 2;
+    Uint16 *dstp = (Uint16 *) info->dst;
+    int dstskip = info->dst_skip >> 1;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4({
+		unsigned alpha;
+		Uint32 s = *srcp;
+		alpha = s >> 27; /* downscale alpha to 5 bits */
+		/* FIXME: Here we special-case opaque alpha since the
+		   compositioning used (>>8 instead of /255) doesn't handle
+		   it correctly. Also special-case alpha=0 for speed?
+		   Benchmark this! */
+		if(alpha) {   
+		  if(alpha == (SDL_ALPHA_OPAQUE >> 3)) {
+		    *dstp = (Uint16)((s >> 9 & 0x7c00) + (s >> 6 & 0x3e0) + (s >> 3  & 0x1f));
+		  } else {
+		    Uint32 d = *dstp;
+		    /*
+		     * convert source and destination to G0RAB65565
+		     * and blend all components at the same time
+		     */
+		    s = ((s & 0xf800) << 10) + (s >> 9 & 0x7c00)
+		      + (s >> 3 & 0x1f);
+		    d = (d | d << 16) & 0x03e07c1f;
+		    d += (s - d) * alpha >> 5;
+		    d &= 0x03e07c1f;
+		    *dstp = (Uint16)(d | d >> 16);
+		  }
+		}
+		srcp++;
+		dstp++;
+	    }, width);
+	    /* *INDENT-ON* */
+        srcp += srcskip;
+        dstp += dstskip;
+    }
+}
+
+/* General (slow) N->N blending with per-surface alpha */
+static void
+BlitNtoNSurfaceAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int srcbpp = srcfmt->BytesPerPixel;
+    int dstbpp = dstfmt->BytesPerPixel;
+    Uint32 Pixel;
+    unsigned sR, sG, sB;
+    unsigned dR, dG, dB, dA;
+    const unsigned sA = info->a;
+
+    if (sA) {
+        while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4(
+	    {
+		DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel, sR, sG, sB);
+		DISEMBLE_RGBA(dst, dstbpp, dstfmt, Pixel, dR, dG, dB, dA);
+		ALPHA_BLEND_RGBA(sR, sG, sB, sA, dR, dG, dB, dA);
+		ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
+		src += srcbpp;
+		dst += dstbpp;
+	    },
+	    width);
+	    /* *INDENT-ON* */
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+}
+
+/* General (slow) colorkeyed N->N blending with per-surface alpha */
+static void
+BlitNtoNSurfaceAlphaKey(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    Uint32 ckey = info->colorkey;
+    int srcbpp = srcfmt->BytesPerPixel;
+    int dstbpp = dstfmt->BytesPerPixel;
+    Uint32 Pixel;
+    unsigned sR, sG, sB;
+    unsigned dR, dG, dB, dA;
+    const unsigned sA = info->a;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4(
+	    {
+		RETRIEVE_RGB_PIXEL(src, srcbpp, Pixel);
+		if(sA && Pixel != ckey) {
+		    RGB_FROM_PIXEL(Pixel, srcfmt, sR, sG, sB);
+		    DISEMBLE_RGBA(dst, dstbpp, dstfmt, Pixel, dR, dG, dB, dA);
+		    ALPHA_BLEND_RGBA(sR, sG, sB, sA, dR, dG, dB, dA);
+		    ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
+		}
+		src += srcbpp;
+		dst += dstbpp;
+	    },
+	    width);
+	    /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+/* General (slow) N->N blending with pixel alpha */
+static void
+BlitNtoNPixelAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int srcbpp;
+    int dstbpp;
+    Uint32 Pixel;
+    unsigned sR, sG, sB, sA;
+    unsigned dR, dG, dB, dA;
+
+    /* Set up some basic variables */
+    srcbpp = srcfmt->BytesPerPixel;
+    dstbpp = dstfmt->BytesPerPixel;
+
+    while (height--) {
+	    /* *INDENT-OFF* */
+	    DUFFS_LOOP4(
+	    {
+		DISEMBLE_RGBA(src, srcbpp, srcfmt, Pixel, sR, sG, sB, sA);
+		if(sA) {
+		    DISEMBLE_RGBA(dst, dstbpp, dstfmt, Pixel, dR, dG, dB, dA);
+		    ALPHA_BLEND_RGBA(sR, sG, sB, sA, dR, dG, dB, dA);
+		    ASSEMBLE_RGBA(dst, dstbpp, dstfmt, dR, dG, dB, dA);
+		}
+		src += srcbpp;
+		dst += dstbpp;
+	    },
+	    width);
+	    /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+
+SDL_BlitFunc
+SDL_CalculateBlitA(SDL_Surface * surface)
+{
+    SDL_PixelFormat *sf = surface->format;
+    SDL_PixelFormat *df = surface->map->dst->format;
+
+    switch (surface->map->info.flags & ~SDL_COPY_RLE_MASK) {
+    case SDL_COPY_BLEND:
+        /* Per-pixel alpha blits */
+        switch (df->BytesPerPixel) {
+        case 1:
+            return BlitNto1PixelAlpha;
+
+        case 2:
+                if (sf->BytesPerPixel == 4 && sf->Amask == 0xff000000
+                    && sf->Gmask == 0xff00
+                    && ((sf->Rmask == 0xff && df->Rmask == 0x1f)
+                        || (sf->Bmask == 0xff && df->Bmask == 0x1f))) {
+                if (df->Gmask == 0x7e0)
+                    return BlitARGBto565PixelAlpha;
+                else if (df->Gmask == 0x3e0)
+                    return BlitARGBto555PixelAlpha;
+            }
+            return BlitNtoNPixelAlpha;
+
+        case 4:
+            if (sf->Rmask == df->Rmask
+                && sf->Gmask == df->Gmask
+                && sf->Bmask == df->Bmask && sf->BytesPerPixel == 4) {
+#if defined(__MMX__) || defined(__3dNOW__)
+                if (sf->Rshift % 8 == 0
+                    && sf->Gshift % 8 == 0
+                    && sf->Bshift % 8 == 0
+                    && sf->Ashift % 8 == 0 && sf->Aloss == 0) {
+#ifdef __3dNOW__
+                    if (SDL_Has3DNow())
+                        return BlitRGBtoRGBPixelAlphaMMX3DNOW;
+#endif
+#ifdef __MMX__
+                    if (SDL_HasMMX())
+                        return BlitRGBtoRGBPixelAlphaMMX;
+#endif
+                }
+#endif /* __MMX__ || __3dNOW__ */
+                if (sf->Amask == 0xff000000) {
+                    return BlitRGBtoRGBPixelAlpha;
+                }
+            }
+            return BlitNtoNPixelAlpha;
+
+        case 3:
+        default:
+            return BlitNtoNPixelAlpha;
+        }
+        break;
+
+    case SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
+        if (sf->Amask == 0) {
+            /* Per-surface alpha blits */
+            switch (df->BytesPerPixel) {
+            case 1:
+                return BlitNto1SurfaceAlpha;
+
+            case 2:
+                if (surface->map->identity) {
+                    if (df->Gmask == 0x7e0) {
+#ifdef __MMX__
+                        if (SDL_HasMMX())
+                            return Blit565to565SurfaceAlphaMMX;
+                        else
+#endif
+                            return Blit565to565SurfaceAlpha;
+                    } else if (df->Gmask == 0x3e0) {
+#ifdef __MMX__
+                        if (SDL_HasMMX())
+                            return Blit555to555SurfaceAlphaMMX;
+                        else
+#endif
+                            return Blit555to555SurfaceAlpha;
+                    }
+                }
+                return BlitNtoNSurfaceAlpha;
+
+            case 4:
+                if (sf->Rmask == df->Rmask
+                    && sf->Gmask == df->Gmask
+                    && sf->Bmask == df->Bmask && sf->BytesPerPixel == 4) {
+#ifdef __MMX__
+                    if (sf->Rshift % 8 == 0
+                        && sf->Gshift % 8 == 0
+                        && sf->Bshift % 8 == 0 && SDL_HasMMX())
+                        return BlitRGBtoRGBSurfaceAlphaMMX;
+#endif
+                    if ((sf->Rmask | sf->Gmask | sf->Bmask) == 0xffffff) {
+                        return BlitRGBtoRGBSurfaceAlpha;
+                    }
+                }
+                return BlitNtoNSurfaceAlpha;
+
+            case 3:
+            default:
+                return BlitNtoNSurfaceAlpha;
+            }
+        }
+        break;
+
+    case SDL_COPY_COLORKEY | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND:
+        if (sf->Amask == 0) {
+            if (df->BytesPerPixel == 1) {
+                return BlitNto1SurfaceAlphaKey;
+            } else {
+                return BlitNtoNSurfaceAlphaKey;
+            }
+        }
+        break;
+    }
+
+    return NULL;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_N.c b/Source/3rd Party/sdl/src/video/SDL_blit_N.c
new file mode 100644
index 000000000..41615be57
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_N.c	
@@ -0,0 +1,2601 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+#include "SDL_endian.h"
+#include "SDL_cpuinfo.h"
+#include "SDL_blit.h"
+
+#include "SDL_assert.h"
+
+/* Functions to blit from N-bit surfaces to other surfaces */
+
+#if SDL_ALTIVEC_BLITTERS
+#ifdef HAVE_ALTIVEC_H
+#include <altivec.h>
+#endif
+#ifdef __MACOSX__
+#include <sys/sysctl.h>
+static size_t
+GetL3CacheSize(void)
+{
+    const char key[] = "hw.l3cachesize";
+    u_int64_t result = 0;
+    size_t typeSize = sizeof(result);
+
+
+    int err = sysctlbyname(key, &result, &typeSize, NULL, 0);
+    if (0 != err)
+        return 0;
+
+    return result;
+}
+#else
+static size_t
+GetL3CacheSize(void)
+{
+    /* XXX: Just guess G4 */
+    return 2097152;
+}
+#endif /* __MACOSX__ */
+
+#if (defined(__MACOSX__) && (__GNUC__ < 4))
+#define VECUINT8_LITERAL(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \
+        (vector unsigned char) ( a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p )
+#define VECUINT16_LITERAL(a,b,c,d,e,f,g,h) \
+        (vector unsigned short) ( a,b,c,d,e,f,g,h )
+#else
+#define VECUINT8_LITERAL(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) \
+        (vector unsigned char) { a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p }
+#define VECUINT16_LITERAL(a,b,c,d,e,f,g,h) \
+        (vector unsigned short) { a,b,c,d,e,f,g,h }
+#endif
+
+#define UNALIGNED_PTR(x) (((size_t) x) & 0x0000000F)
+#define VSWIZZLE32(a,b,c,d) (vector unsigned char) \
+                               ( 0x00+a, 0x00+b, 0x00+c, 0x00+d, \
+                                 0x04+a, 0x04+b, 0x04+c, 0x04+d, \
+                                 0x08+a, 0x08+b, 0x08+c, 0x08+d, \
+                                 0x0C+a, 0x0C+b, 0x0C+c, 0x0C+d )
+
+#define MAKE8888(dstfmt, r, g, b, a)  \
+    ( ((r<<dstfmt->Rshift)&dstfmt->Rmask) | \
+      ((g<<dstfmt->Gshift)&dstfmt->Gmask) | \
+      ((b<<dstfmt->Bshift)&dstfmt->Bmask) | \
+      ((a<<dstfmt->Ashift)&dstfmt->Amask) )
+
+/*
+ * Data Stream Touch...Altivec cache prefetching.
+ *
+ *  Don't use this on a G5...however, the speed boost is very significant
+ *   on a G4.
+ */
+#define DST_CHAN_SRC 1
+#define DST_CHAN_DEST 2
+
+/* macro to set DST control word value... */
+#define DST_CTRL(size, count, stride) \
+    (((size) << 24) | ((count) << 16) | (stride))
+
+#define VEC_ALIGNER(src) ((UNALIGNED_PTR(src)) \
+    ? vec_lvsl(0, src) \
+    : vec_add(vec_lvsl(8, src), vec_splat_u8(8)))
+
+/* Calculate the permute vector used for 32->32 swizzling */
+static vector unsigned char
+calc_swizzle32(const SDL_PixelFormat * srcfmt, const SDL_PixelFormat * dstfmt)
+{
+    /*
+     * We have to assume that the bits that aren't used by other
+     *  colors is alpha, and it's one complete byte, since some formats
+     *  leave alpha with a zero mask, but we should still swizzle the bits.
+     */
+    /* ARGB */
+    const static const struct SDL_PixelFormat default_pixel_format = {
+        0, NULL, 0, 0,
+        {0, 0},
+        0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000,
+        0, 0, 0, 0,
+        16, 8, 0, 24,
+        0, NULL
+    };
+    if (!srcfmt) {
+        srcfmt = &default_pixel_format;
+    }
+    if (!dstfmt) {
+        dstfmt = &default_pixel_format;
+    }
+    const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00,
+                                                       0x04, 0x04, 0x04, 0x04,
+                                                       0x08, 0x08, 0x08, 0x08,
+                                                       0x0C, 0x0C, 0x0C,
+                                                       0x0C);
+    vector unsigned char vswiz;
+    vector unsigned int srcvec;
+#define RESHIFT(X) (3 - ((X) >> 3))
+    Uint32 rmask = RESHIFT(srcfmt->Rshift) << (dstfmt->Rshift);
+    Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift);
+    Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift);
+    Uint32 amask;
+    /* Use zero for alpha if either surface doesn't have alpha */
+    if (dstfmt->Amask) {
+        amask =
+            ((srcfmt->Amask) ? RESHIFT(srcfmt->
+                                       Ashift) : 0x10) << (dstfmt->Ashift);
+    } else {
+        amask =
+            0x10101010 & ((dstfmt->Rmask | dstfmt->Gmask | dstfmt->Bmask) ^
+                          0xFFFFFFFF);
+    }
+#undef RESHIFT
+    ((unsigned int *) (char *) &srcvec)[0] = (rmask | gmask | bmask | amask);
+    vswiz = vec_add(plus, (vector unsigned char) vec_splat(srcvec, 0));
+    return (vswiz);
+}
+
+static void Blit_RGB888_RGB565(SDL_BlitInfo * info);
+static void
+Blit_RGB888_RGB565Altivec(SDL_BlitInfo * info)
+{
+    int height = info->dst_h;
+    Uint8 *src = (Uint8 *) info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = (Uint8 *) info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    vector unsigned char valpha = vec_splat_u8(0);
+    vector unsigned char vpermute = calc_swizzle32(srcfmt, NULL);
+    vector unsigned char vgmerge = VECUINT8_LITERAL(0x00, 0x02, 0x00, 0x06,
+                                                    0x00, 0x0a, 0x00, 0x0e,
+                                                    0x00, 0x12, 0x00, 0x16,
+                                                    0x00, 0x1a, 0x00, 0x1e);
+    vector unsigned short v1 = vec_splat_u16(1);
+    vector unsigned short v3 = vec_splat_u16(3);
+    vector unsigned short v3f =
+        VECUINT16_LITERAL(0x003f, 0x003f, 0x003f, 0x003f,
+                          0x003f, 0x003f, 0x003f, 0x003f);
+    vector unsigned short vfc =
+        VECUINT16_LITERAL(0x00fc, 0x00fc, 0x00fc, 0x00fc,
+                          0x00fc, 0x00fc, 0x00fc, 0x00fc);
+    vector unsigned short vf800 = (vector unsigned short) vec_splat_u8(-7);
+    vf800 = vec_sl(vf800, vec_splat_u16(8));
+
+    while (height--) {
+        vector unsigned char valigner;
+        vector unsigned char voverflow;
+        vector unsigned char vsrc;
+
+        int width = info->dst_w;
+        int extrawidth;
+
+        /* do scalar until we can align... */
+#define ONE_PIXEL_BLEND(condition, widthvar) \
+        while (condition) { \
+            Uint32 Pixel; \
+            unsigned sR, sG, sB, sA; \
+            DISEMBLE_RGBA((Uint8 *)src, 4, srcfmt, Pixel, \
+                          sR, sG, sB, sA); \
+            *(Uint16 *)(dst) = (((sR << 8) & 0x0000F800) | \
+                                ((sG << 3) & 0x000007E0) | \
+                                ((sB >> 3) & 0x0000001F)); \
+            dst += 2; \
+            src += 4; \
+            widthvar--; \
+        }
+
+        ONE_PIXEL_BLEND(((UNALIGNED_PTR(dst)) && (width)), width);
+
+        /* After all that work, here's the vector part! */
+        extrawidth = (width % 8);       /* trailing unaligned stores */
+        width -= extrawidth;
+        vsrc = vec_ld(0, src);
+        valigner = VEC_ALIGNER(src);
+
+        while (width) {
+            vector unsigned short vpixel, vrpixel, vgpixel, vbpixel;
+            vector unsigned int vsrc1, vsrc2;
+            vector unsigned char vdst;
+
+            voverflow = vec_ld(15, src);
+            vsrc = vec_perm(vsrc, voverflow, valigner);
+            vsrc1 = (vector unsigned int) vec_perm(vsrc, valpha, vpermute);
+            src += 16;
+            vsrc = voverflow;
+            voverflow = vec_ld(15, src);
+            vsrc = vec_perm(vsrc, voverflow, valigner);
+            vsrc2 = (vector unsigned int) vec_perm(vsrc, valpha, vpermute);
+            /* 1555 */
+            vpixel = (vector unsigned short) vec_packpx(vsrc1, vsrc2);
+            vgpixel = (vector unsigned short) vec_perm(vsrc1, vsrc2, vgmerge);
+            vgpixel = vec_and(vgpixel, vfc);
+            vgpixel = vec_sl(vgpixel, v3);
+            vrpixel = vec_sl(vpixel, v1);
+            vrpixel = vec_and(vrpixel, vf800);
+            vbpixel = vec_and(vpixel, v3f);
+            vdst =
+                vec_or((vector unsigned char) vrpixel,
+                       (vector unsigned char) vgpixel);
+            /* 565 */
+            vdst = vec_or(vdst, (vector unsigned char) vbpixel);
+            vec_st(vdst, 0, dst);
+
+            width -= 8;
+            src += 16;
+            dst += 16;
+            vsrc = voverflow;
+        }
+
+        SDL_assert(width == 0);
+
+        /* do scalar until we can align... */
+        ONE_PIXEL_BLEND((extrawidth), extrawidth);
+#undef ONE_PIXEL_BLEND
+
+        src += srcskip;         /* move to next row, accounting for pitch. */
+        dst += dstskip;
+    }
+
+
+}
+
+static void
+Blit_RGB565_32Altivec(SDL_BlitInfo * info)
+{
+    int height = info->dst_h;
+    Uint8 *src = (Uint8 *) info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = (Uint8 *) info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    unsigned alpha;
+    vector unsigned char valpha;
+    vector unsigned char vpermute;
+    vector unsigned short vf800;
+    vector unsigned int v8 = vec_splat_u32(8);
+    vector unsigned int v16 = vec_add(v8, v8);
+    vector unsigned short v2 = vec_splat_u16(2);
+    vector unsigned short v3 = vec_splat_u16(3);
+    /*
+       0x10 - 0x1f is the alpha
+       0x00 - 0x0e evens are the red
+       0x01 - 0x0f odds are zero
+     */
+    vector unsigned char vredalpha1 = VECUINT8_LITERAL(0x10, 0x00, 0x01, 0x01,
+                                                       0x10, 0x02, 0x01, 0x01,
+                                                       0x10, 0x04, 0x01, 0x01,
+                                                       0x10, 0x06, 0x01,
+                                                       0x01);
+    vector unsigned char vredalpha2 =
+        (vector unsigned
+         char) (vec_add((vector unsigned int) vredalpha1, vec_sl(v8, v16))
+        );
+    /*
+       0x00 - 0x0f is ARxx ARxx ARxx ARxx
+       0x11 - 0x0f odds are blue
+     */
+    vector unsigned char vblue1 = VECUINT8_LITERAL(0x00, 0x01, 0x02, 0x11,
+                                                   0x04, 0x05, 0x06, 0x13,
+                                                   0x08, 0x09, 0x0a, 0x15,
+                                                   0x0c, 0x0d, 0x0e, 0x17);
+    vector unsigned char vblue2 =
+        (vector unsigned char) (vec_add((vector unsigned int) vblue1, v8)
+        );
+    /*
+       0x00 - 0x0f is ARxB ARxB ARxB ARxB
+       0x10 - 0x0e evens are green
+     */
+    vector unsigned char vgreen1 = VECUINT8_LITERAL(0x00, 0x01, 0x10, 0x03,
+                                                    0x04, 0x05, 0x12, 0x07,
+                                                    0x08, 0x09, 0x14, 0x0b,
+                                                    0x0c, 0x0d, 0x16, 0x0f);
+    vector unsigned char vgreen2 =
+        (vector unsigned
+         char) (vec_add((vector unsigned int) vgreen1, vec_sl(v8, v8))
+        );
+
+    SDL_assert(srcfmt->BytesPerPixel == 2);
+    SDL_assert(dstfmt->BytesPerPixel == 4);
+
+    vf800 = (vector unsigned short) vec_splat_u8(-7);
+    vf800 = vec_sl(vf800, vec_splat_u16(8));
+
+    if (dstfmt->Amask && info->a) {
+        ((unsigned char *) &valpha)[0] = alpha = info->a;
+        valpha = vec_splat(valpha, 0);
+    } else {
+        alpha = 0;
+        valpha = vec_splat_u8(0);
+    }
+
+    vpermute = calc_swizzle32(NULL, dstfmt);
+    while (height--) {
+        vector unsigned char valigner;
+        vector unsigned char voverflow;
+        vector unsigned char vsrc;
+
+        int width = info->dst_w;
+        int extrawidth;
+
+        /* do scalar until we can align... */
+#define ONE_PIXEL_BLEND(condition, widthvar) \
+        while (condition) { \
+            unsigned sR, sG, sB; \
+            unsigned short Pixel = *((unsigned short *)src); \
+            sR = (Pixel >> 8) & 0xf8; \
+            sG = (Pixel >> 3) & 0xfc; \
+            sB = (Pixel << 3) & 0xf8; \
+            ASSEMBLE_RGBA(dst, 4, dstfmt, sR, sG, sB, alpha); \
+            src += 2; \
+            dst += 4; \
+            widthvar--; \
+        }
+        ONE_PIXEL_BLEND(((UNALIGNED_PTR(dst)) && (width)), width);
+
+        /* After all that work, here's the vector part! */
+        extrawidth = (width % 8);       /* trailing unaligned stores */
+        width -= extrawidth;
+        vsrc = vec_ld(0, src);
+        valigner = VEC_ALIGNER(src);
+
+        while (width) {
+            vector unsigned short vR, vG, vB;
+            vector unsigned char vdst1, vdst2;
+
+            voverflow = vec_ld(15, src);
+            vsrc = vec_perm(vsrc, voverflow, valigner);
+
+            vR = vec_and((vector unsigned short) vsrc, vf800);
+            vB = vec_sl((vector unsigned short) vsrc, v3);
+            vG = vec_sl(vB, v2);
+
+            vdst1 =
+                (vector unsigned char) vec_perm((vector unsigned char) vR,
+                                                valpha, vredalpha1);
+            vdst1 = vec_perm(vdst1, (vector unsigned char) vB, vblue1);
+            vdst1 = vec_perm(vdst1, (vector unsigned char) vG, vgreen1);
+            vdst1 = vec_perm(vdst1, valpha, vpermute);
+            vec_st(vdst1, 0, dst);
+
+            vdst2 =
+                (vector unsigned char) vec_perm((vector unsigned char) vR,
+                                                valpha, vredalpha2);
+            vdst2 = vec_perm(vdst2, (vector unsigned char) vB, vblue2);
+            vdst2 = vec_perm(vdst2, (vector unsigned char) vG, vgreen2);
+            vdst2 = vec_perm(vdst2, valpha, vpermute);
+            vec_st(vdst2, 16, dst);
+
+            width -= 8;
+            dst += 32;
+            src += 16;
+            vsrc = voverflow;
+        }
+
+        SDL_assert(width == 0);
+
+
+        /* do scalar until we can align... */
+        ONE_PIXEL_BLEND((extrawidth), extrawidth);
+#undef ONE_PIXEL_BLEND
+
+        src += srcskip;         /* move to next row, accounting for pitch. */
+        dst += dstskip;
+    }
+
+}
+
+
+static void
+Blit_RGB555_32Altivec(SDL_BlitInfo * info)
+{
+    int height = info->dst_h;
+    Uint8 *src = (Uint8 *) info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = (Uint8 *) info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    unsigned alpha;
+    vector unsigned char valpha;
+    vector unsigned char vpermute;
+    vector unsigned short vf800;
+    vector unsigned int v8 = vec_splat_u32(8);
+    vector unsigned int v16 = vec_add(v8, v8);
+    vector unsigned short v1 = vec_splat_u16(1);
+    vector unsigned short v3 = vec_splat_u16(3);
+    /*
+       0x10 - 0x1f is the alpha
+       0x00 - 0x0e evens are the red
+       0x01 - 0x0f odds are zero
+     */
+    vector unsigned char vredalpha1 = VECUINT8_LITERAL(0x10, 0x00, 0x01, 0x01,
+                                                       0x10, 0x02, 0x01, 0x01,
+                                                       0x10, 0x04, 0x01, 0x01,
+                                                       0x10, 0x06, 0x01,
+                                                       0x01);
+    vector unsigned char vredalpha2 =
+        (vector unsigned
+         char) (vec_add((vector unsigned int) vredalpha1, vec_sl(v8, v16))
+        );
+    /*
+       0x00 - 0x0f is ARxx ARxx ARxx ARxx
+       0x11 - 0x0f odds are blue
+     */
+    vector unsigned char vblue1 = VECUINT8_LITERAL(0x00, 0x01, 0x02, 0x11,
+                                                   0x04, 0x05, 0x06, 0x13,
+                                                   0x08, 0x09, 0x0a, 0x15,
+                                                   0x0c, 0x0d, 0x0e, 0x17);
+    vector unsigned char vblue2 =
+        (vector unsigned char) (vec_add((vector unsigned int) vblue1, v8)
+        );
+    /*
+       0x00 - 0x0f is ARxB ARxB ARxB ARxB
+       0x10 - 0x0e evens are green
+     */
+    vector unsigned char vgreen1 = VECUINT8_LITERAL(0x00, 0x01, 0x10, 0x03,
+                                                    0x04, 0x05, 0x12, 0x07,
+                                                    0x08, 0x09, 0x14, 0x0b,
+                                                    0x0c, 0x0d, 0x16, 0x0f);
+    vector unsigned char vgreen2 =
+        (vector unsigned
+         char) (vec_add((vector unsigned int) vgreen1, vec_sl(v8, v8))
+        );
+
+    SDL_assert(srcfmt->BytesPerPixel == 2);
+    SDL_assert(dstfmt->BytesPerPixel == 4);
+
+    vf800 = (vector unsigned short) vec_splat_u8(-7);
+    vf800 = vec_sl(vf800, vec_splat_u16(8));
+
+    if (dstfmt->Amask && info->a) {
+        ((unsigned char *) &valpha)[0] = alpha = info->a;
+        valpha = vec_splat(valpha, 0);
+    } else {
+        alpha = 0;
+        valpha = vec_splat_u8(0);
+    }
+
+    vpermute = calc_swizzle32(NULL, dstfmt);
+    while (height--) {
+        vector unsigned char valigner;
+        vector unsigned char voverflow;
+        vector unsigned char vsrc;
+
+        int width = info->dst_w;
+        int extrawidth;
+
+        /* do scalar until we can align... */
+#define ONE_PIXEL_BLEND(condition, widthvar) \
+        while (condition) { \
+            unsigned sR, sG, sB; \
+            unsigned short Pixel = *((unsigned short *)src); \
+            sR = (Pixel >> 7) & 0xf8; \
+            sG = (Pixel >> 2) & 0xf8; \
+            sB = (Pixel << 3) & 0xf8; \
+            ASSEMBLE_RGBA(dst, 4, dstfmt, sR, sG, sB, alpha); \
+            src += 2; \
+            dst += 4; \
+            widthvar--; \
+        }
+        ONE_PIXEL_BLEND(((UNALIGNED_PTR(dst)) && (width)), width);
+
+        /* After all that work, here's the vector part! */
+        extrawidth = (width % 8);       /* trailing unaligned stores */
+        width -= extrawidth;
+        vsrc = vec_ld(0, src);
+        valigner = VEC_ALIGNER(src);
+
+        while (width) {
+            vector unsigned short vR, vG, vB;
+            vector unsigned char vdst1, vdst2;
+
+            voverflow = vec_ld(15, src);
+            vsrc = vec_perm(vsrc, voverflow, valigner);
+
+            vR = vec_and(vec_sl((vector unsigned short) vsrc, v1), vf800);
+            vB = vec_sl((vector unsigned short) vsrc, v3);
+            vG = vec_sl(vB, v3);
+
+            vdst1 =
+                (vector unsigned char) vec_perm((vector unsigned char) vR,
+                                                valpha, vredalpha1);
+            vdst1 = vec_perm(vdst1, (vector unsigned char) vB, vblue1);
+            vdst1 = vec_perm(vdst1, (vector unsigned char) vG, vgreen1);
+            vdst1 = vec_perm(vdst1, valpha, vpermute);
+            vec_st(vdst1, 0, dst);
+
+            vdst2 =
+                (vector unsigned char) vec_perm((vector unsigned char) vR,
+                                                valpha, vredalpha2);
+            vdst2 = vec_perm(vdst2, (vector unsigned char) vB, vblue2);
+            vdst2 = vec_perm(vdst2, (vector unsigned char) vG, vgreen2);
+            vdst2 = vec_perm(vdst2, valpha, vpermute);
+            vec_st(vdst2, 16, dst);
+
+            width -= 8;
+            dst += 32;
+            src += 16;
+            vsrc = voverflow;
+        }
+
+        SDL_assert(width == 0);
+
+
+        /* do scalar until we can align... */
+        ONE_PIXEL_BLEND((extrawidth), extrawidth);
+#undef ONE_PIXEL_BLEND
+
+        src += srcskip;         /* move to next row, accounting for pitch. */
+        dst += dstskip;
+    }
+
+}
+
+static void BlitNtoNKey(SDL_BlitInfo * info);
+static void BlitNtoNKeyCopyAlpha(SDL_BlitInfo * info);
+static void
+Blit32to32KeyAltivec(SDL_BlitInfo * info)
+{
+    int height = info->dst_h;
+    Uint32 *srcp = (Uint32 *) info->src;
+    int srcskip = info->src_skip / 4;
+    Uint32 *dstp = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip / 4;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    int srcbpp = srcfmt->BytesPerPixel;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int dstbpp = dstfmt->BytesPerPixel;
+    int copy_alpha = (srcfmt->Amask && dstfmt->Amask);
+    unsigned alpha = dstfmt->Amask ? info->a : 0;
+    Uint32 rgbmask = srcfmt->Rmask | srcfmt->Gmask | srcfmt->Bmask;
+    Uint32 ckey = info->colorkey;
+    vector unsigned int valpha;
+    vector unsigned char vpermute;
+    vector unsigned char vzero;
+    vector unsigned int vckey;
+    vector unsigned int vrgbmask;
+    vpermute = calc_swizzle32(srcfmt, dstfmt);
+    if (info->dst_w < 16) {
+        if (copy_alpha) {
+            BlitNtoNKeyCopyAlpha(info);
+        } else {
+            BlitNtoNKey(info);
+        }
+        return;
+    }
+    vzero = vec_splat_u8(0);
+    if (alpha) {
+        ((unsigned char *) &valpha)[0] = (unsigned char) alpha;
+        valpha =
+            (vector unsigned int) vec_splat((vector unsigned char) valpha, 0);
+    } else {
+        valpha = (vector unsigned int) vzero;
+    }
+    ckey &= rgbmask;
+    ((unsigned int *) (char *) &vckey)[0] = ckey;
+    vckey = vec_splat(vckey, 0);
+    ((unsigned int *) (char *) &vrgbmask)[0] = rgbmask;
+    vrgbmask = vec_splat(vrgbmask, 0);
+
+    while (height--) {
+#define ONE_PIXEL_BLEND(condition, widthvar) \
+        if (copy_alpha) { \
+            while (condition) { \
+                Uint32 Pixel; \
+                unsigned sR, sG, sB, sA; \
+                DISEMBLE_RGBA((Uint8 *)srcp, srcbpp, srcfmt, Pixel, \
+                          sR, sG, sB, sA); \
+                if ( (Pixel & rgbmask) != ckey ) { \
+                      ASSEMBLE_RGBA((Uint8 *)dstp, dstbpp, dstfmt, \
+                            sR, sG, sB, sA); \
+                } \
+                dstp = (Uint32 *) (((Uint8 *) dstp) + dstbpp); \
+                srcp = (Uint32 *) (((Uint8 *) srcp) + srcbpp); \
+                widthvar--; \
+            } \
+        } else { \
+            while (condition) { \
+                Uint32 Pixel; \
+                unsigned sR, sG, sB; \
+                RETRIEVE_RGB_PIXEL((Uint8 *)srcp, srcbpp, Pixel); \
+                if ( Pixel != ckey ) { \
+                    RGB_FROM_PIXEL(Pixel, srcfmt, sR, sG, sB); \
+                    ASSEMBLE_RGBA((Uint8 *)dstp, dstbpp, dstfmt, \
+                              sR, sG, sB, alpha); \
+                } \
+                dstp = (Uint32 *) (((Uint8 *)dstp) + dstbpp); \
+                srcp = (Uint32 *) (((Uint8 *)srcp) + srcbpp); \
+                widthvar--; \
+            } \
+        }
+        int width = info->dst_w;
+        ONE_PIXEL_BLEND((UNALIGNED_PTR(dstp)) && (width), width);
+        SDL_assert(width > 0);
+        if (width > 0) {
+            int extrawidth = (width % 4);
+            vector unsigned char valigner = VEC_ALIGNER(srcp);
+            vector unsigned int vs = vec_ld(0, srcp);
+            width -= extrawidth;
+            SDL_assert(width >= 4);
+            while (width) {
+                vector unsigned char vsel;
+                vector unsigned int vd;
+                vector unsigned int voverflow = vec_ld(15, srcp);
+                /* load the source vec */
+                vs = vec_perm(vs, voverflow, valigner);
+                /* vsel is set for items that match the key */
+                vsel = (vector unsigned char) vec_and(vs, vrgbmask);
+                vsel = (vector unsigned char) vec_cmpeq(vs, vckey);
+                /* permute the src vec to the dest format */
+                vs = vec_perm(vs, valpha, vpermute);
+                /* load the destination vec */
+                vd = vec_ld(0, dstp);
+                /* select the source and dest into vs */
+                vd = (vector unsigned int) vec_sel((vector unsigned char) vs,
+                                                   (vector unsigned char) vd,
+                                                   vsel);
+
+                vec_st(vd, 0, dstp);
+                srcp += 4;
+                width -= 4;
+                dstp += 4;
+                vs = voverflow;
+            }
+            ONE_PIXEL_BLEND((extrawidth), extrawidth);
+#undef ONE_PIXEL_BLEND
+            srcp += srcskip;
+            dstp += dstskip;
+        }
+    }
+}
+
+/* Altivec code to swizzle one 32-bit surface to a different 32-bit format. */
+/* Use this on a G5 */
+static void
+ConvertAltivec32to32_noprefetch(SDL_BlitInfo * info)
+{
+    int height = info->dst_h;
+    Uint32 *src = (Uint32 *) info->src;
+    int srcskip = info->src_skip / 4;
+    Uint32 *dst = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip / 4;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    vector unsigned int vzero = vec_splat_u32(0);
+    vector unsigned char vpermute = calc_swizzle32(srcfmt, dstfmt);
+    if (dstfmt->Amask && !srcfmt->Amask) {
+        if (info->a) {
+            vector unsigned char valpha;
+            ((unsigned char *) &valpha)[0] = info->a;
+            vzero = (vector unsigned int) vec_splat(valpha, 0);
+        }
+    }
+
+    SDL_assert(srcfmt->BytesPerPixel == 4);
+    SDL_assert(dstfmt->BytesPerPixel == 4);
+
+    while (height--) {
+        vector unsigned char valigner;
+        vector unsigned int vbits;
+        vector unsigned int voverflow;
+        Uint32 bits;
+        Uint8 r, g, b, a;
+
+        int width = info->dst_w;
+        int extrawidth;
+
+        /* do scalar until we can align... */
+        while ((UNALIGNED_PTR(dst)) && (width)) {
+            bits = *(src++);
+            RGBA_FROM_8888(bits, srcfmt, r, g, b, a);
+            if(!srcfmt->Amask)
+              a = info->a;
+            *(dst++) = MAKE8888(dstfmt, r, g, b, a);
+            width--;
+        }
+
+        /* After all that work, here's the vector part! */
+        extrawidth = (width % 4);
+        width -= extrawidth;
+        valigner = VEC_ALIGNER(src);
+        vbits = vec_ld(0, src);
+
+        while (width) {
+            voverflow = vec_ld(15, src);
+            src += 4;
+            width -= 4;
+            vbits = vec_perm(vbits, voverflow, valigner);       /* src is ready. */
+            vbits = vec_perm(vbits, vzero, vpermute);   /* swizzle it. */
+            vec_st(vbits, 0, dst);      /* store it back out. */
+            dst += 4;
+            vbits = voverflow;
+        }
+
+        SDL_assert(width == 0);
+
+        /* cover pixels at the end of the row that didn't fit in 16 bytes. */
+        while (extrawidth) {
+            bits = *(src++);    /* max 7 pixels, don't bother with prefetch. */
+            RGBA_FROM_8888(bits, srcfmt, r, g, b, a);
+            if(!srcfmt->Amask)
+              a = info->a;
+            *(dst++) = MAKE8888(dstfmt, r, g, b, a);
+            extrawidth--;
+        }
+
+        src += srcskip;
+        dst += dstskip;
+    }
+
+}
+
+/* Altivec code to swizzle one 32-bit surface to a different 32-bit format. */
+/* Use this on a G4 */
+static void
+ConvertAltivec32to32_prefetch(SDL_BlitInfo * info)
+{
+    const int scalar_dst_lead = sizeof(Uint32) * 4;
+    const int vector_dst_lead = sizeof(Uint32) * 16;
+
+    int height = info->dst_h;
+    Uint32 *src = (Uint32 *) info->src;
+    int srcskip = info->src_skip / 4;
+    Uint32 *dst = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip / 4;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    vector unsigned int vzero = vec_splat_u32(0);
+    vector unsigned char vpermute = calc_swizzle32(srcfmt, dstfmt);
+    if (dstfmt->Amask && !srcfmt->Amask) {
+        if (info->a) {
+            vector unsigned char valpha;
+            ((unsigned char *) &valpha)[0] = info->a;
+            vzero = (vector unsigned int) vec_splat(valpha, 0);
+        }
+    }
+
+    SDL_assert(srcfmt->BytesPerPixel == 4);
+    SDL_assert(dstfmt->BytesPerPixel == 4);
+
+    while (height--) {
+        vector unsigned char valigner;
+        vector unsigned int vbits;
+        vector unsigned int voverflow;
+        Uint32 bits;
+        Uint8 r, g, b, a;
+
+        int width = info->dst_w;
+        int extrawidth;
+
+        /* do scalar until we can align... */
+        while ((UNALIGNED_PTR(dst)) && (width)) {
+            vec_dstt(src + scalar_dst_lead, DST_CTRL(2, 32, 1024),
+                     DST_CHAN_SRC);
+            vec_dstst(dst + scalar_dst_lead, DST_CTRL(2, 32, 1024),
+                      DST_CHAN_DEST);
+            bits = *(src++);
+            RGBA_FROM_8888(bits, srcfmt, r, g, b, a);
+            if(!srcfmt->Amask)
+              a = info->a;
+            *(dst++) = MAKE8888(dstfmt, r, g, b, a);
+            width--;
+        }
+
+        /* After all that work, here's the vector part! */
+        extrawidth = (width % 4);
+        width -= extrawidth;
+        valigner = VEC_ALIGNER(src);
+        vbits = vec_ld(0, src);
+
+        while (width) {
+            vec_dstt(src + vector_dst_lead, DST_CTRL(2, 32, 1024),
+                     DST_CHAN_SRC);
+            vec_dstst(dst + vector_dst_lead, DST_CTRL(2, 32, 1024),
+                      DST_CHAN_DEST);
+            voverflow = vec_ld(15, src);
+            src += 4;
+            width -= 4;
+            vbits = vec_perm(vbits, voverflow, valigner);       /* src is ready. */
+            vbits = vec_perm(vbits, vzero, vpermute);   /* swizzle it. */
+            vec_st(vbits, 0, dst);      /* store it back out. */
+            dst += 4;
+            vbits = voverflow;
+        }
+
+        SDL_assert(width == 0);
+
+        /* cover pixels at the end of the row that didn't fit in 16 bytes. */
+        while (extrawidth) {
+            bits = *(src++);    /* max 7 pixels, don't bother with prefetch. */
+            RGBA_FROM_8888(bits, srcfmt, r, g, b, a);
+            if(!srcfmt->Amask)
+              a = info->a;
+            *(dst++) = MAKE8888(dstfmt, r, g, b, a);
+            extrawidth--;
+        }
+
+        src += srcskip;
+        dst += dstskip;
+    }
+
+    vec_dss(DST_CHAN_SRC);
+    vec_dss(DST_CHAN_DEST);
+}
+
+static Uint32
+GetBlitFeatures(void)
+{
+    static Uint32 features = 0xffffffff;
+    if (features == 0xffffffff) {
+        /* Provide an override for testing .. */
+        char *override = SDL_getenv("SDL_ALTIVEC_BLIT_FEATURES");
+        if (override) {
+            features = 0;
+            SDL_sscanf(override, "%u", &features);
+        } else {
+            features = (0
+                        /* Feature 1 is has-MMX */
+                        | ((SDL_HasMMX())? 1 : 0)
+                        /* Feature 2 is has-AltiVec */
+                        | ((SDL_HasAltiVec())? 2 : 0)
+                        /* Feature 4 is dont-use-prefetch */
+                        /* !!!! FIXME: Check for G5 or later, not the cache size! Always prefetch on a G4. */
+                        | ((GetL3CacheSize() == 0) ? 4 : 0)
+                );
+        }
+    }
+    return features;
+}
+
+#if __MWERKS__
+#pragma altivec_model off
+#endif
+#else
+/* Feature 1 is has-MMX */
+#define GetBlitFeatures() ((Uint32)(SDL_HasMMX() ? 1 : 0))
+#endif
+
+/* This is now endian dependent */
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+#define HI  1
+#define LO  0
+#else /* SDL_BYTEORDER == SDL_BIG_ENDIAN */
+#define HI  0
+#define LO  1
+#endif
+
+/* Special optimized blit for RGB 8-8-8 --> RGB 3-3-2 */
+#define RGB888_RGB332(dst, src) { \
+    dst = (Uint8)((((src)&0x00E00000)>>16)| \
+                  (((src)&0x0000E000)>>11)| \
+                  (((src)&0x000000C0)>>6)); \
+}
+static void
+Blit_RGB888_index8(SDL_BlitInfo * info)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int width, height;
+    Uint32 *src;
+    const Uint8 *map;
+    Uint8 *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = (Uint32 *) info->src;
+    srcskip = info->src_skip / 4;
+    dst = info->dst;
+    dstskip = info->dst_skip;
+    map = info->table;
+
+    if (map == NULL) {
+        while (height--) {
+#ifdef USE_DUFFS_LOOP
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+                RGB888_RGB332(*dst++, *src);
+            , width);
+            /* *INDENT-ON* */
+#else
+            for (c = width / 4; c; --c) {
+                /* Pack RGB into 8bit pixel */
+                ++src;
+                RGB888_RGB332(*dst++, *src);
+                ++src;
+                RGB888_RGB332(*dst++, *src);
+                ++src;
+                RGB888_RGB332(*dst++, *src);
+                ++src;
+            }
+            switch (width & 3) {
+            case 3:
+                RGB888_RGB332(*dst++, *src);
+                ++src;
+            case 2:
+                RGB888_RGB332(*dst++, *src);
+                ++src;
+            case 1:
+                RGB888_RGB332(*dst++, *src);
+                ++src;
+            }
+#endif /* USE_DUFFS_LOOP */
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        int Pixel;
+
+        while (height--) {
+#ifdef USE_DUFFS_LOOP
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+                RGB888_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            , width);
+            /* *INDENT-ON* */
+#else
+            for (c = width / 4; c; --c) {
+                /* Pack RGB into 8bit pixel */
+                RGB888_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+                RGB888_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+                RGB888_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+                RGB888_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            }
+            switch (width & 3) {
+            case 3:
+                RGB888_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            case 2:
+                RGB888_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            case 1:
+                RGB888_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            }
+#endif /* USE_DUFFS_LOOP */
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+}
+
+/* Special optimized blit for RGB 10-10-10 --> RGB 3-3-2 */
+#define RGB101010_RGB332(dst, src) { \
+    dst = (Uint8)((((src)&0x38000000)>>22)| \
+                  (((src)&0x000E0000)>>15)| \
+                  (((src)&0x00000300)>>8)); \
+}
+static void
+Blit_RGB101010_index8(SDL_BlitInfo * info)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int width, height;
+    Uint32 *src;
+    const Uint8 *map;
+    Uint8 *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = (Uint32 *) info->src;
+    srcskip = info->src_skip / 4;
+    dst = info->dst;
+    dstskip = info->dst_skip;
+    map = info->table;
+
+    if (map == NULL) {
+        while (height--) {
+#ifdef USE_DUFFS_LOOP
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+                RGB101010_RGB332(*dst++, *src);
+            , width);
+            /* *INDENT-ON* */
+#else
+            for (c = width / 4; c; --c) {
+                /* Pack RGB into 8bit pixel */
+                ++src;
+                RGB101010_RGB332(*dst++, *src);
+                ++src;
+                RGB101010_RGB332(*dst++, *src);
+                ++src;
+                RGB101010_RGB332(*dst++, *src);
+                ++src;
+            }
+            switch (width & 3) {
+            case 3:
+                RGB101010_RGB332(*dst++, *src);
+                ++src;
+            case 2:
+                RGB101010_RGB332(*dst++, *src);
+                ++src;
+            case 1:
+                RGB101010_RGB332(*dst++, *src);
+                ++src;
+            }
+#endif /* USE_DUFFS_LOOP */
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        int Pixel;
+
+        while (height--) {
+#ifdef USE_DUFFS_LOOP
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+                RGB101010_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            , width);
+            /* *INDENT-ON* */
+#else
+            for (c = width / 4; c; --c) {
+                /* Pack RGB into 8bit pixel */
+                RGB101010_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+                RGB101010_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+                RGB101010_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+                RGB101010_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            }
+            switch (width & 3) {
+            case 3:
+                RGB101010_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            case 2:
+                RGB101010_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            case 1:
+                RGB101010_RGB332(Pixel, *src);
+                *dst++ = map[Pixel];
+                ++src;
+            }
+#endif /* USE_DUFFS_LOOP */
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+}
+
+/* Special optimized blit for RGB 8-8-8 --> RGB 5-5-5 */
+#define RGB888_RGB555(dst, src) { \
+    *(Uint16 *)(dst) = (Uint16)((((*src)&0x00F80000)>>9)| \
+                                (((*src)&0x0000F800)>>6)| \
+                                (((*src)&0x000000F8)>>3)); \
+}
+#define RGB888_RGB555_TWO(dst, src) { \
+    *(Uint32 *)(dst) = (((((src[HI])&0x00F80000)>>9)| \
+                         (((src[HI])&0x0000F800)>>6)| \
+                         (((src[HI])&0x000000F8)>>3))<<16)| \
+                         (((src[LO])&0x00F80000)>>9)| \
+                         (((src[LO])&0x0000F800)>>6)| \
+                         (((src[LO])&0x000000F8)>>3); \
+}
+static void
+Blit_RGB888_RGB555(SDL_BlitInfo * info)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int width, height;
+    Uint32 *src;
+    Uint16 *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = (Uint32 *) info->src;
+    srcskip = info->src_skip / 4;
+    dst = (Uint16 *) info->dst;
+    dstskip = info->dst_skip / 2;
+
+#ifdef USE_DUFFS_LOOP
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP(
+            RGB888_RGB555(dst, src);
+            ++src;
+            ++dst;
+        , width);
+        /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+#else
+    /* Memory align at 4-byte boundary, if necessary */
+    if ((long) dst & 0x03) {
+        /* Don't do anything if width is 0 */
+        if (width == 0) {
+            return;
+        }
+        --width;
+
+        while (height--) {
+            /* Perform copy alignment */
+            RGB888_RGB555(dst, src);
+            ++src;
+            ++dst;
+
+            /* Copy in 4 pixel chunks */
+            for (c = width / 4; c; --c) {
+                RGB888_RGB555_TWO(dst, src);
+                src += 2;
+                dst += 2;
+                RGB888_RGB555_TWO(dst, src);
+                src += 2;
+                dst += 2;
+            }
+            /* Get any leftovers */
+            switch (width & 3) {
+            case 3:
+                RGB888_RGB555(dst, src);
+                ++src;
+                ++dst;
+            case 2:
+                RGB888_RGB555_TWO(dst, src);
+                src += 2;
+                dst += 2;
+                break;
+            case 1:
+                RGB888_RGB555(dst, src);
+                ++src;
+                ++dst;
+                break;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        while (height--) {
+            /* Copy in 4 pixel chunks */
+            for (c = width / 4; c; --c) {
+                RGB888_RGB555_TWO(dst, src);
+                src += 2;
+                dst += 2;
+                RGB888_RGB555_TWO(dst, src);
+                src += 2;
+                dst += 2;
+            }
+            /* Get any leftovers */
+            switch (width & 3) {
+            case 3:
+                RGB888_RGB555(dst, src);
+                ++src;
+                ++dst;
+            case 2:
+                RGB888_RGB555_TWO(dst, src);
+                src += 2;
+                dst += 2;
+                break;
+            case 1:
+                RGB888_RGB555(dst, src);
+                ++src;
+                ++dst;
+                break;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+#endif /* USE_DUFFS_LOOP */
+}
+
+/* Special optimized blit for RGB 8-8-8 --> RGB 5-6-5 */
+#define RGB888_RGB565(dst, src) { \
+    *(Uint16 *)(dst) = (Uint16)((((*src)&0x00F80000)>>8)| \
+                                (((*src)&0x0000FC00)>>5)| \
+                                (((*src)&0x000000F8)>>3)); \
+}
+#define RGB888_RGB565_TWO(dst, src) { \
+    *(Uint32 *)(dst) = (((((src[HI])&0x00F80000)>>8)| \
+                         (((src[HI])&0x0000FC00)>>5)| \
+                         (((src[HI])&0x000000F8)>>3))<<16)| \
+                         (((src[LO])&0x00F80000)>>8)| \
+                         (((src[LO])&0x0000FC00)>>5)| \
+                         (((src[LO])&0x000000F8)>>3); \
+}
+static void
+Blit_RGB888_RGB565(SDL_BlitInfo * info)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int width, height;
+    Uint32 *src;
+    Uint16 *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = (Uint32 *) info->src;
+    srcskip = info->src_skip / 4;
+    dst = (Uint16 *) info->dst;
+    dstskip = info->dst_skip / 2;
+
+#ifdef USE_DUFFS_LOOP
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP(
+            RGB888_RGB565(dst, src);
+            ++src;
+            ++dst;
+        , width);
+        /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+#else
+    /* Memory align at 4-byte boundary, if necessary */
+    if ((long) dst & 0x03) {
+        /* Don't do anything if width is 0 */
+        if (width == 0) {
+            return;
+        }
+        --width;
+
+        while (height--) {
+            /* Perform copy alignment */
+            RGB888_RGB565(dst, src);
+            ++src;
+            ++dst;
+
+            /* Copy in 4 pixel chunks */
+            for (c = width / 4; c; --c) {
+                RGB888_RGB565_TWO(dst, src);
+                src += 2;
+                dst += 2;
+                RGB888_RGB565_TWO(dst, src);
+                src += 2;
+                dst += 2;
+            }
+            /* Get any leftovers */
+            switch (width & 3) {
+            case 3:
+                RGB888_RGB565(dst, src);
+                ++src;
+                ++dst;
+            case 2:
+                RGB888_RGB565_TWO(dst, src);
+                src += 2;
+                dst += 2;
+                break;
+            case 1:
+                RGB888_RGB565(dst, src);
+                ++src;
+                ++dst;
+                break;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        while (height--) {
+            /* Copy in 4 pixel chunks */
+            for (c = width / 4; c; --c) {
+                RGB888_RGB565_TWO(dst, src);
+                src += 2;
+                dst += 2;
+                RGB888_RGB565_TWO(dst, src);
+                src += 2;
+                dst += 2;
+            }
+            /* Get any leftovers */
+            switch (width & 3) {
+            case 3:
+                RGB888_RGB565(dst, src);
+                ++src;
+                ++dst;
+            case 2:
+                RGB888_RGB565_TWO(dst, src);
+                src += 2;
+                dst += 2;
+                break;
+            case 1:
+                RGB888_RGB565(dst, src);
+                ++src;
+                ++dst;
+                break;
+            }
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+#endif /* USE_DUFFS_LOOP */
+}
+
+
+/* Special optimized blit for RGB 5-6-5 --> 32-bit RGB surfaces */
+#define RGB565_32(dst, src, map) (map[src[LO]*2] + map[src[HI]*2+1])
+static void
+Blit_RGB565_32(SDL_BlitInfo * info, const Uint32 * map)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int width, height;
+    Uint8 *src;
+    Uint32 *dst;
+    int srcskip, dstskip;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = (Uint8 *) info->src;
+    srcskip = info->src_skip;
+    dst = (Uint32 *) info->dst;
+    dstskip = info->dst_skip / 4;
+
+#ifdef USE_DUFFS_LOOP
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP(
+        {
+            *dst++ = RGB565_32(dst, src, map);
+            src += 2;
+        },
+        width);
+        /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+#else
+    while (height--) {
+        /* Copy in 4 pixel chunks */
+        for (c = width / 4; c; --c) {
+            *dst++ = RGB565_32(dst, src, map);
+            src += 2;
+            *dst++ = RGB565_32(dst, src, map);
+            src += 2;
+            *dst++ = RGB565_32(dst, src, map);
+            src += 2;
+            *dst++ = RGB565_32(dst, src, map);
+            src += 2;
+        }
+        /* Get any leftovers */
+        switch (width & 3) {
+        case 3:
+            *dst++ = RGB565_32(dst, src, map);
+            src += 2;
+        case 2:
+            *dst++ = RGB565_32(dst, src, map);
+            src += 2;
+        case 1:
+            *dst++ = RGB565_32(dst, src, map);
+            src += 2;
+            break;
+        }
+        src += srcskip;
+        dst += dstskip;
+    }
+#endif /* USE_DUFFS_LOOP */
+}
+
+/* Special optimized blit for RGB 5-6-5 --> ARGB 8-8-8-8 */
+static const Uint32 RGB565_ARGB8888_LUT[512] = {
+    0x00000000, 0xff000000, 0x00000008, 0xff002000,
+    0x00000010, 0xff004000, 0x00000018, 0xff006100,
+    0x00000020, 0xff008100, 0x00000029, 0xff00a100,
+    0x00000031, 0xff00c200, 0x00000039, 0xff00e200,
+    0x00000041, 0xff080000, 0x0000004a, 0xff082000,
+    0x00000052, 0xff084000, 0x0000005a, 0xff086100,
+    0x00000062, 0xff088100, 0x0000006a, 0xff08a100,
+    0x00000073, 0xff08c200, 0x0000007b, 0xff08e200,
+    0x00000083, 0xff100000, 0x0000008b, 0xff102000,
+    0x00000094, 0xff104000, 0x0000009c, 0xff106100,
+    0x000000a4, 0xff108100, 0x000000ac, 0xff10a100,
+    0x000000b4, 0xff10c200, 0x000000bd, 0xff10e200,
+    0x000000c5, 0xff180000, 0x000000cd, 0xff182000,
+    0x000000d5, 0xff184000, 0x000000de, 0xff186100,
+    0x000000e6, 0xff188100, 0x000000ee, 0xff18a100,
+    0x000000f6, 0xff18c200, 0x000000ff, 0xff18e200,
+    0x00000400, 0xff200000, 0x00000408, 0xff202000,
+    0x00000410, 0xff204000, 0x00000418, 0xff206100,
+    0x00000420, 0xff208100, 0x00000429, 0xff20a100,
+    0x00000431, 0xff20c200, 0x00000439, 0xff20e200,
+    0x00000441, 0xff290000, 0x0000044a, 0xff292000,
+    0x00000452, 0xff294000, 0x0000045a, 0xff296100,
+    0x00000462, 0xff298100, 0x0000046a, 0xff29a100,
+    0x00000473, 0xff29c200, 0x0000047b, 0xff29e200,
+    0x00000483, 0xff310000, 0x0000048b, 0xff312000,
+    0x00000494, 0xff314000, 0x0000049c, 0xff316100,
+    0x000004a4, 0xff318100, 0x000004ac, 0xff31a100,
+    0x000004b4, 0xff31c200, 0x000004bd, 0xff31e200,
+    0x000004c5, 0xff390000, 0x000004cd, 0xff392000,
+    0x000004d5, 0xff394000, 0x000004de, 0xff396100,
+    0x000004e6, 0xff398100, 0x000004ee, 0xff39a100,
+    0x000004f6, 0xff39c200, 0x000004ff, 0xff39e200,
+    0x00000800, 0xff410000, 0x00000808, 0xff412000,
+    0x00000810, 0xff414000, 0x00000818, 0xff416100,
+    0x00000820, 0xff418100, 0x00000829, 0xff41a100,
+    0x00000831, 0xff41c200, 0x00000839, 0xff41e200,
+    0x00000841, 0xff4a0000, 0x0000084a, 0xff4a2000,
+    0x00000852, 0xff4a4000, 0x0000085a, 0xff4a6100,
+    0x00000862, 0xff4a8100, 0x0000086a, 0xff4aa100,
+    0x00000873, 0xff4ac200, 0x0000087b, 0xff4ae200,
+    0x00000883, 0xff520000, 0x0000088b, 0xff522000,
+    0x00000894, 0xff524000, 0x0000089c, 0xff526100,
+    0x000008a4, 0xff528100, 0x000008ac, 0xff52a100,
+    0x000008b4, 0xff52c200, 0x000008bd, 0xff52e200,
+    0x000008c5, 0xff5a0000, 0x000008cd, 0xff5a2000,
+    0x000008d5, 0xff5a4000, 0x000008de, 0xff5a6100,
+    0x000008e6, 0xff5a8100, 0x000008ee, 0xff5aa100,
+    0x000008f6, 0xff5ac200, 0x000008ff, 0xff5ae200,
+    0x00000c00, 0xff620000, 0x00000c08, 0xff622000,
+    0x00000c10, 0xff624000, 0x00000c18, 0xff626100,
+    0x00000c20, 0xff628100, 0x00000c29, 0xff62a100,
+    0x00000c31, 0xff62c200, 0x00000c39, 0xff62e200,
+    0x00000c41, 0xff6a0000, 0x00000c4a, 0xff6a2000,
+    0x00000c52, 0xff6a4000, 0x00000c5a, 0xff6a6100,
+    0x00000c62, 0xff6a8100, 0x00000c6a, 0xff6aa100,
+    0x00000c73, 0xff6ac200, 0x00000c7b, 0xff6ae200,
+    0x00000c83, 0xff730000, 0x00000c8b, 0xff732000,
+    0x00000c94, 0xff734000, 0x00000c9c, 0xff736100,
+    0x00000ca4, 0xff738100, 0x00000cac, 0xff73a100,
+    0x00000cb4, 0xff73c200, 0x00000cbd, 0xff73e200,
+    0x00000cc5, 0xff7b0000, 0x00000ccd, 0xff7b2000,
+    0x00000cd5, 0xff7b4000, 0x00000cde, 0xff7b6100,
+    0x00000ce6, 0xff7b8100, 0x00000cee, 0xff7ba100,
+    0x00000cf6, 0xff7bc200, 0x00000cff, 0xff7be200,
+    0x00001000, 0xff830000, 0x00001008, 0xff832000,
+    0x00001010, 0xff834000, 0x00001018, 0xff836100,
+    0x00001020, 0xff838100, 0x00001029, 0xff83a100,
+    0x00001031, 0xff83c200, 0x00001039, 0xff83e200,
+    0x00001041, 0xff8b0000, 0x0000104a, 0xff8b2000,
+    0x00001052, 0xff8b4000, 0x0000105a, 0xff8b6100,
+    0x00001062, 0xff8b8100, 0x0000106a, 0xff8ba100,
+    0x00001073, 0xff8bc200, 0x0000107b, 0xff8be200,
+    0x00001083, 0xff940000, 0x0000108b, 0xff942000,
+    0x00001094, 0xff944000, 0x0000109c, 0xff946100,
+    0x000010a4, 0xff948100, 0x000010ac, 0xff94a100,
+    0x000010b4, 0xff94c200, 0x000010bd, 0xff94e200,
+    0x000010c5, 0xff9c0000, 0x000010cd, 0xff9c2000,
+    0x000010d5, 0xff9c4000, 0x000010de, 0xff9c6100,
+    0x000010e6, 0xff9c8100, 0x000010ee, 0xff9ca100,
+    0x000010f6, 0xff9cc200, 0x000010ff, 0xff9ce200,
+    0x00001400, 0xffa40000, 0x00001408, 0xffa42000,
+    0x00001410, 0xffa44000, 0x00001418, 0xffa46100,
+    0x00001420, 0xffa48100, 0x00001429, 0xffa4a100,
+    0x00001431, 0xffa4c200, 0x00001439, 0xffa4e200,
+    0x00001441, 0xffac0000, 0x0000144a, 0xffac2000,
+    0x00001452, 0xffac4000, 0x0000145a, 0xffac6100,
+    0x00001462, 0xffac8100, 0x0000146a, 0xffaca100,
+    0x00001473, 0xffacc200, 0x0000147b, 0xfface200,
+    0x00001483, 0xffb40000, 0x0000148b, 0xffb42000,
+    0x00001494, 0xffb44000, 0x0000149c, 0xffb46100,
+    0x000014a4, 0xffb48100, 0x000014ac, 0xffb4a100,
+    0x000014b4, 0xffb4c200, 0x000014bd, 0xffb4e200,
+    0x000014c5, 0xffbd0000, 0x000014cd, 0xffbd2000,
+    0x000014d5, 0xffbd4000, 0x000014de, 0xffbd6100,
+    0x000014e6, 0xffbd8100, 0x000014ee, 0xffbda100,
+    0x000014f6, 0xffbdc200, 0x000014ff, 0xffbde200,
+    0x00001800, 0xffc50000, 0x00001808, 0xffc52000,
+    0x00001810, 0xffc54000, 0x00001818, 0xffc56100,
+    0x00001820, 0xffc58100, 0x00001829, 0xffc5a100,
+    0x00001831, 0xffc5c200, 0x00001839, 0xffc5e200,
+    0x00001841, 0xffcd0000, 0x0000184a, 0xffcd2000,
+    0x00001852, 0xffcd4000, 0x0000185a, 0xffcd6100,
+    0x00001862, 0xffcd8100, 0x0000186a, 0xffcda100,
+    0x00001873, 0xffcdc200, 0x0000187b, 0xffcde200,
+    0x00001883, 0xffd50000, 0x0000188b, 0xffd52000,
+    0x00001894, 0xffd54000, 0x0000189c, 0xffd56100,
+    0x000018a4, 0xffd58100, 0x000018ac, 0xffd5a100,
+    0x000018b4, 0xffd5c200, 0x000018bd, 0xffd5e200,
+    0x000018c5, 0xffde0000, 0x000018cd, 0xffde2000,
+    0x000018d5, 0xffde4000, 0x000018de, 0xffde6100,
+    0x000018e6, 0xffde8100, 0x000018ee, 0xffdea100,
+    0x000018f6, 0xffdec200, 0x000018ff, 0xffdee200,
+    0x00001c00, 0xffe60000, 0x00001c08, 0xffe62000,
+    0x00001c10, 0xffe64000, 0x00001c18, 0xffe66100,
+    0x00001c20, 0xffe68100, 0x00001c29, 0xffe6a100,
+    0x00001c31, 0xffe6c200, 0x00001c39, 0xffe6e200,
+    0x00001c41, 0xffee0000, 0x00001c4a, 0xffee2000,
+    0x00001c52, 0xffee4000, 0x00001c5a, 0xffee6100,
+    0x00001c62, 0xffee8100, 0x00001c6a, 0xffeea100,
+    0x00001c73, 0xffeec200, 0x00001c7b, 0xffeee200,
+    0x00001c83, 0xfff60000, 0x00001c8b, 0xfff62000,
+    0x00001c94, 0xfff64000, 0x00001c9c, 0xfff66100,
+    0x00001ca4, 0xfff68100, 0x00001cac, 0xfff6a100,
+    0x00001cb4, 0xfff6c200, 0x00001cbd, 0xfff6e200,
+    0x00001cc5, 0xffff0000, 0x00001ccd, 0xffff2000,
+    0x00001cd5, 0xffff4000, 0x00001cde, 0xffff6100,
+    0x00001ce6, 0xffff8100, 0x00001cee, 0xffffa100,
+    0x00001cf6, 0xffffc200, 0x00001cff, 0xffffe200
+};
+
+static void
+Blit_RGB565_ARGB8888(SDL_BlitInfo * info)
+{
+    Blit_RGB565_32(info, RGB565_ARGB8888_LUT);
+}
+
+/* Special optimized blit for RGB 5-6-5 --> ABGR 8-8-8-8 */
+static const Uint32 RGB565_ABGR8888_LUT[512] = {
+    0xff000000, 0x00000000, 0xff080000, 0x00002000,
+    0xff100000, 0x00004000, 0xff180000, 0x00006100,
+    0xff200000, 0x00008100, 0xff290000, 0x0000a100,
+    0xff310000, 0x0000c200, 0xff390000, 0x0000e200,
+    0xff410000, 0x00000008, 0xff4a0000, 0x00002008,
+    0xff520000, 0x00004008, 0xff5a0000, 0x00006108,
+    0xff620000, 0x00008108, 0xff6a0000, 0x0000a108,
+    0xff730000, 0x0000c208, 0xff7b0000, 0x0000e208,
+    0xff830000, 0x00000010, 0xff8b0000, 0x00002010,
+    0xff940000, 0x00004010, 0xff9c0000, 0x00006110,
+    0xffa40000, 0x00008110, 0xffac0000, 0x0000a110,
+    0xffb40000, 0x0000c210, 0xffbd0000, 0x0000e210,
+    0xffc50000, 0x00000018, 0xffcd0000, 0x00002018,
+    0xffd50000, 0x00004018, 0xffde0000, 0x00006118,
+    0xffe60000, 0x00008118, 0xffee0000, 0x0000a118,
+    0xfff60000, 0x0000c218, 0xffff0000, 0x0000e218,
+    0xff000400, 0x00000020, 0xff080400, 0x00002020,
+    0xff100400, 0x00004020, 0xff180400, 0x00006120,
+    0xff200400, 0x00008120, 0xff290400, 0x0000a120,
+    0xff310400, 0x0000c220, 0xff390400, 0x0000e220,
+    0xff410400, 0x00000029, 0xff4a0400, 0x00002029,
+    0xff520400, 0x00004029, 0xff5a0400, 0x00006129,
+    0xff620400, 0x00008129, 0xff6a0400, 0x0000a129,
+    0xff730400, 0x0000c229, 0xff7b0400, 0x0000e229,
+    0xff830400, 0x00000031, 0xff8b0400, 0x00002031,
+    0xff940400, 0x00004031, 0xff9c0400, 0x00006131,
+    0xffa40400, 0x00008131, 0xffac0400, 0x0000a131,
+    0xffb40400, 0x0000c231, 0xffbd0400, 0x0000e231,
+    0xffc50400, 0x00000039, 0xffcd0400, 0x00002039,
+    0xffd50400, 0x00004039, 0xffde0400, 0x00006139,
+    0xffe60400, 0x00008139, 0xffee0400, 0x0000a139,
+    0xfff60400, 0x0000c239, 0xffff0400, 0x0000e239,
+    0xff000800, 0x00000041, 0xff080800, 0x00002041,
+    0xff100800, 0x00004041, 0xff180800, 0x00006141,
+    0xff200800, 0x00008141, 0xff290800, 0x0000a141,
+    0xff310800, 0x0000c241, 0xff390800, 0x0000e241,
+    0xff410800, 0x0000004a, 0xff4a0800, 0x0000204a,
+    0xff520800, 0x0000404a, 0xff5a0800, 0x0000614a,
+    0xff620800, 0x0000814a, 0xff6a0800, 0x0000a14a,
+    0xff730800, 0x0000c24a, 0xff7b0800, 0x0000e24a,
+    0xff830800, 0x00000052, 0xff8b0800, 0x00002052,
+    0xff940800, 0x00004052, 0xff9c0800, 0x00006152,
+    0xffa40800, 0x00008152, 0xffac0800, 0x0000a152,
+    0xffb40800, 0x0000c252, 0xffbd0800, 0x0000e252,
+    0xffc50800, 0x0000005a, 0xffcd0800, 0x0000205a,
+    0xffd50800, 0x0000405a, 0xffde0800, 0x0000615a,
+    0xffe60800, 0x0000815a, 0xffee0800, 0x0000a15a,
+    0xfff60800, 0x0000c25a, 0xffff0800, 0x0000e25a,
+    0xff000c00, 0x00000062, 0xff080c00, 0x00002062,
+    0xff100c00, 0x00004062, 0xff180c00, 0x00006162,
+    0xff200c00, 0x00008162, 0xff290c00, 0x0000a162,
+    0xff310c00, 0x0000c262, 0xff390c00, 0x0000e262,
+    0xff410c00, 0x0000006a, 0xff4a0c00, 0x0000206a,
+    0xff520c00, 0x0000406a, 0xff5a0c00, 0x0000616a,
+    0xff620c00, 0x0000816a, 0xff6a0c00, 0x0000a16a,
+    0xff730c00, 0x0000c26a, 0xff7b0c00, 0x0000e26a,
+    0xff830c00, 0x00000073, 0xff8b0c00, 0x00002073,
+    0xff940c00, 0x00004073, 0xff9c0c00, 0x00006173,
+    0xffa40c00, 0x00008173, 0xffac0c00, 0x0000a173,
+    0xffb40c00, 0x0000c273, 0xffbd0c00, 0x0000e273,
+    0xffc50c00, 0x0000007b, 0xffcd0c00, 0x0000207b,
+    0xffd50c00, 0x0000407b, 0xffde0c00, 0x0000617b,
+    0xffe60c00, 0x0000817b, 0xffee0c00, 0x0000a17b,
+    0xfff60c00, 0x0000c27b, 0xffff0c00, 0x0000e27b,
+    0xff001000, 0x00000083, 0xff081000, 0x00002083,
+    0xff101000, 0x00004083, 0xff181000, 0x00006183,
+    0xff201000, 0x00008183, 0xff291000, 0x0000a183,
+    0xff311000, 0x0000c283, 0xff391000, 0x0000e283,
+    0xff411000, 0x0000008b, 0xff4a1000, 0x0000208b,
+    0xff521000, 0x0000408b, 0xff5a1000, 0x0000618b,
+    0xff621000, 0x0000818b, 0xff6a1000, 0x0000a18b,
+    0xff731000, 0x0000c28b, 0xff7b1000, 0x0000e28b,
+    0xff831000, 0x00000094, 0xff8b1000, 0x00002094,
+    0xff941000, 0x00004094, 0xff9c1000, 0x00006194,
+    0xffa41000, 0x00008194, 0xffac1000, 0x0000a194,
+    0xffb41000, 0x0000c294, 0xffbd1000, 0x0000e294,
+    0xffc51000, 0x0000009c, 0xffcd1000, 0x0000209c,
+    0xffd51000, 0x0000409c, 0xffde1000, 0x0000619c,
+    0xffe61000, 0x0000819c, 0xffee1000, 0x0000a19c,
+    0xfff61000, 0x0000c29c, 0xffff1000, 0x0000e29c,
+    0xff001400, 0x000000a4, 0xff081400, 0x000020a4,
+    0xff101400, 0x000040a4, 0xff181400, 0x000061a4,
+    0xff201400, 0x000081a4, 0xff291400, 0x0000a1a4,
+    0xff311400, 0x0000c2a4, 0xff391400, 0x0000e2a4,
+    0xff411400, 0x000000ac, 0xff4a1400, 0x000020ac,
+    0xff521400, 0x000040ac, 0xff5a1400, 0x000061ac,
+    0xff621400, 0x000081ac, 0xff6a1400, 0x0000a1ac,
+    0xff731400, 0x0000c2ac, 0xff7b1400, 0x0000e2ac,
+    0xff831400, 0x000000b4, 0xff8b1400, 0x000020b4,
+    0xff941400, 0x000040b4, 0xff9c1400, 0x000061b4,
+    0xffa41400, 0x000081b4, 0xffac1400, 0x0000a1b4,
+    0xffb41400, 0x0000c2b4, 0xffbd1400, 0x0000e2b4,
+    0xffc51400, 0x000000bd, 0xffcd1400, 0x000020bd,
+    0xffd51400, 0x000040bd, 0xffde1400, 0x000061bd,
+    0xffe61400, 0x000081bd, 0xffee1400, 0x0000a1bd,
+    0xfff61400, 0x0000c2bd, 0xffff1400, 0x0000e2bd,
+    0xff001800, 0x000000c5, 0xff081800, 0x000020c5,
+    0xff101800, 0x000040c5, 0xff181800, 0x000061c5,
+    0xff201800, 0x000081c5, 0xff291800, 0x0000a1c5,
+    0xff311800, 0x0000c2c5, 0xff391800, 0x0000e2c5,
+    0xff411800, 0x000000cd, 0xff4a1800, 0x000020cd,
+    0xff521800, 0x000040cd, 0xff5a1800, 0x000061cd,
+    0xff621800, 0x000081cd, 0xff6a1800, 0x0000a1cd,
+    0xff731800, 0x0000c2cd, 0xff7b1800, 0x0000e2cd,
+    0xff831800, 0x000000d5, 0xff8b1800, 0x000020d5,
+    0xff941800, 0x000040d5, 0xff9c1800, 0x000061d5,
+    0xffa41800, 0x000081d5, 0xffac1800, 0x0000a1d5,
+    0xffb41800, 0x0000c2d5, 0xffbd1800, 0x0000e2d5,
+    0xffc51800, 0x000000de, 0xffcd1800, 0x000020de,
+    0xffd51800, 0x000040de, 0xffde1800, 0x000061de,
+    0xffe61800, 0x000081de, 0xffee1800, 0x0000a1de,
+    0xfff61800, 0x0000c2de, 0xffff1800, 0x0000e2de,
+    0xff001c00, 0x000000e6, 0xff081c00, 0x000020e6,
+    0xff101c00, 0x000040e6, 0xff181c00, 0x000061e6,
+    0xff201c00, 0x000081e6, 0xff291c00, 0x0000a1e6,
+    0xff311c00, 0x0000c2e6, 0xff391c00, 0x0000e2e6,
+    0xff411c00, 0x000000ee, 0xff4a1c00, 0x000020ee,
+    0xff521c00, 0x000040ee, 0xff5a1c00, 0x000061ee,
+    0xff621c00, 0x000081ee, 0xff6a1c00, 0x0000a1ee,
+    0xff731c00, 0x0000c2ee, 0xff7b1c00, 0x0000e2ee,
+    0xff831c00, 0x000000f6, 0xff8b1c00, 0x000020f6,
+    0xff941c00, 0x000040f6, 0xff9c1c00, 0x000061f6,
+    0xffa41c00, 0x000081f6, 0xffac1c00, 0x0000a1f6,
+    0xffb41c00, 0x0000c2f6, 0xffbd1c00, 0x0000e2f6,
+    0xffc51c00, 0x000000ff, 0xffcd1c00, 0x000020ff,
+    0xffd51c00, 0x000040ff, 0xffde1c00, 0x000061ff,
+    0xffe61c00, 0x000081ff, 0xffee1c00, 0x0000a1ff,
+    0xfff61c00, 0x0000c2ff, 0xffff1c00, 0x0000e2ff
+};
+
+static void
+Blit_RGB565_ABGR8888(SDL_BlitInfo * info)
+{
+    Blit_RGB565_32(info, RGB565_ABGR8888_LUT);
+}
+
+/* Special optimized blit for RGB 5-6-5 --> RGBA 8-8-8-8 */
+static const Uint32 RGB565_RGBA8888_LUT[512] = {
+    0x000000ff, 0x00000000, 0x000008ff, 0x00200000,
+    0x000010ff, 0x00400000, 0x000018ff, 0x00610000,
+    0x000020ff, 0x00810000, 0x000029ff, 0x00a10000,
+    0x000031ff, 0x00c20000, 0x000039ff, 0x00e20000,
+    0x000041ff, 0x08000000, 0x00004aff, 0x08200000,
+    0x000052ff, 0x08400000, 0x00005aff, 0x08610000,
+    0x000062ff, 0x08810000, 0x00006aff, 0x08a10000,
+    0x000073ff, 0x08c20000, 0x00007bff, 0x08e20000,
+    0x000083ff, 0x10000000, 0x00008bff, 0x10200000,
+    0x000094ff, 0x10400000, 0x00009cff, 0x10610000,
+    0x0000a4ff, 0x10810000, 0x0000acff, 0x10a10000,
+    0x0000b4ff, 0x10c20000, 0x0000bdff, 0x10e20000,
+    0x0000c5ff, 0x18000000, 0x0000cdff, 0x18200000,
+    0x0000d5ff, 0x18400000, 0x0000deff, 0x18610000,
+    0x0000e6ff, 0x18810000, 0x0000eeff, 0x18a10000,
+    0x0000f6ff, 0x18c20000, 0x0000ffff, 0x18e20000,
+    0x000400ff, 0x20000000, 0x000408ff, 0x20200000,
+    0x000410ff, 0x20400000, 0x000418ff, 0x20610000,
+    0x000420ff, 0x20810000, 0x000429ff, 0x20a10000,
+    0x000431ff, 0x20c20000, 0x000439ff, 0x20e20000,
+    0x000441ff, 0x29000000, 0x00044aff, 0x29200000,
+    0x000452ff, 0x29400000, 0x00045aff, 0x29610000,
+    0x000462ff, 0x29810000, 0x00046aff, 0x29a10000,
+    0x000473ff, 0x29c20000, 0x00047bff, 0x29e20000,
+    0x000483ff, 0x31000000, 0x00048bff, 0x31200000,
+    0x000494ff, 0x31400000, 0x00049cff, 0x31610000,
+    0x0004a4ff, 0x31810000, 0x0004acff, 0x31a10000,
+    0x0004b4ff, 0x31c20000, 0x0004bdff, 0x31e20000,
+    0x0004c5ff, 0x39000000, 0x0004cdff, 0x39200000,
+    0x0004d5ff, 0x39400000, 0x0004deff, 0x39610000,
+    0x0004e6ff, 0x39810000, 0x0004eeff, 0x39a10000,
+    0x0004f6ff, 0x39c20000, 0x0004ffff, 0x39e20000,
+    0x000800ff, 0x41000000, 0x000808ff, 0x41200000,
+    0x000810ff, 0x41400000, 0x000818ff, 0x41610000,
+    0x000820ff, 0x41810000, 0x000829ff, 0x41a10000,
+    0x000831ff, 0x41c20000, 0x000839ff, 0x41e20000,
+    0x000841ff, 0x4a000000, 0x00084aff, 0x4a200000,
+    0x000852ff, 0x4a400000, 0x00085aff, 0x4a610000,
+    0x000862ff, 0x4a810000, 0x00086aff, 0x4aa10000,
+    0x000873ff, 0x4ac20000, 0x00087bff, 0x4ae20000,
+    0x000883ff, 0x52000000, 0x00088bff, 0x52200000,
+    0x000894ff, 0x52400000, 0x00089cff, 0x52610000,
+    0x0008a4ff, 0x52810000, 0x0008acff, 0x52a10000,
+    0x0008b4ff, 0x52c20000, 0x0008bdff, 0x52e20000,
+    0x0008c5ff, 0x5a000000, 0x0008cdff, 0x5a200000,
+    0x0008d5ff, 0x5a400000, 0x0008deff, 0x5a610000,
+    0x0008e6ff, 0x5a810000, 0x0008eeff, 0x5aa10000,
+    0x0008f6ff, 0x5ac20000, 0x0008ffff, 0x5ae20000,
+    0x000c00ff, 0x62000000, 0x000c08ff, 0x62200000,
+    0x000c10ff, 0x62400000, 0x000c18ff, 0x62610000,
+    0x000c20ff, 0x62810000, 0x000c29ff, 0x62a10000,
+    0x000c31ff, 0x62c20000, 0x000c39ff, 0x62e20000,
+    0x000c41ff, 0x6a000000, 0x000c4aff, 0x6a200000,
+    0x000c52ff, 0x6a400000, 0x000c5aff, 0x6a610000,
+    0x000c62ff, 0x6a810000, 0x000c6aff, 0x6aa10000,
+    0x000c73ff, 0x6ac20000, 0x000c7bff, 0x6ae20000,
+    0x000c83ff, 0x73000000, 0x000c8bff, 0x73200000,
+    0x000c94ff, 0x73400000, 0x000c9cff, 0x73610000,
+    0x000ca4ff, 0x73810000, 0x000cacff, 0x73a10000,
+    0x000cb4ff, 0x73c20000, 0x000cbdff, 0x73e20000,
+    0x000cc5ff, 0x7b000000, 0x000ccdff, 0x7b200000,
+    0x000cd5ff, 0x7b400000, 0x000cdeff, 0x7b610000,
+    0x000ce6ff, 0x7b810000, 0x000ceeff, 0x7ba10000,
+    0x000cf6ff, 0x7bc20000, 0x000cffff, 0x7be20000,
+    0x001000ff, 0x83000000, 0x001008ff, 0x83200000,
+    0x001010ff, 0x83400000, 0x001018ff, 0x83610000,
+    0x001020ff, 0x83810000, 0x001029ff, 0x83a10000,
+    0x001031ff, 0x83c20000, 0x001039ff, 0x83e20000,
+    0x001041ff, 0x8b000000, 0x00104aff, 0x8b200000,
+    0x001052ff, 0x8b400000, 0x00105aff, 0x8b610000,
+    0x001062ff, 0x8b810000, 0x00106aff, 0x8ba10000,
+    0x001073ff, 0x8bc20000, 0x00107bff, 0x8be20000,
+    0x001083ff, 0x94000000, 0x00108bff, 0x94200000,
+    0x001094ff, 0x94400000, 0x00109cff, 0x94610000,
+    0x0010a4ff, 0x94810000, 0x0010acff, 0x94a10000,
+    0x0010b4ff, 0x94c20000, 0x0010bdff, 0x94e20000,
+    0x0010c5ff, 0x9c000000, 0x0010cdff, 0x9c200000,
+    0x0010d5ff, 0x9c400000, 0x0010deff, 0x9c610000,
+    0x0010e6ff, 0x9c810000, 0x0010eeff, 0x9ca10000,
+    0x0010f6ff, 0x9cc20000, 0x0010ffff, 0x9ce20000,
+    0x001400ff, 0xa4000000, 0x001408ff, 0xa4200000,
+    0x001410ff, 0xa4400000, 0x001418ff, 0xa4610000,
+    0x001420ff, 0xa4810000, 0x001429ff, 0xa4a10000,
+    0x001431ff, 0xa4c20000, 0x001439ff, 0xa4e20000,
+    0x001441ff, 0xac000000, 0x00144aff, 0xac200000,
+    0x001452ff, 0xac400000, 0x00145aff, 0xac610000,
+    0x001462ff, 0xac810000, 0x00146aff, 0xaca10000,
+    0x001473ff, 0xacc20000, 0x00147bff, 0xace20000,
+    0x001483ff, 0xb4000000, 0x00148bff, 0xb4200000,
+    0x001494ff, 0xb4400000, 0x00149cff, 0xb4610000,
+    0x0014a4ff, 0xb4810000, 0x0014acff, 0xb4a10000,
+    0x0014b4ff, 0xb4c20000, 0x0014bdff, 0xb4e20000,
+    0x0014c5ff, 0xbd000000, 0x0014cdff, 0xbd200000,
+    0x0014d5ff, 0xbd400000, 0x0014deff, 0xbd610000,
+    0x0014e6ff, 0xbd810000, 0x0014eeff, 0xbda10000,
+    0x0014f6ff, 0xbdc20000, 0x0014ffff, 0xbde20000,
+    0x001800ff, 0xc5000000, 0x001808ff, 0xc5200000,
+    0x001810ff, 0xc5400000, 0x001818ff, 0xc5610000,
+    0x001820ff, 0xc5810000, 0x001829ff, 0xc5a10000,
+    0x001831ff, 0xc5c20000, 0x001839ff, 0xc5e20000,
+    0x001841ff, 0xcd000000, 0x00184aff, 0xcd200000,
+    0x001852ff, 0xcd400000, 0x00185aff, 0xcd610000,
+    0x001862ff, 0xcd810000, 0x00186aff, 0xcda10000,
+    0x001873ff, 0xcdc20000, 0x00187bff, 0xcde20000,
+    0x001883ff, 0xd5000000, 0x00188bff, 0xd5200000,
+    0x001894ff, 0xd5400000, 0x00189cff, 0xd5610000,
+    0x0018a4ff, 0xd5810000, 0x0018acff, 0xd5a10000,
+    0x0018b4ff, 0xd5c20000, 0x0018bdff, 0xd5e20000,
+    0x0018c5ff, 0xde000000, 0x0018cdff, 0xde200000,
+    0x0018d5ff, 0xde400000, 0x0018deff, 0xde610000,
+    0x0018e6ff, 0xde810000, 0x0018eeff, 0xdea10000,
+    0x0018f6ff, 0xdec20000, 0x0018ffff, 0xdee20000,
+    0x001c00ff, 0xe6000000, 0x001c08ff, 0xe6200000,
+    0x001c10ff, 0xe6400000, 0x001c18ff, 0xe6610000,
+    0x001c20ff, 0xe6810000, 0x001c29ff, 0xe6a10000,
+    0x001c31ff, 0xe6c20000, 0x001c39ff, 0xe6e20000,
+    0x001c41ff, 0xee000000, 0x001c4aff, 0xee200000,
+    0x001c52ff, 0xee400000, 0x001c5aff, 0xee610000,
+    0x001c62ff, 0xee810000, 0x001c6aff, 0xeea10000,
+    0x001c73ff, 0xeec20000, 0x001c7bff, 0xeee20000,
+    0x001c83ff, 0xf6000000, 0x001c8bff, 0xf6200000,
+    0x001c94ff, 0xf6400000, 0x001c9cff, 0xf6610000,
+    0x001ca4ff, 0xf6810000, 0x001cacff, 0xf6a10000,
+    0x001cb4ff, 0xf6c20000, 0x001cbdff, 0xf6e20000,
+    0x001cc5ff, 0xff000000, 0x001ccdff, 0xff200000,
+    0x001cd5ff, 0xff400000, 0x001cdeff, 0xff610000,
+    0x001ce6ff, 0xff810000, 0x001ceeff, 0xffa10000,
+    0x001cf6ff, 0xffc20000, 0x001cffff, 0xffe20000,
+};
+
+static void
+Blit_RGB565_RGBA8888(SDL_BlitInfo * info)
+{
+    Blit_RGB565_32(info, RGB565_RGBA8888_LUT);
+}
+
+/* Special optimized blit for RGB 5-6-5 --> BGRA 8-8-8-8 */
+static const Uint32 RGB565_BGRA8888_LUT[512] = {
+    0x00000000, 0x000000ff, 0x08000000, 0x002000ff,
+    0x10000000, 0x004000ff, 0x18000000, 0x006100ff,
+    0x20000000, 0x008100ff, 0x29000000, 0x00a100ff,
+    0x31000000, 0x00c200ff, 0x39000000, 0x00e200ff,
+    0x41000000, 0x000008ff, 0x4a000000, 0x002008ff,
+    0x52000000, 0x004008ff, 0x5a000000, 0x006108ff,
+    0x62000000, 0x008108ff, 0x6a000000, 0x00a108ff,
+    0x73000000, 0x00c208ff, 0x7b000000, 0x00e208ff,
+    0x83000000, 0x000010ff, 0x8b000000, 0x002010ff,
+    0x94000000, 0x004010ff, 0x9c000000, 0x006110ff,
+    0xa4000000, 0x008110ff, 0xac000000, 0x00a110ff,
+    0xb4000000, 0x00c210ff, 0xbd000000, 0x00e210ff,
+    0xc5000000, 0x000018ff, 0xcd000000, 0x002018ff,
+    0xd5000000, 0x004018ff, 0xde000000, 0x006118ff,
+    0xe6000000, 0x008118ff, 0xee000000, 0x00a118ff,
+    0xf6000000, 0x00c218ff, 0xff000000, 0x00e218ff,
+    0x00040000, 0x000020ff, 0x08040000, 0x002020ff,
+    0x10040000, 0x004020ff, 0x18040000, 0x006120ff,
+    0x20040000, 0x008120ff, 0x29040000, 0x00a120ff,
+    0x31040000, 0x00c220ff, 0x39040000, 0x00e220ff,
+    0x41040000, 0x000029ff, 0x4a040000, 0x002029ff,
+    0x52040000, 0x004029ff, 0x5a040000, 0x006129ff,
+    0x62040000, 0x008129ff, 0x6a040000, 0x00a129ff,
+    0x73040000, 0x00c229ff, 0x7b040000, 0x00e229ff,
+    0x83040000, 0x000031ff, 0x8b040000, 0x002031ff,
+    0x94040000, 0x004031ff, 0x9c040000, 0x006131ff,
+    0xa4040000, 0x008131ff, 0xac040000, 0x00a131ff,
+    0xb4040000, 0x00c231ff, 0xbd040000, 0x00e231ff,
+    0xc5040000, 0x000039ff, 0xcd040000, 0x002039ff,
+    0xd5040000, 0x004039ff, 0xde040000, 0x006139ff,
+    0xe6040000, 0x008139ff, 0xee040000, 0x00a139ff,
+    0xf6040000, 0x00c239ff, 0xff040000, 0x00e239ff,
+    0x00080000, 0x000041ff, 0x08080000, 0x002041ff,
+    0x10080000, 0x004041ff, 0x18080000, 0x006141ff,
+    0x20080000, 0x008141ff, 0x29080000, 0x00a141ff,
+    0x31080000, 0x00c241ff, 0x39080000, 0x00e241ff,
+    0x41080000, 0x00004aff, 0x4a080000, 0x00204aff,
+    0x52080000, 0x00404aff, 0x5a080000, 0x00614aff,
+    0x62080000, 0x00814aff, 0x6a080000, 0x00a14aff,
+    0x73080000, 0x00c24aff, 0x7b080000, 0x00e24aff,
+    0x83080000, 0x000052ff, 0x8b080000, 0x002052ff,
+    0x94080000, 0x004052ff, 0x9c080000, 0x006152ff,
+    0xa4080000, 0x008152ff, 0xac080000, 0x00a152ff,
+    0xb4080000, 0x00c252ff, 0xbd080000, 0x00e252ff,
+    0xc5080000, 0x00005aff, 0xcd080000, 0x00205aff,
+    0xd5080000, 0x00405aff, 0xde080000, 0x00615aff,
+    0xe6080000, 0x00815aff, 0xee080000, 0x00a15aff,
+    0xf6080000, 0x00c25aff, 0xff080000, 0x00e25aff,
+    0x000c0000, 0x000062ff, 0x080c0000, 0x002062ff,
+    0x100c0000, 0x004062ff, 0x180c0000, 0x006162ff,
+    0x200c0000, 0x008162ff, 0x290c0000, 0x00a162ff,
+    0x310c0000, 0x00c262ff, 0x390c0000, 0x00e262ff,
+    0x410c0000, 0x00006aff, 0x4a0c0000, 0x00206aff,
+    0x520c0000, 0x00406aff, 0x5a0c0000, 0x00616aff,
+    0x620c0000, 0x00816aff, 0x6a0c0000, 0x00a16aff,
+    0x730c0000, 0x00c26aff, 0x7b0c0000, 0x00e26aff,
+    0x830c0000, 0x000073ff, 0x8b0c0000, 0x002073ff,
+    0x940c0000, 0x004073ff, 0x9c0c0000, 0x006173ff,
+    0xa40c0000, 0x008173ff, 0xac0c0000, 0x00a173ff,
+    0xb40c0000, 0x00c273ff, 0xbd0c0000, 0x00e273ff,
+    0xc50c0000, 0x00007bff, 0xcd0c0000, 0x00207bff,
+    0xd50c0000, 0x00407bff, 0xde0c0000, 0x00617bff,
+    0xe60c0000, 0x00817bff, 0xee0c0000, 0x00a17bff,
+    0xf60c0000, 0x00c27bff, 0xff0c0000, 0x00e27bff,
+    0x00100000, 0x000083ff, 0x08100000, 0x002083ff,
+    0x10100000, 0x004083ff, 0x18100000, 0x006183ff,
+    0x20100000, 0x008183ff, 0x29100000, 0x00a183ff,
+    0x31100000, 0x00c283ff, 0x39100000, 0x00e283ff,
+    0x41100000, 0x00008bff, 0x4a100000, 0x00208bff,
+    0x52100000, 0x00408bff, 0x5a100000, 0x00618bff,
+    0x62100000, 0x00818bff, 0x6a100000, 0x00a18bff,
+    0x73100000, 0x00c28bff, 0x7b100000, 0x00e28bff,
+    0x83100000, 0x000094ff, 0x8b100000, 0x002094ff,
+    0x94100000, 0x004094ff, 0x9c100000, 0x006194ff,
+    0xa4100000, 0x008194ff, 0xac100000, 0x00a194ff,
+    0xb4100000, 0x00c294ff, 0xbd100000, 0x00e294ff,
+    0xc5100000, 0x00009cff, 0xcd100000, 0x00209cff,
+    0xd5100000, 0x00409cff, 0xde100000, 0x00619cff,
+    0xe6100000, 0x00819cff, 0xee100000, 0x00a19cff,
+    0xf6100000, 0x00c29cff, 0xff100000, 0x00e29cff,
+    0x00140000, 0x0000a4ff, 0x08140000, 0x0020a4ff,
+    0x10140000, 0x0040a4ff, 0x18140000, 0x0061a4ff,
+    0x20140000, 0x0081a4ff, 0x29140000, 0x00a1a4ff,
+    0x31140000, 0x00c2a4ff, 0x39140000, 0x00e2a4ff,
+    0x41140000, 0x0000acff, 0x4a140000, 0x0020acff,
+    0x52140000, 0x0040acff, 0x5a140000, 0x0061acff,
+    0x62140000, 0x0081acff, 0x6a140000, 0x00a1acff,
+    0x73140000, 0x00c2acff, 0x7b140000, 0x00e2acff,
+    0x83140000, 0x0000b4ff, 0x8b140000, 0x0020b4ff,
+    0x94140000, 0x0040b4ff, 0x9c140000, 0x0061b4ff,
+    0xa4140000, 0x0081b4ff, 0xac140000, 0x00a1b4ff,
+    0xb4140000, 0x00c2b4ff, 0xbd140000, 0x00e2b4ff,
+    0xc5140000, 0x0000bdff, 0xcd140000, 0x0020bdff,
+    0xd5140000, 0x0040bdff, 0xde140000, 0x0061bdff,
+    0xe6140000, 0x0081bdff, 0xee140000, 0x00a1bdff,
+    0xf6140000, 0x00c2bdff, 0xff140000, 0x00e2bdff,
+    0x00180000, 0x0000c5ff, 0x08180000, 0x0020c5ff,
+    0x10180000, 0x0040c5ff, 0x18180000, 0x0061c5ff,
+    0x20180000, 0x0081c5ff, 0x29180000, 0x00a1c5ff,
+    0x31180000, 0x00c2c5ff, 0x39180000, 0x00e2c5ff,
+    0x41180000, 0x0000cdff, 0x4a180000, 0x0020cdff,
+    0x52180000, 0x0040cdff, 0x5a180000, 0x0061cdff,
+    0x62180000, 0x0081cdff, 0x6a180000, 0x00a1cdff,
+    0x73180000, 0x00c2cdff, 0x7b180000, 0x00e2cdff,
+    0x83180000, 0x0000d5ff, 0x8b180000, 0x0020d5ff,
+    0x94180000, 0x0040d5ff, 0x9c180000, 0x0061d5ff,
+    0xa4180000, 0x0081d5ff, 0xac180000, 0x00a1d5ff,
+    0xb4180000, 0x00c2d5ff, 0xbd180000, 0x00e2d5ff,
+    0xc5180000, 0x0000deff, 0xcd180000, 0x0020deff,
+    0xd5180000, 0x0040deff, 0xde180000, 0x0061deff,
+    0xe6180000, 0x0081deff, 0xee180000, 0x00a1deff,
+    0xf6180000, 0x00c2deff, 0xff180000, 0x00e2deff,
+    0x001c0000, 0x0000e6ff, 0x081c0000, 0x0020e6ff,
+    0x101c0000, 0x0040e6ff, 0x181c0000, 0x0061e6ff,
+    0x201c0000, 0x0081e6ff, 0x291c0000, 0x00a1e6ff,
+    0x311c0000, 0x00c2e6ff, 0x391c0000, 0x00e2e6ff,
+    0x411c0000, 0x0000eeff, 0x4a1c0000, 0x0020eeff,
+    0x521c0000, 0x0040eeff, 0x5a1c0000, 0x0061eeff,
+    0x621c0000, 0x0081eeff, 0x6a1c0000, 0x00a1eeff,
+    0x731c0000, 0x00c2eeff, 0x7b1c0000, 0x00e2eeff,
+    0x831c0000, 0x0000f6ff, 0x8b1c0000, 0x0020f6ff,
+    0x941c0000, 0x0040f6ff, 0x9c1c0000, 0x0061f6ff,
+    0xa41c0000, 0x0081f6ff, 0xac1c0000, 0x00a1f6ff,
+    0xb41c0000, 0x00c2f6ff, 0xbd1c0000, 0x00e2f6ff,
+    0xc51c0000, 0x0000ffff, 0xcd1c0000, 0x0020ffff,
+    0xd51c0000, 0x0040ffff, 0xde1c0000, 0x0061ffff,
+    0xe61c0000, 0x0081ffff, 0xee1c0000, 0x00a1ffff,
+    0xf61c0000, 0x00c2ffff, 0xff1c0000, 0x00e2ffff
+};
+
+static void
+Blit_RGB565_BGRA8888(SDL_BlitInfo * info)
+{
+    Blit_RGB565_32(info, RGB565_BGRA8888_LUT);
+}
+
+static void
+BlitNto1(SDL_BlitInfo * info)
+{
+#ifndef USE_DUFFS_LOOP
+    int c;
+#endif
+    int width, height;
+    Uint8 *src;
+    const Uint8 *map;
+    Uint8 *dst;
+    int srcskip, dstskip;
+    int srcbpp;
+    Uint32 Pixel;
+    int sR, sG, sB;
+    SDL_PixelFormat *srcfmt;
+
+    /* Set up some basic variables */
+    width = info->dst_w;
+    height = info->dst_h;
+    src = info->src;
+    srcskip = info->src_skip;
+    dst = info->dst;
+    dstskip = info->dst_skip;
+    map = info->table;
+    srcfmt = info->src_fmt;
+    srcbpp = srcfmt->BytesPerPixel;
+
+    if (map == NULL) {
+        while (height--) {
+#ifdef USE_DUFFS_LOOP
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+                DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel,
+                                sR, sG, sB);
+                if ( 1 ) {
+                    /* Pack RGB into 8bit pixel */
+                    *dst = ((sR>>5)<<(3+2))|
+                            ((sG>>5)<<(2)) |
+                            ((sB>>6)<<(0)) ;
+                }
+                dst++;
+                src += srcbpp;
+            , width);
+            /* *INDENT-ON* */
+#else
+            for (c = width; c; --c) {
+                DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel, sR, sG, sB);
+                if (1) {
+                    /* Pack RGB into 8bit pixel */
+                    *dst = ((sR >> 5) << (3 + 2)) |
+                        ((sG >> 5) << (2)) | ((sB >> 6) << (0));
+                }
+                dst++;
+                src += srcbpp;
+            }
+#endif
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        while (height--) {
+#ifdef USE_DUFFS_LOOP
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+                DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel,
+                                sR, sG, sB);
+                if ( 1 ) {
+                    /* Pack RGB into 8bit pixel */
+                    *dst = map[((sR>>5)<<(3+2))|
+                           ((sG>>5)<<(2))  |
+                           ((sB>>6)<<(0))  ];
+                }
+                dst++;
+                src += srcbpp;
+            , width);
+            /* *INDENT-ON* */
+#else
+            for (c = width; c; --c) {
+                DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel, sR, sG, sB);
+                if (1) {
+                    /* Pack RGB into 8bit pixel */
+                    *dst = map[((sR >> 5) << (3 + 2)) |
+                               ((sG >> 5) << (2)) | ((sB >> 6) << (0))];
+                }
+                dst++;
+                src += srcbpp;
+            }
+#endif /* USE_DUFFS_LOOP */
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+}
+
+/* blits 32 bit RGB<->RGBA with both surfaces having the same R,G,B fields */
+static void
+Blit4to4MaskAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint32 *src = (Uint32 *) info->src;
+    int srcskip = info->src_skip;
+    Uint32 *dst = (Uint32 *) info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+
+    if (dstfmt->Amask) {
+        /* RGB->RGBA, SET_ALPHA */
+        Uint32 mask = (info->a >> dstfmt->Aloss) << dstfmt->Ashift;
+
+        while (height--) {
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+            {
+                *dst = *src | mask;
+                ++dst;
+                ++src;
+            },
+            width);
+            /* *INDENT-ON* */
+            src = (Uint32 *) ((Uint8 *) src + srcskip);
+            dst = (Uint32 *) ((Uint8 *) dst + dstskip);
+        }
+    } else {
+        /* RGBA->RGB, NO_ALPHA */
+        Uint32 mask = srcfmt->Rmask | srcfmt->Gmask | srcfmt->Bmask;
+
+        while (height--) {
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+            {
+                *dst = *src & mask;
+                ++dst;
+                ++src;
+            },
+            width);
+            /* *INDENT-ON* */
+            src = (Uint32 *) ((Uint8 *) src + srcskip);
+            dst = (Uint32 *) ((Uint8 *) dst + dstskip);
+        }
+    }
+}
+
+static void
+BlitNtoN(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    int srcbpp = srcfmt->BytesPerPixel;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int dstbpp = dstfmt->BytesPerPixel;
+    unsigned alpha = dstfmt->Amask ? info->a : 0;
+
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP(
+        {
+            Uint32 Pixel;
+            unsigned sR;
+            unsigned sG;
+            unsigned sB;
+            DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel, sR, sG, sB);
+            ASSEMBLE_RGBA(dst, dstbpp, dstfmt, sR, sG, sB, alpha);
+            dst += dstbpp;
+            src += srcbpp;
+        },
+        width);
+        /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+BlitNtoNCopyAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    int srcbpp = srcfmt->BytesPerPixel;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int dstbpp = dstfmt->BytesPerPixel;
+    int c;
+
+    while (height--) {
+        for (c = width; c; --c) {
+            Uint32 Pixel;
+            unsigned sR, sG, sB, sA;
+            DISEMBLE_RGBA(src, srcbpp, srcfmt, Pixel, sR, sG, sB, sA);
+            ASSEMBLE_RGBA(dst, dstbpp, dstfmt, sR, sG, sB, sA);
+            dst += dstbpp;
+            src += srcbpp;
+        }
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+BlitNto1Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    const Uint8 *palmap = info->table;
+    Uint32 ckey = info->colorkey;
+    Uint32 rgbmask = ~srcfmt->Amask;
+    int srcbpp;
+    Uint32 Pixel;
+    unsigned sR, sG, sB;
+
+    /* Set up some basic variables */
+    srcbpp = srcfmt->BytesPerPixel;
+    ckey &= rgbmask;
+
+    if (palmap == NULL) {
+        while (height--) {
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+            {
+                DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel,
+                                sR, sG, sB);
+                if ( (Pixel & rgbmask) != ckey ) {
+                    /* Pack RGB into 8bit pixel */
+                    *dst = (Uint8)(((sR>>5)<<(3+2))|
+                                   ((sG>>5)<<(2)) |
+                                   ((sB>>6)<<(0)));
+                }
+                dst++;
+                src += srcbpp;
+            },
+            width);
+            /* *INDENT-ON* */
+            src += srcskip;
+            dst += dstskip;
+        }
+    } else {
+        while (height--) {
+            /* *INDENT-OFF* */
+            DUFFS_LOOP(
+            {
+                DISEMBLE_RGB(src, srcbpp, srcfmt, Pixel,
+                                sR, sG, sB);
+                if ( (Pixel & rgbmask) != ckey ) {
+                    /* Pack RGB into 8bit pixel */
+                    *dst = (Uint8)palmap[((sR>>5)<<(3+2))|
+                                         ((sG>>5)<<(2))  |
+                                         ((sB>>6)<<(0))  ];
+                }
+                dst++;
+                src += srcbpp;
+            },
+            width);
+            /* *INDENT-ON* */
+            src += srcskip;
+            dst += dstskip;
+        }
+    }
+}
+
+static void
+Blit2to2Key(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint16 *srcp = (Uint16 *) info->src;
+    int srcskip = info->src_skip;
+    Uint16 *dstp = (Uint16 *) info->dst;
+    int dstskip = info->dst_skip;
+    Uint32 ckey = info->colorkey;
+    Uint32 rgbmask = ~info->src_fmt->Amask;
+
+    /* Set up some basic variables */
+    srcskip /= 2;
+    dstskip /= 2;
+    ckey &= rgbmask;
+
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP(
+        {
+            if ( (*srcp & rgbmask) != ckey ) {
+                *dstp = *srcp;
+            }
+            dstp++;
+            srcp++;
+        },
+        width);
+        /* *INDENT-ON* */
+        srcp += srcskip;
+        dstp += dstskip;
+    }
+}
+
+static void
+BlitNtoNKey(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    Uint32 ckey = info->colorkey;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int srcbpp = srcfmt->BytesPerPixel;
+    int dstbpp = dstfmt->BytesPerPixel;
+    unsigned alpha = dstfmt->Amask ? info->a : 0;
+    Uint32 rgbmask = ~srcfmt->Amask;
+
+    /* Set up some basic variables */
+    ckey &= rgbmask;
+
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP(
+        {
+            Uint32 Pixel;
+            unsigned sR;
+            unsigned sG;
+            unsigned sB;
+            RETRIEVE_RGB_PIXEL(src, srcbpp, Pixel);
+            if ( (Pixel & rgbmask) != ckey ) {
+                RGB_FROM_PIXEL(Pixel, srcfmt, sR, sG, sB);
+                ASSEMBLE_RGBA(dst, dstbpp, dstfmt, sR, sG, sB, alpha);
+            }
+            dst += dstbpp;
+            src += srcbpp;
+        },
+        width);
+        /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+static void
+BlitNtoNKeyCopyAlpha(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    Uint32 ckey = info->colorkey;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    Uint32 rgbmask = ~srcfmt->Amask;
+
+    Uint8 srcbpp;
+    Uint8 dstbpp;
+    Uint32 Pixel;
+    unsigned sR, sG, sB, sA;
+
+    /* Set up some basic variables */
+    srcbpp = srcfmt->BytesPerPixel;
+    dstbpp = dstfmt->BytesPerPixel;
+    ckey &= rgbmask;
+
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP(
+        {
+            DISEMBLE_RGBA(src, srcbpp, srcfmt, Pixel, sR, sG, sB, sA);
+            if ( (Pixel & rgbmask) != ckey ) {
+                  ASSEMBLE_RGBA(dst, dstbpp, dstfmt, sR, sG, sB, sA);
+            }
+            dst += dstbpp;
+            src += srcbpp;
+        },
+        width);
+        /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+/* Special optimized blit for ARGB 2-10-10-10 --> RGBA */
+static void
+Blit2101010toN(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *dstfmt = info->dst_fmt;
+    int dstbpp = dstfmt->BytesPerPixel;
+    Uint32 Pixel;
+    unsigned sR, sG, sB, sA;
+
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP(
+        {
+            Pixel = *(Uint32 *)src;
+            RGBA_FROM_ARGB2101010(Pixel, sR, sG, sB, sA);
+            ASSEMBLE_RGBA(dst, dstbpp, dstfmt, sR, sG, sB, sA);
+            dst += dstbpp;
+            src += 4;
+        },
+        width);
+        /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+/* Special optimized blit for RGBA --> ARGB 2-10-10-10 */
+static void
+BlitNto2101010(SDL_BlitInfo * info)
+{
+    int width = info->dst_w;
+    int height = info->dst_h;
+    Uint8 *src = info->src;
+    int srcskip = info->src_skip;
+    Uint8 *dst = info->dst;
+    int dstskip = info->dst_skip;
+    SDL_PixelFormat *srcfmt = info->src_fmt;
+    int srcbpp = srcfmt->BytesPerPixel;
+    Uint32 Pixel;
+    unsigned sR, sG, sB, sA;
+
+    while (height--) {
+        /* *INDENT-OFF* */
+        DUFFS_LOOP(
+        {
+            DISEMBLE_RGBA(src, srcbpp, srcfmt, Pixel, sR, sG, sB, sA);
+            ARGB2101010_FROM_RGBA(Pixel, sR, sG, sB, sA);
+            *(Uint32 *)dst = Pixel;
+            dst += 4;
+            src += srcbpp;
+        },
+        width);
+        /* *INDENT-ON* */
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+/* Normal N to N optimized blitters */
+struct blit_table
+{
+    Uint32 srcR, srcG, srcB;
+    int dstbpp;
+    Uint32 dstR, dstG, dstB;
+    Uint32 blit_features;
+    SDL_BlitFunc blitfunc;
+    enum
+    { NO_ALPHA = 1, SET_ALPHA = 2, COPY_ALPHA = 4 } alpha;
+};
+static const struct blit_table normal_blit_1[] = {
+    /* Default for 8-bit RGB source, never optimized */
+    {0, 0, 0, 0, 0, 0, 0, 0, BlitNtoN, 0}
+};
+
+static const struct blit_table normal_blit_2[] = {
+#if SDL_ALTIVEC_BLITTERS
+    /* has-altivec */
+    {0x0000F800, 0x000007E0, 0x0000001F, 4, 0x00000000, 0x00000000, 0x00000000,
+     2, Blit_RGB565_32Altivec, NO_ALPHA | COPY_ALPHA | SET_ALPHA},
+    {0x00007C00, 0x000003E0, 0x0000001F, 4, 0x00000000, 0x00000000, 0x00000000,
+     2, Blit_RGB555_32Altivec, NO_ALPHA | COPY_ALPHA | SET_ALPHA},
+#endif
+    {0x0000F800, 0x000007E0, 0x0000001F, 4, 0x00FF0000, 0x0000FF00, 0x000000FF,
+     0, Blit_RGB565_ARGB8888, NO_ALPHA | COPY_ALPHA | SET_ALPHA},
+    {0x0000F800, 0x000007E0, 0x0000001F, 4, 0x000000FF, 0x0000FF00, 0x00FF0000,
+     0, Blit_RGB565_ABGR8888, NO_ALPHA | COPY_ALPHA | SET_ALPHA},
+    {0x0000F800, 0x000007E0, 0x0000001F, 4, 0xFF000000, 0x00FF0000, 0x0000FF00,
+     0, Blit_RGB565_RGBA8888, NO_ALPHA | COPY_ALPHA | SET_ALPHA},
+    {0x0000F800, 0x000007E0, 0x0000001F, 4, 0x0000FF00, 0x00FF0000, 0xFF000000,
+     0, Blit_RGB565_BGRA8888, NO_ALPHA | COPY_ALPHA | SET_ALPHA},
+
+    /* Default for 16-bit RGB source, used if no other blitter matches */
+    {0, 0, 0, 0, 0, 0, 0, 0, BlitNtoN, 0}
+};
+
+static const struct blit_table normal_blit_3[] = {
+    /* Default for 24-bit RGB source, never optimized */
+    {0, 0, 0, 0, 0, 0, 0, 0, BlitNtoN, 0}
+};
+
+static const struct blit_table normal_blit_4[] = {
+#if SDL_ALTIVEC_BLITTERS
+    /* has-altivec | dont-use-prefetch */
+    {0x00000000, 0x00000000, 0x00000000, 4, 0x00000000, 0x00000000, 0x00000000,
+     6, ConvertAltivec32to32_noprefetch, NO_ALPHA | COPY_ALPHA | SET_ALPHA},
+    /* has-altivec */
+    {0x00000000, 0x00000000, 0x00000000, 4, 0x00000000, 0x00000000, 0x00000000,
+     2, ConvertAltivec32to32_prefetch, NO_ALPHA | COPY_ALPHA | SET_ALPHA},
+    /* has-altivec */
+    {0x00000000, 0x00000000, 0x00000000, 2, 0x0000F800, 0x000007E0, 0x0000001F,
+     2, Blit_RGB888_RGB565Altivec, NO_ALPHA},
+#endif
+    {0x00FF0000, 0x0000FF00, 0x000000FF, 2, 0x0000F800, 0x000007E0, 0x0000001F,
+     0, Blit_RGB888_RGB565, NO_ALPHA},
+    {0x00FF0000, 0x0000FF00, 0x000000FF, 2, 0x00007C00, 0x000003E0, 0x0000001F,
+     0, Blit_RGB888_RGB555, NO_ALPHA},
+    /* Default for 32-bit RGB source, used if no other blitter matches */
+    {0, 0, 0, 0, 0, 0, 0, 0, BlitNtoN, 0}
+};
+
+static const struct blit_table *const normal_blit[] = {
+    normal_blit_1, normal_blit_2, normal_blit_3, normal_blit_4
+};
+
+/* Mask matches table, or table entry is zero */
+#define MASKOK(x, y) (((x) == (y)) || ((y) == 0x00000000))
+
+SDL_BlitFunc
+SDL_CalculateBlitN(SDL_Surface * surface)
+{
+    SDL_PixelFormat *srcfmt;
+    SDL_PixelFormat *dstfmt;
+    const struct blit_table *table;
+    int which;
+    SDL_BlitFunc blitfun;
+
+    /* Set up data for choosing the blit */
+    srcfmt = surface->format;
+    dstfmt = surface->map->dst->format;
+
+    /* We don't support destinations less than 8-bits */
+    if (dstfmt->BitsPerPixel < 8) {
+        return (NULL);
+    }
+
+    switch (surface->map->info.flags & ~SDL_COPY_RLE_MASK) {
+    case 0:
+        blitfun = NULL;
+        if (dstfmt->BitsPerPixel == 8) {
+            if ((srcfmt->BytesPerPixel == 4) &&
+                (srcfmt->Rmask == 0x00FF0000) &&
+                (srcfmt->Gmask == 0x0000FF00) &&
+                (srcfmt->Bmask == 0x000000FF)) {
+                blitfun = Blit_RGB888_index8;
+            } else if ((srcfmt->BytesPerPixel == 4) &&
+                (srcfmt->Rmask == 0x3FF00000) &&
+                (srcfmt->Gmask == 0x000FFC00) &&
+                (srcfmt->Bmask == 0x000003FF)) {
+                blitfun = Blit_RGB101010_index8;
+            } else {
+                blitfun = BlitNto1;
+            }
+        } else {
+            /* Now the meat, choose the blitter we want */
+            int a_need = NO_ALPHA;
+            if (dstfmt->Amask)
+                a_need = srcfmt->Amask ? COPY_ALPHA : SET_ALPHA;
+            table = normal_blit[srcfmt->BytesPerPixel - 1];
+            for (which = 0; table[which].dstbpp; ++which) {
+                if (MASKOK(srcfmt->Rmask, table[which].srcR) &&
+                    MASKOK(srcfmt->Gmask, table[which].srcG) &&
+                    MASKOK(srcfmt->Bmask, table[which].srcB) &&
+                    MASKOK(dstfmt->Rmask, table[which].dstR) &&
+                    MASKOK(dstfmt->Gmask, table[which].dstG) &&
+                    MASKOK(dstfmt->Bmask, table[which].dstB) &&
+                    dstfmt->BytesPerPixel == table[which].dstbpp &&
+                    (a_need & table[which].alpha) == a_need &&
+                    ((table[which].blit_features & GetBlitFeatures()) ==
+                     table[which].blit_features))
+                    break;
+            }
+            blitfun = table[which].blitfunc;
+
+            if (blitfun == BlitNtoN) {  /* default C fallback catch-all. Slow! */
+                if (srcfmt->format == SDL_PIXELFORMAT_ARGB2101010) {
+                    blitfun = Blit2101010toN;
+                } else if (dstfmt->format == SDL_PIXELFORMAT_ARGB2101010) {
+                    blitfun = BlitNto2101010;
+                } else if (srcfmt->BytesPerPixel == 4 &&
+                            dstfmt->BytesPerPixel == 4 &&
+                            srcfmt->Rmask == dstfmt->Rmask &&
+                            srcfmt->Gmask == dstfmt->Gmask &&
+                            srcfmt->Bmask == dstfmt->Bmask) {
+                    /* Fastpath C fallback: 32bit RGB<->RGBA blit with matching RGB */
+                    blitfun = Blit4to4MaskAlpha;
+                } else if (a_need == COPY_ALPHA) {
+                    blitfun = BlitNtoNCopyAlpha;
+                }
+            }
+        }
+        return (blitfun);
+
+    case SDL_COPY_COLORKEY:
+        /* colorkey blit: Here we don't have too many options, mostly
+           because RLE is the preferred fast way to deal with this.
+           If a particular case turns out to be useful we'll add it. */
+
+        if (srcfmt->BytesPerPixel == 2 && surface->map->identity)
+            return Blit2to2Key;
+        else if (dstfmt->BytesPerPixel == 1)
+            return BlitNto1Key;
+        else {
+#if SDL_ALTIVEC_BLITTERS
+            if ((srcfmt->BytesPerPixel == 4) && (dstfmt->BytesPerPixel == 4)
+                && SDL_HasAltiVec()) {
+                return Blit32to32KeyAltivec;
+            } else
+#endif
+            if (srcfmt->Amask && dstfmt->Amask) {
+                return BlitNtoNKeyCopyAlpha;
+            } else {
+                return BlitNtoNKey;
+            }
+        }
+    }
+
+    return NULL;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_auto.c b/Source/3rd Party/sdl/src/video/SDL_blit_auto.c
new file mode 100644
index 000000000..310839ca0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_auto.c	
@@ -0,0 +1,7563 @@
+/* DO NOT EDIT!  This file is generated by sdlgenblit.pl */
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* *INDENT-OFF* */
+
+#include "SDL_video.h"
+#include "SDL_blit.h"
+#include "SDL_blit_auto.h"
+
+static void SDL_Blit_RGB888_RGB888_Scale(SDL_BlitInfo *info)
+{
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            *dst = *src;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_RGB888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_RGB888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_RGB888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_RGB888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_RGB888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_BGR888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF;
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_BGR888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_BGR888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_BGR888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_BGR888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_BGR888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_ARGB8888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF;
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_ARGB8888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_ARGB8888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_ARGB8888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_ARGB8888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGB888_ARGB8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_RGB888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF;
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_RGB888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_RGB888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_RGB888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_RGB888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_RGB888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_BGR888_Scale(SDL_BlitInfo *info)
+{
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            *dst = *src;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_BGR888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_BGR888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_BGR888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_BGR888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_BGR888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_ARGB8888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF;
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_ARGB8888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_ARGB8888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_ARGB8888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel; A = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_ARGB8888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGR888_ARGB8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel; srcA = 0xFF;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_RGB888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_RGB888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_RGB888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_RGB888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_RGB888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_RGB888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_BGR888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_BGR888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_BGR888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_BGR888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_BGR888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_BGR888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_ARGB8888_Scale(SDL_BlitInfo *info)
+{
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            *dst = *src;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_ARGB8888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_ARGB8888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_ARGB8888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); R = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); B = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_ARGB8888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ARGB8888_ARGB8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcR = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcB = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_RGB888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_RGB888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_RGB888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_RGB888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_RGB888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_RGB888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_BGR888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_BGR888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_BGR888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_BGR888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_BGR888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_BGR888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_ARGB8888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_ARGB8888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_ARGB8888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_ARGB8888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            R = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); B = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_ARGB8888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_RGBA8888_ARGB8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcR = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcB = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_RGB888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_RGB888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_RGB888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_RGB888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_RGB888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_RGB888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_BGR888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_BGR888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_BGR888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_BGR888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_BGR888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_BGR888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_ARGB8888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_ARGB8888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_ARGB8888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_ARGB8888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            A = (Uint8)(pixel >> 24); B = (Uint8)(pixel >> 16); G = (Uint8)(pixel >> 8); R = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_ARGB8888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_ABGR8888_ARGB8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcA = (Uint8)(srcpixel >> 24); srcB = (Uint8)(srcpixel >> 16); srcG = (Uint8)(srcpixel >> 8); srcR = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_RGB888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_RGB888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_RGB888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_RGB888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_RGB888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_RGB888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_RGB888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_BGR888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_BGR888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_BGR888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_BGR888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_BGR888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)B << 16) | ((Uint32)G << 8) | R;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_BGR888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_BGR888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstB = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstR = (Uint8)dstpixel; dstA = 0xFF;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstB << 16) | ((Uint32)dstG << 8) | dstR;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_ARGB8888_Scale(SDL_BlitInfo *info)
+{
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_ARGB8888_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_ARGB8888_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_ARGB8888_Modulate(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            pixel = *src;
+            B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_ARGB8888_Modulate_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            pixel = *src;
+            B = (Uint8)(pixel >> 24); G = (Uint8)(pixel >> 16); R = (Uint8)(pixel >> 8); A = (Uint8)pixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                R = (R * modulateR) / 255;
+                G = (G * modulateG) / 255;
+                B = (B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                A = (A * modulateA) / 255;
+            }
+            pixel = ((Uint32)A << 24) | ((Uint32)R << 16) | ((Uint32)G << 8) | B;
+            *dst = pixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_ARGB8888_Modulate_Blend(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+
+    while (info->dst_h--) {
+        Uint32 *src = (Uint32 *)info->src;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+}
+
+static void SDL_Blit_BGRA8888_ARGB8888_Modulate_Blend_Scale(SDL_BlitInfo *info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint32 *src = 0;
+        Uint32 *dst = (Uint32 *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = (Uint32 *)(info->src + (srcy * info->src_pitch) + (srcx * 4));
+            }
+            srcpixel = *src;
+            srcB = (Uint8)(srcpixel >> 24); srcG = (Uint8)(srcpixel >> 16); srcR = (Uint8)(srcpixel >> 8); srcA = (Uint8)srcpixel;
+            dstpixel = *dst;
+            dstA = (Uint8)(dstpixel >> 24); dstR = (Uint8)(dstpixel >> 16); dstG = (Uint8)(dstpixel >> 8); dstB = (Uint8)dstpixel;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                dstA = srcA + ((255 - srcA) * dstA) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR; if (dstR > 255) dstR = 255;
+                dstG = srcG + dstG; if (dstG > 255) dstG = 255;
+                dstB = srcB + dstB; if (dstB > 255) dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            dstpixel = ((Uint32)dstA << 24) | ((Uint32)dstR << 16) | ((Uint32)dstG << 8) | dstB;
+            *dst = dstpixel;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+SDL_BlitFuncEntry SDL_GeneratedBlitFuncTable[] = {
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Blend },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Blend_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Modulate },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Modulate_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Modulate_Blend },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_RGB888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Blend },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Blend_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Modulate },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Modulate_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Modulate_Blend },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_BGR888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_ARGB8888_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_ARGB8888_Blend },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_ARGB8888_Blend_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGB888_ARGB8888_Modulate },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_ARGB8888_Modulate_Scale },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGB888_ARGB8888_Modulate_Blend },
+    { SDL_PIXELFORMAT_RGB888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGB888_ARGB8888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Blend },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Blend_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Modulate },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Modulate_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Modulate_Blend },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_RGB888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Blend },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Blend_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Modulate },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Modulate_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Modulate_Blend },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_BGR888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_ARGB8888_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_ARGB8888_Blend },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_ARGB8888_Blend_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGR888_ARGB8888_Modulate },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_ARGB8888_Modulate_Scale },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGR888_ARGB8888_Modulate_Blend },
+    { SDL_PIXELFORMAT_BGR888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGR888_ARGB8888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Blend },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Blend_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Modulate },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Modulate_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Modulate_Blend },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_RGB888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Blend },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Blend_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Modulate },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Modulate_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Modulate_Blend },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_BGR888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_ARGB8888_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_ARGB8888_Blend },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_ARGB8888_Blend_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ARGB8888_ARGB8888_Modulate },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_ARGB8888_Modulate_Scale },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ARGB8888_ARGB8888_Modulate_Blend },
+    { SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ARGB8888_ARGB8888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Blend },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Blend_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Modulate },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Modulate_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Modulate_Blend },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_RGB888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Blend },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Blend_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Modulate },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Modulate_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Modulate_Blend },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_BGR888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_ARGB8888_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_ARGB8888_Blend },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_ARGB8888_Blend_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_RGBA8888_ARGB8888_Modulate },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_ARGB8888_Modulate_Scale },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_RGBA8888_ARGB8888_Modulate_Blend },
+    { SDL_PIXELFORMAT_RGBA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_RGBA8888_ARGB8888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Blend },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Blend_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Modulate },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Modulate_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Modulate_Blend },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_RGB888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Blend },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Blend_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Modulate },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Modulate_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Modulate_Blend },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_BGR888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_ARGB8888_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_ARGB8888_Blend },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_ARGB8888_Blend_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_ABGR8888_ARGB8888_Modulate },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_ARGB8888_Modulate_Scale },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_ABGR8888_ARGB8888_Modulate_Blend },
+    { SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_ABGR8888_ARGB8888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Blend },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Blend_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Modulate },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Modulate_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Modulate_Blend },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_RGB888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_RGB888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Blend },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Blend_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Modulate },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Modulate_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Modulate_Blend },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_BGR888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_BGR888_Modulate_Blend_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_ARGB8888_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_ARGB8888_Blend },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_ARGB8888_Blend_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA), SDL_CPU_ANY, SDL_Blit_BGRA8888_ARGB8888_Modulate },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_ARGB8888_Modulate_Scale },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD), SDL_CPU_ANY, SDL_Blit_BGRA8888_ARGB8888_Modulate_Blend },
+    { SDL_PIXELFORMAT_BGRA8888, SDL_PIXELFORMAT_ARGB8888, (SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA | SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD | SDL_COPY_NEAREST), SDL_CPU_ANY, SDL_Blit_BGRA8888_ARGB8888_Modulate_Blend_Scale },
+    { 0, 0, 0, 0, NULL }
+};
+
+/* *INDENT-ON* */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_auto.h b/Source/3rd Party/sdl/src/video/SDL_blit_auto.h
new file mode 100644
index 000000000..369e12fc9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_auto.h	
@@ -0,0 +1,30 @@
+/* DO NOT EDIT!  This file is generated by sdlgenblit.pl */
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* *INDENT-OFF* */
+
+extern SDL_BlitFuncEntry SDL_GeneratedBlitFuncTable[];
+
+/* *INDENT-ON* */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_copy.c b/Source/3rd Party/sdl/src/video/SDL_blit_copy.c
new file mode 100644
index 000000000..5c62d633d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_copy.c	
@@ -0,0 +1,152 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+#include "SDL_blit.h"
+#include "SDL_blit_copy.h"
+
+
+#ifdef __SSE__
+/* This assumes 16-byte aligned src and dst */
+static SDL_INLINE void
+SDL_memcpySSE(Uint8 * dst, const Uint8 * src, int len)
+{
+    int i;
+
+    __m128 values[4];
+    for (i = len / 64; i--;) {
+        _mm_prefetch(src, _MM_HINT_NTA);
+        values[0] = *(__m128 *) (src + 0);
+        values[1] = *(__m128 *) (src + 16);
+        values[2] = *(__m128 *) (src + 32);
+        values[3] = *(__m128 *) (src + 48);
+        _mm_stream_ps((float *) (dst + 0), values[0]);
+        _mm_stream_ps((float *) (dst + 16), values[1]);
+        _mm_stream_ps((float *) (dst + 32), values[2]);
+        _mm_stream_ps((float *) (dst + 48), values[3]);
+        src += 64;
+        dst += 64;
+    }
+
+    if (len & 63)
+        SDL_memcpy(dst, src, len & 63);
+}
+#endif /* __SSE__ */
+
+#ifdef __MMX__
+#ifdef _MSC_VER
+#pragma warning(disable:4799)
+#endif
+static SDL_INLINE void
+SDL_memcpyMMX(Uint8 * dst, const Uint8 * src, int len)
+{
+    const int remain = (len & 63);
+    int i;
+
+    __m64* d64 = (__m64*)dst;
+    __m64* s64 = (__m64*)src;
+
+    for(i= len / 64; i--;) {
+        d64[0] = s64[0];
+        d64[1] = s64[1];
+        d64[2] = s64[2];
+        d64[3] = s64[3];
+        d64[4] = s64[4];
+        d64[5] = s64[5];
+        d64[6] = s64[6];
+        d64[7] = s64[7];
+
+        d64 += 8;
+        s64 += 8;
+    }
+
+    if (remain)
+    {
+        const int skip = len - remain;
+        SDL_memcpy(dst + skip, src + skip, remain);
+    }
+}
+#endif /* __MMX__ */
+
+void
+SDL_BlitCopy(SDL_BlitInfo * info)
+{
+    SDL_bool overlap;
+    Uint8 *src, *dst;
+    int w, h;
+    int srcskip, dstskip;
+
+    w = info->dst_w * info->dst_fmt->BytesPerPixel;
+    h = info->dst_h;
+    src = info->src;
+    dst = info->dst;
+    srcskip = info->src_pitch;
+    dstskip = info->dst_pitch;
+
+    /* Properly handle overlapping blits */
+    if (src < dst) {
+        overlap = (dst < (src + h*srcskip));
+    } else {
+        overlap = (src < (dst + h*dstskip));
+    }
+    if (overlap) {
+        while (h--) {
+            SDL_memmove(dst, src, w);
+            src += srcskip;
+            dst += dstskip;
+        }
+        return;
+    }
+
+#ifdef __SSE__
+    if (SDL_HasSSE() &&
+        !((uintptr_t) src & 15) && !(srcskip & 15) &&
+        !((uintptr_t) dst & 15) && !(dstskip & 15)) {
+        while (h--) {
+            SDL_memcpySSE(dst, src, w);
+            src += srcskip;
+            dst += dstskip;
+        }
+        return;
+    }
+#endif
+
+#ifdef __MMX__
+    if (SDL_HasMMX() && !(srcskip & 7) && !(dstskip & 7)) {
+        while (h--) {
+            SDL_memcpyMMX(dst, src, w);
+            src += srcskip;
+            dst += dstskip;
+        }
+        _mm_empty();
+        return;
+    }
+#endif
+
+    while (h--) {
+        SDL_memcpy(dst, src, w);
+        src += srcskip;
+        dst += dstskip;
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_copy.h b/Source/3rd Party/sdl/src/video/SDL_blit_copy.h
new file mode 100644
index 000000000..8b6950ced
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_copy.h	
@@ -0,0 +1,24 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+void SDL_BlitCopy(SDL_BlitInfo * info);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_slow.c b/Source/3rd Party/sdl/src/video/SDL_blit_slow.c
new file mode 100644
index 000000000..ca644adcf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_slow.c	
@@ -0,0 +1,161 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+#include "SDL_blit.h"
+#include "SDL_blit_slow.h"
+
+/* The ONE TRUE BLITTER
+ * This puppy has to handle all the unoptimized cases - yes, it's slow.
+ */
+void
+SDL_Blit_Slow(SDL_BlitInfo * info)
+{
+    const int flags = info->flags;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+    SDL_PixelFormat *src_fmt = info->src_fmt;
+    SDL_PixelFormat *dst_fmt = info->dst_fmt;
+    int srcbpp = src_fmt->BytesPerPixel;
+    int dstbpp = dst_fmt->BytesPerPixel;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        Uint8 *src = 0;
+        Uint8 *dst = (Uint8 *) info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src =
+                    (info->src + (srcy * info->src_pitch) + (srcx * srcbpp));
+            }
+            if (src_fmt->Amask) {
+                DISEMBLE_RGBA(src, srcbpp, src_fmt, srcpixel, srcR, srcG,
+                              srcB, srcA);
+            } else {
+                DISEMBLE_RGB(src, srcbpp, src_fmt, srcpixel, srcR, srcG,
+                             srcB);
+                srcA = 0xFF;
+            }
+            if (flags & SDL_COPY_COLORKEY) {
+                /* srcpixel isn't set for 24 bpp */
+                if (srcbpp == 3) {
+                    srcpixel = (srcR << src_fmt->Rshift) |
+                        (srcG << src_fmt->Gshift) | (srcB << src_fmt->Bshift);
+                }
+                if (srcpixel == info->colorkey) {
+                    posx += incx;
+                    dst += dstbpp;
+                    continue;
+                }
+            }
+            if (dst_fmt->Amask) {
+                DISEMBLE_RGBA(dst, dstbpp, dst_fmt, dstpixel, dstR, dstG,
+                              dstB, dstA);
+            } else {
+                DISEMBLE_RGB(dst, dstbpp, dst_fmt, dstpixel, dstR, dstG,
+                             dstB);
+                dstA = 0xFF;
+            }
+
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                srcR = (srcR * modulateR) / 255;
+                srcG = (srcG * modulateG) / 255;
+                srcB = (srcB * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                srcA = (srcA * modulateA) / 255;
+            }
+            if (flags & (SDL_COPY_BLEND | SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (srcA < 255) {
+                    srcR = (srcR * srcA) / 255;
+                    srcG = (srcG * srcA) / 255;
+                    srcB = (srcB * srcA) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD)) {
+            case 0:
+                dstR = srcR;
+                dstG = srcG;
+                dstB = srcB;
+                dstA = srcA;
+                break;
+            case SDL_COPY_BLEND:
+                dstR = srcR + ((255 - srcA) * dstR) / 255;
+                dstG = srcG + ((255 - srcA) * dstG) / 255;
+                dstB = srcB + ((255 - srcA) * dstB) / 255;
+                break;
+            case SDL_COPY_ADD:
+                dstR = srcR + dstR;
+                if (dstR > 255)
+                    dstR = 255;
+                dstG = srcG + dstG;
+                if (dstG > 255)
+                    dstG = 255;
+                dstB = srcB + dstB;
+                if (dstB > 255)
+                    dstB = 255;
+                break;
+            case SDL_COPY_MOD:
+                dstR = (srcR * dstR) / 255;
+                dstG = (srcG * dstG) / 255;
+                dstB = (srcB * dstB) / 255;
+                break;
+            }
+            if (dst_fmt->Amask) {
+                ASSEMBLE_RGBA(dst, dstbpp, dst_fmt, dstR, dstG, dstB, dstA);
+            } else {
+                ASSEMBLE_RGB(dst, dstbpp, dst_fmt, dstR, dstG, dstB);
+            }
+            posx += incx;
+            dst += dstbpp;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_blit_slow.h b/Source/3rd Party/sdl/src/video/SDL_blit_slow.h
new file mode 100644
index 000000000..c1786e0b5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_blit_slow.h	
@@ -0,0 +1,25 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+extern void SDL_Blit_Slow(SDL_BlitInfo * info);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_bmp.c b/Source/3rd Party/sdl/src/video/SDL_bmp.c
new file mode 100644
index 000000000..6d24aa25d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_bmp.c	
@@ -0,0 +1,612 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/*
+   Code to load and save surfaces in Windows BMP format.
+
+   Why support BMP format?  Well, it's a native format for Windows, and
+   most image processing programs can read and write it.  It would be nice
+   to be able to have at least one image format that we can natively load
+   and save, and since PNG is so complex that it would bloat the library,
+   BMP is a good alternative.
+
+   This code currently supports Win32 DIBs in uncompressed 8 and 24 bpp.
+*/
+
+#include "SDL_video.h"
+#include "SDL_endian.h"
+#include "SDL_pixels_c.h"
+
+#define SAVE_32BIT_BMP
+
+/* Compression encodings for BMP files */
+#ifndef BI_RGB
+#define BI_RGB      0
+#define BI_RLE8     1
+#define BI_RLE4     2
+#define BI_BITFIELDS    3
+#endif
+
+
+static void CorrectAlphaChannel(SDL_Surface *surface)
+{
+    /* Check to see if there is any alpha channel data */
+    SDL_bool hasAlpha = SDL_FALSE;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+    int alphaChannelOffset = 0;
+#else
+    int alphaChannelOffset = 3;
+#endif
+    Uint8 *alpha = ((Uint8*)surface->pixels) + alphaChannelOffset;
+    Uint8 *end = alpha + surface->h * surface->pitch;
+
+    while (alpha < end) {
+        if (*alpha != 0) {
+            hasAlpha = SDL_TRUE;
+            break;
+        }
+        alpha += 4;
+    }
+
+    if (!hasAlpha) {
+        alpha = ((Uint8*)surface->pixels) + alphaChannelOffset;
+        while (alpha < end) {
+            *alpha = SDL_ALPHA_OPAQUE;
+            alpha += 4;
+        }
+    }
+}
+
+SDL_Surface *
+SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
+{
+    SDL_bool was_error;
+    Sint64 fp_offset = 0;
+    int bmpPitch;
+    int i, pad;
+    SDL_Surface *surface;
+    Uint32 Rmask;
+    Uint32 Gmask;
+    Uint32 Bmask;
+    Uint32 Amask;
+    SDL_Palette *palette;
+    Uint8 *bits;
+    Uint8 *top, *end;
+    SDL_bool topDown;
+    int ExpandBMP;
+    SDL_bool correctAlpha = SDL_FALSE;
+
+    /* The Win32 BMP file header (14 bytes) */
+    char magic[2];
+    /* Uint32 bfSize = 0; */
+    /* Uint16 bfReserved1 = 0; */
+    /* Uint16 bfReserved2 = 0; */
+    Uint32 bfOffBits = 0;
+
+    /* The Win32 BITMAPINFOHEADER struct (40 bytes) */
+    Uint32 biSize = 0;
+    Sint32 biWidth = 0;
+    Sint32 biHeight = 0;
+    /* Uint16 biPlanes = 0; */
+    Uint16 biBitCount = 0;
+    Uint32 biCompression = 0;
+    /* Uint32 biSizeImage = 0; */
+    /* Sint32 biXPelsPerMeter = 0; */
+    /* Sint32 biYPelsPerMeter = 0; */
+    Uint32 biClrUsed = 0;
+    /* Uint32 biClrImportant = 0; */
+
+    /* Make sure we are passed a valid data source */
+    surface = NULL;
+    was_error = SDL_FALSE;
+    if (src == NULL) {
+        was_error = SDL_TRUE;
+        goto done;
+    }
+
+    /* Read in the BMP file header */
+    fp_offset = SDL_RWtell(src);
+    SDL_ClearError();
+    if (SDL_RWread(src, magic, 1, 2) != 2) {
+        SDL_Error(SDL_EFREAD);
+        was_error = SDL_TRUE;
+        goto done;
+    }
+    if (SDL_strncmp(magic, "BM", 2) != 0) {
+        SDL_SetError("File is not a Windows BMP file");
+        was_error = SDL_TRUE;
+        goto done;
+    }
+    /* bfSize = */ SDL_ReadLE32(src);
+    /* bfReserved1 = */ SDL_ReadLE16(src);
+    /* bfReserved2 = */ SDL_ReadLE16(src);
+    bfOffBits = SDL_ReadLE32(src);
+
+    /* Read the Win32 BITMAPINFOHEADER */
+    biSize = SDL_ReadLE32(src);
+    if (biSize == 12) {
+        biWidth = (Uint32) SDL_ReadLE16(src);
+        biHeight = (Uint32) SDL_ReadLE16(src);
+        /* biPlanes = */ SDL_ReadLE16(src);
+        biBitCount = SDL_ReadLE16(src);
+        biCompression = BI_RGB;
+    } else {
+        const unsigned int headerSize = 40;
+
+        biWidth = SDL_ReadLE32(src);
+        biHeight = SDL_ReadLE32(src);
+        /* biPlanes = */ SDL_ReadLE16(src);
+        biBitCount = SDL_ReadLE16(src);
+        biCompression = SDL_ReadLE32(src);
+        /* biSizeImage = */ SDL_ReadLE32(src);
+        /* biXPelsPerMeter = */ SDL_ReadLE32(src);
+        /* biYPelsPerMeter = */ SDL_ReadLE32(src);
+        biClrUsed = SDL_ReadLE32(src);
+        /* biClrImportant = */ SDL_ReadLE32(src);
+
+        if (biSize > headerSize) {
+            SDL_RWseek(src, (biSize - headerSize), RW_SEEK_CUR);
+        }
+    }
+    if (biHeight < 0) {
+        topDown = SDL_TRUE;
+        biHeight = -biHeight;
+    } else {
+        topDown = SDL_FALSE;
+    }
+
+    /* Check for read error */
+    if (SDL_strcmp(SDL_GetError(), "") != 0) {
+        was_error = SDL_TRUE;
+        goto done;
+    }
+
+    /* Expand 1 and 4 bit bitmaps to 8 bits per pixel */
+    switch (biBitCount) {
+    case 1:
+    case 4:
+        ExpandBMP = biBitCount;
+        biBitCount = 8;
+        break;
+    default:
+        ExpandBMP = 0;
+        break;
+    }
+
+    /* We don't support any BMP compression right now */
+    Rmask = Gmask = Bmask = Amask = 0;
+    switch (biCompression) {
+    case BI_RGB:
+        /* If there are no masks, use the defaults */
+        if (bfOffBits == (14 + biSize)) {
+            /* Default values for the BMP format */
+            switch (biBitCount) {
+            case 15:
+            case 16:
+                Rmask = 0x7C00;
+                Gmask = 0x03E0;
+                Bmask = 0x001F;
+                break;
+            case 24:
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+                Rmask = 0x000000FF;
+                Gmask = 0x0000FF00;
+                Bmask = 0x00FF0000;
+#else
+                Rmask = 0x00FF0000;
+                Gmask = 0x0000FF00;
+                Bmask = 0x000000FF;
+#endif
+                break;
+            case 32:
+                /* We don't know if this has alpha channel or not */
+                correctAlpha = SDL_TRUE;
+                Amask = 0xFF000000;
+                Rmask = 0x00FF0000;
+                Gmask = 0x0000FF00;
+                Bmask = 0x000000FF;
+                break;
+            default:
+                break;
+            }
+            break;
+        }
+        /* Fall through -- read the RGB masks */
+
+    case BI_BITFIELDS:
+        switch (biBitCount) {
+        case 15:
+        case 16:
+            Rmask = SDL_ReadLE32(src);
+            Gmask = SDL_ReadLE32(src);
+            Bmask = SDL_ReadLE32(src);
+            break;
+        case 32:
+            Rmask = SDL_ReadLE32(src);
+            Gmask = SDL_ReadLE32(src);
+            Bmask = SDL_ReadLE32(src);
+            Amask = SDL_ReadLE32(src);
+            break;
+        default:
+            break;
+        }
+        break;
+    default:
+        SDL_SetError("Compressed BMP files not supported");
+        was_error = SDL_TRUE;
+        goto done;
+    }
+
+    /* Create a compatible surface, note that the colors are RGB ordered */
+    surface =
+        SDL_CreateRGBSurface(0, biWidth, biHeight, biBitCount, Rmask, Gmask,
+                             Bmask, Amask);
+    if (surface == NULL) {
+        was_error = SDL_TRUE;
+        goto done;
+    }
+
+    /* Load the palette, if any */
+    palette = (surface->format)->palette;
+    if (palette) {
+        if (biClrUsed == 0) {
+            biClrUsed = 1 << biBitCount;
+        }
+        if ((int) biClrUsed > palette->ncolors) {
+            palette->ncolors = biClrUsed;
+            palette->colors =
+                (SDL_Color *) SDL_realloc(palette->colors,
+                                          palette->ncolors *
+                                          sizeof(*palette->colors));
+            if (!palette->colors) {
+                SDL_OutOfMemory();
+                was_error = SDL_TRUE;
+                goto done;
+            }
+        } else if ((int) biClrUsed < palette->ncolors) {
+            palette->ncolors = biClrUsed;
+        }
+        if (biSize == 12) {
+            for (i = 0; i < (int) biClrUsed; ++i) {
+                SDL_RWread(src, &palette->colors[i].b, 1, 1);
+                SDL_RWread(src, &palette->colors[i].g, 1, 1);
+                SDL_RWread(src, &palette->colors[i].r, 1, 1);
+                palette->colors[i].a = SDL_ALPHA_OPAQUE;
+            }
+        } else {
+            for (i = 0; i < (int) biClrUsed; ++i) {
+                SDL_RWread(src, &palette->colors[i].b, 1, 1);
+                SDL_RWread(src, &palette->colors[i].g, 1, 1);
+                SDL_RWread(src, &palette->colors[i].r, 1, 1);
+                SDL_RWread(src, &palette->colors[i].a, 1, 1);
+
+                /* According to Microsoft documentation, the fourth element
+                   is reserved and must be zero, so we shouldn't treat it as
+                   alpha.
+                */
+                palette->colors[i].a = SDL_ALPHA_OPAQUE;
+            }
+        }
+    }
+
+    /* Read the surface pixels.  Note that the bmp image is upside down */
+    if (SDL_RWseek(src, fp_offset + bfOffBits, RW_SEEK_SET) < 0) {
+        SDL_Error(SDL_EFSEEK);
+        was_error = SDL_TRUE;
+        goto done;
+    }
+    top = (Uint8 *)surface->pixels;
+    end = (Uint8 *)surface->pixels+(surface->h*surface->pitch);
+    switch (ExpandBMP) {
+    case 1:
+        bmpPitch = (biWidth + 7) >> 3;
+        pad = (((bmpPitch) % 4) ? (4 - ((bmpPitch) % 4)) : 0);
+        break;
+    case 4:
+        bmpPitch = (biWidth + 1) >> 1;
+        pad = (((bmpPitch) % 4) ? (4 - ((bmpPitch) % 4)) : 0);
+        break;
+    default:
+        pad = ((surface->pitch % 4) ? (4 - (surface->pitch % 4)) : 0);
+        break;
+    }
+    if (topDown) {
+        bits = top;
+    } else {
+        bits = end - surface->pitch;
+    }
+    while (bits >= top && bits < end) {
+        switch (ExpandBMP) {
+        case 1:
+        case 4:{
+                Uint8 pixel = 0;
+                int shift = (8 - ExpandBMP);
+                for (i = 0; i < surface->w; ++i) {
+                    if (i % (8 / ExpandBMP) == 0) {
+                        if (!SDL_RWread(src, &pixel, 1, 1)) {
+                            SDL_SetError("Error reading from BMP");
+                            was_error = SDL_TRUE;
+                            goto done;
+                        }
+                    }
+                    *(bits + i) = (pixel >> shift);
+                    pixel <<= ExpandBMP;
+                }
+            }
+            break;
+
+        default:
+            if (SDL_RWread(src, bits, 1, surface->pitch)
+                != surface->pitch) {
+                SDL_Error(SDL_EFREAD);
+                was_error = SDL_TRUE;
+                goto done;
+            }
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+            /* Byte-swap the pixels if needed. Note that the 24bpp
+               case has already been taken care of above. */
+            switch (biBitCount) {
+            case 15:
+            case 16:{
+                    Uint16 *pix = (Uint16 *) bits;
+                    for (i = 0; i < surface->w; i++)
+                        pix[i] = SDL_Swap16(pix[i]);
+                    break;
+                }
+
+            case 32:{
+                    Uint32 *pix = (Uint32 *) bits;
+                    for (i = 0; i < surface->w; i++)
+                        pix[i] = SDL_Swap32(pix[i]);
+                    break;
+                }
+            }
+#endif
+            break;
+        }
+        /* Skip padding bytes, ugh */
+        if (pad) {
+            Uint8 padbyte;
+            for (i = 0; i < pad; ++i) {
+                SDL_RWread(src, &padbyte, 1, 1);
+            }
+        }
+        if (topDown) {
+            bits += surface->pitch;
+        } else {
+            bits -= surface->pitch;
+        }
+    }
+    if (correctAlpha) {
+        CorrectAlphaChannel(surface);
+    }
+  done:
+    if (was_error) {
+        if (src) {
+            SDL_RWseek(src, fp_offset, RW_SEEK_SET);
+        }
+        SDL_FreeSurface(surface);
+        surface = NULL;
+    }
+    if (freesrc && src) {
+        SDL_RWclose(src);
+    }
+    return (surface);
+}
+
+int
+SDL_SaveBMP_RW(SDL_Surface * saveme, SDL_RWops * dst, int freedst)
+{
+    Sint64 fp_offset;
+    int i, pad;
+    SDL_Surface *surface;
+    Uint8 *bits;
+
+    /* The Win32 BMP file header (14 bytes) */
+    char magic[2] = { 'B', 'M' };
+    Uint32 bfSize;
+    Uint16 bfReserved1;
+    Uint16 bfReserved2;
+    Uint32 bfOffBits;
+
+    /* The Win32 BITMAPINFOHEADER struct (40 bytes) */
+    Uint32 biSize;
+    Sint32 biWidth;
+    Sint32 biHeight;
+    Uint16 biPlanes;
+    Uint16 biBitCount;
+    Uint32 biCompression;
+    Uint32 biSizeImage;
+    Sint32 biXPelsPerMeter;
+    Sint32 biYPelsPerMeter;
+    Uint32 biClrUsed;
+    Uint32 biClrImportant;
+
+    /* Make sure we have somewhere to save */
+    surface = NULL;
+    if (dst) {
+        SDL_bool save32bit = SDL_FALSE;
+#ifdef SAVE_32BIT_BMP
+        /* We can save alpha information in a 32-bit BMP */
+        if (saveme->map->info.flags & SDL_COPY_COLORKEY ||
+            saveme->format->Amask) {
+            save32bit = SDL_TRUE;
+        }
+#endif /* SAVE_32BIT_BMP */
+
+        if (saveme->format->palette && !save32bit) {
+            if (saveme->format->BitsPerPixel == 8) {
+                surface = saveme;
+            } else {
+                SDL_SetError("%d bpp BMP files not supported",
+                             saveme->format->BitsPerPixel);
+            }
+        } else if ((saveme->format->BitsPerPixel == 24) &&
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+                   (saveme->format->Rmask == 0x00FF0000) &&
+                   (saveme->format->Gmask == 0x0000FF00) &&
+                   (saveme->format->Bmask == 0x000000FF)
+#else
+                   (saveme->format->Rmask == 0x000000FF) &&
+                   (saveme->format->Gmask == 0x0000FF00) &&
+                   (saveme->format->Bmask == 0x00FF0000)
+#endif
+            ) {
+            surface = saveme;
+        } else {
+            SDL_PixelFormat format;
+
+            /* If the surface has a colorkey or alpha channel we'll save a
+               32-bit BMP with alpha channel, otherwise save a 24-bit BMP. */
+            if (save32bit) {
+                SDL_InitFormat(&format,
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+                               SDL_PIXELFORMAT_ARGB8888
+#else
+                               SDL_PIXELFORMAT_BGRA8888
+#endif
+                               );
+            } else {
+                SDL_InitFormat(&format, SDL_PIXELFORMAT_BGR24);
+            }
+            surface = SDL_ConvertSurface(saveme, &format, 0);
+            if (!surface) {
+                SDL_SetError("Couldn't convert image to %d bpp",
+                             format.BitsPerPixel);
+            }
+        }
+    }
+
+    if (surface && (SDL_LockSurface(surface) == 0)) {
+        const int bw = surface->w * surface->format->BytesPerPixel;
+
+        /* Set the BMP file header values */
+        bfSize = 0;             /* We'll write this when we're done */
+        bfReserved1 = 0;
+        bfReserved2 = 0;
+        bfOffBits = 0;          /* We'll write this when we're done */
+
+        /* Write the BMP file header values */
+        fp_offset = SDL_RWtell(dst);
+        SDL_ClearError();
+        SDL_RWwrite(dst, magic, 2, 1);
+        SDL_WriteLE32(dst, bfSize);
+        SDL_WriteLE16(dst, bfReserved1);
+        SDL_WriteLE16(dst, bfReserved2);
+        SDL_WriteLE32(dst, bfOffBits);
+
+        /* Set the BMP info values */
+        biSize = 40;
+        biWidth = surface->w;
+        biHeight = surface->h;
+        biPlanes = 1;
+        biBitCount = surface->format->BitsPerPixel;
+        biCompression = BI_RGB;
+        biSizeImage = surface->h * surface->pitch;
+        biXPelsPerMeter = 0;
+        biYPelsPerMeter = 0;
+        if (surface->format->palette) {
+            biClrUsed = surface->format->palette->ncolors;
+        } else {
+            biClrUsed = 0;
+        }
+        biClrImportant = 0;
+
+        /* Write the BMP info values */
+        SDL_WriteLE32(dst, biSize);
+        SDL_WriteLE32(dst, biWidth);
+        SDL_WriteLE32(dst, biHeight);
+        SDL_WriteLE16(dst, biPlanes);
+        SDL_WriteLE16(dst, biBitCount);
+        SDL_WriteLE32(dst, biCompression);
+        SDL_WriteLE32(dst, biSizeImage);
+        SDL_WriteLE32(dst, biXPelsPerMeter);
+        SDL_WriteLE32(dst, biYPelsPerMeter);
+        SDL_WriteLE32(dst, biClrUsed);
+        SDL_WriteLE32(dst, biClrImportant);
+
+        /* Write the palette (in BGR color order) */
+        if (surface->format->palette) {
+            SDL_Color *colors;
+            int ncolors;
+
+            colors = surface->format->palette->colors;
+            ncolors = surface->format->palette->ncolors;
+            for (i = 0; i < ncolors; ++i) {
+                SDL_RWwrite(dst, &colors[i].b, 1, 1);
+                SDL_RWwrite(dst, &colors[i].g, 1, 1);
+                SDL_RWwrite(dst, &colors[i].r, 1, 1);
+                SDL_RWwrite(dst, &colors[i].a, 1, 1);
+            }
+        }
+
+        /* Write the bitmap offset */
+        bfOffBits = (Uint32)(SDL_RWtell(dst) - fp_offset);
+        if (SDL_RWseek(dst, fp_offset + 10, RW_SEEK_SET) < 0) {
+            SDL_Error(SDL_EFSEEK);
+        }
+        SDL_WriteLE32(dst, bfOffBits);
+        if (SDL_RWseek(dst, fp_offset + bfOffBits, RW_SEEK_SET) < 0) {
+            SDL_Error(SDL_EFSEEK);
+        }
+
+        /* Write the bitmap image upside down */
+        bits = (Uint8 *) surface->pixels + (surface->h * surface->pitch);
+        pad = ((bw % 4) ? (4 - (bw % 4)) : 0);
+        while (bits > (Uint8 *) surface->pixels) {
+            bits -= surface->pitch;
+            if (SDL_RWwrite(dst, bits, 1, bw) != bw) {
+                SDL_Error(SDL_EFWRITE);
+                break;
+            }
+            if (pad) {
+                const Uint8 padbyte = 0;
+                for (i = 0; i < pad; ++i) {
+                    SDL_RWwrite(dst, &padbyte, 1, 1);
+                }
+            }
+        }
+
+        /* Write the BMP file size */
+        bfSize = (Uint32)(SDL_RWtell(dst) - fp_offset);
+        if (SDL_RWseek(dst, fp_offset + 2, RW_SEEK_SET) < 0) {
+            SDL_Error(SDL_EFSEEK);
+        }
+        SDL_WriteLE32(dst, bfSize);
+        if (SDL_RWseek(dst, fp_offset + bfSize, RW_SEEK_SET) < 0) {
+            SDL_Error(SDL_EFSEEK);
+        }
+
+        /* Close it up.. */
+        SDL_UnlockSurface(surface);
+        if (surface != saveme) {
+            SDL_FreeSurface(surface);
+        }
+    }
+
+    if (freedst && dst) {
+        SDL_RWclose(dst);
+    }
+    return ((SDL_strcmp(SDL_GetError(), "") == 0) ? 0 : -1);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_clipboard.c b/Source/3rd Party/sdl/src/video/SDL_clipboard.c
new file mode 100644
index 000000000..a3b38e045
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_clipboard.c	
@@ -0,0 +1,76 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_clipboard.h"
+#include "SDL_sysvideo.h"
+
+
+int
+SDL_SetClipboardText(const char *text)
+{
+    SDL_VideoDevice *_this = SDL_GetVideoDevice();
+
+    if (!text) {
+        text = "";
+    }
+    if (_this->SetClipboardText) {
+        return _this->SetClipboardText(_this, text);
+    } else {
+        SDL_free(_this->clipboard_text);
+        _this->clipboard_text = SDL_strdup(text);
+        return 0;
+    }
+}
+
+char *
+SDL_GetClipboardText(void)
+{
+    SDL_VideoDevice *_this = SDL_GetVideoDevice();
+
+    if (_this->GetClipboardText) {
+        return _this->GetClipboardText(_this);
+    } else {
+        const char *text = _this->clipboard_text;
+        if (!text) {
+            text = "";
+        }
+        return SDL_strdup(text);
+    }
+}
+
+SDL_bool
+SDL_HasClipboardText(void)
+{
+    SDL_VideoDevice *_this = SDL_GetVideoDevice();
+
+    if (_this->HasClipboardText) {
+        return _this->HasClipboardText(_this);
+    } else {
+        if (_this->clipboard_text && _this->clipboard_text[0] != '\0') {
+            return SDL_TRUE;
+        } else {
+            return SDL_FALSE;
+        }
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_egl.c b/Source/3rd Party/sdl/src/video/SDL_egl.c
new file mode 100644
index 000000000..cfba20071
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_egl.c	
@@ -0,0 +1,509 @@
+/*
+ *  Simple DirectMedia Layer
+ *  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+ * 
+ *  This software is provided 'as-is', without any express or implied
+ *  warranty.  In no event will the authors be held liable for any damages
+ *  arising from the use of this software.
+ * 
+ *  Permission is granted to anyone to use this software for any purpose,
+ *  including commercial applications, and to alter it and redistribute it
+ *  freely, subject to the following restrictions:
+ * 
+ *  1. The origin of this software must not be misrepresented; you must not
+ *     claim that you wrote the original software. If you use this software
+ *     in a product, an acknowledgment in the product documentation would be
+ *     appreciated but is not required.
+ *  2. Altered source versions must be plainly marked as such, and must not be
+ *     misrepresented as being the original software.
+ *  3. This notice may not be removed or altered from any source distribution.
+ */
+#include "../SDL_internal.h"
+
+#if SDL_VIDEO_OPENGL_EGL
+
+#include "SDL_sysvideo.h"
+#include "SDL_egl_c.h"
+#include "SDL_loadso.h"
+#include "SDL_hints.h"
+
+#if SDL_VIDEO_DRIVER_RPI
+/* Raspbian places the OpenGL ES/EGL binaries in a non standard path */
+#define DEFAULT_EGL "/opt/vc/lib/libEGL.so"
+#define DEFAULT_OGL_ES2 "/opt/vc/lib/libGLESv2.so"
+#define DEFAULT_OGL_ES_PVR "/opt/vc/lib/libGLES_CM.so"
+#define DEFAULT_OGL_ES "/opt/vc/lib/libGLESv1_CM.so"
+
+#elif SDL_VIDEO_DRIVER_ANDROID
+/* Android */
+#define DEFAULT_EGL "libEGL.so"
+#define DEFAULT_OGL_ES2 "libGLESv2.so"
+#define DEFAULT_OGL_ES_PVR "libGLES_CM.so"
+#define DEFAULT_OGL_ES "libGLESv1_CM.so"
+
+#elif SDL_VIDEO_DRIVER_WINDOWS || SDL_VIDEO_DRIVER_WINRT
+/* EGL AND OpenGL ES support via ANGLE */
+#define DEFAULT_EGL "libEGL.dll"
+#define DEFAULT_OGL_ES2 "libGLESv2.dll"
+#define DEFAULT_OGL_ES_PVR "libGLES_CM.dll"
+#define DEFAULT_OGL_ES "libGLESv1_CM.dll"
+
+#else
+/* Desktop Linux */
+#define DEFAULT_OGL "libGL.so.1"
+#define DEFAULT_EGL "libEGL.so.1"
+#define DEFAULT_OGL_ES2 "libGLESv2.so.2"
+#define DEFAULT_OGL_ES_PVR "libGLES_CM.so.1"
+#define DEFAULT_OGL_ES "libGLESv1_CM.so.1"
+#endif /* SDL_VIDEO_DRIVER_RPI */
+
+#define LOAD_FUNC(NAME) \
+*((void**)&_this->egl_data->NAME) = SDL_LoadFunction(_this->egl_data->dll_handle, #NAME); \
+if (!_this->egl_data->NAME) \
+{ \
+    return SDL_SetError("Could not retrieve EGL function " #NAME); \
+}
+    
+/* EGL implementation of SDL OpenGL ES support */
+
+void *
+SDL_EGL_GetProcAddress(_THIS, const char *proc)
+{
+    static char procname[1024];
+    void *retval;
+    
+    /* eglGetProcAddress is busted on Android http://code.google.com/p/android/issues/detail?id=7681 */
+#if !defined(SDL_VIDEO_DRIVER_ANDROID) 
+    if (_this->egl_data->eglGetProcAddress) {
+        retval = _this->egl_data->eglGetProcAddress(proc);
+        if (retval) {
+            return retval;
+        }
+    }
+#endif
+    
+    retval = SDL_LoadFunction(_this->egl_data->egl_dll_handle, proc);
+    if (!retval && SDL_strlen(proc) <= 1022) {
+        procname[0] = '_';
+        SDL_strlcpy(procname + 1, proc, 1022);
+        retval = SDL_LoadFunction(_this->egl_data->egl_dll_handle, procname);
+    }
+    return retval;
+}
+
+void
+SDL_EGL_UnloadLibrary(_THIS)
+{
+    if (_this->egl_data) {
+        if (_this->egl_data->egl_display) {
+            _this->egl_data->eglTerminate(_this->egl_data->egl_display);
+            _this->egl_data->egl_display = NULL;
+        }
+
+        if (_this->egl_data->dll_handle) {
+            SDL_UnloadObject(_this->egl_data->dll_handle);
+            _this->egl_data->dll_handle = NULL;
+        }
+        if (_this->egl_data->egl_dll_handle) {
+            SDL_UnloadObject(_this->egl_data->egl_dll_handle);
+            _this->egl_data->egl_dll_handle = NULL;
+        }
+        
+        SDL_free(_this->egl_data);
+        _this->egl_data = NULL;
+    }
+}
+
+int
+SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_display)
+{
+    void *dll_handle = NULL, *egl_dll_handle = NULL; /* The naming is counter intuitive, but hey, I just work here -- Gabriel */
+    char *path = NULL;
+#if SDL_VIDEO_DRIVER_WINDOWS || SDL_VIDEO_DRIVER_WINRT
+    const char *d3dcompiler;
+#endif
+
+    if (_this->egl_data) {
+        return SDL_SetError("OpenGL ES context already created");
+    }
+
+    _this->egl_data = (struct SDL_EGL_VideoData *) SDL_calloc(1, sizeof(SDL_EGL_VideoData));
+    if (!_this->egl_data) {
+        return SDL_OutOfMemory();
+    }
+
+#if SDL_VIDEO_DRIVER_WINDOWS || SDL_VIDEO_DRIVER_WINRT
+    d3dcompiler = SDL_GetHint(SDL_HINT_VIDEO_WIN_D3DCOMPILER);
+    if (!d3dcompiler) {
+        /* By default we load the Vista+ compatible compiler */
+        d3dcompiler = "d3dcompiler_46.dll";
+    }
+    if (SDL_strcasecmp(d3dcompiler, "none") != 0) {
+        SDL_LoadObject(d3dcompiler);
+    }
+#endif
+
+    /* A funny thing, loading EGL.so first does not work on the Raspberry, so we load libGL* first */
+    path = SDL_getenv("SDL_VIDEO_GL_DRIVER");
+    if (path != NULL) {
+        egl_dll_handle = SDL_LoadObject(path);
+    }
+
+    if (egl_dll_handle == NULL) {
+        if(_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) {
+            if (_this->gl_config.major_version > 1) {
+                path = DEFAULT_OGL_ES2;
+                egl_dll_handle = SDL_LoadObject(path);
+            }
+            else {
+                path = DEFAULT_OGL_ES;
+                egl_dll_handle = SDL_LoadObject(path);
+                if (egl_dll_handle == NULL) {
+                    path = DEFAULT_OGL_ES_PVR;
+                    egl_dll_handle = SDL_LoadObject(path);
+                }
+            }
+        }
+#ifdef DEFAULT_OGL         
+        else {
+            path = DEFAULT_OGL;
+            egl_dll_handle = SDL_LoadObject(path);
+        }
+#endif        
+    }
+    _this->egl_data->egl_dll_handle = egl_dll_handle;
+
+    if (egl_dll_handle == NULL) {
+        return SDL_SetError("Could not initialize OpenGL / GLES library");
+    }
+
+    /* Loading libGL* in the previous step took care of loading libEGL.so, but we future proof by double checking */
+    if (egl_path != NULL) {
+        dll_handle = SDL_LoadObject(egl_path);
+    }   
+    /* Try loading a EGL symbol, if it does not work try the default library paths */
+    if (SDL_LoadFunction(dll_handle, "eglChooseConfig") == NULL) {
+        if (dll_handle != NULL) {
+            SDL_UnloadObject(dll_handle);
+        }
+        path = SDL_getenv("SDL_VIDEO_EGL_DRIVER");
+        if (path == NULL) {
+            path = DEFAULT_EGL;
+        }
+        dll_handle = SDL_LoadObject(path);
+        if (dll_handle == NULL) {
+            return SDL_SetError("Could not load EGL library");
+        }
+    }
+
+    _this->egl_data->dll_handle = dll_handle;
+
+    /* Load new function pointers */
+    LOAD_FUNC(eglGetDisplay);
+    LOAD_FUNC(eglInitialize);
+    LOAD_FUNC(eglTerminate);
+    LOAD_FUNC(eglGetProcAddress);
+    LOAD_FUNC(eglChooseConfig);
+    LOAD_FUNC(eglGetConfigAttrib);
+    LOAD_FUNC(eglCreateContext);
+    LOAD_FUNC(eglDestroyContext);
+    LOAD_FUNC(eglCreateWindowSurface);
+    LOAD_FUNC(eglDestroySurface);
+    LOAD_FUNC(eglMakeCurrent);
+    LOAD_FUNC(eglSwapBuffers);
+    LOAD_FUNC(eglSwapInterval);
+    LOAD_FUNC(eglWaitNative);
+    LOAD_FUNC(eglWaitGL);
+    LOAD_FUNC(eglBindAPI);
+    
+    _this->egl_data->egl_display = _this->egl_data->eglGetDisplay(native_display);
+    if (!_this->egl_data->egl_display) {
+        return SDL_SetError("Could not get EGL display");
+    }
+    
+    if (_this->egl_data->eglInitialize(_this->egl_data->egl_display, NULL, NULL) != EGL_TRUE) {
+        return SDL_SetError("Could not initialize EGL");
+    }
+
+    _this->egl_data->dll_handle = dll_handle;
+    _this->egl_data->egl_dll_handle = egl_dll_handle;
+    _this->gl_config.driver_loaded = 1;
+
+    if (path) {
+        SDL_strlcpy(_this->gl_config.driver_path, path, sizeof(_this->gl_config.driver_path) - 1);
+    } else {
+        *_this->gl_config.driver_path = '\0';
+    }
+    
+    return 0;
+}
+
+int
+SDL_EGL_ChooseConfig(_THIS) 
+{
+    /* 64 seems nice. */
+    EGLint attribs[64];
+    EGLint found_configs = 0, value;
+    /* 128 seems even nicer here */
+    EGLConfig configs[128];
+    int i, j, best_bitdiff = -1, bitdiff;
+    
+    if (!_this->egl_data) {
+        /* The EGL library wasn't loaded, SDL_GetError() should have info */
+        return -1;
+    }
+  
+    /* Get a valid EGL configuration */
+    i = 0;
+    attribs[i++] = EGL_RED_SIZE;
+    attribs[i++] = _this->gl_config.red_size;
+    attribs[i++] = EGL_GREEN_SIZE;
+    attribs[i++] = _this->gl_config.green_size;
+    attribs[i++] = EGL_BLUE_SIZE;
+    attribs[i++] = _this->gl_config.blue_size;
+    
+    if (_this->gl_config.alpha_size) {
+        attribs[i++] = EGL_ALPHA_SIZE;
+        attribs[i++] = _this->gl_config.alpha_size;
+    }
+    
+    if (_this->gl_config.buffer_size) {
+        attribs[i++] = EGL_BUFFER_SIZE;
+        attribs[i++] = _this->gl_config.buffer_size;
+    }
+    
+    attribs[i++] = EGL_DEPTH_SIZE;
+    attribs[i++] = _this->gl_config.depth_size;
+    
+    if (_this->gl_config.stencil_size) {
+        attribs[i++] = EGL_STENCIL_SIZE;
+        attribs[i++] = _this->gl_config.stencil_size;
+    }
+    
+    if (_this->gl_config.multisamplebuffers) {
+        attribs[i++] = EGL_SAMPLE_BUFFERS;
+        attribs[i++] = _this->gl_config.multisamplebuffers;
+    }
+    
+    if (_this->gl_config.multisamplesamples) {
+        attribs[i++] = EGL_SAMPLES;
+        attribs[i++] = _this->gl_config.multisamplesamples;
+    }
+    
+    attribs[i++] = EGL_RENDERABLE_TYPE;
+    if(_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) {
+        if (_this->gl_config.major_version == 2) {
+            attribs[i++] = EGL_OPENGL_ES2_BIT;
+        } else {
+            attribs[i++] = EGL_OPENGL_ES_BIT;
+        }
+        _this->egl_data->eglBindAPI(EGL_OPENGL_ES_API);
+    }
+    else {
+        attribs[i++] = EGL_OPENGL_BIT;
+        _this->egl_data->eglBindAPI(EGL_OPENGL_API);
+    }
+    
+    attribs[i++] = EGL_NONE;
+   
+    if (_this->egl_data->eglChooseConfig(_this->egl_data->egl_display,
+        attribs,
+        configs, SDL_arraysize(configs),
+        &found_configs) == EGL_FALSE ||
+        found_configs == 0) {
+        return SDL_SetError("Couldn't find matching EGL config");
+    }
+    
+    /* eglChooseConfig returns a number of configurations that match or exceed the requested attribs. */
+    /* From those, we select the one that matches our requirements more closely via a makeshift algorithm */
+
+    for ( i=0; i<found_configs; i++ ) {
+        bitdiff = 0;
+        for (j = 0; j < SDL_arraysize(attribs) - 1; j += 2) {
+            if (attribs[j] == EGL_NONE) {
+               break;
+            }
+            
+            if ( attribs[j+1] != EGL_DONT_CARE && (
+                attribs[j] == EGL_RED_SIZE ||
+                attribs[j] == EGL_GREEN_SIZE ||
+                attribs[j] == EGL_BLUE_SIZE ||
+                attribs[j] == EGL_ALPHA_SIZE ||
+                attribs[j] == EGL_DEPTH_SIZE ||
+                attribs[j] == EGL_STENCIL_SIZE)) {
+                _this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display, configs[i], attribs[j], &value);
+                bitdiff += value - attribs[j + 1]; /* value is always >= attrib */
+            }
+        }
+
+        if (bitdiff < best_bitdiff || best_bitdiff == -1) {
+            _this->egl_data->egl_config = configs[i];
+            
+            best_bitdiff = bitdiff;
+        }
+           
+        if (bitdiff == 0) break; /* we found an exact match! */
+    }
+    
+    return 0;
+}
+
+SDL_GLContext
+SDL_EGL_CreateContext(_THIS, EGLSurface egl_surface)
+{
+    EGLint context_attrib_list[] = {
+        EGL_CONTEXT_CLIENT_VERSION,
+        1,
+        EGL_NONE
+    };
+    
+    EGLContext egl_context, share_context = EGL_NO_CONTEXT;
+    
+    if (!_this->egl_data) {
+        /* The EGL library wasn't loaded, SDL_GetError() should have info */
+        return NULL;
+    }
+    
+    if (_this->gl_config.share_with_current_context) {
+        share_context = (EGLContext)SDL_GL_GetCurrentContext();
+    }
+    
+    /* Bind the API */
+    if(_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) {
+        _this->egl_data->eglBindAPI(EGL_OPENGL_ES_API);
+        if (_this->gl_config.major_version) {
+            context_attrib_list[1] = _this->gl_config.major_version;
+        }
+
+        egl_context = _this->egl_data->eglCreateContext(_this->egl_data->egl_display,
+                                          _this->egl_data->egl_config,
+                                          share_context, context_attrib_list);
+    }
+    else {
+        _this->egl_data->eglBindAPI(EGL_OPENGL_API);
+        egl_context = _this->egl_data->eglCreateContext(_this->egl_data->egl_display,
+                                          _this->egl_data->egl_config,
+                                          share_context, NULL);
+    }
+    
+    if (egl_context == EGL_NO_CONTEXT) {
+        SDL_SetError("Could not create EGL context");
+        return NULL;
+    }
+    
+    _this->egl_data->egl_swapinterval = 0;
+    
+    if (SDL_EGL_MakeCurrent(_this, egl_surface, egl_context) < 0) {
+        SDL_EGL_DeleteContext(_this, egl_context);
+        SDL_SetError("Could not make EGL context current");
+        return NULL;
+    }
+  
+    return (SDL_GLContext) egl_context;
+}
+
+int
+SDL_EGL_MakeCurrent(_THIS, EGLSurface egl_surface, SDL_GLContext context)
+{
+    EGLContext egl_context = (EGLContext) context;
+
+    if (!_this->egl_data) {
+        return SDL_SetError("OpenGL not initialized");
+    }
+    
+    /* The android emulator crashes badly if you try to eglMakeCurrent 
+     * with a valid context and invalid surface, so we have to check for both here.
+     */
+    if (!egl_context || !egl_surface) {
+         _this->egl_data->eglMakeCurrent(_this->egl_data->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    }
+    else {
+        if (!_this->egl_data->eglMakeCurrent(_this->egl_data->egl_display,
+            egl_surface, egl_surface, egl_context)) {
+            return SDL_SetError("Unable to make EGL context current");
+        }
+    }
+      
+    return 0;
+}
+
+int
+SDL_EGL_SetSwapInterval(_THIS, int interval)
+{
+    EGLBoolean status;
+    
+    if (!_this->egl_data) {
+        return SDL_SetError("EGL not initialized");
+    }
+    
+    status = _this->egl_data->eglSwapInterval(_this->egl_data->egl_display, interval);
+    if (status == EGL_TRUE) {
+        _this->egl_data->egl_swapinterval = interval;
+        return 0;
+    }
+    
+    return SDL_SetError("Unable to set the EGL swap interval");
+}
+
+int
+SDL_EGL_GetSwapInterval(_THIS)
+{
+    if (!_this->egl_data) {
+        return SDL_SetError("EGL not initialized");
+    }
+    
+    return _this->egl_data->egl_swapinterval;
+}
+
+void
+SDL_EGL_SwapBuffers(_THIS, EGLSurface egl_surface)
+{
+    _this->egl_data->eglSwapBuffers(_this->egl_data->egl_display, egl_surface);
+}
+
+void
+SDL_EGL_DeleteContext(_THIS, SDL_GLContext context)
+{
+    EGLContext egl_context = (EGLContext) context;
+
+    /* Clean up GLES and EGL */
+    if (!_this->egl_data) {
+        return;
+    }
+    
+    if (egl_context != NULL && egl_context != EGL_NO_CONTEXT) {
+        SDL_EGL_MakeCurrent(_this, NULL, NULL);
+        _this->egl_data->eglDestroyContext(_this->egl_data->egl_display, egl_context);
+    }
+        
+}
+
+EGLSurface *
+SDL_EGL_CreateSurface(_THIS, NativeWindowType nw) 
+{
+    if (SDL_EGL_ChooseConfig(_this) != 0) {
+        return EGL_NO_SURFACE;
+    }
+    
+    return _this->egl_data->eglCreateWindowSurface(
+            _this->egl_data->egl_display,
+            _this->egl_data->egl_config,
+            nw, NULL);
+}
+
+void
+SDL_EGL_DestroySurface(_THIS, EGLSurface egl_surface) 
+{
+    if (!_this->egl_data) {
+        return;
+    }
+    
+    if (egl_surface != EGL_NO_SURFACE) {
+        _this->egl_data->eglDestroySurface(_this->egl_data->egl_display, egl_surface);
+    }
+}
+
+#endif /* SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
+    
diff --git a/Source/3rd Party/sdl/src/video/SDL_egl_c.h b/Source/3rd Party/sdl/src/video/SDL_egl_c.h
new file mode 100644
index 000000000..ef58b18e0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_egl_c.h	
@@ -0,0 +1,130 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_egl_h
+#define _SDL_egl_h
+
+#if SDL_VIDEO_OPENGL_EGL
+
+#include "SDL_egl.h"
+
+#include "SDL_sysvideo.h"
+
+typedef struct SDL_EGL_VideoData
+{
+    void *egl_dll_handle, *dll_handle;
+    EGLDisplay egl_display;
+    EGLConfig egl_config;
+    int egl_swapinterval;
+    
+    EGLDisplay(EGLAPIENTRY *eglGetDisplay) (NativeDisplayType display);
+    EGLBoolean(EGLAPIENTRY *eglInitialize) (EGLDisplay dpy, EGLint * major,
+                                EGLint * minor);
+    EGLBoolean(EGLAPIENTRY  *eglTerminate) (EGLDisplay dpy);
+    
+    void *(EGLAPIENTRY *eglGetProcAddress) (const char * procName);
+    
+    EGLBoolean(EGLAPIENTRY *eglChooseConfig) (EGLDisplay dpy,
+                                  const EGLint * attrib_list,
+                                  EGLConfig * configs,
+                                  EGLint config_size, EGLint * num_config);
+    
+    EGLContext(EGLAPIENTRY *eglCreateContext) (EGLDisplay dpy,
+                                   EGLConfig config,
+                                   EGLContext share_list,
+                                   const EGLint * attrib_list);
+    
+    EGLBoolean(EGLAPIENTRY *eglDestroyContext) (EGLDisplay dpy, EGLContext ctx);
+    
+    EGLSurface(EGLAPIENTRY *eglCreateWindowSurface) (EGLDisplay dpy,
+                                         EGLConfig config,
+                                         NativeWindowType window,
+                                         const EGLint * attrib_list);
+    EGLBoolean(EGLAPIENTRY *eglDestroySurface) (EGLDisplay dpy, EGLSurface surface);
+    
+    EGLBoolean(EGLAPIENTRY *eglMakeCurrent) (EGLDisplay dpy, EGLSurface draw,
+                                 EGLSurface read, EGLContext ctx);
+    
+    EGLBoolean(EGLAPIENTRY *eglSwapBuffers) (EGLDisplay dpy, EGLSurface draw);
+    
+    EGLBoolean(EGLAPIENTRY *eglSwapInterval) (EGLDisplay dpy, EGLint interval);
+    
+    const char *(EGLAPIENTRY *eglQueryString) (EGLDisplay dpy, EGLint name);
+    
+    EGLBoolean(EGLAPIENTRY  *eglGetConfigAttrib) (EGLDisplay dpy, EGLConfig config,
+                                     EGLint attribute, EGLint * value);
+    
+    EGLBoolean(EGLAPIENTRY *eglWaitNative) (EGLint  engine);
+
+    EGLBoolean(EGLAPIENTRY *eglWaitGL)(void);
+    
+    EGLBoolean(EGLAPIENTRY *eglBindAPI)(EGLenum);
+
+} SDL_EGL_VideoData;
+
+/* OpenGLES functions */
+extern int SDL_EGL_GetAttribute(_THIS, SDL_GLattr attrib, int *value);
+extern int SDL_EGL_LoadLibrary(_THIS, const char *path, NativeDisplayType native_display);
+extern void *SDL_EGL_GetProcAddress(_THIS, const char *proc);
+extern void SDL_EGL_UnloadLibrary(_THIS);
+extern int SDL_EGL_ChooseConfig(_THIS);
+extern int SDL_EGL_SetSwapInterval(_THIS, int interval);
+extern int SDL_EGL_GetSwapInterval(_THIS);
+extern void SDL_EGL_DeleteContext(_THIS, SDL_GLContext context);
+extern EGLSurface *SDL_EGL_CreateSurface(_THIS, NativeWindowType nw);
+extern void SDL_EGL_DestroySurface(_THIS, EGLSurface egl_surface);
+
+/* These need to be wrapped to get the surface for the window by the platform GLES implementation */
+extern SDL_GLContext SDL_EGL_CreateContext(_THIS, EGLSurface egl_surface);
+extern int SDL_EGL_MakeCurrent(_THIS, EGLSurface egl_surface, SDL_GLContext context);
+extern void SDL_EGL_SwapBuffers(_THIS, EGLSurface egl_surface);
+
+/* A few of useful macros */
+
+#define SDL_EGL_SwapWindow_impl(BACKEND) void \
+BACKEND ## _GLES_SwapWindow(_THIS, SDL_Window * window) \
+{\
+    SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);\
+}
+
+#define SDL_EGL_MakeCurrent_impl(BACKEND) int \
+BACKEND ## _GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) \
+{\
+    if (window && context) { \
+        return SDL_EGL_MakeCurrent(_this, ((SDL_WindowData *) window->driverdata)->egl_surface, context); \
+    }\
+    else {\
+        return SDL_EGL_MakeCurrent(_this, NULL, NULL);\
+    }\
+}
+
+#define SDL_EGL_CreateContext_impl(BACKEND) SDL_GLContext \
+BACKEND ## _GLES_CreateContext(_THIS, SDL_Window * window) \
+{\
+    return SDL_EGL_CreateContext(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);\
+}
+
+#endif /* SDL_VIDEO_OPENGL_EGL */
+
+#endif /* _SDL_egl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_fillrect.c b/Source/3rd Party/sdl/src/video/SDL_fillrect.c
new file mode 100644
index 000000000..2bf8a2918
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_fillrect.c	
@@ -0,0 +1,335 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+#include "SDL_blit.h"
+
+
+#ifdef __SSE__
+/* *INDENT-OFF* */
+
+#ifdef _MSC_VER
+#define SSE_BEGIN \
+    __m128 c128; \
+    c128.m128_u32[0] = color; \
+    c128.m128_u32[1] = color; \
+    c128.m128_u32[2] = color; \
+    c128.m128_u32[3] = color;
+#else
+#define SSE_BEGIN \
+    __m128 c128; \
+    DECLARE_ALIGNED(Uint32, cccc[4], 16); \
+    cccc[0] = color; \
+    cccc[1] = color; \
+    cccc[2] = color; \
+    cccc[3] = color; \
+    c128 = *(__m128 *)cccc;
+#endif
+
+#define SSE_WORK \
+    for (i = n / 64; i--;) { \
+        _mm_stream_ps((float *)(p+0), c128); \
+        _mm_stream_ps((float *)(p+16), c128); \
+        _mm_stream_ps((float *)(p+32), c128); \
+        _mm_stream_ps((float *)(p+48), c128); \
+        p += 64; \
+    }
+
+#define SSE_END
+
+#define DEFINE_SSE_FILLRECT(bpp, type) \
+static void \
+SDL_FillRect##bpp##SSE(Uint8 *pixels, int pitch, Uint32 color, int w, int h) \
+{ \
+    int i, n; \
+    Uint8 *p = NULL; \
+ \
+    SSE_BEGIN; \
+ \
+    while (h--) { \
+        n = w * bpp; \
+        p = pixels; \
+ \
+        if (n > 63) { \
+            int adjust = 16 - ((uintptr_t)p & 15); \
+            if (adjust < 16) { \
+                n -= adjust; \
+                adjust /= bpp; \
+                while (adjust--) { \
+                    *((type *)p) = (type)color; \
+                    p += bpp; \
+                } \
+            } \
+            SSE_WORK; \
+        } \
+        if (n & 63) { \
+            int remainder = (n & 63); \
+            remainder /= bpp; \
+            while (remainder--) { \
+                *((type *)p) = (type)color; \
+                p += bpp; \
+            } \
+        } \
+        pixels += pitch; \
+    } \
+ \
+    SSE_END; \
+}
+
+static void
+SDL_FillRect1SSE(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
+{
+    int i, n;
+    Uint8 *p = NULL;
+    
+    SSE_BEGIN;
+    while (h--) {
+        n = w;
+        p = pixels;
+
+        if (n > 63) {
+            int adjust = 16 - ((uintptr_t)p & 15);
+            if (adjust) {
+                n -= adjust;
+                SDL_memset(p, color, adjust);
+                p += adjust;
+            }
+            SSE_WORK;
+        }
+        if (n & 63) {
+            int remainder = (n & 63);
+            SDL_memset(p, color, remainder);
+            p += remainder;
+        }
+        pixels += pitch;
+    }
+
+    SSE_END;
+}
+/* DEFINE_SSE_FILLRECT(1, Uint8) */
+DEFINE_SSE_FILLRECT(2, Uint16)
+DEFINE_SSE_FILLRECT(4, Uint32)
+
+/* *INDENT-ON* */
+#endif /* __SSE__ */
+
+static void
+SDL_FillRect1(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
+{
+    int n;
+    Uint8 *p = NULL;
+    
+    while (h--) {
+        n = w;
+        p = pixels;
+
+        if (n > 3) {
+            switch ((uintptr_t) p & 3) {
+            case 1:
+                *p++ = (Uint8) color;
+                --n;
+            case 2:
+                *p++ = (Uint8) color;
+                --n;
+            case 3:
+                *p++ = (Uint8) color;
+                --n;
+            }
+            SDL_memset4(p, color, (n >> 2));
+        }
+        if (n & 3) {
+            p += (n & ~3);
+            switch (n & 3) {
+            case 3:
+                *p++ = (Uint8) color;
+            case 2:
+                *p++ = (Uint8) color;
+            case 1:
+                *p++ = (Uint8) color;
+            }
+        }
+        pixels += pitch;
+    }
+}
+
+static void
+SDL_FillRect2(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
+{
+    int n;
+    Uint16 *p = NULL;
+    
+    while (h--) {
+        n = w;
+        p = (Uint16 *) pixels;
+
+        if (n > 1) {
+            if ((uintptr_t) p & 2) {
+                *p++ = (Uint16) color;
+                --n;
+            }
+            SDL_memset4(p, color, (n >> 1));
+        }
+        if (n & 1) {
+            p[n - 1] = (Uint16) color;
+        }
+        pixels += pitch;
+    }
+}
+
+static void
+SDL_FillRect3(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
+{
+    Uint8 r = (Uint8) ((color >> 16) & 0xFF);
+    Uint8 g = (Uint8) ((color >> 8) & 0xFF);
+    Uint8 b = (Uint8) (color & 0xFF);
+    int n;
+    Uint8 *p = NULL;
+
+    while (h--) {
+        n = w;
+        p = pixels;
+
+        while (n--) {
+            *p++ = r;
+            *p++ = g;
+            *p++ = b;
+        }
+        pixels += pitch;
+    }
+}
+
+static void
+SDL_FillRect4(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
+{
+    while (h--) {
+        SDL_memset4(pixels, color, w);
+        pixels += pitch;
+    }
+}
+
+/* 
+ * This function performs a fast fill of the given rectangle with 'color'
+ */
+int
+SDL_FillRect(SDL_Surface * dst, const SDL_Rect * rect, Uint32 color)
+{
+    SDL_Rect clipped;
+    Uint8 *pixels;
+
+    if (!dst) {
+        return SDL_SetError("Passed NULL destination surface");
+    }
+
+    /* This function doesn't work on surfaces < 8 bpp */
+    if (dst->format->BitsPerPixel < 8) {
+        return SDL_SetError("SDL_FillRect(): Unsupported surface format");
+    }
+
+    /* If 'rect' == NULL, then fill the whole surface */
+    if (rect) {
+        /* Perform clipping */
+        if (!SDL_IntersectRect(rect, &dst->clip_rect, &clipped)) {
+            return 0;
+        }
+        rect = &clipped;
+    } else {
+        rect = &dst->clip_rect;
+    }
+
+    /* Perform software fill */
+    if (!dst->pixels) {
+        return SDL_SetError("SDL_FillRect(): You must lock the surface");
+    }
+
+    pixels = (Uint8 *) dst->pixels + rect->y * dst->pitch +
+                                     rect->x * dst->format->BytesPerPixel;
+
+    switch (dst->format->BytesPerPixel) {
+    case 1:
+        {
+            color |= (color << 8);
+            color |= (color << 16);
+#ifdef __SSE__
+            if (SDL_HasSSE()) {
+                SDL_FillRect1SSE(pixels, dst->pitch, color, rect->w, rect->h);
+                break;
+            }
+#endif
+            SDL_FillRect1(pixels, dst->pitch, color, rect->w, rect->h);
+            break;
+        }
+
+    case 2:
+        {
+            color |= (color << 16);
+#ifdef __SSE__
+            if (SDL_HasSSE()) {
+                SDL_FillRect2SSE(pixels, dst->pitch, color, rect->w, rect->h);
+                break;
+            }
+#endif
+            SDL_FillRect2(pixels, dst->pitch, color, rect->w, rect->h);
+            break;
+        }
+
+    case 3:
+        /* 24-bit RGB is a slow path, at least for now. */
+        {
+            SDL_FillRect3(pixels, dst->pitch, color, rect->w, rect->h);
+            break;
+        }
+
+    case 4:
+        {
+#ifdef __SSE__
+            if (SDL_HasSSE()) {
+                SDL_FillRect4SSE(pixels, dst->pitch, color, rect->w, rect->h);
+                break;
+            }
+#endif
+            SDL_FillRect4(pixels, dst->pitch, color, rect->w, rect->h);
+            break;
+        }
+    }
+
+    /* We're done! */
+    return 0;
+}
+
+int
+SDL_FillRects(SDL_Surface * dst, const SDL_Rect * rects, int count,
+              Uint32 color)
+{
+    int i;
+    int status = 0;
+
+    if (!rects) {
+        return SDL_SetError("SDL_FillRects() passed NULL rects");
+    }
+
+    for (i = 0; i < count; ++i) {
+        status += SDL_FillRect(dst, &rects[i], color);
+    }
+    return status;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_pixels.c b/Source/3rd Party/sdl/src/video/SDL_pixels.c
new file mode 100644
index 000000000..9eb507e13
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_pixels.c	
@@ -0,0 +1,1127 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* General (mostly internal) pixel/color manipulation routines for SDL */
+
+#include "SDL_endian.h"
+#include "SDL_video.h"
+#include "SDL_sysvideo.h"
+#include "SDL_blit.h"
+#include "SDL_pixels_c.h"
+#include "SDL_RLEaccel_c.h"
+
+
+/* Lookup tables to expand partial bytes to the full 0..255 range */
+
+static Uint8 lookup_0[] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
+};
+
+static Uint8 lookup_1[] = {
+0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, 140, 142, 144, 146, 148, 150, 152, 154, 156, 158, 160, 162, 164, 166, 168, 170, 172, 174, 176, 178, 180, 182, 184, 186, 188, 190, 192, 194, 196, 198, 200, 202, 204, 206, 208, 210, 212, 214, 216, 218, 220, 222, 224, 226, 228, 230, 232, 234, 236, 238, 240, 242, 244, 246, 248, 250, 252, 255
+};
+
+static Uint8 lookup_2[] = {
+0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 60, 64, 68, 72, 76, 80, 85, 89, 93, 97, 101, 105, 109, 113, 117, 121, 125, 129, 133, 137, 141, 145, 149, 153, 157, 161, 165, 170, 174, 178, 182, 186, 190, 194, 198, 202, 206, 210, 214, 218, 222, 226, 230, 234, 238, 242, 246, 250, 255
+};
+
+static Uint8 lookup_3[] = {
+0, 8, 16, 24, 32, 41, 49, 57, 65, 74, 82, 90, 98, 106, 115, 123, 131, 139, 148, 156, 164, 172, 180, 189, 197, 205, 213, 222, 230, 238, 246, 255
+};
+
+static Uint8 lookup_4[] = {
+0, 17, 34, 51, 68, 85, 102, 119, 136, 153, 170, 187, 204, 221, 238, 255
+};
+
+static Uint8 lookup_5[] = {
+0, 36, 72, 109, 145, 182, 218, 255
+};
+
+static Uint8 lookup_6[] = {
+0, 85, 170, 255
+};
+
+static Uint8 lookup_7[] = {
+0, 255
+};
+
+static Uint8 lookup_8[] = {
+255
+};
+
+Uint8* SDL_expand_byte[9] = {
+    lookup_0,
+    lookup_1,
+    lookup_2,
+    lookup_3,
+    lookup_4,
+    lookup_5,
+    lookup_6,
+    lookup_7,
+    lookup_8
+};
+
+/* Helper functions */
+
+const char*
+SDL_GetPixelFormatName(Uint32 format)
+{
+    switch (format) {
+#define CASE(X) case X: return #X;
+    CASE(SDL_PIXELFORMAT_INDEX1LSB)
+    CASE(SDL_PIXELFORMAT_INDEX1MSB)
+    CASE(SDL_PIXELFORMAT_INDEX4LSB)
+    CASE(SDL_PIXELFORMAT_INDEX4MSB)
+    CASE(SDL_PIXELFORMAT_INDEX8)
+    CASE(SDL_PIXELFORMAT_RGB332)
+    CASE(SDL_PIXELFORMAT_RGB444)
+    CASE(SDL_PIXELFORMAT_RGB555)
+    CASE(SDL_PIXELFORMAT_BGR555)
+    CASE(SDL_PIXELFORMAT_ARGB4444)
+    CASE(SDL_PIXELFORMAT_RGBA4444)
+    CASE(SDL_PIXELFORMAT_ABGR4444)
+    CASE(SDL_PIXELFORMAT_BGRA4444)
+    CASE(SDL_PIXELFORMAT_ARGB1555)
+    CASE(SDL_PIXELFORMAT_RGBA5551)
+    CASE(SDL_PIXELFORMAT_ABGR1555)
+    CASE(SDL_PIXELFORMAT_BGRA5551)
+    CASE(SDL_PIXELFORMAT_RGB565)
+    CASE(SDL_PIXELFORMAT_BGR565)
+    CASE(SDL_PIXELFORMAT_RGB24)
+    CASE(SDL_PIXELFORMAT_BGR24)
+    CASE(SDL_PIXELFORMAT_RGB888)
+    CASE(SDL_PIXELFORMAT_RGBX8888)
+    CASE(SDL_PIXELFORMAT_BGR888)
+    CASE(SDL_PIXELFORMAT_BGRX8888)
+    CASE(SDL_PIXELFORMAT_ARGB8888)
+    CASE(SDL_PIXELFORMAT_RGBA8888)
+    CASE(SDL_PIXELFORMAT_ABGR8888)
+    CASE(SDL_PIXELFORMAT_BGRA8888)
+    CASE(SDL_PIXELFORMAT_ARGB2101010)
+    CASE(SDL_PIXELFORMAT_YV12)
+    CASE(SDL_PIXELFORMAT_IYUV)
+    CASE(SDL_PIXELFORMAT_YUY2)
+    CASE(SDL_PIXELFORMAT_UYVY)
+    CASE(SDL_PIXELFORMAT_YVYU)
+#undef CASE
+    default:
+        return "SDL_PIXELFORMAT_UNKNOWN";
+    }
+}
+
+SDL_bool
+SDL_PixelFormatEnumToMasks(Uint32 format, int *bpp, Uint32 * Rmask,
+                           Uint32 * Gmask, Uint32 * Bmask, Uint32 * Amask)
+{
+    Uint32 masks[4];
+
+    /* This function doesn't work with FourCC pixel formats */
+    if (SDL_ISPIXELFORMAT_FOURCC(format)) {
+        SDL_SetError("FOURCC pixel formats are not supported");
+        return SDL_FALSE;
+    }
+
+    /* Initialize the values here */
+    if (SDL_BYTESPERPIXEL(format) <= 2) {
+        *bpp = SDL_BITSPERPIXEL(format);
+    } else {
+        *bpp = SDL_BYTESPERPIXEL(format) * 8;
+    }
+    *Rmask = *Gmask = *Bmask = *Amask = 0;
+
+    if (format == SDL_PIXELFORMAT_RGB24) {
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+        *Rmask = 0x00FF0000;
+        *Gmask = 0x0000FF00;
+        *Bmask = 0x000000FF;
+#else
+        *Rmask = 0x000000FF;
+        *Gmask = 0x0000FF00;
+        *Bmask = 0x00FF0000;
+#endif
+        return SDL_TRUE;
+    }
+
+    if (format == SDL_PIXELFORMAT_BGR24) {
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+        *Rmask = 0x000000FF;
+        *Gmask = 0x0000FF00;
+        *Bmask = 0x00FF0000;
+#else
+        *Rmask = 0x00FF0000;
+        *Gmask = 0x0000FF00;
+        *Bmask = 0x000000FF;
+#endif
+        return SDL_TRUE;
+    }
+
+    if (SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED8 &&
+        SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED16 &&
+        SDL_PIXELTYPE(format) != SDL_PIXELTYPE_PACKED32) {
+        /* Not a format that uses masks */
+        return SDL_TRUE;
+    }
+
+    switch (SDL_PIXELLAYOUT(format)) {
+    case SDL_PACKEDLAYOUT_332:
+        masks[0] = 0x00000000;
+        masks[1] = 0x000000E0;
+        masks[2] = 0x0000001C;
+        masks[3] = 0x00000003;
+        break;
+    case SDL_PACKEDLAYOUT_4444:
+        masks[0] = 0x0000F000;
+        masks[1] = 0x00000F00;
+        masks[2] = 0x000000F0;
+        masks[3] = 0x0000000F;
+        break;
+    case SDL_PACKEDLAYOUT_1555:
+        masks[0] = 0x00008000;
+        masks[1] = 0x00007C00;
+        masks[2] = 0x000003E0;
+        masks[3] = 0x0000001F;
+        break;
+    case SDL_PACKEDLAYOUT_5551:
+        masks[0] = 0x0000F800;
+        masks[1] = 0x000007C0;
+        masks[2] = 0x0000003E;
+        masks[3] = 0x00000001;
+        break;
+    case SDL_PACKEDLAYOUT_565:
+        masks[0] = 0x00000000;
+        masks[1] = 0x0000F800;
+        masks[2] = 0x000007E0;
+        masks[3] = 0x0000001F;
+        break;
+    case SDL_PACKEDLAYOUT_8888:
+        masks[0] = 0xFF000000;
+        masks[1] = 0x00FF0000;
+        masks[2] = 0x0000FF00;
+        masks[3] = 0x000000FF;
+        break;
+    case SDL_PACKEDLAYOUT_2101010:
+        masks[0] = 0xC0000000;
+        masks[1] = 0x3FF00000;
+        masks[2] = 0x000FFC00;
+        masks[3] = 0x000003FF;
+        break;
+    case SDL_PACKEDLAYOUT_1010102:
+        masks[0] = 0xFFC00000;
+        masks[1] = 0x003FF000;
+        masks[2] = 0x00000FFC;
+        masks[3] = 0x00000003;
+        break;
+    default:
+        SDL_SetError("Unknown pixel format");
+        return SDL_FALSE;
+    }
+
+    switch (SDL_PIXELORDER(format)) {
+    case SDL_PACKEDORDER_XRGB:
+        *Rmask = masks[1];
+        *Gmask = masks[2];
+        *Bmask = masks[3];
+        break;
+    case SDL_PACKEDORDER_RGBX:
+        *Rmask = masks[0];
+        *Gmask = masks[1];
+        *Bmask = masks[2];
+        break;
+    case SDL_PACKEDORDER_ARGB:
+        *Amask = masks[0];
+        *Rmask = masks[1];
+        *Gmask = masks[2];
+        *Bmask = masks[3];
+        break;
+    case SDL_PACKEDORDER_RGBA:
+        *Rmask = masks[0];
+        *Gmask = masks[1];
+        *Bmask = masks[2];
+        *Amask = masks[3];
+        break;
+    case SDL_PACKEDORDER_XBGR:
+        *Bmask = masks[1];
+        *Gmask = masks[2];
+        *Rmask = masks[3];
+        break;
+    case SDL_PACKEDORDER_BGRX:
+        *Bmask = masks[0];
+        *Gmask = masks[1];
+        *Rmask = masks[2];
+        break;
+    case SDL_PACKEDORDER_BGRA:
+        *Bmask = masks[0];
+        *Gmask = masks[1];
+        *Rmask = masks[2];
+        *Amask = masks[3];
+        break;
+    case SDL_PACKEDORDER_ABGR:
+        *Amask = masks[0];
+        *Bmask = masks[1];
+        *Gmask = masks[2];
+        *Rmask = masks[3];
+        break;
+    default:
+        SDL_SetError("Unknown pixel format");
+        return SDL_FALSE;
+    }
+    return SDL_TRUE;
+}
+
+Uint32
+SDL_MasksToPixelFormatEnum(int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask,
+                           Uint32 Amask)
+{
+    switch (bpp) {
+    case 1:
+        /* SDL defaults to MSB ordering */
+        return SDL_PIXELFORMAT_INDEX1MSB;
+    case 4:
+        /* SDL defaults to MSB ordering */
+        return SDL_PIXELFORMAT_INDEX4MSB;
+    case 8:
+        if (Rmask == 0) {
+            return SDL_PIXELFORMAT_INDEX8;
+        }
+        if (Rmask == 0xE0 &&
+            Gmask == 0x1C &&
+            Bmask == 0x03 &&
+            Amask == 0x00) {
+            return SDL_PIXELFORMAT_RGB332;
+        }
+        break;
+    case 12:
+        if (Rmask == 0) {
+            return SDL_PIXELFORMAT_RGB444;
+        }
+        if (Rmask == 0x0F00 &&
+            Gmask == 0x00F0 &&
+            Bmask == 0x000F &&
+            Amask == 0x0000) {
+            return SDL_PIXELFORMAT_RGB444;
+        }
+        break;
+    case 15:
+        if (Rmask == 0) {
+            return SDL_PIXELFORMAT_RGB555;
+        }
+        /* Fall through to 16-bit checks */
+    case 16:
+        if (Rmask == 0) {
+            return SDL_PIXELFORMAT_RGB565;
+        }
+        if (Rmask == 0x7C00 &&
+            Gmask == 0x03E0 &&
+            Bmask == 0x001F &&
+            Amask == 0x0000) {
+            return SDL_PIXELFORMAT_RGB555;
+        }
+        if (Rmask == 0x001F &&
+            Gmask == 0x03E0 &&
+            Bmask == 0x7C00 &&
+            Amask == 0x0000) {
+            return SDL_PIXELFORMAT_BGR555;
+        }
+        if (Rmask == 0x0F00 &&
+            Gmask == 0x00F0 &&
+            Bmask == 0x000F &&
+            Amask == 0xF000) {
+            return SDL_PIXELFORMAT_ARGB4444;
+        }
+        if (Rmask == 0xF000 &&
+            Gmask == 0x0F00 &&
+            Bmask == 0x00F0 &&
+            Amask == 0x000F) {
+            return SDL_PIXELFORMAT_RGBA4444;
+        }
+        if (Rmask == 0x000F &&
+            Gmask == 0x00F0 &&
+            Bmask == 0x0F00 &&
+            Amask == 0xF000) {
+            return SDL_PIXELFORMAT_ABGR4444;
+        }
+        if (Rmask == 0x00F0 &&
+            Gmask == 0x0F00 &&
+            Bmask == 0xF000 &&
+            Amask == 0x000F) {
+            return SDL_PIXELFORMAT_BGRA4444;
+        }
+        if (Rmask == 0x7C00 &&
+            Gmask == 0x03E0 &&
+            Bmask == 0x001F &&
+            Amask == 0x8000) {
+            return SDL_PIXELFORMAT_ARGB1555;
+        }
+        if (Rmask == 0xF800 &&
+            Gmask == 0x07C0 &&
+            Bmask == 0x003E &&
+            Amask == 0x0001) {
+            return SDL_PIXELFORMAT_RGBA5551;
+        }
+        if (Rmask == 0x001F &&
+            Gmask == 0x03E0 &&
+            Bmask == 0x7C00 &&
+            Amask == 0x8000) {
+            return SDL_PIXELFORMAT_ABGR1555;
+        }
+        if (Rmask == 0x003E &&
+            Gmask == 0x07C0 &&
+            Bmask == 0xF800 &&
+            Amask == 0x0001) {
+            return SDL_PIXELFORMAT_BGRA5551;
+        }
+        if (Rmask == 0xF800 &&
+            Gmask == 0x07E0 &&
+            Bmask == 0x001F &&
+            Amask == 0x0000) {
+            return SDL_PIXELFORMAT_RGB565;
+        }
+        if (Rmask == 0x001F &&
+            Gmask == 0x07E0 &&
+            Bmask == 0xF800 &&
+            Amask == 0x0000) {
+            return SDL_PIXELFORMAT_BGR565;
+        }
+        break;
+    case 24:
+        switch (Rmask) {
+        case 0:
+        case 0x00FF0000:
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+            return SDL_PIXELFORMAT_RGB24;
+#else
+            return SDL_PIXELFORMAT_BGR24;
+#endif
+        case 0x000000FF:
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+            return SDL_PIXELFORMAT_BGR24;
+#else
+            return SDL_PIXELFORMAT_RGB24;
+#endif
+        }
+    case 32:
+        if (Rmask == 0) {
+            return SDL_PIXELFORMAT_RGB888;
+        }
+        if (Rmask == 0x00FF0000 &&
+            Gmask == 0x0000FF00 &&
+            Bmask == 0x000000FF &&
+            Amask == 0x00000000) {
+            return SDL_PIXELFORMAT_RGB888;
+        }
+        if (Rmask == 0xFF000000 &&
+            Gmask == 0x00FF0000 &&
+            Bmask == 0x0000FF00 &&
+            Amask == 0x00000000) {
+            return SDL_PIXELFORMAT_RGBX8888;
+        }
+        if (Rmask == 0x000000FF &&
+            Gmask == 0x0000FF00 &&
+            Bmask == 0x00FF0000 &&
+            Amask == 0x00000000) {
+            return SDL_PIXELFORMAT_BGR888;
+        }
+        if (Rmask == 0x0000FF00 &&
+            Gmask == 0x00FF0000 &&
+            Bmask == 0xFF000000 &&
+            Amask == 0x00000000) {
+            return SDL_PIXELFORMAT_BGRX8888;
+        }
+        if (Rmask == 0x00FF0000 &&
+            Gmask == 0x0000FF00 &&
+            Bmask == 0x000000FF &&
+            Amask == 0xFF000000) {
+            return SDL_PIXELFORMAT_ARGB8888;
+        }
+        if (Rmask == 0xFF000000 &&
+            Gmask == 0x00FF0000 &&
+            Bmask == 0x0000FF00 &&
+            Amask == 0x000000FF) {
+            return SDL_PIXELFORMAT_RGBA8888;
+        }
+        if (Rmask == 0x000000FF &&
+            Gmask == 0x0000FF00 &&
+            Bmask == 0x00FF0000 &&
+            Amask == 0xFF000000) {
+            return SDL_PIXELFORMAT_ABGR8888;
+        }
+        if (Rmask == 0x0000FF00 &&
+            Gmask == 0x00FF0000 &&
+            Bmask == 0xFF000000 &&
+            Amask == 0x000000FF) {
+            return SDL_PIXELFORMAT_BGRA8888;
+        }
+        if (Rmask == 0x3FF00000 &&
+            Gmask == 0x000FFC00 &&
+            Bmask == 0x000003FF &&
+            Amask == 0xC0000000) {
+            return SDL_PIXELFORMAT_ARGB2101010;
+        }
+    }
+    return SDL_PIXELFORMAT_UNKNOWN;
+}
+
+static SDL_PixelFormat *formats;
+
+SDL_PixelFormat *
+SDL_AllocFormat(Uint32 pixel_format)
+{
+    SDL_PixelFormat *format;
+
+    /* Look it up in our list of previously allocated formats */
+    for (format = formats; format; format = format->next) {
+        if (pixel_format == format->format) {
+            ++format->refcount;
+            return format;
+        }
+    }
+
+    /* Allocate an empty pixel format structure, and initialize it */
+    format = SDL_malloc(sizeof(*format));
+    if (format == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    if (SDL_InitFormat(format, pixel_format) < 0) {
+        SDL_free(format);
+        SDL_InvalidParamError("format");
+        return NULL;
+    }
+
+    if (!SDL_ISPIXELFORMAT_INDEXED(pixel_format)) {
+        /* Cache the RGB formats */
+        format->next = formats;
+        formats = format;
+    }
+    return format;
+}
+
+int
+SDL_InitFormat(SDL_PixelFormat * format, Uint32 pixel_format)
+{
+    int bpp;
+    Uint32 Rmask, Gmask, Bmask, Amask;
+    Uint32 mask;
+
+    if (!SDL_PixelFormatEnumToMasks(pixel_format, &bpp,
+                                    &Rmask, &Gmask, &Bmask, &Amask)) {
+        return -1;
+    }
+
+    /* Set up the format */
+    SDL_zerop(format);
+    format->format = pixel_format;
+    format->BitsPerPixel = bpp;
+    format->BytesPerPixel = (bpp + 7) / 8;
+
+    format->Rmask = Rmask;
+    format->Rshift = 0;
+    format->Rloss = 8;
+    if (Rmask) {
+        for (mask = Rmask; !(mask & 0x01); mask >>= 1)
+            ++format->Rshift;
+        for (; (mask & 0x01); mask >>= 1)
+            --format->Rloss;
+    }
+
+    format->Gmask = Gmask;
+    format->Gshift = 0;
+    format->Gloss = 8;
+    if (Gmask) {
+        for (mask = Gmask; !(mask & 0x01); mask >>= 1)
+            ++format->Gshift;
+        for (; (mask & 0x01); mask >>= 1)
+            --format->Gloss;
+    }
+
+    format->Bmask = Bmask;
+    format->Bshift = 0;
+    format->Bloss = 8;
+    if (Bmask) {
+        for (mask = Bmask; !(mask & 0x01); mask >>= 1)
+            ++format->Bshift;
+        for (; (mask & 0x01); mask >>= 1)
+            --format->Bloss;
+    }
+
+    format->Amask = Amask;
+    format->Ashift = 0;
+    format->Aloss = 8;
+    if (Amask) {
+        for (mask = Amask; !(mask & 0x01); mask >>= 1)
+            ++format->Ashift;
+        for (; (mask & 0x01); mask >>= 1)
+            --format->Aloss;
+    }
+
+    format->palette = NULL;
+    format->refcount = 1;
+    format->next = NULL;
+
+    return 0;
+}
+
+void
+SDL_FreeFormat(SDL_PixelFormat *format)
+{
+    SDL_PixelFormat *prev;
+
+    if (!format) {
+        SDL_InvalidParamError("format");
+        return;
+    }
+    if (--format->refcount > 0) {
+        return;
+    }
+
+    /* Remove this format from our list */
+    if (format == formats) {
+        formats = format->next;
+    } else if (formats) {
+        for (prev = formats; prev->next; prev = prev->next) {
+            if (prev->next == format) {
+                prev->next = format->next;
+                break;
+            }
+        }
+    }
+
+    if (format->palette) {
+        SDL_FreePalette(format->palette);
+    }
+    SDL_free(format);
+}
+
+SDL_Palette *
+SDL_AllocPalette(int ncolors)
+{
+    SDL_Palette *palette;
+
+    /* Input validation */
+    if (ncolors < 1) {
+      SDL_InvalidParamError("ncolors");
+      return NULL;
+    }
+
+    palette = (SDL_Palette *) SDL_malloc(sizeof(*palette));
+    if (!palette) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    palette->colors =
+        (SDL_Color *) SDL_malloc(ncolors * sizeof(*palette->colors));
+    if (!palette->colors) {
+        SDL_free(palette);
+        return NULL;
+    }
+    palette->ncolors = ncolors;
+    palette->version = 1;
+    palette->refcount = 1;
+
+    SDL_memset(palette->colors, 0xFF, ncolors * sizeof(*palette->colors));
+
+    return palette;
+}
+
+int
+SDL_SetPixelFormatPalette(SDL_PixelFormat * format, SDL_Palette *palette)
+{
+    if (!format) {
+        return SDL_SetError("SDL_SetPixelFormatPalette() passed NULL format");
+    }
+
+    if (palette && palette->ncolors != (1 << format->BitsPerPixel)) {
+        return SDL_SetError("SDL_SetPixelFormatPalette() passed a palette that doesn't match the format");
+    }
+
+    if (format->palette == palette) {
+        return 0;
+    }
+
+    if (format->palette) {
+        SDL_FreePalette(format->palette);
+    }
+
+    format->palette = palette;
+
+    if (format->palette) {
+        ++format->palette->refcount;
+    }
+
+    return 0;
+}
+
+int
+SDL_SetPaletteColors(SDL_Palette * palette, const SDL_Color * colors,
+                     int firstcolor, int ncolors)
+{
+    int status = 0;
+
+    /* Verify the parameters */
+    if (!palette) {
+        return -1;
+    }
+    if (ncolors > (palette->ncolors - firstcolor)) {
+        ncolors = (palette->ncolors - firstcolor);
+        status = -1;
+    }
+
+    if (colors != (palette->colors + firstcolor)) {
+        SDL_memcpy(palette->colors + firstcolor, colors,
+                   ncolors * sizeof(*colors));
+    }
+    ++palette->version;
+    if (!palette->version) {
+        palette->version = 1;
+    }
+
+    return status;
+}
+
+void
+SDL_FreePalette(SDL_Palette * palette)
+{
+    if (!palette) {
+        SDL_InvalidParamError("palette");
+        return;
+    }
+    if (--palette->refcount > 0) {
+        return;
+    }
+    SDL_free(palette->colors);
+    SDL_free(palette);
+}
+
+/*
+ * Calculate an 8-bit (3 red, 3 green, 2 blue) dithered palette of colors
+ */
+void
+SDL_DitherColors(SDL_Color * colors, int bpp)
+{
+    int i;
+    if (bpp != 8)
+        return;                 /* only 8bpp supported right now */
+
+    for (i = 0; i < 256; i++) {
+        int r, g, b;
+        /* map each bit field to the full [0, 255] interval,
+           so 0 is mapped to (0, 0, 0) and 255 to (255, 255, 255) */
+        r = i & 0xe0;
+        r |= r >> 3 | r >> 6;
+        colors[i].r = r;
+        g = (i << 3) & 0xe0;
+        g |= g >> 3 | g >> 6;
+        colors[i].g = g;
+        b = i & 0x3;
+        b |= b << 2;
+        b |= b << 4;
+        colors[i].b = b;
+        colors[i].a = SDL_ALPHA_OPAQUE;
+    }
+}
+
+/*
+ * Calculate the pad-aligned scanline width of a surface
+ */
+int
+SDL_CalculatePitch(SDL_Surface * surface)
+{
+    int pitch;
+
+    /* Surface should be 4-byte aligned for speed */
+    pitch = surface->w * surface->format->BytesPerPixel;
+    switch (surface->format->BitsPerPixel) {
+    case 1:
+        pitch = (pitch + 7) / 8;
+        break;
+    case 4:
+        pitch = (pitch + 1) / 2;
+        break;
+    default:
+        break;
+    }
+    pitch = (pitch + 3) & ~3;   /* 4-byte aligning */
+    return (pitch);
+}
+
+/*
+ * Match an RGB value to a particular palette index
+ */
+Uint8
+SDL_FindColor(SDL_Palette * pal, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
+{
+    /* Do colorspace distance matching */
+    unsigned int smallest;
+    unsigned int distance;
+    int rd, gd, bd, ad;
+    int i;
+    Uint8 pixel = 0;
+
+    smallest = ~0;
+    for (i = 0; i < pal->ncolors; ++i) {
+        rd = pal->colors[i].r - r;
+        gd = pal->colors[i].g - g;
+        bd = pal->colors[i].b - b;
+        ad = pal->colors[i].a - a;
+        distance = (rd * rd) + (gd * gd) + (bd * bd) + (ad * ad);
+        if (distance < smallest) {
+            pixel = i;
+            if (distance == 0) {        /* Perfect match! */
+                break;
+            }
+            smallest = distance;
+        }
+    }
+    return (pixel);
+}
+
+/* Find the opaque pixel value corresponding to an RGB triple */
+Uint32
+SDL_MapRGB(const SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b)
+{
+    if (format->palette == NULL) {
+        return (r >> format->Rloss) << format->Rshift
+            | (g >> format->Gloss) << format->Gshift
+            | (b >> format->Bloss) << format->Bshift | format->Amask;
+    } else {
+        return SDL_FindColor(format->palette, r, g, b, SDL_ALPHA_OPAQUE);
+    }
+}
+
+/* Find the pixel value corresponding to an RGBA quadruple */
+Uint32
+SDL_MapRGBA(const SDL_PixelFormat * format, Uint8 r, Uint8 g, Uint8 b,
+            Uint8 a)
+{
+    if (format->palette == NULL) {
+        return (r >> format->Rloss) << format->Rshift
+            | (g >> format->Gloss) << format->Gshift
+            | (b >> format->Bloss) << format->Bshift
+            | ((a >> format->Aloss) << format->Ashift & format->Amask);
+    } else {
+        return SDL_FindColor(format->palette, r, g, b, a);
+    }
+}
+
+void
+SDL_GetRGB(Uint32 pixel, const SDL_PixelFormat * format, Uint8 * r, Uint8 * g,
+           Uint8 * b)
+{
+    if (format->palette == NULL) {
+        unsigned v;
+        v = (pixel & format->Rmask) >> format->Rshift;
+        *r = SDL_expand_byte[format->Rloss][v];
+        v = (pixel & format->Gmask) >> format->Gshift;
+        *g = SDL_expand_byte[format->Gloss][v];
+        v = (pixel & format->Bmask) >> format->Bshift;
+        *b = SDL_expand_byte[format->Bloss][v];
+    } else {
+        if (pixel < (unsigned)format->palette->ncolors) {
+            *r = format->palette->colors[pixel].r;
+            *g = format->palette->colors[pixel].g;
+            *b = format->palette->colors[pixel].b;
+        } else {
+            *r = *g = *b = 0;
+        }
+    }
+}
+
+void
+SDL_GetRGBA(Uint32 pixel, const SDL_PixelFormat * format,
+            Uint8 * r, Uint8 * g, Uint8 * b, Uint8 * a)
+{
+    if (format->palette == NULL) {
+        unsigned v;
+        v = (pixel & format->Rmask) >> format->Rshift;
+        *r = SDL_expand_byte[format->Rloss][v];
+        v = (pixel & format->Gmask) >> format->Gshift;
+        *g = SDL_expand_byte[format->Gloss][v];
+        v = (pixel & format->Bmask) >> format->Bshift;
+        *b = SDL_expand_byte[format->Bloss][v];
+        v = (pixel & format->Amask) >> format->Ashift;
+        *a = SDL_expand_byte[format->Aloss][v];
+    } else {
+        if (pixel < (unsigned)format->palette->ncolors) {
+            *r = format->palette->colors[pixel].r;
+            *g = format->palette->colors[pixel].g;
+            *b = format->palette->colors[pixel].b;
+            *a = format->palette->colors[pixel].a;
+        } else {
+            *r = *g = *b = *a = 0;
+        }
+    }
+}
+
+/* Map from Palette to Palette */
+static Uint8 *
+Map1to1(SDL_Palette * src, SDL_Palette * dst, int *identical)
+{
+    Uint8 *map;
+    int i;
+
+    if (identical) {
+        if (src->ncolors <= dst->ncolors) {
+            /* If an identical palette, no need to map */
+            if (src == dst
+                ||
+                (SDL_memcmp
+                 (src->colors, dst->colors,
+                  src->ncolors * sizeof(SDL_Color)) == 0)) {
+                *identical = 1;
+                return (NULL);
+            }
+        }
+        *identical = 0;
+    }
+    map = (Uint8 *) SDL_malloc(src->ncolors);
+    if (map == NULL) {
+        SDL_OutOfMemory();
+        return (NULL);
+    }
+    for (i = 0; i < src->ncolors; ++i) {
+        map[i] = SDL_FindColor(dst,
+                               src->colors[i].r, src->colors[i].g,
+                               src->colors[i].b, src->colors[i].a);
+    }
+    return (map);
+}
+
+/* Map from Palette to BitField */
+static Uint8 *
+Map1toN(SDL_PixelFormat * src, Uint8 Rmod, Uint8 Gmod, Uint8 Bmod, Uint8 Amod,
+        SDL_PixelFormat * dst)
+{
+    Uint8 *map;
+    int i;
+    int bpp;
+    SDL_Palette *pal = src->palette;
+
+    bpp = ((dst->BytesPerPixel == 3) ? 4 : dst->BytesPerPixel);
+    map = (Uint8 *) SDL_malloc(pal->ncolors * bpp);
+    if (map == NULL) {
+        SDL_OutOfMemory();
+        return (NULL);
+    }
+
+    /* We memory copy to the pixel map so the endianness is preserved */
+    for (i = 0; i < pal->ncolors; ++i) {
+        Uint8 R = (Uint8) ((pal->colors[i].r * Rmod) / 255);
+        Uint8 G = (Uint8) ((pal->colors[i].g * Gmod) / 255);
+        Uint8 B = (Uint8) ((pal->colors[i].b * Bmod) / 255);
+        Uint8 A = (Uint8) ((pal->colors[i].a * Amod) / 255);
+        ASSEMBLE_RGBA(&map[i * bpp], dst->BytesPerPixel, dst, R, G, B, A);
+    }
+    return (map);
+}
+
+/* Map from BitField to Dithered-Palette to Palette */
+static Uint8 *
+MapNto1(SDL_PixelFormat * src, SDL_PixelFormat * dst, int *identical)
+{
+    /* Generate a 256 color dither palette */
+    SDL_Palette dithered;
+    SDL_Color colors[256];
+    SDL_Palette *pal = dst->palette;
+
+    dithered.ncolors = 256;
+    SDL_DitherColors(colors, 8);
+    dithered.colors = colors;
+    return (Map1to1(&dithered, pal, identical));
+}
+
+SDL_BlitMap *
+SDL_AllocBlitMap(void)
+{
+    SDL_BlitMap *map;
+
+    /* Allocate the empty map */
+    map = (SDL_BlitMap *) SDL_calloc(1, sizeof(*map));
+    if (map == NULL) {
+        SDL_OutOfMemory();
+        return (NULL);
+    }
+    map->info.r = 0xFF;
+    map->info.g = 0xFF;
+    map->info.b = 0xFF;
+    map->info.a = 0xFF;
+
+    /* It's ready to go */
+    return (map);
+}
+
+void
+SDL_InvalidateMap(SDL_BlitMap * map)
+{
+    if (!map) {
+        return;
+    }
+    if (map->dst) {
+        /* Release our reference to the surface - see the note below */
+        if (--map->dst->refcount <= 0) {
+            SDL_FreeSurface(map->dst);
+        }
+    }
+    map->dst = NULL;
+    map->src_palette_version = 0;
+    map->dst_palette_version = 0;
+    SDL_free(map->info.table);
+    map->info.table = NULL;
+}
+
+int
+SDL_MapSurface(SDL_Surface * src, SDL_Surface * dst)
+{
+    SDL_PixelFormat *srcfmt;
+    SDL_PixelFormat *dstfmt;
+    SDL_BlitMap *map;
+
+    /* Clear out any previous mapping */
+    map = src->map;
+    if ((src->flags & SDL_RLEACCEL) == SDL_RLEACCEL) {
+        SDL_UnRLESurface(src, 1);
+    }
+    SDL_InvalidateMap(map);
+
+    /* Figure out what kind of mapping we're doing */
+    map->identity = 0;
+    srcfmt = src->format;
+    dstfmt = dst->format;
+    if (SDL_ISPIXELFORMAT_INDEXED(srcfmt->format)) {
+        if (SDL_ISPIXELFORMAT_INDEXED(dstfmt->format)) {
+            /* Palette --> Palette */
+            map->info.table =
+                Map1to1(srcfmt->palette, dstfmt->palette, &map->identity);
+            if (!map->identity) {
+                if (map->info.table == NULL) {
+                    return (-1);
+                }
+            }
+            if (srcfmt->BitsPerPixel != dstfmt->BitsPerPixel)
+                map->identity = 0;
+        } else {
+            /* Palette --> BitField */
+            map->info.table =
+                Map1toN(srcfmt, src->map->info.r, src->map->info.g,
+                        src->map->info.b, src->map->info.a, dstfmt);
+            if (map->info.table == NULL) {
+                return (-1);
+            }
+        }
+    } else {
+        if (SDL_ISPIXELFORMAT_INDEXED(dstfmt->format)) {
+            /* BitField --> Palette */
+            map->info.table = MapNto1(srcfmt, dstfmt, &map->identity);
+            if (!map->identity) {
+                if (map->info.table == NULL) {
+                    return (-1);
+                }
+            }
+            map->identity = 0;  /* Don't optimize to copy */
+        } else {
+            /* BitField --> BitField */
+            if (srcfmt == dstfmt) {
+                map->identity = 1;
+            }
+        }
+    }
+
+    map->dst = dst;
+
+    if (map->dst) {
+        /* Keep a reference to this surface so it doesn't get deleted
+           while we're still pointing at it.
+
+           A better method would be for the destination surface to keep
+           track of surfaces that are mapped to it and automatically
+           invalidate them when it is freed, but this will do for now.
+        */
+        ++map->dst->refcount;
+    }
+
+    if (dstfmt->palette) {
+        map->dst_palette_version = dstfmt->palette->version;
+    } else {
+        map->dst_palette_version = 0;
+    }
+
+    if (srcfmt->palette) {
+        map->src_palette_version = srcfmt->palette->version;
+    } else {
+        map->src_palette_version = 0;
+    }
+
+    /* Choose your blitters wisely */
+    return (SDL_CalculateBlit(src));
+}
+
+void
+SDL_FreeBlitMap(SDL_BlitMap * map)
+{
+    if (map) {
+        SDL_InvalidateMap(map);
+        SDL_free(map);
+    }
+}
+
+void
+SDL_CalculateGammaRamp(float gamma, Uint16 * ramp)
+{
+    int i;
+
+    /* Input validation */
+    if (gamma < 0.0f ) {
+      SDL_InvalidParamError("gamma");
+      return;
+    }
+    if (ramp == NULL) {
+      SDL_InvalidParamError("ramp");
+      return;
+    }
+
+    /* 0.0 gamma is all black */
+    if (gamma == 0.0f) {
+        for (i = 0; i < 256; ++i) {
+            ramp[i] = 0;
+        }
+        return;
+    } else if (gamma == 1.0f) {
+        /* 1.0 gamma is identity */
+        for (i = 0; i < 256; ++i) {
+            ramp[i] = (i << 8) | i;
+        }
+        return;
+    } else {
+        /* Calculate a real gamma ramp */
+        int value;
+        gamma = 1.0f / gamma;
+        for (i = 0; i < 256; ++i) {
+            value =
+                (int) (SDL_pow((double) i / 256.0, gamma) * 65535.0 + 0.5);
+            if (value > 65535) {
+                value = 65535;
+            }
+            ramp[i] = (Uint16) value;
+        }
+    }
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_pixels_c.h b/Source/3rd Party/sdl/src/video/SDL_pixels_c.h
new file mode 100644
index 000000000..de2916ffa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_pixels_c.h	
@@ -0,0 +1,41 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* Useful functions and variables from SDL_pixel.c */
+
+#include "SDL_blit.h"
+
+/* Pixel format functions */
+extern int SDL_InitFormat(SDL_PixelFormat * format, Uint32 pixel_format);
+
+/* Blit mapping functions */
+extern SDL_BlitMap *SDL_AllocBlitMap(void);
+extern void SDL_InvalidateMap(SDL_BlitMap * map);
+extern int SDL_MapSurface(SDL_Surface * src, SDL_Surface * dst);
+extern void SDL_FreeBlitMap(SDL_BlitMap * map);
+
+/* Miscellaneous functions */
+extern int SDL_CalculatePitch(SDL_Surface * surface);
+extern void SDL_DitherColors(SDL_Color * colors, int bpp);
+extern Uint8 SDL_FindColor(SDL_Palette * pal, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_rect.c b/Source/3rd Party/sdl/src/video/SDL_rect.c
new file mode 100644
index 000000000..a0456bd69
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_rect.c	
@@ -0,0 +1,525 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_rect.h"
+#include "SDL_rect_c.h"
+
+
+SDL_bool
+SDL_HasIntersection(const SDL_Rect * A, const SDL_Rect * B)
+{
+    int Amin, Amax, Bmin, Bmax;
+
+    if (!A) {
+        SDL_InvalidParamError("A");
+        return SDL_FALSE;
+    }
+
+    if (!B) {
+        SDL_InvalidParamError("B");
+        return SDL_FALSE;
+    }
+
+    /* Special cases for empty rects */
+    if (SDL_RectEmpty(A) || SDL_RectEmpty(B)) {
+        return SDL_FALSE;
+    }
+
+    /* Horizontal intersection */
+    Amin = A->x;
+    Amax = Amin + A->w;
+    Bmin = B->x;
+    Bmax = Bmin + B->w;
+    if (Bmin > Amin)
+        Amin = Bmin;
+    if (Bmax < Amax)
+        Amax = Bmax;
+    if (Amax <= Amin)
+        return SDL_FALSE;
+
+    /* Vertical intersection */
+    Amin = A->y;
+    Amax = Amin + A->h;
+    Bmin = B->y;
+    Bmax = Bmin + B->h;
+    if (Bmin > Amin)
+        Amin = Bmin;
+    if (Bmax < Amax)
+        Amax = Bmax;
+    if (Amax <= Amin)
+        return SDL_FALSE;
+
+    return SDL_TRUE;
+}
+
+SDL_bool
+SDL_IntersectRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
+{
+    int Amin, Amax, Bmin, Bmax;
+
+    if (!A) {
+        SDL_InvalidParamError("A");
+        return SDL_FALSE;
+    }
+
+    if (!B) {
+        SDL_InvalidParamError("B");
+        return SDL_FALSE;
+    }
+
+    if (!result) {
+        SDL_InvalidParamError("result");
+        return SDL_FALSE;
+    }
+
+    /* Special cases for empty rects */
+    if (SDL_RectEmpty(A) || SDL_RectEmpty(B)) {
+        result->w = 0;
+        result->h = 0;
+        return SDL_FALSE;
+    }
+
+    /* Horizontal intersection */
+    Amin = A->x;
+    Amax = Amin + A->w;
+    Bmin = B->x;
+    Bmax = Bmin + B->w;
+    if (Bmin > Amin)
+        Amin = Bmin;
+    result->x = Amin;
+    if (Bmax < Amax)
+        Amax = Bmax;
+    result->w = Amax - Amin;
+
+    /* Vertical intersection */
+    Amin = A->y;
+    Amax = Amin + A->h;
+    Bmin = B->y;
+    Bmax = Bmin + B->h;
+    if (Bmin > Amin)
+        Amin = Bmin;
+    result->y = Amin;
+    if (Bmax < Amax)
+        Amax = Bmax;
+    result->h = Amax - Amin;
+
+    return !SDL_RectEmpty(result);
+}
+
+void
+SDL_UnionRect(const SDL_Rect * A, const SDL_Rect * B, SDL_Rect * result)
+{
+    int Amin, Amax, Bmin, Bmax;
+
+    if (!A) {
+        SDL_InvalidParamError("A");
+        return;
+    }
+
+    if (!B) {
+        SDL_InvalidParamError("B");
+        return;
+    }
+
+    if (!result) {
+        SDL_InvalidParamError("result");
+        return;
+    }
+
+    /* Special cases for empty Rects */
+    if (SDL_RectEmpty(A)) {
+      if (SDL_RectEmpty(B)) {
+       /* A and B empty */
+       return;
+      } else {
+       /* A empty, B not empty */
+       *result = *B;
+       return;
+      }
+    } else {
+      if (SDL_RectEmpty(B)) {
+       /* A not empty, B empty */
+       *result = *A;
+       return;
+      }
+    }
+
+    /* Horizontal union */
+    Amin = A->x;
+    Amax = Amin + A->w;
+    Bmin = B->x;
+    Bmax = Bmin + B->w;
+    if (Bmin < Amin)
+        Amin = Bmin;
+    result->x = Amin;
+    if (Bmax > Amax)
+        Amax = Bmax;
+    result->w = Amax - Amin;
+
+    /* Vertical union */
+    Amin = A->y;
+    Amax = Amin + A->h;
+    Bmin = B->y;
+    Bmax = Bmin + B->h;
+    if (Bmin < Amin)
+        Amin = Bmin;
+    result->y = Amin;
+    if (Bmax > Amax)
+        Amax = Bmax;
+    result->h = Amax - Amin;
+}
+
+SDL_bool
+SDL_EnclosePoints(const SDL_Point * points, int count, const SDL_Rect * clip,
+                  SDL_Rect * result)
+{
+    int minx = 0;
+    int miny = 0;
+    int maxx = 0;
+    int maxy = 0;
+    int x, y, i;
+
+    if (!points) {
+        SDL_InvalidParamError("points");
+        return SDL_FALSE;
+    }
+
+    if (count < 1) {
+        SDL_InvalidParamError("count");
+        return SDL_FALSE;
+    }
+
+    if (clip) {
+        SDL_bool added = SDL_FALSE;
+        const int clip_minx = clip->x;
+        const int clip_miny = clip->y;
+        const int clip_maxx = clip->x+clip->w-1;
+        const int clip_maxy = clip->y+clip->h-1;
+
+        /* Special case for empty rectangle */
+        if (SDL_RectEmpty(clip)) {
+            return SDL_FALSE;
+        }
+
+        for (i = 0; i < count; ++i) {
+            x = points[i].x;
+            y = points[i].y;
+
+            if (x < clip_minx || x > clip_maxx ||
+                y < clip_miny || y > clip_maxy) {
+                continue;
+            }
+            if (!added) {
+                /* Special case: if no result was requested, we are done */
+                if (result == NULL) {
+                    return SDL_TRUE;
+                }
+
+                /* First point added */
+                minx = maxx = x;
+                miny = maxy = y;
+                added = SDL_TRUE;
+                continue;
+            }
+            if (x < minx) {
+                minx = x;
+            } else if (x > maxx) {
+                maxx = x;
+            }
+            if (y < miny) {
+                miny = y;
+            } else if (y > maxy) {
+                maxy = y;
+            }
+        }
+        if (!added) {
+            return SDL_FALSE;
+        }
+    } else {
+        /* Special case: if no result was requested, we are done */
+        if (result == NULL) {
+            return SDL_TRUE;
+        }
+
+        /* No clipping, always add the first point */
+        minx = maxx = points[0].x;
+        miny = maxy = points[0].y;
+
+        for (i = 1; i < count; ++i) {
+            x = points[i].x;
+            y = points[i].y;
+
+            if (x < minx) {
+                minx = x;
+            } else if (x > maxx) {
+                maxx = x;
+            }
+            if (y < miny) {
+                miny = y;
+            } else if (y > maxy) {
+                maxy = y;
+            }
+        }
+    }
+
+    if (result) {
+        result->x = minx;
+        result->y = miny;
+        result->w = (maxx-minx)+1;
+        result->h = (maxy-miny)+1;
+    }
+    return SDL_TRUE;
+}
+
+/* Use the Cohen-Sutherland algorithm for line clipping */
+#define CODE_BOTTOM 1
+#define CODE_TOP    2
+#define CODE_LEFT   4
+#define CODE_RIGHT  8
+
+static int
+ComputeOutCode(const SDL_Rect * rect, int x, int y)
+{
+    int code = 0;
+    if (y < rect->y) {
+        code |= CODE_TOP;
+    } else if (y >= rect->y + rect->h) {
+        code |= CODE_BOTTOM;
+    }
+    if (x < rect->x) {
+        code |= CODE_LEFT;
+    } else if (x >= rect->x + rect->w) {
+        code |= CODE_RIGHT;
+    }
+    return code;
+}
+
+SDL_bool
+SDL_IntersectRectAndLine(const SDL_Rect * rect, int *X1, int *Y1, int *X2,
+                         int *Y2)
+{
+    int x = 0;
+    int y = 0;
+    int x1, y1;
+    int x2, y2;
+    int rectx1;
+    int recty1;
+    int rectx2;
+    int recty2;
+    int outcode1, outcode2;
+
+    if (!rect) {
+        SDL_InvalidParamError("rect");
+        return SDL_FALSE;
+    }
+
+    if (!X1) {
+        SDL_InvalidParamError("X1");
+        return SDL_FALSE;
+    }
+
+    if (!Y1) {
+        SDL_InvalidParamError("Y1");
+        return SDL_FALSE;
+    }
+
+    if (!X2) {
+        SDL_InvalidParamError("X2");
+        return SDL_FALSE;
+    }
+
+    if (!Y2) {
+        SDL_InvalidParamError("Y2");
+        return SDL_FALSE;
+    }
+
+    /* Special case for empty rect */
+    if (SDL_RectEmpty(rect)) {
+        return SDL_FALSE;
+    }
+
+    x1 = *X1;
+    y1 = *Y1;
+    x2 = *X2;
+    y2 = *Y2;
+    rectx1 = rect->x;
+    recty1 = rect->y;
+    rectx2 = rect->x + rect->w - 1;
+    recty2 = rect->y + rect->h - 1;
+
+    /* Check to see if entire line is inside rect */
+    if (x1 >= rectx1 && x1 <= rectx2 && x2 >= rectx1 && x2 <= rectx2 &&
+        y1 >= recty1 && y1 <= recty2 && y2 >= recty1 && y2 <= recty2) {
+        return SDL_TRUE;
+    }
+
+    /* Check to see if entire line is to one side of rect */
+    if ((x1 < rectx1 && x2 < rectx1) || (x1 > rectx2 && x2 > rectx2) ||
+        (y1 < recty1 && y2 < recty1) || (y1 > recty2 && y2 > recty2)) {
+        return SDL_FALSE;
+    }
+
+    if (y1 == y2) {
+        /* Horizontal line, easy to clip */
+        if (x1 < rectx1) {
+            *X1 = rectx1;
+        } else if (x1 > rectx2) {
+            *X1 = rectx2;
+        }
+        if (x2 < rectx1) {
+            *X2 = rectx1;
+        } else if (x2 > rectx2) {
+            *X2 = rectx2;
+        }
+        return SDL_TRUE;
+    }
+
+    if (x1 == x2) {
+        /* Vertical line, easy to clip */
+        if (y1 < recty1) {
+            *Y1 = recty1;
+        } else if (y1 > recty2) {
+            *Y1 = recty2;
+        }
+        if (y2 < recty1) {
+            *Y2 = recty1;
+        } else if (y2 > recty2) {
+            *Y2 = recty2;
+        }
+        return SDL_TRUE;
+    }
+
+    /* More complicated Cohen-Sutherland algorithm */
+    outcode1 = ComputeOutCode(rect, x1, y1);
+    outcode2 = ComputeOutCode(rect, x2, y2);
+    while (outcode1 || outcode2) {
+        if (outcode1 & outcode2) {
+            return SDL_FALSE;
+        }
+
+        if (outcode1) {
+            if (outcode1 & CODE_TOP) {
+                y = recty1;
+                x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
+            } else if (outcode1 & CODE_BOTTOM) {
+                y = recty2;
+                x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
+            } else if (outcode1 & CODE_LEFT) {
+                x = rectx1;
+                y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
+            } else if (outcode1 & CODE_RIGHT) {
+                x = rectx2;
+                y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
+            }
+            x1 = x;
+            y1 = y;
+            outcode1 = ComputeOutCode(rect, x, y);
+        } else {
+            if (outcode2 & CODE_TOP) {
+                y = recty1;
+                x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
+            } else if (outcode2 & CODE_BOTTOM) {
+                y = recty2;
+                x = x1 + ((x2 - x1) * (y - y1)) / (y2 - y1);
+            } else if (outcode2 & CODE_LEFT) {
+                x = rectx1;
+                y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
+            } else if (outcode2 & CODE_RIGHT) {
+                x = rectx2;
+                y = y1 + ((y2 - y1) * (x - x1)) / (x2 - x1);
+            }
+            x2 = x;
+            y2 = y;
+            outcode2 = ComputeOutCode(rect, x, y);
+        }
+    }
+    *X1 = x1;
+    *Y1 = y1;
+    *X2 = x2;
+    *Y2 = y2;
+    return SDL_TRUE;
+}
+
+SDL_bool
+SDL_GetSpanEnclosingRect(int width, int height,
+                         int numrects, const SDL_Rect * rects, SDL_Rect *span)
+{
+    int i;
+    int span_y1, span_y2;
+    int rect_y1, rect_y2;
+
+    if (width < 1) {
+        SDL_InvalidParamError("width");
+        return SDL_FALSE;
+    }
+
+    if (height < 1) {
+        SDL_InvalidParamError("height");
+        return SDL_FALSE;
+    }
+
+    if (!rects) {
+        SDL_InvalidParamError("rects");
+        return SDL_FALSE;
+    }
+
+    if (!span) {
+        SDL_InvalidParamError("span");
+        return SDL_FALSE;
+    }
+
+    if (numrects < 1) {
+        SDL_InvalidParamError("numrects");
+        return SDL_FALSE;
+    }
+
+    /* Initialize to empty rect */
+    span_y1 = height;
+    span_y2 = 0;
+
+    for (i = 0; i < numrects; ++i) {
+        rect_y1 = rects[i].y;
+        rect_y2 = rect_y1 + rects[i].h;
+
+        /* Clip out of bounds rectangles, and expand span rect */
+        if (rect_y1 < 0) {
+            span_y1 = 0;
+        } else if (rect_y1 < span_y1) {
+            span_y1 = rect_y1;
+        }
+        if (rect_y2 > height) {
+            span_y2 = height;
+        } else if (rect_y2 > span_y2) {
+            span_y2 = rect_y2;
+        }
+    }
+    if (span_y2 > span_y1) {
+        span->x = 0;
+        span->y = span_y1;
+        span->w = width;
+        span->h = (span_y2 - span_y1);
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_rect_c.h b/Source/3rd Party/sdl/src/video/SDL_rect_c.h
new file mode 100644
index 000000000..e6be32926
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_rect_c.h	
@@ -0,0 +1,25 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+extern SDL_bool SDL_GetSpanEnclosingRect(int width, int height, int numrects, const SDL_Rect * rects, SDL_Rect *span);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_shape.c b/Source/3rd Party/sdl/src/video/SDL_shape.c
new file mode 100644
index 000000000..97248bbc8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_shape.c	
@@ -0,0 +1,286 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL.h"
+#include "SDL_assert.h"
+#include "SDL_video.h"
+#include "SDL_sysvideo.h"
+#include "SDL_pixels.h"
+#include "SDL_surface.h"
+#include "SDL_shape.h"
+#include "SDL_shape_internals.h"
+
+SDL_Window*
+SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags)
+{
+    SDL_Window *result = NULL;
+    result = SDL_CreateWindow(title,-1000,-1000,w,h,(flags | SDL_WINDOW_BORDERLESS) & (~SDL_WINDOW_FULLSCREEN) & (~SDL_WINDOW_RESIZABLE) /* & (~SDL_WINDOW_SHOWN) */);
+    if(result != NULL) {
+        result->shaper = SDL_GetVideoDevice()->shape_driver.CreateShaper(result);
+        if(result->shaper != NULL) {
+            result->shaper->userx = x;
+            result->shaper->usery = y;
+            result->shaper->mode.mode = ShapeModeDefault;
+            result->shaper->mode.parameters.binarizationCutoff = 1;
+            result->shaper->hasshape = SDL_FALSE;
+            return result;
+        }
+        else {
+            SDL_DestroyWindow(result);
+            return NULL;
+        }
+    }
+    else
+        return NULL;
+}
+
+SDL_bool
+SDL_IsShapedWindow(const SDL_Window *window)
+{
+    if(window == NULL)
+        return SDL_FALSE;
+    else
+        return (SDL_bool)(window->shaper != NULL);
+}
+
+/* REQUIRES that bitmap point to a w-by-h bitmap with ppb pixels-per-byte. */
+void
+SDL_CalculateShapeBitmap(SDL_WindowShapeMode mode,SDL_Surface *shape,Uint8* bitmap,Uint8 ppb)
+{
+    int x = 0;
+    int y = 0;
+    Uint8 r = 0,g = 0,b = 0,alpha = 0;
+    Uint8* pixel = NULL;
+    Uint32 bitmap_pixel,pixel_value = 0,mask_value = 0;
+    SDL_Color key;
+    if(SDL_MUSTLOCK(shape))
+        SDL_LockSurface(shape);
+    for(y = 0;y<shape->h;y++) {
+        for(x=0;x<shape->w;x++) {
+            alpha = 0;
+            pixel_value = 0;
+            pixel = (Uint8 *)(shape->pixels) + (y*shape->pitch) + (x*shape->format->BytesPerPixel);
+            switch(shape->format->BytesPerPixel) {
+                case(1):
+                    pixel_value = *(Uint8*)pixel;
+                    break;
+                case(2):
+                    pixel_value = *(Uint16*)pixel;
+                    break;
+                case(3):
+                    pixel_value = *(Uint32*)pixel & (~shape->format->Amask);
+                    break;
+                case(4):
+                    pixel_value = *(Uint32*)pixel;
+                    break;
+            }
+            SDL_GetRGBA(pixel_value,shape->format,&r,&g,&b,&alpha);
+            bitmap_pixel = y*shape->w + x;
+            switch(mode.mode) {
+                case(ShapeModeDefault):
+                    mask_value = (alpha >= 1 ? 1 : 0);
+                    break;
+                case(ShapeModeBinarizeAlpha):
+                    mask_value = (alpha >= mode.parameters.binarizationCutoff ? 1 : 0);
+                    break;
+                case(ShapeModeReverseBinarizeAlpha):
+                    mask_value = (alpha <= mode.parameters.binarizationCutoff ? 1 : 0);
+                    break;
+                case(ShapeModeColorKey):
+                    key = mode.parameters.colorKey;
+                    mask_value = ((key.r != r || key.g != g || key.b != b) ? 1 : 0);
+                    break;
+            }
+            bitmap[bitmap_pixel / ppb] |= mask_value << (7 - ((ppb - 1) - (bitmap_pixel % ppb)));
+        }
+    }
+    if(SDL_MUSTLOCK(shape))
+        SDL_UnlockSurface(shape);
+}
+
+static SDL_ShapeTree*
+RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* mask,SDL_Rect dimensions) {
+    int x = 0,y = 0;
+    Uint8* pixel = NULL;
+    Uint32 pixel_value = 0;
+    Uint8 r = 0,g = 0,b = 0,a = 0;
+    SDL_bool pixel_opaque = SDL_FALSE;
+    int last_opaque = -1;
+    SDL_Color key;
+    SDL_ShapeTree* result = (SDL_ShapeTree*)SDL_malloc(sizeof(SDL_ShapeTree));
+    SDL_Rect next = {0,0,0,0};
+    for(y=dimensions.y;y<dimensions.y + dimensions.h;y++) {
+        for(x=dimensions.x;x<dimensions.x + dimensions.w;x++) {
+            pixel_value = 0;
+            pixel = (Uint8 *)(mask->pixels) + (y*mask->pitch) + (x*mask->format->BytesPerPixel);
+            switch(mask->format->BytesPerPixel) {
+                case(1):
+                    pixel_value = *(Uint8*)pixel;
+                    break;
+                case(2):
+                    pixel_value = *(Uint16*)pixel;
+                    break;
+                case(3):
+                    pixel_value = *(Uint32*)pixel & (~mask->format->Amask);
+                    break;
+                case(4):
+                    pixel_value = *(Uint32*)pixel;
+                    break;
+            }
+            SDL_GetRGBA(pixel_value,mask->format,&r,&g,&b,&a);
+            switch(mode.mode) {
+                case(ShapeModeDefault):
+                    pixel_opaque = (a >= 1 ? SDL_TRUE : SDL_FALSE);
+                    break;
+                case(ShapeModeBinarizeAlpha):
+                    pixel_opaque = (a >= mode.parameters.binarizationCutoff ? SDL_TRUE : SDL_FALSE);
+                    break;
+                case(ShapeModeReverseBinarizeAlpha):
+                    pixel_opaque = (a <= mode.parameters.binarizationCutoff ? SDL_TRUE : SDL_FALSE);
+                    break;
+                case(ShapeModeColorKey):
+                    key = mode.parameters.colorKey;
+                    pixel_opaque = ((key.r != r || key.g != g || key.b != b) ? SDL_TRUE : SDL_FALSE);
+                    break;
+            }
+            if(last_opaque == -1)
+                last_opaque = pixel_opaque;
+            if(last_opaque != pixel_opaque) {
+                result->kind = QuadShape;
+                /* These will stay the same. */
+                next.w = dimensions.w / 2;
+                next.h = dimensions.h / 2;
+                /* These will change from recursion to recursion. */
+                next.x = dimensions.x;
+                next.y = dimensions.y;
+                result->data.children.upleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
+                next.x += next.w;
+                /* Unneeded: next.y = dimensions.y; */
+                result->data.children.upright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
+                next.x = dimensions.x;
+                next.y += next.h;
+                result->data.children.downleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
+                next.x += next.w;
+                /* Unneeded: next.y = dimensions.y + dimensions.h /2; */
+                result->data.children.downright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
+                return result;
+            }
+        }
+    }
+    /* If we never recursed, all the pixels in this quadrant have the same "value". */
+    result->kind = (last_opaque == SDL_TRUE ? OpaqueShape : TransparentShape);
+    result->data.shape = dimensions;
+    return result;
+}
+
+SDL_ShapeTree*
+SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape)
+{
+    SDL_Rect dimensions = {0,0,shape->w,shape->h};
+    SDL_ShapeTree* result = NULL;
+    if(SDL_MUSTLOCK(shape))
+        SDL_LockSurface(shape);
+    result = RecursivelyCalculateShapeTree(mode,shape,dimensions);
+    if(SDL_MUSTLOCK(shape))
+        SDL_UnlockSurface(shape);
+    return result;
+}
+
+void
+SDL_TraverseShapeTree(SDL_ShapeTree *tree,SDL_TraversalFunction function,void* closure)
+{
+    SDL_assert(tree != NULL);
+    if(tree->kind == QuadShape) {
+        SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.upleft,function,closure);
+        SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.upright,function,closure);
+        SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.downleft,function,closure);
+        SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.downright,function,closure);
+    }
+    else
+        function(tree,closure);
+}
+
+void
+SDL_FreeShapeTree(SDL_ShapeTree** shape_tree)
+{
+    if((*shape_tree)->kind == QuadShape) {
+        SDL_FreeShapeTree((SDL_ShapeTree **)&(*shape_tree)->data.children.upleft);
+        SDL_FreeShapeTree((SDL_ShapeTree **)&(*shape_tree)->data.children.upright);
+        SDL_FreeShapeTree((SDL_ShapeTree **)&(*shape_tree)->data.children.downleft);
+        SDL_FreeShapeTree((SDL_ShapeTree **)&(*shape_tree)->data.children.downright);
+    }
+    SDL_free(*shape_tree);
+    *shape_tree = NULL;
+}
+
+int
+SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode)
+{
+    int result;
+    if(window == NULL || !SDL_IsShapedWindow(window))
+        /* The window given was not a shapeable window. */
+        return SDL_NONSHAPEABLE_WINDOW;
+    if(shape == NULL)
+        /* Invalid shape argument. */
+        return SDL_INVALID_SHAPE_ARGUMENT;
+
+    if(shape_mode != NULL)
+        window->shaper->mode = *shape_mode;
+    result = SDL_GetVideoDevice()->shape_driver.SetWindowShape(window->shaper,shape,shape_mode);
+    window->shaper->hasshape = SDL_TRUE;
+    if(window->shaper->userx != 0 && window->shaper->usery != 0) {
+        SDL_SetWindowPosition(window,window->shaper->userx,window->shaper->usery);
+        window->shaper->userx = 0;
+        window->shaper->usery = 0;
+    }
+    return result;
+}
+
+static SDL_bool
+SDL_WindowHasAShape(SDL_Window *window)
+{
+    if (window == NULL || !SDL_IsShapedWindow(window))
+        return SDL_FALSE;
+    return window->shaper->hasshape;
+}
+
+int
+SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shape_mode)
+{
+    if(window != NULL && SDL_IsShapedWindow(window)) {
+        if(shape_mode == NULL) {
+            if(SDL_WindowHasAShape(window))
+                /* The window given has a shape. */
+                return 0;
+            else
+                /* The window given is shapeable but lacks a shape. */
+                return SDL_WINDOW_LACKS_SHAPE;
+        }
+        else {
+            *shape_mode = window->shaper->mode;
+            return 0;
+        }
+    }
+    else
+        /* The window given is not a valid shapeable window. */
+        return SDL_NONSHAPEABLE_WINDOW;
+}
diff --git a/Source/3rd Party/sdl/src/video/SDL_shape_internals.h b/Source/3rd Party/sdl/src/video/SDL_shape_internals.h
new file mode 100644
index 000000000..b5413e1ea
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_shape_internals.h	
@@ -0,0 +1,69 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_shape_internals_h
+#define _SDL_shape_internals_h
+
+#include "SDL_rect.h"
+#include "SDL_shape.h"
+#include "SDL_surface.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+extern "C" {
+/* *INDENT-ON* */
+#endif
+
+typedef struct {
+	struct SDL_ShapeTree *upleft,*upright,*downleft,*downright;
+} SDL_QuadTreeChildren;
+
+typedef union {
+	SDL_QuadTreeChildren children;
+	SDL_Rect shape;
+} SDL_ShapeUnion;
+
+typedef enum { QuadShape,TransparentShape,OpaqueShape } SDL_ShapeKind;
+
+typedef struct {
+	SDL_ShapeKind kind;
+	SDL_ShapeUnion data;
+} SDL_ShapeTree;
+	
+typedef void(*SDL_TraversalFunction)(SDL_ShapeTree*,void*);
+
+extern void SDL_CalculateShapeBitmap(SDL_WindowShapeMode mode,SDL_Surface *shape,Uint8* bitmap,Uint8 ppb);
+extern SDL_ShapeTree* SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape);
+extern void SDL_TraverseShapeTree(SDL_ShapeTree *tree,SDL_TraversalFunction function,void* closure);
+extern void SDL_FreeShapeTree(SDL_ShapeTree** shape_tree);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+}
+/* *INDENT-ON* */
+#endif
+#include "close_code.h"
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/SDL_stretch.c b/Source/3rd Party/sdl/src/video/SDL_stretch.c
new file mode 100644
index 000000000..a4faacaf4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_stretch.c	
@@ -0,0 +1,353 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* This a stretch blit implementation based on ideas given to me by
+   Tomasz Cejner - thanks! :)
+
+   April 27, 2000 - Sam Lantinga
+*/
+
+#include "SDL_video.h"
+#include "SDL_blit.h"
+
+/* This isn't ready for general consumption yet - it should be folded
+   into the general blitting mechanism.
+*/
+
+#if ((defined(_MFC_VER) && defined(_M_IX86)) || \
+     defined(__WATCOMC__) || \
+     (defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES
+/* There's a bug with gcc 4.4.1 and -O2 where srcp doesn't get the correct
+ * value after the first scanline.  FIXME? */
+/* #define USE_ASM_STRETCH */
+#endif
+
+#ifdef USE_ASM_STRETCH
+
+#ifdef HAVE_MPROTECT
+#include <sys/types.h>
+#include <sys/mman.h>
+#endif
+#ifdef __GNUC__
+#define PAGE_ALIGNED __attribute__((__aligned__(4096)))
+#else
+#define PAGE_ALIGNED
+#endif
+
+#if defined(_M_IX86) || defined(i386)
+#define PREFIX16    0x66
+#define STORE_BYTE  0xAA
+#define STORE_WORD  0xAB
+#define LOAD_BYTE   0xAC
+#define LOAD_WORD   0xAD
+#define RETURN      0xC3
+#else
+#error Need assembly opcodes for this architecture
+#endif
+
+static unsigned char copy_row[4096] PAGE_ALIGNED;
+
+static int
+generate_rowbytes(int src_w, int dst_w, int bpp)
+{
+    static struct
+    {
+        int bpp;
+        int src_w;
+        int dst_w;
+        int status;
+    } last;
+
+    int i;
+    int pos, inc;
+    unsigned char *eip, *fence;
+    unsigned char load, store;
+
+    /* See if we need to regenerate the copy buffer */
+    if ((src_w == last.src_w) && (dst_w == last.dst_w) && (bpp == last.bpp)) {
+        return (last.status);
+    }
+    last.bpp = bpp;
+    last.src_w = src_w;
+    last.dst_w = dst_w;
+    last.status = -1;
+
+    switch (bpp) {
+    case 1:
+        load = LOAD_BYTE;
+        store = STORE_BYTE;
+        break;
+    case 2:
+    case 4:
+        load = LOAD_WORD;
+        store = STORE_WORD;
+        break;
+    default:
+        return SDL_SetError("ASM stretch of %d bytes isn't supported\n", bpp);
+    }
+#ifdef HAVE_MPROTECT
+    /* Make the code writeable */
+    if (mprotect(copy_row, sizeof(copy_row), PROT_READ | PROT_WRITE) < 0) {
+        return SDL_SetError("Couldn't make copy buffer writeable");
+    }
+#endif
+    pos = 0x10000;
+    inc = (src_w << 16) / dst_w;
+    eip = copy_row;
+    fence = copy_row + sizeof(copy_row)-2;
+    for (i = 0; i < dst_w; ++i) {
+        while (pos >= 0x10000L) {
+            if (eip == fence) {
+                return -1;
+            }
+            if (bpp == 2) {
+                *eip++ = PREFIX16;
+            }
+            *eip++ = load;
+            pos -= 0x10000L;
+        }
+        if (eip == fence) {
+            return -1;
+        }
+        if (bpp == 2) {
+            *eip++ = PREFIX16;
+        }
+        *eip++ = store;
+        pos += inc;
+    }
+    *eip++ = RETURN;
+
+#ifdef HAVE_MPROTECT
+    /* Make the code executable but not writeable */
+    if (mprotect(copy_row, sizeof(copy_row), PROT_READ | PROT_EXEC) < 0) {
+        return SDL_SetError("Couldn't make copy buffer executable");
+    }
+#endif
+    last.status = 0;
+    return (0);
+}
+
+#endif /* USE_ASM_STRETCH */
+
+#define DEFINE_COPY_ROW(name, type)         \
+static void name(type *src, int src_w, type *dst, int dst_w)    \
+{                                           \
+    int i;                                  \
+    int pos, inc;                           \
+    type pixel = 0;                         \
+                                            \
+    pos = 0x10000;                          \
+    inc = (src_w << 16) / dst_w;            \
+    for ( i=dst_w; i>0; --i ) {             \
+        while ( pos >= 0x10000L ) {         \
+            pixel = *src++;                 \
+            pos -= 0x10000L;                \
+        }                                   \
+        *dst++ = pixel;                     \
+        pos += inc;                         \
+    }                                       \
+}
+/* *INDENT-OFF* */
+DEFINE_COPY_ROW(copy_row1, Uint8)
+DEFINE_COPY_ROW(copy_row2, Uint16)
+DEFINE_COPY_ROW(copy_row4, Uint32)
+/* *INDENT-ON* */
+
+/* The ASM code doesn't handle 24-bpp stretch blits */
+static void
+copy_row3(Uint8 * src, int src_w, Uint8 * dst, int dst_w)
+{
+    int i;
+    int pos, inc;
+    Uint8 pixel[3] = { 0, 0, 0 };
+
+    pos = 0x10000;
+    inc = (src_w << 16) / dst_w;
+    for (i = dst_w; i > 0; --i) {
+        while (pos >= 0x10000L) {
+            pixel[0] = *src++;
+            pixel[1] = *src++;
+            pixel[2] = *src++;
+            pos -= 0x10000L;
+        }
+        *dst++ = pixel[0];
+        *dst++ = pixel[1];
+        *dst++ = pixel[2];
+        pos += inc;
+    }
+}
+
+/* Perform a stretch blit between two surfaces of the same format.
+   NOTE:  This function is not safe to call from multiple threads!
+*/
+int
+SDL_SoftStretch(SDL_Surface * src, const SDL_Rect * srcrect,
+                SDL_Surface * dst, const SDL_Rect * dstrect)
+{
+    int src_locked;
+    int dst_locked;
+    int pos, inc;
+    int dst_maxrow;
+    int src_row, dst_row;
+    Uint8 *srcp = NULL;
+    Uint8 *dstp;
+    SDL_Rect full_src;
+    SDL_Rect full_dst;
+#ifdef USE_ASM_STRETCH
+    SDL_bool use_asm = SDL_TRUE;
+#ifdef __GNUC__
+    int u1, u2;
+#endif
+#endif /* USE_ASM_STRETCH */
+    const int bpp = dst->format->BytesPerPixel;
+
+    if (src->format->format != dst->format->format) {
+        return SDL_SetError("Only works with same format surfaces");
+    }
+
+    /* Verify the blit rectangles */
+    if (srcrect) {
+        if ((srcrect->x < 0) || (srcrect->y < 0) ||
+            ((srcrect->x + srcrect->w) > src->w) ||
+            ((srcrect->y + srcrect->h) > src->h)) {
+            return SDL_SetError("Invalid source blit rectangle");
+        }
+    } else {
+        full_src.x = 0;
+        full_src.y = 0;
+        full_src.w = src->w;
+        full_src.h = src->h;
+        srcrect = &full_src;
+    }
+    if (dstrect) {
+        if ((dstrect->x < 0) || (dstrect->y < 0) ||
+            ((dstrect->x + dstrect->w) > dst->w) ||
+            ((dstrect->y + dstrect->h) > dst->h)) {
+            return SDL_SetError("Invalid destination blit rectangle");
+        }
+    } else {
+        full_dst.x = 0;
+        full_dst.y = 0;
+        full_dst.w = dst->w;
+        full_dst.h = dst->h;
+        dstrect = &full_dst;
+    }
+
+    /* Lock the destination if it's in hardware */
+    dst_locked = 0;
+    if (SDL_MUSTLOCK(dst)) {
+        if (SDL_LockSurface(dst) < 0) {
+            return SDL_SetError("Unable to lock destination surface");
+        }
+        dst_locked = 1;
+    }
+    /* Lock the source if it's in hardware */
+    src_locked = 0;
+    if (SDL_MUSTLOCK(src)) {
+        if (SDL_LockSurface(src) < 0) {
+            if (dst_locked) {
+                SDL_UnlockSurface(dst);
+            }
+            return SDL_SetError("Unable to lock source surface");
+        }
+        src_locked = 1;
+    }
+
+    /* Set up the data... */
+    pos = 0x10000;
+    inc = (srcrect->h << 16) / dstrect->h;
+    src_row = srcrect->y;
+    dst_row = dstrect->y;
+
+#ifdef USE_ASM_STRETCH
+    /* Write the opcodes for this stretch */
+    if ((bpp == 3) || (generate_rowbytes(srcrect->w, dstrect->w, bpp) < 0)) {
+        use_asm = SDL_FALSE;
+    }
+#endif
+
+    /* Perform the stretch blit */
+    for (dst_maxrow = dst_row + dstrect->h; dst_row < dst_maxrow; ++dst_row) {
+        dstp = (Uint8 *) dst->pixels + (dst_row * dst->pitch)
+            + (dstrect->x * bpp);
+        while (pos >= 0x10000L) {
+            srcp = (Uint8 *) src->pixels + (src_row * src->pitch)
+                + (srcrect->x * bpp);
+            ++src_row;
+            pos -= 0x10000L;
+        }
+#ifdef USE_ASM_STRETCH
+        if (use_asm) {
+#ifdef __GNUC__
+            __asm__ __volatile__("call *%4":"=&D"(u1), "=&S"(u2)
+                                 :"0"(dstp), "1"(srcp), "r"(copy_row)
+                                 :"memory");
+#elif defined(_MSC_VER) || defined(__WATCOMC__)
+            /* *INDENT-OFF* */
+            {
+                void *code = copy_row;
+                __asm {
+                    push edi
+                    push esi
+                    mov edi, dstp
+                    mov esi, srcp
+                    call dword ptr code
+                    pop esi
+                    pop edi
+                }
+            }
+            /* *INDENT-ON* */
+#else
+#error Need inline assembly for this compiler
+#endif
+        } else
+#endif
+            switch (bpp) {
+            case 1:
+                copy_row1(srcp, srcrect->w, dstp, dstrect->w);
+                break;
+            case 2:
+                copy_row2((Uint16 *) srcp, srcrect->w,
+                          (Uint16 *) dstp, dstrect->w);
+                break;
+            case 3:
+                copy_row3(srcp, srcrect->w, dstp, dstrect->w);
+                break;
+            case 4:
+                copy_row4((Uint32 *) srcp, srcrect->w,
+                          (Uint32 *) dstp, dstrect->w);
+                break;
+            }
+        pos += inc;
+    }
+
+    /* We need to unlock the surfaces if they're locked */
+    if (dst_locked) {
+        SDL_UnlockSurface(dst);
+    }
+    if (src_locked) {
+        SDL_UnlockSurface(src);
+    }
+    return (0);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_surface.c b/Source/3rd Party/sdl/src/video/SDL_surface.c
new file mode 100644
index 000000000..7caf0fc51
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_surface.c	
@@ -0,0 +1,1094 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#include "SDL_video.h"
+#include "SDL_sysvideo.h"
+#include "SDL_blit.h"
+#include "SDL_RLEaccel_c.h"
+#include "SDL_pixels_c.h"
+
+
+/* Public routines */
+/*
+ * Create an empty RGB surface of the appropriate depth
+ */
+SDL_Surface *
+SDL_CreateRGBSurface(Uint32 flags,
+                     int width, int height, int depth,
+                     Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask)
+{
+    SDL_Surface *surface;
+    Uint32 format;
+
+    /* The flags are no longer used, make the compiler happy */
+    (void)flags;
+
+    /* Get the pixel format */
+    format = SDL_MasksToPixelFormatEnum(depth, Rmask, Gmask, Bmask, Amask);
+    if (format == SDL_PIXELFORMAT_UNKNOWN) {
+        SDL_SetError("Unknown pixel format");
+        return NULL;
+    }
+
+    /* Allocate the surface */
+    surface = (SDL_Surface *) SDL_calloc(1, sizeof(*surface));
+    if (surface == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    surface->format = SDL_AllocFormat(format);
+    if (!surface->format) {
+        SDL_FreeSurface(surface);
+        return NULL;
+    }
+    surface->w = width;
+    surface->h = height;
+    surface->pitch = SDL_CalculatePitch(surface);
+    SDL_SetClipRect(surface, NULL);
+
+    if (SDL_ISPIXELFORMAT_INDEXED(surface->format->format)) {
+        SDL_Palette *palette =
+            SDL_AllocPalette((1 << surface->format->BitsPerPixel));
+        if (!palette) {
+            SDL_FreeSurface(surface);
+            return NULL;
+        }
+        if (palette->ncolors == 2) {
+            /* Create a black and white bitmap palette */
+            palette->colors[0].r = 0xFF;
+            palette->colors[0].g = 0xFF;
+            palette->colors[0].b = 0xFF;
+            palette->colors[1].r = 0x00;
+            palette->colors[1].g = 0x00;
+            palette->colors[1].b = 0x00;
+        }
+        SDL_SetSurfacePalette(surface, palette);
+        SDL_FreePalette(palette);
+    }
+
+    /* Get the pixels */
+    if (surface->w && surface->h) {
+        surface->pixels = SDL_malloc(surface->h * surface->pitch);
+        if (!surface->pixels) {
+            SDL_FreeSurface(surface);
+            SDL_OutOfMemory();
+            return NULL;
+        }
+        /* This is important for bitmaps */
+        SDL_memset(surface->pixels, 0, surface->h * surface->pitch);
+    }
+
+    /* Allocate an empty mapping */
+    surface->map = SDL_AllocBlitMap();
+    if (!surface->map) {
+        SDL_FreeSurface(surface);
+        return NULL;
+    }
+
+    /* By default surface with an alpha mask are set up for blending */
+    if (Amask) {
+        SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND);
+    }
+
+    /* The surface is ready to go */
+    surface->refcount = 1;
+    return surface;
+}
+
+/*
+ * Create an RGB surface from an existing memory buffer
+ */
+SDL_Surface *
+SDL_CreateRGBSurfaceFrom(void *pixels,
+                         int width, int height, int depth, int pitch,
+                         Uint32 Rmask, Uint32 Gmask, Uint32 Bmask,
+                         Uint32 Amask)
+{
+    SDL_Surface *surface;
+
+    surface =
+        SDL_CreateRGBSurface(0, 0, 0, depth, Rmask, Gmask, Bmask, Amask);
+    if (surface != NULL) {
+        surface->flags |= SDL_PREALLOC;
+        surface->pixels = pixels;
+        surface->w = width;
+        surface->h = height;
+        surface->pitch = pitch;
+        SDL_SetClipRect(surface, NULL);
+    }
+    return surface;
+}
+
+int
+SDL_SetSurfacePalette(SDL_Surface * surface, SDL_Palette * palette)
+{
+    if (!surface) {
+        return SDL_SetError("SDL_SetSurfacePalette() passed a NULL surface");
+    }
+    return SDL_SetPixelFormatPalette(surface->format, palette);
+}
+
+int
+SDL_SetSurfaceRLE(SDL_Surface * surface, int flag)
+{
+    int flags;
+
+    if (!surface) {
+        return -1;
+    }
+
+    flags = surface->map->info.flags;
+    if (flag) {
+        surface->map->info.flags |= SDL_COPY_RLE_DESIRED;
+    } else {
+        surface->map->info.flags &= ~SDL_COPY_RLE_DESIRED;
+    }
+    if (surface->map->info.flags != flags) {
+        SDL_InvalidateMap(surface->map);
+    }
+    return 0;
+}
+
+int
+SDL_SetColorKey(SDL_Surface * surface, int flag, Uint32 key)
+{
+    int flags;
+
+    if (!surface) {
+        return SDL_InvalidParamError("surface");
+    }
+
+    if (surface->format->palette && key >= ((Uint32) surface->format->palette->ncolors)) {
+        return SDL_InvalidParamError("key");
+    }
+
+    if (flag & SDL_RLEACCEL) {
+        SDL_SetSurfaceRLE(surface, 1);
+    }
+
+    flags = surface->map->info.flags;
+    if (flag) {
+        surface->map->info.flags |= SDL_COPY_COLORKEY;
+        surface->map->info.colorkey = key;
+        if (surface->format->palette) {
+            surface->format->palette->colors[surface->map->info.colorkey].a = SDL_ALPHA_TRANSPARENT;
+            ++surface->format->palette->version;
+            if (!surface->format->palette->version) {
+                surface->format->palette->version = 1;
+            }
+        }
+    } else {
+        if (surface->format->palette) {
+            surface->format->palette->colors[surface->map->info.colorkey].a = SDL_ALPHA_OPAQUE;
+            ++surface->format->palette->version;
+            if (!surface->format->palette->version) {
+                surface->format->palette->version = 1;
+            }
+        }
+        surface->map->info.flags &= ~SDL_COPY_COLORKEY;
+    }
+    if (surface->map->info.flags != flags) {
+        SDL_InvalidateMap(surface->map);
+    }
+
+    return 0;
+}
+
+int
+SDL_GetColorKey(SDL_Surface * surface, Uint32 * key)
+{
+    if (!surface) {
+        return -1;
+    }
+
+    if (!(surface->map->info.flags & SDL_COPY_COLORKEY)) {
+        return -1;
+    }
+
+    if (key) {
+        *key = surface->map->info.colorkey;
+    }
+    return 0;
+}
+
+/* This is a fairly slow function to switch from colorkey to alpha */
+static void
+SDL_ConvertColorkeyToAlpha(SDL_Surface * surface)
+{
+    int x, y;
+
+    if (!surface) {
+        return;
+    }
+
+    if (!(surface->map->info.flags & SDL_COPY_COLORKEY) ||
+        !surface->format->Amask) {
+        return;
+    }
+
+    SDL_LockSurface(surface);
+
+    switch (surface->format->BytesPerPixel) {
+    case 2:
+        {
+            Uint16 *row, *spot;
+            Uint16 ckey = (Uint16) surface->map->info.colorkey;
+            Uint16 mask = (Uint16) (~surface->format->Amask);
+
+            /* Ignore alpha in colorkey comparison */
+            ckey &= mask;
+            row = (Uint16 *) surface->pixels;
+            for (y = surface->h; y--;) {
+                spot = row;
+                for (x = surface->w; x--;) {
+                    if ((*spot & mask) == ckey) {
+                        *spot &= mask;
+                    }
+                    ++spot;
+                }
+                row += surface->pitch / 2;
+            }
+        }
+        break;
+    case 3:
+        /* FIXME */
+        break;
+    case 4:
+        {
+            Uint32 *row, *spot;
+            Uint32 ckey = surface->map->info.colorkey;
+            Uint32 mask = ~surface->format->Amask;
+
+            /* Ignore alpha in colorkey comparison */
+            ckey &= mask;
+            row = (Uint32 *) surface->pixels;
+            for (y = surface->h; y--;) {
+                spot = row;
+                for (x = surface->w; x--;) {
+                    if ((*spot & mask) == ckey) {
+                        *spot &= mask;
+                    }
+                    ++spot;
+                }
+                row += surface->pitch / 4;
+            }
+        }
+        break;
+    }
+
+    SDL_UnlockSurface(surface);
+
+    SDL_SetColorKey(surface, 0, 0);
+    SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND);
+}
+
+int
+SDL_SetSurfaceColorMod(SDL_Surface * surface, Uint8 r, Uint8 g, Uint8 b)
+{
+    int flags;
+
+    if (!surface) {
+        return -1;
+    }
+
+    surface->map->info.r = r;
+    surface->map->info.g = g;
+    surface->map->info.b = b;
+
+    flags = surface->map->info.flags;
+    if (r != 0xFF || g != 0xFF || b != 0xFF) {
+        surface->map->info.flags |= SDL_COPY_MODULATE_COLOR;
+    } else {
+        surface->map->info.flags &= ~SDL_COPY_MODULATE_COLOR;
+    }
+    if (surface->map->info.flags != flags) {
+        SDL_InvalidateMap(surface->map);
+    }
+    return 0;
+}
+
+
+int
+SDL_GetSurfaceColorMod(SDL_Surface * surface, Uint8 * r, Uint8 * g, Uint8 * b)
+{
+    if (!surface) {
+        return -1;
+    }
+
+    if (r) {
+        *r = surface->map->info.r;
+    }
+    if (g) {
+        *g = surface->map->info.g;
+    }
+    if (b) {
+        *b = surface->map->info.b;
+    }
+    return 0;
+}
+
+int
+SDL_SetSurfaceAlphaMod(SDL_Surface * surface, Uint8 alpha)
+{
+    int flags;
+
+    if (!surface) {
+        return -1;
+    }
+
+    surface->map->info.a = alpha;
+
+    flags = surface->map->info.flags;
+    if (alpha != 0xFF) {
+        surface->map->info.flags |= SDL_COPY_MODULATE_ALPHA;
+    } else {
+        surface->map->info.flags &= ~SDL_COPY_MODULATE_ALPHA;
+    }
+    if (surface->map->info.flags != flags) {
+        SDL_InvalidateMap(surface->map);
+    }
+    return 0;
+}
+
+int
+SDL_GetSurfaceAlphaMod(SDL_Surface * surface, Uint8 * alpha)
+{
+    if (!surface) {
+        return -1;
+    }
+
+    if (alpha) {
+        *alpha = surface->map->info.a;
+    }
+    return 0;
+}
+
+int
+SDL_SetSurfaceBlendMode(SDL_Surface * surface, SDL_BlendMode blendMode)
+{
+    int flags, status;
+
+    if (!surface) {
+        return -1;
+    }
+
+    status = 0;
+    flags = surface->map->info.flags;
+    surface->map->info.flags &=
+        ~(SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD);
+    switch (blendMode) {
+    case SDL_BLENDMODE_NONE:
+        break;
+    case SDL_BLENDMODE_BLEND:
+        surface->map->info.flags |= SDL_COPY_BLEND;
+        break;
+    case SDL_BLENDMODE_ADD:
+        surface->map->info.flags |= SDL_COPY_ADD;
+        break;
+    case SDL_BLENDMODE_MOD:
+        surface->map->info.flags |= SDL_COPY_MOD;
+        break;
+    default:
+        status = SDL_Unsupported();
+        break;
+    }
+
+    if (surface->map->info.flags != flags) {
+        SDL_InvalidateMap(surface->map);
+    }
+
+    return status;
+}
+
+int
+SDL_GetSurfaceBlendMode(SDL_Surface * surface, SDL_BlendMode *blendMode)
+{
+    if (!surface) {
+        return -1;
+    }
+
+    if (!blendMode) {
+        return 0;
+    }
+
+    switch (surface->map->
+            info.flags & (SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD)) {
+    case SDL_COPY_BLEND:
+        *blendMode = SDL_BLENDMODE_BLEND;
+        break;
+    case SDL_COPY_ADD:
+        *blendMode = SDL_BLENDMODE_ADD;
+        break;
+    case SDL_COPY_MOD:
+        *blendMode = SDL_BLENDMODE_MOD;
+        break;
+    default:
+        *blendMode = SDL_BLENDMODE_NONE;
+        break;
+    }
+    return 0;
+}
+
+SDL_bool
+SDL_SetClipRect(SDL_Surface * surface, const SDL_Rect * rect)
+{
+    SDL_Rect full_rect;
+
+    /* Don't do anything if there's no surface to act on */
+    if (!surface) {
+        return SDL_FALSE;
+    }
+
+    /* Set up the full surface rectangle */
+    full_rect.x = 0;
+    full_rect.y = 0;
+    full_rect.w = surface->w;
+    full_rect.h = surface->h;
+
+    /* Set the clipping rectangle */
+    if (!rect) {
+        surface->clip_rect = full_rect;
+        return SDL_TRUE;
+    }
+    return SDL_IntersectRect(rect, &full_rect, &surface->clip_rect);
+}
+
+void
+SDL_GetClipRect(SDL_Surface * surface, SDL_Rect * rect)
+{
+    if (surface && rect) {
+        *rect = surface->clip_rect;
+    }
+}
+
+/*
+ * Set up a blit between two surfaces -- split into three parts:
+ * The upper part, SDL_UpperBlit(), performs clipping and rectangle
+ * verification.  The lower part is a pointer to a low level
+ * accelerated blitting function.
+ *
+ * These parts are separated out and each used internally by this
+ * library in the optimimum places.  They are exported so that if
+ * you know exactly what you are doing, you can optimize your code
+ * by calling the one(s) you need.
+ */
+int
+SDL_LowerBlit(SDL_Surface * src, SDL_Rect * srcrect,
+              SDL_Surface * dst, SDL_Rect * dstrect)
+{
+    /* Check to make sure the blit mapping is valid */
+    if ((src->map->dst != dst) ||
+        (dst->format->palette &&
+         src->map->dst_palette_version != dst->format->palette->version) ||
+        (src->format->palette &&
+         src->map->src_palette_version != src->format->palette->version)) {
+        if (SDL_MapSurface(src, dst) < 0) {
+            return (-1);
+        }
+        /* just here for debugging */
+/*         printf */
+/*             ("src = 0x%08X src->flags = %08X src->map->info.flags = %08x\ndst = 0x%08X dst->flags = %08X dst->map->info.flags = %08X\nsrc->map->blit = 0x%08x\n", */
+/*              src, dst->flags, src->map->info.flags, dst, dst->flags, */
+/*              dst->map->info.flags, src->map->blit); */
+    }
+    return (src->map->blit(src, srcrect, dst, dstrect));
+}
+
+
+int
+SDL_UpperBlit(SDL_Surface * src, const SDL_Rect * srcrect,
+              SDL_Surface * dst, SDL_Rect * dstrect)
+{
+    SDL_Rect fulldst;
+    int srcx, srcy, w, h;
+
+    /* Make sure the surfaces aren't locked */
+    if (!src || !dst) {
+        return SDL_SetError("SDL_UpperBlit: passed a NULL surface");
+    }
+    if (src->locked || dst->locked) {
+        return SDL_SetError("Surfaces must not be locked during blit");
+    }
+
+    /* If the destination rectangle is NULL, use the entire dest surface */
+    if (dstrect == NULL) {
+        fulldst.x = fulldst.y = 0;
+        fulldst.w = dst->w;
+        fulldst.h = dst->h;
+        dstrect = &fulldst;
+    }
+
+    /* clip the source rectangle to the source surface */
+    if (srcrect) {
+        int maxw, maxh;
+
+        srcx = srcrect->x;
+        w = srcrect->w;
+        if (srcx < 0) {
+            w += srcx;
+            dstrect->x -= srcx;
+            srcx = 0;
+        }
+        maxw = src->w - srcx;
+        if (maxw < w)
+            w = maxw;
+
+        srcy = srcrect->y;
+        h = srcrect->h;
+        if (srcy < 0) {
+            h += srcy;
+            dstrect->y -= srcy;
+            srcy = 0;
+        }
+        maxh = src->h - srcy;
+        if (maxh < h)
+            h = maxh;
+
+    } else {
+        srcx = srcy = 0;
+        w = src->w;
+        h = src->h;
+    }
+
+    /* clip the destination rectangle against the clip rectangle */
+    {
+        SDL_Rect *clip = &dst->clip_rect;
+        int dx, dy;
+
+        dx = clip->x - dstrect->x;
+        if (dx > 0) {
+            w -= dx;
+            dstrect->x += dx;
+            srcx += dx;
+        }
+        dx = dstrect->x + w - clip->x - clip->w;
+        if (dx > 0)
+            w -= dx;
+
+        dy = clip->y - dstrect->y;
+        if (dy > 0) {
+            h -= dy;
+            dstrect->y += dy;
+            srcy += dy;
+        }
+        dy = dstrect->y + h - clip->y - clip->h;
+        if (dy > 0)
+            h -= dy;
+    }
+
+    /* Switch back to a fast blit if we were previously stretching */
+    if (src->map->info.flags & SDL_COPY_NEAREST) {
+        src->map->info.flags &= ~SDL_COPY_NEAREST;
+        SDL_InvalidateMap(src->map);
+    }
+
+    if (w > 0 && h > 0) {
+        SDL_Rect sr;
+        sr.x = srcx;
+        sr.y = srcy;
+        sr.w = dstrect->w = w;
+        sr.h = dstrect->h = h;
+        return SDL_LowerBlit(src, &sr, dst, dstrect);
+    }
+    dstrect->w = dstrect->h = 0;
+    return 0;
+}
+
+int
+SDL_UpperBlitScaled(SDL_Surface * src, const SDL_Rect * srcrect,
+              SDL_Surface * dst, SDL_Rect * dstrect)
+{
+    SDL_Rect final_src, final_dst, fulldst;
+
+    /* Make sure the surfaces aren't locked */
+    if (!src || !dst) {
+        return SDL_SetError("SDL_UpperBlitScaled: passed a NULL surface");
+    }
+    if (src->locked || dst->locked) {
+        return SDL_SetError("Surfaces must not be locked during blit");
+    }
+
+    /* If the destination rectangle is NULL, use the entire dest surface */
+    if (dstrect == NULL) {
+        fulldst.x = fulldst.y = 0;
+        fulldst.w = dst->w;
+        fulldst.h = dst->h;
+        dstrect = &fulldst;
+    }
+
+    /* clip the source rectangle to the source surface */
+    if (srcrect) {
+        int maxw, maxh;
+
+        final_src.x = srcrect->x;
+        final_src.w = srcrect->w;
+        if (final_src.x < 0) {
+            final_src.w += final_src.x;
+            final_src.x = 0;
+        }
+        maxw = src->w - final_src.x;
+        if (maxw < final_src.w)
+            final_src.w = maxw;
+
+        final_src.y = srcrect->y;
+        final_src.h = srcrect->h;
+        if (final_src.y < 0) {
+            final_src.h += final_src.y;
+            final_src.y = 0;
+        }
+        maxh = src->h - final_src.y;
+        if (maxh < final_src.h)
+            final_src.h = maxh;
+
+    } else {
+        final_src.x = final_src.y = 0;
+        final_src.w = src->w;
+        final_src.h = src->h;
+    }
+
+    /* clip the destination rectangle against the clip rectangle */
+    if (dstrect) {
+        int maxw, maxh;
+
+        final_dst.x = dstrect->x;
+        final_dst.w = dstrect->w;
+        if (final_dst.x < 0) {
+            final_dst.w += final_dst.x;
+            final_dst.x = 0;
+        }
+        maxw = dst->w - final_dst.x;
+        if (maxw < final_dst.w)
+            final_dst.w = maxw;
+
+        final_dst.y = dstrect->y;
+        final_dst.h = dstrect->h;
+        if (final_dst.y < 0) {
+            final_dst.h += final_dst.y;
+            final_dst.y = 0;
+        }
+        maxh = dst->h - final_dst.y;
+        if (maxh < final_dst.h)
+            final_dst.h = maxh;
+    } else {
+        final_dst.x = final_dst.y = 0;
+        final_dst.w = dst->w;
+        final_dst.h = dst->h;
+    }
+
+    if (final_dst.w > 0 && final_dst.h > 0) {
+        return SDL_LowerBlitScaled(src, &final_src, dst, &final_dst);
+    }
+
+    return 0;
+}
+
+/**
+ *  This is a semi-private blit function and it performs low-level surface
+ *  scaled blitting only.
+ */
+int
+SDL_LowerBlitScaled(SDL_Surface * src, SDL_Rect * srcrect,
+                SDL_Surface * dst, SDL_Rect * dstrect)
+{
+    static const Uint32 complex_copy_flags = (
+        SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA |
+        SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD |
+        SDL_COPY_COLORKEY
+    );
+
+    /* Save off the original dst width, height */
+    int dstW = dstrect->w;
+    int dstH = dstrect->h;
+    SDL_Rect full_rect;
+    SDL_Rect final_dst = *dstrect;
+    SDL_Rect final_src = *srcrect;
+
+    /* Clip the dst surface to the dstrect */
+    full_rect.x = 0;
+    full_rect.y = 0;
+    full_rect.w = dst->w;
+    full_rect.h = dst->h;
+    if (!SDL_IntersectRect(&final_dst, &full_rect, &final_dst)) {
+        return 0;
+    }
+
+    /* Did the dst width change? */
+    if ( dstW != final_dst.w ) {
+        /* scale the src width appropriately */
+        final_src.w = final_src.w * dst->clip_rect.w / dstW;
+    }
+
+    /* Did the dst height change? */
+    if ( dstH != final_dst.h ) {
+        /* scale the src width appropriately */
+        final_src.h = final_src.h * dst->clip_rect.h / dstH;
+    }
+
+    /* Clip the src surface to the srcrect */
+    full_rect.x = 0;
+    full_rect.y = 0;
+    full_rect.w = src->w;
+    full_rect.h = src->h;
+    if (!SDL_IntersectRect(&final_src, &full_rect, &final_src)) {
+        return 0;
+    }
+
+    if (!(src->map->info.flags & SDL_COPY_NEAREST)) {
+        src->map->info.flags |= SDL_COPY_NEAREST;
+        SDL_InvalidateMap(src->map);
+    }
+
+    if ( !(src->map->info.flags & complex_copy_flags) &&
+         src->format->format == dst->format->format &&
+         !SDL_ISPIXELFORMAT_INDEXED(src->format->format) ) {
+        return SDL_SoftStretch( src, &final_src, dst, &final_dst );
+    } else {
+        return SDL_LowerBlit( src, &final_src, dst, &final_dst );
+    }
+}
+
+/*
+ * Lock a surface to directly access the pixels
+ */
+int
+SDL_LockSurface(SDL_Surface * surface)
+{
+    if (!surface->locked) {
+        /* Perform the lock */
+        if (surface->flags & SDL_RLEACCEL) {
+            SDL_UnRLESurface(surface, 1);
+            surface->flags |= SDL_RLEACCEL;     /* save accel'd state */
+        }
+    }
+
+    /* Increment the surface lock count, for recursive locks */
+    ++surface->locked;
+
+    /* Ready to go.. */
+    return (0);
+}
+
+/*
+ * Unlock a previously locked surface
+ */
+void
+SDL_UnlockSurface(SDL_Surface * surface)
+{
+    /* Only perform an unlock if we are locked */
+    if (!surface->locked || (--surface->locked > 0)) {
+        return;
+    }
+
+    /* Update RLE encoded surface with new data */
+    if ((surface->flags & SDL_RLEACCEL) == SDL_RLEACCEL) {
+        surface->flags &= ~SDL_RLEACCEL;        /* stop lying */
+        SDL_RLESurface(surface);
+    }
+}
+
+/*
+ * Convert a surface into the specified pixel format.
+ */
+SDL_Surface *
+SDL_ConvertSurface(SDL_Surface * surface, const SDL_PixelFormat * format,
+                   Uint32 flags)
+{
+    SDL_Surface *convert;
+    Uint32 copy_flags;
+    SDL_Color copy_color;
+    SDL_Rect bounds;
+
+    /* Check for empty destination palette! (results in empty image) */
+    if (format->palette != NULL) {
+        int i;
+        for (i = 0; i < format->palette->ncolors; ++i) {
+            if ((format->palette->colors[i].r != 0xFF) ||
+                (format->palette->colors[i].g != 0xFF) ||
+                (format->palette->colors[i].b != 0xFF))
+                break;
+        }
+        if (i == format->palette->ncolors) {
+            SDL_SetError("Empty destination palette");
+            return (NULL);
+        }
+    }
+
+    /* Create a new surface with the desired format */
+    convert = SDL_CreateRGBSurface(flags, surface->w, surface->h,
+                                   format->BitsPerPixel, format->Rmask,
+                                   format->Gmask, format->Bmask,
+                                   format->Amask);
+    if (convert == NULL) {
+        return (NULL);
+    }
+
+    /* Copy the palette if any */
+    if (format->palette && convert->format->palette) {
+        SDL_memcpy(convert->format->palette->colors,
+                   format->palette->colors,
+                   format->palette->ncolors * sizeof(SDL_Color));
+        convert->format->palette->ncolors = format->palette->ncolors;
+    }
+
+    /* Save the original copy flags */
+    copy_flags = surface->map->info.flags;
+    copy_color.r = surface->map->info.r;
+    copy_color.g = surface->map->info.g;
+    copy_color.b = surface->map->info.b;
+    copy_color.a = surface->map->info.a;
+    surface->map->info.r = 0xFF;
+    surface->map->info.g = 0xFF;
+    surface->map->info.b = 0xFF;
+    surface->map->info.a = 0xFF;
+    surface->map->info.flags = 0;
+    SDL_InvalidateMap(surface->map);
+
+    /* Copy over the image data */
+    bounds.x = 0;
+    bounds.y = 0;
+    bounds.w = surface->w;
+    bounds.h = surface->h;
+    SDL_LowerBlit(surface, &bounds, convert, &bounds);
+
+    /* Clean up the original surface, and update converted surface */
+    convert->map->info.r = copy_color.r;
+    convert->map->info.g = copy_color.g;
+    convert->map->info.b = copy_color.b;
+    convert->map->info.a = copy_color.a;
+    convert->map->info.flags =
+        (copy_flags &
+         ~(SDL_COPY_COLORKEY | SDL_COPY_BLEND
+           | SDL_COPY_RLE_DESIRED | SDL_COPY_RLE_COLORKEY |
+           SDL_COPY_RLE_ALPHAKEY));
+    surface->map->info.r = copy_color.r;
+    surface->map->info.g = copy_color.g;
+    surface->map->info.b = copy_color.b;
+    surface->map->info.a = copy_color.a;
+    surface->map->info.flags = copy_flags;
+    SDL_InvalidateMap(surface->map);
+    if (copy_flags & SDL_COPY_COLORKEY) {
+        SDL_bool set_colorkey_by_color = SDL_FALSE;
+
+        if (surface->format->palette) {
+            if (format->palette &&
+                surface->format->palette->ncolors <= format->palette->ncolors &&
+                (SDL_memcmp(surface->format->palette->colors, format->palette->colors,
+                  surface->format->palette->ncolors * sizeof(SDL_Color)) == 0)) {
+                /* The palette is identical, just set the same colorkey */
+                SDL_SetColorKey(convert, 1, surface->map->info.colorkey);
+            } else if (format->Amask) {
+                /* The alpha was set in the destination from the palette */
+            } else {
+                set_colorkey_by_color = SDL_TRUE;
+            }
+        } else {
+            set_colorkey_by_color = SDL_TRUE;
+        }
+
+        if (set_colorkey_by_color) {
+            /* Set the colorkey by color, which needs to be unique */
+            Uint8 keyR, keyG, keyB, keyA;
+
+            SDL_GetRGBA(surface->map->info.colorkey, surface->format, &keyR,
+                        &keyG, &keyB, &keyA);
+            SDL_SetColorKey(convert, 1,
+                            SDL_MapRGBA(convert->format, keyR, keyG, keyB, keyA));
+            /* This is needed when converting for 3D texture upload */
+            SDL_ConvertColorkeyToAlpha(convert);
+        }
+    }
+    SDL_SetClipRect(convert, &surface->clip_rect);
+
+    /* Enable alpha blending by default if the new surface has an
+     * alpha channel or alpha modulation */
+    if ((surface->format->Amask && format->Amask) ||
+        (copy_flags & (SDL_COPY_COLORKEY|SDL_COPY_MODULATE_ALPHA))) {
+        SDL_SetSurfaceBlendMode(convert, SDL_BLENDMODE_BLEND);
+    }
+    if ((copy_flags & SDL_COPY_RLE_DESIRED) || (flags & SDL_RLEACCEL)) {
+        SDL_SetSurfaceRLE(convert, SDL_RLEACCEL);
+    }
+
+    /* We're ready to go! */
+    return (convert);
+}
+
+SDL_Surface *
+SDL_ConvertSurfaceFormat(SDL_Surface * surface, Uint32 pixel_format,
+                         Uint32 flags)
+{
+    SDL_PixelFormat *fmt;
+    SDL_Surface *convert = NULL;
+
+    fmt = SDL_AllocFormat(pixel_format);
+    if (fmt) {
+        convert = SDL_ConvertSurface(surface, fmt, flags);
+        SDL_FreeFormat(fmt);
+    }
+    return convert;
+}
+
+/*
+ * Create a surface on the stack for quick blit operations
+ */
+static SDL_INLINE SDL_bool
+SDL_CreateSurfaceOnStack(int width, int height, Uint32 pixel_format,
+                         void * pixels, int pitch, SDL_Surface * surface,
+                         SDL_PixelFormat * format, SDL_BlitMap * blitmap)
+{
+    if (SDL_ISPIXELFORMAT_INDEXED(pixel_format)) {
+        SDL_SetError("Indexed pixel formats not supported");
+        return SDL_FALSE;
+    }
+    if (SDL_InitFormat(format, pixel_format) < 0) {
+        return SDL_FALSE;
+    }
+
+    SDL_zerop(surface);
+    surface->flags = SDL_PREALLOC;
+    surface->format = format;
+    surface->pixels = pixels;
+    surface->w = width;
+    surface->h = height;
+    surface->pitch = pitch;
+    /* We don't actually need to set up the clip rect for our purposes */
+    /* SDL_SetClipRect(surface, NULL); */
+
+    /* Allocate an empty mapping */
+    SDL_zerop(blitmap);
+    blitmap->info.r = 0xFF;
+    blitmap->info.g = 0xFF;
+    blitmap->info.b = 0xFF;
+    blitmap->info.a = 0xFF;
+    surface->map = blitmap;
+
+    /* The surface is ready to go */
+    surface->refcount = 1;
+    return SDL_TRUE;
+}
+
+/*
+ * Copy a block of pixels of one format to another format
+ */
+int SDL_ConvertPixels(int width, int height,
+                      Uint32 src_format, const void * src, int src_pitch,
+                      Uint32 dst_format, void * dst, int dst_pitch)
+{
+    SDL_Surface src_surface, dst_surface;
+    SDL_PixelFormat src_fmt, dst_fmt;
+    SDL_BlitMap src_blitmap, dst_blitmap;
+    SDL_Rect rect;
+    void *nonconst_src = (void *) src;
+
+    /* Check to make sure we are bliting somewhere, so we don't crash */
+    if (!dst) {
+        return SDL_InvalidParamError("dst");
+    }
+    if (!dst_pitch) {
+        return SDL_InvalidParamError("dst_pitch");
+    }
+
+    /* Fast path for same format copy */
+    if (src_format == dst_format) {
+        int bpp;
+
+        if (SDL_ISPIXELFORMAT_FOURCC(src_format)) {
+            switch (src_format) {
+            case SDL_PIXELFORMAT_YV12:
+            case SDL_PIXELFORMAT_IYUV:
+            case SDL_PIXELFORMAT_YUY2:
+            case SDL_PIXELFORMAT_UYVY:
+            case SDL_PIXELFORMAT_YVYU:
+                bpp = 2;
+                break;
+            default:
+                return SDL_SetError("Unknown FOURCC pixel format");
+            }
+        } else {
+            bpp = SDL_BYTESPERPIXEL(src_format);
+        }
+        width *= bpp;
+
+        while (height-- > 0) {
+            SDL_memcpy(dst, src, width);
+            src = (Uint8*)src + src_pitch;
+            dst = (Uint8*)dst + dst_pitch;
+        }
+        return 0;
+    }
+
+    if (!SDL_CreateSurfaceOnStack(width, height, src_format, nonconst_src,
+                                  src_pitch,
+                                  &src_surface, &src_fmt, &src_blitmap)) {
+        return -1;
+    }
+    if (!SDL_CreateSurfaceOnStack(width, height, dst_format, dst, dst_pitch,
+                                  &dst_surface, &dst_fmt, &dst_blitmap)) {
+        return -1;
+    }
+
+    /* Set up the rect and go! */
+    rect.x = 0;
+    rect.y = 0;
+    rect.w = width;
+    rect.h = height;
+    return SDL_LowerBlit(&src_surface, &rect, &dst_surface, &rect);
+}
+
+/*
+ * Free a surface created by the above function.
+ */
+void
+SDL_FreeSurface(SDL_Surface * surface)
+{
+    if (surface == NULL) {
+        return;
+    }
+    if (surface->flags & SDL_DONTFREE) {
+        return;
+    }
+    if (--surface->refcount > 0) {
+        return;
+    }
+    while (surface->locked > 0) {
+        SDL_UnlockSurface(surface);
+    }
+    if (surface->flags & SDL_RLEACCEL) {
+        SDL_UnRLESurface(surface, 0);
+    }
+    if (surface->format) {
+        SDL_SetSurfacePalette(surface, NULL);
+        SDL_FreeFormat(surface->format);
+        surface->format = NULL;
+    }
+    if (surface->map != NULL) {
+        SDL_FreeBlitMap(surface->map);
+        surface->map = NULL;
+    }
+    if (!(surface->flags & SDL_PREALLOC)) {
+        SDL_free(surface->pixels);
+    }
+    SDL_free(surface);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_sysvideo.h b/Source/3rd Party/sdl/src/video/SDL_sysvideo.h
new file mode 100644
index 000000000..32b5d77a2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_sysvideo.h	
@@ -0,0 +1,410 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+#ifndef _SDL_sysvideo_h
+#define _SDL_sysvideo_h
+
+#include "SDL_messagebox.h"
+#include "SDL_shape.h"
+#include "SDL_thread.h"
+
+/* The SDL video driver */
+
+typedef struct SDL_WindowShaper SDL_WindowShaper;
+typedef struct SDL_ShapeDriver SDL_ShapeDriver;
+typedef struct SDL_VideoDisplay SDL_VideoDisplay;
+typedef struct SDL_VideoDevice SDL_VideoDevice;
+
+/* Define the SDL window-shaper structure */
+struct SDL_WindowShaper
+{
+    /* The window associated with the shaper */
+    SDL_Window *window;
+
+    /* The user's specified coordinates for the window, for once we give it a shape. */
+    Uint32 userx,usery;
+
+    /* The parameters for shape calculation. */
+    SDL_WindowShapeMode mode;
+
+    /* Has this window been assigned a shape? */
+    SDL_bool hasshape;
+
+    void *driverdata;
+};
+
+/* Define the SDL shape driver structure */
+struct SDL_ShapeDriver
+{
+    SDL_WindowShaper *(*CreateShaper)(SDL_Window * window);
+    int (*SetWindowShape)(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
+    int (*ResizeWindowShape)(SDL_Window *window);
+};
+
+typedef struct SDL_WindowUserData
+{
+    char *name;
+    void *data;
+    struct SDL_WindowUserData *next;
+} SDL_WindowUserData;
+
+/* Define the SDL window structure, corresponding to toplevel windows */
+struct SDL_Window
+{
+    const void *magic;
+    Uint32 id;
+    char *title;
+    SDL_Surface *icon;
+    int x, y;
+    int w, h;
+    int min_w, min_h;
+    int max_w, max_h;
+    Uint32 flags;
+    Uint32 last_fullscreen_flags;
+
+    /* Stored position and size for windowed mode */
+    SDL_Rect windowed;
+
+    SDL_DisplayMode fullscreen_mode;
+
+    float brightness;
+    Uint16 *gamma;
+    Uint16 *saved_gamma;        /* (just offset into gamma) */
+
+    SDL_Surface *surface;
+    SDL_bool surface_valid;
+
+    SDL_bool is_destroying;
+
+    SDL_WindowShaper *shaper;
+
+    SDL_WindowUserData *data;
+
+    void *driverdata;
+
+    SDL_Window *prev;
+    SDL_Window *next;
+};
+#define FULLSCREEN_VISIBLE(W) \
+    (((W)->flags & SDL_WINDOW_FULLSCREEN) && \
+     ((W)->flags & SDL_WINDOW_SHOWN) && \
+     !((W)->flags & SDL_WINDOW_MINIMIZED))
+
+/*
+ * Define the SDL display structure This corresponds to physical monitors
+ * attached to the system.
+ */
+struct SDL_VideoDisplay
+{
+    char *name;
+    int max_display_modes;
+    int num_display_modes;
+    SDL_DisplayMode *display_modes;
+    SDL_DisplayMode desktop_mode;
+    SDL_DisplayMode current_mode;
+
+    SDL_Window *fullscreen_window;
+
+    SDL_VideoDevice *device;
+
+    void *driverdata;
+};
+
+/* Forward declaration */
+struct SDL_SysWMinfo;
+
+/* Define the SDL video driver structure */
+#define _THIS   SDL_VideoDevice *_this
+
+struct SDL_VideoDevice
+{
+    /* * * */
+    /* The name of this video driver */
+    const char *name;
+
+    /* * * */
+    /* Initialization/Query functions */
+
+    /*
+     * Initialize the native video subsystem, filling in the list of
+     * displays for this driver, returning 0 or -1 if there's an error.
+     */
+    int (*VideoInit) (_THIS);
+
+    /*
+     * Reverse the effects VideoInit() -- called if VideoInit() fails or
+     * if the application is shutting down the video subsystem.
+     */
+    void (*VideoQuit) (_THIS);
+
+    /* * * */
+    /*
+     * Display functions
+     */
+
+    /*
+     * Get the bounds of a display
+     */
+    int (*GetDisplayBounds) (_THIS, SDL_VideoDisplay * display, SDL_Rect * rect);
+
+    /*
+     * Get a list of the available display modes for a display.
+     */
+    void (*GetDisplayModes) (_THIS, SDL_VideoDisplay * display);
+
+    /*
+     * Setting the display mode is independent of creating windows, so
+     * when the display mode is changed, all existing windows should have
+     * their data updated accordingly, including the display surfaces
+     * associated with them.
+     */
+    int (*SetDisplayMode) (_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+
+    /* * * */
+    /*
+     * Window functions
+     */
+    int (*CreateWindow) (_THIS, SDL_Window * window);
+    int (*CreateWindowFrom) (_THIS, SDL_Window * window, const void *data);
+    void (*SetWindowTitle) (_THIS, SDL_Window * window);
+    void (*SetWindowIcon) (_THIS, SDL_Window * window, SDL_Surface * icon);
+    void (*SetWindowPosition) (_THIS, SDL_Window * window);
+    void (*SetWindowSize) (_THIS, SDL_Window * window);
+    void (*SetWindowMinimumSize) (_THIS, SDL_Window * window);
+    void (*SetWindowMaximumSize) (_THIS, SDL_Window * window);
+    void (*ShowWindow) (_THIS, SDL_Window * window);
+    void (*HideWindow) (_THIS, SDL_Window * window);
+    void (*RaiseWindow) (_THIS, SDL_Window * window);
+    void (*MaximizeWindow) (_THIS, SDL_Window * window);
+    void (*MinimizeWindow) (_THIS, SDL_Window * window);
+    void (*RestoreWindow) (_THIS, SDL_Window * window);
+    void (*SetWindowBordered) (_THIS, SDL_Window * window, SDL_bool bordered);
+    void (*SetWindowFullscreen) (_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen);
+    int (*SetWindowGammaRamp) (_THIS, SDL_Window * window, const Uint16 * ramp);
+    int (*GetWindowGammaRamp) (_THIS, SDL_Window * window, Uint16 * ramp);
+    void (*SetWindowGrab) (_THIS, SDL_Window * window, SDL_bool grabbed);
+    void (*DestroyWindow) (_THIS, SDL_Window * window);
+    int (*CreateWindowFramebuffer) (_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch);
+    int (*UpdateWindowFramebuffer) (_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects);
+    void (*DestroyWindowFramebuffer) (_THIS, SDL_Window * window);
+    void (*OnWindowEnter) (_THIS, SDL_Window * window);
+
+    /* * * */
+    /*
+     * Shaped-window functions
+     */
+    SDL_ShapeDriver shape_driver;
+
+    /* Get some platform dependent window information */
+      SDL_bool(*GetWindowWMInfo) (_THIS, SDL_Window * window,
+                                  struct SDL_SysWMinfo * info);
+
+    /* * * */
+    /*
+     * OpenGL support
+     */
+    int (*GL_LoadLibrary) (_THIS, const char *path);
+    void *(*GL_GetProcAddress) (_THIS, const char *proc);
+    void (*GL_UnloadLibrary) (_THIS);
+      SDL_GLContext(*GL_CreateContext) (_THIS, SDL_Window * window);
+    int (*GL_MakeCurrent) (_THIS, SDL_Window * window, SDL_GLContext context);
+    void (*GL_GetDrawableSize) (_THIS, SDL_Window * window, int *w, int *h);
+    int (*GL_SetSwapInterval) (_THIS, int interval);
+    int (*GL_GetSwapInterval) (_THIS);
+    void (*GL_SwapWindow) (_THIS, SDL_Window * window);
+    void (*GL_DeleteContext) (_THIS, SDL_GLContext context);
+
+    /* * * */
+    /*
+     * Event manager functions
+     */
+    void (*PumpEvents) (_THIS);
+
+    /* Suspend the screensaver */
+    void (*SuspendScreenSaver) (_THIS);
+
+    /* Text input */
+    void (*StartTextInput) (_THIS);
+    void (*StopTextInput) (_THIS);
+    void (*SetTextInputRect) (_THIS, SDL_Rect *rect);
+
+    /* Screen keyboard */
+    SDL_bool (*HasScreenKeyboardSupport) (_THIS);
+    void (*ShowScreenKeyboard) (_THIS, SDL_Window *window);
+    void (*HideScreenKeyboard) (_THIS, SDL_Window *window);
+    SDL_bool (*IsScreenKeyboardShown) (_THIS, SDL_Window *window);
+
+    /* Clipboard */
+    int (*SetClipboardText) (_THIS, const char *text);
+    char * (*GetClipboardText) (_THIS);
+    SDL_bool (*HasClipboardText) (_THIS);
+
+    /* MessageBox */
+    int (*ShowMessageBox) (_THIS, const SDL_MessageBoxData *messageboxdata, int *buttonid);
+
+    /* * * */
+    /* Data common to all drivers */
+    SDL_bool suspend_screensaver;
+    int num_displays;
+    SDL_VideoDisplay *displays;
+    SDL_Window *windows;
+    Uint8 window_magic;
+    Uint32 next_object_id;
+    char * clipboard_text;
+
+    /* * * */
+    /* Data used by the GL drivers */
+    struct
+    {
+        int red_size;
+        int green_size;
+        int blue_size;
+        int alpha_size;
+        int depth_size;
+        int buffer_size;
+        int stencil_size;
+        int double_buffer;
+        int accum_red_size;
+        int accum_green_size;
+        int accum_blue_size;
+        int accum_alpha_size;
+        int stereo;
+        int multisamplebuffers;
+        int multisamplesamples;
+        int accelerated;
+        int major_version;
+        int minor_version;
+        int flags;
+        int profile_mask;
+        int share_with_current_context;
+        int framebuffer_srgb_capable;
+        int retained_backing;
+        int driver_loaded;
+        char driver_path[256];
+        void *dll_handle;
+    } gl_config;
+
+    /* * * */
+    /* Cache current GL context; don't call the OS when it hasn't changed. */
+    /* We have the global pointers here so Cocoa continues to work the way
+       it always has, and the thread-local storage for the general case.
+     */
+    SDL_Window *current_glwin;
+    SDL_GLContext current_glctx;
+    SDL_TLSID current_glwin_tls;
+    SDL_TLSID current_glctx_tls;
+
+    /* * * */
+    /* Data private to this driver */
+    void *driverdata;
+    struct SDL_GLDriverData *gl_data;
+    
+#if SDL_VIDEO_OPENGL_EGL
+    struct SDL_EGL_VideoData *egl_data;
+#endif
+    
+#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+    struct SDL_PrivateGLESData *gles_data;
+#endif
+
+    /* * * */
+    /* The function used to dispose of this structure */
+    void (*free) (_THIS);
+};
+
+typedef struct VideoBootStrap
+{
+    const char *name;
+    const char *desc;
+    int (*available) (void);
+    SDL_VideoDevice *(*create) (int devindex);
+} VideoBootStrap;
+
+#if SDL_VIDEO_DRIVER_COCOA
+extern VideoBootStrap COCOA_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_X11
+extern VideoBootStrap X11_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_MIR
+extern VideoBootStrap MIR_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_DIRECTFB
+extern VideoBootStrap DirectFB_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_WINDOWS
+extern VideoBootStrap WINDOWS_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_WINRT
+extern VideoBootStrap WINRT_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_HAIKU
+extern VideoBootStrap HAIKU_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_PANDORA
+extern VideoBootStrap PND_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_UIKIT
+extern VideoBootStrap UIKIT_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_ANDROID
+extern VideoBootStrap Android_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_PSP
+extern VideoBootStrap PSP_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_RPI
+extern VideoBootStrap RPI_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_DUMMY
+extern VideoBootStrap DUMMY_bootstrap;
+#endif
+#if SDL_VIDEO_DRIVER_WAYLAND
+extern VideoBootStrap Wayland_bootstrap;
+#endif
+
+extern SDL_VideoDevice *SDL_GetVideoDevice(void);
+extern int SDL_AddBasicVideoDisplay(const SDL_DisplayMode * desktop_mode);
+extern int SDL_AddVideoDisplay(const SDL_VideoDisplay * display);
+extern SDL_bool SDL_AddDisplayMode(SDL_VideoDisplay *display, const SDL_DisplayMode * mode);
+extern SDL_VideoDisplay *SDL_GetDisplayForWindow(SDL_Window *window);
+extern void *SDL_GetDisplayDriverData( int displayIndex );
+
+extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
+
+extern void SDL_OnWindowShown(SDL_Window * window);
+extern void SDL_OnWindowHidden(SDL_Window * window);
+extern void SDL_OnWindowResized(SDL_Window * window);
+extern void SDL_OnWindowMinimized(SDL_Window * window);
+extern void SDL_OnWindowRestored(SDL_Window * window);
+extern void SDL_OnWindowEnter(SDL_Window * window);
+extern void SDL_OnWindowLeave(SDL_Window * window);
+extern void SDL_OnWindowFocusGained(SDL_Window * window);
+extern void SDL_OnWindowFocusLost(SDL_Window * window);
+extern void SDL_UpdateWindowGrab(SDL_Window * window);
+extern SDL_Window * SDL_GetFocusWindow(void);
+
+extern SDL_bool SDL_ShouldAllowTopmost(void);
+
+#endif /* _SDL_sysvideo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/SDL_video.c b/Source/3rd Party/sdl/src/video/SDL_video.c
new file mode 100644
index 000000000..a97051a8f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/SDL_video.c	
@@ -0,0 +1,3345 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* The high-level video driver subsystem */
+
+#include "SDL.h"
+#include "SDL_video.h"
+#include "SDL_sysvideo.h"
+#include "SDL_blit.h"
+#include "SDL_pixels_c.h"
+#include "SDL_rect_c.h"
+#include "../events/SDL_events_c.h"
+#include "../timer/SDL_timer_c.h"
+
+#include "SDL_syswm.h"
+
+#if SDL_VIDEO_OPENGL
+#include "SDL_opengl.h"
+#endif /* SDL_VIDEO_OPENGL */
+
+#if SDL_VIDEO_OPENGL_ES
+#include "SDL_opengles.h"
+#endif /* SDL_VIDEO_OPENGL_ES */
+
+/* GL and GLES2 headers conflict on Linux 32 bits */
+#if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL
+#include "SDL_opengles2.h"
+#endif /* SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL */
+
+/* On Windows, windows.h defines CreateWindow */
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
+/* Available video drivers */
+static VideoBootStrap *bootstrap[] = {
+#if SDL_VIDEO_DRIVER_COCOA
+    &COCOA_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_X11
+    &X11_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_MIR
+    &MIR_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_DIRECTFB
+    &DirectFB_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_WINDOWS
+    &WINDOWS_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_WINRT
+    &WINRT_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_HAIKU
+    &HAIKU_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_PANDORA
+    &PND_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_UIKIT
+    &UIKIT_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_ANDROID
+    &Android_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_PSP
+    &PSP_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_RPI
+    &RPI_bootstrap,
+#endif 
+#if SDL_VIDEO_DRIVER_WAYLAND
+    &Wayland_bootstrap,
+#endif
+#if SDL_VIDEO_DRIVER_DUMMY
+    &DUMMY_bootstrap,
+#endif
+    NULL
+};
+
+static SDL_VideoDevice *_this = NULL;
+
+#define CHECK_WINDOW_MAGIC(window, retval) \
+    if (!_this) { \
+        SDL_UninitializedVideo(); \
+        return retval; \
+    } \
+    if (!window || window->magic != &_this->window_magic) { \
+        SDL_SetError("Invalid window"); \
+        return retval; \
+    }
+
+#define CHECK_DISPLAY_INDEX(displayIndex, retval) \
+    if (!_this) { \
+        SDL_UninitializedVideo(); \
+        return retval; \
+    } \
+    if (displayIndex < 0 || displayIndex >= _this->num_displays) { \
+        SDL_SetError("displayIndex must be in the range 0 - %d", \
+                     _this->num_displays - 1); \
+        return retval; \
+    }
+
+#define FULLSCREEN_MASK ( SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_FULLSCREEN )
+
+#ifdef __MACOSX__
+/* Support for Mac OS X fullscreen spaces */
+extern SDL_bool Cocoa_IsWindowInFullscreenSpace(SDL_Window * window);
+extern SDL_bool Cocoa_SetWindowFullscreenSpace(SDL_Window * window, SDL_bool state);
+#endif
+
+
+/* Support for framebuffer emulation using an accelerated renderer */
+
+#define SDL_WINDOWTEXTUREDATA   "_SDL_WindowTextureData"
+
+typedef struct {
+    SDL_Renderer *renderer;
+    SDL_Texture *texture;
+    void *pixels;
+    int pitch;
+    int bytes_per_pixel;
+} SDL_WindowTextureData;
+
+static SDL_bool
+ShouldUseTextureFramebuffer()
+{
+    const char *hint;
+
+    /* If there's no native framebuffer support then there's no option */
+    if (!_this->CreateWindowFramebuffer) {
+        return SDL_TRUE;
+    }
+
+    /* If the user has specified a software renderer we can't use a
+       texture framebuffer, or renderer creation will go recursive.
+     */
+    hint = SDL_GetHint(SDL_HINT_RENDER_DRIVER);
+    if (hint && SDL_strcasecmp(hint, "software") == 0) {
+        return SDL_FALSE;
+    }
+
+    /* See if the user or application wants a specific behavior */
+    hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION);
+    if (hint) {
+        if (*hint == '0') {
+            return SDL_FALSE;
+        } else {
+            return SDL_TRUE;
+        }
+    }
+
+    /* Each platform has different performance characteristics */
+#if defined(__WIN32__)
+    /* GDI BitBlt() is way faster than Direct3D dynamic textures right now.
+     */
+    return SDL_FALSE;
+
+#elif defined(__MACOSX__)
+    /* Mac OS X uses OpenGL as the native fast path */
+    return SDL_TRUE;
+
+#elif defined(__LINUX__)
+    /* Properly configured OpenGL drivers are faster than MIT-SHM */
+#if SDL_VIDEO_OPENGL
+    /* Ugh, find a way to cache this value! */
+    {
+        SDL_Window *window;
+        SDL_GLContext context;
+        SDL_bool hasAcceleratedOpenGL = SDL_FALSE;
+
+        window = SDL_CreateWindow("OpenGL test", -32, -32, 32, 32, SDL_WINDOW_OPENGL|SDL_WINDOW_HIDDEN);
+        if (window) {
+            context = SDL_GL_CreateContext(window);
+            if (context) {
+                const GLubyte *(APIENTRY * glGetStringFunc) (GLenum);
+                const char *vendor = NULL;
+
+                glGetStringFunc = SDL_GL_GetProcAddress("glGetString");
+                if (glGetStringFunc) {
+                    vendor = (const char *) glGetStringFunc(GL_VENDOR);
+                }
+                /* Add more vendors here at will... */
+                if (vendor &&
+                    (SDL_strstr(vendor, "ATI Technologies") ||
+                     SDL_strstr(vendor, "NVIDIA"))) {
+                    hasAcceleratedOpenGL = SDL_TRUE;
+                }
+                SDL_GL_DeleteContext(context);
+            }
+            SDL_DestroyWindow(window);
+        }
+        return hasAcceleratedOpenGL;
+    }
+#elif SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+    /* Let's be optimistic about this! */
+    return SDL_TRUE;
+#else
+    return SDL_FALSE;
+#endif
+
+#else
+    /* Play it safe, assume that if there is a framebuffer driver that it's
+       optimized for the current platform.
+    */
+    return SDL_FALSE;
+#endif
+}
+
+static int
+SDL_CreateWindowTexture(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch)
+{
+    SDL_WindowTextureData *data;
+    SDL_RendererInfo info;
+    Uint32 i;
+
+    data = SDL_GetWindowData(window, SDL_WINDOWTEXTUREDATA);
+    if (!data) {
+        SDL_Renderer *renderer = NULL;
+        SDL_RendererInfo info;
+        int i;
+        const char *hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION);
+
+        /* Check to see if there's a specific driver requested */
+        if (hint && *hint != '0' && *hint != '1' &&
+            SDL_strcasecmp(hint, "software") != 0) {
+            for (i = 0; i < SDL_GetNumRenderDrivers(); ++i) {
+                SDL_GetRenderDriverInfo(i, &info);
+                if (SDL_strcasecmp(info.name, hint) == 0) {
+                    renderer = SDL_CreateRenderer(window, i, 0);
+                    break;
+                }
+            }
+        }
+
+        if (!renderer) {
+            for (i = 0; i < SDL_GetNumRenderDrivers(); ++i) {
+                SDL_GetRenderDriverInfo(i, &info);
+                if (SDL_strcmp(info.name, "software") != 0) {
+                    renderer = SDL_CreateRenderer(window, i, 0);
+                    if (renderer) {
+                        break;
+                    }
+                }
+            }
+        }
+        if (!renderer) {
+            return SDL_SetError("No hardware accelerated renderers available");
+        }
+
+        /* Create the data after we successfully create the renderer (bug #1116) */
+        data = (SDL_WindowTextureData *)SDL_calloc(1, sizeof(*data));
+        if (!data) {
+            SDL_DestroyRenderer(renderer);
+            return SDL_OutOfMemory();
+        }
+        SDL_SetWindowData(window, SDL_WINDOWTEXTUREDATA, data);
+
+        data->renderer = renderer;
+    }
+
+    /* Free any old texture and pixel data */
+    if (data->texture) {
+        SDL_DestroyTexture(data->texture);
+        data->texture = NULL;
+    }
+    SDL_free(data->pixels);
+    data->pixels = NULL;
+
+    if (SDL_GetRendererInfo(data->renderer, &info) < 0) {
+        return -1;
+    }
+
+    /* Find the first format without an alpha channel */
+    *format = info.texture_formats[0];
+    for (i = 0; i < info.num_texture_formats; ++i) {
+        if (!SDL_ISPIXELFORMAT_FOURCC(info.texture_formats[i]) &&
+            !SDL_ISPIXELFORMAT_ALPHA(info.texture_formats[i])) {
+            *format = info.texture_formats[i];
+            break;
+        }
+    }
+
+    data->texture = SDL_CreateTexture(data->renderer, *format,
+                                      SDL_TEXTUREACCESS_STREAMING,
+                                      window->w, window->h);
+    if (!data->texture) {
+        return -1;
+    }
+
+    /* Create framebuffer data */
+    data->bytes_per_pixel = SDL_BYTESPERPIXEL(*format);
+    data->pitch = (((window->w * data->bytes_per_pixel) + 3) & ~3);
+    data->pixels = SDL_malloc(window->h * data->pitch);
+    if (!data->pixels) {
+        return SDL_OutOfMemory();
+    }
+
+    *pixels = data->pixels;
+    *pitch = data->pitch;
+
+    /* Make sure we're not double-scaling the viewport */
+    SDL_RenderSetViewport(data->renderer, NULL);
+
+    return 0;
+}
+
+static int
+SDL_UpdateWindowTexture(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects)
+{
+    SDL_WindowTextureData *data;
+    SDL_Rect rect;
+    void *src;
+
+    data = SDL_GetWindowData(window, SDL_WINDOWTEXTUREDATA);
+    if (!data || !data->texture) {
+        return SDL_SetError("No window texture data");
+    }
+
+    /* Update a single rect that contains subrects for best DMA performance */
+    if (SDL_GetSpanEnclosingRect(window->w, window->h, numrects, rects, &rect)) {
+        src = (void *)((Uint8 *)data->pixels +
+                        rect.y * data->pitch +
+                        rect.x * data->bytes_per_pixel);
+        if (SDL_UpdateTexture(data->texture, &rect, src, data->pitch) < 0) {
+            return -1;
+        }
+
+        if (SDL_RenderCopy(data->renderer, data->texture, NULL, NULL) < 0) {
+            return -1;
+        }
+
+        SDL_RenderPresent(data->renderer);
+    }
+    return 0;
+}
+
+static void
+SDL_DestroyWindowTexture(_THIS, SDL_Window * window)
+{
+    SDL_WindowTextureData *data;
+
+    data = SDL_SetWindowData(window, SDL_WINDOWTEXTUREDATA, NULL);
+    if (!data) {
+        return;
+    }
+    if (data->texture) {
+        SDL_DestroyTexture(data->texture);
+    }
+    if (data->renderer) {
+        SDL_DestroyRenderer(data->renderer);
+    }
+    SDL_free(data->pixels);
+    SDL_free(data);
+}
+
+
+static int
+cmpmodes(const void *A, const void *B)
+{
+    const SDL_DisplayMode *a = (const SDL_DisplayMode *) A;
+    const SDL_DisplayMode *b = (const SDL_DisplayMode *) B;
+    if (a == b) {
+        return 0;
+    } else if (a->w != b->w) {
+        return b->w - a->w;
+    } else if (a->h != b->h) {
+        return b->h - a->h;
+    } else if (SDL_BITSPERPIXEL(a->format) != SDL_BITSPERPIXEL(b->format)) {
+        return SDL_BITSPERPIXEL(b->format) - SDL_BITSPERPIXEL(a->format);
+    } else if (SDL_PIXELLAYOUT(a->format) != SDL_PIXELLAYOUT(b->format)) {
+        return SDL_PIXELLAYOUT(b->format) - SDL_PIXELLAYOUT(a->format);
+    } else if (a->refresh_rate != b->refresh_rate) {
+        return b->refresh_rate - a->refresh_rate;
+    }
+    return 0;
+}
+
+static int
+SDL_UninitializedVideo()
+{
+    return SDL_SetError("Video subsystem has not been initialized");
+}
+
+int
+SDL_GetNumVideoDrivers(void)
+{
+    return SDL_arraysize(bootstrap) - 1;
+}
+
+const char *
+SDL_GetVideoDriver(int index)
+{
+    if (index >= 0 && index < SDL_GetNumVideoDrivers()) {
+        return bootstrap[index]->name;
+    }
+    return NULL;
+}
+
+/*
+ * Initialize the video and event subsystems -- determine native pixel format
+ */
+int
+SDL_VideoInit(const char *driver_name)
+{
+    SDL_VideoDevice *video;
+    const char *hint;
+    int index;
+    int i;
+    SDL_bool allow_screensaver;
+
+    /* Check to make sure we don't overwrite '_this' */
+    if (_this != NULL) {
+        SDL_VideoQuit();
+    }
+
+#if !SDL_TIMERS_DISABLED
+    SDL_TicksInit();
+#endif
+
+    /* Start the event loop */
+    if (SDL_InitSubSystem(SDL_INIT_EVENTS) < 0 ||
+        SDL_KeyboardInit() < 0 ||
+        SDL_MouseInit() < 0 ||
+        SDL_TouchInit() < 0) {
+        return -1;
+    }
+
+    /* Select the proper video driver */
+    index = 0;
+    video = NULL;
+    if (driver_name == NULL) {
+        driver_name = SDL_getenv("SDL_VIDEODRIVER");
+    }
+    if (driver_name != NULL) {
+        for (i = 0; bootstrap[i]; ++i) {
+            if (SDL_strncasecmp(bootstrap[i]->name, driver_name, SDL_strlen(driver_name)) == 0) {
+                if (bootstrap[i]->available()) {
+                    video = bootstrap[i]->create(index);
+                    break;
+                }
+            }
+        }
+    } else {
+        for (i = 0; bootstrap[i]; ++i) {
+            if (bootstrap[i]->available()) {
+                video = bootstrap[i]->create(index);
+                if (video != NULL) {
+                    break;
+                }
+            }
+        }
+    }
+    if (video == NULL) {
+        if (driver_name) {
+            return SDL_SetError("%s not available", driver_name);
+        }
+        return SDL_SetError("No available video device");
+    }
+    _this = video;
+    _this->name = bootstrap[i]->name;
+    _this->next_object_id = 1;
+
+
+    /* Set some very sane GL defaults */
+    _this->gl_config.driver_loaded = 0;
+    _this->gl_config.dll_handle = NULL;
+    SDL_GL_ResetAttributes();
+
+    _this->current_glwin_tls = SDL_TLSCreate();
+    _this->current_glctx_tls = SDL_TLSCreate();
+
+    /* Initialize the video subsystem */
+    if (_this->VideoInit(_this) < 0) {
+        SDL_VideoQuit();
+        return -1;
+    }
+
+    /* Make sure some displays were added */
+    if (_this->num_displays == 0) {
+        SDL_VideoQuit();
+        return SDL_SetError("The video driver did not add any displays");
+    }
+
+    /* Add the renderer framebuffer emulation if desired */
+    if (ShouldUseTextureFramebuffer()) {
+        _this->CreateWindowFramebuffer = SDL_CreateWindowTexture;
+        _this->UpdateWindowFramebuffer = SDL_UpdateWindowTexture;
+        _this->DestroyWindowFramebuffer = SDL_DestroyWindowTexture;
+    }
+
+    /* Disable the screen saver by default. This is a change from <= 2.0.1,
+       but most things using SDL are games or media players; you wouldn't
+       want a screensaver to trigger if you're playing exclusively with a
+       joystick, or passively watching a movie. Things that use SDL but
+       function more like a normal desktop app should explicitly reenable the
+       screensaver. */
+    hint = SDL_GetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER);
+    if (hint) {
+        allow_screensaver = SDL_atoi(hint) ? SDL_TRUE : SDL_FALSE;
+    } else {
+        allow_screensaver = SDL_FALSE;
+    }
+    if (!allow_screensaver) {
+        SDL_DisableScreenSaver();
+    }
+
+    /* If we don't use a screen keyboard, turn on text input by default,
+       otherwise programs that expect to get text events without enabling
+       UNICODE input won't get any events.
+
+       Actually, come to think of it, you needed to call SDL_EnableUNICODE(1)
+       in SDL 1.2 before you got text input events.  Hmm...
+     */
+    if (!SDL_HasScreenKeyboardSupport()) {
+        SDL_StartTextInput();
+    }
+
+    /* We're ready to go! */
+    return 0;
+}
+
+const char *
+SDL_GetCurrentVideoDriver()
+{
+    if (!_this) {
+        SDL_UninitializedVideo();
+        return NULL;
+    }
+    return _this->name;
+}
+
+SDL_VideoDevice *
+SDL_GetVideoDevice(void)
+{
+    return _this;
+}
+
+int
+SDL_AddBasicVideoDisplay(const SDL_DisplayMode * desktop_mode)
+{
+    SDL_VideoDisplay display;
+
+    SDL_zero(display);
+    if (desktop_mode) {
+        display.desktop_mode = *desktop_mode;
+    }
+    display.current_mode = display.desktop_mode;
+
+    return SDL_AddVideoDisplay(&display);
+}
+
+int
+SDL_AddVideoDisplay(const SDL_VideoDisplay * display)
+{
+    SDL_VideoDisplay *displays;
+    int index = -1;
+
+    displays =
+        SDL_realloc(_this->displays,
+                    (_this->num_displays + 1) * sizeof(*displays));
+    if (displays) {
+        index = _this->num_displays++;
+        displays[index] = *display;
+        displays[index].device = _this;
+        _this->displays = displays;
+
+        if (display->name) {
+            displays[index].name = SDL_strdup(display->name);
+        } else {
+            char name[32];
+
+            SDL_itoa(index, name, 10);
+            displays[index].name = SDL_strdup(name);
+        }
+    } else {
+        SDL_OutOfMemory();
+    }
+    return index;
+}
+
+int
+SDL_GetNumVideoDisplays(void)
+{
+    if (!_this) {
+        SDL_UninitializedVideo();
+        return 0;
+    }
+    return _this->num_displays;
+}
+
+static int
+SDL_GetIndexOfDisplay(SDL_VideoDisplay *display)
+{
+    int displayIndex;
+
+    for (displayIndex = 0; displayIndex < _this->num_displays; ++displayIndex) {
+        if (display == &_this->displays[displayIndex]) {
+            return displayIndex;
+        }
+    }
+
+    /* Couldn't find the display, just use index 0 */
+    return 0;
+}
+
+void *
+SDL_GetDisplayDriverData( int displayIndex )
+{
+    CHECK_DISPLAY_INDEX( displayIndex, NULL );
+
+    return _this->displays[displayIndex].driverdata;
+}
+
+const char *
+SDL_GetDisplayName(int displayIndex)
+{
+    CHECK_DISPLAY_INDEX(displayIndex, NULL);
+
+    return _this->displays[displayIndex].name;
+}
+
+int
+SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect)
+{
+    CHECK_DISPLAY_INDEX(displayIndex, -1);
+
+    if (rect) {
+        SDL_VideoDisplay *display = &_this->displays[displayIndex];
+
+        if (_this->GetDisplayBounds) {
+            if (_this->GetDisplayBounds(_this, display, rect) == 0) {
+                return 0;
+            }
+        }
+
+        /* Assume that the displays are left to right */
+        if (displayIndex == 0) {
+            rect->x = 0;
+            rect->y = 0;
+        } else {
+            SDL_GetDisplayBounds(displayIndex-1, rect);
+            rect->x += rect->w;
+        }
+        rect->w = display->current_mode.w;
+        rect->h = display->current_mode.h;
+    }
+    return 0;
+}
+
+SDL_bool
+SDL_AddDisplayMode(SDL_VideoDisplay * display,  const SDL_DisplayMode * mode)
+{
+    SDL_DisplayMode *modes;
+    int i, nmodes;
+
+    /* Make sure we don't already have the mode in the list */
+    modes = display->display_modes;
+    nmodes = display->num_display_modes;
+    for (i = 0; i < nmodes; ++i) {
+        if (cmpmodes(mode, &modes[i]) == 0) {
+            return SDL_FALSE;
+        }
+    }
+
+    /* Go ahead and add the new mode */
+    if (nmodes == display->max_display_modes) {
+        modes =
+            SDL_realloc(modes,
+                        (display->max_display_modes + 32) * sizeof(*modes));
+        if (!modes) {
+            return SDL_FALSE;
+        }
+        display->display_modes = modes;
+        display->max_display_modes += 32;
+    }
+    modes[nmodes] = *mode;
+    display->num_display_modes++;
+
+    /* Re-sort video modes */
+    SDL_qsort(display->display_modes, display->num_display_modes,
+              sizeof(SDL_DisplayMode), cmpmodes);
+
+    return SDL_TRUE;
+}
+
+static int
+SDL_GetNumDisplayModesForDisplay(SDL_VideoDisplay * display)
+{
+    if (!display->num_display_modes && _this->GetDisplayModes) {
+        _this->GetDisplayModes(_this, display);
+        SDL_qsort(display->display_modes, display->num_display_modes,
+                  sizeof(SDL_DisplayMode), cmpmodes);
+    }
+    return display->num_display_modes;
+}
+
+int
+SDL_GetNumDisplayModes(int displayIndex)
+{
+    CHECK_DISPLAY_INDEX(displayIndex, -1);
+
+    return SDL_GetNumDisplayModesForDisplay(&_this->displays[displayIndex]);
+}
+
+int
+SDL_GetDisplayMode(int displayIndex, int index, SDL_DisplayMode * mode)
+{
+    SDL_VideoDisplay *display;
+
+    CHECK_DISPLAY_INDEX(displayIndex, -1);
+
+    display = &_this->displays[displayIndex];
+    if (index < 0 || index >= SDL_GetNumDisplayModesForDisplay(display)) {
+        return SDL_SetError("index must be in the range of 0 - %d",
+                            SDL_GetNumDisplayModesForDisplay(display) - 1);
+    }
+    if (mode) {
+        *mode = display->display_modes[index];
+    }
+    return 0;
+}
+
+int
+SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode)
+{
+    SDL_VideoDisplay *display;
+
+    CHECK_DISPLAY_INDEX(displayIndex, -1);
+
+    display = &_this->displays[displayIndex];
+    if (mode) {
+        *mode = display->desktop_mode;
+    }
+    return 0;
+}
+
+int
+SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode)
+{
+    SDL_VideoDisplay *display;
+
+    CHECK_DISPLAY_INDEX(displayIndex, -1);
+
+    display = &_this->displays[displayIndex];
+    if (mode) {
+        *mode = display->current_mode;
+    }
+    return 0;
+}
+
+static SDL_DisplayMode *
+SDL_GetClosestDisplayModeForDisplay(SDL_VideoDisplay * display,
+                                    const SDL_DisplayMode * mode,
+                                    SDL_DisplayMode * closest)
+{
+    Uint32 target_format;
+    int target_refresh_rate;
+    int i;
+    SDL_DisplayMode *current, *match;
+
+    if (!mode || !closest) {
+        SDL_SetError("Missing desired mode or closest mode parameter");
+        return NULL;
+    }
+
+    /* Default to the desktop format */
+    if (mode->format) {
+        target_format = mode->format;
+    } else {
+        target_format = display->desktop_mode.format;
+    }
+
+    /* Default to the desktop refresh rate */
+    if (mode->refresh_rate) {
+        target_refresh_rate = mode->refresh_rate;
+    } else {
+        target_refresh_rate = display->desktop_mode.refresh_rate;
+    }
+
+    match = NULL;
+    for (i = 0; i < SDL_GetNumDisplayModesForDisplay(display); ++i) {
+        current = &display->display_modes[i];
+
+        if (current->w && (current->w < mode->w)) {
+            /* Out of sorted modes large enough here */
+            break;
+        }
+        if (current->h && (current->h < mode->h)) {
+            if (current->w && (current->w == mode->w)) {
+                /* Out of sorted modes large enough here */
+                break;
+            }
+            /* Wider, but not tall enough, due to a different
+               aspect ratio. This mode must be skipped, but closer
+               modes may still follow. */
+            continue;
+        }
+        if (!match || current->w < match->w || current->h < match->h) {
+            match = current;
+            continue;
+        }
+        if (current->format != match->format) {
+            /* Sorted highest depth to lowest */
+            if (current->format == target_format ||
+                (SDL_BITSPERPIXEL(current->format) >=
+                 SDL_BITSPERPIXEL(target_format)
+                 && SDL_PIXELTYPE(current->format) ==
+                 SDL_PIXELTYPE(target_format))) {
+                match = current;
+            }
+            continue;
+        }
+        if (current->refresh_rate != match->refresh_rate) {
+            /* Sorted highest refresh to lowest */
+            if (current->refresh_rate >= target_refresh_rate) {
+                match = current;
+            }
+        }
+    }
+    if (match) {
+        if (match->format) {
+            closest->format = match->format;
+        } else {
+            closest->format = mode->format;
+        }
+        if (match->w && match->h) {
+            closest->w = match->w;
+            closest->h = match->h;
+        } else {
+            closest->w = mode->w;
+            closest->h = mode->h;
+        }
+        if (match->refresh_rate) {
+            closest->refresh_rate = match->refresh_rate;
+        } else {
+            closest->refresh_rate = mode->refresh_rate;
+        }
+        closest->driverdata = match->driverdata;
+
+        /*
+         * Pick some reasonable defaults if the app and driver don't
+         * care
+         */
+        if (!closest->format) {
+            closest->format = SDL_PIXELFORMAT_RGB888;
+        }
+        if (!closest->w) {
+            closest->w = 640;
+        }
+        if (!closest->h) {
+            closest->h = 480;
+        }
+        return closest;
+    }
+    return NULL;
+}
+
+SDL_DisplayMode *
+SDL_GetClosestDisplayMode(int displayIndex,
+                          const SDL_DisplayMode * mode,
+                          SDL_DisplayMode * closest)
+{
+    SDL_VideoDisplay *display;
+
+    CHECK_DISPLAY_INDEX(displayIndex, NULL);
+
+    display = &_this->displays[displayIndex];
+    return SDL_GetClosestDisplayModeForDisplay(display, mode, closest);
+}
+
+static int
+SDL_SetDisplayModeForDisplay(SDL_VideoDisplay * display, const SDL_DisplayMode * mode)
+{
+    SDL_DisplayMode display_mode;
+    SDL_DisplayMode current_mode;
+
+    if (mode) {
+        display_mode = *mode;
+
+        /* Default to the current mode */
+        if (!display_mode.format) {
+            display_mode.format = display->current_mode.format;
+        }
+        if (!display_mode.w) {
+            display_mode.w = display->current_mode.w;
+        }
+        if (!display_mode.h) {
+            display_mode.h = display->current_mode.h;
+        }
+        if (!display_mode.refresh_rate) {
+            display_mode.refresh_rate = display->current_mode.refresh_rate;
+        }
+
+        /* Get a good video mode, the closest one possible */
+        if (!SDL_GetClosestDisplayModeForDisplay(display, &display_mode, &display_mode)) {
+            return SDL_SetError("No video mode large enough for %dx%d",
+                                display_mode.w, display_mode.h);
+        }
+    } else {
+        display_mode = display->desktop_mode;
+    }
+
+    /* See if there's anything left to do */
+    current_mode = display->current_mode;
+    if (SDL_memcmp(&display_mode, &current_mode, sizeof(display_mode)) == 0) {
+        return 0;
+    }
+
+    /* Actually change the display mode */
+    if (!_this->SetDisplayMode) {
+        return SDL_SetError("Video driver doesn't support changing display mode");
+    }
+    if (_this->SetDisplayMode(_this, display, &display_mode) < 0) {
+        return -1;
+    }
+    display->current_mode = display_mode;
+    return 0;
+}
+
+int
+SDL_GetWindowDisplayIndex(SDL_Window * window)
+{
+    int displayIndex;
+    int i, dist;
+    int closest = -1;
+    int closest_dist = 0x7FFFFFFF;
+    SDL_Point center;
+    SDL_Point delta;
+    SDL_Rect rect;
+
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    if (SDL_WINDOWPOS_ISUNDEFINED(window->x) ||
+        SDL_WINDOWPOS_ISCENTERED(window->x)) {
+        displayIndex = (window->x & 0xFFFF);
+        if (displayIndex >= _this->num_displays) {
+            displayIndex = 0;
+        }
+        return displayIndex;
+    }
+    if (SDL_WINDOWPOS_ISUNDEFINED(window->y) ||
+        SDL_WINDOWPOS_ISCENTERED(window->y)) {
+        displayIndex = (window->y & 0xFFFF);
+        if (displayIndex >= _this->num_displays) {
+            displayIndex = 0;
+        }
+        return displayIndex;
+    }
+
+    /* Find the display containing the window */
+    for (i = 0; i < _this->num_displays; ++i) {
+        SDL_VideoDisplay *display = &_this->displays[i];
+
+        if (display->fullscreen_window == window) {
+            return i;
+        }
+    }
+    center.x = window->x + window->w / 2;
+    center.y = window->y + window->h / 2;
+    for (i = 0; i < _this->num_displays; ++i) {
+        SDL_GetDisplayBounds(i, &rect);
+        if (SDL_EnclosePoints(&center, 1, &rect, NULL)) {
+            return i;
+        }
+
+        delta.x = center.x - (rect.x + rect.w / 2);
+        delta.y = center.y - (rect.y + rect.h / 2);
+        dist = (delta.x*delta.x + delta.y*delta.y);
+        if (dist < closest_dist) {
+            closest = i;
+            closest_dist = dist;
+        }
+    }
+    if (closest < 0) {
+        SDL_SetError("Couldn't find any displays");
+    }
+    return closest;
+}
+
+SDL_VideoDisplay *
+SDL_GetDisplayForWindow(SDL_Window *window)
+{
+    int displayIndex = SDL_GetWindowDisplayIndex(window);
+    if (displayIndex >= 0) {
+        return &_this->displays[displayIndex];
+    } else {
+        return NULL;
+    }
+}
+
+int
+SDL_SetWindowDisplayMode(SDL_Window * window, const SDL_DisplayMode * mode)
+{
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    if (mode) {
+        window->fullscreen_mode = *mode;
+    } else {
+        SDL_zero(window->fullscreen_mode);
+    }
+    return 0;
+}
+
+int
+SDL_GetWindowDisplayMode(SDL_Window * window, SDL_DisplayMode * mode)
+{
+    SDL_DisplayMode fullscreen_mode;
+    SDL_VideoDisplay *display;
+
+    if (!mode) {
+      return SDL_InvalidParamError("mode");
+    }
+
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    fullscreen_mode = window->fullscreen_mode;
+    if (!fullscreen_mode.w) {
+        fullscreen_mode.w = window->w;
+    }
+    if (!fullscreen_mode.h) {
+        fullscreen_mode.h = window->h;
+    }
+
+    display = SDL_GetDisplayForWindow(window);
+
+    /* if in desktop size mode, just return the size of the desktop */
+    if ( ( window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP ) == SDL_WINDOW_FULLSCREEN_DESKTOP )
+    {
+        fullscreen_mode = display->desktop_mode;
+    }
+    else if (!SDL_GetClosestDisplayModeForDisplay(SDL_GetDisplayForWindow(window),
+                                             &fullscreen_mode,
+                                             &fullscreen_mode)) {
+        return SDL_SetError("Couldn't find display mode match");
+    }
+
+    if (mode) {
+        *mode = fullscreen_mode;
+    }
+    return 0;
+}
+
+Uint32
+SDL_GetWindowPixelFormat(SDL_Window * window)
+{
+    SDL_VideoDisplay *display;
+
+    CHECK_WINDOW_MAGIC(window, SDL_PIXELFORMAT_UNKNOWN);
+
+    display = SDL_GetDisplayForWindow(window);
+    return display->current_mode.format;
+}
+
+static void
+SDL_RestoreMousePosition(SDL_Window *window)
+{
+    int x, y;
+
+    if (window == SDL_GetMouseFocus()) {
+        SDL_GetMouseState(&x, &y);
+        SDL_WarpMouseInWindow(window, x, y);
+    }
+}
+
+static void
+SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen)
+{
+    SDL_VideoDisplay *display;
+    SDL_Window *other;
+
+#ifdef __MACOSX__
+    if (Cocoa_SetWindowFullscreenSpace(window, fullscreen)) {
+        window->last_fullscreen_flags = window->flags;
+        return;
+    }
+#endif
+
+    display = SDL_GetDisplayForWindow(window);
+
+    if (fullscreen) {
+        /* Hide any other fullscreen windows */
+        if (display->fullscreen_window &&
+            display->fullscreen_window != window) {
+            SDL_MinimizeWindow(display->fullscreen_window);
+        }
+    }
+
+    /* See if anything needs to be done now */
+    if ((display->fullscreen_window == window) == fullscreen) {
+        if ((window->last_fullscreen_flags & FULLSCREEN_MASK) == (window->flags & FULLSCREEN_MASK)) {
+            return;
+        }
+    }
+
+    /* See if there are any fullscreen windows */
+    for (other = _this->windows; other; other = other->next) {
+        SDL_bool setDisplayMode = SDL_FALSE;
+
+        if (other == window) {
+            setDisplayMode = fullscreen;
+        } else if (FULLSCREEN_VISIBLE(other) &&
+                   SDL_GetDisplayForWindow(other) == display) {
+            setDisplayMode = SDL_TRUE;
+        }
+
+        if (setDisplayMode) {
+            SDL_DisplayMode fullscreen_mode;
+
+            if (SDL_GetWindowDisplayMode(other, &fullscreen_mode) == 0) {
+                SDL_bool resized = SDL_TRUE;
+
+                if (other->w == fullscreen_mode.w && other->h == fullscreen_mode.h) {
+                    resized = SDL_FALSE;
+                }
+
+                /* only do the mode change if we want exclusive fullscreen */
+                if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) != SDL_WINDOW_FULLSCREEN_DESKTOP) {
+                    SDL_SetDisplayModeForDisplay(display, &fullscreen_mode);
+                } else {
+                    SDL_SetDisplayModeForDisplay(display, NULL);
+                }
+
+                if (_this->SetWindowFullscreen) {
+                    _this->SetWindowFullscreen(_this, other, display, SDL_TRUE);
+                }
+                display->fullscreen_window = other;
+
+                /* Generate a mode change event here */
+                if (resized) {
+                    SDL_SendWindowEvent(other, SDL_WINDOWEVENT_RESIZED,
+                                        fullscreen_mode.w, fullscreen_mode.h);
+                } else {
+                    SDL_OnWindowResized(other);
+                }
+
+                SDL_RestoreMousePosition(other);
+
+                window->last_fullscreen_flags = window->flags;
+                return;
+            }
+        }
+    }
+
+    /* Nope, restore the desktop mode */
+    SDL_SetDisplayModeForDisplay(display, NULL);
+
+    if (_this->SetWindowFullscreen) {
+        _this->SetWindowFullscreen(_this, window, display, SDL_FALSE);
+    }
+    display->fullscreen_window = NULL;
+
+    /* Generate a mode change event here */
+    SDL_OnWindowResized(window);
+
+    /* Restore the cursor position */
+    SDL_RestoreMousePosition(window);
+
+    window->last_fullscreen_flags = window->flags;
+}
+
+#define CREATE_FLAGS \
+    (SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI)
+
+static void
+SDL_FinishWindowCreation(SDL_Window *window, Uint32 flags)
+{
+    window->windowed.x = window->x;
+    window->windowed.y = window->y;
+    window->windowed.w = window->w;
+    window->windowed.h = window->h;
+
+    if (flags & SDL_WINDOW_MAXIMIZED) {
+        SDL_MaximizeWindow(window);
+    }
+    if (flags & SDL_WINDOW_MINIMIZED) {
+        SDL_MinimizeWindow(window);
+    }
+    if (flags & SDL_WINDOW_FULLSCREEN) {
+        SDL_SetWindowFullscreen(window, flags);
+    }
+    if (flags & SDL_WINDOW_INPUT_GRABBED) {
+        SDL_SetWindowGrab(window, SDL_TRUE);
+    }
+    if (!(flags & SDL_WINDOW_HIDDEN)) {
+        SDL_ShowWindow(window);
+    }
+}
+
+SDL_Window *
+SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
+{
+    SDL_Window *window;
+    const char *hint;
+
+    if (!_this) {
+        /* Initialize the video system if needed */
+        if (SDL_VideoInit(NULL) < 0) {
+            return NULL;
+        }
+    }
+
+    /* Some platforms can't create zero-sized windows */
+    if (w < 1) {
+        w = 1;
+    }
+    if (h < 1) {
+        h = 1;
+    }
+
+    /* Some platforms have OpenGL enabled by default */
+#if (SDL_VIDEO_OPENGL && __MACOSX__) || __IPHONEOS__ || __ANDROID__
+    flags |= SDL_WINDOW_OPENGL;
+#endif
+    if (flags & SDL_WINDOW_OPENGL) {
+        if (!_this->GL_CreateContext) {
+            SDL_SetError("No OpenGL support in video driver");
+            return NULL;
+        }
+        if (SDL_GL_LoadLibrary(NULL) < 0) {
+            return NULL;
+        }
+    }
+
+    /* Unless the user has specified the high-DPI disabling hint, respect the
+     * SDL_WINDOW_ALLOW_HIGHDPI flag.
+     */
+    if (flags & SDL_WINDOW_ALLOW_HIGHDPI) {
+        hint = SDL_GetHint(SDL_HINT_VIDEO_HIGHDPI_DISABLED);
+        if (hint && SDL_atoi(hint) > 0) {
+            flags &= ~SDL_WINDOW_ALLOW_HIGHDPI;
+        }
+    }
+
+    window = (SDL_Window *)SDL_calloc(1, sizeof(*window));
+    if (!window) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    window->magic = &_this->window_magic;
+    window->id = _this->next_object_id++;
+    window->x = x;
+    window->y = y;
+    window->w = w;
+    window->h = h;
+    if (SDL_WINDOWPOS_ISUNDEFINED(x) || SDL_WINDOWPOS_ISUNDEFINED(y) ||
+        SDL_WINDOWPOS_ISCENTERED(x) || SDL_WINDOWPOS_ISCENTERED(y)) {
+        SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+        int displayIndex;
+        SDL_Rect bounds;
+
+        displayIndex = SDL_GetIndexOfDisplay(display);
+        SDL_GetDisplayBounds(displayIndex, &bounds);
+        if (SDL_WINDOWPOS_ISUNDEFINED(x) || SDL_WINDOWPOS_ISCENTERED(x)) {
+            window->x = bounds.x + (bounds.w - w) / 2;
+        }
+        if (SDL_WINDOWPOS_ISUNDEFINED(y) || SDL_WINDOWPOS_ISCENTERED(y)) {
+            window->y = bounds.y + (bounds.h - h) / 2;
+        }
+    }
+    window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN);
+    window->last_fullscreen_flags = window->flags;
+    window->brightness = 1.0f;
+    window->next = _this->windows;
+    window->is_destroying = SDL_FALSE;
+
+    if (_this->windows) {
+        _this->windows->prev = window;
+    }
+    _this->windows = window;
+
+    if (_this->CreateWindow && _this->CreateWindow(_this, window) < 0) {
+        SDL_DestroyWindow(window);
+        return NULL;
+    }
+
+    if (title) {
+        SDL_SetWindowTitle(window, title);
+    }
+    SDL_FinishWindowCreation(window, flags);
+
+    /* If the window was created fullscreen, make sure the mode code matches */
+    SDL_UpdateFullscreenMode(window, FULLSCREEN_VISIBLE(window));
+
+    return window;
+}
+
+SDL_Window *
+SDL_CreateWindowFrom(const void *data)
+{
+    SDL_Window *window;
+
+    if (!_this) {
+        SDL_UninitializedVideo();
+        return NULL;
+    }
+    window = (SDL_Window *)SDL_calloc(1, sizeof(*window));
+    if (!window) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    window->magic = &_this->window_magic;
+    window->id = _this->next_object_id++;
+    window->flags = SDL_WINDOW_FOREIGN;
+    window->last_fullscreen_flags = window->flags;
+    window->is_destroying = SDL_FALSE;
+    window->brightness = 1.0f;
+    window->next = _this->windows;
+    if (_this->windows) {
+        _this->windows->prev = window;
+    }
+    _this->windows = window;
+
+    if (!_this->CreateWindowFrom ||
+        _this->CreateWindowFrom(_this, window, data) < 0) {
+        SDL_DestroyWindow(window);
+        return NULL;
+    }
+    return window;
+}
+
+int
+SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
+{
+    char *title = window->title;
+    SDL_Surface *icon = window->icon;
+
+    if ((flags & SDL_WINDOW_OPENGL) && !_this->GL_CreateContext) {
+        return SDL_SetError("No OpenGL support in video driver");
+    }
+
+    if (window->flags & SDL_WINDOW_FOREIGN) {
+        /* Can't destroy and re-create foreign windows, hrm */
+        flags |= SDL_WINDOW_FOREIGN;
+    } else {
+        flags &= ~SDL_WINDOW_FOREIGN;
+    }
+
+    /* Restore video mode, etc. */
+    SDL_HideWindow(window);
+
+    /* Tear down the old native window */
+    if (window->surface) {
+        window->surface->flags &= ~SDL_DONTFREE;
+        SDL_FreeSurface(window->surface);
+    }
+    if (_this->DestroyWindowFramebuffer) {
+        _this->DestroyWindowFramebuffer(_this, window);
+    }
+    if (_this->DestroyWindow && !(flags & SDL_WINDOW_FOREIGN)) {
+        _this->DestroyWindow(_this, window);
+    }
+
+    if ((window->flags & SDL_WINDOW_OPENGL) != (flags & SDL_WINDOW_OPENGL)) {
+        if (flags & SDL_WINDOW_OPENGL) {
+            if (SDL_GL_LoadLibrary(NULL) < 0) {
+                return -1;
+            }
+        } else {
+            SDL_GL_UnloadLibrary();
+        }
+    }
+
+    window->title = NULL;
+    window->icon = NULL;
+    window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN);
+    window->last_fullscreen_flags = window->flags;
+    window->is_destroying = SDL_FALSE;
+
+    if (_this->CreateWindow && !(flags & SDL_WINDOW_FOREIGN)) {
+        if (_this->CreateWindow(_this, window) < 0) {
+            if (flags & SDL_WINDOW_OPENGL) {
+                SDL_GL_UnloadLibrary();
+            }
+            return -1;
+        }
+    }
+
+    if (title) {
+        SDL_SetWindowTitle(window, title);
+        SDL_free(title);
+    }
+    if (icon) {
+        SDL_SetWindowIcon(window, icon);
+        SDL_FreeSurface(icon);
+    }
+    SDL_FinishWindowCreation(window, flags);
+
+    return 0;
+}
+
+Uint32
+SDL_GetWindowID(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, 0);
+
+    return window->id;
+}
+
+SDL_Window *
+SDL_GetWindowFromID(Uint32 id)
+{
+    SDL_Window *window;
+
+    if (!_this) {
+        return NULL;
+    }
+    for (window = _this->windows; window; window = window->next) {
+        if (window->id == id) {
+            return window;
+        }
+    }
+    return NULL;
+}
+
+Uint32
+SDL_GetWindowFlags(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, 0);
+
+    return window->flags;
+}
+
+void
+SDL_SetWindowTitle(SDL_Window * window, const char *title)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (title == window->title) {
+        return;
+    }
+    SDL_free(window->title);
+    if (title && *title) {
+        window->title = SDL_strdup(title);
+    } else {
+        window->title = NULL;
+    }
+
+    if (_this->SetWindowTitle) {
+        _this->SetWindowTitle(_this, window);
+    }
+}
+
+const char *
+SDL_GetWindowTitle(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, "");
+
+    return window->title ? window->title : "";
+}
+
+void
+SDL_SetWindowIcon(SDL_Window * window, SDL_Surface * icon)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (!icon) {
+        return;
+    }
+
+    SDL_FreeSurface(window->icon);
+
+    /* Convert the icon into ARGB8888 */
+    window->icon = SDL_ConvertSurfaceFormat(icon, SDL_PIXELFORMAT_ARGB8888, 0);
+    if (!window->icon) {
+        return;
+    }
+
+    if (_this->SetWindowIcon) {
+        _this->SetWindowIcon(_this, window, window->icon);
+    }
+}
+
+void*
+SDL_SetWindowData(SDL_Window * window, const char *name, void *userdata)
+{
+    SDL_WindowUserData *prev, *data;
+
+    CHECK_WINDOW_MAGIC(window, NULL);
+
+    /* Input validation */
+    if (name == NULL || name[0] == '\0') {
+      SDL_InvalidParamError("name");
+      return NULL;
+    }
+
+    /* See if the named data already exists */
+    prev = NULL;
+    for (data = window->data; data; prev = data, data = data->next) {
+        if (data->name && SDL_strcmp(data->name, name) == 0) {
+            void *last_value = data->data;
+
+            if (userdata) {
+                /* Set the new value */
+                data->data = userdata;
+            } else {
+                /* Delete this value */
+                if (prev) {
+                    prev->next = data->next;
+                } else {
+                    window->data = data->next;
+                }
+                SDL_free(data->name);
+                SDL_free(data);
+            }
+            return last_value;
+        }
+    }
+
+    /* Add new data to the window */
+    if (userdata) {
+        data = (SDL_WindowUserData *)SDL_malloc(sizeof(*data));
+        data->name = SDL_strdup(name);
+        data->data = userdata;
+        data->next = window->data;
+        window->data = data;
+    }
+    return NULL;
+}
+
+void *
+SDL_GetWindowData(SDL_Window * window, const char *name)
+{
+    SDL_WindowUserData *data;
+
+    CHECK_WINDOW_MAGIC(window, NULL);
+
+    /* Input validation */
+    if (name == NULL || name[0] == '\0') {
+      SDL_InvalidParamError("name");
+      return NULL;
+    }
+
+    for (data = window->data; data; data = data->next) {
+        if (data->name && SDL_strcmp(data->name, name) == 0) {
+            return data->data;
+        }
+    }
+    return NULL;
+}
+
+void
+SDL_SetWindowPosition(SDL_Window * window, int x, int y)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (SDL_WINDOWPOS_ISCENTERED(x) || SDL_WINDOWPOS_ISCENTERED(y)) {
+        SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+        int displayIndex;
+        SDL_Rect bounds;
+
+        displayIndex = SDL_GetIndexOfDisplay(display);
+        SDL_GetDisplayBounds(displayIndex, &bounds);
+        if (SDL_WINDOWPOS_ISCENTERED(x)) {
+            x = bounds.x + (bounds.w - window->w) / 2;
+        }
+        if (SDL_WINDOWPOS_ISCENTERED(y)) {
+            y = bounds.y + (bounds.h - window->h) / 2;
+        }
+    }
+
+    if ((window->flags & SDL_WINDOW_FULLSCREEN)) {
+        if (!SDL_WINDOWPOS_ISUNDEFINED(x)) {
+            window->windowed.x = x;
+        }
+        if (!SDL_WINDOWPOS_ISUNDEFINED(y)) {
+            window->windowed.y = y;
+        }
+    } else {
+        if (!SDL_WINDOWPOS_ISUNDEFINED(x)) {
+            window->x = x;
+        }
+        if (!SDL_WINDOWPOS_ISUNDEFINED(y)) {
+            window->y = y;
+        }
+
+        if (_this->SetWindowPosition) {
+            _this->SetWindowPosition(_this, window);
+        }
+        SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, x, y);
+    }
+}
+
+void
+SDL_GetWindowPosition(SDL_Window * window, int *x, int *y)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    /* Fullscreen windows are always at their display's origin */
+    if (window->flags & SDL_WINDOW_FULLSCREEN) {
+        if (x) {
+            *x = 0;
+        }
+        if (y) {
+            *y = 0;
+        }
+    } else {
+        if (x) {
+            *x = window->x;
+        }
+        if (y) {
+            *y = window->y;
+        }
+    }
+}
+
+void
+SDL_SetWindowBordered(SDL_Window * window, SDL_bool bordered)
+{
+    CHECK_WINDOW_MAGIC(window, );
+    if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
+        const int want = (bordered != SDL_FALSE);  /* normalize the flag. */
+        const int have = ((window->flags & SDL_WINDOW_BORDERLESS) == 0);
+        if ((want != have) && (_this->SetWindowBordered)) {
+            if (want) {
+                window->flags &= ~SDL_WINDOW_BORDERLESS;
+            } else {
+                window->flags |= SDL_WINDOW_BORDERLESS;
+            }
+            _this->SetWindowBordered(_this, window, (SDL_bool) want);
+        }
+    }
+}
+
+void
+SDL_SetWindowSize(SDL_Window * window, int w, int h)
+{
+    CHECK_WINDOW_MAGIC(window, );
+    if (w <= 0) {
+        SDL_InvalidParamError("w");
+        return;
+    }
+    if (h <= 0) {
+        SDL_InvalidParamError("h");
+        return;
+    }
+
+    /* Make sure we don't exceed any window size limits */
+    if (window->min_w && w < window->min_w)
+    {
+        w = window->min_w;
+    }
+    if (window->max_w && w > window->max_w)
+    {
+        w = window->max_w;
+    }
+    if (window->min_h && h < window->min_h)
+    {
+        h = window->min_h;
+    }
+    if (window->max_h && h > window->max_h)
+    {
+        h = window->max_h;
+    }
+
+    /* FIXME: Should this change fullscreen modes? */
+    if (window->flags & SDL_WINDOW_FULLSCREEN) {
+        window->windowed.w = w;
+        window->windowed.h = h;
+    } else {
+        window->w = w;
+        window->h = h;
+        if (_this->SetWindowSize) {
+            _this->SetWindowSize(_this, window);
+        }
+        if (window->w == w && window->h == h) {
+            /* We didn't get a SDL_WINDOWEVENT_RESIZED event (by design) */
+            SDL_OnWindowResized(window);
+        }
+    }
+}
+
+void
+SDL_GetWindowSize(SDL_Window * window, int *w, int *h)
+{
+    CHECK_WINDOW_MAGIC(window, );
+    if (w) {
+        *w = window->w;
+    }
+    if (h) {
+        *h = window->h;
+    }
+}
+
+void
+SDL_SetWindowMinimumSize(SDL_Window * window, int min_w, int min_h)
+{
+    CHECK_WINDOW_MAGIC(window, );
+    if (min_w <= 0) {
+        SDL_InvalidParamError("min_w");
+        return;
+    }
+    if (min_h <= 0) {
+        SDL_InvalidParamError("min_h");
+        return;
+    }
+
+    if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
+        window->min_w = min_w;
+        window->min_h = min_h;
+        if (_this->SetWindowMinimumSize) {
+            _this->SetWindowMinimumSize(_this, window);
+        }
+        /* Ensure that window is not smaller than minimal size */
+        SDL_SetWindowSize(window, SDL_max(window->w, window->min_w), SDL_max(window->h, window->min_h));
+    }
+}
+
+void
+SDL_GetWindowMinimumSize(SDL_Window * window, int *min_w, int *min_h)
+{
+    CHECK_WINDOW_MAGIC(window, );
+    if (min_w) {
+        *min_w = window->min_w;
+    }
+    if (min_h) {
+        *min_h = window->min_h;
+    }
+}
+
+void
+SDL_SetWindowMaximumSize(SDL_Window * window, int max_w, int max_h)
+{
+    CHECK_WINDOW_MAGIC(window, );
+    if (max_w <= 0) {
+        SDL_InvalidParamError("max_w");
+        return;
+    }
+    if (max_h <= 0) {
+        SDL_InvalidParamError("max_h");
+        return;
+    }
+
+    if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
+        window->max_w = max_w;
+        window->max_h = max_h;
+        if (_this->SetWindowMaximumSize) {
+            _this->SetWindowMaximumSize(_this, window);
+        }
+        /* Ensure that window is not larger than maximal size */
+        SDL_SetWindowSize(window, SDL_min(window->w, window->max_w), SDL_min(window->h, window->max_h));
+    }
+}
+
+void
+SDL_GetWindowMaximumSize(SDL_Window * window, int *max_w, int *max_h)
+{
+    CHECK_WINDOW_MAGIC(window, );
+    if (max_w) {
+        *max_w = window->max_w;
+    }
+    if (max_h) {
+        *max_h = window->max_h;
+    }
+}
+
+void
+SDL_ShowWindow(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (window->flags & SDL_WINDOW_SHOWN) {
+        return;
+    }
+
+    if (_this->ShowWindow) {
+        _this->ShowWindow(_this, window);
+    }
+    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_SHOWN, 0, 0);
+}
+
+void
+SDL_HideWindow(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (!(window->flags & SDL_WINDOW_SHOWN)) {
+        return;
+    }
+
+    SDL_UpdateFullscreenMode(window, SDL_FALSE);
+
+    if (_this->HideWindow) {
+        _this->HideWindow(_this, window);
+    }
+    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
+}
+
+void
+SDL_RaiseWindow(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (!(window->flags & SDL_WINDOW_SHOWN)) {
+        return;
+    }
+    if (_this->RaiseWindow) {
+        _this->RaiseWindow(_this, window);
+    }
+}
+
+void
+SDL_MaximizeWindow(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (window->flags & SDL_WINDOW_MAXIMIZED) {
+        return;
+    }
+
+    /* !!! FIXME: should this check if the window is resizable? */
+
+    if (_this->MaximizeWindow) {
+        _this->MaximizeWindow(_this, window);
+    }
+}
+
+void
+SDL_MinimizeWindow(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (window->flags & SDL_WINDOW_MINIMIZED) {
+        return;
+    }
+
+    SDL_UpdateFullscreenMode(window, SDL_FALSE);
+
+    if (_this->MinimizeWindow) {
+        _this->MinimizeWindow(_this, window);
+    }
+}
+
+void
+SDL_RestoreWindow(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (!(window->flags & (SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED))) {
+        return;
+    }
+
+    if (_this->RestoreWindow) {
+        _this->RestoreWindow(_this, window);
+    }
+}
+
+int
+SDL_SetWindowFullscreen(SDL_Window * window, Uint32 flags)
+{
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    flags &= FULLSCREEN_MASK;
+
+    if ( flags == (window->flags & FULLSCREEN_MASK) ) {
+        return 0;
+    }
+
+    /* clear the previous flags and OR in the new ones */
+    window->flags &= ~FULLSCREEN_MASK;
+    window->flags |= flags;
+
+    SDL_UpdateFullscreenMode(window, FULLSCREEN_VISIBLE(window));
+
+    return 0;
+}
+
+static SDL_Surface *
+SDL_CreateWindowFramebuffer(SDL_Window * window)
+{
+    Uint32 format;
+    void *pixels;
+    int pitch;
+    int bpp;
+    Uint32 Rmask, Gmask, Bmask, Amask;
+
+    if (!_this->CreateWindowFramebuffer || !_this->UpdateWindowFramebuffer) {
+        return NULL;
+    }
+
+    if (_this->CreateWindowFramebuffer(_this, window, &format, &pixels, &pitch) < 0) {
+        return NULL;
+    }
+
+    if (!SDL_PixelFormatEnumToMasks(format, &bpp, &Rmask, &Gmask, &Bmask, &Amask)) {
+        return NULL;
+    }
+
+    return SDL_CreateRGBSurfaceFrom(pixels, window->w, window->h, bpp, pitch, Rmask, Gmask, Bmask, Amask);
+}
+
+SDL_Surface *
+SDL_GetWindowSurface(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, NULL);
+
+    if (!window->surface_valid) {
+        if (window->surface) {
+            window->surface->flags &= ~SDL_DONTFREE;
+            SDL_FreeSurface(window->surface);
+        }
+        window->surface = SDL_CreateWindowFramebuffer(window);
+        if (window->surface) {
+            window->surface_valid = SDL_TRUE;
+            window->surface->flags |= SDL_DONTFREE;
+        }
+    }
+    return window->surface;
+}
+
+int
+SDL_UpdateWindowSurface(SDL_Window * window)
+{
+    SDL_Rect full_rect;
+
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    full_rect.x = 0;
+    full_rect.y = 0;
+    full_rect.w = window->w;
+    full_rect.h = window->h;
+    return SDL_UpdateWindowSurfaceRects(window, &full_rect, 1);
+}
+
+int
+SDL_UpdateWindowSurfaceRects(SDL_Window * window, const SDL_Rect * rects,
+                             int numrects)
+{
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    if (!window->surface_valid) {
+        return SDL_SetError("Window surface is invalid, please call SDL_GetWindowSurface() to get a new surface");
+    }
+
+    return _this->UpdateWindowFramebuffer(_this, window, rects, numrects);
+}
+
+int
+SDL_SetWindowBrightness(SDL_Window * window, float brightness)
+{
+    Uint16 ramp[256];
+    int status;
+
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    SDL_CalculateGammaRamp(brightness, ramp);
+    status = SDL_SetWindowGammaRamp(window, ramp, ramp, ramp);
+    if (status == 0) {
+        window->brightness = brightness;
+    }
+    return status;
+}
+
+float
+SDL_GetWindowBrightness(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, 1.0f);
+
+    return window->brightness;
+}
+
+int
+SDL_SetWindowGammaRamp(SDL_Window * window, const Uint16 * red,
+                                            const Uint16 * green,
+                                            const Uint16 * blue)
+{
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    if (!_this->SetWindowGammaRamp) {
+        return SDL_Unsupported();
+    }
+
+    if (!window->gamma) {
+        if (SDL_GetWindowGammaRamp(window, NULL, NULL, NULL) < 0) {
+            return -1;
+        }
+    }
+
+    if (red) {
+        SDL_memcpy(&window->gamma[0*256], red, 256*sizeof(Uint16));
+    }
+    if (green) {
+        SDL_memcpy(&window->gamma[1*256], green, 256*sizeof(Uint16));
+    }
+    if (blue) {
+        SDL_memcpy(&window->gamma[2*256], blue, 256*sizeof(Uint16));
+    }
+    if (window->flags & SDL_WINDOW_INPUT_FOCUS) {
+        return _this->SetWindowGammaRamp(_this, window, window->gamma);
+    } else {
+        return 0;
+    }
+}
+
+int
+SDL_GetWindowGammaRamp(SDL_Window * window, Uint16 * red,
+                                            Uint16 * green,
+                                            Uint16 * blue)
+{
+    CHECK_WINDOW_MAGIC(window, -1);
+
+    if (!window->gamma) {
+        int i;
+
+        window->gamma = (Uint16 *)SDL_malloc(256*6*sizeof(Uint16));
+        if (!window->gamma) {
+            return SDL_OutOfMemory();
+        }
+        window->saved_gamma = window->gamma + 3*256;
+
+        if (_this->GetWindowGammaRamp) {
+            if (_this->GetWindowGammaRamp(_this, window, window->gamma) < 0) {
+                return -1;
+            }
+        } else {
+            /* Create an identity gamma ramp */
+            for (i = 0; i < 256; ++i) {
+                Uint16 value = (Uint16)((i << 8) | i);
+
+                window->gamma[0*256+i] = value;
+                window->gamma[1*256+i] = value;
+                window->gamma[2*256+i] = value;
+            }
+        }
+        SDL_memcpy(window->saved_gamma, window->gamma, 3*256*sizeof(Uint16));
+    }
+
+    if (red) {
+        SDL_memcpy(red, &window->gamma[0*256], 256*sizeof(Uint16));
+    }
+    if (green) {
+        SDL_memcpy(green, &window->gamma[1*256], 256*sizeof(Uint16));
+    }
+    if (blue) {
+        SDL_memcpy(blue, &window->gamma[2*256], 256*sizeof(Uint16));
+    }
+    return 0;
+}
+
+void
+SDL_UpdateWindowGrab(SDL_Window * window)
+{
+    if (_this->SetWindowGrab) {
+        SDL_bool grabbed;
+        if ((SDL_GetMouse()->relative_mode || (window->flags & SDL_WINDOW_INPUT_GRABBED)) &&
+             (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
+            grabbed = SDL_TRUE;
+        } else {
+            grabbed = SDL_FALSE;
+        }
+        _this->SetWindowGrab(_this, window, grabbed);
+    }
+}
+
+void
+SDL_SetWindowGrab(SDL_Window * window, SDL_bool grabbed)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (!!grabbed == !!(window->flags & SDL_WINDOW_INPUT_GRABBED)) {
+        return;
+    }
+    if (grabbed) {
+        window->flags |= SDL_WINDOW_INPUT_GRABBED;
+    } else {
+        window->flags &= ~SDL_WINDOW_INPUT_GRABBED;
+    }
+    SDL_UpdateWindowGrab(window);
+}
+
+SDL_bool
+SDL_GetWindowGrab(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, SDL_FALSE);
+
+    return ((window->flags & SDL_WINDOW_INPUT_GRABBED) != 0);
+}
+
+void
+SDL_OnWindowShown(SDL_Window * window)
+{
+    SDL_OnWindowRestored(window);
+}
+
+void
+SDL_OnWindowHidden(SDL_Window * window)
+{
+    SDL_UpdateFullscreenMode(window, SDL_FALSE);
+}
+
+void
+SDL_OnWindowResized(SDL_Window * window)
+{
+    window->surface_valid = SDL_FALSE;
+    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_SIZE_CHANGED, window->w, window->h);
+}
+
+void
+SDL_OnWindowMinimized(SDL_Window * window)
+{
+    SDL_UpdateFullscreenMode(window, SDL_FALSE);
+}
+
+void
+SDL_OnWindowRestored(SDL_Window * window)
+{
+    SDL_RaiseWindow(window);
+
+    if (FULLSCREEN_VISIBLE(window)) {
+        SDL_UpdateFullscreenMode(window, SDL_TRUE);
+    }
+}
+
+void
+SDL_OnWindowEnter(SDL_Window * window)
+{
+    if (_this->OnWindowEnter) {
+        _this->OnWindowEnter(_this, window);
+    }
+}
+
+void
+SDL_OnWindowLeave(SDL_Window * window)
+{
+}
+
+void
+SDL_OnWindowFocusGained(SDL_Window * window)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    if (window->gamma && _this->SetWindowGammaRamp) {
+        _this->SetWindowGammaRamp(_this, window, window->gamma);
+    }
+
+    if (mouse && mouse->relative_mode) {
+        SDL_SetMouseFocus(window);
+        SDL_WarpMouseInWindow(window, window->w/2, window->h/2);
+    }
+
+    SDL_UpdateWindowGrab(window);
+}
+
+static SDL_bool
+ShouldMinimizeOnFocusLoss(SDL_Window * window)
+{
+    const char *hint;
+
+    if (!(window->flags & SDL_WINDOW_FULLSCREEN) || window->is_destroying) {
+        return SDL_FALSE;
+    }
+
+#ifdef __MACOSX__
+    if (Cocoa_IsWindowInFullscreenSpace(window)) {
+        return SDL_FALSE;
+    }
+#endif
+
+    hint = SDL_GetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS);
+    if (hint) {
+        if (*hint == '0') {
+            return SDL_FALSE;
+        } else {
+            return SDL_TRUE;
+        }
+    }
+
+    return SDL_TRUE;
+}
+
+void
+SDL_OnWindowFocusLost(SDL_Window * window)
+{
+    if (window->gamma && _this->SetWindowGammaRamp) {
+        _this->SetWindowGammaRamp(_this, window, window->saved_gamma);
+    }
+
+    SDL_UpdateWindowGrab(window);
+
+    if (ShouldMinimizeOnFocusLoss(window)) {
+        SDL_MinimizeWindow(window);
+    }
+}
+
+SDL_Window *
+SDL_GetFocusWindow(void)
+{
+    SDL_Window *window;
+
+    if (!_this) {
+        return NULL;
+    }
+    for (window = _this->windows; window; window = window->next) {
+        if (window->flags & SDL_WINDOW_INPUT_FOCUS) {
+            return window;
+        }
+    }
+    return NULL;
+}
+
+void
+SDL_DestroyWindow(SDL_Window * window)
+{
+    SDL_VideoDisplay *display;
+
+    CHECK_WINDOW_MAGIC(window, );
+
+    window->is_destroying = SDL_TRUE;
+
+    /* Restore video mode, etc. */
+    SDL_HideWindow(window);
+
+    /* Make sure this window no longer has focus */
+    if (SDL_GetKeyboardFocus() == window) {
+        SDL_SetKeyboardFocus(NULL);
+    }
+    if (SDL_GetMouseFocus() == window) {
+        SDL_SetMouseFocus(NULL);
+    }
+
+    /* make no context current if this is the current context window. */
+    if (window->flags & SDL_WINDOW_OPENGL) {
+        if (_this->current_glwin == window) {
+            SDL_GL_MakeCurrent(window, NULL);
+        }
+    }
+
+    if (window->surface) {
+        window->surface->flags &= ~SDL_DONTFREE;
+        SDL_FreeSurface(window->surface);
+    }
+    if (_this->DestroyWindowFramebuffer) {
+        _this->DestroyWindowFramebuffer(_this, window);
+    }
+    if (_this->DestroyWindow) {
+        _this->DestroyWindow(_this, window);
+    }
+    if (window->flags & SDL_WINDOW_OPENGL) {
+        SDL_GL_UnloadLibrary();
+    }
+
+    display = SDL_GetDisplayForWindow(window);
+    if (display->fullscreen_window == window) {
+        display->fullscreen_window = NULL;
+    }
+
+    /* Now invalidate magic */
+    window->magic = NULL;
+
+    /* Free memory associated with the window */
+    SDL_free(window->title);
+    SDL_FreeSurface(window->icon);
+    SDL_free(window->gamma);
+    while (window->data) {
+        SDL_WindowUserData *data = window->data;
+
+        window->data = data->next;
+        SDL_free(data->name);
+        SDL_free(data);
+    }
+
+    /* Unlink the window from the list */
+    if (window->next) {
+        window->next->prev = window->prev;
+    }
+    if (window->prev) {
+        window->prev->next = window->next;
+    } else {
+        _this->windows = window->next;
+    }
+
+    SDL_free(window);
+}
+
+SDL_bool
+SDL_IsScreenSaverEnabled()
+{
+    if (!_this) {
+        return SDL_TRUE;
+    }
+    return _this->suspend_screensaver ? SDL_FALSE : SDL_TRUE;
+}
+
+void
+SDL_EnableScreenSaver()
+{
+    if (!_this) {
+        return;
+    }
+    if (!_this->suspend_screensaver) {
+        return;
+    }
+    _this->suspend_screensaver = SDL_FALSE;
+    if (_this->SuspendScreenSaver) {
+        _this->SuspendScreenSaver(_this);
+    }
+}
+
+void
+SDL_DisableScreenSaver()
+{
+    if (!_this) {
+        return;
+    }
+    if (_this->suspend_screensaver) {
+        return;
+    }
+    _this->suspend_screensaver = SDL_TRUE;
+    if (_this->SuspendScreenSaver) {
+        _this->SuspendScreenSaver(_this);
+    }
+}
+
+void
+SDL_VideoQuit(void)
+{
+    int i, j;
+
+    if (!_this) {
+        return;
+    }
+
+    /* Halt event processing before doing anything else */
+    SDL_TouchQuit();
+    SDL_MouseQuit();
+    SDL_KeyboardQuit();
+    SDL_QuitSubSystem(SDL_INIT_EVENTS);
+
+    SDL_EnableScreenSaver();
+
+    /* Clean up the system video */
+    while (_this->windows) {
+        SDL_DestroyWindow(_this->windows);
+    }
+    _this->VideoQuit(_this);
+
+    for (i = 0; i < _this->num_displays; ++i) {
+        SDL_VideoDisplay *display = &_this->displays[i];
+        for (j = display->num_display_modes; j--;) {
+            SDL_free(display->display_modes[j].driverdata);
+            display->display_modes[j].driverdata = NULL;
+        }
+        SDL_free(display->display_modes);
+        display->display_modes = NULL;
+        SDL_free(display->desktop_mode.driverdata);
+        display->desktop_mode.driverdata = NULL;
+        SDL_free(display->driverdata);
+        display->driverdata = NULL;
+    }
+    if (_this->displays) {
+        for (i = 0; i < _this->num_displays; ++i) {
+            SDL_free(_this->displays[i].name);
+        }
+        SDL_free(_this->displays);
+        _this->displays = NULL;
+        _this->num_displays = 0;
+    }
+    SDL_free(_this->clipboard_text);
+    _this->clipboard_text = NULL;
+    _this->free(_this);
+    _this = NULL;
+}
+
+int
+SDL_GL_LoadLibrary(const char *path)
+{
+    int retval;
+
+    if (!_this) {
+        return SDL_UninitializedVideo();
+    }
+    if (_this->gl_config.driver_loaded) {
+        if (path && SDL_strcmp(path, _this->gl_config.driver_path) != 0) {
+            return SDL_SetError("OpenGL library already loaded");
+        }
+        retval = 0;
+    } else {
+        if (!_this->GL_LoadLibrary) {
+            return SDL_SetError("No dynamic GL support in video driver");
+        }
+        retval = _this->GL_LoadLibrary(_this, path);
+    }
+    if (retval == 0) {
+        ++_this->gl_config.driver_loaded;
+    } else {
+        if (_this->GL_UnloadLibrary) {
+            _this->GL_UnloadLibrary(_this);
+        }
+    }
+    return (retval);
+}
+
+void *
+SDL_GL_GetProcAddress(const char *proc)
+{
+    void *func;
+
+    if (!_this) {
+        SDL_UninitializedVideo();
+        return NULL;
+    }
+    func = NULL;
+    if (_this->GL_GetProcAddress) {
+        if (_this->gl_config.driver_loaded) {
+            func = _this->GL_GetProcAddress(_this, proc);
+        } else {
+            SDL_SetError("No GL driver has been loaded");
+        }
+    } else {
+        SDL_SetError("No dynamic GL support in video driver");
+    }
+    return func;
+}
+
+void
+SDL_GL_UnloadLibrary(void)
+{
+    if (!_this) {
+        SDL_UninitializedVideo();
+        return;
+    }
+    if (_this->gl_config.driver_loaded > 0) {
+        if (--_this->gl_config.driver_loaded > 0) {
+            return;
+        }
+        if (_this->GL_UnloadLibrary) {
+            _this->GL_UnloadLibrary(_this);
+        }
+    }
+}
+
+static SDL_INLINE SDL_bool
+isAtLeastGL3(const char *verstr)
+{
+    return ( verstr && (SDL_atoi(verstr) >= 3) );
+}
+
+SDL_bool
+SDL_GL_ExtensionSupported(const char *extension)
+{
+#if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+    const GLubyte *(APIENTRY * glGetStringFunc) (GLenum);
+    const char *extensions;
+    const char *start;
+    const char *where, *terminator;
+
+    /* Extension names should not have spaces. */
+    where = SDL_strchr(extension, ' ');
+    if (where || *extension == '\0') {
+        return SDL_FALSE;
+    }
+    /* See if there's an environment variable override */
+    start = SDL_getenv(extension);
+    if (start && *start == '0') {
+        return SDL_FALSE;
+    }
+
+    /* Lookup the available extensions */
+
+    glGetStringFunc = SDL_GL_GetProcAddress("glGetString");
+    if (!glGetStringFunc) {
+        return SDL_FALSE;
+    }
+
+    if (isAtLeastGL3((const char *) glGetStringFunc(GL_VERSION))) {
+        const GLubyte *(APIENTRY * glGetStringiFunc) (GLenum, GLuint);
+        void (APIENTRY * glGetIntegervFunc) (GLenum pname, GLint * params);
+        GLint num_exts = 0;
+        GLint i;
+
+        glGetStringiFunc = SDL_GL_GetProcAddress("glGetStringi");
+        glGetIntegervFunc = SDL_GL_GetProcAddress("glGetIntegerv");
+        if ((!glGetStringiFunc) || (!glGetIntegervFunc)) {
+            return SDL_FALSE;
+        }
+
+        #ifndef GL_NUM_EXTENSIONS
+        #define GL_NUM_EXTENSIONS 0x821D
+        #endif
+        glGetIntegervFunc(GL_NUM_EXTENSIONS, &num_exts);
+        for (i = 0; i < num_exts; i++) {
+            const char *thisext = (const char *) glGetStringiFunc(GL_EXTENSIONS, i);
+            if (SDL_strcmp(thisext, extension) == 0) {
+                return SDL_TRUE;
+            }
+        }
+
+        return SDL_FALSE;
+    }
+
+    /* Try the old way with glGetString(GL_EXTENSIONS) ... */
+
+    extensions = (const char *) glGetStringFunc(GL_EXTENSIONS);
+    if (!extensions) {
+        return SDL_FALSE;
+    }
+    /*
+     * It takes a bit of care to be fool-proof about parsing the OpenGL
+     * extensions string. Don't be fooled by sub-strings, etc.
+     */
+
+    start = extensions;
+
+    for (;;) {
+        where = SDL_strstr(start, extension);
+        if (!where)
+            break;
+
+        terminator = where + SDL_strlen(extension);
+        if (where == start || *(where - 1) == ' ')
+            if (*terminator == ' ' || *terminator == '\0')
+                return SDL_TRUE;
+
+        start = terminator;
+    }
+    return SDL_FALSE;
+#else
+    return SDL_FALSE;
+#endif
+}
+
+void
+SDL_GL_ResetAttributes()
+{
+    if (!_this) {
+        return;
+    }
+
+    _this->gl_config.red_size = 3;
+    _this->gl_config.green_size = 3;
+    _this->gl_config.blue_size = 2;
+    _this->gl_config.alpha_size = 0;
+    _this->gl_config.buffer_size = 0;
+    _this->gl_config.depth_size = 16;
+    _this->gl_config.stencil_size = 0;
+    _this->gl_config.double_buffer = 1;
+    _this->gl_config.accum_red_size = 0;
+    _this->gl_config.accum_green_size = 0;
+    _this->gl_config.accum_blue_size = 0;
+    _this->gl_config.accum_alpha_size = 0;
+    _this->gl_config.stereo = 0;
+    _this->gl_config.multisamplebuffers = 0;
+    _this->gl_config.multisamplesamples = 0;
+    _this->gl_config.retained_backing = 1;
+    _this->gl_config.accelerated = -1;  /* accelerated or not, both are fine */
+    _this->gl_config.profile_mask = 0;
+#if SDL_VIDEO_OPENGL
+    _this->gl_config.major_version = 2;
+    _this->gl_config.minor_version = 1;
+#elif SDL_VIDEO_OPENGL_ES2
+    _this->gl_config.major_version = 2;
+    _this->gl_config.minor_version = 0;
+    _this->gl_config.profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
+#elif SDL_VIDEO_OPENGL_ES
+    _this->gl_config.major_version = 1;
+    _this->gl_config.minor_version = 1;
+    _this->gl_config.profile_mask = SDL_GL_CONTEXT_PROFILE_ES;
+#endif
+    _this->gl_config.flags = 0;
+    _this->gl_config.framebuffer_srgb_capable = 0;
+
+    _this->gl_config.share_with_current_context = 0;
+}
+
+int
+SDL_GL_SetAttribute(SDL_GLattr attr, int value)
+{
+#if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+    int retval;
+
+    if (!_this) {
+        return SDL_UninitializedVideo();
+    }
+    retval = 0;
+    switch (attr) {
+    case SDL_GL_RED_SIZE:
+        _this->gl_config.red_size = value;
+        break;
+    case SDL_GL_GREEN_SIZE:
+        _this->gl_config.green_size = value;
+        break;
+    case SDL_GL_BLUE_SIZE:
+        _this->gl_config.blue_size = value;
+        break;
+    case SDL_GL_ALPHA_SIZE:
+        _this->gl_config.alpha_size = value;
+        break;
+    case SDL_GL_DOUBLEBUFFER:
+        _this->gl_config.double_buffer = value;
+        break;
+    case SDL_GL_BUFFER_SIZE:
+        _this->gl_config.buffer_size = value;
+        break;
+    case SDL_GL_DEPTH_SIZE:
+        _this->gl_config.depth_size = value;
+        break;
+    case SDL_GL_STENCIL_SIZE:
+        _this->gl_config.stencil_size = value;
+        break;
+    case SDL_GL_ACCUM_RED_SIZE:
+        _this->gl_config.accum_red_size = value;
+        break;
+    case SDL_GL_ACCUM_GREEN_SIZE:
+        _this->gl_config.accum_green_size = value;
+        break;
+    case SDL_GL_ACCUM_BLUE_SIZE:
+        _this->gl_config.accum_blue_size = value;
+        break;
+    case SDL_GL_ACCUM_ALPHA_SIZE:
+        _this->gl_config.accum_alpha_size = value;
+        break;
+    case SDL_GL_STEREO:
+        _this->gl_config.stereo = value;
+        break;
+    case SDL_GL_MULTISAMPLEBUFFERS:
+        _this->gl_config.multisamplebuffers = value;
+        break;
+    case SDL_GL_MULTISAMPLESAMPLES:
+        _this->gl_config.multisamplesamples = value;
+        break;
+    case SDL_GL_ACCELERATED_VISUAL:
+        _this->gl_config.accelerated = value;
+        break;
+    case SDL_GL_RETAINED_BACKING:
+        _this->gl_config.retained_backing = value;
+        break;
+    case SDL_GL_CONTEXT_MAJOR_VERSION:
+        _this->gl_config.major_version = value;
+        break;
+    case SDL_GL_CONTEXT_MINOR_VERSION:
+        _this->gl_config.minor_version = value;
+        break;
+    case SDL_GL_CONTEXT_EGL:
+        /* FIXME: SDL_GL_CONTEXT_EGL to be deprecated in SDL 2.1 */
+        if (value != 0) {
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+        } else {
+            SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, 0);
+        };
+        break;
+    case SDL_GL_CONTEXT_FLAGS:
+        if( value & ~(SDL_GL_CONTEXT_DEBUG_FLAG |
+              SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG |
+              SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG |
+              SDL_GL_CONTEXT_RESET_ISOLATION_FLAG) ) {
+        retval = SDL_SetError("Unknown OpenGL context flag %d", value);
+        break;
+    }
+        _this->gl_config.flags = value;
+        break;
+    case SDL_GL_CONTEXT_PROFILE_MASK:
+        if( value != 0 &&
+        value != SDL_GL_CONTEXT_PROFILE_CORE &&
+        value != SDL_GL_CONTEXT_PROFILE_COMPATIBILITY &&
+        value != SDL_GL_CONTEXT_PROFILE_ES ) {
+        retval = SDL_SetError("Unknown OpenGL context profile %d", value);
+        break;
+    }
+        _this->gl_config.profile_mask = value;
+        break;
+    case SDL_GL_SHARE_WITH_CURRENT_CONTEXT:
+        _this->gl_config.share_with_current_context = value;
+        break;
+    case SDL_GL_FRAMEBUFFER_SRGB_CAPABLE:
+        _this->gl_config.framebuffer_srgb_capable = value;
+        break;
+    default:
+        retval = SDL_SetError("Unknown OpenGL attribute");
+        break;
+    }
+    return retval;
+#else
+    return SDL_Unsupported();
+#endif /* SDL_VIDEO_OPENGL */
+}
+
+int
+SDL_GL_GetAttribute(SDL_GLattr attr, int *value)
+{
+#if SDL_VIDEO_OPENGL || SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+    void (APIENTRY * glGetIntegervFunc) (GLenum pname, GLint * params);
+    GLenum(APIENTRY * glGetErrorFunc) (void);
+    GLenum attrib = 0;
+    GLenum error = 0;
+
+    glGetIntegervFunc = SDL_GL_GetProcAddress("glGetIntegerv");
+    if (!glGetIntegervFunc) {
+        return -1;
+    }
+
+    glGetErrorFunc = SDL_GL_GetProcAddress("glGetError");
+    if (!glGetErrorFunc) {
+        return -1;
+    }
+
+    /* Clear value in any case */
+    *value = 0;
+
+    switch (attr) {
+    case SDL_GL_RED_SIZE:
+        attrib = GL_RED_BITS;
+        break;
+    case SDL_GL_BLUE_SIZE:
+        attrib = GL_BLUE_BITS;
+        break;
+    case SDL_GL_GREEN_SIZE:
+        attrib = GL_GREEN_BITS;
+        break;
+    case SDL_GL_ALPHA_SIZE:
+        attrib = GL_ALPHA_BITS;
+        break;
+    case SDL_GL_DOUBLEBUFFER:
+#if SDL_VIDEO_OPENGL
+        attrib = GL_DOUBLEBUFFER;
+        break;
+#else
+        /* OpenGL ES 1.0 and above specifications have EGL_SINGLE_BUFFER      */
+        /* parameter which switches double buffer to single buffer. OpenGL ES */
+        /* SDL driver must set proper value after initialization              */
+        *value = _this->gl_config.double_buffer;
+        return 0;
+#endif
+    case SDL_GL_DEPTH_SIZE:
+        attrib = GL_DEPTH_BITS;
+        break;
+    case SDL_GL_STENCIL_SIZE:
+        attrib = GL_STENCIL_BITS;
+        break;
+#if SDL_VIDEO_OPENGL
+    case SDL_GL_ACCUM_RED_SIZE:
+        attrib = GL_ACCUM_RED_BITS;
+        break;
+    case SDL_GL_ACCUM_GREEN_SIZE:
+        attrib = GL_ACCUM_GREEN_BITS;
+        break;
+    case SDL_GL_ACCUM_BLUE_SIZE:
+        attrib = GL_ACCUM_BLUE_BITS;
+        break;
+    case SDL_GL_ACCUM_ALPHA_SIZE:
+        attrib = GL_ACCUM_ALPHA_BITS;
+        break;
+    case SDL_GL_STEREO:
+        attrib = GL_STEREO;
+        break;
+#else
+    case SDL_GL_ACCUM_RED_SIZE:
+    case SDL_GL_ACCUM_GREEN_SIZE:
+    case SDL_GL_ACCUM_BLUE_SIZE:
+    case SDL_GL_ACCUM_ALPHA_SIZE:
+    case SDL_GL_STEREO:
+        /* none of these are supported in OpenGL ES */
+        *value = 0;
+        return 0;
+#endif
+    case SDL_GL_MULTISAMPLEBUFFERS:
+#if SDL_VIDEO_OPENGL
+        attrib = GL_SAMPLE_BUFFERS_ARB;
+#else
+        attrib = GL_SAMPLE_BUFFERS;
+#endif
+        break;
+    case SDL_GL_MULTISAMPLESAMPLES:
+#if SDL_VIDEO_OPENGL
+        attrib = GL_SAMPLES_ARB;
+#else
+        attrib = GL_SAMPLES;
+#endif
+        break;
+    case SDL_GL_BUFFER_SIZE:
+        {
+            GLint bits = 0;
+            GLint component;
+
+            /*
+             * there doesn't seem to be a single flag in OpenGL
+             * for this!
+             */
+            glGetIntegervFunc(GL_RED_BITS, &component);
+            bits += component;
+            glGetIntegervFunc(GL_GREEN_BITS, &component);
+            bits += component;
+            glGetIntegervFunc(GL_BLUE_BITS, &component);
+            bits += component;
+            glGetIntegervFunc(GL_ALPHA_BITS, &component);
+            bits += component;
+
+            *value = bits;
+            return 0;
+        }
+    case SDL_GL_ACCELERATED_VISUAL:
+        {
+            /* FIXME: How do we get this information? */
+            *value = (_this->gl_config.accelerated != 0);
+            return 0;
+        }
+    case SDL_GL_RETAINED_BACKING:
+        {
+            *value = _this->gl_config.retained_backing;
+            return 0;
+        }
+    case SDL_GL_CONTEXT_MAJOR_VERSION:
+        {
+            *value = _this->gl_config.major_version;
+            return 0;
+        }
+    case SDL_GL_CONTEXT_MINOR_VERSION:
+        {
+            *value = _this->gl_config.minor_version;
+            return 0;
+        }
+    case SDL_GL_CONTEXT_EGL:
+        /* FIXME: SDL_GL_CONTEXT_EGL to be deprecated in SDL 2.1 */
+        {
+            if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) {
+                *value = 1;
+            }
+            else {
+                *value = 0;
+            }
+            return 0;
+        }
+    case SDL_GL_CONTEXT_FLAGS:
+        {
+            *value = _this->gl_config.flags;
+            return 0;
+        }
+    case SDL_GL_CONTEXT_PROFILE_MASK:
+        {
+            *value = _this->gl_config.profile_mask;
+            return 0;
+        }
+    case SDL_GL_SHARE_WITH_CURRENT_CONTEXT:
+        {
+            *value = _this->gl_config.share_with_current_context;
+            return 0;
+        }
+    case SDL_GL_FRAMEBUFFER_SRGB_CAPABLE:
+        {
+            *value = _this->gl_config.framebuffer_srgb_capable;
+            return 0;
+        }
+    default:
+        return SDL_SetError("Unknown OpenGL attribute");
+    }
+
+    glGetIntegervFunc(attrib, (GLint *) value);
+    error = glGetErrorFunc();
+    if (error != GL_NO_ERROR) {
+        if (error == GL_INVALID_ENUM) {
+            return SDL_SetError("OpenGL error: GL_INVALID_ENUM");
+        } else if (error == GL_INVALID_VALUE) {
+            return SDL_SetError("OpenGL error: GL_INVALID_VALUE");
+        }
+        return SDL_SetError("OpenGL error: %08X", error);
+    }
+    return 0;
+#else
+    return SDL_Unsupported();
+#endif /* SDL_VIDEO_OPENGL */
+}
+
+SDL_GLContext
+SDL_GL_CreateContext(SDL_Window * window)
+{
+    SDL_GLContext ctx = NULL;
+    CHECK_WINDOW_MAGIC(window, NULL);
+
+    if (!(window->flags & SDL_WINDOW_OPENGL)) {
+        SDL_SetError("The specified window isn't an OpenGL window");
+        return NULL;
+    }
+
+    ctx = _this->GL_CreateContext(_this, window);
+
+    /* Creating a context is assumed to make it current in the SDL driver. */
+    if (ctx) {
+        _this->current_glwin = window;
+        _this->current_glctx = ctx;
+        SDL_TLSSet(_this->current_glwin_tls, window, NULL);
+        SDL_TLSSet(_this->current_glctx_tls, ctx, NULL);
+    }
+    return ctx;
+}
+
+int
+SDL_GL_MakeCurrent(SDL_Window * window, SDL_GLContext ctx)
+{
+    int retval;
+
+    if (window == SDL_GL_GetCurrentWindow() &&
+        ctx == SDL_GL_GetCurrentContext()) {
+        /* We're already current. */
+        return 0;
+    }
+
+    if (!ctx) {
+        window = NULL;
+    } else {
+        CHECK_WINDOW_MAGIC(window, -1);
+
+        if (!(window->flags & SDL_WINDOW_OPENGL)) {
+            return SDL_SetError("The specified window isn't an OpenGL window");
+        }
+    }
+
+    retval = _this->GL_MakeCurrent(_this, window, ctx);
+    if (retval == 0) {
+        _this->current_glwin = window;
+        _this->current_glctx = ctx;
+        SDL_TLSSet(_this->current_glwin_tls, window, NULL);
+        SDL_TLSSet(_this->current_glctx_tls, ctx, NULL);
+    }
+    return retval;
+}
+
+SDL_Window *
+SDL_GL_GetCurrentWindow(void)
+{
+    if (!_this) {
+        SDL_UninitializedVideo();
+        return NULL;
+    }
+    return (SDL_Window *)SDL_TLSGet(_this->current_glwin_tls);
+}
+
+SDL_GLContext
+SDL_GL_GetCurrentContext(void)
+{
+    if (!_this) {
+        SDL_UninitializedVideo();
+        return NULL;
+    }
+    return (SDL_GLContext)SDL_TLSGet(_this->current_glctx_tls);
+}
+
+void SDL_GL_GetDrawableSize(SDL_Window * window, int *w, int *h)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (_this->GL_GetDrawableSize) {
+        _this->GL_GetDrawableSize(_this, window, w, h);
+    } else {
+        SDL_GetWindowSize(window, w, h);
+    }
+}
+
+int
+SDL_GL_SetSwapInterval(int interval)
+{
+    if (!_this) {
+        return SDL_UninitializedVideo();
+    } else if (SDL_GL_GetCurrentContext() == NULL) {
+        return SDL_SetError("No OpenGL context has been made current");
+    } else if (_this->GL_SetSwapInterval) {
+        return _this->GL_SetSwapInterval(_this, interval);
+    } else {
+        return SDL_SetError("Setting the swap interval is not supported");
+    }
+}
+
+int
+SDL_GL_GetSwapInterval(void)
+{
+    if (!_this) {
+        return 0;
+    } else if (SDL_GL_GetCurrentContext() == NULL) {
+        return 0;
+    } else if (_this->GL_GetSwapInterval) {
+        return _this->GL_GetSwapInterval(_this);
+    } else {
+        return 0;
+    }
+}
+
+void
+SDL_GL_SwapWindow(SDL_Window * window)
+{
+    CHECK_WINDOW_MAGIC(window, );
+
+    if (!(window->flags & SDL_WINDOW_OPENGL)) {
+        SDL_SetError("The specified window isn't an OpenGL window");
+        return;
+    }
+
+    if (SDL_GL_GetCurrentWindow() != window) {
+        SDL_SetError("The specified window has not been made current");
+        return;
+    }
+
+    _this->GL_SwapWindow(_this, window);
+}
+
+void
+SDL_GL_DeleteContext(SDL_GLContext context)
+{
+    if (!_this || !context) {
+        return;
+    }
+
+    if (SDL_GL_GetCurrentContext() == context) {
+        SDL_GL_MakeCurrent(NULL, NULL);
+    }
+
+    _this->GL_DeleteContext(_this, context);
+}
+
+#if 0                           /* FIXME */
+/*
+ * Utility function used by SDL_WM_SetIcon(); flags & 1 for color key, flags
+ * & 2 for alpha channel.
+ */
+static void
+CreateMaskFromColorKeyOrAlpha(SDL_Surface * icon, Uint8 * mask, int flags)
+{
+    int x, y;
+    Uint32 colorkey;
+#define SET_MASKBIT(icon, x, y, mask) \
+    mask[(y*((icon->w+7)/8))+(x/8)] &= ~(0x01<<(7-(x%8)))
+
+    colorkey = icon->format->colorkey;
+    switch (icon->format->BytesPerPixel) {
+    case 1:
+        {
+            Uint8 *pixels;
+            for (y = 0; y < icon->h; ++y) {
+                pixels = (Uint8 *) icon->pixels + y * icon->pitch;
+                for (x = 0; x < icon->w; ++x) {
+                    if (*pixels++ == colorkey) {
+                        SET_MASKBIT(icon, x, y, mask);
+                    }
+                }
+            }
+        }
+        break;
+
+    case 2:
+        {
+            Uint16 *pixels;
+            for (y = 0; y < icon->h; ++y) {
+                pixels = (Uint16 *) icon->pixels + y * icon->pitch / 2;
+                for (x = 0; x < icon->w; ++x) {
+                    if ((flags & 1) && *pixels == colorkey) {
+                        SET_MASKBIT(icon, x, y, mask);
+                    } else if ((flags & 2)
+                               && (*pixels & icon->format->Amask) == 0) {
+                        SET_MASKBIT(icon, x, y, mask);
+                    }
+                    pixels++;
+                }
+            }
+        }
+        break;
+
+    case 4:
+        {
+            Uint32 *pixels;
+            for (y = 0; y < icon->h; ++y) {
+                pixels = (Uint32 *) icon->pixels + y * icon->pitch / 4;
+                for (x = 0; x < icon->w; ++x) {
+                    if ((flags & 1) && *pixels == colorkey) {
+                        SET_MASKBIT(icon, x, y, mask);
+                    } else if ((flags & 2)
+                               && (*pixels & icon->format->Amask) == 0) {
+                        SET_MASKBIT(icon, x, y, mask);
+                    }
+                    pixels++;
+                }
+            }
+        }
+        break;
+    }
+}
+
+/*
+ * Sets the window manager icon for the display window.
+ */
+void
+SDL_WM_SetIcon(SDL_Surface * icon, Uint8 * mask)
+{
+    if (icon && _this->SetIcon) {
+        /* Generate a mask if necessary, and create the icon! */
+        if (mask == NULL) {
+            int mask_len = icon->h * (icon->w + 7) / 8;
+            int flags = 0;
+            mask = (Uint8 *) SDL_malloc(mask_len);
+            if (mask == NULL) {
+                return;
+            }
+            SDL_memset(mask, ~0, mask_len);
+            if (icon->flags & SDL_SRCCOLORKEY)
+                flags |= 1;
+            if (icon->flags & SDL_SRCALPHA)
+                flags |= 2;
+            if (flags) {
+                CreateMaskFromColorKeyOrAlpha(icon, mask, flags);
+            }
+            _this->SetIcon(_this, icon, mask);
+            SDL_free(mask);
+        } else {
+            _this->SetIcon(_this, icon, mask);
+        }
+    }
+}
+#endif
+
+SDL_bool
+SDL_GetWindowWMInfo(SDL_Window * window, struct SDL_SysWMinfo *info)
+{
+    CHECK_WINDOW_MAGIC(window, SDL_FALSE);
+
+    if (!info) {
+        return SDL_FALSE;
+    }
+    info->subsystem = SDL_SYSWM_UNKNOWN;
+
+    if (!_this->GetWindowWMInfo) {
+        return SDL_FALSE;
+    }
+    return (_this->GetWindowWMInfo(_this, window, info));
+}
+
+void
+SDL_StartTextInput(void)
+{
+    SDL_Window *window;
+
+    /* First, enable text events */
+    SDL_EventState(SDL_TEXTINPUT, SDL_ENABLE);
+    SDL_EventState(SDL_TEXTEDITING, SDL_ENABLE);
+
+    /* Then show the on-screen keyboard, if any */
+    window = SDL_GetFocusWindow();
+    if (window && _this && _this->ShowScreenKeyboard) {
+        _this->ShowScreenKeyboard(_this, window);
+    }
+
+    /* Finally start the text input system */
+    if (_this && _this->StartTextInput) {
+        _this->StartTextInput(_this);
+    }
+}
+
+SDL_bool
+SDL_IsTextInputActive(void)
+{
+    return (SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE);
+}
+
+void
+SDL_StopTextInput(void)
+{
+    SDL_Window *window;
+
+    /* Stop the text input system */
+    if (_this && _this->StopTextInput) {
+        _this->StopTextInput(_this);
+    }
+
+    /* Hide the on-screen keyboard, if any */
+    window = SDL_GetFocusWindow();
+    if (window && _this && _this->HideScreenKeyboard) {
+        _this->HideScreenKeyboard(_this, window);
+    }
+
+    /* Finally disable text events */
+    SDL_EventState(SDL_TEXTINPUT, SDL_DISABLE);
+    SDL_EventState(SDL_TEXTEDITING, SDL_DISABLE);
+}
+
+void
+SDL_SetTextInputRect(SDL_Rect *rect)
+{
+    if (_this && _this->SetTextInputRect) {
+        _this->SetTextInputRect(_this, rect);
+    }
+}
+
+SDL_bool
+SDL_HasScreenKeyboardSupport(void)
+{
+    if (_this && _this->HasScreenKeyboardSupport) {
+        return _this->HasScreenKeyboardSupport(_this);
+    }
+    return SDL_FALSE;
+}
+
+SDL_bool
+SDL_IsScreenKeyboardShown(SDL_Window *window)
+{
+    if (window && _this && _this->IsScreenKeyboardShown) {
+        return _this->IsScreenKeyboardShown(_this, window);
+    }
+    return SDL_FALSE;
+}
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+#include "windows/SDL_windowsmessagebox.h"
+#endif
+#if SDL_VIDEO_DRIVER_COCOA
+#include "cocoa/SDL_cocoamessagebox.h"
+#endif
+#if SDL_VIDEO_DRIVER_UIKIT
+#include "uikit/SDL_uikitmessagebox.h"
+#endif
+#if SDL_VIDEO_DRIVER_X11
+#include "x11/SDL_x11messagebox.h"
+#endif
+
+static SDL_bool SDL_MessageboxValidForDriver(const SDL_MessageBoxData *messageboxdata, SDL_SYSWM_TYPE drivertype)
+{
+    SDL_SysWMinfo info;
+    SDL_Window *window = messageboxdata->window;
+
+    if (!window) {
+        return SDL_TRUE;
+    }
+
+    SDL_VERSION(&info.version);
+    if (!SDL_GetWindowWMInfo(window, &info)) {
+        return SDL_TRUE;
+    } else {
+        return (info.subsystem == drivertype);
+    }
+}
+
+int
+SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
+{
+    int dummybutton;
+    int retval = -1;
+    SDL_bool relative_mode;
+    int show_cursor_prev;
+
+    if (!messageboxdata) {
+        return SDL_InvalidParamError("messageboxdata");
+    }
+
+    relative_mode = SDL_GetRelativeMouseMode();
+    SDL_SetRelativeMouseMode(SDL_FALSE);
+    show_cursor_prev = SDL_ShowCursor(1);
+
+    if (!buttonid) {
+        buttonid = &dummybutton;
+    }
+
+    if (_this && _this->ShowMessageBox) {
+        retval = _this->ShowMessageBox(_this, messageboxdata, buttonid);
+    }
+
+    /* It's completely fine to call this function before video is initialized */
+#if SDL_VIDEO_DRIVER_WINDOWS
+    if (retval == -1 &&
+        SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_WINDOWS) &&
+        WIN_ShowMessageBox(messageboxdata, buttonid) == 0) {
+        retval = 0;
+    }
+#endif
+#if SDL_VIDEO_DRIVER_COCOA
+    if (retval == -1 &&
+        SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_COCOA) &&
+        Cocoa_ShowMessageBox(messageboxdata, buttonid) == 0) {
+        retval = 0;
+    }
+#endif
+#if SDL_VIDEO_DRIVER_UIKIT
+    if (retval == -1 &&
+        SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_UIKIT) &&
+        UIKit_ShowMessageBox(messageboxdata, buttonid) == 0) {
+        retval = 0;
+    }
+#endif
+#if SDL_VIDEO_DRIVER_X11
+    if (retval == -1 &&
+        SDL_MessageboxValidForDriver(messageboxdata, SDL_SYSWM_X11) &&
+        X11_ShowMessageBox(messageboxdata, buttonid) == 0) {
+        retval = 0;
+    }
+#endif
+    if (retval == -1) {
+        SDL_SetError("No message system available");
+    }
+
+    SDL_ShowCursor(show_cursor_prev);
+    SDL_SetRelativeMouseMode(relative_mode);
+
+    return retval;
+}
+
+int
+SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window)
+{
+    SDL_MessageBoxData data;
+    SDL_MessageBoxButtonData button;
+
+    SDL_zero(data);
+    data.flags = flags;
+    data.title = title;
+    data.message = message;
+    data.numbuttons = 1;
+    data.buttons = &button;
+    data.window = window;
+
+    SDL_zero(button);
+    button.flags |= SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT;
+    button.flags |= SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT;
+    button.text = "OK";
+
+    return SDL_ShowMessageBox(&data, NULL);
+}
+
+SDL_bool
+SDL_ShouldAllowTopmost(void)
+{
+    const char *hint = SDL_GetHint(SDL_HINT_ALLOW_TOPMOST);
+    if (hint) {
+        if (*hint == '0') {
+            return SDL_FALSE;
+        } else {
+            return SDL_TRUE;
+        }
+    }
+    return SDL_TRUE;
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidclipboard.c b/Source/3rd Party/sdl/src/video/android/SDL_androidclipboard.c
new file mode 100644
index 000000000..dcac2e701
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidclipboard.c	
@@ -0,0 +1,48 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include "SDL_androidvideo.h"
+
+#include "../../core/android/SDL_android.h"
+
+int
+Android_SetClipboardText(_THIS, const char *text)
+{
+    return Android_JNI_SetClipboardText(text);
+}
+
+char *
+Android_GetClipboardText(_THIS)
+{
+    return Android_JNI_GetClipboardText();
+}
+
+SDL_bool Android_HasClipboardText(_THIS)
+{
+    return Android_JNI_HasClipboardText();
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidclipboard.h b/Source/3rd Party/sdl/src/video/android/SDL_androidclipboard.h
new file mode 100644
index 000000000..c1ab140cf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidclipboard.h	
@@ -0,0 +1,32 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_androidclipboard_h
+#define _SDL_androidclipboard_h
+
+extern int Android_SetClipboardText(_THIS, const char *text);
+extern char *Android_GetClipboardText(_THIS);
+extern SDL_bool Android_HasClipboardText(_THIS);
+
+#endif /* _SDL_androidclipboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidevents.c b/Source/3rd Party/sdl/src/video/android/SDL_androidevents.c
new file mode 100644
index 000000000..164126cf7
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidevents.c	
@@ -0,0 +1,112 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+/* We're going to do this by default */
+#define SDL_ANDROID_BLOCK_ON_PAUSE  1
+
+#include "SDL_androidevents.h"
+#include "SDL_events.h"
+#include "SDL_androidwindow.h"
+
+void android_egl_context_backup();
+void android_egl_context_restore();
+
+void 
+android_egl_context_restore() 
+{
+    SDL_WindowData *data = (SDL_WindowData *) Android_Window->driverdata;
+    if (SDL_GL_MakeCurrent(Android_Window, (SDL_GLContext) data->egl_context) < 0) {
+        /* The context is no longer valid, create a new one */
+        /* FIXME: Notify the user that the context changed and textures need to be re created */
+        data->egl_context = (EGLContext) SDL_GL_CreateContext(Android_Window);
+        SDL_GL_MakeCurrent(Android_Window, (SDL_GLContext) data->egl_context);
+    }
+}
+
+void 
+android_egl_context_backup() 
+{
+    /* Keep a copy of the EGL Context so we can try to restore it when we resume */
+    SDL_WindowData *data = (SDL_WindowData *) Android_Window->driverdata;
+    data->egl_context = SDL_GL_GetCurrentContext();
+    /* We need to do this so the EGLSurface can be freed */
+    SDL_GL_MakeCurrent(Android_Window, NULL);
+}
+
+void
+Android_PumpEvents(_THIS)
+{
+    static int isPaused = 0;
+#if SDL_ANDROID_BLOCK_ON_PAUSE
+    static int isPausing = 0;
+#endif
+    /* No polling necessary */
+
+    /*
+     * Android_ResumeSem and Android_PauseSem are signaled from Java_org_libsdl_app_SDLActivity_nativePause and Java_org_libsdl_app_SDLActivity_nativeResume
+     * When the pause semaphore is signaled, if SDL_ANDROID_BLOCK_ON_PAUSE is defined the event loop will block until the resume signal is emitted.
+     */
+
+#if SDL_ANDROID_BLOCK_ON_PAUSE
+    if (isPaused && !isPausing) {
+        /* Make sure this is the last thing we do before pausing */
+        android_egl_context_backup();
+        if(SDL_SemWait(Android_ResumeSem) == 0) {
+#else
+    if (isPaused) {
+        if(SDL_SemTryWait(Android_ResumeSem) == 0) {
+#endif
+            isPaused = 0;
+            
+            /* Restore the GL Context from here, as this operation is thread dependent */
+            if (!SDL_HasEvent(SDL_QUIT)) {
+                android_egl_context_restore();
+            }
+        }
+    }
+    else {
+#if SDL_ANDROID_BLOCK_ON_PAUSE
+        if( isPausing || SDL_SemTryWait(Android_PauseSem) == 0 ) {
+            /* We've been signaled to pause, but before we block ourselves, 
+            we need to make sure that certain key events have reached the app */
+            if (SDL_HasEvent(SDL_WINDOWEVENT) || SDL_HasEvent(SDL_APP_WILLENTERBACKGROUND) || SDL_HasEvent(SDL_APP_DIDENTERBACKGROUND) ) {
+                isPausing = 1;
+            }
+            else {
+                isPausing = 0;
+                isPaused = 1;
+            }
+        }
+#else
+        if(SDL_SemTryWait(Android_PauseSem) == 0) {
+            android_egl_context_backup();
+            isPaused = 1;
+        }
+#endif
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidevents.h b/Source/3rd Party/sdl/src/video/android/SDL_androidevents.h
new file mode 100644
index 000000000..547338d76
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidevents.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "SDL_androidvideo.h"
+
+extern void Android_PumpEvents(_THIS);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidgl.c b/Source/3rd Party/sdl/src/video/android/SDL_androidgl.c
new file mode 100644
index 000000000..1f933ce30
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidgl.c	
@@ -0,0 +1,57 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+/* Android SDL video driver implementation */
+
+#include "SDL_video.h"
+#include "../SDL_egl_c.h"
+#include "SDL_androidwindow.h"
+
+#include "SDL_androidvideo.h"
+#include "../../core/android/SDL_android.h"
+
+#include <android/log.h>
+
+#include <dlfcn.h>
+
+SDL_EGL_CreateContext_impl(Android)
+SDL_EGL_MakeCurrent_impl(Android)
+
+void
+Android_GLES_SwapWindow(_THIS, SDL_Window * window)
+{
+    /* FIXME: These two functions were in the Java code, do we really need them? */
+    _this->egl_data->eglWaitNative(EGL_CORE_NATIVE_ENGINE);
+    _this->egl_data->eglWaitGL();
+    SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);
+}
+
+int
+Android_GLES_LoadLibrary(_THIS, const char *path) {
+    return SDL_EGL_LoadLibrary(_this, path, (NativeDisplayType) 0);
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidkeyboard.c b/Source/3rd Party/sdl/src/video/android/SDL_androidkeyboard.c
new file mode 100644
index 000000000..5008cfde6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidkeyboard.c	
@@ -0,0 +1,334 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include <android/log.h>
+
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_androidkeyboard.h"
+
+#include "../../core/android/SDL_android.h"
+
+void Android_InitKeyboard(void)
+{
+    SDL_Keycode keymap[SDL_NUM_SCANCODES];
+
+    /* Add default scancode to key mapping */
+    SDL_GetDefaultKeymap(keymap);
+    SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES);
+}
+
+static SDL_Scancode Android_Keycodes[] = {
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_UNKNOWN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_LEFT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SOFT_RIGHT */
+    SDL_SCANCODE_AC_HOME, /* AKEYCODE_HOME */
+    SDL_SCANCODE_AC_BACK, /* AKEYCODE_BACK */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CALL */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_ENDCALL */
+    SDL_SCANCODE_0, /* AKEYCODE_0 */
+    SDL_SCANCODE_1, /* AKEYCODE_1 */
+    SDL_SCANCODE_2, /* AKEYCODE_2 */
+    SDL_SCANCODE_3, /* AKEYCODE_3 */
+    SDL_SCANCODE_4, /* AKEYCODE_4 */
+    SDL_SCANCODE_5, /* AKEYCODE_5 */
+    SDL_SCANCODE_6, /* AKEYCODE_6 */
+    SDL_SCANCODE_7, /* AKEYCODE_7 */
+    SDL_SCANCODE_8, /* AKEYCODE_8 */
+    SDL_SCANCODE_9, /* AKEYCODE_9 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STAR */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_POUND */
+    SDL_SCANCODE_UP, /* AKEYCODE_DPAD_UP */
+    SDL_SCANCODE_DOWN, /* AKEYCODE_DPAD_DOWN */
+    SDL_SCANCODE_LEFT, /* AKEYCODE_DPAD_LEFT */
+    SDL_SCANCODE_RIGHT, /* AKEYCODE_DPAD_RIGHT */
+    SDL_SCANCODE_SELECT, /* AKEYCODE_DPAD_CENTER */
+    SDL_SCANCODE_VOLUMEUP, /* AKEYCODE_VOLUME_UP */
+    SDL_SCANCODE_VOLUMEDOWN, /* AKEYCODE_VOLUME_DOWN */
+    SDL_SCANCODE_POWER, /* AKEYCODE_POWER */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CAMERA */
+    SDL_SCANCODE_CLEAR, /* AKEYCODE_CLEAR */
+    SDL_SCANCODE_A, /* AKEYCODE_A */
+    SDL_SCANCODE_B, /* AKEYCODE_B */
+    SDL_SCANCODE_C, /* AKEYCODE_C */
+    SDL_SCANCODE_D, /* AKEYCODE_D */
+    SDL_SCANCODE_E, /* AKEYCODE_E */
+    SDL_SCANCODE_F, /* AKEYCODE_F */
+    SDL_SCANCODE_G, /* AKEYCODE_G */
+    SDL_SCANCODE_H, /* AKEYCODE_H */
+    SDL_SCANCODE_I, /* AKEYCODE_I */
+    SDL_SCANCODE_J, /* AKEYCODE_J */
+    SDL_SCANCODE_K, /* AKEYCODE_K */
+    SDL_SCANCODE_L, /* AKEYCODE_L */
+    SDL_SCANCODE_M, /* AKEYCODE_M */
+    SDL_SCANCODE_N, /* AKEYCODE_N */
+    SDL_SCANCODE_O, /* AKEYCODE_O */
+    SDL_SCANCODE_P, /* AKEYCODE_P */
+    SDL_SCANCODE_Q, /* AKEYCODE_Q */
+    SDL_SCANCODE_R, /* AKEYCODE_R */
+    SDL_SCANCODE_S, /* AKEYCODE_S */
+    SDL_SCANCODE_T, /* AKEYCODE_T */
+    SDL_SCANCODE_U, /* AKEYCODE_U */
+    SDL_SCANCODE_V, /* AKEYCODE_V */
+    SDL_SCANCODE_W, /* AKEYCODE_W */
+    SDL_SCANCODE_X, /* AKEYCODE_X */
+    SDL_SCANCODE_Y, /* AKEYCODE_Y */
+    SDL_SCANCODE_Z, /* AKEYCODE_Z */
+    SDL_SCANCODE_COMMA, /* AKEYCODE_COMMA */
+    SDL_SCANCODE_PERIOD, /* AKEYCODE_PERIOD */
+    SDL_SCANCODE_LALT, /* AKEYCODE_ALT_LEFT */
+    SDL_SCANCODE_RALT, /* AKEYCODE_ALT_RIGHT */
+    SDL_SCANCODE_LSHIFT, /* AKEYCODE_SHIFT_LEFT */
+    SDL_SCANCODE_RSHIFT, /* AKEYCODE_SHIFT_RIGHT */
+    SDL_SCANCODE_TAB, /* AKEYCODE_TAB */
+    SDL_SCANCODE_SPACE, /* AKEYCODE_SPACE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SYM */
+    SDL_SCANCODE_WWW, /* AKEYCODE_EXPLORER */
+    SDL_SCANCODE_MAIL, /* AKEYCODE_ENVELOPE */
+    SDL_SCANCODE_RETURN, /* AKEYCODE_ENTER */
+    SDL_SCANCODE_BACKSPACE, /* AKEYCODE_DEL */
+    SDL_SCANCODE_GRAVE, /* AKEYCODE_GRAVE */
+    SDL_SCANCODE_MINUS, /* AKEYCODE_MINUS */
+    SDL_SCANCODE_EQUALS, /* AKEYCODE_EQUALS */
+    SDL_SCANCODE_LEFTBRACKET, /* AKEYCODE_LEFT_BRACKET */
+    SDL_SCANCODE_RIGHTBRACKET, /* AKEYCODE_RIGHT_BRACKET */
+    SDL_SCANCODE_BACKSLASH, /* AKEYCODE_BACKSLASH */
+    SDL_SCANCODE_SEMICOLON, /* AKEYCODE_SEMICOLON */
+    SDL_SCANCODE_APOSTROPHE, /* AKEYCODE_APOSTROPHE */
+    SDL_SCANCODE_SLASH, /* AKEYCODE_SLASH */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_AT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_NUM */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_HEADSETHOOK */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_FOCUS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PLUS */
+    SDL_SCANCODE_MENU, /* AKEYCODE_MENU */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_NOTIFICATION */
+    SDL_SCANCODE_AC_SEARCH, /* AKEYCODE_SEARCH */
+    SDL_SCANCODE_AUDIOPLAY, /* AKEYCODE_MEDIA_PLAY_PAUSE */
+    SDL_SCANCODE_AUDIOSTOP, /* AKEYCODE_MEDIA_STOP */
+    SDL_SCANCODE_AUDIONEXT, /* AKEYCODE_MEDIA_NEXT */
+    SDL_SCANCODE_AUDIOPREV, /* AKEYCODE_MEDIA_PREVIOUS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_REWIND */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_FAST_FORWARD */
+    SDL_SCANCODE_MUTE, /* AKEYCODE_MUTE */
+    SDL_SCANCODE_PAGEUP, /* AKEYCODE_PAGE_UP */
+    SDL_SCANCODE_PAGEDOWN, /* AKEYCODE_PAGE_DOWN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PICTSYMBOLS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SWITCH_CHARSET */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_A */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_B */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_C */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_X */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_Y */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_Z */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_L1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_R1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_L2 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_R2 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_THUMBL */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_THUMBR */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_START */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_SELECT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_MODE */
+    SDL_SCANCODE_ESCAPE, /* AKEYCODE_ESCAPE */
+    SDL_SCANCODE_DELETE, /* AKEYCODE_FORWARD_DEL */
+    SDL_SCANCODE_LCTRL, /* AKEYCODE_CTRL_LEFT */
+    SDL_SCANCODE_RCTRL, /* AKEYCODE_CTRL_RIGHT */
+    SDL_SCANCODE_CAPSLOCK, /* AKEYCODE_CAPS_LOCK */
+    SDL_SCANCODE_SCROLLLOCK, /* AKEYCODE_SCROLL_LOCK */
+    SDL_SCANCODE_LGUI, /* AKEYCODE_META_LEFT */
+    SDL_SCANCODE_RGUI, /* AKEYCODE_META_RIGHT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_FUNCTION */
+    SDL_SCANCODE_PRINTSCREEN, /* AKEYCODE_SYSRQ */
+    SDL_SCANCODE_PAUSE, /* AKEYCODE_BREAK */
+    SDL_SCANCODE_HOME, /* AKEYCODE_MOVE_HOME */
+    SDL_SCANCODE_END, /* AKEYCODE_MOVE_END */
+    SDL_SCANCODE_INSERT, /* AKEYCODE_INSERT */
+    SDL_SCANCODE_AC_FORWARD, /* AKEYCODE_FORWARD */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_PLAY */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_PAUSE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_CLOSE */
+    SDL_SCANCODE_EJECT, /* AKEYCODE_MEDIA_EJECT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_RECORD */
+    SDL_SCANCODE_F1, /* AKEYCODE_F1 */
+    SDL_SCANCODE_F2, /* AKEYCODE_F2 */
+    SDL_SCANCODE_F3, /* AKEYCODE_F3 */
+    SDL_SCANCODE_F4, /* AKEYCODE_F4 */
+    SDL_SCANCODE_F5, /* AKEYCODE_F5 */
+    SDL_SCANCODE_F6, /* AKEYCODE_F6 */
+    SDL_SCANCODE_F7, /* AKEYCODE_F7 */
+    SDL_SCANCODE_F8, /* AKEYCODE_F8 */
+    SDL_SCANCODE_F9, /* AKEYCODE_F9 */
+    SDL_SCANCODE_F10, /* AKEYCODE_F10 */
+    SDL_SCANCODE_F11, /* AKEYCODE_F11 */
+    SDL_SCANCODE_F12, /* AKEYCODE_F12 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_NUM_LOCK */
+    SDL_SCANCODE_KP_0, /* AKEYCODE_NUMPAD_0 */
+    SDL_SCANCODE_KP_1, /* AKEYCODE_NUMPAD_1 */
+    SDL_SCANCODE_KP_2, /* AKEYCODE_NUMPAD_2 */
+    SDL_SCANCODE_KP_3, /* AKEYCODE_NUMPAD_3 */
+    SDL_SCANCODE_KP_4, /* AKEYCODE_NUMPAD_4 */
+    SDL_SCANCODE_KP_5, /* AKEYCODE_NUMPAD_5 */
+    SDL_SCANCODE_KP_6, /* AKEYCODE_NUMPAD_6 */
+    SDL_SCANCODE_KP_7, /* AKEYCODE_NUMPAD_7 */
+    SDL_SCANCODE_KP_8, /* AKEYCODE_NUMPAD_8 */
+    SDL_SCANCODE_KP_9, /* AKEYCODE_NUMPAD_9 */
+    SDL_SCANCODE_KP_DIVIDE, /* AKEYCODE_NUMPAD_DIVIDE */
+    SDL_SCANCODE_KP_MULTIPLY, /* AKEYCODE_NUMPAD_MULTIPLY */
+    SDL_SCANCODE_KP_MINUS, /* AKEYCODE_NUMPAD_SUBTRACT */
+    SDL_SCANCODE_KP_PLUS, /* AKEYCODE_NUMPAD_ADD */
+    SDL_SCANCODE_KP_PERIOD, /* AKEYCODE_NUMPAD_DOT */
+    SDL_SCANCODE_KP_COMMA, /* AKEYCODE_NUMPAD_COMMA */
+    SDL_SCANCODE_KP_ENTER, /* AKEYCODE_NUMPAD_ENTER */
+    SDL_SCANCODE_KP_EQUALS, /* AKEYCODE_NUMPAD_EQUALS */
+    SDL_SCANCODE_KP_LEFTPAREN, /* AKEYCODE_NUMPAD_LEFT_PAREN */
+    SDL_SCANCODE_KP_RIGHTPAREN, /* AKEYCODE_NUMPAD_RIGHT_PAREN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_VOLUME_MUTE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_INFO */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CHANNEL_UP */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CHANNEL_DOWN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_ZOOM_IN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_ZOOM_OUT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_WINDOW */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_GUIDE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_DVR */
+    SDL_SCANCODE_AC_BOOKMARKS, /* AKEYCODE_BOOKMARK */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CAPTIONS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_SETTINGS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_POWER */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_TV_INPUT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STB_POWER */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_STB_INPUT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_AVR_POWER */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_AVR_INPUT */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PROG_RED */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PROG_GREEN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PROG_YELLOW */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_PROG_BLUE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_APP_SWITCH */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_1 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_2 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_3 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_4 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_5 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_6 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_7 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_8 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_9 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_10 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_11 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_12 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_13 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_14 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_15 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_BUTTON_16 */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_LANGUAGE_SWITCH */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MANNER_MODE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_3D_MODE */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CONTACTS */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_CALENDAR */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MUSIC */
+    SDL_SCANCODE_CALCULATOR, /* AKEYCODE_CALCULATOR */
+    SDL_SCANCODE_LANG5, /* AKEYCODE_ZENKAKU_HANKAKU */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_EISU */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MUHENKAN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_HENKAN */
+    SDL_SCANCODE_LANG3, /* AKEYCODE_KATAKANA_HIRAGANA */
+    SDL_SCANCODE_INTERNATIONAL3, /* AKEYCODE_YEN */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_RO */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_KANA */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_ASSIST */
+    SDL_SCANCODE_BRIGHTNESSDOWN, /* AKEYCODE_BRIGHTNESS_DOWN */
+    SDL_SCANCODE_BRIGHTNESSUP, /* AKEYCODE_BRIGHTNESS_UP */
+    SDL_SCANCODE_UNKNOWN, /* AKEYCODE_MEDIA_AUDIO_TRACK */
+};
+
+static SDL_Scancode
+TranslateKeycode(int keycode)
+{
+    SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;
+
+    if (keycode < SDL_arraysize(Android_Keycodes)) {
+        scancode = Android_Keycodes[keycode];
+    }
+    if (scancode == SDL_SCANCODE_UNKNOWN) {
+        __android_log_print(ANDROID_LOG_INFO, "SDL", "Unknown keycode %d", keycode);
+    }
+    return scancode;
+}
+
+int
+Android_OnKeyDown(int keycode)
+{
+    return SDL_SendKeyboardKey(SDL_PRESSED, TranslateKeycode(keycode));
+}
+
+int
+Android_OnKeyUp(int keycode)
+{
+    return SDL_SendKeyboardKey(SDL_RELEASED, TranslateKeycode(keycode));
+}
+
+SDL_bool
+Android_HasScreenKeyboardSupport(_THIS)
+{
+    return SDL_TRUE;
+}
+
+SDL_bool
+Android_IsScreenKeyboardShown(_THIS, SDL_Window * window)
+{
+    return SDL_IsTextInputActive();
+}
+
+void
+Android_StartTextInput(_THIS)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
+    Android_JNI_ShowTextInput(&videodata->textRect);
+}
+
+void
+Android_StopTextInput(_THIS)
+{
+    Android_JNI_HideTextInput();
+}
+
+void
+Android_SetTextInputRect(_THIS, SDL_Rect *rect)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
+
+    if (!rect) {
+        SDL_InvalidParamError("rect");
+        return;
+    }
+
+    videodata->textRect = *rect;
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidkeyboard.h b/Source/3rd Party/sdl/src/video/android/SDL_androidkeyboard.h
new file mode 100644
index 000000000..041987aca
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidkeyboard.h	
@@ -0,0 +1,36 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "SDL_androidvideo.h"
+
+extern void Android_InitKeyboard(void);
+extern int Android_OnKeyDown(int keycode);
+extern int Android_OnKeyUp(int keycode);
+
+extern SDL_bool Android_HasScreenKeyboardSupport(_THIS);
+extern SDL_bool Android_IsScreenKeyboardShown(_THIS, SDL_Window * window);
+
+extern void Android_StartTextInput(_THIS);
+extern void Android_StopTextInput(_THIS);
+extern void Android_SetTextInputRect(_THIS, SDL_Rect *rect);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidtouch.c b/Source/3rd Party/sdl/src/video/android/SDL_androidtouch.c
new file mode 100644
index 000000000..7f11f437d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidtouch.c	
@@ -0,0 +1,125 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include <android/log.h>
+
+#include "SDL_events.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_touch_c.h"
+#include "SDL_log.h"
+
+#include "SDL_androidtouch.h"
+
+#include "../../core/android/SDL_android.h"
+
+#define ACTION_DOWN 0
+#define ACTION_UP 1
+#define ACTION_MOVE 2
+#define ACTION_CANCEL 3
+#define ACTION_OUTSIDE 4
+#define ACTION_POINTER_DOWN 5
+#define ACTION_POINTER_UP 6
+
+static void Android_GetWindowCoordinates(float x, float y,
+                                         int *window_x, int *window_y)
+{
+    int window_w, window_h;
+
+    SDL_GetWindowSize(Android_Window, &window_w, &window_h);
+    *window_x = (int)(x * window_w);
+    *window_y = (int)(y * window_h);
+}
+
+void Android_InitTouch(void)
+{
+    int i;
+    int* ids;
+    int number = Android_JNI_GetTouchDeviceIds(&ids);
+    if (0 < number) {
+        for (i = 0; i < number; ++i) {
+            SDL_AddTouch((SDL_TouchID) ids[i], ""); /* no error handling */
+        }
+        SDL_free(ids);
+    }
+}
+
+void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p)
+{
+    SDL_TouchID touchDeviceId = 0;
+    SDL_FingerID fingerId = 0;
+    int window_x, window_y;
+    static SDL_FingerID pointerFingerID = 0;
+
+    if (!Android_Window) {
+        return;
+    }
+
+    touchDeviceId = (SDL_TouchID)touch_device_id_in;
+    if (SDL_AddTouch(touchDeviceId, "") < 0) {
+        SDL_Log("error: can't add touch %s, %d", __FILE__, __LINE__);
+    }
+
+    fingerId = (SDL_FingerID)pointer_finger_id_in;
+    switch (action) {
+        case ACTION_DOWN:
+            /* Primary pointer down */
+            Android_GetWindowCoordinates(x, y, &window_x, &window_y);
+            /* send moved event */
+            SDL_SendMouseMotion(NULL, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
+            /* send mouse down event */
+            SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
+            pointerFingerID = fingerId;
+        case ACTION_POINTER_DOWN:
+            /* Non primary pointer down */
+            SDL_SendTouch(touchDeviceId, fingerId, SDL_TRUE, x, y, p);
+            break;
+            
+        case ACTION_MOVE:
+            if (!pointerFingerID) {
+                Android_GetWindowCoordinates(x, y, &window_x, &window_y);
+
+                /* send moved event */
+                SDL_SendMouseMotion(NULL, SDL_TOUCH_MOUSEID, 0, window_x, window_y);
+            }
+            SDL_SendTouchMotion(touchDeviceId, fingerId, x, y, p);
+            break;
+            
+        case ACTION_UP:
+            /* Primary pointer up */
+            /* send mouse up */
+            pointerFingerID = (SDL_FingerID) 0;
+            SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
+        case ACTION_POINTER_UP:
+            /* Non primary pointer up */
+            SDL_SendTouch(touchDeviceId, fingerId, SDL_FALSE, x, y, p);
+            break;
+            
+        default:
+            break;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidtouch.h b/Source/3rd Party/sdl/src/video/android/SDL_androidtouch.h
new file mode 100644
index 000000000..81a0cb50e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidtouch.h	
@@ -0,0 +1,28 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "SDL_androidvideo.h"
+
+extern void Android_InitTouch(void);
+extern void Android_OnTouch( int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidvideo.c b/Source/3rd Party/sdl/src/video/android/SDL_androidvideo.c
new file mode 100644
index 000000000..f1cf18552
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidvideo.c	
@@ -0,0 +1,195 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+/* Android SDL video driver implementation
+*/
+
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_windowevents_c.h"
+
+#include "SDL_androidvideo.h"
+#include "SDL_androidclipboard.h"
+#include "SDL_androidevents.h"
+#include "SDL_androidkeyboard.h"
+#include "SDL_androidtouch.h"
+#include "SDL_androidwindow.h"
+
+#define ANDROID_VID_DRIVER_NAME "Android"
+
+/* Initialization/Query functions */
+static int Android_VideoInit(_THIS);
+static void Android_VideoQuit(_THIS);
+
+#include "../SDL_egl_c.h"
+/* GL functions (SDL_androidgl.c) */
+extern SDL_GLContext Android_GLES_CreateContext(_THIS, SDL_Window * window);
+extern int Android_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+extern void Android_GLES_SwapWindow(_THIS, SDL_Window * window);
+extern int Android_GLES_LoadLibrary(_THIS, const char *path);
+#define Android_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define Android_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define Android_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define Android_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+#define Android_GLES_DeleteContext SDL_EGL_DeleteContext
+
+/* Android driver bootstrap functions */
+
+
+/* These are filled in with real values in Android_SetScreenResolution on init (before SDL_main()) */
+int Android_ScreenWidth = 0;
+int Android_ScreenHeight = 0;
+Uint32 Android_ScreenFormat = SDL_PIXELFORMAT_UNKNOWN;
+SDL_sem *Android_PauseSem = NULL, *Android_ResumeSem = NULL;
+
+/* Currently only one window */
+SDL_Window *Android_Window = NULL;
+
+static int
+Android_Available(void)
+{
+    return 1;
+}
+
+static void
+Android_DeleteDevice(SDL_VideoDevice * device)
+{
+    SDL_free(device);
+}
+
+static SDL_VideoDevice *
+Android_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+    SDL_VideoData *data;
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (!device) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    data = (SDL_VideoData*) SDL_calloc(1, sizeof(SDL_VideoData));
+    if (!data) {
+        SDL_OutOfMemory();
+        SDL_free(device);
+        return NULL;
+    }
+
+    device->driverdata = data;
+
+    /* Set the function pointers */
+    device->VideoInit = Android_VideoInit;
+    device->VideoQuit = Android_VideoQuit;
+    device->PumpEvents = Android_PumpEvents;
+
+    device->CreateWindow = Android_CreateWindow;
+    device->SetWindowTitle = Android_SetWindowTitle;
+    device->DestroyWindow = Android_DestroyWindow;
+
+    device->free = Android_DeleteDevice;
+
+    /* GL pointers */
+    device->GL_LoadLibrary = Android_GLES_LoadLibrary;
+    device->GL_GetProcAddress = Android_GLES_GetProcAddress;
+    device->GL_UnloadLibrary = Android_GLES_UnloadLibrary;
+    device->GL_CreateContext = Android_GLES_CreateContext;
+    device->GL_MakeCurrent = Android_GLES_MakeCurrent;
+    device->GL_SetSwapInterval = Android_GLES_SetSwapInterval;
+    device->GL_GetSwapInterval = Android_GLES_GetSwapInterval;
+    device->GL_SwapWindow = Android_GLES_SwapWindow;
+    device->GL_DeleteContext = Android_GLES_DeleteContext;
+
+    /* Text input */
+    device->StartTextInput = Android_StartTextInput;
+    device->StopTextInput = Android_StopTextInput;
+    device->SetTextInputRect = Android_SetTextInputRect;
+
+    /* Screen keyboard */
+    device->HasScreenKeyboardSupport = Android_HasScreenKeyboardSupport;
+    device->IsScreenKeyboardShown = Android_IsScreenKeyboardShown;
+
+    /* Clipboard */
+    device->SetClipboardText = Android_SetClipboardText;
+    device->GetClipboardText = Android_GetClipboardText;
+    device->HasClipboardText = Android_HasClipboardText;
+
+    return device;
+}
+
+VideoBootStrap Android_bootstrap = {
+    ANDROID_VID_DRIVER_NAME, "SDL Android video driver",
+    Android_Available, Android_CreateDevice
+};
+
+
+int
+Android_VideoInit(_THIS)
+{
+    SDL_DisplayMode mode;
+
+    mode.format = Android_ScreenFormat;
+    mode.w = Android_ScreenWidth;
+    mode.h = Android_ScreenHeight;
+    mode.refresh_rate = 0;
+    mode.driverdata = NULL;
+    if (SDL_AddBasicVideoDisplay(&mode) < 0) {
+        return -1;
+    }
+
+    SDL_AddDisplayMode(&_this->displays[0], &mode);
+
+    Android_InitKeyboard();
+
+    Android_InitTouch();
+
+    /* We're done! */
+    return 0;
+}
+
+void
+Android_VideoQuit(_THIS)
+{
+}
+
+/* This function gets called before VideoInit() */
+void
+Android_SetScreenResolution(int width, int height, Uint32 format)
+{
+    Android_ScreenWidth = width;
+    Android_ScreenHeight = height;
+    Android_ScreenFormat = format;
+
+    if (Android_Window) {
+        SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_RESIZED, width, height);
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidvideo.h b/Source/3rd Party/sdl/src/video/android/SDL_androidvideo.h
new file mode 100644
index 000000000..ccd5d7a16
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidvideo.h	
@@ -0,0 +1,49 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_androidvideo_h
+#define _SDL_androidvideo_h
+
+#include "SDL_mutex.h"
+#include "SDL_rect.h"
+#include "../SDL_sysvideo.h"
+
+/* Called by the JNI layer when the screen changes size or format */
+extern void Android_SetScreenResolution(int width, int height, Uint32 format);
+
+/* Private display data */
+
+typedef struct SDL_VideoData
+{
+    SDL_Rect        textRect;
+} SDL_VideoData;
+
+extern int Android_ScreenWidth;
+extern int Android_ScreenHeight;
+extern Uint32 Android_ScreenFormat;
+extern SDL_sem *Android_PauseSem, *Android_ResumeSem;
+extern SDL_Window *Android_Window;
+
+
+#endif /* _SDL_androidvideo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidwindow.c b/Source/3rd Party/sdl/src/video/android/SDL_androidwindow.c
new file mode 100644
index 000000000..acbb58206
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidwindow.c	
@@ -0,0 +1,120 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_ANDROID
+
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_mouse_c.h"
+
+#include "SDL_androidvideo.h"
+#include "SDL_androidwindow.h"
+
+int
+Android_CreateWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data;
+    
+    if (Android_Window) {
+        return SDL_SetError("Android only supports one window");
+    }
+    
+    Android_PauseSem = SDL_CreateSemaphore(0);
+    Android_ResumeSem = SDL_CreateSemaphore(0);
+
+    /* Adjust the window data to match the screen */
+    window->x = 0;
+    window->y = 0;
+    window->w = Android_ScreenWidth;
+    window->h = Android_ScreenHeight;
+
+    window->flags &= ~SDL_WINDOW_RESIZABLE;     /* window is NEVER resizeable */
+    window->flags |= SDL_WINDOW_FULLSCREEN;     /* window is always fullscreen */
+    window->flags &= ~SDL_WINDOW_HIDDEN;
+    window->flags |= SDL_WINDOW_SHOWN;          /* only one window on Android */
+    window->flags |= SDL_WINDOW_INPUT_FOCUS;    /* always has input focus */
+
+    /* One window, it always has focus */
+    SDL_SetMouseFocus(window);
+    SDL_SetKeyboardFocus(window);
+    
+    data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+    
+    data->native_window = Android_JNI_GetNativeWindow();
+    
+    if (!data->native_window) {
+        SDL_free(data);
+        return SDL_SetError("Could not fetch native window");
+    }
+    
+    data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) data->native_window);
+
+    if (data->egl_surface == EGL_NO_SURFACE) {
+        ANativeWindow_release(data->native_window);
+        SDL_free(data);
+        return SDL_SetError("Could not create GLES window surface");
+    }
+
+    window->driverdata = data;
+    Android_Window = window;
+    
+    return 0;
+}
+
+void
+Android_SetWindowTitle(_THIS, SDL_Window * window)
+{
+    Android_JNI_SetActivityTitle(window->title);
+}
+
+void
+Android_DestroyWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data;
+    
+    if (window == Android_Window) {
+        Android_Window = NULL;
+        if (Android_PauseSem) SDL_DestroySemaphore(Android_PauseSem);
+        if (Android_ResumeSem) SDL_DestroySemaphore(Android_ResumeSem);
+        Android_PauseSem = NULL;
+        Android_ResumeSem = NULL;
+        
+        if(window->driverdata) {
+            data = (SDL_WindowData *) window->driverdata;
+            if (data->egl_surface != EGL_NO_SURFACE) {
+                SDL_EGL_DestroySurface(_this, data->egl_surface);
+            }
+            if(data->native_window) {
+                ANativeWindow_release(data->native_window);
+            }
+            SDL_free(window->driverdata);
+            window->driverdata = NULL;
+        }
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/android/SDL_androidwindow.h b/Source/3rd Party/sdl/src/video/android/SDL_androidwindow.h
new file mode 100644
index 000000000..8de223aa0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/android/SDL_androidwindow.h	
@@ -0,0 +1,43 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_androidwindow_h
+#define _SDL_androidwindow_h
+
+#include "../../core/android/SDL_android.h"
+#include "../SDL_egl_c.h"
+
+extern int Android_CreateWindow(_THIS, SDL_Window * window);
+extern void Android_SetWindowTitle(_THIS, SDL_Window * window);
+extern void Android_DestroyWindow(_THIS, SDL_Window * window);
+
+typedef struct
+{
+    EGLSurface egl_surface;
+    EGLContext egl_context; /* We use this to preserve the context when losing focus */
+    ANativeWindow* native_window;
+    
+} SDL_WindowData;
+
+#endif /* _SDL_androidwindow_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaclipboard.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaclipboard.h
new file mode 100644
index 000000000..0a5e0dc0d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaclipboard.h	
@@ -0,0 +1,36 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoaclipboard_h
+#define _SDL_cocoaclipboard_h
+
+/* Forward declaration */
+struct SDL_VideoData;
+
+extern int Cocoa_SetClipboardText(_THIS, const char *text);
+extern char *Cocoa_GetClipboardText(_THIS);
+extern SDL_bool Cocoa_HasClipboardText(_THIS);
+extern void Cocoa_CheckClipboardUpdate(struct SDL_VideoData * data);
+
+#endif /* _SDL_cocoaclipboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaclipboard.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaclipboard.m
new file mode 100644
index 000000000..495c934c0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaclipboard.m	
@@ -0,0 +1,127 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+#include "SDL_cocoavideo.h"
+#include "../../events/SDL_clipboardevents_c.h"
+
+static NSString *
+GetTextFormat(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    if (data->osversion >= 0x1060) {
+        return NSPasteboardTypeString;
+    } else {
+        return NSStringPboardType;
+    }
+}
+
+int
+Cocoa_SetClipboardText(_THIS, const char *text)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    NSAutoreleasePool *pool;
+    NSPasteboard *pasteboard;
+    NSString *format = GetTextFormat(_this);
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    pasteboard = [NSPasteboard generalPasteboard];
+    data->clipboard_count = [pasteboard declareTypes:[NSArray arrayWithObject:format] owner:nil];
+    [pasteboard setString:[NSString stringWithUTF8String:text] forType:format];
+
+    [pool release];
+
+    return 0;
+}
+
+char *
+Cocoa_GetClipboardText(_THIS)
+{
+    NSAutoreleasePool *pool;
+    NSPasteboard *pasteboard;
+    NSString *format = GetTextFormat(_this);
+    NSString *available;
+    char *text;
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    pasteboard = [NSPasteboard generalPasteboard];
+    available = [pasteboard availableTypeFromArray: [NSArray arrayWithObject:format]];
+    if ([available isEqualToString:format]) {
+        NSString* string;
+        const char *utf8;
+
+        string = [pasteboard stringForType:format];
+        if (string == nil) {
+            utf8 = "";
+        } else {
+            utf8 = [string UTF8String];
+        }
+        text = SDL_strdup(utf8);
+    } else {
+        text = SDL_strdup("");
+    }
+
+    [pool release];
+
+    return text;
+}
+
+SDL_bool
+Cocoa_HasClipboardText(_THIS)
+{
+    SDL_bool result = SDL_FALSE;
+    char *text = Cocoa_GetClipboardText(_this);
+    if (text) {
+        result = text[0] != '\0' ? SDL_TRUE : SDL_FALSE;
+    SDL_free(text);
+    }
+    return result;
+}
+
+void
+Cocoa_CheckClipboardUpdate(struct SDL_VideoData * data)
+{
+    NSAutoreleasePool *pool;
+    NSPasteboard *pasteboard;
+    NSInteger count;
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    pasteboard = [NSPasteboard generalPasteboard];
+    count = [pasteboard changeCount];
+    if (count != data->clipboard_count) {
+        if (data->clipboard_count) {
+            SDL_SendClipboardUpdate();
+        }
+        data->clipboard_count = count;
+    }
+
+    [pool release];
+}
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaevents.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaevents.h
new file mode 100644
index 000000000..687cf647e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaevents.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoaevents_h
+#define _SDL_cocoaevents_h
+
+extern void Cocoa_RegisterApp(void);
+extern void Cocoa_PumpEvents(_THIS);
+
+#endif /* _SDL_cocoaevents_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaevents.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaevents.m
new file mode 100644
index 000000000..438385c37
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaevents.m	
@@ -0,0 +1,349 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+#include "SDL_timer.h"
+
+#include "SDL_cocoavideo.h"
+#include "../../events/SDL_events_c.h"
+
+#if !defined(UsrActivity) && defined(__LP64__) && !defined(__POWER__)
+/*
+ * Workaround for a bug in the 10.5 SDK: By accident, OSService.h does
+ * not include Power.h at all when compiling in 64bit mode. This has
+ * been fixed in 10.6, but for 10.5, we manually define UsrActivity
+ * to ensure compilation works.
+ */
+#define UsrActivity 1
+#endif
+
+@interface SDLApplication : NSApplication
+
+- (void)terminate:(id)sender;
+
+@end
+
+@implementation SDLApplication
+
+// Override terminate to handle Quit and System Shutdown smoothly.
+- (void)terminate:(id)sender
+{
+    SDL_SendQuit();
+}
+
+@end // SDLApplication
+
+/* setAppleMenu disappeared from the headers in 10.4 */
+@interface NSApplication(NSAppleMenu)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
+
+@interface SDLAppDelegate : NSObject {
+@public
+    BOOL seenFirstActivate;
+}
+
+- (id)init;
+@end
+
+@implementation SDLAppDelegate : NSObject
+- (id)init
+{
+    self = [super init];
+
+    if (self) {
+        seenFirstActivate = NO;
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(focusSomeWindow:)
+                                                     name:NSApplicationDidBecomeActiveNotification
+                                                   object:nil];
+    }
+
+    return self;
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [super dealloc];
+}
+
+- (void)focusSomeWindow:(NSNotification *)aNotification
+{
+    /* HACK: Ignore the first call. The application gets a
+     * applicationDidBecomeActive: a little bit after the first window is
+     * created, and if we don't ignore it, a window that has been created with
+     * SDL_WINDOW_MINIZED will ~immediately be restored.
+     */
+    if (!seenFirstActivate) {
+        seenFirstActivate = YES;
+        return;
+    }
+
+    SDL_VideoDevice *device = SDL_GetVideoDevice();
+    if (device && device->windows)
+    {
+        SDL_Window *window = device->windows;
+        int i;
+        for (i = 0; i < device->num_displays; ++i)
+        {
+            SDL_Window *fullscreen_window = device->displays[i].fullscreen_window;
+            if (fullscreen_window)
+            {
+                if (fullscreen_window->flags & SDL_WINDOW_MINIMIZED) {
+                    SDL_RestoreWindow(fullscreen_window);
+                }
+                return;
+            }
+        }
+
+        if (window->flags & SDL_WINDOW_MINIMIZED) {
+            SDL_RestoreWindow(window);
+        } else {
+            SDL_RaiseWindow(window);
+        }
+    }
+}
+
+- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
+{
+    return (BOOL)SDL_SendDropFile([filename UTF8String]);
+}
+@end
+
+static SDLAppDelegate *appDelegate = nil;
+
+static NSString *
+GetApplicationName(void)
+{
+    NSString *appName;
+
+    /* Determine the application name */
+    appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"];
+    if (!appName)
+        appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
+
+    if (![appName length])
+        appName = [[NSProcessInfo processInfo] processName];
+
+    return appName;
+}
+
+static void
+CreateApplicationMenus(void)
+{
+    NSString *appName;
+    NSString *title;
+    NSMenu *appleMenu;
+    NSMenu *serviceMenu;
+    NSMenu *windowMenu;
+    NSMenu *viewMenu;
+    NSMenuItem *menuItem;
+
+    if (NSApp == nil) {
+        return;
+    }
+    
+    /* Create the main menu bar */
+    [NSApp setMainMenu:[[NSMenu alloc] init]];
+
+    /* Create the application menu */
+    appName = GetApplicationName();
+    appleMenu = [[NSMenu alloc] initWithTitle:@""];
+
+    /* Add menu items */
+    title = [@"About " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
+
+    [appleMenu addItem:[NSMenuItem separatorItem]];
+
+    [appleMenu addItemWithTitle:@"Preferences…" action:nil keyEquivalent:@","];
+
+    [appleMenu addItem:[NSMenuItem separatorItem]];
+
+    serviceMenu = [[NSMenu alloc] initWithTitle:@""];
+    menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Services" action:nil keyEquivalent:@""];
+    [menuItem setSubmenu:serviceMenu];
+
+    [NSApp setServicesMenu:serviceMenu];
+    [serviceMenu release];
+
+    [appleMenu addItem:[NSMenuItem separatorItem]];
+
+    title = [@"Hide " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
+
+    menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
+    [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
+
+    [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
+
+    [appleMenu addItem:[NSMenuItem separatorItem]];
+
+    title = [@"Quit " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
+
+    /* Put menu into the menubar */
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
+    [menuItem setSubmenu:appleMenu];
+    [[NSApp mainMenu] addItem:menuItem];
+    [menuItem release];
+
+    /* Tell the application object that this is now the application menu */
+    [NSApp setAppleMenu:appleMenu];
+    [appleMenu release];
+
+
+    /* Create the window menu */
+    windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
+
+    /* Add menu items */
+    [windowMenu addItemWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+
+    [windowMenu addItemWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""];
+
+    /* Put menu into the menubar */
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
+    [menuItem setSubmenu:windowMenu];
+    [[NSApp mainMenu] addItem:menuItem];
+    [menuItem release];
+
+    /* Tell the application object that this is now the window menu */
+    [NSApp setWindowsMenu:windowMenu];
+    [windowMenu release];
+
+
+    /* Add the fullscreen view toggle menu option, if supported */
+    if ([NSApp respondsToSelector:@selector(setPresentationOptions:)]) {
+        /* Create the view menu */
+        viewMenu = [[NSMenu alloc] initWithTitle:@"View"];
+
+        /* Add menu items */
+        menuItem = [viewMenu addItemWithTitle:@"Toggle Full Screen" action:@selector(toggleFullScreen:) keyEquivalent:@"f"];
+        [menuItem setKeyEquivalentModifierMask:NSControlKeyMask | NSCommandKeyMask];
+
+        /* Put menu into the menubar */
+        menuItem = [[NSMenuItem alloc] initWithTitle:@"View" action:nil keyEquivalent:@""];
+        [menuItem setSubmenu:viewMenu];
+        [[NSApp mainMenu] addItem:menuItem];
+        [menuItem release];
+
+        [viewMenu release];
+    }
+}
+
+void
+Cocoa_RegisterApp(void)
+{
+    /* This can get called more than once! Be careful what you initialize! */
+    ProcessSerialNumber psn;
+    NSAutoreleasePool *pool;
+
+    if (!GetCurrentProcess(&psn)) {
+        TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+        SetFrontProcess(&psn);
+    }
+
+    pool = [[NSAutoreleasePool alloc] init];
+    if (NSApp == nil) {
+        [SDLApplication sharedApplication];
+
+        if ([NSApp mainMenu] == nil) {
+            CreateApplicationMenus();
+        }
+        [NSApp finishLaunching];
+        NSDictionary *appDefaults = [[NSDictionary alloc] initWithObjectsAndKeys:
+            [NSNumber numberWithBool:NO], @"AppleMomentumScrollSupported",
+            [NSNumber numberWithBool:NO], @"ApplePressAndHoldEnabled",
+            nil];
+        [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults];
+
+    }
+    if (NSApp && !appDelegate) {
+        appDelegate = [[SDLAppDelegate alloc] init];
+
+        /* If someone else has an app delegate, it means we can't turn a
+         * termination into SDL_Quit, and we can't handle application:openFile:
+         */
+        if (![NSApp delegate]) {
+            [NSApp setDelegate:appDelegate];
+        } else {
+            appDelegate->seenFirstActivate = YES;
+        }
+    }
+    [pool release];
+}
+
+void
+Cocoa_PumpEvents(_THIS)
+{
+    NSAutoreleasePool *pool;
+
+    /* Update activity every 30 seconds to prevent screensaver */
+    if (_this->suspend_screensaver) {
+        SDL_VideoData *data = (SDL_VideoData *)_this->driverdata;
+        Uint32 now = SDL_GetTicks();
+        if (!data->screensaver_activity ||
+            SDL_TICKS_PASSED(now, data->screensaver_activity + 30000)) {
+            UpdateSystemActivity(UsrActivity);
+            data->screensaver_activity = now;
+        }
+    }
+
+    pool = [[NSAutoreleasePool alloc] init];
+    for ( ; ; ) {
+        NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES ];
+        if ( event == nil ) {
+            break;
+        }
+
+        switch ([event type]) {
+        case NSLeftMouseDown:
+        case NSOtherMouseDown:
+        case NSRightMouseDown:
+        case NSLeftMouseUp:
+        case NSOtherMouseUp:
+        case NSRightMouseUp:
+        case NSLeftMouseDragged:
+        case NSRightMouseDragged:
+        case NSOtherMouseDragged: /* usually middle mouse dragged */
+        case NSMouseMoved:
+        case NSScrollWheel:
+            Cocoa_HandleMouseEvent(_this, event);
+            break;
+        case NSKeyDown:
+        case NSKeyUp:
+        case NSFlagsChanged:
+            Cocoa_HandleKeyEvent(_this, event);
+            break;
+        default:
+            break;
+        }
+        /* Pass through to NSApp to make sure everything stays in sync */
+        [NSApp sendEvent:event];
+    }
+    [pool release];
+}
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoakeyboard.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoakeyboard.h
new file mode 100644
index 000000000..a85f9b7b0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoakeyboard.h	
@@ -0,0 +1,36 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoakeyboard_h
+#define _SDL_cocoakeyboard_h
+
+extern void Cocoa_InitKeyboard(_THIS);
+extern void Cocoa_HandleKeyEvent(_THIS, NSEvent * event);
+extern void Cocoa_QuitKeyboard(_THIS);
+
+extern void Cocoa_StartTextInput(_THIS);
+extern void Cocoa_StopTextInput(_THIS);
+extern void Cocoa_SetTextInputRect(_THIS, SDL_Rect *rect);
+
+#endif /* _SDL_cocoakeyboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoakeyboard.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoakeyboard.m
new file mode 100644
index 000000000..85bf9a067
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoakeyboard.m	
@@ -0,0 +1,630 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+#include "SDL_cocoavideo.h"
+
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/scancodes_darwin.h"
+
+#include <Carbon/Carbon.h>
+
+/*#define DEBUG_IME NSLog */
+#define DEBUG_IME(...)
+
+#ifndef NX_DEVICERCTLKEYMASK
+    #define NX_DEVICELCTLKEYMASK    0x00000001
+#endif
+#ifndef NX_DEVICELSHIFTKEYMASK
+    #define NX_DEVICELSHIFTKEYMASK  0x00000002
+#endif
+#ifndef NX_DEVICERSHIFTKEYMASK
+    #define NX_DEVICERSHIFTKEYMASK  0x00000004
+#endif
+#ifndef NX_DEVICELCMDKEYMASK
+    #define NX_DEVICELCMDKEYMASK    0x00000008
+#endif
+#ifndef NX_DEVICERCMDKEYMASK
+    #define NX_DEVICERCMDKEYMASK    0x00000010
+#endif
+#ifndef NX_DEVICELALTKEYMASK
+    #define NX_DEVICELALTKEYMASK    0x00000020
+#endif
+#ifndef NX_DEVICERALTKEYMASK
+    #define NX_DEVICERALTKEYMASK    0x00000040
+#endif
+#ifndef NX_DEVICERCTLKEYMASK
+    #define NX_DEVICERCTLKEYMASK    0x00002000
+#endif
+
+@interface SDLTranslatorResponder : NSView <NSTextInput>
+{
+    NSString *_markedText;
+    NSRange   _markedRange;
+    NSRange   _selectedRange;
+    SDL_Rect  _inputRect;
+}
+- (void) doCommandBySelector:(SEL)myselector;
+- (void) setInputRect:(SDL_Rect *) rect;
+@end
+
+@implementation SDLTranslatorResponder
+
+- (void) setInputRect:(SDL_Rect *) rect
+{
+    _inputRect = *rect;
+}
+
+- (void) insertText:(id) aString
+{
+    const char *str;
+
+    DEBUG_IME(@"insertText: %@", aString);
+
+    /* Could be NSString or NSAttributedString, so we have
+     * to test and convert it before return as SDL event */
+    if ([aString isKindOfClass: [NSAttributedString class]])
+        str = [[aString string] UTF8String];
+    else
+        str = [aString UTF8String];
+
+    SDL_SendKeyboardText(str);
+}
+
+- (void) doCommandBySelector:(SEL) myselector
+{
+    /* No need to do anything since we are not using Cocoa
+       selectors to handle special keys, instead we use SDL
+       key events to do the same job.
+    */
+}
+
+- (BOOL) hasMarkedText
+{
+    return _markedText != nil;
+}
+
+- (NSRange) markedRange
+{
+    return _markedRange;
+}
+
+- (NSRange) selectedRange
+{
+    return _selectedRange;
+}
+
+- (void) setMarkedText:(id) aString
+         selectedRange:(NSRange) selRange
+{
+    if ([aString isKindOfClass: [NSAttributedString class]])
+        aString = [aString string];
+
+    if ([aString length] == 0)
+    {
+        [self unmarkText];
+        return;
+    }
+
+    if (_markedText != aString)
+    {
+        [_markedText release];
+        _markedText = [aString retain];
+    }
+
+    _selectedRange = selRange;
+    _markedRange = NSMakeRange(0, [aString length]);
+
+    SDL_SendEditingText([aString UTF8String],
+                        selRange.location, selRange.length);
+
+    DEBUG_IME(@"setMarkedText: %@, (%d, %d)", _markedText,
+          selRange.location, selRange.length);
+}
+
+- (void) unmarkText
+{
+    [_markedText release];
+    _markedText = nil;
+
+    SDL_SendEditingText("", 0, 0);
+}
+
+- (NSRect) firstRectForCharacterRange: (NSRange) theRange
+{
+    NSWindow *window = [self window];
+    NSRect contentRect = [window contentRectForFrameRect: [window frame]];
+    float windowHeight = contentRect.size.height;
+    NSRect rect = NSMakeRect(_inputRect.x, windowHeight - _inputRect.y - _inputRect.h,
+                             _inputRect.w, _inputRect.h);
+
+    DEBUG_IME(@"firstRectForCharacterRange: (%d, %d): windowHeight = %g, rect = %@",
+            theRange.location, theRange.length, windowHeight,
+            NSStringFromRect(rect));
+    rect.origin = [[self window] convertBaseToScreen: rect.origin];
+
+    return rect;
+}
+
+- (NSAttributedString *) attributedSubstringFromRange: (NSRange) theRange
+{
+    DEBUG_IME(@"attributedSubstringFromRange: (%d, %d)", theRange.location, theRange.length);
+    return nil;
+}
+
+- (NSInteger) conversationIdentifier
+{
+    return (NSInteger) self;
+}
+
+/* This method returns the index for character that is
+ * nearest to thePoint.  thPoint is in screen coordinate system.
+ */
+- (NSUInteger) characterIndexForPoint:(NSPoint) thePoint
+{
+    DEBUG_IME(@"characterIndexForPoint: (%g, %g)", thePoint.x, thePoint.y);
+    return 0;
+}
+
+/* This method is the key to attribute extension.
+ * We could add new attributes through this method.
+ * NSInputServer examines the return value of this
+ * method & constructs appropriate attributed string.
+ */
+- (NSArray *) validAttributesForMarkedText
+{
+    return [NSArray array];
+}
+
+@end
+
+/* This is a helper function for HandleModifierSide. This
+ * function reverts back to behavior before the distinction between
+ * sides was made.
+ */
+static void
+HandleNonDeviceModifier(unsigned int device_independent_mask,
+                        unsigned int oldMods,
+                        unsigned int newMods,
+                        SDL_Scancode scancode)
+{
+    unsigned int oldMask, newMask;
+
+    /* Isolate just the bits we care about in the depedent bits so we can
+     * figure out what changed
+     */
+    oldMask = oldMods & device_independent_mask;
+    newMask = newMods & device_independent_mask;
+
+    if (oldMask && oldMask != newMask) {
+        SDL_SendKeyboardKey(SDL_RELEASED, scancode);
+    } else if (newMask && oldMask != newMask) {
+        SDL_SendKeyboardKey(SDL_PRESSED, scancode);
+    }
+}
+
+/* This is a helper function for HandleModifierSide.
+ * This function sets the actual SDL_PrivateKeyboard event.
+ */
+static void
+HandleModifierOneSide(unsigned int oldMods, unsigned int newMods,
+                      SDL_Scancode scancode,
+                      unsigned int sided_device_dependent_mask)
+{
+    unsigned int old_dep_mask, new_dep_mask;
+
+    /* Isolate just the bits we care about in the depedent bits so we can
+     * figure out what changed
+     */
+    old_dep_mask = oldMods & sided_device_dependent_mask;
+    new_dep_mask = newMods & sided_device_dependent_mask;
+
+    /* We now know that this side bit flipped. But we don't know if
+     * it went pressed to released or released to pressed, so we must
+     * find out which it is.
+     */
+    if (new_dep_mask && old_dep_mask != new_dep_mask) {
+        SDL_SendKeyboardKey(SDL_PRESSED, scancode);
+    } else {
+        SDL_SendKeyboardKey(SDL_RELEASED, scancode);
+    }
+}
+
+/* This is a helper function for DoSidedModifiers.
+ * This function will figure out if the modifier key is the left or right side,
+ * e.g. left-shift vs right-shift.
+ */
+static void
+HandleModifierSide(int device_independent_mask,
+                   unsigned int oldMods, unsigned int newMods,
+                   SDL_Scancode left_scancode,
+                   SDL_Scancode right_scancode,
+                   unsigned int left_device_dependent_mask,
+                   unsigned int right_device_dependent_mask)
+{
+    unsigned int device_dependent_mask = (left_device_dependent_mask |
+                                         right_device_dependent_mask);
+    unsigned int diff_mod;
+
+    /* On the basis that the device independent mask is set, but there are
+     * no device dependent flags set, we'll assume that we can't detect this
+     * keyboard and revert to the unsided behavior.
+     */
+    if ((device_dependent_mask & newMods) == 0) {
+        /* Revert to the old behavior */
+        HandleNonDeviceModifier(device_independent_mask, oldMods, newMods, left_scancode);
+        return;
+    }
+
+    /* XOR the previous state against the new state to see if there's a change */
+    diff_mod = (device_dependent_mask & oldMods) ^
+               (device_dependent_mask & newMods);
+    if (diff_mod) {
+        /* A change in state was found. Isolate the left and right bits
+         * to handle them separately just in case the values can simulataneously
+         * change or if the bits don't both exist.
+         */
+        if (left_device_dependent_mask & diff_mod) {
+            HandleModifierOneSide(oldMods, newMods, left_scancode, left_device_dependent_mask);
+        }
+        if (right_device_dependent_mask & diff_mod) {
+            HandleModifierOneSide(oldMods, newMods, right_scancode, right_device_dependent_mask);
+        }
+    }
+}
+
+/* This is a helper function for DoSidedModifiers.
+ * This function will release a key press in the case that
+ * it is clear that the modifier has been released (i.e. one side
+ * can't still be down).
+ */
+static void
+ReleaseModifierSide(unsigned int device_independent_mask,
+                    unsigned int oldMods, unsigned int newMods,
+                    SDL_Scancode left_scancode,
+                    SDL_Scancode right_scancode,
+                    unsigned int left_device_dependent_mask,
+                    unsigned int right_device_dependent_mask)
+{
+    unsigned int device_dependent_mask = (left_device_dependent_mask |
+                                          right_device_dependent_mask);
+
+    /* On the basis that the device independent mask is set, but there are
+     * no device dependent flags set, we'll assume that we can't detect this
+     * keyboard and revert to the unsided behavior.
+     */
+    if ((device_dependent_mask & oldMods) == 0) {
+        /* In this case, we can't detect the keyboard, so use the left side
+         * to represent both, and release it.
+         */
+        SDL_SendKeyboardKey(SDL_RELEASED, left_scancode);
+        return;
+    }
+
+    /*
+     * This could have been done in an if-else case because at this point,
+     * we know that all keys have been released when calling this function.
+     * But I'm being paranoid so I want to handle each separately,
+     * so I hope this doesn't cause other problems.
+     */
+    if ( left_device_dependent_mask & oldMods ) {
+        SDL_SendKeyboardKey(SDL_RELEASED, left_scancode);
+    }
+    if ( right_device_dependent_mask & oldMods ) {
+        SDL_SendKeyboardKey(SDL_RELEASED, right_scancode);
+    }
+}
+
+/* This is a helper function for DoSidedModifiers.
+ * This function handles the CapsLock case.
+ */
+static void
+HandleCapsLock(unsigned short scancode,
+               unsigned int oldMods, unsigned int newMods)
+{
+    unsigned int oldMask, newMask;
+
+    oldMask = oldMods & NSAlphaShiftKeyMask;
+    newMask = newMods & NSAlphaShiftKeyMask;
+
+    if (oldMask != newMask) {
+        SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_CAPSLOCK);
+        SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_CAPSLOCK);
+    }
+}
+
+/* This function will handle the modifier keys and also determine the
+ * correct side of the key.
+ */
+static void
+DoSidedModifiers(unsigned short scancode,
+                 unsigned int oldMods, unsigned int newMods)
+{
+    /* Set up arrays for the key syms for the left and right side. */
+    const SDL_Scancode left_mapping[]  = {
+        SDL_SCANCODE_LSHIFT,
+        SDL_SCANCODE_LCTRL,
+        SDL_SCANCODE_LALT,
+        SDL_SCANCODE_LGUI
+    };
+    const SDL_Scancode right_mapping[] = {
+        SDL_SCANCODE_RSHIFT,
+        SDL_SCANCODE_RCTRL,
+        SDL_SCANCODE_RALT,
+        SDL_SCANCODE_RGUI
+    };
+    /* Set up arrays for the device dependent masks with indices that
+     * correspond to the _mapping arrays
+     */
+    const unsigned int left_device_mapping[]  = { NX_DEVICELSHIFTKEYMASK, NX_DEVICELCTLKEYMASK, NX_DEVICELALTKEYMASK, NX_DEVICELCMDKEYMASK };
+    const unsigned int right_device_mapping[] = { NX_DEVICERSHIFTKEYMASK, NX_DEVICERCTLKEYMASK, NX_DEVICERALTKEYMASK, NX_DEVICERCMDKEYMASK };
+
+    unsigned int i, bit;
+
+    /* Handle CAPSLOCK separately because it doesn't have a left/right side */
+    HandleCapsLock(scancode, oldMods, newMods);
+
+    /* Iterate through the bits, testing each against the old modifiers */
+    for (i = 0, bit = NSShiftKeyMask; bit <= NSCommandKeyMask; bit <<= 1, ++i) {
+        unsigned int oldMask, newMask;
+
+        oldMask = oldMods & bit;
+        newMask = newMods & bit;
+
+        /* If the bit is set, we must always examine it because the left
+         * and right side keys may alternate or both may be pressed.
+         */
+        if (newMask) {
+            HandleModifierSide(bit, oldMods, newMods,
+                               left_mapping[i], right_mapping[i],
+                               left_device_mapping[i], right_device_mapping[i]);
+        }
+        /* If the state changed from pressed to unpressed, we must examine
+            * the device dependent bits to release the correct keys.
+            */
+        else if (oldMask && oldMask != newMask) {
+            ReleaseModifierSide(bit, oldMods, newMods,
+                              left_mapping[i], right_mapping[i],
+                              left_device_mapping[i], right_device_mapping[i]);
+        }
+    }
+}
+
+static void
+HandleModifiers(_THIS, unsigned short scancode, unsigned int modifierFlags)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    if (modifierFlags == data->modifierFlags) {
+        return;
+    }
+
+    DoSidedModifiers(scancode, data->modifierFlags, modifierFlags);
+    data->modifierFlags = modifierFlags;
+}
+
+static void
+UpdateKeymap(SDL_VideoData *data)
+{
+    TISInputSourceRef key_layout;
+    const void *chr_data;
+    int i;
+    SDL_Scancode scancode;
+    SDL_Keycode keymap[SDL_NUM_SCANCODES];
+
+    /* See if the keymap needs to be updated */
+    key_layout = TISCopyCurrentKeyboardLayoutInputSource();
+    if (key_layout == data->key_layout) {
+        return;
+    }
+    data->key_layout = key_layout;
+
+    SDL_GetDefaultKeymap(keymap);
+
+    /* Try Unicode data first */
+    CFDataRef uchrDataRef = TISGetInputSourceProperty(key_layout, kTISPropertyUnicodeKeyLayoutData);
+    if (uchrDataRef)
+        chr_data = CFDataGetBytePtr(uchrDataRef);
+    else
+        goto cleanup;
+
+    if (chr_data) {
+        UInt32 keyboard_type = LMGetKbdType();
+        OSStatus err;
+
+        for (i = 0; i < SDL_arraysize(darwin_scancode_table); i++) {
+            UniChar s[8];
+            UniCharCount len;
+            UInt32 dead_key_state;
+
+            /* Make sure this scancode is a valid character scancode */
+            scancode = darwin_scancode_table[i];
+            if (scancode == SDL_SCANCODE_UNKNOWN ||
+                (keymap[scancode] & SDLK_SCANCODE_MASK)) {
+                continue;
+            }
+
+            dead_key_state = 0;
+            err = UCKeyTranslate ((UCKeyboardLayout *) chr_data,
+                                  i, kUCKeyActionDown,
+                                  0, keyboard_type,
+                                  kUCKeyTranslateNoDeadKeysMask,
+                                  &dead_key_state, 8, &len, s);
+            if (err != noErr)
+                continue;
+
+            if (len > 0 && s[0] != 0x10) {
+                keymap[scancode] = s[0];
+            }
+        }
+        SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES);
+        return;
+    }
+
+cleanup:
+    CFRelease(key_layout);
+}
+
+void
+Cocoa_InitKeyboard(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    UpdateKeymap(data);
+
+    /* Set our own names for the platform-dependent but layout-independent keys */
+    /* This key is NumLock on the MacBook keyboard. :) */
+    /*SDL_SetScancodeName(SDL_SCANCODE_NUMLOCKCLEAR, "Clear");*/
+    SDL_SetScancodeName(SDL_SCANCODE_LALT, "Left Option");
+    SDL_SetScancodeName(SDL_SCANCODE_LGUI, "Left Command");
+    SDL_SetScancodeName(SDL_SCANCODE_RALT, "Right Option");
+    SDL_SetScancodeName(SDL_SCANCODE_RGUI, "Right Command");
+}
+
+void
+Cocoa_StartTextInput(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_Window *window = SDL_GetKeyboardFocus();
+    NSWindow *nswindow = nil;
+    if (window)
+        nswindow = ((SDL_WindowData*)window->driverdata)->nswindow;
+
+    NSView *parentView = [nswindow contentView];
+
+    /* We only keep one field editor per process, since only the front most
+     * window can receive text input events, so it make no sense to keep more
+     * than one copy. When we switched to another window and requesting for
+     * text input, simply remove the field editor from its superview then add
+     * it to the front most window's content view */
+    if (!data->fieldEdit) {
+        data->fieldEdit =
+            [[SDLTranslatorResponder alloc] initWithFrame: NSMakeRect(0.0, 0.0, 0.0, 0.0)];
+    }
+
+    if (![[data->fieldEdit superview] isEqual: parentView])
+    {
+        /* DEBUG_IME(@"add fieldEdit to window contentView"); */
+        [data->fieldEdit removeFromSuperview];
+        [parentView addSubview: data->fieldEdit];
+        [nswindow makeFirstResponder: data->fieldEdit];
+    }
+
+    [pool release];
+}
+
+void
+Cocoa_StopTextInput(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    if (data && data->fieldEdit) {
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        [data->fieldEdit removeFromSuperview];
+        [data->fieldEdit release];
+        data->fieldEdit = nil;
+        [pool release];
+    }
+}
+
+void
+Cocoa_SetTextInputRect(_THIS, SDL_Rect *rect)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    if (!rect) {
+    SDL_InvalidParamError("rect");
+    return;
+    }
+
+    [data->fieldEdit setInputRect: rect];
+}
+
+void
+Cocoa_HandleKeyEvent(_THIS, NSEvent *event)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    unsigned short scancode = [event keyCode];
+    SDL_Scancode code;
+#if 0
+    const char *text;
+#endif
+
+    if ((scancode == 10 || scancode == 50) && KBGetLayoutType(LMGetKbdType()) == kKeyboardISO) {
+        /* see comments in SDL_cocoakeys.h */
+        scancode = 60 - scancode;
+    }
+    if (scancode < SDL_arraysize(darwin_scancode_table)) {
+        code = darwin_scancode_table[scancode];
+    }
+    else {
+        /* Hmm, does this ever happen?  If so, need to extend the keymap... */
+        code = SDL_SCANCODE_UNKNOWN;
+    }
+
+    switch ([event type]) {
+    case NSKeyDown:
+        if (![event isARepeat]) {
+            /* See if we need to rebuild the keyboard layout */
+            UpdateKeymap(data);
+        }
+
+        SDL_SendKeyboardKey(SDL_PRESSED, code);
+#if 1
+        if (code == SDL_SCANCODE_UNKNOWN) {
+            fprintf(stderr, "The key you just pressed is not recognized by SDL. To help get this fixed, report this to the SDL mailing list <sdl@libsdl.org> or to Christian Walther <cwalther@gmx.ch>. Mac virtual key code is %d.\n", scancode);
+        }
+#endif
+        if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
+            /* FIXME CW 2007-08-16: only send those events to the field editor for which we actually want text events, not e.g. esc or function keys. Arrow keys in particular seem to produce crashes sometimes. */
+            [data->fieldEdit interpretKeyEvents:[NSArray arrayWithObject:event]];
+#if 0
+            text = [[event characters] UTF8String];
+            if(text && *text) {
+                SDL_SendKeyboardText(text);
+                [data->fieldEdit setString:@""];
+            }
+#endif
+        }
+        break;
+    case NSKeyUp:
+        SDL_SendKeyboardKey(SDL_RELEASED, code);
+        break;
+    case NSFlagsChanged:
+        /* FIXME CW 2007-08-14: check if this whole mess that takes up half of this file is really necessary */
+        HandleModifiers(_this, scancode, [event modifierFlags]);
+        break;
+    default: /* just to avoid compiler warnings */
+        break;
+    }
+}
+
+void
+Cocoa_QuitKeyboard(_THIS)
+{
+}
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamessagebox.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamessagebox.h
new file mode 100644
index 000000000..ff468a881
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamessagebox.h	
@@ -0,0 +1,29 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+extern int Cocoa_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamessagebox.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamessagebox.m
new file mode 100644
index 000000000..730d952ee
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamessagebox.m	
@@ -0,0 +1,145 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+#if defined(__APPLE__) && defined(__POWERPC__) && !defined(__APPLE_ALTIVEC__)
+#include <altivec.h>
+#undef bool
+#undef vector
+#undef pixel
+#endif
+
+#include "SDL_events.h"
+#include "SDL_timer.h"
+#include "SDL_messagebox.h"
+#include "SDL_cocoavideo.h"
+
+@interface SDLMessageBoxPresenter : NSObject {
+@public
+    NSInteger clicked;
+    NSWindow *nswindow;
+}
+- (id) initWithParentWindow:(SDL_Window *)window;
+- (void) alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
+@end
+
+@implementation SDLMessageBoxPresenter
+- (id) initWithParentWindow:(SDL_Window *)window
+{
+    self = [super init];
+    if (self) {
+        clicked = -1;
+
+        /* Retain the NSWindow because we'll show the alert later on the main thread */
+        if (window) {
+            nswindow = [((SDL_WindowData *) window->driverdata)->nswindow retain];
+        } else {
+            nswindow = NULL;
+        }
+    }
+
+    return self;
+}
+
+- (void)showAlert:(NSAlert*)alert
+{
+    if (nswindow) {
+        [alert beginSheetModalForWindow:nswindow modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:nil];
+        while (clicked < 0) {
+            SDL_PumpEvents();
+            SDL_Delay(100);
+        }
+        [nswindow release];
+    } else {
+        clicked = [alert runModal];
+    }
+}
+
+- (void) alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
+{
+    clicked = returnCode;
+}
+
+@end
+
+
+/* Display a Cocoa message box */
+int
+Cocoa_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
+{
+    Cocoa_RegisterApp();
+
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    NSAlert* alert = [[[NSAlert alloc] init] autorelease];
+
+    if (messageboxdata->flags & SDL_MESSAGEBOX_ERROR) {
+        [alert setAlertStyle:NSCriticalAlertStyle];
+    } else if (messageboxdata->flags & SDL_MESSAGEBOX_WARNING) {
+        [alert setAlertStyle:NSWarningAlertStyle];
+    } else {
+        [alert setAlertStyle:NSInformationalAlertStyle];
+    }
+
+    [alert setMessageText:[NSString stringWithUTF8String:messageboxdata->title]];
+    [alert setInformativeText:[NSString stringWithUTF8String:messageboxdata->message]];
+
+    const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
+    int i;
+    for (i = 0; i < messageboxdata->numbuttons; ++i) {
+        NSButton *button = [alert addButtonWithTitle:[NSString stringWithUTF8String:buttons[i].text]];
+        if (buttons[i].flags & SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT) {
+            [button setKeyEquivalent:@"\r"];
+        } else if (buttons[i].flags & SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT) {
+            [button setKeyEquivalent:@"\033"];
+        } else {
+            [button setKeyEquivalent:@""];
+        }
+    }
+
+    SDLMessageBoxPresenter* presenter = [[[SDLMessageBoxPresenter alloc] initWithParentWindow:messageboxdata->window] autorelease];
+
+    [presenter performSelectorOnMainThread:@selector(showAlert:)
+                                withObject:alert
+                             waitUntilDone:YES];
+
+    int returnValue = 0;
+    NSInteger clicked = presenter->clicked;
+    if (clicked >= NSAlertFirstButtonReturn)
+    {
+        clicked -= NSAlertFirstButtonReturn;
+        *buttonid = buttons[clicked].buttonid;
+    }
+    else
+    {
+        returnValue = SDL_SetError("Did not get a valid `clicked button' id: %d", clicked);
+    }
+
+    [pool release];
+
+    return returnValue;
+}
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamodes.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamodes.h
new file mode 100644
index 000000000..4f8e86324
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamodes.h	
@@ -0,0 +1,44 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoamodes_h
+#define _SDL_cocoamodes_h
+
+typedef struct
+{
+    CGDirectDisplayID display;
+} SDL_DisplayData;
+
+typedef struct
+{
+    const void *moderef;
+} SDL_DisplayModeData;
+
+extern void Cocoa_InitModes(_THIS);
+extern int Cocoa_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect);
+extern void Cocoa_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
+extern int Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+extern void Cocoa_QuitModes(_THIS);
+
+#endif /* _SDL_cocoamodes_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamodes.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamodes.m
new file mode 100644
index 000000000..f41c34937
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamodes.m	
@@ -0,0 +1,465 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+#include "SDL_cocoavideo.h"
+
+/* We need this for IODisplayCreateInfoDictionary and kIODisplayOnlyPreferredName */
+#include <IOKit/graphics/IOGraphicsLib.h>
+
+/* we need this for ShowMenuBar() and HideMenuBar(). */
+#include <Carbon/Carbon.h>
+
+/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
+#include <AvailabilityMacros.h>
+
+
+static void
+Cocoa_ToggleMenuBar(const BOOL show)
+{
+    /* !!! FIXME: keep an eye on this.
+     * ShowMenuBar/HideMenuBar is officially unavailable for 64-bit binaries.
+     *  It happens to work, as of 10.7, but we're going to see if
+     *  we can just simply do without it on newer OSes...
+     */
+#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070) && !defined(__LP64__)
+    if (show)
+        ShowMenuBar();
+    else
+        HideMenuBar();
+#endif
+}
+
+
+/* !!! FIXME: clean out the pre-10.6 code when it makes sense to do so. */
+#define FORCE_OLD_API 0
+
+#if FORCE_OLD_API
+#undef MAC_OS_X_VERSION_MIN_REQUIRED
+#define MAC_OS_X_VERSION_MIN_REQUIRED 1050
+#endif
+
+static BOOL
+IS_SNOW_LEOPARD_OR_LATER(_THIS)
+{
+#if FORCE_OLD_API
+    return NO;
+#else
+    return ((((SDL_VideoData *) _this->driverdata))->osversion >= 0x1060);
+#endif
+}
+
+static int
+CG_SetError(const char *prefix, CGDisplayErr result)
+{
+    const char *error;
+
+    switch (result) {
+    case kCGErrorFailure:
+        error = "kCGErrorFailure";
+        break;
+    case kCGErrorIllegalArgument:
+        error = "kCGErrorIllegalArgument";
+        break;
+    case kCGErrorInvalidConnection:
+        error = "kCGErrorInvalidConnection";
+        break;
+    case kCGErrorInvalidContext:
+        error = "kCGErrorInvalidContext";
+        break;
+    case kCGErrorCannotComplete:
+        error = "kCGErrorCannotComplete";
+        break;
+    case kCGErrorNotImplemented:
+        error = "kCGErrorNotImplemented";
+        break;
+    case kCGErrorRangeCheck:
+        error = "kCGErrorRangeCheck";
+        break;
+    case kCGErrorTypeCheck:
+        error = "kCGErrorTypeCheck";
+        break;
+    case kCGErrorInvalidOperation:
+        error = "kCGErrorInvalidOperation";
+        break;
+    case kCGErrorNoneAvailable:
+        error = "kCGErrorNoneAvailable";
+        break;
+    default:
+        error = "Unknown Error";
+        break;
+    }
+    return SDL_SetError("%s: %s", prefix, error);
+}
+
+static SDL_bool
+GetDisplayMode(_THIS, const void *moderef, SDL_DisplayMode *mode)
+{
+    SDL_DisplayModeData *data;
+    long width = 0;
+    long height = 0;
+    long bpp = 0;
+    long refreshRate = 0;
+
+    data = (SDL_DisplayModeData *) SDL_malloc(sizeof(*data));
+    if (!data) {
+        return SDL_FALSE;
+    }
+    data->moderef = moderef;
+
+    if (IS_SNOW_LEOPARD_OR_LATER(_this)) {
+        CGDisplayModeRef vidmode = (CGDisplayModeRef) moderef;
+        CFStringRef fmt = CGDisplayModeCopyPixelEncoding(vidmode);
+        width = (long) CGDisplayModeGetWidth(vidmode);
+        height = (long) CGDisplayModeGetHeight(vidmode);
+        refreshRate = (long) CGDisplayModeGetRefreshRate(vidmode);
+
+        if (CFStringCompare(fmt, CFSTR(IO32BitDirectPixels),
+                            kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+            bpp = 32;
+        } else if (CFStringCompare(fmt, CFSTR(IO16BitDirectPixels),
+                            kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
+            bpp = 16;
+        } else {
+            bpp = 0;  /* ignore 8-bit and such for now. */
+        }
+
+        CFRelease(fmt);
+    }
+
+    #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+    if (!IS_SNOW_LEOPARD_OR_LATER(_this)) {
+        CFNumberRef number;
+        CFDictionaryRef vidmode = (CFDictionaryRef) moderef;
+        number = CFDictionaryGetValue(vidmode, kCGDisplayWidth);
+        CFNumberGetValue(number, kCFNumberLongType, &width);
+        number = CFDictionaryGetValue(vidmode, kCGDisplayHeight);
+        CFNumberGetValue(number, kCFNumberLongType, &height);
+        number = CFDictionaryGetValue(vidmode, kCGDisplayBitsPerPixel);
+        CFNumberGetValue(number, kCFNumberLongType, &bpp);
+        number = CFDictionaryGetValue(vidmode, kCGDisplayRefreshRate);
+        CFNumberGetValue(number, kCFNumberLongType, &refreshRate);
+    }
+    #endif
+
+    mode->format = SDL_PIXELFORMAT_UNKNOWN;
+    switch (bpp) {
+    case 16:
+        mode->format = SDL_PIXELFORMAT_ARGB1555;
+        break;
+    case 32:
+        mode->format = SDL_PIXELFORMAT_ARGB8888;
+        break;
+    case 8: /* We don't support palettized modes now */
+    default: /* Totally unrecognizable bit depth. */
+        return SDL_FALSE;
+    }
+    mode->w = width;
+    mode->h = height;
+    mode->refresh_rate = refreshRate;
+    mode->driverdata = data;
+    return SDL_TRUE;
+}
+
+static void
+Cocoa_ReleaseDisplayMode(_THIS, const void *moderef)
+{
+    if (IS_SNOW_LEOPARD_OR_LATER(_this)) {
+        CGDisplayModeRelease((CGDisplayModeRef) moderef);  /* NULL is ok */
+    }
+}
+
+static void
+Cocoa_ReleaseDisplayModeList(_THIS, CFArrayRef modelist)
+{
+    if (IS_SNOW_LEOPARD_OR_LATER(_this)) {
+        CFRelease(modelist);  /* NULL is ok */
+    }
+}
+
+static const char *
+Cocoa_GetDisplayName(CGDirectDisplayID displayID)
+{
+    NSDictionary *deviceInfo = (NSDictionary *)IODisplayCreateInfoDictionary(CGDisplayIOServicePort(displayID), kIODisplayOnlyPreferredName);
+    NSDictionary *localizedNames = [deviceInfo objectForKey:[NSString stringWithUTF8String:kDisplayProductName]];
+    const char* displayName = NULL;
+
+    if ([localizedNames count] > 0) {
+        displayName = SDL_strdup([[localizedNames objectForKey:[[localizedNames allKeys] objectAtIndex:0]] UTF8String]);
+    }
+    [deviceInfo release];
+    return displayName;
+}
+
+void
+Cocoa_InitModes(_THIS)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    CGDisplayErr result;
+    CGDirectDisplayID *displays;
+    CGDisplayCount numDisplays;
+    int pass, i;
+
+    result = CGGetOnlineDisplayList(0, NULL, &numDisplays);
+    if (result != kCGErrorSuccess) {
+        CG_SetError("CGGetOnlineDisplayList()", result);
+        [pool release];
+        return;
+    }
+    displays = SDL_stack_alloc(CGDirectDisplayID, numDisplays);
+    result = CGGetOnlineDisplayList(numDisplays, displays, &numDisplays);
+    if (result != kCGErrorSuccess) {
+        CG_SetError("CGGetOnlineDisplayList()", result);
+        SDL_stack_free(displays);
+        [pool release];
+        return;
+    }
+
+    /* Pick up the primary display in the first pass, then get the rest */
+    for (pass = 0; pass < 2; ++pass) {
+        for (i = 0; i < numDisplays; ++i) {
+            SDL_VideoDisplay display;
+            SDL_DisplayData *displaydata;
+            SDL_DisplayMode mode;
+            const void *moderef = NULL;
+
+            if (pass == 0) {
+                if (!CGDisplayIsMain(displays[i])) {
+                    continue;
+                }
+            } else {
+                if (CGDisplayIsMain(displays[i])) {
+                    continue;
+                }
+            }
+
+            if (CGDisplayMirrorsDisplay(displays[i]) != kCGNullDirectDisplay) {
+                continue;
+            }
+
+            if (IS_SNOW_LEOPARD_OR_LATER(_this)) {
+                moderef = CGDisplayCopyDisplayMode(displays[i]);
+            }
+
+            #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+            if (!IS_SNOW_LEOPARD_OR_LATER(_this)) {
+                moderef = CGDisplayCurrentMode(displays[i]);
+            }
+            #endif
+
+            if (!moderef) {
+                continue;
+            }
+
+            displaydata = (SDL_DisplayData *) SDL_malloc(sizeof(*displaydata));
+            if (!displaydata) {
+                Cocoa_ReleaseDisplayMode(_this, moderef);
+                continue;
+            }
+            displaydata->display = displays[i];
+
+            SDL_zero(display);
+            /* this returns a stddup'ed string */
+            display.name = (char *)Cocoa_GetDisplayName(displays[i]);
+            if (!GetDisplayMode (_this, moderef, &mode)) {
+                Cocoa_ReleaseDisplayMode(_this, moderef);
+                SDL_free(display.name);
+                SDL_free(displaydata);
+                continue;
+            }
+
+            display.desktop_mode = mode;
+            display.current_mode = mode;
+            display.driverdata = displaydata;
+            SDL_AddVideoDisplay(&display);
+            SDL_free(display.name);
+        }
+    }
+    SDL_stack_free(displays);
+    [pool release];
+}
+
+int
+Cocoa_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect)
+{
+    SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata;
+    CGRect cgrect;
+
+    cgrect = CGDisplayBounds(displaydata->display);
+    rect->x = (int)cgrect.origin.x;
+    rect->y = (int)cgrect.origin.y;
+    rect->w = (int)cgrect.size.width;
+    rect->h = (int)cgrect.size.height;
+    return 0;
+}
+
+void
+Cocoa_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
+{
+    SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
+    CFArrayRef modes = NULL;
+
+    if (IS_SNOW_LEOPARD_OR_LATER(_this)) {
+        modes = CGDisplayCopyAllDisplayModes(data->display, NULL);
+    }
+
+    #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+    if (!IS_SNOW_LEOPARD_OR_LATER(_this)) {
+        modes = CGDisplayAvailableModes(data->display);
+    }
+    #endif
+
+    if (modes) {
+        const CFIndex count = CFArrayGetCount(modes);
+        CFIndex i;
+
+        for (i = 0; i < count; i++) {
+            const void *moderef = CFArrayGetValueAtIndex(modes, i);
+            SDL_DisplayMode mode;
+            if (GetDisplayMode(_this, moderef, &mode)) {
+                if (IS_SNOW_LEOPARD_OR_LATER(_this)) {
+                    CGDisplayModeRetain((CGDisplayModeRef) moderef);
+                }
+                SDL_AddDisplayMode(display, &mode);
+            }
+        }
+
+        Cocoa_ReleaseDisplayModeList(_this, modes);
+    }
+}
+
+static CGError
+Cocoa_SwitchMode(_THIS, CGDirectDisplayID display, const void *mode)
+{
+    if (IS_SNOW_LEOPARD_OR_LATER(_this)) {
+        return CGDisplaySetDisplayMode(display, (CGDisplayModeRef) mode, NULL);
+    }
+ 
+    #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+    if (!IS_SNOW_LEOPARD_OR_LATER(_this)) {
+        return CGDisplaySwitchToMode(display, (CFDictionaryRef) mode);
+    }
+    #endif
+
+    return kCGErrorFailure;
+}
+
+int
+Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+    SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata;
+    SDL_DisplayModeData *data = (SDL_DisplayModeData *) mode->driverdata;
+    CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
+    CGError result;
+
+    /* Fade to black to hide resolution-switching flicker */
+    if (CGAcquireDisplayFadeReservation(5, &fade_token) == kCGErrorSuccess) {
+        CGDisplayFade(fade_token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, TRUE);
+    }
+
+    if (data == display->desktop_mode.driverdata) {
+        /* Restoring desktop mode */
+        Cocoa_SwitchMode(_this, displaydata->display, data->moderef);
+
+        if (CGDisplayIsMain(displaydata->display)) {
+            CGReleaseAllDisplays();
+        } else {
+            CGDisplayRelease(displaydata->display);
+        }
+
+        if (CGDisplayIsMain(displaydata->display)) {
+            Cocoa_ToggleMenuBar(YES);
+        }
+    } else {
+        /* Put up the blanking window (a window above all other windows) */
+        if (CGDisplayIsMain(displaydata->display)) {
+            /* If we don't capture all displays, Cocoa tries to rearrange windows... *sigh* */
+            result = CGCaptureAllDisplays();
+        } else {
+            result = CGDisplayCapture(displaydata->display);
+        }
+        if (result != kCGErrorSuccess) {
+            CG_SetError("CGDisplayCapture()", result);
+            goto ERR_NO_CAPTURE;
+        }
+
+        /* Do the physical switch */
+        result = Cocoa_SwitchMode(_this, displaydata->display, data->moderef);
+        if (result != kCGErrorSuccess) {
+            CG_SetError("CGDisplaySwitchToMode()", result);
+            goto ERR_NO_SWITCH;
+        }
+
+        /* Hide the menu bar so it doesn't intercept events */
+        if (CGDisplayIsMain(displaydata->display)) {
+            Cocoa_ToggleMenuBar(NO);
+        }
+    }
+
+    /* Fade in again (asynchronously) */
+    if (fade_token != kCGDisplayFadeReservationInvalidToken) {
+        CGDisplayFade(fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
+        CGReleaseDisplayFadeReservation(fade_token);
+    }
+
+    return 0;
+
+    /* Since the blanking window covers *all* windows (even force quit) correct recovery is crucial */
+ERR_NO_SWITCH:
+    CGDisplayRelease(displaydata->display);
+ERR_NO_CAPTURE:
+    if (fade_token != kCGDisplayFadeReservationInvalidToken) {
+        CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
+        CGReleaseDisplayFadeReservation(fade_token);
+    }
+    return -1;
+}
+
+void
+Cocoa_QuitModes(_THIS)
+{
+    int i, j;
+
+    for (i = 0; i < _this->num_displays; ++i) {
+        SDL_VideoDisplay *display = &_this->displays[i];
+        SDL_DisplayModeData *mode;
+
+        if (display->current_mode.driverdata != display->desktop_mode.driverdata) {
+            Cocoa_SetDisplayMode(_this, display, &display->desktop_mode);
+        }
+
+        mode = (SDL_DisplayModeData *) display->desktop_mode.driverdata;
+        Cocoa_ReleaseDisplayMode(_this, mode->moderef);
+
+        for (j = 0; j < display->num_display_modes; j++) {
+            mode = (SDL_DisplayModeData*) display->display_modes[j].driverdata;
+            Cocoa_ReleaseDisplayMode(_this, mode->moderef);
+        }
+
+    }
+    Cocoa_ToggleMenuBar(YES);
+}
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamouse.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamouse.h
new file mode 100644
index 000000000..336b84044
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamouse.h	
@@ -0,0 +1,52 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoamouse_h
+#define _SDL_cocoamouse_h
+
+#include "SDL_cocoavideo.h"
+
+extern void Cocoa_InitMouse(_THIS);
+extern void Cocoa_HandleMouseEvent(_THIS, NSEvent * event);
+extern void Cocoa_HandleMouseWheel(SDL_Window *window, NSEvent * event);
+extern void Cocoa_HandleMouseWarp(CGFloat x, CGFloat y);
+extern void Cocoa_QuitMouse(_THIS);
+
+typedef struct {
+    /* Wether we've seen a cursor warp since the last move event. */
+    SDL_bool seenWarp;
+    /* What location our last cursor warp was to. */
+    CGFloat lastWarpX;
+    CGFloat lastWarpY;
+    /* What location we last saw the cursor move to. */
+    CGFloat lastMoveX;
+    CGFloat lastMoveY;
+    void *tapdata;
+} SDL_MouseData;
+
+@interface NSCursor (InvisibleCursor)
++ (NSCursor *)invisibleCursor;
+@end
+
+#endif /* _SDL_cocoamouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamouse.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamouse.m
new file mode 100644
index 000000000..f5b54ed38
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamouse.m	
@@ -0,0 +1,407 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+#include "SDL_assert.h"
+#include "SDL_events.h"
+#include "SDL_cocoamouse.h"
+#include "SDL_cocoamousetap.h"
+
+#include "../../events/SDL_mouse_c.h"
+
+/* #define DEBUG_COCOAMOUSE */
+
+#ifdef DEBUG_COCOAMOUSE
+#define DLog(fmt, ...) printf("%s: " fmt "\n", __func__, ##__VA_ARGS__)
+#else
+#define DLog(...) do { } while (0)
+#endif
+
+@implementation NSCursor (InvisibleCursor)
++ (NSCursor *)invisibleCursor
+{
+    static NSCursor *invisibleCursor = NULL;
+    if (!invisibleCursor) {
+        /* RAW 16x16 transparent GIF */
+        static unsigned char cursorBytes[] = {
+            0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x10, 0x00, 0x10, 0x00, 0x80,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0xF9, 0x04,
+            0x01, 0x00, 0x00, 0x01, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x10,
+            0x00, 0x10, 0x00, 0x00, 0x02, 0x0E, 0x8C, 0x8F, 0xA9, 0xCB, 0xED,
+            0x0F, 0xA3, 0x9C, 0xB4, 0xDA, 0x8B, 0xB3, 0x3E, 0x05, 0x00, 0x3B
+        };
+
+        NSData *cursorData = [NSData dataWithBytesNoCopy:&cursorBytes[0]
+                                                  length:sizeof(cursorBytes)
+                                            freeWhenDone:NO];
+        NSImage *cursorImage = [[[NSImage alloc] initWithData:cursorData] autorelease];
+        invisibleCursor = [[NSCursor alloc] initWithImage:cursorImage
+                                                  hotSpot:NSZeroPoint];
+    }
+
+    return invisibleCursor;
+}
+@end
+
+
+static SDL_Cursor *
+Cocoa_CreateDefaultCursor()
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSCursor *nscursor;
+    SDL_Cursor *cursor = NULL;
+
+    nscursor = [NSCursor arrowCursor];
+
+    if (nscursor) {
+        cursor = SDL_calloc(1, sizeof(*cursor));
+        if (cursor) {
+            cursor->driverdata = nscursor;
+            [nscursor retain];
+        }
+    }
+
+    [pool release];
+
+    return cursor;
+}
+
+static SDL_Cursor *
+Cocoa_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSImage *nsimage;
+    NSCursor *nscursor = NULL;
+    SDL_Cursor *cursor = NULL;
+
+    nsimage = Cocoa_CreateImage(surface);
+    if (nsimage) {
+        nscursor = [[NSCursor alloc] initWithImage: nsimage hotSpot: NSMakePoint(hot_x, hot_y)];
+    }
+
+    if (nscursor) {
+        cursor = SDL_calloc(1, sizeof(*cursor));
+        if (cursor) {
+            cursor->driverdata = nscursor;
+        } else {
+            [nscursor release];
+        }
+    }
+
+    [pool release];
+
+    return cursor;
+}
+
+static SDL_Cursor *
+Cocoa_CreateSystemCursor(SDL_SystemCursor id)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSCursor *nscursor = NULL;
+    SDL_Cursor *cursor = NULL;
+
+    switch(id)
+    {
+    case SDL_SYSTEM_CURSOR_ARROW:
+        nscursor = [NSCursor arrowCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_IBEAM:
+        nscursor = [NSCursor IBeamCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_WAIT:
+        nscursor = [NSCursor arrowCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_CROSSHAIR:
+        nscursor = [NSCursor crosshairCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_WAITARROW:
+        nscursor = [NSCursor arrowCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_SIZENWSE:
+    case SDL_SYSTEM_CURSOR_SIZENESW:
+        nscursor = [NSCursor closedHandCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_SIZEWE:
+        nscursor = [NSCursor resizeLeftRightCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_SIZENS:
+        nscursor = [NSCursor resizeUpDownCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_SIZEALL:
+        nscursor = [NSCursor closedHandCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_NO:
+        nscursor = [NSCursor operationNotAllowedCursor];
+        break;
+    case SDL_SYSTEM_CURSOR_HAND:
+        nscursor = [NSCursor pointingHandCursor];
+        break;
+    default:
+        SDL_assert(!"Unknown system cursor");
+        return NULL;
+    }
+
+    if (nscursor) {
+        cursor = SDL_calloc(1, sizeof(*cursor));
+        if (cursor) {
+            /* We'll free it later, so retain it here */
+            [nscursor retain];
+            cursor->driverdata = nscursor;
+        }
+    }
+
+    [pool release];
+
+    return cursor;
+}
+
+static void
+Cocoa_FreeCursor(SDL_Cursor * cursor)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSCursor *nscursor = (NSCursor *)cursor->driverdata;
+
+    [nscursor release];
+    SDL_free(cursor);
+
+    [pool release];
+}
+
+static int
+Cocoa_ShowCursor(SDL_Cursor * cursor)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    SDL_VideoDevice *device = SDL_GetVideoDevice();
+    SDL_Window *window = (device ? device->windows : NULL);
+    for (; window != NULL; window = window->next) {
+        SDL_WindowData *driverdata = (SDL_WindowData *)window->driverdata;
+        if (driverdata) {
+            [driverdata->nswindow performSelectorOnMainThread:@selector(invalidateCursorRectsForView:)
+                                                   withObject:[driverdata->nswindow contentView]
+                                                waitUntilDone:NO];
+        }
+    }
+
+    [pool release];
+
+    return 0;
+}
+
+static void
+Cocoa_WarpMouse(SDL_Window * window, int x, int y)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    if ([data->listener isMoving])
+    {
+        DLog("Postponing warp, window being moved.");
+        [data->listener setPendingMoveX:x
+                                      Y:y];
+        return;
+    }
+
+    SDL_Mouse *mouse = SDL_GetMouse();
+    CGPoint point = CGPointMake(x + (float)window->x, y + (float)window->y);
+
+    Cocoa_HandleMouseWarp(point.x, point.y);
+
+    /* According to the docs, this was deprecated in 10.6, but it's still
+     * around. The substitute requires a CGEventSource, but I'm not entirely
+     * sure how we'd procure the right one for this event.
+     */
+    CGSetLocalEventsSuppressionInterval(0.0);
+    CGWarpMouseCursorPosition(point);
+    CGSetLocalEventsSuppressionInterval(0.25);
+
+    if (!mouse->relative_mode) {
+        /* CGWarpMouseCursorPosition doesn't generate a window event, unlike our
+         * other implementations' APIs.
+         */
+        SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 0, x, y);
+    }
+}
+
+static int
+Cocoa_SetRelativeMouseMode(SDL_bool enabled)
+{
+    /* We will re-apply the relative mode when the window gets focus, if it
+     * doesn't have focus right now.
+     */
+    SDL_Window *window = SDL_GetMouseFocus();
+    if (!window) {
+      return 0;
+    }
+
+    /* We will re-apply the relative mode when the window finishes being moved,
+     * if it is being moved right now.
+     */
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    if ([data->listener isMoving]) {
+        return 0;
+    }
+
+    CGError result;
+    if (enabled) {
+        DLog("Turning on.");
+        result = CGAssociateMouseAndMouseCursorPosition(NO);
+    } else {
+        DLog("Turning off.");
+        result = CGAssociateMouseAndMouseCursorPosition(YES);
+    }
+    if (result != kCGErrorSuccess) {
+        return SDL_SetError("CGAssociateMouseAndMouseCursorPosition() failed");
+    }
+    return 0;
+}
+
+void
+Cocoa_InitMouse(_THIS)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    mouse->driverdata = SDL_calloc(1, sizeof(SDL_MouseData));
+
+    mouse->CreateCursor = Cocoa_CreateCursor;
+    mouse->CreateSystemCursor = Cocoa_CreateSystemCursor;
+    mouse->ShowCursor = Cocoa_ShowCursor;
+    mouse->FreeCursor = Cocoa_FreeCursor;
+    mouse->WarpMouse = Cocoa_WarpMouse;
+    mouse->SetRelativeMouseMode = Cocoa_SetRelativeMouseMode;
+
+    SDL_SetDefaultCursor(Cocoa_CreateDefaultCursor());
+
+    Cocoa_InitMouseEventTap(mouse->driverdata);
+
+    SDL_MouseData *driverdata = (SDL_MouseData*)mouse->driverdata;
+    const NSPoint location =  [NSEvent mouseLocation];
+    driverdata->lastMoveX = location.x;
+    driverdata->lastMoveY = location.y;
+}
+
+void
+Cocoa_HandleMouseEvent(_THIS, NSEvent *event)
+{
+    switch ([event type])
+    {
+        case NSMouseMoved:
+        case NSLeftMouseDragged:
+        case NSRightMouseDragged:
+        case NSOtherMouseDragged:
+            break;
+
+        default:
+            /* Ignore any other events. */
+            return;
+    }
+
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    SDL_MouseData *driverdata = (SDL_MouseData*)mouse->driverdata;
+    const SDL_bool seenWarp = driverdata->seenWarp;
+    driverdata->seenWarp = NO;
+
+    const NSPoint location =  [NSEvent mouseLocation];
+    const CGFloat lastMoveX = driverdata->lastMoveX;
+    const CGFloat lastMoveY = driverdata->lastMoveY;
+    driverdata->lastMoveX = location.x;
+    driverdata->lastMoveY = location.y;
+    DLog("Last seen mouse: (%g, %g)", location.x, location.y);
+
+    /* Non-relative movement is handled in -[Cocoa_WindowListener mouseMoved:] */
+    if (!mouse->relative_mode) {
+        return;
+    }
+
+    /* Ignore events that aren't inside the client area (i.e. title bar.) */
+    if ([event window]) {
+        NSRect windowRect = [[[event window] contentView] frame];
+        if (!NSPointInRect([event locationInWindow], windowRect)) {
+            return;
+        }
+    }
+
+    float deltaX = [event deltaX];
+    float deltaY = [event deltaY];
+
+    if (seenWarp)
+    {
+        deltaX += (lastMoveX - driverdata->lastWarpX);
+        deltaY += ((CGDisplayPixelsHigh(kCGDirectMainDisplay) - lastMoveY) - driverdata->lastWarpY);
+
+        DLog("Motion was (%g, %g), offset to (%g, %g)", [event deltaX], [event deltaY], deltaX, deltaY);
+    }
+
+    SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 1, (int)deltaX, (int)deltaY);
+}
+
+void
+Cocoa_HandleMouseWheel(SDL_Window *window, NSEvent *event)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    float x = -[event deltaX];
+    float y = [event deltaY];
+
+    if (x > 0) {
+        x += 0.9f;
+    } else if (x < 0) {
+        x -= 0.9f;
+    }
+    if (y > 0) {
+        y += 0.9f;
+    } else if (y < 0) {
+        y -= 0.9f;
+    }
+    SDL_SendMouseWheel(window, mouse->mouseID, (int)x, (int)y);
+}
+
+void
+Cocoa_HandleMouseWarp(CGFloat x, CGFloat y)
+{
+    /* This makes Cocoa_HandleMouseEvent ignore the delta caused by the warp,
+     * since it gets included in the next movement event.
+     */
+    SDL_MouseData *driverdata = (SDL_MouseData*)SDL_GetMouse()->driverdata;
+    driverdata->lastWarpX = x;
+    driverdata->lastWarpY = y;
+    driverdata->seenWarp = SDL_TRUE;
+
+    DLog("(%g, %g)", x, y);
+}
+
+void
+Cocoa_QuitMouse(_THIS)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    if (mouse) {
+        if (mouse->driverdata) {
+            Cocoa_QuitMouseEventTap(((SDL_MouseData*)mouse->driverdata));
+        }
+
+        SDL_free(mouse->driverdata);
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamousetap.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamousetap.h
new file mode 100644
index 000000000..bf3e73838
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamousetap.h	
@@ -0,0 +1,33 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoamousetap_h
+#define _SDL_cocoamousetap_h
+
+#include "SDL_cocoamouse.h"
+
+extern void Cocoa_InitMouseEventTap(SDL_MouseData *driverdata);
+extern void Cocoa_QuitMouseEventTap(SDL_MouseData *driverdata);
+
+#endif /* _SDL_cocoamousetap_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamousetap.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamousetap.m
new file mode 100644
index 000000000..9cf531cb5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoamousetap.m	
@@ -0,0 +1,259 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+#include "SDL_cocoamousetap.h"
+
+/* Event taps are forbidden in the Mac App Store, so we can only enable this
+ * code if your app doesn't need to ship through the app store.
+ * This code makes it so that a grabbed cursor cannot "leak" a mouse click
+ * past the edge of the window if moving the cursor too fast.
+ */
+#if SDL_MAC_NO_SANDBOX
+
+#include "SDL_keyboard.h"
+#include "SDL_thread.h"
+#include "SDL_cocoavideo.h"
+
+#include "../../events/SDL_mouse_c.h"
+
+typedef struct {
+    CFMachPortRef tap;
+    CFRunLoopRef runloop;
+    CFRunLoopSourceRef runloopSource;
+    SDL_Thread *thread;
+    SDL_sem *runloopStartedSemaphore;
+} SDL_MouseEventTapData;
+
+static const CGEventMask movementEventsMask =
+      CGEventMaskBit(kCGEventLeftMouseDragged)
+    | CGEventMaskBit(kCGEventRightMouseDragged)
+    | CGEventMaskBit(kCGEventMouseMoved);
+
+static const CGEventMask allGrabbedEventsMask =
+      CGEventMaskBit(kCGEventLeftMouseDown)    | CGEventMaskBit(kCGEventLeftMouseUp)
+    | CGEventMaskBit(kCGEventRightMouseDown)   | CGEventMaskBit(kCGEventRightMouseUp)
+    | CGEventMaskBit(kCGEventOtherMouseDown)   | CGEventMaskBit(kCGEventOtherMouseUp)
+    | CGEventMaskBit(kCGEventLeftMouseDragged) | CGEventMaskBit(kCGEventRightMouseDragged)
+    | CGEventMaskBit(kCGEventMouseMoved);
+
+static CGEventRef
+Cocoa_MouseTapCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
+{
+    SDL_MouseEventTapData *tapdata = (SDL_MouseEventTapData*)refcon;
+    SDL_Mouse *mouse = SDL_GetMouse();
+    SDL_Window *window = SDL_GetKeyboardFocus();
+    NSWindow *nswindow;
+    NSRect windowRect;
+    CGPoint eventLocation;
+
+    switch (type)
+    {
+        case kCGEventTapDisabledByTimeout:
+        case kCGEventTapDisabledByUserInput:
+            {
+                CGEventTapEnable(tapdata->tap, true);
+                return NULL;
+            }
+        default:
+            break;
+    }
+
+
+    if (!window || !mouse) {
+        return event;
+    }
+
+    if (mouse->relative_mode) {
+        return event;
+    }
+
+    if (!(window->flags & SDL_WINDOW_INPUT_GRABBED)) {
+        return event;
+    }
+
+    /* This is the same coordinate system as Cocoa uses. */
+    nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
+    eventLocation = CGEventGetUnflippedLocation(event);
+    windowRect = [nswindow contentRectForFrameRect:[nswindow frame]];
+
+    if (!NSPointInRect(NSPointFromCGPoint(eventLocation), windowRect)) {
+
+        /* This is in CGs global screenspace coordinate system, which has a
+         * flipped Y.
+         */
+        CGPoint newLocation = CGEventGetLocation(event);
+
+        if (eventLocation.x < NSMinX(windowRect)) {
+            newLocation.x = NSMinX(windowRect);
+        } else if (eventLocation.x >= NSMaxX(windowRect)) {
+            newLocation.x = NSMaxX(windowRect) - 1.0;
+        }
+
+        if (eventLocation.y < NSMinY(windowRect)) {
+            newLocation.y -= (NSMinY(windowRect) - eventLocation.y + 1);
+        } else if (eventLocation.y >= NSMaxY(windowRect)) {
+            newLocation.y += (eventLocation.y - NSMaxY(windowRect) + 1);
+        }
+
+        CGSetLocalEventsSuppressionInterval(0);
+        CGWarpMouseCursorPosition(newLocation);
+        CGSetLocalEventsSuppressionInterval(0.25);
+
+        if ((CGEventMaskBit(type) & movementEventsMask) == 0) {
+            /* For click events, we just constrain the event to the window, so
+             * no other app receives the click event. We can't due the same to
+             * movement events, since they mean that our warp cursor above
+             * behaves strangely.
+             */
+            CGEventSetLocation(event, newLocation);
+        }
+    }
+
+    return event;
+}
+
+static void
+SemaphorePostCallback(CFRunLoopTimerRef timer, void *info)
+{
+    SDL_SemPost((SDL_sem*)info);
+}
+
+static int
+Cocoa_MouseTapThread(void *data)
+{
+    SDL_MouseEventTapData *tapdata = (SDL_MouseEventTapData*)data;
+
+    /* Create a tap. */
+    CFMachPortRef eventTap = CGEventTapCreate(kCGSessionEventTap, kCGHeadInsertEventTap,
+                                              kCGEventTapOptionDefault, allGrabbedEventsMask,
+                                              &Cocoa_MouseTapCallback, tapdata);
+    if (eventTap) {
+        /* Try to create a runloop source we can schedule. */
+        CFRunLoopSourceRef runloopSource = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, eventTap, 0);
+        if  (runloopSource) {
+            tapdata->tap = eventTap;
+            tapdata->runloopSource = runloopSource;
+        } else {
+            CFRelease(eventTap);
+            SDL_SemPost(tapdata->runloopStartedSemaphore);
+            /* TODO: Both here and in the return below, set some state in
+             * tapdata to indicate that initialization failed, which we should
+             * check in InitMouseEventTap, after we move the semaphore check
+             * from Quit to Init.
+             */
+            return 1;
+        }
+    } else {
+        SDL_SemPost(tapdata->runloopStartedSemaphore);
+        return 1;
+    }
+
+    tapdata->runloop = CFRunLoopGetCurrent();
+    CFRunLoopAddSource(tapdata->runloop, tapdata->runloopSource, kCFRunLoopCommonModes);
+    CFRunLoopTimerContext context = {.info = tapdata->runloopStartedSemaphore};
+    /* We signal the runloop started semaphore *after* the run loop has started, indicating it's safe to CFRunLoopStop it. */
+    CFRunLoopTimerRef timer = CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent(), 0, 0, 0, &SemaphorePostCallback, &context);
+    CFRunLoopAddTimer(tapdata->runloop, timer, kCFRunLoopCommonModes);
+    CFRelease(timer);
+
+    /* Run the event loop to handle events in the event tap. */
+    CFRunLoopRun();
+    /* Make sure this is signaled so that SDL_QuitMouseEventTap knows it can safely SDL_WaitThread for us. */
+    if (SDL_SemValue(tapdata->runloopStartedSemaphore) < 1) {
+        SDL_SemPost(tapdata->runloopStartedSemaphore);
+    }
+    CFRunLoopRemoveSource(tapdata->runloop, tapdata->runloopSource, kCFRunLoopCommonModes);
+
+    /* Clean up. */
+    CGEventTapEnable(tapdata->tap, false);
+    CFRelease(tapdata->runloopSource);
+    CFRelease(tapdata->tap);
+    tapdata->runloopSource = NULL;
+    tapdata->tap = NULL;
+
+    return 0;
+}
+
+void
+Cocoa_InitMouseEventTap(SDL_MouseData* driverdata)
+{
+    SDL_MouseEventTapData *tapdata;
+    driverdata->tapdata = SDL_calloc(1, sizeof(SDL_MouseEventTapData));
+    tapdata = (SDL_MouseEventTapData*)driverdata->tapdata;
+
+    tapdata->runloopStartedSemaphore = SDL_CreateSemaphore(0);
+    if (tapdata->runloopStartedSemaphore) {
+        tapdata->thread = SDL_CreateThread(&Cocoa_MouseTapThread, "Event Tap Loop", tapdata);
+        if (!tapdata->thread) {
+            SDL_DestroySemaphore(tapdata->runloopStartedSemaphore);
+        }
+    }
+
+    if (!tapdata->thread) {
+        SDL_free(driverdata->tapdata);
+        driverdata->tapdata = NULL;
+    }
+}
+
+void
+Cocoa_QuitMouseEventTap(SDL_MouseData *driverdata)
+{
+    SDL_MouseEventTapData *tapdata = (SDL_MouseEventTapData*)driverdata->tapdata;
+    int status;
+
+    /* Ensure that the runloop has been started first.
+     * TODO: Move this to InitMouseEventTap, check for error conditions that can
+     * happen in Cocoa_MouseTapThread, and fall back to the non-EventTap way of
+     * grabbing the mouse if it fails to Init.
+     */
+    status = SDL_SemWaitTimeout(tapdata->runloopStartedSemaphore, 5000);
+    if (status > -1) {
+        /* Then stop it, which will cause Cocoa_MouseTapThread to return. */
+        CFRunLoopStop(tapdata->runloop);
+        /* And then wait for Cocoa_MouseTapThread to finish cleaning up. It
+         * releases some of the pointers in tapdata. */
+        SDL_WaitThread(tapdata->thread, &status);
+    }
+
+    SDL_free(driverdata->tapdata);
+    driverdata->tapdata = NULL;
+}
+
+#else /* SDL_MAC_NO_SANDBOX */
+
+void
+Cocoa_InitMouseEventTap(SDL_MouseData *unused)
+{
+}
+
+void
+Cocoa_QuitMouseEventTap(SDL_MouseData *driverdata)
+{
+}
+
+#endif /* !SDL_MAC_NO_SANDBOX */
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaopengl.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaopengl.h
new file mode 100644
index 000000000..14fd3ab4a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaopengl.h	
@@ -0,0 +1,68 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoaopengl_h
+#define _SDL_cocoaopengl_h
+
+#if SDL_VIDEO_OPENGL_CGL
+
+#include "SDL_atomic.h"
+#import <Cocoa/Cocoa.h>
+
+struct SDL_GLDriverData
+{
+    int initialized;
+};
+
+@interface SDLOpenGLContext : NSOpenGLContext {
+    SDL_atomic_t dirty;
+    SDL_Window *window;
+}
+
+- (id)initWithFormat:(NSOpenGLPixelFormat *)format
+        shareContext:(NSOpenGLContext *)share;
+- (void)scheduleUpdate;
+- (void)updateIfNeeded;
+- (void)setWindow:(SDL_Window *)window;
+
+@end
+
+
+/* OpenGL functions */
+extern int Cocoa_GL_LoadLibrary(_THIS, const char *path);
+extern void *Cocoa_GL_GetProcAddress(_THIS, const char *proc);
+extern void Cocoa_GL_UnloadLibrary(_THIS);
+extern SDL_GLContext Cocoa_GL_CreateContext(_THIS, SDL_Window * window);
+extern int Cocoa_GL_MakeCurrent(_THIS, SDL_Window * window,
+                                SDL_GLContext context);
+extern void Cocoa_GL_GetDrawableSize(_THIS, SDL_Window * window,
+                                     int * w, int * h);
+extern int Cocoa_GL_SetSwapInterval(_THIS, int interval);
+extern int Cocoa_GL_GetSwapInterval(_THIS);
+extern void Cocoa_GL_SwapWindow(_THIS, SDL_Window * window);
+extern void Cocoa_GL_DeleteContext(_THIS, SDL_GLContext context);
+
+#endif /* SDL_VIDEO_OPENGL_CGL */
+
+#endif /* _SDL_cocoaopengl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaopengl.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaopengl.m
new file mode 100644
index 000000000..d9fb24409
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoaopengl.m	
@@ -0,0 +1,440 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+/* NSOpenGL implementation of SDL OpenGL support */
+
+#if SDL_VIDEO_OPENGL_CGL
+#include "SDL_cocoavideo.h"
+#include "SDL_cocoaopengl.h"
+
+#include <OpenGL/CGLTypes.h>
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/CGLRenderers.h>
+
+#include "SDL_loadso.h"
+#include "SDL_opengl.h"
+
+#define DEFAULT_OPENGL  "/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib"
+
+#ifndef NSOpenGLPFAOpenGLProfile
+#define NSOpenGLPFAOpenGLProfile 99
+#endif
+#ifndef NSOpenGLProfileVersionLegacy
+#define NSOpenGLProfileVersionLegacy 0x1000
+#endif
+#ifndef NSOpenGLProfileVersion3_2Core
+#define NSOpenGLProfileVersion3_2Core 0x3200
+#endif
+
+@implementation SDLOpenGLContext : NSOpenGLContext
+
+- (id)initWithFormat:(NSOpenGLPixelFormat *)format
+        shareContext:(NSOpenGLContext *)share
+{
+    self = [super initWithFormat:format shareContext:share];
+    if (self) {
+        SDL_AtomicSet(&self->dirty, 0);
+        self->window = NULL;
+    }
+    return self;
+}
+
+- (void)scheduleUpdate
+{
+    SDL_AtomicAdd(&self->dirty, 1);
+}
+
+/* This should only be called on the thread on which a user is using the context. */
+- (void)updateIfNeeded
+{
+    int value = SDL_AtomicSet(&self->dirty, 0);
+    if (value > 0) {
+        /* We call the real underlying update here, since -[SDLOpenGLContext update] just calls us. */
+        [super update];
+    }
+}
+
+/* This should only be called on the thread on which a user is using the context. */
+- (void)update
+{
+    /* This ensures that regular 'update' calls clear the atomic dirty flag. */
+    [self scheduleUpdate];
+    [self updateIfNeeded];
+}
+
+/* Updates the drawable for the contexts and manages related state. */
+- (void)setWindow:(SDL_Window *)newWindow
+{
+    if (self->window) {
+        SDL_WindowData *oldwindowdata = (SDL_WindowData *)self->window->driverdata;
+
+        /* Make sure to remove us from the old window's context list, or we'll get scheduled updates from it too. */
+        NSMutableArray *contexts = oldwindowdata->nscontexts;
+        @synchronized (contexts) {
+            [contexts removeObject:self];
+        }
+    }
+
+    self->window = newWindow;
+
+    if (newWindow) {
+        SDL_WindowData *windowdata = (SDL_WindowData *)newWindow->driverdata;
+
+        /* Now sign up for scheduled updates for the new window. */
+        NSMutableArray *contexts = windowdata->nscontexts;
+        @synchronized (contexts) {
+            [contexts addObject:self];
+        }
+
+        if ([self view] != [windowdata->nswindow contentView]) {
+            [self setView:[windowdata->nswindow contentView]];
+            if (self == [NSOpenGLContext currentContext]) {
+                [self update];
+            } else {
+                [self scheduleUpdate];
+            }
+        }
+    } else {
+        [self clearDrawable];
+        if (self == [NSOpenGLContext currentContext]) {
+            [self update];
+        } else {
+            [self scheduleUpdate];
+        }
+    }
+}
+
+@end
+
+
+int
+Cocoa_GL_LoadLibrary(_THIS, const char *path)
+{
+    /* Load the OpenGL library */
+    if (path == NULL) {
+        path = SDL_getenv("SDL_OPENGL_LIBRARY");
+    }
+    if (path == NULL) {
+        path = DEFAULT_OPENGL;
+    }
+    _this->gl_config.dll_handle = SDL_LoadObject(path);
+    if (!_this->gl_config.dll_handle) {
+        return -1;
+    }
+    SDL_strlcpy(_this->gl_config.driver_path, path,
+                SDL_arraysize(_this->gl_config.driver_path));
+    return 0;
+}
+
+void *
+Cocoa_GL_GetProcAddress(_THIS, const char *proc)
+{
+    return SDL_LoadFunction(_this->gl_config.dll_handle, proc);
+}
+
+void
+Cocoa_GL_UnloadLibrary(_THIS)
+{
+    SDL_UnloadObject(_this->gl_config.dll_handle);
+    _this->gl_config.dll_handle = NULL;
+}
+
+SDL_GLContext
+Cocoa_GL_CreateContext(_THIS, SDL_Window * window)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    NSAutoreleasePool *pool;
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_DisplayData *displaydata = (SDL_DisplayData *)display->driverdata;
+    NSOpenGLPixelFormatAttribute attr[32];
+    NSOpenGLPixelFormat *fmt;
+    SDLOpenGLContext *context;
+    NSOpenGLContext *share_context = nil;
+    int i = 0;
+    const char *glversion;
+    int glversion_major;
+    int glversion_minor;
+
+    if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) {
+        SDL_SetError ("OpenGL ES is not supported on this platform");
+        return NULL;
+    }
+    if ((_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_CORE) && (data->osversion < 0x1070)) {
+        SDL_SetError ("OpenGL Core Profile is not supported on this platform version");
+        return NULL;
+    }
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    /* specify a profile if we're on Lion (10.7) or later. */
+    if (data->osversion >= 0x1070) {
+        NSOpenGLPixelFormatAttribute profile = NSOpenGLProfileVersionLegacy;
+        if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_CORE) {
+            profile = NSOpenGLProfileVersion3_2Core;
+        }
+        attr[i++] = NSOpenGLPFAOpenGLProfile;
+        attr[i++] = profile;
+    }
+
+    attr[i++] = NSOpenGLPFAColorSize;
+    attr[i++] = SDL_BYTESPERPIXEL(display->current_mode.format)*8;
+
+    attr[i++] = NSOpenGLPFADepthSize;
+    attr[i++] = _this->gl_config.depth_size;
+
+    if (_this->gl_config.double_buffer) {
+        attr[i++] = NSOpenGLPFADoubleBuffer;
+    }
+
+    if (_this->gl_config.stereo) {
+        attr[i++] = NSOpenGLPFAStereo;
+    }
+
+    if (_this->gl_config.stencil_size) {
+        attr[i++] = NSOpenGLPFAStencilSize;
+        attr[i++] = _this->gl_config.stencil_size;
+    }
+
+    if ((_this->gl_config.accum_red_size +
+         _this->gl_config.accum_green_size +
+         _this->gl_config.accum_blue_size +
+         _this->gl_config.accum_alpha_size) > 0) {
+        attr[i++] = NSOpenGLPFAAccumSize;
+        attr[i++] = _this->gl_config.accum_red_size + _this->gl_config.accum_green_size + _this->gl_config.accum_blue_size + _this->gl_config.accum_alpha_size;
+    }
+
+    if (_this->gl_config.multisamplebuffers) {
+        attr[i++] = NSOpenGLPFASampleBuffers;
+        attr[i++] = _this->gl_config.multisamplebuffers;
+    }
+
+    if (_this->gl_config.multisamplesamples) {
+        attr[i++] = NSOpenGLPFASamples;
+        attr[i++] = _this->gl_config.multisamplesamples;
+        attr[i++] = NSOpenGLPFANoRecovery;
+    }
+
+    if (_this->gl_config.accelerated >= 0) {
+        if (_this->gl_config.accelerated) {
+            attr[i++] = NSOpenGLPFAAccelerated;
+        } else {
+            attr[i++] = NSOpenGLPFARendererID;
+            attr[i++] = kCGLRendererGenericFloatID;
+        }
+    }
+
+    attr[i++] = NSOpenGLPFAScreenMask;
+    attr[i++] = CGDisplayIDToOpenGLDisplayMask(displaydata->display);
+    attr[i] = 0;
+
+    fmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attr];
+    if (fmt == nil) {
+        SDL_SetError("Failed creating OpenGL pixel format");
+        [pool release];
+        return NULL;
+    }
+
+    if (_this->gl_config.share_with_current_context) {
+        share_context = (NSOpenGLContext*)SDL_GL_GetCurrentContext();
+    }
+
+    context = [[SDLOpenGLContext alloc] initWithFormat:fmt shareContext:share_context];
+
+    [fmt release];
+
+    if (context == nil) {
+        SDL_SetError("Failed creating OpenGL context");
+        [pool release];
+        return NULL;
+    }
+
+    [pool release];
+
+    if ( Cocoa_GL_MakeCurrent(_this, window, context) < 0 ) {
+        Cocoa_GL_DeleteContext(_this, context);
+        SDL_SetError("Failed making OpenGL context current");
+        return NULL;
+    }
+
+    if (_this->gl_config.major_version < 3 &&
+        _this->gl_config.profile_mask == 0 &&
+        _this->gl_config.flags == 0) {
+        /* This is a legacy profile, so to match other backends, we're done. */
+    } else {
+        const GLubyte *(APIENTRY * glGetStringFunc)(GLenum);
+
+        glGetStringFunc = (const GLubyte *(APIENTRY *)(GLenum)) SDL_GL_GetProcAddress("glGetString");
+        if (!glGetStringFunc) {
+            Cocoa_GL_DeleteContext(_this, context);
+            SDL_SetError ("Failed getting OpenGL glGetString entry point");
+            return NULL;
+        }
+
+        glversion = (const char *)glGetStringFunc(GL_VERSION);
+        if (glversion == NULL) {
+            Cocoa_GL_DeleteContext(_this, context);
+            SDL_SetError ("Failed getting OpenGL context version");
+            return NULL;
+        }
+
+        if (SDL_sscanf(glversion, "%d.%d", &glversion_major, &glversion_minor) != 2) {
+            Cocoa_GL_DeleteContext(_this, context);
+            SDL_SetError ("Failed parsing OpenGL context version");
+            return NULL;
+        }
+
+        if ((glversion_major < _this->gl_config.major_version) ||
+           ((glversion_major == _this->gl_config.major_version) && (glversion_minor < _this->gl_config.minor_version))) {
+            Cocoa_GL_DeleteContext(_this, context);
+            SDL_SetError ("Failed creating OpenGL context at version requested");
+            return NULL;
+        }
+
+        /* In the future we'll want to do this, but to match other platforms
+           we'll leave the OpenGL version the way it is for now
+         */
+        /*_this->gl_config.major_version = glversion_major;*/
+        /*_this->gl_config.minor_version = glversion_minor;*/
+    }
+    return context;
+}
+
+int
+Cocoa_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
+{
+    NSAutoreleasePool *pool;
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    if (context) {
+        SDLOpenGLContext *nscontext = (SDLOpenGLContext *)context;
+        [nscontext setWindow:window];
+        [nscontext updateIfNeeded];
+        [nscontext makeCurrentContext];
+    } else {
+        [NSOpenGLContext clearCurrentContext];
+    }
+
+    [pool release];
+    return 0;
+}
+
+void
+Cocoa_GL_GetDrawableSize(_THIS, SDL_Window * window, int * w, int * h)
+{
+    SDL_WindowData *windata = (SDL_WindowData *) window->driverdata;
+    NSView *contentView = [windata->nswindow contentView];
+    NSRect viewport = [contentView bounds];
+
+    /* This gives us the correct viewport for a Retina-enabled view, only
+     * supported on 10.7+. */
+    if ([contentView respondsToSelector:@selector(convertRectToBacking:)]) {
+        viewport = [contentView convertRectToBacking:viewport];
+    }
+
+    if (w) {
+        *w = viewport.size.width;
+    }
+
+    if (h) {
+        *h = viewport.size.height;
+    }
+}
+
+int
+Cocoa_GL_SetSwapInterval(_THIS, int interval)
+{
+    NSAutoreleasePool *pool;
+    NSOpenGLContext *nscontext;
+    GLint value;
+    int status;
+
+    if (interval < 0) {  /* no extension for this on Mac OS X at the moment. */
+        return SDL_SetError("Late swap tearing currently unsupported");
+    }
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    nscontext = (NSOpenGLContext*)SDL_GL_GetCurrentContext();
+    if (nscontext != nil) {
+        value = interval;
+        [nscontext setValues:&value forParameter:NSOpenGLCPSwapInterval];
+        status = 0;
+    } else {
+        status = SDL_SetError("No current OpenGL context");
+    }
+
+    [pool release];
+    return status;
+}
+
+int
+Cocoa_GL_GetSwapInterval(_THIS)
+{
+    NSAutoreleasePool *pool;
+    NSOpenGLContext *nscontext;
+    GLint value;
+    int status = 0;
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    nscontext = (NSOpenGLContext*)SDL_GL_GetCurrentContext();
+    if (nscontext != nil) {
+        [nscontext getValues:&value forParameter:NSOpenGLCPSwapInterval];
+        status = (int)value;
+    }
+
+    [pool release];
+    return status;
+}
+
+void
+Cocoa_GL_SwapWindow(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool;
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    SDLOpenGLContext* nscontext = (SDLOpenGLContext*)SDL_GL_GetCurrentContext();
+    [nscontext flushBuffer];
+    [nscontext updateIfNeeded];
+
+    [pool release];
+}
+
+void
+Cocoa_GL_DeleteContext(_THIS, SDL_GLContext context)
+{
+    NSAutoreleasePool *pool;
+    SDLOpenGLContext *nscontext = (SDLOpenGLContext *)context;
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    [nscontext setWindow:NULL];
+    [nscontext release];
+
+    [pool release];
+}
+
+#endif /* SDL_VIDEO_OPENGL_CGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoashape.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoashape.h
new file mode 100644
index 000000000..0ab9980e3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoashape.h	
@@ -0,0 +1,43 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoashape_h
+#define _SDL_cocoashape_h
+
+#include "SDL_stdinc.h"
+#include "SDL_video.h"
+#include "SDL_shape.h"
+#include "../SDL_shape_internals.h"
+
+typedef struct {
+    NSGraphicsContext* context;
+    SDL_bool saved;
+
+    SDL_ShapeTree* shape;
+} SDL_ShapeData;
+
+extern SDL_WindowShaper* Cocoa_CreateShaper(SDL_Window* window);
+extern int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
+extern int Cocoa_ResizeWindowShape(SDL_Window *window);
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoashape.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoashape.m
new file mode 100644
index 000000000..b3843ccb0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoashape.m	
@@ -0,0 +1,113 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+#include "SDL_cocoavideo.h"
+#include "SDL_shape.h"
+#include "SDL_cocoashape.h"
+#include "../SDL_sysvideo.h"
+#include "SDL_assert.h"
+
+SDL_WindowShaper*
+Cocoa_CreateShaper(SDL_Window* window) {
+    SDL_WindowData* windata = (SDL_WindowData*)window->driverdata;
+    [windata->nswindow setOpaque:NO];
+
+    if ([windata->nswindow respondsToSelector:@selector(setStyleMask:)]) {
+        [windata->nswindow setStyleMask:NSBorderlessWindowMask];
+    }
+
+    SDL_WindowShaper* result = result = malloc(sizeof(SDL_WindowShaper));
+    result->window = window;
+    result->mode.mode = ShapeModeDefault;
+    result->mode.parameters.binarizationCutoff = 1;
+    result->userx = result->usery = 0;
+    window->shaper = result;
+
+    SDL_ShapeData* data = malloc(sizeof(SDL_ShapeData));
+    result->driverdata = data;
+    data->context = [windata->nswindow graphicsContext];
+    data->saved = SDL_FALSE;
+    data->shape = NULL;
+
+    int resized_properly = Cocoa_ResizeWindowShape(window);
+    SDL_assert(resized_properly == 0);
+    return result;
+}
+
+typedef struct {
+    NSView* view;
+    NSBezierPath* path;
+    SDL_Window* window;
+} SDL_CocoaClosure;
+
+void
+ConvertRects(SDL_ShapeTree* tree,void* closure) {
+    SDL_CocoaClosure* data = (SDL_CocoaClosure*)closure;
+    if(tree->kind == OpaqueShape) {
+        NSRect rect = NSMakeRect(tree->data.shape.x,data->window->h - tree->data.shape.y,tree->data.shape.w,tree->data.shape.h);
+        [data->path appendBezierPathWithRect:[data->view convertRect:rect toView:nil]];
+    }
+}
+
+int
+Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode) {
+    SDL_ShapeData* data = (SDL_ShapeData*)shaper->driverdata;
+    SDL_WindowData* windata = (SDL_WindowData*)shaper->window->driverdata;
+    SDL_CocoaClosure closure;
+    NSAutoreleasePool *pool = NULL;
+    if(data->saved == SDL_TRUE) {
+        [data->context restoreGraphicsState];
+        data->saved = SDL_FALSE;
+    }
+
+    /*[data->context saveGraphicsState];*/
+    /*data->saved = SDL_TRUE;*/
+    [NSGraphicsContext setCurrentContext:data->context];
+
+    [[NSColor clearColor] set];
+    NSRectFill([[windata->nswindow contentView] frame]);
+    data->shape = SDL_CalculateShapeTree(*shape_mode,shape);
+
+    pool = [[NSAutoreleasePool alloc] init];
+    closure.view = [windata->nswindow contentView];
+    closure.path = [[NSBezierPath bezierPath] init];
+    closure.window = shaper->window;
+    SDL_TraverseShapeTree(data->shape,&ConvertRects,&closure);
+    [closure.path addClip];
+    [pool release];
+
+    return 0;
+}
+
+int
+Cocoa_ResizeWindowShape(SDL_Window *window) {
+    SDL_ShapeData* data = window->shaper->driverdata;
+    SDL_assert(data != NULL);
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoavideo.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoavideo.h
new file mode 100644
index 000000000..f194e1f72
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoavideo.h	
@@ -0,0 +1,62 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoavideo_h
+#define _SDL_cocoavideo_h
+
+#include "SDL_opengl.h"
+
+#include <ApplicationServices/ApplicationServices.h>
+#include <Cocoa/Cocoa.h>
+
+#include "SDL_keycode.h"
+#include "../SDL_sysvideo.h"
+
+#include "SDL_cocoaclipboard.h"
+#include "SDL_cocoaevents.h"
+#include "SDL_cocoakeyboard.h"
+#include "SDL_cocoamodes.h"
+#include "SDL_cocoamouse.h"
+#include "SDL_cocoaopengl.h"
+#include "SDL_cocoawindow.h"
+
+/* Private display data */
+
+@class SDLTranslatorResponder;
+
+typedef struct SDL_VideoData
+{
+    SInt32 osversion;
+    int allow_spaces;
+    unsigned int modifierFlags;
+    void *key_layout;
+    SDLTranslatorResponder *fieldEdit;
+    NSInteger clipboard_count;
+    Uint32 screensaver_activity;
+} SDL_VideoData;
+
+/* Utility functions */
+extern NSImage * Cocoa_CreateImage(SDL_Surface * surface);
+
+#endif /* _SDL_cocoavideo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoavideo.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoavideo.m
new file mode 100644
index 000000000..6766b71bb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoavideo.m	
@@ -0,0 +1,242 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+#if defined(__APPLE__) && defined(__POWERPC__) && !defined(__APPLE_ALTIVEC__)
+#include <altivec.h>
+#undef bool
+#undef vector
+#undef pixel
+#endif
+
+#include "SDL.h"
+#include "SDL_endian.h"
+#include "SDL_cocoavideo.h"
+#include "SDL_cocoashape.h"
+#include "SDL_assert.h"
+
+/* Initialization/Query functions */
+static int Cocoa_VideoInit(_THIS);
+static void Cocoa_VideoQuit(_THIS);
+
+/* Cocoa driver bootstrap functions */
+
+static int
+Cocoa_Available(void)
+{
+    return (1);
+}
+
+static void
+Cocoa_DeleteDevice(SDL_VideoDevice * device)
+{
+    SDL_free(device->driverdata);
+    SDL_free(device);
+}
+
+static SDL_VideoDevice *
+Cocoa_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+    SDL_VideoData *data;
+
+    Cocoa_RegisterApp();
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (device) {
+        data = (struct SDL_VideoData *) SDL_calloc(1, sizeof(SDL_VideoData));
+    } else {
+        data = NULL;
+    }
+    if (!data) {
+        SDL_OutOfMemory();
+        SDL_free(device);
+        return NULL;
+    }
+    device->driverdata = data;
+
+    /* Find out what version of Mac OS X we're running */
+    Gestalt(gestaltSystemVersion, &data->osversion);
+
+    /* Set the function pointers */
+    device->VideoInit = Cocoa_VideoInit;
+    device->VideoQuit = Cocoa_VideoQuit;
+    device->GetDisplayBounds = Cocoa_GetDisplayBounds;
+    device->GetDisplayModes = Cocoa_GetDisplayModes;
+    device->SetDisplayMode = Cocoa_SetDisplayMode;
+    device->PumpEvents = Cocoa_PumpEvents;
+
+    device->CreateWindow = Cocoa_CreateWindow;
+    device->CreateWindowFrom = Cocoa_CreateWindowFrom;
+    device->SetWindowTitle = Cocoa_SetWindowTitle;
+    device->SetWindowIcon = Cocoa_SetWindowIcon;
+    device->SetWindowPosition = Cocoa_SetWindowPosition;
+    device->SetWindowSize = Cocoa_SetWindowSize;
+    device->SetWindowMinimumSize = Cocoa_SetWindowMinimumSize;
+    device->SetWindowMaximumSize = Cocoa_SetWindowMaximumSize;
+    device->ShowWindow = Cocoa_ShowWindow;
+    device->HideWindow = Cocoa_HideWindow;
+    device->RaiseWindow = Cocoa_RaiseWindow;
+    device->MaximizeWindow = Cocoa_MaximizeWindow;
+    device->MinimizeWindow = Cocoa_MinimizeWindow;
+    device->RestoreWindow = Cocoa_RestoreWindow;
+    device->SetWindowBordered = Cocoa_SetWindowBordered;
+    device->SetWindowFullscreen = Cocoa_SetWindowFullscreen;
+    device->SetWindowGammaRamp = Cocoa_SetWindowGammaRamp;
+    device->GetWindowGammaRamp = Cocoa_GetWindowGammaRamp;
+    device->SetWindowGrab = Cocoa_SetWindowGrab;
+    device->DestroyWindow = Cocoa_DestroyWindow;
+    device->GetWindowWMInfo = Cocoa_GetWindowWMInfo;
+
+    device->shape_driver.CreateShaper = Cocoa_CreateShaper;
+    device->shape_driver.SetWindowShape = Cocoa_SetWindowShape;
+    device->shape_driver.ResizeWindowShape = Cocoa_ResizeWindowShape;
+
+#if SDL_VIDEO_OPENGL_CGL
+    device->GL_LoadLibrary = Cocoa_GL_LoadLibrary;
+    device->GL_GetProcAddress = Cocoa_GL_GetProcAddress;
+    device->GL_UnloadLibrary = Cocoa_GL_UnloadLibrary;
+    device->GL_CreateContext = Cocoa_GL_CreateContext;
+    device->GL_MakeCurrent = Cocoa_GL_MakeCurrent;
+    device->GL_GetDrawableSize = Cocoa_GL_GetDrawableSize;
+    device->GL_SetSwapInterval = Cocoa_GL_SetSwapInterval;
+    device->GL_GetSwapInterval = Cocoa_GL_GetSwapInterval;
+    device->GL_SwapWindow = Cocoa_GL_SwapWindow;
+    device->GL_DeleteContext = Cocoa_GL_DeleteContext;
+#endif
+
+    device->StartTextInput = Cocoa_StartTextInput;
+    device->StopTextInput = Cocoa_StopTextInput;
+    device->SetTextInputRect = Cocoa_SetTextInputRect;
+
+    device->SetClipboardText = Cocoa_SetClipboardText;
+    device->GetClipboardText = Cocoa_GetClipboardText;
+    device->HasClipboardText = Cocoa_HasClipboardText;
+
+    device->free = Cocoa_DeleteDevice;
+
+    return device;
+}
+
+VideoBootStrap COCOA_bootstrap = {
+    "cocoa", "SDL Cocoa video driver",
+    Cocoa_Available, Cocoa_CreateDevice
+};
+
+
+int
+Cocoa_VideoInit(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    Cocoa_InitModes(_this);
+    Cocoa_InitKeyboard(_this);
+    Cocoa_InitMouse(_this);
+
+    const char *hint = SDL_GetHint(SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES);
+    data->allow_spaces = ( (data->osversion >= 0x1070) && (!hint || (*hint != '0')) );
+
+    return 0;
+}
+
+void
+Cocoa_VideoQuit(_THIS)
+{
+    Cocoa_QuitModes(_this);
+    Cocoa_QuitKeyboard(_this);
+    Cocoa_QuitMouse(_this);
+}
+
+/* This function assumes that it's called from within an autorelease pool */
+NSImage *
+Cocoa_CreateImage(SDL_Surface * surface)
+{
+    SDL_Surface *converted;
+    NSBitmapImageRep *imgrep;
+    Uint8 *pixels;
+    int i;
+    NSImage *img;
+
+    converted = SDL_ConvertSurfaceFormat(surface,
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+                                         SDL_PIXELFORMAT_RGBA8888,
+#else
+                                         SDL_PIXELFORMAT_ABGR8888,
+#endif
+                                         0);
+    if (!converted) {
+        return nil;
+    }
+
+    imgrep = [[[NSBitmapImageRep alloc] initWithBitmapDataPlanes: NULL
+                    pixelsWide: converted->w
+                    pixelsHigh: converted->h
+                    bitsPerSample: 8
+                    samplesPerPixel: 4
+                    hasAlpha: YES
+                    isPlanar: NO
+                    colorSpaceName: NSDeviceRGBColorSpace
+                    bytesPerRow: converted->pitch
+                    bitsPerPixel: converted->format->BitsPerPixel] autorelease];
+    if (imgrep == nil) {
+        SDL_FreeSurface(converted);
+        return nil;
+    }
+
+    /* Copy the pixels */
+    pixels = [imgrep bitmapData];
+    SDL_memcpy(pixels, converted->pixels, converted->h * converted->pitch);
+    SDL_FreeSurface(converted);
+
+    /* Premultiply the alpha channel */
+    for (i = (surface->h * surface->w); i--; ) {
+        Uint8 alpha = pixels[3];
+        pixels[0] = (Uint8)(((Uint16)pixels[0] * alpha) / 255);
+        pixels[1] = (Uint8)(((Uint16)pixels[1] * alpha) / 255);
+        pixels[2] = (Uint8)(((Uint16)pixels[2] * alpha) / 255);
+        pixels += 4;
+    }
+
+    img = [[[NSImage alloc] initWithSize: NSMakeSize(surface->w, surface->h)] autorelease];
+    if (img != nil) {
+        [img addRepresentation: imgrep];
+    }
+    return img;
+}
+
+/*
+ * Mac OS X log support.
+ *
+ * This doesn't really have aything to do with the interfaces of the SDL video
+ *  subsystem, but we need to stuff this into an Objective-C source code file.
+ */
+
+void SDL_NSLog(const char *text)
+{
+    NSLog(@"%s", text);
+}
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vim: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoawindow.h b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoawindow.h
new file mode 100644
index 000000000..a4ec07d72
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoawindow.h	
@@ -0,0 +1,146 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_cocoawindow_h
+#define _SDL_cocoawindow_h
+
+#import <Cocoa/Cocoa.h>
+
+typedef struct SDL_WindowData SDL_WindowData;
+
+typedef enum
+{
+    PENDING_OPERATION_NONE,
+    PENDING_OPERATION_ENTER_FULLSCREEN,
+    PENDING_OPERATION_LEAVE_FULLSCREEN,
+    PENDING_OPERATION_MINIMIZE
+} PendingWindowOperation;
+
+@interface Cocoa_WindowListener : NSResponder <NSWindowDelegate> {
+    SDL_WindowData *_data;
+    BOOL observingVisible;
+    BOOL wasCtrlLeft;
+    BOOL wasVisible;
+    BOOL isFullscreenSpace;
+    BOOL inFullscreenTransition;
+    PendingWindowOperation pendingWindowOperation;
+    BOOL isMoving;
+    int pendingWindowWarpX, pendingWindowWarpY;
+}
+
+-(void) listen:(SDL_WindowData *) data;
+-(void) pauseVisibleObservation;
+-(void) resumeVisibleObservation;
+-(BOOL) setFullscreenSpace:(BOOL) state;
+-(BOOL) isInFullscreenSpace;
+-(BOOL) isInFullscreenSpaceTransition;
+-(void) addPendingWindowOperation:(PendingWindowOperation) operation;
+-(void) close;
+
+-(BOOL) isMoving;
+-(void) setPendingMoveX:(int)x Y:(int)y;
+-(void) windowDidFinishMoving;
+
+/* Window delegate functionality */
+-(BOOL) windowShouldClose:(id) sender;
+-(void) windowDidExpose:(NSNotification *) aNotification;
+-(void) windowDidMove:(NSNotification *) aNotification;
+-(void) windowDidResize:(NSNotification *) aNotification;
+-(void) windowDidMiniaturize:(NSNotification *) aNotification;
+-(void) windowDidDeminiaturize:(NSNotification *) aNotification;
+-(void) windowDidBecomeKey:(NSNotification *) aNotification;
+-(void) windowDidResignKey:(NSNotification *) aNotification;
+-(void) windowWillEnterFullScreen:(NSNotification *) aNotification;
+-(void) windowDidEnterFullScreen:(NSNotification *) aNotification;
+-(void) windowWillExitFullScreen:(NSNotification *) aNotification;
+-(void) windowDidExitFullScreen:(NSNotification *) aNotification;
+-(NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions;
+
+/* Window event handling */
+-(void) mouseDown:(NSEvent *) theEvent;
+-(void) rightMouseDown:(NSEvent *) theEvent;
+-(void) otherMouseDown:(NSEvent *) theEvent;
+-(void) mouseUp:(NSEvent *) theEvent;
+-(void) rightMouseUp:(NSEvent *) theEvent;
+-(void) otherMouseUp:(NSEvent *) theEvent;
+-(void) mouseMoved:(NSEvent *) theEvent;
+-(void) mouseDragged:(NSEvent *) theEvent;
+-(void) rightMouseDragged:(NSEvent *) theEvent;
+-(void) otherMouseDragged:(NSEvent *) theEvent;
+-(void) scrollWheel:(NSEvent *) theEvent;
+-(void) touchesBeganWithEvent:(NSEvent *) theEvent;
+-(void) touchesMovedWithEvent:(NSEvent *) theEvent;
+-(void) touchesEndedWithEvent:(NSEvent *) theEvent;
+-(void) touchesCancelledWithEvent:(NSEvent *) theEvent;
+
+/* Touch event handling */
+typedef enum {
+    COCOA_TOUCH_DOWN,
+    COCOA_TOUCH_UP,
+    COCOA_TOUCH_MOVE,
+    COCOA_TOUCH_CANCELLED
+} cocoaTouchType;
+-(void) handleTouches:(cocoaTouchType)type withEvent:(NSEvent*) event;
+
+@end
+/* *INDENT-ON* */
+
+@class SDLOpenGLContext;
+
+struct SDL_WindowData
+{
+    SDL_Window *window;
+    NSWindow *nswindow;
+    NSMutableArray *nscontexts;
+    SDL_bool created;
+    SDL_bool inWindowMove;
+    Cocoa_WindowListener *listener;
+    struct SDL_VideoData *videodata;
+};
+
+extern int Cocoa_CreateWindow(_THIS, SDL_Window * window);
+extern int Cocoa_CreateWindowFrom(_THIS, SDL_Window * window,
+                                  const void *data);
+extern void Cocoa_SetWindowTitle(_THIS, SDL_Window * window);
+extern void Cocoa_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
+extern void Cocoa_SetWindowPosition(_THIS, SDL_Window * window);
+extern void Cocoa_SetWindowSize(_THIS, SDL_Window * window);
+extern void Cocoa_SetWindowMinimumSize(_THIS, SDL_Window * window);
+extern void Cocoa_SetWindowMaximumSize(_THIS, SDL_Window * window);
+extern void Cocoa_ShowWindow(_THIS, SDL_Window * window);
+extern void Cocoa_HideWindow(_THIS, SDL_Window * window);
+extern void Cocoa_RaiseWindow(_THIS, SDL_Window * window);
+extern void Cocoa_MaximizeWindow(_THIS, SDL_Window * window);
+extern void Cocoa_MinimizeWindow(_THIS, SDL_Window * window);
+extern void Cocoa_RestoreWindow(_THIS, SDL_Window * window);
+extern void Cocoa_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered);
+extern void Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen);
+extern int Cocoa_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp);
+extern int Cocoa_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp);
+extern void Cocoa_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
+extern void Cocoa_DestroyWindow(_THIS, SDL_Window * window);
+extern SDL_bool Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window,
+                                      struct SDL_SysWMinfo *info);
+
+#endif /* _SDL_cocoawindow_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoawindow.m b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoawindow.m
new file mode 100644
index 000000000..a55ab4967
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/cocoa/SDL_cocoawindow.m	
@@ -0,0 +1,1550 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_COCOA
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+# error SDL for Mac OS X must be built with a 10.7 SDK or above.
+#endif /* MAC_OS_X_VERSION_MAX_ALLOWED < 1070 */
+
+#include "SDL_syswm.h"
+#include "SDL_timer.h"  /* For SDL_GetTicks() */
+#include "SDL_hints.h"
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_touch_c.h"
+#include "../../events/SDL_windowevents_c.h"
+#include "SDL_cocoavideo.h"
+#include "SDL_cocoashape.h"
+#include "SDL_cocoamouse.h"
+#include "SDL_cocoaopengl.h"
+#include "SDL_assert.h"
+
+/* #define DEBUG_COCOAWINDOW */
+
+#ifdef DEBUG_COCOAWINDOW
+#define DLog(fmt, ...) printf("%s: " fmt "\n", __func__, ##__VA_ARGS__)
+#else
+#define DLog(...) do { } while (0)
+#endif
+
+
+@interface SDLWindow : NSWindow
+/* These are needed for borderless/fullscreen windows */
+- (BOOL)canBecomeKeyWindow;
+- (BOOL)canBecomeMainWindow;
+- (void)sendEvent:(NSEvent *)event;
+@end
+
+@implementation SDLWindow
+- (BOOL)canBecomeKeyWindow
+{
+    return YES;
+}
+
+- (BOOL)canBecomeMainWindow
+{
+    return YES;
+}
+
+- (void)sendEvent:(NSEvent *)event
+{
+  [super sendEvent:event];
+
+  if ([event type] != NSLeftMouseUp) {
+      return;
+  }
+
+  id delegate = [self delegate];
+  if (![delegate isKindOfClass:[Cocoa_WindowListener class]]) {
+      return;
+  }
+
+  if ([delegate isMoving]) {
+      [delegate windowDidFinishMoving];
+  }
+}
+@end
+
+
+static Uint32 s_moveHack;
+
+static void ConvertNSRect(NSRect *r)
+{
+    r->origin.y = CGDisplayPixelsHigh(kCGDirectMainDisplay) - r->origin.y - r->size.height;
+}
+
+static void
+ScheduleContextUpdates(SDL_WindowData *data)
+{
+    NSOpenGLContext *currentContext = [NSOpenGLContext currentContext];
+    NSMutableArray *contexts = data->nscontexts;
+    @synchronized (contexts) {
+        for (SDLOpenGLContext *context in contexts) {
+            if (context == currentContext) {
+                [context update];
+            } else {
+                [context scheduleUpdate];
+            }
+        }
+    }
+}
+
+static int
+GetHintCtrlClickEmulateRightClick()
+{
+	const char *hint = SDL_GetHint( SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK );
+	return hint != NULL && *hint != '0';
+}
+
+static unsigned int
+GetWindowStyle(SDL_Window * window)
+{
+    unsigned int style;
+
+    if (window->flags & SDL_WINDOW_FULLSCREEN) {
+        style = NSBorderlessWindowMask;
+    } else {
+        if (window->flags & SDL_WINDOW_BORDERLESS) {
+            style = NSBorderlessWindowMask;
+        } else {
+            style = (NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask);
+        }
+        if (window->flags & SDL_WINDOW_RESIZABLE) {
+            style |= NSResizableWindowMask;
+        }
+    }
+    return style;
+}
+
+static SDL_bool
+SetWindowStyle(SDL_Window * window, unsigned int style)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    NSWindow *nswindow = data->nswindow;
+
+    if (![nswindow respondsToSelector: @selector(setStyleMask:)]) {
+        return SDL_FALSE;
+    }
+
+    /* The view responder chain gets messed with during setStyleMask */
+    if ([[nswindow contentView] nextResponder] == data->listener) {
+        [[nswindow contentView] setNextResponder:nil];
+    }
+
+    [nswindow performSelector: @selector(setStyleMask:) withObject: (id)(uintptr_t)style];
+
+    /* The view responder chain gets messed with during setStyleMask */
+    if ([[nswindow contentView] nextResponder] != data->listener) {
+        [[nswindow contentView] setNextResponder:data->listener];
+    }
+
+    return SDL_TRUE;
+}
+
+
+@implementation Cocoa_WindowListener
+
+- (void)listen:(SDL_WindowData *)data
+{
+    NSNotificationCenter *center;
+    NSWindow *window = data->nswindow;
+    NSView *view = [window contentView];
+
+    _data = data;
+    observingVisible = YES;
+    wasCtrlLeft = NO;
+    wasVisible = [window isVisible];
+    isFullscreenSpace = NO;
+    inFullscreenTransition = NO;
+    pendingWindowOperation = PENDING_OPERATION_NONE;
+    isMoving = NO;
+
+    center = [NSNotificationCenter defaultCenter];
+
+    if ([window delegate] != nil) {
+        [center addObserver:self selector:@selector(windowDidExpose:) name:NSWindowDidExposeNotification object:window];
+        [center addObserver:self selector:@selector(windowDidMove:) name:NSWindowDidMoveNotification object:window];
+        [center addObserver:self selector:@selector(windowDidResize:) name:NSWindowDidResizeNotification object:window];
+        [center addObserver:self selector:@selector(windowDidMiniaturize:) name:NSWindowDidMiniaturizeNotification object:window];
+        [center addObserver:self selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification object:window];
+        [center addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:window];
+        [center addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:window];
+        [center addObserver:self selector:@selector(windowWillEnterFullScreen:) name:NSWindowWillEnterFullScreenNotification object:window];
+        [center addObserver:self selector:@selector(windowDidEnterFullScreen:) name:NSWindowDidEnterFullScreenNotification object:window];
+        [center addObserver:self selector:@selector(windowWillExitFullScreen:) name:NSWindowWillExitFullScreenNotification object:window];
+        [center addObserver:self selector:@selector(windowDidExitFullScreen:) name:NSWindowDidExitFullScreenNotification object:window];
+    } else {
+        [window setDelegate:self];
+    }
+
+    /* Haven't found a delegate / notification that triggers when the window is
+     * ordered out (is not visible any more). You can be ordered out without
+     * minimizing, so DidMiniaturize doesn't work. (e.g. -[NSWindow orderOut:])
+     */
+    [window addObserver:self
+             forKeyPath:@"visible"
+                options:NSKeyValueObservingOptionNew
+                context:NULL];
+
+    [window setNextResponder:self];
+    [window setAcceptsMouseMovedEvents:YES];
+
+    [view setNextResponder:self];
+
+    if ([view respondsToSelector:@selector(setAcceptsTouchEvents:)]) {
+        [view setAcceptsTouchEvents:YES];
+    }
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath
+                      ofObject:(id)object
+                        change:(NSDictionary *)change
+                       context:(void *)context
+{
+    if (!observingVisible) {
+        return;
+    }
+
+    if (object == _data->nswindow && [keyPath isEqualToString:@"visible"]) {
+        int newVisibility = [[change objectForKey:@"new"] intValue];
+        if (newVisibility) {
+            SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
+        } else {
+            SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
+        }
+    }
+}
+
+-(void) pauseVisibleObservation
+{
+    observingVisible = NO;
+    wasVisible = [_data->nswindow isVisible];
+}
+
+-(void) resumeVisibleObservation
+{
+    BOOL isVisible = [_data->nswindow isVisible];
+    observingVisible = YES;
+    if (wasVisible != isVisible) {
+        if (isVisible) {
+            SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
+        } else {
+            SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
+        }
+
+        wasVisible = isVisible;
+    }
+}
+
+-(BOOL) setFullscreenSpace:(BOOL) state
+{
+    SDL_Window *window = _data->window;
+    NSWindow *nswindow = _data->nswindow;
+    SDL_VideoData *videodata = ((SDL_WindowData *) window->driverdata)->videodata;
+
+    if (!videodata->allow_spaces) {
+        return NO;  /* Spaces are forcibly disabled. */
+    } else if (state && ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) != SDL_WINDOW_FULLSCREEN_DESKTOP)) {
+        return NO;  /* we only allow you to make a Space on FULLSCREEN_DESKTOP windows. */
+    } else if (state == isFullscreenSpace) {
+        return YES;  /* already there. */
+    }
+
+    if (inFullscreenTransition) {
+        if (state) {
+            [self addPendingWindowOperation:PENDING_OPERATION_ENTER_FULLSCREEN];
+        } else {
+            [self addPendingWindowOperation:PENDING_OPERATION_LEAVE_FULLSCREEN];
+        }
+        return YES;
+    }
+    inFullscreenTransition = YES;
+
+    /* you need to be FullScreenPrimary, or toggleFullScreen doesn't work. Unset it again in windowDidExitFullScreen. */
+    [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+    [nswindow performSelectorOnMainThread: @selector(toggleFullScreen:) withObject:nswindow waitUntilDone:NO];
+    return YES;
+}
+
+-(BOOL) isInFullscreenSpace
+{
+    return isFullscreenSpace;
+}
+
+-(BOOL) isInFullscreenSpaceTransition
+{
+    return inFullscreenTransition;
+}
+
+-(void) addPendingWindowOperation:(PendingWindowOperation) operation
+{
+    pendingWindowOperation = operation;
+}
+
+- (void)close
+{
+    NSNotificationCenter *center;
+    NSWindow *window = _data->nswindow;
+    NSView *view = [window contentView];
+    NSArray *windows = nil;
+
+    center = [NSNotificationCenter defaultCenter];
+
+    if ([window delegate] != self) {
+        [center removeObserver:self name:NSWindowDidExposeNotification object:window];
+        [center removeObserver:self name:NSWindowDidMoveNotification object:window];
+        [center removeObserver:self name:NSWindowDidResizeNotification object:window];
+        [center removeObserver:self name:NSWindowDidMiniaturizeNotification object:window];
+        [center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:window];
+        [center removeObserver:self name:NSWindowDidBecomeKeyNotification object:window];
+        [center removeObserver:self name:NSWindowDidResignKeyNotification object:window];
+        [center removeObserver:self name:NSWindowWillEnterFullScreenNotification object:window];
+        [center removeObserver:self name:NSWindowDidEnterFullScreenNotification object:window];
+        [center removeObserver:self name:NSWindowWillExitFullScreenNotification object:window];
+        [center removeObserver:self name:NSWindowDidExitFullScreenNotification object:window];
+    } else {
+        [window setDelegate:nil];
+    }
+
+    [window removeObserver:self forKeyPath:@"visible"];
+
+    if ([window nextResponder] == self) {
+        [window setNextResponder:nil];
+    }
+    if ([view nextResponder] == self) {
+        [view setNextResponder:nil];
+    }
+
+    /* Make the next window in the z-order Key. If we weren't the foreground
+       when closed, this is a no-op.
+       !!! FIXME: Note that this is a hack, and there are corner cases where
+       !!! FIXME:  this fails (such as the About box). The typical nib+RunLoop
+       !!! FIXME:  handles this for Cocoa apps, but we bypass all that in SDL.
+       !!! FIXME:  We should remove this code when we find a better way to
+       !!! FIXME:  have the system do this for us. See discussion in
+       !!! FIXME:   http://bugzilla.libsdl.org/show_bug.cgi?id=1825
+    */
+    windows = [NSApp orderedWindows];
+    for (NSWindow *win in windows)
+    {
+        if (win == window) {
+            continue;
+        }
+
+        [win makeKeyAndOrderFront:self];
+        break;
+    }
+}
+
+- (BOOL)isMoving
+{
+    return isMoving;
+}
+
+-(void) setPendingMoveX:(int)x Y:(int)y
+{
+    pendingWindowWarpX = x;
+    pendingWindowWarpY = y;
+}
+
+- (void)windowDidFinishMoving
+{
+    if ([self isMoving])
+    {
+        isMoving = NO;
+
+        SDL_Mouse *mouse = SDL_GetMouse();
+        if (pendingWindowWarpX >= 0 && pendingWindowWarpY >= 0) {
+            mouse->WarpMouse(_data->window, pendingWindowWarpX, pendingWindowWarpY);
+            pendingWindowWarpX = pendingWindowWarpY = -1;
+        }
+        if (mouse->relative_mode && SDL_GetMouseFocus() == _data->window) {
+            mouse->SetRelativeMouseMode(SDL_TRUE);
+        }
+    }
+}
+
+- (BOOL)windowShouldClose:(id)sender
+{
+    SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
+    return NO;
+}
+
+- (void)windowDidExpose:(NSNotification *)aNotification
+{
+    SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_EXPOSED, 0, 0);
+}
+
+- (void)windowWillMove:(NSNotification *)aNotification
+{
+    if ([_data->nswindow isKindOfClass:[SDLWindow class]]) {
+        pendingWindowWarpX = pendingWindowWarpY = -1;
+        isMoving = YES;
+    }
+}
+
+- (void)windowDidMove:(NSNotification *)aNotification
+{
+    int x, y;
+    SDL_Window *window = _data->window;
+    NSWindow *nswindow = _data->nswindow;
+    NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
+    ConvertNSRect(&rect);
+
+    if (s_moveHack) {
+        SDL_bool blockMove = ((SDL_GetTicks() - s_moveHack) < 500);
+
+        s_moveHack = 0;
+
+        if (blockMove) {
+            /* Cocoa is adjusting the window in response to a mode change */
+            rect.origin.x = window->x;
+            rect.origin.y = window->y;
+            ConvertNSRect(&rect);
+            [nswindow setFrameOrigin:rect.origin];
+            return;
+        }
+    }
+
+    x = (int)rect.origin.x;
+    y = (int)rect.origin.y;
+
+    ScheduleContextUpdates(_data);
+
+    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, x, y);
+}
+
+- (void)windowDidResize:(NSNotification *)aNotification
+{
+    if (inFullscreenTransition) {
+        /* We'll take care of this at the end of the transition */
+        return;
+    }
+
+    SDL_Window *window = _data->window;
+    NSWindow *nswindow = _data->nswindow;
+    int x, y, w, h;
+    NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
+    ConvertNSRect(&rect);
+    x = (int)rect.origin.x;
+    y = (int)rect.origin.y;
+    w = (int)rect.size.width;
+    h = (int)rect.size.height;
+
+    if (SDL_IsShapedWindow(window)) {
+        Cocoa_ResizeWindowShape(window);
+    }
+
+    ScheduleContextUpdates(_data);
+
+    /* The window can move during a resize event, such as when maximizing
+       or resizing from a corner */
+    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, x, y);
+    SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, w, h);
+
+    const BOOL zoomed = [nswindow isZoomed];
+    if (!zoomed) {
+        SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESTORED, 0, 0);
+    } else if (zoomed) {
+        SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MAXIMIZED, 0, 0);
+    }
+}
+
+- (void)windowDidMiniaturize:(NSNotification *)aNotification
+{
+    SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
+}
+
+- (void)windowDidDeminiaturize:(NSNotification *)aNotification
+{
+    SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESTORED, 0, 0);
+}
+
+- (void)windowDidBecomeKey:(NSNotification *)aNotification
+{
+    SDL_Window *window = _data->window;
+    SDL_Mouse *mouse = SDL_GetMouse();
+    if (mouse->relative_mode && ![self isMoving]) {
+        mouse->SetRelativeMouseMode(SDL_TRUE);
+    }
+
+    /* We're going to get keyboard events, since we're key. */
+    SDL_SetKeyboardFocus(window);
+
+    /* If we just gained focus we need the updated mouse position */
+    if (!mouse->relative_mode) {
+        NSPoint point;
+        int x, y;
+
+        point = [_data->nswindow mouseLocationOutsideOfEventStream];
+        x = (int)point.x;
+        y = (int)(window->h - point.y);
+
+        if (x >= 0 && x < window->w && y >= 0 && y < window->h) {
+            SDL_SendMouseMotion(window, 0, 0, x, y);
+        }
+    }
+
+    /* Check to see if someone updated the clipboard */
+    Cocoa_CheckClipboardUpdate(_data->videodata);
+
+    if ((isFullscreenSpace) && ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP)) {
+        [NSMenu setMenuBarVisible:NO];
+    }
+}
+
+- (void)windowDidResignKey:(NSNotification *)aNotification
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    if (mouse->relative_mode) {
+        mouse->SetRelativeMouseMode(SDL_FALSE);
+    }
+
+    /* Some other window will get mouse events, since we're not key. */
+    if (SDL_GetMouseFocus() == _data->window) {
+        SDL_SetMouseFocus(NULL);
+    }
+
+    /* Some other window will get keyboard events, since we're not key. */
+    if (SDL_GetKeyboardFocus() == _data->window) {
+        SDL_SetKeyboardFocus(NULL);
+    }
+
+    if (isFullscreenSpace) {
+        [NSMenu setMenuBarVisible:YES];
+    }
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification *)aNotification
+{
+    SDL_Window *window = _data->window;
+
+    SetWindowStyle(window, (NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask));
+
+    isFullscreenSpace = YES;
+    inFullscreenTransition = YES;
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *)aNotification
+{
+    SDL_Window *window = _data->window;
+
+    inFullscreenTransition = NO;
+
+    if (pendingWindowOperation == PENDING_OPERATION_LEAVE_FULLSCREEN) {
+        pendingWindowOperation = PENDING_OPERATION_NONE;
+        [self setFullscreenSpace:NO];
+    } else {
+        if ((window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) {
+            [NSMenu setMenuBarVisible:NO];
+        }
+
+        pendingWindowOperation = PENDING_OPERATION_NONE;
+        /* Force the size change event in case it was delivered earlier
+           while the window was still animating into place.
+         */
+        window->w = 0;
+        window->h = 0;
+        [self windowDidResize:aNotification];
+    }
+}
+
+- (void)windowWillExitFullScreen:(NSNotification *)aNotification
+{
+    SDL_Window *window = _data->window;
+
+    SetWindowStyle(window, GetWindowStyle(window));
+
+    isFullscreenSpace = NO;
+    inFullscreenTransition = YES;
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)aNotification
+{
+    SDL_Window *window = _data->window;
+    NSWindow *nswindow = _data->nswindow;
+
+    inFullscreenTransition = NO;
+
+    [nswindow setLevel:kCGNormalWindowLevel];
+
+    if (pendingWindowOperation == PENDING_OPERATION_ENTER_FULLSCREEN) {
+        pendingWindowOperation = PENDING_OPERATION_NONE;
+        [self setFullscreenSpace:YES];
+    } else if (pendingWindowOperation == PENDING_OPERATION_MINIMIZE) {
+        pendingWindowOperation = PENDING_OPERATION_NONE;
+        [nswindow miniaturize:nil];
+    } else {
+        /* Adjust the fullscreen toggle button and readd menu now that we're here. */
+        if (window->flags & SDL_WINDOW_RESIZABLE) {
+            /* resizable windows are Spaces-friendly: they get the "go fullscreen" toggle button on their titlebar. */
+            [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+        } else {
+            [nswindow setCollectionBehavior:NSWindowCollectionBehaviorManaged];
+        }
+        [NSMenu setMenuBarVisible:YES];
+
+        pendingWindowOperation = PENDING_OPERATION_NONE;
+        /* Force the size change event in case it was delivered earlier
+           while the window was still animating into place.
+         */
+        window->w = 0;
+        window->h = 0;
+        [self windowDidResize:aNotification];
+
+        /* FIXME: Why does the window get hidden? */
+        if (window->flags & SDL_WINDOW_SHOWN) {
+            Cocoa_ShowWindow(SDL_GetVideoDevice(), window);
+        }
+    }
+}
+
+-(NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
+{
+    if ((_data->window->flags & SDL_WINDOW_FULLSCREEN_DESKTOP) == SDL_WINDOW_FULLSCREEN_DESKTOP) {
+        return NSApplicationPresentationFullScreen | NSApplicationPresentationHideDock | NSApplicationPresentationHideMenuBar;
+    } else {
+        return proposedOptions;
+    }
+}
+
+
+/* We'll respond to key events by doing nothing so we don't beep.
+ * We could handle key messages here, but we lose some in the NSApp dispatch,
+ * where they get converted to action messages, etc.
+ */
+- (void)flagsChanged:(NSEvent *)theEvent
+{
+    /*Cocoa_HandleKeyEvent(SDL_GetVideoDevice(), theEvent);*/
+}
+- (void)keyDown:(NSEvent *)theEvent
+{
+    /*Cocoa_HandleKeyEvent(SDL_GetVideoDevice(), theEvent);*/
+}
+- (void)keyUp:(NSEvent *)theEvent
+{
+    /*Cocoa_HandleKeyEvent(SDL_GetVideoDevice(), theEvent);*/
+}
+
+/* We'll respond to selectors by doing nothing so we don't beep.
+ * The escape key gets converted to a "cancel" selector, etc.
+ */
+- (void)doCommandBySelector:(SEL)aSelector
+{
+    /*NSLog(@"doCommandBySelector: %@\n", NSStringFromSelector(aSelector));*/
+}
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+    int button;
+
+    switch ([theEvent buttonNumber]) {
+    case 0:
+        if (([theEvent modifierFlags] & NSControlKeyMask) &&
+		    GetHintCtrlClickEmulateRightClick()) {
+            wasCtrlLeft = YES;
+            button = SDL_BUTTON_RIGHT;
+        } else {
+            wasCtrlLeft = NO;
+            button = SDL_BUTTON_LEFT;
+        }
+        break;
+    case 1:
+        button = SDL_BUTTON_RIGHT;
+        break;
+    case 2:
+        button = SDL_BUTTON_MIDDLE;
+        break;
+    default:
+        button = [theEvent buttonNumber] + 1;
+        break;
+    }
+    SDL_SendMouseButton(_data->window, 0, SDL_PRESSED, button);
+}
+
+- (void)rightMouseDown:(NSEvent *)theEvent
+{
+    [self mouseDown:theEvent];
+}
+
+- (void)otherMouseDown:(NSEvent *)theEvent
+{
+    [self mouseDown:theEvent];
+}
+
+- (void)mouseUp:(NSEvent *)theEvent
+{
+    int button;
+
+    switch ([theEvent buttonNumber]) {
+    case 0:
+        if (wasCtrlLeft) {
+            button = SDL_BUTTON_RIGHT;
+            wasCtrlLeft = NO;
+        } else {
+            button = SDL_BUTTON_LEFT;
+        }
+        break;
+    case 1:
+        button = SDL_BUTTON_RIGHT;
+        break;
+    case 2:
+        button = SDL_BUTTON_MIDDLE;
+        break;
+    default:
+        button = [theEvent buttonNumber] + 1;
+        break;
+    }
+    SDL_SendMouseButton(_data->window, 0, SDL_RELEASED, button);
+}
+
+- (void)rightMouseUp:(NSEvent *)theEvent
+{
+    [self mouseUp:theEvent];
+}
+
+- (void)otherMouseUp:(NSEvent *)theEvent
+{
+    [self mouseUp:theEvent];
+}
+
+- (void)mouseMoved:(NSEvent *)theEvent
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    SDL_Window *window = _data->window;
+    NSPoint point;
+    int x, y;
+
+    if (mouse->relative_mode) {
+        return;
+    }
+
+    point = [theEvent locationInWindow];
+    x = (int)point.x;
+    y = (int)(window->h - point.y);
+
+    if (x < 0 || x >= window->w || y < 0 || y >= window->h) {
+        if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
+            if (x < 0) {
+                x = 0;
+            } else if (x >= window->w) {
+                x = window->w - 1;
+            }
+            if (y < 0) {
+                y = 0;
+            } else if (y >= window->h) {
+                y = window->h - 1;
+            }
+
+#if !SDL_MAC_NO_SANDBOX
+            CGPoint cgpoint;
+
+            /* When SDL_MAC_NO_SANDBOX is set, this is handled by
+             * SDL_cocoamousetap.m.
+             */
+
+            cgpoint.x = window->x + x;
+            cgpoint.y = window->y + y;
+
+            /* According to the docs, this was deprecated in 10.6, but it's still
+             * around. The substitute requires a CGEventSource, but I'm not entirely
+             * sure how we'd procure the right one for this event.
+             */
+            CGSetLocalEventsSuppressionInterval(0.0);
+            CGDisplayMoveCursorToPoint(kCGDirectMainDisplay, cgpoint);
+            CGSetLocalEventsSuppressionInterval(0.25);
+
+            Cocoa_HandleMouseWarp(cgpoint.x, cgpoint.y);
+#endif
+        }
+    }
+    SDL_SendMouseMotion(window, 0, 0, x, y);
+}
+
+- (void)mouseDragged:(NSEvent *)theEvent
+{
+    [self mouseMoved:theEvent];
+}
+
+- (void)rightMouseDragged:(NSEvent *)theEvent
+{
+    [self mouseMoved:theEvent];
+}
+
+- (void)otherMouseDragged:(NSEvent *)theEvent
+{
+    [self mouseMoved:theEvent];
+}
+
+- (void)scrollWheel:(NSEvent *)theEvent
+{
+    Cocoa_HandleMouseWheel(_data->window, theEvent);
+}
+
+- (void)touchesBeganWithEvent:(NSEvent *) theEvent
+{
+    [self handleTouches:COCOA_TOUCH_DOWN withEvent:theEvent];
+}
+
+- (void)touchesMovedWithEvent:(NSEvent *) theEvent
+{
+    [self handleTouches:COCOA_TOUCH_MOVE withEvent:theEvent];
+}
+
+- (void)touchesEndedWithEvent:(NSEvent *) theEvent
+{
+    [self handleTouches:COCOA_TOUCH_UP withEvent:theEvent];
+}
+
+- (void)touchesCancelledWithEvent:(NSEvent *) theEvent
+{
+    [self handleTouches:COCOA_TOUCH_CANCELLED withEvent:theEvent];
+}
+
+- (void)handleTouches:(cocoaTouchType)type withEvent:(NSEvent *)event
+{
+    NSSet *touches = 0;
+    NSEnumerator *enumerator;
+    NSTouch *touch;
+
+    switch (type) {
+        case COCOA_TOUCH_DOWN:
+            touches = [event touchesMatchingPhase:NSTouchPhaseBegan inView:nil];
+            break;
+        case COCOA_TOUCH_UP:
+            touches = [event touchesMatchingPhase:NSTouchPhaseEnded inView:nil];
+            break;
+        case COCOA_TOUCH_CANCELLED:
+            touches = [event touchesMatchingPhase:NSTouchPhaseCancelled inView:nil];
+            break;
+        case COCOA_TOUCH_MOVE:
+            touches = [event touchesMatchingPhase:NSTouchPhaseMoved inView:nil];
+            break;
+    }
+
+    enumerator = [touches objectEnumerator];
+    touch = (NSTouch*)[enumerator nextObject];
+    while (touch) {
+        const SDL_TouchID touchId = (SDL_TouchID)(intptr_t)[touch device];
+        if (!SDL_GetTouch(touchId)) {
+            if (SDL_AddTouch(touchId, "") < 0) {
+                return;
+            }
+        }
+
+        const SDL_FingerID fingerId = (SDL_FingerID)(intptr_t)[touch identity];
+        float x = [touch normalizedPosition].x;
+        float y = [touch normalizedPosition].y;
+        /* Make the origin the upper left instead of the lower left */
+        y = 1.0f - y;
+
+        switch (type) {
+        case COCOA_TOUCH_DOWN:
+            SDL_SendTouch(touchId, fingerId, SDL_TRUE, x, y, 1.0f);
+            break;
+        case COCOA_TOUCH_UP:
+        case COCOA_TOUCH_CANCELLED:
+            SDL_SendTouch(touchId, fingerId, SDL_FALSE, x, y, 1.0f);
+            break;
+        case COCOA_TOUCH_MOVE:
+            SDL_SendTouchMotion(touchId, fingerId, x, y, 1.0f);
+            break;
+        }
+
+        touch = (NSTouch*)[enumerator nextObject];
+    }
+}
+
+@end
+
+@interface SDLView : NSView
+
+/* The default implementation doesn't pass rightMouseDown to responder chain */
+- (void)rightMouseDown:(NSEvent *)theEvent;
+@end
+
+@implementation SDLView
+- (void)rightMouseDown:(NSEvent *)theEvent
+{
+    [[self nextResponder] rightMouseDown:theEvent];
+}
+
+- (void)resetCursorRects
+{
+    [super resetCursorRects];
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    if (mouse->cursor_shown && mouse->cur_cursor && !mouse->relative_mode) {
+        [self addCursorRect:[self bounds]
+                     cursor:mouse->cur_cursor->driverdata];
+    } else {
+        [self addCursorRect:[self bounds]
+                     cursor:[NSCursor invisibleCursor]];
+    }
+}
+@end
+
+static int
+SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created)
+{
+    NSAutoreleasePool *pool;
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    SDL_WindowData *data;
+
+    /* Allocate the window data */
+    data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+    data->window = window;
+    data->nswindow = nswindow;
+    data->created = created;
+    data->videodata = videodata;
+    data->nscontexts = [[NSMutableArray alloc] init];
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    /* Create an event listener for the window */
+    data->listener = [[Cocoa_WindowListener alloc] init];
+
+    /* Fill in the SDL window with the window data */
+    {
+        NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
+        ConvertNSRect(&rect);
+        window->x = (int)rect.origin.x;
+        window->y = (int)rect.origin.y;
+        window->w = (int)rect.size.width;
+        window->h = (int)rect.size.height;
+    }
+
+    /* Set up the listener after we create the view */
+    [data->listener listen:data];
+
+    if ([nswindow isVisible]) {
+        window->flags |= SDL_WINDOW_SHOWN;
+    } else {
+        window->flags &= ~SDL_WINDOW_SHOWN;
+    }
+
+    {
+        unsigned int style = [nswindow styleMask];
+
+        if (style == NSBorderlessWindowMask) {
+            window->flags |= SDL_WINDOW_BORDERLESS;
+        } else {
+            window->flags &= ~SDL_WINDOW_BORDERLESS;
+        }
+        if (style & NSResizableWindowMask) {
+            window->flags |= SDL_WINDOW_RESIZABLE;
+        } else {
+            window->flags &= ~SDL_WINDOW_RESIZABLE;
+        }
+    }
+
+    /* isZoomed always returns true if the window is not resizable */
+    if ((window->flags & SDL_WINDOW_RESIZABLE) && [nswindow isZoomed]) {
+        window->flags |= SDL_WINDOW_MAXIMIZED;
+    } else {
+        window->flags &= ~SDL_WINDOW_MAXIMIZED;
+    }
+
+    if ([nswindow isMiniaturized]) {
+        window->flags |= SDL_WINDOW_MINIMIZED;
+    } else {
+        window->flags &= ~SDL_WINDOW_MINIMIZED;
+    }
+
+    if ([nswindow isKeyWindow]) {
+        window->flags |= SDL_WINDOW_INPUT_FOCUS;
+        SDL_SetKeyboardFocus(data->window);
+    }
+
+    /* Prevents the window's "window device" from being destroyed when it is
+     * hidden. See http://www.mikeash.com/pyblog/nsopenglcontext-and-one-shot.html
+     */
+    [nswindow setOneShot:NO];
+
+    /* All done! */
+    [pool release];
+    window->driverdata = data;
+    return 0;
+}
+
+int
+Cocoa_CreateWindow(_THIS, SDL_Window * window)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSWindow *nswindow;
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    NSRect rect;
+    SDL_Rect bounds;
+    unsigned int style;
+
+    Cocoa_GetDisplayBounds(_this, display, &bounds);
+    rect.origin.x = window->x;
+    rect.origin.y = window->y;
+    rect.size.width = window->w;
+    rect.size.height = window->h;
+    ConvertNSRect(&rect);
+
+    style = GetWindowStyle(window);
+
+    /* Figure out which screen to place this window */
+    NSArray *screens = [NSScreen screens];
+    NSScreen *screen = nil;
+    NSScreen *candidate;
+    int i, count = [screens count];
+    for (i = 0; i < count; ++i) {
+        candidate = [screens objectAtIndex:i];
+        NSRect screenRect = [candidate frame];
+        if (rect.origin.x >= screenRect.origin.x &&
+            rect.origin.x < screenRect.origin.x + screenRect.size.width &&
+            rect.origin.y >= screenRect.origin.y &&
+            rect.origin.y < screenRect.origin.y + screenRect.size.height) {
+            screen = candidate;
+            rect.origin.x -= screenRect.origin.x;
+            rect.origin.y -= screenRect.origin.y;
+        }
+    }
+
+    @try {
+        nswindow = [[SDLWindow alloc] initWithContentRect:rect styleMask:style backing:NSBackingStoreBuffered defer:NO screen:screen];
+    }
+    @catch (NSException *e) {
+        SDL_SetError("%s", [[e reason] UTF8String]);
+        [pool release];
+        return -1;
+    }
+    [nswindow setBackgroundColor:[NSColor blackColor]];
+
+    if (videodata->allow_spaces) {
+        SDL_assert(videodata->osversion >= 0x1070);
+        SDL_assert([nswindow respondsToSelector:@selector(toggleFullScreen:)]);
+        /* we put FULLSCREEN_DESKTOP windows in their own Space, without a toggle button or menubar, later */
+        if (window->flags & SDL_WINDOW_RESIZABLE) {
+            /* resizable windows are Spaces-friendly: they get the "go fullscreen" toggle button on their titlebar. */
+            [nswindow setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+        }
+    }
+
+    /* Create a default view for this window */
+    rect = [nswindow contentRectForFrameRect:[nswindow frame]];
+    NSView *contentView = [[SDLView alloc] initWithFrame:rect];
+
+    if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
+        if ([contentView respondsToSelector:@selector(setWantsBestResolutionOpenGLSurface:)]) {
+            [contentView setWantsBestResolutionOpenGLSurface:YES];
+        }
+    }
+
+    [nswindow setContentView: contentView];
+    [contentView release];
+
+    [pool release];
+
+    if (SetupWindowData(_this, window, nswindow, SDL_TRUE) < 0) {
+        [nswindow release];
+        return -1;
+    }
+    return 0;
+}
+
+int
+Cocoa_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
+{
+    NSAutoreleasePool *pool;
+    NSWindow *nswindow = (NSWindow *) data;
+    NSString *title;
+
+    pool = [[NSAutoreleasePool alloc] init];
+
+    /* Query the title from the existing window */
+    title = [nswindow title];
+    if (title) {
+        window->title = SDL_strdup([title UTF8String]);
+    }
+
+    [pool release];
+
+    return SetupWindowData(_this, window, nswindow, SDL_FALSE);
+}
+
+void
+Cocoa_SetWindowTitle(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
+    NSString *string;
+
+    if(window->title) {
+        string = [[NSString alloc] initWithUTF8String:window->title];
+    } else {
+        string = [[NSString alloc] init];
+    }
+    [nswindow setTitle:string];
+    [string release];
+
+    [pool release];
+}
+
+void
+Cocoa_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSImage *nsimage = Cocoa_CreateImage(icon);
+
+    if (nsimage) {
+        [NSApp setApplicationIconImage:nsimage];
+    }
+
+    [pool release];
+}
+
+void
+Cocoa_SetWindowPosition(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *windata = (SDL_WindowData *) window->driverdata;
+    NSWindow *nswindow = windata->nswindow;
+    NSRect rect;
+    Uint32 moveHack;
+
+    rect.origin.x = window->x;
+    rect.origin.y = window->y;
+    rect.size.width = window->w;
+    rect.size.height = window->h;
+    ConvertNSRect(&rect);
+
+    moveHack = s_moveHack;
+    s_moveHack = 0;
+    [nswindow setFrameOrigin:rect.origin];
+    s_moveHack = moveHack;
+
+    ScheduleContextUpdates(windata);
+
+    [pool release];
+}
+
+void
+Cocoa_SetWindowSize(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *windata = (SDL_WindowData *) window->driverdata;
+    NSWindow *nswindow = windata->nswindow;
+    NSSize size;
+
+    size.width = window->w;
+    size.height = window->h;
+    [nswindow setContentSize:size];
+
+    ScheduleContextUpdates(windata);
+
+    [pool release];
+}
+
+void
+Cocoa_SetWindowMinimumSize(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *windata = (SDL_WindowData *) window->driverdata;
+
+    NSSize minSize;
+    minSize.width = window->min_w;
+    minSize.height = window->min_h;
+
+    [windata->nswindow setContentMinSize:minSize];
+
+    [pool release];
+}
+
+void
+Cocoa_SetWindowMaximumSize(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *windata = (SDL_WindowData *) window->driverdata;
+
+    NSSize maxSize;
+    maxSize.width = window->max_w;
+    maxSize.height = window->max_h;
+
+    [windata->nswindow setContentMaxSize:maxSize];
+
+    [pool release];
+}
+
+void
+Cocoa_ShowWindow(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *windowData = ((SDL_WindowData *) window->driverdata);
+    NSWindow *nswindow = windowData->nswindow;
+
+    if (![nswindow isMiniaturized]) {
+        [windowData->listener pauseVisibleObservation];
+        [nswindow makeKeyAndOrderFront:nil];
+        [windowData->listener resumeVisibleObservation];
+    }
+    [pool release];
+}
+
+void
+Cocoa_HideWindow(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
+
+    [nswindow orderOut:nil];
+    [pool release];
+}
+
+void
+Cocoa_RaiseWindow(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *windowData = ((SDL_WindowData *) window->driverdata);
+    NSWindow *nswindow = windowData->nswindow;
+
+    /* makeKeyAndOrderFront: has the side-effect of deminiaturizing and showing
+       a minimized or hidden window, so check for that before showing it.
+     */
+    [windowData->listener pauseVisibleObservation];
+    if (![nswindow isMiniaturized] && [nswindow isVisible]) {
+        [nswindow makeKeyAndOrderFront:nil];
+    }
+    [windowData->listener resumeVisibleObservation];
+
+    [pool release];
+}
+
+void
+Cocoa_MaximizeWindow(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *windata = (SDL_WindowData *) window->driverdata;
+    NSWindow *nswindow = windata->nswindow;
+
+    [nswindow zoom:nil];
+
+    ScheduleContextUpdates(windata);
+
+    [pool release];
+}
+
+void
+Cocoa_MinimizeWindow(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    NSWindow *nswindow = data->nswindow;
+
+    if ([data->listener isInFullscreenSpaceTransition]) {
+        [data->listener addPendingWindowOperation:PENDING_OPERATION_MINIMIZE];
+    } else {
+        [nswindow miniaturize:nil];
+    }
+    [pool release];
+}
+
+void
+Cocoa_RestoreWindow(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
+
+    if ([nswindow isMiniaturized]) {
+        [nswindow deminiaturize:nil];
+    } else if ((window->flags & SDL_WINDOW_RESIZABLE) && [nswindow isZoomed]) {
+        [nswindow zoom:nil];
+    }
+    [pool release];
+}
+
+static NSWindow *
+Cocoa_RebuildWindow(SDL_WindowData * data, NSWindow * nswindow, unsigned style)
+{
+    if (!data->created) {
+        /* Don't mess with other people's windows... */
+        return nswindow;
+    }
+
+    [data->listener close];
+    data->nswindow = [[SDLWindow alloc] initWithContentRect:[[nswindow contentView] frame] styleMask:style backing:NSBackingStoreBuffered defer:NO screen:[nswindow screen]];
+    [data->nswindow setContentView:[nswindow contentView]];
+    /* See comment in SetupWindowData. */
+    [data->nswindow setOneShot:NO];
+    [data->listener listen:data];
+
+    [nswindow close];
+
+    return data->nswindow;
+}
+
+void
+Cocoa_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    if (SetWindowStyle(window, GetWindowStyle(window))) {
+        if (bordered) {
+            Cocoa_SetWindowTitle(_this, window);  /* this got blanked out. */
+        }
+    }
+    [pool release];
+}
+
+
+void
+Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    NSWindow *nswindow = data->nswindow;
+    NSRect rect;
+
+    /* The view responder chain gets messed with during setStyleMask */
+    if ([[nswindow contentView] nextResponder] == data->listener) {
+        [[nswindow contentView] setNextResponder:nil];
+    }
+
+    if (fullscreen) {
+        SDL_Rect bounds;
+
+        Cocoa_GetDisplayBounds(_this, display, &bounds);
+        rect.origin.x = bounds.x;
+        rect.origin.y = bounds.y;
+        rect.size.width = bounds.w;
+        rect.size.height = bounds.h;
+        ConvertNSRect(&rect);
+
+        /* Hack to fix origin on Mac OS X 10.4 */
+        NSRect screenRect = [[nswindow screen] frame];
+        if (screenRect.size.height >= 1.0f) {
+            rect.origin.y += (screenRect.size.height - rect.size.height);
+        }
+
+        if ([nswindow respondsToSelector: @selector(setStyleMask:)]) {
+            [nswindow performSelector: @selector(setStyleMask:) withObject: (id)NSBorderlessWindowMask];
+        } else {
+            nswindow = Cocoa_RebuildWindow(data, nswindow, NSBorderlessWindowMask);
+        }
+    } else {
+        rect.origin.x = window->windowed.x;
+        rect.origin.y = window->windowed.y;
+        rect.size.width = window->windowed.w;
+        rect.size.height = window->windowed.h;
+        ConvertNSRect(&rect);
+
+        if ([nswindow respondsToSelector: @selector(setStyleMask:)]) {
+            [nswindow performSelector: @selector(setStyleMask:) withObject: (id)(uintptr_t)GetWindowStyle(window)];
+        } else {
+            nswindow = Cocoa_RebuildWindow(data, nswindow, GetWindowStyle(window));
+        }
+    }
+
+    /* The view responder chain gets messed with during setStyleMask */
+    if ([[nswindow contentView] nextResponder] != data->listener) {
+        [[nswindow contentView] setNextResponder:data->listener];
+    }
+
+    s_moveHack = 0;
+    [nswindow setContentSize:rect.size];
+    [nswindow setFrameOrigin:rect.origin];
+    s_moveHack = SDL_GetTicks();
+
+    /* When the window style changes the title is cleared */
+    if (!fullscreen) {
+        Cocoa_SetWindowTitle(_this, window);
+    }
+
+    if (SDL_ShouldAllowTopmost() && fullscreen) {
+        /* OpenGL is rendering to the window, so make it visible! */
+        [nswindow setLevel:CGShieldingWindowLevel()];
+    } else {
+        [nswindow setLevel:kCGNormalWindowLevel];
+    }
+
+    if ([nswindow isVisible] || fullscreen) {
+        [data->listener pauseVisibleObservation];
+        [nswindow makeKeyAndOrderFront:nil];
+        [data->listener resumeVisibleObservation];
+    }
+
+    ScheduleContextUpdates(data);
+
+    [pool release];
+}
+
+int
+Cocoa_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp)
+{
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    CGDirectDisplayID display_id = ((SDL_DisplayData *)display->driverdata)->display;
+    const uint32_t tableSize = 256;
+    CGGammaValue redTable[tableSize];
+    CGGammaValue greenTable[tableSize];
+    CGGammaValue blueTable[tableSize];
+    uint32_t i;
+    float inv65535 = 1.0f / 65535.0f;
+
+    /* Extract gamma values into separate tables, convert to floats between 0.0 and 1.0 */
+    for (i = 0; i < 256; i++) {
+        redTable[i] = ramp[0*256+i] * inv65535;
+        greenTable[i] = ramp[1*256+i] * inv65535;
+        blueTable[i] = ramp[2*256+i] * inv65535;
+    }
+
+    if (CGSetDisplayTransferByTable(display_id, tableSize,
+                                    redTable, greenTable, blueTable) != CGDisplayNoErr) {
+        return SDL_SetError("CGSetDisplayTransferByTable()");
+    }
+    return 0;
+}
+
+int
+Cocoa_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp)
+{
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    CGDirectDisplayID display_id = ((SDL_DisplayData *)display->driverdata)->display;
+    const uint32_t tableSize = 256;
+    CGGammaValue redTable[tableSize];
+    CGGammaValue greenTable[tableSize];
+    CGGammaValue blueTable[tableSize];
+    uint32_t i, tableCopied;
+
+    if (CGGetDisplayTransferByTable(display_id, tableSize,
+                                    redTable, greenTable, blueTable, &tableCopied) != CGDisplayNoErr) {
+        return SDL_SetError("CGGetDisplayTransferByTable()");
+    }
+
+    for (i = 0; i < tableCopied; i++) {
+        ramp[0*256+i] = (Uint16)(redTable[i] * 65535.0f);
+        ramp[1*256+i] = (Uint16)(greenTable[i] * 65535.0f);
+        ramp[2*256+i] = (Uint16)(blueTable[i] * 65535.0f);
+    }
+    return 0;
+}
+
+void
+Cocoa_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
+{
+    /* Move the cursor to the nearest point in the window */
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    if (grabbed && data && ![data->listener isMoving]) {
+        int x, y;
+        CGPoint cgpoint;
+
+        SDL_GetMouseState(&x, &y);
+        cgpoint.x = window->x + x;
+        cgpoint.y = window->y + y;
+
+        Cocoa_HandleMouseWarp(cgpoint.x, cgpoint.y);
+
+        DLog("Returning cursor to (%g, %g)", cgpoint.x, cgpoint.y);
+        CGDisplayMoveCursorToPoint(kCGDirectMainDisplay, cgpoint);
+    }
+
+    if ( window->flags & SDL_WINDOW_FULLSCREEN ) {
+        SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+        if (SDL_ShouldAllowTopmost() && (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
+            /* OpenGL is rendering to the window, so make it visible! */
+            [data->nswindow setLevel:CGShieldingWindowLevel()];
+        } else {
+            [data->nswindow setLevel:kCGNormalWindowLevel];
+        }
+    }
+}
+
+void
+Cocoa_DestroyWindow(_THIS, SDL_Window * window)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+    if (data) {
+        [data->listener close];
+        [data->listener release];
+        if (data->created) {
+            [data->nswindow close];
+        }
+
+        NSArray *contexts = [[data->nscontexts copy] autorelease];
+        for (SDLOpenGLContext *context in contexts) {
+            /* Calling setWindow:NULL causes the context to remove itself from the context list. */            
+            [context setWindow:NULL];
+        }
+        [data->nscontexts release];
+
+        SDL_free(data);
+    }
+    [pool release];
+}
+
+SDL_bool
+Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
+{
+    NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
+
+    if (info->version.major <= SDL_MAJOR_VERSION) {
+        info->subsystem = SDL_SYSWM_COCOA;
+        info->info.cocoa.window = nswindow;
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("Application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+}
+
+SDL_bool
+Cocoa_IsWindowInFullscreenSpace(SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+    if ([data->listener isInFullscreenSpace]) {
+        return SDL_TRUE;
+    } else {
+        return SDL_FALSE;
+    }
+}
+
+SDL_bool
+Cocoa_SetWindowFullscreenSpace(SDL_Window * window, SDL_bool state)
+{
+    SDL_bool succeeded = SDL_FALSE;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+    if ([data->listener setFullscreenSpace:(state ? YES : NO)]) {
+        succeeded = SDL_TRUE;
+    }
+
+    [pool release];
+
+    return succeeded;
+}
+
+#endif /* SDL_VIDEO_DRIVER_COCOA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_WM.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_WM.c
new file mode 100644
index 000000000..b48a10698
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_WM.c	
@@ -0,0 +1,413 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
+#include "SDL_DirectFB_video.h"
+#include "SDL_DirectFB_window.h"
+
+#include "../../events/SDL_windowevents_c.h"
+
+#define COLOR_EXPAND(col) col.r, col.g, col.b, col.a
+
+static DFB_Theme theme_std = {
+    4, 4, 8, 8,
+    {255, 200, 200, 200},
+    24,
+    {255, 0, 0, 255},
+    16,
+    {255, 255, 255, 255},
+    "/usr/share/fonts/truetype/freefont/FreeSans.ttf",
+    {255, 255, 0, 0},
+    {255, 255, 255, 0},
+};
+
+static DFB_Theme theme_none = {
+    0, 0, 0, 0,
+    {0, 0, 0, 0},
+    0,
+    {0, 0, 0, 0},
+    0,
+    {0, 0, 0, 0},
+    NULL
+};
+
+static void
+DrawTriangle(IDirectFBSurface * s, int down, int x, int y, int w)
+{
+    int x1, x2, x3;
+    int y1, y2, y3;
+
+    if (down) {
+        x1 = x + w / 2;
+        x2 = x;
+        x3 = x + w;
+        y1 = y + w;
+        y2 = y;
+        y3 = y;
+    } else {
+        x1 = x + w / 2;
+        x2 = x;
+        x3 = x + w;
+        y1 = y;
+        y2 = y + w;
+        y3 = y + w;
+    }
+    s->FillTriangle(s, x1, y1, x2, y2, x3, y3);
+}
+
+static void
+LoadFont(_THIS, SDL_Window * window)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    SDL_DFB_WINDOWDATA(window);
+
+    if (windata->font != NULL) {
+        SDL_DFB_RELEASE(windata->font);
+        windata->font = NULL;
+        SDL_DFB_CHECK(windata->window_surface->SetFont(windata->window_surface, windata->font));
+    }
+
+    if (windata->theme.font != NULL)
+    {
+        DFBFontDescription fdesc;
+
+        SDL_zero(fdesc);
+        fdesc.flags = DFDESC_HEIGHT;
+        fdesc.height = windata->theme.font_size;
+        SDL_DFB_CHECK(devdata->
+                      dfb->CreateFont(devdata->dfb, windata->theme.font,
+                                      &fdesc, &windata->font));
+        SDL_DFB_CHECK(windata->window_surface->SetFont(windata->window_surface, windata->font));
+    }
+}
+
+static void
+DrawCraption(_THIS, IDirectFBSurface * s, int x, int y, char *text)
+{
+    DFBSurfaceTextFlags flags;
+
+    flags = DSTF_CENTER | DSTF_TOP;
+
+    s->DrawString(s, text, -1, x, y, flags);
+}
+
+void
+DirectFB_WM_RedrawLayout(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+    IDirectFBSurface *s = windata->window_surface;
+    DFB_Theme *t = &windata->theme;
+    int i;
+    int d = (t->caption_size - t->font_size) / 2;
+    int x, y, w;
+
+
+    if (!windata->is_managed || (window->flags & SDL_WINDOW_FULLSCREEN))
+        return;
+
+    SDL_DFB_CHECK(s->SetSrcBlendFunction(s, DSBF_ONE));
+    SDL_DFB_CHECK(s->SetDstBlendFunction(s, DSBF_ZERO));
+    SDL_DFB_CHECK(s->SetDrawingFlags(s, DSDRAW_NOFX));
+    SDL_DFB_CHECK(s->SetBlittingFlags(s, DSBLIT_NOFX));
+
+    LoadFont(_this, window);
+    /* s->SetDrawingFlags(s, DSDRAW_BLEND); */
+    s->SetColor(s, COLOR_EXPAND(t->frame_color));
+    /* top */
+    for (i = 0; i < t->top_size; i++)
+        s->DrawLine(s, 0, i, windata->size.w, i);
+    /* bottom */
+    for (i = windata->size.h - t->bottom_size; i < windata->size.h; i++)
+        s->DrawLine(s, 0, i, windata->size.w, i);
+    /* left */
+    for (i = 0; i < t->left_size; i++)
+        s->DrawLine(s, i, 0, i, windata->size.h);
+    /* right */
+    for (i = windata->size.w - t->right_size; i < windata->size.w; i++)
+        s->DrawLine(s, i, 0, i, windata->size.h);
+    /* Caption */
+    s->SetColor(s, COLOR_EXPAND(t->caption_color));
+    s->FillRectangle(s, t->left_size, t->top_size, windata->client.w,
+                     t->caption_size);
+    /* Close Button */
+    w = t->caption_size;
+    x = windata->size.w - t->right_size - w + d;
+    y = t->top_size + d;
+    s->SetColor(s, COLOR_EXPAND(t->close_color));
+    DrawTriangle(s, 1, x, y, w - 2 * d);
+    /* Max Button */
+    s->SetColor(s, COLOR_EXPAND(t->max_color));
+    DrawTriangle(s, window->flags & SDL_WINDOW_MAXIMIZED ? 1 : 0, x - w,
+               y, w - 2 * d);
+
+    /* Caption */
+    if (window->title) {
+        s->SetColor(s, COLOR_EXPAND(t->font_color));
+        DrawCraption(_this, s, (x - w) / 2, t->top_size + d, window->title);
+    }
+    /* Icon */
+    if (windata->icon) {
+        DFBRectangle dr;
+
+        dr.x = t->left_size + d;
+        dr.y = t->top_size + d;
+        dr.w = w - 2 * d;
+        dr.h = w - 2 * d;
+        s->SetBlittingFlags(s, DSBLIT_BLEND_ALPHACHANNEL);
+
+        s->StretchBlit(s, windata->icon, NULL, &dr);
+    }
+    windata->wm_needs_redraw = 0;
+}
+
+DFBResult
+DirectFB_WM_GetClientSize(_THIS, SDL_Window * window, int *cw, int *ch)
+{
+    SDL_DFB_WINDOWDATA(window);
+    IDirectFBWindow *dfbwin = windata->dfbwin;
+
+    SDL_DFB_CHECK(dfbwin->GetSize(dfbwin, cw, ch));
+    dfbwin->GetSize(dfbwin, cw, ch);
+    *cw -= windata->theme.left_size + windata->theme.right_size;
+    *ch -=
+        windata->theme.top_size + windata->theme.caption_size +
+        windata->theme.bottom_size;
+    return DFB_OK;
+}
+
+void
+DirectFB_WM_AdjustWindowLayout(SDL_Window * window, int flags, int w, int h)
+{
+    SDL_DFB_WINDOWDATA(window);
+
+    if (!windata->is_managed)
+        windata->theme = theme_none;
+    else if (flags & SDL_WINDOW_BORDERLESS)
+        /* desc.caps |= DWCAPS_NODECORATION;) */
+        windata->theme = theme_none;
+    else if (flags & SDL_WINDOW_FULLSCREEN) {
+        windata->theme = theme_none;
+    } else if (flags & SDL_WINDOW_MAXIMIZED) {
+        windata->theme = theme_std;
+        windata->theme.left_size = 0;
+        windata->theme.right_size = 0;
+        windata->theme.top_size = 0;
+        windata->theme.bottom_size = 0;
+    } else {
+        windata->theme = theme_std;
+    }
+
+    windata->client.x = windata->theme.left_size;
+    windata->client.y = windata->theme.top_size + windata->theme.caption_size;
+    windata->client.w = w;
+    windata->client.h = h;
+    windata->size.w =
+        w + windata->theme.left_size + windata->theme.right_size;
+    windata->size.h =
+        h + windata->theme.top_size +
+        windata->theme.caption_size + windata->theme.bottom_size;
+}
+
+
+enum
+{
+    WM_POS_NONE = 0x00,
+    WM_POS_CAPTION = 0x01,
+    WM_POS_CLOSE = 0x02,
+    WM_POS_MAX = 0x04,
+    WM_POS_LEFT = 0x08,
+    WM_POS_RIGHT = 0x10,
+    WM_POS_TOP = 0x20,
+    WM_POS_BOTTOM = 0x40,
+};
+
+static int
+WMIsClient(DFB_WindowData * p, int x, int y)
+{
+    x -= p->client.x;
+    y -= p->client.y;
+    if (x < 0 || y < 0)
+        return 0;
+    if (x >= p->client.w || y >= p->client.h)
+        return 0;
+    return 1;
+}
+
+static int
+WMPos(DFB_WindowData * p, int x, int y)
+{
+    int pos = WM_POS_NONE;
+
+    if (!WMIsClient(p, x, y)) {
+        if (y < p->theme.top_size) {
+            pos |= WM_POS_TOP;
+        } else if (y < p->client.y) {
+            if (x <
+                p->size.w - p->theme.right_size - 2 * p->theme.caption_size) {
+                pos |= WM_POS_CAPTION;
+            } else if (x <
+                       p->size.w - p->theme.right_size -
+                       p->theme.caption_size) {
+                pos |= WM_POS_MAX;
+            } else {
+                pos |= WM_POS_CLOSE;
+            }
+        } else if (y >= p->size.h - p->theme.bottom_size) {
+            pos |= WM_POS_BOTTOM;
+        }
+        if (x < p->theme.left_size) {
+            pos |= WM_POS_LEFT;
+        } else if (x >= p->size.w - p->theme.right_size) {
+            pos |= WM_POS_RIGHT;
+        }
+    }
+    return pos;
+}
+
+int
+DirectFB_WM_ProcessEvent(_THIS, SDL_Window * window, DFBWindowEvent * evt)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    SDL_DFB_WINDOWDATA(window);
+    DFB_WindowData *gwindata = ((devdata->grabbed_window) ? (DFB_WindowData *) ((devdata->grabbed_window)->driverdata) : NULL);
+    IDirectFBWindow *dfbwin = windata->dfbwin;
+    DFBWindowOptions wopts;
+
+    if (!windata->is_managed)
+        return 0;
+
+    SDL_DFB_CHECK(dfbwin->GetOptions(dfbwin, &wopts));
+
+    switch (evt->type) {
+    case DWET_BUTTONDOWN:
+        if (evt->buttons & DIBM_LEFT) {
+            int pos = WMPos(windata, evt->x, evt->y);
+            switch (pos) {
+            case WM_POS_NONE:
+                return 0;
+            case WM_POS_CLOSE:
+                windata->wm_grab = WM_POS_NONE;
+                SDL_SendWindowEvent(window, SDL_WINDOWEVENT_CLOSE, 0,
+                                    0);
+                return 1;
+            case WM_POS_MAX:
+                windata->wm_grab = WM_POS_NONE;
+                if (window->flags & SDL_WINDOW_MAXIMIZED) {
+                    SDL_RestoreWindow(window);
+                } else {
+                    SDL_MaximizeWindow(window);
+                }
+                return 1;
+            case WM_POS_CAPTION:
+                if (!(wopts & DWOP_KEEP_STACKING)) {
+                    DirectFB_RaiseWindow(_this, window);
+                }
+                if (window->flags & SDL_WINDOW_MAXIMIZED)
+                    return 1;
+                /* fall through */
+            default:
+                windata->wm_grab = pos;
+                if (gwindata != NULL)
+                    SDL_DFB_CHECK(gwindata->dfbwin->UngrabPointer(gwindata->dfbwin));
+                SDL_DFB_CHECK(dfbwin->GrabPointer(dfbwin));
+                windata->wm_lastx = evt->cx;
+                windata->wm_lasty = evt->cy;
+            }
+        }
+        return 1;
+    case DWET_BUTTONUP:
+        if (!windata->wm_grab)
+            return 0;
+        if (!(evt->buttons & DIBM_LEFT)) {
+            if (windata->wm_grab & (WM_POS_RIGHT | WM_POS_BOTTOM)) {
+                int dx = evt->cx - windata->wm_lastx;
+                int dy = evt->cy - windata->wm_lasty;
+
+                if (!(wopts & DWOP_KEEP_SIZE)) {
+                    int cw, ch;
+                    if ((windata->wm_grab & (WM_POS_BOTTOM | WM_POS_RIGHT)) == WM_POS_BOTTOM)
+                        dx = 0;
+                    else if ((windata->wm_grab & (WM_POS_BOTTOM | WM_POS_RIGHT)) == WM_POS_RIGHT)
+                        dy = 0;
+                    SDL_DFB_CHECK(dfbwin->GetSize(dfbwin, &cw, &ch));
+
+                    /* necessary to trigger an event - ugly */
+                    SDL_DFB_CHECK(dfbwin->DisableEvents(dfbwin, DWET_ALL));
+                    SDL_DFB_CHECK(dfbwin->Resize(dfbwin, cw + dx + 1, ch + dy));
+                    SDL_DFB_CHECK(dfbwin->EnableEvents(dfbwin, DWET_ALL));
+
+                    SDL_DFB_CHECK(dfbwin->Resize(dfbwin, cw + dx, ch + dy));
+                }
+            }
+            SDL_DFB_CHECK(dfbwin->UngrabPointer(dfbwin));
+            if (gwindata != NULL)
+                SDL_DFB_CHECK(gwindata->dfbwin->GrabPointer(gwindata->dfbwin));
+            windata->wm_grab = WM_POS_NONE;
+            return 1;
+        }
+        break;
+    case DWET_MOTION:
+        if (!windata->wm_grab)
+            return 0;
+        if (evt->buttons & DIBM_LEFT) {
+            int dx = evt->cx - windata->wm_lastx;
+            int dy = evt->cy - windata->wm_lasty;
+
+            if (windata->wm_grab & WM_POS_CAPTION) {
+                if (!(wopts & DWOP_KEEP_POSITION))
+                    SDL_DFB_CHECK(dfbwin->Move(dfbwin, dx, dy));
+            }
+            if (windata->wm_grab & (WM_POS_RIGHT | WM_POS_BOTTOM)) {
+                if (!(wopts & DWOP_KEEP_SIZE)) {
+                    int cw, ch;
+
+                    /* Make sure all events are disabled for this operation ! */
+                    SDL_DFB_CHECK(dfbwin->DisableEvents(dfbwin, DWET_ALL));
+
+                    if ((windata->wm_grab & (WM_POS_BOTTOM | WM_POS_RIGHT)) == WM_POS_BOTTOM)
+                        dx = 0;
+                    else if ((windata->wm_grab & (WM_POS_BOTTOM | WM_POS_RIGHT)) == WM_POS_RIGHT)
+                        dy = 0;
+
+                    SDL_DFB_CHECK(dfbwin->GetSize(dfbwin, &cw, &ch));
+                    SDL_DFB_CHECK(dfbwin->Resize(dfbwin, cw + dx, ch + dy));
+
+                    SDL_DFB_CHECK(dfbwin->EnableEvents(dfbwin, DWET_ALL));
+                }
+            }
+            windata->wm_lastx = evt->cx;
+            windata->wm_lasty = evt->cy;
+            return 1;
+        }
+        break;
+    case DWET_KEYDOWN:
+        break;
+    case DWET_KEYUP:
+        break;
+    default:
+        ;
+    }
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_WM.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_WM.h
new file mode 100644
index 000000000..0bfe07e0d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_WM.h	
@@ -0,0 +1,56 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_directfb_wm_h
+#define _SDL_directfb_wm_h
+
+#include "SDL_DirectFB_video.h"
+
+typedef struct _DFB_Theme DFB_Theme;
+struct _DFB_Theme
+{
+    int left_size;
+    int right_size;
+    int top_size;
+    int bottom_size;
+    DFBColor frame_color;
+    int caption_size;
+    DFBColor caption_color;
+    int font_size;
+    DFBColor font_color;
+    char *font;
+    DFBColor close_color;
+    DFBColor max_color;
+};
+
+extern void DirectFB_WM_AdjustWindowLayout(SDL_Window * window, int flags, int w, int h);
+extern void DirectFB_WM_RedrawLayout(_THIS, SDL_Window * window);
+
+extern int DirectFB_WM_ProcessEvent(_THIS, SDL_Window * window,
+                                    DFBWindowEvent * evt);
+
+extern DFBResult DirectFB_WM_GetClientSize(_THIS, SDL_Window * window,
+                                           int *cw, int *ch);
+
+
+#endif /* _SDL_directfb_wm_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_dyn.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_dyn.c
new file mode 100644
index 000000000..49c737b04
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_dyn.c	
@@ -0,0 +1,117 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
+#include "SDL_DirectFB_video.h"
+#include "SDL_DirectFB_dyn.h"
+
+#ifdef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC
+#include "SDL_name.h"
+#include "SDL_loadso.h"
+
+#define DFB_SYM(ret, name, args, al, func) ret (*name) args;
+static struct _SDL_DirectFB_Symbols
+{
+    DFB_SYMS
+    const unsigned int *directfb_major_version;
+    const unsigned int *directfb_minor_version;
+    const unsigned int *directfb_micro_version;
+} SDL_DirectFB_Symbols;
+#undef DFB_SYM
+
+#define DFB_SYM(ret, name, args, al, func) ret name args { func SDL_DirectFB_Symbols.name al  ; }
+DFB_SYMS
+#undef DFB_SYM
+
+static void *handle = NULL;
+
+int
+SDL_DirectFB_LoadLibrary(void)
+{
+    int retval = 0;
+
+    if (handle == NULL) {
+        handle = SDL_LoadObject(SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC);
+        if (handle != NULL) {
+            retval = 1;
+#define DFB_SYM(ret, name, args, al, func) if (!(SDL_DirectFB_Symbols.name = SDL_LoadFunction(handle, # name))) retval = 0;
+            DFB_SYMS
+#undef DFB_SYM
+            if (!
+                    (SDL_DirectFB_Symbols.directfb_major_version =
+                     SDL_LoadFunction(handle, "directfb_major_version")))
+                retval = 0;
+            if (!
+                (SDL_DirectFB_Symbols.directfb_minor_version =
+                 SDL_LoadFunction(handle, "directfb_minor_version")))
+                retval = 0;
+            if (!
+                (SDL_DirectFB_Symbols.directfb_micro_version =
+                 SDL_LoadFunction(handle, "directfb_micro_version")))
+                retval = 0;
+        }
+    }
+    if (retval) {
+        const char *stemp = DirectFBCheckVersion(DIRECTFB_MAJOR_VERSION,
+                                                 DIRECTFB_MINOR_VERSION,
+                                                 DIRECTFB_MICRO_VERSION);
+        /* Version Check */
+        if (stemp != NULL) {
+            fprintf(stderr,
+                    "DirectFB Lib: Version mismatch. Compiled: %d.%d.%d Library %d.%d.%d\n",
+                    DIRECTFB_MAJOR_VERSION, DIRECTFB_MINOR_VERSION,
+                    DIRECTFB_MICRO_VERSION,
+                    *SDL_DirectFB_Symbols.directfb_major_version,
+                    *SDL_DirectFB_Symbols.directfb_minor_version,
+                    *SDL_DirectFB_Symbols.directfb_micro_version);
+            retval = 0;
+        }
+    }
+    if (!retval)
+        SDL_DirectFB_UnLoadLibrary();
+    return retval;
+}
+
+void
+SDL_DirectFB_UnLoadLibrary(void)
+{
+    if (handle != NULL) {
+        SDL_UnloadObject(handle);
+        handle = NULL;
+    }
+}
+
+#else
+int
+SDL_DirectFB_LoadLibrary(void)
+{
+    return 1;
+}
+
+void
+SDL_DirectFB_UnLoadLibrary(void)
+{
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_dyn.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_dyn.h
new file mode 100644
index 000000000..ba57f4533
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_dyn.h	
@@ -0,0 +1,39 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_DirectFB_dyn_h
+#define _SDL_DirectFB_dyn_h
+
+#define DFB_SYMS \
+    DFB_SYM(DFBResult, DirectFBError, (const char *msg, DFBResult result), (msg, result), return) \
+    DFB_SYM(DFBResult, DirectFBErrorFatal, (const char *msg, DFBResult result), (msg, result), return) \
+    DFB_SYM(const char *, DirectFBErrorString, (DFBResult result), (result), return) \
+    DFB_SYM(const char *, DirectFBUsageString, ( void ), (), return) \
+    DFB_SYM(DFBResult, DirectFBInit, (int *argc, char *(*argv[]) ), (argc, argv), return) \
+    DFB_SYM(DFBResult, DirectFBSetOption, (const char *name, const char *value), (name, value), return) \
+    DFB_SYM(DFBResult, DirectFBCreate, (IDirectFB **interface), (interface), return) \
+    DFB_SYM(const char *, DirectFBCheckVersion, (unsigned int required_major, unsigned int required_minor, unsigned int required_micro), \
+                (required_major, required_minor, required_micro), return)
+
+int SDL_DirectFB_LoadLibrary(void);
+void SDL_DirectFB_UnLoadLibrary(void);
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_events.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_events.c
new file mode 100644
index 000000000..9c6c79407
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_events.c	
@@ -0,0 +1,751 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
+/* Handle the event stream, converting DirectFB input events into SDL events */
+
+#include "SDL_DirectFB_video.h"
+#include "SDL_DirectFB_window.h"
+#include "SDL_DirectFB_modes.h"
+
+#include "SDL_syswm.h"
+
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_windowevents_c.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/scancodes_linux.h"
+#include "../../events/scancodes_xfree86.h"
+
+#include "SDL_DirectFB_events.h"
+
+#if USE_MULTI_API
+#define SDL_SendMouseMotion_ex(w, id, relative, x, y, p) SDL_SendMouseMotion(w, id, relative, x, y, p)
+#define SDL_SendMouseButton_ex(w, id, state, button) SDL_SendMouseButton(w, id, state, button)
+#define SDL_SendKeyboardKey_ex(id, state, scancode) SDL_SendKeyboardKey(id, state, scancode)
+#define SDL_SendKeyboardText_ex(id, text) SDL_SendKeyboardText(id, text)
+#else
+#define SDL_SendMouseMotion_ex(w, id, relative, x, y, p) SDL_SendMouseMotion(w, id, relative, x, y)
+#define SDL_SendMouseButton_ex(w, id, state, button) SDL_SendMouseButton(w, id, state, button)
+#define SDL_SendKeyboardKey_ex(id, state, scancode) SDL_SendKeyboardKey(state, scancode)
+#define SDL_SendKeyboardText_ex(id, text) SDL_SendKeyboardText(text)
+#endif
+
+typedef struct _cb_data cb_data;
+struct _cb_data
+{
+    DFB_DeviceData *devdata;
+    int sys_ids;
+    int sys_kbd;
+};
+
+/* The translation tables from a DirectFB keycode to a SDL keysym */
+static SDL_Scancode oskeymap[256];
+
+
+static SDL_Keysym *DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt,
+                                         SDL_Keysym * keysym, Uint32 *unicode);
+static SDL_Keysym *DirectFB_TranslateKeyInputEvent(_THIS, DFBInputEvent * evt,
+                                                   SDL_Keysym * keysym, Uint32 *unicode);
+
+static void DirectFB_InitOSKeymap(_THIS, SDL_Scancode * keypmap, int numkeys);
+static int DirectFB_TranslateButton(DFBInputDeviceButtonIdentifier button);
+
+static void UnicodeToUtf8( Uint16 w , char *utf8buf)
+{
+        unsigned char *utf8s = (unsigned char *) utf8buf;
+
+    if ( w < 0x0080 ) {
+        utf8s[0] = ( unsigned char ) w;
+        utf8s[1] = 0;
+    }
+    else if ( w < 0x0800 ) {
+        utf8s[0] = 0xc0 | (( w ) >> 6 );
+        utf8s[1] = 0x80 | (( w ) & 0x3f );
+        utf8s[2] = 0;
+    }
+    else {
+        utf8s[0] = 0xe0 | (( w ) >> 12 );
+        utf8s[1] = 0x80 | (( ( w ) >> 6 ) & 0x3f );
+        utf8s[2] = 0x80 | (( w ) & 0x3f );
+        utf8s[3] = 0;
+    }
+}
+
+static void
+FocusAllMice(_THIS, SDL_Window *window)
+{
+#if USE_MULTI_API
+    SDL_DFB_DEVICEDATA(_this);
+    int index;
+
+    for (index = 0; index < devdata->num_mice; index++)
+        SDL_SetMouseFocus(devdata->mouse_id[index], id);
+#else
+    SDL_SetMouseFocus(window);
+#endif
+}
+
+
+static void
+FocusAllKeyboards(_THIS, SDL_Window *window)
+{
+#if USE_MULTI_API
+    SDL_DFB_DEVICEDATA(_this);
+    int index;
+
+    for (index = 0; index < devdata->num_keyboard; index++)
+        SDL_SetKeyboardFocus(index, id);
+#else
+    SDL_SetKeyboardFocus(window);
+#endif
+}
+
+static void
+MotionAllMice(_THIS, int x, int y)
+{
+#if USE_MULTI_API
+    SDL_DFB_DEVICEDATA(_this);
+    int index;
+
+    for (index = 0; index < devdata->num_mice; index++) {
+        SDL_Mouse *mouse = SDL_GetMouse(index);
+        mouse->x = mouse->last_x = x;
+        mouse->y = mouse->last_y = y;
+        /* SDL_SendMouseMotion(devdata->mouse_id[index], 0, x, y, 0); */
+    }
+#endif
+}
+
+static int
+KbdIndex(_THIS, int id)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    int index;
+
+    for (index = 0; index < devdata->num_keyboard; index++) {
+        if (devdata->keyboard[index].id == id)
+            return index;
+    }
+    return -1;
+}
+
+static int
+ClientXY(DFB_WindowData * p, int *x, int *y)
+{
+    int cx, cy;
+
+    cx = *x;
+    cy = *y;
+
+    cx -= p->client.x;
+    cy -= p->client.y;
+
+    if (cx < 0 || cy < 0)
+        return 0;
+    if (cx >= p->client.w || cy >= p->client.h)
+        return 0;
+    *x = cx;
+    *y = cy;
+    return 1;
+}
+
+static void
+ProcessWindowEvent(_THIS, SDL_Window *sdlwin, DFBWindowEvent * evt)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    SDL_DFB_WINDOWDATA(sdlwin);
+    SDL_Keysym keysym;
+    Uint32 unicode;
+    char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
+
+    if (evt->clazz == DFEC_WINDOW) {
+        switch (evt->type) {
+        case DWET_BUTTONDOWN:
+            if (ClientXY(windata, &evt->x, &evt->y)) {
+                if (!devdata->use_linux_input) {
+                    SDL_SendMouseMotion_ex(sdlwin, devdata->mouse_id[0], 0, evt->x,
+                                        evt->y, 0);
+                    SDL_SendMouseButton_ex(sdlwin, devdata->mouse_id[0],
+                                        SDL_PRESSED,
+                                        DirectFB_TranslateButton
+                                        (evt->button));
+                } else {
+                    MotionAllMice(_this, evt->x, evt->y);
+                }
+            }
+            break;
+        case DWET_BUTTONUP:
+            if (ClientXY(windata, &evt->x, &evt->y)) {
+                if (!devdata->use_linux_input) {
+                    SDL_SendMouseMotion_ex(sdlwin, devdata->mouse_id[0], 0, evt->x,
+                                        evt->y, 0);
+                    SDL_SendMouseButton_ex(sdlwin, devdata->mouse_id[0],
+                                        SDL_RELEASED,
+                                        DirectFB_TranslateButton
+                                        (evt->button));
+                } else {
+                    MotionAllMice(_this, evt->x, evt->y);
+                }
+            }
+            break;
+        case DWET_MOTION:
+            if (ClientXY(windata, &evt->x, &evt->y)) {
+                if (!devdata->use_linux_input) {
+                    if (!(sdlwin->flags & SDL_WINDOW_INPUT_GRABBED))
+                        SDL_SendMouseMotion_ex(sdlwin, devdata->mouse_id[0], 0,
+                                            evt->x, evt->y, 0);
+                } else {
+                    /* relative movements are not exact!
+                     * This code should limit the number of events sent.
+                     * However it kills MAME axis recognition ... */
+                    static int cnt = 0;
+                    if (1 && ++cnt > 20) {
+                        MotionAllMice(_this, evt->x, evt->y);
+                        cnt = 0;
+                    }
+                }
+                if (!(sdlwin->flags & SDL_WINDOW_MOUSE_FOCUS))
+                    SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_ENTER, 0,
+                                        0);
+            }
+            break;
+        case DWET_KEYDOWN:
+            if (!devdata->use_linux_input) {
+                DirectFB_TranslateKey(_this, evt, &keysym, &unicode);
+                /* printf("Scancode %d  %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
+                SDL_SendKeyboardKey_ex(0, SDL_PRESSED, keysym.scancode);
+                if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
+                    SDL_zero(text);
+                    UnicodeToUtf8(unicode, text);
+                    if (*text) {
+                        SDL_SendKeyboardText_ex(0, text);
+                    }
+                }
+            }
+            break;
+        case DWET_KEYUP:
+            if (!devdata->use_linux_input) {
+                DirectFB_TranslateKey(_this, evt, &keysym, &unicode);
+                SDL_SendKeyboardKey_ex(0, SDL_RELEASED, keysym.scancode);
+            }
+            break;
+        case DWET_POSITION:
+            if (ClientXY(windata, &evt->x, &evt->y)) {
+                SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_MOVED,
+                                    evt->x, evt->y);
+            }
+            break;
+        case DWET_POSITION_SIZE:
+            if (ClientXY(windata, &evt->x, &evt->y)) {
+                SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_MOVED,
+                                    evt->x, evt->y);
+            }
+            /* fall throught */
+        case DWET_SIZE:
+            /* FIXME: what about < 0 */
+            evt->w -= (windata->theme.right_size + windata->theme.left_size);
+            evt->h -=
+                (windata->theme.top_size + windata->theme.bottom_size +
+                 windata->theme.caption_size);
+            SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_RESIZED,
+                                evt->w, evt->h);
+            break;
+        case DWET_CLOSE:
+            SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_CLOSE, 0, 0);
+            break;
+        case DWET_GOTFOCUS:
+            DirectFB_SetContext(_this, sdlwin);
+            FocusAllKeyboards(_this, sdlwin);
+            SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_FOCUS_GAINED,
+                                0, 0);
+            break;
+        case DWET_LOSTFOCUS:
+            SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0);
+            FocusAllKeyboards(_this, 0);
+            break;
+        case DWET_ENTER:
+            /* SDL_DirectFB_ReshowCursor(_this, 0); */
+            FocusAllMice(_this, sdlwin);
+            /* FIXME: when do we really enter ? */
+            if (ClientXY(windata, &evt->x, &evt->y))
+                MotionAllMice(_this, evt->x, evt->y);
+            SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_ENTER, 0, 0);
+            break;
+        case DWET_LEAVE:
+            SDL_SendWindowEvent(sdlwin, SDL_WINDOWEVENT_LEAVE, 0, 0);
+            FocusAllMice(_this, 0);
+            /* SDL_DirectFB_ReshowCursor(_this, 1); */
+            break;
+        default:
+            ;
+        }
+    } else
+        printf("Event Clazz %d\n", evt->clazz);
+}
+
+static void
+ProcessInputEvent(_THIS, DFBInputEvent * ievt)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    SDL_Keysym keysym;
+    int kbd_idx;
+    Uint32 unicode;
+    char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
+
+    if (!devdata->use_linux_input) {
+        if (ievt->type == DIET_AXISMOTION) {
+            if ((devdata->grabbed_window != NULL) && (ievt->flags & DIEF_AXISREL)) {
+                if (ievt->axis == DIAI_X)
+                    SDL_SendMouseMotion_ex(devdata->grabbed_window, ievt->device_id, 1,
+                                        ievt->axisrel, 0, 0);
+                else if (ievt->axis == DIAI_Y)
+                    SDL_SendMouseMotion_ex(devdata->grabbed_window, ievt->device_id, 1, 0,
+                                        ievt->axisrel, 0);
+            }
+        }
+    } else {
+        static int last_x, last_y;
+
+        switch (ievt->type) {
+        case DIET_AXISMOTION:
+            if (ievt->flags & DIEF_AXISABS) {
+                if (ievt->axis == DIAI_X)
+                    last_x = ievt->axisabs;
+                else if (ievt->axis == DIAI_Y)
+                    last_y = ievt->axisabs;
+                if (!(ievt->flags & DIEF_FOLLOW)) {
+#if USE_MULTI_API
+                    SDL_Mouse *mouse = SDL_GetMouse(ievt->device_id);
+                    SDL_Window *window = SDL_GetWindowFromID(mouse->focus);
+#else
+                    SDL_Window *window = devdata->grabbed_window;
+#endif
+                    if (window) {
+                        DFB_WindowData *windata =
+                            (DFB_WindowData *) window->driverdata;
+                        int x, y;
+
+                        windata->dfbwin->GetPosition(windata->dfbwin, &x, &y);
+                        SDL_SendMouseMotion_ex(window, ievt->device_id, 0,
+                                            last_x - (x +
+                                                      windata->client.x),
+                                            last_y - (y +
+                                                      windata->client.y), 0);
+                    } else {
+                        SDL_SendMouseMotion_ex(window, ievt->device_id, 0, last_x,
+                                            last_y, 0);
+                    }
+                }
+            } else if (ievt->flags & DIEF_AXISREL) {
+                if (ievt->axis == DIAI_X)
+                    SDL_SendMouseMotion_ex(devdata->grabbed_window, ievt->device_id, 1,
+                                        ievt->axisrel, 0, 0);
+                else if (ievt->axis == DIAI_Y)
+                    SDL_SendMouseMotion_ex(devdata->grabbed_window, ievt->device_id, 1, 0,
+                                        ievt->axisrel, 0);
+            }
+            break;
+        case DIET_KEYPRESS:
+            kbd_idx = KbdIndex(_this, ievt->device_id);
+            DirectFB_TranslateKeyInputEvent(_this, ievt, &keysym, &unicode);
+            /* printf("Scancode %d  %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
+            SDL_SendKeyboardKey_ex(kbd_idx, SDL_PRESSED, keysym.scancode);
+            if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
+                SDL_zero(text);
+                UnicodeToUtf8(unicode, text);
+                if (*text) {
+                    SDL_SendKeyboardText_ex(kbd_idx, text);
+                }
+            }
+            break;
+        case DIET_KEYRELEASE:
+            kbd_idx = KbdIndex(_this, ievt->device_id);
+            DirectFB_TranslateKeyInputEvent(_this, ievt, &keysym, &unicode);
+            SDL_SendKeyboardKey_ex(kbd_idx, SDL_RELEASED, keysym.scancode);
+            break;
+        case DIET_BUTTONPRESS:
+            if (ievt->buttons & DIBM_LEFT)
+                SDL_SendMouseButton_ex(devdata->grabbed_window, ievt->device_id, SDL_PRESSED, 1);
+            if (ievt->buttons & DIBM_MIDDLE)
+                SDL_SendMouseButton_ex(devdata->grabbed_window, ievt->device_id, SDL_PRESSED, 2);
+            if (ievt->buttons & DIBM_RIGHT)
+                SDL_SendMouseButton_ex(devdata->grabbed_window, ievt->device_id, SDL_PRESSED, 3);
+            break;
+        case DIET_BUTTONRELEASE:
+            if (!(ievt->buttons & DIBM_LEFT))
+                SDL_SendMouseButton_ex(devdata->grabbed_window, ievt->device_id, SDL_RELEASED, 1);
+            if (!(ievt->buttons & DIBM_MIDDLE))
+                SDL_SendMouseButton_ex(devdata->grabbed_window, ievt->device_id, SDL_RELEASED, 2);
+            if (!(ievt->buttons & DIBM_RIGHT))
+                SDL_SendMouseButton_ex(devdata->grabbed_window, ievt->device_id, SDL_RELEASED, 3);
+            break;
+        default:
+            break;              /* please gcc */
+        }
+    }
+}
+
+void
+DirectFB_PumpEventsWindow(_THIS)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    DFBInputEvent ievt;
+    SDL_Window *w;
+
+    for (w = devdata->firstwin; w != NULL; w = w->next) {
+        SDL_DFB_WINDOWDATA(w);
+        DFBWindowEvent evt;
+
+        while (windata->eventbuffer->GetEvent(windata->eventbuffer,
+                                        DFB_EVENT(&evt)) == DFB_OK) {
+            if (!DirectFB_WM_ProcessEvent(_this, w, &evt)) {
+                /* Send a SDL_SYSWMEVENT if the application wants them */
+                if (SDL_GetEventState(SDL_SYSWMEVENT) == SDL_ENABLE) {
+                    SDL_SysWMmsg wmmsg;
+                    SDL_VERSION(&wmmsg.version);
+                    wmmsg.subsystem = SDL_SYSWM_DIRECTFB;
+                    wmmsg.msg.dfb.event.window = evt;
+                    SDL_SendSysWMEvent(&wmmsg);
+                }
+                ProcessWindowEvent(_this, w, &evt);
+            }
+        }
+    }
+
+    /* Now get relative events in case we need them */
+    while (devdata->events->GetEvent(devdata->events,
+                                     DFB_EVENT(&ievt)) == DFB_OK) {
+
+        if (SDL_GetEventState(SDL_SYSWMEVENT) == SDL_ENABLE) {
+            SDL_SysWMmsg wmmsg;
+            SDL_VERSION(&wmmsg.version);
+            wmmsg.subsystem = SDL_SYSWM_DIRECTFB;
+            wmmsg.msg.dfb.event.input = ievt;
+            SDL_SendSysWMEvent(&wmmsg);
+        }
+        ProcessInputEvent(_this, &ievt);
+    }
+}
+
+void
+DirectFB_InitOSKeymap(_THIS, SDL_Scancode * keymap, int numkeys)
+{
+    int i;
+
+    /* Initialize the DirectFB key translation table */
+    for (i = 0; i < numkeys; ++i)
+        keymap[i] = SDL_SCANCODE_UNKNOWN;
+
+    keymap[DIKI_A - DIKI_UNKNOWN] = SDL_SCANCODE_A;
+    keymap[DIKI_B - DIKI_UNKNOWN] = SDL_SCANCODE_B;
+    keymap[DIKI_C - DIKI_UNKNOWN] = SDL_SCANCODE_C;
+    keymap[DIKI_D - DIKI_UNKNOWN] = SDL_SCANCODE_D;
+    keymap[DIKI_E - DIKI_UNKNOWN] = SDL_SCANCODE_E;
+    keymap[DIKI_F - DIKI_UNKNOWN] = SDL_SCANCODE_F;
+    keymap[DIKI_G - DIKI_UNKNOWN] = SDL_SCANCODE_G;
+    keymap[DIKI_H - DIKI_UNKNOWN] = SDL_SCANCODE_H;
+    keymap[DIKI_I - DIKI_UNKNOWN] = SDL_SCANCODE_I;
+    keymap[DIKI_J - DIKI_UNKNOWN] = SDL_SCANCODE_J;
+    keymap[DIKI_K - DIKI_UNKNOWN] = SDL_SCANCODE_K;
+    keymap[DIKI_L - DIKI_UNKNOWN] = SDL_SCANCODE_L;
+    keymap[DIKI_M - DIKI_UNKNOWN] = SDL_SCANCODE_M;
+    keymap[DIKI_N - DIKI_UNKNOWN] = SDL_SCANCODE_N;
+    keymap[DIKI_O - DIKI_UNKNOWN] = SDL_SCANCODE_O;
+    keymap[DIKI_P - DIKI_UNKNOWN] = SDL_SCANCODE_P;
+    keymap[DIKI_Q - DIKI_UNKNOWN] = SDL_SCANCODE_Q;
+    keymap[DIKI_R - DIKI_UNKNOWN] = SDL_SCANCODE_R;
+    keymap[DIKI_S - DIKI_UNKNOWN] = SDL_SCANCODE_S;
+    keymap[DIKI_T - DIKI_UNKNOWN] = SDL_SCANCODE_T;
+    keymap[DIKI_U - DIKI_UNKNOWN] = SDL_SCANCODE_U;
+    keymap[DIKI_V - DIKI_UNKNOWN] = SDL_SCANCODE_V;
+    keymap[DIKI_W - DIKI_UNKNOWN] = SDL_SCANCODE_W;
+    keymap[DIKI_X - DIKI_UNKNOWN] = SDL_SCANCODE_X;
+    keymap[DIKI_Y - DIKI_UNKNOWN] = SDL_SCANCODE_Y;
+    keymap[DIKI_Z - DIKI_UNKNOWN] = SDL_SCANCODE_Z;
+
+    keymap[DIKI_0 - DIKI_UNKNOWN] = SDL_SCANCODE_0;
+    keymap[DIKI_1 - DIKI_UNKNOWN] = SDL_SCANCODE_1;
+    keymap[DIKI_2 - DIKI_UNKNOWN] = SDL_SCANCODE_2;
+    keymap[DIKI_3 - DIKI_UNKNOWN] = SDL_SCANCODE_3;
+    keymap[DIKI_4 - DIKI_UNKNOWN] = SDL_SCANCODE_4;
+    keymap[DIKI_5 - DIKI_UNKNOWN] = SDL_SCANCODE_5;
+    keymap[DIKI_6 - DIKI_UNKNOWN] = SDL_SCANCODE_6;
+    keymap[DIKI_7 - DIKI_UNKNOWN] = SDL_SCANCODE_7;
+    keymap[DIKI_8 - DIKI_UNKNOWN] = SDL_SCANCODE_8;
+    keymap[DIKI_9 - DIKI_UNKNOWN] = SDL_SCANCODE_9;
+
+    keymap[DIKI_F1 - DIKI_UNKNOWN] = SDL_SCANCODE_F1;
+    keymap[DIKI_F2 - DIKI_UNKNOWN] = SDL_SCANCODE_F2;
+    keymap[DIKI_F3 - DIKI_UNKNOWN] = SDL_SCANCODE_F3;
+    keymap[DIKI_F4 - DIKI_UNKNOWN] = SDL_SCANCODE_F4;
+    keymap[DIKI_F5 - DIKI_UNKNOWN] = SDL_SCANCODE_F5;
+    keymap[DIKI_F6 - DIKI_UNKNOWN] = SDL_SCANCODE_F6;
+    keymap[DIKI_F7 - DIKI_UNKNOWN] = SDL_SCANCODE_F7;
+    keymap[DIKI_F8 - DIKI_UNKNOWN] = SDL_SCANCODE_F8;
+    keymap[DIKI_F9 - DIKI_UNKNOWN] = SDL_SCANCODE_F9;
+    keymap[DIKI_F10 - DIKI_UNKNOWN] = SDL_SCANCODE_F10;
+    keymap[DIKI_F11 - DIKI_UNKNOWN] = SDL_SCANCODE_F11;
+    keymap[DIKI_F12 - DIKI_UNKNOWN] = SDL_SCANCODE_F12;
+
+    keymap[DIKI_ESCAPE - DIKI_UNKNOWN] = SDL_SCANCODE_ESCAPE;
+    keymap[DIKI_LEFT - DIKI_UNKNOWN] = SDL_SCANCODE_LEFT;
+    keymap[DIKI_RIGHT - DIKI_UNKNOWN] = SDL_SCANCODE_RIGHT;
+    keymap[DIKI_UP - DIKI_UNKNOWN] = SDL_SCANCODE_UP;
+    keymap[DIKI_DOWN - DIKI_UNKNOWN] = SDL_SCANCODE_DOWN;
+    keymap[DIKI_CONTROL_L - DIKI_UNKNOWN] = SDL_SCANCODE_LCTRL;
+    keymap[DIKI_CONTROL_R - DIKI_UNKNOWN] = SDL_SCANCODE_RCTRL;
+    keymap[DIKI_SHIFT_L - DIKI_UNKNOWN] = SDL_SCANCODE_LSHIFT;
+    keymap[DIKI_SHIFT_R - DIKI_UNKNOWN] = SDL_SCANCODE_RSHIFT;
+    keymap[DIKI_ALT_L - DIKI_UNKNOWN] = SDL_SCANCODE_LALT;
+    keymap[DIKI_ALT_R - DIKI_UNKNOWN] = SDL_SCANCODE_RALT;
+    keymap[DIKI_META_L - DIKI_UNKNOWN] = SDL_SCANCODE_LGUI;
+    keymap[DIKI_META_R - DIKI_UNKNOWN] = SDL_SCANCODE_RGUI;
+    keymap[DIKI_SUPER_L - DIKI_UNKNOWN] = SDL_SCANCODE_APPLICATION;
+    keymap[DIKI_SUPER_R - DIKI_UNKNOWN] = SDL_SCANCODE_APPLICATION;
+    /* FIXME:Do we read hyper keys ?
+     * keymap[DIKI_HYPER_L - DIKI_UNKNOWN] = SDL_SCANCODE_APPLICATION;
+     * keymap[DIKI_HYPER_R - DIKI_UNKNOWN] = SDL_SCANCODE_APPLICATION;
+     */
+    keymap[DIKI_TAB - DIKI_UNKNOWN] = SDL_SCANCODE_TAB;
+    keymap[DIKI_ENTER - DIKI_UNKNOWN] = SDL_SCANCODE_RETURN;
+    keymap[DIKI_SPACE - DIKI_UNKNOWN] = SDL_SCANCODE_SPACE;
+    keymap[DIKI_BACKSPACE - DIKI_UNKNOWN] = SDL_SCANCODE_BACKSPACE;
+    keymap[DIKI_INSERT - DIKI_UNKNOWN] = SDL_SCANCODE_INSERT;
+    keymap[DIKI_DELETE - DIKI_UNKNOWN] = SDL_SCANCODE_DELETE;
+    keymap[DIKI_HOME - DIKI_UNKNOWN] = SDL_SCANCODE_HOME;
+    keymap[DIKI_END - DIKI_UNKNOWN] = SDL_SCANCODE_END;
+    keymap[DIKI_PAGE_UP - DIKI_UNKNOWN] = SDL_SCANCODE_PAGEUP;
+    keymap[DIKI_PAGE_DOWN - DIKI_UNKNOWN] = SDL_SCANCODE_PAGEDOWN;
+    keymap[DIKI_CAPS_LOCK - DIKI_UNKNOWN] = SDL_SCANCODE_CAPSLOCK;
+    keymap[DIKI_NUM_LOCK - DIKI_UNKNOWN] = SDL_SCANCODE_NUMLOCKCLEAR;
+    keymap[DIKI_SCROLL_LOCK - DIKI_UNKNOWN] = SDL_SCANCODE_SCROLLLOCK;
+    keymap[DIKI_PRINT - DIKI_UNKNOWN] = SDL_SCANCODE_PRINTSCREEN;
+    keymap[DIKI_PAUSE - DIKI_UNKNOWN] = SDL_SCANCODE_PAUSE;
+
+    keymap[DIKI_KP_EQUAL - DIKI_UNKNOWN] = SDL_SCANCODE_KP_EQUALS;
+    keymap[DIKI_KP_DECIMAL - DIKI_UNKNOWN] = SDL_SCANCODE_KP_PERIOD;
+    keymap[DIKI_KP_0 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_0;
+    keymap[DIKI_KP_1 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_1;
+    keymap[DIKI_KP_2 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_2;
+    keymap[DIKI_KP_3 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_3;
+    keymap[DIKI_KP_4 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_4;
+    keymap[DIKI_KP_5 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_5;
+    keymap[DIKI_KP_6 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_6;
+    keymap[DIKI_KP_7 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_7;
+    keymap[DIKI_KP_8 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_8;
+    keymap[DIKI_KP_9 - DIKI_UNKNOWN] = SDL_SCANCODE_KP_9;
+    keymap[DIKI_KP_DIV - DIKI_UNKNOWN] = SDL_SCANCODE_KP_DIVIDE;
+    keymap[DIKI_KP_MULT - DIKI_UNKNOWN] = SDL_SCANCODE_KP_MULTIPLY;
+    keymap[DIKI_KP_MINUS - DIKI_UNKNOWN] = SDL_SCANCODE_KP_MINUS;
+    keymap[DIKI_KP_PLUS - DIKI_UNKNOWN] = SDL_SCANCODE_KP_PLUS;
+    keymap[DIKI_KP_ENTER - DIKI_UNKNOWN] = SDL_SCANCODE_KP_ENTER;
+
+    keymap[DIKI_QUOTE_LEFT - DIKI_UNKNOWN] = SDL_SCANCODE_GRAVE;        /*  TLDE  */
+    keymap[DIKI_MINUS_SIGN - DIKI_UNKNOWN] = SDL_SCANCODE_MINUS;        /*  AE11  */
+    keymap[DIKI_EQUALS_SIGN - DIKI_UNKNOWN] = SDL_SCANCODE_EQUALS;      /*  AE12  */
+    keymap[DIKI_BRACKET_LEFT - DIKI_UNKNOWN] = SDL_SCANCODE_RIGHTBRACKET;       /*  AD11  */
+    keymap[DIKI_BRACKET_RIGHT - DIKI_UNKNOWN] = SDL_SCANCODE_LEFTBRACKET;       /*  AD12  */
+    keymap[DIKI_BACKSLASH - DIKI_UNKNOWN] = SDL_SCANCODE_BACKSLASH;     /*  BKSL  */
+    keymap[DIKI_SEMICOLON - DIKI_UNKNOWN] = SDL_SCANCODE_SEMICOLON;     /*  AC10  */
+    keymap[DIKI_QUOTE_RIGHT - DIKI_UNKNOWN] = SDL_SCANCODE_APOSTROPHE;  /*  AC11  */
+    keymap[DIKI_COMMA - DIKI_UNKNOWN] = SDL_SCANCODE_COMMA;     /*  AB08  */
+    keymap[DIKI_PERIOD - DIKI_UNKNOWN] = SDL_SCANCODE_PERIOD;   /*  AB09  */
+    keymap[DIKI_SLASH - DIKI_UNKNOWN] = SDL_SCANCODE_SLASH;     /*  AB10  */
+    keymap[DIKI_LESS_SIGN - DIKI_UNKNOWN] = SDL_SCANCODE_NONUSBACKSLASH;        /*  103rd  */
+
+}
+
+static SDL_Keysym *
+DirectFB_TranslateKey(_THIS, DFBWindowEvent * evt, SDL_Keysym * keysym, Uint32 *unicode)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    int kbd_idx = 0; /* Window events lag the device source KbdIndex(_this, evt->device_id); */
+    DFB_KeyboardData *kbd = &devdata->keyboard[kbd_idx];
+
+    keysym->scancode = SDL_SCANCODE_UNKNOWN;
+
+    if (kbd->map && evt->key_code >= kbd->map_adjust &&
+        evt->key_code < kbd->map_size + kbd->map_adjust)
+        keysym->scancode = kbd->map[evt->key_code - kbd->map_adjust];
+
+    if (keysym->scancode == SDL_SCANCODE_UNKNOWN ||
+        devdata->keyboard[kbd_idx].is_generic) {
+        if (evt->key_id - DIKI_UNKNOWN < SDL_arraysize(oskeymap))
+            keysym->scancode = oskeymap[evt->key_id - DIKI_UNKNOWN];
+        else
+            keysym->scancode = SDL_SCANCODE_UNKNOWN;
+    }
+
+    *unicode =
+        (DFB_KEY_TYPE(evt->key_symbol) == DIKT_UNICODE) ? evt->key_symbol : 0;
+    if (*unicode == 0 &&
+        (evt->key_symbol > 0 && evt->key_symbol < 255))
+        *unicode = evt->key_symbol;
+
+    return keysym;
+}
+
+static SDL_Keysym *
+DirectFB_TranslateKeyInputEvent(_THIS, DFBInputEvent * evt,
+                                SDL_Keysym * keysym, Uint32 *unicode)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    int kbd_idx = KbdIndex(_this, evt->device_id);
+    DFB_KeyboardData *kbd = &devdata->keyboard[kbd_idx];
+
+    keysym->scancode = SDL_SCANCODE_UNKNOWN;
+
+    if (kbd->map && evt->key_code >= kbd->map_adjust &&
+        evt->key_code < kbd->map_size + kbd->map_adjust)
+        keysym->scancode = kbd->map[evt->key_code - kbd->map_adjust];
+
+    if (keysym->scancode == SDL_SCANCODE_UNKNOWN || devdata->keyboard[kbd_idx].is_generic) {
+        if (evt->key_id - DIKI_UNKNOWN < SDL_arraysize(oskeymap))
+            keysym->scancode = oskeymap[evt->key_id - DIKI_UNKNOWN];
+        else
+            keysym->scancode = SDL_SCANCODE_UNKNOWN;
+    }
+
+    *unicode =
+        (DFB_KEY_TYPE(evt->key_symbol) == DIKT_UNICODE) ? evt->key_symbol : 0;
+    if (*unicode == 0 &&
+        (evt->key_symbol > 0 && evt->key_symbol < 255))
+        *unicode = evt->key_symbol;
+
+    return keysym;
+}
+
+static int
+DirectFB_TranslateButton(DFBInputDeviceButtonIdentifier button)
+{
+    switch (button) {
+    case DIBI_LEFT:
+        return 1;
+    case DIBI_MIDDLE:
+        return 2;
+    case DIBI_RIGHT:
+        return 3;
+    default:
+        return 0;
+    }
+}
+
+static DFBEnumerationResult
+EnumKeyboards(DFBInputDeviceID device_id,
+                DFBInputDeviceDescription desc, void *callbackdata)
+{
+    cb_data *cb = callbackdata;
+    DFB_DeviceData *devdata = cb->devdata;
+#if USE_MULTI_API
+    SDL_Keyboard keyboard;
+#endif
+    SDL_Keycode keymap[SDL_NUM_SCANCODES];
+
+    if (!cb->sys_kbd) {
+        if (cb->sys_ids) {
+            if (device_id >= 0x10)
+                return DFENUM_OK;
+        } else {
+            if (device_id < 0x10)
+                return DFENUM_OK;
+        }
+    } else {
+        if (device_id != DIDID_KEYBOARD)
+            return DFENUM_OK;
+    }
+
+    if ((desc.caps & DIDTF_KEYBOARD)) {
+#if USE_MULTI_API
+        SDL_zero(keyboard);
+        SDL_AddKeyboard(&keyboard, devdata->num_keyboard);
+#endif
+        devdata->keyboard[devdata->num_keyboard].id = device_id;
+        devdata->keyboard[devdata->num_keyboard].is_generic = 0;
+        if (!strncmp("X11", desc.name, 3))
+        {
+            devdata->keyboard[devdata->num_keyboard].map = xfree86_scancode_table2;
+            devdata->keyboard[devdata->num_keyboard].map_size = SDL_arraysize(xfree86_scancode_table2);
+            devdata->keyboard[devdata->num_keyboard].map_adjust = 8;
+        } else {
+            devdata->keyboard[devdata->num_keyboard].map = linux_scancode_table;
+            devdata->keyboard[devdata->num_keyboard].map_size = SDL_arraysize(linux_scancode_table);
+            devdata->keyboard[devdata->num_keyboard].map_adjust = 0;
+        }
+
+        SDL_DFB_LOG("Keyboard %d - %s\n", device_id, desc.name);
+
+        SDL_GetDefaultKeymap(keymap);
+#if USE_MULTI_API
+        SDL_SetKeymap(devdata->num_keyboard, 0, keymap, SDL_NUM_SCANCODES);
+#else
+        SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES);
+#endif
+        devdata->num_keyboard++;
+
+        if (cb->sys_kbd)
+            return DFENUM_CANCEL;
+    }
+    return DFENUM_OK;
+}
+
+void
+DirectFB_InitKeyboard(_THIS)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    cb_data cb;
+
+    DirectFB_InitOSKeymap(_this, &oskeymap[0], SDL_arraysize(oskeymap));
+
+    devdata->num_keyboard = 0;
+    cb.devdata = devdata;
+
+    if (devdata->use_linux_input) {
+        cb.sys_kbd = 0;
+        cb.sys_ids = 0;
+        SDL_DFB_CHECK(devdata->dfb->
+                      EnumInputDevices(devdata->dfb, EnumKeyboards, &cb));
+        if (devdata->num_keyboard == 0) {
+            cb.sys_ids = 1;
+            SDL_DFB_CHECK(devdata->dfb->EnumInputDevices(devdata->dfb,
+                                                         EnumKeyboards,
+                                                         &cb));
+        }
+    } else {
+        cb.sys_kbd = 1;
+        SDL_DFB_CHECK(devdata->dfb->EnumInputDevices(devdata->dfb,
+                                                     EnumKeyboards,
+                                                     &cb));
+    }
+}
+
+void
+DirectFB_QuitKeyboard(_THIS)
+{
+    /* SDL_DFB_DEVICEDATA(_this); */
+
+    SDL_KeyboardQuit();
+
+}
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_events.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_events.h
new file mode 100644
index 000000000..db5c7f0fd
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_events.h	
@@ -0,0 +1,32 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_DirectFB_events_h
+#define _SDL_DirectFB_events_h
+
+#include "../SDL_sysvideo.h"
+
+/* Functions to be exported */
+extern void DirectFB_InitKeyboard(_THIS);
+extern void DirectFB_QuitKeyboard(_THIS);
+extern void DirectFB_PumpEventsWindow(_THIS);
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_modes.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_modes.c
new file mode 100644
index 000000000..73de1fc01
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_modes.c	
@@ -0,0 +1,414 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
+#include "SDL_DirectFB_video.h"
+#include "SDL_DirectFB_modes.h"
+
+#define DFB_MAX_MODES 200
+
+struct screen_callback_t
+{
+    int numscreens;
+    DFBScreenID screenid[DFB_MAX_SCREENS];
+    DFBDisplayLayerID gralayer[DFB_MAX_SCREENS];
+    DFBDisplayLayerID vidlayer[DFB_MAX_SCREENS];
+    int aux;                    /* auxiliary integer for callbacks */
+};
+
+struct modes_callback_t
+{
+    int nummodes;
+    SDL_DisplayMode *modelist;
+};
+
+static DFBEnumerationResult
+EnumModesCallback(int width, int height, int bpp, void *data)
+{
+    struct modes_callback_t *modedata = (struct modes_callback_t *) data;
+    SDL_DisplayMode mode;
+
+    mode.w = width;
+    mode.h = height;
+    mode.refresh_rate = 0;
+    mode.driverdata = NULL;
+    mode.format = SDL_PIXELFORMAT_UNKNOWN;
+
+    if (modedata->nummodes < DFB_MAX_MODES) {
+        modedata->modelist[modedata->nummodes++] = mode;
+    }
+
+    return DFENUM_OK;
+}
+
+static DFBEnumerationResult
+EnumScreensCallback(DFBScreenID screen_id, DFBScreenDescription desc,
+          void *callbackdata)
+{
+    struct screen_callback_t *devdata = (struct screen_callback_t *) callbackdata;
+
+    devdata->screenid[devdata->numscreens++] = screen_id;
+    return DFENUM_OK;
+}
+
+static DFBEnumerationResult
+EnumLayersCallback(DFBDisplayLayerID layer_id, DFBDisplayLayerDescription desc,
+         void *callbackdata)
+{
+    struct screen_callback_t *devdata = (struct screen_callback_t *) callbackdata;
+
+    if (desc.caps & DLCAPS_SURFACE) {
+        if ((desc.type & DLTF_GRAPHICS) && (desc.type & DLTF_VIDEO)) {
+            if (devdata->vidlayer[devdata->aux] == -1)
+                devdata->vidlayer[devdata->aux] = layer_id;
+        } else if (desc.type & DLTF_GRAPHICS) {
+            if (devdata->gralayer[devdata->aux] == -1)
+                devdata->gralayer[devdata->aux] = layer_id;
+        }
+    }
+    return DFENUM_OK;
+}
+
+static void
+CheckSetDisplayMode(_THIS, SDL_VideoDisplay * display, DFB_DisplayData * data, SDL_DisplayMode * mode)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    DFBDisplayLayerConfig config;
+    DFBDisplayLayerConfigFlags failed;
+
+    SDL_DFB_CHECKERR(data->layer->SetCooperativeLevel(data->layer,
+                                                      DLSCL_ADMINISTRATIVE));
+    config.width = mode->w;
+    config.height = mode->h;
+    config.pixelformat = DirectFB_SDLToDFBPixelFormat(mode->format);
+    config.flags = DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT;
+    if (devdata->use_yuv_underlays) {
+        config.flags |= DLCONF_OPTIONS;
+        config.options = DLOP_ALPHACHANNEL;
+    }
+    failed = 0;
+    data->layer->TestConfiguration(data->layer, &config, &failed);
+    SDL_DFB_CHECKERR(data->layer->SetCooperativeLevel(data->layer,
+                                                      DLSCL_SHARED));
+    if (failed == 0)
+    {
+        SDL_AddDisplayMode(display, mode);
+        SDL_DFB_LOG("Mode %d x %d Added\n", mode->w, mode->h);
+    }
+    else
+        SDL_DFB_ERR("Mode %d x %d not available: %x\n", mode->w,
+                      mode->h, failed);
+
+    return;
+  error:
+    return;
+}
+
+
+void
+DirectFB_SetContext(_THIS, SDL_Window *window)
+{
+#if (DFB_VERSION_ATLEAST(1,0,0))
+    /* FIXME: does not work on 1.0/1.2 with radeon driver
+     *        the approach did work with the matrox driver
+     *        This has simply no effect.
+     */
+
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
+
+    /* FIXME: should we handle the error */
+    if (dispdata->vidIDinuse)
+        SDL_DFB_CHECK(dispdata->vidlayer->SwitchContext(dispdata->vidlayer,
+                                                           DFB_TRUE));
+#endif
+}
+
+void
+DirectFB_InitModes(_THIS)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    IDirectFBDisplayLayer *layer = NULL;
+    SDL_VideoDisplay display;
+    DFB_DisplayData *dispdata = NULL;
+    SDL_DisplayMode mode;
+    DFBGraphicsDeviceDescription caps;
+    DFBDisplayLayerConfig dlc;
+    struct screen_callback_t *screencbdata;
+
+    int tcw[DFB_MAX_SCREENS];
+    int tch[DFB_MAX_SCREENS];
+    int i;
+    DFBResult ret;
+
+    SDL_DFB_ALLOC_CLEAR(screencbdata, sizeof(*screencbdata));
+
+    screencbdata->numscreens = 0;
+
+    for (i = 0; i < DFB_MAX_SCREENS; i++) {
+        screencbdata->gralayer[i] = -1;
+        screencbdata->vidlayer[i] = -1;
+    }
+
+    SDL_DFB_CHECKERR(devdata->dfb->EnumScreens(devdata->dfb, &EnumScreensCallback,
+                                               screencbdata));
+
+    for (i = 0; i < screencbdata->numscreens; i++) {
+        IDirectFBScreen *screen;
+
+        SDL_DFB_CHECKERR(devdata->dfb->GetScreen(devdata->dfb,
+                                                 screencbdata->screenid
+                                                 [i], &screen));
+
+        screencbdata->aux = i;
+        SDL_DFB_CHECKERR(screen->EnumDisplayLayers(screen, &EnumLayersCallback,
+                                                   screencbdata));
+        screen->GetSize(screen, &tcw[i], &tch[i]);
+
+        screen->Release(screen);
+    }
+
+    /* Query card capabilities */
+
+    devdata->dfb->GetDeviceDescription(devdata->dfb, &caps);
+
+    for (i = 0; i < screencbdata->numscreens; i++) {
+        SDL_DFB_CHECKERR(devdata->dfb->GetDisplayLayer(devdata->dfb,
+                                                       screencbdata->gralayer
+                                                       [i], &layer));
+
+        SDL_DFB_CHECKERR(layer->SetCooperativeLevel(layer,
+                                                    DLSCL_ADMINISTRATIVE));
+        layer->EnableCursor(layer, 1);
+        SDL_DFB_CHECKERR(layer->SetCursorOpacity(layer, 0xC0));
+
+        if (devdata->use_yuv_underlays) {
+            dlc.flags = DLCONF_PIXELFORMAT | DLCONF_OPTIONS;
+            dlc.pixelformat = DSPF_ARGB;
+            dlc.options = DLOP_ALPHACHANNEL;
+
+            ret = layer->SetConfiguration(layer, &dlc);
+            if (ret != DFB_OK) {
+                /* try AiRGB if the previous failed */
+                dlc.pixelformat = DSPF_AiRGB;
+                SDL_DFB_CHECKERR(layer->SetConfiguration(layer, &dlc));
+            }
+        }
+
+        /* Query layer configuration to determine the current mode and pixelformat */
+        dlc.flags = DLCONF_ALL;
+        SDL_DFB_CHECKERR(layer->GetConfiguration(layer, &dlc));
+
+        mode.format = DirectFB_DFBToSDLPixelFormat(dlc.pixelformat);
+
+        if (mode.format == SDL_PIXELFORMAT_UNKNOWN) {
+            SDL_DFB_ERR("Unknown dfb pixelformat %x !\n", dlc.pixelformat);
+            goto error;
+        }
+
+        mode.w = dlc.width;
+        mode.h = dlc.height;
+        mode.refresh_rate = 0;
+        mode.driverdata = NULL;
+
+        SDL_DFB_ALLOC_CLEAR(dispdata, sizeof(*dispdata));
+
+        dispdata->layer = layer;
+        dispdata->pixelformat = dlc.pixelformat;
+        dispdata->cw = tcw[i];
+        dispdata->ch = tch[i];
+
+        /* YUV - Video layer */
+
+        dispdata->vidID = screencbdata->vidlayer[i];
+        dispdata->vidIDinuse = 0;
+
+        SDL_zero(display);
+
+        display.desktop_mode = mode;
+        display.current_mode = mode;
+        display.driverdata = dispdata;
+
+#if (DFB_VERSION_ATLEAST(1,2,0))
+        dlc.flags =
+            DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT |
+            DLCONF_OPTIONS;
+        ret = layer->SetConfiguration(layer, &dlc);
+#endif
+
+        SDL_DFB_CHECKERR(layer->SetCooperativeLevel(layer, DLSCL_SHARED));
+
+        SDL_AddVideoDisplay(&display);
+    }
+    SDL_DFB_FREE(screencbdata);
+    return;
+  error:
+    /* FIXME: Cleanup not complete, Free existing displays */
+    SDL_DFB_FREE(dispdata);
+    SDL_DFB_RELEASE(layer);
+    return;
+}
+
+void
+DirectFB_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
+    SDL_DisplayMode mode;
+    struct modes_callback_t data;
+    int i;
+
+    data.nummodes = 0;
+    /* Enumerate the available fullscreen modes */
+    SDL_DFB_CALLOC(data.modelist, DFB_MAX_MODES, sizeof(SDL_DisplayMode));
+    SDL_DFB_CHECKERR(devdata->dfb->EnumVideoModes(devdata->dfb,
+                                                  EnumModesCallback, &data));
+
+    for (i = 0; i < data.nummodes; ++i) {
+        mode = data.modelist[i];
+
+        mode.format = SDL_PIXELFORMAT_ARGB8888;
+        CheckSetDisplayMode(_this, display, dispdata, &mode);
+        mode.format = SDL_PIXELFORMAT_RGB888;
+        CheckSetDisplayMode(_this, display, dispdata, &mode);
+        mode.format = SDL_PIXELFORMAT_RGB24;
+        CheckSetDisplayMode(_this, display, dispdata, &mode);
+        mode.format = SDL_PIXELFORMAT_RGB565;
+        CheckSetDisplayMode(_this, display, dispdata, &mode);
+        mode.format = SDL_PIXELFORMAT_INDEX8;
+        CheckSetDisplayMode(_this, display, dispdata, &mode);
+    }
+
+    SDL_DFB_FREE(data.modelist);
+error:
+    return;
+}
+
+int
+DirectFB_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+    /*
+     * FIXME: video mode switch is currently broken for 1.2.0
+     *
+     */
+
+    SDL_DFB_DEVICEDATA(_this);
+    DFB_DisplayData *data = (DFB_DisplayData *) display->driverdata;
+    DFBDisplayLayerConfig config, rconfig;
+    DFBDisplayLayerConfigFlags fail = 0;
+
+    SDL_DFB_CHECKERR(data->layer->SetCooperativeLevel(data->layer,
+                                                      DLSCL_ADMINISTRATIVE));
+
+    SDL_DFB_CHECKERR(data->layer->GetConfiguration(data->layer, &config));
+    config.flags = DLCONF_WIDTH | DLCONF_HEIGHT;
+    if (mode->format != SDL_PIXELFORMAT_UNKNOWN) {
+        config.flags |= DLCONF_PIXELFORMAT;
+        config.pixelformat = DirectFB_SDLToDFBPixelFormat(mode->format);
+        data->pixelformat = config.pixelformat;
+    }
+    config.width = mode->w;
+    config.height = mode->h;
+
+    if (devdata->use_yuv_underlays) {
+        config.flags |= DLCONF_OPTIONS;
+        config.options = DLOP_ALPHACHANNEL;
+    }
+
+    data->layer->TestConfiguration(data->layer, &config, &fail);
+
+    if (fail &
+        (DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT |
+         DLCONF_OPTIONS)) {
+        SDL_DFB_ERR("Error setting mode %dx%d-%x\n", mode->w, mode->h,
+                    mode->format);
+        return -1;
+    }
+
+    config.flags &= ~fail;
+    SDL_DFB_CHECKERR(data->layer->SetConfiguration(data->layer, &config));
+#if (DFB_VERSION_ATLEAST(1,2,0))
+    /* Need to call this twice ! */
+    SDL_DFB_CHECKERR(data->layer->SetConfiguration(data->layer, &config));
+#endif
+
+    /* Double check */
+    SDL_DFB_CHECKERR(data->layer->GetConfiguration(data->layer, &rconfig));
+    SDL_DFB_CHECKERR(data->
+                     layer->SetCooperativeLevel(data->layer, DLSCL_SHARED));
+
+    if ((config.width != rconfig.width) || (config.height != rconfig.height)
+        || ((mode->format != SDL_PIXELFORMAT_UNKNOWN)
+            && (config.pixelformat != rconfig.pixelformat))) {
+        SDL_DFB_ERR("Error setting mode %dx%d-%x\n", mode->w, mode->h,
+                    mode->format);
+        return -1;
+    }
+
+    data->pixelformat = rconfig.pixelformat;
+    data->cw = config.width;
+    data->ch = config.height;
+    display->current_mode = *mode;
+
+    return 0;
+  error:
+    return -1;
+}
+
+void
+DirectFB_QuitModes(_THIS)
+{
+    SDL_DisplayMode tmode;
+    int i;
+
+    for (i = 0; i < _this->num_displays; ++i) {
+        SDL_VideoDisplay *display = &_this->displays[i];
+        DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
+
+        SDL_GetDesktopDisplayMode(i, &tmode);
+        tmode.format = SDL_PIXELFORMAT_UNKNOWN;
+        DirectFB_SetDisplayMode(_this, display, &tmode);
+
+        SDL_GetDesktopDisplayMode(i, &tmode);
+        DirectFB_SetDisplayMode(_this, display, &tmode);
+
+        if (dispdata->layer) {
+            SDL_DFB_CHECK(dispdata->
+                          layer->SetCooperativeLevel(dispdata->layer,
+                                                     DLSCL_ADMINISTRATIVE));
+            SDL_DFB_CHECK(dispdata->
+                          layer->SetCursorOpacity(dispdata->layer, 0x00));
+            SDL_DFB_CHECK(dispdata->
+                          layer->SetCooperativeLevel(dispdata->layer,
+                                                     DLSCL_SHARED));
+        }
+
+        SDL_DFB_RELEASE(dispdata->layer);
+        SDL_DFB_RELEASE(dispdata->vidlayer);
+
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_modes.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_modes.h
new file mode 100644
index 000000000..7999f606c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_modes.h	
@@ -0,0 +1,59 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_directfb_modes_h
+#define _SDL_directfb_modes_h
+
+#include <directfb.h>
+
+#include "../SDL_sysvideo.h"
+
+#define SDL_DFB_DISPLAYDATA(win)  DFB_DisplayData *dispdata = ((win) ? (DFB_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata : NULL)
+
+typedef struct _DFB_DisplayData DFB_DisplayData;
+struct _DFB_DisplayData
+{
+    IDirectFBDisplayLayer   *layer;
+    DFBSurfacePixelFormat   pixelformat;
+    /* FIXME: support for multiple video layer.
+     * However, I do not know any card supporting
+     * more than one
+     */
+    DFBDisplayLayerID       vidID;
+    IDirectFBDisplayLayer   *vidlayer;
+
+    int                     vidIDinuse;
+
+    int                     cw;
+    int                     ch;
+};
+
+
+extern void DirectFB_InitModes(_THIS);
+extern void DirectFB_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
+extern int DirectFB_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+extern void DirectFB_QuitModes(_THIS);
+
+extern void DirectFB_SetContext(_THIS, SDL_Window *window);
+
+#endif /* _SDL_directfb_modes_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_mouse.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_mouse.c
new file mode 100644
index 000000000..93798f8e3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_mouse.c	
@@ -0,0 +1,394 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
+#include "SDL_assert.h"
+
+#include "SDL_DirectFB_video.h"
+#include "SDL_DirectFB_mouse.h"
+#include "SDL_DirectFB_modes.h"
+#include "SDL_DirectFB_window.h"
+
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_mouse_c.h"
+
+static SDL_Cursor *DirectFB_CreateDefaultCursor(void);
+static SDL_Cursor *DirectFB_CreateCursor(SDL_Surface * surface,
+                                         int hot_x, int hot_y);
+static int DirectFB_ShowCursor(SDL_Cursor * cursor);
+static void DirectFB_MoveCursor(SDL_Cursor * cursor);
+static void DirectFB_FreeCursor(SDL_Cursor * cursor);
+static void DirectFB_WarpMouse(SDL_Window * window, int x, int y);
+static void DirectFB_FreeMouse(SDL_Mouse * mouse);
+
+static const char *arrow[] = {
+    /* pixels */
+    "X                               ",
+    "XX                              ",
+    "X.X                             ",
+    "X..X                            ",
+    "X...X                           ",
+    "X....X                          ",
+    "X.....X                         ",
+    "X......X                        ",
+    "X.......X                       ",
+    "X........X                      ",
+    "X.....XXXXX                     ",
+    "X..X..X                         ",
+    "X.X X..X                        ",
+    "XX  X..X                        ",
+    "X    X..X                       ",
+    "     X..X                       ",
+    "      X..X                      ",
+    "      X..X                      ",
+    "       XX                       ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+    "                                ",
+};
+
+static SDL_Cursor *
+DirectFB_CreateDefaultCursor(void)
+{
+    SDL_VideoDevice *dev = SDL_GetVideoDevice();
+
+    SDL_DFB_DEVICEDATA(dev);
+    DFB_CursorData *curdata;
+    DFBResult ret;
+    DFBSurfaceDescription dsc;
+    SDL_Cursor *cursor;
+    Uint32 *dest;
+    Uint32 *p;
+    int pitch, i, j;
+
+    SDL_DFB_ALLOC_CLEAR( cursor, sizeof(*cursor));
+    SDL_DFB_ALLOC_CLEAR(curdata, sizeof(*curdata));
+
+    dsc.flags =
+        DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_CAPS;
+    dsc.caps = DSCAPS_VIDEOONLY;
+    dsc.width = 32;
+    dsc.height = 32;
+    dsc.pixelformat = DSPF_ARGB;
+
+    SDL_DFB_CHECKERR(devdata->dfb->CreateSurface(devdata->dfb, &dsc,
+                                                 &curdata->surf));
+    curdata->hotx = 0;
+    curdata->hoty = 0;
+    cursor->driverdata = curdata;
+
+    SDL_DFB_CHECKERR(curdata->surf->Lock(curdata->surf, DSLF_WRITE,
+                                         (void *) &dest, &pitch));
+
+    /* Relies on the fact that this is only called with ARGB surface. */
+    for (i = 0; i < 32; i++)
+    {
+        for (j = 0; j < 32; j++)
+        {
+            switch (arrow[i][j])
+            {
+            case ' ': dest[j] = 0x00000000; break;
+            case '.': dest[j] = 0xffffffff; break;
+            case 'X': dest[j] = 0xff000000; break;
+            }
+        }
+        dest += (pitch >> 2);
+    }
+
+    curdata->surf->Unlock(curdata->surf);
+    return cursor;
+  error:
+    return NULL;
+}
+
+/* Create a cursor from a surface */
+static SDL_Cursor *
+DirectFB_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
+{
+    SDL_VideoDevice *dev = SDL_GetVideoDevice();
+
+    SDL_DFB_DEVICEDATA(dev);
+    DFB_CursorData *curdata;
+    DFBResult ret;
+    DFBSurfaceDescription dsc;
+    SDL_Cursor *cursor;
+    Uint32 *dest;
+    Uint32 *p;
+    int pitch, i;
+
+    SDL_assert(surface->format->format == SDL_PIXELFORMAT_ARGB8888);
+    SDL_assert(surface->pitch == surface->w * 4);
+
+    SDL_DFB_ALLOC_CLEAR( cursor, sizeof(*cursor));
+    SDL_DFB_ALLOC_CLEAR(curdata, sizeof(*curdata));
+
+    dsc.flags =
+        DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_CAPS;
+    dsc.caps = DSCAPS_VIDEOONLY;
+    dsc.width = surface->w;
+    dsc.height = surface->h;
+    dsc.pixelformat = DSPF_ARGB;
+
+    SDL_DFB_CHECKERR(devdata->dfb->CreateSurface(devdata->dfb, &dsc,
+                                                 &curdata->surf));
+    curdata->hotx = hot_x;
+    curdata->hoty = hot_y;
+    cursor->driverdata = curdata;
+
+    SDL_DFB_CHECKERR(curdata->surf->Lock(curdata->surf, DSLF_WRITE,
+                                         (void *) &dest, &pitch));
+
+    p = surface->pixels;
+    for (i = 0; i < surface->h; i++)
+        memcpy((char *) dest + i * pitch,
+               (char *) p + i * surface->pitch, 4 * surface->w);
+
+    curdata->surf->Unlock(curdata->surf);
+    return cursor;
+  error:
+    return NULL;
+}
+
+/* Show the specified cursor, or hide if cursor is NULL */
+static int
+DirectFB_ShowCursor(SDL_Cursor * cursor)
+{
+    SDL_DFB_CURSORDATA(cursor);
+    DFBResult ret;
+    SDL_Window *window;
+
+    window = SDL_GetFocusWindow();
+    if (!window)
+        return -1;
+    else {
+        SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+
+        if (display) {
+            DFB_DisplayData *dispdata =
+                (DFB_DisplayData *) display->driverdata;
+            DFB_WindowData *windata = (DFB_WindowData *) window->driverdata;
+
+            if (cursor)
+                SDL_DFB_CHECKERR(windata->dfbwin->
+                                 SetCursorShape(windata->dfbwin,
+                                                curdata->surf, curdata->hotx,
+                                                curdata->hoty));
+
+            SDL_DFB_CHECKERR(dispdata->layer->
+                             SetCooperativeLevel(dispdata->layer,
+                                                 DLSCL_ADMINISTRATIVE));
+            SDL_DFB_CHECKERR(dispdata->layer->
+                             SetCursorOpacity(dispdata->layer,
+                                              cursor ? 0xC0 : 0x00));
+            SDL_DFB_CHECKERR(dispdata->layer->
+                             SetCooperativeLevel(dispdata->layer,
+                                                 DLSCL_SHARED));
+        }
+    }
+
+    return 0;
+  error:
+    return -1;
+}
+
+/* Free a window manager cursor */
+static void
+DirectFB_FreeCursor(SDL_Cursor * cursor)
+{
+    SDL_DFB_CURSORDATA(cursor);
+
+    SDL_DFB_RELEASE(curdata->surf);
+    SDL_DFB_FREE(cursor->driverdata);
+    SDL_DFB_FREE(cursor);
+}
+
+/* Warp the mouse to (x,y) */
+static void
+DirectFB_WarpMouse(SDL_Window * window, int x, int y)
+{
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
+    DFB_WindowData *windata = (DFB_WindowData *) window->driverdata;
+    DFBResult ret;
+    int cx, cy;
+
+    SDL_DFB_CHECKERR(windata->dfbwin->GetPosition(windata->dfbwin, &cx, &cy));
+    SDL_DFB_CHECKERR(dispdata->layer->WarpCursor(dispdata->layer,
+                                                 cx + x + windata->client.x,
+                                                 cy + y + windata->client.y));
+
+  error:
+    return;
+}
+
+#if USE_MULTI_API
+
+static void DirectFB_WarpMouse(SDL_Mouse * mouse, SDL_Window * window,
+                               int x, int y);
+
+static int id_mask;
+
+static DFBEnumerationResult
+EnumMice(DFBInputDeviceID device_id, DFBInputDeviceDescription desc,
+         void *callbackdata)
+{
+    DFB_DeviceData *devdata = callbackdata;
+
+    if ((desc.type & DIDTF_MOUSE) && (device_id & id_mask)) {
+        SDL_Mouse mouse;
+
+        SDL_zero(mouse);
+        mouse.id = device_id;
+        mouse.CreateCursor = DirectFB_CreateCursor;
+        mouse.ShowCursor = DirectFB_ShowCursor;
+        mouse.MoveCursor = DirectFB_MoveCursor;
+        mouse.FreeCursor = DirectFB_FreeCursor;
+        mouse.WarpMouse = DirectFB_WarpMouse;
+        mouse.FreeMouse = DirectFB_FreeMouse;
+        mouse.cursor_shown = 1;
+
+        SDL_AddMouse(&mouse, desc.name, 0, 0, 1);
+        devdata->mouse_id[devdata->num_mice++] = device_id;
+    }
+    return DFENUM_OK;
+}
+
+void
+DirectFB_InitMouse(_THIS)
+{
+    SDL_DFB_DEVICEDATA(_this);
+
+    devdata->num_mice = 0;
+    if (devdata->use_linux_input) {
+        /* try non-core devices first */
+        id_mask = 0xF0;
+        devdata->dfb->EnumInputDevices(devdata->dfb, EnumMice, devdata);
+        if (devdata->num_mice == 0) {
+            /* try core devices */
+            id_mask = 0x0F;
+            devdata->dfb->EnumInputDevices(devdata->dfb, EnumMice, devdata);
+        }
+    }
+    if (devdata->num_mice == 0) {
+        SDL_Mouse mouse;
+
+        SDL_zero(mouse);
+        mouse.CreateCursor = DirectFB_CreateCursor;
+        mouse.ShowCursor = DirectFB_ShowCursor;
+        mouse.MoveCursor = DirectFB_MoveCursor;
+        mouse.FreeCursor = DirectFB_FreeCursor;
+        mouse.WarpMouse = DirectFB_WarpMouse;
+        mouse.FreeMouse = DirectFB_FreeMouse;
+        mouse.cursor_shown = 1;
+
+        SDL_AddMouse(&mouse, "Mouse", 0, 0, 1);
+        devdata->num_mice = 1;
+    }
+}
+
+void
+DirectFB_QuitMouse(_THIS)
+{
+    SDL_DFB_DEVICEDATA(_this);
+
+    if (devdata->use_linux_input) {
+        SDL_MouseQuit();
+    } else {
+        SDL_DelMouse(0);
+    }
+}
+
+
+/* This is called when a mouse motion event occurs */
+static void
+DirectFB_MoveCursor(SDL_Cursor * cursor)
+{
+
+}
+
+/* Warp the mouse to (x,y) */
+static void
+DirectFB_WarpMouse(SDL_Mouse * mouse, SDL_Window * window, int x, int y)
+{
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
+    DFB_WindowData *windata = (DFB_WindowData *) window->driverdata;
+    DFBResult ret;
+    int cx, cy;
+
+    SDL_DFB_CHECKERR(windata->dfbwin->GetPosition(windata->dfbwin, &cx, &cy));
+    SDL_DFB_CHECKERR(dispdata->layer->WarpCursor(dispdata->layer,
+                                                 cx + x + windata->client.x,
+                                                 cy + y + windata->client.y));
+
+  error:
+    return;
+}
+
+/* Free the mouse when it's time */
+static void
+DirectFB_FreeMouse(SDL_Mouse * mouse)
+{
+    /* nothing yet */
+}
+
+#else /* USE_MULTI_API */
+
+void
+DirectFB_InitMouse(_THIS)
+{
+    SDL_DFB_DEVICEDATA(_this);
+
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    mouse->CreateCursor = DirectFB_CreateCursor;
+    mouse->ShowCursor = DirectFB_ShowCursor;
+    mouse->WarpMouse = DirectFB_WarpMouse;
+    mouse->FreeCursor = DirectFB_FreeCursor;
+
+    SDL_SetDefaultCursor(DirectFB_CreateDefaultCursor());
+
+    devdata->num_mice = 1;
+}
+
+void
+DirectFB_QuitMouse(_THIS)
+{
+}
+
+
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_mouse.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_mouse.h
new file mode 100644
index 000000000..7ac486820
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_mouse.h	
@@ -0,0 +1,44 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_DirectFB_mouse_h
+#define _SDL_DirectFB_mouse_h
+
+#include <directfb.h>
+
+#include "../SDL_sysvideo.h"
+
+typedef struct _DFB_CursorData DFB_CursorData;
+struct _DFB_CursorData
+{
+    IDirectFBSurface *surf;
+    int             hotx;
+    int             hoty;
+};
+
+#define SDL_DFB_CURSORDATA(curs)  DFB_CursorData *curdata = (DFB_CursorData *) ((curs) ? (curs)->driverdata : NULL)
+
+extern void DirectFB_InitMouse(_THIS);
+extern void DirectFB_QuitMouse(_THIS);
+
+#endif /* _SDL_DirectFB_mouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_opengl.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_opengl.c
new file mode 100644
index 000000000..1a378792d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_opengl.c	
@@ -0,0 +1,345 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
+#include "SDL_DirectFB_video.h"
+
+#if SDL_DIRECTFB_OPENGL
+
+#include "SDL_DirectFB_opengl.h"
+#include "SDL_DirectFB_window.h"
+
+#include <directfbgl.h>
+#include "SDL_loadso.h"
+#endif
+
+#if SDL_DIRECTFB_OPENGL
+
+struct SDL_GLDriverData
+{
+    int gl_active;              /* to stop switching drivers while we have a valid context */
+    int initialized;
+    DirectFB_GLContext *firstgl;        /* linked list */
+
+    /* OpenGL */
+    void (*glFinish) (void);
+    void (*glFlush) (void);
+};
+
+#define OPENGL_REQUIRS_DLOPEN
+#if defined(OPENGL_REQUIRS_DLOPEN) && defined(SDL_LOADSO_DLOPEN)
+#include <dlfcn.h>
+#define GL_LoadObject(X)    dlopen(X, (RTLD_NOW|RTLD_GLOBAL))
+#define GL_LoadFunction     dlsym
+#define GL_UnloadObject     dlclose
+#else
+#define GL_LoadObject   SDL_LoadObject
+#define GL_LoadFunction SDL_LoadFunction
+#define GL_UnloadObject SDL_UnloadObject
+#endif
+
+static void DirectFB_GL_UnloadLibrary(_THIS);
+
+int
+DirectFB_GL_Initialize(_THIS)
+{
+    if (_this->gl_data) {
+        return 0;
+    }
+
+    _this->gl_data =
+        (struct SDL_GLDriverData *) SDL_calloc(1,
+                                               sizeof(struct
+                                                      SDL_GLDriverData));
+    if (!_this->gl_data) {
+        return SDL_OutOfMemory();
+    }
+    _this->gl_data->initialized = 0;
+
+    ++_this->gl_data->initialized;
+    _this->gl_data->firstgl = NULL;
+
+    if (DirectFB_GL_LoadLibrary(_this, NULL) < 0) {
+        return -1;
+    }
+
+    /* Initialize extensions */
+    /* FIXME needed?
+     * X11_GL_InitExtensions(_this);
+     */
+
+    return 0;
+}
+
+void
+DirectFB_GL_Shutdown(_THIS)
+{
+    if (!_this->gl_data || (--_this->gl_data->initialized > 0)) {
+        return;
+    }
+
+    DirectFB_GL_UnloadLibrary(_this);
+
+    SDL_free(_this->gl_data);
+    _this->gl_data = NULL;
+}
+
+int
+DirectFB_GL_LoadLibrary(_THIS, const char *path)
+{
+    void *handle = NULL;
+
+    SDL_DFB_DEBUG("Loadlibrary : %s\n", path);
+
+    if (_this->gl_data->gl_active) {
+        return SDL_SetError("OpenGL context already created");
+    }
+
+
+    if (path == NULL) {
+        path = SDL_getenv("SDL_VIDEO_GL_DRIVER");
+        if (path == NULL) {
+            path = "libGL.so";
+        }
+    }
+
+    handle = GL_LoadObject(path);
+    if (handle == NULL) {
+        SDL_DFB_ERR("Library not found: %s\n", path);
+        /* SDL_LoadObject() will call SDL_SetError() for us. */
+        return -1;
+    }
+
+    SDL_DFB_DEBUG("Loaded library: %s\n", path);
+
+    _this->gl_config.dll_handle = handle;
+    _this->gl_config.driver_loaded = 1;
+    if (path) {
+        SDL_strlcpy(_this->gl_config.driver_path, path,
+                    SDL_arraysize(_this->gl_config.driver_path));
+    } else {
+        *_this->gl_config.driver_path = '\0';
+    }
+
+    _this->gl_data->glFinish = DirectFB_GL_GetProcAddress(_this, "glFinish");
+    _this->gl_data->glFlush = DirectFB_GL_GetProcAddress(_this, "glFlush");
+
+    return 0;
+}
+
+static void
+DirectFB_GL_UnloadLibrary(_THIS)
+{
+ #if 0
+    int ret;
+
+    if (_this->gl_config.driver_loaded) {
+
+        ret = GL_UnloadObject(_this->gl_config.dll_handle);
+        if (ret)
+            SDL_DFB_ERR("Error #%d trying to unload library.\n", ret);
+        _this->gl_config.dll_handle = NULL;
+        _this->gl_config.driver_loaded = 0;
+    }
+#endif
+    /* Free OpenGL memory */
+    SDL_free(_this->gl_data);
+    _this->gl_data = NULL;
+}
+
+void *
+DirectFB_GL_GetProcAddress(_THIS, const char *proc)
+{
+    void *handle;
+
+    handle = _this->gl_config.dll_handle;
+    return GL_LoadFunction(handle, proc);
+}
+
+SDL_GLContext
+DirectFB_GL_CreateContext(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+    DirectFB_GLContext *context;
+
+    SDL_DFB_ALLOC_CLEAR(context, sizeof(DirectFB_GLContext));
+
+    SDL_DFB_CHECKERR(windata->surface->GetGL(windata->surface,
+                                             &context->context));
+
+    if (!context->context)
+        return NULL;
+
+    context->is_locked = 0;
+    context->sdl_window = window;
+
+    context->next = _this->gl_data->firstgl;
+    _this->gl_data->firstgl = context;
+
+    SDL_DFB_CHECK(context->context->Unlock(context->context));
+
+    if (DirectFB_GL_MakeCurrent(_this, window, context) < 0) {
+        DirectFB_GL_DeleteContext(_this, context);
+        return NULL;
+    }
+
+    return context;
+
+  error:
+    return NULL;
+}
+
+int
+DirectFB_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
+{
+    DirectFB_GLContext *ctx = (DirectFB_GLContext *) context;
+    DirectFB_GLContext *p;
+
+    for (p = _this->gl_data->firstgl; p; p = p->next)
+    {
+       if (p->is_locked) {
+         SDL_DFB_CHECKERR(p->context->Unlock(p->context));
+         p->is_locked = 0;
+       }
+
+    }
+
+    if (ctx != NULL) {
+        SDL_DFB_CHECKERR(ctx->context->Lock(ctx->context));
+        ctx->is_locked = 1;
+    }
+
+    return 0;
+  error:
+    return -1;
+}
+
+int
+DirectFB_GL_SetSwapInterval(_THIS, int interval)
+{
+    return SDL_Unsupported();
+}
+
+int
+DirectFB_GL_GetSwapInterval(_THIS)
+{
+    return 0;
+}
+
+void
+DirectFB_GL_SwapWindow(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+    DFBRegion region;
+    DirectFB_GLContext *p;
+
+    region.x1 = 0;
+    region.y1 = 0;
+    region.x2 = window->w;
+    region.y2 = window->h;
+
+#if 0
+    if (devdata->glFinish)
+        devdata->glFinish();
+    else if (devdata->glFlush)
+        devdata->glFlush();
+#endif
+
+    for (p = _this->gl_data->firstgl; p != NULL; p = p->next)
+        if (p->sdl_window == window && p->is_locked)
+        {
+            SDL_DFB_CHECKERR(p->context->Unlock(p->context));
+            p->is_locked = 0;
+        }
+
+    SDL_DFB_CHECKERR(windata->window_surface->Flip(windata->window_surface,NULL,  DSFLIP_PIPELINE |DSFLIP_BLIT | DSFLIP_ONSYNC ));
+    return;
+  error:
+    return;
+}
+
+void
+DirectFB_GL_DeleteContext(_THIS, SDL_GLContext context)
+{
+    DirectFB_GLContext *ctx = (DirectFB_GLContext *) context;
+    DirectFB_GLContext *p;
+
+    if (ctx->is_locked)
+        SDL_DFB_CHECK(ctx->context->Unlock(ctx->context));
+    SDL_DFB_RELEASE(ctx->context);
+
+    for (p = _this->gl_data->firstgl; p && p->next != ctx; p = p->next)
+        ;
+    if (p)
+        p->next = ctx->next;
+    else
+        _this->gl_data->firstgl = ctx->next;
+
+    SDL_DFB_FREE(ctx);
+}
+
+void
+DirectFB_GL_FreeWindowContexts(_THIS, SDL_Window * window)
+{
+    DirectFB_GLContext *p;
+
+    for (p = _this->gl_data->firstgl; p != NULL; p = p->next)
+        if (p->sdl_window == window)
+        {
+            if (p->is_locked)
+                SDL_DFB_CHECK(p->context->Unlock(p->context));
+            SDL_DFB_RELEASE(p->context);
+        }
+}
+
+void
+DirectFB_GL_ReAllocWindowContexts(_THIS, SDL_Window * window)
+{
+    DirectFB_GLContext *p;
+
+    for (p = _this->gl_data->firstgl; p != NULL; p = p->next)
+        if (p->sdl_window == window)
+        {
+            SDL_DFB_WINDOWDATA(window);
+            SDL_DFB_CHECK(windata->surface->GetGL(windata->surface,
+                                             &p->context));
+            if (p->is_locked)
+                SDL_DFB_CHECK(p->context->Lock(p->context));
+            }
+}
+
+void
+DirectFB_GL_DestroyWindowContexts(_THIS, SDL_Window * window)
+{
+    DirectFB_GLContext *p;
+
+    for (p = _this->gl_data->firstgl; p != NULL; p = p->next)
+        if (p->sdl_window == window)
+            DirectFB_GL_DeleteContext(_this, p);
+}
+
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_opengl.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_opengl.h
new file mode 100644
index 000000000..ecd5bbafb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_opengl.h	
@@ -0,0 +1,64 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+#ifndef _SDL_directfb_opengl_h
+#define _SDL_directfb_opengl_h
+
+#include "SDL_DirectFB_video.h"
+
+#if SDL_DIRECTFB_OPENGL
+
+#include "SDL_opengl.h"
+
+typedef struct _DirectFB_GLContext DirectFB_GLContext;
+struct _DirectFB_GLContext
+{
+    IDirectFBGL         *context;
+    DirectFB_GLContext  *next;
+
+    SDL_Window          *sdl_window;
+    int                 is_locked;
+};
+
+/* OpenGL functions */
+extern int DirectFB_GL_Initialize(_THIS);
+extern void DirectFB_GL_Shutdown(_THIS);
+
+extern int DirectFB_GL_LoadLibrary(_THIS, const char *path);
+extern void *DirectFB_GL_GetProcAddress(_THIS, const char *proc);
+extern SDL_GLContext DirectFB_GL_CreateContext(_THIS, SDL_Window * window);
+extern int DirectFB_GL_MakeCurrent(_THIS, SDL_Window * window,
+                                   SDL_GLContext context);
+extern int DirectFB_GL_SetSwapInterval(_THIS, int interval);
+extern int DirectFB_GL_GetSwapInterval(_THIS);
+extern void DirectFB_GL_SwapWindow(_THIS, SDL_Window * window);
+extern void DirectFB_GL_DeleteContext(_THIS, SDL_GLContext context);
+
+extern void DirectFB_GL_FreeWindowContexts(_THIS, SDL_Window * window);
+extern void DirectFB_GL_ReAllocWindowContexts(_THIS, SDL_Window * window);
+extern void DirectFB_GL_DestroyWindowContexts(_THIS, SDL_Window * window);
+
+#endif /* SDL_DIRECTFB_OPENGL */
+
+#endif /* _SDL_directfb_opengl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_render.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_render.c
new file mode 100644
index 000000000..61f9b00c5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_render.c	
@@ -0,0 +1,1328 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+#include "SDL_DirectFB_window.h"
+#include "SDL_DirectFB_modes.h"
+
+#include "SDL_syswm.h"
+#include "SDL_DirectFB_shape.h"
+
+#include "../SDL_sysvideo.h"
+#include "../../render/SDL_sysrender.h"
+
+#ifndef DFB_VERSION_ATLEAST
+
+#define DFB_VERSIONNUM(X, Y, Z)                     \
+    ((X)*1000 + (Y)*100 + (Z))
+
+#define DFB_COMPILEDVERSION \
+    DFB_VERSIONNUM(DIRECTFB_MAJOR_VERSION, DIRECTFB_MINOR_VERSION, DIRECTFB_MICRO_VERSION)
+
+#define DFB_VERSION_ATLEAST(X, Y, Z) \
+    (DFB_COMPILEDVERSION >= DFB_VERSIONNUM(X, Y, Z))
+
+#define SDL_DFB_CHECK(x)    x
+
+#endif
+
+/* the following is not yet tested ... */
+#define USE_DISPLAY_PALETTE         (0)
+
+
+#define SDL_DFB_RENDERERDATA(rend) DirectFB_RenderData *renddata = ((rend) ? (DirectFB_RenderData *) (rend)->driverdata : NULL)
+
+
+/* GDI renderer implementation */
+
+static SDL_Renderer *DirectFB_CreateRenderer(SDL_Window * window,
+                                             Uint32 flags);
+static void DirectFB_ActivateRenderer(SDL_Renderer * renderer);
+static int DirectFB_CreateTexture(SDL_Renderer * renderer,
+                                  SDL_Texture * texture);
+static int DirectFB_QueryTexturePixels(SDL_Renderer * renderer,
+                                       SDL_Texture * texture,
+                                       void **pixels, int *pitch);
+static int DirectFB_SetTexturePalette(SDL_Renderer * renderer,
+                                      SDL_Texture * texture,
+                                      const SDL_Color * colors,
+                                      int firstcolor, int ncolors);
+static int DirectFB_GetTexturePalette(SDL_Renderer * renderer,
+                                      SDL_Texture * texture,
+                                      SDL_Color * colors,
+                                      int firstcolor, int ncolors);
+static int DirectFB_SetTextureAlphaMod(SDL_Renderer * renderer,
+                                       SDL_Texture * texture);
+static int DirectFB_SetTextureColorMod(SDL_Renderer * renderer,
+                                       SDL_Texture * texture);
+static int DirectFB_SetTextureBlendMode(SDL_Renderer * renderer,
+                                        SDL_Texture * texture);
+static int DirectFB_SetTextureScaleMode(SDL_Renderer * renderer,
+                                        SDL_Texture * texture);
+static int DirectFB_UpdateTexture(SDL_Renderer * renderer,
+                                  SDL_Texture * texture,
+                                  const SDL_Rect * rect,
+                                  const void *pixels, int pitch);
+static int DirectFB_LockTexture(SDL_Renderer * renderer,
+                                SDL_Texture * texture,
+                                const SDL_Rect * rect,
+                                void **pixels, int *pitch);
+static void DirectFB_UnlockTexture(SDL_Renderer * renderer,
+                                   SDL_Texture * texture);
+static void DirectFB_DirtyTexture(SDL_Renderer * renderer,
+                                  SDL_Texture * texture, int numrects,
+                                  const SDL_Rect * rects);
+static int DirectFB_SetDrawBlendMode(SDL_Renderer * renderer);
+static int DirectFB_RenderDrawPoints(SDL_Renderer * renderer,
+                                const SDL_FPoint * points, int count);
+static int DirectFB_RenderDrawLines(SDL_Renderer * renderer,
+                               const SDL_FPoint * points, int count);
+static int DirectFB_RenderDrawRects(SDL_Renderer * renderer,
+        const SDL_Rect ** rects, int count);
+static int DirectFB_RenderFillRects(SDL_Renderer * renderer,
+        const SDL_FRect * rects, int count);
+static int DirectFB_RenderCopy(SDL_Renderer * renderer,
+                               SDL_Texture * texture,
+                               const SDL_Rect * srcrect,
+                               const SDL_FRect * dstrect);
+static void DirectFB_RenderPresent(SDL_Renderer * renderer);
+static void DirectFB_DestroyTexture(SDL_Renderer * renderer,
+                                    SDL_Texture * texture);
+static void DirectFB_DestroyRenderer(SDL_Renderer * renderer);
+static int DirectFB_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                     Uint32 format, void * pixels, int pitch);
+static int DirectFB_RenderWritePixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                      Uint32 format, const void * pixels, int pitch);
+static int DirectFB_UpdateViewport(SDL_Renderer * renderer);
+static int DirectFB_UpdateClipRect(SDL_Renderer * renderer);
+static int DirectFB_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture);
+
+static int PrepareDraw(SDL_Renderer * renderer);
+
+
+#define SDL_DFB_WINDOWSURFACE(win)  IDirectFBSurface *destsurf = ((DFB_WindowData *) ((win)->driverdata))->surface;
+
+SDL_RenderDriver DirectFB_RenderDriver = {
+    DirectFB_CreateRenderer,
+    {
+     "directfb",
+     (SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED),
+     /* (SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR |
+      SDL_TEXTUREMODULATE_ALPHA),
+      (SDL_BLENDMODE_NONE | SDL_BLENDMODE_MASK | SDL_BLENDMODE_BLEND |
+      SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD),
+     (SDL_SCALEMODE_NONE | SDL_SCALEMODE_FAST |
+      SDL_SCALEMODE_SLOW | SDL_SCALEMODE_BEST), */
+     0,
+     {
+             /* formats filled in later */
+     },
+     0,
+     0}
+};
+
+typedef struct
+{
+    SDL_Window *window;
+    DFBSurfaceFlipFlags flipflags;
+    int size_changed;
+    int lastBlendMode;
+    DFBSurfaceBlittingFlags blitFlags;
+    DFBSurfaceDrawingFlags drawFlags;
+    IDirectFBSurface* target;
+} DirectFB_RenderData;
+
+typedef struct
+{
+    IDirectFBSurface *surface;
+    Uint32 format;
+    void *pixels;
+    int pitch;
+    IDirectFBPalette *palette;
+    int isDirty;
+
+    SDL_VideoDisplay *display;      /* only for yuv textures */
+
+#if (DFB_VERSION_ATLEAST(1,2,0))
+    DFBSurfaceRenderOptions render_options;
+#endif
+} DirectFB_TextureData;
+
+static SDL_INLINE void
+SDLtoDFBRect(const SDL_Rect * sr, DFBRectangle * dr)
+{
+    dr->x = sr->x;
+    dr->y = sr->y;
+    dr->h = sr->h;
+    dr->w = sr->w;
+}
+static SDL_INLINE void
+SDLtoDFBRect_Float(const SDL_FRect * sr, DFBRectangle * dr)
+{
+    dr->x = sr->x;
+    dr->y = sr->y;
+    dr->h = sr->h;
+    dr->w = sr->w;
+}
+
+
+static int
+TextureHasAlpha(DirectFB_TextureData * data)
+{
+    /* Drawing primitive ? */
+    if (!data)
+        return 0;
+
+    return (DFB_PIXELFORMAT_HAS_ALPHA(DirectFB_SDLToDFBPixelFormat(data->format)) ? 1 : 0);
+#if 0
+    switch (data->format) {
+    case SDL_PIXELFORMAT_INDEX4LSB:
+    case SDL_PIXELFORMAT_INDEX4MSB:
+    case SDL_PIXELFORMAT_ARGB4444:
+    case SDL_PIXELFORMAT_ARGB1555:
+    case SDL_PIXELFORMAT_ARGB8888:
+    case SDL_PIXELFORMAT_RGBA8888:
+    case SDL_PIXELFORMAT_ABGR8888:
+    case SDL_PIXELFORMAT_BGRA8888:
+    case SDL_PIXELFORMAT_ARGB2101010:
+       return 1;
+    default:
+        return 0;
+    }
+#endif
+}
+
+static SDL_INLINE IDirectFBSurface *get_dfb_surface(SDL_Window *window)
+{
+    SDL_SysWMinfo wm_info;
+    SDL_memset(&wm_info, 0, sizeof(SDL_SysWMinfo));
+
+    SDL_VERSION(&wm_info.version);
+    SDL_GetWindowWMInfo(window, &wm_info);
+
+    return wm_info.info.dfb.surface;
+}
+
+static SDL_INLINE IDirectFBWindow *get_dfb_window(SDL_Window *window)
+{
+    SDL_SysWMinfo wm_info;
+    SDL_memset(&wm_info, 0, sizeof(SDL_SysWMinfo));
+
+    SDL_VERSION(&wm_info.version);
+    SDL_GetWindowWMInfo(window, &wm_info);
+
+    return wm_info.info.dfb.window;
+}
+
+static void
+SetBlendMode(DirectFB_RenderData * data, int blendMode,
+             DirectFB_TextureData * source)
+{
+    IDirectFBSurface *destsurf = data->target;
+
+    /* FIXME: check for format change */
+    if (1 || data->lastBlendMode != blendMode) {
+        switch (blendMode) {
+        case SDL_BLENDMODE_NONE:
+                                           /**< No blending */
+            data->blitFlags = DSBLIT_NOFX;
+            data->drawFlags = DSDRAW_NOFX;
+            SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_ONE));
+            SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_ZERO));
+            break;
+#if 0
+        case SDL_BLENDMODE_MASK:
+            data->blitFlags =  DSBLIT_BLEND_ALPHACHANNEL;
+            data->drawFlags = DSDRAW_BLEND;
+            SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_SRCALPHA));
+            SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA));
+            break;
+#endif
+        case SDL_BLENDMODE_BLEND:
+            data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
+            data->drawFlags = DSDRAW_BLEND;
+            SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_SRCALPHA));
+            SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_INVSRCALPHA));
+            break;
+        case SDL_BLENDMODE_ADD:
+            data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
+            data->drawFlags = DSDRAW_BLEND;
+            /* FIXME: SRCALPHA kills performance on radeon ...
+             * It will be cheaper to copy the surface to a temporary surface and premultiply
+             */
+            if (source && TextureHasAlpha(source))
+                SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_SRCALPHA));
+            else
+                SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_ONE));
+            SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_ONE));
+            break;
+        case SDL_BLENDMODE_MOD:
+            data->blitFlags = DSBLIT_BLEND_ALPHACHANNEL;
+            data->drawFlags = DSDRAW_BLEND;
+            SDL_DFB_CHECK(destsurf->SetSrcBlendFunction(destsurf, DSBF_ZERO));
+            SDL_DFB_CHECK(destsurf->SetDstBlendFunction(destsurf, DSBF_SRCCOLOR));
+
+            break;
+        }
+        data->lastBlendMode = blendMode;
+    }
+}
+
+static int
+DisplayPaletteChanged(void *userdata, SDL_Palette * palette)
+{
+#if USE_DISPLAY_PALETTE
+    DirectFB_RenderData *data = (DirectFB_RenderData *) userdata;
+    SDL_DFB_WINDOWSURFACE(data->window);
+    IDirectFBPalette *surfpal;
+
+    int i;
+    int ncolors;
+    DFBColor entries[256];
+
+    SDL_DFB_CHECKERR(destsurf->GetPalette(destsurf, &surfpal));
+
+    /* FIXME: number of colors */
+    ncolors = (palette->ncolors < 256 ? palette->ncolors : 256);
+
+    for (i = 0; i < ncolors; ++i) {
+        entries[i].r = palette->colors[i].r;
+        entries[i].g = palette->colors[i].g;
+        entries[i].b = palette->colors[i].b;
+        entries[i].a = palette->colors[i].a;
+    }
+    SDL_DFB_CHECKERR(surfpal->SetEntries(surfpal, entries, ncolors, 0));
+    return 0;
+  error:
+#else
+    SDL_Unsupported();
+#endif
+    return -1;
+}
+
+static void
+DirectFB_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
+{
+    SDL_DFB_RENDERERDATA(renderer);
+
+    if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
+        /* Rebind the context to the window area and update matrices */
+        /* SDL_CurrentContext = NULL; */
+        /* data->updateSize = SDL_TRUE; */
+        renddata->size_changed = SDL_TRUE;
+   }
+}
+
+int
+DirectFB_RenderClear(SDL_Renderer * renderer)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *destsurf = data->target;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    PrepareDraw(renderer);
+
+    destsurf->Clear(destsurf, renderer->r, renderer->g, renderer->b, renderer->a);
+
+
+    return 0;
+}
+
+SDL_Renderer *
+DirectFB_CreateRenderer(SDL_Window * window, Uint32 flags)
+{
+    IDirectFBSurface *winsurf = get_dfb_surface(window);
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_Renderer *renderer = NULL;
+    DirectFB_RenderData *data = NULL;
+    DFBSurfaceCapabilities scaps;
+
+    SDL_DFB_ALLOC_CLEAR(renderer, sizeof(*renderer));
+    SDL_DFB_ALLOC_CLEAR(data, sizeof(*data));
+
+    renderer->WindowEvent = DirectFB_WindowEvent;
+    renderer->CreateTexture = DirectFB_CreateTexture;
+    renderer->SetTextureAlphaMod = DirectFB_SetTextureAlphaMod;
+    renderer->SetTextureColorMod = DirectFB_SetTextureColorMod;
+    renderer->SetTextureBlendMode = DirectFB_SetTextureBlendMode;
+    renderer->UpdateTexture = DirectFB_UpdateTexture;
+    renderer->LockTexture = DirectFB_LockTexture;
+    renderer->RenderClear = DirectFB_RenderClear;
+    renderer->UnlockTexture = DirectFB_UnlockTexture;
+    renderer->RenderDrawPoints = DirectFB_RenderDrawPoints;
+    renderer->RenderDrawLines = DirectFB_RenderDrawLines;
+    /* SetDrawColor - no needed */
+    renderer->RenderFillRects = DirectFB_RenderFillRects;
+
+    renderer->RenderCopy = DirectFB_RenderCopy;
+    renderer->RenderPresent = DirectFB_RenderPresent;
+
+    /* FIXME: Yet to be tested */
+    renderer->RenderReadPixels = DirectFB_RenderReadPixels;
+    /* renderer->RenderWritePixels = DirectFB_RenderWritePixels; */
+
+    renderer->DestroyTexture = DirectFB_DestroyTexture;
+    renderer->DestroyRenderer = DirectFB_DestroyRenderer;
+    renderer->UpdateViewport = DirectFB_UpdateViewport;
+    renderer->UpdateClipRect = DirectFB_UpdateClipRect;
+    renderer->SetRenderTarget = DirectFB_SetRenderTarget;
+
+#if 0
+    renderer->QueryTexturePixels = DirectFB_QueryTexturePixels;
+    renderer->SetTexturePalette = DirectFB_SetTexturePalette;
+    renderer->GetTexturePalette = DirectFB_GetTexturePalette;
+    renderer->SetTextureScaleMode = DirectFB_SetTextureScaleMode;
+    renderer->DirtyTexture = DirectFB_DirtyTexture;
+    renderer->SetDrawBlendMode = DirectFB_SetDrawBlendMode;
+    renderer->RenderDrawRects = DirectFB_RenderDrawRects;
+#endif
+
+    renderer->info = DirectFB_RenderDriver.info;
+    renderer->window = window;      /* SDL window */
+    renderer->driverdata = data;
+
+    renderer->info.flags =
+        SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE;
+
+    data->window = window;
+    data->target = winsurf;
+
+    data->flipflags = DSFLIP_PIPELINE | DSFLIP_BLIT;
+
+    if (flags & SDL_RENDERER_PRESENTVSYNC) {
+        data->flipflags |= DSFLIP_WAITFORSYNC | DSFLIP_ONSYNC;
+        renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
+    } else
+        data->flipflags |= DSFLIP_ONSYNC;
+
+    SDL_DFB_CHECKERR(winsurf->GetCapabilities(winsurf, &scaps));
+
+#if 0
+    if (scaps & DSCAPS_DOUBLE)
+        renderer->info.flags |= SDL_RENDERER_PRESENTFLIP2;
+    else if (scaps & DSCAPS_TRIPLE)
+        renderer->info.flags |= SDL_RENDERER_PRESENTFLIP3;
+    else
+        renderer->info.flags |= SDL_RENDERER_SINGLEBUFFER;
+#endif
+
+    DirectFB_SetSupportedPixelFormats(&renderer->info);
+
+#if 0
+    /* Set up a palette watch on the display palette */
+    if (display-> palette) {
+        SDL_AddPaletteWatch(display->palette, DisplayPaletteChanged, data);
+    }
+#endif
+
+    return renderer;
+
+  error:
+    SDL_DFB_FREE(renderer);
+    SDL_DFB_FREE(data);
+    return NULL;
+}
+
+static void
+DirectFB_ActivateRenderer(SDL_Renderer * renderer)
+{
+    SDL_DFB_RENDERERDATA(renderer);
+    SDL_Window *window = renderer->window;
+    SDL_DFB_WINDOWDATA(window);
+
+    if (renddata->size_changed /* || windata->wm_needs_redraw */) {
+        renddata->size_changed = SDL_FALSE;
+    }
+}
+
+
+static int
+DirectFB_AcquireVidLayer(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    SDL_Window *window = renderer->window;
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_DFB_DEVICEDATA(display->device);
+    DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
+    DirectFB_TextureData *data = texture->driverdata;
+    DFBDisplayLayerConfig layconf;
+    DFBResult ret;
+
+    if (devdata->use_yuv_direct && (dispdata->vidID >= 0)
+        && (!dispdata->vidIDinuse)
+        && SDL_ISPIXELFORMAT_FOURCC(data->format)) {
+        layconf.flags =
+            DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT |
+            DLCONF_SURFACE_CAPS;
+        layconf.width = texture->w;
+        layconf.height = texture->h;
+        layconf.pixelformat = DirectFB_SDLToDFBPixelFormat(data->format);
+        layconf.surface_caps = DSCAPS_VIDEOONLY | DSCAPS_DOUBLE;
+
+        SDL_DFB_CHECKERR(devdata->dfb->GetDisplayLayer(devdata->dfb,
+                                                       dispdata->vidID,
+                                                       &dispdata->vidlayer));
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetCooperativeLevel(dispdata->vidlayer,
+                                                       DLSCL_EXCLUSIVE));
+
+        if (devdata->use_yuv_underlays) {
+            ret = dispdata->vidlayer->SetLevel(dispdata->vidlayer, -1);
+            if (ret != DFB_OK)
+                SDL_DFB_DEBUG("Underlay Setlevel not supported\n");
+        }
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetConfiguration(dispdata->vidlayer,
+                                                    &layconf));
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->GetSurface(dispdata->vidlayer,
+                                              &data->surface));
+        dispdata->vidIDinuse = 1;
+        data->display = display;
+        return 0;
+    }
+    return 1;
+  error:
+    if (dispdata->vidlayer) {
+        SDL_DFB_RELEASE(data->surface);
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetCooperativeLevel(dispdata->vidlayer,
+                                                       DLSCL_ADMINISTRATIVE));
+        SDL_DFB_RELEASE(dispdata->vidlayer);
+    }
+    return 1;
+}
+
+static int
+DirectFB_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    SDL_Window *window = renderer->window;
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_DFB_DEVICEDATA(display->device);
+    DirectFB_TextureData *data;
+    DFBSurfaceDescription dsc;
+    DFBSurfacePixelFormat pixelformat;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    SDL_DFB_ALLOC_CLEAR(data, sizeof(*data));
+    texture->driverdata = data;
+
+    /* find the right pixelformat */
+    pixelformat = DirectFB_SDLToDFBPixelFormat(texture->format);
+    if (pixelformat == DSPF_UNKNOWN) {
+        SDL_SetError("Unknown pixel format %d\n", data->format);
+        goto error;
+    }
+
+    data->format = texture->format;
+    data->pitch = texture->w * DFB_BYTES_PER_PIXEL(pixelformat);
+
+    if (DirectFB_AcquireVidLayer(renderer, texture) != 0) {
+        /* fill surface description */
+        dsc.flags =
+            DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_CAPS;
+        dsc.width = texture->w;
+        dsc.height = texture->h;
+        if(texture->format == SDL_PIXELFORMAT_YV12 ||
+           texture->format == SDL_PIXELFORMAT_IYUV) {
+           /* dfb has problems with odd sizes -make them even internally */
+           dsc.width += (dsc.width % 2);
+           dsc.height += (dsc.height % 2);
+        }
+        /* <1.2 Never use DSCAPS_VIDEOONLY here. It kills performance
+         * No DSCAPS_SYSTEMONLY either - let dfb decide
+         * 1.2: DSCAPS_SYSTEMONLY boosts performance by factor ~8
+         * Depends on other settings as well. Let dfb decide.
+         */
+        dsc.caps = DSCAPS_PREMULTIPLIED;
+#if 0
+        if (texture->access == SDL_TEXTUREACCESS_STREAMING)
+            dsc.caps |= DSCAPS_SYSTEMONLY;
+        else
+            dsc.caps |= DSCAPS_VIDEOONLY;
+#endif
+
+        dsc.pixelformat = pixelformat;
+        data->pixels = NULL;
+
+        /* Create the surface */
+        SDL_DFB_CHECKERR(devdata->dfb->CreateSurface(devdata->dfb, &dsc,
+                                                     &data->surface));
+        if (SDL_ISPIXELFORMAT_INDEXED(data->format)
+            && !SDL_ISPIXELFORMAT_FOURCC(data->format)) {
+#if 1
+            SDL_DFB_CHECKERR(data->surface->GetPalette(data->surface, &data->palette));
+#else
+            /* DFB has issues with blitting LUT8 surfaces.
+             * Creating a new palette does not help.
+             */
+            DFBPaletteDescription pal_desc;
+            pal_desc.flags = DPDESC_SIZE; /* | DPDESC_ENTRIES */
+            pal_desc.size = 256;
+            SDL_DFB_CHECKERR(devdata->dfb->CreatePalette(devdata->dfb, &pal_desc,&data->palette));
+            SDL_DFB_CHECKERR(data->surface->SetPalette(data->surface, data->palette));
+#endif
+        }
+
+    }
+#if (DFB_VERSION_ATLEAST(1,2,0))
+    data->render_options = DSRO_NONE;
+#endif
+    if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
+        /* 3 plane YUVs return 1 bpp, but we need more space for other planes */
+        if(texture->format == SDL_PIXELFORMAT_YV12 ||
+           texture->format == SDL_PIXELFORMAT_IYUV) {
+            SDL_DFB_ALLOC_CLEAR(data->pixels, (texture->h * data->pitch  + ((texture->h + texture->h % 2) * (data->pitch + data->pitch % 2) * 2) / 4));
+        } else {
+            SDL_DFB_ALLOC_CLEAR(data->pixels, texture->h * data->pitch);
+        }
+    }
+
+    return 0;
+
+  error:
+    SDL_DFB_RELEASE(data->palette);
+    SDL_DFB_RELEASE(data->surface);
+    SDL_DFB_FREE(texture->driverdata);
+    return -1;
+}
+
+static int
+DirectFB_QueryTexturePixels(SDL_Renderer * renderer,
+                            SDL_Texture * texture, void **pixels, int *pitch)
+{
+    DirectFB_TextureData *texturedata =
+        (DirectFB_TextureData *) texture->driverdata;
+
+    if (texturedata->display) {
+        return -1;
+    } else {
+        *pixels = texturedata->pixels;
+        *pitch = texturedata->pitch;
+    }
+    return 0;
+}
+
+static int
+DirectFB_SetTexturePalette(SDL_Renderer * renderer,
+                           SDL_Texture * texture,
+                           const SDL_Color * colors, int firstcolor,
+                           int ncolors)
+{
+    DirectFB_TextureData *data = (DirectFB_TextureData *) texture->driverdata;
+    if (SDL_ISPIXELFORMAT_INDEXED(data->format)
+        && !SDL_ISPIXELFORMAT_FOURCC(data->format)) {
+        DFBColor entries[256];
+        int i;
+
+        if (ncolors > 256)
+            ncolors = 256;
+
+        for (i = 0; i < ncolors; ++i) {
+            entries[i].r = colors[i].r;
+            entries[i].g = colors[i].g;
+            entries[i].b = colors[i].b;
+            entries[i].a = 0xff;
+        }
+        SDL_DFB_CHECKERR(data->
+                         palette->SetEntries(data->palette, entries, ncolors, firstcolor));
+        return 0;
+    } else {
+        return SDL_SetError("YUV textures don't have a palette");
+    }
+  error:
+    return -1;
+}
+
+static int
+DirectFB_GetTexturePalette(SDL_Renderer * renderer,
+                           SDL_Texture * texture, SDL_Color * colors,
+                           int firstcolor, int ncolors)
+{
+    DirectFB_TextureData *data = (DirectFB_TextureData *) texture->driverdata;
+
+    if (SDL_ISPIXELFORMAT_INDEXED(data->format)
+        && !SDL_ISPIXELFORMAT_FOURCC(data->format)) {
+        DFBColor entries[256];
+        int i;
+
+        SDL_DFB_CHECKERR(data->
+                         palette->GetEntries(data->palette, entries, ncolors,
+                                             firstcolor));
+
+        for (i = 0; i < ncolors; ++i) {
+            colors[i].r = entries[i].r;
+            colors[i].g = entries[i].g;
+            colors[i].b = entries[i].b;
+            colors[i].a = SDL_ALPHA_OPAQUE;
+        }
+        return 0;
+    } else {
+        return SDL_SetError("YUV textures don't have a palette");
+    }
+  error:
+    return -1;
+}
+
+static int
+DirectFB_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    return 0;
+}
+
+static int
+DirectFB_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    return 0;
+}
+
+static int
+DirectFB_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    switch (texture->blendMode) {
+    case SDL_BLENDMODE_NONE:
+    /* case SDL_BLENDMODE_MASK: */
+    case SDL_BLENDMODE_BLEND:
+    case SDL_BLENDMODE_ADD:
+    case SDL_BLENDMODE_MOD:
+        return 0;
+    default:
+        texture->blendMode = SDL_BLENDMODE_NONE;
+        return SDL_Unsupported();
+    }
+}
+
+static int
+DirectFB_SetDrawBlendMode(SDL_Renderer * renderer)
+{
+    switch (renderer->blendMode) {
+    case SDL_BLENDMODE_NONE:
+    /* case SDL_BLENDMODE_MASK: */
+    case SDL_BLENDMODE_BLEND:
+    case SDL_BLENDMODE_ADD:
+    case SDL_BLENDMODE_MOD:
+        return 0;
+    default:
+        renderer->blendMode = SDL_BLENDMODE_NONE;
+        return SDL_Unsupported();
+    }
+}
+
+#if 0
+static int
+DirectFB_SetTextureScaleMode(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+#if (DFB_VERSION_ATLEAST(1,2,0))
+
+    DirectFB_TextureData *data = (DirectFB_TextureData *) texture->driverdata;
+
+    switch (texture->scaleMode) {
+    case SDL_SCALEMODE_NONE:
+    case SDL_SCALEMODE_FAST:
+        data->render_options = DSRO_NONE;
+        break;
+    case SDL_SCALEMODE_SLOW:
+        data->render_options = DSRO_SMOOTH_UPSCALE | DSRO_SMOOTH_DOWNSCALE;
+        break;
+    case SDL_SCALEMODE_BEST:
+        data->render_options =
+            DSRO_SMOOTH_UPSCALE | DSRO_SMOOTH_DOWNSCALE | DSRO_ANTIALIAS;
+        break;
+    default:
+        data->render_options = DSRO_NONE;
+        texture->scaleMode = SDL_SCALEMODE_NONE;
+        return SDL_Unsupported();
+    }
+#endif
+    return 0;
+}
+#endif
+
+static int
+DirectFB_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                       const SDL_Rect * rect, const void *pixels, int pitch)
+{
+    DirectFB_TextureData *data = (DirectFB_TextureData *) texture->driverdata;
+    Uint8 *dpixels;
+    int dpitch;
+    Uint8 *src, *dst;
+    int row;
+    size_t length;
+    int bpp = DFB_BYTES_PER_PIXEL(DirectFB_SDLToDFBPixelFormat(texture->format));
+    /* FIXME: SDL_BYTESPERPIXEL(texture->format) broken for yuv yv12 3 planes */
+
+    DirectFB_ActivateRenderer(renderer);
+
+    if ((texture->format == SDL_PIXELFORMAT_YV12) ||
+        (texture->format == SDL_PIXELFORMAT_IYUV)) {
+        bpp = 1;
+    }
+
+    SDL_DFB_CHECKERR(data->surface->Lock(data->surface,
+                                         DSLF_WRITE | DSLF_READ,
+                                         ((void **) &dpixels), &dpitch));
+    src = (Uint8 *) pixels;
+    dst = (Uint8 *) dpixels + rect->y * dpitch + rect->x * bpp;
+    length = rect->w * bpp;
+    for (row = 0; row < rect->h; ++row) {
+        SDL_memcpy(dst, src, length);
+        src += pitch;
+        dst += dpitch;
+    }
+    /* copy other planes for 3 plane formats */
+    if ((texture->format == SDL_PIXELFORMAT_YV12) ||
+        (texture->format == SDL_PIXELFORMAT_IYUV)) {
+        src = (Uint8 *) pixels + texture->h * pitch;
+        dst = (Uint8 *) dpixels + texture->h * dpitch + rect->y * dpitch / 4 + rect->x * bpp / 2;
+        for (row = 0; row < rect->h / 2 + (rect->h & 1); ++row) {
+            SDL_memcpy(dst, src, length / 2);
+            src += pitch / 2;
+            dst += dpitch / 2;
+        }
+        src = (Uint8 *) pixels + texture->h * pitch + texture->h * pitch / 4;
+        dst = (Uint8 *) dpixels + texture->h * dpitch + texture->h * dpitch / 4 + rect->y * dpitch / 4 + rect->x * bpp / 2;
+        for (row = 0; row < rect->h / 2 + (rect->h & 1); ++row) {
+            SDL_memcpy(dst, src, length / 2);
+            src += pitch / 2;
+            dst += dpitch / 2;
+        }
+    }
+    SDL_DFB_CHECKERR(data->surface->Unlock(data->surface));
+    data->isDirty = 0;
+    return 0;
+  error:
+    return 1;
+
+}
+
+static int
+DirectFB_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                     const SDL_Rect * rect, void **pixels, int *pitch)
+{
+    DirectFB_TextureData *texturedata =
+        (DirectFB_TextureData *) texture->driverdata;
+
+    DirectFB_ActivateRenderer(renderer);
+
+#if 0
+    if (markDirty) {
+        SDL_AddDirtyRect(&texturedata->dirty, rect);
+    }
+#endif
+
+    if (texturedata->display) {
+        void *fdata;
+        int fpitch;
+
+        SDL_DFB_CHECKERR(texturedata->surface->Lock(texturedata->surface,
+                                                    DSLF_WRITE | DSLF_READ,
+                                                    &fdata, &fpitch));
+        *pitch = fpitch;
+        *pixels = fdata;
+    } else {
+        *pixels =
+            (void *) ((Uint8 *) texturedata->pixels +
+                      rect->y * texturedata->pitch +
+                      rect->x * DFB_BYTES_PER_PIXEL(DirectFB_SDLToDFBPixelFormat(texture->format)));
+        *pitch = texturedata->pitch;
+        texturedata->isDirty = 1;
+    }
+    return 0;
+
+  error:
+    return -1;
+}
+
+static void
+DirectFB_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    DirectFB_TextureData *texturedata =
+        (DirectFB_TextureData *) texture->driverdata;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    if (texturedata->display) {
+        SDL_DFB_CHECK(texturedata->surface->Unlock(texturedata->surface));
+        texturedata->pixels = NULL;
+    }
+}
+
+#if 0
+static void
+DirectFB_DirtyTexture(SDL_Renderer * renderer, SDL_Texture * texture,
+                      int numrects, const SDL_Rect * rects)
+{
+    DirectFB_TextureData *data = (DirectFB_TextureData *) texture->driverdata;
+    int i;
+
+    for (i = 0; i < numrects; ++i) {
+        SDL_AddDirtyRect(&data->dirty, &rects[i]);
+    }
+}
+#endif
+
+static int DirectFB_SetRenderTarget(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    DirectFB_TextureData *tex_data = NULL;
+
+    DirectFB_ActivateRenderer(renderer);
+    if (texture) {
+        tex_data = (DirectFB_TextureData *) texture->driverdata;
+        data->target = tex_data->surface;
+    } else {
+        data->target = get_dfb_surface(data->window);
+    }
+    data->lastBlendMode = 0;
+    return 0;
+}
+
+
+static int
+PrepareDraw(SDL_Renderer * renderer)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *destsurf = data->target;
+
+    Uint8 r, g, b, a;
+
+    r = renderer->r;
+    g = renderer->g;
+    b = renderer->b;
+    a = renderer->a;
+
+    SetBlendMode(data, renderer->blendMode, NULL);
+    SDL_DFB_CHECKERR(destsurf->SetDrawingFlags(destsurf, data->drawFlags));
+
+    switch (renderer->blendMode) {
+    case SDL_BLENDMODE_NONE:
+    /* case SDL_BLENDMODE_MASK: */
+    case SDL_BLENDMODE_BLEND:
+        break;
+    case SDL_BLENDMODE_ADD:
+    case SDL_BLENDMODE_MOD:
+        r = ((int) r * (int) a) / 255;
+        g = ((int) g * (int) a) / 255;
+        b = ((int) b * (int) a) / 255;
+        a = 255;
+        break;
+    }
+
+    SDL_DFB_CHECKERR(destsurf->SetColor(destsurf, r, g, b, a));
+    return 0;
+  error:
+    return -1;
+}
+
+static int DirectFB_RenderDrawPoints(SDL_Renderer * renderer,
+                                const SDL_FPoint * points, int count)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *destsurf = data->target;
+    DFBRegion clip_region;
+    int i;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    PrepareDraw(renderer);
+    destsurf->GetClip(destsurf, &clip_region);
+    for (i=0; i < count; i++) {
+        int x = points[i].x + clip_region.x1;
+        int y = points[i].y + clip_region.y1;
+        SDL_DFB_CHECKERR(destsurf->DrawLine(destsurf, x, y, x, y));
+    }
+    return 0;
+  error:
+    return -1;
+}
+
+static int DirectFB_RenderDrawLines(SDL_Renderer * renderer,
+                               const SDL_FPoint * points, int count)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *destsurf = data->target;
+    DFBRegion clip_region;
+    int i;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    PrepareDraw(renderer);
+    /* Use antialiasing when available */
+#if (DFB_VERSION_ATLEAST(1,2,0))
+    SDL_DFB_CHECKERR(destsurf->SetRenderOptions(destsurf, DSRO_ANTIALIAS));
+#endif
+
+    destsurf->GetClip(destsurf, &clip_region);
+    for (i=0; i < count - 1; i++) {
+        int x1 = points[i].x + clip_region.x1;
+        int y1 = points[i].y + clip_region.y1;
+        int x2 = points[i + 1].x + clip_region.x1;
+        int y2 = points[i + 1].y + clip_region.y1;
+        SDL_DFB_CHECKERR(destsurf->DrawLine(destsurf, x1, y1, x2, y2));
+    }
+
+    return 0;
+  error:
+    return -1;
+}
+
+static int
+DirectFB_RenderDrawRects(SDL_Renderer * renderer, const SDL_Rect ** rects, int count)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *destsurf = data->target;
+    DFBRegion clip_region;
+    int i;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    PrepareDraw(renderer);
+
+    destsurf->GetClip(destsurf, &clip_region);
+    for (i=0; i<count; i++) {
+        SDL_Rect dst = {rects[i]->x, rects[i]->y, rects[i]->w, rects[i]->h};
+        dst.x += clip_region.x1;
+        dst.y += clip_region.y1;
+        SDL_DFB_CHECKERR(destsurf->DrawRectangle(destsurf, dst.x, dst.y,
+                dst.w, dst.h));
+    }
+
+    return 0;
+  error:
+    return -1;
+}
+
+static int
+DirectFB_RenderFillRects(SDL_Renderer * renderer, const SDL_FRect * rects, int count)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *destsurf = data->target;
+    DFBRegion clip_region;
+    int i;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    PrepareDraw(renderer);
+
+    destsurf->GetClip(destsurf, &clip_region);
+    for (i=0; i<count; i++) {
+        SDL_Rect dst = {rects[i].x, rects[i].y, rects[i].w, rects[i].h};
+        dst.x += clip_region.x1;
+        dst.y += clip_region.y1;
+        SDL_DFB_CHECKERR(destsurf->FillRectangle(destsurf, dst.x, dst.y,
+                dst.w, dst.h));
+    }
+
+    return 0;
+  error:
+    return -1;
+}
+
+static int
+DirectFB_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
+                    const SDL_Rect * srcrect, const SDL_FRect * dstrect)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *destsurf = data->target;
+    DirectFB_TextureData *texturedata =
+        (DirectFB_TextureData *) texture->driverdata;
+    Uint8 alpha, r, g, b;
+    DFBRegion clip_region;
+    DFBRectangle sr, dr;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    SDLtoDFBRect(srcrect, &sr);
+    SDLtoDFBRect_Float(dstrect, &dr);
+
+    destsurf->GetClip(destsurf, &clip_region);
+    dr.x += clip_region.x1;
+    dr.y += clip_region.y1;
+
+    if (texturedata->display) {
+        int px, py;
+        SDL_Window *window = renderer->window;
+        IDirectFBWindow *dfbwin = get_dfb_window(window);
+        SDL_DFB_WINDOWDATA(window);
+        SDL_VideoDisplay *display = texturedata->display;
+        DFB_DisplayData *dispdata = (DFB_DisplayData *) display->driverdata;
+
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetSourceRectangle(dispdata->vidlayer,
+                                                      sr.x, sr.y, sr.w, sr.h));
+        dfbwin->GetPosition(dfbwin, &px, &py);
+        px += windata->client.x;
+        py += windata->client.y;
+        SDL_DFB_CHECKERR(dispdata->
+                         vidlayer->SetScreenRectangle(dispdata->vidlayer,
+                                                      px + dr.x,
+                                                      py + dr.y,
+                                                      dr.w,
+                                                      dr.h));
+    } else {
+        DFBSurfaceBlittingFlags flags = 0;
+
+#if 0
+        if (texturedata->dirty.list) {
+            SDL_DirtyRect *dirty;
+            void *pixels;
+            int bpp = DFB_BYTES_PER_PIXEL(DirectFB_SDLToDFBPixelFormat(texture->format));
+            int pitch = texturedata->pitch;
+
+            for (dirty = texturedata->dirty.list; dirty; dirty = dirty->next) {
+                SDL_Rect *rect = &dirty->rect;
+                pixels =
+                    (void *) ((Uint8 *) texturedata->pixels +
+                              rect->y * pitch + rect->x * bpp);
+                DirectFB_UpdateTexture(renderer, texture, rect,
+                                       pixels,
+                                       texturedata->pitch);
+            }
+            SDL_ClearDirtyRects(&texturedata->dirty);
+        }
+#endif
+        if (texturedata->isDirty)
+        {
+            SDL_Rect rect;
+
+            rect.x = 0;
+            rect.y = 0;
+            rect.w = texture->w;
+            rect.h = texture->h;
+
+            DirectFB_UpdateTexture(renderer, texture, &rect, texturedata->pixels, texturedata->pitch);
+        }
+
+        alpha = r = g = b = 0xff;
+        if (texture->modMode & SDL_TEXTUREMODULATE_ALPHA){
+            alpha = texture->a;
+            flags |= DSBLIT_BLEND_COLORALPHA;
+        }
+
+        if (texture->modMode & SDL_TEXTUREMODULATE_COLOR) {
+            r = texture->r;
+            g = texture->g;
+            b = texture->b;
+            flags |= DSBLIT_COLORIZE;
+        }
+        SDL_DFB_CHECKERR(destsurf->
+                         SetColor(destsurf, r, g, b, alpha));
+
+        /* ???? flags |= DSBLIT_SRC_PREMULTCOLOR; */
+
+        SetBlendMode(data, texture->blendMode, texturedata);
+
+        SDL_DFB_CHECKERR(destsurf->SetBlittingFlags(destsurf,
+                                                    data->blitFlags | flags));
+
+#if (DFB_VERSION_ATLEAST(1,2,0))
+        SDL_DFB_CHECKERR(destsurf->SetRenderOptions(destsurf,
+                                                    texturedata->
+                                                    render_options));
+#endif
+
+        if (srcrect->w == dstrect->w && srcrect->h == dstrect->h) {
+            SDL_DFB_CHECKERR(destsurf->Blit(destsurf,
+                                            texturedata->surface,
+                                            &sr, dr.x, dr.y));
+        } else {
+            SDL_DFB_CHECKERR(destsurf->StretchBlit(destsurf,
+                                                   texturedata->surface,
+                                                   &sr, &dr));
+        }
+    }
+    return 0;
+  error:
+    return -1;
+}
+
+static void
+DirectFB_RenderPresent(SDL_Renderer * renderer)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    SDL_Window *window = renderer->window;
+    SDL_DFB_WINDOWDATA(window);
+    SDL_ShapeData *shape_data = (window->shaper ? window->shaper->driverdata : NULL);
+
+    DirectFB_ActivateRenderer(renderer);
+
+    if (shape_data && shape_data->surface) {
+        /* saturate the window surface alpha channel */
+        SDL_DFB_CHECK(windata->window_surface->SetSrcBlendFunction(windata->window_surface, DSBF_ONE));
+        SDL_DFB_CHECK(windata->window_surface->SetDstBlendFunction(windata->window_surface, DSBF_ONE));
+        SDL_DFB_CHECK(windata->window_surface->SetDrawingFlags(windata->window_surface, DSDRAW_BLEND));
+        SDL_DFB_CHECK(windata->window_surface->SetColor(windata->window_surface, 0, 0, 0, 0xff));
+        SDL_DFB_CHECK(windata->window_surface->FillRectangle(windata->window_surface, 0,0, windata->size.w, windata->size.h));
+
+        /* blit the mask */
+        SDL_DFB_CHECK(windata->surface->SetSrcBlendFunction(windata->surface, DSBF_DESTCOLOR));
+        SDL_DFB_CHECK(windata->surface->SetDstBlendFunction(windata->surface, DSBF_ZERO));
+        SDL_DFB_CHECK(windata->surface->SetBlittingFlags(windata->surface, DSBLIT_BLEND_ALPHACHANNEL));
+#if (DFB_VERSION_ATLEAST(1,2,0))
+        SDL_DFB_CHECK(windata->surface->SetRenderOptions(windata->surface, DSRO_NONE));
+#endif
+        SDL_DFB_CHECK(windata->surface->Blit(windata->surface, shape_data->surface, NULL, 0, 0));
+    }
+
+    /* Send the data to the display */
+    SDL_DFB_CHECK(windata->window_surface->Flip(windata->window_surface, NULL,
+                                                data->flipflags));
+}
+
+static void
+DirectFB_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
+{
+    DirectFB_TextureData *data = (DirectFB_TextureData *) texture->driverdata;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    if (!data) {
+        return;
+    }
+    SDL_DFB_RELEASE(data->palette);
+    SDL_DFB_RELEASE(data->surface);
+    if (data->display) {
+        DFB_DisplayData *dispdata =
+            (DFB_DisplayData *) data->display->driverdata;
+        dispdata->vidIDinuse = 0;
+        /* FIXME: Shouldn't we reset the cooperative level */
+        SDL_DFB_CHECK(dispdata->vidlayer->SetCooperativeLevel(dispdata->vidlayer,
+                                                DLSCL_ADMINISTRATIVE));
+        SDL_DFB_RELEASE(dispdata->vidlayer);
+    }
+    SDL_DFB_FREE(data->pixels);
+    SDL_free(data);
+    texture->driverdata = NULL;
+}
+
+static void
+DirectFB_DestroyRenderer(SDL_Renderer * renderer)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(data->window);
+#if 0
+    if (display->palette) {
+        SDL_DelPaletteWatch(display->palette, DisplayPaletteChanged, data);
+    }
+#endif
+
+    SDL_free(data);
+    SDL_free(renderer);
+}
+
+static int
+DirectFB_UpdateViewport(SDL_Renderer * renderer)
+{
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *winsurf = data->target;
+    DFBRegion dreg;
+
+    dreg.x1 = renderer->viewport.x;
+    dreg.y1 = renderer->viewport.y;
+    dreg.x2 = dreg.x1 + renderer->viewport.w - 1;
+    dreg.y2 = dreg.y1 + renderer->viewport.h - 1;
+
+    winsurf->SetClip(winsurf, &dreg);
+    return 0;
+}
+
+static int
+DirectFB_UpdateClipRect(SDL_Renderer * renderer)
+{
+    const SDL_Rect *rect = &renderer->clip_rect;
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *destsurf = get_dfb_surface(data->window);
+    DFBRegion region;
+
+    if (!SDL_RectEmpty(rect)) {
+        region.x1 = rect->x;
+        region.x2 = rect->x + rect->w;
+        region.y1 = rect->y;
+        region.y2 = rect->y + rect->h;
+        SDL_DFB_CHECKERR(destsurf->SetClip(destsurf, &region));
+    } else {
+        SDL_DFB_CHECKERR(destsurf->SetClip(destsurf, NULL));
+    }
+    return 0;
+  error:
+    return -1;
+}
+
+static int
+DirectFB_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                     Uint32 format, void * pixels, int pitch)
+{
+    Uint32 sdl_format;
+    void * laypixels;
+    int laypitch;
+    DFBSurfacePixelFormat dfb_format;
+    DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
+    IDirectFBSurface *winsurf = data->target;
+
+    DirectFB_ActivateRenderer(renderer);
+
+    winsurf->GetPixelFormat(winsurf, &dfb_format);
+    sdl_format = DirectFB_DFBToSDLPixelFormat(dfb_format);
+    winsurf->Lock(winsurf, DSLF_READ, (void **) &laypixels, &laypitch);
+
+    laypixels += (rect->y * laypitch + rect->x * SDL_BYTESPERPIXEL(sdl_format) );
+    SDL_ConvertPixels(rect->w, rect->h,
+                      sdl_format, laypixels, laypitch,
+                      format, pixels, pitch);
+
+    winsurf->Unlock(winsurf);
+
+    return 0;
+}
+
+#if 0
+static int
+DirectFB_RenderWritePixels(SDL_Renderer * renderer, const SDL_Rect * rect,
+                      Uint32 format, const void * pixels, int pitch)
+{
+    SDL_Window *window = renderer->window;
+    SDL_DFB_WINDOWDATA(window);
+    Uint32 sdl_format;
+    void * laypixels;
+    int laypitch;
+    DFBSurfacePixelFormat dfb_format;
+
+    SDL_DFB_CHECK(windata->surface->GetPixelFormat(windata->surface, &dfb_format));
+    sdl_format = DirectFB_DFBToSDLPixelFormat(dfb_format);
+
+    SDL_DFB_CHECK(windata->surface->Lock(windata->surface, DSLF_WRITE, (void **) &laypixels, &laypitch));
+
+    laypixels += (rect->y * laypitch + rect->x * SDL_BYTESPERPIXEL(sdl_format) );
+    SDL_ConvertPixels(rect->w, rect->h,
+                      format, pixels, pitch,
+                      sdl_format, laypixels, laypitch);
+
+    SDL_DFB_CHECK(windata->surface->Unlock(windata->surface));
+
+    return 0;
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_render.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_render.h
new file mode 100644
index 000000000..5405a5e5f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_render.h	
@@ -0,0 +1,25 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+/* SDL surface based renderer implementation */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_shape.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_shape.c
new file mode 100644
index 000000000..64e91f61f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_shape.c	
@@ -0,0 +1,134 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
+#include "SDL_assert.h"
+#include "SDL_DirectFB_video.h"
+#include "SDL_DirectFB_shape.h"
+#include "SDL_DirectFB_window.h"
+
+#include "../SDL_shape_internals.h"
+
+SDL_Window*
+DirectFB_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
+    return SDL_CreateWindow(title,x,y,w,h,flags /* | SDL_DFB_WINDOW_SHAPED */);
+}
+
+SDL_WindowShaper*
+DirectFB_CreateShaper(SDL_Window* window) {
+    SDL_WindowShaper* result = NULL;
+
+    result = malloc(sizeof(SDL_WindowShaper));
+    result->window = window;
+    result->mode.mode = ShapeModeDefault;
+    result->mode.parameters.binarizationCutoff = 1;
+    result->userx = result->usery = 0;
+    SDL_ShapeData* data = SDL_malloc(sizeof(SDL_ShapeData));
+    result->driverdata = data;
+    data->surface = NULL;
+    window->shaper = result;
+    int resized_properly = DirectFB_ResizeWindowShape(window);
+    SDL_assert(resized_properly == 0);
+
+    return result;
+}
+
+int
+DirectFB_ResizeWindowShape(SDL_Window* window) {
+    SDL_ShapeData* data = window->shaper->driverdata;
+    SDL_assert(data != NULL);
+
+    if (window->x != -1000)
+    {
+        window->shaper->userx = window->x;
+        window->shaper->usery = window->y;
+    }
+    SDL_SetWindowPosition(window,-1000,-1000);
+
+    return 0;
+}
+
+int
+DirectFB_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode) {
+
+    if(shaper == NULL || shape == NULL || shaper->driverdata == NULL)
+        return -1;
+    if(shape->format->Amask == 0 && SDL_SHAPEMODEALPHA(shape_mode->mode))
+        return -2;
+    if(shape->w != shaper->window->w || shape->h != shaper->window->h)
+        return -3;
+
+    {
+        SDL_VideoDisplay *display = SDL_GetDisplayForWindow(shaper->window);
+        SDL_DFB_DEVICEDATA(display->device);
+        Uint32 *pixels;
+        Sint32 pitch;
+        Uint32 h,w;
+        Uint8  *src, *bitmap;
+        DFBSurfaceDescription dsc;
+
+        SDL_ShapeData *data = shaper->driverdata;
+
+        SDL_DFB_RELEASE(data->surface);
+
+        dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_CAPS;
+        dsc.width = shape->w;
+        dsc.height = shape->h;
+        dsc.caps = DSCAPS_PREMULTIPLIED;
+        dsc.pixelformat = DSPF_ARGB;
+
+        SDL_DFB_CHECKERR(devdata->dfb->CreateSurface(devdata->dfb, &dsc, &data->surface));
+
+        /* Assume that shaper->alphacutoff already has a value, because SDL_SetWindowShape() should have given it one. */
+        SDL_DFB_ALLOC_CLEAR(bitmap, shape->w * shape->h);
+        SDL_CalculateShapeBitmap(shaper->mode,shape,bitmap,1);
+
+        src = bitmap;
+
+        SDL_DFB_CHECK(data->surface->Lock(data->surface, DSLF_WRITE | DSLF_READ, (void **) &pixels, &pitch));
+
+        h = shaper->window->h;
+        while (h--) {
+            for (w = 0; w < shaper->window->w; w++) {
+                if (*src)
+                    pixels[w] = 0xFFFFFFFF;
+                else
+                    pixels[w] = 0;
+                src++;
+
+            }
+            pixels += (pitch >> 2);
+        }
+        SDL_DFB_CHECK(data->surface->Unlock(data->surface));
+        SDL_DFB_FREE(bitmap);
+
+        /* FIXME: Need to call this here - Big ?? */
+        DirectFB_WM_RedrawLayout(SDL_GetDisplayForWindow(shaper->window)->device, shaper->window);
+    }
+
+    return 0;
+error:
+    return -1;
+}
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_shape.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_shape.h
new file mode 100644
index 000000000..99bff8004
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_shape.h	
@@ -0,0 +1,39 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_DirectFB_shape_h
+#define _SDL_DirectFB_shape_h
+
+#include <directfb.h>
+
+#include "../SDL_sysvideo.h"
+#include "SDL_shape.h"
+
+typedef struct {
+    IDirectFBSurface *surface;
+} SDL_ShapeData;
+
+extern SDL_Window* DirectFB_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags);
+extern SDL_WindowShaper* DirectFB_CreateShaper(SDL_Window* window);
+extern int DirectFB_ResizeWindowShape(SDL_Window* window);
+extern int DirectFB_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode);
+
+#endif /* _SDL_DirectFB_shape_h */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_video.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_video.c
new file mode 100644
index 000000000..55e9ece3c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_video.c	
@@ -0,0 +1,424 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
+#include "SDL_DirectFB_video.h"
+
+#include "SDL_DirectFB_events.h"
+/*
+ * #include "SDL_DirectFB_keyboard.h"
+ */
+#include "SDL_DirectFB_modes.h"
+#include "SDL_DirectFB_mouse.h"
+#include "SDL_DirectFB_opengl.h"
+#include "SDL_DirectFB_window.h"
+#include "SDL_DirectFB_WM.h"
+
+
+/* DirectFB video driver implementation.
+*/
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+
+#include <directfb.h>
+#include <directfb_version.h>
+#include <directfb_strings.h>
+
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
+#include "SDL_DirectFB_video.h"
+#include "SDL_DirectFB_events.h"
+#include "SDL_DirectFB_render.h"
+#include "SDL_DirectFB_mouse.h"
+#include "SDL_DirectFB_shape.h"
+
+
+#include "SDL_DirectFB_dyn.h"
+
+/* Initialization/Query functions */
+static int DirectFB_VideoInit(_THIS);
+static void DirectFB_VideoQuit(_THIS);
+
+static int DirectFB_Available(void);
+static SDL_VideoDevice *DirectFB_CreateDevice(int devindex);
+
+VideoBootStrap DirectFB_bootstrap = {
+    "directfb", "DirectFB",
+    DirectFB_Available, DirectFB_CreateDevice
+};
+
+static const DirectFBSurfaceDrawingFlagsNames(drawing_flags);
+static const DirectFBSurfaceBlittingFlagsNames(blitting_flags);
+static const DirectFBAccelerationMaskNames(acceleration_mask);
+
+/* DirectFB driver bootstrap functions */
+
+static int
+DirectFB_Available(void)
+{
+    if (!SDL_DirectFB_LoadLibrary())
+        return 0;
+    SDL_DirectFB_UnLoadLibrary();
+    return 1;
+}
+
+static void
+DirectFB_DeleteDevice(SDL_VideoDevice * device)
+{
+    SDL_DirectFB_UnLoadLibrary();
+    SDL_DFB_FREE(device->driverdata);
+    SDL_DFB_FREE(device);
+}
+
+static SDL_VideoDevice *
+DirectFB_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+
+    if (!SDL_DirectFB_LoadLibrary()) {
+        return NULL;
+    }
+
+    /* Initialize all variables that we clean on shutdown */
+    SDL_DFB_ALLOC_CLEAR(device, sizeof(SDL_VideoDevice));
+
+    /* Set the function pointers */
+
+    /* Set the function pointers */
+    device->VideoInit = DirectFB_VideoInit;
+    device->VideoQuit = DirectFB_VideoQuit;
+    device->GetDisplayModes = DirectFB_GetDisplayModes;
+    device->SetDisplayMode = DirectFB_SetDisplayMode;
+    device->PumpEvents = DirectFB_PumpEventsWindow;
+    device->CreateWindow = DirectFB_CreateWindow;
+    device->CreateWindowFrom = DirectFB_CreateWindowFrom;
+    device->SetWindowTitle = DirectFB_SetWindowTitle;
+    device->SetWindowIcon = DirectFB_SetWindowIcon;
+    device->SetWindowPosition = DirectFB_SetWindowPosition;
+    device->SetWindowSize = DirectFB_SetWindowSize;
+    device->ShowWindow = DirectFB_ShowWindow;
+    device->HideWindow = DirectFB_HideWindow;
+    device->RaiseWindow = DirectFB_RaiseWindow;
+    device->MaximizeWindow = DirectFB_MaximizeWindow;
+    device->MinimizeWindow = DirectFB_MinimizeWindow;
+    device->RestoreWindow = DirectFB_RestoreWindow;
+    device->SetWindowGrab = DirectFB_SetWindowGrab;
+    device->DestroyWindow = DirectFB_DestroyWindow;
+    device->GetWindowWMInfo = DirectFB_GetWindowWMInfo;
+
+    /* !!! FIXME: implement SetWindowBordered */
+
+#if SDL_DIRECTFB_OPENGL
+    device->GL_LoadLibrary = DirectFB_GL_LoadLibrary;
+    device->GL_GetProcAddress = DirectFB_GL_GetProcAddress;
+    device->GL_MakeCurrent = DirectFB_GL_MakeCurrent;
+
+    device->GL_CreateContext = DirectFB_GL_CreateContext;
+    device->GL_SetSwapInterval = DirectFB_GL_SetSwapInterval;
+    device->GL_GetSwapInterval = DirectFB_GL_GetSwapInterval;
+    device->GL_SwapWindow = DirectFB_GL_SwapWindow;
+    device->GL_DeleteContext = DirectFB_GL_DeleteContext;
+
+#endif
+
+    /* Shaped window support */
+    device->shape_driver.CreateShaper = DirectFB_CreateShaper;
+    device->shape_driver.SetWindowShape = DirectFB_SetWindowShape;
+    device->shape_driver.ResizeWindowShape = DirectFB_ResizeWindowShape;
+
+    device->free = DirectFB_DeleteDevice;
+
+    return device;
+  error:
+    if (device)
+        free(device);
+    return (0);
+}
+
+static void
+DirectFB_DeviceInformation(IDirectFB * dfb)
+{
+    DFBGraphicsDeviceDescription desc;
+    int n;
+
+    dfb->GetDeviceDescription(dfb, &desc);
+
+    SDL_DFB_LOG( "DirectFB Device Information");
+    SDL_DFB_LOG( "===========================");
+    SDL_DFB_LOG( "Name:           %s", desc.name);
+    SDL_DFB_LOG( "Vendor:         %s", desc.vendor);
+    SDL_DFB_LOG( "Driver Name:    %s", desc.driver.name);
+    SDL_DFB_LOG( "Driver Vendor:  %s", desc.driver.vendor);
+    SDL_DFB_LOG( "Driver Version: %d.%d", desc.driver.major,
+            desc.driver.minor);
+
+    SDL_DFB_LOG( "Video memoory:  %d", desc.video_memory);
+
+    SDL_DFB_LOG( "Blitting flags:");
+    for (n = 0; blitting_flags[n].flag; n++) {
+        if (desc.blitting_flags & blitting_flags[n].flag)
+            SDL_DFB_LOG( "    %s", blitting_flags[n].name);
+    }
+
+    SDL_DFB_LOG( "Drawing flags:");
+    for (n = 0; drawing_flags[n].flag; n++) {
+        if (desc.drawing_flags & drawing_flags[n].flag)
+            SDL_DFB_LOG( "    %s", drawing_flags[n].name);
+    }
+
+
+    SDL_DFB_LOG( "Acceleration flags:");
+    for (n = 0; acceleration_mask[n].mask; n++) {
+        if (desc.acceleration_mask & acceleration_mask[n].mask)
+            SDL_DFB_LOG( "    %s", acceleration_mask[n].name);
+    }
+
+
+}
+
+static int readBoolEnv(const char *env_name, int def_val)
+{
+    char *stemp;
+
+    stemp = SDL_getenv(env_name);
+    if (stemp)
+        return atoi(stemp);
+    else
+        return def_val;
+}
+
+static int
+DirectFB_VideoInit(_THIS)
+{
+    IDirectFB *dfb = NULL;
+    DFB_DeviceData *devdata = NULL;
+    DFBResult ret;
+
+    SDL_DFB_ALLOC_CLEAR(devdata, sizeof(*devdata));
+
+    SDL_DFB_CHECKERR(DirectFBInit(NULL, NULL));
+
+    /* avoid switching to the framebuffer when we
+     * are running X11 */
+    ret = readBoolEnv(DFBENV_USE_X11_CHECK , 1);
+    if (ret) {
+        if (SDL_getenv("DISPLAY"))
+            DirectFBSetOption("system", "x11");
+        else
+            DirectFBSetOption("disable-module", "x11input");
+    }
+
+    /* FIXME: Reenable as default once multi kbd/mouse interface is sorted out */
+    devdata->use_linux_input = readBoolEnv(DFBENV_USE_LINUX_INPUT, 0);       /* default: on */
+
+    if (!devdata->use_linux_input)
+    {
+        SDL_DFB_LOG("Disabling linxu input\n");
+        DirectFBSetOption("disable-module", "linux_input");
+    }
+
+    SDL_DFB_CHECKERR(DirectFBCreate(&dfb));
+
+    DirectFB_DeviceInformation(dfb);
+
+    devdata->use_yuv_underlays = readBoolEnv(DFBENV_USE_YUV_UNDERLAY, 0);     /* default: off */
+    devdata->use_yuv_direct = readBoolEnv(DFBENV_USE_YUV_DIRECT, 0);      /* default is off! */
+
+    /* Create global Eventbuffer for axis events */
+    if (devdata->use_linux_input) {
+        SDL_DFB_CHECKERR(dfb->CreateInputEventBuffer(dfb, DICAPS_ALL,
+                                                     DFB_TRUE,
+                                                     &devdata->events));
+    } else {
+        SDL_DFB_CHECKERR(dfb->CreateInputEventBuffer(dfb, DICAPS_AXES
+                                                     /* DICAPS_ALL */ ,
+                                                     DFB_TRUE,
+                                                     &devdata->events));
+    }
+
+    /* simple window manager support */
+    devdata->has_own_wm = readBoolEnv(DFBENV_USE_WM, 0);
+
+    devdata->initialized = 1;
+
+    devdata->dfb = dfb;
+    devdata->firstwin = NULL;
+    devdata->grabbed_window = NULL;
+
+    _this->driverdata = devdata;
+
+    DirectFB_InitModes(_this);
+
+#if SDL_DIRECTFB_OPENGL
+    DirectFB_GL_Initialize(_this);
+#endif
+
+    DirectFB_InitMouse(_this);
+    DirectFB_InitKeyboard(_this);
+
+    return 0;
+
+
+  error:
+    SDL_DFB_FREE(devdata);
+    SDL_DFB_RELEASE(dfb);
+    return -1;
+}
+
+static void
+DirectFB_VideoQuit(_THIS)
+{
+    DFB_DeviceData *devdata = (DFB_DeviceData *) _this->driverdata;
+
+    DirectFB_QuitModes(_this);
+    DirectFB_QuitKeyboard(_this);
+    DirectFB_QuitMouse(_this);
+
+    devdata->events->Reset(devdata->events);
+    SDL_DFB_RELEASE(devdata->events);
+    SDL_DFB_RELEASE(devdata->dfb);
+
+#if SDL_DIRECTFB_OPENGL
+    DirectFB_GL_Shutdown(_this);
+#endif
+
+    devdata->initialized = 0;
+}
+
+/* DirectFB driver general support functions */
+
+static const struct {
+    DFBSurfacePixelFormat dfb;
+    Uint32 sdl;
+} pixelformat_tab[] =
+{
+    { DSPF_RGB32, SDL_PIXELFORMAT_RGB888 },             /* 24 bit RGB (4 byte, nothing@24, red 8@16, green 8@8, blue 8@0) */
+    { DSPF_ARGB, SDL_PIXELFORMAT_ARGB8888 },            /* 32 bit ARGB (4 byte, alpha 8@24, red 8@16, green 8@8, blue 8@0) */
+    { DSPF_RGB16, SDL_PIXELFORMAT_RGB565 },             /* 16 bit RGB (2 byte, red 5@11, green 6@5, blue 5@0) */
+    { DSPF_RGB332, SDL_PIXELFORMAT_RGB332 },            /* 8 bit RGB (1 byte, red 3@5, green 3@2, blue 2@0) */
+    { DSPF_ARGB4444, SDL_PIXELFORMAT_ARGB4444 },        /* 16 bit ARGB (2 byte, alpha 4@12, red 4@8, green 4@4, blue 4@0) */
+    { DSPF_ARGB1555, SDL_PIXELFORMAT_ARGB1555 },        /* 16 bit ARGB (2 byte, alpha 1@15, red 5@10, green 5@5, blue 5@0) */
+    { DSPF_RGB24, SDL_PIXELFORMAT_RGB24 },              /* 24 bit RGB (3 byte, red 8@16, green 8@8, blue 8@0) */
+    { DSPF_RGB444, SDL_PIXELFORMAT_RGB444 },            /* 16 bit RGB (2 byte, nothing @12, red 4@8, green 4@4, blue 4@0) */
+    { DSPF_YV12, SDL_PIXELFORMAT_YV12 },                /* 12 bit YUV (8 bit Y plane followed by 8 bit quarter size V/U planes) */
+    { DSPF_I420,SDL_PIXELFORMAT_IYUV },                 /* 12 bit YUV (8 bit Y plane followed by 8 bit quarter size U/V planes) */
+    { DSPF_YUY2, SDL_PIXELFORMAT_YUY2 },                /* 16 bit YUV (4 byte/ 2 pixel, macropixel contains CbYCrY [31:0]) */
+    { DSPF_UYVY, SDL_PIXELFORMAT_UYVY },                /* 16 bit YUV (4 byte/ 2 pixel, macropixel contains YCbYCr [31:0]) */
+    { DSPF_RGB555, SDL_PIXELFORMAT_RGB555 },            /* 16 bit RGB (2 byte, nothing @15, red 5@10, green 5@5, blue 5@0) */
+#if (ENABLE_LUT8)
+    { DSPF_LUT8, SDL_PIXELFORMAT_INDEX8 },              /* 8 bit LUT (8 bit color and alpha lookup from palette) */
+#endif
+
+#if (DFB_VERSION_ATLEAST(1,2,0))
+    { DSPF_BGR555, SDL_PIXELFORMAT_BGR555 },            /* 16 bit BGR (2 byte, nothing @15, blue 5@10, green 5@5, red 5@0) */
+#else
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_BGR555 },
+#endif
+
+    /* Pfff ... nonmatching formats follow */
+
+    { DSPF_ALUT44, SDL_PIXELFORMAT_UNKNOWN },           /* 8 bit ALUT (1 byte, alpha 4@4, color lookup 4@0) */
+    { DSPF_A8, SDL_PIXELFORMAT_UNKNOWN },               /*  8 bit alpha (1 byte, alpha 8@0), e.g. anti-aliased glyphs */
+    { DSPF_AiRGB, SDL_PIXELFORMAT_UNKNOWN },            /*  32 bit ARGB (4 byte, inv. alpha 8@24, red 8@16, green 8@8, blue 8@0) */
+    { DSPF_A1, SDL_PIXELFORMAT_UNKNOWN },               /*  1 bit alpha (1 byte/ 8 pixel, most significant bit used first) */
+    { DSPF_NV12, SDL_PIXELFORMAT_UNKNOWN },             /*  12 bit YUV (8 bit Y plane followed by one 16 bit quarter size CbCr [15:0] plane) */
+    { DSPF_NV16, SDL_PIXELFORMAT_UNKNOWN },             /*  16 bit YUV (8 bit Y plane followed by one 16 bit half width CbCr [15:0] plane) */
+    { DSPF_ARGB2554, SDL_PIXELFORMAT_UNKNOWN },         /*  16 bit ARGB (2 byte, alpha 2@14, red 5@9, green 5@4, blue 4@0) */
+    { DSPF_NV21, SDL_PIXELFORMAT_UNKNOWN },             /*  12 bit YUV (8 bit Y plane followed by one 16 bit quarter size CrCb [15:0] plane) */
+    { DSPF_AYUV, SDL_PIXELFORMAT_UNKNOWN },             /*  32 bit AYUV (4 byte, alpha 8@24, Y 8@16, Cb 8@8, Cr 8@0) */
+    { DSPF_A4, SDL_PIXELFORMAT_UNKNOWN },               /*  4 bit alpha (1 byte/ 2 pixel, more significant nibble used first) */
+    { DSPF_ARGB1666, SDL_PIXELFORMAT_UNKNOWN },         /*  1 bit alpha (3 byte/ alpha 1@18, red 6@16, green 6@6, blue 6@0) */
+    { DSPF_ARGB6666, SDL_PIXELFORMAT_UNKNOWN },         /*  6 bit alpha (3 byte/ alpha 6@18, red 6@16, green 6@6, blue 6@0) */
+    { DSPF_RGB18, SDL_PIXELFORMAT_UNKNOWN },            /*  6 bit RGB (3 byte/ red 6@16, green 6@6, blue 6@0) */
+    { DSPF_LUT2, SDL_PIXELFORMAT_UNKNOWN },             /*  2 bit LUT (1 byte/ 4 pixel, 2 bit color and alpha lookup from palette) */
+
+#if (DFB_VERSION_ATLEAST(1,3,0))
+    { DSPF_RGBA4444, SDL_PIXELFORMAT_UNKNOWN },         /* 16 bit RGBA (2 byte, red 4@12, green 4@8, blue 4@4, alpha 4@0) */
+#endif
+
+#if (DFB_VERSION_ATLEAST(1,4,3))
+    { DSPF_RGBA5551, SDL_PIXELFORMAT_UNKNOWN },         /*  16 bit RGBA (2 byte, red 5@11, green 5@6, blue 5@1, alpha 1@0) */
+    { DSPF_YUV444P, SDL_PIXELFORMAT_UNKNOWN },          /*  24 bit full YUV planar (8 bit Y plane followed by an 8 bit Cb and an 8 bit Cr plane) */
+    { DSPF_ARGB8565, SDL_PIXELFORMAT_UNKNOWN },         /*  24 bit ARGB (3 byte, alpha 8@16, red 5@11, green 6@5, blue 5@0) */
+    { DSPF_AVYU, SDL_PIXELFORMAT_UNKNOWN },             /*  32 bit AVYU 4:4:4 (4 byte, alpha 8@24, Cr 8@16, Y 8@8, Cb 8@0) */
+    { DSPF_VYU, SDL_PIXELFORMAT_UNKNOWN },              /*  24 bit VYU 4:4:4 (3 byte, Cr 8@16, Y 8@8, Cb 8@0)  */
+#endif
+
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_INDEX1LSB },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_INDEX1MSB },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_INDEX4LSB },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_INDEX4MSB },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_BGR24 },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_BGR888 },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_RGBA8888 },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_ABGR8888 },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_BGRA8888 },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_ARGB2101010 },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_ABGR4444 },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_ABGR1555 },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_BGR565 },
+    { DSPF_UNKNOWN, SDL_PIXELFORMAT_YVYU },                        /**< Packed mode: Y0+V0+Y1+U0 (1 pla */
+};
+
+Uint32
+DirectFB_DFBToSDLPixelFormat(DFBSurfacePixelFormat pixelformat)
+{
+    int i;
+
+    for (i=0; pixelformat_tab[i].dfb != DSPF_UNKNOWN; i++)
+        if (pixelformat_tab[i].dfb == pixelformat)
+        {
+            return pixelformat_tab[i].sdl;
+        }
+    return SDL_PIXELFORMAT_UNKNOWN;
+}
+
+DFBSurfacePixelFormat
+DirectFB_SDLToDFBPixelFormat(Uint32 format)
+{
+    int i;
+
+    for (i=0; pixelformat_tab[i].dfb != DSPF_UNKNOWN; i++)
+        if (pixelformat_tab[i].sdl == format)
+        {
+            return pixelformat_tab[i].dfb;
+        }
+    return DSPF_UNKNOWN;
+}
+
+void DirectFB_SetSupportedPixelFormats(SDL_RendererInfo* ri)
+{
+    int i, j;
+
+    for (i=0, j=0; pixelformat_tab[i].dfb != DSPF_UNKNOWN; i++)
+        if (pixelformat_tab[i].sdl != SDL_PIXELFORMAT_UNKNOWN)
+            ri->texture_formats[j++] = pixelformat_tab[i].sdl;
+    ri->num_texture_formats = j;
+}
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_video.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_video.h
new file mode 100644
index 000000000..82250b63d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_video.h	
@@ -0,0 +1,170 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_DirectFB_video_h
+#define _SDL_DirectFB_video_h
+
+#include <directfb.h>
+#include <directfb_version.h>
+
+#include "../SDL_sysvideo.h"
+#include "SDL_scancode.h"
+#include "SDL_render.h"
+
+#include "SDL_log.h"
+
+#define DFB_VERSIONNUM(X, Y, Z)                     \
+    ((X)*1000 + (Y)*100 + (Z))
+
+#define DFB_COMPILEDVERSION \
+    DFB_VERSIONNUM(DIRECTFB_MAJOR_VERSION, DIRECTFB_MINOR_VERSION, DIRECTFB_MICRO_VERSION)
+
+#define DFB_VERSION_ATLEAST(X, Y, Z) \
+    (DFB_COMPILEDVERSION >= DFB_VERSIONNUM(X, Y, Z))
+
+#if (DFB_VERSION_ATLEAST(1,0,0))
+#ifdef SDL_VIDEO_OPENGL
+#define SDL_DIRECTFB_OPENGL 1
+#endif
+#else
+#error "SDL_DIRECTFB: Please compile against libdirectfb version >= 1.0.0"
+#endif
+
+/* Set below to 1 to compile with (old) multi mice/keyboard api. Code left in
+ * in case we see this again ...
+ */
+
+#define USE_MULTI_API   (0)
+
+/* Support for LUT8/INDEX8 pixel format.
+ * This is broken in DirectFB 1.4.3. It works in 1.4.0 and 1.4.5
+ * occurred.
+ */
+
+#if (DFB_COMPILEDVERSION == DFB_VERSIONNUM(1, 4, 3))
+#define ENABLE_LUT8     (0)
+#else
+#define ENABLE_LUT8     (1)
+#endif
+
+#define DIRECTFB_DEBUG 1
+
+#define DFBENV_USE_YUV_UNDERLAY     "SDL_DIRECTFB_YUV_UNDERLAY"     /* Default: off */
+#define DFBENV_USE_YUV_DIRECT       "SDL_DIRECTFB_YUV_DIRECT"       /* Default: off */
+#define DFBENV_USE_X11_CHECK        "SDL_DIRECTFB_X11_CHECK"        /* Default: on  */
+#define DFBENV_USE_LINUX_INPUT      "SDL_DIRECTFB_LINUX_INPUT"      /* Default: on  */
+#define DFBENV_USE_WM               "SDL_DIRECTFB_WM"       /* Default: off  */
+
+#define SDL_DFB_RELEASE(x) do { if ( (x) != NULL ) { SDL_DFB_CHECK(x->Release(x)); x = NULL; } } while (0)
+#define SDL_DFB_FREE(x) do { SDL_free((x)); (x) = NULL; } while (0)
+#define SDL_DFB_UNLOCK(x) do { if ( (x) != NULL ) { x->Unlock(x); } } while (0)
+
+#define SDL_DFB_CONTEXT "SDL_DirectFB"
+
+#define SDL_DFB_ERR(x...) SDL_LogError(SDL_LOG_CATEGORY_ERROR, x)
+
+#if (DIRECTFB_DEBUG)
+#define SDL_DFB_LOG(x...) SDL_LogInfo(SDL_LOG_CATEGORY_VIDEO, x)
+
+#define SDL_DFB_DEBUG(x...) SDL_LogDebug(SDL_LOG_CATEGORY_VIDEO, x)
+
+static SDL_INLINE DFBResult sdl_dfb_check(DFBResult ret, const char *src_file, int src_line) {
+    if (ret != DFB_OK) {
+        SDL_DFB_LOG("%s (%d):%s", src_file, src_line, DirectFBErrorString (ret) );
+        SDL_SetError("%s:%s", SDL_DFB_CONTEXT, DirectFBErrorString (ret) );
+    }
+    return ret;
+}
+
+#define SDL_DFB_CHECK(x...) do { sdl_dfb_check( x, __FILE__, __LINE__); } while (0)
+#define SDL_DFB_CHECKERR(x...) do { if ( sdl_dfb_check( x, __FILE__, __LINE__) != DFB_OK ) goto error; } while (0)
+
+#else
+
+#define SDL_DFB_CHECK(x...) x
+#define SDL_DFB_CHECKERR(x...) do { if (x != DFB_OK ) goto error; } while (0)
+#define SDL_DFB_LOG(x...) do {} while (0)
+#define SDL_DFB_DEBUG(x...) do {} while (0)
+
+#endif
+
+
+#define SDL_DFB_CALLOC(r, n, s) \
+     do {                                           \
+          r = SDL_calloc (n, s);                    \
+          if (!(r)) {                               \
+               SDL_DFB_ERR("Out of memory");        \
+               SDL_OutOfMemory();                   \
+               goto error;                          \
+          }                                         \
+     } while (0)
+
+#define SDL_DFB_ALLOC_CLEAR(r, s) SDL_DFB_CALLOC(r, 1, s)
+
+/* Private display data */
+
+#define SDL_DFB_DEVICEDATA(dev)  DFB_DeviceData *devdata = (dev ? (DFB_DeviceData *) ((dev)->driverdata) : NULL)
+
+#define DFB_MAX_SCREENS 10
+
+typedef struct _DFB_KeyboardData DFB_KeyboardData;
+struct _DFB_KeyboardData
+{
+    const SDL_Scancode  *map;       /* keyboard scancode map */
+    int             map_size;   /* size of map */
+    int             map_adjust; /* index adjust */
+    int             is_generic; /* generic keyboard */
+    int id;
+};
+
+typedef struct _DFB_DeviceData DFB_DeviceData;
+struct _DFB_DeviceData
+{
+    int initialized;
+
+    IDirectFB           *dfb;
+    int                 num_mice;
+    int                 mouse_id[0x100];
+    int                 num_keyboard;
+    DFB_KeyboardData    keyboard[10];
+    SDL_Window          *firstwin;
+
+    int                 use_yuv_underlays;
+    int                 use_yuv_direct;
+    int                 use_linux_input;
+    int                 has_own_wm;
+
+
+    /* window grab */
+    SDL_Window          *grabbed_window;
+
+    /* global events */
+    IDirectFBEventBuffer *events;
+};
+
+Uint32 DirectFB_DFBToSDLPixelFormat(DFBSurfacePixelFormat pixelformat);
+DFBSurfacePixelFormat DirectFB_SDLToDFBPixelFormat(Uint32 format);
+void DirectFB_SetSupportedPixelFormats(SDL_RendererInfo *ri);
+
+
+#endif /* _SDL_DirectFB_video_h */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_window.c b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_window.c
new file mode 100644
index 000000000..be4969613
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_window.c	
@@ -0,0 +1,532 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DIRECTFB
+
+#include "SDL_DirectFB_video.h"
+#include "SDL_DirectFB_modes.h"
+#include "SDL_DirectFB_window.h"
+#include "SDL_DirectFB_shape.h"
+
+#if SDL_DIRECTFB_OPENGL
+#include "SDL_DirectFB_opengl.h"
+#endif
+
+#include "SDL_syswm.h"
+
+#include "../SDL_pixels_c.h"
+
+int
+DirectFB_CreateWindow(_THIS, SDL_Window * window)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    SDL_DFB_DISPLAYDATA(window);
+    DFB_WindowData *windata = NULL;
+    DFBWindowOptions wopts;
+    DFBWindowDescription desc;
+    int x, y;
+    int bshaped = 0;
+
+    SDL_DFB_ALLOC_CLEAR(window->driverdata, sizeof(DFB_WindowData));
+    SDL_memset(&desc, 0, sizeof(DFBWindowDescription));
+    windata = (DFB_WindowData *) window->driverdata;
+
+    windata->is_managed = devdata->has_own_wm;
+#if 1
+    SDL_DFB_CHECKERR(devdata->dfb->SetCooperativeLevel(devdata->dfb,
+                                                       DFSCL_NORMAL));
+    SDL_DFB_CHECKERR(dispdata->layer->SetCooperativeLevel(dispdata->layer,
+                                                          DLSCL_ADMINISTRATIVE));
+#endif
+    /* FIXME ... ughh, ugly */
+    if (window->x == -1000 && window->y == -1000)
+        bshaped = 1;
+
+    /* Fill the window description. */
+    x = window->x;
+    y = window->y;
+
+    DirectFB_WM_AdjustWindowLayout(window, window->flags, window->w, window->h);
+
+    /* Create Window */
+    desc.caps = 0;
+    desc.flags =
+        DWDESC_WIDTH | DWDESC_HEIGHT | DWDESC_POSX | DWDESC_POSY | DWDESC_SURFACE_CAPS;
+
+    if (bshaped) {
+        desc.flags |= DWDESC_CAPS;
+        desc.caps |= DWCAPS_ALPHACHANNEL;
+    }
+    else
+    {
+        desc.flags |= DWDESC_PIXELFORMAT;
+    }
+
+    if (!(window->flags & SDL_WINDOW_BORDERLESS))
+        desc.caps |= DWCAPS_NODECORATION;
+
+    desc.posx = x;
+    desc.posy = y;
+    desc.width = windata->size.w;
+    desc.height = windata->size.h;
+    desc.pixelformat = dispdata->pixelformat;
+    desc.surface_caps = DSCAPS_PREMULTIPLIED;
+#if DIRECTFB_MAJOR_VERSION == 1 && DIRECTFB_MINOR_VERSION >= 4
+    if (window->flags & SDL_WINDOW_OPENGL) {
+        desc.surface_caps |= DSCAPS_GL;
+    }
+#endif
+
+    /* Create the window. */
+    SDL_DFB_CHECKERR(dispdata->layer->CreateWindow(dispdata->layer, &desc,
+                                                   &windata->dfbwin));
+
+    /* Set Options */
+    SDL_DFB_CHECK(windata->dfbwin->GetOptions(windata->dfbwin, &wopts));
+
+    /* explicit rescaling of surface */
+    wopts |= DWOP_SCALE;
+    if (window->flags & SDL_WINDOW_RESIZABLE) {
+        wopts &= ~DWOP_KEEP_SIZE;
+    }
+    else {
+        wopts |= DWOP_KEEP_SIZE;
+    }
+
+    if (window->flags & SDL_WINDOW_FULLSCREEN) {
+        wopts |= DWOP_KEEP_POSITION | DWOP_KEEP_STACKING | DWOP_KEEP_SIZE;
+        SDL_DFB_CHECK(windata->dfbwin->SetStackingClass(windata->dfbwin, DWSC_UPPER));
+    }
+
+    if (bshaped) {
+        wopts |= DWOP_SHAPED | DWOP_ALPHACHANNEL;
+        wopts &= ~DWOP_OPAQUE_REGION;
+    }
+
+    SDL_DFB_CHECK(windata->dfbwin->SetOptions(windata->dfbwin, wopts));
+
+    /* See what we got */
+    SDL_DFB_CHECK(DirectFB_WM_GetClientSize
+                     (_this, window, &window->w, &window->h));
+
+    /* Get the window's surface. */
+    SDL_DFB_CHECKERR(windata->dfbwin->GetSurface(windata->dfbwin,
+                                                 &windata->window_surface));
+
+    /* And get a subsurface for rendering */
+    SDL_DFB_CHECKERR(windata->window_surface->
+                     GetSubSurface(windata->window_surface, &windata->client,
+                                   &windata->surface));
+
+    SDL_DFB_CHECK(windata->dfbwin->SetOpacity(windata->dfbwin, 0xFF));
+
+    /* Create Eventbuffer */
+
+    SDL_DFB_CHECKERR(windata->dfbwin->CreateEventBuffer(windata->dfbwin,
+                                                        &windata->
+                                                        eventbuffer));
+    SDL_DFB_CHECKERR(windata->dfbwin->
+                     EnableEvents(windata->dfbwin, DWET_ALL));
+
+    /* Create a font */
+    /* FIXME: once during Video_Init */
+    windata->font = NULL;
+
+    /* Make it the top most window. */
+    SDL_DFB_CHECK(windata->dfbwin->RaiseToTop(windata->dfbwin));
+
+    /* remember parent */
+    /* windata->sdlwin = window; */
+
+    /* Add to list ... */
+
+    windata->next = devdata->firstwin;
+    windata->opacity = 0xFF;
+    devdata->firstwin = window;
+
+    /* Draw Frame */
+    DirectFB_WM_RedrawLayout(_this, window);
+
+    return 0;
+  error:
+    SDL_DFB_RELEASE(windata->surface);
+    SDL_DFB_RELEASE(windata->dfbwin);
+    return -1;
+}
+
+int
+DirectFB_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
+{
+    return SDL_Unsupported();
+}
+
+void
+DirectFB_SetWindowTitle(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+
+    if (windata->is_managed) {
+        windata->wm_needs_redraw = 1;
+        DirectFB_WM_RedrawLayout(_this, window);
+    } else {
+        SDL_Unsupported();
+    }
+}
+
+void
+DirectFB_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    SDL_DFB_WINDOWDATA(window);
+    SDL_Surface *surface = NULL;
+
+    if (icon) {
+        SDL_PixelFormat format;
+        DFBSurfaceDescription dsc;
+        Uint32 *dest;
+        Uint32 *p;
+        int pitch, i;
+
+        /* Convert the icon to ARGB for modern window managers */
+        SDL_InitFormat(&format, SDL_PIXELFORMAT_ARGB8888);
+        surface = SDL_ConvertSurface(icon, &format, 0);
+        if (!surface) {
+            return;
+        }
+        dsc.flags =
+            DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_CAPS;
+        dsc.caps = DSCAPS_VIDEOONLY;
+        dsc.width = surface->w;
+        dsc.height = surface->h;
+        dsc.pixelformat = DSPF_ARGB;
+
+        SDL_DFB_CHECKERR(devdata->dfb->CreateSurface(devdata->dfb, &dsc,
+                                                     &windata->icon));
+
+        SDL_DFB_CHECKERR(windata->icon->Lock(windata->icon, DSLF_WRITE,
+                                             (void *) &dest, &pitch));
+
+        p = surface->pixels;
+        for (i = 0; i < surface->h; i++)
+            memcpy((char *) dest + i * pitch,
+                   (char *) p + i * surface->pitch, 4 * surface->w);
+
+        SDL_DFB_CHECK(windata->icon->Unlock(windata->icon));
+        SDL_FreeSurface(surface);
+    } else {
+        SDL_DFB_RELEASE(windata->icon);
+    }
+    return;
+  error:
+    SDL_FreeSurface(surface);
+    SDL_DFB_RELEASE(windata->icon);
+    return;
+}
+
+void
+DirectFB_SetWindowPosition(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+    int x, y;
+
+    x = window->x;
+    y = window->y;
+
+    DirectFB_WM_AdjustWindowLayout(window, window->flags, window->w, window->h);
+    SDL_DFB_CHECK(windata->dfbwin->MoveTo(windata->dfbwin, x, y));
+}
+
+void
+DirectFB_SetWindowSize(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+
+    if(SDL_IsShapedWindow(window))
+        DirectFB_ResizeWindowShape(window);
+
+    if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
+        int cw;
+        int ch;
+
+        /* Make sure all events are disabled for this operation ! */
+        SDL_DFB_CHECKERR(windata->dfbwin->DisableEvents(windata->dfbwin,
+                                                        DWET_ALL));
+        SDL_DFB_CHECKERR(DirectFB_WM_GetClientSize(_this, window, &cw, &ch));
+
+        if (cw != window->w || ch != window->h) {
+
+            DirectFB_WM_AdjustWindowLayout(window, window->flags, window->w, window->h);
+            SDL_DFB_CHECKERR(windata->dfbwin->Resize(windata->dfbwin,
+                                                     windata->size.w,
+                                                     windata->size.h));
+        }
+
+        SDL_DFB_CHECKERR(DirectFB_WM_GetClientSize
+                     (_this, window, &window->w, &window->h));
+        DirectFB_AdjustWindowSurface(window);
+
+        SDL_DFB_CHECKERR(windata->dfbwin->EnableEvents(windata->dfbwin,
+                                                       DWET_ALL));
+
+    }
+    return;
+  error:
+    SDL_DFB_CHECK(windata->dfbwin->EnableEvents(windata->dfbwin, DWET_ALL));
+    return;
+}
+
+void
+DirectFB_ShowWindow(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+
+    SDL_DFB_CHECK(windata->dfbwin->SetOpacity(windata->dfbwin, windata->opacity));
+
+}
+
+void
+DirectFB_HideWindow(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+
+    SDL_DFB_CHECK(windata->dfbwin->GetOpacity(windata->dfbwin, &windata->opacity));
+    SDL_DFB_CHECK(windata->dfbwin->SetOpacity(windata->dfbwin, 0));
+}
+
+void
+DirectFB_RaiseWindow(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+
+    SDL_DFB_CHECK(windata->dfbwin->RaiseToTop(windata->dfbwin));
+    SDL_DFB_CHECK(windata->dfbwin->RequestFocus(windata->dfbwin));
+}
+
+void
+DirectFB_MaximizeWindow(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    DFBWindowOptions wopts;
+
+    SDL_DFB_CHECK(windata->dfbwin->GetPosition(windata->dfbwin,
+                                 &windata->restore.x, &windata->restore.y));
+    SDL_DFB_CHECK(windata->dfbwin->GetSize(windata->dfbwin, &windata->restore.w,
+                             &windata->restore.h));
+
+    DirectFB_WM_AdjustWindowLayout(window, window->flags | SDL_WINDOW_MAXIMIZED, display->current_mode.w, display->current_mode.h) ;
+
+    SDL_DFB_CHECK(windata->dfbwin->MoveTo(windata->dfbwin, 0, 0));
+    SDL_DFB_CHECK(windata->dfbwin->Resize(windata->dfbwin,
+                            display->current_mode.w, display->current_mode.h));
+
+    /* Set Options */
+    SDL_DFB_CHECK(windata->dfbwin->GetOptions(windata->dfbwin, &wopts));
+    wopts |= DWOP_KEEP_SIZE | DWOP_KEEP_POSITION;
+    SDL_DFB_CHECK(windata->dfbwin->SetOptions(windata->dfbwin, wopts));
+}
+
+void
+DirectFB_MinimizeWindow(_THIS, SDL_Window * window)
+{
+    /* FIXME: Size to 32x32 ? */
+
+    SDL_Unsupported();
+}
+
+void
+DirectFB_RestoreWindow(_THIS, SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+    DFBWindowOptions wopts;
+
+    /* Set Options */
+    SDL_DFB_CHECK(windata->dfbwin->GetOptions(windata->dfbwin, &wopts));
+    wopts &= ~(DWOP_KEEP_SIZE | DWOP_KEEP_POSITION);
+    SDL_DFB_CHECK(windata->dfbwin->SetOptions(windata->dfbwin, wopts));
+
+    /* Window layout */
+    DirectFB_WM_AdjustWindowLayout(window, window->flags & ~(SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED),
+        windata->restore.w, windata->restore.h);
+    SDL_DFB_CHECK(windata->dfbwin->Resize(windata->dfbwin, windata->restore.w,
+                            windata->restore.h));
+    SDL_DFB_CHECK(windata->dfbwin->MoveTo(windata->dfbwin, windata->restore.x,
+                            windata->restore.y));
+
+    if (!(window->flags & SDL_WINDOW_RESIZABLE))
+        wopts |= DWOP_KEEP_SIZE;
+
+    if (window->flags & SDL_WINDOW_FULLSCREEN)
+        wopts |= DWOP_KEEP_POSITION | DWOP_KEEP_SIZE;
+    SDL_DFB_CHECK(windata->dfbwin->SetOptions(windata->dfbwin, wopts));
+
+
+}
+
+void
+DirectFB_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    SDL_DFB_WINDOWDATA(window);
+    DFB_WindowData *gwindata = ((devdata->grabbed_window) ? (DFB_WindowData *) ((devdata->grabbed_window)->driverdata) : NULL);
+
+    if ((window->flags & SDL_WINDOW_INPUT_GRABBED)) {
+        if (gwindata != NULL)
+        {
+            SDL_DFB_CHECK(gwindata->dfbwin->UngrabPointer(gwindata->dfbwin));
+            SDL_DFB_CHECK(gwindata->dfbwin->UngrabKeyboard(gwindata->dfbwin));
+        }
+        SDL_DFB_CHECK(windata->dfbwin->GrabPointer(windata->dfbwin));
+        SDL_DFB_CHECK(windata->dfbwin->GrabKeyboard(windata->dfbwin));
+        devdata->grabbed_window = window;
+    } else {
+        SDL_DFB_CHECK(windata->dfbwin->UngrabPointer(windata->dfbwin));
+        SDL_DFB_CHECK(windata->dfbwin->UngrabKeyboard(windata->dfbwin));
+        devdata->grabbed_window = NULL;
+    }
+}
+
+void
+DirectFB_DestroyWindow(_THIS, SDL_Window * window)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    SDL_DFB_WINDOWDATA(window);
+    DFB_WindowData *p;
+
+    /* Some cleanups */
+    SDL_DFB_CHECK(windata->dfbwin->UngrabPointer(windata->dfbwin));
+    SDL_DFB_CHECK(windata->dfbwin->UngrabKeyboard(windata->dfbwin));
+
+#if SDL_DIRECTFB_OPENGL
+    DirectFB_GL_DestroyWindowContexts(_this, window);
+#endif
+
+    if (window->shaper)
+    {
+        SDL_ShapeData *data = window->shaper->driverdata;
+        SDL_DFB_CHECK(data->surface->ReleaseSource(data->surface));
+        SDL_DFB_RELEASE(data->surface);
+        SDL_DFB_FREE(data);
+        SDL_DFB_FREE(window->shaper);
+    }
+
+    SDL_DFB_CHECK(windata->window_surface->SetFont(windata->window_surface, NULL));
+    SDL_DFB_CHECK(windata->surface->ReleaseSource(windata->surface));
+    SDL_DFB_CHECK(windata->window_surface->ReleaseSource(windata->window_surface));
+    SDL_DFB_RELEASE(windata->icon);
+    SDL_DFB_RELEASE(windata->font);
+    SDL_DFB_RELEASE(windata->eventbuffer);
+    SDL_DFB_RELEASE(windata->surface);
+    SDL_DFB_RELEASE(windata->window_surface);
+
+    SDL_DFB_RELEASE(windata->dfbwin);
+
+    /* Remove from list ... */
+
+    p = devdata->firstwin->driverdata;
+
+    while (p && p->next != window)
+        p = (p->next ? p->next->driverdata : NULL);
+    if (p)
+        p->next = windata->next;
+    else
+        devdata->firstwin = windata->next;
+    SDL_free(windata);
+    return;
+}
+
+SDL_bool
+DirectFB_GetWindowWMInfo(_THIS, SDL_Window * window,
+                         struct SDL_SysWMinfo * info)
+{
+    SDL_DFB_DEVICEDATA(_this);
+    SDL_DFB_WINDOWDATA(window);
+
+    if (info->version.major == SDL_MAJOR_VERSION &&
+        info->version.minor == SDL_MINOR_VERSION) {
+        info->subsystem = SDL_SYSWM_DIRECTFB;
+        info->info.dfb.dfb = devdata->dfb;
+        info->info.dfb.window = windata->dfbwin;
+        info->info.dfb.surface = windata->surface;
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("Application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+}
+
+void
+DirectFB_AdjustWindowSurface(SDL_Window * window)
+{
+    SDL_DFB_WINDOWDATA(window);
+    int adjust = windata->wm_needs_redraw;
+    int cw, ch;
+
+    DirectFB_WM_AdjustWindowLayout(window, window->flags, window->w, window->h);
+
+    SDL_DFB_CHECKERR(windata->
+                     window_surface->GetSize(windata->window_surface, &cw,
+                                             &ch));
+    if (cw != windata->size.w || ch != windata->size.h) {
+        adjust = 1;
+    }
+
+    if (adjust) {
+#if SDL_DIRECTFB_OPENGL
+        DirectFB_GL_FreeWindowContexts(SDL_GetVideoDevice(), window);
+#endif
+
+#if (DFB_VERSION_ATLEAST(1,2,1))
+        SDL_DFB_CHECKERR(windata->dfbwin->ResizeSurface(windata->dfbwin,
+                                                        windata->size.w,
+                                                        windata->size.h));
+        SDL_DFB_CHECKERR(windata->surface->MakeSubSurface(windata->surface,
+                                                          windata->
+                                                          window_surface,
+                                                          &windata->client));
+#else
+        DFBWindowOptions opts;
+
+        SDL_DFB_CHECKERR(windata->dfbwin->GetOptions(windata->dfbwin, &opts));
+        /* recreate subsurface */
+        SDL_DFB_RELEASE(windata->surface);
+
+        if (opts & DWOP_SCALE)
+            SDL_DFB_CHECKERR(windata->dfbwin->ResizeSurface(windata->dfbwin,
+                                                            windata->size.w,
+                                                            windata->size.h));
+        SDL_DFB_CHECKERR(windata->window_surface->
+                         GetSubSurface(windata->window_surface,
+                                       &windata->client, &windata->surface));
+#endif
+        DirectFB_WM_RedrawLayout(SDL_GetVideoDevice(), window);
+
+#if SDL_DIRECTFB_OPENGL
+        DirectFB_GL_ReAllocWindowContexts(SDL_GetVideoDevice(), window);
+#endif
+   }
+  error:
+    return;
+}
+
+#endif /* SDL_VIDEO_DRIVER_DIRECTFB */
diff --git a/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_window.h b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_window.h
new file mode 100644
index 000000000..a16d16095
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/directfb/SDL_DirectFB_window.h	
@@ -0,0 +1,81 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_directfb_window_h
+#define _SDL_directfb_window_h
+
+#include "SDL_DirectFB_video.h"
+#include "SDL_DirectFB_WM.h"
+
+#define SDL_DFB_WINDOWDATA(win)  DFB_WindowData *windata = ((win) ? (DFB_WindowData *) ((win)->driverdata) : NULL)
+
+typedef struct _DFB_WindowData DFB_WindowData;
+struct _DFB_WindowData
+{
+    IDirectFBSurface        *window_surface;    /* window surface */
+    IDirectFBSurface        *surface;           /* client drawing surface */
+    IDirectFBWindow         *dfbwin;
+    IDirectFBEventBuffer    *eventbuffer;
+    /* SDL_Window                *sdlwin; */
+    SDL_Window              *next;
+    Uint8                   opacity;
+    DFBRectangle            client;
+    DFBDimension            size;
+    DFBRectangle            restore;
+
+    /* WM extras */
+    int                     is_managed;
+    int                     wm_needs_redraw;
+    IDirectFBSurface        *icon;
+    IDirectFBFont           *font;
+    DFB_Theme               theme;
+
+    /* WM moving and sizing */
+    int                     wm_grab;
+    int                     wm_lastx;
+    int                     wm_lasty;
+};
+
+extern int DirectFB_CreateWindow(_THIS, SDL_Window * window);
+extern int DirectFB_CreateWindowFrom(_THIS, SDL_Window * window,
+                                     const void *data);
+extern void DirectFB_SetWindowTitle(_THIS, SDL_Window * window);
+extern void DirectFB_SetWindowIcon(_THIS, SDL_Window * window,
+                                   SDL_Surface * icon);
+
+extern void DirectFB_SetWindowPosition(_THIS, SDL_Window * window);
+extern void DirectFB_SetWindowSize(_THIS, SDL_Window * window);
+extern void DirectFB_ShowWindow(_THIS, SDL_Window * window);
+extern void DirectFB_HideWindow(_THIS, SDL_Window * window);
+extern void DirectFB_RaiseWindow(_THIS, SDL_Window * window);
+extern void DirectFB_MaximizeWindow(_THIS, SDL_Window * window);
+extern void DirectFB_MinimizeWindow(_THIS, SDL_Window * window);
+extern void DirectFB_RestoreWindow(_THIS, SDL_Window * window);
+extern void DirectFB_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
+extern void DirectFB_DestroyWindow(_THIS, SDL_Window * window);
+extern SDL_bool DirectFB_GetWindowWMInfo(_THIS, SDL_Window * window,
+                                         struct SDL_SysWMinfo *info);
+
+extern void DirectFB_AdjustWindowSurface(SDL_Window * window);
+
+#endif /* _SDL_directfb_window_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/dummy/SDL_nullevents.c b/Source/3rd Party/sdl/src/video/dummy/SDL_nullevents.c
new file mode 100644
index 000000000..22a34bbaa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/dummy/SDL_nullevents.c	
@@ -0,0 +1,41 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DUMMY
+
+/* Being a null driver, there's no event stream. We just define stubs for
+   most of the API. */
+
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_nullvideo.h"
+#include "SDL_nullevents_c.h"
+
+void
+DUMMY_PumpEvents(_THIS)
+{
+    /* do nothing. */
+}
+
+#endif /* SDL_VIDEO_DRIVER_DUMMY */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/dummy/SDL_nullevents_c.h b/Source/3rd Party/sdl/src/video/dummy/SDL_nullevents_c.h
new file mode 100644
index 000000000..41e28caa4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/dummy/SDL_nullevents_c.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#include "SDL_nullvideo.h"
+
+extern void DUMMY_PumpEvents(_THIS);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/dummy/SDL_nullframebuffer.c b/Source/3rd Party/sdl/src/video/dummy/SDL_nullframebuffer.c
new file mode 100644
index 000000000..2f1bcab7a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/dummy/SDL_nullframebuffer.c	
@@ -0,0 +1,89 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DUMMY
+
+#include "../SDL_sysvideo.h"
+#include "SDL_nullframebuffer_c.h"
+
+
+#define DUMMY_SURFACE   "_SDL_DummySurface"
+
+int SDL_DUMMY_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch)
+{
+    SDL_Surface *surface;
+    const Uint32 surface_format = SDL_PIXELFORMAT_RGB888;
+    int w, h;
+    int bpp;
+    Uint32 Rmask, Gmask, Bmask, Amask;
+
+    /* Free the old framebuffer surface */
+    surface = (SDL_Surface *) SDL_GetWindowData(window, DUMMY_SURFACE);
+    SDL_FreeSurface(surface);
+
+    /* Create a new one */
+    SDL_PixelFormatEnumToMasks(surface_format, &bpp, &Rmask, &Gmask, &Bmask, &Amask);
+    SDL_GetWindowSize(window, &w, &h);
+    surface = SDL_CreateRGBSurface(0, w, h, bpp, Rmask, Gmask, Bmask, Amask);
+    if (!surface) {
+        return -1;
+    }
+
+    /* Save the info and return! */
+    SDL_SetWindowData(window, DUMMY_SURFACE, surface);
+    *format = surface_format;
+    *pixels = surface->pixels;
+    *pitch = surface->pitch;
+    return 0;
+}
+
+int SDL_DUMMY_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects)
+{
+    static int frame_number;
+    SDL_Surface *surface;
+
+    surface = (SDL_Surface *) SDL_GetWindowData(window, DUMMY_SURFACE);
+    if (!surface) {
+        return SDL_SetError("Couldn't find dummy surface for window");
+    }
+
+    /* Send the data to the display */
+    if (SDL_getenv("SDL_VIDEO_DUMMY_SAVE_FRAMES")) {
+        char file[128];
+        SDL_snprintf(file, sizeof(file), "SDL_window%d-%8.8d.bmp",
+                     SDL_GetWindowID(window), ++frame_number);
+        SDL_SaveBMP(surface, file);
+    }
+    return 0;
+}
+
+void SDL_DUMMY_DestroyWindowFramebuffer(_THIS, SDL_Window * window)
+{
+    SDL_Surface *surface;
+
+    surface = (SDL_Surface *) SDL_SetWindowData(window, DUMMY_SURFACE, NULL);
+    SDL_FreeSurface(surface);
+}
+
+#endif /* SDL_VIDEO_DRIVER_DUMMY */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/dummy/SDL_nullframebuffer_c.h b/Source/3rd Party/sdl/src/video/dummy/SDL_nullframebuffer_c.h
new file mode 100644
index 000000000..4c582d7d4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/dummy/SDL_nullframebuffer_c.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+extern int SDL_DUMMY_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch);
+extern int SDL_DUMMY_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects);
+extern void SDL_DUMMY_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/dummy/SDL_nullvideo.c b/Source/3rd Party/sdl/src/video/dummy/SDL_nullvideo.c
new file mode 100644
index 000000000..28147bd18
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/dummy/SDL_nullvideo.c	
@@ -0,0 +1,144 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_DUMMY
+
+/* Dummy SDL video driver implementation; this is just enough to make an
+ *  SDL-based application THINK it's got a working video driver, for
+ *  applications that call SDL_Init(SDL_INIT_VIDEO) when they don't need it,
+ *  and also for use as a collection of stubs when porting SDL to a new
+ *  platform for which you haven't yet written a valid video driver.
+ *
+ * This is also a great way to determine bottlenecks: if you think that SDL
+ *  is a performance problem for a given platform, enable this driver, and
+ *  then see if your application runs faster without video overhead.
+ *
+ * Initial work by Ryan C. Gordon (icculus@icculus.org). A good portion
+ *  of this was cut-and-pasted from Stephane Peter's work in the AAlib
+ *  SDL video driver.  Renamed to "DUMMY" by Sam Lantinga.
+ */
+
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_nullvideo.h"
+#include "SDL_nullevents_c.h"
+#include "SDL_nullframebuffer_c.h"
+
+#define DUMMYVID_DRIVER_NAME "dummy"
+
+/* Initialization/Query functions */
+static int DUMMY_VideoInit(_THIS);
+static int DUMMY_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+static void DUMMY_VideoQuit(_THIS);
+
+/* DUMMY driver bootstrap functions */
+
+static int
+DUMMY_Available(void)
+{
+    const char *envr = SDL_getenv("SDL_VIDEODRIVER");
+    if ((envr) && (SDL_strcmp(envr, DUMMYVID_DRIVER_NAME) == 0)) {
+        return (1);
+    }
+
+    return (0);
+}
+
+static void
+DUMMY_DeleteDevice(SDL_VideoDevice * device)
+{
+    SDL_free(device);
+}
+
+static SDL_VideoDevice *
+DUMMY_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (!device) {
+        SDL_OutOfMemory();
+        SDL_free(device);
+        return (0);
+    }
+
+    /* Set the function pointers */
+    device->VideoInit = DUMMY_VideoInit;
+    device->VideoQuit = DUMMY_VideoQuit;
+    device->SetDisplayMode = DUMMY_SetDisplayMode;
+    device->PumpEvents = DUMMY_PumpEvents;
+    device->CreateWindowFramebuffer = SDL_DUMMY_CreateWindowFramebuffer;
+    device->UpdateWindowFramebuffer = SDL_DUMMY_UpdateWindowFramebuffer;
+    device->DestroyWindowFramebuffer = SDL_DUMMY_DestroyWindowFramebuffer;
+
+    device->free = DUMMY_DeleteDevice;
+
+    return device;
+}
+
+VideoBootStrap DUMMY_bootstrap = {
+    DUMMYVID_DRIVER_NAME, "SDL dummy video driver",
+    DUMMY_Available, DUMMY_CreateDevice
+};
+
+
+int
+DUMMY_VideoInit(_THIS)
+{
+    SDL_DisplayMode mode;
+
+    /* Use a fake 32-bpp desktop mode */
+    mode.format = SDL_PIXELFORMAT_RGB888;
+    mode.w = 1024;
+    mode.h = 768;
+    mode.refresh_rate = 0;
+    mode.driverdata = NULL;
+    if (SDL_AddBasicVideoDisplay(&mode) < 0) {
+        return -1;
+    }
+
+    SDL_zero(mode);
+    SDL_AddDisplayMode(&_this->displays[0], &mode);
+
+    /* We're done! */
+    return 0;
+}
+
+static int
+DUMMY_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+    return 0;
+}
+
+void
+DUMMY_VideoQuit(_THIS)
+{
+}
+
+#endif /* SDL_VIDEO_DRIVER_DUMMY */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/dummy/SDL_nullvideo.h b/Source/3rd Party/sdl/src/video/dummy/SDL_nullvideo.h
new file mode 100644
index 000000000..b0a76c064
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/dummy/SDL_nullvideo.h	
@@ -0,0 +1,30 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_nullvideo_h
+#define _SDL_nullvideo_h
+
+#include "../SDL_sysvideo.h"
+
+#endif /* _SDL_nullvideo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_BWin.h b/Source/3rd Party/sdl/src/video/haiku/SDL_BWin.h
new file mode 100644
index 000000000..e6de5b0d0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_BWin.h	
@@ -0,0 +1,638 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_BWin_h
+#define _SDL_BWin_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../../SDL_internal.h"
+#include "SDL.h"
+#include "SDL_syswm.h"
+#include "SDL_bframebuffer.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <stdio.h>
+#include <AppKit.h>
+#include <InterfaceKit.h>
+#include <be/game/DirectWindow.h>
+#if SDL_VIDEO_OPENGL
+#include <be/opengl/GLView.h>
+#endif
+#include "SDL_events.h"
+#include "../../main/haiku/SDL_BApp.h"
+
+
+enum WinCommands {
+    BWIN_MOVE_WINDOW,
+    BWIN_RESIZE_WINDOW,
+    BWIN_SHOW_WINDOW,
+    BWIN_HIDE_WINDOW,
+    BWIN_MAXIMIZE_WINDOW,
+    BWIN_MINIMIZE_WINDOW,
+    BWIN_RESTORE_WINDOW,
+    BWIN_SET_TITLE,
+    BWIN_SET_BORDERED,
+    BWIN_FULLSCREEN
+};
+
+
+class SDL_BWin:public BDirectWindow
+{
+  public:
+    /* Constructor/Destructor */
+    SDL_BWin(BRect bounds, window_look look, uint32 flags)
+        : BDirectWindow(bounds, "Untitled", look, B_NORMAL_WINDOW_FEEL, flags)
+    {
+        _last_buttons = 0;
+
+#if SDL_VIDEO_OPENGL
+        _SDL_GLView = NULL;
+#endif
+        _shown = false;
+        _inhibit_resize = false;
+        _mouse_focused = false;
+        _prev_frame = NULL;
+
+        /* Handle framebuffer stuff */
+        _connected = _connection_disabled = false;
+        _buffer_created = _buffer_dirty = false;
+        _trash_window_buffer = false;
+        _buffer_locker = new BLocker();
+        _bitmap = NULL;
+        _clips = NULL;
+
+#ifdef DRAWTHREAD
+        _draw_thread_id = spawn_thread(BE_DrawThread, "drawing_thread",
+                            B_NORMAL_PRIORITY, (void*) this);
+        resume_thread(_draw_thread_id);
+#endif
+    }
+
+    virtual ~ SDL_BWin()
+    {
+        Lock();
+        _connection_disabled = true;
+        int32 result;
+
+#if SDL_VIDEO_OPENGL
+        if (_SDL_GLView) {
+            _SDL_GLView->UnlockGL();
+            RemoveChild(_SDL_GLView);   /* Why was this outside the if
+                                            statement before? */
+        }
+
+#endif
+        Unlock();
+#if SDL_VIDEO_OPENGL
+        if (_SDL_GLView) {
+            delete _SDL_GLView;
+        }
+#endif
+
+        /* Clean up framebuffer stuff */
+        _buffer_locker->Lock();
+#ifdef DRAWTHREAD
+        wait_for_thread(_draw_thread_id, &result);
+#endif
+        free(_clips);
+        delete _buffer_locker;
+    }
+
+
+    /* * * * * OpenGL functionality * * * * */
+#if SDL_VIDEO_OPENGL
+    virtual BGLView *CreateGLView(Uint32 gl_flags) {
+        Lock();
+        if (_SDL_GLView == NULL) {
+            _SDL_GLView = new BGLView(Bounds(), "SDL GLView",
+                                     B_FOLLOW_ALL_SIDES,
+                                     (B_WILL_DRAW | B_FRAME_EVENTS),
+                                     gl_flags);
+        }
+        AddChild(_SDL_GLView);
+        _SDL_GLView->EnableDirectMode(true);
+        _SDL_GLView->LockGL();  /* "New" GLViews are created */
+        Unlock();
+        return (_SDL_GLView);
+    }
+
+    virtual void RemoveGLView() {
+        Lock();
+        if(_SDL_GLView) {
+            _SDL_GLView->UnlockGL();
+            RemoveChild(_SDL_GLView);
+        }
+        Unlock();
+    }
+
+    virtual void SwapBuffers(void) {
+        _SDL_GLView->UnlockGL();
+        _SDL_GLView->LockGL();
+        _SDL_GLView->SwapBuffers();
+    }
+#endif
+
+    /* * * * * Framebuffering* * * * */
+    virtual void DirectConnected(direct_buffer_info *info) {
+        if(!_connected && _connection_disabled) {
+            return;
+        }
+
+        /* Determine if the pixel buffer is usable after this update */
+        _trash_window_buffer =      _trash_window_buffer
+                                || ((info->buffer_state & B_BUFFER_RESIZED)
+                                || (info->buffer_state & B_BUFFER_RESET)
+                                || (info->driver_state == B_MODE_CHANGED));
+        LockBuffer();
+
+        switch(info->buffer_state & B_DIRECT_MODE_MASK) {
+        case B_DIRECT_START:
+            _connected = true;
+
+        case B_DIRECT_MODIFY:
+            if(_clips) {
+                free(_clips);
+                _clips = NULL;
+            }
+
+            _num_clips = info->clip_list_count;
+            _clips = (clipping_rect *)malloc(_num_clips*sizeof(clipping_rect));
+            if(_clips) {
+                memcpy(_clips, info->clip_list,
+                    _num_clips*sizeof(clipping_rect));
+
+                _bits = (uint8*) info->bits;
+                _row_bytes = info->bytes_per_row;
+                _bounds = info->window_bounds;
+                _bytes_per_px = info->bits_per_pixel / 8;
+                _buffer_dirty = true;
+            }
+            break;
+
+        case B_DIRECT_STOP:
+            _connected = false;
+            break;
+        }
+#if SDL_VIDEO_OPENGL
+        if(_SDL_GLView) {
+            _SDL_GLView->DirectConnected(info);
+        }
+#endif
+
+
+        /* Call the base object directconnected */
+        BDirectWindow::DirectConnected(info);
+
+        UnlockBuffer();
+
+    }
+
+
+
+
+    /* * * * * Event sending * * * * */
+    /* Hook functions */
+    virtual void FrameMoved(BPoint origin) {
+        /* Post a message to the BApp so that it can handle the window event */
+        BMessage msg(BAPP_WINDOW_MOVED);
+        msg.AddInt32("window-x", (int)origin.x);
+        msg.AddInt32("window-y", (int)origin.y);
+        _PostWindowEvent(msg);
+
+        /* Perform normal hook operations */
+        BDirectWindow::FrameMoved(origin);
+    }
+
+    virtual void FrameResized(float width, float height) {
+        /* Post a message to the BApp so that it can handle the window event */
+        BMessage msg(BAPP_WINDOW_RESIZED);
+
+        msg.AddInt32("window-w", (int)width + 1);
+        msg.AddInt32("window-h", (int)height + 1);
+        _PostWindowEvent(msg);
+
+        /* Perform normal hook operations */
+        BDirectWindow::FrameResized(width, height);
+    }
+
+    virtual bool QuitRequested() {
+        BMessage msg(BAPP_WINDOW_CLOSE_REQUESTED);
+        _PostWindowEvent(msg);
+
+        /* We won't allow a quit unless asked by DestroyWindow() */
+        return false;
+    }
+
+    virtual void WindowActivated(bool active) {
+        BMessage msg(BAPP_KEYBOARD_FOCUS);  /* Mouse focus sold separately */
+        _PostWindowEvent(msg);
+    }
+
+    virtual void Zoom(BPoint origin,
+                float width,
+                float height) {
+        BMessage msg(BAPP_MAXIMIZE);    /* Closest thing to maximization Haiku has */
+        _PostWindowEvent(msg);
+
+        /* Before the window zooms, record its size */
+        if( !_prev_frame )
+            _prev_frame = new BRect(Frame());
+
+        /* Perform normal hook operations */
+        BDirectWindow::Zoom(origin, width, height);
+    }
+
+    /* Member functions */
+    virtual void Show() {
+        while(IsHidden()) {
+            BDirectWindow::Show();
+        }
+        _shown = true;
+
+        BMessage msg(BAPP_SHOW);
+        _PostWindowEvent(msg);
+    }
+
+    virtual void Hide() {
+        BDirectWindow::Hide();
+        _shown = false;
+
+        BMessage msg(BAPP_HIDE);
+        _PostWindowEvent(msg);
+    }
+
+    virtual void Minimize(bool minimize) {
+        BDirectWindow::Minimize(minimize);
+        int32 minState = (minimize ? BAPP_MINIMIZE : BAPP_RESTORE);
+
+        BMessage msg(minState);
+        _PostWindowEvent(msg);
+    }
+
+
+    /* BView message interruption */
+    virtual void DispatchMessage(BMessage * msg, BHandler * target)
+    {
+        BPoint where;   /* Used by mouse moved */
+        int32 buttons;  /* Used for mouse button events */
+        int32 key;      /* Used for key events */
+
+        switch (msg->what) {
+        case B_MOUSE_MOVED:
+            int32 transit;
+            if (msg->FindPoint("where", &where) == B_OK
+                && msg->FindInt32("be:transit", &transit) == B_OK) {
+                _MouseMotionEvent(where, transit);
+            }
+
+            /* FIXME: Apparently a button press/release event might be dropped
+               if made before before a different button is released.  Does
+               B_MOUSE_MOVED have the data needed to check if a mouse button
+               state has changed? */
+            if (msg->FindInt32("buttons", &buttons) == B_OK) {
+                _MouseButtonEvent(buttons);
+            }
+            break;
+
+        case B_MOUSE_DOWN:
+        case B_MOUSE_UP:
+            /* _MouseButtonEvent() detects any and all buttons that may have
+               changed state, as well as that button's new state */
+            if (msg->FindInt32("buttons", &buttons) == B_OK) {
+                _MouseButtonEvent(buttons);
+            }
+            break;
+
+        case B_MOUSE_WHEEL_CHANGED:
+            float x, y;
+            if (msg->FindFloat("be:wheel_delta_x", &x) == B_OK
+                && msg->FindFloat("be:wheel_delta_y", &y) == B_OK) {
+                    _MouseWheelEvent((int)x, (int)y);
+            }
+            break;
+
+        case B_KEY_DOWN:
+        case B_UNMAPPED_KEY_DOWN:      /* modifier keys are unmapped */
+            if (msg->FindInt32("key", &key) == B_OK) {
+                _KeyEvent((SDL_Scancode)key, SDL_PRESSED);
+            }
+            break;
+
+        case B_KEY_UP:
+        case B_UNMAPPED_KEY_UP:        /* modifier keys are unmapped */
+            if (msg->FindInt32("key", &key) == B_OK) {
+                _KeyEvent(key, SDL_RELEASED);
+            }
+            break;
+
+        default:
+            /* move it after switch{} so it's always handled
+               that way we keep Haiku features like:
+               - CTRL+Q to close window (and other shortcuts)
+               - PrintScreen to make screenshot into /boot/home
+               - etc.. */
+            /* BDirectWindow::DispatchMessage(msg, target); */
+            break;
+        }
+
+        BDirectWindow::DispatchMessage(msg, target);
+    }
+
+    /* Handle command messages */
+    virtual void MessageReceived(BMessage* message) {
+        switch (message->what) {
+            /* Handle commands from SDL */
+            case BWIN_SET_TITLE:
+                _SetTitle(message);
+                break;
+            case BWIN_MOVE_WINDOW:
+                _MoveTo(message);
+                break;
+            case BWIN_RESIZE_WINDOW:
+                _ResizeTo(message);
+                break;
+            case BWIN_SET_BORDERED:
+                _SetBordered(message);
+                break;
+            case BWIN_SHOW_WINDOW:
+                Show();
+                break;
+            case BWIN_HIDE_WINDOW:
+                Hide();
+                break;
+            case BWIN_MAXIMIZE_WINDOW:
+                BWindow::Zoom();
+                break;
+            case BWIN_MINIMIZE_WINDOW:
+                Minimize(true);
+                break;
+            case BWIN_RESTORE_WINDOW:
+                _Restore();
+                break;
+            case BWIN_FULLSCREEN:
+                _SetFullScreen(message);
+                break;
+            default:
+                /* Perform normal message handling */
+                BDirectWindow::MessageReceived(message);
+                break;
+        }
+
+    }
+
+
+
+    /* Accessor methods */
+    bool IsShown() { return _shown; }
+    int32 GetID() { return _id; }
+    uint32 GetRowBytes() { return _row_bytes; }
+    int32 GetFbX() { return _bounds.left; }
+    int32 GetFbY() { return _bounds.top; }
+    bool ConnectionEnabled() { return !_connection_disabled; }
+    bool Connected() { return _connected; }
+    clipping_rect *GetClips() { return _clips; }
+    int32 GetNumClips() { return _num_clips; }
+    uint8* GetBufferPx() { return _bits; }
+    int32 GetBytesPerPx() { return _bytes_per_px; }
+    bool CanTrashWindowBuffer() { return _trash_window_buffer; }
+    bool BufferExists() { return _buffer_created; }
+    bool BufferIsDirty() { return _buffer_dirty; }
+    BBitmap *GetBitmap() { return _bitmap; }
+#if SDL_VIDEO_OPENGL
+    BGLView *GetGLView() { return _SDL_GLView; }
+#endif
+
+    /* Setter methods */
+    void SetID(int32 id) { _id = id; }
+    void SetBufferExists(bool bufferExists) { _buffer_created = bufferExists; }
+    void LockBuffer() { _buffer_locker->Lock(); }
+    void UnlockBuffer() { _buffer_locker->Unlock(); }
+    void SetBufferDirty(bool bufferDirty) { _buffer_dirty = bufferDirty; }
+    void SetTrashBuffer(bool trash) { _trash_window_buffer = trash;     }
+    void SetBitmap(BBitmap *bitmap) { _bitmap = bitmap; }
+
+
+private:
+    /* Event redirection */
+    void _MouseMotionEvent(BPoint &where, int32 transit) {
+        if(transit == B_EXITED_VIEW) {
+            /* Change mouse focus */
+            if(_mouse_focused) {
+                _MouseFocusEvent(false);
+            }
+        } else {
+            /* Change mouse focus */
+            if (!_mouse_focused) {
+                _MouseFocusEvent(true);
+            }
+            BMessage msg(BAPP_MOUSE_MOVED);
+            msg.AddInt32("x", (int)where.x);
+            msg.AddInt32("y", (int)where.y);
+
+            _PostWindowEvent(msg);
+        }
+    }
+
+    void _MouseFocusEvent(bool focusGained) {
+        _mouse_focused = focusGained;
+        BMessage msg(BAPP_MOUSE_FOCUS);
+        msg.AddBool("focusGained", focusGained);
+        _PostWindowEvent(msg);
+
+/* FIXME: Why were these here?
+ if false: be_app->SetCursor(B_HAND_CURSOR);
+ if true:  SDL_SetCursor(NULL); */
+    }
+
+    void _MouseButtonEvent(int32 buttons) {
+        int32 buttonStateChange = buttons ^ _last_buttons;
+
+        /* Make sure at least one button has changed state */
+        if( !(buttonStateChange) ) {
+            return;
+        }
+
+        /* Add any mouse button events */
+        if(buttonStateChange & B_PRIMARY_MOUSE_BUTTON) {
+            _SendMouseButton(SDL_BUTTON_LEFT, buttons &
+                B_PRIMARY_MOUSE_BUTTON);
+        }
+        if(buttonStateChange & B_SECONDARY_MOUSE_BUTTON) {
+            _SendMouseButton(SDL_BUTTON_RIGHT, buttons &
+                B_PRIMARY_MOUSE_BUTTON);
+        }
+        if(buttonStateChange & B_TERTIARY_MOUSE_BUTTON) {
+            _SendMouseButton(SDL_BUTTON_MIDDLE, buttons &
+                B_PRIMARY_MOUSE_BUTTON);
+        }
+
+        _last_buttons = buttons;
+    }
+
+    void _SendMouseButton(int32 button, int32 state) {
+        BMessage msg(BAPP_MOUSE_BUTTON);
+        msg.AddInt32("button-id", button);
+        msg.AddInt32("button-state", state);
+        _PostWindowEvent(msg);
+    }
+
+    void _MouseWheelEvent(int32 x, int32 y) {
+        /* Create a message to pass along to the BeApp thread */
+        BMessage msg(BAPP_MOUSE_WHEEL);
+        msg.AddInt32("xticks", x);
+        msg.AddInt32("yticks", y);
+        _PostWindowEvent(msg);
+    }
+
+    void _KeyEvent(int32 keyCode, int32 keyState) {
+        /* Create a message to pass along to the BeApp thread */
+        BMessage msg(BAPP_KEY);
+        msg.AddInt32("key-state", keyState);
+        msg.AddInt32("key-scancode", keyCode);
+        be_app->PostMessage(&msg);
+        /* Apparently SDL only uses the scancode */
+    }
+
+    void _RepaintEvent() {
+        /* Force a repaint: Call the SDL exposed event */
+        BMessage msg(BAPP_REPAINT);
+        _PostWindowEvent(msg);
+    }
+    void _PostWindowEvent(BMessage &msg) {
+        msg.AddInt32("window-id", _id);
+        be_app->PostMessage(&msg);
+    }
+
+    /* Command methods (functions called upon by SDL) */
+    void _SetTitle(BMessage *msg) {
+        const char *title;
+        if(
+            msg->FindString("window-title", &title) != B_OK
+        ) {
+            return;
+        }
+        SetTitle(title);
+    }
+
+    void _MoveTo(BMessage *msg) {
+        int32 x, y;
+        if(
+            msg->FindInt32("window-x", &x) != B_OK ||
+            msg->FindInt32("window-y", &y) != B_OK
+        ) {
+            return;
+        }
+        MoveTo(x, y);
+    }
+
+    void _ResizeTo(BMessage *msg) {
+        int32 w, h;
+        if(
+            msg->FindInt32("window-w", &w) != B_OK ||
+            msg->FindInt32("window-h", &h) != B_OK
+        ) {
+            return;
+        }
+        ResizeTo(w, h);
+    }
+
+    void _SetBordered(BMessage *msg) {
+        bool bEnabled;
+        if(msg->FindBool("window-border", &bEnabled) != B_OK) {
+            return;
+        }
+        SetLook(bEnabled ? B_BORDERED_WINDOW_LOOK : B_NO_BORDER_WINDOW_LOOK);
+    }
+
+    void _Restore() {
+        if(IsMinimized()) {
+            Minimize(false);
+        } else if(IsHidden()) {
+            Show();
+        } else if(_prev_frame != NULL) {    /* Zoomed */
+            MoveTo(_prev_frame->left, _prev_frame->top);
+            ResizeTo(_prev_frame->Width(), _prev_frame->Height());
+        }
+    }
+
+    void _SetFullScreen(BMessage *msg) {
+        bool fullscreen;
+        if(
+            msg->FindBool("fullscreen", &fullscreen) != B_OK
+        ) {
+            return;
+        }
+        SetFullScreen(fullscreen);
+    }
+
+    /* Members */
+#if SDL_VIDEO_OPENGL
+    BGLView * _SDL_GLView;
+#endif
+
+    int32 _last_buttons;
+    int32 _id;  /* Window id used by SDL_BApp */
+    bool  _mouse_focused;       /* Does this window have mouse focus? */
+    bool  _shown;
+    bool  _inhibit_resize;
+
+    BRect *_prev_frame; /* Previous position and size of the window */
+
+    /* Framebuffer members */
+    bool            _connected,
+                    _connection_disabled,
+                    _buffer_created,
+                    _buffer_dirty,
+                    _trash_window_buffer;
+    uint8          *_bits;
+    uint32          _row_bytes;
+    clipping_rect   _bounds;
+    BLocker        *_buffer_locker;
+    clipping_rect  *_clips;
+    int32           _num_clips;
+    int32           _bytes_per_px;
+    thread_id       _draw_thread_id;
+
+    BBitmap        *_bitmap;
+};
+
+
+/* FIXME:
+ * An explanation of framebuffer flags.
+ *
+ * _connected -           Original variable used to let the drawing thread know
+ *                         when changes are being made to the other framebuffer
+ *                         members.
+ * _connection_disabled - Used to signal to the drawing thread that the window
+ *                         is closing, and the thread should exit.
+ * _buffer_created -      True if the current buffer is valid
+ * _buffer_dirty -        True if the window should be redrawn.
+ * _trash_window_buffer - True if the window buffer needs to be trashed partway
+ *                         through a draw cycle.  Occurs when the previous
+ *                         buffer provided by DirectConnected() is invalidated.
+ */
+#endif
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bclipboard.cc b/Source/3rd Party/sdl/src/video/haiku/SDL_bclipboard.cc
new file mode 100644
index 000000000..9760d0fba
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bclipboard.cc	
@@ -0,0 +1,95 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_HAIKU
+
+/* BWindow based framebuffer implementation */
+
+#include <unistd.h>
+#include <TypeConstants.h>
+
+#include "SDL_BWin.h"
+#include "SDL_timer.h"
+#include "../SDL_sysvideo.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int BE_SetClipboardText(_THIS, const char *text) {
+	BMessage *clip = NULL;
+	if(be_clipboard->Lock()) {
+		be_clipboard->Clear();
+		if((clip = be_clipboard->Data())) {
+			/* Presumably the string of characters is ascii-format */
+			ssize_t asciiLength = 0;
+			for(; text[asciiLength] != 0; ++asciiLength) {}
+			clip->AddData("text/plain", B_MIME_TYPE, &text, asciiLength);
+			be_clipboard->Commit();
+		}
+		be_clipboard->Unlock();
+	}
+	return 0;
+}
+
+char *BE_GetClipboardText(_THIS) {
+	BMessage *clip = NULL;
+	const char *text = NULL;	
+	ssize_t length;
+	char *result;
+	if(be_clipboard->Lock()) {
+		if((clip = be_clipboard->Data())) {
+			/* Presumably the string of characters is ascii-format */
+			clip->FindData("text/plain", B_MIME_TYPE, (const void**)&text,
+				&length);
+		} else {
+			be_clipboard->Unlock();
+		}
+		be_clipboard->Unlock();
+	} 
+	
+	if (!text) {
+		result = SDL_strdup("");
+	} else {
+		/* Copy the data and pass on to SDL */
+		result = (char*)SDL_calloc(1, sizeof(char*)*length);
+		SDL_strlcpy(result, text, length);
+	}
+	
+	return result;
+}
+
+SDL_bool BE_HasClipboardText(_THIS) {
+	SDL_bool result = SDL_FALSE;
+	char *text = BE_GetClipboardText(_this);
+	if (text) {
+		result = text[0] != '\0' ? SDL_TRUE : SDL_FALSE;
+		SDL_free(text);
+	} 
+	return result;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_HAIKU */
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bclipboard.h b/Source/3rd Party/sdl/src/video/haiku/SDL_bclipboard.h
new file mode 100644
index 000000000..418ba90b9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bclipboard.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef SDL_BCLIPBOARD_H
+#define SDL_BCLIPBOARD_H
+
+extern int BE_SetClipboardText(_THIS, const char *text);
+extern char *BE_GetClipboardText(_THIS);
+extern SDL_bool BE_HasClipboardText(_THIS);
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bevents.cc b/Source/3rd Party/sdl/src/video/haiku/SDL_bevents.cc
new file mode 100644
index 000000000..2ffc47138
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bevents.cc	
@@ -0,0 +1,39 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_HAIKU
+
+#include "SDL_bevents.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void BE_PumpEvents(_THIS) {
+	/* Since the event thread is its own thread, this isn't really necessary */
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_HAIKU */
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bevents.h b/Source/3rd Party/sdl/src/video/haiku/SDL_bevents.h
new file mode 100644
index 000000000..9b53f39aa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bevents.h	
@@ -0,0 +1,37 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_BEVENTS_H
+#define SDL_BEVENTS_H
+
+#include "../SDL_sysvideo.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void BE_PumpEvents(_THIS);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bframebuffer.cc b/Source/3rd Party/sdl/src/video/haiku/SDL_bframebuffer.cc
new file mode 100644
index 000000000..0c5639606
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bframebuffer.cc	
@@ -0,0 +1,254 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_HAIKU
+
+#include "SDL_bframebuffer.h"
+
+#include <AppKit.h>
+#include <InterfaceKit.h>
+#include "SDL_bmodes.h"
+#include "SDL_BWin.h"
+
+#include "../../main/haiku/SDL_BApp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int32 BE_UpdateOnce(SDL_Window *window);
+
+static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
+	return ((SDL_BWin*)(window->driverdata));
+}
+
+static SDL_INLINE SDL_BApp *_GetBeApp() {
+	return ((SDL_BApp*)be_app);
+}
+
+int BE_CreateWindowFramebuffer(_THIS, SDL_Window * window,
+                                       Uint32 * format,
+                                       void ** pixels, int *pitch) {
+	SDL_BWin *bwin = _ToBeWin(window);
+	BScreen bscreen;
+	if(!bscreen.IsValid()) {
+		return -1;
+	}
+
+	while(!bwin->Connected()) { snooze(100); }
+	
+	/* Make sure we have exclusive access to frame buffer data */
+	bwin->LockBuffer();
+
+	/* format */
+	display_mode bmode;
+	bscreen.GetMode(&bmode);
+	int32 bpp = BE_ColorSpaceToBitsPerPixel(bmode.space);
+	*format = BE_BPPToSDLPxFormat(bpp);
+
+	/* Create the new bitmap object */
+	BBitmap *bitmap = bwin->GetBitmap();
+
+	if(bitmap) {
+		delete bitmap;
+	}
+	bitmap = new BBitmap(bwin->Bounds(), (color_space)bmode.space,
+			false,	/* Views not accepted */
+			true);	/* Contiguous memory required */
+			
+	if(bitmap->InitCheck() != B_OK) {
+		return SDL_SetError("Could not initialize back buffer!\n");
+	}
+
+
+	bwin->SetBitmap(bitmap);
+	
+	/* Set the pixel pointer */
+	*pixels = bitmap->Bits();
+
+	/* pitch = width of window, in bytes */
+	*pitch = bitmap->BytesPerRow();
+
+	bwin->SetBufferExists(true);
+	bwin->SetTrashBuffer(false);
+	bwin->UnlockBuffer();
+	return 0;
+}
+
+
+
+int BE_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
+                                      const SDL_Rect * rects, int numrects) {
+	if(!window)
+		return 0;
+
+	SDL_BWin *bwin = _ToBeWin(window);
+
+#ifdef DRAWTHREAD	
+	bwin->LockBuffer();
+	bwin->SetBufferDirty(true);
+	bwin->UnlockBuffer();
+#else
+	bwin->SetBufferDirty(true);
+	BE_UpdateOnce(window);
+#endif
+
+	return 0;
+}
+
+int32 BE_DrawThread(void *data) {
+	SDL_BWin *bwin = (SDL_BWin*)data;
+	
+	BScreen bscreen;
+	if(!bscreen.IsValid()) {
+		return -1;
+	}
+
+	while(bwin->ConnectionEnabled()) {
+		if( bwin->Connected() && bwin->BufferExists() && bwin->BufferIsDirty() ) {
+			bwin->LockBuffer();
+			BBitmap *bitmap = NULL;
+			bitmap = bwin->GetBitmap();
+			int32 windowPitch = bitmap->BytesPerRow();
+			int32 bufferPitch = bwin->GetRowBytes();
+			uint8 *windowpx;
+			uint8 *bufferpx;
+
+			int32 BPP = bwin->GetBytesPerPx();
+			int32 windowSub = bwin->GetFbX() * BPP +
+						  bwin->GetFbY() * windowPitch;
+			clipping_rect *clips = bwin->GetClips();
+			int32 numClips = bwin->GetNumClips();
+			int i, y;
+
+			/* Blit each clipping rectangle */
+			bscreen.WaitForRetrace();
+			for(i = 0; i < numClips; ++i) {
+				clipping_rect rc = clips[i];
+				/* Get addresses of the start of each clipping rectangle */
+				int32 width = clips[i].right - clips[i].left + 1;
+				int32 height = clips[i].bottom - clips[i].top + 1;
+				bufferpx = bwin->GetBufferPx() + 
+					clips[i].top * bufferPitch + clips[i].left * BPP;
+				windowpx = (uint8*)bitmap->Bits() + 
+					clips[i].top * windowPitch + clips[i].left * BPP -
+					windowSub;
+
+				/* Copy each row of pixels from the window buffer into the frame
+				   buffer */
+				for(y = 0; y < height; ++y)
+				{
+
+					if(bwin->CanTrashWindowBuffer()) {
+						goto escape;	/* Break out before the buffer is killed */
+					}
+
+					memcpy(bufferpx, windowpx, width * BPP);
+					bufferpx += bufferPitch;
+					windowpx += windowPitch;
+				}
+			}
+
+			bwin->SetBufferDirty(false);
+escape:
+			bwin->UnlockBuffer();
+		} else {
+			snooze(16000);
+		}
+	}
+	
+	return B_OK;
+}
+
+void BE_DestroyWindowFramebuffer(_THIS, SDL_Window * window) {
+	SDL_BWin *bwin = _ToBeWin(window);
+	
+	bwin->LockBuffer();
+	
+	/* Free and clear the window buffer */
+	BBitmap *bitmap = bwin->GetBitmap();
+	delete bitmap;
+	bwin->SetBitmap(NULL);
+	bwin->SetBufferExists(false);
+	bwin->UnlockBuffer();
+}
+
+
+/*
+ * TODO:
+ * This was written to test if certain errors were caused by threading issues.
+ * The specific issues have since become rare enough that they may have been
+ * solved, but I doubt it- they were pretty sporadic before now.
+ */
+int32 BE_UpdateOnce(SDL_Window *window) {
+	SDL_BWin *bwin = _ToBeWin(window);
+	BScreen bscreen;
+	if(!bscreen.IsValid()) {
+		return -1;
+	}
+
+	if(bwin->ConnectionEnabled() && bwin->Connected()) {
+		bwin->LockBuffer();
+		int32 windowPitch = window->surface->pitch;
+		int32 bufferPitch = bwin->GetRowBytes();
+		uint8 *windowpx;
+		uint8 *bufferpx;
+
+		int32 BPP = bwin->GetBytesPerPx();
+		uint8 *windowBaseAddress = (uint8*)window->surface->pixels;
+		int32 windowSub = bwin->GetFbX() * BPP +
+						  bwin->GetFbY() * windowPitch;
+		clipping_rect *clips = bwin->GetClips();
+		int32 numClips = bwin->GetNumClips();
+		int i, y;
+
+		/* Blit each clipping rectangle */
+		bscreen.WaitForRetrace();
+		for(i = 0; i < numClips; ++i) {
+			clipping_rect rc = clips[i];
+			/* Get addresses of the start of each clipping rectangle */
+			int32 width = clips[i].right - clips[i].left + 1;
+			int32 height = clips[i].bottom - clips[i].top + 1;
+			bufferpx = bwin->GetBufferPx() + 
+				clips[i].top * bufferPitch + clips[i].left * BPP;
+			windowpx = windowBaseAddress + 
+				clips[i].top * windowPitch + clips[i].left * BPP - windowSub;
+
+			/* Copy each row of pixels from the window buffer into the frame
+			   buffer */
+			for(y = 0; y < height; ++y)
+			{
+				memcpy(bufferpx, windowpx, width * BPP);
+				bufferpx += bufferPitch;
+				windowpx += windowPitch;
+			}
+		}
+		bwin->UnlockBuffer();
+	}
+	return 0;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_HAIKU */
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bframebuffer.h b/Source/3rd Party/sdl/src/video/haiku/SDL_bframebuffer.h
new file mode 100644
index 000000000..b0b73d3ca
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bframebuffer.h	
@@ -0,0 +1,45 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_BFRAMEBUFFER_H
+#define SDL_BFRAMEBUFFER_H
+#include <SupportDefs.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define DRAWTHREAD
+
+#include "../SDL_sysvideo.h"
+
+extern int BE_CreateWindowFramebuffer(_THIS, SDL_Window * window,
+                                       Uint32 * format,
+                                       void ** pixels, int *pitch);
+extern int BE_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
+                                       const SDL_Rect * rects, int numrects);
+extern void BE_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
+extern int32 BE_DrawThread(void *data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bkeyboard.cc b/Source/3rd Party/sdl/src/video/haiku/SDL_bkeyboard.cc
new file mode 100644
index 000000000..97f34b23b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bkeyboard.cc	
@@ -0,0 +1,188 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_HAIKU
+
+#include <SupportDefs.h>
+#include <support/UTF8.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "SDL_events.h"
+#include "SDL_keycode.h"
+
+#include "SDL_bkeyboard.h"
+
+
+#define KEYMAP_SIZE 128
+
+
+static SDL_Scancode keymap[KEYMAP_SIZE];
+static int8 keystate[KEYMAP_SIZE];
+
+void BE_InitOSKeymap() {
+		for( uint i = 0; i < SDL_TABLESIZE(keymap); ++i ) {
+			keymap[i] = SDL_SCANCODE_UNKNOWN;
+		}
+
+		for( uint i = 0; i < KEYMAP_SIZE; ++i ) {
+			keystate[i] = SDL_RELEASED;
+		}
+
+		keymap[0x01]		= SDL_GetScancodeFromKey(SDLK_ESCAPE);
+		keymap[B_F1_KEY]	= SDL_GetScancodeFromKey(SDLK_F1);
+		keymap[B_F2_KEY]	= SDL_GetScancodeFromKey(SDLK_F2);
+		keymap[B_F3_KEY]	= SDL_GetScancodeFromKey(SDLK_F3);
+		keymap[B_F4_KEY]	= SDL_GetScancodeFromKey(SDLK_F4);
+		keymap[B_F5_KEY]	= SDL_GetScancodeFromKey(SDLK_F5);
+		keymap[B_F6_KEY]	= SDL_GetScancodeFromKey(SDLK_F6);
+		keymap[B_F7_KEY]	= SDL_GetScancodeFromKey(SDLK_F7);
+		keymap[B_F8_KEY]	= SDL_GetScancodeFromKey(SDLK_F8);
+		keymap[B_F9_KEY]	= SDL_GetScancodeFromKey(SDLK_F9);
+		keymap[B_F10_KEY]	= SDL_GetScancodeFromKey(SDLK_F10);
+		keymap[B_F11_KEY]	= SDL_GetScancodeFromKey(SDLK_F11);
+		keymap[B_F12_KEY]	= SDL_GetScancodeFromKey(SDLK_F12);
+		keymap[B_PRINT_KEY]	= SDL_GetScancodeFromKey(SDLK_PRINTSCREEN);
+		keymap[B_SCROLL_KEY]	= SDL_GetScancodeFromKey(SDLK_SCROLLLOCK);
+		keymap[B_PAUSE_KEY]	= SDL_GetScancodeFromKey(SDLK_PAUSE);
+		keymap[0x11]		= SDL_GetScancodeFromKey(SDLK_BACKQUOTE);
+		keymap[0x12]		= SDL_GetScancodeFromKey(SDLK_1);
+		keymap[0x13]		= SDL_GetScancodeFromKey(SDLK_2);
+		keymap[0x14]		= SDL_GetScancodeFromKey(SDLK_3);
+		keymap[0x15]		= SDL_GetScancodeFromKey(SDLK_4);
+		keymap[0x16]		= SDL_GetScancodeFromKey(SDLK_5);
+		keymap[0x17]		= SDL_GetScancodeFromKey(SDLK_6);
+		keymap[0x18]		= SDL_GetScancodeFromKey(SDLK_7);
+		keymap[0x19]		= SDL_GetScancodeFromKey(SDLK_8);
+		keymap[0x1a]		= SDL_GetScancodeFromKey(SDLK_9);
+		keymap[0x1b]		= SDL_GetScancodeFromKey(SDLK_0);
+		keymap[0x1c]		= SDL_GetScancodeFromKey(SDLK_MINUS);
+		keymap[0x1d]		= SDL_GetScancodeFromKey(SDLK_EQUALS);
+		keymap[0x1e]		= SDL_GetScancodeFromKey(SDLK_BACKSPACE);
+		keymap[0x1f]		= SDL_GetScancodeFromKey(SDLK_INSERT);
+		keymap[0x20]		= SDL_GetScancodeFromKey(SDLK_HOME);
+		keymap[0x21]		= SDL_GetScancodeFromKey(SDLK_PAGEUP);
+		keymap[0x22]		= SDL_GetScancodeFromKey(SDLK_NUMLOCKCLEAR);
+		keymap[0x23]		= SDL_GetScancodeFromKey(SDLK_KP_DIVIDE);
+		keymap[0x24]		= SDL_GetScancodeFromKey(SDLK_KP_MULTIPLY);
+		keymap[0x25]		= SDL_GetScancodeFromKey(SDLK_KP_MINUS);
+		keymap[0x26]		= SDL_GetScancodeFromKey(SDLK_TAB);
+		keymap[0x27]		= SDL_GetScancodeFromKey(SDLK_q);
+		keymap[0x28]		= SDL_GetScancodeFromKey(SDLK_w);
+		keymap[0x29]		= SDL_GetScancodeFromKey(SDLK_e);
+		keymap[0x2a]		= SDL_GetScancodeFromKey(SDLK_r);
+		keymap[0x2b]		= SDL_GetScancodeFromKey(SDLK_t);
+		keymap[0x2c]		= SDL_GetScancodeFromKey(SDLK_y);
+		keymap[0x2d]		= SDL_GetScancodeFromKey(SDLK_u);
+		keymap[0x2e]		= SDL_GetScancodeFromKey(SDLK_i);
+		keymap[0x2f]		= SDL_GetScancodeFromKey(SDLK_o);
+		keymap[0x30]		= SDL_GetScancodeFromKey(SDLK_p);
+		keymap[0x31]		= SDL_GetScancodeFromKey(SDLK_LEFTBRACKET);
+		keymap[0x32]		= SDL_GetScancodeFromKey(SDLK_RIGHTBRACKET);
+		keymap[0x33]		= SDL_GetScancodeFromKey(SDLK_BACKSLASH);
+		keymap[0x34]		= SDL_GetScancodeFromKey(SDLK_DELETE);
+		keymap[0x35]		= SDL_GetScancodeFromKey(SDLK_END);
+		keymap[0x36]		= SDL_GetScancodeFromKey(SDLK_PAGEDOWN);
+		keymap[0x37]		= SDL_GetScancodeFromKey(SDLK_KP_7);
+		keymap[0x38]		= SDL_GetScancodeFromKey(SDLK_KP_8);
+		keymap[0x39]		= SDL_GetScancodeFromKey(SDLK_KP_9);
+		keymap[0x3a]		= SDL_GetScancodeFromKey(SDLK_KP_PLUS);
+		keymap[0x3b]		= SDL_GetScancodeFromKey(SDLK_CAPSLOCK);
+		keymap[0x3c]		= SDL_GetScancodeFromKey(SDLK_a);
+		keymap[0x3d]		= SDL_GetScancodeFromKey(SDLK_s);
+		keymap[0x3e]		= SDL_GetScancodeFromKey(SDLK_d);
+		keymap[0x3f]		= SDL_GetScancodeFromKey(SDLK_f);
+		keymap[0x40]		= SDL_GetScancodeFromKey(SDLK_g);
+		keymap[0x41]		= SDL_GetScancodeFromKey(SDLK_h);
+		keymap[0x42]		= SDL_GetScancodeFromKey(SDLK_j);
+		keymap[0x43]		= SDL_GetScancodeFromKey(SDLK_k);
+		keymap[0x44]		= SDL_GetScancodeFromKey(SDLK_l);
+		keymap[0x45]		= SDL_GetScancodeFromKey(SDLK_SEMICOLON);
+		keymap[0x46]		= SDL_GetScancodeFromKey(SDLK_QUOTE);
+		keymap[0x47]		= SDL_GetScancodeFromKey(SDLK_RETURN);
+		keymap[0x48]		= SDL_GetScancodeFromKey(SDLK_KP_4);
+		keymap[0x49]		= SDL_GetScancodeFromKey(SDLK_KP_5);
+		keymap[0x4a]		= SDL_GetScancodeFromKey(SDLK_KP_6);
+		keymap[0x4b]		= SDL_GetScancodeFromKey(SDLK_LSHIFT);
+		keymap[0x4c]		= SDL_GetScancodeFromKey(SDLK_z);
+		keymap[0x4d]		= SDL_GetScancodeFromKey(SDLK_x);
+		keymap[0x4e]		= SDL_GetScancodeFromKey(SDLK_c);
+		keymap[0x4f]		= SDL_GetScancodeFromKey(SDLK_v);
+		keymap[0x50]		= SDL_GetScancodeFromKey(SDLK_b);
+		keymap[0x51]		= SDL_GetScancodeFromKey(SDLK_n);
+		keymap[0x52]		= SDL_GetScancodeFromKey(SDLK_m);
+		keymap[0x53]		= SDL_GetScancodeFromKey(SDLK_COMMA);
+		keymap[0x54]		= SDL_GetScancodeFromKey(SDLK_PERIOD);
+		keymap[0x55]		= SDL_GetScancodeFromKey(SDLK_SLASH);
+		keymap[0x56]		= SDL_GetScancodeFromKey(SDLK_RSHIFT);
+		keymap[0x57]		= SDL_GetScancodeFromKey(SDLK_UP);
+		keymap[0x58]		= SDL_GetScancodeFromKey(SDLK_KP_1);
+		keymap[0x59]		= SDL_GetScancodeFromKey(SDLK_KP_2);
+		keymap[0x5a]		= SDL_GetScancodeFromKey(SDLK_KP_3);
+		keymap[0x5b]		= SDL_GetScancodeFromKey(SDLK_KP_ENTER);
+		keymap[0x5c]		= SDL_GetScancodeFromKey(SDLK_LCTRL);
+		keymap[0x5d]		= SDL_GetScancodeFromKey(SDLK_LALT);
+		keymap[0x5e]		= SDL_GetScancodeFromKey(SDLK_SPACE);
+		keymap[0x5f]		= SDL_GetScancodeFromKey(SDLK_RALT);
+		keymap[0x60]		= SDL_GetScancodeFromKey(SDLK_RCTRL);
+		keymap[0x61]		= SDL_GetScancodeFromKey(SDLK_LEFT);
+		keymap[0x62]		= SDL_GetScancodeFromKey(SDLK_DOWN);
+		keymap[0x63]		= SDL_GetScancodeFromKey(SDLK_RIGHT);
+		keymap[0x64]		= SDL_GetScancodeFromKey(SDLK_KP_0);
+		keymap[0x65]		= SDL_GetScancodeFromKey(SDLK_KP_PERIOD);
+		keymap[0x66]		= SDL_GetScancodeFromKey(SDLK_LGUI);
+		keymap[0x67]		= SDL_GetScancodeFromKey(SDLK_RGUI);
+		keymap[0x68]		= SDL_GetScancodeFromKey(SDLK_MENU);
+		keymap[0x69]		= SDL_GetScancodeFromKey(SDLK_2); /* SDLK_EURO */
+		keymap[0x6a]		= SDL_GetScancodeFromKey(SDLK_KP_EQUALS);
+		keymap[0x6b]		= SDL_GetScancodeFromKey(SDLK_POWER);
+}
+
+SDL_Scancode BE_GetScancodeFromBeKey(int32 bkey) {
+	if(bkey > 0 && bkey < (int32)SDL_TABLESIZE(keymap)) {
+		return keymap[bkey];
+	} else {
+		return SDL_SCANCODE_UNKNOWN;
+	}
+}
+
+int8 BE_GetKeyState(int32 bkey) {
+	if(bkey > 0 && bkey < KEYMAP_SIZE) {
+		return keystate[bkey];
+	} else {
+		return SDL_RELEASED;
+	}
+}
+
+void BE_SetKeyState(int32 bkey, int8 state) {
+	if(bkey > 0 && bkey < KEYMAP_SIZE) {
+		keystate[bkey] = state;
+	}
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_HAIKU */
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bkeyboard.h b/Source/3rd Party/sdl/src/video/haiku/SDL_bkeyboard.h
new file mode 100644
index 000000000..0acb42c94
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bkeyboard.h	
@@ -0,0 +1,42 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_BKEYBOARD_H
+#define SDL_BKEYBOARD_H
+
+#include <SupportDefs.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../../../include/SDL_keyboard.h"
+
+extern void BE_InitOSKeymap();
+extern SDL_Scancode BE_GetScancodeFromBeKey(int32 bkey);
+extern int8 BE_GetKeyState(int32 bkey);
+extern void BE_SetKeyState(int32 bkey, int8 state);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bmodes.cc b/Source/3rd Party/sdl/src/video/haiku/SDL_bmodes.cc
new file mode 100644
index 000000000..b56442b09
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bmodes.cc	
@@ -0,0 +1,331 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_HAIKU
+
+#include <AppKit.h>
+#include <InterfaceKit.h>
+#include "SDL_bmodes.h"
+#include "SDL_BWin.h"
+
+#if SDL_VIDEO_OPENGL
+#include "SDL_bopengl.h"
+#endif
+
+#include "../../main/haiku/SDL_BApp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define WRAP_BMODE 1 /* FIXME: Some debate as to whether this is necessary */
+
+#if WRAP_BMODE
+/* This wrapper is here so that the driverdata can be freed without freeing
+   the display_mode structure */
+typedef struct SDL_DisplayModeData {
+	display_mode *bmode;
+};
+#endif
+
+static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
+	return ((SDL_BWin*)(window->driverdata));
+}
+
+static SDL_INLINE SDL_BApp *_GetBeApp() {
+	return ((SDL_BApp*)be_app);
+}
+
+static SDL_INLINE display_mode * _ExtractBMode(SDL_DisplayMode *mode) {
+#if WRAP_BMODE
+	return ((SDL_DisplayModeData*)mode->driverdata)->bmode;
+#else
+	return (display_mode*)(mode->driverdata);
+#endif
+}
+
+/* Copied from haiku/trunk/src/preferences/screen/ScreenMode.cpp */
+static float get_refresh_rate(display_mode &mode) {
+	return float(mode.timing.pixel_clock * 1000)
+		/ float(mode.timing.h_total * mode.timing.v_total);
+}
+
+
+#if 0
+/* TODO:
+ * This is a useful debugging tool.  Uncomment and insert into code as needed.
+ */
+void _SpoutModeData(display_mode *bmode) {
+	printf("BMode:\n");
+	printf("\tw,h = (%i,%i)\n", bmode->virtual_width, bmode->virtual_height);
+	printf("\th,v = (%i,%i)\n", bmode->h_display_start, 
+			bmode->v_display_start);
+	if(bmode->flags) {
+		printf("\tFlags:\n");
+		if(bmode->flags & B_SCROLL) {
+			printf("\t\tB_SCROLL\n");
+		}
+		if(bmode->flags & B_8_BIT_DAC) {
+			printf("\t\tB_8_BIT_DAC\n");
+		}
+		if(bmode->flags & B_HARDWARE_CURSOR) {
+			printf("\t\tB_HARDWARE_CURSOR\n");
+		}
+		if(bmode->flags & B_PARALLEL_ACCESS) {
+			printf("\t\tB_PARALLEL_ACCESS\n");
+		}
+		if(bmode->flags & B_DPMS) {
+			printf("\t\tB_DPMS\n");
+		}
+		if(bmode->flags & B_IO_FB_NA) {
+			printf("\t\tB_IO_FB_NA\n");
+		}
+	}
+	printf("\tTiming:\n");
+	printf("\t\tpx clock: %i\n", bmode->timing.pixel_clock);
+	printf("\t\th - display: %i sync start: %i sync end: %i total: %i\n",
+		bmode->timing.h_display, bmode->timing.h_sync_start,
+		bmode->timing.h_sync_end, bmode->timing.h_total);
+	printf("\t\tv - display: %i sync start: %i sync end: %i total: %i\n",
+		bmode->timing.v_display, bmode->timing.v_sync_start,
+		bmode->timing.v_sync_end, bmode->timing.v_total);
+	if(bmode->timing.flags) {
+		printf("\t\tFlags:\n");
+		if(bmode->timing.flags & B_BLANK_PEDESTAL) {
+			printf("\t\t\tB_BLANK_PEDESTAL\n");
+		}
+		if(bmode->timing.flags & B_TIMING_INTERLACED) {
+			printf("\t\t\tB_TIMING_INTERLACED\n");
+		}
+		if(bmode->timing.flags & B_POSITIVE_HSYNC) {
+			printf("\t\t\tB_POSITIVE_HSYNC\n");
+		}
+		if(bmode->timing.flags & B_POSITIVE_VSYNC) {
+			printf("\t\t\tB_POSITIVE_VSYNC\n");
+		}
+		if(bmode->timing.flags & B_SYNC_ON_GREEN) {
+			printf("\t\t\tB_SYNC_ON_GREEN\n");
+		}
+	}
+}
+#endif
+
+
+
+int32 BE_ColorSpaceToBitsPerPixel(uint32 colorspace)
+{
+	int bitsperpixel;
+
+	bitsperpixel = 0;
+	switch (colorspace) {
+	    case B_CMAP8:
+		bitsperpixel = 8;
+		break;
+	    case B_RGB15:
+	    case B_RGBA15:
+	    case B_RGB15_BIG:
+	    case B_RGBA15_BIG:
+		bitsperpixel = 15;
+		break;
+	    case B_RGB16:
+	    case B_RGB16_BIG:
+		bitsperpixel = 16;
+		break;
+	    case B_RGB32:
+	    case B_RGBA32:
+	    case B_RGB32_BIG:
+	    case B_RGBA32_BIG:
+		bitsperpixel = 32;
+		break;
+	    default:
+		break;
+	}
+	return(bitsperpixel);
+}
+
+int32 BE_BPPToSDLPxFormat(int32 bpp) {
+	/* Translation taken from SDL_windowsmodes.c */
+	switch (bpp) {
+	case 32:
+		return SDL_PIXELFORMAT_RGB888;
+		break;
+	case 24:	/* May not be supported by Haiku */
+		return SDL_PIXELFORMAT_RGB24;
+		break;
+	case 16:
+		return SDL_PIXELFORMAT_RGB565;
+		break;
+	case 15:
+		return SDL_PIXELFORMAT_RGB555;
+		break;
+	case 8:
+		return SDL_PIXELFORMAT_INDEX8;
+		break;
+	case 4:		/* May not be supported by Haiku */
+		return SDL_PIXELFORMAT_INDEX4LSB;
+		break;
+	}
+
+	/* May never get here, but safer and needed to shut up compiler */
+	SDL_SetError("Invalid bpp value");
+	return 0;       
+}
+
+static void _BDisplayModeToSdlDisplayMode(display_mode *bmode,
+		SDL_DisplayMode *mode) {
+	mode->w = bmode->virtual_width;
+	mode->h = bmode->virtual_height;
+	mode->refresh_rate = (int)get_refresh_rate(*bmode);
+
+#if WRAP_BMODE
+	SDL_DisplayModeData *data = (SDL_DisplayModeData*)SDL_calloc(1,
+		sizeof(SDL_DisplayModeData));
+	data->bmode = bmode;
+	
+	mode->driverdata = data;
+
+#else
+
+	mode->driverdata = bmode;
+#endif
+
+	/* Set the format */
+	int32 bpp = BE_ColorSpaceToBitsPerPixel(bmode->space);
+	mode->format = BE_BPPToSDLPxFormat(bpp);
+}
+
+/* Later, there may be more than one monitor available */
+static void _AddDisplay(BScreen *screen) {
+	SDL_VideoDisplay display;
+	SDL_DisplayMode *mode = (SDL_DisplayMode*)SDL_calloc(1,
+		sizeof(SDL_DisplayMode));
+	display_mode *bmode = (display_mode*)SDL_calloc(1, sizeof(display_mode));
+	screen->GetMode(bmode);
+
+	_BDisplayModeToSdlDisplayMode(bmode, mode);
+	
+	SDL_zero(display);
+	display.desktop_mode = *mode;
+	display.current_mode = *mode;
+	
+	SDL_AddVideoDisplay(&display);
+}
+
+/*
+ * Functions called by SDL
+ */
+
+int BE_InitModes(_THIS) {
+	BScreen screen;
+
+	/* TODO: When Haiku supports multiple display screens, call
+	   _AddDisplayScreen() for each of them. */
+	_AddDisplay(&screen);
+	return 0;
+}
+
+int BE_QuitModes(_THIS) {
+	/* FIXME: Nothing really needs to be done here at the moment? */
+	return 0;
+}
+
+
+int BE_GetDisplayBounds(_THIS, SDL_VideoDisplay *display, SDL_Rect *rect) {
+	BScreen bscreen;
+	BRect rc = bscreen.Frame();
+	rect->x = (int)rc.left;
+	rect->y = (int)rc.top;
+	rect->w = (int)rc.Width() + 1;
+	rect->h = (int)rc.Height() + 1;
+	return 0;
+}
+
+void BE_GetDisplayModes(_THIS, SDL_VideoDisplay *display) {
+	/* Get the current screen */
+	BScreen bscreen;
+
+	/* Iterate through all of the modes */
+	SDL_DisplayMode mode;
+	display_mode this_bmode;
+	display_mode *bmodes;
+	uint32 count, i;
+	
+	/* Get graphics-hardware supported modes */
+	bscreen.GetModeList(&bmodes, &count);
+	bscreen.GetMode(&this_bmode);
+	
+	for(i = 0; i < count; ++i) {
+		// FIXME: Apparently there are errors with colorspace changes
+		if (bmodes[i].space == this_bmode.space) {
+			_BDisplayModeToSdlDisplayMode(&bmodes[i], &mode);
+			SDL_AddDisplayMode(display, &mode);
+		}
+	}
+	free(bmodes);
+}
+
+
+int BE_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode){
+	/* Get the current screen */
+	BScreen bscreen;
+	if(!bscreen.IsValid()) {
+		printf(__FILE__": %d - ERROR: BAD SCREEN\n", __LINE__);
+	}
+
+	/* Set the mode using the driver data */
+	display_mode *bmode = _ExtractBMode(mode);
+
+
+	/* FIXME: Is the first option always going to be the right one? */
+	uint32 c = 0, i;
+	display_mode *bmode_list;
+	bscreen.GetModeList(&bmode_list, &c);
+	for(i = 0; i < c; ++i) {
+		if(	bmode_list[i].space == bmode->space &&
+			bmode_list[i].virtual_width == bmode->virtual_width &&
+			bmode_list[i].virtual_height == bmode->virtual_height ) {
+				bmode = &bmode_list[i];
+				break;
+		}
+	}
+
+	if(bscreen.SetMode(bmode) != B_OK) {
+		return SDL_SetError("Bad video mode\n");
+	}
+	
+	free(bmode_list);
+	
+#if SDL_VIDEO_OPENGL
+	/* FIXME: Is there some way to reboot the OpenGL context?  This doesn't
+	   help */
+//	BE_GL_RebootContexts(_this);
+#endif
+
+	return 0;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_HAIKU */
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bmodes.h b/Source/3rd Party/sdl/src/video/haiku/SDL_bmodes.h
new file mode 100644
index 000000000..3df862d30
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bmodes.h	
@@ -0,0 +1,46 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_BMODES_H
+#define SDL_BMODES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../SDL_sysvideo.h"
+
+extern int32 BE_ColorSpaceToBitsPerPixel(uint32 colorspace);
+extern int32 BE_BPPToSDLPxFormat(int32 bpp);
+
+extern int BE_InitModes(_THIS);
+extern int BE_QuitModes(_THIS);
+extern int BE_GetDisplayBounds(_THIS, SDL_VideoDisplay *display,
+    SDL_Rect *rect);
+extern void BE_GetDisplayModes(_THIS, SDL_VideoDisplay *display);
+extern int BE_SetDisplayMode(_THIS, SDL_VideoDisplay *display,
+    SDL_DisplayMode *mode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bopengl.cc b/Source/3rd Party/sdl/src/video/haiku/SDL_bopengl.cc
new file mode 100644
index 000000000..245cec12e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bopengl.cc	
@@ -0,0 +1,219 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_HAIKU
+
+#include "SDL_bopengl.h"
+
+#include <unistd.h>
+#include <KernelKit.h>
+#include <OpenGLKit.h>
+#include "SDL_BWin.h"
+#include "../../main/haiku/SDL_BApp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define BGL_FLAGS BGL_RGB | BGL_DOUBLE
+
+static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
+	return ((SDL_BWin*)(window->driverdata));
+}
+
+static SDL_INLINE SDL_BApp *_GetBeApp() {
+	return ((SDL_BApp*)be_app);
+}
+
+/* Passing a NULL path means load pointers from the application */
+int BE_GL_LoadLibrary(_THIS, const char *path)
+{
+/* FIXME: Is this working correctly? */
+	image_info info;
+			int32 cookie = 0;
+	while (get_next_image_info(0, &cookie, &info) == B_OK) {
+		void *location = NULL;
+		if( get_image_symbol(info.id, "glBegin", B_SYMBOL_TYPE_ANY,
+				&location) == B_OK) {
+
+			_this->gl_config.dll_handle = (void *) info.id;
+			_this->gl_config.driver_loaded = 1;
+			SDL_strlcpy(_this->gl_config.driver_path, "libGL.so",
+					SDL_arraysize(_this->gl_config.driver_path));
+		}
+	}
+	return 0;
+}
+
+void *BE_GL_GetProcAddress(_THIS, const char *proc)
+{
+	if (_this->gl_config.dll_handle != NULL) {
+		void *location = NULL;
+		status_t err;
+		if ((err =
+			get_image_symbol((image_id) _this->gl_config.dll_handle,
+                              proc, B_SYMBOL_TYPE_ANY,
+                              &location)) == B_OK) {
+            return location;
+        } else {
+                SDL_SetError("Couldn't find OpenGL symbol");
+                return NULL;
+        }
+	} else {
+		SDL_SetError("OpenGL library not loaded");
+		return NULL;
+	}
+}
+
+
+
+
+void BE_GL_SwapWindow(_THIS, SDL_Window * window) {
+    _ToBeWin(window)->SwapBuffers();
+}
+
+int BE_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) {
+	_GetBeApp()->SetCurrentContext(((SDL_BWin*)context)->GetGLView());
+	return 0;
+}
+
+
+SDL_GLContext BE_GL_CreateContext(_THIS, SDL_Window * window) {
+	/* FIXME: Not sure what flags should be included here; may want to have
+	   most of them */
+	SDL_BWin *bwin = _ToBeWin(window);
+	bwin->CreateGLView(BGL_FLAGS);
+	return (SDL_GLContext)(bwin);
+}
+
+void BE_GL_DeleteContext(_THIS, SDL_GLContext context) {
+	/* Currently, automatically unlocks the view */
+	((SDL_BWin*)context)->RemoveGLView();
+}
+
+
+int BE_GL_SetSwapInterval(_THIS, int interval) {
+	/* TODO: Implement this, if necessary? */
+	return 0;
+}
+
+int BE_GL_GetSwapInterval(_THIS) {
+	/* TODO: Implement this, if necessary? */
+	return 0;
+}
+
+
+void BE_GL_UnloadLibrary(_THIS) {
+	/* TODO: Implement this, if necessary? */
+}
+
+
+/* FIXME: This function is meant to clear the OpenGL context when the video
+   mode changes (see SDL_bmodes.cc), but it doesn't seem to help, and is not
+   currently in use. */
+void BE_GL_RebootContexts(_THIS) {
+	SDL_Window *window = _this->windows;
+	while(window) {
+		SDL_BWin *bwin = _ToBeWin(window);
+		if(bwin->GetGLView()) {
+			bwin->LockLooper();
+			bwin->RemoveGLView();
+			bwin->CreateGLView(BGL_FLAGS);
+			bwin->UnlockLooper();
+		}
+		window = window->next;
+	}
+}
+
+
+#if 0 /* Functions from 1.2 that do not appear to be used in 1.3 */
+
+    int BE_GL_GetAttribute(_THIS, SDL_GLattr attrib, int *value)
+    {
+        /*
+           FIXME? Right now BE_GL_GetAttribute shouldn't be called between glBegin() and glEnd() - it doesn't use "cached" values
+         */
+        switch (attrib) {
+        case SDL_GL_RED_SIZE:
+            glGetIntegerv(GL_RED_BITS, (GLint *) value);
+            break;
+        case SDL_GL_GREEN_SIZE:
+            glGetIntegerv(GL_GREEN_BITS, (GLint *) value);
+            break;
+        case SDL_GL_BLUE_SIZE:
+            glGetIntegerv(GL_BLUE_BITS, (GLint *) value);
+            break;
+        case SDL_GL_ALPHA_SIZE:
+            glGetIntegerv(GL_ALPHA_BITS, (GLint *) value);
+            break;
+        case SDL_GL_DOUBLEBUFFER:
+            glGetBooleanv(GL_DOUBLEBUFFER, (GLboolean *) value);
+            break;
+        case SDL_GL_BUFFER_SIZE:
+            int v;
+            glGetIntegerv(GL_RED_BITS, (GLint *) & v);
+            *value = v;
+            glGetIntegerv(GL_GREEN_BITS, (GLint *) & v);
+            *value += v;
+            glGetIntegerv(GL_BLUE_BITS, (GLint *) & v);
+            *value += v;
+            glGetIntegerv(GL_ALPHA_BITS, (GLint *) & v);
+            *value += v;
+            break;
+        case SDL_GL_DEPTH_SIZE:
+            glGetIntegerv(GL_DEPTH_BITS, (GLint *) value);      /* Mesa creates 16 only? r5 always 32 */
+            break;
+        case SDL_GL_STENCIL_SIZE:
+            glGetIntegerv(GL_STENCIL_BITS, (GLint *) value);
+            break;
+        case SDL_GL_ACCUM_RED_SIZE:
+            glGetIntegerv(GL_ACCUM_RED_BITS, (GLint *) value);
+            break;
+        case SDL_GL_ACCUM_GREEN_SIZE:
+            glGetIntegerv(GL_ACCUM_GREEN_BITS, (GLint *) value);
+            break;
+        case SDL_GL_ACCUM_BLUE_SIZE:
+            glGetIntegerv(GL_ACCUM_BLUE_BITS, (GLint *) value);
+            break;
+        case SDL_GL_ACCUM_ALPHA_SIZE:
+            glGetIntegerv(GL_ACCUM_ALPHA_BITS, (GLint *) value);
+            break;
+        case SDL_GL_STEREO:
+        case SDL_GL_MULTISAMPLEBUFFERS:
+        case SDL_GL_MULTISAMPLESAMPLES:
+        default:
+            *value = 0;
+            return (-1);
+        }
+        return 0;
+    }
+
+#endif
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_HAIKU */
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bopengl.h b/Source/3rd Party/sdl/src/video/haiku/SDL_bopengl.h
new file mode 100644
index 000000000..b046de4e4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bopengl.h	
@@ -0,0 +1,49 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_BOPENGL_H
+#define SDL_BOPENGL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../SDL_sysvideo.h"
+
+
+extern int BE_GL_LoadLibrary(_THIS, const char *path);                  /* FIXME */
+extern void *BE_GL_GetProcAddress(_THIS, const char *proc);             /* FIXME */
+extern void BE_GL_UnloadLibrary(_THIS);                                 /* TODO */
+extern int BE_GL_MakeCurrent(_THIS, SDL_Window * window,
+                              SDL_GLContext context);
+extern int BE_GL_SetSwapInterval(_THIS, int interval);                  /* TODO */
+extern int BE_GL_GetSwapInterval(_THIS);                                /* TODO */
+extern void BE_GL_SwapWindow(_THIS, SDL_Window * window);
+extern SDL_GLContext BE_GL_CreateContext(_THIS, SDL_Window * window);
+extern void BE_GL_DeleteContext(_THIS, SDL_GLContext context);
+
+extern void BE_GL_RebootContexts(_THIS);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bvideo.cc b/Source/3rd Party/sdl/src/video/haiku/SDL_bvideo.cc
new file mode 100644
index 000000000..a526893f8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bvideo.cc	
@@ -0,0 +1,174 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_HAIKU
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "SDL_bkeyboard.h"
+#include "SDL_bwindow.h"
+#include "SDL_bclipboard.h"
+#include "SDL_bvideo.h"
+#include "SDL_bopengl.h"
+#include "SDL_bmodes.h"
+#include "SDL_bframebuffer.h"
+#include "SDL_bevents.h"
+
+/* FIXME: Undefined functions */
+//    #define BE_PumpEvents NULL
+    #define BE_StartTextInput NULL
+    #define BE_StopTextInput NULL
+    #define BE_SetTextInputRect NULL
+
+//    #define BE_DeleteDevice NULL
+
+/* End undefined functions */
+
+static SDL_VideoDevice *
+BE_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+    /*SDL_VideoData *data;*/
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+
+    device->driverdata = NULL; /* FIXME: Is this the cause of some of the
+    							  SDL_Quit() errors? */
+
+/* TODO: Figure out if any initialization needs to go here */
+
+    /* Set the function pointers */
+    device->VideoInit = BE_VideoInit;
+    device->VideoQuit = BE_VideoQuit;
+    device->GetDisplayBounds = BE_GetDisplayBounds;
+    device->GetDisplayModes = BE_GetDisplayModes;
+    device->SetDisplayMode = BE_SetDisplayMode;
+    device->PumpEvents = BE_PumpEvents;
+
+    device->CreateWindow = BE_CreateWindow;
+    device->CreateWindowFrom = BE_CreateWindowFrom;
+    device->SetWindowTitle = BE_SetWindowTitle;
+    device->SetWindowIcon = BE_SetWindowIcon;
+    device->SetWindowPosition = BE_SetWindowPosition;
+    device->SetWindowSize = BE_SetWindowSize;
+    device->ShowWindow = BE_ShowWindow;
+    device->HideWindow = BE_HideWindow;
+    device->RaiseWindow = BE_RaiseWindow;
+    device->MaximizeWindow = BE_MaximizeWindow;
+    device->MinimizeWindow = BE_MinimizeWindow;
+    device->RestoreWindow = BE_RestoreWindow;
+    device->SetWindowBordered = BE_SetWindowBordered;
+    device->SetWindowFullscreen = BE_SetWindowFullscreen;
+    device->SetWindowGammaRamp = BE_SetWindowGammaRamp;
+    device->GetWindowGammaRamp = BE_GetWindowGammaRamp;
+    device->SetWindowGrab = BE_SetWindowGrab;
+    device->DestroyWindow = BE_DestroyWindow;
+    device->GetWindowWMInfo = BE_GetWindowWMInfo;
+    device->CreateWindowFramebuffer = BE_CreateWindowFramebuffer;
+    device->UpdateWindowFramebuffer = BE_UpdateWindowFramebuffer;
+    device->DestroyWindowFramebuffer = BE_DestroyWindowFramebuffer;
+    
+    device->shape_driver.CreateShaper = NULL;
+    device->shape_driver.SetWindowShape = NULL;
+    device->shape_driver.ResizeWindowShape = NULL;
+
+
+    device->GL_LoadLibrary = BE_GL_LoadLibrary;
+    device->GL_GetProcAddress = BE_GL_GetProcAddress;
+    device->GL_UnloadLibrary = BE_GL_UnloadLibrary;
+    device->GL_CreateContext = BE_GL_CreateContext;
+    device->GL_MakeCurrent = BE_GL_MakeCurrent;
+    device->GL_SetSwapInterval = BE_GL_SetSwapInterval;
+    device->GL_GetSwapInterval = BE_GL_GetSwapInterval;
+    device->GL_SwapWindow = BE_GL_SwapWindow;
+    device->GL_DeleteContext = BE_GL_DeleteContext;
+
+    device->StartTextInput = BE_StartTextInput;
+    device->StopTextInput = BE_StopTextInput;
+    device->SetTextInputRect = BE_SetTextInputRect;
+
+    device->SetClipboardText = BE_SetClipboardText;
+    device->GetClipboardText = BE_GetClipboardText;
+    device->HasClipboardText = BE_HasClipboardText;
+
+    device->free = BE_DeleteDevice;
+
+    return device;
+}
+
+VideoBootStrap HAIKU_bootstrap = {
+	"haiku", "Haiku graphics",
+	BE_Available, BE_CreateDevice
+};
+
+void BE_DeleteDevice(SDL_VideoDevice * device)
+{
+	SDL_free(device->driverdata);
+	SDL_free(device);
+}
+
+int BE_VideoInit(_THIS)
+{
+	/* Initialize the Be Application for appserver interaction */
+	if (SDL_InitBeApp() < 0) {
+		return -1;
+	}
+	
+	/* Initialize video modes */
+	BE_InitModes(_this);
+
+	/* Init the keymap */
+	BE_InitOSKeymap();
+	
+	
+#if SDL_VIDEO_OPENGL
+        /* testgl application doesn't load library, just tries to load symbols */
+        /* is it correct? if so we have to load library here */
+    BE_GL_LoadLibrary(_this, NULL);
+#endif
+
+        /* We're done! */
+    return (0);
+}
+
+int BE_Available(void)
+{
+    return (1);
+}
+
+void BE_VideoQuit(_THIS)
+{
+
+    BE_QuitModes(_this);
+
+    SDL_QuitBeApp();
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_HAIKU */
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bvideo.h b/Source/3rd Party/sdl/src/video/haiku/SDL_bvideo.h
new file mode 100644
index 000000000..925c8b5b2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bvideo.h	
@@ -0,0 +1,42 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BVIDEO_H
+#define BVIDEO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../../main/haiku/SDL_BeApp.h"
+#include "../SDL_sysvideo.h"
+
+
+extern void BE_VideoQuit(_THIS);
+extern int BE_VideoInit(_THIS);
+extern void BE_DeleteDevice(_THIS);
+extern int BE_Available(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bwindow.cc b/Source/3rd Party/sdl/src/video/haiku/SDL_bwindow.cc
new file mode 100644
index 000000000..c0a3cee01
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bwindow.cc	
@@ -0,0 +1,223 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_HAIKU
+#include "../SDL_sysvideo.h"
+
+#include "SDL_BWin.h"
+#include <new>
+
+/* Define a path to window's BWIN data */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static SDL_INLINE SDL_BWin *_ToBeWin(SDL_Window *window) {
+	return ((SDL_BWin*)(window->driverdata));
+}
+
+static SDL_INLINE SDL_BApp *_GetBeApp() {
+	return ((SDL_BApp*)be_app);
+}
+
+static int _InitWindow(_THIS, SDL_Window *window) {
+	uint32 flags = 0;
+	window_look look = B_BORDERED_WINDOW_LOOK;
+
+	BRect bounds(
+        window->x,
+        window->y,
+        window->x + window->w - 1,	//BeWindows have an off-by-one px w/h thing
+        window->y + window->h - 1
+    );
+    
+    if(window->flags & SDL_WINDOW_FULLSCREEN) {
+    	/* TODO: Add support for this flag */
+    	printf(__FILE__": %d!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n",__LINE__);
+    }
+    if(window->flags & SDL_WINDOW_OPENGL) {
+    	/* TODO: Add support for this flag */
+    }
+    if(!(window->flags & SDL_WINDOW_RESIZABLE)) {
+    	flags |= B_NOT_RESIZABLE | B_NOT_ZOOMABLE;
+    }
+    if(window->flags & SDL_WINDOW_BORDERLESS) {
+    	look = B_NO_BORDER_WINDOW_LOOK;
+    }
+
+    SDL_BWin *bwin = new(std::nothrow) SDL_BWin(bounds, look, flags);
+    if(bwin == NULL)
+    	return ENOMEM;
+
+    window->driverdata = bwin;
+    int32 winID = _GetBeApp()->GetID(window);
+    bwin->SetID(winID);
+
+    return 0;
+}
+
+int BE_CreateWindow(_THIS, SDL_Window *window) {
+	if(_InitWindow(_this, window) == ENOMEM)
+		return ENOMEM;
+	
+	/* Start window loop */
+    _ToBeWin(window)->Show();
+    return 0;
+}
+
+int BE_CreateWindowFrom(_THIS, SDL_Window * window, const void *data) {
+
+	SDL_BWin *otherBWin = (SDL_BWin*)data;
+	if(!otherBWin->LockLooper())
+		return -1;
+	
+	/* Create the new window and initialize its members */
+	window->x = (int)otherBWin->Frame().left;
+	window->y = (int)otherBWin->Frame().top;
+	window->w = (int)otherBWin->Frame().Width();
+	window->h = (int)otherBWin->Frame().Height();
+	
+	/* Set SDL flags */
+	if(!(otherBWin->Flags() & B_NOT_RESIZABLE)) {
+		window->flags |= SDL_WINDOW_RESIZABLE;
+	}
+	
+	/* If we are out of memory, return the error code */
+	if(_InitWindow(_this, window) == ENOMEM)
+		return ENOMEM;
+	
+	/* TODO: Add any other SDL-supported window attributes here */
+    _ToBeWin(window)->SetTitle(otherBWin->Title());
+    
+    /* Start window loop and unlock the other window */
+    _ToBeWin(window)->Show();
+    
+    otherBWin->UnlockLooper();
+    return 0;
+}
+
+void BE_SetWindowTitle(_THIS, SDL_Window * window) {
+	BMessage msg(BWIN_SET_TITLE);
+	msg.AddString("window-title", window->title);
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon) {
+	/* FIXME: Icons not supported by Haiku */
+}
+
+void BE_SetWindowPosition(_THIS, SDL_Window * window) {
+	BMessage msg(BWIN_MOVE_WINDOW);
+	msg.AddInt32("window-x", window->x);
+	msg.AddInt32("window-y", window->y);
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_SetWindowSize(_THIS, SDL_Window * window) {
+	BMessage msg(BWIN_RESIZE_WINDOW);
+	msg.AddInt32("window-w", window->w - 1);
+	msg.AddInt32("window-h", window->h - 1);
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered) {
+	BMessage msg(BWIN_SET_BORDERED);
+	msg.AddBool("window-border", bordered != SDL_FALSE);
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_ShowWindow(_THIS, SDL_Window * window) {
+	BMessage msg(BWIN_SHOW_WINDOW);
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_HideWindow(_THIS, SDL_Window * window) {
+	BMessage msg(BWIN_HIDE_WINDOW);
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_RaiseWindow(_THIS, SDL_Window * window) {
+	BMessage msg(BWIN_SHOW_WINDOW);	/* Activate this window and move to front */
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_MaximizeWindow(_THIS, SDL_Window * window) {
+	BMessage msg(BWIN_MAXIMIZE_WINDOW);
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_MinimizeWindow(_THIS, SDL_Window * window) {
+	BMessage msg(BWIN_MINIMIZE_WINDOW);
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_RestoreWindow(_THIS, SDL_Window * window) {
+	BMessage msg(BWIN_RESTORE_WINDOW);
+	_ToBeWin(window)->PostMessage(&msg);
+}
+
+void BE_SetWindowFullscreen(_THIS, SDL_Window * window,
+		SDL_VideoDisplay * display, SDL_bool fullscreen) {
+	/* Haiku tracks all video display information */
+	BMessage msg(BWIN_FULLSCREEN);
+	msg.AddBool("fullscreen", fullscreen);
+	_ToBeWin(window)->PostMessage(&msg);
+	
+}
+
+int BE_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp) {
+	/* FIXME: Not Haiku supported */
+	return -1;
+}
+
+int BE_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp) {
+	/* FIXME: Not Haiku supported */
+	return -1;
+}
+
+
+void BE_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed) {
+	/* TODO: Implement this! */
+}
+
+void BE_DestroyWindow(_THIS, SDL_Window * window) {
+	_ToBeWin(window)->LockLooper();	/* This MUST be locked */
+	_GetBeApp()->ClearID(_ToBeWin(window));
+	_ToBeWin(window)->Quit();
+	window->driverdata = NULL;
+}
+
+SDL_bool BE_GetWindowWMInfo(_THIS, SDL_Window * window,
+                                    struct SDL_SysWMinfo *info) {
+	/* FIXME: What is the point of this? What information should be included? */
+	return SDL_FALSE;
+}
+
+
+
+
+ 
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SDL_VIDEO_DRIVER_HAIKU */
diff --git a/Source/3rd Party/sdl/src/video/haiku/SDL_bwindow.h b/Source/3rd Party/sdl/src/video/haiku/SDL_bwindow.h
new file mode 100644
index 000000000..5a3934978
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/haiku/SDL_bwindow.h	
@@ -0,0 +1,53 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_BWINDOW_H
+#define SDL_BWINDOW_H
+
+
+#include "../SDL_sysvideo.h"
+
+
+extern int BE_CreateWindow(_THIS, SDL_Window *window);
+extern int BE_CreateWindowFrom(_THIS, SDL_Window * window, const void *data);
+extern void BE_SetWindowTitle(_THIS, SDL_Window * window);
+extern void BE_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
+extern void BE_SetWindowPosition(_THIS, SDL_Window * window);
+extern void BE_SetWindowSize(_THIS, SDL_Window * window);
+extern void BE_ShowWindow(_THIS, SDL_Window * window);
+extern void BE_HideWindow(_THIS, SDL_Window * window);
+extern void BE_RaiseWindow(_THIS, SDL_Window * window);
+extern void BE_MaximizeWindow(_THIS, SDL_Window * window);
+extern void BE_MinimizeWindow(_THIS, SDL_Window * window);
+extern void BE_RestoreWindow(_THIS, SDL_Window * window);
+extern void BE_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered);
+extern void BE_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen);
+extern int BE_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp);
+extern int BE_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp);
+extern void BE_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
+extern void BE_DestroyWindow(_THIS, SDL_Window * window);
+extern SDL_bool BE_GetWindowWMInfo(_THIS, SDL_Window * window,
+                                    struct SDL_SysWMinfo *info);
+
+
+
+#endif
+
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirdyn.c b/Source/3rd Party/sdl/src/video/mir/SDL_mirdyn.c
new file mode 100644
index 000000000..f544d06ec
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirdyn.c	
@@ -0,0 +1,177 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
+#define DEBUG_DYNAMIC_MIR 0
+
+#include "SDL_mirdyn.h"
+
+#if DEBUG_DYNAMIC_MIR
+#include "SDL_log.h"
+#endif
+
+#ifdef SDL_VIDEO_DRIVER_MIR_DYNAMIC
+
+#include "SDL_name.h"
+#include "SDL_loadso.h"
+
+typedef struct
+{
+    void *lib;
+    const char *libname;
+} mirdynlib;
+
+#ifndef SDL_VIDEO_DRIVER_MIR_DYNAMIC
+#define SDL_VIDEO_DRIVER_MIR_DYNAMIC NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON
+#define SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON NULL
+#endif
+
+static mirdynlib mirlibs[] = {
+    {NULL, SDL_VIDEO_DRIVER_MIR_DYNAMIC},
+    {NULL, SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON}
+};
+
+static void *
+MIR_GetSym(const char *fnname, int *pHasModule)
+{
+    int i;
+    void *fn = NULL;
+    for (i = 0; i < SDL_TABLESIZE(mirlibs); i++) {
+        if (mirlibs[i].lib != NULL) {
+            fn = SDL_LoadFunction(mirlibs[i].lib, fnname);
+            if (fn != NULL)
+                break;
+        }
+    }
+
+#if DEBUG_DYNAMIC_MIR
+    if (fn != NULL)
+        SDL_Log("MIR: Found '%s' in %s (%p)\n", fnname, mirlibs[i].libname, fn);
+    else
+        SDL_Log("MIR: Symbol '%s' NOT FOUND!\n", fnname);
+#endif
+
+    if (fn == NULL)
+        *pHasModule = 0;  /* kill this module. */
+
+    return fn;
+}
+
+#endif /* SDL_VIDEO_DRIVER_MIR_DYNAMIC */
+
+/* Define all the function pointers and wrappers... */
+#define SDL_MIR_MODULE(modname) int SDL_MIR_HAVE_##modname = 0;
+#define SDL_MIR_SYM(rc,fn,params) SDL_DYNMIRFN_##fn MIR_##fn = NULL;
+#include "SDL_mirsym.h"
+#undef SDL_MIR_MODULE
+#undef SDL_MIR_SYM
+
+static int mir_load_refcount = 0;
+
+void
+SDL_MIR_UnloadSymbols(void)
+{
+    /* Don't actually unload if more than one module is using the libs... */
+    if (mir_load_refcount > 0) {
+        if (--mir_load_refcount == 0) {
+#ifdef SDL_VIDEO_DRIVER_MIR_DYNAMIC            
+            int i;
+#endif
+            
+            /* set all the function pointers to NULL. */
+#define SDL_MIR_MODULE(modname) SDL_MIR_HAVE_##modname = 0;
+#define SDL_MIR_SYM(rc,fn,params) MIR_##fn = NULL;
+#include "SDL_mirsym.h"
+#undef SDL_MIR_MODULE
+#undef SDL_MIR_SYM
+
+
+#ifdef SDL_VIDEO_DRIVER_MIR_DYNAMIC
+            for (i = 0; i < SDL_TABLESIZE(mirlibs); i++) {
+                if (mirlibs[i].lib != NULL) {
+                    SDL_UnloadObject(mirlibs[i].lib);
+                    mirlibs[i].lib = NULL;
+                }
+            }
+#endif
+        }
+    }
+}
+
+/* returns non-zero if all needed symbols were loaded. */
+int
+SDL_MIR_LoadSymbols(void)
+{
+    int rc = 1;                 /* always succeed if not using Dynamic MIR stuff. */
+
+    /* deal with multiple modules (dga, wayland, mir, etc) needing these symbols... */
+    if (mir_load_refcount++ == 0) {
+#ifdef SDL_VIDEO_DRIVER_MIR_DYNAMIC
+        int i;
+        int *thismod = NULL;
+        for (i = 0; i < SDL_TABLESIZE(mirlibs); i++) {
+            if (mirlibs[i].libname != NULL) {
+                mirlibs[i].lib = SDL_LoadObject(mirlibs[i].libname);
+            }
+        }
+
+#define SDL_MIR_MODULE(modname) SDL_MIR_HAVE_##modname = 1; /* default yes */
+#define SDL_MIR_SYM(rc,fn,params)
+#include "SDL_mirsym.h"
+#undef SDL_MIR_MODULE
+#undef SDL_MIR_SYM
+
+#define SDL_MIR_MODULE(modname) thismod = &SDL_MIR_HAVE_##modname;
+#define SDL_MIR_SYM(rc,fn,params) MIR_##fn = (SDL_DYNMIRFN_##fn) MIR_GetSym(#fn,thismod);
+#include "SDL_mirsym.h"
+#undef SDL_MIR_MODULE
+#undef SDL_MIR_SYM
+
+        if ((SDL_MIR_HAVE_MIR_CLIENT) && (SDL_MIR_HAVE_XKBCOMMON)) {
+            /* all required symbols loaded. */
+            SDL_ClearError();
+        } else {
+            /* in case something got loaded... */
+            SDL_MIR_UnloadSymbols();
+            rc = 0;
+        }
+
+#else  /* no dynamic MIR */
+
+#define SDL_MIR_MODULE(modname) SDL_MIR_HAVE_##modname = 1; /* default yes */
+#define SDL_MIR_SYM(rc,fn,params) MIR_##fn = fn;
+#include "SDL_mirsym.h"
+#undef SDL_MIR_MODULE
+#undef SDL_MIR_SYM
+
+#endif
+    }
+
+    return rc;
+}
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirdyn.h b/Source/3rd Party/sdl/src/video/mir/SDL_mirdyn.h
new file mode 100644
index 000000000..3bd62e14e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirdyn.h	
@@ -0,0 +1,53 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_mirdyn_h
+#define _SDL_mirdyn_h
+
+#include "../../SDL_internal.h"
+
+#include <EGL/egl.h>
+#include <mir_toolkit/mir_client_library.h>
+#include <xkbcommon/xkbcommon.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int SDL_MIR_LoadSymbols(void);
+void SDL_MIR_UnloadSymbols(void);
+
+/* Declare all the function pointers and wrappers... */
+#define SDL_MIR_MODULE(modname)
+#define SDL_MIR_SYM(rc,fn,params) \
+    typedef rc (*SDL_DYNMIRFN_##fn) params; \
+    extern SDL_DYNMIRFN_##fn MIR_##fn;
+#include "SDL_mirsym.h"
+#undef SDL_MIR_MODULE
+#undef SDL_MIR_SYM
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !defined _SDL_mirdyn_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirevents.c b/Source/3rd Party/sdl/src/video/mir/SDL_mirevents.c
new file mode 100644
index 000000000..f2d3ef382
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirevents.c	
@@ -0,0 +1,260 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_touch_c.h"
+#include "../../events/scancodes_xfree86.h"
+
+#include "SDL_mirevents.h"
+#include "SDL_mirwindow.h"
+
+#include <xkbcommon/xkbcommon.h>
+
+#include "SDL_mirdyn.h"
+
+static void
+HandleKeyText(int32_t key_code)
+{
+    char text[8];
+    int size = 0;
+
+    size = MIR_xkb_keysym_to_utf8(key_code, text, sizeof text);
+
+    if (size > 0) {
+        text[size] = '\0';
+        SDL_SendKeyboardText(text);
+    }
+}
+
+static void
+CheckKeyboardFocus(SDL_Window* sdl_window)
+{
+    SDL_Window* keyboard_window = SDL_GetKeyboardFocus();
+
+    if (keyboard_window != sdl_window)
+        SDL_SetKeyboardFocus(sdl_window);
+}
+
+
+/* FIXME
+   Mir still needs to implement its IM API, for now we assume
+   a single key press produces a character.
+*/
+static void
+HandleKeyEvent(MirKeyEvent const ev, SDL_Window* window)
+{
+    uint32_t scancode = SDL_SCANCODE_UNKNOWN;
+    Uint8 key_state = ev.action == mir_key_action_up ? SDL_RELEASED : SDL_PRESSED;
+
+    CheckKeyboardFocus(window);
+
+    if (ev.scan_code < SDL_arraysize(xfree86_scancode_table2))
+        scancode = xfree86_scancode_table2[ev.scan_code];
+
+    if (scancode != SDL_SCANCODE_UNKNOWN)
+        SDL_SendKeyboardKey(key_state, scancode);
+
+    if (key_state == SDL_PRESSED)
+        HandleKeyText(ev.key_code);
+}
+
+static void
+HandleMouseButton(SDL_Window* sdl_window, Uint8 state, MirMotionButton button_state)
+{
+    static uint32_t last_sdl_button;
+    uint32_t sdl_button;
+
+    switch (button_state) {
+        case mir_motion_button_primary:
+            sdl_button = SDL_BUTTON_LEFT;
+            break;
+        case mir_motion_button_secondary:
+            sdl_button = SDL_BUTTON_RIGHT;
+            break;
+        case mir_motion_button_tertiary:
+            sdl_button = SDL_BUTTON_MIDDLE;
+            break;
+        case mir_motion_button_forward:
+            sdl_button = SDL_BUTTON_X1;
+            break;
+        case mir_motion_button_back:
+            sdl_button = SDL_BUTTON_X2;
+            break;
+        default:
+            sdl_button = last_sdl_button;
+            break;
+    }
+
+    last_sdl_button = sdl_button;
+    SDL_SendMouseButton(sdl_window, 0, state, sdl_button);
+}
+
+static void
+HandleTouchPress(int device_id, int source_id, SDL_bool down, float x, float y, float pressure)
+{
+    SDL_SendTouch(device_id, source_id, down, x, y, pressure);
+}
+
+static void
+HandleTouchMotion(int device_id, int source_id, float x, float y, float pressure)
+{
+    SDL_SendTouchMotion(device_id, source_id, x, y, pressure);
+}
+
+static void
+HandleMouseMotion(SDL_Window* sdl_window, int x, int y)
+{
+    SDL_SendMouseMotion(sdl_window, 0, 0, x, y);
+}
+
+static void
+HandleMouseScroll(SDL_Window* sdl_window, int hscroll, int vscroll)
+{
+    SDL_SendMouseWheel(sdl_window, 0, hscroll, vscroll);
+}
+
+static void
+AddTouchDevice(int device_id)
+{
+    if (SDL_AddTouch(device_id, "") < 0)
+        SDL_SetError("Error: can't add touch %s, %d", __FILE__, __LINE__);
+}
+
+static void
+HandleTouchEvent(MirMotionEvent const motion, int cord_index, SDL_Window* sdl_window)
+{
+    int device_id = motion.device_id;
+    int id = motion.pointer_coordinates[cord_index].id;
+
+    int width  = sdl_window->w;
+    int height = sdl_window->h;
+    float x   = motion.pointer_coordinates[cord_index].x;
+    float y   = motion.pointer_coordinates[cord_index].y;
+
+    float n_x = x / width;
+    float n_y = y / height;
+    float pressure = motion.pointer_coordinates[cord_index].pressure;
+
+    AddTouchDevice(motion.device_id);
+
+    switch (motion.action) {
+        case mir_motion_action_down:
+        case mir_motion_action_pointer_down:
+            HandleTouchPress(device_id, id, SDL_TRUE, n_x, n_y, pressure);
+            break;
+        case mir_motion_action_up:
+        case mir_motion_action_pointer_up:
+            HandleTouchPress(device_id, id, SDL_FALSE, n_x, n_y, pressure);
+            break;
+        case mir_motion_action_hover_move:
+        case mir_motion_action_move:
+            HandleTouchMotion(device_id, id, n_x, n_y, pressure);
+            break;
+        default:
+            break;
+    }
+}
+
+static void
+HandleMouseEvent(MirMotionEvent const motion, int cord_index, SDL_Window* sdl_window)
+{
+    SDL_SetMouseFocus(sdl_window);
+
+    switch (motion.action) {
+        case mir_motion_action_down:
+        case mir_motion_action_pointer_down:
+            HandleMouseButton(sdl_window, SDL_PRESSED, motion.button_state);
+            break;
+        case mir_motion_action_up:
+        case mir_motion_action_pointer_up:
+            HandleMouseButton(sdl_window, SDL_RELEASED, motion.button_state);
+            break;
+        case mir_motion_action_hover_move:
+        case mir_motion_action_move:
+            HandleMouseMotion(sdl_window,
+                              motion.pointer_coordinates[cord_index].x,
+                              motion.pointer_coordinates[cord_index].y);
+            break;
+        case mir_motion_action_outside:
+            SDL_SetMouseFocus(NULL);
+            break;
+#if 0  /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
+        case mir_motion_action_scroll:
+            HandleMouseScroll(sdl_window,
+                              motion.pointer_coordinates[cord_index].hscroll,
+                              motion.pointer_coordinates[cord_index].vscroll);
+            break;
+#endif
+        case mir_motion_action_cancel:
+        case mir_motion_action_hover_enter:
+        case mir_motion_action_hover_exit:
+            break;
+        default:
+            break;
+    }
+}
+
+static void
+HandleMotionEvent(MirMotionEvent const motion, SDL_Window* sdl_window)
+{
+    int cord_index;
+    for (cord_index = 0; cord_index < motion.pointer_count; cord_index++) {
+#if 0  /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
+        if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_mouse) {
+            HandleMouseEvent(motion, cord_index, sdl_window);
+        }
+        else if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) {
+            HandleTouchEvent(motion, cord_index, sdl_window);
+        }
+#else
+        HandleMouseEvent(motion, cord_index, sdl_window);
+#endif
+    }
+}
+
+void
+MIR_HandleInput(MirSurface* surface, MirEvent const* ev, void* context)
+{
+    SDL_Window* window = (SDL_Window*)context;
+    switch (ev->type) {
+        case (mir_event_type_key):
+            HandleKeyEvent(ev->key, window);
+            break;
+        case (mir_event_type_motion):
+            HandleMotionEvent(ev->motion, window);
+            break;
+        default:
+            break;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirevents.h b/Source/3rd Party/sdl/src/video/mir/SDL_mirevents.h
new file mode 100644
index 000000000..9219eed15
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirevents.h	
@@ -0,0 +1,37 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#ifndef _SDL_mirevents_h
+#define _SDL_mirevents_h
+
+#include <mir_toolkit/mir_client_library.h>
+
+extern void
+MIR_HandleInput(MirSurface* surface, MirEvent const* ev, void* context);
+
+#endif /* _SDL_mirevents_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirframebuffer.c b/Source/3rd Party/sdl/src/video/mir/SDL_mirframebuffer.c
new file mode 100644
index 000000000..f8b46649a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirframebuffer.c	
@@ -0,0 +1,157 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
+#include "SDL_mirevents.h"
+#include "SDL_mirframebuffer.h"
+#include "SDL_mirwindow.h"
+
+#include "SDL_mirdyn.h"
+
+static const Uint32 mir_pixel_format_to_sdl_format[] = {
+    SDL_PIXELFORMAT_UNKNOWN,  /* mir_pixel_format_invalid   */
+    SDL_PIXELFORMAT_ABGR8888, /* mir_pixel_format_abgr_8888 */
+    SDL_PIXELFORMAT_BGR888,   /* mir_pixel_format_xbgr_8888 */
+    SDL_PIXELFORMAT_ARGB8888, /* mir_pixel_format_argb_8888 */
+    SDL_PIXELFORMAT_RGB888,   /* mir_pixel_format_xrgb_8888 */
+    SDL_PIXELFORMAT_BGR24     /* mir_pixel_format_bgr_888   */
+};
+
+Uint32
+MIR_GetSDLPixelFormat(MirPixelFormat format)
+{
+    return mir_pixel_format_to_sdl_format[format];
+}
+
+int
+MIR_CreateWindowFramebuffer(_THIS, SDL_Window* window, Uint32* format,
+                            void** pixels, int* pitch)
+{
+    MIR_Data* mir_data = _this->driverdata;
+    MIR_Window* mir_window;
+    MirSurfaceParameters surfaceparm;
+
+    if (MIR_CreateWindow(_this, window) < 0)
+        return SDL_SetError("Failed to created a mir window.");
+
+    mir_window = window->driverdata;
+
+    MIR_mir_surface_get_parameters(mir_window->surface, &surfaceparm);
+
+    *format = MIR_GetSDLPixelFormat(surfaceparm.pixel_format);
+    if (*format == SDL_PIXELFORMAT_UNKNOWN)
+        return SDL_SetError("Unknown pixel format");
+
+    *pitch = (((window->w * SDL_BYTESPERPIXEL(*format)) + 3) & ~3);
+
+    *pixels = SDL_malloc(window->h*(*pitch));
+    if (*pixels == NULL)
+        return SDL_OutOfMemory();
+
+    mir_window->surface = MIR_mir_connection_create_surface_sync(mir_data->connection, &surfaceparm);
+    if (!MIR_mir_surface_is_valid(mir_window->surface)) {
+        const char* error = MIR_mir_surface_get_error_message(mir_window->surface);
+        return SDL_SetError("Failed to created a mir surface: %s", error);
+    }
+
+    return 0;
+}
+
+int
+MIR_UpdateWindowFramebuffer(_THIS, SDL_Window* window,
+                            const SDL_Rect* rects, int numrects)
+{
+    MIR_Window* mir_window = window->driverdata;
+
+    MirGraphicsRegion region;
+    int i, j, x, y, w, h, start;
+    int bytes_per_pixel, bytes_per_row, s_stride, d_stride;
+    char* s_dest;
+    char* pixels;
+
+    MIR_mir_surface_get_graphics_region(mir_window->surface, &region);
+
+    s_dest = region.vaddr;
+    pixels = (char*)window->surface->pixels;
+
+    s_stride = window->surface->pitch;
+    d_stride = region.stride;
+    bytes_per_pixel = window->surface->format->BytesPerPixel;
+
+    for (i = 0; i < numrects; i++) {
+        s_dest = region.vaddr;
+        pixels = (char*)window->surface->pixels;
+
+        x = rects[i].x;
+        y = rects[i].y;
+        w = rects[i].w;
+        h = rects[i].h;
+
+        if (w <= 0 || h <= 0 || (x + w) <= 0 || (y + h) <= 0)
+            continue;
+
+        if (x < 0) {
+            x += w;
+            w += rects[i].x;
+        }
+
+        if (y < 0) {
+            y += h;
+            h += rects[i].y;
+        }
+
+        if (x + w > window->w)
+            w = window->w - x;
+        if (y + h > window->h)
+            h = window->h - y;
+
+        start = y * s_stride + x;
+        pixels += start;
+        s_dest += start;
+
+        bytes_per_row =  bytes_per_pixel * w;
+        for (j = 0; j < h; j++) {
+            memcpy(s_dest, pixels, bytes_per_row);
+            pixels += s_stride;
+            s_dest += d_stride;
+        }
+    }
+
+    MIR_mir_surface_swap_buffers_sync(mir_window->surface);
+
+    return 0;
+}
+
+void
+MIR_DestroyWindowFramebuffer(_THIS, SDL_Window* window)
+{
+}
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirframebuffer.h b/Source/3rd Party/sdl/src/video/mir/SDL_mirframebuffer.h
new file mode 100644
index 000000000..b4860fe1f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirframebuffer.h	
@@ -0,0 +1,47 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#ifndef _SDL_mirframebuffer_h
+#define _SDL_mirframebuffer_h
+
+#include "../SDL_sysvideo.h"
+
+#include "SDL_mirvideo.h"
+
+extern int
+MIR_CreateWindowFramebuffer(_THIS, SDL_Window* sdl_window, Uint32* format,
+                            void** pixels, int* pitch);
+
+extern int
+MIR_UpdateWindowFramebuffer(_THIS, SDL_Window* sdl_window,
+                            const SDL_Rect* rects, int numrects);
+
+extern void
+MIR_DestroyWindowFramebuffer(_THIS, SDL_Window* sdl_window);
+
+#endif /* _SDL_mirframebuffer_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirmouse.c b/Source/3rd Party/sdl/src/video/mir/SDL_mirmouse.c
new file mode 100644
index 000000000..def9dbd06
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirmouse.c	
@@ -0,0 +1,154 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
+#include "SDL_mirmouse.h"
+
+#include "../../events/SDL_mouse_c.h"
+#include "SDL_assert.h"
+
+#include "SDL_mirdyn.h"
+
+static SDL_Cursor*
+MIR_CreateDefaultCursor()
+{
+    SDL_Cursor* cursor;
+
+    cursor = SDL_calloc(1, sizeof(SDL_Cursor));
+    if (cursor) {
+    }
+    else {
+        SDL_OutOfMemory();
+    }
+
+    return cursor;
+}
+
+static SDL_Cursor*
+MIR_CreateCursor(SDL_Surface* sruface, int hot_x, int hot_y)
+{
+    return MIR_CreateDefaultCursor();
+}
+
+static SDL_Cursor*
+MIR_CreateSystemCursor(SDL_SystemCursor id)
+{
+    switch(id) {
+        case SDL_SYSTEM_CURSOR_ARROW:
+            break;
+        case SDL_SYSTEM_CURSOR_IBEAM:
+            break;
+        case SDL_SYSTEM_CURSOR_WAIT:
+            break;
+        case SDL_SYSTEM_CURSOR_CROSSHAIR:
+            break;
+        case SDL_SYSTEM_CURSOR_WAITARROW:
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENWSE:
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENESW:
+            break;
+        case SDL_SYSTEM_CURSOR_SIZEWE:
+            break;
+        case SDL_SYSTEM_CURSOR_SIZENS:
+            break;
+        case SDL_SYSTEM_CURSOR_SIZEALL:
+            break;
+        case SDL_SYSTEM_CURSOR_NO:
+            break;
+        case SDL_SYSTEM_CURSOR_HAND:
+            break;
+        default:
+            SDL_assert(0);
+            return NULL;
+    }
+
+    return MIR_CreateDefaultCursor();
+}
+
+static void
+MIR_FreeCursor(SDL_Cursor* cursor)
+{
+    if (cursor)
+      SDL_free(cursor);
+}
+
+static int
+MIR_ShowCursor(SDL_Cursor* cursor)
+{
+    return 0;
+}
+
+static void
+MIR_WarpMouse(SDL_Window* window, int x, int y)
+{
+    SDL_Unsupported();
+}
+
+static int
+MIR_SetRelativeMouseMode(SDL_bool enabled)
+{
+    return SDL_Unsupported();
+}
+
+/* TODO Actually implement the cursor, need to wait for mir support */
+void
+MIR_InitMouse()
+{
+    SDL_Mouse* mouse = SDL_GetMouse();
+
+    mouse->CreateCursor         = MIR_CreateCursor;
+    mouse->ShowCursor           = MIR_ShowCursor;
+    mouse->FreeCursor           = MIR_FreeCursor;
+    mouse->WarpMouse            = MIR_WarpMouse;
+    mouse->CreateSystemCursor   = MIR_CreateSystemCursor;
+    mouse->SetRelativeMouseMode = MIR_SetRelativeMouseMode;
+
+    SDL_SetDefaultCursor(MIR_CreateDefaultCursor());
+}
+
+void
+MIR_FiniMouse()
+{
+    SDL_Mouse* mouse = SDL_GetMouse();
+
+    MIR_FreeCursor(mouse->def_cursor);
+    mouse->def_cursor = NULL;
+
+    mouse->CreateCursor         = NULL;
+    mouse->ShowCursor           = NULL;
+    mouse->FreeCursor           = NULL;
+    mouse->WarpMouse            = NULL;
+    mouse->CreateSystemCursor   = NULL;
+    mouse->SetRelativeMouseMode = NULL;
+}
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirmouse.h b/Source/3rd Party/sdl/src/video/mir/SDL_mirmouse.h
new file mode 100644
index 000000000..fd4e47626
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirmouse.h	
@@ -0,0 +1,37 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#ifndef _SDL_mirmouse_h
+#define _SDL_mirmouse_h
+
+extern void
+MIR_InitMouse();
+
+extern void
+MIR_FiniMouse();
+
+#endif /* _SDL_mirmouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_miropengl.c b/Source/3rd Party/sdl/src/video/mir/SDL_miropengl.c
new file mode 100644
index 000000000..976b77272
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_miropengl.c	
@@ -0,0 +1,96 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
+#include "SDL_miropengl.h"
+
+#include "SDL_mirdyn.h"
+
+void
+MIR_GL_SwapWindow(_THIS, SDL_Window* window)
+{
+    MIR_Window* mir_wind = window->driverdata;
+
+    SDL_EGL_SwapBuffers(_this, mir_wind->egl_surface);
+}
+
+int
+MIR_GL_MakeCurrent(_THIS, SDL_Window* window, SDL_GLContext context)
+{
+  if (window) {
+      EGLSurface egl_surface = ((MIR_Window*)window->driverdata)->egl_surface;
+      return SDL_EGL_MakeCurrent(_this, egl_surface, context);
+  }
+
+  return SDL_EGL_MakeCurrent(_this, NULL, NULL);
+}
+
+SDL_GLContext
+MIR_GL_CreateContext(_THIS, SDL_Window* window)
+{
+    MIR_Window* mir_window = window->driverdata;
+
+    SDL_GLContext context;
+    context = SDL_EGL_CreateContext(_this, mir_window->egl_surface);
+
+    return context;
+}
+
+int
+MIR_GL_LoadLibrary(_THIS, const char* path)
+{
+    MIR_Data* mir_data = _this->driverdata;
+
+    SDL_EGL_LoadLibrary(_this, path, MIR_mir_connection_get_egl_native_display(mir_data->connection));
+
+    SDL_EGL_ChooseConfig(_this);
+
+    return 0;
+}
+
+void
+MIR_GL_UnloadLibrary(_THIS)
+{
+    SDL_EGL_UnloadLibrary(_this);
+}
+
+void*
+MIR_GL_GetProcAddress(_THIS, const char* proc)
+{
+    void* proc_addr = SDL_EGL_GetProcAddress(_this, proc);
+
+    if (!proc_addr) {
+        SDL_SetError("Failed to find proc address!");
+    }
+
+    return proc_addr;
+}
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_miropengl.h b/Source/3rd Party/sdl/src/video/mir/SDL_miropengl.h
new file mode 100644
index 000000000..0f4c97318
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_miropengl.h	
@@ -0,0 +1,58 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#ifndef _SDL_miropengl_h
+#define _SDL_miropengl_h
+
+#include "SDL_mirwindow.h"
+
+#include "../SDL_egl_c.h"
+
+#define MIR_GL_DeleteContext   SDL_EGL_DeleteContext
+#define MIR_GL_GetSwapInterval SDL_EGL_GetSwapInterval
+#define MIR_GL_SetSwapInterval SDL_EGL_SetSwapInterval
+
+extern void
+MIR_GL_SwapWindow(_THIS, SDL_Window* window);
+
+extern int
+MIR_GL_MakeCurrent(_THIS, SDL_Window* window, SDL_GLContext context);
+
+extern SDL_GLContext
+MIR_GL_CreateContext(_THIS, SDL_Window* window);
+
+extern int
+MIR_GL_LoadLibrary(_THIS, const char* path);
+
+extern void
+MIR_GL_UnloadLibrary(_THIS);
+
+extern void*
+MIR_GL_GetProcAddress(_THIS, const char* proc);
+
+#endif /* _SDL_miropengl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirsym.h b/Source/3rd Party/sdl/src/video/mir/SDL_mirsym.h
new file mode 100644
index 000000000..fe495e3e5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirsym.h	
@@ -0,0 +1,48 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* *INDENT-OFF* */
+
+SDL_MIR_MODULE(MIR_CLIENT)
+SDL_MIR_SYM(MirDisplayConfiguration*,mir_connection_create_display_config,(MirConnection *connection))
+SDL_MIR_SYM(MirSurface *,mir_connection_create_surface_sync,(MirConnection *connection, MirSurfaceParameters const *params))
+SDL_MIR_SYM(void,mir_connection_get_available_surface_formats,(MirConnection* connection, MirPixelFormat* formats, unsigned const int format_size, unsigned int *num_valid_formats))
+SDL_MIR_SYM(MirEGLNativeDisplayType,mir_connection_get_egl_native_display,(MirConnection *connection))
+SDL_MIR_SYM(int,mir_connection_is_valid,(MirConnection *connection))
+SDL_MIR_SYM(void,mir_connection_release,(MirConnection *connection))
+SDL_MIR_SYM(MirConnection *,mir_connect_sync,(char const *server, char const *app_name))
+SDL_MIR_SYM(void,mir_display_config_destroy,(MirDisplayConfiguration* display_configuration))
+SDL_MIR_SYM(MirEGLNativeWindowType,mir_surface_get_egl_native_window,(MirSurface *surface))
+SDL_MIR_SYM(char const *,mir_surface_get_error_message,(MirSurface *surface))
+SDL_MIR_SYM(void,mir_surface_get_graphics_region,(MirSurface *surface, MirGraphicsRegion *graphics_region))
+SDL_MIR_SYM(void,mir_surface_get_parameters,(MirSurface *surface, MirSurfaceParameters *parameters))
+SDL_MIR_SYM(int,mir_surface_is_valid,(MirSurface *surface))
+SDL_MIR_SYM(void,mir_surface_release_sync,(MirSurface *surface))
+SDL_MIR_SYM(void,mir_surface_set_event_handler,(MirSurface *surface, MirEventDelegate const *event_handler))
+SDL_MIR_SYM(MirWaitHandle*,mir_surface_set_type,(MirSurface *surface, MirSurfaceType type))
+SDL_MIR_SYM(void,mir_surface_swap_buffers_sync,(MirSurface *surface))
+
+SDL_MIR_MODULE(XKBCOMMON)
+SDL_MIR_SYM(int,xkb_keysym_to_utf8,(xkb_keysym_t keysym, char *buffer, size_t size))
+
+/* *INDENT-ON* */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirvideo.c b/Source/3rd Party/sdl/src/video/mir/SDL_mirvideo.c
new file mode 100644
index 000000000..ad6de151b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirvideo.c	
@@ -0,0 +1,345 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
+#include "SDL_video.h"
+
+#include "SDL_mirframebuffer.h"
+#include "SDL_mirmouse.h"
+#include "SDL_miropengl.h"
+#include "SDL_mirvideo.h"
+#include "SDL_mirwindow.h"
+
+#include "SDL_mirdyn.h"
+
+#define MIR_DRIVER_NAME "mir"
+
+static int
+MIR_VideoInit(_THIS);
+
+static void
+MIR_VideoQuit(_THIS);
+
+static int
+MIR_GetDisplayBounds(_THIS, SDL_VideoDisplay* display, SDL_Rect* rect);
+
+static void
+MIR_GetDisplayModes(_THIS, SDL_VideoDisplay* sdl_display);
+
+static int
+MIR_SetDisplayMode(_THIS, SDL_VideoDisplay* sdl_display, SDL_DisplayMode* mode);
+
+static SDL_WindowShaper*
+MIR_CreateShaper(SDL_Window* window)
+{
+    /* FIXME Im not sure if mir support this atm, will have to come back to this */
+    return NULL;
+}
+
+static int
+MIR_SetWindowShape(SDL_WindowShaper* shaper, SDL_Surface* shape, SDL_WindowShapeMode* shape_mode)
+{
+    return SDL_Unsupported();
+}
+
+static int
+MIR_ResizeWindowShape(SDL_Window* window)
+{
+    return SDL_Unsupported();
+}
+
+static int
+MIR_Available()
+{
+    int available = 0;
+
+    if (SDL_MIR_LoadSymbols()) {
+        /* !!! FIXME: try to make a MirConnection here. */
+        available = 1;
+        SDL_MIR_UnloadSymbols();
+
+    }
+
+    return available;
+}
+
+static void
+MIR_DeleteDevice(SDL_VideoDevice* device)
+{
+    SDL_free(device);
+    SDL_MIR_UnloadSymbols();
+}
+
+void
+MIR_PumpEvents(_THIS)
+{
+}
+
+static SDL_VideoDevice*
+MIR_CreateDevice(int device_index)
+{
+    MIR_Data* mir_data;
+    SDL_VideoDevice* device = NULL;
+
+    if (!SDL_MIR_LoadSymbols()) {
+        return NULL;
+    }
+
+    device = SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (!device) {
+        SDL_MIR_UnloadSymbols();
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    mir_data = SDL_calloc(1, sizeof(MIR_Data));
+    if (!mir_data) {
+        SDL_free(device);
+        SDL_MIR_UnloadSymbols();
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    device->driverdata = mir_data;
+
+    /* mirvideo */
+    device->VideoInit        = MIR_VideoInit;
+    device->VideoQuit        = MIR_VideoQuit;
+    device->GetDisplayBounds = MIR_GetDisplayBounds;
+    device->GetDisplayModes  = MIR_GetDisplayModes;
+    device->SetDisplayMode   = MIR_SetDisplayMode;
+    device->free             = MIR_DeleteDevice;
+
+    /* miropengles */
+    device->GL_SwapWindow      = MIR_GL_SwapWindow;
+    device->GL_MakeCurrent     = MIR_GL_MakeCurrent;
+    device->GL_CreateContext   = MIR_GL_CreateContext;
+    device->GL_DeleteContext   = MIR_GL_DeleteContext;
+    device->GL_LoadLibrary     = MIR_GL_LoadLibrary;
+    device->GL_UnloadLibrary   = MIR_GL_UnloadLibrary;
+    device->GL_GetSwapInterval = MIR_GL_GetSwapInterval;
+    device->GL_SetSwapInterval = MIR_GL_SetSwapInterval;
+    device->GL_GetProcAddress  = MIR_GL_GetProcAddress;
+
+    /* mirwindow */
+    device->CreateWindow        = MIR_CreateWindow;
+    device->DestroyWindow       = MIR_DestroyWindow;
+    device->GetWindowWMInfo     = MIR_GetWindowWMInfo;
+    device->SetWindowFullscreen = MIR_SetWindowFullscreen;
+    device->MaximizeWindow      = MIR_MaximizeWindow;
+    device->MinimizeWindow      = MIR_MinimizeWindow;
+    device->RestoreWindow       = MIR_RestoreWindow;
+
+    device->CreateWindowFrom     = NULL;
+    device->SetWindowTitle       = NULL;
+    device->SetWindowIcon        = NULL;
+    device->SetWindowPosition    = NULL;
+    device->SetWindowSize        = NULL;
+    device->SetWindowMinimumSize = NULL;
+    device->SetWindowMaximumSize = NULL;
+    device->ShowWindow           = NULL;
+    device->HideWindow           = NULL;
+    device->RaiseWindow          = NULL;
+    device->SetWindowBordered    = NULL;
+    device->SetWindowGammaRamp   = NULL;
+    device->GetWindowGammaRamp   = NULL;
+    device->SetWindowGrab        = NULL;
+    device->OnWindowEnter        = NULL;
+
+    /* mirframebuffer */
+    device->CreateWindowFramebuffer  = MIR_CreateWindowFramebuffer;
+    device->UpdateWindowFramebuffer  = MIR_UpdateWindowFramebuffer;
+    device->DestroyWindowFramebuffer = MIR_DestroyWindowFramebuffer;
+
+    device->shape_driver.CreateShaper      = MIR_CreateShaper;
+    device->shape_driver.SetWindowShape    = MIR_SetWindowShape;
+    device->shape_driver.ResizeWindowShape = MIR_ResizeWindowShape;
+
+    device->PumpEvents = MIR_PumpEvents;
+
+    device->SuspendScreenSaver = NULL;
+
+    device->StartTextInput   = NULL;
+    device->StopTextInput    = NULL;
+    device->SetTextInputRect = NULL;
+
+    device->HasScreenKeyboardSupport = NULL;
+    device->ShowScreenKeyboard       = NULL;
+    device->HideScreenKeyboard       = NULL;
+    device->IsScreenKeyboardShown    = NULL;
+
+    device->SetClipboardText = NULL;
+    device->GetClipboardText = NULL;
+    device->HasClipboardText = NULL;
+
+    device->ShowMessageBox = NULL;
+
+    return device;
+}
+
+VideoBootStrap MIR_bootstrap = {
+    MIR_DRIVER_NAME, "SDL Mir video driver",
+    MIR_Available, MIR_CreateDevice
+};
+
+static void
+MIR_SetCurrentDisplayMode(MirDisplayOutput const* out, SDL_VideoDisplay* display)
+{
+    SDL_DisplayMode mode = {
+        .format = SDL_PIXELFORMAT_RGB888,
+        .w = out->modes[out->current_mode].horizontal_resolution,
+        .h = out->modes[out->current_mode].vertical_resolution,
+        .refresh_rate = out->modes[out->current_mode].refresh_rate,
+        .driverdata = NULL
+    };
+
+    display->desktop_mode = mode;
+    display->current_mode = mode;
+}
+
+static void
+MIR_AddAllModesFromDisplay(MirDisplayOutput const* out, SDL_VideoDisplay* display)
+{
+    int n_mode;
+    for (n_mode = 0; n_mode < out->num_modes; ++n_mode) {
+        SDL_DisplayMode mode = {
+            .format = SDL_PIXELFORMAT_RGB888,
+            .w = out->modes[n_mode].horizontal_resolution,
+            .h = out->modes[n_mode].vertical_resolution,
+            .refresh_rate = out->modes[n_mode].refresh_rate,
+            .driverdata = NULL
+        };
+
+        SDL_AddDisplayMode(display, &mode);
+    }
+}
+
+static void
+MIR_InitDisplays(_THIS)
+{
+    MIR_Data* mir_data = _this->driverdata;
+    int d;
+
+    MirDisplayConfiguration* display_config = MIR_mir_connection_create_display_config(mir_data->connection);
+
+    for (d = 0; d < display_config->num_outputs; d++) {
+        MirDisplayOutput const* out = display_config->outputs + d;
+
+        SDL_VideoDisplay display;
+        SDL_zero(display);
+
+        if (out->used &&
+            out->connected &&
+            out->num_modes &&
+            out->current_mode < out->num_modes) {
+
+            MIR_SetCurrentDisplayMode(out, &display);
+            MIR_AddAllModesFromDisplay(out, &display);
+
+            SDL_AddVideoDisplay(&display);
+        }
+    }
+
+    MIR_mir_display_config_destroy(display_config);
+}
+
+int
+MIR_VideoInit(_THIS)
+{
+    MIR_Data* mir_data = _this->driverdata;
+
+    mir_data->connection = MIR_mir_connect_sync(NULL, __PRETTY_FUNCTION__);
+
+    if (!MIR_mir_connection_is_valid(mir_data->connection))
+        return SDL_SetError("Failed to connect to the Mir Server");
+
+    MIR_InitDisplays(_this);
+    MIR_InitMouse();
+
+    return 0;
+}
+
+void
+MIR_VideoQuit(_THIS)
+{
+    MIR_Data* mir_data = _this->driverdata;
+
+    MIR_FiniMouse();
+
+    MIR_GL_DeleteContext(_this, NULL);
+    MIR_GL_UnloadLibrary(_this);
+
+    MIR_mir_connection_release(mir_data->connection);
+
+    SDL_free(mir_data);
+    _this->driverdata = NULL;
+}
+
+static int
+MIR_GetDisplayBounds(_THIS, SDL_VideoDisplay* display, SDL_Rect* rect)
+{
+    MIR_Data* mir_data = _this->driverdata;
+    int d;
+
+    MirDisplayConfiguration* display_config = MIR_mir_connection_create_display_config(mir_data->connection);
+
+    for (d = 0; d < display_config->num_outputs; d++) {
+        MirDisplayOutput const* out = display_config->outputs + d;
+
+        if (out->used &&
+            out->connected &&
+            out->num_modes &&
+            out->current_mode < out->num_modes) {
+
+            rect->x = out->position_x;
+            rect->y = out->position_y;
+            rect->w = out->modes->horizontal_resolution;
+            rect->h = out->modes->vertical_resolution;
+        }
+    }
+
+    MIR_mir_display_config_destroy(display_config);
+
+    return 0;
+}
+
+static void
+MIR_GetDisplayModes(_THIS, SDL_VideoDisplay* sdl_display)
+{
+}
+
+static int
+MIR_SetDisplayMode(_THIS, SDL_VideoDisplay* sdl_display, SDL_DisplayMode* mode)
+{
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirvideo.h b/Source/3rd Party/sdl/src/video/mir/SDL_mirvideo.h
new file mode 100644
index 000000000..edeca01a4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirvideo.h	
@@ -0,0 +1,39 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#ifndef _SDL_mirvideo_h_
+#define _SDL_mirvideo_h_
+
+#include <EGL/egl.h>
+#include <mir_toolkit/mir_client_library.h>
+
+typedef struct
+{
+    MirConnection* connection;
+} MIR_Data;
+
+#endif /* _SDL_mirvideo_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirwindow.c b/Source/3rd Party/sdl/src/video/mir/SDL_mirwindow.c
new file mode 100644
index 000000000..d233db47f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirwindow.c	
@@ -0,0 +1,227 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_MIR
+
+#include "../SDL_egl_c.h"
+#include "../SDL_sysvideo.h"
+
+#include "SDL_mirevents.h"
+#include "SDL_mirwindow.h"
+
+#include "SDL_mirdyn.h"
+
+int
+IsSurfaceValid(MIR_Window* mir_window)
+{
+    if (!MIR_mir_surface_is_valid(mir_window->surface)) {
+        const char* error = MIR_mir_surface_get_error_message(mir_window->surface);
+        return SDL_SetError("Failed to created a mir surface: %s", error);
+    }
+
+    return 0;
+}
+
+MirPixelFormat
+FindValidPixelFormat(MIR_Data* mir_data)
+{
+    unsigned int pf_size = 32;
+    unsigned int valid_formats;
+    unsigned int f;
+
+    MirPixelFormat formats[pf_size];
+    MIR_mir_connection_get_available_surface_formats(mir_data->connection, formats,
+                                                 pf_size, &valid_formats);
+
+    for (f = 0; f < valid_formats; f++) {
+        MirPixelFormat cur_pf = formats[f];
+
+        if (cur_pf == mir_pixel_format_abgr_8888 ||
+            cur_pf == mir_pixel_format_xbgr_8888 ||
+            cur_pf == mir_pixel_format_argb_8888 ||
+            cur_pf == mir_pixel_format_xrgb_8888) {
+
+            return cur_pf;
+        }
+    }
+
+    return mir_pixel_format_invalid;
+}
+
+int
+MIR_CreateWindow(_THIS, SDL_Window* window)
+{
+    MIR_Window* mir_window;
+    MIR_Data* mir_data;
+
+    MirSurfaceParameters surfaceparm =
+    {
+        .name = "MirSurface",
+        .width = window->w,
+        .height = window->h,
+        .pixel_format = mir_pixel_format_invalid,
+        .buffer_usage = mir_buffer_usage_hardware
+    };
+
+    MirEventDelegate delegate = {
+        MIR_HandleInput,
+        window
+    };
+
+    mir_window = SDL_calloc(1, sizeof(MIR_Window));
+    if (!mir_window)
+        return SDL_OutOfMemory();
+
+    mir_data = _this->driverdata;
+    window->driverdata = mir_window;
+
+    if (window->x == SDL_WINDOWPOS_UNDEFINED)
+        window->x = 0;
+
+    if (window->y == SDL_WINDOWPOS_UNDEFINED)
+        window->y = 0;
+
+    mir_window->mir_data = mir_data;
+    mir_window->sdl_window = window;
+
+    surfaceparm.pixel_format = FindValidPixelFormat(mir_data);
+    if (surfaceparm.pixel_format == mir_pixel_format_invalid) {
+        return SDL_SetError("Failed to find a valid pixel format.");
+    }
+
+    mir_window->surface = MIR_mir_connection_create_surface_sync(mir_data->connection, &surfaceparm);
+    if (!MIR_mir_surface_is_valid(mir_window->surface)) {
+        const char* error = MIR_mir_surface_get_error_message(mir_window->surface);
+        return SDL_SetError("Failed to created a mir surface: %s", error);
+    }
+
+    if (window->flags & SDL_WINDOW_OPENGL) {
+        EGLNativeWindowType egl_native_window =
+                        (EGLNativeWindowType)MIR_mir_surface_get_egl_native_window(mir_window->surface);
+
+        mir_window->egl_surface = SDL_EGL_CreateSurface(_this, egl_native_window);
+
+        if (mir_window->egl_surface == EGL_NO_SURFACE) {
+            return SDL_SetError("Failed to created a window surface %p",
+                                _this->egl_data->egl_display);
+        }
+    }
+    else {
+        mir_window->egl_surface = EGL_NO_SURFACE;
+    }
+
+    MIR_mir_surface_set_event_handler(mir_window->surface, &delegate);
+
+    return 0;
+}
+
+void
+MIR_DestroyWindow(_THIS, SDL_Window* window)
+{
+    MIR_Data* mir_data = _this->driverdata;
+    MIR_Window* mir_window = window->driverdata;
+
+    window->driverdata = NULL;
+
+    if (mir_data) {
+        SDL_EGL_DestroySurface(_this, mir_window->egl_surface);
+        MIR_mir_surface_release_sync(mir_window->surface);
+
+        SDL_free(mir_window);
+    }
+}
+
+SDL_bool
+MIR_GetWindowWMInfo(_THIS, SDL_Window* window, SDL_SysWMinfo* info)
+{
+    if (info->version.major == SDL_MAJOR_VERSION &&
+        info->version.minor == SDL_MINOR_VERSION) {
+        MIR_Window* mir_window = window->driverdata;
+
+        info->subsystem = SDL_SYSWM_MIR;
+        info->info.mir.connection = mir_window->mir_data->connection;
+        info->info.mir.surface = mir_window->surface;
+
+        return SDL_TRUE;
+    }
+
+    return SDL_FALSE;
+}
+
+void
+MIR_SetWindowFullscreen(_THIS, SDL_Window* window,
+                        SDL_VideoDisplay* display,
+                        SDL_bool fullscreen)
+{
+    MIR_Window* mir_window = window->driverdata;
+
+    if (IsSurfaceValid(mir_window) < 0)
+        return;
+
+    if (fullscreen) {
+        MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_fullscreen);
+    } else {
+        MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_restored);
+    }
+}
+
+void
+MIR_MaximizeWindow(_THIS, SDL_Window* window)
+{
+    MIR_Window* mir_window = window->driverdata;
+
+    if (IsSurfaceValid(mir_window) < 0)
+        return;
+
+    MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_maximized);
+}
+
+void
+MIR_MinimizeWindow(_THIS, SDL_Window* window)
+{
+    MIR_Window* mir_window = window->driverdata;
+
+    if (IsSurfaceValid(mir_window) < 0)
+        return;
+
+    MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_minimized);
+}
+
+void
+MIR_RestoreWindow(_THIS, SDL_Window * window)
+{
+    MIR_Window* mir_window = window->driverdata;
+
+    if (IsSurfaceValid(mir_window) < 0)
+        return;
+
+    MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_restored);
+}
+
+#endif /* SDL_VIDEO_DRIVER_MIR */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/mir/SDL_mirwindow.h b/Source/3rd Party/sdl/src/video/mir/SDL_mirwindow.h
new file mode 100644
index 000000000..411c1485f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/mir/SDL_mirwindow.h	
@@ -0,0 +1,69 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+  Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
+*/
+
+#ifndef _SDL_mirwindow_h
+#define _SDL_mirwindow_h
+
+#include "../SDL_sysvideo.h"
+#include "SDL_syswm.h"
+
+#include "SDL_mirvideo.h"
+
+typedef struct {
+    SDL_Window* sdl_window;
+    MIR_Data* mir_data;
+
+    MirSurface* surface;
+    EGLSurface egl_surface;
+} MIR_Window;
+
+
+extern int
+MIR_CreateWindow(_THIS, SDL_Window* window);
+
+extern void
+MIR_DestroyWindow(_THIS, SDL_Window* window);
+
+extern void
+MIR_SetWindowFullscreen(_THIS, SDL_Window* window,
+                        SDL_VideoDisplay* display,
+                        SDL_bool fullscreen);
+
+extern void
+MIR_MaximizeWindow(_THIS, SDL_Window* window);
+
+extern void
+MIR_MinimizeWindow(_THIS, SDL_Window* window);
+
+extern void
+MIR_RestoreWindow(_THIS, SDL_Window* window);
+
+extern SDL_bool
+MIR_GetWindowWMInfo(_THIS, SDL_Window* window, SDL_SysWMinfo* info);
+
+#endif /* _SDL_mirwindow */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/video/pandora/SDL_pandora.c b/Source/3rd Party/sdl/src/video/pandora/SDL_pandora.c
new file mode 100644
index 000000000..10ca38241
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/pandora/SDL_pandora.c	
@@ -0,0 +1,850 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_PANDORA
+
+/* SDL internals */
+#include "../SDL_sysvideo.h"
+#include "SDL_version.h"
+#include "SDL_syswm.h"
+#include "SDL_loadso.h"
+#include "SDL_events.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_keyboard_c.h"
+
+/* PND declarations */
+#include "SDL_pandora.h"
+#include "SDL_pandora_events.h"
+
+/* WIZ declarations */
+#include "GLES/gl.h"
+#ifdef WIZ_GLES_LITE
+static NativeWindowType hNativeWnd = 0; /* A handle to the window we will create. */
+#endif
+
+static SDL_bool PND_initialized = SDL_FALSE;
+
+static int
+PND_available(void)
+{
+    return 1;
+}
+
+static void
+PND_destroy(SDL_VideoDevice * device)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) device->driverdata;
+
+    if (device->driverdata != NULL) {
+        device->driverdata = NULL;
+    }
+}
+
+static SDL_VideoDevice *
+PND_create()
+{
+    SDL_VideoDevice *device;
+    SDL_VideoData *phdata;
+    int status;
+
+    /* Check if pandora could be initialized */
+    status = PND_available();
+    if (status == 0) {
+        /* PND could not be used */
+        return NULL;
+    }
+
+    /* Initialize SDL_VideoDevice structure */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (device == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    /* Initialize internal Pandora specific data */
+    phdata = (SDL_VideoData *) SDL_calloc(1, sizeof(SDL_VideoData));
+    if (phdata == NULL) {
+        SDL_OutOfMemory();
+        SDL_free(device);
+        return NULL;
+    }
+
+    device->driverdata = phdata;
+
+    phdata->egl_initialized = SDL_TRUE;
+
+
+    /* Setup amount of available displays and current display */
+    device->num_displays = 0;
+    device->current_display = 0;
+
+    /* Set device free function */
+    device->free = PND_destroy;
+
+    /* Setup all functions which we can handle */
+    device->VideoInit = PND_videoinit;
+    device->VideoQuit = PND_videoquit;
+    device->GetDisplayModes = PND_getdisplaymodes;
+    device->SetDisplayMode = PND_setdisplaymode;
+    device->CreateWindow = PND_createwindow;
+    device->CreateWindowFrom = PND_createwindowfrom;
+    device->SetWindowTitle = PND_setwindowtitle;
+    device->SetWindowIcon = PND_setwindowicon;
+    device->SetWindowPosition = PND_setwindowposition;
+    device->SetWindowSize = PND_setwindowsize;
+    device->ShowWindow = PND_showwindow;
+    device->HideWindow = PND_hidewindow;
+    device->RaiseWindow = PND_raisewindow;
+    device->MaximizeWindow = PND_maximizewindow;
+    device->MinimizeWindow = PND_minimizewindow;
+    device->RestoreWindow = PND_restorewindow;
+    device->SetWindowGrab = PND_setwindowgrab;
+    device->DestroyWindow = PND_destroywindow;
+    device->GetWindowWMInfo = PND_getwindowwminfo;
+    device->GL_LoadLibrary = PND_gl_loadlibrary;
+    device->GL_GetProcAddress = PND_gl_getprocaddres;
+    device->GL_UnloadLibrary = PND_gl_unloadlibrary;
+    device->GL_CreateContext = PND_gl_createcontext;
+    device->GL_MakeCurrent = PND_gl_makecurrent;
+    device->GL_SetSwapInterval = PND_gl_setswapinterval;
+    device->GL_GetSwapInterval = PND_gl_getswapinterval;
+    device->GL_SwapWindow = PND_gl_swapwindow;
+    device->GL_DeleteContext = PND_gl_deletecontext;
+    device->PumpEvents = PND_PumpEvents;
+
+    /* !!! FIXME: implement SetWindowBordered */
+
+    return device;
+}
+
+VideoBootStrap PND_bootstrap = {
+#ifdef WIZ_GLES_LITE
+    "wiz",
+    "SDL Wiz Video Driver",
+#else
+    "pandora",
+    "SDL Pandora Video Driver",
+#endif
+    PND_available,
+    PND_create
+};
+
+/*****************************************************************************/
+/* SDL Video and Display initialization/handling functions                   */
+/*****************************************************************************/
+int
+PND_videoinit(_THIS)
+{
+    SDL_VideoDisplay display;
+    SDL_DisplayMode current_mode;
+
+    SDL_zero(current_mode);
+#ifdef WIZ_GLES_LITE
+    current_mode.w = 320;
+    current_mode.h = 240;
+#else
+    current_mode.w = 800;
+    current_mode.h = 480;
+#endif
+    current_mode.refresh_rate = 60;
+    current_mode.format = SDL_PIXELFORMAT_RGB565;
+    current_mode.driverdata = NULL;
+
+    SDL_zero(display);
+    display.desktop_mode = current_mode;
+    display.current_mode = current_mode;
+    display.driverdata = NULL;
+
+    SDL_AddVideoDisplay(&display);
+
+    return 1;
+}
+
+void
+PND_videoquit(_THIS)
+{
+
+}
+
+void
+PND_getdisplaymodes(_THIS, SDL_VideoDisplay * display)
+{
+
+}
+
+int
+PND_setdisplaymode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+    return 0;
+}
+
+int
+PND_createwindow(_THIS, SDL_Window * window)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+
+    SDL_WindowData *wdata;
+
+    uint32_t winargc = 0;
+    int32_t status;
+
+
+    /* Allocate window internal data */
+    wdata = (SDL_WindowData *) SDL_calloc(1, sizeof(SDL_WindowData));
+    if (wdata == NULL) {
+        return SDL_OutOfMemory();
+    }
+
+    /* Setup driver data for this window */
+    window->driverdata = wdata;
+
+    /* Check if window must support OpenGL ES rendering */
+    if ((window->flags & SDL_WINDOW_OPENGL) == SDL_WINDOW_OPENGL) {
+
+        EGLBoolean initstatus;
+
+        /* Mark this window as OpenGL ES compatible */
+        wdata->uses_gles = SDL_TRUE;
+
+        /* Create connection to OpenGL ES */
+        if (phdata->egl_display == EGL_NO_DISPLAY) {
+            phdata->egl_display = eglGetDisplay((NativeDisplayType) 0);
+            if (phdata->egl_display == EGL_NO_DISPLAY) {
+                return SDL_SetError("PND: Can't get connection to OpenGL ES");
+            }
+
+            initstatus = eglInitialize(phdata->egl_display, NULL, NULL);
+            if (initstatus != EGL_TRUE) {
+                return SDL_SetError("PND: Can't init OpenGL ES library");
+            }
+        }
+
+        phdata->egl_refcount++;
+    }
+
+    /* Window has been successfully created */
+    return 0;
+}
+
+int
+PND_createwindowfrom(_THIS, SDL_Window * window, const void *data)
+{
+    return -1;
+}
+
+void
+PND_setwindowtitle(_THIS, SDL_Window * window)
+{
+}
+void
+PND_setwindowicon(_THIS, SDL_Window * window, SDL_Surface * icon)
+{
+}
+void
+PND_setwindowposition(_THIS, SDL_Window * window)
+{
+}
+void
+PND_setwindowsize(_THIS, SDL_Window * window)
+{
+}
+void
+PND_showwindow(_THIS, SDL_Window * window)
+{
+}
+void
+PND_hidewindow(_THIS, SDL_Window * window)
+{
+}
+void
+PND_raisewindow(_THIS, SDL_Window * window)
+{
+}
+void
+PND_maximizewindow(_THIS, SDL_Window * window)
+{
+}
+void
+PND_minimizewindow(_THIS, SDL_Window * window)
+{
+}
+void
+PND_restorewindow(_THIS, SDL_Window * window)
+{
+}
+void
+PND_setwindowgrab(_THIS, SDL_Window * window)
+{
+}
+void
+PND_destroywindow(_THIS, SDL_Window * window)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+    eglTerminate(phdata->egl_display);
+}
+
+/*****************************************************************************/
+/* SDL Window Manager function                                               */
+/*****************************************************************************/
+SDL_bool
+PND_getwindowwminfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
+{
+    if (info->version.major <= SDL_MAJOR_VERSION) {
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+
+    /* Failed to get window manager information */
+    return SDL_FALSE;
+}
+
+/*****************************************************************************/
+/* SDL OpenGL/OpenGL ES functions                                            */
+/*****************************************************************************/
+int
+PND_gl_loadlibrary(_THIS, const char *path)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+
+    /* Check if OpenGL ES library is specified for GF driver */
+    if (path == NULL) {
+        path = SDL_getenv("SDL_OPENGL_LIBRARY");
+        if (path == NULL) {
+            path = SDL_getenv("SDL_OPENGLES_LIBRARY");
+        }
+    }
+
+    /* Check if default library loading requested */
+    if (path == NULL) {
+        /* Already linked with GF library which provides egl* subset of  */
+        /* functions, use Common profile of OpenGL ES library by default */
+#ifdef WIZ_GLES_LITE
+    path = "/lib/libopengles_lite.so";
+#else
+        path = "/usr/lib/libGLES_CM.so";
+#endif
+    }
+
+    /* Load dynamic library */
+    _this->gl_config.dll_handle = SDL_LoadObject(path);
+    if (!_this->gl_config.dll_handle) {
+        /* Failed to load new GL ES library */
+        return SDL_SetError("PND: Failed to locate OpenGL ES library");
+    }
+
+    /* Store OpenGL ES library path and name */
+    SDL_strlcpy(_this->gl_config.driver_path, path,
+                SDL_arraysize(_this->gl_config.driver_path));
+
+    /* New OpenGL ES library is loaded */
+    return 0;
+}
+
+void *
+PND_gl_getprocaddres(_THIS, const char *proc)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+    void *function_address;
+
+    /* Try to get function address through the egl interface */
+    function_address = eglGetProcAddress(proc);
+    if (function_address != NULL) {
+        return function_address;
+    }
+
+    /* Then try to get function in the OpenGL ES library */
+    if (_this->gl_config.dll_handle) {
+        function_address =
+            SDL_LoadFunction(_this->gl_config.dll_handle, proc);
+        if (function_address != NULL) {
+            return function_address;
+        }
+    }
+
+    /* Failed to get GL ES function address pointer */
+    SDL_SetError("PND: Cannot locate OpenGL ES function name");
+    return NULL;
+}
+
+void
+PND_gl_unloadlibrary(_THIS)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+
+    if (phdata->egl_initialized == SDL_TRUE) {
+        /* Unload OpenGL ES library */
+        if (_this->gl_config.dll_handle) {
+            SDL_UnloadObject(_this->gl_config.dll_handle);
+            _this->gl_config.dll_handle = NULL;
+        }
+    } else {
+        SDL_SetError("PND: GF initialization failed, no OpenGL ES support");
+    }
+}
+
+SDL_GLContext
+PND_gl_createcontext(_THIS, SDL_Window * window)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+    SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *didata =
+        (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+    EGLBoolean status;
+    int32_t gfstatus;
+    EGLint configs;
+    uint32_t attr_pos;
+    EGLint attr_value;
+    EGLint cit;
+
+    /* Check if EGL was initialized */
+    if (phdata->egl_initialized != SDL_TRUE) {
+        SDL_SetError("PND: EGL initialization failed, no OpenGL ES support");
+        return NULL;
+    }
+
+    /* Prepare attributes list to pass them to OpenGL ES */
+    attr_pos = 0;
+    wdata->gles_attributes[attr_pos++] = EGL_SURFACE_TYPE;
+    wdata->gles_attributes[attr_pos++] = EGL_WINDOW_BIT;
+    wdata->gles_attributes[attr_pos++] = EGL_RED_SIZE;
+    wdata->gles_attributes[attr_pos++] = _this->gl_config.red_size;
+    wdata->gles_attributes[attr_pos++] = EGL_GREEN_SIZE;
+    wdata->gles_attributes[attr_pos++] = _this->gl_config.green_size;
+    wdata->gles_attributes[attr_pos++] = EGL_BLUE_SIZE;
+    wdata->gles_attributes[attr_pos++] = _this->gl_config.blue_size;
+    wdata->gles_attributes[attr_pos++] = EGL_ALPHA_SIZE;
+
+    /* Setup alpha size in bits */
+    if (_this->gl_config.alpha_size) {
+        wdata->gles_attributes[attr_pos++] = _this->gl_config.alpha_size;
+    } else {
+        wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+    }
+
+    /* Setup color buffer size */
+    if (_this->gl_config.buffer_size) {
+        wdata->gles_attributes[attr_pos++] = EGL_BUFFER_SIZE;
+        wdata->gles_attributes[attr_pos++] = _this->gl_config.buffer_size;
+    } else {
+        wdata->gles_attributes[attr_pos++] = EGL_BUFFER_SIZE;
+        wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+    }
+
+    /* Setup depth buffer bits */
+    wdata->gles_attributes[attr_pos++] = EGL_DEPTH_SIZE;
+    wdata->gles_attributes[attr_pos++] = _this->gl_config.depth_size;
+
+    /* Setup stencil bits */
+    if (_this->gl_config.stencil_size) {
+        wdata->gles_attributes[attr_pos++] = EGL_STENCIL_SIZE;
+        wdata->gles_attributes[attr_pos++] = _this->gl_config.buffer_size;
+    } else {
+        wdata->gles_attributes[attr_pos++] = EGL_STENCIL_SIZE;
+        wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+    }
+
+    /* Set number of samples in multisampling */
+    if (_this->gl_config.multisamplesamples) {
+        wdata->gles_attributes[attr_pos++] = EGL_SAMPLES;
+        wdata->gles_attributes[attr_pos++] =
+            _this->gl_config.multisamplesamples;
+    }
+
+    /* Multisample buffers, OpenGL ES 1.0 spec defines 0 or 1 buffer */
+    if (_this->gl_config.multisamplebuffers) {
+        wdata->gles_attributes[attr_pos++] = EGL_SAMPLE_BUFFERS;
+        wdata->gles_attributes[attr_pos++] =
+            _this->gl_config.multisamplebuffers;
+    }
+
+    /* Finish attributes list */
+    wdata->gles_attributes[attr_pos] = EGL_NONE;
+
+    /* Request first suitable framebuffer configuration */
+    status = eglChooseConfig(phdata->egl_display, wdata->gles_attributes,
+                             wdata->gles_configs, 1, &configs);
+    if (status != EGL_TRUE) {
+        SDL_SetError("PND: Can't find closest configuration for OpenGL ES");
+        return NULL;
+    }
+
+    /* Check if nothing has been found, try "don't care" settings */
+    if (configs == 0) {
+        int32_t it;
+        int32_t jt;
+        GLint depthbits[4] = { 32, 24, 16, EGL_DONT_CARE };
+
+        for (it = 0; it < 4; it++) {
+            for (jt = 16; jt >= 0; jt--) {
+                /* Don't care about color buffer bits, use what exist */
+                /* Replace previous set data with EGL_DONT_CARE       */
+                attr_pos = 0;
+                wdata->gles_attributes[attr_pos++] = EGL_SURFACE_TYPE;
+                wdata->gles_attributes[attr_pos++] = EGL_WINDOW_BIT;
+                wdata->gles_attributes[attr_pos++] = EGL_RED_SIZE;
+                wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+                wdata->gles_attributes[attr_pos++] = EGL_GREEN_SIZE;
+                wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+                wdata->gles_attributes[attr_pos++] = EGL_BLUE_SIZE;
+                wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+                wdata->gles_attributes[attr_pos++] = EGL_ALPHA_SIZE;
+                wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+                wdata->gles_attributes[attr_pos++] = EGL_BUFFER_SIZE;
+                wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+
+                /* Try to find requested or smallest depth */
+                if (_this->gl_config.depth_size) {
+                    wdata->gles_attributes[attr_pos++] = EGL_DEPTH_SIZE;
+                    wdata->gles_attributes[attr_pos++] = depthbits[it];
+                } else {
+                    wdata->gles_attributes[attr_pos++] = EGL_DEPTH_SIZE;
+                    wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+                }
+
+                if (_this->gl_config.stencil_size) {
+                    wdata->gles_attributes[attr_pos++] = EGL_STENCIL_SIZE;
+                    wdata->gles_attributes[attr_pos++] = jt;
+                } else {
+                    wdata->gles_attributes[attr_pos++] = EGL_STENCIL_SIZE;
+                    wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+                }
+
+                wdata->gles_attributes[attr_pos++] = EGL_SAMPLES;
+                wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+                wdata->gles_attributes[attr_pos++] = EGL_SAMPLE_BUFFERS;
+                wdata->gles_attributes[attr_pos++] = EGL_DONT_CARE;
+                wdata->gles_attributes[attr_pos] = EGL_NONE;
+
+                /* Request first suitable framebuffer configuration */
+                status =
+                    eglChooseConfig(phdata->egl_display,
+                                    wdata->gles_attributes,
+                                    wdata->gles_configs, 1, &configs);
+
+                if (status != EGL_TRUE) {
+                    SDL_SetError
+                        ("PND: Can't find closest configuration for OpenGL ES");
+                    return NULL;
+                }
+                if (configs != 0) {
+                    break;
+                }
+            }
+            if (configs != 0) {
+                break;
+            }
+        }
+
+        /* No available configs */
+        if (configs == 0) {
+            SDL_SetError("PND: Can't find any configuration for OpenGL ES");
+            return NULL;
+        }
+    }
+
+    /* Initialize config index */
+    wdata->gles_config = 0;
+
+    /* Now check each configuration to find out the best */
+    for (cit = 0; cit < configs; cit++) {
+        uint32_t stencil_found;
+        uint32_t depth_found;
+
+        stencil_found = 0;
+        depth_found = 0;
+
+        if (_this->gl_config.stencil_size) {
+            status =
+                eglGetConfigAttrib(phdata->egl_display,
+                                   wdata->gles_configs[cit], EGL_STENCIL_SIZE,
+                                   &attr_value);
+            if (status == EGL_TRUE) {
+                if (attr_value != 0) {
+                    stencil_found = 1;
+                }
+            }
+        } else {
+            stencil_found = 1;
+        }
+
+        if (_this->gl_config.depth_size) {
+            status =
+                eglGetConfigAttrib(phdata->egl_display,
+                                   wdata->gles_configs[cit], EGL_DEPTH_SIZE,
+                                   &attr_value);
+            if (status == EGL_TRUE) {
+                if (attr_value != 0) {
+                    depth_found = 1;
+                }
+            }
+        } else {
+            depth_found = 1;
+        }
+
+        /* Exit from loop if found appropriate configuration */
+        if ((depth_found != 0) && (stencil_found != 0)) {
+            break;
+        }
+    }
+
+    /* If best could not be found, use first */
+    if (cit == configs) {
+        cit = 0;
+    }
+    wdata->gles_config = cit;
+
+    /* Create OpenGL ES context */
+    wdata->gles_context =
+        eglCreateContext(phdata->egl_display,
+                         wdata->gles_configs[wdata->gles_config], NULL, NULL);
+    if (wdata->gles_context == EGL_NO_CONTEXT) {
+        SDL_SetError("PND: OpenGL ES context creation has been failed");
+        return NULL;
+    }
+
+#ifdef WIZ_GLES_LITE
+    if( !hNativeWnd ) {
+    hNativeWnd = (NativeWindowType)malloc(16*1024);
+
+    if(!hNativeWnd)
+        printf( "Error : Wiz framebuffer allocatation failed\n" );
+    else
+        printf( "SDL13: Wiz framebuffer allocated: %X\n", hNativeWnd );
+    }
+    else {
+    printf( "SDL13: Wiz framebuffer already allocated: %X\n", hNativeWnd );
+    }
+
+    wdata->gles_surface =
+    eglCreateWindowSurface(phdata->egl_display,
+                   wdata->gles_configs[wdata->gles_config],
+                   hNativeWnd, NULL );
+#else
+    wdata->gles_surface =
+        eglCreateWindowSurface(phdata->egl_display,
+                               wdata->gles_configs[wdata->gles_config],
+                               (NativeWindowType) 0, NULL);
+#endif
+
+
+    if (wdata->gles_surface == 0) {
+        SDL_SetError("Error : eglCreateWindowSurface failed;\n");
+        return NULL;
+    }
+
+    /* Make just created context current */
+    status =
+        eglMakeCurrent(phdata->egl_display, wdata->gles_surface,
+                       wdata->gles_surface, wdata->gles_context);
+    if (status != EGL_TRUE) {
+        /* Destroy OpenGL ES surface */
+        eglDestroySurface(phdata->egl_display, wdata->gles_surface);
+        eglDestroyContext(phdata->egl_display, wdata->gles_context);
+        wdata->gles_context = EGL_NO_CONTEXT;
+        SDL_SetError("PND: Can't set OpenGL ES context on creation");
+        return NULL;
+    }
+
+    _this->gl_config.accelerated = 1;
+
+    /* Always clear stereo enable, since OpenGL ES do not supports stereo */
+    _this->gl_config.stereo = 0;
+
+    /* Get back samples and samplebuffers configurations. Rest framebuffer */
+    /* parameters could be obtained through the OpenGL ES API              */
+    status =
+        eglGetConfigAttrib(phdata->egl_display,
+                           wdata->gles_configs[wdata->gles_config],
+                           EGL_SAMPLES, &attr_value);
+    if (status == EGL_TRUE) {
+        _this->gl_config.multisamplesamples = attr_value;
+    }
+    status =
+        eglGetConfigAttrib(phdata->egl_display,
+                           wdata->gles_configs[wdata->gles_config],
+                           EGL_SAMPLE_BUFFERS, &attr_value);
+    if (status == EGL_TRUE) {
+        _this->gl_config.multisamplebuffers = attr_value;
+    }
+
+    /* Get back stencil and depth buffer sizes */
+    status =
+        eglGetConfigAttrib(phdata->egl_display,
+                           wdata->gles_configs[wdata->gles_config],
+                           EGL_DEPTH_SIZE, &attr_value);
+    if (status == EGL_TRUE) {
+        _this->gl_config.depth_size = attr_value;
+    }
+    status =
+        eglGetConfigAttrib(phdata->egl_display,
+                           wdata->gles_configs[wdata->gles_config],
+                           EGL_STENCIL_SIZE, &attr_value);
+    if (status == EGL_TRUE) {
+        _this->gl_config.stencil_size = attr_value;
+    }
+
+    /* Under PND OpenGL ES output can't be double buffered */
+    _this->gl_config.double_buffer = 0;
+
+    /* GL ES context was successfully created */
+    return wdata->gles_context;
+}
+
+int
+PND_gl_makecurrent(_THIS, SDL_Window * window, SDL_GLContext context)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+    SDL_WindowData *wdata;
+    EGLBoolean status;
+
+    if (phdata->egl_initialized != SDL_TRUE) {
+        return SDL_SetError("PND: GF initialization failed, no OpenGL ES support");
+    }
+
+    if ((window == NULL) && (context == NULL)) {
+        status =
+            eglMakeCurrent(phdata->egl_display, EGL_NO_SURFACE,
+                           EGL_NO_SURFACE, EGL_NO_CONTEXT);
+        if (status != EGL_TRUE) {
+            /* Failed to set current GL ES context */
+            return SDL_SetError("PND: Can't set OpenGL ES context");
+        }
+    } else {
+        wdata = (SDL_WindowData *) window->driverdata;
+        if (wdata->gles_surface == EGL_NO_SURFACE) {
+            return SDL_SetError
+                ("PND: OpenGL ES surface is not initialized for this window");
+        }
+        if (wdata->gles_context == EGL_NO_CONTEXT) {
+            return SDL_SetError
+                ("PND: OpenGL ES context is not initialized for this window");
+        }
+        if (wdata->gles_context != context) {
+            return SDL_SetError
+                ("PND: OpenGL ES context is not belong to this window");
+        }
+        status =
+            eglMakeCurrent(phdata->egl_display, wdata->gles_surface,
+                           wdata->gles_surface, wdata->gles_context);
+        if (status != EGL_TRUE) {
+            /* Failed to set current GL ES context */
+            return SDL_SetError("PND: Can't set OpenGL ES context");
+        }
+    }
+    return 0;
+}
+
+int
+PND_gl_setswapinterval(_THIS, int interval)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+    EGLBoolean status;
+
+    if (phdata->egl_initialized != SDL_TRUE) {
+        return SDL_SetError("PND: EGL initialization failed, no OpenGL ES support");
+    }
+
+    /* Check if OpenGL ES connection has been initialized */
+    if (phdata->egl_display != EGL_NO_DISPLAY) {
+        /* Set swap OpenGL ES interval */
+        status = eglSwapInterval(phdata->egl_display, interval);
+        if (status == EGL_TRUE) {
+            /* Return success to upper level */
+            phdata->swapinterval = interval;
+            return 0;
+        }
+    }
+
+    /* Failed to set swap interval */
+    return SDL_SetError("PND: Cannot set swap interval");
+}
+
+int
+PND_gl_getswapinterval(_THIS)
+{
+    return ((SDL_VideoData *) _this->driverdata)->swapinterval;
+}
+
+void
+PND_gl_swapwindow(_THIS, SDL_Window * window)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+    SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *didata =
+        (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+
+
+    if (phdata->egl_initialized != SDL_TRUE) {
+        SDL_SetError("PND: GLES initialization failed, no OpenGL ES support");
+        return;
+    }
+
+    /* Many applications do not uses glFinish(), so we call it for them */
+    glFinish();
+
+    /* Wait until OpenGL ES rendering is completed */
+    eglWaitGL();
+
+    eglSwapBuffers(phdata->egl_display, wdata->gles_surface);
+}
+
+void
+PND_gl_deletecontext(_THIS, SDL_GLContext context)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+    EGLBoolean status;
+
+    if (phdata->egl_initialized != SDL_TRUE) {
+        SDL_SetError("PND: GLES initialization failed, no OpenGL ES support");
+        return;
+    }
+
+    /* Check if OpenGL ES connection has been initialized */
+    if (phdata->egl_display != EGL_NO_DISPLAY) {
+        if (context != EGL_NO_CONTEXT) {
+            status = eglDestroyContext(phdata->egl_display, context);
+            if (status != EGL_TRUE) {
+                /* Error during OpenGL ES context destroying */
+                SDL_SetError("PND: OpenGL ES context destroy error");
+                return;
+            }
+        }
+    }
+
+#ifdef WIZ_GLES_LITE
+    if( hNativeWnd != 0 )
+    {
+      free(hNativeWnd);
+      hNativeWnd = 0;
+      printf( "SDL13: Wiz framebuffer released\n" );
+    }
+#endif
+
+    return;
+}
+
+#endif /* SDL_VIDEO_DRIVER_PANDORA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/pandora/SDL_pandora.h b/Source/3rd Party/sdl/src/video/pandora/SDL_pandora.h
new file mode 100644
index 000000000..802365eed
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/pandora/SDL_pandora.h	
@@ -0,0 +1,101 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __SDL_PANDORA_H__
+#define __SDL_PANDORA_H__
+
+#include <GLES/egl.h>
+
+#include "../../SDL_internal.h"
+#include "../SDL_sysvideo.h"
+
+typedef struct SDL_VideoData
+{
+    SDL_bool egl_initialized;   /* OpenGL ES device initialization status */
+    EGLDisplay egl_display;     /* OpenGL ES display connection           */
+    uint32_t egl_refcount;      /* OpenGL ES reference count              */
+    uint32_t swapinterval;      /* OpenGL ES default swap interval        */
+
+} SDL_VideoData;
+
+
+typedef struct SDL_DisplayData
+{
+
+} SDL_DisplayData;
+
+
+typedef struct SDL_WindowData
+{
+    SDL_bool uses_gles;         /* if true window must support OpenGL ES */
+
+    EGLConfig gles_configs[32];
+    EGLint gles_config;         /* OpenGL ES configuration index      */
+    EGLContext gles_context;    /* OpenGL ES context                  */
+    EGLint gles_attributes[256];        /* OpenGL ES attributes for context   */
+    EGLSurface gles_surface;    /* OpenGL ES target rendering surface */
+
+} SDL_WindowData;
+
+
+/****************************************************************************/
+/* SDL_VideoDevice functions declaration                                    */
+/****************************************************************************/
+
+/* Display and window functions */
+int PND_videoinit(_THIS);
+void PND_videoquit(_THIS);
+void PND_getdisplaymodes(_THIS, SDL_VideoDisplay * display);
+int PND_setdisplaymode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+int PND_createwindow(_THIS, SDL_Window * window);
+int PND_createwindowfrom(_THIS, SDL_Window * window, const void *data);
+void PND_setwindowtitle(_THIS, SDL_Window * window);
+void PND_setwindowicon(_THIS, SDL_Window * window, SDL_Surface * icon);
+void PND_setwindowposition(_THIS, SDL_Window * window);
+void PND_setwindowsize(_THIS, SDL_Window * window);
+void PND_showwindow(_THIS, SDL_Window * window);
+void PND_hidewindow(_THIS, SDL_Window * window);
+void PND_raisewindow(_THIS, SDL_Window * window);
+void PND_maximizewindow(_THIS, SDL_Window * window);
+void PND_minimizewindow(_THIS, SDL_Window * window);
+void PND_restorewindow(_THIS, SDL_Window * window);
+void PND_setwindowgrab(_THIS, SDL_Window * window);
+void PND_destroywindow(_THIS, SDL_Window * window);
+
+/* Window manager function */
+SDL_bool PND_getwindowwminfo(_THIS, SDL_Window * window,
+                             struct SDL_SysWMinfo *info);
+
+/* OpenGL/OpenGL ES functions */
+int PND_gl_loadlibrary(_THIS, const char *path);
+void *PND_gl_getprocaddres(_THIS, const char *proc);
+void PND_gl_unloadlibrary(_THIS);
+SDL_GLContext PND_gl_createcontext(_THIS, SDL_Window * window);
+int PND_gl_makecurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+int PND_gl_setswapinterval(_THIS, int interval);
+int PND_gl_getswapinterval(_THIS);
+void PND_gl_swapwindow(_THIS, SDL_Window * window);
+void PND_gl_deletecontext(_THIS, SDL_GLContext context);
+
+
+#endif /* __SDL_PANDORA_H__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/pandora/SDL_pandora_events.c b/Source/3rd Party/sdl/src/video/pandora/SDL_pandora_events.c
new file mode 100644
index 000000000..eedbc2934
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/pandora/SDL_pandora_events.c	
@@ -0,0 +1,38 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_PANDORA
+
+/* Being a null driver, there's no event stream. We just define stubs for
+   most of the API. */
+
+#include "../../events/SDL_events_c.h"
+
+void
+PND_PumpEvents(_THIS)
+{
+    /* Not implemented. */
+}
+
+#endif /* SDL_VIDEO_DRIVER_PANDORA */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/pandora/SDL_pandora_events.h b/Source/3rd Party/sdl/src/video/pandora/SDL_pandora_events.h
new file mode 100644
index 000000000..e628d14a9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/pandora/SDL_pandora_events.h	
@@ -0,0 +1,25 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+extern void PND_PumpEvents(_THIS);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/psp/SDL_pspevents.c b/Source/3rd Party/sdl/src/video/psp/SDL_pspevents.c
new file mode 100644
index 000000000..d096c0616
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/psp/SDL_pspevents.c	
@@ -0,0 +1,284 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* Being a null driver, there's no event stream. We just define stubs for
+   most of the API. */
+
+#include "SDL.h"
+#include "../../events/SDL_sysevents.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "SDL_pspvideo.h"
+#include "SDL_pspevents_c.h"
+#include "SDL_thread.h"
+#include "SDL_keyboard.h"
+#include <psphprm.h>
+
+#ifdef PSPIRKEYB
+#include <pspirkeyb.h>
+#include <pspirkeyb_rawkeys.h>
+
+#define IRKBD_CONFIG_FILE     NULL    /* this will take ms0:/seplugins/pspirkeyb.ini */
+
+static int irkbd_ready = 0;
+static SDLKey keymap[256];
+#endif
+
+static enum PspHprmKeys hprm = 0;
+static SDL_sem *event_sem = NULL;
+static SDL_Thread *thread = NULL;
+static int running = 0;
+static struct {
+    enum PspHprmKeys id;
+    SDL_Keycode sym;
+} keymap_psp[] = {
+    { PSP_HPRM_PLAYPAUSE, SDLK_F10 },
+    { PSP_HPRM_FORWARD,   SDLK_F11 },
+    { PSP_HPRM_BACK,      SDLK_F12 },
+    { PSP_HPRM_VOL_UP,    SDLK_F13 },
+    { PSP_HPRM_VOL_DOWN,  SDLK_F14 },
+    { PSP_HPRM_HOLD,      SDLK_F15 }
+};
+
+int EventUpdate(void *data)
+{
+    while (running) {
+                SDL_SemWait(event_sem);
+                                sceHprmPeekCurrentKey(&hprm);
+                SDL_SemPost(event_sem);
+                /* Delay 1/60th of a second */
+                sceKernelDelayThread(1000000 / 60);
+        }
+        return 0;
+}
+
+void PSP_PumpEvents(_THIS)
+{
+    int i;
+    enum PspHprmKeys keys;
+    enum PspHprmKeys changed;
+    static enum PspHprmKeys old_keys = 0;
+    SDL_Keysym sym;
+
+    SDL_SemWait(event_sem);
+    keys = hprm;
+    SDL_SemPost(event_sem);
+
+    /* HPRM Keyboard */
+    changed = old_keys ^ keys;
+    old_keys = keys;
+    if(changed) {
+        for(i=0; i<sizeof(keymap_psp)/sizeof(keymap_psp[0]); i++) {
+            if(changed & keymap_psp[i].id) {
+                sym.scancode = keymap_psp[i].id;
+                sym.sym = keymap_psp[i].sym;
+
+                /* out of date
+                SDL_PrivateKeyboard((keys & keymap_psp[i].id) ?
+                            SDL_PRESSED : SDL_RELEASED,
+                            &sym);
+        */
+                SDL_SendKeyboardKey((keys & keymap_psp[i].id) ?
+                                    SDL_PRESSED : SDL_RELEASED, SDL_GetScancodeFromKey(keymap_psp[i].sym));
+            }
+        }
+    }
+
+#ifdef PSPIRKEYB
+    if (irkbd_ready) {
+            unsigned char buffer[255];
+        int i, length, count;
+        SIrKeybScanCodeData *scanData;
+
+            if(pspIrKeybReadinput(buffer, &length) >= 0) {
+                if((length % sizeof(SIrKeybScanCodeData)) == 0){
+                    count = length / sizeof(SIrKeybScanCodeData);
+                    for( i=0; i < count; i++ ) {
+                unsigned char raw, pressed;
+                        scanData=(SIrKeybScanCodeData*) buffer+i;
+                        raw = scanData->raw;
+                        pressed = scanData->pressed;
+                sym.scancode = raw;
+                sym.sym = keymap[raw];
+                /* not tested */
+                /* SDL_PrivateKeyboard(pressed?SDL_PRESSED:SDL_RELEASED, &sym); */
+                SDL_SendKeyboardKey((keys & keymap_psp[i].id) ?
+                                    SDL_PRESSED : SDL_RELEASED, SDL_GetScancodeFromKey(keymap[raw]);
+
+                }
+            }
+        }
+    }
+#endif
+    sceKernelDelayThread(0);
+
+    return;
+}
+
+void PSP_InitOSKeymap(_THIS)
+{
+#ifdef PSPIRKEYB
+    int i;
+    for (i=0; i<SDL_TABLESIZE(keymap); ++i)
+        keymap[i] = SDLK_UNKNOWN;
+
+    keymap[KEY_ESC] = SDLK_ESCAPE;
+
+    keymap[KEY_F1] = SDLK_F1;
+    keymap[KEY_F2] = SDLK_F2;
+    keymap[KEY_F3] = SDLK_F3;
+    keymap[KEY_F4] = SDLK_F4;
+    keymap[KEY_F5] = SDLK_F5;
+    keymap[KEY_F6] = SDLK_F6;
+    keymap[KEY_F7] = SDLK_F7;
+    keymap[KEY_F8] = SDLK_F8;
+    keymap[KEY_F9] = SDLK_F9;
+    keymap[KEY_F10] = SDLK_F10;
+    keymap[KEY_F11] = SDLK_F11;
+    keymap[KEY_F12] = SDLK_F12;
+    keymap[KEY_F13] = SDLK_PRINT;
+    keymap[KEY_F14] = SDLK_PAUSE;
+
+    keymap[KEY_GRAVE] = SDLK_BACKQUOTE;
+    keymap[KEY_1] = SDLK_1;
+    keymap[KEY_2] = SDLK_2;
+    keymap[KEY_3] = SDLK_3;
+    keymap[KEY_4] = SDLK_4;
+    keymap[KEY_5] = SDLK_5;
+    keymap[KEY_6] = SDLK_6;
+    keymap[KEY_7] = SDLK_7;
+    keymap[KEY_8] = SDLK_8;
+    keymap[KEY_9] = SDLK_9;
+    keymap[KEY_0] = SDLK_0;
+    keymap[KEY_MINUS] = SDLK_MINUS;
+    keymap[KEY_EQUAL] = SDLK_EQUALS;
+    keymap[KEY_BACKSPACE] = SDLK_BACKSPACE;
+
+    keymap[KEY_TAB] = SDLK_TAB;
+    keymap[KEY_Q] = SDLK_q;
+    keymap[KEY_W] = SDLK_w;
+    keymap[KEY_E] = SDLK_e;
+    keymap[KEY_R] = SDLK_r;
+    keymap[KEY_T] = SDLK_t;
+    keymap[KEY_Y] = SDLK_y;
+    keymap[KEY_U] = SDLK_u;
+    keymap[KEY_I] = SDLK_i;
+    keymap[KEY_O] = SDLK_o;
+    keymap[KEY_P] = SDLK_p;
+    keymap[KEY_LEFTBRACE] = SDLK_LEFTBRACKET;
+    keymap[KEY_RIGHTBRACE] = SDLK_RIGHTBRACKET;
+    keymap[KEY_ENTER] = SDLK_RETURN;
+
+    keymap[KEY_CAPSLOCK] = SDLK_CAPSLOCK;
+    keymap[KEY_A] = SDLK_a;
+    keymap[KEY_S] = SDLK_s;
+    keymap[KEY_D] = SDLK_d;
+    keymap[KEY_F] = SDLK_f;
+    keymap[KEY_G] = SDLK_g;
+    keymap[KEY_H] = SDLK_h;
+    keymap[KEY_J] = SDLK_j;
+    keymap[KEY_K] = SDLK_k;
+    keymap[KEY_L] = SDLK_l;
+    keymap[KEY_SEMICOLON] = SDLK_SEMICOLON;
+    keymap[KEY_APOSTROPHE] = SDLK_QUOTE;
+    keymap[KEY_BACKSLASH] = SDLK_BACKSLASH;
+
+    keymap[KEY_Z] = SDLK_z;
+    keymap[KEY_X] = SDLK_x;
+    keymap[KEY_C] = SDLK_c;
+    keymap[KEY_V] = SDLK_v;
+    keymap[KEY_B] = SDLK_b;
+    keymap[KEY_N] = SDLK_n;
+    keymap[KEY_M] = SDLK_m;
+    keymap[KEY_COMMA] = SDLK_COMMA;
+    keymap[KEY_DOT] = SDLK_PERIOD;
+    keymap[KEY_SLASH] = SDLK_SLASH;
+
+    keymap[KEY_SPACE] = SDLK_SPACE;
+
+    keymap[KEY_UP] = SDLK_UP;
+    keymap[KEY_DOWN] = SDLK_DOWN;
+    keymap[KEY_LEFT] = SDLK_LEFT;
+    keymap[KEY_RIGHT] = SDLK_RIGHT;
+
+    keymap[KEY_HOME] = SDLK_HOME;
+    keymap[KEY_END] = SDLK_END;
+    keymap[KEY_INSERT] = SDLK_INSERT;
+    keymap[KEY_DELETE] = SDLK_DELETE;
+
+    keymap[KEY_NUMLOCK] = SDLK_NUMLOCK;
+    keymap[KEY_LEFTMETA] = SDLK_LSUPER;
+
+    keymap[KEY_KPSLASH] = SDLK_KP_DIVIDE;
+    keymap[KEY_KPASTERISK] = SDLK_KP_MULTIPLY;
+    keymap[KEY_KPMINUS] = SDLK_KP_MINUS;
+    keymap[KEY_KPPLUS] = SDLK_KP_PLUS;
+    keymap[KEY_KPDOT] = SDLK_KP_PERIOD;
+    keymap[KEY_KPEQUAL] = SDLK_KP_EQUALS;
+
+    keymap[KEY_LEFTCTRL] = SDLK_LCTRL;
+    keymap[KEY_RIGHTCTRL] = SDLK_RCTRL;
+    keymap[KEY_LEFTALT] = SDLK_LALT;
+    keymap[KEY_RIGHTALT] = SDLK_RALT;
+    keymap[KEY_LEFTSHIFT] = SDLK_LSHIFT;
+    keymap[KEY_RIGHTSHIFT] = SDLK_RSHIFT;
+#endif
+}
+
+void PSP_EventInit(_THIS)
+{
+#ifdef PSPIRKEYB
+    int outputmode = PSP_IRKBD_OUTPUT_MODE_SCANCODE;
+    int ret = pspIrKeybInit(IRKBD_CONFIG_FILE, 0);
+    if (ret == PSP_IRKBD_RESULT_OK) {
+            pspIrKeybOutputMode(outputmode);
+        irkbd_ready = 1;
+    } else {
+        irkbd_ready = 0;
+    }
+#endif
+    /* Start thread to read data */
+    if((event_sem =  SDL_CreateSemaphore(1)) == NULL) {
+        SDL_SetError("Can't create input semaphore\n");
+        return;
+    }
+    running = 1;
+    if((thread = SDL_CreateThread(EventUpdate, "PSPInputThread",NULL)) == NULL) {
+        SDL_SetError("Can't create input thread\n");
+        return;
+    }
+}
+
+void PSP_EventQuit(_THIS)
+{
+    running = 0;
+    SDL_WaitThread(thread, NULL);
+    SDL_DestroySemaphore(event_sem);
+#ifdef PSPIRKEYB
+    if (irkbd_ready) {
+            pspIrKeybFinish();
+        irkbd_ready = 0;
+    }
+#endif
+}
+
+/* end of SDL_pspevents.c ... */
+
diff --git a/Source/3rd Party/sdl/src/video/psp/SDL_pspevents_c.h b/Source/3rd Party/sdl/src/video/psp/SDL_pspevents_c.h
new file mode 100644
index 000000000..af45c4d16
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/psp/SDL_pspevents_c.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_pspvideo.h"
+
+/* Variables and functions exported by SDL_sysevents.c to other parts
+   of the native video subsystem (SDL_sysvideo.c)
+*/
+extern void PSP_InitOSKeymap(_THIS);
+extern void PSP_PumpEvents(_THIS);
+
+/* end of SDL_pspevents_c.h ... */
+
diff --git a/Source/3rd Party/sdl/src/video/psp/SDL_pspgl.c b/Source/3rd Party/sdl/src/video/psp/SDL_pspgl.c
new file mode 100644
index 000000000..d24e72292
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/psp/SDL_pspgl.c	
@@ -0,0 +1,205 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "SDL_error.h"
+#include "SDL_pspvideo.h"
+#include "SDL_pspgl_c.h"
+
+/*****************************************************************************/
+/* SDL OpenGL/OpenGL ES functions                                            */
+/*****************************************************************************/
+#define EGLCHK(stmt)                            \
+    do {                                        \
+        EGLint err;                             \
+                                                \
+        stmt;                                   \
+        err = eglGetError();                    \
+        if (err != EGL_SUCCESS) {               \
+            SDL_SetError("EGL error %d", err);  \
+            return 0;                           \
+        }                                       \
+    } while (0)
+
+int
+PSP_GL_LoadLibrary(_THIS, const char *path)
+{
+  if (!_this->gl_config.driver_loaded) {
+        _this->gl_config.driver_loaded = 1;
+  }
+
+  return 0;
+}
+
+/* pspgl doesn't provide this call, so stub it out since SDL requires it.
+#define GLSTUB(func,params) void func params {}
+
+GLSTUB(glOrtho,(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top,
+                    GLdouble zNear, GLdouble zFar))
+*/
+void *
+PSP_GL_GetProcAddress(_THIS, const char *proc)
+{
+        return eglGetProcAddress(proc);
+}
+
+void
+PSP_GL_UnloadLibrary(_THIS)
+{
+        eglTerminate(_this->gl_data->display);
+}
+
+static EGLint width = 480;
+static EGLint height = 272;
+
+SDL_GLContext
+PSP_GL_CreateContext(_THIS, SDL_Window * window)
+{
+
+    SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
+
+        EGLint attribs[32];
+        EGLDisplay display;
+        EGLContext context;
+        EGLSurface surface;
+        EGLConfig config;
+        EGLint num_configs;
+        int i;
+
+
+    /* EGL init taken from glutCreateWindow() in PSPGL's glut.c. */
+        EGLCHK(display = eglGetDisplay(0));
+        EGLCHK(eglInitialize(display, NULL, NULL));
+    wdata->uses_gles = SDL_TRUE;
+        window->flags |= SDL_WINDOW_FULLSCREEN;
+
+        /* Setup the config based on SDL's current values. */
+        i = 0;
+        attribs[i++] = EGL_RED_SIZE;
+        attribs[i++] = _this->gl_config.red_size;
+        attribs[i++] = EGL_GREEN_SIZE;
+        attribs[i++] = _this->gl_config.green_size;
+        attribs[i++] = EGL_BLUE_SIZE;
+        attribs[i++] = _this->gl_config.blue_size;
+        attribs[i++] = EGL_DEPTH_SIZE;
+        attribs[i++] = _this->gl_config.depth_size;
+
+        if (_this->gl_config.alpha_size)
+        {
+            attribs[i++] = EGL_ALPHA_SIZE;
+            attribs[i++] = _this->gl_config.alpha_size;
+        }
+        if (_this->gl_config.stencil_size)
+        {
+            attribs[i++] = EGL_STENCIL_SIZE;
+            attribs[i++] = _this->gl_config.stencil_size;
+        }
+
+        attribs[i++] = EGL_NONE;
+
+        EGLCHK(eglChooseConfig(display, attribs, &config, 1, &num_configs));
+
+        if (num_configs == 0)
+        {
+            SDL_SetError("No valid EGL configs for requested mode");
+            return 0;
+        }
+
+        EGLCHK(eglGetConfigAttrib(display, config, EGL_WIDTH, &width));
+        EGLCHK(eglGetConfigAttrib(display, config, EGL_HEIGHT, &height));
+
+        EGLCHK(context = eglCreateContext(display, config, NULL, NULL));
+        EGLCHK(surface = eglCreateWindowSurface(display, config, 0, NULL));
+        EGLCHK(eglMakeCurrent(display, surface, surface, context));
+
+        _this->gl_data->display = display;
+        _this->gl_data->context = context;
+        _this->gl_data->surface = surface;
+
+
+    return context;
+}
+
+int
+PSP_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
+{
+        if (!eglMakeCurrent(_this->gl_data->display, _this->gl_data->surface,
+                          _this->gl_data->surface, _this->gl_data->context))
+        {
+            return SDL_SetError("Unable to make EGL context current");
+        }
+    return 0;
+}
+
+int
+PSP_GL_SetSwapInterval(_THIS, int interval)
+{
+    EGLBoolean status;
+    status = eglSwapInterval(_this->gl_data->display, interval);
+    if (status == EGL_TRUE) {
+        /* Return success to upper level */
+        _this->gl_data->swapinterval = interval;
+        return 0;
+    }
+    /* Failed to set swap interval */
+    return SDL_SetError("Unable to set the EGL swap interval");
+}
+
+int
+PSP_GL_GetSwapInterval(_THIS)
+{
+    return _this->gl_data->swapinterval;
+}
+
+void
+PSP_GL_SwapWindow(_THIS, SDL_Window * window)
+{
+    eglSwapBuffers(_this->gl_data->display, _this->gl_data->surface);
+}
+
+void
+PSP_GL_DeleteContext(_THIS, SDL_GLContext context)
+{
+    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
+    EGLBoolean status;
+
+    if (phdata->egl_initialized != SDL_TRUE) {
+        SDL_SetError("PSP: GLES initialization failed, no OpenGL ES support");
+        return;
+    }
+
+    /* Check if OpenGL ES connection has been initialized */
+    if (_this->gl_data->display != EGL_NO_DISPLAY) {
+        if (context != EGL_NO_CONTEXT) {
+            status = eglDestroyContext(_this->gl_data->display, context);
+            if (status != EGL_TRUE) {
+                /* Error during OpenGL ES context destroying */
+                SDL_SetError("PSP: OpenGL ES context destroy error");
+                return;
+            }
+        }
+    }
+
+    return;
+}
+
diff --git a/Source/3rd Party/sdl/src/video/psp/SDL_pspgl_c.h b/Source/3rd Party/sdl/src/video/psp/SDL_pspgl_c.h
new file mode 100644
index 000000000..c0c15d955
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/psp/SDL_pspgl_c.h	
@@ -0,0 +1,52 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_pspgl_c_h
+#define _SDL_pspgl_c_h
+
+
+#include <GLES/egl.h>
+#include <GLES/gl.h>
+
+#include "SDL_pspvideo.h"
+
+
+typedef struct SDL_GLDriverData {
+        EGLDisplay display;
+        EGLContext context;
+        EGLSurface surface;
+    uint32_t swapinterval;
+}SDL_GLDriverData;
+
+extern void * PSP_GL_GetProcAddress(_THIS, const char *proc);
+extern int PSP_GL_MakeCurrent(_THIS,SDL_Window * window, SDL_GLContext context);
+extern void PSP_GL_SwapBuffers(_THIS);
+
+extern void PSP_GL_SwapWindow(_THIS, SDL_Window * window);
+extern SDL_GLContext PSP_GL_CreateContext(_THIS, SDL_Window * window);
+
+extern int PSP_GL_LoadLibrary(_THIS, const char *path);
+extern void PSP_GL_UnloadLibrary(_THIS);
+extern int PSP_GL_SetSwapInterval(_THIS, int interval);
+extern int PSP_GL_GetSwapInterval(_THIS);
+
+
+#endif /* _SDL_pspgl_c_h */
diff --git a/Source/3rd Party/sdl/src/video/psp/SDL_pspmouse.c b/Source/3rd Party/sdl/src/video/psp/SDL_pspmouse.c
new file mode 100644
index 000000000..8df3d614e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/psp/SDL_pspmouse.c	
@@ -0,0 +1,35 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+#include <stdio.h>
+
+#include "SDL_error.h"
+#include "SDL_mouse.h"
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_pspmouse_c.h"
+
+
+/* The implementation dependent data for the window manager cursor */
+struct WMcursor {
+    int unused;
+};
diff --git a/Source/3rd Party/sdl/src/video/psp/SDL_pspmouse_c.h b/Source/3rd Party/sdl/src/video/psp/SDL_pspmouse_c.h
new file mode 100644
index 000000000..d14b84b9a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/psp/SDL_pspmouse_c.h	
@@ -0,0 +1,24 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "SDL_pspvideo.h"
+
+/* Functions to be exported */
diff --git a/Source/3rd Party/sdl/src/video/psp/SDL_pspvideo.c b/Source/3rd Party/sdl/src/video/psp/SDL_pspvideo.c
new file mode 100644
index 000000000..b3787239c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/psp/SDL_pspvideo.c	
@@ -0,0 +1,328 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_PSP
+
+/* SDL internals */
+#include "../SDL_sysvideo.h"
+#include "SDL_version.h"
+#include "SDL_syswm.h"
+#include "SDL_loadso.h"
+#include "SDL_events.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_keyboard_c.h"
+
+
+
+/* PSP declarations */
+#include "SDL_pspvideo.h"
+#include "SDL_pspevents_c.h"
+#include "SDL_pspgl_c.h"
+
+/* unused
+static SDL_bool PSP_initialized = SDL_FALSE;
+*/
+static int
+PSP_Available(void)
+{
+    return 1;
+}
+
+static void
+PSP_Destroy(SDL_VideoDevice * device)
+{
+/*    SDL_VideoData *phdata = (SDL_VideoData *) device->driverdata; */
+
+    if (device->driverdata != NULL) {
+        device->driverdata = NULL;
+    }
+}
+
+static SDL_VideoDevice *
+PSP_Create()
+{
+    SDL_VideoDevice *device;
+    SDL_VideoData *phdata;
+    SDL_GLDriverData *gldata;
+    int status;
+
+    /* Check if pandora could be initialized */
+    status = PSP_Available();
+    if (status == 0) {
+        /* PSP could not be used */
+        return NULL;
+    }
+
+    /* Initialize SDL_VideoDevice structure */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (device == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    /* Initialize internal Pandora specific data */
+    phdata = (SDL_VideoData *) SDL_calloc(1, sizeof(SDL_VideoData));
+    if (phdata == NULL) {
+        SDL_OutOfMemory();
+        SDL_free(device);
+        return NULL;
+    }
+
+        gldata = (SDL_GLDriverData *) SDL_calloc(1, sizeof(SDL_GLDriverData));
+    if (gldata == NULL) {
+        SDL_OutOfMemory();
+        SDL_free(device);
+        return NULL;
+    }
+    device->gl_data = gldata;
+
+    device->driverdata = phdata;
+
+    phdata->egl_initialized = SDL_TRUE;
+
+
+    /* Setup amount of available displays and current display */
+    device->num_displays = 0;
+
+    /* Set device free function */
+    device->free = PSP_Destroy;
+
+    /* Setup all functions which we can handle */
+    device->VideoInit = PSP_VideoInit;
+    device->VideoQuit = PSP_VideoQuit;
+    device->GetDisplayModes = PSP_GetDisplayModes;
+    device->SetDisplayMode = PSP_SetDisplayMode;
+    device->CreateWindow = PSP_CreateWindow;
+    device->CreateWindowFrom = PSP_CreateWindowFrom;
+    device->SetWindowTitle = PSP_SetWindowTitle;
+    device->SetWindowIcon = PSP_SetWindowIcon;
+    device->SetWindowPosition = PSP_SetWindowPosition;
+    device->SetWindowSize = PSP_SetWindowSize;
+    device->ShowWindow = PSP_ShowWindow;
+    device->HideWindow = PSP_HideWindow;
+    device->RaiseWindow = PSP_RaiseWindow;
+    device->MaximizeWindow = PSP_MaximizeWindow;
+    device->MinimizeWindow = PSP_MinimizeWindow;
+    device->RestoreWindow = PSP_RestoreWindow;
+    device->SetWindowGrab = PSP_SetWindowGrab;
+    device->DestroyWindow = PSP_DestroyWindow;
+    device->GetWindowWMInfo = PSP_GetWindowWMInfo;
+    device->GL_LoadLibrary = PSP_GL_LoadLibrary;
+    device->GL_GetProcAddress = PSP_GL_GetProcAddress;
+    device->GL_UnloadLibrary = PSP_GL_UnloadLibrary;
+    device->GL_CreateContext = PSP_GL_CreateContext;
+    device->GL_MakeCurrent = PSP_GL_MakeCurrent;
+    device->GL_SetSwapInterval = PSP_GL_SetSwapInterval;
+    device->GL_GetSwapInterval = PSP_GL_GetSwapInterval;
+    device->GL_SwapWindow = PSP_GL_SwapWindow;
+    device->GL_DeleteContext = PSP_GL_DeleteContext;
+    device->HasScreenKeyboardSupport = PSP_HasScreenKeyboardSupport;
+    device->ShowScreenKeyboard = PSP_ShowScreenKeyboard;
+    device->HideScreenKeyboard = PSP_HideScreenKeyboard;
+    device->IsScreenKeyboardShown = PSP_IsScreenKeyboardShown;
+
+    device->PumpEvents = PSP_PumpEvents;
+
+    return device;
+}
+
+VideoBootStrap PSP_bootstrap = {
+    "PSP",
+    "PSP Video Driver",
+    PSP_Available,
+    PSP_Create
+};
+
+/*****************************************************************************/
+/* SDL Video and Display initialization/handling functions                   */
+/*****************************************************************************/
+int
+PSP_VideoInit(_THIS)
+{
+    SDL_VideoDisplay display;
+    SDL_DisplayMode current_mode;
+
+    SDL_zero(current_mode);
+
+    current_mode.w = 480;
+    current_mode.h = 272;
+
+    current_mode.refresh_rate = 60;
+    /* 32 bpp for default */
+    current_mode.format = SDL_PIXELFORMAT_ABGR8888;
+
+    current_mode.driverdata = NULL;
+
+    SDL_zero(display);
+    display.desktop_mode = current_mode;
+    display.current_mode = current_mode;
+    display.driverdata = NULL;
+
+    SDL_AddVideoDisplay(&display);
+
+    return 1;
+}
+
+void
+PSP_VideoQuit(_THIS)
+{
+
+}
+
+void
+PSP_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
+{
+
+}
+
+int
+PSP_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+    return 0;
+}
+#define EGLCHK(stmt)                            \
+    do {                                        \
+        EGLint err;                             \
+                                                \
+        stmt;                                   \
+        err = eglGetError();                    \
+        if (err != EGL_SUCCESS) {               \
+            SDL_SetError("EGL error %d", err);  \
+            return 0;                           \
+        }                                       \
+    } while (0)
+
+int
+PSP_CreateWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *wdata;
+
+    /* Allocate window internal data */
+    wdata = (SDL_WindowData *) SDL_calloc(1, sizeof(SDL_WindowData));
+    if (wdata == NULL) {
+        return SDL_OutOfMemory();
+    }
+
+    /* Setup driver data for this window */
+    window->driverdata = wdata;
+
+
+    /* Window has been successfully created */
+    return 0;
+}
+
+int
+PSP_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
+{
+    return -1;
+}
+
+void
+PSP_SetWindowTitle(_THIS, SDL_Window * window)
+{
+}
+void
+PSP_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
+{
+}
+void
+PSP_SetWindowPosition(_THIS, SDL_Window * window)
+{
+}
+void
+PSP_SetWindowSize(_THIS, SDL_Window * window)
+{
+}
+void
+PSP_ShowWindow(_THIS, SDL_Window * window)
+{
+}
+void
+PSP_HideWindow(_THIS, SDL_Window * window)
+{
+}
+void
+PSP_RaiseWindow(_THIS, SDL_Window * window)
+{
+}
+void
+PSP_MaximizeWindow(_THIS, SDL_Window * window)
+{
+}
+void
+PSP_MinimizeWindow(_THIS, SDL_Window * window)
+{
+}
+void
+PSP_RestoreWindow(_THIS, SDL_Window * window)
+{
+}
+void
+PSP_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
+{
+
+}
+void
+PSP_DestroyWindow(_THIS, SDL_Window * window)
+{
+}
+
+/*****************************************************************************/
+/* SDL Window Manager function                                               */
+/*****************************************************************************/
+SDL_bool
+PSP_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
+{
+    if (info->version.major <= SDL_MAJOR_VERSION) {
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+
+    /* Failed to get window manager information */
+    return SDL_FALSE;
+}
+
+
+/* TO Write Me */
+SDL_bool PSP_HasScreenKeyboardSupport(_THIS)
+{
+    return SDL_FALSE;
+}
+void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window)
+{
+}
+void PSP_HideScreenKeyboard(_THIS, SDL_Window *window)
+{
+}
+SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window)
+{
+    return SDL_FALSE;
+}
+
+
+#endif /* SDL_VIDEO_DRIVER_PSP */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/psp/SDL_pspvideo.h b/Source/3rd Party/sdl/src/video/psp/SDL_pspvideo.h
new file mode 100644
index 000000000..2e1bb241b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/psp/SDL_pspvideo.h	
@@ -0,0 +1,102 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __SDL_PANDORA_H__
+#define __SDL_PANDORA_H__
+
+#include <GLES/egl.h>
+
+#include "../../SDL_internal.h"
+#include "../SDL_sysvideo.h"
+
+typedef struct SDL_VideoData
+{
+    SDL_bool egl_initialized;   /* OpenGL ES device initialization status */
+    uint32_t egl_refcount;      /* OpenGL ES reference count              */
+
+
+
+} SDL_VideoData;
+
+
+typedef struct SDL_DisplayData
+{
+
+} SDL_DisplayData;
+
+
+typedef struct SDL_WindowData
+{
+    SDL_bool uses_gles;         /* if true window must support OpenGL ES */
+
+} SDL_WindowData;
+
+
+
+
+/****************************************************************************/
+/* SDL_VideoDevice functions declaration                                    */
+/****************************************************************************/
+
+/* Display and window functions */
+int PSP_VideoInit(_THIS);
+void PSP_VideoQuit(_THIS);
+void PSP_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
+int PSP_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+int PSP_CreateWindow(_THIS, SDL_Window * window);
+int PSP_CreateWindowFrom(_THIS, SDL_Window * window, const void *data);
+void PSP_SetWindowTitle(_THIS, SDL_Window * window);
+void PSP_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
+void PSP_SetWindowPosition(_THIS, SDL_Window * window);
+void PSP_SetWindowSize(_THIS, SDL_Window * window);
+void PSP_ShowWindow(_THIS, SDL_Window * window);
+void PSP_HideWindow(_THIS, SDL_Window * window);
+void PSP_RaiseWindow(_THIS, SDL_Window * window);
+void PSP_MaximizeWindow(_THIS, SDL_Window * window);
+void PSP_MinimizeWindow(_THIS, SDL_Window * window);
+void PSP_RestoreWindow(_THIS, SDL_Window * window);
+void PSP_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
+void PSP_DestroyWindow(_THIS, SDL_Window * window);
+
+/* Window manager function */
+SDL_bool PSP_GetWindowWMInfo(_THIS, SDL_Window * window,
+                             struct SDL_SysWMinfo *info);
+
+/* OpenGL/OpenGL ES functions */
+int PSP_GL_LoadLibrary(_THIS, const char *path);
+void *PSP_GL_GetProcAddress(_THIS, const char *proc);
+void PSP_GL_UnloadLibrary(_THIS);
+SDL_GLContext PSP_GL_CreateContext(_THIS, SDL_Window * window);
+int PSP_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+int PSP_GL_SetSwapInterval(_THIS, int interval);
+int PSP_GL_GetSwapInterval(_THIS);
+void PSP_GL_SwapWindow(_THIS, SDL_Window * window);
+void PSP_GL_DeleteContext(_THIS, SDL_GLContext context);
+
+/* PSP on screen keyboard */
+SDL_bool PSP_HasScreenKeyboardSupport(_THIS);
+void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window);
+void PSP_HideScreenKeyboard(_THIS, SDL_Window *window);
+SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window);
+
+#endif /* __SDL_PANDORA_H__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/raspberry/SDL_rpievents.c b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpievents.c
new file mode 100644
index 000000000..cdfc746a7
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpievents.c	
@@ -0,0 +1,45 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_RPI
+
+#include "../../events/SDL_sysevents.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "SDL_rpivideo.h"
+#include "SDL_rpievents_c.h"
+
+#ifdef SDL_INPUT_LINUXEV
+#include "../../core/linux/SDL_evdev.h"
+#endif
+
+void RPI_PumpEvents(_THIS)
+{
+#ifdef SDL_INPUT_LINUXEV
+    SDL_EVDEV_Poll();
+#endif
+    
+}
+
+#endif /* SDL_VIDEO_DRIVER_RPI */
+
diff --git a/Source/3rd Party/sdl/src/video/raspberry/SDL_rpievents_c.h b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpievents_c.h
new file mode 100644
index 000000000..e69c5917f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpievents_c.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_rpievents_c_h
+#define _SDL_rpievents_c_h
+
+#include "SDL_rpivideo.h"
+
+void RPI_PumpEvents(_THIS);
+void RPI_EventInit(_THIS);
+void RPI_EventQuit(_THIS);
+
+#endif /* _SDL_rpievents_c_h */
diff --git a/Source/3rd Party/sdl/src/video/raspberry/SDL_rpimouse.c b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpimouse.c
new file mode 100644
index 000000000..718fef81b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpimouse.c	
@@ -0,0 +1,277 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_RPI
+
+#include "SDL_assert.h"
+#include "SDL_surface.h"
+
+#include "SDL_rpivideo.h"
+#include "SDL_rpimouse.h"
+
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/default_cursor.h"
+
+/* Copied from vc_vchi_dispmanx.h which is bugged and tries to include a non existing file */
+/* Attributes changes flag mask */
+#define ELEMENT_CHANGE_LAYER          (1<<0)
+#define ELEMENT_CHANGE_OPACITY        (1<<1)
+#define ELEMENT_CHANGE_DEST_RECT      (1<<2)
+#define ELEMENT_CHANGE_SRC_RECT       (1<<3)
+#define ELEMENT_CHANGE_MASK_RESOURCE  (1<<4)
+#define ELEMENT_CHANGE_TRANSFORM      (1<<5)
+/* End copied from vc_vchi_dispmanx.h */
+
+static SDL_Cursor *RPI_CreateDefaultCursor(void);
+static SDL_Cursor *RPI_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y);
+static int RPI_ShowCursor(SDL_Cursor * cursor);
+static void RPI_MoveCursor(SDL_Cursor * cursor);
+static void RPI_FreeCursor(SDL_Cursor * cursor);
+static void RPI_WarpMouse(SDL_Window * window, int x, int y);
+
+static SDL_Cursor *
+RPI_CreateDefaultCursor(void)
+{
+    return SDL_CreateCursor(default_cdata, default_cmask, DEFAULT_CWIDTH, DEFAULT_CHEIGHT, DEFAULT_CHOTX, DEFAULT_CHOTY);
+}
+
+/* Create a cursor from a surface */
+static SDL_Cursor *
+RPI_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
+{
+    RPI_CursorData *curdata;
+    SDL_Cursor *cursor;
+    int ret;
+    VC_RECT_T dst_rect;
+    Uint32 dummy;
+        
+    SDL_assert(surface->format->format == SDL_PIXELFORMAT_ARGB8888);
+    SDL_assert(surface->pitch == surface->w * 4);
+    
+    cursor = (SDL_Cursor *) SDL_calloc(1, sizeof(*cursor));
+    curdata = (RPI_CursorData *) SDL_calloc(1, sizeof(*curdata));
+
+    curdata->hot_x = hot_x;
+    curdata->hot_y = hot_y;
+    curdata->w = surface->w;
+    curdata->h = surface->h;
+    
+    /* This usage is inspired by Wayland/Weston RPI code, how they figured this out is anyone's guess */
+    curdata->resource = vc_dispmanx_resource_create( VC_IMAGE_ARGB8888, surface->w | (surface->pitch << 16), surface->h | (surface->h << 16), &dummy );
+    SDL_assert(curdata->resource);
+    vc_dispmanx_rect_set( &dst_rect, 0, 0, curdata->w, curdata->h);
+    /* A note from Weston: 
+     * vc_dispmanx_resource_write_data() ignores ifmt,
+     * rect.x, rect.width, and uses stride only for computing
+     * the size of the transfer as rect.height * stride.
+     * Therefore we can only write rows starting at x=0.
+     */
+    ret = vc_dispmanx_resource_write_data( curdata->resource, VC_IMAGE_ARGB8888, surface->pitch, surface->pixels, &dst_rect );
+    SDL_assert ( ret == DISPMANX_SUCCESS );
+    
+    cursor->driverdata = curdata;
+    
+    return cursor;
+
+}
+
+/* Show the specified cursor, or hide if cursor is NULL */
+static int
+RPI_ShowCursor(SDL_Cursor * cursor)
+{
+    int ret;
+    DISPMANX_UPDATE_HANDLE_T update;
+    RPI_CursorData *curdata;
+    VC_RECT_T src_rect, dst_rect;
+    SDL_Mouse *mouse;
+    SDL_VideoDisplay *display;
+    SDL_DisplayData *data;
+    VC_DISPMANX_ALPHA_T alpha = {  DISPMANX_FLAGS_ALPHA_FROM_SOURCE /* flags */ , 255 /*opacity 0->255*/,  0 /* mask */ };
+    
+    mouse = SDL_GetMouse();
+    if (mouse == NULL) {
+        return -1;
+    }
+    
+    if (cursor == NULL) {
+        /* FIXME: We hide the current mouse's cursor, what we actually need is *_HideCursor */
+
+        if ( mouse->cur_cursor != NULL && mouse->cur_cursor->driverdata != NULL) {
+            curdata = (RPI_CursorData *) mouse->cur_cursor->driverdata;
+            if (curdata->element > DISPMANX_NO_HANDLE) {
+                update = vc_dispmanx_update_start( 10 );
+                SDL_assert( update );
+                ret = vc_dispmanx_element_remove( update, curdata->element );
+                SDL_assert( ret == DISPMANX_SUCCESS );
+                ret = vc_dispmanx_update_submit_sync( update );
+                SDL_assert( ret == DISPMANX_SUCCESS );
+                curdata->element = DISPMANX_NO_HANDLE;
+            }
+        }
+        return 0;
+    }
+    
+    curdata = (RPI_CursorData *) cursor->driverdata;
+    if (curdata == NULL) {
+        return -1;
+    }
+    
+    if (mouse->focus == NULL) {
+        return -1;
+    }
+    
+    display = SDL_GetDisplayForWindow(mouse->focus);
+    if (display == NULL) {
+        return -1;
+    }
+    
+    data = (SDL_DisplayData*) display->driverdata;
+    if (data == NULL) {
+        return -1;
+    }
+    
+    if (curdata->element == DISPMANX_NO_HANDLE) {
+        vc_dispmanx_rect_set( &src_rect, 0, 0, curdata->w << 16, curdata->h << 16 );
+        vc_dispmanx_rect_set( &dst_rect, 0, 0, curdata->w, curdata->h);
+        
+        update = vc_dispmanx_update_start( 10 );
+        SDL_assert( update );
+
+        curdata->element = vc_dispmanx_element_add( update,
+                                                    data->dispman_display,
+                                                    SDL_RPI_MOUSELAYER, // layer
+                                                    &dst_rect,
+                                                    curdata->resource,
+                                                    &src_rect,
+                                                    DISPMANX_PROTECTION_NONE,
+                                                    &alpha,
+                                                    DISPMANX_NO_HANDLE, // clamp
+                                                    VC_IMAGE_ROT0 );
+        SDL_assert( curdata->element > DISPMANX_NO_HANDLE);
+        ret = vc_dispmanx_update_submit_sync( update );
+        SDL_assert( ret == DISPMANX_SUCCESS );
+    }
+    
+    return 0;
+}
+
+/* Free a window manager cursor */
+static void
+RPI_FreeCursor(SDL_Cursor * cursor)
+{
+    int ret;
+    DISPMANX_UPDATE_HANDLE_T update;
+    RPI_CursorData *curdata;
+    
+    if (cursor != NULL) {
+        curdata = (RPI_CursorData *) cursor->driverdata;
+        
+        if (curdata != NULL) {
+            if (curdata->element != DISPMANX_NO_HANDLE) {
+                update = vc_dispmanx_update_start( 10 );
+                SDL_assert( update );
+                ret = vc_dispmanx_element_remove( update, curdata->element );
+                SDL_assert( ret == DISPMANX_SUCCESS );
+                ret = vc_dispmanx_update_submit_sync( update );
+                SDL_assert( ret == DISPMANX_SUCCESS );
+            }
+            
+            if (curdata->resource != DISPMANX_NO_HANDLE) {
+                ret = vc_dispmanx_resource_delete( curdata->resource );
+                SDL_assert( ret == DISPMANX_SUCCESS );
+            }
+        
+            SDL_free(cursor->driverdata);
+        }
+        SDL_free(cursor);
+    }
+}
+
+/* Warp the mouse to (x,y) */
+static void
+RPI_WarpMouse(SDL_Window * window, int x, int y)
+{
+    RPI_CursorData *curdata;
+    DISPMANX_UPDATE_HANDLE_T update;
+    int ret;
+    VC_RECT_T dst_rect;
+    SDL_Mouse *mouse = SDL_GetMouse();
+    
+    if (mouse != NULL && mouse->cur_cursor != NULL && mouse->cur_cursor->driverdata != NULL) {
+        curdata = (RPI_CursorData *) mouse->cur_cursor->driverdata;
+        if (curdata->element != DISPMANX_NO_HANDLE) {
+            update = vc_dispmanx_update_start( 10 );
+            SDL_assert( update );
+            vc_dispmanx_rect_set( &dst_rect, x, y, curdata->w, curdata->h);
+            ret = vc_dispmanx_element_change_attributes(
+                update,
+                curdata->element,
+                ELEMENT_CHANGE_DEST_RECT,
+                0,
+                0,
+                &dst_rect,
+                NULL,
+                DISPMANX_NO_HANDLE,
+                DISPMANX_NO_ROTATE);
+            SDL_assert( ret == DISPMANX_SUCCESS );
+            /* Submit asynchronously, otherwise the peformance suffers a lot */
+            ret = vc_dispmanx_update_submit( update, 0, NULL );
+            SDL_assert( ret == DISPMANX_SUCCESS );
+        }
+    }    
+}
+
+void
+RPI_InitMouse(_THIS)
+{
+    /* FIXME: Using UDEV it should be possible to scan all mice 
+     * but there's no point in doing so as there's no multimice support...yet!
+     */
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    mouse->CreateCursor = RPI_CreateCursor;
+    mouse->ShowCursor = RPI_ShowCursor;
+    mouse->MoveCursor = RPI_MoveCursor;
+    mouse->FreeCursor = RPI_FreeCursor;
+    mouse->WarpMouse = RPI_WarpMouse;
+
+    SDL_SetDefaultCursor(RPI_CreateDefaultCursor());
+}
+
+void
+RPI_QuitMouse(_THIS)
+{
+    
+}
+
+/* This is called when a mouse motion event occurs */
+static void
+RPI_MoveCursor(SDL_Cursor * cursor)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    RPI_WarpMouse(mouse->focus, mouse->x, mouse->y);
+}
+
+#endif /* SDL_VIDEO_DRIVER_RPI */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/raspberry/SDL_rpimouse.h b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpimouse.h
new file mode 100644
index 000000000..a39e6549d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpimouse.h	
@@ -0,0 +1,43 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_RPI_mouse_h
+#define _SDL_RPI_mouse_h
+
+#include "../SDL_sysvideo.h"
+
+typedef struct _RPI_CursorData RPI_CursorData;
+struct _RPI_CursorData
+{
+    DISPMANX_RESOURCE_HANDLE_T  resource;
+    DISPMANX_ELEMENT_HANDLE_T   element;
+    int                         hot_x, hot_y;
+    int                         w, h;
+};
+
+#define SDL_RPI_CURSORDATA(curs)  RPI_CursorData *curdata = (RPI_CursorData *) ((curs) ? (curs)->driverdata : NULL)
+
+extern void RPI_InitMouse(_THIS);
+extern void RPI_QuitMouse(_THIS);
+
+#endif /* _SDL_RPI_mouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/raspberry/SDL_rpiopengles.c b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpiopengles.c
new file mode 100644
index 000000000..c6f462b2a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpiopengles.c	
@@ -0,0 +1,42 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
+
+#include "SDL_rpivideo.h"
+#include "SDL_rpiopengles.h"
+
+/* EGL implementation of SDL OpenGL support */
+
+int
+RPI_GLES_LoadLibrary(_THIS, const char *path) {
+    return SDL_EGL_LoadLibrary(_this, path, EGL_DEFAULT_DISPLAY);
+}
+
+SDL_EGL_CreateContext_impl(RPI)
+SDL_EGL_SwapWindow_impl(RPI)
+SDL_EGL_MakeCurrent_impl(RPI)
+
+#endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/video/raspberry/SDL_rpiopengles.h b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpiopengles.h
new file mode 100644
index 000000000..5ef8f8fff
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpiopengles.h	
@@ -0,0 +1,48 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_rpiopengles_h
+#define _SDL_rpiopengles_h
+
+#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
+
+#include "../SDL_sysvideo.h"
+#include "../SDL_egl_c.h"
+
+/* OpenGLES functions */
+#define RPI_GLES_GetAttribute SDL_EGL_GetAttribute
+#define RPI_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define RPI_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define RPI_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define RPI_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+#define RPI_GLES_DeleteContext SDL_EGL_DeleteContext
+
+extern int RPI_GLES_LoadLibrary(_THIS, const char *path);
+extern SDL_GLContext RPI_GLES_CreateContext(_THIS, SDL_Window * window);
+extern void RPI_GLES_SwapWindow(_THIS, SDL_Window * window);
+extern int RPI_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+
+#endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */
+
+#endif /* _SDL_rpiopengles_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/raspberry/SDL_rpivideo.c b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpivideo.c
new file mode 100644
index 000000000..8391c762a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpivideo.c	
@@ -0,0 +1,372 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_RPI
+
+/* References
+ * http://elinux.org/RPi_VideoCore_APIs
+ * https://github.com/raspberrypi/firmware/blob/master/opt/vc/src/hello_pi/hello_triangle/triangle.c
+ * http://cgit.freedesktop.org/wayland/weston/tree/src/rpi-renderer.c
+ * http://cgit.freedesktop.org/wayland/weston/tree/src/compositor-rpi.c
+ */
+
+/* SDL internals */
+#include "../SDL_sysvideo.h"
+#include "SDL_version.h"
+#include "SDL_syswm.h"
+#include "SDL_loadso.h"
+#include "SDL_events.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_keyboard_c.h"
+
+#ifdef SDL_INPUT_LINUXEV
+#include "../../core/linux/SDL_evdev.h"
+#endif
+
+/* RPI declarations */
+#include "SDL_rpivideo.h"
+#include "SDL_rpievents_c.h"
+#include "SDL_rpiopengles.h"
+#include "SDL_rpimouse.h"
+
+static int
+RPI_Available(void)
+{
+    return 1;
+}
+
+static void
+RPI_Destroy(SDL_VideoDevice * device)
+{
+    /*    SDL_VideoData *phdata = (SDL_VideoData *) device->driverdata; */
+
+    if (device->driverdata != NULL) {
+        device->driverdata = NULL;
+    }
+}
+
+static SDL_VideoDevice *
+RPI_Create()
+{
+    SDL_VideoDevice *device;
+    SDL_VideoData *phdata;
+
+    /* Initialize SDL_VideoDevice structure */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (device == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    /* Initialize internal data */
+    phdata = (SDL_VideoData *) SDL_calloc(1, sizeof(SDL_VideoData));
+    if (phdata == NULL) {
+        SDL_OutOfMemory();
+        SDL_free(device);
+        return NULL;
+    }
+
+    device->driverdata = phdata;
+
+    /* Setup amount of available displays and current display */
+    device->num_displays = 0;
+
+    /* Set device free function */
+    device->free = RPI_Destroy;
+
+    /* Setup all functions which we can handle */
+    device->VideoInit = RPI_VideoInit;
+    device->VideoQuit = RPI_VideoQuit;
+    device->GetDisplayModes = RPI_GetDisplayModes;
+    device->SetDisplayMode = RPI_SetDisplayMode;
+    device->CreateWindow = RPI_CreateWindow;
+    device->CreateWindowFrom = RPI_CreateWindowFrom;
+    device->SetWindowTitle = RPI_SetWindowTitle;
+    device->SetWindowIcon = RPI_SetWindowIcon;
+    device->SetWindowPosition = RPI_SetWindowPosition;
+    device->SetWindowSize = RPI_SetWindowSize;
+    device->ShowWindow = RPI_ShowWindow;
+    device->HideWindow = RPI_HideWindow;
+    device->RaiseWindow = RPI_RaiseWindow;
+    device->MaximizeWindow = RPI_MaximizeWindow;
+    device->MinimizeWindow = RPI_MinimizeWindow;
+    device->RestoreWindow = RPI_RestoreWindow;
+    device->SetWindowGrab = RPI_SetWindowGrab;
+    device->DestroyWindow = RPI_DestroyWindow;
+    device->GetWindowWMInfo = RPI_GetWindowWMInfo;
+    device->GL_LoadLibrary = RPI_GLES_LoadLibrary;
+    device->GL_GetProcAddress = RPI_GLES_GetProcAddress;
+    device->GL_UnloadLibrary = RPI_GLES_UnloadLibrary;
+    device->GL_CreateContext = RPI_GLES_CreateContext;
+    device->GL_MakeCurrent = RPI_GLES_MakeCurrent;
+    device->GL_SetSwapInterval = RPI_GLES_SetSwapInterval;
+    device->GL_GetSwapInterval = RPI_GLES_GetSwapInterval;
+    device->GL_SwapWindow = RPI_GLES_SwapWindow;
+    device->GL_DeleteContext = RPI_GLES_DeleteContext;
+
+    device->PumpEvents = RPI_PumpEvents;
+
+    return device;
+}
+
+VideoBootStrap RPI_bootstrap = {
+    "RPI",
+    "RPI Video Driver",
+    RPI_Available,
+    RPI_Create
+};
+
+/*****************************************************************************/
+/* SDL Video and Display initialization/handling functions                   */
+/*****************************************************************************/
+int
+RPI_VideoInit(_THIS)
+{
+    SDL_VideoDisplay display;
+    SDL_DisplayMode current_mode;
+    SDL_DisplayData *data;
+    uint32_t w,h;
+
+    /* Initialize BCM Host */
+    bcm_host_init();
+
+    SDL_zero(current_mode);
+
+    if (graphics_get_display_size( 0, &w, &h) < 0) {
+        return -1;
+    }
+
+    current_mode.w = w;
+    current_mode.h = h;
+    /* FIXME: Is there a way to tell the actual refresh rate? */
+    current_mode.refresh_rate = 60;
+    /* 32 bpp for default */
+    current_mode.format = SDL_PIXELFORMAT_ABGR8888;
+
+    current_mode.driverdata = NULL;
+
+    SDL_zero(display);
+    display.desktop_mode = current_mode;
+    display.current_mode = current_mode;
+
+    /* Allocate display internal data */
+    data = (SDL_DisplayData *) SDL_calloc(1, sizeof(SDL_DisplayData));
+    if (data == NULL) {
+        return SDL_OutOfMemory();
+    }
+
+    data->dispman_display = vc_dispmanx_display_open( 0 /* LCD */);
+
+    display.driverdata = data;
+
+    SDL_AddVideoDisplay(&display);
+
+#ifdef SDL_INPUT_LINUXEV    
+    SDL_EVDEV_Init();
+#endif    
+    
+    RPI_InitMouse(_this);
+
+    return 1;
+}
+
+void
+RPI_VideoQuit(_THIS)
+{
+#ifdef SDL_INPUT_LINUXEV    
+    SDL_EVDEV_Quit();
+#endif    
+}
+
+void
+RPI_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
+{
+    /* Only one display mode available, the current one */
+    SDL_AddDisplayMode(display, &display->current_mode);
+}
+
+int
+RPI_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+    return 0;
+}
+
+int
+RPI_CreateWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *wdata;
+    SDL_VideoDisplay *display;
+    SDL_DisplayData *displaydata;
+    VC_RECT_T dst_rect;
+    VC_RECT_T src_rect;
+    VC_DISPMANX_ALPHA_T         dispman_alpha;
+    DISPMANX_UPDATE_HANDLE_T dispman_update;
+
+    /* Disable alpha, otherwise the app looks composed with whatever dispman is showing (X11, console,etc) */
+    dispman_alpha.flags = DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS; 
+    dispman_alpha.opacity = 0xFF; 
+    dispman_alpha.mask = 0;
+
+    /* Allocate window internal data */
+    wdata = (SDL_WindowData *) SDL_calloc(1, sizeof(SDL_WindowData));
+    if (wdata == NULL) {
+        return SDL_OutOfMemory();
+    }
+    display = SDL_GetDisplayForWindow(window);
+    displaydata = (SDL_DisplayData *) display->driverdata;
+
+    /* Windows have one size for now */
+    window->w = display->desktop_mode.w;
+    window->h = display->desktop_mode.h;
+
+    /* OpenGL ES is the law here, buddy */
+    window->flags |= SDL_WINDOW_OPENGL;
+
+    /* Create a dispman element and associate a window to it */
+    dst_rect.x = 0;
+    dst_rect.y = 0;
+    dst_rect.width = window->w;
+    dst_rect.height = window->h;
+
+    src_rect.x = 0;
+    src_rect.y = 0;
+    src_rect.width = window->w << 16;
+    src_rect.height = window->h << 16;
+
+    dispman_update = vc_dispmanx_update_start( 0 );
+    wdata->dispman_window.element = vc_dispmanx_element_add ( dispman_update, displaydata->dispman_display, SDL_RPI_VIDEOLAYER /* layer */, &dst_rect, 0/*src*/, &src_rect, DISPMANX_PROTECTION_NONE, &dispman_alpha /*alpha*/, 0/*clamp*/, 0/*transform*/);
+    wdata->dispman_window.width = window->w;
+    wdata->dispman_window.height = window->h;
+    vc_dispmanx_update_submit_sync( dispman_update );
+    
+    if (!_this->egl_data) {
+        if (SDL_GL_LoadLibrary(NULL) < 0) {
+            return -1;
+        }
+    }
+    wdata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) &wdata->dispman_window);
+
+    if (wdata->egl_surface == EGL_NO_SURFACE) {
+        return SDL_SetError("Could not create GLES window surface");
+    }
+
+    /* Setup driver data for this window */
+    window->driverdata = wdata;
+    
+    /* One window, it always has focus */
+    SDL_SetMouseFocus(window);
+    SDL_SetKeyboardFocus(window);
+
+    /* Window has been successfully created */
+    return 0;
+}
+
+void
+RPI_DestroyWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data;
+        
+    if(window->driverdata) {
+        data = (SDL_WindowData *) window->driverdata;
+        if (data->egl_surface != EGL_NO_SURFACE) {
+            SDL_EGL_DestroySurface(_this, data->egl_surface);
+            data->egl_surface = EGL_NO_SURFACE;
+        }
+        SDL_free(window->driverdata);
+        window->driverdata = NULL;
+    }
+}
+
+int
+RPI_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
+{
+    return -1;
+}
+
+void
+RPI_SetWindowTitle(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
+{
+}
+void
+RPI_SetWindowPosition(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_SetWindowSize(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_ShowWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_HideWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_RaiseWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_MaximizeWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_MinimizeWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_RestoreWindow(_THIS, SDL_Window * window)
+{
+}
+void
+RPI_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
+{
+
+}
+
+/*****************************************************************************/
+/* SDL Window Manager function                                               */
+/*****************************************************************************/
+SDL_bool
+RPI_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
+{
+    if (info->version.major <= SDL_MAJOR_VERSION) {
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+
+    /* Failed to get window manager information */
+    return SDL_FALSE;
+}
+
+#endif /* SDL_VIDEO_DRIVER_RPI */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/raspberry/SDL_rpivideo.h b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpivideo.h
new file mode 100644
index 000000000..4de8983c3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/raspberry/SDL_rpivideo.h	
@@ -0,0 +1,98 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef __SDL_RPIVIDEO_H__
+#define __SDL_RPIVIDEO_H__
+
+#include "../../SDL_internal.h"
+#include "../SDL_sysvideo.h"
+
+#include "bcm_host.h"
+#include "GLES/gl.h"
+#include "EGL/egl.h"
+#include "EGL/eglext.h"
+
+typedef struct SDL_VideoData
+{
+    uint32_t egl_refcount;      /* OpenGL ES reference count              */
+} SDL_VideoData;
+
+
+typedef struct SDL_DisplayData
+{
+    DISPMANX_DISPLAY_HANDLE_T dispman_display;
+} SDL_DisplayData;
+
+
+typedef struct SDL_WindowData
+{
+    EGL_DISPMANX_WINDOW_T dispman_window;
+#if SDL_VIDEO_OPENGL_EGL  
+    EGLSurface egl_surface;
+#endif    
+} SDL_WindowData;
+
+#define SDL_RPI_VIDEOLAYER 10000 /* High enough so to occlude everything */
+#define SDL_RPI_MOUSELAYER SDL_RPI_VIDEOLAYER + 1
+
+
+/****************************************************************************/
+/* SDL_VideoDevice functions declaration                                    */
+/****************************************************************************/
+
+/* Display and window functions */
+int RPI_VideoInit(_THIS);
+void RPI_VideoQuit(_THIS);
+void RPI_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
+int RPI_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+int RPI_CreateWindow(_THIS, SDL_Window * window);
+int RPI_CreateWindowFrom(_THIS, SDL_Window * window, const void *data);
+void RPI_SetWindowTitle(_THIS, SDL_Window * window);
+void RPI_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
+void RPI_SetWindowPosition(_THIS, SDL_Window * window);
+void RPI_SetWindowSize(_THIS, SDL_Window * window);
+void RPI_ShowWindow(_THIS, SDL_Window * window);
+void RPI_HideWindow(_THIS, SDL_Window * window);
+void RPI_RaiseWindow(_THIS, SDL_Window * window);
+void RPI_MaximizeWindow(_THIS, SDL_Window * window);
+void RPI_MinimizeWindow(_THIS, SDL_Window * window);
+void RPI_RestoreWindow(_THIS, SDL_Window * window);
+void RPI_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
+void RPI_DestroyWindow(_THIS, SDL_Window * window);
+
+/* Window manager function */
+SDL_bool RPI_GetWindowWMInfo(_THIS, SDL_Window * window,
+                             struct SDL_SysWMinfo *info);
+
+/* OpenGL/OpenGL ES functions */
+int RPI_GLES_LoadLibrary(_THIS, const char *path);
+void *RPI_GLES_GetProcAddress(_THIS, const char *proc);
+void RPI_GLES_UnloadLibrary(_THIS);
+SDL_GLContext RPI_GLES_CreateContext(_THIS, SDL_Window * window);
+int RPI_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+int RPI_GLES_SetSwapInterval(_THIS, int interval);
+int RPI_GLES_GetSwapInterval(_THIS);
+void RPI_GLES_SwapWindow(_THIS, SDL_Window * window);
+void RPI_GLES_DeleteContext(_THIS, SDL_GLContext context);
+
+#endif /* __SDL_RPIVIDEO_H__ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/sdlgenblit.pl b/Source/3rd Party/sdl/src/video/sdlgenblit.pl
new file mode 100644
index 000000000..091d5663c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/sdlgenblit.pl	
@@ -0,0 +1,476 @@
+#!/usr/bin/perl -w
+#
+# A script to generate optimized C blitters for Simple DirectMedia Layer
+# http://www.libsdl.org/
+
+use warnings;
+use strict;
+
+my %file;
+
+# The formats potentially supported by this script:
+# SDL_PIXELFORMAT_RGB332
+# SDL_PIXELFORMAT_RGB444
+# SDL_PIXELFORMAT_RGB555
+# SDL_PIXELFORMAT_ARGB4444
+# SDL_PIXELFORMAT_ARGB1555
+# SDL_PIXELFORMAT_RGB565
+# SDL_PIXELFORMAT_RGB24
+# SDL_PIXELFORMAT_BGR24
+# SDL_PIXELFORMAT_RGB888
+# SDL_PIXELFORMAT_BGR888
+# SDL_PIXELFORMAT_ARGB8888
+# SDL_PIXELFORMAT_RGBA8888
+# SDL_PIXELFORMAT_ABGR8888
+# SDL_PIXELFORMAT_BGRA8888
+# SDL_PIXELFORMAT_ARGB2101010
+
+# The formats we're actually creating blitters for:
+my @src_formats = (
+    "RGB888",
+    "BGR888",
+    "ARGB8888",
+    "RGBA8888",
+    "ABGR8888",
+    "BGRA8888",
+);
+my @dst_formats = (
+    "RGB888",
+    "BGR888",
+    "ARGB8888",
+);
+
+my %format_size = (
+    "RGB888" => 4,
+    "BGR888" => 4,
+    "ARGB8888" => 4,
+    "RGBA8888" => 4,
+    "ABGR8888" => 4,
+    "BGRA8888" => 4,
+);
+
+my %format_type = (
+    "RGB888" => "Uint32",
+    "BGR888" => "Uint32",
+    "ARGB8888" => "Uint32",
+    "RGBA8888" => "Uint32",
+    "ABGR8888" => "Uint32",
+    "BGRA8888" => "Uint32",
+);
+
+my %get_rgba_string = (
+    "RGB888" => "_R = (Uint8)(_pixel >> 16); _G = (Uint8)(_pixel >> 8); _B = (Uint8)_pixel; _A = 0xFF;",
+    "BGR888" => "_B = (Uint8)(_pixel >> 16); _G = (Uint8)(_pixel >> 8); _R = (Uint8)_pixel; _A = 0xFF;", "ARGB8888" => "_A = (Uint8)(_pixel >> 24); _R = (Uint8)(_pixel >> 16); _G = (Uint8)(_pixel >> 8); _B = (Uint8)_pixel;",
+    "RGBA8888" => "_R = (Uint8)(_pixel >> 24); _G = (Uint8)(_pixel >> 16); _B = (Uint8)(_pixel >> 8); _A = (Uint8)_pixel;",
+    "ABGR8888" => "_A = (Uint8)(_pixel >> 24); _B = (Uint8)(_pixel >> 16); _G = (Uint8)(_pixel >> 8); _R = (Uint8)_pixel;",
+    "BGRA8888" => "_B = (Uint8)(_pixel >> 24); _G = (Uint8)(_pixel >> 16); _R = (Uint8)(_pixel >> 8); _A = (Uint8)_pixel;",
+);
+
+my %set_rgba_string = (
+    "RGB888" => "_pixel = ((Uint32)_R << 16) | ((Uint32)_G << 8) | _B;",
+    "BGR888" => "_pixel = ((Uint32)_B << 16) | ((Uint32)_G << 8) | _R;",
+    "ARGB8888" => "_pixel = ((Uint32)_A << 24) | ((Uint32)_R << 16) | ((Uint32)_G << 8) | _B;",
+    "RGBA8888" => "_pixel = ((Uint32)_R << 24) | ((Uint32)_G << 16) | ((Uint32)_B << 8) | _A;",
+    "ABGR8888" => "_pixel = ((Uint32)_A << 24) | ((Uint32)_B << 16) | ((Uint32)_G << 8) | _R;",
+    "BGRA8888" => "_pixel = ((Uint32)_B << 24) | ((Uint32)_G << 16) | ((Uint32)_R << 8) | _A;",
+);
+
+sub open_file {
+    my $name = shift;
+    open(FILE, ">$name.new") || die "Cant' open $name.new: $!";
+    print FILE <<__EOF__;
+/* DO NOT EDIT!  This file is generated by sdlgenblit.pl */
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken\@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../SDL_internal.h"
+
+/* *INDENT-OFF* */
+
+__EOF__
+}
+
+sub close_file {
+    my $name = shift;
+    print FILE <<__EOF__;
+/* *INDENT-ON* */
+
+/* vi: set ts=4 sw=4 expandtab: */
+__EOF__
+    close FILE;
+    if ( ! -f $name || system("cmp -s $name $name.new") != 0 ) {
+        rename("$name.new", "$name");
+    } else {
+        unlink("$name.new");
+    }
+}
+
+sub output_copydefs
+{
+    print FILE <<__EOF__;
+extern SDL_BlitFuncEntry SDL_GeneratedBlitFuncTable[];
+__EOF__
+}
+
+sub output_copyfuncname
+{
+    my $prefix = shift;
+    my $src = shift;
+    my $dst = shift;
+    my $modulate = shift;
+    my $blend = shift;
+    my $scale = shift;
+    my $args = shift;
+    my $suffix = shift;
+
+    print FILE "$prefix SDL_Blit_${src}_${dst}";
+    if ( $modulate ) {
+        print FILE "_Modulate";
+    }
+    if ( $blend ) {
+        print FILE "_Blend";
+    }
+    if ( $scale ) {
+        print FILE "_Scale";
+    }
+    if ( $args ) {
+        print FILE "(SDL_BlitInfo *info)";
+    }
+    print FILE "$suffix";
+}
+
+sub get_rgba
+{
+    my $prefix = shift;
+    my $format = shift;
+    my $string = $get_rgba_string{$format};
+    $string =~ s/_/$prefix/g;
+    if ( $prefix ne "" ) {
+        print FILE <<__EOF__;
+            ${prefix}pixel = *$prefix;
+__EOF__
+    } else {
+        print FILE <<__EOF__;
+            pixel = *src;
+__EOF__
+    }
+    print FILE <<__EOF__;
+            $string
+__EOF__
+}
+
+sub set_rgba
+{
+    my $prefix = shift;
+    my $format = shift;
+    my $string = $set_rgba_string{$format};
+    $string =~ s/_/$prefix/g;
+    print FILE <<__EOF__;
+            $string
+            *dst = ${prefix}pixel;
+__EOF__
+}
+
+sub output_copycore
+{
+    my $src = shift;
+    my $dst = shift;
+    my $modulate = shift;
+    my $blend = shift;
+    my $s = "";
+    my $d = "";
+
+    # Nice and easy...
+    if ( $src eq $dst && !$modulate && !$blend ) {
+        print FILE <<__EOF__;
+            *dst = *src;
+__EOF__
+        return;
+    }
+
+    if ( $blend ) {
+        get_rgba("src", $src);
+        get_rgba("dst", $dst);
+        $s = "src";
+        $d = "dst";
+    } else {
+        get_rgba("", $src);
+    }
+
+    if ( $modulate ) {
+        print FILE <<__EOF__;
+            if (flags & SDL_COPY_MODULATE_COLOR) {
+                ${s}R = (${s}R * modulateR) / 255;
+                ${s}G = (${s}G * modulateG) / 255;
+                ${s}B = (${s}B * modulateB) / 255;
+            }
+            if (flags & SDL_COPY_MODULATE_ALPHA) {
+                ${s}A = (${s}A * modulateA) / 255;
+            }
+__EOF__
+    }
+    if ( $blend ) {
+        print FILE <<__EOF__;
+            if (flags & (SDL_COPY_BLEND|SDL_COPY_ADD)) {
+                /* This goes away if we ever use premultiplied alpha */
+                if (${s}A < 255) {
+                    ${s}R = (${s}R * ${s}A) / 255;
+                    ${s}G = (${s}G * ${s}A) / 255;
+                    ${s}B = (${s}B * ${s}A) / 255;
+                }
+            }
+            switch (flags & (SDL_COPY_BLEND|SDL_COPY_ADD|SDL_COPY_MOD)) {
+            case SDL_COPY_BLEND:
+                ${d}R = ${s}R + ((255 - ${s}A) * ${d}R) / 255;
+                ${d}G = ${s}G + ((255 - ${s}A) * ${d}G) / 255;
+                ${d}B = ${s}B + ((255 - ${s}A) * ${d}B) / 255;
+                ${d}A = ${s}A + ((255 - ${s}A) * ${d}A) / 255;
+                break;
+            case SDL_COPY_ADD:
+                ${d}R = ${s}R + ${d}R; if (${d}R > 255) ${d}R = 255;
+                ${d}G = ${s}G + ${d}G; if (${d}G > 255) ${d}G = 255;
+                ${d}B = ${s}B + ${d}B; if (${d}B > 255) ${d}B = 255;
+                break;
+            case SDL_COPY_MOD:
+                ${d}R = (${s}R * ${d}R) / 255;
+                ${d}G = (${s}G * ${d}G) / 255;
+                ${d}B = (${s}B * ${d}B) / 255;
+                break;
+            }
+__EOF__
+    }
+    if ( $blend ) {
+        set_rgba("dst", $dst);
+    } else {
+        set_rgba("", $dst);
+    }
+}
+
+sub output_copyfunc
+{
+    my $src = shift;
+    my $dst = shift;
+    my $modulate = shift;
+    my $blend = shift;
+    my $scale = shift;
+
+    output_copyfuncname("static void", $src, $dst, $modulate, $blend, $scale, 1, "\n");
+    print FILE <<__EOF__;
+{
+__EOF__
+    if ( $modulate || $blend ) {
+        print FILE <<__EOF__;
+    const int flags = info->flags;
+__EOF__
+    }
+    if ( $modulate ) {
+        print FILE <<__EOF__;
+    const Uint32 modulateR = info->r;
+    const Uint32 modulateG = info->g;
+    const Uint32 modulateB = info->b;
+    const Uint32 modulateA = info->a;
+__EOF__
+    }
+    if ( $blend ) {
+        print FILE <<__EOF__;
+    Uint32 srcpixel;
+    Uint32 srcR, srcG, srcB, srcA;
+    Uint32 dstpixel;
+    Uint32 dstR, dstG, dstB, dstA;
+__EOF__
+    } elsif ( $modulate || $src ne $dst ) {
+        print FILE <<__EOF__;
+    Uint32 pixel;
+    Uint32 R, G, B, A;
+__EOF__
+    }
+    if ( $scale ) {
+        print FILE <<__EOF__;
+    int srcy, srcx;
+    int posy, posx;
+    int incy, incx;
+
+    srcy = 0;
+    posy = 0;
+    incy = (info->src_h << 16) / info->dst_h;
+    incx = (info->src_w << 16) / info->dst_w;
+
+    while (info->dst_h--) {
+        $format_type{$src} *src = 0;
+        $format_type{$dst} *dst = ($format_type{$dst} *)info->dst;
+        int n = info->dst_w;
+        srcx = -1;
+        posx = 0x10000L;
+        while (posy >= 0x10000L) {
+            ++srcy;
+            posy -= 0x10000L;
+        }
+        while (n--) {
+            if (posx >= 0x10000L) {
+                while (posx >= 0x10000L) {
+                    ++srcx;
+                    posx -= 0x10000L;
+                }
+                src = ($format_type{$src} *)(info->src + (srcy * info->src_pitch) + (srcx * $format_size{$src}));
+__EOF__
+        print FILE <<__EOF__;
+            }
+__EOF__
+        output_copycore($src, $dst, $modulate, $blend);
+        print FILE <<__EOF__;
+            posx += incx;
+            ++dst;
+        }
+        posy += incy;
+        info->dst += info->dst_pitch;
+    }
+__EOF__
+    } else {
+        print FILE <<__EOF__;
+
+    while (info->dst_h--) {
+        $format_type{$src} *src = ($format_type{$src} *)info->src;
+        $format_type{$dst} *dst = ($format_type{$dst} *)info->dst;
+        int n = info->dst_w;
+        while (n--) {
+__EOF__
+        output_copycore($src, $dst, $modulate, $blend);
+        print FILE <<__EOF__;
+            ++src;
+            ++dst;
+        }
+        info->src += info->src_pitch;
+        info->dst += info->dst_pitch;
+    }
+__EOF__
+    }
+    print FILE <<__EOF__;
+}
+
+__EOF__
+}
+
+sub output_copyfunc_h
+{
+}
+
+sub output_copyinc
+{
+    print FILE <<__EOF__;
+#include "SDL_video.h"
+#include "SDL_blit.h"
+#include "SDL_blit_auto.h"
+
+__EOF__
+}
+
+sub output_copyfunctable
+{
+    print FILE <<__EOF__;
+SDL_BlitFuncEntry SDL_GeneratedBlitFuncTable[] = {
+__EOF__
+    for (my $i = 0; $i <= $#src_formats; ++$i) {
+        my $src = $src_formats[$i];
+        for (my $j = 0; $j <= $#dst_formats; ++$j) {
+            my $dst = $dst_formats[$j];
+            for (my $modulate = 0; $modulate <= 1; ++$modulate) {
+                for (my $blend = 0; $blend <= 1; ++$blend) {
+                    for (my $scale = 0; $scale <= 1; ++$scale) {
+                        if ( $modulate || $blend || $scale ) {
+                            print FILE "    { SDL_PIXELFORMAT_$src, SDL_PIXELFORMAT_$dst, ";
+                            my $flags = "";
+                            my $flag = "";
+                            if ( $modulate ) {
+                                $flag = "SDL_COPY_MODULATE_COLOR | SDL_COPY_MODULATE_ALPHA";
+                                if ( $flags eq "" ) {
+                                    $flags = $flag;
+                                } else {
+                                    $flags = "$flags | $flag";
+                                }
+                            }
+                            if ( $blend ) {
+                                $flag = "SDL_COPY_BLEND | SDL_COPY_ADD | SDL_COPY_MOD";
+                                if ( $flags eq "" ) {
+                                    $flags = $flag;
+                                } else {
+                                    $flags = "$flags | $flag";
+                                }
+                            }
+                            if ( $scale ) {
+                                $flag = "SDL_COPY_NEAREST";
+                                if ( $flags eq "" ) {
+                                    $flags = $flag;
+                                } else {
+                                    $flags = "$flags | $flag";
+                                }
+                            }
+                            if ( $flags eq "" ) {
+                                $flags = "0";
+                            }
+                            print FILE "($flags), SDL_CPU_ANY,";
+                            output_copyfuncname("", $src_formats[$i], $dst_formats[$j], $modulate, $blend, $scale, 0, " },\n");
+                        }
+                    }
+                }
+            }
+        }
+    }
+    print FILE <<__EOF__;
+    { 0, 0, 0, 0, NULL }
+};
+
+__EOF__
+}
+
+sub output_copyfunc_c
+{
+    my $src = shift;
+    my $dst = shift;
+
+    for (my $modulate = 0; $modulate <= 1; ++$modulate) {
+        for (my $blend = 0; $blend <= 1; ++$blend) {
+            for (my $scale = 0; $scale <= 1; ++$scale) {
+                if ( $modulate || $blend || $scale ) {
+                    output_copyfunc($src, $dst, $modulate, $blend, $scale);
+                }
+            }
+        }
+    }
+}
+
+open_file("SDL_blit_auto.h");
+output_copydefs();
+for (my $i = 0; $i <= $#src_formats; ++$i) {
+    for (my $j = 0; $j <= $#dst_formats; ++$j) {
+        output_copyfunc_h($src_formats[$i], $dst_formats[$j]);
+    }
+}
+print FILE "\n";
+close_file("SDL_blit_auto.h");
+
+open_file("SDL_blit_auto.c");
+output_copyinc();
+for (my $i = 0; $i <= $#src_formats; ++$i) {
+    for (my $j = 0; $j <= $#dst_formats; ++$j) {
+        output_copyfunc_c($src_formats[$i], $dst_formats[$j]);
+    }
+}
+output_copyfunctable();
+close_file("SDL_blit_auto.c");
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitappdelegate.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitappdelegate.h
new file mode 100644
index 000000000..d5430beb1
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitappdelegate.h	
@@ -0,0 +1,32 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#import <UIKit/UIKit.h>
+
+@interface SDLUIKitDelegate : NSObject<UIApplicationDelegate> {
+}
+
++ (id) sharedAppDelegate;
++ (NSString *)getAppDelegateClassName;
+
+@end
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitappdelegate.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitappdelegate.m
new file mode 100644
index 000000000..a9924fbca
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitappdelegate.m	
@@ -0,0 +1,290 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#include "../SDL_sysvideo.h"
+#include "SDL_assert.h"
+#include "SDL_hints.h"
+#include "SDL_system.h"
+#include "SDL_main.h"
+
+#include "SDL_uikitappdelegate.h"
+#include "SDL_uikitmodes.h"
+#include "../../events/SDL_events_c.h"
+
+#ifdef main
+#undef main
+#endif
+
+static int forward_argc;
+static char **forward_argv;
+static int exit_status;
+static UIWindow *launch_window;
+
+int main(int argc, char **argv)
+{
+    int i;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    /* store arguments */
+    forward_argc = argc;
+    forward_argv = (char **)malloc((argc+1) * sizeof(char *));
+    for (i = 0; i < argc; i++) {
+        forward_argv[i] = malloc( (strlen(argv[i])+1) * sizeof(char));
+        strcpy(forward_argv[i], argv[i]);
+    }
+    forward_argv[i] = NULL;
+
+    /* Give over control to run loop, SDLUIKitDelegate will handle most things from here */
+    UIApplicationMain(argc, argv, NULL, [SDLUIKitDelegate getAppDelegateClassName]);
+
+    /* free the memory we used to hold copies of argc and argv */
+    for (i = 0; i < forward_argc; i++) {
+        free(forward_argv[i]);
+    }
+    free(forward_argv);
+
+    [pool release];
+    return exit_status;
+}
+
+static void
+SDL_IdleTimerDisabledChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
+{
+    BOOL disable = (hint && *hint != '0');
+    [UIApplication sharedApplication].idleTimerDisabled = disable;
+}
+
+@interface SDL_splashviewcontroller : UIViewController {
+    UIImageView *splash;
+    UIImage *splashPortrait;
+    UIImage *splashLandscape;
+}
+
+- (void)updateSplashImage:(UIInterfaceOrientation)interfaceOrientation;
+@end
+
+@implementation SDL_splashviewcontroller
+
+- (id)init
+{
+    self = [super init];
+    if (self == nil) {
+        return nil;
+    }
+
+    self->splash = [[UIImageView alloc] init];
+    [self setView:self->splash];
+
+    CGSize size = [UIScreen mainScreen].bounds.size;
+    float height = SDL_max(size.width, size.height);
+    self->splashPortrait = [UIImage imageNamed:[NSString stringWithFormat:@"Default-%dh.png", (int)height]];
+    if (!self->splashPortrait) {
+        self->splashPortrait = [UIImage imageNamed:@"Default.png"];
+    }
+    self->splashLandscape = [UIImage imageNamed:@"Default-Landscape.png"];
+    if (!self->splashLandscape && self->splashPortrait) {
+        self->splashLandscape = [[UIImage alloc] initWithCGImage: self->splashPortrait.CGImage
+                                                           scale: 1.0
+                                                     orientation: UIImageOrientationRight];
+    }
+    if (self->splashPortrait) {
+        [self->splashPortrait retain];
+    }
+    if (self->splashLandscape) {
+        [self->splashLandscape retain];
+    }
+
+    [self updateSplashImage:[[UIApplication sharedApplication] statusBarOrientation]];
+
+    return self;
+}
+
+- (NSUInteger)supportedInterfaceOrientations
+{
+    NSUInteger orientationMask = UIInterfaceOrientationMaskAll;
+
+    /* Don't allow upside-down orientation on the phone, so answering calls is in the natural orientation */
+    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
+        orientationMask &= ~UIInterfaceOrientationMaskPortraitUpsideDown;
+    }
+    return orientationMask;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orient
+{
+    NSUInteger orientationMask = [self supportedInterfaceOrientations];
+    return (orientationMask & (1 << orient));
+}
+
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation duration:(NSTimeInterval)duration
+{
+    [self updateSplashImage:interfaceOrientation];
+}
+
+- (void)updateSplashImage:(UIInterfaceOrientation)interfaceOrientation
+{
+    UIImage *image;
+
+    if (UIInterfaceOrientationIsLandscape(interfaceOrientation)) {
+        image = self->splashLandscape;
+    } else {
+        image = self->splashPortrait;
+    }
+    if (image)
+    {
+        splash.image = image;
+    }
+}
+
+@end
+
+
+@implementation SDLUIKitDelegate
+
+/* convenience method */
++ (id) sharedAppDelegate
+{
+    /* the delegate is set in UIApplicationMain(), which is garaunteed to be called before this method */
+    return [[UIApplication sharedApplication] delegate];
+}
+
++ (NSString *)getAppDelegateClassName
+{
+    /* subclassing notice: when you subclass this appdelegate, make sure to add a category to override
+       this method and return the actual name of the delegate */
+    return @"SDLUIKitDelegate";
+}
+
+- (id)init
+{
+    self = [super init];
+    return self;
+}
+
+- (void)postFinishLaunch
+{
+    /* run the user's application, passing argc and argv */
+    SDL_iPhoneSetEventPump(SDL_TRUE);
+    exit_status = SDL_main(forward_argc, forward_argv);
+    SDL_iPhoneSetEventPump(SDL_FALSE);
+
+    /* If we showed a splash image, clean it up */
+    if (launch_window) {
+        [launch_window release];
+        launch_window = NULL;
+    }
+
+    /* exit, passing the return status from the user's application */
+    /* We don't actually exit to support applications that do setup in
+     * their main function and then allow the Cocoa event loop to run.
+     */
+    /* exit(exit_status); */
+}
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    /* Keep the launch image up until we set a video mode */
+    launch_window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+
+    UIViewController *splashViewController = [[SDL_splashviewcontroller alloc] init];
+    launch_window.rootViewController = splashViewController;
+    [launch_window addSubview:splashViewController.view];
+    [launch_window makeKeyAndVisible];
+
+    /* Set working directory to resource path */
+    [[NSFileManager defaultManager] changeCurrentDirectoryPath: [[NSBundle mainBundle] resourcePath]];
+
+    /* register a callback for the idletimer hint */
+    SDL_AddHintCallback(SDL_HINT_IDLE_TIMER_DISABLED,
+                        SDL_IdleTimerDisabledChanged, NULL);
+
+    SDL_SetMainReady();
+    [self performSelector:@selector(postFinishLaunch) withObject:nil afterDelay:0.0];
+
+    return YES;
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+    SDL_SendAppEvent(SDL_APP_TERMINATING);
+}
+
+- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application
+{
+    SDL_SendAppEvent(SDL_APP_LOWMEMORY);
+}
+
+- (void) applicationWillResignActive:(UIApplication*)application
+{
+    SDL_VideoDevice *_this = SDL_GetVideoDevice();
+    if (_this) {
+        SDL_Window *window;
+        for (window = _this->windows; window != nil; window = window->next) {
+            SDL_SendWindowEvent(window, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0);
+            SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
+        }
+    }
+    SDL_SendAppEvent(SDL_APP_WILLENTERBACKGROUND);
+}
+
+- (void) applicationDidEnterBackground:(UIApplication*)application
+{
+    SDL_SendAppEvent(SDL_APP_DIDENTERBACKGROUND);
+}
+
+- (void) applicationWillEnterForeground:(UIApplication*)application
+{
+    SDL_SendAppEvent(SDL_APP_WILLENTERFOREGROUND);
+}
+
+- (void) applicationDidBecomeActive:(UIApplication*)application
+{
+    SDL_SendAppEvent(SDL_APP_DIDENTERFOREGROUND);
+
+    SDL_VideoDevice *_this = SDL_GetVideoDevice();
+    if (_this) {
+        SDL_Window *window;
+        for (window = _this->windows; window != nil; window = window->next) {
+            SDL_SendWindowEvent(window, SDL_WINDOWEVENT_FOCUS_GAINED, 0, 0);
+            SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESTORED, 0, 0);
+        }
+    }
+}
+
+- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
+{
+    NSURL *fileURL = [url filePathURL];
+    if (fileURL != nil) {
+        SDL_SendDropFile([[fileURL path] UTF8String]);
+    } else {
+        SDL_SendDropFile([[url absoluteString] UTF8String]);
+    }
+    return YES;
+}
+
+@end
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitevents.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitevents.h
new file mode 100644
index 000000000..d9fb4ab36
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitevents.h	
@@ -0,0 +1,30 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef _SDL_uikitevents_h
+#define _SDL_uikitevents_h
+
+#include "../SDL_sysvideo.h"
+
+extern void UIKit_PumpEvents(_THIS);
+
+#endif /* _SDL_uikitevents_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitevents.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitevents.m
new file mode 100644
index 000000000..94fba878b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitevents.m	
@@ -0,0 +1,68 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_uikitvideo.h"
+#include "SDL_uikitevents.h"
+
+#import <Foundation/Foundation.h>
+
+static BOOL UIKit_EventPumpEnabled = YES;
+
+void
+SDL_iPhoneSetEventPump(SDL_bool enabled)
+{
+    UIKit_EventPumpEnabled = enabled;
+}
+
+void
+UIKit_PumpEvents(_THIS)
+{
+    if (!UIKit_EventPumpEnabled)
+        return;
+
+    /* Let the run loop run for a short amount of time: long enough for
+       touch events to get processed (which is important to get certain
+       elements of Game Center's GKLeaderboardViewController to respond
+       to touch input), but not long enough to introduce a significant
+       delay in the rest of the app.
+    */
+    const CFTimeInterval seconds = 0.000002;
+
+    /* Pump most event types. */
+    SInt32 result;
+    do {
+        result = CFRunLoopRunInMode(kCFRunLoopDefaultMode, seconds, TRUE);
+    } while (result == kCFRunLoopRunHandledSource);
+
+    /* Make sure UIScrollView objects scroll properly. */
+    do {
+        result = CFRunLoopRunInMode((CFStringRef)UITrackingRunLoopMode, seconds, TRUE);
+    } while(result == kCFRunLoopRunHandledSource);
+}
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmessagebox.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmessagebox.h
new file mode 100644
index 000000000..86af87b5c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmessagebox.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+extern SDL_bool UIKit_ShowingMessageBox();
+
+extern int UIKit_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmessagebox.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmessagebox.m
new file mode 100644
index 000000000..8fa8bc97b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmessagebox.m	
@@ -0,0 +1,114 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#include "SDL.h"
+#include "SDL_uikitvideo.h"
+
+
+/* Display a UIKit message box */
+
+static SDL_bool s_showingMessageBox = SDL_FALSE;
+
+@interface UIKit_UIAlertViewDelegate : NSObject <UIAlertViewDelegate> {
+@private
+    int *clickedButtonIndex;
+}
+
+- (id)initWithButtonIndex:(int *)_buttonIndex;
+- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex;
+
+@end
+
+@implementation UIKit_UIAlertViewDelegate
+
+- (id)initWithButtonIndex:(int *)buttonIndex
+{
+    self = [self init];
+    if (self == nil) {
+        return nil;
+    }
+    self->clickedButtonIndex = buttonIndex;
+
+    return self;
+}
+
+- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex;
+{
+    *clickedButtonIndex = buttonIndex;
+}
+
+@end /* UIKit_UIAlertViewDelegate */
+
+
+SDL_bool
+UIKit_ShowingMessageBox()
+{
+    return s_showingMessageBox;
+}
+
+int
+UIKit_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
+{
+    int clicked;
+
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    UIAlertView* alert = [[UIAlertView alloc] init];
+
+    alert.title = [NSString stringWithUTF8String:messageboxdata->title];
+    alert.message = [NSString stringWithUTF8String:messageboxdata->message];
+    alert.delegate = [[UIKit_UIAlertViewDelegate alloc] initWithButtonIndex:&clicked];
+
+    const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
+    int i;
+    for (i = 0; i < messageboxdata->numbuttons; ++i) {
+        [alert addButtonWithTitle:[[NSString alloc] initWithUTF8String:buttons[i].text]];
+    }
+
+    /* Set up for showing the alert */
+    clicked = messageboxdata->numbuttons;
+
+    [alert show];
+
+    /* Run the main event loop until the alert has finished */
+    /* Note that this needs to be done on the main thread */
+    s_showingMessageBox = SDL_TRUE;
+    while (clicked == messageboxdata->numbuttons) {
+        [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
+    }
+    s_showingMessageBox = SDL_FALSE;
+
+    *buttonid = messageboxdata->buttons[clicked].buttonid;
+
+    [alert.delegate release];
+    [alert release];
+
+    [pool release];
+
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmodes.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmodes.h
new file mode 100644
index 000000000..ae9ced659
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmodes.h	
@@ -0,0 +1,51 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_uikitmodes_h
+#define _SDL_uikitmodes_h
+
+#include "SDL_uikitvideo.h"
+
+typedef struct
+{
+    UIScreen *uiscreen;
+    CGFloat scale;
+} SDL_DisplayData;
+
+typedef struct
+{
+    UIScreenMode *uiscreenmode;
+    CGFloat scale;
+} SDL_DisplayModeData;
+
+extern BOOL SDL_UIKit_supports_multiple_displays;
+
+extern SDL_bool UIKit_IsDisplayLandscape(UIScreen *uiscreen);
+
+extern int UIKit_InitModes(_THIS);
+extern void UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
+extern int UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+extern void UIKit_QuitModes(_THIS);
+
+#endif /* _SDL_uikitmodes_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmodes.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmodes.m
new file mode 100644
index 000000000..dddb2f145
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitmodes.m	
@@ -0,0 +1,322 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#include "SDL_assert.h"
+#include "SDL_uikitmodes.h"
+
+
+BOOL SDL_UIKit_supports_multiple_displays = NO;
+
+
+static int
+UIKit_AllocateDisplayModeData(SDL_DisplayMode * mode,
+    UIScreenMode * uiscreenmode, CGFloat scale)
+{
+    SDL_DisplayModeData *data = NULL;
+
+    if (uiscreenmode != nil) {
+        /* Allocate the display mode data */
+        data = (SDL_DisplayModeData *) SDL_malloc(sizeof(*data));
+        if (!data) {
+            return SDL_OutOfMemory();
+        }
+
+        data->uiscreenmode = uiscreenmode;
+        [data->uiscreenmode retain];
+
+        data->scale = scale;
+    }
+
+    mode->driverdata = data;
+
+    return 0;
+}
+
+static void
+UIKit_FreeDisplayModeData(SDL_DisplayMode * mode)
+{
+    if (!SDL_UIKit_supports_multiple_displays) {
+        /* Not on at least iPhoneOS 3.2 (versions prior to iPad). */
+        SDL_assert(mode->driverdata == NULL);
+    } else if (mode->driverdata != NULL) {
+        SDL_DisplayModeData *data = (SDL_DisplayModeData *)mode->driverdata;
+        [data->uiscreenmode release];
+        SDL_free(data);
+        mode->driverdata = NULL;
+    }
+}
+
+static int
+UIKit_AddSingleDisplayMode(SDL_VideoDisplay * display, int w, int h,
+    UIScreenMode * uiscreenmode, CGFloat scale)
+{
+    SDL_DisplayMode mode;
+    SDL_zero(mode);
+
+    mode.format = SDL_PIXELFORMAT_ABGR8888;
+    mode.refresh_rate = 0;
+    if (UIKit_AllocateDisplayModeData(&mode, uiscreenmode, scale) < 0) {
+        return -1;
+    }
+
+    mode.w = w;
+    mode.h = h;
+    if (SDL_AddDisplayMode(display, &mode)) {
+        return 0;
+    } else {
+        UIKit_FreeDisplayModeData(&mode);
+        return -1;
+    }
+}
+
+static int
+UIKit_AddDisplayMode(SDL_VideoDisplay * display, int w, int h, CGFloat scale,
+                     UIScreenMode * uiscreenmode, SDL_bool addRotation)
+{
+    if (UIKit_AddSingleDisplayMode(display, w, h, uiscreenmode, scale) < 0) {
+        return -1;
+    }
+
+    if (addRotation) {
+        /* Add the rotated version */
+        if (UIKit_AddSingleDisplayMode(display, h, w, uiscreenmode, scale) < 0) {
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+static int
+UIKit_AddDisplay(UIScreen *uiscreen)
+{
+    CGSize size = [uiscreen bounds].size;
+
+    /* Make sure the width/height are oriented correctly */
+    if (UIKit_IsDisplayLandscape(uiscreen) != (size.width > size.height)) {
+        CGFloat height = size.width;
+        size.width = size.height;
+        size.height = height;
+    }
+
+    /* When dealing with UIKit all coordinates are specified in terms of
+     * what Apple refers to as points. On earlier devices without the
+     * so called "Retina" display, there is a one to one mapping between
+     * points and pixels. In other cases [UIScreen scale] indicates the
+     * relationship between points and pixels. Since SDL has no notion
+     * of points, we must compensate in all cases where dealing with such
+     * units.
+     */
+    CGFloat scale;
+    if ([UIScreen instancesRespondToSelector:@selector(scale)]) {
+        scale = [uiscreen scale]; /* iOS >= 4.0 */
+    } else {
+        scale = 1.0f; /* iOS < 4.0 */
+    }
+
+    SDL_VideoDisplay display;
+    SDL_DisplayMode mode;
+    SDL_zero(mode);
+    mode.format = SDL_PIXELFORMAT_ABGR8888;
+    mode.w = (int)(size.width * scale);
+    mode.h = (int)(size.height * scale);
+
+    UIScreenMode * uiscreenmode = nil;
+    /* UIScreenMode showed up in 3.2 (the iPad and later). We're
+     * misusing this supports_multiple_displays flag here for that.
+     */
+    if (SDL_UIKit_supports_multiple_displays) {
+        uiscreenmode = [uiscreen currentMode];
+    }
+
+    if (UIKit_AllocateDisplayModeData(&mode, uiscreenmode, scale) < 0) {
+        return -1;
+    }
+
+    SDL_zero(display);
+    display.desktop_mode = mode;
+    display.current_mode = mode;
+
+    /* Allocate the display data */
+    SDL_DisplayData *data = (SDL_DisplayData *) SDL_malloc(sizeof(*data));
+    if (!data) {
+        UIKit_FreeDisplayModeData(&display.desktop_mode);
+        return SDL_OutOfMemory();
+    }
+
+    [uiscreen retain];
+    data->uiscreen = uiscreen;
+    data->scale = scale;
+
+    display.driverdata = data;
+    SDL_AddVideoDisplay(&display);
+
+    return 0;
+}
+
+SDL_bool
+UIKit_IsDisplayLandscape(UIScreen *uiscreen)
+{
+    if (uiscreen == [UIScreen mainScreen]) {
+        return UIInterfaceOrientationIsLandscape([[UIApplication sharedApplication] statusBarOrientation]);
+    } else {
+        CGSize size = [uiscreen bounds].size;
+        return (size.width > size.height);
+    }
+}
+
+int
+UIKit_InitModes(_THIS)
+{
+    /* this tells us whether we are running on ios >= 3.2 */
+    SDL_UIKit_supports_multiple_displays = [UIScreen instancesRespondToSelector:@selector(currentMode)];
+
+    /* Add the main screen. */
+    if (UIKit_AddDisplay([UIScreen mainScreen]) < 0) {
+        return -1;
+    }
+
+    /* If this is iPhoneOS < 3.2, all devices are one screen, 320x480 pixels. */
+    /*  The iPad added both a larger main screen and the ability to use
+     *  external displays. So, add the other displays (screens in UI speak).
+     */
+    if (SDL_UIKit_supports_multiple_displays) {
+        for (UIScreen *uiscreen in [UIScreen screens]) {
+            /* Only add the other screens */
+            if (uiscreen != [UIScreen mainScreen]) {
+                if (UIKit_AddDisplay(uiscreen) < 0) {
+                    return -1;
+                }
+            }
+        }
+    }
+
+    /* We're done! */
+    return 0;
+}
+
+void
+UIKit_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
+{
+    SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
+
+    SDL_bool isLandscape = UIKit_IsDisplayLandscape(data->uiscreen);
+    SDL_bool addRotation = (data->uiscreen == [UIScreen mainScreen]);
+
+    if (SDL_UIKit_supports_multiple_displays) {
+        /* availableModes showed up in 3.2 (the iPad and later). We should only
+         * land here for at least that version of the OS.
+         */
+        for (UIScreenMode *uimode in [data->uiscreen availableModes]) {
+            CGSize size = [uimode size];
+            int w = (int)size.width;
+            int h = (int)size.height;
+
+            /* Make sure the width/height are oriented correctly */
+            if (isLandscape != (w > h)) {
+                int tmp = w;
+                w = h;
+                h = tmp;
+            }
+
+            /* Add the native screen resolution. */
+            UIKit_AddDisplayMode(display, w, h, data->scale, uimode, addRotation);
+
+            if (data->scale != 1.0f) {
+                /* Add the native screen resolution divided by its scale.
+                 * This is so devices capable of e.g. 640x960 also advertise 320x480.
+                 */
+                UIKit_AddDisplayMode(display,
+                    (int)(size.width / data->scale),
+                    (int)(size.height / data->scale),
+                    1.0f, uimode, addRotation);
+            }
+        }
+    } else {
+        const CGSize size = [data->uiscreen bounds].size;
+        int w = (int)size.width;
+        int h = (int)size.height;
+
+        /* Make sure the width/height are oriented correctly */
+        if (isLandscape != (w > h)) {
+            int tmp = w;
+            w = h;
+            h = tmp;
+        }
+
+        UIKit_AddDisplayMode(display, w, h, 1.0f, nil, addRotation);
+    }
+}
+
+int
+UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+    SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
+
+    if (!SDL_UIKit_supports_multiple_displays) {
+        /* Not on at least iPhoneOS 3.2 (versions prior to iPad). */
+        SDL_assert(mode->driverdata == NULL);
+    } else {
+        SDL_DisplayModeData *modedata = (SDL_DisplayModeData *)mode->driverdata;
+        [data->uiscreen setCurrentMode:modedata->uiscreenmode];
+
+        if (data->uiscreen == [UIScreen mainScreen]) {
+            if (mode->w > mode->h) {
+                if (!UIKit_IsDisplayLandscape(data->uiscreen)) {
+                    [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO];
+                }
+            } else if (mode->w < mode->h) {
+                if (UIKit_IsDisplayLandscape(data->uiscreen)) {
+                    [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait animated:NO];
+                }
+            }
+        }
+    }
+    return 0;
+}
+
+void
+UIKit_QuitModes(_THIS)
+{
+    /* Release Objective-C objects, so higher level doesn't free() them. */
+    int i, j;
+    for (i = 0; i < _this->num_displays; i++) {
+        SDL_VideoDisplay *display = &_this->displays[i];
+
+        UIKit_FreeDisplayModeData(&display->desktop_mode);
+        for (j = 0; j < display->num_display_modes; j++) {
+            SDL_DisplayMode *mode = &display->display_modes[j];
+            UIKit_FreeDisplayModeData(mode);
+        }
+
+        SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
+        [data->uiscreen release];
+        SDL_free(data);
+        display->driverdata = NULL;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopengles.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopengles.h
new file mode 100644
index 000000000..947678cae
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopengles.h	
@@ -0,0 +1,36 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef _SDL_uikitopengles
+#define _SDL_uikitopengles
+
+#include "../SDL_sysvideo.h"
+
+extern int UIKit_GL_MakeCurrent(_THIS, SDL_Window * window,
+                                SDL_GLContext context);
+extern void UIKit_GL_SwapWindow(_THIS, SDL_Window * window);
+extern SDL_GLContext UIKit_GL_CreateContext(_THIS, SDL_Window * window);
+extern void UIKit_GL_DeleteContext(_THIS, SDL_GLContext context);
+extern void *UIKit_GL_GetProcAddress(_THIS, const char *proc);
+extern int UIKit_GL_LoadLibrary(_THIS, const char *path);
+
+#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopengles.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopengles.m
new file mode 100644
index 000000000..42303e3cb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopengles.m	
@@ -0,0 +1,181 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#include "SDL_uikitopengles.h"
+#include "SDL_uikitopenglview.h"
+#include "SDL_uikitappdelegate.h"
+#include "SDL_uikitmodes.h"
+#include "SDL_uikitwindow.h"
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../power/uikit/SDL_syspower.h"
+#include "SDL_loadso.h"
+#include <dlfcn.h>
+
+static int UIKit_GL_Initialize(_THIS);
+
+void *
+UIKit_GL_GetProcAddress(_THIS, const char *proc)
+{
+    /* Look through all SO's for the proc symbol.  Here's why:
+       -Looking for the path to the OpenGL Library seems not to work in the iPhone Simulator.
+       -We don't know that the path won't change in the future.
+    */
+    return dlsym(RTLD_DEFAULT, proc);
+}
+
+/*
+    note that SDL_GL_Delete context makes it current without passing the window
+*/
+int UIKit_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
+{
+    if (context) {
+        SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+        [data->view setCurrentContext];
+    }
+    else {
+        [EAGLContext setCurrentContext: nil];
+    }
+
+    return 0;
+}
+
+int
+UIKit_GL_LoadLibrary(_THIS, const char *path)
+{
+    /*
+        shouldn't be passing a path into this function
+        why?  Because we've already loaded the library
+        and because the SDK forbids loading an external SO
+    */
+    if (path != NULL) {
+        return SDL_SetError("iPhone GL Load Library just here for compatibility");
+    }
+    return 0;
+}
+
+void UIKit_GL_SwapWindow(_THIS, SDL_Window * window)
+{
+#if SDL_POWER_UIKIT
+    /* Check once a frame to see if we should turn off the battery monitor. */
+    SDL_UIKit_UpdateBatteryMonitoring();
+#endif
+
+    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+
+    if (nil == data->view) {
+        return;
+    }
+    [data->view swapBuffers];
+
+    /* You need to pump events in order for the OS to make changes visible.
+       We don't pump events here because we don't want iOS application events
+       (low memory, terminate, etc.) to happen inside low level rendering.
+     */
+}
+
+SDL_GLContext UIKit_GL_CreateContext(_THIS, SDL_Window * window)
+{
+    SDL_uikitopenglview *view;
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_DisplayData *displaydata = display->driverdata;
+    SDL_DisplayModeData *displaymodedata = display->current_mode.driverdata;
+    UIWindow *uiwindow = data->uiwindow;
+    EAGLSharegroup *share_group = nil;
+
+    if (_this->gl_config.share_with_current_context) {
+        SDL_uikitopenglview *view = (SDL_uikitopenglview *) SDL_GL_GetCurrentContext();
+        share_group = [view.context sharegroup];
+    }
+
+    /* construct our view, passing in SDL's OpenGL configuration data */
+    CGRect frame;
+    if (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) {
+        frame = [displaydata->uiscreen bounds];
+    } else {
+        frame = [displaydata->uiscreen applicationFrame];
+    }
+    view = [[SDL_uikitopenglview alloc] initWithFrame: frame
+                                    scale: displaymodedata->scale
+                                    retainBacking: _this->gl_config.retained_backing
+                                    rBits: _this->gl_config.red_size
+                                    gBits: _this->gl_config.green_size
+                                    bBits: _this->gl_config.blue_size
+                                    aBits: _this->gl_config.alpha_size
+                                    depthBits: _this->gl_config.depth_size
+                                    stencilBits: _this->gl_config.stencil_size
+                                    majorVersion: _this->gl_config.major_version
+                                    shareGroup: share_group];
+    if (!view) {
+        return NULL;
+    }
+
+    data->view = view;
+    view->viewcontroller = data->viewcontroller;
+    if (view->viewcontroller != nil) {
+        [view->viewcontroller setView:view];
+        [view->viewcontroller retain];
+    }
+    [uiwindow addSubview: view];
+
+    /* The view controller needs to be the root in order to control rotation on iOS 6.0 */
+    if (uiwindow.rootViewController == nil) {
+        uiwindow.rootViewController = view->viewcontroller;
+    }
+
+    if (UIKit_GL_MakeCurrent(_this, window, view) < 0) {
+        UIKit_GL_DeleteContext(_this, view);
+        return NULL;
+    }
+
+    /* Make this window the current mouse focus for touch input */
+    if (displaydata->uiscreen == [UIScreen mainScreen]) {
+        SDL_SetMouseFocus(window);
+        SDL_SetKeyboardFocus(window);
+    }
+
+    return view;
+}
+
+void UIKit_GL_DeleteContext(_THIS, SDL_GLContext context)
+{
+    /* the delegate has retained the view, this will release him */
+    SDL_uikitopenglview *view = (SDL_uikitopenglview *)context;
+    if (view->viewcontroller) {
+        UIWindow *uiwindow = (UIWindow *)view.superview;
+        if (uiwindow.rootViewController == view->viewcontroller) {
+            uiwindow.rootViewController = nil;
+        }
+        [view->viewcontroller setView:nil];
+        [view->viewcontroller release];
+    }
+    [view removeFromSuperview];
+    [view release];
+}
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopenglview.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopenglview.h
new file mode 100644
index 000000000..f04b5b0bb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopenglview.h	
@@ -0,0 +1,86 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#import <UIKit/UIKit.h>
+#import <OpenGLES/EAGL.h>
+#import <OpenGLES/ES1/gl.h>
+#import <OpenGLES/ES1/glext.h>
+#import "SDL_uikitview.h"
+/*
+    This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass.
+    The view content is basically an EAGL surface you render your OpenGL scene into.
+    Note that setting the view non-opaque will only work if the EAGL surface has an alpha channel.
+ */
+@interface SDL_uikitopenglview : SDL_uikitview {
+
+@private
+    /* The pixel dimensions of the backbuffer */
+    GLint backingWidth;
+    GLint backingHeight;
+
+    EAGLContext *context;
+
+    /* OpenGL names for the renderbuffer and framebuffers used to render to this view */
+    GLuint viewRenderbuffer, viewFramebuffer;
+
+    /* OpenGL name for the depth buffer that is attached to viewFramebuffer, if it exists (0 if it does not exist) */
+    GLuint depthRenderbuffer;
+
+    /* format of depthRenderbuffer */
+    GLenum depthBufferFormat;
+
+    id displayLink;
+    int animationInterval;
+    void (*animationCallback)(void*);
+    void *animationCallbackParam;
+}
+
+@property (nonatomic, retain, readonly) EAGLContext *context;
+
+- (void)swapBuffers;
+- (void)setCurrentContext;
+
+- (id)initWithFrame:(CGRect)frame
+    scale:(CGFloat)scale
+    retainBacking:(BOOL)retained
+    rBits:(int)rBits
+    gBits:(int)gBits
+    bBits:(int)bBits
+    aBits:(int)aBits
+    depthBits:(int)depthBits
+    stencilBits:(int)stencilBits
+    majorVersion:(int)majorVersion
+    shareGroup:(EAGLSharegroup*)shareGroup;
+
+- (void)updateFrame;
+
+- (void)setAnimationCallback:(int)interval
+    callback:(void (*)(void*))callback
+    callbackParam:(void*)callbackParam;
+
+- (void)startAnimation;
+- (void)stopAnimation;
+
+- (void)doLoop:(id)sender;
+
+@end
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopenglview.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopenglview.m
new file mode 100644
index 000000000..5c163c9a0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitopenglview.m	
@@ -0,0 +1,246 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#include <QuartzCore/QuartzCore.h>
+#include <OpenGLES/EAGLDrawable.h>
+#include "SDL_uikitopenglview.h"
+#include "SDL_uikitmessagebox.h"
+
+
+@implementation SDL_uikitopenglview
+
+@synthesize context;
+
++ (Class)layerClass
+{
+    return [CAEAGLLayer class];
+}
+
+- (id)initWithFrame:(CGRect)frame
+      scale:(CGFloat)scale
+      retainBacking:(BOOL)retained
+      rBits:(int)rBits
+      gBits:(int)gBits
+      bBits:(int)bBits
+      aBits:(int)aBits
+      depthBits:(int)depthBits
+      stencilBits:(int)stencilBits
+      majorVersion:(int)majorVersion
+      shareGroup:(EAGLSharegroup*)shareGroup
+{
+    depthBufferFormat = 0;
+
+    if ((self = [super initWithFrame:frame])) {
+        const BOOL useStencilBuffer = (stencilBits != 0);
+        const BOOL useDepthBuffer = (depthBits != 0);
+        NSString *colorFormat = nil;
+
+        /* The EAGLRenderingAPI enum values currently map 1:1 to major GLES
+           versions, and this allows us to handle future OpenGL ES versions.
+         */
+        EAGLRenderingAPI api = majorVersion;
+
+        if (rBits == 8 && gBits == 8 && bBits == 8) {
+            /* if user specifically requests rbg888 or some color format higher than 16bpp */
+            colorFormat = kEAGLColorFormatRGBA8;
+        } else {
+            /* default case (faster) */
+            colorFormat = kEAGLColorFormatRGB565;
+        }
+
+        /* Get the layer */
+        CAEAGLLayer *eaglLayer = (CAEAGLLayer *)self.layer;
+
+        eaglLayer.opaque = YES;
+        eaglLayer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys:
+                                        [NSNumber numberWithBool: retained], kEAGLDrawablePropertyRetainedBacking, colorFormat, kEAGLDrawablePropertyColorFormat, nil];
+
+        context = [[EAGLContext alloc] initWithAPI:api sharegroup:shareGroup];
+        if (!context || ![EAGLContext setCurrentContext:context]) {
+            [self release];
+            SDL_SetError("OpenGL ES %d not supported", majorVersion);
+            return nil;
+        }
+
+        /* Set the appropriate scale (for retina display support) */
+        if ([self respondsToSelector:@selector(contentScaleFactor)])
+            self.contentScaleFactor = scale;
+
+        /* create the buffers */
+        glGenFramebuffersOES(1, &viewFramebuffer);
+        glGenRenderbuffersOES(1, &viewRenderbuffer);
+
+        glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
+        glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
+        [context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)self.layer];
+        glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, viewRenderbuffer);
+
+        glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &backingWidth);
+        glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &backingHeight);
+
+        if ((useDepthBuffer) || (useStencilBuffer)) {
+            if (useStencilBuffer) {
+                /* Apparently you need to pack stencil and depth into one buffer. */
+                depthBufferFormat = GL_DEPTH24_STENCIL8_OES;
+            } else if (useDepthBuffer) {
+                /* iOS only has 24-bit depth buffers, even with GL_DEPTH_COMPONENT16_OES */
+                depthBufferFormat = GL_DEPTH_COMPONENT24_OES;
+            }
+
+            glGenRenderbuffersOES(1, &depthRenderbuffer);
+            glBindRenderbufferOES(GL_RENDERBUFFER_OES, depthRenderbuffer);
+            glRenderbufferStorageOES(GL_RENDERBUFFER_OES, depthBufferFormat, backingWidth, backingHeight);
+            if (useDepthBuffer) {
+                glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_DEPTH_ATTACHMENT_OES, GL_RENDERBUFFER_OES, depthRenderbuffer);
+            }
+            if (useStencilBuffer) {
+                glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_STENCIL_ATTACHMENT_OES, GL_RENDERBUFFER_OES, depthRenderbuffer);
+            }
+        }
+
+        if (glCheckFramebufferStatusOES(GL_FRAMEBUFFER_OES) != GL_FRAMEBUFFER_COMPLETE_OES) {
+            return NO;
+        }
+
+        glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
+        /* end create buffers */
+
+        self.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
+        self.autoresizesSubviews = YES;
+    }
+    return self;
+}
+
+- (void)updateFrame
+{
+    glBindFramebufferOES(GL_FRAMEBUFFER_OES, viewFramebuffer);
+    glBindRenderbufferOES(GL_RENDERBUFFER_OES, 0);
+    glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, 0);
+    glDeleteRenderbuffersOES(1, &viewRenderbuffer);
+
+    glGenRenderbuffersOES(1, &viewRenderbuffer);
+    glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
+    [context renderbufferStorage:GL_RENDERBUFFER_OES fromDrawable:(CAEAGLLayer*)self.layer];
+    glFramebufferRenderbufferOES(GL_FRAMEBUFFER_OES, GL_COLOR_ATTACHMENT0_OES, GL_RENDERBUFFER_OES, viewRenderbuffer);
+
+    glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_WIDTH_OES, &backingWidth);
+    glGetRenderbufferParameterivOES(GL_RENDERBUFFER_OES, GL_RENDERBUFFER_HEIGHT_OES, &backingHeight);
+
+    if (depthRenderbuffer != 0) {
+        glBindRenderbufferOES(GL_RENDERBUFFER_OES, depthRenderbuffer);
+        glRenderbufferStorageOES(GL_RENDERBUFFER_OES, depthBufferFormat, backingWidth, backingHeight);
+    }
+
+    glBindRenderbufferOES(GL_RENDERBUFFER_OES, viewRenderbuffer);
+}
+
+- (void)setAnimationCallback:(int)interval
+    callback:(void (*)(void*))callback
+    callbackParam:(void*)callbackParam
+{
+    [self stopAnimation];
+
+    animationInterval = interval;
+    animationCallback = callback;
+    animationCallbackParam = callbackParam;
+
+    if (animationCallback)
+        [self startAnimation];
+}
+
+- (void)startAnimation
+{
+    /* CADisplayLink is API new to iPhone SDK 3.1.
+     * Compiling against earlier versions will result in a warning, but can be dismissed
+     * if the system version runtime check for CADisplayLink exists in -initWithCoder:.
+     */
+    displayLink = [NSClassFromString(@"CADisplayLink") displayLinkWithTarget:self selector:@selector(doLoop:)];
+    [displayLink setFrameInterval:animationInterval];
+    [displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
+}
+
+- (void)stopAnimation
+{
+    [displayLink invalidate];
+    displayLink = nil;
+}
+
+- (void)doLoop:(id)sender
+{
+    /* Don't run the game loop while a messagebox is up */
+    if (!UIKit_ShowingMessageBox()) {
+        animationCallback(animationCallbackParam);
+    }
+}
+
+- (void)setCurrentContext
+{
+    [EAGLContext setCurrentContext:context];
+}
+
+
+- (void)swapBuffers
+{
+    /* viewRenderbuffer should always be bound here. Code that binds something
+        else is responsible for rebinding viewRenderbuffer, to reduce
+        duplicate state changes. */
+    [context presentRenderbuffer:GL_RENDERBUFFER_OES];
+}
+
+
+- (void)layoutSubviews
+{
+    [EAGLContext setCurrentContext:context];
+    [self updateFrame];
+}
+
+- (void)destroyFramebuffer
+{
+    glDeleteFramebuffersOES(1, &viewFramebuffer);
+    viewFramebuffer = 0;
+    glDeleteRenderbuffersOES(1, &viewRenderbuffer);
+    viewRenderbuffer = 0;
+
+    if (depthRenderbuffer) {
+        glDeleteRenderbuffersOES(1, &depthRenderbuffer);
+        depthRenderbuffer = 0;
+    }
+}
+
+
+- (void)dealloc
+{
+    [self destroyFramebuffer];
+    if ([EAGLContext currentContext] == context) {
+        [EAGLContext setCurrentContext:nil];
+    }
+    [context release];
+    [super dealloc];
+}
+
+@end
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitvideo.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitvideo.h
new file mode 100644
index 000000000..ef6298257
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitvideo.h	
@@ -0,0 +1,45 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef _SDL_uikitvideo_h
+#define _SDL_uikitvideo_h
+
+#include <UIKit/UIKit.h>
+
+#include "../SDL_sysvideo.h"
+
+#ifndef __IPHONE_6_0
+/* This enum isn't available in older SDKs, but we use it for our own purposes on iOS 5.1 and for the system on iOS 6.0 */
+enum UIInterfaceOrientationMask
+{
+    UIInterfaceOrientationMaskPortrait = (1 << UIInterfaceOrientationPortrait),
+    UIInterfaceOrientationMaskLandscapeLeft = (1 << UIInterfaceOrientationLandscapeLeft),
+    UIInterfaceOrientationMaskLandscapeRight = (1 << UIInterfaceOrientationLandscapeRight),
+    UIInterfaceOrientationMaskPortraitUpsideDown = (1 << UIInterfaceOrientationPortraitUpsideDown),
+    UIInterfaceOrientationMaskLandscape = (UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight),
+    UIInterfaceOrientationMaskAll = (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight | UIInterfaceOrientationMaskPortraitUpsideDown),
+    UIInterfaceOrientationMaskAllButUpsideDown = (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight),
+};
+#endif /* !__IPHONE_6_0 */
+
+
+#endif /* _SDL_uikitvideo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitvideo.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitvideo.m
new file mode 100644
index 000000000..4893bc163
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitvideo.m	
@@ -0,0 +1,146 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#import <UIKit/UIKit.h>
+
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_uikitvideo.h"
+#include "SDL_uikitevents.h"
+#include "SDL_uikitmodes.h"
+#include "SDL_uikitwindow.h"
+#include "SDL_uikitopengles.h"
+
+#define UIKITVID_DRIVER_NAME "uikit"
+
+/* Initialization/Query functions */
+static int UIKit_VideoInit(_THIS);
+static void UIKit_VideoQuit(_THIS);
+
+/* DUMMY driver bootstrap functions */
+
+static int
+UIKit_Available(void)
+{
+    return 1;
+}
+
+static void UIKit_DeleteDevice(SDL_VideoDevice * device)
+{
+    SDL_free(device);
+}
+
+static SDL_VideoDevice *
+UIKit_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (!device) {
+        SDL_free(device);
+        SDL_OutOfMemory();
+        return (0);
+    }
+
+    /* Set the function pointers */
+    device->VideoInit = UIKit_VideoInit;
+    device->VideoQuit = UIKit_VideoQuit;
+    device->GetDisplayModes = UIKit_GetDisplayModes;
+    device->SetDisplayMode = UIKit_SetDisplayMode;
+    device->PumpEvents = UIKit_PumpEvents;
+    device->CreateWindow = UIKit_CreateWindow;
+    device->ShowWindow = UIKit_ShowWindow;
+    device->HideWindow = UIKit_HideWindow;
+    device->RaiseWindow = UIKit_RaiseWindow;
+    device->SetWindowFullscreen = UIKit_SetWindowFullscreen;
+    device->DestroyWindow = UIKit_DestroyWindow;
+    device->GetWindowWMInfo = UIKit_GetWindowWMInfo;
+
+    /* !!! FIXME: implement SetWindowBordered */
+
+#if SDL_IPHONE_KEYBOARD
+    device->HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport;
+    device->ShowScreenKeyboard = UIKit_ShowScreenKeyboard;
+    device->HideScreenKeyboard = UIKit_HideScreenKeyboard;
+    device->IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown;
+    device->SetTextInputRect = UIKit_SetTextInputRect;
+#endif
+
+    /* OpenGL (ES) functions */
+    device->GL_MakeCurrent        = UIKit_GL_MakeCurrent;
+    device->GL_SwapWindow        = UIKit_GL_SwapWindow;
+    device->GL_CreateContext    = UIKit_GL_CreateContext;
+    device->GL_DeleteContext    = UIKit_GL_DeleteContext;
+    device->GL_GetProcAddress   = UIKit_GL_GetProcAddress;
+    device->GL_LoadLibrary        = UIKit_GL_LoadLibrary;
+    device->free = UIKit_DeleteDevice;
+
+    device->gl_config.accelerated = 1;
+
+    return device;
+}
+
+VideoBootStrap UIKIT_bootstrap = {
+    UIKITVID_DRIVER_NAME, "SDL UIKit video driver",
+    UIKit_Available, UIKit_CreateDevice
+};
+
+
+int
+UIKit_VideoInit(_THIS)
+{
+    _this->gl_config.driver_loaded = 1;
+
+    if (UIKit_InitModes(_this) < 0) {
+        return -1;
+    }
+    return 0;
+}
+
+void
+UIKit_VideoQuit(_THIS)
+{
+    UIKit_QuitModes(_this);
+}
+
+/*
+ * iOS log support.
+ *
+ * This doesn't really have aything to do with the interfaces of the SDL video
+ *  subsystem, but we need to stuff this into an Objective-C source code file.
+ */
+
+void SDL_NSLog(const char *text)
+{
+    NSLog(@"%s", text);
+}
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitview.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitview.h
new file mode 100644
index 000000000..ce616c07e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitview.h	
@@ -0,0 +1,78 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#import <UIKit/UIKit.h>
+#import "SDL_uikitviewcontroller.h"
+
+#include "SDL_touch.h"
+
+#define IPHONE_TOUCH_EFFICIENT_DANGEROUS
+
+#ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
+#define MAX_SIMULTANEOUS_TOUCHES 5
+#endif
+
+#if SDL_IPHONE_KEYBOARD
+@interface SDL_uikitview : UIView<UITextFieldDelegate> {
+#else
+@interface SDL_uikitview : UIView {
+#endif
+
+    SDL_TouchID touchId;
+    UITouch *leftFingerDown;
+#ifndef IPHONE_TOUCH_EFFICIENT_DANGEROUS
+    UITouch *finger[MAX_SIMULTANEOUS_TOUCHES];
+#endif
+
+#if SDL_IPHONE_KEYBOARD
+    UITextField *textField;
+    BOOL keyboardVisible;
+    SDL_Rect textInputRect;
+    int keyboardHeight;
+#endif
+
+@public
+    SDL_uikitviewcontroller *viewcontroller;
+}
+- (CGPoint)touchLocation:(UITouch *)touch shouldNormalize:(BOOL)normalize;
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event;
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event;
+
+#if SDL_IPHONE_KEYBOARD
+- (void)showKeyboard;
+- (void)hideKeyboard;
+- (void)initializeKeyboard;
+@property (readonly) BOOL keyboardVisible;
+@property (nonatomic,assign) SDL_Rect textInputRect;
+@property (nonatomic,assign) int keyboardHeight;
+
+SDL_bool UIKit_HasScreenKeyboardSupport(_THIS);
+void UIKit_ShowScreenKeyboard(_THIS, SDL_Window *window);
+void UIKit_HideScreenKeyboard(_THIS, SDL_Window *window);
+SDL_bool UIKit_IsScreenKeyboardShown(_THIS, SDL_Window *window);
+void UIKit_SetTextInputRect(_THIS, SDL_Rect *rect);
+
+#endif
+
+@end
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitview.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitview.m
new file mode 100644
index 000000000..f890b7a8e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitview.m	
@@ -0,0 +1,463 @@
+ /*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#include "SDL_uikitview.h"
+
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_touch_c.h"
+
+#if SDL_IPHONE_KEYBOARD
+#include "keyinfotable.h"
+#endif
+#include "SDL_uikitappdelegate.h"
+#include "SDL_uikitmodes.h"
+#include "SDL_uikitwindow.h"
+
+void _uikit_keyboard_init() ;
+
+@implementation SDL_uikitview
+
+- (void)dealloc
+{
+    [super dealloc];
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame: frame];
+
+#if SDL_IPHONE_KEYBOARD
+    [self initializeKeyboard];
+#endif
+
+    self.multipleTouchEnabled = YES;
+
+    touchId = 1;
+    SDL_AddTouch(touchId, "");
+
+    return self;
+
+}
+
+- (CGPoint)touchLocation:(UITouch *)touch shouldNormalize:(BOOL)normalize
+{
+    CGPoint point = [touch locationInView: self];
+
+    /* Get the display scale and apply that to the input coordinates */
+    SDL_Window *window = self->viewcontroller.window;
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_DisplayModeData *displaymodedata = (SDL_DisplayModeData *) display->current_mode.driverdata;
+
+    if (normalize) {
+        CGRect bounds = [self bounds];
+        point.x /= bounds.size.width;
+        point.y /= bounds.size.height;
+    } else {
+        point.x *= displaymodedata->scale;
+        point.y *= displaymodedata->scale;
+    }
+    return point;
+}
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    NSEnumerator *enumerator = [touches objectEnumerator];
+    UITouch *touch = (UITouch*)[enumerator nextObject];
+
+    while (touch) {
+        if (!leftFingerDown) {
+            CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
+
+            /* send moved event */
+            SDL_SendMouseMotion(NULL, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
+
+            /* send mouse down event */
+            SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_PRESSED, SDL_BUTTON_LEFT);
+
+            leftFingerDown = touch;
+        }
+
+        CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
+#ifdef IPHONE_TOUCH_EFFICIENT_DANGEROUS
+        /* FIXME: TODO: Using touch as the fingerId is potentially dangerous
+         * It is also much more efficient than storing the UITouch pointer
+         * and comparing it to the incoming event.
+         */
+        SDL_SendTouch(touchId, (SDL_FingerID)((size_t)touch),
+                      SDL_TRUE, locationInView.x, locationInView.y, 1.0f);
+#else
+        int i;
+        for(i = 0; i < MAX_SIMULTANEOUS_TOUCHES; i++) {
+            if (finger[i] == NULL) {
+                finger[i] = touch;
+                SDL_SendTouch(touchId, i,
+                              SDL_TRUE, locationInView.x, locationInView.y, 1.0f);
+                break;
+            }
+        }
+#endif
+        touch = (UITouch*)[enumerator nextObject];
+    }
+}
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    NSEnumerator *enumerator = [touches objectEnumerator];
+    UITouch *touch = (UITouch*)[enumerator nextObject];
+
+    while(touch) {
+        if (touch == leftFingerDown) {
+            /* send mouse up */
+            SDL_SendMouseButton(NULL, SDL_TOUCH_MOUSEID, SDL_RELEASED, SDL_BUTTON_LEFT);
+            leftFingerDown = nil;
+        }
+
+        CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
+#ifdef IPHONE_TOUCH_EFFICIENT_DANGEROUS
+        SDL_SendTouch(touchId, (long)touch,
+                      SDL_FALSE, locationInView.x, locationInView.y, 1.0f);
+#else
+        int i;
+        for (i = 0; i < MAX_SIMULTANEOUS_TOUCHES; i++) {
+            if (finger[i] == touch) {
+                SDL_SendTouch(touchId, i,
+                              SDL_FALSE, locationInView.x, locationInView.y, 1.0f);
+                finger[i] = NULL;
+                break;
+            }
+        }
+#endif
+        touch = (UITouch*)[enumerator nextObject];
+    }
+}
+
+- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    /*
+        this can happen if the user puts more than 5 touches on the screen
+        at once, or perhaps in other circumstances.  Usually (it seems)
+        all active touches are canceled.
+    */
+    [self touchesEnded: touches withEvent: event];
+}
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    NSEnumerator *enumerator = [touches objectEnumerator];
+    UITouch *touch = (UITouch*)[enumerator nextObject];
+
+    while (touch) {
+        if (touch == leftFingerDown) {
+            CGPoint locationInView = [self touchLocation:touch shouldNormalize:NO];
+
+            /* send moved event */
+            SDL_SendMouseMotion(NULL, SDL_TOUCH_MOUSEID, 0, locationInView.x, locationInView.y);
+        }
+
+        CGPoint locationInView = [self touchLocation:touch shouldNormalize:YES];
+#ifdef IPHONE_TOUCH_EFFICIENT_DANGEROUS
+        SDL_SendTouchMotion(touchId, (long)touch,
+                            locationInView.x, locationInView.y, 1.0f);
+#else
+        int i;
+        for (i = 0; i < MAX_SIMULTANEOUS_TOUCHES; i++) {
+            if (finger[i] == touch) {
+                SDL_SendTouchMotion(touchId, i,
+                                    locationInView.x, locationInView.y, 1.0f);
+                break;
+            }
+        }
+#endif
+        touch = (UITouch*)[enumerator nextObject];
+    }
+}
+
+/*
+    ---- Keyboard related functionality below this line ----
+*/
+#if SDL_IPHONE_KEYBOARD
+
+@synthesize textInputRect = textInputRect;
+@synthesize keyboardHeight = keyboardHeight;
+
+/* Is the iPhone virtual keyboard visible onscreen? */
+- (BOOL)keyboardVisible
+{
+    return keyboardVisible;
+}
+
+/* Set ourselves up as a UITextFieldDelegate */
+- (void)initializeKeyboard
+{
+    textField = [[UITextField alloc] initWithFrame: CGRectZero];
+    textField.delegate = self;
+    /* placeholder so there is something to delete! */
+    textField.text = @" ";
+
+    /* set UITextInputTrait properties, mostly to defaults */
+    textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
+    textField.autocorrectionType = UITextAutocorrectionTypeNo;
+    textField.enablesReturnKeyAutomatically = NO;
+    textField.keyboardAppearance = UIKeyboardAppearanceDefault;
+    textField.keyboardType = UIKeyboardTypeDefault;
+    textField.returnKeyType = UIReturnKeyDefault;
+    textField.secureTextEntry = NO;
+
+    textField.hidden = YES;
+    keyboardVisible = NO;
+    /* add the UITextField (hidden) to our view */
+    [self addSubview: textField];
+    [textField release];
+    
+    _uikit_keyboard_init();
+}
+
+/* reveal onscreen virtual keyboard */
+- (void)showKeyboard
+{
+    keyboardVisible = YES;
+    [textField becomeFirstResponder];
+}
+
+/* hide onscreen virtual keyboard */
+- (void)hideKeyboard
+{
+    keyboardVisible = NO;
+    [textField resignFirstResponder];
+}
+
+/* UITextFieldDelegate method.  Invoked when user types something. */
+- (BOOL)textField:(UITextField *)_textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
+{
+    if ([string length] == 0) {
+        /* it wants to replace text with nothing, ie a delete */
+        SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_BACKSPACE);
+        SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_BACKSPACE);
+    }
+    else {
+        /* go through all the characters in the string we've been sent
+           and convert them to key presses */
+        int i;
+        for (i = 0; i < [string length]; i++) {
+
+            unichar c = [string characterAtIndex: i];
+
+            Uint16 mod = 0;
+            SDL_Scancode code;
+
+            if (c < 127) {
+                /* figure out the SDL_Scancode and SDL_keymod for this unichar */
+                code = unicharToUIKeyInfoTable[c].code;
+                mod  = unicharToUIKeyInfoTable[c].mod;
+            }
+            else {
+                /* we only deal with ASCII right now */
+                code = SDL_SCANCODE_UNKNOWN;
+                mod = 0;
+            }
+
+            if (mod & KMOD_SHIFT) {
+                /* If character uses shift, press shift down */
+                SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_LSHIFT);
+            }
+            /* send a keydown and keyup even for the character */
+            SDL_SendKeyboardKey(SDL_PRESSED, code);
+            SDL_SendKeyboardKey(SDL_RELEASED, code);
+            if (mod & KMOD_SHIFT) {
+                /* If character uses shift, press shift back up */
+                SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_LSHIFT);
+            }
+        }
+        SDL_SendKeyboardText([string UTF8String]);
+    }
+    return NO; /* don't allow the edit! (keep placeholder text there) */
+}
+
+/* Terminates the editing session */
+- (BOOL)textFieldShouldReturn:(UITextField*)_textField
+{
+    SDL_SendKeyboardKey(SDL_PRESSED, SDL_SCANCODE_RETURN);
+    SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_RETURN);
+    SDL_StopTextInput();
+    return YES;
+}
+
+#endif
+
+@end
+
+/* iPhone keyboard addition functions */
+#if SDL_IPHONE_KEYBOARD
+
+static SDL_uikitview * getWindowView(SDL_Window * window)
+{
+    if (window == NULL) {
+        SDL_SetError("Window does not exist");
+        return nil;
+    }
+
+    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+    SDL_uikitview *view = data != NULL ? data->view : nil;
+
+    if (view == nil) {
+        SDL_SetError("Window has no view");
+    }
+
+    return view;
+}
+
+SDL_bool UIKit_HasScreenKeyboardSupport(_THIS)
+{
+    return SDL_TRUE;
+}
+
+void UIKit_ShowScreenKeyboard(_THIS, SDL_Window *window)
+{
+    SDL_uikitview *view = getWindowView(window);
+    if (view != nil) {
+        [view showKeyboard];
+    }
+}
+
+void UIKit_HideScreenKeyboard(_THIS, SDL_Window *window)
+{
+    SDL_uikitview *view = getWindowView(window);
+    if (view != nil) {
+        [view hideKeyboard];
+    }
+}
+
+SDL_bool UIKit_IsScreenKeyboardShown(_THIS, SDL_Window *window)
+{
+    SDL_uikitview *view = getWindowView(window);
+    if (view == nil) {
+        return 0;
+    }
+
+    return view.keyboardVisible;
+}
+
+
+void _uikit_keyboard_update() {
+    SDL_Window *window = SDL_GetFocusWindow();
+    if (!window) { return; }
+    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+    if (!data) { return; }
+    SDL_uikitview *view = data->view;
+    if (!view) { return; }
+    
+    SDL_Rect r = view.textInputRect;
+    int height = view.keyboardHeight;
+    int offsetx = 0;
+    int offsety = 0;
+    if (height) {
+        int sw,sh;
+        SDL_GetWindowSize(window,&sw,&sh);
+        int bottom = (r.y + r.h);
+        int kbottom = sh - height;
+        if (kbottom < bottom) {
+            offsety = kbottom-bottom;
+        }
+    }
+    UIInterfaceOrientation ui_orient = [[UIApplication sharedApplication] statusBarOrientation];
+    if (ui_orient == UIInterfaceOrientationLandscapeLeft) {
+        int tmp = offsetx; offsetx = offsety; offsety = tmp;
+    }
+    if (ui_orient == UIInterfaceOrientationLandscapeRight) {
+        offsety = -offsety;
+        int tmp = offsetx; offsetx = offsety; offsety = tmp;
+    }
+    if (ui_orient == UIInterfaceOrientationPortraitUpsideDown) {
+        offsety = -offsety;
+    }
+    if ([[UIScreen mainScreen] respondsToSelector:@selector(displayLinkWithTarget:selector:)]) {
+        float scale = [UIScreen mainScreen].scale;
+        offsetx /= scale;
+        offsety /= scale;
+    }
+    view.frame = CGRectMake(offsetx,offsety,view.frame.size.width,view.frame.size.height);
+}
+
+void _uikit_keyboard_set_height(int height) {
+    SDL_uikitview *view = getWindowView(SDL_GetFocusWindow());
+    if (view == nil) {
+        return ;
+    }
+    
+    view.keyboardHeight = height;
+    _uikit_keyboard_update();
+}
+
+void _uikit_keyboard_init() {
+    NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
+    NSOperationQueue *queue = [NSOperationQueue mainQueue];
+    [center addObserverForName:UIKeyboardWillShowNotification
+                        object:nil
+                         queue:queue
+                    usingBlock:^(NSNotification *notification) {
+                        int height = 0;
+                        CGSize keyboardSize = [[[notification userInfo] objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue].size;
+                        height = keyboardSize.height;
+                        UIInterfaceOrientation ui_orient = [[UIApplication sharedApplication] statusBarOrientation];
+                        if (ui_orient == UIInterfaceOrientationLandscapeRight || ui_orient == UIInterfaceOrientationLandscapeLeft) {
+                            height = keyboardSize.width;
+                        }
+                        if ([[UIScreen mainScreen] respondsToSelector:@selector(displayLinkWithTarget:selector:)]) {
+                            height *= [UIScreen mainScreen].scale;
+                        }
+                        _uikit_keyboard_set_height(height);
+                    }
+     ];
+    [center addObserverForName:UIKeyboardDidHideNotification
+                        object:nil
+                         queue:queue
+                    usingBlock:^(NSNotification *notification) {
+                        _uikit_keyboard_set_height(0);
+                    }
+     ];
+}
+
+void
+UIKit_SetTextInputRect(_THIS, SDL_Rect *rect)
+{
+    if (!rect) {
+        SDL_InvalidParamError("rect");
+        return;
+    }
+    
+    SDL_uikitview *view = getWindowView(SDL_GetFocusWindow());
+    if (view == nil) {
+        return ;
+    }
+
+    view.textInputRect = *rect;
+}
+
+
+#endif /* SDL_IPHONE_KEYBOARD */
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitviewcontroller.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitviewcontroller.h
new file mode 100644
index 000000000..e8d595d9b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitviewcontroller.h	
@@ -0,0 +1,40 @@
+/*
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+ */
+
+#import <UIKit/UIKit.h>
+
+#include "../SDL_sysvideo.h"
+
+@interface SDL_uikitviewcontroller : UIViewController {
+@private
+    SDL_Window *window;
+}
+
+@property (readwrite) SDL_Window *window;
+
+- (id)initWithSDLWindow:(SDL_Window *)_window;
+- (void)loadView;
+- (void)viewDidLayoutSubviews;
+- (NSUInteger)supportedInterfaceOrientations;
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orient;
+- (BOOL)prefersStatusBarHidden;
+
+@end
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitviewcontroller.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitviewcontroller.m
new file mode 100644
index 000000000..447b80b80
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitviewcontroller.m	
@@ -0,0 +1,135 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#include "SDL_video.h"
+#include "SDL_assert.h"
+#include "SDL_hints.h"
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_uikitviewcontroller.h"
+#include "SDL_uikitvideo.h"
+#include "SDL_uikitmodes.h"
+#include "SDL_uikitwindow.h"
+
+
+@implementation SDL_uikitviewcontroller
+
+@synthesize window;
+
+- (id)initWithSDLWindow:(SDL_Window *)_window
+{
+    self = [self init];
+    if (self == nil) {
+        return nil;
+    }
+    self.window = _window;
+
+    return self;
+}
+
+- (void)loadView
+{
+    /* do nothing. */
+}
+
+- (void)viewDidLayoutSubviews
+{
+    if (self->window->flags & SDL_WINDOW_RESIZABLE) {
+        SDL_WindowData *data = self->window->driverdata;
+        SDL_VideoDisplay *display = SDL_GetDisplayForWindow(self->window);
+        SDL_DisplayModeData *displaymodedata = (SDL_DisplayModeData *) display->current_mode.driverdata;
+        const CGSize size = data->view.bounds.size;
+        int w, h;
+
+        w = (int)(size.width * displaymodedata->scale);
+        h = (int)(size.height * displaymodedata->scale);
+
+        SDL_SendWindowEvent(self->window, SDL_WINDOWEVENT_RESIZED, w, h);
+    }
+}
+
+- (NSUInteger)supportedInterfaceOrientations
+{
+    NSUInteger orientationMask = 0;
+
+    const char *orientationsCString;
+    if ((orientationsCString = SDL_GetHint(SDL_HINT_ORIENTATIONS)) != NULL) {
+        BOOL rotate = NO;
+        NSString *orientationsNSString = [NSString stringWithCString:orientationsCString
+                                                            encoding:NSUTF8StringEncoding];
+        NSArray *orientations = [orientationsNSString componentsSeparatedByCharactersInSet:
+                                 [NSCharacterSet characterSetWithCharactersInString:@" "]];
+
+        if ([orientations containsObject:@"LandscapeLeft"]) {
+            orientationMask |= UIInterfaceOrientationMaskLandscapeLeft;
+        }
+        if ([orientations containsObject:@"LandscapeRight"]) {
+            orientationMask |= UIInterfaceOrientationMaskLandscapeRight;
+        }
+        if ([orientations containsObject:@"Portrait"]) {
+            orientationMask |= UIInterfaceOrientationMaskPortrait;
+        }
+        if ([orientations containsObject:@"PortraitUpsideDown"]) {
+            orientationMask |= UIInterfaceOrientationMaskPortraitUpsideDown;
+        }
+
+    } else if (self->window->flags & SDL_WINDOW_RESIZABLE) {
+        orientationMask = UIInterfaceOrientationMaskAll;  /* any orientation is okay. */
+    } else {
+        if (self->window->w >= self->window->h) {
+            orientationMask |= UIInterfaceOrientationMaskLandscape;
+        }
+        if (self->window->h >= self->window->w) {
+            orientationMask |= (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown);
+        }
+    }
+
+    /* Don't allow upside-down orientation on the phone, so answering calls is in the natural orientation */
+    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
+        orientationMask &= ~UIInterfaceOrientationMaskPortraitUpsideDown;
+    }
+    return orientationMask;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orient
+{
+    NSUInteger orientationMask = [self supportedInterfaceOrientations];
+    return (orientationMask & (1 << orient));
+}
+
+- (BOOL)prefersStatusBarHidden
+{
+    if (self->window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) {
+        return YES;
+    } else {
+        return NO;
+    }
+}
+
+@end
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitwindow.h b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitwindow.h
new file mode 100644
index 000000000..494b028f3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitwindow.h	
@@ -0,0 +1,51 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef _SDL_uikitwindow_h
+#define _SDL_uikitwindow_h
+
+#include "../SDL_sysvideo.h"
+#import "SDL_uikitvideo.h"
+#import "SDL_uikitopenglview.h"
+#import "SDL_uikitviewcontroller.h"
+
+typedef struct SDL_WindowData SDL_WindowData;
+
+extern int UIKit_CreateWindow(_THIS, SDL_Window * window);
+extern void UIKit_ShowWindow(_THIS, SDL_Window * window);
+extern void UIKit_HideWindow(_THIS, SDL_Window * window);
+extern void UIKit_RaiseWindow(_THIS, SDL_Window * window);
+extern void UIKit_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen);
+extern void UIKit_DestroyWindow(_THIS, SDL_Window * window);
+extern SDL_bool UIKit_GetWindowWMInfo(_THIS, SDL_Window * window,
+                                      struct SDL_SysWMinfo * info);
+
+@class UIWindow;
+
+struct SDL_WindowData
+{
+    UIWindow *uiwindow;
+    SDL_uikitopenglview *view;
+    SDL_uikitviewcontroller *viewcontroller;
+};
+
+#endif /* _SDL_uikitwindow_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/SDL_uikitwindow.m b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitwindow.m
new file mode 100644
index 000000000..a1dd1a9e2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/SDL_uikitwindow.m	
@@ -0,0 +1,333 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_UIKIT
+
+#include "SDL_syswm.h"
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "SDL_assert.h"
+#include "SDL_hints.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_uikitvideo.h"
+#include "SDL_uikitevents.h"
+#include "SDL_uikitmodes.h"
+#include "SDL_uikitwindow.h"
+#import "SDL_uikitappdelegate.h"
+
+#import "SDL_uikitopenglview.h"
+
+#include <Foundation/Foundation.h>
+
+
+
+
+static int SetupWindowData(_THIS, SDL_Window *window, UIWindow *uiwindow, SDL_bool created)
+{
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_DisplayModeData *displaymodedata = (SDL_DisplayModeData *) display->current_mode.driverdata;
+    SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata;
+    SDL_WindowData *data;
+
+    /* Allocate the window data */
+    data = (SDL_WindowData *)SDL_malloc(sizeof(*data));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+    data->uiwindow = uiwindow;
+    data->viewcontroller = nil;
+    data->view = nil;
+
+    /* Fill in the SDL window with the window data */
+    {
+        window->x = 0;
+        window->y = 0;
+
+        CGRect bounds;
+        if (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) {
+            bounds = [displaydata->uiscreen bounds];
+        } else {
+            bounds = [displaydata->uiscreen applicationFrame];
+        }
+
+        /* Get frame dimensions in pixels */
+        int width = (int)(bounds.size.width * displaymodedata->scale);
+        int height = (int)(bounds.size.height * displaymodedata->scale);
+
+        /* Make sure the width/height are oriented correctly */
+        if (UIKit_IsDisplayLandscape(displaydata->uiscreen) != (width > height)) {
+            int temp = width;
+            width = height;
+            height = temp;
+        }
+
+        window->w = width;
+        window->h = height;
+    }
+
+    window->driverdata = data;
+
+    /* only one window on iOS, always shown */
+    window->flags &= ~SDL_WINDOW_HIDDEN;
+
+    /* SDL_WINDOW_BORDERLESS controls whether status bar is hidden.
+     * This is only set if the window is on the main screen. Other screens
+     *  just force the window to have the borderless flag.
+     */
+    if (displaydata->uiscreen == [UIScreen mainScreen]) {
+        window->flags |= SDL_WINDOW_INPUT_FOCUS;  /* always has input focus */
+
+        /* This was setup earlier for our window, and in iOS 7 is controlled by the view, not the application
+        if ([UIApplication sharedApplication].statusBarHidden) {
+            window->flags |= SDL_WINDOW_BORDERLESS;
+        } else {
+            window->flags &= ~SDL_WINDOW_BORDERLESS;
+        }
+        */
+    } else {
+        window->flags &= ~SDL_WINDOW_RESIZABLE;  /* window is NEVER resizeable */
+        window->flags &= ~SDL_WINDOW_INPUT_FOCUS;  /* never has input focus */
+        window->flags |= SDL_WINDOW_BORDERLESS;  /* never has a status bar. */
+    }
+
+    /* The View Controller will handle rotating the view when the
+     * device orientation changes. This will trigger resize events, if
+     * appropriate.
+     */
+    SDL_uikitviewcontroller *controller;
+    controller = [SDL_uikitviewcontroller alloc];
+    data->viewcontroller = [controller initWithSDLWindow:window];
+    [data->viewcontroller setTitle:@"SDL App"];  /* !!! FIXME: hook up SDL_SetWindowTitle() */
+
+    return 0;
+}
+
+int
+UIKit_CreateWindow(_THIS, SDL_Window *window)
+{
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
+    const BOOL external = ([UIScreen mainScreen] != data->uiscreen);
+
+    /* SDL currently puts this window at the start of display's linked list. We rely on this. */
+    SDL_assert(_this->windows == window);
+
+    /* We currently only handle a single window per display on iOS */
+    if (window->next != NULL) {
+        return SDL_SetError("Only one window allowed per display.");
+    }
+
+    /* If monitor has a resolution of 0x0 (hasn't been explicitly set by the
+     * user, so it's in standby), try to force the display to a resolution
+     * that most closely matches the desired window size.
+     */
+    if (SDL_UIKit_supports_multiple_displays) {
+        const CGSize origsize = [[data->uiscreen currentMode] size];
+        if ((origsize.width == 0.0f) && (origsize.height == 0.0f)) {
+            if (display->num_display_modes == 0) {
+                _this->GetDisplayModes(_this, display);
+            }
+
+            int i;
+            const SDL_DisplayMode *bestmode = NULL;
+            for (i = display->num_display_modes; i >= 0; i--) {
+                const SDL_DisplayMode *mode = &display->display_modes[i];
+                if ((mode->w >= window->w) && (mode->h >= window->h))
+                    bestmode = mode;
+            }
+
+            if (bestmode) {
+                SDL_DisplayModeData *modedata = (SDL_DisplayModeData *)bestmode->driverdata;
+                [data->uiscreen setCurrentMode:modedata->uiscreenmode];
+
+                /* desktop_mode doesn't change here (the higher level will
+                 * use it to set all the screens back to their defaults
+                 * upon window destruction, SDL_Quit(), etc.
+                 */
+                display->current_mode = *bestmode;
+            }
+        }
+    }
+
+    if (data->uiscreen == [UIScreen mainScreen]) {
+        if (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) {
+            [UIApplication sharedApplication].statusBarHidden = YES;
+        } else {
+            [UIApplication sharedApplication].statusBarHidden = NO;
+        }
+    }
+
+    if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
+        if (window->w > window->h) {
+            if (!UIKit_IsDisplayLandscape(data->uiscreen)) {
+                [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationLandscapeRight animated:NO];
+            }
+        } else if (window->w < window->h) {
+            if (UIKit_IsDisplayLandscape(data->uiscreen)) {
+                [[UIApplication sharedApplication] setStatusBarOrientation:UIInterfaceOrientationPortrait animated:NO];
+            }
+        }
+    }
+
+    /* ignore the size user requested, and make a fullscreen window */
+    /* !!! FIXME: can we have a smaller view? */
+    UIWindow *uiwindow = [UIWindow alloc];
+    uiwindow = [uiwindow initWithFrame:[data->uiscreen bounds]];
+
+    /* put the window on an external display if appropriate. This implicitly
+     * does [uiwindow setframe:[uiscreen bounds]], so don't do it on the
+     * main display, where we land by default, as that would eat the
+     * status bar real estate.
+     */
+    if (external) {
+        [uiwindow setScreen:data->uiscreen];
+    }
+
+    if (SetupWindowData(_this, window, uiwindow, SDL_TRUE) < 0) {
+        [uiwindow release];
+        return -1;
+    }
+
+    return 1;
+
+}
+
+void
+UIKit_ShowWindow(_THIS, SDL_Window * window)
+{
+    UIWindow *uiwindow = ((SDL_WindowData *) window->driverdata)->uiwindow;
+
+    [uiwindow makeKeyAndVisible];
+}
+
+void
+UIKit_HideWindow(_THIS, SDL_Window * window)
+{
+    UIWindow *uiwindow = ((SDL_WindowData *) window->driverdata)->uiwindow;
+
+    uiwindow.hidden = YES;
+}
+
+void
+UIKit_RaiseWindow(_THIS, SDL_Window * window)
+{
+    /* We don't currently offer a concept of "raising" the SDL window, since
+     *  we only allow one per display, in the iOS fashion.
+     * However, we use this entry point to rebind the context to the view
+     *  during OnWindowRestored processing.
+     */
+    _this->GL_MakeCurrent(_this, _this->current_glwin, _this->current_glctx);
+}
+
+void
+UIKit_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen)
+{
+    SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata;
+    SDL_DisplayModeData *displaymodedata = (SDL_DisplayModeData *) display->current_mode.driverdata;
+    UIWindow *uiwindow = ((SDL_WindowData *) window->driverdata)->uiwindow;
+
+    if (fullscreen) {
+        [UIApplication sharedApplication].statusBarHidden = YES;
+    } else {
+        [UIApplication sharedApplication].statusBarHidden = NO;
+    }
+
+    CGRect bounds;
+    if (fullscreen) {
+        bounds = [displaydata->uiscreen bounds];
+    } else {
+        bounds = [displaydata->uiscreen applicationFrame];
+    }
+
+    /* Get frame dimensions in pixels */
+    int width = (int)(bounds.size.width * displaymodedata->scale);
+    int height = (int)(bounds.size.height * displaymodedata->scale);
+
+    /* We can pick either width or height here and we'll rotate the
+       screen to match, so we pick the closest to what we wanted.
+     */
+    if (window->w >= window->h) {
+        if (width > height) {
+            window->w = width;
+            window->h = height;
+        } else {
+            window->w = height;
+            window->h = width;
+        }
+    } else {
+        if (width > height) {
+            window->w = height;
+            window->h = width;
+        } else {
+            window->w = width;
+            window->h = height;
+        }
+    }
+}
+
+void
+UIKit_DestroyWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+    if (data) {
+        [data->viewcontroller release];
+        [data->uiwindow release];
+        SDL_free(data);
+        window->driverdata = NULL;
+    }
+}
+
+SDL_bool
+UIKit_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
+{
+    UIWindow *uiwindow = ((SDL_WindowData *) window->driverdata)->uiwindow;
+
+    if (info->version.major <= SDL_MAJOR_VERSION) {
+        info->subsystem = SDL_SYSWM_UIKIT;
+        info->info.uikit.window = uiwindow;
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("Application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+}
+
+int
+SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam)
+{
+    SDL_WindowData *data = window ? (SDL_WindowData *)window->driverdata : NULL;
+
+    if (!data || !data->view) {
+        return SDL_SetError("Invalid window or view not set");
+    }
+
+    [data->view setAnimationCallback:interval callback:callback callbackParam:callbackParam];
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_UIKIT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/uikit/keyinfotable.h b/Source/3rd Party/sdl/src/video/uikit/keyinfotable.h
new file mode 100644
index 000000000..1d16868c8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/uikit/keyinfotable.h	
@@ -0,0 +1,174 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _UIKIT_KeyInfo
+#define _UIKIT_KeyInfo
+
+#include "SDL_scancode.h"
+
+/*
+    This file is used by the keyboard code in SDL_uikitview.m to convert between characters
+    passed in from the iPhone's virtual keyboard, and tuples of SDL_Scancode and SDL_keymods.
+    For example unicharToUIKeyInfoTable['a'] would give you the scan code and keymod for lower
+    case a.
+*/
+
+typedef struct
+{
+    SDL_Scancode code;
+    Uint16 mod;
+} UIKitKeyInfo;
+
+/* So far only ASCII characters here */
+static UIKitKeyInfo unicharToUIKeyInfoTable[] = {
+/*  0 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  1 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  2 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  3 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  4 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  5 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  6 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  7 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  8 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  9 */  {  SDL_SCANCODE_UNKNOWN, 0 },
+/*  10 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  11 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  12 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  13 */ {   SDL_SCANCODE_RETURN, 0 },
+/*  14 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  15 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  16 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  17 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  18 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  19 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  20 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  21 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  22 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  23 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  24 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  25 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  26 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  27 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  28 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  29 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  30 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  31 */ {   SDL_SCANCODE_UNKNOWN, 0 },
+/*  32 */ {   SDL_SCANCODE_SPACE, 0 },
+/*  33 */ {   SDL_SCANCODE_1,    KMOD_SHIFT },        /* plus shift modifier '!' */
+/*  34 */ {   SDL_SCANCODE_APOSTROPHE, KMOD_SHIFT },    /* plus shift modifier '"' */
+/*  35 */ {   SDL_SCANCODE_3, KMOD_SHIFT },            /* plus shift modifier '#' */
+/*  36 */ {   SDL_SCANCODE_4, KMOD_SHIFT },            /* plus shift modifier '$' */
+/*  37 */ {   SDL_SCANCODE_5, KMOD_SHIFT },            /* plus shift modifier '%' */
+/*  38 */ {   SDL_SCANCODE_7, KMOD_SHIFT },            /* plus shift modifier '&' */
+/*  39 */ {   SDL_SCANCODE_APOSTROPHE, 0 },    /* '''                       */
+/*  40 */ {   SDL_SCANCODE_9, KMOD_SHIFT },             /* plus shift modifier '(' */
+/*  41 */ {   SDL_SCANCODE_0, KMOD_SHIFT },            /* plus shift modifier ')' */
+/*  42 */ {   SDL_SCANCODE_8, KMOD_SHIFT },            /* '*' */
+/*  43 */ {   SDL_SCANCODE_EQUALS, KMOD_SHIFT },    /* plus shift modifier '+' */
+/*  44 */ {   SDL_SCANCODE_COMMA, 0 },        /* ','                       */
+/*  45 */ {   SDL_SCANCODE_MINUS, 0 },        /* '-'                       */
+/*  46 */ {   SDL_SCANCODE_PERIOD, 0 },        /* '.'                       */
+/*  47 */ {   SDL_SCANCODE_SLASH, 0 },        /* '/'                       */
+/*  48 */ {   SDL_SCANCODE_0, 0    },
+/*  49 */ {   SDL_SCANCODE_1, 0 },
+/*  50 */ {   SDL_SCANCODE_2, 0 },
+/*  51 */ {   SDL_SCANCODE_3, 0 },
+/*  52 */ {   SDL_SCANCODE_4, 0 },
+/*  53 */ {   SDL_SCANCODE_5, 0 },
+/*  54 */ {   SDL_SCANCODE_6, 0 },
+/*  55 */ {   SDL_SCANCODE_7, 0 },
+/*  56 */ {   SDL_SCANCODE_8, 0 },
+/*  57 */ {   SDL_SCANCODE_9, 0 },
+/*  58 */ {   SDL_SCANCODE_SEMICOLON,  KMOD_SHIFT },    /* plus shift modifier ';' */
+/*  59 */ {   SDL_SCANCODE_SEMICOLON, 0 },
+/*  60 */ {   SDL_SCANCODE_COMMA,  KMOD_SHIFT },         /* plus shift modifier '<' */
+/*  61 */ {   SDL_SCANCODE_EQUALS, 0 },
+/*  62 */ {   SDL_SCANCODE_PERIOD,  KMOD_SHIFT },        /* plus shift modifier '>' */
+/*  63 */ {   SDL_SCANCODE_SLASH,  KMOD_SHIFT },        /* plus shift modifier '?' */
+/*  64 */ {   SDL_SCANCODE_2,  KMOD_SHIFT },            /* plus shift modifier '@' */
+/*  65 */ {   SDL_SCANCODE_A,  KMOD_SHIFT },            /* all the following need shift modifiers */
+/*  66 */ {   SDL_SCANCODE_B,  KMOD_SHIFT },
+/*  67 */ {   SDL_SCANCODE_C,  KMOD_SHIFT },
+/*  68 */ {   SDL_SCANCODE_D,  KMOD_SHIFT },
+/*  69 */ {   SDL_SCANCODE_E,  KMOD_SHIFT },
+/*  70 */ {   SDL_SCANCODE_F,  KMOD_SHIFT },
+/*  71 */ {   SDL_SCANCODE_G,  KMOD_SHIFT },
+/*  72 */ {   SDL_SCANCODE_H,  KMOD_SHIFT },
+/*  73 */ {   SDL_SCANCODE_I,  KMOD_SHIFT },
+/*  74 */ {   SDL_SCANCODE_J,  KMOD_SHIFT },
+/*  75 */ {   SDL_SCANCODE_K,  KMOD_SHIFT },
+/*  76 */ {   SDL_SCANCODE_L,  KMOD_SHIFT },
+/*  77 */ {   SDL_SCANCODE_M,  KMOD_SHIFT },
+/*  78 */ {   SDL_SCANCODE_N,  KMOD_SHIFT },
+/*  79 */ {   SDL_SCANCODE_O,  KMOD_SHIFT },
+/*  80 */ {   SDL_SCANCODE_P,  KMOD_SHIFT },
+/*  81 */ {   SDL_SCANCODE_Q,  KMOD_SHIFT },
+/*  82 */ {   SDL_SCANCODE_R,  KMOD_SHIFT },
+/*  83 */ {   SDL_SCANCODE_S,  KMOD_SHIFT },
+/*  84 */ {   SDL_SCANCODE_T,  KMOD_SHIFT },
+/*  85 */ {   SDL_SCANCODE_U,  KMOD_SHIFT },
+/*  86 */ {   SDL_SCANCODE_V,  KMOD_SHIFT },
+/*  87 */ {   SDL_SCANCODE_W,  KMOD_SHIFT },
+/*  88 */ {   SDL_SCANCODE_X,  KMOD_SHIFT },
+/*  89 */ {   SDL_SCANCODE_Y,  KMOD_SHIFT },
+/*  90 */ {   SDL_SCANCODE_Z,  KMOD_SHIFT },
+/*  91 */ {   SDL_SCANCODE_LEFTBRACKET, 0 },
+/*  92 */ {   SDL_SCANCODE_BACKSLASH, 0 },
+/*  93 */ {   SDL_SCANCODE_RIGHTBRACKET, 0 },
+/*  94 */ {   SDL_SCANCODE_6,  KMOD_SHIFT },            /* plus shift modifier '^' */
+/*  95 */ {   SDL_SCANCODE_MINUS,  KMOD_SHIFT },        /* plus shift modifier '_' */
+/*  96 */ {   SDL_SCANCODE_GRAVE,  KMOD_SHIFT },        /* '`' */
+/*  97 */ {   SDL_SCANCODE_A, 0    },
+/*  98 */ {   SDL_SCANCODE_B, 0 },
+/*  99 */ {   SDL_SCANCODE_C, 0 },
+/*  100 */{    SDL_SCANCODE_D, 0 },
+/*  101 */{    SDL_SCANCODE_E, 0 },
+/*  102 */{    SDL_SCANCODE_F, 0 },
+/*  103 */{    SDL_SCANCODE_G, 0 },
+/*  104 */{    SDL_SCANCODE_H, 0 },
+/*  105 */{    SDL_SCANCODE_I, 0 },
+/*  106 */{    SDL_SCANCODE_J, 0 },
+/*  107 */{    SDL_SCANCODE_K, 0 },
+/*  108 */{    SDL_SCANCODE_L, 0 },
+/*  109 */{    SDL_SCANCODE_M, 0 },
+/*  110 */{    SDL_SCANCODE_N, 0 },
+/*  111 */{    SDL_SCANCODE_O, 0 },
+/*  112 */{    SDL_SCANCODE_P, 0 },
+/*  113 */{    SDL_SCANCODE_Q, 0 },
+/*  114 */{    SDL_SCANCODE_R, 0 },
+/*  115 */{    SDL_SCANCODE_S, 0 },
+/*  116 */{    SDL_SCANCODE_T, 0 },
+/*  117 */{    SDL_SCANCODE_U, 0 },
+/*  118 */{    SDL_SCANCODE_V, 0 },
+/*  119 */{    SDL_SCANCODE_W, 0 },
+/*  120 */{    SDL_SCANCODE_X, 0 },
+/*  121 */{    SDL_SCANCODE_Y, 0 },
+/*  122 */{    SDL_SCANCODE_Z, 0 },
+/*  123 */{    SDL_SCANCODE_LEFTBRACKET, KMOD_SHIFT },    /* plus shift modifier '{' */
+/*  124 */{    SDL_SCANCODE_BACKSLASH, KMOD_SHIFT },    /* plus shift modifier '|' */
+/*  125 */{    SDL_SCANCODE_RIGHTBRACKET, KMOD_SHIFT },    /* plus shift modifier '}' */
+/*  126 */{    SDL_SCANCODE_GRAVE, KMOD_SHIFT },         /* plus shift modifier '~' */
+/*  127 */{    SDL_SCANCODE_BACKSPACE, KMOD_SHIFT }
+};
+
+#endif /* UIKitKeyInfo */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylanddyn.c b/Source/3rd Party/sdl/src/video/wayland/SDL_waylanddyn.c
new file mode 100644
index 000000000..1ed29db5c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylanddyn.c	
@@ -0,0 +1,195 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WAYLAND
+
+#define DEBUG_DYNAMIC_WAYLAND 0
+
+#include "SDL_waylanddyn.h"
+
+#if DEBUG_DYNAMIC_WAYLAND
+#include "SDL_log.h"
+#endif
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+
+#include "SDL_name.h"
+#include "SDL_loadso.h"
+
+typedef struct
+{
+    void *lib;
+    const char *libname;
+} waylanddynlib;
+
+#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL
+#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR
+#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON
+#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON NULL
+#endif
+
+static waylanddynlib waylandlibs[] = {
+    {NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC},
+    {NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL},
+    {NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR},
+    {NULL, SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON}
+};
+
+static void *
+WAYLAND_GetSym(const char *fnname, int *pHasModule)
+{
+    int i;
+    void *fn = NULL;
+    for (i = 0; i < SDL_TABLESIZE(waylandlibs); i++) {
+        if (waylandlibs[i].lib != NULL) {
+            fn = SDL_LoadFunction(waylandlibs[i].lib, fnname);
+            if (fn != NULL)
+                break;
+        }
+    }
+
+#if DEBUG_DYNAMIC_WAYLAND
+    if (fn != NULL)
+        SDL_Log("WAYLAND: Found '%s' in %s (%p)\n", fnname, waylandlibs[i].libname, fn);
+    else
+        SDL_Log("WAYLAND: Symbol '%s' NOT FOUND!\n", fnname);
+#endif
+
+    if (fn == NULL)
+        *pHasModule = 0;  /* kill this module. */
+
+    return fn;
+}
+
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */
+
+/* Define all the function pointers and wrappers... */
+#define SDL_WAYLAND_MODULE(modname) int SDL_WAYLAND_HAVE_##modname = 0;
+#define SDL_WAYLAND_SYM(rc,fn,params) SDL_DYNWAYLANDFN_##fn WAYLAND_##fn = NULL;
+#define SDL_WAYLAND_INTERFACE(iface) const struct wl_interface *WAYLAND_##iface = NULL;
+#include "SDL_waylandsym.h"
+#undef SDL_WAYLAND_MODULE
+#undef SDL_WAYLAND_SYM
+#undef SDL_WAYLAND_INTERFACE
+
+static int wayland_load_refcount = 0;
+
+void
+SDL_WAYLAND_UnloadSymbols(void)
+{
+    /* Don't actually unload if more than one module is using the libs... */
+    if (wayland_load_refcount > 0) {
+        if (--wayland_load_refcount == 0) {
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC            
+            int i;
+#endif
+            
+            /* set all the function pointers to NULL. */
+#define SDL_WAYLAND_MODULE(modname) SDL_WAYLAND_HAVE_##modname = 0;
+#define SDL_WAYLAND_SYM(rc,fn,params) WAYLAND_##fn = NULL;
+#define SDL_WAYLAND_INTERFACE(iface) WAYLAND_##iface = NULL;
+#include "SDL_waylandsym.h"
+#undef SDL_WAYLAND_MODULE
+#undef SDL_WAYLAND_SYM
+#undef SDL_WAYLAND_INTERFACE
+
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+            for (i = 0; i < SDL_TABLESIZE(waylandlibs); i++) {
+                if (waylandlibs[i].lib != NULL) {
+                    SDL_UnloadObject(waylandlibs[i].lib);
+                    waylandlibs[i].lib = NULL;
+                }
+            }
+#endif
+        }
+    }
+}
+
+/* returns non-zero if all needed symbols were loaded. */
+int
+SDL_WAYLAND_LoadSymbols(void)
+{
+    int rc = 1;                 /* always succeed if not using Dynamic WAYLAND stuff. */
+
+    /* deal with multiple modules (dga, wayland, etc) needing these symbols... */
+    if (wayland_load_refcount++ == 0) {
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+        int i;
+        int *thismod = NULL;
+        for (i = 0; i < SDL_TABLESIZE(waylandlibs); i++) {
+            if (waylandlibs[i].libname != NULL) {
+                waylandlibs[i].lib = SDL_LoadObject(waylandlibs[i].libname);
+            }
+        }
+
+#define SDL_WAYLAND_MODULE(modname) SDL_WAYLAND_HAVE_##modname = 1; /* default yes */
+#define SDL_WAYLAND_SYM(rc,fn,params)
+#define SDL_WAYLAND_INTERFACE(iface)
+#include "SDL_waylandsym.h"
+#undef SDL_WAYLAND_MODULE
+#undef SDL_WAYLAND_SYM
+#undef SDL_WAYLAND_INTERFACE
+
+#define SDL_WAYLAND_MODULE(modname) thismod = &SDL_WAYLAND_HAVE_##modname;
+#define SDL_WAYLAND_SYM(rc,fn,params) WAYLAND_##fn = (SDL_DYNWAYLANDFN_##fn) WAYLAND_GetSym(#fn,thismod);
+#define SDL_WAYLAND_INTERFACE(iface) WAYLAND_##iface = (struct wl_interface *) WAYLAND_GetSym(#iface,thismod);
+#include "SDL_waylandsym.h"
+#undef SDL_WAYLAND_MODULE
+#undef SDL_WAYLAND_SYM
+#undef SDL_WAYLAND_INTERFACE
+
+        if (SDL_WAYLAND_HAVE_WAYLAND_CLIENT) {
+            /* all required symbols loaded. */
+            SDL_ClearError();
+        } else {
+            /* in case something got loaded... */
+            SDL_WAYLAND_UnloadSymbols();
+            rc = 0;
+        }
+
+#else  /* no dynamic WAYLAND */
+
+#define SDL_WAYLAND_MODULE(modname) SDL_WAYLAND_HAVE_##modname = 1; /* default yes */
+#define SDL_WAYLAND_SYM(rc,fn,params) WAYLAND_##fn = fn;
+#define SDL_WAYLAND_INTERFACE(iface) WAYLAND_##iface = &iface;
+#include "SDL_waylandsym.h"
+#undef SDL_WAYLAND_MODULE
+#undef SDL_WAYLAND_SYM
+#undef SDL_WAYLAND_INTERFACE
+
+#endif
+    }
+
+    return rc;
+}
+
+#endif /* SDL_VIDEO_DRIVER_WAYLAND */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylanddyn.h b/Source/3rd Party/sdl/src/video/wayland/SDL_waylanddyn.h
new file mode 100644
index 000000000..8d9313a2d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylanddyn.h	
@@ -0,0 +1,104 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_waylanddyn_h
+#define _SDL_waylanddyn_h
+
+#include "../../SDL_internal.h"
+
+/* We can't include wayland-client.h here 
+ * but we need some structs from it
+ */
+struct wl_interface;
+struct wl_proxy;
+struct wl_event_queue;
+struct wl_display;
+struct wl_surface;
+struct wl_shm;
+
+#include <stdint.h>
+#include "wayland-cursor.h"
+#include "wayland-util.h"
+#include "xkbcommon/xkbcommon.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+int SDL_WAYLAND_LoadSymbols(void);
+void SDL_WAYLAND_UnloadSymbols(void);
+
+#define SDL_WAYLAND_MODULE(modname) extern int SDL_WAYLAND_HAVE_##modname;
+#define SDL_WAYLAND_SYM(rc,fn,params) \
+    typedef rc (*SDL_DYNWAYLANDFN_##fn) params; \
+    extern SDL_DYNWAYLANDFN_##fn WAYLAND_##fn;
+#define SDL_WAYLAND_INTERFACE(iface) extern const struct wl_interface *WAYLAND_##iface;
+#include "SDL_waylandsym.h"
+#undef SDL_WAYLAND_MODULE
+#undef SDL_WAYLAND_SYM
+#undef SDL_WAYLAND_INTERFACE
+ 
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+
+#ifdef _WAYLAND_CLIENT_H
+#error Do not include wayland-client ahead of SDL_waylanddyn.h in dynamic loading mode
+#endif
+
+/* wayland-client-protocol.h included from wayland-client.h
+ * has inline functions that require these to be defined in dynamic loading mode
+ */
+
+#define wl_proxy_create (*WAYLAND_wl_proxy_create)
+#define wl_proxy_destroy (*WAYLAND_wl_proxy_destroy)
+#define wl_proxy_marshal (*WAYLAND_wl_proxy_marshal)
+#define wl_proxy_set_user_data (*WAYLAND_wl_proxy_set_user_data)
+#define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data)
+#define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener)
+#define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor)
+
+#define wl_seat_interface (*WAYLAND_wl_seat_interface)
+#define wl_surface_interface (*WAYLAND_wl_surface_interface)
+#define wl_shm_pool_interface (*WAYLAND_wl_shm_pool_interface)
+#define wl_buffer_interface (*WAYLAND_wl_buffer_interface)
+#define wl_registry_interface (*WAYLAND_wl_registry_interface)
+#define wl_shell_surface_interface (*WAYLAND_wl_shell_surface_interface)
+#define wl_region_interface (*WAYLAND_wl_region_interface)
+#define wl_pointer_interface (*WAYLAND_wl_pointer_interface)
+#define wl_keyboard_interface (*WAYLAND_wl_keyboard_interface)
+#define wl_compositor_interface (*WAYLAND_wl_compositor_interface)
+#define wl_output_interface (*WAYLAND_wl_output_interface)
+#define wl_shell_interface (*WAYLAND_wl_shell_interface)
+#define wl_shm_interface (*WAYLAND_wl_shm_interface)
+
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */
+
+#include "wayland-client.h"
+#include "wayland-egl.h"
+
+#endif /* !defined _SDL_waylanddyn_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandevents.c b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandevents.c
new file mode 100644
index 000000000..cb729001e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandevents.c	
@@ -0,0 +1,404 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WAYLAND
+
+#include "SDL_stdinc.h"
+#include "SDL_assert.h"
+
+#include "../../events/SDL_sysevents.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/scancodes_xfree86.h"
+
+#include "SDL_waylandvideo.h"
+#include "SDL_waylandevents_c.h"
+#include "SDL_waylandwindow.h"
+
+#include "SDL_waylanddyn.h"
+
+#include <linux/input.h>
+#include <sys/select.h>
+#include <sys/mman.h>
+#include <poll.h>
+#include <errno.h>
+#include <unistd.h>
+#include <xkbcommon/xkbcommon.h>
+
+struct SDL_WaylandInput {
+    SDL_VideoData *display;
+    struct wl_seat *seat;
+    struct wl_pointer *pointer;
+    struct wl_keyboard *keyboard;
+    SDL_WindowData *pointer_focus;
+    SDL_WindowData *keyboard_focus;
+
+    struct {
+        struct xkb_keymap *keymap;
+        struct xkb_state *state;
+    } xkb;
+};
+
+void
+Wayland_PumpEvents(_THIS)
+{
+    SDL_VideoData *d = _this->driverdata;
+    struct pollfd pfd[1];
+
+    pfd[0].fd = WAYLAND_wl_display_get_fd(d->display);
+    pfd[0].events = POLLIN;
+    poll(pfd, 1, 0);
+
+    if (pfd[0].revents & POLLIN)
+        WAYLAND_wl_display_dispatch(d->display);
+    else
+        WAYLAND_wl_display_dispatch_pending(d->display);
+}
+
+static void
+pointer_handle_enter(void *data, struct wl_pointer *pointer,
+                     uint32_t serial, struct wl_surface *surface,
+                     wl_fixed_t sx_w, wl_fixed_t sy_w)
+{
+    struct SDL_WaylandInput *input = data;
+    SDL_WindowData *window;
+
+    if (!surface) {
+        /* enter event for a window we've just destroyed */
+        return;
+    }
+    
+    /* This handler will be called twice in Wayland 1.4
+     * Once for the window surface which has valid user data
+     * and again for the mouse cursor surface which does not have valid user data
+     * We ignore the later
+     */
+
+    window = (SDL_WindowData *)wl_surface_get_user_data(surface);
+    
+    if (window) {
+        input->pointer_focus = window;
+        SDL_SetMouseFocus(window->sdlwindow);
+    }
+}
+
+static void
+pointer_handle_leave(void *data, struct wl_pointer *pointer,
+                     uint32_t serial, struct wl_surface *surface)
+{
+    struct SDL_WaylandInput *input = data;
+
+    if (input->pointer_focus) {
+        SDL_SetMouseFocus(NULL);
+        input->pointer_focus = NULL;
+    }
+}
+
+static void
+pointer_handle_motion(void *data, struct wl_pointer *pointer,
+                      uint32_t time, wl_fixed_t sx_w, wl_fixed_t sy_w)
+{
+    struct SDL_WaylandInput *input = data;
+    SDL_WindowData *window = input->pointer_focus;
+    int sx = wl_fixed_to_int(sx_w);
+    int sy = wl_fixed_to_int(sy_w);
+    if (input->pointer_focus) {
+        SDL_SendMouseMotion(window->sdlwindow, 0, 0, sx, sy);
+    }
+}
+
+static void
+pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial,
+                      uint32_t time, uint32_t button, uint32_t state_w)
+{
+    struct SDL_WaylandInput *input = data;
+    SDL_WindowData *window = input->pointer_focus;
+    enum wl_pointer_button_state state = state_w;
+    uint32_t sdl_button;
+    
+    if  (input->pointer_focus) {
+        switch (button) {
+            case BTN_LEFT:
+                sdl_button = SDL_BUTTON_LEFT;
+                break;
+            case BTN_MIDDLE:
+                sdl_button = SDL_BUTTON_MIDDLE;
+                break;
+            case BTN_RIGHT:
+                sdl_button = SDL_BUTTON_RIGHT;
+                break;
+            case BTN_SIDE:
+                sdl_button = SDL_BUTTON_X1;
+                break;
+            case BTN_EXTRA:
+                sdl_button = SDL_BUTTON_X2;
+                break;
+            default:
+                return;
+        }
+
+        SDL_SendMouseButton(window->sdlwindow, 0,
+                            state ? SDL_PRESSED : SDL_RELEASED, sdl_button);
+    }
+}
+
+static void
+pointer_handle_axis(void *data, struct wl_pointer *pointer,
+                    uint32_t time, uint32_t axis, wl_fixed_t value)
+{
+    struct SDL_WaylandInput *input = data;
+    SDL_WindowData *window = input->pointer_focus;
+    enum wl_pointer_axis a = axis;
+    int x, y;
+
+    if (input->pointer_focus) {
+        switch (a) {
+            case WL_POINTER_AXIS_VERTICAL_SCROLL:
+                x = 0;
+                y = wl_fixed_to_int(value);
+                break;
+            case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
+                x = wl_fixed_to_int(value);
+                y = 0;
+                break;
+            default:
+                return;
+        }
+
+        SDL_SendMouseWheel(window->sdlwindow, 0, x, y);
+    }
+}
+
+static const struct wl_pointer_listener pointer_listener = {
+    pointer_handle_enter,
+    pointer_handle_leave,
+    pointer_handle_motion,
+    pointer_handle_button,
+    pointer_handle_axis,
+};
+
+static void
+keyboard_handle_keymap(void *data, struct wl_keyboard *keyboard,
+                       uint32_t format, int fd, uint32_t size)
+{
+    struct SDL_WaylandInput *input = data;
+    char *map_str;
+
+    if (!data) {
+        close(fd);
+        return;
+    }
+
+    if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) {
+        close(fd);
+        return;
+    }
+
+    map_str = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+    if (map_str == MAP_FAILED) {
+        close(fd);
+        return;
+    }
+
+    input->xkb.keymap = WAYLAND_xkb_keymap_new_from_string(input->display->xkb_context,
+                                                map_str,
+                                                XKB_KEYMAP_FORMAT_TEXT_V1,
+                                                0);
+    munmap(map_str, size);
+    close(fd);
+
+    if (!input->xkb.keymap) {
+        fprintf(stderr, "failed to compile keymap\n");
+        return;
+    }
+
+    input->xkb.state = WAYLAND_xkb_state_new(input->xkb.keymap);
+    if (!input->xkb.state) {
+        fprintf(stderr, "failed to create XKB state\n");
+        WAYLAND_xkb_keymap_unref(input->xkb.keymap);
+        input->xkb.keymap = NULL;
+        return;
+    }
+}
+
+static void
+keyboard_handle_enter(void *data, struct wl_keyboard *keyboard,
+                      uint32_t serial, struct wl_surface *surface,
+                      struct wl_array *keys)
+{
+    struct SDL_WaylandInput *input = data;
+    SDL_WindowData *window = wl_surface_get_user_data(surface);
+
+    input->keyboard_focus = window;
+    window->keyboard_device = input;
+    if (window) {
+        SDL_SetKeyboardFocus(window->sdlwindow);
+    }
+}
+
+static void
+keyboard_handle_leave(void *data, struct wl_keyboard *keyboard,
+                      uint32_t serial, struct wl_surface *surface)
+{
+    SDL_SetKeyboardFocus(NULL);
+}
+
+static void
+keyboard_handle_key(void *data, struct wl_keyboard *keyboard,
+                    uint32_t serial, uint32_t time, uint32_t key,
+                    uint32_t state_w)
+{
+    struct SDL_WaylandInput *input = data;
+    SDL_WindowData *window = input->keyboard_focus;
+    enum wl_keyboard_key_state state = state_w;
+    const xkb_keysym_t *syms;
+    uint32_t scancode;
+    char text[8];
+    int size;
+
+    if (key < SDL_arraysize(xfree86_scancode_table2)) {
+        scancode = xfree86_scancode_table2[key];
+
+        // TODO when do we get WL_KEYBOARD_KEY_STATE_REPEAT?
+        if (scancode != SDL_SCANCODE_UNKNOWN)
+            SDL_SendKeyboardKey(state == WL_KEYBOARD_KEY_STATE_PRESSED ?
+                                SDL_PRESSED : SDL_RELEASED, scancode);
+    }
+
+    if (!window || window->keyboard_device != input || !input->xkb.state)
+        return;
+
+    // TODO can this happen?
+    if (WAYLAND_xkb_state_key_get_syms(input->xkb.state, key + 8, &syms) != 1)
+        return;
+
+    if (state) {
+        size = WAYLAND_xkb_keysym_to_utf8(syms[0], text, sizeof text);
+
+        if (size > 0) {
+            text[size] = 0;
+            SDL_SendKeyboardText(text);
+        }
+    }
+}
+
+static void
+keyboard_handle_modifiers(void *data, struct wl_keyboard *keyboard,
+                          uint32_t serial, uint32_t mods_depressed,
+                          uint32_t mods_latched, uint32_t mods_locked,
+                          uint32_t group)
+{
+    struct SDL_WaylandInput *input = data;
+
+    WAYLAND_xkb_state_update_mask(input->xkb.state, mods_depressed, mods_latched,
+                          mods_locked, 0, 0, group);
+}
+
+static const struct wl_keyboard_listener keyboard_listener = {
+    keyboard_handle_keymap,
+    keyboard_handle_enter,
+    keyboard_handle_leave,
+    keyboard_handle_key,
+    keyboard_handle_modifiers,
+};
+
+static void
+seat_handle_capabilities(void *data, struct wl_seat *seat,
+                         enum wl_seat_capability caps)
+{
+    struct SDL_WaylandInput *input = data;
+
+    if ((caps & WL_SEAT_CAPABILITY_POINTER) && !input->pointer) {
+        input->pointer = wl_seat_get_pointer(seat);
+        input->display->pointer = input->pointer;
+        wl_pointer_set_user_data(input->pointer, input);
+        wl_pointer_add_listener(input->pointer, &pointer_listener,
+                                input);
+    } else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && input->pointer) {
+        wl_pointer_destroy(input->pointer);
+        input->pointer = NULL;
+    }
+
+    if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !input->keyboard) {
+        input->keyboard = wl_seat_get_keyboard(seat);
+        wl_keyboard_set_user_data(input->keyboard, input);
+        wl_keyboard_add_listener(input->keyboard, &keyboard_listener,
+                                 input);
+    } else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && input->keyboard) {
+        wl_keyboard_destroy(input->keyboard);
+        input->keyboard = NULL;
+    }
+}
+
+static const struct wl_seat_listener seat_listener = {
+    seat_handle_capabilities,
+};
+
+void
+Wayland_display_add_input(SDL_VideoData *d, uint32_t id)
+{
+    struct SDL_WaylandInput *input;
+
+    input = SDL_calloc(1, sizeof *input);
+    if (input == NULL)
+        return;
+
+    input->display = d;
+    input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface, 1);
+
+    d->input = input;
+
+    wl_seat_add_listener(input->seat, &seat_listener, input);
+    wl_seat_set_user_data(input->seat, input);
+
+    WAYLAND_wl_display_flush(d->display);
+}
+
+void Wayland_display_destroy_input(SDL_VideoData *d)
+{
+    struct SDL_WaylandInput *input = d->input;
+
+    if (!input)
+        return;
+
+    if (input->keyboard)
+        wl_keyboard_destroy(input->keyboard);
+
+    if (input->pointer)
+        wl_pointer_destroy(input->pointer);
+
+    if (input->seat)
+        wl_seat_destroy(input->seat);
+
+    if (input->xkb.state)
+        WAYLAND_xkb_state_unref(input->xkb.state);
+
+    if (input->xkb.keymap)
+        WAYLAND_xkb_keymap_unref(input->xkb.keymap);
+
+    SDL_free(input);
+    d->input = NULL;
+}
+
+#endif /* SDL_VIDEO_DRIVER_WAYLAND */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandevents_c.h b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandevents_c.h
new file mode 100644
index 000000000..8a6c3fcd6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandevents_c.h	
@@ -0,0 +1,37 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_waylandevents_h
+#define _SDL_waylandevents_h
+
+#include "SDL_waylandvideo.h"
+#include "SDL_waylandwindow.h"
+
+extern void Wayland_PumpEvents(_THIS);
+
+extern void Wayland_display_add_input(SDL_VideoData *d, uint32_t id);
+extern void Wayland_display_destroy_input(SDL_VideoData *d);
+
+#endif /* _SDL_waylandevents_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandmouse.c b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandmouse.c
new file mode 100644
index 000000000..075269571
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandmouse.c	
@@ -0,0 +1,414 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WAYLAND
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <limits.h>
+
+#include "../SDL_sysvideo.h"
+
+#include "SDL_mouse.h"
+#include "../../events/SDL_mouse_c.h"
+#include "SDL_waylandvideo.h"
+#include "SDL_waylandevents_c.h"
+
+#include "SDL_waylanddyn.h"
+#include "wayland-cursor.h"
+
+#include "SDL_assert.h"
+
+
+typedef struct {
+    struct wl_buffer   *buffer;
+    struct wl_surface  *surface;
+
+    int                hot_x, hot_y;
+
+    /* Either a preloaded cursor, or one we created ourselves */
+    struct wl_cursor   *cursor;
+    void               *shm_data;
+} Wayland_CursorData;
+
+static int
+wayland_create_tmp_file(off_t size)
+{
+    static const char template[] = "/sdl-shared-XXXXXX";
+    char *xdg_path;
+    char tmp_path[PATH_MAX];
+    int fd;
+
+    xdg_path = SDL_getenv("XDG_RUNTIME_DIR");
+    if (!xdg_path) {
+        errno = ENOENT;
+        return -1;
+    }
+
+    SDL_strlcpy(tmp_path, xdg_path, PATH_MAX);
+    SDL_strlcat(tmp_path, template, PATH_MAX);
+
+    fd = mkostemp(tmp_path, O_CLOEXEC);
+    if (fd < 0)
+        return -1;
+
+    if (ftruncate(fd, size) < 0) {
+        close(fd);
+        return -1;
+    }
+
+    return fd;
+}
+
+static void
+mouse_buffer_release(void *data, struct wl_buffer *buffer)
+{
+}
+
+static const struct wl_buffer_listener mouse_buffer_listener = {
+    mouse_buffer_release
+};
+
+static int
+create_buffer_from_shm(Wayland_CursorData *d,
+                       int width,
+                       int height,
+                       uint32_t format)
+{
+    SDL_VideoDevice *vd = SDL_GetVideoDevice();
+    SDL_VideoData *data = (SDL_VideoData *) vd->driverdata;
+
+    int stride = width * 4;
+    int size = stride * height;
+
+    int shm_fd;
+
+    shm_fd = wayland_create_tmp_file(size);
+    if (shm_fd < 0)
+    {
+        fprintf(stderr, "creating mouse cursor buffer failed!\n");
+        return -1;
+    }
+
+    d->shm_data = mmap(NULL,
+                       size,
+                       PROT_READ | PROT_WRITE,
+                       MAP_SHARED,
+                       shm_fd,
+                       0);
+    if (data == MAP_FAILED) {
+        d->shm_data = NULL;
+        fprintf (stderr, "mmap () failed\n");
+        close (shm_fd);
+    }
+
+    struct wl_shm_pool *shm_pool = wl_shm_create_pool(data->shm,
+                                                      shm_fd,
+                                                      size);
+    d->buffer = wl_shm_pool_create_buffer(shm_pool,
+                                          0,
+                                          width,
+                                          height,
+                                          stride,
+                                          format);
+    wl_buffer_add_listener(d->buffer,
+                           &mouse_buffer_listener,
+                           d);
+
+    wl_shm_pool_destroy (shm_pool);
+    close (shm_fd);
+
+    return 0;
+}
+
+static SDL_Cursor *
+Wayland_CreateCursor(SDL_Surface *surface, int hot_x, int hot_y)
+{
+    SDL_Cursor *cursor;
+
+    cursor = calloc(1, sizeof (*cursor));
+    if (cursor) {
+        SDL_VideoDevice *vd = SDL_GetVideoDevice ();
+        SDL_VideoData *wd = (SDL_VideoData *) vd->driverdata;
+        Wayland_CursorData *data = calloc (1, sizeof (Wayland_CursorData));
+        cursor->driverdata = (void *) data;
+
+        /* Assume ARGB8888 */
+        SDL_assert(surface->format->format == SDL_PIXELFORMAT_ARGB8888);
+        SDL_assert(surface->pitch == surface->w * 4);
+
+        /* Allocate shared memory buffer for this cursor */
+        if (create_buffer_from_shm (data,
+                                    surface->w,
+                                    surface->h,
+                                    WL_SHM_FORMAT_XRGB8888) < 0)
+        {
+            free (cursor->driverdata);
+            free (cursor);
+            return NULL;
+        }
+
+        SDL_memcpy(data->shm_data,
+                   surface->pixels,
+                   surface->h * surface->pitch);
+
+        data->surface = wl_compositor_create_surface(wd->compositor);
+        wl_surface_set_user_data(data->surface, NULL);
+        wl_surface_attach(data->surface,
+                          data->buffer,
+                          0,
+                          0);
+        wl_surface_damage(data->surface,
+                          0,
+                          0,
+                          surface->w,
+                          surface->h);
+        wl_surface_commit(data->surface);
+
+        data->hot_x = hot_x;
+        data->hot_y = hot_y;
+    }
+
+    return cursor;
+}
+
+static SDL_Cursor *
+CreateCursorFromWlCursor(SDL_VideoData *d, struct wl_cursor *wlcursor)
+{
+    SDL_Cursor *cursor;
+
+    cursor = calloc(1, sizeof (*cursor));
+    if (cursor) {
+        Wayland_CursorData *data = calloc (1, sizeof (Wayland_CursorData));
+        cursor->driverdata = (void *) data;
+
+        /* The wl_buffer here will be destroyed from wl_cursor_theme_destroy
+         * if we are fetching this from a wl_cursor_theme, so don't store a
+         * reference to it here */
+        data->buffer = NULL;
+        data->surface = wl_compositor_create_surface(d->compositor);
+        wl_surface_set_user_data(data->surface, NULL);
+        wl_surface_attach(data->surface,
+                          WAYLAND_wl_cursor_image_get_buffer(wlcursor->images[0]),
+                          0,
+                          0);
+        wl_surface_damage(data->surface,
+                          0,
+                          0,
+                          wlcursor->images[0]->width,
+                          wlcursor->images[0]->height);
+        wl_surface_commit(data->surface);
+        data->hot_x = wlcursor->images[0]->hotspot_x;
+        data->hot_y = wlcursor->images[0]->hotspot_y;
+        data->cursor= wlcursor;
+    } else {
+        SDL_OutOfMemory ();
+    }
+
+    return cursor;
+}
+
+static SDL_Cursor *
+Wayland_CreateDefaultCursor()
+{
+    SDL_VideoDevice *device = SDL_GetVideoDevice();
+    SDL_VideoData *data = device->driverdata;
+
+    return CreateCursorFromWlCursor (data,
+                                     WAYLAND_wl_cursor_theme_get_cursor(data->cursor_theme,
+                                                                "left_ptr"));
+}
+
+static SDL_Cursor *
+Wayland_CreateSystemCursor(SDL_SystemCursor id)
+{
+    SDL_VideoDevice *vd = SDL_GetVideoDevice();
+    SDL_VideoData *d = vd->driverdata;
+
+    struct wl_cursor *cursor = NULL;
+
+    switch(id)
+    {
+    default:
+        SDL_assert(0);
+        return NULL;
+    case SDL_SYSTEM_CURSOR_ARROW:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "left_ptr");
+        break;
+    case SDL_SYSTEM_CURSOR_IBEAM:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "xterm");
+        break;
+    case SDL_SYSTEM_CURSOR_WAIT:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "wait");
+        break;
+    case SDL_SYSTEM_CURSOR_CROSSHAIR:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "hand1");
+        break;
+    case SDL_SYSTEM_CURSOR_WAITARROW:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "wait");
+        break;
+    case SDL_SYSTEM_CURSOR_SIZENWSE:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "hand1");
+        break;
+    case SDL_SYSTEM_CURSOR_SIZENESW:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "hand1");
+        break;
+    case SDL_SYSTEM_CURSOR_SIZEWE:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "hand1");
+        break;
+    case SDL_SYSTEM_CURSOR_SIZENS:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "hand1");
+        break;
+    case SDL_SYSTEM_CURSOR_SIZEALL:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "hand1");
+        break;
+    case SDL_SYSTEM_CURSOR_NO:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "xterm");
+        break;
+    case SDL_SYSTEM_CURSOR_HAND:
+        cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "hand1");
+        break;
+    }
+
+    SDL_Cursor *sdl_cursor = CreateCursorFromWlCursor (d, cursor);
+
+    return sdl_cursor;
+}
+
+static void
+Wayland_FreeCursor(SDL_Cursor *cursor)
+{
+    if (!cursor)
+        return;
+
+    Wayland_CursorData *d = cursor->driverdata;
+
+    /* Probably not a cursor we own */
+    if (!d)
+        return;
+
+    if (d->buffer)
+        wl_buffer_destroy(d->buffer);
+
+    if (d->surface)
+        wl_surface_destroy(d->surface);
+
+    /* Not sure what's meant to happen to shm_data */
+    free (cursor->driverdata);
+    SDL_free(cursor);
+}
+
+static int
+Wayland_ShowCursor(SDL_Cursor *cursor)
+{
+    SDL_VideoDevice *vd = SDL_GetVideoDevice();
+    SDL_VideoData *d = vd->driverdata;
+
+    struct wl_pointer *pointer = d->pointer;
+
+    if (!pointer)
+        return -1;
+
+    if (cursor)
+    {
+        Wayland_CursorData *data = cursor->driverdata;
+
+        wl_pointer_set_cursor (pointer, 0,
+                               data->surface,
+                               data->hot_x,
+                               data->hot_y);
+    }
+    else
+    {
+        wl_pointer_set_cursor (pointer, 0,
+                               NULL,
+                               0,
+                               0);
+    }
+    
+    return 0;
+}
+
+static void
+Wayland_WarpMouse(SDL_Window *window, int x, int y)
+{
+    SDL_Unsupported();
+    return;
+}
+
+static int
+Wayland_SetRelativeMouseMode(SDL_bool enabled)
+{
+    SDL_Unsupported();
+    return -1;
+}
+
+void
+Wayland_InitMouse(void)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    mouse->CreateCursor = Wayland_CreateCursor;
+    mouse->CreateSystemCursor = Wayland_CreateSystemCursor;
+    mouse->ShowCursor = Wayland_ShowCursor;
+    mouse->FreeCursor = Wayland_FreeCursor;
+    mouse->WarpMouse = Wayland_WarpMouse;
+    mouse->SetRelativeMouseMode = Wayland_SetRelativeMouseMode;
+
+    SDL_SetDefaultCursor(Wayland_CreateDefaultCursor());
+}
+
+void
+Wayland_FiniMouse(void)
+{
+    /* This effectively assumes that nobody else
+     * touches SDL_Mouse which is effectively
+     * a singleton */
+
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    /* Free the current cursor if not the same pointer as
+     * the default cursor */
+    if (mouse->def_cursor != mouse->cur_cursor)
+        Wayland_FreeCursor (mouse->cur_cursor);
+
+    Wayland_FreeCursor (mouse->def_cursor);
+    mouse->def_cursor = NULL;
+    mouse->cur_cursor = NULL;
+
+    mouse->CreateCursor =  NULL;
+    mouse->CreateSystemCursor = NULL;
+    mouse->ShowCursor = NULL;
+    mouse->FreeCursor = NULL;
+    mouse->WarpMouse = NULL;
+    mouse->SetRelativeMouseMode = NULL;
+}
+#endif  /* SDL_VIDEO_DRIVER_WAYLAND */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandmouse.h b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandmouse.h
new file mode 100644
index 000000000..efd29d6ce
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandmouse.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+#include "SDL_mouse.h"
+#include "SDL_waylandvideo.h"
+
+#if SDL_VIDEO_DRIVER_WAYLAND
+
+extern void Wayland_InitMouse(void);
+extern void Wayland_FiniMouse(void);
+
+#endif
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandopengles.c b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandopengles.c
new file mode 100644
index 000000000..45078043c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandopengles.c	
@@ -0,0 +1,91 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WAYLAND && SDL_VIDEO_OPENGL_EGL
+
+#include "SDL_waylandvideo.h"
+#include "SDL_waylandopengles.h"
+#include "SDL_waylandwindow.h"
+#include "SDL_waylandevents_c.h"
+#include "SDL_waylanddyn.h"
+
+/* EGL implementation of SDL OpenGL ES support */
+
+int
+Wayland_GLES_LoadLibrary(_THIS, const char *path) {
+    int ret;
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    
+    ret = SDL_EGL_LoadLibrary(_this, path, (NativeDisplayType) data->display);
+
+    Wayland_PumpEvents(_this);
+    WAYLAND_wl_display_flush(data->display);
+    
+    return ret;
+}
+
+
+SDL_GLContext
+Wayland_GLES_CreateContext(_THIS, SDL_Window * window)
+{
+    SDL_GLContext context;
+    context = SDL_EGL_CreateContext(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);
+    WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display );
+    
+    return context;
+}
+
+void
+Wayland_GLES_SwapWindow(_THIS, SDL_Window *window)
+{
+    SDL_EGL_SwapBuffers(_this, ((SDL_WindowData *) window->driverdata)->egl_surface);
+    WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display );
+}
+
+
+int
+Wayland_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
+{
+    int ret;
+    
+    if (window && context) {
+        ret = SDL_EGL_MakeCurrent(_this, ((SDL_WindowData *) window->driverdata)->egl_surface, context);
+    }
+    else {
+        ret = SDL_EGL_MakeCurrent(_this, NULL, NULL);
+    }
+    
+    WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display );
+    
+    return ret;
+}
+
+void 
+Wayland_GLES_DeleteContext(_THIS, SDL_GLContext context)
+{
+    SDL_EGL_DeleteContext(_this, context);
+    WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display );
+}
+
+#endif /* SDL_VIDEO_DRIVER_WAYLAND && SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandopengles.h b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandopengles.h
new file mode 100644
index 000000000..77081f81b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandopengles.h	
@@ -0,0 +1,46 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_waylandopengles_h
+#define _SDL_waylandopengles_h
+
+#include "../SDL_sysvideo.h"
+#include "../SDL_egl_c.h"
+
+typedef struct SDL_PrivateGLESData
+{
+} SDL_PrivateGLESData;
+
+/* OpenGLES functions */
+#define Wayland_GLES_GetAttribute SDL_EGL_GetAttribute
+#define Wayland_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define Wayland_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define Wayland_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define Wayland_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+
+extern int Wayland_GLES_LoadLibrary(_THIS, const char *path);
+extern SDL_GLContext Wayland_GLES_CreateContext(_THIS, SDL_Window * window);
+extern void Wayland_GLES_SwapWindow(_THIS, SDL_Window * window);
+extern int Wayland_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+extern void Wayland_GLES_DeleteContext(_THIS, SDL_GLContext context);
+
+#endif /* _SDL_waylandopengles_h */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandsym.h b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandsym.h
new file mode 100644
index 000000000..c3b4fa508
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandsym.h	
@@ -0,0 +1,106 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* *INDENT-OFF* */
+
+SDL_WAYLAND_MODULE(WAYLAND_CLIENT)
+SDL_WAYLAND_SYM(void, wl_proxy_marshal, (struct wl_proxy *, uint32_t, ...))
+SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_create, (struct wl_proxy *, const struct wl_interface *))
+SDL_WAYLAND_SYM(void, wl_proxy_destroy, (struct wl_proxy *))
+SDL_WAYLAND_SYM(int, wl_proxy_add_listener, (struct wl_proxy *, void (**)(void), void *))
+SDL_WAYLAND_SYM(void, wl_proxy_set_user_data, (struct wl_proxy *, void *))
+SDL_WAYLAND_SYM(void *, wl_proxy_get_user_data, (struct wl_proxy *))
+SDL_WAYLAND_SYM(uint32_t, wl_proxy_get_id, (struct wl_proxy *))
+SDL_WAYLAND_SYM(const char *, wl_proxy_get_class, (struct wl_proxy *))
+SDL_WAYLAND_SYM(void, wl_proxy_set_queue, (struct wl_proxy *, struct wl_event_queue *))
+SDL_WAYLAND_SYM(struct wl_display *, wl_display_connect, (const char *))
+SDL_WAYLAND_SYM(struct wl_display *, wl_display_connect_to_fd, (int))
+SDL_WAYLAND_SYM(void, wl_display_disconnect, (struct wl_display *))
+SDL_WAYLAND_SYM(int, wl_display_get_fd, (struct wl_display *))
+SDL_WAYLAND_SYM(int, wl_display_dispatch, (struct wl_display *))
+SDL_WAYLAND_SYM(int, wl_display_dispatch_queue, (struct wl_display *, struct wl_event_queue *))
+SDL_WAYLAND_SYM(int, wl_display_dispatch_queue_pending, (struct wl_display *, struct wl_event_queue *))
+SDL_WAYLAND_SYM(int, wl_display_dispatch_pending, (struct wl_display *))
+SDL_WAYLAND_SYM(int, wl_display_get_error, (struct wl_display *))
+SDL_WAYLAND_SYM(int, wl_display_flush, (struct wl_display *))
+SDL_WAYLAND_SYM(int, wl_display_roundtrip, (struct wl_display *))
+SDL_WAYLAND_SYM(struct wl_event_queue *, wl_display_create_queue, (struct wl_display *))
+SDL_WAYLAND_SYM(void, wl_log_set_handler_client, (wl_log_func_t))
+SDL_WAYLAND_SYM(void, wl_list_init, (struct wl_list *))
+SDL_WAYLAND_SYM(void, wl_list_insert, (struct wl_list *, struct wl_list *) )
+SDL_WAYLAND_SYM(void, wl_list_remove, (struct wl_list *))
+SDL_WAYLAND_SYM(int, wl_list_length, (const struct wl_list *))
+SDL_WAYLAND_SYM(int, wl_list_empty, (const struct wl_list *))
+SDL_WAYLAND_SYM(void, wl_list_insert_list, (struct wl_list *, struct wl_list *))
+
+/* These functions are available in Wayland >= 1.4 */
+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4)
+SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, ...))
+
+SDL_WAYLAND_INTERFACE(wl_seat_interface)
+SDL_WAYLAND_INTERFACE(wl_surface_interface)
+SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)
+SDL_WAYLAND_INTERFACE(wl_buffer_interface)
+SDL_WAYLAND_INTERFACE(wl_registry_interface)
+SDL_WAYLAND_INTERFACE(wl_shell_surface_interface)
+SDL_WAYLAND_INTERFACE(wl_region_interface)
+SDL_WAYLAND_INTERFACE(wl_pointer_interface)
+SDL_WAYLAND_INTERFACE(wl_keyboard_interface)
+SDL_WAYLAND_INTERFACE(wl_compositor_interface)
+SDL_WAYLAND_INTERFACE(wl_output_interface)
+SDL_WAYLAND_INTERFACE(wl_shell_interface)
+SDL_WAYLAND_INTERFACE(wl_shm_interface)
+
+SDL_WAYLAND_MODULE(WAYLAND_EGL)
+SDL_WAYLAND_SYM(struct wl_egl_window *, wl_egl_window_create, (struct wl_surface *, int, int))
+SDL_WAYLAND_SYM(void, wl_egl_window_destroy, (struct wl_egl_window *))
+SDL_WAYLAND_SYM(void, wl_egl_window_resize, (struct wl_egl_window *, int, int, int, int))
+SDL_WAYLAND_SYM(void, wl_egl_window_get_attached_size, (struct wl_egl_window *, int *, int *))
+
+SDL_WAYLAND_MODULE(WAYLAND_CURSOR)
+SDL_WAYLAND_SYM(struct wl_cursor_theme *, wl_cursor_theme_load, (const char *, int , struct wl_shm *))
+SDL_WAYLAND_SYM(void, wl_cursor_theme_destroy, (struct wl_cursor_theme *))
+SDL_WAYLAND_SYM(struct wl_cursor *, wl_cursor_theme_get_cursor, (struct wl_cursor_theme *, const char *))
+SDL_WAYLAND_SYM(struct wl_buffer *, wl_cursor_image_get_buffer, (struct wl_cursor_image *))
+SDL_WAYLAND_SYM(int, wl_cursor_frame, (struct wl_cursor *, uint32_t))
+
+SDL_WAYLAND_MODULE(WAYLAND_XKB)
+SDL_WAYLAND_SYM(int, xkb_state_key_get_syms, (struct xkb_state *, xkb_keycode_t, const xkb_keysym_t **))
+SDL_WAYLAND_SYM(int, xkb_keysym_to_utf8, (xkb_keysym_t, char *, size_t) )
+SDL_WAYLAND_SYM(struct xkb_keymap *, xkb_keymap_new_from_string, (struct xkb_context *, const char *, enum xkb_keymap_format, enum xkb_keymap_compile_flags))
+SDL_WAYLAND_SYM(struct xkb_state *, xkb_state_new, (struct xkb_keymap *) )
+SDL_WAYLAND_SYM(void, xkb_keymap_unref, (struct xkb_keymap *) )
+SDL_WAYLAND_SYM(void, xkb_state_unref, (struct xkb_state *) )
+SDL_WAYLAND_SYM(void, xkb_context_unref, (struct xkb_context *) )
+SDL_WAYLAND_SYM(struct xkb_context *, xkb_context_new, (enum xkb_context_flags flags) )
+SDL_WAYLAND_SYM(enum xkb_state_component, xkb_state_update_mask, (struct xkb_state *state,\
+                      xkb_mod_mask_t depressed_mods,\
+                      xkb_mod_mask_t latched_mods,\
+                      xkb_mod_mask_t locked_mods,\
+                      xkb_layout_index_t depressed_layout,\
+                      xkb_layout_index_t latched_layout,\
+                      xkb_layout_index_t locked_layout) )
+
+
+/* *INDENT-ON* */
+
+/* vi: set ts=4 sw=4 expandtab: */
+//SDL_WAYLAND_SYM(ret, fn, params)
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandtouch.c b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandtouch.c
new file mode 100644
index 000000000..683c7029f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandtouch.c	
@@ -0,0 +1,264 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* Contributed by Thomas Perl <thomas.perl@jollamobile.com> */
+
+#include "../../SDL_internal.h"
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+
+#include "SDL_waylandtouch.h"
+#include "SDL_log.h"
+#include "../../events/SDL_touch_c.h"
+
+struct SDL_WaylandTouch {
+    struct qt_touch_extension *touch_extension;
+};
+
+
+/**
+ * Qt TouchPointState
+ * adapted from qtbase/src/corelib/global/qnamespace.h
+ **/
+enum QtWaylandTouchPointState {
+    QtWaylandTouchPointPressed    = 0x01,
+    QtWaylandTouchPointMoved      = 0x02,
+    /*
+    Never sent by the server:
+    QtWaylandTouchPointStationary = 0x04,
+    */
+    QtWaylandTouchPointReleased   = 0x08,
+};
+
+static void
+touch_handle_touch(void *data,
+        struct qt_touch_extension *qt_touch_extension,
+        uint32_t time,
+        uint32_t id,
+        uint32_t state,
+        int32_t x,
+        int32_t y,
+        int32_t normalized_x,
+        int32_t normalized_y,
+        int32_t width,
+        int32_t height,
+        uint32_t pressure,
+        int32_t velocity_x,
+        int32_t velocity_y,
+        uint32_t flags,
+        struct wl_array *rawdata)
+{
+    /**
+     * Event is assembled in QtWayland in TouchExtensionGlobal::postTouchEvent
+     * (src/compositor/wayland_wrapper/qwltouch.cpp)
+     **/
+
+    float FIXED_TO_FLOAT = 1. / 10000.;
+    float xf = FIXED_TO_FLOAT * x;
+    float yf = FIXED_TO_FLOAT * y;
+
+    float PRESSURE_TO_FLOAT = 1. / 255.;
+    float pressuref = PRESSURE_TO_FLOAT * pressure;
+
+    uint32_t touchState = state & 0xFFFF;
+    /*
+    Other fields that are sent by the server (qwltouch.cpp),
+    but not used at the moment can be decoded in this way:
+
+    uint32_t sentPointCount = state >> 16;
+    uint32_t touchFlags = flags & 0xFFFF;
+    uint32_t capabilities = flags >> 16;
+    */
+
+    SDL_TouchID deviceId = 0;
+    if (!SDL_GetTouch(deviceId)) {
+        if (SDL_AddTouch(deviceId, "qt_touch_extension") < 0) {
+             SDL_Log("error: can't add touch %s, %d", __FILE__, __LINE__);
+        }
+    }
+
+    switch (touchState) {
+        case QtWaylandTouchPointPressed:
+        case QtWaylandTouchPointReleased:
+            SDL_SendTouch(deviceId, (SDL_FingerID)id,
+                    (touchState == QtWaylandTouchPointPressed) ? SDL_TRUE : SDL_FALSE,
+                    xf, yf, pressuref);
+            break;
+        case QtWaylandTouchPointMoved:
+            SDL_SendTouchMotion(deviceId, (SDL_FingerID)id, xf, yf, pressuref);
+            break;
+        default:
+            /* Should not happen */
+            break;
+    }
+}
+
+static void
+touch_handle_configure(void *data,
+        struct qt_touch_extension *qt_touch_extension,
+        uint32_t flags)
+{
+}
+
+
+/* wayland-qt-touch-extension.c BEGINS */
+
+static const struct qt_touch_extension_listener touch_listener = {
+    touch_handle_touch,
+    touch_handle_configure,
+};
+
+static const struct wl_interface *qt_touch_extension_types[] = {
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+};
+
+static const struct wl_message qt_touch_extension_requests[] = {
+    { "dummy", "", qt_touch_extension_types + 0 },
+};
+
+static const struct wl_message qt_touch_extension_events[] = {
+    { "touch", "uuuiiiiiiuiiua", qt_touch_extension_types + 0 },
+    { "configure", "u", qt_touch_extension_types + 0 },
+};
+
+WL_EXPORT const struct wl_interface qt_touch_extension_interface = {
+    "qt_touch_extension", 1,
+    1, qt_touch_extension_requests,
+    2, qt_touch_extension_events,
+};
+
+/* wayland-qt-touch-extension.c ENDS */
+
+/* wayland-qt-windowmanager.c BEGINS */
+static const struct wl_interface *qt_windowmanager_types[] = {
+    NULL,
+    NULL,
+};
+
+static const struct wl_message qt_windowmanager_requests[] = {
+    { "open_url", "us", qt_windowmanager_types + 0 },
+};
+
+static const struct wl_message qt_windowmanager_events[] = {
+    { "hints", "i", qt_windowmanager_types + 0 },
+    { "quit", "", qt_windowmanager_types + 0 },
+};
+
+WL_EXPORT const struct wl_interface qt_windowmanager_interface = {
+    "qt_windowmanager", 1,
+    1, qt_windowmanager_requests,
+    2, qt_windowmanager_events,
+};
+/* wayland-qt-windowmanager.c ENDS */
+
+/* wayland-qt-surface-extension.c BEGINS */
+extern const struct wl_interface qt_extended_surface_interface;
+#ifndef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+extern const struct wl_interface wl_surface_interface;
+#endif
+
+static const struct wl_interface *qt_surface_extension_types[] = {
+    NULL,
+    NULL,
+    &qt_extended_surface_interface,
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+    /* FIXME: Set this dynamically to (*WAYLAND_wl_surface_interface) ? 
+     * The value comes from auto generated code and does 
+     * not appear to actually be used anywhere
+     */
+    NULL, 
+#else
+    &wl_surface_interface,
+#endif    
+};
+
+static const struct wl_message qt_surface_extension_requests[] = {
+    { "get_extended_surface", "no", qt_surface_extension_types + 2 },
+};
+
+WL_EXPORT const struct wl_interface qt_surface_extension_interface = {
+    "qt_surface_extension", 1,
+    1, qt_surface_extension_requests,
+    0, NULL,
+};
+
+static const struct wl_message qt_extended_surface_requests[] = {
+    { "update_generic_property", "sa", qt_surface_extension_types + 0 },
+    { "set_content_orientation", "i", qt_surface_extension_types + 0 },
+    { "set_window_flags", "i", qt_surface_extension_types + 0 },
+};
+
+static const struct wl_message qt_extended_surface_events[] = {
+    { "onscreen_visibility", "i", qt_surface_extension_types + 0 },
+    { "set_generic_property", "sa", qt_surface_extension_types + 0 },
+    { "close", "", qt_surface_extension_types + 0 },
+};
+
+WL_EXPORT const struct wl_interface qt_extended_surface_interface = {
+    "qt_extended_surface", 1,
+    3, qt_extended_surface_requests,
+    3, qt_extended_surface_events,
+};
+
+/* wayland-qt-surface-extension.c ENDS */
+
+void
+Wayland_touch_create(SDL_VideoData *data, uint32_t id)
+{
+    if (data->touch) {
+        Wayland_touch_destroy(data);
+    }
+
+    data->touch = malloc(sizeof(struct SDL_WaylandTouch));
+
+    struct SDL_WaylandTouch *touch = data->touch;
+    touch->touch_extension = wl_registry_bind(data->registry, id, &qt_touch_extension_interface, 1);
+    qt_touch_extension_add_listener(touch->touch_extension, &touch_listener, data);
+}
+
+void
+Wayland_touch_destroy(SDL_VideoData *data)
+{
+    if (data->touch) {
+        struct SDL_WaylandTouch *touch = data->touch;
+        if (touch->touch_extension) {
+            qt_touch_extension_destroy(touch->touch_extension);
+        }
+
+        free(data->touch);
+        data->touch = NULL;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandtouch.h b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandtouch.h
new file mode 100644
index 000000000..435fd5624
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandtouch.h	
@@ -0,0 +1,352 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+
+#ifndef _SDL_waylandtouch_h
+#define _SDL_waylandtouch_h
+
+#include "SDL_waylandvideo.h"
+#include <stdint.h>
+#include <stddef.h>
+#include "wayland-util.h"
+#include "SDL_waylanddyn.h"
+
+
+void Wayland_touch_create(SDL_VideoData *data, uint32_t id);
+void Wayland_touch_destroy(SDL_VideoData *data);
+
+struct qt_touch_extension;
+
+/* Autogenerated QT headers */
+
+/*
+ Support for Wayland with QmlCompositor as Server
+================================================
+
+The Wayland video driver has support for some additional features when
+using QtWayland's "qmlcompositor" as Wayland server. This is needed for touch
+input when running SDL applications under a qmlcompositor Wayland server.
+
+The files following headers have been
+generated from the Wayland XML Protocol Definition in QtWayland as follows:
+
+Clone QtWayland from Git:
+    http://qt.gitorious.org/qt/qtwayland/
+
+Generate headers and glue code:
+    for extension in touch-extension surface-extension windowmanager; do
+        wayland-scanner client-header < src/extensions/$extension.xml > wayland-qt-$extension.h
+        wayland-scanner code < src/extensions/$extension.xml > wayland-qt-$extension.c
+    done
+
+*/
+
+/* wayland-qt-surface-extension.h */
+
+struct wl_client;
+struct wl_resource;
+
+struct qt_surface_extension;
+struct qt_extended_surface;
+
+extern const struct wl_interface qt_surface_extension_interface;
+extern const struct wl_interface qt_extended_surface_interface;
+
+#define QT_SURFACE_EXTENSION_GET_EXTENDED_SURFACE   0
+
+static inline void
+qt_surface_extension_set_user_data(struct qt_surface_extension *qt_surface_extension, void *user_data)
+{
+    wl_proxy_set_user_data((struct wl_proxy *) qt_surface_extension, user_data);
+}
+
+static inline void *
+qt_surface_extension_get_user_data(struct qt_surface_extension *qt_surface_extension)
+{
+    return wl_proxy_get_user_data((struct wl_proxy *) qt_surface_extension);
+}
+
+static inline void
+qt_surface_extension_destroy(struct qt_surface_extension *qt_surface_extension)
+{
+    WAYLAND_wl_proxy_destroy((struct wl_proxy *) qt_surface_extension);
+}
+
+static inline struct qt_extended_surface *
+qt_surface_extension_get_extended_surface(struct qt_surface_extension *qt_surface_extension, struct wl_surface *surface)
+{
+    struct wl_proxy *id;
+
+    id = wl_proxy_create((struct wl_proxy *) qt_surface_extension,
+                 &qt_extended_surface_interface);
+    if (!id)
+        return NULL;
+
+    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_surface_extension,
+             QT_SURFACE_EXTENSION_GET_EXTENDED_SURFACE, id, surface);
+
+    return (struct qt_extended_surface *) id;
+}
+
+#ifndef QT_EXTENDED_SURFACE_ORIENTATION_ENUM
+#define QT_EXTENDED_SURFACE_ORIENTATION_ENUM
+enum qt_extended_surface_orientation {
+    QT_EXTENDED_SURFACE_ORIENTATION_PRIMARYORIENTATION = 0,
+    QT_EXTENDED_SURFACE_ORIENTATION_PORTRAITORIENTATION = 1,
+    QT_EXTENDED_SURFACE_ORIENTATION_LANDSCAPEORIENTATION = 2,
+    QT_EXTENDED_SURFACE_ORIENTATION_INVERTEDPORTRAITORIENTATION = 4,
+    QT_EXTENDED_SURFACE_ORIENTATION_INVERTEDLANDSCAPEORIENTATION = 8,
+};
+#endif /* QT_EXTENDED_SURFACE_ORIENTATION_ENUM */
+
+#ifndef QT_EXTENDED_SURFACE_WINDOWFLAG_ENUM
+#define QT_EXTENDED_SURFACE_WINDOWFLAG_ENUM
+enum qt_extended_surface_windowflag {
+    QT_EXTENDED_SURFACE_WINDOWFLAG_OVERRIDESSYSTEMGESTURES = 1,
+    QT_EXTENDED_SURFACE_WINDOWFLAG_STAYSONTOP = 2,
+};
+#endif /* QT_EXTENDED_SURFACE_WINDOWFLAG_ENUM */
+
+struct qt_extended_surface_listener {
+    /**
+     * onscreen_visibility - (none)
+     * @visible: (none)
+     */
+    void (*onscreen_visibility)(void *data,
+                    struct qt_extended_surface *qt_extended_surface,
+                    int32_t visible);
+    /**
+     * set_generic_property - (none)
+     * @name: (none)
+     * @value: (none)
+     */
+    void (*set_generic_property)(void *data,
+                     struct qt_extended_surface *qt_extended_surface,
+                     const char *name,
+                     struct wl_array *value);
+    /**
+     * close - (none)
+     */
+    void (*close)(void *data,
+              struct qt_extended_surface *qt_extended_surface);
+};
+
+static inline int
+qt_extended_surface_add_listener(struct qt_extended_surface *qt_extended_surface,
+                 const struct qt_extended_surface_listener *listener, void *data)
+{
+    return wl_proxy_add_listener((struct wl_proxy *) qt_extended_surface,
+                     (void (**)(void)) listener, data);
+}
+
+#define QT_EXTENDED_SURFACE_UPDATE_GENERIC_PROPERTY 0
+#define QT_EXTENDED_SURFACE_SET_CONTENT_ORIENTATION 1
+#define QT_EXTENDED_SURFACE_SET_WINDOW_FLAGS    2
+
+static inline void
+qt_extended_surface_set_user_data(struct qt_extended_surface *qt_extended_surface, void *user_data)
+{
+    WAYLAND_wl_proxy_set_user_data((struct wl_proxy *) qt_extended_surface, user_data);
+}
+
+static inline void *
+qt_extended_surface_get_user_data(struct qt_extended_surface *qt_extended_surface)
+{
+    return WAYLAND_wl_proxy_get_user_data((struct wl_proxy *) qt_extended_surface);
+}
+
+static inline void
+qt_extended_surface_destroy(struct qt_extended_surface *qt_extended_surface)
+{
+    WAYLAND_wl_proxy_destroy((struct wl_proxy *) qt_extended_surface);
+}
+
+static inline void
+qt_extended_surface_update_generic_property(struct qt_extended_surface *qt_extended_surface, const char *name, struct wl_array *value)
+{
+    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_extended_surface,
+             QT_EXTENDED_SURFACE_UPDATE_GENERIC_PROPERTY, name, value);
+}
+
+static inline void
+qt_extended_surface_set_content_orientation(struct qt_extended_surface *qt_extended_surface, int32_t orientation)
+{
+    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_extended_surface,
+             QT_EXTENDED_SURFACE_SET_CONTENT_ORIENTATION, orientation);
+}
+
+static inline void
+qt_extended_surface_set_window_flags(struct qt_extended_surface *qt_extended_surface, int32_t flags)
+{
+    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_extended_surface,
+             QT_EXTENDED_SURFACE_SET_WINDOW_FLAGS, flags);
+}
+
+/* wayland-qt-touch-extension.h */
+
+extern const struct wl_interface qt_touch_extension_interface;
+
+#ifndef QT_TOUCH_EXTENSION_FLAGS_ENUM
+#define QT_TOUCH_EXTENSION_FLAGS_ENUM
+enum qt_touch_extension_flags {
+    QT_TOUCH_EXTENSION_FLAGS_MOUSE_FROM_TOUCH = 0x1,
+};
+#endif /* QT_TOUCH_EXTENSION_FLAGS_ENUM */
+
+struct qt_touch_extension_listener {
+    /**
+     * touch - (none)
+     * @time: (none)
+     * @id: (none)
+     * @state: (none)
+     * @x: (none)
+     * @y: (none)
+     * @normalized_x: (none)
+     * @normalized_y: (none)
+     * @width: (none)
+     * @height: (none)
+     * @pressure: (none)
+     * @velocity_x: (none)
+     * @velocity_y: (none)
+     * @flags: (none)
+     * @rawdata: (none)
+     */
+    void (*touch)(void *data,
+              struct qt_touch_extension *qt_touch_extension,
+              uint32_t time,
+              uint32_t id,
+              uint32_t state,
+              int32_t x,
+              int32_t y,
+              int32_t normalized_x,
+              int32_t normalized_y,
+              int32_t width,
+              int32_t height,
+              uint32_t pressure,
+              int32_t velocity_x,
+              int32_t velocity_y,
+              uint32_t flags,
+              struct wl_array *rawdata);
+    /**
+     * configure - (none)
+     * @flags: (none)
+     */
+    void (*configure)(void *data,
+              struct qt_touch_extension *qt_touch_extension,
+              uint32_t flags);
+};
+
+static inline int
+qt_touch_extension_add_listener(struct qt_touch_extension *qt_touch_extension,
+                const struct qt_touch_extension_listener *listener, void *data)
+{
+    return wl_proxy_add_listener((struct wl_proxy *) qt_touch_extension,
+                     (void (**)(void)) listener, data);
+}
+
+#define QT_TOUCH_EXTENSION_DUMMY    0
+
+static inline void
+qt_touch_extension_set_user_data(struct qt_touch_extension *qt_touch_extension, void *user_data)
+{
+    WAYLAND_wl_proxy_set_user_data((struct wl_proxy *) qt_touch_extension, user_data);
+}
+
+static inline void *
+qt_touch_extension_get_user_data(struct qt_touch_extension *qt_touch_extension)
+{
+    return WAYLAND_wl_proxy_get_user_data((struct wl_proxy *) qt_touch_extension);
+}
+
+static inline void
+qt_touch_extension_destroy(struct qt_touch_extension *qt_touch_extension)
+{
+    WAYLAND_wl_proxy_destroy((struct wl_proxy *) qt_touch_extension);
+}
+
+static inline void
+qt_touch_extension_dummy(struct qt_touch_extension *qt_touch_extension)
+{
+    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_touch_extension,
+             QT_TOUCH_EXTENSION_DUMMY);
+}
+
+
+/* wayland-qt-windowmanager.h */
+
+extern const struct wl_interface qt_windowmanager_interface;
+
+struct qt_windowmanager_listener {
+    /**
+     * hints - (none)
+     * @show_is_fullscreen: (none)
+     */
+    void (*hints)(void *data,
+              struct qt_windowmanager *qt_windowmanager,
+              int32_t show_is_fullscreen);
+    /**
+     * quit - (none)
+     */
+    void (*quit)(void *data,
+             struct qt_windowmanager *qt_windowmanager);
+};
+
+static inline int
+qt_windowmanager_add_listener(struct qt_windowmanager *qt_windowmanager,
+                  const struct qt_windowmanager_listener *listener, void *data)
+{
+    return wl_proxy_add_listener((struct wl_proxy *) qt_windowmanager,
+                     (void (**)(void)) listener, data);
+}
+
+#define QT_WINDOWMANAGER_OPEN_URL   0
+
+static inline void
+qt_windowmanager_set_user_data(struct qt_windowmanager *qt_windowmanager, void *user_data)
+{
+    WAYLAND_wl_proxy_set_user_data((struct wl_proxy *) qt_windowmanager, user_data);
+}
+
+static inline void *
+qt_windowmanager_get_user_data(struct qt_windowmanager *qt_windowmanager)
+{
+    return WAYLAND_wl_proxy_get_user_data((struct wl_proxy *) qt_windowmanager);
+}
+
+static inline void
+qt_windowmanager_destroy(struct qt_windowmanager *qt_windowmanager)
+{
+    WAYLAND_wl_proxy_destroy((struct wl_proxy *) qt_windowmanager);
+}
+
+static inline void
+qt_windowmanager_open_url(struct qt_windowmanager *qt_windowmanager, uint32_t remaining, const char *url)
+{
+    WAYLAND_wl_proxy_marshal((struct wl_proxy *) qt_windowmanager,
+             QT_WINDOWMANAGER_OPEN_URL, remaining, url);
+}
+
+#endif /* _SDL_waylandtouch_h */
+
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandvideo.c b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandvideo.c
new file mode 100644
index 000000000..43826b831
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandvideo.c	
@@ -0,0 +1,437 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WAYLAND
+
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "SDL_stdinc.h"
+#include "../../events/SDL_events_c.h"
+
+#include "SDL_waylandvideo.h"
+#include "SDL_waylandevents_c.h"
+#include "SDL_waylandwindow.h"
+#include "SDL_waylandopengles.h"
+#include "SDL_waylandmouse.h"
+#include "SDL_waylandtouch.h"
+
+#include <fcntl.h>
+#include <xkbcommon/xkbcommon.h>
+
+#include "SDL_waylanddyn.h"
+#include <wayland-util.h>
+
+#define WAYLANDVID_DRIVER_NAME "wayland"
+
+struct wayland_mode {
+    SDL_DisplayMode mode;
+    struct wl_list link;
+};
+
+/* Initialization/Query functions */
+static int
+Wayland_VideoInit(_THIS);
+
+static void
+Wayland_GetDisplayModes(_THIS, SDL_VideoDisplay *sdl_display);
+static int
+Wayland_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode);
+
+static void
+Wayland_VideoQuit(_THIS);
+
+/* Wayland driver bootstrap functions */
+static int
+Wayland_Available(void)
+{
+    struct wl_display *display = NULL;
+    if (SDL_WAYLAND_LoadSymbols()) {
+        display = WAYLAND_wl_display_connect(NULL);
+        if (display != NULL) {
+            WAYLAND_wl_display_disconnect(display);
+        }
+        SDL_WAYLAND_UnloadSymbols();
+    }
+
+    return (display != NULL);
+}
+
+static void
+Wayland_DeleteDevice(SDL_VideoDevice *device)
+{
+    SDL_free(device);
+    SDL_WAYLAND_UnloadSymbols();
+}
+
+static SDL_VideoDevice *
+Wayland_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+    
+    if (!SDL_WAYLAND_LoadSymbols()) {
+        return NULL;
+    }
+
+    /* Initialize all variables that we clean on shutdown */
+    device = SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (!device) {
+        SDL_WAYLAND_UnloadSymbols();
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    /* Set the function pointers */
+    device->VideoInit = Wayland_VideoInit;
+    device->VideoQuit = Wayland_VideoQuit;
+    device->SetDisplayMode = Wayland_SetDisplayMode;
+    device->GetDisplayModes = Wayland_GetDisplayModes;
+    device->GetWindowWMInfo = Wayland_GetWindowWMInfo;
+
+    device->PumpEvents = Wayland_PumpEvents;
+
+    device->GL_SwapWindow = Wayland_GLES_SwapWindow;
+    device->GL_GetSwapInterval = Wayland_GLES_GetSwapInterval;
+    device->GL_SetSwapInterval = Wayland_GLES_SetSwapInterval;
+    device->GL_MakeCurrent = Wayland_GLES_MakeCurrent;
+    device->GL_CreateContext = Wayland_GLES_CreateContext;
+    device->GL_LoadLibrary = Wayland_GLES_LoadLibrary;
+    device->GL_UnloadLibrary = Wayland_GLES_UnloadLibrary;
+    device->GL_GetProcAddress = Wayland_GLES_GetProcAddress;
+    device->GL_DeleteContext = Wayland_GLES_DeleteContext;
+
+    device->CreateWindow = Wayland_CreateWindow;
+    device->ShowWindow = Wayland_ShowWindow;
+    device->SetWindowFullscreen = Wayland_SetWindowFullscreen;
+    device->SetWindowSize = Wayland_SetWindowSize;
+    device->DestroyWindow = Wayland_DestroyWindow;
+
+    device->free = Wayland_DeleteDevice;
+
+    return device;
+}
+
+VideoBootStrap Wayland_bootstrap = {
+    WAYLANDVID_DRIVER_NAME, "SDL Wayland video driver",
+    Wayland_Available, Wayland_CreateDevice
+};
+
+static void
+wayland_add_mode(SDL_VideoData *d, SDL_DisplayMode m)
+{
+    struct wayland_mode *mode;
+
+    /* Check for duplicate mode */
+    wl_list_for_each(mode, &d->modes_list, link)
+        if (mode->mode.w == m.w && mode->mode.h == m.h &&
+	    mode->mode.refresh_rate == m.refresh_rate)
+	    return;
+
+    /* Add new mode to the list */
+    mode = (struct wayland_mode *) SDL_calloc(1, sizeof *mode);
+
+    if (!mode)
+	return;
+
+    mode->mode = m;
+    WAYLAND_wl_list_insert(&d->modes_list, &mode->link);
+}
+
+static void
+display_handle_geometry(void *data,
+                        struct wl_output *output,
+                        int x, int y,
+                        int physical_width,
+                        int physical_height,
+                        int subpixel,
+                        const char *make,
+                        const char *model,
+                        int transform)
+
+{
+    SDL_VideoData *d = data;
+
+    d->screen_allocation.x = x;
+    d->screen_allocation.y = y;
+}
+
+static void
+display_handle_mode(void *data,
+                    struct wl_output *wl_output,
+                    uint32_t flags,
+                    int width,
+                    int height,
+                    int refresh)
+{
+    SDL_VideoData *d = data;
+    SDL_DisplayMode mode;
+
+    SDL_zero(mode);
+    mode.w = width;
+    mode.h = height;
+    mode.refresh_rate = refresh / 1000;
+
+    wayland_add_mode(d, mode);
+
+    if (flags & WL_OUTPUT_MODE_CURRENT) {
+        d->screen_allocation.width = width;
+        d->screen_allocation.height = height;
+    }
+}
+
+static const struct wl_output_listener output_listener = {
+    display_handle_geometry,
+    display_handle_mode
+};
+
+static void
+shm_handle_format(void *data,
+                  struct wl_shm *shm,
+                  uint32_t format)
+{
+    SDL_VideoData *d = data;
+
+    d->shm_formats |= (1 << format);
+}
+
+static const struct wl_shm_listener shm_listener = {
+    shm_handle_format
+};
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+static void
+windowmanager_hints(void *data, struct qt_windowmanager *qt_windowmanager,
+        int32_t show_is_fullscreen)
+{
+}
+
+static void
+windowmanager_quit(void *data, struct qt_windowmanager *qt_windowmanager)
+{
+    SDL_SendQuit();
+}
+
+static const struct qt_windowmanager_listener windowmanager_listener = {
+    windowmanager_hints,
+    windowmanager_quit,
+};
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+
+static void
+display_handle_global(void *data, struct wl_registry *registry, uint32_t id,
+					const char *interface, uint32_t version)
+{
+    SDL_VideoData *d = data;
+    
+    if (strcmp(interface, "wl_compositor") == 0) {
+        d->compositor = wl_registry_bind(d->registry, id, &wl_compositor_interface, 1);
+    } else if (strcmp(interface, "wl_output") == 0) {
+        d->output = wl_registry_bind(d->registry, id, &wl_output_interface, 1);
+        wl_output_add_listener(d->output, &output_listener, d);
+    } else if (strcmp(interface, "wl_seat") == 0) {
+        Wayland_display_add_input(d, id);
+    } else if (strcmp(interface, "wl_shell") == 0) {
+        d->shell = wl_registry_bind(d->registry, id, &wl_shell_interface, 1);
+    } else if (strcmp(interface, "wl_shm") == 0) {
+        d->shm = wl_registry_bind(registry, id, &wl_shm_interface, 1);
+        d->cursor_theme = WAYLAND_wl_cursor_theme_load(NULL, 32, d->shm);
+        d->default_cursor = WAYLAND_wl_cursor_theme_get_cursor(d->cursor_theme, "left_ptr");
+        wl_shm_add_listener(d->shm, &shm_listener, d);
+    
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+    } else if (strcmp(interface, "qt_touch_extension") == 0) {
+        Wayland_touch_create(d, id);
+    } else if (strcmp(interface, "qt_surface_extension") == 0) {
+        d->surface_extension = wl_registry_bind(registry, id,
+                &qt_surface_extension_interface, 1);
+    } else if (strcmp(interface, "qt_windowmanager") == 0) {
+        d->windowmanager = wl_registry_bind(registry, id,
+                &qt_windowmanager_interface, 1);
+        qt_windowmanager_add_listener(d->windowmanager, &windowmanager_listener, d);
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+    }
+}
+
+static const struct wl_registry_listener registry_listener = {
+	display_handle_global
+};
+
+int
+Wayland_VideoInit(_THIS)
+{
+    SDL_VideoData *data;
+    SDL_VideoDisplay display;
+    SDL_DisplayMode mode;
+    int i;
+    
+    data = malloc(sizeof *data);
+    if (data == NULL)
+        return 0;
+    memset(data, 0, sizeof *data);
+
+    _this->driverdata = data;
+
+    WAYLAND_wl_list_init(&data->modes_list);
+    
+    data->display = WAYLAND_wl_display_connect(NULL);
+    if (data->display == NULL) {
+        SDL_SetError("Failed to connect to a Wayland display");
+        return 0;
+    }
+
+    data->registry = wl_display_get_registry(data->display);
+   
+    if ( data->registry == NULL) {
+        SDL_SetError("Failed to get the Wayland registry");
+        return 0;
+    }
+    
+    wl_registry_add_listener(data->registry, &registry_listener, data);
+
+    for (i=0; i < 100; i++) {
+        if (data->screen_allocation.width != 0 || WAYLAND_wl_display_get_error(data->display) != 0) {
+            break;
+        }
+        WAYLAND_wl_display_dispatch(data->display);
+    }
+    
+    if (data->screen_allocation.width == 0) {
+        SDL_SetError("Failed while waiting for screen allocation: %d ", WAYLAND_wl_display_get_error(data->display));
+        return 0;
+    }
+
+    data->xkb_context = WAYLAND_xkb_context_new(0);
+    if (!data->xkb_context) {
+        SDL_SetError("Failed to create XKB context");
+        return 0;
+    }
+
+    /* Use a fake 32-bpp desktop mode */
+    mode.format = SDL_PIXELFORMAT_RGB888;
+    mode.w = data->screen_allocation.width;
+    mode.h = data->screen_allocation.height;
+    mode.refresh_rate = 0;
+    mode.driverdata = NULL;
+    wayland_add_mode(data, mode);
+    SDL_zero(display);
+    display.desktop_mode = mode;
+    display.current_mode = mode;
+    display.driverdata = NULL;
+    SDL_AddVideoDisplay(&display);
+
+    Wayland_InitMouse ();
+
+    WAYLAND_wl_display_flush(data->display);
+
+    return 0;
+}
+
+static void
+Wayland_GetDisplayModes(_THIS, SDL_VideoDisplay *sdl_display)
+{
+    SDL_VideoData *data = _this->driverdata;
+    SDL_DisplayMode mode;
+    struct wayland_mode *m;
+
+    Wayland_PumpEvents(_this);
+
+    wl_list_for_each(m, &data->modes_list, link) {
+        m->mode.format = SDL_PIXELFORMAT_RGB888;
+        SDL_AddDisplayMode(sdl_display, &m->mode);
+        m->mode.format = SDL_PIXELFORMAT_RGBA8888;
+        SDL_AddDisplayMode(sdl_display, &m->mode);
+    }
+
+    mode.w = data->screen_allocation.width;
+    mode.h = data->screen_allocation.height;
+    mode.refresh_rate = 0;
+    mode.driverdata = NULL;
+
+    mode.format = SDL_PIXELFORMAT_RGB888;
+    SDL_AddDisplayMode(sdl_display, &mode);
+    mode.format = SDL_PIXELFORMAT_RGBA8888;
+    SDL_AddDisplayMode(sdl_display, &mode);
+}
+
+static int
+Wayland_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode)
+{
+    return 0;
+}
+
+void
+Wayland_VideoQuit(_THIS)
+{
+    SDL_VideoData *data = _this->driverdata;
+    struct wayland_mode *t, *m;
+
+    Wayland_FiniMouse ();
+
+    if (data->output)
+        wl_output_destroy(data->output);
+
+    Wayland_display_destroy_input(data);
+
+    if (data->xkb_context) {
+        WAYLAND_xkb_context_unref(data->xkb_context);
+        data->xkb_context = NULL;
+    }
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+    if (data->windowmanager)
+        qt_windowmanager_destroy(data->windowmanager);
+
+    if (data->surface_extension)
+        qt_surface_extension_destroy(data->surface_extension);
+
+    Wayland_touch_destroy(data);
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+
+    if (data->shm)
+        wl_shm_destroy(data->shm);
+
+    if (data->cursor_theme)
+        WAYLAND_wl_cursor_theme_destroy(data->cursor_theme);
+
+    if (data->shell)
+        wl_shell_destroy(data->shell);
+
+    if (data->compositor)
+        wl_compositor_destroy(data->compositor);
+
+    if (data->display) {
+        WAYLAND_wl_display_flush(data->display);
+        WAYLAND_wl_display_disconnect(data->display);
+    }
+    
+    wl_list_for_each_safe(m, t, &data->modes_list, link) {
+        WAYLAND_wl_list_remove(&m->link);
+        free(m);
+    }
+
+
+    free(data);
+    _this->driverdata = NULL;
+}
+
+#endif /* SDL_VIDEO_DRIVER_WAYLAND */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandvideo.h b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandvideo.h
new file mode 100644
index 000000000..06bcdc48d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandvideo.h	
@@ -0,0 +1,74 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_waylandvideo_h
+#define _SDL_waylandvideo_h
+
+#include <EGL/egl.h>
+#include "wayland-util.h"
+
+struct xkb_context;
+struct SDL_WaylandInput;
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+struct SDL_WaylandTouch;
+struct qt_surface_extension;
+struct qt_windowmanager;
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+
+typedef struct {
+    struct wl_display *display;
+    struct wl_registry *registry;
+    struct wl_compositor *compositor;
+    struct wl_output *output;
+    struct wl_shm *shm;
+    struct wl_cursor_theme *cursor_theme;
+    struct wl_cursor *default_cursor;
+    struct wl_pointer *pointer;
+    struct wl_shell *shell;
+
+    struct {
+        int32_t x, y, width, height;
+    } screen_allocation;
+
+    struct wl_list modes_list;
+
+    EGLDisplay edpy;
+    EGLContext context;
+    EGLConfig econf;
+
+    struct xkb_context *xkb_context;
+    struct SDL_WaylandInput *input;
+    
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH    
+    struct SDL_WaylandTouch *touch;
+    struct qt_surface_extension *surface_extension;
+    struct qt_windowmanager *windowmanager;
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+
+    uint32_t shm_formats;
+} SDL_VideoData;
+
+#endif /* _SDL_nullvideo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandwindow.c b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandwindow.c
new file mode 100644
index 000000000..f7b339cfc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandwindow.c	
@@ -0,0 +1,243 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WAYLAND && SDL_VIDEO_OPENGL_EGL
+
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_windowevents_c.h"
+#include "../SDL_egl_c.h"
+#include "SDL_waylandwindow.h"
+#include "SDL_waylandvideo.h"
+#include "SDL_waylandtouch.h"
+
+static void
+handle_ping(void *data, struct wl_shell_surface *shell_surface,
+            uint32_t serial)
+{
+    wl_shell_surface_pong(shell_surface, serial);
+}
+
+static void
+handle_configure(void *data, struct wl_shell_surface *shell_surface,
+                 uint32_t edges, int32_t width, int32_t height)
+{
+}
+
+static void
+handle_popup_done(void *data, struct wl_shell_surface *shell_surface)
+{
+}
+
+static const struct wl_shell_surface_listener shell_surface_listener = {
+    handle_ping,
+    handle_configure,
+    handle_popup_done
+};
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+static void
+handle_onscreen_visibility(void *data,
+        struct qt_extended_surface *qt_extended_surface, int32_t visible)
+{
+}
+
+static void
+handle_set_generic_property(void *data,
+        struct qt_extended_surface *qt_extended_surface, const char *name,
+        struct wl_array *value)
+{
+}
+
+static void
+handle_close(void *data, struct qt_extended_surface *qt_extended_surface)
+{
+    SDL_WindowData *window = (SDL_WindowData *)data;
+    SDL_SendWindowEvent(window->sdlwindow, SDL_WINDOWEVENT_CLOSE, 0, 0);
+}
+
+static const struct qt_extended_surface_listener extended_surface_listener = {
+    handle_onscreen_visibility,
+    handle_set_generic_property,
+    handle_close,
+};
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+
+SDL_bool
+Wayland_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+    info->info.wl.display = data->waylandData->display;
+    info->info.wl.surface = data->surface;
+    info->info.wl.shell_surface = data->shell_surface;
+    info->subsystem = SDL_SYSWM_WAYLAND;
+
+    return SDL_TRUE;
+}
+
+void Wayland_ShowWindow(_THIS, SDL_Window *window)
+{
+    SDL_WindowData *wind = window->driverdata;
+
+    if (window->flags & SDL_WINDOW_FULLSCREEN)
+        wl_shell_surface_set_fullscreen(wind->shell_surface,
+                                        WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
+                                        0, NULL);
+    else
+        wl_shell_surface_set_toplevel(wind->shell_surface);
+
+    WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display );
+}
+
+void
+Wayland_SetWindowFullscreen(_THIS, SDL_Window * window,
+                            SDL_VideoDisplay * _display, SDL_bool fullscreen)
+{
+    SDL_WindowData *wind = window->driverdata;
+
+    if (fullscreen)
+        wl_shell_surface_set_fullscreen(wind->shell_surface,
+                                        WL_SHELL_SURFACE_FULLSCREEN_METHOD_SCALE,
+                                        0, NULL);
+    else
+        wl_shell_surface_set_toplevel(wind->shell_surface);
+
+    WAYLAND_wl_display_flush( ((SDL_VideoData*)_this->driverdata)->display );
+}
+
+int Wayland_CreateWindow(_THIS, SDL_Window *window)
+{
+    SDL_WindowData *data;
+    SDL_VideoData *c;
+    struct wl_region *region;
+
+    data = calloc(1, sizeof *data);
+    if (data == NULL)
+        return 0;
+
+    c = _this->driverdata;
+    window->driverdata = data;
+
+    if (!(window->flags & SDL_WINDOW_OPENGL)) {
+        SDL_GL_LoadLibrary(NULL);
+        window->flags |= SDL_WINDOW_OPENGL;
+    }
+
+    if (window->x == SDL_WINDOWPOS_UNDEFINED) {
+        window->x = 0;
+    }
+    if (window->y == SDL_WINDOWPOS_UNDEFINED) {
+        window->y = 0;
+    }
+
+    data->waylandData = c;
+    data->sdlwindow = window;
+
+    data->surface =
+        wl_compositor_create_surface(c->compositor);
+    wl_surface_set_user_data(data->surface, data);
+    data->shell_surface = wl_shell_get_shell_surface(c->shell,
+                                                     data->surface);
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH    
+    if (c->surface_extension) {
+        data->extended_surface = qt_surface_extension_get_extended_surface(
+                c->surface_extension, data->surface);
+    }
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+    data->egl_window = WAYLAND_wl_egl_window_create(data->surface,
+                                            window->w, window->h);
+
+    /* Create the GLES window surface */
+    data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) data->egl_window);
+    
+    if (data->egl_surface == EGL_NO_SURFACE) {
+        SDL_SetError("failed to create a window surface");
+        return -1;
+    }
+
+    if (data->shell_surface) {
+        wl_shell_surface_set_user_data(data->shell_surface, data);
+        wl_shell_surface_add_listener(data->shell_surface,
+                                      &shell_surface_listener, data);
+    }
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+    if (data->extended_surface) {
+        qt_extended_surface_set_user_data(data->extended_surface, data);
+        qt_extended_surface_add_listener(data->extended_surface,
+                                         &extended_surface_listener, data);
+    }
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+
+    region = wl_compositor_create_region(c->compositor);
+    wl_region_add(region, 0, 0, window->w, window->h);
+    wl_surface_set_opaque_region(data->surface, region);
+    wl_region_destroy(region);
+
+    WAYLAND_wl_display_flush(c->display);
+
+    return 0;
+}
+
+void Wayland_SetWindowSize(_THIS, SDL_Window * window)
+{
+    SDL_VideoData *data = _this->driverdata;
+    SDL_WindowData *wind = window->driverdata;
+    struct wl_region *region;
+
+    WAYLAND_wl_egl_window_resize(wind->egl_window, window->w, window->h, 0, 0);
+
+    region =wl_compositor_create_region(data->compositor);
+    wl_region_add(region, 0, 0, window->w, window->h);
+    wl_surface_set_opaque_region(wind->surface, region);
+    wl_region_destroy(region);
+}
+
+void Wayland_DestroyWindow(_THIS, SDL_Window *window)
+{
+    SDL_VideoData *data = _this->driverdata;
+    SDL_WindowData *wind = window->driverdata;
+
+    window->driverdata = NULL;
+
+    if (data) {
+        SDL_EGL_DestroySurface(_this, wind->egl_surface);
+        WAYLAND_wl_egl_window_destroy(wind->egl_window);
+
+        if (wind->shell_surface)
+            wl_shell_surface_destroy(wind->shell_surface);
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+        if (wind->extended_surface)
+            qt_extended_surface_destroy(wind->extended_surface);
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+        wl_surface_destroy(wind->surface);
+
+        SDL_free(wind);
+        WAYLAND_wl_display_flush(data->display);
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_WAYLAND && SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/wayland/SDL_waylandwindow.h b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandwindow.h
new file mode 100644
index 000000000..c1190d521
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/wayland/SDL_waylandwindow.h	
@@ -0,0 +1,61 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_waylandwindow_h
+#define _SDL_waylandwindow_h
+
+#include "../SDL_sysvideo.h"
+#include "SDL_syswm.h"
+
+#include "SDL_waylandvideo.h"
+
+struct SDL_WaylandInput;
+
+typedef struct {
+    SDL_Window *sdlwindow;
+    SDL_VideoData *waylandData;
+    struct wl_surface *surface;
+    struct wl_shell_surface *shell_surface;
+    struct wl_egl_window *egl_window;
+    struct SDL_WaylandInput *keyboard_device;
+    EGLSurface egl_surface;
+
+#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+    struct qt_extended_surface *extended_surface;
+#endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */    
+} SDL_WindowData;
+
+extern void Wayland_ShowWindow(_THIS, SDL_Window *window);
+extern void Wayland_SetWindowFullscreen(_THIS, SDL_Window * window,
+                                        SDL_VideoDisplay * _display,
+                                        SDL_bool fullscreen);
+extern int Wayland_CreateWindow(_THIS, SDL_Window *window);
+extern void Wayland_SetWindowSize(_THIS, SDL_Window * window);
+extern void Wayland_DestroyWindow(_THIS, SDL_Window *window);
+
+extern SDL_bool
+Wayland_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info);
+
+#endif /* _SDL_waylandwindow_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_msctf.h b/Source/3rd Party/sdl/src/video/windows/SDL_msctf.h
new file mode 100644
index 000000000..01e732cfb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_msctf.h	
@@ -0,0 +1,242 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SDL_msctf_h
+#define _SDL_msctf_h
+
+#include <unknwn.h>
+
+#define     TF_INVALID_COOKIE               (0xffffffff)
+#define     TF_IPSINK_FLAG_ACTIVE           0x0001
+#define     TF_TMAE_UIELEMENTENABLEDONLY    0x00000004
+
+typedef struct ITfThreadMgr ITfThreadMgr;
+typedef struct ITfDocumentMgr ITfDocumentMgr;
+typedef struct ITfClientId ITfClientId;
+
+typedef struct IEnumTfDocumentMgrs IEnumTfDocumentMgrs;
+typedef struct IEnumTfFunctionProviders IEnumTfFunctionProviders;
+typedef struct ITfFunctionProvider ITfFunctionProvider;
+typedef struct ITfCompartmentMgr ITfCompartmentMgr;
+typedef struct ITfContext ITfContext;
+typedef struct IEnumTfContexts IEnumTfContexts;
+typedef struct ITfUIElementSink ITfUIElementSink;
+typedef struct ITfUIElement ITfUIElement;
+typedef struct ITfUIElementMgr ITfUIElementMgr;
+typedef struct IEnumTfUIElements IEnumTfUIElements;
+typedef struct ITfThreadMgrEx ITfThreadMgrEx;
+typedef struct ITfCandidateListUIElement ITfCandidateListUIElement;
+typedef struct ITfReadingInformationUIElement ITfReadingInformationUIElement;
+typedef struct ITfInputProcessorProfileActivationSink ITfInputProcessorProfileActivationSink;
+typedef struct ITfSource ITfSource;
+
+typedef DWORD TfClientId;
+typedef DWORD TfEditCookie;
+
+typedef struct ITfThreadMgrVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfThreadMgr *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfThreadMgr *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfThreadMgr *);
+    HRESULT (STDMETHODCALLTYPE *Activate)(ITfThreadMgr *, TfClientId *);
+    HRESULT (STDMETHODCALLTYPE *Deactivate)(ITfThreadMgr *);
+    HRESULT (STDMETHODCALLTYPE *CreateDocumentMgr)(ITfThreadMgr *);
+    HRESULT (STDMETHODCALLTYPE *EnumDocumentMgrs)(ITfThreadMgr *, IEnumTfDocumentMgrs **);
+    HRESULT (STDMETHODCALLTYPE *GetFocus)(ITfThreadMgr *, ITfDocumentMgr **);
+    HRESULT (STDMETHODCALLTYPE *SetFocus)(ITfThreadMgr *, ITfDocumentMgr *);
+    HRESULT (STDMETHODCALLTYPE *AssociateFocus)(ITfThreadMgr *, HWND, ITfDocumentMgr *, ITfDocumentMgr **);
+    HRESULT (STDMETHODCALLTYPE *IsThreadFocus)(ITfThreadMgr *, BOOL *);
+    HRESULT (STDMETHODCALLTYPE *GetFunctionProvider)(ITfThreadMgr *, REFCLSID, ITfFunctionProvider **);
+    HRESULT (STDMETHODCALLTYPE *EnumFunctionProviders)(ITfThreadMgr *, IEnumTfFunctionProviders **);
+    HRESULT (STDMETHODCALLTYPE *GetGlobalCompartment)(ITfThreadMgr *, ITfCompartmentMgr **);
+} ITfThreadMgrVtbl;
+
+struct ITfThreadMgr
+{
+    const struct ITfThreadMgrVtbl *lpVtbl;
+};
+
+typedef struct ITfThreadMgrExVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfThreadMgrEx *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfThreadMgrEx *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfThreadMgrEx *);
+    HRESULT (STDMETHODCALLTYPE *Activate)(ITfThreadMgrEx *, TfClientId *);
+    HRESULT (STDMETHODCALLTYPE *Deactivate)(ITfThreadMgrEx *);
+    HRESULT (STDMETHODCALLTYPE *CreateDocumentMgr)(ITfThreadMgrEx *, ITfDocumentMgr **);
+    HRESULT (STDMETHODCALLTYPE *EnumDocumentMgrs)(ITfThreadMgrEx *, IEnumTfDocumentMgrs **);
+    HRESULT (STDMETHODCALLTYPE *GetFocus)(ITfThreadMgrEx *, ITfDocumentMgr **);
+    HRESULT (STDMETHODCALLTYPE *SetFocus)(ITfThreadMgrEx *, ITfDocumentMgr *);
+    HRESULT (STDMETHODCALLTYPE *AssociateFocus)(ITfThreadMgrEx *, ITfDocumentMgr *, ITfDocumentMgr **);
+    HRESULT (STDMETHODCALLTYPE *IsThreadFocus)(ITfThreadMgrEx *, BOOL *);
+    HRESULT (STDMETHODCALLTYPE *GetFunctionProvider)(ITfThreadMgrEx *, REFCLSID, ITfFunctionProvider **);
+    HRESULT (STDMETHODCALLTYPE *EnumFunctionProviders)(ITfThreadMgrEx *, IEnumTfFunctionProviders **);
+    HRESULT (STDMETHODCALLTYPE *GetGlobalCompartment)(ITfThreadMgrEx *, ITfCompartmentMgr **);
+    HRESULT (STDMETHODCALLTYPE *ActivateEx)(ITfThreadMgrEx *, TfClientId *, DWORD);
+    HRESULT (STDMETHODCALLTYPE *GetActiveFlags)(ITfThreadMgrEx *, DWORD *);
+} ITfThreadMgrExVtbl;
+
+struct ITfThreadMgrEx
+{
+    const struct ITfThreadMgrExVtbl *lpVtbl;
+};
+
+typedef struct ITfDocumentMgrVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfDocumentMgr *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfDocumentMgr *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfDocumentMgr *);
+    HRESULT (STDMETHODCALLTYPE *CreateContext)(ITfDocumentMgr *, TfClientId, DWORD, IUnknown *, ITfContext **, TfEditCookie *);
+    HRESULT (STDMETHODCALLTYPE *Push)(ITfDocumentMgr *, ITfContext *);
+    HRESULT (STDMETHODCALLTYPE *Pop)(ITfDocumentMgr *);
+    HRESULT (STDMETHODCALLTYPE *GetTop)(ITfDocumentMgr *, ITfContext **);
+    HRESULT (STDMETHODCALLTYPE *GetBase)(ITfDocumentMgr *, ITfContext **);
+    HRESULT (STDMETHODCALLTYPE *EnumContexts)(ITfDocumentMgr *, IEnumTfContexts **);
+} ITfDocumentMgrVtbl;
+
+struct ITfDocumentMgr
+{
+    const struct ITfDocumentMgrVtbl *lpVtbl;
+};
+
+typedef struct ITfUIElementSinkVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfUIElementSink *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfUIElementSink *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfUIElementSink *);
+    HRESULT (STDMETHODCALLTYPE *BeginUIElement)(ITfUIElementSink *, DWORD, BOOL *);
+    HRESULT (STDMETHODCALLTYPE *UpdateUIElement)(ITfUIElementSink *, DWORD);
+    HRESULT (STDMETHODCALLTYPE *EndUIElement)(ITfUIElementSink *, DWORD);
+} ITfUIElementSinkVtbl;
+
+struct ITfUIElementSink
+{
+    const struct ITfUIElementSinkVtbl *lpVtbl;
+};
+
+typedef struct ITfUIElementMgrVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfUIElementMgr *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfUIElementMgr *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfUIElementMgr *);
+    HRESULT (STDMETHODCALLTYPE *BeginUIElement)(ITfUIElementMgr *, ITfUIElement *, BOOL *, DWORD *);
+    HRESULT (STDMETHODCALLTYPE *UpdateUIElement)(ITfUIElementMgr *, DWORD);
+    HRESULT (STDMETHODCALLTYPE *EndUIElement)(ITfUIElementMgr *, DWORD);
+    HRESULT (STDMETHODCALLTYPE *GetUIElement)(ITfUIElementMgr *, DWORD, ITfUIElement **);
+    HRESULT (STDMETHODCALLTYPE *EnumUIElements)(ITfUIElementMgr *, IEnumTfUIElements **);
+} ITfUIElementMgrVtbl;
+
+struct ITfUIElementMgr
+{
+    const struct ITfUIElementMgrVtbl *lpVtbl;
+};
+
+typedef struct ITfCandidateListUIElementVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfCandidateListUIElement *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfCandidateListUIElement *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfCandidateListUIElement *);
+    HRESULT (STDMETHODCALLTYPE *GetDescription)(ITfCandidateListUIElement *, BSTR *);
+    HRESULT (STDMETHODCALLTYPE *GetGUID)(ITfCandidateListUIElement *, GUID *);
+    HRESULT (STDMETHODCALLTYPE *Show)(ITfCandidateListUIElement *, BOOL);
+    HRESULT (STDMETHODCALLTYPE *IsShown)(ITfCandidateListUIElement *, BOOL *);
+    HRESULT (STDMETHODCALLTYPE *GetUpdatedFlags)(ITfCandidateListUIElement *, DWORD *);
+    HRESULT (STDMETHODCALLTYPE *GetDocumentMgr)(ITfCandidateListUIElement *, ITfDocumentMgr **);
+    HRESULT (STDMETHODCALLTYPE *GetCount)(ITfCandidateListUIElement *, UINT *);
+    HRESULT (STDMETHODCALLTYPE *GetSelection)(ITfCandidateListUIElement *, UINT *);
+    HRESULT (STDMETHODCALLTYPE *GetString)(ITfCandidateListUIElement *, UINT, BSTR *);
+    HRESULT (STDMETHODCALLTYPE *GetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT, UINT *);
+    HRESULT (STDMETHODCALLTYPE *SetPageIndex)(ITfCandidateListUIElement *, UINT *, UINT);
+    HRESULT (STDMETHODCALLTYPE *GetCurrentPage)(ITfCandidateListUIElement *, UINT *);
+} ITfCandidateListUIElementVtbl;
+
+struct ITfCandidateListUIElement
+{
+    const struct ITfCandidateListUIElementVtbl *lpVtbl;
+};
+
+typedef struct ITfReadingInformationUIElementVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfReadingInformationUIElement *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfReadingInformationUIElement *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfReadingInformationUIElement *);
+    HRESULT (STDMETHODCALLTYPE *GetDescription)(ITfReadingInformationUIElement *, BSTR *);
+    HRESULT (STDMETHODCALLTYPE *GetGUID)(ITfReadingInformationUIElement *, GUID *);
+    HRESULT (STDMETHODCALLTYPE *Show)(ITfReadingInformationUIElement *, BOOL);
+    HRESULT (STDMETHODCALLTYPE *IsShown)(ITfReadingInformationUIElement *, BOOL *);
+    HRESULT (STDMETHODCALLTYPE *GetUpdatedFlags)(ITfReadingInformationUIElement *, DWORD *);
+    HRESULT (STDMETHODCALLTYPE *GetContext)(ITfReadingInformationUIElement *, ITfContext **);
+    HRESULT (STDMETHODCALLTYPE *GetString)(ITfReadingInformationUIElement *, BSTR *);
+    HRESULT (STDMETHODCALLTYPE *GetMaxReadingStringLength)(ITfReadingInformationUIElement *, UINT *);
+    HRESULT (STDMETHODCALLTYPE *GetErrorIndex)(ITfReadingInformationUIElement *, UINT *);
+    HRESULT (STDMETHODCALLTYPE *IsVerticalOrderPreferred)(ITfReadingInformationUIElement *, BOOL *);
+} ITfReadingInformationUIElementVtbl;
+
+struct ITfReadingInformationUIElement
+{
+    const struct ITfReadingInformationUIElementVtbl *lpVtbl;
+};
+
+typedef struct ITfUIElementVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfUIElement *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfUIElement *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfUIElement *);
+    HRESULT (STDMETHODCALLTYPE *GetDescription)(ITfUIElement *, BSTR *);
+    HRESULT (STDMETHODCALLTYPE *GetGUID)(ITfUIElement *, GUID *);
+    HRESULT (STDMETHODCALLTYPE *Show)(ITfUIElement *, BOOL);
+    HRESULT (STDMETHODCALLTYPE *IsShown)(ITfUIElement *, BOOL *);
+} ITfUIElementVtbl;
+
+struct ITfUIElement
+{
+    const struct ITfUIElementVtbl *lpVtbl;
+};
+
+typedef struct ITfInputProcessorProfileActivationSinkVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfInputProcessorProfileActivationSink *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfInputProcessorProfileActivationSink *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfInputProcessorProfileActivationSink *);
+    HRESULT (STDMETHODCALLTYPE *OnActivated)(ITfInputProcessorProfileActivationSink *, DWORD, LANGID, REFCLSID, REFGUID, REFGUID, HKL, DWORD);
+
+} ITfInputProcessorProfileActivationSinkVtbl;
+
+struct ITfInputProcessorProfileActivationSink
+{
+    const struct ITfInputProcessorProfileActivationSinkVtbl *lpVtbl;
+};
+
+typedef struct ITfSourceVtbl
+{
+    HRESULT (STDMETHODCALLTYPE *QueryInterface)(ITfSource *, REFIID, void **);
+    ULONG (STDMETHODCALLTYPE *AddRef)(ITfSource *);
+    ULONG (STDMETHODCALLTYPE *Release)(ITfSource *);
+    HRESULT (STDMETHODCALLTYPE *AdviseSink)(ITfSource *, REFIID, IUnknown *, DWORD *);
+    HRESULT (STDMETHODCALLTYPE *UnadviseSink)(ITfSource *, DWORD);
+} ITfSourceVtbl;
+
+struct ITfSource
+{
+    const struct ITfSourceVtbl *lpVtbl;
+};
+
+#endif /* _SDL_msctf_h */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_vkeys.h b/Source/3rd Party/sdl/src/video/windows/SDL_vkeys.h
new file mode 100644
index 000000000..1ed155a18
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_vkeys.h	
@@ -0,0 +1,76 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef VK_0
+#define VK_0    '0'
+#define VK_1    '1'
+#define VK_2    '2'
+#define VK_3    '3'
+#define VK_4    '4'
+#define VK_5    '5'
+#define VK_6    '6'
+#define VK_7    '7'
+#define VK_8    '8'
+#define VK_9    '9'
+#define VK_A    'A'
+#define VK_B    'B'
+#define VK_C    'C'
+#define VK_D    'D'
+#define VK_E    'E'
+#define VK_F    'F'
+#define VK_G    'G'
+#define VK_H    'H'
+#define VK_I    'I'
+#define VK_J    'J'
+#define VK_K    'K'
+#define VK_L    'L'
+#define VK_M    'M'
+#define VK_N    'N'
+#define VK_O    'O'
+#define VK_P    'P'
+#define VK_Q    'Q'
+#define VK_R    'R'
+#define VK_S    'S'
+#define VK_T    'T'
+#define VK_U    'U'
+#define VK_V    'V'
+#define VK_W    'W'
+#define VK_X    'X'
+#define VK_Y    'Y'
+#define VK_Z    'Z'
+#endif /* VK_0 */
+
+/* These keys haven't been defined, but were experimentally determined */
+#define VK_SEMICOLON    0xBA
+#define VK_EQUALS       0xBB
+#define VK_COMMA        0xBC
+#define VK_MINUS        0xBD
+#define VK_PERIOD       0xBE
+#define VK_SLASH        0xBF
+#define VK_GRAVE        0xC0
+#define VK_LBRACKET     0xDB
+#define VK_BACKSLASH    0xDC
+#define VK_RBRACKET     0xDD
+#define VK_APOSTROPHE   0xDE
+#define VK_BACKTICK     0xDF
+#define VK_OEM_102      0xE2
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsclipboard.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsclipboard.c
new file mode 100644
index 000000000..ae3a104ab
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsclipboard.c	
@@ -0,0 +1,160 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "SDL_windowsvideo.h"
+#include "SDL_windowswindow.h"
+#include "../../events/SDL_clipboardevents_c.h"
+
+
+#ifdef UNICODE
+#define TEXT_FORMAT  CF_UNICODETEXT
+#else
+#define TEXT_FORMAT  CF_TEXT
+#endif
+
+
+/* Get any application owned window handle for clipboard association */
+static HWND
+GetWindowHandle(_THIS)
+{
+    SDL_Window *window;
+
+    window = _this->windows;
+    if (window) {
+        return ((SDL_WindowData *) window->driverdata)->hwnd;
+    }
+    return NULL;
+}
+
+int
+WIN_SetClipboardText(_THIS, const char *text)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    int result = 0;
+
+    if (OpenClipboard(GetWindowHandle(_this))) {
+        HANDLE hMem;
+        LPTSTR tstr;
+        SIZE_T i, size;
+
+        /* Convert the text from UTF-8 to Windows Unicode */
+        tstr = WIN_UTF8ToString(text);
+        if (!tstr) {
+            return -1;
+        }
+
+        /* Find out the size of the data */
+        for (size = 0, i = 0; tstr[i]; ++i, ++size) {
+            if (tstr[i] == '\n' && (i == 0 || tstr[i-1] != '\r')) {
+                /* We're going to insert a carriage return */
+                ++size;
+            }
+        }
+        size = (size+1)*sizeof(*tstr);
+
+        /* Save the data to the clipboard */
+        hMem = GlobalAlloc(GMEM_MOVEABLE, size);
+        if (hMem) {
+            LPTSTR dst = (LPTSTR)GlobalLock(hMem);
+            if (dst) {
+                /* Copy the text over, adding carriage returns as necessary */
+                for (i = 0; tstr[i]; ++i) {
+                    if (tstr[i] == '\n' && (i == 0 || tstr[i-1] != '\r')) {
+                        *dst++ = '\r';
+                    }
+                    *dst++ = tstr[i];
+                }
+                *dst = 0;
+                GlobalUnlock(hMem);
+            }
+
+            EmptyClipboard();
+            if (!SetClipboardData(TEXT_FORMAT, hMem)) {
+                result = WIN_SetError("Couldn't set clipboard data");
+            }
+            data->clipboard_count = GetClipboardSequenceNumber();
+        }
+        SDL_free(tstr);
+
+        CloseClipboard();
+    } else {
+        result = WIN_SetError("Couldn't open clipboard");
+    }
+    return result;
+}
+
+char *
+WIN_GetClipboardText(_THIS)
+{
+    char *text;
+
+    text = NULL;
+    if (IsClipboardFormatAvailable(TEXT_FORMAT) &&
+        OpenClipboard(GetWindowHandle(_this))) {
+        HANDLE hMem;
+        LPTSTR tstr;
+
+        hMem = GetClipboardData(TEXT_FORMAT);
+        if (hMem) {
+            tstr = (LPTSTR)GlobalLock(hMem);
+            text = WIN_StringToUTF8(tstr);
+            GlobalUnlock(hMem);
+        } else {
+            WIN_SetError("Couldn't get clipboard data");
+        }
+        CloseClipboard();
+    }
+    if (!text) {
+        text = SDL_strdup("");
+    }
+    return text;
+}
+
+SDL_bool
+WIN_HasClipboardText(_THIS)
+{
+    SDL_bool result = SDL_FALSE;
+    char *text = WIN_GetClipboardText(_this);
+    if (text) {
+        result = text[0] != '\0' ? SDL_TRUE : SDL_FALSE;
+        SDL_free(text);
+    }
+    return result;
+}
+
+void
+WIN_CheckClipboardUpdate(struct SDL_VideoData * data)
+{
+    const DWORD count = GetClipboardSequenceNumber();
+    if (count != data->clipboard_count) {
+        if (data->clipboard_count) {
+            SDL_SendClipboardUpdate();
+        }
+        data->clipboard_count = count;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsclipboard.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsclipboard.h
new file mode 100644
index 000000000..49c36c4ee
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsclipboard.h	
@@ -0,0 +1,36 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_windowsclipboard_h
+#define _SDL_windowsclipboard_h
+
+/* Forward declaration */
+struct SDL_VideoData;
+
+extern int WIN_SetClipboardText(_THIS, const char *text);
+extern char *WIN_GetClipboardText(_THIS);
+extern SDL_bool WIN_HasClipboardText(_THIS);
+extern void WIN_CheckClipboardUpdate(struct SDL_VideoData * data);
+
+#endif /* _SDL_windowsclipboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsevents.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsevents.c
new file mode 100644
index 000000000..ec3c05262
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsevents.c	
@@ -0,0 +1,981 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "SDL_windowsvideo.h"
+#include "SDL_windowsshape.h"
+#include "SDL_syswm.h"
+#include "SDL_timer.h"
+#include "SDL_vkeys.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_touch_c.h"
+#include "../../events/scancodes_windows.h"
+
+/* Dropfile support */
+#include <shellapi.h>
+
+/* For GET_X_LPARAM, GET_Y_LPARAM. */
+#include <windowsx.h>
+
+/* #define WMMSG_DEBUG */
+#ifdef WMMSG_DEBUG
+#include <stdio.h>
+#include "wmmsg.h"
+#endif
+
+/* Masks for processing the windows KEYDOWN and KEYUP messages */
+#define REPEATED_KEYMASK    (1<<30)
+#define EXTENDED_KEYMASK    (1<<24)
+
+#define VK_ENTER    10          /* Keypad Enter ... no VKEY defined? */
+#ifndef VK_OEM_NEC_EQUAL
+#define VK_OEM_NEC_EQUAL 0x92
+#endif
+
+/* Make sure XBUTTON stuff is defined that isn't in older Platform SDKs... */
+#ifndef WM_XBUTTONDOWN
+#define WM_XBUTTONDOWN 0x020B
+#endif
+#ifndef WM_XBUTTONUP
+#define WM_XBUTTONUP 0x020C
+#endif
+#ifndef GET_XBUTTON_WPARAM
+#define GET_XBUTTON_WPARAM(w) (HIWORD(w))
+#endif
+#ifndef WM_INPUT
+#define WM_INPUT 0x00ff
+#endif
+#ifndef WM_TOUCH
+#define WM_TOUCH 0x0240
+#endif
+#ifndef WM_MOUSEHWHEEL
+#define WM_MOUSEHWHEEL 0x020E
+#endif
+#ifndef WM_UNICHAR
+#define WM_UNICHAR 0x0109
+#endif
+
+static SDL_Scancode
+WindowsScanCodeToSDLScanCode( LPARAM lParam, WPARAM wParam )
+{
+    SDL_Scancode code;
+    char bIsExtended;
+    int nScanCode = ( lParam >> 16 ) & 0xFF;
+
+    /* 0x45 here to work around both pause and numlock sharing the same scancode, so use the VK key to tell them apart */
+    if ( nScanCode == 0 || nScanCode == 0x45 )
+    {
+        switch( wParam )
+        {
+        case VK_CLEAR: return SDL_SCANCODE_CLEAR;
+        case VK_MODECHANGE: return SDL_SCANCODE_MODE;
+        case VK_SELECT: return SDL_SCANCODE_SELECT;
+        case VK_EXECUTE: return SDL_SCANCODE_EXECUTE;
+        case VK_HELP: return SDL_SCANCODE_HELP;
+        case VK_PAUSE: return SDL_SCANCODE_PAUSE;
+        case VK_NUMLOCK: return SDL_SCANCODE_NUMLOCKCLEAR;
+
+        case VK_F13: return SDL_SCANCODE_F13;
+        case VK_F14: return SDL_SCANCODE_F14;
+        case VK_F15: return SDL_SCANCODE_F15;
+        case VK_F16: return SDL_SCANCODE_F16;
+        case VK_F17: return SDL_SCANCODE_F17;
+        case VK_F18: return SDL_SCANCODE_F18;
+        case VK_F19: return SDL_SCANCODE_F19;
+        case VK_F20: return SDL_SCANCODE_F20;
+        case VK_F21: return SDL_SCANCODE_F21;
+        case VK_F22: return SDL_SCANCODE_F22;
+        case VK_F23: return SDL_SCANCODE_F23;
+        case VK_F24: return SDL_SCANCODE_F24;
+
+        case VK_OEM_NEC_EQUAL: return SDL_SCANCODE_KP_EQUALS;
+        case VK_BROWSER_BACK: return SDL_SCANCODE_AC_BACK;
+        case VK_BROWSER_FORWARD: return SDL_SCANCODE_AC_FORWARD;
+        case VK_BROWSER_REFRESH: return SDL_SCANCODE_AC_REFRESH;
+        case VK_BROWSER_STOP: return SDL_SCANCODE_AC_STOP;
+        case VK_BROWSER_SEARCH: return SDL_SCANCODE_AC_SEARCH;
+        case VK_BROWSER_FAVORITES: return SDL_SCANCODE_AC_BOOKMARKS;
+        case VK_BROWSER_HOME: return SDL_SCANCODE_AC_HOME;
+        case VK_VOLUME_MUTE: return SDL_SCANCODE_AUDIOMUTE;
+        case VK_VOLUME_DOWN: return SDL_SCANCODE_VOLUMEDOWN;
+        case VK_VOLUME_UP: return SDL_SCANCODE_VOLUMEUP;
+
+        case VK_MEDIA_NEXT_TRACK: return SDL_SCANCODE_AUDIONEXT;
+        case VK_MEDIA_PREV_TRACK: return SDL_SCANCODE_AUDIOPREV;
+        case VK_MEDIA_STOP: return SDL_SCANCODE_AUDIOSTOP;
+        case VK_MEDIA_PLAY_PAUSE: return SDL_SCANCODE_AUDIOPLAY;
+        case VK_LAUNCH_MAIL: return SDL_SCANCODE_MAIL;
+        case VK_LAUNCH_MEDIA_SELECT: return SDL_SCANCODE_MEDIASELECT;
+
+        case VK_OEM_102: return SDL_SCANCODE_NONUSBACKSLASH;
+
+        case VK_ATTN: return SDL_SCANCODE_SYSREQ;
+        case VK_CRSEL: return SDL_SCANCODE_CRSEL;
+        case VK_EXSEL: return SDL_SCANCODE_EXSEL;
+        case VK_OEM_CLEAR: return SDL_SCANCODE_CLEAR;
+
+        case VK_LAUNCH_APP1: return SDL_SCANCODE_APP1;
+        case VK_LAUNCH_APP2: return SDL_SCANCODE_APP2;
+
+        default: return SDL_SCANCODE_UNKNOWN;
+        }
+    }
+
+    if ( nScanCode > 127 )
+        return SDL_SCANCODE_UNKNOWN;
+
+    code = windows_scancode_table[nScanCode];
+
+    bIsExtended = ( lParam & ( 1 << 24 ) ) != 0;
+    if ( !bIsExtended )
+    {
+        switch ( code )
+        {
+        case SDL_SCANCODE_HOME:
+            return SDL_SCANCODE_KP_7;
+        case SDL_SCANCODE_UP:
+            return SDL_SCANCODE_KP_8;
+        case SDL_SCANCODE_PAGEUP:
+            return SDL_SCANCODE_KP_9;
+        case SDL_SCANCODE_LEFT:
+            return SDL_SCANCODE_KP_4;
+        case SDL_SCANCODE_RIGHT:
+            return SDL_SCANCODE_KP_6;
+        case SDL_SCANCODE_END:
+            return SDL_SCANCODE_KP_1;
+        case SDL_SCANCODE_DOWN:
+            return SDL_SCANCODE_KP_2;
+        case SDL_SCANCODE_PAGEDOWN:
+            return SDL_SCANCODE_KP_3;
+        case SDL_SCANCODE_INSERT:
+            return SDL_SCANCODE_KP_0;
+        case SDL_SCANCODE_DELETE:
+            return SDL_SCANCODE_KP_PERIOD;
+        case SDL_SCANCODE_PRINTSCREEN:
+            return SDL_SCANCODE_KP_MULTIPLY;
+        default:
+            break;
+        }
+    }
+    else
+    {
+        switch ( code )
+        {
+        case SDL_SCANCODE_RETURN:
+            return SDL_SCANCODE_KP_ENTER;
+        case SDL_SCANCODE_LALT:
+            return SDL_SCANCODE_RALT;
+        case SDL_SCANCODE_LCTRL:
+            return SDL_SCANCODE_RCTRL;
+        case SDL_SCANCODE_SLASH:
+            return SDL_SCANCODE_KP_DIVIDE;
+        case SDL_SCANCODE_CAPSLOCK:
+            return SDL_SCANCODE_KP_PLUS;
+        default:
+            break;
+        }
+    }
+
+    return code;
+}
+
+
+void
+WIN_CheckWParamMouseButton( SDL_bool bwParamMousePressed, SDL_bool bSDLMousePressed, SDL_WindowData *data, Uint8 button )
+{
+    if ( bwParamMousePressed && !bSDLMousePressed )
+    {
+        SDL_SendMouseButton(data->window, 0, SDL_PRESSED, button);
+    }
+    else if ( !bwParamMousePressed && bSDLMousePressed )
+    {
+        SDL_SendMouseButton(data->window, 0, SDL_RELEASED, button);
+    }
+}
+
+/*
+* Some windows systems fail to send a WM_LBUTTONDOWN sometimes, but each mouse move contains the current button state also
+*  so this funciton reconciles our view of the world with the current buttons reported by windows
+*/
+void
+WIN_CheckWParamMouseButtons( WPARAM wParam, SDL_WindowData *data )
+{
+    if ( wParam != data->mouse_button_flags )
+    {
+        Uint32 mouseFlags = SDL_GetMouseState( NULL, NULL );
+        WIN_CheckWParamMouseButton(  (wParam & MK_LBUTTON), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT );
+        WIN_CheckWParamMouseButton(  (wParam & MK_MBUTTON), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE );
+        WIN_CheckWParamMouseButton(  (wParam & MK_RBUTTON), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT );
+        WIN_CheckWParamMouseButton(  (wParam & MK_XBUTTON1), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1 );
+        WIN_CheckWParamMouseButton(  (wParam & MK_XBUTTON2), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2 );
+        data->mouse_button_flags = wParam;
+    }
+}
+
+
+void
+WIN_CheckRawMouseButtons( ULONG rawButtons, SDL_WindowData *data )
+{
+    if ( rawButtons != data->mouse_button_flags )
+    {
+        Uint32 mouseFlags = SDL_GetMouseState( NULL, NULL );
+        if ( (rawButtons & RI_MOUSE_BUTTON_1_DOWN) )
+            WIN_CheckWParamMouseButton(  (rawButtons & RI_MOUSE_BUTTON_1_DOWN), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT );
+        if ( (rawButtons & RI_MOUSE_BUTTON_1_UP) )
+            WIN_CheckWParamMouseButton(  !(rawButtons & RI_MOUSE_BUTTON_1_UP), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT );
+        if ( (rawButtons & RI_MOUSE_BUTTON_2_DOWN) )
+            WIN_CheckWParamMouseButton(  (rawButtons & RI_MOUSE_BUTTON_2_DOWN), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT );
+        if ( (rawButtons & RI_MOUSE_BUTTON_2_UP) )
+            WIN_CheckWParamMouseButton(  !(rawButtons & RI_MOUSE_BUTTON_2_UP), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT );
+        if ( (rawButtons & RI_MOUSE_BUTTON_3_DOWN) )
+            WIN_CheckWParamMouseButton(  (rawButtons & RI_MOUSE_BUTTON_3_DOWN), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE );
+        if ( (rawButtons & RI_MOUSE_BUTTON_3_UP) )
+            WIN_CheckWParamMouseButton(  !(rawButtons & RI_MOUSE_BUTTON_3_UP), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE );
+        if ( (rawButtons & RI_MOUSE_BUTTON_4_DOWN) )
+            WIN_CheckWParamMouseButton(  (rawButtons & RI_MOUSE_BUTTON_4_DOWN), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1 );
+        if ( (rawButtons & RI_MOUSE_BUTTON_4_UP) )
+            WIN_CheckWParamMouseButton(  !(rawButtons & RI_MOUSE_BUTTON_4_UP), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1 );
+        if ( (rawButtons & RI_MOUSE_BUTTON_5_DOWN) )
+            WIN_CheckWParamMouseButton(  (rawButtons & RI_MOUSE_BUTTON_5_DOWN), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2 );
+        if ( (rawButtons & RI_MOUSE_BUTTON_5_UP) )
+            WIN_CheckWParamMouseButton(  !(rawButtons & RI_MOUSE_BUTTON_5_UP), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2 );
+        data->mouse_button_flags = rawButtons;
+    }
+}
+
+void
+WIN_CheckAsyncMouseRelease( SDL_WindowData *data )
+{
+    Uint32 mouseFlags;
+    SHORT keyState;
+
+    /* mouse buttons may have changed state here, we need to resync them,
+       but we will get a WM_MOUSEMOVE right away which will fix things up if in non raw mode also
+    */
+    mouseFlags = SDL_GetMouseState( NULL, NULL );
+
+    keyState = GetAsyncKeyState( VK_LBUTTON );
+    WIN_CheckWParamMouseButton( ( keyState & 0x8000 ), ( mouseFlags & SDL_BUTTON_LMASK ), data, SDL_BUTTON_LEFT );
+    keyState = GetAsyncKeyState( VK_RBUTTON );
+    WIN_CheckWParamMouseButton( ( keyState & 0x8000 ), ( mouseFlags & SDL_BUTTON_RMASK ), data, SDL_BUTTON_RIGHT );
+    keyState = GetAsyncKeyState( VK_MBUTTON );
+    WIN_CheckWParamMouseButton( ( keyState & 0x8000 ), ( mouseFlags & SDL_BUTTON_MMASK ), data, SDL_BUTTON_MIDDLE );
+    keyState = GetAsyncKeyState( VK_XBUTTON1 );
+    WIN_CheckWParamMouseButton( ( keyState & 0x8000 ), ( mouseFlags & SDL_BUTTON_X1MASK ), data, SDL_BUTTON_X1 );
+    keyState = GetAsyncKeyState( VK_XBUTTON2 );
+    WIN_CheckWParamMouseButton( ( keyState & 0x8000 ), ( mouseFlags & SDL_BUTTON_X2MASK ), data, SDL_BUTTON_X2 );
+    data->mouse_button_flags = 0;
+}
+
+SDL_FORCE_INLINE BOOL
+WIN_ConvertUTF32toUTF8(UINT32 codepoint, char * text)
+{
+    if (codepoint <= 0x7F) {
+        text[0] = (char) codepoint;
+        text[1] = '\0';
+    } else if (codepoint <= 0x7FF) {
+        text[0] = 0xC0 | (char) ((codepoint >> 6) & 0x1F);
+        text[1] = 0x80 | (char) (codepoint & 0x3F);
+        text[2] = '\0';
+    } else if (codepoint <= 0xFFFF) {
+        text[0] = 0xE0 | (char) ((codepoint >> 12) & 0x0F);
+        text[1] = 0x80 | (char) ((codepoint >> 6) & 0x3F);
+        text[2] = 0x80 | (char) (codepoint & 0x3F);
+        text[3] = '\0';
+    } else if (codepoint <= 0x10FFFF) {
+        text[0] = 0xF0 | (char) ((codepoint >> 18) & 0x0F);
+        text[1] = 0x80 | (char) ((codepoint >> 12) & 0x3F);
+        text[2] = 0x80 | (char) ((codepoint >> 6) & 0x3F);
+        text[3] = 0x80 | (char) (codepoint & 0x3F);
+        text[4] = '\0';
+    } else {
+        return SDL_FALSE;
+    }
+    return SDL_TRUE;
+}
+
+LRESULT CALLBACK
+WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    SDL_WindowData *data;
+    LRESULT returnCode = -1;
+
+    /* Send a SDL_SYSWMEVENT if the application wants them */
+    if (SDL_GetEventState(SDL_SYSWMEVENT) == SDL_ENABLE) {
+        SDL_SysWMmsg wmmsg;
+
+        SDL_VERSION(&wmmsg.version);
+        wmmsg.subsystem = SDL_SYSWM_WINDOWS;
+        wmmsg.msg.win.hwnd = hwnd;
+        wmmsg.msg.win.msg = msg;
+        wmmsg.msg.win.wParam = wParam;
+        wmmsg.msg.win.lParam = lParam;
+        SDL_SendSysWMEvent(&wmmsg);
+    }
+
+    /* Get the window data for the window */
+    data = (SDL_WindowData *) GetProp(hwnd, TEXT("SDL_WindowData"));
+    if (!data) {
+        return CallWindowProc(DefWindowProc, hwnd, msg, wParam, lParam);
+    }
+
+#ifdef WMMSG_DEBUG
+    {
+        char message[1024];
+        if (msg > MAX_WMMSG) {
+            SDL_snprintf(message, sizeof(message), "Received windows message: %p UNKNOWN (%d) -- 0x%X, 0x%X\n", hwnd, msg, wParam, lParam);
+        } else {
+            SDL_snprintf(message, sizeof(message), "Received windows message: %p %s -- 0x%X, 0x%X\n", hwnd, wmtab[msg], wParam, lParam);
+        }
+        OutputDebugStringA(message);
+    }
+#endif /* WMMSG_DEBUG */
+
+    if (IME_HandleMessage(hwnd, msg, wParam, &lParam, data->videodata))
+        return 0;
+
+    switch (msg) {
+
+    case WM_SHOWWINDOW:
+        {
+            if (wParam) {
+                SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
+            } else {
+                SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
+            }
+        }
+        break;
+
+    case WM_ACTIVATE:
+        {
+            BOOL minimized;
+
+            minimized = HIWORD(wParam);
+            if (!minimized && (LOWORD(wParam) != WA_INACTIVE)) {
+                SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
+                if (SDL_GetKeyboardFocus() != data->window) {
+                    SDL_SetKeyboardFocus(data->window);
+                }
+                WIN_UpdateClipCursor(data->window);
+                WIN_CheckAsyncMouseRelease(data);
+
+                /*
+                 * FIXME: Update keyboard state
+                 */
+                WIN_CheckClipboardUpdate(data->videodata);
+            } else {
+                if (SDL_GetKeyboardFocus() == data->window) {
+                    SDL_SetKeyboardFocus(NULL);
+                }
+
+                ClipCursor(NULL);
+            }
+        }
+        returnCode = 0;
+        break;
+
+    case WM_MOUSEMOVE:
+        {
+            SDL_Mouse *mouse = SDL_GetMouse();
+            if (!mouse->relative_mode || mouse->relative_mode_warp) {
+                SDL_SendMouseMotion(data->window, 0, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+            }
+        }
+        /* don't break here, fall through to check the wParam like the button presses */
+    case WM_LBUTTONUP:
+    case WM_RBUTTONUP:
+    case WM_MBUTTONUP:
+    case WM_XBUTTONUP:
+    case WM_LBUTTONDOWN:
+    case WM_RBUTTONDOWN:
+    case WM_MBUTTONDOWN:
+    case WM_XBUTTONDOWN:
+        {
+            SDL_Mouse *mouse = SDL_GetMouse();
+            if (!mouse->relative_mode || mouse->relative_mode_warp) {
+                WIN_CheckWParamMouseButtons(wParam, data);
+            }
+        }
+        break;
+
+    case WM_INPUT:
+        {
+            SDL_Mouse *mouse = SDL_GetMouse();
+            HRAWINPUT hRawInput = (HRAWINPUT)lParam;
+            RAWINPUT inp;
+            UINT size = sizeof(inp);
+
+            if (!mouse->relative_mode || mouse->relative_mode_warp || mouse->focus != data->window) {
+                break;
+            }
+
+            GetRawInputData(hRawInput, RID_INPUT, &inp, &size, sizeof(RAWINPUTHEADER));
+
+            /* Mouse data */
+            if (inp.header.dwType == RIM_TYPEMOUSE) {
+                RAWMOUSE* mouse = &inp.data.mouse;
+
+                if ((mouse->usFlags & 0x01) == MOUSE_MOVE_RELATIVE) {
+                    SDL_SendMouseMotion(data->window, 0, 1, (int)mouse->lLastX, (int)mouse->lLastY);
+                } else {
+                    /* synthesize relative moves from the abs position */
+                    static SDL_Point initialMousePoint;
+                    if (initialMousePoint.x == 0 && initialMousePoint.y == 0) {
+                        initialMousePoint.x = mouse->lLastX;
+                        initialMousePoint.y = mouse->lLastY;
+                    }
+
+                    SDL_SendMouseMotion(data->window, 0, 1, (int)(mouse->lLastX-initialMousePoint.x), (int)(mouse->lLastY-initialMousePoint.y) );
+
+                    initialMousePoint.x = mouse->lLastX;
+                    initialMousePoint.y = mouse->lLastY;
+                }
+                WIN_CheckRawMouseButtons( mouse->usButtonFlags, data );
+            }
+        }
+        break;
+
+    case WM_MOUSEWHEEL:
+        {
+            static short s_AccumulatedMotion;
+
+            s_AccumulatedMotion += GET_WHEEL_DELTA_WPARAM(wParam);
+            if (s_AccumulatedMotion > 0) {
+                while (s_AccumulatedMotion >= WHEEL_DELTA) {
+                    SDL_SendMouseWheel(data->window, 0, 0, 1);
+                    s_AccumulatedMotion -= WHEEL_DELTA;
+                }
+            } else {
+                while (s_AccumulatedMotion <= -WHEEL_DELTA) {
+                    SDL_SendMouseWheel(data->window, 0, 0, -1);
+                    s_AccumulatedMotion += WHEEL_DELTA;
+                }
+            }
+        }
+        break;
+
+    case WM_MOUSEHWHEEL:
+        {
+            static short s_AccumulatedMotion;
+
+            s_AccumulatedMotion += GET_WHEEL_DELTA_WPARAM(wParam);
+            if (s_AccumulatedMotion > 0) {
+                while (s_AccumulatedMotion >= WHEEL_DELTA) {
+                    SDL_SendMouseWheel(data->window, 0, 1, 0);
+                    s_AccumulatedMotion -= WHEEL_DELTA;
+                }
+            } else {
+                while (s_AccumulatedMotion <= -WHEEL_DELTA) {
+                    SDL_SendMouseWheel(data->window, 0, -1, 0);
+                    s_AccumulatedMotion += WHEEL_DELTA;
+                }
+            }
+        }
+        break;
+
+#ifdef WM_MOUSELEAVE
+    case WM_MOUSELEAVE:
+        if (SDL_GetMouseFocus() == data->window && !SDL_GetMouse()->relative_mode) {
+            if (!IsIconic(hwnd)) {
+                POINT cursorPos;
+                GetCursorPos(&cursorPos);
+                ScreenToClient(hwnd, &cursorPos);
+                SDL_SendMouseMotion(data->window, 0, 0, cursorPos.x, cursorPos.y);
+            }
+            SDL_SetMouseFocus(NULL);
+        }
+        returnCode = 0;
+        break;
+#endif /* WM_MOUSELEAVE */
+
+    case WM_KEYDOWN:
+    case WM_SYSKEYDOWN:
+        {
+            SDL_Scancode code = WindowsScanCodeToSDLScanCode( lParam, wParam );
+            if ( code != SDL_SCANCODE_UNKNOWN ) {
+                SDL_SendKeyboardKey(SDL_PRESSED, code );
+            }
+        }
+        if (msg == WM_KEYDOWN) {
+            BYTE keyboardState[256];
+            char text[5];
+            UINT32 utf32 = 0;
+
+            GetKeyboardState(keyboardState);
+            if (ToUnicode(wParam, (lParam >> 16) & 0xff, keyboardState, (LPWSTR)&utf32, 1, 0) > 0) {
+                WORD repetition;
+                for (repetition = lParam & 0xffff; repetition > 0; repetition--) {
+                    WIN_ConvertUTF32toUTF8(utf32, text);
+                    SDL_SendKeyboardText(text);
+                }
+            }
+        }
+        returnCode = 0;
+        break;
+
+    case WM_SYSKEYUP:
+    case WM_KEYUP:
+        {
+            SDL_Scancode code = WindowsScanCodeToSDLScanCode( lParam, wParam );
+            const Uint8 *keyboardState = SDL_GetKeyboardState(NULL);
+
+            /* Detect relevant keyboard shortcuts */
+            if (keyboardState[SDL_SCANCODE_LALT] == SDL_PRESSED || keyboardState[SDL_SCANCODE_RALT] == SDL_PRESSED ) {
+                /* ALT+F4: Close window */
+                if (code == SDL_SCANCODE_F4) {
+                    SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
+                }
+            }
+
+            if ( code != SDL_SCANCODE_UNKNOWN ) {
+                if (code == SDL_SCANCODE_PRINTSCREEN &&
+                    keyboardState[code] == SDL_RELEASED) {
+                    SDL_SendKeyboardKey(SDL_PRESSED, code);
+                }
+                SDL_SendKeyboardKey(SDL_RELEASED, code);
+            }
+        }
+        returnCode = 0;
+        break;
+
+    case WM_UNICHAR:
+    case WM_CHAR:
+        /* Ignore WM_CHAR messages that come from TranslateMessage(), since we handle WM_KEY* messages directly */
+        returnCode = 0;
+        break;
+
+#ifdef WM_INPUTLANGCHANGE
+    case WM_INPUTLANGCHANGE:
+        {
+            WIN_UpdateKeymap();
+        }
+        returnCode = 1;
+        break;
+#endif /* WM_INPUTLANGCHANGE */
+
+    case WM_NCLBUTTONDOWN:
+        {
+            data->in_title_click = SDL_TRUE;
+            WIN_UpdateClipCursor(data->window);
+        }
+        break;
+
+    case WM_NCMOUSELEAVE:
+        {
+            data->in_title_click = SDL_FALSE;
+            WIN_UpdateClipCursor(data->window);
+        }
+        break;
+
+    case WM_ENTERSIZEMOVE:
+    case WM_ENTERMENULOOP:
+        {
+            data->in_modal_loop = SDL_TRUE;
+            WIN_UpdateClipCursor(data->window);
+        }
+        break;
+
+    case WM_EXITSIZEMOVE:
+    case WM_EXITMENULOOP:
+        {
+            data->in_modal_loop = SDL_FALSE;
+            WIN_UpdateClipCursor(data->window);
+
+            /* The mouse may have been released during the modal loop */
+            WIN_CheckAsyncMouseRelease(data);
+        }
+        break;
+
+#ifdef WM_GETMINMAXINFO
+    case WM_GETMINMAXINFO:
+        {
+            MINMAXINFO *info;
+            RECT size;
+            int x, y;
+            int w, h;
+            int min_w, min_h;
+            int max_w, max_h;
+            int style;
+            BOOL menu;
+            BOOL constrain_max_size;
+
+            if (SDL_IsShapedWindow(data->window))
+                Win32_ResizeWindowShape(data->window);
+
+            /* If this is an expected size change, allow it */
+            if (data->expected_resize) {
+                break;
+            }
+
+            /* Get the current position of our window */
+            GetWindowRect(hwnd, &size);
+            x = size.left;
+            y = size.top;
+
+            /* Calculate current size of our window */
+            SDL_GetWindowSize(data->window, &w, &h);
+            SDL_GetWindowMinimumSize(data->window, &min_w, &min_h);
+            SDL_GetWindowMaximumSize(data->window, &max_w, &max_h);
+
+            /* Store in min_w and min_h difference between current size and minimal
+               size so we don't need to call AdjustWindowRectEx twice */
+            min_w -= w;
+            min_h -= h;
+            if (max_w && max_h) {
+                max_w -= w;
+                max_h -= h;
+                constrain_max_size = TRUE;
+            } else {
+                constrain_max_size = FALSE;
+            }
+
+            size.top = 0;
+            size.left = 0;
+            size.bottom = h;
+            size.right = w;
+
+            style = GetWindowLong(hwnd, GWL_STYLE);
+            /* DJM - according to the docs for GetMenu(), the
+               return value is undefined if hwnd is a child window.
+               Aparently it's too difficult for MS to check
+               inside their function, so I have to do it here.
+             */
+            menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
+            AdjustWindowRectEx(&size, style, menu, 0);
+            w = size.right - size.left;
+            h = size.bottom - size.top;
+
+            /* Fix our size to the current size */
+            info = (MINMAXINFO *) lParam;
+            if (SDL_GetWindowFlags(data->window) & SDL_WINDOW_RESIZABLE) {
+                info->ptMinTrackSize.x = w + min_w;
+                info->ptMinTrackSize.y = h + min_h;
+                if (constrain_max_size) {
+                    info->ptMaxTrackSize.x = w + max_w;
+                    info->ptMaxTrackSize.y = h + max_h;
+                }
+            } else {
+                info->ptMaxSize.x = w;
+                info->ptMaxSize.y = h;
+                info->ptMaxPosition.x = x;
+                info->ptMaxPosition.y = y;
+                info->ptMinTrackSize.x = w;
+                info->ptMinTrackSize.y = h;
+                info->ptMaxTrackSize.x = w;
+                info->ptMaxTrackSize.y = h;
+            }
+        }
+        returnCode = 0;
+        break;
+#endif /* WM_GETMINMAXINFO */
+
+    case WM_WINDOWPOSCHANGED:
+        {
+            RECT rect;
+            int x, y;
+            int w, h;
+
+            if (!GetClientRect(hwnd, &rect) || IsRectEmpty(&rect)) {
+                break;
+            }
+            ClientToScreen(hwnd, (LPPOINT) & rect);
+            ClientToScreen(hwnd, (LPPOINT) & rect + 1);
+
+            WIN_UpdateClipCursor(data->window);
+
+            x = rect.left;
+            y = rect.top;
+            SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED, x, y);
+
+            w = rect.right - rect.left;
+            h = rect.bottom - rect.top;
+            SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESIZED, w,
+                                h);
+        }
+        break;
+
+    case WM_SIZE:
+        {
+            switch (wParam)
+            {
+            case SIZE_MAXIMIZED:
+                SDL_SendWindowEvent(data->window,
+                    SDL_WINDOWEVENT_MAXIMIZED, 0, 0);
+                break;
+            case SIZE_MINIMIZED:
+                SDL_SendWindowEvent(data->window,
+                    SDL_WINDOWEVENT_MINIMIZED, 0, 0);
+                break;
+            default:
+                SDL_SendWindowEvent(data->window,
+                    SDL_WINDOWEVENT_RESTORED, 0, 0);
+                break;
+            }
+        }
+        break;
+
+    case WM_SETCURSOR:
+        {
+            Uint16 hittest;
+
+            hittest = LOWORD(lParam);
+            if (hittest == HTCLIENT) {
+                SetCursor(SDL_cursor);
+                returnCode = TRUE;
+            }
+        }
+        break;
+
+        /* We were occluded, refresh our display */
+    case WM_PAINT:
+        {
+            RECT rect;
+            if (GetUpdateRect(hwnd, &rect, FALSE)) {
+                ValidateRect(hwnd, NULL);
+                SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_EXPOSED,
+                                    0, 0);
+            }
+        }
+        returnCode = 0;
+        break;
+
+        /* We'll do our own drawing, prevent flicker */
+    case WM_ERASEBKGND:
+        {
+        }
+        return (1);
+
+#if defined(SC_SCREENSAVE) || defined(SC_MONITORPOWER)
+    case WM_SYSCOMMAND:
+        {
+            /* Don't start the screensaver or blank the monitor in fullscreen apps */
+            if ((wParam & 0xFFF0) == SC_SCREENSAVE ||
+                (wParam & 0xFFF0) == SC_MONITORPOWER) {
+                if (SDL_GetVideoDevice()->suspend_screensaver) {
+                    return (0);
+                }
+            }
+        }
+        break;
+#endif /* System has screensaver support */
+
+    case WM_CLOSE:
+        {
+            SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
+        }
+        returnCode = 0;
+        break;
+
+    case WM_TOUCH:
+        {
+            UINT i, num_inputs = LOWORD(wParam);
+            PTOUCHINPUT inputs = SDL_stack_alloc(TOUCHINPUT, num_inputs);
+            if (data->videodata->GetTouchInputInfo((HTOUCHINPUT)lParam, num_inputs, inputs, sizeof(TOUCHINPUT))) {
+                RECT rect;
+                float x, y;
+
+                if (!GetClientRect(hwnd, &rect) ||
+                    (rect.right == rect.left && rect.bottom == rect.top)) {
+                    if (inputs) {
+                        SDL_stack_free(inputs);
+                    }
+                    break;
+                }
+                ClientToScreen(hwnd, (LPPOINT) & rect);
+                ClientToScreen(hwnd, (LPPOINT) & rect + 1);
+                rect.top *= 100;
+                rect.left *= 100;
+                rect.bottom *= 100;
+                rect.right *= 100;
+
+                for (i = 0; i < num_inputs; ++i) {
+                    PTOUCHINPUT input = &inputs[i];
+
+                    const SDL_TouchID touchId = (SDL_TouchID)((size_t)input->hSource);
+                    if (!SDL_GetTouch(touchId)) {
+                        if (SDL_AddTouch(touchId, "") < 0) {
+                            continue;
+                        }
+                    }
+
+                    /* Get the normalized coordinates for the window */
+                    x = (float)(input->x - rect.left)/(rect.right - rect.left);
+                    y = (float)(input->y - rect.top)/(rect.bottom - rect.top);
+
+                    if (input->dwFlags & TOUCHEVENTF_DOWN) {
+                        SDL_SendTouch(touchId, input->dwID, SDL_TRUE, x, y, 1.0f);
+                    }
+                    if (input->dwFlags & TOUCHEVENTF_MOVE) {
+                        SDL_SendTouchMotion(touchId, input->dwID, x, y, 1.0f);
+                    }
+                    if (input->dwFlags & TOUCHEVENTF_UP) {
+                        SDL_SendTouch(touchId, input->dwID, SDL_FALSE, x, y, 1.0f);
+                    }
+                }
+            }
+            SDL_stack_free(inputs);
+
+            data->videodata->CloseTouchInputHandle((HTOUCHINPUT)lParam);
+            return 0;
+        }
+        break;
+
+    case WM_DROPFILES:
+        {
+            UINT i;
+            HDROP drop = (HDROP) wParam;
+            UINT count = DragQueryFile(drop, 0xFFFFFFFF, NULL, 0);
+            for (i = 0; i < count; ++i) {
+                UINT size = DragQueryFile(drop, i, NULL, 0) + 1;
+                LPTSTR buffer = SDL_stack_alloc(TCHAR, size);
+                if (buffer) {
+                    if (DragQueryFile(drop, i, buffer, size)) {
+                        char *file = WIN_StringToUTF8(buffer);
+                        SDL_SendDropFile(file);
+                        SDL_free(file);
+                    }
+                    SDL_stack_free(buffer);
+                }
+            }
+            DragFinish(drop);
+            return 0;
+        }
+        break;
+    }
+
+    /* If there's a window proc, assume it's going to handle messages */
+    if (data->wndproc) {
+        return CallWindowProc(data->wndproc, hwnd, msg, wParam, lParam);
+    } else if (returnCode >= 0) {
+        return returnCode;
+    } else {
+        return CallWindowProc(DefWindowProc, hwnd, msg, wParam, lParam);
+    }
+}
+
+void
+WIN_PumpEvents(_THIS)
+{
+    const Uint8 *keystate;
+    MSG msg;
+    DWORD start_ticks = GetTickCount();
+
+    while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+        /* Always translate the message in case it's a non-SDL window (e.g. with Qt integration) */
+        TranslateMessage(&msg);
+        DispatchMessage( &msg );
+
+        /* Make sure we don't busy loop here forever if there are lots of events coming in */
+        if (SDL_TICKS_PASSED(msg.time, start_ticks)) {
+            break;
+        }
+    }
+
+    /* Windows loses a shift KEYUP event when you have both pressed at once and let go of one.
+       You won't get a KEYUP until both are released, and that keyup will only be for the second
+       key you released. Take heroic measures and check the keystate as of the last handled event,
+       and if we think a key is pressed when Windows doesn't, unstick it in SDL's state. */
+    keystate = SDL_GetKeyboardState(NULL);
+    if ((keystate[SDL_SCANCODE_LSHIFT] == SDL_PRESSED) && !(GetKeyState(VK_LSHIFT) & 0x8000)) {
+        SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_LSHIFT);
+    }
+    if ((keystate[SDL_SCANCODE_RSHIFT] == SDL_PRESSED) && !(GetKeyState(VK_RSHIFT) & 0x8000)) {
+        SDL_SendKeyboardKey(SDL_RELEASED, SDL_SCANCODE_RSHIFT);
+    }
+}
+
+static int app_registered = 0;
+LPTSTR SDL_Appname = NULL;
+Uint32 SDL_Appstyle = 0;
+HINSTANCE SDL_Instance = NULL;
+
+/* Register the class for this application */
+int
+SDL_RegisterApp(char *name, Uint32 style, void *hInst)
+{
+    WNDCLASS class;
+
+    /* Only do this once... */
+    if (app_registered) {
+        ++app_registered;
+        return (0);
+    }
+    if (!name && !SDL_Appname) {
+        name = "SDL_app";
+#if defined(CS_BYTEALIGNCLIENT) || defined(CS_OWNDC)
+        SDL_Appstyle = (CS_BYTEALIGNCLIENT | CS_OWNDC);
+#endif
+        SDL_Instance = hInst ? hInst : GetModuleHandle(NULL);
+    }
+
+    if (name) {
+        SDL_Appname = WIN_UTF8ToString(name);
+        SDL_Appstyle = style;
+        SDL_Instance = hInst ? hInst : GetModuleHandle(NULL);
+    }
+
+    /* Register the application class */
+    class.hCursor = NULL;
+    class.hIcon =
+        LoadImage(SDL_Instance, SDL_Appname, IMAGE_ICON, 0, 0,
+                  LR_DEFAULTCOLOR);
+    class.lpszMenuName = NULL;
+    class.lpszClassName = SDL_Appname;
+    class.hbrBackground = NULL;
+    class.hInstance = SDL_Instance;
+    class.style = SDL_Appstyle;
+    class.lpfnWndProc = WIN_WindowProc;
+    class.cbWndExtra = 0;
+    class.cbClsExtra = 0;
+    if (!RegisterClass(&class)) {
+        return SDL_SetError("Couldn't register application class");
+    }
+
+    app_registered = 1;
+    return 0;
+}
+
+/* Unregisters the windowclass registered in SDL_RegisterApp above. */
+void
+SDL_UnregisterApp()
+{
+    WNDCLASS class;
+
+    /* SDL_RegisterApp might not have been called before */
+    if (!app_registered) {
+        return;
+    }
+    --app_registered;
+    if (app_registered == 0) {
+        /* Check for any registered window classes. */
+        if (GetClassInfo(SDL_Instance, SDL_Appname, &class)) {
+            UnregisterClass(SDL_Appname, SDL_Instance);
+        }
+        SDL_free(SDL_Appname);
+        SDL_Appname = NULL;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsevents.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsevents.h
new file mode 100644
index 000000000..b9944ee75
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsevents.h	
@@ -0,0 +1,36 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_windowsevents_h
+#define _SDL_windowsevents_h
+
+extern LPTSTR SDL_Appname;
+extern Uint32 SDL_Appstyle;
+extern HINSTANCE SDL_Instance;
+
+extern LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam,
+                                       LPARAM lParam);
+extern void WIN_PumpEvents(_THIS);
+
+#endif /* _SDL_windowsevents_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsframebuffer.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsframebuffer.c
new file mode 100644
index 000000000..4292db5a6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsframebuffer.c	
@@ -0,0 +1,124 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "SDL_windowsvideo.h"
+
+int WIN_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    size_t size;
+    LPBITMAPINFO info;
+    HBITMAP hbm;
+
+    /* Free the old framebuffer surface */
+    if (data->mdc) {
+        DeleteDC(data->mdc);
+    }
+    if (data->hbm) {
+        DeleteObject(data->hbm);
+    }
+
+    /* Find out the format of the screen */
+    size = sizeof(BITMAPINFOHEADER) + 256 * sizeof (RGBQUAD);
+    info = (LPBITMAPINFO)SDL_stack_alloc(Uint8, size);
+
+    SDL_memset(info, 0, size);
+    info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+
+    /* The second call to GetDIBits() fills in the bitfields */
+    hbm = CreateCompatibleBitmap(data->hdc, 1, 1);
+    GetDIBits(data->hdc, hbm, 0, 0, NULL, info, DIB_RGB_COLORS);
+    GetDIBits(data->hdc, hbm, 0, 0, NULL, info, DIB_RGB_COLORS);
+    DeleteObject(hbm);
+
+    *format = SDL_PIXELFORMAT_UNKNOWN;
+    if (info->bmiHeader.biCompression == BI_BITFIELDS) {
+        int bpp;
+        Uint32 *masks;
+
+        bpp = info->bmiHeader.biPlanes * info->bmiHeader.biBitCount;
+        masks = (Uint32*)((Uint8*)info + info->bmiHeader.biSize);
+        *format = SDL_MasksToPixelFormatEnum(bpp, masks[0], masks[1], masks[2], 0);
+    }
+    if (*format == SDL_PIXELFORMAT_UNKNOWN)
+    {
+        /* We'll use RGB format for now */
+        *format = SDL_PIXELFORMAT_RGB888;
+
+        /* Create a new one */
+        SDL_memset(info, 0, size);
+        info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+        info->bmiHeader.biPlanes = 1;
+        info->bmiHeader.biBitCount = 32;
+        info->bmiHeader.biCompression = BI_RGB;
+    }
+
+    /* Fill in the size information */
+    *pitch = (((window->w * SDL_BYTESPERPIXEL(*format)) + 3) & ~3);
+    info->bmiHeader.biWidth = window->w;
+    info->bmiHeader.biHeight = -window->h;  /* negative for topdown bitmap */
+    info->bmiHeader.biSizeImage = window->h * (*pitch);
+
+    data->mdc = CreateCompatibleDC(data->hdc);
+    data->hbm = CreateDIBSection(data->hdc, info, DIB_RGB_COLORS, pixels, NULL, 0);
+    SDL_stack_free(info);
+
+    if (!data->hbm) {
+        return WIN_SetError("Unable to create DIB");
+    }
+    SelectObject(data->mdc, data->hbm);
+
+    return 0;
+}
+
+int WIN_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+    BitBlt(data->hdc, 0, 0, window->w, window->h, data->mdc, 0, 0, SRCCOPY);
+    return 0;
+}
+
+void WIN_DestroyWindowFramebuffer(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+    if (!data) {
+        /* The window wasn't fully initialized */
+        return;
+    }
+
+    if (data->mdc) {
+        DeleteDC(data->mdc);
+        data->mdc = NULL;
+    }
+    if (data->hbm) {
+        DeleteObject(data->hbm);
+        data->hbm = NULL;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsframebuffer.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsframebuffer.h
new file mode 100644
index 000000000..daa42b83e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsframebuffer.h	
@@ -0,0 +1,27 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+extern int WIN_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch);
+extern int WIN_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects);
+extern void WIN_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowskeyboard.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowskeyboard.c
new file mode 100644
index 000000000..0f3c9fcbf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowskeyboard.c	
@@ -0,0 +1,1524 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "SDL_windowsvideo.h"
+
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/scancodes_windows.h"
+
+#include <imm.h>
+#include <oleauto.h>
+
+#ifndef SDL_DISABLE_WINDOWS_IME
+static void IME_Init(SDL_VideoData *videodata, HWND hwnd);
+static void IME_Enable(SDL_VideoData *videodata, HWND hwnd);
+static void IME_Disable(SDL_VideoData *videodata, HWND hwnd);
+static void IME_Quit(SDL_VideoData *videodata);
+#endif /* !SDL_DISABLE_WINDOWS_IME */
+
+#ifndef MAPVK_VK_TO_VSC
+#define MAPVK_VK_TO_VSC     0
+#endif
+#ifndef MAPVK_VSC_TO_VK
+#define MAPVK_VSC_TO_VK     1
+#endif
+#ifndef MAPVK_VK_TO_CHAR
+#define MAPVK_VK_TO_CHAR    2
+#endif
+
+/* Alphabetic scancodes for PC keyboards */
+void
+WIN_InitKeyboard(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    data->ime_com_initialized = SDL_FALSE;
+    data->ime_threadmgr = 0;
+    data->ime_initialized = SDL_FALSE;
+    data->ime_enabled = SDL_FALSE;
+    data->ime_available = SDL_FALSE;
+    data->ime_hwnd_main = 0;
+    data->ime_hwnd_current = 0;
+    data->ime_himc = 0;
+    data->ime_composition[0] = 0;
+    data->ime_readingstring[0] = 0;
+    data->ime_cursor = 0;
+
+    data->ime_candlist = SDL_FALSE;
+    SDL_memset(data->ime_candidates, 0, sizeof(data->ime_candidates));
+    data->ime_candcount = 0;
+    data->ime_candref = 0;
+    data->ime_candsel = 0;
+    data->ime_candpgsize = 0;
+    data->ime_candlistindexbase = 0;
+    data->ime_candvertical = SDL_TRUE;
+
+    data->ime_dirty = SDL_FALSE;
+    SDL_memset(&data->ime_rect, 0, sizeof(data->ime_rect));
+    SDL_memset(&data->ime_candlistrect, 0, sizeof(data->ime_candlistrect));
+    data->ime_winwidth = 0;
+    data->ime_winheight = 0;
+
+    data->ime_hkl = 0;
+    data->ime_himm32 = 0;
+    data->GetReadingString = 0;
+    data->ShowReadingWindow = 0;
+    data->ImmLockIMC = 0;
+    data->ImmUnlockIMC = 0;
+    data->ImmLockIMCC = 0;
+    data->ImmUnlockIMCC = 0;
+    data->ime_uiless = SDL_FALSE;
+    data->ime_threadmgrex = 0;
+    data->ime_uielemsinkcookie = TF_INVALID_COOKIE;
+    data->ime_alpnsinkcookie = TF_INVALID_COOKIE;
+    data->ime_openmodesinkcookie = TF_INVALID_COOKIE;
+    data->ime_convmodesinkcookie = TF_INVALID_COOKIE;
+    data->ime_uielemsink = 0;
+    data->ime_ippasink = 0;
+
+    WIN_UpdateKeymap();
+
+    SDL_SetScancodeName(SDL_SCANCODE_APPLICATION, "Menu");
+    SDL_SetScancodeName(SDL_SCANCODE_LGUI, "Left Windows");
+    SDL_SetScancodeName(SDL_SCANCODE_RGUI, "Right Windows");
+}
+
+void
+WIN_UpdateKeymap()
+{
+    int i;
+    SDL_Scancode scancode;
+    SDL_Keycode keymap[SDL_NUM_SCANCODES];
+
+    SDL_GetDefaultKeymap(keymap);
+
+    for (i = 0; i < SDL_arraysize(windows_scancode_table); i++) {
+        int vk;
+        /* Make sure this scancode is a valid character scancode */
+        scancode = windows_scancode_table[i];
+        if (scancode == SDL_SCANCODE_UNKNOWN ) {
+            continue;
+        }
+
+        /* If this key is one of the non-mappable keys, ignore it */
+        /* Don't allow the number keys right above the qwerty row to translate or the top left key (grave/backquote) */
+        /* Not mapping numbers fixes the French layout, giving numeric keycodes for the number keys, which is the expected behavior */
+        if ((keymap[scancode] & SDLK_SCANCODE_MASK) ||
+            scancode == SDL_SCANCODE_GRAVE ||
+            (scancode >= SDL_SCANCODE_1 && scancode <= SDL_SCANCODE_0) ) {
+            continue;
+        }
+
+        vk =  MapVirtualKey(i, MAPVK_VSC_TO_VK);
+        if ( vk ) {
+            int ch = (MapVirtualKey( vk, MAPVK_VK_TO_CHAR ) & 0x7FFF);
+            if ( ch ) {
+                if ( ch >= 'A' && ch <= 'Z' ) {
+                    keymap[scancode] =  SDLK_a + ( ch - 'A' );
+                } else {
+                    keymap[scancode] = ch;
+                }
+            }
+        }
+    }
+
+    SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES);
+}
+
+void
+WIN_QuitKeyboard(_THIS)
+{
+#ifndef SDL_DISABLE_WINDOWS_IME
+    IME_Quit((SDL_VideoData *)_this->driverdata);
+#endif
+}
+
+void
+WIN_StartTextInput(_THIS)
+{
+#ifndef SDL_DISABLE_WINDOWS_IME
+    SDL_Window *window = SDL_GetKeyboardFocus();
+    if (window) {
+        HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
+        SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
+        SDL_GetWindowSize(window, &videodata->ime_winwidth, &videodata->ime_winheight);
+        IME_Init(videodata, hwnd);
+        IME_Enable(videodata, hwnd);
+    }
+#endif /* !SDL_DISABLE_WINDOWS_IME */
+}
+
+void
+WIN_StopTextInput(_THIS)
+{
+#ifndef SDL_DISABLE_WINDOWS_IME
+    SDL_Window *window = SDL_GetKeyboardFocus();
+    if (window) {
+        HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
+        SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
+        IME_Init(videodata, hwnd);
+        IME_Disable(videodata, hwnd);
+    }
+#endif /* !SDL_DISABLE_WINDOWS_IME */
+}
+
+void
+WIN_SetTextInputRect(_THIS, SDL_Rect *rect)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
+
+    if (!rect) {
+        SDL_InvalidParamError("rect");
+        return;
+    }
+
+    videodata->ime_rect = *rect;
+}
+
+#ifdef SDL_DISABLE_WINDOWS_IME
+
+
+SDL_bool
+IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, SDL_VideoData *videodata)
+{
+    return SDL_FALSE;
+}
+
+void IME_Present(SDL_VideoData *videodata)
+{
+}
+
+#else
+
+#ifdef __GNUC__
+#undef DEFINE_GUID
+#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) static const GUID n = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
+DEFINE_GUID(IID_ITfInputProcessorProfileActivationSink,        0x71C6E74E,0x0F28,0x11D8,0xA8,0x2A,0x00,0x06,0x5B,0x84,0x43,0x5C);
+DEFINE_GUID(IID_ITfUIElementSink,                              0xEA1EA136,0x19DF,0x11D7,0xA6,0xD2,0x00,0x06,0x5B,0x84,0x43,0x5C);
+DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD,                           0x34745C63,0xB2F0,0x4784,0x8B,0x67,0x5E,0x12,0xC8,0x70,0x1A,0x31);
+DEFINE_GUID(IID_ITfSource,                                     0x4EA48A35,0x60AE,0x446F,0x8F,0xD6,0xE6,0xA8,0xD8,0x24,0x59,0xF7);
+DEFINE_GUID(IID_ITfUIElementMgr,                               0xEA1EA135,0x19DF,0x11D7,0xA6,0xD2,0x00,0x06,0x5B,0x84,0x43,0x5C);
+DEFINE_GUID(IID_ITfCandidateListUIElement,                     0xEA1EA138,0x19DF,0x11D7,0xA6,0xD2,0x00,0x06,0x5B,0x84,0x43,0x5C);
+DEFINE_GUID(IID_ITfReadingInformationUIElement,                0xEA1EA139,0x19DF,0x11D7,0xA6,0xD2,0x00,0x06,0x5B,0x84,0x43,0x5C);
+DEFINE_GUID(IID_ITfThreadMgr,                                  0xAA80E801,0x2021,0x11D2,0x93,0xE0,0x00,0x60,0xB0,0x67,0xB8,0x6E);
+DEFINE_GUID(CLSID_TF_ThreadMgr,                                0x529A9E6B,0x6587,0x4F23,0xAB,0x9E,0x9C,0x7D,0x68,0x3E,0x3C,0x50);
+DEFINE_GUID(IID_ITfThreadMgrEx,                                0x3E90ADE3,0x7594,0x4CB0,0xBB,0x58,0x69,0x62,0x8F,0x5F,0x45,0x8C);
+#endif
+
+#define LANG_CHT MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL)
+#define LANG_CHS MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED)
+
+#define MAKEIMEVERSION(major,minor) ((DWORD) (((BYTE)(major) << 24) | ((BYTE)(minor) << 16) ))
+#define IMEID_VER(id) ((id) & 0xffff0000)
+#define IMEID_LANG(id) ((id) & 0x0000ffff)
+
+#define CHT_HKL_DAYI            ((HKL)0xE0060404)
+#define CHT_HKL_NEW_PHONETIC    ((HKL)0xE0080404)
+#define CHT_HKL_NEW_CHANG_JIE   ((HKL)0xE0090404)
+#define CHT_HKL_NEW_QUICK       ((HKL)0xE00A0404)
+#define CHT_HKL_HK_CANTONESE    ((HKL)0xE00B0404)
+#define CHT_IMEFILENAME1        "TINTLGNT.IME"
+#define CHT_IMEFILENAME2        "CINTLGNT.IME"
+#define CHT_IMEFILENAME3        "MSTCIPHA.IME"
+#define IMEID_CHT_VER42         (LANG_CHT | MAKEIMEVERSION(4, 2))
+#define IMEID_CHT_VER43         (LANG_CHT | MAKEIMEVERSION(4, 3))
+#define IMEID_CHT_VER44         (LANG_CHT | MAKEIMEVERSION(4, 4))
+#define IMEID_CHT_VER50         (LANG_CHT | MAKEIMEVERSION(5, 0))
+#define IMEID_CHT_VER51         (LANG_CHT | MAKEIMEVERSION(5, 1))
+#define IMEID_CHT_VER52         (LANG_CHT | MAKEIMEVERSION(5, 2))
+#define IMEID_CHT_VER60         (LANG_CHT | MAKEIMEVERSION(6, 0))
+#define IMEID_CHT_VER_VISTA     (LANG_CHT | MAKEIMEVERSION(7, 0))
+
+#define CHS_HKL                 ((HKL)0xE00E0804)
+#define CHS_IMEFILENAME1        "PINTLGNT.IME"
+#define CHS_IMEFILENAME2        "MSSCIPYA.IME"
+#define IMEID_CHS_VER41         (LANG_CHS | MAKEIMEVERSION(4, 1))
+#define IMEID_CHS_VER42         (LANG_CHS | MAKEIMEVERSION(4, 2))
+#define IMEID_CHS_VER53         (LANG_CHS | MAKEIMEVERSION(5, 3))
+
+#define LANG() LOWORD((videodata->ime_hkl))
+#define PRIMLANG() ((WORD)PRIMARYLANGID(LANG()))
+#define SUBLANG() SUBLANGID(LANG())
+
+static void IME_UpdateInputLocale(SDL_VideoData *videodata);
+static void IME_ClearComposition(SDL_VideoData *videodata);
+static void IME_SetWindow(SDL_VideoData* videodata, HWND hwnd);
+static void IME_SetupAPI(SDL_VideoData *videodata);
+static DWORD IME_GetId(SDL_VideoData *videodata, UINT uIndex);
+static void IME_SendEditingEvent(SDL_VideoData *videodata);
+static void IME_DestroyTextures(SDL_VideoData *videodata);
+
+#define SDL_IsEqualIID(riid1, riid2) SDL_IsEqualGUID(riid1, riid2)
+#define SDL_IsEqualGUID(rguid1, rguid2) (!SDL_memcmp(rguid1, rguid2, sizeof(GUID)))
+
+static SDL_bool UILess_SetupSinks(SDL_VideoData *videodata);
+static void UILess_ReleaseSinks(SDL_VideoData *videodata);
+static void UILess_EnableUIUpdates(SDL_VideoData *videodata);
+static void UILess_DisableUIUpdates(SDL_VideoData *videodata);
+
+static void
+IME_Init(SDL_VideoData *videodata, HWND hwnd)
+{
+    if (videodata->ime_initialized)
+        return;
+
+    videodata->ime_hwnd_main = hwnd;
+    if (SUCCEEDED(WIN_CoInitialize())) {
+        videodata->ime_com_initialized = SDL_TRUE;
+        CoCreateInstance(&CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, &IID_ITfThreadMgr, (LPVOID *)&videodata->ime_threadmgr);
+    }
+    videodata->ime_initialized = SDL_TRUE;
+    videodata->ime_himm32 = SDL_LoadObject("imm32.dll");
+    if (!videodata->ime_himm32) {
+        videodata->ime_available = SDL_FALSE;
+        return;
+    }
+    videodata->ImmLockIMC = (LPINPUTCONTEXT2 (WINAPI *)(HIMC))SDL_LoadFunction(videodata->ime_himm32, "ImmLockIMC");
+    videodata->ImmUnlockIMC = (BOOL (WINAPI *)(HIMC))SDL_LoadFunction(videodata->ime_himm32, "ImmUnlockIMC");
+    videodata->ImmLockIMCC = (LPVOID (WINAPI *)(HIMCC))SDL_LoadFunction(videodata->ime_himm32, "ImmLockIMCC");
+    videodata->ImmUnlockIMCC = (BOOL (WINAPI *)(HIMCC))SDL_LoadFunction(videodata->ime_himm32, "ImmUnlockIMCC");
+
+    IME_SetWindow(videodata, hwnd);
+    videodata->ime_himc = ImmGetContext(hwnd);
+    ImmReleaseContext(hwnd, videodata->ime_himc);
+    if (!videodata->ime_himc) {
+        videodata->ime_available = SDL_FALSE;
+        IME_Disable(videodata, hwnd);
+        return;
+    }
+    videodata->ime_available = SDL_TRUE;
+    IME_UpdateInputLocale(videodata);
+    IME_SetupAPI(videodata);
+    videodata->ime_uiless = UILess_SetupSinks(videodata);
+    IME_UpdateInputLocale(videodata);
+    IME_Disable(videodata, hwnd);
+}
+
+static void
+IME_Enable(SDL_VideoData *videodata, HWND hwnd)
+{
+    if (!videodata->ime_initialized || !videodata->ime_hwnd_current)
+        return;
+
+    if (!videodata->ime_available) {
+        IME_Disable(videodata, hwnd);
+        return;
+    }
+    if (videodata->ime_hwnd_current == videodata->ime_hwnd_main)
+        ImmAssociateContext(videodata->ime_hwnd_current, videodata->ime_himc);
+
+    videodata->ime_enabled = SDL_TRUE;
+    IME_UpdateInputLocale(videodata);
+    UILess_EnableUIUpdates(videodata);
+}
+
+static void
+IME_Disable(SDL_VideoData *videodata, HWND hwnd)
+{
+    if (!videodata->ime_initialized || !videodata->ime_hwnd_current)
+        return;
+
+    IME_ClearComposition(videodata);
+    if (videodata->ime_hwnd_current == videodata->ime_hwnd_main)
+        ImmAssociateContext(videodata->ime_hwnd_current, (HIMC)0);
+
+    videodata->ime_enabled = SDL_FALSE;
+    UILess_DisableUIUpdates(videodata);
+}
+
+static void
+IME_Quit(SDL_VideoData *videodata)
+{
+    if (!videodata->ime_initialized)
+        return;
+
+    UILess_ReleaseSinks(videodata);
+    if (videodata->ime_hwnd_main)
+        ImmAssociateContext(videodata->ime_hwnd_main, videodata->ime_himc);
+
+    videodata->ime_hwnd_main = 0;
+    videodata->ime_himc = 0;
+    if (videodata->ime_himm32) {
+        SDL_UnloadObject(videodata->ime_himm32);
+        videodata->ime_himm32 = 0;
+    }
+    if (videodata->ime_threadmgr) {
+        videodata->ime_threadmgr->lpVtbl->Release(videodata->ime_threadmgr);
+        videodata->ime_threadmgr = 0;
+    }
+    if (videodata->ime_com_initialized) {
+        WIN_CoUninitialize();
+        videodata->ime_com_initialized = SDL_FALSE;
+    }
+    IME_DestroyTextures(videodata);
+    videodata->ime_initialized = SDL_FALSE;
+}
+
+static void
+IME_GetReadingString(SDL_VideoData *videodata, HWND hwnd)
+{
+    DWORD id = 0;
+    HIMC himc = 0;
+    WCHAR buffer[16];
+    WCHAR *s = buffer;
+    DWORD len = 0;
+    INT err = 0;
+    BOOL vertical = FALSE;
+    UINT maxuilen = 0;
+    static OSVERSIONINFOA osversion = {0};
+    if (videodata->ime_uiless)
+        return;
+
+    videodata->ime_readingstring[0] = 0;
+    if (!osversion.dwOSVersionInfoSize) {
+        osversion.dwOSVersionInfoSize = sizeof(osversion);
+        GetVersionExA(&osversion);
+    }
+    id = IME_GetId(videodata, 0);
+    if (!id)
+        return;
+
+    himc = ImmGetContext(hwnd);
+    if (!himc)
+        return;
+
+    if (videodata->GetReadingString) {
+        len = videodata->GetReadingString(himc, 0, 0, &err, &vertical, &maxuilen);
+        if (len) {
+            if (len > SDL_arraysize(buffer))
+                len = SDL_arraysize(buffer);
+
+            len = videodata->GetReadingString(himc, len, s, &err, &vertical, &maxuilen);
+        }
+        SDL_wcslcpy(videodata->ime_readingstring, s, len);
+    }
+    else {
+        LPINPUTCONTEXT2 lpimc = videodata->ImmLockIMC(himc);
+        LPBYTE p = 0;
+        s = 0;
+        switch (id)
+        {
+        case IMEID_CHT_VER42:
+        case IMEID_CHT_VER43:
+        case IMEID_CHT_VER44:
+            p = *(LPBYTE *)((LPBYTE)videodata->ImmLockIMCC(lpimc->hPrivate) + 24);
+            if (!p)
+                break;
+
+            len = *(DWORD *)(p + 7*4 + 32*4);
+            s = (WCHAR *)(p + 56);
+            break;
+        case IMEID_CHT_VER51:
+        case IMEID_CHT_VER52:
+        case IMEID_CHS_VER53:
+            p = *(LPBYTE *)((LPBYTE)videodata->ImmLockIMCC(lpimc->hPrivate) + 4);
+            if (!p)
+                break;
+
+            p = *(LPBYTE *)((LPBYTE)p + 1*4 + 5*4);
+            if (!p)
+                break;
+
+            len = *(DWORD *)(p + 1*4 + (16*2+2*4) + 5*4 + 16*2);
+            s = (WCHAR *)(p + 1*4 + (16*2+2*4) + 5*4);
+            break;
+        case IMEID_CHS_VER41:
+            {
+                int offset = (IME_GetId(videodata, 1) >= 0x00000002) ? 8 : 7;
+                p = *(LPBYTE *)((LPBYTE)videodata->ImmLockIMCC(lpimc->hPrivate) + offset * 4);
+                if (!p)
+                    break;
+
+                len = *(DWORD *)(p + 7*4 + 16*2*4);
+                s = (WCHAR *)(p + 6*4 + 16*2*1);
+            }
+            break;
+        case IMEID_CHS_VER42:
+            if (osversion.dwPlatformId != VER_PLATFORM_WIN32_NT)
+                break;
+
+            p = *(LPBYTE *)((LPBYTE)videodata->ImmLockIMCC(lpimc->hPrivate) + 1*4 + 1*4 + 6*4);
+            if (!p)
+                break;
+
+            len = *(DWORD *)(p + 1*4 + (16*2+2*4) + 5*4 + 16*2);
+            s = (WCHAR *)(p + 1*4 + (16*2+2*4) + 5*4);
+            break;
+        }
+        if (s) {
+            size_t size = SDL_min((size_t)(len + 1), SDL_arraysize(videodata->ime_readingstring));
+            SDL_wcslcpy(videodata->ime_readingstring, s, size);
+        }
+
+        videodata->ImmUnlockIMCC(lpimc->hPrivate);
+        videodata->ImmUnlockIMC(himc);
+    }
+    ImmReleaseContext(hwnd, himc);
+    IME_SendEditingEvent(videodata);
+}
+
+static void
+IME_InputLangChanged(SDL_VideoData *videodata)
+{
+    UINT lang = PRIMLANG();
+    IME_UpdateInputLocale(videodata);
+    if (!videodata->ime_uiless)
+        videodata->ime_candlistindexbase = (videodata->ime_hkl == CHT_HKL_DAYI) ? 0 : 1;
+
+    IME_SetupAPI(videodata);
+    if (lang != PRIMLANG()) {
+        IME_ClearComposition(videodata);
+    }
+}
+
+static DWORD
+IME_GetId(SDL_VideoData *videodata, UINT uIndex)
+{
+    static HKL hklprev = 0;
+    static DWORD dwRet[2] = {0};
+    DWORD dwVerSize = 0;
+    DWORD dwVerHandle = 0;
+    LPVOID lpVerBuffer = 0;
+    LPVOID lpVerData = 0;
+    UINT cbVerData = 0;
+    char szTemp[256];
+    HKL hkl = 0;
+    DWORD dwLang = 0;
+    if (uIndex >= sizeof(dwRet) / sizeof(dwRet[0]))
+        return 0;
+
+    hkl = videodata->ime_hkl;
+    if (hklprev == hkl)
+        return dwRet[uIndex];
+
+    hklprev = hkl;
+    dwLang = ((DWORD_PTR)hkl & 0xffff);
+    if (videodata->ime_uiless && LANG() == LANG_CHT) {
+        dwRet[0] = IMEID_CHT_VER_VISTA;
+        dwRet[1] = 0;
+        return dwRet[0];
+    }
+    if (hkl != CHT_HKL_NEW_PHONETIC
+        && hkl != CHT_HKL_NEW_CHANG_JIE
+        && hkl != CHT_HKL_NEW_QUICK
+        && hkl != CHT_HKL_HK_CANTONESE
+        && hkl != CHS_HKL) {
+        dwRet[0] = dwRet[1] = 0;
+        return dwRet[uIndex];
+    }
+    if (ImmGetIMEFileNameA(hkl, szTemp, sizeof(szTemp) - 1) <= 0) {
+        dwRet[0] = dwRet[1] = 0;
+        return dwRet[uIndex];
+    }
+    if (!videodata->GetReadingString) {
+        #define LCID_INVARIANT MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT)
+        if (CompareStringA(LCID_INVARIANT, NORM_IGNORECASE, szTemp, -1, CHT_IMEFILENAME1, -1) != 2
+            && CompareStringA(LCID_INVARIANT, NORM_IGNORECASE, szTemp, -1, CHT_IMEFILENAME2, -1) != 2
+            && CompareStringA(LCID_INVARIANT, NORM_IGNORECASE, szTemp, -1, CHT_IMEFILENAME3, -1) != 2
+            && CompareStringA(LCID_INVARIANT, NORM_IGNORECASE, szTemp, -1, CHS_IMEFILENAME1, -1) != 2
+            && CompareStringA(LCID_INVARIANT, NORM_IGNORECASE, szTemp, -1, CHS_IMEFILENAME2, -1) != 2) {
+            dwRet[0] = dwRet[1] = 0;
+            return dwRet[uIndex];
+        }
+        #undef LCID_INVARIANT
+        dwVerSize = GetFileVersionInfoSizeA(szTemp, &dwVerHandle);
+        if (dwVerSize) {
+            lpVerBuffer = SDL_malloc(dwVerSize);
+            if (lpVerBuffer) {
+                if (GetFileVersionInfoA(szTemp, dwVerHandle, dwVerSize, lpVerBuffer)) {
+                    if (VerQueryValueA(lpVerBuffer, "\\", &lpVerData, &cbVerData)) {
+                        #define pVerFixedInfo   ((VS_FIXEDFILEINFO FAR*)lpVerData)
+                        DWORD dwVer = pVerFixedInfo->dwFileVersionMS;
+                        dwVer = (dwVer & 0x00ff0000) << 8 | (dwVer & 0x000000ff) << 16;
+                        if ((videodata->GetReadingString) ||
+                            ((dwLang == LANG_CHT) && (
+                            dwVer == MAKEIMEVERSION(4, 2) ||
+                            dwVer == MAKEIMEVERSION(4, 3) ||
+                            dwVer == MAKEIMEVERSION(4, 4) ||
+                            dwVer == MAKEIMEVERSION(5, 0) ||
+                            dwVer == MAKEIMEVERSION(5, 1) ||
+                            dwVer == MAKEIMEVERSION(5, 2) ||
+                            dwVer == MAKEIMEVERSION(6, 0)))
+                            ||
+                            ((dwLang == LANG_CHS) && (
+                            dwVer == MAKEIMEVERSION(4, 1) ||
+                            dwVer == MAKEIMEVERSION(4, 2) ||
+                            dwVer == MAKEIMEVERSION(5, 3)))) {
+                            dwRet[0] = dwVer | dwLang;
+                            dwRet[1] = pVerFixedInfo->dwFileVersionLS;
+                            SDL_free(lpVerBuffer);
+                            return dwRet[0];
+                        }
+                        #undef pVerFixedInfo
+                    }
+                }
+            }
+            SDL_free(lpVerBuffer);
+        }
+    }
+    dwRet[0] = dwRet[1] = 0;
+    return dwRet[uIndex];
+}
+
+static void
+IME_SetupAPI(SDL_VideoData *videodata)
+{
+    char ime_file[MAX_PATH + 1];
+    void* hime = 0;
+    HKL hkl = 0;
+    videodata->GetReadingString = 0;
+    videodata->ShowReadingWindow = 0;
+    if (videodata->ime_uiless)
+        return;
+
+    hkl = videodata->ime_hkl;
+    if (ImmGetIMEFileNameA(hkl, ime_file, sizeof(ime_file) - 1) <= 0)
+        return;
+
+    hime = SDL_LoadObject(ime_file);
+    if (!hime)
+        return;
+
+    videodata->GetReadingString = (UINT (WINAPI *)(HIMC, UINT, LPWSTR, PINT, BOOL*, PUINT))
+        SDL_LoadFunction(hime, "GetReadingString");
+    videodata->ShowReadingWindow = (BOOL (WINAPI *)(HIMC, BOOL))
+        SDL_LoadFunction(hime, "ShowReadingWindow");
+
+    if (videodata->ShowReadingWindow) {
+        HIMC himc = ImmGetContext(videodata->ime_hwnd_current);
+        if (himc) {
+            videodata->ShowReadingWindow(himc, FALSE);
+            ImmReleaseContext(videodata->ime_hwnd_current, himc);
+        }
+    }
+}
+
+static void
+IME_SetWindow(SDL_VideoData* videodata, HWND hwnd)
+{
+    videodata->ime_hwnd_current = hwnd;
+    if (videodata->ime_threadmgr) {
+        struct ITfDocumentMgr *document_mgr = 0;
+        if (SUCCEEDED(videodata->ime_threadmgr->lpVtbl->AssociateFocus(videodata->ime_threadmgr, hwnd, NULL, &document_mgr))) {
+            if (document_mgr)
+                document_mgr->lpVtbl->Release(document_mgr);
+        }
+    }
+}
+
+static void
+IME_UpdateInputLocale(SDL_VideoData *videodata)
+{
+    static HKL hklprev = 0;
+    videodata->ime_hkl = GetKeyboardLayout(0);
+    if (hklprev == videodata->ime_hkl)
+        return;
+
+    hklprev = videodata->ime_hkl;
+    switch (PRIMLANG()) {
+    case LANG_CHINESE:
+        videodata->ime_candvertical = SDL_TRUE;
+        if (SUBLANG() == SUBLANG_CHINESE_SIMPLIFIED)
+            videodata->ime_candvertical = SDL_FALSE;
+
+        break;
+    case LANG_JAPANESE:
+        videodata->ime_candvertical = SDL_TRUE;
+        break;
+    case LANG_KOREAN:
+        videodata->ime_candvertical = SDL_FALSE;
+        break;
+    }
+}
+
+static void
+IME_ClearComposition(SDL_VideoData *videodata)
+{
+    HIMC himc = 0;
+    if (!videodata->ime_initialized)
+        return;
+
+    himc = ImmGetContext(videodata->ime_hwnd_current);
+    if (!himc)
+        return;
+
+    ImmNotifyIME(himc, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
+    if (videodata->ime_uiless)
+        ImmSetCompositionString(himc, SCS_SETSTR, TEXT(""), sizeof(TCHAR), TEXT(""), sizeof(TCHAR));
+
+    ImmNotifyIME(himc, NI_CLOSECANDIDATE, 0, 0);
+    ImmReleaseContext(videodata->ime_hwnd_current, himc);
+    SDL_SendEditingText("", 0, 0);
+}
+
+static void
+IME_GetCompositionString(SDL_VideoData *videodata, HIMC himc, DWORD string)
+{
+    LONG length = ImmGetCompositionStringW(himc, string, videodata->ime_composition, sizeof(videodata->ime_composition) - sizeof(videodata->ime_composition[0]));
+    if (length < 0)
+        length = 0;
+
+    length /= sizeof(videodata->ime_composition[0]);
+    videodata->ime_cursor = LOWORD(ImmGetCompositionStringW(himc, GCS_CURSORPOS, 0, 0));
+    if (videodata->ime_cursor < SDL_arraysize(videodata->ime_composition) && videodata->ime_composition[videodata->ime_cursor] == 0x3000) {
+        int i;
+        for (i = videodata->ime_cursor + 1; i < length; ++i)
+            videodata->ime_composition[i - 1] = videodata->ime_composition[i];
+
+        --length;
+    }
+    videodata->ime_composition[length] = 0;
+}
+
+static void
+IME_SendInputEvent(SDL_VideoData *videodata)
+{
+    char *s = 0;
+    s = WIN_StringToUTF8(videodata->ime_composition);
+    SDL_SendKeyboardText(s);
+    SDL_free(s);
+
+    videodata->ime_composition[0] = 0;
+    videodata->ime_readingstring[0] = 0;
+    videodata->ime_cursor = 0;
+}
+
+static void
+IME_SendEditingEvent(SDL_VideoData *videodata)
+{
+    char *s = 0;
+    WCHAR buffer[SDL_TEXTEDITINGEVENT_TEXT_SIZE];
+    const size_t size = SDL_arraysize(buffer);
+    buffer[0] = 0;
+    if (videodata->ime_readingstring[0]) {
+        size_t len = SDL_min(SDL_wcslen(videodata->ime_composition), (size_t)videodata->ime_cursor);
+        SDL_wcslcpy(buffer, videodata->ime_composition, len + 1);
+        SDL_wcslcat(buffer, videodata->ime_readingstring, size);
+        SDL_wcslcat(buffer, &videodata->ime_composition[len], size);
+    }
+    else {
+        SDL_wcslcpy(buffer, videodata->ime_composition, size);
+    }
+    s = WIN_StringToUTF8(buffer);
+    SDL_SendEditingText(s, videodata->ime_cursor + SDL_wcslen(videodata->ime_readingstring), 0);
+    SDL_free(s);
+}
+
+static void
+IME_AddCandidate(SDL_VideoData *videodata, UINT i, LPCWSTR candidate)
+{
+    LPWSTR dst = videodata->ime_candidates[i];
+    *dst++ = (WCHAR)(TEXT('0') + ((i + videodata->ime_candlistindexbase) % 10));
+    if (videodata->ime_candvertical)
+        *dst++ = TEXT(' ');
+
+    while (*candidate && (SDL_arraysize(videodata->ime_candidates[i]) > (dst - videodata->ime_candidates[i])))
+        *dst++ = *candidate++;
+
+    *dst = (WCHAR)'\0';
+}
+
+static void
+IME_GetCandidateList(HIMC himc, SDL_VideoData *videodata)
+{
+    LPCANDIDATELIST cand_list = 0;
+    DWORD size = ImmGetCandidateListW(himc, 0, 0, 0);
+    if (size) {
+        cand_list = (LPCANDIDATELIST)SDL_malloc(size);
+        if (cand_list) {
+            size = ImmGetCandidateListW(himc, 0, cand_list, size);
+            if (size) {
+                int i = 0;
+                int j = 0;
+                int page_start = 0;
+                videodata->ime_candsel = cand_list->dwSelection;
+                videodata->ime_candcount = cand_list->dwCount;
+
+                if (LANG() == LANG_CHS && IME_GetId(videodata, 0)) {
+                    const UINT maxcandchar = 18;
+                    UINT i = 0;
+                    size_t cchars = 0;
+
+                    for (; i < videodata->ime_candcount; ++i) {
+                        size_t len = SDL_wcslen((LPWSTR)((DWORD_PTR)cand_list + cand_list->dwOffset[i])) + 1;
+                        if (len + cchars > maxcandchar) {
+                            if (i > cand_list->dwSelection)
+                                break;
+
+                            page_start = i;
+                            cchars = len;
+                        }
+                        else {
+                            cchars += len;
+                        }
+                    }
+                    videodata->ime_candpgsize = i - page_start;
+                }
+                else {
+                    videodata->ime_candpgsize = SDL_min(cand_list->dwPageSize, MAX_CANDLIST);
+                    page_start = (cand_list->dwSelection / videodata->ime_candpgsize) * videodata->ime_candpgsize;
+                }
+                SDL_memset(&videodata->ime_candidates, 0, sizeof(videodata->ime_candidates));
+                for (i = page_start, j = 0; (DWORD)i < cand_list->dwCount && j < (int)videodata->ime_candpgsize; i++, j++) {
+                    LPCWSTR candidate = (LPCWSTR)((DWORD_PTR)cand_list + cand_list->dwOffset[i]);
+                    IME_AddCandidate(videodata, j, candidate);
+                }
+                if (PRIMLANG() == LANG_KOREAN || (PRIMLANG() == LANG_CHT && !IME_GetId(videodata, 0)))
+                    videodata->ime_candsel = -1;
+
+            }
+            SDL_free(cand_list);
+        }
+    }
+}
+
+static void
+IME_ShowCandidateList(SDL_VideoData *videodata)
+{
+    videodata->ime_dirty = SDL_TRUE;
+    videodata->ime_candlist = SDL_TRUE;
+    IME_DestroyTextures(videodata);
+    IME_SendEditingEvent(videodata);
+}
+
+static void
+IME_HideCandidateList(SDL_VideoData *videodata)
+{
+    videodata->ime_dirty = SDL_FALSE;
+    videodata->ime_candlist = SDL_FALSE;
+    IME_DestroyTextures(videodata);
+    IME_SendEditingEvent(videodata);
+}
+
+SDL_bool
+IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, SDL_VideoData *videodata)
+{
+    SDL_bool trap = SDL_FALSE;
+    HIMC himc = 0;
+    if (!videodata->ime_initialized || !videodata->ime_available || !videodata->ime_enabled)
+        return SDL_FALSE;
+
+    switch (msg) {
+    case WM_INPUTLANGCHANGE:
+        IME_InputLangChanged(videodata);
+        break;
+    case WM_IME_SETCONTEXT:
+        *lParam = 0;
+        break;
+    case WM_IME_STARTCOMPOSITION:
+        trap = SDL_TRUE;
+        break;
+    case WM_IME_COMPOSITION:
+        trap = SDL_TRUE;
+        himc = ImmGetContext(hwnd);
+        if (*lParam & GCS_RESULTSTR) {
+            IME_GetCompositionString(videodata, himc, GCS_RESULTSTR);
+            IME_SendInputEvent(videodata);
+        }
+        if (*lParam & GCS_COMPSTR) {
+            if (!videodata->ime_uiless)
+                videodata->ime_readingstring[0] = 0;
+
+            IME_GetCompositionString(videodata, himc, GCS_COMPSTR);
+            IME_SendEditingEvent(videodata);
+        }
+        ImmReleaseContext(hwnd, himc);
+        break;
+    case WM_IME_ENDCOMPOSITION:
+        videodata->ime_composition[0] = 0;
+        videodata->ime_readingstring[0] = 0;
+        videodata->ime_cursor = 0;
+        SDL_SendEditingText("", 0, 0);
+        break;
+    case WM_IME_NOTIFY:
+        switch (wParam) {
+        case IMN_SETCONVERSIONMODE:
+        case IMN_SETOPENSTATUS:
+            IME_UpdateInputLocale(videodata);
+            break;
+        case IMN_OPENCANDIDATE:
+        case IMN_CHANGECANDIDATE:
+            if (videodata->ime_uiless)
+                break;
+
+            trap = SDL_TRUE;
+            IME_ShowCandidateList(videodata);
+            himc = ImmGetContext(hwnd);
+            if (!himc)
+                break;
+
+            IME_GetCandidateList(himc, videodata);
+            ImmReleaseContext(hwnd, himc);
+            break;
+        case IMN_CLOSECANDIDATE:
+            trap = SDL_TRUE;
+            IME_HideCandidateList(videodata);
+            break;
+        case IMN_PRIVATE:
+            {
+                DWORD dwId = IME_GetId(videodata, 0);
+                IME_GetReadingString(videodata, hwnd);
+                switch (dwId)
+                {
+                case IMEID_CHT_VER42:
+                case IMEID_CHT_VER43:
+                case IMEID_CHT_VER44:
+                case IMEID_CHS_VER41:
+                case IMEID_CHS_VER42:
+                    if (*lParam == 1 || *lParam == 2)
+                        trap = SDL_TRUE;
+
+                    break;
+                case IMEID_CHT_VER50:
+                case IMEID_CHT_VER51:
+                case IMEID_CHT_VER52:
+                case IMEID_CHT_VER60:
+                case IMEID_CHS_VER53:
+                    if (*lParam == 16
+                        || *lParam == 17
+                        || *lParam == 26
+                        || *lParam == 27
+                        || *lParam == 28)
+                        trap = SDL_TRUE;
+                    break;
+                }
+            }
+            break;
+        default:
+            trap = SDL_TRUE;
+            break;
+        }
+        break;
+    }
+    return trap;
+}
+
+static void
+IME_CloseCandidateList(SDL_VideoData *videodata)
+{
+    IME_HideCandidateList(videodata);
+    videodata->ime_candcount = 0;
+    SDL_memset(videodata->ime_candidates, 0, sizeof(videodata->ime_candidates));
+}
+
+static void
+UILess_GetCandidateList(SDL_VideoData *videodata, ITfCandidateListUIElement *pcandlist)
+{
+    UINT selection = 0;
+    UINT count = 0;
+    UINT page = 0;
+    UINT pgcount = 0;
+    DWORD pgstart = 0;
+    DWORD pgsize = 0;
+    UINT i, j;
+    pcandlist->lpVtbl->GetSelection(pcandlist, &selection);
+    pcandlist->lpVtbl->GetCount(pcandlist, &count);
+    pcandlist->lpVtbl->GetCurrentPage(pcandlist, &page);
+
+    videodata->ime_candsel = selection;
+    videodata->ime_candcount = count;
+    IME_ShowCandidateList(videodata);
+
+    pcandlist->lpVtbl->GetPageIndex(pcandlist, 0, 0, &pgcount);
+    if (pgcount > 0) {
+        UINT *idxlist = SDL_malloc(sizeof(UINT) * pgcount);
+        if (idxlist) {
+            pcandlist->lpVtbl->GetPageIndex(pcandlist, idxlist, pgcount, &pgcount);
+            pgstart = idxlist[page];
+            if (page < pgcount - 1)
+                pgsize = SDL_min(count, idxlist[page + 1]) - pgstart;
+            else
+                pgsize = count - pgstart;
+
+            SDL_free(idxlist);
+        }
+    }
+    videodata->ime_candpgsize = SDL_min(pgsize, MAX_CANDLIST);
+    videodata->ime_candsel = videodata->ime_candsel - pgstart;
+
+    SDL_memset(videodata->ime_candidates, 0, sizeof(videodata->ime_candidates));
+    for (i = pgstart, j = 0; (DWORD)i < count && j < videodata->ime_candpgsize; i++, j++) {
+        BSTR bstr;
+        if (SUCCEEDED(pcandlist->lpVtbl->GetString(pcandlist, i, &bstr))) {
+            if (bstr) {
+                IME_AddCandidate(videodata, j, bstr);
+                SysFreeString(bstr);
+            }
+        }
+    }
+    if (PRIMLANG() == LANG_KOREAN)
+        videodata->ime_candsel = -1;
+}
+
+STDMETHODIMP_(ULONG) TSFSink_AddRef(TSFSink *sink)
+{
+    return ++sink->refcount;
+}
+
+STDMETHODIMP_(ULONG)TSFSink_Release(TSFSink *sink)
+{
+    --sink->refcount;
+    if (sink->refcount == 0) {
+        SDL_free(sink);
+        return 0;
+    }
+    return sink->refcount;
+}
+
+STDMETHODIMP UIElementSink_QueryInterface(TSFSink *sink, REFIID riid, PVOID *ppv)
+{
+    if (!ppv)
+        return E_INVALIDARG;
+
+    *ppv = 0;
+    if (SDL_IsEqualIID(riid, &IID_IUnknown))
+        *ppv = (IUnknown *)sink;
+    else if (SDL_IsEqualIID(riid, &IID_ITfUIElementSink))
+        *ppv = (ITfUIElementSink *)sink;
+
+    if (*ppv) {
+        TSFSink_AddRef(sink);
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+ITfUIElement *UILess_GetUIElement(SDL_VideoData *videodata, DWORD dwUIElementId)
+{
+    ITfUIElementMgr *puiem = 0;
+    ITfUIElement *pelem = 0;
+    ITfThreadMgrEx *threadmgrex = videodata->ime_threadmgrex;
+
+    if (SUCCEEDED(threadmgrex->lpVtbl->QueryInterface(threadmgrex, &IID_ITfUIElementMgr, (LPVOID *)&puiem))) {
+        puiem->lpVtbl->GetUIElement(puiem, dwUIElementId, &pelem);
+        puiem->lpVtbl->Release(puiem);
+    }
+    return pelem;
+}
+
+STDMETHODIMP UIElementSink_BeginUIElement(TSFSink *sink, DWORD dwUIElementId, BOOL *pbShow)
+{
+    ITfUIElement *element = UILess_GetUIElement((SDL_VideoData *)sink->data, dwUIElementId);
+    ITfReadingInformationUIElement *preading = 0;
+    ITfCandidateListUIElement *pcandlist = 0;
+    SDL_VideoData *videodata = (SDL_VideoData *)sink->data;
+    if (!element)
+        return E_INVALIDARG;
+
+    *pbShow = FALSE;
+    if (SUCCEEDED(element->lpVtbl->QueryInterface(element, &IID_ITfReadingInformationUIElement, (LPVOID *)&preading))) {
+        BSTR bstr;
+        if (SUCCEEDED(preading->lpVtbl->GetString(preading, &bstr)) && bstr) {
+            SysFreeString(bstr);
+        }
+        preading->lpVtbl->Release(preading);
+    }
+    else if (SUCCEEDED(element->lpVtbl->QueryInterface(element, &IID_ITfCandidateListUIElement, (LPVOID *)&pcandlist))) {
+        videodata->ime_candref++;
+        UILess_GetCandidateList(videodata, pcandlist);
+        pcandlist->lpVtbl->Release(pcandlist);
+    }
+    return S_OK;
+}
+
+STDMETHODIMP UIElementSink_UpdateUIElement(TSFSink *sink, DWORD dwUIElementId)
+{
+    ITfUIElement *element = UILess_GetUIElement((SDL_VideoData *)sink->data, dwUIElementId);
+    ITfReadingInformationUIElement *preading = 0;
+    ITfCandidateListUIElement *pcandlist = 0;
+    SDL_VideoData *videodata = (SDL_VideoData *)sink->data;
+    if (!element)
+        return E_INVALIDARG;
+
+    if (SUCCEEDED(element->lpVtbl->QueryInterface(element, &IID_ITfReadingInformationUIElement, (LPVOID *)&preading))) {
+        BSTR bstr;
+        if (SUCCEEDED(preading->lpVtbl->GetString(preading, &bstr)) && bstr) {
+            WCHAR *s = (WCHAR *)bstr;
+            SDL_wcslcpy(videodata->ime_readingstring, s, SDL_arraysize(videodata->ime_readingstring));
+            IME_SendEditingEvent(videodata);
+            SysFreeString(bstr);
+        }
+        preading->lpVtbl->Release(preading);
+    }
+    else if (SUCCEEDED(element->lpVtbl->QueryInterface(element, &IID_ITfCandidateListUIElement, (LPVOID *)&pcandlist))) {
+        UILess_GetCandidateList(videodata, pcandlist);
+        pcandlist->lpVtbl->Release(pcandlist);
+    }
+    return S_OK;
+}
+
+STDMETHODIMP UIElementSink_EndUIElement(TSFSink *sink, DWORD dwUIElementId)
+{
+    ITfUIElement *element = UILess_GetUIElement((SDL_VideoData *)sink->data, dwUIElementId);
+    ITfReadingInformationUIElement *preading = 0;
+    ITfCandidateListUIElement *pcandlist = 0;
+    SDL_VideoData *videodata = (SDL_VideoData *)sink->data;
+    if (!element)
+        return E_INVALIDARG;
+
+    if (SUCCEEDED(element->lpVtbl->QueryInterface(element, &IID_ITfReadingInformationUIElement, (LPVOID *)&preading))) {
+        videodata->ime_readingstring[0] = 0;
+        IME_SendEditingEvent(videodata);
+        preading->lpVtbl->Release(preading);
+    }
+    if (SUCCEEDED(element->lpVtbl->QueryInterface(element, &IID_ITfCandidateListUIElement, (LPVOID *)&pcandlist))) {
+        videodata->ime_candref--;
+        if (videodata->ime_candref == 0)
+            IME_CloseCandidateList(videodata);
+
+        pcandlist->lpVtbl->Release(pcandlist);
+    }
+    return S_OK;
+}
+
+STDMETHODIMP IPPASink_QueryInterface(TSFSink *sink, REFIID riid, PVOID *ppv)
+{
+    if (!ppv)
+        return E_INVALIDARG;
+
+    *ppv = 0;
+    if (SDL_IsEqualIID(riid, &IID_IUnknown))
+        *ppv = (IUnknown *)sink;
+    else if (SDL_IsEqualIID(riid, &IID_ITfInputProcessorProfileActivationSink))
+        *ppv = (ITfInputProcessorProfileActivationSink *)sink;
+
+    if (*ppv) {
+        TSFSink_AddRef(sink);
+        return S_OK;
+    }
+    return E_NOINTERFACE;
+}
+
+STDMETHODIMP IPPASink_OnActivated(TSFSink *sink, DWORD dwProfileType, LANGID langid, REFCLSID clsid, REFGUID catid, REFGUID guidProfile, HKL hkl, DWORD dwFlags)
+{
+    static const GUID TF_PROFILE_DAYI = { 0x037B2C25, 0x480C, 0x4D7F, { 0xB0, 0x27, 0xD6, 0xCA, 0x6B, 0x69, 0x78, 0x8A } };
+    SDL_VideoData *videodata = (SDL_VideoData *)sink->data;
+    videodata->ime_candlistindexbase = SDL_IsEqualGUID(&TF_PROFILE_DAYI, guidProfile) ? 0 : 1;
+    if (SDL_IsEqualIID(catid, &GUID_TFCAT_TIP_KEYBOARD) && (dwFlags & TF_IPSINK_FLAG_ACTIVE))
+        IME_InputLangChanged((SDL_VideoData *)sink->data);
+
+    IME_HideCandidateList(videodata);
+    return S_OK;
+}
+
+static void *vtUIElementSink[] = {
+    (void *)(UIElementSink_QueryInterface),
+    (void *)(TSFSink_AddRef),
+    (void *)(TSFSink_Release),
+    (void *)(UIElementSink_BeginUIElement),
+    (void *)(UIElementSink_UpdateUIElement),
+    (void *)(UIElementSink_EndUIElement)
+};
+
+static void *vtIPPASink[] = {
+    (void *)(IPPASink_QueryInterface),
+    (void *)(TSFSink_AddRef),
+    (void *)(TSFSink_Release),
+    (void *)(IPPASink_OnActivated)
+};
+
+static void
+UILess_EnableUIUpdates(SDL_VideoData *videodata)
+{
+    ITfSource *source = 0;
+    if (!videodata->ime_threadmgrex || videodata->ime_uielemsinkcookie != TF_INVALID_COOKIE)
+        return;
+
+    if (SUCCEEDED(videodata->ime_threadmgrex->lpVtbl->QueryInterface(videodata->ime_threadmgrex, &IID_ITfSource, (LPVOID *)&source))) {
+        source->lpVtbl->AdviseSink(source, &IID_ITfUIElementSink, (IUnknown *)videodata->ime_uielemsink, &videodata->ime_uielemsinkcookie);
+        source->lpVtbl->Release(source);
+    }
+}
+
+static void
+UILess_DisableUIUpdates(SDL_VideoData *videodata)
+{
+    ITfSource *source = 0;
+    if (!videodata->ime_threadmgrex || videodata->ime_uielemsinkcookie == TF_INVALID_COOKIE)
+        return;
+
+    if (SUCCEEDED(videodata->ime_threadmgrex->lpVtbl->QueryInterface(videodata->ime_threadmgrex, &IID_ITfSource, (LPVOID *)&source))) {
+        source->lpVtbl->UnadviseSink(source, videodata->ime_uielemsinkcookie);
+        videodata->ime_uielemsinkcookie = TF_INVALID_COOKIE;
+        source->lpVtbl->Release(source);
+    }
+}
+
+static SDL_bool
+UILess_SetupSinks(SDL_VideoData *videodata)
+{
+    TfClientId clientid = 0;
+    SDL_bool result = SDL_FALSE;
+    ITfSource *source = 0;
+    if (FAILED(CoCreateInstance(&CLSID_TF_ThreadMgr, NULL, CLSCTX_INPROC_SERVER, &IID_ITfThreadMgrEx, (LPVOID *)&videodata->ime_threadmgrex)))
+        return SDL_FALSE;
+
+    if (FAILED(videodata->ime_threadmgrex->lpVtbl->ActivateEx(videodata->ime_threadmgrex, &clientid, TF_TMAE_UIELEMENTENABLEDONLY)))
+        return SDL_FALSE;
+
+    videodata->ime_uielemsink = SDL_malloc(sizeof(TSFSink));
+    videodata->ime_ippasink = SDL_malloc(sizeof(TSFSink));
+
+    videodata->ime_uielemsink->lpVtbl = vtUIElementSink;
+    videodata->ime_uielemsink->refcount = 1;
+    videodata->ime_uielemsink->data = videodata;
+
+    videodata->ime_ippasink->lpVtbl = vtIPPASink;
+    videodata->ime_ippasink->refcount = 1;
+    videodata->ime_ippasink->data = videodata;
+
+    if (SUCCEEDED(videodata->ime_threadmgrex->lpVtbl->QueryInterface(videodata->ime_threadmgrex, &IID_ITfSource, (LPVOID *)&source))) {
+        if (SUCCEEDED(source->lpVtbl->AdviseSink(source, &IID_ITfUIElementSink, (IUnknown *)videodata->ime_uielemsink, &videodata->ime_uielemsinkcookie))) {
+            if (SUCCEEDED(source->lpVtbl->AdviseSink(source, &IID_ITfInputProcessorProfileActivationSink, (IUnknown *)videodata->ime_ippasink, &videodata->ime_alpnsinkcookie))) {
+                result = SDL_TRUE;
+            }
+        }
+        source->lpVtbl->Release(source);
+    }
+    return result;
+}
+
+#define SAFE_RELEASE(p)                             \
+{                                                   \
+    if (p) {                                        \
+        (p)->lpVtbl->Release((p));                  \
+        (p) = 0;                                    \
+    }                                               \
+}
+
+static void
+UILess_ReleaseSinks(SDL_VideoData *videodata)
+{
+    ITfSource *source = 0;
+    if (videodata->ime_threadmgrex && SUCCEEDED(videodata->ime_threadmgrex->lpVtbl->QueryInterface(videodata->ime_threadmgrex, &IID_ITfSource, (LPVOID *)&source))) {
+        source->lpVtbl->UnadviseSink(source, videodata->ime_uielemsinkcookie);
+        source->lpVtbl->UnadviseSink(source, videodata->ime_alpnsinkcookie);
+        SAFE_RELEASE(source);
+        videodata->ime_threadmgrex->lpVtbl->Deactivate(videodata->ime_threadmgrex);
+        SAFE_RELEASE(videodata->ime_threadmgrex);
+        TSFSink_Release(videodata->ime_uielemsink);
+        videodata->ime_uielemsink = 0;
+        TSFSink_Release(videodata->ime_ippasink);
+        videodata->ime_ippasink = 0;
+    }
+}
+
+static void *
+StartDrawToBitmap(HDC hdc, HBITMAP *hhbm, int width, int height)
+{
+    BITMAPINFO info;
+    BITMAPINFOHEADER *infoHeader = &info.bmiHeader;
+    BYTE *bits = NULL;
+    if (hhbm) {
+        SDL_zero(info);
+        infoHeader->biSize = sizeof(BITMAPINFOHEADER);
+        infoHeader->biWidth = width;
+        infoHeader->biHeight = -1 * SDL_abs(height);
+        infoHeader->biPlanes = 1;
+        infoHeader->biBitCount = 32;
+        infoHeader->biCompression = BI_RGB;
+        *hhbm = CreateDIBSection(hdc, &info, DIB_RGB_COLORS, (void **)&bits, 0, 0);
+        if (*hhbm)
+            SelectObject(hdc, *hhbm);
+    }
+    return bits;
+}
+
+static void
+StopDrawToBitmap(HDC hdc, HBITMAP *hhbm)
+{
+    if (hhbm && *hhbm) {
+        DeleteObject(*hhbm);
+        *hhbm = NULL;
+    }
+}
+
+/* This draws only within the specified area and fills the entire region. */
+static void
+DrawRect(HDC hdc, int left, int top, int right, int bottom, int pensize)
+{
+    /* The case of no pen (PenSize = 0) is automatically taken care of. */
+    const int penadjust = (int)SDL_floor(pensize / 2.0f - 0.5f);
+    left += pensize / 2;
+    top += pensize / 2;
+    right -= penadjust;
+    bottom -= penadjust;
+    Rectangle(hdc, left, top, right, bottom);
+}
+
+static void
+IME_DestroyTextures(SDL_VideoData *videodata)
+{
+}
+
+#define SDL_swap(a,b) { \
+    int c = (a);        \
+    (a) = (b);          \
+    (b) = c;            \
+    }
+
+static void
+IME_PositionCandidateList(SDL_VideoData *videodata, SIZE size)
+{
+    int left, top, right, bottom;
+    SDL_bool ok = SDL_FALSE;
+    int winw = videodata->ime_winwidth;
+    int winh = videodata->ime_winheight;
+
+    /* Bottom */
+    left = videodata->ime_rect.x;
+    top = videodata->ime_rect.y + videodata->ime_rect.h;
+    right = left + size.cx;
+    bottom = top + size.cy;
+    if (right >= winw) {
+        left -= right - winw;
+        right = winw;
+    }
+    if (bottom < winh)
+        ok = SDL_TRUE;
+
+    /* Top */
+    if (!ok) {
+        left = videodata->ime_rect.x;
+        top = videodata->ime_rect.y - size.cy;
+        right = left + size.cx;
+        bottom = videodata->ime_rect.y;
+        if (right >= winw) {
+            left -= right - winw;
+            right = winw;
+        }
+        if (top >= 0)
+            ok = SDL_TRUE;
+    }
+
+    /* Right */
+    if (!ok) {
+        left = videodata->ime_rect.x + size.cx;
+        top = 0;
+        right = left + size.cx;
+        bottom = size.cy;
+        if (right < winw)
+            ok = SDL_TRUE;
+    }
+
+    /* Left */
+    if (!ok) {
+        left = videodata->ime_rect.x - size.cx;
+        top = 0;
+        right = videodata->ime_rect.x;
+        bottom = size.cy;
+        if (right >= 0)
+            ok = SDL_TRUE;
+    }
+
+    /* Window too small, show at (0,0) */
+    if (!ok) {
+        left = 0;
+        top = 0;
+        right = size.cx;
+        bottom = size.cy;
+    }
+
+    videodata->ime_candlistrect.x = left;
+    videodata->ime_candlistrect.y = top;
+    videodata->ime_candlistrect.w = right - left;
+    videodata->ime_candlistrect.h = bottom - top;
+}
+
+static void
+IME_RenderCandidateList(SDL_VideoData *videodata, HDC hdc)
+{
+    int i, j;
+    SIZE size = {0};
+    SIZE candsizes[MAX_CANDLIST];
+    SIZE maxcandsize = {0};
+    HBITMAP hbm = NULL;
+    const int candcount = SDL_min(SDL_min(MAX_CANDLIST, videodata->ime_candcount), videodata->ime_candpgsize);
+    SDL_bool vertical = videodata->ime_candvertical;
+
+    const int listborder = 1;
+    const int listpadding = 0;
+    const int listbordercolor = RGB(0xB4, 0xC7, 0xAA);
+    const int listfillcolor = RGB(255, 255, 255);
+
+    const int candborder = 1;
+    const int candpadding = 0;
+    const int candmargin = 1;
+    const COLORREF candbordercolor = RGB(255, 255, 255);
+    const COLORREF candfillcolor = RGB(255, 255, 255);
+    const COLORREF candtextcolor = RGB(0, 0, 0);
+    const COLORREF selbordercolor = RGB(0x84, 0xAC, 0xDD);
+    const COLORREF selfillcolor = RGB(0xD2, 0xE6, 0xFF);
+    const COLORREF seltextcolor = RGB(0, 0, 0);
+    const int horzcandspacing = 5;
+
+    HPEN listpen = listborder != 0 ? CreatePen(PS_SOLID, listborder, listbordercolor) : (HPEN)GetStockObject(NULL_PEN);
+    HBRUSH listbrush = CreateSolidBrush(listfillcolor);
+    HPEN candpen = candborder != 0 ? CreatePen(PS_SOLID, candborder, candbordercolor) : (HPEN)GetStockObject(NULL_PEN);
+    HBRUSH candbrush = CreateSolidBrush(candfillcolor);
+    HPEN selpen = candborder != 0 ? CreatePen(PS_DOT, candborder, selbordercolor) : (HPEN)GetStockObject(NULL_PEN);
+    HBRUSH selbrush = CreateSolidBrush(selfillcolor);
+    HFONT font = CreateFont((int)(1 + videodata->ime_rect.h * 0.75f), 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET, OUT_CHARACTER_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, VARIABLE_PITCH | FF_SWISS, TEXT("Microsoft Sans Serif"));
+
+    SetBkMode(hdc, TRANSPARENT);
+    SelectObject(hdc, font);
+
+    for (i = 0; i < candcount; ++i) {
+        const WCHAR *s = videodata->ime_candidates[i];
+        if (!*s)
+            break;
+
+        GetTextExtentPoint32W(hdc, s, SDL_wcslen(s), &candsizes[i]);
+        maxcandsize.cx = SDL_max(maxcandsize.cx, candsizes[i].cx);
+        maxcandsize.cy = SDL_max(maxcandsize.cy, candsizes[i].cy);
+
+    }
+    if (vertical) {
+        size.cx =
+            (listborder * 2) +
+            (listpadding * 2) +
+            (candmargin * 2) +
+            (candborder * 2) +
+            (candpadding * 2) +
+            (maxcandsize.cx)
+            ;
+        size.cy =
+            (listborder * 2) +
+            (listpadding * 2) +
+            ((candcount + 1) * candmargin) +
+            (candcount * candborder * 2) +
+            (candcount * candpadding * 2) +
+            (candcount * maxcandsize.cy)
+            ;
+    }
+    else {
+        size.cx =
+            (listborder * 2) +
+            (listpadding * 2) +
+            ((candcount + 1) * candmargin) +
+            (candcount * candborder * 2) +
+            (candcount * candpadding * 2) +
+            ((candcount - 1) * horzcandspacing);
+        ;
+
+        for (i = 0; i < candcount; ++i)
+            size.cx += candsizes[i].cx;
+
+        size.cy =
+            (listborder * 2) +
+            (listpadding * 2) +
+            (candmargin * 2) +
+            (candborder * 2) +
+            (candpadding * 2) +
+            (maxcandsize.cy)
+            ;
+    }
+
+    StartDrawToBitmap(hdc, &hbm, size.cx, size.cy);
+
+    SelectObject(hdc, listpen);
+    SelectObject(hdc, listbrush);
+    DrawRect(hdc, 0, 0, size.cx, size.cy, listborder);
+
+    SelectObject(hdc, candpen);
+    SelectObject(hdc, candbrush);
+    SetTextColor(hdc, candtextcolor);
+    SetBkMode(hdc, TRANSPARENT);
+
+    for (i = 0; i < candcount; ++i) {
+        const WCHAR *s = videodata->ime_candidates[i];
+        int left, top, right, bottom;
+        if (!*s)
+            break;
+
+        if (vertical) {
+            left = listborder + listpadding + candmargin;
+            top = listborder + listpadding + (i * candborder * 2) + (i * candpadding * 2) + ((i + 1) * candmargin) + (i * maxcandsize.cy);
+            right = size.cx - listborder - listpadding - candmargin;
+            bottom = top + maxcandsize.cy + (candpadding * 2) + (candborder * 2);
+        }
+        else {
+            left = listborder + listpadding + (i * candborder * 2) + (i * candpadding * 2) + ((i + 1) * candmargin) + (i * horzcandspacing);
+
+            for (j = 0; j < i; ++j)
+                left += candsizes[j].cx;
+
+            top = listborder + listpadding + candmargin;
+            right = left + candsizes[i].cx + (candpadding * 2) + (candborder * 2);
+            bottom = size.cy - listborder - listpadding - candmargin;
+        }
+
+        if (i == videodata->ime_candsel) {
+            SelectObject(hdc, selpen);
+            SelectObject(hdc, selbrush);
+            SetTextColor(hdc, seltextcolor);
+        }
+        else {
+            SelectObject(hdc, candpen);
+            SelectObject(hdc, candbrush);
+            SetTextColor(hdc, candtextcolor);
+        }
+
+        DrawRect(hdc, left, top, right, bottom, candborder);
+        ExtTextOutW(hdc, left + candborder + candpadding, top + candborder + candpadding, 0, NULL, s, SDL_wcslen(s), NULL);
+    }
+    StopDrawToBitmap(hdc, &hbm);
+
+    DeleteObject(listpen);
+    DeleteObject(listbrush);
+    DeleteObject(candpen);
+    DeleteObject(candbrush);
+    DeleteObject(selpen);
+    DeleteObject(selbrush);
+    DeleteObject(font);
+
+    IME_PositionCandidateList(videodata, size);
+}
+
+static void
+IME_Render(SDL_VideoData *videodata)
+{
+    HDC hdc = CreateCompatibleDC(NULL);
+
+    if (videodata->ime_candlist)
+        IME_RenderCandidateList(videodata, hdc);
+
+    DeleteDC(hdc);
+
+    videodata->ime_dirty = SDL_FALSE;
+}
+
+void IME_Present(SDL_VideoData *videodata)
+{
+    if (videodata->ime_dirty)
+        IME_Render(videodata);
+
+    /* FIXME: Need to show the IME bitmap */
+}
+
+#endif /* SDL_DISABLE_WINDOWS_IME */
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowskeyboard.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowskeyboard.h
new file mode 100644
index 000000000..3eb0cbf6b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowskeyboard.h	
@@ -0,0 +1,38 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_windowskeyboard_h
+#define _SDL_windowskeyboard_h
+
+extern void WIN_InitKeyboard(_THIS);
+extern void WIN_UpdateKeymap(void);
+extern void WIN_QuitKeyboard(_THIS);
+
+extern void WIN_StartTextInput(_THIS);
+extern void WIN_StopTextInput(_THIS);
+extern void WIN_SetTextInputRect(_THIS, SDL_Rect *rect);
+
+extern SDL_bool IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, struct SDL_VideoData *videodata);
+
+#endif /* _SDL_windowskeyboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsmessagebox.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmessagebox.c
new file mode 100644
index 000000000..6cffc8adf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmessagebox.c	
@@ -0,0 +1,479 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "../../core/windows/SDL_windows.h"
+
+#include "SDL_assert.h"
+#include "SDL_windowsvideo.h"
+
+
+#ifndef SS_EDITCONTROL
+#define SS_EDITCONTROL  0x2000
+#endif
+
+/* Display a Windows message box */
+
+#pragma pack(push, 1)
+
+typedef struct
+{
+    WORD dlgVer;
+    WORD signature;
+    DWORD helpID;
+    DWORD exStyle;
+    DWORD style;
+    WORD cDlgItems;
+    short x;
+    short y;
+    short cx;
+    short cy;
+} DLGTEMPLATEEX;
+
+typedef struct
+{
+    DWORD helpID;
+    DWORD exStyle;
+    DWORD style;
+    short x;
+    short y;
+    short cx;
+    short cy;
+    DWORD id;
+} DLGITEMTEMPLATEEX;
+
+#pragma pack(pop)
+
+typedef struct
+{
+    DLGTEMPLATEEX* lpDialog;
+    Uint8 *data;
+    size_t size;
+    size_t used;
+} WIN_DialogData;
+
+
+static INT_PTR MessageBoxDialogProc(HWND hDlg, UINT iMessage, WPARAM wParam, LPARAM lParam)
+{
+    switch ( iMessage ) {
+    case WM_COMMAND:
+        /* Return the ID of the button that was pushed */
+        EndDialog(hDlg, LOWORD(wParam));
+        return TRUE;
+
+    default:
+        break;
+    }
+    return FALSE;
+}
+
+static SDL_bool ExpandDialogSpace(WIN_DialogData *dialog, size_t space)
+{
+    size_t size = dialog->size;
+
+    if (size == 0) {
+        size = space;
+    } else {
+        while ((dialog->used + space) > size) {
+            size *= 2;
+        }
+    }
+    if (size > dialog->size) {
+        void *data = SDL_realloc(dialog->data, size);
+        if (!data) {
+            SDL_OutOfMemory();
+            return SDL_FALSE;
+        }
+        dialog->data = data;
+        dialog->size = size;
+        dialog->lpDialog = (DLGTEMPLATEEX*)dialog->data;
+    }
+    return SDL_TRUE;
+}
+
+static SDL_bool AlignDialogData(WIN_DialogData *dialog, size_t size)
+{
+    size_t padding = (dialog->used % size);
+
+    if (!ExpandDialogSpace(dialog, padding)) {
+        return SDL_FALSE;
+    }
+
+    dialog->used += padding;
+
+    return SDL_TRUE;
+}
+
+static SDL_bool AddDialogData(WIN_DialogData *dialog, const void *data, size_t size)
+{
+    if (!ExpandDialogSpace(dialog, size)) {
+        return SDL_FALSE;
+    }
+
+    SDL_memcpy(dialog->data+dialog->used, data, size);
+    dialog->used += size;
+
+    return SDL_TRUE;
+}
+
+static SDL_bool AddDialogString(WIN_DialogData *dialog, const char *string)
+{
+    WCHAR *wstring;
+    WCHAR *p;
+    size_t count;
+    SDL_bool status;
+
+    if (!string) {
+        string = "";
+    }
+
+    wstring = WIN_UTF8ToString(string);
+    if (!wstring) {
+        return SDL_FALSE;
+    }
+
+    /* Find out how many characters we have, including null terminator */
+    count = 0;
+    for (p = wstring; *p; ++p) {
+        ++count;
+    }
+    ++count;
+
+    status = AddDialogData(dialog, wstring, count*sizeof(WCHAR));
+    SDL_free(wstring);
+    return status;
+}
+
+static int s_BaseUnitsX;
+static int s_BaseUnitsY;
+static void Vec2ToDLU(short *x, short *y)
+{
+    SDL_assert(s_BaseUnitsX != 0); /* we init in WIN_ShowMessageBox(), which is the only public function... */
+
+    *x = MulDiv(*x, 4, s_BaseUnitsX);
+    *y = MulDiv(*y, 8, s_BaseUnitsY);
+}
+
+
+static SDL_bool AddDialogControl(WIN_DialogData *dialog, WORD type, DWORD style, DWORD exStyle, int x, int y, int w, int h, int id, const char *caption)
+{
+    DLGITEMTEMPLATEEX item;
+    WORD marker = 0xFFFF;
+    WORD extraData = 0;
+
+    SDL_zero(item);
+    item.style = style;
+    item.exStyle = exStyle;
+    item.x = x;
+    item.y = y;
+    item.cx = w;
+    item.cy = h;
+    item.id = id;
+
+    Vec2ToDLU(&item.x, &item.y);
+    Vec2ToDLU(&item.cx, &item.cy);
+
+    if (!AlignDialogData(dialog, sizeof(DWORD))) {
+        return SDL_FALSE;
+    }
+    if (!AddDialogData(dialog, &item, sizeof(item))) {
+        return SDL_FALSE;
+    }
+    if (!AddDialogData(dialog, &marker, sizeof(marker))) {
+        return SDL_FALSE;
+    }
+    if (!AddDialogData(dialog, &type, sizeof(type))) {
+        return SDL_FALSE;
+    }
+    if (!AddDialogString(dialog, caption)) {
+        return SDL_FALSE;
+    }
+    if (!AddDialogData(dialog, &extraData, sizeof(extraData))) {
+        return SDL_FALSE;
+    }
+    ++dialog->lpDialog->cDlgItems;
+
+    return SDL_TRUE;
+}
+
+static SDL_bool AddDialogStatic(WIN_DialogData *dialog, int x, int y, int w, int h, const char *text)
+{
+    DWORD style = WS_VISIBLE | WS_CHILD | SS_LEFT | SS_NOPREFIX | SS_EDITCONTROL;
+    return AddDialogControl(dialog, 0x0082, style, 0, x, y, w, h, -1, text);
+}
+
+static SDL_bool AddDialogButton(WIN_DialogData *dialog, int x, int y, int w, int h, const char *text, int id, SDL_bool isDefault)
+{
+    DWORD style = WS_VISIBLE | WS_CHILD;
+    if (isDefault) {
+        style |= BS_DEFPUSHBUTTON;
+    } else {
+        style |= BS_PUSHBUTTON;
+    }
+    return AddDialogControl(dialog, 0x0080, style, 0, x, y, w, h, id, text);
+}
+
+static void FreeDialogData(WIN_DialogData *dialog)
+{
+    SDL_free(dialog->data);
+    SDL_free(dialog);
+}
+
+static WIN_DialogData *CreateDialogData(int w, int h, const char *caption)
+{
+    WIN_DialogData *dialog;
+    DLGTEMPLATEEX dialogTemplate;
+    WORD WordToPass;
+
+    SDL_zero(dialogTemplate);
+    dialogTemplate.dlgVer = 1;
+    dialogTemplate.signature = 0xffff;
+    dialogTemplate.style = (WS_CAPTION | DS_CENTER | DS_SHELLFONT);
+    dialogTemplate.x = 0;
+    dialogTemplate.y = 0;
+    dialogTemplate.cx = w;
+    dialogTemplate.cy = h;
+    Vec2ToDLU(&dialogTemplate.cx, &dialogTemplate.cy);
+
+    dialog = (WIN_DialogData *)SDL_calloc(1, sizeof(*dialog));
+    if (!dialog) {
+        return NULL;
+    }
+
+    if (!AddDialogData(dialog, &dialogTemplate, sizeof(dialogTemplate))) {
+        FreeDialogData(dialog);
+        return NULL;
+    }
+
+    /* No menu */
+    WordToPass = 0;
+    if (!AddDialogData(dialog, &WordToPass, 2)) {
+        FreeDialogData(dialog);
+        return NULL;
+    }
+
+    /* No custom class */
+    if (!AddDialogData(dialog, &WordToPass, 2)) {
+        FreeDialogData(dialog);
+        return NULL;
+    }
+
+    /* title */
+    if (!AddDialogString(dialog, caption)) {
+        FreeDialogData(dialog);
+        return NULL;
+    }
+
+    /* Font stuff */
+    {
+        /*
+         * We want to use the system messagebox font.
+         */
+        BYTE ToPass;
+
+        NONCLIENTMETRICSA NCM;
+        NCM.cbSize = sizeof(NCM);
+        SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &NCM, 0);
+
+        /* Font size - convert to logical font size for dialog parameter. */
+        {
+            HDC ScreenDC = GetDC(0);
+            WordToPass = (WORD)(-72 * NCM.lfMessageFont.lfHeight / GetDeviceCaps(ScreenDC, LOGPIXELSY));
+            ReleaseDC(0, ScreenDC);
+        }
+
+        if (!AddDialogData(dialog, &WordToPass, 2)) {
+            FreeDialogData(dialog);
+            return NULL;
+        }
+
+        /* Font weight */
+        WordToPass = (WORD)NCM.lfMessageFont.lfWeight;
+        if (!AddDialogData(dialog, &WordToPass, 2)) {
+            FreeDialogData(dialog);
+            return NULL;
+        }
+
+        /* italic? */
+        ToPass = NCM.lfMessageFont.lfItalic;
+        if (!AddDialogData(dialog, &ToPass, 1)) {
+            FreeDialogData(dialog);
+            return NULL;
+        }
+
+        /* charset? */
+        ToPass = NCM.lfMessageFont.lfCharSet;
+        if (!AddDialogData(dialog, &ToPass, 1)) {
+            FreeDialogData(dialog);
+            return NULL;
+        }
+
+        /* font typeface. */
+        if (!AddDialogString(dialog, NCM.lfMessageFont.lfFaceName)) {
+            FreeDialogData(dialog);
+            return NULL;
+        }
+    }
+
+    return dialog;
+}
+
+int
+WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
+{
+    WIN_DialogData *dialog;
+    int i, x, y;
+    UINT_PTR which;
+    const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
+    HFONT DialogFont;
+    SIZE Size;
+    RECT TextSize;
+    wchar_t* wmessage;
+    TEXTMETRIC TM;
+
+
+    const int ButtonWidth = 88;
+    const int ButtonHeight = 26;
+    const int TextMargin = 16;
+    const int ButtonMargin = 12;
+
+
+    /* Jan 25th, 2013 - dant@fleetsa.com
+     *
+     *
+     * I've tried to make this more reasonable, but I've run in to a lot
+     * of nonsense.
+     *
+     * The original issue is the code was written in pixels and not
+     * dialog units (DLUs). All DialogBox functions use DLUs, which
+     * vary based on the selected font (yay).
+     *
+     * According to MSDN, the most reliable way to convert is via
+     * MapDialogUnits, which requires an HWND, which we don't have
+     * at time of template creation.
+     *
+     * We do however have:
+     *  The system font (DLU width 8 for me)
+     *  The font we select for the dialog (DLU width 6 for me)
+     *
+     * Based on experimentation, *neither* of these return the value
+     * actually used. Stepping in to MapDialogUnits(), the conversion
+     * is fairly clear, and uses 7 for me.
+     *
+     * As a result, some of this is hacky to ensure the sizing is
+     * somewhat correct.
+     *
+     * Honestly, a long term solution is to use CreateWindow, not CreateDialog.
+     *
+
+     *
+     * In order to get text dimensions we need to have a DC with the desired font.
+     * I'm assuming a dialog box in SDL is rare enough we can to the create.
+     */
+    HDC FontDC = CreateCompatibleDC(0);
+
+    {
+        /* Create a duplicate of the font used in system message boxes. */
+        LOGFONT lf;
+        NONCLIENTMETRICS NCM;
+        NCM.cbSize = sizeof(NCM);
+        SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &NCM, 0);
+        lf = NCM.lfMessageFont;
+        DialogFont = CreateFontIndirect(&lf);
+    }
+
+    /* Select the font in to our DC */
+    SelectObject(FontDC, DialogFont);
+
+    {
+        /* Get the metrics to try and figure our DLU conversion. */
+        GetTextMetrics(FontDC, &TM);
+        s_BaseUnitsX = TM.tmAveCharWidth + 1;
+        s_BaseUnitsY = TM.tmHeight;
+    }
+
+    /* Measure the *pixel* size of the string. */
+    wmessage = WIN_UTF8ToString(messageboxdata->message);
+    SDL_zero(TextSize);
+    Size.cx = DrawText(FontDC, wmessage, -1, &TextSize, DT_CALCRECT);
+
+    /* Add some padding for hangs, etc. */
+    TextSize.right += 2;
+    TextSize.bottom += 2;
+
+    /* Done with the DC, and the string */
+    DeleteDC(FontDC);
+    SDL_free(wmessage);
+
+    /* Increase the size of the dialog by some border spacing around the text. */
+    Size.cx = TextSize.right - TextSize.left;
+    Size.cy = TextSize.bottom - TextSize.top;
+    Size.cx += TextMargin * 2;
+    Size.cy += TextMargin * 2;
+
+    /* Ensure the size is wide enough for all of the buttons. */
+    if (Size.cx < messageboxdata->numbuttons * (ButtonWidth + ButtonMargin) + ButtonMargin)
+        Size.cx = messageboxdata->numbuttons * (ButtonWidth + ButtonMargin) + ButtonMargin;
+
+    /* Add vertical space for the buttons and border. */
+    Size.cy += ButtonHeight + TextMargin;
+
+    dialog = CreateDialogData(Size.cx, Size.cy, messageboxdata->title);
+    if (!dialog) {
+        return -1;
+    }
+
+    if (!AddDialogStatic(dialog, TextMargin, TextMargin, TextSize.right - TextSize.left, TextSize.bottom - TextSize.top, messageboxdata->message)) {
+        FreeDialogData(dialog);
+        return -1;
+    }
+
+    /* Align the buttons to the right/bottom. */
+    x = Size.cx - ButtonWidth - ButtonMargin;
+    y = Size.cy - ButtonHeight - ButtonMargin;
+    for (i = 0; i < messageboxdata->numbuttons; ++i) {
+        SDL_bool isDefault;
+
+        if (buttons[i].flags & SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT) {
+            isDefault = SDL_TRUE;
+        } else {
+            isDefault = SDL_FALSE;
+        }
+        if (!AddDialogButton(dialog, x, y, ButtonWidth, ButtonHeight, buttons[i].text, i, isDefault)) {
+            FreeDialogData(dialog);
+            return -1;
+        }
+        x -= ButtonWidth + ButtonMargin;
+    }
+
+    /* FIXME: If we have a parent window, get the Instance and HWND for them */
+    which = DialogBoxIndirect(NULL, (DLGTEMPLATE*)dialog->lpDialog, NULL, (DLGPROC)MessageBoxDialogProc);
+    *buttonid = buttons[which].buttonid;
+
+    FreeDialogData(dialog);
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsmessagebox.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmessagebox.h
new file mode 100644
index 000000000..ea709a4af
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmessagebox.h	
@@ -0,0 +1,29 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+extern int WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsmodes.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmodes.c
new file mode 100644
index 000000000..1687e277a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmodes.c	
@@ -0,0 +1,310 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "SDL_windowsvideo.h"
+
+/* Windows CE compatibility */
+#ifndef CDS_FULLSCREEN
+#define CDS_FULLSCREEN 0
+#endif
+
+static SDL_bool
+WIN_GetDisplayMode(LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode)
+{
+    SDL_DisplayModeData *data;
+    DEVMODE devmode;
+    HDC hdc;
+
+    devmode.dmSize = sizeof(devmode);
+    devmode.dmDriverExtra = 0;
+    if (!EnumDisplaySettings(deviceName, index, &devmode)) {
+        return SDL_FALSE;
+    }
+
+    data = (SDL_DisplayModeData *) SDL_malloc(sizeof(*data));
+    if (!data) {
+        return SDL_FALSE;
+    }
+    data->DeviceMode = devmode;
+    data->DeviceMode.dmFields =
+        (DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY |
+         DM_DISPLAYFLAGS);
+	data->ScaleX = 1.0f;
+	data->ScaleY = 1.0f;
+
+    /* Fill in the mode information */
+    mode->format = SDL_PIXELFORMAT_UNKNOWN;
+    mode->w = devmode.dmPelsWidth;
+    mode->h = devmode.dmPelsHeight;
+    mode->refresh_rate = devmode.dmDisplayFrequency;
+    mode->driverdata = data;
+
+    if (index == ENUM_CURRENT_SETTINGS
+        && (hdc = CreateDC(deviceName, NULL, NULL, NULL)) != NULL) {
+        char bmi_data[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)];
+        LPBITMAPINFO bmi;
+        HBITMAP hbm;
+		int logical_width = GetDeviceCaps( hdc, HORZRES );
+		int logical_height = GetDeviceCaps( hdc, VERTRES );
+
+		data->ScaleX = (float)logical_width / devmode.dmPelsWidth;
+		data->ScaleY = (float)logical_height / devmode.dmPelsHeight;
+		mode->w = logical_width;
+		mode->h = logical_height;
+
+        SDL_zero(bmi_data);
+        bmi = (LPBITMAPINFO) bmi_data;
+        bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+
+        hbm = CreateCompatibleBitmap(hdc, 1, 1);
+        GetDIBits(hdc, hbm, 0, 1, NULL, bmi, DIB_RGB_COLORS);
+        GetDIBits(hdc, hbm, 0, 1, NULL, bmi, DIB_RGB_COLORS);
+        DeleteObject(hbm);
+        DeleteDC(hdc);
+        if (bmi->bmiHeader.biCompression == BI_BITFIELDS) {
+            switch (*(Uint32 *) bmi->bmiColors) {
+            case 0x00FF0000:
+                mode->format = SDL_PIXELFORMAT_RGB888;
+                break;
+            case 0x000000FF:
+                mode->format = SDL_PIXELFORMAT_BGR888;
+                break;
+            case 0xF800:
+                mode->format = SDL_PIXELFORMAT_RGB565;
+                break;
+            case 0x7C00:
+                mode->format = SDL_PIXELFORMAT_RGB555;
+                break;
+            }
+        } else if (bmi->bmiHeader.biBitCount == 8) {
+            mode->format = SDL_PIXELFORMAT_INDEX8;
+        } else if (bmi->bmiHeader.biBitCount == 4) {
+            mode->format = SDL_PIXELFORMAT_INDEX4LSB;
+        }
+	} else {
+        /* FIXME: Can we tell what this will be? */
+        if ((devmode.dmFields & DM_BITSPERPEL) == DM_BITSPERPEL) {
+            switch (devmode.dmBitsPerPel) {
+            case 32:
+                mode->format = SDL_PIXELFORMAT_RGB888;
+                break;
+            case 24:
+                mode->format = SDL_PIXELFORMAT_RGB24;
+                break;
+            case 16:
+                mode->format = SDL_PIXELFORMAT_RGB565;
+                break;
+            case 15:
+                mode->format = SDL_PIXELFORMAT_RGB555;
+                break;
+            case 8:
+                mode->format = SDL_PIXELFORMAT_INDEX8;
+                break;
+            case 4:
+                mode->format = SDL_PIXELFORMAT_INDEX4LSB;
+                break;
+            }
+        }
+    }
+    return SDL_TRUE;
+}
+
+static SDL_bool
+WIN_AddDisplay(LPTSTR DeviceName)
+{
+    SDL_VideoDisplay display;
+    SDL_DisplayData *displaydata;
+    SDL_DisplayMode mode;
+    DISPLAY_DEVICE device;
+
+#ifdef DEBUG_MODES
+    printf("Display: %s\n", WIN_StringToUTF8(DeviceName));
+#endif
+    if (!WIN_GetDisplayMode(DeviceName, ENUM_CURRENT_SETTINGS, &mode)) {
+        return SDL_FALSE;
+    }
+
+    displaydata = (SDL_DisplayData *) SDL_malloc(sizeof(*displaydata));
+    if (!displaydata) {
+        return SDL_FALSE;
+    }
+    SDL_memcpy(displaydata->DeviceName, DeviceName,
+               sizeof(displaydata->DeviceName));
+
+    SDL_zero(display);
+    device.cb = sizeof(device);
+    if (EnumDisplayDevices(DeviceName, 0, &device, 0)) {
+        display.name = WIN_StringToUTF8(device.DeviceString);
+    }
+    display.desktop_mode = mode;
+    display.current_mode = mode;
+    display.driverdata = displaydata;
+    SDL_AddVideoDisplay(&display);
+    SDL_free(display.name);
+    return SDL_TRUE;
+}
+
+int
+WIN_InitModes(_THIS)
+{
+    int pass;
+    DWORD i, j, count;
+    DISPLAY_DEVICE device;
+
+    device.cb = sizeof(device);
+
+    /* Get the primary display in the first pass */
+    for (pass = 0; pass < 2; ++pass) {
+        for (i = 0; ; ++i) {
+            TCHAR DeviceName[32];
+
+            if (!EnumDisplayDevices(NULL, i, &device, 0)) {
+                break;
+            }
+            if (!(device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) {
+                continue;
+            }
+            if (pass == 0) {
+                if (!(device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) {
+                    continue;
+                }
+            } else {
+                if (device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) {
+                    continue;
+                }
+            }
+            SDL_memcpy(DeviceName, device.DeviceName, sizeof(DeviceName));
+#ifdef DEBUG_MODES
+            printf("Device: %s\n", WIN_StringToUTF8(DeviceName));
+#endif
+            count = 0;
+            for (j = 0; ; ++j) {
+                if (!EnumDisplayDevices(DeviceName, j, &device, 0)) {
+                    break;
+                }
+                if (!(device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) {
+                    continue;
+                }
+                if (pass == 0) {
+                    if (!(device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)) {
+                        continue;
+                    }
+                } else {
+                    if (device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) {
+                        continue;
+                    }
+                }
+                count += WIN_AddDisplay(device.DeviceName);
+            }
+            if (count == 0) {
+                WIN_AddDisplay(DeviceName);
+            }
+        }
+    }
+    if (_this->num_displays == 0) {
+        return SDL_SetError("No displays available");
+    }
+    return 0;
+}
+
+int
+WIN_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect)
+{
+    SDL_DisplayModeData *data = (SDL_DisplayModeData *) display->current_mode.driverdata;
+
+    rect->x = (int)SDL_ceil(data->DeviceMode.dmPosition.x * data->ScaleX);
+    rect->y = (int)SDL_ceil(data->DeviceMode.dmPosition.y * data->ScaleY);
+    rect->w = (int)SDL_ceil(data->DeviceMode.dmPelsWidth * data->ScaleX);
+    rect->h = (int)SDL_ceil(data->DeviceMode.dmPelsHeight * data->ScaleY);
+
+    return 0;
+}
+
+void
+WIN_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
+{
+    SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
+    DWORD i;
+    SDL_DisplayMode mode;
+
+    for (i = 0;; ++i) {
+        if (!WIN_GetDisplayMode(data->DeviceName, i, &mode)) {
+            break;
+        }
+        if (SDL_ISPIXELFORMAT_INDEXED(mode.format)) {
+            /* We don't support palettized modes now */
+            SDL_free(mode.driverdata);
+            continue;
+        }
+        if (mode.format != SDL_PIXELFORMAT_UNKNOWN) {
+            if (!SDL_AddDisplayMode(display, &mode)) {
+                SDL_free(mode.driverdata);
+            }
+        } else {
+            SDL_free(mode.driverdata);
+        }
+    }
+}
+
+int
+WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+    SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata;
+    SDL_DisplayModeData *data = (SDL_DisplayModeData *) mode->driverdata;
+    LONG status;
+
+    status =
+        ChangeDisplaySettingsEx(displaydata->DeviceName, &data->DeviceMode,
+                                NULL, CDS_FULLSCREEN, NULL);
+    if (status != DISP_CHANGE_SUCCESSFUL) {
+        const char *reason = "Unknown reason";
+        switch (status) {
+        case DISP_CHANGE_BADFLAGS:
+            reason = "DISP_CHANGE_BADFLAGS";
+            break;
+        case DISP_CHANGE_BADMODE:
+            reason = "DISP_CHANGE_BADMODE";
+            break;
+        case DISP_CHANGE_BADPARAM:
+            reason = "DISP_CHANGE_BADPARAM";
+            break;
+        case DISP_CHANGE_FAILED:
+            reason = "DISP_CHANGE_FAILED";
+            break;
+        }
+        return SDL_SetError("ChangeDisplaySettingsEx() failed: %s", reason);
+    }
+    EnumDisplaySettings(displaydata->DeviceName, ENUM_CURRENT_SETTINGS, &data->DeviceMode);
+    return 0;
+}
+
+void
+WIN_QuitModes(_THIS)
+{
+    /* All fullscreen windows should have restored modes by now */
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsmodes.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmodes.h
new file mode 100644
index 000000000..d16a5e7a8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmodes.h	
@@ -0,0 +1,46 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_windowsmodes_h
+#define _SDL_windowsmodes_h
+
+typedef struct
+{
+    TCHAR DeviceName[32];
+} SDL_DisplayData;
+
+typedef struct
+{
+    DEVMODE DeviceMode;
+	float ScaleX;
+	float ScaleY;
+} SDL_DisplayModeData;
+
+extern int WIN_InitModes(_THIS);
+extern int WIN_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect);
+extern void WIN_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
+extern int WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+extern void WIN_QuitModes(_THIS);
+
+#endif /* _SDL_windowsmodes_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsmouse.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmouse.c
new file mode 100644
index 000000000..b49249db6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmouse.c	
@@ -0,0 +1,252 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "SDL_assert.h"
+#include "SDL_windowsvideo.h"
+
+#include "../../events/SDL_mouse_c.h"
+
+
+HCURSOR SDL_cursor = NULL;
+
+
+static SDL_Cursor *
+WIN_CreateDefaultCursor()
+{
+    SDL_Cursor *cursor;
+
+    cursor = SDL_calloc(1, sizeof(*cursor));
+    if (cursor) {
+        cursor->driverdata = LoadCursor(NULL, IDC_ARROW);
+    } else {
+        SDL_OutOfMemory();
+    }
+
+    return cursor;
+}
+
+static SDL_Cursor *
+WIN_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
+{
+    /* msdn says cursor mask has to be padded out to word alignment. Not sure
+        if that means machine word or WORD, but this handles either case. */
+    const size_t pad = (sizeof (size_t) * 8);  /* 32 or 64, or whatever. */
+    SDL_Cursor *cursor;
+    HICON hicon;
+    HDC hdc;
+    BITMAPV4HEADER bmh;
+    LPVOID pixels;
+    LPVOID maskbits;
+    size_t maskbitslen;
+    ICONINFO ii;
+
+    SDL_zero(bmh);
+    bmh.bV4Size = sizeof(bmh);
+    bmh.bV4Width = surface->w;
+    bmh.bV4Height = -surface->h; /* Invert the image */
+    bmh.bV4Planes = 1;
+    bmh.bV4BitCount = 32;
+    bmh.bV4V4Compression = BI_BITFIELDS;
+    bmh.bV4AlphaMask = 0xFF000000;
+    bmh.bV4RedMask   = 0x00FF0000;
+    bmh.bV4GreenMask = 0x0000FF00;
+    bmh.bV4BlueMask  = 0x000000FF;
+
+    maskbitslen = ((surface->w + (pad - (surface->w % pad))) / 8) * surface->h;
+    maskbits = SDL_stack_alloc(Uint8,maskbitslen);
+    if (maskbits == NULL) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+
+    /* AND the cursor against full bits: no change. We already have alpha. */
+    SDL_memset(maskbits, 0xFF, maskbitslen);
+
+    hdc = GetDC(NULL);
+    SDL_zero(ii);
+    ii.fIcon = FALSE;
+    ii.xHotspot = (DWORD)hot_x;
+    ii.yHotspot = (DWORD)hot_y;
+    ii.hbmColor = CreateDIBSection(hdc, (BITMAPINFO*)&bmh, DIB_RGB_COLORS, &pixels, NULL, 0);
+    ii.hbmMask = CreateBitmap(surface->w, surface->h, 1, 1, maskbits);
+    ReleaseDC(NULL, hdc);
+    SDL_stack_free(maskbits);
+
+    SDL_assert(surface->format->format == SDL_PIXELFORMAT_ARGB8888);
+    SDL_assert(surface->pitch == surface->w * 4);
+    SDL_memcpy(pixels, surface->pixels, surface->h * surface->pitch);
+
+    hicon = CreateIconIndirect(&ii);
+
+    DeleteObject(ii.hbmColor);
+    DeleteObject(ii.hbmMask);
+
+    if (!hicon) {
+        WIN_SetError("CreateIconIndirect()");
+        return NULL;
+    }
+
+    cursor = SDL_calloc(1, sizeof(*cursor));
+    if (cursor) {
+        cursor->driverdata = hicon;
+    } else {
+        DestroyIcon(hicon);
+        SDL_OutOfMemory();
+    }
+
+    return cursor;
+}
+
+static SDL_Cursor *
+WIN_CreateSystemCursor(SDL_SystemCursor id)
+{
+    SDL_Cursor *cursor;
+    LPCTSTR name;
+
+    switch(id)
+    {
+    default:
+        SDL_assert(0);
+        return NULL;
+    case SDL_SYSTEM_CURSOR_ARROW:     name = IDC_ARROW; break;
+    case SDL_SYSTEM_CURSOR_IBEAM:     name = IDC_IBEAM; break;
+    case SDL_SYSTEM_CURSOR_WAIT:      name = IDC_WAIT; break;
+    case SDL_SYSTEM_CURSOR_CROSSHAIR: name = IDC_CROSS; break;
+    case SDL_SYSTEM_CURSOR_WAITARROW: name = IDC_WAIT; break;
+    case SDL_SYSTEM_CURSOR_SIZENWSE:  name = IDC_SIZENWSE; break;
+    case SDL_SYSTEM_CURSOR_SIZENESW:  name = IDC_SIZENESW; break;
+    case SDL_SYSTEM_CURSOR_SIZEWE:    name = IDC_SIZEWE; break;
+    case SDL_SYSTEM_CURSOR_SIZENS:    name = IDC_SIZENS; break;
+    case SDL_SYSTEM_CURSOR_SIZEALL:   name = IDC_SIZEALL; break;
+    case SDL_SYSTEM_CURSOR_NO:        name = IDC_NO; break;
+    case SDL_SYSTEM_CURSOR_HAND:      name = IDC_HAND; break;
+    }
+
+    cursor = SDL_calloc(1, sizeof(*cursor));
+    if (cursor) {
+        HICON hicon;
+
+        hicon = LoadCursor(NULL, name);
+
+        cursor->driverdata = hicon;
+    } else {
+        SDL_OutOfMemory();
+    }
+
+    return cursor;
+}
+
+static void
+WIN_FreeCursor(SDL_Cursor * cursor)
+{
+    HICON hicon = (HICON)cursor->driverdata;
+
+    DestroyIcon(hicon);
+    SDL_free(cursor);
+}
+
+static int
+WIN_ShowCursor(SDL_Cursor * cursor)
+{
+    if (cursor) {
+        SDL_cursor = (HCURSOR)cursor->driverdata;
+    } else {
+        SDL_cursor = NULL;
+    }
+    if (SDL_GetMouseFocus() != NULL) {
+        SetCursor(SDL_cursor);
+    }
+    return 0;
+}
+
+static void
+WIN_WarpMouse(SDL_Window * window, int x, int y)
+{
+    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+    HWND hwnd = data->hwnd;
+    POINT pt;
+
+    /* Don't warp the mouse while we're doing a modal interaction */
+    if (data->in_title_click || data->in_modal_loop) {
+        return;
+    }
+
+    pt.x = x;
+    pt.y = y;
+    ClientToScreen(hwnd, &pt);
+    SetCursorPos(pt.x, pt.y);
+}
+
+static int
+WIN_SetRelativeMouseMode(SDL_bool enabled)
+{
+    RAWINPUTDEVICE rawMouse = { 0x01, 0x02, 0, NULL }; /* Mouse: UsagePage = 1, Usage = 2 */
+
+    if (!enabled) {
+        rawMouse.dwFlags |= RIDEV_REMOVE;
+    }
+
+    /* (Un)register raw input for mice */
+    if (RegisterRawInputDevices(&rawMouse, 1, sizeof(RAWINPUTDEVICE)) == FALSE) {
+
+        /* Only return an error when registering. If we unregister and fail,
+           then it's probably that we unregistered twice. That's OK. */
+        if (enabled) {
+            return SDL_Unsupported();
+        }
+    }
+    return 0;
+}
+
+void
+WIN_InitMouse(_THIS)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    mouse->CreateCursor = WIN_CreateCursor;
+    mouse->CreateSystemCursor = WIN_CreateSystemCursor;
+    mouse->ShowCursor = WIN_ShowCursor;
+    mouse->FreeCursor = WIN_FreeCursor;
+    mouse->WarpMouse = WIN_WarpMouse;
+    mouse->SetRelativeMouseMode = WIN_SetRelativeMouseMode;
+
+    SDL_SetDefaultCursor(WIN_CreateDefaultCursor());
+
+    SDL_SetDoubleClickTime(GetDoubleClickTime());
+}
+
+void
+WIN_QuitMouse(_THIS)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+    if ( mouse->def_cursor ) {
+        SDL_free(mouse->def_cursor);
+        mouse->def_cursor = NULL;
+        mouse->cur_cursor = NULL;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsmouse.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmouse.h
new file mode 100644
index 000000000..665cdc57b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsmouse.h	
@@ -0,0 +1,33 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_windowsmouse_h
+#define _SDL_windowsmouse_h
+
+extern HCURSOR SDL_cursor;
+
+extern void WIN_InitMouse(_THIS);
+extern void WIN_QuitMouse(_THIS);
+
+#endif /* _SDL_windowsmouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengl.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengl.c
new file mode 100644
index 000000000..80ba3b45d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengl.c	
@@ -0,0 +1,786 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "SDL_assert.h"
+#include "SDL_loadso.h"
+#include "SDL_windowsvideo.h"
+#include "SDL_windowsopengles.h"
+
+/* WGL implementation of SDL OpenGL support */
+
+#if SDL_VIDEO_OPENGL_WGL
+#include "SDL_opengl.h"
+
+#define DEFAULT_OPENGL "OPENGL32.DLL"
+
+#ifndef WGL_ARB_create_context
+#define WGL_ARB_create_context
+#define WGL_CONTEXT_MAJOR_VERSION_ARB   0x2091
+#define WGL_CONTEXT_MINOR_VERSION_ARB   0x2092
+#define WGL_CONTEXT_LAYER_PLANE_ARB     0x2093
+#define WGL_CONTEXT_FLAGS_ARB           0x2094
+#define WGL_CONTEXT_DEBUG_BIT_ARB       0x0001
+#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB  0x0002
+
+#ifndef WGL_ARB_create_context_profile
+#define WGL_ARB_create_context_profile
+#define WGL_CONTEXT_PROFILE_MASK_ARB              0x9126
+#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB          0x00000001
+#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
+#endif
+
+#ifndef WGL_ARB_create_context_robustness
+#define WGL_ARB_create_context_robustness
+#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB         0x00000004
+#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB     0x8256
+#define WGL_NO_RESET_NOTIFICATION_ARB                   0x8261
+#define WGL_LOSE_CONTEXT_ON_RESET_ARB                   0x8252
+#endif
+#endif
+
+#ifndef WGL_EXT_create_context_es2_profile
+#define WGL_EXT_create_context_es2_profile
+#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT           0x00000004
+#endif
+
+#ifndef WGL_EXT_create_context_es_profile
+#define WGL_EXT_create_context_es_profile
+#define WGL_CONTEXT_ES_PROFILE_BIT_EXT            0x00000004
+#endif
+
+#ifndef WGL_ARB_framebuffer_sRGB
+#define WGL_ARB_framebuffer_sRGB
+#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB                0x20A9
+#endif
+
+typedef HGLRC(APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC,
+                                                            HGLRC
+                                                            hShareContext,
+                                                            const int
+                                                            *attribList);
+
+int
+WIN_GL_LoadLibrary(_THIS, const char *path)
+{
+    void *handle;
+
+    if (path == NULL) {
+        path = SDL_getenv("SDL_OPENGL_LIBRARY");
+    }
+    if (path == NULL) {
+        path = DEFAULT_OPENGL;
+    }
+    _this->gl_config.dll_handle = SDL_LoadObject(path);
+    if (!_this->gl_config.dll_handle) {
+        return -1;
+    }
+    SDL_strlcpy(_this->gl_config.driver_path, path,
+                SDL_arraysize(_this->gl_config.driver_path));
+
+    /* Allocate OpenGL memory */
+    _this->gl_data = (struct SDL_GLDriverData *) SDL_calloc(1, sizeof(struct SDL_GLDriverData));
+    if (!_this->gl_data) {
+        return SDL_OutOfMemory();
+    }
+
+    /* Load function pointers */
+    handle = _this->gl_config.dll_handle;
+    _this->gl_data->wglGetProcAddress = (void *(WINAPI *) (const char *))
+        SDL_LoadFunction(handle, "wglGetProcAddress");
+    _this->gl_data->wglCreateContext = (HGLRC(WINAPI *) (HDC))
+        SDL_LoadFunction(handle, "wglCreateContext");
+    _this->gl_data->wglDeleteContext = (BOOL(WINAPI *) (HGLRC))
+        SDL_LoadFunction(handle, "wglDeleteContext");
+    _this->gl_data->wglMakeCurrent = (BOOL(WINAPI *) (HDC, HGLRC))
+        SDL_LoadFunction(handle, "wglMakeCurrent");
+    _this->gl_data->wglShareLists = (BOOL(WINAPI *) (HGLRC, HGLRC))
+        SDL_LoadFunction(handle, "wglShareLists");
+
+    if (!_this->gl_data->wglGetProcAddress ||
+        !_this->gl_data->wglCreateContext ||
+        !_this->gl_data->wglDeleteContext ||
+        !_this->gl_data->wglMakeCurrent) {
+        return SDL_SetError("Could not retrieve OpenGL functions");
+    }
+
+    return 0;
+}
+
+void *
+WIN_GL_GetProcAddress(_THIS, const char *proc)
+{
+    void *func;
+
+    /* This is to pick up extensions */
+    func = _this->gl_data->wglGetProcAddress(proc);
+    if (!func) {
+        /* This is probably a normal GL function */
+        func = GetProcAddress(_this->gl_config.dll_handle, proc);
+    }
+    return func;
+}
+
+void
+WIN_GL_UnloadLibrary(_THIS)
+{
+    SDL_UnloadObject(_this->gl_config.dll_handle);
+    _this->gl_config.dll_handle = NULL;
+
+    /* Free OpenGL memory */
+    SDL_free(_this->gl_data);
+    _this->gl_data = NULL;
+}
+
+static void
+WIN_GL_SetupPixelFormat(_THIS, PIXELFORMATDESCRIPTOR * pfd)
+{
+    SDL_zerop(pfd);
+    pfd->nSize = sizeof(*pfd);
+    pfd->nVersion = 1;
+    pfd->dwFlags = (PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL);
+    if (_this->gl_config.double_buffer) {
+        pfd->dwFlags |= PFD_DOUBLEBUFFER;
+    }
+    if (_this->gl_config.stereo) {
+        pfd->dwFlags |= PFD_STEREO;
+    }
+    pfd->iLayerType = PFD_MAIN_PLANE;
+    pfd->iPixelType = PFD_TYPE_RGBA;
+    pfd->cRedBits = _this->gl_config.red_size;
+    pfd->cGreenBits = _this->gl_config.green_size;
+    pfd->cBlueBits = _this->gl_config.blue_size;
+    pfd->cAlphaBits = _this->gl_config.alpha_size;
+    if (_this->gl_config.buffer_size) {
+        pfd->cColorBits =
+            _this->gl_config.buffer_size - _this->gl_config.alpha_size;
+    } else {
+        pfd->cColorBits = (pfd->cRedBits + pfd->cGreenBits + pfd->cBlueBits);
+    }
+    pfd->cAccumRedBits = _this->gl_config.accum_red_size;
+    pfd->cAccumGreenBits = _this->gl_config.accum_green_size;
+    pfd->cAccumBlueBits = _this->gl_config.accum_blue_size;
+    pfd->cAccumAlphaBits = _this->gl_config.accum_alpha_size;
+    pfd->cAccumBits =
+        (pfd->cAccumRedBits + pfd->cAccumGreenBits + pfd->cAccumBlueBits +
+         pfd->cAccumAlphaBits);
+    pfd->cDepthBits = _this->gl_config.depth_size;
+    pfd->cStencilBits = _this->gl_config.stencil_size;
+}
+
+/* Choose the closest pixel format that meets or exceeds the target.
+   FIXME: Should we weight any particular attribute over any other?
+*/
+static int
+WIN_GL_ChoosePixelFormat(HDC hdc, PIXELFORMATDESCRIPTOR * target)
+{
+    PIXELFORMATDESCRIPTOR pfd;
+    int count, index, best = 0;
+    unsigned int dist, best_dist = ~0U;
+
+    count = DescribePixelFormat(hdc, 1, sizeof(pfd), NULL);
+
+    for (index = 1; index <= count; index++) {
+
+        if (!DescribePixelFormat(hdc, index, sizeof(pfd), &pfd)) {
+            continue;
+        }
+
+        if ((pfd.dwFlags & target->dwFlags) != target->dwFlags) {
+            continue;
+        }
+
+        if (pfd.iLayerType != target->iLayerType) {
+            continue;
+        }
+        if (pfd.iPixelType != target->iPixelType) {
+            continue;
+        }
+
+        dist = 0;
+
+        if (pfd.cColorBits < target->cColorBits) {
+            continue;
+        } else {
+            dist += (pfd.cColorBits - target->cColorBits);
+        }
+        if (pfd.cRedBits < target->cRedBits) {
+            continue;
+        } else {
+            dist += (pfd.cRedBits - target->cRedBits);
+        }
+        if (pfd.cGreenBits < target->cGreenBits) {
+            continue;
+        } else {
+            dist += (pfd.cGreenBits - target->cGreenBits);
+        }
+        if (pfd.cBlueBits < target->cBlueBits) {
+            continue;
+        } else {
+            dist += (pfd.cBlueBits - target->cBlueBits);
+        }
+        if (pfd.cAlphaBits < target->cAlphaBits) {
+            continue;
+        } else {
+            dist += (pfd.cAlphaBits - target->cAlphaBits);
+        }
+        if (pfd.cAccumBits < target->cAccumBits) {
+            continue;
+        } else {
+            dist += (pfd.cAccumBits - target->cAccumBits);
+        }
+        if (pfd.cAccumRedBits < target->cAccumRedBits) {
+            continue;
+        } else {
+            dist += (pfd.cAccumRedBits - target->cAccumRedBits);
+        }
+        if (pfd.cAccumGreenBits < target->cAccumGreenBits) {
+            continue;
+        } else {
+            dist += (pfd.cAccumGreenBits - target->cAccumGreenBits);
+        }
+        if (pfd.cAccumBlueBits < target->cAccumBlueBits) {
+            continue;
+        } else {
+            dist += (pfd.cAccumBlueBits - target->cAccumBlueBits);
+        }
+        if (pfd.cAccumAlphaBits < target->cAccumAlphaBits) {
+            continue;
+        } else {
+            dist += (pfd.cAccumAlphaBits - target->cAccumAlphaBits);
+        }
+        if (pfd.cDepthBits < target->cDepthBits) {
+            continue;
+        } else {
+            dist += (pfd.cDepthBits - target->cDepthBits);
+        }
+        if (pfd.cStencilBits < target->cStencilBits) {
+            continue;
+        } else {
+            dist += (pfd.cStencilBits - target->cStencilBits);
+        }
+
+        if (dist < best_dist) {
+            best = index;
+            best_dist = dist;
+        }
+    }
+
+    return best;
+}
+
+static SDL_bool
+HasExtension(const char *extension, const char *extensions)
+{
+    const char *start;
+    const char *where, *terminator;
+
+    /* Extension names should not have spaces. */
+    where = SDL_strchr(extension, ' ');
+    if (where || *extension == '\0')
+        return SDL_FALSE;
+
+    if (!extensions)
+        return SDL_FALSE;
+
+    /* It takes a bit of care to be fool-proof about parsing the
+     * OpenGL extensions string. Don't be fooled by sub-strings,
+     * etc. */
+
+    start = extensions;
+
+    for (;;) {
+        where = SDL_strstr(start, extension);
+        if (!where)
+            break;
+
+        terminator = where + SDL_strlen(extension);
+        if (where == start || *(where - 1) == ' ')
+            if (*terminator == ' ' || *terminator == '\0')
+                return SDL_TRUE;
+
+        start = terminator;
+    }
+    return SDL_FALSE;
+}
+
+void
+WIN_GL_InitExtensions(_THIS)
+{
+    const char *(WINAPI * wglGetExtensionsStringARB) (HDC) = 0;
+    const char *extensions;
+    HWND hwnd;
+    HDC hdc;
+    HGLRC hglrc;
+    PIXELFORMATDESCRIPTOR pfd;
+
+    hwnd =
+        CreateWindow(SDL_Appname, SDL_Appname, (WS_POPUP | WS_DISABLED), 0, 0,
+        10, 10, NULL, NULL, SDL_Instance, NULL);
+    if (!hwnd) {
+        return;
+    }
+    WIN_PumpEvents(_this);
+
+    hdc = GetDC(hwnd);
+
+    WIN_GL_SetupPixelFormat(_this, &pfd);
+
+    SetPixelFormat(hdc, ChoosePixelFormat(hdc, &pfd), &pfd);
+
+    hglrc = _this->gl_data->wglCreateContext(hdc);
+    if (!hglrc) {
+        return;
+    }
+    _this->gl_data->wglMakeCurrent(hdc, hglrc);
+
+    wglGetExtensionsStringARB = (const char *(WINAPI *) (HDC))
+        _this->gl_data->wglGetProcAddress("wglGetExtensionsStringARB");
+    if (wglGetExtensionsStringARB) {
+        extensions = wglGetExtensionsStringARB(hdc);
+    } else {
+        extensions = NULL;
+    }
+
+    /* Check for WGL_ARB_pixel_format */
+    _this->gl_data->HAS_WGL_ARB_pixel_format = SDL_FALSE;
+    if (HasExtension("WGL_ARB_pixel_format", extensions)) {
+        _this->gl_data->wglChoosePixelFormatARB = (BOOL(WINAPI *)
+                                                   (HDC, const int *,
+                                                    const FLOAT *, UINT,
+                                                    int *, UINT *))
+            WIN_GL_GetProcAddress(_this, "wglChoosePixelFormatARB");
+        _this->gl_data->wglGetPixelFormatAttribivARB =
+            (BOOL(WINAPI *) (HDC, int, int, UINT, const int *, int *))
+            WIN_GL_GetProcAddress(_this, "wglGetPixelFormatAttribivARB");
+
+        if ((_this->gl_data->wglChoosePixelFormatARB != NULL) &&
+            (_this->gl_data->wglGetPixelFormatAttribivARB != NULL)) {
+            _this->gl_data->HAS_WGL_ARB_pixel_format = SDL_TRUE;
+        }
+    }
+
+    /* Check for WGL_EXT_swap_control */
+    _this->gl_data->HAS_WGL_EXT_swap_control_tear = SDL_FALSE;
+    if (HasExtension("WGL_EXT_swap_control", extensions)) {
+        _this->gl_data->wglSwapIntervalEXT =
+            WIN_GL_GetProcAddress(_this, "wglSwapIntervalEXT");
+        _this->gl_data->wglGetSwapIntervalEXT =
+            WIN_GL_GetProcAddress(_this, "wglGetSwapIntervalEXT");
+        if (HasExtension("WGL_EXT_swap_control_tear", extensions)) {
+            _this->gl_data->HAS_WGL_EXT_swap_control_tear = SDL_TRUE;
+        }
+    } else {
+        _this->gl_data->wglSwapIntervalEXT = NULL;
+        _this->gl_data->wglGetSwapIntervalEXT = NULL;
+    }
+
+    /* Check for WGL_EXT_create_context_es2_profile */
+    _this->gl_data->HAS_WGL_EXT_create_context_es2_profile = SDL_FALSE;
+    if (HasExtension("WGL_EXT_create_context_es2_profile", extensions)) {
+        _this->gl_data->HAS_WGL_EXT_create_context_es2_profile = SDL_TRUE;
+    }
+
+    _this->gl_data->wglMakeCurrent(hdc, NULL);
+    _this->gl_data->wglDeleteContext(hglrc);
+    ReleaseDC(hwnd, hdc);
+    DestroyWindow(hwnd);
+    WIN_PumpEvents(_this);
+}
+
+static int
+WIN_GL_ChoosePixelFormatARB(_THIS, int *iAttribs, float *fAttribs)
+{
+    HWND hwnd;
+    HDC hdc;
+    PIXELFORMATDESCRIPTOR pfd;
+    HGLRC hglrc;
+    int pixel_format = 0;
+    unsigned int matching;
+
+    hwnd =
+        CreateWindow(SDL_Appname, SDL_Appname, (WS_POPUP | WS_DISABLED), 0, 0,
+                     10, 10, NULL, NULL, SDL_Instance, NULL);
+    WIN_PumpEvents(_this);
+
+    hdc = GetDC(hwnd);
+
+    WIN_GL_SetupPixelFormat(_this, &pfd);
+
+    SetPixelFormat(hdc, ChoosePixelFormat(hdc, &pfd), &pfd);
+
+    hglrc = _this->gl_data->wglCreateContext(hdc);
+    if (hglrc) {
+        _this->gl_data->wglMakeCurrent(hdc, hglrc);
+
+        if (_this->gl_data->HAS_WGL_ARB_pixel_format) {
+            _this->gl_data->wglChoosePixelFormatARB(hdc, iAttribs, fAttribs,
+                                                    1, &pixel_format,
+                                                    &matching);
+        }
+
+        _this->gl_data->wglMakeCurrent(hdc, NULL);
+        _this->gl_data->wglDeleteContext(hglrc);
+    }
+    ReleaseDC(hwnd, hdc);
+    DestroyWindow(hwnd);
+    WIN_PumpEvents(_this);
+
+    return pixel_format;
+}
+
+/* actual work of WIN_GL_SetupWindow() happens here. */
+static int
+WIN_GL_SetupWindowInternal(_THIS, SDL_Window * window)
+{
+    HDC hdc = ((SDL_WindowData *) window->driverdata)->hdc;
+    PIXELFORMATDESCRIPTOR pfd;
+    int pixel_format = 0;
+    int iAttribs[64];
+    int *iAttr;
+    int *iAccelAttr;
+    float fAttribs[1] = { 0 };
+
+    WIN_GL_SetupPixelFormat(_this, &pfd);
+
+    /* setup WGL_ARB_pixel_format attribs */
+    iAttr = &iAttribs[0];
+
+    *iAttr++ = WGL_DRAW_TO_WINDOW_ARB;
+    *iAttr++ = GL_TRUE;
+    *iAttr++ = WGL_RED_BITS_ARB;
+    *iAttr++ = _this->gl_config.red_size;
+    *iAttr++ = WGL_GREEN_BITS_ARB;
+    *iAttr++ = _this->gl_config.green_size;
+    *iAttr++ = WGL_BLUE_BITS_ARB;
+    *iAttr++ = _this->gl_config.blue_size;
+
+    if (_this->gl_config.alpha_size) {
+        *iAttr++ = WGL_ALPHA_BITS_ARB;
+        *iAttr++ = _this->gl_config.alpha_size;
+    }
+
+    *iAttr++ = WGL_DOUBLE_BUFFER_ARB;
+    *iAttr++ = _this->gl_config.double_buffer;
+
+    *iAttr++ = WGL_DEPTH_BITS_ARB;
+    *iAttr++ = _this->gl_config.depth_size;
+
+    if (_this->gl_config.stencil_size) {
+        *iAttr++ = WGL_STENCIL_BITS_ARB;
+        *iAttr++ = _this->gl_config.stencil_size;
+    }
+
+    if (_this->gl_config.accum_red_size) {
+        *iAttr++ = WGL_ACCUM_RED_BITS_ARB;
+        *iAttr++ = _this->gl_config.accum_red_size;
+    }
+
+    if (_this->gl_config.accum_green_size) {
+        *iAttr++ = WGL_ACCUM_GREEN_BITS_ARB;
+        *iAttr++ = _this->gl_config.accum_green_size;
+    }
+
+    if (_this->gl_config.accum_blue_size) {
+        *iAttr++ = WGL_ACCUM_BLUE_BITS_ARB;
+        *iAttr++ = _this->gl_config.accum_blue_size;
+    }
+
+    if (_this->gl_config.accum_alpha_size) {
+        *iAttr++ = WGL_ACCUM_ALPHA_BITS_ARB;
+        *iAttr++ = _this->gl_config.accum_alpha_size;
+    }
+
+    if (_this->gl_config.stereo) {
+        *iAttr++ = WGL_STEREO_ARB;
+        *iAttr++ = GL_TRUE;
+    }
+
+    if (_this->gl_config.multisamplebuffers) {
+        *iAttr++ = WGL_SAMPLE_BUFFERS_ARB;
+        *iAttr++ = _this->gl_config.multisamplebuffers;
+    }
+
+    if (_this->gl_config.multisamplesamples) {
+        *iAttr++ = WGL_SAMPLES_ARB;
+        *iAttr++ = _this->gl_config.multisamplesamples;
+    }
+
+    if (_this->gl_config.framebuffer_srgb_capable) {
+        *iAttr++ = WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB;
+        *iAttr++ = _this->gl_config.framebuffer_srgb_capable;
+    }
+
+    /* We always choose either FULL or NO accel on Windows, because of flaky
+       drivers. If the app didn't specify, we use FULL, because that's
+       probably what they wanted (and if you didn't care and got FULL, that's
+       a perfectly valid result in any case). */
+    *iAttr++ = WGL_ACCELERATION_ARB;
+    iAccelAttr = iAttr;
+    if (_this->gl_config.accelerated) {
+        *iAttr++ = WGL_FULL_ACCELERATION_ARB;
+    } else {
+        *iAttr++ = WGL_NO_ACCELERATION_ARB;
+    }
+
+    *iAttr = 0;
+
+    /* Choose and set the closest available pixel format */
+    pixel_format = WIN_GL_ChoosePixelFormatARB(_this, iAttribs, fAttribs);
+
+    /* App said "don't care about accel" and FULL accel failed. Try NO. */
+    if ( ( !pixel_format ) && ( _this->gl_config.accelerated < 0 ) ) {
+        *iAccelAttr = WGL_NO_ACCELERATION_ARB;
+        pixel_format = WIN_GL_ChoosePixelFormatARB(_this, iAttribs, fAttribs);
+        *iAccelAttr = WGL_FULL_ACCELERATION_ARB;  /* if we try again. */
+    }
+    if (!pixel_format) {
+        pixel_format = WIN_GL_ChoosePixelFormat(hdc, &pfd);
+    }
+    if (!pixel_format) {
+        return SDL_SetError("No matching GL pixel format available");
+    }
+    if (!SetPixelFormat(hdc, pixel_format, &pfd)) {
+        return WIN_SetError("SetPixelFormat()");
+    }
+    return 0;
+}
+
+int
+WIN_GL_SetupWindow(_THIS, SDL_Window * window)
+{
+    /* The current context is lost in here; save it and reset it. */
+    SDL_Window *current_win = SDL_GL_GetCurrentWindow();
+    SDL_GLContext current_ctx = SDL_GL_GetCurrentContext();
+    const int retval = WIN_GL_SetupWindowInternal(_this, window);
+    WIN_GL_MakeCurrent(_this, current_win, current_ctx);
+    return retval;
+}
+
+SDL_GLContext
+WIN_GL_CreateContext(_THIS, SDL_Window * window)
+{
+    HDC hdc = ((SDL_WindowData *) window->driverdata)->hdc;
+    HGLRC context, share_context;
+
+    if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES &&
+        !_this->gl_data->HAS_WGL_EXT_create_context_es2_profile) {
+#if SDL_VIDEO_OPENGL_EGL        
+        /* Switch to EGL based functions */
+        WIN_GL_UnloadLibrary(_this);
+        _this->GL_LoadLibrary = WIN_GLES_LoadLibrary;
+        _this->GL_GetProcAddress = WIN_GLES_GetProcAddress;
+        _this->GL_UnloadLibrary = WIN_GLES_UnloadLibrary;
+        _this->GL_CreateContext = WIN_GLES_CreateContext;
+        _this->GL_MakeCurrent = WIN_GLES_MakeCurrent;
+        _this->GL_SetSwapInterval = WIN_GLES_SetSwapInterval;
+        _this->GL_GetSwapInterval = WIN_GLES_GetSwapInterval;
+        _this->GL_SwapWindow = WIN_GLES_SwapWindow;
+        _this->GL_DeleteContext = WIN_GLES_DeleteContext;
+        
+        if (WIN_GLES_LoadLibrary(_this, NULL) != 0) {
+            return NULL;
+        }
+        
+        return WIN_GLES_CreateContext(_this, window);
+#else
+        SDL_SetError("SDL not configured with EGL support");
+        return NULL;
+#endif
+    }
+
+    if (_this->gl_config.share_with_current_context) {
+        share_context = (HGLRC)SDL_GL_GetCurrentContext();
+    } else {
+        share_context = 0;
+    }
+
+    if (_this->gl_config.major_version < 3 &&
+        _this->gl_config.profile_mask == 0 &&
+        _this->gl_config.flags == 0) {
+        /* Create legacy context */
+        context = _this->gl_data->wglCreateContext(hdc);
+        if( share_context != 0 ) {
+            _this->gl_data->wglShareLists(share_context, context);
+        }
+    } else {
+        PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
+        HGLRC temp_context = _this->gl_data->wglCreateContext(hdc);
+        if (!temp_context) {
+            SDL_SetError("Could not create GL context");
+            return NULL;
+        }
+
+        /* Make the context current */
+        if (WIN_GL_MakeCurrent(_this, window, temp_context) < 0) {
+            WIN_GL_DeleteContext(_this, temp_context);
+            return NULL;
+        }
+
+        wglCreateContextAttribsARB =
+            (PFNWGLCREATECONTEXTATTRIBSARBPROC) _this->gl_data->
+            wglGetProcAddress("wglCreateContextAttribsARB");
+        if (!wglCreateContextAttribsARB) {
+            SDL_SetError("GL 3.x is not supported");
+            context = temp_context;
+        } else {
+        /* max 8 attributes plus terminator */
+            int attribs[9] = {
+                WGL_CONTEXT_MAJOR_VERSION_ARB, _this->gl_config.major_version,
+                WGL_CONTEXT_MINOR_VERSION_ARB, _this->gl_config.minor_version,
+                0
+            };
+        int iattr = 4;
+
+        /* SDL profile bits match WGL profile bits */
+        if( _this->gl_config.profile_mask != 0 ) {
+            attribs[iattr++] = WGL_CONTEXT_PROFILE_MASK_ARB;
+        attribs[iattr++] = _this->gl_config.profile_mask;
+        }
+
+        /* SDL flags match WGL flags */
+        if( _this->gl_config.flags != 0 ) {
+            attribs[iattr++] = WGL_CONTEXT_FLAGS_ARB;
+        attribs[iattr++] = _this->gl_config.flags;
+        }
+
+        attribs[iattr++] = 0;
+
+            /* Create the GL 3.x context */
+            context = wglCreateContextAttribsARB(hdc, share_context, attribs);
+            /* Delete the GL 2.x context */
+            _this->gl_data->wglDeleteContext(temp_context);
+        }
+    }
+
+    if (!context) {
+        WIN_SetError("Could not create GL context");
+        return NULL;
+    }
+
+    if (WIN_GL_MakeCurrent(_this, window, context) < 0) {
+        WIN_GL_DeleteContext(_this, context);
+        return NULL;
+    }
+
+    return context;
+}
+
+int
+WIN_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
+{
+    HDC hdc;
+
+    if (!_this->gl_data) {
+        return SDL_SetError("OpenGL not initialized");
+    }
+
+    /* sanity check that higher level handled this. */
+    SDL_assert(window || (!window && !context));
+
+    /* Some Windows drivers freak out if hdc is NULL, even when context is
+       NULL, against spec. Since hdc is _supposed_ to be ignored if context
+       is NULL, we either use the current GL window, or do nothing if we
+       already have no current context. */
+    if (!window) {
+        window = SDL_GL_GetCurrentWindow();
+        if (!window) {
+            SDL_assert(SDL_GL_GetCurrentContext() == NULL);
+            return 0;  /* already done. */
+        }
+    }
+
+    hdc = ((SDL_WindowData *) window->driverdata)->hdc;
+    if (!_this->gl_data->wglMakeCurrent(hdc, (HGLRC) context)) {
+        return WIN_SetError("wglMakeCurrent()");
+    }
+    return 0;
+}
+
+int
+WIN_GL_SetSwapInterval(_THIS, int interval)
+{
+    if ((interval < 0) && (!_this->gl_data->HAS_WGL_EXT_swap_control_tear)) {
+        return SDL_SetError("Negative swap interval unsupported in this GL");
+    } else if (_this->gl_data->wglSwapIntervalEXT) {
+        if (_this->gl_data->wglSwapIntervalEXT(interval) != TRUE) {
+            return WIN_SetError("wglSwapIntervalEXT()");
+        }
+    } else {
+        return SDL_Unsupported();
+    }
+    return 0;
+}
+
+int
+WIN_GL_GetSwapInterval(_THIS)
+{
+    int retval = 0;
+    if (_this->gl_data->wglGetSwapIntervalEXT) {
+        retval = _this->gl_data->wglGetSwapIntervalEXT();
+    }
+    return retval;
+}
+
+void
+WIN_GL_SwapWindow(_THIS, SDL_Window * window)
+{
+    HDC hdc = ((SDL_WindowData *) window->driverdata)->hdc;
+
+    SwapBuffers(hdc);
+}
+
+void
+WIN_GL_DeleteContext(_THIS, SDL_GLContext context)
+{
+    if (!_this->gl_data) {
+        return;
+    }
+    _this->gl_data->wglDeleteContext((HGLRC) context);
+}
+
+
+SDL_bool
+WIN_GL_SetPixelFormatFrom(_THIS, SDL_Window * fromWindow, SDL_Window * toWindow)
+{
+    HDC hfromdc = ((SDL_WindowData *) fromWindow->driverdata)->hdc;
+    HDC htodc = ((SDL_WindowData *) toWindow->driverdata)->hdc;
+    BOOL result;
+
+    /* get the pixel format of the fromWindow */
+    int pixel_format = GetPixelFormat(hfromdc);
+    PIXELFORMATDESCRIPTOR pfd;
+    SDL_memset(&pfd, 0, sizeof(pfd));
+    DescribePixelFormat(hfromdc, pixel_format, sizeof(pfd), &pfd);
+
+    /* set the pixel format of the toWindow */
+    result = SetPixelFormat(htodc, pixel_format, &pfd);
+
+    return result ? SDL_TRUE : SDL_FALSE;
+}
+
+#endif /* SDL_VIDEO_OPENGL_WGL */
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengl.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengl.h
new file mode 100644
index 000000000..b96e0ac1e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengl.h	
@@ -0,0 +1,130 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_windowsopengl_h
+#define _SDL_windowsopengl_h
+
+#if SDL_VIDEO_OPENGL_WGL
+
+struct SDL_GLDriverData
+{
+    SDL_bool HAS_WGL_ARB_pixel_format;
+    SDL_bool HAS_WGL_EXT_swap_control_tear;
+    SDL_bool HAS_WGL_EXT_create_context_es2_profile;
+
+    void *(WINAPI * wglGetProcAddress) (const char *proc);
+      HGLRC(WINAPI * wglCreateContext) (HDC hdc);
+      BOOL(WINAPI * wglDeleteContext) (HGLRC hglrc);
+      BOOL(WINAPI * wglMakeCurrent) (HDC hdc, HGLRC hglrc);
+      BOOL(WINAPI * wglShareLists) (HGLRC hglrc1, HGLRC hglrc2);
+      BOOL(WINAPI * wglChoosePixelFormatARB) (HDC hdc,
+                                              const int *piAttribIList,
+                                              const FLOAT * pfAttribFList,
+                                              UINT nMaxFormats,
+                                              int *piFormats,
+                                              UINT * nNumFormats);
+      BOOL(WINAPI * wglGetPixelFormatAttribivARB) (HDC hdc, int iPixelFormat,
+                                                   int iLayerPlane,
+                                                   UINT nAttributes,
+                                                   const int *piAttributes,
+                                                   int *piValues);
+    BOOL (WINAPI * wglSwapIntervalEXT) (int interval);
+    int (WINAPI * wglGetSwapIntervalEXT) (void);
+};
+
+/* OpenGL functions */
+extern int WIN_GL_LoadLibrary(_THIS, const char *path);
+extern void *WIN_GL_GetProcAddress(_THIS, const char *proc);
+extern void WIN_GL_UnloadLibrary(_THIS);
+extern int WIN_GL_SetupWindow(_THIS, SDL_Window * window);
+extern SDL_GLContext WIN_GL_CreateContext(_THIS, SDL_Window * window);
+extern int WIN_GL_MakeCurrent(_THIS, SDL_Window * window,
+                              SDL_GLContext context);
+extern int WIN_GL_SetSwapInterval(_THIS, int interval);
+extern int WIN_GL_GetSwapInterval(_THIS);
+extern void WIN_GL_SwapWindow(_THIS, SDL_Window * window);
+extern void WIN_GL_DeleteContext(_THIS, SDL_GLContext context);
+extern void WIN_GL_InitExtensions(_THIS);
+extern SDL_bool WIN_GL_SetPixelFormatFrom(_THIS, SDL_Window * fromWindow, SDL_Window * toWindow);
+
+#ifndef WGL_ARB_pixel_format
+#define WGL_NUMBER_PIXEL_FORMATS_ARB   0x2000
+#define WGL_DRAW_TO_WINDOW_ARB         0x2001
+#define WGL_DRAW_TO_BITMAP_ARB         0x2002
+#define WGL_ACCELERATION_ARB           0x2003
+#define WGL_NEED_PALETTE_ARB           0x2004
+#define WGL_NEED_SYSTEM_PALETTE_ARB    0x2005
+#define WGL_SWAP_LAYER_BUFFERS_ARB     0x2006
+#define WGL_SWAP_METHOD_ARB            0x2007
+#define WGL_NUMBER_OVERLAYS_ARB        0x2008
+#define WGL_NUMBER_UNDERLAYS_ARB       0x2009
+#define WGL_TRANSPARENT_ARB            0x200A
+#define WGL_TRANSPARENT_RED_VALUE_ARB  0x2037
+#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
+#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
+#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
+#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
+#define WGL_SHARE_DEPTH_ARB            0x200C
+#define WGL_SHARE_STENCIL_ARB          0x200D
+#define WGL_SHARE_ACCUM_ARB            0x200E
+#define WGL_SUPPORT_GDI_ARB            0x200F
+#define WGL_SUPPORT_OPENGL_ARB         0x2010
+#define WGL_DOUBLE_BUFFER_ARB          0x2011
+#define WGL_STEREO_ARB                 0x2012
+#define WGL_PIXEL_TYPE_ARB             0x2013
+#define WGL_COLOR_BITS_ARB             0x2014
+#define WGL_RED_BITS_ARB               0x2015
+#define WGL_RED_SHIFT_ARB              0x2016
+#define WGL_GREEN_BITS_ARB             0x2017
+#define WGL_GREEN_SHIFT_ARB            0x2018
+#define WGL_BLUE_BITS_ARB              0x2019
+#define WGL_BLUE_SHIFT_ARB             0x201A
+#define WGL_ALPHA_BITS_ARB             0x201B
+#define WGL_ALPHA_SHIFT_ARB            0x201C
+#define WGL_ACCUM_BITS_ARB             0x201D
+#define WGL_ACCUM_RED_BITS_ARB         0x201E
+#define WGL_ACCUM_GREEN_BITS_ARB       0x201F
+#define WGL_ACCUM_BLUE_BITS_ARB        0x2020
+#define WGL_ACCUM_ALPHA_BITS_ARB       0x2021
+#define WGL_DEPTH_BITS_ARB             0x2022
+#define WGL_STENCIL_BITS_ARB           0x2023
+#define WGL_AUX_BUFFERS_ARB            0x2024
+#define WGL_NO_ACCELERATION_ARB        0x2025
+#define WGL_GENERIC_ACCELERATION_ARB   0x2026
+#define WGL_FULL_ACCELERATION_ARB      0x2027
+#define WGL_SWAP_EXCHANGE_ARB          0x2028
+#define WGL_SWAP_COPY_ARB              0x2029
+#define WGL_SWAP_UNDEFINED_ARB         0x202A
+#define WGL_TYPE_RGBA_ARB              0x202B
+#define WGL_TYPE_COLORINDEX_ARB        0x202C
+#endif
+
+#ifndef WGL_ARB_multisample
+#define WGL_SAMPLE_BUFFERS_ARB         0x2041
+#define WGL_SAMPLES_ARB                0x2042
+#endif
+
+#endif /* SDL_VIDEO_OPENGL_WGL */
+
+#endif /* _SDL_windowsopengl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengles.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengles.c
new file mode 100644
index 000000000..a921ba8aa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengles.c	
@@ -0,0 +1,139 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS && SDL_VIDEO_OPENGL_EGL
+
+#include "SDL_windowsvideo.h"
+#include "SDL_windowsopengles.h"
+#include "SDL_windowsopengl.h"
+#include "SDL_log.h"
+
+/* EGL implementation of SDL OpenGL support */
+
+int
+WIN_GLES_LoadLibrary(_THIS, const char *path) {
+
+    /* If the profile requested is not GL ES, switch over to WIN_GL functions  */
+    if (_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) {
+#if SDL_VIDEO_OPENGL_WGL
+        WIN_GLES_UnloadLibrary(_this);
+        _this->GL_LoadLibrary = WIN_GL_LoadLibrary;
+        _this->GL_GetProcAddress = WIN_GL_GetProcAddress;
+        _this->GL_UnloadLibrary = WIN_GL_UnloadLibrary;
+        _this->GL_CreateContext = WIN_GL_CreateContext;
+        _this->GL_MakeCurrent = WIN_GL_MakeCurrent;
+        _this->GL_SetSwapInterval = WIN_GL_SetSwapInterval;
+        _this->GL_GetSwapInterval = WIN_GL_GetSwapInterval;
+        _this->GL_SwapWindow = WIN_GL_SwapWindow;
+        _this->GL_DeleteContext = WIN_GL_DeleteContext;
+        return WIN_GL_LoadLibrary(_this, path);
+#else
+        return SDL_SetError("SDL not configured with OpenGL/WGL support");
+#endif
+    }
+    
+    if (_this->egl_data == NULL) {
+        return SDL_EGL_LoadLibrary(_this, NULL, EGL_DEFAULT_DISPLAY);
+    }
+
+    return 0;
+}
+
+SDL_GLContext
+WIN_GLES_CreateContext(_THIS, SDL_Window * window)
+{
+    SDL_GLContext context;
+    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+
+    if (_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) {
+        /* Switch to WGL based functions */
+        WIN_GLES_UnloadLibrary(_this);
+        _this->GL_LoadLibrary = WIN_GL_LoadLibrary;
+        _this->GL_GetProcAddress = WIN_GL_GetProcAddress;
+        _this->GL_UnloadLibrary = WIN_GL_UnloadLibrary;
+        _this->GL_CreateContext = WIN_GL_CreateContext;
+        _this->GL_MakeCurrent = WIN_GL_MakeCurrent;
+        _this->GL_SetSwapInterval = WIN_GL_SetSwapInterval;
+        _this->GL_GetSwapInterval = WIN_GL_GetSwapInterval;
+        _this->GL_SwapWindow = WIN_GL_SwapWindow;
+        _this->GL_DeleteContext = WIN_GL_DeleteContext;
+
+        if (WIN_GL_LoadLibrary(_this, NULL) != 0) {
+            return NULL;
+        }
+
+        return WIN_GL_CreateContext(_this, window);
+    }
+
+    context = SDL_EGL_CreateContext(_this, data->egl_surface);
+    return context;
+}
+
+void
+WIN_GLES_DeleteContext(_THIS, SDL_GLContext context)
+{
+    SDL_EGL_DeleteContext(_this, context);
+    WIN_GLES_UnloadLibrary(_this);
+}
+
+SDL_EGL_SwapWindow_impl(WIN)
+SDL_EGL_MakeCurrent_impl(WIN)
+
+int
+WIN_GLES_SetupWindow(_THIS, SDL_Window * window)
+{
+    /* The current context is lost in here; save it and reset it. */
+    SDL_WindowData *windowdata = (SDL_WindowData *) window->driverdata;
+    SDL_Window *current_win = SDL_GL_GetCurrentWindow();
+    SDL_GLContext current_ctx = SDL_GL_GetCurrentContext();
+
+
+    if (_this->egl_data == NULL) {
+        if (SDL_EGL_LoadLibrary(_this, NULL, EGL_DEFAULT_DISPLAY) < 0) {
+            return -1;
+        }
+    }
+  
+    /* Create the GLES window surface */
+    windowdata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType)windowdata->hwnd);
+
+    if (windowdata->egl_surface == EGL_NO_SURFACE) {
+        return SDL_SetError("Could not create GLES window surface");
+    }
+
+    return WIN_GLES_MakeCurrent(_this, current_win, current_ctx);    
+}
+
+int
+WIN_GLES_SetSwapInterval(_THIS, int interval)
+{
+    /* FIXME: This should call SDL_EGL_SetSwapInterval, but ANGLE has a bug that prevents this
+     * from working if we do (the window contents freeze and don't swap properly). So, we ignore
+     * the request for now.
+     */
+    SDL_Log("WARNING: Ignoring SDL_GL_SetSwapInterval call due to ANGLE bug");
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS && SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengles.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengles.h
new file mode 100644
index 000000000..8e232177e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsopengles.h	
@@ -0,0 +1,51 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_winopengles_h
+#define _SDL_winopengles_h
+
+#if SDL_VIDEO_OPENGL_EGL
+
+#include "../SDL_sysvideo.h"
+#include "../SDL_egl_c.h"
+
+/* OpenGLES functions */
+#define WIN_GLES_GetAttribute SDL_EGL_GetAttribute
+#define WIN_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define WIN_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define WIN_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+/* See the WIN_GLES_GetSwapInterval implementation to see why this is commented out */
+/*#define WIN_GLES_SetSwapInterval SDL_EGL_SetSwapInterval*/
+extern int WIN_GLES_SetSwapInterval(_THIS, int interval);
+
+extern int WIN_GLES_LoadLibrary(_THIS, const char *path);
+extern SDL_GLContext WIN_GLES_CreateContext(_THIS, SDL_Window * window);
+extern void WIN_GLES_SwapWindow(_THIS, SDL_Window * window);
+extern int WIN_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+extern void WIN_GLES_DeleteContext(_THIS, SDL_GLContext context);
+extern int WIN_GLES_SetupWindow(_THIS, SDL_Window * window);
+
+#endif /* SDL_VIDEO_OPENGL_EGL */
+
+#endif /* _SDL_winopengles_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsshape.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsshape.c
new file mode 100644
index 000000000..9409e2b4d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsshape.c	
@@ -0,0 +1,110 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "SDL_assert.h"
+#include "SDL_windowsshape.h"
+#include "SDL_windowsvideo.h"
+
+SDL_WindowShaper*
+Win32_CreateShaper(SDL_Window * window) {
+    int resized_properly;
+    SDL_WindowShaper* result = (SDL_WindowShaper *)SDL_malloc(sizeof(SDL_WindowShaper));
+    result->window = window;
+    result->mode.mode = ShapeModeDefault;
+    result->mode.parameters.binarizationCutoff = 1;
+    result->userx = result->usery = 0;
+    result->driverdata = (SDL_ShapeData*)SDL_malloc(sizeof(SDL_ShapeData));
+    ((SDL_ShapeData*)result->driverdata)->mask_tree = NULL;
+    /* Put some driver-data here. */
+    window->shaper = result;
+    resized_properly = Win32_ResizeWindowShape(window);
+    if (resized_properly != 0)
+            return NULL;
+
+    return result;
+}
+
+void
+CombineRectRegions(SDL_ShapeTree* node,void* closure) {
+    HRGN mask_region = *((HRGN*)closure),temp_region = NULL;
+    if(node->kind == OpaqueShape) {
+        /* Win32 API regions exclude their outline, so we widen the region by one pixel in each direction to include the real outline. */
+        temp_region = CreateRectRgn(node->data.shape.x,node->data.shape.y,node->data.shape.x + node->data.shape.w + 1,node->data.shape.y + node->data.shape.h + 1);
+        if(mask_region != NULL) {
+            CombineRgn(mask_region,mask_region,temp_region,RGN_OR);
+            DeleteObject(temp_region);
+        }
+        else
+            *((HRGN*)closure) = temp_region;
+    }
+}
+
+int
+Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode) {
+    SDL_ShapeData *data;
+    HRGN mask_region = NULL;
+
+    if( (shaper == NULL) ||
+        (shape == NULL) ||
+        ((shape->format->Amask == 0) && (shape_mode->mode != ShapeModeColorKey)) ||
+        (shape->w != shaper->window->w) ||
+        (shape->h != shaper->window->h) ) {
+        return SDL_INVALID_SHAPE_ARGUMENT;
+    }
+
+    data = (SDL_ShapeData*)shaper->driverdata;
+    if(data->mask_tree != NULL)
+        SDL_FreeShapeTree(&data->mask_tree);
+    data->mask_tree = SDL_CalculateShapeTree(*shape_mode,shape);
+
+    SDL_TraverseShapeTree(data->mask_tree,&CombineRectRegions,&mask_region);
+    SDL_assert(mask_region != NULL);
+
+    SetWindowRgn(((SDL_WindowData *)(shaper->window->driverdata))->hwnd, mask_region, TRUE);
+
+    return 0;
+}
+
+int
+Win32_ResizeWindowShape(SDL_Window *window) {
+    SDL_ShapeData* data;
+
+    if (window == NULL)
+        return -1;
+    data = (SDL_ShapeData *)window->shaper->driverdata;
+    if (data == NULL)
+        return -1;
+
+    if(data->mask_tree != NULL)
+        SDL_FreeShapeTree(&data->mask_tree);
+    if(window->shaper->hasshape == SDL_TRUE) {
+        window->shaper->userx = window->x;
+        window->shaper->usery = window->y;
+        SDL_SetWindowPosition(window,-1000,-1000);
+    }
+
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsshape.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsshape.h
new file mode 100644
index 000000000..9405a501e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsshape.h	
@@ -0,0 +1,40 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_windowsshape_h
+#define _SDL_windowsshape_h
+
+#include "SDL_video.h"
+#include "SDL_shape.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_shape_internals.h"
+
+typedef struct {
+    SDL_ShapeTree *mask_tree;
+} SDL_ShapeData;
+
+extern SDL_WindowShaper* Win32_CreateShaper(SDL_Window * window);
+extern int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
+extern int Win32_ResizeWindowShape(SDL_Window *window);
+
+#endif /* _SDL_windowsshape_h */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsvideo.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowsvideo.c
new file mode 100644
index 000000000..503653bd6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsvideo.c	
@@ -0,0 +1,335 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "SDL_main.h"
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "SDL_system.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+
+#include "SDL_windowsvideo.h"
+#include "SDL_windowsframebuffer.h"
+#include "SDL_windowsshape.h"
+
+/* Initialization/Query functions */
+static int WIN_VideoInit(_THIS);
+static void WIN_VideoQuit(_THIS);
+
+
+/* Windows driver bootstrap functions */
+
+static int
+WIN_Available(void)
+{
+    return (1);
+}
+
+static void
+WIN_DeleteDevice(SDL_VideoDevice * device)
+{
+    SDL_VideoData *data = (SDL_VideoData *) device->driverdata;
+
+    SDL_UnregisterApp();
+    if (data->userDLL) {
+        SDL_UnloadObject(data->userDLL);
+    }
+
+    SDL_free(device->driverdata);
+    SDL_free(device);
+}
+
+static SDL_VideoDevice *
+WIN_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+    SDL_VideoData *data;
+
+    SDL_RegisterApp(NULL, 0, NULL);
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (device) {
+        data = (struct SDL_VideoData *) SDL_calloc(1, sizeof(SDL_VideoData));
+    } else {
+        data = NULL;
+    }
+    if (!data) {
+        SDL_free(device);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    device->driverdata = data;
+
+    data->userDLL = SDL_LoadObject("USER32.DLL");
+    if (data->userDLL) {
+        data->CloseTouchInputHandle = (BOOL (WINAPI *)( HTOUCHINPUT )) SDL_LoadFunction(data->userDLL, "CloseTouchInputHandle");
+        data->GetTouchInputInfo = (BOOL (WINAPI *)( HTOUCHINPUT, UINT, PTOUCHINPUT, int )) SDL_LoadFunction(data->userDLL, "GetTouchInputInfo");
+        data->RegisterTouchWindow = (BOOL (WINAPI *)( HWND, ULONG )) SDL_LoadFunction(data->userDLL, "RegisterTouchWindow");
+    }
+
+    /* Set the function pointers */
+    device->VideoInit = WIN_VideoInit;
+    device->VideoQuit = WIN_VideoQuit;
+    device->GetDisplayBounds = WIN_GetDisplayBounds;
+    device->GetDisplayModes = WIN_GetDisplayModes;
+    device->SetDisplayMode = WIN_SetDisplayMode;
+    device->PumpEvents = WIN_PumpEvents;
+
+#undef CreateWindow
+    device->CreateWindow = WIN_CreateWindow;
+    device->CreateWindowFrom = WIN_CreateWindowFrom;
+    device->SetWindowTitle = WIN_SetWindowTitle;
+    device->SetWindowIcon = WIN_SetWindowIcon;
+    device->SetWindowPosition = WIN_SetWindowPosition;
+    device->SetWindowSize = WIN_SetWindowSize;
+    device->ShowWindow = WIN_ShowWindow;
+    device->HideWindow = WIN_HideWindow;
+    device->RaiseWindow = WIN_RaiseWindow;
+    device->MaximizeWindow = WIN_MaximizeWindow;
+    device->MinimizeWindow = WIN_MinimizeWindow;
+    device->RestoreWindow = WIN_RestoreWindow;
+    device->SetWindowBordered = WIN_SetWindowBordered;
+    device->SetWindowFullscreen = WIN_SetWindowFullscreen;
+    device->SetWindowGammaRamp = WIN_SetWindowGammaRamp;
+    device->GetWindowGammaRamp = WIN_GetWindowGammaRamp;
+    device->SetWindowGrab = WIN_SetWindowGrab;
+    device->DestroyWindow = WIN_DestroyWindow;
+    device->GetWindowWMInfo = WIN_GetWindowWMInfo;
+    device->CreateWindowFramebuffer = WIN_CreateWindowFramebuffer;
+    device->UpdateWindowFramebuffer = WIN_UpdateWindowFramebuffer;
+    device->DestroyWindowFramebuffer = WIN_DestroyWindowFramebuffer;
+    device->OnWindowEnter = WIN_OnWindowEnter;
+
+    device->shape_driver.CreateShaper = Win32_CreateShaper;
+    device->shape_driver.SetWindowShape = Win32_SetWindowShape;
+    device->shape_driver.ResizeWindowShape = Win32_ResizeWindowShape;
+
+#if SDL_VIDEO_OPENGL_WGL
+    device->GL_LoadLibrary = WIN_GL_LoadLibrary;
+    device->GL_GetProcAddress = WIN_GL_GetProcAddress;
+    device->GL_UnloadLibrary = WIN_GL_UnloadLibrary;
+    device->GL_CreateContext = WIN_GL_CreateContext;
+    device->GL_MakeCurrent = WIN_GL_MakeCurrent;
+    device->GL_SetSwapInterval = WIN_GL_SetSwapInterval;
+    device->GL_GetSwapInterval = WIN_GL_GetSwapInterval;
+    device->GL_SwapWindow = WIN_GL_SwapWindow;
+    device->GL_DeleteContext = WIN_GL_DeleteContext;
+#endif
+    device->StartTextInput = WIN_StartTextInput;
+    device->StopTextInput = WIN_StopTextInput;
+    device->SetTextInputRect = WIN_SetTextInputRect;
+
+    device->SetClipboardText = WIN_SetClipboardText;
+    device->GetClipboardText = WIN_GetClipboardText;
+    device->HasClipboardText = WIN_HasClipboardText;
+
+    device->free = WIN_DeleteDevice;
+
+    return device;
+}
+
+VideoBootStrap WINDOWS_bootstrap = {
+    "windows", "SDL Windows video driver", WIN_Available, WIN_CreateDevice
+};
+
+int
+WIN_VideoInit(_THIS)
+{
+    if (WIN_InitModes(_this) < 0) {
+        return -1;
+    }
+
+    WIN_InitKeyboard(_this);
+    WIN_InitMouse(_this);
+
+    return 0;
+}
+
+void
+WIN_VideoQuit(_THIS)
+{
+    WIN_QuitModes(_this);
+    WIN_QuitKeyboard(_this);
+    WIN_QuitMouse(_this);
+}
+
+
+#define D3D_DEBUG_INFO
+#include <d3d9.h>
+
+SDL_bool 
+D3D_LoadDLL( void **pD3DDLL, IDirect3D9 **pDirect3D9Interface )
+{
+	*pD3DDLL = SDL_LoadObject("D3D9.DLL");
+	if (*pD3DDLL) {
+		IDirect3D9 *(WINAPI * D3DCreate) (UINT SDKVersion);
+
+		D3DCreate =
+			(IDirect3D9 * (WINAPI *) (UINT)) SDL_LoadFunction(*pD3DDLL,
+			"Direct3DCreate9");
+		if (D3DCreate) {
+			*pDirect3D9Interface = D3DCreate(D3D_SDK_VERSION);
+		}
+		if (!*pDirect3D9Interface) {
+			SDL_UnloadObject(*pD3DDLL);
+			*pD3DDLL = NULL;
+			return SDL_FALSE;
+		}
+
+		return SDL_TRUE;
+	} else {
+		*pDirect3D9Interface = NULL;
+		return SDL_FALSE;
+	}
+}
+
+
+int
+SDL_Direct3D9GetAdapterIndex( int displayIndex )
+{
+	void *pD3DDLL;
+	IDirect3D9 *pD3D;
+	if (!D3D_LoadDLL(&pD3DDLL, &pD3D)) {
+		SDL_SetError("Unable to create Direct3D interface");
+		return D3DADAPTER_DEFAULT;
+	} else {
+		SDL_DisplayData *pData = (SDL_DisplayData *)SDL_GetDisplayDriverData(displayIndex);
+		int adapterIndex = D3DADAPTER_DEFAULT;
+
+		if (!pData) {
+			SDL_SetError("Invalid display index");
+			adapterIndex = -1; /* make sure we return something invalid */
+		} else {
+			char *displayName = WIN_StringToUTF8(pData->DeviceName);
+			unsigned int count = IDirect3D9_GetAdapterCount(pD3D);
+			unsigned int i;
+			for (i=0; i<count; i++) {
+				D3DADAPTER_IDENTIFIER9 id;
+				IDirect3D9_GetAdapterIdentifier(pD3D, i, 0, &id);
+
+				if (SDL_strcmp(id.DeviceName, displayName) == 0) {
+					adapterIndex = i;
+					break;
+				}
+			}
+			SDL_free(displayName);
+		}
+
+		/* free up the D3D stuff we inited */
+		IDirect3D9_Release(pD3D);
+		SDL_UnloadObject(pD3DDLL);
+
+		return adapterIndex;
+	}
+}
+
+#define CINTERFACE
+#define COBJMACROS
+#include <dxgi.h>
+
+SDL_bool 
+DXGI_LoadDLL( void **pDXGIDLL , IDXGIFactory **pDXGIFactory )
+{
+	*pDXGIDLL = SDL_LoadObject("DXGI.DLL");
+	if (*pDXGIDLL ) {
+		HRESULT (WINAPI *CreateDXGI)( REFIID riid, void **ppFactory );
+
+		CreateDXGI =
+			(HRESULT (WINAPI *) (REFIID, void**)) SDL_LoadFunction(*pDXGIDLL,
+			"CreateDXGIFactory");
+		if (CreateDXGI) {
+			GUID dxgiGUID = {0x7b7166ec,0x21c7,0x44ae,{0xb2,0x1a,0xc9,0xae,0x32,0x1a,0xe3,0x69}};
+			if( !SUCCEEDED( CreateDXGI( &dxgiGUID, (void**)pDXGIFactory ))) {
+				*pDXGIFactory = NULL;
+			}
+		}
+		if (!*pDXGIFactory) {
+			SDL_UnloadObject(*pDXGIDLL);
+			*pDXGIDLL = NULL;
+			return SDL_FALSE;
+		}
+
+		return SDL_TRUE;
+	} else {
+		*pDXGIFactory = NULL;
+		return SDL_FALSE;
+	}
+}
+
+
+void
+SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex )
+{
+	void *pDXGIDLL;
+	IDXGIFactory *pDXGIFactory;
+
+	*adapterIndex = -1;
+	*outputIndex = -1;
+
+	if (!DXGI_LoadDLL(&pDXGIDLL, &pDXGIFactory)) {
+		SDL_SetError("Unable to create DXGI interface");
+	} else {
+		SDL_DisplayData *pData = (SDL_DisplayData *)SDL_GetDisplayDriverData(displayIndex);
+
+		if (!pData) {
+			SDL_SetError("Invalid display index");
+		} else {
+			char *displayName = WIN_StringToUTF8(pData->DeviceName);
+			int nAdapter = 0, nOutput = 0;
+			IDXGIAdapter* pDXGIAdapter;
+			while ( *adapterIndex == -1 && IDXGIFactory_EnumAdapters(pDXGIFactory, nAdapter, &pDXGIAdapter) != DXGI_ERROR_NOT_FOUND ) {
+				IDXGIOutput* pDXGIOutput;
+				while ( *adapterIndex == -1 && IDXGIAdapter_EnumOutputs(pDXGIAdapter, nOutput, &pDXGIOutput) != DXGI_ERROR_NOT_FOUND ) {
+					DXGI_OUTPUT_DESC outputDesc;
+					if (SUCCEEDED(IDXGIOutput_GetDesc(pDXGIOutput, &outputDesc))) {
+						char *outputName = WIN_StringToUTF8(outputDesc.DeviceName);
+
+						if(!SDL_strcmp(outputName, displayName)) {
+							*adapterIndex = nAdapter;
+							*outputIndex = nOutput;
+						}
+
+						SDL_free( outputName );
+					}
+
+					IDXGIOutput_Release( pDXGIOutput );
+					nOutput++;
+				}
+
+				IDXGIAdapter_Release( pDXGIAdapter );
+				nAdapter++;
+			}
+			SDL_free(displayName);
+		}
+
+		/* free up the D3D stuff we inited */
+		IDXGIFactory_AddRef( pDXGIFactory );
+		SDL_UnloadObject(pDXGIDLL);
+	}
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vim: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowsvideo.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowsvideo.h
new file mode 100644
index 000000000..b64cbddfb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowsvideo.h	
@@ -0,0 +1,180 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_windowsvideo_h
+#define _SDL_windowsvideo_h
+
+#include "../../core/windows/SDL_windows.h"
+
+#include "../SDL_sysvideo.h"
+
+#if defined(_MSC_VER)
+#include <msctf.h>
+#else
+#include "SDL_msctf.h"
+#endif
+
+#include <imm.h>
+
+#define MAX_CANDLIST    10
+#define MAX_CANDLENGTH  256
+
+#include "SDL_windowsclipboard.h"
+#include "SDL_windowsevents.h"
+#include "SDL_windowskeyboard.h"
+#include "SDL_windowsmodes.h"
+#include "SDL_windowsmouse.h"
+#include "SDL_windowsopengl.h"
+#include "SDL_windowsopengles.h"
+#include "SDL_windowswindow.h"
+#include "SDL_events.h"
+#include "SDL_loadso.h"
+
+
+#if WINVER < 0x0601
+/* Touch input definitions */
+#define TWF_FINETOUCH   1
+#define TWF_WANTPALM    2
+
+#define TOUCHEVENTF_MOVE 0x0001
+#define TOUCHEVENTF_DOWN 0x0002
+#define TOUCHEVENTF_UP   0x0004
+
+DECLARE_HANDLE(HTOUCHINPUT);
+
+typedef struct _TOUCHINPUT {
+    LONG      x;
+    LONG      y;
+    HANDLE    hSource;
+    DWORD     dwID;
+    DWORD     dwFlags;
+    DWORD     dwMask;
+    DWORD     dwTime;
+    ULONG_PTR dwExtraInfo;
+    DWORD     cxContact;
+    DWORD     cyContact;
+} TOUCHINPUT, *PTOUCHINPUT;
+
+#endif /* WINVER < 0x0601 */
+
+typedef BOOL  (*PFNSHFullScreen)(HWND, DWORD);
+typedef void  (*PFCoordTransform)(SDL_Window*, POINT*);
+
+typedef struct
+{
+    void **lpVtbl;
+    int refcount;
+    void *data;
+} TSFSink;
+
+/* Definition from Win98DDK version of IMM.H */
+typedef struct tagINPUTCONTEXT2 {
+    HWND hWnd;
+    BOOL fOpen;
+    POINT ptStatusWndPos;
+    POINT ptSoftKbdPos;
+    DWORD fdwConversion;
+    DWORD fdwSentence;
+    union {
+        LOGFONTA A;
+        LOGFONTW W;
+    } lfFont;
+    COMPOSITIONFORM cfCompForm;
+    CANDIDATEFORM cfCandForm[4];
+    HIMCC hCompStr;
+    HIMCC hCandInfo;
+    HIMCC hGuideLine;
+    HIMCC hPrivate;
+    DWORD dwNumMsgBuf;
+    HIMCC hMsgBuf;
+    DWORD fdwInit;
+    DWORD dwReserve[3];
+} INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2;
+
+/* Private display data */
+
+typedef struct SDL_VideoData
+{
+    int render;
+
+    DWORD clipboard_count;
+
+    /* Touch input functions */
+    void* userDLL;
+    BOOL (WINAPI *CloseTouchInputHandle)( HTOUCHINPUT );
+    BOOL (WINAPI *GetTouchInputInfo)( HTOUCHINPUT, UINT, PTOUCHINPUT, int );
+    BOOL (WINAPI *RegisterTouchWindow)( HWND, ULONG );
+
+    SDL_bool ime_com_initialized;
+    struct ITfThreadMgr *ime_threadmgr;
+    SDL_bool ime_initialized;
+    SDL_bool ime_enabled;
+    SDL_bool ime_available;
+    HWND ime_hwnd_main;
+    HWND ime_hwnd_current;
+    HIMC ime_himc;
+
+    WCHAR ime_composition[SDL_TEXTEDITINGEVENT_TEXT_SIZE];
+    WCHAR ime_readingstring[16];
+    int ime_cursor;
+
+    SDL_bool ime_candlist;
+    WCHAR ime_candidates[MAX_CANDLIST][MAX_CANDLENGTH];
+    DWORD ime_candcount;
+    DWORD ime_candref;
+    DWORD ime_candsel;
+    UINT ime_candpgsize;
+    int ime_candlistindexbase;
+    SDL_bool ime_candvertical;
+
+    SDL_bool ime_dirty;
+    SDL_Rect ime_rect;
+    SDL_Rect ime_candlistrect;
+    int ime_winwidth;
+    int ime_winheight;
+
+    HKL ime_hkl;
+    void* ime_himm32;
+    UINT (WINAPI *GetReadingString)(HIMC himc, UINT uReadingBufLen, LPWSTR lpwReadingBuf, PINT pnErrorIndex, BOOL *pfIsVertical, PUINT puMaxReadingLen);
+    BOOL (WINAPI *ShowReadingWindow)(HIMC himc, BOOL bShow);
+    LPINPUTCONTEXT2 (WINAPI *ImmLockIMC)(HIMC himc);
+    BOOL (WINAPI *ImmUnlockIMC)(HIMC himc);
+    LPVOID (WINAPI *ImmLockIMCC)(HIMCC himcc);
+    BOOL (WINAPI *ImmUnlockIMCC)(HIMCC himcc);
+
+    SDL_bool ime_uiless;
+    struct ITfThreadMgrEx *ime_threadmgrex;
+    DWORD ime_uielemsinkcookie;
+    DWORD ime_alpnsinkcookie;
+    DWORD ime_openmodesinkcookie;
+    DWORD ime_convmodesinkcookie;
+    TSFSink *ime_uielemsink;
+    TSFSink *ime_ippasink;
+} SDL_VideoData;
+
+
+typedef struct IDirect3D9 IDirect3D9;
+extern SDL_bool D3D_LoadDLL( void **pD3DDLL, IDirect3D9 **pDirect3D9Interface );
+
+#endif /* _SDL_windowsvideo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowswindow.c b/Source/3rd Party/sdl/src/video/windows/SDL_windowswindow.c
new file mode 100644
index 000000000..425b4da23
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowswindow.c	
@@ -0,0 +1,786 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINDOWS
+
+#include "../../core/windows/SDL_windows.h"
+
+#include "SDL_assert.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_mouse_c.h"
+
+#include "SDL_windowsvideo.h"
+#include "SDL_windowswindow.h"
+#include "SDL_hints.h"
+
+/* Dropfile support */
+#include <shellapi.h>
+
+/* This is included after SDL_windowsvideo.h, which includes windows.h */
+#include "SDL_syswm.h"
+
+/* Windows CE compatibility */
+#ifndef SWP_NOCOPYBITS
+#define SWP_NOCOPYBITS 0
+#endif
+
+/* Fake window to help with DirectInput events. */
+HWND SDL_HelperWindow = NULL;
+static WCHAR *SDL_HelperWindowClassName = TEXT("SDLHelperWindowInputCatcher");
+static WCHAR *SDL_HelperWindowName = TEXT("SDLHelperWindowInputMsgWindow");
+static ATOM SDL_HelperWindowClass = 0;
+
+#define STYLE_BASIC         (WS_CLIPSIBLINGS | WS_CLIPCHILDREN)
+#define STYLE_FULLSCREEN    (WS_POPUP)
+#define STYLE_BORDERLESS    (WS_POPUP)
+#define STYLE_NORMAL        (WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX)
+#define STYLE_RESIZABLE     (WS_THICKFRAME | WS_MAXIMIZEBOX)
+#define STYLE_MASK          (STYLE_FULLSCREEN | STYLE_BORDERLESS | STYLE_NORMAL | STYLE_RESIZABLE)
+
+static DWORD
+GetWindowStyle(SDL_Window * window)
+{
+    DWORD style = 0;
+
+    if (window->flags & SDL_WINDOW_FULLSCREEN) {
+        style |= STYLE_FULLSCREEN;
+    } else {
+        if (window->flags & SDL_WINDOW_BORDERLESS) {
+            style |= STYLE_BORDERLESS;
+        } else {
+            style |= STYLE_NORMAL;
+        }
+        if (window->flags & SDL_WINDOW_RESIZABLE) {
+            style |= STYLE_RESIZABLE;
+        }
+    }
+    return style;
+}
+
+static void
+WIN_SetWindowPositionInternal(_THIS, SDL_Window * window, UINT flags)
+{
+    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+    HWND hwnd = data->hwnd;
+    RECT rect;
+    DWORD style;
+    HWND top;
+    BOOL menu;
+    int x, y;
+    int w, h;
+
+    /* Figure out what the window area will be */
+    if (SDL_ShouldAllowTopmost() && (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS)) == (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS)) {
+        top = HWND_TOPMOST;
+    } else {
+        top = HWND_NOTOPMOST;
+    }
+    style = GetWindowLong(hwnd, GWL_STYLE);
+    rect.left = 0;
+    rect.top = 0;
+    rect.right = window->w;
+    rect.bottom = window->h;
+    menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
+    AdjustWindowRectEx(&rect, style, menu, 0);
+    w = (rect.right - rect.left);
+    h = (rect.bottom - rect.top);
+    x = window->x + rect.left;
+    y = window->y + rect.top;
+
+    data->expected_resize = TRUE;
+    SetWindowPos(hwnd, top, x, y, w, h, flags);
+    data->expected_resize = FALSE;
+}
+
+static int
+SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    SDL_WindowData *data;
+
+    /* Allocate the window data */
+    data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+    data->window = window;
+    data->hwnd = hwnd;
+    data->hdc = GetDC(hwnd);
+    data->created = created;
+    data->mouse_button_flags = 0;
+    data->videodata = videodata;
+
+    window->driverdata = data;
+
+    /* Associate the data with the window */
+    if (!SetProp(hwnd, TEXT("SDL_WindowData"), data)) {
+        ReleaseDC(hwnd, data->hdc);
+        SDL_free(data);
+        return WIN_SetError("SetProp() failed");
+    }
+
+    /* Set up the window proc function */
+#ifdef GWLP_WNDPROC
+    data->wndproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
+    if (data->wndproc == WIN_WindowProc) {
+        data->wndproc = NULL;
+    } else {
+        SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) WIN_WindowProc);
+    }
+#else
+    data->wndproc = (WNDPROC) GetWindowLong(hwnd, GWL_WNDPROC);
+    if (data->wndproc == WIN_WindowProc) {
+        data->wndproc = NULL;
+    } else {
+        SetWindowLong(hwnd, GWL_WNDPROC, (LONG_PTR) WIN_WindowProc);
+    }
+#endif
+
+    /* Fill in the SDL window with the window data */
+    {
+        RECT rect;
+        if (GetClientRect(hwnd, &rect)) {
+            int w = rect.right;
+            int h = rect.bottom;
+            if ((window->w && window->w != w) || (window->h && window->h != h)) {
+                /* We tried to create a window larger than the desktop and Windows didn't allow it.  Override! */
+                WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_NOZORDER | SWP_NOACTIVATE);
+            } else {
+                window->w = w;
+                window->h = h;
+            }
+        }
+    }
+    {
+        POINT point;
+        point.x = 0;
+        point.y = 0;
+        if (ClientToScreen(hwnd, &point)) {
+            window->x = point.x;
+            window->y = point.y;
+        }
+    }
+    {
+        DWORD style = GetWindowLong(hwnd, GWL_STYLE);
+        if (style & WS_VISIBLE) {
+            window->flags |= SDL_WINDOW_SHOWN;
+        } else {
+            window->flags &= ~SDL_WINDOW_SHOWN;
+        }
+        if (style & (WS_BORDER | WS_THICKFRAME)) {
+            window->flags &= ~SDL_WINDOW_BORDERLESS;
+        } else {
+            window->flags |= SDL_WINDOW_BORDERLESS;
+        }
+        if (style & WS_THICKFRAME) {
+            window->flags |= SDL_WINDOW_RESIZABLE;
+        } else {
+            window->flags &= ~SDL_WINDOW_RESIZABLE;
+        }
+#ifdef WS_MAXIMIZE
+        if (style & WS_MAXIMIZE) {
+            window->flags |= SDL_WINDOW_MAXIMIZED;
+        } else
+#endif
+        {
+            window->flags &= ~SDL_WINDOW_MAXIMIZED;
+        }
+#ifdef WS_MINIMIZE
+        if (style & WS_MINIMIZE) {
+            window->flags |= SDL_WINDOW_MINIMIZED;
+        } else
+#endif
+        {
+            window->flags &= ~SDL_WINDOW_MINIMIZED;
+        }
+    }
+    if (GetFocus() == hwnd) {
+        window->flags |= SDL_WINDOW_INPUT_FOCUS;
+        SDL_SetKeyboardFocus(data->window);
+
+        if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
+            RECT rect;
+            GetClientRect(hwnd, &rect);
+            ClientToScreen(hwnd, (LPPOINT) & rect);
+            ClientToScreen(hwnd, (LPPOINT) & rect + 1);
+            ClipCursor(&rect);
+        }
+    }
+
+    /* Enable multi-touch */
+    if (videodata->RegisterTouchWindow) {
+        videodata->RegisterTouchWindow(hwnd, (TWF_FINETOUCH|TWF_WANTPALM));
+    }
+
+    /* Enable dropping files */
+    DragAcceptFiles(hwnd, TRUE);
+
+    /* All done! */
+    return 0;
+}
+
+int
+WIN_CreateWindow(_THIS, SDL_Window * window)
+{
+    HWND hwnd;
+    RECT rect;
+    DWORD style = STYLE_BASIC;
+    int x, y;
+    int w, h;
+
+    style |= GetWindowStyle(window);
+
+    /* Figure out what the window area will be */
+    rect.left = window->x;
+    rect.top = window->y;
+    rect.right = window->x + window->w;
+    rect.bottom = window->y + window->h;
+    AdjustWindowRectEx(&rect, style, FALSE, 0);
+    x = rect.left;
+    y = rect.top;
+    w = (rect.right - rect.left);
+    h = (rect.bottom - rect.top);
+
+    hwnd =
+        CreateWindow(SDL_Appname, TEXT(""), style, x, y, w, h, NULL, NULL,
+                     SDL_Instance, NULL);
+    if (!hwnd) {
+        return WIN_SetError("Couldn't create window");
+    }
+
+    WIN_PumpEvents(_this);
+
+    if (SetupWindowData(_this, window, hwnd, SDL_TRUE) < 0) {
+        DestroyWindow(hwnd);
+        return -1;
+    }
+
+#if SDL_VIDEO_OPENGL_WGL
+    /* We need to initialize the extensions before deciding how to create ES profiles */
+    if (window->flags & SDL_WINDOW_OPENGL) {
+        WIN_GL_InitExtensions(_this);
+    }
+#endif
+
+#if SDL_VIDEO_OPENGL_ES2
+    if ((window->flags & SDL_WINDOW_OPENGL) &&
+        _this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES
+#if SDL_VIDEO_OPENGL_WGL           
+        && (!_this->gl_data || !_this->gl_data->HAS_WGL_EXT_create_context_es2_profile)
+#endif  
+        ) {
+#if SDL_VIDEO_OPENGL_EGL  
+        if (WIN_GLES_SetupWindow(_this, window) < 0) {
+            WIN_DestroyWindow(_this, window);
+            return -1;
+        }
+#else
+        return SDL_SetError("Could not create GLES window surface (no EGL support available)");
+#endif /* SDL_VIDEO_OPENGL_EGL */
+    } else 
+#endif /* SDL_VIDEO_OPENGL_ES2 */
+
+#if SDL_VIDEO_OPENGL_WGL
+    if (window->flags & SDL_WINDOW_OPENGL) {
+        if (WIN_GL_SetupWindow(_this, window) < 0) {
+            WIN_DestroyWindow(_this, window);
+            return -1;
+        }
+    }
+#endif
+
+    return 0;
+}
+
+int
+WIN_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
+{
+    HWND hwnd = (HWND) data;
+    LPTSTR title;
+    int titleLen;
+
+    /* Query the title from the existing window */
+    titleLen = GetWindowTextLength(hwnd);
+    title = SDL_stack_alloc(TCHAR, titleLen + 1);
+    if (title) {
+        titleLen = GetWindowText(hwnd, title, titleLen);
+    } else {
+        titleLen = 0;
+    }
+    if (titleLen > 0) {
+        window->title = WIN_StringToUTF8(title);
+    }
+    if (title) {
+        SDL_stack_free(title);
+    }
+
+    if (SetupWindowData(_this, window, hwnd, SDL_FALSE) < 0) {
+        return -1;
+    }
+
+#if SDL_VIDEO_OPENGL_WGL
+    {
+        const char *hint = SDL_GetHint(SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT);
+        if (hint) {
+            // This hint is a pointer (in string form) of the address of
+            // the window to share a pixel format with
+            SDL_Window *otherWindow = NULL;
+            SDL_sscanf(hint, "%p", (void**)&otherWindow);
+
+            // Do some error checking on the pointer
+            if (otherWindow != NULL && otherWindow->magic == &_this->window_magic)
+            {
+                // If the otherWindow has SDL_WINDOW_OPENGL set, set it for the new window as well
+                if (otherWindow->flags & SDL_WINDOW_OPENGL)
+                {
+                    window->flags |= SDL_WINDOW_OPENGL;
+                    if(!WIN_GL_SetPixelFormatFrom(_this, otherWindow, window)) {
+                        return -1;
+                    }
+                }
+            }
+        }
+    }
+#endif
+    return 0;
+}
+
+void
+WIN_SetWindowTitle(_THIS, SDL_Window * window)
+{
+    HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
+    LPTSTR title;
+
+    if (window->title) {
+        title = WIN_UTF8ToString(window->title);
+    } else {
+        title = NULL;
+    }
+    SetWindowText(hwnd, title ? title : TEXT(""));
+    SDL_free(title);
+}
+
+void
+WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
+{
+    HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
+    HICON hicon = NULL;
+    BYTE *icon_bmp;
+    int icon_len, y;
+    SDL_RWops *dst;
+
+    /* Create temporary bitmap buffer */
+    icon_len = 40 + icon->h * icon->w * 4;
+    icon_bmp = SDL_stack_alloc(BYTE, icon_len);
+    dst = SDL_RWFromMem(icon_bmp, icon_len);
+    if (!dst) {
+        SDL_stack_free(icon_bmp);
+        return;
+    }
+
+    /* Write the BITMAPINFO header */
+    SDL_WriteLE32(dst, 40);
+    SDL_WriteLE32(dst, icon->w);
+    SDL_WriteLE32(dst, icon->h * 2);
+    SDL_WriteLE16(dst, 1);
+    SDL_WriteLE16(dst, 32);
+    SDL_WriteLE32(dst, BI_RGB);
+    SDL_WriteLE32(dst, icon->h * icon->w * 4);
+    SDL_WriteLE32(dst, 0);
+    SDL_WriteLE32(dst, 0);
+    SDL_WriteLE32(dst, 0);
+    SDL_WriteLE32(dst, 0);
+
+    /* Write the pixels upside down into the bitmap buffer */
+    SDL_assert(icon->format->format == SDL_PIXELFORMAT_ARGB8888);
+    y = icon->h;
+    while (y--) {
+        Uint8 *src = (Uint8 *) icon->pixels + y * icon->pitch;
+        SDL_RWwrite(dst, src, icon->pitch, 1);
+    }
+
+    hicon = CreateIconFromResource(icon_bmp, icon_len, TRUE, 0x00030000);
+
+    SDL_RWclose(dst);
+    SDL_stack_free(icon_bmp);
+
+    /* Set the icon for the window */
+    SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM) hicon);
+
+    /* Set the icon in the task manager (should we do this?) */
+    SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM) hicon);
+}
+
+void
+WIN_SetWindowPosition(_THIS, SDL_Window * window)
+{
+    WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_NOSIZE | SWP_NOACTIVATE);
+}
+
+void
+WIN_SetWindowSize(_THIS, SDL_Window * window)
+{
+    WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOACTIVATE);
+}
+
+void
+WIN_ShowWindow(_THIS, SDL_Window * window)
+{
+    HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
+    ShowWindow(hwnd, SW_SHOW);
+}
+
+void
+WIN_HideWindow(_THIS, SDL_Window * window)
+{
+    HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
+    ShowWindow(hwnd, SW_HIDE);
+}
+
+void
+WIN_RaiseWindow(_THIS, SDL_Window * window)
+{
+    WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOSIZE);
+}
+
+void
+WIN_MaximizeWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+    HWND hwnd = data->hwnd;
+    data->expected_resize = TRUE;
+    ShowWindow(hwnd, SW_MAXIMIZE);
+    data->expected_resize = FALSE;
+}
+
+void
+WIN_MinimizeWindow(_THIS, SDL_Window * window)
+{
+    HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
+    ShowWindow(hwnd, SW_MINIMIZE);
+}
+
+void
+WIN_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered)
+{
+    HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
+    DWORD style = GetWindowLong(hwnd, GWL_STYLE);
+
+    if (bordered) {
+        style &= ~STYLE_BORDERLESS;
+        style |= STYLE_NORMAL;
+    } else {
+        style &= ~STYLE_NORMAL;
+        style |= STYLE_BORDERLESS;
+    }
+
+    SetWindowLong(hwnd, GWL_STYLE, style);
+    WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_FRAMECHANGED | SWP_NOREPOSITION | SWP_NOZORDER |SWP_NOACTIVATE | SWP_NOSENDCHANGING);
+}
+
+void
+WIN_RestoreWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *)window->driverdata;
+    HWND hwnd = data->hwnd;
+    data->expected_resize = TRUE;
+    ShowWindow(hwnd, SW_RESTORE);
+    data->expected_resize = FALSE;
+}
+
+void
+WIN_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    HWND hwnd = data->hwnd;
+    RECT rect;
+    SDL_Rect bounds;
+    DWORD style;
+    HWND top;
+    BOOL menu;
+    int x, y;
+    int w, h;
+
+    if (SDL_ShouldAllowTopmost() && (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS)) == (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_INPUT_FOCUS)) {
+        top = HWND_TOPMOST;
+    } else {
+        top = HWND_NOTOPMOST;
+    }
+
+    style = GetWindowLong(hwnd, GWL_STYLE);
+    style &= ~STYLE_MASK;
+    style |= GetWindowStyle(window);
+
+    WIN_GetDisplayBounds(_this, display, &bounds);
+
+    if (fullscreen) {
+        x = bounds.x;
+        y = bounds.y;
+        w = bounds.w;
+        h = bounds.h;
+    } else {
+        rect.left = 0;
+        rect.top = 0;
+        rect.right = window->windowed.w;
+        rect.bottom = window->windowed.h;
+        menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
+        AdjustWindowRectEx(&rect, style, menu, 0);
+        w = (rect.right - rect.left);
+        h = (rect.bottom - rect.top);
+        x = window->windowed.x + rect.left;
+        y = window->windowed.y + rect.top;
+    }
+    SetWindowLong(hwnd, GWL_STYLE, style);
+    data->expected_resize = TRUE;
+    SetWindowPos(hwnd, top, x, y, w, h, SWP_NOCOPYBITS | SWP_NOACTIVATE);
+    data->expected_resize = FALSE;
+}
+
+int
+WIN_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp)
+{
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
+    HDC hdc;
+    BOOL succeeded = FALSE;
+
+    hdc = CreateDC(data->DeviceName, NULL, NULL, NULL);
+    if (hdc) {
+        succeeded = SetDeviceGammaRamp(hdc, (LPVOID)ramp);
+        if (!succeeded) {
+            WIN_SetError("SetDeviceGammaRamp()");
+        }
+        DeleteDC(hdc);
+    }
+    return succeeded ? 0 : -1;
+}
+
+int
+WIN_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp)
+{
+    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
+    SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
+    HDC hdc;
+    BOOL succeeded = FALSE;
+
+    hdc = CreateDC(data->DeviceName, NULL, NULL, NULL);
+    if (hdc) {
+        succeeded = GetDeviceGammaRamp(hdc, (LPVOID)ramp);
+        if (!succeeded) {
+            WIN_SetError("GetDeviceGammaRamp()");
+        }
+        DeleteDC(hdc);
+    }
+    return succeeded ? 0 : -1;
+}
+
+void
+WIN_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
+{
+    WIN_UpdateClipCursor(window);
+
+    if (window->flags & SDL_WINDOW_FULLSCREEN) {
+        UINT flags = SWP_NOCOPYBITS | SWP_NOMOVE | SWP_NOSIZE;
+
+        if (!(window->flags & SDL_WINDOW_SHOWN)) {
+            flags |= SWP_NOACTIVATE;
+        }
+        WIN_SetWindowPositionInternal(_this, window, flags);
+    }
+}
+
+void
+WIN_DestroyWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+
+    if (data) {
+        ReleaseDC(data->hwnd, data->hdc);
+        if (data->created) {
+            DestroyWindow(data->hwnd);
+        } else {
+            /* Restore any original event handler... */
+            if (data->wndproc != NULL) {
+#ifdef GWLP_WNDPROC
+                SetWindowLongPtr(data->hwnd, GWLP_WNDPROC,
+                                 (LONG_PTR) data->wndproc);
+#else
+                SetWindowLong(data->hwnd, GWL_WNDPROC,
+                              (LONG_PTR) data->wndproc);
+#endif
+            }
+        }
+        SDL_free(data);
+    }
+}
+
+SDL_bool
+WIN_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
+{
+    HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
+    if (info->version.major <= SDL_MAJOR_VERSION) {
+        info->subsystem = SDL_SYSWM_WINDOWS;
+        info->info.win.window = hwnd;
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("Application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+}
+
+
+/*
+ * Creates a HelperWindow used for DirectInput events.
+ */
+int
+SDL_HelperWindowCreate(void)
+{
+    HINSTANCE hInstance = GetModuleHandle(NULL);
+    WNDCLASS wce;
+
+    /* Make sure window isn't created twice. */
+    if (SDL_HelperWindow != NULL) {
+        return 0;
+    }
+
+    /* Create the class. */
+    SDL_zero(wce);
+    wce.lpfnWndProc = DefWindowProc;
+    wce.lpszClassName = (LPCWSTR) SDL_HelperWindowClassName;
+    wce.hInstance = hInstance;
+
+    /* Register the class. */
+    SDL_HelperWindowClass = RegisterClass(&wce);
+    if (SDL_HelperWindowClass == 0 && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) {
+        return WIN_SetError("Unable to create Helper Window Class");
+    }
+
+    /* Create the window. */
+    SDL_HelperWindow = CreateWindowEx(0, SDL_HelperWindowClassName,
+                                      SDL_HelperWindowName,
+                                      WS_OVERLAPPED, CW_USEDEFAULT,
+                                      CW_USEDEFAULT, CW_USEDEFAULT,
+                                      CW_USEDEFAULT, HWND_MESSAGE, NULL,
+                                      hInstance, NULL);
+    if (SDL_HelperWindow == NULL) {
+        UnregisterClass(SDL_HelperWindowClassName, hInstance);
+        return WIN_SetError("Unable to create Helper Window");
+    }
+
+    return 0;
+}
+
+
+/*
+ * Destroys the HelperWindow previously created with SDL_HelperWindowCreate.
+ */
+void
+SDL_HelperWindowDestroy(void)
+{
+    HINSTANCE hInstance = GetModuleHandle(NULL);
+
+    /* Destroy the window. */
+    if (SDL_HelperWindow != NULL) {
+        if (DestroyWindow(SDL_HelperWindow) == 0) {
+            WIN_SetError("Unable to destroy Helper Window");
+            return;
+        }
+        SDL_HelperWindow = NULL;
+    }
+
+    /* Unregister the class. */
+    if (SDL_HelperWindowClass != 0) {
+        if ((UnregisterClass(SDL_HelperWindowClassName, hInstance)) == 0) {
+            WIN_SetError("Unable to destroy Helper Window Class");
+            return;
+        }
+        SDL_HelperWindowClass = 0;
+    }
+}
+
+void WIN_OnWindowEnter(_THIS, SDL_Window * window)
+{
+#ifdef WM_MOUSELEAVE
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    TRACKMOUSEEVENT trackMouseEvent;
+
+    if (!data || !data->hwnd) {
+        /* The window wasn't fully initialized */
+        return;
+    }
+
+    trackMouseEvent.cbSize = sizeof(TRACKMOUSEEVENT);
+    trackMouseEvent.dwFlags = TME_LEAVE;
+    trackMouseEvent.hwndTrack = data->hwnd;
+
+    TrackMouseEvent(&trackMouseEvent);
+#endif /* WM_MOUSELEAVE */
+}
+
+void
+WIN_UpdateClipCursor(SDL_Window *window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    /* Don't clip the cursor while we're in the modal resize or move loop */
+    if (data->in_title_click || data->in_modal_loop) {
+        ClipCursor(NULL);
+        return;
+    }
+
+    if ((mouse->relative_mode || (window->flags & SDL_WINDOW_INPUT_GRABBED)) &&
+        (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
+        if (mouse->relative_mode && !mouse->relative_mode_warp) {
+            LONG cx, cy;
+            RECT rect;
+            GetWindowRect(data->hwnd, &rect);
+
+            cx = (rect.left + rect.right) / 2;
+            cy = (rect.top + rect.bottom) / 2;
+
+            /* Make an absurdly small clip rect */
+            rect.left = cx - 1;
+            rect.right = cx + 1;
+            rect.top = cy - 1;
+            rect.bottom = cy + 1;
+
+            ClipCursor(&rect);
+        } else {
+            RECT rect;
+            if (GetClientRect(data->hwnd, &rect) && !IsRectEmpty(&rect)) {
+                ClientToScreen(data->hwnd, (LPPOINT) & rect);
+                ClientToScreen(data->hwnd, (LPPOINT) & rect + 1);
+                ClipCursor(&rect);
+            }
+        }
+    } else {
+        ClipCursor(NULL);
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINDOWS */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/SDL_windowswindow.h b/Source/3rd Party/sdl/src/video/windows/SDL_windowswindow.h
new file mode 100644
index 000000000..c42888744
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/SDL_windowswindow.h	
@@ -0,0 +1,74 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_windowswindow_h
+#define _SDL_windowswindow_h
+
+#if SDL_VIDEO_OPENGL_EGL   
+#include "../SDL_egl_c.h"
+#endif
+
+typedef struct
+{
+    SDL_Window *window;
+    HWND hwnd;
+    HDC hdc;
+    HDC mdc;
+    HBITMAP hbm;
+    WNDPROC wndproc;
+    SDL_bool created;
+    WPARAM mouse_button_flags;
+    BOOL expected_resize;
+    SDL_bool in_title_click;
+    SDL_bool in_modal_loop;
+    struct SDL_VideoData *videodata;
+#if SDL_VIDEO_OPENGL_EGL  
+    EGLSurface egl_surface;
+#endif
+} SDL_WindowData;
+
+extern int WIN_CreateWindow(_THIS, SDL_Window * window);
+extern int WIN_CreateWindowFrom(_THIS, SDL_Window * window, const void *data);
+extern void WIN_SetWindowTitle(_THIS, SDL_Window * window);
+extern void WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
+extern void WIN_SetWindowPosition(_THIS, SDL_Window * window);
+extern void WIN_SetWindowSize(_THIS, SDL_Window * window);
+extern void WIN_ShowWindow(_THIS, SDL_Window * window);
+extern void WIN_HideWindow(_THIS, SDL_Window * window);
+extern void WIN_RaiseWindow(_THIS, SDL_Window * window);
+extern void WIN_MaximizeWindow(_THIS, SDL_Window * window);
+extern void WIN_MinimizeWindow(_THIS, SDL_Window * window);
+extern void WIN_RestoreWindow(_THIS, SDL_Window * window);
+extern void WIN_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered);
+extern void WIN_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen);
+extern int WIN_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp);
+extern int WIN_GetWindowGammaRamp(_THIS, SDL_Window * window, Uint16 * ramp);
+extern void WIN_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
+extern void WIN_DestroyWindow(_THIS, SDL_Window * window);
+extern SDL_bool WIN_GetWindowWMInfo(_THIS, SDL_Window * window,
+                                    struct SDL_SysWMinfo *info);
+extern void WIN_OnWindowEnter(_THIS, SDL_Window * window);
+extern void WIN_UpdateClipCursor(SDL_Window *window);
+
+#endif /* _SDL_windowswindow_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/windows/wmmsg.h b/Source/3rd Party/sdl/src/video/windows/wmmsg.h
new file mode 100644
index 000000000..ea4639630
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/windows/wmmsg.h	
@@ -0,0 +1,1052 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#define MAX_WMMSG   (sizeof(wmtab)/sizeof(wmtab[0]))
+
+char *wmtab[] = {
+    "WM_NULL",
+    "WM_CREATE",
+    "WM_DESTROY",
+    "WM_MOVE",
+    "UNKNOWN (4)",
+    "WM_SIZE",
+    "WM_ACTIVATE",
+    "WM_SETFOCUS",
+    "WM_KILLFOCUS",
+    "UNKNOWN (9)",
+    "WM_ENABLE",
+    "WM_SETREDRAW",
+    "WM_SETTEXT",
+    "WM_GETTEXT",
+    "WM_GETTEXTLENGTH",
+    "WM_PAINT",
+    "WM_CLOSE",
+    "WM_QUERYENDSESSION",
+    "WM_QUIT",
+    "WM_QUERYOPEN",
+    "WM_ERASEBKGND",
+    "WM_SYSCOLORCHANGE",
+    "WM_ENDSESSION",
+    "UNKNOWN (23)",
+    "WM_SHOWWINDOW",
+    "UNKNOWN (25)",
+    "WM_SETTINGCHANGE",
+    "WM_DEVMODECHANGE",
+    "WM_ACTIVATEAPP",
+    "WM_FONTCHANGE",
+    "WM_TIMECHANGE",
+    "WM_CANCELMODE",
+    "WM_SETCURSOR",
+    "WM_MOUSEACTIVATE",
+    "WM_CHILDACTIVATE",
+    "WM_QUEUESYNC",
+    "WM_GETMINMAXINFO",
+    "UNKNOWN (37)",
+    "WM_PAINTICON",
+    "WM_ICONERASEBKGND",
+    "WM_NEXTDLGCTL",
+    "UNKNOWN (41)",
+    "WM_SPOOLERSTATUS",
+    "WM_DRAWITEM",
+    "WM_MEASUREITEM",
+    "WM_DELETEITEM",
+    "WM_VKEYTOITEM",
+    "WM_CHARTOITEM",
+    "WM_SETFONT",
+    "WM_GETFONT",
+    "WM_SETHOTKEY",
+    "WM_GETHOTKEY",
+    "UNKNOWN (52)",
+    "UNKNOWN (53)",
+    "UNKNOWN (54)",
+    "WM_QUERYDRAGICON",
+    "UNKNOWN (56)",
+    "WM_COMPAREITEM",
+    "UNKNOWN (58)",
+    "UNKNOWN (59)",
+    "UNKNOWN (60)",
+    "WM_GETOBJECT",
+    "UNKNOWN (62)",
+    "UNKNOWN (63)",
+    "UNKNOWN (64)",
+    "WM_COMPACTING",
+    "UNKNOWN (66)",
+    "UNKNOWN (67)",
+    "WM_COMMNOTIFY",
+    "UNKNOWN (69)",
+    "WM_WINDOWPOSCHANGING",
+    "WM_WINDOWPOSCHANGED",
+    "WM_POWER",
+    "UNKNOWN (73)",
+    "WM_COPYDATA",
+    "WM_CANCELJOURNAL",
+    "UNKNOWN (76)",
+    "UNKNOWN (77)",
+    "WM_NOTIFY",
+    "UNKNOWN (79)",
+    "WM_INPUTLANGCHANGEREQUEST",
+    "WM_INPUTLANGCHANGE",
+    "WM_TCARD",
+    "WM_HELP",
+    "WM_USERCHANGED",
+    "WM_NOTIFYFORMAT",
+    "UNKNOWN (86)",
+    "UNKNOWN (87)",
+    "UNKNOWN (88)",
+    "UNKNOWN (89)",
+    "UNKNOWN (90)",
+    "UNKNOWN (91)",
+    "UNKNOWN (92)",
+    "UNKNOWN (93)",
+    "UNKNOWN (94)",
+    "UNKNOWN (95)",
+    "UNKNOWN (96)",
+    "UNKNOWN (97)",
+    "UNKNOWN (98)",
+    "UNKNOWN (99)",
+    "UNKNOWN (100)",
+    "UNKNOWN (101)",
+    "UNKNOWN (102)",
+    "UNKNOWN (103)",
+    "UNKNOWN (104)",
+    "UNKNOWN (105)",
+    "UNKNOWN (106)",
+    "UNKNOWN (107)",
+    "UNKNOWN (108)",
+    "UNKNOWN (109)",
+    "UNKNOWN (110)",
+    "UNKNOWN (111)",
+    "UNKNOWN (112)",
+    "UNKNOWN (113)",
+    "UNKNOWN (114)",
+    "UNKNOWN (115)",
+    "UNKNOWN (116)",
+    "UNKNOWN (117)",
+    "UNKNOWN (118)",
+    "UNKNOWN (119)",
+    "UNKNOWN (120)",
+    "UNKNOWN (121)",
+    "UNKNOWN (122)",
+    "WM_CONTEXTMENU",
+    "WM_STYLECHANGING",
+    "WM_STYLECHANGED",
+    "WM_DISPLAYCHANGE",
+    "WM_GETICON",
+    "WM_SETICON",
+    "WM_NCCREATE",
+    "WM_NCDESTROY",
+    "WM_NCCALCSIZE",
+    "WM_NCHITTEST",
+    "WM_NCPAINT",
+    "WM_NCACTIVATE",
+    "WM_GETDLGCODE",
+    "WM_SYNCPAINT",
+    "UNKNOWN (137)",
+    "UNKNOWN (138)",
+    "UNKNOWN (139)",
+    "UNKNOWN (140)",
+    "UNKNOWN (141)",
+    "UNKNOWN (142)",
+    "UNKNOWN (143)",
+    "UNKNOWN (144)",
+    "UNKNOWN (145)",
+    "UNKNOWN (146)",
+    "UNKNOWN (147)",
+    "UNKNOWN (148)",
+    "UNKNOWN (149)",
+    "UNKNOWN (150)",
+    "UNKNOWN (151)",
+    "UNKNOWN (152)",
+    "UNKNOWN (153)",
+    "UNKNOWN (154)",
+    "UNKNOWN (155)",
+    "UNKNOWN (156)",
+    "UNKNOWN (157)",
+    "UNKNOWN (158)",
+    "UNKNOWN (159)",
+    "WM_NCMOUSEMOVE",
+    "WM_NCLBUTTONDOWN",
+    "WM_NCLBUTTONUP",
+    "WM_NCLBUTTONDBLCLK",
+    "WM_NCRBUTTONDOWN",
+    "WM_NCRBUTTONUP",
+    "WM_NCRBUTTONDBLCLK",
+    "WM_NCMBUTTONDOWN",
+    "WM_NCMBUTTONUP",
+    "WM_NCMBUTTONDBLCLK",
+    "UNKNOWN (170)",
+    "UNKNOWN (171)",
+    "UNKNOWN (172)",
+    "UNKNOWN (173)",
+    "UNKNOWN (174)",
+    "UNKNOWN (175)",
+    "UNKNOWN (176)",
+    "UNKNOWN (177)",
+    "UNKNOWN (178)",
+    "UNKNOWN (179)",
+    "UNKNOWN (180)",
+    "UNKNOWN (181)",
+    "UNKNOWN (182)",
+    "UNKNOWN (183)",
+    "UNKNOWN (184)",
+    "UNKNOWN (185)",
+    "UNKNOWN (186)",
+    "UNKNOWN (187)",
+    "UNKNOWN (188)",
+    "UNKNOWN (189)",
+    "UNKNOWN (190)",
+    "UNKNOWN (191)",
+    "UNKNOWN (192)",
+    "UNKNOWN (193)",
+    "UNKNOWN (194)",
+    "UNKNOWN (195)",
+    "UNKNOWN (196)",
+    "UNKNOWN (197)",
+    "UNKNOWN (198)",
+    "UNKNOWN (199)",
+    "UNKNOWN (200)",
+    "UNKNOWN (201)",
+    "UNKNOWN (202)",
+    "UNKNOWN (203)",
+    "UNKNOWN (204)",
+    "UNKNOWN (205)",
+    "UNKNOWN (206)",
+    "UNKNOWN (207)",
+    "UNKNOWN (208)",
+    "UNKNOWN (209)",
+    "UNKNOWN (210)",
+    "UNKNOWN (211)",
+    "UNKNOWN (212)",
+    "UNKNOWN (213)",
+    "UNKNOWN (214)",
+    "UNKNOWN (215)",
+    "UNKNOWN (216)",
+    "UNKNOWN (217)",
+    "UNKNOWN (218)",
+    "UNKNOWN (219)",
+    "UNKNOWN (220)",
+    "UNKNOWN (221)",
+    "UNKNOWN (222)",
+    "UNKNOWN (223)",
+    "UNKNOWN (224)",
+    "UNKNOWN (225)",
+    "UNKNOWN (226)",
+    "UNKNOWN (227)",
+    "UNKNOWN (228)",
+    "UNKNOWN (229)",
+    "UNKNOWN (230)",
+    "UNKNOWN (231)",
+    "UNKNOWN (232)",
+    "UNKNOWN (233)",
+    "UNKNOWN (234)",
+    "UNKNOWN (235)",
+    "UNKNOWN (236)",
+    "UNKNOWN (237)",
+    "UNKNOWN (238)",
+    "UNKNOWN (239)",
+    "UNKNOWN (240)",
+    "UNKNOWN (241)",
+    "UNKNOWN (242)",
+    "UNKNOWN (243)",
+    "UNKNOWN (244)",
+    "UNKNOWN (245)",
+    "UNKNOWN (246)",
+    "UNKNOWN (247)",
+    "UNKNOWN (248)",
+    "UNKNOWN (249)",
+    "UNKNOWN (250)",
+    "UNKNOWN (251)",
+    "UNKNOWN (252)",
+    "UNKNOWN (253)",
+    "UNKNOWN (254)",
+    "WM_INPUT",
+    "WM_KEYDOWN",
+    "WM_KEYUP",
+    "WM_CHAR",
+    "WM_DEADCHAR",
+    "WM_SYSKEYDOWN",
+    "WM_SYSKEYUP",
+    "WM_SYSCHAR",
+    "WM_SYSDEADCHAR",
+    "WM_KEYLAST",
+    "UNKNOWN (265)",
+    "UNKNOWN (266)",
+    "UNKNOWN (267)",
+    "UNKNOWN (268)",
+    "UNKNOWN (269)",
+    "UNKNOWN (270)",
+    "UNKNOWN (271)",
+    "WM_INITDIALOG",
+    "WM_COMMAND",
+    "WM_SYSCOMMAND",
+    "WM_TIMER",
+    "WM_HSCROLL",
+    "WM_VSCROLL",
+    "WM_INITMENU",
+    "WM_INITMENUPOPUP",
+    "UNKNOWN (280)",
+    "WM_GESTURE",
+    "UNKNOWN (282)",
+    "UNKNOWN (283)",
+    "UNKNOWN (284)",
+    "UNKNOWN (285)",
+    "UNKNOWN (286)",
+    "WM_MENUSELECT",
+    "WM_MENUCHAR",
+    "WM_ENTERIDLE",
+    "WM_MENURBUTTONUP",
+    "WM_MENUDRAG",
+    "WM_MENUGETOBJECT",
+    "WM_UNINITMENUPOPUP",
+    "WM_MENUCOMMAND",
+    "UNKNOWN (295)",
+    "UNKNOWN (296)",
+    "UNKNOWN (297)",
+    "UNKNOWN (298)",
+    "UNKNOWN (299)",
+    "UNKNOWN (300)",
+    "UNKNOWN (301)",
+    "UNKNOWN (302)",
+    "UNKNOWN (303)",
+    "UNKNOWN (304)",
+    "UNKNOWN (305)",
+    "WM_CTLCOLORMSGBOX",
+    "WM_CTLCOLOREDIT",
+    "WM_CTLCOLORLISTBOX",
+    "WM_CTLCOLORBTN",
+    "WM_CTLCOLORDLG",
+    "WM_CTLCOLORSCROLLBAR",
+    "WM_CTLCOLORSTATIC",
+    "UNKNOWN (313)",
+    "UNKNOWN (314)",
+    "UNKNOWN (315)",
+    "UNKNOWN (316)",
+    "UNKNOWN (317)",
+    "UNKNOWN (318)",
+    "UNKNOWN (319)",
+    "UNKNOWN (320)",
+    "UNKNOWN (321)",
+    "UNKNOWN (322)",
+    "UNKNOWN (323)",
+    "UNKNOWN (324)",
+    "UNKNOWN (325)",
+    "UNKNOWN (326)",
+    "UNKNOWN (327)",
+    "UNKNOWN (328)",
+    "UNKNOWN (329)",
+    "UNKNOWN (330)",
+    "UNKNOWN (331)",
+    "UNKNOWN (332)",
+    "UNKNOWN (333)",
+    "UNKNOWN (334)",
+    "UNKNOWN (335)",
+    "UNKNOWN (336)",
+    "UNKNOWN (337)",
+    "UNKNOWN (338)",
+    "UNKNOWN (339)",
+    "UNKNOWN (340)",
+    "UNKNOWN (341)",
+    "UNKNOWN (342)",
+    "UNKNOWN (343)",
+    "UNKNOWN (344)",
+    "UNKNOWN (345)",
+    "UNKNOWN (346)",
+    "UNKNOWN (347)",
+    "UNKNOWN (348)",
+    "UNKNOWN (349)",
+    "UNKNOWN (350)",
+    "UNKNOWN (351)",
+    "UNKNOWN (352)",
+    "UNKNOWN (353)",
+    "UNKNOWN (354)",
+    "UNKNOWN (355)",
+    "UNKNOWN (356)",
+    "UNKNOWN (357)",
+    "UNKNOWN (358)",
+    "UNKNOWN (359)",
+    "UNKNOWN (360)",
+    "UNKNOWN (361)",
+    "UNKNOWN (362)",
+    "UNKNOWN (363)",
+    "UNKNOWN (364)",
+    "UNKNOWN (365)",
+    "UNKNOWN (366)",
+    "UNKNOWN (367)",
+    "UNKNOWN (368)",
+    "UNKNOWN (369)",
+    "UNKNOWN (370)",
+    "UNKNOWN (371)",
+    "UNKNOWN (372)",
+    "UNKNOWN (373)",
+    "UNKNOWN (374)",
+    "UNKNOWN (375)",
+    "UNKNOWN (376)",
+    "UNKNOWN (377)",
+    "UNKNOWN (378)",
+    "UNKNOWN (379)",
+    "UNKNOWN (380)",
+    "UNKNOWN (381)",
+    "UNKNOWN (382)",
+    "UNKNOWN (383)",
+    "UNKNOWN (384)",
+    "UNKNOWN (385)",
+    "UNKNOWN (386)",
+    "UNKNOWN (387)",
+    "UNKNOWN (388)",
+    "UNKNOWN (389)",
+    "UNKNOWN (390)",
+    "UNKNOWN (391)",
+    "UNKNOWN (392)",
+    "UNKNOWN (393)",
+    "UNKNOWN (394)",
+    "UNKNOWN (395)",
+    "UNKNOWN (396)",
+    "UNKNOWN (397)",
+    "UNKNOWN (398)",
+    "UNKNOWN (399)",
+    "UNKNOWN (400)",
+    "UNKNOWN (401)",
+    "UNKNOWN (402)",
+    "UNKNOWN (403)",
+    "UNKNOWN (404)",
+    "UNKNOWN (405)",
+    "UNKNOWN (406)",
+    "UNKNOWN (407)",
+    "UNKNOWN (408)",
+    "UNKNOWN (409)",
+    "UNKNOWN (410)",
+    "UNKNOWN (411)",
+    "UNKNOWN (412)",
+    "UNKNOWN (413)",
+    "UNKNOWN (414)",
+    "UNKNOWN (415)",
+    "UNKNOWN (416)",
+    "UNKNOWN (417)",
+    "UNKNOWN (418)",
+    "UNKNOWN (419)",
+    "UNKNOWN (420)",
+    "UNKNOWN (421)",
+    "UNKNOWN (422)",
+    "UNKNOWN (423)",
+    "UNKNOWN (424)",
+    "UNKNOWN (425)",
+    "UNKNOWN (426)",
+    "UNKNOWN (427)",
+    "UNKNOWN (428)",
+    "UNKNOWN (429)",
+    "UNKNOWN (430)",
+    "UNKNOWN (431)",
+    "UNKNOWN (432)",
+    "UNKNOWN (433)",
+    "UNKNOWN (434)",
+    "UNKNOWN (435)",
+    "UNKNOWN (436)",
+    "UNKNOWN (437)",
+    "UNKNOWN (438)",
+    "UNKNOWN (439)",
+    "UNKNOWN (440)",
+    "UNKNOWN (441)",
+    "UNKNOWN (442)",
+    "UNKNOWN (443)",
+    "UNKNOWN (444)",
+    "UNKNOWN (445)",
+    "UNKNOWN (446)",
+    "UNKNOWN (447)",
+    "UNKNOWN (448)",
+    "UNKNOWN (449)",
+    "UNKNOWN (450)",
+    "UNKNOWN (451)",
+    "UNKNOWN (452)",
+    "UNKNOWN (453)",
+    "UNKNOWN (454)",
+    "UNKNOWN (455)",
+    "UNKNOWN (456)",
+    "UNKNOWN (457)",
+    "UNKNOWN (458)",
+    "UNKNOWN (459)",
+    "UNKNOWN (460)",
+    "UNKNOWN (461)",
+    "UNKNOWN (462)",
+    "UNKNOWN (463)",
+    "UNKNOWN (464)",
+    "UNKNOWN (465)",
+    "UNKNOWN (466)",
+    "UNKNOWN (467)",
+    "UNKNOWN (468)",
+    "UNKNOWN (469)",
+    "UNKNOWN (470)",
+    "UNKNOWN (471)",
+    "UNKNOWN (472)",
+    "UNKNOWN (473)",
+    "UNKNOWN (474)",
+    "UNKNOWN (475)",
+    "UNKNOWN (476)",
+    "UNKNOWN (477)",
+    "UNKNOWN (478)",
+    "UNKNOWN (479)",
+    "UNKNOWN (480)",
+    "UNKNOWN (481)",
+    "UNKNOWN (482)",
+    "UNKNOWN (483)",
+    "UNKNOWN (484)",
+    "UNKNOWN (485)",
+    "UNKNOWN (486)",
+    "UNKNOWN (487)",
+    "UNKNOWN (488)",
+    "UNKNOWN (489)",
+    "UNKNOWN (490)",
+    "UNKNOWN (491)",
+    "UNKNOWN (492)",
+    "UNKNOWN (493)",
+    "UNKNOWN (494)",
+    "UNKNOWN (495)",
+    "UNKNOWN (496)",
+    "UNKNOWN (497)",
+    "UNKNOWN (498)",
+    "UNKNOWN (499)",
+    "UNKNOWN (500)",
+    "UNKNOWN (501)",
+    "UNKNOWN (502)",
+    "UNKNOWN (503)",
+    "UNKNOWN (504)",
+    "UNKNOWN (505)",
+    "UNKNOWN (506)",
+    "UNKNOWN (507)",
+    "UNKNOWN (508)",
+    "UNKNOWN (509)",
+    "UNKNOWN (510)",
+    "UNKNOWN (511)",
+    "WM_MOUSEMOVE",
+    "WM_LBUTTONDOWN",
+    "WM_LBUTTONUP",
+    "WM_LBUTTONDBLCLK",
+    "WM_RBUTTONDOWN",
+    "WM_RBUTTONUP",
+    "WM_RBUTTONDBLCLK",
+    "WM_MBUTTONDOWN",
+    "WM_MBUTTONUP",
+    "WM_MOUSELAST",
+    "WM_MOUSEWHEEL",
+    "WM_XBUTTONDOWN",
+    "WM_XBUTTONUP",
+    "UNKNOWN (525)",
+    "UNKNOWN (526)",
+    "UNKNOWN (527)",
+    "WM_PARENTNOTIFY",
+    "WM_ENTERMENULOOP",
+    "WM_EXITMENULOOP",
+    "WM_NEXTMENU",
+    "WM_SIZING",
+    "WM_CAPTURECHANGED",
+    "WM_MOVING",
+    "UNKNOWN (535)",
+    "WM_POWERBROADCAST",
+    "WM_DEVICECHANGE",
+    "UNKNOWN (538)",
+    "UNKNOWN (539)",
+    "UNKNOWN (540)",
+    "UNKNOWN (541)",
+    "UNKNOWN (542)",
+    "UNKNOWN (543)",
+    "WM_MDICREATE",
+    "WM_MDIDESTROY",
+    "WM_MDIACTIVATE",
+    "WM_MDIRESTORE",
+    "WM_MDINEXT",
+    "WM_MDIMAXIMIZE",
+    "WM_MDITILE",
+    "WM_MDICASCADE",
+    "WM_MDIICONARRANGE",
+    "WM_MDIGETACTIVE",
+    "UNKNOWN (554)",
+    "UNKNOWN (555)",
+    "UNKNOWN (556)",
+    "UNKNOWN (557)",
+    "UNKNOWN (558)",
+    "UNKNOWN (559)",
+    "WM_MDISETMENU",
+    "WM_ENTERSIZEMOVE",
+    "WM_EXITSIZEMOVE",
+    "WM_DROPFILES",
+    "WM_MDIREFRESHMENU",
+    "UNKNOWN (565)",
+    "UNKNOWN (566)",
+    "UNKNOWN (567)",
+    "WM_POINTERDEVICECHANGE",
+    "WM_POINTERDEVICEINRANGE",
+    "WM_POINTERDEVICEOUTOFRANGE",
+    "UNKNOWN (571)",
+    "UNKNOWN (572)",
+    "UNKNOWN (573)",
+    "UNKNOWN (574)",
+    "UNKNOWN (575)",
+    "WM_TOUCH",
+    "WM_NCPOINTERUPDATE",
+    "WM_NCPOINTERDOWN",
+    "WM_NCPOINTERUP",
+    "UNKNOWN (580)",
+    "WM_POINTERUPDATE",
+    "WM_POINTERDOWN",
+    "WM_POINTERUP",
+    "WM_POINTERENTER",
+    "WM_POINTERLEAVE",
+    "WM_POINTERACTIVATE",
+    "WM_POINTERCAPTURECHANGED",
+    "WM_TOUCHHITTESTING",
+    "WM_POINTERWHEEL",
+    "WM_POINTERHWHEEL",
+    "DM_POINTERHITTEST",
+    "UNKNOWN (592)",
+    "UNKNOWN (593)",
+    "UNKNOWN (594)",
+    "UNKNOWN (595)",
+    "UNKNOWN (596)",
+    "UNKNOWN (597)",
+    "UNKNOWN (598)",
+    "UNKNOWN (599)",
+    "UNKNOWN (600)",
+    "UNKNOWN (601)",
+    "UNKNOWN (602)",
+    "UNKNOWN (603)",
+    "UNKNOWN (604)",
+    "UNKNOWN (605)",
+    "UNKNOWN (606)",
+    "UNKNOWN (607)",
+    "UNKNOWN (608)",
+    "UNKNOWN (609)",
+    "UNKNOWN (610)",
+    "UNKNOWN (611)",
+    "UNKNOWN (612)",
+    "UNKNOWN (613)",
+    "UNKNOWN (614)",
+    "UNKNOWN (615)",
+    "UNKNOWN (616)",
+    "UNKNOWN (617)",
+    "UNKNOWN (618)",
+    "UNKNOWN (619)",
+    "UNKNOWN (620)",
+    "UNKNOWN (621)",
+    "UNKNOWN (622)",
+    "UNKNOWN (623)",
+    "UNKNOWN (624)",
+    "UNKNOWN (625)",
+    "UNKNOWN (626)",
+    "UNKNOWN (627)",
+    "UNKNOWN (628)",
+    "UNKNOWN (629)",
+    "UNKNOWN (630)",
+    "UNKNOWN (631)",
+    "UNKNOWN (632)",
+    "UNKNOWN (633)",
+    "UNKNOWN (634)",
+    "UNKNOWN (635)",
+    "UNKNOWN (636)",
+    "UNKNOWN (637)",
+    "UNKNOWN (638)",
+    "UNKNOWN (639)",
+    "UNKNOWN (640)",
+    "WM_IME_SETCONTEXT",
+    "WM_IME_NOTIFY",
+    "WM_IME_CONTROL",
+    "WM_IME_COMPOSITIONFULL",
+    "WM_IME_SELECT",
+    "WM_IME_CHAR",
+    "UNKNOWN (647)",
+    "WM_IME_REQUEST",
+    "UNKNOWN (649)",
+    "UNKNOWN (650)",
+    "UNKNOWN (651)",
+    "UNKNOWN (652)",
+    "UNKNOWN (653)",
+    "UNKNOWN (654)",
+    "UNKNOWN (655)",
+    "WM_IME_KEYDOWN",
+    "WM_IME_KEYUP",
+    "UNKNOWN (658)",
+    "UNKNOWN (659)",
+    "UNKNOWN (660)",
+    "UNKNOWN (661)",
+    "UNKNOWN (662)",
+    "UNKNOWN (663)",
+    "UNKNOWN (664)",
+    "UNKNOWN (665)",
+    "UNKNOWN (666)",
+    "UNKNOWN (667)",
+    "UNKNOWN (668)",
+    "UNKNOWN (669)",
+    "UNKNOWN (670)",
+    "UNKNOWN (671)",
+    "WM_NCMOUSEHOVER",
+    "WM_MOUSEHOVER",
+    "WM_NCMOUSELEAVE",
+    "WM_MOUSELEAVE",
+    "UNKNOWN (676)",
+    "UNKNOWN (677)",
+    "UNKNOWN (678)",
+    "UNKNOWN (679)",
+    "UNKNOWN (680)",
+    "UNKNOWN (681)",
+    "UNKNOWN (682)",
+    "UNKNOWN (683)",
+    "UNKNOWN (684)",
+    "UNKNOWN (685)",
+    "UNKNOWN (686)",
+    "UNKNOWN (687)",
+    "UNKNOWN (688)",
+    "WM_WTSSESSION_CHANGE",
+    "UNKNOWN (690)",
+    "UNKNOWN (691)",
+    "UNKNOWN (692)",
+    "UNKNOWN (693)",
+    "UNKNOWN (694)",
+    "UNKNOWN (695)",
+    "UNKNOWN (696)",
+    "UNKNOWN (697)",
+    "UNKNOWN (698)",
+    "UNKNOWN (699)",
+    "UNKNOWN (700)",
+    "UNKNOWN (701)",
+    "UNKNOWN (702)",
+    "UNKNOWN (703)",
+    "UNKNOWN (704)",
+    "UNKNOWN (705)",
+    "UNKNOWN (706)",
+    "UNKNOWN (707)",
+    "UNKNOWN (708)",
+    "UNKNOWN (709)",
+    "UNKNOWN (710)",
+    "UNKNOWN (711)",
+    "UNKNOWN (712)",
+    "UNKNOWN (713)",
+    "UNKNOWN (714)",
+    "UNKNOWN (715)",
+    "UNKNOWN (716)",
+    "UNKNOWN (717)",
+    "UNKNOWN (718)",
+    "UNKNOWN (719)",
+    "UNKNOWN (720)",
+    "UNKNOWN (721)",
+    "UNKNOWN (722)",
+    "UNKNOWN (723)",
+    "UNKNOWN (724)",
+    "UNKNOWN (725)",
+    "UNKNOWN (726)",
+    "UNKNOWN (727)",
+    "UNKNOWN (728)",
+    "UNKNOWN (729)",
+    "UNKNOWN (730)",
+    "UNKNOWN (731)",
+    "UNKNOWN (732)",
+    "UNKNOWN (733)",
+    "UNKNOWN (734)",
+    "UNKNOWN (735)",
+    "WM_DPICHANGED",
+    "UNKNOWN (737)",
+    "UNKNOWN (738)",
+    "UNKNOWN (739)",
+    "UNKNOWN (740)",
+    "UNKNOWN (741)",
+    "UNKNOWN (742)",
+    "UNKNOWN (743)",
+    "UNKNOWN (744)",
+    "UNKNOWN (745)",
+    "UNKNOWN (746)",
+    "UNKNOWN (747)",
+    "UNKNOWN (748)",
+    "UNKNOWN (749)",
+    "UNKNOWN (750)",
+    "UNKNOWN (751)",
+    "UNKNOWN (752)",
+    "UNKNOWN (753)",
+    "UNKNOWN (754)",
+    "UNKNOWN (755)",
+    "UNKNOWN (756)",
+    "UNKNOWN (757)",
+    "UNKNOWN (758)",
+    "UNKNOWN (759)",
+    "UNKNOWN (760)",
+    "UNKNOWN (761)",
+    "UNKNOWN (762)",
+    "UNKNOWN (763)",
+    "UNKNOWN (764)",
+    "UNKNOWN (765)",
+    "UNKNOWN (766)",
+    "UNKNOWN (767)",
+    "WM_CUT",
+    "WM_COPY",
+    "WM_PASTE",
+    "WM_CLEAR",
+    "WM_UNDO",
+    "WM_RENDERFORMAT",
+    "WM_RENDERALLFORMATS",
+    "WM_DESTROYCLIPBOARD",
+    "WM_DRAWCLIPBOARD",
+    "WM_PAINTCLIPBOARD",
+    "WM_VSCROLLCLIPBOARD",
+    "WM_SIZECLIPBOARD",
+    "WM_ASKCBFORMATNAME",
+    "WM_CHANGECBCHAIN",
+    "WM_HSCROLLCLIPBOARD",
+    "WM_QUERYNEWPALETTE",
+    "WM_PALETTEISCHANGING",
+    "WM_PALETTECHANGED",
+    "WM_HOTKEY",
+    "UNKNOWN (787)",
+    "UNKNOWN (788)",
+    "UNKNOWN (789)",
+    "UNKNOWN (790)",
+    "WM_PRINT",
+    "WM_PRINTCLIENT",
+    "WM_APPCOMMAND",
+    "WM_THEMECHANGED",
+    "UNKNOWN (795)",
+    "UNKNOWN (796)",
+    "WM_CLIPBOARDUPDATE",
+    "WM_DWMCOMPOSITIONCHANGED",
+    "WM_DWMNCRENDERINGCHANGED",
+    "WM_DWMCOLORIZATIONCOLORCHANGED",
+    "WM_DWMWINDOWMAXIMIZEDCHANGE",
+    "UNKNOWN (802)",
+    "WM_DWMSENDICONICTHUMBNAIL",
+    "UNKNOWN (804)",
+    "UNKNOWN (805)",
+    "WM_DWMSENDICONICLIVEPREVIEWBITMAP",
+    "UNKNOWN (807)",
+    "UNKNOWN (808)",
+    "UNKNOWN (809)",
+    "UNKNOWN (810)",
+    "UNKNOWN (811)",
+    "UNKNOWN (812)",
+    "UNKNOWN (813)",
+    "UNKNOWN (814)",
+    "UNKNOWN (815)",
+    "UNKNOWN (816)",
+    "UNKNOWN (817)",
+    "UNKNOWN (818)",
+    "UNKNOWN (819)",
+    "UNKNOWN (820)",
+    "UNKNOWN (821)",
+    "UNKNOWN (822)",
+    "UNKNOWN (823)",
+    "UNKNOWN (824)",
+    "UNKNOWN (825)",
+    "UNKNOWN (826)",
+    "UNKNOWN (827)",
+    "UNKNOWN (828)",
+    "UNKNOWN (829)",
+    "UNKNOWN (830)",
+    "WM_GETTITLEBARINFOEX",
+    "UNKNOWN (832)",
+    "UNKNOWN (833)",
+    "UNKNOWN (834)",
+    "UNKNOWN (835)",
+    "UNKNOWN (836)",
+    "UNKNOWN (837)",
+    "UNKNOWN (838)",
+    "UNKNOWN (839)",
+    "UNKNOWN (840)",
+    "UNKNOWN (841)",
+    "UNKNOWN (842)",
+    "UNKNOWN (843)",
+    "UNKNOWN (844)",
+    "UNKNOWN (845)",
+    "UNKNOWN (846)",
+    "UNKNOWN (847)",
+    "UNKNOWN (848)",
+    "UNKNOWN (849)",
+    "UNKNOWN (850)",
+    "UNKNOWN (851)",
+    "UNKNOWN (852)",
+    "UNKNOWN (853)",
+    "UNKNOWN (854)",
+    "UNKNOWN (855)",
+    "WM_HANDHELDFIRST",
+    "UNKNOWN (857)",
+    "UNKNOWN (858)",
+    "UNKNOWN (859)",
+    "UNKNOWN (860)",
+    "UNKNOWN (861)",
+    "UNKNOWN (862)",
+    "WM_HANDHELDLAST",
+    "WM_AFXFIRST",
+    "UNKNOWN (865)",
+    "UNKNOWN (866)",
+    "UNKNOWN (867)",
+    "UNKNOWN (868)",
+    "UNKNOWN (869)",
+    "UNKNOWN (870)",
+    "UNKNOWN (871)",
+    "UNKNOWN (872)",
+    "UNKNOWN (873)",
+    "UNKNOWN (874)",
+    "UNKNOWN (875)",
+    "UNKNOWN (876)",
+    "UNKNOWN (877)",
+    "UNKNOWN (878)",
+    "UNKNOWN (879)",
+    "UNKNOWN (880)",
+    "UNKNOWN (881)",
+    "UNKNOWN (882)",
+    "UNKNOWN (883)",
+    "UNKNOWN (884)",
+    "UNKNOWN (885)",
+    "UNKNOWN (886)",
+    "UNKNOWN (887)",
+    "UNKNOWN (888)",
+    "UNKNOWN (889)",
+    "UNKNOWN (890)",
+    "UNKNOWN (891)",
+    "UNKNOWN (892)",
+    "UNKNOWN (893)",
+    "UNKNOWN (894)",
+    "WM_AFXLAST",
+    "WM_PENWINFIRST",
+    "UNKNOWN (897)",
+    "UNKNOWN (898)",
+    "UNKNOWN (899)",
+    "UNKNOWN (900)",
+    "UNKNOWN (901)",
+    "UNKNOWN (902)",
+    "UNKNOWN (903)",
+    "UNKNOWN (904)",
+    "UNKNOWN (905)",
+    "UNKNOWN (906)",
+    "UNKNOWN (907)",
+    "UNKNOWN (908)",
+    "UNKNOWN (909)",
+    "UNKNOWN (910)",
+    "WM_PENWINLAST",
+    "UNKNOWN (912)",
+    "UNKNOWN (913)",
+    "UNKNOWN (914)",
+    "UNKNOWN (915)",
+    "UNKNOWN (916)",
+    "UNKNOWN (917)",
+    "UNKNOWN (918)",
+    "UNKNOWN (919)",
+    "UNKNOWN (920)",
+    "UNKNOWN (921)",
+    "UNKNOWN (922)",
+    "UNKNOWN (923)",
+    "UNKNOWN (924)",
+    "UNKNOWN (925)",
+    "UNKNOWN (926)",
+    "UNKNOWN (927)",
+    "UNKNOWN (928)",
+    "UNKNOWN (929)",
+    "UNKNOWN (930)",
+    "UNKNOWN (931)",
+    "UNKNOWN (932)",
+    "UNKNOWN (933)",
+    "UNKNOWN (934)",
+    "UNKNOWN (935)",
+    "UNKNOWN (936)",
+    "UNKNOWN (937)",
+    "UNKNOWN (938)",
+    "UNKNOWN (939)",
+    "UNKNOWN (940)",
+    "UNKNOWN (941)",
+    "UNKNOWN (942)",
+    "UNKNOWN (943)",
+    "UNKNOWN (944)",
+    "UNKNOWN (945)",
+    "UNKNOWN (946)",
+    "UNKNOWN (947)",
+    "UNKNOWN (948)",
+    "UNKNOWN (949)",
+    "UNKNOWN (950)",
+    "UNKNOWN (951)",
+    "UNKNOWN (952)",
+    "UNKNOWN (953)",
+    "UNKNOWN (954)",
+    "UNKNOWN (955)",
+    "UNKNOWN (956)",
+    "UNKNOWN (957)",
+    "UNKNOWN (958)",
+    "UNKNOWN (959)",
+    "UNKNOWN (960)",
+    "UNKNOWN (961)",
+    "UNKNOWN (962)",
+    "UNKNOWN (963)",
+    "UNKNOWN (964)",
+    "UNKNOWN (965)",
+    "UNKNOWN (966)",
+    "UNKNOWN (967)",
+    "UNKNOWN (968)",
+    "UNKNOWN (969)",
+    "UNKNOWN (970)",
+    "UNKNOWN (971)",
+    "UNKNOWN (972)",
+    "UNKNOWN (973)",
+    "UNKNOWN (974)",
+    "UNKNOWN (975)",
+    "UNKNOWN (976)",
+    "UNKNOWN (977)",
+    "UNKNOWN (978)",
+    "UNKNOWN (979)",
+    "UNKNOWN (980)",
+    "UNKNOWN (981)",
+    "UNKNOWN (982)",
+    "UNKNOWN (983)",
+    "UNKNOWN (984)",
+    "UNKNOWN (985)",
+    "UNKNOWN (986)",
+    "UNKNOWN (987)",
+    "UNKNOWN (988)",
+    "UNKNOWN (989)",
+    "UNKNOWN (990)",
+    "UNKNOWN (991)",
+    "UNKNOWN (992)",
+    "UNKNOWN (993)",
+    "UNKNOWN (994)",
+    "UNKNOWN (995)",
+    "UNKNOWN (996)",
+    "UNKNOWN (997)",
+    "UNKNOWN (998)",
+    "UNKNOWN (999)",
+    "UNKNOWN (1000)",
+    "UNKNOWN (1001)",
+    "UNKNOWN (1002)",
+    "UNKNOWN (1003)",
+    "UNKNOWN (1004)",
+    "UNKNOWN (1005)",
+    "UNKNOWN (1006)",
+    "UNKNOWN (1007)",
+    "UNKNOWN (1008)",
+    "UNKNOWN (1009)",
+    "UNKNOWN (1010)",
+    "UNKNOWN (1011)",
+    "UNKNOWN (1012)",
+    "UNKNOWN (1013)",
+    "UNKNOWN (1014)",
+    "UNKNOWN (1015)",
+    "UNKNOWN (1016)",
+    "UNKNOWN (1017)",
+    "UNKNOWN (1018)",
+    "UNKNOWN (1019)",
+    "UNKNOWN (1020)",
+    "UNKNOWN (1021)",
+    "UNKNOWN (1022)",
+    "UNKNOWN (1023)",
+    "WM_USER"
+};
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtevents.cpp b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtevents.cpp
new file mode 100644
index 000000000..7c0cf49a9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtevents.cpp	
@@ -0,0 +1,153 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINRT
+
+/*
+ * Windows includes:
+ */
+#include <Windows.h>
+using namespace Windows::UI::Core;
+using Windows::UI::Core::CoreCursor;
+
+/*
+ * SDL includes:
+ */
+#include "SDL_winrtevents_c.h"
+#include "../../core/winrt/SDL_winrtapp_common.h"
+#include "../../core/winrt/SDL_winrtapp_direct3d.h"
+#include "../../core/winrt/SDL_winrtapp_xaml.h"
+#include "SDL_assert.h"
+#include "SDL_system.h"
+
+extern "C" {
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_events_c.h"
+}
+
+
+/* Forward declarations */
+static void WINRT_YieldXAMLThread();
+
+
+/* Global event management */
+
+void
+WINRT_PumpEvents(_THIS)
+{
+    if (SDL_WinRTGlobalApp) {
+        SDL_WinRTGlobalApp->PumpEvents();
+    } else if (WINRT_XAMLWasEnabled) {
+        WINRT_YieldXAMLThread();
+    }
+}
+
+
+/* XAML Thread management */
+
+enum SDL_XAMLAppThreadState
+{
+    ThreadState_NotLaunched = 0,
+    ThreadState_Running,
+    ThreadState_Yielding
+};
+
+static SDL_XAMLAppThreadState _threadState = ThreadState_NotLaunched;
+static SDL_Thread * _XAMLThread = nullptr;
+static SDL_mutex * _mutex = nullptr;
+static SDL_cond * _cond = nullptr;
+
+static void
+WINRT_YieldXAMLThread()
+{
+    SDL_LockMutex(_mutex);
+    SDL_assert(_threadState == ThreadState_Running);
+    _threadState = ThreadState_Yielding;
+    SDL_UnlockMutex(_mutex);
+
+    SDL_CondSignal(_cond);
+
+    SDL_LockMutex(_mutex);
+    while (_threadState != ThreadState_Running) {
+        SDL_CondWait(_cond, _mutex);
+    }
+    SDL_UnlockMutex(_mutex);
+}
+
+static int
+WINRT_XAMLThreadMain(void * userdata)
+{
+    // TODO, WinRT: pass the C-style main() a reasonably realistic
+    // representation of command line arguments.
+    int argc = 0;
+    char **argv = NULL;
+    return WINRT_SDLAppEntryPoint(argc, argv);
+}
+
+void
+WINRT_CycleXAMLThread()
+{
+    switch (_threadState) {
+        case ThreadState_NotLaunched:
+        {
+            _cond = SDL_CreateCond();
+
+            _mutex = SDL_CreateMutex();
+            _threadState = ThreadState_Running;
+            _XAMLThread = SDL_CreateThread(WINRT_XAMLThreadMain, "SDL/XAML App Thread", nullptr);
+
+            SDL_LockMutex(_mutex);
+            while (_threadState != ThreadState_Yielding) {
+                SDL_CondWait(_cond, _mutex);
+            }
+            SDL_UnlockMutex(_mutex);
+
+            break;
+        }
+
+        case ThreadState_Running:
+        {
+            SDL_assert(false);
+            break;
+        }
+
+        case ThreadState_Yielding:
+        {
+            SDL_LockMutex(_mutex);
+            SDL_assert(_threadState == ThreadState_Yielding);
+            _threadState = ThreadState_Running;
+            SDL_UnlockMutex(_mutex);
+
+            SDL_CondSignal(_cond);
+
+            SDL_LockMutex(_mutex);
+            while (_threadState != ThreadState_Yielding) {
+                SDL_CondWait(_cond, _mutex);
+            }
+            SDL_UnlockMutex(_mutex);
+        }
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINRT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtevents_c.h b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtevents_c.h
new file mode 100644
index 000000000..826cad74e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtevents_c.h	
@@ -0,0 +1,72 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+extern "C" {
+#include "../SDL_sysvideo.h"
+}
+
+/*
+ * Internal-use, C-style functions:
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void WINRT_InitTouch(_THIS);
+extern void WINRT_PumpEvents(_THIS);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*
+ * Internal-use, C++/CX functions:
+ */
+#ifdef __cplusplus_winrt
+
+/* Pointers (Mice, Touch, etc.) */
+typedef enum {
+    NormalizeZeroToOne,
+    TransformToSDLWindowSize
+} WINRT_CursorNormalizationType;
+extern Windows::Foundation::Point WINRT_TransformCursorPosition(SDL_Window * window,
+                                                                Windows::Foundation::Point rawPosition,
+                                                                WINRT_CursorNormalizationType normalization);
+extern Uint8 WINRT_GetSDLButtonForPointerPoint(Windows::UI::Input::PointerPoint ^pt);
+extern void WINRT_ProcessPointerPressedEvent(SDL_Window *window, Windows::UI::Input::PointerPoint ^pointerPoint);
+extern void WINRT_ProcessPointerMovedEvent(SDL_Window *window, Windows::UI::Input::PointerPoint ^pointerPoint);
+extern void WINRT_ProcessPointerReleasedEvent(SDL_Window *window, Windows::UI::Input::PointerPoint ^pointerPoint);
+extern void WINRT_ProcessPointerWheelChangedEvent(SDL_Window *window, Windows::UI::Input::PointerPoint ^pointerPoint);
+extern void WINRT_ProcessMouseMovedEvent(SDL_Window * window, Windows::Devices::Input::MouseEventArgs ^args);
+
+/* Keyboard */
+extern void WINRT_ProcessKeyDownEvent(Windows::UI::Core::KeyEventArgs ^args);
+extern void WINRT_ProcessKeyUpEvent(Windows::UI::Core::KeyEventArgs ^args);
+
+/* XAML Thread Management */
+extern void WINRT_CycleXAMLThread();
+
+#endif // ifdef __cplusplus_winrt
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtkeyboard.cpp b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtkeyboard.cpp
new file mode 100644
index 000000000..f2fa59d64
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtkeyboard.cpp	
@@ -0,0 +1,301 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINRT
+
+/* Standard C++11 includes */
+#include <unordered_map>
+
+
+/* Windows-specific includes */
+#include <Windows.h>
+#include <agile.h>
+
+
+/* SDL-specific includes */
+#include <SDL.h>
+#include "SDL_winrtevents_c.h"
+
+extern "C" {
+#include "../../events/scancodes_windows.h"
+#include "../../events/SDL_keyboard_c.h"
+}
+
+
+static SDL_Scancode WinRT_Official_Keycodes[] = {
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.None -- 0
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.LeftButton -- 1
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.RightButton -- 2
+    SDL_SCANCODE_CANCEL, // VirtualKey.Cancel -- 3
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.MiddleButton -- 4
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.XButton1 -- 5
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.XButton2 -- 6
+    SDL_SCANCODE_UNKNOWN, // -- 7
+    SDL_SCANCODE_BACKSPACE, // VirtualKey.Back -- 8
+    SDL_SCANCODE_TAB, // VirtualKey.Tab -- 9
+    SDL_SCANCODE_UNKNOWN, // -- 10
+    SDL_SCANCODE_UNKNOWN, // -- 11
+    SDL_SCANCODE_CLEAR, // VirtualKey.Clear -- 12
+    SDL_SCANCODE_RETURN, // VirtualKey.Enter -- 13
+    SDL_SCANCODE_UNKNOWN, // -- 14
+    SDL_SCANCODE_UNKNOWN, // -- 15
+    SDL_SCANCODE_LSHIFT, // VirtualKey.Shift -- 16
+    SDL_SCANCODE_LCTRL, // VirtualKey.Control -- 17
+    SDL_SCANCODE_MENU, // VirtualKey.Menu -- 18
+    SDL_SCANCODE_PAUSE, // VirtualKey.Pause -- 19
+    SDL_SCANCODE_CAPSLOCK, // VirtualKey.CapitalLock -- 20
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Kana or VirtualKey.Hangul -- 21
+    SDL_SCANCODE_UNKNOWN, // -- 22
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Junja -- 23
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Final -- 24
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Hanja or VirtualKey.Kanji -- 25
+    SDL_SCANCODE_UNKNOWN, // -- 26
+    SDL_SCANCODE_ESCAPE, // VirtualKey.Escape -- 27
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Convert -- 28
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.NonConvert -- 29
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Accept -- 30
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.ModeChange -- 31  (maybe SDL_SCANCODE_MODE ?)
+    SDL_SCANCODE_SPACE, // VirtualKey.Space -- 32
+    SDL_SCANCODE_PAGEUP, // VirtualKey.PageUp -- 33
+    SDL_SCANCODE_PAGEDOWN, // VirtualKey.PageDown -- 34
+    SDL_SCANCODE_END, // VirtualKey.End -- 35
+    SDL_SCANCODE_HOME, // VirtualKey.Home -- 36
+    SDL_SCANCODE_LEFT, // VirtualKey.Left -- 37
+    SDL_SCANCODE_UP, // VirtualKey.Up -- 38
+    SDL_SCANCODE_RIGHT, // VirtualKey.Right -- 39
+    SDL_SCANCODE_DOWN, // VirtualKey.Down -- 40
+    SDL_SCANCODE_SELECT, // VirtualKey.Select -- 41
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Print -- 42  (maybe SDL_SCANCODE_PRINTSCREEN ?)
+    SDL_SCANCODE_EXECUTE, // VirtualKey.Execute -- 43
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Snapshot -- 44
+    SDL_SCANCODE_INSERT, // VirtualKey.Insert -- 45
+    SDL_SCANCODE_DELETE, // VirtualKey.Delete -- 46
+    SDL_SCANCODE_HELP, // VirtualKey.Help -- 47
+    SDL_SCANCODE_0, // VirtualKey.Number0 -- 48
+    SDL_SCANCODE_1, // VirtualKey.Number1 -- 49
+    SDL_SCANCODE_2, // VirtualKey.Number2 -- 50
+    SDL_SCANCODE_3, // VirtualKey.Number3 -- 51
+    SDL_SCANCODE_4, // VirtualKey.Number4 -- 52
+    SDL_SCANCODE_5, // VirtualKey.Number5 -- 53
+    SDL_SCANCODE_6, // VirtualKey.Number6 -- 54
+    SDL_SCANCODE_7, // VirtualKey.Number7 -- 55
+    SDL_SCANCODE_8, // VirtualKey.Number8 -- 56
+    SDL_SCANCODE_9, // VirtualKey.Number9 -- 57
+    SDL_SCANCODE_UNKNOWN, // -- 58
+    SDL_SCANCODE_UNKNOWN, // -- 59
+    SDL_SCANCODE_UNKNOWN, // -- 60
+    SDL_SCANCODE_UNKNOWN, // -- 61
+    SDL_SCANCODE_UNKNOWN, // -- 62
+    SDL_SCANCODE_UNKNOWN, // -- 63
+    SDL_SCANCODE_UNKNOWN, // -- 64
+    SDL_SCANCODE_A, // VirtualKey.A -- 65
+    SDL_SCANCODE_B, // VirtualKey.B -- 66
+    SDL_SCANCODE_C, // VirtualKey.C -- 67
+    SDL_SCANCODE_D, // VirtualKey.D -- 68
+    SDL_SCANCODE_E, // VirtualKey.E -- 69
+    SDL_SCANCODE_F, // VirtualKey.F -- 70
+    SDL_SCANCODE_G, // VirtualKey.G -- 71
+    SDL_SCANCODE_H, // VirtualKey.H -- 72
+    SDL_SCANCODE_I, // VirtualKey.I -- 73
+    SDL_SCANCODE_J, // VirtualKey.J -- 74
+    SDL_SCANCODE_K, // VirtualKey.K -- 75
+    SDL_SCANCODE_L, // VirtualKey.L -- 76
+    SDL_SCANCODE_M, // VirtualKey.M -- 77
+    SDL_SCANCODE_N, // VirtualKey.N -- 78
+    SDL_SCANCODE_O, // VirtualKey.O -- 79
+    SDL_SCANCODE_P, // VirtualKey.P -- 80
+    SDL_SCANCODE_Q, // VirtualKey.Q -- 81
+    SDL_SCANCODE_R, // VirtualKey.R -- 82
+    SDL_SCANCODE_S, // VirtualKey.S -- 83
+    SDL_SCANCODE_T, // VirtualKey.T -- 84
+    SDL_SCANCODE_U, // VirtualKey.U -- 85
+    SDL_SCANCODE_V, // VirtualKey.V -- 86
+    SDL_SCANCODE_W, // VirtualKey.W -- 87
+    SDL_SCANCODE_X, // VirtualKey.X -- 88
+    SDL_SCANCODE_Y, // VirtualKey.Y -- 89
+    SDL_SCANCODE_Z, // VirtualKey.Z -- 90
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.LeftWindows -- 91  (maybe SDL_SCANCODE_APPLICATION or SDL_SCANCODE_LGUI ?)
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.RightWindows -- 92  (maybe SDL_SCANCODE_APPLICATION or SDL_SCANCODE_RGUI ?)
+    SDL_SCANCODE_APPLICATION, // VirtualKey.Application -- 93
+    SDL_SCANCODE_UNKNOWN, // -- 94
+    SDL_SCANCODE_SLEEP, // VirtualKey.Sleep -- 95
+    SDL_SCANCODE_KP_0, // VirtualKey.NumberPad0 -- 96
+    SDL_SCANCODE_KP_1, // VirtualKey.NumberPad1 -- 97
+    SDL_SCANCODE_KP_2, // VirtualKey.NumberPad2 -- 98
+    SDL_SCANCODE_KP_3, // VirtualKey.NumberPad3 -- 99
+    SDL_SCANCODE_KP_4, // VirtualKey.NumberPad4 -- 100
+    SDL_SCANCODE_KP_5, // VirtualKey.NumberPad5 -- 101
+    SDL_SCANCODE_KP_6, // VirtualKey.NumberPad6 -- 102
+    SDL_SCANCODE_KP_7, // VirtualKey.NumberPad7 -- 103
+    SDL_SCANCODE_KP_8, // VirtualKey.NumberPad8 -- 104
+    SDL_SCANCODE_KP_9, // VirtualKey.NumberPad9 -- 105
+    SDL_SCANCODE_KP_MULTIPLY, // VirtualKey.Multiply -- 106
+    SDL_SCANCODE_KP_PLUS, // VirtualKey.Add -- 107
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Separator -- 108
+    SDL_SCANCODE_KP_MINUS, // VirtualKey.Subtract -- 109
+    SDL_SCANCODE_UNKNOWN, // VirtualKey.Decimal -- 110  (maybe SDL_SCANCODE_DECIMALSEPARATOR, SDL_SCANCODE_KP_DECIMAL, or SDL_SCANCODE_KP_PERIOD ?)
+    SDL_SCANCODE_KP_DIVIDE, // VirtualKey.Divide -- 111
+    SDL_SCANCODE_F1, // VirtualKey.F1 -- 112
+    SDL_SCANCODE_F2, // VirtualKey.F2 -- 113
+    SDL_SCANCODE_F3, // VirtualKey.F3 -- 114
+    SDL_SCANCODE_F4, // VirtualKey.F4 -- 115
+    SDL_SCANCODE_F5, // VirtualKey.F5 -- 116
+    SDL_SCANCODE_F6, // VirtualKey.F6 -- 117
+    SDL_SCANCODE_F7, // VirtualKey.F7 -- 118
+    SDL_SCANCODE_F8, // VirtualKey.F8 -- 119
+    SDL_SCANCODE_F9, // VirtualKey.F9 -- 120
+    SDL_SCANCODE_F10, // VirtualKey.F10 -- 121
+    SDL_SCANCODE_F11, // VirtualKey.F11 -- 122
+    SDL_SCANCODE_F12, // VirtualKey.F12 -- 123
+    SDL_SCANCODE_F13, // VirtualKey.F13 -- 124
+    SDL_SCANCODE_F14, // VirtualKey.F14 -- 125
+    SDL_SCANCODE_F15, // VirtualKey.F15 -- 126
+    SDL_SCANCODE_F16, // VirtualKey.F16 -- 127
+    SDL_SCANCODE_F17, // VirtualKey.F17 -- 128
+    SDL_SCANCODE_F18, // VirtualKey.F18 -- 129
+    SDL_SCANCODE_F19, // VirtualKey.F19 -- 130
+    SDL_SCANCODE_F20, // VirtualKey.F20 -- 131
+    SDL_SCANCODE_F21, // VirtualKey.F21 -- 132
+    SDL_SCANCODE_F22, // VirtualKey.F22 -- 133
+    SDL_SCANCODE_F23, // VirtualKey.F23 -- 134
+    SDL_SCANCODE_F24, // VirtualKey.F24 -- 135
+    SDL_SCANCODE_UNKNOWN, // -- 136
+    SDL_SCANCODE_UNKNOWN, // -- 137
+    SDL_SCANCODE_UNKNOWN, // -- 138
+    SDL_SCANCODE_UNKNOWN, // -- 139
+    SDL_SCANCODE_UNKNOWN, // -- 140
+    SDL_SCANCODE_UNKNOWN, // -- 141
+    SDL_SCANCODE_UNKNOWN, // -- 142
+    SDL_SCANCODE_UNKNOWN, // -- 143
+    SDL_SCANCODE_NUMLOCKCLEAR, // VirtualKey.NumberKeyLock -- 144
+    SDL_SCANCODE_SCROLLLOCK, // VirtualKey.Scroll -- 145
+    SDL_SCANCODE_UNKNOWN, // -- 146
+    SDL_SCANCODE_UNKNOWN, // -- 147
+    SDL_SCANCODE_UNKNOWN, // -- 148
+    SDL_SCANCODE_UNKNOWN, // -- 149
+    SDL_SCANCODE_UNKNOWN, // -- 150
+    SDL_SCANCODE_UNKNOWN, // -- 151
+    SDL_SCANCODE_UNKNOWN, // -- 152
+    SDL_SCANCODE_UNKNOWN, // -- 153
+    SDL_SCANCODE_UNKNOWN, // -- 154
+    SDL_SCANCODE_UNKNOWN, // -- 155
+    SDL_SCANCODE_UNKNOWN, // -- 156
+    SDL_SCANCODE_UNKNOWN, // -- 157
+    SDL_SCANCODE_UNKNOWN, // -- 158
+    SDL_SCANCODE_UNKNOWN, // -- 159
+    SDL_SCANCODE_LSHIFT, // VirtualKey.LeftShift -- 160
+    SDL_SCANCODE_RSHIFT, // VirtualKey.RightShift -- 161
+    SDL_SCANCODE_LCTRL, // VirtualKey.LeftControl -- 162
+    SDL_SCANCODE_RCTRL, // VirtualKey.RightControl -- 163
+    SDL_SCANCODE_MENU, // VirtualKey.LeftMenu -- 164
+    SDL_SCANCODE_MENU, // VirtualKey.RightMenu -- 165
+};
+
+static std::unordered_map<int, SDL_Scancode> WinRT_Unofficial_Keycodes;
+
+static SDL_Scancode
+TranslateKeycode(int keycode)
+{
+    if (WinRT_Unofficial_Keycodes.empty()) {
+        /* Set up a table of undocumented (by Microsoft), WinRT-specific,
+           key codes: */
+        // TODO, WinRT: move content declarations of WinRT_Unofficial_Keycodes into a C++11 initializer list, when possible
+        WinRT_Unofficial_Keycodes[220] = SDL_SCANCODE_GRAVE;
+        WinRT_Unofficial_Keycodes[222] = SDL_SCANCODE_BACKSLASH;
+    }
+
+    /* Try to get a documented, WinRT, 'VirtualKey' first (as documented at
+       http://msdn.microsoft.com/en-us/library/windows/apps/windows.system.virtualkey.aspx ).
+       If that fails, fall back to a Win32 virtual key.
+    */
+    // TODO, WinRT: try filling out the WinRT keycode table as much as possible, using the Win32 table for interpretation hints
+    //SDL_Log("WinRT TranslateKeycode, keycode=%d\n", (int)keycode);
+    SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;
+    if (keycode < SDL_arraysize(WinRT_Official_Keycodes)) {
+        scancode = WinRT_Official_Keycodes[keycode];
+    }
+    if (scancode == SDL_SCANCODE_UNKNOWN) {
+        if (WinRT_Unofficial_Keycodes.find(keycode) != WinRT_Unofficial_Keycodes.end()) {
+            scancode = WinRT_Unofficial_Keycodes[keycode];
+        }
+    }
+    if (scancode == SDL_SCANCODE_UNKNOWN) {
+        if (keycode < SDL_arraysize(windows_scancode_table)) {
+            scancode = windows_scancode_table[keycode];
+        }
+    }
+    if (scancode == SDL_SCANCODE_UNKNOWN) {
+        SDL_Log("WinRT TranslateKeycode, unknown keycode=%d\n", (int)keycode);
+    }
+    return scancode;
+}
+
+void
+WINRT_ProcessKeyDownEvent(Windows::UI::Core::KeyEventArgs ^args)
+{
+    SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey);
+#if 0
+    SDL_Keycode keycode = SDL_GetKeyFromScancode(sdlScancode);
+    SDL_Log("key down, handled=%s, ext?=%s, released?=%s, menu key down?=%s, repeat count=%d, native scan code=%d, was down?=%s, vkey=%d, sdl scan code=%d (%s), sdl key code=%d (%s)\n",
+        (args->Handled ? "1" : "0"),
+        (args->KeyStatus.IsExtendedKey ? "1" : "0"),
+        (args->KeyStatus.IsKeyReleased ? "1" : "0"),
+        (args->KeyStatus.IsMenuKeyDown ? "1" : "0"),
+        args->KeyStatus.RepeatCount,
+        args->KeyStatus.ScanCode,
+        (args->KeyStatus.WasKeyDown ? "1" : "0"),
+        args->VirtualKey,
+        sdlScancode,
+        SDL_GetScancodeName(sdlScancode),
+        keycode,
+        SDL_GetKeyName(keycode));
+    //args->Handled = true;
+    //VirtualKey vkey = args->VirtualKey;
+#endif
+    SDL_SendKeyboardKey(SDL_PRESSED, sdlScancode);
+}
+
+void
+WINRT_ProcessKeyUpEvent(Windows::UI::Core::KeyEventArgs ^args)
+{
+    SDL_Scancode sdlScancode = TranslateKeycode((int)args->VirtualKey);
+#if 0
+    SDL_Keycode keycode = SDL_GetKeyFromScancode(sdlScancode);
+    SDL_Log("key up, handled=%s, ext?=%s, released?=%s, menu key down?=%s, repeat count=%d, native scan code=%d, was down?=%s, vkey=%d, sdl scan code=%d (%s), sdl key code=%d (%s)\n",
+        (args->Handled ? "1" : "0"),
+        (args->KeyStatus.IsExtendedKey ? "1" : "0"),
+        (args->KeyStatus.IsKeyReleased ? "1" : "0"),
+        (args->KeyStatus.IsMenuKeyDown ? "1" : "0"),
+        args->KeyStatus.RepeatCount,
+        args->KeyStatus.ScanCode,
+        (args->KeyStatus.WasKeyDown ? "1" : "0"),
+        args->VirtualKey,
+        sdlScancode,
+        SDL_GetScancodeName(sdlScancode),
+        keycode,
+        SDL_GetKeyName(keycode));
+    //args->Handled = true;
+#endif
+    SDL_SendKeyboardKey(SDL_RELEASED, sdlScancode);
+}
+
+#endif // SDL_VIDEO_DRIVER_WINRT
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtmouse.cpp b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtmouse.cpp
new file mode 100644
index 000000000..4c04a211c
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtmouse.cpp	
@@ -0,0 +1,165 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINRT
+
+/*
+ * Windows includes:
+ */
+#include <Windows.h>
+using namespace Windows::UI::Core;
+using Windows::UI::Core::CoreCursor;
+
+/*
+ * SDL includes:
+ */
+extern "C" {
+#include "SDL_assert.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_touch_c.h"
+#include "../SDL_sysvideo.h"
+#include "SDL_events.h"
+#include "SDL_log.h"
+}
+
+#include "../../core/winrt/SDL_winrtapp_direct3d.h"
+#include "SDL_winrtvideo_cpp.h"
+#include "SDL_winrtmouse_c.h"
+
+
+extern "C" SDL_bool WINRT_UsingRelativeMouseMode = SDL_FALSE;
+
+
+static SDL_Cursor *
+WINRT_CreateSystemCursor(SDL_SystemCursor id)
+{
+    SDL_Cursor *cursor;
+    CoreCursorType cursorType = CoreCursorType::Arrow;
+
+    switch(id)
+    {
+    default:
+        SDL_assert(0);
+        return NULL;
+    case SDL_SYSTEM_CURSOR_ARROW:     cursorType = CoreCursorType::Arrow; break;
+    case SDL_SYSTEM_CURSOR_IBEAM:     cursorType = CoreCursorType::IBeam; break;
+    case SDL_SYSTEM_CURSOR_WAIT:      cursorType = CoreCursorType::Wait; break;
+    case SDL_SYSTEM_CURSOR_CROSSHAIR: cursorType = CoreCursorType::Cross; break;
+    case SDL_SYSTEM_CURSOR_WAITARROW: cursorType = CoreCursorType::Wait; break;
+    case SDL_SYSTEM_CURSOR_SIZENWSE:  cursorType = CoreCursorType::SizeNorthwestSoutheast; break;
+    case SDL_SYSTEM_CURSOR_SIZENESW:  cursorType = CoreCursorType::SizeNortheastSouthwest; break;
+    case SDL_SYSTEM_CURSOR_SIZEWE:    cursorType = CoreCursorType::SizeWestEast; break;
+    case SDL_SYSTEM_CURSOR_SIZENS:    cursorType = CoreCursorType::SizeNorthSouth; break;
+    case SDL_SYSTEM_CURSOR_SIZEALL:   cursorType = CoreCursorType::SizeAll; break;
+    case SDL_SYSTEM_CURSOR_NO:        cursorType = CoreCursorType::UniversalNo; break;
+    case SDL_SYSTEM_CURSOR_HAND:      cursorType = CoreCursorType::Hand; break;
+    }
+
+    cursor = (SDL_Cursor *) SDL_calloc(1, sizeof(*cursor));
+    if (cursor) {
+        /* Create a pointer to a COM reference to a cursor.  The extra
+           pointer is used (on top of the COM reference) to allow the cursor
+           to be referenced by the SDL_cursor's driverdata field, which is
+           a void pointer.
+        */
+        CoreCursor ^* theCursor = new CoreCursor^(nullptr);
+        *theCursor = ref new CoreCursor(cursorType, 0);
+        cursor->driverdata = (void *) theCursor;
+    } else {
+        SDL_OutOfMemory();
+    }
+
+    return cursor;
+}
+
+static SDL_Cursor *
+WINRT_CreateDefaultCursor()
+{
+    return WINRT_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
+}
+
+static void
+WINRT_FreeCursor(SDL_Cursor * cursor)
+{
+    if (cursor->driverdata) {
+        CoreCursor ^* theCursor = (CoreCursor ^*) cursor->driverdata;
+        *theCursor = nullptr;       // Release the COM reference to the CoreCursor
+        delete theCursor;           // Delete the pointer to the COM reference
+    }
+    SDL_free(cursor);
+}
+
+static int
+WINRT_ShowCursor(SDL_Cursor * cursor)
+{
+    // TODO, WinRT, XAML: make WINRT_ShowCursor work when XAML support is enabled.
+    if ( ! CoreWindow::GetForCurrentThread()) {
+        return 0;
+    }
+
+    if (cursor) {
+        CoreCursor ^* theCursor = (CoreCursor ^*) cursor->driverdata;
+        CoreWindow::GetForCurrentThread()->PointerCursor = *theCursor;
+    } else {
+        CoreWindow::GetForCurrentThread()->PointerCursor = nullptr;
+    }
+    return 0;
+}
+
+static int
+WINRT_SetRelativeMouseMode(SDL_bool enabled)
+{
+    WINRT_UsingRelativeMouseMode = enabled;
+    return 0;
+}
+
+void
+WINRT_InitMouse(_THIS)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    /* DLudwig, Dec 3, 2012: WinRT does not currently provide APIs for
+       the following features, AFAIK:
+        - custom cursors  (multiple system cursors are, however, available)
+        - programmatically moveable cursors
+    */
+
+#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
+    //mouse->CreateCursor = WINRT_CreateCursor;
+    mouse->CreateSystemCursor = WINRT_CreateSystemCursor;
+    mouse->ShowCursor = WINRT_ShowCursor;
+    mouse->FreeCursor = WINRT_FreeCursor;
+    //mouse->WarpMouse = WINRT_WarpMouse;
+    mouse->SetRelativeMouseMode = WINRT_SetRelativeMouseMode;
+
+    SDL_SetDefaultCursor(WINRT_CreateDefaultCursor());
+#endif
+}
+
+void
+WINRT_QuitMouse(_THIS)
+{
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINRT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtmouse_c.h b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtmouse_c.h
new file mode 100644
index 000000000..676669b34
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtmouse_c.h	
@@ -0,0 +1,40 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_winrtmouse_h
+#define _SDL_winrtmouse_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void WINRT_InitMouse(_THIS);
+extern void WINRT_QuitMouse(_THIS);
+extern SDL_bool WINRT_UsingRelativeMouseMode;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SDL_windowsmouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtopengles.cpp b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtopengles.cpp
new file mode 100644
index 000000000..6f3ddcedf
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtopengles.cpp	
@@ -0,0 +1,50 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+// TODO: WinRT, make this file compile via C code
+
+#if SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL
+
+/* EGL implementation of SDL OpenGL support */
+
+#include "SDL_winrtvideo_cpp.h"
+extern "C" {
+#include "SDL_winrtopengles.h"
+}
+
+#define EGL_D3D11_ONLY_DISPLAY_ANGLE ((NativeDisplayType) -3)
+
+extern "C" int
+WINRT_GLES_LoadLibrary(_THIS, const char *path) {
+    return SDL_EGL_LoadLibrary(_this, path, EGL_D3D11_ONLY_DISPLAY_ANGLE);
+}
+
+extern "C" {
+SDL_EGL_CreateContext_impl(WINRT)
+SDL_EGL_SwapWindow_impl(WINRT)
+SDL_EGL_MakeCurrent_impl(WINRT)
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
+
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtopengles.h b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtopengles.h
new file mode 100644
index 000000000..f051132eb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtopengles.h	
@@ -0,0 +1,48 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_winrtopengles_h
+#define _SDL_winrtopengles_h
+
+#if SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL
+
+#include "../SDL_sysvideo.h"
+#include "../SDL_egl_c.h"
+
+/* OpenGLES functions */
+#define WINRT_GLES_GetAttribute SDL_EGL_GetAttribute
+#define WINRT_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define WINRT_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define WINRT_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define WINRT_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+#define WINRT_GLES_DeleteContext SDL_EGL_DeleteContext
+
+extern int WINRT_GLES_LoadLibrary(_THIS, const char *path);
+extern SDL_GLContext WINRT_GLES_CreateContext(_THIS, SDL_Window * window);
+extern void WINRT_GLES_SwapWindow(_THIS, SDL_Window * window);
+extern int WINRT_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+
+#endif /* SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL */
+
+#endif /* _SDL_winrtopengles_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtpointerinput.cpp b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtpointerinput.cpp
new file mode 100644
index 000000000..e3afffbaa
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtpointerinput.cpp	
@@ -0,0 +1,394 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINRT
+
+/* SDL includes */
+#include "SDL_winrtevents_c.h"
+#include "SDL_winrtmouse_c.h"
+#include "SDL_winrtvideo_cpp.h"
+#include "SDL_assert.h"
+#include "SDL_system.h"
+
+extern "C" {
+#include "../SDL_sysvideo.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_touch_c.h"
+}
+
+/* File-specific globals: */
+static SDL_TouchID WINRT_TouchID = 1;
+static unsigned int WINRT_LeftFingerDown = 0;
+
+
+void
+WINRT_InitTouch(_THIS)
+{
+    SDL_AddTouch(WINRT_TouchID, "");
+}
+
+
+//
+// Applies necessary geometric transformations to raw cursor positions:
+//
+Windows::Foundation::Point
+WINRT_TransformCursorPosition(SDL_Window * window,
+                              Windows::Foundation::Point rawPosition,
+                              WINRT_CursorNormalizationType normalization)
+{
+    using namespace Windows::UI::Core;
+    using namespace Windows::Graphics::Display;
+
+    if (!window) {
+        return rawPosition;
+    }
+
+    SDL_WindowData * windowData = (SDL_WindowData *) window->driverdata;
+    if (windowData->coreWindow == nullptr) {
+        // For some reason, the window isn't associated with a CoreWindow.
+        // This might end up being the case as XAML support is extended.
+        // For now, if there's no CoreWindow attached to the SDL_Window,
+        // don't do any transforms.
+
+        // TODO, WinRT: make sure touch input coordinate ranges are correct when using XAML support
+        return rawPosition;
+    }
+
+    // The CoreWindow can only be accessed on certain thread(s).
+    SDL_assert(CoreWindow::GetForCurrentThread() != nullptr);
+
+    CoreWindow ^ nativeWindow = windowData->coreWindow.Get();
+    Windows::Foundation::Point outputPosition;
+
+    // Compute coordinates normalized from 0..1.
+    // If the coordinates need to be sized to the SDL window,
+    // we'll do that after.
+#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
+    outputPosition.X = rawPosition.X / nativeWindow->Bounds.Width;
+    outputPosition.Y = rawPosition.Y / nativeWindow->Bounds.Height;
+#else
+    switch (DisplayProperties::CurrentOrientation)
+    {
+        case DisplayOrientations::Portrait:
+            outputPosition.X = rawPosition.X / nativeWindow->Bounds.Width;
+            outputPosition.Y = rawPosition.Y / nativeWindow->Bounds.Height;
+            break;
+        case DisplayOrientations::PortraitFlipped:
+            outputPosition.X = 1.0f - (rawPosition.X / nativeWindow->Bounds.Width);
+            outputPosition.Y = 1.0f - (rawPosition.Y / nativeWindow->Bounds.Height);
+            break;
+        case DisplayOrientations::Landscape:
+            outputPosition.X = rawPosition.Y / nativeWindow->Bounds.Height;
+            outputPosition.Y = 1.0f - (rawPosition.X / nativeWindow->Bounds.Width);
+            break;
+        case DisplayOrientations::LandscapeFlipped:
+            outputPosition.X = 1.0f - (rawPosition.Y / nativeWindow->Bounds.Height);
+            outputPosition.Y = rawPosition.X / nativeWindow->Bounds.Width;
+            break;
+        default:
+            break;
+    }
+#endif
+
+    if (normalization == TransformToSDLWindowSize) {
+        outputPosition.X *= ((float32) window->w);
+        outputPosition.Y *= ((float32) window->h);
+    }
+
+    return outputPosition;
+}
+
+static inline int
+_lround(float arg)
+{
+    if (arg >= 0.0f) {
+        return (int)floor(arg + 0.5f);
+    } else {
+        return (int)ceil(arg - 0.5f);
+    }
+}
+
+Uint8
+WINRT_GetSDLButtonForPointerPoint(Windows::UI::Input::PointerPoint ^pt)
+{
+    using namespace Windows::UI::Input;
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    return SDL_BUTTON_LEFT;
+#else
+    switch (pt->Properties->PointerUpdateKind)
+    {
+        case PointerUpdateKind::LeftButtonPressed:
+        case PointerUpdateKind::LeftButtonReleased:
+            return SDL_BUTTON_LEFT;
+
+        case PointerUpdateKind::RightButtonPressed:
+        case PointerUpdateKind::RightButtonReleased:
+            return SDL_BUTTON_RIGHT;
+
+        case PointerUpdateKind::MiddleButtonPressed:
+        case PointerUpdateKind::MiddleButtonReleased:
+            return SDL_BUTTON_MIDDLE;
+
+        case PointerUpdateKind::XButton1Pressed:
+        case PointerUpdateKind::XButton1Released:
+            return SDL_BUTTON_X1;
+
+        case PointerUpdateKind::XButton2Pressed:
+        case PointerUpdateKind::XButton2Released:
+            return SDL_BUTTON_X2;
+
+        default:
+            break;
+    }
+#endif
+
+    return 0;
+}
+
+//const char *
+//WINRT_ConvertPointerUpdateKindToString(Windows::UI::Input::PointerUpdateKind kind)
+//{
+//    using namespace Windows::UI::Input;
+//
+//    switch (kind)
+//    {
+//        case PointerUpdateKind::Other:
+//            return "Other";
+//        case PointerUpdateKind::LeftButtonPressed:
+//            return "LeftButtonPressed";
+//        case PointerUpdateKind::LeftButtonReleased:
+//            return "LeftButtonReleased";
+//        case PointerUpdateKind::RightButtonPressed:
+//            return "RightButtonPressed";
+//        case PointerUpdateKind::RightButtonReleased:
+//            return "RightButtonReleased";
+//        case PointerUpdateKind::MiddleButtonPressed:
+//            return "MiddleButtonPressed";
+//        case PointerUpdateKind::MiddleButtonReleased:
+//            return "MiddleButtonReleased";
+//        case PointerUpdateKind::XButton1Pressed:
+//            return "XButton1Pressed";
+//        case PointerUpdateKind::XButton1Released:
+//            return "XButton1Released";
+//        case PointerUpdateKind::XButton2Pressed:
+//            return "XButton2Pressed";
+//        case PointerUpdateKind::XButton2Released:
+//            return "XButton2Released";
+//    }
+//
+//    return "";
+//}
+
+static bool
+WINRT_IsTouchEvent(Windows::UI::Input::PointerPoint ^pointerPoint)
+{
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    return true;
+#else
+    using namespace Windows::Devices::Input;
+    switch (pointerPoint->PointerDevice->PointerDeviceType) {
+        case PointerDeviceType::Touch:
+        case PointerDeviceType::Pen:
+            return true;
+        default:
+            return false;
+    }
+#endif
+}
+
+void WINRT_ProcessPointerPressedEvent(SDL_Window *window, Windows::UI::Input::PointerPoint ^pointerPoint)
+{
+    if (!window) {
+        return;
+    }
+
+    Uint8 button = WINRT_GetSDLButtonForPointerPoint(pointerPoint);
+
+    if ( ! WINRT_IsTouchEvent(pointerPoint)) {
+        SDL_SendMouseButton(window, 0, SDL_PRESSED, button);
+    } else {
+        Windows::Foundation::Point normalizedPoint = WINRT_TransformCursorPosition(window, pointerPoint->Position, NormalizeZeroToOne);
+        Windows::Foundation::Point windowPoint = WINRT_TransformCursorPosition(window, pointerPoint->Position, TransformToSDLWindowSize);
+
+        if (!WINRT_LeftFingerDown) {
+            if (button) {
+                SDL_SendMouseMotion(window, 0, 0, (int)windowPoint.X, (int)windowPoint.Y);
+                SDL_SendMouseButton(window, 0, SDL_PRESSED, button);
+            }
+
+            WINRT_LeftFingerDown = pointerPoint->PointerId;
+        }
+
+        SDL_SendTouch(
+            WINRT_TouchID,
+            (SDL_FingerID) pointerPoint->PointerId,
+            SDL_TRUE,
+            normalizedPoint.X,
+            normalizedPoint.Y,
+            pointerPoint->Properties->Pressure);
+    }
+}
+
+void
+WINRT_ProcessPointerMovedEvent(SDL_Window *window, Windows::UI::Input::PointerPoint ^pointerPoint)
+{
+    if (!window || WINRT_UsingRelativeMouseMode) {
+        return;
+    }
+
+    Windows::Foundation::Point normalizedPoint = WINRT_TransformCursorPosition(window, pointerPoint->Position, NormalizeZeroToOne);
+    Windows::Foundation::Point windowPoint = WINRT_TransformCursorPosition(window, pointerPoint->Position, TransformToSDLWindowSize);
+
+    if ( ! WINRT_IsTouchEvent(pointerPoint)) {
+        SDL_SendMouseMotion(window, 0, 0, (int)windowPoint.X, (int)windowPoint.Y);
+    } else if (pointerPoint->PointerId == WINRT_LeftFingerDown) {
+        if (pointerPoint->PointerId == WINRT_LeftFingerDown) {
+            SDL_SendMouseMotion(window, 0, 0, (int)windowPoint.X, (int)windowPoint.Y);
+        }
+
+        SDL_SendTouchMotion(
+            WINRT_TouchID,
+            (SDL_FingerID) pointerPoint->PointerId,
+            normalizedPoint.X,
+            normalizedPoint.Y,
+            pointerPoint->Properties->Pressure);
+    }
+}
+
+void WINRT_ProcessPointerReleasedEvent(SDL_Window *window, Windows::UI::Input::PointerPoint ^pointerPoint)
+{
+    if (!window) {
+        return;
+    }
+
+    Uint8 button = WINRT_GetSDLButtonForPointerPoint(pointerPoint);
+
+    if (!WINRT_IsTouchEvent(pointerPoint)) {
+        SDL_SendMouseButton(window, 0, SDL_RELEASED, button);
+    } else {
+        Windows::Foundation::Point normalizedPoint = WINRT_TransformCursorPosition(window, pointerPoint->Position, NormalizeZeroToOne);
+
+        if (WINRT_LeftFingerDown == pointerPoint->PointerId) {
+            if (button) {
+                SDL_SendMouseButton(window, 0, SDL_RELEASED, button);
+            }
+            WINRT_LeftFingerDown = 0;
+        }
+    
+        SDL_SendTouch(
+            WINRT_TouchID,
+            (SDL_FingerID) pointerPoint->PointerId,
+            SDL_FALSE,
+            normalizedPoint.X,
+            normalizedPoint.Y,
+            pointerPoint->Properties->Pressure);
+    }
+}
+
+void
+WINRT_ProcessPointerWheelChangedEvent(SDL_Window *window, Windows::UI::Input::PointerPoint ^pointerPoint)
+{
+    if (!window) {
+        return;
+    }
+
+    // FIXME: This may need to accumulate deltas up to WHEEL_DELTA
+    short motion = pointerPoint->Properties->MouseWheelDelta / WHEEL_DELTA;
+    SDL_SendMouseWheel(window, 0, 0, motion);
+}
+
+void
+WINRT_ProcessMouseMovedEvent(SDL_Window * window, Windows::Devices::Input::MouseEventArgs ^args)
+{
+    if (!window || !WINRT_UsingRelativeMouseMode) {
+        return;
+    }
+
+    // DLudwig, 2012-12-28: On some systems, namely Visual Studio's Windows
+    // Simulator, as well as Windows 8 in a Parallels 8 VM, MouseEventArgs'
+    // MouseDelta field often reports very large values.  More information
+    // on this can be found at the following pages on MSDN:
+    //  - http://social.msdn.microsoft.com/Forums/en-US/winappswithnativecode/thread/a3c789fa-f1c5-49c4-9c0a-7db88d0f90f8
+    //  - https://connect.microsoft.com/VisualStudio/Feedback/details/756515
+    //
+    // The values do not appear to be as large when running on some systems,
+    // most notably a Surface RT.  Furthermore, the values returned by
+    // CoreWindow's PointerMoved event, and sent to this class' OnPointerMoved
+    // method, do not ever appear to be large, even when MouseEventArgs'
+    // MouseDelta is reporting to the contrary.
+    //
+    // On systems with the large-values behavior, it appears that the values
+    // get reported as if the screen's size is 65536 units in both the X and Y
+    // dimensions.  This can be viewed by using Windows' now-private, "Raw Input"
+    // APIs.  (GetRawInputData, RegisterRawInputDevices, WM_INPUT, etc.)
+    //
+    // MSDN's documentation on MouseEventArgs' MouseDelta field (at
+    // http://msdn.microsoft.com/en-us/library/windows/apps/windows.devices.input.mouseeventargs.mousedelta ),
+    // does not seem to indicate (to me) that its values should be so large.  It
+    // says that its values should be a "change in screen location".  I could
+    // be misinterpreting this, however a post on MSDN from a Microsoft engineer (see: 
+    // http://social.msdn.microsoft.com/Forums/en-US/winappswithnativecode/thread/09a9868e-95bb-4858-ba1a-cb4d2c298d62 ),
+    // indicates that these values are in DIPs, which is the same unit used
+    // by CoreWindow's PointerMoved events (via the Position field in its CurrentPoint
+    // property.  See http://msdn.microsoft.com/en-us/library/windows/apps/windows.ui.input.pointerpoint.position.aspx
+    // for details.)
+    //
+    // To note, PointerMoved events are sent a 'RawPosition' value (via the
+    // CurrentPoint property in MouseEventArgs), however these do not seem
+    // to exhibit the same large-value behavior.
+    //
+    // The values passed via PointerMoved events can't always be used for relative
+    // mouse motion, unfortunately.  Its values are bound to the cursor's position,
+    // which stops when it hits one of the screen's edges.  This can be a problem in
+    // first person shooters, whereby it is normal for mouse motion to travel far
+    // along any one axis for a period of time.  MouseMoved events do not have the
+    // screen-bounding limitation, and can be used regardless of where the system's
+    // cursor is.
+    //
+    // One possible workaround would be to programmatically set the cursor's
+    // position to the screen's center (when SDL's relative mouse mode is enabled),
+    // however WinRT does not yet seem to have the ability to set the cursor's
+    // position via a public API.  Win32 did this via an API call, SetCursorPos,
+    // however WinRT makes this function be private.  Apps that use it won't get
+    // approved for distribution in the Windows Store.  I've yet to be able to find
+    // a suitable, store-friendly counterpart for WinRT.
+    //
+    // There may be some room for a workaround whereby OnPointerMoved's values
+    // are compared to the values from OnMouseMoved in order to detect
+    // when this bug is active.  A suitable transformation could then be made to
+    // OnMouseMoved's values.  For now, however, the system-reported values are sent
+    // to SDL with minimal transformation: from native screen coordinates (in DIPs)
+    // to SDL window coordinates.
+    //
+    const Windows::Foundation::Point mouseDeltaInDIPs((float)args->MouseDelta.X, (float)args->MouseDelta.Y);
+    const Windows::Foundation::Point mouseDeltaInSDLWindowCoords = WINRT_TransformCursorPosition(window, mouseDeltaInDIPs, TransformToSDLWindowSize);
+    SDL_SendMouseMotion(
+        window,
+        0,
+        1,
+        _lround(mouseDeltaInSDLWindowCoords.X),
+        _lround(mouseDeltaInSDLWindowCoords.Y));
+}
+
+#endif // SDL_VIDEO_DRIVER_WINRT
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtvideo.cpp b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtvideo.cpp
new file mode 100644
index 000000000..4a5301f22
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtvideo.cpp	
@@ -0,0 +1,409 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_WINRT
+
+/* WinRT SDL video driver implementation
+
+   Initial work on this was done by David Ludwig (dludwig@pobox.com), and
+   was based off of SDL's "dummy" video driver.
+ */
+
+/* Windows includes */
+#include <agile.h>
+using namespace Windows::UI::Core;
+
+
+/* SDL includes */
+extern "C" {
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_events_c.h"
+#include "../../render/SDL_sysrender.h"
+#include "SDL_syswm.h"
+#include "SDL_winrtopengles.h"
+}
+
+#include "../../core/winrt/SDL_winrtapp_direct3d.h"
+#include "../../core/winrt/SDL_winrtapp_xaml.h"
+#include "SDL_winrtvideo_cpp.h"
+#include "SDL_winrtevents_c.h"
+#include "SDL_winrtmouse_c.h"
+#include "SDL_main.h"
+#include "SDL_system.h"
+
+
+/* Initialization/Query functions */
+static int WINRT_VideoInit(_THIS);
+static int WINRT_InitModes(_THIS);
+static int WINRT_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+static void WINRT_VideoQuit(_THIS);
+
+
+/* Window functions */
+static int WINRT_CreateWindow(_THIS, SDL_Window * window);
+static void WINRT_DestroyWindow(_THIS, SDL_Window * window);
+static SDL_bool WINRT_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info);
+
+
+/* SDL-internal globals: */
+SDL_Window * WINRT_GlobalSDLWindow = NULL;
+SDL_VideoDevice * WINRT_GlobalSDLVideoDevice = NULL;
+
+
+/* WinRT driver bootstrap functions */
+
+static int
+WINRT_Available(void)
+{
+    return (1);
+}
+
+static void
+WINRT_DeleteDevice(SDL_VideoDevice * device)
+{
+    if (device == WINRT_GlobalSDLVideoDevice) {
+        WINRT_GlobalSDLVideoDevice = NULL;
+    }
+    SDL_free(device);
+}
+
+static SDL_VideoDevice *
+WINRT_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (!device) {
+        SDL_OutOfMemory();
+        if (device) {
+            SDL_free(device);
+        }
+        return (0);
+    }
+
+    /* Set the function pointers */
+    device->VideoInit = WINRT_VideoInit;
+    device->VideoQuit = WINRT_VideoQuit;
+    device->CreateWindow = WINRT_CreateWindow;
+    device->DestroyWindow = WINRT_DestroyWindow;
+    device->SetDisplayMode = WINRT_SetDisplayMode;
+    device->PumpEvents = WINRT_PumpEvents;
+    device->GetWindowWMInfo = WINRT_GetWindowWMInfo;
+#ifdef SDL_VIDEO_OPENGL_EGL
+    device->GL_LoadLibrary = WINRT_GLES_LoadLibrary;
+    device->GL_GetProcAddress = WINRT_GLES_GetProcAddress;
+    device->GL_UnloadLibrary = WINRT_GLES_UnloadLibrary;
+    device->GL_CreateContext = WINRT_GLES_CreateContext;
+    device->GL_MakeCurrent = WINRT_GLES_MakeCurrent;
+    device->GL_SetSwapInterval = WINRT_GLES_SetSwapInterval;
+    device->GL_GetSwapInterval = WINRT_GLES_GetSwapInterval;
+    device->GL_SwapWindow = WINRT_GLES_SwapWindow;
+    device->GL_DeleteContext = WINRT_GLES_DeleteContext;
+#endif
+    device->free = WINRT_DeleteDevice;
+    WINRT_GlobalSDLVideoDevice = device;
+
+    return device;
+}
+
+#define WINRTVID_DRIVER_NAME "winrt"
+VideoBootStrap WINRT_bootstrap = {
+    WINRTVID_DRIVER_NAME, "SDL WinRT video driver",
+    WINRT_Available, WINRT_CreateDevice
+};
+
+int
+WINRT_VideoInit(_THIS)
+{
+    if (WINRT_InitModes(_this) < 0) {
+        return -1;
+    }
+    WINRT_InitMouse(_this);
+    WINRT_InitTouch(_this);
+
+    return 0;
+}
+
+int
+WINRT_CalcDisplayModeUsingNativeWindow(SDL_DisplayMode * mode)
+{
+    SDL_DisplayModeData * driverdata;
+
+    using namespace Windows::Graphics::Display;
+
+    // Go no further if a native window cannot be accessed.  This can happen,
+    // for example, if this function is called from certain threads, such as
+    // the SDL/XAML thread.
+    if (!CoreWindow::GetForCurrentThread()) {
+        return SDL_SetError("SDL/WinRT display modes cannot be calculated outside of the main thread, such as in SDL's XAML thread");
+    }
+
+    // Calculate the display size given the window size, taking into account
+    // the current display's DPI:
+#if NTDDI_VERSION > NTDDI_WIN8
+    const float currentDPI = DisplayInformation::GetForCurrentView()->LogicalDpi;
+#else
+    const float currentDPI = Windows::Graphics::Display::DisplayProperties::LogicalDpi;
+#endif
+    const float dipsPerInch = 96.0f;
+    const int w = (int) ((CoreWindow::GetForCurrentThread()->Bounds.Width * currentDPI) / dipsPerInch);
+    const int h = (int) ((CoreWindow::GetForCurrentThread()->Bounds.Height * currentDPI) / dipsPerInch);
+    if (w == 0 || w == h) {
+        return SDL_SetError("Unable to calculate the WinRT window/display's size");
+    }
+
+    // Create a driverdata field:
+    driverdata = (SDL_DisplayModeData *) SDL_malloc(sizeof(*driverdata));
+    if (!driverdata) {
+        return SDL_OutOfMemory();
+    }
+    SDL_zerop(driverdata);
+
+    // Fill in most fields:
+    SDL_zerop(mode);
+    mode->format = SDL_PIXELFORMAT_RGB888;
+    mode->refresh_rate = 0;  // TODO, WinRT: see if refresh rate data is available, or relevant (for WinRT apps)
+    mode->w = w;
+    mode->h = h;
+    mode->driverdata = driverdata;
+#if NTDDI_VERSION > NTDDI_WIN8
+    driverdata->currentOrientation = DisplayInformation::GetForCurrentView()->CurrentOrientation;
+#else
+    driverdata->currentOrientation = DisplayProperties::CurrentOrientation;
+#endif
+
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+    // On Windows Phone, the native window's size is always in portrait,
+    // regardless of the device's orientation.  This is in contrast to
+    // Windows 8/RT, which will resize the native window as the device's
+    // orientation changes.  In order to compensate for this behavior,
+    // on Windows Phone, the mode's width and height will be swapped when
+    // the device is in a landscape (non-portrait) mode.
+    switch (DisplayProperties::CurrentOrientation) {
+        case DisplayOrientations::Landscape:
+        case DisplayOrientations::LandscapeFlipped:
+        {
+            const int tmp = mode->h;
+            mode->h = mode->w;
+            mode->w = tmp;
+            break;
+        }
+
+        default:
+            break;
+    }
+#endif
+
+    return 0;
+}
+
+int
+WINRT_DuplicateDisplayMode(SDL_DisplayMode * dest, const SDL_DisplayMode * src)
+{
+    SDL_DisplayModeData * driverdata;
+    driverdata = (SDL_DisplayModeData *) SDL_malloc(sizeof(*driverdata));
+    if (!driverdata) {
+        return SDL_OutOfMemory();
+    }
+    SDL_memcpy(driverdata, src->driverdata, sizeof(SDL_DisplayModeData));
+    SDL_memcpy(dest, src, sizeof(SDL_DisplayMode));
+    dest->driverdata = driverdata;
+    return 0;
+}
+
+int
+WINRT_InitModes(_THIS)
+{
+    // Retrieve the display mode:
+    SDL_DisplayMode mode, desktop_mode;
+    if (WINRT_CalcDisplayModeUsingNativeWindow(&mode) != 0) {
+        return -1;	// If WINRT_CalcDisplayModeUsingNativeWindow fails, it'll already have set the SDL error
+    }
+
+    if (WINRT_DuplicateDisplayMode(&desktop_mode, &mode) != 0) {
+        return -1;
+    }
+    if (SDL_AddBasicVideoDisplay(&desktop_mode) < 0) {
+        return -1;
+    }
+
+    SDL_AddDisplayMode(&_this->displays[0], &mode);
+    return 0;
+}
+
+static int
+WINRT_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
+{
+    return 0;
+}
+
+void
+WINRT_VideoQuit(_THIS)
+{
+    WINRT_QuitMouse(_this);
+}
+
+int
+WINRT_CreateWindow(_THIS, SDL_Window * window)
+{
+    // Make sure that only one window gets created, at least until multimonitor
+    // support is added.
+    if (WINRT_GlobalSDLWindow != NULL) {
+        SDL_SetError("WinRT only supports one window");
+        return -1;
+    }
+
+    SDL_WindowData *data = new SDL_WindowData;
+    if (!data) {
+        SDL_OutOfMemory();
+        return -1;
+    }
+    window->driverdata = data;
+    data->sdlWindow = window;
+
+    /* To note, when XAML support is enabled, access to the CoreWindow will not
+       be possible, at least not via the SDL/XAML thread.  Attempts to access it
+       from there will throw exceptions.  As such, the SDL_WindowData's
+       'coreWindow' field will only be set (to a non-null value) if XAML isn't
+       enabled.
+    */
+    if (!WINRT_XAMLWasEnabled) {
+        data->coreWindow = CoreWindow::GetForCurrentThread();
+    }
+
+#if SDL_VIDEO_OPENGL_EGL
+    /* Setup the EGL surface, but only if OpenGL ES 2 was requested. */
+    if (!(window->flags & SDL_WINDOW_OPENGL)) {
+        /* OpenGL ES 2 wasn't requested.  Don't set up an EGL surface. */
+        data->egl_surface = EGL_NO_SURFACE;
+    } else {
+        /* OpenGL ES 2 was reuqested.  Set up an EGL surface. */
+
+        /* HACK: ANGLE/WinRT currently uses non-pointer, C++ objects to represent
+           native windows.  The object only contains a single pointer to a COM
+           interface pointer, which on x86 appears to be castable to the object
+           without apparant problems.  On other platforms, notable ARM and x64,
+           doing so will cause a crash.  To avoid this crash, we'll bypass
+           SDL's normal call to eglCreateWindowSurface, which is invoked from C
+           code, and call it here, where an appropriate C++ object may be
+           passed in.
+         */
+        typedef EGLSurface (*eglCreateWindowSurfaceFunction)(EGLDisplay dpy, EGLConfig config,
+            Microsoft::WRL::ComPtr<IUnknown> win,
+            const EGLint *attrib_list);
+        eglCreateWindowSurfaceFunction WINRT_eglCreateWindowSurface =
+            (eglCreateWindowSurfaceFunction) _this->egl_data->eglCreateWindowSurface;
+
+        Microsoft::WRL::ComPtr<IUnknown> nativeWindow = reinterpret_cast<IUnknown *>(data->coreWindow.Get());
+        data->egl_surface = WINRT_eglCreateWindowSurface(
+            _this->egl_data->egl_display,
+            _this->egl_data->egl_config,
+            nativeWindow, NULL);
+        if (data->egl_surface == NULL) {
+            // TODO, WinRT: see if eglCreateWindowSurface, or its callee(s), sets an error message.  If so, attach it to the SDL error.
+            return SDL_SetError("eglCreateWindowSurface failed");
+        }
+    }
+#endif
+
+    /* Make sure the window is considered to be positioned at {0,0},
+       and is considered fullscreen, shown, and the like.
+    */
+    window->x = 0;
+    window->y = 0;
+    window->flags =
+        SDL_WINDOW_FULLSCREEN |
+        SDL_WINDOW_SHOWN |
+        SDL_WINDOW_BORDERLESS |
+        SDL_WINDOW_MAXIMIZED |
+        SDL_WINDOW_INPUT_GRABBED;
+
+#if SDL_VIDEO_OPENGL_EGL
+    if (data->egl_surface) {
+        window->flags |= SDL_WINDOW_OPENGL;
+    }
+#endif
+
+    /* WinRT does not, as of this writing, appear to support app-adjustable
+       window sizes.  Set the window size to whatever the native WinRT
+       CoreWindow is set at.
+
+       TODO, WinRT: if and when non-fullscreen XAML control support is added to SDL, consider making those resizable via SDL_Window's interfaces.
+    */
+    window->w = _this->displays[0].current_mode.w;
+    window->h = _this->displays[0].current_mode.h;
+
+    /* For now, treat WinRT apps as if they always have focus.
+       TODO, WinRT: try tracking keyboard and mouse focus state with respect to snapped apps
+     */
+    SDL_SetMouseFocus(window);
+    SDL_SetKeyboardFocus(window);
+ 
+    /* Make sure the WinRT app's IFramworkView can post events on
+       behalf of SDL:
+    */
+    WINRT_GlobalSDLWindow = window;
+
+    /* All done! */
+    return 0;
+}
+
+void
+WINRT_DestroyWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData * data = (SDL_WindowData *) window->driverdata;
+
+    if (WINRT_GlobalSDLWindow == window) {
+        WINRT_GlobalSDLWindow = NULL;
+    }
+
+    if (data) {
+        // Delete the internal window data:
+        delete data;
+        data = NULL;
+    }
+}
+
+SDL_bool
+WINRT_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
+{
+    SDL_WindowData * data = (SDL_WindowData *) window->driverdata;
+
+    if (info->version.major <= SDL_MAJOR_VERSION) {
+        info->subsystem = SDL_SYSWM_WINRT;
+        info->info.winrt.window = reinterpret_cast<IInspectable *>(data->coreWindow.Get());
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("Application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+    return SDL_FALSE;
+}
+
+#endif /* SDL_VIDEO_DRIVER_WINRT */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/winrt/SDL_winrtvideo_cpp.h b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtvideo_cpp.h
new file mode 100644
index 000000000..b5f44510d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/winrt/SDL_winrtvideo_cpp.h	
@@ -0,0 +1,79 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* Windows includes: */
+#include <windows.h>
+#ifdef __cplusplus_winrt
+#include <agile.h>
+#endif
+
+/* SDL includes: */
+#include "SDL_video.h"
+#include "SDL_events.h"
+
+extern "C" {
+#include "../SDL_sysvideo.h"
+#include "../SDL_egl_c.h"
+}
+
+
+/* The global, WinRT, SDL Window.
+   For now, SDL/WinRT only supports one window (due to platform limitations of
+   WinRT.
+*/
+extern SDL_Window * WINRT_GlobalSDLWindow;
+
+/* The global, WinRT, video device. */
+extern SDL_VideoDevice * WINRT_GlobalSDLVideoDevice;
+
+/* Creates a display mode for Plain Direct3D (non-XAML) apps, using the lone, native window's settings.
+
+   Pass in an allocated SDL_DisplayMode field to store the data in.
+
+   This function will return 0 on success, -1 on failure.
+
+   If this function succeeds, be sure to call SDL_free on the
+   SDL_DisplayMode's driverdata field.
+*/
+extern int WINRT_CalcDisplayModeUsingNativeWindow(SDL_DisplayMode * mode);
+
+/* Duplicates a display mode, copying over driverdata as necessary */
+extern int WINRT_DuplicateDisplayMode(SDL_DisplayMode * dest, const SDL_DisplayMode * src);
+
+/* Display mode internals */
+typedef struct
+{
+    Windows::Graphics::Display::DisplayOrientations currentOrientation;
+} SDL_DisplayModeData;
+
+#ifdef __cplusplus_winrt
+
+/* Internal window data */
+struct SDL_WindowData
+{
+    SDL_Window *sdlWindow;
+    Platform::Agile<Windows::UI::Core::CoreWindow> coreWindow;
+#ifdef SDL_VIDEO_OPENGL_EGL
+    EGLSurface egl_surface;
+#endif
+};
+
+#endif // ifdef __cplusplus_winrt
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11clipboard.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11clipboard.c
new file mode 100644
index 000000000..2999d9837
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11clipboard.c	
@@ -0,0 +1,176 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include <limits.h> /* For INT_MAX */
+
+#include "SDL_events.h"
+#include "SDL_x11video.h"
+#include "SDL_timer.h"
+
+
+/* If you don't support UTF-8, you might use XA_STRING here */
+#ifdef X_HAVE_UTF8_STRING
+#define TEXT_FORMAT X11_XInternAtom(display, "UTF8_STRING", False)
+#else
+#define TEXT_FORMAT XA_STRING
+#endif
+
+/* Get any application owned window handle for clipboard association */
+static Window
+GetWindow(_THIS)
+{
+    SDL_Window *window;
+
+    window = _this->windows;
+    if (window) {
+        return ((SDL_WindowData *) window->driverdata)->xwindow;
+    }
+    return None;
+}
+
+int
+X11_SetClipboardText(_THIS, const char *text)
+{
+    Display *display = ((SDL_VideoData *) _this->driverdata)->display;
+    Atom format;
+    Window window;
+    Atom XA_CLIPBOARD = X11_XInternAtom(display, "CLIPBOARD", 0);
+
+    /* Get the SDL window that will own the selection */
+    window = GetWindow(_this);
+    if (window == None) {
+        return SDL_SetError("Couldn't find a window to own the selection");
+    }
+
+    /* Save the selection on the root window */
+    format = TEXT_FORMAT;
+    X11_XChangeProperty(display, DefaultRootWindow(display),
+        XA_CUT_BUFFER0, format, 8, PropModeReplace,
+        (const unsigned char *)text, SDL_strlen(text));
+
+    if (XA_CLIPBOARD != None &&
+        X11_XGetSelectionOwner(display, XA_CLIPBOARD) != window) {
+        X11_XSetSelectionOwner(display, XA_CLIPBOARD, window, CurrentTime);
+    }
+
+    if (X11_XGetSelectionOwner(display, XA_PRIMARY) != window) {
+        X11_XSetSelectionOwner(display, XA_PRIMARY, window, CurrentTime);
+    }
+    return 0;
+}
+
+char *
+X11_GetClipboardText(_THIS)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    Display *display = videodata->display;
+    Atom format;
+    Window window;
+    Window owner;
+    Atom selection;
+    Atom seln_type;
+    int seln_format;
+    unsigned long nbytes;
+    unsigned long overflow;
+    unsigned char *src;
+    char *text;
+    Uint32 waitStart;
+    Uint32 waitElapsed;
+    Atom XA_CLIPBOARD = X11_XInternAtom(display, "CLIPBOARD", 0);
+    if (XA_CLIPBOARD == None) {
+        SDL_SetError("Couldn't access X clipboard");
+        return SDL_strdup("");
+    }
+
+    text = NULL;
+
+    /* Get the window that holds the selection */
+    window = GetWindow(_this);
+    format = TEXT_FORMAT;
+    owner = X11_XGetSelectionOwner(display, XA_CLIPBOARD);
+    if ((owner == None) || (owner == window)) {
+        owner = DefaultRootWindow(display);
+        selection = XA_CUT_BUFFER0;
+    } else {
+        /* Request that the selection owner copy the data to our window */
+        owner = window;
+        selection = X11_XInternAtom(display, "SDL_SELECTION", False);
+        X11_XConvertSelection(display, XA_CLIPBOARD, format, selection, owner,
+            CurrentTime);
+
+        /* When using synergy on Linux and when data has been put in the clipboard
+           on the remote (Windows anyway) machine then selection_waiting may never
+           be set to False. Time out after a while. */
+        waitStart = SDL_GetTicks();
+        videodata->selection_waiting = SDL_TRUE;
+        while (videodata->selection_waiting) {
+            SDL_PumpEvents();
+            waitElapsed = SDL_GetTicks() - waitStart;
+            /* Wait one second for a clipboard response. */
+            if (waitElapsed > 1000) {
+                videodata->selection_waiting = SDL_FALSE;
+                SDL_SetError("Clipboard timeout");
+                /* We need to set the clipboard text so that next time we won't
+                   timeout, otherwise we will hang on every call to this function. */
+                X11_SetClipboardText(_this, "");
+                return SDL_strdup("");
+            }
+        }
+    }
+
+    if (X11_XGetWindowProperty(display, owner, selection, 0, INT_MAX/4, False,
+            format, &seln_type, &seln_format, &nbytes, &overflow, &src)
+            == Success) {
+        if (seln_type == format) {
+            text = (char *)SDL_malloc(nbytes+1);
+            if (text) {
+                SDL_memcpy(text, src, nbytes);
+                text[nbytes] = '\0';
+            }
+        }
+        X11_XFree(src);
+    }
+
+    if (!text) {
+        text = SDL_strdup("");
+    }
+
+    return text;
+}
+
+SDL_bool
+X11_HasClipboardText(_THIS)
+{
+    SDL_bool result = SDL_FALSE;
+    char *text = X11_GetClipboardText(_this);
+    if (text) {
+        result = text[0] != '\0' ? SDL_TRUE : SDL_FALSE;
+        SDL_free(text);
+    }
+    return result;
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11clipboard.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11clipboard.h
new file mode 100644
index 000000000..46291cf60
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11clipboard.h	
@@ -0,0 +1,32 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11clipboard_h
+#define _SDL_x11clipboard_h
+
+extern int X11_SetClipboardText(_THIS, const char *text);
+extern char *X11_GetClipboardText(_THIS);
+extern SDL_bool X11_HasClipboardText(_THIS);
+
+#endif /* _SDL_x11clipboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11dyn.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11dyn.c
new file mode 100644
index 000000000..97760ba32
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11dyn.c	
@@ -0,0 +1,227 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#define DEBUG_DYNAMIC_X11 0
+
+#include "SDL_x11dyn.h"
+
+#if DEBUG_DYNAMIC_X11
+#include <stdio.h>
+#endif
+
+#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
+
+#include "SDL_name.h"
+#include "SDL_loadso.h"
+
+typedef struct
+{
+    void *lib;
+    const char *libname;
+} x11dynlib;
+
+#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS NULL
+#endif
+#ifndef SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE NULL
+#endif
+
+static x11dynlib x11libs[] = {
+    {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC},
+    {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT},
+    {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR},
+    {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA},
+    {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2},
+    {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR},
+    {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS},
+    {NULL, SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE}
+};
+
+static void *
+X11_GetSym(const char *fnname, int *pHasModule)
+{
+    int i;
+    void *fn = NULL;
+    for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
+        if (x11libs[i].lib != NULL) {
+            fn = SDL_LoadFunction(x11libs[i].lib, fnname);
+            if (fn != NULL)
+                break;
+        }
+    }
+
+#if DEBUG_DYNAMIC_X11
+    if (fn != NULL)
+        printf("X11: Found '%s' in %s (%p)\n", fnname, x11libs[i].libname, fn);
+    else
+        printf("X11: Symbol '%s' NOT FOUND!\n", fnname);
+#endif
+
+    if (fn == NULL)
+        *pHasModule = 0;  /* kill this module. */
+
+    return fn;
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11_DYNAMIC */
+
+/* Define all the function pointers and wrappers... */
+#define SDL_X11_MODULE(modname)
+#define SDL_X11_SYM(rc,fn,params,args,ret) SDL_DYNX11FN_##fn X11_##fn = NULL;
+#include "SDL_x11sym.h"
+#undef SDL_X11_MODULE
+#undef SDL_X11_SYM
+
+/* Annoying varargs entry point... */
+#ifdef X_HAVE_UTF8_STRING
+SDL_DYNX11FN_XCreateIC X11_XCreateIC = NULL;
+SDL_DYNX11FN_XGetICValues X11_XGetICValues = NULL;
+#endif
+
+/* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */
+#define SDL_X11_MODULE(modname) int SDL_X11_HAVE_##modname = 0;
+#define SDL_X11_SYM(rc,fn,params,args,ret)
+#include "SDL_x11sym.h"
+#undef SDL_X11_MODULE
+#undef SDL_X11_SYM
+
+static int x11_load_refcount = 0;
+
+void
+SDL_X11_UnloadSymbols(void)
+{
+    /* Don't actually unload if more than one module is using the libs... */
+    if (x11_load_refcount > 0) {
+        if (--x11_load_refcount == 0) {
+            int i;
+
+            /* set all the function pointers to NULL. */
+#define SDL_X11_MODULE(modname) SDL_X11_HAVE_##modname = 0;
+#define SDL_X11_SYM(rc,fn,params,args,ret) X11_##fn = NULL;
+#include "SDL_x11sym.h"
+#undef SDL_X11_MODULE
+#undef SDL_X11_SYM
+
+#ifdef X_HAVE_UTF8_STRING
+            X11_XCreateIC = NULL;
+            X11_XGetICValues = NULL;
+#endif
+
+#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
+            for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
+                if (x11libs[i].lib != NULL) {
+                    SDL_UnloadObject(x11libs[i].lib);
+                    x11libs[i].lib = NULL;
+                }
+            }
+#endif
+        }
+    }
+}
+
+/* returns non-zero if all needed symbols were loaded. */
+int
+SDL_X11_LoadSymbols(void)
+{
+    int rc = 1;                 /* always succeed if not using Dynamic X11 stuff. */
+
+    /* deal with multiple modules (dga, x11, etc) needing these symbols... */
+    if (x11_load_refcount++ == 0) {
+#ifdef SDL_VIDEO_DRIVER_X11_DYNAMIC
+        int i;
+        int *thismod = NULL;
+        for (i = 0; i < SDL_TABLESIZE(x11libs); i++) {
+            if (x11libs[i].libname != NULL) {
+                x11libs[i].lib = SDL_LoadObject(x11libs[i].libname);
+            }
+        }
+
+#define SDL_X11_MODULE(modname) SDL_X11_HAVE_##modname = 1; /* default yes */
+#define SDL_X11_SYM(a,fn,x,y,z)
+#include "SDL_x11sym.h"
+#undef SDL_X11_MODULE
+#undef SDL_X11_SYM
+
+#define SDL_X11_MODULE(modname) thismod = &SDL_X11_HAVE_##modname;
+#define SDL_X11_SYM(a,fn,x,y,z) X11_##fn = (SDL_DYNX11FN_##fn) X11_GetSym(#fn,thismod);
+#include "SDL_x11sym.h"
+#undef SDL_X11_MODULE
+#undef SDL_X11_SYM
+
+#ifdef X_HAVE_UTF8_STRING
+        X11_XCreateIC = (SDL_DYNX11FN_XCreateIC)
+                        X11_GetSym("XCreateIC", &SDL_X11_HAVE_UTF8);
+        X11_XGetICValues = (SDL_DYNX11FN_XGetICValues)
+                        X11_GetSym("XGetICValues", &SDL_X11_HAVE_UTF8);
+#endif
+
+        if (SDL_X11_HAVE_BASEXLIB) {
+            /* all required symbols loaded. */
+            SDL_ClearError();
+        } else {
+            /* in case something got loaded... */
+            SDL_X11_UnloadSymbols();
+            rc = 0;
+        }
+
+#else  /* no dynamic X11 */
+
+#define SDL_X11_MODULE(modname) SDL_X11_HAVE_##modname = 1; /* default yes */
+#define SDL_X11_SYM(a,fn,x,y,z) X11_##fn = fn;
+#include "SDL_x11sym.h"
+#undef SDL_X11_MODULE
+#undef SDL_X11_SYM
+
+#ifdef X_HAVE_UTF8_STRING
+        X11_XCreateIC = XCreateIC;
+        X11_XGetICValues = XGetICValues;
+#endif
+#endif
+    }
+
+    return rc;
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11dyn.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11dyn.h
new file mode 100644
index 000000000..7d2e077c6
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11dyn.h	
@@ -0,0 +1,114 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11dyn_h
+#define _SDL_x11dyn_h
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+
+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+#include <X11/XKBlib.h>
+#endif
+
+/* Apparently some X11 systems can't include this multiple times... */
+#ifndef SDL_INCLUDED_XLIBINT_H
+#define SDL_INCLUDED_XLIBINT_H 1
+#include <X11/Xlibint.h>
+#endif
+
+#include <X11/Xproto.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
+
+#ifndef NO_SHARED_MEMORY
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+#endif
+
+#if SDL_VIDEO_DRIVER_X11_XCURSOR
+#include <X11/Xcursor/Xcursor.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XINPUT2
+#include <X11/extensions/XInput2.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+#include <X11/extensions/Xrandr.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XSCRNSAVER
+#include <X11/extensions/scrnsaver.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XSHAPE
+#include <X11/extensions/shape.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+#include <X11/extensions/xf86vmode.h>
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* evil function signatures... */
+typedef Bool(*SDL_X11_XESetWireToEventRetType) (Display *, XEvent *, xEvent *);
+typedef int (*SDL_X11_XSynchronizeRetType) (Display *);
+typedef Status(*SDL_X11_XESetEventToWireRetType) (Display *, XEvent *, xEvent *);
+
+int SDL_X11_LoadSymbols(void);
+void SDL_X11_UnloadSymbols(void);
+
+/* Declare all the function pointers and wrappers... */
+#define SDL_X11_MODULE(modname)
+#define SDL_X11_SYM(rc,fn,params,args,ret) \
+    typedef rc (*SDL_DYNX11FN_##fn) params; \
+    extern SDL_DYNX11FN_##fn X11_##fn;
+#include "SDL_x11sym.h"
+#undef SDL_X11_MODULE
+#undef SDL_X11_SYM
+
+/* Annoying varargs entry point... */
+#ifdef X_HAVE_UTF8_STRING
+typedef XIC(*SDL_DYNX11FN_XCreateIC) (XIM,...);
+typedef char *(*SDL_DYNX11FN_XGetICValues) (XIC, ...);
+extern SDL_DYNX11FN_XCreateIC X11_XCreateIC;
+extern SDL_DYNX11FN_XGetICValues X11_XGetICValues;
+#endif
+
+/* These SDL_X11_HAVE_* flags are here whether you have dynamic X11 or not. */
+#define SDL_X11_MODULE(modname) extern int SDL_X11_HAVE_##modname;
+#define SDL_X11_SYM(rc,fn,params,args,ret)
+#include "SDL_x11sym.h"
+#undef SDL_X11_MODULE
+#undef SDL_X11_SYM
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif                          /* !defined _SDL_x11dyn_h */
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11events.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11events.c
new file mode 100644
index 000000000..ad3c59d6a
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11events.c	
@@ -0,0 +1,1062 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <signal.h>
+#include <unistd.h>
+#include <limits.h> /* For INT_MAX */
+
+#include "SDL_x11video.h"
+#include "SDL_x11touch.h"
+#include "SDL_x11xinput2.h"
+#include "../../events/SDL_events_c.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_touch_c.h"
+
+#include "SDL_timer.h"
+#include "SDL_syswm.h"
+
+#include <stdio.h>
+
+typedef struct {
+    unsigned char *data;
+    int format, count;
+    Atom type;
+} SDL_x11Prop;
+
+/* Reads property
+   Must call X11_XFree on results
+ */
+static void X11_ReadProperty(SDL_x11Prop *p, Display *disp, Window w, Atom prop)
+{
+    unsigned char *ret=NULL;
+    Atom type;
+    int fmt;
+    unsigned long count;
+    unsigned long bytes_left;
+    int bytes_fetch = 0;
+
+    do {
+        if (ret != 0) X11_XFree(ret);
+        X11_XGetWindowProperty(disp, w, prop, 0, bytes_fetch, False, AnyPropertyType, &type, &fmt, &count, &bytes_left, &ret);
+        bytes_fetch += bytes_left;
+    } while (bytes_left != 0);
+
+    p->data=ret;
+    p->format=fmt;
+    p->count=count;
+    p->type=type;
+}
+
+/* Find text-uri-list in a list of targets and return it's atom
+   if available, else return None */
+static Atom X11_PickTarget(Display *disp, Atom list[], int list_count)
+{
+    Atom request = None;
+    char *name;
+    int i;
+    for (i=0; i < list_count && request == None; i++) {
+        name = X11_XGetAtomName(disp, list[i]);
+        if (strcmp("text/uri-list", name)==0) request = list[i];
+        X11_XFree(name);
+    }
+    return request;
+}
+
+/* Wrapper for X11_PickTarget for a maximum of three targets, a special
+   case in the Xdnd protocol */
+static Atom X11_PickTargetFromAtoms(Display *disp, Atom a0, Atom a1, Atom a2)
+{
+    int count=0;
+    Atom atom[3];
+    if (a0 != None) atom[count++] = a0;
+    if (a1 != None) atom[count++] = a1;
+    if (a2 != None) atom[count++] = a2;
+    return X11_PickTarget(disp, atom, count);
+}
+/* #define DEBUG_XEVENTS */
+
+struct KeyRepeatCheckData
+{
+    XEvent *event;
+    SDL_bool found;
+};
+
+static Bool X11_KeyRepeatCheckIfEvent(Display *display, XEvent *chkev,
+    XPointer arg)
+{
+    struct KeyRepeatCheckData *d = (struct KeyRepeatCheckData *) arg;
+    if (chkev->type == KeyPress &&
+        chkev->xkey.keycode == d->event->xkey.keycode &&
+        chkev->xkey.time - d->event->xkey.time < 2)
+        d->found = SDL_TRUE;
+    return False;
+}
+
+/* Check to see if this is a repeated key.
+   (idea shamelessly lifted from GII -- thanks guys! :)
+ */
+static SDL_bool X11_KeyRepeat(Display *display, XEvent *event)
+{
+    XEvent dummyev;
+    struct KeyRepeatCheckData d;
+    d.event = event;
+    d.found = SDL_FALSE;
+    if (X11_XPending(display))
+        X11_XCheckIfEvent(display, &dummyev, X11_KeyRepeatCheckIfEvent,
+            (XPointer) &d);
+    return d.found;
+}
+
+static Bool X11_IsWheelCheckIfEvent(Display *display, XEvent *chkev,
+    XPointer arg)
+{
+    XEvent *event = (XEvent *) arg;
+    /* we only handle buttons 4 and 5 - false positive avoidance */
+    if (chkev->type == ButtonRelease &&
+        (event->xbutton.button == Button4 || event->xbutton.button == Button5) &&
+        chkev->xbutton.button == event->xbutton.button &&
+        chkev->xbutton.time == event->xbutton.time)
+        return True;
+    return False;
+}
+
+static SDL_bool X11_IsWheelEvent(Display * display,XEvent * event,int * ticks)
+{
+    XEvent relevent;
+    if (X11_XPending(display)) {
+        /* according to the xlib docs, no specific mouse wheel events exist.
+           however, mouse wheel events trigger a button press and a button release
+           immediately. thus, checking if the same button was released at the same
+           time as it was pressed, should be an adequate hack to derive a mouse
+           wheel event.
+           However, there is broken and unusual hardware out there...
+           - False positive: a button for which a release event is
+             generated (or synthesised) immediately.
+           - False negative: a wheel which, when rolled, doesn't have
+             a release event generated immediately. */
+        if (X11_XCheckIfEvent(display, &relevent, X11_IsWheelCheckIfEvent,
+            (XPointer) event)) {
+
+            /* by default, X11 only knows 5 buttons. on most 3 button + wheel mouse,
+               Button4 maps to wheel up, Button5 maps to wheel down. */
+            if (event->xbutton.button == Button4) {
+                *ticks = 1;
+            }
+            else if (event->xbutton.button == Button5) {
+                *ticks = -1;
+            }
+            return SDL_TRUE;
+        }
+    }
+    return SDL_FALSE;
+}
+
+/* Convert URI to local filename
+   return filename if possible, else NULL
+*/
+static char* X11_URIToLocal(char* uri) {
+    char *file = NULL;
+    SDL_bool local;
+
+    if (memcmp(uri,"file:/",6) == 0) uri += 6;      /* local file? */
+    else if (strstr(uri,":/") != NULL) return file; /* wrong scheme */
+
+    local = uri[0] != '/' || ( uri[0] != '\0' && uri[1] == '/' );
+
+    /* got a hostname? */
+    if ( !local && uri[0] == '/' && uri[2] != '/' ) {
+      char* hostname_end = strchr( uri+1, '/' );
+      if ( hostname_end != NULL ) {
+          char hostname[ 257 ];
+          if ( gethostname( hostname, 255 ) == 0 ) {
+            hostname[ 256 ] = '\0';
+            if ( memcmp( uri+1, hostname, hostname_end - ( uri+1 )) == 0 ) {
+                uri = hostname_end + 1;
+                local = SDL_TRUE;
+            }
+          }
+      }
+    }
+    if ( local ) {
+      file = uri;
+      if ( uri[1] == '/' ) {
+          file++;
+      } else {
+          file--;
+      }
+    }
+    return file;
+}
+
+#if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
+static void X11_HandleGenericEvent(SDL_VideoData *videodata,XEvent event)
+{
+    /* event is a union, so cookie == &event, but this is type safe. */
+    XGenericEventCookie *cookie = &event.xcookie;
+    if (X11_XGetEventData(videodata->display, cookie)) {
+        X11_HandleXinput2Event(videodata, cookie);
+        X11_XFreeEventData(videodata->display, cookie);
+    }
+}
+#endif /* SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS */
+
+
+static void
+X11_DispatchFocusIn(SDL_WindowData *data)
+{
+#ifdef DEBUG_XEVENTS
+    printf("window %p: Dispatching FocusIn\n", data);
+#endif
+    SDL_SetKeyboardFocus(data->window);
+#ifdef X_HAVE_UTF8_STRING
+    if (data->ic) {
+        X11_XSetICFocus(data->ic);
+    }
+#endif
+}
+
+static void
+X11_DispatchFocusOut(SDL_WindowData *data)
+{
+#ifdef DEBUG_XEVENTS
+    printf("window %p: Dispatching FocusOut\n", data);
+#endif
+    /* If another window has already processed a focus in, then don't try to
+     * remove focus here.  Doing so will incorrectly remove focus from that
+     * window, and the focus lost event for this window will have already
+     * been dispatched anyway. */
+    if (data->window == SDL_GetKeyboardFocus()) {
+        SDL_SetKeyboardFocus(NULL);
+    }
+#ifdef X_HAVE_UTF8_STRING
+    if (data->ic) {
+        X11_XUnsetICFocus(data->ic);
+    }
+#endif
+}
+
+static void
+X11_DispatchMapNotify(SDL_WindowData *data)
+{
+    SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
+    SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESTORED, 0, 0);
+}
+
+static void
+X11_DispatchUnmapNotify(SDL_WindowData *data)
+{
+    SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
+    SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
+}
+
+static void
+X11_DispatchEvent(_THIS)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    Display *display = videodata->display;
+    SDL_WindowData *data;
+    XEvent xevent;
+    int orig_event_type;
+    KeyCode orig_keycode;
+    XClientMessageEvent m;
+    int i;
+
+    SDL_zero(xevent);           /* valgrind fix. --ryan. */
+    X11_XNextEvent(display, &xevent);
+
+    /* Save the original keycode for dead keys, which are filtered out by
+       the XFilterEvent() call below.
+    */
+    orig_event_type = xevent.type;
+    if (orig_event_type == KeyPress || orig_event_type == KeyRelease) {
+        orig_keycode = xevent.xkey.keycode;
+    } else {
+        orig_keycode = 0;
+    }
+
+    /* filter events catchs XIM events and sends them to the correct handler */
+    if (X11_XFilterEvent(&xevent, None) == True) {
+#if 0
+        printf("Filtered event type = %d display = %d window = %d\n",
+               xevent.type, xevent.xany.display, xevent.xany.window);
+#endif
+        if (orig_keycode) {
+            /* Make sure dead key press/release events are sent */
+            SDL_Scancode scancode = videodata->key_layout[orig_keycode];
+            if (orig_event_type == KeyPress) {
+                SDL_SendKeyboardKey(SDL_PRESSED, scancode);
+            } else {
+                SDL_SendKeyboardKey(SDL_RELEASED, scancode);
+            }
+        }
+        return;
+    }
+
+    /* Send a SDL_SYSWMEVENT if the application wants them */
+    if (SDL_GetEventState(SDL_SYSWMEVENT) == SDL_ENABLE) {
+        SDL_SysWMmsg wmmsg;
+
+        SDL_VERSION(&wmmsg.version);
+        wmmsg.subsystem = SDL_SYSWM_X11;
+        wmmsg.msg.x11.event = xevent;
+        SDL_SendSysWMEvent(&wmmsg);
+    }
+
+#if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
+    if(xevent.type == GenericEvent) {
+        X11_HandleGenericEvent(videodata,xevent);
+        return;
+    }
+#endif
+
+#if 0
+    printf("type = %d display = %d window = %d\n",
+           xevent.type, xevent.xany.display, xevent.xany.window);
+#endif
+
+    data = NULL;
+    if (videodata && videodata->windowlist) {
+        for (i = 0; i < videodata->numwindows; ++i) {
+            if ((videodata->windowlist[i] != NULL) &&
+                (videodata->windowlist[i]->xwindow == xevent.xany.window)) {
+                data = videodata->windowlist[i];
+                break;
+            }
+        }
+    }
+    if (!data) {
+        return;
+    }
+
+    switch (xevent.type) {
+
+        /* Gaining mouse coverage? */
+    case EnterNotify:{
+#ifdef DEBUG_XEVENTS
+            printf("window %p: EnterNotify! (%d,%d,%d)\n", data,
+                   xevent.xcrossing.x,
+                   xevent.xcrossing.y,
+                   xevent.xcrossing.mode);
+            if (xevent.xcrossing.mode == NotifyGrab)
+                printf("Mode: NotifyGrab\n");
+            if (xevent.xcrossing.mode == NotifyUngrab)
+                printf("Mode: NotifyUngrab\n");
+#endif
+            SDL_SetMouseFocus(data->window);
+
+            if (!SDL_GetMouse()->relative_mode) {
+                SDL_SendMouseMotion(data->window, 0, 0, xevent.xcrossing.x, xevent.xcrossing.y);
+            }
+        }
+        break;
+        /* Losing mouse coverage? */
+    case LeaveNotify:{
+#ifdef DEBUG_XEVENTS
+            printf("window %p: LeaveNotify! (%d,%d,%d)\n", data,
+                   xevent.xcrossing.x,
+                   xevent.xcrossing.y,
+                   xevent.xcrossing.mode);
+            if (xevent.xcrossing.mode == NotifyGrab)
+                printf("Mode: NotifyGrab\n");
+            if (xevent.xcrossing.mode == NotifyUngrab)
+                printf("Mode: NotifyUngrab\n");
+#endif
+            if (!SDL_GetMouse()->relative_mode) {
+                SDL_SendMouseMotion(data->window, 0, 0, xevent.xcrossing.x, xevent.xcrossing.y);
+            }
+
+            if (xevent.xcrossing.mode != NotifyGrab &&
+                xevent.xcrossing.mode != NotifyUngrab &&
+                xevent.xcrossing.detail != NotifyInferior) {
+                SDL_SetMouseFocus(NULL);
+            }
+        }
+        break;
+
+        /* Gaining input focus? */
+    case FocusIn:{
+            if (xevent.xfocus.mode == NotifyGrab || xevent.xfocus.mode == NotifyUngrab) {
+                /* Someone is handling a global hotkey, ignore it */
+#ifdef DEBUG_XEVENTS
+                printf("window %p: FocusIn (NotifyGrab/NotifyUngrab, ignoring)\n", data);
+#endif
+                break;
+            }
+
+            if (xevent.xfocus.detail == NotifyInferior) {
+#ifdef DEBUG_XEVENTS
+                printf("window %p: FocusIn (NotifierInferior, ignoring)\n", data);
+#endif
+                break;
+            }
+#ifdef DEBUG_XEVENTS
+            printf("window %p: FocusIn!\n", data);
+#endif
+            if (data->pending_focus == PENDING_FOCUS_OUT &&
+                data->window == SDL_GetKeyboardFocus()) {
+                /* We want to reset the keyboard here, because we may have
+                   missed keyboard messages after our previous FocusOut.
+                 */
+                /* Actually, if we do this we clear the ALT key on Unity
+                   because it briefly takes focus for their dashboard.
+
+                   I think it's better to think the ALT key is held down
+                   when it's not, then always lose the ALT modifier on Unity.
+                 */
+                /* SDL_ResetKeyboard(); */
+            }
+            data->pending_focus = PENDING_FOCUS_IN;
+            data->pending_focus_time = SDL_GetTicks() + PENDING_FOCUS_IN_TIME;
+        }
+        break;
+
+        /* Losing input focus? */
+    case FocusOut:{
+            if (xevent.xfocus.mode == NotifyGrab || xevent.xfocus.mode == NotifyUngrab) {
+                /* Someone is handling a global hotkey, ignore it */
+#ifdef DEBUG_XEVENTS
+                printf("window %p: FocusOut (NotifyGrab/NotifyUngrab, ignoring)\n", data);
+#endif
+                break;
+            }
+            if (xevent.xfocus.detail == NotifyInferior) {
+                /* We still have focus if a child gets focus */
+#ifdef DEBUG_XEVENTS
+                printf("window %p: FocusOut (NotifierInferior, ignoring)\n", data);
+#endif
+                break;
+            }
+#ifdef DEBUG_XEVENTS
+            printf("window %p: FocusOut!\n", data);
+#endif
+            data->pending_focus = PENDING_FOCUS_OUT;
+            data->pending_focus_time = SDL_GetTicks() + PENDING_FOCUS_OUT_TIME;
+        }
+        break;
+
+        /* Generated upon EnterWindow and FocusIn */
+    case KeymapNotify:{
+#ifdef DEBUG_XEVENTS
+            printf("window %p: KeymapNotify!\n", data);
+#endif
+            /* FIXME:
+               X11_SetKeyboardState(SDL_Display, xevent.xkeymap.key_vector);
+             */
+        }
+        break;
+
+        /* Has the keyboard layout changed? */
+    case MappingNotify:{
+#ifdef DEBUG_XEVENTS
+            printf("window %p: MappingNotify!\n", data);
+#endif
+            X11_UpdateKeymap(_this);
+        }
+        break;
+
+        /* Key press? */
+    case KeyPress:{
+            KeyCode keycode = xevent.xkey.keycode;
+            KeySym keysym = NoSymbol;
+            char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
+            Status status = 0;
+
+#ifdef DEBUG_XEVENTS
+            printf("window %p: KeyPress (X11 keycode = 0x%X)\n", data, xevent.xkey.keycode);
+#endif
+            SDL_SendKeyboardKey(SDL_PRESSED, videodata->key_layout[keycode]);
+#if 1
+            if (videodata->key_layout[keycode] == SDL_SCANCODE_UNKNOWN && keycode) {
+                int min_keycode, max_keycode;
+                X11_XDisplayKeycodes(display, &min_keycode, &max_keycode);
+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+                keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
+#else
+                keysym = XKeycodeToKeysym(display, keycode, 0);
+#endif
+                fprintf(stderr,
+                        "The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list <sdl@libsdl.org> X11 KeyCode %d (%d), X11 KeySym 0x%lX (%s).\n",
+                        keycode, keycode - min_keycode, keysym,
+                        X11_XKeysymToString(keysym));
+            }
+#endif
+            /* */
+            SDL_zero(text);
+#ifdef X_HAVE_UTF8_STRING
+            if (data->ic) {
+                X11_Xutf8LookupString(data->ic, &xevent.xkey, text, sizeof(text),
+                                  &keysym, &status);
+            }
+#else
+            XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL);
+#endif
+            if (*text) {
+                SDL_SendKeyboardText(text);
+            }
+        }
+        break;
+
+        /* Key release? */
+    case KeyRelease:{
+            KeyCode keycode = xevent.xkey.keycode;
+
+#ifdef DEBUG_XEVENTS
+            printf("window %p: KeyRelease (X11 keycode = 0x%X)\n", data, xevent.xkey.keycode);
+#endif
+            if (X11_KeyRepeat(display, &xevent)) {
+                /* We're about to get a repeated key down, ignore the key up */
+                break;
+            }
+            SDL_SendKeyboardKey(SDL_RELEASED, videodata->key_layout[keycode]);
+        }
+        break;
+
+        /* Have we been iconified? */
+    case UnmapNotify:{
+#ifdef DEBUG_XEVENTS
+            printf("window %p: UnmapNotify!\n", data);
+#endif
+            X11_DispatchUnmapNotify(data);
+        }
+        break;
+
+        /* Have we been restored? */
+    case MapNotify:{
+#ifdef DEBUG_XEVENTS
+            printf("window %p: MapNotify!\n", data);
+#endif
+            X11_DispatchMapNotify(data);
+        }
+        break;
+
+        /* Have we been resized or moved? */
+    case ConfigureNotify:{
+#ifdef DEBUG_XEVENTS
+            printf("window %p: ConfigureNotify! (position: %d,%d, size: %dx%d)\n", data,
+                   xevent.xconfigure.x, xevent.xconfigure.y,
+                   xevent.xconfigure.width, xevent.xconfigure.height);
+#endif
+            long border_left = 0;
+            long border_right = 0;
+            long border_top = 0;
+            long border_bottom = 0;
+            if (data->xwindow) {
+                Atom _net_frame_extents = X11_XInternAtom(display, "_NET_FRAME_EXTENTS", 0);
+                Atom type = None;
+                int format;
+                unsigned long nitems = 0, bytes_after;
+                unsigned char *property;
+                X11_XGetWindowProperty(display, data->xwindow,
+                    _net_frame_extents, 0, 16, 0,
+                    XA_CARDINAL, &type, &format,
+                    &nitems, &bytes_after, &property);
+
+                if (type != None && nitems == 4)
+                {
+                    border_left = ((long*)property)[0];
+                    border_right = ((long*)property)[1];
+                    border_top = ((long*)property)[2];
+                    border_bottom = ((long*)property)[3];
+                }
+            }
+
+            if (xevent.xconfigure.x != data->last_xconfigure.x ||
+                xevent.xconfigure.y != data->last_xconfigure.y) {
+                SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED,
+                                    xevent.xconfigure.x - border_left,
+                                    xevent.xconfigure.y - border_top);
+            }
+            if (xevent.xconfigure.width != data->last_xconfigure.width ||
+                xevent.xconfigure.height != data->last_xconfigure.height) {
+                SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESIZED,
+                                    xevent.xconfigure.width,
+                                    xevent.xconfigure.height);
+            }
+            data->last_xconfigure = xevent.xconfigure;
+        }
+        break;
+
+        /* Have we been requested to quit (or another client message?) */
+    case ClientMessage:{
+
+            int xdnd_version=0;
+
+            if (xevent.xclient.message_type == videodata->XdndEnter) {
+                SDL_bool use_list = xevent.xclient.data.l[1] & 1;
+                data->xdnd_source = xevent.xclient.data.l[0];
+                xdnd_version = ( xevent.xclient.data.l[1] >> 24);
+                if (use_list) {
+                    /* fetch conversion targets */
+                    SDL_x11Prop p;
+                    X11_ReadProperty(&p, display, data->xdnd_source, videodata->XdndTypeList);
+                    /* pick one */
+                    data->xdnd_req = X11_PickTarget(display, (Atom*)p.data, p.count);
+                    X11_XFree(p.data);
+                } else {
+                    /* pick from list of three */
+                    data->xdnd_req = X11_PickTargetFromAtoms(display, xevent.xclient.data.l[2], xevent.xclient.data.l[3], xevent.xclient.data.l[4]);
+                }
+            }
+            else if (xevent.xclient.message_type == videodata->XdndPosition) {
+
+                /* reply with status */
+                memset(&m, 0, sizeof(XClientMessageEvent));
+                m.type = ClientMessage;
+                m.display = xevent.xclient.display;
+                m.window = xevent.xclient.data.l[0];
+                m.message_type = videodata->XdndStatus;
+                m.format=32;
+                m.data.l[0] = data->xwindow;
+                m.data.l[1] = (data->xdnd_req != None);
+                m.data.l[2] = 0; /* specify an empty rectangle */
+                m.data.l[3] = 0;
+                m.data.l[4] = videodata->XdndActionCopy; /* we only accept copying anyway */
+
+                X11_XSendEvent(display, xevent.xclient.data.l[0], False, NoEventMask, (XEvent*)&m);
+                X11_XFlush(display);
+            }
+            else if(xevent.xclient.message_type == videodata->XdndDrop) {
+                if (data->xdnd_req == None) {
+                    /* say again - not interested! */
+                    memset(&m, 0, sizeof(XClientMessageEvent));
+                    m.type = ClientMessage;
+                    m.display = xevent.xclient.display;
+                    m.window = xevent.xclient.data.l[0];
+                    m.message_type = videodata->XdndFinished;
+                    m.format=32;
+                    m.data.l[0] = data->xwindow;
+                    m.data.l[1] = 0;
+                    m.data.l[2] = None; /* fail! */
+                    X11_XSendEvent(display, xevent.xclient.data.l[0], False, NoEventMask, (XEvent*)&m);
+                } else {
+                    /* convert */
+                    if(xdnd_version >= 1) {
+                        X11_XConvertSelection(display, videodata->XdndSelection, data->xdnd_req, videodata->PRIMARY, data->xwindow, xevent.xclient.data.l[2]);
+                    } else {
+                        X11_XConvertSelection(display, videodata->XdndSelection, data->xdnd_req, videodata->PRIMARY, data->xwindow, CurrentTime);
+                    }
+                }
+            }
+            else if ((xevent.xclient.message_type == videodata->WM_PROTOCOLS) &&
+                (xevent.xclient.format == 32) &&
+                (xevent.xclient.data.l[0] == videodata->_NET_WM_PING)) {
+                Window root = DefaultRootWindow(display);
+
+#ifdef DEBUG_XEVENTS
+                printf("window %p: _NET_WM_PING\n", data);
+#endif
+                xevent.xclient.window = root;
+                X11_XSendEvent(display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &xevent);
+                break;
+            }
+
+            else if ((xevent.xclient.message_type == videodata->WM_PROTOCOLS) &&
+                (xevent.xclient.format == 32) &&
+                (xevent.xclient.data.l[0] == videodata->WM_DELETE_WINDOW)) {
+
+#ifdef DEBUG_XEVENTS
+                printf("window %p: WM_DELETE_WINDOW\n", data);
+#endif
+                SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
+                break;
+            }
+        }
+        break;
+
+        /* Do we need to refresh ourselves? */
+    case Expose:{
+#ifdef DEBUG_XEVENTS
+            printf("window %p: Expose (count = %d)\n", data, xevent.xexpose.count);
+#endif
+            SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_EXPOSED, 0, 0);
+        }
+        break;
+
+    case MotionNotify:{
+            SDL_Mouse *mouse = SDL_GetMouse();
+            if(!mouse->relative_mode || mouse->relative_mode_warp) {
+#ifdef DEBUG_MOTION
+                printf("window %p: X11 motion: %d,%d\n", xevent.xmotion.x, xevent.xmotion.y);
+#endif
+
+                SDL_SendMouseMotion(data->window, 0, 0, xevent.xmotion.x, xevent.xmotion.y);
+            }
+        }
+        break;
+
+    case ButtonPress:{
+            int ticks = 0;
+            if (X11_IsWheelEvent(display,&xevent,&ticks)) {
+                SDL_SendMouseWheel(data->window, 0, 0, ticks);
+            } else {
+                SDL_SendMouseButton(data->window, 0, SDL_PRESSED, xevent.xbutton.button);
+            }
+        }
+        break;
+
+    case ButtonRelease:{
+            SDL_SendMouseButton(data->window, 0, SDL_RELEASED, xevent.xbutton.button);
+        }
+        break;
+
+    case PropertyNotify:{
+#ifdef DEBUG_XEVENTS
+            unsigned char *propdata;
+            int status, real_format;
+            Atom real_type;
+            unsigned long items_read, items_left, i;
+
+            char *name = X11_XGetAtomName(display, xevent.xproperty.atom);
+            if (name) {
+                printf("window %p: PropertyNotify: %s %s\n", data, name, (xevent.xproperty.state == PropertyDelete) ? "deleted" : "changed");
+                X11_XFree(name);
+            }
+
+            status = X11_XGetWindowProperty(display, data->xwindow, xevent.xproperty.atom, 0L, 8192L, False, AnyPropertyType, &real_type, &real_format, &items_read, &items_left, &propdata);
+            if (status == Success && items_read > 0) {
+                if (real_type == XA_INTEGER) {
+                    int *values = (int *)propdata;
+
+                    printf("{");
+                    for (i = 0; i < items_read; i++) {
+                        printf(" %d", values[i]);
+                    }
+                    printf(" }\n");
+                } else if (real_type == XA_CARDINAL) {
+                    if (real_format == 32) {
+                        Uint32 *values = (Uint32 *)propdata;
+
+                        printf("{");
+                        for (i = 0; i < items_read; i++) {
+                            printf(" %d", values[i]);
+                        }
+                        printf(" }\n");
+                    } else if (real_format == 16) {
+                        Uint16 *values = (Uint16 *)propdata;
+
+                        printf("{");
+                        for (i = 0; i < items_read; i++) {
+                            printf(" %d", values[i]);
+                        }
+                        printf(" }\n");
+                    } else if (real_format == 8) {
+                        Uint8 *values = (Uint8 *)propdata;
+
+                        printf("{");
+                        for (i = 0; i < items_read; i++) {
+                            printf(" %d", values[i]);
+                        }
+                        printf(" }\n");
+                    }
+                } else if (real_type == XA_STRING ||
+                           real_type == videodata->UTF8_STRING) {
+                    printf("{ \"%s\" }\n", propdata);
+                } else if (real_type == XA_ATOM) {
+                    Atom *atoms = (Atom *)propdata;
+
+                    printf("{");
+                    for (i = 0; i < items_read; i++) {
+                        char *name = X11_XGetAtomName(display, atoms[i]);
+                        if (name) {
+                            printf(" %s", name);
+                            X11_XFree(name);
+                        }
+                    }
+                    printf(" }\n");
+                } else {
+                    char *name = X11_XGetAtomName(display, real_type);
+                    printf("Unknown type: %ld (%s)\n", real_type, name ? name : "UNKNOWN");
+                    if (name) {
+                        X11_XFree(name);
+                    }
+                }
+            }
+            if (status == Success) {
+                X11_XFree(propdata);
+            }
+#endif /* DEBUG_XEVENTS */
+
+            if (xevent.xproperty.atom == data->videodata->_NET_WM_STATE) {
+                /* Get the new state from the window manager.
+                   Compositing window managers can alter visibility of windows
+                   without ever mapping / unmapping them, so we handle that here,
+                   because they use the NETWM protocol to notify us of changes.
+                 */
+                Uint32 flags = X11_GetNetWMState(_this, xevent.xproperty.window);
+                if ((flags^data->window->flags) & SDL_WINDOW_HIDDEN) {
+                    if (flags & SDL_WINDOW_HIDDEN) {
+                        X11_DispatchUnmapNotify(data);
+                    } else {
+                        X11_DispatchMapNotify(data);
+                    }
+                }
+            }
+        }
+        break;
+
+    /* Copy the selection from XA_CUT_BUFFER0 to the requested property */
+    case SelectionRequest: {
+            XSelectionRequestEvent *req;
+            XEvent sevent;
+            int seln_format;
+            unsigned long nbytes;
+            unsigned long overflow;
+            unsigned char *seln_data;
+
+            req = &xevent.xselectionrequest;
+#ifdef DEBUG_XEVENTS
+            printf("window %p: SelectionRequest (requestor = %ld, target = %ld)\n", data,
+                req->requestor, req->target);
+#endif
+
+            SDL_zero(sevent);
+            sevent.xany.type = SelectionNotify;
+            sevent.xselection.selection = req->selection;
+            sevent.xselection.target = None;
+            sevent.xselection.property = None;
+            sevent.xselection.requestor = req->requestor;
+            sevent.xselection.time = req->time;
+            if (X11_XGetWindowProperty(display, DefaultRootWindow(display),
+                    XA_CUT_BUFFER0, 0, INT_MAX/4, False, req->target,
+                    &sevent.xselection.target, &seln_format, &nbytes,
+                    &overflow, &seln_data) == Success) {
+                Atom XA_TARGETS = X11_XInternAtom(display, "TARGETS", 0);
+                if (sevent.xselection.target == req->target) {
+                    X11_XChangeProperty(display, req->requestor, req->property,
+                        sevent.xselection.target, seln_format, PropModeReplace,
+                        seln_data, nbytes);
+                    sevent.xselection.property = req->property;
+                } else if (XA_TARGETS == req->target) {
+                    Atom SupportedFormats[] = { sevent.xselection.target, XA_TARGETS };
+                    X11_XChangeProperty(display, req->requestor, req->property,
+                        XA_ATOM, 32, PropModeReplace,
+                        (unsigned char*)SupportedFormats,
+                        sizeof(SupportedFormats)/sizeof(*SupportedFormats));
+                    sevent.xselection.property = req->property;
+                }
+                X11_XFree(seln_data);
+            }
+            X11_XSendEvent(display, req->requestor, False, 0, &sevent);
+            X11_XSync(display, False);
+        }
+        break;
+
+    case SelectionNotify: {
+#ifdef DEBUG_XEVENTS
+            printf("window %p: SelectionNotify (requestor = %ld, target = %ld)\n", data,
+                xevent.xselection.requestor, xevent.xselection.target);
+#endif
+            Atom target = xevent.xselection.target;
+            if (target == data->xdnd_req) {
+                /* read data */
+                SDL_x11Prop p;
+                X11_ReadProperty(&p, display, data->xwindow, videodata->PRIMARY);
+
+                if (p.format == 8) {
+                    SDL_bool expect_lf = SDL_FALSE;
+                    char *start = NULL;
+                    char *scan = (char*)p.data;
+                    char *fn;
+                    char *uri;
+                    int length = 0;
+                    while (p.count--) {
+                        if (!expect_lf) {
+                            if (*scan == 0x0D) {
+                                expect_lf = SDL_TRUE;
+                            }
+                            if (start == NULL) {
+                                start = scan;
+                                length = 0;
+                            }
+                            length++;
+                        } else {
+                            if (*scan == 0x0A && length > 0) {
+                                uri = SDL_malloc(length--);
+                                SDL_memcpy(uri, start, length);
+                                uri[length] = '\0';
+                                fn = X11_URIToLocal(uri);
+                                if (fn) {
+                                    SDL_SendDropFile(fn);
+                                }
+                                SDL_free(uri);
+                            }
+                            expect_lf = SDL_FALSE;
+                            start = NULL;
+                        }
+                        scan++;
+                    }
+                }
+
+                X11_XFree(p.data);
+
+                /* send reply */
+                SDL_memset(&m, 0, sizeof(XClientMessageEvent));
+                m.type = ClientMessage;
+                m.display = display;
+                m.window = data->xdnd_source;
+                m.message_type = videodata->XdndFinished;
+                m.format = 32;
+                m.data.l[0] = data->xwindow;
+                m.data.l[1] = 1;
+                m.data.l[2] = videodata->XdndActionCopy;
+                X11_XSendEvent(display, data->xdnd_source, False, NoEventMask, (XEvent*)&m);
+
+                X11_XSync(display, False);
+
+            } else {
+                videodata->selection_waiting = SDL_FALSE;
+            }
+        }
+        break;
+
+    default:{
+#ifdef DEBUG_XEVENTS
+            printf("window %p: Unhandled event %d\n", data, xevent.type);
+#endif
+        }
+        break;
+    }
+}
+
+static void
+X11_HandleFocusChanges(_THIS)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    int i;
+
+    if (videodata && videodata->windowlist) {
+        for (i = 0; i < videodata->numwindows; ++i) {
+            SDL_WindowData *data = videodata->windowlist[i];
+            if (data && data->pending_focus != PENDING_FOCUS_NONE) {
+                Uint32 now = SDL_GetTicks();
+                if (SDL_TICKS_PASSED(now, data->pending_focus_time)) {
+                    if ( data->pending_focus == PENDING_FOCUS_IN ) {
+                        X11_DispatchFocusIn(data);
+                    } else {
+                        X11_DispatchFocusOut(data);
+                    }
+                    data->pending_focus = PENDING_FOCUS_NONE;
+                }
+            }
+        }
+    }
+}
+/* Ack!  X11_XPending() actually performs a blocking read if no events available */
+static int
+X11_Pending(Display * display)
+{
+    /* Flush the display connection and look to see if events are queued */
+    X11_XFlush(display);
+    if (X11_XEventsQueued(display, QueuedAlready)) {
+        return (1);
+    }
+
+    /* More drastic measures are required -- see if X is ready to talk */
+    {
+        static struct timeval zero_time;        /* static == 0 */
+        int x11_fd;
+        fd_set fdset;
+
+        x11_fd = ConnectionNumber(display);
+        FD_ZERO(&fdset);
+        FD_SET(x11_fd, &fdset);
+        if (select(x11_fd + 1, &fdset, NULL, NULL, &zero_time) == 1) {
+            return (X11_XPending(display));
+        }
+    }
+
+    /* Oh well, nothing is ready .. */
+    return (0);
+}
+
+void
+X11_PumpEvents(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    /* Update activity every 30 seconds to prevent screensaver */
+    if (_this->suspend_screensaver) {
+        Uint32 now = SDL_GetTicks();
+        if (!data->screensaver_activity ||
+            SDL_TICKS_PASSED(now, data->screensaver_activity + 30000)) {
+            X11_XResetScreenSaver(data->display);
+
+            #if SDL_USE_LIBDBUS
+            SDL_dbus_screensaver_tickle(_this);
+            #endif
+
+            data->screensaver_activity = now;
+        }
+    }
+
+    /* Keep processing pending events */
+    while (X11_Pending(data->display)) {
+        X11_DispatchEvent(_this);
+    }
+
+    /* FIXME: Only need to do this when there are pending focus changes */
+    X11_HandleFocusChanges(_this);
+}
+
+
+void
+X11_SuspendScreenSaver(_THIS)
+{
+#if SDL_VIDEO_DRIVER_X11_XSCRNSAVER
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    int dummy;
+    int major_version, minor_version;
+#endif /* SDL_VIDEO_DRIVER_X11_XSCRNSAVER */
+
+#if SDL_USE_LIBDBUS
+    if (SDL_dbus_screensaver_inhibit(_this)) {
+        return;
+    }
+
+    if (_this->suspend_screensaver) {
+        SDL_dbus_screensaver_tickle(_this);
+    }
+#endif
+
+#if SDL_VIDEO_DRIVER_X11_XSCRNSAVER
+    if (SDL_X11_HAVE_XSS) {
+        /* X11_XScreenSaverSuspend was introduced in MIT-SCREEN-SAVER 1.1 */
+        if (!X11_XScreenSaverQueryExtension(data->display, &dummy, &dummy) ||
+            !X11_XScreenSaverQueryVersion(data->display,
+                                      &major_version, &minor_version) ||
+            major_version < 1 || (major_version == 1 && minor_version < 1)) {
+            return;
+        }
+
+        X11_XScreenSaverSuspend(data->display, _this->suspend_screensaver);
+        X11_XResetScreenSaver(data->display);
+    }
+#endif
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11events.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11events.h
new file mode 100644
index 000000000..e27d53ac5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11events.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11events_h
+#define _SDL_x11events_h
+
+extern void X11_PumpEvents(_THIS);
+extern void X11_SuspendScreenSaver(_THIS);
+
+#endif /* _SDL_x11events_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11framebuffer.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11framebuffer.c
new file mode 100644
index 000000000..19d9d0ba0
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11framebuffer.c	
@@ -0,0 +1,257 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include "SDL_x11video.h"
+#include "SDL_x11framebuffer.h"
+
+
+#ifndef NO_SHARED_MEMORY
+
+/* Shared memory error handler routine */
+static int shm_error;
+static int (*X_handler)(Display *, XErrorEvent *) = NULL;
+static int shm_errhandler(Display *d, XErrorEvent *e)
+{
+        if ( e->error_code == BadAccess ) {
+            shm_error = True;
+            return(0);
+        } else
+        return(X_handler(d,e));
+}
+
+static SDL_bool have_mitshm(void)
+{
+    /* Only use shared memory on local X servers */
+    if ( (SDL_strncmp(X11_XDisplayName(NULL), ":", 1) == 0) ||
+         (SDL_strncmp(X11_XDisplayName(NULL), "unix:", 5) == 0) ) {
+        return SDL_X11_HAVE_SHM;
+    }
+    return SDL_FALSE;
+}
+
+#endif /* !NO_SHARED_MEMORY */
+
+int
+X11_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format,
+                            void ** pixels, int *pitch)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+    XGCValues gcv;
+    XVisualInfo vinfo;
+
+    /* Free the old framebuffer surface */
+    X11_DestroyWindowFramebuffer(_this, window);
+
+    /* Create the graphics context for drawing */
+    gcv.graphics_exposures = False;
+    data->gc = X11_XCreateGC(display, data->xwindow, GCGraphicsExposures, &gcv);
+    if (!data->gc) {
+        return SDL_SetError("Couldn't create graphics context");
+    }
+
+    /* Find out the pixel format and depth */
+    if (X11_GetVisualInfoFromVisual(display, data->visual, &vinfo) < 0) {
+        return SDL_SetError("Couldn't get window visual information");
+    }
+
+    *format = X11_GetPixelFormatFromVisualInfo(display, &vinfo);
+    if (*format == SDL_PIXELFORMAT_UNKNOWN) {
+        return SDL_SetError("Unknown window pixel format");
+    }
+
+    /* Calculate pitch */
+    *pitch = (((window->w * SDL_BYTESPERPIXEL(*format)) + 3) & ~3);
+
+    /* Create the actual image */
+#ifndef NO_SHARED_MEMORY
+    if (have_mitshm()) {
+        XShmSegmentInfo *shminfo = &data->shminfo;
+
+        shminfo->shmid = shmget(IPC_PRIVATE, window->h*(*pitch), IPC_CREAT | 0777);
+        if ( shminfo->shmid >= 0 ) {
+            shminfo->shmaddr = (char *)shmat(shminfo->shmid, 0, 0);
+            shminfo->readOnly = False;
+            if ( shminfo->shmaddr != (char *)-1 ) {
+                shm_error = False;
+                X_handler = X11_XSetErrorHandler(shm_errhandler);
+                X11_XShmAttach(display, shminfo);
+                X11_XSync(display, True);
+                X11_XSetErrorHandler(X_handler);
+                if ( shm_error )
+                    shmdt(shminfo->shmaddr);
+            } else {
+                shm_error = True;
+            }
+            shmctl(shminfo->shmid, IPC_RMID, NULL);
+        } else {
+            shm_error = True;
+        }
+        if (!shm_error) {
+            data->ximage = X11_XShmCreateImage(display, data->visual,
+                             vinfo.depth, ZPixmap,
+                             shminfo->shmaddr, shminfo,
+                             window->w, window->h);
+            if (!data->ximage) {
+                X11_XShmDetach(display, shminfo);
+                X11_XSync(display, False);
+                shmdt(shminfo->shmaddr);
+            } else {
+                /* Done! */
+                data->use_mitshm = SDL_TRUE;
+                *pixels = shminfo->shmaddr;
+                return 0;
+            }
+        }
+    }
+#endif /* not NO_SHARED_MEMORY */
+
+    *pixels = SDL_malloc(window->h*(*pitch));
+    if (*pixels == NULL) {
+        return SDL_OutOfMemory();
+    }
+
+    data->ximage = X11_XCreateImage(display, data->visual,
+                      vinfo.depth, ZPixmap, 0, (char *)(*pixels),
+                      window->w, window->h, 32, 0);
+    if (!data->ximage) {
+        SDL_free(*pixels);
+        return SDL_SetError("Couldn't create XImage");
+    }
+    return 0;
+}
+
+int
+X11_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects,
+                            int numrects)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+    int i;
+    int x, y, w ,h;
+#ifndef NO_SHARED_MEMORY
+    if (data->use_mitshm) {
+        for (i = 0; i < numrects; ++i) {
+            x = rects[i].x;
+            y = rects[i].y;
+            w = rects[i].w;
+            h = rects[i].h;
+
+            if (w <= 0 || h <= 0 || (x + w) <= 0 || (y + h) <= 0) {
+                /* Clipped? */
+                continue;
+            }
+            if (x < 0)
+            {
+                x += w;
+                w += rects[i].x;
+            }
+            if (y < 0)
+            {
+                y += h;
+                h += rects[i].y;
+            }
+            if (x + w > window->w)
+                w = window->w - x;
+            if (y + h > window->h)
+                h = window->h - y;
+
+            X11_XShmPutImage(display, data->xwindow, data->gc, data->ximage,
+                x, y, x, y, w, h, False);
+        }
+    }
+    else
+#endif /* !NO_SHARED_MEMORY */
+    {
+        for (i = 0; i < numrects; ++i) {
+            x = rects[i].x;
+            y = rects[i].y;
+            w = rects[i].w;
+            h = rects[i].h;
+
+            if (w <= 0 || h <= 0 || (x + w) <= 0 || (y + h) <= 0) {
+                /* Clipped? */
+                continue;
+            }
+            if (x < 0)
+            {
+                x += w;
+                w += rects[i].x;
+            }
+            if (y < 0)
+            {
+                y += h;
+                h += rects[i].y;
+            }
+            if (x + w > window->w)
+                w = window->w - x;
+            if (y + h > window->h)
+                h = window->h - y;
+
+            X11_XPutImage(display, data->xwindow, data->gc, data->ximage,
+                x, y, x, y, w, h);
+        }
+    }
+
+    X11_XSync(display, False);
+
+    return 0;
+}
+
+void
+X11_DestroyWindowFramebuffer(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display;
+
+    if (!data) {
+        /* The window wasn't fully initialized */
+        return;
+    }
+
+    display = data->videodata->display;
+
+    if (data->ximage) {
+        XDestroyImage(data->ximage);
+
+#ifndef NO_SHARED_MEMORY
+        if (data->use_mitshm) {
+            X11_XShmDetach(display, &data->shminfo);
+            X11_XSync(display, False);
+            shmdt(data->shminfo.shmaddr);
+            data->use_mitshm = SDL_FALSE;
+        }
+#endif /* !NO_SHARED_MEMORY */
+
+        data->ximage = NULL;
+    }
+    if (data->gc) {
+        X11_XFreeGC(display, data->gc);
+        data->gc = NULL;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11framebuffer.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11framebuffer.h
new file mode 100644
index 000000000..c73c7487d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11framebuffer.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+
+extern int X11_CreateWindowFramebuffer(_THIS, SDL_Window * window,
+                                       Uint32 * format,
+                                       void ** pixels, int *pitch);
+extern int X11_UpdateWindowFramebuffer(_THIS, SDL_Window * window,
+                                       const SDL_Rect * rects, int numrects);
+extern void X11_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11keyboard.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11keyboard.c
new file mode 100644
index 000000000..36034606e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11keyboard.c	
@@ -0,0 +1,321 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include "SDL_x11video.h"
+
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/scancodes_darwin.h"
+#include "../../events/scancodes_xfree86.h"
+
+#include <X11/keysym.h>
+
+#include "imKStoUCS.h"
+
+/* *INDENT-OFF* */
+static const struct {
+    KeySym keysym;
+    SDL_Scancode scancode;
+} KeySymToSDLScancode[] = {
+    { XK_Return, SDL_SCANCODE_RETURN },
+    { XK_Escape, SDL_SCANCODE_ESCAPE },
+    { XK_BackSpace, SDL_SCANCODE_BACKSPACE },
+    { XK_Tab, SDL_SCANCODE_TAB },
+    { XK_Caps_Lock, SDL_SCANCODE_CAPSLOCK },
+    { XK_F1, SDL_SCANCODE_F1 },
+    { XK_F2, SDL_SCANCODE_F2 },
+    { XK_F3, SDL_SCANCODE_F3 },
+    { XK_F4, SDL_SCANCODE_F4 },
+    { XK_F5, SDL_SCANCODE_F5 },
+    { XK_F6, SDL_SCANCODE_F6 },
+    { XK_F7, SDL_SCANCODE_F7 },
+    { XK_F8, SDL_SCANCODE_F8 },
+    { XK_F9, SDL_SCANCODE_F9 },
+    { XK_F10, SDL_SCANCODE_F10 },
+    { XK_F11, SDL_SCANCODE_F11 },
+    { XK_F12, SDL_SCANCODE_F12 },
+    { XK_Print, SDL_SCANCODE_PRINTSCREEN },
+    { XK_Scroll_Lock, SDL_SCANCODE_SCROLLLOCK },
+    { XK_Pause, SDL_SCANCODE_PAUSE },
+    { XK_Insert, SDL_SCANCODE_INSERT },
+    { XK_Home, SDL_SCANCODE_HOME },
+    { XK_Prior, SDL_SCANCODE_PAGEUP },
+    { XK_Delete, SDL_SCANCODE_DELETE },
+    { XK_End, SDL_SCANCODE_END },
+    { XK_Next, SDL_SCANCODE_PAGEDOWN },
+    { XK_Right, SDL_SCANCODE_RIGHT },
+    { XK_Left, SDL_SCANCODE_LEFT },
+    { XK_Down, SDL_SCANCODE_DOWN },
+    { XK_Up, SDL_SCANCODE_UP },
+    { XK_Num_Lock, SDL_SCANCODE_NUMLOCKCLEAR },
+    { XK_KP_Divide, SDL_SCANCODE_KP_DIVIDE },
+    { XK_KP_Multiply, SDL_SCANCODE_KP_MULTIPLY },
+    { XK_KP_Subtract, SDL_SCANCODE_KP_MINUS },
+    { XK_KP_Add, SDL_SCANCODE_KP_PLUS },
+    { XK_KP_Enter, SDL_SCANCODE_KP_ENTER },
+    { XK_KP_Delete, SDL_SCANCODE_KP_PERIOD },
+    { XK_KP_End, SDL_SCANCODE_KP_1 },
+    { XK_KP_Down, SDL_SCANCODE_KP_2 },
+    { XK_KP_Next, SDL_SCANCODE_KP_3 },
+    { XK_KP_Left, SDL_SCANCODE_KP_4 },
+    { XK_KP_Begin, SDL_SCANCODE_KP_5 },
+    { XK_KP_Right, SDL_SCANCODE_KP_6 },
+    { XK_KP_Home, SDL_SCANCODE_KP_7 },
+    { XK_KP_Up, SDL_SCANCODE_KP_8 },
+    { XK_KP_Prior, SDL_SCANCODE_KP_9 },
+    { XK_KP_Insert, SDL_SCANCODE_KP_0 },
+    { XK_KP_Decimal, SDL_SCANCODE_KP_PERIOD },
+    { XK_KP_1, SDL_SCANCODE_KP_1 },
+    { XK_KP_2, SDL_SCANCODE_KP_2 },
+    { XK_KP_3, SDL_SCANCODE_KP_3 },
+    { XK_KP_4, SDL_SCANCODE_KP_4 },
+    { XK_KP_5, SDL_SCANCODE_KP_5 },
+    { XK_KP_6, SDL_SCANCODE_KP_6 },
+    { XK_KP_7, SDL_SCANCODE_KP_7 },
+    { XK_KP_8, SDL_SCANCODE_KP_8 },
+    { XK_KP_9, SDL_SCANCODE_KP_9 },
+    { XK_KP_0, SDL_SCANCODE_KP_0 },
+    { XK_KP_Decimal, SDL_SCANCODE_KP_PERIOD },
+    { XK_Hyper_R, SDL_SCANCODE_APPLICATION },
+    { XK_KP_Equal, SDL_SCANCODE_KP_EQUALS },
+    { XK_F13, SDL_SCANCODE_F13 },
+    { XK_F14, SDL_SCANCODE_F14 },
+    { XK_F15, SDL_SCANCODE_F15 },
+    { XK_F16, SDL_SCANCODE_F16 },
+    { XK_F17, SDL_SCANCODE_F17 },
+    { XK_F18, SDL_SCANCODE_F18 },
+    { XK_F19, SDL_SCANCODE_F19 },
+    { XK_F20, SDL_SCANCODE_F20 },
+    { XK_F21, SDL_SCANCODE_F21 },
+    { XK_F22, SDL_SCANCODE_F22 },
+    { XK_F23, SDL_SCANCODE_F23 },
+    { XK_F24, SDL_SCANCODE_F24 },
+    { XK_Execute, SDL_SCANCODE_EXECUTE },
+    { XK_Help, SDL_SCANCODE_HELP },
+    { XK_Menu, SDL_SCANCODE_MENU },
+    { XK_Select, SDL_SCANCODE_SELECT },
+    { XK_Cancel, SDL_SCANCODE_STOP },
+    { XK_Redo, SDL_SCANCODE_AGAIN },
+    { XK_Undo, SDL_SCANCODE_UNDO },
+    { XK_Find, SDL_SCANCODE_FIND },
+    { XK_KP_Separator, SDL_SCANCODE_KP_COMMA },
+    { XK_Sys_Req, SDL_SCANCODE_SYSREQ },
+    { XK_Control_L, SDL_SCANCODE_LCTRL },
+    { XK_Shift_L, SDL_SCANCODE_LSHIFT },
+    { XK_Alt_L, SDL_SCANCODE_LALT },
+    { XK_Meta_L, SDL_SCANCODE_LGUI },
+    { XK_Super_L, SDL_SCANCODE_LGUI },
+    { XK_Control_R, SDL_SCANCODE_RCTRL },
+    { XK_Shift_R, SDL_SCANCODE_RSHIFT },
+    { XK_Alt_R, SDL_SCANCODE_RALT },
+    { XK_Meta_R, SDL_SCANCODE_RGUI },
+    { XK_Super_R, SDL_SCANCODE_RGUI },
+    { XK_Mode_switch, SDL_SCANCODE_MODE },
+};
+
+static const struct
+{
+    SDL_Scancode const *table;
+    int table_size;
+} scancode_set[] = {
+    { darwin_scancode_table, SDL_arraysize(darwin_scancode_table) },
+    { xfree86_scancode_table, SDL_arraysize(xfree86_scancode_table) },
+    { xfree86_scancode_table2, SDL_arraysize(xfree86_scancode_table2) },
+};
+/* *INDENT-OFF* */
+
+/* This function only works for keyboards in US QWERTY layout */
+static SDL_Scancode
+X11_KeyCodeToSDLScancode(Display *display, KeyCode keycode)
+{
+    KeySym keysym;
+    int i;
+
+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+    keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
+#else
+    keysym = XKeycodeToKeysym(display, keycode, 0);
+#endif
+    if (keysym == NoSymbol) {
+        return SDL_SCANCODE_UNKNOWN;
+    }
+
+    if (keysym >= XK_A && keysym <= XK_Z) {
+        return SDL_SCANCODE_A + (keysym - XK_A);
+    }
+
+    if (keysym >= XK_0 && keysym <= XK_9) {
+        return SDL_SCANCODE_0 + (keysym - XK_0);
+    }
+
+    for (i = 0; i < SDL_arraysize(KeySymToSDLScancode); ++i) {
+        if (keysym == KeySymToSDLScancode[i].keysym) {
+            return KeySymToSDLScancode[i].scancode;
+        }
+    }
+    return SDL_SCANCODE_UNKNOWN;
+}
+
+static Uint32
+X11_KeyCodeToUcs4(Display *display, KeyCode keycode)
+{
+    KeySym keysym;
+
+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+    keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
+#else
+    keysym = XKeycodeToKeysym(display, keycode, 0);
+#endif
+    if (keysym == NoSymbol) {
+        return 0;
+    }
+
+    return X11_KeySymToUcs4(keysym);
+}
+
+int
+X11_InitKeyboard(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    int i = 0;
+    int j = 0;
+    int min_keycode, max_keycode;
+    struct {
+        SDL_Scancode scancode;
+        KeySym keysym;
+        int value;
+    } fingerprint[] = {
+        { SDL_SCANCODE_HOME, XK_Home, 0 },
+        { SDL_SCANCODE_PAGEUP, XK_Prior, 0 },
+        { SDL_SCANCODE_PAGEDOWN, XK_Next, 0 },
+    };
+    SDL_bool fingerprint_detected;
+
+    X11_XAutoRepeatOn(data->display);
+
+    /* Try to determine which scancodes are being used based on fingerprint */
+    fingerprint_detected = SDL_FALSE;
+    X11_XDisplayKeycodes(data->display, &min_keycode, &max_keycode);
+    for (i = 0; i < SDL_arraysize(fingerprint); ++i) {
+        fingerprint[i].value =
+            X11_XKeysymToKeycode(data->display, fingerprint[i].keysym) -
+            min_keycode;
+    }
+    for (i = 0; i < SDL_arraysize(scancode_set); ++i) {
+        /* Make sure the scancode set isn't too big */
+        if ((max_keycode - min_keycode + 1) <= scancode_set[i].table_size) {
+            continue;
+        }
+        for (j = 0; j < SDL_arraysize(fingerprint); ++j) {
+            if (fingerprint[j].value < 0
+                || fingerprint[j].value >= scancode_set[i].table_size) {
+                break;
+            }
+            if (scancode_set[i].table[fingerprint[j].value] !=
+                fingerprint[j].scancode) {
+                break;
+            }
+        }
+        if (j == SDL_arraysize(fingerprint)) {
+#ifdef DEBUG_KEYBOARD
+            printf("Using scancode set %d, min_keycode = %d, max_keycode = %d, table_size = %d\n", i, min_keycode, max_keycode, scancode_set[i].table_size);
+#endif
+            SDL_memcpy(&data->key_layout[min_keycode], scancode_set[i].table,
+                       sizeof(SDL_Scancode) * scancode_set[i].table_size);
+            fingerprint_detected = SDL_TRUE;
+            break;
+        }
+    }
+
+    if (!fingerprint_detected) {
+        SDL_Keycode keymap[SDL_NUM_SCANCODES];
+
+        printf
+            ("Keyboard layout unknown, please send the following to the SDL mailing list (sdl@libsdl.org):\n");
+
+        /* Determine key_layout - only works on US QWERTY layout */
+        SDL_GetDefaultKeymap(keymap);
+        for (i = min_keycode; i <= max_keycode; ++i) {
+            KeySym sym;
+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+            sym = X11_XkbKeycodeToKeysym(data->display, i, 0, 0);
+#else
+            sym = XKeycodeToKeysym(data->display, i, 0);
+#endif
+            if (sym != NoSymbol) {
+                SDL_Scancode scancode;
+                printf("code = %d, sym = 0x%X (%s) ", i - min_keycode,
+                       (unsigned int) sym, X11_XKeysymToString(sym));
+                scancode = X11_KeyCodeToSDLScancode(data->display, i);
+                data->key_layout[i] = scancode;
+                if (scancode == SDL_SCANCODE_UNKNOWN) {
+                    printf("scancode not found\n");
+                } else {
+                    printf("scancode = %d (%s)\n", scancode, SDL_GetScancodeName(scancode));
+                }
+            }
+        }
+    }
+
+    X11_UpdateKeymap(_this);
+
+    SDL_SetScancodeName(SDL_SCANCODE_APPLICATION, "Menu");
+
+    return 0;
+}
+
+void
+X11_UpdateKeymap(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    int i;
+    SDL_Scancode scancode;
+    SDL_Keycode keymap[SDL_NUM_SCANCODES];
+
+    SDL_GetDefaultKeymap(keymap);
+    for (i = 0; i < SDL_arraysize(data->key_layout); i++) {
+        Uint32 key;
+
+        /* Make sure this is a valid scancode */
+        scancode = data->key_layout[i];
+        if (scancode == SDL_SCANCODE_UNKNOWN) {
+            continue;
+        }
+
+        /* See if there is a UCS keycode for this scancode */
+        key = X11_KeyCodeToUcs4(data->display, (KeyCode)i);
+        if (key) {
+            keymap[scancode] = key;
+        }
+    }
+    SDL_SetKeymap(0, keymap, SDL_NUM_SCANCODES);
+}
+
+void
+X11_QuitKeyboard(_THIS)
+{
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11keyboard.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11keyboard.h
new file mode 100644
index 000000000..3d1631fe5
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11keyboard.h	
@@ -0,0 +1,32 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11keyboard_h
+#define _SDL_x11keyboard_h
+
+extern int X11_InitKeyboard(_THIS);
+extern void X11_UpdateKeymap(_THIS);
+extern void X11_QuitKeyboard(_THIS);
+
+#endif /* _SDL_x11keyboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11messagebox.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11messagebox.c
new file mode 100644
index 000000000..2a98e3c3e
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11messagebox.c	
@@ -0,0 +1,762 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include "SDL.h"
+#include "SDL_x11video.h"
+#include "SDL_x11dyn.h"
+#include "SDL_assert.h"
+
+#include <locale.h>
+
+
+#define SDL_FORK_MESSAGEBOX 0
+#define SDL_SET_LOCALE      0
+
+#if SDL_FORK_MESSAGEBOX
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <errno.h>
+#endif
+
+#define MAX_BUTTONS             8       /* Maximum number of buttons supported */
+#define MAX_TEXT_LINES          32      /* Maximum number of text lines supported */
+#define MIN_BUTTON_WIDTH        64      /* Minimum button width */
+#define MIN_DIALOG_WIDTH        200     /* Minimum dialog width */
+#define MIN_DIALOG_HEIGHT       100     /* Minimum dialog height */
+
+static const char g_MessageBoxFontLatin1[] = "-*-*-medium-r-normal--0-120-*-*-p-0-iso8859-1";
+static const char g_MessageBoxFont[] = "-*-*-*-*-*-*-*-120-*-*-*-*-*-*";
+
+static const SDL_MessageBoxColor g_default_colors[ SDL_MESSAGEBOX_COLOR_MAX ] = {
+    { 56,  54,  53  }, /* SDL_MESSAGEBOX_COLOR_BACKGROUND, */
+    { 209, 207, 205 }, /* SDL_MESSAGEBOX_COLOR_TEXT, */
+    { 140, 135, 129 }, /* SDL_MESSAGEBOX_COLOR_BUTTON_BORDER, */
+    { 105, 102, 99  }, /* SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND, */
+    { 205, 202, 53  }, /* SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED, */
+};
+
+#define SDL_MAKE_RGB( _r, _g, _b )  ( ( ( Uint32 )( _r ) << 16 ) | \
+                                      ( ( Uint32 )( _g ) << 8 ) |  \
+                                      ( ( Uint32 )( _b ) ) )
+
+typedef struct SDL_MessageBoxButtonDataX11 {
+    int x, y;                           /* Text position */
+    int length;                         /* Text length */
+    int text_width;                     /* Text width */
+
+    SDL_Rect rect;                      /* Rectangle for entire button */
+
+    const SDL_MessageBoxButtonData *buttondata;   /* Button data from caller */
+} SDL_MessageBoxButtonDataX11;
+
+typedef struct TextLineData {
+    int width;                          /* Width of this text line */
+    int length;                         /* String length of this text line */
+    const char *text;                   /* Text for this line */
+} TextLineData;
+
+typedef struct SDL_MessageBoxDataX11
+{
+    Display *display;
+    int screen;
+    Window window;
+    long event_mask;
+    Atom wm_protocols;
+    Atom wm_delete_message;
+
+    int dialog_width;                   /* Dialog box width. */
+    int dialog_height;                  /* Dialog box height. */
+
+    XFontSet font_set;                  /* for UTF-8 systems */
+    XFontStruct *font_struct;           /* Latin1 (ASCII) fallback. */
+    int xtext, ytext;                   /* Text position to start drawing at. */
+    int numlines;                       /* Count of Text lines. */
+    int text_height;                    /* Height for text lines. */
+    TextLineData linedata[ MAX_TEXT_LINES ];
+
+    int *pbuttonid;                     /* Pointer to user return buttonid value. */
+
+    int button_press_index;             /* Index into buttondata/buttonpos for button which is pressed (or -1). */
+    int mouse_over_index;               /* Index into buttondata/buttonpos for button mouse is over (or -1). */
+
+    int numbuttons;                     /* Count of buttons. */
+    const SDL_MessageBoxButtonData *buttondata;
+    SDL_MessageBoxButtonDataX11 buttonpos[ MAX_BUTTONS ];
+
+    Uint32 color[ SDL_MESSAGEBOX_COLOR_MAX ];
+
+    const SDL_MessageBoxData *messageboxdata;
+} SDL_MessageBoxDataX11;
+
+/* Maximum helper for ints. */
+static SDL_INLINE int
+IntMax( int a, int b )
+{
+    return ( a > b  ) ? a : b;
+}
+
+/* Return width and height for a string. */
+static void
+GetTextWidthHeight( SDL_MessageBoxDataX11 *data, const char *str, int nbytes, int *pwidth, int *pheight )
+{
+    if (SDL_X11_HAVE_UTF8) {
+        XRectangle overall_ink, overall_logical;
+        X11_Xutf8TextExtents(data->font_set, str, nbytes, &overall_ink, &overall_logical);
+        *pwidth = overall_logical.width;
+        *pheight = overall_logical.height;
+    } else {
+        XCharStruct text_structure;
+        int font_direction, font_ascent, font_descent;
+        X11_XTextExtents( data->font_struct, str, nbytes,
+                      &font_direction, &font_ascent, &font_descent,
+                      &text_structure );
+        *pwidth = text_structure.width;
+        *pheight = text_structure.ascent + text_structure.descent;
+    }
+}
+
+/* Return index of button if position x,y is contained therein. */
+static int
+GetHitButtonIndex( SDL_MessageBoxDataX11 *data, int x, int y )
+{
+    int i;
+    int numbuttons = data->numbuttons;
+    SDL_MessageBoxButtonDataX11 *buttonpos = data->buttonpos;
+
+    for ( i = 0; i < numbuttons; i++ ) {
+        SDL_Rect *rect = &buttonpos[ i ].rect;
+
+        if ( ( x >= rect->x ) &&
+             ( x <= ( rect->x + rect->w ) ) &&
+             ( y >= rect->y ) &&
+             ( y <= ( rect->y + rect->h ) ) ) {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+/* Initialize SDL_MessageBoxData structure and Display, etc. */
+static int
+X11_MessageBoxInit( SDL_MessageBoxDataX11 *data, const SDL_MessageBoxData * messageboxdata, int * pbuttonid )
+{
+    int i;
+    int numbuttons = messageboxdata->numbuttons;
+    const SDL_MessageBoxButtonData *buttondata = messageboxdata->buttons;
+    const SDL_MessageBoxColor *colorhints;
+
+    if ( numbuttons > MAX_BUTTONS ) {
+        return SDL_SetError("Too many buttons (%d max allowed)", MAX_BUTTONS);
+    }
+
+    data->dialog_width = MIN_DIALOG_WIDTH;
+    data->dialog_height = MIN_DIALOG_HEIGHT;
+    data->messageboxdata = messageboxdata;
+    data->buttondata = buttondata;
+    data->numbuttons = numbuttons;
+    data->pbuttonid = pbuttonid;
+
+    data->display = X11_XOpenDisplay( NULL );
+    if ( !data->display ) {
+        return SDL_SetError("Couldn't open X11 display");
+    }
+
+    if (SDL_X11_HAVE_UTF8) {
+        char **missing = NULL;
+        int num_missing = 0;
+        data->font_set = X11_XCreateFontSet(data->display, g_MessageBoxFont,
+                                        &missing, &num_missing, NULL);
+        if ( missing != NULL ) {
+            X11_XFreeStringList(missing);
+        }
+        if ( data->font_set == NULL ) {
+            return SDL_SetError("Couldn't load font %s", g_MessageBoxFont);
+        }
+    } else {
+        data->font_struct = X11_XLoadQueryFont( data->display, g_MessageBoxFontLatin1 );
+        if ( data->font_struct == NULL ) {
+            return SDL_SetError("Couldn't load font %s", g_MessageBoxFontLatin1);
+        }
+    }
+
+    if ( messageboxdata->colorScheme ) {
+        colorhints = messageboxdata->colorScheme->colors;
+    } else {
+        colorhints = g_default_colors;
+    }
+
+    /* Convert our SDL_MessageBoxColor r,g,b values to packed RGB format. */
+    for ( i = 0; i < SDL_MESSAGEBOX_COLOR_MAX; i++ ) {
+        data->color[ i ] = SDL_MAKE_RGB( colorhints[ i ].r, colorhints[ i ].g, colorhints[ i ].b );
+    }
+
+    return 0;
+}
+
+/* Calculate and initialize text and button locations. */
+static int
+X11_MessageBoxInitPositions( SDL_MessageBoxDataX11 *data )
+{
+    int i;
+    int ybuttons;
+    int text_width_max = 0;
+    int button_text_height = 0;
+    int button_width = MIN_BUTTON_WIDTH;
+    const SDL_MessageBoxData *messageboxdata = data->messageboxdata;
+
+    /* Go over text and break linefeeds into separate lines. */
+    if ( messageboxdata->message && messageboxdata->message[ 0 ] ) {
+        const char *text = messageboxdata->message;
+        TextLineData *plinedata = data->linedata;
+
+        for ( i = 0; i < MAX_TEXT_LINES; i++, plinedata++ ) {
+            int height;
+            char *lf = SDL_strchr( ( char * )text, '\n' );
+
+            data->numlines++;
+
+            /* Only grab length up to lf if it exists and isn't the last line. */
+            plinedata->length = ( lf && ( i < MAX_TEXT_LINES - 1 ) ) ? ( lf - text ) : SDL_strlen( text );
+            plinedata->text = text;
+
+            GetTextWidthHeight( data, text, plinedata->length, &plinedata->width, &height );
+
+            /* Text and widths are the largest we've ever seen. */
+            data->text_height = IntMax( data->text_height, height );
+            text_width_max = IntMax( text_width_max, plinedata->width );
+
+            if (lf && (lf > text) && (lf[-1] == '\r')) {
+                plinedata->length--;
+            }
+
+            text += plinedata->length + 1;
+
+            /* Break if there are no more linefeeds. */
+            if ( !lf )
+                break;
+        }
+
+        /* Bump up the text height slightly. */
+        data->text_height += 2;
+    }
+
+    /* Loop through all buttons and calculate the button widths and height. */
+    for ( i = 0; i < data->numbuttons; i++ ) {
+        int height;
+
+        data->buttonpos[ i ].buttondata = &data->buttondata[ i ];
+        data->buttonpos[ i ].length = SDL_strlen( data->buttondata[ i ].text );
+
+        GetTextWidthHeight( data, data->buttondata[ i ].text, SDL_strlen( data->buttondata[ i ].text ),
+                            &data->buttonpos[ i ].text_width, &height );
+
+        button_width = IntMax( button_width, data->buttonpos[ i ].text_width );
+        button_text_height = IntMax( button_text_height, height );
+    }
+
+    if ( data->numlines ) {
+        /* x,y for this line of text. */
+        data->xtext = data->text_height;
+        data->ytext = data->text_height + data->text_height;
+
+        /* Bump button y down to bottom of text. */
+        ybuttons = 3 * data->ytext / 2 + ( data->numlines - 1 ) * data->text_height;
+
+        /* Bump the dialog box width and height up if needed. */
+        data->dialog_width = IntMax( data->dialog_width, 2 * data->xtext + text_width_max );
+        data->dialog_height = IntMax( data->dialog_height, ybuttons );
+    } else {
+        /* Button y starts at height of button text. */
+        ybuttons = button_text_height;
+    }
+
+    if ( data->numbuttons ) {
+        int x, y;
+        int width_of_buttons;
+        int button_spacing = button_text_height;
+        int button_height = 2 * button_text_height;
+
+        /* Bump button width up a bit. */
+        button_width += button_text_height;
+
+        /* Get width of all buttons lined up. */
+        width_of_buttons = data->numbuttons * button_width + ( data->numbuttons - 1 ) * button_spacing;
+
+        /* Bump up dialog width and height if buttons are wider than text. */
+        data->dialog_width = IntMax( data->dialog_width, width_of_buttons + 2 * button_spacing );
+        data->dialog_height = IntMax( data->dialog_height, ybuttons + 2 * button_height );
+
+        /* Location for first button. */
+        x = ( data->dialog_width - width_of_buttons ) / 2;
+        y = ybuttons + ( data->dialog_height - ybuttons - button_height ) / 2;
+
+        for ( i = 0; i < data->numbuttons; i++ ) {
+            /* Button coordinates. */
+            data->buttonpos[ i ].rect.x = x;
+            data->buttonpos[ i ].rect.y = y;
+            data->buttonpos[ i ].rect.w = button_width;
+            data->buttonpos[ i ].rect.h = button_height;
+
+            /* Button text coordinates. */
+            data->buttonpos[ i ].x = x + ( button_width - data->buttonpos[ i ].text_width ) / 2;
+            data->buttonpos[ i ].y = y + ( button_height - button_text_height - 1 ) / 2 + button_text_height;
+
+            /* Scoot over for next button. */
+            x += button_width + button_spacing;
+        }
+    }
+
+    return 0;
+}
+
+/* Free SDL_MessageBoxData data. */
+static void
+X11_MessageBoxShutdown( SDL_MessageBoxDataX11 *data )
+{
+    if ( data->font_set != NULL ) {
+        X11_XFreeFontSet( data->display, data->font_set );
+        data->font_set = NULL;
+    }
+
+    if ( data->font_struct != NULL ) {
+        X11_XFreeFont( data->display, data->font_struct );
+        data->font_struct = NULL;
+    }
+
+    if ( data->display ) {
+        if ( data->window != None ) {
+            X11_XWithdrawWindow( data->display, data->window, data->screen );
+            X11_XDestroyWindow( data->display, data->window );
+            data->window = None;
+        }
+
+        X11_XCloseDisplay( data->display );
+        data->display = NULL;
+    }
+}
+
+/* Create and set up our X11 dialog box indow. */
+static int
+X11_MessageBoxCreateWindow( SDL_MessageBoxDataX11 *data )
+{
+    int x, y;
+    XSizeHints *sizehints;
+    XSetWindowAttributes wnd_attr;
+    Display *display = data->display;
+    SDL_WindowData *windowdata = NULL;
+    const SDL_MessageBoxData *messageboxdata = data->messageboxdata;
+
+    if ( messageboxdata->window ) {
+        SDL_DisplayData *displaydata =
+            (SDL_DisplayData *) SDL_GetDisplayForWindow(messageboxdata->window)->driverdata;
+        windowdata = (SDL_WindowData *)messageboxdata->window->driverdata;
+        data->screen = displaydata->screen;
+    } else {
+        data->screen = DefaultScreen( display );
+    }
+
+    data->event_mask = ExposureMask |
+                       ButtonPressMask | ButtonReleaseMask | KeyPressMask | KeyReleaseMask |
+                       StructureNotifyMask | FocusChangeMask | PointerMotionMask;
+    wnd_attr.event_mask = data->event_mask;
+
+    data->window = X11_XCreateWindow(
+                       display, RootWindow(display, data->screen),
+                       0, 0,
+                       data->dialog_width, data->dialog_height,
+                       0, CopyFromParent, InputOutput, CopyFromParent,
+                       CWEventMask, &wnd_attr );
+    if ( data->window == None ) {
+        return SDL_SetError("Couldn't create X window");
+    }
+
+    if ( windowdata ) {
+        /* http://tronche.com/gui/x/icccm/sec-4.html#WM_TRANSIENT_FOR */
+        X11_XSetTransientForHint( display, data->window, windowdata->xwindow );
+    }
+
+    X11_XStoreName( display, data->window, messageboxdata->title );
+
+    /* Allow the window to be deleted by the window manager */
+    data->wm_protocols = X11_XInternAtom( display, "WM_PROTOCOLS", False );
+    data->wm_delete_message = X11_XInternAtom( display, "WM_DELETE_WINDOW", False );
+    X11_XSetWMProtocols( display, data->window, &data->wm_delete_message, 1 );
+
+    if ( windowdata ) {
+        XWindowAttributes attrib;
+        Window dummy;
+
+        X11_XGetWindowAttributes(display, windowdata->xwindow, &attrib);
+        x = attrib.x + ( attrib.width - data->dialog_width ) / 2;
+        y = attrib.y + ( attrib.height - data->dialog_height ) / 3 ;
+        X11_XTranslateCoordinates(display, windowdata->xwindow, RootWindow(display, data->screen), x, y, &x, &y, &dummy);
+    } else {
+        x = ( DisplayWidth( display, data->screen ) - data->dialog_width ) / 2;
+        y = ( DisplayHeight( display, data->screen ) - data->dialog_height ) / 3 ;
+    }
+    X11_XMoveWindow( display, data->window, x, y );
+
+    sizehints = X11_XAllocSizeHints();
+    if ( sizehints ) {
+        sizehints->flags = USPosition | USSize | PMaxSize | PMinSize;
+        sizehints->x = x;
+        sizehints->y = y;
+        sizehints->width = data->dialog_width;
+        sizehints->height = data->dialog_height;
+
+        sizehints->min_width = sizehints->max_width = data->dialog_width;
+        sizehints->min_height = sizehints->max_height = data->dialog_height;
+
+        X11_XSetWMNormalHints( display, data->window, sizehints );
+
+        X11_XFree( sizehints );
+    }
+
+    X11_XMapRaised( display, data->window );
+    return 0;
+}
+
+/* Draw our message box. */
+static void
+X11_MessageBoxDraw( SDL_MessageBoxDataX11 *data, GC ctx )
+{
+    int i;
+    Window window = data->window;
+    Display *display = data->display;
+
+    X11_XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_BACKGROUND ] );
+    X11_XFillRectangle( display, window, ctx, 0, 0, data->dialog_width, data->dialog_height );
+
+    X11_XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_TEXT ] );
+    for ( i = 0; i < data->numlines; i++ ) {
+        TextLineData *plinedata = &data->linedata[ i ];
+
+        if (SDL_X11_HAVE_UTF8) {
+            X11_Xutf8DrawString( display, window, data->font_set, ctx,
+                             data->xtext, data->ytext + i * data->text_height,
+                             plinedata->text, plinedata->length );
+        } else {
+            X11_XDrawString( display, window, ctx,
+                         data->xtext, data->ytext + i * data->text_height,
+                         plinedata->text, plinedata->length );
+        }
+    }
+
+    for ( i = 0; i < data->numbuttons; i++ ) {
+        SDL_MessageBoxButtonDataX11 *buttondatax11 = &data->buttonpos[ i ];
+        const SDL_MessageBoxButtonData *buttondata = buttondatax11->buttondata;
+        int border = ( buttondata->flags & SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT ) ? 2 : 0;
+        int offset = ( ( data->mouse_over_index == i ) && ( data->button_press_index == data->mouse_over_index ) ) ? 1 : 0;
+
+        X11_XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND ] );
+        X11_XFillRectangle( display, window, ctx,
+                        buttondatax11->rect.x - border, buttondatax11->rect.y - border,
+                        buttondatax11->rect.w + 2 * border, buttondatax11->rect.h + 2 * border );
+
+        X11_XSetForeground( display, ctx, data->color[ SDL_MESSAGEBOX_COLOR_BUTTON_BORDER ] );
+        X11_XDrawRectangle( display, window, ctx,
+                        buttondatax11->rect.x, buttondatax11->rect.y,
+                        buttondatax11->rect.w, buttondatax11->rect.h );
+
+        X11_XSetForeground( display, ctx, ( data->mouse_over_index == i ) ?
+                        data->color[ SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED ] :
+                        data->color[ SDL_MESSAGEBOX_COLOR_TEXT ] );
+
+        if (SDL_X11_HAVE_UTF8) {
+            X11_Xutf8DrawString( display, window, data->font_set, ctx,
+                             buttondatax11->x + offset,
+                             buttondatax11->y + offset,
+                             buttondata->text, buttondatax11->length );
+        } else {
+            X11_XDrawString( display, window, ctx,
+                         buttondatax11->x + offset, buttondatax11->y + offset,
+                         buttondata->text, buttondatax11->length );
+        }
+    }
+}
+
+/* Loop and handle message box event messages until something kills it. */
+static int
+X11_MessageBoxLoop( SDL_MessageBoxDataX11 *data )
+{
+    GC ctx;
+    XGCValues ctx_vals;
+    SDL_bool close_dialog = SDL_FALSE;
+    SDL_bool has_focus = SDL_TRUE;
+    KeySym last_key_pressed = XK_VoidSymbol;
+    unsigned long gcflags = GCForeground | GCBackground;
+
+    SDL_zero(ctx_vals);
+    ctx_vals.foreground = data->color[ SDL_MESSAGEBOX_COLOR_BACKGROUND ];
+    ctx_vals.background = data->color[ SDL_MESSAGEBOX_COLOR_BACKGROUND ];
+
+    if (!SDL_X11_HAVE_UTF8) {
+        gcflags |= GCFont;
+        ctx_vals.font = data->font_struct->fid;
+    }
+
+    ctx = X11_XCreateGC( data->display, data->window, gcflags, &ctx_vals );
+    if ( ctx == None ) {
+        return SDL_SetError("Couldn't create graphics context");
+    }
+
+    data->button_press_index = -1;  /* Reset what button is currently depressed. */
+    data->mouse_over_index = -1;    /* Reset what button the mouse is over. */
+
+    while( !close_dialog ) {
+        XEvent e;
+        SDL_bool draw = SDL_TRUE;
+
+        X11_XWindowEvent( data->display, data->window, data->event_mask, &e );
+
+        /* If X11_XFilterEvent returns True, then some input method has filtered the
+           event, and the client should discard the event. */
+        if ( ( e.type != Expose ) && X11_XFilterEvent( &e, None ) )
+            continue;
+
+        switch( e.type ) {
+        case Expose:
+            if ( e.xexpose.count > 0 ) {
+                draw = SDL_FALSE;
+            }
+            break;
+
+        case FocusIn:
+            /* Got focus. */
+            has_focus = SDL_TRUE;
+            break;
+
+        case FocusOut:
+            /* lost focus. Reset button and mouse info. */
+            has_focus = SDL_FALSE;
+            data->button_press_index = -1;
+            data->mouse_over_index = -1;
+            break;
+
+        case MotionNotify:
+            if ( has_focus ) {
+                /* Mouse moved... */
+                int previndex = data->mouse_over_index;
+                data->mouse_over_index = GetHitButtonIndex( data, e.xbutton.x, e.xbutton.y );
+                if (data->mouse_over_index == previndex) {
+                    draw = SDL_FALSE;
+                }
+            }
+            break;
+
+        case ClientMessage:
+            if ( e.xclient.message_type == data->wm_protocols &&
+                 e.xclient.format == 32 &&
+                 e.xclient.data.l[ 0 ] == data->wm_delete_message ) {
+                close_dialog = SDL_TRUE;
+            }
+            break;
+
+        case KeyPress:
+            /* Store key press - we make sure in key release that we got both. */
+            last_key_pressed = X11_XLookupKeysym( &e.xkey, 0 );
+            break;
+
+        case KeyRelease: {
+            Uint32 mask = 0;
+            KeySym key = X11_XLookupKeysym( &e.xkey, 0 );
+
+            /* If this is a key release for something we didn't get the key down for, then bail. */
+            if ( key != last_key_pressed )
+                break;
+
+            if ( key == XK_Escape )
+                mask = SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT;
+            else if ( ( key == XK_Return ) || ( key == XK_KP_Enter ) )
+                mask = SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT;
+
+            if ( mask ) {
+                int i;
+
+                /* Look for first button with this mask set, and return it if found. */
+                for ( i = 0; i < data->numbuttons; i++ ) {
+                    SDL_MessageBoxButtonDataX11 *buttondatax11 = &data->buttonpos[ i ];
+
+                    if ( buttondatax11->buttondata->flags & mask ) {
+                        *data->pbuttonid = buttondatax11->buttondata->buttonid;
+                        close_dialog = SDL_TRUE;
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+
+        case ButtonPress:
+            data->button_press_index = -1;
+            if ( e.xbutton.button == Button1 ) {
+                /* Find index of button they clicked on. */
+                data->button_press_index = GetHitButtonIndex( data, e.xbutton.x, e.xbutton.y );
+            }
+            break;
+
+        case ButtonRelease:
+            /* If button is released over the same button that was clicked down on, then return it. */
+            if ( ( e.xbutton.button == Button1 ) && ( data->button_press_index >= 0 ) ) {
+                int button = GetHitButtonIndex( data, e.xbutton.x, e.xbutton.y );
+
+                if ( data->button_press_index == button ) {
+                    SDL_MessageBoxButtonDataX11 *buttondatax11 = &data->buttonpos[ button ];
+
+                    *data->pbuttonid = buttondatax11->buttondata->buttonid;
+                    close_dialog = SDL_TRUE;
+                }
+            }
+            data->button_press_index = -1;
+            break;
+        }
+
+        if ( draw ) {
+            /* Draw our dialog box. */
+            X11_MessageBoxDraw( data, ctx );
+        }
+    }
+
+    X11_XFreeGC( data->display, ctx );
+    return 0;
+}
+
+static int
+X11_ShowMessageBoxImpl(const SDL_MessageBoxData *messageboxdata, int *buttonid)
+{
+    int ret;
+    SDL_MessageBoxDataX11 data;
+#if SDL_SET_LOCALE
+    char *origlocale;
+#endif
+
+    SDL_zero(data);
+
+    if ( !SDL_X11_LoadSymbols() )
+        return -1;
+
+#if SDL_SET_LOCALE
+    origlocale = setlocale(LC_ALL, NULL);
+    if (origlocale != NULL) {
+        origlocale = SDL_strdup(origlocale);
+        if (origlocale == NULL) {
+            return SDL_OutOfMemory();
+        }
+        setlocale(LC_ALL, "");
+    }
+#endif
+
+    /* This code could get called from multiple threads maybe? */
+    X11_XInitThreads();
+
+    /* Initialize the return buttonid value to -1 (for error or dialogbox closed). */
+    *buttonid = -1;
+
+    /* Init and display the message box. */
+    ret = X11_MessageBoxInit( &data, messageboxdata, buttonid );
+    if ( ret != -1 ) {
+        ret = X11_MessageBoxInitPositions( &data );
+        if ( ret != -1 ) {
+            ret = X11_MessageBoxCreateWindow( &data );
+            if ( ret != -1 ) {
+                ret = X11_MessageBoxLoop( &data );
+            }
+        }
+    }
+
+    X11_MessageBoxShutdown( &data );
+
+#if SDL_SET_LOCALE
+    if (origlocale) {
+        setlocale(LC_ALL, origlocale);
+        SDL_free(origlocale);
+    }
+#endif
+
+    return ret;
+}
+
+/* Display an x11 message box. */
+int
+X11_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
+{
+#if SDL_FORK_MESSAGEBOX
+    /* Use a child process to protect against setlocale(). Annoying. */
+    pid_t pid;
+    int fds[2];
+    int status = 0;
+
+    /* Need to flush here in case someone has turned grab off and it hasn't gone through yet, etc. */
+    X11_XFlush(data->display);
+
+    if (pipe(fds) == -1) {
+        return X11_ShowMessageBoxImpl(messageboxdata, buttonid); /* oh well. */
+    }
+
+    pid = fork();
+    if (pid == -1) {  /* failed */
+        close(fds[0]);
+        close(fds[1]);
+        return X11_ShowMessageBoxImpl(messageboxdata, buttonid); /* oh well. */
+    } else if (pid == 0) {  /* we're the child */
+        int exitcode = 0;
+        close(fds[0]);
+        status = X11_ShowMessageBoxImpl(messageboxdata, buttonid);
+        if (write(fds[1], &status, sizeof (int)) != sizeof (int))
+            exitcode = 1;
+        else if (write(fds[1], buttonid, sizeof (int)) != sizeof (int))
+            exitcode = 1;
+        close(fds[1]);
+        _exit(exitcode);  /* don't run atexit() stuff, static destructors, etc. */
+    } else {  /* we're the parent */
+        pid_t rc;
+        close(fds[1]);
+        do {
+            rc = waitpid(pid, &status, 0);
+        } while ((rc == -1) && (errno == EINTR));
+
+        SDL_assert(rc == pid);  /* not sure what to do if this fails. */
+
+        if ((rc == -1) || (!WIFEXITED(status)) || (WEXITSTATUS(status) != 0)) {
+            return SDL_SetError("msgbox child process failed");
+        }
+
+        if (read(fds[0], &status, sizeof (int)) != sizeof (int))
+            status = -1;
+        else if (read(fds[0], buttonid, sizeof (int)) != sizeof (int))
+            status = -1;
+        close(fds[0]);
+
+        return status;
+    }
+#else
+    return X11_ShowMessageBoxImpl(messageboxdata, buttonid);
+#endif
+}
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11messagebox.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11messagebox.h
new file mode 100644
index 000000000..d2d171288
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11messagebox.h	
@@ -0,0 +1,28 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#if SDL_VIDEO_DRIVER_X11
+
+extern int X11_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11modes.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11modes.c
new file mode 100644
index 000000000..6336f0cab
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11modes.c	
@@ -0,0 +1,889 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include "SDL_hints.h"
+#include "SDL_x11video.h"
+#include "edid.h"
+
+/* #define X11MODES_DEBUG */
+
+/* I'm becoming more and more convinced that the application should never
+ * use XRandR, and it's the window manager's responsibility to track and
+ * manage display modes for fullscreen windows.  Right now XRandR is completely
+ * broken with respect to window manager behavior on every window manager that
+ * I can find.  For example, on Unity 3D if you show a fullscreen window while
+ * the resolution is changing (within ~250 ms) your window will retain the
+ * fullscreen state hint but be decorated and windowed.
+ *
+ * However, many people swear by it, so let them swear at it. :)
+*/
+/* #define XRANDR_DISABLED_BY_DEFAULT */
+
+
+static int
+get_visualinfo(Display * display, int screen, XVisualInfo * vinfo)
+{
+    const char *visual_id = SDL_getenv("SDL_VIDEO_X11_VISUALID");
+    int depth;
+
+    /* Look for an exact visual, if requested */
+    if (visual_id) {
+        XVisualInfo *vi, template;
+        int nvis;
+
+        SDL_zero(template);
+        template.visualid = SDL_strtol(visual_id, NULL, 0);
+        vi = X11_XGetVisualInfo(display, VisualIDMask, &template, &nvis);
+        if (vi) {
+            *vinfo = *vi;
+            X11_XFree(vi);
+            return 0;
+        }
+    }
+
+    depth = DefaultDepth(display, screen);
+    if ((X11_UseDirectColorVisuals() &&
+         X11_XMatchVisualInfo(display, screen, depth, DirectColor, vinfo)) ||
+        X11_XMatchVisualInfo(display, screen, depth, TrueColor, vinfo) ||
+        X11_XMatchVisualInfo(display, screen, depth, PseudoColor, vinfo) ||
+        X11_XMatchVisualInfo(display, screen, depth, StaticColor, vinfo)) {
+        return 0;
+    }
+    return -1;
+}
+
+int
+X11_GetVisualInfoFromVisual(Display * display, Visual * visual, XVisualInfo * vinfo)
+{
+    XVisualInfo *vi;
+    int nvis;
+
+    vinfo->visualid = X11_XVisualIDFromVisual(visual);
+    vi = X11_XGetVisualInfo(display, VisualIDMask, vinfo, &nvis);
+    if (vi) {
+        *vinfo = *vi;
+        X11_XFree(vi);
+        return 0;
+    }
+    return -1;
+}
+
+Uint32
+X11_GetPixelFormatFromVisualInfo(Display * display, XVisualInfo * vinfo)
+{
+    if (vinfo->class == DirectColor || vinfo->class == TrueColor) {
+        int bpp;
+        Uint32 Rmask, Gmask, Bmask, Amask;
+
+        Rmask = vinfo->visual->red_mask;
+        Gmask = vinfo->visual->green_mask;
+        Bmask = vinfo->visual->blue_mask;
+        if (vinfo->depth == 32) {
+            Amask = (0xFFFFFFFF & ~(Rmask | Gmask | Bmask));
+        } else {
+            Amask = 0;
+        }
+
+        bpp = vinfo->depth;
+        if (bpp == 24) {
+            int i, n;
+            XPixmapFormatValues *p = X11_XListPixmapFormats(display, &n);
+            if (p) {
+                for (i = 0; i < n; ++i) {
+                    if (p[i].depth == 24) {
+                        bpp = p[i].bits_per_pixel;
+                        break;
+                    }
+                }
+                X11_XFree(p);
+            }
+        }
+
+        return SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask);
+    }
+
+    if (vinfo->class == PseudoColor || vinfo->class == StaticColor) {
+        switch (vinfo->depth) {
+        case 8:
+            return SDL_PIXELTYPE_INDEX8;
+        case 4:
+            if (BitmapBitOrder(display) == LSBFirst) {
+                return SDL_PIXELFORMAT_INDEX4LSB;
+            } else {
+                return SDL_PIXELFORMAT_INDEX4MSB;
+            }
+            break;
+        case 1:
+            if (BitmapBitOrder(display) == LSBFirst) {
+                return SDL_PIXELFORMAT_INDEX1LSB;
+            } else {
+                return SDL_PIXELFORMAT_INDEX1MSB;
+            }
+            break;
+        }
+    }
+
+    return SDL_PIXELFORMAT_UNKNOWN;
+}
+
+/* Global for the error handler */
+int vm_event, vm_error = -1;
+
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+static SDL_bool
+CheckXinerama(Display * display, int *major, int *minor)
+{
+    int event_base = 0;
+    int error_base = 0;
+    const char *env;
+
+    /* Default the extension not available */
+    *major = *minor = 0;
+
+    /* Allow environment override */
+    env = SDL_GetHint(SDL_HINT_VIDEO_X11_XINERAMA);
+    if (env && !SDL_atoi(env)) {
+#ifdef X11MODES_DEBUG
+        printf("Xinerama disabled due to hint\n");
+#endif
+        return SDL_FALSE;
+    }
+
+    if (!SDL_X11_HAVE_XINERAMA) {
+#ifdef X11MODES_DEBUG
+        printf("Xinerama support not available\n");
+#endif
+        return SDL_FALSE;
+    }
+
+    /* Query the extension version */
+    if (!X11_XineramaQueryExtension(display, &event_base, &error_base) ||
+        !X11_XineramaQueryVersion(display, major, minor) ||
+        !X11_XineramaIsActive(display)) {
+#ifdef X11MODES_DEBUG
+        printf("Xinerama not active on the display\n");
+#endif
+        return SDL_FALSE;
+    }
+#ifdef X11MODES_DEBUG
+    printf("Xinerama available at version %d.%d!\n", *major, *minor);
+#endif
+    return SDL_TRUE;
+}
+#endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
+
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+static SDL_bool
+CheckXRandR(Display * display, int *major, int *minor)
+{
+    const char *env;
+
+    /* Default the extension not available */
+    *major = *minor = 0;
+
+    /* Allow environment override */
+    env = SDL_GetHint(SDL_HINT_VIDEO_X11_XRANDR);
+#ifdef XRANDR_DISABLED_BY_DEFAULT
+    if (!env || !SDL_atoi(env)) {
+#ifdef X11MODES_DEBUG
+        printf("XRandR disabled by default due to window manager issues\n");
+#endif
+        return SDL_FALSE;
+    }
+#else
+    if (env && !SDL_atoi(env)) {
+#ifdef X11MODES_DEBUG
+        printf("XRandR disabled due to hint\n");
+#endif
+        return SDL_FALSE;
+    }
+#endif /* XRANDR_ENABLED_BY_DEFAULT */
+
+    if (!SDL_X11_HAVE_XRANDR) {
+#ifdef X11MODES_DEBUG
+        printf("XRandR support not available\n");
+#endif
+        return SDL_FALSE;
+    }
+
+    /* Query the extension version */
+    if (!X11_XRRQueryVersion(display, major, minor)) {
+#ifdef X11MODES_DEBUG
+        printf("XRandR not active on the display\n");
+#endif
+        return SDL_FALSE;
+    }
+#ifdef X11MODES_DEBUG
+    printf("XRandR available at version %d.%d!\n", *major, *minor);
+#endif
+    return SDL_TRUE;
+}
+
+#define XRANDR_ROTATION_LEFT    (1 << 1)
+#define XRANDR_ROTATION_RIGHT   (1 << 3)
+
+static int
+CalculateXRandRRefreshRate(const XRRModeInfo *info)
+{
+    return (info->hTotal
+            && info->vTotal) ? (info->dotClock / (info->hTotal * info->vTotal)) : 0;
+}
+
+static SDL_bool
+SetXRandRModeInfo(Display *display, XRRScreenResources *res, XRROutputInfo *output_info,
+                  RRMode modeID, SDL_DisplayMode *mode)
+{
+    int i;
+    for (i = 0; i < res->nmode; ++i) {
+        if (res->modes[i].id == modeID) {
+            XRRCrtcInfo *crtc;
+            Rotation rotation = 0;
+            const XRRModeInfo *info = &res->modes[i];
+
+            crtc = X11_XRRGetCrtcInfo(display, res, output_info->crtc);
+            if (crtc) {
+                rotation = crtc->rotation;
+                X11_XRRFreeCrtcInfo(crtc);
+            }
+
+            if (rotation & (XRANDR_ROTATION_LEFT|XRANDR_ROTATION_RIGHT)) {
+                mode->w = info->height;
+                mode->h = info->width;
+            } else {
+                mode->w = info->width;
+                mode->h = info->height;
+            }
+            mode->refresh_rate = CalculateXRandRRefreshRate(info);
+            ((SDL_DisplayModeData*)mode->driverdata)->xrandr_mode = modeID;
+#ifdef X11MODES_DEBUG
+            printf("XRandR mode %d: %dx%d@%dHz\n", (int) modeID, mode->w, mode->h, mode->refresh_rate);
+#endif
+            return SDL_TRUE;
+        }
+    }
+    return SDL_FALSE;
+}
+#endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
+
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+static SDL_bool
+CheckVidMode(Display * display, int *major, int *minor)
+{
+    const char *env;
+
+    /* Default the extension not available */
+    *major = *minor = 0;
+
+    /* Allow environment override */
+    env = SDL_GetHint(SDL_HINT_VIDEO_X11_XVIDMODE);
+    if (env && !SDL_atoi(env)) {
+#ifdef X11MODES_DEBUG
+        printf("XVidMode disabled due to hint\n");
+#endif
+        return SDL_FALSE;
+    }
+
+    if (!SDL_X11_HAVE_XVIDMODE) {
+#ifdef X11MODES_DEBUG
+        printf("XVidMode support not available\n");
+#endif
+        return SDL_FALSE;
+    }
+
+    /* Query the extension version */
+    vm_error = -1;
+    if (!X11_XF86VidModeQueryExtension(display, &vm_event, &vm_error)
+        || !X11_XF86VidModeQueryVersion(display, major, minor)) {
+#ifdef X11MODES_DEBUG
+        printf("XVidMode not active on the display\n");
+#endif
+        return SDL_FALSE;
+    }
+#ifdef X11MODES_DEBUG
+    printf("XVidMode available at version %d.%d!\n", *major, *minor);
+#endif
+    return SDL_TRUE;
+}
+
+static
+Bool XF86VidModeGetModeInfo(Display * dpy, int scr,
+                                       XF86VidModeModeInfo* info)
+{
+    Bool retval;
+    int dotclock;
+    XF86VidModeModeLine l;
+    SDL_zerop(info);
+    SDL_zero(l);
+    retval = X11_XF86VidModeGetModeLine(dpy, scr, &dotclock, &l);
+    info->dotclock = dotclock;
+    info->hdisplay = l.hdisplay;
+    info->hsyncstart = l.hsyncstart;
+    info->hsyncend = l.hsyncend;
+    info->htotal = l.htotal;
+    info->hskew = l.hskew;
+    info->vdisplay = l.vdisplay;
+    info->vsyncstart = l.vsyncstart;
+    info->vsyncend = l.vsyncend;
+    info->vtotal = l.vtotal;
+    info->flags = l.flags;
+    info->privsize = l.privsize;
+    info->private = l.private;
+    return retval;
+}
+
+static int
+CalculateXVidModeRefreshRate(const XF86VidModeModeInfo * info)
+{
+    return (info->htotal
+            && info->vtotal) ? (1000 * info->dotclock / (info->htotal *
+                                                         info->vtotal)) : 0;
+}
+
+SDL_bool
+SetXVidModeModeInfo(const XF86VidModeModeInfo *info, SDL_DisplayMode *mode)
+{
+    mode->w = info->hdisplay;
+    mode->h = info->vdisplay;
+    mode->refresh_rate = CalculateXVidModeRefreshRate(info);
+    ((SDL_DisplayModeData*)mode->driverdata)->vm_mode = *info;
+    return SDL_TRUE;
+}
+#endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
+
+int
+X11_InitModes(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    int screen, screencount;
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+    int xinerama_major, xinerama_minor;
+    int use_xinerama = 0;
+    XineramaScreenInfo *xinerama = NULL;
+#endif
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+    int xrandr_major, xrandr_minor;
+    int use_xrandr = 0;
+    XRRScreenResources *res = NULL;
+#endif
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+    int vm_major, vm_minor;
+    int use_vidmode = 0;
+#endif
+
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+    /* Query Xinerama extention
+     * NOTE: This works with Nvidia Twinview correctly, but you need version 302.17 (released on June 2012)
+     *       or newer of the Nvidia binary drivers
+     */
+    if (CheckXinerama(data->display, &xinerama_major, &xinerama_minor)) {
+        xinerama = X11_XineramaQueryScreens(data->display, &screencount);
+        if (xinerama) {
+            use_xinerama = xinerama_major * 100 + xinerama_minor;
+        }
+    }
+    if (!xinerama) {
+        screencount = ScreenCount(data->display);
+    }
+#else
+    screencount = ScreenCount(data->display);
+#endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
+
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+    /* require at least XRandR v1.2 */
+    if (CheckXRandR(data->display, &xrandr_major, &xrandr_minor) &&
+        (xrandr_major >= 2 || (xrandr_major == 1 && xrandr_minor >= 2))) {
+        use_xrandr = xrandr_major * 100 + xrandr_minor;
+    }
+#endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
+
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+    if (CheckVidMode(data->display, &vm_major, &vm_minor)) {
+        use_vidmode = vm_major * 100 + vm_minor;
+    }
+#endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
+
+    for (screen = 0; screen < screencount; ++screen) {
+        XVisualInfo vinfo;
+        SDL_VideoDisplay display;
+        SDL_DisplayData *displaydata;
+        SDL_DisplayMode mode;
+        SDL_DisplayModeData *modedata;
+        XPixmapFormatValues *pixmapFormats;
+        char display_name[128];
+        int i, n;
+
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+        if (xinerama) {
+            if (get_visualinfo(data->display, 0, &vinfo) < 0) {
+                continue;
+            }
+        } else {
+            if (get_visualinfo(data->display, screen, &vinfo) < 0) {
+                continue;
+            }
+        }
+#else
+        if (get_visualinfo(data->display, screen, &vinfo) < 0) {
+            continue;
+        }
+#endif
+
+        displaydata = (SDL_DisplayData *) SDL_calloc(1, sizeof(*displaydata));
+        if (!displaydata) {
+            continue;
+        }
+        display_name[0] = '\0';
+
+        mode.format = X11_GetPixelFormatFromVisualInfo(data->display, &vinfo);
+        if (SDL_ISPIXELFORMAT_INDEXED(mode.format)) {
+            /* We don't support palettized modes now */
+            SDL_free(displaydata);
+            continue;
+        }
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+        if (xinerama) {
+            mode.w = xinerama[screen].width;
+            mode.h = xinerama[screen].height;
+        } else {
+            mode.w = DisplayWidth(data->display, screen);
+            mode.h = DisplayHeight(data->display, screen);
+        }
+#else
+        mode.w = DisplayWidth(data->display, screen);
+        mode.h = DisplayHeight(data->display, screen);
+#endif
+        mode.refresh_rate = 0;
+
+        modedata = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
+        if (!modedata) {
+            SDL_free(displaydata);
+            continue;
+        }
+        mode.driverdata = modedata;
+
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+        /* Most of SDL's calls to X11 are unwaware of Xinerama, and to X11 standard calls, when Xinerama is active,
+         * there's only one screen available. So we force the screen number to zero and
+         * let Xinerama specific code handle specific functionality using displaydata->xinerama_info
+         */
+        if (use_xinerama) {
+            displaydata->screen = 0;
+            displaydata->use_xinerama = use_xinerama;
+            displaydata->xinerama_info = xinerama[screen];
+            displaydata->xinerama_screen = screen;
+        }
+        else displaydata->screen = screen;
+#else
+        displaydata->screen = screen;
+#endif
+        displaydata->visual = vinfo.visual;
+        displaydata->depth = vinfo.depth;
+
+        displaydata->scanline_pad = SDL_BYTESPERPIXEL(mode.format) * 8;
+        pixmapFormats = X11_XListPixmapFormats(data->display, &n);
+        if (pixmapFormats) {
+            for (i = 0; i < n; ++i) {
+                if (pixmapFormats[i].depth == displaydata->depth) {
+                    displaydata->scanline_pad = pixmapFormats[i].scanline_pad;
+                    break;
+                }
+            }
+            X11_XFree(pixmapFormats);
+        }
+
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+        if (use_xinerama) {
+            displaydata->x = xinerama[screen].x_org;
+            displaydata->y = xinerama[screen].y_org;
+        }
+        else
+#endif
+        {
+            displaydata->x = 0;
+            displaydata->y = 0;
+        }
+
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+        if (use_xrandr) {
+            res = X11_XRRGetScreenResources(data->display, RootWindow(data->display, displaydata->screen));
+        }
+        if (res) {
+            XRROutputInfo *output_info;
+            XRRCrtcInfo *crtc;
+            int output;
+            Atom EDID = X11_XInternAtom(data->display, "EDID", False);
+            Atom *props;
+            int nprop;
+            unsigned long width_mm;
+            unsigned long height_mm;
+            int inches = 0;
+
+            for (output = 0; output < res->noutput; output++) {
+                output_info = X11_XRRGetOutputInfo(data->display, res, res->outputs[output]);
+                if (!output_info || !output_info->crtc ||
+                    output_info->connection == RR_Disconnected) {
+                    X11_XRRFreeOutputInfo(output_info);
+                    continue;
+                }
+
+                /* Is this the output that corresponds to the current screen?
+                   We're checking the crtc position, but that may not be a valid test
+                   in all cases.  Anybody want to give this some love?
+                 */
+                crtc = X11_XRRGetCrtcInfo(data->display, res, output_info->crtc);
+                if (!crtc || crtc->x != displaydata->x || crtc->y != displaydata->y ||
+                    crtc->width != mode.w || crtc->height != mode.h) {
+                    X11_XRRFreeOutputInfo(output_info);
+                    X11_XRRFreeCrtcInfo(crtc);
+                    continue;
+                }
+
+                displaydata->use_xrandr = use_xrandr;
+                displaydata->xrandr_output = res->outputs[output];
+                SetXRandRModeInfo(data->display, res, output_info, crtc->mode, &mode);
+
+                /* Get the name of this display */
+                width_mm = output_info->mm_width;
+                height_mm = output_info->mm_height;
+                inches = (int)((sqrt(width_mm * width_mm +
+                                     height_mm * height_mm) / 25.4f) + 0.5f);
+                SDL_strlcpy(display_name, output_info->name, sizeof(display_name));
+
+                /* See if we can get the EDID data for the real monitor name */
+                props = X11_XRRListOutputProperties(data->display, res->outputs[output], &nprop);
+                for (i = 0; i < nprop; ++i) {
+                    unsigned char *prop;
+                    int actual_format;
+                    unsigned long nitems, bytes_after;
+                    Atom actual_type;
+
+                    if (props[i] == EDID) {
+                        if (X11_XRRGetOutputProperty(data->display,
+                                                 res->outputs[output], props[i],
+                                                 0, 100, False, False,
+                                                 AnyPropertyType,
+                                                 &actual_type, &actual_format,
+                                                 &nitems, &bytes_after, &prop) == Success ) {
+                            MonitorInfo *info = decode_edid(prop);
+                            if (info) {
+    #ifdef X11MODES_DEBUG
+                                printf("Found EDID data for %s\n", output_info->name);
+                                dump_monitor_info(info);
+    #endif
+                                SDL_strlcpy(display_name, info->dsc_product_name, sizeof(display_name));
+                                free(info);
+                            }
+                            X11_XFree(prop);
+                        }
+                        break;
+                    }
+                }
+                if (props) {
+                    X11_XFree(props);
+                }
+
+                if (*display_name && inches) {
+                    size_t len = SDL_strlen(display_name);
+                    SDL_snprintf(&display_name[len], sizeof(display_name)-len, " %d\"", inches);
+                }
+#ifdef X11MODES_DEBUG
+                printf("Display name: %s\n", display_name);
+#endif
+
+                X11_XRRFreeOutputInfo(output_info);
+                X11_XRRFreeCrtcInfo(crtc);
+                break;
+            }
+#ifdef X11MODES_DEBUG
+            if (output == res->noutput) {
+                printf("Couldn't find XRandR CRTC at %d,%d\n", displaydata->x, displaydata->y);
+            }
+#endif
+            X11_XRRFreeScreenResources(res);
+        }
+#endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
+
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+        if (!displaydata->use_xrandr &&
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+            /* XVidMode only works on the screen at the origin */
+            (!displaydata->use_xinerama ||
+             (displaydata->x == 0 && displaydata->y == 0)) &&
+#endif
+            use_vidmode) {
+            displaydata->use_vidmode = use_vidmode;
+            if (displaydata->use_xinerama) {
+                displaydata->vidmode_screen = 0;
+            } else {
+                displaydata->vidmode_screen = screen;
+            }
+            XF86VidModeGetModeInfo(data->display, displaydata->vidmode_screen, &modedata->vm_mode);
+        }
+#endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
+
+        SDL_zero(display);
+        if (*display_name) {
+            display.name = display_name;
+        }
+        display.desktop_mode = mode;
+        display.current_mode = mode;
+        display.driverdata = displaydata;
+        SDL_AddVideoDisplay(&display);
+    }
+
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+    if (xinerama) X11_XFree(xinerama);
+#endif
+
+    if (_this->num_displays == 0) {
+        return SDL_SetError("No available displays");
+    }
+    return 0;
+}
+
+void
+X11_GetDisplayModes(_THIS, SDL_VideoDisplay * sdl_display)
+{
+    Display *display = ((SDL_VideoData *) _this->driverdata)->display;
+    SDL_DisplayData *data = (SDL_DisplayData *) sdl_display->driverdata;
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+    int nmodes;
+    XF86VidModeModeInfo ** modes;
+#endif
+    int screen_w;
+    int screen_h;
+    SDL_DisplayMode mode;
+    SDL_DisplayModeData *modedata;
+
+    /* Unfortunately X11 requires the window to be created with the correct
+     * visual and depth ahead of time, but the SDL API allows you to create
+     * a window before setting the fullscreen display mode.  This means that
+     * we have to use the same format for all windows and all display modes.
+     * (or support recreating the window with a new visual behind the scenes)
+     */
+    mode.format = sdl_display->current_mode.format;
+    mode.driverdata = NULL;
+
+    screen_w = DisplayWidth(display, data->screen);
+    screen_h = DisplayHeight(display, data->screen);
+
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+    if (data->use_xinerama) {
+        if (data->use_vidmode && !data->xinerama_info.x_org && !data->xinerama_info.y_org &&
+           (screen_w > data->xinerama_info.width || screen_h > data->xinerama_info.height)) {
+            /* Add the full (both screens combined) xinerama mode only on the display that starts at 0,0
+             * if we're using vidmode.
+             */
+            mode.w = screen_w;
+            mode.h = screen_h;
+            mode.refresh_rate = 0;
+            modedata = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
+            if (modedata) {
+                *modedata = *(SDL_DisplayModeData *)sdl_display->desktop_mode.driverdata;
+            }
+            mode.driverdata = modedata;
+            SDL_AddDisplayMode(sdl_display, &mode);
+        }
+        else if (!data->use_xrandr)
+        {
+            /* Add the current mode of each monitor otherwise if we can't get them from xrandr */
+            mode.w = data->xinerama_info.width;
+            mode.h = data->xinerama_info.height;
+            mode.refresh_rate = 0;
+            modedata = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
+            if (modedata) {
+                *modedata = *(SDL_DisplayModeData *)sdl_display->desktop_mode.driverdata;
+            }
+            mode.driverdata = modedata;
+            SDL_AddDisplayMode(sdl_display, &mode);
+        }
+
+    }
+#endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
+
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+    if (data->use_xrandr) {
+        XRRScreenResources *res;
+
+        res = X11_XRRGetScreenResources (display, RootWindow(display, data->screen));
+        if (res) {
+            SDL_DisplayModeData *modedata;
+            XRROutputInfo *output_info;
+            int i;
+
+            output_info = X11_XRRGetOutputInfo(display, res, data->xrandr_output);
+            if (output_info && output_info->connection != RR_Disconnected) {
+                for (i = 0; i < output_info->nmode; ++i) {
+                    modedata = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
+                    if (!modedata) {
+                        continue;
+                    }
+                    mode.driverdata = modedata;
+
+                    if (SetXRandRModeInfo(display, res, output_info, output_info->modes[i], &mode)) {
+                        SDL_AddDisplayMode(sdl_display, &mode);
+                    } else {
+                        SDL_free(modedata);
+                    }
+                }
+            }
+            X11_XRRFreeOutputInfo(output_info);
+            X11_XRRFreeScreenResources(res);
+        }
+        return;
+    }
+#endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
+
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+    if (data->use_vidmode &&
+        X11_XF86VidModeGetAllModeLines(display, data->vidmode_screen, &nmodes, &modes)) {
+        int i;
+
+#ifdef X11MODES_DEBUG
+        printf("VidMode modes: (unsorted)\n");
+        for (i = 0; i < nmodes; ++i) {
+            printf("Mode %d: %d x %d @ %d, flags: 0x%x\n", i,
+                   modes[i]->hdisplay, modes[i]->vdisplay,
+                   CalculateXVidModeRefreshRate(modes[i]), modes[i]->flags);
+        }
+#endif
+        for (i = 0; i < nmodes; ++i) {
+            modedata = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
+            if (!modedata) {
+                continue;
+            }
+            mode.driverdata = modedata;
+
+            if (SetXVidModeModeInfo(modes[i], &mode)) {
+                SDL_AddDisplayMode(sdl_display, &mode);
+            } else {
+                SDL_free(modedata);
+            }
+        }
+        X11_XFree(modes);
+        return;
+    }
+#endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
+
+    if (!data->use_xrandr && !data->use_vidmode) {
+        /* Add the desktop mode */
+        mode = sdl_display->desktop_mode;
+        modedata = (SDL_DisplayModeData *) SDL_calloc(1, sizeof(SDL_DisplayModeData));
+        if (modedata) {
+            *modedata = *(SDL_DisplayModeData *)sdl_display->desktop_mode.driverdata;
+        }
+        mode.driverdata = modedata;
+        SDL_AddDisplayMode(sdl_display, &mode);
+    }
+}
+
+int
+X11_SetDisplayMode(_THIS, SDL_VideoDisplay * sdl_display, SDL_DisplayMode * mode)
+{
+    Display *display = ((SDL_VideoData *) _this->driverdata)->display;
+    SDL_DisplayData *data = (SDL_DisplayData *) sdl_display->driverdata;
+    SDL_DisplayModeData *modedata = (SDL_DisplayModeData *)mode->driverdata;
+
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+    if (data->use_xrandr) {
+        XRRScreenResources *res;
+        XRROutputInfo *output_info;
+        XRRCrtcInfo *crtc;
+        Status status;
+
+        res = X11_XRRGetScreenResources (display, RootWindow(display, data->screen));
+        if (!res) {
+            return SDL_SetError("Couldn't get XRandR screen resources");
+        }
+
+        output_info = X11_XRRGetOutputInfo(display, res, data->xrandr_output);
+        if (!output_info || output_info->connection == RR_Disconnected) {
+            X11_XRRFreeScreenResources(res);
+            return SDL_SetError("Couldn't get XRandR output info");
+        }
+
+        crtc = X11_XRRGetCrtcInfo(display, res, output_info->crtc);
+        if (!crtc) {
+            X11_XRRFreeOutputInfo(output_info);
+            X11_XRRFreeScreenResources(res);
+            return SDL_SetError("Couldn't get XRandR crtc info");
+        }
+
+        status = X11_XRRSetCrtcConfig (display, res, output_info->crtc, CurrentTime,
+          crtc->x, crtc->y, modedata->xrandr_mode, crtc->rotation,
+          &data->xrandr_output, 1);
+
+        X11_XRRFreeCrtcInfo(crtc);
+        X11_XRRFreeOutputInfo(output_info);
+        X11_XRRFreeScreenResources(res);
+
+        if (status != Success) {
+            return SDL_SetError("X11_XRRSetCrtcConfig failed");
+        }
+    }
+#endif /* SDL_VIDEO_DRIVER_X11_XRANDR */
+
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+    if (data->use_vidmode) {
+        X11_XF86VidModeSwitchToMode(display, data->vidmode_screen, &modedata->vm_mode);
+    }
+#endif /* SDL_VIDEO_DRIVER_X11_XVIDMODE */
+
+    return 0;
+}
+
+void
+X11_QuitModes(_THIS)
+{
+}
+
+int
+X11_GetDisplayBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rect)
+{
+    SDL_DisplayData *data = (SDL_DisplayData *) sdl_display->driverdata;
+
+    rect->x = data->x;
+    rect->y = data->y;
+    rect->w = sdl_display->current_mode.w;
+    rect->h = sdl_display->current_mode.h;
+
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+    /* Get the real current bounds of the display */
+    if (data->use_xinerama) {
+        Display *display = ((SDL_VideoData *) _this->driverdata)->display;
+        int screencount;
+        XineramaScreenInfo *xinerama = X11_XineramaQueryScreens(display, &screencount);
+        if (xinerama) {
+            rect->x = xinerama[data->xinerama_screen].x_org;
+            rect->y = xinerama[data->xinerama_screen].y_org;
+            X11_XFree(xinerama);
+        }
+    }
+#endif /* SDL_VIDEO_DRIVER_X11_XINERAMA */
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11modes.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11modes.h
new file mode 100644
index 000000000..82af1d2d8
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11modes.h	
@@ -0,0 +1,80 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11modes_h
+#define _SDL_x11modes_h
+
+typedef struct
+{
+    int screen;
+    Visual *visual;
+    int depth;
+    int scanline_pad;
+    int x;
+    int y;
+
+    int use_xinerama;
+    int use_xrandr;
+    int use_vidmode;
+
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+    XineramaScreenInfo xinerama_info;
+    int xinerama_screen;
+#endif
+
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+    RROutput xrandr_output;
+#endif
+
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+    int vidmode_screen;
+#endif
+
+} SDL_DisplayData;
+
+typedef struct
+{
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+    RRMode xrandr_mode;
+#endif
+
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+    XF86VidModeModeInfo vm_mode;
+#endif
+
+} SDL_DisplayModeData;
+
+extern int X11_InitModes(_THIS);
+extern void X11_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
+extern int X11_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
+extern void X11_QuitModes(_THIS);
+
+/* Some utility functions for working with visuals */
+extern int X11_GetVisualInfoFromVisual(Display * display, Visual * visual,
+                                       XVisualInfo * vinfo);
+extern Uint32 X11_GetPixelFormatFromVisualInfo(Display * display,
+                                               XVisualInfo * vinfo);
+extern int X11_GetDisplayBounds(_THIS, SDL_VideoDisplay * sdl_display, SDL_Rect * rect);
+
+#endif /* _SDL_x11modes_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11mouse.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11mouse.c
new file mode 100644
index 000000000..38bb86656
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11mouse.c	
@@ -0,0 +1,356 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include <X11/cursorfont.h>
+#include "SDL_assert.h"
+#include "SDL_x11video.h"
+#include "SDL_x11mouse.h"
+#include "SDL_x11xinput2.h"
+#include "../../events/SDL_mouse_c.h"
+
+
+/* FIXME: Find a better place to put this... */
+static Cursor x11_empty_cursor = None;
+
+static Display *
+GetDisplay(void)
+{
+    return ((SDL_VideoData *)SDL_GetVideoDevice()->driverdata)->display;
+}
+
+static Cursor
+X11_CreateEmptyCursor()
+{
+    if (x11_empty_cursor == None) {
+        Display *display = GetDisplay();
+        char data[1];
+        XColor color;
+        Pixmap pixmap;
+
+        SDL_zero(data);
+        color.red = color.green = color.blue = 0;
+        pixmap = X11_XCreateBitmapFromData(display, DefaultRootWindow(display),
+                                       data, 1, 1);
+        if (pixmap) {
+            x11_empty_cursor = X11_XCreatePixmapCursor(display, pixmap, pixmap,
+                                                   &color, &color, 0, 0);
+            X11_XFreePixmap(display, pixmap);
+        }
+    }
+    return x11_empty_cursor;
+}
+
+static void
+X11_DestroyEmptyCursor(void)
+{
+    if (x11_empty_cursor != None) {
+        X11_XFreeCursor(GetDisplay(), x11_empty_cursor);
+        x11_empty_cursor = None;
+    }
+}
+
+static SDL_Cursor *
+X11_CreateDefaultCursor()
+{
+    SDL_Cursor *cursor;
+
+    cursor = SDL_calloc(1, sizeof(*cursor));
+    if (cursor) {
+        /* None is used to indicate the default cursor */
+        cursor->driverdata = (void*)None;
+    } else {
+        SDL_OutOfMemory();
+    }
+
+    return cursor;
+}
+
+#if SDL_VIDEO_DRIVER_X11_XCURSOR
+static Cursor
+X11_CreateXCursorCursor(SDL_Surface * surface, int hot_x, int hot_y)
+{
+    Display *display = GetDisplay();
+    Cursor cursor = None;
+    XcursorImage *image;
+
+    image = X11_XcursorImageCreate(surface->w, surface->h);
+    if (!image) {
+        SDL_OutOfMemory();
+        return None;
+    }
+    image->xhot = hot_x;
+    image->yhot = hot_y;
+    image->delay = 0;
+
+    SDL_assert(surface->format->format == SDL_PIXELFORMAT_ARGB8888);
+    SDL_assert(surface->pitch == surface->w * 4);
+    SDL_memcpy(image->pixels, surface->pixels, surface->h * surface->pitch);
+
+    cursor = X11_XcursorImageLoadCursor(display, image);
+
+    X11_XcursorImageDestroy(image);
+
+    return cursor;
+}
+#endif /* SDL_VIDEO_DRIVER_X11_XCURSOR */
+
+static Cursor
+X11_CreatePixmapCursor(SDL_Surface * surface, int hot_x, int hot_y)
+{
+    Display *display = GetDisplay();
+    XColor fg, bg;
+    Cursor cursor = None;
+    Uint32 *ptr;
+    Uint8 *data_bits, *mask_bits;
+    Pixmap data_pixmap, mask_pixmap;
+    int x, y;
+    unsigned int rfg, gfg, bfg, rbg, gbg, bbg, fgBits, bgBits;
+    unsigned int width_bytes = ((surface->w + 7) & ~7) / 8;
+
+    data_bits = SDL_calloc(1, surface->h * width_bytes);
+    if (!data_bits) {
+        SDL_OutOfMemory();
+        return None;
+    }
+
+    mask_bits = SDL_calloc(1, surface->h * width_bytes);
+    if (!mask_bits) {
+        SDL_free(data_bits);
+        SDL_OutOfMemory();
+        return None;
+    }
+
+    /* Code below assumes ARGB pixel format */
+    SDL_assert(surface->format->format == SDL_PIXELFORMAT_ARGB8888);
+
+    rfg = gfg = bfg = rbg = gbg = bbg = fgBits = bgBits = 0;
+    for (y = 0; y < surface->h; ++y) {
+        ptr = (Uint32 *)((Uint8 *)surface->pixels + y * surface->pitch);
+        for (x = 0; x < surface->w; ++x) {
+            int alpha = (*ptr >> 24) & 0xff;
+            int red   = (*ptr >> 16) & 0xff;
+            int green = (*ptr >> 8) & 0xff;
+            int blue  = (*ptr >> 0) & 0xff;
+            if (alpha > 25) {
+                mask_bits[y * width_bytes + x / 8] |= (0x01 << (x % 8));
+
+                if ((red + green + blue) > 0x40) {
+                    fgBits++;
+                    rfg += red;
+                    gfg += green;
+                    bfg += blue;
+                    data_bits[y * width_bytes + x / 8] |= (0x01 << (x % 8));
+                } else {
+                    bgBits++;
+                    rbg += red;
+                    gbg += green;
+                    bbg += blue;
+                }
+            }
+            ++ptr;
+        }
+    }
+
+    if (fgBits) {
+        fg.red   = rfg * 257 / fgBits;
+        fg.green = gfg * 257 / fgBits;
+        fg.blue  = bfg * 257 / fgBits;
+    }
+    else fg.red = fg.green = fg.blue = 0;
+
+    if (bgBits) {
+        bg.red   = rbg * 257 / bgBits;
+        bg.green = gbg * 257 / bgBits;
+        bg.blue  = bbg * 257 / bgBits;
+    }
+    else bg.red = bg.green = bg.blue = 0;
+
+    data_pixmap = X11_XCreateBitmapFromData(display, DefaultRootWindow(display),
+                                        (char*)data_bits,
+                                        surface->w, surface->h);
+    mask_pixmap = X11_XCreateBitmapFromData(display, DefaultRootWindow(display),
+                                        (char*)mask_bits,
+                                        surface->w, surface->h);
+    cursor = X11_XCreatePixmapCursor(display, data_pixmap, mask_pixmap,
+                                 &fg, &bg, hot_x, hot_y);
+    X11_XFreePixmap(display, data_pixmap);
+    X11_XFreePixmap(display, mask_pixmap);
+
+    return cursor;
+}
+
+static SDL_Cursor *
+X11_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y)
+{
+    SDL_Cursor *cursor;
+
+    cursor = SDL_calloc(1, sizeof(*cursor));
+    if (cursor) {
+        Cursor x11_cursor = None;
+
+#if SDL_VIDEO_DRIVER_X11_XCURSOR
+        if (SDL_X11_HAVE_XCURSOR) {
+            x11_cursor = X11_CreateXCursorCursor(surface, hot_x, hot_y);
+        }
+#endif
+        if (x11_cursor == None) {
+            x11_cursor = X11_CreatePixmapCursor(surface, hot_x, hot_y);
+        }
+        cursor->driverdata = (void*)x11_cursor;
+    } else {
+        SDL_OutOfMemory();
+    }
+
+    return cursor;
+}
+
+static SDL_Cursor *
+X11_CreateSystemCursor(SDL_SystemCursor id)
+{
+    SDL_Cursor *cursor;
+    unsigned int shape;
+
+    switch(id)
+    {
+    default:
+        SDL_assert(0);
+        return NULL;
+    /* X Font Cursors reference: */
+    /*   http://tronche.com/gui/x/xlib/appendix/b/ */
+    case SDL_SYSTEM_CURSOR_ARROW:     shape = XC_left_ptr; break;
+    case SDL_SYSTEM_CURSOR_IBEAM:     shape = XC_xterm; break;
+    case SDL_SYSTEM_CURSOR_WAIT:      shape = XC_watch; break;
+    case SDL_SYSTEM_CURSOR_CROSSHAIR: shape = XC_tcross; break;
+    case SDL_SYSTEM_CURSOR_WAITARROW: shape = XC_watch; break;
+    case SDL_SYSTEM_CURSOR_SIZENWSE:  shape = XC_fleur; break;
+    case SDL_SYSTEM_CURSOR_SIZENESW:  shape = XC_fleur; break;
+    case SDL_SYSTEM_CURSOR_SIZEWE:    shape = XC_sb_h_double_arrow; break;
+    case SDL_SYSTEM_CURSOR_SIZENS:    shape = XC_sb_v_double_arrow; break;
+    case SDL_SYSTEM_CURSOR_SIZEALL:   shape = XC_fleur; break;
+    case SDL_SYSTEM_CURSOR_NO:        shape = XC_pirate; break;
+    case SDL_SYSTEM_CURSOR_HAND:      shape = XC_hand2; break;
+    }
+
+    cursor = SDL_calloc(1, sizeof(*cursor));
+    if (cursor) {
+        Cursor x11_cursor;
+
+        x11_cursor = X11_XCreateFontCursor(GetDisplay(), shape);
+
+        cursor->driverdata = (void*)x11_cursor;
+    } else {
+        SDL_OutOfMemory();
+    }
+
+    return cursor;
+}
+
+static void
+X11_FreeCursor(SDL_Cursor * cursor)
+{
+    Cursor x11_cursor = (Cursor)cursor->driverdata;
+
+    if (x11_cursor != None) {
+        X11_XFreeCursor(GetDisplay(), x11_cursor);
+    }
+    SDL_free(cursor);
+}
+
+static int
+X11_ShowCursor(SDL_Cursor * cursor)
+{
+    Cursor x11_cursor = 0;
+
+    if (cursor) {
+        x11_cursor = (Cursor)cursor->driverdata;
+    } else {
+        x11_cursor = X11_CreateEmptyCursor();
+    }
+
+    /* FIXME: Is there a better way than this? */
+    {
+        SDL_VideoDevice *video = SDL_GetVideoDevice();
+        Display *display = GetDisplay();
+        SDL_Window *window;
+        SDL_WindowData *data;
+
+        for (window = video->windows; window; window = window->next) {
+            data = (SDL_WindowData *)window->driverdata;
+            if (x11_cursor != None) {
+                X11_XDefineCursor(display, data->xwindow, x11_cursor);
+            } else {
+                X11_XUndefineCursor(display, data->xwindow);
+            }
+        }
+        X11_XFlush(display);
+    }
+    return 0;
+}
+
+static void
+X11_WarpMouse(SDL_Window * window, int x, int y)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+
+    X11_XWarpPointer(display, None, data->xwindow, 0, 0, 0, 0, x, y);
+    X11_XSync(display, False);
+}
+
+static int
+X11_SetRelativeMouseMode(SDL_bool enabled)
+{
+#if SDL_VIDEO_DRIVER_X11_XINPUT2
+    if(X11_Xinput2IsInitialized())
+        return 0;
+#else
+    SDL_Unsupported();
+#endif
+    return -1;
+}
+
+void
+X11_InitMouse(_THIS)
+{
+    SDL_Mouse *mouse = SDL_GetMouse();
+
+    mouse->CreateCursor = X11_CreateCursor;
+    mouse->CreateSystemCursor = X11_CreateSystemCursor;
+    mouse->ShowCursor = X11_ShowCursor;
+    mouse->FreeCursor = X11_FreeCursor;
+    mouse->WarpMouse = X11_WarpMouse;
+    mouse->SetRelativeMouseMode = X11_SetRelativeMouseMode;
+
+    SDL_SetDefaultCursor(X11_CreateDefaultCursor());
+}
+
+void
+X11_QuitMouse(_THIS)
+{
+    X11_DestroyEmptyCursor();
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11mouse.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11mouse.h
new file mode 100644
index 000000000..8a2dac0ea
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11mouse.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11mouse_h
+#define _SDL_x11mouse_h
+
+extern void X11_InitMouse(_THIS);
+extern void X11_QuitMouse(_THIS);
+
+#endif /* _SDL_x11mouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11opengl.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11opengl.c
new file mode 100644
index 000000000..1d2603e0b
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11opengl.c	
@@ -0,0 +1,825 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include "SDL_x11video.h"
+#include "SDL_assert.h"
+
+/* GLX implementation of SDL OpenGL support */
+
+#if SDL_VIDEO_OPENGL_GLX
+#include "SDL_loadso.h"
+#include "SDL_x11opengles.h"
+
+#if defined(__IRIX__)
+/* IRIX doesn't have a GL library versioning system */
+#define DEFAULT_OPENGL  "libGL.so"
+#elif defined(__MACOSX__)
+#define DEFAULT_OPENGL  "/usr/X11R6/lib/libGL.1.dylib"
+#elif defined(__QNXNTO__)
+#define DEFAULT_OPENGL  "libGL.so.3"
+#else
+#define DEFAULT_OPENGL  "libGL.so.1"
+#endif
+
+#ifndef GLX_NONE_EXT
+#define GLX_NONE_EXT                       0x8000
+#endif
+
+#ifndef GLX_ARB_multisample
+#define GLX_ARB_multisample
+#define GLX_SAMPLE_BUFFERS_ARB             100000
+#define GLX_SAMPLES_ARB                    100001
+#endif
+
+#ifndef GLX_EXT_visual_rating
+#define GLX_EXT_visual_rating
+#define GLX_VISUAL_CAVEAT_EXT              0x20
+#define GLX_NONE_EXT                       0x8000
+#define GLX_SLOW_VISUAL_EXT                0x8001
+#define GLX_NON_CONFORMANT_VISUAL_EXT      0x800D
+#endif
+
+#ifndef GLX_EXT_visual_info
+#define GLX_EXT_visual_info
+#define GLX_X_VISUAL_TYPE_EXT              0x22
+#define GLX_DIRECT_COLOR_EXT               0x8003
+#endif
+
+#ifndef GLX_ARB_create_context
+#define GLX_ARB_create_context
+#define GLX_CONTEXT_MAJOR_VERSION_ARB      0x2091
+#define GLX_CONTEXT_MINOR_VERSION_ARB      0x2092
+#define GLX_CONTEXT_FLAGS_ARB              0x2094
+#define GLX_CONTEXT_DEBUG_BIT_ARB          0x0001
+#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
+
+/* Typedef for the GL 3.0 context creation function */
+typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display * dpy,
+                                                        GLXFBConfig config,
+                                                        GLXContext
+                                                        share_context,
+                                                        Bool direct,
+                                                        const int
+                                                        *attrib_list);
+#endif
+
+#ifndef GLX_ARB_create_context_profile
+#define GLX_ARB_create_context_profile
+#define GLX_CONTEXT_PROFILE_MASK_ARB       0x9126
+#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB   0x00000001
+#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002
+#endif
+
+#ifndef GLX_ARB_create_context_robustness
+#define GLX_ARB_create_context_robustness
+#define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB  0x00000004
+#define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB     0x8256
+#define GLX_NO_RESET_NOTIFICATION_ARB                   0x8261
+#define GLX_LOSE_CONTEXT_ON_RESET_ARB                   0x8252
+#endif
+
+#ifndef GLX_EXT_create_context_es2_profile
+#define GLX_EXT_create_context_es2_profile
+#ifndef GLX_CONTEXT_ES2_PROFILE_BIT_EXT
+#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT    0x00000002
+#endif
+#endif
+
+#ifndef GLX_ARB_framebuffer_sRGB
+#define GLX_ARB_framebuffer_sRGB
+#ifndef GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB
+#define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB                0x20B2
+#endif
+#endif
+
+#ifndef GLX_EXT_swap_control
+#define GLX_SWAP_INTERVAL_EXT              0x20F1
+#define GLX_MAX_SWAP_INTERVAL_EXT          0x20F2
+#endif
+
+#ifndef GLX_EXT_swap_control_tear
+#define GLX_LATE_SWAPS_TEAR_EXT 0x20F3
+#endif
+
+#define OPENGL_REQUIRES_DLOPEN
+#if defined(OPENGL_REQUIRES_DLOPEN) && defined(SDL_LOADSO_DLOPEN)
+#include <dlfcn.h>
+#define GL_LoadObject(X)    dlopen(X, (RTLD_NOW|RTLD_GLOBAL))
+#define GL_LoadFunction     dlsym
+#define GL_UnloadObject     dlclose
+#else
+#define GL_LoadObject   SDL_LoadObject
+#define GL_LoadFunction SDL_LoadFunction
+#define GL_UnloadObject SDL_UnloadObject
+#endif
+
+static void X11_GL_InitExtensions(_THIS);
+
+
+int
+X11_GL_LoadLibrary(_THIS, const char *path)
+{
+    Display *display;
+    void *handle;
+
+    if (_this->gl_data) {
+        return SDL_SetError("OpenGL context already created");
+    }
+
+    /* Load the OpenGL library */
+    if (path == NULL) {
+        path = SDL_getenv("SDL_OPENGL_LIBRARY");
+    }
+    if (path == NULL) {
+        path = DEFAULT_OPENGL;
+    }
+    _this->gl_config.dll_handle = GL_LoadObject(path);
+    if (!_this->gl_config.dll_handle) {
+#if defined(OPENGL_REQUIRES_DLOPEN) && defined(SDL_LOADSO_DLOPEN)
+        SDL_SetError("Failed loading %s: %s", path, dlerror());
+#endif
+        return -1;
+    }
+    SDL_strlcpy(_this->gl_config.driver_path, path,
+                SDL_arraysize(_this->gl_config.driver_path));
+
+    /* Allocate OpenGL memory */
+    _this->gl_data =
+        (struct SDL_GLDriverData *) SDL_calloc(1,
+                                               sizeof(struct
+                                                      SDL_GLDriverData));
+    if (!_this->gl_data) {
+        return SDL_OutOfMemory();
+    }
+
+    /* Load function pointers */
+    handle = _this->gl_config.dll_handle;
+    _this->gl_data->glXQueryExtension =
+        (Bool (*)(Display *, int *, int *))
+            GL_LoadFunction(handle, "glXQueryExtension");
+    _this->gl_data->glXGetProcAddress =
+        (void *(*)(const GLubyte *))
+            GL_LoadFunction(handle, "glXGetProcAddressARB");
+    _this->gl_data->glXChooseVisual =
+        (XVisualInfo * (*)(Display *, int, int *))
+            X11_GL_GetProcAddress(_this, "glXChooseVisual");
+    _this->gl_data->glXCreateContext =
+        (GLXContext(*)(Display *, XVisualInfo *, GLXContext, int))
+            X11_GL_GetProcAddress(_this, "glXCreateContext");
+    _this->gl_data->glXDestroyContext =
+        (void (*)(Display *, GLXContext))
+            X11_GL_GetProcAddress(_this, "glXDestroyContext");
+    _this->gl_data->glXMakeCurrent =
+        (int (*)(Display *, GLXDrawable, GLXContext))
+            X11_GL_GetProcAddress(_this, "glXMakeCurrent");
+    _this->gl_data->glXSwapBuffers =
+        (void (*)(Display *, GLXDrawable))
+            X11_GL_GetProcAddress(_this, "glXSwapBuffers");
+    _this->gl_data->glXQueryDrawable =
+        (void (*)(Display*,GLXDrawable,int,unsigned int*))
+            X11_GL_GetProcAddress(_this, "glXQueryDrawable");
+
+    if (!_this->gl_data->glXQueryExtension ||
+        !_this->gl_data->glXChooseVisual ||
+        !_this->gl_data->glXCreateContext ||
+        !_this->gl_data->glXDestroyContext ||
+        !_this->gl_data->glXMakeCurrent ||
+        !_this->gl_data->glXSwapBuffers) {
+        return SDL_SetError("Could not retrieve OpenGL functions");
+    }
+
+    display = ((SDL_VideoData *) _this->driverdata)->display;
+    if (!_this->gl_data->glXQueryExtension(display, &_this->gl_data->errorBase, &_this->gl_data->eventBase)) {
+        return SDL_SetError("GLX is not supported");
+    }
+
+    /* Initialize extensions */
+    X11_GL_InitExtensions(_this);
+    
+    /* If we need a GL ES context and there's no  
+     * GLX_EXT_create_context_es2_profile extension, switch over to X11_GLES functions  
+     */
+    if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES && 
+        ! _this->gl_data->HAS_GLX_EXT_create_context_es2_profile ) {
+#if SDL_VIDEO_OPENGL_EGL
+        X11_GL_UnloadLibrary(_this);
+        /* Better avoid conflicts! */
+        if (_this->gl_config.dll_handle != NULL ) {
+            GL_UnloadObject(_this->gl_config.dll_handle);
+            _this->gl_config.dll_handle = NULL;
+        }
+        _this->GL_LoadLibrary = X11_GLES_LoadLibrary;
+        _this->GL_GetProcAddress = X11_GLES_GetProcAddress;
+        _this->GL_UnloadLibrary = X11_GLES_UnloadLibrary;
+        _this->GL_CreateContext = X11_GLES_CreateContext;
+        _this->GL_MakeCurrent = X11_GLES_MakeCurrent;
+        _this->GL_SetSwapInterval = X11_GLES_SetSwapInterval;
+        _this->GL_GetSwapInterval = X11_GLES_GetSwapInterval;
+        _this->GL_SwapWindow = X11_GLES_SwapWindow;
+        _this->GL_DeleteContext = X11_GLES_DeleteContext;
+        return X11_GLES_LoadLibrary(_this, NULL);
+#else
+        return SDL_SetError("SDL not configured with EGL support");
+#endif
+    }
+
+    return 0;
+}
+
+void *
+X11_GL_GetProcAddress(_THIS, const char *proc)
+{
+    if (_this->gl_data->glXGetProcAddress) {
+        return _this->gl_data->glXGetProcAddress((const GLubyte *) proc);
+    }
+    return GL_LoadFunction(_this->gl_config.dll_handle, proc);
+}
+
+void
+X11_GL_UnloadLibrary(_THIS)
+{
+    /* Don't actually unload the library, since it may have registered
+     * X11 shutdown hooks, per the notes at:
+     * http://dri.sourceforge.net/doc/DRIuserguide.html
+     */
+#if 0
+    GL_UnloadObject(_this->gl_config.dll_handle);
+    _this->gl_config.dll_handle = NULL;
+#endif
+
+    /* Free OpenGL memory */
+    SDL_free(_this->gl_data);
+    _this->gl_data = NULL;
+}
+
+static SDL_bool
+HasExtension(const char *extension, const char *extensions)
+{
+    const char *start;
+    const char *where, *terminator;
+
+    /* Extension names should not have spaces. */
+    where = SDL_strchr(extension, ' ');
+    if (where || *extension == '\0')
+        return SDL_FALSE;
+
+    if (!extensions)
+        return SDL_FALSE;
+
+    /* It takes a bit of care to be fool-proof about parsing the
+     * OpenGL extensions string. Don't be fooled by sub-strings,
+     * etc. */
+
+    start = extensions;
+
+    for (;;) {
+        where = SDL_strstr(start, extension);
+        if (!where)
+            break;
+
+        terminator = where + SDL_strlen(extension);
+        if (where == start || *(where - 1) == ' ')
+            if (*terminator == ' ' || *terminator == '\0')
+                return SDL_TRUE;
+
+        start = terminator;
+    }
+    return SDL_FALSE;
+}
+
+static void
+X11_GL_InitExtensions(_THIS)
+{
+    Display *display = ((SDL_VideoData *) _this->driverdata)->display;
+    int screen = DefaultScreen(display);
+    XVisualInfo *vinfo;
+    XSetWindowAttributes xattr;
+    Window w;
+    GLXContext context;
+    const char *(*glXQueryExtensionsStringFunc) (Display *, int);
+    const char *extensions;
+
+    vinfo = X11_GL_GetVisual(_this, display, screen);
+    if (!vinfo) {
+        return;
+    }
+    xattr.background_pixel = 0;
+    xattr.border_pixel = 0;
+    xattr.colormap =
+        X11_XCreateColormap(display, RootWindow(display, screen), vinfo->visual,
+                        AllocNone);
+    w = X11_XCreateWindow(display, RootWindow(display, screen), 0, 0, 32, 32, 0,
+                      vinfo->depth, InputOutput, vinfo->visual,
+                      (CWBackPixel | CWBorderPixel | CWColormap), &xattr);
+    context = _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
+    if (context) {
+        _this->gl_data->glXMakeCurrent(display, w, context);
+    }
+    X11_XFree(vinfo);
+
+    glXQueryExtensionsStringFunc =
+        (const char *(*)(Display *, int)) X11_GL_GetProcAddress(_this,
+                                                                "glXQueryExtensionsString");
+    if (glXQueryExtensionsStringFunc) {
+        extensions = glXQueryExtensionsStringFunc(display, screen);
+    } else {
+        extensions = NULL;
+    }
+
+    /* Check for GLX_EXT_swap_control(_tear) */
+    _this->gl_data->HAS_GLX_EXT_swap_control_tear = SDL_FALSE;
+    if (HasExtension("GLX_EXT_swap_control", extensions)) {
+        _this->gl_data->glXSwapIntervalEXT =
+            (void (*)(Display*,GLXDrawable,int))
+                X11_GL_GetProcAddress(_this, "glXSwapIntervalEXT");
+        if (HasExtension("GLX_EXT_swap_control_tear", extensions)) {
+            _this->gl_data->HAS_GLX_EXT_swap_control_tear = SDL_TRUE;
+        }
+    }
+
+    /* Check for GLX_MESA_swap_control */
+    if (HasExtension("GLX_MESA_swap_control", extensions)) {
+        _this->gl_data->glXSwapIntervalMESA =
+            (int(*)(int)) X11_GL_GetProcAddress(_this, "glXSwapIntervalMESA");
+        _this->gl_data->glXGetSwapIntervalMESA =
+            (int(*)(void)) X11_GL_GetProcAddress(_this,
+                                                   "glXGetSwapIntervalMESA");
+    }
+
+    /* Check for GLX_SGI_swap_control */
+    if (HasExtension("GLX_SGI_swap_control", extensions)) {
+        _this->gl_data->glXSwapIntervalSGI =
+            (int (*)(int)) X11_GL_GetProcAddress(_this, "glXSwapIntervalSGI");
+    }
+
+    /* Check for GLX_EXT_visual_rating */
+    if (HasExtension("GLX_EXT_visual_rating", extensions)) {
+        _this->gl_data->HAS_GLX_EXT_visual_rating = SDL_TRUE;
+    }
+
+    /* Check for GLX_EXT_visual_info */
+    if (HasExtension("GLX_EXT_visual_info", extensions)) {
+        _this->gl_data->HAS_GLX_EXT_visual_info = SDL_TRUE;
+    }
+    
+    /* Check for GLX_EXT_create_context_es2_profile */
+    if (HasExtension("GLX_EXT_create_context_es2_profile", extensions)) {
+        _this->gl_data->HAS_GLX_EXT_create_context_es2_profile = SDL_TRUE;
+    }
+
+    if (context) {
+        _this->gl_data->glXMakeCurrent(display, None, NULL);
+        _this->gl_data->glXDestroyContext(display, context);
+    }
+    X11_XDestroyWindow(display, w);
+    X11_PumpEvents(_this);
+}
+
+/* glXChooseVisual and glXChooseFBConfig have some small differences in
+ * the attribute encoding, it can be chosen with the for_FBConfig parameter.
+ */
+int
+X11_GL_GetAttributes(_THIS, Display * display, int screen, int * attribs, int size, Bool for_FBConfig)
+{
+    int i = 0;
+    const int MAX_ATTRIBUTES = 64;
+
+    /* assert buffer is large enough to hold all SDL attributes. */
+    SDL_assert(size >= MAX_ATTRIBUTES);
+
+    /* Setup our GLX attributes according to the gl_config. */
+    if( for_FBConfig ) {
+        attribs[i++] = GLX_RENDER_TYPE;
+        attribs[i++] = GLX_RGBA_BIT;
+    } else {
+        attribs[i++] = GLX_RGBA;
+    }
+    attribs[i++] = GLX_RED_SIZE;
+    attribs[i++] = _this->gl_config.red_size;
+    attribs[i++] = GLX_GREEN_SIZE;
+    attribs[i++] = _this->gl_config.green_size;
+    attribs[i++] = GLX_BLUE_SIZE;
+    attribs[i++] = _this->gl_config.blue_size;
+
+    if (_this->gl_config.alpha_size) {
+        attribs[i++] = GLX_ALPHA_SIZE;
+        attribs[i++] = _this->gl_config.alpha_size;
+    }
+
+    if (_this->gl_config.double_buffer) {
+        attribs[i++] = GLX_DOUBLEBUFFER;
+        if( for_FBConfig ) {
+            attribs[i++] = True;
+        }
+    }
+
+    attribs[i++] = GLX_DEPTH_SIZE;
+    attribs[i++] = _this->gl_config.depth_size;
+
+    if (_this->gl_config.stencil_size) {
+        attribs[i++] = GLX_STENCIL_SIZE;
+        attribs[i++] = _this->gl_config.stencil_size;
+    }
+
+    if (_this->gl_config.accum_red_size) {
+        attribs[i++] = GLX_ACCUM_RED_SIZE;
+        attribs[i++] = _this->gl_config.accum_red_size;
+    }
+
+    if (_this->gl_config.accum_green_size) {
+        attribs[i++] = GLX_ACCUM_GREEN_SIZE;
+        attribs[i++] = _this->gl_config.accum_green_size;
+    }
+
+    if (_this->gl_config.accum_blue_size) {
+        attribs[i++] = GLX_ACCUM_BLUE_SIZE;
+        attribs[i++] = _this->gl_config.accum_blue_size;
+    }
+
+    if (_this->gl_config.accum_alpha_size) {
+        attribs[i++] = GLX_ACCUM_ALPHA_SIZE;
+        attribs[i++] = _this->gl_config.accum_alpha_size;
+    }
+
+    if (_this->gl_config.stereo) {
+        attribs[i++] = GLX_STEREO;
+        if( for_FBConfig ) {
+            attribs[i++] = True;
+        }
+    }
+
+    if (_this->gl_config.multisamplebuffers) {
+        attribs[i++] = GLX_SAMPLE_BUFFERS_ARB;
+        attribs[i++] = _this->gl_config.multisamplebuffers;
+    }
+
+    if (_this->gl_config.multisamplesamples) {
+        attribs[i++] = GLX_SAMPLES_ARB;
+        attribs[i++] = _this->gl_config.multisamplesamples;
+    }
+
+    if (_this->gl_config.framebuffer_srgb_capable) {
+        attribs[i++] = GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB;
+        if( for_FBConfig ) {
+            attribs[i++] = True;
+        }
+    }
+
+    if (_this->gl_config.accelerated >= 0 &&
+        _this->gl_data->HAS_GLX_EXT_visual_rating) {
+        attribs[i++] = GLX_VISUAL_CAVEAT_EXT;
+        attribs[i++] = _this->gl_config.accelerated ? GLX_NONE_EXT :
+                                                      GLX_SLOW_VISUAL_EXT;
+    }
+
+    /* If we're supposed to use DirectColor visuals, and we've got the
+       EXT_visual_info extension, then add GLX_X_VISUAL_TYPE_EXT. */
+    if (X11_UseDirectColorVisuals() &&
+        _this->gl_data->HAS_GLX_EXT_visual_info) {
+        attribs[i++] = GLX_X_VISUAL_TYPE_EXT;
+        attribs[i++] = GLX_DIRECT_COLOR_EXT;
+    }
+
+    attribs[i++] = None;
+
+    SDL_assert(i <= MAX_ATTRIBUTES);
+
+    return i;
+}
+
+XVisualInfo *
+X11_GL_GetVisual(_THIS, Display * display, int screen)
+{
+    XVisualInfo *vinfo;
+
+    /* 64 seems nice. */
+    int attribs[64];
+    X11_GL_GetAttributes(_this,display,screen,attribs,64,SDL_FALSE);
+
+    if (!_this->gl_data) {
+        /* The OpenGL library wasn't loaded, SDL_GetError() should have info */
+        return NULL;
+    }
+
+    vinfo = _this->gl_data->glXChooseVisual(display, screen, attribs);
+    if (!vinfo) {
+        SDL_SetError("Couldn't find matching GLX visual");
+    }
+    return vinfo;
+}
+
+#ifndef GLXBadContext
+#define GLXBadContext 0
+#endif
+#ifndef GLXBadFBConfig
+#define GLXBadFBConfig 9
+#endif
+#ifndef GLXBadProfileARB
+#define GLXBadProfileARB 13
+#endif
+static int (*handler) (Display *, XErrorEvent *) = NULL;
+static int errorBase = 0;
+static int
+X11_GL_CreateContextErrorHandler(Display * d, XErrorEvent * e)
+{
+    switch (e->error_code) {
+    case BadRequest:
+    case BadMatch:
+    case BadValue:
+    case BadAlloc:
+        return (0);
+    default:
+        if (errorBase && 
+            (e->error_code == errorBase + GLXBadContext ||
+             e->error_code == errorBase + GLXBadFBConfig ||
+             e->error_code == errorBase + GLXBadProfileARB)) {
+            return (0);
+        }
+        return (handler(d, e));
+    }
+}
+
+SDL_GLContext
+X11_GL_CreateContext(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+    int screen =
+        ((SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata)->screen;
+    XWindowAttributes xattr;
+    XVisualInfo v, *vinfo;
+    int n;
+    GLXContext context = NULL, share_context;
+    PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs = NULL;
+
+    if (_this->gl_config.share_with_current_context) {
+        share_context = (GLXContext)SDL_GL_GetCurrentContext();
+    } else {
+        share_context = NULL;
+    }
+
+    /* We do this to create a clean separation between X and GLX errors. */
+    X11_XSync(display, False);
+    errorBase = _this->gl_data->errorBase;
+    handler = X11_XSetErrorHandler(X11_GL_CreateContextErrorHandler);
+    X11_XGetWindowAttributes(display, data->xwindow, &xattr);
+    v.screen = screen;
+    v.visualid = X11_XVisualIDFromVisual(xattr.visual);
+    vinfo = X11_XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &v, &n);
+    if (vinfo) {
+        if (_this->gl_config.major_version < 3 &&
+            _this->gl_config.profile_mask == 0 &&
+            _this->gl_config.flags == 0) {
+            /* Create legacy context */
+            context =
+                _this->gl_data->glXCreateContext(display, vinfo, share_context, True);
+        } else {
+            /* If we want a GL 3.0 context or later we need to get a temporary
+               context to grab the new context creation function */
+            GLXContext temp_context =
+                _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
+            if (temp_context) {
+                /* max 8 attributes plus terminator */
+                int attribs[9] = {
+                    GLX_CONTEXT_MAJOR_VERSION_ARB,
+                    _this->gl_config.major_version,
+                    GLX_CONTEXT_MINOR_VERSION_ARB,
+                    _this->gl_config.minor_version,
+                    0
+                };
+                int iattr = 4;
+
+                /* SDL profile bits match GLX profile bits */
+                if( _this->gl_config.profile_mask != 0 ) {
+                    attribs[iattr++] = GLX_CONTEXT_PROFILE_MASK_ARB;
+                    attribs[iattr++] = _this->gl_config.profile_mask;
+                }
+
+                /* SDL flags match GLX flags */
+                if( _this->gl_config.flags != 0 ) {
+                    attribs[iattr++] = GLX_CONTEXT_FLAGS_ARB;
+                    attribs[iattr++] = _this->gl_config.flags;
+                }
+
+                attribs[iattr++] = 0;
+
+                /* Get a pointer to the context creation function for GL 3.0 */
+                glXCreateContextAttribs =
+                    (PFNGLXCREATECONTEXTATTRIBSARBPROC) _this->gl_data->
+                    glXGetProcAddress((GLubyte *)
+                                      "glXCreateContextAttribsARB");
+                if (!glXCreateContextAttribs) {
+                    SDL_SetError("GL 3.x is not supported");
+                    context = temp_context;
+                } else {
+                    int glxAttribs[64];
+
+                    /* Create a GL 3.x context */
+                    GLXFBConfig *framebuffer_config = NULL;
+                    int fbcount = 0;
+                    GLXFBConfig *(*glXChooseFBConfig) (Display * disp,
+                                                       int screen,
+                                                       const int *attrib_list,
+                                                       int *nelements);
+
+                    glXChooseFBConfig =
+                        (GLXFBConfig *
+                         (*)(Display *, int, const int *,
+                             int *)) _this->gl_data->
+                        glXGetProcAddress((GLubyte *) "glXChooseFBConfig");
+
+                    X11_GL_GetAttributes(_this,display,screen,glxAttribs,64,SDL_TRUE);
+
+                    if (!glXChooseFBConfig
+                        || !(framebuffer_config =
+                             glXChooseFBConfig(display,
+                                               DefaultScreen(display), glxAttribs,
+                                               &fbcount))) {
+                        SDL_SetError
+                            ("No good framebuffers found. GL 3.x disabled");
+                        context = temp_context;
+                    } else {
+                        context =
+                            glXCreateContextAttribs(display,
+                                                    framebuffer_config[0],
+                                                    share_context, True, attribs);
+                        _this->gl_data->glXDestroyContext(display,
+                                                          temp_context);
+                    }
+                }
+            }
+        }
+        X11_XFree(vinfo);
+    }
+    X11_XSync(display, False);
+    X11_XSetErrorHandler(handler);
+
+    if (!context) {
+        SDL_SetError("Could not create GL context");
+        return NULL;
+    }
+
+    if (X11_GL_MakeCurrent(_this, window, context) < 0) {
+        X11_GL_DeleteContext(_this, context);
+        return NULL;
+    }
+
+    return context;
+}
+
+int
+X11_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
+{
+    Display *display = ((SDL_VideoData *) _this->driverdata)->display;
+    Window drawable =
+        (context ? ((SDL_WindowData *) window->driverdata)->xwindow : None);
+    GLXContext glx_context = (GLXContext) context;
+
+    if (!_this->gl_data) {
+        return SDL_SetError("OpenGL not initialized");
+    }
+
+    if (!_this->gl_data->glXMakeCurrent(display, drawable, glx_context)) {
+        return SDL_SetError("Unable to make GL context current");
+    }
+
+    return 0;
+}
+
+/*
+   0 is a valid argument to glxSwapInterval(MESA|EXT) and setting it to 0
+   will undo the effect of a previous call with a value that is greater
+   than zero (or at least that is what the docs say). OTOH, 0 is an invalid
+   argument to glxSwapIntervalSGI and it returns an error if you call it
+   with 0 as an argument.
+*/
+
+static int swapinterval = -1;
+int
+X11_GL_SetSwapInterval(_THIS, int interval)
+{
+    int status = -1;
+
+    if ((interval < 0) && (!_this->gl_data->HAS_GLX_EXT_swap_control_tear)) {
+        SDL_SetError("Negative swap interval unsupported in this GL");
+    } else if (_this->gl_data->glXSwapIntervalEXT) {
+        Display *display = ((SDL_VideoData *) _this->driverdata)->display;
+        const SDL_WindowData *windowdata = (SDL_WindowData *)
+            SDL_GL_GetCurrentWindow()->driverdata;
+
+        Window drawable = windowdata->xwindow;
+
+        /*
+         * This is a workaround for a bug in NVIDIA drivers. Bug has been reported
+         * and will be fixed in a future release (probably 319.xx).
+         *
+         * There's a bug where glXSetSwapIntervalEXT ignores updates because
+         * it has the wrong value cached. To work around it, we just run a no-op
+         * update to the current value.
+         */
+        int currentInterval = X11_GL_GetSwapInterval(_this);
+        _this->gl_data->glXSwapIntervalEXT(display, drawable, currentInterval);
+        _this->gl_data->glXSwapIntervalEXT(display, drawable, interval);
+
+        status = 0;
+        swapinterval = interval;
+    } else if (_this->gl_data->glXSwapIntervalMESA) {
+        status = _this->gl_data->glXSwapIntervalMESA(interval);
+        if (status != 0) {
+            SDL_SetError("glxSwapIntervalMESA failed");
+        } else {
+            swapinterval = interval;
+        }
+    } else if (_this->gl_data->glXSwapIntervalSGI) {
+        status = _this->gl_data->glXSwapIntervalSGI(interval);
+        if (status != 0) {
+            SDL_SetError("glxSwapIntervalSGI failed");
+        } else {
+            swapinterval = interval;
+        }
+    } else {
+        SDL_Unsupported();
+    }
+    return status;
+}
+
+int
+X11_GL_GetSwapInterval(_THIS)
+{
+    if (_this->gl_data->glXSwapIntervalEXT) {
+        Display *display = ((SDL_VideoData *) _this->driverdata)->display;
+        const SDL_WindowData *windowdata = (SDL_WindowData *)
+            SDL_GL_GetCurrentWindow()->driverdata;
+        Window drawable = windowdata->xwindow;
+        unsigned int allow_late_swap_tearing = 0;
+        unsigned int interval = 0;
+
+        if (_this->gl_data->HAS_GLX_EXT_swap_control_tear) {
+            _this->gl_data->glXQueryDrawable(display, drawable,
+                                            GLX_LATE_SWAPS_TEAR_EXT,
+                                            &allow_late_swap_tearing);
+        }
+
+        _this->gl_data->glXQueryDrawable(display, drawable,
+                                         GLX_SWAP_INTERVAL_EXT, &interval);
+
+        if ((allow_late_swap_tearing) && (interval > 0)) {
+            return -((int) interval);
+        }
+
+        return (int) interval;
+    } else if (_this->gl_data->glXGetSwapIntervalMESA) {
+        return _this->gl_data->glXGetSwapIntervalMESA();
+    } else {
+        return swapinterval;
+    }
+}
+
+void
+X11_GL_SwapWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+
+    _this->gl_data->glXSwapBuffers(display, data->xwindow);
+}
+
+void
+X11_GL_DeleteContext(_THIS, SDL_GLContext context)
+{
+    Display *display = ((SDL_VideoData *) _this->driverdata)->display;
+    GLXContext glx_context = (GLXContext) context;
+
+    if (!_this->gl_data) {
+        return;
+    }
+    _this->gl_data->glXDestroyContext(display, glx_context);
+    X11_XSync(display, False);
+}
+
+#endif /* SDL_VIDEO_OPENGL_GLX */
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11opengl.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11opengl.h
new file mode 100644
index 000000000..ed7f292d4
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11opengl.h	
@@ -0,0 +1,70 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11opengl_h
+#define _SDL_x11opengl_h
+
+#if SDL_VIDEO_OPENGL_GLX
+#include "SDL_opengl.h"
+#include <GL/glx.h>
+
+struct SDL_GLDriverData
+{
+    int errorBase, eventBase;
+
+    SDL_bool HAS_GLX_EXT_visual_rating;
+    SDL_bool HAS_GLX_EXT_visual_info;
+    SDL_bool HAS_GLX_EXT_swap_control_tear;
+    SDL_bool HAS_GLX_EXT_create_context_es2_profile;
+
+    Bool (*glXQueryExtension) (Display*,int*,int*);
+    void *(*glXGetProcAddress) (const GLubyte*);
+    XVisualInfo *(*glXChooseVisual) (Display*,int,int*);
+    GLXContext (*glXCreateContext) (Display*,XVisualInfo*,GLXContext,Bool);
+    void (*glXDestroyContext) (Display*, GLXContext);
+    Bool(*glXMakeCurrent) (Display*,GLXDrawable,GLXContext);
+    void (*glXSwapBuffers) (Display*, GLXDrawable);
+    void (*glXQueryDrawable) (Display*,GLXDrawable,int,unsigned int*);
+    void (*glXSwapIntervalEXT) (Display*,GLXDrawable,int);
+    int (*glXSwapIntervalSGI) (int);
+    int (*glXSwapIntervalMESA) (int);
+    int (*glXGetSwapIntervalMESA) (void);
+};
+
+/* OpenGL functions */
+extern int X11_GL_LoadLibrary(_THIS, const char *path);
+extern void *X11_GL_GetProcAddress(_THIS, const char *proc);
+extern void X11_GL_UnloadLibrary(_THIS);
+extern XVisualInfo *X11_GL_GetVisual(_THIS, Display * display, int screen);
+extern SDL_GLContext X11_GL_CreateContext(_THIS, SDL_Window * window);
+extern int X11_GL_MakeCurrent(_THIS, SDL_Window * window,
+                              SDL_GLContext context);
+extern int X11_GL_SetSwapInterval(_THIS, int interval);
+extern int X11_GL_GetSwapInterval(_THIS);
+extern void X11_GL_SwapWindow(_THIS, SDL_Window * window);
+extern void X11_GL_DeleteContext(_THIS, SDL_GLContext context);
+
+#endif /* SDL_VIDEO_OPENGL_GLX */
+
+#endif /* _SDL_x11opengl_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11opengles.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11opengles.c
new file mode 100644
index 000000000..bce59b108
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11opengles.c	
@@ -0,0 +1,109 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_EGL
+
+#include "SDL_x11video.h"
+#include "SDL_x11opengles.h"
+#include "SDL_x11opengl.h"
+
+/* EGL implementation of SDL OpenGL support */
+
+int
+X11_GLES_LoadLibrary(_THIS, const char *path) {
+        
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    /* If the profile requested is not GL ES, switch over to X11_GL functions  */
+    if (_this->gl_config.profile_mask != SDL_GL_CONTEXT_PROFILE_ES) {
+        #if SDL_VIDEO_OPENGL_GLX
+        X11_GLES_UnloadLibrary(_this);
+        _this->GL_LoadLibrary = X11_GL_LoadLibrary;
+        _this->GL_GetProcAddress = X11_GL_GetProcAddress;
+        _this->GL_UnloadLibrary = X11_GL_UnloadLibrary;
+        _this->GL_CreateContext = X11_GL_CreateContext;
+        _this->GL_MakeCurrent = X11_GL_MakeCurrent;
+        _this->GL_SetSwapInterval = X11_GL_SetSwapInterval;
+        _this->GL_GetSwapInterval = X11_GL_GetSwapInterval;
+        _this->GL_SwapWindow = X11_GL_SwapWindow;
+        _this->GL_DeleteContext = X11_GL_DeleteContext;
+        return X11_GL_LoadLibrary(_this, path);
+        #else
+        return SDL_SetError("SDL not configured with OpenGL/GLX support");
+        #endif
+    }
+    
+    return SDL_EGL_LoadLibrary(_this, path, (NativeDisplayType) data->display);
+}
+
+XVisualInfo *
+X11_GLES_GetVisual(_THIS, Display * display, int screen)
+{
+   
+    XVisualInfo *egl_visualinfo = NULL;
+    EGLint visual_id;
+    XVisualInfo vi_in;
+    int out_count;
+
+    if (!_this->egl_data) {
+        /* The EGL library wasn't loaded, SDL_GetError() should have info */
+        return NULL;
+    }
+
+    if (_this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display,
+                                            _this->egl_data->egl_config,
+                                            EGL_NATIVE_VISUAL_ID,
+                                            &visual_id) == EGL_FALSE || !visual_id) {
+        /* Use the default visual when all else fails */
+        vi_in.screen = screen;
+        egl_visualinfo = X11_XGetVisualInfo(display,
+                                        VisualScreenMask,
+                                        &vi_in, &out_count);
+    } else {
+        vi_in.screen = screen;
+        vi_in.visualid = visual_id;
+        egl_visualinfo = X11_XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &vi_in, &out_count);
+    }
+
+    return egl_visualinfo;
+}
+
+SDL_GLContext
+X11_GLES_CreateContext(_THIS, SDL_Window * window)
+{
+    SDL_GLContext context;
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+
+    X11_XSync(display, False);
+    context = SDL_EGL_CreateContext(_this, data->egl_surface);
+    X11_XSync(display, False);
+
+    return context;
+}
+
+SDL_EGL_SwapWindow_impl(X11)
+SDL_EGL_MakeCurrent_impl(X11)
+
+#endif /* SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_EGL */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11opengles.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11opengles.h
new file mode 100644
index 000000000..f6ea71eb7
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11opengles.h	
@@ -0,0 +1,53 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11opengles_h
+#define _SDL_x11opengles_h
+
+#if SDL_VIDEO_OPENGL_EGL
+
+#include "../SDL_sysvideo.h"
+#include "../SDL_egl_c.h"
+
+typedef struct SDL_PrivateGLESData
+{
+} SDL_PrivateGLESData;
+
+/* OpenGLES functions */
+#define X11_GLES_GetAttribute SDL_EGL_GetAttribute
+#define X11_GLES_GetProcAddress SDL_EGL_GetProcAddress
+#define X11_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
+#define X11_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
+#define X11_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
+#define X11_GLES_DeleteContext SDL_EGL_DeleteContext
+
+extern int X11_GLES_LoadLibrary(_THIS, const char *path);
+extern XVisualInfo *X11_GLES_GetVisual(_THIS, Display * display, int screen);
+extern SDL_GLContext X11_GLES_CreateContext(_THIS, SDL_Window * window);
+extern void X11_GLES_SwapWindow(_THIS, SDL_Window * window);
+extern int X11_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
+
+#endif /* SDL_VIDEO_OPENGL_EGL */
+
+#endif /* _SDL_x11opengles_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11shape.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11shape.c
new file mode 100644
index 000000000..515209464
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11shape.c	
@@ -0,0 +1,121 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include "SDL_assert.h"
+#include "SDL_x11video.h"
+#include "SDL_x11shape.h"
+#include "SDL_x11window.h"
+#include "../SDL_shape_internals.h"
+
+SDL_Window*
+X11_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
+    return SDL_CreateWindow(title,x,y,w,h,flags);
+}
+
+SDL_WindowShaper*
+X11_CreateShaper(SDL_Window* window) {
+    SDL_WindowShaper* result = NULL;
+    SDL_ShapeData* data = NULL;
+    int resized_properly;
+
+#if SDL_VIDEO_DRIVER_X11_XSHAPE
+    if (SDL_X11_HAVE_XSHAPE) {  /* Make sure X server supports it. */
+        result = malloc(sizeof(SDL_WindowShaper));
+        result->window = window;
+        result->mode.mode = ShapeModeDefault;
+        result->mode.parameters.binarizationCutoff = 1;
+        result->userx = result->usery = 0;
+        data = SDL_malloc(sizeof(SDL_ShapeData));
+        result->driverdata = data;
+        data->bitmapsize = 0;
+        data->bitmap = NULL;
+        window->shaper = result;
+        resized_properly = X11_ResizeWindowShape(window);
+        SDL_assert(resized_properly == 0);
+    }
+#endif
+
+    return result;
+}
+
+int
+X11_ResizeWindowShape(SDL_Window* window) {
+    SDL_ShapeData* data = window->shaper->driverdata;
+    unsigned int bitmapsize = window->w / 8;
+    SDL_assert(data != NULL);
+
+    if(window->w % 8 > 0)
+        bitmapsize += 1;
+    bitmapsize *= window->h;
+    if(data->bitmapsize != bitmapsize || data->bitmap == NULL) {
+        data->bitmapsize = bitmapsize;
+        if(data->bitmap != NULL)
+            free(data->bitmap);
+        data->bitmap = malloc(data->bitmapsize);
+        if(data->bitmap == NULL) {
+            return SDL_SetError("Could not allocate memory for shaped-window bitmap.");
+        }
+    }
+    memset(data->bitmap,0,data->bitmapsize);
+
+    window->shaper->userx = window->x;
+    window->shaper->usery = window->y;
+    SDL_SetWindowPosition(window,-1000,-1000);
+
+    return 0;
+}
+
+int
+X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode) {
+    SDL_ShapeData *data = NULL;
+    SDL_WindowData *windowdata = NULL;
+    Pixmap shapemask;
+    
+    if(shaper == NULL || shape == NULL || shaper->driverdata == NULL)
+        return -1;
+
+#if SDL_VIDEO_DRIVER_X11_XSHAPE
+    if(shape->format->Amask == 0 && SDL_SHAPEMODEALPHA(shape_mode->mode))
+        return -2;
+    if(shape->w != shaper->window->w || shape->h != shaper->window->h)
+        return -3;
+    data = shaper->driverdata;
+
+    /* Assume that shaper->alphacutoff already has a value, because SDL_SetWindowShape() should have given it one. */
+    SDL_CalculateShapeBitmap(shaper->mode,shape,data->bitmap,8);
+
+    windowdata = (SDL_WindowData*)(shaper->window->driverdata);
+    shapemask = X11_XCreateBitmapFromData(windowdata->videodata->display,windowdata->xwindow,data->bitmap,shaper->window->w,shaper->window->h);
+
+    X11_XShapeCombineMask(windowdata->videodata->display,windowdata->xwindow, ShapeBounding, 0, 0,shapemask, ShapeSet);
+    X11_XSync(windowdata->videodata->display,False);
+
+    X11_XFreePixmap(windowdata->videodata->display,shapemask);
+#endif
+
+    return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11shape.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11shape.h
new file mode 100644
index 000000000..68118cfeb
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11shape.h	
@@ -0,0 +1,40 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11shape_h
+#define _SDL_x11shape_h
+
+#include "SDL_video.h"
+#include "SDL_shape.h"
+#include "../SDL_sysvideo.h"
+
+typedef struct {
+    void* bitmap;
+    Uint32 bitmapsize;
+} SDL_ShapeData;
+
+extern SDL_Window* X11_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags);
+extern SDL_WindowShaper* X11_CreateShaper(SDL_Window* window);
+extern int X11_ResizeWindowShape(SDL_Window* window);
+extern int X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode);
+
+#endif /* _SDL_x11shape_h */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11sym.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11sym.h
new file mode 100644
index 000000000..9678bac54
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11sym.h	
@@ -0,0 +1,303 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/* *INDENT-OFF* */
+
+SDL_X11_MODULE(BASEXLIB)
+SDL_X11_SYM(XSizeHints*,XAllocSizeHints,(void),(),return)
+SDL_X11_SYM(XWMHints*,XAllocWMHints,(void),(),return)
+SDL_X11_SYM(XClassHint*,XAllocClassHint,(void),(),return)
+SDL_X11_SYM(int,XAutoRepeatOn,(Display* a),(a),return)
+SDL_X11_SYM(int,XAutoRepeatOff,(Display* a),(a),return)
+SDL_X11_SYM(int,XChangePointerControl,(Display* a,Bool b,Bool c,int d,int e,int f),(a,b,c,d,e,f),return)
+SDL_X11_SYM(int,XChangeProperty,(Display* a,Window b,Atom c,Atom d,int e,int f,_Xconst unsigned char* g,int h),(a,b,c,d,e,f,g,h),return)
+SDL_X11_SYM(Bool,XCheckIfEvent,(Display* a,XEvent *b,Bool (*c)(Display*,XEvent*,XPointer),XPointer d),(a,b,c,d),return)
+SDL_X11_SYM(int,XClearWindow,(Display* a,Window b),(a,b),return)
+SDL_X11_SYM(int,XCloseDisplay,(Display* a),(a),return)
+SDL_X11_SYM(int,XConvertSelection,(Display* a,Atom b,Atom c,Atom d,Window e,Time f),(a,b,c,d,e,f),return)
+SDL_X11_SYM(Pixmap,XCreateBitmapFromData,(Display *dpy,Drawable d,_Xconst char *data,unsigned int width,unsigned int height),(dpy,d,data,width,height),return)
+SDL_X11_SYM(Colormap,XCreateColormap,(Display* a,Window b,Visual* c,int d),(a,b,c,d),return)
+SDL_X11_SYM(Cursor,XCreatePixmapCursor,(Display* a,Pixmap b,Pixmap c,XColor* d,XColor* e,unsigned int f,unsigned int g),(a,b,c,d,e,f,g),return)
+SDL_X11_SYM(Cursor,XCreateFontCursor,(Display* a,unsigned int b),(a,b),return)
+SDL_X11_SYM(XFontSet,XCreateFontSet,(Display* a, _Xconst char* b, char*** c, int* d, char**	e),(a,b,c,d,e),return)
+SDL_X11_SYM(GC,XCreateGC,(Display* a,Drawable b,unsigned long c,XGCValues* d),(a,b,c,d),return)
+SDL_X11_SYM(XImage*,XCreateImage,(Display* a,Visual* b,unsigned int c,int d,int e,char* f,unsigned int g,unsigned int h,int i,int j),(a,b,c,d,e,f,g,h,i,j),return)
+SDL_X11_SYM(Window,XCreateWindow,(Display* a,Window b,int c,int d,unsigned int e,unsigned int f,unsigned int g,int h,unsigned int i,Visual* j,unsigned long k,XSetWindowAttributes* l),(a,b,c,d,e,f,g,h,i,j,k,l),return)
+SDL_X11_SYM(int,XDefineCursor,(Display* a,Window b,Cursor c),(a,b,c),return)
+SDL_X11_SYM(int,XDeleteProperty,(Display* a,Window b,Atom c),(a,b,c),return)
+SDL_X11_SYM(int,XDestroyWindow,(Display* a,Window b),(a,b),return)
+SDL_X11_SYM(int,XDisplayKeycodes,(Display* a,int* b,int* c),(a,b,c),return)
+SDL_X11_SYM(int,XDrawRectangle,(Display* a,Drawable b,GC c,int d,int e,unsigned int f,unsigned int g),(a,b,c,d,e,f,g),return)
+SDL_X11_SYM(char*,XDisplayName,(_Xconst char* a),(a),return)
+SDL_X11_SYM(int,XDrawString,(Display* a,Drawable b,GC c,int d,int e,_Xconst char* f,int g),(a,b,c,d,e,f,g),return)
+SDL_X11_SYM(int,XEventsQueued,(Display* a,int b),(a,b),return)
+SDL_X11_SYM(int,XFillRectangle,(Display* a,Drawable b,GC c,int d,int e,unsigned int f,unsigned int g),(a,b,c,d,e,f,g),return)
+SDL_X11_SYM(Bool,XFilterEvent,(XEvent *event,Window w),(event,w),return)
+SDL_X11_SYM(int,XFlush,(Display* a),(a),return)
+SDL_X11_SYM(int,XFree,(void*a),(a),return)
+SDL_X11_SYM(int,XFreeCursor,(Display* a,Cursor b),(a,b),return)
+SDL_X11_SYM(void,XFreeFontSet,(Display* a, XFontSet b),(a,b),)
+SDL_X11_SYM(int,XFreeGC,(Display* a,GC b),(a,b),return)
+SDL_X11_SYM(int,XFreeFont,(Display* a, XFontStruct* b),(a,b),return)
+SDL_X11_SYM(int,XFreeModifiermap,(XModifierKeymap* a),(a),return)
+SDL_X11_SYM(int,XFreePixmap,(Display* a,Pixmap b),(a,b),return)
+SDL_X11_SYM(void,XFreeStringList,(char** a),(a),)
+SDL_X11_SYM(char*,XGetAtomName,(Display *a,Atom b),(a,b),return)
+SDL_X11_SYM(int,XGetInputFocus,(Display *a,Window *b,int *c),(a,b,c),return)
+SDL_X11_SYM(int,XGetErrorDatabaseText,(Display* a,_Xconst char* b,_Xconst char* c,_Xconst char* d,char* e,int f),(a,b,c,d,e,f),return)
+SDL_X11_SYM(XModifierKeymap*,XGetModifierMapping,(Display* a),(a),return)
+SDL_X11_SYM(int,XGetPointerControl,(Display* a,int* b,int* c,int* d),(a,b,c,d),return)
+SDL_X11_SYM(Window,XGetSelectionOwner,(Display* a,Atom b),(a,b),return)
+SDL_X11_SYM(XVisualInfo*,XGetVisualInfo,(Display* a,long b,XVisualInfo* c,int* d),(a,b,c,d),return)
+SDL_X11_SYM(Status,XGetWindowAttributes,(Display* a,Window b,XWindowAttributes* c),(a,b,c),return)
+SDL_X11_SYM(int,XGetWindowProperty,(Display* a,Window b,Atom c,long d,long e,Bool f,Atom g,Atom* h,int* i,unsigned long* j,unsigned long *k,unsigned char **l),(a,b,c,d,e,f,g,h,i,j,k,l),return)
+SDL_X11_SYM(XWMHints*,XGetWMHints,(Display* a,Window b),(a,b),return)
+SDL_X11_SYM(Status,XGetWMNormalHints,(Display *a,Window b, XSizeHints *c, long *d),(a,b,c,d),return)
+SDL_X11_SYM(int,XIfEvent,(Display* a,XEvent *b,Bool (*c)(Display*,XEvent*,XPointer),XPointer d),(a,b,c,d),return)
+SDL_X11_SYM(int,XGrabKeyboard,(Display* a,Window b,Bool c,int d,int e,Time f),(a,b,c,d,e,f),return)
+SDL_X11_SYM(int,XGrabPointer,(Display* a,Window b,Bool c,unsigned int d,int e,int f,Window g,Cursor h,Time i),(a,b,c,d,e,f,g,h,i),return)
+SDL_X11_SYM(int,XGrabServer,(Display* a),(a),return)
+SDL_X11_SYM(Status,XIconifyWindow,(Display* a,Window b,int c),(a,b,c),return)
+SDL_X11_SYM(KeyCode,XKeysymToKeycode,(Display* a,KeySym b),(a,b),return)
+SDL_X11_SYM(char*,XKeysymToString,(KeySym a),(a),return)
+SDL_X11_SYM(int,XInstallColormap,(Display* a,Colormap b),(a,b),return)
+SDL_X11_SYM(Atom,XInternAtom,(Display* a,_Xconst char* b,Bool c),(a,b,c),return)
+SDL_X11_SYM(XPixmapFormatValues*,XListPixmapFormats,(Display* a,int* b),(a,b),return)
+SDL_X11_SYM(XFontStruct*,XLoadQueryFont,(Display* a,_Xconst char* b),(a,b),return)
+SDL_X11_SYM(KeySym,XLookupKeysym,(XKeyEvent* a,int b),(a,b),return)
+SDL_X11_SYM(int,XLookupString,(XKeyEvent* a,char* b,int c,KeySym* d,XComposeStatus* e),(a,b,c,d,e),return)
+SDL_X11_SYM(int,XMapRaised,(Display* a,Window b),(a,b),return)
+SDL_X11_SYM(Status,XMatchVisualInfo,(Display* a,int b,int c,int d,XVisualInfo* e),(a,b,c,d,e),return)
+SDL_X11_SYM(int,XMissingExtension,(Display* a,_Xconst char* b),(a,b),return)
+SDL_X11_SYM(int,XMoveWindow,(Display* a,Window b,int c,int d),(a,b,c,d),return)
+SDL_X11_SYM(int,XNextEvent,(Display* a,XEvent* b),(a,b),return)
+SDL_X11_SYM(Display*,XOpenDisplay,(_Xconst char* a),(a),return)
+SDL_X11_SYM(Status,XInitThreads,(void),(),return)
+SDL_X11_SYM(int,XPeekEvent,(Display* a,XEvent* b),(a,b),return)
+SDL_X11_SYM(int,XPending,(Display* a),(a),return)
+SDL_X11_SYM(int,XPutImage,(Display* a,Drawable b,GC c,XImage* d,int e,int f,int g,int h,unsigned int i,unsigned int j),(a,b,c,d,e,f,g,h,i,j),return)
+SDL_X11_SYM(int,XQueryKeymap,(Display* a,char *b),(a,b),return)
+SDL_X11_SYM(Bool,XQueryPointer,(Display* a,Window b,Window* c,Window* d,int* e,int* f,int* g,int* h,unsigned int* i),(a,b,c,d,e,f,g,h,i),return)
+SDL_X11_SYM(int,XRaiseWindow,(Display* a,Window b),(a,b),return)
+SDL_X11_SYM(int,XReparentWindow,(Display* a,Window b,Window c,int d,int e),(a,b,c,d,e),return)
+SDL_X11_SYM(int,XResetScreenSaver,(Display* a),(a),return)
+SDL_X11_SYM(int,XResizeWindow,(Display* a,Window b,unsigned int c,unsigned int d),(a,b,c,d),return)
+SDL_X11_SYM(int,XSelectInput,(Display* a,Window b,long c),(a,b,c),return)
+SDL_X11_SYM(Status,XSendEvent,(Display* a,Window b,Bool c,long d,XEvent* e),(a,b,c,d,e),return)
+SDL_X11_SYM(XErrorHandler,XSetErrorHandler,(XErrorHandler a),(a),return)
+SDL_X11_SYM(int,XSetForeground,(Display* a,GC b,unsigned long c),(a,b,c),return)
+SDL_X11_SYM(XIOErrorHandler,XSetIOErrorHandler,(XIOErrorHandler a),(a),return)
+SDL_X11_SYM(int,XSetInputFocus,(Display *a,Window b,int c,Time d),(a,b,c,d),return)
+SDL_X11_SYM(int,XSetSelectionOwner,(Display* a,Atom b,Window c,Time d),(a,b,c,d),return)
+SDL_X11_SYM(int,XSetTransientForHint,(Display* a,Window b,Window c),(a,b,c),return)
+SDL_X11_SYM(void,XSetTextProperty,(Display* a,Window b,XTextProperty* c,Atom d),(a,b,c,d),)
+SDL_X11_SYM(int,XSetWindowBackground,(Display* a,Window b,unsigned long c),(a,b,c),return)
+SDL_X11_SYM(void,XSetWMProperties,(Display* a,Window b,XTextProperty* c,XTextProperty* d,char** e,int f,XSizeHints* g,XWMHints* h,XClassHint* i),(a,b,c,d,e,f,g,h,i),)
+SDL_X11_SYM(void,XSetWMNormalHints,(Display* a,Window b,XSizeHints* c),(a,b,c),)
+SDL_X11_SYM(Status,XSetWMProtocols,(Display* a,Window b,Atom* c,int d),(a,b,c,d),return)
+SDL_X11_SYM(int,XStoreColors,(Display* a,Colormap b,XColor* c,int d),(a,b,c,d),return)
+SDL_X11_SYM(int,XStoreName,(Display* a,Window b,_Xconst char* c),(a,b,c),return)
+SDL_X11_SYM(Status,XStringListToTextProperty,(char** a,int b,XTextProperty* c),(a,b,c),return)
+SDL_X11_SYM(int,XSync,(Display* a,Bool b),(a,b),return)
+SDL_X11_SYM(int,XTextExtents,(XFontStruct* a,_Xconst char* b,int c,int* d,int* e,int* f,XCharStruct* g),(a,b,c,d,e,f,g),return)
+SDL_X11_SYM(Bool,XTranslateCoordinates,(Display *a,Window b,Window c,int d,int e,int* f,int* g,Window* h),(a,b,c,d,e,f,g,h),return)
+SDL_X11_SYM(int,XUndefineCursor,(Display* a,Window b),(a,b),return)
+SDL_X11_SYM(int,XUngrabKeyboard,(Display* a,Time b),(a,b),return)
+SDL_X11_SYM(int,XUngrabPointer,(Display* a,Time b),(a,b),return)
+SDL_X11_SYM(int,XUngrabServer,(Display* a),(a),return)
+SDL_X11_SYM(int,XUninstallColormap,(Display* a,Colormap b),(a,b),return)
+SDL_X11_SYM(int,XUnloadFont,(Display* a,Font b),(a,b),return)
+SDL_X11_SYM(int,XWarpPointer,(Display* a,Window b,Window c,int d,int e,unsigned int f,unsigned int g,int h,int i),(a,b,c,d,e,f,g,h,i),return)
+SDL_X11_SYM(int,XWindowEvent,(Display* a,Window b,long c,XEvent* d),(a,b,c,d),return)
+SDL_X11_SYM(Status,XWithdrawWindow,(Display* a,Window b,int c),(a,b,c),return)
+SDL_X11_SYM(VisualID,XVisualIDFromVisual,(Visual* a),(a),return)
+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY
+SDL_X11_SYM(XExtDisplayInfo*,XextAddDisplay,(XExtensionInfo* a,Display* b,_Xconst char* c,XExtensionHooks* d,int e,XPointer f),(a,b,c,d,e,f),return)
+#else
+SDL_X11_SYM(XExtDisplayInfo*,XextAddDisplay,(XExtensionInfo* a,Display* b,char* c,XExtensionHooks* d,int e,XPointer f),(a,b,c,d,e,f),return)
+#endif
+SDL_X11_SYM(XExtensionInfo*,XextCreateExtension,(void),(),return)
+SDL_X11_SYM(void,XextDestroyExtension,(XExtensionInfo* a),(a),)
+SDL_X11_SYM(XExtDisplayInfo*,XextFindDisplay,(XExtensionInfo* a,Display* b),(a,b),return)
+SDL_X11_SYM(int,XextRemoveDisplay,(XExtensionInfo* a,Display* b),(a,b),return)
+SDL_X11_SYM(Bool,XQueryExtension,(Display* a,_Xconst char* b,int* c,int* d,int* e),(a,b,c,d,e),return)
+SDL_X11_SYM(char *,XDisplayString,(Display* a),(a),return)
+SDL_X11_SYM(int,XGetErrorText,(Display* a,int b,char* c,int d),(a,b,c,d),return)
+SDL_X11_SYM(void,_XEatData,(Display* a,unsigned long b),(a,b),)
+SDL_X11_SYM(void,_XFlush,(Display* a),(a),)
+SDL_X11_SYM(void,_XFlushGCCache,(Display* a,GC b),(a,b),)
+SDL_X11_SYM(int,_XRead,(Display* a,char* b,long c),(a,b,c),return)
+SDL_X11_SYM(void,_XReadPad,(Display* a,char* b,long c),(a,b,c),)
+SDL_X11_SYM(void,_XSend,(Display* a,_Xconst char* b,long c),(a,b,c),)
+SDL_X11_SYM(Status,_XReply,(Display* a,xReply* b,int c,Bool d),(a,b,c,d),return)
+SDL_X11_SYM(unsigned long,_XSetLastRequestRead,(Display* a,xGenericReply* b),(a,b),return)
+SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return)
+SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)
+SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)
+
+#if SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
+SDL_X11_SYM(Bool,XGetEventData,(Display* a,XGenericEventCookie* b),(a,b),return)
+SDL_X11_SYM(void,XFreeEventData,(Display* a,XGenericEventCookie* b),(a,b),)    
+#endif
+
+#if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+#if NeedWidePrototypes
+SDL_X11_SYM(KeySym,XkbKeycodeToKeysym,(Display* a,unsigned int b,int c,int d),(a,b,c,d),return)
+#else
+SDL_X11_SYM(KeySym,XkbKeycodeToKeysym,(Display* a,KeyCode b,int c,int d),(a,b,c,d),return)
+#endif
+#endif
+
+#if NeedWidePrototypes
+SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)
+#else
+SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,KeyCode b,int c),(a,b,c),return)
+#endif
+
+#ifdef X_HAVE_UTF8_STRING
+SDL_X11_MODULE(UTF8)
+SDL_X11_SYM(int,Xutf8TextListToTextProperty,(Display* a,char** b,int c,XICCEncodingStyle d,XTextProperty* e),(a,b,c,d,e),return)
+SDL_X11_SYM(int,Xutf8LookupString,(XIC a,XKeyPressedEvent* b,char* c,int d,KeySym* e,Status* f),(a,b,c,d,e,f),return)
+/* SDL_X11_SYM(XIC,XCreateIC,(XIM, ...),return)  !!! ARGH! */
+SDL_X11_SYM(void,XDestroyIC,(XIC a),(a),)
+/* SDL_X11_SYM(char*,XGetICValues,(XIC, ...),return)  !!! ARGH! */
+SDL_X11_SYM(void,XSetICFocus,(XIC a),(a),)
+SDL_X11_SYM(void,XUnsetICFocus,(XIC a),(a),)
+SDL_X11_SYM(XIM,XOpenIM,(Display* a,struct _XrmHashBucketRec* b,char* c,char* d),(a,b,c,d),return)
+SDL_X11_SYM(Status,XCloseIM,(XIM a),(a),return)
+SDL_X11_SYM(void,Xutf8DrawString,(Display *a, Drawable b, XFontSet c, GC d, int e, int f, _Xconst char *g, int h),(a,b,c,d,e,f,g,h),)
+SDL_X11_SYM(int,Xutf8TextExtents,(XFontSet a, _Xconst char*	b, int c, XRectangle* d, XRectangle* e),(a,b,c,d,e),return)
+#endif
+
+#ifndef NO_SHARED_MEMORY
+SDL_X11_MODULE(SHM)
+SDL_X11_SYM(Status,XShmAttach,(Display* a,XShmSegmentInfo* b),(a,b),return)
+SDL_X11_SYM(Status,XShmDetach,(Display* a,XShmSegmentInfo* b),(a,b),return)
+SDL_X11_SYM(Status,XShmPutImage,(Display* a,Drawable b,GC c,XImage* d,int e,int f,int g,int h,unsigned int i,unsigned int j,Bool k),(a,b,c,d,e,f,g,h,i,j,k),return)
+SDL_X11_SYM(XImage*,XShmCreateImage,(Display* a,Visual* b,unsigned int c,int d,char* e,XShmSegmentInfo* f,unsigned int g,unsigned int h),(a,b,c,d,e,f,g,h),return)
+SDL_X11_SYM(Pixmap,XShmCreatePixmap,(Display *a,Drawable b,char* c,XShmSegmentInfo* d, unsigned int e, unsigned int f, unsigned int g),(a,b,c,d,e,f,g),return)
+SDL_X11_SYM(Bool,XShmQueryExtension,(Display* a),(a),return)
+#endif
+
+/*
+ * Not required...these only exist in code in headers on some 64-bit platforms,
+ *  and are removed via macros elsewhere, so it's safe for them to be missing.
+ */
+#ifdef LONG64
+SDL_X11_MODULE(IO_32BIT)
+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+#else
+SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
+#endif
+SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+#endif
+
+/*
+ * These only show up on some variants of Unix.
+ */
+#if defined(__osf__)
+SDL_X11_MODULE(OSF_ENTRY_POINTS)
+SDL_X11_SYM(void,_SmtBufferOverflow,(Display *dpy,register smtDisplayPtr p),(dpy,p),)
+SDL_X11_SYM(void,_SmtIpError,(Display *dpy,register smtDisplayPtr p,int i),(dpy,p,i),)
+SDL_X11_SYM(int,ipAllocateData,(ChannelPtr a,IPCard b,IPDataPtr * c),(a,b,c),return)
+SDL_X11_SYM(int,ipUnallocateAndSendData,(ChannelPtr a,IPCard b),(a,b),return)
+#endif
+
+/* XCursor support */
+#if SDL_VIDEO_DRIVER_X11_XCURSOR
+SDL_X11_MODULE(XCURSOR)
+SDL_X11_SYM(XcursorImage*,XcursorImageCreate,(int a,int b),(a,b),return)
+SDL_X11_SYM(void,XcursorImageDestroy,(XcursorImage *a),(a),)
+SDL_X11_SYM(Cursor,XcursorImageLoadCursor,(Display *a,const XcursorImage *b),(a,b),return)
+#endif
+
+/* Xinerama support */
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+SDL_X11_MODULE(XINERAMA)
+SDL_X11_SYM(Bool,XineramaIsActive,(Display *a),(a),return)
+SDL_X11_SYM(Bool,XineramaQueryExtension,(Display *a,int *b,int *c),(a,b,c),return)
+SDL_X11_SYM(Status,XineramaQueryVersion,(Display *a,int *b,int *c),(a,b,c),return)
+SDL_X11_SYM(XineramaScreenInfo*,XineramaQueryScreens,(Display *a, int *b),(a,b),return)
+#endif
+
+/* XInput2 support for multiple mice, tablets, etc. */
+#if SDL_VIDEO_DRIVER_X11_XINPUT2
+SDL_X11_MODULE(XINPUT2)
+SDL_X11_SYM(XIDeviceInfo*,XIQueryDevice,(Display *a,int b,int *c),(a,b,c),return)
+SDL_X11_SYM(void,XIFreeDeviceInfo,(XIDeviceInfo *a),(a),)
+SDL_X11_SYM(int,XISelectEvents,(Display *a,Window b,XIEventMask *c,int d),(a,b,c,d),return)
+SDL_X11_SYM(Status,XIQueryVersion,(Display *a,int *b,int *c),(a,b,c),return)
+SDL_X11_SYM(XIEventMask*,XIGetSelectedEvents,(Display *a,Window b,int *c),(a,b,c),return)
+#endif
+
+/* XRandR support */
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+SDL_X11_MODULE(XRANDR)
+SDL_X11_SYM(Status,XRRQueryVersion,(Display *dpy,int *major_versionp,int *minor_versionp),(dpy,major_versionp,minor_versionp),return)
+SDL_X11_SYM(XRRScreenConfiguration *,XRRGetScreenInfo,(Display *dpy,Drawable draw),(dpy,draw),return)
+SDL_X11_SYM(SizeID,XRRConfigCurrentConfiguration,(XRRScreenConfiguration *config,Rotation *rotation),(config,rotation),return)
+SDL_X11_SYM(short,XRRConfigCurrentRate,(XRRScreenConfiguration *config),(config),return)
+SDL_X11_SYM(short *,XRRConfigRates,(XRRScreenConfiguration *config,int sizeID,int *nrates),(config,sizeID,nrates),return)
+SDL_X11_SYM(XRRScreenSize *,XRRConfigSizes,(XRRScreenConfiguration *config,int *nsizes),(config,nsizes),return)
+SDL_X11_SYM(Status,XRRSetScreenConfigAndRate,(Display *dpy,XRRScreenConfiguration *config,Drawable draw,int size_index,Rotation rotation,short rate,Time timestamp),(dpy,config,draw,size_index,rotation,rate,timestamp),return)
+SDL_X11_SYM(void,XRRFreeScreenConfigInfo,(XRRScreenConfiguration *config),(config),)
+SDL_X11_SYM(void,XRRSetScreenSize,(Display *dpy, Window window,int width, int height,int mmWidth, int mmHeight),(dpy,window,width,height,mmWidth,mmHeight),)
+SDL_X11_SYM(Status,XRRGetScreenSizeRange,(Display *dpy, Window window,int *minWidth, int *minHeight, int *maxWidth, int *maxHeight),(dpy,window,minWidth,minHeight,maxWidth,maxHeight),return)
+SDL_X11_SYM(XRRScreenResources *,XRRGetScreenResources,(Display *dpy, Window window),(dpy, window),return)
+SDL_X11_SYM(void,XRRFreeScreenResources,(XRRScreenResources *resources),(resources),)
+SDL_X11_SYM(XRROutputInfo *,XRRGetOutputInfo,(Display *dpy, XRRScreenResources *resources, RROutput output),(dpy,resources,output),return)
+SDL_X11_SYM(void,XRRFreeOutputInfo,(XRROutputInfo *outputInfo),(outputInfo),)
+SDL_X11_SYM(XRRCrtcInfo *,XRRGetCrtcInfo,(Display *dpy, XRRScreenResources *resources, RRCrtc crtc),(dpy,resources,crtc),return)
+SDL_X11_SYM(void,XRRFreeCrtcInfo,(XRRCrtcInfo *crtcInfo),(crtcInfo),)
+SDL_X11_SYM(Status,XRRSetCrtcConfig,(Display *dpy, XRRScreenResources *resources, RRCrtc crtc, Time timestamp, int x, int y, RRMode mode, Rotation rotation, RROutput *outputs, int noutputs),(dpy,resources,crtc,timestamp,x,y,mode,rotation,outputs,noutputs),return)
+SDL_X11_SYM(Atom*,XRRListOutputProperties,(Display *dpy, RROutput output, int *nprop),(dpy,output,nprop),return)
+SDL_X11_SYM(XRRPropertyInfo*,XRRQueryOutputProperty,(Display *dpy,RROutput output, Atom property),(dpy,output,property),return)
+SDL_X11_SYM(int,XRRGetOutputProperty,(Display *dpy,RROutput output, Atom property, long offset, long length, Bool _delete, Bool pending, Atom req_type, Atom *actual_type, int *actual_format, unsigned long *nitems, unsigned long *bytes_after, unsigned char **prop),(dpy,output,property,offset,length, _delete, pending, req_type, actual_type, actual_format, nitems, bytes_after, prop),return)
+#endif
+
+/* MIT-SCREEN-SAVER support */
+#if SDL_VIDEO_DRIVER_X11_XSCRNSAVER
+SDL_X11_MODULE(XSS)
+SDL_X11_SYM(Bool,XScreenSaverQueryExtension,(Display *dpy,int *event_base,int *error_base),(dpy,event_base,error_base),return)
+SDL_X11_SYM(Status,XScreenSaverQueryVersion,(Display *dpy,int *major_versionp,int *minor_versionp),(dpy,major_versionp,minor_versionp),return)
+SDL_X11_SYM(void,XScreenSaverSuspend,(Display *dpy,Bool suspend),(dpy,suspend),return)
+#endif
+
+#if SDL_VIDEO_DRIVER_X11_XSHAPE
+SDL_X11_MODULE(XSHAPE)
+SDL_X11_SYM(void,XShapeCombineMask,(Display *dpy,Window dest,int dest_kind,int x_off,int y_off,Pixmap src,int op),(dpy,dest,dest_kind,x_off,y_off,src,op),)
+#endif
+
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+SDL_X11_MODULE(XVIDMODE)
+SDL_X11_SYM(Bool,XF86VidModeGetAllModeLines,(Display *a,int b,int *c,XF86VidModeModeInfo ***d),(a,b,c,d),return)
+SDL_X11_SYM(Bool,XF86VidModeGetModeLine,(Display *a,int b,int *c,XF86VidModeModeLine *d),(a,b,c,d),return)
+SDL_X11_SYM(Bool,XF86VidModeGetViewPort,(Display *a,int b,int *c,int *d),(a,b,c,d),return)
+SDL_X11_SYM(Bool,XF86VidModeQueryExtension,(Display *a,int *b,int *c),(a,b,c),return)
+SDL_X11_SYM(Bool,XF86VidModeQueryVersion,(Display *a,int *b,int *c),(a,b,c),return)
+SDL_X11_SYM(Bool,XF86VidModeSwitchToMode,(Display *a,int b,XF86VidModeModeInfo *c),(a,b,c),return)
+SDL_X11_SYM(Bool,XF86VidModeLockModeSwitch,(Display *a,int b,int c),(a,b,c),return)
+#endif
+
+/* *INDENT-ON* */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11touch.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11touch.c
new file mode 100644
index 000000000..a6da04633
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11touch.c	
@@ -0,0 +1,47 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include "SDL_x11video.h"
+#include "SDL_x11touch.h"
+#include "SDL_x11xinput2.h"
+#include "../../events/SDL_touch_c.h"
+
+
+void
+X11_InitTouch(_THIS)
+{
+    if (X11_Xinput2IsMultitouchSupported()) {
+        X11_InitXinput2Multitouch(_this);
+    }
+}
+
+void
+X11_QuitTouch(_THIS)
+{
+    SDL_TouchQuit();
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11touch.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11touch.h
new file mode 100644
index 000000000..84de8d63d
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11touch.h	
@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11touch_h
+#define _SDL_x11touch_h
+
+extern void X11_InitTouch(_THIS);
+extern void X11_QuitTouch(_THIS);
+
+#endif /* _SDL_x11touch_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11video.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11video.c
new file mode 100644
index 000000000..ca9faee31
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11video.c	
@@ -0,0 +1,674 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include <unistd.h> /* For getpid() and readlink() */
+
+#include "SDL_video.h"
+#include "SDL_mouse.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+
+#include "SDL_x11video.h"
+#include "SDL_x11framebuffer.h"
+#include "SDL_x11shape.h"
+#include "SDL_x11touch.h"
+#include "SDL_x11xinput2.h"
+
+#if SDL_VIDEO_OPENGL_EGL
+#include "SDL_x11opengles.h"
+#endif
+
+/* !!! FIXME: move dbus stuff to somewhere under src/core/linux ... */
+#if SDL_USE_LIBDBUS
+/* we never link directly to libdbus. */
+#include "SDL_loadso.h"
+static const char *dbus_library = "libdbus-1.so.3";
+static void *dbus_handle = NULL;
+static unsigned int screensaver_cookie = 0;
+
+/* !!! FIXME: this is kinda ugly. */
+static SDL_bool
+load_dbus_sym(const char *fn, void **addr)
+{
+    *addr = SDL_LoadFunction(dbus_handle, fn);
+    if (*addr == NULL) {
+        /* Don't call SDL_SetError(): SDL_LoadFunction already did. */
+        return SDL_FALSE;
+    }
+
+    return SDL_TRUE;
+}
+
+/* libdbus entry points... */
+static DBusConnection *(*DBUS_dbus_bus_get_private)(DBusBusType, DBusError *) = NULL;
+static void (*DBUS_dbus_connection_set_exit_on_disconnect)(DBusConnection *, dbus_bool_t) = NULL;
+static dbus_bool_t (*DBUS_dbus_connection_send)(DBusConnection *, DBusMessage *, dbus_uint32_t *) = NULL;
+static DBusMessage *(*DBUS_dbus_connection_send_with_reply_and_block)(DBusConnection *, DBusMessage *, int, DBusError *) = NULL;
+static void (*DBUS_dbus_connection_close)(DBusConnection *) = NULL;
+static void (*DBUS_dbus_connection_unref)(DBusConnection *) = NULL;
+static void (*DBUS_dbus_connection_flush)(DBusConnection *) = NULL;
+static DBusMessage *(*DBUS_dbus_message_new_method_call)(const char *, const char *, const char *, const char *) = NULL;
+static dbus_bool_t (*DBUS_dbus_message_append_args)(DBusMessage *, int, ...) = NULL;
+static dbus_bool_t (*DBUS_dbus_message_get_args)(DBusMessage *, DBusError *, int, ...) = NULL;
+static void (*DBUS_dbus_message_unref)(DBusMessage *) = NULL;
+static void (*DBUS_dbus_error_init)(DBusError *) = NULL;
+static dbus_bool_t (*DBUS_dbus_error_is_set)(const DBusError *) = NULL;
+static void (*DBUS_dbus_error_free)(DBusError *) = NULL;
+
+static int
+load_dbus_syms(void)
+{
+    /* cast funcs to char* first, to please GCC's strict aliasing rules. */
+    #define SDL_DBUS_SYM(x) \
+        if (!load_dbus_sym(#x, (void **) (char *) &DBUS_##x)) return -1
+
+    SDL_DBUS_SYM(dbus_bus_get_private);
+    SDL_DBUS_SYM(dbus_connection_set_exit_on_disconnect);
+    SDL_DBUS_SYM(dbus_connection_send);
+    SDL_DBUS_SYM(dbus_connection_send_with_reply_and_block);
+    SDL_DBUS_SYM(dbus_connection_close);
+    SDL_DBUS_SYM(dbus_connection_unref);
+    SDL_DBUS_SYM(dbus_connection_flush);
+    SDL_DBUS_SYM(dbus_message_append_args);
+    SDL_DBUS_SYM(dbus_message_get_args);
+    SDL_DBUS_SYM(dbus_message_new_method_call);
+    SDL_DBUS_SYM(dbus_message_unref);
+    SDL_DBUS_SYM(dbus_error_init);
+    SDL_DBUS_SYM(dbus_error_is_set);
+    SDL_DBUS_SYM(dbus_error_free);
+
+    #undef SDL_DBUS_SYM
+
+    return 0;
+}
+
+static void
+UnloadDBUSLibrary(void)
+{
+    if (dbus_handle != NULL) {
+        SDL_UnloadObject(dbus_handle);
+        dbus_handle = NULL;
+    }
+}
+
+static int
+LoadDBUSLibrary(void)
+{
+    int retval = 0;
+    if (dbus_handle == NULL) {
+        dbus_handle = SDL_LoadObject(dbus_library);
+        if (dbus_handle == NULL) {
+            retval = -1;
+            /* Don't call SDL_SetError(): SDL_LoadObject already did. */
+        } else {
+            retval = load_dbus_syms();
+            if (retval < 0) {
+                UnloadDBUSLibrary();
+            }
+        }
+    }
+
+    return retval;
+}
+
+static void
+X11_InitDBus(_THIS)
+{
+    if (LoadDBUSLibrary() != -1) {
+        SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+        DBusError err;
+        DBUS_dbus_error_init(&err);
+        data->dbus = DBUS_dbus_bus_get_private(DBUS_BUS_SESSION, &err);
+        if (DBUS_dbus_error_is_set(&err)) {
+            DBUS_dbus_error_free(&err);
+            if (data->dbus) {
+                DBUS_dbus_connection_unref(data->dbus);
+                data->dbus = NULL;
+            }
+            return;  /* oh well */
+        }
+        DBUS_dbus_connection_set_exit_on_disconnect(data->dbus, 0);
+    }
+}
+
+static void
+X11_QuitDBus(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    if (data->dbus) {
+        DBUS_dbus_connection_close(data->dbus);
+        DBUS_dbus_connection_unref(data->dbus);
+        data->dbus = NULL;
+    }
+}
+
+void
+SDL_dbus_screensaver_tickle(_THIS)
+{
+    const SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    DBusConnection *conn = data->dbus;
+    if (conn != NULL) {
+        DBusMessage *msg = DBUS_dbus_message_new_method_call("org.gnome.ScreenSaver",
+                                                             "/org/gnome/ScreenSaver",
+                                                             "org.gnome.ScreenSaver",
+                                                             "SimulateUserActivity");
+        if (msg != NULL) {
+            if (DBUS_dbus_connection_send(conn, msg, NULL)) {
+                DBUS_dbus_connection_flush(conn);
+            }
+            DBUS_dbus_message_unref(msg);
+        }
+    }
+}
+
+SDL_bool
+SDL_dbus_screensaver_inhibit(_THIS)
+{
+    const SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    DBusConnection *conn = data->dbus;
+
+    if (conn == NULL)
+        return SDL_FALSE;
+
+    if (_this->suspend_screensaver &&
+        screensaver_cookie != 0)
+        return SDL_TRUE;
+    if (!_this->suspend_screensaver &&
+        screensaver_cookie == 0)
+        return SDL_TRUE;
+
+    if (_this->suspend_screensaver) {
+        const char *app = "My SDL application";
+        const char *reason = "Playing a game";
+
+        DBusMessage *msg = DBUS_dbus_message_new_method_call("org.freedesktop.ScreenSaver",
+                                                             "/org/freedesktop/ScreenSaver",
+                                                             "org.freedesktop.ScreenSaver",
+                                                             "Inhibit");
+        if (msg != NULL) {
+            DBUS_dbus_message_append_args (msg,
+                                           DBUS_TYPE_STRING, &app,
+                                           DBUS_TYPE_STRING, &reason,
+                                           DBUS_TYPE_INVALID);
+        }
+
+        if (msg != NULL) {
+            DBusMessage *reply;
+
+            reply = DBUS_dbus_connection_send_with_reply_and_block(conn, msg, 300, NULL);
+            if (reply) {
+                if (!DBUS_dbus_message_get_args(reply, NULL,
+                                                DBUS_TYPE_UINT32, &screensaver_cookie,
+                                                DBUS_TYPE_INVALID))
+                    screensaver_cookie = 0;
+                DBUS_dbus_message_unref(reply);
+            }
+
+            DBUS_dbus_message_unref(msg);
+        }
+
+        if (screensaver_cookie == 0) {
+            return SDL_FALSE;
+        }
+        return SDL_TRUE;
+    } else {
+        DBusMessage *msg = DBUS_dbus_message_new_method_call("org.freedesktop.ScreenSaver",
+                                                             "/org/freedesktop/ScreenSaver",
+                                                             "org.freedesktop.ScreenSaver",
+                                                             "UnInhibit");
+        DBUS_dbus_message_append_args (msg,
+                                       DBUS_TYPE_UINT32, &screensaver_cookie,
+                                       DBUS_TYPE_INVALID);
+        if (msg != NULL) {
+            if (DBUS_dbus_connection_send(conn, msg, NULL)) {
+                DBUS_dbus_connection_flush(conn);
+            }
+            DBUS_dbus_message_unref(msg);
+        }
+
+        screensaver_cookie = 0;
+        return SDL_TRUE;
+    }
+}
+#endif
+
+/* Initialization/Query functions */
+static int X11_VideoInit(_THIS);
+static void X11_VideoQuit(_THIS);
+
+/* Find out what class name we should use */
+static char *
+get_classname()
+{
+    char *spot;
+#if defined(__LINUX__) || defined(__FREEBSD__)
+    char procfile[1024];
+    char linkfile[1024];
+    int linksize;
+#endif
+
+    /* First allow environment variable override */
+    spot = SDL_getenv("SDL_VIDEO_X11_WMCLASS");
+    if (spot) {
+        return SDL_strdup(spot);
+    }
+
+    /* Next look at the application's executable name */
+#if defined(__LINUX__) || defined(__FREEBSD__)
+#if defined(__LINUX__)
+    SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/exe", getpid());
+#elif defined(__FREEBSD__)
+    SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/file",
+                 getpid());
+#else
+#error Where can we find the executable name?
+#endif
+    linksize = readlink(procfile, linkfile, sizeof(linkfile) - 1);
+    if (linksize > 0) {
+        linkfile[linksize] = '\0';
+        spot = SDL_strrchr(linkfile, '/');
+        if (spot) {
+            return SDL_strdup(spot + 1);
+        } else {
+            return SDL_strdup(linkfile);
+        }
+    }
+#endif /* __LINUX__ || __FREEBSD__ */
+
+    /* Finally use the default we've used forever */
+    return SDL_strdup("SDL_App");
+}
+
+/* X11 driver bootstrap functions */
+
+static int
+X11_Available(void)
+{
+    Display *display = NULL;
+    if (SDL_X11_LoadSymbols()) {
+        display = X11_XOpenDisplay(NULL);
+        if (display != NULL) {
+            X11_XCloseDisplay(display);
+        }
+        SDL_X11_UnloadSymbols();
+    }
+    return (display != NULL);
+}
+
+static void
+X11_DeleteDevice(SDL_VideoDevice * device)
+{
+    SDL_VideoData *data = (SDL_VideoData *) device->driverdata;
+    if (data->display) {
+        X11_XCloseDisplay(data->display);
+    }
+    SDL_free(data->windowlist);
+    SDL_free(device->driverdata);
+    SDL_free(device);
+
+    SDL_X11_UnloadSymbols();
+}
+
+/* An error handler to reset the vidmode and then call the default handler. */
+static SDL_bool safety_net_triggered = SDL_FALSE;
+static int (*orig_x11_errhandler) (Display *, XErrorEvent *) = NULL;
+static int
+X11_SafetyNetErrHandler(Display * d, XErrorEvent * e)
+{
+    SDL_VideoDevice *device = NULL;
+    /* if we trigger an error in our error handler, don't try again. */
+    if (!safety_net_triggered) {
+        safety_net_triggered = SDL_TRUE;
+        device = SDL_GetVideoDevice();
+        if (device != NULL) {
+            int i;
+            for (i = 0; i < device->num_displays; i++) {
+                SDL_VideoDisplay *display = &device->displays[i];
+                if (SDL_memcmp(&display->current_mode, &display->desktop_mode,
+                               sizeof (SDL_DisplayMode)) != 0) {
+                    X11_SetDisplayMode(device, display, &display->desktop_mode);
+                }
+            }
+        }
+    }
+
+    if (orig_x11_errhandler != NULL) {
+        return orig_x11_errhandler(d, e);  /* probably terminate. */
+    }
+
+    return 0;
+}
+
+static SDL_VideoDevice *
+X11_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+    SDL_VideoData *data;
+    const char *display = NULL; /* Use the DISPLAY environment variable */
+
+    if (!SDL_X11_LoadSymbols()) {
+        return NULL;
+    }
+
+    /* Need for threading gl calls. This is also required for the proprietary
+        nVidia driver to be threaded. */
+    X11_XInitThreads();
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (!device) {
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    data = (struct SDL_VideoData *) SDL_calloc(1, sizeof(SDL_VideoData));
+    if (!data) {
+        SDL_free(device);
+        SDL_OutOfMemory();
+        return NULL;
+    }
+    device->driverdata = data;
+
+    /* FIXME: Do we need this?
+       if ( (SDL_strncmp(X11_XDisplayName(display), ":", 1) == 0) ||
+       (SDL_strncmp(X11_XDisplayName(display), "unix:", 5) == 0) ) {
+       local_X11 = 1;
+       } else {
+       local_X11 = 0;
+       }
+     */
+    data->display = X11_XOpenDisplay(display);
+#if defined(__osf__) && defined(SDL_VIDEO_DRIVER_X11_DYNAMIC)
+    /* On Tru64 if linking without -lX11, it fails and you get following message.
+     * Xlib: connection to ":0.0" refused by server
+     * Xlib: XDM authorization key matches an existing client!
+     *
+     * It succeeds if retrying 1 second later
+     * or if running xhost +localhost on shell.
+     */
+    if (data->display == NULL) {
+        SDL_Delay(1000);
+        data->display = X11_XOpenDisplay(display);
+    }
+#endif
+    if (data->display == NULL) {
+        SDL_free(device->driverdata);
+        SDL_free(device);
+        SDL_SetError("Couldn't open X11 display");
+        return NULL;
+    }
+#ifdef X11_DEBUG
+    X11_XSynchronize(data->display, True);
+#endif
+
+    /* Hook up an X11 error handler to recover the desktop resolution. */
+    safety_net_triggered = SDL_FALSE;
+    orig_x11_errhandler = X11_XSetErrorHandler(X11_SafetyNetErrHandler);
+
+    /* Set the function pointers */
+    device->VideoInit = X11_VideoInit;
+    device->VideoQuit = X11_VideoQuit;
+    device->GetDisplayModes = X11_GetDisplayModes;
+    device->GetDisplayBounds = X11_GetDisplayBounds;
+    device->SetDisplayMode = X11_SetDisplayMode;
+    device->SuspendScreenSaver = X11_SuspendScreenSaver;
+    device->PumpEvents = X11_PumpEvents;
+
+    device->CreateWindow = X11_CreateWindow;
+    device->CreateWindowFrom = X11_CreateWindowFrom;
+    device->SetWindowTitle = X11_SetWindowTitle;
+    device->SetWindowIcon = X11_SetWindowIcon;
+    device->SetWindowPosition = X11_SetWindowPosition;
+    device->SetWindowSize = X11_SetWindowSize;
+    device->SetWindowMinimumSize = X11_SetWindowMinimumSize;
+    device->SetWindowMaximumSize = X11_SetWindowMaximumSize;
+    device->ShowWindow = X11_ShowWindow;
+    device->HideWindow = X11_HideWindow;
+    device->RaiseWindow = X11_RaiseWindow;
+    device->MaximizeWindow = X11_MaximizeWindow;
+    device->MinimizeWindow = X11_MinimizeWindow;
+    device->RestoreWindow = X11_RestoreWindow;
+    device->SetWindowBordered = X11_SetWindowBordered;
+    device->SetWindowFullscreen = X11_SetWindowFullscreen;
+    device->SetWindowGammaRamp = X11_SetWindowGammaRamp;
+    device->SetWindowGrab = X11_SetWindowGrab;
+    device->DestroyWindow = X11_DestroyWindow;
+    device->CreateWindowFramebuffer = X11_CreateWindowFramebuffer;
+    device->UpdateWindowFramebuffer = X11_UpdateWindowFramebuffer;
+    device->DestroyWindowFramebuffer = X11_DestroyWindowFramebuffer;
+    device->GetWindowWMInfo = X11_GetWindowWMInfo;
+
+    device->shape_driver.CreateShaper = X11_CreateShaper;
+    device->shape_driver.SetWindowShape = X11_SetWindowShape;
+    device->shape_driver.ResizeWindowShape = X11_ResizeWindowShape;
+
+#if SDL_VIDEO_OPENGL_GLX
+    device->GL_LoadLibrary = X11_GL_LoadLibrary;
+    device->GL_GetProcAddress = X11_GL_GetProcAddress;
+    device->GL_UnloadLibrary = X11_GL_UnloadLibrary;
+    device->GL_CreateContext = X11_GL_CreateContext;
+    device->GL_MakeCurrent = X11_GL_MakeCurrent;
+    device->GL_SetSwapInterval = X11_GL_SetSwapInterval;
+    device->GL_GetSwapInterval = X11_GL_GetSwapInterval;
+    device->GL_SwapWindow = X11_GL_SwapWindow;
+    device->GL_DeleteContext = X11_GL_DeleteContext;
+#elif SDL_VIDEO_OPENGL_EGL
+    device->GL_LoadLibrary = X11_GLES_LoadLibrary;
+    device->GL_GetProcAddress = X11_GLES_GetProcAddress;
+    device->GL_UnloadLibrary = X11_GLES_UnloadLibrary;
+    device->GL_CreateContext = X11_GLES_CreateContext;
+    device->GL_MakeCurrent = X11_GLES_MakeCurrent;
+    device->GL_SetSwapInterval = X11_GLES_SetSwapInterval;
+    device->GL_GetSwapInterval = X11_GLES_GetSwapInterval;
+    device->GL_SwapWindow = X11_GLES_SwapWindow;
+    device->GL_DeleteContext = X11_GLES_DeleteContext;
+#endif
+
+    device->SetClipboardText = X11_SetClipboardText;
+    device->GetClipboardText = X11_GetClipboardText;
+    device->HasClipboardText = X11_HasClipboardText;
+
+    device->free = X11_DeleteDevice;
+
+    return device;
+}
+
+VideoBootStrap X11_bootstrap = {
+    "x11", "SDL X11 video driver",
+    X11_Available, X11_CreateDevice
+};
+
+static int (*handler) (Display *, XErrorEvent *) = NULL;
+static int
+X11_CheckWindowManagerErrorHandler(Display * d, XErrorEvent * e)
+{
+    if (e->error_code == BadWindow) {
+        return (0);
+    } else {
+        return (handler(d, e));
+    }
+}
+
+static void
+X11_CheckWindowManager(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    Display *display = data->display;
+    Atom _NET_SUPPORTING_WM_CHECK;
+    int status, real_format;
+    Atom real_type;
+    unsigned long items_read = 0, items_left = 0;
+    unsigned char *propdata = NULL;
+    Window wm_window = 0;
+#ifdef DEBUG_WINDOW_MANAGER
+    char *wm_name;
+#endif
+
+    /* Set up a handler to gracefully catch errors */
+    X11_XSync(display, False);
+    handler = X11_XSetErrorHandler(X11_CheckWindowManagerErrorHandler);
+
+    _NET_SUPPORTING_WM_CHECK = X11_XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False);
+    status = X11_XGetWindowProperty(display, DefaultRootWindow(display), _NET_SUPPORTING_WM_CHECK, 0L, 1L, False, XA_WINDOW, &real_type, &real_format, &items_read, &items_left, &propdata);
+    if (status == Success) {
+        if (items_read) {
+            wm_window = ((Window*)propdata)[0];
+        }
+        if (propdata) {
+            X11_XFree(propdata);
+            propdata = NULL;
+        }
+    }
+
+    if (wm_window) {
+        status = X11_XGetWindowProperty(display, wm_window, _NET_SUPPORTING_WM_CHECK, 0L, 1L, False, XA_WINDOW, &real_type, &real_format, &items_read, &items_left, &propdata);
+        if (status != Success || !items_read || wm_window != ((Window*)propdata)[0]) {
+            wm_window = None;
+        }
+        if (status == Success && propdata) {
+            X11_XFree(propdata);
+            propdata = NULL;
+        }
+    }
+
+    /* Reset the error handler, we're done checking */
+    X11_XSync(display, False);
+    X11_XSetErrorHandler(handler);
+
+    if (!wm_window) {
+#ifdef DEBUG_WINDOW_MANAGER
+        printf("Couldn't get _NET_SUPPORTING_WM_CHECK property\n");
+#endif
+        return;
+    }
+    data->net_wm = SDL_TRUE;
+
+#ifdef DEBUG_WINDOW_MANAGER
+    wm_name = X11_GetWindowTitle(_this, wm_window);
+    printf("Window manager: %s\n", wm_name);
+    SDL_free(wm_name);
+#endif
+}
+
+
+int
+X11_VideoInit(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    /* Get the window class name, usually the name of the application */
+    data->classname = get_classname();
+
+    /* Get the process PID to be associated to the window */
+    data->pid = getpid();
+
+    /* Open a connection to the X input manager */
+#ifdef X_HAVE_UTF8_STRING
+    if (SDL_X11_HAVE_UTF8) {
+        data->im =
+            X11_XOpenIM(data->display, NULL, data->classname, data->classname);
+    }
+#endif
+
+    /* Look up some useful Atoms */
+#define GET_ATOM(X) data->X = X11_XInternAtom(data->display, #X, False)
+    GET_ATOM(WM_PROTOCOLS);
+    GET_ATOM(WM_DELETE_WINDOW);
+    GET_ATOM(_NET_WM_STATE);
+    GET_ATOM(_NET_WM_STATE_HIDDEN);
+    GET_ATOM(_NET_WM_STATE_FOCUSED);
+    GET_ATOM(_NET_WM_STATE_MAXIMIZED_VERT);
+    GET_ATOM(_NET_WM_STATE_MAXIMIZED_HORZ);
+    GET_ATOM(_NET_WM_STATE_FULLSCREEN);
+    GET_ATOM(_NET_WM_ALLOWED_ACTIONS);
+    GET_ATOM(_NET_WM_ACTION_FULLSCREEN);
+    GET_ATOM(_NET_WM_NAME);
+    GET_ATOM(_NET_WM_ICON_NAME);
+    GET_ATOM(_NET_WM_ICON);
+    GET_ATOM(_NET_WM_PING);
+    GET_ATOM(_NET_ACTIVE_WINDOW);
+    GET_ATOM(UTF8_STRING);
+    GET_ATOM(PRIMARY);
+    GET_ATOM(XdndEnter);
+    GET_ATOM(XdndPosition);
+    GET_ATOM(XdndStatus);
+    GET_ATOM(XdndTypeList);
+    GET_ATOM(XdndActionCopy);
+    GET_ATOM(XdndDrop);
+    GET_ATOM(XdndFinished);
+    GET_ATOM(XdndSelection);
+
+    /* Detect the window manager */
+    X11_CheckWindowManager(_this);
+
+    if (X11_InitModes(_this) < 0) {
+        return -1;
+    }
+
+    X11_InitXinput2(_this);
+
+    if (X11_InitKeyboard(_this) != 0) {
+        return -1;
+    }
+    X11_InitMouse(_this);
+
+    X11_InitTouch(_this);
+
+#if SDL_USE_LIBDBUS
+    X11_InitDBus(_this);
+#endif
+
+    return 0;
+}
+
+void
+X11_VideoQuit(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    SDL_free(data->classname);
+#ifdef X_HAVE_UTF8_STRING
+    if (data->im) {
+        X11_XCloseIM(data->im);
+    }
+#endif
+
+    X11_QuitModes(_this);
+    X11_QuitKeyboard(_this);
+    X11_QuitMouse(_this);
+    X11_QuitTouch(_this);
+
+#if SDL_USE_LIBDBUS
+    X11_QuitDBus(_this);
+#endif
+}
+
+SDL_bool
+X11_UseDirectColorVisuals(void)
+{
+    return SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ? SDL_FALSE : SDL_TRUE;
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vim: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11video.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11video.h
new file mode 100644
index 000000000..8ab88f728
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11video.h	
@@ -0,0 +1,129 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11video_h
+#define _SDL_x11video_h
+
+#include "SDL_keycode.h"
+
+#include "../SDL_sysvideo.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+
+#if SDL_VIDEO_DRIVER_X11_XCURSOR
+#include <X11/Xcursor/Xcursor.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XINPUT2
+#include <X11/extensions/XInput2.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XRANDR
+#include <X11/extensions/Xrandr.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XSCRNSAVER
+#include <X11/extensions/scrnsaver.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XSHAPE
+#include <X11/extensions/shape.h>
+#endif
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+#include <X11/extensions/xf86vmode.h>
+#endif
+
+#ifdef HAVE_DBUS_DBUS_H
+#define SDL_USE_LIBDBUS 1
+#include <dbus/dbus.h>
+#endif
+
+#include "SDL_x11dyn.h"
+
+#include "SDL_x11clipboard.h"
+#include "SDL_x11events.h"
+#include "SDL_x11keyboard.h"
+#include "SDL_x11modes.h"
+#include "SDL_x11mouse.h"
+#include "SDL_x11opengl.h"
+#include "SDL_x11window.h"
+
+/* Private display data */
+
+typedef struct SDL_VideoData
+{
+    Display *display;
+    char *classname;
+    pid_t pid;
+    XIM im;
+    Uint32 screensaver_activity;
+    int numwindows;
+    SDL_WindowData **windowlist;
+    int windowlistlength;
+
+    /* This is true for ICCCM2.0-compliant window managers */
+    SDL_bool net_wm;
+
+    /* Useful atoms */
+    Atom WM_PROTOCOLS;
+    Atom WM_DELETE_WINDOW;
+    Atom _NET_WM_STATE;
+    Atom _NET_WM_STATE_HIDDEN;
+    Atom _NET_WM_STATE_FOCUSED;
+    Atom _NET_WM_STATE_MAXIMIZED_VERT;
+    Atom _NET_WM_STATE_MAXIMIZED_HORZ;
+    Atom _NET_WM_STATE_FULLSCREEN;
+    Atom _NET_WM_ALLOWED_ACTIONS;
+    Atom _NET_WM_ACTION_FULLSCREEN;
+    Atom _NET_WM_NAME;
+    Atom _NET_WM_ICON_NAME;
+    Atom _NET_WM_ICON;
+    Atom _NET_WM_PING;
+    Atom _NET_ACTIVE_WINDOW;
+    Atom UTF8_STRING;
+    Atom PRIMARY;
+    Atom XdndEnter;
+    Atom XdndPosition;
+    Atom XdndStatus;
+    Atom XdndTypeList;
+    Atom XdndActionCopy;
+    Atom XdndDrop;
+    Atom XdndFinished;
+    Atom XdndSelection;
+
+    SDL_Scancode key_layout[256];
+    SDL_bool selection_waiting;
+
+#if SDL_USE_LIBDBUS
+    DBusConnection *dbus;
+#endif
+} SDL_VideoData;
+
+extern SDL_bool X11_UseDirectColorVisuals(void);
+
+SDL_bool SDL_dbus_screensaver_inhibit(_THIS);
+void SDL_dbus_screensaver_tickle(_THIS);
+
+#endif /* _SDL_x11video_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11window.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11window.c
new file mode 100644
index 000000000..f5ae655bc
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11window.c	
@@ -0,0 +1,1450 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include "SDL_assert.h"
+#include "SDL_hints.h"
+#include "../SDL_sysvideo.h"
+#include "../SDL_pixels_c.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_mouse_c.h"
+
+#include "SDL_x11video.h"
+#include "SDL_x11mouse.h"
+#include "SDL_x11shape.h"
+#include "SDL_x11xinput2.h"
+
+#if SDL_VIDEO_OPENGL_EGL
+#include "SDL_x11opengles.h"
+#endif
+
+#include "SDL_timer.h"
+#include "SDL_syswm.h"
+#include "SDL_assert.h"
+
+#define _NET_WM_STATE_REMOVE    0l
+#define _NET_WM_STATE_ADD       1l
+#define _NET_WM_STATE_TOGGLE    2l
+
+static Bool isMapNotify(Display *dpy, XEvent *ev, XPointer win)
+{
+    return ev->type == MapNotify && ev->xmap.window == *((Window*)win);
+}
+static Bool isUnmapNotify(Display *dpy, XEvent *ev, XPointer win)
+{
+    return ev->type == UnmapNotify && ev->xunmap.window == *((Window*)win);
+}
+static Bool isConfigureNotify(Display *dpy, XEvent *ev, XPointer win)
+{
+    return ev->type == ConfigureNotify && ev->xconfigure.window == *((Window*)win);
+}
+
+/*
+static Bool
+X11_XIfEventTimeout(Display *display, XEvent *event_return, Bool (*predicate)(), XPointer arg, int timeoutMS)
+{
+    Uint32 start = SDL_GetTicks();
+
+    while (!X11_XCheckIfEvent(display, event_return, predicate, arg)) {
+        if (SDL_TICKS_PASSED(SDL_GetTicks(), start + timeoutMS)) {
+            return False;
+        }
+    }
+    return True;
+}
+*/
+
+static SDL_bool
+X11_IsWindowLegacyFullscreen(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    return (data->fswindow != 0);
+}
+
+static SDL_bool
+X11_IsWindowMapped(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    XWindowAttributes attr;
+
+    X11_XGetWindowAttributes(videodata->display, data->xwindow, &attr);
+    if (attr.map_state != IsUnmapped) {
+        return SDL_TRUE;
+    } else {
+        return SDL_FALSE;
+    }
+}
+
+#if 0
+static SDL_bool
+X11_IsActionAllowed(SDL_Window *window, Atom action)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Atom _NET_WM_ALLOWED_ACTIONS = data->videodata->_NET_WM_ALLOWED_ACTIONS;
+    Atom type;
+    Display *display = data->videodata->display;
+    int form;
+    unsigned long remain;
+    unsigned long len, i;
+    Atom *list;
+    SDL_bool ret = SDL_FALSE;
+
+    if (X11_XGetWindowProperty(display, data->xwindow, _NET_WM_ALLOWED_ACTIONS, 0, 1024, False, XA_ATOM, &type, &form, &len, &remain, (unsigned char **)&list) == Success)
+    {
+        for (i=0; i<len; ++i)
+        {
+            if (list[i] == action) {
+                ret = SDL_TRUE;
+                break;
+            }
+        }
+        X11_XFree(list);
+    }
+    return ret;
+}
+#endif /* 0 */
+
+void
+X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    Display *display = videodata->display;
+    Atom _NET_WM_STATE = videodata->_NET_WM_STATE;
+    /* Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN; */
+    Atom _NET_WM_STATE_FOCUSED = videodata->_NET_WM_STATE_FOCUSED;
+    Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT;
+    Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
+    Atom _NET_WM_STATE_FULLSCREEN = videodata->_NET_WM_STATE_FULLSCREEN;
+    Atom atoms[5];
+    int count = 0;
+
+    /* The window manager sets this property, we shouldn't set it.
+       If we did, this would indicate to the window manager that we don't
+       actually want to be mapped during X11_XMapRaised(), which would be bad.
+     *
+    if (flags & SDL_WINDOW_HIDDEN) {
+        atoms[count++] = _NET_WM_STATE_HIDDEN;
+    }
+    */
+    if (flags & SDL_WINDOW_INPUT_FOCUS) {
+        atoms[count++] = _NET_WM_STATE_FOCUSED;
+    }
+    if (flags & SDL_WINDOW_MAXIMIZED) {
+        atoms[count++] = _NET_WM_STATE_MAXIMIZED_VERT;
+        atoms[count++] = _NET_WM_STATE_MAXIMIZED_HORZ;
+    }
+    if (flags & SDL_WINDOW_FULLSCREEN) {
+        atoms[count++] = _NET_WM_STATE_FULLSCREEN;
+    }
+    if (count > 0) {
+        X11_XChangeProperty(display, xwindow, _NET_WM_STATE, XA_ATOM, 32,
+                        PropModeReplace, (unsigned char *)atoms, count);
+    } else {
+        X11_XDeleteProperty(display, xwindow, _NET_WM_STATE);
+    }
+}
+
+Uint32
+X11_GetNetWMState(_THIS, Window xwindow)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    Display *display = videodata->display;
+    Atom _NET_WM_STATE = videodata->_NET_WM_STATE;
+    Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN;
+    Atom _NET_WM_STATE_FOCUSED = videodata->_NET_WM_STATE_FOCUSED;
+    Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT;
+    Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
+    Atom _NET_WM_STATE_FULLSCREEN = videodata->_NET_WM_STATE_FULLSCREEN;
+    Atom actualType;
+    int actualFormat;
+    unsigned long i, numItems, bytesAfter;
+    unsigned char *propertyValue = NULL;
+    long maxLength = 1024;
+    Uint32 flags = 0;
+
+    if (X11_XGetWindowProperty(display, xwindow, _NET_WM_STATE,
+                           0l, maxLength, False, XA_ATOM, &actualType,
+                           &actualFormat, &numItems, &bytesAfter,
+                           &propertyValue) == Success) {
+        Atom *atoms = (Atom *) propertyValue;
+        int maximized = 0;
+        int fullscreen = 0;
+
+        for (i = 0; i < numItems; ++i) {
+            if (atoms[i] == _NET_WM_STATE_HIDDEN) {
+                flags |= SDL_WINDOW_HIDDEN;
+            } else if (atoms[i] == _NET_WM_STATE_FOCUSED) {
+                flags |= SDL_WINDOW_INPUT_FOCUS;
+            } else if (atoms[i] == _NET_WM_STATE_MAXIMIZED_VERT) {
+                maximized |= 1;
+            } else if (atoms[i] == _NET_WM_STATE_MAXIMIZED_HORZ) {
+                maximized |= 2;
+            } else if ( atoms[i] == _NET_WM_STATE_FULLSCREEN) {
+                fullscreen = 1;
+            }
+        }
+        if (maximized == 3) {
+            flags |= SDL_WINDOW_MAXIMIZED;
+        }  else if (fullscreen == 1) {
+            flags |= SDL_WINDOW_FULLSCREEN;
+        }
+        X11_XFree(propertyValue);
+    }
+
+    /* FIXME, check the size hints for resizable */
+    /* flags |= SDL_WINDOW_RESIZABLE; */
+
+    return flags;
+}
+
+static int
+SetupWindowData(_THIS, SDL_Window * window, Window w, BOOL created)
+{
+    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+    SDL_WindowData *data;
+    int numwindows = videodata->numwindows;
+    int windowlistlength = videodata->windowlistlength;
+    SDL_WindowData **windowlist = videodata->windowlist;
+
+    /* Allocate the window data */
+    data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data));
+    if (!data) {
+        return SDL_OutOfMemory();
+    }
+    data->window = window;
+    data->xwindow = w;
+#ifdef X_HAVE_UTF8_STRING
+    if (SDL_X11_HAVE_UTF8 && videodata->im) {
+        data->ic =
+            X11_XCreateIC(videodata->im, XNClientWindow, w, XNFocusWindow, w,
+                       XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+                       XNResourceName, videodata->classname, XNResourceClass,
+                       videodata->classname, NULL);
+    }
+#endif
+    data->created = created;
+    data->videodata = videodata;
+
+    /* Associate the data with the window */
+
+    if (numwindows < windowlistlength) {
+        windowlist[numwindows] = data;
+        videodata->numwindows++;
+    } else {
+        windowlist =
+            (SDL_WindowData **) SDL_realloc(windowlist,
+                                            (numwindows +
+                                             1) * sizeof(*windowlist));
+        if (!windowlist) {
+            SDL_free(data);
+            return SDL_OutOfMemory();
+        }
+        windowlist[numwindows] = data;
+        videodata->numwindows++;
+        videodata->windowlistlength++;
+        videodata->windowlist = windowlist;
+    }
+
+    /* Fill in the SDL window with the window data */
+    {
+        XWindowAttributes attrib;
+
+        X11_XGetWindowAttributes(data->videodata->display, w, &attrib);
+        window->x = attrib.x;
+        window->y = attrib.y;
+        window->w = attrib.width;
+        window->h = attrib.height;
+        if (attrib.map_state != IsUnmapped) {
+            window->flags |= SDL_WINDOW_SHOWN;
+        } else {
+            window->flags &= ~SDL_WINDOW_SHOWN;
+        }
+        data->visual = attrib.visual;
+        data->colormap = attrib.colormap;
+    }
+
+    window->flags |= X11_GetNetWMState(_this, w);
+
+    {
+        Window FocalWindow;
+        int RevertTo=0;
+        X11_XGetInputFocus(data->videodata->display, &FocalWindow, &RevertTo);
+        if (FocalWindow==w)
+        {
+            window->flags |= SDL_WINDOW_INPUT_FOCUS;
+        }
+
+        if (window->flags & SDL_WINDOW_INPUT_FOCUS) {
+            SDL_SetKeyboardFocus(data->window);
+        }
+
+        if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
+            /* Tell x11 to clip mouse */
+        }
+    }
+
+    /* All done! */
+    window->driverdata = data;
+    return 0;
+}
+
+static void
+SetWindowBordered(Display *display, int screen, Window window, SDL_bool border)
+{
+    /*
+     * this code used to check for KWM_WIN_DECORATION, but KDE hasn't
+     *  supported it for years and years. It now respects _MOTIF_WM_HINTS.
+     *  Gnome is similar: just use the Motif atom.
+     */
+
+    Atom WM_HINTS = X11_XInternAtom(display, "_MOTIF_WM_HINTS", True);
+    if (WM_HINTS != None) {
+        /* Hints used by Motif compliant window managers */
+        struct
+        {
+            unsigned long flags;
+            unsigned long functions;
+            unsigned long decorations;
+            long input_mode;
+            unsigned long status;
+        } MWMHints = {
+            (1L << 1), 0, border ? 1 : 0, 0, 0
+        };
+
+        X11_XChangeProperty(display, window, WM_HINTS, WM_HINTS, 32,
+                        PropModeReplace, (unsigned char *) &MWMHints,
+                        sizeof(MWMHints) / 4);
+    } else {  /* set the transient hints instead, if necessary */
+        X11_XSetTransientForHint(display, window, RootWindow(display, screen));
+    }
+}
+
+int
+X11_CreateWindow(_THIS, SDL_Window * window)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    SDL_DisplayData *displaydata =
+        (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+    SDL_WindowData *windowdata;
+    Display *display = data->display;
+    int screen = displaydata->screen;
+    Visual *visual;
+    int depth;
+    XSetWindowAttributes xattr;
+    Window w;
+    XSizeHints *sizehints;
+    XWMHints *wmhints;
+    XClassHint *classhints;
+    const long _NET_WM_BYPASS_COMPOSITOR_HINT_ON = 1;
+    Atom _NET_WM_BYPASS_COMPOSITOR;
+    Atom _NET_WM_WINDOW_TYPE;
+    Atom _NET_WM_WINDOW_TYPE_NORMAL;
+    Atom _NET_WM_PID;
+    Atom XdndAware, xdnd_version = 5;
+    Uint32 fevent = 0;
+
+#if SDL_VIDEO_OPENGL_GLX || SDL_VIDEO_OPENGL_EGL
+    if ((window->flags & SDL_WINDOW_OPENGL) &&
+        !SDL_getenv("SDL_VIDEO_X11_VISUALID")) {
+        XVisualInfo *vinfo = NULL;
+
+#if SDL_VIDEO_OPENGL_EGL
+        if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES 
+#if SDL_VIDEO_OPENGL_GLX            
+            && ( !_this->gl_data || ! _this->gl_data->HAS_GLX_EXT_create_context_es2_profile )
+#endif
+        ){
+            vinfo = X11_GLES_GetVisual(_this, display, screen);
+        } else
+#endif
+        {
+#if SDL_VIDEO_OPENGL_GLX
+            vinfo = X11_GL_GetVisual(_this, display, screen);
+#endif
+        }
+
+        if (!vinfo) {
+            return -1;
+        }
+        visual = vinfo->visual;
+        depth = vinfo->depth;
+        X11_XFree(vinfo);
+    } else
+#endif
+    {
+        visual = displaydata->visual;
+        depth = displaydata->depth;
+    }
+
+    xattr.override_redirect = False;
+    xattr.background_pixmap = None;
+    xattr.border_pixel = 0;
+
+    if (visual->class == DirectColor) {
+        XColor *colorcells;
+        int i;
+        int ncolors;
+        int rmax, gmax, bmax;
+        int rmask, gmask, bmask;
+        int rshift, gshift, bshift;
+
+        xattr.colormap =
+            X11_XCreateColormap(display, RootWindow(display, screen),
+                            visual, AllocAll);
+
+        /* If we can't create a colormap, then we must die */
+        if (!xattr.colormap) {
+            return SDL_SetError("Could not create writable colormap");
+        }
+
+        /* OK, we got a colormap, now fill it in as best as we can */
+        colorcells = SDL_malloc(visual->map_entries * sizeof(XColor));
+        if (!colorcells) {
+            return SDL_OutOfMemory();
+        }
+        ncolors = visual->map_entries;
+        rmax = 0xffff;
+        gmax = 0xffff;
+        bmax = 0xffff;
+
+        rshift = 0;
+        rmask = visual->red_mask;
+        while (0 == (rmask & 1)) {
+            rshift++;
+            rmask >>= 1;
+        }
+
+        gshift = 0;
+        gmask = visual->green_mask;
+        while (0 == (gmask & 1)) {
+            gshift++;
+            gmask >>= 1;
+        }
+
+        bshift = 0;
+        bmask = visual->blue_mask;
+        while (0 == (bmask & 1)) {
+            bshift++;
+            bmask >>= 1;
+        }
+
+        /* build the color table pixel values */
+        for (i = 0; i < ncolors; i++) {
+            Uint32 red = (rmax * i) / (ncolors - 1);
+            Uint32 green = (gmax * i) / (ncolors - 1);
+            Uint32 blue = (bmax * i) / (ncolors - 1);
+
+            Uint32 rbits = (rmask * i) / (ncolors - 1);
+            Uint32 gbits = (gmask * i) / (ncolors - 1);
+            Uint32 bbits = (bmask * i) / (ncolors - 1);
+
+            Uint32 pix =
+                (rbits << rshift) | (gbits << gshift) | (bbits << bshift);
+
+            colorcells[i].pixel = pix;
+
+            colorcells[i].red = red;
+            colorcells[i].green = green;
+            colorcells[i].blue = blue;
+
+            colorcells[i].flags = DoRed | DoGreen | DoBlue;
+        }
+
+        X11_XStoreColors(display, xattr.colormap, colorcells, ncolors);
+
+        SDL_free(colorcells);
+    } else {
+        xattr.colormap =
+            X11_XCreateColormap(display, RootWindow(display, screen),
+                            visual, AllocNone);
+    }
+
+    w = X11_XCreateWindow(display, RootWindow(display, screen),
+                      window->x, window->y, window->w, window->h,
+                      0, depth, InputOutput, visual,
+                      (CWOverrideRedirect | CWBackPixmap | CWBorderPixel |
+                       CWColormap), &xattr);
+    if (!w) {
+        return SDL_SetError("Couldn't create window");
+    }
+
+    SetWindowBordered(display, screen, w,
+                      (window->flags & SDL_WINDOW_BORDERLESS) == 0);
+
+    sizehints = X11_XAllocSizeHints();
+    /* Setup the normal size hints */
+    sizehints->flags = 0;
+    if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
+        sizehints->min_width = sizehints->max_width = window->w;
+        sizehints->min_height = sizehints->max_height = window->h;
+        sizehints->flags |= (PMaxSize | PMinSize);
+    }
+    sizehints->x = window->x;
+    sizehints->y = window->y;
+    sizehints->flags |= USPosition;
+
+    /* Setup the input hints so we get keyboard input */
+    wmhints = X11_XAllocWMHints();
+    wmhints->input = True;
+    wmhints->flags = InputHint;
+
+    /* Setup the class hints so we can get an icon (AfterStep) */
+    classhints = X11_XAllocClassHint();
+    classhints->res_name = data->classname;
+    classhints->res_class = data->classname;
+
+    /* Set the size, input and class hints, and define WM_CLIENT_MACHINE and WM_LOCALE_NAME */
+    X11_XSetWMProperties(display, w, NULL, NULL, NULL, 0, sizehints, wmhints, classhints);
+
+    X11_XFree(sizehints);
+    X11_XFree(wmhints);
+    X11_XFree(classhints);
+    /* Set the PID related to the window for the given hostname, if possible */
+    if (data->pid > 0) {
+        _NET_WM_PID = X11_XInternAtom(display, "_NET_WM_PID", False);
+        X11_XChangeProperty(display, w, _NET_WM_PID, XA_CARDINAL, 32, PropModeReplace,
+                        (unsigned char *)&data->pid, 1);
+    }
+
+    /* Set the window manager state */
+    X11_SetNetWMState(_this, w, window->flags);
+
+    /* Let the window manager know we're a "normal" window */
+    _NET_WM_WINDOW_TYPE = X11_XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
+    _NET_WM_WINDOW_TYPE_NORMAL = X11_XInternAtom(display, "_NET_WM_WINDOW_TYPE_NORMAL", False);
+    X11_XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,
+                    PropModeReplace,
+                    (unsigned char *)&_NET_WM_WINDOW_TYPE_NORMAL, 1);
+
+    _NET_WM_BYPASS_COMPOSITOR = X11_XInternAtom(display, "_NET_WM_BYPASS_COMPOSITOR", False);
+    X11_XChangeProperty(display, w, _NET_WM_BYPASS_COMPOSITOR, XA_CARDINAL, 32,
+                    PropModeReplace,
+                    (unsigned char *)&_NET_WM_BYPASS_COMPOSITOR_HINT_ON, 1);
+
+    {
+        Atom protocols[] = {
+            data->WM_DELETE_WINDOW, /* Allow window to be deleted by the WM */
+            data->_NET_WM_PING, /* Respond so WM knows we're alive */
+        };
+        X11_XSetWMProtocols(display, w, protocols, sizeof (protocols) / sizeof (protocols[0]));
+    }
+
+    if (SetupWindowData(_this, window, w, SDL_TRUE) < 0) {
+        X11_XDestroyWindow(display, w);
+        return -1;
+    }
+    windowdata = (SDL_WindowData *) window->driverdata;
+
+#if SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
+    if ((window->flags & SDL_WINDOW_OPENGL) && 
+        _this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES
+#if SDL_VIDEO_OPENGL_GLX            
+        && ( !_this->gl_data || ! _this->gl_data->HAS_GLX_EXT_create_context_es2_profile )
+#endif  
+    ) {
+#if SDL_VIDEO_OPENGL_EGL  
+        if (!_this->egl_data) {
+            X11_XDestroyWindow(display, w);
+            return -1;
+        }
+
+        /* Create the GLES window surface */
+        windowdata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) w);
+
+        if (windowdata->egl_surface == EGL_NO_SURFACE) {
+            X11_XDestroyWindow(display, w);
+            return SDL_SetError("Could not create GLES window surface");
+        }
+#else
+        return SDL_SetError("Could not create GLES window surface (no EGL support available)");
+#endif /* SDL_VIDEO_OPENGL_EGL */
+    }
+#endif
+    
+
+#ifdef X_HAVE_UTF8_STRING
+    if (SDL_X11_HAVE_UTF8 && windowdata->ic) {
+        X11_XGetICValues(windowdata->ic, XNFilterEvents, &fevent, NULL);
+    }
+#endif
+
+    X11_Xinput2SelectTouch(_this, window);
+
+    X11_XSelectInput(display, w,
+                 (FocusChangeMask | EnterWindowMask | LeaveWindowMask |
+                 ExposureMask | ButtonPressMask | ButtonReleaseMask |
+                 PointerMotionMask | KeyPressMask | KeyReleaseMask |
+                 PropertyChangeMask | StructureNotifyMask |
+                 KeymapStateMask | fevent));
+
+    XdndAware = X11_XInternAtom(display, "XdndAware", False);
+    X11_XChangeProperty(display, w, XdndAware, XA_ATOM, 32,
+                 PropModeReplace,
+                 (unsigned char*)&xdnd_version, 1);
+
+    X11_XFlush(display);
+
+    return 0;
+}
+
+int
+X11_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
+{
+    Window w = (Window) data;
+
+    window->title = X11_GetWindowTitle(_this, w);
+
+    if (SetupWindowData(_this, window, w, SDL_FALSE) < 0) {
+        return -1;
+    }
+    return 0;
+}
+
+char *
+X11_GetWindowTitle(_THIS, Window xwindow)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    Display *display = data->display;
+    int status, real_format;
+    Atom real_type;
+    unsigned long items_read, items_left;
+    unsigned char *propdata;
+    char *title = NULL;
+
+    status = X11_XGetWindowProperty(display, xwindow, data->_NET_WM_NAME,
+                0L, 8192L, False, data->UTF8_STRING, &real_type, &real_format,
+                &items_read, &items_left, &propdata);
+    if (status == Success && propdata) {
+        title = SDL_strdup(SDL_static_cast(char*, propdata));
+        X11_XFree(propdata);
+    } else {
+        status = X11_XGetWindowProperty(display, xwindow, XA_WM_NAME,
+                    0L, 8192L, False, XA_STRING, &real_type, &real_format,
+                    &items_read, &items_left, &propdata);
+        if (status == Success && propdata) {
+            title = SDL_iconv_string("UTF-8", "", SDL_static_cast(char*, propdata), items_read+1);
+        } else {
+            title = SDL_strdup("");
+        }
+    }
+    return title;
+}
+
+void
+X11_SetWindowTitle(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+    XTextProperty titleprop, iconprop;
+    Status status;
+    const char *title = window->title;
+    const char *icon = NULL;
+
+#ifdef X_HAVE_UTF8_STRING
+    Atom _NET_WM_NAME = data->videodata->_NET_WM_NAME;
+    Atom _NET_WM_ICON_NAME = data->videodata->_NET_WM_ICON_NAME;
+#endif
+
+    if (title != NULL) {
+        char *title_locale = SDL_iconv_utf8_locale(title);
+        if (!title_locale) {
+            SDL_OutOfMemory();
+            return;
+        }
+        status = X11_XStringListToTextProperty(&title_locale, 1, &titleprop);
+        SDL_free(title_locale);
+        if (status) {
+            X11_XSetTextProperty(display, data->xwindow, &titleprop, XA_WM_NAME);
+            X11_XFree(titleprop.value);
+        }
+#ifdef X_HAVE_UTF8_STRING
+        if (SDL_X11_HAVE_UTF8) {
+            status =
+                X11_Xutf8TextListToTextProperty(display, (char **) &title, 1,
+                                            XUTF8StringStyle, &titleprop);
+            if (status == Success) {
+                X11_XSetTextProperty(display, data->xwindow, &titleprop,
+                                 _NET_WM_NAME);
+                X11_XFree(titleprop.value);
+            }
+        }
+#endif
+    }
+    if (icon != NULL) {
+        char *icon_locale = SDL_iconv_utf8_locale(icon);
+        if (!icon_locale) {
+            SDL_OutOfMemory();
+            return;
+        }
+        status = X11_XStringListToTextProperty(&icon_locale, 1, &iconprop);
+        SDL_free(icon_locale);
+        if (status) {
+            X11_XSetTextProperty(display, data->xwindow, &iconprop,
+                             XA_WM_ICON_NAME);
+            X11_XFree(iconprop.value);
+        }
+#ifdef X_HAVE_UTF8_STRING
+        if (SDL_X11_HAVE_UTF8) {
+            status =
+                X11_Xutf8TextListToTextProperty(display, (char **) &icon, 1,
+                                            XUTF8StringStyle, &iconprop);
+            if (status == Success) {
+                X11_XSetTextProperty(display, data->xwindow, &iconprop,
+                                 _NET_WM_ICON_NAME);
+                X11_XFree(iconprop.value);
+            }
+        }
+#endif
+    }
+    X11_XFlush(display);
+}
+
+void
+X11_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+    Atom _NET_WM_ICON = data->videodata->_NET_WM_ICON;
+
+    if (icon) {
+        int propsize;
+        long *propdata;
+
+        /* Set the _NET_WM_ICON property */
+        SDL_assert(icon->format->format == SDL_PIXELFORMAT_ARGB8888);
+        propsize = 2 + (icon->w * icon->h);
+        propdata = SDL_malloc(propsize * sizeof(long));
+        if (propdata) {
+            int x, y;
+            Uint32 *src;
+            long *dst;
+
+            propdata[0] = icon->w;
+            propdata[1] = icon->h;
+            dst = &propdata[2];
+            for (y = 0; y < icon->h; ++y) {
+                src = (Uint32*)((Uint8*)icon->pixels + y * icon->pitch);
+                for (x = 0; x < icon->w; ++x) {
+                    *dst++ = *src++;
+                }
+            }
+            X11_XChangeProperty(display, data->xwindow, _NET_WM_ICON, XA_CARDINAL,
+                            32, PropModeReplace, (unsigned char *) propdata,
+                            propsize);
+        }
+        SDL_free(propdata);
+    } else {
+        X11_XDeleteProperty(display, data->xwindow, _NET_WM_ICON);
+    }
+    X11_XFlush(display);
+}
+
+void
+X11_SetWindowPosition(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+
+    X11_XMoveWindow(display, data->xwindow, window->x, window->y);
+    X11_XFlush(display);
+}
+
+void
+X11_SetWindowMinimumSize(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+
+    if (window->flags & SDL_WINDOW_RESIZABLE) {
+         XSizeHints *sizehints = X11_XAllocSizeHints();
+         long userhints;
+
+         X11_XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
+
+         sizehints->min_width = window->min_w;
+         sizehints->min_height = window->min_h;
+         sizehints->flags |= PMinSize;
+
+         X11_XSetWMNormalHints(display, data->xwindow, sizehints);
+
+         X11_XFree(sizehints);
+
+        /* See comment in X11_SetWindowSize. */
+        X11_XResizeWindow(display, data->xwindow, window->w, window->h);
+        X11_XMoveWindow(display, data->xwindow, window->x, window->y);
+        X11_XRaiseWindow(display, data->xwindow);
+    }
+
+    X11_XFlush(display);
+}
+
+void
+X11_SetWindowMaximumSize(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+
+    if (window->flags & SDL_WINDOW_RESIZABLE) {
+         XSizeHints *sizehints = X11_XAllocSizeHints();
+         long userhints;
+
+         X11_XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
+
+         sizehints->max_width = window->max_w;
+         sizehints->max_height = window->max_h;
+         sizehints->flags |= PMaxSize;
+
+         X11_XSetWMNormalHints(display, data->xwindow, sizehints);
+
+         X11_XFree(sizehints);
+
+        /* See comment in X11_SetWindowSize. */
+        X11_XResizeWindow(display, data->xwindow, window->w, window->h);
+        X11_XMoveWindow(display, data->xwindow, window->x, window->y);
+        X11_XRaiseWindow(display, data->xwindow);
+    }
+
+    X11_XFlush(display);
+}
+
+void
+X11_SetWindowSize(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+
+    if (SDL_IsShapedWindow(window)) {
+        X11_ResizeWindowShape(window);
+    }
+    if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
+         /* Apparently, if the X11 Window is set to a 'non-resizable' window, you cannot resize it using the X11_XResizeWindow, thus
+            we must set the size hints to adjust the window size. */
+         XSizeHints *sizehints = X11_XAllocSizeHints();
+         long userhints;
+
+         X11_XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
+
+         sizehints->min_width = sizehints->max_width = window->w;
+         sizehints->min_height = sizehints->max_height = window->h;
+         sizehints->flags |= PMinSize | PMaxSize;
+
+         X11_XSetWMNormalHints(display, data->xwindow, sizehints);
+
+         X11_XFree(sizehints);
+
+        /* From Pierre-Loup:
+           WMs each have their little quirks with that.  When you change the
+           size hints, they get a ConfigureNotify event with the
+           WM_NORMAL_SIZE_HINTS Atom.  They all save the hints then, but they
+           don't all resize the window right away to enforce the new hints.
+
+           Some of them resize only after:
+            - A user-initiated move or resize
+            - A code-initiated move or resize
+            - Hiding & showing window (Unmap & map)
+
+           The following move & resize seems to help a lot of WMs that didn't
+           properly update after the hints were changed. We don't do a
+           hide/show, because there are supposedly subtle problems with doing so
+           and transitioning from windowed to fullscreen in Unity.
+         */
+        X11_XResizeWindow(display, data->xwindow, window->w, window->h);
+        X11_XMoveWindow(display, data->xwindow, window->x, window->y);
+        X11_XRaiseWindow(display, data->xwindow);
+    } else {
+        X11_XResizeWindow(display, data->xwindow, window->w, window->h);
+    }
+
+    X11_XFlush(display);
+}
+
+void
+X11_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered)
+{
+    const SDL_bool focused = ((window->flags & SDL_WINDOW_INPUT_FOCUS) != 0);
+    const SDL_bool visible = ((window->flags & SDL_WINDOW_HIDDEN) == 0);
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *displaydata =
+        (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+    Display *display = data->videodata->display;
+    XEvent event;
+
+    SetWindowBordered(display, displaydata->screen, data->xwindow, bordered);
+    X11_XFlush(display);
+    X11_XIfEvent(display, &event, &isConfigureNotify, (XPointer)&data->xwindow);
+
+    if (visible) {
+        XWindowAttributes attr;
+        do {
+            X11_XSync(display, False);
+            X11_XGetWindowAttributes(display, data->xwindow, &attr);
+        } while (attr.map_state != IsViewable);
+
+        if (focused) {
+            X11_XSetInputFocus(display, data->xwindow, RevertToParent, CurrentTime);
+        }
+    }
+
+    /* make sure these don't make it to the real event queue if they fired here. */
+    X11_XSync(display, False);
+    X11_XCheckIfEvent(display, &event, &isUnmapNotify, (XPointer)&data->xwindow);
+    X11_XCheckIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
+}
+
+void
+X11_ShowWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+    XEvent event;
+
+    if (!X11_IsWindowMapped(_this, window)) {
+        X11_XMapRaised(display, data->xwindow);
+        /* Blocking wait for "MapNotify" event.
+         * We use X11_XIfEvent because pXWindowEvent takes a mask rather than a type,
+         * and XCheckTypedWindowEvent doesn't block */
+        X11_XIfEvent(display, &event, &isMapNotify, (XPointer)&data->xwindow);
+        X11_XFlush(display);
+    }
+}
+
+void
+X11_HideWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *displaydata = (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+    Display *display = data->videodata->display;
+    XEvent event;
+
+    if (X11_IsWindowMapped(_this, window)) {
+        X11_XWithdrawWindow(display, data->xwindow, displaydata->screen);
+        /* Blocking wait for "UnmapNotify" event */
+        X11_XIfEvent(display, &event, &isUnmapNotify, (XPointer)&data->xwindow);
+        X11_XFlush(display);
+    }
+}
+
+static void
+SetWindowActive(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *displaydata =
+        (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+    Display *display = data->videodata->display;
+    Atom _NET_ACTIVE_WINDOW = data->videodata->_NET_ACTIVE_WINDOW;
+
+    if (X11_IsWindowMapped(_this, window)) {
+        XEvent e;
+
+        SDL_zero(e);
+        e.xany.type = ClientMessage;
+        e.xclient.message_type = _NET_ACTIVE_WINDOW;
+        e.xclient.format = 32;
+        e.xclient.window = data->xwindow;
+        e.xclient.data.l[0] = 1;  /* source indication. 1 = application */
+        e.xclient.data.l[1] = CurrentTime;
+        e.xclient.data.l[2] = 0;
+
+        X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0,
+                   SubstructureNotifyMask | SubstructureRedirectMask, &e);
+
+        X11_XFlush(display);
+    }
+}
+
+void
+X11_RaiseWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+
+    X11_XRaiseWindow(display, data->xwindow);
+    SetWindowActive(_this, window);
+    X11_XFlush(display);
+}
+
+static void
+SetWindowMaximized(_THIS, SDL_Window * window, SDL_bool maximized)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *displaydata =
+        (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+    Display *display = data->videodata->display;
+    Atom _NET_WM_STATE = data->videodata->_NET_WM_STATE;
+    Atom _NET_WM_STATE_MAXIMIZED_VERT = data->videodata->_NET_WM_STATE_MAXIMIZED_VERT;
+    Atom _NET_WM_STATE_MAXIMIZED_HORZ = data->videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
+
+    if (maximized) {
+        window->flags |= SDL_WINDOW_MAXIMIZED;
+    } else {
+        window->flags &= ~SDL_WINDOW_MAXIMIZED;
+    }
+
+    if (X11_IsWindowMapped(_this, window)) {
+        XEvent e;
+
+        SDL_zero(e);
+        e.xany.type = ClientMessage;
+        e.xclient.message_type = _NET_WM_STATE;
+        e.xclient.format = 32;
+        e.xclient.window = data->xwindow;
+        e.xclient.data.l[0] =
+            maximized ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE;
+        e.xclient.data.l[1] = _NET_WM_STATE_MAXIMIZED_VERT;
+        e.xclient.data.l[2] = _NET_WM_STATE_MAXIMIZED_HORZ;
+        e.xclient.data.l[3] = 0l;
+
+        X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0,
+                   SubstructureNotifyMask | SubstructureRedirectMask, &e);
+    } else {
+        X11_SetNetWMState(_this, data->xwindow, window->flags);
+    }
+    X11_XFlush(display);
+}
+
+void
+X11_MaximizeWindow(_THIS, SDL_Window * window)
+{
+    SetWindowMaximized(_this, window, SDL_TRUE);
+}
+
+void
+X11_MinimizeWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *displaydata =
+        (SDL_DisplayData *) SDL_GetDisplayForWindow(window)->driverdata;
+    Display *display = data->videodata->display;
+
+    X11_XIconifyWindow(display, data->xwindow, displaydata->screen);
+    X11_XFlush(display);
+}
+
+void
+X11_RestoreWindow(_THIS, SDL_Window * window)
+{
+    SetWindowMaximized(_this, window, SDL_FALSE);
+    X11_ShowWindow(_this, window);
+    SetWindowActive(_this, window);
+}
+
+/* This asks the Window Manager to handle fullscreen for us. Most don't do it right, though. */
+static void
+X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _display, SDL_bool fullscreen)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *displaydata = (SDL_DisplayData *) _display->driverdata;
+    Display *display = data->videodata->display;
+    Atom _NET_WM_STATE = data->videodata->_NET_WM_STATE;
+    Atom _NET_WM_STATE_FULLSCREEN = data->videodata->_NET_WM_STATE_FULLSCREEN;
+
+    if (X11_IsWindowMapped(_this, window)) {
+        XEvent e;
+
+        if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
+            /* Compiz refuses fullscreen toggle if we're not resizable, so update the hints so we
+               can be resized to the fullscreen resolution (or reset so we're not resizable again) */
+            XSizeHints *sizehints = X11_XAllocSizeHints();
+            long flags = 0;
+            X11_XGetWMNormalHints(display, data->xwindow, sizehints, &flags);
+            /* set the resize flags on */
+            if (fullscreen) {
+                /* we are going fullscreen so turn the flags off */
+                sizehints->flags &= ~(PMinSize | PMaxSize);
+            } else {
+                /* Reset the min/max width height to make the window non-resizable again */
+                sizehints->flags |= PMinSize | PMaxSize;
+                sizehints->min_width = sizehints->max_width = window->windowed.w;
+                sizehints->min_height = sizehints->max_height = window->windowed.h;
+            }
+            X11_XSetWMNormalHints(display, data->xwindow, sizehints);
+            X11_XFree(sizehints);
+        }
+
+        SDL_zero(e);
+        e.xany.type = ClientMessage;
+        e.xclient.message_type = _NET_WM_STATE;
+        e.xclient.format = 32;
+        e.xclient.window = data->xwindow;
+        e.xclient.data.l[0] =
+            fullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE;
+        e.xclient.data.l[1] = _NET_WM_STATE_FULLSCREEN;
+        e.xclient.data.l[3] = 0l;
+
+        X11_XSendEvent(display, RootWindow(display, displaydata->screen), 0,
+                   SubstructureNotifyMask | SubstructureRedirectMask, &e);
+    } else {
+        Uint32 flags;
+
+        flags = window->flags;
+        if (fullscreen) {
+            flags |= SDL_WINDOW_FULLSCREEN;
+        } else {
+            flags &= ~SDL_WINDOW_FULLSCREEN;
+        }
+        X11_SetNetWMState(_this, data->xwindow, flags);
+    }
+
+    if (data->visual->class == DirectColor) {
+        if ( fullscreen ) {
+            X11_XInstallColormap(display, data->colormap);
+        } else {
+            X11_XUninstallColormap(display, data->colormap);
+        }
+    }
+
+    X11_XFlush(display);
+}
+
+/* This handles fullscreen itself, outside the Window Manager. */
+static void
+X11_BeginWindowFullscreenLegacy(_THIS, SDL_Window * window, SDL_VideoDisplay * _display)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *displaydata = (SDL_DisplayData *) _display->driverdata;
+    Visual *visual = data->visual;
+    Display *display = data->videodata->display;
+    const int screen = displaydata->screen;
+    Window root = RootWindow(display, screen);
+    const int def_vis = (visual == DefaultVisual(display, screen));
+    unsigned long xattrmask = 0;
+    XSetWindowAttributes xattr;
+    XEvent ev;
+    SDL_Rect rect;
+
+    if ( data->fswindow ) {
+        return;  /* already fullscreen, I hope. */
+    }
+
+    X11_GetDisplayBounds(_this, _display, &rect);
+
+    SDL_zero(xattr);
+    xattr.override_redirect = True;
+    xattrmask |= CWOverrideRedirect;
+    xattr.background_pixel = def_vis ? BlackPixel(display, screen) : 0;
+    xattrmask |= CWBackPixel;
+    xattr.border_pixel = 0;
+    xattrmask |= CWBorderPixel;
+    xattr.colormap = data->colormap;
+    xattrmask |= CWColormap;
+
+    data->fswindow = X11_XCreateWindow(display, root,
+                                   rect.x, rect.y, rect.w, rect.h, 0,
+                                   displaydata->depth, InputOutput,
+                                   visual, xattrmask, &xattr);
+
+    X11_XSelectInput(display, data->fswindow, StructureNotifyMask);
+    X11_XSetWindowBackground(display, data->fswindow, 0);
+    X11_XInstallColormap(display, data->colormap);
+    X11_XClearWindow(display, data->fswindow);
+    X11_XMapRaised(display, data->fswindow);
+
+    /* Make sure the fswindow is in view by warping mouse to the corner */
+    X11_XUngrabPointer(display, CurrentTime);
+    X11_XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
+
+    /* Wait to be mapped, filter Unmap event out if it arrives. */
+    X11_XIfEvent(display, &ev, &isMapNotify, (XPointer)&data->fswindow);
+    X11_XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->fswindow);
+
+#if SDL_VIDEO_DRIVER_X11_XVIDMODE
+    if ( displaydata->use_vidmode ) {
+        X11_XF86VidModeLockModeSwitch(display, screen, True);
+    }
+#endif
+
+    SetWindowBordered(display, displaydata->screen, data->xwindow, SDL_FALSE);
+
+    /* Center actual window within our cover-the-screen window. */
+    X11_XReparentWindow(display, data->xwindow, data->fswindow,
+                    (rect.w - window->w) / 2, (rect.h - window->h) / 2);
+
+    /* Move the mouse to the upper left to make sure it's on-screen */
+    X11_XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
+
+    /* Center mouse in the fullscreen window. */
+    rect.x += (rect.w / 2);
+    rect.y += (rect.h / 2);
+    X11_XWarpPointer(display, None, root, 0, 0, 0, 0, rect.x, rect.y);
+
+    /* Wait to be mapped, filter Unmap event out if it arrives. */
+    X11_XIfEvent(display, &ev, &isMapNotify, (XPointer)&data->xwindow);
+    X11_XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->xwindow);
+
+    SDL_UpdateWindowGrab(window);
+}
+
+static void
+X11_EndWindowFullscreenLegacy(_THIS, SDL_Window * window, SDL_VideoDisplay * _display)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    SDL_DisplayData *displaydata = (SDL_DisplayData *) _display->driverdata;
+    Display *display = data->videodata->display;
+    const int screen = displaydata->screen;
+    Window root = RootWindow(display, screen);
+    Window fswindow = data->fswindow;
+    XEvent ev;
+
+    if (!data->fswindow) {
+        return;  /* already not fullscreen, I hope. */
+    }
+
+    data->fswindow = None;
+
+#if SDL_VIDEO_DRIVER_X11_VIDMODE
+    if ( displaydata->use_vidmode ) {
+        X11_XF86VidModeLockModeSwitch(display, screen, False);
+    }
+#endif
+
+    SDL_UpdateWindowGrab(window);
+
+    X11_XReparentWindow(display, data->xwindow, root, window->x, window->y);
+
+    /* flush these events so they don't confuse normal event handling */
+    X11_XSync(display, False);
+    X11_XCheckIfEvent(display, &ev, &isMapNotify, (XPointer)&data->xwindow);
+    X11_XCheckIfEvent(display, &ev, &isUnmapNotify, (XPointer)&data->xwindow);
+
+    SetWindowBordered(display, screen, data->xwindow,
+                      (window->flags & SDL_WINDOW_BORDERLESS) == 0);
+
+    X11_XWithdrawWindow(display, fswindow, screen);
+
+    /* Wait to be unmapped. */
+    X11_XIfEvent(display, &ev, &isUnmapNotify, (XPointer)&fswindow);
+    X11_XDestroyWindow(display, fswindow);
+}
+
+
+void
+X11_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * _display, SDL_bool fullscreen)
+{
+    /* !!! FIXME: SDL_Hint? */
+    SDL_bool legacy = SDL_FALSE;
+    const char *env = SDL_getenv("SDL_VIDEO_X11_LEGACY_FULLSCREEN");
+    if (env) {
+        legacy = SDL_atoi(env);
+    } else {
+        SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
+        SDL_DisplayData *displaydata = (SDL_DisplayData *) _display->driverdata;
+        if ( displaydata->use_vidmode ) {
+            legacy = SDL_TRUE;  /* the new stuff only works with XRandR. */
+        } else if ( !videodata->net_wm ) {
+            legacy = SDL_TRUE;  /* The window manager doesn't support it */
+        } else {
+            /* !!! FIXME: look at the window manager name, and blacklist certain ones? */
+            /* http://stackoverflow.com/questions/758648/find-the-name-of-the-x-window-manager */
+            legacy = SDL_FALSE;  /* try the new way. */
+        }
+    }
+
+    if (legacy) {
+        if (fullscreen) {
+            X11_BeginWindowFullscreenLegacy(_this, window, _display);
+        } else {
+            X11_EndWindowFullscreenLegacy(_this, window, _display);
+        }
+    } else {
+        X11_SetWindowFullscreenViaWM(_this, window, _display, fullscreen);
+    }
+}
+
+
+int
+X11_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+    Visual *visual = data->visual;
+    Colormap colormap = data->colormap;
+    XColor *colorcells;
+    int ncolors;
+    int rmask, gmask, bmask;
+    int rshift, gshift, bshift;
+    int i;
+
+    if (visual->class != DirectColor) {
+        return SDL_SetError("Window doesn't have DirectColor visual");
+    }
+
+    ncolors = visual->map_entries;
+    colorcells = SDL_malloc(ncolors * sizeof(XColor));
+    if (!colorcells) {
+        return SDL_OutOfMemory();
+    }
+
+    rshift = 0;
+    rmask = visual->red_mask;
+    while (0 == (rmask & 1)) {
+        rshift++;
+        rmask >>= 1;
+    }
+
+    gshift = 0;
+    gmask = visual->green_mask;
+    while (0 == (gmask & 1)) {
+        gshift++;
+        gmask >>= 1;
+    }
+
+    bshift = 0;
+    bmask = visual->blue_mask;
+    while (0 == (bmask & 1)) {
+        bshift++;
+        bmask >>= 1;
+    }
+
+    /* build the color table pixel values */
+    for (i = 0; i < ncolors; i++) {
+        Uint32 rbits = (rmask * i) / (ncolors - 1);
+        Uint32 gbits = (gmask * i) / (ncolors - 1);
+        Uint32 bbits = (bmask * i) / (ncolors - 1);
+        Uint32 pix = (rbits << rshift) | (gbits << gshift) | (bbits << bshift);
+
+        colorcells[i].pixel = pix;
+
+        colorcells[i].red = ramp[(0 * 256) + i];
+        colorcells[i].green = ramp[(1 * 256) + i];
+        colorcells[i].blue = ramp[(2 * 256) + i];
+
+        colorcells[i].flags = DoRed | DoGreen | DoBlue;
+    }
+
+    X11_XStoreColors(display, colormap, colorcells, ncolors);
+    X11_XFlush(display);
+    SDL_free(colorcells);
+
+    return 0;
+}
+
+void
+X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+    SDL_bool oldstyle_fullscreen;
+    SDL_bool grab_keyboard;
+    const char *hint;
+
+    /* ICCCM2.0-compliant window managers can handle fullscreen windows
+       If we're using XVidMode to change resolution we need to confine
+       the cursor so we don't pan around the virtual desktop.
+     */
+    oldstyle_fullscreen = X11_IsWindowLegacyFullscreen(_this, window);
+
+    if (oldstyle_fullscreen || grabbed) {
+        /* Try to grab the mouse */
+        for (;;) {
+            int result =
+                X11_XGrabPointer(display, data->xwindow, True, 0, GrabModeAsync,
+                             GrabModeAsync, data->xwindow, None, CurrentTime);
+            if (result == GrabSuccess) {
+                break;
+            }
+            SDL_Delay(50);
+        }
+
+        /* Raise the window if we grab the mouse */
+        X11_XRaiseWindow(display, data->xwindow);
+
+        /* Now grab the keyboard */
+        hint = SDL_GetHint(SDL_HINT_GRAB_KEYBOARD);
+        if (hint && SDL_atoi(hint)) {
+            grab_keyboard = SDL_TRUE;
+        } else {
+            /* We need to do this with the old style override_redirect
+               fullscreen window otherwise we won't get keyboard focus.
+            */
+            grab_keyboard = oldstyle_fullscreen;
+        }
+        if (grab_keyboard) {
+            X11_XGrabKeyboard(display, data->xwindow, True, GrabModeAsync,
+                          GrabModeAsync, CurrentTime);
+        }
+    } else {
+        X11_XUngrabPointer(display, CurrentTime);
+        X11_XUngrabKeyboard(display, CurrentTime);
+    }
+    X11_XSync(display, False);
+}
+
+void
+X11_DestroyWindow(_THIS, SDL_Window * window)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    window->driverdata = NULL;
+
+    if (data) {
+        SDL_VideoData *videodata = (SDL_VideoData *) data->videodata;
+        Display *display = videodata->display;
+        int numwindows = videodata->numwindows;
+        SDL_WindowData **windowlist = videodata->windowlist;
+        int i;
+
+        if (windowlist) {
+            for (i = 0; i < numwindows; ++i) {
+                if (windowlist[i] && (windowlist[i]->window == window)) {
+                    windowlist[i] = windowlist[numwindows - 1];
+                    windowlist[numwindows - 1] = NULL;
+                    videodata->numwindows--;
+                    break;
+                }
+            }
+        }
+#ifdef X_HAVE_UTF8_STRING
+        if (data->ic) {
+            X11_XDestroyIC(data->ic);
+        }
+#endif
+        if (data->created) {
+            X11_XDestroyWindow(display, data->xwindow);
+            X11_XFlush(display);
+        }
+        SDL_free(data);
+    }
+}
+
+SDL_bool
+X11_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
+{
+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
+    Display *display = data->videodata->display;
+
+    if (info->version.major == SDL_MAJOR_VERSION &&
+        info->version.minor == SDL_MINOR_VERSION) {
+        info->subsystem = SDL_SYSWM_X11;
+        info->info.x11.display = display;
+        info->info.x11.window = data->xwindow;
+        return SDL_TRUE;
+    } else {
+        SDL_SetError("Application not compiled with SDL %d.%d\n",
+                     SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
+        return SDL_FALSE;
+    }
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11window.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11window.h
new file mode 100644
index 000000000..cf0d7f799
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11window.h	
@@ -0,0 +1,99 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11window_h
+#define _SDL_x11window_h
+
+/* We need to queue the focus in/out changes because they may occur during
+   video mode changes and we can respond to them by triggering more mode
+   changes.
+*/
+#define PENDING_FOCUS_IN_TIME   200
+#define PENDING_FOCUS_OUT_TIME  200
+
+#if SDL_VIDEO_OPENGL_EGL   
+#include <EGL/egl.h>
+#endif
+
+typedef enum
+{
+    PENDING_FOCUS_NONE,
+    PENDING_FOCUS_IN,
+    PENDING_FOCUS_OUT
+} PendingFocusEnum;
+
+typedef struct
+{
+    SDL_Window *window;
+    Window xwindow;
+    Window fswindow;  /* used if we can't have the WM handle fullscreen. */
+    Visual *visual;
+    Colormap colormap;
+#ifndef NO_SHARED_MEMORY
+    /* MIT shared memory extension information */
+    SDL_bool use_mitshm;
+    XShmSegmentInfo shminfo;
+#endif
+    XImage *ximage;
+    GC gc;
+    XIC ic;
+    SDL_bool created;
+    PendingFocusEnum pending_focus;
+    Uint32 pending_focus_time;
+    XConfigureEvent last_xconfigure;
+    struct SDL_VideoData *videodata;
+    Atom xdnd_req;
+    Window xdnd_source;
+#if SDL_VIDEO_OPENGL_EGL  
+    EGLSurface egl_surface;
+#endif
+} SDL_WindowData;
+
+extern void X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags);
+extern Uint32 X11_GetNetWMState(_THIS, Window xwindow);
+
+extern int X11_CreateWindow(_THIS, SDL_Window * window);
+extern int X11_CreateWindowFrom(_THIS, SDL_Window * window, const void *data);
+extern char *X11_GetWindowTitle(_THIS, Window xwindow);
+extern void X11_SetWindowTitle(_THIS, SDL_Window * window);
+extern void X11_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
+extern void X11_SetWindowPosition(_THIS, SDL_Window * window);
+extern void X11_SetWindowMinimumSize(_THIS, SDL_Window * window);
+extern void X11_SetWindowMaximumSize(_THIS, SDL_Window * window);
+extern void X11_SetWindowSize(_THIS, SDL_Window * window);
+extern void X11_ShowWindow(_THIS, SDL_Window * window);
+extern void X11_HideWindow(_THIS, SDL_Window * window);
+extern void X11_RaiseWindow(_THIS, SDL_Window * window);
+extern void X11_MaximizeWindow(_THIS, SDL_Window * window);
+extern void X11_MinimizeWindow(_THIS, SDL_Window * window);
+extern void X11_RestoreWindow(_THIS, SDL_Window * window);
+extern void X11_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered);
+extern void X11_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen);
+extern int X11_SetWindowGammaRamp(_THIS, SDL_Window * window, const Uint16 * ramp);
+extern void X11_SetWindowGrab(_THIS, SDL_Window * window, SDL_bool grabbed);
+extern void X11_DestroyWindow(_THIS, SDL_Window * window);
+extern SDL_bool X11_GetWindowWMInfo(_THIS, SDL_Window * window,
+                                    struct SDL_SysWMinfo *info);
+
+#endif /* _SDL_x11window_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11xinput2.c b/Source/3rd Party/sdl/src/video/x11/SDL_x11xinput2.c
new file mode 100644
index 000000000..7c149922f
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11xinput2.c	
@@ -0,0 +1,260 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+#include "SDL_x11video.h"
+#include "SDL_x11xinput2.h"
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_touch_c.h"
+
+#define MAX_AXIS 16
+
+#if SDL_VIDEO_DRIVER_X11_XINPUT2
+static int xinput2_initialized = 0;
+
+#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+static int xinput2_multitouch_supported = 0;
+#endif
+
+/* Opcode returned X11_XQueryExtension
+ * It will be used in event processing
+ * to know that the event came from
+ * this extension */
+static int xinput2_opcode;
+
+static void parse_valuators(const double *input_values,unsigned char *mask,int mask_len,
+                            double *output_values,int output_values_len) {
+    int i = 0,z = 0;
+    int top = mask_len * 8;
+    if (top > MAX_AXIS)
+        top = MAX_AXIS;
+
+    SDL_memset(output_values,0,output_values_len * sizeof(double));
+    for (; i < top && z < output_values_len; i++) {
+        if (XIMaskIsSet(mask, i)) {
+            const int value = (int) *input_values;
+            output_values[z] = value;
+            input_values++;
+        }
+        z++;
+    }
+}
+
+static int
+query_xinput2_version(Display *display, int major, int minor)
+{
+    /* We don't care if this fails, so long as it sets major/minor on it's way out the door. */
+    X11_XIQueryVersion(display, &major, &minor);
+    return ((major * 1000) + minor);
+}
+
+static SDL_bool
+xinput2_version_atleast(const int version, const int wantmajor, const int wantminor)
+{
+    return ( version >= ((wantmajor * 1000) + wantminor) );
+}
+#endif /* SDL_VIDEO_DRIVER_X11_XINPUT2 */
+
+void
+X11_InitXinput2(_THIS)
+{
+#if SDL_VIDEO_DRIVER_X11_XINPUT2
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    int version = 0;
+    XIEventMask eventmask;
+    unsigned char mask[3] = { 0,0,0 };
+    int event, err;
+
+    /*
+    * Initialize XInput 2
+    * According to http://who-t.blogspot.com/2009/05/xi2-recipes-part-1.html its better
+    * to inform Xserver what version of Xinput we support.The server will store the version we support.
+    * "As XI2 progresses it becomes important that you use this call as the server may treat the client
+    * differently depending on the supported version".
+    *
+    * FIXME:event and err are not needed but if not passed X11_XQueryExtension returns SegmentationFault
+    */
+    if (!SDL_X11_HAVE_XINPUT2 ||
+        !X11_XQueryExtension(data->display, "XInputExtension", &xinput2_opcode, &event, &err)) {
+        return; /* X server does not have XInput at all */
+    }
+
+    /* We need at least 2.2 for Multitouch, 2.0 otherwise. */
+    version = query_xinput2_version(data->display, 2, 2);
+    if (!xinput2_version_atleast(version, 2, 0)) {
+        return; /* X server does not support the version we want at all. */
+    }
+
+    xinput2_initialized = 1;
+
+#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH  /* Multitouch needs XInput 2.2 */
+    xinput2_multitouch_supported = xinput2_version_atleast(version, 2, 2);
+#endif
+
+    /* Enable  Raw motion events for this display */
+    eventmask.deviceid = XIAllMasterDevices;
+    eventmask.mask_len = sizeof(mask);
+    eventmask.mask = mask;
+
+    XISetMask(mask, XI_RawMotion);
+
+    if (X11_XISelectEvents(data->display,DefaultRootWindow(data->display),&eventmask,1) != Success) {
+        return;
+    }
+#endif
+}
+
+int
+X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie)
+{
+#if SDL_VIDEO_DRIVER_X11_XINPUT2
+    if(cookie->extension != xinput2_opcode) {
+        return 0;
+    }
+    switch(cookie->evtype) {
+        case XI_RawMotion: {
+            const XIRawEvent *rawev = (const XIRawEvent*)cookie->data;
+            SDL_Mouse *mouse = SDL_GetMouse();
+            double relative_cords[2];
+
+            if (!mouse->relative_mode || mouse->relative_mode_warp) {
+                return 0;
+            }
+
+            parse_valuators(rawev->raw_values,rawev->valuators.mask,
+                            rawev->valuators.mask_len,relative_cords,2);
+            SDL_SendMouseMotion(mouse->focus,mouse->mouseID,1,(int)relative_cords[0],(int)relative_cords[1]);
+            return 1;
+            }
+            break;
+#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+        case XI_TouchBegin: {
+            const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data;
+            SDL_SendTouch(xev->sourceid,xev->detail,
+                      SDL_TRUE, xev->event_x, xev->event_y, 1.0);
+            return 1;
+            }
+            break;
+        case XI_TouchEnd: {
+            const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data;
+            SDL_SendTouch(xev->sourceid,xev->detail,
+                      SDL_FALSE, xev->event_x, xev->event_y, 1.0);
+            return 1;
+            }
+            break;
+        case XI_TouchUpdate: {
+            const XIDeviceEvent *xev = (const XIDeviceEvent *) cookie->data;
+            SDL_SendTouchMotion(xev->sourceid,xev->detail,
+                                xev->event_x, xev->event_y, 1.0);
+            return 1;
+            }
+            break;
+#endif
+    }
+#endif
+    return 0;
+}
+
+void
+X11_InitXinput2Multitouch(_THIS)
+{
+#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    XIDeviceInfo *info;
+    int ndevices,i,j;
+    info = X11_XIQueryDevice(data->display, XIAllMasterDevices, &ndevices);
+
+    for (i = 0; i < ndevices; i++) {
+        XIDeviceInfo *dev = &info[i];
+        for (j = 0; j < dev->num_classes; j++) {
+            SDL_TouchID touchId;
+            XIAnyClassInfo *class = dev->classes[j];
+            XITouchClassInfo *t = (XITouchClassInfo*)class;
+
+            /* Only touch devices */
+            if (class->type != XITouchClass)
+                continue;
+
+            touchId = t->sourceid;
+            if (!SDL_GetTouch(touchId)) {
+                SDL_AddTouch(touchId, dev->name);
+            }
+        }
+    }
+    X11_XIFreeDeviceInfo(info);
+#endif
+}
+
+void
+X11_Xinput2SelectTouch(_THIS, SDL_Window *window)
+{
+#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+    SDL_VideoData *data = NULL;
+    XIEventMask eventmask;
+    unsigned char mask[3] = { 0,0,0 };
+    SDL_WindowData *window_data = NULL;
+    
+    if (!X11_Xinput2IsMultitouchSupported()) {
+        return;
+    }
+
+    data = (SDL_VideoData *) _this->driverdata;
+    window_data = (SDL_WindowData*)window->driverdata;
+
+    eventmask.deviceid = XIAllMasterDevices;
+    eventmask.mask_len = sizeof(mask);
+    eventmask.mask = mask;
+
+    XISetMask(mask, XI_TouchBegin);
+    XISetMask(mask, XI_TouchUpdate);
+    XISetMask(mask, XI_TouchEnd);
+
+    X11_XISelectEvents(data->display,window_data->xwindow,&eventmask,1);
+#endif
+}
+
+
+int
+X11_Xinput2IsInitialized()
+{
+#if SDL_VIDEO_DRIVER_X11_XINPUT2
+    return xinput2_initialized;
+#else
+    return 0;
+#endif
+}
+
+int
+X11_Xinput2IsMultitouchSupported()
+{
+#if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+    return xinput2_initialized && xinput2_multitouch_supported;
+#else
+    return 0;
+#endif
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/SDL_x11xinput2.h b/Source/3rd Party/sdl/src/video/x11/SDL_x11xinput2.h
new file mode 100644
index 000000000..3e7178cb9
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/SDL_x11xinput2.h	
@@ -0,0 +1,42 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_x11xinput2_h
+#define _SDL_x11xinput2_h
+
+#ifndef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
+/* Define XGenericEventCookie as forward declaration when
+ *xinput2 is not available in order to compile */
+struct XGenericEventCookie;
+typedef struct XGenericEventCookie XGenericEventCookie;
+#endif
+
+extern void X11_InitXinput2(_THIS);
+extern void X11_InitXinput2Multitouch(_THIS);
+extern int X11_HandleXinput2Event(SDL_VideoData *videodata,XGenericEventCookie *cookie);
+extern int X11_Xinput2IsInitialized(void);
+extern int X11_Xinput2IsMultitouchSupported(void);
+extern void X11_Xinput2SelectTouch(_THIS, SDL_Window *window);
+
+#endif /* _SDL_x11xinput2_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/3rd Party/sdl/src/video/x11/edid-parse.c b/Source/3rd Party/sdl/src/video/x11/edid-parse.c
new file mode 100644
index 000000000..8608bf254
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/edid-parse.c	
@@ -0,0 +1,752 @@
+/*
+ * Copyright 2007 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Author: Soren Sandmann <sandmann@redhat.com> */
+
+#include "edid.h"
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <stdio.h>
+
+#define TRUE 1
+#define FALSE 0
+
+static int
+get_bit (int in, int bit)
+{
+    return (in & (1 << bit)) >> bit;
+}
+
+static int
+get_bits (int in, int begin, int end)
+{
+    int mask = (1 << (end - begin + 1)) - 1;
+    
+    return (in >> begin) & mask;
+}
+
+static int
+decode_header (const uchar *edid)
+{
+    if (memcmp (edid, "\x00\xff\xff\xff\xff\xff\xff\x00", 8) == 0)
+	return TRUE;
+    return FALSE;
+}
+
+static int
+decode_vendor_and_product_identification (const uchar *edid, MonitorInfo *info)
+{
+    int is_model_year;
+    
+    /* Manufacturer Code */
+    info->manufacturer_code[0]  = get_bits (edid[0x08], 2, 6);
+    info->manufacturer_code[1]  = get_bits (edid[0x08], 0, 1) << 3;
+    info->manufacturer_code[1] |= get_bits (edid[0x09], 5, 7);
+    info->manufacturer_code[2]  = get_bits (edid[0x09], 0, 4);
+    info->manufacturer_code[3]  = '\0';
+    
+    info->manufacturer_code[0] += 'A' - 1;
+    info->manufacturer_code[1] += 'A' - 1;
+    info->manufacturer_code[2] += 'A' - 1;
+
+    /* Product Code */
+    info->product_code = edid[0x0b] << 8 | edid[0x0a];
+
+    /* Serial Number */
+    info->serial_number =
+	edid[0x0c] | edid[0x0d] << 8 | edid[0x0e] << 16 | edid[0x0f] << 24;
+
+    /* Week and Year */
+    is_model_year = FALSE;
+    switch (edid[0x10])
+    {
+    case 0x00:
+	info->production_week = -1;
+	break;
+
+    case 0xff:
+	info->production_week = -1;
+	is_model_year = TRUE;
+	break;
+
+    default:
+	info->production_week = edid[0x10];
+	break;
+    }
+
+    if (is_model_year)
+    {
+	info->production_year = -1;
+	info->model_year = 1990 + edid[0x11];
+    }
+    else
+    {
+	info->production_year = 1990 + edid[0x11];
+	info->model_year = -1;
+    }
+
+    return TRUE;
+}
+
+static int
+decode_edid_version (const uchar *edid, MonitorInfo *info)
+{
+    info->major_version = edid[0x12];
+    info->minor_version = edid[0x13];
+
+    return TRUE;
+}
+
+static int
+decode_display_parameters (const uchar *edid, MonitorInfo *info)
+{
+    /* Digital vs Analog */
+    info->is_digital = get_bit (edid[0x14], 7);
+
+    if (info->is_digital)
+    {
+	int bits;
+	
+	static const int bit_depth[8] =
+	{
+	    -1, 6, 8, 10, 12, 14, 16, -1
+	};
+
+	static const Interface interfaces[6] =
+	{
+	    UNDEFINED, DVI, HDMI_A, HDMI_B, MDDI, DISPLAY_PORT
+	};
+
+	bits = get_bits (edid[0x14], 4, 6);
+	info->digital.bits_per_primary = bit_depth[bits];
+
+	bits = get_bits (edid[0x14], 0, 3);
+	
+	if (bits <= 5)
+	    info->digital.interface = interfaces[bits];
+	else
+	    info->digital.interface = UNDEFINED;
+    }
+    else
+    {
+	int bits = get_bits (edid[0x14], 5, 6);
+	
+	static const double levels[][3] =
+	{
+	    { 0.7,   0.3,    1.0 },
+	    { 0.714, 0.286,  1.0 },
+	    { 1.0,   0.4,    1.4 },
+	    { 0.7,   0.0,    0.7 },
+	};
+
+	info->analog.video_signal_level = levels[bits][0];
+	info->analog.sync_signal_level = levels[bits][1];
+	info->analog.total_signal_level = levels[bits][2];
+
+	info->analog.blank_to_black = get_bit (edid[0x14], 4);
+
+	info->analog.separate_hv_sync = get_bit (edid[0x14], 3);
+	info->analog.composite_sync_on_h = get_bit (edid[0x14], 2);
+	info->analog.composite_sync_on_green = get_bit (edid[0x14], 1);
+
+	info->analog.serration_on_vsync = get_bit (edid[0x14], 0);
+    }
+
+    /* Screen Size / Aspect Ratio */
+    if (edid[0x15] == 0 && edid[0x16] == 0)
+    {
+	info->width_mm = -1;
+	info->height_mm = -1;
+	info->aspect_ratio = -1.0;
+    }
+    else if (edid[0x16] == 0)
+    {
+	info->width_mm = -1;
+	info->height_mm = -1; 
+	info->aspect_ratio = 100.0 / (edid[0x15] + 99);
+    }
+    else if (edid[0x15] == 0)
+    {
+	info->width_mm = -1;
+	info->height_mm = -1;
+	info->aspect_ratio = 100.0 / (edid[0x16] + 99);
+	info->aspect_ratio = 1/info->aspect_ratio; /* portrait */
+    }
+    else
+    {
+	info->width_mm = 10 * edid[0x15];
+	info->height_mm = 10 * edid[0x16];
+    }
+
+    /* Gamma */
+    if (edid[0x17] == 0xFF)
+	info->gamma = -1.0;
+    else
+	info->gamma = (edid[0x17] + 100.0) / 100.0;
+
+    /* Features */
+    info->standby = get_bit (edid[0x18], 7);
+    info->suspend = get_bit (edid[0x18], 6);
+    info->active_off = get_bit (edid[0x18], 5);
+
+    if (info->is_digital)
+    {
+	info->digital.rgb444 = TRUE;
+	if (get_bit (edid[0x18], 3))
+	    info->digital.ycrcb444 = 1;
+	if (get_bit (edid[0x18], 4))
+	    info->digital.ycrcb422 = 1;
+    }
+    else
+    {
+	int bits = get_bits (edid[0x18], 3, 4);
+	ColorType color_type[4] =
+	{
+	    MONOCHROME, RGB, OTHER_COLOR, UNDEFINED_COLOR
+	};
+
+	info->analog.color_type = color_type[bits];
+    }
+
+    info->srgb_is_standard = get_bit (edid[0x18], 2);
+
+    /* In 1.3 this is called "has preferred timing" */
+    info->preferred_timing_includes_native = get_bit (edid[0x18], 1);
+
+    /* FIXME: In 1.3 this indicates whether the monitor accepts GTF */
+    info->continuous_frequency = get_bit (edid[0x18], 0);
+    return TRUE;
+}
+
+static double
+decode_fraction (int high, int low)
+{
+    double result = 0.0;
+    int i;
+
+    high = (high << 2) | low;
+
+    for (i = 0; i < 10; ++i)
+	result += get_bit (high, i) * pow (2, i - 10);
+
+    return result;
+}
+
+static int
+decode_color_characteristics (const uchar *edid, MonitorInfo *info)
+{
+    info->red_x = decode_fraction (edid[0x1b], get_bits (edid[0x19], 6, 7));
+    info->red_y = decode_fraction (edid[0x1c], get_bits (edid[0x19], 5, 4));
+    info->green_x = decode_fraction (edid[0x1d], get_bits (edid[0x19], 2, 3));
+    info->green_y = decode_fraction (edid[0x1e], get_bits (edid[0x19], 0, 1));
+    info->blue_x = decode_fraction (edid[0x1f], get_bits (edid[0x1a], 6, 7));
+    info->blue_y = decode_fraction (edid[0x20], get_bits (edid[0x1a], 4, 5));
+    info->white_x = decode_fraction (edid[0x21], get_bits (edid[0x1a], 2, 3));
+    info->white_y = decode_fraction (edid[0x22], get_bits (edid[0x1a], 0, 1));
+
+    return TRUE;
+}
+
+static int
+decode_established_timings (const uchar *edid, MonitorInfo *info)
+{
+    static const Timing established[][8] = 
+    {
+	{
+	    { 800, 600, 60 },
+	    { 800, 600, 56 },
+	    { 640, 480, 75 },
+	    { 640, 480, 72 },
+	    { 640, 480, 67 },
+	    { 640, 480, 60 },
+	    { 720, 400, 88 },
+	    { 720, 400, 70 }
+	},
+	{
+	    { 1280, 1024, 75 },
+	    { 1024, 768, 75 },
+	    { 1024, 768, 70 },
+	    { 1024, 768, 60 },
+	    { 1024, 768, 87 },
+	    { 832, 624, 75 },
+	    { 800, 600, 75 },
+	    { 800, 600, 72 }
+	},
+	{
+	    { 0, 0, 0 },
+	    { 0, 0, 0 },
+	    { 0, 0, 0 },
+	    { 0, 0, 0 },
+	    { 0, 0, 0 },
+	    { 0, 0, 0 },
+	    { 0, 0, 0 },
+	    { 1152, 870, 75 }
+	},
+    };
+
+    int i, j, idx;
+
+    idx = 0;
+    for (i = 0; i < 3; ++i)
+    {
+	for (j = 0; j < 8; ++j)
+	{
+	    int byte = edid[0x23 + i];
+
+	    if (get_bit (byte, j) && established[i][j].frequency != 0)
+		info->established[idx++] = established[i][j];
+	}
+    }
+    return TRUE;
+}
+
+static int
+decode_standard_timings (const uchar *edid, MonitorInfo *info)
+{
+    int i;
+    
+    for (i = 0; i < 8; i++)
+    {
+	int first = edid[0x26 + 2 * i];
+	int second = edid[0x27 + 2 * i];
+
+	if (first != 0x01 && second != 0x01)
+	{
+	    int w = 8 * (first + 31);
+	    int h = 0;
+
+	    switch (get_bits (second, 6, 7))
+	    {
+	    case 0x00: h = (w / 16) * 10; break;
+	    case 0x01: h = (w / 4) * 3; break;
+	    case 0x02: h = (w / 5) * 4; break;
+	    case 0x03: h = (w / 16) * 9; break;
+	    }
+
+	    info->standard[i].width = w;
+	    info->standard[i].height = h;
+	    info->standard[i].frequency = get_bits (second, 0, 5) + 60;
+	}
+    }
+    
+    return TRUE;
+}
+
+static void
+decode_lf_string (const uchar *s, int n_chars, char *result)
+{
+    int i;
+    for (i = 0; i < n_chars; ++i)
+    {
+	if (s[i] == 0x0a)
+	{
+	    *result++ = '\0';
+	    break;
+	}
+	else if (s[i] == 0x00)
+	{
+	    /* Convert embedded 0's to spaces */
+	    *result++ = ' ';
+	}
+	else
+	{
+	    *result++ = s[i];
+	}
+    }
+}
+
+static void
+decode_display_descriptor (const uchar *desc,
+			   MonitorInfo *info)
+{
+    switch (desc[0x03])
+    {
+    case 0xFC:
+	decode_lf_string (desc + 5, 13, info->dsc_product_name);
+	break;
+    case 0xFF:
+	decode_lf_string (desc + 5, 13, info->dsc_serial_number);
+	break;
+    case 0xFE:
+	decode_lf_string (desc + 5, 13, info->dsc_string);
+	break;
+    case 0xFD:
+	/* Range Limits */
+	break;
+    case 0xFB:
+	/* Color Point */
+	break;
+    case 0xFA:
+	/* Timing Identifications */
+	break;
+    case 0xF9:
+	/* Color Management */
+	break;
+    case 0xF8:
+	/* Timing Codes */
+	break;
+    case 0xF7:
+	/* Established Timings */
+	break;
+    case 0x10:
+	break;
+    }
+}
+
+static void
+decode_detailed_timing (const uchar *timing,
+			DetailedTiming *detailed)
+{
+    int bits;
+    StereoType stereo[] =
+    {
+	NO_STEREO, NO_STEREO, FIELD_RIGHT, FIELD_LEFT,
+	TWO_WAY_RIGHT_ON_EVEN, TWO_WAY_LEFT_ON_EVEN,
+	FOUR_WAY_INTERLEAVED, SIDE_BY_SIDE
+    };
+    
+    detailed->pixel_clock = (timing[0x00] | timing[0x01] << 8) * 10000;
+    detailed->h_addr = timing[0x02] | ((timing[0x04] & 0xf0) << 4);
+    detailed->h_blank = timing[0x03] | ((timing[0x04] & 0x0f) << 8);
+    detailed->v_addr = timing[0x05] | ((timing[0x07] & 0xf0) << 4);
+    detailed->v_blank = timing[0x06] | ((timing[0x07] & 0x0f) << 8);
+    detailed->h_front_porch = timing[0x08] | get_bits (timing[0x0b], 6, 7) << 8;
+    detailed->h_sync = timing[0x09] | get_bits (timing[0x0b], 4, 5) << 8;
+    detailed->v_front_porch =
+	get_bits (timing[0x0a], 4, 7) | get_bits (timing[0x0b], 2, 3) << 4;
+    detailed->v_sync =
+	get_bits (timing[0x0a], 0, 3) | get_bits (timing[0x0b], 0, 1) << 4;
+    detailed->width_mm =  timing[0x0c] | get_bits (timing[0x0e], 4, 7) << 8;
+    detailed->height_mm = timing[0x0d] | get_bits (timing[0x0e], 0, 3) << 8;
+    detailed->right_border = timing[0x0f];
+    detailed->top_border = timing[0x10];
+
+    detailed->interlaced = get_bit (timing[0x11], 7);
+
+    /* Stereo */
+    bits = get_bits (timing[0x11], 5, 6) << 1 | get_bit (timing[0x11], 0);
+    detailed->stereo = stereo[bits];
+
+    /* Sync */
+    bits = timing[0x11];
+
+    detailed->digital_sync = get_bit (bits, 4);
+    if (detailed->digital_sync)
+    {
+	detailed->digital.composite = !get_bit (bits, 3);
+
+	if (detailed->digital.composite)
+	{
+	    detailed->digital.serrations = get_bit (bits, 2);
+	    detailed->digital.negative_vsync = FALSE;
+	}
+	else
+	{
+	    detailed->digital.serrations = FALSE;
+	    detailed->digital.negative_vsync = !get_bit (bits, 2);
+	}
+
+	detailed->digital.negative_hsync = !get_bit (bits, 0);
+    }
+    else
+    {
+	detailed->analog.bipolar = get_bit (bits, 3);
+	detailed->analog.serrations = get_bit (bits, 2);
+	detailed->analog.sync_on_green = !get_bit (bits, 1);
+    }
+}
+
+static int
+decode_descriptors (const uchar *edid, MonitorInfo *info)
+{
+    int i;
+    int timing_idx;
+    
+    timing_idx = 0;
+    
+    for (i = 0; i < 4; ++i)
+    {
+	int index = 0x36 + i * 18;
+
+	if (edid[index + 0] == 0x00 && edid[index + 1] == 0x00)
+	{
+	    decode_display_descriptor (edid + index, info);
+	}
+	else
+	{
+	    decode_detailed_timing (
+		edid + index, &(info->detailed_timings[timing_idx++]));
+	}
+    }
+
+    info->n_detailed_timings = timing_idx;
+
+    return TRUE;
+}
+
+static void
+decode_check_sum (const uchar *edid,
+		  MonitorInfo *info)
+{
+    int i;
+    uchar check = 0;
+
+    for (i = 0; i < 128; ++i)
+	check += edid[i];
+
+    info->checksum = check;
+}
+
+MonitorInfo *
+decode_edid (const uchar *edid)
+{
+    MonitorInfo *info = calloc (1, sizeof (MonitorInfo));
+
+    decode_check_sum (edid, info);
+    
+    if (!decode_header (edid) ||
+        !decode_vendor_and_product_identification (edid, info) ||
+        !decode_edid_version (edid, info) ||
+        !decode_display_parameters (edid, info) ||
+        !decode_color_characteristics (edid, info) ||
+        !decode_established_timings (edid, info) ||
+        !decode_standard_timings (edid, info) ||
+        !decode_descriptors (edid, info)) {
+        free(info);
+	return NULL;
+    }
+    
+    return info;
+}
+
+static const char *
+yesno (int v)
+{
+    return v? "yes" : "no";
+}
+
+void
+dump_monitor_info (MonitorInfo *info)
+{
+    char *s;
+    int i;
+    
+    printf ("Checksum: %d (%s)\n",
+	    info->checksum, info->checksum? "incorrect" : "correct");
+    printf ("Manufacturer Code: %s\n", info->manufacturer_code);
+    printf ("Product Code: 0x%x\n", info->product_code);
+    printf ("Serial Number: %u\n", info->serial_number);
+    
+    if (info->production_week != -1)
+	printf ("Production Week: %d\n", info->production_week);
+    else
+	printf ("Production Week: unspecified\n");
+    
+    if (info->production_year != -1)
+	printf ("Production Year: %d\n", info->production_year);
+    else
+	printf ("Production Year: unspecified\n");
+    
+    if (info->model_year != -1)
+	printf ("Model Year: %d\n", info->model_year);
+    else
+	printf ("Model Year: unspecified\n");
+    
+    printf ("EDID revision: %d.%d\n", info->major_version, info->minor_version);
+    
+    printf ("Display is %s\n", info->is_digital? "digital" : "analog");
+    if (info->is_digital)
+    {
+	const char *interface;
+	if (info->digital.bits_per_primary != -1)
+	    printf ("Bits Per Primary: %d\n", info->digital.bits_per_primary);
+	else
+	    printf ("Bits Per Primary: undefined\n");
+	
+	switch (info->digital.interface)
+	{
+	case DVI: interface = "DVI"; break;
+	case HDMI_A: interface = "HDMI-a"; break;
+	case HDMI_B: interface = "HDMI-b"; break;
+	case MDDI: interface = "MDDI"; break;
+	case DISPLAY_PORT: interface = "DisplayPort"; break;
+	case UNDEFINED: interface = "undefined"; break;
+	default: interface = "unknown"; break;
+	}
+	printf ("Interface: %s\n", interface);
+	
+	printf ("RGB 4:4:4: %s\n", yesno (info->digital.rgb444));
+	printf ("YCrCb 4:4:4: %s\n", yesno (info->digital.ycrcb444));
+	printf ("YCrCb 4:2:2: %s\n", yesno (info->digital.ycrcb422));
+    }
+    else
+    {
+	printf ("Video Signal Level: %f\n", info->analog.video_signal_level);
+	printf ("Sync Signal Level: %f\n", info->analog.sync_signal_level);
+	printf ("Total Signal Level: %f\n", info->analog.total_signal_level);
+	
+	printf ("Blank to Black: %s\n",
+		yesno (info->analog.blank_to_black));
+	printf ("Separate HV Sync: %s\n",
+		yesno (info->analog.separate_hv_sync));
+	printf ("Composite Sync on H: %s\n",
+		yesno (info->analog.composite_sync_on_h));
+	printf ("Serration on VSync: %s\n",
+		yesno (info->analog.serration_on_vsync));
+	
+	switch (info->analog.color_type)
+	{
+	case UNDEFINED_COLOR: s = "undefined"; break;
+	case MONOCHROME: s = "monochrome"; break;
+	case RGB: s = "rgb"; break;
+	case OTHER_COLOR: s = "other color"; break;
+	default: s = "unknown"; break;
+	};
+	
+	printf ("Color: %s\n", s);
+    }
+    
+    if (info->width_mm == -1)
+	printf ("Width: undefined\n");
+    else
+	printf ("Width: %d mm\n", info->width_mm);
+    
+    if (info->height_mm == -1)
+	printf ("Height: undefined\n");
+    else
+	printf ("Height: %d mm\n", info->height_mm);
+    
+    if (info->aspect_ratio > 0)
+	printf ("Aspect Ratio: %f\n", info->aspect_ratio);
+    else
+	printf ("Aspect Ratio: undefined\n");
+    
+    if (info->gamma >= 0)
+	printf ("Gamma: %f\n", info->gamma);
+    else
+	printf ("Gamma: undefined\n");
+    
+    printf ("Standby: %s\n", yesno (info->standby));
+    printf ("Suspend: %s\n", yesno (info->suspend));
+    printf ("Active Off: %s\n", yesno (info->active_off));
+    
+    printf ("SRGB is Standard: %s\n", yesno (info->srgb_is_standard));
+    printf ("Preferred Timing Includes Native: %s\n",
+	    yesno (info->preferred_timing_includes_native));
+    printf ("Continuous Frequency: %s\n", yesno (info->continuous_frequency));
+    
+    printf ("Red X: %f\n", info->red_x);
+    printf ("Red Y: %f\n", info->red_y);
+    printf ("Green X: %f\n", info->green_x);
+    printf ("Green Y: %f\n", info->green_y);
+    printf ("Blue X: %f\n", info->blue_x);
+    printf ("Blue Y: %f\n", info->blue_y);
+    printf ("White X: %f\n", info->white_x);
+    printf ("White Y: %f\n", info->white_y);
+    
+    printf ("Established Timings:\n");
+    
+    for (i = 0; i < 24; ++i)
+    {
+	Timing *timing = &(info->established[i]);
+	
+	if (timing->frequency == 0)
+	    break;
+	
+	printf ("  %d x %d @ %d Hz\n",
+		timing->width, timing->height, timing->frequency);
+	
+    }
+    
+    printf ("Standard Timings:\n");
+    for (i = 0; i < 8; ++i)
+    {
+	Timing *timing = &(info->standard[i]);
+	
+	if (timing->frequency == 0)
+	    break;
+	
+	printf ("  %d x %d @ %d Hz\n",
+		timing->width, timing->height, timing->frequency);
+    }
+    
+    for (i = 0; i < info->n_detailed_timings; ++i)
+    {
+	DetailedTiming *timing = &(info->detailed_timings[i]);
+	const char *s;
+	
+	printf ("Timing%s: \n",
+		(i == 0 && info->preferred_timing_includes_native)?
+		" (Preferred)" : "");
+	printf ("  Pixel Clock: %d\n", timing->pixel_clock);
+	printf ("  H Addressable: %d\n", timing->h_addr);
+	printf ("  H Blank: %d\n", timing->h_blank);
+	printf ("  H Front Porch: %d\n", timing->h_front_porch);
+	printf ("  H Sync: %d\n", timing->h_sync);
+	printf ("  V Addressable: %d\n", timing->v_addr);
+	printf ("  V Blank: %d\n", timing->v_blank);
+	printf ("  V Front Porch: %d\n", timing->v_front_porch);
+	printf ("  V Sync: %d\n", timing->v_sync);
+	printf ("  Width: %d mm\n", timing->width_mm);
+	printf ("  Height: %d mm\n", timing->height_mm);
+	printf ("  Right Border: %d\n", timing->right_border);
+	printf ("  Top Border: %d\n", timing->top_border);
+	switch (timing->stereo)
+	{
+	default:
+	case NO_STEREO:   s = "No Stereo"; break;
+	case FIELD_RIGHT: s = "Field Sequential, Right on Sync"; break;
+	case FIELD_LEFT:  s = "Field Sequential, Left on Sync"; break;
+	case TWO_WAY_RIGHT_ON_EVEN: s = "Two-way, Right on Even"; break;
+	case TWO_WAY_LEFT_ON_EVEN:  s = "Two-way, Left on Even"; break;
+	case FOUR_WAY_INTERLEAVED:  s = "Four-way Interleaved"; break;
+	case SIDE_BY_SIDE:          s = "Side-by-Side"; break;
+	}
+	printf ("  Stereo: %s\n", s);
+	
+	if (timing->digital_sync)
+	{
+	    printf ("  Digital Sync:\n");
+	    printf ("    composite: %s\n", yesno (timing->digital.composite));
+	    printf ("    serrations: %s\n", yesno (timing->digital.serrations));
+	    printf ("    negative vsync: %s\n",
+		    yesno (timing->digital.negative_vsync));
+	    printf ("    negative hsync: %s\n",
+		    yesno (timing->digital.negative_hsync));
+	}
+	else
+	{
+	    printf ("  Analog Sync:\n");
+	    printf ("    bipolar: %s\n", yesno (timing->analog.bipolar));
+	    printf ("    serrations: %s\n", yesno (timing->analog.serrations));
+	    printf ("    sync on green: %s\n", yesno (
+			timing->analog.sync_on_green));
+	}
+    }
+    
+    printf ("Detailed Product information:\n");
+    printf ("  Product Name: %s\n", info->dsc_product_name);
+    printf ("  Serial Number: %s\n", info->dsc_serial_number);
+    printf ("  Unspecified String: %s\n", info->dsc_string);
+}
+
diff --git a/Source/3rd Party/sdl/src/video/x11/edid.h b/Source/3rd Party/sdl/src/video/x11/edid.h
new file mode 100644
index 000000000..8c217eba2
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/edid.h	
@@ -0,0 +1,167 @@
+typedef unsigned char uchar;
+typedef struct MonitorInfo MonitorInfo;
+typedef struct Timing Timing;
+typedef struct DetailedTiming DetailedTiming;
+
+typedef enum
+{
+    UNDEFINED,
+    DVI,
+    HDMI_A,
+    HDMI_B,
+    MDDI,
+    DISPLAY_PORT
+} Interface;
+
+typedef enum
+{
+    UNDEFINED_COLOR,
+    MONOCHROME,
+    RGB,
+    OTHER_COLOR
+} ColorType;
+
+typedef enum
+{
+    NO_STEREO,
+    FIELD_RIGHT,
+    FIELD_LEFT,
+    TWO_WAY_RIGHT_ON_EVEN,
+    TWO_WAY_LEFT_ON_EVEN,
+    FOUR_WAY_INTERLEAVED,
+    SIDE_BY_SIDE
+} StereoType;
+
+struct Timing
+{
+    int width;
+    int height;
+    int frequency;
+};
+
+struct DetailedTiming
+{
+    int		pixel_clock;
+    int		h_addr;
+    int		h_blank;
+    int		h_sync;
+    int		h_front_porch;
+    int		v_addr;
+    int		v_blank;
+    int		v_sync;
+    int		v_front_porch;
+    int		width_mm;
+    int		height_mm;
+    int		right_border;
+    int		top_border;
+    int		interlaced;
+    StereoType	stereo;
+
+    int		digital_sync;
+    union
+    {
+	struct
+	{
+	    int bipolar;
+	    int serrations;
+	    int sync_on_green;
+	} analog;
+
+	struct
+	{
+	    int composite;
+	    int serrations;
+	    int negative_vsync;
+	    int negative_hsync;
+	} digital;
+    };
+};
+
+struct MonitorInfo
+{
+    int			checksum;
+    char		manufacturer_code[4];
+    int			product_code;
+    unsigned int	serial_number;
+    
+    int			production_week;	/* -1 if not specified */
+    int			production_year;	/* -1 if not specified */
+    int			model_year;		/* -1 if not specified */
+
+    int			major_version;
+    int			minor_version;
+
+    int			is_digital;
+    
+    union
+    {
+	struct
+	{
+	    int		bits_per_primary;
+	    Interface	interface;
+	    int		rgb444;
+	    int		ycrcb444;
+	    int		ycrcb422;
+	} digital;
+
+	struct
+	{
+	    double	video_signal_level;
+	    double	sync_signal_level;
+	    double	total_signal_level;
+
+	    int		blank_to_black;
+
+	    int		separate_hv_sync;
+	    int		composite_sync_on_h;
+	    int		composite_sync_on_green;
+	    int		serration_on_vsync;
+	    ColorType	color_type;
+	} analog;
+    };
+
+    int			width_mm;		/* -1 if not specified */
+    int			height_mm;		/* -1 if not specified */
+    double		aspect_ratio;		/* -1.0 if not specififed */
+
+    double		gamma;			/* -1.0 if not specified */
+
+    int			standby;
+    int			suspend;
+    int			active_off;
+
+    int			srgb_is_standard;
+    int			preferred_timing_includes_native;
+    int			continuous_frequency;
+
+    double		red_x;
+    double		red_y;
+    double		green_x;
+    double		green_y;
+    double		blue_x;
+    double		blue_y;
+    double		white_x;
+    double		white_y;
+
+    Timing		established[24];	/* Terminated by 0x0x0 */
+    Timing		standard[8];
+    
+    int			n_detailed_timings;
+    DetailedTiming	detailed_timings[4];	/* If monitor has a preferred
+						 * mode, it is the first one
+						 * (whether it has, is
+						 * determined by the 
+						 * preferred_timing_includes
+						 * bit.
+						 */
+
+    /* Optional product description */
+    char		dsc_serial_number[14];
+    char		dsc_product_name[14];
+    char		dsc_string[14];		/* Unspecified ASCII data */
+};
+
+MonitorInfo *decode_edid (const uchar *data);
+void         dump_monitor_info (MonitorInfo *info);
+char *       make_display_name (const char        *output_name,
+				const MonitorInfo *info);
diff --git a/Source/3rd Party/sdl/src/video/x11/imKStoUCS.c b/Source/3rd Party/sdl/src/video/x11/imKStoUCS.c
new file mode 100644
index 000000000..e4f086464
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/imKStoUCS.c	
@@ -0,0 +1,350 @@
+/* Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+*/
+#include "../../SDL_internal.h"
+
+#if SDL_VIDEO_DRIVER_X11
+
+/* $XFree86: xc/lib/X11/imKStoUCS.c,v 1.4 2003/04/29 11:29:18 pascal Exp $ */
+
+#include <X11/X.h>
+#include "imKStoUCS.h"
+
+static unsigned short const keysym_to_unicode_1a1_1ff[] = {
+    0x0104, 0x02d8, 0x0141, 0x0000, 0x013d, 0x015a, 0x0000,     /* 0x01a0-0x01a7 */
+    0x0000, 0x0160, 0x015e, 0x0164, 0x0179, 0x0000, 0x017d, 0x017b,     /* 0x01a8-0x01af */
+    0x0000, 0x0105, 0x02db, 0x0142, 0x0000, 0x013e, 0x015b, 0x02c7,     /* 0x01b0-0x01b7 */
+    0x0000, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c,     /* 0x01b8-0x01bf */
+    0x0154, 0x0000, 0x0000, 0x0102, 0x0000, 0x0139, 0x0106, 0x0000,     /* 0x01c0-0x01c7 */
+    0x010c, 0x0000, 0x0118, 0x0000, 0x011a, 0x0000, 0x0000, 0x010e,     /* 0x01c8-0x01cf */
+    0x0110, 0x0143, 0x0147, 0x0000, 0x0000, 0x0150, 0x0000, 0x0000,     /* 0x01d0-0x01d7 */
+    0x0158, 0x016e, 0x0000, 0x0170, 0x0000, 0x0000, 0x0162, 0x0000,     /* 0x01d8-0x01df */
+    0x0155, 0x0000, 0x0000, 0x0103, 0x0000, 0x013a, 0x0107, 0x0000,     /* 0x01e0-0x01e7 */
+    0x010d, 0x0000, 0x0119, 0x0000, 0x011b, 0x0000, 0x0000, 0x010f,     /* 0x01e8-0x01ef */
+    0x0111, 0x0144, 0x0148, 0x0000, 0x0000, 0x0151, 0x0000, 0x0000,     /* 0x01f0-0x01f7 */
+    0x0159, 0x016f, 0x0000, 0x0171, 0x0000, 0x0000, 0x0163, 0x02d9      /* 0x01f8-0x01ff */
+};
+
+static unsigned short const keysym_to_unicode_2a1_2fe[] = {
+    0x0126, 0x0000, 0x0000, 0x0000, 0x0000, 0x0124, 0x0000,     /* 0x02a0-0x02a7 */
+    0x0000, 0x0130, 0x0000, 0x011e, 0x0134, 0x0000, 0x0000, 0x0000,     /* 0x02a8-0x02af */
+    0x0000, 0x0127, 0x0000, 0x0000, 0x0000, 0x0000, 0x0125, 0x0000,     /* 0x02b0-0x02b7 */
+    0x0000, 0x0131, 0x0000, 0x011f, 0x0135, 0x0000, 0x0000, 0x0000,     /* 0x02b8-0x02bf */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010a, 0x0108, 0x0000,     /* 0x02c0-0x02c7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x02c8-0x02cf */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0120, 0x0000, 0x0000,     /* 0x02d0-0x02d7 */
+    0x011c, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x015c, 0x0000,     /* 0x02d8-0x02df */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010b, 0x0109, 0x0000,     /* 0x02e0-0x02e7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x02e8-0x02ef */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0121, 0x0000, 0x0000,     /* 0x02f0-0x02f7 */
+    0x011d, 0x0000, 0x0000, 0x0000, 0x0000, 0x016d, 0x015d      /* 0x02f8-0x02ff */
+};
+
+static unsigned short const keysym_to_unicode_3a2_3fe[] = {
+    0x0138, 0x0156, 0x0000, 0x0128, 0x013b, 0x0000,     /* 0x03a0-0x03a7 */
+    0x0000, 0x0000, 0x0112, 0x0122, 0x0166, 0x0000, 0x0000, 0x0000,     /* 0x03a8-0x03af */
+    0x0000, 0x0000, 0x0000, 0x0157, 0x0000, 0x0129, 0x013c, 0x0000,     /* 0x03b0-0x03b7 */
+    0x0000, 0x0000, 0x0113, 0x0123, 0x0167, 0x014a, 0x0000, 0x014b,     /* 0x03b8-0x03bf */
+    0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012e,     /* 0x03c0-0x03c7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0116, 0x0000, 0x0000, 0x012a,     /* 0x03c8-0x03cf */
+    0x0000, 0x0145, 0x014c, 0x0136, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x03d0-0x03d7 */
+    0x0000, 0x0172, 0x0000, 0x0000, 0x0000, 0x0168, 0x016a, 0x0000,     /* 0x03d8-0x03df */
+    0x0101, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012f,     /* 0x03e0-0x03e7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0117, 0x0000, 0x0000, 0x012b,     /* 0x03e8-0x03ef */
+    0x0000, 0x0146, 0x014d, 0x0137, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x03f0-0x03f7 */
+    0x0000, 0x0173, 0x0000, 0x0000, 0x0000, 0x0169, 0x016b      /* 0x03f8-0x03ff */
+};
+
+static unsigned short const keysym_to_unicode_4a1_4df[] = {
+    0x3002, 0x3008, 0x3009, 0x3001, 0x30fb, 0x30f2, 0x30a1,     /* 0x04a0-0x04a7 */
+    0x30a3, 0x30a5, 0x30a7, 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3,     /* 0x04a8-0x04af */
+    0x30fc, 0x30a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad,     /* 0x04b0-0x04b7 */
+    0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd,     /* 0x04b8-0x04bf */
+    0x30bf, 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc,     /* 0x04c0-0x04c7 */
+    0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de,     /* 0x04c8-0x04cf */
+    0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9,     /* 0x04d0-0x04d7 */
+    0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3, 0x309b, 0x309c      /* 0x04d8-0x04df */
+};
+
+static unsigned short const keysym_to_unicode_590_5fe[] = {
+    0x06f0, 0x06f1, 0x06f2, 0x06f3, 0x06f4, 0x06f5, 0x06f6, 0x06f7,     /* 0x0590-0x0597 */
+    0x06f8, 0x06f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x0598-0x059f */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x066a, 0x0670, 0x0679,     /* 0x05a0-0x05a7 */
+
+    0x067e, 0x0686, 0x0688, 0x0691, 0x060c, 0x0000, 0x06d4, 0x0000,     /* 0x05ac-0x05af */
+    0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667,     /* 0x05b0-0x05b7 */
+    0x0668, 0x0669, 0x0000, 0x061b, 0x0000, 0x0000, 0x0000, 0x061f,     /* 0x05b8-0x05bf */
+    0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,     /* 0x05c0-0x05c7 */
+    0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f,     /* 0x05c8-0x05cf */
+    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637,     /* 0x05d0-0x05d7 */
+    0x0638, 0x0639, 0x063a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x05d8-0x05df */
+    0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647,     /* 0x05e0-0x05e7 */
+    0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f,     /* 0x05e8-0x05ef */
+    0x0650, 0x0651, 0x0652, 0x0653, 0x0654, 0x0655, 0x0698, 0x06a4,     /* 0x05f0-0x05f7 */
+    0x06a9, 0x06af, 0x06ba, 0x06be, 0x06cc, 0x06d2, 0x06c1      /* 0x05f8-0x05fe */
+};
+
+static unsigned short const keysym_to_unicode_680_6ff[] = {
+    0x0492, 0x0496, 0x049a, 0x049c, 0x04a2, 0x04ae, 0x04b0, 0x04b2,     /* 0x0680-0x0687 */
+    0x04b6, 0x04b8, 0x04ba, 0x0000, 0x04d8, 0x04e2, 0x04e8, 0x04ee,     /* 0x0688-0x068f */
+    0x0493, 0x0497, 0x049b, 0x049d, 0x04a3, 0x04af, 0x04b1, 0x04b3,     /* 0x0690-0x0697 */
+    0x04b7, 0x04b9, 0x04bb, 0x0000, 0x04d9, 0x04e3, 0x04e9, 0x04ef,     /* 0x0698-0x069f */
+    0x0000, 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457,     /* 0x06a0-0x06a7 */
+    0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0491, 0x045e, 0x045f,     /* 0x06a8-0x06af */
+    0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407,     /* 0x06b0-0x06b7 */
+    0x0408, 0x0409, 0x040a, 0x040b, 0x040c, 0x0490, 0x040e, 0x040f,     /* 0x06b8-0x06bf */
+    0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,     /* 0x06c0-0x06c7 */
+    0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e,     /* 0x06c8-0x06cf */
+    0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,     /* 0x06d0-0x06d7 */
+    0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a,     /* 0x06d8-0x06df */
+    0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,     /* 0x06e0-0x06e7 */
+    0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e,     /* 0x06e8-0x06ef */
+    0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,     /* 0x06f0-0x06f7 */
+    0x042c, 0x042b, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a      /* 0x06f8-0x06ff */
+};
+
+static unsigned short const keysym_to_unicode_7a1_7f9[] = {
+    0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0x0000, 0x038c,     /* 0x07a0-0x07a7 */
+    0x038e, 0x03ab, 0x0000, 0x038f, 0x0000, 0x0000, 0x0385, 0x2015,     /* 0x07a8-0x07af */
+    0x0000, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc,     /* 0x07b0-0x07b7 */
+    0x03cd, 0x03cb, 0x03b0, 0x03ce, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x07b8-0x07bf */
+    0x0000, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,     /* 0x07c0-0x07c7 */
+    0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f,     /* 0x07c8-0x07cf */
+    0x03a0, 0x03a1, 0x03a3, 0x0000, 0x03a4, 0x03a5, 0x03a6, 0x03a7,     /* 0x07d0-0x07d7 */
+    0x03a8, 0x03a9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x07d8-0x07df */
+    0x0000, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7,     /* 0x07e0-0x07e7 */
+    0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf,     /* 0x07e8-0x07ef */
+    0x03c0, 0x03c1, 0x03c3, 0x03c2, 0x03c4, 0x03c5, 0x03c6, 0x03c7,     /* 0x07f0-0x07f7 */
+    0x03c8, 0x03c9              /* 0x07f8-0x07ff */
+};
+
+static unsigned short const keysym_to_unicode_8a4_8fe[] = {
+    0x2320, 0x2321, 0x0000, 0x231c,     /* 0x08a0-0x08a7 */
+    0x231d, 0x231e, 0x231f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x08a8-0x08af */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x08b0-0x08b7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x2264, 0x2260, 0x2265, 0x222b,     /* 0x08b8-0x08bf */
+    0x2234, 0x0000, 0x221e, 0x0000, 0x0000, 0x2207, 0x0000, 0x0000,     /* 0x08c0-0x08c7 */
+    0x2245, 0x2246, 0x0000, 0x0000, 0x0000, 0x0000, 0x22a2, 0x0000,     /* 0x08c8-0x08cf */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x221a, 0x0000,     /* 0x08d0-0x08d7 */
+    0x0000, 0x0000, 0x2282, 0x2283, 0x2229, 0x222a, 0x2227, 0x2228,     /* 0x08d8-0x08df */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x08e0-0x08e7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x08e8-0x08ef */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0192, 0x0000,     /* 0x08f0-0x08f7 */
+    0x0000, 0x0000, 0x0000, 0x2190, 0x2191, 0x2192, 0x2193      /* 0x08f8-0x08ff */
+};
+
+static unsigned short const keysym_to_unicode_9df_9f8[] = {
+    0x2422,                     /* 0x09d8-0x09df */
+    0x2666, 0x25a6, 0x2409, 0x240c, 0x240d, 0x240a, 0x0000, 0x0000,     /* 0x09e0-0x09e7 */
+    0x240a, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x2500,     /* 0x09e8-0x09ef */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x251c, 0x2524, 0x2534, 0x252c,     /* 0x09f0-0x09f7 */
+    0x2502                      /* 0x09f8-0x09ff */
+};
+
+static unsigned short const keysym_to_unicode_aa1_afe[] = {
+    0x2003, 0x2002, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009,     /* 0x0aa0-0x0aa7 */
+    0x200a, 0x2014, 0x2013, 0x0000, 0x0000, 0x0000, 0x2026, 0x2025,     /* 0x0aa8-0x0aaf */
+    0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, 0x215a,     /* 0x0ab0-0x0ab7 */
+    0x2105, 0x0000, 0x0000, 0x2012, 0x2039, 0x2024, 0x203a, 0x0000,     /* 0x0ab8-0x0abf */
+    0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e, 0x0000,     /* 0x0ac0-0x0ac7 */
+    0x0000, 0x2122, 0x2120, 0x0000, 0x25c1, 0x25b7, 0x25cb, 0x25ad,     /* 0x0ac8-0x0acf */
+    0x2018, 0x2019, 0x201c, 0x201d, 0x211e, 0x0000, 0x2032, 0x2033,     /* 0x0ad0-0x0ad7 */
+    0x0000, 0x271d, 0x0000, 0x220e, 0x25c2, 0x2023, 0x25cf, 0x25ac,     /* 0x0ad8-0x0adf */
+    0x25e6, 0x25ab, 0x25ae, 0x25b5, 0x25bf, 0x2606, 0x2022, 0x25aa,     /* 0x0ae0-0x0ae7 */
+    0x25b4, 0x25be, 0x261a, 0x261b, 0x2663, 0x2666, 0x2665, 0x0000,     /* 0x0ae8-0x0aef */
+    0x2720, 0x2020, 0x2021, 0x2713, 0x2612, 0x266f, 0x266d, 0x2642,     /* 0x0af0-0x0af7 */
+    0x2640, 0x2121, 0x2315, 0x2117, 0x2038, 0x201a, 0x201e      /* 0x0af8-0x0aff */
+};
+
+/* none of the APL keysyms match the Unicode characters */
+
+static unsigned short const keysym_to_unicode_cdf_cfa[] = {
+    0x2017,                     /* 0x0cd8-0x0cdf */
+    0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7,     /* 0x0ce0-0x0ce7 */
+    0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df,     /* 0x0ce8-0x0cef */
+    0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7,     /* 0x0cf0-0x0cf7 */
+    0x05e8, 0x05e9, 0x05ea      /* 0x0cf8-0x0cff */
+};
+
+static unsigned short const keysym_to_unicode_da1_df9[] = {
+    0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07,     /* 0x0da0-0x0da7 */
+    0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f,     /* 0x0da8-0x0daf */
+    0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17,     /* 0x0db0-0x0db7 */
+    0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f,     /* 0x0db8-0x0dbf */
+    0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27,     /* 0x0dc0-0x0dc7 */
+    0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f,     /* 0x0dc8-0x0dcf */
+    0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37,     /* 0x0dd0-0x0dd7 */
+    0x0e38, 0x0e39, 0x0e3a, 0x0000, 0x0000, 0x0000, 0x0e3e, 0x0e3f,     /* 0x0dd8-0x0ddf */
+    0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47,     /* 0x0de0-0x0de7 */
+    0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0000, 0x0000,     /* 0x0de8-0x0def */
+    0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57,     /* 0x0df0-0x0df7 */
+    0x0e58, 0x0e59              /* 0x0df8-0x0dff */
+};
+
+static unsigned short const keysym_to_unicode_ea0_eff[] = {
+    0x0000, 0x1101, 0x1101, 0x11aa, 0x1102, 0x11ac, 0x11ad, 0x1103,     /* 0x0ea0-0x0ea7 */
+    0x1104, 0x1105, 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4, 0x11b5,     /* 0x0ea8-0x0eaf */
+    0x11b6, 0x1106, 0x1107, 0x1108, 0x11b9, 0x1109, 0x110a, 0x110b,     /* 0x0eb0-0x0eb7 */
+    0x110c, 0x110d, 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1161,     /* 0x0eb8-0x0ebf */
+    0x1162, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, 0x1168, 0x1169,     /* 0x0ec0-0x0ec7 */
+    0x116a, 0x116b, 0x116c, 0x116d, 0x116e, 0x116f, 0x1170, 0x1171,     /* 0x0ec8-0x0ecf */
+    0x1172, 0x1173, 0x1174, 0x1175, 0x11a8, 0x11a9, 0x11aa, 0x11ab,     /* 0x0ed0-0x0ed7 */
+    0x11ac, 0x11ad, 0x11ae, 0x11af, 0x11b0, 0x11b1, 0x11b2, 0x11b3,     /* 0x0ed8-0x0edf */
+    0x11b4, 0x11b5, 0x11b6, 0x11b7, 0x11b8, 0x11b9, 0x11ba, 0x11bb,     /* 0x0ee0-0x0ee7 */
+    0x11bc, 0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x0000,     /* 0x0ee8-0x0eef */
+    0x0000, 0x0000, 0x1140, 0x0000, 0x0000, 0x1159, 0x119e, 0x0000,     /* 0x0ef0-0x0ef7 */
+    0x11eb, 0x0000, 0x11f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x20a9,     /* 0x0ef8-0x0eff */
+};
+
+static unsigned short const keysym_to_unicode_12a1_12fe[] = {
+    0x1e02, 0x1e03, 0x0000, 0x0000, 0x0000, 0x1e0a, 0x0000,     /* 0x12a0-0x12a7 */
+    0x1e80, 0x0000, 0x1e82, 0x1e0b, 0x1ef2, 0x0000, 0x0000, 0x0000,     /* 0x12a8-0x12af */
+    0x1e1e, 0x1e1f, 0x0000, 0x0000, 0x1e40, 0x1e41, 0x0000, 0x1e56,     /* 0x12b0-0x12b7 */
+    0x1e81, 0x1e57, 0x1e83, 0x1e60, 0x1ef3, 0x1e84, 0x1e85, 0x1e61,     /* 0x12b8-0x12bf */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x12c0-0x12c7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x12c8-0x12cf */
+    0x0174, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6a,     /* 0x12d0-0x12d7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0176, 0x0000,     /* 0x12d8-0x12df */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x12e0-0x12e7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x12e8-0x12ef */
+    0x0175, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1e6b,     /* 0x12f0-0x12f7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0177      /* 0x12f0-0x12ff */
+};
+
+static unsigned short const keysym_to_unicode_13bc_13be[] = {
+    0x0152, 0x0153, 0x0178      /* 0x13b8-0x13bf */
+};
+
+static unsigned short const keysym_to_unicode_14a1_14ff[] = {
+    0x2741, 0x00a7, 0x0589, 0x0029, 0x0028, 0x00bb, 0x00ab,     /* 0x14a0-0x14a7 */
+    0x2014, 0x002e, 0x055d, 0x002c, 0x2013, 0x058a, 0x2026, 0x055c,     /* 0x14a8-0x14af */
+    0x055b, 0x055e, 0x0531, 0x0561, 0x0532, 0x0562, 0x0533, 0x0563,     /* 0x14b0-0x14b7 */
+    0x0534, 0x0564, 0x0535, 0x0565, 0x0536, 0x0566, 0x0537, 0x0567,     /* 0x14b8-0x14bf */
+    0x0538, 0x0568, 0x0539, 0x0569, 0x053a, 0x056a, 0x053b, 0x056b,     /* 0x14c0-0x14c7 */
+    0x053c, 0x056c, 0x053d, 0x056d, 0x053e, 0x056e, 0x053f, 0x056f,     /* 0x14c8-0x14cf */
+    0x0540, 0x0570, 0x0541, 0x0571, 0x0542, 0x0572, 0x0543, 0x0573,     /* 0x14d0-0x14d7 */
+    0x0544, 0x0574, 0x0545, 0x0575, 0x0546, 0x0576, 0x0547, 0x0577,     /* 0x14d8-0x14df */
+    0x0548, 0x0578, 0x0549, 0x0579, 0x054a, 0x057a, 0x054b, 0x057b,     /* 0x14e0-0x14e7 */
+    0x054c, 0x057c, 0x054d, 0x057d, 0x054e, 0x057e, 0x054f, 0x057f,     /* 0x14e8-0x14ef */
+    0x0550, 0x0580, 0x0551, 0x0581, 0x0552, 0x0582, 0x0553, 0x0583,     /* 0x14f0-0x14f7 */
+    0x0554, 0x0584, 0x0555, 0x0585, 0x0556, 0x0586, 0x2019, 0x0027,     /* 0x14f8-0x14ff */
+};
+
+static unsigned short const keysym_to_unicode_15d0_15f6[] = {
+    0x10d0, 0x10d1, 0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10d7,     /* 0x15d0-0x15d7 */
+    0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, 0x10dd, 0x10de, 0x10df,     /* 0x15d8-0x15df */
+    0x10e0, 0x10e1, 0x10e2, 0x10e3, 0x10e4, 0x10e5, 0x10e6, 0x10e7,     /* 0x15e0-0x15e7 */
+    0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed, 0x10ee, 0x10ef,     /* 0x15e8-0x15ef */
+    0x10f0, 0x10f1, 0x10f2, 0x10f3, 0x10f4, 0x10f5, 0x10f6      /* 0x15f0-0x15f7 */
+};
+
+static unsigned short const keysym_to_unicode_16a0_16f6[] = {
+    0x0000, 0x0000, 0xf0a2, 0x1e8a, 0x0000, 0xf0a5, 0x012c, 0xf0a7,     /* 0x16a0-0x16a7 */
+    0xf0a8, 0x01b5, 0x01e6, 0x0000, 0x0000, 0x0000, 0x0000, 0x019f,     /* 0x16a8-0x16af */
+    0x0000, 0x0000, 0xf0b2, 0x1e8b, 0x01d1, 0xf0b5, 0x012d, 0xf0b7,     /* 0x16b0-0x16b7 */
+    0xf0b8, 0x01b6, 0x01e7, 0x0000, 0x0000, 0x01d2, 0x0000, 0x0275,     /* 0x16b8-0x16bf */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x018f, 0x0000,     /* 0x16c0-0x16c7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x16c8-0x16cf */
+    0x0000, 0x1e36, 0xf0d2, 0xf0d3, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x16d0-0x16d7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x16d8-0x16df */
+    0x0000, 0x1e37, 0xf0e2, 0xf0e3, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x16e0-0x16e7 */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,     /* 0x16e8-0x16ef */
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0259      /* 0x16f0-0x16f6 */
+};
+
+static unsigned short const keysym_to_unicode_1e9f_1eff[] = {
+    0x0303,
+    0x1ea0, 0x1ea1, 0x1ea2, 0x1ea3, 0x1ea4, 0x1ea5, 0x1ea6, 0x1ea7,     /* 0x1ea0-0x1ea7 */
+    0x1ea8, 0x1ea9, 0x1eaa, 0x1eab, 0x1eac, 0x1ead, 0x1eae, 0x1eaf,     /* 0x1ea8-0x1eaf */
+    0x1eb0, 0x1eb1, 0x1eb2, 0x1eb3, 0x1eb4, 0x1eb5, 0x1eb6, 0x1eb7,     /* 0x1eb0-0x1eb7 */
+    0x1eb8, 0x1eb9, 0x1eba, 0x1ebb, 0x1ebc, 0x1ebd, 0x1ebe, 0x1ebf,     /* 0x1eb8-0x1ebf */
+    0x1ec0, 0x1ec1, 0x1ec2, 0x1ec3, 0x1ec4, 0x1ec5, 0x1ec6, 0x1ec7,     /* 0x1ec0-0x1ec7 */
+    0x1ec8, 0x1ec9, 0x1eca, 0x1ecb, 0x1ecc, 0x1ecd, 0x1ece, 0x1ecf,     /* 0x1ec8-0x1ecf */
+    0x1ed0, 0x1ed1, 0x1ed2, 0x1ed3, 0x1ed4, 0x1ed5, 0x1ed6, 0x1ed7,     /* 0x1ed0-0x1ed7 */
+    0x1ed8, 0x1ed9, 0x1eda, 0x1edb, 0x1edc, 0x1edd, 0x1ede, 0x1edf,     /* 0x1ed8-0x1edf */
+    0x1ee0, 0x1ee1, 0x1ee2, 0x1ee3, 0x1ee4, 0x1ee5, 0x1ee6, 0x1ee7,     /* 0x1ee0-0x1ee7 */
+    0x1ee8, 0x1ee9, 0x1eea, 0x1eeb, 0x1eec, 0x1eed, 0x1eee, 0x1eef,     /* 0x1ee8-0x1eef */
+    0x1ef0, 0x1ef1, 0x0300, 0x0301, 0x1ef4, 0x1ef5, 0x1ef6, 0x1ef7,     /* 0x1ef0-0x1ef7 */
+    0x1ef8, 0x1ef9, 0x01a0, 0x01a1, 0x01af, 0x01b0, 0x0309, 0x0323      /* 0x1ef8-0x1eff */
+};
+
+static unsigned short const keysym_to_unicode_20a0_20ac[] = {
+    0x20a0, 0x20a1, 0x20a2, 0x20a3, 0x20a4, 0x20a5, 0x20a6, 0x20a7,     /* 0x20a0-0x20a7 */
+    0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac      /* 0x20a8-0x20af */
+};
+
+unsigned int
+X11_KeySymToUcs4(KeySym keysym)
+{
+    /* 'Unicode keysym' */
+    if ((keysym & 0xff000000) == 0x01000000)
+        return (keysym & 0x00ffffff);
+
+    if (keysym > 0 && keysym < 0x100)
+        return keysym;
+    else if (keysym > 0x1a0 && keysym < 0x200)
+        return keysym_to_unicode_1a1_1ff[keysym - 0x1a1];
+    else if (keysym > 0x2a0 && keysym < 0x2ff)
+        return keysym_to_unicode_2a1_2fe[keysym - 0x2a1];
+    else if (keysym > 0x3a1 && keysym < 0x3ff)
+        return keysym_to_unicode_3a2_3fe[keysym - 0x3a2];
+    else if (keysym > 0x4a0 && keysym < 0x4e0)
+        return keysym_to_unicode_4a1_4df[keysym - 0x4a1];
+    else if (keysym > 0x589 && keysym < 0x5ff)
+        return keysym_to_unicode_590_5fe[keysym - 0x590];
+    else if (keysym > 0x67f && keysym < 0x700)
+        return keysym_to_unicode_680_6ff[keysym - 0x680];
+    else if (keysym > 0x7a0 && keysym < 0x7fa)
+        return keysym_to_unicode_7a1_7f9[keysym - 0x7a1];
+    else if (keysym > 0x8a3 && keysym < 0x8ff)
+        return keysym_to_unicode_8a4_8fe[keysym - 0x8a4];
+    else if (keysym > 0x9de && keysym < 0x9f9)
+        return keysym_to_unicode_9df_9f8[keysym - 0x9df];
+    else if (keysym > 0xaa0 && keysym < 0xaff)
+        return keysym_to_unicode_aa1_afe[keysym - 0xaa1];
+    else if (keysym > 0xcde && keysym < 0xcfb)
+        return keysym_to_unicode_cdf_cfa[keysym - 0xcdf];
+    else if (keysym > 0xda0 && keysym < 0xdfa)
+        return keysym_to_unicode_da1_df9[keysym - 0xda1];
+    else if (keysym > 0xe9f && keysym < 0xf00)
+        return keysym_to_unicode_ea0_eff[keysym - 0xea0];
+    else if (keysym > 0x12a0 && keysym < 0x12ff)
+        return keysym_to_unicode_12a1_12fe[keysym - 0x12a1];
+    else if (keysym > 0x13bb && keysym < 0x13bf)
+        return keysym_to_unicode_13bc_13be[keysym - 0x13bc];
+    else if (keysym > 0x14a0 && keysym < 0x1500)
+        return keysym_to_unicode_14a1_14ff[keysym - 0x14a1];
+    else if (keysym > 0x15cf && keysym < 0x15f7)
+        return keysym_to_unicode_15d0_15f6[keysym - 0x15d0];
+    else if (keysym > 0x169f && keysym < 0x16f7)
+        return keysym_to_unicode_16a0_16f6[keysym - 0x16a0];
+    else if (keysym > 0x1e9e && keysym < 0x1f00)
+        return keysym_to_unicode_1e9f_1eff[keysym - 0x1e9f];
+    else if (keysym > 0x209f && keysym < 0x20ad)
+        return keysym_to_unicode_20a0_20ac[keysym - 0x20a0];
+    else
+        return 0;
+}
+
+#endif /* SDL_VIDEO_DRIVER_X11 */
diff --git a/Source/3rd Party/sdl/src/video/x11/imKStoUCS.h b/Source/3rd Party/sdl/src/video/x11/imKStoUCS.h
new file mode 100644
index 000000000..cc684c2e3
--- /dev/null
+++ b/Source/3rd Party/sdl/src/video/x11/imKStoUCS.h	
@@ -0,0 +1,31 @@
+#ifndef _imKStoUCS_h
+#define _imKStoUCS_h
+
+/* Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+*/
+
+extern unsigned int X11_KeySymToUcs4(KeySym keysym);
+
+#endif /* _imKStoUCS_h */
diff --git a/Source/3rd Party/wx/include/msvc/wx/setup.h b/Source/3rd Party/wx/include/msvc/wx/setup.h
index 36bd70701..f00b8ec37 100644
--- a/Source/3rd Party/wx/include/msvc/wx/setup.h	
+++ b/Source/3rd Party/wx/include/msvc/wx/setup.h	
@@ -1,225 +1,241 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msvc/wx/setup.h
+// Name:        msvc/wx/msw/setup.h
 // Purpose:     wrapper around the real wx/setup.h for Visual C++
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-12-12
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: setup.h 43687 2006-11-27 15:03:59Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _MSC_VER
-    #error "This file should only be included when using Microsoft Visual C++"
-#endif
-
 // VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but
 // the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined
 // explicitly!
 
-#include "wx/version.h"
-#include "wx/cpp.h"
-
-// notice that wxSUFFIX_DEBUG is a string but wxSUFFIX itself must be an
-// identifier as string concatenation is not done inside #include where we
-// need it
-#ifdef _DEBUG
-    #define wxSUFFIX_DEBUG "d"
+#ifdef _MSC_VER
     #ifdef _UNICODE
-        #define wxSUFFIX ud
-    #else // !_UNICODE
-        #define wxSUFFIX d
-    #endif // _UNICODE/!_UNICODE
-#else
-    #define wxSUFFIX_DEBUG ""
-    #ifdef _UNICODE
-        #define wxSUFFIX u
-    #else // !_UNICODE
-        // don't define wxSUFFIX at all as preprocessor operations don't work
-        // with empty values so we need to check for this case specially below
-    #endif // _UNICODE/!_UNICODE
-#endif
-
-// compiler-specific prefix: by default it's always just "vc" for compatibility
-// reasons but if you use multiple MSVC versions you probably build them with
-// COMPILER_PREFIX=vcXX and in this case you may want to either predefine
-// wxMSVC_VERSION as "XX" or define wxMSVC_VERSION_AUTO to use the appropriate
-// version depending on the compiler used
-#ifdef wxMSVC_VERSION
-    #define wxCOMPILER_PREFIX wxCONCAT(vc, wxMSVC_VERSION)
-#elif defined(wxMSVC_VERSION_AUTO)
-    #if _MSC_VER == 1200
-        #define wxCOMPILER_PREFIX vc60
-    #elif _MSC_VER == 1300
-        #define wxCOMPILER_PREFIX vc70
-    #elif _MSC_VER == 1310
-        #define wxCOMPILER_PREFIX vc71
-    #elif _MSC_VER == 1400
-        #define wxCOMPILER_PREFIX vc80
-    #elif _MSC_VER == 1500
-        #define wxCOMPILER_PREFIX vc90
-    #elif _MSC_VER == 1600
-        #define wxCOMPILER_PREFIX vc100
-    #elif _MSC_VER == 1700
-        #define wxCOMPILER_PREFIX vc110
-    #else
-        #error "Unknown MSVC compiler version, please report to wx-dev."
-    #endif
-#else
-    #define wxCOMPILER_PREFIX vc
-#endif
-
-// architecture-specific part: not used (again, for compatibility), for x86
-#if defined(_M_X64)
-    #define wxARCH_SUFFIX _x64
-#elif defined(_M_IA64)
-    #define wxARCH_SUFFIX _ia64
-#else // assume _M_IX86
-    #define wxARCH_SUFFIX
-#endif
-
-#ifdef WXUSINGDLL
-    #define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _dll)
-#else // !DLL
-    #define wxLIB_SUBDIR wxCONCAT3(wxCOMPILER_PREFIX, wxARCH_SUFFIX, _lib)
-#endif // DLL/!DLL
-
-// The user can predefine a different prefix if not using the default MSW port
-// with MSVC.
-#ifndef wxTOOLKIT_PREFIX
-    #define wxTOOLKIT_PREFIX msw
-#endif // wxTOOLKIT_PREFIX
-
-// the real setup.h header file we need is in the build-specific directory,
-// construct the path to it
-#ifdef wxSUFFIX
-    #define wxSETUPH_PATH \
-        wxCONCAT6(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, wxSUFFIX, /wx/setup.h)
-#else // suffix is empty
-    #define wxSETUPH_PATH \
-        wxCONCAT5(../../../lib/, wxLIB_SUBDIR, /, wxTOOLKIT_PREFIX, /wx/setup.h)
-#endif
-
-#define wxSETUPH_PATH_STR wxSTRINGIZE(wxSETUPH_PATH)
-
-#include wxSETUPH_PATH_STR
-
-
-// the library names depend on the build, these macro builds the correct
-// library name for the given base name
-#ifdef wxSUFFIX
-    #define wxSUFFIX_STR wxSTRINGIZE(wxSUFFIX)
-#else // suffix is empty
-    #define wxSUFFIX_STR ""
-#endif
-#define wxSHORT_VERSION_STRING \
-    wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)
-
-#define wxWX_LIB_NAME(name, subname) \
-    "wx" name wxSHORT_VERSION_STRING wxSUFFIX_STR subname
-
-#define wxBASE_LIB_NAME(name) wxWX_LIB_NAME("base", "_" name)
-#define wxTOOLKIT_LIB_NAME(name) wxWX_LIB_NAME(wxSTRINGIZE(wxTOOLKIT_PREFIX), "_" name)
-
-// This one is for 3rd party libraries: they don't have the version number
-// in their names and usually exist in ANSI version only (except for regex)
-//
-// 3rd party libraries are also are not linked in when using DLLs as they're
-// embedded inside our own DLLs and don't need to be linked with the user code.
-#define wx3RD_PARTY_LIB_NAME(name) "wx" name wxSUFFIX_DEBUG
-
-// special version for regex as it does have a Unicode version
-#define wx3RD_PARTY_LIB_NAME_U(name) "wx" name wxSUFFIX_STR
-
-#pragma comment(lib, wxWX_LIB_NAME("base", ""))
-
-#ifndef wxNO_NET_LIB
-    #pragma comment(lib, wxBASE_LIB_NAME("net"))
-#endif
-#ifndef wxNO_XML_LIB
-    #pragma comment(lib, wxBASE_LIB_NAME("xml"))
-#endif
-#if wxUSE_REGEX && !defined(wxNO_REGEX_LIB) && !defined(WXUSINGDLL)
-    #pragma comment(lib, wx3RD_PARTY_LIB_NAME_U("regex"))
-#endif
-
-#if wxUSE_GUI
-    #if wxUSE_XML && !defined(wxNO_EXPAT_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("expat"))
-    #endif
-    #if wxUSE_LIBJPEG && !defined(wxNO_JPEG_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("jpeg"))
-    #endif
-    #if wxUSE_LIBPNG && !defined(wxNO_PNG_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("png"))
-    #endif
-    #if wxUSE_LIBTIFF && !defined(wxNO_TIFF_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("tiff"))
-    #endif
-    #if wxUSE_ZLIB && !defined(wxNO_ZLIB_LIB) && !defined(WXUSINGDLL)
-        #pragma comment(lib, wx3RD_PARTY_LIB_NAME("zlib"))
-    #endif
-
-    #pragma comment(lib, wxTOOLKIT_LIB_NAME("core"))
-
-    #ifndef wxNO_ADV_LIB
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("adv"))
-    #endif
-
-    #ifndef wxNO_HTML_LIB
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("html"))
-    #endif
-    #if wxUSE_GLCANVAS && !defined(wxNO_GL_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("gl"))
-    #endif
-    #if wxUSE_DEBUGREPORT && !defined(wxNO_QA_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("qa"))
-    #endif
-    #if wxUSE_XRC && !defined(wxNO_XRC_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("xrc"))
-    #endif
-    #if wxUSE_AUI && !defined(wxNO_AUI_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("aui"))
-    #endif
-    #if wxUSE_PROPGRID && !defined(wxNO_PROPGRID_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("propgrid"))
-    #endif
-    #if wxUSE_RIBBON && !defined(wxNO_RIBBON_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("ribbon"))
-    #endif
-    #if wxUSE_RICHTEXT && !defined(wxNO_RICHTEXT_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("richtext"))
-    #endif
-    #if wxUSE_MEDIACTRL && !defined(wxNO_MEDIA_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("media"))
-    #endif
-    #if wxUSE_STC && !defined(wxNO_STC_LIB)
-        #pragma comment(lib, wxTOOLKIT_LIB_NAME("stc"))
-        #ifndef WXUSINGDLL
-            #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
+        #ifdef WXUSINGDLL
+            #ifdef _DEBUG
+                #include "../../../lib/vc_dll/mswud/wx/setup.h"
+            #else
+                #include "../../../lib/vc_dll/mswu/wx/setup.h"
+            #endif
+        #else
+            #ifdef _DEBUG
+                #include "../../../lib/vc_lib/mswud/wx/setup.h"
+            #else
+                #include "../../../lib/vc_lib/mswu/wx/setup.h"
+            #endif
         #endif
-    #endif
-#endif // wxUSE_GUI
 
+        #ifdef _DEBUG
+            #pragma comment(lib,"wxbase28ud")
+            #pragma comment(lib,"wxbase28ud_net")
+            #pragma comment(lib,"wxbase28ud_xml")
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregexud")
+            #endif
+
+            #if wxUSE_GUI
+                #if wxUSE_XML
+                    #pragma comment(lib,"wxexpatd")
+                #endif
+                #if wxUSE_LIBJPEG
+                    #pragma comment(lib,"wxjpegd")
+                #endif
+                #if wxUSE_LIBPNG
+                    #pragma comment(lib,"wxpngd")
+                #endif
+                #if wxUSE_LIBTIFF
+                    #pragma comment(lib,"wxtiffd")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlibd")
+                #endif
+                #pragma comment(lib,"wxmsw28ud_adv")
+                #pragma comment(lib,"wxmsw28ud_core")
+                #pragma comment(lib,"wxmsw28ud_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw28ud_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw28ud_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw28ud_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw28ud_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw28ud_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw28ud_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase28ud_odbc")
+                #endif
+            #endif // wxUSE_GUI
+        #else // release
+            #pragma comment(lib,"wxbase28u")
+            #pragma comment(lib,"wxbase28u_net")
+            #pragma comment(lib,"wxbase28u_xml")
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregexu")
+            #endif
+
+            #if wxUSE_GUI
+                #if wxUSE_XML
+                    #pragma comment(lib,"wxexpat")
+                #endif
+                #if wxUSE_LIBJPEG
+                    #pragma comment(lib,"wxjpeg")
+                #endif
+                #if wxUSE_LIBPNG
+                    #pragma comment(lib,"wxpng")
+                #endif
+                #if wxUSE_LIBTIFF
+                    #pragma comment(lib,"wxtiff")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlib")
+                #endif
+                #pragma comment(lib,"wxmsw28u_adv")
+                #pragma comment(lib,"wxmsw28u_core")
+                #pragma comment(lib,"wxmsw28u_html")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw28u_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw28u_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw28u_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw28u_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw28u_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw28u_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase28u_odbc")
+                #endif
+            #endif // wxUSE_GUI
+        #endif // debug/release
+    #else // !_UNICODE
+        #ifdef WXUSINGDLL
+            #ifdef _DEBUG
+                #include "../../../lib/vc_dll/mswd/wx/setup.h"
+            #else
+                #include "../../../lib/vc_dll/msw/wx/setup.h"
+            #endif
+        #else // static lib
+            #ifdef _DEBUG
+                #include "../../../lib/vc_lib/mswd/wx/setup.h"
+            #else
+                #include "../../../lib/vc_lib/msw/wx/setup.h"
+            #endif
+        #endif // shared/static
+
+        #ifdef _DEBUG
+            #pragma comment(lib,"wxbase28d")
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregexd")
+            #endif
+
+            #if wxUSE_GUI
+                #if wxUSE_XML
+                    #pragma comment(lib,"wxexpatd")
+                #endif
+                #if wxUSE_LIBJPEG
+                    #pragma comment(lib,"wxjpegd")
+                #endif
+                #if wxUSE_LIBPNG
+                    #pragma comment(lib,"wxpngd")
+                #endif
+                #if wxUSE_LIBTIFF
+                    #pragma comment(lib,"wxtiffd")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlibd")
+                #endif
+                #pragma comment(lib,"wxmsw28d_core")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw28d_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw28d_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw28d_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw28d_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw28d_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw28d_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase28d_odbc")
+                #endif
+            #endif // wxUSE_GUI
+        #else // release
+            #pragma comment(lib,"wxbase28")
+            #if wxUSE_REGEX
+                #pragma comment(lib,"wxregex")
+            #endif
+
+            #if wxUSE_GUI
+                #if wxUSE_XML
+                    #pragma comment(lib,"wxexpat")
+                #endif
+                #if wxUSE_LIBJPEG
+                    #pragma comment(lib,"wxjpeg")
+                #endif
+                #if wxUSE_LIBPNG
+                    #pragma comment(lib,"wxpng")
+                #endif
+                #if wxUSE_LIBTIFF
+                    #pragma comment(lib,"wxtiff")
+                #endif
+                #if wxUSE_ZLIB
+                    #pragma comment(lib,"wxzlib")
+                #endif
+                #pragma comment(lib,"wxmsw28_core")
+                #if wxUSE_GLCANVAS
+                    #pragma comment(lib,"wxmsw28_gl")
+                #endif
+                #if wxUSE_DEBUGREPORT
+                    #pragma comment(lib,"wxmsw28_qa")
+                #endif
+                #if wxUSE_XRC
+                    #pragma comment(lib,"wxmsw28_xrc")
+                #endif
+                #if wxUSE_AUI
+                    #pragma comment(lib,"wxmsw28_aui")
+                #endif
+                #if wxUSE_RICHTEXT
+                    #pragma comment(lib,"wxmsw28_richtext")
+                #endif
+                #if wxUSE_MEDIACTRL
+                    #pragma comment(lib,"wxmsw28_media")
+                #endif
+                #if wxUSE_ODBC
+                    #pragma comment(lib,"wxbase28_odbc")
+                #endif
+            #endif // wxUSE_GUI
+        #endif // debug/release
+    #endif // _UNICODE/!_UNICODE
+#else
+    #error "This file should only be included when using Microsoft Visual C++"
+#endif
 
-#ifndef WXUSINGDLL
-    // Make sure all required system libraries are added to the linker too when
-    // using static libraries.
-    #pragma comment(lib, "kernel32")
-    #pragma comment(lib, "user32")
-    #pragma comment(lib, "gdi32")
-    #pragma comment(lib, "comdlg32")
-    #pragma comment(lib, "winspool")
-    #pragma comment(lib, "winmm")
-    #pragma comment(lib, "shell32")
-    #pragma comment(lib, "comctl32")
-    #pragma comment(lib, "ole32")
-    #pragma comment(lib, "oleaut32")
-    #pragma comment(lib, "uuid")
-    #pragma comment(lib, "rpcrt4")
-    #pragma comment(lib, "advapi32")
-    #pragma comment(lib, "wsock32")
-    #if wxUSE_URL_NATIVE
-        #pragma comment(lib, "wininet")
-    #endif
-#endif // !WXUSINGDLL
diff --git a/Source/3rd Party/wx/include/wx/accel.h b/Source/3rd Party/wx/include/wx/accel.h
index 8b4aeb60d..49d14ec2a 100644
--- a/Source/3rd Party/wx/include/wx/accel.h	
+++ b/Source/3rd Party/wx/include/wx/accel.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     31.05.01 (extracted from other files)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: accel.h 66927 2011-02-16 23:27:30Z JS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -27,25 +27,24 @@ class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 // ----------------------------------------------------------------------------
 
 // wxAcceleratorEntry flags
-enum wxAcceleratorEntryFlags
+enum
 {
     wxACCEL_NORMAL  = 0x0000,   // no modifiers
     wxACCEL_ALT     = 0x0001,   // hold Alt key down
     wxACCEL_CTRL    = 0x0002,   // hold Ctrl key down
     wxACCEL_SHIFT   = 0x0004,   // hold Shift key down
 #if defined(__WXMAC__) || defined(__WXCOCOA__)
-    wxACCEL_RAW_CTRL= 0x0008,   // 
+    wxACCEL_CMD      = 0x0008   // Command key on OS X
 #else
-    wxACCEL_RAW_CTRL= wxACCEL_CTRL,
+    wxACCEL_CMD      = wxACCEL_CTRL
 #endif
-    wxACCEL_CMD     = wxACCEL_CTRL
 };
 
 // ----------------------------------------------------------------------------
 // an entry in wxAcceleratorTable corresponds to one accelerator
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxAcceleratorEntry
+class WXDLLEXPORT wxAcceleratorEntry
 {
 public:
     wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0,
@@ -69,8 +68,7 @@ public:
 
     wxAcceleratorEntry& operator=(const wxAcceleratorEntry& entry)
     {
-        if (&entry != this)
-            Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);
+        Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);
         return *this;
     }
 
@@ -108,7 +106,7 @@ public:
 
     bool IsOk() const
     {
-        return  m_keyCode != 0;
+        return m_keyCode != 0;
     }
 
 
@@ -117,13 +115,8 @@ public:
 
     // returns a wxString for the this accelerator.
     // this function formats it using the <flags>-<keycode> format
-    // where <flags> maybe a hyphen-separated list of "shift|alt|ctrl"
-    wxString ToString() const { return AsPossiblyLocalizedString(true); }
-
-    // same as above but without translating, useful if the string is meant to
-    // be stored in a file or otherwise stored, instead of being shown to the
-    // user
-    wxString ToRawString() const { return AsPossiblyLocalizedString(false); }
+    // where <flags> maybe a hyphen-separed list of "shift|alt|ctrl"
+    wxString ToString() const;
 
     // returns true if the given string correctly initialized this object
     // (i.e. if IsOk() returns true after this call)
@@ -131,8 +124,6 @@ public:
 
 
 private:
-    wxString AsPossiblyLocalizedString(bool localized) const;
-
     // common part of Create() and FromString()
     static bool ParseAccel(const wxString& str, int *flags, int *keycode);
 
@@ -164,14 +155,14 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/accel.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/accel.h"
+    #include "wx/mac/accel.h"
 #elif defined(__WXCOCOA__)
     #include "wx/generic/accel.h"
 #elif defined(__WXPM__)
     #include "wx/os2/accel.h"
 #endif
 
-extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;
+extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif // wxUSE_ACCEL
 
diff --git a/Source/3rd Party/wx/include/wx/affinematrix2d.h b/Source/3rd Party/wx/include/wx/affinematrix2d.h
deleted file mode 100644
index e8380eb7c..000000000
--- a/Source/3rd Party/wx/include/wx/affinematrix2d.h	
+++ /dev/null
@@ -1,51 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:         wx/affinematrix2d.h
-// Purpose:      wxAffineMatrix2D class.
-// Author:       Based on wxTransformMatrix by Chris Breeze, Julian Smart
-// Created:      2011-04-05
-// Copyright:    (c) wxWidgets team
-// Licence:      wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_AFFINEMATRIX2D_H_
-#define _WX_AFFINEMATRIX2D_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_GEOMETRY
-
-#include "wx/affinematrix2dbase.h"
-
-// A simple implementation of wxAffineMatrix2DBase interface done entirely in
-// wxWidgets.
-class WXDLLIMPEXP_CORE wxAffineMatrix2D : public wxAffineMatrix2DBase
-{
-public:
-    wxAffineMatrix2D() : m_11(1), m_12(0),
-                         m_21(0), m_22(1),
-                         m_tx(0), m_ty(0)
-    {
-    }
-
-    // Implement base class pure virtual methods.
-    virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr);
-    virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const;
-    virtual void Concat(const wxAffineMatrix2DBase& t);
-    virtual bool Invert();
-    virtual bool IsIdentity() const;
-    virtual bool IsEqual(const wxAffineMatrix2DBase& t) const;
-    virtual void Translate(wxDouble dx, wxDouble dy);
-    virtual void Scale(wxDouble xScale, wxDouble yScale);
-    virtual void Rotate(wxDouble cRadians);
-
-protected:
-    virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const;
-    virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const;
-
-private:
-    wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;
-};
-
-#endif // wxUSE_GEOMETRY
-
-#endif // _WX_AFFINEMATRIX2D_H_
diff --git a/Source/3rd Party/wx/include/wx/affinematrix2dbase.h b/Source/3rd Party/wx/include/wx/affinematrix2dbase.h
deleted file mode 100644
index d60aced80..000000000
--- a/Source/3rd Party/wx/include/wx/affinematrix2dbase.h	
+++ /dev/null
@@ -1,127 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:         wx/affinematrix2dbase.h
-// Purpose:      Common interface for 2D transformation matrices.
-// Author:       Catalin Raceanu
-// Created:      2011-04-06
-// Copyright:    (c) wxWidgets team
-// Licence:      wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_AFFINEMATRIX2DBASE_H_
-#define _WX_AFFINEMATRIX2DBASE_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_GEOMETRY
-
-#include "wx/geometry.h"
-
-struct wxMatrix2D
-{
-    wxMatrix2D(wxDouble v11 = 1,
-               wxDouble v12 = 0,
-               wxDouble v21 = 0,
-               wxDouble v22 = 1)
-    {
-        m_11 = v11; m_12 = v12;
-        m_21 = v21; m_22 = v22;
-    }
-
-    wxDouble m_11, m_12, m_21, m_22;
-};
-
-// A 2x3 matrix representing an affine 2D transformation.
-//
-// This is an abstract base class implemented by wxAffineMatrix2D only so far,
-// but in the future we also plan to derive wxGraphicsMatrix from it (it should
-// also be documented then as currently only wxAffineMatrix2D itself is).
-class WXDLLIMPEXP_CORE wxAffineMatrix2DBase
-{
-public:
-    wxAffineMatrix2DBase() {}
-    virtual ~wxAffineMatrix2DBase() {}
-
-    // sets the matrix to the respective values
-    virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) = 0;
-
-    // gets the component valuess of the matrix
-    virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const = 0;
-
-    // concatenates the matrix
-    virtual void Concat(const wxAffineMatrix2DBase& t) = 0;
-
-    // makes this the inverse matrix
-    virtual bool Invert() = 0;
-
-    // return true if this is the identity matrix
-    virtual bool IsIdentity() const = 0;
-
-    // returns true if the elements of the transformation matrix are equal ?
-    virtual bool IsEqual(const wxAffineMatrix2DBase& t) const = 0;
-    bool operator==(const wxAffineMatrix2DBase& t) const { return IsEqual(t); }
-    bool operator!=(const wxAffineMatrix2DBase& t) const { return !IsEqual(t); }
-
-
-    //
-    // transformations
-    //
-
-    // add the translation to this matrix
-    virtual void Translate(wxDouble dx, wxDouble dy) = 0;
-
-    // add the scale to this matrix
-    virtual void Scale(wxDouble xScale, wxDouble yScale) = 0;
-
-    // add the rotation to this matrix (counter clockwise, radians)
-    virtual void Rotate(wxDouble ccRadians) = 0;
-
-    // add mirroring to this matrix
-    void Mirror(int direction = wxHORIZONTAL)
-    {
-        wxDouble x = (direction & wxHORIZONTAL) ? -1 : 1;
-        wxDouble y = (direction & wxVERTICAL) ? -1 : 1;
-        Scale(x, y);
-    }
-
-
-    // applies that matrix to the point
-    wxPoint2DDouble TransformPoint(const wxPoint2DDouble& src) const
-    {
-        return DoTransformPoint(src);
-    }
-
-    void TransformPoint(wxDouble* x, wxDouble* y) const
-    {
-        wxCHECK_RET( x && y, "Can't be NULL" );
-
-        const wxPoint2DDouble dst = DoTransformPoint(wxPoint2DDouble(*x, *y));
-        *x = dst.m_x;
-        *y = dst.m_y;
-    }
-
-    // applies the matrix except for translations
-    wxPoint2DDouble TransformDistance(const wxPoint2DDouble& src) const
-    {
-        return DoTransformDistance(src);
-    }
-
-    void TransformDistance(wxDouble* dx, wxDouble* dy) const
-    {
-        wxCHECK_RET( dx && dy, "Can't be NULL" );
-
-        const wxPoint2DDouble
-            dst = DoTransformDistance(wxPoint2DDouble(*dx, *dy));
-        *dx = dst.m_x;
-        *dy = dst.m_y;
-    }
-
-protected:
-    virtual
-        wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const = 0;
-    virtual
-        wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const = 0;
-};
-
-#endif // wxUSE_GEOMETRY
-
-#endif // _WX_AFFINEMATRIX2DBASE_H_
diff --git a/Source/3rd Party/wx/include/wx/afterstd.h b/Source/3rd Party/wx/include/wx/afterstd.h
index d90b49a4a..78d3a7009 100644
--- a/Source/3rd Party/wx/include/wx/afterstd.h	
+++ b/Source/3rd Party/wx/include/wx/afterstd.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/afterstd.h
+// Name:        include/wx/afterstd.h
 // Purpose:     #include after STL headers
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07/07/03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: afterstd.h 61871 2009-09-09 22:29:51Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,7 @@
     See the comments in beforestd.h.
  */
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
     #include "wx/msw/winundef.h"
 #endif
 
@@ -21,6 +21,13 @@
 #if defined(__VISUALC__) && __VISUALC__ <= 1201
     // MSVC 5 does not have this
     #if _MSC_VER > 1100
+        // don't restore this one for VC6, it gives it in each try/catch which is a
+        // bit annoying to say the least
+        #if _MSC_VER >= 0x1300
+            // unreachable code
+            #pragma warning(default:4702)
+        #endif // VC++ >= 7
+
         #pragma warning(pop)
     #else
         // 'expression' : signed/unsigned mismatch
@@ -39,7 +46,26 @@
     #endif
 #endif
 
-// see beforestd.h for explanation
-#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY)
-    #pragma GCC visibility pop
-#endif
+/*
+    Redefine _T if we undefined it in wx/beforestd.h (see comment there about
+    why do we do it) and if we need it (we always do when building wx itself
+    and might also need when compiling the user code but this must be indicated
+    by the special wxNEEDS__T macro)
+ */
+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
+    #if defined(WXBUILDING) || defined(wxNEEDS_T)
+        /*
+            Undefine _T in case it was defined in the standard header.
+         */
+        #undef _T
+
+        /*
+            And define it again in the same way as it's done in wx/wxchar.h.
+         */
+        #if wxUSE_UNICODE
+            #define _T(x) wxCONCAT_HELPER(L, x)
+        #else /* !Unicode */
+            #define _T(x) x
+        #endif /* Unicode/!Unicode */
+    #endif /* we need _T() to be defined */
+#endif /* defined(__SUNPRO_CC) || defined(__SUNPRO_C) */
diff --git a/Source/3rd Party/wx/include/wx/anidecod.h b/Source/3rd Party/wx/include/wx/anidecod.h
index 9183c75e7..6e3847614 100644
--- a/Source/3rd Party/wx/include/wx/anidecod.h	
+++ b/Source/3rd Party/wx/include/wx/anidecod.h	
@@ -2,7 +2,7 @@
 // Name:        wx/anidecod.h
 // Purpose:     wxANIDecoder, ANI reader for wxImage and wxAnimation
 // Author:      Francesco Montorsi
-// CVS-ID:      $Id$
+// CVS-ID:      $Id: anidecod.h 45563 2007-04-21 18:17:50Z VZ $
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_STREAMS && (wxUSE_ICO_CUR || wxUSE_GIF)
+#if wxUSE_STREAMS && wxUSE_ICO_CUR
 
 #include "wx/stream.h"
 #include "wx/image.h"
@@ -20,7 +20,7 @@
 #include "wx/dynarray.h"
 
 
-class /*WXDLLIMPEXP_CORE*/ wxANIFrameInfo;      // private implementation detail
+class /*WXDLLEXPORT*/ wxANIFrameInfo;
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxANIFrameInfo, wxANIFrameInfoArray);
 WX_DECLARE_EXPORTED_OBJARRAY(wxImage, wxImageArray);
@@ -29,7 +29,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxImage, wxImageArray);
 // wxANIDecoder class
 // --------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxANIDecoder : public wxAnimationDecoder
+class WXDLLEXPORT wxANIDecoder : public wxAnimationDecoder
 {
 public:
     // constructor, destructor, etc.
@@ -44,7 +44,7 @@ public:
     virtual wxColour GetTransparentColour(unsigned int frame) const;
 
     // implementation of wxAnimationDecoder's pure virtuals
-
+    virtual bool CanRead( wxInputStream& stream ) const;
     virtual bool Load( wxInputStream& stream );
 
     bool ConvertToImage(unsigned int frame, wxImage *image) const;
@@ -55,10 +55,6 @@ public:
         { return wxANIMATION_TYPE_ANI; }
 
 private:
-    // wxAnimationDecoder pure virtual:
-    virtual bool DoCanRead( wxInputStream& stream ) const;
-            // modifies current stream position (see wxAnimationDecoder::CanRead)
-
     // frames stored as wxImage(s): ANI files are meant to be used mostly for animated
     // cursors and thus they do not use any optimization to encode differences between
     // two frames: they are just a list of images to display sequentially.
@@ -72,10 +68,10 @@ private:
     static wxCURHandler sm_handler;
 
 
-    wxDECLARE_NO_COPY_CLASS(wxANIDecoder);
+    DECLARE_NO_COPY_CLASS(wxANIDecoder)
 };
 
 
-#endif  // wxUSE_STREAMS && (wxUSE_ICO_CUR || wxUSE_GIF)
+#endif  // wxUSE_STREAM && wxUSE_ICO_CUR
 
 #endif  // _WX_ANIDECOD_H
diff --git a/Source/3rd Party/wx/include/wx/animdecod.h b/Source/3rd Party/wx/include/wx/animdecod.h
index 723ffa96a..a1cb15eaa 100644
--- a/Source/3rd Party/wx/include/wx/animdecod.h	
+++ b/Source/3rd Party/wx/include/wx/animdecod.h	
@@ -2,7 +2,7 @@
 // Name:        wx/animdecod.h
 // Purpose:     wxAnimationDecoder
 // Author:      Francesco Montorsi
-// CVS-ID:      $Id$
+// CVS-ID:      $Id: animdecod.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,9 +16,8 @@
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
-#include "wx/log.h"
-#include "wx/stream.h"
 
+class WXDLLIMPEXP_FWD_BASE wxInputStream;
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 /*
@@ -31,15 +30,15 @@ class WXDLLIMPEXP_FWD_CORE wxImage;
     wxAnimationDecoders always load an input stream using some optimized format
     to store it which is format-depedent. This allows to store a (possibly big)
     animation using a format which is a good compromise between required memory
-    and time required to blit it on the screen.
+    and time required to blit in on the screen.
 
- 2) wxAnimationDecoders contain the animation data in some internal variable.
+ 2) wxAnimationDecoders contain the animation data in some internal var.
     That's why they derive from wxObjectRefData: they are data which can be shared.
 
  3) wxAnimationDecoders can be used by a wxImageHandler to retrieve a frame
     in wxImage format; the viceversa cannot be done.
 
- 4) wxAnimationDecoders are decoders only, thus they do not support save features.
+ 4) wxAnimationDecoders are decoders only, thus do not support save features.
 
  5) wxAnimationDecoders are directly used by wxAnimation (generic implementation)
     as wxObjectRefData while they need to be 'wrapped' by a wxImageHandler for
@@ -62,11 +61,11 @@ enum wxAnimationDisposal
     // Do not dispose. The graphic is to be left in place.
     wxANIM_DONOTREMOVE = 0,
 
-    // Restore to background color. The area used by the graphic must be
+    // Restore to background color. The area used by the graphic must be 
     // restored to the background color.
     wxANIM_TOBACKGROUND = 1,
 
-    // Restore to previous. The decoder is required to restore the area
+    // Restore to previous. The decoder is required to restore the area 
     // overwritten by the graphic with what was there prior to rendering the graphic.
     wxANIM_TOPREVIOUS = 2
 };
@@ -85,37 +84,19 @@ enum wxAnimationType
 // wxAnimationDecoder class
 // --------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxAnimationDecoder : public wxObjectRefData
+class WXDLLEXPORT wxAnimationDecoder : public wxObjectRefData
 {
 public:
     wxAnimationDecoder()
     {
+        m_background = wxNullColour;
         m_nFrames = 0;
     }
+    virtual ~wxAnimationDecoder() { }
+
 
     virtual bool Load( wxInputStream& stream ) = 0;
-
-    bool CanRead( wxInputStream& stream ) const
-    {
-        // NOTE: this code is the same of wxImageHandler::CallDoCanRead
-
-        if ( !stream.IsSeekable() )
-            return false;        // can't test unseekable stream
-
-        wxFileOffset posOld = stream.TellI();
-        bool ok = DoCanRead(stream);
-
-        // restore the old position to be able to test other formats and so on
-        if ( stream.SeekI(posOld) == wxInvalidOffset )
-        {
-            wxLogDebug(wxT("Failed to rewind the stream in wxAnimationDecoder!"));
-
-            // reading would fail anyhow as we're not at the right position
-            return false;
-        }
-
-        return ok;
-    }
+    virtual bool CanRead( wxInputStream& stream ) const = 0;
 
     virtual wxAnimationDecoder *Clone() const = 0;
     virtual wxAnimationType GetType() const = 0;
@@ -151,12 +132,6 @@ public:
     unsigned int GetFrameCount() const { return m_nFrames; }
 
 protected:
-    // checks the signature of the data in the given stream and returns true if it
-    // appears to be a valid animation format recognized by the animation decoder;
-    // this function should modify the stream current position without taking care
-    // of restoring it since CanRead() will do it.
-    virtual bool DoCanRead(wxInputStream& stream) const = 0;
-
     wxSize m_szAnimation;
     unsigned int m_nFrames;
 
@@ -165,7 +140,7 @@ protected:
     wxColour m_background;
 };
 
-#endif  // wxUSE_STREAMS
 
+#endif  // wxUSE_STREAM
 #endif  // _WX_ANIMDECOD_H
 
diff --git a/Source/3rd Party/wx/include/wx/any.h b/Source/3rd Party/wx/include/wx/any.h
deleted file mode 100644
index 10e3168bd..000000000
--- a/Source/3rd Party/wx/include/wx/any.h	
+++ /dev/null
@@ -1,1110 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/any.h
-// Purpose:     wxAny class
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     07/05/2009
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ANY_H_
-#define _WX_ANY_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_ANY
-
-#include <new> // for placement new
-#include "wx/string.h"
-#include "wx/meta/if.h"
-#include "wx/typeinfo.h"
-#include "wx/list.h"
-
-// Size of the wxAny value buffer.
-enum
-{
-    WX_ANY_VALUE_BUFFER_SIZE = 16
-};
-
-union wxAnyValueBuffer
-{
-    union Alignment
-    {
-    #if wxHAS_INT64
-        wxInt64 m_int64;
-    #endif
-        long double m_longDouble;
-        void ( *m_funcPtr )(void);
-        void ( wxAnyValueBuffer::*m_mFuncPtr )(void);
-    } m_alignment;
-
-    void*   m_ptr;
-    wxByte  m_buffer[WX_ANY_VALUE_BUFFER_SIZE];
-};
-
-//
-// wxAnyValueType is base class for value type functionality for C++ data
-// types used with wxAny. Usually the default template (wxAnyValueTypeImpl<>)
-// will create a satisfactory wxAnyValueType implementation for a data type.
-//
-class WXDLLIMPEXP_BASE wxAnyValueType
-{
-    WX_DECLARE_ABSTRACT_TYPEINFO(wxAnyValueType)
-public:
-    /**
-        Default constructor.
-    */
-    wxAnyValueType()
-    {
-    }
-
-    /**
-        Destructor.
-    */
-    virtual ~wxAnyValueType()
-    {
-    }
-
-    /**
-        This function is used for internal type matching.
-    */
-    virtual bool IsSameType(const wxAnyValueType* otherType) const = 0;
-
-    /**
-        This function is called every time the data in wxAny
-        buffer needs to be freed.
-    */
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const = 0;
-
-    /**
-        Implement this for buffer-to-buffer copy.
-
-        @param src
-            This is the source data buffer.
-
-        @param dst
-            This is the destination data buffer that is in either
-            uninitialized or freed state.
-    */
-    virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const = 0;
-
-    /**
-        Convert value into buffer of different type. Return false if
-        not possible.
-    */
-    virtual bool ConvertValue(const wxAnyValueBuffer& src,
-                              wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const = 0;
-
-    /**
-        Use this template function for checking if wxAnyValueType represents
-        a specific C++ data type.
-
-        @remarks This template function does not work on some older compilers
-                (such as Visual C++ 6.0). For full compiler compatibility
-                please use wxANY_VALUE_TYPE_CHECK_TYPE(valueTypePtr, T) macro
-                instead.
-
-        @see wxAny::CheckType()
-    */
-    // FIXME-VC6: remove this hack when VC6 is no longer supported
-    template <typename T>
-    bool CheckType(T* reserved = NULL) const;
-
-#if wxUSE_EXTENDED_RTTI
-    virtual const wxTypeInfo* GetTypeInfo() const = 0;
-#endif
-private:
-};
-
-
-//
-// We need to allocate wxAnyValueType instances in heap, and need to use
-// scoped ptr to properly deallocate them in dynamic library use cases.
-// Here we have a minimal specialized scoped ptr implementation to deal
-// with various compiler-specific problems with template class' static
-// member variable of template type with explicit constructor which
-// is initialized in global scope.
-//
-class wxAnyValueTypeScopedPtr
-{
-public:
-    wxAnyValueTypeScopedPtr(wxAnyValueType* ptr) : m_ptr(ptr) { }
-    ~wxAnyValueTypeScopedPtr() { delete m_ptr; }
-    wxAnyValueType* get() const { return m_ptr; }
-private:
-    wxAnyValueType* m_ptr;
-};
-
-
-//
-// This method of checking the type is compatible with VC6
-#define wxANY_VALUE_TYPE_CHECK_TYPE(valueTypePtr, T) \
-    wxAnyValueTypeImpl<T>::IsSameClass(valueTypePtr)
-
-
-/**
-    Helper macro for defining user value types.
-
-    Even though C++ RTTI would be fully available to use, we'd have to to
-    facilitate sub-type system which allows, for instance, wxAny with
-    signed short '15' to be treated equal to wxAny with signed long long '15'.
-    Having sm_instance is important here.
-
-    NB: We really need to have wxAnyValueType instances allocated
-        in heap. They are stored as static template member variables,
-        and with them we just can't be too careful (eg. not allocating
-        them in heap broke the type identification in GCC).
-*/
-#define WX_DECLARE_ANY_VALUE_TYPE(CLS) \
-    friend class wxAny; \
-    WX_DECLARE_TYPEINFO_INLINE(CLS) \
-public: \
-    static bool IsSameClass(const wxAnyValueType* otherType) \
-    { \
-        return wxTypeId(*sm_instance.get()) == wxTypeId(*otherType); \
-    } \
-    virtual bool IsSameType(const wxAnyValueType* otherType) const \
-    { \
-        return IsSameClass(otherType); \
-    } \
-private: \
-    static wxAnyValueTypeScopedPtr sm_instance; \
-public: \
-    static wxAnyValueType* GetInstance() \
-    { \
-        return sm_instance.get(); \
-    }
-
-
-#define WX_IMPLEMENT_ANY_VALUE_TYPE(CLS) \
-wxAnyValueTypeScopedPtr CLS::sm_instance(new CLS());
-
-
-#ifdef __VISUALC6__
-    // "non dll-interface class 'xxx' used as base interface
-    #pragma warning (push)
-    #pragma warning (disable:4275)
-#endif
-
-/**
-    Following are helper classes for the wxAnyValueTypeImplBase.
-*/
-namespace wxPrivate
-{
-
-template<typename T>
-class wxAnyValueTypeOpsInplace
-{
-public:
-    static void DeleteValue(wxAnyValueBuffer& buf)
-    {
-        T* value = reinterpret_cast<T*>(&buf.m_buffer[0]);
-        value->~T();
-
-        // Some compiler may given 'unused variable' warnings without this
-        wxUnusedVar(value);
-    }
-
-    static void SetValue(const T& value,
-                         wxAnyValueBuffer& buf)
-    {
-        // Use placement new
-        void* const place = buf.m_buffer;
-        ::new(place) T(value);
-    }
-
-    static const T& GetValue(const wxAnyValueBuffer& buf)
-    {
-        // Breaking this code into two lines should suppress
-        // GCC's 'type-punned pointer will break strict-aliasing rules'
-        // warning.
-        const T* value = reinterpret_cast<const T*>(&buf.m_buffer[0]);
-        return *value;
-    }
-};
-
-
-template<typename T>
-class wxAnyValueTypeOpsGeneric
-{
-public:
-    template<typename T2>
-    class DataHolder
-    {
-    public:
-        DataHolder(const T2& value)
-        {
-            m_value = value;
-        }
-        virtual ~DataHolder() { }
-
-        T2   m_value;
-    private:
-        wxDECLARE_NO_COPY_CLASS(DataHolder);
-    };
-
-    static void DeleteValue(wxAnyValueBuffer& buf)
-    {
-        DataHolder<T>* holder = static_cast<DataHolder<T>*>(buf.m_ptr);
-        delete holder;
-    }
-
-    static void SetValue(const T& value,
-                         wxAnyValueBuffer& buf)
-    {
-        DataHolder<T>* holder = new DataHolder<T>(value);
-        buf.m_ptr = holder;
-    }
-
-    static const T& GetValue(const wxAnyValueBuffer& buf)
-    {
-        DataHolder<T>* holder = static_cast<DataHolder<T>*>(buf.m_ptr);
-        return holder->m_value;
-    }
-};
-
-} // namespace wxPrivate
-
-
-/**
-    Intermediate template for the generic value type implementation.
-    We can derive from this same value type for multiple actual types
-    (for instance, we can have wxAnyValueTypeImplInt for all signed
-    integer types), and also easily implement specialized templates
-    with specific dynamic type conversion.
-*/
-template<typename T>
-class wxAnyValueTypeImplBase : public wxAnyValueType
-{
-    typedef typename wxIf< sizeof(T) <= WX_ANY_VALUE_BUFFER_SIZE,
-                           wxPrivate::wxAnyValueTypeOpsInplace<T>,
-                           wxPrivate::wxAnyValueTypeOpsGeneric<T> >::value
-            Ops;
-
-public:
-    wxAnyValueTypeImplBase() : wxAnyValueType() { }
-    virtual ~wxAnyValueTypeImplBase() { }
-
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const
-    {
-        Ops::DeleteValue(buf);
-    }
-
-    virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const
-    {
-        Ops::SetValue(Ops::GetValue(src), dst);
-    }
-
-    /**
-        It is important to reimplement this in any specialized template
-        classes that inherit from wxAnyValueTypeImplBase.
-    */
-    static void SetValue(const T& value,
-                         wxAnyValueBuffer& buf)
-    {
-        Ops::SetValue(value, buf);
-    }
-
-    /**
-        It is important to reimplement this in any specialized template
-        classes that inherit from wxAnyValueTypeImplBase.
-    */
-    static const T& GetValue(const wxAnyValueBuffer& buf)
-    {
-        return Ops::GetValue(buf);
-    }
-#if wxUSE_EXTENDED_RTTI
-    virtual const wxTypeInfo* GetTypeInfo() const 
-    {
-        return wxGetTypeInfo((T*)NULL);
-    }
-#endif
-};
-
-
-/*
-    Generic value type template. Note that bulk of the implementation
-    resides in wxAnyValueTypeImplBase.
-*/
-template<typename T>
-class wxAnyValueTypeImpl : public wxAnyValueTypeImplBase<T>
-{
-    WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl<T>)
-public:
-    wxAnyValueTypeImpl() : wxAnyValueTypeImplBase<T>() { }
-    virtual ~wxAnyValueTypeImpl() { }
-
-    virtual bool ConvertValue(const wxAnyValueBuffer& src,
-                              wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const
-    {
-        wxUnusedVar(src);
-        wxUnusedVar(dstType);
-        wxUnusedVar(dst);
-        return false;
-    }
-};
-
-template<typename T>
-wxAnyValueTypeScopedPtr wxAnyValueTypeImpl<T>::sm_instance = new wxAnyValueTypeImpl<T>();
-
-
-//
-// Helper macro for using same base value type implementation for multiple
-// actual C++ data types.
-//
-#define _WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE) \
-template<> \
-class wxAnyValueTypeImpl<T> : public wxAnyValueTypeImpl##CLSTYPE \
-{ \
-    typedef wxAnyBase##CLSTYPE##Type UseDataType; \
-public: \
-    wxAnyValueTypeImpl() : wxAnyValueTypeImpl##CLSTYPE() { } \
-    virtual ~wxAnyValueTypeImpl() { } \
-    static void SetValue(const T& value, wxAnyValueBuffer& buf) \
-    { \
-        void* voidPtr = reinterpret_cast<void*>(&buf.m_buffer[0]); \
-        UseDataType* dptr = reinterpret_cast<UseDataType*>(voidPtr); \
-        *dptr = static_cast<UseDataType>(value); \
-    } \
-    static T GetValue(const wxAnyValueBuffer& buf) \
-    { \
-        const void* voidPtr = \
-            reinterpret_cast<const void*>(&buf.m_buffer[0]); \
-        const UseDataType* sptr = \
-            reinterpret_cast<const UseDataType*>(voidPtr); \
-        return static_cast<T>(*sptr); \
-    } 
-
-#if wxUSE_EXTENDED_RTTI
-#define WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE) \
-_WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE)\
-    virtual const wxTypeInfo* GetTypeInfo() const  \
-    { \
-        return wxGetTypeInfo((T*)NULL); \
-    } \
-};
-#else
-#define WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE) \
-_WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE)\
-};
-#endif
-
-//
-//  Integer value types
-//
-
-#ifdef wxLongLong_t
-    typedef wxLongLong_t wxAnyBaseIntType;
-    typedef wxULongLong_t wxAnyBaseUintType;
-#else
-    typedef long wxAnyBaseIntType;
-    typedef unsigned long wxAnyBaseUintType;
-#endif
-
-
-class WXDLLIMPEXP_BASE wxAnyValueTypeImplInt :
-    public wxAnyValueTypeImplBase<wxAnyBaseIntType>
-{
-    WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImplInt)
-public:
-    wxAnyValueTypeImplInt() :
-        wxAnyValueTypeImplBase<wxAnyBaseIntType>() { }
-    virtual ~wxAnyValueTypeImplInt() { }
-
-    virtual bool ConvertValue(const wxAnyValueBuffer& src,
-                              wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
-};
-
-
-class WXDLLIMPEXP_BASE wxAnyValueTypeImplUint :
-    public wxAnyValueTypeImplBase<wxAnyBaseUintType>
-{
-    WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImplUint)
-public:
-    wxAnyValueTypeImplUint() :
-        wxAnyValueTypeImplBase<wxAnyBaseUintType>() { }
-    virtual ~wxAnyValueTypeImplUint() { }
-
-    virtual bool ConvertValue(const wxAnyValueBuffer& src,
-                              wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
-};
-
-
-WX_ANY_DEFINE_SUB_TYPE(signed long, Int)
-WX_ANY_DEFINE_SUB_TYPE(signed int, Int)
-WX_ANY_DEFINE_SUB_TYPE(signed short, Int)
-WX_ANY_DEFINE_SUB_TYPE(signed char, Int)
-#ifdef wxLongLong_t
-WX_ANY_DEFINE_SUB_TYPE(wxLongLong_t, Int)
-#endif
-
-WX_ANY_DEFINE_SUB_TYPE(unsigned long, Uint)
-WX_ANY_DEFINE_SUB_TYPE(unsigned int, Uint)
-WX_ANY_DEFINE_SUB_TYPE(unsigned short, Uint)
-WX_ANY_DEFINE_SUB_TYPE(unsigned char, Uint)
-#ifdef wxLongLong_t
-WX_ANY_DEFINE_SUB_TYPE(wxULongLong_t, Uint)
-#endif
-
-
-//
-// This macro is used in header, but then in source file we must have:
-// WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl##TYPENAME)
-//
-#define _WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, CONVFUNC, GV) \
-class WXDLLIMPEXP_BASE wxAnyValueTypeImpl##TYPENAME : \
-    public wxAnyValueTypeImplBase<T> \
-{ \
-    WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl##TYPENAME) \
-public: \
-    wxAnyValueTypeImpl##TYPENAME() : \
-        wxAnyValueTypeImplBase<T>() { } \
-    virtual ~wxAnyValueTypeImpl##TYPENAME() { } \
-    virtual bool ConvertValue(const wxAnyValueBuffer& src, \
-                              wxAnyValueType* dstType, \
-                              wxAnyValueBuffer& dst) const \
-    { \
-        GV value = GetValue(src); \
-        return CONVFUNC(value, dstType, dst); \
-    } \
-}; \
-template<> \
-class wxAnyValueTypeImpl<T> : public wxAnyValueTypeImpl##TYPENAME \
-{ \
-public: \
-    wxAnyValueTypeImpl() : wxAnyValueTypeImpl##TYPENAME() { } \
-    virtual ~wxAnyValueTypeImpl() { } \
-};
-
-#define WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, CONVFUNC, BT) \
-_WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, CONVFUNC, BT) \
-
-#define WX_ANY_DEFINE_CONVERTIBLE_TYPE_BASE(T, TYPENAME, CONVFUNC) \
-_WX_ANY_DEFINE_CONVERTIBLE_TYPE(T, TYPENAME, \
-                                CONVFUNC, const T&) \
-
-//
-// String value type
-//
-
-// Convert wxString to destination wxAny value type
-extern WXDLLIMPEXP_BASE bool wxAnyConvertString(const wxString& value,
-                                                wxAnyValueType* dstType,
-                                                wxAnyValueBuffer& dst);
-
-WX_ANY_DEFINE_CONVERTIBLE_TYPE_BASE(wxString, wxString, wxAnyConvertString)
-WX_ANY_DEFINE_CONVERTIBLE_TYPE(const char*, ConstCharPtr,
-                               wxAnyConvertString, wxString)
-WX_ANY_DEFINE_CONVERTIBLE_TYPE(const wchar_t*, ConstWchar_tPtr,
-                               wxAnyConvertString, wxString)
-
-//
-// Bool value type
-//
-template<>
-class WXDLLIMPEXP_BASE wxAnyValueTypeImpl<bool> :
-    public wxAnyValueTypeImplBase<bool>
-{
-    WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl<bool>)
-public:
-    wxAnyValueTypeImpl() :
-        wxAnyValueTypeImplBase<bool>() { }
-    virtual ~wxAnyValueTypeImpl() { }
-
-    virtual bool ConvertValue(const wxAnyValueBuffer& src,
-                              wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
-};
-
-//
-// Floating point value type
-//
-class WXDLLIMPEXP_BASE wxAnyValueTypeImplDouble :
-    public wxAnyValueTypeImplBase<double>
-{
-    WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImplDouble)
-public:
-    wxAnyValueTypeImplDouble() :
-        wxAnyValueTypeImplBase<double>() { }
-    virtual ~wxAnyValueTypeImplDouble() { }
-
-    virtual bool ConvertValue(const wxAnyValueBuffer& src,
-                              wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
-};
-
-// WX_ANY_DEFINE_SUB_TYPE requires this
-typedef double wxAnyBaseDoubleType;
-
-WX_ANY_DEFINE_SUB_TYPE(float, Double)
-WX_ANY_DEFINE_SUB_TYPE(double, Double)
-
-
-//
-// Defines a dummy wxAnyValueTypeImpl<> with given export
-// declaration. This is needed if a class is used with
-// wxAny in both user shared library and application.
-//
-#define wxDECLARE_ANY_TYPE(CLS, DECL) \
-template<> \
-class DECL wxAnyValueTypeImpl<CLS> : \
-    public wxAnyValueTypeImplBase<CLS> \
-{ \
-    WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl<CLS>) \
-public: \
-    wxAnyValueTypeImpl() : \
-        wxAnyValueTypeImplBase<CLS>() { } \
-    virtual ~wxAnyValueTypeImpl() { } \
- \
-    virtual bool ConvertValue(const wxAnyValueBuffer& src, \
-                              wxAnyValueType* dstType, \
-                              wxAnyValueBuffer& dst) const \
-    { \
-        wxUnusedVar(src); \
-        wxUnusedVar(dstType); \
-        wxUnusedVar(dst); \
-        return false; \
-    } \
-};
-
-
-// Make sure some of wx's own types get the right wxAnyValueType export
-// (this is needed only for types that are referred to from wxBase.
-// currently we may not use any of these types from there, but let's
-// use the macro on at least one to make sure it compiles since we can't
-// really test it properly in unit tests since a separate DLL would
-// be needed).
-#if wxUSE_DATETIME
-    #include "wx/datetime.h"
-    wxDECLARE_ANY_TYPE(wxDateTime, WXDLLIMPEXP_BASE)
-#endif
-
-//#include "wx/object.h"
-//wxDECLARE_ANY_TYPE(wxObject*, WXDLLIMPEXP_BASE)
-
-//#include "wx/arrstr.h"
-//wxDECLARE_ANY_TYPE(wxArrayString, WXDLLIMPEXP_BASE)
-
-
-#if wxUSE_VARIANT
-
-class WXDLLIMPEXP_FWD_BASE wxAnyToVariantRegistration;
-
-// Because of header inter-dependencies, cannot include this earlier
-#include "wx/variant.h"
-
-//
-// wxVariantData* data type implementation. For cases when appropriate
-// wxAny<->wxVariant conversion code is missing.
-//
-
-class WXDLLIMPEXP_BASE wxAnyValueTypeImplVariantData :
-    public wxAnyValueTypeImplBase<wxVariantData*>
-{
-    WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImplVariantData)
-public:
-    wxAnyValueTypeImplVariantData() :
-        wxAnyValueTypeImplBase<wxVariantData*>() { }
-    virtual ~wxAnyValueTypeImplVariantData() { }
-
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const
-    {
-        wxVariantData* data = static_cast<wxVariantData*>(buf.m_ptr);
-        if ( data )
-            data->DecRef();
-    }
-
-    virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const
-    {
-        wxVariantData* data = static_cast<wxVariantData*>(src.m_ptr);
-        if ( data )
-            data->IncRef();
-        dst.m_ptr = data;
-    }
-
-    static void SetValue(wxVariantData* value,
-                         wxAnyValueBuffer& buf)
-    {
-        value->IncRef();
-        buf.m_ptr = value;
-    }
-
-    static wxVariantData* GetValue(const wxAnyValueBuffer& buf)
-    {
-        return static_cast<wxVariantData*>(buf.m_ptr);
-    }
-
-    virtual bool ConvertValue(const wxAnyValueBuffer& src,
-                              wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const
-    {
-        wxUnusedVar(src);
-        wxUnusedVar(dstType);
-        wxUnusedVar(dst);
-        return false;
-    }
-};
-
-template<>
-class wxAnyValueTypeImpl<wxVariantData*> :
-    public wxAnyValueTypeImplVariantData
-{
-public:
-    wxAnyValueTypeImpl() : wxAnyValueTypeImplVariantData() { }
-    virtual ~wxAnyValueTypeImpl() { }
-};
-
-#endif // wxUSE_VARIANT
-
-#ifdef __VISUALC6__
-    // Re-enable useless VC6 warnings
-    #pragma warning (pop)
-#endif
-
-
-/*
-    Let's define a discrete Null value so we don't have to really
-    ever check if wxAny.m_type pointer is NULL or not. This is an
-    optimization, mostly. Implementation of this value type is
-    "hidden" in the source file.
-*/
-extern WXDLLIMPEXP_DATA_BASE(wxAnyValueType*) wxAnyNullValueType;
-
-
-//
-// We need to implement custom signed/unsigned int equals operators
-// for signed/unsigned (eg. wxAny(128UL) == 128L) comparisons to work.
-#define WXANY_IMPLEMENT_INT_EQ_OP(TS, TUS) \
-bool operator==(TS value) const \
-{ \
-    if ( wxAnyValueTypeImpl<TS>::IsSameClass(m_type) ) \
-        return (value == static_cast<TS> \
-                (wxAnyValueTypeImpl<TS>::GetValue(m_buffer))); \
-    if ( wxAnyValueTypeImpl<TUS>::IsSameClass(m_type) ) \
-        return (value == static_cast<TS> \
-                (wxAnyValueTypeImpl<TUS>::GetValue(m_buffer))); \
-    return false; \
-} \
-bool operator==(TUS value) const \
-{ \
-    if ( wxAnyValueTypeImpl<TUS>::IsSameClass(m_type) ) \
-        return (value == static_cast<TUS> \
-                (wxAnyValueTypeImpl<TUS>::GetValue(m_buffer))); \
-    if ( wxAnyValueTypeImpl<TS>::IsSameClass(m_type) ) \
-        return (value == static_cast<TUS> \
-                (wxAnyValueTypeImpl<TS>::GetValue(m_buffer))); \
-    return false; \
-}
-
-
-#if wxUSE_VARIANT
-
-// Note that the following functions are implemented outside wxAny class
-// so that it can reside entirely in header and lack the export declaration.
-
-// Helper function used to associate wxAnyValueType with a wxVariantData.
-extern WXDLLIMPEXP_BASE void
-wxPreRegisterAnyToVariant(wxAnyToVariantRegistration* reg);
-
-// This function performs main wxAny to wxVariant conversion duties.
-extern WXDLLIMPEXP_BASE bool
-wxConvertAnyToVariant(const wxAny& any, wxVariant* variant);
-
-#endif // wxUSE_VARIANT
-
-
-//
-// The wxAny class represents a container for any type. A variant's value
-// can be changed at run time, possibly to a different type of value.
-//
-// As standard, wxAny can store value of almost any type, in a fairly
-// optimal manner even.
-//
-class wxAny
-{
-public:
-    /**
-        Default constructor.
-    */
-    wxAny()
-    {
-        m_type = wxAnyNullValueType;
-    }
-
-    /**
-        Destructor.
-    */
-    ~wxAny()
-    {
-        m_type->DeleteValue(m_buffer);
-    }
-
-    //@{
-    /**
-        Various constructors.
-    */
-    template<typename T>
-    wxAny(const T& value)
-    {
-        m_type = wxAnyValueTypeImpl<T>::sm_instance.get();
-        wxAnyValueTypeImpl<T>::SetValue(value, m_buffer);
-    }
-
-    // These two constructors are needed to deal with string literals
-    wxAny(const char* value)
-    {
-        m_type = wxAnyValueTypeImpl<const char*>::sm_instance.get();
-        wxAnyValueTypeImpl<const char*>::SetValue(value, m_buffer);
-    }
-    wxAny(const wchar_t* value)
-    {
-        m_type = wxAnyValueTypeImpl<const wchar_t*>::sm_instance.get();
-        wxAnyValueTypeImpl<const wchar_t*>::SetValue(value, m_buffer);
-    }
-
-    wxAny(const wxAny& any)
-    {
-        m_type = wxAnyNullValueType;
-        AssignAny(any);
-    }
-
-#if wxUSE_VARIANT
-    wxAny(const wxVariant& variant)
-    {
-        m_type = wxAnyNullValueType;
-        AssignVariant(variant);
-    }
-#endif
-
-    //@}
-
-    /**
-        Use this template function for checking if this wxAny holds
-        a specific C++ data type.
-
-        @remarks This template function does not work on some older compilers
-                (such as Visual C++ 6.0). For full compiler ccompatibility
-                please use wxANY_CHECK_TYPE(any, T) macro instead.
-
-        @see wxAnyValueType::CheckType()
-    */
-    // FIXME-VC6: remove this hack when VC6 is no longer supported
-    template <typename T>
-    bool CheckType(T* = NULL) const
-    {
-        return m_type->CheckType<T>();
-    }
-
-    /**
-        Returns the value type as wxAnyValueType instance.
-
-        @remarks You cannot reliably test whether two wxAnys are of
-                 same value type by simply comparing return values
-                 of wxAny::GetType(). Instead, use wxAny::HasSameType().
-
-        @see HasSameType()
-    */
-    const wxAnyValueType* GetType() const
-    {
-        return m_type;
-    }
-
-    /**
-        Returns @true if this and another wxAny have the same
-        value type.
-    */
-    bool HasSameType(const wxAny& other) const
-    {
-        return GetType()->IsSameType(other.GetType());
-    }
-
-    /**
-        Tests if wxAny is null (that is, whether there is no data).
-    */
-    bool IsNull() const
-    {
-        return (m_type == wxAnyNullValueType);
-    }
-
-    /**
-        Makes wxAny null (that is, clears it).
-    */
-    void MakeNull()
-    {
-        m_type->DeleteValue(m_buffer);
-        m_type = wxAnyNullValueType;
-    }
-
-    //@{
-    /**
-        Assignment operators.
-    */
-    template<typename T>
-    wxAny& operator=(const T &value)
-    {
-        m_type->DeleteValue(m_buffer);
-        m_type = wxAnyValueTypeImpl<T>::sm_instance.get();
-        wxAnyValueTypeImpl<T>::SetValue(value, m_buffer);
-        return *this;
-    }
-
-    wxAny& operator=(const wxAny &any)
-    {
-        if (this != &any)
-            AssignAny(any);
-        return *this;
-    }
-
-#if wxUSE_VARIANT
-    wxAny& operator=(const wxVariant &variant)
-    {
-        AssignVariant(variant);
-        return *this;
-    }
-#endif
-
-    // These two operators are needed to deal with string literals
-    wxAny& operator=(const char* value)
-    {
-        Assign(value);
-        return *this;
-    }
-    wxAny& operator=(const wchar_t* value)
-    {
-        Assign(value);
-        return *this;
-    }
-
-    //@{
-    /**
-        Equality operators.
-    */
-    bool operator==(const wxString& value) const
-    {
-        wxString value2;
-        if ( !GetAs(&value2) )
-            return false;
-        return value == value2;
-    }
-
-    bool operator==(const char* value) const
-        { return (*this) == wxString(value); }
-    bool operator==(const wchar_t* value) const
-        { return (*this) == wxString(value); }
-
-    //
-    // We need to implement custom signed/unsigned int equals operators
-    // for signed/unsigned (eg. wxAny(128UL) == 128L) comparisons to work.
-    WXANY_IMPLEMENT_INT_EQ_OP(signed char, unsigned char)
-    WXANY_IMPLEMENT_INT_EQ_OP(signed short, unsigned short)
-    WXANY_IMPLEMENT_INT_EQ_OP(signed int, unsigned int)
-    WXANY_IMPLEMENT_INT_EQ_OP(signed long, unsigned long)
-#ifdef wxLongLong_t
-    WXANY_IMPLEMENT_INT_EQ_OP(wxLongLong_t, wxULongLong_t)
-#endif
-
-    bool operator==(float value) const
-    {
-        if ( !wxAnyValueTypeImpl<float>::IsSameClass(m_type) )
-            return false;
-
-        return value ==
-            static_cast<float>
-                (wxAnyValueTypeImpl<float>::GetValue(m_buffer));
-    }
-
-    bool operator==(double value) const
-    {
-        if ( !wxAnyValueTypeImpl<double>::IsSameClass(m_type) )
-            return false;
-
-        return value ==
-            static_cast<double>
-                (wxAnyValueTypeImpl<double>::GetValue(m_buffer));
-    }
-
-    bool operator==(bool value) const
-    {
-        if ( !wxAnyValueTypeImpl<bool>::IsSameClass(m_type) )
-            return false;
-
-        return value == (wxAnyValueTypeImpl<bool>::GetValue(m_buffer));
-    }
-
-    //@}
-
-    //@{
-    /**
-        Inequality operators (implement as template).
-    */
-    template<typename T>
-    bool operator!=(const T& value) const
-        { return !((*this) == value); }
-    //@}
-
-    /**
-        This template function converts wxAny into given type. In most cases
-        no type conversion is performed, so if the type is incorrect an
-        assertion failure will occur.
-
-        @remarks For convenience, conversion is done when T is wxString. This
-                 is useful when a string literal (which are treated as
-                 const char* and const wchar_t*) has been assigned to wxAny.
-
-                 This template function may not work properly with Visual C++
-                 6. For full compiler compatibility, please use
-                 wxANY_AS(any, T) macro instead.
-    */
-    // FIXME-VC6: remove this hack when VC6 is no longer supported
-    template<typename T>
-    T As(T* = NULL) const
-    {
-        if ( !wxAnyValueTypeImpl<T>::IsSameClass(m_type) )
-        {
-            wxFAIL_MSG("Incorrect or non-convertible data type");
-        }
-
-        return static_cast<T>(wxAnyValueTypeImpl<T>::GetValue(m_buffer));
-    }
-
-    // Allow easy conversion from 'const char *' etc. to wxString
-    // FIXME-VC6: remove this hack when VC6 is no longer supported
-    //template<>
-    wxString As(wxString*) const
-    {
-        wxString value;
-        if ( !GetAs(&value) )
-        {
-            wxFAIL_MSG("Incorrect or non-convertible data type");
-        }
-        return value;
-    }
-
-#if wxUSE_EXTENDED_RTTI
-    const wxTypeInfo* GetTypeInfo() const
-    {
-        return m_type->GetTypeInfo();
-    }
-#endif
-    /**
-        Template function that retrieves and converts the value of this
-        variant to the type that T* value is.
-
-        @return Returns @true if conversion was successful.
-    */
-    template<typename T>
-    bool GetAs(T* value) const
-    {
-        if ( !wxAnyValueTypeImpl<T>::IsSameClass(m_type) )
-        {
-            wxAnyValueType* otherType =
-                wxAnyValueTypeImpl<T>::sm_instance.get();
-            wxAnyValueBuffer temp_buf;
-
-            if ( !m_type->ConvertValue(m_buffer, otherType, temp_buf) )
-                return false;
-
-            *value =
-                static_cast<T>(wxAnyValueTypeImpl<T>::GetValue(temp_buf));
-            otherType->DeleteValue(temp_buf);
-
-            return true;
-        }
-        *value = static_cast<T>(wxAnyValueTypeImpl<T>::GetValue(m_buffer));
-        return true;
-    }
-
-#if wxUSE_VARIANT
-    // GetAs() wxVariant specialization
-    bool GetAs(wxVariant* value) const
-    {
-        return wxConvertAnyToVariant(*this, value);
-    }
-#endif
-
-private:
-    // Assignment functions
-    void AssignAny(const wxAny& any)
-    {
-        // Must delete value - CopyBuffer() never does that
-        m_type->DeleteValue(m_buffer);
-
-        wxAnyValueType* newType = any.m_type;
-
-        if ( !newType->IsSameType(m_type) )
-            m_type = newType;
-
-        newType->CopyBuffer(any.m_buffer, m_buffer);
-    }
-
-#if wxUSE_VARIANT
-    void AssignVariant(const wxVariant& variant)
-    {
-        wxVariantData* data = variant.GetData();
-
-        if ( data && data->GetAsAny(this) )
-            return;
-
-        m_type->DeleteValue(m_buffer);
-
-        if ( variant.IsNull() )
-        {
-            // Init as Null
-            m_type = wxAnyNullValueType;
-        }
-        else
-        {
-            // If everything else fails, wrap the whole wxVariantData
-            m_type = wxAnyValueTypeImpl<wxVariantData*>::sm_instance.get();
-            wxAnyValueTypeImpl<wxVariantData*>::SetValue(data, m_buffer);
-        }
-    }
-#endif
-
-    template<typename T>
-    void Assign(const T &value)
-    {
-        m_type->DeleteValue(m_buffer);
-        m_type = wxAnyValueTypeImpl<T>::sm_instance.get();
-        wxAnyValueTypeImpl<T>::SetValue(value, m_buffer);
-    }
-
-    // Data
-    wxAnyValueBuffer    m_buffer;
-    wxAnyValueType*     m_type;
-};
-
-
-//
-// This method of checking the type is compatible with VC6
-#define wxANY_CHECK_TYPE(any, T) \
-    wxANY_VALUE_TYPE_CHECK_TYPE((any).GetType(), T)
-
-
-//
-// This method of getting the value is compatible with VC6
-#define wxANY_AS(any, T) \
-    (any).As(static_cast<T*>(NULL))
-
-
-template<typename T>
-inline bool wxAnyValueType::CheckType(T* reserved) const
-{
-    wxUnusedVar(reserved);
-    return wxAnyValueTypeImpl<T>::IsSameClass(this);
-}
-
-WX_DECLARE_LIST_WITH_DECL(wxAny, wxAnyList, class WXDLLIMPEXP_BASE);
-
-#endif // wxUSE_ANY
-
-#endif // _WX_ANY_H_
diff --git a/Source/3rd Party/wx/include/wx/anybutton.h b/Source/3rd Party/wx/include/wx/anybutton.h
deleted file mode 100644
index 520f51222..000000000
--- a/Source/3rd Party/wx/include/wx/anybutton.h	
+++ /dev/null
@@ -1,200 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/anybutton.h
-// Purpose:     wxAnyButtonBase class
-// Author:      Vadim Zetlin
-// Created:     2000-08-15 (extracted from button.h)
-// RCS-ID:      $Id$
-// Copyright:   (c) Vadim Zetlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ANYBUTTON_H_BASE_
-#define _WX_ANYBUTTON_H_BASE_
-
-#include "wx/defs.h"
-
-#ifdef wxHAS_ANY_BUTTON
-
-// ----------------------------------------------------------------------------
-// wxAnyButton specific flags
-// ----------------------------------------------------------------------------
-
-// These flags affect label alignment
-#define wxBU_LEFT            0x0040
-#define wxBU_TOP             0x0080
-#define wxBU_RIGHT           0x0100
-#define wxBU_BOTTOM          0x0200
-#define wxBU_ALIGN_MASK      ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
-
-// These two flags are obsolete
-#define wxBU_NOAUTODRAW      0x0000
-#define wxBU_AUTODRAW        0x0004
-
-// by default, the buttons will be created with some (system dependent)
-// minimal size to make them look nicer, giving this style will make them as
-// small as possible
-#define wxBU_EXACTFIT        0x0001
-
-// this flag can be used to disable using the text label in the button: it is
-// mostly useful when creating buttons showing bitmap and having stock id as
-// without it both the standard label corresponding to the stock id and the
-// bitmap would be shown
-#define wxBU_NOTEXT          0x0002
-
-
-#include "wx/bitmap.h"
-#include "wx/control.h"
-
-// ----------------------------------------------------------------------------
-// wxAnyButton: common button functionality
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxAnyButtonBase : public wxControl
-{
-public:
-    wxAnyButtonBase() { }
-
-    // show the image in the button in addition to the label: this method is
-    // supported on all (major) platforms
-    void SetBitmap(const wxBitmap& bitmap, wxDirection dir = wxLEFT)
-    {
-        SetBitmapLabel(bitmap);
-        SetBitmapPosition(dir);
-    }
-
-    wxBitmap GetBitmap() const { return DoGetBitmap(State_Normal); }
-
-    // Methods for setting individual images for different states: normal,
-    // selected (meaning pushed or pressed), focused (meaning normal state for
-    // a focused button), disabled or hover (a.k.a. hot or current).
-    //
-    // Remember that SetBitmap() itself must be called before any other
-    // SetBitmapXXX() methods (except for SetBitmapLabel() which is a synonym
-    // for it anyhow) and that all bitmaps passed to these functions should be
-    // of the same size.
-    void SetBitmapLabel(const wxBitmap& bitmap)
-        { DoSetBitmap(bitmap, State_Normal); }
-    void SetBitmapPressed(const wxBitmap& bitmap)
-        { DoSetBitmap(bitmap, State_Pressed); }
-    void SetBitmapDisabled(const wxBitmap& bitmap)
-        { DoSetBitmap(bitmap, State_Disabled); }
-    void SetBitmapCurrent(const wxBitmap& bitmap)
-        { DoSetBitmap(bitmap, State_Current); }
-    void SetBitmapFocus(const wxBitmap& bitmap)
-        { DoSetBitmap(bitmap, State_Focused); }
-
-    wxBitmap GetBitmapLabel() const { return DoGetBitmap(State_Normal); }
-    wxBitmap GetBitmapPressed() const { return DoGetBitmap(State_Pressed); }
-    wxBitmap GetBitmapDisabled() const { return DoGetBitmap(State_Disabled); }
-    wxBitmap GetBitmapCurrent() const { return DoGetBitmap(State_Current); }
-    wxBitmap GetBitmapFocus() const { return DoGetBitmap(State_Focused); }
-
-
-    // set the margins around the image
-    void SetBitmapMargins(wxCoord x, wxCoord y) { DoSetBitmapMargins(x, y); }
-    void SetBitmapMargins(const wxSize& sz) { DoSetBitmapMargins(sz.x, sz.y); }
-    wxSize GetBitmapMargins() { return DoGetBitmapMargins(); }
-
-    // set the image position relative to the text, i.e. wxLEFT means that the
-    // image is to the left of the text (this is the default)
-    void SetBitmapPosition(wxDirection dir);
-
-
-    // Buttons on MSW can look bad if they are not native colours, because
-    // then they become owner-drawn and not theme-drawn.  Disable it here
-    // in wxAnyButtonBase to make it consistent.
-    virtual bool ShouldInheritColours() const { return false; }
-
-    // wxUniv-compatible and deprecated equivalents to SetBitmapXXX()
-#if WXWIN_COMPATIBILITY_2_8
-    void SetImageLabel(const wxBitmap& bitmap) { SetBitmap(bitmap); }
-    void SetImageMargins(wxCoord x, wxCoord y) { SetBitmapMargins(x, y); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
-    // backwards compatible names for pressed/current bitmaps: they're not
-    // deprecated as there is nothing really wrong with using them and no real
-    // advantage to using the new names but the new names are still preferred
-    wxBitmap GetBitmapSelected() const { return GetBitmapPressed(); }
-    wxBitmap GetBitmapHover() const { return GetBitmapCurrent(); }
-
-    void SetBitmapSelected(const wxBitmap& bitmap) { SetBitmapPressed(bitmap); }
-    void SetBitmapHover(const wxBitmap& bitmap) { SetBitmapCurrent(bitmap); }
-
-
-    // this enum is not part of wx public API, it is public because it is used
-    // in non wxAnyButton-derived classes internally
-    //
-    // also notice that MSW code relies on the values of the enum elements, do
-    // not change them without revising src/msw/button.cpp
-    enum State
-    {
-        State_Normal,
-        State_Current,    // a.k.a. hot or "hovering"
-        State_Pressed,    // a.k.a. "selected" in public API for some reason
-        State_Disabled,
-        State_Focused,
-        State_Max
-    };
-
-    // return true if this button shouldn't show the text label, either because
-    // it doesn't have it or because it was explicitly disabled with wxBU_NOTEXT
-    bool DontShowLabel() const
-    {
-        return HasFlag(wxBU_NOTEXT) || GetLabel().empty();
-    }
-
-    // return true if we do show the label
-    bool ShowsLabel() const
-    {
-        return !DontShowLabel();
-    }
-
-protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const
-        { return wxBitmap(); }
-    virtual void DoSetBitmap(const wxBitmap& WXUNUSED(bitmap),
-                             State WXUNUSED(which))
-        { }
-
-    virtual wxSize DoGetBitmapMargins() const
-        { return wxSize(0, 0); }
-
-    virtual void DoSetBitmapMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
-        { }
-
-    virtual void DoSetBitmapPosition(wxDirection WXUNUSED(dir))
-        { }
-
-    virtual bool DoGetAuthNeeded() const { return false; }
-    virtual void DoSetAuthNeeded(bool WXUNUSED(show)) { }
-
-
-    wxDECLARE_NO_COPY_CLASS(wxAnyButtonBase);
-};
-
-#if defined(__WXUNIVERSAL__)
-    #include "wx/univ/anybutton.h"
-#elif defined(__WXMSW__)
-    #include "wx/msw/anybutton.h"
-//#elif defined(__WXMOTIF__)
-//    #include "wx/motif/anybutton.h"
-#elif defined(__WXGTK20__)
-    #include "wx/gtk/anybutton.h"
-//#elif defined(__WXGTK__)
-//    #include "wx/gtk1/anybutton.h"
-#elif defined(__WXMAC__)
-    #include "wx/osx/anybutton.h"
-//#elif defined(__WXCOCOA__)
-//    #include "wx/cocoa/anybutton.h"
-//#elif defined(__WXPM__)
-//    #include "wx/os2/anybutton.h"
-#else
-    typedef wxAnyButtonBase wxAnyButton;
-#endif
-
-#endif // wxHAS_ANY_BUTTON
-
-#endif // _WX_ANYBUTTON_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/anystr.h b/Source/3rd Party/wx/include/wx/anystr.h
deleted file mode 100644
index c924304f1..000000000
--- a/Source/3rd Party/wx/include/wx/anystr.h	
+++ /dev/null
@@ -1,140 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/anystr.h
-// Purpose:     wxAnyStrPtr class declaration
-// Author:      Vadim Zeitlin
-// Created:     2009-03-23
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ANYSTR_H_
-#define _WX_ANYSTR_H_
-
-#include "wx/string.h"
-
-// ----------------------------------------------------------------------------
-// wxAnyStrPtr
-//
-// Notice that this is an internal and intentionally not documented class. It
-// is only used by wxWidgets itself to ensure compatibility with previous
-// versions and shouldn't be used by user code. When you see a function
-// returning it you should just know that you can treat it as a string pointer.
-// ----------------------------------------------------------------------------
-
-// This is a helper class convertible to either narrow or wide string pointer.
-// It is similar to wxCStrData but, unlike it, can be NULL which is required to
-// represent the return value of wxDateTime::ParseXXX() methods for example.
-//
-// NB: this class is fully inline and so doesn't need to be DLL-exported
-class wxAnyStrPtr
-{
-public:
-    // ctors: this class must be created from the associated string or using
-    // its default ctor for an invalid NULL-like object; notice that it is
-    // immutable after creation.
-
-    // ctor for invalid pointer
-    wxAnyStrPtr()
-        : m_str(NULL)
-    {
-    }
-
-    // ctor for valid pointer into the given string (whose lifetime must be
-    // greater than ours and which should remain constant while we're used)
-    wxAnyStrPtr(const wxString& str, const wxString::const_iterator& iter)
-        : m_str(&str),
-          m_iter(iter)
-    {
-    }
-
-    // default copy ctor is ok and so is default dtor, in particular we do not
-    // free the string
-
-
-    // various operators meant to make this class look like a superposition of
-    // char* and wchar_t*
-
-    // this one is needed to allow boolean expressions involving these objects,
-    // e.g. "if ( FuncReturningAnyStrPtr() && ... )" (unfortunately using
-    // unspecified_bool_type here wouldn't help with ambiguity between all the
-    // different conversions to pointers)
-    operator bool() const { return m_str != NULL; }
-
-    // at least VC6 and VC7 also need this one or they complain about ambiguity
-    // for !anystr expressions
-    bool operator!() const { return !((bool)*this); }
-
-
-    // and these are the conversions operator which allow to assign the result
-    // of FuncReturningAnyStrPtr() to either char* or wxChar* (i.e. wchar_t*)
-    operator const char *() const
-    {
-        if ( !m_str )
-            return NULL;
-
-        // check if the string is convertible to char at all
-        //
-        // notice that this pointer points into wxString internal buffer
-        // containing its char* representation and so it can be kept for as
-        // long as wxString is not modified -- which is long enough for our
-        // needs
-        const char *p = m_str->c_str().AsChar();
-        if ( *p )
-        {
-            // find the offset of the character corresponding to this iterator
-            // position in bytes: we don't have any direct way to do it so we
-            // need to redo the conversion again for the part of the string
-            // before the iterator to find its length in bytes in current
-            // locale
-            //
-            // NB: conversion won't fail as it succeeded for the entire string
-            p += strlen(wxString(m_str->begin(), m_iter).mb_str());
-        }
-        //else: conversion failed, return "" as we can't do anything else
-
-        return p;
-    }
-
-    operator const wchar_t *() const
-    {
-        if ( !m_str )
-            return NULL;
-
-        // no complications with wide strings (as long as we discount
-        // surrogates as we do for now)
-        //
-        // just remember that this works as long as wxString keeps an internal
-        // buffer with its wide wide char representation, just as with AsChar()
-        // above
-        return m_str->c_str().AsWChar() + (m_iter - m_str->begin());
-    }
-
-    // Because the objects of this class are only used as return type for
-    // functions which can return NULL we can skip providing dereferencing
-    // operators: the code using this class must test it for NULL first and if
-    // it does anything else with it it has to assign it to either char* or
-    // wchar_t* itself, before dereferencing.
-    //
-    // IOW this
-    //
-    //      if ( *FuncReturningAnyStrPtr() )
-    //
-    // is invalid because it could crash. And this
-    //
-    //      const char *p = FuncReturningAnyStrPtr();
-    //      if ( p && *p )
-    //
-    // already works fine.
-
-private:
-    // the original string and the position in it we correspond to, if the
-    // string is NULL this object is NULL pointer-like
-    const wxString * const m_str;
-    const wxString::const_iterator m_iter;
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxAnyStrPtr);
-};
-
-#endif // _WX_ANYSTR_H_
-
diff --git a/Source/3rd Party/wx/include/wx/app.h b/Source/3rd Party/wx/include/wx/app.h
index 82a0eaecd..b7d500b12 100644
--- a/Source/3rd Party/wx/include/wx/app.h	
+++ b/Source/3rd Party/wx/include/wx/app.h	
@@ -5,7 +5,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: app.h 51592 2008-02-08 08:17:41Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,29 +18,21 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/event.h"       // for the base class
-#include "wx/eventfilter.h" // (and another one)
 #include "wx/build.h"
-#include "wx/cmdargs.h"     // for wxCmdLineArgsArray used by wxApp::argv
 #include "wx/init.h"        // we must declare wxEntry()
 #include "wx/intl.h"        // for wxLayoutDirection
-#include "wx/log.h"         // for wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD()
 
 class WXDLLIMPEXP_FWD_BASE wxAppConsole;
 class WXDLLIMPEXP_FWD_BASE wxAppTraits;
 class WXDLLIMPEXP_FWD_BASE wxCmdLineParser;
-class WXDLLIMPEXP_FWD_BASE wxEventLoopBase;
+class WXDLLIMPEXP_FWD_BASE wxLog;
 class WXDLLIMPEXP_FWD_BASE wxMessageOutput;
 
 #if wxUSE_GUI
+    class WXDLLIMPEXP_FWD_BASE wxEventLoop;
     struct WXDLLIMPEXP_FWD_CORE wxVideoMode;
-    class WXDLLIMPEXP_FWD_CORE wxWindow;
 #endif
 
-// this macro should be used in any main() or equivalent functions defined in wx
-#define wxDISABLE_DEBUG_SUPPORT() \
-    wxDISABLE_ASSERTS_IN_RELEASE_BUILD(); \
-    wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD()
-
 // ----------------------------------------------------------------------------
 // typedefs
 // ----------------------------------------------------------------------------
@@ -59,25 +51,15 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// global variables
+// wxAppConsole: wxApp for non-GUI applications
 // ----------------------------------------------------------------------------
 
-// use of this list is strongly deprecated, use wxApp ScheduleForDestruction()
-// and IsScheduledForDestruction()  methods instead of this list directly, it
-// is here for compatibility purposes only
-extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
-
-// ----------------------------------------------------------------------------
-// wxAppConsoleBase: wxApp for non-GUI applications
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandler,
-                                          public wxEventFilter
+class WXDLLIMPEXP_BASE wxAppConsole : public wxEvtHandler
 {
 public:
     // ctor and dtor
-    wxAppConsoleBase();
-    virtual ~wxAppConsoleBase();
+    wxAppConsole();
+    virtual ~wxAppConsole();
 
 
     // the virtual functions which may/must be overridden in the derived class
@@ -99,25 +81,17 @@ public:
     // class OnInit() to do it.
     virtual bool OnInit();
 
+    // this is here only temporary hopefully (FIXME)
+    virtual bool OnInitGui() { return true; }
+
     // This is the replacement for the normal main(): all program work should
     // be done here. When OnRun() returns, the programs starts shutting down.
-    virtual int OnRun();
-
-    // This is called by wxEventLoopBase::SetActive(): you should put the code
-    // which needs an active event loop here.
-    // Note that this function is called whenever an event loop is activated;
-    // you may want to use wxEventLoopBase::IsMain() to perform initialization
-    // specific for the app's main event loop.
-    virtual void OnEventLoopEnter(wxEventLoopBase* WXUNUSED(loop)) {}
+    virtual int OnRun() = 0;
 
     // This is only called if OnInit() returned true so it's a good place to do
     // any cleanup matching the initializations done there.
     virtual int OnExit();
 
-    // This is called by wxEventLoopBase::OnExit() for each event loop which
-    // is exited.
-    virtual void OnEventLoopExit(wxEventLoopBase* WXUNUSED(loop)) {}
-
     // This is the very last function called on wxApp object before it is
     // destroyed. If you override it (instead of overriding OnExit() as usual)
     // do not forget to call the base class version!
@@ -143,20 +117,12 @@ public:
     //     be argv[0]
 
         // set/get the application name
-    wxString GetAppName() const;
+    wxString GetAppName() const
+    {
+        return m_appName.empty() ? m_className : m_appName;
+    }
     void SetAppName(const wxString& name) { m_appName = name; }
 
-        // set/get the application display name: the display name is the name
-        // shown to the user in titles, reports, etc while the app name is
-        // used for paths, config, and other places the user doesn't see
-        //
-        // by default the display name is the same as app name or a capitalized
-        // version of the program if app name was not set neither but it's
-        // usually better to set it explicitly to something nicer
-    wxString GetAppDisplayName() const;
-
-    void SetAppDisplayName(const wxString& name) { m_appDisplayName = name; }
-
         // set/get the app class name
     wxString GetClassName() const { return m_className; }
     void SetClassName(const wxString& name) { m_className = name; }
@@ -165,19 +131,6 @@ public:
     const wxString& GetVendorName() const { return m_vendorName; }
     void SetVendorName(const wxString& name) { m_vendorName = name; }
 
-        // set/get the vendor display name:  the display name is shown
-        // in titles/reports/dialogs to the user, while the vendor name
-        // is used in some areas such as wxConfig, wxStandardPaths, etc
-    const wxString& GetVendorDisplayName() const
-    {
-        return m_vendorDisplayName.empty() ? GetVendorName()
-                                           : m_vendorDisplayName;
-    }
-    void SetVendorDisplayName(const wxString& name)
-    {
-        m_vendorDisplayName = name;
-    }
-
 
     // cmd line parsing stuff
     // ----------------------
@@ -217,48 +170,40 @@ public:
     // either should be configurable by the user (then he can change the
     // default behaviour simply by overriding CreateTraits() and returning his
     // own traits object) or which is GUI/console dependent as then wxAppTraits
-    // allows us to abstract the differences behind the common facade
+    // allows us to abstract the differences behind the common fa�ade
     wxAppTraits *GetTraits();
 
-    // this function provides safer access to traits object than
-    // wxTheApp->GetTraits() during startup or termination when the global
-    // application object itself may be unavailable
-    //
-    // of course, it still returns NULL in this case and the caller must check
-    // for it
-    static wxAppTraits *GetTraitsIfExists();
+    // the functions below shouldn't be used now that we have wxAppTraits
+#if WXWIN_COMPATIBILITY_2_4
 
-    // returns the main event loop instance, i.e. the event loop which is started
-    // by OnRun() and which dispatches all events sent from the native toolkit
-    // to the application (except when new event loops are temporarily set-up).
-    // The returned value maybe NULL. Put initialization code which needs a
-    // non-NULL main event loop into OnEventLoopEnter().
-    wxEventLoopBase* GetMainLoop() const
-        { return m_mainLoop; }
+#if wxUSE_LOG
+        // override this function to create default log target of arbitrary
+        // user-defined class (default implementation creates a wxLogGui
+        // object) -- this log object is used by default by all wxLogXXX()
+        // functions.
+    wxDEPRECATED( virtual wxLog *CreateLogTarget() );
+#endif // wxUSE_LOG
+
+        // similar to CreateLogTarget() but for the global wxMessageOutput
+        // object
+    wxDEPRECATED( virtual wxMessageOutput *CreateMessageOutput() );
+
+#endif // WXWIN_COMPATIBILITY_2_4
 
 
     // event processing functions
     // --------------------------
 
-    // Implement the inherited wxEventFilter method but just return -1 from it
-    // to indicate that default processing should take place.
+    // this method allows to filter all the events processed by the program, so
+    // you should try to return quickly from it to avoid slowing down the
+    // program to the crawl
+    //
+    // return value should be -1 to continue with the normal event processing,
+    // or TRUE or FALSE to stop further processing and pretend that the event
+    // had been already processed or won't be processed at all, respectively
     virtual int FilterEvent(wxEvent& event);
 
-    // return true if we're running event loop, i.e. if the events can
-    // (already) be dispatched
-    static bool IsMainLoopRunning();
-
 #if wxUSE_EXCEPTIONS
-    // execute the functor to handle the given event
-    //
-    // this is a generalization of HandleEvent() below and the base class
-    // implementation of CallEventHandler() still calls HandleEvent() for
-    // compatibility for functors which are just wxEventFunctions (i.e. methods
-    // of wxEvtHandler)
-    virtual void CallEventHandler(wxEvtHandler *handler,
-                                  wxEventFunctor& functor,
-                                  wxEvent& event) const;
-
     // call the specified handler on the given object with the given event
     //
     // this method only exists to allow catching the exceptions thrown by any
@@ -269,112 +214,33 @@ public:
                              wxEvent& event) const;
 
     // Called when an unhandled C++ exception occurs inside OnRun(): note that
-    // the main event loop has already terminated by now and the program will
-    // exit, if you need to really handle the exceptions you need to override
-    // OnExceptionInMainLoop()
-    virtual void OnUnhandledException();
-
-    // Function called if an uncaught exception is caught inside the main
-    // event loop: it may return true to continue running the event loop or
-    // false to stop it (in the latter case it may rethrow the exception as
-    // well)
-    virtual bool OnExceptionInMainLoop();
-
+    // the exception type is lost by now, so if you really want to handle the
+    // exception you should override OnRun() and put a try/catch around
+    // MainLoop() call there or use OnExceptionInMainLoop()
+    virtual void OnUnhandledException() { }
 #endif // wxUSE_EXCEPTIONS
 
-
-    // pending events
-    // --------------
-
-    // IMPORTANT: all these methods conceptually belong to wxEventLoopBase
-    //            but for many reasons we need to allow queuing of events
-    //            even when there's no event loop (e.g. in wxApp::OnInit);
-    //            this feature is used e.g. to queue events on secondary threads
-    //            or in wxPython to use wx.CallAfter before the GUI is initialized
-
-    // process all events in the m_handlersWithPendingEvents list -- it is necessary
-    // to call this function to process posted events. This happens during each
+    // process all events in the wxPendingEvents list -- it is necessary to
+    // call this function to process posted events. This happens during each
     // event loop iteration in GUI mode but if there is no main loop, it may be
     // also called directly.
     virtual void ProcessPendingEvents();
 
-    // check if there are pending events on global pending event list
-    bool HasPendingEvents() const;
+    // doesn't do anything in this class, just a hook for GUI wxApp
+    virtual bool Yield(bool WXUNUSED(onlyIfNeeded) = false) { return true; }
 
-    // temporary suspends processing of the pending events
-    void SuspendProcessingOfPendingEvents();
+    // make sure that idle events are sent again
+    virtual void WakeUpIdle() { }
 
-    // resume processing of the pending events previously stopped because of a
-    // call to SuspendProcessingOfPendingEvents()
-    void ResumeProcessingOfPendingEvents();
-
-    // called by ~wxEvtHandler to (eventually) remove the handler from the list of
-    // the handlers with pending events
-    void RemovePendingEventHandler(wxEvtHandler* toRemove);
-
-    // adds an event handler to the list of the handlers with pending events
-    void AppendPendingEventHandler(wxEvtHandler* toAppend);
-
-    // moves the event handler from the list of the handlers with pending events
-    //to the list of the handlers with _delayed_ pending events
-    void DelayPendingEventHandler(wxEvtHandler* toDelay);
-
-    // deletes the current pending events
-    void DeletePendingEvents();
-
-
-    // delayed destruction
-    // -------------------
-
-    // If an object may have pending events for it, it shouldn't be deleted
-    // immediately as this would result in a crash when trying to handle these
-    // events: instead, it should be scheduled for destruction and really
-    // destroyed only after processing all pending events.
-    //
-    // Notice that this is only possible if we have a running event loop,
-    // otherwise the object is just deleted directly by ScheduleForDestruction()
-    // and IsScheduledForDestruction() always returns false.
-
-    // schedule the object for destruction in the near future
-    void ScheduleForDestruction(wxObject *object);
-
-    // return true if the object is scheduled for destruction
-    bool IsScheduledForDestruction(wxObject *object) const;
-
-
-    // wxEventLoop-related methods
-    // ---------------------------
-
-    // all these functions are forwarded to the corresponding methods of the
-    // currently active event loop -- and do nothing if there is none
-    virtual bool Pending();
-    virtual bool Dispatch();
-
-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-
-    bool Yield(bool onlyIfNeeded = false);
-
-    virtual void WakeUpIdle();
-
-    // this method is called by the active event loop when there are no events
-    // to process
-    //
-    // by default it generates the idle events and if you override it in your
-    // derived class you should call the base class version to ensure that idle
-    // events are still sent out
-    virtual bool ProcessIdle();
-
-    // this virtual function is overridden in GUI wxApp to always return true
-    // as GUI applications always have an event loop -- but console ones may
-    // have it or not, so it simply returns true if already have an event loop
-    // running but false otherwise
-    virtual bool UsesEventLoop() const;
+    // this is just a convenience: by providing its implementation here we
+    // avoid #ifdefs in the code using it
+    static bool IsMainLoopRunning() { return false; }
 
 
     // debugging support
     // -----------------
 
+#ifdef __WXDEBUG__
     // this function is called when an assert failure occurs, the base class
     // version does the normal processing (i.e. shows the usual assert failure
     // dialog box)
@@ -394,12 +260,16 @@ public:
                           int line,
                           const wxChar *cond,
                           const wxChar *msg);
+#endif // __WXDEBUG__
 
     // check that the wxBuildOptions object (constructed in the application
-    // itself, usually the one from wxIMPLEMENT_APP() macro) matches the build
+    // itself, usually the one from IMPLEMENT_APP() macro) matches the build
     // options of the library and abort if it doesn't
     static bool CheckBuildOptions(const char *optionsSignature,
                                   const char *componentName);
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( static bool CheckBuildOptions(const wxBuildOptions& buildOptions) );
+#endif
 
     // implementation only from now on
     // -------------------------------
@@ -419,88 +289,37 @@ public:
 
 
     // command line arguments (public for backwards compatibility)
-    int argc;
-
-    // this object is implicitly convertible to either "char**" (traditional
-    // type of argv parameter of main()) or to "wchar_t **" (for compatibility
-    // with Unicode build in previous wx versions and because the command line
-    // can, in pr
-#if wxUSE_UNICODE
-    wxCmdLineArgsArray argv;
-#else
-    char **argv;
-#endif
+    int      argc;
+    wxChar **argv;
 
 protected:
-    // delete all objects in wxPendingDelete list
-    //
-    // called from ProcessPendingEvents()
-    void DeletePendingObjects();
-
     // the function which creates the traits object when GetTraits() needs it
     // for the first time
     virtual wxAppTraits *CreateTraits();
 
+
     // function used for dynamic wxApp creation
     static wxAppInitializerFunction ms_appInitFn;
 
     // the one and only global application object
     static wxAppConsole *ms_appInstance;
 
-    // create main loop from AppTraits or return NULL if
-    // there is no main loop implementation
-    wxEventLoopBase *CreateMainLoop();
 
     // application info (must be set from the user code)
-    wxString m_vendorName,        // vendor name ("acme")
-             m_vendorDisplayName, // vendor display name (e.g. "ACME Inc")
-             m_appName,           // app name ("myapp")
-             m_appDisplayName,    // app display name ("My Application")
-             m_className;         // class name
+    wxString m_vendorName,      // vendor name (ACME Inc)
+             m_appName,         // app name
+             m_className;       // class name
 
     // the class defining the application behaviour, NULL initially and created
     // by GetTraits() when first needed
     wxAppTraits *m_traits;
 
-    // the main event loop of the application (may be NULL if the loop hasn't
-    // been started yet or has already terminated)
-    wxEventLoopBase *m_mainLoop;
-
-
-    // pending events management vars:
-
-    // the array of the handlers with pending events which needs to be processed
-    // inside ProcessPendingEvents()
-    wxEvtHandlerArray m_handlersWithPendingEvents;
-
-    // helper array used by ProcessPendingEvents() to store the event handlers
-    // which have pending events but of these events none can be processed right now
-    // (because of a call to wxEventLoop::YieldFor() which asked to selectively process
-    // pending events)
-    wxEvtHandlerArray m_handlersWithPendingDelayedEvents;
-
-#if wxUSE_THREADS
-    // this critical section protects both the lists above
-    wxCriticalSection m_handlersWithPendingEventsLocker;
-#endif
-
-    // flag modified by Suspend/ResumeProcessingOfPendingEvents()
-    bool m_bDoPendingEventProcessing;
-
-    friend class WXDLLIMPEXP_FWD_BASE wxEvtHandler;
 
     // the application object is a singleton anyhow, there is no sense in
     // copying it
-    wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
+    DECLARE_NO_COPY_CLASS(wxAppConsole)
 };
 
-#if defined(__UNIX__) && !defined(__WXMSW__)
-    #include "wx/unix/app.h"
-#else
-    // this has to be a class and not a typedef as we forward declare it
-    class wxAppConsole : public wxAppConsoleBase { };
-#endif
-
 // ----------------------------------------------------------------------------
 // wxAppBase: the common part of wxApp implementations for all platforms
 // ----------------------------------------------------------------------------
@@ -548,9 +367,43 @@ public:
     // the worker functions - usually not used directly by the user code
     // -----------------------------------------------------------------
 
-        // safer alternatives to Yield(), using wxWindowDisabler
-    virtual bool SafeYield(wxWindow *win, bool onlyIfNeeded);
-    virtual bool SafeYieldFor(wxWindow *win, long eventsToProcess);
+        // return true if we're running main loop, i.e. if the events can
+        // (already) be dispatched
+    static bool IsMainLoopRunning()
+    {
+        wxAppBase *app = wx_static_cast(wxAppBase *, GetInstance());
+        return app && app->m_mainLoop != NULL;
+    }
+
+        // execute the main GUI loop, the function returns when the loop ends
+    virtual int MainLoop();
+
+        // exit the main loop thus terminating the application
+    virtual void Exit();
+
+        // exit the main GUI loop during the next iteration (i.e. it does not
+        // stop the program immediately!)
+    virtual void ExitMainLoop();
+
+        // returns true if there are unprocessed events in the event queue
+    virtual bool Pending();
+
+        // process the first event in the event queue (blocks until an event
+        // appears if there are none currently, use Pending() if this is not
+        // wanted), returns false if the event loop should stop and true
+        // otherwise
+    virtual bool Dispatch();
+
+        // process all currently pending events right now
+        //
+        // it is an error to call Yield() recursively unless the value of
+        // onlyIfNeeded is true
+        //
+        // WARNING: this function is dangerous as it can lead to unexpected
+        //          reentrancies (i.e. when called from an event handler it
+        //          may result in calling the same event handler again), use
+        //          with _extreme_ care or, better, don't use at all!
+    virtual bool Yield(bool onlyIfNeeded = false) = 0;
 
         // this virtual function is called in the GUI mode when the application
         // becomes idle and normally just sends wxIdleEvent to all interested
@@ -559,8 +412,18 @@ public:
         // it should return true if more idle events are needed, false if not
     virtual bool ProcessIdle();
 
-        // override base class version: GUI apps always use an event loop
-    virtual bool UsesEventLoop() const { return true; }
+        // Send idle event to window and all subwindows
+        // Returns true if more idle time is requested.
+    virtual bool SendIdleEvents(wxWindow* win, wxIdleEvent& event);
+
+
+#if wxUSE_EXCEPTIONS
+    // Function called if an uncaught exception is caught inside the main
+    // event loop: it may return true to continue running the event loop or
+    // false to stop it (in the latter case it may rethrow the exception as
+    // well)
+    virtual bool OnExceptionInMainLoop();
+#endif // wxUSE_EXCEPTIONS
 
 
     // top level window functions
@@ -592,15 +455,15 @@ public:
     // ------------------------------------------------------------------------
 
         // Get display mode that is used use. This is only used in framebuffer
-        // wxWin ports such as wxDFB.
+        // wxWin ports (such as wxMGL or wxDFB).
     virtual wxVideoMode GetDisplayMode() const;
         // Set display mode to use. This is only used in framebuffer wxWin
-        // ports such as wxDFB. This method should be called from
+        // ports (such as wxMGL or wxDFB). This method should be called from
         // wxApp::OnInitGui
     virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return true; }
 
         // set use of best visual flag (see below)
-    void SetUseBestVisual( bool flag, bool forceTrueColour = false )
+    void SetUseBestVisual( bool flag, bool forceTrueColour = false ) 
         { m_useBestVisual = flag; m_forceTrueColour = forceTrueColour; }
     bool GetUseBestVisual() const { return m_useBestVisual; }
 
@@ -615,9 +478,6 @@ public:
     // if it's unknown
     virtual wxLayoutDirection GetLayoutDirection() const;
 
-    // Change the theme used by the application, return true on success.
-    virtual bool SetNativeTheme(const wxString& WXUNUSED(theme)) { return false; }
-
 
     // command line parsing (GUI-specific)
     // ------------------------------------------------------------------------
@@ -642,11 +502,22 @@ public:
     wxDEPRECATED( bool Initialized() );
 #endif // WXWIN_COMPATIBILITY_2_6
 
+    // perform standard OnIdle behaviour, ensure that this is always called
+    void OnIdle(wxIdleEvent& event);
+
+
 protected:
+    // delete all objects in wxPendingDelete list
+    void DeletePendingObjects();
+
     // override base class method to use GUI traits
     virtual wxAppTraits *CreateTraits();
 
 
+    // the main event loop of the application (may be NULL if the loop hasn't
+    // been started yet or has already terminated)
+    wxEventLoop *m_mainLoop;
+
     // the main top level window (may be NULL)
     wxWindow *m_topWindow;
 
@@ -670,43 +541,47 @@ protected:
     // does any of our windows have focus?
     bool m_isActive;
 
-    wxDECLARE_NO_COPY_CLASS(wxAppBase);
+
+    DECLARE_NO_COPY_CLASS(wxAppBase)
 };
 
 #if WXWIN_COMPATIBILITY_2_6
     inline bool wxAppBase::Initialized() { return true; }
 #endif // WXWIN_COMPATIBILITY_2_6
 
+#endif // wxUSE_GUI
+
 // ----------------------------------------------------------------------------
 // now include the declaration of the real class
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
-    #include "wx/msw/app.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/app.h"
-#elif defined(__WXDFB__)
-    #include "wx/dfb/app.h"
-#elif defined(__WXGTK20__)
-    #include "wx/gtk/app.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk1/app.h"
-#elif defined(__WXX11__)
-    #include "wx/x11/app.h"
-#elif defined(__WXMAC__)
-    #include "wx/osx/app.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/app.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/app.h"
-#endif
-
+#if wxUSE_GUI
+    #if defined(__WXPALMOS__)
+        #include "wx/palmos/app.h"
+    #elif defined(__WXMSW__)
+        #include "wx/msw/app.h"
+    #elif defined(__WXMOTIF__)
+        #include "wx/motif/app.h"
+    #elif defined(__WXMGL__)
+        #include "wx/mgl/app.h"
+    #elif defined(__WXDFB__)
+        #include "wx/dfb/app.h"
+    #elif defined(__WXGTK20__)
+        #include "wx/gtk/app.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk1/app.h"
+    #elif defined(__WXX11__)
+        #include "wx/x11/app.h"
+    #elif defined(__WXMAC__)
+        #include "wx/mac/app.h"
+    #elif defined(__WXCOCOA__)
+        #include "wx/cocoa/app.h"
+    #elif defined(__WXPM__)
+        #include "wx/os2/app.h"
+    #endif
 #else // !GUI
-
-// wxApp is defined in core and we cannot define another one in wxBase,
-// so use the preprocessor to allow using wxApp in console programs too
-#define wxApp wxAppConsole
-
+    // allow using just wxApp (instead of wxAppConsole) in console programs
+    typedef wxAppConsole wxApp;
 #endif // GUI/!GUI
 
 // ----------------------------------------------------------------------------
@@ -717,12 +592,12 @@ protected:
 // object of type wxApp
 //
 // note that instead of using of wxTheApp in application code you should
-// consider using wxDECLARE_APP() after which you may call wxGetApp() which will
+// consider using DECLARE_APP() after which you may call wxGetApp() which will
 // return the object of the correct type (i.e. MyApp and not wxApp)
 //
 // the cast is safe as in GUI build we only use wxApp, not wxAppConsole, and in
 // console mode it does nothing at all
-#define wxTheApp static_cast<wxApp*>(wxApp::GetInstance())
+#define wxTheApp wx_static_cast(wxApp*, wxApp::GetInstance())
 
 // ----------------------------------------------------------------------------
 // global functions
@@ -732,20 +607,20 @@ protected:
 // ------------------------------------------------------
 
 // Force an exit from main loop
-WXDLLIMPEXP_BASE void wxExit();
+extern void WXDLLIMPEXP_BASE wxExit();
 
-// avoid redeclaring this function here if it had been already declared by
+// avoid redeclaring this function here if it had been already declated by
 // wx/utils.h, this results in warnings from g++ with -Wredundant-decls
 #ifndef wx_YIELD_DECLARED
 #define wx_YIELD_DECLARED
 
 // Yield to other apps/messages
-WXDLLIMPEXP_CORE bool wxYield();
+extern bool WXDLLIMPEXP_BASE wxYield();
 
 #endif // wx_YIELD_DECLARED
 
 // Yield to other apps/messages
-WXDLLIMPEXP_BASE void wxWakeUpIdle();
+extern void WXDLLIMPEXP_BASE wxWakeUpIdle();
 
 // ----------------------------------------------------------------------------
 // macros for dynamic creation of the application object
@@ -762,40 +637,34 @@ public:
         { wxApp::SetInitializerFunction(fn); }
 };
 
-// the code below defines a wxIMPLEMENT_WXWIN_MAIN macro which you can use if
+// the code below defines a IMPLEMENT_WXWIN_MAIN macro which you can use if
 // your compiler really, really wants main() to be in your main program (e.g.
-// hello.cpp). Now wxIMPLEMENT_APP should add this code if required.
+// hello.cpp). Now IMPLEMENT_APP should add this code if required.
 
-#define wxIMPLEMENT_WXWIN_MAIN_CONSOLE                                        \
-    int main(int argc, char **argv)                                           \
-    {                                                                         \
-        wxDISABLE_DEBUG_SUPPORT();                                            \
-                                                                              \
-        return wxEntry(argc, argv);                                           \
-    }
+#define IMPLEMENT_WXWIN_MAIN_CONSOLE \
+        int main(int argc, char **argv) { return wxEntry(argc, argv); }
 
 // port-specific header could have defined it already in some special way
-#ifndef wxIMPLEMENT_WXWIN_MAIN
-    #define wxIMPLEMENT_WXWIN_MAIN          wxIMPLEMENT_WXWIN_MAIN_CONSOLE
-#endif // defined(wxIMPLEMENT_WXWIN_MAIN)
+#ifndef IMPLEMENT_WXWIN_MAIN
+    #define IMPLEMENT_WXWIN_MAIN IMPLEMENT_WXWIN_MAIN_CONSOLE
+#endif // defined(IMPLEMENT_WXWIN_MAIN)
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/theme.h"
 
     #ifdef wxUNIV_DEFAULT_THEME
-        #define wxIMPLEMENT_WX_THEME_SUPPORT \
+        #define IMPLEMENT_WX_THEME_SUPPORT \
             WX_USE_THEME(wxUNIV_DEFAULT_THEME);
     #else
-        #define wxIMPLEMENT_WX_THEME_SUPPORT
+        #define IMPLEMENT_WX_THEME_SUPPORT
     #endif
 #else
-    #define wxIMPLEMENT_WX_THEME_SUPPORT
+    #define IMPLEMENT_WX_THEME_SUPPORT
 #endif
 
 // Use this macro if you want to define your own main() or WinMain() function
 // and call wxEntry() from there.
-#define wxIMPLEMENT_APP_NO_MAIN(appname)                                    \
-    appname& wxGetApp() { return *static_cast<appname*>(wxApp::GetInstance()); }    \
+#define IMPLEMENT_APP_NO_MAIN(appname)                                      \
     wxAppConsole *wxCreateApp()                                             \
     {                                                                       \
         wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE,         \
@@ -803,53 +672,37 @@ public:
         return new appname;                                                 \
     }                                                                       \
     wxAppInitializer                                                        \
-        wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp)
+        wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp);        \
+    DECLARE_APP(appname)                                                    \
+    appname& wxGetApp() { return *wx_static_cast(appname*, wxApp::GetInstance()); }
 
-// Same as wxIMPLEMENT_APP() normally but doesn't include themes support in
+// Same as IMPLEMENT_APP() normally but doesn't include themes support in
 // wxUniversal builds
-#define wxIMPLEMENT_APP_NO_THEMES(appname)  \
-    wxIMPLEMENT_WXWIN_MAIN                  \
-    wxIMPLEMENT_APP_NO_MAIN(appname)
+#define IMPLEMENT_APP_NO_THEMES(appname)    \
+    IMPLEMENT_APP_NO_MAIN(appname)          \
+    IMPLEMENT_WXWIN_MAIN
 
 // Use this macro exactly once, the argument is the name of the wxApp-derived
 // class which is the class of your application.
-#define wxIMPLEMENT_APP(appname)            \
-    wxIMPLEMENT_WX_THEME_SUPPORT            \
-    wxIMPLEMENT_APP_NO_THEMES(appname)
+#define IMPLEMENT_APP(appname)              \
+    IMPLEMENT_APP_NO_THEMES(appname)        \
+    IMPLEMENT_WX_THEME_SUPPORT
 
 // Same as IMPLEMENT_APP(), but for console applications.
-#define wxIMPLEMENT_APP_CONSOLE(appname)    \
-    wxIMPLEMENT_WXWIN_MAIN_CONSOLE          \
-    wxIMPLEMENT_APP_NO_MAIN(appname)
+#define IMPLEMENT_APP_CONSOLE(appname)      \
+    IMPLEMENT_APP_NO_MAIN(appname)          \
+    IMPLEMENT_WXWIN_MAIN_CONSOLE
 
 // this macro can be used multiple times and just allows you to use wxGetApp()
 // function
-#define wxDECLARE_APP(appname)              \
-    extern appname& wxGetApp()
+#define DECLARE_APP(appname) extern appname& wxGetApp();
 
 
-// declare the stuff defined by wxIMPLEMENT_APP() macro, it's not really needed
+// declare the stuff defined by IMPLEMENT_APP() macro, it's not really needed
 // anywhere else but at the very least it suppresses icc warnings about
 // defining extern symbols without prior declaration, and it shouldn't do any
 // harm
 extern wxAppConsole *wxCreateApp();
 extern wxAppInitializer wxTheAppInitializer;
 
-// ----------------------------------------------------------------------------
-// Compatibility macro aliases
-// ----------------------------------------------------------------------------
-
-// deprecated variants _not_ requiring a semicolon after them
-// (note that also some wx-prefixed macro do _not_ require a semicolon because
-//  it's not always possible to force the compire to require it)
-
-#define IMPLEMENT_WXWIN_MAIN_CONSOLE            wxIMPLEMENT_WXWIN_MAIN_CONSOLE
-#define IMPLEMENT_WXWIN_MAIN                    wxIMPLEMENT_WXWIN_MAIN
-#define IMPLEMENT_WX_THEME_SUPPORT              wxIMPLEMENT_WX_THEME_SUPPORT
-#define IMPLEMENT_APP_NO_MAIN(app)              wxIMPLEMENT_APP_NO_MAIN(app);
-#define IMPLEMENT_APP_NO_THEMES(app)            wxIMPLEMENT_APP_NO_THEMES(app);
-#define IMPLEMENT_APP(app)                      wxIMPLEMENT_APP(app);
-#define IMPLEMENT_APP_CONSOLE(app)              wxIMPLEMENT_APP_CONSOLE(app);
-#define DECLARE_APP(app)                        wxDECLARE_APP(app);
-
 #endif // _WX_APP_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/apptrait.h b/Source/3rd Party/wx/include/wx/apptrait.h
index b8e14ab2c..56f36dfea 100644
--- a/Source/3rd Party/wx/include/wx/apptrait.h	
+++ b/Source/3rd Party/wx/include/wx/apptrait.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.06.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: apptrait.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -15,44 +15,34 @@
 #include "wx/string.h"
 #include "wx/platinfo.h"
 
-class WXDLLIMPEXP_FWD_BASE wxArrayString;
-class WXDLLIMPEXP_FWD_BASE wxConfigBase;
-class WXDLLIMPEXP_FWD_BASE wxEventLoopBase;
+class WXDLLIMPEXP_FWD_BASE wxObject;
+class WXDLLIMPEXP_FWD_BASE wxAppTraits;
 #if wxUSE_FONTMAP
     class WXDLLIMPEXP_FWD_CORE wxFontMapper;
 #endif // wxUSE_FONTMAP
 class WXDLLIMPEXP_FWD_BASE wxLog;
 class WXDLLIMPEXP_FWD_BASE wxMessageOutput;
-class WXDLLIMPEXP_FWD_BASE wxObject;
 class WXDLLIMPEXP_FWD_CORE wxRendererNative;
-class WXDLLIMPEXP_FWD_BASE wxStandardPaths;
 class WXDLLIMPEXP_FWD_BASE wxString;
-class WXDLLIMPEXP_FWD_BASE wxTimer;
-class WXDLLIMPEXP_FWD_BASE wxTimerImpl;
 
-class wxSocketManager;
+class GSocketGUIFunctionsTable;
 
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
+class WXDLLIMPEXP_FWD_BASE wxStandardPathsBase;
+
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:
     // needed since this class declares virtual members
     virtual ~wxAppTraitsBase() { }
 
-    // hooks for working with the global objects, may be overridden by the user
+    // hooks for creating the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 
-#if wxUSE_CONFIG
-    // create the default configuration object (base class version is
-    // implemented in config.cpp and creates wxRegConfig for wxMSW and
-    // wxFileConfig for all the other platforms)
-    virtual wxConfigBase *CreateConfig();
-#endif // wxUSE_CONFIG
-
 #if wxUSE_LOG
     // create the default log target
     virtual wxLog *CreateLogTarget() = 0;
@@ -73,20 +63,16 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
+#if wxUSE_STDPATHS
     // wxStandardPaths object is normally the same for wxBase and wxGUI
     // except in the case of wxMac and wxCocoa
-    virtual wxStandardPaths& GetStandardPaths();
-
-#if wxUSE_INTL
-    // called during wxApp initialization to set the locale to correspond to
-    // the user default (i.e. system locale under Windows, LC_ALL under Unix)
-    virtual void SetLocale();
-#endif // wxUSE_INTL
-
+    virtual wxStandardPathsBase& GetStandardPaths();
+#endif // wxUSE_STDPATHS
 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------
 
+#ifdef __WXDEBUG__
     // show the assert dialog with the specified message in GUI or just print
     // the string to stderr in console mode
     //
@@ -95,79 +81,53 @@ public:
     //
     // return true to suppress subsequent asserts, false to continue as before
     virtual bool ShowAssertDialog(const wxString& msg) = 0;
+#endif // __WXDEBUG__
 
     // return true if fprintf(stderr) goes somewhere, false otherwise
     virtual bool HasStderr() = 0;
 
+    // managing "pending delete" list: in GUI mode we can't immediately delete
+    // some objects because there may be unprocessed events for them and so we
+    // only do it during the next idle loop iteration while this is, of course,
+    // unnecessary in wxBase, so we have a few functions to abstract these
+    // operations
+
+    // add the object to the pending delete list in GUI, delete it immediately
+    // in wxBase
+    virtual void ScheduleForDestroy(wxObject *object) = 0;
+
+    // remove this object from the pending delete list in GUI, do nothing in
+    // wxBase
+    virtual void RemoveFromPendingDelete(wxObject *object) = 0;
+
 #if wxUSE_SOCKETS
-    // this function is used by wxNet library to set the default socket manager
-    // to use: doing it like this allows us to keep all socket-related code in
-    // wxNet instead of having to pull it in wxBase itself as we'd have to do
-    // if we really implemented wxSocketManager here
-    //
-    // we don't take ownership of this pointer, it should have a lifetime
-    // greater than that of any socket (e.g. be a pointer to a static object)
-    static void SetDefaultSocketManager(wxSocketManager *manager)
-    {
-        ms_manager = manager;
-    }
-
-    // return socket manager: this is usually different for console and GUI
-    // applications (although some ports use the same implementation for both)
-    virtual wxSocketManager *GetSocketManager() { return ms_manager; }
+    // return table of GUI callbacks for GSocket code or NULL in wxBase. This
+    // is needed because networking classes are in their own library and so
+    // they can't directly call GUI functions (the same net library can be
+    // used in both GUI and base apps). To complicate it further, GUI library
+    // ("wxCore") doesn't depend on networking library and so only a functions
+    // table can be passed around
+    virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0;
 #endif
 
-    // create a new, port specific, instance of the event loop used by wxApp
-    virtual wxEventLoopBase *CreateEventLoop() = 0;
-
-#if wxUSE_TIMER
-    // return platform and toolkit dependent wxTimer implementation
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) = 0;
-#endif
-
-#if wxUSE_THREADS
-    virtual void MutexGuiEnter();
-    virtual void MutexGuiLeave();
-#endif
-
-    // functions returning port-specific information
-    // ------------------------------------------------------------------------
-
     // return information about the (native) toolkit currently used and its
     // runtime (not compile-time) version.
     // returns wxPORT_BASE for console applications and one of the remaining
     // wxPORT_* values for GUI applications.
-    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const = 0;
+    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const = 0;
 
     // return true if the port is using wxUniversal for the GUI, false if not
     virtual bool IsUsingUniversalWidgets() const = 0;
 
     // return the name of the Desktop Environment such as
     // "KDE" or "GNOME". May return an empty string.
-    virtual wxString GetDesktopEnvironment() const = 0;
-
-    // returns a short string to identify the block of the standard command
-    // line options parsed automatically by current port: if this string is
-    // empty, there are no such options, otherwise the function also fills
-    // passed arrays with the names and the descriptions of those options.
-    virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
-                                               wxArrayString& desc) const
-    {
-        wxUnusedVar(names);
-        wxUnusedVar(desc);
-
-        return wxEmptyString;
-    }
-
+    virtual wxString GetDesktopEnvironment() const { return wxEmptyString; }
 
 protected:
-#if wxUSE_STACKWALKER
+#if wxUSE_STACKWALKER && defined( __WXDEBUG__ )
     // utility function: returns the stack frame as a plain wxString
     virtual wxString GetAssertStackTrace();
 #endif
-
-private:
-    static wxSocketManager *ms_manager;
 };
 
 // ----------------------------------------------------------------------------
@@ -177,10 +137,14 @@ private:
 // NB:  test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
 //      Unix code (and otherwise __UNIX__ wouldn't be defined)
 // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
-#if defined(__WIN32__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/apptbase.h"
+#elif defined(__WIN32__)
     #include "wx/msw/apptbase.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptbase.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/apptbase.h"
 #elif defined(__OS2__)
     #include "wx/os2/apptbase.h"
 #else // no platform-specific methods to add to wxAppTraits
@@ -201,10 +165,6 @@ private:
 class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits
 {
 public:
-#if !wxUSE_CONSOLE_EVENTLOOP
-    virtual wxEventLoopBase *CreateEventLoop() { return NULL; }
-#endif // !wxUSE_CONSOLE_EVENTLOOP
-
 #if wxUSE_LOG
     virtual wxLog *CreateLogTarget();
 #endif // wxUSE_LOG
@@ -213,12 +173,20 @@ public:
     virtual wxFontMapper *CreateFontMapper();
 #endif // wxUSE_FONTMAP
     virtual wxRendererNative *CreateRenderer();
+#if wxUSE_SOCKETS
+    virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
+#endif
 
+#ifdef __WXDEBUG__
     virtual bool ShowAssertDialog(const wxString& msg);
+#endif // __WXDEBUG__
     virtual bool HasStderr();
 
+    virtual void ScheduleForDestroy(wxObject *object);
+    virtual void RemoveFromPendingDelete(wxObject *object);
+
     // the GetToolkitVersion for console application is always the same
-    virtual wxPortId GetToolkitVersion(int *verMaj = NULL, int *verMin = NULL) const
+    virtual wxPortId GetToolkitVersion(int *verMaj, int *verMin) const
     {
         // no toolkits (wxBase is for console applications without GUI support)
         // NB: zero means "no toolkit", -1 means "not initialized yet"
@@ -229,7 +197,6 @@ public:
     }
 
     virtual bool IsUsingUniversalWidgets() const { return false; }
-    virtual wxString GetDesktopEnvironment() const { return wxEmptyString; }
 };
 
 // ----------------------------------------------------------------------------
@@ -238,7 +205,7 @@ public:
 
 #if wxUSE_GUI
 
-class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits
+class WXDLLEXPORT wxGUIAppTraitsBase : public wxAppTraits
 {
 public:
 #if wxUSE_LOG
@@ -249,10 +216,18 @@ public:
     virtual wxFontMapper *CreateFontMapper();
 #endif // wxUSE_FONTMAP
     virtual wxRendererNative *CreateRenderer();
+#if wxUSE_SOCKETS
+    virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
+#endif
 
+#ifdef __WXDEBUG__
     virtual bool ShowAssertDialog(const wxString& msg);
+#endif // __WXDEBUG__
     virtual bool HasStderr();
 
+    virtual void ScheduleForDestroy(wxObject *object);
+    virtual void RemoveFromPendingDelete(wxObject *object);
+
     virtual bool IsUsingUniversalWidgets() const
     {
     #ifdef __WXUNIVERSAL__
@@ -261,8 +236,6 @@ public:
         return false;
     #endif
     }
-
-    virtual wxString GetDesktopEnvironment() const { return wxEmptyString; }
 };
 
 #endif // wxUSE_GUI
@@ -272,12 +245,16 @@ public:
 // ----------------------------------------------------------------------------
 
 // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
-#if defined(__WIN32__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/apptrait.h"
+#elif defined(__WIN32__)
     #include "wx/msw/apptrait.h"
 #elif defined(__OS2__)
     #include "wx/os2/apptrait.h"
 #elif defined(__UNIX__)
     #include "wx/unix/apptrait.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/apptrait.h"
 #elif defined(__DOS__)
     #include "wx/msdos/apptrait.h"
 #else
diff --git a/Source/3rd Party/wx/include/wx/archive.h b/Source/3rd Party/wx/include/wx/archive.h
index da27f2958..dbf26c25c 100644
--- a/Source/3rd Party/wx/include/wx/archive.h	
+++ b/Source/3rd Party/wx/include/wx/archive.h	
@@ -2,7 +2,7 @@
 // Name:        wx/archive.h
 // Purpose:     Streams for archive formats
 // Author:      Mike Wetherell
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: archive.h 43445 2006-11-16 14:30:20Z MW $
 // Copyright:   (c) 2004 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -225,7 +225,7 @@ public:
         if (it.m_rep)
             it.m_rep.AddRef();
         if (m_rep)
-            this->m_rep.UnRef();
+            m_rep.UnRef();
         m_rep = it.m_rep;
         return *this;
     }
@@ -341,13 +341,11 @@ public:
         const wxString& name,
         wxPathFormat format = wxPATH_NATIVE) const = 0;
 
-    // FIXME-UTF8: remove these from this file, they are used for ANSI
-    //             build only
     void SetConv(wxMBConv& conv) { m_pConv = &conv; }
     wxMBConv& GetConv() const
         { if (m_pConv) return *m_pConv; else return wxConvLocal; }
 
-    static const wxArchiveClassFactory *Find(const wxString& protocol,
+    static const wxArchiveClassFactory *Find(const wxChar *protocol,
                                              wxStreamProtocolType type
                                              = wxSTREAM_PROTOCOL);
 
diff --git a/Source/3rd Party/wx/include/wx/arrimpl.cpp b/Source/3rd Party/wx/include/wx/arrimpl.cpp
index f7b5efef7..37b26314a 100644
--- a/Source/3rd Party/wx/include/wx/arrimpl.cpp	
+++ b/Source/3rd Party/wx/include/wx/arrimpl.cpp	
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.10.97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: arrimpl.cpp 34241 2005-05-22 12:10:55Z JS $
 // Copyright:   (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 /*****************************************************************************
@@ -98,7 +98,7 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
       size_t ui = size() - 1;                                                 \
       do {                                                                    \
         if ( (T*)base_array::operator[](ui) == &Item )                        \
-          return static_cast<int>(ui);                                     \
+          return wx_static_cast(int, ui);                                     \
         ui--;                                                                 \
       }                                                                       \
       while ( ui != 0 );                                                      \
@@ -107,7 +107,7 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
   else {                                                                      \
     for( size_t ui = 0; ui < size(); ui++ ) {                                 \
       if( (T*)base_array::operator[](ui) == &Item )                           \
-        return static_cast<int>(ui);                                       \
+        return wx_static_cast(int, ui);                                       \
     }                                                                         \
   }                                                                           \
                                                                               \
diff --git a/Source/3rd Party/wx/include/wx/arrstr.h b/Source/3rd Party/wx/include/wx/arrstr.h
index 4b2b263cd..299cd00f5 100644
--- a/Source/3rd Party/wx/include/wx/arrstr.h	
+++ b/Source/3rd Party/wx/include/wx/arrstr.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/arrstr.h
+// Name:        include/wx/arrstr.h
 // Purpose:     wxArrayString class
 // Author:      Mattia Barbon and Vadim Zeitlin
 // Modified by:
 // Created:     07/07/03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: arrstr.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -15,20 +15,10 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
-// these functions are only used in STL build now but we define them in any
-// case for compatibility with the existing code outside of the library which
-// could be using them
-inline int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2)
-{
-    return s1->Cmp(*s2);
-}
+WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortAscending(wxString*, wxString*);
+WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortDescending(wxString*, wxString*);
 
-inline int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
-{
-    return wxStringSortAscending(s2, s1);
-}
-
-#if wxUSE_STD_CONTAINERS
+#if wxUSE_STL
 
 #include "wx/dynarray.h"
 
@@ -52,11 +42,10 @@ public:
 
     wxArrayString() { }
     wxArrayString(const wxArrayString& a) : wxArrayStringBase(a) { }
-    wxArrayString(size_t sz, const char** a);
-    wxArrayString(size_t sz, const wchar_t** a);
+    wxArrayString(size_t sz, const wxChar** a);
     wxArrayString(size_t sz, const wxString* a);
 
-    int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const;
+    int Index(const wxChar* sz, bool bCase = true, bool bFromEnd = false) const;
 
     void Sort(bool reverseOrder = false);
     void Sort(CompareFunction function);
@@ -86,37 +75,25 @@ public:
             Add(src[n]);
     }
 
-    int Index(const wxString& str, bool bCase = true, bool bFromEnd = false) const;
-
-private:
-    void Insert()
-    {
-        wxFAIL_MSG( "wxSortedArrayString::Insert() is not to be used" );
-    }
-
-    void Sort()
-    {
-        wxFAIL_MSG( "wxSortedArrayString::Sort() is not to be used" );
-    }
+    int Index(const wxChar* sz, bool bCase = true, bool bFromEnd = false) const;
 };
 
-#else // if !wxUSE_STD_CONTAINERS
+#else // if !wxUSE_STL
 
-// this shouldn't be defined for compilers not supporting template methods or
-// without std::distance()
+// ----------------------------------------------------------------------------
+// The string array uses it's knowledge of internal structure of the wxString
+// class to optimize string storage. Normally, we would store pointers to
+// string, but as wxString is, in fact, itself a pointer (sizeof(wxString) is
+// sizeof(char *)) we store these pointers instead. The cast to "wxString *" is
+// really all we need to turn such pointer into a string!
 //
-// FIXME-VC6: currently it's only not defined for VC6 in DLL build as it
-//            doesn't export template methods from DLL correctly so even though
-//            it compiles them fine, we get link errors when using wxArrayString
-#if !defined(__VISUALC6__) || !(defined(WXMAKINGDLL) || defined(WXUSINGDLL))
-    #define wxHAS_VECTOR_TEMPLATE_ASSIGN
-#endif
-
-#ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN
-    #include "wx/beforestd.h"
-    #include <iterator>
-    #include "wx/afterstd.h"
-#endif // wxHAS_VECTOR_TEMPLATE_ASSIGN
+// Of course, it can be called a dirty hack, but we use twice less memory and
+// this approach is also more speed efficient, so it's probably worth it.
+//
+// Usage notes: when a string is added/inserted, a new copy of it is created,
+// so the original string may be safely deleted. When a string is retrieved
+// from the array (operator[] or Item() method), a reference is returned.
+// ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxArrayString
 {
@@ -136,14 +113,13 @@ public:
     //
     // NB: the reason for using int and not bool is that like this we can avoid
     //     using this ctor for implicit conversions from "const char *" (which
-    //     we'd like to be implicitly converted to wxString instead!). This
-    //     wouldn't be needed if the 'explicit' keyword was supported by all
-    //     compilers, or if this was protected ctor for wxSortedArrayString,
-    //     but we're stuck with it now.
-  wxEXPLICIT wxArrayString(int autoSort) { Init(autoSort != 0); }
+    //     we'd like to be implicitly converted to wxString instead!)
+    //
+    //     of course, using explicit would be even better - if all compilers
+    //     supported it...
+  wxArrayString(int autoSort) { Init(autoSort != 0); }
     // C string array ctor
-  wxArrayString(size_t sz, const char** a);
-  wxArrayString(size_t sz, const wchar_t** a);
+  wxArrayString(size_t sz, const wxChar** a);
     // wxString string array ctor
   wxArrayString(size_t sz, const wxString* a);
     // copy ctor
@@ -173,34 +149,38 @@ public:
 
   // items access (range checking is done in debug version)
     // get item at position uiIndex
-  wxString& Item(size_t nIndex)
+  wxString& Item(size_t nIndex) const
     {
         wxASSERT_MSG( nIndex < m_nCount,
                       wxT("wxArrayString: index out of bounds") );
 
-        return m_pItems[nIndex];
+        return *(wxString *)&(m_pItems[nIndex]);
     }
-  const wxString& Item(size_t nIndex) const { return const_cast<wxArrayString*>(this)->Item(nIndex); }
 
     // same as Item()
-  wxString& operator[](size_t nIndex) { return Item(nIndex); }
-  const wxString& operator[](size_t nIndex) const { return Item(nIndex); }
+  wxString& operator[](size_t nIndex) const { return Item(nIndex); }
     // get last item
-  wxString& Last()
+  wxString& Last() const
   {
       wxASSERT_MSG( !IsEmpty(),
                     wxT("wxArrayString: index out of bounds") );
-      return Item(GetCount() - 1);
+      return Item(Count() - 1);
   }
-  const wxString& Last() const { return const_cast<wxArrayString*>(this)->Last(); }
 
+    // return a wxString[], useful for the controls which
+    // take one in their ctor.  You must delete[] it yourself
+    // once you are done with it.  Will return NULL if the
+    // ArrayString was empty.
+#if WXWIN_COMPATIBILITY_2_4
+  wxDEPRECATED( wxString* GetStringArray() const );
+#endif
 
   // item management
     // Search the element in the array, starting from the beginning if
     // bFromEnd is false or from end otherwise. If bCase, comparison is case
     // sensitive (default). Returns index of the first item matched or
     // wxNOT_FOUND
-  int  Index (const wxString& str, bool bCase = true, bool bFromEnd = false) const;
+  int  Index (const wxChar *sz, bool bCase = true, bool bFromEnd = false) const;
     // add new element at the end (if the array is not sorted), return its
     // index
   size_t Add(const wxString& str, size_t nInsert = 1);
@@ -209,15 +189,18 @@ public:
     // expand the array to have count elements
   void SetCount(size_t count);
     // remove first item matching this value
-  void Remove(const wxString& sz);
+  void Remove(const wxChar *sz);
     // remove item by index
+#if WXWIN_COMPATIBILITY_2_4
+  wxDEPRECATED( void Remove(size_t nIndex, size_t nRemove = 1) );
+#endif
   void RemoveAt(size_t nIndex, size_t nRemove = 1);
 
   // sorting
     // sort array elements in alphabetical order (or reversed alphabetical
     // order if reverseOrder parameter is true)
   void Sort(bool reverseOrder = false);
-    // sort array elements using specified comparison function
+    // sort array elements using specified comparaison function
   void Sort(CompareFunction compareFunction);
   void Sort(CompareFunction2 compareFunction);
 
@@ -252,7 +235,7 @@ public:
   public:
     pointer m_ptr;
     reverse_iterator() : m_ptr(NULL) { }
-    wxEXPLICIT reverse_iterator(pointer ptr) : m_ptr(ptr) { }
+    reverse_iterator(pointer ptr) : m_ptr(ptr) { }
     reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }
     pointer operator->() const { return m_ptr; }
@@ -278,7 +261,7 @@ public:
   public:
     pointer m_ptr;
     const_reverse_iterator() : m_ptr(NULL) { }
-    wxEXPLICIT const_reverse_iterator(pointer ptr) : m_ptr(ptr) { }
+    const_reverse_iterator(pointer ptr) : m_ptr(ptr) { }
     const_reverse_iterator(const itor& it) : m_ptr(it.m_ptr) { }
     const_reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
     reference operator*() const { return *m_ptr; }
@@ -295,32 +278,13 @@ public:
   wxArrayString(const_iterator first, const_iterator last)
     { Init(false); assign(first, last); }
   wxArrayString(size_type n, const_reference v) { Init(false); assign(n, v); }
-
-#ifdef wxHAS_VECTOR_TEMPLATE_ASSIGN
-  template <class Iterator>
-  void assign(Iterator first, Iterator last)
-  {
-      clear();
-      reserve(std::distance(first, last));
-      for(; first != last; ++first)
-          push_back(*first);
-  }
-#else // !wxHAS_VECTOR_TEMPLATE_ASSIGN
-  void assign(const_iterator first, const_iterator last)
-  {
-      clear();
-      reserve(last - first);
-      for(; first != last; ++first)
-          push_back(*first);
-  }
-#endif // wxHAS_VECTOR_TEMPLATE_ASSIGN/!wxHAS_VECTOR_TEMPLATE_ASSIGN
-
+  void assign(const_iterator first, const_iterator last);
   void assign(size_type n, const_reference v)
     { clear(); Add(v, n); }
   reference back() { return *(end() - 1); }
   const_reference back() const { return *(end() - 1); }
-  iterator begin() { return m_pItems; }
-  const_iterator begin() const { return m_pItems; }
+  iterator begin() { return (wxString *)&(m_pItems[0]); }
+  const_iterator begin() const { return (wxString *)&(m_pItems[0]); }
   size_type capacity() const { return m_nSize; }
   void clear() { Clear(); }
   bool empty() const { return IsEmpty(); }
@@ -344,21 +308,12 @@ public:
   void pop_back() { RemoveAt(GetCount() - 1); }
   void push_back(const_reference v) { Add(v); }
   reverse_iterator rbegin() { return reverse_iterator(end() - 1); }
-  const_reverse_iterator rbegin() const
-    { return const_reverse_iterator(end() - 1); }
+  const_reverse_iterator rbegin() const;
   reverse_iterator rend() { return reverse_iterator(begin() - 1); }
-  const_reverse_iterator rend() const
-    { return const_reverse_iterator(begin() - 1); }
+  const_reverse_iterator rend() const;
   void reserve(size_type n) /* base::reserve*/;
   void resize(size_type n, value_type v = value_type());
   size_type size() const { return GetCount(); }
-  void swap(wxArrayString& other)
-  {
-      wxSwap(m_nSize, other.m_nSize);
-      wxSwap(m_nCount, other.m_nCount);
-      wxSwap(m_pItems, other.m_pItems);
-      wxSwap(m_autoSort, other.m_autoSort);
-  }
 
 protected:
   void Init(bool autoSort);             // common part of all ctors
@@ -366,11 +321,14 @@ protected:
 
 private:
   void Grow(size_t nIncrement = 0);     // makes array bigger if needed
+  void Free();                          // free all the strings stored
+
+  void DoSort();                        // common part of all Sort() variants
 
   size_t  m_nSize,    // current size of the array
           m_nCount;   // current number of elements
 
-  wxString *m_pItems; // pointer to data
+  wxChar  **m_pItems; // pointer to data
 
   bool    m_autoSort; // if true, keep the array always sorted
 };
@@ -384,7 +342,7 @@ public:
     { Copy(array); }
 };
 
-#endif // !wxUSE_STD_CONTAINERS
+#endif // !wxUSE_STL
 
 // this class provides a temporary wxString* from a
 // wxArrayString
@@ -407,110 +365,13 @@ public:
         return m_strings;
     }
 
-    wxString* Release()
-    {
-        wxString *r = GetStrings();
-        m_strings = NULL;
-        return r;
-    }
+#if wxABI_VERSION >= 20810
+    wxString* Release();
+#endif // wxABI_VERSION >= 20810
 
 private:
     const wxArrayString& m_array;
     wxString* m_strings;
 };
 
-
-// ----------------------------------------------------------------------------
-// helper functions for working with arrays
-// ----------------------------------------------------------------------------
-
-// by default, these functions use the escape character to escape the
-// separators occuring inside the string to be joined, this can be disabled by
-// passing '\0' as escape
-
-WXDLLIMPEXP_BASE wxString wxJoin(const wxArrayString& arr,
-                                 const wxChar sep,
-                                 const wxChar escape = wxT('\\'));
-
-WXDLLIMPEXP_BASE wxArrayString wxSplit(const wxString& str,
-                                       const wxChar sep,
-                                       const wxChar escape = wxT('\\'));
-
-
-// ----------------------------------------------------------------------------
-// This helper class allows to pass both C array of wxStrings or wxArrayString
-// using the same interface.
-//
-// Use it when you have two methods taking wxArrayString or (int, wxString[]),
-// that do the same thing. This class lets you iterate over input data in the
-// same way whether it is a raw array of strings or wxArrayString.
-//
-// The object does not take ownership of the data -- internally it keeps
-// pointers to the data, therefore the data must be disposed of by user
-// and only after this object is destroyed. Usually it is not a problem as
-// only temporary objects of this class are used.
-// ----------------------------------------------------------------------------
-
-class wxArrayStringsAdapter
-{
-public:
-    // construct an adapter from a wxArrayString
-    wxArrayStringsAdapter(const wxArrayString& strings)
-        : m_type(wxSTRING_ARRAY), m_size(strings.size())
-    {
-        m_data.array = &strings;
-    }
-
-    // construct an adapter from a wxString[]
-    wxArrayStringsAdapter(unsigned int n, const wxString *strings)
-        : m_type(wxSTRING_POINTER), m_size(n)
-    {
-        m_data.ptr = strings;
-    }
-
-    // construct an adapter from a single wxString
-    wxArrayStringsAdapter(const wxString& s)
-        : m_type(wxSTRING_POINTER), m_size(1)
-    {
-        m_data.ptr = &s;
-    }
-
-    // default copy constructor is ok
-
-    // iteration interface
-    size_t GetCount() const { return m_size; }
-    bool IsEmpty() const { return GetCount() == 0; }
-    const wxString& operator[] (unsigned int i) const
-    {
-        wxASSERT_MSG( i < GetCount(), wxT("index out of bounds") );
-        if(m_type == wxSTRING_POINTER)
-            return m_data.ptr[i];
-        return m_data.array->Item(i);
-    }
-    wxArrayString AsArrayString() const
-    {
-        if(m_type == wxSTRING_ARRAY)
-            return *m_data.array;
-        return wxArrayString(GetCount(), m_data.ptr);
-    }
-
-private:
-    // type of the data being held
-    enum wxStringContainerType
-    {
-        wxSTRING_ARRAY,  // wxArrayString
-        wxSTRING_POINTER // wxString[]
-    };
-
-    wxStringContainerType m_type;
-    size_t m_size;
-    union
-    {
-        const wxString *      ptr;
-        const wxArrayString * array;
-    } m_data;
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxArrayStringsAdapter);
-};
-
-#endif // _WX_ARRSTR_H
+#endif
diff --git a/Source/3rd Party/wx/include/wx/artprov.h b/Source/3rd Party/wx/include/wx/artprov.h
index 276f891e3..31f3bd44e 100644
--- a/Source/3rd Party/wx/include/wx/artprov.h	
+++ b/Source/3rd Party/wx/include/wx/artprov.h	
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     18/03/2002
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: artprov.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,7 +15,6 @@
 #include "wx/string.h"
 #include "wx/bitmap.h"
 #include "wx/icon.h"
-#include "wx/iconbndl.h"
 
 class WXDLLIMPEXP_FWD_CORE wxArtProvidersList;
 class WXDLLIMPEXP_FWD_CORE wxArtProviderCache;
@@ -28,10 +27,10 @@ class wxArtProviderModule;
 typedef wxString wxArtClient;
 typedef wxString wxArtID;
 
-#define wxART_MAKE_CLIENT_ID_FROM_STR(id)  ((id) + "_C")
-#define wxART_MAKE_CLIENT_ID(id)           (#id "_C")
+#define wxART_MAKE_CLIENT_ID_FROM_STR(id)  (id + wxT("_C"))
+#define wxART_MAKE_CLIENT_ID(id)           wxT(#id) wxT("_C")
 #define wxART_MAKE_ART_ID_FROM_STR(id)     (id)
-#define wxART_MAKE_ART_ID(id)              (#id)
+#define wxART_MAKE_ART_ID(id)              wxT(#id)
 
 // ----------------------------------------------------------------------------
 // Art clients
@@ -45,7 +44,6 @@ typedef wxString wxArtID;
 #define wxART_HELP_BROWSER         wxART_MAKE_CLIENT_ID(wxART_HELP_BROWSER)
 #define wxART_MESSAGE_BOX          wxART_MAKE_CLIENT_ID(wxART_MESSAGE_BOX)
 #define wxART_BUTTON               wxART_MAKE_CLIENT_ID(wxART_BUTTON)
-#define wxART_LIST                 wxART_MAKE_CLIENT_ID(wxART_LIST)
 
 #define wxART_OTHER                wxART_MAKE_CLIENT_ID(wxART_OTHER)
 
@@ -66,8 +64,6 @@ typedef wxString wxArtID;
 #define wxART_GO_DOWN              wxART_MAKE_ART_ID(wxART_GO_DOWN)
 #define wxART_GO_TO_PARENT         wxART_MAKE_ART_ID(wxART_GO_TO_PARENT)
 #define wxART_GO_HOME              wxART_MAKE_ART_ID(wxART_GO_HOME)
-#define wxART_GOTO_FIRST           wxART_MAKE_ART_ID(wxART_GOTO_FIRST)
-#define wxART_GOTO_LAST            wxART_MAKE_ART_ID(wxART_GOTO_LAST)
 #define wxART_FILE_OPEN            wxART_MAKE_ART_ID(wxART_FILE_OPEN)
 #define wxART_FILE_SAVE            wxART_MAKE_ART_ID(wxART_FILE_SAVE)
 #define wxART_FILE_SAVE_AS         wxART_MAKE_ART_ID(wxART_FILE_SAVE_AS)
@@ -103,10 +99,6 @@ typedef wxString wxArtID;
 #define wxART_UNDO                 wxART_MAKE_ART_ID(wxART_UNDO)
 #define wxART_REDO                 wxART_MAKE_ART_ID(wxART_REDO)
 
-#define wxART_PLUS                 wxART_MAKE_ART_ID(wxART_PLUS)
-#define wxART_MINUS                wxART_MAKE_ART_ID(wxART_MINUS)
-
-#define wxART_CLOSE                wxART_MAKE_ART_ID(wxART_CLOSE)
 #define wxART_QUIT                 wxART_MAKE_ART_ID(wxART_QUIT)
 
 #define wxART_FIND                 wxART_MAKE_ART_ID(wxART_FIND)
@@ -117,14 +109,12 @@ typedef wxString wxArtID;
 // wxArtProvider class
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxArtProvider : public wxObject
+class WXDLLEXPORT wxArtProvider : public wxObject
 {
 public:
     // Dtor removes the provider from providers stack if it's still on it
     virtual ~wxArtProvider();
 
-    // Does this platform implement native icons theme?
-    static bool HasNativeProvider();
 
     // Add new provider to the top of providers stack (i.e. the provider will
     // be queried first of all).
@@ -132,12 +122,11 @@ public:
 
     // Add new provider to the bottom of providers stack (i.e. the provider
     // will be queried as the last one).
+#if wxABI_VERSION >= 20810
     static void PushBack(wxArtProvider *provider);
-
-#if WXWIN_COMPATIBILITY_2_8
-    // use PushBack(), it's the same thing
-    static wxDEPRECATED( void Insert(wxArtProvider *provider) );
 #endif
+    // same as PushBack()
+    static void Insert(wxArtProvider *provider);
 
     // Remove latest added provider and delete it.
     static bool Pop();
@@ -161,54 +150,26 @@ public:
                           const wxArtClient& client = wxART_OTHER,
                           const wxSize& size = wxDefaultSize);
 
-    // Helper used by GetMessageBoxIcon(): return the art id corresponding to
-    // the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one
-    // can be set)
-    static wxArtID GetMessageBoxIconId(int flags);
-
-    // Helper used by several generic classes: return the icon corresponding to
-    // the standard wxICON_INFORMATION/WARNING/ERROR/QUESTION flags (only one
-    // can be set)
-    static wxIcon GetMessageBoxIcon(int flags)
-    {
-        return GetIcon(GetMessageBoxIconId(flags), wxART_MESSAGE_BOX);
-    }
-
-    // Query the providers for iconbundle with given ID and return it. Return
-    // wxNullIconBundle if no provider provides it.
-    static wxIconBundle GetIconBundle(const wxArtID& id,
-                                      const wxArtClient& client = wxART_OTHER);
-
-    // Gets native size for given 'client' or wxDefaultSize if it doesn't
-    // have native equivalent
-    static wxSize GetNativeSizeHint(const wxArtClient& client);
-
     // Get the size hint of an icon from a specific wxArtClient, queries
     // the topmost provider if platform_dependent = false
     static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false);
 
 #if WXWIN_COMPATIBILITY_2_6
     // use the corresponding methods without redundant "Provider" suffix
-    static wxDEPRECATED( void PushProvider(wxArtProvider *provider) );
-    static wxDEPRECATED( void InsertProvider(wxArtProvider *provider) );
-    static wxDEPRECATED( bool PopProvider() );
+    wxDEPRECATED( static void PushProvider(wxArtProvider *provider) );
+    wxDEPRECATED( static void InsertProvider(wxArtProvider *provider) );
+    wxDEPRECATED( static bool PopProvider() );
 
     // use Delete() if this is what you really need, or just delete the
     // provider pointer, do not use Remove() as it does not delete the pointer
     // unlike RemoveProvider() which does
-    static wxDEPRECATED( bool RemoveProvider(wxArtProvider *provider) );
+    wxDEPRECATED( static bool RemoveProvider(wxArtProvider *provider) );
 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
     friend class wxArtProviderModule;
-#if wxUSE_ARTPROVIDER_STD
     // Initializes default provider
     static void InitStdProvider();
-#endif // wxUSE_ARTPROVIDER_STD
-    // Initializes Tango-based icon provider
-#if wxUSE_ARTPROVIDER_TANGO
-    static void InitTangoProvider();
-#endif // wxUSE_ARTPROVIDER_TANGO
     // Initializes platform's native provider, if available (e.g. GTK2)
     static void InitNativeProvider();
     // Destroy caches & all providers
@@ -220,26 +181,15 @@ protected:
         return GetSizeHint(client, true);
     }
 
-    // Derived classes must override CreateBitmap or CreateIconBundle
-    // (or both) to create requested art resource. This method is called
-    // only once per instance's lifetime for each requested wxArtID.
+    // Derived classes must override this method to create requested
+    // art resource. This method is called only once per instance's
+    // lifetime for each requested wxArtID.
     virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id),
                                   const wxArtClient& WXUNUSED(client),
-                                  const wxSize& WXUNUSED(size))
-    {
-        return wxNullBitmap;
-    }
-
-    virtual wxIconBundle CreateIconBundle(const wxArtID& WXUNUSED(id),
-                                          const wxArtClient& WXUNUSED(client))
-    {
-        return wxNullIconBundle;
-    }
+                                  const wxSize& WXUNUSED(size)) = 0;
 
 private:
     static void CommonAddingProvider();
-    static wxIconBundle DoGetIconBundle(const wxArtID& id,
-                                        const wxArtClient& client);
 
 private:
     // list of providers:
@@ -251,12 +201,4 @@ private:
 };
 
 
-#if !defined(__WXUNIVERSAL__) && \
-    ((defined(__WXGTK__) && defined(__WXGTK20__)) || defined(__WXMSW__) || \
-     defined(__WXMAC__))
-  // *some* (partial) native implementation of wxArtProvider exists; this is
-  // not the same as wxArtProvider::HasNativeProvider()!
-  #define wxHAS_NATIVE_ART_PROVIDER_IMPL
-#endif
-
 #endif // _WX_ARTPROV_H_
diff --git a/Source/3rd Party/wx/include/wx/atomic.h b/Source/3rd Party/wx/include/wx/atomic.h
deleted file mode 100644
index 107950a3d..000000000
--- a/Source/3rd Party/wx/include/wx/atomic.h	
+++ /dev/null
@@ -1,160 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/atomic.h
-// Purpose:     functions to manipulate atomically integers and pointers
-// Author:      Armel Asselin
-// Created:     12/13/2006
-// RCS-ID:      $Id$
-// Copyright:   (c) Armel Asselin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ATOMIC_H_
-#define _WX_ATOMIC_H_
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// get the value of wxUSE_THREADS configuration flag
-#include "wx/defs.h"
-
-// constraints on the various functions:
-//  - wxAtomicDec must return a zero value if the value is zero once
-//  decremented else it must return any non-zero value (the true value is OK
-//  but not necessary).
-
-#if wxUSE_THREADS
-
-#if defined(HAVE_GCC_ATOMIC_BUILTINS)
-
-// NB: we intentionally don't use Linux's asm/atomic.h header, because it's
-//     an internal kernel header that doesn't always work in userspace:
-//     http://bugs.mysql.com/bug.php?id=28456
-//     http://golubenco.org/blog/atomic-operations/
-
-inline void wxAtomicInc (wxUint32 &value)
-{
-    __sync_fetch_and_add(&value, 1);
-}
-
-inline wxUint32 wxAtomicDec (wxUint32 &value)
-{
-    return __sync_sub_and_fetch(&value, 1);
-}
-
-
-#elif defined(__WINDOWS__)
-
-// include standard Windows headers
-#include "wx/msw/wrapwin.h"
-
-inline void wxAtomicInc (wxUint32 &value)
-{
-    InterlockedIncrement ((LONG*)&value);
-}
-
-inline wxUint32 wxAtomicDec (wxUint32 &value)
-{
-    return InterlockedDecrement ((LONG*)&value);
-}
-
-#elif defined(__WXMAC__) || defined(__DARWIN__)
-
-#include "libkern/OSAtomic.h"
-inline void wxAtomicInc (wxUint32 &value)
-{
-    OSAtomicIncrement32 ((int32_t*)&value);
-}
-
-inline wxUint32 wxAtomicDec (wxUint32 &value)
-{
-    return OSAtomicDecrement32 ((int32_t*)&value);
-}
-
-#elif defined (__SOLARIS__)
-
-#include <atomic.h>
-
-inline void wxAtomicInc (wxUint32 &value)
-{
-    atomic_add_32 ((uint32_t*)&value, 1);
-}
-
-inline wxUint32 wxAtomicDec (wxUint32 &value)
-{
-    return atomic_add_32_nv ((uint32_t*)&value, (uint32_t)-1);
-}
-
-#else // unknown platform
-
-// it will result in inclusion if the generic implementation code a bit later in this page
-#define wxNEEDS_GENERIC_ATOMIC_OPS
-
-#endif // unknown platform
-
-#else // else of wxUSE_THREADS
-// if no threads are used we can safely use simple ++/--
-
-inline void wxAtomicInc (wxUint32 &value) { ++value; }
-inline wxUint32 wxAtomicDec (wxUint32 &value) { return --value; }
-
-#endif // !wxUSE_THREADS
-
-// ----------------------------------------------------------------------------
-// proxies to actual implementations, but for various other types with same
-//  behaviour
-// ----------------------------------------------------------------------------
-
-#ifdef wxNEEDS_GENERIC_ATOMIC_OPS
-
-#include "wx/thread.h" // for wxCriticalSection
-
-class wxAtomicInt32
-{
-public:
-    wxAtomicInt32() { } // non initialized for consistency with basic int type
-    wxAtomicInt32(wxInt32 v) : m_value(v) { }
-    wxAtomicInt32(const wxAtomicInt32& a) : m_value(a.m_value) {}
-
-    operator wxInt32() const { return m_value; }
-    operator volatile wxInt32&() { return m_value; }
-
-    wxAtomicInt32& operator=(wxInt32 v) { m_value = v; return *this; }
-
-    void Inc()
-    {
-        wxCriticalSectionLocker lock(m_locker);
-        ++m_value;
-    }
-
-    wxInt32 Dec()
-    {
-        wxCriticalSectionLocker lock(m_locker);
-        return --m_value;
-    }
-
-private:
-    volatile wxInt32  m_value;
-    wxCriticalSection m_locker;
-};
-
-inline void wxAtomicInc(wxAtomicInt32 &value) { value.Inc(); }
-inline wxInt32 wxAtomicDec(wxAtomicInt32 &value) { return value.Dec(); }
-
-#else // !wxNEEDS_GENERIC_ATOMIC_OPS
-
-#define wxHAS_ATOMIC_OPS
-
-inline void wxAtomicInc(wxInt32 &value) { wxAtomicInc((wxUint32&)value); }
-inline wxInt32 wxAtomicDec(wxInt32 &value) { return wxAtomicDec((wxUint32&)value); }
-
-typedef wxInt32 wxAtomicInt32;
-
-#endif // wxNEEDS_GENERIC_ATOMIC_OPS
-
-// all the native implementations use 32 bits currently
-// for a 64 bits implementation we could use (a future) wxAtomicInt64 as
-// default type
-typedef wxAtomicInt32 wxAtomicInt;
-
-#endif // _WX_ATOMIC_H_
diff --git a/Source/3rd Party/wx/include/wx/base64.h b/Source/3rd Party/wx/include/wx/base64.h
deleted file mode 100644
index 12a5f976f..000000000
--- a/Source/3rd Party/wx/include/wx/base64.h	
+++ /dev/null
@@ -1,122 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/base64.h
-// Purpose:     declaration of BASE64 encoding/decoding functionality
-// Author:      Charles Reimers, Vadim Zeitlin
-// Created:     2007-06-18
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BASE64_H_
-#define _WX_BASE64_H_
-
-#if wxUSE_BASE64
-
-#include "wx/string.h"
-#include "wx/buffer.h"
-
-// ----------------------------------------------------------------------------
-// encoding functions
-// ----------------------------------------------------------------------------
-
-// return the size needed for the buffer containing the encoded representation
-// of a buffer of given length
-inline size_t wxBase64EncodedSize(size_t len) { return 4*((len+2)/3); }
-
-// raw base64 encoding function which encodes the contents of a buffer of the
-// specified length into the buffer of the specified size
-//
-// returns the length of the encoded data or wxCONV_FAILED if the buffer is not
-// large enough; to determine the needed size you can either allocate a buffer
-// of wxBase64EncodedSize(srcLen) size or call the function with NULL buffer in
-// which case the required size will be returned
-WXDLLIMPEXP_BASE size_t
-wxBase64Encode(char *dst, size_t dstLen, const void *src, size_t srcLen);
-
-// encode the contents of the given buffer using base64 and return as string
-// (there is no error return)
-inline wxString wxBase64Encode(const void *src, size_t srcLen)
-{
-    const size_t dstLen = wxBase64EncodedSize(srcLen);
-    wxCharBuffer dst(dstLen);
-    wxBase64Encode(dst.data(), dstLen, src, srcLen);
-
-    return dst;
-}
-
-inline wxString wxBase64Encode(const wxMemoryBuffer& buf)
-{
-    return wxBase64Encode(buf.GetData(), buf.GetDataLen());
-}
-
-// ----------------------------------------------------------------------------
-// decoding functions
-// ----------------------------------------------------------------------------
-
-// elements of this enum specify the possible behaviours of wxBase64Decode()
-// when an invalid character is encountered
-enum wxBase64DecodeMode
-{
-    // normal behaviour: stop at any invalid characters
-    wxBase64DecodeMode_Strict,
-
-    // skip whitespace characters
-    wxBase64DecodeMode_SkipWS,
-
-    // the most lenient behaviour: simply ignore all invalid characters
-    wxBase64DecodeMode_Relaxed
-};
-
-// return the buffer size necessary for decoding a base64 string of the given
-// length
-inline size_t wxBase64DecodedSize(size_t srcLen) { return 3*srcLen/4; }
-
-// raw decoding function which decodes the contents of the string of specified
-// length (or NUL-terminated by default) into the provided buffer of the given
-// size
-//
-// the function normally stops at any character invalid inside a base64-encoded
-// string (i.e. not alphanumeric nor '+' nor '/') but can be made to skip the
-// whitespace or all invalid characters using its mode argument
-//
-// returns the length of the decoded data or wxCONV_FAILED if an error occurs
-// such as the buffer is too small or the encoded string is invalid; in the
-// latter case the posErr is filled with the position where the decoding
-// stopped if it is not NULL
-WXDLLIMPEXP_BASE size_t
-wxBase64Decode(void *dst, size_t dstLen,
-               const char *src, size_t srcLen = wxNO_LEN,
-               wxBase64DecodeMode mode = wxBase64DecodeMode_Strict,
-               size_t *posErr = NULL);
-
-inline size_t
-wxBase64Decode(void *dst, size_t dstLen,
-               const wxString& src,
-               wxBase64DecodeMode mode = wxBase64DecodeMode_Strict,
-               size_t *posErr = NULL)
-{
-    // don't use str.length() here as the ASCII buffer is shorter than it for
-    // strings with embedded NULs
-    return wxBase64Decode(dst, dstLen, src.ToAscii(), wxNO_LEN, mode, posErr);
-}
-
-// decode the contents of the given string; the returned buffer is empty if an
-// error occurs during decoding
-WXDLLIMPEXP_BASE wxMemoryBuffer
-wxBase64Decode(const char *src, size_t srcLen = wxNO_LEN,
-               wxBase64DecodeMode mode = wxBase64DecodeMode_Strict,
-               size_t *posErr = NULL);
-
-inline wxMemoryBuffer
-wxBase64Decode(const wxString& src,
-               wxBase64DecodeMode mode = wxBase64DecodeMode_Strict,
-               size_t *posErr = NULL)
-{
-    // don't use str.length() here as the ASCII buffer is shorter than it for
-    // strings with embedded NULs
-    return wxBase64Decode(src.ToAscii(), wxNO_LEN, mode, posErr);
-}
-
-#endif // wxUSE_BASE64
-
-#endif // _WX_BASE64_H_
diff --git a/Source/3rd Party/wx/include/wx/beforestd.h b/Source/3rd Party/wx/include/wx/beforestd.h
index dc8232e69..7261de803 100644
--- a/Source/3rd Party/wx/include/wx/beforestd.h	
+++ b/Source/3rd Party/wx/include/wx/beforestd.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/beforestd.h
+// Name:        include/wx/beforestd.h
 // Purpose:     #include before STL headers
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07/07/03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: beforestd.h 61871 2009-09-09 22:29:51Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -23,20 +23,6 @@
 // VC 7.x isn't as bad as VC6 and doesn't give these warnings but eVC (which
 // defines _MSC_VER as 1201) does need to be included as it's VC6-like
 #if defined(__VISUALC__) && __VISUALC__ <= 1201
-    // these warning have to be disabled and not just temporarily disabled
-    // because they will be given at the end of the compilation of the
-    // current source and there is absolutely nothing we can do about them so
-    // disable them before warning(push) below
-
-    // 'foo': unreferenced inline function has been removed
-    #pragma warning(disable:4514)
-
-    // 'function' : function not inlined
-    #pragma warning(disable:4710)
-
-    // 'id': identifier was truncated to 'num' characters in the debug info
-    #pragma warning(disable:4786)
-
     // MSVC 5 does not have this
     #if __VISUALC__ > 1100
         // we have to disable (and reenable in afterstd.h) this one because,
@@ -62,15 +48,28 @@
         // 'identifier' use the following syntax
         #pragma warning(disable:4663)
     #endif
+
+    // these warning have to be disabled and not just temporarily disabled
+    // because they will be given at the end of the compilation of the
+    // current source and there is absolutely nothing we can do about them
+
+    // 'foo': unreferenced inline function has been removed
+    #pragma warning(disable:4514)
+
+    // 'function' : function not inlined
+    #pragma warning(disable:4710)
+
+    // 'id': identifier was truncated to 'num' characters in the debug info
+    #pragma warning(disable:4786)
 #endif // VC++ < 7
 
-/**
-    GCC's visibility support is broken for libstdc++ in some older versions
-    (namely Debian/Ubuntu's GCC 4.1, see
-    https://bugs.launchpad.net/ubuntu/+source/gcc-4.1/+bug/109262). We fix it
-    here by mimicking newer versions' behaviour of using default visibility
-    for libstdc++ code.
+/*
+    Recent versions of Sun C++ compiler use _T in their standard headers and
+    our definition of it in wx/wxchar.h conflicts with them and breaks
+    compilation, so undefine _T before including them and redefine it back in
+    wx/afterstd.h if needed.
  */
-#if defined(HAVE_VISIBILITY) && defined(HAVE_BROKEN_LIBSTDCXX_VISIBILITY)
-    #pragma GCC visibility push(default)
-#endif
+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
+    #undef _T
+#endif /* SUNCC */
+
diff --git a/Source/3rd Party/wx/include/wx/bitmap.h b/Source/3rd Party/wx/include/wx/bitmap.h
index 503cc1c8c..bcee14373 100644
--- a/Source/3rd Party/wx/include/wx/bitmap.h	
+++ b/Source/3rd Party/wx/include/wx/bitmap.h	
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     22.04.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: bitmap.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,11 +19,11 @@
 #include "wx/string.h"
 #include "wx/gdicmn.h"  // for wxBitmapType
 #include "wx/colour.h"
-#include "wx/image.h"
 
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
 class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxImage;
 class WXDLLIMPEXP_FWD_CORE wxMask;
 class WXDLLIMPEXP_FWD_CORE wxPalette;
 
@@ -33,16 +33,14 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
-DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLIMPEXP_CORE)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxBitmap,WXDLLEXPORT)
 #endif
 
 // ----------------------------------------------------------------------------
 // wxMask represents the transparent area of the bitmap
 // ----------------------------------------------------------------------------
 
-// TODO: all implementation of wxMask, except the generic one,
-//       do not derive from wxMaskBase,,, they should
-class WXDLLIMPEXP_CORE wxMaskBase : public wxObject
+class WXDLLEXPORT wxMaskBase : public wxObject
 {
 public:
     // create the mask from bitmap pixels of the given colour
@@ -68,7 +66,8 @@ protected:
     virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) = 0;
 };
 
-#if defined(__WXDFB__) || \
+#if defined(__WXMGL__) || \
+    defined(__WXDFB__) || \
     defined(__WXMAC__) || \
     defined(__WXGTK__) || \
     defined(__WXCOCOA__) || \
@@ -79,13 +78,8 @@ protected:
     #define wxUSE_BITMAP_BASE 0
 #endif
 
-// a more readable way to tell
-#define wxBITMAP_SCREEN_DEPTH       (-1)
-
-
-// All ports except wxMSW and wxOS2 use wxBitmapHandler and wxBitmapBase as
-// base class for wxBitmapHandler; wxMSW and wxOS2 use wxGDIImageHandler as
-// base class since it allows some code reuse there.
+// Only used by some ports
+// FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes
 #if wxUSE_BITMAP_BASE
 
 // ----------------------------------------------------------------------------
@@ -93,29 +87,18 @@ protected:
 // different formats
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmapHandler : public wxObject
+class WXDLLEXPORT wxBitmapHandlerBase : public wxObject
 {
 public:
-    wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; }
-    virtual ~wxBitmapHandler() { }
+    wxBitmapHandlerBase() { m_type = wxBITMAP_TYPE_INVALID; }
+    virtual ~wxBitmapHandlerBase() { }
 
-    // NOTE: the following functions should be pure virtuals, but they aren't
-    //       because otherwise almost all ports would have to implement
-    //       them as "return false"...
-
-    virtual bool Create(wxBitmap *WXUNUSED(bitmap), const void* WXUNUSED(data),
-                         wxBitmapType WXUNUSED(type), int WXUNUSED(width), int WXUNUSED(height),
-                         int WXUNUSED(depth) = 1)
-        { return false; }
-
-    virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name),
-                           wxBitmapType WXUNUSED(type), int WXUNUSED(desiredWidth),
-                           int WXUNUSED(desiredHeight))
-        { return false; }
-
-    virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap), const wxString& WXUNUSED(name),
-                           wxBitmapType WXUNUSED(type), const wxPalette *WXUNUSED(palette) = NULL) const
-        { return false; }
+    virtual bool Create(wxBitmap *bitmap, const void* data, long flags,
+                        int width, int height, int depth = 1);
+    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+                          int desiredWidth, int desiredHeight);
+    virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
+                          int type, const wxPalette *palette = NULL);
 
     void SetName(const wxString& name)      { m_name = name; }
     void SetExtension(const wxString& ext)  { m_extension = ext; }
@@ -129,56 +112,43 @@ private:
     wxString      m_extension;
     wxBitmapType  m_type;
 
-    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
+    DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
 };
 
-
-// ----------------------------------------------------------------------------
-// wxBitmap: class which represents platform-dependent bitmap (unlike wxImage)
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject
+class WXDLLEXPORT wxBitmapBase : public wxGDIObject
 {
 public:
     /*
     Derived class must implement these:
 
     wxBitmap();
-    wxBitmap(const wxBitmap& bmp);
+    wxBitmap(int width, int height, int depth = -1);
     wxBitmap(const char bits[], int width, int height, int depth = 1);
-    wxBitmap(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
-    wxBitmap(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH);
     wxBitmap(const char* const* bits);
     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
-    wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH);
+    wxBitmap(const wxImage& image, int depth = -1);
+
+    bool Create(int width, int height, int depth = -1);
 
     static void InitStandardHandlers();
     */
 
-    virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) = 0;
-    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) = 0;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;
 
     virtual int GetHeight() const = 0;
     virtual int GetWidth() const = 0;
     virtual int GetDepth() const = 0;
 
-    wxSize GetSize() const
-        { return wxSize(GetWidth(), GetHeight()); }
-
-#if wxUSE_IMAGE
     virtual wxImage ConvertToImage() const = 0;
 
-    // Convert to disabled (dimmed) bitmap.
-    wxBitmap ConvertToDisabled(unsigned char brightness = 255) const;
-#endif // wxUSE_IMAGE
-
     virtual wxMask *GetMask() const = 0;
     virtual void SetMask(wxMask *mask) = 0;
 
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const = 0;
 
     virtual bool SaveFile(const wxString &name, wxBitmapType type,
-                          const wxPalette *palette = NULL) const = 0;
+                          const wxPalette *palette = (wxPalette *)NULL) const = 0;
     virtual bool LoadFile(const wxString &name, wxBitmapType type) = 0;
 
     /*
@@ -204,8 +174,8 @@ public:
 
     // Format handling
     static inline wxList& GetHandlers() { return sm_handlers; }
-    static void AddHandler(wxBitmapHandler *handler);
-    static void InsertHandler(wxBitmapHandler *handler);
+    static void AddHandler(wxBitmapHandlerBase *handler);
+    static void InsertHandler(wxBitmapHandlerBase *handler);
     static bool RemoveHandler(const wxString& name);
     static wxBitmapHandler *FindHandler(const wxString& name);
     static wxBitmapHandler *FindHandler(const wxString& extension, wxBitmapType bitmapType);
@@ -233,58 +203,32 @@ protected:
 
 #endif // wxUSE_BITMAP_BASE
 
-
-// the wxBITMAP_DEFAULT_TYPE constant defines the default argument value
-// for wxBitmap's ctor and wxBitmap::LoadFile() functions.
-#if defined(__WXMSW__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/bitmap.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
     #include "wx/x11/bitmap.h"
 #elif defined(__WXGTK20__)
-    #ifdef __WINDOWS__
-        #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
-    #else
-        #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
-    #endif
     #include "wx/gtk/bitmap.h"
 #elif defined(__WXGTK__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
     #include "wx/gtk1/bitmap.h"
 #elif defined(__WXX11__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_XPM
     #include "wx/x11/bitmap.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/bitmap.h"
 #elif defined(__WXDFB__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
     #include "wx/dfb/bitmap.h"
 #elif defined(__WXMAC__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_PICT_RESOURCE
-    #include "wx/osx/bitmap.h"
+    #include "wx/mac/bitmap.h"
 #elif defined(__WXCOCOA__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
     #include "wx/cocoa/bitmap.h"
 #elif defined(__WXPM__)
-    #define wxBITMAP_DEFAULT_TYPE    wxBITMAP_TYPE_BMP_RESOURCE
     #include "wx/os2/bitmap.h"
 #endif
 
-#if wxUSE_IMAGE
-inline
-wxBitmap
-#if wxUSE_BITMAP_BASE
-wxBitmapBase::
-#else
-wxBitmap::
-#endif
-ConvertToDisabled(unsigned char brightness) const
-{
-    return ConvertToImage().ConvertToDisabled(brightness);
-}
-#endif // wxUSE_IMAGE
-
 // we must include generic mask.h after wxBitmap definition
-#if defined(__WXDFB__)
+#if defined(__WXMGL__) || defined(__WXDFB__)
     #define wxUSE_GENERIC_MASK 1
 #else
     #define wxUSE_GENERIC_MASK 0
diff --git a/Source/3rd Party/wx/include/wx/bmpbuttn.h b/Source/3rd Party/wx/include/wx/bmpbuttn.h
index 085e4fbb2..f7b96b662 100644
--- a/Source/3rd Party/wx/include/wx/bmpbuttn.h	
+++ b/Source/3rd Party/wx/include/wx/bmpbuttn.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/bmpbuttn.h
+// Name:        wx/bmpbutton.h
 // Purpose:     wxBitmapButton class interface
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: bmpbuttn.h 45498 2007-04-16 13:03:05Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,67 +16,57 @@
 
 #if wxUSE_BMPBUTTON
 
+#include "wx/bitmap.h"
 #include "wx/button.h"
 
-// FIXME: right now only wxMSW, wxGTK and wxOSX implement bitmap support in wxButton
-//        itself, this shouldn't be used for the other platforms neither
-//        when all of them do it
-#if (defined(__WXMSW__) || defined(__WXGTK20__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)
-    #define wxHAS_BUTTON_BITMAP
-#endif
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxBitmapButton: a button which shows bitmaps instead of the usual string.
 // It has different bitmaps for different states (focused/disabled/pressed)
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmapButtonBase : public wxButton
+class WXDLLEXPORT wxBitmapButtonBase : public wxButton
 {
 public:
     wxBitmapButtonBase()
     {
-#ifndef wxHAS_BUTTON_BITMAP
         m_marginX =
         m_marginY = 0;
-#endif // wxHAS_BUTTON_BITMAP
     }
 
-    bool Create(wxWindow *parent,
-                wxWindowID winid,
-                const wxPoint& pos,
-                const wxSize& size,
-                long style,
-                const wxValidator& validator,
-                const wxString& name)
-    {
-        // We use wxBU_NOTEXT to let the base class Create() know that we are
-        // not going to show the label: this is a hack needed for wxGTK where
-        // we can show both label and bitmap only with GTK 2.6+ but we always
-        // can show just one of them and this style allows us to choose which
-        // one we need.
-        //
-        // And we also use wxBU_EXACTFIT to avoid being resized up to the
-        // standard button size as this doesn't make sense for bitmap buttons
-        // which are not standard anyhow and should fit their bitmap size.
-        return wxButton::Create(parent, winid, "",
-                                pos, size,
-                                style | wxBU_NOTEXT | wxBU_EXACTFIT,
-                                validator, name);
-    }
+    // set the bitmaps
+    void SetBitmapLabel(const wxBitmap& bitmap)
+        { m_bmpNormal = bitmap; OnSetBitmap(); }
+    void SetBitmapSelected(const wxBitmap& sel)
+        { m_bmpSelected = sel; OnSetBitmap(); }
+    void SetBitmapFocus(const wxBitmap& focus)
+        { m_bmpFocus = focus; OnSetBitmap(); }
+    void SetBitmapDisabled(const wxBitmap& disabled)
+        { m_bmpDisabled = disabled; OnSetBitmap(); }
+    void SetBitmapHover(const wxBitmap& hover)
+        { m_bmpHover = hover; OnSetBitmap(); }
+
+    // retrieve the bitmaps
+    const wxBitmap& GetBitmapLabel() const { return m_bmpNormal; }
+    const wxBitmap& GetBitmapSelected() const { return m_bmpSelected; }
+    const wxBitmap& GetBitmapFocus() const { return m_bmpFocus; }
+    const wxBitmap& GetBitmapDisabled() const { return m_bmpDisabled; }
+    const wxBitmap& GetBitmapHover() const { return m_bmpHover; }
+    wxBitmap& GetBitmapLabel() { return m_bmpNormal; }
+    wxBitmap& GetBitmapSelected() { return m_bmpSelected; }
+    wxBitmap& GetBitmapFocus() { return m_bmpFocus; }
+    wxBitmap& GetBitmapDisabled() { return m_bmpDisabled; }
+    wxBitmap& GetBitmapHover() { return m_bmpHover; }
 
     // set/get the margins around the button
-    virtual void SetMargins(int x, int y)
-    {
-        DoSetBitmapMargins(x, y);
-    }
-
-    int GetMarginX() const { return DoGetBitmapMargins().x; }
-    int GetMarginY() const { return DoGetBitmapMargins().y; }
+    virtual void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
+    int GetMarginX() const { return m_marginX; }
+    int GetMarginY() const { return m_marginY; }
 
     // deprecated synonym for SetBitmapLabel()
 #if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
-       SetBitmapLabel(bitmap); )
+    wxDEPRECATED( void SetLabel(const wxBitmap& bitmap) );
 
     // prevent virtual function hiding
     virtual void SetLabel(const wxString& label)
@@ -84,36 +74,31 @@ public:
 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
-#ifndef wxHAS_BUTTON_BITMAP
     // function called when any of the bitmaps changes
     virtual void OnSetBitmap() { InvalidateBestSize(); Refresh(); }
 
-    virtual wxBitmap DoGetBitmap(State which) const { return m_bitmaps[which]; }
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which)
-        { m_bitmaps[which] = bitmap; OnSetBitmap(); }
-
-    virtual wxSize DoGetBitmapMargins() const
-    {
-        return wxSize(m_marginX, m_marginY);
-    }
-
-    virtual void DoSetBitmapMargins(int x, int y)
-    {
-        m_marginX = x;
-        m_marginY = y;
-    }
-
     // the bitmaps for various states
-    wxBitmap m_bitmaps[State_Max];
+    wxBitmap m_bmpNormal,
+             m_bmpSelected,
+             m_bmpFocus,
+             m_bmpDisabled,
+             m_bmpHover;
 
     // the margins around the bitmap
     int m_marginX,
         m_marginY;
-#endif // !wxHAS_BUTTON_BITMAP
 
-    wxDECLARE_NO_COPY_CLASS(wxBitmapButtonBase);
+
+    DECLARE_NO_COPY_CLASS(wxBitmapButtonBase)
 };
 
+#if WXWIN_COMPATIBILITY_2_6
+inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
+{
+    SetBitmapLabel(bitmap);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/bmpbuttn.h"
 #elif defined(__WXMSW__)
@@ -125,7 +110,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/bmpbuttn.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/bmpbuttn.h"
+    #include "wx/mac/bmpbuttn.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/bmpbuttn.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/bookctrl.h b/Source/3rd Party/wx/include/wx/bookctrl.h
index 6042b0d91..98a95dc6e 100644
--- a/Source/3rd Party/wx/include/wx/bookctrl.h	
+++ b/Source/3rd Party/wx/include/wx/bookctrl.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: bookctrl.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -22,12 +22,11 @@
 
 #include "wx/control.h"
 #include "wx/dynarray.h"
-#include "wx/withimages.h"
 
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxWindow *, wxArrayPages);
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
-class WXDLLIMPEXP_FWD_CORE wxBookCtrlEvent;
+class WXDLLIMPEXP_FWD_CORE wxBookCtrlBaseEvent;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -55,8 +54,7 @@ enum
 // wxBookCtrlBase
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBookCtrlBase : public wxControl,
-                                        public wxWithImages
+class WXDLLEXPORT wxBookCtrlBase : public wxControl
 {
 public:
     // construction
@@ -87,6 +85,9 @@ public:
                 long style = 0,
                 const wxString& name = wxEmptyString);
 
+    // dtor
+    virtual ~wxBookCtrlBase();
+
 
     // accessors
     // ---------
@@ -95,7 +96,8 @@ public:
     virtual size_t GetPageCount() const { return m_pages.size(); }
 
     // get the panel which represents the given page
-    virtual wxWindow *GetPage(size_t n) const { return m_pages[n]; }
+    wxWindow *GetPage(size_t n) { return m_pages[n]; }
+    wxWindow *GetPage(size_t n) const { return m_pages[n]; }
 
     // get the current page or NULL if none
     wxWindow *GetCurrentPage() const
@@ -105,7 +107,7 @@ public:
     }
 
     // get the currently selected page or wxNOT_FOUND if none
-    virtual int GetSelection() const { return m_selection; }
+    virtual int GetSelection() const = 0;
 
     // set/get the title of a page
     virtual bool SetPageText(size_t n, const wxString& strText) = 0;
@@ -116,6 +118,15 @@ public:
     // images belong to the same image list)
     // ---------------------------------------------------------------------
 
+    // sets the image list to use, it is *not* deleted by the control
+    virtual void SetImageList(wxImageList *imageList);
+
+    // as SetImageList() but we will delete the image list ourselves
+    void AssignImageList(wxImageList *imageList);
+
+    // get pointer (may be NULL) to the associated image list
+    wxImageList* GetImageList() const { return m_imageList; }
+
     // sets/returns item's image index in the current image list
     virtual int GetPageImage(size_t n) const = 0;
     virtual bool SetPageImage(size_t n, int imageId) = 0;
@@ -127,14 +138,8 @@ public:
     // resize the notebook so that all pages will have the specified size
     virtual void SetPageSize(const wxSize& size);
 
-    // return the size of the area needed to accommodate the controller
-    wxSize GetControllerSize() const;
-
     // calculate the size of the control from the size of its page
-    //
-    // by default this simply returns size enough to fit both the page and the
-    // controller
-    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
+    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const = 0;
 
     // get/set size of area between book control area and page area
     unsigned int GetInternalBorder() const { return m_internalBorder; }
@@ -154,7 +159,6 @@ public:
     // returns the sizer containing the control, if any
     wxSizer* GetControlSizer() const { return m_controlSizer; }
 
-
     // operations
     // ----------
 
@@ -171,7 +175,6 @@ public:
     // remove all pages and delete them
     virtual bool DeleteAllPages()
     {
-        m_selection = wxNOT_FOUND;
         DoInvalidateBestSize();
         WX_CLEAR_ARRAY(m_pages);
         return true;
@@ -181,7 +184,7 @@ public:
     virtual bool AddPage(wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,
-                         int imageId = NO_IMAGE)
+                         int imageId = -1)
     {
         DoInvalidateBestSize();
         return InsertPage(GetPageCount(), page, text, bSelect, imageId);
@@ -192,10 +195,10 @@ public:
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
-                            int imageId = NO_IMAGE) = 0;
+                            int imageId = -1) = 0;
 
     // set the currently selected page, return the index of the previously
-    // selected one (or wxNOT_FOUND on error)
+    // selected one (or -1 on error)
     //
     // NB: this function will generate PAGE_CHANGING/ED events
     virtual int SetSelection(size_t n) = 0;
@@ -208,7 +211,7 @@ public:
     void AdvanceSelection(bool forward = true)
     {
         int nPage = GetNextPage(forward);
-        if ( nPage != wxNOT_FOUND )
+        if ( nPage != -1 )
         {
             // cast is safe because of the check above
             SetSelection((size_t)nPage);
@@ -226,11 +229,6 @@ public:
     // we do have multiple pages
     virtual bool HasMultiplePages() const { return true; }
 
-    // we don't want focus for ourselves
-    virtual bool AcceptsFocus() const { return false; }
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
 
 protected:
     // flags for DoSetSelection()
@@ -239,20 +237,6 @@ protected:
         SetSelection_SendEvent = 1
     };
 
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    // After the insertion of the page in the method InsertPage, calling this
-    // method sets the selection to the given page or the first one if there is
-    // still no selection. The "selection changed" event is sent only if
-    // bSelect is true, so when it is false, no event is sent even if the
-    // selection changed from wxNOT_FOUND to 0 when inserting the first page.
-    //
-    // Returns true if the selection was set to the specified page (explicitly
-    // because of bSelect == true or implicitly because it's the first page) or
-    // false otherwise.
-    bool DoSetSelectionAfterInsertion(size_t n, bool bSelect);
-
     // set the selection to the given page, sending the events (which can
     // possibly prevent the page change from taking place) if SendEvent flag is
     // included
@@ -268,12 +252,12 @@ protected:
         { wxFAIL_MSG(wxT("Override this function!")); }
 
     // create a new "page changing" event
-    virtual wxBookCtrlEvent* CreatePageChangingEvent() const
+    virtual wxBookCtrlBaseEvent* CreatePageChangingEvent() const
         { wxFAIL_MSG(wxT("Override this function!")); return NULL; }
 
     // modify the event created by CreatePageChangingEvent() to "page changed"
     // event, usually by just calling SetEventType() on it
-    virtual void MakeChangedEvent(wxBookCtrlEvent& WXUNUSED(event))
+    virtual void MakeChangedEvent(wxBookCtrlBaseEvent& WXUNUSED(event))
         { wxFAIL_MSG(wxT("Override this function!")); }
 
 
@@ -294,7 +278,7 @@ protected:
     int GetNextPage(bool forward) const;
 
     // Lay out controls
-    virtual void DoSize();
+    void DoSize();
 
     // This method also invalidates the size of the controller and should be
     // called instead of just InvalidateBestSize() whenever pages are added or
@@ -310,10 +294,17 @@ protected:
     // the array of all pages of this control
     wxArrayPages m_pages;
 
+    // the associated image list or NULL
+    wxImageList *m_imageList;
+
+    // true if we must delete m_imageList
+    bool m_ownsImageList;
+
     // get the page area
-    virtual wxRect GetPageRect() const;
+    wxRect GetPageRect() const;
 
     // event handlers
+    virtual wxSize GetControllerSize() const;
     void OnSize(wxSizeEvent& event);
 
     // controller buddy if available, NULL otherwise (usually for native book controls like wxNotebook)
@@ -328,11 +319,6 @@ protected:
     // the margin around the choice control
     int m_controlMargin;
 
-    // The currently selected page (in range 0..m_pages.size()-1 inclusive) or
-    // wxNOT_FOUND if none (this can normally only be the case for an empty
-    // control without any pages).
-    int m_selection;
-
 private:
 
     // common part of all ctors
@@ -342,75 +328,66 @@ private:
     unsigned int m_internalBorder;
 
     DECLARE_ABSTRACT_CLASS(wxBookCtrlBase)
-    wxDECLARE_NO_COPY_CLASS(wxBookCtrlBase);
-
+    DECLARE_NO_COPY_CLASS(wxBookCtrlBase)
     DECLARE_EVENT_TABLE()
 };
 
 // ----------------------------------------------------------------------------
-// wxBookCtrlEvent: page changing events generated by book classes
+// wxBookCtrlBaseEvent: page changing events generated by derived classes
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBookCtrlEvent : public wxNotifyEvent
+class WXDLLEXPORT wxBookCtrlBaseEvent : public wxNotifyEvent
 {
 public:
-    wxBookCtrlEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
-                        int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)
+    wxBookCtrlBaseEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
+                        int nSel = -1, int nOldSel = -1)
         : wxNotifyEvent(commandType, winid)
     {
         m_nSel = nSel;
         m_nOldSel = nOldSel;
     }
 
-    wxBookCtrlEvent(const wxBookCtrlEvent& event)
+    wxBookCtrlBaseEvent(const wxBookCtrlBaseEvent& event)
         : wxNotifyEvent(event)
     {
         m_nSel = event.m_nSel;
         m_nOldSel = event.m_nOldSel;
     }
 
-    virtual wxEvent *Clone() const { return new wxBookCtrlEvent(*this); }
-
     // accessors
-        // the currently selected page (wxNOT_FOUND if none)
+        // the currently selected page (-1 if none)
     int GetSelection() const { return m_nSel; }
     void SetSelection(int nSel) { m_nSel = nSel; }
-        // the page that was selected before the change (wxNOT_FOUND if none)
+        // the page that was selected before the change (-1 if none)
     int GetOldSelection() const { return m_nOldSel; }
     void SetOldSelection(int nOldSel) { m_nOldSel = nOldSel; }
 
 private:
     int m_nSel,     // currently selected page
         m_nOldSel;  // previously selected page
-
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxBookCtrlEvent)
 };
 
-typedef void (wxEvtHandler::*wxBookCtrlEventFunction)(wxBookCtrlEvent&);
-
-#define wxBookCtrlEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxBookCtrlEventFunction, func)
-
-// obsolete name, defined for compatibility only
-#define wxBookCtrlBaseEvent wxBookCtrlEvent
-
 // make a default book control for given platform
 #if wxUSE_NOTEBOOK
     // dedicated to majority of desktops
     #include "wx/notebook.h"
     #define wxBookCtrl                             wxNotebook
+    #define wxBookCtrlEvent                        wxNotebookEvent
     #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED    wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
     #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING   wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
     #define EVT_BOOKCTRL_PAGE_CHANGED(id, fn)      EVT_NOTEBOOK_PAGE_CHANGED(id, fn)
     #define EVT_BOOKCTRL_PAGE_CHANGING(id, fn)     EVT_NOTEBOOK_PAGE_CHANGING(id, fn)
+    #define wxBookctrlEventHandler(func)           wxNotebookEventHandler(func)
 #else
     // dedicated to Smartphones
     #include "wx/choicebk.h"
     #define wxBookCtrl                             wxChoicebook
+    #define wxBookCtrlEvent                        wxChoicebookEvent
     #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED    wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED
     #define wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING   wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
     #define EVT_BOOKCTRL_PAGE_CHANGED(id, fn)      EVT_CHOICEBOOK_PAGE_CHANGED(id, fn)
     #define EVT_BOOKCTRL_PAGE_CHANGING(id, fn)     EVT_CHOICEBOOK_PAGE_CHANGING(id, fn)
+    #define wxBookctrlEventHandler(func)           wxChoicebookEventHandler(func)
 #endif
 
 #if WXWIN_COMPATIBILITY_2_6
diff --git a/Source/3rd Party/wx/include/wx/brush.h b/Source/3rd Party/wx/include/wx/brush.h
index c39419269..cf963ab2d 100644
--- a/Source/3rd Party/wx/include/wx/brush.h	
+++ b/Source/3rd Party/wx/include/wx/brush.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: brush.h 40865 2006-08-27 09:42:42Z VS $
 // Copyright:   Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,62 +15,22 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdiobj.h"
-#include "wx/gdicmn.h"      // for wxGDIObjListBase
-
-// NOTE: these values cannot be combined together!
-enum wxBrushStyle
-{
-    wxBRUSHSTYLE_INVALID = -1,
-
-    wxBRUSHSTYLE_SOLID = wxSOLID,
-    wxBRUSHSTYLE_TRANSPARENT = wxTRANSPARENT,
-    wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE,
-    wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
-    wxBRUSHSTYLE_STIPPLE = wxSTIPPLE,
-    wxBRUSHSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL,
-    wxBRUSHSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG,
-    wxBRUSHSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL,
-    wxBRUSHSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS,
-    wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL,
-    wxBRUSHSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL,
-    wxBRUSHSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST,
-    wxBRUSHSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST
-};
-
 
 // wxBrushBase
-class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject
+class WXDLLEXPORT wxBrushBase: public wxGDIObject
 {
 public:
     virtual ~wxBrushBase() { }
 
-    virtual void SetColour(const wxColour& col) = 0;
-    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0;
-    virtual void SetStyle(wxBrushStyle style) = 0;
-    virtual void SetStipple(const wxBitmap& stipple) = 0;
-
-    virtual wxColour GetColour() const = 0;
-    virtual wxBrushStyle GetStyle() const = 0;
-    virtual wxBitmap *GetStipple() const = 0;
+    virtual int GetStyle() const = 0;
 
     virtual bool IsHatch() const
-        { return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); }
-
-    // Convenient helpers for testing whether the brush is a transparent one:
-    // unlike GetStyle() == wxBRUSHSTYLE_TRANSPARENT, they work correctly even
-    // if the brush is invalid (they both return false in this case).
-    bool IsTransparent() const
-    {
-        return IsOk() && GetStyle() == wxBRUSHSTYLE_TRANSPARENT;
-    }
-
-    bool IsNonTransparent() const
-    {
-        return IsOk() && GetStyle() != wxBRUSHSTYLE_TRANSPARENT;
-    }
+        { return (GetStyle()>=wxFIRST_HATCH) && (GetStyle()<=wxLAST_HATCH); }
 };
 
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/brush.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/brush.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
     #include "wx/x11/brush.h"
@@ -78,60 +38,17 @@ public:
     #include "wx/gtk/brush.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/brush.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/brush.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/brush.h"
+    #include "wx/mac/brush.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/brush.h"
 #elif defined(__WXPM__)
     #include "wx/os2/brush.h"
 #endif
 
-class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase
-{
-public:
-    wxBrush *FindOrCreateBrush(const wxColour& colour,
-                               wxBrushStyle style = wxBRUSHSTYLE_SOLID);
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxBrush *FindOrCreateBrush(const wxColour& colour, int style)
-        { return FindOrCreateBrush(colour, (wxBrushStyle)style); }
 #endif
-
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( void AddBrush(wxBrush*) );
-    wxDEPRECATED( void RemoveBrush(wxBrush*) );
-#endif
-};
-
-extern WXDLLIMPEXP_DATA_CORE(wxBrushList*)   wxTheBrushList;
-
-// provide comparison operators to allow code such as
-//
-//      if ( brush.GetStyle() == wxTRANSPARENT )
-//
-// to compile without warnings which it would otherwise provoke from some
-// compilers as it compares elements of different enums
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-
-// Unfortunately some compilers have ambiguity issues when enum comparisons are
-// overloaded so we have to disable the overloads in this case, see
-// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
-#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
-
-inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
-{
-    return static_cast<int>(s) == static_cast<int>(t);
-}
-
-inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
-{
-    return !(s == t);
-}
-
-#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
-
-#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
-
-#endif // _WX_BRUSH_H_BASE_
+    // _WX_BRUSH_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/buffer.h b/Source/3rd Party/wx/include/wx/buffer.h
index 43b4e01d9..f1ef1a23f 100644
--- a/Source/3rd Party/wx/include/wx/buffer.h	
+++ b/Source/3rd Party/wx/include/wx/buffer.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.04.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: buffer.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,412 +12,144 @@
 #ifndef _WX_BUFFER_H
 #define _WX_BUFFER_H
 
-#include "wx/chartype.h"
-#include "wx/wxcrtbase.h"
+#include "wx/wxchar.h"
 
 #include <stdlib.h>             // malloc() and free()
 
-class WXDLLIMPEXP_FWD_BASE wxCStrData;
-
 // ----------------------------------------------------------------------------
 // Special classes for (wide) character strings: they use malloc/free instead
 // of new/delete
 // ----------------------------------------------------------------------------
 
-// helpers used by wxCharTypeBuffer
-namespace wxPrivate
-{
-
-struct UntypedBufferData
-{
-    enum Kind
-    {
-        Owned,
-        NonOwned
-    };
-
-    UntypedBufferData(void *str, size_t len, Kind kind = Owned)
-        : m_str(str), m_length(len), m_ref(1), m_owned(kind == Owned) {}
-
-    ~UntypedBufferData()
-    {
-        if ( m_owned )
-            free(m_str);
-    }
-
-    void *m_str;
-    size_t m_length;
-
-    // "short" to have sizeof(Data)=12 on 32bit archs
-    unsigned short m_ref;
-
-    bool m_owned;
-};
-
-// NB: this is defined in string.cpp and not the (non-existent) buffer.cpp
-WXDLLIMPEXP_BASE UntypedBufferData * GetUntypedNullData();
-
-} // namespace wxPrivate
-
-
-// Reference-counted character buffer for storing string data. The buffer
-// is only valid for as long as the "parent" object that provided the data
-// is valid; see wxCharTypeBuffer<T> for persistent variant.
-template <typename T>
-class wxScopedCharTypeBuffer
-{
-public:
-    typedef T CharType;
-
-    wxScopedCharTypeBuffer()
-    {
-        m_data = GetNullData();
-    }
-
-    // Creates "non-owned" buffer, i.e. 'str' is not owned by the buffer
-    // and doesn't get freed by dtor. Used e.g. to point to wxString's internal
-    // storage.
-    static
-    const wxScopedCharTypeBuffer CreateNonOwned(const CharType *str,
-                                                size_t len = wxNO_LEN)
-    {
-        if ( len == wxNO_LEN )
-            len = wxStrlen(str);
-
-        wxScopedCharTypeBuffer buf;
-        if ( str )
-            buf.m_data = new Data(const_cast<CharType*>(str), len, Data::NonOwned);
-        return buf;
-    }
-
-    // Creates "owned" buffer, i.e. takes over ownership of 'str' and frees it
-    // in dtor (if ref.count reaches 0).
-    static
-    const wxScopedCharTypeBuffer CreateOwned(CharType *str,
-                                             size_t len = wxNO_LEN )
-    {
-        if ( len == wxNO_LEN )
-            len = wxStrlen(str);
-
-        wxScopedCharTypeBuffer buf;
-        if ( str )
-            buf.m_data = new Data(str, len);
-        return buf;
-    }
-
-    wxScopedCharTypeBuffer(const wxScopedCharTypeBuffer& src)
-    {
-        m_data = src.m_data;
-        IncRef();
-    }
-
-    wxScopedCharTypeBuffer& operator=(const wxScopedCharTypeBuffer& src)
-    {
-        if ( &src == this )
-            return *this;
-
-        DecRef();
-        m_data = src.m_data;
-        IncRef();
-
-        return *this;
-    }
-
-    ~wxScopedCharTypeBuffer()
-    {
-        DecRef();
-    }
-
-    // NB: this method is only const for backward compatibility. It used to
-    //     be needed for auto_ptr-like semantics of the copy ctor, but now
-    //     that ref-counting is used, it's not really needed.
-    CharType *release() const
-    {
-        if ( m_data == GetNullData() )
-            return NULL;
-
-        wxASSERT_MSG( m_data->m_owned, wxT("can't release non-owned buffer") );
-        wxASSERT_MSG( m_data->m_ref == 1, wxT("can't release shared buffer") );
-
-        CharType * const p = m_data->Get();
-
-        wxScopedCharTypeBuffer *self = const_cast<wxScopedCharTypeBuffer*>(this);
-        self->m_data->Set(NULL, 0);
-        self->DecRef();
-
-        return p;
-    }
-
-    void reset()
-    {
-        DecRef();
-    }
-
-    CharType *data() { return m_data->Get(); }
-    const CharType *data() const { return  m_data->Get(); }
-    operator const CharType *() const { return data(); }
-    CharType operator[](size_t n) const { return data()[n]; }
-
-    size_t length() const { return m_data->m_length; }
-
-protected:
-    // reference-counted data
-    struct Data : public wxPrivate::UntypedBufferData
-    {
-        Data(CharType *str, size_t len, Kind kind = Owned)
-            : wxPrivate::UntypedBufferData(str, len, kind)
-        {
-        }
-
-        CharType *Get() const { return static_cast<CharType *>(m_str); }
-        void Set(CharType *str, size_t len)
-        {
-            m_str = str;
-            m_length = len;
-        }
-    };
-
-    // placeholder for NULL string, to simplify this code
-    static Data *GetNullData()
-    {
-        return static_cast<Data *>(wxPrivate::GetUntypedNullData());
-    }
-
-    void IncRef()
-    {
-        if ( m_data == GetNullData() ) // exception, not ref-counted
-            return;
-        m_data->m_ref++;
-    }
-
-    void DecRef()
-    {
-        if ( m_data == GetNullData() ) // exception, not ref-counted
-            return;
-        if ( --m_data->m_ref == 0 )
-            delete m_data;
-        m_data = GetNullData();
-    }
-
-    // sets this object to a be copy of 'other'; if 'src' is non-owned,
-    // a deep copy is made and 'this' will contain new instance of the data
-    void MakeOwnedCopyOf(const wxScopedCharTypeBuffer& src)
-    {
-        this->DecRef();
-
-        if ( src.m_data == this->GetNullData() )
-        {
-            this->m_data = this->GetNullData();
-        }
-        else if ( src.m_data->m_owned )
-        {
-            this->m_data = src.m_data;
-            this->IncRef();
-        }
-        else
-        {
-            // if the scoped buffer had non-owned data, we have to make
-            // a copy here, because src.m_data->m_str is valid only for as long
-            // as 'src' exists
-            this->m_data = new Data
-                               (
-                                   StrCopy(src.data(), src.length()),
-                                   src.length()
-                               );
-        }
-    }
-
-    static CharType *StrCopy(const CharType *src, size_t len)
-    {
-        CharType *dst = (CharType*)malloc(sizeof(CharType) * (len + 1));
-        memcpy(dst, src, sizeof(CharType) * (len + 1));
-        return dst;
-    }
-
-protected:
-    Data *m_data;
-};
-
-typedef wxScopedCharTypeBuffer<char> wxScopedCharBuffer;
-typedef wxScopedCharTypeBuffer<wchar_t> wxScopedWCharBuffer;
-
-
-// this buffer class always stores data in "owned" (persistent) manner
-template <typename T>
-class wxCharTypeBuffer : public wxScopedCharTypeBuffer<T>
-{
-protected:
-    typedef typename wxScopedCharTypeBuffer<T>::Data Data;
-
-public:
-    typedef T CharType;
-
-    wxCharTypeBuffer(const CharType *str = NULL, size_t len = wxNO_LEN)
-    {
-        if ( str )
-        {
-            if ( len == wxNO_LEN )
-                len = wxStrlen(str);
-            this->m_data = new Data(this->StrCopy(str, len), len);
-        }
-        else
-        {
-            this->m_data = this->GetNullData();
-        }
-    }
-
-    wxCharTypeBuffer(size_t len)
-    {
-        this->m_data =
-            new Data((CharType *)malloc((len + 1)*sizeof(CharType)), len);
-        this->m_data->Get()[len] = (CharType)0;
-    }
-
-    wxCharTypeBuffer(const wxCharTypeBuffer& src)
-        : wxScopedCharTypeBuffer<T>(src) {}
-
-    wxCharTypeBuffer& operator=(const CharType *str)
-    {
-        this->DecRef();
-
-        if ( str )
-            this->m_data = new Data(wxStrdup(str), wxStrlen(str));
-        return *this;
-    }
-
-    wxCharTypeBuffer& operator=(const wxCharTypeBuffer& src)
-    {
-        wxScopedCharTypeBuffer<T>::operator=(src);
-        return *this;
-    }
-
-    wxCharTypeBuffer(const wxScopedCharTypeBuffer<T>& src)
-    {
-        this->MakeOwnedCopyOf(src);
-    }
-
-    wxCharTypeBuffer& operator=(const wxScopedCharTypeBuffer<T>& src)
-    {
-        MakeOwnedCopyOf(src);
-        return *this;
-    }
-
-    bool extend(size_t len)
-    {
-        wxASSERT_MSG( this->m_data->m_owned, "cannot extend non-owned buffer" );
-        wxASSERT_MSG( this->m_data->m_ref == 1, "can't extend shared buffer" );
-
-        CharType *str =
-            (CharType *)realloc(this->data(), (len + 1) * sizeof(CharType));
-        if ( !str )
-            return false;
-
-        // For consistency with the ctor taking just the length, NUL-terminate
-        // the buffer.
-        str[len] = (CharType)0;
-
-        if ( this->m_data == this->GetNullData() )
-        {
-            this->m_data = new Data(str, len);
-        }
-        else
-        {
-            this->m_data->Set(str, len);
-            this->m_data->m_owned = true;
-        }
-
-        return true;
-    }
-
-    void shrink(size_t len)
-    {
-        wxASSERT_MSG( this->m_data->m_owned, "cannot shrink non-owned buffer" );
-        wxASSERT_MSG( this->m_data->m_ref == 1, "can't shrink shared buffer" );
-
-        wxASSERT( len <= this->length() );
-
-        this->m_data->m_length = len;
-        this->data()[len] = 0;
-    }
-};
-
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer<char> )
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<char> )
-
-class wxCharBuffer : public wxCharTypeBuffer<char>
-{
-public:
-    typedef wxCharTypeBuffer<char> wxCharTypeBufferBase;
-    typedef wxScopedCharTypeBuffer<char> wxScopedCharTypeBufferBase;
-
-    wxCharBuffer(const wxCharTypeBufferBase& buf)
-        : wxCharTypeBufferBase(buf) {}
-    wxCharBuffer(const wxScopedCharTypeBufferBase& buf)
-        : wxCharTypeBufferBase(buf) {}
-
-    wxCharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {}
-    wxCharBuffer(size_t len) : wxCharTypeBufferBase(len) {}
-
-    wxCharBuffer(const wxCStrData& cstr);
-};
-
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxScopedCharTypeBuffer<wchar_t> )
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxCharTypeBuffer<wchar_t> )
-
-class wxWCharBuffer : public wxCharTypeBuffer<wchar_t>
-{
-public:
-    typedef wxCharTypeBuffer<wchar_t> wxCharTypeBufferBase;
-    typedef wxScopedCharTypeBuffer<wchar_t> wxScopedCharTypeBufferBase;
-
-    wxWCharBuffer(const wxCharTypeBufferBase& buf)
-        : wxCharTypeBufferBase(buf) {}
-    wxWCharBuffer(const wxScopedCharTypeBufferBase& buf)
-        : wxCharTypeBufferBase(buf) {}
-
-    wxWCharBuffer(const CharType *str = NULL) : wxCharTypeBufferBase(str) {}
-    wxWCharBuffer(size_t len) : wxCharTypeBufferBase(len) {}
-
-    wxWCharBuffer(const wxCStrData& cstr);
-};
-
-// wxCharTypeBuffer<T> implicitly convertible to T*
-template <typename T>
-class wxWritableCharTypeBuffer : public wxCharTypeBuffer<T>
-{
-public:
-    typedef typename wxScopedCharTypeBuffer<T>::CharType CharType;
-
-    wxWritableCharTypeBuffer(const wxScopedCharTypeBuffer<T>& src)
-        : wxCharTypeBuffer<T>(src) {}
-    // FIXME-UTF8: this won't be needed after converting mb_str()/wc_str() to
-    //             always return a buffer
-    //             + we should derive this class from wxScopedCharTypeBuffer
-    //               then
-    wxWritableCharTypeBuffer(const CharType *str = NULL)
-        : wxCharTypeBuffer<T>(str) {}
-
-    operator CharType*() { return this->data(); }
-};
-
-typedef wxWritableCharTypeBuffer<char> wxWritableCharBuffer;
-typedef wxWritableCharTypeBuffer<wchar_t> wxWritableWCharBuffer;
-
+#define DEFINE_BUFFER(classname, chartype, strdupfunc)                      \
+class WXDLLIMPEXP_BASE classname                                            \
+{                                                                           \
+public:                                                                     \
+    classname(const chartype *str = NULL)                                   \
+        : m_str(str ? strdupfunc(str) : NULL)                               \
+    {                                                                       \
+    }                                                                       \
+                                                                            \
+    classname(size_t len)                                                   \
+        : m_str((chartype *)malloc((len + 1)*sizeof(chartype)))             \
+    {                                                                       \
+        m_str[len] = (chartype)0;                                           \
+    }                                                                       \
+                                                                            \
+    /* no need to check for NULL, free() does it */                         \
+    ~classname() { free(m_str); }                                           \
+                                                                            \
+    /*                                                                      \
+        WARNING:                                                            \
+                                                                            \
+        the copy ctor and assignment operators change the passed in object  \
+        even although it is declared as "const", so:                        \
+                                                                            \
+        a) it shouldn't be really const                                     \
+        b) you shouldn't use it afterwards (or know that it was reset)      \
+                                                                            \
+        This is very ugly but is unfortunately needed to make the normal use\
+        of classname buffer objects possible and is very similar to what    \
+        std::auto_ptr<> does (as if it were an excuse...)                   \
+    */                                                                      \
+                                                                            \
+    /*                                                                      \
+       because of the remark above, release() is declared const even if it  \
+       isn't really const                                                   \
+     */                                                                     \
+    chartype *release() const                                               \
+    {                                                                       \
+        chartype *p = m_str;                                                \
+        ((classname *)this)->m_str = NULL;                                  \
+        return p;                                                           \
+    }                                                                       \
+                                                                            \
+    void reset()                                                            \
+    {                                                                       \
+        free(m_str);                                                        \
+        m_str = NULL;                                                       \
+    }                                                                       \
+                                                                            \
+    classname(const classname& src)                                         \
+        : m_str(src.release())                                              \
+    {                                                                       \
+    }                                                                       \
+                                                                            \
+    classname& operator=(const chartype *str)                               \
+    {                                                                       \
+        free(m_str);                                                        \
+        m_str = str ? strdupfunc(str) : NULL;                               \
+        return *this;                                                       \
+    }                                                                       \
+                                                                            \
+    classname& operator=(const classname& src)                              \
+    {                                                                       \
+        free(m_str);                                                        \
+        m_str = src.release();                                              \
+                                                                            \
+        return *this;                                                       \
+    }                                                                       \
+                                                                            \
+    bool extend(size_t len)                                                 \
+    {                                                                       \
+        chartype *                                                          \
+            str = (chartype *)realloc(m_str, (len + 1)*sizeof(chartype));   \
+        if ( !str )                                                         \
+            return false;                                                   \
+                                                                            \
+        m_str = str;                                                        \
+                                                                            \
+        return true;                                                        \
+    }                                                                       \
+                                                                            \
+    chartype *data() { return m_str; }                                      \
+    const chartype *data() const { return m_str; }                          \
+    operator const chartype *() const { return m_str; }                     \
+    chartype operator[](size_t n) const { return m_str[n]; }                \
+                                                                            \
+private:                                                                    \
+    chartype *m_str;                                                        \
+}
+
+#if wxABI_VERSION >= 20804
+// needed for wxString::char_str() and wchar_str()
+#define DEFINE_WRITABLE_BUFFER(classname, baseclass, chartype)              \
+class WXDLLIMPEXP_BASE classname : public baseclass                         \
+{                                                                           \
+public:                                                                     \
+    classname(const baseclass& src) : baseclass(src) {}                     \
+    classname(const chartype *str = NULL) : baseclass(str) {}               \
+                                                                            \
+    operator chartype*() { return this->data(); }                           \
+}
+#endif // wxABI_VERSION >= 20804
+
+DEFINE_BUFFER(wxCharBuffer, char, wxStrdupA);
+#if wxABI_VERSION >= 20804
+DEFINE_WRITABLE_BUFFER(wxWritableCharBuffer, wxCharBuffer, char);
+#endif
+
+#if wxUSE_WCHAR_T
+
+DEFINE_BUFFER(wxWCharBuffer, wchar_t, wxStrdupW);
+#if wxABI_VERSION >= 20804
+DEFINE_WRITABLE_BUFFER(wxWritableWCharBuffer, wxWCharBuffer, wchar_t);
+#endif
+
+#endif // wxUSE_WCHAR_T
+
+#undef DEFINE_BUFFER
+#undef DEFINE_WRITABLE_BUFFER
 
 #if wxUSE_UNICODE
-    #define wxWxCharBuffer wxWCharBuffer
+    typedef wxWCharBuffer wxWxCharBuffer;
 
     #define wxMB2WXbuf wxWCharBuffer
     #define wxWX2MBbuf wxCharBuffer
-    #if wxUSE_UNICODE_WCHAR
-        #define wxWC2WXbuf wxChar*
-        #define wxWX2WCbuf wxChar*
-    #elif wxUSE_UNICODE_UTF8
-        #define wxWC2WXbuf wxWCharBuffer
-        #define wxWX2WCbuf wxWCharBuffer
-    #endif
+    #define wxWC2WXbuf wxChar*
+    #define wxWX2WCbuf wxChar*
 #else // ANSI
-    #define wxWxCharBuffer wxCharBuffer
+    typedef wxCharBuffer wxWxCharBuffer;
 
     #define wxMB2WXbuf wxChar*
     #define wxWX2MBbuf wxChar*
@@ -470,21 +202,6 @@ private:
             delete this;
     }
 
-    void *release()
-    {
-        if ( m_data == NULL )
-            return NULL;
-
-        wxASSERT_MSG( m_ref == 1, "can't release shared buffer" );
-
-        void *p = m_data;
-        m_data = NULL;
-        m_len =
-        m_size = 0;
-
-        return p;
-    }
-
 
     // the buffer containing the data
     void  *m_data;
@@ -498,7 +215,7 @@ private:
     // the reference count
     size_t m_ref;
 
-    wxDECLARE_NO_COPY_CLASS(wxMemoryBufferData);
+    DECLARE_NO_COPY_CLASS(wxMemoryBufferData)
 };
 
 
@@ -524,12 +241,9 @@ public:
 
     wxMemoryBuffer& operator=(const wxMemoryBuffer& src)
     {
-        if (&src != this)
-        {
-            m_bufdata->DecRef();
-            m_bufdata = src.m_bufdata;
-            m_bufdata->IncRef();
-        }
+        m_bufdata->DecRef();
+        m_bufdata = src.m_bufdata;
+        m_bufdata->IncRef();
         return *this;
     }
 
@@ -539,8 +253,6 @@ public:
     size_t GetBufSize() const { return m_bufdata->m_size; }
     size_t GetDataLen() const { return m_bufdata->m_len; }
 
-    bool IsEmpty() const { return GetDataLen() == 0; }
-
     void   SetBufSize(size_t size) { m_bufdata->ResizeIfNeeded(size); }
     void   SetDataLen(size_t len)
     {
@@ -548,8 +260,6 @@ public:
         m_bufdata->m_len = len;
     }
 
-    void Clear() { SetDataLen(0); }
-
     // Ensure the buffer is big enough and return a pointer to it
     void *GetWriteBuf(size_t sizeNeeded)
     {
@@ -591,13 +301,6 @@ public:
 
     operator const char *() const { return (const char*)GetData(); }
 
-    // gives up ownership of data, returns the pointer; after this call,
-    // data isn't freed by the buffer and its content is resent to empty
-    void *release()
-    {
-        return m_bufdata->release();
-    }
-
 private:
     wxMemoryBufferData*  m_bufdata;
 };
diff --git a/Source/3rd Party/wx/include/wx/build.h b/Source/3rd Party/wx/include/wx/build.h
index 8c4df90d8..f6f5b0e22 100644
--- a/Source/3rd Party/wx/include/wx/build.h	
+++ b/Source/3rd Party/wx/include/wx/build.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin, Vaclav Slavik
 // Modified by:
 // Created:     07.05.02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: build.h 35858 2005-10-09 15:48:42Z MBN $
 // Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -15,7 +15,7 @@
 #include "wx/version.h"
 
 // NB: This file contains macros for checking binary compatibility of libraries
-//     in multilib builds, plugins and user components.
+//     in multilib buildm, plugins and user components.
 //     The WX_BUILD_OPTIONS_SIGNATURE macro expands into string that should
 //     uniquely identify binary compatible builds: i.e. if two builds of the
 //     library are binary compatible, their signature string should be the
@@ -42,10 +42,14 @@
         __WX_BO_STRINGIZE(x) "." __WX_BO_STRINGIZE(y) "." __WX_BO_STRINGIZE(z)
 #endif
 
-#if wxUSE_UNICODE_UTF8
-    #define __WX_BO_UNICODE "UTF-8"
-#elif wxUSE_UNICODE_WCHAR
-    #define __WX_BO_UNICODE "wchar_t"
+#ifdef __WXDEBUG__
+    #define __WX_BO_DEBUG "debug"
+#else
+    #define __WX_BO_DEBUG "no debug"
+#endif
+
+#if wxUSE_UNICODE
+    #define __WX_BO_UNICODE "Unicode"
 #else
     #define __WX_BO_UNICODE "ANSI"
 #endif
@@ -61,7 +65,7 @@
     #define __WX_BO_COMPILER ",GCC " \
             __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)
 #elif defined(__VISUALC__)
-    #define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER)
+    #define __WX_BO_COMPILER ",Visual C++"
 #elif defined(__BORLANDC__)
     #define __WX_BO_COMPILER ",Borland C++"
 #elif defined(__DIGITALMARS__)
@@ -73,19 +77,19 @@
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions
+#if WXWIN_COMPATIBILITY_2_4
+    #define __WX_BO_WXWIN_COMPAT_2_4 ",compatible with 2.4"
+#else
+    #define __WX_BO_WXWIN_COMPAT_2_4
+#endif
 #if WXWIN_COMPATIBILITY_2_6
     #define __WX_BO_WXWIN_COMPAT_2_6 ",compatible with 2.6"
 #else
     #define __WX_BO_WXWIN_COMPAT_2_6
 #endif
-#if WXWIN_COMPATIBILITY_2_8
-    #define __WX_BO_WXWIN_COMPAT_2_8 ",compatible with 2.8"
-#else
-    #define __WX_BO_WXWIN_COMPAT_2_8
-#endif
 
 // deriving wxWin containers from STL ones changes them completely:
-#if wxUSE_STD_CONTAINERS
+#if wxUSE_STL
     #define __WX_BO_STL ",STL containers"
 #else
     #define __WX_BO_STL ",wx containers"
@@ -94,10 +98,10 @@
 // This macro is passed as argument to wxConsoleApp::CheckBuildOptions()
 #define WX_BUILD_OPTIONS_SIGNATURE \
     __WX_BO_VERSION(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) \
-    " (" __WX_BO_UNICODE \
+    " (" __WX_BO_DEBUG "," __WX_BO_UNICODE \
      __WX_BO_COMPILER \
      __WX_BO_STL \
-     __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \
+     __WX_BO_WXWIN_COMPAT_2_4 __WX_BO_WXWIN_COMPAT_2_6 \
      ")"
 
 
@@ -106,7 +110,7 @@
 // ----------------------------------------------------------------------------
 
 // Use this macro to check build options. Adding it to a file in DLL will
-// ensure that the DLL checks build options in same way wxIMPLEMENT_APP() does.
+// ensure that the DLL checks build options in same way IMPLEMENT_APP() does.
 #define WX_CHECK_BUILD_OPTIONS(libName)                                 \
     static struct wxBuildOptionsChecker                                 \
     {                                                                   \
@@ -118,4 +122,28 @@
     } gs_buildOptionsCheck;
 
 
+#if WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// wxBuildOptions
+// ----------------------------------------------------------------------------
+
+// NB: Don't use this class in new code, it relies on the ctor being always
+//     inlined. WX_BUILD_OPTIONS_SIGNATURE always works.
+class wxBuildOptions
+{
+public:
+    // the ctor must be inline to get the compilation settings of the code
+    // which included this header
+    wxBuildOptions() : m_signature(WX_BUILD_OPTIONS_SIGNATURE) {}
+
+private:
+    const char *m_signature;
+
+    // actually only CheckBuildOptions() should be our friend but well...
+    friend class wxAppConsole;
+};
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
 #endif // _WX_BUILD_H_
diff --git a/Source/3rd Party/wx/include/wx/busyinfo.h b/Source/3rd Party/wx/include/wx/busyinfo.h
index 47526c9b7..d13d3b68c 100644
--- a/Source/3rd Party/wx/include/wx/busyinfo.h	
+++ b/Source/3rd Party/wx/include/wx/busyinfo.h	
@@ -3,7 +3,7 @@
 // Purpose:     Information window (when app is busy)
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: busyinfo.h 37158 2006-01-26 15:40:46Z ABX $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/Source/3rd Party/wx/include/wx/button.h b/Source/3rd Party/wx/include/wx/button.h
index a938db1dc..4ca2305ae 100644
--- a/Source/3rd Party/wx/include/wx/button.h	
+++ b/Source/3rd Party/wx/include/wx/button.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zetlin
 // Modified by:
 // Created:     15.08.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: button.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Vadim Zetlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,37 +14,70 @@
 
 #include "wx/defs.h"
 
+// ----------------------------------------------------------------------------
+// wxButton flags shared with other classes
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOGGLEBTN || wxUSE_BUTTON
+
+// These flags affect label alignment
+#define wxBU_LEFT            0x0040
+#define wxBU_TOP             0x0080
+#define wxBU_RIGHT           0x0100
+#define wxBU_BOTTOM          0x0200
+#define wxBU_ALIGN_MASK      ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
+#endif
+
 #if wxUSE_BUTTON
 
-#include "wx/anybutton.h"
+// ----------------------------------------------------------------------------
+// wxButton specific flags
+// ----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
+// These two flags are obsolete
+#define wxBU_NOAUTODRAW      0x0000
+#define wxBU_AUTODRAW        0x0004
+
+// by default, the buttons will be created with some (system dependent)
+// minimal size to make them look nicer, giving this style will make them as
+// small as possible
+#define wxBU_EXACTFIT        0x0001
+
+#include "wx/control.h"
+
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxButtonBase : public wxAnyButton
+class WXDLLEXPORT wxButtonBase : public wxControl
 {
 public:
     wxButtonBase() { }
 
-    // show the authentication needed symbol on the button: this is currently
-    // only implemented on Windows Vista and newer (on which it shows the UAC
-    // shield symbol)
-    void SetAuthNeeded(bool show = true) { DoSetAuthNeeded(show); }
-    bool GetAuthNeeded() const { return DoGetAuthNeeded(); }
+    // show the image in the button in addition to the label
+    virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { }
 
-    // make this button the default button in its top level window
-    //
-    // returns the old default item (possibly NULL)
-    virtual wxWindow *SetDefault();
+    // set the margins around the image
+    virtual void SetImageMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { }
+
+    // this wxButton method is called when the button becomes the default one
+    // on its panel
+    virtual void SetDefault() { }
+
+    // Buttons on MSW can look bad if they are not native colours, because
+    // then they become owner-drawn and not theme-drawn.  Disable it here
+    // in wxButtonBase to make it consistent.
+    virtual bool ShouldInheritColours() const { return false; }
 
     // returns the default button size for this platform
     static wxSize GetDefaultSize();
 
 protected:
-    wxDECLARE_NO_COPY_CLASS(wxButtonBase);
+    DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -58,13 +91,16 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/button.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/button.h"
+    #include "wx/mac/button.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)
     #include "wx/os2/button.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/button.h"
 #endif
 
 #endif // wxUSE_BUTTON
 
-#endif // _WX_BUTTON_H_BASE_
+#endif
+    // _WX_BUTTON_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/cairo.h b/Source/3rd Party/wx/include/wx/cairo.h
deleted file mode 100644
index 99df37033..000000000
--- a/Source/3rd Party/wx/include/wx/cairo.h	
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cairo.h
-// Purpose:     Cairo library
-// Author:      Anthony Bretaudeau
-// Created:     2007-08-25
-// RCS-ID:      $Id$
-// Copyright:   (c) Anthony Bretaudeau
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CAIRO_H_BASE_
-#define _WX_CAIRO_H_BASE_
-
-#if wxUSE_CAIRO
-
-#include "wx/dynlib.h"
-#include <cairo.h>
-
-extern "C"
-{
-    
-bool wxCairoInit();
-void wxCairoCleanUp();
-
-}
-
-#endif // wxUSE_CAIRO
-
-#endif // _WX_CAIRO_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/caret.h b/Source/3rd Party/wx/include/wx/caret.h
index 86df48dbb..848fdcf73 100644
--- a/Source/3rd Party/wx/include/wx/caret.h	
+++ b/Source/3rd Party/wx/include/wx/caret.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: caret.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 // appear. It can be either a solid block or a custom bitmap (TODO)
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxCaretBase
+class WXDLLEXPORT wxCaretBase
 {
 public:
     // ctors
@@ -147,7 +147,7 @@ public:
     virtual void OnKillFocus() { }
 
 protected:
-    // these functions may be overridden in the derived classes, but they
+    // these functions may be overriden in the derived classes, but they
     // should call the base class version first
     virtual bool DoCreate(wxWindowBase *window, int width, int height)
     {
@@ -167,7 +167,7 @@ protected:
     // the common initialization
     void Init()
     {
-        m_window = NULL;
+        m_window = (wxWindowBase *)NULL;
         m_x = m_y = 0;
         m_width = m_height = 0;
         m_countVisible = 0;
@@ -186,7 +186,7 @@ protected:
     int m_countVisible;
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxCaretBase);
+    DECLARE_NO_COPY_CLASS(wxCaretBase)
 };
 
 // ---------------------------------------------------------------------------
@@ -208,17 +208,17 @@ private:
 #ifdef wxHAS_CARET_USING_OVERLAYS
 
 // we don't need to hide the caret if it's rendered using overlays
-class WXDLLIMPEXP_CORE wxCaretSuspend
+class WXDLLEXPORT wxCaretSuspend
 {
 public:
     wxCaretSuspend(wxWindow *WXUNUSED(win)) {}
 
-    wxDECLARE_NO_COPY_CLASS(wxCaretSuspend);
+    DECLARE_NO_COPY_CLASS(wxCaretSuspend)
 };
 
 #else // !wxHAS_CARET_USING_OVERLAYS
 
-class WXDLLIMPEXP_CORE wxCaretSuspend
+class WXDLLEXPORT wxCaretSuspend
 {
 public:
     wxCaretSuspend(wxWindow *win)
@@ -242,7 +242,7 @@ private:
     wxCaret *m_caret;
     bool     m_show;
 
-    wxDECLARE_NO_COPY_CLASS(wxCaretSuspend);
+    DECLARE_NO_COPY_CLASS(wxCaretSuspend)
 };
 
 #endif // wxHAS_CARET_USING_OVERLAYS/!wxHAS_CARET_USING_OVERLAYS
diff --git a/Source/3rd Party/wx/include/wx/chartype.h b/Source/3rd Party/wx/include/wx/chartype.h
deleted file mode 100644
index 672a0b9a5..000000000
--- a/Source/3rd Party/wx/include/wx/chartype.h	
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
- * Name:        wx/chartype.h
- * Purpose:     Declarations of wxChar and related types
- * Author:      Joel Farley, Ove Kåven
- * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
- * Created:     1998/06/12
- * RCS-ID:      $Id$
- * Copyright:   (c) 1998-2006 wxWidgets dev team
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-
-#ifndef _WX_WXCHARTYPE_H_
-#define _WX_WXCHARTYPE_H_
-
-/* defs.h indirectly includes this file, so don't include it here */
-#include "wx/platform.h"
-
-/* check whether we have wchar_t and which size it is if we do */
-#if !defined(wxUSE_WCHAR_T)
-    #if defined(__UNIX__)
-        #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__)
-            #define wxUSE_WCHAR_T 1
-        #else
-            #define wxUSE_WCHAR_T 0
-        #endif
-    #elif defined(__GNUWIN32__) && !defined(__MINGW32__)
-        #define wxUSE_WCHAR_T 0
-    #elif defined(__WATCOMC__)
-        #define wxUSE_WCHAR_T 0
-    #elif defined(__VISAGECPP__) && (__IBMCPP__ < 400)
-        #define wxUSE_WCHAR_T 0
-    #else
-        /* add additional compiler checks if this fails */
-        #define wxUSE_WCHAR_T 1
-    #endif
-#endif /* !defined(wxUSE_WCHAR_T) */
-
-/* Unicode support requires wchar_t */
-#if !wxUSE_WCHAR_T
-    #error "wchar_t must be available"
-#endif /* Unicode */
-
-/*
-   non Unix compilers which do have wchar.h (but not tchar.h which is included
-   below and which includes wchar.h anyhow).
-
-   Actually MinGW has tchar.h, but it does not include wchar.h
- */
-#if defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
-    #ifndef HAVE_WCHAR_H
-        #define HAVE_WCHAR_H
-    #endif
-#endif
-
-#ifdef HAVE_WCHAR_H
-    /* the current (as of Nov 2002) version of cygwin has a bug in its */
-    /* wchar.h -- there is no extern "C" around the declarations in it */
-    /* and this results in linking errors later; also, at least on some */
-    /* Cygwin versions, wchar.h requires sys/types.h */
-    #ifdef __CYGWIN__
-        #include <sys/types.h>
-        #ifdef __cplusplus
-            extern "C" {
-        #endif
-    #endif /* Cygwin */
-
-    #include <wchar.h>
-
-    #if defined(__CYGWIN__) && defined(__cplusplus)
-        }
-    #endif /* Cygwin and C++ */
-
-#elif defined(HAVE_WCSTR_H)
-    /* old compilers have relevant declarations here */
-    #include <wcstr.h>
-#elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
-    /* include stdlib.h for wchar_t */
-    #include <stdlib.h>
-#endif /* HAVE_WCHAR_H */
-
-#ifdef HAVE_WIDEC_H
-    #include <widec.h>
-#endif
-
-/* -------------------------------------------------------------------------- */
-/* define wxHAVE_TCHAR_SUPPORT for the compilers which support the TCHAR type */
-/* mapped to either char or wchar_t depending on the ASCII/Unicode mode and   */
-/* have the function mapping _tfoo() -> foo() or wfoo()                       */
-/* -------------------------------------------------------------------------- */
-
-/* VC++ and BC++ starting with 5.2 have TCHAR support */
-#ifdef __VISUALC__
-    #define wxHAVE_TCHAR_SUPPORT
-#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
-    #define wxHAVE_TCHAR_SUPPORT
-    #include <ctype.h>
-#elif defined(__WATCOMC__)
-    #define wxHAVE_TCHAR_SUPPORT
-#elif defined(__DMC__)
-    #define wxHAVE_TCHAR_SUPPORT
-#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
-    #define wxHAVE_TCHAR_SUPPORT
-    #include <stddef.h>
-    #include <string.h>
-    #include <ctype.h>
-#elif 0 && defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
-    /* VZ: the old VisualAge definitions were completely wrong and had no    */
-    /*     chance at all to work in Unicode build anyhow so let's pretend    */
-    /*     that VisualAge does _not_ support TCHAR for the moment (as        */
-    /*     indicated by "0 &&" above) until someone really has time to delve */
-    /*     into Unicode issues under OS/2 */
-
-    /* VisualAge 4.0+ supports TCHAR */
-    #define wxHAVE_TCHAR_SUPPORT
-#endif /* compilers with (good) TCHAR support */
-
-#ifdef wxHAVE_TCHAR_SUPPORT
-    /* get TCHAR definition if we've got it */
-    #include <tchar.h>
-
-    /* we surely do have wchar_t if we have TCHAR */
-    #ifndef wxUSE_WCHAR_T
-        #define wxUSE_WCHAR_T 1
-    #endif /* !defined(wxUSE_WCHAR_T) */
-#endif /* wxHAVE_TCHAR_SUPPORT */
-
-/* ------------------------------------------------------------------------- */
-/* define wxChar type                                                        */
-/* ------------------------------------------------------------------------- */
-
-/* TODO: define wxCharInt to be equal to either int or wint_t? */
-
-#if !wxUSE_UNICODE
-    typedef char wxChar;
-    typedef signed char wxSChar;
-    typedef unsigned char wxUChar;
-#else
-    /* VZ: note that VC++ defines _T[SU]CHAR simply as wchar_t and not as    */
-    /*     signed/unsigned version of it which (a) makes sense to me (unlike */
-    /*     char wchar_t is always unsigned) and (b) was how the previous     */
-    /*     definitions worked so keep it like this                           */
-
-    /* Sun's SunPro compiler supports the wchar_t type and wide character    */
-    /* functions, but does not define __WCHAR_TYPE__. Define it here to      */
-    /* allow unicode enabled builds.                                         */
-    #if (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && !defined(__WCHAR_TYPE__)
-        #define __WCHAR_TYPE__ wxchar_t
-    #endif
-
-    /* GNU libc has __WCHAR_TYPE__ which requires special treatment, see */
-    /* comment below */
-    #if !defined(__WCHAR_TYPE__) || \
-        (!defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 96))
-        /* standard case */
-        typedef wchar_t wxChar;
-        typedef wchar_t wxSChar;
-        typedef wchar_t wxUChar;
-    #else /* __WCHAR_TYPE__ and gcc < 2.96 */
-        /* VS: wxWidgets used to define wxChar as __WCHAR_TYPE__ here.       */
-        /*     However, this doesn't work with new GCC 3.x compilers because */
-        /*     wchar_t is C++'s builtin type in the new standard. OTOH, old  */
-        /*     compilers (GCC 2.x) won't accept new definition of            */
-        /*     wx{S,U}CharType, so we have to define wxChar                  */
-        /*     conditionally depending on detected compiler & compiler       */
-        /*     version.                                                      */
-
-        /*     with old definition of wxChar. */
-        #define wchar_t __WCHAR_TYPE__
-        typedef __WCHAR_TYPE__ wxChar;
-        typedef __WCHAR_TYPE__ wxSChar;
-        typedef __WCHAR_TYPE__ wxUChar;
-    #endif /* __WCHAR_TYPE__ */
-#endif /* ASCII/Unicode */
-
-/* ------------------------------------------------------------------------- */
-/* define wxStringCharType                                                   */
-/* ------------------------------------------------------------------------- */
-
-/* depending on the platform, Unicode build can either store wxStrings as
-   wchar_t* or UTF-8 encoded char*: */
-#if wxUSE_UNICODE
-    /* FIXME-UTF8: what would be better place for this? */
-    #if defined(wxUSE_UTF8_LOCALE_ONLY) && !defined(wxUSE_UNICODE_UTF8)
-        #error "wxUSE_UTF8_LOCALE_ONLY only makes sense with wxUSE_UNICODE_UTF8"
-    #endif
-    #ifndef wxUSE_UTF8_LOCALE_ONLY
-        #define wxUSE_UTF8_LOCALE_ONLY 0
-    #endif
-
-    #ifndef wxUSE_UNICODE_UTF8
-        #define wxUSE_UNICODE_UTF8 0
-    #endif
-
-    #if wxUSE_UNICODE_UTF8
-        #define wxUSE_UNICODE_WCHAR 0
-    #else
-        #define wxUSE_UNICODE_WCHAR 1
-    #endif
-#else
-    #define wxUSE_UNICODE_WCHAR 0
-    #define wxUSE_UNICODE_UTF8  0
-    #define wxUSE_UTF8_LOCALE_ONLY 0
-#endif
-
-/* define char type used by wxString internal representation: */
-#if wxUSE_UNICODE_WCHAR
-    typedef wchar_t wxStringCharType;
-#else /* wxUSE_UNICODE_UTF8 || ANSI */
-    typedef char wxStringCharType;
-#endif
-
-
-/* ------------------------------------------------------------------------- */
-/* define wxT() and related macros                                           */
-/* ------------------------------------------------------------------------- */
-
-/* BSD systems define _T() to be something different in ctype.h, override it */
-#if defined(__FreeBSD__) || defined(__DARWIN__)
-    #include <ctype.h>
-    #undef _T
-#endif
-
-/*
-   wxT ("wx text") macro turns a literal string constant into a wide char
-   constant. It is mostly unnecessary with wx 2.9 but defined for
-   compatibility.
- */
-#ifndef wxT
-    #if !wxUSE_UNICODE
-        #define wxT(x) x
-    #else /* Unicode */
-        /*
-            Notice that we use an intermediate macro to allow x to be expanded
-            if it's a macro itself.
-         */
-        #ifndef wxCOMPILER_BROKEN_CONCAT_OPER
-            #define wxT(x) wxCONCAT_HELPER(L, x)
-        #else
-            #define wxT(x) wxPREPEND_L(x)
-        #endif
-    #endif /* ASCII/Unicode */
-#endif /* !defined(wxT) */
-
-/*
-    wxT_2 exists only for compatibility with wx 2.x and is the same as wxT() in
-    that version but nothing in the newer ones.
- */
-#define wxT_2(x) x
-
-/*
-   wxS ("wx string") macro can be used to create literals using the same
-   representation as wxString does internally, i.e. wchar_t in Unicode build
-   under Windows or char in UTF-8-based Unicode builds and (deprecated) ANSI
-   builds everywhere (see wxStringCharType definition above).
- */
-#if wxUSE_UNICODE_WCHAR
-    /*
-        As above with wxT(), wxS() argument is expanded if it's a macro.
-     */
-    #ifndef wxCOMPILER_BROKEN_CONCAT_OPER
-        #define wxS(x) wxCONCAT_HELPER(L, x)
-    #else
-        #define wxS(x) wxPREPEND_L(x)
-    #endif
-#else /* wxUSE_UNICODE_UTF8 || ANSI */
-    #define wxS(x) x
-#endif
-
-/*
-    _T() is a synonym for wxT() familiar to Windows programmers. As this macro
-    has even higher risk of conflicting with system headers, its use is
-    discouraged and you may predefine wxNO__T to disable it. Additionally, we
-    do it ourselves for Sun CC which is known to use it in its standard headers
-    (see #10660).
- */
-#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-    #ifndef wxNO__T
-        #define wxNO__T
-    #endif
-#endif
-
-#if !defined(_T) && !defined(wxNO__T)
-    #define _T(x) wxT(x)
-#endif
-
-/* a helper macro allowing to make another macro Unicode-friendly, see below */
-#define wxAPPLY_T(x) wxT(x)
-
-/* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */
-#ifndef __TFILE__
-    #define __TFILE__ wxAPPLY_T(__FILE__)
-#endif
-
-#ifndef __TDATE__
-    #define __TDATE__ wxAPPLY_T(__DATE__)
-#endif
-
-#ifndef __TTIME__
-    #define __TTIME__ wxAPPLY_T(__TIME__)
-#endif
-
-#endif /* _WX_WXCHARTYPE_H_ */
-
diff --git a/Source/3rd Party/wx/include/wx/checkbox.h b/Source/3rd Party/wx/include/wx/checkbox.h
index 92342a907..4760475ab 100644
--- a/Source/3rd Party/wx/include/wx/checkbox.h	
+++ b/Source/3rd Party/wx/include/wx/checkbox.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.09.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: checkbox.h 39901 2006-06-30 10:51:44Z VS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -25,12 +25,8 @@
  * Determine whether to use a 3-state or 2-state
  * checkbox. 3-state enables to differentiate
  * between 'unchecked', 'checked' and 'undetermined'.
- *
- * In addition to the styles here it is also possible to specify just 0 which
- * is treated the same as wxCHK_2STATE for compatibility (but using explicit
- * flag is preferred).
  */
-#define wxCHK_2STATE           0x4000
+#define wxCHK_2STATE           0x0000
 #define wxCHK_3STATE           0x1000
 
 /*
@@ -41,13 +37,25 @@
  */
 #define wxCHK_ALLOW_3RD_STATE_FOR_USER 0x2000
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
+/*
+ * The possible states of a 3-state checkbox (Compatible
+ * with the 2-state checkbox).
+ */
+enum wxCheckBoxState
+{
+    wxCHK_UNCHECKED,
+    wxCHK_CHECKED,
+    wxCHK_UNDETERMINED /* 3-state checkbox only */
+};
+
+
+extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxCheckBox: a control which shows a label and a box which may be checked
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxCheckBoxBase : public wxControl
+class WXDLLEXPORT wxCheckBoxBase : public wxControl
 {
 public:
     wxCheckBoxBase() { }
@@ -110,9 +118,6 @@ public:
     }
 
 protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 
     virtual wxCheckBoxState DoGet3StateValue() const
@@ -121,51 +126,10 @@ protected:
         return wxCHK_UNCHECKED;
     }
 
-    // Helper function to be called from derived classes Create()
-    // implementations: it checks that the style doesn't contain any
-    // incompatible bits and modifies it to be sane if it does.
-    static void WXValidateStyle(long *stylePtr)
-    {
-        long& style = *stylePtr;
-
-        if ( !(style & (wxCHK_2STATE | wxCHK_3STATE)) )
-        {
-            // For compatibility we use absence of style flags as wxCHK_2STATE
-            // because wxCHK_2STATE used to have the value of 0 and some
-            // existing code uses 0 instead of it. Moreover, some code even
-            // uses some non-0 style, e.g. wxBORDER_XXX, but doesn't specify
-            // neither wxCHK_2STATE nor wxCHK_3STATE -- to avoid breaking it,
-            // assume (much more common) 2 state checkbox by default.
-            style |= wxCHK_2STATE;
-        }
-
-        if ( style & wxCHK_3STATE )
-        {
-            if ( style & wxCHK_2STATE )
-            {
-                wxFAIL_MSG( "wxCHK_2STATE and wxCHK_3STATE can't be used "
-                            "together" );
-                style &= ~wxCHK_3STATE;
-            }
-        }
-        else // No wxCHK_3STATE
-        {
-            if ( style & wxCHK_ALLOW_3RD_STATE_FOR_USER )
-            {
-                wxFAIL_MSG( "wxCHK_ALLOW_3RD_STATE_FOR_USER doesn't make sense "
-                            "without wxCHK_3STATE" );
-                style &= ~wxCHK_ALLOW_3RD_STATE_FOR_USER;
-            }
-        }
-    }
-
 private:
-    wxDECLARE_NO_COPY_CLASS(wxCheckBoxBase);
+    DECLARE_NO_COPY_CLASS(wxCheckBoxBase)
 };
 
-// Most ports support 3 state checkboxes so define this by default.
-#define wxHAS_3STATE_CHECKBOX
-
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/checkbox.h"
 #elif defined(__WXMSW__)
@@ -175,17 +139,18 @@ private:
 #elif defined(__WXGTK20__)
     #include "wx/gtk/checkbox.h"
 #elif defined(__WXGTK__)
-    #undef wxHAS_3STATE_CHECKBOX
     #include "wx/gtk1/checkbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/checkbox.h"
+    #include "wx/mac/checkbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
-    #undef wxHAS_3STATE_CHECKBOX
     #include "wx/os2/checkbox.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/checkbox.h"
 #endif
 
 #endif // wxUSE_CHECKBOX
 
-#endif // _WX_CHECKBOX_H_BASE_
+#endif
+    // _WX_CHECKBOX_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/checkeddelete.h b/Source/3rd Party/wx/include/wx/checkeddelete.h
deleted file mode 100644
index 084791019..000000000
--- a/Source/3rd Party/wx/include/wx/checkeddelete.h	
+++ /dev/null
@@ -1,54 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/checkeddelete.h
-// Purpose:     wxCHECKED_DELETE() macro
-// Author:      Vadim Zeitlin
-// Created:     2009-02-03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2002-2009 wxWidgets dev team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHECKEDDELETE_H_
-#define _WX_CHECKEDDELETE_H_
-
-// TODO: provide wxCheckedDelete[Array]() template functions too
-
-// ----------------------------------------------------------------------------
-// wxCHECKED_DELETE and wxCHECKED_DELETE_ARRAY macros
-// ----------------------------------------------------------------------------
-
-/*
-   checked deleters are used to make sure that the type being deleted is really
-   a complete type.: otherwise sizeof() would result in a compile-time error
-
-   do { ... } while ( 0 ) construct is used to have an anonymous scope
-   (otherwise we could have name clashes between different "complete"s) but
-   still force a semicolon after the macro
-*/
-
-#ifdef __WATCOMC__
-    #define wxFOR_ONCE(name)              for(int name=0; name<1; name++)
-    #define wxPRE_NO_WARNING_SCOPE(name)  wxFOR_ONCE(wxMAKE_UNIQUE_NAME(name))
-    #define wxPOST_NO_WARNING_SCOPE(name)
-#else
-    #define wxPRE_NO_WARNING_SCOPE(name)  do
-    #define wxPOST_NO_WARNING_SCOPE(name) while ( wxFalse )
-#endif
-
-#define wxCHECKED_DELETE(ptr)                                                 \
-    wxPRE_NO_WARNING_SCOPE(scope_var1)                                        \
-    {                                                                         \
-        typedef char complete[sizeof(*ptr)];                                  \
-        delete ptr;                                                           \
-    } wxPOST_NO_WARNING_SCOPE(scope_var1)
-
-#define wxCHECKED_DELETE_ARRAY(ptr)                                           \
-    wxPRE_NO_WARNING_SCOPE(scope_var2)                                        \
-    {                                                                         \
-        typedef char complete[sizeof(*ptr)];                                  \
-        delete [] ptr;                                                        \
-    } wxPOST_NO_WARNING_SCOPE(scope_var2)
-
-
-#endif // _WX_CHECKEDDELETE_H_
-
diff --git a/Source/3rd Party/wx/include/wx/checklst.h b/Source/3rd Party/wx/include/wx/checklst.h
index 53b1ecbad..c8857fd08 100644
--- a/Source/3rd Party/wx/include/wx/checklst.h	
+++ b/Source/3rd Party/wx/include/wx/checklst.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: checklst.h 38319 2006-03-23 22:05:23Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,8 +12,6 @@
 #ifndef _WX_CHECKLST_H_BASE_
 #define _WX_CHECKLST_H_BASE_
 
-#include "wx/defs.h"
-
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/listbox.h"
@@ -22,7 +20,7 @@
 // wxCheckListBox: a listbox whose items may be checked
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxCheckListBoxBase : public
+class WXDLLEXPORT wxCheckListBoxBase : public
                                               #ifdef __WXWINCE__
                                                   // keep virtuals synchronised
                                                   wxListBoxBase
@@ -37,7 +35,7 @@ public:
     virtual bool IsChecked(unsigned int item) const = 0;
     virtual void Check(unsigned int item, bool check = true) = 0;
 
-    wxDECLARE_NO_COPY_CLASS(wxCheckListBoxBase);
+    DECLARE_NO_COPY_CLASS(wxCheckListBoxBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -53,7 +51,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/checklst.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/checklst.h"
+    #include "wx/mac/checklst.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checklst.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/chkconf.h b/Source/3rd Party/wx/include/wx/chkconf.h
index 482593d97..811e0c304 100644
--- a/Source/3rd Party/wx/include/wx/chkconf.h	
+++ b/Source/3rd Party/wx/include/wx/chkconf.h	
@@ -4,52 +4,46 @@
  * Author:      Vadim Zeitlin
  * Modified by:
  * Created:     09.08.00
- * RCS-ID:      $Id$
+ * RCS-ID:      $Id: chkconf.h 48113 2007-08-15 17:43:50Z DE $
  * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-#ifndef _WX_CHKCONF_H_
-#define _WX_CHKCONF_H_
 
 /*
-              **************************************************
-              PLEASE READ THIS IF YOU GET AN ERROR IN THIS FILE!
-              **************************************************
-
-    If you get an error saying "wxUSE_FOO must be defined", it means that you
-    are not using the correct up-to-date version of setup.h. This happens most
-    often when using svn or daily snapshots and a new symbol was added to
-    setup0.h and you haven't updated your local setup.h to reflect it. If
-    this is the case, you need to propagate the changes from setup0.h to your
-    setup.h and, if using makefiles under MSW, also remove setup.h under the
-    build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that
-    the new setup.h is copied there.
-
-    If you get an error of the form "wxFoo requires wxBar", then the settings
-    in your setup.h are inconsistent. You have the choice between correcting
-    them manually or commenting out #define wxABORT_ON_CONFIG_ERROR below to
-    try to correct the problems automatically (not really recommended but
-    might work).
+   Platform-specific checking.
  */
 
-/*
-   This file has the following sections:
-    1. checks that all wxUSE_XXX symbols we use are defined
-     a) first the non-GUI ones
-     b) then the GUI-only ones
-    2. platform-specific checks done in the platform headers
-    3. generic consistency checks
-     a) first the non-GUI ones
-     b) then the GUI-only ones
- */
+#if defined(__WXPALMOS__)
+#  include "wx/palmos/chkconf.h"
+#elif defined(__WXWINCE__)
+#  include "wx/msw/wince/chkconf.h"
+#elif defined(__WXMSW__)
+#  include "wx/msw/chkconf.h"
+#elif defined(__WXMAC__)
+#  include "wx/mac/chkconf.h"
+#elif defined(__OS2__)
+#  include "wx/os2/chkconf.h"
+#elif defined(__WXMGL__)
+#  include "wx/mgl/chkconf.h"
+#elif defined(__WXDFB__)
+#  include "wx/dfb/chkconf.h"
+#elif defined(__WXMOTIF__)
+#  include "wx/motif/chkconf.h"
+#elif defined(__WXX11__)
+#  include "wx/x11/chkconf.h"
+#endif
+
+#ifdef __WXUNIVERSAL__
+#   include "wx/univ/chkconf.h"
+#endif
 
 /*
    this global setting determines what should we do if the setting FOO
    requires BAR and BAR is not set: we can either silently unset FOO as well
    (do this if you're trying to build the smallest possible library) or give an
-   error and abort (default as leads to least surprising behaviour)
+   error and abort (default as leads to least surprizing behaviour)
  */
 #define wxABORT_ON_CONFIG_ERROR
 
@@ -57,6 +51,16 @@
    global features
  */
 
+/* GUI build by default */
+#if !defined(wxUSE_GUI)
+#   define wxUSE_GUI 1
+#endif /* !defined(wxUSE_GUI) */
+
+/* Turn off wxUSE_ABI_INCOMPATIBLE_FEATURES if not specified. */
+#if !defined(wxUSE_ABI_INCOMPATIBLE_FEATURES)
+#   define wxUSE_ABI_INCOMPATIBLE_FEATURES 0
+#endif /* !defined(wxUSE_ABI_INCOMPATIBLE_FEATURES) */
+
 /*
     If we're compiling without support for threads/exceptions we have to
     disable the corresponding features.
@@ -79,38 +83,24 @@
 
 
 /*
-   Section 1a: tests for non GUI features.
+   tests for non GUI features
 
    please keep the options in alphabetical order!
  */
 
-#ifndef wxUSE_ANY
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ANY must be defined, please read comment near the top of this file."
+#ifndef wxUSE_CRASHREPORT
+    /* this one is special: as currently it is Windows-only, don't force it
+       to be defined on other platforms */
+#   if defined(wxABORT_ON_CONFIG_ERROR) && defined(__WXMSW__)
+#       error "wxUSE_CRASHREPORT must be defined."
 #   else
-#       define wxUSE_ANY 0
+#       define wxUSE_CRASHREPORT 0
 #   endif
-#endif /* wxUSE_ANY */
-
-#ifndef wxUSE_COMPILER_TLS
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_COMPILER_TLS must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_COMPILER_TLS 0
-#   endif
-#endif /* !defined(wxUSE_COMPILER_TLS) */
-
-#ifndef wxUSE_CONSOLE_EVENTLOOP
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CONSOLE_EVENTLOOP must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_CONSOLE_EVENTLOOP 0
-#   endif
-#endif /* !defined(wxUSE_CONSOLE_EVENTLOOP) */
+#endif /* !defined(wxUSE_CRASHREPORT) */
 
 #ifndef wxUSE_DYNLIB_CLASS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DYNLIB_CLASS must be defined, please read comment near the top of this file."
+#       error "wxUSE_DYNLIB_CLASS must be defined."
 #   else
 #       define wxUSE_DYNLIB_CLASS 0
 #   endif
@@ -118,23 +108,15 @@
 
 #ifndef wxUSE_EXCEPTIONS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_EXCEPTIONS must be defined, please read comment near the top of this file."
+#       error "wxUSE_EXCEPTIONS must be defined."
 #   else
 #       define wxUSE_EXCEPTIONS 0
 #   endif
 #endif /* !defined(wxUSE_EXCEPTIONS) */
 
-#ifndef wxUSE_FILE_HISTORY
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FILE_HISTORY must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_FILE_HISTORY 0
-#   endif
-#endif /* !defined(wxUSE_FILE_HISTORY) */
-
 #ifndef wxUSE_FILESYSTEM
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FILESYSTEM must be defined, please read comment near the top of this file."
+#       error "wxUSE_FILESYSTEM must be defined."
 #   else
 #       define wxUSE_FILESYSTEM 0
 #   endif
@@ -142,55 +124,28 @@
 
 #ifndef wxUSE_FS_ARCHIVE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FS_ARCHIVE must be defined, please read comment near the top of this file."
+#       error "wxUSE_FS_ARCHIVE must be defined."
 #   else
 #       define wxUSE_FS_ARCHIVE 0
 #   endif
 #endif /* !defined(wxUSE_FS_ARCHIVE) */
 
+/* don't give an error about this one yet, it's not fully implemented */
 #ifndef wxUSE_FSVOLUME
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FSVOLUME must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_FSVOLUME 0
-#   endif
+#   define wxUSE_FSVOLUME 0
 #endif /* !defined(wxUSE_FSVOLUME) */
 
-#ifndef wxUSE_FSWATCHER
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FSWATCHER must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_FSWATCHER 0
-#   endif
-#endif /* !defined(wxUSE_FSWATCHER) */
-
 #ifndef wxUSE_DYNAMIC_LOADER
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DYNAMIC_LOADER must be defined, please read comment near the top of this file."
+#       error "wxUSE_DYNAMIC_LOADER must be defined."
 #   else
 #       define wxUSE_DYNAMIC_LOADER 0
 #   endif
 #endif /* !defined(wxUSE_DYNAMIC_LOADER) */
 
-#ifndef wxUSE_INTL
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_INTL must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_INTL 0
-#   endif
-#endif /* !defined(wxUSE_INTL) */
-
-#ifndef wxUSE_IPV6
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_IPV6 must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_IPV6 0
-#   endif
-#endif /* !defined(wxUSE_IPV6) */
-
 #ifndef wxUSE_LOG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_LOG must be defined, please read comment near the top of this file."
+#       error "wxUSE_LOG must be defined."
 #   else
 #       define wxUSE_LOG 0
 #   endif
@@ -198,7 +153,7 @@
 
 #ifndef wxUSE_LONGLONG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_LONGLONG must be defined, please read comment near the top of this file."
+#       error "wxUSE_LONGLONG must be defined."
 #   else
 #       define wxUSE_LONGLONG 0
 #   endif
@@ -206,7 +161,7 @@
 
 #ifndef wxUSE_MIMETYPE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_MIMETYPE must be defined, please read comment near the top of this file."
+#       error "wxUSE_MIMETYPE must be defined."
 #   else
 #       define wxUSE_MIMETYPE 0
 #   endif
@@ -214,7 +169,7 @@
 
 #ifndef wxUSE_ON_FATAL_EXCEPTION
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ON_FATAL_EXCEPTION must be defined, please read comment near the top of this file."
+#       error "wxUSE_ON_FATAL_EXCEPTION must be defined."
 #   else
 #       define wxUSE_ON_FATAL_EXCEPTION 0
 #   endif
@@ -222,7 +177,7 @@
 
 #ifndef wxUSE_PRINTF_POS_PARAMS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_PRINTF_POS_PARAMS must be defined, please read comment near the top of this file."
+#       error "wxUSE_PRINTF_POS_PARAMS must be defined."
 #   else
 #       define wxUSE_PRINTF_POS_PARAMS 0
 #   endif
@@ -230,7 +185,7 @@
 
 #ifndef wxUSE_PROTOCOL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_PROTOCOL must be defined, please read comment near the top of this file."
+#       error "wxUSE_PROTOCOL must be defined."
 #   else
 #       define wxUSE_PROTOCOL 0
 #   endif
@@ -248,7 +203,7 @@
 
 #ifndef wxUSE_PROTOCOL_HTTP
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_PROTOCOL_HTTP must be defined, please read comment near the top of this file."
+#       error "wxUSE_PROTOCOL_HTTP must be defined."
 #   else
 #       define wxUSE_PROTOCOL_HTTP 0
 #   endif
@@ -256,7 +211,7 @@
 
 #ifndef wxUSE_PROTOCOL_FTP
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_PROTOCOL_FTP must be defined, please read comment near the top of this file."
+#       error "wxUSE_PROTOCOL_FTP must be defined."
 #   else
 #       define wxUSE_PROTOCOL_FTP 0
 #   endif
@@ -264,7 +219,7 @@
 
 #ifndef wxUSE_PROTOCOL_FILE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_PROTOCOL_FILE must be defined, please read comment near the top of this file."
+#       error "wxUSE_PROTOCOL_FILE must be defined."
 #   else
 #       define wxUSE_PROTOCOL_FILE 0
 #   endif
@@ -272,7 +227,7 @@
 
 #ifndef wxUSE_REGEX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_REGEX must be defined, please read comment near the top of this file."
+#       error "wxUSE_REGEX must be defined."
 #   else
 #       define wxUSE_REGEX 0
 #   endif
@@ -280,7 +235,7 @@
 
 #ifndef wxUSE_STDPATHS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STDPATHS must be defined, please read comment near the top of this file."
+#       error "wxUSE_STDPATHS must be defined."
 #   else
 #       define wxUSE_STDPATHS 1
 #   endif
@@ -288,7 +243,7 @@
 
 #ifndef wxUSE_XML
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_XML must be defined, please read comment near the top of this file."
+#       error "wxUSE_XML must be defined."
 #   else
 #       define wxUSE_XML 0
 #   endif
@@ -296,31 +251,15 @@
 
 #ifndef wxUSE_SOCKETS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SOCKETS must be defined, please read comment near the top of this file."
+#       error "wxUSE_SOCKETS must be defined."
 #   else
 #       define wxUSE_SOCKETS 0
 #   endif
 #endif /* !defined(wxUSE_SOCKETS) */
 
-#ifndef wxUSE_STD_CONTAINERS
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STD_CONTAINERS must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_STD_CONTAINERS 0
-#   endif
-#endif /* !defined(wxUSE_STD_CONTAINERS) */
-
-#ifndef wxUSE_STD_STRING_CONV_IN_WXSTRING
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STD_STRING_CONV_IN_WXSTRING must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_STD_STRING_CONV_IN_WXSTRING 0
-#   endif
-#endif /* !defined(wxUSE_STD_STRING_CONV_IN_WXSTRING) */
-
 #ifndef wxUSE_STREAMS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STREAMS must be defined, please read comment near the top of this file."
+#       error "wxUSE_STREAMS must be defined."
 #   else
 #       define wxUSE_STREAMS 0
 #   endif
@@ -328,7 +267,7 @@
 
 #ifndef wxUSE_STOPWATCH
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STOPWATCH must be defined, please read comment near the top of this file."
+#       error "wxUSE_STOPWATCH must be defined."
 #   else
 #       define wxUSE_STOPWATCH 0
 #   endif
@@ -336,7 +275,7 @@
 
 #ifndef wxUSE_TEXTBUFFER
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TEXTBUFFER must be defined, please read comment near the top of this file."
+#       error "wxUSE_TEXTBUFFER must be defined."
 #   else
 #       define wxUSE_TEXTBUFFER 0
 #   endif
@@ -344,7 +283,7 @@
 
 #ifndef wxUSE_TEXTFILE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TEXTFILE must be defined, please read comment near the top of this file."
+#       error "wxUSE_TEXTFILE must be defined."
 #   else
 #       define wxUSE_TEXTFILE 0
 #   endif
@@ -352,7 +291,7 @@
 
 #ifndef wxUSE_UNICODE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_UNICODE must be defined, please read comment near the top of this file."
+#       error "wxUSE_UNICODE must be defined."
 #   else
 #       define wxUSE_UNICODE 0
 #   endif
@@ -360,7 +299,7 @@
 
 #ifndef wxUSE_URL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_URL must be defined, please read comment near the top of this file."
+#       error "wxUSE_URL must be defined."
 #   else
 #       define wxUSE_URL 0
 #   endif
@@ -368,22 +307,14 @@
 
 #ifndef wxUSE_VARIANT
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_VARIANT must be defined, please read comment near the top of this file."
+#       error "wxUSE_VARIANT must be defined."
 #   else
 #       define wxUSE_VARIANT 0
 #   endif
 #endif /* wxUSE_VARIANT */
 
-#ifndef wxUSE_XLOCALE
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_XLOCALE must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_XLOCALE 0
-#   endif
-#endif /* !defined(wxUSE_XLOCALE) */
-
 /*
-   Section 1b: all these tests are for GUI only.
+   all these tests are for GUI only
 
    please keep the options in alphabetical order!
  */
@@ -396,7 +327,7 @@
 
 #ifndef wxUSE_ABOUTDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ABOUTDLG must be defined, please read comment near the top of this file."
+#       error "wxUSE_ABOUTDLG must be defined."
 #   else
 #       define wxUSE_ABOUTDLG 0
 #   endif
@@ -404,55 +335,23 @@
 
 #ifndef wxUSE_ACCEL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ACCEL must be defined, please read comment near the top of this file."
+#       error "wxUSE_ACCEL must be defined."
 #   else
 #       define wxUSE_ACCEL 0
 #   endif
 #endif /* !defined(wxUSE_ACCEL) */
 
-#ifndef wxUSE_ACCESSIBILITY
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ACCESSIBILITY must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_ACCESSIBILITY 0
-#   endif
-#endif /* !defined(wxUSE_ACCESSIBILITY) */
-
 #ifndef wxUSE_ANIMATIONCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ANIMATIONCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_ANIMATIONCTRL must be defined."
 #   else
 #       define wxUSE_ANIMATIONCTRL 0
 #   endif
 #endif /* !defined(wxUSE_ANIMATIONCTRL) */
 
-#ifndef wxUSE_ARTPROVIDER_STD
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ARTPROVIDER_STD must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_ARTPROVIDER_STD 0
-#   endif
-#endif /* !defined(wxUSE_ARTPROVIDER_STD) */
-
-#ifndef wxUSE_ARTPROVIDER_TANGO
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ARTPROVIDER_TANGO must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_ARTPROVIDER_TANGO 0
-#   endif
-#endif /* !defined(wxUSE_ARTPROVIDER_TANGO) */
-
-#ifndef wxUSE_AUTOID_MANAGEMENT
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_AUTOID_MANAGEMENT must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_AUTOID_MANAGEMENT 0
-#   endif
-#endif /* !defined(wxUSE_AUTOID_MANAGEMENT) */
-
 #ifndef wxUSE_BITMAPCOMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_BITMAPCOMBOBOX must be defined, please read comment near the top of this file."
+#       error "wxUSE_BITMAPCOMBOBOX must be defined."
 #   else
 #       define wxUSE_BITMAPCOMBOBOX 0
 #   endif
@@ -460,7 +359,7 @@
 
 #ifndef wxUSE_BMPBUTTON
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_BMPBUTTON must be defined, please read comment near the top of this file."
+#       error "wxUSE_BMPBUTTON must be defined."
 #   else
 #       define wxUSE_BMPBUTTON 0
 #   endif
@@ -468,23 +367,15 @@
 
 #ifndef wxUSE_BUTTON
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_BUTTON must be defined, please read comment near the top of this file."
+#       error "wxUSE_BUTTON must be defined."
 #   else
 #       define wxUSE_BUTTON 0
 #   endif
 #endif /* !defined(wxUSE_BUTTON) */
 
-#ifndef wxUSE_CAIRO
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CAIRO must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_CAIRO 0
-#   endif
-#endif /* !defined(wxUSE_CAIRO) */
-
 #ifndef wxUSE_CALENDARCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CALENDARCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_CALENDARCTRL must be defined."
 #   else
 #       define wxUSE_CALENDARCTRL 0
 #   endif
@@ -492,7 +383,7 @@
 
 #ifndef wxUSE_CARET
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CARET must be defined, please read comment near the top of this file."
+#       error "wxUSE_CARET must be defined."
 #   else
 #       define wxUSE_CARET 0
 #   endif
@@ -500,7 +391,7 @@
 
 #ifndef wxUSE_CHECKBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CHECKBOX must be defined, please read comment near the top of this file."
+#       error "wxUSE_CHECKBOX must be defined."
 #   else
 #       define wxUSE_CHECKBOX 0
 #   endif
@@ -508,7 +399,7 @@
 
 #ifndef wxUSE_CHECKLISTBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CHECKLISTBOX must be defined, please read comment near the top of this file."
+#       error "wxUSE_CHECKLISTBOX must be defined."
 #   else
 #       define wxUSE_CHECKLISTBOX 0
 #   endif
@@ -516,7 +407,7 @@
 
 #ifndef wxUSE_CHOICE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CHOICE must be defined, please read comment near the top of this file."
+#       error "wxUSE_CHOICE must be defined."
 #   else
 #       define wxUSE_CHOICE 0
 #   endif
@@ -524,7 +415,7 @@
 
 #ifndef wxUSE_CHOICEBOOK
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CHOICEBOOK must be defined, please read comment near the top of this file."
+#       error "wxUSE_CHOICEBOOK must be defined."
 #   else
 #       define wxUSE_CHOICEBOOK 0
 #   endif
@@ -532,7 +423,7 @@
 
 #ifndef wxUSE_CHOICEDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CHOICEDLG must be defined, please read comment near the top of this file."
+#       error "wxUSE_CHOICEDLG must be defined."
 #   else
 #       define wxUSE_CHOICEDLG 0
 #   endif
@@ -540,7 +431,7 @@
 
 #ifndef wxUSE_CLIPBOARD
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CLIPBOARD must be defined, please read comment near the top of this file."
+#       error "wxUSE_CLIPBOARD must be defined."
 #   else
 #       define wxUSE_CLIPBOARD 0
 #   endif
@@ -548,7 +439,7 @@
 
 #ifndef wxUSE_COLLPANE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_COLLPANE must be defined, please read comment near the top of this file."
+#       error "wxUSE_COLLPANE must be defined."
 #   else
 #       define wxUSE_COLLPANE 0
 #   endif
@@ -556,7 +447,7 @@
 
 #ifndef wxUSE_COLOURDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_COLOURDLG must be defined, please read comment near the top of this file."
+#       error "wxUSE_COLOURDLG must be defined."
 #   else
 #       define wxUSE_COLOURDLG 0
 #   endif
@@ -564,7 +455,7 @@
 
 #ifndef wxUSE_COLOURPICKERCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_COLOURPICKERCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_COLOURPICKERCTRL must be defined."
 #   else
 #       define wxUSE_COLOURPICKERCTRL 0
 #   endif
@@ -572,23 +463,15 @@
 
 #ifndef wxUSE_COMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_COMBOBOX must be defined, please read comment near the top of this file."
+#       error "wxUSE_COMBOBOX must be defined."
 #   else
 #       define wxUSE_COMBOBOX 0
 #   endif
 #endif /* !defined(wxUSE_COMBOBOX) */
 
-#ifndef wxUSE_COMMANDLINKBUTTON
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_COMMANDLINKBUTTON must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_COMMANDLINKBUTTON 0
-#   endif
-#endif /* !defined(wxUSE_COMMANDLINKBUTTON) */
-
 #ifndef wxUSE_COMBOCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_COMBOCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_COMBOCTRL must be defined."
 #   else
 #       define wxUSE_COMBOCTRL 0
 #   endif
@@ -596,7 +479,7 @@
 
 #ifndef wxUSE_DATAOBJ
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DATAOBJ must be defined, please read comment near the top of this file."
+#       error "wxUSE_DATAOBJ must be defined."
 #   else
 #       define wxUSE_DATAOBJ 0
 #   endif
@@ -604,7 +487,7 @@
 
 #ifndef wxUSE_DATAVIEWCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DATAVIEWCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_DATAVIEWCTRL must be defined."
 #   else
 #       define wxUSE_DATAVIEWCTRL 0
 #   endif
@@ -612,23 +495,15 @@
 
 #ifndef wxUSE_DATEPICKCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DATEPICKCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_DATEPICKCTRL must be defined."
 #   else
 #       define wxUSE_DATEPICKCTRL 0
 #   endif
 #endif /* !defined(wxUSE_DATEPICKCTRL) */
 
-#ifndef wxUSE_DC_TRANSFORM_MATRIX
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DC_TRANSFORM_MATRIX must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_DC_TRANSFORM_MATRIX 1
-#   endif
-#endif /* wxUSE_DC_TRANSFORM_MATRIX */
-
 #ifndef wxUSE_DIRPICKERCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DIRPICKERCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_DIRPICKERCTRL must be defined."
 #   else
 #       define wxUSE_DIRPICKERCTRL 0
 #   endif
@@ -636,7 +511,7 @@
 
 #ifndef wxUSE_DISPLAY
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DISPLAY must be defined, please read comment near the top of this file."
+#       error "wxUSE_DISPLAY must be defined."
 #   else
 #       define wxUSE_DISPLAY 0
 #   endif
@@ -644,23 +519,15 @@
 
 #ifndef wxUSE_DOC_VIEW_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined, please read comment near the top of this file."
+#       error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined."
 #   else
 #       define wxUSE_DOC_VIEW_ARCHITECTURE 0
 #   endif
 #endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */
 
-#ifndef wxUSE_FILECTRL
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FILECTRL must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_FILECTRL 0
-#   endif
-#endif /* !defined(wxUSE_FILECTRL) */
-
 #ifndef wxUSE_FILEDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FILEDLG must be defined, please read comment near the top of this file."
+#       error "wxUSE_FILEDLG must be defined."
 #   else
 #       define wxUSE_FILEDLG 0
 #   endif
@@ -668,7 +535,7 @@
 
 #ifndef wxUSE_FILEPICKERCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FILEPICKERCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_FILEPICKERCTRL must be defined."
 #   else
 #       define wxUSE_FILEPICKERCTRL 0
 #   endif
@@ -676,7 +543,7 @@
 
 #ifndef wxUSE_FONTDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FONTDLG must be defined, please read comment near the top of this file."
+#       error "wxUSE_FONTDLG must be defined."
 #   else
 #       define wxUSE_FONTDLG 0
 #   endif
@@ -684,7 +551,7 @@
 
 #ifndef wxUSE_FONTMAP
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FONTMAP must be defined, please read comment near the top of this file."
+#       error "wxUSE_FONTMAP must be defined."
 #   else
 #       define wxUSE_FONTMAP 0
 #   endif
@@ -692,7 +559,7 @@
 
 #ifndef wxUSE_FONTPICKERCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_FONTPICKERCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_FONTPICKERCTRL must be defined."
 #   else
 #       define wxUSE_FONTPICKERCTRL 0
 #   endif
@@ -700,7 +567,7 @@
 
 #ifndef wxUSE_GAUGE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_GAUGE must be defined, please read comment near the top of this file."
+#       error "wxUSE_GAUGE must be defined."
 #   else
 #       define wxUSE_GAUGE 0
 #   endif
@@ -708,7 +575,7 @@
 
 #ifndef wxUSE_GRAPHICS_CONTEXT
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_GRAPHICS_CONTEXT must be defined, please read comment near the top of this file."
+#       error "wxUSE_GRAPHICS_CONTEXT must be defined."
 #   else
 #       define wxUSE_GRAPHICS_CONTEXT 0
 #   endif
@@ -717,23 +584,15 @@
 
 #ifndef wxUSE_GRID
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_GRID must be defined, please read comment near the top of this file."
+#       error "wxUSE_GRID must be defined."
 #   else
 #       define wxUSE_GRID 0
 #   endif
 #endif /* !defined(wxUSE_GRID) */
 
-#ifndef wxUSE_HEADERCTRL
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_HEADERCTRL must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_HEADERCTRL 0
-#   endif
-#endif /* !defined(wxUSE_HEADERCTRL) */
-
 #ifndef wxUSE_HELP
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_HELP must be defined, please read comment near the top of this file."
+#       error "wxUSE_HELP must be defined."
 #   else
 #       define wxUSE_HELP 0
 #   endif
@@ -741,7 +600,7 @@
 
 #ifndef wxUSE_HYPERLINKCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_HYPERLINKCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_HYPERLINKCTRL must be defined."
 #   else
 #       define wxUSE_HYPERLINKCTRL 0
 #   endif
@@ -749,19 +608,19 @@
 
 #ifndef wxUSE_HTML
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_HTML must be defined, please read comment near the top of this file."
+#       error "wxUSE_HTML must be defined."
 #   else
 #       define wxUSE_HTML 0
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 
 #ifndef wxUSE_LIBMSPACK
-#   if !defined(__UNIX__)
+#   ifndef __UNIX__
         /* set to 0 on platforms that don't have libmspack */
 #       define wxUSE_LIBMSPACK 0
 #   else
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_LIBMSPACK must be defined, please read comment near the top of this file."
+#           error "wxUSE_LIBMSPACK must be defined."
 #       else
 #           define wxUSE_LIBMSPACK 0
 #       endif
@@ -770,7 +629,7 @@
 
 #ifndef wxUSE_ICO_CUR
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ICO_CUR must be defined, please read comment near the top of this file."
+#       error "wxUSE_ICO_CUR must be defined."
 #   else
 #       define wxUSE_ICO_CUR 0
 #   endif
@@ -778,7 +637,7 @@
 
 #ifndef wxUSE_IFF
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_IFF must be defined, please read comment near the top of this file."
+#       error "wxUSE_IFF must be defined."
 #   else
 #       define wxUSE_IFF 0
 #   endif
@@ -786,23 +645,15 @@
 
 #ifndef wxUSE_IMAGLIST
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_IMAGLIST must be defined, please read comment near the top of this file."
+#       error "wxUSE_IMAGLIST must be defined."
 #   else
 #       define wxUSE_IMAGLIST 0
 #   endif
 #endif /* !defined(wxUSE_IMAGLIST) */
 
-#ifndef wxUSE_INFOBAR
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_INFOBAR must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_INFOBAR 0
-#   endif
-#endif /* !defined(wxUSE_INFOBAR) */
-
 #ifndef wxUSE_JOYSTICK
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_JOYSTICK must be defined, please read comment near the top of this file."
+#       error "wxUSE_JOYSTICK must be defined."
 #   else
 #       define wxUSE_JOYSTICK 0
 #   endif
@@ -810,7 +661,7 @@
 
 #ifndef wxUSE_LISTBOOK
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_LISTBOOK must be defined, please read comment near the top of this file."
+#       error "wxUSE_LISTBOOK must be defined."
 #   else
 #       define wxUSE_LISTBOOK 0
 #   endif
@@ -818,7 +669,7 @@
 
 #ifndef wxUSE_LISTBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_LISTBOX must be defined, please read comment near the top of this file."
+#       error "wxUSE_LISTBOX must be defined."
 #   else
 #       define wxUSE_LISTBOX 0
 #   endif
@@ -826,7 +677,7 @@
 
 #ifndef wxUSE_LISTCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_LISTCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_LISTCTRL must be defined."
 #   else
 #       define wxUSE_LISTCTRL 0
 #   endif
@@ -834,7 +685,7 @@
 
 #ifndef wxUSE_LOGGUI
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_LOGGUI must be defined, please read comment near the top of this file."
+#       error "wxUSE_LOGGUI must be defined."
 #   else
 #       define wxUSE_LOGGUI 0
 #   endif
@@ -842,7 +693,7 @@
 
 #ifndef wxUSE_LOGWINDOW
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_LOGWINDOW must be defined, please read comment near the top of this file."
+#       error "wxUSE_LOGWINDOW must be defined."
 #   else
 #       define wxUSE_LOGWINDOW 0
 #   endif
@@ -850,23 +701,15 @@
 
 #ifndef wxUSE_LOG_DIALOG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_LOG_DIALOG must be defined, please read comment near the top of this file."
+#       error "wxUSE_LOG_DIALOG must be defined."
 #   else
 #       define wxUSE_LOG_DIALOG 0
 #   endif
 #endif /* !defined(wxUSE_LOG_DIALOG) */
 
-#ifndef wxUSE_MARKUP
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_MARKUP must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_MARKUP 0
-#   endif
-#endif /* !defined(wxUSE_MARKUP) */
-
 #ifndef wxUSE_MDI
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_MDI must be defined, please read comment near the top of this file."
+#       error "wxUSE_MDI must be defined."
 #   else
 #       define wxUSE_MDI 0
 #   endif
@@ -874,7 +717,7 @@
 
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_MDI_ARCHITECTURE must be defined, please read comment near the top of this file."
+#       error "wxUSE_MDI_ARCHITECTURE must be defined."
 #   else
 #       define wxUSE_MDI_ARCHITECTURE 0
 #   endif
@@ -882,7 +725,7 @@
 
 #ifndef wxUSE_MENUS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_MENUS must be defined, please read comment near the top of this file."
+#       error "wxUSE_MENUS must be defined."
 #   else
 #       define wxUSE_MENUS 0
 #   endif
@@ -890,7 +733,7 @@
 
 #ifndef wxUSE_MSGDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_MSGDLG must be defined, please read comment near the top of this file."
+#       error "wxUSE_MSGDLG must be defined."
 #   else
 #       define wxUSE_MSGDLG 0
 #   endif
@@ -898,23 +741,15 @@
 
 #ifndef wxUSE_NOTEBOOK
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_NOTEBOOK must be defined, please read comment near the top of this file."
+#       error "wxUSE_NOTEBOOK must be defined."
 #   else
 #       define wxUSE_NOTEBOOK 0
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 
-#ifndef wxUSE_NOTIFICATION_MESSAGE
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_NOTIFICATION_MESSAGE must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_NOTIFICATION_MESSAGE 0
-#   endif
-#endif /* !defined(wxUSE_NOTIFICATION_MESSAGE) */
-
 #ifndef wxUSE_ODCOMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ODCOMBOBOX must be defined, please read comment near the top of this file."
+#       error "wxUSE_ODCOMBOBOX must be defined."
 #   else
 #       define wxUSE_ODCOMBOBOX 0
 #   endif
@@ -922,7 +757,7 @@
 
 #ifndef wxUSE_PALETTE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_PALETTE must be defined, please read comment near the top of this file."
+#       error "wxUSE_PALETTE must be defined."
 #   else
 #       define wxUSE_PALETTE 0
 #   endif
@@ -930,7 +765,7 @@
 
 #ifndef wxUSE_POPUPWIN
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_POPUPWIN must be defined, please read comment near the top of this file."
+#       error "wxUSE_POPUPWIN must be defined."
 #   else
 #       define wxUSE_POPUPWIN 0
 #   endif
@@ -938,7 +773,7 @@
 
 #ifndef wxUSE_PRINTING_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_PRINTING_ARCHITECTURE must be defined, please read comment near the top of this file."
+#       error "wxUSE_PRINTING_ARCHITECTURE must be defined."
 #   else
 #       define wxUSE_PRINTING_ARCHITECTURE 0
 #   endif
@@ -946,7 +781,7 @@
 
 #ifndef wxUSE_RADIOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_RADIOBOX must be defined, please read comment near the top of this file."
+#       error "wxUSE_RADIOBOX must be defined."
 #   else
 #       define wxUSE_RADIOBOX 0
 #   endif
@@ -954,47 +789,15 @@
 
 #ifndef wxUSE_RADIOBTN
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_RADIOBTN must be defined, please read comment near the top of this file."
+#       error "wxUSE_RADIOBTN must be defined."
 #   else
 #       define wxUSE_RADIOBTN 0
 #   endif
 #endif /* !defined(wxUSE_RADIOBTN) */
 
-#ifndef wxUSE_REARRANGECTRL
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_REARRANGECTRL must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_REARRANGECTRL 0
-#   endif
-#endif /* !defined(wxUSE_REARRANGECTRL) */
-
-#ifndef wxUSE_RIBBON
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_RIBBON must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_RIBBON 0
-#   endif
-#endif /* !defined(wxUSE_RIBBON) */
-
-#ifndef wxUSE_RICHMSGDLG
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_RICHMSGDLG must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_RICHMSGDLG 0
-#   endif
-#endif /* !defined(wxUSE_RICHMSGDLG) */
-
-#ifndef wxUSE_RICHTOOLTIP
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_RICHTOOLTIP must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_RICHTOOLTIP 0
-#   endif
-#endif /* !defined(wxUSE_RICHTOOLTIP) */
-
 #ifndef wxUSE_SASH
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SASH must be defined, please read comment near the top of this file."
+#       error "wxUSE_SASH must be defined."
 #   else
 #       define wxUSE_SASH 0
 #   endif
@@ -1002,7 +805,7 @@
 
 #ifndef wxUSE_SCROLLBAR
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SCROLLBAR must be defined, please read comment near the top of this file."
+#       error "wxUSE_SCROLLBAR must be defined."
 #   else
 #       define wxUSE_SCROLLBAR 0
 #   endif
@@ -1010,7 +813,7 @@
 
 #ifndef wxUSE_SLIDER
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SLIDER must be defined, please read comment near the top of this file."
+#       error "wxUSE_SLIDER must be defined."
 #   else
 #       define wxUSE_SLIDER 0
 #   endif
@@ -1018,7 +821,7 @@
 
 #ifndef wxUSE_SOUND
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SOUND must be defined, please read comment near the top of this file."
+#       error "wxUSE_SOUND must be defined."
 #   else
 #       define wxUSE_SOUND 0
 #   endif
@@ -1026,7 +829,7 @@
 
 #ifndef wxUSE_SPINBTN
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SPINBTN must be defined, please read comment near the top of this file."
+#       error "wxUSE_SPINBTN must be defined."
 #   else
 #       define wxUSE_SPINBTN 0
 #   endif
@@ -1034,7 +837,7 @@
 
 #ifndef wxUSE_SPINCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SPINCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_SPINCTRL must be defined."
 #   else
 #       define wxUSE_SPINCTRL 0
 #   endif
@@ -1042,7 +845,7 @@
 
 #ifndef wxUSE_SPLASH
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SPLASH must be defined, please read comment near the top of this file."
+#       error "wxUSE_SPLASH must be defined."
 #   else
 #       define wxUSE_SPLASH 0
 #   endif
@@ -1050,7 +853,7 @@
 
 #ifndef wxUSE_SPLITTER
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SPLITTER must be defined, please read comment near the top of this file."
+#       error "wxUSE_SPLITTER must be defined."
 #   else
 #       define wxUSE_SPLITTER 0
 #   endif
@@ -1058,7 +861,7 @@
 
 #ifndef wxUSE_STATBMP
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STATBMP must be defined, please read comment near the top of this file."
+#       error "wxUSE_STATBMP must be defined."
 #   else
 #       define wxUSE_STATBMP 0
 #   endif
@@ -1066,7 +869,7 @@
 
 #ifndef wxUSE_STATBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STATBOX must be defined, please read comment near the top of this file."
+#       error "wxUSE_STATBOX must be defined."
 #   else
 #       define wxUSE_STATBOX 0
 #   endif
@@ -1074,7 +877,7 @@
 
 #ifndef wxUSE_STATLINE
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STATLINE must be defined, please read comment near the top of this file."
+#       error "wxUSE_STATLINE must be defined."
 #   else
 #       define wxUSE_STATLINE 0
 #   endif
@@ -1082,7 +885,7 @@
 
 #ifndef wxUSE_STATTEXT
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STATTEXT must be defined, please read comment near the top of this file."
+#       error "wxUSE_STATTEXT must be defined."
 #   else
 #       define wxUSE_STATTEXT 0
 #   endif
@@ -1090,39 +893,31 @@
 
 #ifndef wxUSE_STATUSBAR
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_STATUSBAR must be defined, please read comment near the top of this file."
+#       error "wxUSE_STATUSBAR must be defined."
 #   else
 #       define wxUSE_STATUSBAR 0
 #   endif
 #endif /* !defined(wxUSE_STATUSBAR) */
 
-#ifndef wxUSE_TASKBARICON
+#ifndef wxUSE_TAB_DIALOG
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TASKBARICON must be defined, please read comment near the top of this file."
+#       error "wxUSE_TAB_DIALOG must be defined."
 #   else
-#       define wxUSE_TASKBARICON 0
+#       define wxUSE_TAB_DIALOG 0
 #   endif
-#endif /* !defined(wxUSE_TASKBARICON) */
+#endif /* !defined(wxUSE_TAB_DIALOG) */
 
 #ifndef wxUSE_TEXTCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TEXTCTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_TEXTCTRL must be defined."
 #   else
 #       define wxUSE_TEXTCTRL 0
 #   endif
 #endif /* !defined(wxUSE_TEXTCTRL) */
 
-#ifndef wxUSE_TIMEPICKCTRL
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TIMEPICKCTRL must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_TIMEPICKCTRL 0
-#   endif
-#endif /* !defined(wxUSE_TIMEPICKCTRL) */
-
 #ifndef wxUSE_TIPWINDOW
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TIPWINDOW must be defined, please read comment near the top of this file."
+#       error "wxUSE_TIPWINDOW must be defined."
 #   else
 #       define wxUSE_TIPWINDOW 0
 #   endif
@@ -1130,7 +925,7 @@
 
 #ifndef wxUSE_TOOLBAR
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TOOLBAR must be defined, please read comment near the top of this file."
+#       error "wxUSE_TOOLBAR must be defined."
 #   else
 #       define wxUSE_TOOLBAR 0
 #   endif
@@ -1138,7 +933,7 @@
 
 #ifndef wxUSE_TOOLTIPS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TOOLTIPS must be defined, please read comment near the top of this file."
+#       error "wxUSE_TOOLTIPS must be defined."
 #   else
 #       define wxUSE_TOOLTIPS 0
 #   endif
@@ -1146,47 +941,23 @@
 
 #ifndef wxUSE_TREECTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TREECTRL must be defined, please read comment near the top of this file."
+#       error "wxUSE_TREECTRL must be defined."
 #   else
 #       define wxUSE_TREECTRL 0
 #   endif
 #endif /* !defined(wxUSE_TREECTRL) */
 
-#ifndef wxUSE_TREELISTCTRL
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TREELISTCTRL must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_TREELISTCTRL 0
-#   endif
-#endif /* !defined(wxUSE_TREELISTCTRL) */
-
-#ifndef wxUSE_UIACTIONSIMULATOR
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_UIACTIONSIMULATOR must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_UIACTIONSIMULATOR 0
-#   endif
-#endif /* !defined(wxUSE_UIACTIONSIMULATOR) */
-
 #ifndef wxUSE_VALIDATORS
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_VALIDATORS must be defined, please read comment near the top of this file."
+#       error "wxUSE_VALIDATORS must be defined."
 #   else
 #       define wxUSE_VALIDATORS 0
 #   endif
 #endif /* !defined(wxUSE_VALIDATORS) */
 
-#ifndef wxUSE_WEBVIEW
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_WEBVIEW must be defined, please read comment near the top of this file."
-#   else
-#       define wxUSE_WEBVIEW 0
-#   endif
-#endif /* !defined(wxUSE_WEBVIEW) */
-
 #ifndef wxUSE_WXHTML_HELP
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_WXHTML_HELP must be defined, please read comment near the top of this file."
+#       error "wxUSE_WXHTML_HELP must be defined."
 #   else
 #       define wxUSE_WXHTML_HELP 0
 #   endif
@@ -1194,7 +965,7 @@
 
 #ifndef wxUSE_XRC
 #   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_XRC must be defined, please read comment near the top of this file."
+#       error "wxUSE_XRC must be defined."
 #   else
 #       define wxUSE_XRC 0
 #   endif
@@ -1203,60 +974,19 @@
 #endif /* wxUSE_GUI */
 
 /*
-   Section 2: platform-specific checks.
-
-   This must be done after checking that everything is defined as the platform
-   checks use wxUSE_XXX symbols in #if tests.
+   check consistency of the settings
  */
 
-#if defined(__WXWINCE__)
-#  include "wx/msw/wince/chkconf.h"
-#elif defined(__WXMSW__)
-#  include "wx/msw/chkconf.h"
-#elif defined(__WXGTK__)
-#  include "wx/gtk/chkconf.h"
-#elif defined(__WXCOCOA__)
-#  include "wx/cocoa/chkconf.h"
-#elif defined(__WXMAC__)
-#  include "wx/osx/chkconf.h"
-#elif defined(__OS2__)
-#  include "wx/os2/chkconf.h"
-#elif defined(__WXDFB__)
-#  include "wx/dfb/chkconf.h"
-#elif defined(__WXMOTIF__)
-#  include "wx/motif/chkconf.h"
-#elif defined(__WXX11__)
-#  include "wx/x11/chkconf.h"
-#elif defined(__WXANDROID__)
-#  include "wx/android/chkconf.h"
-#endif
-
-/*
-    __UNIX__ is also defined under Cygwin but we shouldn't perform these checks
-    there if we're building wxMSW.
- */
-#if defined(__UNIX__) && !defined(__WXMSW__)
-#   include "wx/unix/chkconf.h"
-#endif
-
-#ifdef __WXUNIVERSAL__
-#   include "wx/univ/chkconf.h"
-#endif
-
-/*
-   Section 3a: check consistency of the non-GUI settings.
- */
-
-#if WXWIN_COMPATIBILITY_2_6
-#   if !WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_4
+#   if !WXWIN_COMPATIBILITY_2_6
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "2.6.X compatibility requires 2.8.X compatibility"
+#           error "2.4.X compatibility requires 2.6.X compatibility"
 #       else
-#           undef WXWIN_COMPATIBILITY_2_8
-#           define WXWIN_COMPATIBILITY_2_8 1
+#           undef WXWIN_COMPATIBILITY_2_6
+#           define WXWIN_COMPATIBILITY_2_6 1
 #       endif
 #   endif
-#endif /* WXWIN_COMPATIBILITY_2_6 */
+#endif /* WXWIN_COMPATIBILITY_2_4 */
 
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME
@@ -1269,6 +999,15 @@
 #   endif
 #endif /* wxUSE_ARCHIVE_STREAMS */
 
+#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
+#   else
+#       undef wxUSE_CRASHREPORT
+#       define wxUSE_CRASHREPORT 0
+#   endif
+#endif /* wxUSE_CRASHREPORT */
+
 #if wxUSE_PROTOCOL_FILE || wxUSE_PROTOCOL_FTP || wxUSE_PROTOCOL_HTTP
 #   if !wxUSE_PROTOCOL
 #        ifdef wxABORT_ON_CONFIG_ERROR
@@ -1396,6 +1135,17 @@
 #   endif
 #endif /* wxUSE_MIMETYPE */
 
+#if wxUSE_ODBC
+#   if !wxUSE_DATETIME
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxODBC requires wxUSE_DATETIME"
+#       else
+#           undef wxUSE_ODBC
+#           define wxUSE_ODBC 0
+#       endif
+#   endif
+#endif /* wxUSE_ODBC */
+
 #if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER"
@@ -1414,6 +1164,15 @@
 #   endif
 #endif /* wxUSE_TEXTFILE */
 
+#if wxUSE_XML && !wxUSE_WCHAR_T
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XML requires wxUSE_WCHAR_T"
+#   else
+#       undef wxUSE_XML
+#       define wxUSE_XML 0
+#   endif
+#endif /* wxUSE_XML */
+
 #if !wxUSE_DYNLIB_CLASS
 #   if wxUSE_DYNAMIC_LOADER
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -1443,6 +1202,18 @@
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
 
+#if wxUSE_TARSTREAM
+    /* wxTar doesn't currently compile without wchar_t */
+#   if !wxUSE_WCHAR_T
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxTar requires wchar_t"
+#       else
+#           undef wxUSE_TARSTREAM
+#           define wxUSE_TARSTREAM 0
+#       endif
+#   endif
+#endif /* wxUSE_TARSTREAM */
+
 #if wxUSE_TARSTREAM
 #   if !wxUSE_ARCHIVE_STREAMS
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -1454,20 +1225,9 @@
 #   endif
 #endif /* wxUSE_TARSTREAM */
 
-/*
-   Section 3b: the tests for the GUI settings only.
- */
+/* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 
-#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__)
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ACCESSIBILITY is currently only supported under wxMSW"
-#   else
-#       undef wxUSE_ACCESSIBILITY
-#       define wxUSE_ACCESSIBILITY 0
-#   endif
-#endif /* wxUSE_ACCESSIBILITY */
-
 #if wxUSE_BUTTON || \
     wxUSE_CALENDARCTRL || \
     wxUSE_CARET || \
@@ -1478,13 +1238,11 @@
     wxUSE_CHOICE || \
     wxUSE_GAUGE || \
     wxUSE_GRID || \
-    wxUSE_HEADERCTRL || \
     wxUSE_LISTBOX || \
     wxUSE_LISTCTRL || \
     wxUSE_NOTEBOOK || \
     wxUSE_RADIOBOX || \
     wxUSE_RADIOBTN || \
-    wxUSE_REARRANGECTRL || \
     wxUSE_SCROLLBAR || \
     wxUSE_SLIDER || \
     wxUSE_SPINBTN || \
@@ -1496,8 +1254,7 @@
     wxUSE_STATUSBAR || \
     wxUSE_TEXTCTRL || \
     wxUSE_TOOLBAR || \
-    wxUSE_TREECTRL || \
-    wxUSE_TREELISTCTRL
+    wxUSE_TREECTRL
 #    if !wxUSE_CONTROLS
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "wxUSE_CONTROLS unset but some controls used"
@@ -1519,17 +1276,6 @@
 #    endif
 #endif /* wxUSE_BMPBUTTON */
 
-#if wxUSE_COMMANDLINKBUTTON
-#    if !wxUSE_BUTTON
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxUSE_COMMANDLINKBUTTON requires wxUSE_BUTTON"
-#        else
-#            undef wxUSE_BUTTON
-#            define wxUSE_BUTTON 1
-#        endif
-#    endif
-#endif /* wxUSE_COMMANDLINKBUTTON */
-
 /*
    wxUSE_BOOKCTRL should be only used if any of the controls deriving from it
    are used
@@ -1594,53 +1340,20 @@
 
 #if !wxUSE_ODCOMBOBOX
 #   if wxUSE_BITMAPCOMBOBOX
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
-#       else
-#           undef wxUSE_BITMAPCOMBOBOX
-#           define wxUSE_BITMAPCOMBOBOX 0
-#       endif
+#       error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
+#   else
+#       undef wxUSE_BITMAPCOMBOBOX
+#       define wxUSE_BITMAPCOMBOBOX 0
 #   endif
 #endif /* !wxUSE_ODCOMBOBOX */
 
-#if !wxUSE_HEADERCTRL
-#   if wxUSE_DATAVIEWCTRL || wxUSE_GRID
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxDataViewCtrl and wxGrid require wxHeaderCtrl"
-#       else
-#           undef wxUSE_HEADERCTRL
-#           define wxUSE_HEADERCTRL 1
-#       endif
-#   endif
-#endif /* !wxUSE_HEADERCTRL */
-
-#if wxUSE_REARRANGECTRL
-#   if !wxUSE_CHECKLISTBOX
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxRearrangeCtrl requires wxCheckListBox"
-#       else
-#           undef wxUSE_REARRANGECTRL
-#           define wxUSE_REARRANGECTRL 0
-#       endif
-#   endif
-#endif /* wxUSE_REARRANGECTRL */
-
-#if wxUSE_RICHMSGDLG
-#    if !wxUSE_MSGDLG
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxUSE_RICHMSGDLG requires wxUSE_MSGDLG"
-#        else
-#            undef wxUSE_MSGDLG
-#            define wxUSE_MSGDLG 1
-#        endif
-#    endif
-#endif /* wxUSE_RICHMSGDLG */
-
 /* don't attempt to use native status bar on the platforms not having it */
 #ifndef wxUSE_NATIVE_STATUSBAR
 #   define wxUSE_NATIVE_STATUSBAR 0
 #elif wxUSE_NATIVE_STATUSBAR
-#   if defined(__WXUNIVERSAL__) || !(defined(__WXMSW__) || defined(__WXMAC__))
+#   if defined(__WXUNIVERSAL__) || !( defined(__WXMSW__) || \
+                                      defined(__WXMAC__) || \
+                                      defined(__WXPALMOS__) )
 #       undef wxUSE_NATIVE_STATUSBAR
 #       define wxUSE_NATIVE_STATUSBAR 0
 #   endif
@@ -1656,6 +1369,40 @@
 #endif /* wxUSE_GRAPHICS_CONTEXT */
 
 
+/* wxGTK-specific dependencies */
+#ifdef __WXGTK__
+#   ifndef __WXUNIVERSAL__
+#       if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "MDI requires wxUSE_MENUS in wxGTK"
+#           else
+#               undef wxUSE_MENUS
+#               define wxUSE_MENUS 1
+#           endif
+#       endif
+#   endif /* !__WXUNIVERSAL__ */
+
+#   if wxUSE_JOYSTICK
+#       if !wxUSE_THREADS
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "wxJoystick requires threads in wxGTK"
+#           else
+#               undef wxUSE_JOYSTICK
+#               define wxUSE_JOYSTICK 0
+#           endif
+#       endif
+#   endif
+#endif /* wxGTK && !wxUniv */
+
+/* Hopefully we can emulate these dialogs in due course */
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+#   ifdef wxUSE_COLOURDLG
+#       undef wxUSE_COLOURDLG
+#       define wxUSE_COLOURDLG 0
+#   endif
+#endif /* __SMARTPHONE__ && __WXWINCE__ */
+
+
 /* generic controls dependencies */
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
 #   if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG
@@ -1683,29 +1430,7 @@
 #   endif
 #endif /* !wxMSW || wxUniv */
 
-/* generic file dialog depends on (generic) file control */
-#if wxUSE_FILEDLG && !wxUSE_FILECTRL && \
-        (defined(__WXUNIVERSAL__) || defined(__WXGTK__))
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "Generic wxFileDialog requires wxFileCtrl"
-#   else
-#       undef wxUSE_FILECTRL
-#       define wxUSE_FILECTRL 1
-#   endif
-#endif /* wxUSE_FILEDLG */
-
 /* common dependencies */
-#if wxUSE_ARTPROVIDER_TANGO
-#   if !(wxUSE_STREAMS && wxUSE_IMAGE && wxUSE_LIBPNG)
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "Tango art provider requires wxImage with streams and PNG support"
-#       else
-#           undef wxUSE_ARTPROVIDER_TANGO
-#           define wxUSE_ARTPROVIDER_TANGO 0
-#       endif
-#   endif
-#endif /* wxUSE_ARTPROVIDER_TANGO */
-
 #if wxUSE_CALENDARCTRL
 #   if !(wxUSE_SPINBTN && wxUSE_COMBOBOX)
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -1728,16 +1453,16 @@
 #   endif
 #endif /* wxUSE_CALENDARCTRL */
 
-#if wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL
+#if wxUSE_DATEPICKCTRL
 #   if !wxUSE_DATETIME
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxDatePickerCtrl and wxTimePickerCtrl requires wxUSE_DATETIME"
+#           error "wxDatePickerCtrl requires wxUSE_DATETIME"
 #       else
 #           undef wxUSE_DATETIME
 #           define wxUSE_DATETIME 1
 #       endif
 #   endif
-#endif /* wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL */
+#endif /* wxUSE_DATEPICKCTRL */
 
 #if wxUSE_CHECKLISTBOX
 #   if !wxUSE_LISTBOX
@@ -1761,17 +1486,6 @@
 #   endif
 #endif /* wxUSE_CHOICEDLG */
 
-#if wxUSE_FILECTRL
-#   if !wxUSE_DATETIME
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxFileCtrl requires wxDateTime"
-#       else
-#           undef wxUSE_DATETIME
-#           define wxUSE_DATETIME 1
-#       endif
-#   endif
-#endif /* wxUSE_FILECTRL */
-
 #if wxUSE_HELP
 #   if !wxUSE_BMPBUTTON
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -1948,15 +1662,6 @@
 #            define wxUSE_STREAMS 1
 #        endif
 #   endif
-
-#   if !wxUSE_FILE_HISTORY
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "DocView requires wxUSE_FILE_HISTORY"
-#        else
-#            undef wxUSE_FILE_HISTORY
-#            define wxUSE_FILE_HISTORY 1
-#        endif
-#   endif
 #endif /* wxUSE_DOC_VIEW_ARCHITECTURE */
 
 #if wxUSE_PRINTING_ARCHITECTURE
@@ -2002,7 +1707,7 @@
 #endif /* wxUSE_FILEDLG */
 
 #if !wxUSE_GAUGE || !wxUSE_BUTTON
-#   if wxUSE_PROGRESSDLG
+#   if wxUSE_PROGRESSDLG && !defined(__WXPALMOS__)
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "Generic progress dialog requires wxUSE_GAUGE and wxUSE_BUTTON"
 #       else
@@ -2044,7 +1749,7 @@
 #endif
 
 #if !wxUSE_IMAGLIST
-#   if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL || wxUSE_TREELISTCTRL
+#   if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxImageList must be compiled as well"
 #       else
@@ -2054,6 +1759,16 @@
 #   endif
 #endif /* !wxUSE_IMAGLIST */
 
+#if !wxUSE_MSGDLG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+        /* FIXME: should compile without it, of course, but doesn't */
+#       error "wxMessageBox is always needed"
+#   else
+#       undef wxUSE_MSGDLG
+#       define wxUSE_MSGDLG 1
+#   endif
+#endif
+
 #if wxUSE_RADIOBOX
 #   if !wxUSE_RADIOBTN
 #        ifdef wxABORT_ON_CONFIG_ERROR
@@ -2063,7 +1778,7 @@
 #            define wxUSE_RADIOBTN 1
 #        endif
 #   endif
-#   if !wxUSE_STATBOX
+#   if !wxUSE_STATBOX && !defined(__WXPALMOS__)
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #            error "wxUSE_RADIOBOX requires wxUSE_STATBOX"
 #        else
@@ -2106,6 +1821,15 @@
 #   endif
 #endif /* wxUSE_CLIPBOARD */
 
+#if wxUSE_WX_RESOURCES && !wxUSE_PROLOGIO
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxr resources require PrologIO"
+#   else
+#       undef wxUSE_PROLOGIO
+#       define wxUSE_PROLOGIO 1
+#   endif
+#endif /* wxUSE_WX_RESOURCES */
+
 #if wxUSE_XRC && !wxUSE_XML
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XRC requires wxUSE_XML"
@@ -2124,42 +1848,6 @@
 #   endif
 #endif /* wxUSE_SOCKETS */
 
-#if wxUSE_SVG && !wxUSE_STREAMS
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SVG requires wxUSE_STREAMS"
-#   else
-#       undef wxUSE_SVG
-#       define wxUSE_SVG 0
-#   endif
-#endif /* wxUSE_SVG */
-
-#if wxUSE_SVG && !wxUSE_IMAGE
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SVG requires wxUSE_IMAGE"
-#   else
-#       undef wxUSE_SVG
-#       define wxUSE_SVG 0
-#   endif
-#endif /* wxUSE_SVG */
-
-#if wxUSE_SVG && !wxUSE_LIBPNG
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_SVG requires wxUSE_LIBPNG"
-#   else
-#       undef wxUSE_SVG
-#       define wxUSE_SVG 0
-#   endif
-#endif /* wxUSE_SVG */
-
-#if wxUSE_TASKBARICON && !wxUSE_MENUS
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TASKBARICON requires wxUSE_MENUS"
-#   else
-#       undef wxUSE_TASKBARICON
-#       define wxUSE_TASKBARICON 0
-#   endif
-#endif /* wxUSE_TASKBARICON */
-
 #if !wxUSE_VARIANT
 #   if wxUSE_DATAVIEWCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -2169,26 +1857,15 @@
 #           define wxUSE_DATAVIEWCTRL 0
 #       endif
 #   endif
+
+#   if wxUSE_ODBC
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_ODBC requires wxVariant"
+#       else
+#           undef wxUSE_ODBC
+#           define wxUSE_ODBC 0
+#       endif
+#   endif
 #endif /* wxUSE_VARIANT */
 
-#if wxUSE_TREELISTCTRL && !wxUSE_DATAVIEWCTRL
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TREELISTCTRL requires wxDataViewCtrl"
-#   else
-#       undef wxUSE_TREELISTCTRL
-#       define wxUSE_TREELISTCTRL 0
-#   endif
-#endif /* wxUSE_TREELISTCTRL */
-
-#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_WEBVIEW requires at least one backend"
-#   else
-#       undef wxUSE_WEBVIEW
-#       define wxUSE_WEBVIEW 0
-#   endif
-#endif /* wxUSE_WEBVIEW && !any web view backend */
-
 #endif /* wxUSE_GUI */
-
-#endif /* _WX_CHKCONF_H_ */
diff --git a/Source/3rd Party/wx/include/wx/choicdlg.h b/Source/3rd Party/wx/include/wx/choicdlg.h
index 54ba6fd1b..76867ec67 100644
--- a/Source/3rd Party/wx/include/wx/choicdlg.h	
+++ b/Source/3rd Party/wx/include/wx/choicdlg.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/choicdlg.h
+// Name:        wx/choicdgg.h
 // Purpose:     Includes generic choice dialog file
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: choicdlg.h 33948 2005-05-04 18:57:50Z JS $
 // Copyright:   Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Source/3rd Party/wx/include/wx/choice.h b/Source/3rd Party/wx/include/wx/choice.h
index ccc66fa78..fe2a9fa76 100644
--- a/Source/3rd Party/wx/include/wx/choice.h	
+++ b/Source/3rd Party/wx/include/wx/choice.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: choice.h 42727 2006-10-30 16:04:27Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,13 +26,13 @@
 // global data
 // ----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxChoiceNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxChoice allows to select one of a non-modifiable list of strings
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems
+class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
 {
 public:
     wxChoiceBase() { }
@@ -55,11 +55,8 @@ public:
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
 
-    // override wxItemContainer::IsSorted
-    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
-
 private:
-    wxDECLARE_NO_COPY_CLASS(wxChoiceBase);
+    DECLARE_NO_COPY_CLASS(wxChoiceBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -79,7 +76,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/choice.h"
+    #include "wx/mac/choice.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/choice.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/choicebk.h b/Source/3rd Party/wx/include/wx/choicebk.h
index 55293739f..2f35c0a01 100644
--- a/Source/3rd Party/wx/include/wx/choicebk.h	
+++ b/Source/3rd Party/wx/include/wx/choicebk.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by: Wlodzimierz ABX Skiba from wx/listbook.h
 // Created:     15.09.04
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: choicebk.h 59616 2009-03-18 21:58:15Z VZ $
 // Copyright:   (c) Vadim Zeitlin, Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,12 +18,11 @@
 
 #include "wx/bookctrl.h"
 #include "wx/choice.h"
-#include "wx/containr.h"
 
 class WXDLLIMPEXP_FWD_CORE wxChoice;
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING;
 
 // wxChoicebook flags
 #define wxCHB_DEFAULT          wxBK_DEFAULT
@@ -37,10 +36,13 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGI
 // wxChoicebook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxChoicebook : public wxNavigationEnabled<wxBookCtrlBase>
+class WXDLLEXPORT wxChoicebook : public wxBookCtrlBase
 {
 public:
-    wxChoicebook() { }
+    wxChoicebook()
+    {
+        Init();
+    }
 
     wxChoicebook(wxWindow *parent,
                  wxWindowID id,
@@ -49,6 +51,8 @@ public:
                  long style = 0,
                  const wxString& name = wxEmptyString)
     {
+        Init();
+
         (void)Create(parent, id, pos, size, style, name);
     }
 
@@ -61,17 +65,18 @@ public:
                 const wxString& name = wxEmptyString);
 
 
+    virtual int GetSelection() const;
     virtual bool SetPageText(size_t n, const wxString& strText);
     virtual wxString GetPageText(size_t n) const;
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageImage(size_t n, int imageId);
+    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
     virtual bool InsertPage(size_t n,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
-                            int imageId = NO_IMAGE);
-    virtual int SetSelection(size_t n)
-        { return DoSetSelection(n, SetSelection_SendEvent); }
+                            int imageId = -1);
+    virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
     virtual void SetImageList(wxImageList *imageList);
 
@@ -80,29 +85,31 @@ public:
     // returns the choice control
     wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
 
-    // Override this to return true because the part of parent window
-    // background between our controlling wxChoice and the page area should
-    // show through.
-    virtual bool HasTransparentBackground() { return true; }
-
 protected:
-    virtual void DoSetWindowVariant(wxWindowVariant variant);
-
     virtual wxWindow *DoRemovePage(size_t page);
 
+    // get the size which the choice control should have
+    virtual wxSize GetControllerSize() const;
+
     void UpdateSelectedPage(size_t newsel)
     {
-        m_selection = static_cast<int>(newsel);
+        m_selection = wx_static_cast(int, newsel);
         GetChoiceCtrl()->Select(m_selection);
     }
 
-    wxBookCtrlEvent* CreatePageChangingEvent() const;
-    void MakeChangedEvent(wxBookCtrlEvent &event);
+    wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
+    void MakeChangedEvent(wxBookCtrlBaseEvent &event);
 
     // event handlers
     void OnChoiceSelected(wxCommandEvent& event);
 
+    // the currently selected page or wxNOT_FOUND if none
+    int m_selection;
+
 private:
+    // common part of all constructors
+    void Init();
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebook)
 };
@@ -111,16 +118,36 @@ private:
 // choicebook event class and related stuff
 // ----------------------------------------------------------------------------
 
-// wxChoicebookEvent is obsolete and defined for compatibility only
-#define wxChoicebookEvent wxBookCtrlEvent
-typedef wxBookCtrlEventFunction wxChoicebookEventFunction;
-#define wxChoicebookEventHandler(func) wxBookCtrlEventHandler(func)
+class WXDLLEXPORT wxChoicebookEvent : public wxBookCtrlBaseEvent
+{
+public:
+    wxChoicebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
+                      int nSel = -1, int nOldSel = -1)
+        : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel)
+    {
+    }
+
+    wxChoicebookEvent(const wxChoicebookEvent& event)
+        : wxBookCtrlBaseEvent(event)
+    {
+    }
+
+    virtual wxEvent *Clone() const { return new wxChoicebookEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChoicebookEvent)
+};
+
+typedef void (wxEvtHandler::*wxChoicebookEventFunction)(wxChoicebookEvent&);
+
+#define wxChoicebookEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxChoicebookEventFunction, &func)
 
 #define EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, winid, wxChoicebookEventHandler(fn))
 
 #define EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, winid, wxChoicebookEventHandler(fn))
 
 #endif // wxUSE_CHOICEBOOK
 
diff --git a/Source/3rd Party/wx/include/wx/clipbrd.h b/Source/3rd Party/wx/include/wx/clipbrd.h
index fbc8f9ad5..11976bec9 100644
--- a/Source/3rd Party/wx/include/wx/clipbrd.h	
+++ b/Source/3rd Party/wx/include/wx/clipbrd.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.10.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: clipbrd.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,11 +17,11 @@
 #if wxUSE_CLIPBOARD
 
 
-#include "wx/event.h"
-#include "wx/chartype.h"
-#include "wx/dataobj.h"     // for wxDataFormat
-#include "wx/vector.h"
+#include "wx/object.h"
+#include "wx/wxchar.h"
 
+class WXDLLIMPEXP_FWD_CORE wxDataFormat;
+class WXDLLIMPEXP_FWD_CORE wxDataObject;
 class WXDLLIMPEXP_FWD_CORE wxClipboard;
 
 // ----------------------------------------------------------------------------
@@ -32,10 +32,10 @@ class WXDLLIMPEXP_FWD_CORE wxClipboard;
 // with wxDataObject.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxClipboardBase : public wxObject
+class WXDLLEXPORT wxClipboardBase : public wxObject
 {
 public:
-    wxClipboardBase() { m_usePrimary = false; }
+    wxClipboardBase() {}
 
     // open the clipboard before Add/SetData() and GetData()
     virtual bool Open() = 0;
@@ -59,9 +59,6 @@ public:
     // ask if data in correct format is available
     virtual bool IsSupported( const wxDataFormat& format ) = 0;
 
-    // ask if data in correct format is available
-    virtual bool IsSupportedAsync( wxEvtHandler *sink );
-
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data ) = 0;
 
@@ -73,72 +70,13 @@ public:
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush() { return false; }
 
-    // this allows to choose whether we work with CLIPBOARD (default) or
-    // PRIMARY selection on X11-based systems
-    //
-    // on the other ones, working with primary selection does nothing: this
-    // allows to write code which sets the primary selection when something is
-    // selected without any ill effects (i.e. without overwriting the
-    // clipboard which would be wrong on the platforms without X11 PRIMARY)
-    virtual void UsePrimarySelection(bool usePrimary = false)
-    {
-        m_usePrimary = usePrimary;
-    }
-
-    // return true if we're using primary selection
-    bool IsUsingPrimarySelection() const { return m_usePrimary; }
+    // X11 has two clipboards which get selected by this call. Empty on MSW.
+    virtual void UsePrimarySelection( bool WXUNUSED(primary) = false ) { }
 
     // Returns global instance (wxTheClipboard) of the object:
     static wxClipboard *Get();
-
-
-    // don't use this directly, it is public for compatibility with some ports
-    // (wxX11, wxMotif, ...) only
-    bool m_usePrimary;
 };
 
-// ----------------------------------------------------------------------------
-// asynchronous clipboard event
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent
-{
-public:
-    wxClipboardEvent(wxEventType evtType = wxEVT_NULL)
-        : wxEvent(0, evtType)
-    {
-    }
-
-    wxClipboardEvent(const wxClipboardEvent& event)
-        : wxEvent(event),
-          m_formats(event.m_formats)
-    {
-    }
-
-    bool SupportsFormat(const wxDataFormat& format) const;
-    void AddFormat(const wxDataFormat& format);
-
-    virtual wxEvent *Clone() const
-    {
-        return new wxClipboardEvent(*this);
-    }
-
-
-protected:
-    wxVector<wxDataFormat> m_formats;
-
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent)
-};
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );
-
-typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
-
-#define wxClipboardEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxClipboardEventFunction, func)
-
-#define EVT_CLIPBOARD_CHANGED(func) wx__DECLARE_EVT0(wxEVT_CLIPBOARD_CHANGED, wxClipboardEventHandler(func))
-
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -160,8 +98,10 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
     #include "wx/gtk1/clipbrd.h"
 #elif defined(__WXX11__)
     #include "wx/x11/clipbrd.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/clipbrd.h"
+    #include "wx/mac/clipbrd.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/clipbrd.h"
 #elif defined(__WXPM__)
@@ -172,10 +112,10 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
 // helpful class for opening the clipboard and automatically closing it
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxClipboardLocker
+class WXDLLEXPORT wxClipboardLocker
 {
 public:
-    wxClipboardLocker(wxClipboard *clipboard = NULL)
+    wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)
     {
         m_clipboard = clipboard ? clipboard : wxTheClipboard;
         if ( m_clipboard )
@@ -197,7 +137,7 @@ public:
 private:
     wxClipboard *m_clipboard;
 
-    wxDECLARE_NO_COPY_CLASS(wxClipboardLocker);
+    DECLARE_NO_COPY_CLASS(wxClipboardLocker)
 };
 
 #endif // wxUSE_CLIPBOARD
diff --git a/Source/3rd Party/wx/include/wx/clntdata.h b/Source/3rd Party/wx/include/wx/clntdata.h
index e586f6198..f9704a7d0 100644
--- a/Source/3rd Party/wx/include/wx/clntdata.h	
+++ b/Source/3rd Party/wx/include/wx/clntdata.h	
@@ -4,7 +4,7 @@
 // Author:      Robin Dunn
 // Modified by:
 // Created:     9-Oct-2001
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: clntdata.h 36973 2006-01-18 16:45:41Z JS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -159,5 +159,115 @@ protected:
 
 };
 
+#include "wx/vector.h"
+
+struct WXDLLIMPEXP_BASE wxClientDataDictionaryPair
+{
+    wxClientDataDictionaryPair( size_t idx ) : index( idx ), data( 0 ) { }
+
+    size_t index;
+    wxClientData* data;
+};
+
+_WX_DECLARE_VECTOR(
+    wxClientDataDictionaryPair,
+    wxClientDataDictionaryPairVector,
+    WXDLLIMPEXP_BASE
+);
+
+// this class is used internally to maintain the association between items
+// of (some subclasses of) wxControlWithItems and their client data
+// NOTE: this class does not keep track of whether it contains
+// wxClientData or void*. The client must ensure that
+// it does not contain a mix of the two, and that
+// DestroyData is called if it contains wxClientData
+class WXDLLIMPEXP_BASE wxClientDataDictionary
+{
+public:
+    wxClientDataDictionary() {}
+
+    // deletes all the data
+    void DestroyData()
+    {
+        for( size_t i = 0, end = m_vec.size(); i != end; ++i )
+            delete m_vec[i].data;
+        m_vec.clear();
+    }
+
+    // if data for the given index is not present, add it,
+    // if it is present, delete the old data and replace it with
+    // the new one
+    void Set( size_t index, wxClientData* data, bool doDelete )
+    {
+        size_t ptr = Find( index );
+
+        if( !data )
+        {
+            if( ptr == m_vec.size() ) return;
+            if( doDelete )
+                delete m_vec[ptr].data;
+            m_vec.erase( ptr );
+        }
+        else
+        {
+            if( ptr == m_vec.size() )
+            {
+                m_vec.push_back( wxClientDataDictionaryPair( index ) );
+                ptr = m_vec.size() - 1;
+            }
+
+            if( doDelete )
+                delete m_vec[ptr].data;
+            m_vec[ptr].data = data;
+        }
+    }
+
+    // get the data associated with the given index,
+    // return 0 if not found
+    wxClientData* Get( size_t index ) const
+    {
+        size_t it = Find( index );
+        if( it == m_vec.size() ) return 0;
+        return (wxClientData*)m_vec[it].data; // const cast
+    }
+
+    // delete the data associated with the given index
+    // it also decreases by one the indices of all the elements
+    // with an index greater than the given index
+    void Delete( size_t index, bool doDelete )
+    {
+        size_t todel = m_vec.size();
+
+        for( size_t i = 0, end = m_vec.size(); i != end; ++i )
+        {
+            if( m_vec[i].index == index )
+                todel = i;
+            else if( m_vec[i].index > index )
+                --(m_vec[i].index);
+        }
+
+        if( todel != m_vec.size() )
+        {
+            if( doDelete )
+                delete m_vec[todel].data;
+            m_vec.erase( todel );
+        }
+    }
+private:
+    // returns MyVec.size() if not found
+    size_t Find( size_t index ) const
+    {
+        for( size_t i = 0, end = m_vec.size(); i != end; ++i )
+        {
+            if( m_vec[i].index == index )
+                return i;
+        }
+
+        return m_vec.size();
+    }
+
+    wxClientDataDictionaryPairVector m_vec;
+};
+
 #endif // _WX_CLNTDATAH__
 
diff --git a/Source/3rd Party/wx/include/wx/clrpicker.h b/Source/3rd Party/wx/include/wx/clrpicker.h
index 72662f9c3..f6a436fc3 100644
--- a/Source/3rd Party/wx/include/wx/clrpicker.h	
+++ b/Source/3rd Party/wx/include/wx/clrpicker.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: clrpicker.h 53135 2008-04-12 02:31:04Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -22,15 +22,8 @@
 
 class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerWidgetNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxColourPickerCtrlNameStr[];
-
-// show the colour in HTML form (#AABBCC) as colour button label
-#define wxCLRBTN_SHOW_LABEL     100
-
-// the default style
-#define wxCLRBTN_DEFAULT_STYLE  (wxCLRBTN_SHOW_LABEL)
-
+extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[];
 
 
 // ----------------------------------------------------------------------------
@@ -77,7 +70,7 @@ protected:
 //       same prototype for their contructor (and also explains why we use
 //       define instead of a typedef)
 // since GTK > 2.4, there is GtkColorButton
-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/clrpicker.h"
     #define wxColourPickerWidget      wxColourButton
 #else
@@ -160,7 +153,9 @@ private:
 // wxColourPickerEvent: used by wxColourPickerCtrl only
 // ----------------------------------------------------------------------------
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLOURPICKER_CHANGED, 1102)
+END_DECLARE_EVENT_TYPES()
 
 class WXDLLIMPEXP_CORE wxColourPickerEvent : public wxCommandEvent
 {
@@ -193,7 +188,7 @@ private:
 typedef void (wxEvtHandler::*wxColourPickerEventFunction)(wxColourPickerEvent&);
 
 #define wxColourPickerEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxColourPickerEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxColourPickerEventFunction, &func)
 
 #define EVT_COLOURPICKER_CHANGED(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn))
diff --git a/Source/3rd Party/wx/include/wx/cmdargs.h b/Source/3rd Party/wx/include/wx/cmdargs.h
deleted file mode 100644
index 56a3b355e..000000000
--- a/Source/3rd Party/wx/include/wx/cmdargs.h	
+++ /dev/null
@@ -1,152 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/cmdargs.h
-// Purpose:     declaration of wxCmdLineArgsArray helper class
-// Author:      Vadim Zeitlin
-// Created:     2007-11-12
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CMDARGS_H_
-#define _WX_CMDARGS_H_
-
-#include "wx/arrstr.h"
-
-// ----------------------------------------------------------------------------
-// wxCmdLineArgsArray: helper class used by wxApp::argv
-// ----------------------------------------------------------------------------
-
-#if wxUSE_UNICODE
-
-// this class is used instead of either "char **" or "wchar_t **" (neither of
-// which would be backwards compatible with all the existing code) for argv
-// field of wxApp
-//
-// as it's used for compatibility, it tries to look as much as traditional
-// (char **) argv as possible, in particular it provides implicit conversions
-// to "char **" and also array-like operator[]
-class WXDLLIMPEXP_BASE wxCmdLineArgsArray
-{
-public:
-    wxCmdLineArgsArray() { m_argsA = NULL; m_argsW = NULL; }
-
-    template <typename T>
-    wxCmdLineArgsArray& operator=(T **argv)
-    {
-        FreeArgs();
-
-        m_args.clear();
-
-        if ( argv )
-        {
-            while ( *argv )
-                m_args.push_back(*argv++);
-        }
-
-        return *this;
-    }
-
-    operator char**() const
-    {
-        if ( !m_argsA )
-        {
-            const size_t count = m_args.size();
-            m_argsA = new char *[count];
-            for ( size_t n = 0; n < count; n++ )
-                m_argsA[n] = wxStrdup(m_args[n].ToAscii());
-        }
-
-        return m_argsA;
-    }
-
-    operator wchar_t**() const
-    {
-        if ( !m_argsW )
-        {
-            const size_t count = m_args.size();
-            m_argsW = new wchar_t *[count];
-            for ( size_t n = 0; n < count; n++ )
-                m_argsW[n] = wxStrdup(m_args[n].wc_str());
-        }
-
-        return m_argsW;
-    }
-
-    // existing code does checks like "if ( argv )" and we want it to continue
-    // to compile, so provide this conversion even if it is pretty dangerous
-    operator bool() const
-    {
-        return !m_args.empty();
-    }
-
-    // and the same for "if ( !argv )" checks
-    bool operator!() const
-    {
-        return m_args.empty();
-    }
-
-    wxString operator[](size_t n) const
-    {
-        return m_args[n];
-    }
-
-    // we must provide this overload for g++ 3.4 which can't choose between
-    // our operator[](size_t) and ::operator[](char**, int) otherwise
-    wxString operator[](int n) const
-    {
-        return m_args[n];
-    }
-
-
-    // convenience methods, i.e. not existing only for backwards compatibility
-
-    // do we have any arguments at all?
-    bool IsEmpty() const { return m_args.empty(); }
-
-    // access the arguments as a convenient array of wxStrings
-    const wxArrayString& GetArguments() const { return m_args; }
-
-    ~wxCmdLineArgsArray()
-    {
-        FreeArgs();
-    }
-
-private:
-    template <typename T>
-    void Free(T **args)
-    {
-        if ( !args )
-            return;
-
-        const size_t count = m_args.size();
-        for ( size_t n = 0; n < count; n++ )
-            free(args[n]);
-
-        delete [] args;
-    }
-
-    void FreeArgs()
-    {
-        Free(m_argsA);
-        Free(m_argsW);
-    }
-
-    wxArrayString m_args;
-    mutable char **m_argsA;
-    mutable wchar_t **m_argsW;
-
-    wxDECLARE_NO_COPY_CLASS(wxCmdLineArgsArray);
-};
-
-// provide global operator overload for compatibility with the existing code
-// doing things like "if ( condition && argv )"
-inline bool operator&&(bool cond, const wxCmdLineArgsArray& array)
-{
-    return cond && !array.IsEmpty();
-}
-
-#endif // wxUSE_UNICODE
-
-#endif // _WX_CMDARGS_H_
-
diff --git a/Source/3rd Party/wx/include/wx/cmdline.h b/Source/3rd Party/wx/include/wx/cmdline.h
index d83c257cc..9f6e6080b 100644
--- a/Source/3rd Party/wx/include/wx/cmdline.h	
+++ b/Source/3rd Party/wx/include/wx/cmdline.h	
@@ -5,7 +5,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.01.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: cmdline.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,14 +17,6 @@
 
 #include "wx/string.h"
 #include "wx/arrstr.h"
-#include "wx/cmdargs.h"
-
-// determines ConvertStringToArgs() behaviour
-enum wxCmdLineSplitType
-{
-    wxCMD_LINE_SPLIT_DOS,
-    wxCMD_LINE_SPLIT_UNIX
-};
 
 #if wxUSE_CMDLINE_PARSER
 
@@ -36,14 +28,13 @@ class WXDLLIMPEXP_FWD_BASE wxDateTime;
 
 // by default, options are optional (sic) and each call to AddParam() allows
 // one more parameter - this may be changed by giving non-default flags to it
-enum wxCmdLineEntryFlags
+enum
 {
     wxCMD_LINE_OPTION_MANDATORY = 0x01, // this option must be given
     wxCMD_LINE_PARAM_OPTIONAL   = 0x02, // the parameter may be omitted
     wxCMD_LINE_PARAM_MULTIPLE   = 0x04, // the parameter may be repeated
     wxCMD_LINE_OPTION_HELP      = 0x08, // this option is a help request
-    wxCMD_LINE_NEEDS_SEPARATOR  = 0x10, // must have sep before the value
-    wxCMD_LINE_SWITCH_NEGATABLE = 0x20  // this switch can be negated (e.g. /S-)
+    wxCMD_LINE_NEEDS_SEPARATOR  = 0x10  // must have sep before the value
 };
 
 // an option value or parameter may be a string (the most common case), a
@@ -53,7 +44,6 @@ enum wxCmdLineParamType
     wxCMD_LINE_VAL_STRING,  // should be 0 (default)
     wxCMD_LINE_VAL_NUMBER,
     wxCMD_LINE_VAL_DATE,
-    wxCMD_LINE_VAL_DOUBLE,
     wxCMD_LINE_VAL_NONE
 };
 
@@ -63,18 +53,9 @@ enum wxCmdLineEntryType
     wxCMD_LINE_SWITCH,
     wxCMD_LINE_OPTION,
     wxCMD_LINE_PARAM,
-    wxCMD_LINE_USAGE_TEXT,
     wxCMD_LINE_NONE         // to terminate the list
 };
 
-// Possible return values of wxCmdLineParser::FoundSwitch()
-enum wxCmdLineSwitchState
-{
-    wxCMD_SWITCH_OFF = -1,  // Found but turned off/negated.
-    wxCMD_SWITCH_NOT_FOUND, // Not found at all.
-    wxCMD_SWITCH_ON         // Found in normal state.
-};
-
 // ----------------------------------------------------------------------------
 // wxCmdLineEntryDesc is a description of one command line
 // switch/option/parameter
@@ -83,17 +64,13 @@ enum wxCmdLineSwitchState
 struct wxCmdLineEntryDesc
 {
     wxCmdLineEntryType kind;
-    const char *shortName;
-    const char *longName;
-    const char *description;
+    const wxChar *shortName;
+    const wxChar *longName;
+    const wxChar *description;
     wxCmdLineParamType type;
     int flags;
 };
 
-// the list of wxCmdLineEntryDesc objects should be terminated with this one
-#define wxCMD_LINE_DESC_END \
-        { wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0x0 }
-
 // ----------------------------------------------------------------------------
 // wxCmdLineParser is a class for parsing command line.
 //
@@ -123,8 +100,6 @@ public:
     wxCmdLineParser(int argc, char **argv) { Init(); SetCmdLine(argc, argv); }
 #if wxUSE_UNICODE
     wxCmdLineParser(int argc, wxChar **argv) { Init(); SetCmdLine(argc, argv); }
-    wxCmdLineParser(int argc, const wxCmdLineArgsArray& argv)
-        { Init(); SetCmdLine(argc, argv); }
 #endif // wxUSE_UNICODE
     wxCmdLineParser(const wxString& cmdline) { Init(); SetCmdLine(cmdline); }
 
@@ -137,10 +112,6 @@ public:
 #if wxUSE_UNICODE
     wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, wxChar **argv)
         { Init(); SetCmdLine(argc, argv); SetDesc(desc); }
-    wxCmdLineParser(const wxCmdLineEntryDesc *desc,
-                    int argc,
-                    const wxCmdLineArgsArray& argv)
-        { Init(); SetCmdLine(argc, argv); SetDesc(desc); }
 #endif // wxUSE_UNICODE
     wxCmdLineParser(const wxCmdLineEntryDesc *desc, const wxString& cmdline)
         { Init(); SetCmdLine(cmdline); SetDesc(desc); }
@@ -149,7 +120,6 @@ public:
     void SetCmdLine(int argc, char **argv);
 #if wxUSE_UNICODE
     void SetCmdLine(int argc, wxChar **argv);
-    void SetCmdLine(int argc, const wxCmdLineArgsArray& argv);
 #endif // wxUSE_UNICODE
     void SetCmdLine(const wxString& cmdline);
 
@@ -168,7 +138,7 @@ public:
     void EnableLongOptions(bool enable = true);
     void DisableLongOptions() { EnableLongOptions(false); }
 
-    bool AreLongOptionsEnabled() const;
+    bool AreLongOptionsEnabled();
 
     // extra text may be shown by Usage() method if set by this function
     void SetLogo(const wxString& logo);
@@ -183,34 +153,18 @@ public:
     void AddSwitch(const wxString& name, const wxString& lng = wxEmptyString,
                    const wxString& desc = wxEmptyString,
                    int flags = 0);
-    void AddLongSwitch(const wxString& lng,
-                       const wxString& desc = wxEmptyString,
-                       int flags = 0)
-    {
-        AddSwitch(wxString(), lng, desc, flags);
-    }
 
     // an option taking a value of the given type
     void AddOption(const wxString& name, const wxString& lng = wxEmptyString,
                    const wxString& desc = wxEmptyString,
                    wxCmdLineParamType type = wxCMD_LINE_VAL_STRING,
                    int flags = 0);
-    void AddLongOption(const wxString& lng,
-                       const wxString& desc = wxEmptyString,
-                       wxCmdLineParamType type = wxCMD_LINE_VAL_STRING,
-                       int flags = 0)
-    {
-        AddOption(wxString(), lng, desc, type, flags);
-    }
 
     // a parameter
     void AddParam(const wxString& desc = wxEmptyString,
                   wxCmdLineParamType type = wxCMD_LINE_VAL_STRING,
                   int flags = 0);
 
-    // add an explanatory text to be shown to the user in help
-    void AddUsageText(const wxString& text);
-
     // actions
     // -------
 
@@ -223,10 +177,7 @@ public:
     int Parse(bool showUsage = true);
 
     // give the usage message describing all program options
-    void Usage() const;
-
-    // return the usage string, call Usage() to directly show it to the user
-    wxString GetUsageString() const;
+    void Usage();
 
     // get the command line arguments
     // ------------------------------
@@ -234,12 +185,6 @@ public:
     // returns true if the given switch was found
     bool Found(const wxString& name) const;
 
-    // Returns wxCMD_SWITCH_NOT_FOUND if the switch was not found at all,
-    // wxCMD_SWITCH_ON if it was found in normal state and wxCMD_SWITCH_OFF if
-    // it was found but negated (i.e. followed by "-", this can only happen for
-    // the switches with wxCMD_LINE_SWITCH_NEGATABLE flag).
-    wxCmdLineSwitchState FoundSwitch(const wxString& name) const;
-
     // returns true if an option taking a string value was found and stores the
     // value in the provided pointer
     bool Found(const wxString& name, wxString *value) const;
@@ -248,10 +193,6 @@ public:
     // the value in the provided pointer
     bool Found(const wxString& name, long *value) const;
 
-    // returns true if an option taking a double value was found and stores
-    // the value in the provided pointer
-    bool Found(const wxString& name, double *value) const;
-
 #if wxUSE_DATETIME
     // returns true if an option taking a date value was found and stores the
     // value in the provided pointer
@@ -268,17 +209,18 @@ public:
     void Reset();
 
     // break down the command line in arguments
-    static wxArrayString
-    ConvertStringToArgs(const wxString& cmdline,
-                        wxCmdLineSplitType type = wxCMD_LINE_SPLIT_DOS);
+    static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
 
 private:
+    // get usage string
+    wxString GetUsageString();
+
     // common part of all ctors
     void Init();
 
     struct wxCmdLineParserData *m_data;
 
-    wxDECLARE_NO_COPY_CLASS(wxCmdLineParser);
+    DECLARE_NO_COPY_CLASS(wxCmdLineParser)
 };
 
 #else // !wxUSE_CMDLINE_PARSER
@@ -288,11 +230,10 @@ private:
 class WXDLLIMPEXP_BASE wxCmdLineParser
 {
 public:
-    static wxArrayString
-    ConvertStringToArgs(const wxString& cmdline,
-                        wxCmdLineSplitType type = wxCMD_LINE_SPLIT_DOS);
+    static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
 };
 
 #endif // wxUSE_CMDLINE_PARSER/!wxUSE_CMDLINE_PARSER
 
 #endif // _WX_CMDLINE_H_
+
diff --git a/Source/3rd Party/wx/include/wx/cmdproc.h b/Source/3rd Party/wx/include/wx/cmdproc.h
index 2a93d9e05..930cad753 100644
--- a/Source/3rd Party/wx/include/wx/cmdproc.h	
+++ b/Source/3rd Party/wx/include/wx/cmdproc.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart (extracted from docview.h by VZ)
 // Modified by:
 // Created:     05.11.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: cmdproc.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxMenu;
 // wxCommand: a single command capable of performing itself
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxCommand : public wxObject
+class WXDLLEXPORT wxCommand : public wxObject
 {
 public:
     wxCommand(bool canUndoIt = false, const wxString& name = wxEmptyString);
@@ -49,7 +49,7 @@ private:
 // wxCommandProcessor: wxCommand manager
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxCommandProcessor : public wxObject
+class WXDLLEXPORT wxCommandProcessor : public wxObject
 {
 public:
     // if max number of commands is -1, it is unlimited
@@ -97,7 +97,10 @@ public:
     virtual void ClearCommands();
 
     // Has the current project been changed?
-    virtual bool IsDirty() const;
+    virtual bool IsDirty() const
+    {
+        return m_currentCommand && (m_lastSavedCommand != m_currentCommand);
+    }
 
     // Mark the current command as the one where the last save took place
     void MarkAsSaved()
@@ -134,7 +137,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
-    wxDECLARE_NO_COPY_CLASS(wxCommandProcessor);
+    DECLARE_NO_COPY_CLASS(wxCommandProcessor)
 };
 
 #endif // _WX_CMDPROC_H_
diff --git a/Source/3rd Party/wx/include/wx/cmndata.h b/Source/3rd Party/wx/include/wx/cmndata.h
index 2db863158..a96c4ff72 100644
--- a/Source/3rd Party/wx/include/wx/cmndata.h	
+++ b/Source/3rd Party/wx/include/wx/cmndata.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart and others
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: cmndata.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,18 +12,134 @@
 #ifndef _WX_CMNDATA_H_BASE_
 #define _WX_CMNDATA_H_BASE_
 
-#include "wx/defs.h"
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
+#include "wx/window.h"
+#include "wx/font.h"
+#include "wx/encinfo.h"
+#include "wx/colour.h"
 #include "wx/gdicmn.h"
 
 #if wxUSE_STREAMS
 #include "wx/stream.h"
 #endif
 
+
 class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
 
+
+class WXDLLEXPORT wxColourData: public wxObject
+{
+public:
+    wxColourData();
+    wxColourData(const wxColourData& data);
+    virtual ~wxColourData();
+
+    void SetChooseFull(bool flag) { m_chooseFull = flag; }
+    bool GetChooseFull() const { return m_chooseFull; }
+    void SetColour(const wxColour& colour) { m_dataColour = colour; }
+    const wxColour& GetColour() const { return m_dataColour; }
+    wxColour& GetColour() { return m_dataColour; }
+
+    // Array of 16 custom colours
+    void SetCustomColour(int i, const wxColour& colour);
+    wxColour GetCustomColour(int i);
+
+    void operator=(const wxColourData& data);
+
+public:
+    wxColour        m_dataColour;
+    wxColour        m_custColours[16];
+    bool            m_chooseFull;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxColourData)
+};
+
+class WXDLLEXPORT wxFontData : public wxObject
+{
+public:
+    wxFontData();
+    virtual ~wxFontData();
+
+    wxFontData(const wxFontData& data)
+        : wxObject(),
+          m_fontColour(data.m_fontColour),
+          m_showHelp(data.m_showHelp),
+          m_allowSymbols(data.m_allowSymbols),
+          m_enableEffects(data.m_enableEffects),
+          m_initialFont(data.m_initialFont),
+          m_chosenFont(data.m_chosenFont),
+          m_minSize(data.m_minSize),
+          m_maxSize(data.m_maxSize),
+          m_encoding(data.m_encoding),
+          m_encodingInfo(data.m_encodingInfo)
+    {
+    }
+
+    wxFontData& operator=(const wxFontData& data)
+    {
+        wxObject::operator=(data);
+        m_fontColour     = data.m_fontColour;
+        m_showHelp       = data.m_showHelp;
+        m_allowSymbols   = data.m_allowSymbols;
+        m_enableEffects  = data.m_enableEffects;
+        m_initialFont    = data.m_initialFont;
+        m_chosenFont     = data.m_chosenFont;
+        m_minSize        = data.m_minSize;
+        m_maxSize        = data.m_maxSize;
+        m_encoding       = data.m_encoding;
+        m_encodingInfo   = data.m_encodingInfo;
+        return *this;
+    }
+
+    void SetAllowSymbols(bool flag) { m_allowSymbols = flag; }
+    bool GetAllowSymbols() const { return m_allowSymbols; }
+
+    void SetColour(const wxColour& colour) { m_fontColour = colour; }
+    const wxColour& GetColour() const { return m_fontColour; }
+
+    void SetShowHelp(bool flag) { m_showHelp = flag; }
+    bool GetShowHelp() const { return m_showHelp; }
+
+    void EnableEffects(bool flag) { m_enableEffects = flag; }
+    bool GetEnableEffects() const { return m_enableEffects; }
+
+    void SetInitialFont(const wxFont& font) { m_initialFont = font; }
+    wxFont GetInitialFont() const { return m_initialFont; }
+
+    void SetChosenFont(const wxFont& font) { m_chosenFont = font; }
+    wxFont GetChosenFont() const { return m_chosenFont; }
+
+    void SetRange(int minRange, int maxRange) { m_minSize = minRange; m_maxSize = maxRange; }
+
+    // encoding info is split into 2 parts: the logical wxWin encoding
+    // (wxFontEncoding) and a structure containing the native parameters for
+    // it (wxNativeEncodingInfo)
+    wxFontEncoding GetEncoding() const { return m_encoding; }
+    void SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; }
+
+    wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
+
+
+    // public for backwards compatibility only: don't use directly
+public:
+    wxColour        m_fontColour;
+    bool            m_showHelp;
+    bool            m_allowSymbols;
+    bool            m_enableEffects;
+    wxFont          m_initialFont;
+    wxFont          m_chosenFont;
+    int             m_minSize;
+    int             m_maxSize;
+
+private:
+    wxFontEncoding       m_encoding;
+    wxNativeEncodingInfo m_encodingInfo;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxFontData)
+};
+
+#if wxUSE_PRINTING_ARCHITECTURE
 /*
  * wxPrintData
  * Encapsulates printer information (not printer dialog information)
@@ -52,7 +168,7 @@ enum wxPrintBin
 
 const int wxPRINTMEDIA_DEFAULT = 0;
 
-class WXDLLIMPEXP_CORE wxPrintData: public wxObject
+class WXDLLEXPORT wxPrintData: public wxObject
 {
 public:
     wxPrintData();
@@ -61,7 +177,7 @@ public:
 
     int GetNoCopies() const { return m_printNoCopies; }
     bool GetCollate() const { return m_printCollate; }
-    wxPrintOrientation GetOrientation() const { return m_printOrientation; }
+    int  GetOrientation() const { return m_printOrientation; }
     bool IsOrientationReversed() const { return m_printOrientationReversed; }
 
     // Is this data OK for showing the print dialog?
@@ -81,11 +197,7 @@ public:
 
     void SetNoCopies(int v) { m_printNoCopies = v; }
     void SetCollate(bool flag) { m_printCollate = flag; }
-
-    // Please use the overloaded method below
-    wxDEPRECATED_INLINE(void SetOrientation(int orient),
-                        m_printOrientation = (wxPrintOrientation)orient; )
-    void SetOrientation(wxPrintOrientation orient) { m_printOrientation = orient; }
+    void SetOrientation(int orient) { m_printOrientation = orient; }
     void SetOrientationReversed(bool reversed) { m_printOrientationReversed = reversed; }
 
     void SetPrinterName(const wxString& name) { m_printerName = name; }
@@ -101,13 +213,36 @@ public:
     wxString GetFilename() const { return m_filename; }
     void SetFilename( const wxString &filename ) { m_filename = filename; }
 
-    wxPrintData& operator=(const wxPrintData& data);
+    void operator=(const wxPrintData& data);
 
     char* GetPrivData() const { return m_privData; }
     int GetPrivDataLen() const { return m_privDataLen; }
     void SetPrivData( char *privData, int len );
 
 
+#if WXWIN_COMPATIBILITY_2_4
+    // PostScript-specific data
+    wxString GetPrinterCommand() const;
+    wxString GetPrinterOptions() const;
+    wxString GetPreviewCommand() const;
+    wxString GetFontMetricPath() const;
+    double GetPrinterScaleX() const;
+    double GetPrinterScaleY() const;
+    long GetPrinterTranslateX() const;
+    long GetPrinterTranslateY() const;
+
+    void SetPrinterCommand(const wxString& command);
+    void SetPrinterOptions(const wxString& options);
+    void SetPreviewCommand(const wxString& command);
+    void SetFontMetricPath(const wxString& path);
+    void SetPrinterScaleX(double x);
+    void SetPrinterScaleY(double y);
+    void SetPrinterScaling(double x, double y);
+    void SetPrinterTranslateX(long x);
+    void SetPrinterTranslateY(long y);
+    void SetPrinterTranslation(long x, long y);
+#endif
+
     // Convert between wxPrintData and native data
     void ConvertToNative();
     void ConvertFromNative();
@@ -120,7 +255,7 @@ private:
     wxPrintMode     m_printMode;
 
     int             m_printNoCopies;
-    wxPrintOrientation m_printOrientation;
+    int             m_printOrientation;
     bool            m_printOrientationReversed;
     bool            m_printCollate;
 
@@ -149,7 +284,7 @@ private:
  * from the dialog.
  */
 
-class WXDLLIMPEXP_CORE wxPrintDialogData: public wxObject
+class WXDLLEXPORT wxPrintDialogData: public wxObject
 {
 public:
     wxPrintDialogData();
@@ -166,7 +301,9 @@ public:
     bool GetSelection() const { return m_printSelection; }
     bool GetCollate() const { return m_printCollate; }
     bool GetPrintToFile() const { return m_printToFile; }
-
+#if WXWIN_COMPATIBILITY_2_4
+    bool GetSetupDialog() const { return m_printSetupDialog; }
+#endif
     void SetFromPage(int v) { m_printFromPage = v; }
     void SetToPage(int v) { m_printToPage = v; }
     void SetMinPage(int v) { m_printMinPage = v; }
@@ -176,7 +313,9 @@ public:
     void SetSelection(bool flag) { m_printSelection = flag; }
     void SetCollate(bool flag) { m_printCollate = flag; }
     void SetPrintToFile(bool flag) { m_printToFile = flag; }
-
+#if WXWIN_COMPATIBILITY_2_4
+    void SetSetupDialog(bool flag) { m_printSetupDialog = flag; }
+#endif
     void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; }
     void EnableSelection(bool flag) { m_printEnableSelection = flag; }
     void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; }
@@ -189,7 +328,7 @@ public:
 
     // Is this data OK for showing the print dialog?
     bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_printData.IsOk() ; }
+    bool IsOk() const { return m_printData.Ok() ; }
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
@@ -211,6 +350,9 @@ private:
     bool            m_printEnablePageNumbers;
     bool            m_printEnableHelp;
     bool            m_printEnablePrintToFile;
+#if WXWIN_COMPATIBILITY_2_4
+    bool            m_printSetupDialog;
+#endif
     wxPrintData     m_printData;
 
 private:
@@ -224,7 +366,7 @@ private:
 // Compatibility with old name
 #define wxPageSetupData wxPageSetupDialogData
 
-class WXDLLIMPEXP_CORE wxPageSetupDialogData: public wxObject
+class WXDLLEXPORT wxPageSetupDialogData: public wxObject
 {
 public:
     wxPageSetupDialogData();
@@ -249,7 +391,7 @@ public:
 
     // Is this data OK for showing the page setup dialog?
     bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_printData.IsOk() ; }
+    bool IsOk() const { return m_printData.Ok() ; }
 
     // If a corresponding paper type is found in the paper database, will set the m_printData
     // paper size id member as well.
@@ -280,7 +422,7 @@ public:
     // Use paper id in wxPrintData to set this object's paper size
     void CalculatePaperSizeFromId();
 
-    wxPageSetupDialogData& operator=(const wxPageSetupDialogData& data);
+    wxPageSetupDialogData& operator=(const wxPageSetupData& data);
     wxPageSetupDialogData& operator=(const wxPrintData& data);
 
     wxPrintData& GetPrintData() { return m_printData; }
diff --git a/Source/3rd Party/wx/include/wx/collpane.h b/Source/3rd Party/wx/include/wx/collpane.h
index bd67ad705..483d33b26 100644
--- a/Source/3rd Party/wx/include/wx/collpane.h	
+++ b/Source/3rd Party/wx/include/wx/collpane.h	
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     8/10/2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: collpane.h 43300 2006-11-11 07:32:08Z RD $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,8 +19,6 @@
 
 #include "wx/control.h"
 
-// class name
-extern WXDLLIMPEXP_DATA_CORE(const char) wxCollapsiblePaneNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxCollapsiblePaneBase: interface for wxCollapsiblePane
@@ -51,9 +49,9 @@ public:
 // event types and macros
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent;
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COLLPANE_CHANGED, 1102)
+END_DECLARE_EVENT_TYPES()
 
 class WXDLLIMPEXP_CORE wxCollapsiblePaneEvent : public wxCommandEvent
 {
@@ -86,13 +84,13 @@ private:
 typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEvent&);
 
 #define wxCollapsiblePaneEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxCollapsiblePaneEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCollapsiblePaneEventFunction, &func)
 
 #define EVT_COLLAPSIBLEPANE_CHANGED(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn))
 
 
-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/collpane.h"
 #else
     #include "wx/generic/collpaneg.h"
diff --git a/Source/3rd Party/wx/include/wx/colordlg.h b/Source/3rd Party/wx/include/wx/colordlg.h
index 19a3f3084..f17192078 100644
--- a/Source/3rd Party/wx/include/wx/colordlg.h	
+++ b/Source/3rd Party/wx/include/wx/colordlg.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/colordlg.h
+// Name:        wx/colrdlgg.h
 // Purpose:     wxColourDialog
 // Author:      Vadim Zeitiln
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: colordlg.h 36623 2006-01-02 14:26:36Z JS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,14 +16,14 @@
 
 #if wxUSE_COLOURDLG
 
-#include "wx/colourdata.h"
-
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/colordlg.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
-    #include "wx/osx/colordlg.h"
+    #include "wx/mac/colordlg.h"
 #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/colordlg.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/colordlg.h"
 #else
     #include "wx/generic/colrdlgg.h"
 
@@ -31,10 +31,9 @@
 #endif
 
 // get the colour from user and return it
-WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL,
-                                              const wxColour& colInit = wxNullColour,
-                                              const wxString& caption = wxEmptyString,
-                                              wxColourData *data = NULL);
+wxColour WXDLLEXPORT
+wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
+                    const wxColour& colInit = wxNullColour, const wxString& caption = wxEmptyString);
 
 #endif // wxUSE_COLOURDLG
 
diff --git a/Source/3rd Party/wx/include/wx/colour.h b/Source/3rd Party/wx/include/wx/colour.h
index da30f5a04..66c45e772 100644
--- a/Source/3rd Party/wx/include/wx/colour.h	
+++ b/Source/3rd Party/wx/include/wx/colour.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Francesco Montorsi
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: colour.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,46 +15,38 @@
 #include "wx/defs.h"
 #include "wx/gdiobj.h"
 
+
 class WXDLLIMPEXP_FWD_CORE wxColour;
 
-// A macro to define the standard wxColour constructors:
-//
-// It avoids the need to repeat these lines across all colour.h files, since
-// Set() is a virtual function and thus cannot be called by wxColourBase ctors
+// the standard wxColour constructors;
+// this macro avoids to repeat these lines across all colour.h files, since
+// Set() is a virtual function and thus cannot be called by wxColourBase
+// constructors
 #define DEFINE_STD_WXCOLOUR_CONSTRUCTORS                                      \
-    wxColour() { Init(); }                                                    \
-    wxColour(ChannelType red,                                                 \
-             ChannelType green,                                               \
-             ChannelType blue,                                                \
-             ChannelType alpha = wxALPHA_OPAQUE)                              \
-        { Init(); Set(red, green, blue, alpha); }                             \
-    wxColour(unsigned long colRGB) { Init(); Set(colRGB    ); }               \
-    wxColour(const wxString& colourName) { Init(); Set(colourName); }         \
-    wxColour(const char *colourName) { Init(); Set(colourName); }             \
-    wxColour(const wchar_t *colourName) { Init(); Set(colourName); }
+    wxColour( ChannelType red, ChannelType green, ChannelType blue,           \
+              ChannelType alpha = wxALPHA_OPAQUE )                            \
+        { Set(red, green, blue, alpha); }                                     \
+    wxColour( unsigned long colRGB ) { Set(colRGB); }                         \
+    wxColour(const wxString &colourName) { Set(colourName); }                 \
+    wxColour(const wxChar *colourName) { Set(colourName); }
 
 
 // flags for wxColour -> wxString conversion (see wxColour::GetAsString)
-enum {
-    wxC2S_NAME             = 1,   // return colour name, when possible
-    wxC2S_CSS_SYNTAX       = 2,   // return colour in rgb(r,g,b) syntax
-    wxC2S_HTML_SYNTAX      = 4    // return colour in #rrggbb syntax
-};
+#define wxC2S_NAME              1   // return colour name, when possible
+#define wxC2S_CSS_SYNTAX        2   // return colour in rgb(r,g,b) syntax
+#define wxC2S_HTML_SYNTAX       4   // return colour in #rrggbb syntax
+
 
 const unsigned char wxALPHA_TRANSPARENT = 0;
 const unsigned char wxALPHA_OPAQUE = 0xff;
 
-// a valid but fully transparent colour
-#define wxTransparentColour wxColour(0, 0, 0, wxALPHA_TRANSPARENT)
-#define wxTransparentColor wxTransparentColour
-
 // ----------------------------------------------------------------------------
 // wxVariant support
 // ----------------------------------------------------------------------------
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
-DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
 #endif
 
 //-----------------------------------------------------------------------------
@@ -62,22 +54,7 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLIMPEXP_CORE)
 //               code redundancy in all native wxColour implementations
 //-----------------------------------------------------------------------------
 
-/*  Transition from wxGDIObject to wxObject is incomplete.  If your port does
-    not need the wxGDIObject machinery to handle colors, please add it to the
-    list of ports which do not need it.
- */
-#if defined( __WXMAC__ ) || defined( __WXMSW__ ) || defined( __WXPM__ ) || defined( __WXCOCOA__ )
-#define wxCOLOUR_IS_GDIOBJECT 0
-#else
-#define wxCOLOUR_IS_GDIOBJECT 1
-#endif
-
-class WXDLLIMPEXP_CORE wxColourBase : public
-#if wxCOLOUR_IS_GDIOBJECT
-    wxGDIObject
-#else
-    wxObject
-#endif
+class WXDLLEXPORT wxColourBase : public wxGDIObject
 {
 public:
     // type of a single colour component
@@ -94,9 +71,12 @@ public:
              ChannelType green,
              ChannelType blue,
              ChannelType alpha = wxALPHA_OPAQUE)
-        { InitRGBA(red, green, blue, alpha); }
+        { InitRGBA(red,green,blue, alpha); }
 
     // implemented in colourcmn.cpp
+    bool Set(const wxChar *str)
+        { return FromString(str); }
+
     bool Set(const wxString &str)
         { return FromString(str); }
 
@@ -114,6 +94,9 @@ public:
     // accessors
     // ---------
 
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;
+
     virtual ChannelType Red() const = 0;
     virtual ChannelType Green() const = 0;
     virtual ChannelType Blue() const = 0;
@@ -123,97 +106,28 @@ public:
     // implemented in colourcmn.cpp
     virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const;
 
-    void SetRGB(wxUint32 colRGB)
-    {
-        Set((ChannelType)(0xFF & colRGB),
-            (ChannelType)(0xFF & (colRGB >> 8)),
-            (ChannelType)(0xFF & (colRGB >> 16)));
-    }
 
-    void SetRGBA(wxUint32 colRGBA)
-    {
-        Set((ChannelType)(0xFF & colRGBA),
-            (ChannelType)(0xFF & (colRGBA >> 8)),
-            (ChannelType)(0xFF & (colRGBA >> 16)),
-            (ChannelType)(0xFF & (colRGBA >> 24)));
-    }
-
-    wxUint32 GetRGB() const
-        { return Red() | (Green() << 8) | (Blue() << 16); }
-
-    wxUint32 GetRGBA() const
-        { return Red() | (Green() << 8) | (Blue() << 16) | (Alpha() << 24); }
-
-#if !wxCOLOUR_IS_GDIOBJECT
-    virtual bool IsOk() const= 0;
-
-    // older version, for backwards compatibility only (but not deprecated
-    // because it's still widely used)
-    bool Ok() const { return IsOk(); }
-#endif
-
-    // manipulation
-    // ------------
-
-    // These methods are static because they are mostly used
-    // within tight loops (where we don't want to instantiate wxColour's)
-
-    static void          MakeMono    (unsigned char* r, unsigned char* g, unsigned char* b, bool on);
-    static void          MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char brightness = 255);
-    static void          MakeGrey    (unsigned char* r, unsigned char* g, unsigned char* b); // integer version
-    static void          MakeGrey    (unsigned char* r, unsigned char* g, unsigned char* b,
-                                      double weight_r, double weight_g, double weight_b); // floating point version
-    static unsigned char AlphaBlend  (unsigned char fg, unsigned char bg, double alpha);
-    static void          ChangeLightness(unsigned char* r, unsigned char* g, unsigned char* b, int ialpha);
-
-    wxColour ChangeLightness(int ialpha) const;
 
     // old, deprecated
     // ---------------
 
 #if WXWIN_COMPATIBILITY_2_6
-    static wxDEPRECATED( wxColour CreateByName(const wxString& name) );
+    wxDEPRECATED( static wxColour CreateByName(const wxString& name) );
     wxDEPRECATED( void InitFromName(const wxString& col) );
 #endif
 
 protected:
-    // Some ports need Init() and while we don't, provide a stub so that the
-    // ports which don't need it are not forced to define it
-    void Init() { }
-
     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) = 0;
 
-    virtual bool FromString(const wxString& s);
-
-#if wxCOLOUR_IS_GDIOBJECT
-    // wxColour doesn't use reference counted data (at least not in all ports)
-    // so provide stubs for the functions which need to be defined if we do use
-    // them
-    virtual wxGDIRefData *CreateGDIRefData() const
-    {
-        wxFAIL_MSG( "must be overridden if used" );
-
-        return NULL;
-    }
-
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
-    {
-        wxFAIL_MSG( "must be overridden if used" );
-
-        return NULL;
-    }
-#endif
+    virtual bool FromString(const wxChar *s);
 };
 
 
-// wxColour <-> wxString utilities, used by wxConfig, defined in colourcmn.cpp
-WXDLLIMPEXP_CORE wxString wxToString(const wxColourBase& col);
-WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
 
-
-
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+    #include "wx/generic/colour.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/colour.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/colour.h"
@@ -221,12 +135,14 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
     #include "wx/gtk/colour.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/colour.h"
+#elif defined(__WXMGL__)
+    #include "wx/generic/colour.h"
 #elif defined(__WXDFB__)
     #include "wx/generic/colour.h"
 #elif defined(__WXX11__)
     #include "wx/x11/colour.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/colour.h"
+    #include "wx/mac/colour.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/colour.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/colourdata.h b/Source/3rd Party/wx/include/wx/colourdata.h
deleted file mode 100644
index a3a03d0ab..000000000
--- a/Source/3rd Party/wx/include/wx/colourdata.h	
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/colourdata.h
-// Author:      Julian Smart
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COLOURDATA_H_
-#define _WX_COLOURDATA_H_
-
-#include "wx/colour.h"
-
-class WXDLLIMPEXP_CORE wxColourData : public wxObject
-{
-public:
-    // number of custom colours we store
-    enum
-    {
-        NUM_CUSTOM = 16
-    };
-
-    wxColourData();
-    wxColourData(const wxColourData& data);
-    wxColourData& operator=(const wxColourData& data);
-    virtual ~wxColourData();
-
-    void SetChooseFull(bool flag) { m_chooseFull = flag; }
-    bool GetChooseFull() const { return m_chooseFull; }
-    void SetColour(const wxColour& colour) { m_dataColour = colour; }
-    const wxColour& GetColour() const { return m_dataColour; }
-    wxColour& GetColour() { return m_dataColour; }
-
-    // SetCustomColour() modifies colours in an internal array of NUM_CUSTOM
-    // custom colours;
-    void SetCustomColour(int i, const wxColour& colour);
-    wxColour GetCustomColour(int i) const;
-
-    // Serialize the object to a string and restore it from it
-    wxString ToString() const;
-    bool FromString(const wxString& str);
-
-
-    // public for backwards compatibility only: don't use directly
-    wxColour        m_dataColour;
-    wxColour        m_custColours[NUM_CUSTOM];
-    bool            m_chooseFull;
-
-    DECLARE_DYNAMIC_CLASS(wxColourData)
-};
-
-#endif // _WX_COLOURDATA_H_
diff --git a/Source/3rd Party/wx/include/wx/combo.h b/Source/3rd Party/wx/include/wx/combo.h
index 6b1a76344..2e5593d72 100644
--- a/Source/3rd Party/wx/include/wx/combo.h	
+++ b/Source/3rd Party/wx/include/wx/combo.h	
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: combo.h 64412 2010-05-27 15:11:58Z JMS $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -45,7 +45,6 @@
 #include "wx/control.h"
 #include "wx/renderer.h" // this is needed for wxCONTROL_XXX flags
 #include "wx/bitmap.h" // wxBitmap used by-value
-#include "wx/textentry.h"
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 class WXDLLIMPEXP_FWD_CORE wxComboPopup;
@@ -87,8 +86,8 @@ enum
     wxCC_IFLAG_CREATED              = 0x0100,
     // Internal use: really put button outside
     wxCC_IFLAG_BUTTON_OUTSIDE       = 0x0200,
-    // Internal use: SetMargins has been successfully called
-    wxCC_IFLAG_LEFT_MARGIN_SET      = 0x0400,
+    // Internal use: SetTextIndent has been called
+    wxCC_IFLAG_INDENT_SET           = 0x0400,
     // Internal use: Set wxTAB_TRAVERSAL to parent when popup is dismissed
     wxCC_IFLAG_PARENT_TAB_TRAVERSAL = 0x0800,
     // Internal use: Secondary popup window type should be used (if available).
@@ -120,8 +119,7 @@ struct wxComboCtrlFeatures
         BitmapButton        = 0x0002, // Button may be replaced with bitmap
         ButtonSpacing       = 0x0004, // Button can have spacing from the edge
                                       // of the control
-        TextIndent          = 0x0008, // SetMargins can be used to control
-                                      // left margin.
+        TextIndent          = 0x0008, // SetTextIndent can be used
         PaintControl        = 0x0010, // Combo control itself can be custom painted
         PaintWritable       = 0x0020, // A variable-width area in front of writable
                                       // combo control's textctrl can be custom
@@ -140,14 +138,12 @@ struct wxComboCtrlFeatures
 };
 
 
-class WXDLLIMPEXP_CORE wxComboCtrlBase : public wxControl,
-                                         public wxTextEntry
+class WXDLLEXPORT wxComboCtrlBase : public wxControl
 {
     friend class wxComboPopup;
-    friend class wxComboPopupEvtHandler;
 public:
     // ctors and such
-    wxComboCtrlBase() : wxControl(), wxTextEntry() { Init(); }
+    wxComboCtrlBase() : wxControl() { Init(); }
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -160,19 +156,9 @@ public:
 
     virtual ~wxComboCtrlBase();
 
-    // Show/hide popup window (wxComboBox-compatible methods)
-    virtual void Popup();
-    virtual void Dismiss()
-    {
-        HidePopup(true);
-    }
-
-    // Show/hide popup window.
-    // TODO: Maybe deprecate in favor of Popup()/Dismiss().
-    //       However, these functions are still called internally
-    //       so it is not straightforward.
+    // show/hide popup window
     virtual void ShowPopup();
-    virtual void HidePopup(bool generateEvent=false);
+    virtual void HidePopup();
 
     // Override for totally custom combo action
     virtual void OnButtonClick();
@@ -208,56 +194,26 @@ public:
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
     virtual bool SetFont(const wxFont& font);
+#if wxUSE_VALIDATORS
+    virtual void SetValidator(const wxValidator &validator);
+    virtual wxValidator *GetValidator();
+#endif // wxUSE_VALIDATORS
 
-    //
-    // wxTextEntry methods
-    //
-    // NB: We basically need to override all of them because there is
-    //     no guarantee how platform-specific wxTextEntry is implemented.
-    //
-    virtual void SetValue(const wxString& value)
-        { wxTextEntryBase::SetValue(value); }
-    virtual void ChangeValue(const wxString& value)
-        { wxTextEntryBase::ChangeValue(value); }
-
-    virtual void WriteText(const wxString& text);
-    virtual void AppendText(const wxString& text)
-        { wxTextEntryBase::AppendText(text); }
-
-    virtual wxString GetValue() const
-        { return wxTextEntryBase::GetValue(); }
-
-    virtual wxString GetRange(long from, long to) const
-        { return wxTextEntryBase::GetRange(from, to); }
-
-    // Replace() and DoSetValue() need to be fully re-implemented since
-    // EventSuppressor utility class does not work with the way
-    // wxComboCtrl is implemented.
-    virtual void Replace(long from, long to, const wxString& value);
-
-    virtual void Remove(long from, long to);
-
+    // wxTextCtrl methods - for readonly combo they should return
+    // without errors.
+    virtual wxString GetValue() const;
+    virtual void SetValue(const wxString& value);
     virtual void Copy();
     virtual void Cut();
     virtual void Paste();
-
-    virtual void Undo();
-    virtual void Redo();
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
     virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
     virtual long GetLastPosition() const;
-
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);
-    virtual void GetSelection(long *from, long *to) const;
-
-    virtual bool IsEditable() const;
-    virtual void SetEditable(bool editable);
-
-    virtual bool SetHint(const wxString& hint);
-    virtual wxString GetHint() const;
+    virtual void Undo();
 
     // This method sets the text without affecting list selection
     // (ie. wxComboPopup::SetStringValue doesn't get called).
@@ -265,13 +221,7 @@ public:
 
     // This method sets value and also optionally sends EVT_TEXT
     // (needed by combo popups)
-    wxDEPRECATED( void SetValueWithEvent(const wxString& value,
-                                         bool withEvent = true) );
-
-    // Changes value of the control as if user had done it by selecting an
-    // item from a combo box drop-down list. Needs to be public so that
-    // derived popup classes can call it.
-    void SetValueByUser(const wxString& value);
+    void SetValueWithEvent(const wxString& value, bool withEvent = true);
 
     //
     // Popup customization methods
@@ -353,18 +303,19 @@ public:
                            const wxBitmap& bmpHover = wxNullBitmap,
                            const wxBitmap& bmpDisabled = wxNullBitmap );
 
-#if WXWIN_COMPATIBILITY_2_8
     //
     // This will set the space in pixels between left edge of the control and the
     // text, regardless whether control is read-only (ie. no wxTextCtrl) or not.
     // Platform-specific default can be set with value-1.
     // Remarks
     // * This method may do nothing on some native implementations.
-    wxDEPRECATED( void SetTextIndent( int indent ) );
+    void SetTextIndent( int indent );
 
     // Returns actual indentation in pixels.
-    wxDEPRECATED( wxCoord GetTextIndent() const );
-#endif
+    wxCoord GetTextIndent() const
+    {
+        return m_absIndent;
+    }
 
     // Returns area covered by the text field.
     const wxRect& GetTextRect() const
@@ -435,21 +386,14 @@ public:
     const wxBitmap& GetBitmapHover() const { return m_bmpHover; }
     const wxBitmap& GetBitmapDisabled() const { return m_bmpDisabled; }
 
-    // Set custom style flags for embedded wxTextCtrl. Usually must be used
-    // with two-step creation, before Create() call.
-    void SetTextCtrlStyle( int style );
-
     // Return internal flags
     wxUint32 GetInternalFlags() const { return m_iFlags; }
 
     // Return true if Create has finished
     bool IsCreated() const { return m_iFlags & wxCC_IFLAG_CREATED ? true : false; }
 
-    // Need to override to return text area background colour
-    wxColour GetBackgroundColour() const;
-
     // common code to be called on popup hide/dismiss
-    void OnPopupDismiss(bool generateEvent);
+    void OnPopupDismiss();
 
     // PopupShown states
     enum
@@ -467,22 +411,8 @@ public:
     // Set value returned by GetMainWindowOfCompositeControl
     void SetCtrlMainWnd( wxWindow* wnd ) { m_mainCtrlWnd = wnd; }
 
-    // This is public so we can access it from wxComboCtrlTextCtrl
-    virtual wxWindow *GetMainWindowOfCompositeControl()
-        { return m_mainCtrlWnd; }
-
 protected:
 
-    // Returns true if hint text should be drawn in the control
-    bool ShouldUseHintText(int flags = 0) const
-    {
-        return ( !m_text &&
-                 !(flags & wxCONTROL_ISSUBMENU) &&
-                 !m_valueString.length() &&
-                 m_hintText.length() &&
-                 !ShouldDrawFocus() );
-    }
-
     //
     // Override these for customization purposes
     //
@@ -490,8 +420,7 @@ protected:
     // called from wxSizeEvent handler
     virtual void OnResize() = 0;
 
-    // Return native text identation
-    // (i.e. text margin, for pure text, not textctrl)
+    // Return native text identation (for pure text, not textctrl)
     virtual wxCoord GetNativeTextIndent() const;
 
     // Called in syscolourchanged handler and base create
@@ -499,25 +428,20 @@ protected:
 
     // Creates wxTextCtrl.
     //   extraStyle: Extra style parameters
-    void CreateTextCtrl( int extraStyle );
-
-    // Called when text was changed programmatically
-    // (e.g. from WriteText())
-    void OnSetValue(const wxString& value);
+    void CreateTextCtrl( int extraStyle, const wxValidator& validator );
 
     // Installs standard input handler to combo (and optionally to the textctrl)
     void InstallInputHandlers();
 
-    // Flags for DrawButton
+    // flags for DrawButton()
     enum
     {
-        Button_PaintBackground             = 0x0001, // Paints control background below the button
-        Button_BitmapOnly                  = 0x0002  // Only paints the bitmap
+        Draw_PaintBg = 1,
+        Draw_BitmapOnly  = 2
     };
 
     // Draws dropbutton. Using wxRenderer or bitmaps, as appropriate.
-    // Flags are defined above.
-    virtual void DrawButton( wxDC& dc, const wxRect& rect, int flags = Button_PaintBackground );
+    void DrawButton( wxDC& dc, const wxRect& rect, int flags = Draw_PaintBg );
 
     // Call if cursor is on button area or mouse is captured for the button.
     //bool HandleButtonMouseEvent( wxMouseEvent& event, bool isInside );
@@ -543,10 +467,6 @@ protected:
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
 
-    // also set the embedded wxTextCtrl colours
-    virtual bool SetForegroundColour(const wxColour& colour);
-    virtual bool SetBackgroundColour(const wxColour& colour);
-
     // NULL popup can be used to indicate default in a derived class
     virtual void DoSetPopupControl(wxComboPopup* popup);
 
@@ -560,8 +480,7 @@ protected:
 
     // Standard textctrl positioning routine. Just give it platform-dependant
     // textctrl coordinate adjustment.
-    virtual void PositionTextCtrl( int textCtrlXAdjust = 0,
-                                   int textCtrlYAdjust = 0);
+    void PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust );
 
     // event handlers
     void OnSizeEvent( wxSizeEvent& event );
@@ -570,7 +489,6 @@ protected:
     void OnTextCtrlEvent(wxCommandEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
     void OnKeyEvent(wxKeyEvent& event);
-    void OnCharEvent(wxKeyEvent& event);
 
     // Set customization flags (directs how wxComboCtrlBase helpers behave)
     void Customize( wxUint32 flags ) { m_iFlags |= flags; }
@@ -599,21 +517,12 @@ protected:
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif
 
-    // protected wxTextEntry methods
-    virtual void DoSetValue(const wxString& value, int flags);
-    virtual wxString DoGetValue() const;
-    virtual wxWindow *GetEditableWindow() { return this; }
-
-    // margins functions
-    virtual bool DoSetMargins(const wxPoint& pt);
-    virtual wxPoint DoGetMargins() const;
+    virtual wxWindow *GetMainWindowOfCompositeControl()
+        { return m_mainCtrlWnd; }
 
     // This is used when m_text is hidden (readonly).
     wxString                m_valueString;
 
-    // This is used when control is unfocused and m_valueString is empty
-    wxString                m_hintText;
-
     // the text control and button we show all the time
     wxTextCtrl*             m_text;
     wxWindow*               m_btn;
@@ -634,7 +543,7 @@ protected:
     wxEvtHandler*           m_toplevEvtHandler;
 
     // this is for the control in popup
-    wxEvtHandler*           m_popupEvtHandler;
+    wxEvtHandler*           m_popupExtraHandler;
 
     // this is for the popup window
     wxEvtHandler*           m_popupWinEvtHandler;
@@ -642,7 +551,7 @@ protected:
     // main (ie. topmost) window of a composite control (default = this)
     wxWindow*               m_mainCtrlWnd;
 
-    // used to prevent immediate re-popupping in case closed popup
+    // used to prevent immediate re-popupping incase closed popup
     // by clicking on the combo control (needed because of inconsistent
     // transient implementation across platforms).
     wxLongLong              m_timeCanAcceptClick;
@@ -662,8 +571,8 @@ protected:
     // selection indicator.
     wxCoord                 m_widthCustomPaint;
 
-    // left margin, in pixels
-    wxCoord                 m_marginLeft;
+    // absolute text indentation, in pixels
+    wxCoord                 m_absIndent;
 
     // side on which the popup is aligned
     int                     m_anchorSide;
@@ -675,9 +584,6 @@ protected:
     wxRect                  m_tcArea;
     wxRect                  m_btnArea;
 
-    // Colour of the text area, in case m_text is NULL
-    wxColour                m_tcBgCol;
-
     // current button state (uses renderer flags)
     int                     m_btnState;
 
@@ -702,9 +608,6 @@ protected:
     // platform-dependant customization and other flags
     wxUint32                m_iFlags;
 
-    // custom style for m_text
-    int                     m_textCtrlStyle;
-
     // draw blank button background under bitmap?
     bool                    m_blankButtonBg;
 
@@ -713,10 +616,7 @@ protected:
 
     // should the focus be reset to the textctrl in idle time?
     bool                    m_resetFocus;
-
-    // is the text-area background colour overridden?
-    bool                    m_hasTcBgCol;
-
+    
 private:
     void Init();
 
@@ -743,16 +643,14 @@ enum
     wxCP_IFLAG_CREATED      = 0x0001 // Set by wxComboCtrlBase after Create is called
 };
 
-class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
 
-
-class WXDLLIMPEXP_CORE wxComboPopup
+class WXDLLEXPORT wxComboPopup
 {
     friend class wxComboCtrlBase;
 public:
     wxComboPopup()
     {
-        m_combo = NULL;
+        m_combo = (wxComboCtrlBase*) NULL;
         m_iFlags = 0;
     }
 
@@ -768,13 +666,6 @@ public:
     // Return true for success.
     virtual bool Create(wxWindow* parent) = 0;
 
-    // Calls Destroy() for the popup control (i.e. one returned by
-    // GetControl()) and makes sure that 'this' is deleted at the end.
-    // Default implementation works for both cases where popup control
-    // class is multiple inherited or created on heap as a separate
-    // object.
-    virtual void DestroyPopup();
-
     // We must have an associated control which is subclassed by the combobox.
     virtual wxWindow *GetControl() = 0;
 
@@ -791,25 +682,14 @@ public:
     // Gets displayed string representation of the value.
     virtual wxString GetStringValue() const = 0;
 
-    // Called to check if the popup - when an item container - actually
-    // has matching item. Case-sensitivity checking etc. is up to the
-    // implementation. If the found item matched the string, but is
-    // different, it should be written back to pItem. Default implementation
-    // always return true and does not alter trueItem.
-    virtual bool FindItem(const wxString& item, wxString* trueItem=NULL);
-
     // This is called to custom paint in the combo control itself (ie. not the popup).
     // Default implementation draws value as string.
     virtual void PaintComboControl( wxDC& dc, const wxRect& rect );
 
-    // Receives wxEVT_KEY_DOWN key events from the parent wxComboCtrl.
+    // Receives key events from the parent wxComboCtrl.
     // Events not handled should be skipped, as usual.
     virtual void OnComboKeyEvent( wxKeyEvent& event );
 
-    // Receives wxEVT_CHAR key events from the parent wxComboCtrl.
-    // Events not handled should be skipped, as usual.
-    virtual void OnComboCharEvent( wxKeyEvent& event );
-
     // Implement if you need to support special action when user
     // double-clicks on the parent wxComboCtrl.
     virtual void OnComboDoubleClick();
@@ -840,9 +720,6 @@ public:
         return (m_iFlags & wxCP_IFLAG_CREATED) ? true : false;
     }
 
-    // Returns pointer to the associated parent wxComboCtrl.
-    wxComboCtrl* GetComboCtrl() const;
-
     // Default PaintComboControl behaviour
     static void DefaultPaintComboControl( wxComboCtrlBase* combo,
                                           wxDC& dc,
diff --git a/Source/3rd Party/wx/include/wx/combobox.h b/Source/3rd Party/wx/include/wx/combobox.h
index 89b9c1357..af84fb668 100644
--- a/Source/3rd Party/wx/include/wx/combobox.h	
+++ b/Source/3rd Party/wx/include/wx/combobox.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     24.12.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: combobox.h 42727 2006-10-30 16:04:27Z VZ $
 // Copyright:   (c) 1996-2000 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,54 +16,57 @@
 
 #if wxUSE_COMBOBOX
 
-// For compatibility with 2.8 include this header to allow using wxTE_XXX
-// styles with wxComboBox without explicitly including it in the user code.
-#include "wx/textctrl.h"
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxComboBoxBase: this interface defines the methods wxComboBox must implement
 // ----------------------------------------------------------------------------
 
+#include "wx/textctrl.h"
 #include "wx/ctrlsub.h"
-#include "wx/textentry.h"
 
-class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer,
-                                        public wxTextEntry
+class WXDLLEXPORT wxComboBoxBase : public wxItemContainer
 {
 public:
-    // override these methods to disambiguate between two base classes versions
-    virtual void Clear()
-    {
-        wxTextEntry::Clear();
-        wxItemContainer::Clear();
-    }
+    // wxTextCtrl-like methods wxComboBox must implement
+    virtual wxString GetValue() const = 0;
+    virtual void SetValue(const wxString& value) = 0;
 
-    // IsEmpty() is ambiguous because we inherit it from both wxItemContainer
-    // and wxTextEntry, and even if defined it here to help the compiler with
-    // choosing one of them, it would still be confusing for the human users of
-    // this class. So instead define the clearly named methods below and leave
-    // IsEmpty() ambiguous to trigger a compilation error if it's used.
-    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
-    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
+    virtual void Copy() = 0;
+    virtual void Cut() = 0;
+    virtual void Paste() = 0;
+    virtual void SetInsertionPoint(long pos) = 0;
+    virtual long GetInsertionPoint() const = 0;
+    virtual wxTextPos GetLastPosition() const = 0;
+    virtual void Replace(long from, long to, const wxString& value) = 0;
+    virtual void SetSelection(long from, long to) = 0;
+    virtual void SetEditable(bool editable) = 0;
 
-    // also bring in GetSelection() versions of both base classes in scope
-    //
-    // NB: GetSelection(from, to) could be already implemented in wxTextEntry
-    //     but still make it pure virtual because for some platforms it's not
-    //     implemented there and also because the derived class has to override
-    //     it anyhow to avoid ambiguity with the other GetSelection()
-    virtual int GetSelection() const = 0;
-    virtual void GetSelection(long *from, long *to) const = 0;
+    virtual void SetInsertionPointEnd()
+        { SetInsertionPoint(GetLastPosition()); }
+    virtual void Remove(long from, long to)
+        { Replace(from, to, wxEmptyString); }
 
-    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
-    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
+    virtual bool IsEditable() const = 0;
+
+    virtual void Undo() = 0;
+    virtual void Redo() = 0;
+    virtual void SelectAll() = 0;
+
+    virtual bool CanCopy() const = 0;
+    virtual bool CanCut() const = 0;
+    virtual bool CanPaste() const = 0;
+    virtual bool CanUndo() const = 0;
+    virtual bool CanRedo() const = 0;
 
     // may return value different from GetSelection() when the combobox
     // dropdown is shown and the user selected, but not yet accepted, a value
     // different from the old one in it
     virtual int GetCurrentSelection() const { return GetSelection(); }
+
+    // redeclare inherited SetSelection() overload here as well to avoid
+    // virtual function hiding
+    virtual void SetSelection(int n) = 0;
 };
 
 // ----------------------------------------------------------------------------
@@ -81,7 +84,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/combobox.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/combobox.h"
+    #include "wx/mac/combobox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/combobox.h"
 #elif defined(__WXPM__)
@@ -90,4 +93,5 @@ public:
 
 #endif // wxUSE_COMBOBOX
 
-#endif // _WX_COMBOBOX_H_BASE_
+#endif
+    // _WX_COMBOBOX_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/compositewin.h b/Source/3rd Party/wx/include/wx/compositewin.h
deleted file mode 100644
index dc8ea0e9d..000000000
--- a/Source/3rd Party/wx/include/wx/compositewin.h	
+++ /dev/null
@@ -1,230 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/compositewin.h
-// Purpose:     wxCompositeWindow<> declaration
-// Author:      Vadim Zeitlin
-// Created:     2011-01-02
-// RCS-ID:      $Id$
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COMPOSITEWIN_H_
-#define _WX_COMPOSITEWIN_H_
-
-#include "wx/window.h"
-#include "wx/containr.h"
-
-class WXDLLIMPEXP_FWD_CORE wxToolTip;
-
-// NB: This is an experimental and, as for now, undocumented class used only by
-//     wxWidgets itself internally. Don't use it in your code until its API is
-//     officially stabilized unless you are ready to change it with the next
-//     wxWidgets release.
-
-// ----------------------------------------------------------------------------
-// wxCompositeWindow is a helper for implementing composite windows: to define
-// a class using subwindows, simply inherit from it specialized with the real
-// base class name and implement GetCompositeWindowParts() pure virtual method.
-// ----------------------------------------------------------------------------
-
-// The template parameter W must be a wxWindow-derived class.
-template <class W>
-class wxCompositeWindow : public W
-{
-public:
-    typedef W BaseWindowClass;
-
-    // Default ctor doesn't do anything.
-    wxCompositeWindow()
-    {
-        this->Connect
-              (
-                  wxEVT_CREATE,
-                  wxWindowCreateEventHandler(wxCompositeWindow::OnWindowCreate)
-              );
-
-    }
-
-#ifndef __VISUALC6__
-    // FIXME-VC6: This compiler can't compile DoSetForAllParts() template function,
-    // it can't determine whether the deduced type should be "T" or "const T&". And
-    // without this function wxCompositeWindow is pretty useless so simply disable
-    // this code for it, this does mean that setting colours/fonts/... for
-    // composite controls won't work in the library compiled with it but so far
-    // this only affects the generic wxDatePickerCtrl which is not used by default
-    // under MSW anyhow so it doesn't seem to be worth it to spend time and uglify
-    // the code to fix it.
-
-    // Override all wxWindow methods which must be forwarded to the composite
-    // window parts.
-
-    // Attribute setters group.
-    //
-    // NB: Unfortunately we can't factor out the call for the setter itself
-    //     into DoSetForAllParts() because we can't call the function passed to
-    //     it non-virtually and we need to do this to avoid infinite recursion,
-    //     so we work around this by calling the method of this object itself
-    //     manually in each function.
-    virtual bool SetForegroundColour(const wxColour& colour)
-    {
-        if ( !BaseWindowClass::SetForegroundColour(colour) )
-            return false;
-
-        SetForAllParts(&wxWindowBase::SetForegroundColour, colour);
-
-        return true;
-    }
-
-    virtual bool SetBackgroundColour(const wxColour& colour)
-    {
-        if ( !BaseWindowClass::SetBackgroundColour(colour) )
-            return false;
-
-        SetForAllParts(&wxWindowBase::SetBackgroundColour, colour);
-
-        return true;
-    }
-
-    virtual bool SetFont(const wxFont& font)
-    {
-        if ( !BaseWindowClass::SetFont(font) )
-            return false;
-
-        SetForAllParts(&wxWindowBase::SetFont, font);
-
-        return true;
-    }
-
-    virtual bool SetCursor(const wxCursor& cursor)
-    {
-        if ( !BaseWindowClass::SetCursor(cursor) )
-            return false;
-
-        SetForAllParts(&wxWindowBase::SetCursor, cursor);
-
-        return true;
-    }
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip(wxToolTip *tip)
-    {
-        BaseWindowClass::DoSetToolTip(tip);
-
-        SetForAllParts(&wxWindowBase::CopyToolTip, tip);
-    }
-#endif // wxUSE_TOOLTIPS
-
-#endif // !__VISUALC6__
-
-    virtual void SetFocus()
-    {
-        wxSetFocusToChild(this, NULL);
-    }
-
-private:
-    // Must be implemented by the derived class to return all children to which
-    // the public methods we override should forward to.
-    virtual wxWindowList GetCompositeWindowParts() const = 0;
-
-    void OnWindowCreate(wxWindowCreateEvent& event)
-    {
-        event.Skip();
-
-        // Attach a few event handlers to all parts of the composite window.
-        // This makes the composite window behave more like a simple control
-        // and allows other code (such as wxDataViewCtrl's inline editing
-        // support) to hook into its event processing.
-
-        wxWindow *child = event.GetWindow();
-        if ( child == this )
-            return; // not a child, we don't want to Connect() to ourselves
-
-        // Always capture wxEVT_KILL_FOCUS:
-        child->Connect(wxEVT_KILL_FOCUS,
-                       wxFocusEventHandler(wxCompositeWindow::OnKillFocus),
-                       NULL, this);
-
-        // Some events should be only handled for non-toplevel children. For
-        // example, we want to close the control in wxDataViewCtrl when Enter
-        // is pressed in the inline editor, but not when it's pressed in a
-        // popup dialog it opens.
-        wxWindow *win = child;
-        while ( win && win != this )
-        {
-            if ( win->IsTopLevel() )
-                return;
-            win = win->GetParent();
-        }
-
-        child->Connect(wxEVT_CHAR,
-                       wxKeyEventHandler(wxCompositeWindow::OnChar),
-                       NULL, this);
-    }
-
-    void OnChar(wxKeyEvent& event)
-    {
-        if ( !this->ProcessWindowEvent(event) )
-            event.Skip();
-    }
-
-    void OnKillFocus(wxFocusEvent& event)
-    {
-        // Ignore focus changes within the composite control:
-        wxWindow *win = event.GetWindow();
-        while ( win )
-        {
-            if ( win == this )
-            {
-                event.Skip();
-                return;
-            }
-
-            // Note that we don't use IsTopLevel() check here, because we do
-            // want to ignore focus changes going to toplevel window that have
-            // the composite control as its parent; these would typically be
-            // some kind of control's popup window.
-            win = win->GetParent();
-        }
-
-        // The event shouldn't be ignored, forward it to the main control:
-        if ( !this->ProcessWindowEvent(event) )
-            event.Skip();
-    }
-
-#ifndef __VISUALC6__
-    template <class T>
-    void SetForAllParts(bool (wxWindowBase::*func)(const T&), const T& arg)
-    {
-        DoSetForAllParts<const T&>(func, arg);
-    }
-
-    template <class T>
-    void SetForAllParts(bool (wxWindowBase::*func)(T*), T* arg)
-    {
-        DoSetForAllParts<T*>(func, arg);
-    }
-
-    template <class T>
-    void DoSetForAllParts(bool (wxWindowBase::*func)(T), T arg)
-    {
-        // Simply call the setters for all parts of this composite window.
-        const wxWindowList parts = GetCompositeWindowParts();
-        for ( wxWindowList::const_iterator i = parts.begin();
-              i != parts.end();
-              ++i )
-        {
-            wxWindow * const child = *i;
-
-            // Allow NULL elements in the list, this makes the code of derived
-            // composite controls which may have optionally shown children
-            // simpler and it doesn't cost us much here.
-            if ( child )
-                (child->*func)(arg);
-        }
-    }
-#endif // !__VISUALC6__
-
-    wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCompositeWindow, W);
-};
-
-#endif // _WX_COMPOSITEWIN_H_
diff --git a/Source/3rd Party/wx/include/wx/confbase.h b/Source/3rd Party/wx/include/wx/confbase.h
index 2e17338bc..2e0197dce 100644
--- a/Source/3rd Party/wx/include/wx/confbase.h	
+++ b/Source/3rd Party/wx/include/wx/confbase.h	
@@ -1,23 +1,21 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/confbase.h
+// Name:        confbase.h
 // Purpose:     declaration of the base class of all config implementations
 //              (see also: fileconf.h and msw/regconf.h and iniconf.h)
 // Author:      Karsten Ballueder & Vadim Zeitlin
 // Modified by:
 // Created:     07.04.98 (adapted from appconf.h)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: confbase.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1997 Karsten Ballueder   Ballueder@usa.net
 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_CONFBASE_H_
-#define _WX_CONFBASE_H_
+#ifndef   _WX_CONFBASE_H_
+#define   _WX_CONFBASE_H_
 
 #include "wx/defs.h"
 #include "wx/string.h"
-#include "wx/object.h"
-#include "wx/base64.h"
 
 class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
@@ -43,6 +41,8 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 #if wxUSE_CONFIG
 
+#include "wx/string.h"
+
 /// should we use registry instead of configuration files under Windows?
 // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
 //  false) or wxRegConfig (if it's true and we're under Win32))
@@ -50,15 +50,6 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
   #define wxUSE_CONFIG_NATIVE 1
 #endif
 
-// not all compilers can deal with template Read/Write() methods, define this
-// symbol if the template functions are available
-#if (!defined(__VISUALC__) || __VISUALC__ > 1200) && \
-    !defined( __VMS ) && \
-    !(defined(__HP_aCC) && defined(__hppa)) && \
-    !defined (__DMC__)
-    #define wxHAS_CONFIG_TEMPLATE_RW
-#endif
-
 // Style flags for constructor style parameter
 enum
 {
@@ -81,7 +72,7 @@ enum
 // (long) type (TODO doubles and other types such as wxDate coming soon).
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxConfigBase : public wxObject
+class WXDLLIMPEXP_BASE wxConfigBase
 {
 public:
   // constants
@@ -173,7 +164,7 @@ public:
   bool Read(const wxString& key, long *pl) const;
   bool Read(const wxString& key, long *pl, long defVal) const;
 
-    // read an int (wrapper around `long' version)
+    // read an int
   bool Read(const wxString& key, int *pi) const;
   bool Read(const wxString& key, int *pi, int defVal) const;
 
@@ -181,138 +172,39 @@ public:
   bool Read(const wxString& key, double* val) const;
   bool Read(const wxString& key, double* val, double defVal) const;
 
-    // read a float
-  bool Read(const wxString& key, float* val) const;
-  bool Read(const wxString& key, float* val, float defVal) const;
-
     // read a bool
   bool Read(const wxString& key, bool* val) const;
   bool Read(const wxString& key, bool* val, bool defVal) const;
 
-#if wxUSE_BASE64
-    // read a binary data block
-  bool Read(const wxString& key, wxMemoryBuffer* data) const
-    { return DoReadBinary(key, data); }
-   // no default version since it does not make sense for binary data
-#endif // wxUSE_BASE64
-
-#ifdef wxHAS_CONFIG_TEMPLATE_RW
-  // read other types, for which wxFromString is defined
-  template <typename T>
-  bool Read(const wxString& key, T* value) const
-  {
-      wxString s;
-      if ( !Read(key, &s) )
-          return false;
-      return wxFromString(s, value);
-  }
-
-  template <typename T>
-  bool Read(const wxString& key, T* value, const T& defVal) const
-  {
-      const bool found = Read(key, value);
-      if ( !found )
-      {
-          if (IsRecordingDefaults())
-              ((wxConfigBase *)this)->Write(key, defVal);
-          *value = defVal;
-      }
-      return found;
-  }
-#endif // wxHAS_CONFIG_TEMPLATE_RW
-
-  // convenience functions returning directly the value
+  // convenience functions returning directly the value (we don't have them for
+  // int/double/bool as there would be ambiguities with the long one then)
   wxString Read(const wxString& key,
                 const wxString& defVal = wxEmptyString) const
     { wxString s; (void)Read(key, &s, defVal); return s; }
 
-  // we have to provide a separate version for C strings as otherwise the
-  // template Read() would be used
-  wxString Read(const wxString& key, const char* defVal) const
-    { return Read(key, wxString(defVal)); }
-  wxString Read(const wxString& key, const wchar_t* defVal) const
-    { return Read(key, wxString(defVal)); }
-
-  long ReadLong(const wxString& key, long defVal) const
+  long Read(const wxString& key, long defVal) const
     { long l; (void)Read(key, &l, defVal); return l; }
 
-  double ReadDouble(const wxString& key, double defVal) const
-    { double d; (void)Read(key, &d, defVal); return d; }
-
-  bool ReadBool(const wxString& key, bool defVal) const
-    { bool b; (void)Read(key, &b, defVal); return b; }
-
-  template <typename T>
-  T ReadObject(const wxString& key, T const& defVal) const
-    { T t; (void)Read(key, &t, defVal); return t; }
-
-  // for compatibility with wx 2.8
-  long Read(const wxString& key, long defVal) const
-    { return ReadLong(key, defVal); }
-
-
-  // write the value (return true on success)
+    // write the value (return true on success)
   bool Write(const wxString& key, const wxString& value)
     { return DoWriteString(key, value); }
 
   bool Write(const wxString& key, long value)
     { return DoWriteLong(key, value); }
 
+  bool Write(const wxString& key, int value)
+    { return DoWriteInt(key, value); }
+
   bool Write(const wxString& key, double value)
     { return DoWriteDouble(key, value); }
 
   bool Write(const wxString& key, bool value)
     { return DoWriteBool(key, value); }
 
-#if wxUSE_BASE64
-  bool Write(const wxString& key, const wxMemoryBuffer& buf)
-    { return DoWriteBinary(key, buf); }
-#endif // wxUSE_BASE64
-
   // we have to provide a separate version for C strings as otherwise they
   // would be converted to bool and not to wxString as expected!
-  bool Write(const wxString& key, const char *value)
+  bool Write(const wxString& key, const wxChar *value)
     { return Write(key, wxString(value)); }
-  bool Write(const wxString& key, const unsigned char *value)
-    { return Write(key, wxString(value)); }
-  bool Write(const wxString& key, const wchar_t *value)
-    { return Write(key, wxString(value)); }
-
-
-  // we also have to provide specializations for other types which we want to
-  // handle using the specialized DoWriteXXX() instead of the generic template
-  // version below
-  bool Write(const wxString& key, char value)
-    { return DoWriteLong(key, value); }
-
-  bool Write(const wxString& key, unsigned char value)
-    { return DoWriteLong(key, value); }
-
-  bool Write(const wxString& key, short value)
-    { return DoWriteLong(key, value); }
-
-  bool Write(const wxString& key, unsigned short value)
-    { return DoWriteLong(key, value); }
-
-  bool Write(const wxString& key, unsigned int value)
-    { return DoWriteLong(key, value); }
-
-  bool Write(const wxString& key, int value)
-    { return DoWriteLong(key, value); }
-
-  bool Write(const wxString& key, unsigned long value)
-    { return DoWriteLong(key, value); }
-
-  bool Write(const wxString& key, float value)
-    { return DoWriteDouble(key, value); }
-
-  // Causes ambiguities in VC++ 6 and OpenVMS (at least)
-#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) && !defined (__DMC__))
-  // for other types, use wxToString()
-  template <typename T>
-  bool Write(const wxString& key, T const& value)
-    { return Write(key, wxToString(value)); }
-#endif
 
   // permanently writes all changes
   virtual bool Flush(bool bCurrentOnly = false) = 0;
@@ -373,19 +265,15 @@ protected:
   // do read/write the values of different types
   virtual bool DoReadString(const wxString& key, wxString *pStr) const = 0;
   virtual bool DoReadLong(const wxString& key, long *pl) const = 0;
+  virtual bool DoReadInt(const wxString& key, int *pi) const;
   virtual bool DoReadDouble(const wxString& key, double* val) const;
   virtual bool DoReadBool(const wxString& key, bool* val) const;
-#if wxUSE_BASE64
-  virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const = 0;
-#endif // wxUSE_BASE64
 
   virtual bool DoWriteString(const wxString& key, const wxString& value) = 0;
   virtual bool DoWriteLong(const wxString& key, long value) = 0;
+  virtual bool DoWriteInt(const wxString& key, int value);
   virtual bool DoWriteDouble(const wxString& key, double value);
   virtual bool DoWriteBool(const wxString& key, bool value);
-#if wxUSE_BASE64
-  virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) = 0;
-#endif // wxUSE_BASE64
 
 private:
   // are we doing automatic environment variable expansion?
@@ -403,8 +291,6 @@ private:
 
   // Style flag
   long              m_style;
-
-  DECLARE_ABSTRACT_CLASS(wxConfigBase)
 };
 
 // a handy little class which changes current path to the path of given entry
@@ -436,10 +322,22 @@ private:
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
 
-  wxDECLARE_NO_COPY_CLASS(wxConfigPathChanger);
+  DECLARE_NO_COPY_CLASS(wxConfigPathChanger)
 };
 
 
+// ----------------------------------------------------------------------------
+// the native wxConfigBase implementation
+// ----------------------------------------------------------------------------
+
+// under Windows we prefer to use the native implementation
+// wxIniConfig isn't native anywhere after droping win16 in wxWidgets 2.6
+#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
+    #define wxConfig  wxRegConfig
+#else // either we're under Unix or wish to use files even under Windows
+  #define wxConfig  wxFileConfig
+#endif
+
 #endif // wxUSE_CONFIG
 
 /*
@@ -453,7 +351,9 @@ WXDLLIMPEXP_BASE wxString wxExpandEnvVars(const wxString &sz);
 /*
   Split path into parts removing '..' in progress
  */
-WXDLLIMPEXP_BASE void wxSplitPath(wxArrayString& aParts, const wxString& path);
+WXDLLIMPEXP_BASE void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
 
-#endif // _WX_CONFBASE_H_
+
+#endif
+  // _WX_CONFIG_H_
 
diff --git a/Source/3rd Party/wx/include/wx/config.h b/Source/3rd Party/wx/include/wx/config.h
index bbc072ed0..92d036f93 100644
--- a/Source/3rd Party/wx/include/wx/config.h	
+++ b/Source/3rd Party/wx/include/wx/config.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/config.h
+// Name:        config.h
 // Purpose:     wxConfig base header
 // Author:      Julian Smart
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: config.h 60524 2009-05-05 22:51:44Z PC $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,21 +16,16 @@
 
 #if wxUSE_CONFIG
 
-// ----------------------------------------------------------------------------
-// define the native wxConfigBase implementation
-// ----------------------------------------------------------------------------
-
-// under Windows we prefer to use the native implementation but can be forced
-// to use the file-based one
-#if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE
-    #include "wx/msw/regconf.h"
-    #define wxConfig  wxRegConfig
-#elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE
-    #include "wx/os2/iniconf.h"
-    #define wxConfig wxIniConfig
-#else // either we're under Unix or wish to always use config files
-    #include "wx/fileconf.h"
-    #define wxConfig wxFileConfig
+#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
+#    ifdef __WIN32__
+#        include "wx/msw/regconf.h"
+#    else
+#        include "wx/msw/iniconf.h"
+#    endif
+#elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
+#    include "wx/palmos/prefconf.h"
+#else
+#    include "wx/fileconf.h"
 #endif
 
 #endif // wxUSE_CONFIG
diff --git a/Source/3rd Party/wx/include/wx/containr.h b/Source/3rd Party/wx/include/wx/containr.h
index d8047dc2c..0cf322c2e 100644
--- a/Source/3rd Party/wx/include/wx/containr.h	
+++ b/Source/3rd Party/wx/include/wx/containr.h	
@@ -1,94 +1,62 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/containr.h
-// Purpose:     wxControlContainer and wxNavigationEnabled declarations
+// Purpose:     wxControlContainer class declration: a "mix-in" class which
+//              implements the TAB navigation between the controls
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.08.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001, 2011 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// RCS-ID:      $Id: containr.h 50863 2007-12-20 18:32:55Z VS $
+// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CONTAINR_H_
 #define _WX_CONTAINR_H_
 
-#include "wx/defs.h"
-
-#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
-    // We need wxEVT_XXX declarations in this case.
-    #include "wx/event.h"
-#endif
-
+class WXDLLIMPEXP_FWD_CORE wxFocusEvent;
+class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 
 /*
-    This header declares wxControlContainer class however it's not a real
-    container of controls but rather just a helper used to implement TAB
-    navigation among the window children. You should rarely need to use it
-    directly, derive from the documented public wxNavigationEnabled<> class to
-    implement TAB navigation in a custom composite window.
+   Implementation note: wxControlContainer is not a real mix-in but rather
+   a class meant to be agregated with (and not inherited from). Although
+   logically it should be a mix-in, doing it like this has no advantage from
+   the point of view of the existing code but does have some problems (we'd
+   need to play tricks with event handlers which may be difficult to do
+   safely). The price we pay for this simplicity is the ugly macros below.
  */
 
 // ----------------------------------------------------------------------------
-// wxControlContainerBase: common part used in both native and generic cases
+// wxControlContainer
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxControlContainerBase
+class WXDLLEXPORT wxControlContainer
 {
 public:
-    // default ctor, SetContainerWindow() must be called later
-    wxControlContainerBase()
-    {
-        m_winParent = NULL;
+    // ctors and such
+    wxControlContainer(wxWindow *winParent = NULL);
+    void SetContainerWindow(wxWindow *winParent) { m_winParent = winParent; }
 
-        // do accept focus initially, we'll stop doing it if/when any children
-        // are added
-        m_acceptsFocus = true;
-        m_inSetFocus = false;
-        m_winLastFocused = NULL;
-    }
-    virtual ~wxControlContainerBase() {}
-
-    void SetContainerWindow(wxWindow *winParent)
-    {
-        wxASSERT_MSG( !m_winParent, wxT("shouldn't be called twice") );
-
-        m_winParent = winParent;
-    }
+    // the methods to be called from the window event handlers
+    void HandleOnNavigationKey(wxNavigationKeyEvent& event);
+    void HandleOnFocus(wxFocusEvent& event);
+    void HandleOnWindowDestroy(wxWindowBase *child);
 
     // should be called from SetFocus(), returns false if we did nothing with
     // the focus and the default processing should take place
     bool DoSetFocus();
 
-    // should be called when we decide that we should [stop] accepting focus
-    void SetCanFocus(bool acceptsFocus);
+    // can our child get the focus?
+    bool AcceptsFocus() const;
 
-    // returns whether we should accept focus ourselves or not
-    bool AcceptsFocus() const { return m_acceptsFocus; }
-
-    // returns whether we or one of our children accepts focus: we always do
-    // because if we don't have any focusable children it probably means that
-    // we're not being used as a container at all (think of wxGrid or generic
-    // wxListCtrl) and so should get focus for ourselves
-    bool AcceptsFocusRecursively() const { return true; }
-
-    // this is used to determine whether we can accept focus when Tab or
-    // another navigation key is pressed -- we alsways can, for the same reason
-    // as mentioned above for AcceptsFocusRecursively()
-    bool AcceptsFocusFromKeyboard() const { return true; }
-
-    // Call this when the number of children of the window changes.
-    // If we have any children, this panel (used just as container for
-    // them) shouldn't get focus for itself.
-    void UpdateCanFocus() { SetCanFocus(!HasAnyFocusableChildren()); }
+    // called from OnChildFocus() handler, i.e. when one of our (grand)
+    // children gets the focus
+    void SetLastFocus(wxWindow *win);
 
 protected:
     // set the focus to the child which had it the last time
-    virtual bool SetFocusToChild();
-
-    // return true if we have any children accepting focus
-    bool HasAnyFocusableChildren() const;
+    bool SetFocusToChild();
 
     // the parent window we manage the children for
     wxWindow *m_winParent;
@@ -96,256 +64,33 @@ protected:
     // the child which had the focus last time this panel was activated
     wxWindow *m_winLastFocused;
 
-private:
-    // value returned by AcceptsFocus(), should be changed using SetCanFocus()
-    // only
-    bool m_acceptsFocus;
-
     // a guard against infinite recursion
     bool m_inSetFocus;
+
+    DECLARE_NO_COPY_CLASS(wxControlContainer)
 };
 
-#ifdef wxHAS_NATIVE_TAB_TRAVERSAL
-
-// ----------------------------------------------------------------------------
-// wxControlContainer for native TAB navigation
-// ----------------------------------------------------------------------------
-
-// this must be a real class as we forward-declare it elsewhere
-class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase
-{
-protected:
-    // set the focus to the child which had it the last time
-    virtual bool SetFocusToChild();
-};
-
-#else // !wxHAS_NATIVE_TAB_TRAVERSAL
-
-// ----------------------------------------------------------------------------
-// wxControlContainer for TAB navigation implemented in wx itself
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase
-{
-public:
-    // default ctor, SetContainerWindow() must be called later
-    wxControlContainer();
-
-    // the methods to be called from the window event handlers
-    void HandleOnNavigationKey(wxNavigationKeyEvent& event);
-    void HandleOnFocus(wxFocusEvent& event);
-    void HandleOnWindowDestroy(wxWindowBase *child);
-
-    // called from OnChildFocus() handler, i.e. when one of our (grand)
-    // children gets the focus
-    void SetLastFocus(wxWindow *win);
-
-protected:
-
-    wxDECLARE_NO_COPY_CLASS(wxControlContainer);
-};
-
-#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL
-
 // this function is for wxWidgets internal use only
-extern WXDLLIMPEXP_CORE bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
+extern bool wxSetFocusToChild(wxWindow *win, wxWindow **child);
 
 // ----------------------------------------------------------------------------
-// wxNavigationEnabled: Derive from this class to support keyboard navigation
-// among window children in a wxWindow-derived class. The details of this class
-// don't matter, you just need to derive from it to make navigation work.
+// macros which may be used by the classes wishing to implement TAB navigation
+// among their children
 // ----------------------------------------------------------------------------
 
-// The template parameter W must be a wxWindow-derived class.
-template <class W>
-class wxNavigationEnabled : public W
-{
-public:
-    typedef W BaseWindowClass;
-
-    wxNavigationEnabled()
-    {
-        m_container.SetContainerWindow(this);
-
-#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
-        BaseWindowClass::Connect(wxEVT_NAVIGATION_KEY,
-                wxNavigationKeyEventHandler(wxNavigationEnabled::OnNavigationKey));
-
-        BaseWindowClass::Connect(wxEVT_SET_FOCUS,
-                wxFocusEventHandler(wxNavigationEnabled::OnFocus));
-
-        BaseWindowClass::Connect(wxEVT_CHILD_FOCUS,
-                wxChildFocusEventHandler(wxNavigationEnabled::OnChildFocus));
-#endif // !wxHAS_NATIVE_TAB_TRAVERSAL
-    }
-
-    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const
-    {
-        return m_container.AcceptsFocus();
-    }
-
-    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const
-    {
-        return m_container.AcceptsFocusRecursively();
-    }
-
-    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const
-    {
-        return m_container.AcceptsFocusFromKeyboard();
-    }
-
-    WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child)
-    {
-        BaseWindowClass::AddChild(child);
-
-        m_container.UpdateCanFocus();
-    }
-
-    WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child)
-    {
-#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
-        m_container.HandleOnWindowDestroy(child);
-#endif // !wxHAS_NATIVE_TAB_TRAVERSAL
-
-        BaseWindowClass::RemoveChild(child);
-
-        m_container.UpdateCanFocus();
-    }
-
-    WXDLLIMPEXP_INLINE_CORE virtual void SetFocus()
-    {
-        if ( !m_container.DoSetFocus() )
-            BaseWindowClass::SetFocus();
-    }
-
-    void SetFocusIgnoringChildren()
-    {
-        BaseWindowClass::SetFocus();
-    }
-
-    void AcceptFocus(bool acceptFocus)
-    {
-        m_container.SetCanFocus(acceptFocus);
-    }
-
-protected:
-#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
-    void OnNavigationKey(wxNavigationKeyEvent& event)
-    {
-        m_container.HandleOnNavigationKey(event);
-    }
-
-    void OnFocus(wxFocusEvent& event)
-    {
-        m_container.HandleOnFocus(event);
-    }
-
-    void OnChildFocus(wxChildFocusEvent& event)
-    {
-        m_container.SetLastFocus(event.GetWindow());
-        event.Skip();
-    }
-#endif // !wxHAS_NATIVE_TAB_TRAVERSAL
-
-    wxControlContainer m_container;
-
-
-    wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxNavigationEnabled, W);
-};
-
-// ----------------------------------------------------------------------------
-// Compatibility macros from now on, do NOT use them and preferably do not even
-// look at them.
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-
-// common part of WX_DECLARE_CONTROL_CONTAINER in the native and generic cases,
-// it should be used in the wxWindow-derived class declaration
-#define WX_DECLARE_CONTROL_CONTAINER_BASE()                                   \
-public:                                                                       \
-    virtual bool AcceptsFocus() const;                                        \
-    virtual bool AcceptsFocusRecursively() const;                             \
-    virtual bool AcceptsFocusFromKeyboard() const;                            \
-    virtual void AddChild(wxWindowBase *child);                               \
-    virtual void RemoveChild(wxWindowBase *child);                            \
-    virtual void SetFocus();                                                  \
-    void SetFocusIgnoringChildren();                                          \
-    void AcceptFocus(bool acceptFocus)                                        \
-    {                                                                         \
-        m_container.SetCanFocus(acceptFocus);                                 \
-    }                                                                         \
-                                                                              \
-protected:                                                                    \
-    wxControlContainer m_container
-
-// this macro must be used in the derived class ctor
-#define WX_INIT_CONTROL_CONTAINER() \
-    m_container.SetContainerWindow(this)
-
-// common part of WX_DELEGATE_TO_CONTROL_CONTAINER in the native and generic
-// cases, must be used in the wxWindow-derived class implementation
-#define WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename)            \
-    void classname::AddChild(wxWindowBase *child)                             \
-    {                                                                         \
-        basename::AddChild(child);                                            \
-                                                                              \
-        m_container.UpdateCanFocus();                                         \
-    }                                                                         \
-                                                                              \
-    bool classname::AcceptsFocusRecursively() const                           \
-    {                                                                         \
-        return m_container.AcceptsFocusRecursively();                         \
-    }                                                                         \
-                                                                              \
-    void classname::SetFocus()                                                \
-    {                                                                         \
-        if ( !m_container.DoSetFocus() )                                      \
-            basename::SetFocus();                                             \
-    }                                                                         \
-                                                                              \
-    bool classname::AcceptsFocus() const                                      \
-    {                                                                         \
-        return m_container.AcceptsFocus();                                    \
-    }                                                                         \
-                                                                              \
-    bool classname::AcceptsFocusFromKeyboard() const                          \
-    {                                                                         \
-        return m_container.AcceptsFocusFromKeyboard();                        \
-    }
-
-
-#ifdef wxHAS_NATIVE_TAB_TRAVERSAL
-
-#define WX_EVENT_TABLE_CONTROL_CONTAINER(classname)
-
-#define WX_DECLARE_CONTROL_CONTAINER WX_DECLARE_CONTROL_CONTAINER_BASE
-
-#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, basename)                 \
-    WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename)                \
-                                                                              \
-    void classname::RemoveChild(wxWindowBase *child)                          \
-    {                                                                         \
-        basename::RemoveChild(child);                                         \
-                                                                              \
-        m_container.UpdateCanFocus();                                         \
-    }                                                                         \
-                                                                              \
-    void classname::SetFocusIgnoringChildren()                                \
-    {                                                                         \
-        basename::SetFocus();                                                 \
-    }
-
-#else // !wxHAS_NATIVE_TAB_TRAVERSAL
-
 // declare the methods to be forwarded
-#define WX_DECLARE_CONTROL_CONTAINER()                                        \
-    WX_DECLARE_CONTROL_CONTAINER_BASE();                                      \
-                                                                              \
-public:                                                                       \
-    void OnNavigationKey(wxNavigationKeyEvent& event);                        \
-    void OnFocus(wxFocusEvent& event);                                        \
-    virtual void OnChildFocus(wxChildFocusEvent& event)
+#define WX_DECLARE_CONTROL_CONTAINER() \
+public: \
+    void OnNavigationKey(wxNavigationKeyEvent& event); \
+    void OnFocus(wxFocusEvent& event); \
+    virtual void OnChildFocus(wxChildFocusEvent& event); \
+    virtual void SetFocus(); \
+    virtual void SetFocusIgnoringChildren(); \
+    virtual void RemoveChild(wxWindowBase *child); \
+    virtual bool AcceptsFocus() const; \
+\
+protected: \
+    wxControlContainer m_container
 
 // implement the event table entries for wxControlContainer
 #define WX_EVENT_TABLE_CONTROL_CONTAINER(classname) \
@@ -354,41 +99,44 @@ public:                                                                       \
     EVT_NAVIGATION_KEY(classname::OnNavigationKey)
 
 // implement the methods forwarding to the wxControlContainer
-#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, basename)                 \
-    WX_DELEGATE_TO_CONTROL_CONTAINER_BASE(classname, basename)                \
-                                                                              \
-    void classname::RemoveChild(wxWindowBase *child)                          \
-    {                                                                         \
-        m_container.HandleOnWindowDestroy(child);                             \
-                                                                              \
-        basename::RemoveChild(child);                                         \
-                                                                              \
-        m_container.UpdateCanFocus();                                         \
-    }                                                                         \
-                                                                              \
-    void classname::OnNavigationKey( wxNavigationKeyEvent& event )            \
-    {                                                                         \
-        m_container.HandleOnNavigationKey(event);                             \
-    }                                                                         \
-                                                                              \
-    void classname::SetFocusIgnoringChildren()                                \
-    {                                                                         \
-        basename::SetFocus();                                                 \
-    }                                                                         \
-                                                                              \
-    void classname::OnChildFocus(wxChildFocusEvent& event)                    \
-    {                                                                         \
-        m_container.SetLastFocus(event.GetWindow());                          \
-        event.Skip();                                                         \
-    }                                                                         \
-                                                                              \
-    void classname::OnFocus(wxFocusEvent& event)                              \
-    {                                                                         \
-        m_container.HandleOnFocus(event);                                     \
-    }
+#define WX_DELEGATE_TO_CONTROL_CONTAINER(classname, basename)  \
+void classname::OnNavigationKey( wxNavigationKeyEvent& event ) \
+{ \
+    m_container.HandleOnNavigationKey(event); \
+} \
+ \
+void classname::RemoveChild(wxWindowBase *child) \
+{ \
+    m_container.HandleOnWindowDestroy(child); \
+ \
+    basename::RemoveChild(child); \
+} \
+ \
+void classname::SetFocus() \
+{ \
+    if ( !m_container.DoSetFocus() ) \
+        basename::SetFocus(); \
+} \
+ \
+void classname::SetFocusIgnoringChildren() \
+{ \
+        basename::SetFocus(); \
+} \
+ \
+void classname::OnChildFocus(wxChildFocusEvent& event) \
+{ \
+    m_container.SetLastFocus(event.GetWindow()); \
+    event.Skip(); \
+} \
+ \
+void classname::OnFocus(wxFocusEvent& event) \
+{ \
+    m_container.HandleOnFocus(event); \
+} \
+bool classname::AcceptsFocus() const \
+{ \
+    return m_container.AcceptsFocus(); \
+}
 
-#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL
-
-#endif // WXWIN_COMPATIBILITY_2_8
 
 #endif // _WX_CONTAINR_H_
diff --git a/Source/3rd Party/wx/include/wx/control.h b/Source/3rd Party/wx/include/wx/control.h
index 83f552471..ff11a93cf 100644
--- a/Source/3rd Party/wx/include/wx/control.h	
+++ b/Source/3rd Party/wx/include/wx/control.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: control.h 42816 2006-10-31 08:50:17Z RD $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,38 +22,13 @@
 
 #include "wx/window.h"      // base class
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxControlNameStr[];
-
-
-// ----------------------------------------------------------------------------
-// Ellipsize() constants
-// ----------------------------------------------------------------------------
-
-enum wxEllipsizeFlags
-{
-    wxELLIPSIZE_FLAGS_NONE = 0,
-    wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS = 1,
-    wxELLIPSIZE_FLAGS_EXPAND_TABS = 2,
-
-    wxELLIPSIZE_FLAGS_DEFAULT = wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS |
-                                wxELLIPSIZE_FLAGS_EXPAND_TABS
-};
-
-// NB: Don't change the order of these values, they're the same as in
-//     PangoEllipsizeMode enum.
-enum wxEllipsizeMode
-{
-    wxELLIPSIZE_NONE,
-    wxELLIPSIZE_START,
-    wxELLIPSIZE_MIDDLE,
-    wxELLIPSIZE_END
-};
+extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxControl is the base class for all controls
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxControlBase : public wxWindow
+class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:
     wxControlBase() { }
@@ -71,51 +46,11 @@ public:
     // get the control alignment (left/right/centre, top/bottom/centre)
     int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
 
-    // set label with mnemonics
-    virtual void SetLabel(const wxString& label)
-    {
-        m_labelOrig = label;
-
-        InvalidateBestSize();
-
-        wxWindow::SetLabel(label);
-    }
-
-    // return the original string, as it was passed to SetLabel()
-    // (i.e. with wx-style mnemonics)
-    virtual wxString GetLabel() const { return m_labelOrig; }
-
-    // set label text (mnemonics will be escaped)
-    virtual void SetLabelText(const wxString& text)
-    {
-        SetLabel(EscapeMnemonics(text));
-    }
+    // get the string without mnemonic characters ('&')
+    static wxString GetLabelText(const wxString& label);
 
     // get just the text of the label, without mnemonic characters ('&')
-    virtual wxString GetLabelText() const { return GetLabelText(GetLabel()); }
-
-
-#if wxUSE_MARKUP
-    // Set the label with markup (and mnemonics). Markup is a simple subset of
-    // HTML with tags such as <b>, <i> and <span>. By default it is not
-    // supported i.e. all the markup is simply stripped and SetLabel() is
-    // called but some controls in some ports do support this already and in
-    // the future most of them should.
-    //
-    // Notice that, being HTML-like, markup also supports XML entities so '<'
-    // should be encoded as "&lt;" and so on, a bare '<' in the input will
-    // likely result in an error. As an exception, a bare '&' is allowed and
-    // indicates that the next character is a mnemonic. To insert a literal '&'
-    // in the control you need to use "&amp;" in the input string.
-    //
-    // Returns true if the label was set, even if the markup in it was ignored.
-    // False is only returned if we failed to parse the label.
-    bool SetLabelMarkup(const wxString& markup)
-    {
-        return DoSetLabelMarkup(markup);
-    }
-#endif // wxUSE_MARKUP
-
+    wxString GetLabelText() const { return GetLabelText(GetLabel()); }
 
     // controls by default inherit the colours of their parents, if a
     // particular control class doesn't want to do it, it can override
@@ -129,52 +64,13 @@ public:
     // if the button was clicked)
     virtual void Command(wxCommandEvent &event);
 
+    virtual void SetLabel( const wxString &label );
     virtual bool SetFont(const wxFont& font);
 
     // wxControl-specific processing after processing the update event
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
 
-
-
-    // static utilities for mnemonics char (&) handling
-    // ------------------------------------------------
-
-    // returns the given string without mnemonic characters ('&')
-    static wxString GetLabelText(const wxString& label);
-
-    // returns the given string without mnemonic characters ('&')
-    // this function is identic to GetLabelText() and is provided for clarity
-    // and for symmetry with the wxStaticText::RemoveMarkup() function.
-    static wxString RemoveMnemonics(const wxString& str);
-
-    // escapes (by doubling them) the mnemonics
-    static wxString EscapeMnemonics(const wxString& str);
-
-
-    // miscellaneous static utilities
-    // ------------------------------
-
-    // replaces parts of the given (multiline) string with an ellipsis if needed
-    static wxString Ellipsize(const wxString& label, const wxDC& dc,
-                              wxEllipsizeMode mode, int maxWidth,
-                              int flags = wxELLIPSIZE_FLAGS_DEFAULT);
-
-    // return the accel index in the string or -1 if none and puts the modified
-    // string into second parameter if non NULL
-    static int FindAccelIndex(const wxString& label,
-                              wxString *labelOnly = NULL);
-
-    // this is a helper for the derived class GetClassDefaultAttributes()
-    // implementation: it returns the right colours for the classes which
-    // contain something else (e.g. wxListBox, wxTextCtrl, ...) instead of
-    // being simple controls (such as wxButton, wxCheckBox, ...)
-    static wxVisualAttributes
-        GetCompositeControlsDefaultAttributes(wxWindowVariant variant);
-
 protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const;
-
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
     bool CreateControl(wxWindowBase *parent,
@@ -185,34 +81,10 @@ protected:
                        const wxValidator& validator,
                        const wxString& name);
 
-#if wxUSE_MARKUP
-    // This function may be overridden in the derived classes to implement
-    // support for labels with markup. The base class version simply strips the
-    // markup and calls SetLabel() with the remaining text.
-    virtual bool DoSetLabelMarkup(const wxString& markup);
-#endif // wxUSE_MARKUP
-
-
     // initialize the common fields of wxCommandEvent
     void InitCommandEvent(wxCommandEvent& event) const;
 
-    // Ellipsize() helper:
-    static wxString DoEllipsizeSingleLine(const wxString& label, const wxDC& dc,
-                                          wxEllipsizeMode mode, int maxWidth,
-                                          int replacementWidth);
-
-#if wxUSE_MARKUP
-    // Remove markup from the given string, returns empty string on error i.e.
-    // if markup was syntactically invalid.
-    static wxString RemoveMarkup(const wxString& markup);
-#endif // wxUSE_MARKUP
-
-
-    // this field contains the label in wx format, i.e. with '&' mnemonics,
-    // as it was passed to the last SetLabel() call
-    wxString m_labelOrig;
-
-    wxDECLARE_NO_COPY_CLASS(wxControlBase);
+    DECLARE_NO_COPY_CLASS(wxControlBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -221,6 +93,8 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/control.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/control.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/control.h"
 #elif defined(__WXMOTIF__)
@@ -230,7 +104,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/control.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/control.h"
+    #include "wx/mac/control.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/control.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/convauto.h b/Source/3rd Party/wx/include/wx/convauto.h
index d90b5ed5a..ced911950 100644
--- a/Source/3rd Party/wx/include/wx/convauto.h	
+++ b/Source/3rd Party/wx/include/wx/convauto.h	
@@ -3,7 +3,7 @@
 // Purpose:     wxConvAuto class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-04-03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: convauto.h 45893 2007-05-08 20:05:16Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,63 +12,24 @@
 #define _WX_CONVAUTO_H_
 
 #include "wx/strconv.h"
-#include "wx/fontenc.h"
+
+#if wxUSE_WCHAR_T
 
 // ----------------------------------------------------------------------------
 // wxConvAuto: uses BOM to automatically detect input encoding
 // ----------------------------------------------------------------------------
 
-// All currently recognized BOM values.
-enum wxBOM
-{
-    wxBOM_Unknown = -1,
-    wxBOM_None,
-    wxBOM_UTF32BE,
-    wxBOM_UTF32LE,
-    wxBOM_UTF16BE,
-    wxBOM_UTF16LE,
-    wxBOM_UTF8
-};
-
 class WXDLLIMPEXP_BASE wxConvAuto : public wxMBConv
 {
 public:
     // default ctor, the real conversion will be created on demand
-    wxConvAuto(wxFontEncoding enc = wxFONTENCODING_DEFAULT)
-    {
-        Init();
-
-        m_encDefault = enc;
-    }
+    wxConvAuto() { m_conv = NULL; /* the rest will be initialized later */ }
 
     // copy ctor doesn't initialize anything neither as conversion can only be
     // deduced on first use
-    wxConvAuto(const wxConvAuto& other) : wxMBConv()
-    {
-        Init();
-
-        m_encDefault = other.m_encDefault;
-    }
-
-    virtual ~wxConvAuto()
-    {
-        if ( m_ownsConv )
-            delete m_conv;
-    }
-
-    // get/set the fall-back encoding used when the input text doesn't have BOM
-    // and isn't UTF-8
-    //
-    // special values are wxFONTENCODING_MAX meaning not to use any fall back
-    // at all (but just fail to convert in this case) and wxFONTENCODING_SYSTEM
-    // meaning to use the encoding of the system locale
-    static wxFontEncoding GetFallbackEncoding() { return ms_defaultMBEncoding; }
-    static void SetFallbackEncoding(wxFontEncoding enc);
-    static void DisableFallbackEncoding()
-    {
-        SetFallbackEncoding(wxFONTENCODING_MAX);
-    }
+    wxConvAuto(const wxConvAuto& WXUNUSED(other)) : wxMBConv() { m_conv = NULL; }
 
+    virtual ~wxConvAuto() { if ( m_conv && m_ownsConv ) delete m_conv; }
 
     // override the base class virtual function(s) to use our m_conv
     virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
@@ -81,64 +42,46 @@ public:
 
     virtual wxMBConv *Clone() const { return new wxConvAuto(*this); }
 
-    // return the BOM type of this buffer
-    static wxBOM DetectBOM(const char *src, size_t srcLen);
-
-    // return the characters composing the given BOM.
-    static const char* GetBOMChars(wxBOM bomType, size_t* count);
-
-    wxBOM GetBOM() const
-    {
-        return m_bomType;
-    }
-
 private:
-    // common part of all ctors
-    void Init()
+    // all currently recognized BOM values
+    enum BOMType
     {
-        // We don't initialize m_encDefault here as different ctors do it
-        // differently.
-        m_conv = NULL;
-        m_bomType = wxBOM_Unknown;
-        m_ownsConv = false;
-        m_consumedBOM = false;
-    }
+        BOM_None,
+        BOM_UTF32BE,
+        BOM_UTF32LE,
+        BOM_UTF16BE,
+        BOM_UTF16LE,
+        BOM_UTF8
+    };
 
-    // initialize m_conv with the UTF-8 conversion
-    void InitWithUTF8()
+    // return the BOM type of this buffer
+    static BOMType DetectBOM(const char *src, size_t srcLen);
+
+    // initialize m_conv with the conversion to use by default (UTF-8)
+    void InitWithDefault()
     {
         m_conv = &wxConvUTF8;
         m_ownsConv = false;
     }
 
     // create the correct conversion object for the given BOM type
-    void InitFromBOM(wxBOM bomType);
+    void InitFromBOM(BOMType bomType);
 
     // create the correct conversion object for the BOM present in the
-    // beginning of the buffer
-    //
-    // return false if the buffer is too short to allow us to determine if we
-    // have BOM or not
-    bool InitFromInput(const char *src, size_t len);
+    // beginning of the buffer; adjust the buffer to skip the BOM if found
+    void InitFromInput(const char **src, size_t *len);
 
     // adjust src and len to skip over the BOM (identified by m_bomType) at the
     // start of the buffer
     void SkipBOM(const char **src, size_t *len) const;
 
 
-    // fall-back multibyte encoding to use, may be wxFONTENCODING_SYSTEM or
-    // wxFONTENCODING_MAX but not wxFONTENCODING_DEFAULT
-    static wxFontEncoding ms_defaultMBEncoding;
-
     // conversion object which we really use, NULL until the first call to
     // either ToWChar() or FromWChar()
     wxMBConv *m_conv;
 
-    // the multibyte encoding to use by default if input isn't Unicode
-    wxFontEncoding m_encDefault;
-
     // our BOM type
-    wxBOM m_bomType;
+    BOMType m_bomType;
 
     // true if we allocated m_conv ourselves, false if we just use an existing
     // global conversion
@@ -149,8 +92,17 @@ private:
     bool m_consumedBOM;
 
 
-    wxDECLARE_NO_ASSIGN_CLASS(wxConvAuto);
+    DECLARE_NO_ASSIGN_CLASS(wxConvAuto)
 };
 
+#else // !wxUSE_WCHAR_T
+
+// it doesn't matter how we define it in this case as it's unused anyhow, but
+// do define it to allow the code using wxConvAuto() as default argument (this
+// is done in many places) to compile
+typedef wxMBConv wxConvAuto;
+
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
+
 #endif // _WX_CONVAUTO_H_
 
diff --git a/Source/3rd Party/wx/include/wx/cpp.h b/Source/3rd Party/wx/include/wx/cpp.h
index c600e4023..8d7a646d7 100644
--- a/Source/3rd Party/wx/include/wx/cpp.h	
+++ b/Source/3rd Party/wx/include/wx/cpp.h	
@@ -3,7 +3,7 @@
  *  Purpose:     Various preprocessor helpers
  *  Author:      Vadim Zeitlin
  *  Created:     2006-09-30
- *  RCS-ID:      $Id$
+ *  RCS-ID:      $Id: cpp.h 42993 2006-11-03 21:06:57Z VZ $
  *  Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
  *  Licence:     wxWindows licence
  */
@@ -15,23 +15,7 @@
 
 /* wxCONCAT works like preprocessor ## operator but also works with macros */
 #define wxCONCAT_HELPER(text, line) text ## line
-
-#define wxCONCAT(x1, x2) \
-    wxCONCAT_HELPER(x1, x2)
-#define wxCONCAT3(x1, x2, x3) \
-    wxCONCAT(wxCONCAT(x1, x2), x3)
-#define wxCONCAT4(x1, x2, x3, x4) \
-    wxCONCAT(wxCONCAT3(x1, x2, x3), x4)
-#define wxCONCAT5(x1, x2, x3, x4, x5) \
-    wxCONCAT(wxCONCAT4(x1, x2, x3, x4), x5)
-#define wxCONCAT6(x1, x2, x3, x4, x5, x6) \
-    wxCONCAT(wxCONCAT5(x1, x2, x3, x4, x5), x6)
-#define wxCONCAT7(x1, x2, x3, x4, x5, x6, x7) \
-    wxCONCAT(wxCONCAT6(x1, x2, x3, x4, x5, x6), x7)
-#define wxCONCAT8(x1, x2, x3, x4, x5, x6, x7, x8) \
-    wxCONCAT(wxCONCAT7(x1, x2, x3, x4, x5, x6, x7), x8)
-#define wxCONCAT9(x1, x2, x3, x4, x5, x6, x7, x8, x9) \
-    wxCONCAT(wxCONCAT8(x1, x2, x3, x4, x5, x6, x7, x8), x9)
+#define wxCONCAT(text, line)        wxCONCAT_HELPER(text, line)
 
 /* wxSTRINGIZE works as the preprocessor # operator but also works with macros */
 #define wxSTRINGIZE_HELPER(x)       #x
@@ -40,16 +24,6 @@
 /* a Unicode-friendly version of wxSTRINGIZE_T */
 #define wxSTRINGIZE_T(x)            wxAPPLY_T(wxSTRINGIZE(x))
 
-/*
-    Special workarounds for compilers with broken "##" operator. For all the
-    other ones we can just use it directly.
- */
-#ifdef wxCOMPILER_BROKEN_CONCAT_OPER
-    #define wxPREPEND_L(x)      L ## x
-    #define wxAPPEND_i64(x)     x ## i64
-    #define wxAPPEND_ui64(x)    x ## ui64
-#endif /* wxCOMPILER_BROKEN_CONCAT_OPER */
-
 /*
    Helper macros for wxMAKE_UNIQUE_NAME: normally this works by appending the
    current line number to the given identifier to reduce the probability of the
@@ -79,27 +53,5 @@
  */
 #define wxEMPTY_PARAMETER_VALUE /* Fake macro parameter value */
 
-/*
-    Define __WXFUNCTION__ which is like standard __FUNCTION__ but defined as
-    NULL for the compilers which don't support the latter.
- */
-#ifndef __WXFUNCTION__
-    /* TODO: add more compilers supporting __FUNCTION__ */
-    #if defined(__DMC__)
-        /*
-           __FUNCTION__ happens to be not defined within class members
-           http://www.digitalmars.com/drn-bin/wwwnews?c%2B%2B.beta/485
-        */
-        #define __WXFUNCTION__ (NULL)
-    #elif defined(__GNUC__) || \
-          (defined(_MSC_VER) && _MSC_VER >= 1300) || \
-          defined(__FUNCTION__)
-        #define __WXFUNCTION__ __FUNCTION__
-    #else
-        /* still define __WXFUNCTION__ to avoid #ifdefs elsewhere */
-        #define __WXFUNCTION__ (NULL)
-    #endif
-#endif /* __WXFUNCTION__ already defined */
-
-#endif /* _WX_CPP_H_ */
+#endif // _WX_CPP_H_
 
diff --git a/Source/3rd Party/wx/include/wx/crt.h b/Source/3rd Party/wx/include/wx/crt.h
deleted file mode 100644
index 6c5629464..000000000
--- a/Source/3rd Party/wx/include/wx/crt.h	
+++ /dev/null
@@ -1,23 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Name:        wx/crt.h
-// Purpose:     Header to include all headers with wrappers for CRT functions
-// Author:      Robert Roebling
-// Created:     2007-05-30
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 wxWidgets dev team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CRT_H_
-#define _WX_CRT_H_
-
-#include "wx/defs.h"
-
-// include wxChar type definition:
-#include "wx/chartype.h"
-
-// and wrappers for CRT functions:
-#include "wx/wxcrt.h"
-#include "wx/wxcrtvararg.h"
-
-#endif // _WX_CRT_H_
diff --git a/Source/3rd Party/wx/include/wx/cshelp.h b/Source/3rd Party/wx/include/wx/cshelp.h
index 43f3831fc..53e13c389 100644
--- a/Source/3rd Party/wx/include/wx/cshelp.h	
+++ b/Source/3rd Party/wx/include/wx/cshelp.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     08/09/2000
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: cshelp.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -36,7 +36,7 @@
  * window for the application to display help for.
  */
 
-class WXDLLIMPEXP_CORE wxContextHelp : public wxObject
+class WXDLLEXPORT wxContextHelp : public wxObject
 {
 public:
     wxContextHelp(wxWindow* win = NULL, bool beginHelp = true);
@@ -65,7 +65,7 @@ private:
  * to put the application into context help mode.
  */
 
-class WXDLLIMPEXP_CORE wxContextHelpButton : public wxBitmapButton
+class WXDLLEXPORT wxContextHelpButton : public wxBitmapButton
 {
 public:
     wxContextHelpButton(wxWindow* parent,
@@ -106,7 +106,7 @@ private:
 // and overriding ShowHelp() but calling the base class version wouldn't work
 // any more, which forces us to use a rather ugly hack and pass the extra
 // parameters of ShowHelpAtPoint() to ShowHelp() via member variables.
-class WXDLLIMPEXP_CORE wxHelpProvider
+class WXDLLEXPORT wxHelpProvider
 {
 public:
     // get/set the current (application-global) help provider (Set() returns
@@ -188,7 +188,7 @@ WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash,
 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the
 // control (if any) in a tooltip
-class WXDLLIMPEXP_CORE wxSimpleHelpProvider : public wxHelpProvider
+class WXDLLEXPORT wxSimpleHelpProvider : public wxHelpProvider
 {
 public:
     // implement wxHelpProvider methods
@@ -212,12 +212,12 @@ protected:
 // both context identifiers and plain text help strings. If the help text is an integer,
 // it is passed to wxHelpController::DisplayContextPopup. Otherwise, it shows the string
 // in a tooltip as per wxSimpleHelpProvider.
-class WXDLLIMPEXP_CORE wxHelpControllerHelpProvider : public wxSimpleHelpProvider
+class WXDLLEXPORT wxHelpControllerHelpProvider : public wxSimpleHelpProvider
 {
 public:
     // Note that it doesn't own the help controller. The help controller
     // should be deleted separately.
-    wxHelpControllerHelpProvider(wxHelpControllerBase* hc = NULL);
+    wxHelpControllerHelpProvider(wxHelpControllerBase* hc = (wxHelpControllerBase*) NULL);
 
     // implement wxHelpProvider methods
 
@@ -232,11 +232,11 @@ public:
 protected:
     wxHelpControllerBase*   m_helpController;
 
-    wxDECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider);
+    DECLARE_NO_COPY_CLASS(wxHelpControllerHelpProvider)
 };
 
 // Convenience function for turning context id into wxString
-WXDLLIMPEXP_CORE wxString wxContextId(int id);
+WXDLLEXPORT wxString wxContextId(int id);
 
 #endif // wxUSE_HELP
 
diff --git a/Source/3rd Party/wx/include/wx/ctrlsub.h b/Source/3rd Party/wx/include/wx/ctrlsub.h
index b2c7f94b1..dc29fe63f 100644
--- a/Source/3rd Party/wx/include/wx/ctrlsub.h	
+++ b/Source/3rd Party/wx/include/wx/ctrlsub.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: ctrlsub.h 42816 2006-10-31 08:50:17Z RD $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,6 @@
 
 #if wxUSE_CONTROLS
 
-#include "wx/arrstr.h"
 #include "wx/control.h"      // base class
 
 // ----------------------------------------------------------------------------
@@ -30,7 +29,7 @@
 // implements an extended interface deriving from this one)
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxItemContainerImmutable
+class WXDLLEXPORT wxItemContainerImmutable
 {
 public:
     wxItemContainerImmutable() { }
@@ -73,7 +72,7 @@ public:
     bool SetStringSelection(const wxString& s);
 
     // return the selected string or empty string if none
-    virtual wxString GetStringSelection() const;
+    wxString GetStringSelection() const;
 
     // this is the same as SetSelection( for single-selection controls but
     // reads better for multi-selection ones
@@ -81,109 +80,14 @@ public:
 
 
 protected:
+
     // check that the index is valid
-    bool IsValid(unsigned int n) const { return n < GetCount(); }
-    bool IsValidInsert(unsigned int n) const { return n <= GetCount(); }
+    inline bool IsValid(unsigned int n) const { return n < GetCount(); }
+    inline bool IsValidInsert(unsigned int n) const { return n <= GetCount(); }
 };
 
-// ----------------------------------------------------------------------------
-// wxItemContainer extends wxItemContainerImmutable interface with methods
-// for adding/removing items.
-//
-// Classes deriving from this one must override DoInsertItems() to implement
-// adding items to the control. This can often be implemented more efficiently
-// than simply looping over the elements and inserting them but if this is not
-// the case, the generic DoInsertItemsInLoop can be used in implementation, but
-// in this case DoInsertItem() needs to be overridden.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxItemContainer : public wxItemContainerImmutable
+class WXDLLEXPORT wxItemContainer : public wxItemContainerImmutable
 {
-private:
-    // AppendItems() and InsertItems() helpers just call DoAppend/InsertItems()
-    // after doing some checks
-    //
-    // NB: they're defined here so that they're inlined when used in public part
-    int AppendItems(const wxArrayStringsAdapter& items,
-                    void **clientData,
-                    wxClientDataType type)
-    {
-        if ( items.IsEmpty() )
-            return wxNOT_FOUND;
-
-        return DoAppendItems(items, clientData, type);
-    }
-
-    int AppendItems(const wxArrayStringsAdapter& items)
-    {
-        return AppendItems(items, NULL, wxClientData_None);
-    }
-
-    int AppendItems(const wxArrayStringsAdapter& items, void **clientData)
-    {
-        wxASSERT_MSG( GetClientDataType() != wxClientData_Object,
-                      wxT("can't mix different types of client data") );
-
-        return AppendItems(items, clientData, wxClientData_Void);
-    }
-
-    int AppendItems(const wxArrayStringsAdapter& items,
-                    wxClientData **clientData)
-    {
-        wxASSERT_MSG( GetClientDataType() != wxClientData_Void,
-                      wxT("can't mix different types of client data") );
-
-        return AppendItems(items, reinterpret_cast<void **>(clientData),
-                           wxClientData_Object);
-    }
-
-    int InsertItems(const wxArrayStringsAdapter& items,
-                    unsigned int pos,
-                    void **clientData,
-                    wxClientDataType type)
-    {
-        wxASSERT_MSG( !IsSorted(), wxT("can't insert items in sorted control") );
-
-        wxCHECK_MSG( pos <= GetCount(), wxNOT_FOUND,
-                     wxT("position out of range") );
-
-        // not all derived classes handle empty arrays correctly in
-        // DoInsertItems() and besides it really doesn't make much sense to do
-        // this (for append it could correspond to creating an initially empty
-        // control but why would anybody need to insert 0 items?)
-        wxCHECK_MSG( !items.IsEmpty(), wxNOT_FOUND,
-                     wxT("need something to insert") );
-
-        return DoInsertItems(items, pos, clientData, type);
-    }
-
-    int InsertItems(const wxArrayStringsAdapter& items, unsigned int pos)
-    {
-        return InsertItems(items, pos, NULL, wxClientData_None);
-    }
-
-    int InsertItems(const wxArrayStringsAdapter& items,
-                     unsigned int pos,
-                     void **clientData)
-    {
-        wxASSERT_MSG( GetClientDataType() != wxClientData_Object,
-                      wxT("can't mix different types of client data") );
-
-        return InsertItems(items, pos, clientData, wxClientData_Void);
-    }
-
-    int InsertItems(const wxArrayStringsAdapter& items,
-                     unsigned int pos,
-                     wxClientData **clientData)
-    {
-        wxASSERT_MSG( GetClientDataType() != wxClientData_Void,
-                      wxT("can't mix different types of client data") );
-
-        return InsertItems(items, pos,
-                           reinterpret_cast<void **>(clientData),
-                           wxClientData_Object);
-    }
-
 public:
     wxItemContainer() { m_clientDataItemsType = wxClientData_None; }
     virtual ~wxItemContainer();
@@ -191,251 +95,94 @@ public:
     // adding items
     // ------------
 
-    // append single item, return its position in the control (which can be
-    // different from the last one if the control is sorted)
     int Append(const wxString& item)
-        { return AppendItems(item); }
+        { return DoAppend(item); }
     int Append(const wxString& item, void *clientData)
-        { return AppendItems(item, &clientData); }
+        { int n = DoAppend(item); SetClientData(n, clientData); return n; }
     int Append(const wxString& item, wxClientData *clientData)
-        { return AppendItems(item, &clientData); }
+        { int n = DoAppend(item); SetClientObject(n, clientData); return n; }
 
-    // append several items at once to the control, return the position of the
-    // last item appended
-    int Append(const wxArrayString& items)
-        { return AppendItems(items); }
-    int Append(const wxArrayString& items, void **clientData)
-        { return AppendItems(items, clientData); }
-    int Append(const wxArrayString& items, wxClientData **clientData)
-        { return AppendItems(items, clientData); }
-    int Append(unsigned int n, const wxString *items)
-        { return AppendItems(wxArrayStringsAdapter(n, items)); }
-    int Append(unsigned int n, const wxString *items, void **clientData)
-        { return AppendItems(wxArrayStringsAdapter(n, items), clientData); }
-    int Append(unsigned int n,
-               const wxString *items,
-               wxClientData **clientData)
-        { return AppendItems(wxArrayStringsAdapter(n, items), clientData); }
+    // only for rtti needs (separate name)
+    void AppendString( const wxString& item)
+        { Append( item ); }
 
-    // only for RTTI needs (separate name)
-    void AppendString(const wxString& item)
-        { Append(item); }
+    // append several items at once to the control
+    void Append(const wxArrayString& strings);
 
-
-    // inserting items: not for sorted controls!
-    // -----------------------------------------
-
-    // insert single item at the given position, return its effective position
     int Insert(const wxString& item, unsigned int pos)
-        { return InsertItems(item, pos); }
-    int Insert(const wxString& item, unsigned int pos, void *clientData)
-        { return InsertItems(item, pos, &clientData); }
-    int Insert(const wxString& item, unsigned int pos, wxClientData *clientData)
-        { return InsertItems(item, pos, &clientData); }
-
-    // insert several items at once into the control, return the index of the
-    // last item inserted
-    int Insert(const wxArrayString& items, unsigned int pos)
-        { return InsertItems(items, pos); }
-    int Insert(const wxArrayString& items, unsigned int pos, void **clientData)
-        { return InsertItems(items, pos, clientData); }
-    int Insert(const wxArrayString& items,
-               unsigned int pos,
-               wxClientData **clientData)
-        { return InsertItems(items, pos, clientData); }
-    int Insert(unsigned int n, const wxString *items, unsigned int pos)
-        { return InsertItems(wxArrayStringsAdapter(n, items), pos); }
-    int Insert(unsigned int n,
-               const wxString *items,
-               unsigned int pos,
-               void **clientData)
-        { return InsertItems(wxArrayStringsAdapter(n, items), pos, clientData); }
-    int Insert(unsigned int n,
-               const wxString *items,
-               unsigned int pos,
-               wxClientData **clientData)
-        { return InsertItems(wxArrayStringsAdapter(n, items), pos, clientData); }
-
-
-    // replacing items
-    // ---------------
-
-    void Set(const wxArrayString& items)
-        { Clear(); Append(items); }
-    void Set(const wxArrayString& items, void **clientData)
-        { Clear(); Append(items, clientData); }
-    void Set(const wxArrayString& items, wxClientData **clientData)
-        { Clear(); Append(items, clientData); }
-    void Set(unsigned int n, const wxString *items)
-        { Clear(); Append(n, items); }
-    void Set(unsigned int n, const wxString *items, void **clientData)
-        { Clear(); Append(n, items, clientData); }
-    void Set(unsigned int n, const wxString *items, wxClientData **clientData)
-        { Clear(); Append(n, items, clientData); }
+        { return DoInsert(item, pos); }
+    int Insert(const wxString& item, unsigned int pos, void *clientData);
+    int Insert(const wxString& item, unsigned int pos, wxClientData *clientData);
 
     // deleting items
     // --------------
 
-    void Clear();
-    void Delete(unsigned int pos);
-
-
-    // various accessors
-    // -----------------
-
-    // The control may maintain its items in a sorted order in which case
-    // items are automatically inserted at the right position when they are
-    // inserted or appended. Derived classes have to override this method if
-    // they implement sorting, typically by returning HasFlag(wxXX_SORT)
-    virtual bool IsSorted() const { return false; }
+    virtual void Clear() = 0;
+    virtual void Delete(unsigned int n) = 0;
 
+    // misc
+    // ----
 
     // client data stuff
-    // -----------------
-
     void SetClientData(unsigned int n, void* clientData);
     void* GetClientData(unsigned int n) const;
 
-    // SetClientObject() takes ownership of the pointer, GetClientObject()
-    // returns it but keeps the ownership while DetachClientObject() expects
-    // the caller to delete the pointer and also resets the internally stored
-    // one to NULL for this item
     void SetClientObject(unsigned int n, wxClientData* clientData);
     wxClientData* GetClientObject(unsigned int n) const;
-    wxClientData* DetachClientObject(unsigned int n);
 
-    // return the type of client data stored in this control: usually it just
-    // returns m_clientDataItemsType but must be overridden in the controls
-    // which delegate their client data storage to another one (e.g. wxChoice
-    // in wxUniv which stores data in wxListBox which it uses anyhow); don't
-    // forget to override SetClientDataType() if you override this one
-    //
-    // NB: for this to work no code should ever access m_clientDataItemsType
-    //     directly but only via this function!
-    virtual wxClientDataType GetClientDataType() const
-        { return m_clientDataItemsType; }
-
-    bool HasClientData() const
-        { return GetClientDataType() != wxClientData_None; }
     bool HasClientObjectData() const
-        { return GetClientDataType() == wxClientData_Object; }
+        { return m_clientDataItemsType == wxClientData_Object; }
     bool HasClientUntypedData() const
-        { return GetClientDataType() == wxClientData_Void; }
+        { return m_clientDataItemsType == wxClientData_Void; }
 
 protected:
-    // there is usually no need to override this method but you can do it if it
-    // is more convenient to only do "real" insertions in DoInsertItems() and
-    // to implement items appending here (in which case DoInsertItems() should
-    // call this method if pos == GetCount() as it can still be called in this
-    // case if public Insert() is called with such position)
-    virtual int DoAppendItems(const wxArrayStringsAdapter& items,
-                              void **clientData,
-                              wxClientDataType type)
-    {
-        return DoInsertItems(items, GetCount(), clientData, type);
-    }
+    virtual int DoAppend(const wxString& item) = 0;
+    virtual int DoInsert(const wxString& item, unsigned int pos) = 0;
 
-    // this method must be implemented to insert the items into the control at
-    // position pos which can be GetCount() meaning that the items should be
-    // appended; for the sorted controls the position can be ignored
-    //
-    // the derived classes typically use AssignNewItemClientData() to
-    // associate the data with the items as they're being inserted
-    //
-    // the method should return the index of the position the last item was
-    // inserted into or wxNOT_FOUND if an error occurred
-    virtual int DoInsertItems(const wxArrayStringsAdapter & items,
-                              unsigned int pos,
-                              void **clientData,
-                              wxClientDataType type) = 0;
-
-    // before the client data is set for the first time for the control which
-    // hadn't had it before, DoInitItemClientData() is called which gives the
-    // derived class the possibility to initialize its client data storage only
-    // when client data is really used
-    virtual void DoInitItemClientData() { }
-    virtual void DoSetItemClientData(unsigned int n, void *clientData) = 0;
-    virtual void *DoGetItemClientData(unsigned int n) const = 0;
-
-    virtual void DoClear() = 0;
-    virtual void DoDeleteOneItem(unsigned int pos) = 0;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData) = 0;
+    virtual void* DoGetItemClientData(unsigned int n) const = 0;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData) = 0;
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const = 0;
 
 
-    // methods useful for the derived classes which don't have any better way
-    // of adding multiple items to the control than doing it one by one: such
-    // classes should call DoInsertItemsInLoop() from their DoInsert() and
-    // override DoInsertOneItem() to perform the real insertion
-    virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
-    int DoInsertItemsInLoop(const wxArrayStringsAdapter& items,
-                            unsigned int pos,
-                            void **clientData,
-                            wxClientDataType type);
-
-
-    // helper for DoInsertItems(): n is the index into clientData, pos is the
-    // position of the item in the control
-    void AssignNewItemClientData(unsigned int pos,
-                                 void **clientData,
-                                 unsigned int n,
-                                 wxClientDataType type);
-
-    // free the client object associated with the item at given position and
-    // set it to NULL (must only be called if HasClientObjectData())
-    void ResetItemClientObject(unsigned int n);
-
-    // set the type of the client data stored in this control: override this if
-    // you override GetClientDataType()
-    virtual void SetClientDataType(wxClientDataType clientDataItemsType)
-    {
-        m_clientDataItemsType = clientDataItemsType;
-    }
-
-private:
     // the type of the client data for the items
     wxClientDataType m_clientDataItemsType;
 };
 
-// Inheriting directly from a wxWindow-derived class and wxItemContainer
-// unfortunately introduces an ambiguity for all GetClientXXX() methods as they
-// are inherited twice: the "global" versions from wxWindow and the per-item
-// versions taking the index from wxItemContainer.
-//
-// So we need to explicitly resolve them and this helper template class is
-// provided to do it. To use it, simply inherit from wxWindowWithItems<Window,
-// Container> instead of Window and Container interface directly.
-template <class W, class C>
-class wxWindowWithItems : public W, public C
-{
-public:
-    typedef W BaseWindowClass;
-    typedef C BaseContainerInterface;
-
-    wxWindowWithItems() { }
-
-    void SetClientData(void *data)
-        { BaseWindowClass::SetClientData(data); }
-    void *GetClientData() const
-        { return BaseWindowClass::GetClientData(); }
-    void SetClientObject(wxClientData *data)
-        { BaseWindowClass::SetClientObject(data); }
-    wxClientData *GetClientObject() const
-        { return BaseWindowClass::GetClientObject(); }
-
-    void SetClientData(unsigned int n, void* clientData)
-        { wxItemContainer::SetClientData(n, clientData); }
-    void* GetClientData(unsigned int n) const
-        { return wxItemContainer::GetClientData(n); }
-    void SetClientObject(unsigned int n, wxClientData* clientData)
-        { wxItemContainer::SetClientObject(n, clientData); }
-    wxClientData* GetClientObject(unsigned int n) const
+// this macro must (unfortunately) be used in any class deriving from both
+// wxItemContainer and wxControl because otherwise there is ambiguity when
+// calling GetClientXXX() functions -- the compiler can't choose between the
+// two versions
+#define wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST                    \
+    void SetClientData(void *data)                                         \
+        { wxEvtHandler::SetClientData(data); }                             \
+    void *GetClientData() const                                            \
+        { return wxEvtHandler::GetClientData(); }                          \
+    void SetClientObject(wxClientData *data)                               \
+        { wxEvtHandler::SetClientObject(data); }                           \
+    wxClientData *GetClientObject() const                                  \
+        { return wxEvtHandler::GetClientObject(); }                        \
+    void SetClientData(unsigned int n, void* clientData)                   \
+        { wxItemContainer::SetClientData(n, clientData); }                 \
+    void* GetClientData(unsigned int n) const                              \
+        { return wxItemContainer::GetClientData(n); }                      \
+    void SetClientObject(unsigned int n, wxClientData* clientData)         \
+        { wxItemContainer::SetClientObject(n, clientData); }               \
+    wxClientData* GetClientObject(unsigned int n) const                    \
         { return wxItemContainer::GetClientObject(n); }
-};
 
-class WXDLLIMPEXP_CORE wxControlWithItemsBase :
-    public wxWindowWithItems<wxControl, wxItemContainer>
+class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer
 {
 public:
-    wxControlWithItemsBase() { }
+    wxControlWithItems() { }
+    virtual ~wxControlWithItems();
+
+    // we have to redefine these functions here to avoid ambiguities in classes
+    // deriving from us which would arise otherwise because both base classses
+    // have the methods with the same names - hopefully, a smart compiler can
+    // optimize away these simple inline wrappers so we don't suffer much from
+    // this
+    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
     // usually the controls like list/combo boxes have their own background
     // colour
@@ -449,25 +196,14 @@ protected:
     void InitCommandEventWithItems(wxCommandEvent& event, int n);
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxControlWithItemsBase);
+    DECLARE_ABSTRACT_CLASS(wxControlWithItems)
+    DECLARE_NO_COPY_CLASS(wxControlWithItems)
 };
 
-// define the platform-specific wxControlWithItems class
-#if defined(__WXMSW__)
-    #include "wx/msw/ctrlsub.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/ctrlsub.h"
-#else
-    class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase
-    {
-    public:
-        wxControlWithItems() { }
 
-    private:
-        DECLARE_ABSTRACT_CLASS(wxControlWithItems)
-        wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
-    };
-#endif
+// ----------------------------------------------------------------------------
+// inline functions
+// ----------------------------------------------------------------------------
 
 #endif // wxUSE_CONTROLS
 
diff --git a/Source/3rd Party/wx/include/wx/cursor.h b/Source/3rd Party/wx/include/wx/cursor.h
index 6907d7211..d072ff56a 100644
--- a/Source/3rd Party/wx/include/wx/cursor.h	
+++ b/Source/3rd Party/wx/include/wx/cursor.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: cursor.h 40865 2006-08-27 09:42:42Z VS $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,56 +14,27 @@
 
 #include "wx/defs.h"
 
-/*
-    wxCursor classes should have the following public API:
-
-class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
-{
-public:
-    wxCursor();
-    wxCursor(const wxImage& image);
-    wxCursor(const wxString& name,
-             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
-             int hotSpotX = 0, int hotSpotY = 0);
-    wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
-    virtual ~wxCursor();
-};
-
-*/
-
-#if defined(__WXMSW__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/cursor.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/cursor.h"
 #elif defined(__WXMOTIF__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XBM
     #include "wx/motif/cursor.h"
 #elif defined(__WXGTK20__)
-    #ifdef __WINDOWS__
-        #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
-    #else
-        #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
-    #endif
     #include "wx/gtk/cursor.h"
 #elif defined(__WXGTK__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
     #include "wx/gtk1/cursor.h"
 #elif defined(__WXX11__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
     #include "wx/x11/cursor.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/cursor.h"
 #elif defined(__WXDFB__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
     #include "wx/dfb/cursor.h"
 #elif defined(__WXMAC__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_MACCURSOR_RESOURCE
-    #include "wx/osx/cursor.h"
+    #include "wx/mac/cursor.h"
 #elif defined(__WXCOCOA__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_MACCURSOR_RESOURCE
     #include "wx/cocoa/cursor.h"
 #elif defined(__WXPM__)
-    #define wxCURSOR_DEFAULT_TYPE   wxBITMAP_TYPE_CUR_RESOURCE
     #include "wx/os2/cursor.h"
 #endif
 
diff --git a/Source/3rd Party/wx/include/wx/dataobj.h b/Source/3rd Party/wx/include/wx/dataobj.h
index 2d7ad48c4..31a756e23 100644
--- a/Source/3rd Party/wx/include/wx/dataobj.h	
+++ b/Source/3rd Party/wx/include/wx/dataobj.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin, Robert Roebling
 // Modified by:
 // Created:     26.05.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dataobj.h 40772 2006-08-23 13:38:45Z VZ $
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ public:
     typedef <integral type> NativeFormat;
 
     wxDataFormat(NativeFormat format = wxDF_INVALID);
-    wxDataFormat(const wxString& format);
+    wxDataFormat(const wxChar *format);
 
     wxDataFormat& operator=(NativeFormat format);
     wxDataFormat& operator=(const wxDataFormat& format);
@@ -67,7 +67,7 @@ public:
     NativeFormat GetType() const;
 
     wxString GetId() const;
-    void SetId(const wxString& format);
+    void SetId(const wxChar *format);
 };
 
 */
@@ -83,7 +83,7 @@ public:
 #elif defined(__WXX11__)
     #include "wx/x11/dataform.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/dataform.h"
+    #include "wx/mac/dataform.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dataform.h"
 #elif defined(__WXPM__)
@@ -92,7 +92,7 @@ public:
 
 // the value for default argument to some functions (corresponds to
 // wxDF_INVALID)
-extern WXDLLIMPEXP_CORE const wxDataFormat& wxFormatInvalid;
+extern WXDLLEXPORT const wxDataFormat& wxFormatInvalid;
 
 // ----------------------------------------------------------------------------
 // wxDataObject represents a piece of data which knows which formats it
@@ -114,7 +114,7 @@ extern WXDLLIMPEXP_CORE const wxDataFormat& wxFormatInvalid;
 // to be supported by SetData() or GetDataHere().
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDataObjectBase
+class WXDLLEXPORT wxDataObjectBase
 {
 public:
     enum Direction
@@ -171,7 +171,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/dataobj.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/dataobj.h"
+    #include "wx/mac/dataobj.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dataobj.h"
 #elif defined(__WXPM__)
@@ -194,7 +194,7 @@ public:
 // Otherwise, you should use wxDataObjectComposite or wxDataObject directly.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDataObjectSimple : public wxDataObject
+class WXDLLEXPORT wxDataObjectSimple : public wxDataObject
 {
 public:
     // ctor takes the format we support, but it can also be set later with
@@ -246,7 +246,7 @@ private:
     // the one and only format we support
     wxDataFormat m_format;
 
-    wxDECLARE_NO_COPY_CLASS(wxDataObjectSimple);
+    DECLARE_NO_COPY_CLASS(wxDataObjectSimple)
 };
 
 // ----------------------------------------------------------------------------
@@ -261,7 +261,7 @@ private:
 
 WX_DECLARE_EXPORTED_LIST(wxDataObjectSimple, wxSimpleDataObjectList);
 
-class WXDLLIMPEXP_CORE wxDataObjectComposite : public wxDataObject
+class WXDLLEXPORT wxDataObjectComposite : public wxDataObject
 {
 public:
     // ctor
@@ -274,17 +274,11 @@ public:
     void Add(wxDataObjectSimple *dataObject, bool preferred = false);
 
     // Report the format passed to the SetData method.  This should be the
-    // format of the data object within the composite that received data from
+    // format of the data object within the composite that recieved data from
     // the clipboard or the DnD operation.  You can use this method to find
-    // out what kind of data object was received.
+    // out what kind of data object was recieved.
     wxDataFormat GetReceivedFormat() const;
 
-    // Returns the pointer to the object which supports this format or NULL.
-    // The returned pointer is owned by wxDataObjectComposite and must
-    // therefore not be destroyed by the caller.
-    wxDataObjectSimple *GetObject(const wxDataFormat& format,
-                                  wxDataObjectBase::Direction dir = Get) const;
-
     // implement base class pure virtuals
     // ----------------------------------
     virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const;
@@ -301,6 +295,10 @@ public:
     virtual size_t GetBufferOffset( const wxDataFormat& format );
 #endif
 
+protected:
+    // returns the pointer to the object which supports this format or NULL
+    wxDataObjectSimple *GetObject(const wxDataFormat& format) const;
+
 private:
     // the list of all (simple) data objects whose formats we support
     wxSimpleDataObjectList m_dataObjects;
@@ -311,7 +309,7 @@ private:
 
     wxDataFormat m_receivedFormat;
 
-    wxDECLARE_NO_COPY_CLASS(wxDataObjectComposite);
+    DECLARE_NO_COPY_CLASS(wxDataObjectComposite)
 };
 
 // ============================================================================
@@ -326,54 +324,7 @@ private:
 // wxTextDataObject contains text data
 // ----------------------------------------------------------------------------
 
-#if wxUSE_UNICODE
-    #if defined(__WXGTK20__)
-        #define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
-    #elif defined(__WXMAC__)
-        #define wxNEEDS_UTF16_FOR_TEXT_DATAOBJ
-    #endif
-#endif // wxUSE_UNICODE
-
-class WXDLLIMPEXP_CORE wxHTMLDataObject : public wxDataObjectSimple
-{
-public:
-    // ctor: you can specify the text here or in SetText(), or override
-    // GetText()
-    wxHTMLDataObject(const wxString& html = wxEmptyString)
-        : wxDataObjectSimple(wxDF_HTML),
-          m_html(html)
-        {
-        }
-
-    // virtual functions which you may override if you want to provide text on
-    // demand only - otherwise, the trivial default versions will be used
-    virtual size_t GetLength() const { return m_html.Len() + 1; }
-    virtual wxString GetHTML() const { return m_html; }
-    virtual void SetHTML(const wxString& html) { m_html = html; }
-    
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-    
-    // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
-    {
-        return GetDataSize();
-    }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
-    {
-        return GetDataHere(buf);
-    }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
-    {
-        return SetData(len, buf);
-    }
-
-private:
-    wxString m_html;
-};
-
-class WXDLLIMPEXP_CORE wxTextDataObject : public wxDataObjectSimple
+class WXDLLEXPORT wxTextDataObject : public wxDataObjectSimple
 {
 public:
     // ctor: you can specify the text here or in SetText(), or override
@@ -400,7 +351,7 @@ public:
     // ----------------------------------
 
     // some platforms have 2 and not 1 format for text data
-#if defined(wxNEEDS_UTF8_FOR_TEXT_DATAOBJ) || defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
+#if wxUSE_UNICODE && (defined(__WXGTK20__) || defined(__WXMAC__))
     virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const { return 2; }
     virtual void GetAllFormats(wxDataFormat *formats,
                                wxDataObjectBase::Direction WXUNUSED(dir) = Get) const;
@@ -412,7 +363,7 @@ public:
     size_t GetDataSize(const wxDataFormat& format) const;
     bool GetDataHere(const wxDataFormat& format, void *pBuf) const;
     bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf);
-#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ
+#else
     virtual size_t GetDataSize() const;
     virtual bool GetDataHere(void *buf) const;
     virtual bool SetData(size_t len, const void *buf);
@@ -429,19 +380,19 @@ public:
     {
         return SetData(len, buf);
     }
-#endif // different wxTextDataObject implementations
+#endif
 
 private:
     wxString m_text;
 
-    wxDECLARE_NO_COPY_CLASS(wxTextDataObject);
+    DECLARE_NO_COPY_CLASS(wxTextDataObject)
 };
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject contains a bitmap
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmapDataObjectBase : public wxDataObjectSimple
+class WXDLLEXPORT wxBitmapDataObjectBase : public wxDataObjectSimple
 {
 public:
     // ctor: you can specify the bitmap here or in SetBitmap(), or override
@@ -459,7 +410,7 @@ public:
 protected:
     wxBitmap m_bitmap;
 
-    wxDECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase);
+    DECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -469,7 +420,7 @@ protected:
 //     data from drag and drop operation.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFileDataObjectBase : public wxDataObjectSimple
+class WXDLLEXPORT wxFileDataObjectBase : public wxDataObjectSimple
 {
 public:
     // ctor: use AddFile() later to fill the array
@@ -481,7 +432,7 @@ public:
 protected:
     wxArrayString m_filenames;
 
-    wxDECLARE_NO_COPY_CLASS(wxFileDataObjectBase);
+    DECLARE_NO_COPY_CLASS(wxFileDataObjectBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -490,7 +441,7 @@ protected:
 // It is understood that this data can be copied bitwise.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxCustomDataObject : public wxDataObjectSimple
+class WXDLLEXPORT wxCustomDataObject : public wxDataObjectSimple
 {
 public:
     // if you don't specify the format in the ctor, you can still use
@@ -542,7 +493,7 @@ private:
     size_t m_size;
     void  *m_data;
 
-    wxDECLARE_NO_COPY_CLASS(wxCustomDataObject);
+    DECLARE_NO_COPY_CLASS(wxCustomDataObject)
 };
 
 // ----------------------------------------------------------------------------
@@ -551,20 +502,19 @@ private:
 
 #if defined(__WXMSW__)
     #include "wx/msw/ole/dataobj2.h"
-    // wxURLDataObject defined in msw/ole/dataobj2.h
-#elif defined(__WXGTK20__)
-    #include "wx/gtk/dataobj2.h"
-    // wxURLDataObject defined in msw/ole/dataobj2.h
 
-#else
-    #if defined(__WXGTK__)
+    // wxURLDataObject defined in msw/ole/dataobj2.h
+#else // !__WXMSW__
+    #if defined(__WXGTK20__)
+        #include "wx/gtk/dataobj2.h"
+    #elif defined(__WXGTK__)
         #include "wx/gtk1/dataobj2.h"
     #elif defined(__WXX11__)
         #include "wx/x11/dataobj2.h"
     #elif defined(__WXMOTIF__)
         #include "wx/motif/dataobj2.h"
     #elif defined(__WXMAC__)
-        #include "wx/osx/dataobj2.h"
+        #include "wx/mac/dataobj2.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dataobj2.h"
     #elif defined(__WXPM__)
@@ -572,7 +522,7 @@ private:
     #endif
 
     // wxURLDataObject is simply wxTextDataObject with a different name
-    class WXDLLIMPEXP_CORE wxURLDataObject : public wxTextDataObject
+    class WXDLLEXPORT wxURLDataObject : public wxTextDataObject
     {
     public:
         wxURLDataObject(const wxString& url = wxEmptyString)
@@ -583,7 +533,7 @@ private:
         wxString GetURL() const { return GetText(); }
         void SetURL(const wxString& url) { SetText(url); }
     };
-#endif
+#endif // __WXMSW__/!__WXMSW__
 
 #endif // wxUSE_DATAOBJ
 
diff --git a/Source/3rd Party/wx/include/wx/datetime.h b/Source/3rd Party/wx/include/wx/datetime.h
index f4bca124a..f527b9d42 100644
--- a/Source/3rd Party/wx/include/wx/datetime.h	
+++ b/Source/3rd Party/wx/include/wx/datetime.h	
@@ -5,7 +5,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.02.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: datetime.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,23 +17,19 @@
 
 #if wxUSE_DATETIME
 
-#ifdef __WXWINCE__
-    #include "wx/msw/wince/time.h"
+#ifndef __WXWINCE__
+#include <time.h>
 #else
-    #include <time.h>
-#endif // OS
+#include "wx/msw/wince/time.h"
+#endif
 
 #include <limits.h>             // for INT_MIN
 
 #include "wx/longlong.h"
-#include "wx/anystr.h"
 
 class WXDLLIMPEXP_FWD_BASE wxDateTime;
 class WXDLLIMPEXP_FWD_BASE wxTimeSpan;
 class WXDLLIMPEXP_FWD_BASE wxDateSpan;
-#ifdef __WINDOWS__
-struct _SYSTEMTIME;
-#endif
 
 #include "wx/dynarray.h"
 
@@ -41,8 +37,11 @@ struct _SYSTEMTIME;
 // set this to the corresponding value in seconds 1/1/1970 has on your
 // systems c-runtime
 
-#define WX_TIME_BASE_OFFSET 0
-
+#if defined(__WXMAC__) && !defined(__DARWIN__) && __MSL__ < 0x6000
+    #define WX_TIME_BASE_OFFSET ( 2082844800L + 126144000L )
+#else
+    #define WX_TIME_BASE_OFFSET 0
+#endif
 /*
  * TODO
  *
@@ -53,6 +52,27 @@ struct _SYSTEMTIME;
  *   5. wxDateTimeHolidayAuthority for Easter and other christian feasts
  */
 
+/* Two wrapper functions for thread safety */
+#ifdef HAVE_LOCALTIME_R
+#define wxLocaltime_r localtime_r
+#else
+WXDLLIMPEXP_BASE struct tm *wxLocaltime_r(const time_t*, struct tm*);
+#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__)
+     // On Windows, localtime _is_ threadsafe!
+#warning using pseudo thread-safe wrapper for localtime to emulate localtime_r
+#endif
+#endif
+
+#ifdef HAVE_GMTIME_R
+#define wxGmtime_r gmtime_r
+#else
+WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*);
+#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__)
+     // On Windows, gmtime _is_ threadsafe!
+#warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r
+#endif
+#endif
+
 /*
   The three (main) classes declared in this header represent:
 
@@ -107,25 +127,12 @@ struct _SYSTEMTIME;
 // wxInvalidDateTime)
 class WXDLLIMPEXP_FWD_BASE wxDateTime;
 
-extern WXDLLIMPEXP_DATA_BASE(const char) wxDefaultDateTimeFormat[];
-extern WXDLLIMPEXP_DATA_BASE(const char) wxDefaultTimeSpanFormat[];
+extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDefaultDateTimeFormat;
+extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDefaultTimeSpanFormat;
 extern WXDLLIMPEXP_DATA_BASE(const wxDateTime) wxDefaultDateTime;
 
 #define wxInvalidDateTime wxDefaultDateTime
 
-
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-// if configure detected strftime(), we have it too
-#ifdef HAVE_STRFTIME
-    #define wxHAS_STRFTIME
-// suppose everyone else has strftime except Win CE unless VC8 is used
-#elif !defined(__WXWINCE__) || defined(__VISUALC8__)
-    #define wxHAS_STRFTIME
-#endif
-
 // ----------------------------------------------------------------------------
 // wxDateTime represents an absolute moment in the time
 // ----------------------------------------------------------------------------
@@ -152,7 +159,7 @@ public:
         // the time in the current time zone
         Local,
 
-        // zones from GMT (= Greenwich Mean Time): they're guaranteed to be
+        // zones from GMT (= Greenwhich Mean Time): they're guaranteed to be
         // consequent numbers, so writing something like `GMT0 + offset' is
         // safe if abs(offset) <= 12
 
@@ -226,7 +233,7 @@ public:
         // adoption of the Gregorian calendar (see IsGregorian())
         //
         // All data and comments taken verbatim from "The Calendar FAQ (v 2.0)"
-        // by Claus Tøndering, http://www.pip.dknet.dk/~c-t/calendar.html
+        // by Claus T�ndering, http://www.pip.dknet.dk/~c-t/calendar.html
         // except for the comments "we take".
         //
         // Symbol "->" should be read as "was followed by" in the comments
@@ -415,15 +422,19 @@ public:
     public:
         TimeZone(TZ tz);
 
-        // create time zone object with the given offset
-        TimeZone(long offset = 0) { m_offset = offset; }
+        // don't use this ctor, it doesn't work for negative offsets (but can't
+        // be removed or changed to avoid breaking ABI in 2.8)
+        TimeZone(wxDateTime_t offset = 0) { m_offset = offset; }
 
+#if wxABI_VERSION >= 20808
+        // create time zone object with the given offset
         static TimeZone Make(long offset)
         {
             TimeZone tz;
             tz.m_offset = offset;
             return tz;
         }
+#endif // wxABI 2.8.8+
 
         long GetOffset() const { return m_offset; }
 
@@ -441,9 +452,7 @@ public:
         //     instead of modifying the member fields directly!
     struct WXDLLIMPEXP_BASE Tm
     {
-        wxDateTime_t msec, sec, min, hour,
-                     mday,  // Day of the month in 1..31 range.
-                     yday;  // Day of the year in 0..365 range.
+        wxDateTime_t msec, sec, min, hour, mday;
         Month mon;
         int year;
 
@@ -478,10 +487,9 @@ public:
         // the timezone we correspond to
         TimeZone m_tz;
 
-        // This value can only be accessed via GetWeekDay() and not directly
-        // because it's not always computed when creating this object and may
-        // need to be calculated on demand.
-        wxDateTime_t wday;
+        // these values can't be accessed directly because they're not always
+        // computed and we calculate them on demand
+        wxDateTime_t wday, yday;
     };
 
     // static methods
@@ -524,25 +532,16 @@ public:
                                         int year = Inv_Year,
                                         Calendar cal = Gregorian);
 
-
         // get the full (default) or abbreviated month name in the current
         // locale, returns empty string on error
     static wxString GetMonthName(Month month,
                                  NameFlags flags = Name_Full);
 
-        // get the standard English full (default) or abbreviated month name
-    static wxString GetEnglishMonthName(Month month,
-                                        NameFlags flags = Name_Full);
-
         // get the full (default) or abbreviated weekday name in the current
         // locale, returns empty string on error
     static wxString GetWeekDayName(WeekDay weekday,
                                    NameFlags flags = Name_Full);
 
-        // get the standard English full (default) or abbreviated weekday name
-    static wxString GetEnglishWeekDayName(WeekDay weekday,
-                                          NameFlags flags = Name_Full);
-
         // get the AM and PM strings in the current locale (may be empty)
     static void GetAmPmStrings(wxString *am, wxString *pm);
 
@@ -578,7 +577,7 @@ public:
     // ------------------------------------------------------------------------
 
         // default ctor does not initialize the object, use Set()!
-    wxDateTime() { m_time = wxLongLong(wxINT32_MIN, 0); }
+    wxDateTime() { m_time = wxLongLong((wxInt32)UINT_MAX, UINT_MAX); }
 
         // from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970)
 #if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
@@ -606,12 +605,6 @@ public:
                       wxDateTime_t minute = 0,
                       wxDateTime_t second = 0,
                       wxDateTime_t millisec = 0);
-#ifdef __WINDOWS__
-    wxDateTime(const struct _SYSTEMTIME& st)
-    {
-        SetFromMSWSysTime(st);
-    }
-#endif
 
         // default copy ctor ok
 
@@ -659,9 +652,11 @@ public:
         // resets time to 00:00:00, doesn't change the date
     wxDateTime& ResetTime();
 
+#if wxABI_VERSION >= 20802
         // get the date part of this object only, i.e. the object which has the
         // same date as this one but time of 00:00:00
     wxDateTime GetDateOnly() const;
+#endif // wxABI 2.8.1+
 
         // the following functions don't change the values of the other
         // fields, i.e. SetMinute() won't change either hour or seconds value
@@ -711,7 +706,7 @@ public:
     wxDateTime& SetToPrevWeekDay(WeekDay weekday);
     inline wxDateTime GetPrevWeekDay(WeekDay weekday) const;
 
-        // set to Nth occurrence of given weekday in the given month of the
+        // set to Nth occurence of given weekday in the given month of the
         // given year (time is set to 0), return true on success and false on
         // failure. n may be positive (1..5) or negative to count from the end
         // of the month (see helper function SetToLastWeekDay())
@@ -926,20 +921,6 @@ public:
         // pack the date in DOS format
     unsigned long GetAsDOS() const;
 
-    // SYSTEMTIME format
-    // ------------------------------------------------------------------------
-#ifdef __WINDOWS__
-    // convert SYSTEMTIME to wxDateTime
-    wxDateTime& SetFromMSWSysTime(const struct _SYSTEMTIME& st);
-
-    // convert wxDateTime to SYSTEMTIME
-    void GetAsMSWSysTime(struct _SYSTEMTIME* st) const;
-
-    // same as above but only take date part into account, time is always zero
-    wxDateTime& SetFromMSWSysDate(const struct _SYSTEMTIME& st);
-    void GetAsMSWSysDate(struct _SYSTEMTIME* st) const;
-#endif // __WINDOWS__
-
     // comparison (see also functions below for operator versions)
     // ------------------------------------------------------------------------
 
@@ -1063,193 +1044,46 @@ public:
     inline wxTimeSpan Subtract(const wxDateTime& dt) const;
     inline wxTimeSpan operator-(const wxDateTime& dt2) const;
 
-    // conversion to/from text
+    // conversion to/from text: all conversions from text return the pointer to
+    // the next character following the date specification (i.e. the one where
+    // the scan had to stop) or NULL on failure.
     // ------------------------------------------------------------------------
 
-    // all conversions functions return true to indicate whether parsing
-    // succeeded or failed and fill in the provided end iterator, which must
-    // not be NULL, with the location of the character where the parsing
-    // stopped (this will be end() of the passed string if everything was
-    // parsed)
-
         // parse a string in RFC 822 format (found e.g. in mail headers and
         // having the form "Wed, 10 Feb 1999 19:07:07 +0100")
-    bool ParseRfc822Date(const wxString& date,
-                         wxString::const_iterator *end);
-
+    const wxChar *ParseRfc822Date(const wxChar* date);
         // parse a date/time in the given format (see strptime(3)), fill in
         // the missing (in the string) fields with the values of dateDef (by
         // default, they will not change if they had valid values or will
         // default to Today() otherwise)
-    bool ParseFormat(const wxString& date,
-                     const wxString& format,
-                     const wxDateTime& dateDef,
-                     wxString::const_iterator *end);
-
-    bool ParseFormat(const wxString& date,
-                     const wxString& format,
-                     wxString::const_iterator *end)
-    {
-        return ParseFormat(date, format, wxDefaultDateTime, end);
-    }
-
-    bool ParseFormat(const wxString& date,
-                     wxString::const_iterator *end)
-    {
-        return ParseFormat(date, wxDefaultDateTimeFormat, wxDefaultDateTime, end);
-    }
-
-        // parse a string containing date, time or both in ISO 8601 format
-        //
-        // notice that these functions are new in wx 3.0 and so we don't
-        // provide compatibility overloads for them
-    bool ParseISODate(const wxString& date)
-    {
-        wxString::const_iterator end;
-        return ParseFormat(date, wxS("%Y-%m-%d"), &end) && end == date.end();
-    }
-
-    bool ParseISOTime(const wxString& time)
-    {
-        wxString::const_iterator end;
-        return ParseFormat(time, wxS("%H:%M:%S"), &end) && end == time.end();
-    }
-
-    bool ParseISOCombined(const wxString& datetime, char sep = 'T')
-    {
-        wxString::const_iterator end;
-        const wxString fmt = wxS("%Y-%m-%d") + wxString(sep) + wxS("%H:%M:%S");
-        return ParseFormat(datetime, fmt, &end) && end == datetime.end();
-    }
-
+    const wxChar *ParseFormat(const wxChar *date,
+                              const wxChar *format = wxDefaultDateTimeFormat,
+                              const wxDateTime& dateDef = wxDefaultDateTime);
         // parse a string containing the date/time in "free" format, this
         // function will try to make an educated guess at the string contents
-    bool ParseDateTime(const wxString& datetime,
-                       wxString::const_iterator *end);
-
+    const wxChar *ParseDateTime(const wxChar *datetime);
         // parse a string containing the date only in "free" format (less
         // flexible than ParseDateTime)
-    bool ParseDate(const wxString& date,
-                   wxString::const_iterator *end);
-
+    const wxChar *ParseDate(const wxChar *date);
         // parse a string containing the time only in "free" format
-    bool ParseTime(const wxString& time,
-                   wxString::const_iterator *end);
-
+    const wxChar *ParseTime(const wxChar *time);
 
         // this function accepts strftime()-like format string (default
         // argument corresponds to the preferred date and time representation
         // for the current locale) and returns the string containing the
         // resulting text representation
-    wxString Format(const wxString& format = wxDefaultDateTimeFormat,
+    wxString Format(const wxChar *format = wxDefaultDateTimeFormat,
                     const TimeZone& tz = Local) const;
         // preferred date representation for the current locale
-    wxString FormatDate() const { return Format(wxS("%x")); }
+    wxString FormatDate() const { return Format(wxT("%x")); }
         // preferred time representation for the current locale
-    wxString FormatTime() const { return Format(wxS("%X")); }
+    wxString FormatTime() const { return Format(wxT("%X")); }
         // returns the string representing the date in ISO 8601 format
         // (YYYY-MM-DD)
-    wxString FormatISODate() const { return Format(wxS("%Y-%m-%d")); }
+    wxString FormatISODate() const { return Format(wxT("%Y-%m-%d")); }
         // returns the string representing the time in ISO 8601 format
         // (HH:MM:SS)
-    wxString FormatISOTime() const { return Format(wxS("%H:%M:%S")); }
-        // return the combined date time representation in ISO 8601 format; the
-        // separator character should be 'T' according to the standard but it
-        // can also be useful to set it to ' '
-    wxString FormatISOCombined(char sep = 'T') const
-        { return FormatISODate() + sep + FormatISOTime(); }
-
-
-    // backwards compatible versions of the parsing functions: they return an
-    // object representing the next character following the date specification
-    // (i.e. the one where the scan had to stop) or a special NULL-like object
-    // on failure
-    //
-    // they're not deprecated because a lot of existing code uses them and
-    // there is no particular harm in keeping them but you should still prefer
-    // the versions above in the new code
-    wxAnyStrPtr ParseRfc822Date(const wxString& date)
-    {
-        wxString::const_iterator end;
-        return ParseRfc822Date(date, &end) ? wxAnyStrPtr(date, end)
-                                           : wxAnyStrPtr();
-    }
-
-    wxAnyStrPtr ParseFormat(const wxString& date,
-                            const wxString& format = wxDefaultDateTimeFormat,
-                            const wxDateTime& dateDef = wxDefaultDateTime)
-    {
-        wxString::const_iterator end;
-        return ParseFormat(date, format, dateDef, &end) ? wxAnyStrPtr(date, end)
-                                                        : wxAnyStrPtr();
-    }
-
-    wxAnyStrPtr ParseDateTime(const wxString& datetime)
-    {
-        wxString::const_iterator end;
-        return ParseDateTime(datetime, &end) ? wxAnyStrPtr(datetime, end)
-                                             : wxAnyStrPtr();
-    }
-
-    wxAnyStrPtr ParseDate(const wxString& date)
-    {
-        wxString::const_iterator end;
-        return ParseDate(date, &end) ? wxAnyStrPtr(date, end)
-                                     : wxAnyStrPtr();
-    }
-
-    wxAnyStrPtr ParseTime(const wxString& time)
-    {
-        wxString::const_iterator end;
-        return ParseTime(time, &end) ? wxAnyStrPtr(time, end)
-                                     : wxAnyStrPtr();
-    }
-
-    // In addition to wxAnyStrPtr versions above we also must provide the
-    // overloads for C strings as we must return a pointer into the original
-    // string and not inside a temporary wxString which would have been created
-    // if the overloads above were used.
-    //
-    // And then we also have to provide the overloads for wxCStrData, as usual.
-    // Unfortunately those ones can't return anything as we don't have any
-    // sufficiently long-lived wxAnyStrPtr to return from them: any temporary
-    // strings it would point to would be destroyed when this function returns
-    // making it impossible to dereference the return value. So we just don't
-    // return anything from here which at least allows to keep compatibility
-    // with the code not testing the return value. Other uses of this method
-    // need to be converted to use one of the new bool-returning overloads
-    // above.
-    void ParseRfc822Date(const wxCStrData& date)
-        { ParseRfc822Date(wxString(date)); }
-    const char* ParseRfc822Date(const char* date);
-    const wchar_t* ParseRfc822Date(const wchar_t* date);
-
-    void ParseFormat(const wxCStrData& date,
-                     const wxString& format = wxDefaultDateTimeFormat,
-                     const wxDateTime& dateDef = wxDefaultDateTime)
-        { ParseFormat(wxString(date), format, dateDef); }
-    const char* ParseFormat(const char* date,
-                            const wxString& format = wxDefaultDateTimeFormat,
-                            const wxDateTime& dateDef = wxDefaultDateTime);
-    const wchar_t* ParseFormat(const wchar_t* date,
-                               const wxString& format = wxDefaultDateTimeFormat,
-                               const wxDateTime& dateDef = wxDefaultDateTime);
-
-    void ParseDateTime(const wxCStrData& datetime)
-        { ParseDateTime(wxString(datetime)); }
-    const char* ParseDateTime(const char* datetime);
-    const wchar_t* ParseDateTime(const wchar_t* datetime);
-
-    void ParseDate(const wxCStrData& date)
-        { ParseDate(wxString(date)); }
-    const char* ParseDate(const char* date);
-    const wchar_t* ParseDate(const wchar_t* date);
-
-    void ParseTime(const wxCStrData& time)
-        { ParseTime(wxString(time)); }
-    const char* ParseTime(const char* time);
-    const wchar_t* ParseTime(const wchar_t* time);
-
+    wxString FormatISOTime() const { return Format(wxT("%H:%M:%S")); }
 
     // implementation
     // ------------------------------------------------------------------------
@@ -1261,7 +1095,7 @@ public:
     inline wxLongLong GetValue() const;
 
     // a helper function to get the current time_t
-    static time_t GetTimeNow() { return time(NULL); }
+    static time_t GetTimeNow() { return time((time_t *)NULL); }
 
     // another one to get the current time broken down
     static struct tm *GetTmNow()
@@ -1418,7 +1252,7 @@ public:
         // compare two timestamps: works with the absolute values, i.e. 1
         // hour is shorter than -2 hours. Also, it will return false if the
         // timespans are equal in absolute value.
-    bool IsShorterThan(const wxTimeSpan& t) const;
+    bool IsShorterThan(const wxTimeSpan& t) const { return !IsLongerThan(t); }
 
     inline bool operator<(const wxTimeSpan &ts) const
     {
@@ -1475,7 +1309,7 @@ public:
         // resulting text representation. Notice that only some of format
         // specifiers valid for wxDateTime are valid for wxTimeSpan: hours,
         // minutes and seconds make sense, but not "PM/AM" string for example.
-    wxString Format(const wxString& format = wxDefaultTimeSpanFormat) const;
+    wxString Format(const wxChar *format = wxDefaultTimeSpanFormat) const;
 
     // implementation
     // ------------------------------------------------------------------------
@@ -1753,9 +1587,7 @@ protected:
 
 inline bool wxDateTime::IsInStdRange() const
 {
-    // currently we don't know what is the real type of time_t so prefer to err
-    // on the safe side and limit it to 32 bit values which is safe everywhere
-    return m_time >= 0l && (m_time / TIME_T_FACTOR) < wxINT32_MAX;
+    return m_time >= 0l && (m_time / TIME_T_FACTOR) < LONG_MAX;
 }
 
 /* static */
@@ -2115,9 +1947,9 @@ inline wxLongLong wxTimeSpan::GetSeconds() const
 
 inline int wxTimeSpan::GetMinutes() const
 {
-    // For compatibility, this method (and the other accessors) return int,
-    // even though GetLo() actually returns unsigned long with greater range.
-    return static_cast<int>((GetSeconds() / 60l).GetLo());
+    // explicit cast to int suppresses a warning with CodeWarrior and possibly
+    // others (changing the return type to long from int is impossible in 2.8)
+    return (int)((GetSeconds() / 60l).GetLo());
 }
 
 inline int wxTimeSpan::GetHours() const
@@ -2190,11 +2022,6 @@ inline bool wxTimeSpan::IsLongerThan(const wxTimeSpan& ts) const
     return GetValue().Abs() > ts.GetValue().Abs();
 }
 
-inline bool wxTimeSpan::IsShorterThan(const wxTimeSpan& ts) const
-{
-    return GetValue().Abs() < ts.GetValue().Abs();
-}
-
 // ----------------------------------------------------------------------------
 // wxDateSpan
 // ----------------------------------------------------------------------------
diff --git a/Source/3rd Party/wx/include/wx/datstrm.h b/Source/3rd Party/wx/include/wx/datstrm.h
index 5cf06eb29..b6d00e43e 100644
--- a/Source/3rd Party/wx/include/wx/datstrm.h	
+++ b/Source/3rd Party/wx/include/wx/datstrm.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/datstrm.h
+// Name:        datstrm.h
 // Purpose:     Data stream classes
 // Author:      Guilhem Lavaux
 // Modified by: Mickael Gilabert
 // Created:     28/06/1998
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: datstrm.h 38576 2006-04-05 16:10:08Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@ class WXDLLIMPEXP_BASE wxDataInputStream
 {
 public:
 #if wxUSE_UNICODE
-    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvUTF8 );
+    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto());
 #else
     wxDataInputStream(wxInputStream& s);
 #endif
@@ -79,11 +79,6 @@ public:
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
 
-#if wxUSE_UNICODE
-    void SetConv( const wxMBConv &conv );
-    wxMBConv *GetConv() const { return m_conv; }
-#endif
-
 protected:
     wxInputStream *m_input;
     bool m_be_order;
@@ -91,14 +86,14 @@ protected:
     wxMBConv *m_conv;
 #endif
 
-    wxDECLARE_NO_COPY_CLASS(wxDataInputStream);
+    DECLARE_NO_COPY_CLASS(wxDataInputStream)
 };
 
 class WXDLLIMPEXP_BASE wxDataOutputStream
 {
 public:
 #if wxUSE_UNICODE
-    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvUTF8 );
+    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto());
 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif
@@ -137,6 +132,7 @@ public:
     void Write8(const wxUint8 *buffer, size_t size);
     void WriteDouble(const double *buffer, size_t size);
 
+    wxDataOutputStream& operator<<(const wxChar *string);
     wxDataOutputStream& operator<<(const wxString& string);
     wxDataOutputStream& operator<<(wxInt8 c);
     wxDataOutputStream& operator<<(wxInt16 i);
@@ -157,11 +153,6 @@ public:
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
 
-#if wxUSE_UNICODE
-    void SetConv( const wxMBConv &conv );
-    wxMBConv *GetConv() const { return m_conv; }
-#endif
-
 protected:
     wxOutputStream *m_output;
     bool m_be_order;
@@ -169,7 +160,7 @@ protected:
     wxMBConv *m_conv;
 #endif
 
-    wxDECLARE_NO_COPY_CLASS(wxDataOutputStream);
+    DECLARE_NO_COPY_CLASS(wxDataOutputStream)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/dc.h b/Source/3rd Party/wx/include/wx/dc.h
index 63cde6779..8448d8005 100644
--- a/Source/3rd Party/wx/include/wx/dc.h	
+++ b/Source/3rd Party/wx/include/wx/dc.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05/25/99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dc.h 59768 2009-03-23 12:35:12Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,137 +26,25 @@
 #include "wx/brush.h"
 #include "wx/pen.h"
 #include "wx/palette.h"
+#include "wx/list.h"            // we use wxList in inline functions
 #include "wx/dynarray.h"
 #include "wx/math.h"
-#include "wx/image.h"
-#include "wx/region.h"
-#include "wx/affinematrix2d.h"
-
-#define wxUSE_NEW_DC 1
 
 class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxClientDC;
-class WXDLLIMPEXP_FWD_CORE wxPaintDC;
-class WXDLLIMPEXP_FWD_CORE wxWindowDC;
-class WXDLLIMPEXP_FWD_CORE wxScreenDC;
-class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
-class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
-class WXDLLIMPEXP_FWD_CORE wxPrintData;
+class WXDLLIMPEXP_FWD_CORE wxDCBase;
 
-#if wxUSE_GRAPHICS_CONTEXT
-class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
-#endif
-
-//  Logical ops
-enum wxRasterOperationMode
-{
-    wxCLEAR,       // 0
-    wxXOR,         // src XOR dst
-    wxINVERT,      // NOT dst
-    wxOR_REVERSE,  // src OR (NOT dst)
-    wxAND_REVERSE, // src AND (NOT dst)
-    wxCOPY,        // src
-    wxAND,         // src AND dst
-    wxAND_INVERT,  // (NOT src) AND dst
-    wxNO_OP,       // dst
-    wxNOR,         // (NOT src) AND (NOT dst)
-    wxEQUIV,       // (NOT src) XOR dst
-    wxSRC_INVERT,  // (NOT src)
-    wxOR_INVERT,   // (NOT src) OR dst
-    wxNAND,        // (NOT src) OR (NOT dst)
-    wxOR,          // src OR dst
-    wxSET          // 1
-#if WXWIN_COMPATIBILITY_2_8
-    ,wxROP_BLACK = wxCLEAR,
-    wxBLIT_BLACKNESS = wxCLEAR,
-    wxROP_XORPEN = wxXOR,
-    wxBLIT_SRCINVERT = wxXOR,
-    wxROP_NOT = wxINVERT,
-    wxBLIT_DSTINVERT = wxINVERT,
-    wxROP_MERGEPENNOT = wxOR_REVERSE,
-    wxBLIT_00DD0228 = wxOR_REVERSE,
-    wxROP_MASKPENNOT = wxAND_REVERSE,
-    wxBLIT_SRCERASE = wxAND_REVERSE,
-    wxROP_COPYPEN = wxCOPY,
-    wxBLIT_SRCCOPY = wxCOPY,
-    wxROP_MASKPEN = wxAND,
-    wxBLIT_SRCAND = wxAND,
-    wxROP_MASKNOTPEN = wxAND_INVERT,
-    wxBLIT_00220326 = wxAND_INVERT,
-    wxROP_NOP = wxNO_OP,
-    wxBLIT_00AA0029 = wxNO_OP,
-    wxROP_NOTMERGEPEN = wxNOR,
-    wxBLIT_NOTSRCERASE = wxNOR,
-    wxROP_NOTXORPEN = wxEQUIV,
-    wxBLIT_00990066 = wxEQUIV,
-    wxROP_NOTCOPYPEN = wxSRC_INVERT,
-    wxBLIT_NOTSCRCOPY = wxSRC_INVERT,
-    wxROP_MERGENOTPEN = wxOR_INVERT,
-    wxBLIT_MERGEPAINT = wxOR_INVERT,
-    wxROP_NOTMASKPEN = wxNAND,
-    wxBLIT_007700E6 = wxNAND,
-    wxROP_MERGEPEN = wxOR,
-    wxBLIT_SRCPAINT = wxOR,
-    wxROP_WHITE = wxSET,
-    wxBLIT_WHITENESS = wxSET
-#endif //WXWIN_COMPATIBILITY_2_8
-};
-
-//  Flood styles
-enum wxFloodFillStyle
-{
-    wxFLOOD_SURFACE = 1,
-    wxFLOOD_BORDER
-};
-
-//  Mapping modes
-enum wxMappingMode
-{
-    wxMM_TEXT = 1,
-    wxMM_METRIC,
-    wxMM_LOMETRIC,
-    wxMM_TWIPS,
-    wxMM_POINTS
-};
-
-// Description of text characteristics.
-struct wxFontMetrics
-{
-    wxFontMetrics()
-    {
-        height =
-        ascent =
-        descent =
-        internalLeading =
-        externalLeading =
-        averageWidth = 0;
-    }
-
-    int height,             // Total character height.
-        ascent,             // Part of the height above the baseline.
-        descent,            // Part of the height below the baseline.
-        internalLeading,    // Intra-line spacing.
-        externalLeading,    // Inter-line spacing.
-        averageWidth;       // Average font width, a.k.a. "x-width".
-};
-
-#if WXWIN_COMPATIBILITY_2_8
-
-//-----------------------------------------------------------------------------
-// wxDrawObject helper class
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDrawObject
+class WXDLLEXPORT wxDrawObject
 {
 public:
-    wxDEPRECATED_CONSTRUCTOR(wxDrawObject)()
+
+    wxDrawObject()
         : m_isBBoxValid(false)
         , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
     { }
 
     virtual ~wxDrawObject() { }
 
-    virtual void Draw(wxDC&) const { }
+    virtual void Draw(wxDCBase&) const { }
 
     virtual void CalcBoundingBox(wxCoord x, wxCoord y)
     {
@@ -202,114 +90,297 @@ protected:
     wxCoord m_minX, m_minY, m_maxX, m_maxY;
 };
 
-#endif // WXWIN_COMPATIBILITY_2_8
+// ---------------------------------------------------------------------------
+// global variables
+// ---------------------------------------------------------------------------
 
+// ---------------------------------------------------------------------------
+// wxDC is the device context - object on which any drawing is done
+// ---------------------------------------------------------------------------
 
-//-----------------------------------------------------------------------------
-// wxDCFactory
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxDCImpl;
-
-class WXDLLIMPEXP_CORE wxDCFactory
+class WXDLLEXPORT wxDCBase : public wxObject
 {
 public:
-    wxDCFactory() {}
-    virtual ~wxDCFactory() {}
+    wxDCBase()
+        : m_colour(wxColourDisplay())
+        , m_ok(true)
+        , m_clipping(false)
+        , m_isInteractive(0)
+        , m_isBBoxValid(false)
+        , m_logicalOriginX(0), m_logicalOriginY(0)
+        , m_deviceOriginX(0), m_deviceOriginY(0)
+        , m_logicalScaleX(1.0), m_logicalScaleY(1.0)
+        , m_userScaleX(1.0), m_userScaleY(1.0)
+        , m_scaleX(1.0), m_scaleY(1.0)
+        , m_signX(1), m_signY(1)
+        , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
+        , m_clipX1(0), m_clipY1(0), m_clipX2(0), m_clipY2(0)
+        , m_logicalFunction(wxCOPY)
+        , m_backgroundMode(wxTRANSPARENT)
+        , m_mappingMode(wxMM_TEXT)
+        , m_pen()
+        , m_brush()
+        , m_backgroundBrush(*wxTRANSPARENT_BRUSH)
+        , m_textForegroundColour(*wxBLACK)
+        , m_textBackgroundColour(*wxWHITE)
+        , m_font()
+#if wxUSE_PALETTE
+        , m_palette()
+        , m_hasCustomPalette(false)
+#endif // wxUSE_PALETTE
+    {
+        ResetBoundingBox();
+        ResetClipping();
+    }
 
-    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) = 0;
-    virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) = 0;
-    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) = 0;
-    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) = 0;
-    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) = 0;
-    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc ) = 0;
-    virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner ) = 0;
-#if wxUSE_PRINTING_ARCHITECTURE
-    virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data  ) = 0;
+    virtual ~wxDCBase() { }
+
+    // graphic primitives
+    // ------------------
+
+    virtual void DrawObject(wxDrawObject* drawobject)
+    {
+        drawobject->Draw(*this);
+        CalcBoundingBox(drawobject->MinX(),drawobject->MinY());
+        CalcBoundingBox(drawobject->MaxX(),drawobject->MaxY());
+    }
+
+    bool FloodFill(wxCoord x, wxCoord y, const wxColour& col,
+                   int style = wxFLOOD_SURFACE)
+        { return DoFloodFill(x, y, col, style); }
+    bool FloodFill(const wxPoint& pt, const wxColour& col,
+                   int style = wxFLOOD_SURFACE)
+        { return DoFloodFill(pt.x, pt.y, col, style); }
+
+    // fill the area specified by rect with a radial gradient, starting from
+    // initialColour in the centre of the cercle and fading to destColour.
+    void GradientFillConcentric(const wxRect& rect,
+                                const wxColour& initialColour,
+                                const wxColour& destColour)
+        { GradientFillConcentric(rect, initialColour, destColour,
+                                 wxPoint(rect.GetWidth() / 2,
+                                         rect.GetHeight() / 2)); }
+
+    void GradientFillConcentric(const wxRect& rect,
+                                const wxColour& initialColour,
+                                const wxColour& destColour,
+                                const wxPoint& circleCenter)
+        { DoGradientFillConcentric(rect, initialColour, destColour, circleCenter); }
+
+    // fill the area specified by rect with a linear gradient
+    void GradientFillLinear(const wxRect& rect,
+                            const wxColour& initialColour,
+                            const wxColour& destColour,
+                            wxDirection nDirection = wxEAST)
+        { DoGradientFillLinear(rect, initialColour, destColour, nDirection); }
+
+    bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const
+        { return DoGetPixel(x, y, col); }
+    bool GetPixel(const wxPoint& pt, wxColour *col) const
+        { return DoGetPixel(pt.x, pt.y, col); }
+
+    void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+        { DoDrawLine(x1, y1, x2, y2); }
+    void DrawLine(const wxPoint& pt1, const wxPoint& pt2)
+        { DoDrawLine(pt1.x, pt1.y, pt2.x, pt2.y); }
+
+    void CrossHair(wxCoord x, wxCoord y)
+        { DoCrossHair(x, y); }
+    void CrossHair(const wxPoint& pt)
+        { DoCrossHair(pt.x, pt.y); }
+
+    void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
+                 wxCoord xc, wxCoord yc)
+        { DoDrawArc(x1, y1, x2, y2, xc, yc); }
+    void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
+        { DoDrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y); }
+
+    void DrawCheckMark(wxCoord x, wxCoord y,
+                       wxCoord width, wxCoord height)
+        { DoDrawCheckMark(x, y, width, height); }
+    void DrawCheckMark(const wxRect& rect)
+        { DoDrawCheckMark(rect.x, rect.y, rect.width, rect.height); }
+
+    void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                         double sa, double ea)
+        { DoDrawEllipticArc(x, y, w, h, sa, ea); }
+    void DrawEllipticArc(const wxPoint& pt, const wxSize& sz,
+                         double sa, double ea)
+        { DoDrawEllipticArc(pt.x, pt.y, sz.x, sz.y, sa, ea); }
+
+    void DrawPoint(wxCoord x, wxCoord y)
+        { DoDrawPoint(x, y); }
+    void DrawPoint(const wxPoint& pt)
+        { DoDrawPoint(pt.x, pt.y); }
+
+    void DrawLines(int n, wxPoint points[],
+                   wxCoord xoffset = 0, wxCoord yoffset = 0)
+        { DoDrawLines(n, points, xoffset, yoffset); }
+    void DrawLines(const wxList *list,
+                   wxCoord xoffset = 0, wxCoord yoffset = 0);
+
+    void DrawPolygon(int n, wxPoint points[],
+                     wxCoord xoffset = 0, wxCoord yoffset = 0,
+                     int fillStyle = wxODDEVEN_RULE)
+        { DoDrawPolygon(n, points, xoffset, yoffset, fillStyle); }
+
+    void DrawPolygon(const wxList *list,
+                     wxCoord xoffset = 0, wxCoord yoffset = 0,
+                     int fillStyle = wxODDEVEN_RULE);
+
+    void DrawPolyPolygon(int n, int count[], wxPoint points[],
+                         wxCoord xoffset = 0, wxCoord yoffset = 0,
+                         int fillStyle = wxODDEVEN_RULE)
+        { DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); }
+
+    void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { DoDrawRectangle(x, y, width, height); }
+    void DrawRectangle(const wxPoint& pt, const wxSize& sz)
+        { DoDrawRectangle(pt.x, pt.y, sz.x, sz.y); }
+    void DrawRectangle(const wxRect& rect)
+        { DoDrawRectangle(rect.x, rect.y, rect.width, rect.height); }
+
+    void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height,
+                              double radius)
+        { DoDrawRoundedRectangle(x, y, width, height, radius); }
+    void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz,
+                             double radius)
+        { DoDrawRoundedRectangle(pt.x, pt.y, sz.x, sz.y, radius); }
+    void DrawRoundedRectangle(const wxRect& r, double radius)
+        { DoDrawRoundedRectangle(r.x, r.y, r.width, r.height, radius); }
+
+    void DrawCircle(wxCoord x, wxCoord y, wxCoord radius)
+        { DoDrawEllipse(x - radius, y - radius, 2*radius, 2*radius); }
+    void DrawCircle(const wxPoint& pt, wxCoord radius)
+        { DrawCircle(pt.x, pt.y, radius); }
+
+    void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { DoDrawEllipse(x, y, width, height); }
+    void DrawEllipse(const wxPoint& pt, const wxSize& sz)
+        { DoDrawEllipse(pt.x, pt.y, sz.x, sz.y); }
+    void DrawEllipse(const wxRect& rect)
+        { DoDrawEllipse(rect.x, rect.y, rect.width, rect.height); }
+
+    void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
+        { DoDrawIcon(icon, x, y); }
+    void DrawIcon(const wxIcon& icon, const wxPoint& pt)
+        { DoDrawIcon(icon, pt.x, pt.y); }
+
+    void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                    bool useMask = false)
+        { DoDrawBitmap(bmp, x, y, useMask); }
+    void DrawBitmap(const wxBitmap &bmp, const wxPoint& pt,
+                    bool useMask = false)
+        { DoDrawBitmap(bmp, pt.x, pt.y, useMask); }
+
+    void DrawText(const wxString& text, wxCoord x, wxCoord y)
+        { DoDrawText(text, x, y); }
+    void DrawText(const wxString& text, const wxPoint& pt)
+        { DoDrawText(text, pt.x, pt.y); }
+
+    void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
+        { DoDrawRotatedText(text, x, y, angle); }
+    void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle)
+        { DoDrawRotatedText(text, pt.x, pt.y, angle); }
+
+    // this version puts both optional bitmap and the text into the given
+    // rectangle and aligns is as specified by alignment parameter; it also
+    // will emphasize the character with the given index if it is != -1 and
+    // return the bounding rectangle if required
+    virtual void DrawLabel(const wxString& text,
+                           const wxBitmap& image,
+                           const wxRect& rect,
+                           int alignment = wxALIGN_LEFT | wxALIGN_TOP,
+                           int indexAccel = -1,
+                           wxRect *rectBounding = NULL);
+
+    void DrawLabel(const wxString& text, const wxRect& rect,
+                   int alignment = wxALIGN_LEFT | wxALIGN_TOP,
+                   int indexAccel = -1)
+        { DrawLabel(text, wxNullBitmap, rect, alignment, indexAccel); }
+
+    bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+              wxDC *source, wxCoord xsrc, wxCoord ysrc,
+              int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
+    {
+        return DoBlit(xdest, ydest, width, height,
+                      source, xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask);
+    }
+    bool Blit(const wxPoint& destPt, const wxSize& sz,
+              wxDC *source, const wxPoint& srcPt,
+              int rop = wxCOPY, bool useMask = false, const wxPoint& srcPtMask = wxDefaultPosition)
+    {
+        return DoBlit(destPt.x, destPt.y, sz.x, sz.y,
+                      source, srcPt.x, srcPt.y, rop, useMask, srcPtMask.x, srcPtMask.y);
+    }
+    
+    wxBitmap GetAsBitmap(const wxRect *subrect = (const wxRect *) NULL) const
+    {
+        return DoGetAsBitmap(subrect);
+    }
+
+#if wxUSE_SPLINES
+    // TODO: this API needs fixing (wxPointList, why (!const) "wxList *"?)
+    void DrawSpline(wxCoord x1, wxCoord y1,
+                    wxCoord x2, wxCoord y2,
+                    wxCoord x3, wxCoord y3);
+    void DrawSpline(int n, wxPoint points[]);
+
+    void DrawSpline(wxList *points) { DoDrawSpline(points); }
+#endif // wxUSE_SPLINES
+
+    // Eventually we will have wxUSE_GENERIC_DRAWELLIPSE
+#ifdef __WXWINCE__
+    //! Generic method to draw ellipses, circles and arcs with current pen and brush.
+    /*! \param x Upper left corner of bounding box.
+     *  \param y Upper left corner of bounding box.
+     *  \param w Width of bounding box.
+     *  \param h Height of bounding box.
+     *  \param sa Starting angle of arc
+     *            (counterclockwise, start at 3 o'clock, 360 is full circle).
+     *  \param ea Ending angle of arc.
+     *  \param angle Rotation angle, the Arc will be rotated after
+     *               calculating begin and end.
+     */
+    void DrawEllipticArcRot( wxCoord x, wxCoord y,
+                             wxCoord width, wxCoord height,
+                             double sa = 0, double ea = 0, double angle = 0 )
+    { DoDrawEllipticArcRot( x, y, width, height, sa, ea, angle ); }
+
+    void DrawEllipticArcRot( const wxPoint& pt,
+                             const wxSize& sz,
+                             double sa = 0, double ea = 0, double angle = 0 )
+    { DoDrawEllipticArcRot( pt.x, pt.y, sz.x, sz.y, sa, ea, angle ); }
+
+    void DrawEllipticArcRot( const wxRect& rect,
+                             double sa = 0, double ea = 0, double angle = 0 )
+    { DoDrawEllipticArcRot( rect.x, rect.y, rect.width, rect.height, sa, ea, angle ); }
+
+    virtual void DoDrawEllipticArcRot( wxCoord x, wxCoord y,
+                                       wxCoord w, wxCoord h,
+                                       double sa = 0, double ea = 0, double angle = 0 );
+
+    //! Rotates points around center.
+    /*! This is a quite straight method, it calculates in pixels
+     *  and so it produces rounding errors.
+     *  \param points The points inside will be rotated.
+     *  \param angle Rotating angle (counterclockwise, start at 3 o'clock, 360 is full circle).
+     *  \param center Center of rotation.
+     */
+    void Rotate( wxList* points, double angle, wxPoint center = wxPoint(0,0) );
+
+    // used by DrawEllipticArcRot
+    // Careful: wxList gets filled with points you have to delete later.
+    void CalculateEllipticPoints( wxList* points,
+                                  wxCoord xStart, wxCoord yStart,
+                                  wxCoord w, wxCoord h,
+                                  double sa, double ea );
 #endif
 
-    static void Set(wxDCFactory *factory);
-    static wxDCFactory *Get();
+    // global DC operations
+    // --------------------
 
-private:
-    static wxDCFactory *m_factory;
-};
-
-//-----------------------------------------------------------------------------
-// wxNativeDCFactory
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory
-{
-public:
-    wxNativeDCFactory() {}
-
-    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window );
-    virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window );
-    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window );
-    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner );
-    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap );
-    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc );
-    virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner );
-#if wxUSE_PRINTING_ARCHITECTURE
-    virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data  );
-#endif
-};
-
-//-----------------------------------------------------------------------------
-// wxDCImpl
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDCImpl: public wxObject
-{
-public:
-    wxDCImpl( wxDC *owner );
-    virtual ~wxDCImpl();
-
-    wxDC *GetOwner() const { return m_owner; }
-
-    wxWindow* GetWindow() const { return m_window; }
-
-    virtual bool IsOk() const { return m_ok; }
-
-    // query capabilities
-
-    virtual bool CanDrawBitmap() const = 0;
-    virtual bool CanGetTextExtent() const = 0;
-
-    // get Cairo context
-    virtual void* GetCairoContext() const
-    {
-        return NULL;
-    }
-
-    // query dimension, colour deps, resolution
-
-    virtual void DoGetSize(int *width, int *height) const = 0;
-    void GetSize(int *width, int *height) const
-    {
-        DoGetSize(width, height);
-        return ;
-    }
-
-    wxSize GetSize() const
-    {
-        int w, h;
-        DoGetSize(&w, &h);
-        return wxSize(w, h);
-    }
-
-    virtual void DoGetSizeMM(int* width, int* height) const = 0;
-
-    virtual int GetDepth() const = 0;
-    virtual wxSize GetPPI() const = 0;
-
-    // Right-To-Left (RTL) modes
-
-    virtual void SetLayoutDirection(wxLayoutDirection WXUNUSED(dir)) { }
-    virtual wxLayoutDirection GetLayoutDirection() const  { return wxLayout_Default; }
-
-    // page and document
+    virtual void Clear() = 0;
 
     virtual bool StartDoc(const wxString& WXUNUSED(message)) { return true; }
     virtual void EndDoc() { }
@@ -317,10 +388,206 @@ public:
     virtual void StartPage() { }
     virtual void EndPage() { }
 
-    // flushing the content of this dc immediately eg onto screen
-    virtual void Flush() { }
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( void BeginDrawing() );
+    wxDEPRECATED( void EndDrawing() );
+#endif // WXWIN_COMPATIBILITY_2_6
+
+
+    // set objects to use for drawing
+    // ------------------------------
+
+    virtual void SetFont(const wxFont& font) = 0;
+    virtual void SetPen(const wxPen& pen) = 0;
+    virtual void SetBrush(const wxBrush& brush) = 0;
+    virtual void SetBackground(const wxBrush& brush) = 0;
+    virtual void SetBackgroundMode(int mode) = 0;
+#if wxUSE_PALETTE
+    virtual void SetPalette(const wxPalette& palette) = 0;
+#endif // wxUSE_PALETTE
+
+    // clipping region
+    // ---------------
+
+    void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { DoSetClippingRegion(x, y, width, height); }
+    void SetClippingRegion(const wxPoint& pt, const wxSize& sz)
+        { DoSetClippingRegion(pt.x, pt.y, sz.x, sz.y); }
+    void SetClippingRegion(const wxRect& rect)
+        { DoSetClippingRegion(rect.x, rect.y, rect.width, rect.height); }
+    void SetClippingRegion(const wxRegion& region)
+        { DoSetClippingRegionAsRegion(region); }
+
+#if wxABI_VERSION >= 20811
+    void SetDeviceClippingRegion(const wxRegion& region)
+        { DoSetClippingRegionAsRegion(region); }
+#endif
+
+    virtual void DestroyClippingRegion() { ResetClipping(); }
+
+    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+        { DoGetClippingBox(x, y, w, h); }
+    void GetClippingBox(wxRect& rect) const
+        {
+          DoGetClippingBox(&rect.x, &rect.y, &rect.width, &rect.height);
+        }
+
+    // text extent
+    // -----------
+
+    virtual wxCoord GetCharHeight() const = 0;
+    virtual wxCoord GetCharWidth() const = 0;
+
+    // only works for single line strings
+    void GetTextExtent(const wxString& string,
+                       wxCoord *x, wxCoord *y,
+                       wxCoord *descent = NULL,
+                       wxCoord *externalLeading = NULL,
+                       wxFont *theFont = NULL) const
+        { DoGetTextExtent(string, x, y, descent, externalLeading, theFont); }
+
+    wxSize GetTextExtent(const wxString& string) const
+    {
+        wxCoord w, h;
+        DoGetTextExtent(string, &w, &h);
+        return wxSize(w, h);
+    }
+
+    // works for single as well as multi-line strings
+    virtual void GetMultiLineTextExtent(const wxString& string,
+                                        wxCoord *width,
+                                        wxCoord *height,
+                                        wxCoord *heightLine = NULL,
+                                        wxFont *font = NULL) const;
+
+    wxSize GetMultiLineTextExtent(const wxString& string) const
+    {
+        wxCoord w, h;
+        GetMultiLineTextExtent(string, &w, &h);
+        return wxSize(w, h);
+    }
+
+    // Measure cumulative width of text after each character
+    bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+        { return DoGetPartialTextExtents(text, widths); }
+
+    // size and resolution
+    // -------------------
+
+    // in device units
+    void GetSize(int *width, int *height) const
+        { DoGetSize(width, height); }
+    wxSize GetSize() const
+    {
+        int w, h;
+        DoGetSize(&w, &h);
+
+        return wxSize(w, h);
+    }
+
+    // in mm
+    void GetSizeMM(int* width, int* height) const
+        { DoGetSizeMM(width, height); }
+    wxSize GetSizeMM() const
+    {
+        int w, h;
+        DoGetSizeMM(&w, &h);
+
+        return wxSize(w, h);
+    }
+
+    // coordinates conversions
+    // -----------------------
+
+    // This group of functions does actual conversion of the input, as you'd
+    // expect.
+    wxCoord DeviceToLogicalX(wxCoord x) const;
+    wxCoord DeviceToLogicalY(wxCoord y) const;
+    wxCoord DeviceToLogicalXRel(wxCoord x) const;
+    wxCoord DeviceToLogicalYRel(wxCoord y) const;
+    wxCoord LogicalToDeviceX(wxCoord x) const;
+    wxCoord LogicalToDeviceY(wxCoord y) const;
+    wxCoord LogicalToDeviceXRel(wxCoord x) const;
+    wxCoord LogicalToDeviceYRel(wxCoord y) const;
+
+    // query DC capabilities
+    // ---------------------
+
+    virtual bool CanDrawBitmap() const = 0;
+    virtual bool CanGetTextExtent() const = 0;
+
+    // colour depth
+    virtual int GetDepth() const = 0;
+
+    // Resolution in Pixels per inch
+    virtual wxSize GetPPI() const = 0;
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return m_ok; }
+
+    // accessors and setters
+    // ---------------------
+
+    virtual int GetBackgroundMode() const { return m_backgroundMode; }
+    virtual const wxBrush&  GetBackground() const { return m_backgroundBrush; }
+    virtual const wxBrush&  GetBrush() const { return m_brush; }
+    virtual const wxFont&   GetFont() const { return m_font; }
+    virtual const wxPen&    GetPen() const { return m_pen; }
+
+    virtual const wxColour& GetTextForeground() const { return m_textForegroundColour; }
+    virtual const wxColour& GetTextBackground() const { return m_textBackgroundColour; }
+    virtual void SetTextForeground(const wxColour& colour)
+        { m_textForegroundColour = colour; }
+    virtual void SetTextBackground(const wxColour& colour)
+        { m_textBackgroundColour = colour; }
+
+    virtual int GetMapMode() const { return m_mappingMode; }
+    virtual void SetMapMode(int mode) = 0;
+
+    virtual void GetUserScale(double *x, double *y) const
+    {
+        if ( x ) *x = m_userScaleX;
+        if ( y ) *y = m_userScaleY;
+    }
+    virtual void SetUserScale(double x, double y) = 0;
+
+    virtual void GetLogicalScale(double *x, double *y)
+    {
+        if ( x ) *x = m_logicalScaleX;
+        if ( y ) *y = m_logicalScaleY;
+    }
+    virtual void SetLogicalScale(double x, double y)
+    {
+        m_logicalScaleX = x;
+        m_logicalScaleY = y;
+    }
+
+    void GetLogicalOrigin(wxCoord *x, wxCoord *y) const
+        { DoGetLogicalOrigin(x, y); }
+    wxPoint GetLogicalOrigin() const
+        { wxCoord x, y; DoGetLogicalOrigin(&x, &y); return wxPoint(x, y); }
+    virtual void SetLogicalOrigin(wxCoord x, wxCoord y) = 0;
+
+    void GetDeviceOrigin(wxCoord *x, wxCoord *y) const
+        { DoGetDeviceOrigin(x, y); }
+    wxPoint GetDeviceOrigin() const
+        { wxCoord x, y; DoGetDeviceOrigin(&x, &y); return wxPoint(x, y); }
+    virtual void SetDeviceOrigin(wxCoord x, wxCoord y) = 0;
+
+    virtual void ComputeScaleAndOrigin() {}
+
+    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) = 0;
+
+    virtual int GetLogicalFunction() const { return m_logicalFunction; }
+    virtual void SetLogicalFunction(int function) = 0;
+
+#if WXWIN_COMPATIBILITY_2_4
+    virtual void SetOptimization(bool WXUNUSED(opt)) { }
+    virtual bool GetOptimization() { return false; }
+#endif
 
     // bounding box
+    // ------------
 
     virtual void CalcBoundingBox(wxCoord x, wxCoord y)
     {
@@ -341,6 +608,7 @@ public:
          m_maxY = y;
       }
     }
+
     void ResetBoundingBox()
     {
         m_isBBoxValid = false;
@@ -348,192 +616,79 @@ public:
         m_minX = m_maxX = m_minY = m_maxY = 0;
     }
 
+    // Get the final bounding box of the PostScript or Metafile picture.
     wxCoord MinX() const { return m_minX; }
     wxCoord MaxX() const { return m_maxX; }
     wxCoord MinY() const { return m_minY; }
     wxCoord MaxY() const { return m_maxY; }
 
-    // setters and getters
+    // misc old functions
+    // ------------------
 
-    virtual void SetFont(const wxFont& font) = 0;
-    virtual const wxFont& GetFont() const { return m_font; }
-
-    virtual void SetPen(const wxPen& pen) = 0;
-    virtual const wxPen& GetPen() const { return m_pen; }
-
-    virtual void SetBrush(const wxBrush& brush) = 0;
-    virtual const wxBrush& GetBrush() const { return m_brush; }
-
-    virtual void SetBackground(const wxBrush& brush) = 0;
-    virtual const wxBrush& GetBackground() const { return m_backgroundBrush; }
-
-    virtual void SetBackgroundMode(int mode) = 0;
-    virtual int GetBackgroundMode() const { return m_backgroundMode; }
-
-    virtual void SetTextForeground(const wxColour& colour)
-        { m_textForegroundColour = colour; }
-    virtual const wxColour& GetTextForeground() const
-        { return m_textForegroundColour; }
-
-    virtual void SetTextBackground(const wxColour& colour)
-        { m_textBackgroundColour = colour; }
-    virtual const wxColour& GetTextBackground() const
-        { return m_textBackgroundColour; }
-
-#if wxUSE_PALETTE
-    virtual void SetPalette(const wxPalette& palette) = 0;
-#endif // wxUSE_PALETTE
-
-    // inherit the DC attributes (font and colours) from the given window
-    //
-    // this is called automatically when a window, client or paint DC is
-    // created
-    virtual void InheritAttributes(wxWindow *win);
-
-
-    // logical functions
-
-    virtual void SetLogicalFunction(wxRasterOperationMode function) = 0;
-    virtual wxRasterOperationMode GetLogicalFunction() const
-                                      { return m_logicalFunction; }
-
-    // text measurement
-
-    virtual wxCoord GetCharHeight() const = 0;
-    virtual wxCoord GetCharWidth() const = 0;
-
-    // The derived classes should really override DoGetFontMetrics() to return
-    // the correct values in the future but for now provide a default
-    // implementation in terms of DoGetTextExtent() to avoid breaking the
-    // compilation of all other ports as wxMSW is the only one to implement it.
-    virtual void DoGetFontMetrics(int *height,
-                                  int *ascent,
-                                  int *descent,
-                                  int *internalLeading,
-                                  int *externalLeading,
-                                  int *averageWidth) const;
-
-    virtual void DoGetTextExtent(const wxString& string,
-                                 wxCoord *x, wxCoord *y,
-                                 wxCoord *descent = NULL,
-                                 wxCoord *externalLeading = NULL,
-                                 const wxFont *theFont = NULL) const = 0;
-    virtual void GetMultiLineTextExtent(const wxString& string,
-                                        wxCoord *width,
-                                        wxCoord *height,
-                                        wxCoord *heightLine = NULL,
-                                        const wxFont *font = NULL) const;
-    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
-
-    // clearing
-
-    virtual void Clear() = 0;
-
-    // clipping
-
-    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-                                     wxCoord width, wxCoord height) = 0;
-
-    // NB: this function works with device coordinates, not the logical ones!
-    virtual void DoSetDeviceClippingRegion(const wxRegion& region) = 0;
-
-    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
-                                  wxCoord *w, wxCoord *h) const
+    // for compatibility with the old code when wxCoord was long everywhere
+    void GetTextExtent(const wxString& string,
+                       long *x, long *y,
+                       long *descent = NULL,
+                       long *externalLeading = NULL,
+                       wxFont *theFont = NULL) const
     {
+        wxCoord x2, y2, descent2, externalLeading2;
+        DoGetTextExtent(string, &x2, &y2,
+                        &descent2, &externalLeading2,
+                        theFont);
         if ( x )
-            *x = m_clipX1;
+            *x = x2;
         if ( y )
-            *y = m_clipY1;
-        if ( w )
-            *w = m_clipX2 - m_clipX1;
-        if ( h )
-            *h = m_clipY2 - m_clipY1;
+            *y = y2;
+        if ( descent )
+            *descent = descent2;
+        if ( externalLeading )
+            *externalLeading = externalLeading2;
     }
 
-    virtual void DestroyClippingRegion() { ResetClipping(); }
-
-
-    // coordinates conversions and transforms
-
-    virtual wxCoord DeviceToLogicalX(wxCoord x) const;
-    virtual wxCoord DeviceToLogicalY(wxCoord y) const;
-    virtual wxCoord DeviceToLogicalXRel(wxCoord x) const;
-    virtual wxCoord DeviceToLogicalYRel(wxCoord y) const;
-    virtual wxCoord LogicalToDeviceX(wxCoord x) const;
-    virtual wxCoord LogicalToDeviceY(wxCoord y) const;
-    virtual wxCoord LogicalToDeviceXRel(wxCoord x) const;
-    virtual wxCoord LogicalToDeviceYRel(wxCoord y) const;
-
-    virtual void SetMapMode(wxMappingMode mode);
-    virtual wxMappingMode GetMapMode() const { return m_mappingMode; }
-
-    virtual void SetUserScale(double x, double y);
-    virtual void GetUserScale(double *x, double *y) const
+    void GetLogicalOrigin(long *x, long *y) const
     {
-        if ( x ) *x = m_userScaleX;
-        if ( y ) *y = m_userScaleY;
+        wxCoord x2, y2;
+        DoGetLogicalOrigin(&x2, &y2);
+        if ( x )
+            *x = x2;
+        if ( y )
+            *y = y2;
     }
 
-    virtual void SetLogicalScale(double x, double y);
-    virtual void GetLogicalScale(double *x, double *y) const
+    void GetDeviceOrigin(long *x, long *y) const
     {
-        if ( x ) *x = m_logicalScaleX;
-        if ( y ) *y = m_logicalScaleY;
+        wxCoord x2, y2;
+        DoGetDeviceOrigin(&x2, &y2);
+        if ( x )
+            *x = x2;
+        if ( y )
+            *y = y2;
     }
-
-    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
-    virtual void DoGetLogicalOrigin(wxCoord *x, wxCoord *y) const
+    void GetClippingBox(long *x, long *y, long *w, long *h) const
     {
-        if ( x ) *x = m_logicalOriginX;
-        if ( y ) *y = m_logicalOriginY;
+        wxCoord xx,yy,ww,hh;
+        DoGetClippingBox(&xx, &yy, &ww, &hh);
+        if (x) *x = xx;
+        if (y) *y = yy;
+        if (w) *w = ww;
+        if (h) *h = hh;
     }
 
-    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
-    virtual void DoGetDeviceOrigin(wxCoord *x, wxCoord *y) const
-    {
-        if ( x ) *x = m_deviceOriginX;
-        if ( y ) *y = m_deviceOriginY;
-    }
+    // RTL related functions
+    // ---------------------
 
-#if wxUSE_DC_TRANSFORM_MATRIX
-    // Transform matrix support is not available in most ports right now
-    // (currently only wxMSW provides it) so do nothing in these methods by
-    // default.
-    virtual bool CanUseTransformMatrix() const
-        { return false; }
-    virtual bool SetTransformMatrix(const wxAffineMatrix2D& WXUNUSED(matrix))
-        { return false; }
-    virtual wxAffineMatrix2D GetTransformMatrix() const
-        { return wxAffineMatrix2D(); }
-    virtual void ResetTransformMatrix()
+    // get or change the layout direction (LTR or RTL) for this dc,
+    // wxLayout_Default is returned if layout direction is not supported
+    virtual wxLayoutDirection GetLayoutDirection() const
+        { return wxLayout_Default; }
+    virtual void SetLayoutDirection(wxLayoutDirection WXUNUSED(dir))
         { }
-#endif // wxUSE_DC_TRANSFORM_MATRIX
-
-    virtual void SetDeviceLocalOrigin( wxCoord x, wxCoord y );
-
-    virtual void ComputeScaleAndOrigin();
-
-    // this needs to overidden if the axis is inverted
-    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
-
-#ifdef __WXMSW__
-    // Native Windows functions using the underlying HDC don't honour GDI+
-    // transformations which may be applied to it. Using this function we can
-    // transform the coordinates manually before passing them to such functions
-    // (as in e.g. wxRendererMSW code). It doesn't do anything if this is not a
-    // wxGCDC.
-    virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const
-    {
-        return r;
-    }
-#endif // __WXMSW__
-
-
-    // ---------------------------------------------------------
-    // the actual drawing API
 
+protected:
+    // the pure virtual functions which should be implemented by wxDC
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             wxFloodFillStyle style = wxFLOOD_SURFACE) = 0;
+                             int style = wxFLOOD_SURFACE) = 0;
 
     virtual void DoGradientFillLinear(const wxRect& rect,
                                       const wxColour& initialColour,
@@ -577,83 +732,78 @@ public:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
-                        wxDC *source,
-                        wxCoord xsrc, wxCoord ysrc,
-                        wxRasterOperationMode rop = wxCOPY,
-                        bool useMask = false,
-                        wxCoord xsrcMask = wxDefaultCoord,
-                        wxCoord ysrcMask = wxDefaultCoord) = 0;
+                        wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) = 0;
 
-    virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
-                               wxCoord dstWidth, wxCoord dstHeight,
-                               wxDC *source,
-                               wxCoord xsrc, wxCoord ysrc,
-                               wxCoord srcWidth, wxCoord srcHeight,
-                               wxRasterOperationMode rop = wxCOPY,
-                               bool useMask = false,
-                               wxCoord xsrcMask = wxDefaultCoord,
-                               wxCoord ysrcMask = wxDefaultCoord);
-
-    virtual wxBitmap DoGetAsBitmap(const wxRect *WXUNUSED(subrect)) const
-        { return wxNullBitmap; }
+    virtual wxBitmap DoGetAsBitmap(const wxRect *WXUNUSED(subrect)) const { return wxNullBitmap; }
 
+    virtual void DoGetSize(int *width, int *height) const = 0;
+    virtual void DoGetSizeMM(int* width, int* height) const = 0;
 
     virtual void DoDrawLines(int n, wxPoint points[],
-                             wxCoord xoffset, wxCoord yoffset ) = 0;
-    virtual void DrawLines(const wxPointList *list,
-                           wxCoord xoffset, wxCoord yoffset );
-
+                             wxCoord xoffset, wxCoord yoffset) = 0;
     virtual void DoDrawPolygon(int n, wxPoint points[],
-                           wxCoord xoffset, wxCoord yoffset,
-                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE) = 0;
+                               wxCoord xoffset, wxCoord yoffset,
+                               int fillStyle = wxODDEVEN_RULE) = 0;
     virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
-                               wxPolygonFillMode fillStyle);
-    void DrawPolygon(const wxPointList *list,
-                     wxCoord xoffset, wxCoord yoffset,
-                     wxPolygonFillMode fillStyle );
+                               int fillStyle);
 
+    virtual void DoSetClippingRegionAsRegion(const wxRegion& region) = 0;
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
+                                     wxCoord width, wxCoord height) = 0;
+
+#if WXWIN_COMPATIBILITY_2_4
+    // this was only for confusing people, use DoGetClippingBox only
+    virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
+                                     wxCoord *w, wxCoord *h)
+        { DoGetClippingBox(x, y, w, h); }
+#endif
+
+    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
+                                  wxCoord *w, wxCoord *h) const
+    {
+        if ( x )
+            *x = m_clipX1;
+        if ( y )
+            *y = m_clipY1;
+        if ( w )
+            *w = m_clipX2 - m_clipX1;
+        if ( h )
+            *h = m_clipY2 - m_clipY1;
+    }
+
+    virtual void DoGetLogicalOrigin(wxCoord *x, wxCoord *y) const
+    {
+        if ( x ) *x = m_logicalOriginX;
+        if ( y ) *y = m_logicalOriginY;
+    }
+
+    virtual void DoGetDeviceOrigin(wxCoord *x, wxCoord *y) const
+    {
+        if ( x ) *x = m_deviceOriginX;
+        if ( y ) *y = m_deviceOriginY;
+    }
+
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *x, wxCoord *y,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL,
+                                 wxFont *theFont = NULL) const = 0;
+
+    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
 #if wxUSE_SPLINES
-    void DrawSpline(wxCoord x1, wxCoord y1,
-                            wxCoord x2, wxCoord y2,
-                            wxCoord x3, wxCoord y3);
-    void DrawSpline(int n, wxPoint points[]);
-    void DrawSpline(const wxPointList *points) { DoDrawSpline(points); }
-
-    virtual void DoDrawSpline(const wxPointList *points);
+    virtual void DoDrawSpline(wxList *points);
 #endif
 
-    // ---------------------------------------------------------
-    // wxMemoryDC Impl API
-
-    virtual void DoSelect(const wxBitmap& WXUNUSED(bmp))
-       { }
-
-    virtual const wxBitmap& GetSelectedBitmap() const
-        { return wxNullBitmap; }
-    virtual wxBitmap& GetSelectedBitmap()
-        { return wxNullBitmap; }
-
-    // ---------------------------------------------------------
-    // wxPrinterDC Impl API
-
-    virtual wxRect GetPaperRect() const
-        { int w = 0; int h = 0; DoGetSize( &w, &h ); return wxRect(0,0,w,h); }
-
-    virtual int GetResolution() const
-        { return -1; }
-
-#if wxUSE_GRAPHICS_CONTEXT
-    virtual wxGraphicsContext* GetGraphicsContext() const
-        { return NULL; }
-    virtual void SetGraphicsContext( wxGraphicsContext* WXUNUSED(ctx) )
-        {}
+#if wxABI_VERSION >= 20810
+    // returns adjustment factor for converting wxFont "point size"; in wx
+    // it is point size on screen and needs to be multiplied by this value
+    // for rendering on higher-resolution DCs such as printer ones
+    static float GetFontPointSizeAdjustment(float dpi);
 #endif
 
-private:
-    wxDC       *m_owner;
-
 protected:
     // unset clipping variables (after clipping region was destroyed)
     void ResetClipping()
@@ -663,61 +813,6 @@ protected:
         m_clipX1 = m_clipX2 = m_clipY1 = m_clipY2 = 0;
     }
 
-#ifdef __WXWINCE__
-    //! Generic method to draw ellipses, circles and arcs with current pen and brush.
-    /*! \param x Upper left corner of bounding box.
-     *  \param y Upper left corner of bounding box.
-     *  \param w Width of bounding box.
-     *  \param h Height of bounding box.
-     *  \param sa Starting angle of arc
-     *            (counterclockwise, start at 3 o'clock, 360 is full circle).
-     *  \param ea Ending angle of arc.
-     *  \param angle Rotation angle, the Arc will be rotated after
-     *               calculating begin and end.
-     */
-    void DrawEllipticArcRot( wxCoord x, wxCoord y,
-                             wxCoord width, wxCoord height,
-                             double sa = 0, double ea = 0, double angle = 0 )
-    { DoDrawEllipticArcRot( x, y, width, height, sa, ea, angle ); }
-
-    void DrawEllipticArcRot( const wxPoint& pt,
-                             const wxSize& sz,
-                             double sa = 0, double ea = 0, double angle = 0 )
-    { DoDrawEllipticArcRot( pt.x, pt.y, sz.x, sz.y, sa, ea, angle ); }
-
-    void DrawEllipticArcRot( const wxRect& rect,
-                             double sa = 0, double ea = 0, double angle = 0 )
-    { DoDrawEllipticArcRot( rect.x, rect.y, rect.width, rect.height, sa, ea, angle ); }
-
-    virtual void DoDrawEllipticArcRot( wxCoord x, wxCoord y,
-                                       wxCoord w, wxCoord h,
-                                       double sa = 0, double ea = 0, double angle = 0 );
-
-    //! Rotates points around center.
-    /*! This is a quite straight method, it calculates in pixels
-     *  and so it produces rounding errors.
-     *  \param points The points inside will be rotated.
-     *  \param angle Rotating angle (counterclockwise, start at 3 o'clock, 360 is full circle).
-     *  \param center Center of rotation.
-     */
-    void Rotate( wxPointList* points, double angle, wxPoint center = wxPoint(0,0) );
-
-    // used by DrawEllipticArcRot
-    // Careful: wxList gets filled with points you have to delete later.
-    void CalculateEllipticPoints( wxPointList* points,
-                                  wxCoord xStart, wxCoord yStart,
-                                  wxCoord w, wxCoord h,
-                                  double sa, double ea );
-#endif // __WXWINCE__
-
-    // returns adjustment factor for converting wxFont "point size"; in wx
-    // it is point size on screen and needs to be multiplied by this value
-    // for rendering on higher-resolution DCs such as printer ones
-    static float GetFontPointSizeAdjustment(float dpi);
-
-    // window on which the DC draws or NULL
-    wxWindow   *m_window;
-
     // flags
     bool m_colour:1;
     bool m_ok:1;
@@ -727,33 +822,27 @@ protected:
 
     // coordinate system variables
 
-    wxCoord m_logicalOriginX, m_logicalOriginY;
-    wxCoord m_deviceOriginX, m_deviceOriginY;           // Usually 0,0, can be change by user
+    // TODO short descriptions of what exactly they are would be nice...
+
+    wxCoord m_logicalOriginX, m_logicalOriginY;
+    wxCoord m_deviceOriginX, m_deviceOriginY;
 
-    wxCoord m_deviceLocalOriginX, m_deviceLocalOriginY; // non-zero if native top-left corner
-                                                        // is not at 0,0. This was the case under
-                                                        // Mac's GrafPorts (coordinate system
-                                                        // used toplevel window's origin) and
-                                                        // e.g. for Postscript, where the native
-                                                        // origin in the bottom left corner.
     double m_logicalScaleX, m_logicalScaleY;
     double m_userScaleX, m_userScaleY;
-    double m_scaleX, m_scaleY;  // calculated from logical scale and user scale
+    double m_scaleX, m_scaleY;
 
-    int m_signX, m_signY;  // Used by SetAxisOrientation() to invert the axes
-
-    // what is a mm on a screen you don't know the size of?
-    double       m_mm_to_pix_x,
-                 m_mm_to_pix_y;
+    // Used by SetAxisOrientation() to invert the axes
+    int m_signX, m_signY;
 
     // bounding and clipping boxes
     wxCoord m_minX, m_minY, m_maxX, m_maxY;
     wxCoord m_clipX1, m_clipY1, m_clipX2, m_clipY2;
 
-    wxRasterOperationMode m_logicalFunction;
+    int m_logicalFunction;
     int m_backgroundMode;
-    wxMappingMode m_mappingMode;
+    int m_mappingMode;
 
+    // GDI objects
     wxPen             m_pen;
     wxBrush           m_brush;
     wxBrush           m_backgroundBrush;
@@ -767,607 +856,48 @@ protected:
 #endif // wxUSE_PALETTE
 
 private:
-    DECLARE_ABSTRACT_CLASS(wxDCImpl)
+    DECLARE_NO_COPY_CLASS(wxDCBase)
+    DECLARE_ABSTRACT_CLASS(wxDCBase)
 };
 
-
-class WXDLLIMPEXP_CORE wxDC : public wxObject
-{
-public:
-    // copy attributes (font, colours and writing direction) from another DC
-    void CopyAttributes(const wxDC& dc);
-
-    virtual ~wxDC() { delete m_pimpl; }
-
-    wxDCImpl *GetImpl()
-        { return m_pimpl; }
-    const wxDCImpl *GetImpl() const
-        { return m_pimpl; }
-
-    wxWindow *GetWindow() const
-        { return m_pimpl->GetWindow(); }
-
-    bool IsOk() const
-        { return m_pimpl && m_pimpl->IsOk(); }
-
-    // query capabilities
-
-    bool CanDrawBitmap() const
-        { return m_pimpl->CanDrawBitmap(); }
-    bool CanGetTextExtent() const
-        { return m_pimpl->CanGetTextExtent(); }
-
-    // query dimension, colour deps, resolution
-
-    void GetSize(int *width, int *height) const
-        { m_pimpl->DoGetSize(width, height); }
-    wxSize GetSize() const
-        { return m_pimpl->GetSize(); }
-
-    void GetSizeMM(int* width, int* height) const
-        { m_pimpl->DoGetSizeMM(width, height); }
-    wxSize GetSizeMM() const
-    {
-        int w, h;
-        m_pimpl->DoGetSizeMM(&w, &h);
-        return wxSize(w, h);
-    }
-
-    int GetDepth() const
-        { return m_pimpl->GetDepth(); }
-    wxSize GetPPI() const
-        { return m_pimpl->GetPPI(); }
-
-    virtual int GetResolution() const
-        { return m_pimpl->GetResolution(); }
-
-    // Right-To-Left (RTL) modes
-
-    void SetLayoutDirection(wxLayoutDirection dir)
-        { m_pimpl->SetLayoutDirection( dir ); }
-    wxLayoutDirection GetLayoutDirection() const
-        { return m_pimpl->GetLayoutDirection(); }
-
-    // page and document
-
-    bool StartDoc(const wxString& message)
-        { return m_pimpl->StartDoc(message); }
-    void EndDoc()
-        { m_pimpl->EndDoc(); }
-
-    void StartPage()
-        { m_pimpl->StartPage(); }
-    void EndPage()
-        { m_pimpl->EndPage(); }
-
-    // bounding box
-
-    void CalcBoundingBox(wxCoord x, wxCoord y)
-        { m_pimpl->CalcBoundingBox(x,y); }
-    void ResetBoundingBox()
-        { m_pimpl->ResetBoundingBox(); }
-
-    wxCoord MinX() const
-        { return m_pimpl->MinX(); }
-    wxCoord MaxX() const
-        { return m_pimpl->MaxX(); }
-    wxCoord MinY() const
-        { return m_pimpl->MinY(); }
-    wxCoord MaxY() const
-        { return m_pimpl->MaxY(); }
-
-    // setters and getters
-
-    void SetFont(const wxFont& font)
-        { m_pimpl->SetFont( font ); }
-    const wxFont&   GetFont() const
-        { return m_pimpl->GetFont(); }
-
-    void SetPen(const wxPen& pen)
-        { m_pimpl->SetPen( pen ); }
-    const wxPen&    GetPen() const
-        { return m_pimpl->GetPen(); }
-
-    void SetBrush(const wxBrush& brush)
-        { m_pimpl->SetBrush( brush ); }
-    const wxBrush&  GetBrush() const
-        { return m_pimpl->GetBrush(); }
-
-    void SetBackground(const wxBrush& brush)
-        { m_pimpl->SetBackground( brush ); }
-    const wxBrush&  GetBackground() const
-        { return m_pimpl->GetBackground(); }
-
-    void SetBackgroundMode(int mode)
-        { m_pimpl->SetBackgroundMode( mode ); }
-    int GetBackgroundMode() const
-        { return m_pimpl->GetBackgroundMode(); }
-
-    void SetTextForeground(const wxColour& colour)
-        { m_pimpl->SetTextForeground(colour); }
-    const wxColour& GetTextForeground() const
-        { return m_pimpl->GetTextForeground(); }
-
-    void SetTextBackground(const wxColour& colour)
-        { m_pimpl->SetTextBackground(colour); }
-    const wxColour& GetTextBackground() const
-        { return m_pimpl->GetTextBackground(); }
-
-#if wxUSE_PALETTE
-    void SetPalette(const wxPalette& palette)
-        { m_pimpl->SetPalette(palette); }
-#endif // wxUSE_PALETTE
-
-    // logical functions
-
-    void SetLogicalFunction(wxRasterOperationMode function)
-        { m_pimpl->SetLogicalFunction(function); }
-    wxRasterOperationMode GetLogicalFunction() const
-        { return m_pimpl->GetLogicalFunction(); }
-
-    // text measurement
-
-    wxCoord GetCharHeight() const
-        { return m_pimpl->GetCharHeight(); }
-    wxCoord GetCharWidth() const
-        { return m_pimpl->GetCharWidth(); }
-
-    wxFontMetrics GetFontMetrics() const
-    {
-        wxFontMetrics fm;
-        m_pimpl->DoGetFontMetrics(&fm.height, &fm.ascent, &fm.descent,
-                                  &fm.internalLeading, &fm.externalLeading,
-                                  &fm.averageWidth);
-        return fm;
-    }
-
-    void GetTextExtent(const wxString& string,
-                       wxCoord *x, wxCoord *y,
-                       wxCoord *descent = NULL,
-                       wxCoord *externalLeading = NULL,
-                       const wxFont *theFont = NULL) const
-        { m_pimpl->DoGetTextExtent(string, x, y, descent, externalLeading, theFont); }
-
-    wxSize GetTextExtent(const wxString& string) const
-    {
-        wxCoord w, h;
-        m_pimpl->DoGetTextExtent(string, &w, &h);
-        return wxSize(w, h);
-    }
-
-    void GetMultiLineTextExtent(const wxString& string,
-                                        wxCoord *width,
-                                        wxCoord *height,
-                                        wxCoord *heightLine = NULL,
-                                        const wxFont *font = NULL) const
-        { m_pimpl->GetMultiLineTextExtent( string, width, height, heightLine, font ); }
-
-    wxSize GetMultiLineTextExtent(const wxString& string) const
-    {
-        wxCoord w, h;
-        m_pimpl->GetMultiLineTextExtent(string, &w, &h);
-        return wxSize(w, h);
-    }
-
-    bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
-        { return m_pimpl->DoGetPartialTextExtents(text, widths); }
-
-    // clearing
-
-    void Clear()
-        { m_pimpl->Clear(); }
-
-    // clipping
-
-    void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-        { m_pimpl->DoSetClippingRegion(x, y, width, height); }
-    void SetClippingRegion(const wxPoint& pt, const wxSize& sz)
-        { m_pimpl->DoSetClippingRegion(pt.x, pt.y, sz.x, sz.y); }
-    void SetClippingRegion(const wxRect& rect)
-        { m_pimpl->DoSetClippingRegion(rect.x, rect.y, rect.width, rect.height); }
-
-    // unlike the functions above, the coordinates of the region used in this
-    // one are in device coordinates, not the logical ones
-    void SetDeviceClippingRegion(const wxRegion& region)
-        { m_pimpl->DoSetDeviceClippingRegion(region); }
-
-    // this function is deprecated because its name is confusing: you may
-    // expect it to work with logical coordinates but, in fact, it does exactly
-    // the same thing as SetDeviceClippingRegion()
-    //
-    // please review the code using it and either replace it with calls to
-    // SetDeviceClippingRegion() or correct it if it was [wrongly] passing
-    // logical coordinates to this function
-    wxDEPRECATED_INLINE(void SetClippingRegion(const wxRegion& region),
-                        SetDeviceClippingRegion(region); )
-
-    void DestroyClippingRegion()
-        { m_pimpl->DestroyClippingRegion(); }
-
-    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
-        { m_pimpl->DoGetClippingBox(x, y, w, h); }
-    void GetClippingBox(wxRect& rect) const
-        { m_pimpl->DoGetClippingBox(&rect.x, &rect.y, &rect.width, &rect.height); }
-
-    // coordinates conversions and transforms
-
-    wxCoord DeviceToLogicalX(wxCoord x) const
-        { return m_pimpl->DeviceToLogicalX(x); }
-    wxCoord DeviceToLogicalY(wxCoord y) const
-        { return m_pimpl->DeviceToLogicalY(y); }
-    wxCoord DeviceToLogicalXRel(wxCoord x) const
-        { return m_pimpl->DeviceToLogicalXRel(x); }
-    wxCoord DeviceToLogicalYRel(wxCoord y) const
-        { return m_pimpl->DeviceToLogicalYRel(y); }
-    wxCoord LogicalToDeviceX(wxCoord x) const
-        { return m_pimpl->LogicalToDeviceX(x); }
-    wxCoord LogicalToDeviceY(wxCoord y) const
-        { return m_pimpl->LogicalToDeviceY(y); }
-    wxCoord LogicalToDeviceXRel(wxCoord x) const
-        { return m_pimpl->LogicalToDeviceXRel(x); }
-    wxCoord LogicalToDeviceYRel(wxCoord y) const
-        { return m_pimpl->LogicalToDeviceYRel(y); }
-
-    void SetMapMode(wxMappingMode mode)
-        { m_pimpl->SetMapMode(mode); }
-    wxMappingMode GetMapMode() const
-        { return m_pimpl->GetMapMode(); }
-
-    void SetUserScale(double x, double y)
-        { m_pimpl->SetUserScale(x,y); }
-    void GetUserScale(double *x, double *y) const
-        { m_pimpl->GetUserScale( x, y ); }
-
-    void SetLogicalScale(double x, double y)
-        { m_pimpl->SetLogicalScale( x, y ); }
-    void GetLogicalScale(double *x, double *y) const
-        { m_pimpl->GetLogicalScale( x, y ); }
-
-    void SetLogicalOrigin(wxCoord x, wxCoord y)
-        { m_pimpl->SetLogicalOrigin(x,y); }
-    void GetLogicalOrigin(wxCoord *x, wxCoord *y) const
-        { m_pimpl->DoGetLogicalOrigin(x, y); }
-    wxPoint GetLogicalOrigin() const
-        { wxCoord x, y; m_pimpl->DoGetLogicalOrigin(&x, &y); return wxPoint(x, y); }
-
-    void SetDeviceOrigin(wxCoord x, wxCoord y)
-        { m_pimpl->SetDeviceOrigin( x, y); }
-    void GetDeviceOrigin(wxCoord *x, wxCoord *y) const
-        { m_pimpl->DoGetDeviceOrigin(x, y); }
-    wxPoint GetDeviceOrigin() const
-        { wxCoord x, y; m_pimpl->DoGetDeviceOrigin(&x, &y); return wxPoint(x, y); }
-
-    void SetAxisOrientation(bool xLeftRight, bool yBottomUp)
-        { m_pimpl->SetAxisOrientation(xLeftRight, yBottomUp); }
-
-#if wxUSE_DC_TRANSFORM_MATRIX
-    bool CanUseTransformMatrix() const
-        { return m_pimpl->CanUseTransformMatrix(); }
-
-    bool SetTransformMatrix(const wxAffineMatrix2D &matrix)
-        { return m_pimpl->SetTransformMatrix(matrix); }
-
-    wxAffineMatrix2D GetTransformMatrix() const
-        { return m_pimpl->GetTransformMatrix(); }
-
-    void ResetTransformMatrix()
-        { m_pimpl->ResetTransformMatrix(); }
-#endif // wxUSE_DC_TRANSFORM_MATRIX
-
-    // mostly internal
-    void SetDeviceLocalOrigin( wxCoord x, wxCoord y )
-        { m_pimpl->SetDeviceLocalOrigin( x, y ); }
-
-
-    // -----------------------------------------------
-    // the actual drawing API
-
-    bool FloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                   wxFloodFillStyle style = wxFLOOD_SURFACE)
-        { return m_pimpl->DoFloodFill(x, y, col, style); }
-    bool FloodFill(const wxPoint& pt, const wxColour& col,
-                   wxFloodFillStyle style = wxFLOOD_SURFACE)
-        { return m_pimpl->DoFloodFill(pt.x, pt.y, col, style); }
-
-    // fill the area specified by rect with a radial gradient, starting from
-    // initialColour in the centre of the cercle and fading to destColour.
-    void GradientFillConcentric(const wxRect& rect,
-                                const wxColour& initialColour,
-                                const wxColour& destColour)
-        { m_pimpl->DoGradientFillConcentric( rect, initialColour, destColour,
-                                             wxPoint(rect.GetWidth() / 2,
-                                                     rect.GetHeight() / 2)); }
-
-    void GradientFillConcentric(const wxRect& rect,
-                                const wxColour& initialColour,
-                                const wxColour& destColour,
-                                const wxPoint& circleCenter)
-        { m_pimpl->DoGradientFillConcentric(rect, initialColour, destColour, circleCenter); }
-
-    // fill the area specified by rect with a linear gradient
-    void GradientFillLinear(const wxRect& rect,
-                            const wxColour& initialColour,
-                            const wxColour& destColour,
-                            wxDirection nDirection = wxEAST)
-        { m_pimpl->DoGradientFillLinear(rect, initialColour, destColour, nDirection); }
-
-    bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const
-        { return m_pimpl->DoGetPixel(x, y, col); }
-    bool GetPixel(const wxPoint& pt, wxColour *col) const
-        { return m_pimpl->DoGetPixel(pt.x, pt.y, col); }
-
-    void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
-        { m_pimpl->DoDrawLine(x1, y1, x2, y2); }
-    void DrawLine(const wxPoint& pt1, const wxPoint& pt2)
-        { m_pimpl->DoDrawLine(pt1.x, pt1.y, pt2.x, pt2.y); }
-
-    void CrossHair(wxCoord x, wxCoord y)
-        { m_pimpl->DoCrossHair(x, y); }
-    void CrossHair(const wxPoint& pt)
-        { m_pimpl->DoCrossHair(pt.x, pt.y); }
-
-    void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
-                 wxCoord xc, wxCoord yc)
-        { m_pimpl->DoDrawArc(x1, y1, x2, y2, xc, yc); }
-    void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
-        { m_pimpl->DoDrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y); }
-
-    void DrawCheckMark(wxCoord x, wxCoord y,
-                       wxCoord width, wxCoord height)
-        { m_pimpl->DoDrawCheckMark(x, y, width, height); }
-    void DrawCheckMark(const wxRect& rect)
-        { m_pimpl->DoDrawCheckMark(rect.x, rect.y, rect.width, rect.height); }
-
-    void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                         double sa, double ea)
-        { m_pimpl->DoDrawEllipticArc(x, y, w, h, sa, ea); }
-    void DrawEllipticArc(const wxPoint& pt, const wxSize& sz,
-                         double sa, double ea)
-        { m_pimpl->DoDrawEllipticArc(pt.x, pt.y, sz.x, sz.y, sa, ea); }
-
-    void DrawPoint(wxCoord x, wxCoord y)
-        { m_pimpl->DoDrawPoint(x, y); }
-    void DrawPoint(const wxPoint& pt)
-        { m_pimpl->DoDrawPoint(pt.x, pt.y); }
-
-    void DrawLines(int n, wxPoint points[],
-                   wxCoord xoffset = 0, wxCoord yoffset = 0)
-        { m_pimpl->DoDrawLines(n, points, xoffset, yoffset); }
-    void DrawLines(const wxPointList *list,
-                   wxCoord xoffset = 0, wxCoord yoffset = 0)
-        { m_pimpl->DrawLines( list, xoffset, yoffset ); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( void DrawLines(const wxList *list,
-                                 wxCoord xoffset = 0, wxCoord yoffset = 0) );
-#endif  // WXWIN_COMPATIBILITY_2_8
-
-    void DrawPolygon(int n, wxPoint points[],
-                     wxCoord xoffset = 0, wxCoord yoffset = 0,
-                     wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
-        { m_pimpl->DoDrawPolygon(n, points, xoffset, yoffset, fillStyle); }
-    void DrawPolygon(const wxPointList *list,
-                     wxCoord xoffset = 0, wxCoord yoffset = 0,
-                     wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
-        { m_pimpl->DrawPolygon( list, xoffset, yoffset, fillStyle ); }
-    void DrawPolyPolygon(int n, int count[], wxPoint points[],
-                         wxCoord xoffset = 0, wxCoord yoffset = 0,
-                         wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
-        { m_pimpl->DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( void DrawPolygon(const wxList *list,
-                     wxCoord xoffset = 0, wxCoord yoffset = 0,
-                     wxPolygonFillMode fillStyle = wxODDEVEN_RULE) );
-#endif  // WXWIN_COMPATIBILITY_2_8
-
-    void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-        { m_pimpl->DoDrawRectangle(x, y, width, height); }
-    void DrawRectangle(const wxPoint& pt, const wxSize& sz)
-        { m_pimpl->DoDrawRectangle(pt.x, pt.y, sz.x, sz.y); }
-    void DrawRectangle(const wxRect& rect)
-        { m_pimpl->DoDrawRectangle(rect.x, rect.y, rect.width, rect.height); }
-
-    void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height,
-                              double radius)
-        { m_pimpl->DoDrawRoundedRectangle(x, y, width, height, radius); }
-    void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz,
-                             double radius)
-        { m_pimpl->DoDrawRoundedRectangle(pt.x, pt.y, sz.x, sz.y, radius); }
-    void DrawRoundedRectangle(const wxRect& r, double radius)
-        { m_pimpl->DoDrawRoundedRectangle(r.x, r.y, r.width, r.height, radius); }
-
-    void DrawCircle(wxCoord x, wxCoord y, wxCoord radius)
-        { m_pimpl->DoDrawEllipse(x - radius, y - radius, 2*radius, 2*radius); }
-    void DrawCircle(const wxPoint& pt, wxCoord radius)
-        { m_pimpl->DoDrawEllipse(pt.x - radius, pt.y - radius, 2*radius, 2*radius); }
-
-    void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-        { m_pimpl->DoDrawEllipse(x, y, width, height); }
-    void DrawEllipse(const wxPoint& pt, const wxSize& sz)
-        { m_pimpl->DoDrawEllipse(pt.x, pt.y, sz.x, sz.y); }
-    void DrawEllipse(const wxRect& rect)
-        { m_pimpl->DoDrawEllipse(rect.x, rect.y, rect.width, rect.height); }
-
-    void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
-        { m_pimpl->DoDrawIcon(icon, x, y); }
-    void DrawIcon(const wxIcon& icon, const wxPoint& pt)
-        { m_pimpl->DoDrawIcon(icon, pt.x, pt.y); }
-
-    void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-                    bool useMask = false)
-        { m_pimpl->DoDrawBitmap(bmp, x, y, useMask); }
-    void DrawBitmap(const wxBitmap &bmp, const wxPoint& pt,
-                    bool useMask = false)
-        { m_pimpl->DoDrawBitmap(bmp, pt.x, pt.y, useMask); }
-
-    void DrawText(const wxString& text, wxCoord x, wxCoord y)
-        { m_pimpl->DoDrawText(text, x, y); }
-    void DrawText(const wxString& text, const wxPoint& pt)
-        { m_pimpl->DoDrawText(text, pt.x, pt.y); }
-
-    void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
-        { m_pimpl->DoDrawRotatedText(text, x, y, angle); }
-    void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle)
-        { m_pimpl->DoDrawRotatedText(text, pt.x, pt.y, angle); }
-
-    // this version puts both optional bitmap and the text into the given
-    // rectangle and aligns is as specified by alignment parameter; it also
-    // will emphasize the character with the given index if it is != -1 and
-    // return the bounding rectangle if required
-    void DrawLabel(const wxString& text,
-                           const wxBitmap& image,
-                           const wxRect& rect,
-                           int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                           int indexAccel = -1,
-                           wxRect *rectBounding = NULL);
-
-    void DrawLabel(const wxString& text, const wxRect& rect,
-                   int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                   int indexAccel = -1)
-        { DrawLabel(text, wxNullBitmap, rect, alignment, indexAccel); }
-
-    bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-              wxDC *source, wxCoord xsrc, wxCoord ysrc,
-              wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-              wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
-    {
-        return m_pimpl->DoBlit(xdest, ydest, width, height,
-                      source, xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask);
-    }
-    bool Blit(const wxPoint& destPt, const wxSize& sz,
-              wxDC *source, const wxPoint& srcPt,
-              wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-              const wxPoint& srcPtMask = wxDefaultPosition)
-    {
-        return m_pimpl->DoBlit(destPt.x, destPt.y, sz.x, sz.y,
-                      source, srcPt.x, srcPt.y, rop, useMask, srcPtMask.x, srcPtMask.y);
-    }
-
-    bool StretchBlit(wxCoord dstX, wxCoord dstY,
-                     wxCoord dstWidth, wxCoord dstHeight,
-                     wxDC *source,
-                     wxCoord srcX, wxCoord srcY,
-                     wxCoord srcWidth, wxCoord srcHeight,
-                     wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-                     wxCoord srcMaskX = wxDefaultCoord, wxCoord srcMaskY = wxDefaultCoord)
-    {
-        return m_pimpl->DoStretchBlit(dstX, dstY, dstWidth, dstHeight,
-                      source, srcX, srcY, srcWidth, srcHeight, rop, useMask, srcMaskX, srcMaskY);
-    }
-    bool StretchBlit(const wxPoint& dstPt, const wxSize& dstSize,
-                     wxDC *source, const wxPoint& srcPt, const wxSize& srcSize,
-                     wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-                     const wxPoint& srcMaskPt = wxDefaultPosition)
-    {
-        return m_pimpl->DoStretchBlit(dstPt.x, dstPt.y, dstSize.x, dstSize.y,
-                      source, srcPt.x, srcPt.y, srcSize.x, srcSize.y, rop, useMask, srcMaskPt.x, srcMaskPt.y);
-    }
-
-    wxBitmap GetAsBitmap(const wxRect *subrect = (const wxRect *) NULL) const
-    {
-        return m_pimpl->DoGetAsBitmap(subrect);
-    }
-
-#if wxUSE_SPLINES
-    void DrawSpline(wxCoord x1, wxCoord y1,
-                    wxCoord x2, wxCoord y2,
-                    wxCoord x3, wxCoord y3)
-        { m_pimpl->DrawSpline(x1,y1,x2,y2,x3,y3); }
-    void DrawSpline(int n, wxPoint points[])
-        { m_pimpl->DrawSpline(n,points); }
-    void DrawSpline(const wxPointList *points)
-        { m_pimpl->DrawSpline(points); }
-#endif // wxUSE_SPLINES
-
-
-#if WXWIN_COMPATIBILITY_2_8
-    // for compatibility with the old code when wxCoord was long everywhere
-    wxDEPRECATED( void GetTextExtent(const wxString& string,
-                       long *x, long *y,
-                       long *descent = NULL,
-                       long *externalLeading = NULL,
-                       const wxFont *theFont = NULL) const );
-    wxDEPRECATED( void GetLogicalOrigin(long *x, long *y) const );
-    wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const );
-    wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const );
-
-    wxDEPRECATED( void DrawObject(wxDrawObject* drawobject) );
-#endif  // WXWIN_COMPATIBILITY_2_8
-
-#ifdef __WXMSW__
-    // GetHDC() is the simplest way to retrieve an HDC From a wxDC but only
-    // works if this wxDC is GDI-based and fails for GDI+ contexts (and
-    // anything else without HDC, e.g. wxPostScriptDC)
-    WXHDC GetHDC() const;
-
-    // don't use these methods manually, use GetTempHDC() instead
-    virtual WXHDC AcquireHDC() { return GetHDC(); }
-    virtual void ReleaseHDC(WXHDC WXUNUSED(hdc)) { }
-
-    // helper class holding the result of GetTempHDC() with std::auto_ptr<>-like
-    // semantics, i.e. it is moved when copied
-    class TempHDC
-    {
-    public:
-        TempHDC(wxDC& dc)
-            : m_dc(dc),
-              m_hdc(dc.AcquireHDC())
-        {
-        }
-
-        TempHDC(const TempHDC& thdc)
-            : m_dc(thdc.m_dc),
-              m_hdc(thdc.m_hdc)
-        {
-            const_cast<TempHDC&>(thdc).m_hdc = 0;
-        }
-
-        ~TempHDC()
-        {
-            if ( m_hdc )
-                m_dc.ReleaseHDC(m_hdc);
-        }
-
-        WXHDC GetHDC() const { return m_hdc; }
-
-    private:
-        wxDC& m_dc;
-        WXHDC m_hdc;
-
-        wxDECLARE_NO_ASSIGN_CLASS(TempHDC);
-    };
-
-    // GetTempHDC() also works for wxGCDC (but still not for wxPostScriptDC &c)
-    TempHDC GetTempHDC() { return TempHDC(*this); }
-#endif // __WXMSW__
-
-#if wxUSE_GRAPHICS_CONTEXT
-    virtual wxGraphicsContext* GetGraphicsContext() const
-    {
-        return m_pimpl->GetGraphicsContext();
-    }
-    virtual void SetGraphicsContext( wxGraphicsContext* ctx )
-    {
-        m_pimpl->SetGraphicsContext(ctx);
-    }
+// ----------------------------------------------------------------------------
+// now include the declaration of wxDC class
+// ----------------------------------------------------------------------------
+
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/dc.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/dc.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/dc.h"
+#elif defined(__WXGTK20__)
+    #include "wx/gtk/dc.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/dc.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/dc.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/dc.h"
+#elif defined(__WXDFB__)
+    #include "wx/dfb/dc.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/dc.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/dc.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/dc.h"
 #endif
 
-protected:
-    // ctor takes ownership of the pointer
-    wxDC(wxDCImpl *pimpl) : m_pimpl(pimpl) { }
-
-    wxDCImpl * const m_pimpl;
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxDC)
-    wxDECLARE_NO_COPY_CLASS(wxDC);
-};
+#if wxUSE_GRAPHICS_CONTEXT
+    #include "wx/dcgraph.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // helper class: you can use it to temporarily change the DC text colour and
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDCTextColourChanger
+class WXDLLEXPORT wxDCTextColourChanger
 {
 public:
     wxDCTextColourChanger(wxDC& dc) : m_dc(dc), m_colFgOld() { }
@@ -1379,13 +909,13 @@ public:
 
     ~wxDCTextColourChanger()
     {
-        if ( m_colFgOld.IsOk() )
+        if ( m_colFgOld.Ok() )
             m_dc.SetTextForeground(m_colFgOld);
     }
 
     void Set(const wxColour& col)
     {
-        if ( !m_colFgOld.IsOk() )
+        if ( !m_colFgOld.Ok() )
             m_colFgOld = m_dc.GetTextForeground();
         m_dc.SetTextForeground(col);
     }
@@ -1395,7 +925,7 @@ private:
 
     wxColour m_colFgOld;
 
-    wxDECLARE_NO_COPY_CLASS(wxDCTextColourChanger);
+    DECLARE_NO_COPY_CLASS(wxDCTextColourChanger)
 };
 
 // ----------------------------------------------------------------------------
@@ -1403,7 +933,7 @@ private:
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDCPenChanger
+class WXDLLEXPORT wxDCPenChanger
 {
 public:
     wxDCPenChanger(wxDC& dc, const wxPen& pen) : m_dc(dc), m_penOld(dc.GetPen())
@@ -1413,7 +943,7 @@ public:
 
     ~wxDCPenChanger()
     {
-        if ( m_penOld.IsOk() )
+        if ( m_penOld.Ok() )
             m_dc.SetPen(m_penOld);
     }
 
@@ -1422,7 +952,7 @@ private:
 
     wxPen m_penOld;
 
-    wxDECLARE_NO_COPY_CLASS(wxDCPenChanger);
+    DECLARE_NO_COPY_CLASS(wxDCPenChanger)
 };
 
 // ----------------------------------------------------------------------------
@@ -1430,7 +960,7 @@ private:
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDCBrushChanger
+class WXDLLEXPORT wxDCBrushChanger
 {
 public:
     wxDCBrushChanger(wxDC& dc, const wxBrush& brush) : m_dc(dc), m_brushOld(dc.GetBrush())
@@ -1440,7 +970,7 @@ public:
 
     ~wxDCBrushChanger()
     {
-        if ( m_brushOld.IsOk() )
+        if ( m_brushOld.Ok() )
             m_dc.SetBrush(m_brushOld);
     }
 
@@ -1449,7 +979,7 @@ private:
 
     wxBrush m_brushOld;
 
-    wxDECLARE_NO_COPY_CLASS(wxDCBrushChanger);
+    DECLARE_NO_COPY_CLASS(wxDCBrushChanger)
 };
 
 // ----------------------------------------------------------------------------
@@ -1457,11 +987,11 @@ private:
 // destroys it in the dtor
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDCClipper
+class WXDLLEXPORT wxDCClipper
 {
 public:
     wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc)
-        { dc.SetClippingRegion(r.GetBox()); }
+        { dc.SetClippingRegion(r); }
     wxDCClipper(wxDC& dc, const wxRect& r) : m_dc(dc)
         { dc.SetClippingRegion(r.x, r.y, r.width, r.height); }
     wxDCClipper(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h) : m_dc(dc)
@@ -1472,48 +1002,7 @@ public:
 private:
     wxDC& m_dc;
 
-    wxDECLARE_NO_COPY_CLASS(wxDCClipper);
+    DECLARE_NO_COPY_CLASS(wxDCClipper)
 };
 
-// ----------------------------------------------------------------------------
-// helper class: you can use it to temporarily change the DC font and
-// restore it automatically when the object goes out of scope
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDCFontChanger
-{
-public:
-    wxDCFontChanger(wxDC& dc)
-        : m_dc(dc), m_fontOld()
-    {
-    }
-
-    wxDCFontChanger(wxDC& dc, const wxFont& font)
-        : m_dc(dc), m_fontOld(dc.GetFont())
-    {
-        m_dc.SetFont(font);
-    }
-
-    void Set(const wxFont& font)
-    {
-        if ( !m_fontOld.IsOk() )
-            m_fontOld = m_dc.GetFont();
-        m_dc.SetFont(font);
-    }
-
-    ~wxDCFontChanger()
-    {
-        if ( m_fontOld.IsOk() )
-            m_dc.SetFont(m_fontOld);
-    }
-
-private:
-    wxDC& m_dc;
-
-    wxFont m_fontOld;
-
-    wxDECLARE_NO_COPY_CLASS(wxDCFontChanger);
-};
-
-
 #endif // _WX_DC_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/dcbuffer.h b/Source/3rd Party/wx/include/wx/dcbuffer.h
index d84cdfee6..6769dbc85 100644
--- a/Source/3rd Party/wx/include/wx/dcbuffer.h	
+++ b/Source/3rd Party/wx/include/wx/dcbuffer.h	
@@ -4,7 +4,7 @@
 // Author:      Ron Lee <ron@debian.org>
 // Modified by: Vadim Zeitlin (refactored, added bg preservation)
 // Created:     16/03/02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcbuffer.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Ron Lee
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,11 +37,7 @@
 // does not prepare the window DC
 #define wxBUFFER_CLIENT_AREA        0x02
 
-// Set when not using specific buffer bitmap. Note that this
-// is private style and not returned by GetStyle.
-#define wxBUFFER_USES_SHARED_BUFFER 0x04
-
-class WXDLLIMPEXP_CORE wxBufferedDC : public wxMemoryDC
+class WXDLLEXPORT wxBufferedDC : public wxMemoryDC
 {
 public:
     // Default ctor, must subsequently call Init for two stage construction.
@@ -102,11 +98,25 @@ public:
     // Usually called in the dtor or by the dtor of derived classes if the
     // BufferedDC must blit before the derived class (which may own the dc it's
     // blitting to) is destroyed.
-    void UnMask();
+    void UnMask()
+    {
+        wxCHECK_RET( m_dc, wxT("no underlying wxDC?") );
+        wxASSERT_MSG( m_buffer && m_buffer->IsOk(), wxT("invalid backing store") );
+
+        wxCoord x = 0,
+                y = 0;
+
+        if ( m_style & wxBUFFER_CLIENT_AREA )
+            GetDeviceOrigin(&x, &y);
+
+        m_dc->Blit(0, 0, m_buffer->GetWidth(), m_buffer->GetHeight(),
+                   this, -x, -y );
+        m_dc = NULL;
+    }
 
     // Set and get the style
     void SetStyle(int style) { m_style = style; }
-    int GetStyle() const { return m_style & ~wxBUFFER_USES_SHARED_BUFFER; }
+    int GetStyle() const { return m_style; }
 
 private:
     // common part of Init()s
@@ -116,6 +126,10 @@ private:
 
         m_dc = dc;
         m_style = style;
+
+        // inherit the same layout direction as the original DC
+        if (dc && dc->IsOk())
+            SetLayoutDirection(dc->GetLayoutDirection());
     }
 
     // check that the bitmap is valid and use it
@@ -134,10 +148,8 @@ private:
     // the buffering style
     int m_style;
 
-    wxSize m_area;
-    
     DECLARE_DYNAMIC_CLASS(wxBufferedDC)
-    wxDECLARE_NO_COPY_CLASS(wxBufferedDC);
+    DECLARE_NO_COPY_CLASS(wxBufferedDC)
 };
 
 
@@ -147,7 +159,7 @@ private:
 
 // Creates a double buffered wxPaintDC, optionally allowing the
 // user to specify their own buffer to use.
-class WXDLLIMPEXP_CORE wxBufferedPaintDC : public wxBufferedDC
+class WXDLLEXPORT wxBufferedPaintDC : public wxBufferedDC
 {
 public:
     // If no bitmap is supplied by the user, a temporary one will be created.
@@ -197,7 +209,7 @@ private:
     wxPaintDC m_paintdc;
 
     DECLARE_ABSTRACT_CLASS(wxBufferedPaintDC)
-    wxDECLARE_NO_COPY_CLASS(wxBufferedPaintDC);
+    DECLARE_NO_COPY_CLASS(wxBufferedPaintDC)
 };
 
 
@@ -214,25 +226,40 @@ private:
     #define wxAutoBufferedPaintDCBase           wxBufferedPaintDC
 #endif
 
-class WXDLLIMPEXP_CORE wxAutoBufferedPaintDC : public wxAutoBufferedPaintDCBase
+
+#ifdef __WXDEBUG__
+
+class wxAutoBufferedPaintDC : public wxAutoBufferedPaintDCBase
 {
 public:
 
     wxAutoBufferedPaintDC(wxWindow* win)
         : wxAutoBufferedPaintDCBase(win)
     {
-        wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_PAINT,
-            "You need to call SetBackgroundStyle(wxBG_STYLE_PAINT) in ctor, "
-            "and also, if needed, paint the background in wxEVT_PAINT handler."
-        );
+        TestWinStyle(win);
     }
 
     virtual ~wxAutoBufferedPaintDC() { }
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxAutoBufferedPaintDC);
+
+    void TestWinStyle(wxWindow* win)
+    {
+        // Help the user to get the double-buffering working properly.
+        wxASSERT_MSG( win->GetBackgroundStyle() == wxBG_STYLE_CUSTOM,
+                      wxT("In constructor, you need to call SetBackgroundStyle(wxBG_STYLE_CUSTOM), ")
+                      wxT("and also, if needed, paint the background manually in the paint event handler."));
+    }
+
+    DECLARE_NO_COPY_CLASS(wxAutoBufferedPaintDC)
 };
 
+#else // !__WXDEBUG__
+
+// In release builds, just use typedef
+typedef wxAutoBufferedPaintDCBase wxAutoBufferedPaintDC;
+
+#endif
 
 
 // Check if the window is natively double buffered and will return a wxPaintDC
diff --git a/Source/3rd Party/wx/include/wx/dcclient.h b/Source/3rd Party/wx/include/wx/dcclient.h
index a5c1e6880..c770f6a2f 100644
--- a/Source/3rd Party/wx/include/wx/dcclient.h	
+++ b/Source/3rd Party/wx/include/wx/dcclient.h	
@@ -2,62 +2,41 @@
 // Name:        wx/dcclient.h
 // Purpose:     wxClientDC base header
 // Author:      Julian Smart
+// Modified by:
+// Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcclient.h 40865 2006-08-27 09:42:42Z VS $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCCLIENT_H_BASE_
 #define _WX_DCCLIENT_H_BASE_
 
-#include "wx/dc.h"
+#include "wx/defs.h"
 
-//-----------------------------------------------------------------------------
-// wxWindowDC
-//-----------------------------------------------------------------------------
+#if defined(__WXPALMOS__)
+#include "wx/palmos/dcclient.h"
+#elif defined(__WXMSW__)
+#include "wx/msw/dcclient.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/dcclient.h"
+#elif defined(__WXGTK20__)
+#include "wx/gtk/dcclient.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcclient.h"
+#elif defined(__WXX11__)
+#include "wx/x11/dcclient.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/dcclient.h"
+#elif defined(__WXDFB__)
+#include "wx/dfb/dcclient.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dcclient.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/dcclient.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcclient.h"
+#endif
 
-class WXDLLIMPEXP_CORE wxWindowDC : public wxDC
-{
-public:
-    wxWindowDC(wxWindow *win);
-
-protected:
-    wxWindowDC(wxDCImpl *impl) : wxDC(impl) { }
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxWindowDC)
-};
-
-//-----------------------------------------------------------------------------
-// wxClientDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxClientDC : public wxWindowDC
-{
-public:
-    wxClientDC(wxWindow *win);
-
-protected:
-    wxClientDC(wxDCImpl *impl) : wxWindowDC(impl) { }
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxClientDC)
-};
-
-//-----------------------------------------------------------------------------
-// wxPaintDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPaintDC : public wxClientDC
-{
-public:
-    wxPaintDC(wxWindow *win);
-
-protected:
-    wxPaintDC(wxDCImpl *impl) : wxClientDC(impl) { }
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxPaintDC)
-};
-
-#endif // _WX_DCCLIENT_H_BASE_
+#endif
+    // _WX_DCCLIENT_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/dcgraph.h b/Source/3rd Party/wx/include/wx/dcgraph.h
index e6404fc9f..8245f8145 100644
--- a/Source/3rd Party/wx/include/wx/dcgraph.h	
+++ b/Source/3rd Party/wx/include/wx/dcgraph.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/dcgraph.h
+// Name:        wx/graphdc.h
 // Purpose:     graphics context device bridge header
 // Author:      Stefan Csomor
 // Modified by:
 // Created:
 // Copyright:   (c) Stefan Csomor
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcgraph.h 53390 2008-04-28 04:19:15Z KO $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,60 +14,34 @@
 
 #if wxUSE_GRAPHICS_CONTEXT
 
-#include "wx/dc.h"
 #include "wx/geometry.h"
+#include "wx/dynarray.h"
 #include "wx/graphics.h"
 
-class WXDLLIMPEXP_FWD_CORE wxWindowDC;
+class WXDLLEXPORT wxWindowDC;
 
+#ifdef __WXMAC__
+#define wxGCDC wxDC
+#endif
 
-class WXDLLIMPEXP_CORE wxGCDC: public wxDC
+class WXDLLEXPORT wxGCDC: 
+#ifdef __WXMAC__
+    public wxDCBase
+#else
+    public wxDC
+#endif
 {
+    DECLARE_DYNAMIC_CLASS(wxGCDC)
+    DECLARE_NO_COPY_CLASS(wxGCDC)
+
 public:
-    wxGCDC( const wxWindowDC& dc );
-    wxGCDC( const wxMemoryDC& dc );
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxGCDC( const wxPrinterDC& dc );
-#endif
-#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
-    wxGCDC( const wxEnhMetaFileDC& dc );
-#endif
-    wxGCDC(wxGraphicsContext* context);
-    
+    wxGCDC(const wxWindowDC& dc);
+#ifdef __WXMSW__
+    wxGCDC( const wxMemoryDC& dc);
+#endif    
     wxGCDC();
     virtual ~wxGCDC();
 
-    wxGraphicsContext* GetGraphicsContext() const;
-    void SetGraphicsContext( wxGraphicsContext* ctx );
-
-#ifdef __WXMSW__
-    // override wxDC virtual functions to provide access to HDC associated with
-    // this Graphics object (implemented in src/msw/graphics.cpp)
-    virtual WXHDC AcquireHDC();
-    virtual void ReleaseHDC(WXHDC hdc);
-#endif // __WXMSW__
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGCDC)
-    wxDECLARE_NO_COPY_CLASS(wxGCDC);
-};
-
-
-class WXDLLIMPEXP_CORE wxGCDCImpl: public wxDCImpl
-{
-public:
-    wxGCDCImpl( wxDC *owner, const wxWindowDC& dc );
-    wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
-#endif
-#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
-    wxGCDCImpl( wxDC *owner, const wxEnhMetaFileDC& dc );
-#endif
-    wxGCDCImpl( wxDC *owner );
-
-    virtual ~wxGCDCImpl();
-
     void Init();
 
 
@@ -81,9 +55,10 @@ public:
 
     virtual void StartPage();
     virtual void EndPage();
-
+    
+    // to be virtualized on next major
     // flushing the content of this dc immediately onto screen
-    virtual void Flush();
+    void Flush();
 
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
@@ -102,19 +77,27 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
-    virtual void SetLogicalFunction(wxRasterOperationMode function);
+    virtual void SetMapMode(int mode);
+    virtual void SetUserScale(double x, double y);
+
+    virtual void SetLogicalScale(double x, double y);
+    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
+    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
+    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
+    virtual void SetLogicalFunction(int function);
 
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
 
     virtual void ComputeScaleAndOrigin();
 
-    wxGraphicsContext* GetGraphicsContext() const { return m_graphicContext; }
+    wxGraphicsContext* GetGraphicsContext() { return m_graphicContext; }
     virtual void SetGraphicsContext( wxGraphicsContext* ctx );
-
+    
+protected:
     // the true implementations
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             wxFloodFillStyle style = wxFLOOD_SURFACE);
+        int style = wxFLOOD_SURFACE);
 
     virtual void DoGradientFillLinear(const wxRect& rect,
         const wxColour& initialColour,
@@ -131,7 +114,7 @@ public:
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
 
 #if wxUSE_SPLINES
-    virtual void DoDrawSpline(const wxPointList *points);
+    virtual void DoDrawSpline(wxList *points);
 #endif
 
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
@@ -163,17 +146,8 @@ public:
         double angle);
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-                        wxDC *source, wxCoord xsrc, wxCoord ysrc,
-                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-                        wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
-
-    virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
-                               wxCoord dstWidth, wxCoord dstHeight,
-                               wxDC *source,
-                               wxCoord xsrc, wxCoord ysrc,
-                               wxCoord srcWidth, wxCoord srcHeight,
-                               wxRasterOperationMode = wxCOPY, bool useMask = false,
-                               wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+        wxDC *source, wxCoord xsrc, wxCoord ysrc,
+        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
 
     virtual void DoGetSize(int *,int *) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
@@ -181,13 +155,13 @@ public:
     virtual void DoDrawLines(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
-                               wxCoord xoffset, wxCoord yoffset,
-                               wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+        wxCoord xoffset, wxCoord yoffset,
+        int fillStyle = wxODDEVEN_RULE);
     virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
-                                   wxCoord xoffset, wxCoord yoffset,
-                                   wxPolygonFillMode fillStyle);
+        wxCoord xoffset, wxCoord yoffset,
+        int fillStyle);
 
-    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
+    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
 
@@ -195,27 +169,22 @@ public:
         wxCoord *x, wxCoord *y,
         wxCoord *descent = NULL,
         wxCoord *externalLeading = NULL,
-        const wxFont *theFont = NULL) const;
+        wxFont *theFont = NULL) const;
 
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
-#ifdef __WXMSW__
-    virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const;
-#endif // __WXMSW__
-
 protected:
     // scaling variables
     bool m_logicalFunctionSupported;
+    double       m_mm_to_pix_x, m_mm_to_pix_y;
     wxGraphicsMatrix m_matrixOriginal;
     wxGraphicsMatrix m_matrixCurrent;
 
     double m_formerScaleX, m_formerScaleY;
 
     wxGraphicsContext* m_graphicContext;
-
-    DECLARE_CLASS(wxGCDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxGCDCImpl);
 };
 
-#endif // wxUSE_GRAPHICS_CONTEXT
+#endif
+
 #endif // _WX_GRAPHICS_DC_H_
diff --git a/Source/3rd Party/wx/include/wx/dcmemory.h b/Source/3rd Party/wx/include/wx/dcmemory.h
index 3ae9e6e23..cd7bb0c9d 100644
--- a/Source/3rd Party/wx/include/wx/dcmemory.h	
+++ b/Source/3rd Party/wx/include/wx/dcmemory.h	
@@ -5,41 +5,72 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcmemory.h 43843 2006-12-07 05:44:44Z PC $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCMEMORY_H_BASE_
 #define _WX_DCMEMORY_H_BASE_
 
-#include "wx/dc.h"
 #include "wx/bitmap.h"
 
-//-----------------------------------------------------------------------------
-// wxMemoryDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMemoryDC: public wxDC
+// NOTE: different native implementations of wxMemoryDC will derive from
+//       different wxDC classes (wxPaintDC, wxWindowDC, etc), so that
+//       we cannot derive wxMemoryDCBase from wxDC and then use it as the
+//       only base class for native impl of wxMemoryDC...
+class WXDLLEXPORT wxMemoryDCBase
 {
 public:
-    wxMemoryDC();
-    wxMemoryDC( wxBitmap& bitmap );
-    wxMemoryDC( wxDC *dc );
+    wxMemoryDCBase() { }
+
+    // avoid warnings about having virtual functions but non virtual dtor
+    virtual ~wxMemoryDCBase() { }
 
     // select the given bitmap to draw on it
-    void SelectObject(wxBitmap& bmp);
+    void SelectObject(wxBitmap& bmp)
+    {
+        // make sure that the given wxBitmap is not sharing its data with other
+        // wxBitmap instances as its contents will be modified by any drawing
+        // operation done on this DC
+        if (bmp.IsOk())
+            bmp.UnShare();
+
+        DoSelect(bmp);
+    }
 
     // select the given bitmap for read-only
-    void SelectObjectAsSource(const wxBitmap& bmp);
+    virtual void SelectObjectAsSource(const wxBitmap& bmp)
+    {
+        DoSelect(bmp);
+    }
 
-    // get selected bitmap
-    const wxBitmap& GetSelectedBitmap() const;
-    wxBitmap& GetSelectedBitmap();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+protected:
+    virtual void DoSelect(const wxBitmap& bmp) = 0;
 };
 
+#if defined(__WXPALMOS__)
+#include "wx/palmos/dcmemory.h"
+#elif defined(__WXMSW__)
+#include "wx/msw/dcmemory.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/dcmemory.h"
+#elif defined(__WXGTK20__)
+#include "wx/gtk/dcmemory.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcmemory.h"
+#elif defined(__WXX11__)
+#include "wx/x11/dcmemory.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/dcmemory.h"
+#elif defined(__WXDFB__)
+#include "wx/dfb/dcmemory.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dcmemory.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/dcmemory.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcmemory.h"
+#endif
 
 #endif
     // _WX_DCMEMORY_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/dcmirror.h b/Source/3rd Party/wx/include/wx/dcmirror.h
index 369e46a60..89bf12575 100644
--- a/Source/3rd Party/wx/include/wx/dcmirror.h	
+++ b/Source/3rd Party/wx/include/wx/dcmirror.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.07.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcmirror.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@
 // wxMirrorDC allows to write the same code for horz/vertical layout
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMirrorDCImpl : public wxDCImpl
+class WXDLLEXPORT wxMirrorDC : public wxDC
 {
 public:
     // constructs a mirror DC associated with the given real DC
@@ -26,12 +26,13 @@ public:
     // if mirror parameter is true, all vertical and horizontal coordinates are
     // exchanged, otherwise this class behaves in exactly the same way as a
     // plain DC
-    wxMirrorDCImpl(wxDC *owner, wxDCImpl& dc, bool mirror)
-        : wxDCImpl(owner),
-          m_dc(dc)
-    {
-        m_mirror = mirror;
-    }
+    //
+    // the cast to wxMirrorDC is a dirty hack done to allow us to call the
+    // protected methods of wxDCBase directly in our code below, without it it
+    // would be impossible (this is correct from C++ point of view but doesn't
+    // make any sense in this particular situation)
+    wxMirrorDC(wxDC& dc, bool mirror) : m_dc((wxMirrorDC&)dc)
+        { m_mirror = mirror; }
 
     // wxDCBase operations
     virtual void Clear() { m_dc.Clear(); }
@@ -52,8 +53,9 @@ public:
     virtual bool CanGetTextExtent() const { return m_dc.CanGetTextExtent(); }
     virtual int GetDepth() const { return m_dc.GetDepth(); }
     virtual wxSize GetPPI() const { return m_dc.GetPPI(); }
-    virtual bool IsOk() const { return m_dc.IsOk(); }
-    virtual void SetMapMode(wxMappingMode mode) { m_dc.SetMapMode(mode); }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return m_dc.Ok(); }
+    virtual void SetMapMode(int mode) { m_dc.SetMapMode(mode); }
     virtual void SetUserScale(double x, double y)
         { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); }
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y)
@@ -63,9 +65,15 @@ public:
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp)
         { m_dc.SetAxisOrientation(GetX(xLeftRight, yBottomUp),
                                   GetY(xLeftRight, yBottomUp)); }
-    virtual void SetLogicalFunction(wxRasterOperationMode function)
+    virtual void SetLogicalFunction(int function)
         { m_dc.SetLogicalFunction(function); }
 
+    // helper functions which may be useful for the users of this class
+    wxSize Reflect(const wxSize& sizeOrig)
+    {
+        return m_mirror ? wxSize(sizeOrig.y, sizeOrig.x) : sizeOrig;
+    }
+
 protected:
     // returns x and y if not mirroring or y and x if mirroring
     wxCoord GetX(wxCoord x, wxCoord y) const { return m_mirror ? y : x; }
@@ -102,7 +110,7 @@ protected:
 
     // wxDCBase functions
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             wxFloodFillStyle style = wxFLOOD_SURFACE)
+                             int style = wxFLOOD_SURFACE)
     {
         return m_dc.DoFloodFill(GetX(x, y), GetY(x, y), col, style);
     }
@@ -202,8 +210,7 @@ protected:
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord w, wxCoord h,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
-                        wxRasterOperationMode rop = wxCOPY,
-                        bool useMask = false,
+                        int rop = wxCOPY, bool useMask = false,
                         wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
     {
         return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest),
@@ -236,7 +243,7 @@ protected:
 
     virtual void DoDrawPolygon(int n, wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
-                               wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
+                               int fillStyle = wxODDEVEN_RULE)
     {
         Mirror(n, points);
 
@@ -247,7 +254,7 @@ protected:
         Mirror(n, points);
     }
 
-    virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region))
+    virtual void DoSetClippingRegionAsRegion(const wxRegion& WXUNUSED(region))
     {
         wxFAIL_MSG( wxT("not implemented") );
     }
@@ -262,39 +269,18 @@ protected:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
-                                 const wxFont *theFont = NULL) const
+                                 wxFont *theFont = NULL) const
     {
         // never mirrored
         m_dc.DoGetTextExtent(string, x, y, descent, externalLeading, theFont);
     }
 
 private:
-    wxDCImpl& m_dc;
+    wxMirrorDC& m_dc;
 
     bool m_mirror;
 
-    wxDECLARE_NO_COPY_CLASS(wxMirrorDCImpl);
-};
-
-class WXDLLIMPEXP_CORE wxMirrorDC : public wxDC
-{
-public:
-    wxMirrorDC(wxDC& dc, bool mirror)
-        : wxDC(new wxMirrorDCImpl(this, *dc.GetImpl(), mirror))
-    {
-        m_mirror = mirror;
-    }
-
-    // helper functions which may be useful for the users of this class
-    wxSize Reflect(const wxSize& sizeOrig)
-    {
-        return m_mirror ? wxSize(sizeOrig.y, sizeOrig.x) : sizeOrig;
-    }
-
-private:
-    bool m_mirror;
-
-    wxDECLARE_NO_COPY_CLASS(wxMirrorDC);
+    DECLARE_NO_COPY_CLASS(wxMirrorDC)
 };
 
 #endif // _WX_DCMIRROR_H_
diff --git a/Source/3rd Party/wx/include/wx/dcprint.h b/Source/3rd Party/wx/include/wx/dcprint.h
index 0ddef56e4..b22394b08 100644
--- a/Source/3rd Party/wx/include/wx/dcprint.h	
+++ b/Source/3rd Party/wx/include/wx/dcprint.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcprint.h 41240 2006-09-15 16:45:48Z PC $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,28 +16,18 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
-#include "wx/dc.h"
-
-//-----------------------------------------------------------------------------
-// wxPrinterDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPrinterDC : public wxDC
-{
-public:
-    wxPrinterDC();
-    wxPrinterDC(const wxPrintData& data);
-
-    wxRect GetPaperRect() const;
-    int GetResolution() const;
-
-protected:
-    wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPrinterDC)
-};
+#if defined(__WXPALMOS__)
+#include "wx/palmos/dcprint.h"
+#elif defined(__WXMSW__)
+#include "wx/msw/dcprint.h"
+#endif
+#if defined(__WXPM__)
+#include "wx/os2/dcprint.h"
+#endif
+#if defined(__WXMAC__)
+#include "wx/mac/dcprint.h"
+#endif
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
-
-#endif // _WX_DCPRINT_H_BASE_
+#endif
+    // _WX_DCPRINT_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/dcscreen.h b/Source/3rd Party/wx/include/wx/dcscreen.h
index 3bfa71526..8b52dd959 100644
--- a/Source/3rd Party/wx/include/wx/dcscreen.h	
+++ b/Source/3rd Party/wx/include/wx/dcscreen.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcscreen.h 40865 2006-08-27 09:42:42Z VS $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,24 +13,30 @@
 #define _WX_DCSCREEN_H_BASE_
 
 #include "wx/defs.h"
-#include "wx/dc.h"
-
-class WXDLLIMPEXP_CORE wxScreenDC : public wxDC
-{
-public:
-    wxScreenDC();
-
-    static bool StartDrawingOnTop(wxWindow * WXUNUSED(window))
-        { return true; }
-    static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) =  NULL)
-        { return true; }
-    static bool EndDrawingOnTop()
-        { return true; }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxScreenDC)
-};
 
+#if defined(__WXPALMOS__)
+#include "wx/palmos/dcscreen.h"
+#elif defined(__WXMSW__)
+#include "wx/msw/dcscreen.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/dcscreen.h"
+#elif defined(__WXGTK20__)
+#include "wx/gtk/dcscreen.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcscreen.h"
+#elif defined(__WXX11__)
+#include "wx/x11/dcscreen.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/dcscreen.h"
+#elif defined(__WXDFB__)
+#include "wx/dfb/dcscreen.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dcscreen.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/dcscreen.h"
+#elif defined(__WXPM__)
+#include "wx/os2/dcscreen.h"
+#endif
 
 #endif
     // _WX_DCSCREEN_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/dcsvg.h b/Source/3rd Party/wx/include/wx/dcsvg.h
deleted file mode 100644
index a2530d296..000000000
--- a/Source/3rd Party/wx/include/wx/dcsvg.h	
+++ /dev/null
@@ -1,219 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/dcsvg.h
-// Purpose:     wxSVGFileDC
-// Author:      Chris Elliott
-// Modified by:
-// Created:
-// Copyright:   (c) Chris Elliott
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCSVG_H_
-#define _WX_DCSVG_H_
-
-#include "wx/string.h"
-#include "wx/dc.h"
-
-#if wxUSE_SVG
-
-#define wxSVGVersion wxT("v0100")
-
-#ifdef __BORLANDC__
-#pragma warn -8008
-#pragma warn -8066
-#endif
-
-class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;
-
-
-
-class WXDLLIMPEXP_FWD_CORE wxSVGFileDC;
-
-class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
-{
-public:
-    wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename,
-                     int width=320, int height=240, double dpi=72.0 );
-
-    virtual ~wxSVGFileDCImpl();
-
-    bool IsOk() const { return m_OK; }
-
-    virtual bool CanDrawBitmap() const { return true; }
-    virtual bool CanGetTextExtent() const { return true; }
-
-    virtual int GetDepth() const
-    {
-        wxFAIL_MSG(wxT("wxSVGFILEDC::GetDepth Call not implemented"));
-        return -1;
-    }
-
-    virtual void Clear()
-    {
-        wxFAIL_MSG(wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?"));
-    }
-
-    virtual void DestroyClippingRegion()
-    {
-        wxFAIL_MSG(wxT("wxSVGFILEDC::void Call not yet implemented"));
-    }
-
-    virtual wxCoord GetCharHeight() const;
-    virtual wxCoord GetCharWidth() const;
-
-    virtual void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
-                                   wxCoord WXUNUSED(w), wxCoord WXUNUSED(h))
-    {
-        wxFAIL_MSG(wxT("wxSVGFILEDC::SetClippingRegion not implemented"));
-    }
-
-    virtual void SetPalette(const wxPalette&  WXUNUSED(palette))
-    {
-        wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented"));
-    }
-
-    virtual void GetClippingBox(wxCoord *WXUNUSED(x), wxCoord *WXUNUSED(y),
-                                wxCoord *WXUNUSED(w), wxCoord *WXUNUSED(h))
-    {
-        wxFAIL_MSG(wxT("wxSVGFILEDC::GetClippingBox not implemented"));
-    }
-
-    virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
-    {
-        wxFAIL_MSG(wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented"));
-    }
-
-    virtual wxRasterOperationMode GetLogicalFunction() const
-    {
-        wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented"));
-        return wxCOPY;
-    }
-
-    virtual void SetBackground( const wxBrush &brush );
-    virtual void SetBackgroundMode( int mode );
-    virtual void SetBrush(const wxBrush& brush);
-    virtual void SetFont(const wxFont& font);
-    virtual void SetPen(const wxPen& pen);
-
-private:
-   virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const
-   {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::DoGetPixel Call not implemented"));
-       return true;
-   }
-
-   virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *,
-                       wxCoord, wxCoord, wxRasterOperationMode = wxCOPY,
-                       bool = 0, int = -1, int = -1);
-
-   virtual void DoCrossHair(wxCoord, wxCoord)
-   {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::CrossHair Call not implemented"));
-   }
-
-   virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
-
-   virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false);
-
-   virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
-
-   virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
-
-   virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                  double sa, double ea);
-
-   virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord);
-
-   virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
-
-   virtual void DoDrawLines(int n, wxPoint points[],
-                            wxCoord xoffset = 0, wxCoord yoffset = 0);
-
-   virtual void DoDrawPoint(wxCoord, wxCoord);
-
-   virtual void DoDrawPolygon(int n, wxPoint points[],
-                              wxCoord xoffset, wxCoord yoffset,
-                              wxPolygonFillMode fillStyle);
-
-   virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
-
-   virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
-                                  double angle);
-
-   virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-                                       wxCoord w, wxCoord h,
-                                       double radius = 20) ;
-
-   virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-
-   virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
-                            const wxColour& WXUNUSED(col),
-                            wxFloodFillStyle WXUNUSED(style) = wxFLOOD_SURFACE)
-   {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented"));
-       return false;
-   }
-
-   virtual void DoGetSize(int * x, int *y) const
-   {
-       if ( x )
-           *x = m_width;
-       if ( y )
-           *y = m_height;
-   }
-
-   virtual void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h,
-                                wxCoord *descent = NULL,
-                                wxCoord *externalLeading = NULL,
-                                const wxFont *font = NULL) const;
-
-   virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region))
-   {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetDeviceClippingRegion not yet implemented"));
-   }
-
-   virtual void DoSetClippingRegion( int WXUNUSED(x),  int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
-   {
-       wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetClippingRegion not yet implemented"));
-   }
-
-   virtual void DoGetSizeMM( int *width, int *height ) const;
-
-   virtual wxSize GetPPI() const;
-
-   void Init (const wxString &filename, int width, int height, double dpi);
-
-   void NewGraphics();
-
-   void write( const wxString &s );
-
-private:
-   wxFileOutputStream *m_outfile;
-   wxString            m_filename;
-   int                 m_sub_images; // number of png format images we have
-   bool                m_OK;
-   bool                m_graphics_changed;
-   int                 m_width, m_height;
-   double              m_dpi;
-
-private:
-   DECLARE_ABSTRACT_CLASS(wxSVGFileDCImpl)
-};
-
-
-class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
-{
-public:
-    wxSVGFileDC(const wxString& filename,
-                int width = 320,
-                int height = 240,
-                double dpi = 72.0)
-        : wxDC(new wxSVGFileDCImpl(this, filename, width, height, dpi))
-    {
-    }
-};
-
-#endif // wxUSE_SVG
-
-#endif // _WX_DCSVG_H_
diff --git a/Source/3rd Party/wx/include/wx/dde.h b/Source/3rd Party/wx/include/wx/dde.h
index 2a6f6639e..495e9e27a 100644
--- a/Source/3rd Party/wx/include/wx/dde.h	
+++ b/Source/3rd Party/wx/include/wx/dde.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dde.h 53135 2008-04-12 02:31:04Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -22,10 +22,10 @@ WX_DECLARE_USER_EXPORTED_LIST(wxDDEClient, wxDDEClientList, WXDLLIMPEXP_BASE);
 WX_DECLARE_USER_EXPORTED_LIST(wxDDEServer, wxDDEServerList, WXDLLIMPEXP_BASE);
 WX_DECLARE_USER_EXPORTED_LIST(wxDDEConnection, wxDDEConnectionList, WXDLLIMPEXP_BASE);
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
     #include "wx/msw/dde.h"
 #else
-    #error DDE is only supported under Windows
+    #error DDE is only supported on MSW
 #endif
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/debug.h b/Source/3rd Party/wx/include/wx/debug.h
index a7c33e272..fd42bdbfd 100644
--- a/Source/3rd Party/wx/include/wx/debug.h	
+++ b/Source/3rd Party/wx/include/wx/debug.h	
@@ -1,364 +1,247 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/debug.h
-// Purpose:     Misc debug functions and macros
-// Author:      Vadim Zeitlin
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998-2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
+/**
+*  Name:        wx/debug.h
+*  Purpose:     Misc debug functions and macros
+*  Author:      Vadim Zeitlin
+*  Modified by: Ryan Norton (Converted to C)
+*  Created:     29/01/98
+*  RCS-ID:      $Id: debug.h 61872 2009-09-09 22:37:05Z VZ $
+*  Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+*  Licence:     wxWindows licence
+*/
 
-#ifndef _WX_DEBUG_H_
-#define _WX_DEBUG_H_
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
-#if !defined(__WXWINCE__)
-    #include  <assert.h>
-#endif // systems without assert.h
+#ifndef   _WX_DEBUG_H_
+#define   _WX_DEBUG_H_
 
-#include <limits.h>          // for CHAR_BIT used below
+#ifndef __WXWINCE__
+#include  <assert.h>
+#endif
+#include  <limits.h>            /*  for CHAR_BIT used below */
 
-#include "wx/chartype.h"     // for __TFILE__ and wxChar
-#include "wx/cpp.h"          // for __WXFUNCTION__
-#include "wx/dlimpexp.h"     // for WXDLLIMPEXP_FWD_BASE
+#include  "wx/wxchar.h"         /*  for __TFILE__ and wxChar */
 
-class WXDLLIMPEXP_FWD_BASE wxString;
-class WXDLLIMPEXP_FWD_BASE wxCStrData;
+/*  ---------------------------------------------------------------------------- */
+/*  Defines controlling the debugging macros */
+/*  ---------------------------------------------------------------------------- */
 
-// ----------------------------------------------------------------------------
-// Defines controlling the debugging macros
-// ----------------------------------------------------------------------------
-
-/*
-    wxWidgets can be built with several different levels of debug support
-    specified by the value of wxDEBUG_LEVEL constant:
-
-    0:  No assertion macros at all, this should only be used when optimizing
-        for resource-constrained systems (typically embedded ones).
-    1:  Default level, most of the assertions are enabled.
-    2:  Maximal (at least for now): asserts which are "expensive"
-        (performance-wise) or only make sense for finding errors in wxWidgets
-        itself, as opposed to bugs in applications using it, are also enabled.
- */
-
-// unless wxDEBUG_LEVEL is predefined (by configure or via wx/setup.h under
-// Windows), use the default
-#if !defined(wxDEBUG_LEVEL)
-    #define wxDEBUG_LEVEL 1
-#endif // !defined(wxDEBUG_LEVEL)
-
-/*
-    __WXDEBUG__ is defined when wxDEBUG_LEVEL != 0. This is done mostly for
-    compatibility but it also provides a simpler way to check if asserts and
-    debug logging is enabled at all.
- */
-#if wxDEBUG_LEVEL > 0
+/*  if _DEBUG is defined (MS VC++ and others use it in debug builds), define */
+/*  __WXDEBUG__ too */
+#ifdef _DEBUG
     #ifndef __WXDEBUG__
         #define __WXDEBUG__
-    #endif
-#else
-    #undef __WXDEBUG__
-#endif
+    #endif /*  !__WXDEBUG__ */
+#endif /*  _DEBUG */
 
-// Finally there is also a very old WXDEBUG macro not used anywhere at all, it
-// is only defined for compatibility.
+/*  if NDEBUG is defined (<assert.h> uses it), undef __WXDEBUG__ and WXDEBUG */
+#ifdef NDEBUG
+    #undef __WXDEBUG__
+    #undef WXDEBUG
+#endif /*  NDEBUG */
+
+/*  if __WXDEBUG__ is defined, make sure that WXDEBUG is defined and >= 1 */
 #ifdef __WXDEBUG__
     #if !defined(WXDEBUG) || !WXDEBUG
         #undef WXDEBUG
         #define WXDEBUG 1
-    #endif // !WXDEBUG
-#endif // __WXDEBUG__
+    #endif /*  !WXDEBUG */
+#endif /*  __WXDEBUG__ */
 
-// ----------------------------------------------------------------------------
-// Handling assertion failures
-// ----------------------------------------------------------------------------
+#ifndef __WXFUNCTION__
+    /* TODO: add more compilers supporting __FUNCTION__ */
+    #if defined(__DMC__)
+        /* 
+           __FUNCTION__ happens to be not defined within class members
+           http://www.digitalmars.com/drn-bin/wwwnews?c%2B%2B.beta/485
+        */
+        #define __WXFUNCTION__ (NULL)
+    #elif defined(__GNUC__) || \
+          (defined(_MSC_VER) && _MSC_VER >= 1300) || \
+          defined(__FUNCTION__)
+        #define __WXFUNCTION__ __FUNCTION__
+    #else
+        /* still define __WXFUNCTION__ to avoid #ifdefs elsewhere */
+        #define __WXFUNCTION__ (NULL)
+    #endif
+#endif /* __WXFUNCTION__ already defined */
 
-/*
-    Type for the function called in case of assert failure, see
-    wxSetAssertHandler().
- */
-typedef void (*wxAssertHandler_t)(const wxString& file,
-                                  int line,
-                                  const wxString& func,
-                                  const wxString& cond,
-                                  const wxString& msg);
+/*  ---------------------------------------------------------------------------- */
+/*  Debugging macros */
+/*  */
+/*  All debugging macros rely on ASSERT() which in turn calls the user-defined */
+/*  OnAssert() function. To keep things simple, it's called even when the */
+/*  expression is true (i.e. everything is ok) and by default does nothing: just */
+/*  returns the same value back. But if you redefine it to do something more sexy */
+/*  (popping up a message box in your favourite GUI, sending you e-mail or */
+/*  whatever) it will affect all ASSERTs, FAILs and CHECKs in your code. */
+/*  */
+/*  Warning: if you don't like advice on programming style, don't read */
+/*  further! ;-) */
+/*  */
+/*  Extensive use of these macros is recommended! Remember that ASSERTs are */
+/*  disabled in final build (without __WXDEBUG__ defined), so they add strictly */
+/*  nothing to your program's code. On the other hand, CHECK macros do stay */
+/*  even in release builds, but in general are not much of a burden, while */
+/*  a judicious use of them might increase your program's stability. */
+/*  ---------------------------------------------------------------------------- */
 
-#if wxDEBUG_LEVEL
+/*  Macros which are completely disabled in 'release' mode */
+/*  */
+/*  NB: these functions are implemented in src/common/appcmn.cpp */
+#if defined(__cplusplus) && defined(__WXDEBUG__)
+  /*
+    This function is called whenever one of debugging macros fails (i.e.
+    condition is false in an assertion). To customize its behaviour, override
+    wxApp::OnAssert().
 
-// the global assert handler function, if it is NULL asserts don't check their
-// conditions
-extern WXDLLIMPEXP_DATA_BASE(wxAssertHandler_t) wxTheAssertHandler;
+    Parameters:
+       szFile and nLine - file name and line number of the ASSERT
+       szFunc           - function name of the ASSERT, may be NULL (NB: ASCII)
+       szCond           - text form of the condition which failed
+       szMsg            - optional message explaining the reason
+  */
+  extern void WXDLLIMPEXP_BASE wxOnAssert(const wxChar *szFile,
+                                          int nLine,
+                                          const char *szFunc,
+                                          const wxChar *szCond,
+                                          const wxChar *szMsg = NULL);
 
-/*
-    Sets the function to be called in case of assertion failure.
+  /*  call this function to break into the debugger unconditionally (assuming */
+  /*  the program is running under debugger, of course) */
+  extern void WXDLLIMPEXP_BASE wxTrap();
 
-    The default assert handler forwards to wxApp::OnAssertFailure() whose
-    default behaviour is, in turn, to show the standard assertion failure
-    dialog if a wxApp object exists or shows the same dialog itself directly
-    otherwise.
-
-    While usually it is enough -- and more convenient -- to just override
-    OnAssertFailure(), to handle all assertion failures, including those
-    occurring even before wxApp object creation or after its destruction you
-    need to provide your assertion handler function.
-
-    This function also provides a simple way to disable all asserts: simply
-    pass NULL pointer to it. Doing this will result in not even evaluating
-    assert conditions at all, avoiding almost all run-time cost of asserts.
-
-    Notice that this function is not MT-safe, so you should call it before
-    starting any other threads.
-
-    The return value of this function is the previous assertion handler. It can
-    be called after any pre-processing by your handler and can also be restored
-    later if you uninstall your handler.
- */
-inline wxAssertHandler_t wxSetAssertHandler(wxAssertHandler_t handler)
-{
-    const wxAssertHandler_t old = wxTheAssertHandler;
-    wxTheAssertHandler = handler;
-    return old;
-}
-
-/*
-    Reset the default assert handler.
-
-    This may be used to enable asserts, which are disabled by default in this
-    case, for programs built in release build (NDEBUG defined).
- */
-extern void WXDLLIMPEXP_BASE wxSetDefaultAssertHandler();
-
-#else // !wxDEBUG_LEVEL
-
-// provide empty stubs in case assertions are completely disabled
-//
-// NB: can't use WXUNUSED() here as we're included from wx/defs.h before it is
-//     defined
-inline wxAssertHandler_t wxSetAssertHandler(wxAssertHandler_t /* handler */)
-{
-    return NULL;
-}
-
-inline void wxSetDefaultAssertHandler() { }
-
-#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
-
-// simply a synonym for wxSetAssertHandler(NULL)
-inline void wxDisableAsserts() { wxSetAssertHandler(NULL); }
-
-/*
-    A macro which disables asserts for applications compiled in release build.
-
-    By default, wxIMPLEMENT_APP (or rather wxIMPLEMENT_WXWIN_MAIN) disable the
-    asserts in the applications compiled in the release build by calling this.
-    It does nothing if NDEBUG is not defined.
- */
-#ifdef NDEBUG
-    #define wxDISABLE_ASSERTS_IN_RELEASE_BUILD() wxDisableAsserts()
-#else
-    #define wxDISABLE_ASSERTS_IN_RELEASE_BUILD()
-#endif
-
-#if wxDEBUG_LEVEL
-
-/*
-    wxOnAssert() is used by the debugging macros defined below. Different
-    overloads are needed because these macros can be used with or without wxT().
-
-    All of them are implemented in src/common/appcmn.cpp and unconditionally
-    call wxTheAssertHandler so the caller must check that it is non-NULL
-    (assert macros do it).
- */
-
-#if wxUSE_UNICODE
-
-// these overloads are the ones typically used by debugging macros: we have to
-// provide wxChar* msg version because it's common to use wxT() in the macros
-// and finally, we can't use const wx(char)* msg = NULL, because that would
-// be ambiguous
-//
-// also notice that these functions can't be inline as wxString is not defined
-// yet (and can't be as wxString code itself may use assertions)
-extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
-                                        int line,
-                                        const char *func,
-                                        const char *cond);
-
-extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
-                                        int line,
-                                        const char *func,
-                                        const char *cond,
-                                        const char *msg);
-
-extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
-                                        int line,
-                                        const char *func,
-                                        const char *cond,
-                                        const wxChar *msg) ;
-#endif /* wxUSE_UNICODE */
-
-// this version is for compatibility with wx 2.8 Unicode build only, we don't
-// use it ourselves any more except in ANSI-only build in which case it is all
-// we need
-extern WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file,
-                                        int line,
-                                        const char *func,
-                                        const wxChar *cond,
-                                        const wxChar *msg = NULL);
-
-// these overloads work when msg passed to debug macro is a string and we
-// also have to provide wxCStrData overload to resolve ambiguity which would
-// otherwise arise from wxASSERT( s.c_str() )
-extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file,
-                                        int line,
-                                        const wxString& func,
-                                        const wxString& cond,
-                                        const wxString& msg);
-
-extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file,
-                                        int line,
-                                        const wxString& func,
-                                        const wxString& cond);
-
-extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
-                                        int line,
-                                        const char *func,
-                                        const char *cond,
-                                        const wxCStrData& msg);
-
-extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,
-                                        int line,
-                                        const char *func,
-                                        const char *cond,
-                                        const wxString& msg);
-
-#endif // wxDEBUG_LEVEL
+  /*  generic assert macro */
+  #define wxASSERT(cond) wxASSERT_MSG(cond, NULL)
 
 
-// ----------------------------------------------------------------------------
-// Debugging macros
-// ----------------------------------------------------------------------------
+  /*  assert with additional message explaining its cause */
 
-/*
-    Assertion macros: check if the condition is true and call assert handler
-    (which will by default notify the user about failure) if it isn't.
-
-    wxASSERT and wxFAIL macros as well as wxTrap() function do nothing at all
-    if wxDEBUG_LEVEL is 0 however they do check their conditions at default
-    debug level 1, unlike the previous wxWidgets versions.
-
-    wxASSERT_LEVEL_2 is meant to be used for "expensive" asserts which should
-    normally be disabled because they have a big impact on performance and so
-    this macro only does anything if wxDEBUG_LEVEL >= 2.
- */
-#if wxDEBUG_LEVEL
-    // call this function to break into the debugger unconditionally (assuming
-    // the program is running under debugger, of course)
-    extern void WXDLLIMPEXP_BASE wxTrap();
-
-    // assert checks if the condition is true and calls the assert handler with
-    // the provided message if it isn't
-    //
-    // NB: the macro is defined like this to ensure that nested if/else
-    //     statements containing it are compiled in the same way whether it is
-    //     defined as empty or not; also notice that we can't use ";" instead
-    //     of "{}" as some compilers warn about "possible unwanted ;" then
+  /*  compilers can give a warning (such as "possible unwanted ;") when using */
+  /*  the default definition of wxASSERT_MSG so we provide an alternative */
+  #if defined(__MWERKS__)
     #define wxASSERT_MSG(cond, msg)                                           \
-        if ( !wxTheAssertHandler || (cond) )                                  \
-        {}                                                                    \
-        else                                                                  \
-            wxOnAssert(__FILE__, __LINE__, __WXFUNCTION__, #cond, msg)
+      if ( cond )                                                             \
+      {}                                                                      \
+      else                                                                    \
+          wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg)
+  #else
+    #define wxASSERT_MSG(cond, msg)                                           \
+      if ( cond )                                                             \
+          ;                                                                   \
+      else                                                                    \
+          wxOnAssert(__TFILE__, __LINE__, __WXFUNCTION__, wxT(#cond), msg)
+  #endif
 
-    // a version without any additional message, don't use unless condition
-    // itself is fully self-explanatory
-    #define wxASSERT(cond) wxASSERT_MSG(cond, (const char*)NULL)
+  /*  special form of assert: always triggers it (in debug mode) */
+  #define wxFAIL wxFAIL_MSG(NULL)
 
-    // wxFAIL is a special form of assert: it always triggers (and so is
-    // usually used in normally unreachable code)
-    #define wxFAIL_COND_MSG(cond, msg) \
-        if ( !wxTheAssertHandler )                                            \
-        {}                                                                    \
-        else                                                                  \
-            wxOnAssert(__FILE__, __LINE__,  __WXFUNCTION__, cond, msg)
-    #define wxFAIL_MSG(msg) wxFAIL_COND_MSG("Assert failure", msg)
-    #define wxFAIL wxFAIL_MSG((const char*)NULL)
-#else // !wxDEBUG_LEVEL
-    #define wxTrap()
+  /*  FAIL with some message */
+  #define wxFAIL_MSG(msg) wxFAIL_COND_MSG("wxAssertFailure", msg)
 
-    #define wxASSERT(cond)
-    #define wxASSERT_MSG(cond, msg)
-    #define wxFAIL
-    #define wxFAIL_MSG(msg)
-    #define wxFAIL_COND_MSG(cond, msg)
-#endif  // wxDEBUG_LEVEL
+  /*  FAIL with some message and a condition */
+  #define wxFAIL_COND_MSG(cond, msg)                                          \
+      wxOnAssert(__TFILE__, __LINE__,  __WXFUNCTION__, wxT(cond), msg)
 
-#if wxDEBUG_LEVEL >= 2
-    #define wxASSERT_LEVEL_2_MSG(cond, msg) wxASSERT_MSG(cond, msg)
-    #define wxASSERT_LEVEL_2(cond) wxASSERT(cond)
-#else // wxDEBUG_LEVEL < 2
-    #define wxASSERT_LEVEL_2_MSG(cond, msg)
-    #define wxASSERT_LEVEL_2(cond)
+  /*  An assert helper used to avoid warning when testing constant expressions, */
+  /*  i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about */
+  /*  expression being always true, but not using */
+  /*  wxASSERT( wxAssertIsEqual(sizeof(int), 4) ) */
+  /*  */
+  /*  NB: this is made obsolete by wxCOMPILE_TIME_ASSERT() and should no */
+  /*      longer be used. */
+  extern bool WXDLLIMPEXP_BASE wxAssertIsEqual(int x, int y);
+#else
+  #define wxTrap()
+
+  /*  nothing to do in release mode (hopefully at this moment there are */
+  /*  no more bugs ;-) */
+  #define wxASSERT(cond)
+  #define wxASSERT_MSG(cond, msg)
+  #define wxFAIL
+  #define wxFAIL_MSG(msg)
+  #define wxFAIL_COND_MSG(cond, msg)
+#endif  /* __WXDEBUG__ */
+
+#ifdef __cplusplus
+    /*  Use of wxFalse instead of false suppresses compiler warnings about testing */
+    /*  constant expression */
+    extern WXDLLIMPEXP_DATA_BASE(const bool) wxFalse;
 #endif
 
-// This is simply a wrapper for the standard abort() which is not available
-// under all platforms.
-//
-// It isn't really debug-related but there doesn't seem to be any better place
-// for it, so declare it here and define it in appbase.cpp, together with
-// wxTrap().
-extern void WXDLLIMPEXP_BASE wxAbort();
+#define wxAssertFailure wxFalse
+
+/*  NB: the following macros also work in release mode! */
 
 /*
-    wxCHECK macros always check their conditions, setting debug level to 0 only
-    makes them silent in case of failure, otherwise -- including at default
-    debug level 1 -- they call the assert handler if the condition is false
-
-    They are supposed to be used only in invalid situation: for example, an
-    invalid parameter (e.g. a NULL pointer) is passed to a function. Instead of
-    dereferencing it and causing core dump the function might use
-
-        wxCHECK_RET( p != NULL, "pointer can't be NULL" )
+  These macros must be used only in invalid situation: for example, an
+  invalid parameter (e.g. a NULL pointer) is passed to a function. Instead of
+  dereferencing it and causing core dump the function might try using
+  CHECK( p != NULL ) or CHECK( p != NULL, return LogError("p is NULL!!") )
 */
 
-// the generic macro: takes the condition to check, the statement to be executed
-// in case the condition is false and the message to pass to the assert handler
-#define wxCHECK2_MSG(cond, op, msg)                                       \
-    if ( cond )                                                           \
-    {}                                                                    \
-    else                                                                  \
-    {                                                                     \
-        wxFAIL_COND_MSG(#cond, msg);                                      \
-        op;                                                               \
-    }                                                                     \
-    struct wxDummyCheckStruct /* just to force a semicolon */
+/*  check that expression is true, "return" if not (also FAILs in debug mode) */
+#define wxCHECK(cond, rc)            wxCHECK_MSG(cond, rc, NULL)
 
-// check which returns with the specified return code if the condition fails
+/*  as wxCHECK but with a message explaining why we fail */
 #define wxCHECK_MSG(cond, rc, msg)   wxCHECK2_MSG(cond, return rc, msg)
 
-// check that expression is true, "return" if not (also FAILs in debug mode)
-#define wxCHECK(cond, rc)            wxCHECK_MSG(cond, rc, (const char*)NULL)
+/*  check that expression is true, perform op if not */
+#define wxCHECK2(cond, op)           wxCHECK2_MSG(cond, op, NULL)
 
-// check that expression is true, perform op if not
-#define wxCHECK2(cond, op)           wxCHECK2_MSG(cond, op, (const char*)NULL)
+/*  as wxCHECK2 but with a message explaining why we fail */
 
-// special form of wxCHECK2: as wxCHECK, but for use in void functions
-//
-// NB: there is only one form (with msg parameter) and it's intentional:
-//     there is no other way to tell the caller what exactly went wrong
-//     from the void function (of course, the function shouldn't be void
-//     to begin with...)
+#ifdef __GNUC__
+    #define wxFORCE_SEMICOLON typedef int wxDummyCheckInt
+    /* Note: old gcc versions (e.g. 2.8) give an internal compiler error */
+    /*     on a simple forward declaration, when used in a template    */
+    /*     function, so rather use a dummy typedef which does work...  */
+#else
+    #define wxFORCE_SEMICOLON struct wxDummyCheckStruct
+    /* Note2: however, some other compilers (notably Digital Mars */
+    /*     don't like multiple typedefs (even though the standard */
+    /*     does allow them), so use a forward declaration for non-gcc.  */
+#endif
+/* see comment near the definition of wxASSERT_MSG for the # if/else reason */
+#if defined(__MWERKS__)
+    #define wxCHECK2_MSG(cond, op, msg)                                       \
+        if ( cond )                                                           \
+        {}                                                                    \
+        else                                                                  \
+        {                                                                     \
+            wxFAIL_COND_MSG(#cond, msg);                                      \
+            op;                                                               \
+        }                                                                     \
+        struct wxDummyCheckStruct /* just to force a semicolon */
+#else
+    #define wxCHECK2_MSG(cond, op, msg)                                       \
+        if ( cond )                                                           \
+            ;                                                                 \
+        else                                                                  \
+        {                                                                     \
+            wxFAIL_COND_MSG(#cond, msg);                                      \
+            op;                                                               \
+        }                                                                     \
+        wxFORCE_SEMICOLON /* just to force a semicolon */
+#endif
+
+/*  special form of wxCHECK2: as wxCHECK, but for use in void functions */
+/*  */
+/*  NB: there is only one form (with msg parameter) and it's intentional: */
+/*      there is no other way to tell the caller what exactly went wrong */
+/*      from the void function (of course, the function shouldn't be void */
+/*      to begin with...) */
 #define wxCHECK_RET(cond, msg)       wxCHECK2_MSG(cond, return, msg)
 
-
-// ----------------------------------------------------------------------------
-// Compile time asserts
-//
-// Unlike the normal assert and related macros above which are checked during
-// the program run-time the macros below will result in a compilation error if
-// the condition they check is false. This is usually used to check the
-// expressions containing sizeof()s which cannot be tested with the
-// preprocessor. If you can use the #if's, do use them as you can give a more
-// detailed error message then.
-// ----------------------------------------------------------------------------
+/*  ---------------------------------------------------------------------------- */
+/*  Compile time asserts */
+/*  */
+/*  Unlike the normal assert and related macros above which are checked during */
+/*  the program tun-time the macros below will result in a compilation error if */
+/*  the condition they check is false. This is usually used to check the */
+/*  expressions containing sizeof()s which cannot be tested with the */
+/*  preprocessor. If you can use the #if's, do use them as you can give a more */
+/*  detailed error message then. */
+/*  ---------------------------------------------------------------------------- */
 
 /*
   How this works (you don't have to understand it to be able to use the
@@ -380,31 +263,13 @@ extern void WXDLLIMPEXP_BASE wxAbort();
 
  It may be used both within a function and in the global scope.
 */
-#if defined(__WATCOMC__)
+#if defined(__WATCOMC__) && defined(__cplusplus)
     /* avoid "unused symbol" warning */
     #define wxCOMPILE_TIME_ASSERT(expr, msg) \
         class wxMAKE_UNIQUE_ASSERT_NAME { \
           unsigned int msg: expr; \
           wxMAKE_UNIQUE_ASSERT_NAME() { wxUnusedVar(msg); } \
         }
-#elif defined( __VMS )
-namespace wxdebug{
-
-// HP aCC cannot deal with missing names for template value parameters
-template <bool x> struct STATIC_ASSERTION_FAILURE;
-
-template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
-
-// HP aCC cannot deal with missing names for template value parameters
-template<int x> struct static_assert_test{};
-
-}
-    #define WX_JOIN( X, Y ) X##Y
-    #define WX_STATIC_ASSERT_BOOL_CAST(x) (bool)(x)
-    #define wxCOMPILE_TIME_ASSERT(expr, msg) \
-       typedef ::wxdebug::static_assert_test<\
-          sizeof(::wxdebug::STATIC_ASSERTION_FAILURE< WX_STATIC_ASSERT_BOOL_CAST( expr ) >)>\
-            WX_JOIN(wx_static_assert_typedef_, __LINE__)
 #else
     #define wxCOMPILE_TIME_ASSERT(expr, msg) \
         struct wxMAKE_UNIQUE_ASSERT_NAME { unsigned int msg: expr; }
@@ -420,53 +285,32 @@ template<int x> struct static_assert_test{};
 #define wxCOMPILE_TIME_ASSERT2(expr, msg, text) \
     struct wxMAKE_UNIQUE_ASSERT_NAME2(text) { unsigned int msg: expr; }
 
-// helpers for wxCOMPILE_TIME_ASSERT below, for private use only
+/*  helpers for wxCOMPILE_TIME_ASSERT below, for private use only */
 #define wxMAKE_BITSIZE_MSG(type, size) type ## SmallerThan ## size ## Bits
 
-// a special case of compile time assert: check that the size of the given type
-// is at least the given number of bits
+/*  a special case of compile time assert: check that the size of the given type */
+/*  is at least the given number of bits */
 #define wxASSERT_MIN_BITSIZE(type, size) \
     wxCOMPILE_TIME_ASSERT(sizeof(type) * CHAR_BIT >= size, \
                           wxMAKE_BITSIZE_MSG(type, size))
 
-
-// ----------------------------------------------------------------------------
-// other miscellaneous debugger-related functions
-// ----------------------------------------------------------------------------
+/*  ---------------------------------------------------------------------------- */
+/*  other miscellaneous debugger-related functions */
+/*  ---------------------------------------------------------------------------- */
 
 /*
     Return true if we're running under debugger.
 
-    Currently only really works under Win32 and just returns false elsewhere.
+    Currently this only really works under Win32 and Mac in CodeWarrior builds,
+    it always returns false in other cases.
  */
-#if defined(__WIN32__)
-    extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
-#else // !Mac
-    inline bool wxIsDebuggerRunning() { return false; }
-#endif // Mac/!Mac
+#ifdef __cplusplus
+    /* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */
+    #if defined(__WXMAC__) || defined(__WIN32__)
+        extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
+    #else /*  !Mac */
+        inline bool wxIsDebuggerRunning() { return false; }
+    #endif /*  Mac/!Mac */
+#endif /* __cplusplus */
 
-// An assert helper used to avoid warning when testing constant expressions,
-// i.e. wxASSERT( sizeof(int) == 4 ) can generate a compiler warning about
-// expression being always true, but not using
-// wxASSERT( wxAssertIsEqual(sizeof(int), 4) )
-//
-// NB: this is made obsolete by wxCOMPILE_TIME_ASSERT() and should no
-//     longer be used.
-extern bool WXDLLIMPEXP_BASE wxAssertIsEqual(int x, int y);
-
-// Use of wxFalse instead of false suppresses compiler warnings about testing
-// constant expression
-extern WXDLLIMPEXP_DATA_BASE(const bool) wxFalse;
-
-#define wxAssertFailure wxFalse
-
-// This is similar to WXUNUSED() and useful for parameters which are only used
-// in assertions.
-#if wxDEBUG_LEVEL
-    #define WXUNUSED_UNLESS_DEBUG(param)  param
-#else
-    #define WXUNUSED_UNLESS_DEBUG(param)  WXUNUSED(param)
-#endif
-
-
-#endif // _WX_DEBUG_H_
+#endif  /*  _WX_DEBUG_H_ */
diff --git a/Source/3rd Party/wx/include/wx/defs.h b/Source/3rd Party/wx/include/wx/defs.h
index e49f8d1be..6e3fd8765 100644
--- a/Source/3rd Party/wx/include/wx/defs.h	
+++ b/Source/3rd Party/wx/include/wx/defs.h	
@@ -4,7 +4,7 @@
  *  Author:      Julian Smart and others
  *  Modified by: Ryan Norton (Converted to C)
  *  Created:     01/02/97
- *  RCS-ID:      $Id$
+ *  RCS-ID:      $Id: defs.h 66923 2011-02-16 22:37:48Z JS $
  *  Copyright:   (c) Julian Smart
  *  Licence:     wxWindows licence
  */
@@ -14,13 +14,6 @@
 #ifndef _WX_DEFS_H_
 #define _WX_DEFS_H_
 
-/*
-    NOTE: this symbol will be replaced with "WXWIN_COMPATIBILITY_3_0" as soon
-          as the development branch for 3.1 is created
- */
-#define FUTURE_WXWIN_COMPATIBILITY_3_0      1
-#define wxDEPRECATED_FUTURE( x )            x
-
 /*  ---------------------------------------------------------------------------- */
 /*  compiler and OS identification */
 /*  ---------------------------------------------------------------------------- */
@@ -30,16 +23,18 @@
 #ifdef __cplusplus
 /*  Make sure the environment is set correctly */
 #   if defined(__WXMSW__) && defined(__X__)
-#       error "Target can't be both X and MSW"
+#       error "Target can't be both X and Windows"
+#   elif defined(__WXMSW__) && defined(__PALMOS__)
+#       error "Target can't be both PalmOS and Windows"
 #   elif !defined(__WXMOTIF__) && \
          !defined(__WXMSW__)   && \
+         !defined(__WXPALMOS__)&& \
          !defined(__WXGTK__)   && \
          !defined(__WXPM__)    && \
-         !defined(__WXOSX_CARBON__)   && \
-         !defined(__WXOSX_COCOA__)   && \
-         !defined(__WXOSX_IPHONE__)   && \
+         !defined(__WXMAC__)   && \
          !defined(__WXCOCOA__) && \
          !defined(__X__)       && \
+         !defined(__WXMGL__)   && \
          !defined(__WXDFB__)   && \
          !defined(__WXX11__)   && \
           wxUSE_GUI
@@ -64,6 +59,9 @@
     #define __WXBASE__
 #endif
 
+/*  include the feature test macros */
+#include "wx/features.h"
+
 /*  suppress some Visual C++ warnings */
 #ifdef __VISUALC__
     /*  the only "real" warning here is 4244 but there are just too many of them */
@@ -74,89 +72,43 @@
 #   pragma warning(disable:4355)    /* 'this' used in base member initializer list */
 #   pragma warning(disable:4511)    /*  copy ctor couldn't be generated */
 #   pragma warning(disable:4512)    /*  operator=() couldn't be generated */
-#   pragma warning(disable:4514)   /*  unreferenced inline func has been removed */
 #   pragma warning(disable:4710)    /*  function not inlined */
 
-    /*
-        TODO: this warning should really be enabled as it can be genuinely
-              useful, check where does it occur in wxWidgets
-     */
-    #pragma warning(disable: 4127) /*  conditional expression is constant */
-
-    /* There are too many false positivies for this one, particularly when
-       using templates like wxVector<T> */
-    /* class 'foo' needs to have dll-interface to be used by clients of
-       class 'bar'" */
-#   pragma warning(disable:4251)
-
-    /*
-        This is a similar warning which occurs when deriving from standard
-        containers. MSDN even mentions that it can be ignored in this case
-        (albeit only in debug build while the warning is the same in release
-        too and seems equally harmless).
-     */
-#if wxUSE_STD_CONTAINERS
-#   pragma warning(disable:4275)
-#endif /* wxUSE_STD_CONTAINERS */
-
-#   ifdef __VISUALC5__
     /* For VC++ 5.0 for release mode, the warning 'C4702: unreachable code */
     /* is buggy, and occurs for code that does actually get executed */
-#   ifndef __WXDEBUG__
+#   if !defined __WXDEBUG__ && __VISUALC__ <= 1100
 #       pragma warning(disable:4702)    /* unreachable code */
 #   endif
-
     /* The VC++ 5.0 warning 'C4003: not enough actual parameters for macro'
      * is incompatible with the wxWidgets headers since it is given when
      * parameters are empty but not missing. */
+#   if __VISUALC__ <= 1100
 #       pragma warning(disable:4003)    /* not enough actual parameters for macro */
 #   endif
 
-    /*
-       VC6 insists on complaining about
-
-        return type for 'wxVector<T>::reverse_iterator::operator ->' is 'T **'
-        (ie; not a UDT or reference to a UDT.  Will produce errors if applied
-        using infix notation)
-
-       which is perfectly fine because template classes do routinely define
-       operators which don't make sense for all template parameter values
-       (besides this warning was removed in subsequent versions).
-     */
-    #ifdef __VISUALC6__
-        #pragma warning(disable: 4284)
-    #endif /* VC6 */
-
-    /*
-       When compiling with VC++ 7 /Wp64 option we get thousands of warnings for
-       conversion from size_t to int or long. Some precious few of them might
-       be worth looking into but unfortunately it seems infeasible to fix all
-       the other, harmless ones (e.g. inserting static_cast<int>(s.length())
-       everywhere this method is used though we are quite sure that using >4GB
-       strings is a bad idea anyhow) so just disable it globally for now.
-     */
-    #if wxCHECK_VISUALC_VERSION(7)
-        /* conversion from 'size_t' to 'unsigned long', possible loss of data */
-        #pragma warning(disable:4267)
-    #endif /* VC++ 7 or later */
-
     /*
        VC++ 8 gives a warning when using standard functions such as sprintf,
        localtime, ... -- stop this madness, unless the user had already done it
      */
-    #if wxCHECK_VISUALC_VERSION(8)
+    #if __VISUALC__ >= 1400
         #ifndef _CRT_SECURE_NO_DEPRECATE
             #define _CRT_SECURE_NO_DEPRECATE 1
         #endif
         #ifndef _CRT_NON_CONFORMING_SWPRINTFS
             #define _CRT_NON_CONFORMING_SWPRINTFS 1
         #endif
-        #ifndef _SCL_SECURE_NO_WARNINGS
-            #define _SCL_SECURE_NO_WARNINGS 1
-        #endif
     #endif /* VC++ 8 */
 #endif /*  __VISUALC__ */
 
+/*  suppress some Salford C++ warnings */
+#ifdef __SALFORDC__
+#   pragma suppress 353             /*  Possible nested comments */
+#   pragma suppress 593             /*  Define not used */
+#   pragma suppress 61              /*  enum has no name (doesn't suppress!) */
+#   pragma suppress 106             /*  unnamed, unused parameter */
+#   pragma suppress 571             /*  Virtual function hiding */
+#endif /*  __SALFORDC__ */
+
 /*  suppress some Borland C++ warnings */
 #ifdef __BORLANDC__
 #   pragma warn -inl                /*  Functions containing reserved words and certain constructs are not expanded inline */
@@ -175,18 +127,6 @@
 #   define wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(name)
 #endif
 
-/*
-   Clang Support
- */
- 
-#ifndef WX_HAS_CLANG_FEATURE
-#   ifndef __has_feature      
-#       define WX_HAS_CLANG_FEATURE(x) 0 
-#   else
-#       define WX_HAS_CLANG_FEATURE(x) __has_feature(x)
-#   endif
-#endif
-
 /*  ---------------------------------------------------------------------------- */
 /*  wxWidgets version and compatibility defines */
 /*  ---------------------------------------------------------------------------- */
@@ -215,16 +155,73 @@
 #define va_list __gnuc_va_list
 #endif /*  HP-UX */
 
-/* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
-/* when using Windows sockets. */
-#if defined(__CYGWIN__) && defined(__WXMSW__)
-#define __USE_W32_SOCKETS
-#endif
-
 /*  ---------------------------------------------------------------------------- */
 /*  check for native bool type and TRUE/FALSE constants */
 /*  ---------------------------------------------------------------------------- */
 
+/*  Add more tests here for Windows compilers that already define bool */
+/*  (under Unix, configure tests for this) */
+#ifndef HAVE_BOOL
+    #if defined( __MWERKS__ )
+        #if (__MWERKS__ >= 0x1000) && __option(bool)
+            #define HAVE_BOOL
+        #endif
+    #elif defined(__APPLE__) && defined(__APPLE_CC__)
+        /*  Apple bundled gcc supports bool */
+        #define HAVE_BOOL
+    #elif defined(__VISUALC__) && (__VISUALC__ == 1020)
+        /*  in VC++ 4.2 the bool keyword is reserved (hence can't be typedefed) */
+        /*  but not implemented, so we must #define it */
+        #define bool unsigned int
+    #elif defined(__VISUALC__) && (__VISUALC__ == 1010)
+        /*  For VisualC++ 4.1, we need to define */
+        /*  bool as something between 4.0 & 5.0... */
+        typedef unsigned int wxbool;
+        #define bool wxbool
+        #define HAVE_BOOL
+    #elif defined(__VISUALC__) && (__VISUALC__ > 1020)
+        /*  VC++ supports bool since 4.2 */
+        #define HAVE_BOOL
+    #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)
+        /*  Borland 5.0+ supports bool */
+        #define HAVE_BOOL
+    #elif wxCHECK_WATCOM_VERSION(1,0)
+        /*  Watcom 11+ supports bool */
+        #define HAVE_BOOL
+    #elif defined(__DIGITALMARS__)
+        /*  DigitalMars supports bool */
+        #define HAVE_BOOL
+    #elif defined(__GNUWIN32__) || defined(__MINGW32__) || defined(__CYGWIN__)
+        /*  Cygwin supports bool */
+        #define HAVE_BOOL
+    #elif defined(__VISAGECPP__)
+        #if __IBMCPP__ < 400
+            typedef unsigned long bool;
+            #define true ((bool)1)
+            #define false ((bool)0)
+        #endif
+        #define HAVE_BOOL
+    #endif /*  compilers */
+#endif /*  HAVE_BOOL */
+
+#if !defined(__MWERKS__) || !defined(true)
+#if !defined(HAVE_BOOL) && !defined(bool) && !defined(VMS)
+    /*  NB: of course, this doesn't replace the standard type, because, for */
+    /*      example, overloading based on bool/int parameter doesn't work and */
+    /*      so should be avoided in portable programs */
+    typedef unsigned int bool;
+#endif /*  bool */
+
+/*  deal with TRUE/true stuff: we assume that if the compiler supports bool, it */
+/*  supports true/false as well and that, OTOH, if it does _not_ support bool, */
+/*  it doesn't support these keywords (this is less sure, in particular VC++ */
+/*  4.x could be a problem here) */
+#ifndef HAVE_BOOL
+    #define true ((bool)1)
+    #define false ((bool)0)
+#endif
+#endif
+
 /*  for backwards compatibility, also define TRUE and FALSE */
 /*  */
 /*  note that these definitions should work both in C++ and C code, so don't */
@@ -239,6 +236,12 @@
 
 typedef short int WXTYPE;
 
+/*  special care should be taken with this type under Windows where the real */
+/*  window id is unsigned, so we must always do the cast before comparing them */
+/*  (or else they would be always different!). Using wxGetWindowId() which does */
+/*  the cast itself is recommended. Note that this type can't be unsigned */
+/*  because wxID_ANY == -1 is a valid (and largely used) value for window id. */
+typedef int wxWindowID;
 
 /*  ---------------------------------------------------------------------------- */
 /*  other feature tests */
@@ -264,9 +267,10 @@ typedef short int WXTYPE;
     #elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x0520)
         /*  BC++ 4.52 doesn't support explicit, CBuilder 1 does */
         #define HAVE_EXPLICIT
-    #elif defined(__DIGITALMARS__)
+    #elif defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+        /*  Metrowerks CW6 or higher has explicit */
         #define HAVE_EXPLICIT
-    #elif defined(__WATCOMC__)
+    #elif defined(__DIGITALMARS__)
         #define HAVE_EXPLICIT
     #endif
 #endif /*  !HAVE_EXPLICIT */
@@ -277,10 +281,51 @@ typedef short int WXTYPE;
     #define wxEXPLICIT
 #endif /*  HAVE_EXPLICIT/!HAVE_EXPLICIT */
 
-/* these macros are obsolete, use the standard C++ casts directly now */
-#define wx_static_cast(t, x) static_cast<t>(x)
-#define wx_const_cast(t, x) const_cast<t>(x)
-#define wx_reinterpret_cast(t, x) reinterpret_cast<t>(x)
+/* check for static/const_cast<>() (we don't use the other ones for now) */
+#ifndef HAVE_CXX_CASTS
+    #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
+        /*  VC++ 6.0 and 5.0 have C++ casts (what about earlier versions?) */
+        #define HAVE_CXX_CASTS
+    #elif defined(__MINGW32__) || defined(__CYGWIN32__)
+        #if wxCHECK_GCC_VERSION(2, 95)
+            /*  GCC 2.95 has C++ casts, what about earlier versions? */
+            #define HAVE_CXX_CASTS
+        #endif
+    #endif
+#endif /*  !HAVE_CXX_CASTS */
+
+#ifdef HAVE_CXX_CASTS
+    #ifndef HAVE_CONST_CAST
+        #define HAVE_CONST_CAST
+    #endif
+    #ifndef HAVE_REINTERPRET_CAST
+        #define HAVE_REINTERPRET_CAST
+    #endif
+    #ifndef HAVE_STATIC_CAST
+        #define HAVE_STATIC_CAST
+    #endif
+    #ifndef HAVE_DYNAMIC_CAST
+        #define HAVE_DYNAMIC_CAST
+    #endif
+#endif /*  HAVE_CXX_CASTS */
+
+#ifdef HAVE_STATIC_CAST
+    #define wx_static_cast(t, x) static_cast<t>(x)
+#else
+    #define wx_static_cast(t, x) ((t)(x))
+#endif
+
+#ifdef HAVE_CONST_CAST
+    #define wx_const_cast(t, x) const_cast<t>(x)
+#else
+    #define wx_const_cast(t, x) ((t)(x))
+#endif
+
+#ifdef HAVE_REINTERPRET_CAST
+    #define wx_reinterpret_cast(t, x) reinterpret_cast<t>(x)
+#else
+    #define wx_reinterpret_cast(t, x) ((t)(x))
+#endif
 
 /*
    This one is a wx invention: like static cast but used when we intentionally
@@ -296,8 +341,6 @@ typedef short int WXTYPE;
         #pragma warning(disable: 1682)
         /* conversion from "X" to "T" may lose significant bits */
         #pragma warning(disable: 810)
-        /* non-pointer conversion from "foo" to "bar" may lose significant bits */
-        #pragma warning(disable: 2259)
 
         return x;
 
@@ -331,7 +374,8 @@ typedef short int WXTYPE;
     #if defined(__VISUALC__) && (__VISUALC__ >= 1100)
         /*  VC++ 6.0 and 5.0 have std::wstring (what about earlier versions?) */
         #define HAVE_STD_WSTRING
-    #elif defined(__MINGW32__) && wxCHECK_GCC_VERSION(3, 3)
+    #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \
+          && wxCHECK_GCC_VERSION(3, 3)
         /*  GCC 3.1 has std::wstring; 3.0 never was in MinGW, 2.95 hasn't it */
         #define HAVE_STD_WSTRING
     #endif
@@ -350,12 +394,6 @@ typedef short int WXTYPE;
     #endif
 #endif
 
-#ifndef HAVE_TR1_TYPE_TRAITS
-    #if defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
-        #define HAVE_TR1_TYPE_TRAITS
-    #endif
-#endif
-
 /* provide replacement for C99 va_copy() if the compiler doesn't have it */
 
 /* could be already defined by configure or the user */
@@ -399,62 +437,6 @@ typedef short int WXTYPE;
     #endif /* va_copy/!va_copy */
 #endif /* wxVaCopy */
 
-#ifndef HAVE_VARIADIC_MACROS
-    #if wxCHECK_WATCOM_VERSION(1,2)
-        #define HAVE_VARIADIC_MACROS
-    #endif
-
-    #if wxCHECK_VISUALC_VERSION(9)
-        #define HAVE_VARIADIC_MACROS
-    #endif
-#endif /* HAVE_VARIADIC_MACROS */
-
-
-#ifndef HAVE_WOSTREAM
-    /*
-        Mingw <= 3.4 and all versions of Cygwin don't have std::wostream
-     */
-    #if (defined(__MINGW32__) && !wxCHECK_GCC_VERSION(4, 0)) || \
-        defined(__CYGWIN__)
-        #define wxNO_WOSTREAM
-    #endif
-
-    /* VC++ doesn't have it in the old iostream library */
-    #if defined(__VISUALC__) && wxUSE_IOSTREAMH
-        #define wxNO_WOSTREAM
-    #endif
-
-    #ifndef wxNO_WOSTREAM
-        #define HAVE_WOSTREAM
-    #endif
-
-    #undef wxNO_WOSTREAM
-#endif /* HAVE_WOSTREAM */
-
-/*  ---------------------------------------------------------------------------- */
-/*  other C++ features */
-/*  ---------------------------------------------------------------------------- */
-
-#ifndef HAVE_PARTIAL_SPECIALIZATION
-    /* be optimistic by default */
-    #define HAVE_PARTIAL_SPECIALIZATION
-#endif
-
-#ifdef __VISUALC__
-    #if __VISUALC__ < 1310
-        #undef HAVE_PARTIAL_SPECIALIZATION
-    #endif
-#endif /* __VISUALC__ */
-
-
-#ifndef HAVE_TEMPLATE_OVERLOAD_RESOLUTION
-    /* assume the compiler can use type or const expressions as template
-       arguments if it supports partial specialization -- except if it's a
-       Borland one which can't */
-    #if defined(HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__)
-        #define HAVE_TEMPLATE_OVERLOAD_RESOLUTION
-    #endif /* (HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__) */
-#endif /* !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) */
 
 /*  ---------------------------------------------------------------------------- */
 /*  portable calling conventions macros */
@@ -512,135 +494,48 @@ typedef short int WXTYPE;
 /*  ---------------------------------------------------------------------------- */
 
 /*  Printf-like attribute definitions to obtain warnings with GNU C/C++ */
-#ifndef WX_ATTRIBUTE_PRINTF
+#ifndef ATTRIBUTE_PRINTF
 #   if defined(__GNUC__) && !wxUSE_UNICODE
-#       define WX_ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
+#       define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n)))
 #   else
-#       define WX_ATTRIBUTE_PRINTF(m, n)
+#       define ATTRIBUTE_PRINTF(m, n)
 #   endif
 
-#   define WX_ATTRIBUTE_PRINTF_1 WX_ATTRIBUTE_PRINTF(1, 2)
-#   define WX_ATTRIBUTE_PRINTF_2 WX_ATTRIBUTE_PRINTF(2, 3)
-#   define WX_ATTRIBUTE_PRINTF_3 WX_ATTRIBUTE_PRINTF(3, 4)
-#   define WX_ATTRIBUTE_PRINTF_4 WX_ATTRIBUTE_PRINTF(4, 5)
-#   define WX_ATTRIBUTE_PRINTF_5 WX_ATTRIBUTE_PRINTF(5, 6)
-#endif /* !defined(WX_ATTRIBUTE_PRINTF) */
-
-#ifndef WX_ATTRIBUTE_NORETURN
-#   if WX_HAS_CLANG_FEATURE(attribute_analyzer_noreturn)
-#       define WX_ATTRIBUTE_NORETURN __attribute__((analyzer_noreturn))
-#   elif defined( __GNUC__ )
-#       define WX_ATTRIBUTE_NORETURN __attribute__ ((noreturn))
-#   elif wxCHECK_VISUALC_VERSION(7)
-#       define WX_ATTRIBUTE_NORETURN __declspec(noreturn)
-#   else
-#       define WX_ATTRIBUTE_NORETURN
-#   endif
-#endif
+#   define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2)
+#   define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3)
+#   define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4)
+#   define ATTRIBUTE_PRINTF_4 ATTRIBUTE_PRINTF(4, 5)
+#   define ATTRIBUTE_PRINTF_5 ATTRIBUTE_PRINTF(5, 6)
+#endif /* !defined(ATTRIBUTE_PRINTF) */
 
 /*  Macro to issue warning when using deprecated functions with gcc3 or MSVC7: */
 #if wxCHECK_GCC_VERSION(3, 1)
-    #define wxDEPRECATED(x) __attribute__((deprecated)) x
+    #define wxDEPRECATED(x) x __attribute__ ((deprecated))
 #elif defined(__VISUALC__) && (__VISUALC__ >= 1300)
     #define wxDEPRECATED(x) __declspec(deprecated) x
 #else
     #define wxDEPRECATED(x) x
 #endif
 
-#if defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 4)
-    /*
-        We need to add dummy "inline" to allow gcc < 3.4 to handle the
-        deprecation attribute on the constructors.
-    */
-    #define  wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED( inline x)
-#else
-    #define  wxDEPRECATED_CONSTRUCTOR(x) wxDEPRECATED(x)
-#endif
-
-/*
-   Macro which marks the function as being deprecated but also defines it
-   inline.
-
-   Currently it's defined in the same trivial way in all cases but it could
-   need a special definition with some other compilers in the future which
-   explains why do we have it.
- */
-#define wxDEPRECATED_INLINE(func, body) wxDEPRECATED(func) { body }
-
-/*
-    A macro to define a simple deprecated accessor.
- */
-#define wxDEPRECATED_ACCESSOR(func, what) wxDEPRECATED_INLINE(func, return what;)
-
-/*
-   Special variant of the macro above which should be used for the functions
-   which are deprecated but called by wx itself: this often happens with
-   deprecated virtual functions which are called by the library.
- */
-#ifdef WXBUILDING
-#   define wxDEPRECATED_BUT_USED_INTERNALLY(x) x
-#else
-#   define wxDEPRECATED_BUT_USED_INTERNALLY(x) wxDEPRECATED(x)
-#endif
-
-/*
-    Combination of the two variants above: should be used for deprecated
-    functions which are defined inline and are used by wxWidgets itself.
- */
-#ifdef WXBUILDING
-#   define wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(func, body) func { body }
-#else
-#   define wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(func, body) \
-        wxDEPRECATED(func) { body }
-#endif
+/*  everybody gets the assert and other debug macros */
+#include "wx/debug.h"
 
 /*  NULL declaration: it must be defined as 0 for C++ programs (in particular, */
 /*  it must not be defined as "(void *)0" which is standard for C but completely */
 /*  breaks C++ code) */
-#if !defined(__HANDHELDPC__)
+#ifndef __HANDHELDPC__
 #include <stddef.h>
 #endif
 
-#ifdef __cplusplus
+/*  delete pointer if it is not NULL and NULL it afterwards */
+/*  (checking that it's !NULL before passing it to delete is just a */
+/*   a question of style, because delete will do it itself anyhow, but it might */
+/*   be considered as an error by some overzealous debugging implementations of */
+/*   the library, so we do it ourselves) */
+#define wxDELETE(p)      if ( (p) != NULL ) { delete p; p = NULL; }
 
-// everybody gets the assert and other debug macros
-#include "wx/debug.h"
-
-    // delete pointer if it is not NULL and NULL it afterwards
-    template <typename T>
-    inline void wxDELETE(T*& ptr)
-    {
-        typedef char TypeIsCompleteCheck[sizeof(T)];
-
-        if ( ptr != NULL )
-        {
-            delete ptr;
-            ptr = NULL;
-        }
-    }
-
-    // delete an array and NULL it (see comments above)
-    template <typename T>
-    inline void wxDELETEA(T*& ptr)
-    {
-        typedef char TypeIsCompleteCheck[sizeof(T)];
-
-        if ( ptr != NULL )
-        {
-            delete [] ptr;
-            ptr = NULL;
-        }
-    }
-
-    // trivial implementation of std::swap() for primitive types
-    template <typename T>
-    inline void wxSwap(T& first, T& second)
-    {
-        T tmp(first);
-        first = second;
-        second = tmp;
-    }
-#endif /*__cplusplus*/
+/*  delete an array and NULL it (see comments above) */
+#define wxDELETEA(p)     if ( (p) ) { delete [] (p); p = NULL; }
 
 /*  size of statically declared array */
 #define WXSIZEOF(array)   (sizeof(array)/sizeof(array[0]))
@@ -649,64 +544,6 @@ typedef short int WXTYPE;
 /*  integer on success as failure indicator */
 #define wxNOT_FOUND       (-1)
 
-/* the default value for some length parameters meaning that the string is */
-/* NUL-terminated */
-#define wxNO_LEN ((size_t)-1)
-
-/*  ---------------------------------------------------------------------------- */
-/*  macros dealing with comparison operators */
-/*  ---------------------------------------------------------------------------- */
-
-/*
-    Expands into m(op, args...) for each op in the set { ==, !=, <, <=, >, >= }.
- */
-#define wxFOR_ALL_COMPARISONS(m) \
-    m(==) m(!=) m(>=) m(<=) m(>) m(<)
-
-#define wxFOR_ALL_COMPARISONS_1(m, x) \
-    m(==,x) m(!=,x) m(>=,x) m(<=,x) m(>,x) m(<,x)
-
-#define wxFOR_ALL_COMPARISONS_2(m, x, y) \
-    m(==,x,y) m(!=,x,y) m(>=,x,y) m(<=,x,y) m(>,x,y) m(<,x,y)
-
-#define wxFOR_ALL_COMPARISONS_3(m, x, y, z) \
-    m(==,x,y,z) m(!=,x,y,z) m(>=,x,y,z) m(<=,x,y,z) m(>,x,y,z) m(<,x,y,z)
-
-/*
-    This is only used with wxDEFINE_COMPARISON_REV: it passes both the normal
-    and the reversed comparison operators to the macro.
- */
-#define wxFOR_ALL_COMPARISONS_3_REV(m, x, y, z) \
-    m(==,x,y,z,==) m(!=,x,y,z,!=) m(>=,x,y,z,<=) \
-    m(<=,x,y,z,>=) m(>,x,y,z,<) m(<,x,y,z,>)
-
-
-#define wxDEFINE_COMPARISON(op, T1, T2, cmp) \
-    inline bool operator op(T1 x, T2 y) { return cmp(x, y, op); }
-
-#define wxDEFINE_COMPARISON_REV(op, T1, T2, cmp, oprev) \
-    inline bool operator op(T2 y, T1 x) { return cmp(x, y, oprev); }
-
-/*
-    Define all 6 comparison operators (==, !=, <, <=, >, >=) for the given
-    types in the specified order. The implementation is provided by the cmp
-    macro. Normally wxDEFINE_ALL_COMPARISONS should be used as comparison
-    operators are usually symmetric.
- */
-#define wxDEFINE_COMPARISONS(T1, T2, cmp) \
-    wxFOR_ALL_COMPARISONS_3(wxDEFINE_COMPARISON, T1, T2, cmp)
-
-/*
-    This macro allows to define all 12 comparison operators (6 operators for
-    both orders of arguments) for the given types using the provided "cmp"
-    macro to implement the actual comparison: the macro is called with the 2
-    arguments names, the first of type T1 and the second of type T2, and the
-    comparison operator being implemented.
- */
-#define wxDEFINE_ALL_COMPARISONS(T1, T2, cmp) \
-    wxFOR_ALL_COMPARISONS_3(wxDEFINE_COMPARISON, T1, T2, cmp) \
-    wxFOR_ALL_COMPARISONS_3_REV(wxDEFINE_COMPARISON_REV, T1, T2, cmp)
-
 /*  ---------------------------------------------------------------------------- */
 /*  macros to avoid compiler warnings */
 /*  ---------------------------------------------------------------------------- */
@@ -718,6 +555,13 @@ typedef short int WXTYPE;
     #define WXUNUSED(identifier) identifier
 #endif
 
+/*  some arguments are only used in debug mode, but unused in release one */
+#ifdef __WXDEBUG__
+    #define WXUNUSED_UNLESS_DEBUG(param)  param
+#else
+    #define WXUNUSED_UNLESS_DEBUG(param)  WXUNUSED(param)
+#endif
+
 /*  some arguments are not used in unicode mode */
 #if wxUSE_UNICODE
     #define WXUNUSED_IN_UNICODE(param)  WXUNUSED(param)
@@ -764,6 +608,25 @@ typedef short int WXTYPE;
 /*  compiler specific settings */
 /*  ---------------------------------------------------------------------------- */
 
+/*  to allow compiling with warning level 4 under Microsoft Visual C++ some */
+/*  warnings just must be disabled */
+#ifdef  __VISUALC__
+  #pragma warning(disable: 4514) /*  unreferenced inline func has been removed */
+/*
+  you might be tempted to disable this one also: triggered by CHECK and FAIL
+  macros in debug.h, but it's, overall, a rather useful one, so I leave it and
+  will try to find some way to disable this warning just for CHECK/FAIL. Anyone?
+*/
+  #pragma warning(disable: 4127) /*  conditional expression is constant */
+#endif  /*  VC++ */
+
+#if defined(__MWERKS__)
+    #undef try
+    #undef except
+    #undef finally
+    #define except(x) catch(...)
+#endif /*  Metrowerks */
+
 #if wxONLY_WATCOM_EARLIER_THAN(1,4)
     typedef short mode_t;
 #endif
@@ -771,10 +634,13 @@ typedef short int WXTYPE;
 /*  where should i put this? we need to make sure of this as it breaks */
 /*  the <iostream> code. */
 #if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
+#  ifndef __MWERKS__
+/*  #undef __WXDEBUG__ */
 #    ifdef wxUSE_DEBUG_NEW_ALWAYS
 #    undef wxUSE_DEBUG_NEW_ALWAYS
 #    define wxUSE_DEBUG_NEW_ALWAYS 0
 #    endif
+#  endif
 #endif
 
 /*  ---------------------------------------------------------------------------- */
@@ -790,7 +656,7 @@ enum {  wxDefaultCoord = -1 };
 /*  define fixed length types */
 /*  ---------------------------------------------------------------------------- */
 
-#if defined(__MINGW32__)
+#if defined(__WXPALMOS__) || defined(__MINGW32__)
     #include <sys/types.h>
 #endif
 
@@ -798,6 +664,9 @@ enum {  wxDefaultCoord = -1 };
 /*  practice) */
 
 /*  8bit */
+#ifndef SIZEOF_CHAR
+    #define SIZEOF_CHAR 1
+#endif
 typedef signed char wxInt8;
 typedef unsigned char wxUint8;
 typedef wxUint8 wxByte;
@@ -829,7 +698,7 @@ typedef wxUint16 wxWord;
   |short      | 16    16    16    16    16 |
   |int        | 32    64    32    32    16 |
   |long       | 64    64    32    32    32 |
-  |long long  | 64    64    64    --    -- |
+  |long long  |             64             |
   |void *     | 64    64    64    32    32 |
   +-----------+----------------------------+
 
@@ -840,31 +709,32 @@ typedef wxUint16 wxWord;
  */
 
 /*  32bit */
-#if defined(__WINDOWS__)
+#ifdef __PALMOS__
+    typedef int wxInt32;
+    typedef unsigned int wxUint32;
+    #define SIZEOF_INT 4
+    #define SIZEOF_LONG 4
+    #define SIZEOF_WCHAR_T 2
+    #define SIZEOF_SIZE_T 4
+    #define wxSIZE_T_IS_UINT
+    #define SIZEOF_VOID_P 4
+    #define SIZEOF_SIZE_T 4
+#elif defined(__WINDOWS__)
+    /*  Win64 uses LLP64 model and so ints and longs have the same size as in */
+    /*  Win32 */
     #if defined(__WIN32__)
         typedef int wxInt32;
         typedef unsigned int wxUint32;
 
-        /*
-            Win64 uses LLP64 model and so ints and longs have the same size as
-            in Win32.
-         */
+        /* Assume that if SIZEOF_INT is defined that all the other ones except
+           SIZEOF_SIZE_T, are too.  See next #if below.  */
         #ifndef SIZEOF_INT
             #define SIZEOF_INT 4
-        #endif
-
-        #ifndef SIZEOF_LONG
             #define SIZEOF_LONG 4
-        #endif
-
-        #ifndef SIZEOF_WCHAR_T
-            /* Windows uses UTF-16 */
             #define SIZEOF_WCHAR_T 2
-        #endif
 
-        #ifndef SIZEOF_SIZE_T
             /*
-               Under Win64 sizeof(size_t) == 8 and so it is neither unsigned
+               under Win64 sizeof(size_t) == 8 and so it is neither unsigned
                int nor unsigned long!
              */
             #ifdef __WIN64__
@@ -877,14 +747,25 @@ typedef wxUint16 wxWord;
                 #define wxSIZE_T_IS_UINT
             #endif
             #undef wxSIZE_T_IS_ULONG
-        #endif
 
-        #ifndef SIZEOF_VOID_P
             #ifdef __WIN64__
                 #define SIZEOF_VOID_P 8
             #else /*  Win32 */
                 #define SIZEOF_VOID_P 4
             #endif /*  Win64/32 */
+        #endif /*  !defined(SIZEOF_INT) */
+
+        /*
+          If Python.h was included first, it defines all of the SIZEOF's above
+          except for SIZEOF_SIZE_T, so we need to do it here to avoid
+          triggering the #error in the ssize_t typedefs below...
+        */
+        #ifndef SIZEOF_SIZE_T
+            #ifdef __WIN64__
+                #define SIZEOF_SIZE_T 8
+            #else /* Win32 */
+                #define SIZEOF_SIZE_T 4
+            #endif
         #endif
     #else
         #error "Unsupported Windows version"
@@ -927,7 +808,7 @@ typedef wxUint16 wxWord;
         #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T)
             #define SIZEOF_WCHAR_T 4
         #endif
-        #if !defined(SIZEOF_WCHAR_T)
+        #if wxUSE_WCHAR_T && !defined(SIZEOF_WCHAR_T)
             /*  also assume that sizeof(wchar_t) == 2 (under Unix the most */
             /*  common case is 4 but there configure would have defined */
             /*  SIZEOF_WCHAR_T for us) */
@@ -936,213 +817,23 @@ typedef wxUint16 wxWord;
                                     Wchar_tMustBeExactly2Bytes);
 
             #define SIZEOF_WCHAR_T 2
-        #endif /*  !defined(SIZEOF_WCHAR_T) */
+        #endif /*  wxUSE_WCHAR_T */
     #endif
 #endif /*  Win/!Win */
 
-#ifndef SIZEOF_WCHAR_T
-    #error "SIZEOF_WCHAR_T must be defined, but isn't"
-#endif
-
-/* also define C99-like sized MIN/MAX constants */
-#define wxINT8_MIN CHAR_MIN
-#define wxINT8_MAX CHAR_MAX
-#define wxUINT8_MAX UCHAR_MAX
-
-#define wxINT16_MIN SHRT_MIN
-#define wxINT16_MAX SHRT_MAX
-#define wxUINT16_MAX USHRT_MAX
-
-#if SIZEOF_INT == 4
-    #define wxINT32_MIN INT_MIN
-    #define wxINT32_MAX INT_MAX
-    #define wxUINT32_MAX UINT_MAX
-#elif SIZEOF_LONG == 4
-    #define wxINT32_MIN LONG_MIN
-    #define wxINT32_MAX LONG_MAX
-    #define wxUINT32_MAX ULONG_MAX
-#else
-    #error "Unknown 32 bit type"
-#endif
-
 typedef wxUint32 wxDword;
 
-#ifdef LLONG_MAX
-    #define wxINT64_MIN LLONG_MIN
-    #define wxINT64_MAX LLONG_MAX
-    #define wxUINT64_MAX ULLONG_MAX
-#else
-    #define wxINT64_MIN (wxLL(-9223372036854775807)-1)
-    #define wxINT64_MAX wxLL(9223372036854775807)
-    #define wxUINT64_MAX wxULL(0xFFFFFFFFFFFFFFFF)
-#endif
-
-/*  64 bit */
-
-/*  NB: we #define and not typedef wxLongLong_t because we use "#ifdef */
-/*      wxLongLong_t" in wx/longlong.h */
-
-/*      wxULongLong_t is set later (usually to unsigned wxLongLong_t) */
-
-/*  to avoid compilation problems on 64bit machines with ambiguous method calls */
-/*  we will need to define this */
-#undef wxLongLongIsLong
-
 /*
-   First check for specific compilers which have known 64 bit integer types,
-   this avoids clashes with SIZEOF_LONG[_LONG] being defined incorrectly for
-   e.g. MSVC builds (Python.h defines it as 8 even for MSVC).
-
-   Also notice that we check for "long long" before checking for 64 bit long as
-   we still want to use "long long" and not "long" for wxLongLong_t on 64 bit
-   architectures to be able to pass wxLongLong_t to the standard functions
-   prototyped as taking "long long" such as strtoll().
+   Define an integral type big enough to contain all of long, size_t and void *.
  */
-#if (defined(__VISUALC__) && defined(__WIN32__))
-    #define wxLongLong_t __int64
-    #define wxLongLongSuffix i64
-    #define wxLongLongFmtSpec "I64"
-#elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
-    #define wxLongLong_t __int64
-    #define wxLongLongSuffix i64
-    #define wxLongLongFmtSpec "L"
-#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__)))
-      #define wxLongLong_t __int64
-      #define wxLongLongSuffix i64
-      #define wxLongLongFmtSpec "L"
-#elif defined(__DIGITALMARS__)
-      #define wxLongLong_t __int64
-      #define wxLongLongSuffix LL
-      #define wxLongLongFmtSpec "ll"
-#elif defined(__MINGW32__)
-    #define wxLongLong_t long long
-    #define wxLongLongSuffix ll
-    #define wxLongLongFmtSpec "I64"
-#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
-    #define wxLongLong_t long long
-#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
-        defined(__GNUC__) || \
-        defined(__CYGWIN__) || \
-        defined(__WXMICROWIN__) || \
-        (defined(__DJGPP__) && __DJGPP__ >= 2)
-    #define wxLongLong_t long long
-    #define wxLongLongSuffix ll
-    #define wxLongLongFmtSpec "ll"
-#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
-    #define wxLongLong_t long
-    #define wxLongLongSuffix l
-    #define wxLongLongFmtSpec "l"
-    #define wxLongLongIsLong
-#endif
-
-
-#ifdef wxLongLong_t
-    #define wxULongLong_t unsigned wxLongLong_t
-
-    /*
-        wxLL() and wxULL() macros allow to define 64 bit constants in a
-        portable way.
-     */
-    #ifndef wxCOMPILER_BROKEN_CONCAT_OPER
-        #define wxLL(x) wxCONCAT(x, wxLongLongSuffix)
-        #define wxULL(x) wxCONCAT(x, wxCONCAT(u, wxLongLongSuffix))
-    #else
-        /*
-            Currently only Borland compiler has broken concatenation operator
-            and this compiler is known to use [u]i64 suffix.
-         */
-        #define wxLL(x) wxAPPEND_i64(x)
-        #define wxULL(x) wxAPPEND_ui64(x)
-    #endif
-
-    typedef wxLongLong_t wxInt64;
-    typedef wxULongLong_t wxUint64;
-
-    #define wxHAS_INT64 1
-
-    #ifndef wxLongLongIsLong
-        #define wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-    #endif
-#elif wxUSE_LONGLONG
-    /*  these macros allow to define 64 bit constants in a portable way */
-    #define wxLL(x) wxLongLong(x)
-    #define wxULL(x) wxULongLong(x)
-
-    #define wxInt64 wxLongLong
-    #define wxUint64 wxULongLong
-
-    #define wxHAS_INT64 1
-
-#else /* !wxUSE_LONGLONG */
-
-    #define wxHAS_INT64 0
-
-#endif
-
-
-/* Make sure ssize_t is defined (a signed type the same size as size_t). */
-/* (HAVE_SSIZE_T is not already defined by configure) */
-#ifndef HAVE_SSIZE_T
-#ifdef __MINGW32__
-    #if defined(_SSIZE_T_) || defined(_SSIZE_T_DEFINED)
-        #define HAVE_SSIZE_T
-    #endif
-#elif wxCHECK_WATCOM_VERSION(1,4)
-    #define HAVE_SSIZE_T
-#endif
-#endif /* !HAVE_SSIZE_T */
-
-/* If we really don't have ssize_t, provide our own version. */
-#ifdef HAVE_SSIZE_T
-    #ifdef __UNIX__
-        #include <sys/types.h>
-    #endif
-#else /* !HAVE_SSIZE_T */
-    #if SIZEOF_SIZE_T == 4
-        typedef wxInt32 ssize_t;
-    #elif SIZEOF_SIZE_T == 8
-        typedef wxInt64 ssize_t;
-    #else
-        #error "error defining ssize_t, size_t is not 4 or 8 bytes"
-    #endif
-
-    /* prevent ssize_t redefinitions in other libraries */
-    #define HAVE_SSIZE_T
-#endif
-
-/*
-    We can't rely on Windows _W64 being defined as windows.h may not be
-    included so define our own equivalent: this should be used with types
-    like WXLPARAM or WXWPARAM which are 64 bit under Win64 to avoid warnings
-    each time we cast it to a pointer or a handle (which results in hundreds
-    of warnings as Win32 API often passes pointers in them)
- */
-#if wxCHECK_VISUALC_VERSION(7)
-    #define wxW64 __w64
-#else
-    #define wxW64
-#endif
-
-/*
-   Define signed and unsigned integral types big enough to contain all of long,
-   size_t and void *.
- */
-#if SIZEOF_LONG >= SIZEOF_VOID_P
-    /*
-       Normal case when long is the largest integral type.
-     */
-    typedef long wxIntPtr;
+#if SIZEOF_LONG >= SIZEOF_VOID_P && SIZEOF_LONG >= SIZEOF_SIZE_T
+    /* normal case */
     typedef unsigned long wxUIntPtr;
+    typedef long wxIntPtr;
 #elif SIZEOF_SIZE_T >= SIZEOF_VOID_P
-    /*
-       Win64 case: size_t is the only integral type big enough for "void *".
-
-       Notice that we must use __w64 to avoid warnings about casting pointers
-       to wxIntPtr (which we do often as this is what it is defined for) in 32
-       bit build with MSVC.
-     */
-    typedef wxW64 ssize_t wxIntPtr;
+    /* Win64 case */
     typedef size_t wxUIntPtr;
+    #define wxIntPtr ssize_t
 #else
     /*
        This should never happen for the current architectures but if you're
@@ -1202,16 +893,152 @@ inline void *wxUIntToPtr(wxUIntPtr p)
 #endif /*__cplusplus*/
 
 
+/*  64 bit */
+
+/*  NB: we #define and not typedef wxLongLong_t because we use "#ifdef */
+/*      wxLongLong_t" in wx/longlong.h */
+
+/*      wxULongLong_t is set later (usually to unsigned wxLongLong_t) */
+
+/*  to avoid compilation problems on 64bit machines with ambiguous method calls */
+/*  we will need to define this */
+#undef wxLongLongIsLong
+
+/*
+   First check for specific compilers which have known 64 bit integer types,
+   this avoids clashes with SIZEOF_LONG[_LONG] being defined incorrectly for
+   e.g. MSVC builds (Python.h defines it as 8 even for MSVC).
+
+   Also notice that we check for "long long" before checking for 64 bit long as
+   we still want to use "long long" and not "long" for wxLongLong_t on 64 bit
+   architectures to be able to pass wxLongLong_t to the standard functions
+   prototyped as taking "long long" such as strtoll().
+ */
+#if (defined(__VISUALC__) && defined(__WIN32__))
+    #define wxLongLong_t __int64
+    #define wxLongLongSuffix i64
+    #define wxLongLongFmtSpec wxT("I64")
+#elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
+    #define wxLongLong_t __int64
+    #define wxLongLongSuffix i64
+    #define wxLongLongFmtSpec wxT("L")
+#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__)))
+      #define wxLongLong_t __int64
+      #define wxLongLongSuffix i64
+      #define wxLongLongFmtSpec wxT("L")
+#elif defined(__DIGITALMARS__)
+      #define wxLongLong_t __int64
+      #define wxLongLongSuffix LL
+      #define wxLongLongFmtSpec wxT("ll")
+#elif defined(__MINGW32__)
+    #define wxLongLong_t long long
+    #define wxLongLongSuffix ll
+    #define wxLongLongFmtSpec wxT("I64")
+#elif defined(__MWERKS__)
+    #if __option(longlong)
+        #define wxLongLong_t long long
+        #define wxLongLongSuffix ll
+        #define wxLongLongFmtSpec wxT("ll")
+    #else
+        #error "The 64 bit integer support in CodeWarrior has been disabled."
+        #error "See the documentation on the 'longlong' pragma."
+    #endif
+#elif defined(__WXPALMOS__)
+    #define wxLongLong_t int64_t
+    #define wxLongLongSuffix ll
+    #define wxLongLongFmtSpec wxT("ll")
+#elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
+    #define wxLongLong_t long long
+#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
+        defined(__GNUC__) || \
+        defined(__CYGWIN__) || \
+        defined(__WXMICROWIN__) || \
+        (defined(__DJGPP__) && __DJGPP__ >= 2)
+    #define wxLongLong_t long long
+    #define wxLongLongSuffix ll
+    #define wxLongLongFmtSpec wxT("ll")
+#elif defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
+    #define wxLongLong_t long
+    #define wxLongLongSuffix l
+    #define wxLongLongFmtSpec wxT("l")
+    #define wxLongLongIsLong
+#endif
+
+
+#ifdef wxLongLong_t
+
+    #ifdef __WXPALMOS__
+        #define wxULongLong_t uint64_t
+    #else
+        #define wxULongLong_t unsigned wxLongLong_t
+    #endif
+
+    /*  these macros allow to define 64 bit constants in a portable way */
+    #define wxLL(x) wxCONCAT(x, wxLongLongSuffix)
+    #define wxULL(x) wxCONCAT(x, wxCONCAT(u, wxLongLongSuffix))
+
+    typedef wxLongLong_t wxInt64;
+    typedef wxULongLong_t wxUint64;
+
+    #define wxHAS_INT64 1
+
+#elif wxUSE_LONGLONG
+    /*  these macros allow to define 64 bit constants in a portable way */
+    #define wxLL(x) wxLongLong(x)
+    #define wxULL(x) wxULongLong(x)
+
+    #define wxInt64 wxLongLong
+    #define wxUint64 wxULongLong
+
+    #define wxHAS_INT64 1
+
+#else /* !wxUSE_LONGLONG */
+
+    #define wxHAS_INT64 0
+
+#endif
+
+
+/* Make sure ssize_t is defined (a signed type the same size as size_t) */
+/* HAVE_SSIZE_T should be defined for compiliers that already have it */
+#ifdef __MINGW32__
+    #if defined(_SSIZE_T_) && !defined(HAVE_SSIZE_T)
+        #define HAVE_SSIZE_T
+    #endif
+#endif
+#if defined(__PALMOS__) && !defined(HAVE_SSIZE_T)
+    #define HAVE_SSIZE_T
+#endif
+#if wxCHECK_WATCOM_VERSION(1,4)
+    #define HAVE_SSIZE_T
+#endif
+#ifndef HAVE_SSIZE_T
+    #if SIZEOF_SIZE_T == 4
+        typedef wxInt32 ssize_t;
+    #elif SIZEOF_SIZE_T == 8
+        typedef wxInt64 ssize_t;
+    #else
+        #error "error defining ssize_t, size_t is not 4 or 8 bytes"
+    #endif
+
+    /* prevent ssize_t redefinitions in other libraries */
+    #define HAVE_SSIZE_T
+#endif
+
 
 /*  base floating point types */
-/*  wxFloat32: 32 bit IEEE float ( 1 sign, 8 exponent bits, 23 fraction bits ) */
-/*  wxFloat64: 64 bit IEEE float ( 1 sign, 11 exponent bits, 52 fraction bits ) */
+/*  wxFloat32: 32 bit IEEE float ( 1 sign, 8 exponent bits, 23 fraction bits */
+/*  wxFloat64: 64 bit IEEE float ( 1 sign, 11 exponent bits, 52 fraction bits */
 /*  wxDouble: native fastest representation that has at least wxFloat64 */
 /*            precision, so use the IEEE types for storage, and this for */
 /*            calculations */
 
 typedef float wxFloat32;
-typedef double wxFloat64;
+#if (defined( __WXMAC__ ) || defined(__WXCOCOA__))  && defined (__MWERKS__)
+    typedef short double wxFloat64;
+#else
+    typedef double wxFloat64;
+#endif
 
 typedef double wxDouble;
 
@@ -1220,56 +1047,18 @@ typedef double wxDouble;
     of treating it as a real fundamental type, set wxWCHAR_T_IS_REAL_TYPE to 0
     for them and to 1 for all the others.
  */
-#ifndef wxWCHAR_T_IS_REAL_TYPE
+#if wxUSE_WCHAR_T
     /*
-        VC++ typedefs wchar_t as unsigned short by default until VC8, that is
-        unless /Za or /Zc:wchar_t option is used in which case _WCHAR_T_DEFINED
-        is defined.
+        VC++ typedefs wchar_t as unsigned short by default, that is unless
+        /Za or /Zc:wchar_t option is used in which case _WCHAR_T_DEFINED is
+        defined.
      */
 #   if defined(__VISUALC__) && !defined(_NATIVE_WCHAR_T_DEFINED)
 #       define wxWCHAR_T_IS_REAL_TYPE 0
 #   else /* compiler having standard-conforming wchar_t */
 #       define wxWCHAR_T_IS_REAL_TYPE 1
 #   endif
-#endif /* !defined(wxWCHAR_T_IS_REAL_TYPE) */
-
-/* Helper macro for doing something dependent on whether wchar_t is or isn't a
-   typedef inside another macro. */
-#if wxWCHAR_T_IS_REAL_TYPE
-    #define wxIF_WCHAR_T_TYPE(x) x
-#else /* !wxWCHAR_T_IS_REAL_TYPE */
-    #define wxIF_WCHAR_T_TYPE(x)
-#endif /* wxWCHAR_T_IS_REAL_TYPE/!wxWCHAR_T_IS_REAL_TYPE */
-
-/*
-   This constant should be used instead of NULL in vararg functions taking
-   wxChar* arguments: passing NULL (which is the same as 0, unless the compiler
-   defines it specially, e.g. like gcc does with its __null built-in) doesn't
-   work in this case as va_arg() wouldn't interpret the integer 0 correctly
-   when trying to convert it to a pointer on architectures where sizeof(int) is
-   strictly less than sizeof(void *).
-
-   Examples of places where this must be used include wxFileTypeInfo ctor.
- */
-#define wxNullPtr ((void *)NULL)
-
-
-/* Define wxChar16 and wxChar32                                              */
-
-#if SIZEOF_WCHAR_T == 2
-    #define wxWCHAR_T_IS_WXCHAR16
-    typedef wchar_t wxChar16;
-#else
-    typedef wxUint16 wxChar16;
-#endif
-
-#if SIZEOF_WCHAR_T == 4
-    #define wxWCHAR_T_IS_WXCHAR32
-    typedef wchar_t wxChar32;
-#else
-    typedef wxUint32 wxChar32;
-#endif
-
+#endif /* wxUSE_WCHAR_T */
 
 /*  ---------------------------------------------------------------------------- */
 /*  byte ordering related definition and macros */
@@ -1289,6 +1078,36 @@ typedef double wxDouble;
 
 /*  byte swapping */
 
+#if defined (__MWERKS__) && ( (__MWERKS__ < 0x0900) || macintosh )
+/*  assembler versions for these */
+#ifdef __POWERPC__
+    inline wxUint16 wxUINT16_SWAP_ALWAYS( wxUint16 i )
+        {return (__lhbrx( &i , 0 ) );}
+    inline wxInt16 wxINT16_SWAP_ALWAYS( wxInt16 i )
+        {return (__lhbrx( &i , 0 ) );}
+    inline wxUint32 wxUINT32_SWAP_ALWAYS( wxUint32 i )
+        {return (__lwbrx( &i , 0 ) );}
+    inline wxInt32 wxINT32_SWAP_ALWAYS( wxInt32 i )
+        {return (__lwbrx( &i , 0 ) );}
+#else
+    #pragma parameter __D0 wxUINT16_SWAP_ALWAYS(__D0)
+    pascal wxUint16 wxUINT16_SWAP_ALWAYS(wxUint16 value)
+        = { 0xE158 };
+
+    #pragma parameter __D0 wxINT16_SWAP_ALWAYS(__D0)
+    pascal wxInt16 wxINT16_SWAP_ALWAYS(wxInt16 value)
+        = { 0xE158 };
+
+    #pragma parameter __D0 wxUINT32_SWAP_ALWAYS (__D0)
+    pascal wxUint32 wxUINT32_SWAP_ALWAYS(wxUint32 value)
+        = { 0xE158, 0x4840, 0xE158 };
+
+    #pragma parameter __D0 wxINT32_SWAP_ALWAYS (__D0)
+    pascal wxInt32 wxINT32_SWAP_ALWAYS(wxInt32 value)
+        = { 0xE158, 0x4840, 0xE158 };
+
+#endif
+#else /*  !MWERKS */
 #define wxUINT16_SWAP_ALWAYS(val) \
    ((wxUint16) ( \
     (((wxUint16) (val) & (wxUint16) 0x00ffU) << 8) | \
@@ -1312,6 +1131,7 @@ typedef double wxDouble;
     (((wxUint32) (val) & (wxUint32) 0x0000ff00U) <<  8) | \
     (((wxUint32) (val) & (wxUint32) 0x00ff0000U) >>  8) | \
     (((wxUint32) (val) & (wxUint32) 0xff000000U) >> 24)))
+#endif
 /*  machine specific byte swapping */
 
 #ifdef wxLongLong_t
@@ -1372,8 +1192,6 @@ typedef double wxDouble;
     #if wxHAS_INT64
         #define wxUINT64_SWAP_ON_BE(val)  wxUINT64_SWAP_ALWAYS(val)
         #define wxUINT64_SWAP_ON_LE(val)  (val)
-        #define wxINT64_SWAP_ON_BE(val)  wxINT64_SWAP_ALWAYS(val)
-        #define wxINT64_SWAP_ON_LE(val)  (val)
     #endif
 #else
     #define wxUINT16_SWAP_ON_LE(val)  wxUINT16_SWAP_ALWAYS(val)
@@ -1387,50 +1205,9 @@ typedef double wxDouble;
     #if wxHAS_INT64
         #define wxUINT64_SWAP_ON_LE(val)  wxUINT64_SWAP_ALWAYS(val)
         #define wxUINT64_SWAP_ON_BE(val)  (val)
-        #define wxINT64_SWAP_ON_LE(val)  wxINT64_SWAP_ALWAYS(val)
-        #define wxINT64_SWAP_ON_BE(val)  (val)
     #endif
 #endif
 
-/*  ---------------------------------------------------------------------------- */
-/*  template workarounds for buggy compilers */
-/*  ---------------------------------------------------------------------------- */
-
-#if defined(__GNUC__) && !wxCHECK_GCC_VERSION( 3, 4 )
-    /* GCC <= 3.4 has buggy template support */
-#  define wxUSE_MEMBER_TEMPLATES 0
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-    /* MSVC <= 6.0 has buggy template support */
-#  define wxUSE_MEMBER_TEMPLATES 0
-#  define wxUSE_FUNC_TEMPLATE_POINTER 0
-#endif
-
-#ifndef wxUSE_MEMBER_TEMPLATES
-#  define wxUSE_MEMBER_TEMPLATES 1
-#endif
-
-#ifndef wxUSE_FUNC_TEMPLATE_POINTER
-#  define wxUSE_FUNC_TEMPLATE_POINTER 1
-#endif
-
-#if wxUSE_MEMBER_TEMPLATES
-#  define wxTEMPLATED_MEMBER_CALL( method, type ) method<type>()
-#  define wxTEMPLATED_MEMBER_FIX( type )
-#else
-#  define wxTEMPLATED_MEMBER_CALL( method, type ) method((type*)NULL)
-#  define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-#  define wxTEMPLATED_FUNCTION_FIX( type ), wxTEMPLATED_MEMBER_FIX(type)
-#  define wxINFUNC_CLASS_TYPE_FIX( type ) typedef type type;
-#else
-#  define wxTEMPLATED_FUNCTION_FIX( type )
-#  define wxINFUNC_CLASS_TYPE_FIX( type )
-#endif
-
 /*  ---------------------------------------------------------------------------- */
 /*  Geometric flags */
 /*  ---------------------------------------------------------------------------- */
@@ -1453,10 +1230,7 @@ enum wxOrientation
     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,
 
-    wxBOTH                    = wxVERTICAL | wxHORIZONTAL,
-
-    /*  a mask to extract orientation from the combination of flags */
-    wxORIENTATION_MASK        = wxBOTH
+    wxBOTH                    = wxVERTICAL | wxHORIZONTAL
 };
 
 enum wxDirection
@@ -1474,21 +1248,11 @@ enum wxDirection
     wxWEST                    = wxLEFT,
     wxEAST                    = wxRIGHT,
 
-    wxALL                     = (wxUP | wxDOWN | wxRIGHT | wxLEFT),
-
-    /*  a mask to extract direction from the combination of flags */
-    wxDIRECTION_MASK           = wxALL
+    wxALL                     = (wxUP | wxDOWN | wxRIGHT | wxLEFT)
 };
 
 enum wxAlignment
 {
-    /*
-        0 is a valid wxAlignment value (both wxALIGN_LEFT and wxALIGN_TOP
-        use it) so define a symbolic name for an invalid alignment value
-        which can be assumed to be different from anything else
-     */
-    wxALIGN_INVALID           = -1,
-
     wxALIGN_NOT               = 0x0000,
     wxALIGN_CENTER_HORIZONTAL = 0x0100,
     wxALIGN_CENTRE_HORIZONTAL = wxALIGN_CENTER_HORIZONTAL,
@@ -1506,25 +1270,6 @@ enum wxAlignment
     wxALIGN_MASK              = 0x0f00
 };
 
-/* misc. flags for wxSizer items */
-enum wxSizerFlagBits
-{
-    /*
-        wxADJUST_MINSIZE doesn't do anything any more but we still define
-        it for compatibility. Notice that it may be also predefined (as 0,
-        hopefully) in the user code in order to use it even in
-        !WXWIN_COMPATIBILITY_2_8 builds so don't redefine it in such case.
-     */
-#if WXWIN_COMPATIBILITY_2_8 && !defined(wxADJUST_MINSIZE)
-    wxADJUST_MINSIZE               = 0,
-#endif
-    wxFIXED_MINSIZE                = 0x8000,
-    wxRESERVE_SPACE_EVEN_IF_HIDDEN = 0x0002,
-
-    /*  a mask to extract wxSizerFlagBits from combination of flags */
-    wxSIZER_FLAG_BITS_MASK         = 0x8002
-};
-
 enum wxStretch
 {
     wxSTRETCH_NOT             = 0x0000,
@@ -1532,10 +1277,18 @@ enum wxStretch
     wxGROW                    = 0x2000,
     wxEXPAND                  = wxGROW,
     wxSHAPED                  = 0x4000,
-    wxTILE                    = wxSHAPED | wxFIXED_MINSIZE,
+    wxFIXED_MINSIZE           = 0x8000,
+#if wxABI_VERSION >= 20808
+    wxRESERVE_SPACE_EVEN_IF_HIDDEN = 0x0002,
+#endif
+    wxTILE                    = 0xc000,
 
-    /*  a mask to extract stretch from the combination of flags */
-    wxSTRETCH_MASK            = 0x7000 /* sans wxTILE */
+    /* for compatibility only, default now, don't use explicitly any more */
+#if WXWIN_COMPATIBILITY_2_4
+    wxADJUST_MINSIZE          = 0x00100000
+#else
+    wxADJUST_MINSIZE          = 0
+#endif
 };
 
 /*  border flags: the values are chosen for backwards compatibility */
@@ -1551,7 +1304,7 @@ enum wxBorder
     wxBORDER_RAISED = 0x04000000,
     wxBORDER_SUNKEN = 0x08000000,
     wxBORDER_DOUBLE = 0x10000000, /* deprecated */
-    wxBORDER_THEME  = wxBORDER_DOUBLE,
+    wxBORDER_THEME =  0x10000000,
 
     /*  a mask to extract border style from the combination of flags */
     wxBORDER_MASK   = 0x1f200000
@@ -1573,40 +1326,12 @@ enum wxBorder
  * Some styles are used across more than one group,
  * so the values mustn't clash with others in the group.
  * Otherwise, numbers can be reused across groups.
- */
-
-/*
-    Summary of the bits used by various styles.
-
-    High word, containing styles which can be used with many windows:
-
-    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
-    |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|
-    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
-      |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
-      |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  \_ wxFULL_REPAINT_ON_RESIZE
-      |  |  |  |  |  |  |  |  |  |  |  |  |  |  \____ wxPOPUP_WINDOW
-      |  |  |  |  |  |  |  |  |  |  |  |  |  \_______ wxWANTS_CHARS
-      |  |  |  |  |  |  |  |  |  |  |  |  \__________ wxTAB_TRAVERSAL
-      |  |  |  |  |  |  |  |  |  |  |  \_____________ wxTRANSPARENT_WINDOW
-      |  |  |  |  |  |  |  |  |  |  \________________ wxBORDER_NONE
-      |  |  |  |  |  |  |  |  |  \___________________ wxCLIP_CHILDREN
-      |  |  |  |  |  |  |  |  \______________________ wxALWAYS_SHOW_SB
-      |  |  |  |  |  |  |  \_________________________ wxBORDER_STATIC
-      |  |  |  |  |  |  \____________________________ wxBORDER_SIMPLE
-      |  |  |  |  |  \_______________________________ wxBORDER_RAISED
-      |  |  |  |  \__________________________________ wxBORDER_SUNKEN
-      |  |  |  \_____________________________________ wxBORDER_{DOUBLE,THEME}
-      |  |  \________________________________________ wxCAPTION/wxCLIP_SIBLINGS
-      |  \___________________________________________ wxHSCROLL
-      \______________________________________________ wxVSCROLL
-
-
-    Low word style bits is class-specific meaning that the same bit can have
-    different meanings for different controls (e.g. 0x10 is wxCB_READONLY
-    meaning that the control can't be modified for wxComboBox but wxLB_SORT
-    meaning that the control should be kept sorted for wxListBox, while
-    wxLB_SORT has a different value -- and this is just fine).
+ *
+ * From version 1.66:
+ * Window (cross-group) styles now take up the first half
+ * of the flag, and control-specific styles the
+ * second half.
+ *
  */
 
 /*
@@ -1765,10 +1490,9 @@ enum wxBorder
 #define wxLB_MULTIPLE       0x0040
 #define wxLB_EXTENDED       0x0080
 /*  wxLB_OWNERDRAW is Windows-only */
-#define wxLB_NEEDED_SB      0x0000
 #define wxLB_OWNERDRAW      0x0100
-#define wxLB_ALWAYS_SB      0x0200
-#define wxLB_NO_SB          0x0400
+#define wxLB_NEEDED_SB      0x0200
+#define wxLB_ALWAYS_SB      0x0400
 #define wxLB_HSCROLL        wxHSCROLL
 /*  always show an entire number of rows */
 #define wxLB_INT_HEIGHT     0x0800
@@ -1802,12 +1526,14 @@ enum wxBorder
 /*  Old names for compatibility */
 #define wxRA_HORIZONTAL     wxHORIZONTAL
 #define wxRA_VERTICAL       wxVERTICAL
+#define wxRA_USE_CHECKBOX   0x0010 /* alternative native subcontrols (wxPalmOS) */
 
 /*
  * wxRadioButton style flag
  */
 #define wxRB_GROUP          0x0004
 #define wxRB_SINGLE         0x0008
+#define wxRB_USE_CHECKBOX   0x0010 /* alternative native control (wxPalmOS) */
 
 /*
  * wxScrollBar flags
@@ -1817,15 +1543,14 @@ enum wxBorder
 
 /*
  * wxSpinButton flags.
- * Note that a wxSpinCtrl is sometimes defined as a wxTextCtrl, and so the
- * flags shouldn't overlap with wxTextCtrl flags that can be used for a single
- * line controls (currently we reuse wxTE_CHARWRAP and wxTE_RICH2 neither of
- * which makes sense for them).
+ * Note that a wxSpinCtrl is sometimes defined as
+ * a wxTextCtrl, and so the flags must be different
+ * from wxTextCtrl's.
  */
 #define wxSP_HORIZONTAL       wxHORIZONTAL /*  4 */
 #define wxSP_VERTICAL         wxVERTICAL   /*  8 */
-#define wxSP_ARROW_KEYS       0x4000
-#define wxSP_WRAP             0x8000
+#define wxSP_ARROW_KEYS       0x1000
+#define wxSP_WRAP             0x2000
 
 /*
  * wxTabCtrl flags
@@ -1839,6 +1564,18 @@ enum wxBorder
 #define wxTC_MULTILINE        0x0200    /* == wxNB_MULTILINE */
 #define wxTC_OWNERDRAW        0x0400
 
+/*
+ * wxStatusBar95 flags
+ */
+#define wxST_SIZEGRIP         0x0010
+
+/*
+ * wxStaticText flags
+ */
+#define wxST_NO_AUTORESIZE    0x0001
+#define wxST_DOTS_MIDDLE      0x0002
+#define wxST_DOTS_END         0x0004
+
 /*
  * wxStaticBitmap flags
  */
@@ -1864,13 +1601,9 @@ enum wxBorder
 #define wxNO                    0x00000008
 #define wxYES_NO                (wxYES | wxNO)
 #define wxCANCEL                0x00000010
-#define wxAPPLY                 0x00000020
-#define wxCLOSE                 0x00000040
 
-#define wxOK_DEFAULT            0x00000000  /* has no effect (default) */
-#define wxYES_DEFAULT           0x00000000  /* has no effect (default) */
-#define wxNO_DEFAULT            0x00000080  /* only valid with wxYES_NO */
-#define wxCANCEL_DEFAULT        0x80000000  /* only valid with wxCANCEL */
+#define wxYES_DEFAULT           0x00000000  /*  has no effect (default) */
+#define wxNO_DEFAULT            0x00000080
 
 #define wxICON_EXCLAMATION      0x00000100
 #define wxICON_HAND             0x00000200
@@ -1880,65 +1613,24 @@ enum wxBorder
 #define wxICON_INFORMATION      0x00000800
 #define wxICON_STOP             wxICON_HAND
 #define wxICON_ASTERISK         wxICON_INFORMATION
+#define wxICON_MASK             (0x00000100|0x00000200|0x00000400|0x00000800)
 
-#define wxHELP                  0x00001000
-#define wxFORWARD               0x00002000
-#define wxBACKWARD              0x00004000
-#define wxRESET                 0x00008000
-#define wxMORE                  0x00010000
-#define wxSETUP                 0x00020000
-#define wxICON_NONE             0x00040000
-
-#define wxICON_MASK \
-    (wxICON_EXCLAMATION|wxICON_HAND|wxICON_QUESTION|wxICON_INFORMATION|wxICON_NONE)
+#define  wxFORWARD              0x00001000
+#define  wxBACKWARD             0x00002000
+#define  wxRESET                0x00004000
+#define  wxHELP                 0x00008000
+#define  wxMORE                 0x00010000
+#define  wxSETUP                0x00020000
 
 /*
  * Background styles. See wxWindow::SetBackgroundStyle
  */
+
 enum wxBackgroundStyle
 {
-    /*
-        background is erased in the EVT_ERASE_BACKGROUND handler or using
-        the system default background if no such handler is defined (this
-        is the default style)
-     */
-    wxBG_STYLE_ERASE,
-
-    /*
-        background is erased by the system, no EVT_ERASE_BACKGROUND event
-        is generated at all
-     */
-    wxBG_STYLE_SYSTEM,
-
-    /*
-        background is erased in EVT_PAINT handler and not erased at all
-        before it, this should be used if the paint handler paints over
-        the entire window to avoid flicker
-     */
-    wxBG_STYLE_PAINT,
-
-
-    /* this is a Mac-only style, don't use in portable code */
-    wxBG_STYLE_TRANSPARENT,
-
-    /* this style is deprecated and doesn't do anything, don't use */
-    wxBG_STYLE_COLOUR,
-
-    /*
-        this style is deprecated and is synonymous with
-        wxBG_STYLE_PAINT, use the new name
-     */
-    wxBG_STYLE_CUSTOM = wxBG_STYLE_PAINT
-};
-
-/*
- * Key types used by (old style) lists and hashes.
- */
-enum wxKeyType
-{
-    wxKEY_NONE,
-    wxKEY_INTEGER,
-    wxKEY_STRING
+  wxBG_STYLE_SYSTEM,
+  wxBG_STYLE_COLOUR,
+  wxBG_STYLE_CUSTOM
 };
 
 /*  ---------------------------------------------------------------------------- */
@@ -1946,26 +1638,8 @@ enum wxKeyType
 /*  ---------------------------------------------------------------------------- */
 
 /*  Standard menu IDs */
-enum wxStandardID
+enum
 {
-    /*
-       These ids delimit the range used by automatically-generated ids
-       (i.e. those used when wxID_ANY is specified during construction).
-     */
-#if defined(__WXMSW__) || wxUSE_AUTOID_MANAGEMENT
-    /*
-       On MSW the range is always restricted no matter if id management
-       is used or not because the native window ids are limited to short
-       range.  On other platforms the range is only restricted if id
-       management is used so the reference count buffer won't be so big.
-     */
-    wxID_AUTO_LOWEST = -32000,
-    wxID_AUTO_HIGHEST = -2000,
-#else
-    wxID_AUTO_LOWEST = -1000000,
-    wxID_AUTO_HIGHEST = -2000,
-#endif
-
     /* no id matches this one when compared to it */
     wxID_NONE = -3,
 
@@ -2081,24 +1755,6 @@ enum wxStandardID
     wxID_ZOOM_OUT,
     wxID_UNDELETE,
     wxID_REVERT_TO_SAVED,
-    wxID_CDROM,
-    wxID_CONVERT,
-    wxID_EXECUTE,
-    wxID_FLOPPY,
-    wxID_HARDDISK,
-    wxID_BOTTOM,
-    wxID_FIRST,
-    wxID_LAST,
-    wxID_TOP,
-    wxID_INFO,
-    wxID_JUMP_TO,
-    wxID_NETWORK,
-    wxID_SELECT_COLOR,
-    wxID_SELECT_FONT,
-    wxID_SORT_ASCENDING,
-    wxID_SORT_DESCENDING,
-    wxID_SPELL_CHECK,
-    wxID_STRIKETHROUGH,
 
     /*  System menu IDs (used by wxUniv): */
     wxID_SYSTEM_MENU = 5200,
@@ -2109,45 +1765,12 @@ enum wxStandardID
     wxID_ICONIZE_FRAME,
     wxID_RESTORE_FRAME,
 
-    /* MDI window menu ids */
-    wxID_MDI_WINDOW_FIRST = 5230,
-    wxID_MDI_WINDOW_CASCADE = wxID_MDI_WINDOW_FIRST,
-    wxID_MDI_WINDOW_TILE_HORZ,
-    wxID_MDI_WINDOW_TILE_VERT,
-    wxID_MDI_WINDOW_ARRANGE_ICONS,
-    wxID_MDI_WINDOW_PREV,
-    wxID_MDI_WINDOW_NEXT,
-    wxID_MDI_WINDOW_LAST = wxID_MDI_WINDOW_NEXT,
-
-    /* OS X system menu ids */
-    wxID_OSX_MENU_FIRST = 5250,
-    wxID_OSX_HIDE = wxID_OSX_MENU_FIRST,
-    wxID_OSX_HIDEOTHERS,
-    wxID_OSX_SHOWALL,
-    wxID_OSX_MENU_LAST = wxID_OSX_SHOWALL,
-    
     /*  IDs used by generic file dialog (13 consecutive starting from this value) */
     wxID_FILEDLGG = 5900,
 
-    /*  IDs used by generic file ctrl (4 consecutive starting from this value) */
-    wxID_FILECTRL = 5950,
-
     wxID_HIGHEST = 5999
 };
 
-/*  ---------------------------------------------------------------------------- */
-/*  wxWindowID type (after wxID_XYZ enum, platform detection, and dlimpexp.h)    */
-/*  ---------------------------------------------------------------------------- */
-
-/*  special care should be taken with this type under Windows where the real */
-/*  window id is unsigned, so we must always do the cast before comparing them */
-/*  (or else they would be always different!). Using wxGetWindowId() which does */
-/*  the cast itself is recommended. Note that this type can't be unsigned */
-/*  because wxID_ANY == -1 is a valid (and largely used) value for window id. */
-#if defined(__cplusplus) && wxUSE_GUI
-    #include "wx/windowid.h"
-#endif
-
 /*  ---------------------------------------------------------------------------- */
 /*  other constants */
 /*  ---------------------------------------------------------------------------- */
@@ -2159,22 +1782,9 @@ enum wxItemKind
     wxITEM_NORMAL,
     wxITEM_CHECK,
     wxITEM_RADIO,
-    wxITEM_DROPDOWN,
     wxITEM_MAX
 };
 
-/*
- * The possible states of a 3-state checkbox (Compatible
- * with the 2-state checkbox).
- */
-enum wxCheckBoxState
-{
-    wxCHK_UNCHECKED,
-    wxCHK_CHECKED,
-    wxCHK_UNDETERMINED /* 3-state checkbox only */
-};
-
-
 /*  hit test results */
 enum wxHitTest
 {
@@ -2220,45 +1830,12 @@ enum wxHitTest
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 /*  Change the window position even if it seems to be already correct */
 #define wxSIZE_FORCE            0x0010
-/*  Emit size event even if size didn't change */
-#define wxSIZE_FORCE_EVENT      0x0020
 
 /*  ---------------------------------------------------------------------------- */
 /*  GDI descriptions */
 /*  ---------------------------------------------------------------------------- */
 
-// Hatch styles used by both pen and brush styles.
-//
-// NB: Do not use these constants directly, they're for internal use only, use
-//     wxBRUSHSTYLE_XXX_HATCH and wxPENSTYLE_XXX_HATCH instead.
-enum wxHatchStyle
-{
-    wxHATCHSTYLE_INVALID = -1,
-
-    /*
-        The value of the first style is chosen to fit with
-        wxDeprecatedGUIConstants values below, don't change it.
-     */
-    wxHATCHSTYLE_FIRST = 111,
-    wxHATCHSTYLE_BDIAGONAL = wxHATCHSTYLE_FIRST,
-    wxHATCHSTYLE_CROSSDIAG,
-    wxHATCHSTYLE_FDIAGONAL,
-    wxHATCHSTYLE_CROSS,
-    wxHATCHSTYLE_HORIZONTAL,
-    wxHATCHSTYLE_VERTICAL,
-    wxHATCHSTYLE_LAST = wxHATCHSTYLE_VERTICAL
-};
-
-/*
-    WARNING: the following styles are deprecated; use the
-             wxFontFamily, wxFontStyle, wxFontWeight, wxBrushStyle,
-             wxPenStyle, wxPenCap, wxPenJoin enum values instead!
-*/
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-
-/* don't use any elements of this enum in the new code */
-enum wxDeprecatedGUIConstants
+enum
 {
     /*  Text font families */
     wxDEFAULT    = 70,
@@ -2291,23 +1868,71 @@ enum wxDeprecatedGUIConstants
     wxTRANSPARENT,
 
     /*  Brush & Pen Stippling. Note that a stippled pen cannot be dashed!! */
-    /*  Note also that stippling a Pen IS meaningful, because a Line is */
+    /*  Note also that stippling a Pen IS meaningfull, because a Line is */
     wxSTIPPLE_MASK_OPAQUE, /* mask is used for blitting monochrome using text fore and back ground colors */
     wxSTIPPLE_MASK,        /* mask is used for masking areas in the stipple bitmap (TO DO) */
     /*  drawn with a Pen, and without any Brush -- and it can be stippled. */
     wxSTIPPLE =          110,
 
-    wxBDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL,
-    wxCROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG,
-    wxFDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL,
-    wxCROSS_HATCH = wxHATCHSTYLE_CROSS,
-    wxHORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL,
-    wxVERTICAL_HATCH = wxHATCHSTYLE_VERTICAL,
-    wxFIRST_HATCH = wxHATCHSTYLE_FIRST,
-    wxLAST_HATCH = wxHATCHSTYLE_LAST
+    wxBDIAGONAL_HATCH,     /* In wxWidgets < 2.6 use WX_HATCH macro  */
+    wxCROSSDIAG_HATCH,     /* to verify these wx*_HATCH are in style */
+    wxFDIAGONAL_HATCH,     /* of wxBrush. In wxWidgets >= 2.6 use    */
+    wxCROSS_HATCH,         /* wxBrush::IsHatch() instead.            */
+    wxHORIZONTAL_HATCH,
+    wxVERTICAL_HATCH,
+    wxFIRST_HATCH = wxBDIAGONAL_HATCH,
+    wxLAST_HATCH = wxVERTICAL_HATCH,
+
+    wxJOIN_BEVEL =     120,
+    wxJOIN_MITER,
+    wxJOIN_ROUND,
+
+    wxCAP_ROUND =      130,
+    wxCAP_PROJECTING,
+    wxCAP_BUTT
 };
+
+#if WXWIN_COMPATIBILITY_2_4
+    #define IS_HATCH(s)    ((s)>=wxFIRST_HATCH && (s)<=wxLAST_HATCH)
+#else
+    /* use wxBrush::IsHatch() instead thought wxMotif still uses it in src/motif/dcclient.cpp */
 #endif
 
+/*  Logical ops */
+typedef enum
+{
+    wxCLEAR,        wxROP_BLACK = wxCLEAR,             wxBLIT_BLACKNESS = wxCLEAR,        /*  0 */
+    wxXOR,          wxROP_XORPEN = wxXOR,              wxBLIT_SRCINVERT = wxXOR,          /*  src XOR dst */
+    wxINVERT,       wxROP_NOT = wxINVERT,              wxBLIT_DSTINVERT = wxINVERT,       /*  NOT dst */
+    wxOR_REVERSE,   wxROP_MERGEPENNOT = wxOR_REVERSE,  wxBLIT_00DD0228 = wxOR_REVERSE,    /*  src OR (NOT dst) */
+    wxAND_REVERSE,  wxROP_MASKPENNOT = wxAND_REVERSE,  wxBLIT_SRCERASE = wxAND_REVERSE,   /*  src AND (NOT dst) */
+    wxCOPY,         wxROP_COPYPEN = wxCOPY,            wxBLIT_SRCCOPY = wxCOPY,           /*  src */
+    wxAND,          wxROP_MASKPEN = wxAND,             wxBLIT_SRCAND = wxAND,             /*  src AND dst */
+    wxAND_INVERT,   wxROP_MASKNOTPEN = wxAND_INVERT,   wxBLIT_00220326 = wxAND_INVERT,    /*  (NOT src) AND dst */
+    wxNO_OP,        wxROP_NOP = wxNO_OP,               wxBLIT_00AA0029 = wxNO_OP,         /*  dst */
+    wxNOR,          wxROP_NOTMERGEPEN = wxNOR,         wxBLIT_NOTSRCERASE = wxNOR,        /*  (NOT src) AND (NOT dst) */
+    wxEQUIV,        wxROP_NOTXORPEN = wxEQUIV,         wxBLIT_00990066 = wxEQUIV,         /*  (NOT src) XOR dst */
+    wxSRC_INVERT,   wxROP_NOTCOPYPEN = wxSRC_INVERT,   wxBLIT_NOTSCRCOPY = wxSRC_INVERT,  /*  (NOT src) */
+    wxOR_INVERT,    wxROP_MERGENOTPEN = wxOR_INVERT,   wxBLIT_MERGEPAINT = wxOR_INVERT,   /*  (NOT src) OR dst */
+    wxNAND,         wxROP_NOTMASKPEN = wxNAND,         wxBLIT_007700E6 = wxNAND,          /*  (NOT src) OR (NOT dst) */
+    wxOR,           wxROP_MERGEPEN = wxOR,             wxBLIT_SRCPAINT = wxOR,            /*  src OR dst */
+    wxSET,          wxROP_WHITE = wxSET,               wxBLIT_WHITENESS = wxSET           /*  1 */
+} form_ops_t;
+
+/*  Flood styles */
+enum
+{
+    wxFLOOD_SURFACE = 1,
+    wxFLOOD_BORDER
+};
+
+/*  Polygon filling mode */
+enum
+{
+    wxODDEVEN_RULE = 1,
+    wxWINDING_RULE
+};
+
 /*  ToolPanel in wxFrame (VZ: unused?) */
 enum
 {
@@ -2343,55 +1968,19 @@ enum wxDataFormatId
     wxDF_MAX
 };
 
-/* Key codes */
+/*  Virtual keycodes */
 enum wxKeyCode
 {
-    WXK_NONE    =    0,
-
-    WXK_CONTROL_A = 1,
-    WXK_CONTROL_B,
-    WXK_CONTROL_C,
-    WXK_CONTROL_D,
-    WXK_CONTROL_E,
-    WXK_CONTROL_F,
-    WXK_CONTROL_G,
-    WXK_CONTROL_H,
-    WXK_CONTROL_I,
-    WXK_CONTROL_J,
-    WXK_CONTROL_K,
-    WXK_CONTROL_L,
-    WXK_CONTROL_M,
-    WXK_CONTROL_N,
-    WXK_CONTROL_O,
-    WXK_CONTROL_P,
-    WXK_CONTROL_Q,
-    WXK_CONTROL_R,
-    WXK_CONTROL_S,
-    WXK_CONTROL_T,
-    WXK_CONTROL_U,
-    WXK_CONTROL_V,
-    WXK_CONTROL_W,
-    WXK_CONTROL_X,
-    WXK_CONTROL_Y,
-    WXK_CONTROL_Z,
-
-    WXK_BACK    =    8, /* backspace */
+    WXK_BACK    =    8,
     WXK_TAB     =    9,
     WXK_RETURN  =    13,
     WXK_ESCAPE  =    27,
-
-    /* values from 33 to 126 are reserved for the standard ASCII characters */
-
     WXK_SPACE   =    32,
     WXK_DELETE  =    127,
 
-    /* values from 128 to 255 are reserved for ASCII extended characters
-       (note that there isn't a single fixed standard for the meaning
-       of these values; avoid them in portable apps!) */
-
-    /* These are not compatible with unicode characters.
+    /* These are, by design, not compatible with unicode characters.
        If you want to get a unicode character from a key event, use
-       wxKeyEvent::GetUnicodeKey                                    */
+       wxKeyEvent::GetUnicodeKey instead.                           */
     WXK_START   = 300,
     WXK_LBUTTON,
     WXK_RBUTTON,
@@ -2498,12 +2087,7 @@ enum wxKeyCode
     WXK_WINDOWS_LEFT,
     WXK_WINDOWS_RIGHT,
     WXK_WINDOWS_MENU ,
-#ifdef __WXOSX__
-    WXK_RAW_CONTROL,
-#else
-    WXK_RAW_CONTROL = WXK_CONTROL,
-#endif
-    WXK_COMMAND = WXK_CONTROL,
+    WXK_COMMAND,
 
     /* Hardware-specific buttons */
     WXK_SPECIAL1 = 193,
@@ -2539,14 +2123,28 @@ enum wxKeyModifier
     wxMOD_META      = 0x0008,
     wxMOD_WIN       = wxMOD_META,
 #if defined(__WXMAC__) || defined(__WXCOCOA__)
-    wxMOD_RAW_CONTROL = 0x0010,
+    wxMOD_CMD       = wxMOD_META,
 #else
-    wxMOD_RAW_CONTROL = wxMOD_CONTROL,
-#endif
     wxMOD_CMD       = wxMOD_CONTROL,
+#endif
     wxMOD_ALL       = 0xffff
 };
 
+/*  Mapping modes (same values as used by Windows, don't change) */
+enum
+{
+    wxMM_TEXT = 1,
+    wxMM_LOMETRIC,
+    wxMM_HIMETRIC,
+    wxMM_LOENGLISH,
+    wxMM_HIENGLISH,
+    wxMM_TWIPS,
+    wxMM_ISOTROPIC,
+    wxMM_ANISOTROPIC,
+    wxMM_POINTS,
+    wxMM_METRIC
+};
+
 /* Shortcut for easier dialog-unit-to-pixel conversion */
 #define wxDLG_UNIT(parent, pt) parent->ConvertDialogToPixels(pt)
 
@@ -2671,17 +2269,14 @@ typedef enum
     wxPAPER_PENV_7_ROTATED,     /* PRC Envelope #7 Rotated 230 x 160 mm */
     wxPAPER_PENV_8_ROTATED,     /* PRC Envelope #8 Rotated 309 x 120 mm */
     wxPAPER_PENV_9_ROTATED,     /* PRC Envelope #9 Rotated 324 x 229 mm */
-    wxPAPER_PENV_10_ROTATED,    /* PRC Envelope #10 Rotated 458 x 324 m */
-    wxPAPER_A0,                 /* A0 Sheet 841 x 1189 mm */
-    wxPAPER_A1                  /* A1 Sheet 594 x 841 mm */
+    wxPAPER_PENV_10_ROTATED    /* PRC Envelope #10 Rotated 458 x 324 m */
 } wxPaperSize;
 
 /* Printing orientation */
-enum wxPrintOrientation
-{
-   wxPORTRAIT = 1,
-   wxLANDSCAPE
-};
+#ifndef wxPORTRAIT
+#define wxPORTRAIT      1
+#define wxLANDSCAPE     2
+#endif
 
 /* Duplex printing modes
  */
@@ -2726,20 +2321,16 @@ enum wxUpdateUI
     wxUPDATE_UI_FROMIDLE      = 0x0002 /*  Invoked from On(Internal)Idle */
 };
 
+/*  ---------------------------------------------------------------------------- */
+/*  Notification Event flags - used for dock icon bouncing, etc. */
+/*  ---------------------------------------------------------------------------- */
 
-/* ---------------------------------------------------------------------------- */
-/* wxList types */
-/* ---------------------------------------------------------------------------- */
-
-/* type of compare function for list sort operation (as in 'qsort'): it should
-   return a negative value, 0 or positive value if the first element is less
-   than, equal or greater than the second */
-
-typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2);
-
-/* wxList iterator function */
-typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
-
+enum wxNotificationOptions
+{
+    wxNOTIFY_NONE           = 0x0000,
+    wxNOTIFY_ONCE           = 0x0001,
+    wxNOTIFY_REPEAT         = 0x0002
+};
 
 /*  ---------------------------------------------------------------------------- */
 /*  miscellaneous */
@@ -2760,7 +2351,7 @@ typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
 #endif
 
 #if defined(__CYGWIN__) && defined(__WXMSW__)
-#   if wxUSE_STD_CONTAINERS || defined(wxUSE_STD_STRING)
+#   if wxUSE_STL || defined(wxUSE_STD_STRING)
          /*
             NASTY HACK because the gethostname in sys/unistd.h which the gnu
             stl includes and wx builds with by default clash with each other
@@ -2783,8 +2374,11 @@ typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
 
 #define WX_OPAQUE_TYPE( name ) struct wxOpaque##name
 
+typedef unsigned char WXCOLORREF[6];
+typedef void*       WXCGIMAGEREF;
 typedef void*       WXHBITMAP;
 typedef void*       WXHCURSOR;
+typedef void*       WXHRGN;
 typedef void*       WXRECTPTR;
 typedef void*       WXPOINTPTR;
 typedef void*       WXHWND;
@@ -2792,72 +2386,54 @@ typedef void*       WXEVENTREF;
 typedef void*       WXEVENTHANDLERREF;
 typedef void*       WXEVENTHANDLERCALLREF;
 typedef void*       WXAPPLEEVENTREF;
-
+typedef void*       WXHDC;
+typedef void*       WXHMENU;
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
 
+typedef WX_OPAQUE_TYPE(CIconHandle ) * WXHICON ;
 typedef WX_OPAQUE_TYPE(PicHandle ) * WXHMETAFILE ;
-#if wxOSX_USE_CARBON
-typedef struct OpaqueControlRef* WXWidget ;
-typedef struct OpaqueWindowPtr* WXWindow ;
-typedef struct __AGLPixelFormatRec   *WXGLPixelFormat;
-typedef struct __AGLContextRec       *WXGLContext;
-#endif
 
+
+/* typedef void*       WXWidget; */
+/* typedef void*       WXWindow; */
+typedef WX_OPAQUE_TYPE(ControlRef ) * WXWidget ;
+typedef WX_OPAQUE_TYPE(WindowRef) * WXWindow ;
 typedef void*       WXDisplay;
 
-/*
- * core frameworks
- */
+/* typedef WindowPtr       WXHWND; */
+/* typedef Handle          WXHANDLE; */
+/* typedef CIconHandle     WXHICON; */
+/* typedef unsigned long   WXHFONT; */
+/* typedef MenuHandle      WXHMENU; */
+/* typedef unsigned long   WXHPEN; */
+/* typedef unsigned long   WXHBRUSH; */
+/* typedef unsigned long   WXHPALETTE; */
+/* typedef CursHandle      WXHCURSOR; */
+/* typedef RgnHandle       WXHRGN; */
+/* typedef unsigned long   WXHACCEL; */
+/* typedef unsigned long   WXHINSTANCE; */
+/* typedef unsigned long   WXHIMAGELIST; */
+/* typedef unsigned long   WXHGLOBAL; */
+/* typedef GrafPtr         WXHDC; */
+/* typedef unsigned int    WXWPARAM; */
+/* typedef long            WXLPARAM; */
+/* typedef void *          WXRGNDATA; */
+/* typedef void *          WXMSG; */
+/* typedef unsigned long   WXHCONV; */
+/* typedef unsigned long   WXHKEY; */
+/* typedef void *          WXDRAWITEMSTRUCT; */
+/* typedef void *          WXMEASUREITEMSTRUCT; */
+/* typedef void *          WXLPCREATESTRUCT; */
+/* typedef int (*WXFARPROC)(); */
 
-typedef const void * CFTypeRef;
-
-/* typedef const struct __CFString * CFStringRef; */
-
-#define DECLARE_WXOSX_OPAQUE_CFREF( name ) typedef struct __##name* name##Ref;
-#define DECLARE_WXOSX_OPAQUE_CONST_CFREF( name ) typedef const struct __##name* name##Ref;
-
-DECLARE_WXOSX_OPAQUE_CONST_CFREF( CFString )
-typedef struct __CFString * CFMutableStringRef;
-
-DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopSource )
-DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFont )
-DECLARE_WXOSX_OPAQUE_CONST_CFREF( CTFontDescriptor )
-
-#define DECLARE_WXOSX_OPAQUE_CGREF( name ) typedef struct name* name##Ref;
-
-DECLARE_WXOSX_OPAQUE_CGREF( CGColor )
-DECLARE_WXOSX_OPAQUE_CGREF( CGImage )
-DECLARE_WXOSX_OPAQUE_CGREF( CGContext )
-DECLARE_WXOSX_OPAQUE_CGREF( CGFont )
-
-typedef CGColorRef    WXCOLORREF;
-typedef CGImageRef    WXCGIMAGEREF;
-typedef CGContextRef  WXHDC;
-
-/*
- * carbon
- */
-
-typedef const struct __HIShape * HIShapeRef;
-typedef struct __HIShape * HIMutableShapeRef;
-
-#define DECLARE_WXMAC_OPAQUE_REF( name ) typedef struct Opaque##name* name;
-
-DECLARE_WXMAC_OPAQUE_REF( PasteboardRef )
-DECLARE_WXMAC_OPAQUE_REF( IconRef )
-DECLARE_WXMAC_OPAQUE_REF( MenuRef )
-
-typedef IconRef WXHICON ;
-typedef HIShapeRef WXHRGN;
-#if wxOSX_USE_CARBON
-typedef MenuRef WXHMENU;
-#endif
+/* typedef WindowPtr       WXWindow; */
+/* typedef ControlHandle   WXWidget; */
 
 #endif
 
-#if defined( __WXCOCOA__ ) || defined(__WXMAC__)
+#if defined( __WXCOCOA__ ) || ( defined(__WXMAC__) && defined(__DARWIN__) )
 
 /* Definitions of 32-bit/64-bit types
  * These are typedef'd exactly the same way in newer OS X headers so
@@ -2890,7 +2466,7 @@ typedef unsigned int NSUInteger;
  */
 
 /*  NOTE: This ought to work with other compilers too, but I'm being cautious */
-#if (defined(__GNUC__) && defined(__APPLE__))
+#if (defined(__GNUC__) && defined(__APPLE__)) || defined(__MWERKS__)
 /* It's desirable to have type safety for Objective-C(++) code as it does
 at least catch typos of method names among other things.  However, it
 is not possible to declare an Objective-C class from plain old C or C++
@@ -2910,7 +2486,7 @@ typedef klass *WX_##klass
 typedef struct klass *WX_##klass
 #endif /*  defined(__OBJC__) */
 
-#else /*  not Apple's gcc */
+#else /*  not Apple's GNU or CodeWarrior */
 #warning "Objective-C types will not be checked by the compiler."
 /*  NOTE: typedef struct objc_object *id; */
 /*  IOW, we're declaring these using the id type without using that name, */
@@ -2920,7 +2496,7 @@ typedef struct klass *WX_##klass
 #define DECLARE_WXCOCOA_OBJC_CLASS(klass) \
 typedef struct objc_object *WX_##klass
 
-#endif /*  (defined(__GNUC__) && defined(__APPLE__)) */
+#endif /*  (defined(__GNUC__) && defined(__APPLE__)) || defined(__MWERKS__) */
 
 DECLARE_WXCOCOA_OBJC_CLASS(NSApplication);
 DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep);
@@ -2931,8 +2507,6 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSColorPanel);
 DECLARE_WXCOCOA_OBJC_CLASS(NSControl);
 DECLARE_WXCOCOA_OBJC_CLASS(NSCursor);
 DECLARE_WXCOCOA_OBJC_CLASS(NSEvent);
-DECLARE_WXCOCOA_OBJC_CLASS(NSFont);
-DECLARE_WXCOCOA_OBJC_CLASS(NSFontDescriptor);
 DECLARE_WXCOCOA_OBJC_CLASS(NSFontPanel);
 DECLARE_WXCOCOA_OBJC_CLASS(NSImage);
 DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager);
@@ -2954,77 +2528,76 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage);
 DECLARE_WXCOCOA_OBJC_CLASS(NSThread);
 DECLARE_WXCOCOA_OBJC_CLASS(NSWindow);
 DECLARE_WXCOCOA_OBJC_CLASS(NSView);
-DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext);
-DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLPixelFormat);
-DECLARE_WXCOCOA_OBJC_CLASS( NSPrintInfo );
-#ifndef __WXMAC__
+#ifdef __WXMAC__
+// things added for __WXMAC__
+DECLARE_WXCOCOA_OBJC_CLASS(NSString);
+#else
+// things only for __WXCOCOA__
 typedef WX_NSView WXWidget; /*  wxWidgets BASE definition */
 #endif
 #endif /*  __WXCOCOA__  || ( __WXMAC__ &__DARWIN__)*/
 
-#ifdef __WXMAC__
+#if defined(__WXPALMOS__)
 
-DECLARE_WXCOCOA_OBJC_CLASS(NSString);
+typedef void *          WXHWND;
+typedef void *          WXHANDLE;
+typedef void *          WXHICON;
+typedef void *          WXHFONT;
+typedef void *          WXHMENU;
+typedef void *          WXHPEN;
+typedef void *          WXHBRUSH;
+typedef void *          WXHPALETTE;
+typedef void *          WXHCURSOR;
+typedef void *          WXHRGN;
+typedef void *          WXHACCEL;
+typedef void *          WXHINSTANCE;
+typedef void *          WXHBITMAP;
+typedef void *          WXHIMAGELIST;
+typedef void *          WXHGLOBAL;
+typedef void *          WXHDC;
+typedef unsigned int    WXUINT;
+typedef unsigned long   WXDWORD;
+typedef unsigned short  WXWORD;
 
-#if wxOSX_USE_COCOA
+typedef unsigned long   WXCOLORREF;
+typedef struct tagMSG   WXMSG;
 
-typedef WX_NSWindow WXWindow;
-typedef WX_NSView WXWidget;
-typedef WX_NSMenu WXHMENU;
-typedef WX_NSOpenGLPixelFormat WXGLPixelFormat;
-typedef WX_NSOpenGLContext WXGLContext;
+typedef WXHWND          WXWINHANDLE; /* WinHandle of PalmOS */
+typedef WXWINHANDLE     WXWidget;
 
-#elif wxOSX_USE_IPHONE
+typedef void *          WXFORMPTR;
+typedef void *          WXEVENTPTR;
+typedef void *          WXRECTANGLEPTR;
 
-DECLARE_WXCOCOA_OBJC_CLASS(UIWindow);
-DECLARE_WXCOCOA_OBJC_CLASS(UIView);
-DECLARE_WXCOCOA_OBJC_CLASS(UIFont);
-DECLARE_WXCOCOA_OBJC_CLASS(UIImage);
-DECLARE_WXCOCOA_OBJC_CLASS(UIEvent);
-DECLARE_WXCOCOA_OBJC_CLASS(NSSet);
-DECLARE_WXCOCOA_OBJC_CLASS(EAGLContext);
+#endif /* __WXPALMOS__ */
 
-typedef WX_UIWindow WXWindow;
-typedef WX_UIView WXWidget;
-typedef WX_EAGLContext WXGLContext;
-typedef WX_NSString* WXGLPixelFormat;
-
-#endif
-
-#endif /* __WXMAC__ */
 
 /* ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port */
 #if defined(__WIN32__)
 
-/*  Stand-ins for Windows types to avoid #including all of windows.h */
-
-#ifndef NO_STRICT
-    #define WX_MSW_DECLARE_HANDLE(type) typedef struct type##__ * WX##type
-#else
-    #define WX_MSW_DECLARE_HANDLE(type) typedef void * WX##type
+/*  the keywords needed for WinMain() declaration */
+#ifndef WXFAR
+#    define WXFAR
 #endif
 
-typedef void* WXHANDLE;
-WX_MSW_DECLARE_HANDLE(HWND);
-WX_MSW_DECLARE_HANDLE(HICON);
-WX_MSW_DECLARE_HANDLE(HFONT);
-WX_MSW_DECLARE_HANDLE(HMENU);
-WX_MSW_DECLARE_HANDLE(HPEN);
-WX_MSW_DECLARE_HANDLE(HBRUSH);
-WX_MSW_DECLARE_HANDLE(HPALETTE);
-WX_MSW_DECLARE_HANDLE(HCURSOR);
-WX_MSW_DECLARE_HANDLE(HRGN);
-WX_MSW_DECLARE_HANDLE(RECTPTR);
-WX_MSW_DECLARE_HANDLE(HACCEL);
-WX_MSW_DECLARE_HANDLE(HINSTANCE);
-WX_MSW_DECLARE_HANDLE(HBITMAP);
-WX_MSW_DECLARE_HANDLE(HIMAGELIST);
-WX_MSW_DECLARE_HANDLE(HGLOBAL);
-WX_MSW_DECLARE_HANDLE(HDC);
-typedef WXHINSTANCE WXHMODULE;
-
-#undef WX_MSW_DECLARE_HANDLE
-
+/*  Stand-ins for Windows types to avoid #including all of windows.h */
+typedef void *          WXHWND;
+typedef void *          WXHANDLE;
+typedef void *          WXHICON;
+typedef void *          WXHFONT;
+typedef void *          WXHMENU;
+typedef void *          WXHPEN;
+typedef void *          WXHBRUSH;
+typedef void *          WXHPALETTE;
+typedef void *          WXHCURSOR;
+typedef void *          WXHRGN;
+typedef void *          WXRECTPTR;
+typedef void *          WXHACCEL;
+typedef void WXFAR  *   WXHINSTANCE;
+typedef void *          WXHBITMAP;
+typedef void *          WXHIMAGELIST;
+typedef void *          WXHGLOBAL;
+typedef void *          WXHDC;
 typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
@@ -3040,18 +2613,16 @@ typedef void *          WXDRAWITEMSTRUCT;
 typedef void *          WXMEASUREITEMSTRUCT;
 typedef void *          WXLPCREATESTRUCT;
 
-#ifdef __WXMSW__
 typedef WXHWND          WXWidget;
-#endif
 
 #ifdef __WIN64__
-typedef unsigned __int64   WXWPARAM;
+typedef unsigned __int64    WXWPARAM;
 typedef __int64            WXLPARAM;
 typedef __int64            WXLRESULT;
 #else
-typedef wxW64 unsigned int WXWPARAM;
-typedef wxW64 long         WXLPARAM;
-typedef wxW64 long         WXLRESULT;
+typedef unsigned int    WXWPARAM;
+typedef long            WXLPARAM;
+typedef long            WXLRESULT;
 #endif
 
 #if defined(__GNUWIN32__) || defined(__WXMICROWIN__)
@@ -3081,8 +2652,6 @@ typedef unsigned long   WXHPALETTE;
 typedef unsigned long   WXHCURSOR;
 typedef unsigned long   WXHRGN;
 typedef unsigned long   WXHACCEL;
-typedef unsigned long   WXHINSTANCE;
-typedef unsigned long   WXHMODULE;
 typedef unsigned long   WXHBITMAP;
 typedef unsigned long   WXHDC;
 typedef unsigned int    WXUINT;
@@ -3202,49 +2771,56 @@ typedef long            WXPixel; /* safety catch in src/motif/colour.cpp */
 #ifdef __WXGTK__
 
 /* Stand-ins for GLIB types */
+typedef char           gchar;
+typedef signed char    gint8;
+typedef int            gint;
+typedef unsigned       guint;
+typedef unsigned long  gulong;
+typedef void*          gpointer;
 typedef struct _GSList GSList;
 
 /* Stand-ins for GDK types */
 typedef struct _GdkColor        GdkColor;
+typedef struct _GdkColormap     GdkColormap;
+typedef struct _GdkFont         GdkFont;
+typedef struct _GdkGC           GdkGC;
+typedef struct _GdkVisual       GdkVisual;
+
+#ifdef __WXGTK20__
+typedef struct _GdkAtom        *GdkAtom;
+typedef struct _GdkDrawable     GdkWindow;
+typedef struct _GdkDrawable     GdkBitmap;
+typedef struct _GdkDrawable     GdkPixmap;
+#else /*  GTK+ 1.2 */
+typedef gulong                  GdkAtom;
+typedef struct _GdkWindow       GdkWindow;
+typedef struct _GdkWindow       GdkBitmap;
+typedef struct _GdkWindow       GdkPixmap;
+#endif /*  GTK+ 1.2/2.0 */
+
 typedef struct _GdkCursor       GdkCursor;
+typedef struct _GdkRegion       GdkRegion;
 typedef struct _GdkDragContext  GdkDragContext;
 
-#if defined(__WXGTK20__)
-    typedef struct _GdkAtom* GdkAtom;
-#else
-    typedef unsigned long GdkAtom;
-#endif
-
-#if !defined(__WXGTK3__)
-    typedef struct _GdkColormap GdkColormap;
-    typedef struct _GdkFont GdkFont;
-    typedef struct _GdkGC GdkGC;
-    typedef struct _GdkRegion GdkRegion;
-#endif
-
-#if defined(__WXGTK3__)
-    typedef struct _GdkWindow GdkWindow;
-#elif defined(__WXGTK20__)
-    typedef struct _GdkDrawable GdkWindow;
-    typedef struct _GdkDrawable GdkPixmap;
-#else
-    typedef struct _GdkWindow GdkWindow;
-    typedef struct _GdkWindow GdkBitmap;
-    typedef struct _GdkWindow GdkPixmap;
+#ifdef HAVE_XIM
+typedef struct _GdkIC           GdkIC;
+typedef struct _GdkICAttr       GdkICAttr;
 #endif
 
 /* Stand-ins for GTK types */
 typedef struct _GtkWidget         GtkWidget;
 typedef struct _GtkRcStyle        GtkRcStyle;
 typedef struct _GtkAdjustment     GtkAdjustment;
+typedef struct _GtkList           GtkList;
 typedef struct _GtkToolbar        GtkToolbar;
+typedef struct _GtkTooltips       GtkTooltips;
 typedef struct _GtkNotebook       GtkNotebook;
 typedef struct _GtkNotebookPage   GtkNotebookPage;
 typedef struct _GtkAccelGroup     GtkAccelGroup;
+typedef struct _GtkItemFactory    GtkItemFactory;
 typedef struct _GtkSelectionData  GtkSelectionData;
 typedef struct _GtkTextBuffer     GtkTextBuffer;
 typedef struct _GtkRange          GtkRange;
-typedef struct _GtkCellRenderer   GtkCellRenderer;
 
 typedef GtkWidget *WXWidget;
 
@@ -3268,6 +2844,10 @@ typedef struct _PangoLayout          PangoLayout;
 typedef struct _PangoFontDescription PangoFontDescription;
 #endif
 
+#ifdef __WXMGL__
+typedef struct window_t *WXWidget;
+#endif /*  MGL */
+
 #ifdef __WXDFB__
 /* DirectFB doesn't have the concept of non-TLW window, so use
    something arbitrary */
@@ -3278,45 +2858,23 @@ typedef const void* WXWidget;
 /*  included before or after wxWidgets classes, and therefore must be */
 /*  disabled here before any significant wxWidgets headers are included. */
 #ifdef __cplusplus
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include "wx/msw/winundef.h"
-#endif /* __WINDOWS__ */
+#endif /*  __WXMSW__ */
 #endif /* __cplusplus */
 
-
-/*  include the feature test macros */
-#include "wx/features.h"
-
 /*  --------------------------------------------------------------------------- */
-/*  macros to define a class without copy ctor nor assignment operator */
+/*  macro to define a class without copy ctor nor assignment operator */
 /*  --------------------------------------------------------------------------- */
 
-#define wxDECLARE_NO_COPY_CLASS(classname)      \
+#define DECLARE_NO_COPY_CLASS(classname)        \
     private:                                    \
         classname(const classname&);            \
-        classname& operator=(const classname&)
+        classname& operator=(const classname&);
 
-#define wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg)  \
-    private:                                              \
-        classname(const classname<arg>&);                 \
-        classname& operator=(const classname<arg>&)
-
-#define wxDECLARE_NO_COPY_TEMPLATE_CLASS_2(classname, arg1, arg2) \
-    private:                                                      \
-        classname(const classname<arg1, arg2>&);                  \
-        classname& operator=(const classname<arg1, arg2>&)
-
-#define wxDECLARE_NO_ASSIGN_CLASS(classname)    \
+#define DECLARE_NO_ASSIGN_CLASS(classname)      \
     private:                                    \
-        classname& operator=(const classname&)
-
-/* deprecated variants _not_ requiring a semicolon after them */
-#define DECLARE_NO_COPY_CLASS(classname) \
-    wxDECLARE_NO_COPY_CLASS(classname);
-#define DECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg) \
-    wxDECLARE_NO_COPY_TEMPLATE_CLASS(classname, arg);
-#define DECLARE_NO_ASSIGN_CLASS(classname) \
-    wxDECLARE_NO_ASSIGN_CLASS(classname);
+        classname& operator=(const classname&);
 
 /*  --------------------------------------------------------------------------- */
 /*  If a manifest is being automatically generated, add common controls 6 to it */
@@ -3329,7 +2887,7 @@ typedef const void* WXWidget;
     "/manifestdependency:\"type='win32'         \
      name='Microsoft.Windows.Common-Controls'   \
      version='6.0.0.0'                          \
-     processorArchitecture='" cpu "'            \
+     processorArchitecture='"cpu"'              \
      publicKeyToken='6595b64144ccf1df'          \
      language='*'\""
 
diff --git a/Source/3rd Party/wx/include/wx/dialog.h b/Source/3rd Party/wx/include/wx/dialog.h
index 63fb51994..cf9dbf6c9 100644
--- a/Source/3rd Party/wx/include/wx/dialog.h	
+++ b/Source/3rd Party/wx/include/wx/dialog.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dialog.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,20 +13,13 @@
 #define _WX_DIALOG_H_BASE_
 
 #include "wx/defs.h"
+#include "wx/containr.h"
 #include "wx/toplevel.h"
 
 class WXDLLIMPEXP_FWD_CORE wxSizer;
 class WXDLLIMPEXP_FWD_CORE wxStdDialogButtonSizer;
-class WXDLLIMPEXP_FWD_CORE wxBoxSizer;
-class WXDLLIMPEXP_FWD_CORE wxDialogLayoutAdapter;
-class WXDLLIMPEXP_FWD_CORE wxDialog;
-class WXDLLIMPEXP_FWD_CORE wxButton;
-class WXDLLIMPEXP_FWD_CORE wxScrolledWindow;
-class wxTextSizerWrapper;
 
-// Also see the bit summary table in wx/toplevel.h.
-
-#define wxDIALOG_NO_PARENT      0x00000020  // Don't make owned by apps top window
+#define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 
 #ifdef __WXWINCE__
 #define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxMAXIMIZE | wxCLOSE_BOX | wxNO_BORDER)
@@ -34,40 +27,17 @@ class wxTextSizerWrapper;
 #define wxDEFAULT_DIALOG_STYLE  (wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX)
 #endif
 
-// Layout adaptation levels, for SetLayoutAdaptationLevel
+extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
 
-// Don't do any layout adaptation
-#define wxDIALOG_ADAPTATION_NONE             0
-
-// Only look for wxStdDialogButtonSizer for non-scrolling part
-#define wxDIALOG_ADAPTATION_STANDARD_SIZER   1
-
-// Also look for any suitable sizer for non-scrolling part
-#define wxDIALOG_ADAPTATION_ANY_SIZER        2
-
-// Also look for 'loose' standard buttons for non-scrolling part
-#define wxDIALOG_ADAPTATION_LOOSE_BUTTONS    3
-
-// Layout adaptation mode, for SetLayoutAdaptationMode
-enum wxDialogLayoutAdaptationMode
-{
-    wxDIALOG_ADAPTATION_MODE_DEFAULT = 0,   // use global adaptation enabled status
-    wxDIALOG_ADAPTATION_MODE_ENABLED = 1,   // enable this dialog overriding global status
-    wxDIALOG_ADAPTATION_MODE_DISABLED = 2   // disable this dialog overriding global status
-};
-
-enum wxDialogModality
-{
-    wxDIALOG_MODALITY_NONE = 0,
-    wxDIALOG_MODALITY_WINDOW_MODAL = 1,
-    wxDIALOG_MODALITY_APP_MODAL = 2
-};
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
-
-class WXDLLIMPEXP_CORE wxDialogBase : public wxTopLevelWindow
+class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
 {
 public:
+    enum
+    {
+        // all flags allowed in wxDialogBase::CreateButtonSizer()
+        ButtonSizerFlags = wxOK|wxCANCEL|wxYES|wxNO|wxHELP|wxNO_DEFAULT
+    };
+
     wxDialogBase() { Init(); }
     virtual ~wxDialogBase() { }
 
@@ -75,10 +45,7 @@ public:
     virtual int ShowModal() = 0;
     virtual void EndModal(int retCode) = 0;
     virtual bool IsModal() const = 0;
-    // show the dialog frame-modally (needs a parent), using app-modal
-    // dialogs on platforms that don't support it
-    virtual void ShowWindowModal () ;
-    virtual void SendWindowModalDialogEvent ( wxEventType type );
+
 
     // Modal dialogs have a return code - usually the id of the last
     // pressed button
@@ -97,33 +64,10 @@ public:
     void SetEscapeId(int escapeId);
     int GetEscapeId() const { return m_escapeId; }
 
-    // Find the parent to use for modal dialog: try to use the specified parent
-    // but fall back to the current active window or main application window as
-    // last resort if it is unsuitable.
-    //
-    // As this function is often called from the ctor, the window style may be
-    // not set yet and hence must be passed explicitly to it so that we could
-    // check whether it contains wxDIALOG_NO_PARENT bit.
-    //
-    // This function always returns a valid top level window or NULL.
-    wxWindow *GetParentForModalDialog(wxWindow *parent, long style) const;
-
-    // This overload can only be used for already initialized windows, i.e. not
-    // from the ctor. It uses the current window parent and style.
-    wxWindow *GetParentForModalDialog() const
-    {
-        return GetParentForModalDialog(GetParent(), GetWindowStyle());
-    }
-
 #if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
-    // splits text up at newlines and places the lines into a vertical
-    // wxBoxSizer
-    wxSizer *CreateTextSizer( const wxString& message );
-
-    // same as above but uses a customized wxTextSizerWrapper to create
-    // non-standard controls for the lines
-    wxSizer *CreateTextSizer( const wxString& message,
-                              wxTextSizerWrapper& wrapper );
+    // splits text up at newlines and places the
+    // lines into a vertical wxBoxSizer
+    wxSizer *CreateTextSizer( const wxString &message );
 #endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL
 
     // returns a horizontal wxBoxSizer containing the given buttons
@@ -133,64 +77,15 @@ public:
     // platforms which have hardware buttons replacing OK/Cancel and such)
     wxSizer *CreateButtonSizer(long flags);
 
-    // returns a sizer containing the given one and a static line separating it
-    // from the preceding elements if it's appropriate for the current platform
-    wxSizer *CreateSeparatedSizer(wxSizer *sizer);
-
     // returns the sizer containing CreateButtonSizer() below a separating
     // static line for the platforms which use static lines for items
     // separation (i.e. not Mac)
-    //
-    // this is just a combination of CreateButtonSizer() and
-    // CreateSeparatedSizer()
     wxSizer *CreateSeparatedButtonSizer(long flags);
 
 #if wxUSE_BUTTON
     wxStdDialogButtonSizer *CreateStdDialogButtonSizer( long flags );
 #endif // wxUSE_BUTTON
 
-    // Do layout adaptation
-    virtual bool DoLayoutAdaptation();
-
-    // Can we do layout adaptation?
-    virtual bool CanDoLayoutAdaptation();
-
-    // Returns a content window if there is one. This can be used by the layout adapter, for
-    // example to make the pages of a book control into scrolling windows
-    virtual wxWindow* GetContentWindow() const { return NULL; }
-
-    // Add an id to the list of main button identifiers that should be in the button sizer
-    void AddMainButtonId(wxWindowID id) { m_mainButtonIds.Add((int) id); }
-    wxArrayInt& GetMainButtonIds() { return m_mainButtonIds; }
-
-    // Is this id in the main button id array?
-    bool IsMainButtonId(wxWindowID id) const { return (m_mainButtonIds.Index((int) id) != wxNOT_FOUND); }
-
-    // Level of adaptation, from none (Level 0) to full (Level 3). To disable adaptation,
-    // set level 0, for example in your dialog constructor. You might
-    // do this if you know that you are displaying on a large screen and you don't want the
-    // dialog changed.
-    void SetLayoutAdaptationLevel(int level) { m_layoutAdaptationLevel = level; }
-    int GetLayoutAdaptationLevel() const { return m_layoutAdaptationLevel; }
-
-    /// Override global adaptation enabled/disabled status
-    void SetLayoutAdaptationMode(wxDialogLayoutAdaptationMode mode) { m_layoutAdaptationMode = mode; }
-    wxDialogLayoutAdaptationMode GetLayoutAdaptationMode() const { return m_layoutAdaptationMode; }
-
-    // Returns true if the adaptation has been done
-    void SetLayoutAdaptationDone(bool adaptationDone) { m_layoutAdaptationDone = adaptationDone; }
-    bool GetLayoutAdaptationDone() const { return m_layoutAdaptationDone; }
-
-    // Set layout adapter class, returning old adapter
-    static wxDialogLayoutAdapter* SetLayoutAdapter(wxDialogLayoutAdapter* adapter);
-    static wxDialogLayoutAdapter* GetLayoutAdapter() { return sm_layoutAdapter; }
-
-    // Global switch for layout adaptation
-    static bool IsLayoutAdaptationEnabled() { return sm_layoutAdaptation; }
-    static void EnableLayoutAdaptation(bool enable) { sm_layoutAdaptation = enable; }
-
-    // modality kind
-    virtual wxDialogModality GetModality() const;
 protected:
     // emulate click of a button with the given id if it's present in the dialog
     //
@@ -213,6 +108,7 @@ protected:
     // wxID_OK return code
     void AcceptAndClose();
 
+
     // The return code from modal dialog
     int m_returnCode;
 
@@ -222,40 +118,10 @@ protected:
     // The identifier for cancel button (usually wxID_CANCEL)
     int m_escapeId;
 
-    // Flags whether layout adaptation has been done for this dialog
-    bool                                m_layoutAdaptationDone;
-
-    // Extra button identifiers to be taken as 'main' button identifiers
-    // to be placed in the non-scrolling area
-    wxArrayInt                          m_mainButtonIds;
-
-    // Adaptation level
-    int                                 m_layoutAdaptationLevel;
-
-    // Local override for global adaptation enabled status
-    wxDialogLayoutAdaptationMode        m_layoutAdaptationMode;
-
-    // Global layout adapter
-    static wxDialogLayoutAdapter*       sm_layoutAdapter;
-
-    // Global adaptation switch
-    static bool                         sm_layoutAdaptation;
-
 private:
     // common part of all ctors
     void Init();
 
-    // helper of GetParentForModalDialog(): returns the passed in window if it
-    // can be used as our parent or NULL if it can't
-    wxWindow *CheckIfCanBeUsedAsParent(wxWindow *parent) const;
-
-    // Helper of OnCharHook() and OnCloseWindow(): find the appropriate button
-    // for closing the dialog and send a click event for it.
-    //
-    // Return true if we found a button to close the dialog and "clicked" it or
-    // false otherwise.
-    bool SendCloseButtonClickEvent();
-
     // handle Esc key presses
     void OnCharHook(wxKeyEvent& event);
 
@@ -269,88 +135,18 @@ private:
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 
-    wxDECLARE_NO_COPY_CLASS(wxDialogBase);
+    DECLARE_NO_COPY_CLASS(wxDialogBase)
     DECLARE_EVENT_TABLE()
+    WX_DECLARE_CONTROL_CONTAINER();
 };
 
-/*!
- * Base class for layout adapters - code that, for example, turns a dialog into a
- * scrolling dialog if there isn't enough screen space. You can derive further
- * adapter classes to do any other kind of adaptation, such as applying a watermark, or adding
- * a help mechanism.
- */
-
-class WXDLLIMPEXP_CORE wxDialogLayoutAdapter: public wxObject
-{
-    DECLARE_CLASS(wxDialogLayoutAdapter)
-public:
-    wxDialogLayoutAdapter() {}
-
-    // Override this function to indicate that adaptation should be done
-    virtual bool CanDoLayoutAdaptation(wxDialog* dialog) = 0;
-
-    // Override this function to do the adaptation
-    virtual bool DoLayoutAdaptation(wxDialog* dialog) = 0;
-};
-
-/*!
- * Standard adapter. Does scrolling adaptation for paged and regular dialogs.
- *
- */
-
-class WXDLLIMPEXP_CORE wxStandardDialogLayoutAdapter: public wxDialogLayoutAdapter
-{
-    DECLARE_CLASS(wxStandardDialogLayoutAdapter)
-public:
-    wxStandardDialogLayoutAdapter() {}
-
-// Overrides
-
-    // Indicate that adaptation should be done
-    virtual bool CanDoLayoutAdaptation(wxDialog* dialog);
-
-    // Do layout adaptation
-    virtual bool DoLayoutAdaptation(wxDialog* dialog);
-
-// Implementation
-
-    // Create the scrolled window
-    virtual wxScrolledWindow* CreateScrolledWindow(wxWindow* parent);
-
-#if wxUSE_BUTTON
-    // Find a standard or horizontal box sizer
-    virtual wxSizer* FindButtonSizer(bool stdButtonSizer, wxDialog* dialog, wxSizer* sizer, int& retBorder, int accumlatedBorder = 0);
-
-    // Check if this sizer contains standard buttons, and so can be repositioned in the dialog
-    virtual bool IsOrdinaryButtonSizer(wxDialog* dialog, wxBoxSizer* sizer);
-
-    // Check if this is a standard button
-    virtual bool IsStandardButton(wxDialog* dialog, wxButton* button);
-
-    // Find 'loose' main buttons in the existing layout and add them to the standard dialog sizer
-    virtual bool FindLooseButtons(wxDialog* dialog, wxStdDialogButtonSizer* buttonSizer, wxSizer* sizer, int& count);
-#endif // wxUSE_BUTTON
-
-    // Reparent the controls to the scrolled window, except those in buttonSizer
-    virtual void ReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer = NULL);
-    static void DoReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer = NULL);
-
-    // A function to fit the dialog around its contents, and then adjust for screen size.
-    // If scrolled windows are passed, scrolling is enabled in the required orientation(s).
-    virtual bool FitWithScrolling(wxDialog* dialog, wxScrolledWindow* scrolledWindow);
-    virtual bool FitWithScrolling(wxDialog* dialog, wxWindowList& windows);
-    static bool DoFitWithScrolling(wxDialog* dialog, wxScrolledWindow* scrolledWindow);
-    static bool DoFitWithScrolling(wxDialog* dialog, wxWindowList& windows);
-
-    // Find whether scrolling will be necessary for the dialog, returning wxVERTICAL, wxHORIZONTAL or both
-    virtual int MustScroll(wxDialog* dialog, wxSize& windowSize, wxSize& displaySize);
-    static int DoMustScroll(wxDialog* dialog, wxSize& windowSize, wxSize& displaySize);
-};
 
 #if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__)
     #include "wx/univ/dialog.h"
 #else
-    #if defined(__WXMSW__)
+    #if defined(__WXPALMOS__)
+        #include "wx/palmos/dialog.h"
+    #elif defined(__WXMSW__)
         #include "wx/msw/dialog.h"
     #elif defined(__WXMOTIF__)
         #include "wx/motif/dialog.h"
@@ -359,7 +155,7 @@ public:
     #elif defined(__WXGTK__)
         #include "wx/gtk1/dialog.h"
     #elif defined(__WXMAC__)
-        #include "wx/osx/dialog.h"
+        #include "wx/mac/dialog.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dialog.h"
     #elif defined(__WXPM__)
@@ -367,33 +163,5 @@ public:
     #endif
 #endif
 
-class WXDLLIMPEXP_CORE wxWindowModalDialogEvent  : public wxCommandEvent
-{
-public:
-    wxWindowModalDialogEvent (wxEventType commandType = wxEVT_NULL, int id = 0)
-        : wxCommandEvent(commandType, id) { }
-
-    wxDialog *GetDialog() const
-        { return wxStaticCast(GetEventObject(), wxDialog); }
-
-    int GetReturnCode() const
-        { return GetDialog()->GetReturnCode(); }
-
-    virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); }
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowModalDialogEvent )
-};
-
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent );
-
-typedef void (wxEvtHandler::*wxWindowModalDialogEventFunction)(wxWindowModalDialogEvent &);
-
-#define wxWindowModalDialogEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxWindowModalDialogEventFunction, func)
-
-#define EVT_WINDOW_MODAL_DIALOG_CLOSED(winid, func) \
-    wx__DECLARE_EVT1(wxEVT_WINDOW_MODAL_DIALOG_CLOSED, winid, wxWindowModalDialogEventHandler(func))
-
 #endif
     // _WX_DIALOG_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/dialup.h b/Source/3rd Party/wx/include/wx/dialup.h
index 954b258da..b86e70cba 100644
--- a/Source/3rd Party/wx/include/wx/dialup.h	
+++ b/Source/3rd Party/wx/include/wx/dialup.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dialup.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -43,7 +43,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
  *    main thread?
  */
 
-class WXDLLIMPEXP_CORE wxDialUpManager
+class WXDLLEXPORT wxDialUpManager
 {
 public:
     // this function should create and return the object of the
@@ -152,13 +152,13 @@ public:
 // wxDialUpManager events
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_FWD_CORE wxDialUpEvent;
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIALUP_CONNECTED, wxDialUpEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_DIALUP_DISCONNECTED, wxDialUpEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED, 450)
+    DECLARE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED, 451)
+END_DECLARE_EVENT_TYPES()
 
 // the event class for the dialup events
-class WXDLLIMPEXP_CORE wxDialUpEvent : public wxEvent
+class WXDLLEXPORT wxDialUpEvent : public wxEvent
 {
 public:
     wxDialUpEvent(bool isConnected, bool isOwnEvent) : wxEvent(isOwnEvent)
@@ -171,7 +171,7 @@ public:
     bool IsConnectedEvent() const
         { return GetEventType() == wxEVT_DIALUP_CONNECTED; }
 
-    // does this event come from wxDialUpManager::Dial() or from some external
+    // does this event come from wxDialUpManager::Dial() or from some extrenal
     // process (i.e. does it result from our own attempt to establish the
     // connection)?
     bool IsOwnEvent() const { return m_id != 0; }
@@ -180,14 +180,14 @@ public:
     virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); }
 
 private:
-    wxDECLARE_NO_ASSIGN_CLASS(wxDialUpEvent);
+    DECLARE_NO_ASSIGN_CLASS(wxDialUpEvent)
 };
 
 // the type of dialup event handler function
 typedef void (wxEvtHandler::*wxDialUpEventFunction)(wxDialUpEvent&);
 
 #define wxDialUpEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxDialUpEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDialUpEventFunction, &func)
 
 // macros to catch dialup events
 #define EVT_DIALUP_CONNECTED(func) \
diff --git a/Source/3rd Party/wx/include/wx/dir.h b/Source/3rd Party/wx/include/wx/dir.h
index 16aaef39d..90cee0225 100644
--- a/Source/3rd Party/wx/include/wx/dir.h	
+++ b/Source/3rd Party/wx/include/wx/dir.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dir.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,7 +14,6 @@
 
 #include "wx/longlong.h"
 #include "wx/string.h"
-#include "wx/filefn.h"      // for wxS_DIR_DEFAULT
 
 class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
@@ -24,7 +23,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 // these flags define what kind of filenames is included in the list of files
 // enumerated by GetFirst/GetNext
-enum wxDirFlags
+enum
 {
     wxDIR_FILES     = 0x0001,       // include files
     wxDIR_DIRS      = 0x0002,       // include directories
@@ -64,7 +63,7 @@ public:
     virtual wxDirTraverseResult OnDir(const wxString& dirname) = 0;
 
     // called for each directory which we couldn't open during our traversal
-    // of the directory tree
+    // of the directory tyree
     //
     // this method can also return either wxDIR_STOP, wxDIR_IGNORE or
     // wxDIR_CONTINUE but the latter is treated specially: it means to retry
@@ -84,6 +83,8 @@ class WXDLLIMPEXP_FWD_BASE wxDirData;
 class WXDLLIMPEXP_BASE wxDir
 {
 public:
+    // test for existence of a directory with the given name
+    static bool Exists(const wxString& dir);
 
     // ctors
     // -----
@@ -94,7 +95,7 @@ public:
     // opens the directory for enumeration, use IsOpened() to test success
     wxDir(const wxString& dir);
 
-    // dtor cleans up the associated resources
+    // dtor cleans up the associated ressources
     ~wxDir();
 
     // open the directory for enumerating
@@ -106,11 +107,6 @@ public:
     // get the full name of the directory (without '/' at the end)
     wxString GetName() const;
 
-    // Same as GetName() but does include the trailing separator, unless the
-    // string is empty (only for invalid directories).
-    wxString GetNameWithSep() const;
-
-
     // file enumeration routines
     // -------------------------
 
@@ -124,10 +120,10 @@ public:
     bool GetNext(wxString *filename) const;
 
     // return true if this directory has any files in it
-    bool HasFiles(const wxString& spec = wxEmptyString) const;
+    bool HasFiles(const wxString& spec = wxEmptyString);
 
     // return true if this directory has any subdirectories
-    bool HasSubDirs(const wxString& spec = wxEmptyString) const;
+    bool HasSubDirs(const wxString& spec = wxEmptyString);
 
     // enumerate all files in this directory and its subdirectories
     //
@@ -150,31 +146,15 @@ public:
                               const wxString& filespec,
                               int flags = wxDIR_DEFAULT);
 
-#if wxUSE_LONGLONG
     // returns the size of all directories recursively found in given path
     static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL);
-#endif // wxUSE_LONGLONG
-
-
-    // static utilities for directory management
-    // (alias to wxFileName's functions for dirs)
-    // -----------------------------------------
-
-    // test for existence of a directory with the given name
-    static bool Exists(const wxString& dir);
-
-    static bool Make(const wxString &dir, int perm = wxS_DIR_DEFAULT,
-                     int flags = 0);
-
-    static bool Remove(const wxString &dir, int flags = 0);
-
 
 private:
     friend class wxDirData;
 
     wxDirData *m_data;
 
-    wxDECLARE_NO_COPY_CLASS(wxDir);
+    DECLARE_NO_COPY_CLASS(wxDir)
 };
 
 #endif // _WX_DIR_H_
diff --git a/Source/3rd Party/wx/include/wx/dirdlg.h b/Source/3rd Party/wx/include/wx/dirdlg.h
index 228ced765..8c6d2f8fe 100644
--- a/Source/3rd Party/wx/include/wx/dirdlg.h	
+++ b/Source/3rd Party/wx/include/wx/dirdlg.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dirdlg.h 44027 2006-12-21 19:26:48Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -20,9 +20,9 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogDefaultFolderStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
 
 #define wxDD_CHANGE_DIR         0x0100
 #define wxDD_DIR_MUST_EXIST     0x0200
@@ -40,7 +40,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];
 // wxDirDialogBase
 //-------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog
+class WXDLLEXPORT wxDirDialogBase : public wxDialog
 {
 public:
     wxDirDialogBase() {}
@@ -96,7 +96,8 @@ protected:
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
-#elif defined(__WXMSW__) && (!wxUSE_OLE               || \
+#elif defined(__WXMSW__) && (defined(__SALFORDC__)    || \
+                             !wxUSE_OLE               || \
                              (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
@@ -105,17 +106,18 @@ protected:
     #define wxDirDialog wxGenericDirDialog
 #elif defined(__WXMSW__)
     #include "wx/msw/dirdlg.h"  // Native MSW
-#elif defined(__WXGTK20__)
+#elif defined(__WXGTK24__)
     #include "wx/gtk/dirdlg.h"  // Native GTK for gtk2.4
 #elif defined(__WXGTK__)
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
 #elif defined(__WXMAC__)
-    #include "wx/osx/dirdlg.h"      // Native Mac
+    #include "wx/mac/dirdlg.h"      // Native Mac
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dirdlg.h"    // Native Cocoa
 #elif defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
+      defined(__WXMGL__)   || \
       defined(__WXCOCOA__) || \
       defined(__WXPM__)
     #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation
@@ -126,7 +128,7 @@ protected:
 // common ::wxDirSelector() function
 // ----------------------------------------------------------------------------
 
-WXDLLIMPEXP_CORE wxString
+WXDLLEXPORT wxString
 wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
               const wxString& defaultPath = wxEmptyString,
               long style = wxDD_DEFAULT_STYLE,
diff --git a/Source/3rd Party/wx/include/wx/display.h b/Source/3rd Party/wx/include/wx/display.h
index 2e925ca9a..98a52ec30 100644
--- a/Source/3rd Party/wx/include/wx/display.h	
+++ b/Source/3rd Party/wx/include/wx/display.h	
@@ -3,7 +3,7 @@
 // Purpose:     wxDisplay class
 // Author:      Royce Mitchell III, Vadim Zeitlin
 // Created:     06/21/02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: display.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) 2002-2006 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@
     WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes);
 
     // default, uninitialized, video mode object
-    extern WXDLLIMPEXP_DATA_CORE(const wxVideoMode) wxDefaultVideoMode;
+    extern WXDLLEXPORT_DATA(const wxVideoMode) wxDefaultVideoMode;
 #endif // wxUSE_DISPLAY
 
 class WXDLLIMPEXP_FWD_CORE wxWindow;
@@ -37,7 +37,7 @@ class WXDLLIMPEXP_FWD_CORE wxDisplayImpl;
 // wxDisplay: represents a display/monitor attached to the system
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDisplay
+class WXDLLEXPORT wxDisplay
 {
 public:
     // initialize the object containing all information about the given
@@ -62,7 +62,7 @@ public:
 
     // find the display where the given window lies, return wxNOT_FOUND if it
     // is not shown at all
-    static int GetFromWindow(const wxWindow *window);
+    static int GetFromWindow(wxWindow *window);
 
 
     // return true if the object was initialized successfully
@@ -122,7 +122,7 @@ private:
     wxDisplayImpl *m_impl;
 
 
-    wxDECLARE_NO_COPY_CLASS(wxDisplay);
+    DECLARE_NO_COPY_CLASS(wxDisplay)
 };
 
 #endif // _WX_DISPLAY_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/display_impl.h b/Source/3rd Party/wx/include/wx/display_impl.h
index 0d5833158..8c38f6522 100644
--- a/Source/3rd Party/wx/include/wx/display_impl.h	
+++ b/Source/3rd Party/wx/include/wx/display_impl.h	
@@ -3,7 +3,7 @@
 // Purpose:     wxDisplayImpl class declaration
 // Author:      Vadim Zeitlin
 // Created:     2006-03-15
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: display_impl.h 41548 2006-10-02 05:38:05Z PC $
 // Copyright:   (c) 2002-2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,7 @@
 // wxDisplayFactory: allows to create wxDisplay objects
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDisplayFactory
+class WXDLLEXPORT wxDisplayFactory
 {
 public:
     wxDisplayFactory() { }
@@ -37,14 +37,14 @@ public:
     // return the display for the given window or wxNOT_FOUND
     //
     // the window pointer must not be NULL (i.e. caller should check it)
-    virtual int GetFromWindow(const wxWindow *window);
+    virtual int GetFromWindow(wxWindow *window);
 };
 
 // ----------------------------------------------------------------------------
 // wxDisplayImpl: base class for all wxDisplay implementations
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDisplayImpl
+class WXDLLEXPORT wxDisplayImpl
 {
 public:
     // virtual dtor for this base class
@@ -89,7 +89,7 @@ protected:
 
     friend class wxDisplayFactory;
 
-    wxDECLARE_NO_COPY_CLASS(wxDisplayImpl);
+    DECLARE_NO_COPY_CLASS(wxDisplayImpl)
 };
 
 // ----------------------------------------------------------------------------
@@ -98,7 +98,7 @@ protected:
 
 // this is a stub implementation using single/main display only, it is
 // available even if wxUSE_DISPLAY == 0
-class WXDLLIMPEXP_CORE wxDisplayFactorySingle : public wxDisplayFactory
+class WXDLLEXPORT wxDisplayFactorySingle : public wxDisplayFactory
 {
 public:
     virtual wxDisplayImpl *CreateDisplay(unsigned n);
diff --git a/Source/3rd Party/wx/include/wx/dlimpexp.h b/Source/3rd Party/wx/include/wx/dlimpexp.h
index 485842b89..743785e04 100644
--- a/Source/3rd Party/wx/include/wx/dlimpexp.h	
+++ b/Source/3rd Party/wx/include/wx/dlimpexp.h	
@@ -4,7 +4,7 @@
  * Author:      Vadim Zeitlin
  * Modified by:
  * Created:     16.10.2003 (extracted from wx/defs.h)
- * RCS-ID:      $Id$
+ * RCS-ID:      $Id: dlimpexp.h 49563 2007-10-31 20:46:21Z VZ $
  * Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
  * Licence:     wxWindows licence
  */
@@ -16,31 +16,17 @@
 #ifndef _WX_DLIMPEXP_H_
 #define _WX_DLIMPEXP_H_
 
-#if defined(HAVE_VISIBILITY)
-#    define WXEXPORT __attribute__ ((visibility("default")))
-#    define WXIMPORT __attribute__ ((visibility("default")))
-#elif defined(__WINDOWS__)
+#if defined(__WXMSW__)
     /*
        __declspec works in BC++ 5 and later, Watcom C++ 11.0 and later as well
-       as VC++.
+       as VC++ and gcc
      */
-#    if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#    if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNUC__) || defined(__WATCOMC__)
 #        define WXEXPORT __declspec(dllexport)
 #        define WXIMPORT __declspec(dllimport)
-    /*
-        While gcc also supports __declspec(dllexport), it creates unusably huge
-        DLL files since gcc 4.5 (while taking horribly long amounts of time),
-        see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43601. Because of this
-        we rely on binutils auto export/import support which seems to work
-        quite well for 4.5+.
-     */
-#    elif defined(__GNUC__) && !wxCHECK_GCC_VERSION(4, 5)
-        /*
-            __declspec could be used here too but let's use the native
-            __attribute__ instead for clarity.
-        */
-#       define WXEXPORT __attribute__((dllexport))
-#       define WXIMPORT __attribute__((dllimport))
+#    else /* compiler doesn't support __declspec() */
+#        define WXEXPORT
+#        define WXIMPORT
 #    endif
 #elif defined(__WXPM__)
 #    if defined (__WATCOMC__)
@@ -57,6 +43,11 @@
 #        define WXEXPORT _Export
 #        define WXIMPORT _Export
 #    endif
+#elif defined(__WXMAC__) || defined(__WXCOCOA__)
+#    ifdef __MWERKS__
+#        define WXEXPORT __declspec(export)
+#        define WXIMPORT __declspec(import)
+#    endif
 #elif defined(__CYGWIN__)
 #    define WXEXPORT __declspec(dllexport)
 #    define WXIMPORT __declspec(dllimport)
@@ -73,7 +64,7 @@
    support arbitrary combinations of libs/DLLs: either we build all of them as
    DLLs (in which case WXMAKINGDLL is defined) or none (it isn't).
 
-   However we have a problem because we need separate WXDLLIMPEXP versions for
+   However we have a problem because we need separate WXDLLEXPORT versions for
    different libraries as, for example, wxString class should be dllexported
    when compiled in wxBase and dllimported otherwise, so we do define separate
    WXMAKING/USINGDLL_XYZ constants for each component XYZ.
@@ -87,43 +78,30 @@
 #    define WXMAKINGDLL_CORE
 #    define WXMAKINGDLL_ADV
 #    define WXMAKINGDLL_QA
+#    define WXMAKINGDLL_ODBC
+#    define WXMAKINGDLL_DBGRID
 #    define WXMAKINGDLL_HTML
 #    define WXMAKINGDLL_GL
 #    define WXMAKINGDLL_XML
 #    define WXMAKINGDLL_XRC
 #    define WXMAKINGDLL_AUI
-#    define WXMAKINGDLL_RIBBON
-#    define WXMAKINGDLL_PROPGRID
 #    define WXMAKINGDLL_RICHTEXT
 #    define WXMAKINGDLL_MEDIA
-#    define WXMAKINGDLL_STC
-#    define WXMAKINGDLL_WEBVIEW
 #endif /* WXMAKINGDLL */
 
 /*
-   WXDLLIMPEXP_CORE maps to export declaration when building the DLL, to import
+   WXDLLEXPORT maps to export declaration when building the DLL, to import
    declaration if using it or to nothing at all if we don't use wxWin as DLL
  */
 #ifdef WXMAKINGDLL_BASE
 #    define WXDLLIMPEXP_BASE WXEXPORT
 #    define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
-#    if defined(HAVE_VISIBILITY)
-#        define WXDLLIMPEXP_INLINE_BASE WXEXPORT
-#    else
-#        define WXDLLIMPEXP_INLINE_BASE
-#    endif
 #elif defined(WXUSINGDLL)
 #    define WXDLLIMPEXP_BASE WXIMPORT
 #    define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type
-#    if defined(HAVE_VISIBILITY)
-#        define WXDLLIMPEXP_INLINE_BASE WXIMPORT
-#    else
-#        define WXDLLIMPEXP_INLINE_BASE
-#    endif
 #else /* not making nor using DLL */
 #    define WXDLLIMPEXP_BASE
 #    define WXDLLIMPEXP_DATA_BASE(type) type
-#    define WXDLLIMPEXP_INLINE_BASE
 #endif
 
 #ifdef WXMAKINGDLL_NET
@@ -140,23 +118,12 @@
 #ifdef WXMAKINGDLL_CORE
 #    define WXDLLIMPEXP_CORE WXEXPORT
 #    define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type
-#    if defined(HAVE_VISIBILITY)
-#        define WXDLLIMPEXP_INLINE_CORE WXEXPORT
-#    else
-#        define WXDLLIMPEXP_INLINE_CORE
-#    endif
 #elif defined(WXUSINGDLL)
 #    define WXDLLIMPEXP_CORE WXIMPORT
 #    define WXDLLIMPEXP_DATA_CORE(type) WXIMPORT type
-#    if defined(HAVE_VISIBILITY)
-#        define WXDLLIMPEXP_INLINE_CORE WXIMPORT
-#    else
-#        define WXDLLIMPEXP_INLINE_CORE
-#    endif
 #else /* not making nor using DLL */
 #    define WXDLLIMPEXP_CORE
 #    define WXDLLIMPEXP_DATA_CORE(type) type
-#    define WXDLLIMPEXP_INLINE_CORE
 #endif
 
 #ifdef WXMAKINGDLL_ADV
@@ -170,6 +137,17 @@
 #    define WXDLLIMPEXP_DATA_ADV(type) type
 #endif
 
+#ifdef WXMAKINGDLL_ODBC
+#    define WXDLLIMPEXP_ODBC WXEXPORT
+#    define WXDLLIMPEXP_DATA_ODBC(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_ODBC WXIMPORT
+#    define WXDLLIMPEXP_DATA_ODBC(type) WXIMPORT type
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_ODBC
+#    define WXDLLIMPEXP_DATA_ODBC(type) type
+#endif
+
 #ifdef WXMAKINGDLL_QA
 #    define WXDLLIMPEXP_QA WXEXPORT
 #    define WXDLLIMPEXP_DATA_QA(type) WXEXPORT type
@@ -181,6 +159,17 @@
 #    define WXDLLIMPEXP_DATA_QA(type) type
 #endif
 
+#ifdef WXMAKINGDLL_DBGRID
+#    define WXDLLIMPEXP_DBGRID WXEXPORT
+#    define WXDLLIMPEXP_DATA_DBGRID(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_DBGRID WXIMPORT
+#    define WXDLLIMPEXP_DATA_DBGRID(type) WXIMPORT type
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_DBGRID
+#    define WXDLLIMPEXP_DATA_DBGRID(type) type
+#endif
+
 #ifdef WXMAKINGDLL_HTML
 #    define WXDLLIMPEXP_HTML WXEXPORT
 #    define WXDLLIMPEXP_DATA_HTML(type) WXEXPORT type
@@ -224,25 +213,6 @@
 #    define WXDLLIMPEXP_AUI
 #endif
 
-#ifdef WXMAKINGDLL_RIBBON
-#    define WXDLLIMPEXP_RIBBON WXEXPORT
-#elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_RIBBON WXIMPORT
-#else /* not making nor using DLL */
-#    define WXDLLIMPEXP_RIBBON
-#endif
-
-#ifdef WXMAKINGDLL_PROPGRID
-#    define WXDLLIMPEXP_PROPGRID WXEXPORT
-#    define WXDLLIMPEXP_DATA_PROPGRID(type) WXEXPORT type
-#elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_PROPGRID WXIMPORT
-#    define WXDLLIMPEXP_DATA_PROPGRID(type) WXIMPORT type
-#else /* not making nor using DLL */
-#    define WXDLLIMPEXP_PROPGRID
-#    define WXDLLIMPEXP_DATA_PROPGRID(type) type
-#endif
-
 #ifdef WXMAKINGDLL_RICHTEXT
 #    define WXDLLIMPEXP_RICHTEXT WXEXPORT
 #elif defined(WXUSINGDLL)
@@ -259,35 +229,19 @@
 #    define WXDLLIMPEXP_MEDIA
 #endif
 
-#ifdef WXMAKINGDLL_STC
-#    define WXDLLIMPEXP_STC WXEXPORT
-#    define WXDLLIMPEXP_DATA_STC(type) WXEXPORT type
-#elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_STC WXIMPORT
-#    define WXDLLIMPEXP_DATA_STC(type) WXIMPORT type
-#else /* not making nor using DLL */
-#    define WXDLLIMPEXP_STC
-#    define WXDLLIMPEXP_DATA_STC(type) type
-#endif
+/* for backwards compatibility, define suffix-less versions too */
+#define WXDLLEXPORT WXDLLIMPEXP_CORE
+#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE
 
-#ifdef WXMAKINGDLL_WEBVIEW
-#    define WXDLLIMPEXP_WEBVIEW WXEXPORT
-#    define WXDLLIMPEXP_DATA_WEBVIEW(type) WXEXPORT type
-#elif defined(WXUSINGDLL)
-#    define WXDLLIMPEXP_WEBVIEW WXIMPORT
-#    define WXDLLIMPEXP_DATA_WEBVIEW(type) WXIMPORT type
-#else /* not making nor using DLL */
-#    define WXDLLIMPEXP_WEBVIEW
-#    define WXDLLIMPEXP_DATA_WEBVIEW(type) type
-#endif
-
-/*
+/* wx-2.9 introduces new macros for forward declarations, include them
+ * here for forward compatibility:
+ 
    GCC warns about using __attribute__ (and also __declspec in mingw32 case) on
    forward declarations while MSVC complains about forward declarations without
    __declspec for the classes later declared with it, so we need a separate set
    of macros for forward declarations to hide this difference:
  */
-#if defined(HAVE_VISIBILITY) || (defined(__WINDOWS__) && defined(__GNUC__))
+#if defined(__WINDOWS__) && defined(__GNUC__)
     #define WXDLLIMPEXP_FWD_BASE
     #define WXDLLIMPEXP_FWD_NET
     #define WXDLLIMPEXP_FWD_CORE
@@ -298,11 +252,9 @@
     #define WXDLLIMPEXP_FWD_XML
     #define WXDLLIMPEXP_FWD_XRC
     #define WXDLLIMPEXP_FWD_AUI
-    #define WXDLLIMPEXP_FWD_PROPGRID
     #define WXDLLIMPEXP_FWD_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA
     #define WXDLLIMPEXP_FWD_STC
-    #define WXDLLIMPEXP_FWD_WEBVIEW
 #else
     #define WXDLLIMPEXP_FWD_BASE      WXDLLIMPEXP_BASE
     #define WXDLLIMPEXP_FWD_NET       WXDLLIMPEXP_NET
@@ -314,50 +266,10 @@
     #define WXDLLIMPEXP_FWD_XML       WXDLLIMPEXP_XML
     #define WXDLLIMPEXP_FWD_XRC       WXDLLIMPEXP_XRC
     #define WXDLLIMPEXP_FWD_AUI       WXDLLIMPEXP_AUI
-    #define WXDLLIMPEXP_FWD_PROPGRID  WXDLLIMPEXP_PROPGRID
     #define WXDLLIMPEXP_FWD_RICHTEXT  WXDLLIMPEXP_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA     WXDLLIMPEXP_MEDIA
     #define WXDLLIMPEXP_FWD_STC       WXDLLIMPEXP_STC
-    #define WXDLLIMPEXP_FWD_WEBVIEW   WXDLLIMPEXP_WEBVIEW
 #endif
 
-/* for backwards compatibility, define suffix-less versions too */
-#define WXDLLEXPORT WXDLLIMPEXP_CORE
-#define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE
-
-/*
-   MSVC up to 6.0 needs to be explicitly told to export template instantiations
-   used by the DLL clients, use this macro to do it like this:
-
-       template <typename T> class Foo { ... };
-       WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( Foo<int> )
-
-   (notice that currently we only need this for wxBase and wxCore libraries)
- */
-#if defined(__VISUALC__) && (__VISUALC__ <= 1200)
-    #ifdef WXMAKINGDLL_BASE
-        #define WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE(decl) \
-            template class WXDLLIMPEXP_BASE decl;
-        #define WXDLLIMPEXP_TEMPLATE_INSTANCE_CORE(decl) \
-            template class WXDLLIMPEXP_CORE decl;
-    #else
-        /*
-           We need to disable this warning when using this macro, as
-           recommended by Microsoft itself:
-
-           http://support.microsoft.com/default.aspx?scid=kb%3ben-us%3b168958
-         */
-        #pragma warning(disable:4231)
-
-        #define WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE(decl) \
-            extern template class WXDLLIMPEXP_BASE decl;
-        #define WXDLLIMPEXP_TEMPLATE_INSTANCE_CORE(decl) \
-            extern template class WXDLLIMPEXP_CORE decl;
-    #endif
-#else /* not VC <= 6 */
-    #define WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE(decl)
-    #define WXDLLIMPEXP_TEMPLATE_INSTANCE_CORE(decl)
-#endif /* VC6/others */
-
 #endif /* _WX_DLIMPEXP_H_ */
 
diff --git a/Source/3rd Party/wx/include/wx/dlist.h b/Source/3rd Party/wx/include/wx/dlist.h
deleted file mode 100644
index 1948b877a..000000000
--- a/Source/3rd Party/wx/include/wx/dlist.h	
+++ /dev/null
@@ -1,850 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/dlist.h
-// Purpose:     wxDList<T> which is a template version of wxList
-// Author:      Robert Roebling
-// Created:     18.09.2008
-// Copyright:   (c) 2008 wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DLIST_H_
-#define _WX_DLIST_H_
-
-#include "wx/defs.h"
-#include "wx/utils.h"
-
-#if wxUSE_STD_CONTAINERS
-
-#include "wx/beforestd.h"
-#include <algorithm>
-#include <iterator>
-#include <list>
-#include "wx/afterstd.h"
-
-template<typename T>
-class wxDList: public std::list<T*>
-{
-private:
-    bool m_destroy;
-    typedef std::list<T*> BaseListType;
-    typedef wxDList<T> ListType;
-
-public:
-    typedef typename BaseListType::iterator iterator;
-
-    class compatibility_iterator
-    {
-    private:
-        /* Workaround for broken VC6 nested class name resolution */
-        typedef typename BaseListType::iterator iterator;
-        friend class wxDList<T>;
-
-        iterator m_iter;
-        ListType *m_list;
-
-    public:
-        compatibility_iterator()
-            : m_iter(), m_list( NULL ) {}
-        compatibility_iterator( ListType* li, iterator i )
-            : m_iter( i ), m_list( li ) {}
-        compatibility_iterator( const ListType* li, iterator i )
-            : m_iter( i ), m_list( const_cast<ListType*>(li) ) {}
-
-        compatibility_iterator* operator->() { return this; }
-        const compatibility_iterator* operator->() const { return this; }
-
-        bool operator==(const compatibility_iterator& i) const
-        {
-            wxASSERT_MSG( m_list && i.m_list,
-                          "comparing invalid iterators is illegal" );
-            return (m_list == i.m_list) && (m_iter == i.m_iter);
-        }
-        bool operator!=(const compatibility_iterator& i) const
-            { return !( operator==( i ) ); }
-        operator bool() const
-            { return m_list ? m_iter != m_list->end() : false; }
-        bool operator !() const
-            { return !( operator bool() ); }
-
-        T* GetData() const { return *m_iter; }
-        void SetData( T* e ) { *m_iter = e; }
-
-        compatibility_iterator GetNext() const
-        {
-            iterator i = m_iter;
-            return compatibility_iterator( m_list, ++i );
-        }
-
-        compatibility_iterator GetPrevious() const
-        {
-            if ( m_iter == m_list->begin() )
-                return compatibility_iterator();
-
-            iterator i = m_iter;
-            return compatibility_iterator( m_list, --i );
-        }
-
-        int IndexOf() const
-        {
-            return *this ? std::distance( m_list->begin(), m_iter )
-                : wxNOT_FOUND;
-        }
-    };
-
-public:
-    wxDList() : m_destroy( false ) {}
-
-    ~wxDList() { Clear(); }
-
-    compatibility_iterator Find( const T* e ) const
-    {
-        return compatibility_iterator( this,
-                std::find( const_cast<ListType*>(this)->begin(),
-                           const_cast<ListType*>(this)->end(), e ) );
-    }
-
-    bool IsEmpty() const
-        { return this->empty(); }
-    size_t GetCount() const
-        { return this->size(); }
-
-    compatibility_iterator Item( size_t idx ) const
-    {
-        iterator i = const_cast<ListType*>(this)->begin();
-        std::advance( i, idx );
-        return compatibility_iterator( this, i );
-    }
-
-    T* operator[](size_t idx) const
-    {
-        return Item(idx).GetData();
-    }
-
-    compatibility_iterator GetFirst() const
-    {
-        return compatibility_iterator( this, const_cast<ListType*>(this)->begin() );
-    }
-    compatibility_iterator GetLast() const
-    {
-        iterator i = const_cast<ListType*>(this)->end();
-        return compatibility_iterator( this, !(this->empty()) ? --i : i );
-    }
-    compatibility_iterator Member( T* e ) const
-        { return Find( e ); }
-    compatibility_iterator Nth( int n ) const
-        { return Item( n ); }
-    int IndexOf( T* e ) const
-        { return Find( e ).IndexOf(); }
-
-    compatibility_iterator Append( T* e )
-    {
-        this->push_back( e );
-        return GetLast();
-    }
-
-    compatibility_iterator Insert( T* e )
-    {
-        this->push_front( e );
-        return compatibility_iterator( this, this->begin() );
-    }
-
-    compatibility_iterator Insert( compatibility_iterator & i, T* e )
-    {
-        return compatibility_iterator( this, this->insert( i.m_iter, e ) );
-    }
-
-    compatibility_iterator Insert( size_t idx, T* e )
-    {
-        return compatibility_iterator( this,
-                this->insert( Item( idx ).m_iter, e ) );
-    }
-
-    void DeleteContents( bool destroy )
-        { m_destroy = destroy; }
-
-    bool GetDeleteContents() const
-        { return m_destroy; }
-
-    void Erase( const compatibility_iterator& i )
-    {
-        if ( m_destroy )
-            delete i->GetData();
-        this->erase( i.m_iter );
-    }
-
-    bool DeleteNode( const compatibility_iterator& i )
-    {
-        if( i )
-        {
-            Erase( i );
-            return true;
-        }
-        return false;
-    }
-
-    bool DeleteObject( T* e )
-    {
-        return DeleteNode( Find( e ) );
-    }
-
-    void Clear()
-    {
-        if ( m_destroy )
-        {
-            iterator it, en;
-            for ( it = this->begin(), en = this->end(); it != en; ++it )
-                delete *it;
-        }
-        this->clear();
-    }
-};
-
-#else  // !wxUSE_STD_CONTAINERS
-
-template <typename T>
-class wxDList
-{
-public:
-    class Node
-    {
-    public:
-        Node(wxDList<T> *list = NULL,
-             Node *previous = NULL,
-             Node *next = NULL,
-             T *data = NULL)
-        {
-            m_list = list;
-            m_previous = previous;
-            m_next = next;
-            m_data = data;
-            if (previous)
-                previous->m_next = this;
-            if (next)
-                next->m_previous = this;
-        }
-
-        ~Node()
-        {
-            // handle the case when we're being deleted from the list by
-            // the user (i.e. not by the list itself from DeleteNode) -
-            // we must do it for compatibility with old code
-            if (m_list != NULL)
-                m_list->DetachNode(this);
-        }
-
-        void DeleteData()
-        {
-            delete m_data;
-        }
-
-        Node *GetNext() const      { return m_next; }
-        Node *GetPrevious() const  { return m_previous; }
-        T *GetData() const         { return m_data; }
-        T **GetDataPtr() const     { return &(wx_const_cast(nodetype*,this)->m_data); }
-        void SetData( T *data )    { m_data = data; }
-
-        int IndexOf() const
-        {
-            wxCHECK_MSG( m_list, wxNOT_FOUND,
-                         "node doesn't belong to a list in IndexOf" );
-
-            int i;
-            Node *prev = m_previous;
-            for( i = 0; prev; i++ )
-                prev = prev->m_previous;
-            return i;
-        }
-
-    private:
-        T           *m_data;        // user data
-        Node        *m_next,        // next and previous nodes in the list
-                    *m_previous;
-        wxDList<T>   *m_list;         // list we belong to
-
-        friend class wxDList<T>;
-    };
-
-    typedef Node nodetype;
-
-    class compatibility_iterator
-    {
-    public:
-        compatibility_iterator(nodetype *ptr = NULL) : m_ptr(ptr) { }
-        nodetype *operator->() const { return m_ptr; }
-        operator nodetype *() const  { return m_ptr; }
-
-    private:
-        nodetype *m_ptr;
-    };
-
-private:
-    void Init()
-    {
-        m_nodeFirst =
-        m_nodeLast = NULL;
-        m_count = 0;
-        m_destroy = false;
-    }
-
-    void DoDeleteNode( nodetype *node )
-    {
-        if ( m_destroy )
-            node->DeleteData();
-        // so that the node knows that it's being deleted by the list
-        node->m_list = NULL;
-        delete node;
-    }
-
-    size_t m_count;             // number of elements in the list
-    bool m_destroy;             // destroy user data when deleting list items?
-    nodetype *m_nodeFirst,      // pointers to the head and tail of the list
-             *m_nodeLast;
-
-public:
-    wxDList()
-    {
-        Init();
-    }
-
-    wxDList( const wxDList<T>& list )
-    {
-        Init();
-        Assign(list);
-    }
-
-    wxDList( size_t count, T *elements[] )
-    {
-        Init();
-        size_t n;
-        for (n = 0; n < count; n++)
-            Append( elements[n] );
-    }
-
-    wxDList& operator=( const wxDList<T>& list )
-    {
-        if (&list != this)
-            Assign(list);
-        return *this;
-    }
-
-    ~wxDList()
-    {
-        nodetype *each = m_nodeFirst;
-        while ( each != NULL )
-        {
-            nodetype *next = each->GetNext();
-                DoDeleteNode(each);
-            each = next;
-        }
-    }
-
-    void Assign(const wxDList<T> &list)
-    {
-        wxASSERT_MSG( !list.m_destroy,
-                      "copying list which owns it's elements is a bad idea" );
-        Clear();
-        m_destroy = list.m_destroy;
-        m_nodeFirst = NULL;
-        m_nodeLast = NULL;
-        nodetype* node;
-        for (node = list.GetFirst(); node; node = node->GetNext() )
-            Append(node->GetData());
-        wxASSERT_MSG( m_count == list.m_count, "logic error in Assign()" );
-    }
-
-    nodetype *Append( T *object )
-    {
-        nodetype *node = new nodetype( this, m_nodeLast, NULL, object );
-
-        if ( !m_nodeFirst )
-        {
-            m_nodeFirst = node;
-            m_nodeLast = m_nodeFirst;
-        }
-        else
-        {
-            m_nodeLast->m_next = node;
-            m_nodeLast = node;
-        }
-        m_count++;
-        return node;
-    }
-
-    nodetype *Insert( T* object )
-    {
-        return Insert( NULL, object );
-    }
-
-    nodetype *Insert( size_t pos, T* object )
-    {
-        if (pos == m_count)
-            return Append( object );
-        else
-            return Insert( Item(pos), object );
-    }
-
-    nodetype *Insert( nodetype *position, T* object )
-    {
-        wxCHECK_MSG( !position || position->m_list == this, NULL,
-                     "can't insert before a node from another list" );
-
-        // previous and next node for the node being inserted
-        nodetype *prev, *next;
-        if ( position )
-        {
-           prev = position->GetPrevious();
-           next = position;
-        }
-        else
-        {
-            // inserting in the beginning of the list
-            prev = NULL;
-            next = m_nodeFirst;
-        }
-        nodetype *node = new nodetype( this, prev, next, object );
-        if ( !m_nodeFirst )
-            m_nodeLast = node;
-        if ( prev == NULL )
-            m_nodeFirst = node;
-        m_count++;
-        return node;
-    }
-
-    nodetype *GetFirst() const { return m_nodeFirst; }
-    nodetype *GetLast() const { return m_nodeLast; }
-    size_t GetCount() const { return m_count; }
-    bool IsEmpty() const { return m_count == 0; }
-
-    void DeleteContents(bool destroy) { m_destroy = destroy; }
-    bool GetDeleteContents() const { return m_destroy; }
-
-    nodetype *Item(size_t index) const
-    {
-        for ( nodetype *current = GetFirst(); current; current = current->GetNext() )
-        {
-            if ( index-- == 0 )
-               return current;
-        }
-        wxFAIL_MSG( "invalid index in Item()" );
-        return NULL;
-    }
-
-    T *operator[](size_t index) const
-    {
-        nodetype *node = Item(index);
-        return node ? node->GetData() : NULL;
-    }
-
-    nodetype *DetachNode( nodetype *node )
-    {
-        wxCHECK_MSG( node, NULL, "detaching NULL wxNodeBase" );
-        wxCHECK_MSG( node->m_list == this, NULL,
-                     "detaching node which is not from this list" );
-        // update the list
-        nodetype **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next
-                                                  : &m_nodeFirst;
-        nodetype **nextPrev = node->GetNext() ? &node->GetNext()->m_previous
-                                              : &m_nodeLast;
-        *prevNext = node->GetNext();
-        *nextPrev = node->GetPrevious();
-        m_count--;
-        // mark the node as not belonging to this list any more
-        node->m_list = NULL;
-        return node;
-    }
-
-    void Erase( nodetype *node )
-    {
-         DeleteNode(node);
-    }
-
-    bool DeleteNode( nodetype *node )
-    {
-        if ( !DetachNode(node) )
-           return false;
-        DoDeleteNode(node);
-        return true;
-    }
-
-    bool DeleteObject( T *object )
-    {
-        for ( nodetype *current = GetFirst(); current; current = current->GetNext() )
-        {
-            if ( current->GetData() == object )
-            {
-                DeleteNode(current);
-                return true;
-            }
-        }
-        // not found
-        return false;
-    }
-
-    nodetype *Find(const T *object) const
-    {
-        for ( nodetype *current = GetFirst(); current; current = current->GetNext() )
-        {
-            if ( current->GetData() == object )
-                return current;
-        }
-        // not found
-        return NULL;
-    }
-
-    int IndexOf(const T *object) const
-    {
-        int n = 0;
-        for ( nodetype *current = GetFirst(); current; current = current->GetNext() )
-        {
-            if ( current->GetData() == object )
-                return n;
-            n++;
-        }
-        return wxNOT_FOUND;
-    }
-
-    void Clear()
-    {
-        nodetype *current = m_nodeFirst;
-        while ( current )
-        {
-            nodetype *next = current->GetNext();
-            DoDeleteNode(current);
-            current = next;
-        }
-        m_nodeFirst =
-        m_nodeLast = NULL;
-        m_count = 0;
-    }
-
-    void Reverse()
-    {
-        nodetype * node = m_nodeFirst;
-        nodetype* tmp;
-        while (node)
-        {
-            // swap prev and next pointers
-            tmp = node->m_next;
-            node->m_next = node->m_previous;
-            node->m_previous = tmp;
-            // this is the node that was next before swapping
-            node = tmp;
-        }
-        // swap first and last node
-        tmp = m_nodeFirst; m_nodeFirst = m_nodeLast; m_nodeLast = tmp;
-    }
-
-    void DeleteNodes(nodetype* first, nodetype* last)
-    {
-        nodetype * node = first;
-        while (node != last)
-        {
-            nodetype* next = node->GetNext();
-            DeleteNode(node);
-            node = next;
-        }
-    }
-
-    void ForEach(wxListIterateFunction F)
-    {
-        for ( nodetype *current = GetFirst(); current; current = current->GetNext() )
-            (*F)(current->GetData());
-    }
-
-    T *FirstThat(wxListIterateFunction F)
-    {
-        for ( nodetype *current = GetFirst(); current; current = current->GetNext() )
-        {
-            if ( (*F)(current->GetData()) )
-                return current->GetData();
-        }
-        return NULL;
-    }
-
-    T *LastThat(wxListIterateFunction F)
-    {
-        for ( nodetype *current = GetLast(); current; current = current->GetPrevious() )
-        {
-            if ( (*F)(current->GetData()) )
-                return current->GetData();
-        }
-        return NULL;
-    }
-
-    /* STL interface */
-public:
-    typedef size_t size_type;
-    typedef int difference_type;
-    typedef T* value_type;
-    typedef value_type& reference;
-    typedef const value_type& const_reference;
-
-    class iterator
-    {
-    public:
-        typedef nodetype Node;
-        typedef iterator itor;
-        typedef T* value_type;
-        typedef value_type* ptr_type;
-        typedef value_type& reference;
-
-        Node* m_node;
-        Node* m_init;
-    public:
-        typedef reference reference_type;
-        typedef ptr_type pointer_type;
-
-        iterator(Node* node, Node* init) : m_node(node), m_init(init) {}
-        iterator() : m_node(NULL), m_init(NULL) { }
-        reference_type operator*() const
-            { return *m_node->GetDataPtr(); }
-        // ptrop
-        itor& operator++() { m_node = m_node->GetNext(); return *this; }
-        const itor operator++(int)
-            { itor tmp = *this; m_node = m_node->GetNext(); return tmp; }
-        itor& operator--()
-        {
-            m_node = m_node ? m_node->GetPrevious() : m_init;
-            return *this;
-        }
-        const itor operator--(int)
-        {
-            itor tmp = *this;
-            m_node = m_node ? m_node->GetPrevious() : m_init;
-            return tmp;
-        }
-        bool operator!=(const itor& it) const
-            { return it.m_node != m_node; }
-        bool operator==(const itor& it) const
-            { return it.m_node == m_node; }
-    };
-    class const_iterator
-    {
-    public:
-        typedef nodetype Node;
-        typedef T* value_type;
-        typedef const value_type& const_reference;
-        typedef const_iterator itor;
-        typedef value_type* ptr_type;
-
-        Node* m_node;
-        Node* m_init;
-    public:
-        typedef const_reference reference_type;
-        typedef const ptr_type pointer_type;
-
-        const_iterator(Node* node, Node* init)
-            : m_node(node), m_init(init) { }
-        const_iterator() : m_node(NULL), m_init(NULL) { }
-        const_iterator(const iterator& it)
-            : m_node(it.m_node), m_init(it.m_init) { }
-        reference_type operator*() const
-            { return *m_node->GetDataPtr(); }
-        // ptrop
-        itor& operator++() { m_node = m_node->GetNext(); return *this; }
-        const itor operator++(int)
-            { itor tmp = *this; m_node = m_node->GetNext(); return tmp; }
-        itor& operator--()
-        {
-            m_node = m_node ? m_node->GetPrevious() : m_init;
-            return *this;
-        }
-        const itor operator--(int)
-        {
-            itor tmp = *this;
-            m_node = m_node ? m_node->GetPrevious() : m_init;
-            return tmp;
-        }
-        bool operator!=(const itor& it) const
-            { return it.m_node != m_node; }
-        bool operator==(const itor& it) const
-            { return it.m_node == m_node; }
-    };
-
-    class reverse_iterator
-    {
-    public:
-        typedef nodetype Node;
-        typedef T* value_type;
-        typedef reverse_iterator itor;
-        typedef value_type* ptr_type;
-        typedef value_type& reference;
-
-        Node* m_node;
-        Node* m_init;
-    public:
-        typedef reference reference_type;
-        typedef ptr_type pointer_type;
-
-        reverse_iterator(Node* node, Node* init)
-            : m_node(node), m_init(init) { }
-        reverse_iterator() : m_node(NULL), m_init(NULL) { }
-        reference_type operator*() const
-            { return *m_node->GetDataPtr(); }
-        // ptrop
-        itor& operator++()
-            { m_node = m_node->GetPrevious(); return *this; }
-        const itor operator++(int)
-        { itor tmp = *this; m_node = m_node->GetPrevious(); return tmp; }
-        itor& operator--()
-        { m_node = m_node ? m_node->GetNext() : m_init; return *this; }
-        const itor operator--(int)
-        {
-            itor tmp = *this;
-            m_node = m_node ? m_node->GetNext() : m_init;
-            return tmp;
-        }
-        bool operator!=(const itor& it) const
-            { return it.m_node != m_node; }
-        bool operator==(const itor& it) const
-            { return it.m_node == m_node; }
-    };
-
-    class const_reverse_iterator
-    {
-    public:
-        typedef nodetype Node;
-        typedef T* value_type;
-        typedef const_reverse_iterator itor;
-        typedef value_type* ptr_type;
-        typedef const value_type& const_reference;
-
-        Node* m_node;
-        Node* m_init;
-    public:
-        typedef const_reference reference_type;
-        typedef const ptr_type pointer_type;
-
-        const_reverse_iterator(Node* node, Node* init)
-            : m_node(node), m_init(init) { }
-        const_reverse_iterator() : m_node(NULL), m_init(NULL) { }
-        const_reverse_iterator(const reverse_iterator& it)
-            : m_node(it.m_node), m_init(it.m_init) { }
-        reference_type operator*() const
-            { return *m_node->GetDataPtr(); }
-        // ptrop
-        itor& operator++()
-            { m_node = m_node->GetPrevious(); return *this; }
-        const itor operator++(int)
-        { itor tmp = *this; m_node = m_node->GetPrevious(); return tmp; }
-        itor& operator--()
-            { m_node = m_node ? m_node->GetNext() : m_init; return *this;}
-        const itor operator--(int)
-        {
-            itor tmp = *this;
-            m_node = m_node ? m_node->GetNext() : m_init;
-            return tmp;
-        }
-        bool operator!=(const itor& it) const
-            { return it.m_node != m_node; }
-        bool operator==(const itor& it) const
-            { return it.m_node == m_node; }
-    };
-
-    wxEXPLICIT wxDList(size_type n, const_reference v = value_type())
-        { assign(n, v); }
-    wxDList(const const_iterator& first, const const_iterator& last)
-        { assign(first, last); }
-    iterator begin() { return iterator(GetFirst(), GetLast()); }
-    const_iterator begin() const
-        { return const_iterator(GetFirst(), GetLast()); }
-    iterator end() { return iterator(NULL, GetLast()); }
-    const_iterator end() const { return const_iterator(NULL, GetLast()); }
-    reverse_iterator rbegin()
-        { return reverse_iterator(GetLast(), GetFirst()); }
-    const_reverse_iterator rbegin() const
-        { return const_reverse_iterator(GetLast(), GetFirst()); }
-    reverse_iterator rend() { return reverse_iterator(NULL, GetFirst()); }
-    const_reverse_iterator rend() const
-        { return const_reverse_iterator(NULL, GetFirst()); }
-    void resize(size_type n, value_type v = value_type())
-    {
-        while (n < size())
-            pop_back();
-        while (n > size())
-            push_back(v);
-    }
-    size_type size() const { return GetCount(); }
-    size_type max_size() const { return INT_MAX; }
-    bool empty() const { return IsEmpty(); }
-    reference front() { return *begin(); }
-    const_reference front() const { return *begin(); }
-    reference back() { iterator tmp = end(); return *--tmp; }
-    const_reference back() const { const_iterator tmp = end(); return *--tmp; }
-    void push_front(const_reference v = value_type())
-        { Insert(GetFirst(), v); }
-    void pop_front() { DeleteNode(GetFirst()); }
-    void push_back(const_reference v = value_type())
-        { Append( v ); }
-    void pop_back() { DeleteNode(GetLast()); }
-    void assign(const_iterator first, const const_iterator& last)
-    {
-        clear();
-        for(; first != last; ++first)
-            Append(*first);
-    }
-    void assign(size_type n, const_reference v = value_type())
-    {
-        clear();
-        for(size_type i = 0; i < n; ++i)
-            Append(v);
-    }
-    iterator insert(const iterator& it, const_reference v)
-    {
-        if (it == end())
-            Append( v );
-        else
-            Insert(it.m_node,v);
-        iterator itprev(it);
-        return itprev--;
-    }
-    void insert(const iterator& it, size_type n, const_reference v)
-    {
-        for(size_type i = 0; i < n; ++i)
-            Insert(it.m_node, v);
-    }
-    void insert(const iterator& it, const_iterator first, const const_iterator& last)
-    {
-        for(; first != last; ++first)
-            Insert(it.m_node, *first);
-    }
-    iterator erase(const iterator& it)
-    {
-        iterator next = iterator(it.m_node->GetNext(), GetLast());
-        DeleteNode(it.m_node); return next;
-    }
-    iterator erase(const iterator& first, const iterator& last)
-    {
-        iterator next = last; ++next;
-        DeleteNodes(first.m_node, last.m_node);
-        return next;
-    }
-    void clear() { Clear(); }
-    void splice(const iterator& it, wxDList<T>& l, const iterator& first, const iterator& last)
-        { insert(it, first, last); l.erase(first, last); }
-    void splice(const iterator& it, wxDList<T>& l)
-        { splice(it, l, l.begin(), l.end() ); }
-    void splice(const iterator& it, wxDList<T>& l, const iterator& first)
-    {
-        iterator tmp = first; ++tmp;
-        if(it == first || it == tmp) return;
-        insert(it, *first);
-        l.erase(first);
-    }
-    void remove(const_reference v)
-        { DeleteObject(v); }
-    void reverse()
-        { Reverse(); }
- /* void swap(list<T>& l)
-    {
-        { size_t t = m_count; m_count = l.m_count; l.m_count = t; }
-        { bool t = m_destroy; m_destroy = l.m_destroy; l.m_destroy = t; }
-        { wxNodeBase* t = m_nodeFirst; m_nodeFirst = l.m_nodeFirst; l.m_nodeFirst = t; }
-        { wxNodeBase* t = m_nodeLast; m_nodeLast = l.m_nodeLast; l.m_nodeLast = t; }
-        { wxKeyType t = m_keyType; m_keyType = l.m_keyType; l.m_keyType = t; }
-    } */
-};
-
-#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
-
-#endif // _WX_DLIST_H_
diff --git a/Source/3rd Party/wx/include/wx/dnd.h b/Source/3rd Party/wx/include/wx/dnd.h
index 017745a3c..62dbac117 100644
--- a/Source/3rd Party/wx/include/wx/dnd.h	
+++ b/Source/3rd Party/wx/include/wx/dnd.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin, Robert Roebling
 // Modified by:
 // Created:     26.05.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dnd.h 43636 2006-11-25 14:08:27Z VZ $
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -47,14 +47,14 @@ enum wxDragResult
 
 // return true if res indicates that something was done during a dnd operation,
 // i.e. is neither error nor none nor cancel
-WXDLLIMPEXP_CORE bool wxIsDragResultOk(wxDragResult res);
+WXDLLEXPORT bool wxIsDragResultOk(wxDragResult res);
 
 // ----------------------------------------------------------------------------
 // wxDropSource is the object you need to create (and call DoDragDrop on it)
 // to initiate a drag-and-drop operation
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDropSourceBase
+class WXDLLEXPORT wxDropSourceBase
 {
 public:
     wxDropSourceBase(const wxCursor &cursorCopy = wxNullCursor,
@@ -63,7 +63,7 @@ public:
         : m_cursorCopy(cursorCopy),
           m_cursorMove(cursorMove),
           m_cursorStop(cursorStop)
-        { m_data = NULL; }
+        { m_data = (wxDataObject *)NULL; }
     virtual ~wxDropSourceBase() { }
 
     // set the data which is transfered by drag and drop
@@ -115,7 +115,7 @@ protected:
              m_cursorMove,
              m_cursorStop;
 
-    wxDECLARE_NO_COPY_CLASS(wxDropSourceBase);
+    DECLARE_NO_COPY_CLASS(wxDropSourceBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -129,13 +129,13 @@ protected:
 // OnData() is called)
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDropTargetBase
+class WXDLLEXPORT wxDropTargetBase
 {
 public:
     // ctor takes a pointer to heap-allocated wxDataObject which will be owned
     // by wxDropTarget and deleted by it automatically. If you don't give it
     // here, you can use SetDataObject() later.
-    wxDropTargetBase(wxDataObject *dataObject = NULL)
+    wxDropTargetBase(wxDataObject *dataObject = (wxDataObject*)NULL)
         { m_dataObject = dataObject; m_defaultAction = wxDragNone; }
     // dtor deletes our data object
     virtual ~wxDropTargetBase()
@@ -203,7 +203,7 @@ protected:
     wxDataObject *m_dataObject;
     wxDragResult m_defaultAction;
 
-    wxDECLARE_NO_COPY_CLASS(wxDropTargetBase);
+    DECLARE_NO_COPY_CLASS(wxDropTargetBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -222,7 +222,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/dnd.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/dnd.h"
+    #include "wx/mac/dnd.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dnd.h"
 #endif
@@ -233,7 +233,7 @@ protected:
 
 // A simple wxDropTarget derived class for text data: you only need to
 // override OnDropText() to get something working
-class WXDLLIMPEXP_CORE wxTextDropTarget : public wxDropTarget
+class WXDLLEXPORT wxTextDropTarget : public wxDropTarget
 {
 public:
     wxTextDropTarget();
@@ -243,11 +243,11 @@ public:
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxTextDropTarget);
+    DECLARE_NO_COPY_CLASS(wxTextDropTarget)
 };
 
 // A drop target which accepts files (dragged from File Manager or Explorer)
-class WXDLLIMPEXP_CORE wxFileDropTarget : public wxDropTarget
+class WXDLLEXPORT wxFileDropTarget : public wxDropTarget
 {
 public:
     wxFileDropTarget();
@@ -259,7 +259,7 @@ public:
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxFileDropTarget);
+    DECLARE_NO_COPY_CLASS(wxFileDropTarget)
 };
 
 #endif // wxUSE_DRAG_AND_DROP
diff --git a/Source/3rd Party/wx/include/wx/docmdi.h b/Source/3rd Party/wx/include/wx/docmdi.h
index 911e0dd7f..d4d7fcfed 100644
--- a/Source/3rd Party/wx/include/wx/docmdi.h	
+++ b/Source/3rd Party/wx/include/wx/docmdi.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/docmdi.h
+// Name:        docmdi.h
 // Purpose:     Frame classes for MDI document/view applications
 // Author:      Julian Smart
+// Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) 1997 Julian Smart
-//              (c) 2010 Vadim Zeitlin
+// RCS-ID:      $Id: docmdi.h 41020 2006-09-05 20:47:48Z VZ $
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -19,83 +19,89 @@
 #include "wx/docview.h"
 #include "wx/mdi.h"
 
-#ifdef __VISUALC6__
-    // "non dll-interface class 'wxDocXXXFrameAny<>' used as base interface for
-    // dll-interface class 'wxDocMDIXXXFrame'" -- this is bogus as the template
-    // will be DLL-exported but only once it is used as base class here!
-    #pragma warning (push)
-    #pragma warning (disable:4275)
-#endif
+/*
+ * Use this instead of wxMDIParentFrame
+ */
 
-// Define MDI versions of the doc-view frame classes. Note that we need to
-// define them as classes for wxRTTI, otherwise we could simply define them as
-// typedefs.
-
-// ----------------------------------------------------------------------------
-// An MDI document parent frame
-// ----------------------------------------------------------------------------
-
-typedef
-  wxDocParentFrameAny<wxMDIParentFrame> wxDocMDIParentFrameBase;
-
-class WXDLLIMPEXP_CORE wxDocMDIParentFrame : public wxDocMDIParentFrameBase
+class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame
 {
 public:
-    wxDocMDIParentFrame() : wxDocMDIParentFrameBase() { }
+    wxDocMDIParentFrame();
+    wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
+        const wxString& title, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
 
-    wxDocMDIParentFrame(wxDocManager *manager,
-                        wxFrame *parent,
-                        wxWindowID id,
-                        const wxString& title,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
-        : wxDocMDIParentFrameBase(manager,
-                                  parent, id, title, pos, size, style, name)
-    {
-    }
+    bool Create(wxDocManager *manager, wxFrame *parent, wxWindowID id,
+        const wxString& title, const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
+
+    // Extend event processing to search the document manager's event table
+    virtual bool ProcessEvent(wxEvent& event);
+
+    wxDocManager *GetDocumentManager(void) const { return m_docManager; }
+
+    void OnExit(wxCommandEvent& event);
+    void OnMRUFile(wxCommandEvent& event);
+    void OnCloseWindow(wxCloseEvent& event);
+
+protected:
+    void Init();
+    wxDocManager *m_docManager;
 
 private:
     DECLARE_CLASS(wxDocMDIParentFrame)
-    wxDECLARE_NO_COPY_CLASS(wxDocMDIParentFrame);
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDocMDIParentFrame)
 };
 
-// ----------------------------------------------------------------------------
-// An MDI document child frame
-// ----------------------------------------------------------------------------
+/*
+ * Use this instead of wxMDIChildFrame
+ */
 
-typedef
-  wxDocChildFrameAny<wxMDIChildFrame, wxMDIParentFrame> wxDocMDIChildFrameBase;
-
-class WXDLLIMPEXP_CORE wxDocMDIChildFrame : public wxDocMDIChildFrameBase
+class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame
 {
 public:
-    wxDocMDIChildFrame() { }
+    wxDocMDIChildFrame();
+    wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id,
+        const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+        long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame"));
+    virtual ~wxDocMDIChildFrame();
 
-    wxDocMDIChildFrame(wxDocument *doc,
-                       wxView *view,
-                       wxMDIParentFrame *parent,
-                       wxWindowID id,
-                       const wxString& title,
-                       const wxPoint& pos = wxDefaultPosition,
-                       const wxSize& size = wxDefaultSize,
-                       long style = wxDEFAULT_FRAME_STYLE,
-                       const wxString& name = wxFrameNameStr)
-        : wxDocMDIChildFrameBase(doc, view,
-                                 parent, id, title, pos, size, style, name)
-    {
-    }
+    bool Create(wxDocument *doc,
+                wxView *view,
+                wxMDIParentFrame *frame,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long type = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);
+
+    // Extend event processing to search the view's event table
+    virtual bool ProcessEvent(wxEvent& event);
+
+    void OnActivate(wxActivateEvent& event);
+    void OnCloseWindow(wxCloseEvent& event);
+
+    inline wxDocument *GetDocument() const { return m_childDocument; }
+    inline wxView *GetView(void) const { return m_childView; }
+    inline void SetDocument(wxDocument *doc) { m_childDocument = doc; }
+    inline void SetView(wxView *view) { m_childView = view; }
+    bool Destroy() { m_childView = (wxView *)NULL; return wxMDIChildFrame::Destroy(); }
+
+protected:
+    void Init();
+    wxDocument*       m_childDocument;
+    wxView*           m_childView;
 
 private:
+    DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDocMDIChildFrame)
-    wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame);
+    DECLARE_NO_COPY_CLASS(wxDocMDIChildFrame)
 };
 
-#ifdef __VISUALC6__
-    #pragma warning (pop)
 #endif
+    // wxUSE_MDI_ARCHITECTURE
 
-#endif // wxUSE_MDI_ARCHITECTURE
-
-#endif // _WX_DOCMDI_H_
+#endif
+    // _WX_DOCMDI_H_
diff --git a/Source/3rd Party/wx/include/wx/docview.h b/Source/3rd Party/wx/include/wx/docview.h
index cd703c997..c19bae19d 100644
--- a/Source/3rd Party/wx/include/wx/docview.h	
+++ b/Source/3rd Party/wx/include/wx/docview.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: docview.h 53546 2008-05-10 21:02:36Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,10 +17,8 @@
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 
 #include "wx/list.h"
-#include "wx/dlist.h"
 #include "wx/string.h"
 #include "wx/frame.h"
-#include "wx/filehistory.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/print.h"
@@ -33,37 +31,39 @@ class WXDLLIMPEXP_FWD_CORE wxDocTemplate;
 class WXDLLIMPEXP_FWD_CORE wxDocManager;
 class WXDLLIMPEXP_FWD_CORE wxPrintInfo;
 class WXDLLIMPEXP_FWD_CORE wxCommandProcessor;
+class WXDLLIMPEXP_FWD_CORE wxFileHistory;
 class WXDLLIMPEXP_FWD_BASE wxConfigBase;
 
-class wxDocChildFrameAnyBase;
-
 #if wxUSE_STD_IOSTREAM
   #include "wx/iosfwrap.h"
 #else
   #include "wx/stream.h"
 #endif
 
-// Flags for wxDocManager (can be combined).
+// Document manager flags
 enum
 {
-    wxDOC_NEW    = 1,
-    wxDOC_SILENT = 2
+    wxDOC_SDI = 1,
+    wxDOC_MDI,
+    wxDOC_NEW,
+    wxDOC_SILENT,
+    wxDEFAULT_DOCMAN_FLAGS = wxDOC_SDI
 };
 
 // Document template flags
 enum
 {
     wxTEMPLATE_VISIBLE = 1,
-    wxTEMPLATE_INVISIBLE = 2,
+    wxTEMPLATE_INVISIBLE,
     wxDEFAULT_TEMPLATE_FLAGS = wxTEMPLATE_VISIBLE
 };
 
 #define wxMAX_FILE_HISTORY 9
 
-class WXDLLIMPEXP_CORE wxDocument : public wxEvtHandler
+class WXDLLEXPORT wxDocument : public wxEvtHandler
 {
 public:
-    wxDocument(wxDocument *parent = NULL);
+    wxDocument(wxDocument *parent = (wxDocument *) NULL);
     virtual ~wxDocument();
 
     // accessors
@@ -76,16 +76,9 @@ public:
     void SetDocumentName(const wxString& name) { m_documentTypeName = name; }
     wxString GetDocumentName() const { return m_documentTypeName; }
 
-    // access the flag indicating whether this document had been already saved,
-    // SetDocumentSaved() is only used internally, don't call it
     bool GetDocumentSaved() const { return m_savedYet; }
     void SetDocumentSaved(bool saved = true) { m_savedYet = saved; }
 
-    // return true if the document hasn't been modified since the last time it
-    // was saved (implying that it returns false if it was never saved, even if
-    // the document is not modified)
-    bool AlreadySaved() const { return !IsModified() && GetDocumentSaved(); }
-
     virtual bool Close();
     virtual bool Save();
     virtual bool SaveAs();
@@ -110,10 +103,6 @@ public:
     // modified to false)
     virtual bool OnSaveModified();
 
-    // if you override, remember to call the default
-    // implementation (wxDocument::OnChangeFilename)
-    virtual void OnChangeFilename(bool notifyViews);
-
     // Called by framework if created automatically by the default document
     // manager: gives document a chance to initialise and (usually) create a
     // view
@@ -121,22 +110,18 @@ public:
 
     // By default, creates a base wxCommandProcessor.
     virtual wxCommandProcessor *OnCreateCommandProcessor();
-    virtual wxCommandProcessor *GetCommandProcessor() const
-        { return m_commandProcessor; }
-    virtual void SetCommandProcessor(wxCommandProcessor *proc)
-        { m_commandProcessor = proc; }
+    virtual wxCommandProcessor *GetCommandProcessor() const { return m_commandProcessor; }
+    virtual void SetCommandProcessor(wxCommandProcessor *proc) { m_commandProcessor = proc; }
 
     // Called after a view is added or removed. The default implementation
     // deletes the document if this is there are no more views.
     virtual void OnChangedViewList();
 
-    // Called from OnCloseDocument(), does nothing by default but may be
-    // overridden. Return value is ignored.
     virtual bool DeleteContents();
 
     virtual bool Draw(wxDC&);
     virtual bool IsModified() const { return m_documentModified; }
-    virtual void Modify(bool mod);
+    virtual void Modify(bool mod) { m_documentModified = mod; }
 
     virtual bool AddView(wxView *view);
     virtual bool RemoveView(wxView *view);
@@ -144,7 +129,7 @@ public:
     const wxList& GetViews() const { return m_documentViews; }
     wxView *GetFirstView() const;
 
-    virtual void UpdateAllViews(wxView *sender = NULL, wxObject *hint = NULL);
+    virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL);
     virtual void NotifyClosing();
 
     // Remove all views (because we're closing the document)
@@ -152,31 +137,30 @@ public:
 
     // Other stuff
     virtual wxDocManager *GetDocumentManager() const;
-    virtual wxDocTemplate *GetDocumentTemplate() const
-        { return m_documentTemplate; }
-    virtual void SetDocumentTemplate(wxDocTemplate *temp)
-        { m_documentTemplate = temp; }
+    virtual wxDocTemplate *GetDocumentTemplate() const { return m_documentTemplate; }
+    virtual void SetDocumentTemplate(wxDocTemplate *temp) { m_documentTemplate = temp; }
 
-    // Get the document name to be shown to the user: the title if there is
-    // any, otherwise the filename if the document was saved and, finally,
-    // "unnamed" otherwise
-    virtual wxString GetUserReadableName() const;
+    // Get title, or filename if no title, else [unnamed]
+    //
+    // NB: this method will be deprecated in wxWidgets 3.0, you still need to
+    //     override it if you need to modify the existing behaviour in this
+    //     version but use GetUserReadableName() below if you just need to call
+    //     it
+    virtual bool GetPrintableName(wxString& buf) const;
 
-#if WXWIN_COMPATIBILITY_2_8
-    // use GetUserReadableName() instead
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual bool GetPrintableName(wxString& buf) const
-    );
-#endif // WXWIN_COMPATIBILITY_2_8
+#if wxABI_VERSION >= 20805
+    wxString GetUserReadableName() const
+    {
+        wxString s;
+        GetPrintableName(s);
+        return s;
+    }
+#endif // wxABI 2.8.5+
 
     // Returns a window that can be used as a parent for document-related
     // dialogs. Override if necessary.
     virtual wxWindow *GetDocumentWindow() const;
 
-    // Returns true if this document is a child document corresponding to a
-    // part of the parent document and not a disk file as usual.
-    bool IsChildDocument() const { return m_documentParent != NULL; }
-
 protected:
     wxList                m_documentViews;
     wxString              m_documentFile;
@@ -184,36 +168,25 @@ protected:
     wxString              m_documentTypeName;
     wxDocTemplate*        m_documentTemplate;
     bool                  m_documentModified;
-
-    // if the document parent is non-NULL, it's a pseudo-document corresponding
-    // to a part of the parent document which can't be saved or loaded
-    // independently of its parent and is always closed when its parent is
     wxDocument*           m_documentParent;
-
     wxCommandProcessor*   m_commandProcessor;
     bool                  m_savedYet;
 
     // Called by OnSaveDocument and OnOpenDocument to implement standard
-    // Save/Load behaviour. Re-implement in derived class for custom
-    // behaviour.
+    // Save/Load behavior. Re-implement in derived class for custom
+    // behavior.
     virtual bool DoSaveDocument(const wxString& file);
     virtual bool DoOpenDocument(const wxString& file);
 
-    // the default implementation of GetUserReadableName()
-    wxString DoGetUserReadableName() const;
-
 private:
-    // list of all documents whose m_documentParent is this one
-    typedef wxDList<wxDocument> DocsList;
-    DocsList m_childDocuments;
-
     DECLARE_ABSTRACT_CLASS(wxDocument)
-    wxDECLARE_NO_COPY_CLASS(wxDocument);
+    DECLARE_NO_COPY_CLASS(wxDocument)
 };
 
-class WXDLLIMPEXP_CORE wxView: public wxEvtHandler
+class WXDLLEXPORT wxView: public wxEvtHandler
 {
 public:
+    //  wxView(wxDocument *doc = (wxDocument *) NULL);
     wxView();
     virtual ~wxView();
 
@@ -226,19 +199,16 @@ public:
     wxWindow *GetFrame() const { return m_viewFrame ; }
     void SetFrame(wxWindow *frame) { m_viewFrame = frame; }
 
-    virtual void OnActivateView(bool activate,
-                                wxView *activeView,
-                                wxView *deactiveView);
+    virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView);
     virtual void OnDraw(wxDC *dc) = 0;
     virtual void OnPrint(wxDC *dc, wxObject *info);
-    virtual void OnUpdate(wxView *sender, wxObject *hint = NULL);
+    virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
     virtual void OnClosingDocument() {}
     virtual void OnChangeFilename();
 
     // Called by framework if created automatically by the default document
     // manager class: gives view a chance to initialise
-    virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags))
-        { return true; }
+    virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return true; }
 
     // Checks if the view is the last one for the document; if so, asks user
     // to confirm save data (if modified). If ok, deletes itself and returns
@@ -248,6 +218,9 @@ public:
     // Override to do cleanup/veto close
     virtual bool OnClose(bool deleteWindow);
 
+    // Extend event processing to search the document's event table
+    virtual bool ProcessEvent(wxEvent& event);
+
     // A view's window can call this to notify the view it is (in)active.
     // The function then notifies the document manager.
     virtual void Activate(bool activate);
@@ -259,30 +232,18 @@ public:
     virtual wxPrintout *OnCreatePrintout();
 #endif
 
-    // implementation only
-    // -------------------
-
-    // set the associated frame, it is used to reset its view when we're
-    // destroyed
-    void SetDocChildFrame(wxDocChildFrameAnyBase *docChildFrame);
-
 protected:
-    // hook the document into event handlers chain here
-    virtual bool TryBefore(wxEvent& event);
-
     wxDocument*       m_viewDocument;
     wxString          m_viewTypeName;
     wxWindow*         m_viewFrame;
 
-    wxDocChildFrameAnyBase *m_docChildFrame;
-
 private:
     DECLARE_ABSTRACT_CLASS(wxView)
-    wxDECLARE_NO_COPY_CLASS(wxView);
+    DECLARE_NO_COPY_CLASS(wxView)
 };
 
 // Represents user interface (and other) properties of documents and views
-class WXDLLIMPEXP_CORE wxDocTemplate: public wxObject
+class WXDLLEXPORT wxDocTemplate: public wxObject
 {
 
 friend class WXDLLIMPEXP_FWD_CORE wxDocManager;
@@ -297,8 +258,8 @@ public:
                   const wxString& ext,
                   const wxString& docTypeName,
                   const wxString& viewTypeName,
-                  wxClassInfo *docClassInfo = NULL,
-                  wxClassInfo *viewClassInfo = NULL,
+                  wxClassInfo *docClassInfo = (wxClassInfo *) NULL,
+                  wxClassInfo *viewClassInfo = (wxClassInfo *)NULL,
                   long flags = wxDEFAULT_TEMPLATE_FLAGS);
 
     virtual ~wxDocTemplate();
@@ -311,16 +272,13 @@ public:
 
     // Helper method for CreateDocument; also allows you to do your own document
     // creation
-    virtual bool InitDocument(wxDocument* doc,
-                              const wxString& path,
-                              long flags = 0);
+    virtual bool InitDocument(wxDocument* doc, const wxString& path, long flags = 0);
 
     wxString GetDefaultExtension() const { return m_defaultExt; }
     wxString GetDescription() const { return m_description; }
     wxString GetDirectory() const { return m_directory; }
     wxDocManager *GetDocumentManager() const { return m_documentManager; }
-    void SetDocumentManager(wxDocManager *manager)
-        { m_documentManager = manager; }
+    void SetDocumentManager(wxDocManager *manager) { m_documentManager = manager; }
     wxString GetFileFilter() const { return m_fileFilter; }
     long GetFlags() const { return m_flags; }
     virtual wxString GetViewName() const { return m_viewTypeName; }
@@ -332,7 +290,7 @@ public:
     void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; }
     void SetFlags(long flags) { m_flags = flags; }
 
-    bool IsVisible() const { return (m_flags & wxTEMPLATE_VISIBLE) != 0; }
+    bool IsVisible() const { return ((m_flags & wxTEMPLATE_VISIBLE) == wxTEMPLATE_VISIBLE); }
 
     wxClassInfo* GetDocClassInfo() const { return m_docClassInfo; }
     wxClassInfo* GetViewClassInfo() const { return m_viewClassInfo; }
@@ -353,26 +311,23 @@ protected:
     wxClassInfo*      m_docClassInfo;
     wxClassInfo*      m_viewClassInfo;
 
-    // Called by CreateDocument and CreateView to create the actual
-    // document/view object.
-    //
-    // By default uses the ClassInfo provided to the constructor. Override
-    // these functions to provide a different method of creation.
+    // Called by CreateDocument and CreateView to create the actual document/view object.
+    // By default uses the ClassInfo provided to the constructor. Override these functions
+    // to provide a different method of creation.
     virtual wxDocument *DoCreateDocument();
     virtual wxView *DoCreateView();
 
 private:
     DECLARE_CLASS(wxDocTemplate)
-    wxDECLARE_NO_COPY_CLASS(wxDocTemplate);
+    DECLARE_NO_COPY_CLASS(wxDocTemplate)
 };
 
 // One object of this class may be created in an application, to manage all
 // the templates and documents.
-class WXDLLIMPEXP_CORE wxDocManager: public wxEvtHandler
+class WXDLLEXPORT wxDocManager: public wxEvtHandler
 {
 public:
-    // NB: flags are unused, don't pass wxDOC_XXX to this ctor
-    wxDocManager(long flags = 0, bool initialize = true);
+    wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true);
     virtual ~wxDocManager();
 
     virtual bool Initialize();
@@ -385,18 +340,14 @@ public:
     void OnFileRevert(wxCommandEvent& event);
     void OnFileSave(wxCommandEvent& event);
     void OnFileSaveAs(wxCommandEvent& event);
-    void OnMRUFile(wxCommandEvent& event);
-#if wxUSE_PRINTING_ARCHITECTURE
     void OnPrint(wxCommandEvent& event);
     void OnPreview(wxCommandEvent& event);
-    void OnPageSetup(wxCommandEvent& event);
-#endif // wxUSE_PRINTING_ARCHITECTURE
     void OnUndo(wxCommandEvent& event);
     void OnRedo(wxCommandEvent& event);
 
     // Handlers for UI update commands
     void OnUpdateFileOpen(wxUpdateUIEvent& event);
-    void OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event);
+    void OnUpdateFileClose(wxUpdateUIEvent& event);
     void OnUpdateFileRevert(wxUpdateUIEvent& event);
     void OnUpdateFileNew(wxUpdateUIEvent& event);
     void OnUpdateFileSave(wxUpdateUIEvent& event);
@@ -404,16 +355,17 @@ public:
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
+    void OnUpdatePrint(wxUpdateUIEvent& event);
+    void OnUpdatePreview(wxUpdateUIEvent& event);
+
+    // Extend event processing to search the view's event table
+    virtual bool ProcessEvent(wxEvent& event);
+
     // called when file format detection didn't work, can be overridden to do
     // something in this case
     virtual void OnOpenFileFailure() { }
 
     virtual wxDocument *CreateDocument(const wxString& path, long flags = 0);
-
-    // wrapper around CreateDocument() with a more clear name
-    wxDocument *CreateNewDocument()
-        { return CreateDocument(wxString(), wxDOC_NEW); }
-
     virtual wxView *CreateView(wxDocument *doc, long flags = 0);
     virtual void DeleteTemplate(wxDocTemplate *temp, long flags = 0);
     virtual bool FlushDoc(wxDocument *doc);
@@ -429,9 +381,6 @@ public:
     void AssociateTemplate(wxDocTemplate *temp);
     void DisassociateTemplate(wxDocTemplate *temp);
 
-    // Find template from document class info, may return NULL.
-    wxDocTemplate* FindTemplate(const wxClassInfo* documentClassInfo);
-
     wxDocument *GetCurrentDocument() const;
 
     void SetMaxDocsOpen(int n) { m_maxDocsOpen = n; }
@@ -453,14 +402,27 @@ public:
     // Views or windows should inform the document manager
     // when a view is going in or out of focus
     virtual void ActivateView(wxView *view, bool activate = true);
-    virtual wxView *GetCurrentView() const { return m_currentView; }
+    virtual wxView *GetCurrentView() const;
 
     wxList& GetDocuments() { return m_docs; }
     wxList& GetTemplates() { return m_templates; }
 
-    // Return the default name for a new document (by default returns strings
-    // in the form "unnamed <counter>" but can be overridden)
-    virtual wxString MakeNewDocumentName();
+    // Make a default document name
+    //
+    // NB: this method is renamed to MakeNewDocumentName() in wx 3.0, you still
+    //     need to override it if your code needs to customize the default name
+    //     generation but if you just use it from your code, prefer the version
+    //     below which is forward-compatible with wx 3.0
+    virtual bool MakeDefaultName(wxString& buf);
+
+#if wxABI_VERSION >= 20808
+    wxString MakeNewDocumentName() const
+    {
+        wxString s;
+        wx_const_cast(wxDocManager *, this)->MakeDefaultName(s);
+        return s;
+    }
+#endif // wx ABI >= 2.8.8
 
     // Make a frame title (override this to do something different)
     virtual wxString MakeFrameTitle(wxDocument* doc);
@@ -476,68 +438,26 @@ public:
     virtual void FileHistoryUseMenu(wxMenu *menu);
     virtual void FileHistoryRemoveMenu(wxMenu *menu);
 #if wxUSE_CONFIG
-    virtual void FileHistoryLoad(const wxConfigBase& config);
+    virtual void FileHistoryLoad(wxConfigBase& config);
     virtual void FileHistorySave(wxConfigBase& config);
 #endif // wxUSE_CONFIG
 
     virtual void FileHistoryAddFilesToMenu();
     virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
 
-    wxString GetLastDirectory() const;
+    wxString GetLastDirectory() const { return m_lastDirectory; }
     void SetLastDirectory(const wxString& dir) { m_lastDirectory = dir; }
 
     // Get the current document manager
     static wxDocManager* GetDocumentManager() { return sm_docManager; }
 
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxPageSetupDialogData& GetPageSetupDialogData()
-        { return m_pageSetupDialogData; }
-    const wxPageSetupDialogData& GetPageSetupDialogData() const
-        { return m_pageSetupDialogData; }
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-#if WXWIN_COMPATIBILITY_2_8
-    // deprecated, override GetDefaultName() instead
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual bool MakeDefaultName(wxString& buf)
-    );
-#endif
-
 #if WXWIN_COMPATIBILITY_2_6
     // deprecated, use GetHistoryFilesCount() instead
     wxDEPRECATED( size_t GetNoHistoryFiles() const );
 #endif // WXWIN_COMPATIBILITY_2_6
 
-
 protected:
-    // Called when a file selected from the MRU list doesn't exist any more.
-    // The default behaviour is to remove the file from the MRU and notify the
-    // user about it but this method can be overridden to customize it.
-    virtual void OnMRUFileNotExist(unsigned n, const wxString& filename);
-
-    // Open the MRU file with the given index in our associated file history.
-    void DoOpenMRUFile(unsigned n);
-#if wxUSE_PRINTING_ARCHITECTURE
-    virtual wxPreviewFrame* CreatePreviewFrame(wxPrintPreviewBase* preview,
-                                               wxWindow *parent,
-                                               const wxString& title);
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-    // hook the currently active view into event handlers chain here
-    virtual bool TryBefore(wxEvent& event);
-
-    // return the command processor for the current document, if any
-    wxCommandProcessor *GetCurrentCommandProcessor() const;
-
-    // this method tries to find an active view harder than GetCurrentView():
-    // if the latter is NULL, it also checks if we don't have just a single
-    // view and returns it then
-    wxView *GetActiveView() const;
-
-    // activate the first view of the given document if any
-    void ActivateDocument(wxDocument *doc);
-
-
+    long              m_flags;
     int               m_defaultDocumentNameCounter;
     int               m_maxDocsOpen;
     wxList            m_docs;
@@ -547,13 +467,9 @@ protected:
     wxString          m_lastDirectory;
     static wxDocManager* sm_docManager;
 
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxPageSetupDialogData m_pageSetupDialogData;
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxDocManager)
-    wxDECLARE_NO_COPY_CLASS(wxDocManager);
+    DECLARE_NO_COPY_CLASS(wxDocManager)
 };
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -564,282 +480,61 @@ inline size_t wxDocManager::GetNoHistoryFiles() const
 #endif // WXWIN_COMPATIBILITY_2_6
 
 // ----------------------------------------------------------------------------
-// Base class for child frames -- this is what wxView renders itself into
-//
-// Notice that this is a mix-in class so it doesn't derive from wxWindow, only
-// wxDocChildFrameAny does
+// A default child frame
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDocChildFrameAnyBase
+class WXDLLEXPORT wxDocChildFrame : public wxFrame
 {
 public:
-    // default ctor, use Create() after it
-    wxDocChildFrameAnyBase()
-    {
-        m_childDocument = NULL;
-        m_childView = NULL;
-        m_win = NULL;
-    }
+    wxDocChildFrame(wxDocument *doc,
+                    wxView *view,
+                    wxFrame *frame,
+                    wxWindowID id,
+                    const wxString& title,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long type = wxDEFAULT_FRAME_STYLE,
+                    const wxString& name = wxT("frame"));
+    virtual ~wxDocChildFrame(){}
 
-    // full ctor equivalent to using the default one and Create(0
-    wxDocChildFrameAnyBase(wxDocument *doc, wxView *view, wxWindow *win)
-    {
-        Create(doc, view, win);
-    }
+    // Extend event processing to search the view's event table
+    virtual bool ProcessEvent(wxEvent& event);
 
-    // method which must be called for an object created using the default ctor
-    //
-    // note that it returns bool just for consistency with Create() methods in
-    // other classes, we never return false from here
-    bool Create(wxDocument *doc, wxView *view, wxWindow *win)
-    {
-        m_childDocument = doc;
-        m_childView = view;
-        m_win = win;
-
-        if ( view )
-            view->SetDocChildFrame(this);
-
-        return true;
-    }
-
-    // dtor doesn't need to be virtual, an object should never be destroyed via
-    // a pointer to this class
-    ~wxDocChildFrameAnyBase()
-    {
-        // prevent the view from deleting us if we're being deleted directly
-        // (and not via Close() + Destroy())
-        if ( m_childView )
-            m_childView->SetDocChildFrame(NULL);
-    }
+    void OnActivate(wxActivateEvent& event);
+    void OnCloseWindow(wxCloseEvent& event);
 
     wxDocument *GetDocument() const { return m_childDocument; }
     wxView *GetView() const { return m_childView; }
     void SetDocument(wxDocument *doc) { m_childDocument = doc; }
     void SetView(wxView *view) { m_childView = view; }
-
-    wxWindow *GetWindow() const { return m_win; }
+    bool Destroy() { m_childView = (wxView *)NULL; return wxFrame::Destroy(); }
 
 protected:
-    // we're not a wxEvtHandler but we provide this wxEvtHandler-like function
-    // which is called from TryBefore() of the derived classes to give our view
-    // a chance to process the message before the frame event handlers are used
-    bool TryProcessEvent(wxEvent& event)
-    {
-        return m_childView && m_childView->ProcessEventLocally(event);
-    }
-
-    // called from EVT_CLOSE handler in the frame: check if we can close and do
-    // cleanup if so; veto the event otherwise
-    bool CloseView(wxCloseEvent& event);
-
-
     wxDocument*       m_childDocument;
     wxView*           m_childView;
 
-    // the associated window: having it here is not terribly elegant but it
-    // allows us to avoid having any virtual functions in this class
-    wxWindow* m_win;
-
-
-    wxDECLARE_NO_COPY_CLASS(wxDocChildFrameAnyBase);
-};
-
-// ----------------------------------------------------------------------------
-// Template implementing child frame concept using the given wxFrame-like class
-//
-// This is used to define wxDocChildFrame and wxDocMDIChildFrame: ChildFrame is
-// a wxFrame or wxMDIChildFrame (although in theory it could be any wxWindow-
-// derived class as long as it provided a ctor with the same signature as
-// wxFrame and OnActivate() method) and ParentFrame is either wxFrame or
-// wxMDIParentFrame.
-// ----------------------------------------------------------------------------
-
-template <class ChildFrame, class ParentFrame>
-class WXDLLIMPEXP_CORE wxDocChildFrameAny : public ChildFrame,
-                                            public wxDocChildFrameAnyBase
-{
-public:
-    typedef ChildFrame BaseClass;
-
-    // default ctor, use Create after it
-    wxDocChildFrameAny() { }
-
-    // ctor for a frame showing the given view of the specified document
-    wxDocChildFrameAny(wxDocument *doc,
-                       wxView *view,
-                       ParentFrame *parent,
-                       wxWindowID id,
-                       const wxString& title,
-                       const wxPoint& pos = wxDefaultPosition,
-                       const wxSize& size = wxDefaultSize,
-                       long style = wxDEFAULT_FRAME_STYLE,
-                       const wxString& name = wxFrameNameStr)
-    {
-        Create(doc, view, parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxDocument *doc,
-                wxView *view,
-                ParentFrame *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr)
-    {
-        if ( !wxDocChildFrameAnyBase::Create(doc, view, this) )
-            return false;
-
-        if ( !BaseClass::Create(parent, id, title, pos, size, style, name) )
-            return false;
-
-        this->Connect(wxEVT_ACTIVATE,
-                      wxActivateEventHandler(wxDocChildFrameAny::OnActivate));
-        this->Connect(wxEVT_CLOSE_WINDOW,
-                      wxCloseEventHandler(wxDocChildFrameAny::OnCloseWindow));
-
-        return true;
-    }
-
-    virtual bool Destroy()
-    {
-        // FIXME: why exactly do we do this? to avoid activation events during
-        //        destructions maybe?
-        m_childView = NULL;
-        return BaseClass::Destroy();
-    }
-
-protected:
-    // hook the child view into event handlers chain here
-    virtual bool TryBefore(wxEvent& event)
-    {
-        return TryProcessEvent(event) || BaseClass::TryBefore(event);
-    }
-
-private:
-    void OnActivate(wxActivateEvent& event)
-    {
-        BaseClass::OnActivate(event);
-
-        if ( m_childView )
-            m_childView->Activate(event.GetActive());
-    }
-
-    void OnCloseWindow(wxCloseEvent& event)
-    {
-        if ( CloseView(event) )
-            Destroy();
-        //else: vetoed
-    }
-
-    wxDECLARE_NO_COPY_TEMPLATE_CLASS_2(wxDocChildFrameAny,
-                                        ChildFrame, ParentFrame);
-};
-
-// ----------------------------------------------------------------------------
-// A default child frame: we need to define it as a class just for wxRTTI,
-// otherwise we could simply typedef it
-// ----------------------------------------------------------------------------
-
-#ifdef __VISUALC6__
-    // "non dll-interface class 'wxDocChildFrameAny<>' used as base interface
-    // for dll-interface class 'wxDocChildFrame'" -- this is bogus as the
-    // template will be DLL-exported but only once it is used as base class
-    // here!
-    #pragma warning (push)
-    #pragma warning (disable:4275)
-#endif
-
-typedef wxDocChildFrameAny<wxFrame, wxFrame> wxDocChildFrameBase;
-
-class WXDLLIMPEXP_CORE wxDocChildFrame : public wxDocChildFrameBase
-{
-public:
-    wxDocChildFrame()
-    {
-    }
-
-    wxDocChildFrame(wxDocument *doc,
-                    wxView *view,
-                    wxFrame *parent,
-                    wxWindowID id,
-                    const wxString& title,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxDEFAULT_FRAME_STYLE,
-                    const wxString& name = wxFrameNameStr)
-        : wxDocChildFrameBase(doc, view,
-                              parent, id, title, pos, size, style, name)
-    {
-    }
-
-    bool Create(wxDocument *doc,
-                wxView *view,
-                wxFrame *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr)
-    {
-        return wxDocChildFrameBase::Create
-               (
-                    doc, view,
-                    parent, id, title, pos, size, style, name
-               );
-    }
-
 private:
     DECLARE_CLASS(wxDocChildFrame)
-    wxDECLARE_NO_COPY_CLASS(wxDocChildFrame);
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDocChildFrame)
 };
 
 // ----------------------------------------------------------------------------
-// wxDocParentFrame and related classes.
-//
-// As with wxDocChildFrame we define a template base class used by both normal
-// and MDI versions
+// A default parent frame
 // ----------------------------------------------------------------------------
 
-// Base class containing type-independent code of wxDocParentFrameAny
-//
-// Similarly to wxDocChildFrameAnyBase, this class is a mix-in and doesn't
-// derive from wxWindow.
-class WXDLLIMPEXP_CORE wxDocParentFrameAnyBase
+class WXDLLEXPORT wxDocParentFrame : public wxFrame
 {
 public:
-    wxDocParentFrameAnyBase() { m_docManager = NULL; }
-
-    wxDocManager *GetDocumentManager() const { return m_docManager; }
-
-protected:
-    wxDocManager *m_docManager;
-
-    wxDECLARE_NO_COPY_CLASS(wxDocParentFrameAnyBase);
-};
-
-// This is similar to wxDocChildFrameAny and is used to provide common
-// implementation for both wxDocParentFrame and wxDocMDIParentFrame
-template <class BaseFrame>
-class WXDLLIMPEXP_CORE wxDocParentFrameAny : public BaseFrame,
-                                             public wxDocParentFrameAnyBase
-{
-public:
-    wxDocParentFrameAny() { }
-    wxDocParentFrameAny(wxDocManager *manager,
-                        wxFrame *frame,
-                        wxWindowID id,
-                        const wxString& title,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
-    {
-        Create(manager, frame, id, title, pos, size, style, name);
-    }
+    wxDocParentFrame();
+    wxDocParentFrame(wxDocManager *manager,
+                     wxFrame *frame,
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxDEFAULT_FRAME_STYLE,
+                     const wxString& name = wxFrameNameStr);
 
     bool Create(wxDocManager *manager,
                 wxFrame *frame,
@@ -848,115 +543,40 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr)
-    {
-        m_docManager = manager;
+                const wxString& name = wxFrameNameStr);
 
-        if ( !BaseFrame::Create(frame, id, title, pos, size, style, name) )
-            return false;
+    // Extend event processing to search the document manager's event table
+    virtual bool ProcessEvent(wxEvent& event);
 
-        this->Connect(wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED,
-                      wxCommandEventHandler(wxDocParentFrameAny::OnExit));
-        this->Connect(wxEVT_CLOSE_WINDOW,
-                      wxCloseEventHandler(wxDocParentFrameAny::OnCloseWindow));
+    wxDocManager *GetDocumentManager() const { return m_docManager; }
 
-        return true;
-    }
+    void OnExit(wxCommandEvent& event);
+    void OnMRUFile(wxCommandEvent& event);
+    void OnCloseWindow(wxCloseEvent& event);
 
 protected:
-    // hook the document manager into event handling chain here
-    virtual bool TryBefore(wxEvent& event)
-    {
-        if ( m_docManager && m_docManager->ProcessEventLocally(event) )
-            return true;
-
-        return BaseFrame::TryBefore(event);
-    }
-
-private:
-    void OnExit(wxCommandEvent& WXUNUSED(event))
-    {
-        this->Close();
-    }
-
-    void OnCloseWindow(wxCloseEvent& event)
-    {
-        if ( m_docManager && !m_docManager->Clear(!event.CanVeto()) )
-        {
-            // The user decided not to close finally, abort.
-            event.Veto();
-        }
-        else
-        {
-            // Just skip the event, base class handler will destroy the window.
-            event.Skip();
-        }
-    }
-
-
-    wxDECLARE_NO_COPY_CLASS(wxDocParentFrameAny);
-};
-
-typedef wxDocParentFrameAny<wxFrame> wxDocParentFrameBase;
-
-class WXDLLIMPEXP_CORE wxDocParentFrame : public wxDocParentFrameBase
-{
-public:
-    wxDocParentFrame() : wxDocParentFrameBase() { }
-
-    wxDocParentFrame(wxDocManager *manager,
-                     wxFrame *parent,
-                     wxWindowID id,
-                     const wxString& title,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxDEFAULT_FRAME_STYLE,
-                     const wxString& name = wxFrameNameStr)
-        : wxDocParentFrameBase(manager,
-                               parent, id, title, pos, size, style, name)
-    {
-    }
-
-    bool Create(wxDocManager *manager,
-                wxFrame *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr)
-    {
-        return wxDocParentFrameBase::Create(manager,
-                                            parent, id, title,
-                                            pos, size, style, name);
-    }
+    wxDocManager *m_docManager;
 
 private:
+    typedef wxFrame base_type;
     DECLARE_CLASS(wxDocParentFrame)
-    wxDECLARE_NO_COPY_CLASS(wxDocParentFrame);
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDocParentFrame)
 };
 
-#ifdef __VISUALC6__
-    // reenable warning 4275
-    #pragma warning (pop)
-#endif
-
 // ----------------------------------------------------------------------------
 // Provide simple default printing facilities
 // ----------------------------------------------------------------------------
 
 #if wxUSE_PRINTING_ARCHITECTURE
-class WXDLLIMPEXP_CORE wxDocPrintout : public wxPrintout
+class WXDLLEXPORT wxDocPrintout : public wxPrintout
 {
 public:
-    wxDocPrintout(wxView *view = NULL, const wxString& title = wxString());
-
-    // implement wxPrintout methods
-    virtual bool OnPrintPage(int page);
-    virtual bool HasPage(int page);
-    virtual bool OnBeginDocument(int startPage, int endPage);
-    virtual void GetPageInfo(int *minPage, int *maxPage,
-                             int *selPageFrom, int *selPageTo);
+    wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = wxT("Printout"));
+    bool OnPrintPage(int page);
+    bool HasPage(int page);
+    bool OnBeginDocument(int startPage, int endPage);
+    void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
 
     virtual wxView *GetView() { return m_printoutView; }
 
@@ -965,36 +585,91 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDocPrintout)
-    wxDECLARE_NO_COPY_CLASS(wxDocPrintout);
+    DECLARE_NO_COPY_CLASS(wxDocPrintout)
 };
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
+// ----------------------------------------------------------------------------
+// File history management
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFileHistory : public wxObject
+{
+public:
+    wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);
+    virtual ~wxFileHistory();
+
+    // Operations
+    virtual void AddFileToHistory(const wxString& file);
+    virtual void RemoveFileFromHistory(size_t i);
+    virtual int GetMaxFiles() const { return (int)m_fileMaxFiles; }
+    virtual void UseMenu(wxMenu *menu);
+
+    // Remove menu from the list (MDI child may be closing)
+    virtual void RemoveMenu(wxMenu *menu);
+
+#if wxUSE_CONFIG
+    virtual void Load(wxConfigBase& config);
+    virtual void Save(wxConfigBase& config);
+#endif // wxUSE_CONFIG
+
+    virtual void AddFilesToMenu();
+    virtual void AddFilesToMenu(wxMenu* menu); // Single menu
+
+    // Accessors
+    virtual wxString GetHistoryFile(size_t i) const;
+    virtual size_t GetCount() const { return m_fileHistoryN; }
+
+    const wxList& GetMenus() const { return m_fileMenus; }
+
+#if wxABI_VERSION >= 20802
+    // Set/get base id
+    void SetBaseId(wxWindowID baseId) { m_idBase = baseId; }
+    wxWindowID GetBaseId() const { return m_idBase; }
+#endif // wxABI 2.8.2+
+
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated, use GetCount() instead
+    wxDEPRECATED( size_t GetNoHistoryFiles() const );
+#endif // WXWIN_COMPATIBILITY_2_6
+
+protected:
+    // Last n files
+    wxChar**          m_fileHistory;
+    // Number of files saved
+    size_t            m_fileHistoryN;
+    // Menus to maintain (may need several for an MDI app)
+    wxList            m_fileMenus;
+    // Max files to maintain
+    size_t            m_fileMaxFiles;
+
+private:
+    // The ID of the first history menu item (Doesn't have to be wxID_FILE1)
+    wxWindowID m_idBase;
+
+    DECLARE_DYNAMIC_CLASS(wxFileHistory)
+    DECLARE_NO_COPY_CLASS(wxFileHistory)
+};
+
+#if WXWIN_COMPATIBILITY_2_6
+inline size_t wxFileHistory::GetNoHistoryFiles() const
+{
+    return m_fileHistoryN;
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+#if wxUSE_STD_IOSTREAM
 // For compatibility with existing file formats:
 // converts from/to a stream to/from a temporary file.
-#if wxUSE_STD_IOSTREAM
-bool WXDLLIMPEXP_CORE
-wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream);
-bool WXDLLIMPEXP_CORE
-wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename);
+bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream);
+bool WXDLLEXPORT wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename);
 #else
-bool WXDLLIMPEXP_CORE
-wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
-bool WXDLLIMPEXP_CORE
-wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
+// For compatibility with existing file formats:
+// converts from/to a stream to/from a temporary file.
+bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, wxOutputStream& stream);
+bool WXDLLEXPORT wxTransferStreamToFile(wxInputStream& stream, const wxString& filename);
 #endif // wxUSE_STD_IOSTREAM
 
-
-// these flags are not used anywhere by wxWidgets and kept only for an unlikely
-// case of existing user code using them for its own purposes
-#if WXWIN_COMPATIBILITY_2_8
-enum
-{
-    wxDOC_SDI = 1,
-    wxDOC_MDI,
-    wxDEFAULT_DOCMAN_FLAGS = wxDOC_SDI
-};
-#endif // WXWIN_COMPATIBILITY_2_8
-
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 
 #endif // _WX_DOCH__
diff --git a/Source/3rd Party/wx/include/wx/dynarray.h b/Source/3rd Party/wx/include/wx/dynarray.h
index 0414f2dd2..3cde91ae7 100644
--- a/Source/3rd Party/wx/include/wx/dynarray.h	
+++ b/Source/3rd Party/wx/include/wx/dynarray.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dynarray.h 45498 2007-04-16 13:03:05Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -14,7 +14,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_STD_CONTAINERS
+#if wxUSE_STL
     #include "wx/beforestd.h"
     #include <vector>
     #include <algorithm>
@@ -54,8 +54,6 @@
 */
 #define WX_ARRAY_DEFAULT_INITIAL_SIZE    (16)
 
-#define _WX_ERROR_REMOVE "removing inexistent element in wxArray::Remove"
-
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
@@ -81,10 +79,10 @@ typedef int (wxCMPFUNC_CONV *CMPFUNC)(const void* pItem1, const void* pItem2);
 //     you cast "SomeArray *" as "BaseArray *" and then delete it)
 // ----------------------------------------------------------------------------
 
-#if wxUSE_STD_CONTAINERS
+#if wxUSE_STL
 
 template<class T>
-class wxArray_SortFunction
+class WXDLLIMPEXP_BASE wxArray_SortFunction
 {
 public:
     typedef int (wxCMPFUNC_CONV *CMPFUNC)(T* pItem1, T* pItem2);
@@ -97,7 +95,7 @@ private:
 };
 
 template<class T, typename F>
-class wxSortedArray_SortFunction
+class WXDLLIMPEXP_BASE wxSortedArray_SortFunction
 {
 public:
     typedef F CMPFUNC;
@@ -121,78 +119,32 @@ classexp name : public std::vector<T>                               \
   typedef predicate::CMPFUNC SCMPFUNC;                              \
 public:                                                             \
   typedef wxArray_SortFunction<T>::CMPFUNC CMPFUNC;                 \
-                                                                    \
 public:                                                             \
-  typedef T base_type;                                              \
-                                                                    \
-  name() : std::vector<T>() { }                                     \
-  name(size_type n) : std::vector<T>(n) { }                         \
-  name(size_type n, const_reference v) : std::vector<T>(n, v) { }   \
-                                                                    \
   void Empty() { clear(); }                                         \
   void Clear() { clear(); }                                         \
   void Alloc(size_t uiSize) { reserve(uiSize); }                    \
-  void Shrink() { name tmp(*this); swap(tmp); }                     \
+  void Shrink();                                                    \
                                                                     \
   size_t GetCount() const { return size(); }                        \
   void SetCount(size_t n, T v = T()) { resize(n, v); }              \
   bool IsEmpty() const { return empty(); }                          \
   size_t Count() const { return size(); }                           \
                                                                     \
+  typedef T base_type;                                              \
+                                                                    \
+protected:                                                          \
   T& Item(size_t uiIndex) const                                     \
     { wxASSERT( uiIndex < size() ); return (T&)operator[](uiIndex); }   \
-  T& Last() const { return Item(size() - 1); }                      \
                                                                     \
-  int Index(T item, bool bFromEnd = false) const                    \
-  {                                                                 \
-      if ( bFromEnd )                                               \
-      {                                                             \
-          const const_reverse_iterator b = rbegin(),                \
-                                       e = rend();                  \
-          for ( const_reverse_iterator i = b; i != e; ++i )         \
-              if ( *i == item )                                     \
-                  return (int)(e - i - 1);                          \
-      }                                                             \
-      else                                                          \
-      {                                                             \
-          const const_iterator b = begin(),                         \
-                               e = end();                           \
-          for ( const_iterator i = b; i != e; ++i )                 \
-              if ( *i == item )                                     \
-                  return (int)(i - b);                              \
-      }                                                             \
-                                                                    \
-      return wxNOT_FOUND;                                           \
-  }                                                                 \
-  int Index(T lItem, CMPFUNC fnCompare) const                       \
-  {                                                                 \
-      Predicate p((SCMPFUNC)fnCompare);                             \
-      const_iterator i = std::lower_bound(begin(), end(), lItem, p);\
-      return i != end() && !p(lItem, *i) ? (int)(i - begin())       \
-                                         : wxNOT_FOUND;             \
-  }                                                                 \
-  size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const           \
-  {                                                                 \
-      Predicate p((SCMPFUNC)fnCompare);                             \
-      const_iterator i = std::lower_bound(begin(), end(), lItem, p);\
-      return i - begin();                                           \
-  }                                                                 \
+  int Index(T e, bool bFromEnd = false) const;                      \
+  int Index(T lItem, CMPFUNC fnCompare) const;                      \
+  size_t IndexForInsert(T lItem, CMPFUNC fnCompare) const;          \
   void Add(T lItem, size_t nInsert = 1)                             \
     { insert(end(), nInsert, lItem); }                              \
-  size_t Add(T lItem, CMPFUNC fnCompare)                            \
-  {                                                                 \
-      size_t n = IndexForInsert(lItem, fnCompare);                  \
-      Insert(lItem, n);                                             \
-      return n;                                                     \
-  }                                                                 \
+  size_t Add(T lItem, CMPFUNC fnCompare);                           \
   void Insert(T lItem, size_t uiIndex, size_t nInsert = 1)          \
     { insert(begin() + uiIndex, nInsert, lItem); }                  \
-  void Remove(T lItem)                                              \
-  {                                                                 \
-    int n = Index(lItem);                                           \
-    wxCHECK_RET( n != wxNOT_FOUND, _WX_ERROR_REMOVE );              \
-    RemoveAt((size_t)n);                                            \
-  }                                                                 \
+  void Remove(T lItem);                                             \
   void RemoveAt(size_t uiIndex, size_t nRemove = 1)                 \
     { erase(begin() + uiIndex, begin() + uiIndex + nRemove); }      \
                                                                     \
@@ -203,12 +155,12 @@ public:                                                             \
   }                                                                 \
 }
 
-#else // if !wxUSE_STD_CONTAINERS
+#else // if !wxUSE_STL
 
 #define  _WX_DECLARE_BASEARRAY(T, name, classexp)                   \
 classexp name                                                       \
 {                                                                   \
-  typedef CMPFUNC SCMPFUNC; /* for compatibility wuth wxUSE_STD_CONTAINERS */  \
+  typedef CMPFUNC SCMPFUNC; /* for compatibility wuth wxUSE_STL */  \
 public:                                                             \
   name();                                                           \
   name(const name& array);                                          \
@@ -282,13 +234,6 @@ protected:                                                          \
   const_iterator begin() const { return m_pItems; }                 \
   const_iterator end() const { return m_pItems + m_nCount; }        \
                                                                     \
-  void swap(name& other)                                            \
-  {                                                                 \
-    wxSwap(m_nSize, other.m_nSize);                                 \
-    wxSwap(m_nCount, other.m_nCount);                               \
-    wxSwap(m_pItems, other.m_pItems);                               \
-  }                                                                 \
-                                                                    \
   /* the following functions may be made directly public because */ \
   /* they don't use the type of the elements at all */              \
 public:                                                             \
@@ -307,7 +252,7 @@ private:                                                            \
   T      *m_pItems;                                                 \
 }
 
-#endif // !wxUSE_STD_CONTAINERS
+#endif // !wxUSE_STL
 
 // ============================================================================
 // The private helper macros containing the core of the array classes
@@ -320,22 +265,53 @@ private:                                                            \
 //       so using a temporary variable instead.
 //
 // The classes need a (even trivial) ~name() to link under Mac X
+//
+// _WX_ERROR_REMOVE is needed to resolve the name conflict between the wxT()
+// macro and T typedef: we can't use wxT() inside WX_DEFINE_ARRAY!
+
+#define _WX_ERROR_REMOVE wxT("removing inexisting element in wxArray::Remove")
 
 // ----------------------------------------------------------------------------
 // _WX_DEFINE_TYPEARRAY: array for simple types
 // ----------------------------------------------------------------------------
 
-#if wxUSE_STD_CONTAINERS
+#if wxUSE_STL
 
-// in STL case we don't need the entire base arrays hack as standard container
-// don't suffer from alignment/storage problems as our home-grown do
 #define  _WX_DEFINE_TYPEARRAY(T, name, base, classexp)                \
-    _WX_DECLARE_BASEARRAY(T, name, classexp)
+typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2);         \
+classexp name : public base                                           \
+{                                                                     \
+public:                                                               \
+  T& operator[](size_t uiIndex) const                                 \
+    { return (T&)(base::operator[](uiIndex)); }                       \
+  T& Item(size_t uiIndex) const                                       \
+    { return (T&)/*const cast*/base::operator[](uiIndex); }           \
+  T& Last() const                                                     \
+    { return Item(Count() - 1); }                                     \
+                                                                      \
+  int Index(T e, bool bFromEnd = false) const                         \
+    { return base::Index(e, bFromEnd); }                              \
+                                                                      \
+  void Add(T lItem, size_t nInsert = 1)                               \
+    { insert(end(), nInsert, lItem); }                                \
+  void Insert(T lItem, size_t uiIndex, size_t nInsert = 1)            \
+    { insert(begin() + uiIndex, nInsert, lItem); }                    \
+                                                                      \
+  void RemoveAt(size_t uiIndex, size_t nRemove = 1)                   \
+    { base::RemoveAt(uiIndex, nRemove); }                             \
+  void Remove(T lItem)                                                \
+    { int iIndex = Index(lItem);                                      \
+      wxCHECK2_MSG( iIndex != wxNOT_FOUND, return,                    \
+         _WX_ERROR_REMOVE);                                           \
+      RemoveAt((size_t)iIndex); }                                     \
+                                                                      \
+  void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC)fCmp); }           \
+}
 
 #define  _WX_DEFINE_TYPEARRAY_PTR(T, name, base, classexp)         \
          _WX_DEFINE_TYPEARRAY(T, name, base, classexp)
 
-#else // if !wxUSE_STD_CONTAINERS
+#else // if !wxUSE_STL
 
 // common declaration used by both _WX_DEFINE_TYPEARRAY and
 // _WX_DEFINE_TYPEARRAY_PTR
@@ -350,12 +326,17 @@ public:                                                               \
   name() { }                                                          \
   ~name() { }                                                         \
                                                                       \
+  name& operator=(const name& src)                                    \
+    { base* temp = (base*) this;                                      \
+      (*temp) = ((const base&)src);                                   \
+      return *this; }                                                 \
+                                                                      \
   T& operator[](size_t uiIndex) const                                 \
     { return (T&)(base::operator[](uiIndex)); }                       \
   T& Item(size_t uiIndex) const                                       \
     { return (T&)(base::operator[](uiIndex)); }                       \
   T& Last() const                                                     \
-    { return (T&)(base::operator[](GetCount() - 1)); }                \
+    { return (T&)(base::operator[](Count() - 1)); }                   \
                                                                       \
   int Index(T lItem, bool bFromEnd = false) const                     \
     { return base::Index((base_type)lItem, bFromEnd); }               \
@@ -369,7 +350,8 @@ public:                                                               \
     { base::RemoveAt(uiIndex, nRemove); }                             \
   void Remove(T lItem)                                                \
     { int iIndex = Index(lItem);                                      \
-      wxCHECK_RET( iIndex != wxNOT_FOUND, _WX_ERROR_REMOVE);          \
+      wxCHECK2_MSG( iIndex != wxNOT_FOUND, return,                    \
+         _WX_ERROR_REMOVE);                                           \
       base::RemoveAt((size_t)iIndex); }                               \
                                                                       \
   void Sort(CMPFUNC##T fCmp) { base::Sort((CMPFUNC)fCmp); }           \
@@ -456,7 +438,6 @@ public:                                                               \
     bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }\
   };                                                                  \
                                                                       \
-  name(size_type n) { assign(n, value_type()); }                      \
   name(size_type n, const_reference v) { assign(n, v); }              \
   name(const_iterator first, const_iterator last)                     \
     { assign(first, last); }                                          \
@@ -494,7 +475,6 @@ public:                                                               \
   void reserve(size_type n) { base::reserve(n); }                     \
   void resize(size_type n, value_type v = value_type())               \
     { base::resize(n, v); }                                           \
-  void swap(name& other) { base::swap(other); }                       \
 }
 
 #define _WX_PTROP pointer operator->() const { return m_ptr; }
@@ -505,7 +485,7 @@ public:                                                               \
 #define _WX_DEFINE_TYPEARRAY_PTR(T, name, base, classexp)          \
     _WX_DEFINE_TYPEARRAY_HELPER(T, name, base, classexp, _WX_PTROP_NONE)
 
-#endif // !wxUSE_STD_CONTAINERS
+#endif // !wxUSE_STL
 
 // ----------------------------------------------------------------------------
 // _WX_DEFINE_SORTED_TYPEARRAY: sorted array for simple data types
@@ -546,14 +526,13 @@ public:                                                               \
                                                                       \
   size_t Add(T lItem)                                                 \
     { return base::Add(lItem, (CMPFUNC)m_fnCompare); }                \
-  void push_back(T lItem)                                             \
-    { Add(lItem); }                                                   \
                                                                       \
   void RemoveAt(size_t uiIndex, size_t nRemove = 1)                   \
     { base::erase(begin() + uiIndex, begin() + uiIndex + nRemove); }  \
   void Remove(T lItem)                                                \
     { int iIndex = Index(lItem);                                      \
-      wxCHECK_RET( iIndex != wxNOT_FOUND, _WX_ERROR_REMOVE );         \
+      wxCHECK2_MSG( iIndex != wxNOT_FOUND, return,                    \
+        _WX_ERROR_REMOVE );                                           \
       base::erase(begin() + iIndex); }                                \
                                                                       \
 private:                                                              \
@@ -578,8 +557,7 @@ public:                                                                  \
                                                                          \
   ~name();                                                               \
                                                                          \
-  void Alloc(size_t count) { base::reserve(count); }                     \
-  void reserve(size_t count) { base::reserve(count); }                   \
+  void Alloc(size_t count) { reserve(count); }                           \
   size_t GetCount() const { return base_array::size(); }                 \
   size_t size() const { return base_array::size(); }                     \
   bool IsEmpty() const { return base_array::empty(); }                   \
@@ -638,7 +616,7 @@ private:                                                                 \
 // that wants to export a wxArray daubed with your own import/export goo.
 //
 // Finally, you can define the macro below as something special to modify the
-// arrays defined by a simple WX_FOO_ARRAY as well. By default is empty.
+// arrays defined by a simple WX_FOO_ARRAY as well. By default is is empty.
 #define wxARRAY_DEFAULT_EXPORT
 
 // ----------------------------------------------------------------------------
@@ -650,7 +628,7 @@ private:                                                                 \
     WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, wxARRAY_DEFAULT_EXPORT)
 
 #define WX_DECLARE_EXPORTED_BASEARRAY(T, name)                    \
-    WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, WXDLLIMPEXP_CORE)
+    WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, WXDLLEXPORT)
 
 #define WX_DECLARE_USER_EXPORTED_BASEARRAY(T, name, expmode)      \
     typedef T _wxArray##name;                                     \
@@ -671,10 +649,10 @@ private:                                                                 \
     WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class wxARRAY_DEFAULT_EXPORT)
 
 #define WX_DEFINE_EXPORTED_TYPEARRAY(T, name, base)               \
-    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLIMPEXP_CORE)
+    WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class WXDLLEXPORT)
 
 #define WX_DEFINE_EXPORTED_TYPEARRAY_PTR(T, name, base)               \
-    WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class WXDLLIMPEXP_CORE)
+    WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(T, name, base, class WXDLLEXPORT)
 
 #define WX_DEFINE_USER_EXPORTED_TYPEARRAY(T, name, base, expdecl) \
     WX_DEFINE_TYPEARRAY_WITH_DECL(T, name, base, class expdecl)
@@ -727,7 +705,7 @@ private:                                                                 \
                                              wxARRAY_DEFAULT_EXPORT)
 
 #define WX_DEFINE_SORTED_EXPORTED_TYPEARRAY(T, name, base)                \
-    WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, WXDLLIMPEXP_CORE)
+    WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, WXDLLEXPORT)
 
 #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY(T, name, base, expmode)  \
     typedef T _wxArray##name;                                             \
@@ -753,7 +731,7 @@ private:                                                                 \
 
 #define WX_DEFINE_SORTED_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base)      \
     WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base,     \
-                                                 WXDLLIMPEXP_CORE)
+                                                 WXDLLEXPORT)
 
 #define WX_DEFINE_SORTED_USER_EXPORTED_TYPEARRAY_CMP(T, cmpfunc, name, base, \
                                                      expmode)                \
@@ -806,7 +784,7 @@ private:                                                                 \
     WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, wxARRAY_DEFAULT_EXPORT)
 
 #define WX_DECLARE_EXPORTED_OBJARRAY(T, name)               \
-    WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLIMPEXP_CORE)
+    WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, WXDLLEXPORT)
 
 #define WX_DECLARE_OBJARRAY_WITH_DECL(T, name, decl) \
     typedef T _wxObjArray##name;                            \
@@ -1028,7 +1006,7 @@ WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE
 #define WX_PREPEND_ARRAY(array, other)                                        \
     {                                                                         \
         size_t wxAAcnt = (other).size();                                      \
-        (array).reserve(wxAAcnt);                                             \
+        (array).Alloc(wxAAcnt);                                               \
         for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
         {                                                                     \
             (array).Insert((other)[wxAAn], wxAAn);                            \
@@ -1039,7 +1017,7 @@ WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE
 #define WX_APPEND_ARRAY(array, other)                                         \
     {                                                                         \
         size_t wxAAcnt = (other).size();                                      \
-        (array).reserve(wxAAcnt);                                             \
+        (array).Alloc(wxAAcnt);                                               \
         for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
         {                                                                     \
             (array).push_back((other)[wxAAn]);                                \
diff --git a/Source/3rd Party/wx/include/wx/dynlib.h b/Source/3rd Party/wx/include/wx/dynlib.h
index e79bc3b30..5903a7b5b 100644
--- a/Source/3rd Party/wx/include/wx/dynlib.h	
+++ b/Source/3rd Party/wx/include/wx/dynlib.h	
@@ -4,7 +4,7 @@
 // Author:      Guilhem Lavaux, Vadim Zeitlin, Vaclav Slavik
 // Modified by:
 // Created:     20/07/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dynlib.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,6 +19,14 @@
 #include "wx/string.h"
 #include "wx/dynarray.h"
 
+#if defined(__OS2__) || defined(__EMX__)
+#include "wx/os2/private.h"
+#endif
+
+#ifdef __WXMSW__
+#include "wx/msw/private.h"
+#endif
+
 // note that we have our own dlerror() implementation under Darwin
 #if (defined(HAVE_DLERROR) && !defined(__EMX__)) || defined(__DARWIN__)
     #define wxHAVE_DYNLIB_ERROR
@@ -33,7 +41,7 @@ class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator;
 // Note: __OS2__/EMX has to be tested first, since we want to use
 // native version, even if configure detected presence of DLOPEN.
 #if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__)
-    typedef WXHMODULE           wxDllType;
+    typedef HMODULE             wxDllType;
 #elif defined(__DARWIN__)
     // Don't include dlfcn.h on Darwin, we may be using our own replacements.
     typedef void               *wxDllType;
@@ -65,13 +73,12 @@ enum wxDLFlags
     wxDL_VERBATIM   = 0x00000008,   // attempt to load the supplied library
                                     // name without appending the usual dll
                                     // filename extension.
-
-    // this flag is obsolete, don't use
     wxDL_NOSHARE    = 0x00000010,   // load new DLL, don't reuse already loaded
                                     // (only for wxPluginManager)
 
     wxDL_QUIET      = 0x00000020,   // don't log an error if failed to load
 
+#if wxABI_VERSION >= 20810
     // this flag is dangerous, for internal use of wxMSW only, don't use at all
     // and especially don't use directly, use wxLoadedDLL instead if you really
     // do need it
@@ -79,6 +86,7 @@ enum wxDLFlags
                                     // loaded DLL or NULL otherwise; Unload()
                                     // should not be called so don't forget to
                                     // Detach() if you use this function
+#endif // wx 2.8.10+
 
     wxDL_DEFAULT    = wxDL_NOW      // default flags correspond to Win32
 };
@@ -110,63 +118,6 @@ enum wxPluginCategory
 #define wxDYNLIB_FUNCTION(type, name, dynlib) \
     type pfn ## name = (type)(dynlib).GetSymbol(wxT(#name))
 
-
-// a more convenient function replacing wxDYNLIB_FUNCTION above
-//
-// it uses the convention that the type of the function is its name suffixed
-// with "_t" but it doesn't define a variable but just assigns the loaded value
-// to it and also allows to pass it the prefix to be used instead of hardcoding
-// "pfn" (the prefix can be "m_" or "gs_pfn" or whatever)
-//
-// notice that this function doesn't generate error messages if the symbol
-// couldn't be loaded, the caller should generate the appropriate message
-#define wxDL_INIT_FUNC(pfx, name, dynlib) \
-    pfx ## name = (name ## _t)(dynlib).RawGetSymbol(#name)
-
-#ifdef __WINDOWS__
-
-// same as wxDL_INIT_FUNC() but appends 'A' or 'W' to the function name, see
-// wxDynamicLibrary::GetSymbolAorW()
-#define wxDL_INIT_FUNC_AW(pfx, name, dynlib) \
-    pfx ## name = (name ## _t)(dynlib).GetSymbolAorW(#name)
-
-#endif // __WINDOWS__
-
-// the following macros can be used to redirect a whole library to a class and
-// check at run-time if the library is present and contains all required
-// methods
-//
-// notice that they are supposed to be used inside a class which has "m_ok"
-// member variable indicating if the library had been successfully loaded
-
-// helper macros constructing the name of the variable storing the function
-// pointer and the name of its type from the function name
-#define wxDL_METHOD_NAME(name) m_pfn ## name
-#define wxDL_METHOD_TYPE(name) name ## _t
-
-// parameters are:
-//  - rettype: return type of the function, e.g. "int"
-//  - name: name of the function, e.g. "foo"
-//  - args: function signature in parentheses, e.g. "(int x, int y)"
-//  - argnames: the names of the parameters in parentheses, e.g. "(x, y)"
-//  - defret: the value to return if the library wasn't successfully loaded
-#define wxDL_METHOD_DEFINE( rettype, name, args, argnames, defret ) \
-    typedef rettype (* wxDL_METHOD_TYPE(name)) args ; \
-    wxDL_METHOD_TYPE(name) wxDL_METHOD_NAME(name); \
-    rettype name args \
-        { return m_ok ? wxDL_METHOD_NAME(name) argnames : defret; }
-
-#define wxDL_VOIDMETHOD_DEFINE( name, args, argnames ) \
-    typedef void (* wxDL_METHOD_TYPE(name)) args ; \
-    wxDL_METHOD_TYPE(name) wxDL_METHOD_NAME(name); \
-    void name args \
-        { if ( m_ok ) wxDL_METHOD_NAME(name) argnames ; }
-
-#define wxDL_METHOD_LOAD(lib, name) \
-    wxDL_METHOD_NAME(name) = \
-        (wxDL_METHOD_TYPE(name)) lib.GetSymbol(#name, &m_ok); \
-    if ( !m_ok ) return false
-
 // ----------------------------------------------------------------------------
 // wxDynamicLibraryDetails: contains details about a loaded wxDynamicLibrary
 // ----------------------------------------------------------------------------
@@ -232,7 +183,7 @@ public:
     static wxDllType         GetProgramHandle();
 
     // return the platform standard DLL extension (with leading dot)
-    static const wxString& GetDllExt() { return ms_dllext; }
+    static const wxChar *GetDllExt() { return ms_dllext; }
 
     wxDynamicLibrary() : m_handle(0) { }
     wxDynamicLibrary(const wxString& libname, int flags = wxDL_DEFAULT)
@@ -304,7 +255,7 @@ public:
 #endif
     }
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
     // this function is useful for loading functions from the standard Windows
     // DLLs: such functions have an 'A' (in ANSI build) or 'W' (in Unicode, or
     // wide character build) suffix if they take string parameters
@@ -326,7 +277,7 @@ public:
     {
         return RawGetSymbolAorW(m_handle, name);
     }
-#endif // __WINDOWS__
+#endif // __WXMSW__
 
     // return all modules/shared libraries in the address space of this process
     //
@@ -349,19 +300,6 @@ public:
     static wxString GetPluginsDirectory();
 
 
-#ifdef __WINDOWS__
-    // return the handle (HMODULE/HINSTANCE) of the DLL with the given name
-    // and/or containing the specified address: for XP and later systems only
-    // the address is used and the name is ignored but for the previous systems
-    // only the name (which may be either a full path to the DLL or just its
-    // base name, possibly even without extension) is used
-    //
-    // the returned handle reference count is not incremented so it doesn't
-    // need to be freed using FreeLibrary() but it also means that it can
-    // become invalid if the DLL is unloaded
-    static WXHMODULE MSWGetModuleHandle(const char *name, void *addr);
-#endif // __WINDOWS__
-
 protected:
     // common part of GetSymbol() and HasSymbol()
     void *DoGetSymbol(const wxString& name, bool *success = 0) const;
@@ -373,17 +311,17 @@ protected:
 
 
     // platform specific shared lib suffix.
-    static const wxString ms_dllext;
+    static const wxChar *ms_dllext;
 
     // the handle to DLL or NULL
     wxDllType m_handle;
 
     // no copy ctor/assignment operators (or we'd try to unload the library
     // twice)
-    wxDECLARE_NO_COPY_CLASS(wxDynamicLibrary);
+    DECLARE_NO_COPY_CLASS(wxDynamicLibrary)
 };
 
-#ifdef __WINDOWS__
+#if defined(__WXMSW__) && wxABI_VERSION >= 20810
 
 // ----------------------------------------------------------------------------
 // wxLoadedDLL is a MSW-only internal helper class allowing to dynamically bind
@@ -404,7 +342,7 @@ public:
     }
 };
 
-#endif // __WINDOWS__
+#endif // __WXMSW__
 
 // ----------------------------------------------------------------------------
 // Interesting defines
diff --git a/Source/3rd Party/wx/include/wx/dynload.h b/Source/3rd Party/wx/include/wx/dynload.h
index d2a1fc038..76b377c07 100644
--- a/Source/3rd Party/wx/include/wx/dynload.h	
+++ b/Source/3rd Party/wx/include/wx/dynload.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:         wx/dynload.h
+// Name:         dynload.h
 // Purpose:      Dynamic loading framework
 // Author:       Ron Lee, David Falkinder, Vadim Zeitlin and a cast of 1000's
 //               (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
 // Modified by:
 // Created:      03/12/01
-// RCS-ID:       $Id$
+// RCS-ID:       $Id: dynload.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>
 // Licence:      wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -82,11 +82,8 @@ public:
 
 private:
 
-    // These pointers may be NULL but if they are not, then m_ourLast follows
-    // m_ourFirst in the linked list, i.e. can be found by calling GetNext() a
-    // sufficient number of times.
-    const wxClassInfo    *m_ourFirst; // first class info in this plugin
-    const wxClassInfo    *m_ourLast;  // ..and the last one
+    wxClassInfo    *m_before;       // sm_first before loading this lib
+    wxClassInfo    *m_after;        // ..and after.
 
     size_t          m_linkcount;    // Ref count of library link calls
     size_t          m_objcount;     // ..and (pluggable) object instantiations.
@@ -97,7 +94,7 @@ private:
     void    RegisterModules();      // Init any wxModules in the lib.
     void    UnregisterModules();    // Cleanup any wxModules we installed.
 
-    wxDECLARE_NO_COPY_CLASS(wxPluginLibrary);
+    DECLARE_NO_COPY_CLASS(wxPluginLibrary)
 };
 
 
@@ -147,7 +144,7 @@ private:
 
     // We could allow this class to be copied if we really
     // wanted to, but not without modification.
-    wxDECLARE_NO_COPY_CLASS(wxPluginManager);
+    DECLARE_NO_COPY_CLASS(wxPluginManager)
 };
 
 
diff --git a/Source/3rd Party/wx/include/wx/effects.h b/Source/3rd Party/wx/include/wx/effects.h
index a43a23c64..987ddf51a 100644
--- a/Source/3rd Party/wx/include/wx/effects.h	
+++ b/Source/3rd Party/wx/include/wx/effects.h	
@@ -5,7 +5,7 @@
 // Author:      Julian Smart et al
 // Modified by:
 // Created:     25/4/2000
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: effects.h 39109 2006-05-08 11:31:03Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,12 +13,6 @@
 #ifndef _WX_EFFECTS_H_
 #define _WX_EFFECTS_H_
 
-// this class is deprecated and will be removed in the next wx version
-//
-// please use wxRenderer::DrawBorder() instead of DrawSunkenEdge(); there is no
-// replacement for TileBitmap() but it doesn't seem to be very useful anyhow
-#if WXWIN_COMPATIBILITY_2_8
-
 /*
  * wxEffects: various 3D effects
  */
@@ -28,15 +22,17 @@
 #include "wx/gdicmn.h"
 #include "wx/dc.h"
 
-class WXDLLIMPEXP_CORE wxEffectsImpl: public wxObject
+class WXDLLEXPORT wxEffects: public wxObject
 {
+DECLARE_CLASS(wxEffects)
+
 public:
     // Assume system colours
-    wxEffectsImpl() ;
+    wxEffects() ;
     // Going from lightest to darkest
-    wxEffectsImpl(const wxColour& highlightColour, const wxColour& lightShadow,
-                  const wxColour& faceColour, const wxColour& mediumShadow,
-                  const wxColour& darkShadow) ;
+    wxEffects(const wxColour& highlightColour, const wxColour& lightShadow,
+              const wxColour& faceColour, const wxColour& mediumShadow,
+              const wxColour& darkShadow) ;
 
     // Accessors
     wxColour GetHighlightColour() const { return m_highlightColour; }
@@ -74,18 +70,6 @@ protected:
     wxColour    m_faceColour;       // Usually grey
     wxColour    m_mediumShadow;     // Usually dark grey
     wxColour    m_darkShadow;       // Usually black
-
-    DECLARE_CLASS(wxEffectsImpl)
 };
 
-// current versions of g++ don't generate deprecation warnings for classes
-// declared deprecated, so define wxEffects as a typedef instead: this does
-// generate warnings with both g++ and VC (which also has no troubles with
-// directly deprecating the classes...)
-//
-// note that this g++ bug (16370) is supposed to be fixed in g++ 4.3.0
-typedef wxEffectsImpl wxDEPRECATED(wxEffects);
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
-#endif // _WX_EFFECTS_H_
+#endif
diff --git a/Source/3rd Party/wx/include/wx/encconv.h b/Source/3rd Party/wx/include/wx/encconv.h
index 555e2ba00..f57d8ea9d 100644
--- a/Source/3rd Party/wx/include/wx/encconv.h	
+++ b/Source/3rd Party/wx/include/wx/encconv.h	
@@ -57,7 +57,7 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             virtual ~wxEncodingConverter() { if (m_Table) delete[] m_Table; }
 
             // Initialize conversion. Both output or input encoding may
-            // be wxFONTENCODING_UNICODE.
+            // be wxFONTENCODING_UNICODE, but only if wxUSE_WCHAR_T is set to 1.
             //
             // All subsequent calls to Convert() will interpret it's argument
             // as a string in input_enc encoding and will output string in
@@ -91,11 +91,12 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             bool Convert(char* str) const { return Convert(str, str); }
             wxString Convert(const wxString& input) const;
 
+#if wxUSE_WCHAR_T
             bool Convert(const char* input, wchar_t* output) const;
             bool Convert(const wchar_t* input, char* output) const;
             bool Convert(const wchar_t* input, wchar_t* output) const;
             bool Convert(wchar_t* str) const { return Convert(str, str); }
-
+#endif
             // Return equivalent(s) for given font that are used
             // under given platform. wxPLATFORM_CURRENT means the plaform
             // this binary was compiled for
@@ -143,11 +144,16 @@ class WXDLLIMPEXP_BASE wxEncodingConverter : public wxObject
             }
 
     private:
+
+#if wxUSE_WCHAR_T
             wchar_t *m_Table;
+#else
+            char *m_Table;
+#endif
             bool m_UnicodeInput, m_UnicodeOutput;
             bool m_JustCopy;
 
-    wxDECLARE_NO_COPY_CLASS(wxEncodingConverter);
+    DECLARE_NO_COPY_CLASS(wxEncodingConverter)
 };
 
 #endif  // _WX_ENCCONV_H_
diff --git a/Source/3rd Party/wx/include/wx/encinfo.h b/Source/3rd Party/wx/include/wx/encinfo.h
index 360a2150b..fb3d9214f 100644
--- a/Source/3rd Party/wx/include/wx/encinfo.h	
+++ b/Source/3rd Party/wx/include/wx/encinfo.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.09.2003 (extracted from wx/fontenc.h)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: encinfo.h 40865 2006-08-27 09:42:42Z VS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -32,9 +32,10 @@
 // to create a font of non-standard encoding (like KOI8) under Windows - the
 // facename specifies the encoding then)
 
-struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
+struct WXDLLEXPORT wxNativeEncodingInfo
 {
     wxString facename;          // may be empty meaning "any"
+#ifndef __WXPALMOS__
     wxFontEncoding encoding;    // so that we know what this struct represents
 
 #if defined(__WXMSW__) || \
@@ -52,11 +53,17 @@ struct WXDLLIMPEXP_CORE wxNativeEncodingInfo
 #elif defined(_WX_X_FONTLIKE)
     wxString xregistry,
              xencoding;
-#elif defined(wxHAS_UTF8_FONTS)
-    // ports using UTF-8 for text don't need encoding information for fonts
+#elif defined(__WXGTK20__)
+    // No way to specify this in Pango as this
+    // seems to be handled internally.
+#elif defined(__WXMGL__)
+    int      mglEncoding;
+#elif defined(__WXDFB__)
+    // DirectFB uses UTF-8 internally, doesn't use font encodings
 #else
     #error "Unsupported toolkit"
 #endif
+#endif // !__WXPALMOS__
     // this struct is saved in config by wxFontMapper, so it should know to
     // serialise itself (implemented in platform-specific code)
     bool FromString(const wxString& s);
diff --git a/Source/3rd Party/wx/include/wx/event.h b/Source/3rd Party/wx/include/wx/event.h
index 5dca14a73..599b588d2 100644
--- a/Source/3rd Party/wx/include/wx/event.h	
+++ b/Source/3rd Party/wx/include/wx/event.h	
@@ -4,13 +4,13 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: event.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_EVENT_H_
-#define _WX_EVENT_H_
+#ifndef _WX_EVENT_H__
+#define _WX_EVENT_H__
 
 #include "wx/defs.h"
 #include "wx/cpp.h"
@@ -20,26 +20,18 @@
 #if wxUSE_GUI
     #include "wx/gdicmn.h"
     #include "wx/cursor.h"
-    #include "wx/mousestate.h"
 #endif
 
+#include "wx/thread.h"
+
 #include "wx/dynarray.h"
-#include "wx/thread.h"
-#include "wx/tracker.h"
-#include "wx/typeinfo.h"
-#include "wx/any.h"
-
-#ifdef wxHAS_EVENT_BIND
-    #include "wx/meta/convertible.h"
-#endif
 
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_BASE wxList;
-class WXDLLIMPEXP_FWD_BASE wxEvent;
-class WXDLLIMPEXP_FWD_BASE wxEventFilter;
+
 #if wxUSE_GUI
     class WXDLLIMPEXP_FWD_CORE wxDC;
     class WXDLLIMPEXP_FWD_CORE wxMenu;
@@ -47,25 +39,7 @@ class WXDLLIMPEXP_FWD_BASE wxEventFilter;
     class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 #endif // wxUSE_GUI
 
-// We operate with pointer to members of wxEvtHandler (such functions are used
-// as event handlers in the event tables or as arguments to Connect()) but by
-// default MSVC uses a restricted (but more efficient) representation of
-// pointers to members which can't deal with multiple base classes. To avoid
-// mysterious (as the compiler is not good enough to detect this and give a
-// sensible error message) errors in the user code as soon as it defines
-// classes inheriting from both wxEvtHandler (possibly indirectly, e.g. via
-// wxWindow) and something else (including our own wxTrackable but not limited
-// to it), we use the special MSVC keyword telling the compiler to use a more
-// general pointer to member representation for the classes inheriting from
-// wxEvtHandler.
-#ifdef __VISUALC__
-    #define wxMSVC_FWD_MULTIPLE_BASES __multiple_inheritance
-#else
-    #define wxMSVC_FWD_MULTIPLE_BASES
-#endif
-
-class WXDLLIMPEXP_FWD_BASE wxMSVC_FWD_MULTIPLE_BASES wxEvtHandler;
-class wxEventConnectionRef;
+class WXDLLIMPEXP_FWD_BASE wxEvtHandler;
 
 // ----------------------------------------------------------------------------
 // Event types
@@ -73,751 +47,246 @@ class wxEventConnectionRef;
 
 typedef int wxEventType;
 
-#define wxEVT_ANY           ((wxEventType)-1)
-
 // this is used to make the event table entry type safe, so that for an event
-// handler only a function with proper parameter list can be given. See also
-// the wxEVENT_HANDLER_CAST-macro.
-#define wxStaticCastEvent(type, val) static_cast<type>(val)
+// handler only a function with proper parameter list can be given.
+#define wxStaticCastEvent(type, val) wx_static_cast(type, val)
 
-#define wxDECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \
-    wxEventTableEntry(type, winid, idLast, wxNewEventTableFunctor(type, fn), obj)
+// in previous versions of wxWidgets the event types used to be constants
+// which created difficulties with custom/user event types definition
+//
+// starting from wxWidgets 2.4 the event types are now dynamically assigned
+// using wxNewEventType() which solves this problem, however at price of
+// several incompatibilities:
+//
+//  a) event table macros declaration changed, it now uses wxEventTableEntry
+//     ctor instead of initialisation from an agregate - the macro
+//     DECLARE_EVENT_TABLE_ENTRY may be used to write code which can compile
+//     with all versions of wxWidgets
+//
+//  b) event types can't be used as switch() cases as they're not really
+//     constant any more - there is no magic solution here, you just have to
+//     change the switch()es to if()s
+//
+// if these are real problems for you, define WXWIN_COMPATIBILITY_EVENT_TYPES
+// as 1 to get 100% old behaviour, however you won't be able to use the
+// libraries using the new dynamic event type allocation in such case, so avoid
+// it if possible.
+#ifndef WXWIN_COMPATIBILITY_EVENT_TYPES
+    #define WXWIN_COMPATIBILITY_EVENT_TYPES 0
+#endif
 
-#define wxDECLARE_EVENT_TABLE_TERMINATOR() \
-    wxEventTableEntry(wxEVT_NULL, 0, 0, 0, 0)
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+
+#define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \
+    { type, winid, idLast, fn, obj }
+
+#define BEGIN_DECLARE_EVENT_TYPES() enum {
+#define END_DECLARE_EVENT_TYPES() };
+#define DECLARE_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,
+#define DECLARE_LOCAL_EVENT_TYPE(name, value) name = wxEVT_USER_FIRST + value,
+#define DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value) \
+    DECLARE_LOCAL_EVENT_TYPE(name, value)
+#define DEFINE_EVENT_TYPE(name)
+#define DEFINE_LOCAL_EVENT_TYPE(name)
+
+
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+#define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \
+    wxEventTableEntry(type, winid, idLast, fn, obj)
+
+#define BEGIN_DECLARE_EVENT_TYPES()
+#define END_DECLARE_EVENT_TYPES()
+#define DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value) \
+    extern expdecl const wxEventType name;
+#define DECLARE_EVENT_TYPE(name, value) \
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, name, value)
+#define DECLARE_LOCAL_EVENT_TYPE(name, value) \
+    DECLARE_EXPORTED_EVENT_TYPE(wxEMPTY_PARAMETER_VALUE, name, value)
+#define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
+#define DEFINE_LOCAL_EVENT_TYPE(name) DEFINE_EVENT_TYPE(name)
 
 // generate a new unique event type
 extern WXDLLIMPEXP_BASE wxEventType wxNewEventType();
 
-// define macros to create new event types:
-#ifdef wxHAS_EVENT_BIND
-    // events are represented by an instance of wxEventTypeTag and the
-    // corresponding type must be specified for type-safety checks
-
-    // define a new custom event type, can be used alone or after event
-    // declaration in the header using one of the macros below
-    #define wxDEFINE_EVENT( name, type ) \
-        const wxEventTypeTag< type > name( wxNewEventType() )
-
-    // the general version allowing exporting the event type from DLL, used by
-    // wxWidgets itself
-    #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \
-        extern const expdecl wxEventTypeTag< type > name
-
-    // this is the version which will normally be used in the user code
-    #define wxDECLARE_EVENT( name, type ) \
-        wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type )
-
-
-    // these macros are only used internally for backwards compatibility and
-    // allow to define an alias for an existing event type (this is used by
-    // wxEVT_SPIN_XXX)
-    #define wxDEFINE_EVENT_ALIAS( name, type, value ) \
-        const wxEventTypeTag< type > name( value )
-
-    #define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \
-        extern const expdecl wxEventTypeTag< type > name
-#else // !wxHAS_EVENT_BIND
-    // the macros are the same ones as above but defined differently as we only
-    // use the integer event type values to identify events in this case
-
-    #define wxDEFINE_EVENT( name, type ) \
-        const wxEventType name( wxNewEventType() )
-
-    #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \
-        extern const expdecl wxEventType name
-    #define wxDECLARE_EVENT( name, type ) \
-        wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type )
-
-    #define wxDEFINE_EVENT_ALIAS( name, type, value ) \
-        const wxEventType name = value
-    #define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \
-        extern const expdecl wxEventType name
-#endif // wxHAS_EVENT_BIND/!wxHAS_EVENT_BIND
-
-// Try to cast the given event handler to the correct handler type:
-
-#define wxEVENT_HANDLER_CAST( functype, func ) \
-    ( wxObjectEventFunction )( wxEventFunction )wxStaticCastEvent( functype, &func )
-
-
-#ifdef wxHAS_EVENT_BIND
-
-// The tag is a type associated to the event type (which is an integer itself,
-// in spite of its name) value. It exists in order to be used as a template
-// parameter and provide a mapping between the event type values and their
-// corresponding wxEvent-derived classes.
-template <typename T>
-class wxEventTypeTag
-{
-public:
-    // The class of wxEvent-derived class carried by the events of this type.
-    typedef T EventClass;
-
-    wxEventTypeTag(wxEventType type) { m_type = type; }
-
-    // Return a wxEventType reference for the initialization of the static
-    // event tables. See wxEventTableEntry::m_eventType for a more thorough
-    // explanation.
-    operator const wxEventType&() const { return m_type; }
-
-private:
-    wxEventType m_type;
-};
-
-#endif // wxHAS_EVENT_BIND
-
-// These are needed for the functor definitions
-typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
-
-// We had some trouble (specifically with eVC for ARM WinCE build) with using
-// wxEventFunction in the past so we had introduced wxObjectEventFunction which
-// used to be a typedef for a member of wxObject and not wxEvtHandler to work
-// around this but as eVC is not really supported any longer we now only keep
-// this for backwards compatibility and, despite its name, this is a typedef
-// for wxEvtHandler member now -- but if we have the same problem with another
-// compiler we can restore its old definition for it.
-typedef wxEventFunction wxObjectEventFunction;
-
-// The event functor which is stored in the static and dynamic event tables:
-class WXDLLIMPEXP_BASE wxEventFunctor
-{
-public:
-    virtual ~wxEventFunctor();
-
-    // Invoke the actual event handler:
-    virtual void operator()(wxEvtHandler *, wxEvent&) = 0;
-
-    // this function tests whether this functor is matched, for the purpose of
-    // finding it in an event table in Unbind(), by the given functor:
-    virtual bool IsMatching(const wxEventFunctor& functor) const = 0;
-
-    // If the functor holds an wxEvtHandler, then get access to it and track
-    // its lifetime with wxEventConnectionRef:
-    virtual wxEvtHandler *GetEvtHandler() const
-        { return NULL; }
-
-    // This is only used to maintain backward compatibility in
-    // wxAppConsoleBase::CallEventHandler and ensures that an overwritten
-    // wxAppConsoleBase::HandleEvent is still called for functors which hold an
-    // wxEventFunction:
-    virtual wxEventFunction GetEvtMethod() const
-        { return NULL; }
-
-private:
-    WX_DECLARE_ABSTRACT_TYPEINFO(wxEventFunctor)
-};
-
-// A plain method functor for the untyped legacy event types:
-class WXDLLIMPEXP_BASE wxObjectEventFunctor : public wxEventFunctor
-{
-public:
-    wxObjectEventFunctor(wxObjectEventFunction method, wxEvtHandler *handler)
-        : m_handler( handler ), m_method( method )
-        { }
-
-    virtual void operator()(wxEvtHandler *handler, wxEvent& event);
-
-    virtual bool IsMatching(const wxEventFunctor& functor) const
-    {
-        if ( wxTypeId(functor) == wxTypeId(*this) )
-        {
-            const wxObjectEventFunctor &other =
-                static_cast< const wxObjectEventFunctor & >( functor );
-
-            // FIXME-VC6: amazing but true: replacing "m_method == 0" here
-            // with "!m_method" makes VC6 crash with an ICE in DLL build (only!)
-            // Also notice that using "NULL" instead of "0" results in warnings
-            // about "using NULL in arithmetics" from arm-linux-androideabi-g++
-            // 4.4.3 used for wxAndroid build.
-
-            return ( m_method == other.m_method || other.m_method == 0 ) &&
-                   ( m_handler == other.m_handler || other.m_handler == NULL );
-        }
-        else
-            return false;
-    }
-
-    virtual wxEvtHandler *GetEvtHandler() const
-        { return m_handler; }
-
-    virtual wxEventFunction GetEvtMethod() const
-        { return m_method; }
-
-private:
-    wxEvtHandler *m_handler;
-    wxEventFunction m_method;
-
-    // Provide a dummy default ctor for type info purposes
-    wxObjectEventFunctor() { }
-
-    WX_DECLARE_TYPEINFO_INLINE(wxObjectEventFunctor)
-};
-
-// Create a functor for the legacy events: used by Connect()
-inline wxObjectEventFunctor *
-wxNewEventFunctor(const wxEventType& WXUNUSED(evtType),
-                  wxObjectEventFunction method,
-                  wxEvtHandler *handler)
-{
-    return new wxObjectEventFunctor(method, handler);
-}
-
-// This version is used by wxDECLARE_EVENT_TABLE_ENTRY()
-inline wxObjectEventFunctor *
-wxNewEventTableFunctor(const wxEventType& WXUNUSED(evtType),
-                       wxObjectEventFunction method)
-{
-    return new wxObjectEventFunctor(method, NULL);
-}
-
-inline wxObjectEventFunctor
-wxMakeEventFunctor(const wxEventType& WXUNUSED(evtType),
-                        wxObjectEventFunction method,
-                        wxEvtHandler *handler)
-{
-    return wxObjectEventFunctor(method, handler);
-}
-
-#ifdef wxHAS_EVENT_BIND
-
-namespace wxPrivate
-{
-
-// helper template defining nested "type" typedef as the event class
-// corresponding to the given event type
-template <typename T> struct EventClassOf;
-
-// the typed events provide the information about the class of the events they
-// carry themselves:
-template <typename T>
-struct EventClassOf< wxEventTypeTag<T> >
-{
-    typedef typename wxEventTypeTag<T>::EventClass type;
-};
-
-// for the old untyped events we don't have information about the exact event
-// class carried by them
-template <>
-struct EventClassOf<wxEventType>
-{
-    typedef wxEvent type;
-};
-
-
-// helper class defining operations different for method functors using an
-// object of wxEvtHandler-derived class as handler and the others
-template <typename T, typename A, bool> struct HandlerImpl;
-
-// specialization for handlers deriving from wxEvtHandler
-template <typename T, typename A>
-struct HandlerImpl<T, A, true>
-{
-    static bool IsEvtHandler()
-        { return true; }
-    static T *ConvertFromEvtHandler(wxEvtHandler *p)
-        { return static_cast<T *>(p); }
-    static wxEvtHandler *ConvertToEvtHandler(T *p)
-        { return p; }
-    static wxEventFunction ConvertToEvtMethod(void (T::*f)(A&))
-        { return static_cast<wxEventFunction>(
-                    reinterpret_cast<void (T::*)(wxEvent&)>(f)); }
-};
-
-// specialization for handlers not deriving from wxEvtHandler
-template <typename T, typename A>
-struct HandlerImpl<T, A, false>
-{
-    static bool IsEvtHandler()
-        { return false; }
-    static T *ConvertFromEvtHandler(wxEvtHandler *)
-        { return NULL; }
-    static wxEvtHandler *ConvertToEvtHandler(T *)
-        { return NULL; }
-    static wxEventFunction ConvertToEvtMethod(void (T::*)(A&))
-        { return NULL; }
-};
-
-} // namespace wxPrivate
-
-// functor forwarding the event to a method of the given object
-//
-// notice that the object class may be different from the class in which the
-// method is defined but it must be convertible to this class
-//
-// also, the type of the handler parameter doesn't need to be exactly the same
-// as EventTag::EventClass but it must be its base class -- this is explicitly
-// allowed to handle different events in the same handler taking wxEvent&, for
-// example
-template
-  <typename EventTag, typename Class, typename EventArg, typename EventHandler>
-class wxEventFunctorMethod
-    : public wxEventFunctor,
-      private wxPrivate::HandlerImpl
-              <
-                Class,
-                EventArg,
-                wxConvertibleTo<Class, wxEvtHandler>::value != 0
-              >
-{
-private:
-    static void CheckHandlerArgument(EventArg *) { }
-
-public:
-    // the event class associated with the given event tag
-    typedef typename wxPrivate::EventClassOf<EventTag>::type EventClass;
-
-
-    wxEventFunctorMethod(void (Class::*method)(EventArg&), EventHandler *handler)
-        : m_handler( handler ), m_method( method )
-    {
-        wxASSERT_MSG( handler || this->IsEvtHandler(),
-                      "handlers defined in non-wxEvtHandler-derived classes "
-                      "must be connected with a valid sink object" );
-
-        // if you get an error here it means that the signature of the handler
-        // you're trying to use is not compatible with (i.e. is not the same as
-        // or a base class of) the real event class used for this event type
-        CheckHandlerArgument(static_cast<EventClass *>(NULL));
-    }
-
-    virtual void operator()(wxEvtHandler *handler, wxEvent& event)
-    {
-        Class * realHandler = m_handler;
-        if ( !realHandler )
-        {
-            realHandler = this->ConvertFromEvtHandler(handler);
-
-            // this is not supposed to happen but check for it nevertheless
-            wxCHECK_RET( realHandler, "invalid event handler" );
-        }
-
-        // the real (run-time) type of event is EventClass and we checked in
-        // the ctor that EventClass can be converted to EventArg, so this cast
-        // is always valid
-        (realHandler->*m_method)(static_cast<EventArg&>(event));
-    }
-
-    virtual bool IsMatching(const wxEventFunctor& functor) const
-    {
-        if ( wxTypeId(functor) != wxTypeId(*this) )
-            return false;
-
-        typedef wxEventFunctorMethod<EventTag, Class, EventArg, EventHandler>
-            ThisFunctor;
-
-        // the cast is valid because wxTypeId()s matched above
-        const ThisFunctor& other = static_cast<const ThisFunctor &>(functor);
-
-        return (m_method == other.m_method || other.m_method == NULL) &&
-               (m_handler == other.m_handler || other.m_handler == NULL);
-    }
-
-    virtual wxEvtHandler *GetEvtHandler() const
-        { return this->ConvertToEvtHandler(m_handler); }
-
-    virtual wxEventFunction GetEvtMethod() const
-        { return this->ConvertToEvtMethod(m_method); }
-
-private:
-    EventHandler *m_handler;
-    void (Class::*m_method)(EventArg&);
-
-    // Provide a dummy default ctor for type info purposes
-    wxEventFunctorMethod() { }
-
-    typedef wxEventFunctorMethod<EventTag, Class,
-                                 EventArg, EventHandler> thisClass;
-    WX_DECLARE_TYPEINFO_INLINE(thisClass)
-};
-
-
-// functor forwarding the event to function (function, static method)
-template <typename EventTag, typename EventArg>
-class wxEventFunctorFunction : public wxEventFunctor
-{
-private:
-    static void CheckHandlerArgument(EventArg *) { }
-
-public:
-    // the event class associated with the given event tag
-    typedef typename wxPrivate::EventClassOf<EventTag>::type EventClass;
-
-    wxEventFunctorFunction( void ( *handler )( EventArg & ))
-        : m_handler( handler )
-    {
-        // if you get an error here it means that the signature of the handler
-        // you're trying to use is not compatible with (i.e. is not the same as
-        // or a base class of) the real event class used for this event type
-        CheckHandlerArgument(static_cast<EventClass *>(NULL));
-    }
-
-    virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event)
-    {
-        // If you get an error here like "must use .* or ->* to call
-        // pointer-to-member function" then you probably tried to call
-        // Bind/Unbind with a method pointer but without a handler pointer or
-        // NULL as a handler e.g.:
-        // Unbind( wxEVT_XXX, &EventHandler::method );
-        // or
-        // Unbind( wxEVT_XXX, &EventHandler::method, NULL )
-        m_handler(static_cast<EventArg&>(event));
-    }
-
-    virtual bool IsMatching(const wxEventFunctor &functor) const
-    {
-        if ( wxTypeId(functor) != wxTypeId(*this) )
-            return false;
-
-        typedef wxEventFunctorFunction<EventTag, EventArg> ThisFunctor;
-
-        const ThisFunctor& other = static_cast<const ThisFunctor&>( functor );
-
-        return m_handler == other.m_handler;
-    }
-
-private:
-    void (*m_handler)(EventArg&);
-
-    // Provide a dummy default ctor for type info purposes
-    wxEventFunctorFunction() { }
-
-    typedef wxEventFunctorFunction<EventTag, EventArg> thisClass;
-    WX_DECLARE_TYPEINFO_INLINE(thisClass)
-};
-
-
-template <typename EventTag, typename Functor>
-class wxEventFunctorFunctor : public wxEventFunctor
-{
-public:
-    typedef typename EventTag::EventClass EventArg;
-
-    wxEventFunctorFunctor(const Functor& handler)
-        : m_handler(handler), m_handlerAddr(&handler)
-        { }
-
-    virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event)
-    {
-        // If you get an error here like "must use '.*' or '->*' to call
-        // pointer-to-member function" then you probably tried to call
-        // Bind/Unbind with a method pointer but without a handler pointer or
-        // NULL as a handler e.g.:
-        // Unbind( wxEVT_XXX, &EventHandler::method );
-        // or
-        // Unbind( wxEVT_XXX, &EventHandler::method, NULL )
-        m_handler(static_cast<EventArg&>(event));
-    }
-
-    virtual bool IsMatching(const wxEventFunctor &functor) const
-    {
-        if ( wxTypeId(functor) != wxTypeId(*this) )
-            return false;
-
-        typedef wxEventFunctorFunctor<EventTag, Functor> FunctorThis;
-
-        const FunctorThis& other = static_cast<const FunctorThis&>(functor);
-
-        // The only reliable/portable way to compare two functors is by
-        // identity:
-        return m_handlerAddr == other.m_handlerAddr;
-    }
-
-private:
-    // Store a copy of the functor to prevent using/calling an already
-    // destroyed instance:
-    Functor m_handler;
-
-    // Use the address of the original functor for comparison in IsMatching:
-    const void *m_handlerAddr;
-
-    // Provide a dummy default ctor for type info purposes
-    wxEventFunctorFunctor() { }
-
-    typedef wxEventFunctorFunctor<EventTag, Functor> thisClass;
-    WX_DECLARE_TYPEINFO_INLINE(thisClass)
-};
-
-// Create functors for the templatized events, either allocated on the heap for
-// wxNewXXX() variants (this is needed in wxEvtHandler::Bind<>() to store them
-// in dynamic event table) or just by returning them as temporary objects (this
-// is enough for Unbind<>() and we avoid unnecessary heap allocation like this).
-
-
-// Create functors wrapping functions:
-template <typename EventTag, typename EventArg>
-inline wxEventFunctorFunction<EventTag, EventArg> *
-wxNewEventFunctor(const EventTag&, void (*func)(EventArg &))
-{
-    return new wxEventFunctorFunction<EventTag, EventArg>(func);
-}
-
-template <typename EventTag, typename EventArg>
-inline wxEventFunctorFunction<EventTag, EventArg>
-wxMakeEventFunctor(const EventTag&, void (*func)(EventArg &))
-{
-    return wxEventFunctorFunction<EventTag, EventArg>(func);
-}
-
-// Create functors wrapping other functors:
-template <typename EventTag, typename Functor>
-inline wxEventFunctorFunctor<EventTag, Functor> *
-wxNewEventFunctor(const EventTag&, const Functor &func)
-{
-    return new wxEventFunctorFunctor<EventTag, Functor>(func);
-}
-
-template <typename EventTag, typename Functor>
-inline wxEventFunctorFunctor<EventTag, Functor>
-wxMakeEventFunctor(const EventTag&, const Functor &func)
-{
-    return wxEventFunctorFunctor<EventTag, Functor>(func);
-}
-
-// Create functors wrapping methods:
-template
-  <typename EventTag, typename Class, typename EventArg, typename EventHandler>
-inline wxEventFunctorMethod<EventTag, Class, EventArg, EventHandler> *
-wxNewEventFunctor(const EventTag&,
-                  void (Class::*method)(EventArg&),
-                  EventHandler *handler)
-{
-    return new wxEventFunctorMethod<EventTag, Class, EventArg, EventHandler>(
-                method, handler);
-}
-
-template
-    <typename EventTag, typename Class, typename EventArg, typename EventHandler>
-inline wxEventFunctorMethod<EventTag, Class, EventArg, EventHandler>
-wxMakeEventFunctor(const EventTag&,
-                   void (Class::*method)(EventArg&),
-                   EventHandler *handler)
-{
-    return wxEventFunctorMethod<EventTag, Class, EventArg, EventHandler>(
-                method, handler);
-}
-
-// Create an event functor for the event table via wxDECLARE_EVENT_TABLE_ENTRY:
-// in this case we don't have the handler (as it's always the same as the
-// object which generated the event) so we must use Class as its type
-template <typename EventTag, typename Class, typename EventArg>
-inline wxEventFunctorMethod<EventTag, Class, EventArg, Class> *
-wxNewEventTableFunctor(const EventTag&, void (Class::*method)(EventArg&))
-{
-    return new wxEventFunctorMethod<EventTag, Class, EventArg, Class>(
-                    method, NULL);
-}
-
-#endif // wxHAS_EVENT_BIND
-
-
-// many, but not all, standard event types
-
-    // some generic events
-extern WXDLLIMPEXP_BASE const wxEventType wxEVT_NULL;
-extern WXDLLIMPEXP_BASE const wxEventType wxEVT_FIRST;
-extern WXDLLIMPEXP_BASE const wxEventType wxEVT_USER_FIRST;
-
-    // Need events declared to do this
-class WXDLLIMPEXP_FWD_BASE wxIdleEvent;
-class WXDLLIMPEXP_FWD_BASE wxThreadEvent;
-class WXDLLIMPEXP_FWD_CORE wxCommandEvent;
-class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
-class WXDLLIMPEXP_FWD_CORE wxFocusEvent;
-class WXDLLIMPEXP_FWD_CORE wxChildFocusEvent;
-class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
-class WXDLLIMPEXP_FWD_CORE wxSetCursorEvent;
-class WXDLLIMPEXP_FWD_CORE wxScrollEvent;
-class WXDLLIMPEXP_FWD_CORE wxSpinEvent;
-class WXDLLIMPEXP_FWD_CORE wxScrollWinEvent;
-class WXDLLIMPEXP_FWD_CORE wxSizeEvent;
-class WXDLLIMPEXP_FWD_CORE wxMoveEvent;
-class WXDLLIMPEXP_FWD_CORE wxCloseEvent;
-class WXDLLIMPEXP_FWD_CORE wxActivateEvent;
-class WXDLLIMPEXP_FWD_CORE wxWindowCreateEvent;
-class WXDLLIMPEXP_FWD_CORE wxWindowDestroyEvent;
-class WXDLLIMPEXP_FWD_CORE wxShowEvent;
-class WXDLLIMPEXP_FWD_CORE wxIconizeEvent;
-class WXDLLIMPEXP_FWD_CORE wxMaximizeEvent;
-class WXDLLIMPEXP_FWD_CORE wxMouseCaptureChangedEvent;
-class WXDLLIMPEXP_FWD_CORE wxMouseCaptureLostEvent;
-class WXDLLIMPEXP_FWD_CORE wxPaintEvent;
-class WXDLLIMPEXP_FWD_CORE wxEraseEvent;
-class WXDLLIMPEXP_FWD_CORE wxNcPaintEvent;
-class WXDLLIMPEXP_FWD_CORE wxMenuEvent;
-class WXDLLIMPEXP_FWD_CORE wxContextMenuEvent;
-class WXDLLIMPEXP_FWD_CORE wxSysColourChangedEvent;
-class WXDLLIMPEXP_FWD_CORE wxDisplayChangedEvent;
-class WXDLLIMPEXP_FWD_CORE wxQueryNewPaletteEvent;
-class WXDLLIMPEXP_FWD_CORE wxPaletteChangedEvent;
-class WXDLLIMPEXP_FWD_CORE wxJoystickEvent;
-class WXDLLIMPEXP_FWD_CORE wxDropFilesEvent;
-class WXDLLIMPEXP_FWD_CORE wxInitDialogEvent;
-class WXDLLIMPEXP_FWD_CORE wxUpdateUIEvent;
-class WXDLLIMPEXP_FWD_CORE wxClipboardTextEvent;
-class WXDLLIMPEXP_FWD_CORE wxHelpEvent;
-
-
-    // Command events
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEvent);
-
-// wxEVT_COMMAND_SCROLLBAR_UPDATED is deprecated, use wxEVT_SCROLL... events
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SCROLLBAR_UPDATED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_VLBOX_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_RCLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_ENTER, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_DROPDOWN, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_CLOSEUP, wxCommandEvent);
-
-    // Thread events
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_THREAD, wxThreadEvent);
-
-    // Mouse event types
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DOWN, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_UP, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DOWN, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_UP, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DOWN, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_UP, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOTION, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ENTER_WINDOW, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEAVE_WINDOW, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DCLICK, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DCLICK, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DCLICK, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_FOCUS, wxFocusEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KILL_FOCUS, wxFocusEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHILD_FOCUS, wxChildFocusEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSEWHEEL, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DOWN, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_UP, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DCLICK, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DOWN, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_UP, wxMouseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DCLICK, wxMouseEvent);
-
-    // Character input event type
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR, wxKeyEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR_HOOK, wxKeyEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NAVIGATION_KEY, wxNavigationKeyEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_DOWN, wxKeyEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_UP, wxKeyEvent);
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+BEGIN_DECLARE_EVENT_TYPES()
+
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+    wxEVT_NULL = 0,
+    wxEVT_FIRST = 10000,
+    wxEVT_USER_FIRST = wxEVT_FIRST + 2000,
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+    // it is important to still have these as constants to avoid
+    // initialization order related problems
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_NULL, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_FIRST, 10000)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_USER_FIRST, wxEVT_FIRST + 2000)
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED, 1)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED, 2)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED, 3)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_SELECTED, 4)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 5)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 6)
+    // now they are in wx/textctrl.h
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED, 7)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER, 8)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL, 13)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN, 14)
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_MENU_SELECTED, 9)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SLIDER_UPDATED, 10)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_RADIOBOX_SELECTED, 11)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_RADIOBUTTON_SELECTED, 12)
+
+    // wxEVT_COMMAND_SCROLLBAR_UPDATED is now obsolete since we use
+    // wxEVT_SCROLL... events
+
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SCROLLBAR_UPDATED, 13)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_VLBOX_SELECTED, 14)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_COMBOBOX_SELECTED, 15)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOOL_RCLICKED, 16)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER, 17)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED, 18)
+
+        // Sockets and timers send events, too
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_SOCKET, 50)
+    DECLARE_EVENT_TYPE(wxEVT_TIMER , 80)
+
+        // Mouse event types
+    DECLARE_EVENT_TYPE(wxEVT_LEFT_DOWN, 100)
+    DECLARE_EVENT_TYPE(wxEVT_LEFT_UP, 101)
+    DECLARE_EVENT_TYPE(wxEVT_MIDDLE_DOWN, 102)
+    DECLARE_EVENT_TYPE(wxEVT_MIDDLE_UP, 103)
+    DECLARE_EVENT_TYPE(wxEVT_RIGHT_DOWN, 104)
+    DECLARE_EVENT_TYPE(wxEVT_RIGHT_UP, 105)
+    DECLARE_EVENT_TYPE(wxEVT_MOTION, 106)
+    DECLARE_EVENT_TYPE(wxEVT_ENTER_WINDOW, 107)
+    DECLARE_EVENT_TYPE(wxEVT_LEAVE_WINDOW, 108)
+    DECLARE_EVENT_TYPE(wxEVT_LEFT_DCLICK, 109)
+    DECLARE_EVENT_TYPE(wxEVT_MIDDLE_DCLICK, 110)
+    DECLARE_EVENT_TYPE(wxEVT_RIGHT_DCLICK, 111)
+    DECLARE_EVENT_TYPE(wxEVT_SET_FOCUS, 112)
+    DECLARE_EVENT_TYPE(wxEVT_KILL_FOCUS, 113)
+    DECLARE_EVENT_TYPE(wxEVT_CHILD_FOCUS, 114)
+    DECLARE_EVENT_TYPE(wxEVT_MOUSEWHEEL, 115)
+
+        // Non-client mouse events
+    DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN, 200)
+    DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_UP, 201)
+    DECLARE_EVENT_TYPE(wxEVT_NC_MIDDLE_DOWN, 202)
+    DECLARE_EVENT_TYPE(wxEVT_NC_MIDDLE_UP, 203)
+    DECLARE_EVENT_TYPE(wxEVT_NC_RIGHT_DOWN, 204)
+    DECLARE_EVENT_TYPE(wxEVT_NC_RIGHT_UP, 205)
+    DECLARE_EVENT_TYPE(wxEVT_NC_MOTION, 206)
+    DECLARE_EVENT_TYPE(wxEVT_NC_ENTER_WINDOW, 207)
+    DECLARE_EVENT_TYPE(wxEVT_NC_LEAVE_WINDOW, 208)
+    DECLARE_EVENT_TYPE(wxEVT_NC_LEFT_DCLICK, 209)
+    DECLARE_EVENT_TYPE(wxEVT_NC_MIDDLE_DCLICK, 210)
+    DECLARE_EVENT_TYPE(wxEVT_NC_RIGHT_DCLICK, 211)
+
+        // Character input event type
+    DECLARE_EVENT_TYPE(wxEVT_CHAR, 212)
+    DECLARE_EVENT_TYPE(wxEVT_CHAR_HOOK, 213)
+    DECLARE_EVENT_TYPE(wxEVT_NAVIGATION_KEY, 214)
+    DECLARE_EVENT_TYPE(wxEVT_KEY_DOWN, 215)
+    DECLARE_EVENT_TYPE(wxEVT_KEY_UP, 216)
 #if wxUSE_HOTKEY
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HOTKEY, wxKeyEvent);
+    DECLARE_EVENT_TYPE(wxEVT_HOTKEY, 217)
 #endif
-// This is a private event used by wxMSW code only and subject to change or
-// disappear in the future. Don't use.
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AFTER_CHAR, wxKeyEvent);
+        // Set cursor event
+    DECLARE_EVENT_TYPE(wxEVT_SET_CURSOR, 230)
 
-    // Set cursor event
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_CURSOR, wxSetCursorEvent);
+        // wxScrollBar and wxSlider event identifiers
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_TOP, 300)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_BOTTOM, 301)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_LINEUP, 302)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_LINEDOWN, 303)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_PAGEUP, 304)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN, 305)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK, 306)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE, 307)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLL_CHANGED, 308)
 
-    // wxScrollBar and wxSlider event identifiers
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_TOP, wxScrollEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_BOTTOM, wxScrollEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEUP, wxScrollEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEDOWN, wxScrollEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEUP, wxScrollEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEDOWN, wxScrollEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBTRACK, wxScrollEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBRELEASE, wxScrollEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_CHANGED, wxScrollEvent);
+        // Scroll events from wxWindow
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP, 320)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM, 321)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEUP, 322)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEDOWN, 323)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEUP, 324)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEDOWN, 325)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBTRACK, 326)
+    DECLARE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBRELEASE, 327)
 
-// Due to a bug in older wx versions, wxSpinEvents were being sent with type of
-// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But
-// with the type-safe events in place, these event types are associated with
-// wxScrollEvent. To allow handling of spin events, new event types have been
-// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility
-// the spin event types are being initialized with the scroll event types.
+        // System events
+    DECLARE_EVENT_TYPE(wxEVT_SIZE, 400)
+    DECLARE_EVENT_TYPE(wxEVT_MOVE, 401)
+    DECLARE_EVENT_TYPE(wxEVT_CLOSE_WINDOW, 402)
+    DECLARE_EVENT_TYPE(wxEVT_END_SESSION, 403)
+    DECLARE_EVENT_TYPE(wxEVT_QUERY_END_SESSION, 404)
+    DECLARE_EVENT_TYPE(wxEVT_ACTIVATE_APP, 405)
+    // 406..408 are power events
+    DECLARE_EVENT_TYPE(wxEVT_ACTIVATE, 409)
+    DECLARE_EVENT_TYPE(wxEVT_CREATE, 410)
+    DECLARE_EVENT_TYPE(wxEVT_DESTROY, 411)
+    DECLARE_EVENT_TYPE(wxEVT_SHOW, 412)
+    DECLARE_EVENT_TYPE(wxEVT_ICONIZE, 413)
+    DECLARE_EVENT_TYPE(wxEVT_MAXIMIZE, 414)
+    DECLARE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_CHANGED, 415)
+    DECLARE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_LOST, 416)
+    DECLARE_EVENT_TYPE(wxEVT_PAINT, 417)
+    DECLARE_EVENT_TYPE(wxEVT_ERASE_BACKGROUND, 418)
+    DECLARE_EVENT_TYPE(wxEVT_NC_PAINT, 419)
+    DECLARE_EVENT_TYPE(wxEVT_PAINT_ICON, 420)
+    DECLARE_EVENT_TYPE(wxEVT_MENU_OPEN, 421)
+    DECLARE_EVENT_TYPE(wxEVT_MENU_CLOSE, 422)
+    DECLARE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT, 423)
+    DECLARE_EVENT_TYPE(wxEVT_CONTEXT_MENU, 424)
+    DECLARE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED, 425)
+    DECLARE_EVENT_TYPE(wxEVT_DISPLAY_CHANGED, 426)
+    DECLARE_EVENT_TYPE(wxEVT_SETTING_CHANGED, 427)
+    DECLARE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE, 428)
+    DECLARE_EVENT_TYPE(wxEVT_PALETTE_CHANGED, 429)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_BUTTON_DOWN, 430)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_BUTTON_UP, 431)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_MOVE, 432)
+    DECLARE_EVENT_TYPE(wxEVT_JOY_ZMOVE, 433)
+    DECLARE_EVENT_TYPE(wxEVT_DROP_FILES, 434)
+    DECLARE_EVENT_TYPE(wxEVT_DRAW_ITEM, 435)
+    DECLARE_EVENT_TYPE(wxEVT_MEASURE_ITEM, 436)
+    DECLARE_EVENT_TYPE(wxEVT_COMPARE_ITEM, 437)
+    DECLARE_EVENT_TYPE(wxEVT_INIT_DIALOG, 438)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_IDLE, 439)
+    DECLARE_EVENT_TYPE(wxEVT_UPDATE_UI, 440)
+    DECLARE_EVENT_TYPE(wxEVT_SIZING, 441)
+    DECLARE_EVENT_TYPE(wxEVT_MOVING, 442)
+    DECLARE_EVENT_TYPE(wxEVT_HIBERNATE, 443)
+    // more power events follow -- see wx/power.h
 
-#if wxUSE_SPINBTN
+        // Clipboard events
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_COPY, 444)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_CUT, 445)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_PASTE, 446)
 
-wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_UP,   wxSpinEvent );
-wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_DOWN, wxSpinEvent );
-wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN,      wxSpinEvent );
+        // Generic command events
+        // Note: a click is a higher-level event than button down/up
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LEFT_CLICK, 500)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LEFT_DCLICK, 501)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_CLICK, 502)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_DCLICK, 503)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SET_FOCUS, 504)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_KILL_FOCUS, 505)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_ENTER, 506)
 
-#endif
+        // Help events
+    DECLARE_EVENT_TYPE(wxEVT_HELP, 1050)
+    DECLARE_EVENT_TYPE(wxEVT_DETAILED_HELP, 1051)
 
-    // Scroll events from wxWindow
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_TOP, wxScrollWinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEUP, wxScrollWinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEUP, wxScrollWinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEvent);
-
-    // System events
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZE, wxSizeEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE, wxMoveEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CLOSE_WINDOW, wxCloseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_END_SESSION, wxCloseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_END_SESSION, wxCloseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE_APP, wxActivateEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE, wxActivateEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CREATE, wxWindowCreateEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DESTROY, wxWindowDestroyEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SHOW, wxShowEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ICONIZE, wxIconizeEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MAXIMIZE, wxMaximizeEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_CHANGED, wxMouseCaptureChangedEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PAINT, wxPaintEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ERASE_BACKGROUND, wxEraseEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NC_PAINT, wxNcPaintEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_OPEN, wxMenuEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_CLOSE, wxMenuEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_HIGHLIGHT, wxMenuEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CONTEXT_MENU, wxContextMenuEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SYS_COLOUR_CHANGED, wxSysColourChangedEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DISPLAY_CHANGED, wxDisplayChangedEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_NEW_PALETTE, wxQueryNewPaletteEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PALETTE_CHANGED, wxPaletteChangedEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_DOWN, wxJoystickEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_UP, wxJoystickEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_MOVE, wxJoystickEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_ZMOVE, wxJoystickEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DROP_FILES, wxDropFilesEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_INIT_DIALOG, wxInitDialogEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_IDLE, wxIdleEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_UPDATE_UI, wxUpdateUIEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZING, wxSizeEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVING, wxMoveEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_START, wxMoveEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_END, wxMoveEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HIBERNATE, wxActivateEvent);
-
-    // Clipboard events
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_COPY, wxClipboardTextEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_CUT, wxClipboardTextEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_PASTE, wxClipboardTextEvent);
-
-    // Generic command events
-    // Note: a click is a higher-level event than button down/up
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_CLICK, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_DCLICK, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_CLICK, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_DCLICK, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SET_FOCUS, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_KILL_FOCUS, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_ENTER, wxCommandEvent);
-
-    // Help events
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HELP, wxHelpEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DETAILED_HELP, wxHelpEvent);
+END_DECLARE_EVENT_TYPES()
 
 // these 2 events are the same
 #define wxEVT_COMMAND_TOOL_CLICKED wxEVT_COMMAND_MENU_SELECTED
@@ -830,16 +299,13 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DETAILED_HELP, wxHelpEvent);
 // wx/textctrl.h in all ports [yet], so declare it here as well
 //
 // still, any new code using it should include wx/textctrl.h explicitly
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent);
-
-
-// ----------------------------------------------------------------------------
-// wxEvent(-derived) classes
-// ----------------------------------------------------------------------------
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+    extern const wxEventType WXDLLIMPEXP_CORE wxEVT_COMMAND_TEXT_UPDATED;
+#endif
 
 // the predefined constants for the number of times we propagate event
 // upwards window child-parent chain
-enum wxEventPropagation
+enum Propagation_state
 {
     // don't propagate it at all
     wxEVENT_PROPAGATE_NONE = 0,
@@ -848,59 +314,6 @@ enum wxEventPropagation
     wxEVENT_PROPAGATE_MAX = INT_MAX
 };
 
-// The different categories for a wxEvent; see wxEvent::GetEventCategory.
-// NOTE: they are used as OR-combinable flags by wxEventLoopBase::YieldFor
-enum wxEventCategory
-{
-    // this is the category for those events which are generated to update
-    // the appearance of the GUI but which (usually) do not comport data
-    // processing, i.e. which do not provide input or output data
-    // (e.g. size events, scroll events, etc).
-    // They are events NOT directly generated by the user's input devices.
-    wxEVT_CATEGORY_UI = 1,
-
-    // this category groups those events which are generated directly from the
-    // user through input devices like mouse and keyboard and usually result in
-    // data to be processed from the application.
-    // (e.g. mouse clicks, key presses, etc)
-    wxEVT_CATEGORY_USER_INPUT = 2,
-
-    // this category is for wxSocketEvent
-    wxEVT_CATEGORY_SOCKET = 4,
-
-    // this category is for wxTimerEvent
-    wxEVT_CATEGORY_TIMER = 8,
-
-    // this category is for any event used to send notifications from the
-    // secondary threads to the main one or in general for notifications among
-    // different threads (which may or may not be user-generated)
-    wxEVT_CATEGORY_THREAD = 16,
-
-
-    // implementation only
-
-    // used in the implementations of wxEventLoopBase::YieldFor
-    wxEVT_CATEGORY_UNKNOWN = 32,
-
-    // a special category used as an argument to wxEventLoopBase::YieldFor to indicate that
-    // Yield() should leave all wxEvents on the queue while emptying the native event queue
-    // (native events will be processed but the wxEvents they generate will be queued)
-    wxEVT_CATEGORY_CLIPBOARD = 64,
-
-
-    // shortcut masks
-
-    // this category groups those events which are emitted in response to
-    // events of the native toolkit and which typically are not-"delayable".
-    wxEVT_CATEGORY_NATIVE_EVENTS = wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT,
-
-    // used in wxEventLoopBase::YieldFor to specify all event categories should be processed:
-    wxEVT_CATEGORY_ALL =
-        wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT|wxEVT_CATEGORY_SOCKET| \
-        wxEVT_CATEGORY_TIMER|wxEVT_CATEGORY_THREAD|wxEVT_CATEGORY_UNKNOWN| \
-        wxEVT_CATEGORY_CLIPBOARD
-};
-
 /*
  * wxWidgets events, covering all interesting things that might happen
  * (button clicking, resizing, setting text in widgets, etc.).
@@ -915,18 +328,21 @@ enum wxEventCategory
 
 class WXDLLIMPEXP_BASE wxEvent : public wxObject
 {
+private:
+    wxEvent& operator=(const wxEvent&);
+
+protected:
+    wxEvent(const wxEvent&);                   // for implementing Clone()
+
 public:
     wxEvent(int winid = 0, wxEventType commandType = wxEVT_NULL );
 
     void SetEventType(wxEventType typ) { m_eventType = typ; }
     wxEventType GetEventType() const { return m_eventType; }
-
     wxObject *GetEventObject() const { return m_eventObject; }
     void SetEventObject(wxObject *obj) { m_eventObject = obj; }
-
     long GetTimestamp() const { return m_timeStamp; }
     void SetTimestamp(long ts = 0) { m_timeStamp = ts; }
-
     int GetId() const { return m_id; }
     void SetId(int Id) { m_id = Id; }
 
@@ -937,17 +353,11 @@ public:
     void Skip(bool skip = true) { m_skipped = skip; }
     bool GetSkipped() const { return m_skipped; }
 
-    // This function is used to create a copy of the event polymorphically and
+    // this function is used to create a copy of the event polymorphically and
     // all derived classes must implement it because otherwise wxPostEvent()
     // for them wouldn't work (it needs to do a copy of the event)
     virtual wxEvent *Clone() const = 0;
 
-    // this function is used to selectively process events in wxEventLoopBase::YieldFor
-    // NOTE: by default it returns wxEVT_CATEGORY_UI just because the major
-    //       part of wxWidgets events belong to that category.
-    virtual wxEventCategory GetEventCategory() const
-        { return wxEVT_CATEGORY_UI; }
-
     // Implementation only: this test is explicitly anti OO and this function
     // exists only for optimization purposes.
     bool IsCommandEvent() const { return m_isCommandEvent; }
@@ -972,40 +382,11 @@ public:
         m_propagationLevel = propagationLevel;
     }
 
-
-    // This is for internal use only and is only called by
-    // wxEvtHandler::ProcessEvent() to check whether it's the first time this
-    // event is being processed
-    bool WasProcessed()
-    {
-        if ( m_wasProcessed )
-            return true;
-
-        m_wasProcessed = true;
-
-        return false;
-    }
-
-    // This is also used only internally by ProcessEvent() to check if it
-    // should process the event normally or only restrict the search for the
-    // event handler to this object itself.
-    bool ShouldProcessOnlyIn(wxEvtHandler *h) const
-    {
-        return h == m_handlerToProcessOnlyIn;
-    }
-
-    // Called to indicate that the result of ShouldProcessOnlyIn() wasn't taken
-    // into account. The existence of this function may seem counterintuitive
-    // but unfortunately it's needed by wxScrollHelperEvtHandler, see comments
-    // there. Don't even think of using this in your own code, this is a gross
-    // hack and is only needed because of wx complicated history and should
-    // never be used anywhere else.
-    void DidntHonourProcessOnlyIn()
-    {
-        m_handlerToProcessOnlyIn = NULL;
-    }
-
+#if WXWIN_COMPATIBILITY_2_4
+public:
+#else
 protected:
+#endif
     wxObject*         m_eventObject;
     wxEventType       m_eventType;
     long              m_timeStamp;
@@ -1015,36 +396,26 @@ public:
     // m_callbackUserData is for internal usage only
     wxObject*         m_callbackUserData;
 
-private:
-    // If this handler
-    wxEvtHandler *m_handlerToProcessOnlyIn;
-
 protected:
     // the propagation level: while it is positive, we propagate the event to
     // the parent window (if any)
+    //
+    // this one doesn't have to be public, we don't have to worry about
+    // backwards compatibility as it is new
     int               m_propagationLevel;
 
+#if WXWIN_COMPATIBILITY_2_4
+public:
+#else
+protected:
+#endif
     bool              m_skipped;
     bool              m_isCommandEvent;
 
-    // initially false but becomes true as soon as WasProcessed() is called for
-    // the first time, as this is done only by ProcessEvent() it explains the
-    // variable name: it becomes true after ProcessEvent() was called at least
-    // once for this event
-    bool m_wasProcessed;
-
-protected:
-    wxEvent(const wxEvent&);            // for implementing Clone()
-    wxEvent& operator=(const wxEvent&); // for derived classes operator=()
-
 private:
     // it needs to access our m_propagationLevel
     friend class WXDLLIMPEXP_FWD_BASE wxPropagateOnce;
 
-    // and this one needs to access our m_handlerToProcessOnlyIn
-    friend class WXDLLIMPEXP_FWD_BASE wxEventProcessInHandlerOnly;
-
-
     DECLARE_ABSTRACT_CLASS(wxEvent)
 };
 
@@ -1068,7 +439,7 @@ private:
     wxEvent& m_event;
     int m_propagationLevelOld;
 
-    wxDECLARE_NO_COPY_CLASS(wxPropagationDisabler);
+    DECLARE_NO_COPY_CLASS(wxPropagationDisabler)
 };
 
 /*
@@ -1093,175 +464,9 @@ public:
 private:
     wxEvent& m_event;
 
-    wxDECLARE_NO_COPY_CLASS(wxPropagateOnce);
+    DECLARE_NO_COPY_CLASS(wxPropagateOnce)
 };
 
-// A helper object used to temporarily make wxEvent::ShouldProcessOnlyIn()
-// return true for the handler passed to its ctor.
-class wxEventProcessInHandlerOnly
-{
-public:
-    wxEventProcessInHandlerOnly(wxEvent& event, wxEvtHandler *handler)
-        : m_event(event),
-          m_handlerToProcessOnlyInOld(event.m_handlerToProcessOnlyIn)
-    {
-        m_event.m_handlerToProcessOnlyIn = handler;
-    }
-
-    ~wxEventProcessInHandlerOnly()
-    {
-        m_event.m_handlerToProcessOnlyIn = m_handlerToProcessOnlyInOld;
-    }
-
-private:
-    wxEvent& m_event;
-    wxEvtHandler * const m_handlerToProcessOnlyInOld;
-
-    wxDECLARE_NO_COPY_CLASS(wxEventProcessInHandlerOnly);
-};
-
-
-class WXDLLIMPEXP_BASE wxEventBasicPayloadMixin
-{
-public:
-    wxEventBasicPayloadMixin()
-        : m_commandInt(0),
-          m_extraLong(0)
-    {
-    }
-
-    void SetString(const wxString& s) { m_cmdString = s; }
-    const wxString& GetString() const { return m_cmdString; }
-
-    void SetInt(int i) { m_commandInt = i; }
-    int GetInt() const { return m_commandInt; }
-
-    void SetExtraLong(long extraLong) { m_extraLong = extraLong; }
-    long GetExtraLong() const { return m_extraLong; }
-
-protected:
-    // Note: these variables have "cmd" or "command" in their name for backward compatibility:
-    //       they used to be part of wxCommandEvent, not this mixin.
-    wxString          m_cmdString;     // String event argument
-    int               m_commandInt;
-    long              m_extraLong;     // Additional information (e.g. select/deselect)
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin);
-};
-
-class WXDLLIMPEXP_BASE wxEventAnyPayloadMixin : public wxEventBasicPayloadMixin
-{
-public:
-    wxEventAnyPayloadMixin() : wxEventBasicPayloadMixin() {}
-
-#if wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7))
-    template<typename T>
-    void SetPayload(const T& payload)
-    {
-        m_payload = payload;
-    }
-
-    template<typename T>
-    T GetPayload() const
-    {
-        return m_payload.As<T>();
-    }
-
-protected:
-    wxAny m_payload;
-#endif // wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7))
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin);
-};
-
-
-// Idle event
-/*
- wxEVT_IDLE
- */
-
-// Whether to always send idle events to windows, or
-// to only send update events to those with the
-// wxWS_EX_PROCESS_IDLE style.
-
-enum wxIdleMode
-{
-        // Send idle events to all windows
-    wxIDLE_PROCESS_ALL,
-
-        // Send idle events to windows that have
-        // the wxWS_EX_PROCESS_IDLE flag specified
-    wxIDLE_PROCESS_SPECIFIED
-};
-
-class WXDLLIMPEXP_BASE wxIdleEvent : public wxEvent
-{
-public:
-    wxIdleEvent()
-        : wxEvent(0, wxEVT_IDLE),
-          m_requestMore(false)
-        { }
-    wxIdleEvent(const wxIdleEvent& event)
-        : wxEvent(event),
-          m_requestMore(event.m_requestMore)
-    { }
-
-    void RequestMore(bool needMore = true) { m_requestMore = needMore; }
-    bool MoreRequested() const { return m_requestMore; }
-
-    virtual wxEvent *Clone() const { return new wxIdleEvent(*this); }
-
-    // Specify how wxWidgets will send idle events: to
-    // all windows, or only to those which specify that they
-    // will process the events.
-    static void SetMode(wxIdleMode mode) { sm_idleMode = mode; }
-
-    // Returns the idle event mode
-    static wxIdleMode GetMode() { return sm_idleMode; }
-
-protected:
-    bool m_requestMore;
-    static wxIdleMode sm_idleMode;
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent)
-};
-
-
-// Thread event
-
-class WXDLLIMPEXP_BASE wxThreadEvent : public wxEvent,
-                                       public wxEventAnyPayloadMixin
-{
-public:
-    wxThreadEvent(wxEventType eventType = wxEVT_THREAD, int id = wxID_ANY)
-        : wxEvent(id, eventType)
-        { }
-
-    wxThreadEvent(const wxThreadEvent& event)
-        : wxEvent(event),
-          wxEventAnyPayloadMixin(event)
-    {
-        // make sure our string member (which uses COW, aka refcounting) is not
-        // shared by other wxString instances:
-        SetString(GetString().Clone());
-    }
-
-    virtual wxEvent *Clone() const
-    {
-        return new wxThreadEvent(*this);
-    }
-
-    // this is important to avoid that calling wxEventLoopBase::YieldFor thread events
-    // gets processed when this is unwanted:
-    virtual wxEventCategory GetEventCategory() const
-        { return wxEVT_CATEGORY_THREAD; }
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent)
-};
-
-
 #if wxUSE_GUI
 
 
@@ -1284,15 +489,39 @@ private:
  wxEVT_COMMAND_TOGGLEBUTTON_CLICKED
 */
 
-class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent,
-                                        public wxEventBasicPayloadMixin
+#if WXWIN_COMPATIBILITY_2_4
+// Backwards compatibility for wxCommandEvent::m_commandString, will lead to compilation errors in some cases of usage
+class WXDLLIMPEXP_CORE wxCommandEvent;
+
+class WXDLLIMPEXP_CORE wxCommandEventStringHelper
+{
+public:
+    wxCommandEventStringHelper(wxCommandEvent * evt)
+        : m_evt(evt)
+        { }
+
+    void operator=(const wxString &str);
+    operator wxString();
+    const wxChar* c_str() const;
+
+private:
+    wxCommandEvent* m_evt;
+};
+#endif
+
+class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent
 {
 public:
     wxCommandEvent(wxEventType commandType = wxEVT_NULL, int winid = 0);
 
     wxCommandEvent(const wxCommandEvent& event)
         : wxEvent(event),
-          wxEventBasicPayloadMixin(event),
+#if WXWIN_COMPATIBILITY_2_4
+          m_commandString(this),
+#endif
+          m_cmdString(event.m_cmdString),
+          m_commandInt(event.m_commandInt),
+          m_extraLong(event.m_extraLong),
           m_clientData(event.m_clientData),
           m_clientObject(event.m_clientObject)
         { }
@@ -1305,23 +534,36 @@ public:
     void SetClientObject(wxClientData* clientObject) { m_clientObject = clientObject; }
     wxClientData *GetClientObject() const { return m_clientObject; }
 
-    // Note: this shadows wxEventBasicPayloadMixin::GetString(), because it does some
-    // GUI-specific hacks
-    wxString GetString() const;
-
     // Get listbox selection if single-choice
     int GetSelection() const { return m_commandInt; }
 
+    // Set/Get listbox/choice selection string
+    void SetString(const wxString& s) { m_cmdString = s; }
+    wxString GetString() const;
+
     // Get checkbox value
     bool IsChecked() const { return m_commandInt != 0; }
 
     // true if the listbox event was a selection.
     bool IsSelection() const { return (m_extraLong != 0); }
 
-    virtual wxEvent *Clone() const { return new wxCommandEvent(*this); }
-    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }
+    void SetExtraLong(long extraLong) { m_extraLong = extraLong; }
+    long GetExtraLong() const { return m_extraLong; }
 
+    void SetInt(int i) { m_commandInt = i; }
+    int GetInt() const { return m_commandInt; }
+
+    virtual wxEvent *Clone() const { return new wxCommandEvent(*this); }
+
+#if WXWIN_COMPATIBILITY_2_4
+public:
+    wxCommandEventStringHelper m_commandString;
+#else
 protected:
+#endif
+    wxString          m_cmdString;     // String event argument
+    int               m_commandInt;
+    long              m_extraLong;     // Additional information (e.g. select/deselect)
     void*             m_clientData;    // Arbitrary client data
     wxClientData*     m_clientObject;  // Arbitrary client object
 
@@ -1329,6 +571,23 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent)
 };
 
+#if WXWIN_COMPATIBILITY_2_4
+inline void wxCommandEventStringHelper::operator=(const wxString &str)
+{
+    m_evt->SetString(str);
+}
+
+inline wxCommandEventStringHelper::operator wxString()
+{
+    return m_evt->GetString();
+}
+
+inline const wxChar* wxCommandEventStringHelper::c_str() const
+{
+    return m_evt->GetString().c_str();
+}
+#endif
+
 // this class adds a possibility to react (from the user) code to a control
 // notification: allow or veto the operation being reported.
 class WXDLLIMPEXP_CORE wxNotifyEvent  : public wxCommandEvent
@@ -1360,7 +619,6 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent)
 };
 
-
 // Scroll event class, derived form wxCommandEvent. wxScrollEvents are
 // sent by wxSlider and wxScrollBar.
 /*
@@ -1410,7 +668,7 @@ class WXDLLIMPEXP_CORE wxScrollWinEvent : public wxEvent
 public:
     wxScrollWinEvent(wxEventType commandType = wxEVT_NULL,
                      int pos = 0, int orient = 0);
-    wxScrollWinEvent(const wxScrollWinEvent& event) : wxEvent(event)
+    wxScrollWinEvent(const wxScrollWinEvent & event) : wxEvent(event)
         {    m_commandInt = event.m_commandInt;
             m_extraLong = event.m_extraLong;    }
 
@@ -1421,7 +679,11 @@ public:
 
     virtual wxEvent *Clone() const { return new wxScrollWinEvent(*this); }
 
+#if WXWIN_COMPATIBILITY_2_4
+public:
+#else
 protected:
+#endif
     int               m_commandInt;
     long              m_extraLong;
 
@@ -1429,8 +691,6 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent)
 };
 
-
-
 // Mouse event class
 
 /*
@@ -1446,25 +706,36 @@ private:
  wxEVT_LEFT_DCLICK
  wxEVT_MIDDLE_DCLICK
  wxEVT_RIGHT_DCLICK
+ wxEVT_NC_LEFT_DOWN
+ wxEVT_NC_LEFT_UP,
+ wxEVT_NC_MIDDLE_DOWN,
+ wxEVT_NC_MIDDLE_UP,
+ wxEVT_NC_RIGHT_DOWN,
+ wxEVT_NC_RIGHT_UP,
+ wxEVT_NC_MOTION,
+ wxEVT_NC_ENTER_WINDOW,
+ wxEVT_NC_LEAVE_WINDOW,
+ wxEVT_NC_LEFT_DCLICK,
+ wxEVT_NC_MIDDLE_DCLICK,
+ wxEVT_NC_RIGHT_DCLICK,
 */
 
-enum wxMouseWheelAxis
+// the symbolic names for the mouse buttons
+enum
 {
-    wxMOUSE_WHEEL_VERTICAL,
-    wxMOUSE_WHEEL_HORIZONTAL
+    wxMOUSE_BTN_ANY     = -1,
+    wxMOUSE_BTN_NONE    = 0,
+    wxMOUSE_BTN_LEFT    = 1,
+    wxMOUSE_BTN_MIDDLE  = 2,
+    wxMOUSE_BTN_RIGHT   = 3
 };
 
-class WXDLLIMPEXP_CORE wxMouseEvent : public wxEvent,
-                                      public wxMouseState
+class WXDLLIMPEXP_CORE wxMouseEvent : public wxEvent
 {
 public:
     wxMouseEvent(wxEventType mouseType = wxEVT_NULL);
-    wxMouseEvent(const wxMouseEvent& event)
-        : wxEvent(event),
-          wxMouseState(event)
-    {
-        Assign(event);
-    }
+    wxMouseEvent(const wxMouseEvent& event)    : wxEvent(event)
+        { Assign(event); }
 
     // Was it a button event? (*doesn't* mean: is any button *down*?)
     bool IsButton() const { return Button(wxMOUSE_BTN_ANY); }
@@ -1478,30 +749,47 @@ public:
     // Was it a up event from this (or any) button?
     bool ButtonUp(int but = wxMOUSE_BTN_ANY) const;
 
-    // Was this event generated by the given button?
+    // Was the given button?
     bool Button(int but) const;
 
+    // Was the given button in Down state?
+    bool ButtonIsDown(int but) const;
+
     // Get the button which is changing state (wxMOUSE_BTN_NONE if none)
     int GetButton() const;
 
+    // Find state of shift/control keys
+    bool ControlDown() const { return m_controlDown; }
+    bool MetaDown() const { return m_metaDown; }
+    bool AltDown() const { return m_altDown; }
+    bool ShiftDown() const { return m_shiftDown; }
+    bool CmdDown() const
+    {
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+        return MetaDown();
+#else
+        return ControlDown();
+#endif
+    }
+
     // Find which event was just generated
     bool LeftDown() const { return (m_eventType == wxEVT_LEFT_DOWN); }
     bool MiddleDown() const { return (m_eventType == wxEVT_MIDDLE_DOWN); }
     bool RightDown() const { return (m_eventType == wxEVT_RIGHT_DOWN); }
-    bool Aux1Down() const { return (m_eventType == wxEVT_AUX1_DOWN); }
-    bool Aux2Down() const { return (m_eventType == wxEVT_AUX2_DOWN); }
 
     bool LeftUp() const { return (m_eventType == wxEVT_LEFT_UP); }
     bool MiddleUp() const { return (m_eventType == wxEVT_MIDDLE_UP); }
     bool RightUp() const { return (m_eventType == wxEVT_RIGHT_UP); }
-    bool Aux1Up() const { return (m_eventType == wxEVT_AUX1_UP); }
-    bool Aux2Up() const { return (m_eventType == wxEVT_AUX2_UP); }
 
     bool LeftDClick() const { return (m_eventType == wxEVT_LEFT_DCLICK); }
     bool MiddleDClick() const { return (m_eventType == wxEVT_MIDDLE_DCLICK); }
     bool RightDClick() const { return (m_eventType == wxEVT_RIGHT_DCLICK); }
-    bool Aux1DClick() const { return (m_eventType == wxEVT_AUX1_DCLICK); }
-    bool Aux2DClick() const { return (m_eventType == wxEVT_AUX2_DCLICK); }
+
+    // Find the current state of the mouse buttons (regardless
+    // of current event type)
+    bool LeftIsDown() const { return m_leftDown; }
+    bool MiddleIsDown() const { return m_middleDown; }
+    bool RightIsDown() const { return m_rightDown; }
 
     // True if a button is down and the mouse is moving
     bool Dragging() const
@@ -1521,12 +809,35 @@ public:
     // True if the mouse is just leaving the window
     bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); }
 
-    // Returns the number of mouse clicks associated with this event.
-    int GetClickCount() const { return m_clickCount; }
+    // Find the position of the event
+    void GetPosition(wxCoord *xpos, wxCoord *ypos) const
+    {
+        if (xpos)
+            *xpos = m_x;
+        if (ypos)
+            *ypos = m_y;
+    }
+
+    void GetPosition(long *xpos, long *ypos) const
+    {
+        if (xpos)
+            *xpos = (long)m_x;
+        if (ypos)
+            *ypos = (long)m_y;
+    }
+
+    // Find the position of the event
+    wxPoint GetPosition() const { return wxPoint(m_x, m_y); }
 
     // Find the logical position of the event given the DC
     wxPoint GetLogicalPosition(const wxDC& dc) const;
 
+    // Get X position
+    wxCoord GetX() const { return m_x; }
+
+    // Get Y position
+    wxCoord GetY() const { return m_y; }
+
     // Get wheel rotation, positive or negative indicates direction of
     // rotation.  Current devices all send an event when rotation is equal to
     // +/-WheelDelta, but this allows for finer resolution devices to be
@@ -1541,11 +852,6 @@ public:
     // should occur for each delta.
     int GetWheelDelta() const { return m_wheelDelta; }
 
-    // Gets the axis the wheel operation concerns; wxMOUSE_WHEEL_VERTICAL
-    // (most common case) or wxMOUSE_WHEEL_HORIZONTAL (for horizontal scrolling
-    // using e.g. a trackpad).
-    wxMouseWheelAxis GetWheelAxis() const { return m_wheelAxis; }
-
     // Returns the configured number of lines (or whatever) to be scrolled per
     // wheel action.  Defaults to one.
     int GetLinesPerAction() const { return m_linesPerAction; }
@@ -1554,19 +860,21 @@ public:
     bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); }
 
     virtual wxEvent *Clone() const { return new wxMouseEvent(*this); }
-    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }
 
-    wxMouseEvent& operator=(const wxMouseEvent& event)
-    {
-        if (&event != this)
-            Assign(event);
-        return *this;
-    }
+    wxMouseEvent& operator=(const wxMouseEvent& event) { Assign(event); return *this; }
 
 public:
-    int           m_clickCount;
+    wxCoord m_x, m_y;
+
+    bool          m_leftDown;
+    bool          m_middleDown;
+    bool          m_rightDown;
+
+    bool          m_controlDown;
+    bool          m_shiftDown;
+    bool          m_altDown;
+    bool          m_metaDown;
 
-    wxMouseWheelAxis m_wheelAxis;
     int           m_wheelRotation;
     int           m_wheelDelta;
     int           m_linesPerAction;
@@ -1592,7 +900,7 @@ public:
           m_x(x), m_y(y), m_cursor()
         { }
 
-    wxSetCursorEvent(const wxSetCursorEvent& event)
+    wxSetCursorEvent(const wxSetCursorEvent & event)
         : wxEvent(event),
           m_x(event.m_x),
           m_y(event.m_y),
@@ -1604,7 +912,7 @@ public:
 
     void SetCursor(const wxCursor& cursor) { m_cursor = cursor; }
     const wxCursor& GetCursor() const { return m_cursor; }
-    bool HasCursor() const { return m_cursor.IsOk(); }
+    bool HasCursor() const { return m_cursor.Ok(); }
 
     virtual wxEvent *Clone() const { return new wxSetCursorEvent(*this); }
 
@@ -1626,51 +934,51 @@ private:
  wxEVT_HOTKEY
  */
 
-// key categories: the bit flags for IsKeyInCategory() function
-//
-// the enum values used may change in future version of wx
-// use the named constants only, or bitwise combinations thereof
-enum wxKeyCategoryFlags
-{
-    // arrow keys, on and off numeric keypads
-    WXK_CATEGORY_ARROW  = 1,
-
-    // page up and page down keys, on and off numeric keypads
-    WXK_CATEGORY_PAGING = 2,
-
-    // home and end keys, on and off numeric keypads
-    WXK_CATEGORY_JUMP   = 4,
-
-    // tab key, on and off numeric keypads
-    WXK_CATEGORY_TAB    = 8,
-
-    // backspace and delete keys, on and off numeric keypads
-    WXK_CATEGORY_CUT    = 16,
-
-    // all keys usually used for navigation
-    WXK_CATEGORY_NAVIGATION = WXK_CATEGORY_ARROW |
-                              WXK_CATEGORY_PAGING |
-                              WXK_CATEGORY_JUMP
-};
-
-class WXDLLIMPEXP_CORE wxKeyEvent : public wxEvent,
-                                    public wxKeyboardState
+class WXDLLIMPEXP_CORE wxKeyEvent : public wxEvent
 {
 public:
     wxKeyEvent(wxEventType keyType = wxEVT_NULL);
-
-    // Normal copy ctor and a ctor creating a new event for the same key as the
-    // given one but a different event type (this is used in implementation
-    // code only, do not use outside of the library).
     wxKeyEvent(const wxKeyEvent& evt);
-    wxKeyEvent(wxEventType eventType, const wxKeyEvent& evt);
+
+    // can be used check if the key event has exactly the given modifiers:
+    // "GetModifiers() = wxMOD_CONTROL" is easier to write than "ControlDown()
+    // && !MetaDown() && !AltDown() && !ShiftDown()"
+    int GetModifiers() const
+    {
+        return (m_controlDown ? wxMOD_CONTROL : 0) |
+               (m_shiftDown ? wxMOD_SHIFT : 0) |
+               (m_metaDown ? wxMOD_META : 0) |
+               (m_altDown ? wxMOD_ALT : 0);
+    }
+
+    // Find state of shift/control keys
+    bool ControlDown() const { return m_controlDown; }
+    bool ShiftDown() const { return m_shiftDown; }
+    bool MetaDown() const { return m_metaDown; }
+    bool AltDown() const { return m_altDown; }
+
+    // "Cmd" is a pseudo key which is Control for PC and Unix platforms but
+    // Apple ("Command") key under Macs: it makes often sense to use it instead
+    // of, say, ControlDown() because Cmd key is used for the same thing under
+    // Mac as Ctrl elsewhere (but Ctrl still exists, just not used for this
+    // purpose under Mac)
+    bool CmdDown() const
+    {
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+        return MetaDown();
+#else
+        return ControlDown();
+#endif
+    }
+
+    // exclude MetaDown() from HasModifiers() because NumLock under X is often
+    // configured as mod2 modifier, yet the key events even when it is pressed
+    // should be processed normally, not like Ctrl- or Alt-key
+    bool HasModifiers() const { return ControlDown() || AltDown(); }
 
     // get the key code: an ASCII7 char or an element of wxKeyCode enum
     int GetKeyCode() const { return (int)m_keyCode; }
 
-    // returns true iff this event's key code is of a certain type
-    bool IsKeyInCategory(int category) const;
-
 #if wxUSE_UNICODE
     // get the Unicode character corresponding to this key
     wxChar GetUnicodeKey() const { return m_uniChar; }
@@ -1704,32 +1012,33 @@ public:
     // Get Y position
     wxCoord GetY() const { return m_y; }
 
-    // Can be called from wxEVT_CHAR_HOOK handler to allow generation of normal
-    // key events even though the event had been handled (by default they would
-    // not be generated in this case).
-    void DoAllowNextEvent() { m_allowNext = true; }
-
-    // Return the value of the "allow next" flag, for internal use only.
-    bool IsNextEventAllowed() const { return m_allowNext; }
-
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated, Use GetKeyCode instead.
+    wxDEPRECATED( long KeyCode() const );
+#endif // WXWIN_COMPATIBILITY_2_6
 
     virtual wxEvent *Clone() const { return new wxKeyEvent(*this); }
-    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }
 
     // we do need to copy wxKeyEvent sometimes (in wxTreeCtrl code, for
     // example)
     wxKeyEvent& operator=(const wxKeyEvent& evt)
     {
-        if ( &evt != this )
-        {
-            wxEvent::operator=(evt);
+        m_x = evt.m_x;
+        m_y = evt.m_y;
 
-            // Borland C++ 5.82 doesn't compile an explicit call to an
-            // implicitly defined operator=() so need to do it this way:
-            *static_cast<wxKeyboardState *>(this) = evt;
+        m_keyCode = evt.m_keyCode;
+
+        m_controlDown = evt.m_controlDown;
+        m_shiftDown = evt.m_shiftDown;
+        m_altDown = evt.m_altDown;
+        m_metaDown = evt.m_metaDown;
+        m_scanCode = evt.m_scanCode;
+        m_rawCode = evt.m_rawCode;
+        m_rawFlags = evt.m_rawFlags;
+#if wxUSE_UNICODE
+        m_uniChar = evt.m_uniChar;
+#endif
 
-            DoAssignMembers(evt);
-        }
         return *this;
     }
 
@@ -1738,6 +1047,15 @@ public:
 
     long          m_keyCode;
 
+    // TODO: replace those with a single m_modifiers bitmask of wxMOD_XXX?
+    bool          m_controlDown;
+    bool          m_shiftDown;
+    bool          m_altDown;
+    bool          m_metaDown;
+
+    // FIXME: what is this for? relation to m_rawXXX?
+    bool          m_scanCode;
+
 #if wxUSE_UNICODE
     // This contains the full Unicode character
     // in a character events in Unicode mode
@@ -1750,37 +1068,6 @@ public:
     wxUint32      m_rawFlags;
 
 private:
-    // Set the event to propagate if necessary, i.e. if it's of wxEVT_CHAR_HOOK
-    // type. This is used by all ctors.
-    void InitPropagation()
-    {
-        if ( m_eventType == wxEVT_CHAR_HOOK )
-            m_propagationLevel = wxEVENT_PROPAGATE_MAX;
-
-        m_allowNext = false;
-    }
-
-    // Copy only the event data present in this class, this is used by
-    // AssignKeyData() and copy ctor.
-    void DoAssignMembers(const wxKeyEvent& evt)
-    {
-        m_x = evt.m_x;
-        m_y = evt.m_y;
-
-        m_keyCode = evt.m_keyCode;
-
-        m_rawCode = evt.m_rawCode;
-        m_rawFlags = evt.m_rawFlags;
-#if wxUSE_UNICODE
-        m_uniChar = evt.m_uniChar;
-#endif
-    }
-
-    // If this flag is true, the normal key events should still be generated
-    // even if wxEVT_CHAR_HOOK had been handled. By default it is false as
-    // handling wxEVT_CHAR_HOOK suppresses all the subsequent events.
-    bool m_allowNext;
-
     DECLARE_DYNAMIC_CLASS(wxKeyEvent)
 };
 
@@ -1798,7 +1085,7 @@ public:
         : wxEvent(winid, wxEVT_SIZE),
           m_size(sz)
         { }
-    wxSizeEvent(const wxSizeEvent& event)
+    wxSizeEvent(const wxSizeEvent & event)
         : wxEvent(event),
           m_size(event.m_size), m_rect(event.m_rect)
         { }
@@ -1807,7 +1094,6 @@ public:
         { m_eventType = wxEVT_SIZING; m_id = id; }
 
     wxSize GetSize() const { return m_size; }
-    void SetSize(wxSize size) { m_size = size; }
     wxRect GetRect() const { return m_rect; }
     void SetRect(const wxRect& rect) { m_rect = rect; }
 
@@ -1853,7 +1139,11 @@ public:
 
     virtual wxEvent *Clone() const { return new wxMoveEvent(*this); }
 
+#if WXWIN_COMPATIBILITY_2_4
+public:
+#else
 protected:
+#endif
     wxPoint m_pos;
     wxRect m_rect;
 
@@ -1865,11 +1155,10 @@ private:
 /*
  wxEVT_PAINT
  wxEVT_NC_PAINT
+ wxEVT_PAINT_ICON
  */
 
-#if wxDEBUG_LEVEL && (defined(__WXMSW__) || defined(__WXPM__))
-    #define wxHAS_PAINT_DEBUG
-
+#if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
     // see comments in src/msw|os2/dcclient.cpp where g_isPainting is defined
     extern WXDLLIMPEXP_CORE int g_isPainting;
 #endif // debug
@@ -1880,15 +1169,15 @@ public:
     wxPaintEvent(int Id = 0)
         : wxEvent(Id, wxEVT_PAINT)
     {
-#ifdef wxHAS_PAINT_DEBUG
-        // set the internal flag for the duration of redrawing
+#if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
+        // set the internal flag for the duration of processing of WM_PAINT
         g_isPainting++;
 #endif // debug
     }
 
     // default copy ctor and dtor are normally fine, we only need them to keep
     // g_isPainting updated in debug build
-#ifdef wxHAS_PAINT_DEBUG
+#if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
     wxPaintEvent(const wxPaintEvent& event)
             : wxEvent(event)
     {
@@ -1928,7 +1217,7 @@ private:
 class WXDLLIMPEXP_CORE wxEraseEvent : public wxEvent
 {
 public:
-    wxEraseEvent(int Id = 0, wxDC *dc = NULL)
+    wxEraseEvent(int Id = 0, wxDC *dc = (wxDC *) NULL)
         : wxEvent(Id, wxEVT_ERASE_BACKGROUND),
           m_dc(dc)
         { }
@@ -1942,7 +1231,11 @@ public:
 
     virtual wxEvent *Clone() const { return new wxEraseEvent(*this); }
 
+#if WXWIN_COMPATIBILITY_2_4
+public:
+#else
 protected:
+#endif
     wxDC *m_dc;
 
 private:
@@ -2055,7 +1348,7 @@ public:
     wxMenuEvent(wxEventType type = wxEVT_NULL, int winid = 0, wxMenu* menu = NULL)
         : wxEvent(winid, type)
         { m_menuId = winid; m_menu = menu; }
-    wxMenuEvent(const wxMenuEvent& event)
+    wxMenuEvent(const wxMenuEvent & event)
         : wxEvent(event)
     { m_menuId = event.m_menuId; m_menu = event.m_menu; }
 
@@ -2093,7 +1386,7 @@ public:
           m_veto(false),      // should be false by default
           m_canVeto(true) {}
 
-    wxCloseEvent(const wxCloseEvent& event)
+    wxCloseEvent(const wxCloseEvent & event)
         : wxEvent(event),
         m_loggingOff(event.m_loggingOff),
         m_veto(event.m_veto),
@@ -2143,17 +1436,14 @@ public:
     wxShowEvent(int winid = 0, bool show = false)
         : wxEvent(winid, wxEVT_SHOW)
         { m_show = show; }
-    wxShowEvent(const wxShowEvent& event)
+    wxShowEvent(const wxShowEvent & event)
         : wxEvent(event)
     { m_show = event.m_show; }
 
     void SetShow(bool show) { m_show = show; }
-
-    // return true if the window was shown, false if hidden
-    bool IsShown() const { return m_show; }
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( bool GetShow() const { return IsShown(); } )
+    bool GetShow() const { return m_show; }
+#if wxABI_VERSION >= 20811
+    bool IsShown() const { return GetShow(); }
 #endif
 
     virtual wxEvent *Clone() const { return new wxShowEvent(*this); }
@@ -2175,16 +1465,15 @@ public:
     wxIconizeEvent(int winid = 0, bool iconized = true)
         : wxEvent(winid, wxEVT_ICONIZE)
         { m_iconized = iconized; }
-    wxIconizeEvent(const wxIconizeEvent& event)
+    wxIconizeEvent(const wxIconizeEvent & event)
         : wxEvent(event)
     { m_iconized = event.m_iconized; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( bool Iconized() const { return IsIconized(); } )
-#endif
     // return true if the frame was iconized, false if restored
-    bool IsIconized() const { return m_iconized; }
-
+    bool Iconized() const { return m_iconized; }
+#if wxABI_VERSION >= 20811
+    bool IsIconized() const { return Iconized(); }
+#endif
     virtual wxEvent *Clone() const { return new wxIconizeEvent(*this); }
 
 protected:
@@ -2237,7 +1526,11 @@ enum
 
 class WXDLLIMPEXP_CORE wxJoystickEvent : public wxEvent
 {
+#if WXWIN_COMPATIBILITY_2_4
+public:
+#else
 protected:
+#endif
     wxPoint   m_pos;
     int       m_zPosition;
     int       m_buttonChange;   // Which button changed?
@@ -2257,7 +1550,7 @@ public:
           m_joyStick(joystick)
     {
     }
-    wxJoystickEvent(const wxJoystickEvent& event)
+    wxJoystickEvent(const wxJoystickEvent & event)
         : wxEvent(event),
           m_pos(event.m_pos),
           m_zPosition(event.m_zPosition),
@@ -2323,7 +1616,7 @@ public:
 
     wxDropFilesEvent(wxEventType type = wxEVT_NULL,
                      int noFiles = 0,
-                     wxString *files = NULL)
+                     wxString *files = (wxString *) NULL)
         : wxEvent(0, type),
           m_noFiles(noFiles),
           m_pos(),
@@ -2392,7 +1685,7 @@ public:
         m_setText =
         m_setChecked = false;
     }
-    wxUpdateUIEvent(const wxUpdateUIEvent& event)
+    wxUpdateUIEvent(const wxUpdateUIEvent & event)
         : wxCommandEvent(event),
           m_checked(event.m_checked),
           m_enabled(event.m_enabled),
@@ -2556,7 +1849,7 @@ class WXDLLIMPEXP_CORE wxPaletteChangedEvent : public wxEvent
 public:
     wxPaletteChangedEvent(wxWindowID winid = 0)
         : wxEvent(winid, wxEVT_PALETTE_CHANGED),
-          m_changedWindow(NULL)
+          m_changedWindow((wxWindow *) NULL)
         { }
 
     wxPaletteChangedEvent(const wxPaletteChangedEvent& event)
@@ -2588,7 +1881,7 @@ public:
         : wxEvent(winid, wxEVT_QUERY_NEW_PALETTE),
           m_paletteRealized(false)
         { }
-    wxQueryNewPaletteEvent(const wxQueryNewPaletteEvent& event)
+    wxQueryNewPaletteEvent(const wxQueryNewPaletteEvent & event)
         : wxEvent(event),
         m_paletteRealized(event.m_paletteRealized)
     { }
@@ -2617,7 +1910,7 @@ public:
     wxNavigationKeyEvent()
         : wxEvent(0, wxEVT_NAVIGATION_KEY),
           m_flags(IsForward | FromTab),    // defaults are for TAB
-          m_focus(NULL)
+          m_focus((wxWindow *)NULL)
         {
             m_propagationLevel = wxEVENT_PROPAGATE_NONE;
         }
@@ -2658,7 +1951,7 @@ public:
 
     virtual wxEvent *Clone() const { return new wxNavigationKeyEvent(*this); }
 
-    enum wxNavigationKeyEventFlags
+    enum
     {
         IsBackward = 0x0000,
         IsForward = 0x0001,
@@ -2734,7 +2027,7 @@ public:
           m_pos(pt),
           m_origin(GuessOrigin(origin))
     { }
-    wxHelpEvent(const wxHelpEvent& event)
+    wxHelpEvent(const wxHelpEvent & event)
         : wxCommandEvent(event),
           m_pos(event.m_pos),
           m_target(event.m_target),
@@ -2792,7 +2085,7 @@ public:
                      wxWindowID winid = 0)
         : wxCommandEvent(type, winid)
     { }
-    wxClipboardTextEvent(const wxClipboardTextEvent& event)
+    wxClipboardTextEvent(const wxClipboardTextEvent & event)
         : wxCommandEvent(event)
     { }
 
@@ -2819,7 +2112,7 @@ public:
         : wxCommandEvent(type, winid),
           m_pos(pt)
     { }
-    wxContextMenuEvent(const wxContextMenuEvent& event)
+    wxContextMenuEvent(const wxContextMenuEvent & event)
         : wxCommandEvent(event),
         m_pos(event.m_pos)
     { }
@@ -2837,6 +2130,62 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent)
 };
 
+// Idle event
+/*
+ wxEVT_IDLE
+ */
+
+// Whether to always send idle events to windows, or
+// to only send update events to those with the
+// wxWS_EX_PROCESS_IDLE style.
+
+enum wxIdleMode
+{
+        // Send idle events to all windows
+    wxIDLE_PROCESS_ALL,
+
+        // Send idle events to windows that have
+        // the wxWS_EX_PROCESS_IDLE flag specified
+    wxIDLE_PROCESS_SPECIFIED
+};
+
+class WXDLLIMPEXP_CORE wxIdleEvent : public wxEvent
+{
+public:
+    wxIdleEvent()
+        : wxEvent(0, wxEVT_IDLE),
+          m_requestMore(false)
+        { }
+    wxIdleEvent(const wxIdleEvent & event)
+        : wxEvent(event),
+          m_requestMore(event.m_requestMore)
+    { }
+
+    void RequestMore(bool needMore = true) { m_requestMore = needMore; }
+    bool MoreRequested() const { return m_requestMore; }
+
+    virtual wxEvent *Clone() const { return new wxIdleEvent(*this); }
+
+    // Specify how wxWidgets will send idle events: to
+    // all windows, or only to those which specify that they
+    // will process the events.
+    static void SetMode(wxIdleMode mode) { sm_idleMode = mode; }
+
+    // Returns the idle event mode
+    static wxIdleMode GetMode() { return sm_idleMode; }
+
+    // Can we send an idle event?
+    static bool CanSend(wxWindow* win);
+
+protected:
+    bool m_requestMore;
+    static wxIdleMode sm_idleMode;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent)
+};
+
+#endif // wxUSE_GUI
 
 /* TODO
  wxEVT_MOUSE_CAPTURE_CHANGED,
@@ -2848,69 +2197,75 @@ private:
  wxEVT_COMPARE_ITEM
 */
 
-#endif // wxUSE_GUI
-
 
 // ============================================================================
 // event handler and related classes
 // ============================================================================
 
+// for backwards compatibility and to prevent eVC 4 for ARM from crashing with
+// internal compiler error when compiling wx, we define wxObjectEventFunction
+// as a wxObject method even though it can only be a wxEvtHandler one
+typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
+
+// we can't have ctors nor base struct in backwards compatibility mode or
+// otherwise we won't be able to initialize the objects with an agregate, so
+// we have to keep both versions
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+
+struct WXDLLIMPEXP_BASE wxEventTableEntry
+{
+    // For some reason, this can't be wxEventType, or VC++ complains.
+    int m_eventType;            // main event type
+    int m_id;                   // control/menu/toolbar id
+    int m_lastId;               // used for ranges of ids
+    wxObjectEventFunction m_fn; // function to call: not wxEventFunction,
+                                // because of dependency problems
+
+    wxObject* m_callbackUserData;
+};
+
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
 
 // struct containing the members common to static and dynamic event tables
 // entries
 struct WXDLLIMPEXP_BASE wxEventTableEntryBase
 {
+private:
+    wxEventTableEntryBase& operator=(const wxEventTableEntryBase& event);
+
+public:
     wxEventTableEntryBase(int winid, int idLast,
-                          wxEventFunctor* fn, wxObject *data)
+                          wxObjectEventFunction fn, wxObject *data)
         : m_id(winid),
           m_lastId(idLast),
           m_fn(fn),
           m_callbackUserData(data)
-    {
-        wxASSERT_MSG( idLast == wxID_ANY || winid <= idLast,
-                      "invalid IDs range: lower bound > upper bound" );
-    }
+    { }
 
-    wxEventTableEntryBase( const wxEventTableEntryBase &entry )
-        : m_id( entry.m_id ),
-          m_lastId( entry.m_lastId ),
-          m_fn( entry.m_fn ),
-          m_callbackUserData( entry.m_callbackUserData )
-    {
-        // This is a 'hack' to ensure that only one instance tries to delete
-        // the functor pointer. It is safe as long as the only place where the
-        // copy constructor is being called is when the static event tables are
-        // being initialized (a temporary instance is created and then this
-        // constructor is called).
-
-        const_cast<wxEventTableEntryBase&>( entry ).m_fn = NULL;
-    }
-
-    ~wxEventTableEntryBase()
-    {
-        delete m_fn;
-    }
+    wxEventTableEntryBase(const wxEventTableEntryBase& event)
+        : m_id(event.m_id),
+          m_lastId(event.m_lastId),
+          m_fn(event.m_fn),
+          m_callbackUserData(event.m_callbackUserData)
+    { }
 
     // the range of ids for this entry: if m_lastId == wxID_ANY, the range
     // consists only of m_id, otherwise it is m_id..m_lastId inclusive
     int m_id,
         m_lastId;
 
-    // function/method/functor to call
-    wxEventFunctor* m_fn;
+    // function to call: not wxEventFunction, because of dependency problems
+    wxObjectEventFunction m_fn;
 
-    // arbitrary user data associated with the callback
+    // arbitrary user data asosciated with the callback
     wxObject* m_callbackUserData;
-
-private:
-    wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntryBase);
 };
 
 // an entry from a static event table
 struct WXDLLIMPEXP_BASE wxEventTableEntry : public wxEventTableEntryBase
 {
     wxEventTableEntry(const int& evType, int winid, int idLast,
-                      wxEventFunctor* fn, wxObject *data)
+                      wxObjectEventFunction fn, wxObject *data)
         : wxEventTableEntryBase(winid, idLast, fn, data),
         m_eventType(evType)
     { }
@@ -2924,16 +2279,17 @@ struct WXDLLIMPEXP_BASE wxEventTableEntry : public wxEventTableEntryBase
     const int& m_eventType;
 
 private:
-    wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntry);
+    wxEventTableEntry& operator=(const wxEventTableEntry&);
 };
 
 // an entry used in dynamic event table managed by wxEvtHandler::Connect()
 struct WXDLLIMPEXP_BASE wxDynamicEventTableEntry : public wxEventTableEntryBase
 {
     wxDynamicEventTableEntry(int evType, int winid, int idLast,
-                             wxEventFunctor* fn, wxObject *data)
+                             wxObjectEventFunction fn, wxObject *data, wxEvtHandler* eventSink)
         : wxEventTableEntryBase(winid, idLast, fn, data),
-          m_eventType(evType)
+          m_eventType(evType),
+          m_eventSink(eventSink)
     { }
 
     // not a reference here as we can't keep a reference to a temporary int
@@ -2941,10 +2297,16 @@ struct WXDLLIMPEXP_BASE wxDynamicEventTableEntry : public wxEventTableEntryBase
     // do we need it
     int m_eventType;
 
-private:
-    wxDECLARE_NO_ASSIGN_CLASS(wxDynamicEventTableEntry);
+    // Pointer to object whose function is fn - so we don't assume the
+    // EventFunction is always a member of the EventHandler receiving the
+    // message
+    wxEvtHandler* m_eventSink;
+
+    DECLARE_NO_COPY_CLASS(wxDynamicEventTableEntry)
 };
 
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
 // ----------------------------------------------------------------------------
 // wxEventTable: an array of event entries terminated with {0, 0, 0, 0, 0}
 // ----------------------------------------------------------------------------
@@ -2983,16 +2345,15 @@ public:
 
     // Handle the given event, in other words search the event table hash
     // and call self->ProcessEvent() if a match was found.
-    bool HandleEvent(wxEvent& event, wxEvtHandler *self);
+    bool HandleEvent(wxEvent &event, wxEvtHandler *self);
 
     // Clear table
     void Clear();
 
-#if wxUSE_MEMORY_TRACING
-    // Clear all tables: only used to work around problems in memory tracing
-    // code
+    // Clear all tables
     static void ClearAll();
-#endif // wxUSE_MEMORY_TRACING
+    // Rebuild all tables
+    static void ReconstructAll();
 
 protected:
     // Init the hash table with the entries of the static event table.
@@ -3016,7 +2377,7 @@ protected:
     wxEventHashTable* m_previous;
     wxEventHashTable* m_next;
 
-    wxDECLARE_NO_COPY_CLASS(wxEventHashTable);
+    DECLARE_NO_COPY_CLASS(wxEventHashTable)
 };
 
 // ----------------------------------------------------------------------------
@@ -3024,252 +2385,75 @@ protected:
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxEvtHandler : public wxObject
-                                    , public wxTrackable
 {
 public:
     wxEvtHandler();
     virtual ~wxEvtHandler();
 
-
-    // Event handler chain
-    // -------------------
-
     wxEvtHandler *GetNextHandler() const { return m_nextHandler; }
     wxEvtHandler *GetPreviousHandler() const { return m_previousHandler; }
-    virtual void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; }
-    virtual void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; }
+    void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; }
+    void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; }
 
     void SetEvtHandlerEnabled(bool enabled) { m_enabled = enabled; }
     bool GetEvtHandlerEnabled() const { return m_enabled; }
 
-    void Unlink();
-    bool IsUnlinked() const;
-
-
-    // Global event filters
-    // --------------------
-
-    // Add an event filter whose FilterEvent() method will be called for each
-    // and every event processed by wxWidgets. The filters are called in LIFO
-    // order and wxApp is registered as an event filter by default. The pointer
-    // must remain valid until it's removed with RemoveFilter() and is not
-    // deleted by wxEvtHandler.
-    static void AddFilter(wxEventFilter* filter);
-
-    // Remove a filter previously installed with AddFilter().
-    static void RemoveFilter(wxEventFilter* filter);
-
-
-    // Event queuing and processing
-    // ----------------------------
-
-    // Process an event right now: this can only be called from the main
-    // thread, use QueueEvent() for scheduling the events for
-    // processing from other threads.
+    // process an event right now
     virtual bool ProcessEvent(wxEvent& event);
 
-    // Process an event by calling ProcessEvent and handling any exceptions
-    // thrown by event handlers. It's mostly useful when processing wx events
-    // when called from C code (e.g. in GTK+ callback) when the exception
-    // wouldn't correctly propagate to wxEventLoop.
-    bool SafelyProcessEvent(wxEvent& event);
-        // NOTE: uses ProcessEvent()
-
-    // This method tries to process the event in this event handler, including
-    // any preprocessing done by TryBefore() and all the handlers chained to
-    // it, but excluding the post-processing done in TryAfter().
-    //
-    // It is meant to be called from ProcessEvent() only and is not virtual,
-    // additional event handlers can be hooked into the normal event processing
-    // logic using TryBefore() and TryAfter() hooks.
-    //
-    // You can also call it yourself to forward an event to another handler but
-    // without propagating it upwards if it's unhandled (this is usually
-    // unwanted when forwarding as the original handler would already do it if
-    // needed normally).
-    bool ProcessEventLocally(wxEvent& event);
-
-    // Schedule the given event to be processed later. It takes ownership of
-    // the event pointer, i.e. it will be deleted later. This is safe to call
-    // from multiple threads although you still need to ensure that wxString
-    // fields of the event object are deep copies and not use the same string
-    // buffer as other wxString objects in this thread.
-    virtual void QueueEvent(wxEvent *event);
-
-    // Add an event to be processed later: notice that this function is not
-    // safe to call from threads other than main, use QueueEvent()
-    virtual void AddPendingEvent(const wxEvent& event)
-    {
-        // notice that the thread-safety problem comes from the fact that
-        // Clone() doesn't make deep copies of wxString fields of wxEvent
-        // object and so the same wxString could be used from both threads when
-        // the event object is destroyed in this one -- QueueEvent() avoids
-        // this problem as the event pointer is not used any more in this
-        // thread at all after it is called.
-        QueueEvent(event.Clone());
-    }
+    // add an event to be processed later
+    void AddPendingEvent(wxEvent& event);
 
     void ProcessPendingEvents();
-        // NOTE: uses ProcessEvent()
-
-    void DeletePendingEvents();
 
 #if wxUSE_THREADS
-    bool ProcessThreadEvent(const wxEvent& event);
-        // NOTE: uses AddPendingEvent(); call only from secondary threads
+    bool ProcessThreadEvent(wxEvent& event);
 #endif
 
-
-    // Connecting and disconnecting
-    // ----------------------------
-
-    // These functions are used for old, untyped, event handlers and don't
-    // check that the type of the function passed to them actually matches the
-    // type of the event. They also only allow connecting events to methods of
-    // wxEvtHandler-derived classes.
-    //
-    // The template Connect() methods below are safer and allow connecting
-    // events to arbitrary functions or functors -- but require compiler
-    // support for templates.
-
     // Dynamic association of a member function handler with the event handler,
     // winid and event type
     void Connect(int winid,
                  int lastId,
-                 wxEventType eventType,
+                 int eventType,
                  wxObjectEventFunction func,
-                 wxObject *userData = NULL,
-                 wxEvtHandler *eventSink = NULL)
-    {
-        DoBind(winid, lastId, eventType,
-                  wxNewEventFunctor(eventType, func, eventSink),
-                  userData);
-    }
+                 wxObject *userData = (wxObject *) NULL,
+                 wxEvtHandler *eventSink = (wxEvtHandler *) NULL);
 
     // Convenience function: take just one id
     void Connect(int winid,
-                 wxEventType eventType,
+                 int eventType,
                  wxObjectEventFunction func,
-                 wxObject *userData = NULL,
-                 wxEvtHandler *eventSink = NULL)
+                 wxObject *userData = (wxObject *) NULL,
+                 wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
         { Connect(winid, wxID_ANY, eventType, func, userData, eventSink); }
 
     // Even more convenient: without id (same as using id of wxID_ANY)
-    void Connect(wxEventType eventType,
+    void Connect(int eventType,
                  wxObjectEventFunction func,
-                 wxObject *userData = NULL,
-                 wxEvtHandler *eventSink = NULL)
+                 wxObject *userData = (wxObject *) NULL,
+                 wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
         { Connect(wxID_ANY, wxID_ANY, eventType, func, userData, eventSink); }
 
     bool Disconnect(int winid,
                     int lastId,
                     wxEventType eventType,
                     wxObjectEventFunction func = NULL,
-                    wxObject *userData = NULL,
-                    wxEvtHandler *eventSink = NULL)
-    {
-        return DoUnbind(winid, lastId, eventType,
-                            wxMakeEventFunctor(eventType, func, eventSink),
-                            userData );
-    }
+                    wxObject *userData = (wxObject *) NULL,
+                    wxEvtHandler *eventSink = (wxEvtHandler *) NULL);
 
     bool Disconnect(int winid = wxID_ANY,
                     wxEventType eventType = wxEVT_NULL,
                     wxObjectEventFunction func = NULL,
-                    wxObject *userData = NULL,
-                    wxEvtHandler *eventSink = NULL)
+                    wxObject *userData = (wxObject *) NULL,
+                    wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
         { return Disconnect(winid, wxID_ANY, eventType, func, userData, eventSink); }
 
     bool Disconnect(wxEventType eventType,
                     wxObjectEventFunction func,
-                    wxObject *userData = NULL,
-                    wxEvtHandler *eventSink = NULL)
+                    wxObject *userData = (wxObject *) NULL,
+                    wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
         { return Disconnect(wxID_ANY, eventType, func, userData, eventSink); }
 
-#ifdef wxHAS_EVENT_BIND
-    // Bind functions to an event:
-    template <typename EventTag, typename EventArg>
-    void Bind(const EventTag& eventType,
-              void (*function)(EventArg &),
-              int winid = wxID_ANY,
-              int lastId = wxID_ANY,
-              wxObject *userData = NULL)
-    {
-        DoBind(winid, lastId, eventType,
-                  wxNewEventFunctor(eventType, function),
-                  userData);
-    }
-
-
-    template <typename EventTag, typename EventArg>
-    bool Unbind(const EventTag& eventType,
-                void (*function)(EventArg &),
-                int winid = wxID_ANY,
-                int lastId = wxID_ANY,
-                wxObject *userData = NULL)
-    {
-        return DoUnbind(winid, lastId, eventType,
-                            wxMakeEventFunctor(eventType, function),
-                            userData);
-    }
-
-    // Bind functors to an event:
-    template <typename EventTag, typename Functor>
-    void Bind(const EventTag& eventType,
-              const Functor &functor,
-              int winid = wxID_ANY,
-              int lastId = wxID_ANY,
-              wxObject *userData = NULL)
-    {
-        DoBind(winid, lastId, eventType,
-                  wxNewEventFunctor(eventType, functor),
-                  userData);
-    }
-
-
-    template <typename EventTag, typename Functor>
-    bool Unbind(const EventTag& eventType,
-                const Functor &functor,
-                int winid = wxID_ANY,
-                int lastId = wxID_ANY,
-                wxObject *userData = NULL)
-    {
-        return DoUnbind(winid, lastId, eventType,
-                            wxMakeEventFunctor(eventType, functor),
-                            userData);
-    }
-
-
-    // Bind a method of a class (called on the specified handler which must
-    // be convertible to this class) object to an event:
-
-    template <typename EventTag, typename Class, typename EventArg, typename EventHandler>
-    void Bind(const EventTag &eventType,
-              void (Class::*method)(EventArg &),
-              EventHandler *handler,
-              int winid = wxID_ANY,
-              int lastId = wxID_ANY,
-              wxObject *userData = NULL)
-    {
-        DoBind(winid, lastId, eventType,
-                  wxNewEventFunctor(eventType, method, handler),
-                  userData);
-    }
-
-    template <typename EventTag, typename Class, typename EventArg, typename EventHandler>
-    bool Unbind(const EventTag &eventType,
-                void (Class::*method)(EventArg&),
-                EventHandler *handler,
-                int winid = wxID_ANY,
-                int lastId = wxID_ANY,
-                wxObject *userData = NULL )
-    {
-        return DoUnbind(winid, lastId, eventType,
-                            wxMakeEventFunctor(eventType, method, handler),
-                            userData);
-    }
-#endif // wxHAS_EVENT_BIND
-
     wxList* GetDynamicEventTable() const { return m_dynamicEvents ; }
 
     // User data can be associated with each wxEvtHandler
@@ -3279,80 +2463,48 @@ public:
     void SetClientData( void *data ) { DoSetClientData(data); }
     void *GetClientData() const { return DoGetClientData(); }
 
-
-    // implementation from now on
-    // --------------------------
-
-    // check if the given event table entry matches this event by id (the check
-    // for the event type should be done by caller) and call the handler if it
-    // does
+    // check if the given event table entry matches this event and call the
+    // handler if it does
     //
     // return true if the event was processed, false otherwise (no match or the
     // handler decided to skip the event)
-    static bool ProcessEventIfMatchesId(const wxEventTableEntryBase& tableEntry,
-                                        wxEvtHandler *handler,
-                                        wxEvent& event);
+    static bool ProcessEventIfMatches(const wxEventTableEntryBase& tableEntry,
+                                      wxEvtHandler *handler,
+                                      wxEvent& event);
 
+    // implementation from now on
     virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
     bool SearchDynamicEventTable( wxEvent& event );
 
+#if wxUSE_THREADS
+    void ClearEventLocker();
+#endif // wxUSE_THREADS
+
     // Avoid problems at exit by cleaning up static hash table gracefully
     void ClearEventHashTable() { GetEventHashTable().Clear(); }
-    void OnSinkDestroyed( wxEvtHandler *sink );
-
 
 private:
-    void DoBind(int winid,
-                   int lastId,
-                   wxEventType eventType,
-                   wxEventFunctor *func,
-                   wxObject* userData = NULL);
-
-    bool DoUnbind(int winid,
-                      int lastId,
-                      wxEventType eventType,
-                      const wxEventFunctor& func,
-                      wxObject *userData = NULL);
-
     static const wxEventTableEntry sm_eventTableEntries[];
 
 protected:
     // hooks for wxWindow used by ProcessEvent()
     // -----------------------------------------
 
-    // this one is called before trying our own event table to allow plugging
-    // in the event handlers overriding the default logic, this is used by e.g.
-    // validators.
-    virtual bool TryBefore(wxEvent& event);
-
-    // This one is not a hook but just a helper which looks up the handler in
-    // this object itself.
+    // This one is called before trying our own event table to allow plugging
+    // in the validators.
     //
-    // It is called from ProcessEventLocally() and normally shouldn't be called
-    // directly as doing it would ignore any chained event handlers
-    bool TryHereOnly(wxEvent& event);
-
-    // Another helper which simply calls pre-processing hook and then tries to
-    // handle the event at this handler level.
-    bool TryBeforeAndHere(wxEvent& event)
-    {
-        return TryBefore(event) || TryHereOnly(event);
-    }
+    // NB: This method is intentionally *not* inside wxUSE_VALIDATORS!
+    //     It is part of wxBase which doesn't use validators and the code
+    //     is compiled out when building wxBase w/o GUI classes, which affects
+    //     binary compatibility and wxBase library can't be used by GUI
+    //     ports.
+    virtual bool TryValidator(wxEvent& WXUNUSED(event)) { return false; }
 
     // this one is called after failing to find the event handle in our own
     // table to give a chance to the other windows to process it
     //
     // base class implementation passes the event to wxTheApp
-    virtual bool TryAfter(wxEvent& event);
-
-#if WXWIN_COMPATIBILITY_2_8
-    // deprecated method: override TryBefore() instead of this one
-    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
-        virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; )
-
-    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
-        virtual bool TryParent(wxEvent& event), return DoTryApp(event); )
-#endif // WXWIN_COMPATIBILITY_2_8
+    virtual bool TryParent(wxEvent& event);
 
 
     static const wxEventTable sm_eventTable;
@@ -3367,9 +2519,18 @@ protected:
     wxList*             m_pendingEvents;
 
 #if wxUSE_THREADS
-    // critical section protecting m_pendingEvents
-    wxCriticalSection m_pendingEventsLock;
-#endif // wxUSE_THREADS
+#if defined (__VISAGECPP__)
+    const wxCriticalSection& Lock() const { return m_eventsLocker; }
+    wxCriticalSection& Lock() { return m_eventsLocker; }
+
+    wxCriticalSection   m_eventsLocker;
+#  else
+    const wxCriticalSection& Lock() const { return *m_eventsLocker; }
+    wxCriticalSection& Lock() { return *m_eventsLocker; }
+
+    wxCriticalSection*  m_eventsLocker;
+#  endif
+#endif
 
     // Is event handler enabled?
     bool                m_enabled;
@@ -3396,142 +2557,26 @@ protected:
     virtual void DoSetClientData( void *data );
     virtual void *DoGetClientData() const;
 
-    // Search tracker objects for event connection with this sink
-    wxEventConnectionRef *FindRefInTrackerList(wxEvtHandler *handler);
-
 private:
-    // pass the event to wxTheApp instance, called from TryAfter()
-    bool DoTryApp(wxEvent& event);
-
-    // try to process events in all handlers chained to this one
-    bool DoTryChain(wxEvent& event);
-
-    // Head of the event filter linked list.
-    static wxEventFilter* ms_filterList;
-
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler)
 };
 
-WX_DEFINE_ARRAY_WITH_DECL_PTR(wxEvtHandler *, wxEvtHandlerArray, class WXDLLIMPEXP_BASE);
-
-
-// Define an inline method of wxObjectEventFunctor which couldn't be defined
-// before wxEvtHandler declaration: at least Sun CC refuses to compile function
-// calls through pointer to member for forward-declared classes (see #12452).
-inline void wxObjectEventFunctor::operator()(wxEvtHandler *handler, wxEvent& event)
+// Post a message to the given eventhandler which will be processed during the
+// next event loop iteration
+inline void wxPostEvent(wxEvtHandler *dest, wxEvent& event)
 {
-    wxEvtHandler * const realHandler = m_handler ? m_handler : handler;
-
-    (realHandler->*m_method)(event);
-}
-
-// ----------------------------------------------------------------------------
-// wxEventConnectionRef represents all connections between two event handlers
-// and enables automatic disconnect when an event handler sink goes out of
-// scope. Each connection/disconnect increases/decreases ref count, and
-// when it reaches zero the node goes out of scope.
-// ----------------------------------------------------------------------------
-
-class wxEventConnectionRef : public wxTrackerNode
-{
-public:
-    wxEventConnectionRef() : m_src(NULL), m_sink(NULL), m_refCount(0) { }
-    wxEventConnectionRef(wxEvtHandler *src, wxEvtHandler *sink)
-        : m_src(src), m_sink(sink), m_refCount(1)
-    {
-        m_sink->AddNode(this);
-    }
-
-    // The sink is being destroyed
-    virtual void OnObjectDestroy( )
-    {
-        if ( m_src )
-            m_src->OnSinkDestroyed( m_sink );
-        delete this;
-    }
-
-    virtual wxEventConnectionRef *ToEventConnection() { return this; }
-
-    void IncRef() { m_refCount++; }
-    void DecRef()
-    {
-        if ( !--m_refCount )
-        {
-            // The sink holds the only external pointer to this object
-            if ( m_sink )
-                m_sink->RemoveNode(this);
-            delete this;
-        }
-    }
-
-private:
-    wxEvtHandler *m_src,
-                 *m_sink;
-    int m_refCount;
-
-    friend class wxEvtHandler;
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxEventConnectionRef);
-};
-
-// Post a message to the given event handler which will be processed during the
-// next event loop iteration.
-//
-// Notice that this one is not thread-safe, use wxQueueEvent()
-inline void wxPostEvent(wxEvtHandler *dest, const wxEvent& event)
-{
-    wxCHECK_RET( dest, "need an object to post event to" );
+    wxCHECK_RET( dest, wxT("need an object to post event to in wxPostEvent") );
 
     dest->AddPendingEvent(event);
 }
 
-// Wrapper around wxEvtHandler::QueueEvent(): adds an event for later
-// processing, unlike wxPostEvent it is safe to use from different thread even
-// for events with wxString members
-inline void wxQueueEvent(wxEvtHandler *dest, wxEvent *event)
-{
-    wxCHECK_RET( dest, "need an object to queue event for" );
-
-    dest->QueueEvent(event);
-}
-
 typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
-typedef void (wxEvtHandler::*wxIdleEventFunction)(wxIdleEvent&);
-typedef void (wxEvtHandler::*wxThreadEventFunction)(wxThreadEvent&);
 
 #define wxEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxEventFunction, func)
-#define wxIdleEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxIdleEventFunction, func)
-#define wxThreadEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxThreadEventFunction, func)
+    (wxObjectEventFunction)wxStaticCastEvent(wxEventFunction, &func)
 
 #if wxUSE_GUI
 
-// ----------------------------------------------------------------------------
-// wxEventBlocker: helper class to temporarily disable event handling for a window
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxEventBlocker : public wxEvtHandler
-{
-public:
-    wxEventBlocker(wxWindow *win, wxEventType type = wxEVT_ANY);
-    virtual ~wxEventBlocker();
-
-    void Block(wxEventType type)
-    {
-        m_eventsToBlock.push_back(type);
-    }
-
-    virtual bool ProcessEvent(wxEvent& event);
-
-protected:
-    wxArrayInt m_eventsToBlock;
-    wxWindow *m_window;
-
-    wxDECLARE_NO_COPY_CLASS(wxEventBlocker);
-};
-
 typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&);
 typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&);
 typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&);
@@ -3552,6 +2597,7 @@ typedef void (wxEvtHandler::*wxInitDialogEventFunction)(wxInitDialogEvent&);
 typedef void (wxEvtHandler::*wxSysColourChangedEventFunction)(wxSysColourChangedEvent&);
 typedef void (wxEvtHandler::*wxDisplayChangedEventFunction)(wxDisplayChangedEvent&);
 typedef void (wxEvtHandler::*wxUpdateUIEventFunction)(wxUpdateUIEvent&);
+typedef void (wxEvtHandler::*wxIdleEventFunction)(wxIdleEvent&);
 typedef void (wxEvtHandler::*wxCloseEventFunction)(wxCloseEvent&);
 typedef void (wxEvtHandler::*wxShowEventFunction)(wxShowEvent&);
 typedef void (wxEvtHandler::*wxIconizeEventFunction)(wxIconizeEvent&);
@@ -3569,100 +2615,109 @@ typedef void (wxEvtHandler::*wxMouseCaptureChangedEventFunction)(wxMouseCaptureC
 typedef void (wxEvtHandler::*wxMouseCaptureLostEventFunction)(wxMouseCaptureLostEvent&);
 typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&);
 
+// these typedefs don't have the same name structure as the others, keep for
+// backwards compatibility only
+#if WXWIN_COMPATIBILITY_2_4
+    typedef wxSysColourChangedEventFunction wxSysColourChangedFunction;
+    typedef wxDisplayChangedEventFunction wxDisplayChangedFunction;
+#endif // WXWIN_COMPATIBILITY_2_4
+
 
 #define wxCommandEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxCommandEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCommandEventFunction, &func)
 #define wxScrollEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxScrollEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxScrollEventFunction, &func)
 #define wxScrollWinEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxScrollWinEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxScrollWinEventFunction, &func)
 #define wxSizeEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxSizeEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSizeEventFunction, &func)
 #define wxMoveEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxMoveEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxMoveEventFunction, &func)
 #define wxPaintEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxPaintEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxPaintEventFunction, &func)
 #define wxNcPaintEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxNcPaintEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxNcPaintEventFunction, &func)
 #define wxEraseEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxEraseEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxEraseEventFunction, &func)
 #define wxMouseEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxMouseEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxMouseEventFunction, &func)
 #define wxCharEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxCharEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCharEventFunction, &func)
 #define wxKeyEventHandler(func) wxCharEventHandler(func)
 #define wxFocusEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxFocusEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFocusEventFunction, &func)
 #define wxChildFocusEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxChildFocusEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxChildFocusEventFunction, &func)
 #define wxActivateEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxActivateEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxActivateEventFunction, &func)
 #define wxMenuEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxMenuEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxMenuEventFunction, &func)
 #define wxJoystickEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxJoystickEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxJoystickEventFunction, &func)
 #define wxDropFilesEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxDropFilesEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDropFilesEventFunction, &func)
 #define wxInitDialogEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxInitDialogEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxInitDialogEventFunction, &func)
 #define wxSysColourChangedEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxSysColourChangedEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSysColourChangedEventFunction, &func)
 #define wxDisplayChangedEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxDisplayChangedEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxDisplayChangedEventFunction, &func)
 #define wxUpdateUIEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxUpdateUIEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxUpdateUIEventFunction, &func)
+#define wxIdleEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxIdleEventFunction, &func)
 #define wxCloseEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxCloseEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCloseEventFunction, &func)
 #define wxShowEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxShowEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxShowEventFunction, &func)
 #define wxIconizeEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxIconizeEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxIconizeEventFunction, &func)
 #define wxMaximizeEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxMaximizeEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxMaximizeEventFunction, &func)
 #define wxNavigationKeyEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxNavigationKeyEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxNavigationKeyEventFunction, &func)
 #define wxPaletteChangedEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxPaletteChangedEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxPaletteChangedEventFunction, &func)
 #define wxQueryNewPaletteEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxQueryNewPaletteEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxQueryNewPaletteEventFunction, &func)
 #define wxWindowCreateEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxWindowCreateEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxWindowCreateEventFunction, &func)
 #define wxWindowDestroyEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxWindowDestroyEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxWindowDestroyEventFunction, &func)
 #define wxSetCursorEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxSetCursorEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSetCursorEventFunction, &func)
 #define wxNotifyEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxNotifyEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxNotifyEventFunction, &func)
 #define wxHelpEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxHelpEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxHelpEventFunction, &func)
 #define wxContextMenuEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxContextMenuEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxContextMenuEventFunction, &func)
 #define wxMouseCaptureChangedEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxMouseCaptureChangedEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxMouseCaptureChangedEventFunction, &func)
 #define wxMouseCaptureLostEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxMouseCaptureLostEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxMouseCaptureLostEventFunction, &func)
 #define wxClipboardTextEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxClipboardTextEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxClipboardTextEventFunction, &func)
 
 #endif // wxUSE_GUI
 
 // N.B. In GNU-WIN32, you *have* to take the address of a member function
 // (use &) or the compiler crashes...
 
-#define wxDECLARE_EVENT_TABLE()                                         \
-    private:                                                            \
-        static const wxEventTableEntry sm_eventTableEntries[];          \
-    protected:                                                          \
-        static const wxEventTable        sm_eventTable;                 \
-        virtual const wxEventTable*      GetEventTable() const;         \
-        static wxEventHashTable          sm_eventHashTable;             \
-        virtual wxEventHashTable&        GetEventHashTable() const
+#define DECLARE_EVENT_TABLE() \
+    private: \
+        static const wxEventTableEntry sm_eventTableEntries[]; \
+    protected: \
+        static const wxEventTable        sm_eventTable; \
+        virtual const wxEventTable*      GetEventTable() const; \
+        static wxEventHashTable          sm_eventHashTable; \
+        virtual wxEventHashTable&        GetEventHashTable() const;
 
 // N.B.: when building DLL with Borland C++ 5.5 compiler, you must initialize
 //       sm_eventTable before using it in GetEventTable() or the compiler gives
 //       E2233 (see http://groups.google.com/groups?selm=397dcc8a%241_2%40dnews)
 
-#define wxBEGIN_EVENT_TABLE(theClass, baseClass) \
+#define BEGIN_EVENT_TABLE(theClass, baseClass) \
     const wxEventTable theClass::sm_eventTable = \
         { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \
     const wxEventTable *theClass::GetEventTable() const \
@@ -3672,7 +2727,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
         { return theClass::sm_eventHashTable; } \
     const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
 
-#define wxBEGIN_EVENT_TABLE_TEMPLATE1(theClass, baseClass, T1) \
+#define BEGIN_EVENT_TABLE_TEMPLATE1(theClass, baseClass, T1) \
     template<typename T1> \
     const wxEventTable theClass<T1>::sm_eventTable = \
         { &baseClass::sm_eventTable, &theClass<T1>::sm_eventTableEntries[0] }; \
@@ -3687,7 +2742,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
     template<typename T1> \
     const wxEventTableEntry theClass<T1>::sm_eventTableEntries[] = { \
 
-#define wxBEGIN_EVENT_TABLE_TEMPLATE2(theClass, baseClass, T1, T2) \
+#define BEGIN_EVENT_TABLE_TEMPLATE2(theClass, baseClass, T1, T2) \
     template<typename T1, typename T2> \
     const wxEventTable theClass<T1, T2>::sm_eventTable = \
         { &baseClass::sm_eventTable, &theClass<T1, T2>::sm_eventTableEntries[0] }; \
@@ -3702,7 +2757,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
     template<typename T1, typename T2> \
     const wxEventTableEntry theClass<T1, T2>::sm_eventTableEntries[] = { \
 
-#define wxBEGIN_EVENT_TABLE_TEMPLATE3(theClass, baseClass, T1, T2, T3) \
+#define BEGIN_EVENT_TABLE_TEMPLATE3(theClass, baseClass, T1, T2, T3) \
     template<typename T1, typename T2, typename T3> \
     const wxEventTable theClass<T1, T2, T3>::sm_eventTable = \
         { &baseClass::sm_eventTable, &theClass<T1, T2, T3>::sm_eventTableEntries[0] }; \
@@ -3717,7 +2772,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
     template<typename T1, typename T2, typename T3> \
     const wxEventTableEntry theClass<T1, T2, T3>::sm_eventTableEntries[] = { \
 
-#define wxBEGIN_EVENT_TABLE_TEMPLATE4(theClass, baseClass, T1, T2, T3, T4) \
+#define BEGIN_EVENT_TABLE_TEMPLATE4(theClass, baseClass, T1, T2, T3, T4) \
     template<typename T1, typename T2, typename T3, typename T4> \
     const wxEventTable theClass<T1, T2, T3, T4>::sm_eventTable = \
         { &baseClass::sm_eventTable, &theClass<T1, T2, T3, T4>::sm_eventTableEntries[0] }; \
@@ -3732,7 +2787,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
     template<typename T1, typename T2, typename T3, typename T4> \
     const wxEventTableEntry theClass<T1, T2, T3, T4>::sm_eventTableEntries[] = { \
 
-#define wxBEGIN_EVENT_TABLE_TEMPLATE5(theClass, baseClass, T1, T2, T3, T4, T5) \
+#define BEGIN_EVENT_TABLE_TEMPLATE5(theClass, baseClass, T1, T2, T3, T4, T5) \
     template<typename T1, typename T2, typename T3, typename T4, typename T5> \
     const wxEventTable theClass<T1, T2, T3, T4, T5>::sm_eventTable = \
         { &baseClass::sm_eventTable, &theClass<T1, T2, T3, T4, T5>::sm_eventTableEntries[0] }; \
@@ -3747,7 +2802,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
     template<typename T1, typename T2, typename T3, typename T4, typename T5> \
     const wxEventTableEntry theClass<T1, T2, T3, T4, T5>::sm_eventTableEntries[] = { \
 
-#define wxBEGIN_EVENT_TABLE_TEMPLATE7(theClass, baseClass, T1, T2, T3, T4, T5, T6, T7) \
+#define BEGIN_EVENT_TABLE_TEMPLATE7(theClass, baseClass, T1, T2, T3, T4, T5, T6, T7) \
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7> \
     const wxEventTable theClass<T1, T2, T3, T4, T5, T6, T7>::sm_eventTable = \
         { &baseClass::sm_eventTable, &theClass<T1, T2, T3, T4, T5, T6, T7>::sm_eventTableEntries[0] }; \
@@ -3762,7 +2817,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7> \
     const wxEventTableEntry theClass<T1, T2, T3, T4, T5, T6, T7>::sm_eventTableEntries[] = { \
 
-#define wxBEGIN_EVENT_TABLE_TEMPLATE8(theClass, baseClass, T1, T2, T3, T4, T5, T6, T7, T8) \
+#define BEGIN_EVENT_TABLE_TEMPLATE8(theClass, baseClass, T1, T2, T3, T4, T5, T6, T7, T8) \
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> \
     const wxEventTable theClass<T1, T2, T3, T4, T5, T6, T7, T8>::sm_eventTable = \
         { &baseClass::sm_eventTable, &theClass<T1, T2, T3, T4, T5, T6, T7, T8>::sm_eventTableEntries[0] }; \
@@ -3777,8 +2832,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
     template<typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8> \
     const wxEventTableEntry theClass<T1, T2, T3, T4, T5, T6, T7, T8>::sm_eventTableEntries[] = { \
 
-#define wxEND_EVENT_TABLE() \
-    wxDECLARE_EVENT_TABLE_TERMINATOR() };
+#define END_EVENT_TABLE() DECLARE_EVENT_TABLE_ENTRY( wxEVT_NULL, 0, 0, 0, 0 ) };
 
 /*
  * Event table macros
@@ -3792,7 +2846,7 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 //  - id1, id2 ids of the first/last id
 //  - fn the function (should be cast to the right type)
 #define wx__DECLARE_EVT2(evt, id1, id2, fn) \
-    wxDECLARE_EVENT_TABLE_ENTRY(evt, id1, id2, fn, NULL),
+    DECLARE_EVENT_TABLE_ENTRY(evt, id1, id2, fn, NULL),
 #define wx__DECLARE_EVT1(evt, id, fn) \
     wx__DECLARE_EVT2(evt, id, wxID_ANY, fn)
 #define wx__DECLARE_EVT0(evt, fn) \
@@ -3808,13 +2862,11 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 // EVT_COMMAND
 #define EVT_COMMAND(winid, event, func) \
     wx__DECLARE_EVT1(event, winid, wxCommandEventHandler(func))
-
 #define EVT_COMMAND_RANGE(id1, id2, event, func) \
     wx__DECLARE_EVT2(event, id1, id2, wxCommandEventHandler(func))
 
 #define EVT_NOTIFY(event, winid, func) \
     wx__DECLARE_EVT1(event, winid, wxNotifyEventHandler(func))
-
 #define EVT_NOTIFY_RANGE(event, id1, id2, func) \
     wx__DECLARE_EVT2(event, id1, id2, wxNotifyEventHandler(func))
 
@@ -3823,8 +2875,6 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 #define EVT_SIZING(func)  wx__DECLARE_EVT0(wxEVT_SIZING, wxSizeEventHandler(func))
 #define EVT_MOVE(func)  wx__DECLARE_EVT0(wxEVT_MOVE, wxMoveEventHandler(func))
 #define EVT_MOVING(func)  wx__DECLARE_EVT0(wxEVT_MOVING, wxMoveEventHandler(func))
-#define EVT_MOVE_START(func)  wx__DECLARE_EVT0(wxEVT_MOVE_START, wxMoveEventHandler(func))
-#define EVT_MOVE_END(func)  wx__DECLARE_EVT0(wxEVT_MOVE_END, wxMoveEventHandler(func))
 #define EVT_CLOSE(func)  wx__DECLARE_EVT0(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(func))
 #define EVT_END_SESSION(func)  wx__DECLARE_EVT0(wxEVT_END_SESSION, wxCloseEventHandler(func))
 #define EVT_QUERY_END_SESSION(func)  wx__DECLARE_EVT0(wxEVT_QUERY_END_SESSION, wxCloseEventHandler(func))
@@ -3880,31 +2930,19 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 #define EVT_LEAVE_WINDOW(func) wx__DECLARE_EVT0(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(func))
 #define EVT_ENTER_WINDOW(func) wx__DECLARE_EVT0(wxEVT_ENTER_WINDOW, wxMouseEventHandler(func))
 #define EVT_MOUSEWHEEL(func) wx__DECLARE_EVT0(wxEVT_MOUSEWHEEL, wxMouseEventHandler(func))
-#define EVT_MOUSE_AUX1_DOWN(func) wx__DECLARE_EVT0(wxEVT_AUX1_DOWN, wxMouseEventHandler(func))
-#define EVT_MOUSE_AUX1_UP(func) wx__DECLARE_EVT0(wxEVT_AUX1_UP, wxMouseEventHandler(func))
-#define EVT_MOUSE_AUX1_DCLICK(func) wx__DECLARE_EVT0(wxEVT_AUX1_DCLICK, wxMouseEventHandler(func))
-#define EVT_MOUSE_AUX2_DOWN(func) wx__DECLARE_EVT0(wxEVT_AUX2_DOWN, wxMouseEventHandler(func))
-#define EVT_MOUSE_AUX2_UP(func) wx__DECLARE_EVT0(wxEVT_AUX2_UP, wxMouseEventHandler(func))
-#define EVT_MOUSE_AUX2_DCLICK(func) wx__DECLARE_EVT0(wxEVT_AUX2_DCLICK, wxMouseEventHandler(func))
 
 // All mouse events
 #define EVT_MOUSE_EVENTS(func) \
     EVT_LEFT_DOWN(func) \
     EVT_LEFT_UP(func) \
-    EVT_LEFT_DCLICK(func) \
     EVT_MIDDLE_DOWN(func) \
     EVT_MIDDLE_UP(func) \
-    EVT_MIDDLE_DCLICK(func) \
     EVT_RIGHT_DOWN(func) \
     EVT_RIGHT_UP(func) \
-    EVT_RIGHT_DCLICK(func) \
-    EVT_MOUSE_AUX1_DOWN(func) \
-    EVT_MOUSE_AUX1_UP(func) \
-    EVT_MOUSE_AUX1_DCLICK(func) \
-    EVT_MOUSE_AUX2_DOWN(func) \
-    EVT_MOUSE_AUX2_UP(func) \
-    EVT_MOUSE_AUX2_DCLICK(func) \
     EVT_MOTION(func) \
+    EVT_LEFT_DCLICK(func) \
+    EVT_MIDDLE_DCLICK(func) \
+    EVT_RIGHT_DCLICK(func) \
     EVT_LEAVE_WINDOW(func) \
     EVT_ENTER_WINDOW(func) \
     EVT_MOUSEWHEEL(func)
@@ -4000,14 +3038,11 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 #define EVT_VLBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_VLBOX_SELECTED, winid, wxCommandEventHandler(func))
 #define EVT_COMBOBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_COMBOBOX_SELECTED, winid, wxCommandEventHandler(func))
 #define EVT_TOOL(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_CLICKED, winid, wxCommandEventHandler(func))
-#define EVT_TOOL_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, winid, wxCommandEventHandler(func))
 #define EVT_TOOL_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_COMMAND_TOOL_CLICKED, id1, id2, wxCommandEventHandler(func))
 #define EVT_TOOL_RCLICKED(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_RCLICKED, winid, wxCommandEventHandler(func))
 #define EVT_TOOL_RCLICKED_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, wxCommandEventHandler(func))
 #define EVT_TOOL_ENTER(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_ENTER, winid, wxCommandEventHandler(func))
 #define EVT_CHECKLISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, winid, wxCommandEventHandler(func))
-#define EVT_COMBOBOX_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_COMBOBOX_DROPDOWN, winid, wxCommandEventHandler(func))
-#define EVT_COMBOBOX_CLOSEUP(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_COMBOBOX_CLOSEUP, winid, wxCommandEventHandler(func))
 
 // Generic command events
 #define EVT_COMMAND_LEFT_CLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LEFT_CLICK, winid, wxCommandEventHandler(func))
@@ -4025,6 +3060,12 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 #define EVT_JOY_MOVE(func) wx__DECLARE_EVT0(wxEVT_JOY_MOVE, wxJoystickEventHandler(func))
 #define EVT_JOY_ZMOVE(func) wx__DECLARE_EVT0(wxEVT_JOY_ZMOVE, wxJoystickEventHandler(func))
 
+// These are obsolete, see _BUTTON_ events
+#if WXWIN_COMPATIBILITY_2_4
+    #define EVT_JOY_DOWN(func) EVT_JOY_BUTTON_DOWN(func)
+    #define EVT_JOY_UP(func) EVT_JOY_BUTTON_UP(func)
+#endif // WXWIN_COMPATIBILITY_2_4
+
 // All joystick events
 #define EVT_JOYSTICK_EVENTS(func) \
     EVT_JOY_BUTTON_DOWN(func) \
@@ -4054,50 +3095,21 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 #define EVT_TEXT_COPY(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_COPY, winid, wxClipboardTextEventHandler(func))
 #define EVT_TEXT_PASTE(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_PASTE, winid, wxClipboardTextEventHandler(func))
 
-// Thread events
-#define EVT_THREAD(id, func)  wx__DECLARE_EVT1(wxEVT_THREAD, id, wxThreadEventHandler(func))
-// alias for backward compatibility with 2.9.0:
-#define wxEVT_COMMAND_THREAD wxEVT_THREAD
+// ----------------------------------------------------------------------------
+// Global data
+// ----------------------------------------------------------------------------
+
+// for pending event processing - notice that there is intentionally no
+// WXDLLEXPORT here
+extern WXDLLIMPEXP_BASE wxList *wxPendingEvents;
+#if wxUSE_THREADS
+    extern WXDLLIMPEXP_BASE wxCriticalSection *wxPendingEventsLocker;
+#endif
 
 // ----------------------------------------------------------------------------
 // Helper functions
 // ----------------------------------------------------------------------------
 
-// This is an ugly hack to allow the use of Bind() instead of Connect() inside
-// the library code if the library was built with support for it, here is how
-// it is used:
-//
-// class SomeEventHandlingClass : wxBIND_OR_CONNECT_HACK_BASE_CLASS
-//                                public SomeBaseClass
-// {
-// public:
-//     SomeEventHandlingClass(wxWindow *win)
-//     {
-//         // connect to the event for the given window
-//         wxBIND_OR_CONNECT_HACK(win, wxEVT_SOMETHING, wxSomeEventHandler,
-//                                SomeEventHandlingClass::OnSomeEvent, this);
-//     }
-//
-// private:
-//     void OnSomeEvent(wxSomeEvent&) { ... }
-// };
-//
-// This is *not* meant to be used by library users, it is only defined here
-// (and not in a private header) because the base class must be visible from
-// other public headers, please do NOT use this in your code, it will be
-// removed from future wx versions without warning.
-#ifdef wxHAS_EVENT_BIND
-    #define wxBIND_OR_CONNECT_HACK_BASE_CLASS
-    #define wxBIND_OR_CONNECT_HACK_ONLY_BASE_CLASS
-    #define wxBIND_OR_CONNECT_HACK(win, evt, handler, func, obj) \
-        win->Bind(evt, &func, obj)
-#else // wxHAS_EVENT_BIND
-    #define wxBIND_OR_CONNECT_HACK_BASE_CLASS public wxEvtHandler,
-    #define wxBIND_OR_CONNECT_HACK_ONLY_BASE_CLASS : public wxEvtHandler
-    #define wxBIND_OR_CONNECT_HACK(win, evt, handler, func, obj) \
-        win->Connect(evt, handler(func), NULL, obj)
-#endif // wxHAS_EVENT_BIND
-
 #if wxUSE_GUI
 
 // Find a window with the focus, that is also a descendant of the given window.
@@ -4106,39 +3118,4 @@ WXDLLIMPEXP_CORE wxWindow* wxFindFocusDescendant(wxWindow* ancestor);
 
 #endif // wxUSE_GUI
 
-
-// ----------------------------------------------------------------------------
-// Compatibility macro aliases
-// ----------------------------------------------------------------------------
-
-// deprecated variants _not_ requiring a semicolon after them and without wx prefix
-// (note that also some wx-prefixed macro do _not_ require a semicolon because
-//  it's not always possible to force the compire to require it)
-
-#define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \
-    wxDECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj)
-#define DECLARE_EVENT_TABLE_TERMINATOR()               wxDECLARE_EVENT_TABLE_TERMINATOR()
-#define DECLARE_EVENT_TABLE()                          wxDECLARE_EVENT_TABLE();
-#define BEGIN_EVENT_TABLE(a,b)                         wxBEGIN_EVENT_TABLE(a,b)
-#define BEGIN_EVENT_TABLE_TEMPLATE1(a,b,c)             wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c)
-#define BEGIN_EVENT_TABLE_TEMPLATE2(a,b,c,d)           wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d)
-#define BEGIN_EVENT_TABLE_TEMPLATE3(a,b,c,d,e)         wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d,e)
-#define BEGIN_EVENT_TABLE_TEMPLATE4(a,b,c,d,e,f)       wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d,e,f)
-#define BEGIN_EVENT_TABLE_TEMPLATE5(a,b,c,d,e,f,g)     wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d,e,f,g)
-#define BEGIN_EVENT_TABLE_TEMPLATE6(a,b,c,d,e,f,g,h)   wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c,d,e,f,g,h)
-#define END_EVENT_TABLE()                              wxEND_EVENT_TABLE()
-
-// other obsolete event declaration/definition macros; we don't need them any longer
-// but we keep them for compatibility as it doesn't cost us anything anyhow
-#define BEGIN_DECLARE_EVENT_TYPES()
-#define END_DECLARE_EVENT_TYPES()
-#define DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value) \
-    extern expdecl const wxEventType name;
-#define DECLARE_EVENT_TYPE(name, value) \
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, name, value)
-#define DECLARE_LOCAL_EVENT_TYPE(name, value) \
-    DECLARE_EXPORTED_EVENT_TYPE(wxEMPTY_PARAMETER_VALUE, name, value)
-#define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
-#define DEFINE_LOCAL_EVENT_TYPE(name) DEFINE_EVENT_TYPE(name)
-
-#endif // _WX_EVENT_H_
+#endif // _WX_EVENT_H__
diff --git a/Source/3rd Party/wx/include/wx/eventfilter.h b/Source/3rd Party/wx/include/wx/eventfilter.h
deleted file mode 100644
index af55b518b..000000000
--- a/Source/3rd Party/wx/include/wx/eventfilter.h	
+++ /dev/null
@@ -1,72 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/eventfilter.h
-// Purpose:     wxEventFilter class declaration.
-// Author:      Vadim Zeitlin
-// Created:     2011-11-21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_EVENTFILTER_H_
-#define _WX_EVENTFILTER_H_
-
-#include "wx/defs.h"
-
-class WXDLLIMPEXP_FWD_BASE wxEvent;
-class WXDLLIMPEXP_FWD_BASE wxEvtHandler;
-
-// ----------------------------------------------------------------------------
-// wxEventFilter is used with wxEvtHandler::AddFilter() and ProcessEvent().
-// ----------------------------------------------------------------------------
-
-class wxEventFilter
-{
-public:
-    // Possible return values for FilterEvent().
-    //
-    // Notice that the values of these enum elements are fixed due to backwards
-    // compatibility constraints.
-    enum
-    {
-        // Process event as usual.
-        Event_Skip = -1,
-
-        // Don't process the event normally at all.
-        Event_Ignore = 0,
-
-        // Event was already handled, don't process it normally.
-        Event_Processed = 1
-    };
-
-    wxEventFilter()
-    {
-        m_next = NULL;
-    }
-
-    virtual ~wxEventFilter()
-    {
-        wxASSERT_MSG( !m_next, "Forgot to call wxEvtHandler::RemoveFilter()?" );
-    }
-
-    // This method allows to filter all the events processed by the program, so
-    // you should try to return quickly from it to avoid slowing down the
-    // program to a crawl.
-    //
-    // Return value should be -1 to continue with the normal event processing,
-    // or true or false to stop further processing and pretend that the event
-    // had been already processed or won't be processed at all, respectively.
-    virtual int FilterEvent(wxEvent& event) = 0;
-
-private:
-    // Objects of this class are made to be stored in a linked list in
-    // wxEvtHandler so put the next node ponter directly in the class itself.
-    wxEventFilter* m_next;
-
-    // And provide access to it for wxEvtHandler [only].
-    friend class wxEvtHandler;
-
-    wxDECLARE_NO_COPY_CLASS(wxEventFilter);
-};
-
-#endif // _WX_EVENTFILTER_H_
diff --git a/Source/3rd Party/wx/include/wx/evtloop.h b/Source/3rd Party/wx/include/wx/evtloop.h
index 6c29c94a0..3f44e8688 100644
--- a/Source/3rd Party/wx/include/wx/evtloop.h	
+++ b/Source/3rd Party/wx/include/wx/evtloop.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.06.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: evtloop.h 53607 2008-05-16 15:21:40Z SN $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,90 +12,26 @@
 #ifndef _WX_EVTLOOP_H_
 #define _WX_EVTLOOP_H_
 
-#include "wx/event.h"
 #include "wx/utils.h"
 
-// TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be
-//       monitored using MsgWaitForMultipleObjects())
-#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WXMSW__))
-    #define wxUSE_EVENTLOOP_SOURCE 1
-#else
-    #define wxUSE_EVENTLOOP_SOURCE 0
-#endif
-
-#if wxUSE_EVENTLOOP_SOURCE
-    class wxEventLoopSource;
-    class wxEventLoopSourceHandler;
-#endif
-
-/*
-    NOTE ABOUT wxEventLoopBase::YieldFor LOGIC
-    ------------------------------------------
-
-    The YieldFor() function helps to avoid re-entrancy problems and problems
-    caused by out-of-order event processing
-    (see "wxYield-like problems" and "wxProgressDialog+threading BUG" wx-dev threads).
-
-    The logic behind YieldFor() is simple: it analyzes the queue of the native
-    events generated by the underlying GUI toolkit and picks out and processes
-    only those matching the given mask.
-
-    It's important to note that YieldFor() is used to selectively process the
-    events generated by the NATIVE toolkit.
-    Events syntethized by wxWidgets code or by user code are instead selectively
-    processed thanks to the logic built into wxEvtHandler::ProcessPendingEvents().
-    In fact, when wxEvtHandler::ProcessPendingEvents gets called from inside a
-    YieldFor() call, wxEventLoopBase::IsEventAllowedInsideYield is used to decide
-    if the pending events for that event handler can be processed.
-    If all the pending events associated with that event handler result as "not processable",
-    the event handler "delays" itself calling wxEventLoopBase::DelayPendingEventHandler
-    (so it's moved: m_handlersWithPendingEvents => m_handlersWithPendingDelayedEvents).
-    Last, wxEventLoopBase::ProcessPendingEvents() before exiting moves the delayed
-    event handlers back into the list of handlers with pending events
-    (m_handlersWithPendingDelayedEvents => m_handlersWithPendingEvents) so that
-    a later call to ProcessPendingEvents() (possibly outside the YieldFor() call)
-    will process all pending events as usual.
-*/
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;
 
 // ----------------------------------------------------------------------------
-// wxEventLoopBase: interface for wxEventLoop
+// wxEventLoop: a GUI event loop
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxEventLoopBase
+class WXDLLEXPORT wxEventLoopBase
 {
 public:
     // trivial, but needed (because of wxEventLoopBase) ctor
-    wxEventLoopBase();
+    wxEventLoopBase() { }
 
     // dtor
     virtual ~wxEventLoopBase() { }
 
-    // use this to check whether the event loop was successfully created before
-    // using it
-    virtual bool IsOk() const { return true; }
-
-    // returns true if this is the main loop
-    bool IsMain() const;
-
-#if wxUSE_EVENTLOOP_SOURCE
-    // create a new event loop source wrapping the given file descriptor and
-    // start monitoring it
-    virtual wxEventLoopSource *
-      AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags) = 0;
-#endif // wxUSE_EVENTLOOP_SOURCE
-
-    // dispatch&processing
-    // -------------------
-
     // start the event loop, return the exit code when it is finished
     virtual int Run() = 0;
 
-    // is this event loop running now?
-    //
-    // notice that even if this event loop hasn't terminated yet but has just
-    // spawned a nested (e.g. modal) event loop, this would return false
-    bool IsRunning() const;
-
     // exit from the loop with the given exit code
     virtual void Exit(int rc = 0) = 0;
 
@@ -105,92 +41,38 @@ public:
     // dispatch a single event, return false if we should exit from the loop
     virtual bool Dispatch() = 0;
 
-    // same as Dispatch() but doesn't wait for longer than the specified (in
-    // ms) timeout, return true if an event was processed, false if we should
-    // exit the loop or -1 if timeout expired
-    virtual int DispatchTimeout(unsigned long timeout) = 0;
-
-    // implement this to wake up the loop: usually done by posting a dummy event
-    // to it (can be called from non main thread)
-    virtual void WakeUp() = 0;
-
-
-    // idle handling
-    // -------------
-
-        // make sure that idle events are sent again
-    virtual void WakeUpIdle();
-
-        // this virtual function is called  when the application
-        // becomes idle and by default it forwards to wxApp::ProcessIdle() and
-        // while it can be overridden in a custom event loop, you must call the
-        // base class version to ensure that idle events are still generated
-        //
-        // it should return true if more idle events are needed, false if not
-    virtual bool ProcessIdle();
-
-
-    // Yield-related hooks
-    // -------------------
-
-    // process all currently pending events right now
-    //
-    // it is an error to call Yield() recursively unless the value of
-    // onlyIfNeeded is true
-    //
-    // WARNING: this function is dangerous as it can lead to unexpected
-    //          reentrancies (i.e. when called from an event handler it
-    //          may result in calling the same event handler again), use
-    //          with _extreme_ care or, better, don't use at all!
-    bool Yield(bool onlyIfNeeded = false);
-    virtual bool YieldFor(long eventsToProcess) = 0;
-
-    // returns true if the main thread is inside a Yield() call
-    virtual bool IsYielding() const
-        { return m_isInsideYield; }
-
-    // returns true if events of the given event category should be immediately
-    // processed inside a wxApp::Yield() call or rather should be queued for
-    // later processing by the main event loop
-    virtual bool IsEventAllowedInsideYield(wxEventCategory cat) const
-        { return (m_eventsToProcessInsideYield & cat) != 0; }
-
-    // no SafeYield hooks since it uses wxWindow which is not available when wxUSE_GUI=0
-
-
-    // active loop
-    // -----------
-
     // return currently active (running) event loop, may be NULL
-    static wxEventLoopBase *GetActive() { return ms_activeLoop; }
+    static wxEventLoop *GetActive() { return ms_activeLoop; }
 
     // set currently active (running) event loop
-    static void SetActive(wxEventLoopBase* loop);
+    static void SetActive(wxEventLoop* loop) { ms_activeLoop = loop; }
 
+    // is this event loop running now?
+    //
+    // notice that even if this event loop hasn't terminated yet but has just
+    // spawned a nested (e.g. modal) event loop, this would return false
+    bool IsRunning() const;
 
 protected:
     // this function should be called before the event loop terminates, whether
     // this happens normally (because of Exit() call) or abnormally (because of
     // an exception thrown from inside the loop)
-    virtual void OnExit();
+    virtual void OnExit() { }
+
 
     // the pointer to currently active loop
-    static wxEventLoopBase *ms_activeLoop;
+    static wxEventLoop *ms_activeLoop;
 
-    // YieldFor() helpers:
-    bool m_isInsideYield;
-    long m_eventsToProcessInsideYield;
-
-    wxDECLARE_NO_COPY_CLASS(wxEventLoopBase);
+    DECLARE_NO_COPY_CLASS(wxEventLoopBase)
 };
 
-#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXDFB__) || (defined(__UNIX__) && !defined(__WXOSX__))
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXDFB__)
 
 // this class can be used to implement a standard event loop logic using
 // Pending() and Dispatch()
 //
 // it also handles idle processing automatically
-class WXDLLIMPEXP_BASE wxEventLoopManual : public wxEventLoopBase
+class WXDLLEXPORT wxEventLoopManual : public wxEventLoopBase
 {
 public:
     wxEventLoopManual();
@@ -204,6 +86,10 @@ public:
     virtual void Exit(int rc = 0);
 
 protected:
+    // implement this to wake up the loop: usually done by posting a dummy event
+    // to it (called from Exit())
+    virtual void WakeUp() = 0;
+
     // may be overridden to perform some action at the start of each new event
     // loop iteration
     virtual void OnNextIteration() { }
@@ -214,15 +100,6 @@ protected:
 
     // should we exit the loop?
     bool m_shouldExit;
-
-private:
-    // process all already pending events and dispatch a new one (blocking
-    // until it appears in the event queue if necessary)
-    //
-    // returns the return value of Dispatch()
-    bool ProcessEvents();
-
-    wxDECLARE_NO_COPY_CLASS(wxEventLoopManual);
 };
 
 #endif // platforms using "manual" loop
@@ -230,105 +107,42 @@ private:
 // we're moving away from old m_impl wxEventLoop model as otherwise the user
 // code doesn't have access to platform-specific wxEventLoop methods and this
 // can sometimes be very useful (e.g. under MSW this is necessary for
-// integration with MFC) but currently this is not done for all ports yet (e.g.
-// wxX11) so fall back to the old wxGUIEventLoop definition below for them
-
-#if defined(__WXMSW__)
-    // this header defines both console and GUI loops for MSW
+// integration with MFC) but currently this is done for MSW only, other ports
+// should follow a.s.a.p.
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/evtloop.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/evtloop.h"
-#elif defined(__WXOSX__)
-    // CoreFoundation-based event loop is currently in wxBase so include it in
-    // any case too (although maybe it actually shouldn't be there at all)
-    #include "wx/osx/evtloop.h"
-#elif wxUSE_GUI
-
-// include the appropriate header defining wxGUIEventLoop
-
-#if defined(__WXCOCOA__)
-    #include "wx/cocoa/evtloop.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/evtloop.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/evtloop.h"
-#elif defined(__WXGTK20__)
-    #include "wx/gtk/evtloop.h"
 #else // other platform
 
-#include "wx/stopwatch.h"   // for wxMilliClock_t
+class WXDLLEXPORT wxEventLoopImpl;
 
-class WXDLLIMPEXP_FWD_CORE wxEventLoopImpl;
-
-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase
+class WXDLLEXPORT wxEventLoop : public wxEventLoopBase
 {
 public:
-    wxGUIEventLoop() { m_impl = NULL; }
-    virtual ~wxGUIEventLoop();
-
-#if wxUSE_EVENTLOOP_SOURCE
-    // We need to define a base class pure virtual method but we can't provide
-    // a generic implementation for it so simply fail.
-    virtual wxEventLoopSource *
-    AddSourceForFD(int WXUNUSED(fd),
-                   wxEventLoopSourceHandler * WXUNUSED(handler),
-                   int WXUNUSED(flags))
-    {
-        wxFAIL_MSG( "support for event loop sources not implemented" );
-        return NULL;
-    }
-#endif // wxUSE_EVENTLOOP_SOURCE
+    wxEventLoop() { m_impl = NULL; }
+    virtual ~wxEventLoop();
 
     virtual int Run();
     virtual void Exit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout)
-    {
-        // TODO: this is, of course, horribly inefficient and a proper wait with
-        //       timeout should be implemented for all ports natively...
-        const wxMilliClock_t timeEnd = wxGetLocalTimeMillis() + timeout;
-        for ( ;; )
-        {
-            if ( Pending() )
-                return Dispatch();
-
-            if ( wxGetLocalTimeMillis() >= timeEnd )
-                return -1;
-        }
-    }
-    virtual void WakeUp() { }
-    virtual bool YieldFor(long eventsToProcess);
 
 protected:
     // the pointer to the port specific implementation class
     wxEventLoopImpl *m_impl;
 
-    wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop);
+    DECLARE_NO_COPY_CLASS(wxEventLoop)
 };
 
 #endif // platforms
 
-#endif // wxUSE_GUI
-
-// include the header defining wxConsoleEventLoop for Unix systems
-#if defined(__UNIX__) && !defined(__WXMSW__)
-#include "wx/unix/evtloop.h"
-#endif
-
-#if wxUSE_GUI
-    // we use a class rather than a typedef because wxEventLoop is
-    // forward-declared in many places
-    class wxEventLoop : public wxGUIEventLoop { };
-#else // !wxUSE_GUI
-    // we can't define wxEventLoop differently in GUI and base libraries so use
-    // a #define to still allow writing wxEventLoop in the user code
-    #if wxUSE_CONSOLE_EVENTLOOP && (defined(__WXMSW__) || defined(__UNIX__))
-        #define wxEventLoop wxConsoleEventLoop
-    #else // we still must define it somehow for the code below...
-        #define wxEventLoop wxEventLoopBase
-    #endif
-#endif
-
 inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }
 
-#if wxUSE_GUI && !defined(__WXOSX__)
 // ----------------------------------------------------------------------------
 // wxModalEventLoop
 // ----------------------------------------------------------------------------
@@ -337,7 +151,7 @@ inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }
 // implement modality, we will surely need platform-specific implementations
 // too, this generic implementation is here only temporarily to see how it
 // works
-class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop
+class WXDLLEXPORT wxModalEventLoop : public wxEventLoop
 {
 public:
     wxModalEventLoop(wxWindow *winModal)
@@ -351,15 +165,13 @@ protected:
         delete m_windowDisabler;
         m_windowDisabler = NULL;
 
-        wxGUIEventLoop::OnExit();
+        wxEventLoop::OnExit();
     }
 
 private:
     wxWindowDisabler *m_windowDisabler;
 };
 
-#endif //wxUSE_GUI
-
 // ----------------------------------------------------------------------------
 // wxEventLoopActivator: helper class for wxEventLoop implementations
 // ----------------------------------------------------------------------------
@@ -370,24 +182,23 @@ private:
 class wxEventLoopActivator
 {
 public:
-    wxEventLoopActivator(wxEventLoopBase *evtLoop)
+    wxEventLoopActivator(wxEventLoop *evtLoop)
     {
-        m_evtLoopOld = wxEventLoopBase::GetActive();
-        wxEventLoopBase::SetActive(evtLoop);
+        m_evtLoopOld = wxEventLoop::GetActive();
+        wxEventLoop::SetActive(evtLoop);
     }
 
     ~wxEventLoopActivator()
     {
         // restore the previously active event loop
-        wxEventLoopBase::SetActive(m_evtLoopOld);
+        wxEventLoop::SetActive(m_evtLoopOld);
     }
 
 private:
-    wxEventLoopBase *m_evtLoopOld;
+    wxEventLoop *m_evtLoopOld;
 };
 
-#if wxUSE_CONSOLE_EVENTLOOP
-
+#if wxABI_VERSION >= 20808
 class wxEventLoopGuarantor
 {
 public:
@@ -413,7 +224,6 @@ public:
 private:
     wxEventLoop *m_evtLoopNew;
 };
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
+#endif // wxABI_VERSION >= 20805
 
 #endif // _WX_EVTLOOP_H_
diff --git a/Source/3rd Party/wx/include/wx/except.h b/Source/3rd Party/wx/include/wx/except.h
index 6c9a7f6d5..f6310a57f 100644
--- a/Source/3rd Party/wx/include/wx/except.h	
+++ b/Source/3rd Party/wx/include/wx/except.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     17.09.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: except.h 27408 2004-05-23 20:53:33Z JS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,24 +18,13 @@
 // macros working whether wxUSE_EXCEPTIONS is 0 or 1
 // ----------------------------------------------------------------------------
 
-// even if the library itself was compiled with exceptions support, the user
-// code using it might be compiling with a compiler switch disabling them in
-// which cases we shouldn't use try/catch in the headers -- this results in
-// compilation errors in e.g. wx/scopeguard.h with at least g++ 4
-#if !wxUSE_EXCEPTIONS || \
-        (defined(__GNUG__) && !defined(__EXCEPTIONS))
-    #ifndef wxNO_EXCEPTIONS
-        #define wxNO_EXCEPTIONS
-    #endif
-#endif
-
-#ifdef wxNO_EXCEPTIONS
-    #define wxTRY
-    #define wxCATCH_ALL(code)
-#else // do use exceptions
+#if wxUSE_EXCEPTIONS
     #define wxTRY try
     #define wxCATCH_ALL(code) catch ( ... ) { code }
-#endif // wxNO_EXCEPTIONS/!wxNO_EXCEPTIONS
+#else // !wxUSE_EXCEPTIONS
+    #define wxTRY
+    #define wxCATCH_ALL(code)
+#endif // wxUSE_EXCEPTIONS/!wxUSE_EXCEPTIONS
 
 #endif // _WX_EXCEPT_H_
 
diff --git a/Source/3rd Party/wx/include/wx/fdrepdlg.h b/Source/3rd Party/wx/include/wx/fdrepdlg.h
index cf2798b7c..87d154497 100644
--- a/Source/3rd Party/wx/include/wx/fdrepdlg.h	
+++ b/Source/3rd Party/wx/include/wx/fdrepdlg.h	
@@ -4,7 +4,7 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     23/03/2001
-// RCS-ID:      $Id$
+// RCS-ID:
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -60,7 +60,7 @@ enum wxFindReplaceDialogStyles
 // wxFindReplaceData: holds Setup Data/Feedback Data for wxFindReplaceDialog
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFindReplaceData : public wxObject
+class WXDLLEXPORT wxFindReplaceData : public wxObject
 {
 public:
     wxFindReplaceData() { Init(); }
@@ -93,7 +93,7 @@ private:
 // wxFindReplaceDialogBase
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFindReplaceDialogBase : public wxDialog
+class WXDLLEXPORT wxFindReplaceDialogBase : public wxDialog
 {
 public:
     // ctors and such
@@ -121,7 +121,7 @@ protected:
     // the last string we searched for
     wxString m_lastSearch;
 
-    wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase);
+    DECLARE_NO_COPY_CLASS(wxFindReplaceDialogBase)
 };
 
 // include wxFindReplaceDialog declaration
@@ -137,13 +137,11 @@ protected:
 // wxFindReplaceDialog events
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFindDialogEvent : public wxCommandEvent
+class WXDLLEXPORT wxFindDialogEvent : public wxCommandEvent
 {
 public:
     wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
         : wxCommandEvent(commandType, id) { }
-    wxFindDialogEvent(const wxFindDialogEvent& event)
-        : wxCommandEvent(event), m_strReplace(event.m_strReplace) { }
 
     int GetFlags() const { return GetInt(); }
     wxString GetFindString() const { return GetString(); }
@@ -157,24 +155,24 @@ public:
     void SetFindString(const wxString& str) { SetString(str); }
     void SetReplaceString(const wxString& str) { m_strReplace = str; }
 
-    virtual wxEvent *Clone() const { return new wxFindDialogEvent(*this); }
-
 private:
     wxString m_strReplace;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFindDialogEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFindDialogEvent)
 };
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND, wxFindDialogEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_NEXT, wxFindDialogEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_REPLACE, wxFindDialogEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_REPLACE_ALL, wxFindDialogEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FIND_CLOSE, wxFindDialogEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND, 510)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_NEXT, 511)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE, 512)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE_ALL, 513)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_FIND_CLOSE, 514)
+END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxFindDialogEventFunction)(wxFindDialogEvent&);
 
 #define wxFindDialogEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxFindDialogEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFindDialogEventFunction, &func)
 
 #define EVT_FIND(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_FIND, id, wxFindDialogEventHandler(fn))
diff --git a/Source/3rd Party/wx/include/wx/features.h b/Source/3rd Party/wx/include/wx/features.h
index e76f2c567..953940a87 100644
--- a/Source/3rd Party/wx/include/wx/features.h	
+++ b/Source/3rd Party/wx/include/wx/features.h	
@@ -5,7 +5,7 @@
 *  Author:      Vadim Zeitlin
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     18.03.02
-*  RCS-ID:      $Id$
+*  RCS-ID:      $Id: features.h 40865 2006-08-27 09:42:42Z VS $
 *  Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 *  Licence:     wxWindows licence
 */
@@ -35,11 +35,9 @@
 /*  taskbar is implemented in the major ports */
 #if defined(__WXMSW__) || defined(__WXCOCOA__) \
     || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) \
-    || defined(__WXOSX_MAC__) || defined(__WXCOCOA__)
+    || defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
     #define wxHAS_TASK_BAR_ICON
 #else
-    #undef wxUSE_TASKBARICON
-    #define wxUSE_TASKBARICON 0
     #undef wxHAS_TASK_BAR_ICON
 #endif
 
@@ -62,65 +60,5 @@
     #undef wxHAS_REGEX_ADVANCED
 #endif
 
-/* Pango-based ports and wxDFB use UTF-8 for text and font encodings
- * internally and so their fonts can handle any encodings: */
-#if wxUSE_PANGO || defined(__WXDFB__)
-    #define wxHAS_UTF8_FONTS
-#endif
-
-/* This is defined when the underlying toolkit handles tab traversal natively.
-   Otherwise we implement it ourselves in wxControlContainer. */
-#ifdef __WXGTK20__
-    #define wxHAS_NATIVE_TAB_TRAVERSAL
-#endif
-
-/* This is defined when the compiler provides some type of extended locale
-   functions.  Otherwise, we implement them ourselves to only support the
-   'C' locale */
-#if defined(HAVE_LOCALE_T) || \
-    (wxCHECK_VISUALC_VERSION(8) && !defined(__WXWINCE__))
-    #define wxHAS_XLOCALE_SUPPORT
-#else
-    #undef wxHAS_XLOCALE_SUPPORT
-#endif
-
-/* Direct access to bitmap data is not implemented in all ports yet */
-#if defined(__WXGTK20__) || defined(__WXMAC__) || defined(__WXDFB__) || \
-        defined(__WXMSW__)
-
-    /*
-       These compilers can't deal with templates in wx/rawbmp.h:
-        - HP aCC for PA-RISC
-        - Watcom < 1.8
-     */
-    #if !wxONLY_WATCOM_EARLIER_THAN(1, 8) && \
-        !(defined(__HP_aCC) && defined(__hppa))
-        #define wxHAS_RAW_BITMAP
-    #endif
-#endif
-
-/* also define deprecated synonym which exists for compatibility only */
-#ifdef wxHAS_RAW_BITMAP
-    #define wxHAVE_RAW_BITMAP
-#endif
-
-/*
-   If this is defined, wxEvtHandler::Bind<>() is available (not all compilers
-   have the required template support for this and in particular under Windows
-   where only g++ and MSVC >= 7 currently support it.
-
-   Recent Sun CC versions support this but perhaps older ones can compile this
-   code too, adjust the version check if this is the case (unfortunately we
-   can't easily test for the things used in wx/event.h in configure so we have
-   to maintain these checks manually). The same applies to xlC 7: perhaps
-   earlier versions can compile this code too but they were not tested.
- */
-#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7) \
-        || (defined(__SUNCC__) && __SUNCC__ >= 0x5100) \
-        || (defined(__xlC__) && __xlC__ >= 0x700)
-    #define wxHAS_EVENT_BIND
-#endif
-
-
 #endif /*  _WX_FEATURES_H_ */
 
diff --git a/Source/3rd Party/wx/include/wx/ffile.h b/Source/3rd Party/wx/include/wx/ffile.h
index 3c39c7eeb..26f1b4e3e 100644
--- a/Source/3rd Party/wx/include/wx/ffile.h	
+++ b/Source/3rd Party/wx/include/wx/ffile.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: ffile.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,13 +37,13 @@ public:
     // def ctor
   wxFFile() { m_fp = NULL; }
     // open specified file (may fail, use IsOpened())
-  wxFFile(const wxString& filename, const wxString& mode = wxT("r"));
+  wxFFile(const wxChar *filename, const wxChar *mode = wxT("r"));
     // attach to (already opened) file
   wxFFile(FILE *lfp) { m_fp = lfp; }
 
   // open/close
     // open a file (existing or not - the mode controls what happens)
-  bool Open(const wxString& filename, const wxString& mode = wxT("r"));
+  bool Open(const wxChar *filename, const wxChar *mode = wxT("r"));
     // closes the opened file (this is a NOP if not opened)
   bool Close();
 
@@ -62,7 +62,12 @@ public:
     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success
-  bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto());
+  bool Write(const wxString& s, const wxMBConv& conv = wxConvAuto())
+  {
+      const wxWX2MBbuf buf = s.mb_str(conv);
+      size_t size = strlen(buf);
+      return Write((const char *)buf, size) == size;
+  }
     // flush data not yet written
   bool Flush();
 
diff --git a/Source/3rd Party/wx/include/wx/file.h b/Source/3rd Party/wx/include/wx/file.h
index 370242a01..a2ccd4223 100644
--- a/Source/3rd Party/wx/include/wx/file.h	
+++ b/Source/3rd Party/wx/include/wx/file.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/file.h
+// Name:        file.h
 // Purpose:     wxFile - encapsulates low-level "file descriptor"
 //              wxTempFile - safely replace the old file
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: file.h 46331 2007-06-05 13:16:11Z JS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,6 +21,28 @@
 #include  "wx/filefn.h"
 #include  "wx/strconv.h"
 
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// we redefine these constants here because S_IREAD &c are _not_ standard
+// however, we do assume that the values correspond to the Unix umask bits
+#define wxS_IRUSR 00400
+#define wxS_IWUSR 00200
+#define wxS_IXUSR 00100
+
+#define wxS_IRGRP 00040
+#define wxS_IWGRP 00020
+#define wxS_IXGRP 00010
+
+#define wxS_IROTH 00004
+#define wxS_IWOTH 00002
+#define wxS_IXOTH 00001
+
+// default mode for the new files: corresponds to umask 022
+#define wxS_DEFAULT   (wxS_IRUSR | wxS_IWUSR | wxS_IRGRP | wxS_IWGRP |\
+                       wxS_IROTH | wxS_IWOTH)
+
 // ----------------------------------------------------------------------------
 // class wxFile: raw file IO
 //
@@ -41,31 +63,31 @@ public:
   // static functions
   // ----------------
     // check whether a regular file by this name exists
-  static bool Exists(const wxString& name);
+  static bool Exists(const wxChar *name);
     // check whether we can access the given file in given mode
     // (only read and write make sense here)
-  static bool Access(const wxString& name, OpenMode mode);
+  static bool Access(const wxChar *name, OpenMode mode);
 
   // ctors
   // -----
     // def ctor
-  wxFile() { m_fd = fd_invalid; m_lasterror = 0; }
+  wxFile() { m_fd = fd_invalid; m_error = false; }
     // open specified file (may fail, use IsOpened())
-  wxFile(const wxString& fileName, OpenMode mode = read);
+  wxFile(const wxChar *szFileName, OpenMode mode = read);
     // attach to (already opened) file
-  wxFile(int lfd) { m_fd = lfd; m_lasterror = 0; }
+  wxFile(int lfd) { m_fd = lfd; m_error = false; }
 
   // open/close
     // create a new file (with the default value of bOverwrite, it will fail if
     // the file already exists, otherwise it will overwrite it and succeed)
-  bool Create(const wxString& fileName, bool bOverwrite = false,
+  bool Create(const wxChar *szFileName, bool bOverwrite = false,
               int access = wxS_DEFAULT);
-  bool Open(const wxString& fileName, OpenMode mode = read,
+  bool Open(const wxChar *szFileName, OpenMode mode = read,
             int access = wxS_DEFAULT);
   bool Close();  // Close is a NOP if not opened
 
   // assign an existing file descriptor and get it back from wxFile object
-  void Attach(int lfd) { Close(); m_fd = lfd; m_lasterror = 0; }
+  void Attach(int lfd) { Close(); m_fd = lfd; m_error = false; }
   void Detach()       { m_fd = fd_invalid;  }
   int  fd() const { return m_fd; }
 
@@ -75,7 +97,14 @@ public:
     // returns the number of bytes written
   size_t Write(const void *pBuf, size_t nCount);
     // returns true on success
-  bool Write(const wxString& s, const wxMBConv& conv = wxMBConvUTF8());
+  bool Write(const wxString& s, const wxMBConv& conv = wxConvUTF8)
+  {
+      const wxWX2MBbuf buf = s.mb_str(conv);
+      if (!buf)
+          return false;
+      size_t size = strlen(buf);
+      return Write((const char *) buf, size) == size;
+  }
     // flush data not yet written
   bool Flush();
 
@@ -95,15 +124,10 @@ public:
     // is end of file reached?
   bool Eof() const;
     // has an error occurred?
-  bool Error() const { return m_lasterror != 0; }
-    // get last errno
-  int GetLastError() const { return m_lasterror; }
-    // reset error state
-  void ClearLastError() { m_lasterror = 0; }
+  bool Error() const { return m_error; }
     // type such as disk or pipe
   wxFileKind GetKind() const { return wxGetFileKind(m_fd); }
 
-
   // dtor closes the file if opened
   ~wxFile() { Close(); }
 
@@ -114,16 +138,8 @@ private:
   wxFile(const wxFile&);
   wxFile& operator=(const wxFile&);
 
-  // Copy the value of errno into m_lasterror if rc == -1 and return true in
-  // this case (indicating that we've got an error). Otherwise return false.
-  //
-  // Notice that we use the possibly 64 bit wxFileOffset instead of int here so
-  // that it works for checking the result of functions such as tell() too.
-  bool CheckForError(wxFileOffset rc) const;
-
-
   int m_fd; // file descriptor or INVALID_FD if not opened
-  int m_lasterror; // errno value of last error
+  bool m_error; // error memory
 };
 
 // ----------------------------------------------------------------------------
@@ -158,13 +174,9 @@ public:
 
   // I/O (both functions return true on success, false on failure)
   bool Write(const void *p, size_t n) { return m_file.Write(p, n) == n; }
-  bool Write(const wxString& str, const wxMBConv& conv = wxMBConvUTF8())
+  bool Write(const wxString& str, const wxMBConv& conv = wxConvUTF8)
     { return m_file.Write(str, conv); }
 
-  // flush data: can be called before closing file to ensure that data was
-  // correctly written out
-  bool Flush() { return m_file.Flush(); }
-
   // different ways to close the file
     // validate changes and delete the old file of name m_strName
   bool Commit();
diff --git a/Source/3rd Party/wx/include/wx/fileconf.h b/Source/3rd Party/wx/include/wx/fileconf.h
index 669175981..47c483f26 100644
--- a/Source/3rd Party/wx/include/wx/fileconf.h	
+++ b/Source/3rd Party/wx/include/wx/fileconf.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.04.98 (adapted from appconf.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fileconf.h 50711 2007-12-15 02:57:58Z VZ $
 // Copyright:   (c) 1997 Karsten Ballueder   &  Vadim Zeitlin
 //                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
@@ -20,7 +20,6 @@
 #include "wx/textfile.h"
 #include "wx/string.h"
 #include "wx/confbase.h"
-#include "wx/filename.h"
 
 // ----------------------------------------------------------------------------
 // wxFileConfig
@@ -112,18 +111,8 @@ public:
   //
   // where file is the basename of szFile, ext is its extension
   // or .conf (Unix) or .ini (Win) if it has none
-  static wxFileName GetGlobalFile(const wxString& szFile);
-  static wxFileName GetLocalFile(const wxString& szFile, int style = 0);
-
-  static wxString GetGlobalFileName(const wxString& szFile)
-  {
-      return GetGlobalFile(szFile).GetFullPath();
-  }
-
-  static wxString GetLocalFileName(const wxString& szFile, int style = 0)
-  {
-      return GetLocalFile(szFile, style).GetFullPath();
-  }
+  static wxString GetGlobalFileName(const wxChar *szFile);
+  static wxString GetLocalFileName(const wxChar *szFile);
 
   // ctor & dtor
     // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or
@@ -153,7 +142,7 @@ public:
 
   // implement inherited pure virtual functions
   virtual void SetPath(const wxString& strPath);
-  virtual const wxString& GetPath() const;
+  virtual const wxString& GetPath() const { return m_strPath; }
 
   virtual bool GetFirstGroup(wxString& str, long& lIndex) const;
   virtual bool GetNextGroup (wxString& str, long& lIndex) const;
@@ -194,20 +183,14 @@ public:
 protected:
   virtual bool DoReadString(const wxString& key, wxString *pStr) const;
   virtual bool DoReadLong(const wxString& key, long *pl) const;
-#if wxUSE_BASE64
-  virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const;
-#endif // wxUSE_BASE64
 
   virtual bool DoWriteString(const wxString& key, const wxString& szValue);
   virtual bool DoWriteLong(const wxString& key, long lValue);
-#if wxUSE_BASE64
-  virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf);
-#endif // wxUSE_BASE64
 
 private:
   // GetXXXFileName helpers: return ('/' terminated) directory names
   static wxString GetGlobalDir();
-  static wxString GetLocalDir(int style = 0);
+  static wxString GetLocalDir();
 
   // common part of all ctors (assumes that m_str{Local|Global}File are already
   // initialized
@@ -237,8 +220,8 @@ private:
   wxFileConfigLineList *m_linesHead,    // head of the linked list
                        *m_linesTail;    // tail
 
-  wxFileName  m_fnLocalFile,            // local  file name passed to ctor
-              m_fnGlobalFile;           // global
+  wxString    m_strLocalFile,           // local  file name passed to ctor
+              m_strGlobalFile;          // global
   wxString    m_strPath;                // current path (not '/' terminated)
 
   wxFileConfigGroup *m_pRootGroup,      // the top (unnamed) group
@@ -252,8 +235,7 @@ private:
 
   bool m_isDirty;                       // if true, we have unsaved changes
 
-  wxDECLARE_NO_COPY_CLASS(wxFileConfig);
-  DECLARE_ABSTRACT_CLASS(wxFileConfig)
+  DECLARE_NO_COPY_CLASS(wxFileConfig)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/filectrl.h b/Source/3rd Party/wx/include/wx/filectrl.h
deleted file mode 100644
index 52e804ea2..000000000
--- a/Source/3rd Party/wx/include/wx/filectrl.h	
+++ /dev/null
@@ -1,146 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/filectrl.h
-// Purpose:     Header for wxFileCtrlBase and other common functions used by
-//              platform-specific wxFileCtrl's
-// Author:      Diaa M. Sami
-// Modified by:
-// Created:     Jul-07-2007
-// RCS-ID:      $Id$
-// Copyright:   (c) Diaa M. Sami
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FILECTRL_H_BASE_
-#define _WX_FILECTRL_H_BASE_
-
-#include "wx/defs.h"
-
-#if wxUSE_FILECTRL
-
-#include "wx/string.h"
-#include "wx/event.h"
-
-enum
-{
-    wxFC_OPEN              = 0x0001,
-    wxFC_SAVE              = 0x0002,
-    wxFC_MULTIPLE          = 0x0004,
-    wxFC_NOSHOWHIDDEN      = 0x0008
-};
-
-#define wxFC_DEFAULT_STYLE wxFC_OPEN
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFileCtrlNameStr[]; // in filectrlcmn.cpp
-
-class WXDLLIMPEXP_CORE wxFileCtrlBase
-{
-public:
-    virtual ~wxFileCtrlBase() {}
-
-    virtual void SetWildcard( const wxString& wildCard ) = 0;
-    virtual void SetFilterIndex( int filterindex ) = 0;
-    virtual bool SetDirectory( const wxString& dir ) = 0;
-
-    // Selects a certain file.
-    // In case the filename specified isn't found/couldn't be shown with
-    // currently selected filter, false is returned and nothing happens
-    virtual bool SetFilename( const wxString& name ) = 0;
-
-    // chdirs to a certain directory and selects a certain file.
-    // In case the filename specified isn't found/couldn't be shown with
-    // currently selected filter, false is returned and if directory exists
-    // it's chdir'ed to
-    virtual bool SetPath( const wxString& path ) = 0;
-
-    virtual wxString GetFilename() const = 0;
-    virtual wxString GetDirectory() const = 0;
-    virtual wxString GetWildcard() const = 0;
-    virtual wxString GetPath() const = 0;
-    virtual void GetPaths( wxArrayString& paths ) const = 0;
-    virtual void GetFilenames( wxArrayString& files ) const = 0;
-    virtual int GetFilterIndex() const = 0;
-
-    virtual bool HasMultipleFileSelection() const = 0;
-    virtual void ShowHidden(bool show) = 0;
-};
-
-void GenerateFilterChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd );
-void GenerateFolderChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd );
-void GenerateSelectionChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd );
-void GenerateFileActivatedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd, const wxString filename = wxEmptyString );
-
-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-    #define wxFileCtrl wxGtkFileCtrl
-    #include "wx/gtk/filectrl.h"
-#else
-    #define wxFileCtrl wxGenericFileCtrl
-    #include "wx/generic/filectrlg.h"
-#endif
-
-// Some documentation
-// On wxEVT_FILECTRL_FILTERCHANGED, only the value returned by GetFilterIndex is
-// valid and it represents the (new) current filter index for the wxFileCtrl.
-// On wxEVT_FILECTRL_FOLDERCHANGED, only the value returned by GetDirectory is
-// valid and it represents the (new) current directory for the wxFileCtrl.
-// On wxEVT_FILECTRL_FILEACTIVATED, GetDirectory returns the current directory
-// for the wxFileCtrl and GetFiles returns the names of the file(s) activated.
-// On wxEVT_FILECTRL_SELECTIONCHANGED, GetDirectory returns the current directory
-// for the wxFileCtrl and GetFiles returns the names of the currently selected
-// file(s).
-// In wxGTK, after each wxEVT_FILECTRL_FOLDERCHANGED, wxEVT_FILECTRL_SELECTIONCHANGED
-// is fired automatically once or more with 0 files.
-class WXDLLIMPEXP_CORE wxFileCtrlEvent : public wxCommandEvent
-{
-public:
-    wxFileCtrlEvent() {}
-    wxFileCtrlEvent( wxEventType type, wxObject *evtObject, int id )
-            : wxCommandEvent( type, id )
-    {
-        SetEventObject( evtObject );
-    }
-
-    // no need for the copy constructor as the default one will be fine.
-    virtual wxEvent *Clone() const { return new wxFileCtrlEvent( *this ); }
-
-    void SetFiles( const wxArrayString &files ) { m_files = files; }
-    void SetDirectory( const wxString &directory ) { m_directory = directory; }
-    void SetFilterIndex( int filterIndex ) { m_filterIndex = filterIndex; }
-
-    wxArrayString GetFiles() const { return m_files; }
-    wxString GetDirectory() const { return m_directory; }
-    int GetFilterIndex() const { return m_filterIndex; }
-
-    wxString GetFile() const;
-
-protected:
-    int m_filterIndex;
-    wxString m_directory;
-    wxArrayString m_files;
-
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN( wxFileCtrlEvent )
-};
-
-typedef void ( wxEvtHandler::*wxFileCtrlEventFunction )( wxFileCtrlEvent& );
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_SELECTIONCHANGED, wxFileCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FILEACTIVATED, wxFileCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FOLDERCHANGED, wxFileCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_FILECTRL_FILTERCHANGED, wxFileCtrlEvent );
-
-#define wxFileCtrlEventHandler(func) \
-    wxEVENT_HANDLER_CAST( wxFileCtrlEventFunction, func )
-
-#define EVT_FILECTRL_FILEACTIVATED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_FILECTRL_FILEACTIVATED, id, wxFileCtrlEventHandler(fn))
-
-#define EVT_FILECTRL_SELECTIONCHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_FILECTRL_SELECTIONCHANGED, id, wxFileCtrlEventHandler(fn))
-
-#define EVT_FILECTRL_FOLDERCHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_FILECTRL_FOLDERCHANGED, id, wxFileCtrlEventHandler(fn))
-
-#define EVT_FILECTRL_FILTERCHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_FILECTRL_FILTERCHANGED, id, wxFileCtrlEventHandler(fn))
-
-#endif // wxUSE_FILECTRL
-
-#endif // _WX_FILECTRL_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/filedlg.h b/Source/3rd Party/wx/include/wx/filedlg.h
index c8e9588ea..0e247b358 100644
--- a/Source/3rd Party/wx/include/wx/filedlg.h	
+++ b/Source/3rd Party/wx/include/wx/filedlg.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     8/17/99
 // Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filedlg.h 44027 2006-12-21 19:26:48Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -19,12 +19,6 @@
 #include "wx/dialog.h"
 #include "wx/arrstr.h"
 
-// this symbol is defined for the platforms which support multiple
-// ('|'-separated) filters in the file dialog
-#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
-    #define wxHAS_MULTIPLE_FILEDLG_FILTERS
-#endif
-
 //----------------------------------------------------------------------------
 // wxFileDialog data
 //----------------------------------------------------------------------------
@@ -56,6 +50,9 @@ enum
     wxOPEN              = wxFD_OPEN,
     wxSAVE              = wxFD_SAVE,
     wxOVERWRITE_PROMPT  = wxFD_OVERWRITE_PROMPT,
+#if WXWIN_COMPATIBILITY_2_4
+    wxHIDE_READONLY     = 0x0008,
+#endif
     wxFILE_MUST_EXIST   = wxFD_FILE_MUST_EXIST,
     wxMULTIPLE          = wxFD_MULTIPLE,
     wxCHANGE_DIR        = wxFD_CHANGE_DIR
@@ -64,15 +61,15 @@ enum
 
 #define wxFD_DEFAULT_STYLE      wxFD_OPEN
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFileDialogNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[];
 
 //----------------------------------------------------------------------------
 // wxFileDialogBase
 //----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFileDialogBase: public wxDialog
+class WXDLLEXPORT wxFileDialogBase: public wxDialog
 {
 public:
     wxFileDialogBase () { Init(); }
@@ -91,9 +88,6 @@ public:
         Create(parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name);
     }
 
-    virtual ~wxFileDialogBase() {}
-
-
     bool Create(wxWindow *parent,
                 const wxString& message = wxFileSelectorPromptStr,
                 const wxString& defaultDir = wxEmptyString,
@@ -107,9 +101,9 @@ public:
     bool HasFdFlag(int flag) const { return HasFlag(flag); }
 
     virtual void SetMessage(const wxString& message) { m_message = message; }
-    virtual void SetPath(const wxString& path);
-    virtual void SetDirectory(const wxString& dir);
-    virtual void SetFilename(const wxString& name);
+    virtual void SetPath(const wxString& path) { m_path = path; }
+    virtual void SetDirectory(const wxString& dir) { m_dir = dir; }
+    virtual void SetFilename(const wxString& name) { m_fileName = name; }
     virtual void SetWildcard(const wxString& wildCard) { m_wildCard = wildCard; }
     virtual void SetFilterIndex(int filterIndex) { m_filterIndex = filterIndex; }
 
@@ -122,17 +116,19 @@ public:
     virtual wxString GetWildcard() const { return m_wildCard; }
     virtual int GetFilterIndex() const { return m_filterIndex; }
 
-    // this function is called with wxFileDialog as parameter and should
-    // create the window containing the extra controls we want to show in it
-    typedef wxWindow *(*ExtraControlCreatorFunction)(wxWindow*);
-
-    virtual bool SupportsExtraControl() const { return false; }
-
-    bool SetExtraControlCreator(ExtraControlCreatorFunction creator);
-    wxWindow *GetExtraControl() const { return m_extraControl; }
-
     // Utility functions
 
+#if WXWIN_COMPATIBILITY_2_4
+    // Parses the wildCard, returning the number of filters.
+    // Returns 0 if none or if there's a problem,
+    // The arrays will contain an equal number of items found before the error.
+    // wildCard is in the form:
+    // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png"
+    wxDEPRECATED( static int ParseWildcard(const wxString& wildCard,
+                                           wxArrayString& descriptions,
+                                           wxArrayString& filters) );
+#endif // WXWIN_COMPATIBILITY_2_4
+
 #if WXWIN_COMPATIBILITY_2_6
 
     wxDEPRECATED( long GetStyle() const );
@@ -155,83 +151,74 @@ protected:
     wxString      m_fileName;
     wxString      m_wildCard;
     int           m_filterIndex;
-    wxWindow*     m_extraControl;
-
-    // returns true if control is created (if it already exists returns false)
-    bool CreateExtraControl();
-    // return true if SetExtraControlCreator() was called
-    bool HasExtraControlCreator() const
-        { return m_extraControlCreator != NULL; }
-    // get the size of the extra control by creating and deleting it
-    wxSize GetExtraControlSize();
 
 private:
-    ExtraControlCreatorFunction m_extraControlCreator;
-
     void Init();
     DECLARE_DYNAMIC_CLASS(wxFileDialogBase)
-    wxDECLARE_NO_COPY_CLASS(wxFileDialogBase);
+    DECLARE_NO_COPY_CLASS(wxFileDialogBase)
 };
 
-
 //----------------------------------------------------------------------------
 // wxFileDialog convenience functions
 //----------------------------------------------------------------------------
 
 // File selector - backward compatibility
-WXDLLIMPEXP_CORE wxString
-wxFileSelector(const wxString& message = wxFileSelectorPromptStr,
-               const wxString& default_path = wxEmptyString,
-               const wxString& default_filename = wxEmptyString,
-               const wxString& default_extension = wxEmptyString,
-               const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
+WXDLLEXPORT wxString
+wxFileSelector(const wxChar *message = wxFileSelectorPromptStr,
+               const wxChar *default_path = NULL,
+               const wxChar *default_filename = NULL,
+               const wxChar *default_extension = NULL,
+               const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
                int flags = 0,
                wxWindow *parent = NULL,
                int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // An extended version of wxFileSelector
-WXDLLIMPEXP_CORE wxString
-wxFileSelectorEx(const wxString& message = wxFileSelectorPromptStr,
-                 const wxString& default_path = wxEmptyString,
-                 const wxString& default_filename = wxEmptyString,
+WXDLLEXPORT wxString
+wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr,
+                 const wxChar *default_path = NULL,
+                 const wxChar *default_filename = NULL,
                  int *indexDefaultExtension = NULL,
-                 const wxString& wildcard = wxFileSelectorDefaultWildcardStr,
+                 const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
                  int flags = 0,
                  wxWindow *parent = NULL,
                  int x = wxDefaultCoord, int y = wxDefaultCoord);
 
 // Ask for filename to load
-WXDLLIMPEXP_CORE wxString
-wxLoadFileSelector(const wxString& what,
-                   const wxString& extension,
-                   const wxString& default_name = wxEmptyString,
-                   wxWindow *parent = NULL);
+WXDLLEXPORT wxString
+wxLoadFileSelector(const wxChar *what,
+                   const wxChar *extension,
+                   const wxChar *default_name = (const wxChar *)NULL,
+                   wxWindow *parent = (wxWindow *) NULL);
 
 // Ask for filename to save
-WXDLLIMPEXP_CORE wxString
-wxSaveFileSelector(const wxString& what,
-                   const wxString& extension,
-                   const wxString& default_name = wxEmptyString,
-                   wxWindow *parent = NULL);
+WXDLLEXPORT wxString
+wxSaveFileSelector(const wxChar *what,
+                   const wxChar *extension,
+                   const wxChar *default_name = (const wxChar *) NULL,
+                   wxWindow *parent = (wxWindow *) NULL);
 
 
 #if defined (__WXUNIVERSAL__)
-    #define wxHAS_GENERIC_FILEDIALOG
-    #include "wx/generic/filedlgg.h"
+#define wxUSE_GENERIC_FILEDIALOG
+#include "wx/generic/filedlgg.h"
 #elif defined(__WXMSW__)
-    #include "wx/msw/filedlg.h"
+#include "wx/msw/filedlg.h"
 #elif defined(__WXMOTIF__)
-    #include "wx/motif/filedlg.h"
+#include "wx/motif/filedlg.h"
+#elif defined(__WXGTK24__)
+#include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version
 #elif defined(__WXGTK20__)
-    #include "wx/gtk/filedlg.h"     // GTK+ > 2.4 has native version
+#define wxUSE_GENERIC_FILEDIALOG
+#include "wx/generic/filedlgg.h"
 #elif defined(__WXGTK__)
-    #include "wx/gtk1/filedlg.h"
+#include "wx/gtk1/filedlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/filedlg.h"
+#include "wx/mac/filedlg.h"
 #elif defined(__WXCOCOA__)
-    #include "wx/cocoa/filedlg.h"
+#include "wx/cocoa/filedlg.h"
 #elif defined(__WXPM__)
-    #include "wx/os2/filedlg.h"
+#include "wx/os2/filedlg.h"
 #endif
 
 #endif // wxUSE_FILEDLG
diff --git a/Source/3rd Party/wx/include/wx/filefn.h b/Source/3rd Party/wx/include/wx/filefn.h
index a20fd26df..84bb515a7 100644
--- a/Source/3rd Party/wx/include/wx/filefn.h	
+++ b/Source/3rd Party/wx/include/wx/filefn.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filefn.h 63300 2010-01-28 21:36:09Z MW $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,9 +22,22 @@
     #include <time.h>
 #endif
 
-#ifndef __WXWINCE__
+#ifdef __WXWINCE__
+// Nothing
+#elif !defined(__MWERKS__)
     #include <sys/types.h>
     #include <sys/stat.h>
+#else
+    #ifdef __MACH__
+        #include <sys/types.h>
+        #include <utime.h>
+        #include <sys/stat.h>
+        #include <unistd.h>
+    #else
+        #include <stat.h>
+        #include <unistd.h>
+        #include <unix.h>
+    #endif
 #endif
 
 #ifdef __OS2__
@@ -45,7 +58,7 @@
 #endif
 
 #if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-#if !defined( __GNUWIN32__ ) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
+#if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) && !defined(__WXWINCE__) && !defined(__CYGWIN__)
     #include <direct.h>
     #include <dos.h>
     #include <io.h>
@@ -70,18 +83,18 @@
     #include <dir.h>
 #endif
 
+#ifdef __SALFORDC__
+    #include <dir.h>
+    #include <unix.h>
+#endif
+
 #ifndef __WXWINCE__
     #include  <fcntl.h>       // O_RDONLY &c
 #endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
-#if defined(__VISUALC__) || defined(__DIGITALMARS__)
-    typedef int mode_t;
-#endif
-
 #ifdef __WXWINCE__
     typedef long off_t;
 #else
@@ -93,10 +106,12 @@
     #endif
 #endif
 
-#if defined(__VISUALC__) && !defined(__WXWINCE__)
+#if (defined(__VISUALC__) && !defined(__WXWINCE__)) || ( defined(__MWERKS__) && defined( __INTEL__) )
     typedef _off_t off_t;
 #elif defined(__SYMANTEC__)
     typedef long off_t;
+#elif defined(__MWERKS__) && !defined(__INTEL__) && !defined(__MACH__)
+    typedef long off_t;
 #endif
 
 enum wxSeekMode
@@ -114,51 +129,6 @@ enum wxFileKind
   wxFILE_KIND_PIPE      // a pipe
 };
 
-// we redefine these constants here because S_IREAD &c are _not_ standard
-// however, we do assume that the values correspond to the Unix umask bits
-enum wxPosixPermissions
-{
-    // standard Posix names for these permission flags:
-    wxS_IRUSR = 00400,
-    wxS_IWUSR = 00200,
-    wxS_IXUSR = 00100,
-
-    wxS_IRGRP = 00040,
-    wxS_IWGRP = 00020,
-    wxS_IXGRP = 00010,
-
-    wxS_IROTH = 00004,
-    wxS_IWOTH = 00002,
-    wxS_IXOTH = 00001,
-
-    // longer but more readable synonyms for the constants above:
-    wxPOSIX_USER_READ = wxS_IRUSR,
-    wxPOSIX_USER_WRITE = wxS_IWUSR,
-    wxPOSIX_USER_EXECUTE = wxS_IXUSR,
-
-    wxPOSIX_GROUP_READ = wxS_IRGRP,
-    wxPOSIX_GROUP_WRITE = wxS_IWGRP,
-    wxPOSIX_GROUP_EXECUTE = wxS_IXGRP,
-
-    wxPOSIX_OTHERS_READ = wxS_IROTH,
-    wxPOSIX_OTHERS_WRITE = wxS_IWOTH,
-    wxPOSIX_OTHERS_EXECUTE = wxS_IXOTH,
-
-    // default mode for the new files: allow reading/writing them to everybody but
-    // the effective file mode will be set after anding this value with umask and
-    // so won't include wxS_IW{GRP,OTH} for the default 022 umask value
-    wxS_DEFAULT = (wxPOSIX_USER_READ | wxPOSIX_USER_WRITE | \
-                   wxPOSIX_GROUP_READ | wxPOSIX_GROUP_WRITE | \
-                   wxPOSIX_OTHERS_READ | wxPOSIX_OTHERS_WRITE),
-
-    // default mode for the new directories (see wxFileName::Mkdir): allow
-    // reading/writing/executing them to everybody, but just like wxS_DEFAULT
-    // the effective directory mode will be set after anding this value with umask
-    wxS_DIR_DEFAULT = (wxPOSIX_USER_READ | wxPOSIX_USER_WRITE | wxPOSIX_USER_EXECUTE | \
-                       wxPOSIX_GROUP_READ | wxPOSIX_GROUP_WRITE | wxPOSIX_GROUP_EXECUTE | \
-                       wxPOSIX_OTHERS_READ | wxPOSIX_OTHERS_WRITE | wxPOSIX_OTHERS_EXECUTE)
-};
-
 // ----------------------------------------------------------------------------
 // declare our versions of low level file functions: some compilers prepend
 // underscores to the usual names, some also have Unicode versions of them
@@ -168,29 +138,29 @@ enum wxPosixPermissions
 // Implemented in filefnwce.cpp
 #if defined( __WXWINCE__)
     typedef __int64 wxFileOffset;
-    #define wxFileOffsetFmtSpec wxT("I64")
-    WXDLLIMPEXP_BASE int wxCRT_Open(const wxChar *filename, int oflag, int WXUNUSED(pmode));
-    WXDLLIMPEXP_BASE int wxCRT_Access(const wxChar *name, int WXUNUSED(how));
-    WXDLLIMPEXP_BASE int wxClose(int fd);
-    WXDLLIMPEXP_BASE int wxFsync(int WXUNUSED(fd));
-    WXDLLIMPEXP_BASE int wxRead(int fd, void *buf, unsigned int count);
-    WXDLLIMPEXP_BASE int wxWrite(int fd, const void *buf, unsigned int count);
-    WXDLLIMPEXP_BASE int wxEof(int fd);
-    WXDLLIMPEXP_BASE wxFileOffset wxSeek(int fd, wxFileOffset offset, int origin);
+    #define wxFileOffsetFmtSpec _("I64")
+    int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode));
+    int wxAccess(const wxChar *name, int WXUNUSED(how));
+    int wxClose(int fd);
+    int wxFsync(int WXUNUSED(fd));
+    int wxRead(int fd, void *buf, unsigned int count);
+    int wxWrite(int fd, const void *buf, unsigned int count);
+    int wxEof(int fd);
+    wxFileOffset wxSeek(int fd, wxFileOffset offset, int origin);
     #define wxLSeek wxSeek
-    WXDLLIMPEXP_BASE wxFileOffset wxTell(int fd);
+    wxFileOffset wxTell(int fd);
 
     // always Unicode under WinCE
-    #define   wxCRT_MkDir      _wmkdir
-    #define   wxCRT_RmDir      _wrmdir
-    #define   wxCRT_Stat       _wstat
+    #define   wxMkDir      _wmkdir
+    #define   wxRmDir      _wrmdir
+    #define   wxStat       _wstat
     #define   wxStructStat struct _stat
-#elif (defined(__WINDOWS__) || defined(__OS2__)) && \
+#elif (defined(__WXMSW__) || defined(__OS2__)) && !defined(__WXPALMOS__) && \
       ( \
         defined(__VISUALC__) || \
-        defined(__MINGW64__) || \
         (defined(__MINGW32__) && !defined(__WINE__) && \
                                 wxCHECK_W32API_VERSION(0, 5)) || \
+        defined(__MWERKS__) || \
         defined(__DMC__) || \
         defined(__WATCOMC__) || \
         defined(__BORLANDC__) \
@@ -203,14 +173,14 @@ enum wxPosixPermissions
     // detect compilers which have support for huge files
     #if defined(__VISUALC__)
         #define wxHAS_HUGE_FILES 1
-    #elif defined(__MINGW32__) || defined(__MINGW64__)
+    #elif defined(__MINGW32__)
         #define wxHAS_HUGE_FILES 1
     #elif defined(_LARGE_FILES)
         #define wxHAS_HUGE_FILES 1
     #endif
 
     // detect compilers which have support for huge stdio files
-    #if wxCHECK_VISUALC_VERSION(8)
+    #if defined __VISUALC__ && __VISUALC__ >= 1400
         #define wxHAS_HUGE_STDIO_FILES
         #define wxFseek _fseeki64
         #define wxFtell _ftelli64
@@ -220,10 +190,9 @@ enum wxPosixPermissions
         #define wxFtell ftello64
     #endif
 
-    // other Windows compilers (DMC, Watcom, and Borland) don't have huge file
-    // support (or at least not all functions needed for it by wx) currently
-
-    // types
+    // other Windows compilers (DMC, Watcom, Metrowerks and Borland) don't have
+    // huge file support (or at least not all functions needed for it by wx)
+    // currently
 
     #ifdef wxHAS_HUGE_FILES
         typedef wxLongLong_t wxFileOffset;
@@ -232,46 +201,6 @@ enum wxPosixPermissions
         typedef off_t wxFileOffset;
     #endif
 
-    // at least Borland 5.5 doesn't like "struct ::stat" so don't use the scope
-    // resolution operator present in wxPOSIX_IDENT for it
-    #ifdef __BORLANDC__
-        #define wxPOSIX_STRUCT(s)    struct s
-    #else
-        #define wxPOSIX_STRUCT(s)    struct wxPOSIX_IDENT(s)
-    #endif
-
-    // Notice that Watcom is the only compiler to have a wide char
-    // version of struct stat as well as a wide char stat function variant.
-    // This was dropped since OW 1.4 "for consistency across platforms".
-    //
-    // Borland is also special in that it uses _stat with Unicode functions
-    // (for MSVC compatibility?) but stat with ANSI ones
-    #ifdef __BORLANDC__
-        #if wxHAS_HUGE_FILES
-            #define wxStructStat struct stati64
-        #else
-            #if wxUSE_UNICODE
-                #define wxStructStat struct _stat
-            #else
-                #define wxStructStat struct stat
-            #endif
-        #endif
-    #else // !__BORLANDC__
-        #ifdef wxHAS_HUGE_FILES
-            #if wxUSE_UNICODE && wxONLY_WATCOM_EARLIER_THAN(1,4)
-                #define wxStructStat struct _wstati64
-            #else
-                #define wxStructStat struct _stati64
-            #endif
-        #else
-            #if wxUSE_UNICODE && wxONLY_WATCOM_EARLIER_THAN(1,4)
-                #define wxStructStat struct _wstat
-            #else
-                #define wxStructStat struct _stat
-            #endif
-        #endif
-    #endif // __BORLANDC__/!__BORLANDC__
-
 
     // functions
 
@@ -288,12 +217,32 @@ enum wxPosixPermissions
         #define wxHAS_UNDERSCORES_IN_POSIX_IDENTS
     #endif
 
+    // at least Borland 5.5 doesn't like "struct ::stat" so don't use the scope
+    // resolution operator present in wxPOSIX_IDENT for it
+    #ifdef __BORLANDC__
+        #define wxPOSIX_STRUCT(s)    struct s
+    #else
+        #define wxPOSIX_STRUCT(s)    struct wxPOSIX_IDENT(s)
+    #endif
+
     // first functions not working with strings, i.e. without ANSI/Unicode
     // complications
     #define   wxClose      wxPOSIX_IDENT(close)
 
-    #define wxRead         wxPOSIX_IDENT(read)
-    #define wxWrite        wxPOSIX_IDENT(write)
+    #if defined(__MWERKS__)
+        #if __MSL__ >= 0x6000
+            #define wxRead(fd, buf, nCount)  _read(fd, (void *)buf, nCount)
+            #define wxWrite(fd, buf, nCount) _write(fd, (void *)buf, nCount)
+        #else
+            #define wxRead(fd, buf, nCount)\
+                  _read(fd, (const char *)buf, nCount)
+            #define wxWrite(fd, buf, nCount)\
+                  _write(fd, (const char *)buf, nCount)
+        #endif
+    #else // __MWERKS__
+        #define wxRead         wxPOSIX_IDENT(read)
+        #define wxWrite        wxPOSIX_IDENT(write)
+    #endif
 
     #ifdef wxHAS_HUGE_FILES
         #ifndef __MINGW64__
@@ -327,86 +276,104 @@ enum wxPosixPermissions
     #define   wxEof        wxPOSIX_IDENT(eof)
 
     // then the functions taking strings
-
-    // first the ANSI versions
-    #define   wxCRT_OpenA       wxPOSIX_IDENT(open)
-    #define   wxCRT_AccessA     wxPOSIX_IDENT(access)
-    #define   wxCRT_MkDirA      wxPOSIX_IDENT(mkdir)
-    #define   wxCRT_RmDirA      wxPOSIX_IDENT(rmdir)
-    #ifdef wxHAS_HUGE_FILES
-        // MinGW-64 provides underscore-less versions of all file functions
-        // except for this one.
-        #ifdef __MINGW64__
-            #define   wxCRT_StatA       _stati64
-        #else
-            #define   wxCRT_StatA       wxPOSIX_IDENT(stati64)
-        #endif
-    #else
-        // Unfortunately Watcom is not consistent
-        #if defined(__OS2__) && defined(__WATCOMC__)
-            #define   wxCRT_StatA       _stat
-        #else
-            #define   wxCRT_StatA       wxPOSIX_IDENT(stat)
-        #endif
-    #endif
-
-    // then wide char ones
     #if wxUSE_UNICODE
-        // special workaround for buggy wopen() in bcc 5.5
-        #if defined(__BORLANDC__) && \
-            (__BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551)
-                WXDLLIMPEXP_BASE int wxCRT_OpenW(const wxChar *pathname,
-                                                 int flags, mode_t mode);
-        #else
-            #define wxCRT_OpenW       _wopen
-        #endif
-
-        #define   wxCRT_AccessW     _waccess
-        #define   wxCRT_MkDirW      _wmkdir
-        #define   wxCRT_RmDirW      _wrmdir
-        #ifdef wxHAS_HUGE_FILES
-            #define   wxCRT_StatW       _wstati64
-        #else
-            #define   wxCRT_StatW       _wstat
-        #endif
-    #endif // wxUSE_UNICODE
-
-
-    // finally the default char-type versions
-    #if wxUSE_UNICODE
-        #if wxUSE_UNICODE_MSLU || defined(__WX_STRICT_ANSI_GCC__)
+        #if wxUSE_UNICODE_MSLU
             // implement the missing file functions in Win9x ourselves
-            WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name,
-                                               int flags, int mode);
-            WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name,
-                                                 int mode);
-            WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name);
-            WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name);
+            #if defined( __VISUALC__ ) \
+                || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
+                || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
+                || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) ) \
+                || defined(__DMC__)
 
-            WXDLLIMPEXP_BASE int
-            wxMSLU__wstat(const wxChar *name, wxStructStat *buffer);
+                WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name,
+                                                   int flags, int mode);
+                WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name,
+                                                     int mode);
+                WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name);
+                WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name);
 
-            #define   wxCRT_Open       wxMSLU__wopen
+                WXDLLIMPEXP_BASE int
+                wxMSLU__wstat(const wxChar *name, wxPOSIX_STRUCT(stat) *buffer);
+                WXDLLIMPEXP_BASE int
+                wxMSLU__wstati64(const wxChar *name,
+                                 wxPOSIX_STRUCT(stati64) *buffer);
+            #endif // Windows compilers with MSLU support
 
-            #define   wxCRT_Access     wxMSLU__waccess
-            #define   wxCRT_MkDir      wxMSLU__wmkdir
-            #define   wxCRT_RmDir      wxMSLU__wrmdir
-            #define   wxCRT_Stat       wxMSLU__wstat
+            #define   wxOpen       wxMSLU__wopen
+
+            #define   wxAccess     wxMSLU__waccess
+            #define   wxMkDir      wxMSLU__wmkdir
+            #define   wxRmDir      wxMSLU__wrmdir
+            #ifdef wxHAS_HUGE_FILES
+                #define   wxStat       wxMSLU__wstati64
+            #else
+                #define   wxStat       wxMSLU__wstat
+            #endif
         #else // !wxUSE_UNICODE_MSLU
-            #define wxCRT_Open      wxCRT_OpenW
-            #define wxCRT_Access    wxCRT_AccessW
-            #define wxCRT_MkDir     wxCRT_MkDirW
-            #define wxCRT_RmDir     wxCRT_RmDirW
-            #define wxCRT_Stat      wxCRT_StatW
+            #ifdef __BORLANDC__
+                #if __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551
+                    WXDLLIMPEXP_BASE int wxOpen(const wxChar *pathname,
+                                                int flags, mode_t mode);
+                #else
+                    #define   wxOpen       _wopen
+                #endif
+                #define   wxAccess     _waccess
+                #define   wxMkDir      _wmkdir
+                #define   wxRmDir      _wrmdir
+                #ifdef wxHAS_HUGE_FILES
+                    #define   wxStat       _wstati64
+                #else
+                    #define   wxStat       _wstat
+                #endif
+            #else
+                #define   wxOpen       _wopen
+                #define   wxAccess     _waccess
+                #define   wxMkDir      _wmkdir
+                #define   wxRmDir      _wrmdir
+                #ifdef wxHAS_HUGE_FILES
+                    #define   wxStat       _wstati64
+                #else
+                    #define   wxStat       _wstat
+                #endif
+            #endif
         #endif // wxUSE_UNICODE_MSLU/!wxUSE_UNICODE_MSLU
     #else // !wxUSE_UNICODE
-        #define wxCRT_Open      wxCRT_OpenA
-        #define wxCRT_Access    wxCRT_AccessA
-        #define wxCRT_MkDir     wxCRT_MkDirA
-        #define wxCRT_RmDir     wxCRT_RmDirA
-        #define wxCRT_Stat      wxCRT_StatA
+        #define   wxOpen       wxPOSIX_IDENT(open)
+        #define   wxAccess     wxPOSIX_IDENT(access)
+        #define   wxMkDir      wxPOSIX_IDENT(mkdir)
+        #define   wxRmDir      wxPOSIX_IDENT(rmdir)
+        #ifdef wxHAS_HUGE_FILES
+            #define   wxStat       wxPOSIX_IDENT(stati64)
+        #else
+            // Unfortunately Watcom is not consistent, so:-
+            #if defined(__OS2__) && defined(__WATCOMC__)
+                #define   wxStat       _stat
+            #else
+                #if defined (__BORLANDC__)
+                    #define   wxStat       _stat //wxPOSIX_IDENT(stat)
+                #else
+                    #define   wxStat       wxPOSIX_IDENT(stat)
+                #endif // !borland
+            #endif // !watcom
+        #endif
     #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
+    // Types: Notice that Watcom is the only compiler to have a wide char
+    // version of struct stat as well as a wide char stat function variant.
+    // This was droped since OW 1.4 "for consistency across platforms".
+    #ifdef wxHAS_HUGE_FILES
+        #if wxUSE_UNICODE && wxONLY_WATCOM_EARLIER_THAN(1,4)
+            #define   wxStructStat struct _wstati64
+        #else
+            #define   wxStructStat struct _stati64
+        #endif
+    #else
+        #if wxUSE_UNICODE && wxONLY_WATCOM_EARLIER_THAN(1,4)
+            #define   wxStructStat struct _wstat
+        #else
+            #define   wxStructStat struct _stat
+        #endif
+    #endif
 
     // constants (unless already defined by the user code)
     #ifdef wxHAS_UNDERSCORES_IN_POSIX_IDENTS
@@ -442,16 +409,16 @@ enum wxPosixPermissions
     #undef wxHAS_HUGE_STDIO_FILES
 #else // Unix or Windows using unknown compiler, assume POSIX supported
     typedef off_t wxFileOffset;
-    #ifdef HAVE_LARGEFILE_SUPPORT
+    #ifdef _LARGE_FILES
         #define wxFileOffsetFmtSpec wxLongLongFmtSpec
         wxCOMPILE_TIME_ASSERT( sizeof(off_t) == sizeof(wxLongLong_t),
                                 BadFileSizeType );
         // wxFile is present and supports large files
-        #if wxUSE_FILE
+        #ifdef wxUSE_FILE
             #define wxHAS_LARGE_FILES
         #endif
         // wxFFile is present and supports large files
-        #if wxUSE_FFILE && (SIZEOF_LONG == 8 || defined HAVE_FSEEKO)
+        #if SIZEOF_LONG == 8 || defined HAVE_FSEEKO
             #define wxHAS_LARGE_FFILES
         #endif
         #ifdef HAVE_FSEEKO
@@ -470,27 +437,32 @@ enum wxPosixPermissions
     #define   wxFsync      fsync
     #define   wxEof        eof
 
-    #define   wxCRT_MkDir      mkdir
-    #define   wxCRT_RmDir      rmdir
+    #define   wxMkDir      mkdir
+    #define   wxRmDir      rmdir
 
     #define   wxTell(fd)   lseek(fd, 0, SEEK_CUR)
 
     #define   wxStructStat struct stat
 
-    #define   wxCRT_Open       open
-    #define   wxCRT_Stat       stat
-    #define   wxCRT_Lstat      lstat
-    #define   wxCRT_Access     access
+    #if wxUSE_UNICODE
+        #define wxNEED_WX_UNISTD_H
+        #if defined(__DMC__)
+            typedef unsigned long mode_t;
+        #endif
+        WXDLLIMPEXP_BASE int wxStat( const wxChar *file_name, wxStructStat *buf );
+        WXDLLIMPEXP_BASE int wxLstat( const wxChar *file_name, wxStructStat *buf );
+        WXDLLIMPEXP_BASE int wxAccess( const wxChar *pathname, int mode );
+        WXDLLIMPEXP_BASE int wxOpen( const wxChar *pathname, int flags, mode_t mode );
+    #else
+        #define   wxOpen       open
+        #define   wxStat       stat
+        #define   wxLstat      lstat
+        #define   wxAccess     access
+    #endif
 
     #define wxHAS_NATIVE_LSTAT
 #endif // platforms
 
-// if the platform doesn't have symlinks, define wxCRT_Lstat to be the same as
-// wxCRT_Stat to avoid #ifdefs in the code using it
-#ifndef wxHAS_NATIVE_LSTAT
-    #define wxCRT_Lstat wxCRT_Stat
-#endif
-
 // define wxFseek/wxFtell to large file versions if available (done above) or
 // to fseek/ftell if not, to save ifdefs in using code
 #ifndef wxFseek
@@ -500,35 +472,18 @@ enum wxPosixPermissions
     #define wxFtell ftell
 #endif
 
-inline int wxAccess(const wxString& path, mode_t mode)
-    { return wxCRT_Access(path.fn_str(), mode); }
-inline int wxOpen(const wxString& path, int flags, mode_t mode)
-    { return wxCRT_Open(path.fn_str(), flags, mode); }
-
-// FIXME-CE: provide our own implementations of the missing CRT functions
-#ifndef __WXWINCE__
-inline int wxStat(const wxString& path, wxStructStat *buf)
-    { return wxCRT_Stat(path.fn_str(), buf); }
-inline int wxLstat(const wxString& path, wxStructStat *buf)
-    { return wxCRT_Lstat(path.fn_str(), buf); }
-inline int wxRmDir(const wxString& path)
-    { return wxCRT_RmDir(path.fn_str()); }
-#if (defined(__WINDOWS__) && !defined(__CYGWIN__)) \
-        || (defined(__OS2__) && defined(__WATCOMC__))
-inline int wxMkDir(const wxString& path, mode_t WXUNUSED(mode) = 0)
-    { return wxCRT_MkDir(path.fn_str()); }
-#else
-inline int wxMkDir(const wxString& path, mode_t mode)
-    { return wxCRT_MkDir(path.fn_str(), mode); }
-#endif
-#endif // !__WXWINCE__
-
 #ifdef O_BINARY
     #define wxO_BINARY O_BINARY
 #else
     #define wxO_BINARY 0
 #endif
 
+// if the platform doesn't have symlinks, define wxLstat to be the same as
+// wxStat to avoid #ifdefs in the code using it
+#ifndef wxHAS_NATIVE_LSTAT
+    #define wxLstat wxStat
+#endif
+
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //
 // VisualAge C++ V4.0 cannot have any external linkage const decs
@@ -545,7 +500,7 @@ const int wxInvalidOffset = -1;
 WXDLLIMPEXP_BASE bool wxFileExists(const wxString& filename);
 
 // does the path exist? (may have or not '/' or '\\' at the end)
-WXDLLIMPEXP_BASE bool wxDirExists(const wxString& pathName);
+WXDLLIMPEXP_BASE bool wxDirExists(const wxChar *pszPathName);
 
 WXDLLIMPEXP_BASE bool wxIsAbsolutePath(const wxString& filename);
 
@@ -556,58 +511,43 @@ WXDLLIMPEXP_BASE wxString wxFileNameFromPath(const wxString& path);
 // Get directory
 WXDLLIMPEXP_BASE wxString wxPathOnly(const wxString& path);
 
-// all deprecated functions below are deprecated in favour of wxFileName's methods
-#if WXWIN_COMPATIBILITY_2_8
+// wxString version
+WXDLLIMPEXP_BASE wxString wxRealPath(const wxString& path);
 
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxDos2UnixFilename(char *s) );
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxDos2UnixFilename(wchar_t *s) );
+WXDLLIMPEXP_BASE void wxDos2UnixFilename(wxChar *s);
 
-wxDEPRECATED_BUT_USED_INTERNALLY(
-    WXDLLIMPEXP_BASE void wxUnix2DosFilename(char *s) );
-wxDEPRECATED_BUT_USED_INTERNALLY(
-    WXDLLIMPEXP_BASE void wxUnix2DosFilename(wchar_t *s) );
+WXDLLIMPEXP_BASE void wxUnix2DosFilename(wxChar *s);
 
 // Strip the extension, in situ
-// Deprecated in favour of wxFileName::StripExtension() but notice that their
-// behaviour is slightly different, see the manual
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(char *buffer) );
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(wchar_t *buffer) );
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxStripExtension(wxString& buffer) );
+WXDLLIMPEXP_BASE void wxStripExtension(wxChar *buffer);
+WXDLLIMPEXP_BASE void wxStripExtension(wxString& buffer);
 
 // Get a temporary filename
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = NULL) );
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE bool wxGetTempFileName(const wxString& prefix, wxString& buf) );
+WXDLLIMPEXP_BASE wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL);
+WXDLLIMPEXP_BASE bool wxGetTempFileName(const wxString& prefix, wxString& buf);
 
 // Expand file name (~/ and ${OPENWINHOME}/ stuff)
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE char* wxExpandPath(char *dest, const wxString& path) );
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wchar_t* wxExpandPath(wchar_t *dest, const wxString& path) );
-    // DEPRECATED: use wxFileName::Normalize(wxPATH_NORM_ENV_VARS)
+WXDLLIMPEXP_BASE wxChar* wxExpandPath(wxChar *dest, const wxChar *path);
+WXDLLIMPEXP_BASE bool wxExpandPath(wxString& dest, const wxChar *path);
 
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home
 // [caller must copy-- volatile]
-wxDEPRECATED(
 WXDLLIMPEXP_BASE wxChar* wxContractPath(const wxString& filename,
                                    const wxString& envname = wxEmptyString,
-                                   const wxString& user = wxEmptyString) );
-    // DEPRECATED: use wxFileName::ReplaceEnvVariable and wxFileName::ReplaceHomeDir
+                                   const wxString& user = wxEmptyString);
 
 // Destructive removal of /./ and /../ stuff
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE char* wxRealPath(char *path) );
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wchar_t* wxRealPath(wchar_t *path) );
-wxDEPRECATED_BUT_USED_INTERNALLY( WXDLLIMPEXP_BASE wxString wxRealPath(const wxString& path) );
-    // DEPRECATED: use wxFileName::Normalize instead
+WXDLLIMPEXP_BASE wxChar* wxRealPath(wxChar *path);
 
 // Allocate a copy of the full absolute path
-wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* wxCopyAbsolutePath(const wxString& path) );
-    // DEPRECATED: use wxFileName::MakeAbsolute instead
-#endif
+WXDLLIMPEXP_BASE wxChar* wxCopyAbsolutePath(const wxString& path);
 
 // Get first file name matching given wild card.
 // Flags are reserved for future use.
 #define wxFILE  1
 #define wxDIR   2
-WXDLLIMPEXP_BASE wxString wxFindFirstFile(const wxString& spec, int flags = wxFILE);
+WXDLLIMPEXP_BASE wxString wxFindFirstFile(const wxChar *spec, int flags = wxFILE);
 WXDLLIMPEXP_BASE wxString wxFindNextFile();
 
 // Does the pattern contain wildcards?
@@ -637,7 +577,7 @@ WXDLLIMPEXP_BASE bool wxRenameFile(const wxString& file1, const wxString& file2,
 // copies into buf.
 // IMPORTANT NOTE getcwd is know not to work under some releases
 // of Win32s 1.3, according to MS release notes!
-wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* wxGetWorkingDirectory(wxChar *buf = NULL, int sz = 1000) );
+wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* wxGetWorkingDirectory(wxChar *buf = (wxChar *) NULL, int sz = 1000) );
 // new and preferred version of wxGetWorkingDirectory
 // NB: can't have the same name because of overloading ambiguity
 #endif // WXWIN_COMPATIBILITY_2_6
@@ -647,7 +587,7 @@ WXDLLIMPEXP_BASE wxString wxGetCwd();
 WXDLLIMPEXP_BASE bool wxSetWorkingDirectory(const wxString& d);
 
 // Make directory
-WXDLLIMPEXP_BASE bool wxMkdir(const wxString& dir, int perm = wxS_DIR_DEFAULT);
+WXDLLIMPEXP_BASE bool wxMkdir(const wxString& dir, int perm = 0777);
 
 // Remove directory. Flags reserved for future use.
 WXDLLIMPEXP_BASE bool wxRmdir(const wxString& dir, int flags = 0);
@@ -727,20 +667,17 @@ inline bool wxIsPathSeparator(wxChar c)
 }
 
 // does the string ends with path separator?
-WXDLLIMPEXP_BASE bool wxEndsWithPathSeparator(const wxString& filename);
+WXDLLIMPEXP_BASE bool wxEndsWithPathSeparator(const wxChar *pszFileName);
 
-#if WXWIN_COMPATIBILITY_2_8
 // split the full path into path (including drive for DOS), name and extension
 // (understands both '/' and '\\')
-// Deprecated in favour of wxFileName::SplitPath
-wxDEPRECATED( WXDLLIMPEXP_BASE void wxSplitPath(const wxString& fileName,
-                                                wxString *pstrPath,
-                                                wxString *pstrName,
-                                                wxString *pstrExt) );
-#endif
+WXDLLIMPEXP_BASE void wxSplitPath(const wxChar *pszFileName,
+                             wxString *pstrPath,
+                             wxString *pstrName,
+                             wxString *pstrExt);
 
 // find a file in a list of directories, returns false if not found
-WXDLLIMPEXP_BASE bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile);
+WXDLLIMPEXP_BASE bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile);
 
 // Get the OS directory if appropriate (such as the Windows directory).
 // On non-Windows platform, probably just return the empty string.
diff --git a/Source/3rd Party/wx/include/wx/filehistory.h b/Source/3rd Party/wx/include/wx/filehistory.h
deleted file mode 100644
index 222f93739..000000000
--- a/Source/3rd Party/wx/include/wx/filehistory.h	
+++ /dev/null
@@ -1,114 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/filehistory.h
-// Purpose:     wxFileHistory class
-// Author:      Julian Smart, Vaclav Slavik
-// Created:     2010-05-03
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart, Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FILEHISTORY_H_
-#define _WX_FILEHISTORY_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_FILE_HISTORY
-
-#include "wx/windowid.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/string.h"
-#include "wx/arrstr.h"
-
-class WXDLLIMPEXP_FWD_CORE wxMenu;
-class WXDLLIMPEXP_FWD_BASE wxConfigBase;
-class WXDLLIMPEXP_FWD_BASE wxFileName;
-
-// ----------------------------------------------------------------------------
-// File history management
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileHistoryBase : public wxObject
-{
-public:
-    wxFileHistoryBase(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);
-
-    // Operations
-    virtual void AddFileToHistory(const wxString& file);
-    virtual void RemoveFileFromHistory(size_t i);
-    virtual int GetMaxFiles() const { return (int)m_fileMaxFiles; }
-    virtual void UseMenu(wxMenu *menu);
-
-    // Remove menu from the list (MDI child may be closing)
-    virtual void RemoveMenu(wxMenu *menu);
-
-#if wxUSE_CONFIG
-    virtual void Load(const wxConfigBase& config);
-    virtual void Save(wxConfigBase& config);
-#endif // wxUSE_CONFIG
-
-    virtual void AddFilesToMenu();
-    virtual void AddFilesToMenu(wxMenu* menu); // Single menu
-
-    // Accessors
-    virtual wxString GetHistoryFile(size_t i) const { return m_fileHistory[i]; }
-    virtual size_t GetCount() const { return m_fileHistory.GetCount(); }
-
-    const wxList& GetMenus() const { return m_fileMenus; }
-
-    // Set/get base id
-    void SetBaseId(wxWindowID baseId) { m_idBase = baseId; }
-    wxWindowID GetBaseId() const { return m_idBase; }
-
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, use GetCount() instead
-    wxDEPRECATED( size_t GetNoHistoryFiles() const );
-#endif // WXWIN_COMPATIBILITY_2_6
-
-protected:
-    // Last n files
-    wxArrayString     m_fileHistory;
-
-    // Menus to maintain (may need several for an MDI app)
-    wxList            m_fileMenus;
-
-    // Max files to maintain
-    size_t            m_fileMaxFiles;
-
-private:
-    // The ID of the first history menu item (Doesn't have to be wxID_FILE1)
-    wxWindowID m_idBase;
-
-    // Normalize a file name to canonical form. We have a special function for
-    // this to ensure the same normalization is used everywhere.
-    static wxString NormalizeFileName(const wxFileName& filename);
-
-    wxDECLARE_NO_COPY_CLASS(wxFileHistoryBase);
-};
-
-#if WXWIN_COMPATIBILITY_2_6
-inline size_t wxFileHistoryBase::GetNoHistoryFiles() const
-{
-    return m_fileHistory.GetCount();
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
-#if defined(__WXGTK20__)
-    #include "wx/gtk/filehistory.h"
-#else
-    // no platform-specific implementation of wxFileHistory yet
-    class WXDLLIMPEXP_CORE wxFileHistory : public wxFileHistoryBase
-    {
-    public:
-        wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1)
-            : wxFileHistoryBase(maxFiles, idBase) {}
-
-        DECLARE_DYNAMIC_CLASS(wxFileHistory)
-    };
-#endif
-
-#endif // wxUSE_FILE_HISTORY
-
-#endif // _WX_FILEHISTORY_H_
diff --git a/Source/3rd Party/wx/include/wx/filename.h b/Source/3rd Party/wx/include/wx/filename.h
index 62e37abb1..e9228787d 100644
--- a/Source/3rd Party/wx/include/wx/filename.h	
+++ b/Source/3rd Party/wx/include/wx/filename.h	
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     28.12.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filename.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 2000 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,8 +27,6 @@
 #include "wx/filefn.h"
 #include "wx/datetime.h"
 #include "wx/intl.h"
-#include "wx/longlong.h"
-#include "wx/file.h"
 
 #if wxUSE_FILE
 class WXDLLIMPEXP_FWD_BASE wxFile;
@@ -38,12 +36,6 @@ class WXDLLIMPEXP_FWD_BASE wxFile;
 class WXDLLIMPEXP_FWD_BASE wxFFile;
 #endif
 
-// this symbol is defined for the platforms where file systems use volumes in
-// paths
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
-    #define wxHAS_FILESYSTEM_VOLUMES
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -65,20 +57,12 @@ enum wxPathFormat
     wxPATH_MAX // Not a valid value for specifying path format
 };
 
-// different conventions that may be used with GetHumanReadableSize()
-enum wxSizeConvention
-{
-    wxSIZE_CONV_TRADITIONAL,  // 1024 bytes = 1 KB
-    wxSIZE_CONV_IEC,          // 1024 bytes = 1 KiB
-    wxSIZE_CONV_SI            // 1000 bytes = 1 KB
-};
-
 // the kind of normalization to do with the file name: these values can be
 // or'd together to perform several operations at once
 enum wxPathNormalize
 {
     wxPATH_NORM_ENV_VARS = 0x0001,  // replace env vars with their values
-    wxPATH_NORM_DOTS     = 0x0002,  // squeeze all .. and .
+    wxPATH_NORM_DOTS     = 0x0002,  // squeeze all .. and . and prepend cwd
     wxPATH_NORM_TILDE    = 0x0004,  // Unix only: replace ~ and ~user
     wxPATH_NORM_CASE     = 0x0008,  // if case insensitive => tolower
     wxPATH_NORM_ABSOLUTE = 0x0010,  // make the path absolute
@@ -90,28 +74,18 @@ enum wxPathNormalize
 // what exactly should GetPath() return?
 enum
 {
-    wxPATH_NO_SEPARATOR  = 0x0000,  // for symmetry with wxPATH_GET_SEPARATOR
     wxPATH_GET_VOLUME    = 0x0001,  // include the volume if applicable
     wxPATH_GET_SEPARATOR = 0x0002   // terminate the path with the separator
 };
 
-// Mkdir flags
+// MkDir flags
 enum
 {
     wxPATH_MKDIR_FULL    = 0x0001   // create directories recursively
 };
 
-// Rmdir flags
-enum
-{
-    wxPATH_RMDIR_FULL       = 0x0001,  // delete with subdirectories if empty
-    wxPATH_RMDIR_RECURSIVE  = 0x0002   // delete all recursively (dangerous!)
-};
-
-#if wxUSE_LONGLONG
 // error code of wxFileName::GetSize()
-extern WXDLLIMPEXP_DATA_BASE(const wxULongLong) wxInvalidSize;
-#endif // wxUSE_LONGLONG
+extern WXDLLIMPEXP_DATA_BASE(wxULongLong) wxInvalidSize;
 
 
 
@@ -190,7 +164,7 @@ public:
         // assorted assignment operators
 
     wxFileName& operator=(const wxFileName& filename)
-        { if (this != &filename) Assign(filename); return *this; }
+        { Assign(filename); return *this; }
 
     wxFileName& operator=(const wxString& filename)
         { Assign(filename); return *this; }
@@ -214,20 +188,14 @@ public:
                 !m_ext.empty() || m_hasExt;
     }
 
-        // does the file with this name exist?
+        // does the file with this name exists?
     bool FileExists() const;
     static bool FileExists( const wxString &file );
 
-        // does the directory with this name exist?
+        // does the directory with this name exists?
     bool DirExists() const;
     static bool DirExists( const wxString &dir );
 
-        // does anything at all with this name (i.e. file, directory or some
-        // other file system object such as a device, socket, ...) exist?
-    bool Exists() const { return Exists(GetFullPath()); }
-    static bool Exists(const wxString& path);
-
-
         // checks on most common flags for files/directories;
         // more platform-specific features (like e.g. Unix permissions) are not
         // available in wxFileName
@@ -257,10 +225,10 @@ public:
         // (any of the pointers may be NULL)
     bool SetTimes(const wxDateTime *dtAccess,
                   const wxDateTime *dtMod,
-                  const wxDateTime *dtCreate) const;
+                  const wxDateTime *dtCreate);
 
         // set the access and modification times to the current moment
-    bool Touch() const;
+    bool Touch();
 
         // return the last access, last modification and create times
         // (any of the pointers may be NULL)
@@ -277,9 +245,9 @@ public:
     }
 #endif // wxUSE_DATETIME
 
-#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
+#ifdef __WXMAC__
     bool MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) ;
-    bool MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) const;
+    bool MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) ;
     // gets the 'common' type and creator for a certain extension
     static bool MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator ) ;
     // registers application defined extensions and their default type and creator
@@ -295,7 +263,7 @@ public:
     static wxString GetCwd(const wxString& volume = wxEmptyString);
 
         // change the current working directory
-    bool SetCwd() const;
+    bool SetCwd();
     static bool SetCwd( const wxString &cwd );
 
         // get the value of user home (Unix only mainly)
@@ -330,12 +298,11 @@ public:
 #endif // wxUSE_FFILE
 
     // directory creation and removal.
-    bool Mkdir(int perm = wxS_DIR_DEFAULT, int flags = 0) const;
-    static bool Mkdir(const wxString &dir, int perm = wxS_DIR_DEFAULT,
-                      int flags = 0);
+    bool Mkdir( int perm = 0777, int flags = 0);
+    static bool Mkdir( const wxString &dir, int perm = 0777, int flags = 0 );
 
-    bool Rmdir(int flags = 0) const;
-    static bool Rmdir(const wxString &dir, int flags = 0);
+    bool Rmdir();
+    static bool Rmdir( const wxString &dir );
 
     // operations on the path
 
@@ -372,28 +339,9 @@ public:
         // the arguments
     bool GetShortcutTarget(const wxString& shortcutPath,
                            wxString& targetFilename,
-                           wxString* arguments = NULL) const;
+                           wxString* arguments = NULL);
 #endif
 
-#ifndef __WXWINCE__
-        // if the path contains the value of the environment variable named envname
-        // then this function replaces it with the string obtained from
-        //    wxString::Format(replacementFmtString, value_of_envname_variable)
-        //
-        // Example:
-        //    wxFileName fn("/usr/openwin/lib/someFile");
-        //    fn.ReplaceEnvVariable("OPENWINHOME");
-        //         // now fn.GetFullPath() == "$OPENWINHOME/lib/someFile"
-    bool ReplaceEnvVariable(const wxString& envname,
-                            const wxString& replacementFmtString = "$%s",
-                            wxPathFormat format = wxPATH_NATIVE);
-#endif
-
-        // replaces, if present in the path, the home directory for the given user
-        // (see wxGetHomeDir) with a tilde
-    bool ReplaceHomeDir(wxPathFormat format = wxPATH_NATIVE);
-
-
     // Comparison
 
         // compares with the rules of the given platforms format
@@ -441,17 +389,12 @@ public:
     static wxString GetPathTerminators(wxPathFormat format = wxPATH_NATIVE);
 
     // get the canonical path separator for this format
-    static wxUniChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE)
+    static wxChar GetPathSeparator(wxPathFormat format = wxPATH_NATIVE)
         { return GetPathSeparators(format)[0u]; }
 
     // is the char a path separator for this format?
     static bool IsPathSeparator(wxChar ch, wxPathFormat format = wxPATH_NATIVE);
 
-    // is this is a DOS path which beings with a windows unique volume name
-    // ('\\?\Volume{guid}\')?
-    static bool IsMSWUniqueVolumeNamePath(const wxString& path,
-                                          wxPathFormat format = wxPATH_NATIVE);
-
     // Dir accessors
     size_t GetDirCount() const { return m_dirs.size(); }
     void AppendDir(const wxString& dir);
@@ -538,32 +481,24 @@ public:
                             wxString *path,
                             wxPathFormat format = wxPATH_NATIVE);
 
-        // strip the file extension: "foo.bar" => "foo" (but ".baz" => ".baz")
+#if wxABI_VERSION >= 20811
+        // strip the file extension
     static wxString StripExtension(const wxString& fullpath);
+#endif // wxABI_VERSION >= 20811
 
-#ifdef wxHAS_FILESYSTEM_VOLUMES
-        // return the string representing a file system volume, or drive
-    static wxString GetVolumeString(char drive, int flags = wxPATH_GET_SEPARATOR);
-#endif // wxHAS_FILESYSTEM_VOLUMES
 
-    // File size
+    // Filesize
 
-#if wxUSE_LONGLONG
         // returns the size of the given filename
     wxULongLong GetSize() const;
     static wxULongLong GetSize(const wxString &file);
 
         // returns the size in a human readable form
-    wxString
-    GetHumanReadableSize(const wxString& nullsize = _("Not available"),
-                         int precision = 1,
-                         wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL) const;
-    static wxString
-    GetHumanReadableSize(const wxULongLong& sz,
-                         const wxString& nullsize = _("Not available"),
-                         int precision = 1,
-                         wxSizeConvention conv = wxSIZE_CONV_TRADITIONAL);
-#endif // wxUSE_LONGLONG
+    wxString GetHumanReadableSize(const wxString &nullsize = wxGetTranslation(wxT("Not available")),
+                                  int precision = 1) const;
+    static wxString GetHumanReadableSize(const wxULongLong &sz,
+                                         const wxString &nullsize = wxGetTranslation(wxT("Not available")),
+                                         int precision = 1);
 
 
     // deprecated methods, don't use any more
diff --git a/Source/3rd Party/wx/include/wx/filepicker.h b/Source/3rd Party/wx/include/wx/filepicker.h
index a272a1dcd..ce08f8569 100644
--- a/Source/3rd Party/wx/include/wx/filepicker.h	
+++ b/Source/3rd Party/wx/include/wx/filepicker.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filepicker.h 49804 2007-11-10 01:09:42Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,64 +17,20 @@
 #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
 #include "wx/pickerbase.h"
-#include "wx/filename.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDialog;
 class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent;
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerWidgetLabel[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerWidgetNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFilePickerCtrlNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetLabel[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerWidgetNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFilePickerCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[];
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerWidgetLabel[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerWidgetNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDirPickerCtrlNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetLabel[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerWidgetNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirPickerCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
 
-// ----------------------------------------------------------------------------
-// wxFileDirPickerEvent: used by wxFilePickerCtrl and wxDirPickerCtrl only
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileDirPickerEvent : public wxCommandEvent
-{
-public:
-    wxFileDirPickerEvent() {}
-    wxFileDirPickerEvent(wxEventType type, wxObject *generator, int id, const wxString &path)
-        : wxCommandEvent(type, id),
-          m_path(path)
-    {
-        SetEventObject(generator);
-    }
-
-    wxString GetPath() const { return m_path; }
-    void SetPath(const wxString &p) { m_path = p; }
-
-    // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const { return new wxFileDirPickerEvent(*this); }
-
-private:
-    wxString m_path;
-
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileDirPickerEvent)
-};
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEvent );
-
-// ----------------------------------------------------------------------------
-// event types and macros
-// ----------------------------------------------------------------------------
-
-typedef void (wxEvtHandler::*wxFileDirPickerEventFunction)(wxFileDirPickerEvent&);
-
-#define wxFileDirPickerEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxFileDirPickerEventFunction, func)
-
-#define EVT_FILEPICKER_CHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_FILEPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn))
-#define EVT_DIRPICKER_CHANGED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_DIRPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn))
 
 // ----------------------------------------------------------------------------
 // wxFileDirPickerWidgetBase: a generic abstract interface which must be
@@ -87,13 +43,9 @@ public:
     wxFileDirPickerWidgetBase() {  }
     virtual ~wxFileDirPickerWidgetBase() {  }
 
-    // Path here is the name of the selected file or directory.
     wxString GetPath() const { return m_path; }
     virtual void SetPath(const wxString &str) { m_path=str; }
 
-    // Set the directory to open the file browse dialog at initially.
-    virtual void SetInitialDirectory(const wxString& dir) = 0;
-
     // returns the picker widget cast to wxControl
     virtual wxControl *AsControl() = 0;
 
@@ -113,14 +65,12 @@ protected:
 #define wxFLP_OVERWRITE_PROMPT        0x1000
 #define wxFLP_FILE_MUST_EXIST         0x2000
 #define wxFLP_CHANGE_DIR              0x4000
-#define wxFLP_SMALL                   wxPB_SMALL
 
 // NOTE: wxMULTIPLE is not supported !
 
 
 #define wxDIRP_DIR_MUST_EXIST         0x0008
 #define wxDIRP_CHANGE_DIR             0x0010
-#define wxDIRP_SMALL                  wxPB_SMALL
 
 
 // map platform-dependent controls which implement the wxFileDirPickerWidgetBase
@@ -169,12 +119,6 @@ public:         // public API
     wxString GetPath() const;
     void SetPath(const wxString &str);
 
-    // Set the directory to open the file browse dialog at initially.
-    void SetInitialDirectory(const wxString& dir)
-    {
-        m_pickerIface->SetInitialDirectory(dir);
-    }
-
 public:        // internal functions
 
     void UpdatePickerFromTextCtrl();
@@ -194,8 +138,6 @@ public:        // internal functions
     // Returns the event type sent by this picker
     virtual wxEventType GetEventType() const = 0;
 
-    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) = 0;
-
     // Returns the filtered value currently placed in the text control (if present).
     virtual wxString GetTextCtrlValue() const = 0;
 
@@ -265,13 +207,14 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxFLP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxFilePickerCtrlNameStr);
+                const wxString& name = wxFilePickerCtrlNameStr)
+    {
+        return wxFileDirPickerCtrlBase::CreateBase(parent, id, path,
+                                                   message, wildcard,
+                                                   pos, size, style,
+                                                   validator, name);
+    }
 
-    void SetFileName(const wxFileName &filename)
-        { SetPath(filename.GetFullPath()); }
-
-    wxFileName GetFileName() const
-        { return wxFileName(GetPath()); }
 
 public:     // overrides
 
@@ -287,23 +230,14 @@ public:     // overrides
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
 
-    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink )
-    {
-        sender->Connect( wxEVT_COMMAND_FILEPICKER_CHANGED,
-            wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ),
-            NULL, eventSink );
-    }
-
-
 protected:
-    virtual
     wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent,
                                             const wxString& path,
                                             const wxString& message,
                                             const wxString& wildcard)
     {
         return new wxFilePickerWidget(parent, wxID_ANY,
-                                      wxGetTranslation(wxFilePickerWidgetLabel),
+                                      wxFilePickerWidgetLabel,
                                       path, message, wildcard,
                                       wxDefaultPosition, wxDefaultSize,
                                       GetPickerStyle(GetWindowStyle()));
@@ -312,13 +246,8 @@ protected:
     // extracts the style for our picker from wxFileDirPickerCtrlBase's style
     long GetPickerStyle(long style) const
     {
-        return style & (wxFLP_OPEN |
-                        wxFLP_SAVE |
-                        wxFLP_OVERWRITE_PROMPT |
-                        wxFLP_FILE_MUST_EXIST |
-                        wxFLP_CHANGE_DIR |
-                        wxFLP_USE_TEXTCTRL |
-                        wxFLP_SMALL);
+        return (style & (wxFLP_OPEN|wxFLP_SAVE|wxFLP_OVERWRITE_PROMPT|
+                            wxFLP_FILE_MUST_EXIST|wxFLP_CHANGE_DIR));
     }
 
 private:
@@ -369,13 +298,15 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxDIRP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxDirPickerCtrlNameStr);
+                const wxString& name = wxDirPickerCtrlNameStr)
+    {
+        return wxFileDirPickerCtrlBase::CreateBase
+               (
+                    parent, id, path, message, wxEmptyString,
+                    pos, size, style, validator, name
+               );
+    }
 
-    void SetDirName(const wxFileName &dirname)
-        { SetPath(dirname.GetPath()); }
-
-    wxFileName GetDirName() const
-        { return wxFileName::DirName(GetPath()); }
 
 public:     // overrides
 
@@ -389,23 +320,13 @@ public:     // overrides
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
 
-    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink )
-    {
-        sender->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED,
-            wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ),
-            NULL, eventSink );
-    }
-
-
 protected:
-    virtual
     wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent,
                                             const wxString& path,
                                             const wxString& message,
                                             const wxString& WXUNUSED(wildcard))
     {
-        return new wxDirPickerWidget(parent, wxID_ANY,
-                                     wxGetTranslation(wxDirPickerWidgetLabel),
+        return new wxDirPickerWidget(parent, wxID_ANY, wxDirPickerWidgetLabel,
                                      path, message,
                                      wxDefaultPosition, wxDefaultSize,
                                      GetPickerStyle(GetWindowStyle()));
@@ -413,12 +334,7 @@ protected:
 
     // extracts the style for our picker from wxFileDirPickerCtrlBase's style
     long GetPickerStyle(long style) const
-    {
-        return style & (wxDIRP_DIR_MUST_EXIST |
-                        wxDIRP_CHANGE_DIR |
-                        wxDIRP_USE_TEXTCTRL |
-                        wxDIRP_SMALL);
-    }
+        { return (style & (wxDIRP_DIR_MUST_EXIST|wxDIRP_CHANGE_DIR)); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDirPickerCtrl)
@@ -426,5 +342,57 @@ private:
 
 #endif      // wxUSE_DIRPICKERCTRL
 
+
+#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
+
+// ----------------------------------------------------------------------------
+// wxFileDirPickerEvent: used by wxFilePickerCtrl and wxDirPickerCtrl only
+// ----------------------------------------------------------------------------
+
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_FILEPICKER_CHANGED, 1102)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_DIRPICKER_CHANGED, 1103)
+END_DECLARE_EVENT_TYPES()
+
+class WXDLLIMPEXP_CORE wxFileDirPickerEvent : public wxCommandEvent
+{
+public:
+    wxFileDirPickerEvent() {}
+    wxFileDirPickerEvent(wxEventType type, wxObject *generator, int id, const wxString &path)
+        : wxCommandEvent(type, id),
+          m_path(path)
+    {
+        SetEventObject(generator);
+    }
+
+    wxString GetPath() const { return m_path; }
+    void SetPath(const wxString &p) { m_path = p; }
+
+    // default copy ctor, assignment operator and dtor are ok
+    virtual wxEvent *Clone() const { return new wxFileDirPickerEvent(*this); }
+
+private:
+    wxString m_path;
+
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileDirPickerEvent)
+};
+
+// ----------------------------------------------------------------------------
+// event types and macros
+// ----------------------------------------------------------------------------
+
+typedef void (wxEvtHandler::*wxFileDirPickerEventFunction)(wxFileDirPickerEvent&);
+
+#define wxFileDirPickerEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFileDirPickerEventFunction, &func)
+
+#define EVT_FILEPICKER_CHANGED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_FILEPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn))
+#define EVT_DIRPICKER_CHANGED(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_DIRPICKER_CHANGED, id, wxFileDirPickerEventHandler(fn))
+
+
+#endif // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
+
 #endif // _WX_FILEDIRPICKER_H_BASE_
 
diff --git a/Source/3rd Party/wx/include/wx/filesys.h b/Source/3rd Party/wx/include/wx/filesys.h
index 26fdaf44d..3d40f1104 100644
--- a/Source/3rd Party/wx/include/wx/filesys.h	
+++ b/Source/3rd Party/wx/include/wx/filesys.h	
@@ -3,7 +3,7 @@
 // Purpose:     class for opening files - virtual file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filesys.h 53135 2008-04-12 02:31:04Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -12,8 +12,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_FILESYSTEM
-
 #if !wxUSE_STREAMS
 #error You cannot compile virtual file systems without wxUSE_STREAMS
 #endif
@@ -22,6 +20,8 @@
 #error You cannot compile wxHTML without virtual file systems
 #endif
 
+#if wxUSE_FILESYSTEM
+
 #include "wx/stream.h"
 #include "wx/datetime.h"
 #include "wx/filename.h"
@@ -50,7 +50,7 @@ public:
     {
         m_Stream = stream;
         m_Location = loc;
-        m_MimeType = mimetype.Lower();
+        m_MimeType = mimetype; m_MimeType.MakeLower();
         m_Anchor = anchor;
 #if wxUSE_DATETIME
         m_Modif = modif;
@@ -78,7 +78,7 @@ public:
     }
 
     // returns file's mime type
-    const wxString& GetMimeType() const;
+    const wxString& GetMimeType() const { return m_MimeType; }
 
     // returns the original location (aka filename) of the file
     const wxString& GetLocation() const { return m_Location; }
@@ -99,7 +99,7 @@ private:
 #endif // wxUSE_DATETIME
 
     DECLARE_ABSTRACT_CLASS(wxFSFile)
-    wxDECLARE_NO_COPY_CLASS(wxFSFile);
+    DECLARE_NO_COPY_CLASS(wxFSFile)
 };
 
 
@@ -132,28 +132,28 @@ public:
     virtual wxString FindFirst(const wxString& spec, int flags = 0);
     virtual wxString FindNext();
 
-    // Returns MIME type of the file - w/o need to open it
-    // (default behaviour is that it returns type based on extension)
-    static wxString GetMimeTypeFromExt(const wxString& location);
-
 protected:
     // returns protocol ("file", "http", "tar" etc.) The last (most right)
     // protocol is used:
     // {it returns "tar" for "file:subdir/archive.tar.gz#tar:/README.txt"}
-    static wxString GetProtocol(const wxString& location);
+    wxString GetProtocol(const wxString& location) const;
 
     // returns left part of address:
     // {it returns "file:subdir/archive.tar.gz" for "file:subdir/archive.tar.gz#tar:/README.txt"}
-    static wxString GetLeftLocation(const wxString& location);
+    wxString GetLeftLocation(const wxString& location) const;
 
     // returns anchor part of address:
     // {it returns "anchor" for "file:subdir/archive.tar.gz#tar:/README.txt#anchor"}
     // NOTE:  anchor is NOT a part of GetLeftLocation()'s return value
-    static wxString GetAnchor(const wxString& location);
+    wxString GetAnchor(const wxString& location) const;
 
     // returns right part of address:
     // {it returns "/README.txt" for "file:subdir/archive.tar.gz#tar:/README.txt"}
-    static wxString GetRightLocation(const wxString& location);
+    wxString GetRightLocation(const wxString& location) const;
+
+    // Returns MIME type of the file - w/o need to open it
+    // (default behaviour is that it returns type based on extension)
+    wxString GetMimeTypeFromExt(const wxString& location);
 
     DECLARE_ABSTRACT_CLASS(wxFileSystemHandler)
 };
@@ -168,8 +168,7 @@ protected:
 //--------------------------------------------------------------------------------
 
 // Open Bit Flags
-enum wxFileSystemOpenFlags
-{
+enum {
     wxFS_READ = 1,      // Open for reading
     wxFS_SEEKABLE = 4   // Returned stream will be seekable
 };
@@ -206,8 +205,7 @@ public:
     wxString FindNext();
 
     // find a file in a list of directories, returns false if not found
-    bool FindFileInPath(wxString *pStr,
-                        const wxString& path, const wxString& file);
+    bool FindFileInPath(wxString *pStr, const wxChar *path, const wxChar *file);
 
     // Adds FS handler.
     // In fact, this class is only front-end to the FS handlers :-)
@@ -247,7 +245,7 @@ protected:
             // Handlers local to this instance
 
     DECLARE_DYNAMIC_CLASS(wxFileSystem)
-    wxDECLARE_NO_COPY_CLASS(wxFileSystem);
+    DECLARE_NO_COPY_CLASS(wxFileSystem)
 };
 
 
@@ -293,20 +291,7 @@ protected:
     static wxString ms_root;
 };
 
-// Stream reading data from wxFSFile: this allows to use virtual files with any
-// wx functions accepting streams.
-class WXDLLIMPEXP_BASE wxFSInputStream : public wxWrapperInputStream
-{
-public:
-    // Notice that wxFS_READ is implied in flags.
-    wxFSInputStream(const wxString& filename, int flags = 0);
-    virtual ~wxFSInputStream();
 
-private:
-    wxFSFile* m_file;
-
-    wxDECLARE_NO_COPY_CLASS(wxFSInputStream);
-};
 
 #endif
   // wxUSE_FILESYSTEM
diff --git a/Source/3rd Party/wx/include/wx/flags.h b/Source/3rd Party/wx/include/wx/flags.h
index f0ff9fa89..803205fdf 100644
--- a/Source/3rd Party/wx/include/wx/flags.h	
+++ b/Source/3rd Party/wx/include/wx/flags.h	
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     27/07/03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: flags.h 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -153,10 +153,8 @@ private :
     unsigned long m_data;
 };
 
-#if wxUSE_EXTENDED_RTTI
-
-#define wxDEFINE_FLAGS( flags ) \
-    class WXDLLIMPEXP_BASE flags \
+#define WX_DEFINE_FLAGS( flags ) \
+    class WXDLLEXPORT flags \
     {\
     public : \
         flags(long data=0) :m_data(data) {} \
@@ -164,14 +162,4 @@ private :
         bool operator ==(const flags &rhs) const { return m_data == rhs.m_data; }\
     } ;
 
-#else
-
-#define wxDEFINE_FLAGS( flags )
-
-#endif
-
-#if WXWIN_COMPATIBILITY_2_8
-    #define WX_DEFINE_FLAGS     wxDEFINE_FLAGS
-#endif
-
 #endif
diff --git a/Source/3rd Party/wx/include/wx/fmappriv.h b/Source/3rd Party/wx/include/wx/fmappriv.h
index ced61d9a0..95df28c90 100644
--- a/Source/3rd Party/wx/include/wx/fmappriv.h	
+++ b/Source/3rd Party/wx/include/wx/fmappriv.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003 (extracted from common/fontmap.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fmappriv.h 27454 2004-05-26 10:49:43Z JS $
 // Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -65,7 +65,7 @@ private:
     bool m_ok;
 
 
-    wxDECLARE_NO_COPY_CLASS(wxFontMapperPathChanger);
+    DECLARE_NO_COPY_CLASS(wxFontMapperPathChanger)
 };
 
 #endif // wxUSE_CONFIG
diff --git a/Source/3rd Party/wx/include/wx/font.h b/Source/3rd Party/wx/include/wx/font.h
index 4f0effee7..751262626 100644
--- a/Source/3rd Party/wx/include/wx/font.h	
+++ b/Source/3rd Party/wx/include/wx/font.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: font.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,13 +19,15 @@
 #include "wx/defs.h"        // for wxDEFAULT &c
 #include "wx/fontenc.h"     // the font encoding constants
 #include "wx/gdiobj.h"      // the base class
-#include "wx/gdicmn.h"      // for wxGDIObjListBase
 
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 
+class WXDLLIMPEXP_FWD_CORE wxFontData;
+class WXDLLIMPEXP_FWD_CORE wxFontBase;
 class WXDLLIMPEXP_FWD_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxSize;
 
 // ----------------------------------------------------------------------------
 // font constants
@@ -66,20 +68,8 @@ enum wxFontWeight
     wxFONTWEIGHT_MAX
 };
 
-// Symbolic font sizes as defined in CSS specification.
-enum wxFontSymbolicSize
-{
-    wxFONTSIZE_XX_SMALL = -3,
-    wxFONTSIZE_X_SMALL,
-    wxFONTSIZE_SMALL,
-    wxFONTSIZE_MEDIUM,
-    wxFONTSIZE_LARGE,
-    wxFONTSIZE_X_LARGE,
-    wxFONTSIZE_XX_LARGE
-};
-
 // the font flag bits for the new font ctor accepting one combined flags word
-enum wxFontFlag
+enum
 {
     // no special flags: font with default weight/slant/anti-aliasing
     wxFONTFLAG_DEFAULT          = 0,
@@ -117,36 +107,12 @@ enum wxFontFlag
 
 class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
 
-class WXDLLIMPEXP_CORE wxFontBase : public wxGDIObject
+class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 public:
-    /*
-        derived classes should provide the following ctors:
-
-    wxFont();
-    wxFont(const wxString& nativeFontInfoString);
-    wxFont(const wxNativeFontInfo& info);
-    wxFont(int size,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-    wxFont(const wxSize& pixelSize,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-    */
-
     // creator function
     virtual ~wxFontBase();
 
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
     // from the font components
     static wxFont *New(
         int pointSize,              // size of the font in points
@@ -155,41 +121,6 @@ public:
         int weight,                 // see wxFontWeight enum
         bool underlined = false,    // not underlined by default
         const wxString& face = wxEmptyString,              // facename
-        wxFontEncoding encoding = wxFONTENCODING_DEFAULT)  // ISO8859-X, ...
-        { return New(pointSize, (wxFontFamily)family, (wxFontStyle)style,
-                     (wxFontWeight)weight, underlined, face, encoding); }
-
-    // from the font components
-    static wxFont *New(
-        const wxSize& pixelSize,    // size of the font in pixels
-        int family,                 // see wxFontFamily enum
-        int style,                  // see wxFontStyle enum
-        int weight,                 // see wxFontWeight enum
-        bool underlined = false,    // not underlined by default
-        const wxString& face = wxEmptyString,              // facename
-        wxFontEncoding encoding = wxFONTENCODING_DEFAULT)  // ISO8859-X, ...
-        { return New(pixelSize, (wxFontFamily)family, (wxFontStyle)style,
-                     (wxFontWeight)weight, underlined, face, encoding); }
-#endif
-
-    // from the font components
-    static wxFont *New(
-        int pointSize,              // size of the font in points
-        wxFontFamily family,        // see wxFontFamily enum
-        wxFontStyle style,          // see wxFontStyle enum
-        wxFontWeight weight,        // see wxFontWeight enum
-        bool underlined = false,    // not underlined by default
-        const wxString& face = wxEmptyString,              // facename
-        wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ...
-
-    // from the font components
-    static wxFont *New(
-        const wxSize& pixelSize,    // size of the font in pixels
-        wxFontFamily family,        // see wxFontFamily enum
-        wxFontStyle style,          // see wxFontStyle enum
-        wxFontWeight weight,        // see wxFontWeight enum
-        bool underlined = false,    // not underlined by default
-        const wxString& face = wxEmptyString,              // facename
         wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ...
 
     // from the font components but using the font flags instead of separate
@@ -200,6 +131,15 @@ public:
                        const wxString& face = wxEmptyString,
                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
+    // from the font components
+    static wxFont *New(
+        const wxSize& pixelSize,    // size of the font in pixels
+        int family,                 // see wxFontFamily enum
+        int style,                  // see wxFontStyle enum
+        int weight,                 // see wxFontWeight enum
+        bool underlined = false,    // not underlined by default
+        const wxString& face = wxEmptyString,              // facename
+        wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ...
 
     // from the font components but using the font flags instead of separate
     // parameters for each flag
@@ -215,19 +155,22 @@ public:
     // from the string representation of wxNativeFontInfo
     static wxFont *New(const wxString& strNativeFontDesc);
 
+    // was the font successfully created?
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
+
     // comparison
-    bool operator==(const wxFont& font) const;
-    bool operator!=(const wxFont& font) const { return !(*this == font); }
+    bool operator == (const wxFont& font) const;
+    bool operator != (const wxFont& font) const;
 
     // accessors: get the font characteristics
     virtual int GetPointSize() const = 0;
     virtual wxSize GetPixelSize() const;
     virtual bool IsUsingSizeInPixels() const;
-    wxFontFamily GetFamily() const;
-    virtual wxFontStyle GetStyle() const = 0;
-    virtual wxFontWeight GetWeight() const = 0;
+    virtual int GetFamily() const = 0;
+    virtual int GetStyle() const = 0;
+    virtual int GetWeight() const = 0;
     virtual bool GetUnderlined() const = 0;
-    virtual bool GetStrikethrough() const { return false; }
     virtual wxString GetFaceName() const = 0;
     virtual wxFontEncoding GetEncoding() const = 0;
     virtual const wxNativeFontInfo *GetNativeFontInfo() const = 0;
@@ -240,12 +183,10 @@ public:
     // change the font characteristics
     virtual void SetPointSize( int pointSize ) = 0;
     virtual void SetPixelSize( const wxSize& pixelSize );
-    virtual void SetFamily( wxFontFamily family ) = 0;
-    virtual void SetStyle( wxFontStyle style ) = 0;
-    virtual void SetWeight( wxFontWeight weight ) = 0;
-
+    virtual void SetFamily( int family ) = 0;
+    virtual void SetStyle( int style ) = 0;
+    virtual void SetWeight( int weight ) = 0;
     virtual void SetUnderlined( bool underlined ) = 0;
-    virtual void SetStrikethrough( bool WXUNUSED(strikethrough) ) {}
     virtual void SetEncoding(wxFontEncoding encoding) = 0;
     virtual bool SetFaceName( const wxString& faceName );
     void SetNativeFontInfo(const wxNativeFontInfo& info)
@@ -254,71 +195,25 @@ public:
     bool SetNativeFontInfo(const wxString& info);
     bool SetNativeFontInfoUserDesc(const wxString& info);
 
-    // Symbolic font sizes support: set the font size to "large" or "very
-    // small" either absolutely (i.e. compared to the default font size) or
-    // relatively to the given font size.
-    void SetSymbolicSize(wxFontSymbolicSize size);
-    void SetSymbolicSizeRelativeTo(wxFontSymbolicSize size, int base)
-    {
-        SetPointSize(AdjustToSymbolicSize(size, base));
-    }
-
-    // Adjust the base size in points according to symbolic size.
-    static int AdjustToSymbolicSize(wxFontSymbolicSize size, int base);
-
-
     // translate the fonts into human-readable string (i.e. GetStyleString()
     // will return "wxITALIC" for an italic font, ...)
     wxString GetFamilyString() const;
     wxString GetStyleString() const;
     wxString GetWeightString() const;
 
+    // Unofficial API, don't use
+    virtual void SetNoAntiAliasing( bool WXUNUSED(no) = true ) {  }
+    virtual bool GetNoAntiAliasing() const { return false; }
+
     // the default encoding is used for creating all fonts with default
     // encoding parameter
     static wxFontEncoding GetDefaultEncoding() { return ms_encodingDefault; }
     static void SetDefaultEncoding(wxFontEncoding encoding);
 
-    // this doesn't do anything and is kept for compatibility only
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE(void SetNoAntiAliasing(bool no = true), wxUnusedVar(no););
-    wxDEPRECATED_INLINE(bool GetNoAntiAliasing() const, return false;)
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
     // the function called by both overloads of SetNativeFontInfo()
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
 
-    // The function called by public GetFamily(): it can return
-    // wxFONTFAMILY_UNKNOWN unlike the public method (see comment there).
-    virtual wxFontFamily DoGetFamily() const = 0;
-
-
-    // Helper functions to recover wxFONTSTYLE/wxFONTWEIGHT and underlined flg
-    // values from flags containing a combination of wxFONTFLAG_XXX.
-    static wxFontStyle GetStyleFromFlags(int flags)
-    {
-        return flags & wxFONTFLAG_ITALIC
-                        ? wxFONTSTYLE_ITALIC
-                        : flags & wxFONTFLAG_SLANT
-                            ? wxFONTSTYLE_SLANT
-                            : wxFONTSTYLE_NORMAL;
-    }
-
-    static wxFontWeight GetWeightFromFlags(int flags)
-    {
-        return flags & wxFONTFLAG_LIGHT
-                        ? wxFONTWEIGHT_LIGHT
-                        : flags & wxFONTFLAG_BOLD
-                            ? wxFONTWEIGHT_BOLD
-                            : wxFONTWEIGHT_NORMAL;
-    }
-
-    static bool GetUnderlinedFromFlags(int flags)
-    {
-        return (flags & wxFONTFLAG_UNDERLINED) != 0;
-    }
-
-
 private:
     // the currently default encoding: by default, it's the default system
     // encoding, but may be changed by the application using
@@ -327,52 +222,10 @@ private:
     static wxFontEncoding ms_encodingDefault;
 };
 
-// wxFontBase <-> wxString utilities, used by wxConfig
-WXDLLIMPEXP_CORE wxString wxToString(const wxFontBase& font);
-WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
-
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-#define wxDECLARE_FONT_COMPAT_SETTER   \
-    wxDEPRECATED_FUTURE( void SetFamily(int family) ) \
-        { SetFamily((wxFontFamily)family); } \
-    wxDEPRECATED_FUTURE( void SetStyle(int style) ) \
-        { SetStyle((wxFontStyle)style); } \
-    wxDEPRECATED_FUTURE( void SetWeight(int weight) ) \
-        { SetWeight((wxFontWeight)weight); } \
-    wxDEPRECATED_FUTURE( void SetFamily(wxDeprecatedGUIConstants family) ) \
-        { SetFamily((wxFontFamily)family); } \
-    wxDEPRECATED_FUTURE( void SetStyle(wxDeprecatedGUIConstants style) ) \
-        { SetStyle((wxFontStyle)style); } \
-    wxDEPRECATED_FUTURE( void SetWeight(wxDeprecatedGUIConstants weight) ) \
-        { SetWeight((wxFontWeight)weight); }
-#else
-#define wxDECLARE_FONT_COMPAT_SETTER  /*empty*/
-#endif
-
-// this macro must be used in all derived wxFont classes declarations
-#define wxDECLARE_COMMON_FONT_METHODS() \
-    wxDECLARE_FONT_COMPAT_SETTER \
- \
-    /* functions for modifying font in place */ \
-    wxFont& MakeBold(); \
-    wxFont& MakeItalic(); \
-    wxFont& MakeUnderlined(); \
-    wxFont& MakeStrikethrough(); \
-    wxFont& MakeLarger() { return Scale(1.2f); } \
-    wxFont& MakeSmaller() { return Scale(1/1.2f); } \
-    wxFont& Scale(float x); \
-    /* functions for creating fonts based on this one */ \
-    wxFont Bold() const; \
-    wxFont Italic() const; \
-    wxFont Underlined() const; \
-    wxFont Strikethrough() const; \
-    wxFont Larger() const { return Scaled(1.2f); } \
-    wxFont Smaller() const { return Scaled(1/1.2f); } \
-    wxFont Scaled(float x) const
-
 // include the real class declaration
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/font.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/font.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/font.h"
@@ -382,74 +235,17 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
     #include "wx/gtk1/font.h"
 #elif defined(__WXX11__)
     #include "wx/x11/font.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/font.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/font.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/font.h"
+    #include "wx/mac/font.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/font.h"
 #elif defined(__WXPM__)
     #include "wx/os2/font.h"
 #endif
 
-class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase
-{
-public:
-    wxFont *FindOrCreateFont(int pointSize,
-                             wxFontFamily family,
-                             wxFontStyle style,
-                             wxFontWeight weight,
-                             bool underline = false,
-                             const wxString& face = wxEmptyString,
-                             wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-     wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
-                              bool underline = false,
-                              const wxString& face = wxEmptyString,
-                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-        { return FindOrCreateFont(pointSize, (wxFontFamily)family, (wxFontStyle)style,
-                                  (wxFontWeight)weight, underline, face, encoding); }
-#endif
-
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( void AddFont(wxFont*) );
-    wxDEPRECATED( void RemoveFont(wxFont*) );
-#endif
-};
-
-extern WXDLLIMPEXP_DATA_CORE(wxFontList*)    wxTheFontList;
-
-
-// provide comparison operators to allow code such as
-//
-//      if ( font.GetStyle() == wxFONTSTYLE_SLANT )
-//
-// to compile without warnings which it would otherwise provoke from some
-// compilers as it compares elements of different enums
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-
-// Unfortunately some compilers have ambiguity issues when enum comparisons are
-// overloaded so we have to disable the overloads in this case, see
-// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
-#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
-
-inline bool operator==(wxFontFamily s, wxDeprecatedGUIConstants t)
-{ return static_cast<int>(s) == static_cast<int>(t); }
-inline bool operator!=(wxFontFamily s, wxDeprecatedGUIConstants t)
-{ return !(s == t); }
-inline bool operator==(wxFontStyle s, wxDeprecatedGUIConstants t)
-{ return static_cast<int>(s) == static_cast<int>(t); }
-inline bool operator!=(wxFontStyle s, wxDeprecatedGUIConstants t)
-{ return !(s == t); }
-inline bool operator==(wxFontWeight s, wxDeprecatedGUIConstants t)
-{ return static_cast<int>(s) == static_cast<int>(t); }
-inline bool operator!=(wxFontWeight s, wxDeprecatedGUIConstants t)
-{ return !(s == t); }
-
-#endif // // wxCOMPILER_NO_OVERLOAD_ON_ENUM
-
-#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
-
 #endif
     // _WX_FONT_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/fontdata.h b/Source/3rd Party/wx/include/wx/fontdata.h
deleted file mode 100644
index 4b9a16bc1..000000000
--- a/Source/3rd Party/wx/include/wx/fontdata.h	
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/fontdata.h
-// Author:      Julian Smart
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FONTDATA_H_
-#define _WX_FONTDATA_H_
-
-#include "wx/font.h"
-#include "wx/colour.h"
-#include "wx/encinfo.h"
-
-class WXDLLIMPEXP_CORE wxFontData : public wxObject
-{
-public:
-    wxFontData();
-    virtual ~wxFontData();
-
-    wxFontData(const wxFontData& data);
-    wxFontData& operator=(const wxFontData& data);
-
-    void SetAllowSymbols(bool flag) { m_allowSymbols = flag; }
-    bool GetAllowSymbols() const { return m_allowSymbols; }
-
-    void SetColour(const wxColour& colour) { m_fontColour = colour; }
-    const wxColour& GetColour() const { return m_fontColour; }
-
-    void SetShowHelp(bool flag) { m_showHelp = flag; }
-    bool GetShowHelp() const { return m_showHelp; }
-
-    void EnableEffects(bool flag) { m_enableEffects = flag; }
-    bool GetEnableEffects() const { return m_enableEffects; }
-
-    void SetInitialFont(const wxFont& font) { m_initialFont = font; }
-    wxFont GetInitialFont() const { return m_initialFont; }
-
-    void SetChosenFont(const wxFont& font) { m_chosenFont = font; }
-    wxFont GetChosenFont() const { return m_chosenFont; }
-
-    void SetRange(int minRange, int maxRange) { m_minSize = minRange; m_maxSize = maxRange; }
-
-    // encoding info is split into 2 parts: the logical wxWin encoding
-    // (wxFontEncoding) and a structure containing the native parameters for
-    // it (wxNativeEncodingInfo)
-    wxFontEncoding GetEncoding() const { return m_encoding; }
-    void SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; }
-
-    wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
-
-
-    // public for backwards compatibility only: don't use directly
-    wxColour        m_fontColour;
-    bool            m_showHelp;
-    bool            m_allowSymbols;
-    bool            m_enableEffects;
-    wxFont          m_initialFont;
-    wxFont          m_chosenFont;
-    int             m_minSize;
-    int             m_maxSize;
-
-private:
-    wxFontEncoding       m_encoding;
-    wxNativeEncodingInfo m_encodingInfo;
-
-    DECLARE_DYNAMIC_CLASS(wxFontData)
-};
-
-#endif // _WX_FONTDATA_H_
diff --git a/Source/3rd Party/wx/include/wx/fontdlg.h b/Source/3rd Party/wx/include/wx/fontdlg.h
index f05b97fe2..f93bba49e 100644
--- a/Source/3rd Party/wx/include/wx/fontdlg.h	
+++ b/Source/3rd Party/wx/include/wx/fontdlg.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.05.02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontdlg.h 41846 2006-10-09 22:56:48Z VZ $
 // Copyright:   (c) 1997-2002 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,13 +17,13 @@
 #if wxUSE_FONTDLG
 
 #include "wx/dialog.h"          // the base class
-#include "wx/fontdata.h"
+#include "wx/cmndata.h"         // wxFontData
 
 // ----------------------------------------------------------------------------
 // wxFontDialog interface
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog
+class WXDLLEXPORT wxFontDialogBase : public wxDialog
 {
 public:
     // create the font dialog
@@ -37,6 +37,8 @@ public:
     bool Create(wxWindow *parent, const wxFontData& data)
         { InitFontData(&data); return Create(parent); }
 
+    virtual ~wxFontDialogBase();
+
     // retrieve the font data
     const wxFontData& GetFontData() const { return m_fontData; }
     wxFontData& GetFontData() { return m_fontData; }
@@ -56,7 +58,7 @@ protected:
 
     wxFontData m_fontData;
 
-    wxDECLARE_NO_COPY_CLASS(wxFontDialogBase);
+    DECLARE_NO_COPY_CLASS(wxFontDialogBase)
 };
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -72,7 +74,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
-#if defined( __WXOSX_MAC__ )
+#if defined( __WXMAC_OSX__ ) && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
 //set to 1 to use native mac font and color dialogs
 #define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1
 #else
@@ -97,7 +99,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/fontdlg.h"
+    #include "wx/mac/fontdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -106,9 +108,9 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled
-WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL,
-                                          const wxFont& fontInit = wxNullFont,
-                                          const wxString& caption = wxEmptyString);
+wxFont WXDLLEXPORT
+wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
+                  const wxFont& fontInit = wxNullFont, const wxString& caption = wxEmptyString);
 
 #endif // wxUSE_FONTDLG
 
diff --git a/Source/3rd Party/wx/include/wx/fontenc.h b/Source/3rd Party/wx/include/wx/fontenc.h
index 76f47af15..b80acafff 100644
--- a/Source/3rd Party/wx/include/wx/fontenc.h	
+++ b/Source/3rd Party/wx/include/wx/fontenc.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.03.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontenc.h 29139 2004-09-14 12:08:28Z ABX $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ enum wxFontEncoding
     wxFONTENCODING_CP874,           // WinThai
     wxFONTENCODING_CP932,           // Japanese (shift-JIS)
     wxFONTENCODING_CP936,           // Chinese simplified (GB)
-    wxFONTENCODING_CP949,           // Korean (Hangul charset, a.k.a. EUC-KR)
+    wxFONTENCODING_CP949,           // Korean (Hangul charset)
     wxFONTENCODING_CP950,           // Chinese (traditional - Big5)
     wxFONTENCODING_CP1250,          // WinLatin2
     wxFONTENCODING_CP1251,          // WinCyrillic
@@ -65,8 +65,6 @@ enum wxFontEncoding
     wxFONTENCODING_CP1255,          // WinHebrew
     wxFONTENCODING_CP1256,          // WinArabic
     wxFONTENCODING_CP1257,          // WinBaltic (same as Latin 7)
-    wxFONTENCODING_CP1258,          // WinVietnamese
-    wxFONTENCODING_CP1361,          // Johab Korean character set.
     wxFONTENCODING_CP12_MAX,
 
     wxFONTENCODING_UTF7,            // UTF-7 Unicode encoding
@@ -118,10 +116,6 @@ enum wxFontEncoding
     wxFONTENCODING_MACGAELIC,
     wxFONTENCODING_MACKEYBOARD,
 
-    // more CJK encodings (for historical reasons some are already declared
-    // above)
-    wxFONTENCODING_ISO2022_JP,      // ISO-2022-JP JIS encoding
-
     wxFONTENCODING_MAX,             // highest enumerated encoding value
 
     wxFONTENCODING_MACMIN = wxFONTENCODING_MACROMAN ,
@@ -150,14 +144,7 @@ enum wxFontEncoding
     wxFONTENCODING_BIG5 = wxFONTENCODING_CP950,   // Traditional Chinese
 
         // Japanese (see http://zsigri.tripod.com/fontboard/cjk/jis.html)
-    wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932, // Shift JIS
-
-        // Korean (CP 949 not actually the same but close enough)
-    wxFONTENCODING_EUC_KR = wxFONTENCODING_CP949,
-    wxFONTENCODING_JOHAB = wxFONTENCODING_CP1361,
-
-        // Vietnamese
-    wxFONTENCODING_VIETNAMESE = wxFONTENCODING_CP1258
+    wxFONTENCODING_SHIFT_JIS = wxFONTENCODING_CP932 // Shift JIS
 };
 
 #endif // _WX_FONTENC_H_
diff --git a/Source/3rd Party/wx/include/wx/fontenum.h b/Source/3rd Party/wx/include/wx/fontenum.h
index 6faf25f16..8ea5a23c9 100644
--- a/Source/3rd Party/wx/include/wx/fontenum.h	
+++ b/Source/3rd Party/wx/include/wx/fontenum.h	
@@ -5,7 +5,7 @@
 // Modified by: extended to enumerate more than just font facenames and works
 //              not only on Windows now (VZ)
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontenum.h 43727 2006-12-01 10:14:28Z VS $
 // Copyright:   (c) Julian Smart, Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,19 +13,20 @@
 #ifndef _WX_FONTENUM_H_
 #define _WX_FONTENUM_H_
 
-#include "wx/defs.h"
-
-#if wxUSE_FONTENUM
-
 #include "wx/fontenc.h"
 #include "wx/arrstr.h"
 
+#if wxUSE_PANGO || defined(__WXDFB__)
+    // defined if the port uses only UTF-8 font encodings internally
+    #define wxHAS_UTF8_FONTS
+#endif
+
 // ----------------------------------------------------------------------------
 // wxFontEnumerator enumerates all available fonts on the system or only the
 // fonts with given attributes
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFontEnumerator
+class WXDLLEXPORT wxFontEnumerator
 {
 public:
     wxFontEnumerator() {}
@@ -81,9 +82,7 @@ private:
     bool EnumerateEncodingsUTF8(const wxString& facename);
 #endif
 
-    wxDECLARE_NO_COPY_CLASS(wxFontEnumerator);
+    DECLARE_NO_COPY_CLASS(wxFontEnumerator)
 };
 
-#endif // wxUSE_FONTENUM
-
 #endif // _WX_FONTENUM_H_
diff --git a/Source/3rd Party/wx/include/wx/fontmap.h b/Source/3rd Party/wx/include/wx/fontmap.h
index eaa5ebecd..c30511328 100644
--- a/Source/3rd Party/wx/include/wx/fontmap.h	
+++ b/Source/3rd Party/wx/include/wx/fontmap.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.11.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontmap.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@ class WXDLLIMPEXP_FWD_CORE wxFontMapper;
 class WXDLLIMPEXP_BASE wxFontMapperBase
 {
 public:
-    // constructor and such
+    // constructtor and such
     // ---------------------
 
     // default ctor
@@ -122,7 +122,7 @@ public:
     void SetConfigPath(const wxString& prefix);
 
     // return default config path
-    static const wxString& GetDefaultConfigPath();
+    static const wxChar *GetDefaultConfigPath();
 #endif // wxUSE_CONFIG
 
 
@@ -170,7 +170,7 @@ private:
 
     friend class wxFontMapperPathChanger;
 
-    wxDECLARE_NO_COPY_CLASS(wxFontMapperBase);
+    DECLARE_NO_COPY_CLASS(wxFontMapperBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -264,7 +264,7 @@ protected:
     wxWindow *m_windowParent;
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxFontMapper);
+    DECLARE_NO_COPY_CLASS(wxFontMapper)
 };
 
 #endif // wxUSE_GUI
diff --git a/Source/3rd Party/wx/include/wx/fontpicker.h b/Source/3rd Party/wx/include/wx/fontpicker.h
index 2a0c33b3f..d13d0b22f 100644
--- a/Source/3rd Party/wx/include/wx/fontpicker.h	
+++ b/Source/3rd Party/wx/include/wx/fontpicker.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontpicker.h 53135 2008-04-12 02:31:04Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -22,8 +22,8 @@
 
 class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent;
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFontPickerWidgetNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFontPickerCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerWidgetNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[];
 
 
 // ----------------------------------------------------------------------------
@@ -66,11 +66,8 @@ protected:
 // uses the currently selected font to draw the label of the button
 #define wxFNTP_USEFONT_FOR_LABEL      0x0010
 
-#define wxFONTBTN_DEFAULT_STYLE \
-    (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL)
-
-// native version currently only exists in wxGTK2
-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+// since GTK > 2.4, there is GtkFontButton
+#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/fontpicker.h"
     #define wxFontPickerWidget      wxFontButton
 #else
@@ -180,7 +177,9 @@ private:
 // wxFontPickerEvent: used by wxFontPickerCtrl only
 // ----------------------------------------------------------------------------
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_FONTPICKER_CHANGED, 1102)
+END_DECLARE_EVENT_TYPES()
 
 class WXDLLIMPEXP_CORE wxFontPickerEvent : public wxCommandEvent
 {
@@ -212,7 +211,7 @@ private:
 typedef void (wxEvtHandler::*wxFontPickerEventFunction)(wxFontPickerEvent&);
 
 #define wxFontPickerEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxFontPickerEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxFontPickerEventFunction, &func)
 
 #define EVT_FONTPICKER_CHANGED(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_FONTPICKER_CHANGED, id, wxFontPickerEventHandler(fn))
diff --git a/Source/3rd Party/wx/include/wx/fontutil.h b/Source/3rd Party/wx/include/wx/fontutil.h
index 0a4546a56..c0c46e458 100644
--- a/Source/3rd Party/wx/include/wx/fontutil.h	
+++ b/Source/3rd Party/wx/include/wx/fontutil.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.11.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontutil.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -65,8 +65,7 @@ enum wxXLFDField
 // functions, the user code can only get the objects of this type from
 // somewhere and pass it somewhere else (possibly save them somewhere using
 // ToString() and restore them using FromString())
-
-class WXDLLIMPEXP_CORE wxNativeFontInfo
+class WXDLLEXPORT wxNativeFontInfo
 {
 public:
 #if wxUSE_PANGO
@@ -106,76 +105,12 @@ public:
     // set the XFLD
     void SetXFontName(const wxString& xFontName);
 #elif defined(__WXMSW__)
-    wxNativeFontInfo(const LOGFONT& lf_) : lf(lf_) { }
-
     LOGFONT      lf;
 #elif defined(__WXPM__)
     // OS/2 native structures that define a font
     FATTRS       fa;
     FONTMETRICS  fm;
     FACENAMEDESC fn;
-#elif defined(__WXOSX__)
-public:
-    wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); }
-    wxNativeFontInfo( int size,
-                  wxFontFamily family,
-                  wxFontStyle style,
-                  wxFontWeight weight,
-                  bool underlined,
-                  const wxString& faceName,
-                  wxFontEncoding encoding)
-    { Init(size,family,style,weight,underlined,faceName,encoding); }
-
-    ~wxNativeFontInfo() { Free(); }
-
-    wxNativeFontInfo& operator=(const wxNativeFontInfo& info)
-    {
-        if (this != &info)
-        {
-            Free();
-            Init(info);
-        }
-        return *this;
-    }
-
-#if wxOSX_USE_CORE_TEXT
-    void Init(CTFontDescriptorRef descr);
-#endif
-    void Init(const wxNativeFontInfo& info);
-    void Init(int size,
-                  wxFontFamily family,
-                  wxFontStyle style,
-                  wxFontWeight weight,
-                  bool underlined,
-                  const wxString& faceName ,
-                  wxFontEncoding encoding);
-
-    void Free();
-    void EnsureValid();
-
-    bool m_descriptorValid;
-
-#if wxOSX_USE_ATSU_TEXT
-    bool            m_atsuFontValid;
-    // the atsu font ID
-    wxUint32        m_atsuFontID;
-    // the qd styles that are not intrinsic to the font above
-    wxInt16         m_atsuAdditionalQDStyles;
-#if wxOSX_USE_CARBON
-    wxInt16         m_qdFontFamily;
-    wxInt16         m_qdFontStyle;
-#endif
-#endif
-
-    int           m_pointSize;
-    wxFontFamily  m_family;
-    wxFontStyle   m_style;
-    wxFontWeight  m_weight;
-    bool          m_underlined;
-    bool          m_strikethrough;
-    wxString      m_faceName;
-    wxFontEncoding m_encoding;
-public :
 #else // other platforms
     //
     //  This is a generic implementation that should work on all ports
@@ -188,7 +123,6 @@ public :
     wxFontStyle   style;
     wxFontWeight  weight;
     bool          underlined;
-    bool          strikethrough;
     wxString      faceName;
     wxFontEncoding encoding;
 #endif // platforms
@@ -207,11 +141,8 @@ public:
 
     wxNativeFontInfo& operator=(const wxNativeFontInfo& info)
     {
-        if (this != &info)
-        {
-            Free();
-            Init(info);
-        }
+        Free();
+        Init(info);
         return *this;
     }
 #endif // wxUSE_PANGO
@@ -226,7 +157,6 @@ public:
         SetStyle((wxFontStyle)font.GetStyle());
         SetWeight((wxFontWeight)font.GetWeight());
         SetUnderlined(font.GetUnderlined());
-        SetStrikethrough(font.GetStrikethrough());
 #if defined(__WXMSW__)
         if ( font.IsUsingSizeInPixels() )
             SetPixelSize(font.GetPixelSize());
@@ -255,7 +185,6 @@ public:
     wxFontStyle GetStyle() const;
     wxFontWeight GetWeight() const;
     bool GetUnderlined() const;
-    bool GetStrikethrough() const;
     wxString GetFaceName() const;
     wxFontFamily GetFamily() const;
     wxFontEncoding GetEncoding() const;
@@ -265,7 +194,6 @@ public:
     void SetStyle(wxFontStyle style);
     void SetWeight(wxFontWeight weight);
     void SetUnderlined(bool underlined);
-    void SetStrikethrough(bool strikethrough);
     bool SetFaceName(const wxString& facename);
     void SetFamily(wxFontFamily family);
     void SetEncoding(wxFontEncoding encoding);
@@ -296,12 +224,12 @@ public:
 // translate a wxFontEncoding into native encoding parameter (defined above),
 // returning true if an (exact) macth could be found, false otherwise (without
 // attempting any substitutions)
-WXDLLIMPEXP_CORE bool wxGetNativeFontEncoding(wxFontEncoding encoding,
-                                              wxNativeEncodingInfo *info);
+extern bool wxGetNativeFontEncoding(wxFontEncoding encoding,
+                                    wxNativeEncodingInfo *info);
 
 // test for the existence of the font described by this facename/encoding,
 // return true if such font(s) exist, false otherwise
-WXDLLIMPEXP_CORE bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
+extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
 
 // ----------------------------------------------------------------------------
 // font-related functions (X and GTK)
diff --git a/Source/3rd Party/wx/include/wx/frame.h b/Source/3rd Party/wx/include/wx/frame.h
index b3b7d8290..a1a8036fc 100644
--- a/Source/3rd Party/wx/include/wx/frame.h	
+++ b/Source/3rd Party/wx/include/wx/frame.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     15.11.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: frame.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,15 +17,13 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/toplevel.h"      // the base class
-#include "wx/statusbr.h"
 
 // the default names for various classs
-extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-class WXDLLIMPEXP_FWD_CORE wxMenuItem;
 class WXDLLIMPEXP_FWD_CORE wxStatusBar;
 class WXDLLIMPEXP_FWD_CORE wxToolBar;
 
@@ -34,11 +32,10 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar;
 // ----------------------------------------------------------------------------
 
 // wxFrame-specific (i.e. not for wxDialog) styles
-//
-// Also see the bit summary table in wx/toplevel.h.
 #define wxFRAME_NO_TASKBAR      0x0002  // No taskbar button (MSW only)
 #define wxFRAME_TOOL_WINDOW     0x0004  // No taskbar button, no system menu
 #define wxFRAME_FLOAT_ON_PARENT 0x0008  // Always above its parent
+#define wxFRAME_SHAPED          0x0010  // Create a window that is able to be shaped
 
 // ----------------------------------------------------------------------------
 // wxFrame is a top-level window with optional menubar, statusbar and toolbar
@@ -52,7 +49,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar;
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow
+class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
 {
 public:
     // construction
@@ -74,6 +71,9 @@ public:
     // if the frame has a toolbar) in client coordinates
     virtual wxPoint GetClientAreaOrigin() const;
 
+    // sends a size event to the window using its current size -- this has an
+    // effect of refreshing the window layout
+    virtual void SendSizeEvent();
 
     // menu bar functions
     // ------------------
@@ -81,33 +81,20 @@ public:
 #if wxUSE_MENUS
     virtual void SetMenuBar(wxMenuBar *menubar);
     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
-
-    // find the item by id in the frame menu bar: this is an internal function
-    // and exists mainly in order to be overridden in the MDI parent frame
-    // which also looks at its active child menu bar
-    virtual wxMenuItem *FindItemInMenuBar(int menuId) const;
-
-    // generate menu command corresponding to the given menu item
-    //
-    // returns true if processed
-    bool ProcessCommand(wxMenuItem *item);
-
-    // generate menu command corresponding to the given menu command id
-    //
-    // returns true if processed
-    bool ProcessCommand(int winid);
-#else
-    bool ProcessCommand(int WXUNUSED(winid)) { return false; }
 #endif // wxUSE_MENUS
 
+    // process menu command: returns true if processed
+    bool ProcessCommand(int winid);
+
     // status bar functions
     // --------------------
 #if wxUSE_STATUSBAR
     // create the main status bar by calling OnCreateStatusBar()
     virtual wxStatusBar* CreateStatusBar(int number = 1,
-                                         long style = wxSTB_DEFAULT_STYLE,
+                                         long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE,
                                          wxWindowID winid = 0,
-                                         const wxString& name = wxStatusLineNameStr);
+                                         const wxString& name =
+                                            wxStatusLineNameStr);
     // return a new status bar
     virtual wxStatusBar *OnCreateStatusBar(int number,
                                            long style,
@@ -170,18 +157,23 @@ public:
     // Implement internal behaviour (menu updating on some platforms)
     virtual void OnInternalIdle();
 
+    // if there is no real wxTopLevelWindow on this platform we have to define
+    // some wxTopLevelWindowBase pure virtual functions here to avoid breaking
+    // old ports (wxMotif) which don't define them in wxFrame
+#ifndef wxTopLevelWindowNative
+    virtual bool ShowFullScreen(bool WXUNUSED(show),
+                                long WXUNUSED(style) = wxFULLSCREEN_ALL)
+        { return false; }
+    virtual bool IsFullScreen() const
+        { return false; }
+#endif // no wxTopLevelWindowNative
+
 #if wxUSE_MENUS || wxUSE_TOOLBAR
-    // show help text for the currently selected menu or toolbar item
-    // (typically in the status bar) or hide it and restore the status bar text
-    // originally shown before the menu was opened if show == false
+    // show help text (typically in the statusbar); show is false
+    // if you are hiding the help, true otherwise
     virtual void DoGiveHelp(const wxString& text, bool show);
 #endif
 
-    virtual bool IsClientAreaChild(const wxWindow *child) const
-    {
-        return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child);
-    }
-
 protected:
     // the frame main menu/status/tool bars
     // ------------------------------------
@@ -211,9 +203,6 @@ protected:
 #if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR)
     // the saved status bar text overwritten by DoGiveHelp()
     wxString m_oldStatusText;
-
-    // the last help string we have shown in the status bar
-    wxString m_lastHelpShown;
 #endif
 
 #if wxUSE_STATUSBAR
@@ -221,10 +210,9 @@ protected:
     // something changes
     virtual void PositionStatusBar() { }
 
-    // show the help string for the given menu item using DoGiveHelp() if the
-    // given item does have a help string (as determined by FindInMenuBar()),
-    // return false if there is no help for such item
-    bool ShowMenuHelp(int helpid);
+    // show the help string for this menu item in the given status bar: the
+    // status bar pointer can be NULL; return true if help was shown
+    bool ShowMenuHelp(wxStatusBar *statbar, int helpid);
 
     wxStatusBar *m_frameStatusBar;
 #endif // wxUSE_STATUSBAR
@@ -244,14 +232,16 @@ protected:
     DECLARE_EVENT_TABLE()
 #endif // wxUSE_MENUS && wxUSE_STATUSBAR
 
-    wxDECLARE_NO_COPY_CLASS(wxFrameBase);
+    DECLARE_NO_COPY_CLASS(wxFrameBase)
 };
 
 // include the real class declaration
 #if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
     #include "wx/univ/frame.h"
 #else // !__WXUNIVERSAL__
-    #if defined(__WXMSW__)
+    #if defined(__WXPALMOS__)
+        #include "wx/palmos/frame.h"
+    #elif defined(__WXMSW__)
         #include "wx/msw/frame.h"
     #elif defined(__WXGTK20__)
         #include "wx/gtk/frame.h"
@@ -260,7 +250,7 @@ protected:
     #elif defined(__WXMOTIF__)
         #include "wx/motif/frame.h"
     #elif defined(__WXMAC__)
-        #include "wx/osx/frame.h"
+        #include "wx/mac/frame.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/frame.h"
     #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/fs_arc.h b/Source/3rd Party/wx/include/wx/fs_arc.h
index 07ff65d30..02afd0746 100644
--- a/Source/3rd Party/wx/include/wx/fs_arc.h	
+++ b/Source/3rd Party/wx/include/wx/fs_arc.h	
@@ -3,7 +3,7 @@
 // Purpose:     Archive file system
 // Author:      Vaclav Slavik, Mike Wetherell
 // Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell
-// CVS-ID:      $Id$
+// CVS-ID:      $Id: fs_arc.h 42713 2006-10-30 11:56:12Z ABX $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -47,7 +47,7 @@ private:
 
     wxString DoFind();
 
-    wxDECLARE_NO_COPY_CLASS(wxArchiveFSHandler);
+    DECLARE_NO_COPY_CLASS(wxArchiveFSHandler)
     DECLARE_DYNAMIC_CLASS(wxArchiveFSHandler)
 };
 
diff --git a/Source/3rd Party/wx/include/wx/fs_filter.h b/Source/3rd Party/wx/include/wx/fs_filter.h
index b42c0d67b..1eb014510 100644
--- a/Source/3rd Party/wx/include/wx/fs_filter.h	
+++ b/Source/3rd Party/wx/include/wx/fs_filter.h	
@@ -3,7 +3,7 @@
 // Purpose:     Filter file system handler
 // Author:      Mike Wetherell
 // Copyright:   (c) 2006 Mike Wetherell
-// CVS-ID:      $Id$
+// CVS-ID:      $Id: fs_filter.h 42713 2006-10-30 11:56:12Z ABX $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -33,7 +33,7 @@ public:
     virtual wxString FindNext();
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxFilterFSHandler);
+    DECLARE_NO_COPY_CLASS(wxFilterFSHandler)
 };
 
 #endif // wxUSE_FILESYSTEM
diff --git a/Source/3rd Party/wx/include/wx/fs_mem.h b/Source/3rd Party/wx/include/wx/fs_mem.h
index facb6c5e0..e4d6737d7 100644
--- a/Source/3rd Party/wx/include/wx/fs_mem.h	
+++ b/Source/3rd Party/wx/include/wx/fs_mem.h	
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/fs_mem.h
+// Name:        fs_mem.h
 // Purpose:     in-memory file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 2000 Vaclav Slavik
@@ -15,13 +15,9 @@
 
 #include "wx/filesys.h"
 
-#include "wx/hashmap.h"
-
-class wxMemoryFSFile;
-WX_DECLARE_STRING_HASH_MAP(wxMemoryFSFile *, wxMemoryFSHash);
-
 #if wxUSE_GUI
-    #include "wx/bitmap.h"
+    class WXDLLIMPEXP_FWD_CORE wxBitmap;
+    class WXDLLIMPEXP_FWD_CORE wxImage;
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
@@ -39,12 +35,14 @@ public:
     // name "memory:" + filename
     static void AddFile(const wxString& filename, const wxString& textdata);
     static void AddFile(const wxString& filename, const void *binarydata, size_t size);
+#if wxABI_VERSION >= 20805
     static void AddFileWithMimeType(const wxString& filename,
                                     const wxString& textdata,
                                     const wxString& mimetype);
     static void AddFileWithMimeType(const wxString& filename,
                                     const void *binarydata, size_t size,
                                     const wxString& mimetype);
+#endif // wxABI_VERSION >= 20805
 
     // Remove file from memory FS and free occupied memory
     static void RemoveFile(const wxString& filename);
@@ -55,21 +53,8 @@ public:
     virtual wxString FindNext();
 
 protected:
-    // check that the given file is not already present in m_Hash; logs an
-    // error and returns false if it does exist
-    static bool CheckDoesntExist(const wxString& filename);
-
-    // the hash map indexed by the names of the files stored in the memory FS
-    static wxMemoryFSHash m_Hash;
-
-    // the file name currently being searched for, i.e. the argument of the
-    // last FindFirst() call or empty string if FindFirst() hasn't been called
-    // yet or FindNext() didn't find anything
-    wxString m_findArgument;
-
-    // iterator into m_Hash used by FindFirst/Next(), possibly m_Hash.end() or
-    // even invalid (can only be used when m_findArgument is not empty)
-    wxMemoryFSHash::const_iterator m_findIter;
+    static bool CheckHash(const wxString& filename);
+    static wxHashTable *m_Hash;
 };
 
 // ----------------------------------------------------------------------------
@@ -96,6 +81,7 @@ public:
     {
         wxMemoryFSHandlerBase::AddFile(filename, binarydata, size);
     }
+#if wxABI_VERSION >= 20805
     static void AddFileWithMimeType(const wxString& filename,
                                     const wxString& textdata,
                                     const wxString& mimetype)
@@ -112,15 +98,16 @@ public:
                                                    binarydata, size,
                                                    mimetype);
     }
+#endif // wxABI_VERSION >= 20805
 
 #if wxUSE_IMAGE
     static void AddFile(const wxString& filename,
                         const wxImage& image,
-                        wxBitmapType type);
+                        long type);
 
     static void AddFile(const wxString& filename,
                         const wxBitmap& bitmap,
-                        wxBitmapType type);
+                        long type);
 #endif // wxUSE_IMAGE
 
 };
diff --git a/Source/3rd Party/wx/include/wx/fswatcher.h b/Source/3rd Party/wx/include/wx/fswatcher.h
deleted file mode 100644
index 3a57caac9..000000000
--- a/Source/3rd Party/wx/include/wx/fswatcher.h	
+++ /dev/null
@@ -1,354 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/fswatcher.h
-// Purpose:     wxFileSystemWatcherBase
-// Author:      Bartosz Bekier
-// Created:     2009-05-23
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FSWATCHER_BASE_H_
-#define _WX_FSWATCHER_BASE_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_FSWATCHER
-
-#include "wx/log.h"
-#include "wx/event.h"
-#include "wx/evtloop.h"
-#include "wx/filename.h"
-#include "wx/dir.h"
-#include "wx/hashmap.h"
-
-#define wxTRACE_FSWATCHER "fswatcher"
-
-// ----------------------------------------------------------------------------
-// wxFileSystemWatcherEventType & wxFileSystemWatcherEvent
-// ----------------------------------------------------------------------------
-
-/**
- * Possible types of file system events.
- * This is a subset that will work fine an all platforms (actually, we will
- * see how it works on Mac).
- *
- * We got 2 types of error events:
- * - warning: these are not fatal and further events can still be generated
- * - error: indicates fatal error and causes that no more events will happen
- */
-enum
-{
-    wxFSW_EVENT_CREATE = 0x01,
-    wxFSW_EVENT_DELETE = 0x02,
-    wxFSW_EVENT_RENAME = 0x04,
-    wxFSW_EVENT_MODIFY = 0x08,
-    wxFSW_EVENT_ACCESS = 0x10,
-
-    // error events
-    wxFSW_EVENT_WARNING = 0x20,
-    wxFSW_EVENT_ERROR = 0x40,
-
-    wxFSW_EVENT_ALL = wxFSW_EVENT_CREATE | wxFSW_EVENT_DELETE |
-                         wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY |
-                         wxFSW_EVENT_ACCESS |
-                         wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR
-};
-
-// Type of the path watched, used only internally for now.
-enum wxFSWPathType
-{
-    wxFSWPath_None,     // Invalid value for an initialized watch.
-    wxFSWPath_File,     // Plain file.
-    wxFSWPath_Dir,      // Watch a directory and the files in it.
-    wxFSWPath_Tree      // Watch a directory and all its children recursively.
-};
-
-
-/**
- * Event containing information about file system change.
- */
-class WXDLLIMPEXP_FWD_BASE wxFileSystemWatcherEvent;
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_FSWATCHER,
-                         wxFileSystemWatcherEvent);
-
-class WXDLLIMPEXP_BASE wxFileSystemWatcherEvent: public wxEvent
-{
-public:
-    wxFileSystemWatcherEvent(int changeType, int watchid = wxID_ANY) :
-        wxEvent(watchid, wxEVT_FSWATCHER),
-        m_changeType(changeType)
-    {
-    }
-
-    wxFileSystemWatcherEvent(int changeType, const wxString& errorMsg,
-                             int watchid = wxID_ANY) :
-        wxEvent(watchid, wxEVT_FSWATCHER),
-        m_changeType(changeType), m_errorMsg(errorMsg)
-    {
-    }
-
-    wxFileSystemWatcherEvent(int changeType,
-                             const wxFileName& path, const wxFileName& newPath,
-                             int watchid = wxID_ANY) :
-         wxEvent(watchid, wxEVT_FSWATCHER),
-         m_changeType(changeType), m_path(path), m_newPath(newPath)
-    {
-    }
-
-    /**
-     * Returns the path at which the event occurred.
-     */
-    const wxFileName& GetPath() const
-    {
-        return m_path;
-    }
-
-    /**
-     * Sets the path at which the event occurred
-     */
-    void SetPath(const wxFileName& path)
-    {
-        m_path = path;
-    }
-
-    /**
-     * In case of rename(move?) events, returns the new path related to the
-     * event. The "new" means newer in the sense of time. In case of other
-     * events it returns the same path as GetPath().
-     */
-    const wxFileName& GetNewPath() const
-    {
-        return m_newPath;
-    }
-
-    /**
-     * Sets the new path related to the event. See above.
-     */
-    void SetNewPath(const wxFileName& path)
-    {
-        m_newPath = path;
-    }
-
-    /**
-     * Returns the type of file system event that occurred.
-     */
-    int GetChangeType() const
-    {
-        return m_changeType;
-    }
-
-    virtual wxEvent* Clone() const
-    {
-        wxFileSystemWatcherEvent* evt = new wxFileSystemWatcherEvent(*this);
-        evt->m_errorMsg = m_errorMsg.Clone();
-        evt->m_path = wxFileName(m_path.GetFullPath().Clone());
-        evt->m_newPath = wxFileName(m_newPath.GetFullPath().Clone());
-        return evt;
-    }
-
-    virtual wxEventCategory GetEventCategory() const
-    {
-        // TODO this has to be merged with "similiar" categories and changed
-        return wxEVT_CATEGORY_UNKNOWN;
-    }
-
-    /**
-     * Returns if this error is an error event
-     */
-    bool IsError() const
-    {
-        return (m_changeType & (wxFSW_EVENT_ERROR | wxFSW_EVENT_WARNING)) != 0;
-    }
-
-    wxString GetErrorDescription() const
-    {
-        return m_errorMsg;
-    }
-
-    /**
-     * Returns a wxString describing an event useful for debugging or testing
-     */
-    wxString ToString() const;
-
-protected:
-    int m_changeType;
-    wxFileName m_path;
-    wxFileName m_newPath;
-    wxString m_errorMsg;
-};
-
-typedef void (wxEvtHandler::*wxFileSystemWatcherEventFunction)
-                                                (wxFileSystemWatcherEvent&);
-
-#define wxFileSystemWatcherEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxFileSystemWatcherEventFunction, func)
-
-#define EVT_FSWATCHER(winid, func) \
-    wx__DECLARE_EVT1(wxEVT_FSWATCHER, winid, wxFileSystemWatcherEventHandler(func))
-
-// ----------------------------------------------------------------------------
-// wxFileSystemWatcherBase: interface for wxFileSystemWatcher
-// ----------------------------------------------------------------------------
-
-// Simple container to store information about one watched path.
-class wxFSWatchInfo
-{
-public:
-    wxFSWatchInfo() :
-        m_events(-1), m_type(wxFSWPath_None)
-    {
-    }
-
-    wxFSWatchInfo(const wxString& path, int events, wxFSWPathType type) :
-        m_path(path), m_events(events), m_type(type)
-    {
-    }
-
-    const wxString& GetPath() const
-    {
-        return m_path;
-    }
-
-    int GetFlags() const
-    {
-        return m_events;
-    }
-
-    wxFSWPathType GetType() const
-    {
-        return m_type;
-    }
-
-protected:
-    wxString m_path;
-    int m_events;
-    wxFSWPathType m_type;
-};
-
-WX_DECLARE_STRING_HASH_MAP(wxFSWatchInfo, wxFSWatchInfoMap);
-
-/**
- * Encapsulation of platform-specific file system event mechanism
- */
-class wxFSWatcherImpl;
-
-/**
- * Main entry point for clients interested in file system events.
- * Defines interface that can be used to receive that kind of events.
- */
-class WXDLLIMPEXP_BASE wxFileSystemWatcherBase: public wxEvtHandler
-{
-public:
-    wxFileSystemWatcherBase();
-
-    virtual ~wxFileSystemWatcherBase();
-
-    /**
-     * Adds path to currently watched files. Any events concerning this
-     * particular path will be sent to handler. Optionally a filter can be
-     * specified to receive only events of particular type.
-     *
-     * Please note that when adding a dir, immediate children will be watched
-     * as well.
-     */
-    virtual bool Add(const wxFileName& path, int events = wxFSW_EVENT_ALL);
-
-    /**
-     * Like above, but recursively adds every file/dir in the tree rooted in
-     * path. Additionally a file mask can be specified to include only files
-     * of particular type.
-     */
-    virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL,
-                         const wxString& filter = wxEmptyString);
-
-    /**
-     * Removes path from the list of watched paths.
-     */
-    virtual bool Remove(const wxFileName& path);
-
-    /**
-     * Same as above, but also removes every file belonging to the tree rooted
-     * at path.
-     */
-    virtual bool RemoveTree(const wxFileName& path);
-
-    /**
-     * Clears the list of currently watched paths.
-     */
-    virtual bool RemoveAll();
-
-    /**
-     * Returns the number of watched paths
-     */
-    int GetWatchedPathsCount() const;
-
-    /**
-     * Retrevies all watched paths and places them in wxArrayString. Returns
-     * the number of paths.
-     *
-     * TODO think about API here: we need to return more information (like is
-     * the path watched recursively)
-     */
-    int GetWatchedPaths(wxArrayString* paths) const;
-
-    wxEvtHandler* GetOwner() const
-    {
-        return m_owner;
-    }
-
-    void SetOwner(wxEvtHandler* handler)
-    {
-        if (!handler)
-            m_owner = this;
-        else
-            m_owner = handler;
-    }
-
-protected:
-
-    static wxString GetCanonicalPath(const wxFileName& path)
-    {
-        wxFileName path_copy = wxFileName(path);
-        if ( !path_copy.Normalize() )
-        {
-            wxFAIL_MSG(wxString::Format("Unable to normalize path '%s'",
-                                         path.GetFullPath()));
-            return wxEmptyString;
-        }
-
-        return path_copy.GetFullPath();
-    }
-
-    // Delegates the real work of adding the path to wxFSWatcherImpl::Add() and
-    // updates m_watches if the new path was successfully added.
-    bool DoAdd(const wxFileName& path, int events, wxFSWPathType type);
-
-
-    wxFSWatchInfoMap m_watches;        // path=>wxFSWatchInfo map
-    wxFSWatcherImpl* m_service;     // file system events service
-    wxEvtHandler* m_owner;             // handler for file system events
-
-    friend class wxFSWatcherImpl;
-};
-
-// include the platform specific file defining wxFileSystemWatcher
-// inheriting from wxFileSystemWatcherBase
-
-#ifdef wxHAS_INOTIFY
-    #include "wx/unix/fswatcher_inotify.h"
-    #define wxFileSystemWatcher wxInotifyFileSystemWatcher
-#elif defined(wxHAS_KQUEUE)
-    #include "wx/unix/fswatcher_kqueue.h"
-    #define wxFileSystemWatcher wxKqueueFileSystemWatcher
-#elif defined(__WINDOWS__)
-    #include "wx/msw/fswatcher.h"
-    #define wxFileSystemWatcher wxMSWFileSystemWatcher
-#else
-    #include "wx/generic/fswatcher.h"
-    #define wxFileSystemWatcher wxPollingFileSystemWatcher
-#endif
-
-#endif // wxUSE_FSWATCHER
-
-#endif /* _WX_FSWATCHER_BASE_H_ */
diff --git a/Source/3rd Party/wx/include/wx/gauge.h b/Source/3rd Party/wx/include/wx/gauge.h
index 21acb77fc..a6246ca42 100644
--- a/Source/3rd Party/wx/include/wx/gauge.h	
+++ b/Source/3rd Party/wx/include/wx/gauge.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.02.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: gauge.h 41089 2006-09-09 13:36:54Z RR $
 // Copyright:   (c) 1996-2001 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -41,13 +41,13 @@
     #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0
 #endif
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGaugeBase : public wxControl
+class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:
     wxGaugeBase() { m_rangeMax = m_gaugePos = 0; }
@@ -84,12 +84,10 @@ public:
     virtual void SetBezelFace(int w);
     virtual int GetBezelFace() const;
 
-    // overridden base class virtuals
+    // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
 
 protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
     // the max position
     int m_rangeMax;
 
@@ -100,13 +98,14 @@ protected:
     int m_nDirection;       // can be wxRIGHT or wxLEFT
 #endif
 
-    wxDECLARE_NO_COPY_CLASS(wxGaugeBase);
+    DECLARE_NO_COPY_CLASS(wxGaugeBase)
 };
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/gauge.h"
 #elif defined(__WXMSW__)
-    #include "wx/msw/gauge.h"
+    #include "wx/msw/gauge95.h"
+    #define wxGauge wxGauge95
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"
 #elif defined(__WXGTK20__)
@@ -114,7 +113,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/gauge.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/gauge.h"
+    #include "wx/mac/gauge.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/gauge.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/gbsizer.h b/Source/3rd Party/wx/include/wx/gbsizer.h
index d9fc7e33d..dd2f31bec 100644
--- a/Source/3rd Party/wx/include/wx/gbsizer.h	
+++ b/Source/3rd Party/wx/include/wx/gbsizer.h	
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/gbsizer.h
+// Name:        gbsizer.h
 // Purpose:     wxGridBagSizer:  A sizer that can lay out items in a grid,
 //              with items at specified cells, and with the option of row
 //              and/or column spanning
 //
 // Author:      Robin Dunn
 // Created:     03-Nov-2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: gbsizer.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Robin Dunn
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,7 +28,7 @@
 // is used for this and also for wxGridCellCoords.
 //---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGBPosition
+class WXDLLEXPORT wxGBPosition
 {
 public:
     wxGBPosition() : m_row(0), m_col(0) {}
@@ -50,55 +50,29 @@ private:
 };
 
 
-class WXDLLIMPEXP_CORE wxGBSpan
+class WXDLLEXPORT wxGBSpan
 {
 public:
-    wxGBSpan() { Init(); }
-    wxGBSpan(int rowspan, int colspan)
-    {
-        // Initialize the members to valid values as not doing it may result in
-        // infinite loop in wxGBSizer code if the user passed 0 for any of
-        // them, see #12934.
-        Init();
-
-        SetRowspan(rowspan);
-        SetColspan(colspan);
-    }
+    wxGBSpan() : m_rowspan(1), m_colspan(1) {}
+    wxGBSpan(int rowspan, int colspan) : m_rowspan(rowspan), m_colspan(colspan) {}
 
     // default copy ctor and assignment operator are okay.
 
     int GetRowspan() const { return m_rowspan; }
     int GetColspan() const { return m_colspan; }
-    void SetRowspan(int rowspan)
-    {
-        wxCHECK_RET( rowspan > 0, "Row span should be strictly positive" );
-
-        m_rowspan = rowspan;
-    }
-
-    void SetColspan(int colspan)
-    {
-        wxCHECK_RET( colspan > 0, "Column span should be strictly positive" );
-
-        m_colspan = colspan;
-    }
+    void SetRowspan(int rowspan) { m_rowspan = rowspan; }
+    void SetColspan(int colspan) { m_colspan = colspan; }
 
     bool operator==(const wxGBSpan& o) const { return m_rowspan == o.m_rowspan && m_colspan == o.m_colspan; }
     bool operator!=(const wxGBSpan& o) const { return !(*this == o); }
 
 private:
-    void Init()
-    {
-        m_rowspan =
-        m_colspan = 1;
-    }
-
     int m_rowspan;
     int m_colspan;
 };
 
 
-extern WXDLLIMPEXP_DATA_CORE(const wxGBSpan) wxDefaultSpan;
+extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan;
 
 
 //---------------------------------------------------------------------------
@@ -108,33 +82,33 @@ extern WXDLLIMPEXP_DATA_CORE(const wxGBSpan) wxDefaultSpan;
 class WXDLLIMPEXP_FWD_CORE wxGridBagSizer;
 
 
-class WXDLLIMPEXP_CORE wxGBSizerItem : public wxSizerItem
+class WXDLLEXPORT wxGBSizerItem : public wxSizerItem
 {
 public:
     // spacer
     wxGBSizerItem( int width,
                    int height,
                    const wxGBPosition& pos,
-                   const wxGBSpan& span=wxDefaultSpan,
-                   int flag=0,
-                   int border=0,
-                   wxObject* userData=NULL);
+                   const wxGBSpan& span,
+                   int flag,
+                   int border,
+                   wxObject* userData);
 
     // window
     wxGBSizerItem( wxWindow *window,
                    const wxGBPosition& pos,
-                   const wxGBSpan& span=wxDefaultSpan,
-                   int flag=0,
-                   int border=0,
-                   wxObject* userData=NULL );
+                   const wxGBSpan& span,
+                   int flag,
+                   int border,
+                   wxObject* userData );
 
     // subsizer
     wxGBSizerItem( wxSizer *sizer,
                    const wxGBPosition& pos,
-                   const wxGBSpan& span=wxDefaultSpan,
-                   int flag=0,
-                   int border=0,
-                   wxObject* userData=NULL );
+                   const wxGBSpan& span,
+                   int flag,
+                   int border,
+                   wxObject* userData );
 
     // default ctor
     wxGBSizerItem();
@@ -160,7 +134,7 @@ public:
     // is successful and after the next Layout the item will be resized.
     bool SetSpan( const wxGBSpan& span );
 
-    // Returns true if this item and the other item intersect
+    // Returns true if this item and the other item instersect
     bool Intersects(const wxGBSizerItem& other);
 
     // Returns true if the given pos/span would intersect with this item.
@@ -182,7 +156,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGBSizerItem)
-    wxDECLARE_NO_COPY_CLASS(wxGBSizerItem);
+    DECLARE_NO_COPY_CLASS(wxGBSizerItem)
 };
 
 
@@ -191,7 +165,7 @@ private:
 //---------------------------------------------------------------------------
 
 
-class WXDLLIMPEXP_CORE wxGridBagSizer : public wxFlexGridSizer
+class WXDLLEXPORT wxGridBagSizer : public wxFlexGridSizer
 {
 public:
     wxGridBagSizer(int vgap = 0, int hgap = 0 );
@@ -312,7 +286,9 @@ public:
 
 protected:
     wxGBPosition FindEmptyCell();
+#if wxABI_VERSION >= 20808
     void AdjustForOverflow();
+#endif
 
     wxSize m_emptyCellSize;
 
@@ -320,7 +296,7 @@ protected:
 private:
 
     DECLARE_CLASS(wxGridBagSizer)
-    wxDECLARE_NO_COPY_CLASS(wxGridBagSizer);
+    DECLARE_NO_COPY_CLASS(wxGridBagSizer)
 };
 
 //---------------------------------------------------------------------------
diff --git a/Source/3rd Party/wx/include/wx/gdicmn.h b/Source/3rd Party/wx/include/wx/gdicmn.h
index 61e80d7fe..2b9e71b05 100644
--- a/Source/3rd Party/wx/include/wx/gdicmn.h	
+++ b/Source/3rd Party/wx/include/wx/gdicmn.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: gdicmn.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,8 +37,6 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
 class WXDLLIMPEXP_FWD_CORE wxPen;
 class WXDLLIMPEXP_FWD_CORE wxRegion;
 class WXDLLIMPEXP_FWD_BASE wxString;
-class WXDLLIMPEXP_FWD_CORE wxIconBundle;
-class WXDLLIMPEXP_FWD_CORE wxPoint;
 
 // ---------------------------------------------------------------------------
 // constants
@@ -59,10 +57,8 @@ enum wxBitmapType
     wxBITMAP_TYPE_XBM_DATA,
     wxBITMAP_TYPE_XPM,
     wxBITMAP_TYPE_XPM_DATA,
-    wxBITMAP_TYPE_TIFF,
-    wxBITMAP_TYPE_TIF = wxBITMAP_TYPE_TIFF,
-    wxBITMAP_TYPE_TIFF_RESOURCE,
-    wxBITMAP_TYPE_TIF_RESOURCE = wxBITMAP_TYPE_TIFF_RESOURCE,
+    wxBITMAP_TYPE_TIF,
+    wxBITMAP_TYPE_TIF_RESOURCE,
     wxBITMAP_TYPE_GIF,
     wxBITMAP_TYPE_GIF_RESOURCE,
     wxBITMAP_TYPE_PNG,
@@ -82,18 +78,9 @@ enum wxBitmapType
     wxBITMAP_TYPE_TGA,
     wxBITMAP_TYPE_MACCURSOR,
     wxBITMAP_TYPE_MACCURSOR_RESOURCE,
-
-    wxBITMAP_TYPE_MAX,
     wxBITMAP_TYPE_ANY = 50
 };
 
-//  Polygon filling mode
-enum wxPolygonFillMode
-{
-    wxODDEVEN_RULE = 1,
-    wxWINDING_RULE
-};
-
 // Standard cursors
 enum wxStockCursor
 {
@@ -137,58 +124,48 @@ enum wxStockCursor
     wxCURSOR_BASED_ARROW_UP,
     wxCURSOR_BASED_ARROW_DOWN,
 #endif // X11
+
     wxCURSOR_ARROWWAIT,
-#ifdef __WXMAC__
-    wxCURSOR_OPEN_HAND,
-    wxCURSOR_CLOSED_HAND,
-#endif
 
     wxCURSOR_MAX
 };
 
 #ifndef __WXGTK__
-    #define wxCURSOR_DEFAULT        wxCURSOR_ARROW
-#endif
-
-#ifndef __WXMAC__
-    // TODO CS supply openhand and closedhand cursors
-    #define wxCURSOR_OPEN_HAND      wxCURSOR_HAND
-    #define wxCURSOR_CLOSED_HAND    wxCURSOR_HAND
+    #define wxCURSOR_DEFAULT wxCURSOR_ARROW
 #endif
 
 // ---------------------------------------------------------------------------
 // macros
 // ---------------------------------------------------------------------------
 
-#if defined(__WINDOWS__) || defined(__WXPM__)
-    #define wxHAS_IMAGES_IN_RESOURCES
-#endif
-
 /* Useful macro for creating icons portably, for example:
 
-    wxIcon *icon = new wxICON(sample);
+    wxIcon *icon = new wxICON(mondrian);
 
   expands into:
 
-    wxIcon *icon = new wxIcon("sample");      // On Windows
-    wxIcon *icon = new wxIcon(sample_xpm);    // On wxGTK/Linux
+    wxIcon *icon = new wxIcon("mondrian");      // On wxMSW
+    wxIcon *icon = new wxIcon(mondrian_xpm);    // On wxGTK
  */
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
     // Load from a resource
     #define wxICON(X) wxIcon(wxT(#X))
 #elif defined(__WXPM__)
     // Load from a resource
     #define wxICON(X) wxIcon(wxT(#X))
+#elif defined(__WXMGL__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )
 #elif defined(__WXDFB__)
     // Initialize from an included XPM
-    #define wxICON(X) wxIcon( X##_xpm )
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )
 #elif defined(__WXGTK__)
     // Initialize from an included XPM
-    #define wxICON(X) wxIcon( X##_xpm )
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )
 #elif defined(__WXMAC__)
     // Initialize from an included XPM
-    #define wxICON(X) wxIcon( X##_xpm )
+    #define wxICON(X) wxIcon( (const char**) X##_xpm )
 #elif defined(__WXMOTIF__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )
@@ -204,16 +181,17 @@ enum wxStockCursor
    under Unix bitmaps live in XPMs and under Windows they're in ressources.
  */
 
-#if defined(__WINDOWS__) || defined(__WXPM__)
-    #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE)
+#if defined(__WXMSW__) || defined(__WXPM__)
+    #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_RESOURCE)
 #elif defined(__WXGTK__)   || \
       defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
       defined(__WXMAC__)   || \
+      defined(__WXMGL__)   || \
       defined(__WXDFB__)   || \
       defined(__WXCOCOA__)
     // Initialize from an included XPM
-    #define wxBITMAP(name) wxBitmap(name##_xpm)
+    #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
 #else // other platforms
     #define wxBITMAP(name) wxBitmap(name##_xpm, wxBITMAP_TYPE_XPM)
 #endif // platform
@@ -226,7 +204,7 @@ enum wxStockCursor
 // wxSize
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSize
+class WXDLLEXPORT wxSize
 {
 public:
     // members are public for compatibility, don't use them directly.
@@ -238,18 +216,18 @@ public:
 
     // no copy ctor or assignment operator - the defaults are ok
 
+    bool operator==(const wxSize& sz) const { return x == sz.x && y == sz.y; }
+    bool operator!=(const wxSize& sz) const { return x != sz.x || y != sz.y; }
+
+    wxSize operator+(const wxSize& sz) const { return wxSize(x + sz.x, y + sz.y); }
+    wxSize operator-(const wxSize& sz) const { return wxSize(x - sz.x, y - sz.y); }
+    wxSize operator/(int i) const { return wxSize(x / i, y / i); }
+    wxSize operator*(int i) const { return wxSize(x * i, y * i); }
+
     wxSize& operator+=(const wxSize& sz) { x += sz.x; y += sz.y; return *this; }
     wxSize& operator-=(const wxSize& sz) { x -= sz.x; y -= sz.y; return *this; }
-    wxSize& operator/=(int i) { x /= i; y /= i; return *this; }
-    wxSize& operator*=(int i) { x *= i; y *= i; return *this; }
-    wxSize& operator/=(unsigned int i) { x /= i; y /= i; return *this; }
-    wxSize& operator*=(unsigned int i) { x *= i; y *= i; return *this; }
-    wxSize& operator/=(long i) { x /= i; y /= i; return *this; }
-    wxSize& operator*=(long i) { x *= i; y *= i; return *this; }
-    wxSize& operator/=(unsigned long i) { x /= i; y /= i; return *this; }
-    wxSize& operator*=(unsigned long i) { x *= i; y *= i; return *this; }
-    wxSize& operator/=(double i) { x = int(x/i); y = int(y/i); return *this; }
-    wxSize& operator*=(double i) { x = int(x*i); y = int(y*i); return *this; }
+    wxSize& operator/=(const int i) { x /= i; y /= i; return *this; }
+    wxSize& operator*=(const int i) { x *= i; y *= i; return *this; }
 
     void IncTo(const wxSize& sz)
         { if ( sz.x > x ) x = sz.x; if ( sz.y > y ) y = sz.y; }
@@ -257,12 +235,10 @@ public:
         { if ( sz.x < x ) x = sz.x; if ( sz.y < y ) y = sz.y; }
 
     void IncBy(int dx, int dy) { x += dx; y += dy; }
-    void IncBy(const wxPoint& pt);
     void IncBy(const wxSize& sz) { IncBy(sz.x, sz.y); }
     void IncBy(int d) { IncBy(d, d); }
 
     void DecBy(int dx, int dy) { IncBy(-dx, -dy); }
-    void DecBy(const wxPoint& pt);
     void DecBy(const wxSize& sz) { DecBy(sz.x, sz.y); }
     void DecBy(int d) { DecBy(d, d); }
 
@@ -295,103 +271,11 @@ public:
     int GetY() const { return y; }
 };
 
-inline bool operator==(const wxSize& s1, const wxSize& s2)
-{
-    return s1.x == s2.x && s1.y == s2.y;
-}
-
-inline bool operator!=(const wxSize& s1, const wxSize& s2)
-{
-    return s1.x != s2.x || s1.y != s2.y;
-}
-
-inline wxSize operator+(const wxSize& s1, const wxSize& s2)
-{
-    return wxSize(s1.x + s2.x, s1.y + s2.y);
-}
-
-inline wxSize operator-(const wxSize& s1, const wxSize& s2)
-{
-    return wxSize(s1.x - s2.x, s1.y - s2.y);
-}
-
-inline wxSize operator/(const wxSize& s, int i)
-{
-    return wxSize(s.x / i, s.y / i);
-}
-
-inline wxSize operator*(const wxSize& s, int i)
-{
-    return wxSize(s.x * i, s.y * i);
-}
-
-inline wxSize operator*(int i, const wxSize& s)
-{
-    return wxSize(s.x * i, s.y * i);
-}
-
-inline wxSize operator/(const wxSize& s, unsigned int i)
-{
-    return wxSize(s.x / i, s.y / i);
-}
-
-inline wxSize operator*(const wxSize& s, unsigned int i)
-{
-    return wxSize(s.x * i, s.y * i);
-}
-
-inline wxSize operator*(unsigned int i, const wxSize& s)
-{
-    return wxSize(s.x * i, s.y * i);
-}
-
-inline wxSize operator/(const wxSize& s, long i)
-{
-    return wxSize(s.x / i, s.y / i);
-}
-
-inline wxSize operator*(const wxSize& s, long i)
-{
-    return wxSize(s.x * i, s.y * i);
-}
-
-inline wxSize operator*(long i, const wxSize& s)
-{
-    return wxSize(s.x * i, s.y * i);
-}
-
-inline wxSize operator/(const wxSize& s, unsigned long i)
-{
-    return wxSize(s.x / i, s.y / i);
-}
-
-inline wxSize operator*(const wxSize& s, unsigned long i)
-{
-    return wxSize(s.x * i, s.y * i);
-}
-
-inline wxSize operator*(unsigned long i, const wxSize& s)
-{
-    return wxSize(s.x * i, s.y * i);
-}
-
-inline wxSize operator*(const wxSize& s, double i)
-{
-    return wxSize(int(s.x * i), int(s.y * i));
-}
-
-inline wxSize operator*(double i, const wxSize& s)
-{
-    return wxSize(int(s.x * i), int(s.y * i));
-}
-
-
-
 // ---------------------------------------------------------------------------
 // Point classes: with real or integer coordinates
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxRealPoint
+class WXDLLEXPORT wxRealPoint
 {
 public:
     double x;
@@ -399,273 +283,53 @@ public:
 
     wxRealPoint() : x(0.0), y(0.0) { }
     wxRealPoint(double xx, double yy) : x(xx), y(yy) { }
-    wxRealPoint(const wxPoint& pt);
 
-    // no copy ctor or assignment operator - the defaults are ok
+    wxRealPoint operator+(const wxRealPoint& pt) const { return wxRealPoint(x + pt.x, y + pt.y); }
+    wxRealPoint operator-(const wxRealPoint& pt) const { return wxRealPoint(x - pt.x, y - pt.y); }
 
-    //assignment operators
-    wxRealPoint& operator+=(const wxRealPoint& p) { x += p.x; y += p.y; return *this; }
-    wxRealPoint& operator-=(const wxRealPoint& p) { x -= p.x; y -= p.y; return *this; }
-
-    wxRealPoint& operator+=(const wxSize& s) { x += s.GetWidth(); y += s.GetHeight(); return *this; }
-    wxRealPoint& operator-=(const wxSize& s) { x -= s.GetWidth(); y -= s.GetHeight(); return *this; }
+    bool operator==(const wxRealPoint& pt) const
+    {
+        return wxIsSameDouble(x, pt.x) && wxIsSameDouble(y, pt.y);
+    }
+    bool operator!=(const wxRealPoint& pt) const { return !(*this == pt); }
 };
 
 
-inline bool operator==(const wxRealPoint& p1, const wxRealPoint& p2)
-{
-    return wxIsSameDouble(p1.x, p2.x) && wxIsSameDouble(p1.y, p2.y);
-}
-
-inline bool operator!=(const wxRealPoint& p1, const wxRealPoint& p2)
-{
-    return !(p1 == p2);
-}
-
-inline wxRealPoint operator+(const wxRealPoint& p1, const wxRealPoint& p2)
-{
-    return wxRealPoint(p1.x + p2.x, p1.y + p2.y);
-}
-
-
-inline wxRealPoint operator-(const wxRealPoint& p1, const wxRealPoint& p2)
-{
-    return wxRealPoint(p1.x - p2.x, p1.y - p2.y);
-}
-
-
-inline wxRealPoint operator/(const wxRealPoint& s, int i)
-{
-    return wxRealPoint(s.x / i, s.y / i);
-}
-
-inline wxRealPoint operator*(const wxRealPoint& s, int i)
-{
-    return wxRealPoint(s.x * i, s.y * i);
-}
-
-inline wxRealPoint operator*(int i, const wxRealPoint& s)
-{
-    return wxRealPoint(s.x * i, s.y * i);
-}
-
-inline wxRealPoint operator/(const wxRealPoint& s, unsigned int i)
-{
-    return wxRealPoint(s.x / i, s.y / i);
-}
-
-inline wxRealPoint operator*(const wxRealPoint& s, unsigned int i)
-{
-    return wxRealPoint(s.x * i, s.y * i);
-}
-
-inline wxRealPoint operator*(unsigned int i, const wxRealPoint& s)
-{
-    return wxRealPoint(s.x * i, s.y * i);
-}
-
-inline wxRealPoint operator/(const wxRealPoint& s, long i)
-{
-    return wxRealPoint(s.x / i, s.y / i);
-}
-
-inline wxRealPoint operator*(const wxRealPoint& s, long i)
-{
-    return wxRealPoint(s.x * i, s.y * i);
-}
-
-inline wxRealPoint operator*(long i, const wxRealPoint& s)
-{
-    return wxRealPoint(s.x * i, s.y * i);
-}
-
-inline wxRealPoint operator/(const wxRealPoint& s, unsigned long i)
-{
-    return wxRealPoint(s.x / i, s.y / i);
-}
-
-inline wxRealPoint operator*(const wxRealPoint& s, unsigned long i)
-{
-    return wxRealPoint(s.x * i, s.y * i);
-}
-
-inline wxRealPoint operator*(unsigned long i, const wxRealPoint& s)
-{
-    return wxRealPoint(s.x * i, s.y * i);
-}
-
-inline wxRealPoint operator*(const wxRealPoint& s, double i)
-{
-    return wxRealPoint(int(s.x * i), int(s.y * i));
-}
-
-inline wxRealPoint operator*(double i, const wxRealPoint& s)
-{
-    return wxRealPoint(int(s.x * i), int(s.y * i));
-}
-
-
-// ----------------------------------------------------------------------------
-// wxPoint: 2D point with integer coordinates
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPoint
+class WXDLLEXPORT wxPoint
 {
 public:
     int x, y;
 
     wxPoint() : x(0), y(0) { }
     wxPoint(int xx, int yy) : x(xx), y(yy) { }
-    wxPoint(const wxRealPoint& pt) : x(int(pt.x)), y(int(pt.y)) { }
 
     // no copy ctor or assignment operator - the defaults are ok
 
-    //assignment operators
+    // comparison
+    bool operator==(const wxPoint& p) const { return x == p.x && y == p.y; }
+    bool operator!=(const wxPoint& p) const { return !(*this == p); }
+
+    // arithmetic operations (component wise)
+    wxPoint operator+(const wxPoint& p) const { return wxPoint(x + p.x, y + p.y); }
+    wxPoint operator-(const wxPoint& p) const { return wxPoint(x - p.x, y - p.y); }
+
     wxPoint& operator+=(const wxPoint& p) { x += p.x; y += p.y; return *this; }
     wxPoint& operator-=(const wxPoint& p) { x -= p.x; y -= p.y; return *this; }
 
     wxPoint& operator+=(const wxSize& s) { x += s.GetWidth(); y += s.GetHeight(); return *this; }
     wxPoint& operator-=(const wxSize& s) { x -= s.GetWidth(); y -= s.GetHeight(); return *this; }
 
-    // check if both components are set/initialized
-    bool IsFullySpecified() const { return x != wxDefaultCoord && y != wxDefaultCoord; }
+    wxPoint operator+(const wxSize& s) const { return wxPoint(x + s.GetWidth(), y + s.GetHeight()); }
+    wxPoint operator-(const wxSize& s) const { return wxPoint(x - s.GetWidth(), y - s.GetHeight()); }
 
-    // fill in the unset components with the values from the other point
-    void SetDefaults(const wxPoint& pt)
-    {
-        if ( x == wxDefaultCoord )
-            x = pt.x;
-        if ( y == wxDefaultCoord )
-            y = pt.y;
-    }
+    wxPoint operator-() const { return wxPoint(-x, -y); }
 };
 
-
-// comparison
-inline bool operator==(const wxPoint& p1, const wxPoint& p2)
-{
-    return p1.x == p2.x && p1.y == p2.y;
-}
-
-inline bool operator!=(const wxPoint& p1, const wxPoint& p2)
-{
-    return !(p1 == p2);
-}
-
-
-// arithmetic operations (component wise)
-inline wxPoint operator+(const wxPoint& p1, const wxPoint& p2)
-{
-    return wxPoint(p1.x + p2.x, p1.y + p2.y);
-}
-
-inline wxPoint operator-(const wxPoint& p1, const wxPoint& p2)
-{
-    return wxPoint(p1.x - p2.x, p1.y - p2.y);
-}
-
-inline wxPoint operator+(const wxPoint& p, const wxSize& s)
-{
-    return wxPoint(p.x + s.x, p.y + s.y);
-}
-
-inline wxPoint operator-(const wxPoint& p, const wxSize& s)
-{
-    return wxPoint(p.x - s.x, p.y - s.y);
-}
-
-inline wxPoint operator+(const wxSize& s, const wxPoint& p)
-{
-    return wxPoint(p.x + s.x, p.y + s.y);
-}
-
-inline wxPoint operator-(const wxSize& s, const wxPoint& p)
-{
-    return wxPoint(s.x - p.x, s.y - p.y);
-}
-
-inline wxPoint operator-(const wxPoint& p)
-{
-    return wxPoint(-p.x, -p.y);
-}
-
-inline wxPoint operator/(const wxPoint& s, int i)
-{
-    return wxPoint(s.x / i, s.y / i);
-}
-
-inline wxPoint operator*(const wxPoint& s, int i)
-{
-    return wxPoint(s.x * i, s.y * i);
-}
-
-inline wxPoint operator*(int i, const wxPoint& s)
-{
-    return wxPoint(s.x * i, s.y * i);
-}
-
-inline wxPoint operator/(const wxPoint& s, unsigned int i)
-{
-    return wxPoint(s.x / i, s.y / i);
-}
-
-inline wxPoint operator*(const wxPoint& s, unsigned int i)
-{
-    return wxPoint(s.x * i, s.y * i);
-}
-
-inline wxPoint operator*(unsigned int i, const wxPoint& s)
-{
-    return wxPoint(s.x * i, s.y * i);
-}
-
-inline wxPoint operator/(const wxPoint& s, long i)
-{
-    return wxPoint(s.x / i, s.y / i);
-}
-
-inline wxPoint operator*(const wxPoint& s, long i)
-{
-    return wxPoint(s.x * i, s.y * i);
-}
-
-inline wxPoint operator*(long i, const wxPoint& s)
-{
-    return wxPoint(s.x * i, s.y * i);
-}
-
-inline wxPoint operator/(const wxPoint& s, unsigned long i)
-{
-    return wxPoint(s.x / i, s.y / i);
-}
-
-inline wxPoint operator*(const wxPoint& s, unsigned long i)
-{
-    return wxPoint(s.x * i, s.y * i);
-}
-
-inline wxPoint operator*(unsigned long i, const wxPoint& s)
-{
-    return wxPoint(s.x * i, s.y * i);
-}
-
-inline wxPoint operator*(const wxPoint& s, double i)
-{
-    return wxPoint(int(s.x * i), int(s.y * i));
-}
-
-inline wxPoint operator*(double i, const wxPoint& s)
-{
-    return wxPoint(int(s.x * i), int(s.y * i));
-}
-
-WX_DECLARE_LIST_WITH_DECL(wxPoint, wxPointList, class WXDLLIMPEXP_CORE);
-
 // ---------------------------------------------------------------------------
 // wxRect
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxRect
+class WXDLLEXPORT wxRect
 {
 public:
     wxRect()
@@ -727,7 +391,7 @@ public:
     wxPoint GetTopRight() const { return wxPoint(GetRight(), GetTop()); }
     wxPoint GetRightTop() const { return GetTopRight(); }
     void SetTopRight(const wxPoint &p) { SetRight(p.x); SetTop(p.y); }
-    void SetRightTop(const wxPoint &p) { SetTopRight(p); }
+    void SetRightTop(const wxPoint &p) { SetTopLeft(p); }
 
     wxPoint GetBottomLeft() const { return wxPoint(GetLeft(), GetBottom()); }
     wxPoint GetLeftBottom() const { return GetBottomLeft(); }
@@ -774,10 +438,14 @@ public:
         return r;
     }
 
+    // compare rectangles
+    bool operator==(const wxRect& rect) const;
+    bool operator!=(const wxRect& rect) const { return !(*this == rect); }
+
     // return true if the point is (not strcitly) inside the rect
     bool Contains(int x, int y) const;
     bool Contains(const wxPoint& pt) const { return Contains(pt.x, pt.y); }
-    // return true if the rectangle 'rect' is (not strictly) inside this rect
+    // return true if the rectangle is (not strcitly) inside the rect
     bool Contains(const wxRect& rect) const;
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -790,11 +458,15 @@ public:
     // return true if the rectangles have a non empty intersection
     bool Intersects(const wxRect& rect) const;
 
-    // like Union() but don't ignore empty rectangles
-    wxRect& operator+=(const wxRect& rect);
 
-    // intersections of two rectrangles not testing for empty rectangles
-    wxRect& operator*=(const wxRect& rect);
+    // these are like Union() but don't ignore empty rectangles
+    wxRect operator+(const wxRect& rect) const;
+    wxRect& operator+=(const wxRect& rect)
+    {
+        *this = *this + rect;
+        return *this;
+    }
+
 
     // centre this rectangle in the given (usually, but not necessarily,
     // larger) one
@@ -814,28 +486,6 @@ public:
     int x, y, width, height;
 };
 
-
-// compare rectangles
-inline bool operator==(const wxRect& r1, const wxRect& r2)
-{
-    return (r1.x == r2.x) && (r1.y == r2.y) &&
-           (r1.width == r2.width) && (r1.height == r2.height);
-}
-
-inline bool operator!=(const wxRect& r1, const wxRect& r2)
-{
-    return !(r1 == r2);
-}
-
-// like Union() but don't treat empty rectangles specially
-WXDLLIMPEXP_CORE wxRect operator+(const wxRect& r1, const wxRect& r2);
-
-// intersections of two rectangles
-WXDLLIMPEXP_CORE wxRect operator*(const wxRect& r1, const wxRect& r2);
-
-
-
-
 #if WXWIN_COMPATIBILITY_2_6
 inline bool wxRect::Inside(int cx, int cy) const { return Contains(cx, cy); }
 inline bool wxRect::Inside(const wxPoint& pt) const { return Contains(pt); }
@@ -843,11 +493,6 @@ inline bool wxRect::Inside(const wxRect& rect) const { return Contains(rect); }
 #endif // WXWIN_COMPATIBILITY_2_6
 
 
-// define functions which couldn't be defined above because of declarations
-// order
-inline void wxSize::IncBy(const wxPoint& pt) { IncBy(pt.x, pt.y); }
-inline void wxSize::DecBy(const wxPoint& pt) { DecBy(pt.x, pt.y); }
-
 // ---------------------------------------------------------------------------
 // Management of pens, brushes and fonts
 // ---------------------------------------------------------------------------
@@ -863,9 +508,42 @@ protected:
     wxList list;
 };
 
+class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase
+{
+public:
+    wxPen *FindOrCreatePen(const wxColour& colour, int width, int style);
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( void AddPen(wxPen*) );
+    wxDEPRECATED( void RemovePen(wxPen*) );
+#endif
+};
+
+class WXDLLIMPEXP_CORE wxBrushList: public wxGDIObjListBase
+{
+public:
+    wxBrush *FindOrCreateBrush(const wxColour& colour, int style = wxSOLID);
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( void AddBrush(wxBrush*) );
+    wxDEPRECATED( void RemoveBrush(wxBrush*) );
+#endif
+};
+
+class WXDLLIMPEXP_CORE wxFontList: public wxGDIObjListBase
+{
+public:
+    wxFont *FindOrCreateFont(int pointSize, int family, int style, int weight,
+                             bool underline = false,
+                             const wxString& face = wxEmptyString,
+                             wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( void AddFont(wxFont*) );
+    wxDEPRECATED( void RemoveFont(wxFont*) );
+#endif
+};
+
 WX_DECLARE_STRING_HASH_MAP(wxColour*, wxStringToColourHashMap);
 
-class WXDLLIMPEXP_CORE wxColourDatabase
+class WXDLLEXPORT wxColourDatabase
 {
 public:
     wxColourDatabase();
@@ -898,11 +576,11 @@ private:
     wxStringToColourHashMap *m_map;
 };
 
-class WXDLLIMPEXP_CORE wxResourceCache: public wxList
+class WXDLLEXPORT wxResourceCache: public wxList
 {
 public:
     wxResourceCache() { }
-#if !wxUSE_STD_CONTAINERS
+#if !wxUSE_STL
     wxResourceCache(const unsigned int keyType) : wxList(keyType) { }
 #endif
     virtual ~wxResourceCache();
@@ -912,6 +590,10 @@ public:
 // global variables
 // ---------------------------------------------------------------------------
 
+// Lists of GDI objects
+extern WXDLLEXPORT_DATA(wxPenList*)   wxThePenList;
+extern WXDLLEXPORT_DATA(wxBrushList*)   wxTheBrushList;
+extern WXDLLEXPORT_DATA(wxFontList*)    wxTheFontList;
 
 /* Stock objects
 
@@ -931,7 +613,6 @@ public:
         BRUSH_BLUE,
         BRUSH_CYAN,
         BRUSH_GREEN,
-        BRUSH_YELLOW,
         BRUSH_GREY,
         BRUSH_LIGHTGREY,
         BRUSH_MEDIUMGREY,
@@ -942,7 +623,6 @@ public:
         COLOUR_BLUE,
         COLOUR_CYAN,
         COLOUR_GREEN,
-        COLOUR_YELLOW,
         COLOUR_LIGHTGREY,
         COLOUR_RED,
         COLOUR_WHITE,
@@ -955,10 +635,8 @@ public:
         FONT_SWISS,
         PEN_BLACK,
         PEN_BLACKDASHED,
-        PEN_BLUE,
         PEN_CYAN,
         PEN_GREEN,
-        PEN_YELLOW,
         PEN_GREY,
         PEN_LIGHTGREY,
         PEN_MEDIUMGREY,
@@ -986,7 +664,7 @@ protected:
 
     static wxObject* ms_stockObject[ITEMCOUNT];
 
-    wxDECLARE_NO_COPY_CLASS(wxStockGDI);
+    DECLARE_NO_COPY_CLASS(wxStockGDI)
 };
 
 #define wxITALIC_FONT  wxStockGDI::instance().GetFont(wxStockGDI::FONT_ITALIC)
@@ -996,10 +674,8 @@ protected:
 
 #define wxBLACK_DASHED_PEN  wxStockGDI::GetPen(wxStockGDI::PEN_BLACKDASHED)
 #define wxBLACK_PEN         wxStockGDI::GetPen(wxStockGDI::PEN_BLACK)
-#define wxBLUE_PEN          wxStockGDI::GetPen(wxStockGDI::PEN_BLUE)
 #define wxCYAN_PEN          wxStockGDI::GetPen(wxStockGDI::PEN_CYAN)
 #define wxGREEN_PEN         wxStockGDI::GetPen(wxStockGDI::PEN_GREEN)
-#define wxYELLOW_PEN        wxStockGDI::GetPen(wxStockGDI::PEN_YELLOW)
 #define wxGREY_PEN          wxStockGDI::GetPen(wxStockGDI::PEN_GREY)
 #define wxLIGHT_GREY_PEN    wxStockGDI::GetPen(wxStockGDI::PEN_LIGHTGREY)
 #define wxMEDIUM_GREY_PEN   wxStockGDI::GetPen(wxStockGDI::PEN_MEDIUMGREY)
@@ -1011,7 +687,6 @@ protected:
 #define wxBLUE_BRUSH         wxStockGDI::GetBrush(wxStockGDI::BRUSH_BLUE)
 #define wxCYAN_BRUSH         wxStockGDI::GetBrush(wxStockGDI::BRUSH_CYAN)
 #define wxGREEN_BRUSH        wxStockGDI::GetBrush(wxStockGDI::BRUSH_GREEN)
-#define wxYELLOW_BRUSH       wxStockGDI::GetBrush(wxStockGDI::BRUSH_YELLOW)
 #define wxGREY_BRUSH         wxStockGDI::GetBrush(wxStockGDI::BRUSH_GREY)
 #define wxLIGHT_GREY_BRUSH   wxStockGDI::GetBrush(wxStockGDI::BRUSH_LIGHTGREY)
 #define wxMEDIUM_GREY_BRUSH  wxStockGDI::GetBrush(wxStockGDI::BRUSH_MEDIUMGREY)
@@ -1023,7 +698,6 @@ protected:
 #define wxBLUE        wxStockGDI::GetColour(wxStockGDI::COLOUR_BLUE)
 #define wxCYAN        wxStockGDI::GetColour(wxStockGDI::COLOUR_CYAN)
 #define wxGREEN       wxStockGDI::GetColour(wxStockGDI::COLOUR_GREEN)
-#define wxYELLOW      wxStockGDI::GetColour(wxStockGDI::COLOUR_YELLOW)
 #define wxLIGHT_GREY  wxStockGDI::GetColour(wxStockGDI::COLOUR_LIGHTGREY)
 #define wxRED         wxStockGDI::GetColour(wxStockGDI::COLOUR_RED)
 #define wxWHITE       wxStockGDI::GetColour(wxStockGDI::COLOUR_WHITE)
@@ -1033,51 +707,49 @@ protected:
 #define wxSTANDARD_CURSOR   wxStockGDI::GetCursor(wxStockGDI::CURSOR_STANDARD)
 
 // 'Null' objects
-extern WXDLLIMPEXP_DATA_CORE(wxBitmap)     wxNullBitmap;
-extern WXDLLIMPEXP_DATA_CORE(wxIcon)       wxNullIcon;
-extern WXDLLIMPEXP_DATA_CORE(wxCursor)     wxNullCursor;
-extern WXDLLIMPEXP_DATA_CORE(wxPen)        wxNullPen;
-extern WXDLLIMPEXP_DATA_CORE(wxBrush)      wxNullBrush;
-extern WXDLLIMPEXP_DATA_CORE(wxPalette)    wxNullPalette;
-extern WXDLLIMPEXP_DATA_CORE(wxFont)       wxNullFont;
-extern WXDLLIMPEXP_DATA_CORE(wxColour)     wxNullColour;
-extern WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle;
+extern WXDLLEXPORT_DATA(wxBitmap)     wxNullBitmap;
+extern WXDLLEXPORT_DATA(wxIcon)       wxNullIcon;
+extern WXDLLEXPORT_DATA(wxCursor)     wxNullCursor;
+extern WXDLLEXPORT_DATA(wxPen)        wxNullPen;
+extern WXDLLEXPORT_DATA(wxBrush)      wxNullBrush;
+extern WXDLLEXPORT_DATA(wxPalette)     wxNullPalette;
+extern WXDLLEXPORT_DATA(wxFont)       wxNullFont;
+extern WXDLLEXPORT_DATA(wxColour)     wxNullColour;
 
-extern WXDLLIMPEXP_DATA_CORE(wxColourDatabase*)  wxTheColourDatabase;
+extern WXDLLEXPORT_DATA(wxColourDatabase*)  wxTheColourDatabase;
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
 
-extern WXDLLIMPEXP_DATA_CORE(const wxSize) wxDefaultSize;
-extern WXDLLIMPEXP_DATA_CORE(const wxPoint) wxDefaultPosition;
+extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
+extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
 
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
 
 // resource management
-extern void WXDLLIMPEXP_CORE wxInitializeStockLists();
-extern void WXDLLIMPEXP_CORE wxDeleteStockLists();
+extern void WXDLLEXPORT wxInitializeStockLists();
+extern void WXDLLEXPORT wxDeleteStockLists();
 
 // is the display colour (or monochrome)?
-extern bool WXDLLIMPEXP_CORE wxColourDisplay();
+extern bool WXDLLEXPORT wxColourDisplay();
 
 // Returns depth of screen
-extern int WXDLLIMPEXP_CORE wxDisplayDepth();
+extern int WXDLLEXPORT wxDisplayDepth();
 #define wxGetDisplayDepth wxDisplayDepth
 
 // get the display size
-extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height);
-extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize();
-extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height);
-extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM();
-extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI();
+extern void WXDLLEXPORT wxDisplaySize(int *width, int *height);
+extern wxSize WXDLLEXPORT wxGetDisplaySize();
+extern void WXDLLEXPORT wxDisplaySizeMM(int *width, int *height);
+extern wxSize WXDLLEXPORT wxGetDisplaySizeMM();
 
 // Get position and size of the display workarea
-extern void WXDLLIMPEXP_CORE wxClientDisplayRect(int *x, int *y, int *width, int *height);
-extern wxRect WXDLLIMPEXP_CORE wxGetClientDisplayRect();
+extern void WXDLLEXPORT wxClientDisplayRect(int *x, int *y, int *width, int *height);
+extern wxRect WXDLLEXPORT wxGetClientDisplayRect();
 
 // set global cursor
-extern void WXDLLIMPEXP_CORE wxSetCursor(const wxCursor& cursor);
+extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
 
 #endif
     // _WX_GDICMNH__
diff --git a/Source/3rd Party/wx/include/wx/gdiobj.h b/Source/3rd Party/wx/include/wx/gdiobj.h
index 19334d485..b4dab2774 100644
--- a/Source/3rd Party/wx/include/wx/gdiobj.h	
+++ b/Source/3rd Party/wx/include/wx/gdiobj.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: gdiobj.h 42211 2006-10-21 17:19:11Z SN $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -20,44 +20,18 @@
 // the same native GDI object
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGDIRefData : public wxObjectRefData
-{
-public:
-    // Default ctor which needs to be defined just because we use
-    // wxDECLARE_NO_COPY_CLASS() below.
-    wxGDIRefData() { }
-
-    // override this in the derived classes to check if this data object is
-    // really fully initialized
-    virtual bool IsOk() const { return true; }
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxGDIRefData);
-};
+class WXDLLIMPEXP_CORE wxGDIRefData: public wxObjectRefData { };
 
 // ----------------------------------------------------------------------------
-// wxGDIObject: base class for bitmaps, pens, brushes, ...
+// wxGDIObject
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGDIObject : public wxObject
+class WXDLLIMPEXP_CORE wxGDIObject: public wxObject
 {
 public:
-    // checks if the object can be used
-    virtual bool IsOk() const
-    {
-        // the cast here is safe because the derived classes always create
-        // wxGDIRefData objects
-        return m_refData && static_cast<wxGDIRefData *>(m_refData)->IsOk();
-    }
-
-    // don't use in the new code, use IsOk() instead
     bool IsNull() const { return m_refData == NULL; }
 
-    // older version, for backwards compatibility only (but not deprecated
-    // because it's still widely used)
-    bool Ok() const { return IsOk(); }
-
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXPALMOS__)
     // Creates the resource
     virtual bool RealizeResource() { return false; }
 
@@ -70,24 +44,8 @@ public:
     virtual WXHANDLE GetResourceHandle() const { return 0; }
 #endif // defined(__WXMSW__) || defined(__WXPM__)
 
-protected:
-    // replace base class functions using wxObjectRefData with our own which
-    // use wxGDIRefData to ensure that we always work with data objects of the
-    // correct type (i.e. derived from wxGDIRefData)
-    virtual wxObjectRefData *CreateRefData() const
-    {
-        return CreateGDIRefData();
-    }
-
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const
-    {
-        return CloneGDIRefData(static_cast<const wxGDIRefData *>(data));
-    }
-
-    virtual wxGDIRefData *CreateGDIRefData() const = 0;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const = 0;
-
     DECLARE_DYNAMIC_CLASS(wxGDIObject)
 };
 
-#endif // _WX_GDIOBJ_H_BASE_
+#endif
+    // _WX_GDIOBJ_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/generic/busyinfo.h b/Source/3rd Party/wx/include/wx/generic/busyinfo.h
index 42bfd2d25..b8fdd4866 100644
--- a/Source/3rd Party/wx/include/wx/generic/busyinfo.h	
+++ b/Source/3rd Party/wx/include/wx/generic/busyinfo.h	
@@ -3,19 +3,17 @@
 // Purpose:     Information window (when app is busy)
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: busyinfo.h 49804 2007-11-10 01:09:42Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_BUSYINFO_H_
-#define _WX_BUSYINFO_H_
+#ifndef __BUSYINFO_H__
+#define __BUSYINFO_H__
 
 #include "wx/defs.h"
 
 #if wxUSE_BUSYINFO
 
-#include "wx/object.h"
-
 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 
@@ -25,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
 //                  Can be used in exactly same way as wxBusyCursor
 //--------------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBusyInfo : public wxObject
+class WXDLLEXPORT wxBusyInfo : public wxObject
 {
 public:
     wxBusyInfo(const wxString& message, wxWindow *parent = NULL);
@@ -35,8 +33,10 @@ public:
 private:
     wxFrame *m_InfoFrame;
 
-    wxDECLARE_NO_COPY_CLASS(wxBusyInfo);
+    DECLARE_NO_COPY_CLASS(wxBusyInfo)
 };
 
+
 #endif // wxUSE_BUSYINFO
-#endif // _WX_BUSYINFO_H_
+
+#endif // __BUSYINFO_H__
diff --git a/Source/3rd Party/wx/include/wx/generic/choicdgg.h b/Source/3rd Party/wx/include/wx/generic/choicdgg.h
index 2d8876a99..ebefcd81b 100644
--- a/Source/3rd Party/wx/include/wx/generic/choicdgg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/choicdgg.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: choicdgg.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -36,7 +36,7 @@ class WXDLLIMPEXP_FWD_CORE wxListBoxBase;
 // wxAnyChoiceDialog: a base class for dialogs containing a listbox
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxAnyChoiceDialog : public wxDialog
+class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog
 {
 public:
     wxAnyChoiceDialog() { }
@@ -86,14 +86,14 @@ protected:
                                       const wxString *choices,
                                       long styleLbox);
 
-    wxDECLARE_NO_COPY_CLASS(wxAnyChoiceDialog);
+    DECLARE_NO_COPY_CLASS(wxAnyChoiceDialog)
 };
 
 // ----------------------------------------------------------------------------
 // wxSingleChoiceDialog: a dialog with single selection listbox
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSingleChoiceDialog : public wxAnyChoiceDialog
+class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog
 {
 public:
     wxSingleChoiceDialog()
@@ -106,112 +106,39 @@ public:
                          const wxString& caption,
                          int n,
                          const wxString *choices,
-                         void **clientData = NULL,
+                         char **clientData = (char **)NULL,
                          long style = wxCHOICEDLG_STYLE,
-                         const wxPoint& pos = wxDefaultPosition)
-    {
-        Create(parent, message, caption, n, choices, clientData, style, pos);
-    }
-
+                         const wxPoint& pos = wxDefaultPosition);
     wxSingleChoiceDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& caption,
                          const wxArrayString& choices,
-                         void **clientData = NULL,
+                         char **clientData = (char **)NULL,
                          long style = wxCHOICEDLG_STYLE,
-                         const wxPoint& pos = wxDefaultPosition)
-    {
-        Create(parent, message, caption, choices, clientData, style, pos);
-    }
+                         const wxPoint& pos = wxDefaultPosition);
 
     bool Create(wxWindow *parent,
                 const wxString& message,
                 const wxString& caption,
                 int n,
                 const wxString *choices,
-                void **clientData = NULL,
+                char **clientData = (char **)NULL,
                 long style = wxCHOICEDLG_STYLE,
                 const wxPoint& pos = wxDefaultPosition);
     bool Create(wxWindow *parent,
                 const wxString& message,
                 const wxString& caption,
                 const wxArrayString& choices,
-                void **clientData = NULL,
+                char **clientData = (char **)NULL,
                 long style = wxCHOICEDLG_STYLE,
                 const wxPoint& pos = wxDefaultPosition);
 
     void SetSelection(int sel);
     int GetSelection() const { return m_selection; }
     wxString GetStringSelection() const { return m_stringSelection; }
-    void* GetSelectionData() const { return m_clientData; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    // Deprecated overloads taking "char**" client data.
-    wxDEPRECATED_CONSTRUCTOR
-    (
-        wxSingleChoiceDialog(wxWindow *parent,
-                             const wxString& message,
-                             const wxString& caption,
-                             int n,
-                             const wxString *choices,
-                             char **clientData,
-                             long style = wxCHOICEDLG_STYLE,
-                             const wxPoint& pos = wxDefaultPosition)
-    )
-    {
-        Create(parent, message, caption, n, choices,
-               (void**)clientData, style, pos);
-    }
-
-    wxDEPRECATED_CONSTRUCTOR
-    (
-        wxSingleChoiceDialog(wxWindow *parent,
-                             const wxString& message,
-                             const wxString& caption,
-                             const wxArrayString& choices,
-                             char **clientData,
-                             long style = wxCHOICEDLG_STYLE,
-                             const wxPoint& pos = wxDefaultPosition)
-    )
-    {
-        Create(parent, message, caption, choices,
-               (void**)clientData, style, pos);
-    }
-
-    wxDEPRECATED_INLINE
-    (
-        bool Create(wxWindow *parent,
-                    const wxString& message,
-                    const wxString& caption,
-                    int n,
-                    const wxString *choices,
-                    char **clientData,
-                    long style = wxCHOICEDLG_STYLE,
-                    const wxPoint& pos = wxDefaultPosition),
-        return Create(parent, message, caption, n, choices,
-                      (void**)clientData, style, pos);
-    )
-
-    wxDEPRECATED_INLINE
-    (
-        bool Create(wxWindow *parent,
-                    const wxString& message,
-                    const wxString& caption,
-                    const wxArrayString& choices,
-                    char **clientData,
-                    long style = wxCHOICEDLG_STYLE,
-                    const wxPoint& pos = wxDefaultPosition),
-        return Create(parent, message, caption, choices,
-                      (void**)clientData, style, pos);
-    )
-
-    // NB: no need to make it return wxChar, it's untyped
-    wxDEPRECATED_ACCESSOR
-    (
-        char* GetSelectionClientData() const,
-        (char*)GetSelectionData()
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
+    // obsolete function (NB: no need to make it return wxChar, it's untyped)
+    char *GetSelectionClientData() const { return (char *)m_clientData; }
 
     // implementation from now on
     void OnOK(wxCommandEvent& event);
@@ -237,7 +164,7 @@ private:
 // wxMultiChoiceDialog: a dialog with multi selection listbox
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMultiChoiceDialog : public wxAnyChoiceDialog
+class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog
 {
 public:
     wxMultiChoiceDialog() { }
@@ -300,7 +227,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // get the user selection as a string
-WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message,
+WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,
                                        const wxArrayString& choices,
                                        wxWindow *parent = NULL,
@@ -308,10 +235,9 @@ WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message,
                                        int y = wxDefaultCoord,
                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
-                                       int height = wxCHOICE_HEIGHT,
-                                       int initialSelection = 0);
+                                       int height = wxCHOICE_HEIGHT);
 
-WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message,
+WXDLLEXPORT wxString wxGetSingleChoice(const wxString& message,
                                        const wxString& caption,
                                        int n, const wxString *choices,
                                        wxWindow *parent = NULL,
@@ -319,24 +245,11 @@ WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message,
                                        int y = wxDefaultCoord,
                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
-                                       int height = wxCHOICE_HEIGHT,
-                                       int initialSelection = 0);
-
-WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message,
-                                            const wxString& caption,
-                                            const wxArrayString& choices,
-                                            int initialSelection,
-                                            wxWindow *parent = NULL);
-
-WXDLLIMPEXP_CORE wxString wxGetSingleChoice(const wxString& message,
-                                            const wxString& caption,
-                                            int n, const wxString *choices,
-                                            int initialSelection,
-                                            wxWindow *parent = NULL);
+                                       int height = wxCHOICE_HEIGHT);
 
 // Same as above but gets position in list of strings, instead of string,
 // or -1 if no selection
-WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message,
+WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
                                        const wxString& caption,
                                        const wxArrayString& choices,
                                        wxWindow *parent = NULL,
@@ -344,10 +257,9 @@ WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message,
                                        int y = wxDefaultCoord,
                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
-                                       int height = wxCHOICE_HEIGHT,
-                                       int initialSelection = 0);
+                                       int height = wxCHOICE_HEIGHT);
 
-WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message,
+WXDLLEXPORT int wxGetSingleChoiceIndex(const wxString& message,
                                        const wxString& caption,
                                        int n, const wxString *choices,
                                        wxWindow *parent = NULL,
@@ -355,23 +267,10 @@ WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message,
                                        int y = wxDefaultCoord,
                                        bool centre = true,
                                        int width = wxCHOICE_WIDTH,
-                                       int height = wxCHOICE_HEIGHT,
-                                       int initialSelection = 0);
+                                       int height = wxCHOICE_HEIGHT);
 
-WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message,
-                                            const wxString& caption,
-                                            const wxArrayString& choices,
-                                            int initialSelection,
-                                            wxWindow *parent = NULL);
-
-WXDLLIMPEXP_CORE int wxGetSingleChoiceIndex(const wxString& message,
-                                            const wxString& caption,
-                                            int n, const wxString *choices,
-                                            int initialSelection,
-                                            wxWindow *parent = NULL);
-
-// Return client data instead or NULL if canceled
-WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message,
+// Return client data instead or NULL if cancelled
+WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
                                         const wxString& caption,
                                         const wxArrayString& choices,
                                         void **client_data,
@@ -380,10 +279,9 @@ WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message,
                                         int y = wxDefaultCoord,
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
-                                        int height = wxCHOICE_HEIGHT,
-                                        int initialSelection = 0);
+                                        int height = wxCHOICE_HEIGHT);
 
-WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message,
+WXDLLEXPORT void* wxGetSingleChoiceData(const wxString& message,
                                         const wxString& caption,
                                         int n, const wxString *choices,
                                         void **client_data,
@@ -392,54 +290,12 @@ WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message,
                                         int y = wxDefaultCoord,
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
-                                        int height = wxCHOICE_HEIGHT,
-                                        int initialSelection = 0);
-
-WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message,
-                                             const wxString& caption,
-                                             const wxArrayString& choices,
-                                             void **client_data,
-                                             int initialSelection,
-                                             wxWindow *parent = NULL);
-
-
-WXDLLIMPEXP_CORE void* wxGetSingleChoiceData(const wxString& message,
-                                             const wxString& caption,
-                                             int n, const wxString *choices,
-                                             void **client_data,
-                                             int initialSelection,
-                                             wxWindow *parent = NULL);
-
-// fill the array with the indices of the chosen items, it will be empty
-// if no items were selected or Cancel was pressed - return the number of
-// selections or -1 if cancelled
-WXDLLIMPEXP_CORE int wxGetSelectedChoices(wxArrayInt& selections,
-                                        const wxString& message,
-                                        const wxString& caption,
-                                        int n, const wxString *choices,
-                                        wxWindow *parent = NULL,
-                                        int x = wxDefaultCoord,
-                                        int y = wxDefaultCoord,
-                                        bool centre = true,
-                                        int width = wxCHOICE_WIDTH,
                                         int height = wxCHOICE_HEIGHT);
 
-WXDLLIMPEXP_CORE int wxGetSelectedChoices(wxArrayInt& selections,
-                                        const wxString& message,
-                                        const wxString& caption,
-                                        const wxArrayString& choices,
-                                        wxWindow *parent = NULL,
-                                        int x = wxDefaultCoord,
-                                        int y = wxDefaultCoord,
-                                        bool centre = true,
-                                        int width = wxCHOICE_WIDTH,
-                                        int height = wxCHOICE_HEIGHT);
-
-#if WXWIN_COMPATIBILITY_2_8
 // fill the array with the indices of the chosen items, it will be empty
 // if no items were selected or Cancel was pressed - return the number of
 // selections
-wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections,
+WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
                                         const wxString& message,
                                         const wxString& caption,
                                         int n, const wxString *choices,
@@ -448,9 +304,9 @@ wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selection
                                         int y = wxDefaultCoord,
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
-                                        int height = wxCHOICE_HEIGHT) );
+                                        int height = wxCHOICE_HEIGHT);
 
-wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selections,
+WXDLLEXPORT size_t wxGetMultipleChoices(wxArrayInt& selections,
                                         const wxString& message,
                                         const wxString& caption,
                                         const wxArrayString& choices,
@@ -459,7 +315,6 @@ wxDEPRECATED( WXDLLIMPEXP_CORE size_t wxGetMultipleChoices(wxArrayInt& selection
                                         int y = wxDefaultCoord,
                                         bool centre = true,
                                         int width = wxCHOICE_WIDTH,
-                                        int height = wxCHOICE_HEIGHT));
-#endif // WXWIN_COMPATIBILITY_2_8
+                                        int height = wxCHOICE_HEIGHT);
 
 #endif // _WX_GENERIC_CHOICDGG_H_
diff --git a/Source/3rd Party/wx/include/wx/generic/clrpickerg.h b/Source/3rd Party/wx/include/wx/generic/clrpickerg.h
index 5cd82ea18..3a54f1e6f 100644
--- a/Source/3rd Party/wx/include/wx/generic/clrpickerg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/clrpickerg.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: clrpickerg.h 58967 2009-02-17 13:31:28Z SC $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,14 +13,30 @@
 #define _WX_CLRPICKER_H_
 
 #include "wx/button.h"
-#include "wx/bmpbuttn.h"
-#include "wx/colourdata.h"
+#include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
 // wxGenericColourButton: a button which brings up a wxColourDialog
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGenericColourButton : public wxBitmapButton,
+// show the colour in HTML form (#AABBCC) as colour button label
+#define wxCLRBTN_SHOW_LABEL     100
+
+// the default style
+#define wxCLRBTN_DEFAULT_STYLE  (wxCLRBTN_SHOW_LABEL)
+
+#ifndef wxCLRBTN_USES_BMP_BUTTON
+    #define wxCLRBTN_USES_BMP_BUTTON 0
+#endif
+
+#if wxCLRBTN_USES_BMP_BUTTON
+    #include "wx/bmpbutton.h"
+    #define wxCLRBTN_BASE_CLASS wxBitmapButton
+#else
+     #define wxCLRBTN_BASE_CLASS wxButton
+#endif
+                                               
+class WXDLLIMPEXP_CORE wxGenericColourButton : public wxCLRBTN_BASE_CLASS,
                                                public wxColourPickerWidgetBase
 {
 public:
@@ -64,7 +80,6 @@ public:
 
 
 protected:
-    wxBitmap    m_bitmap;
 
     wxSize DoGetBestSize() const;
 
diff --git a/Source/3rd Party/wx/include/wx/generic/collpaneg.h b/Source/3rd Party/wx/include/wx/generic/collpaneg.h
index 34babeacc..b16b65948 100644
--- a/Source/3rd Party/wx/include/wx/generic/collpaneg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/collpaneg.h	
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     8/10/2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: collpaneg.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,18 +15,15 @@
 // forward declared
 class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxStaticLine;
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
-class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
-#endif
 
-#include "wx/containr.h"
+// class name
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGenericCollapsiblePane :
-    public wxNavigationEnabled<wxCollapsiblePaneBase>
+class WXDLLIMPEXP_CORE wxGenericCollapsiblePane : public wxCollapsiblePaneBase
 {
 public:
     wxGenericCollapsiblePane() { Init(); }
@@ -45,7 +42,15 @@ public:
         Create(parent, winid, label, pos, size, style, val, name);
     }
 
-    virtual ~wxGenericCollapsiblePane();
+    void Init()
+    {
+        m_pButton = NULL;
+        m_pPane = NULL;
+        m_pStaticLine = NULL;
+        m_sz = NULL;
+    }
+
+    ~wxGenericCollapsiblePane();
 
     bool Create(wxWindow *parent,
                 wxWindowID winid,
@@ -69,11 +74,6 @@ public:
 
     virtual bool Layout();
 
-
-    // for the generic collapsible pane only:
-    wxControl* GetControlWidget() const
-        { return (wxControl*)m_pButton; }
-
     // implementation only, don't use
     void OnStateChange(const wxSize& sizeNew);
 
@@ -85,11 +85,7 @@ protected:
     int GetBorder() const;
 
     // child controls
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
-    wxDisclosureTriangle *m_pButton;
-#else
     wxButton *m_pButton;
-#endif
     wxStaticLine *m_pStaticLine;
     wxWindow *m_pPane;
     wxSizer *m_sz;
@@ -98,8 +94,6 @@ protected:
     wxString m_strLabel;
 
 private:
-    void Init();
-
     // event handlers
     void OnButton(wxCommandEvent &ev);
     void OnSize(wxSizeEvent &ev);
diff --git a/Source/3rd Party/wx/include/wx/generic/combo.h b/Source/3rd Party/wx/include/wx/generic/combo.h
index 3cc274284..1c0ccee5c 100644
--- a/Source/3rd Party/wx/include/wx/generic/combo.h	
+++ b/Source/3rd Party/wx/include/wx/generic/combo.h	
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: combo.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,11 +31,9 @@
 
 #endif
 
-#include "wx/dcbuffer.h"
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
-
-class WXDLLIMPEXP_CORE wxGenericComboCtrl : public wxComboCtrlBase
+class WXDLLEXPORT wxGenericComboCtrl : public wxComboCtrlBase
 {
 public:
     // ctors and such
@@ -82,37 +80,6 @@ public:
 
 protected:
 
-    // Dummies for platform-specific wxTextEntry implementations
-#if defined(__WXUNIVERSAL__)
-    // Looks like there's nothing we need to override here
-#elif defined(__WXMOTIF__)
-    virtual WXWidget GetTextWidget() const { return NULL; }
-#elif defined(__WXGTK__)
-#if defined(__WXGTK20__)
-    virtual GtkEditable *GetEditable() const { return NULL; }
-    virtual GtkEntry *GetEntry() const { return NULL; }
-#endif
-#elif defined(__WXMAC__)
-    // Looks like there's nothing we need to override here
-#elif defined(__WXPM__)
-    virtual WXHWND GetEditHWND() const { return NULL; }
-#endif
-
-    // For better transparent background rendering
-    virtual bool HasTransparentBackground()
-    {
-        #if wxALWAYS_NATIVE_DOUBLE_BUFFER
-          #ifdef __WXGTK__
-            // Sanity check for GTK+
-            return IsDoubleBuffered();
-          #else
-            return true;
-          #endif
-        #else
-            return false;
-        #endif
-    }
-
     // Mandatory virtuals
     virtual void OnResize();
 
@@ -134,7 +101,7 @@ private:
 // If native wxComboCtrl was not defined, then prepare a simple
 // front-end so that wxRTTI works as expected.
 
-class WXDLLIMPEXP_CORE wxComboCtrl : public wxGenericComboCtrl
+class WXDLLEXPORT wxComboCtrl : public wxGenericComboCtrl
 {
 public:
     wxComboCtrl() : wxGenericComboCtrl() {}
diff --git a/Source/3rd Party/wx/include/wx/generic/ctrlsub.h b/Source/3rd Party/wx/include/wx/generic/ctrlsub.h
deleted file mode 100644
index ed15283ec..000000000
--- a/Source/3rd Party/wx/include/wx/generic/ctrlsub.h	
+++ /dev/null
@@ -1,123 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/ctrlsub.h
-// Purpose:     common functionality of wxItemContainer-derived controls
-// Author:      Vadim Zeitlin
-// Created:     2007-07-25
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_CTRLSUB_H_
-#define _WX_GENERIC_CTRLSUB_H_
-
-#include "wx/dynarray.h"
-
-// ----------------------------------------------------------------------------
-// wxControlWithItemsGeneric: generic implementation of item client data
-// ----------------------------------------------------------------------------
-
-class wxControlWithItemsGeneric : public wxControlWithItemsBase
-{
-public:
-    wxControlWithItemsGeneric() { }
-
-    virtual void DoInitItemClientData()
-    {
-        m_itemsClientData.resize(GetCount(), NULL);
-    }
-
-    virtual void DoSetItemClientData(unsigned int n, void *clientData)
-    {
-        m_itemsClientData[n] = clientData;
-    }
-
-    virtual void *DoGetItemClientData(unsigned int n) const
-    {
-        return m_itemsClientData[n];
-    }
-
-    virtual void DoClear() { m_itemsClientData.clear(); }
-    virtual void DoDeleteOneItem(unsigned int pos)
-    {
-        if ( HasClientData() )
-            m_itemsClientData.RemoveAt(pos);
-    }
-
-protected:
-    // preallocate memory for numItems new items: this should be called from
-    // the derived classes DoInsertItems() to speed up appending big numbers of
-    // items with client data; it is safe to call even if we don't use client
-    // data at all and does nothing in this case
-    void AllocClientData(unsigned int numItems)
-    {
-        if ( HasClientData() )
-            m_itemsClientData.reserve(m_itemsClientData.size() + numItems);
-    }
-
-    // this must be called by derived classes when a new item is added to the
-    // control to add storage for the corresponding client data pointer (before
-    // inserting many items, call AllocClientData())
-    void InsertNewItemClientData(unsigned int pos,
-                                 void **clientData,
-                                 unsigned int n,
-                                 wxClientDataType type)
-    {
-        if ( InitClientDataIfNeeded(type) )
-            m_itemsClientData.Insert(clientData[n], pos);
-    }
-
-    // the same as InsertNewItemClientData() but for numItems consecutive items
-    // (this can only be used if the control doesn't support sorting as
-    // otherwise the items positions wouldn't be consecutive any more)
-    void InsertNewItemsClientData(unsigned int pos,
-                                  unsigned int numItems,
-                                  void **clientData,
-                                  wxClientDataType type)
-    {
-        if ( InitClientDataIfNeeded(type) )
-        {
-            // it's more efficient to insert everything at once and then update
-            // for big number of items to avoid moving the array contents
-            // around (which would result in O(N^2) algorithm)
-            m_itemsClientData.Insert(NULL, pos, numItems);
-
-            for ( unsigned int n = 0; n < numItems; ++n, ++pos )
-                m_itemsClientData[pos] = clientData[n];
-        }
-    }
-
-
-    // vector containing the client data pointers: it is either empty (if
-    // client data is not used) or has the same number of elements as the
-    // control
-    wxArrayPtrVoid m_itemsClientData;
-
-private:
-    // initialize client data if needed, return false if we don't have any
-    // client data and true otherwise
-    bool InitClientDataIfNeeded(wxClientDataType type)
-    {
-        if ( !HasClientData() )
-        {
-            if ( type == wxClientData_None )
-            {
-                // we didn't have the client data before and are not asked to
-                // store it now neither
-                return false;
-            }
-
-            // this is the first time client data is used with this control
-            DoInitItemClientData();
-            SetClientDataType(type);
-        }
-        //else: we already have client data
-
-        return true;
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxControlWithItemsGeneric);
-};
-
-#endif // _WX_GENERIC_CTRLSUB_H_
-
diff --git a/Source/3rd Party/wx/include/wx/generic/dirctrlg.h b/Source/3rd Party/wx/include/wx/generic/dirctrlg.h
index 16c84bf12..b4cea43b5 100644
--- a/Source/3rd Party/wx/include/wx/generic/dirctrlg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/dirctrlg.h	
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/dirctrlg.h
+// Name:        dirctrlg.h
 // Purpose:     wxGenericDirCtrl class
 //              Builds on wxDirCtrl class written by Robert Roebling for the
 //              wxFile application, modified by Harm van der Heijden.
@@ -7,7 +7,7 @@
 // Author:      Robert Roebling, Harm van der Heijden, Julian Smart et al
 // Modified by:
 // Created:     21/3/2000
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dirctrlg.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Robert Roebling, Harm van der Heijden, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,6 +15,10 @@
 #ifndef _WX_DIRCTRL_H_
 #define _WX_DIRCTRL_H_
 
+#if wxUSE_DIRDLG || wxUSE_FILEDLG
+    #include "wx/imaglist.h"
+#endif
+
 #if wxUSE_DIRDLG
 
 #include "wx/treectrl.h"
@@ -27,6 +31,7 @@
 //-----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxImageList;
 class WXDLLIMPEXP_FWD_BASE wxHashTable;
 
 //-----------------------------------------------------------------------------
@@ -39,23 +44,19 @@ enum
     wxDIRCTRL_DIR_ONLY       = 0x0010,
     // When setting the default path, select the first file in the directory
     wxDIRCTRL_SELECT_FIRST   = 0x0020,
-#if WXWIN_COMPATIBILITY_2_8
-    // Unused, for compatibility only
+    // Show the filter list
     wxDIRCTRL_SHOW_FILTERS   = 0x0040,
-#endif // WXWIN_COMPATIBILITY_2_8
     // Use 3D borders on internal controls
     wxDIRCTRL_3D_INTERNAL    = 0x0080,
     // Editable labels
-    wxDIRCTRL_EDIT_LABELS    = 0x0100,
-    // Allow multiple selection
-    wxDIRCTRL_MULTIPLE       = 0x0200
+    wxDIRCTRL_EDIT_LABELS    = 0x0100
 };
 
 //-----------------------------------------------------------------------------
 // wxDirItemData
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDirItemData : public wxTreeItemData
+class WXDLLEXPORT wxDirItemData : public wxTreeItemData
 {
 public:
     wxDirItemData(const wxString& path, const wxString& name, bool isDir);
@@ -77,7 +78,7 @@ public:
 
 class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl;
 
-class WXDLLIMPEXP_CORE wxGenericDirCtrl: public wxControl
+class WXDLLEXPORT wxGenericDirCtrl: public wxControl
 {
 public:
     wxGenericDirCtrl();
@@ -85,7 +86,7 @@ public:
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
-              long style = wxDIRCTRL_3D_INTERNAL,
+              long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr )
@@ -98,7 +99,7 @@ public:
               const wxString &dir = wxDirDialogDefaultFolderStr,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
-              long style = wxDIRCTRL_3D_INTERNAL,
+              long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER,
               const wxString& filter = wxEmptyString,
               int defaultFilter = 0,
               const wxString& name = wxTreeCtrlNameStr );
@@ -125,17 +126,12 @@ public:
 
     // Get dir or filename
     virtual wxString GetPath() const;
-    virtual void GetPaths(wxArrayString& paths) const;
 
     // Get selected filename path only (else empty string).
     // I.e. don't count a directory as a selection
     virtual wxString GetFilePath() const;
-    virtual void GetFilePaths(wxArrayString& paths) const;
     virtual void SetPath(const wxString& path);
 
-    virtual void SelectPath(const wxString& path, bool select = true);
-    virtual void SelectPaths(const wxArrayString& paths);
-
     virtual void ShowHidden( bool show );
     virtual bool GetShowHidden() { return m_showHidden; }
 
@@ -150,11 +146,14 @@ public:
     virtual wxTreeCtrl* GetTreeCtrl() const { return m_treeCtrl; }
     virtual wxDirFilterListCtrl* GetFilterListCtrl() const { return m_filterListCtrl; }
 
-    virtual void UnselectAll();
-
     // Helper
     virtual void SetupSections();
 
+#if WXWIN_COMPATIBILITY_2_4
+    // Parse the filter into an array of filters and an array of descriptions
+    virtual int ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions);
+#endif // WXWIN_COMPATIBILITY_2_4
+
     // Find the child that matches the first part of 'path'.
     // E.g. if a child path is "/usr" and 'path' is "/usr/include"
     // then the child for /usr is returned.
@@ -170,9 +169,6 @@ public:
     // Collapse the entire tree
     virtual void CollapseTree();
 
-    // overridden base class methods
-    virtual void SetFocus();
-
 protected:
     virtual void ExpandRoot();
     virtual void ExpandDir(wxTreeItemId parentId);
@@ -189,8 +185,6 @@ protected:
     bool ExtractWildcard(const wxString& filterStr, int n, wxString& filter, wxString& description);
 
 private:
-    void PopulateNode(wxTreeItemId node);
-
     bool            m_showHidden;
     wxTreeItemId    m_rootId;
     wxString        m_defaultPath; // Starting path
@@ -204,14 +198,14 @@ private:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericDirCtrl)
-    wxDECLARE_NO_COPY_CLASS(wxGenericDirCtrl);
+    DECLARE_NO_COPY_CLASS(wxGenericDirCtrl)
 };
 
 //-----------------------------------------------------------------------------
 // wxDirFilterListCtrl
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDirFilterListCtrl: public wxChoice
+class WXDLLEXPORT wxDirFilterListCtrl: public wxChoice
 {
 public:
     wxDirFilterListCtrl() { Init(); }
@@ -244,7 +238,7 @@ protected:
 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDirFilterListCtrl)
-    wxDECLARE_NO_COPY_CLASS(wxDirFilterListCtrl);
+    DECLARE_NO_COPY_CLASS(wxDirFilterListCtrl)
 };
 
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && !defined(__WXPM__)
@@ -261,11 +255,9 @@ protected:
 // wxFileIconsTable - use wxTheFileIconsTable which is created as necessary
 //-------------------------------------------------------------------------
 
-#if wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL
+#if wxUSE_DIRDLG || wxUSE_FILEDLG
 
-class WXDLLIMPEXP_FWD_CORE wxImageList;
-
-class WXDLLIMPEXP_CORE wxFileIconsTable
+class WXDLLEXPORT wxFileIconsTable
 {
 public:
     wxFileIconsTable();
@@ -295,9 +287,9 @@ protected:
 };
 
 // The global fileicons table
-extern WXDLLIMPEXP_DATA_CORE(wxFileIconsTable *) wxTheFileIconsTable;
+extern WXDLLEXPORT_DATA(wxFileIconsTable *) wxTheFileIconsTable;
 
-#endif // wxUSE_DIRDLG || wxUSE_FILEDLG || wxUSE_FILECTRL
+#endif // wxUSE_DIRDLG || wxUSE_FILEDLG
 
 #endif
     // _WX_DIRCTRLG_H_
diff --git a/Source/3rd Party/wx/include/wx/generic/dragimgg.h b/Source/3rd Party/wx/include/wx/generic/dragimgg.h
index 201bafa14..79f2785ba 100644
--- a/Source/3rd Party/wx/include/wx/generic/dragimgg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/dragimgg.h	
@@ -5,7 +5,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/2/2000
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dragimgg.h 42397 2006-10-25 12:12:56Z VS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -88,7 +88,7 @@
  * wxGenericDragImage
  */
 
-class WXDLLIMPEXP_CORE wxGenericDragImage: public wxObject
+class WXDLLEXPORT wxGenericDragImage: public wxObject
 {
 public:
 
@@ -157,14 +157,13 @@ public:
     // Attributes
     ////////////////////////////////////////////////////////////////////////////
 
-#ifdef wxHAS_NATIVE_OVERLAY
-    // backing store is not used when native overlays are
-    void SetBackingBitmap(wxBitmap* WXUNUSED(bitmap)) { }
-#else
     // For efficiency, tell wxGenericDragImage to use a bitmap that's already
     // created (e.g. from last drag)
-    void SetBackingBitmap(wxBitmap* bitmap) { m_pBackingBitmap = bitmap; }
-#endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY
+    void SetBackingBitmap(wxBitmap* bitmap) { 
+#ifndef wxHAS_NATIVE_OVERLAY
+        m_pBackingBitmap = bitmap; 
+#endif
+    }
 
     // Operations
     ////////////////////////////////////////////////////////////////////////////
@@ -193,7 +192,7 @@ public:
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image.
-    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = NULL);
+    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = (wxRect*) NULL);
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image. This is full screen only. fullScreenRect gives the
@@ -265,7 +264,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericDragImage)
-    wxDECLARE_NO_COPY_CLASS(wxGenericDragImage);
+    DECLARE_NO_COPY_CLASS(wxGenericDragImage)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/generic/filectrlg.h b/Source/3rd Party/wx/include/wx/generic/filectrlg.h
deleted file mode 100644
index 0f5735e45..000000000
--- a/Source/3rd Party/wx/include/wx/generic/filectrlg.h	
+++ /dev/null
@@ -1,304 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/filectrlg.h
-// Purpose:     wxGenericFileCtrl Header
-// Author:      Diaa M. Sami
-// Modified by:
-// Created:     Jul-07-2007
-// RCS-ID:      $Id$
-// Copyright:   (c) Diaa M. Sami
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_FILECTRL_H_
-#define _WX_GENERIC_FILECTRL_H_
-
-#if wxUSE_FILECTRL
-
-#include "wx/containr.h"
-#include "wx/listctrl.h"
-#include "wx/filectrl.h"
-#include "wx/filename.h"
-
-class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-class WXDLLIMPEXP_FWD_CORE wxChoice;
-class WXDLLIMPEXP_FWD_CORE wxStaticText;
-class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[];
-
-//-----------------------------------------------------------------------------
-//  wxFileData - a class to hold the file info for the wxFileListCtrl
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileData
-{
-public:
-    enum fileType
-    {
-        is_file  = 0x0000,
-        is_dir   = 0x0001,
-        is_link  = 0x0002,
-        is_exe   = 0x0004,
-        is_drive = 0x0008
-    };
-
-    wxFileData() { Init(); }
-    // Full copy constructor
-    wxFileData( const wxFileData& fileData ) { Copy(fileData); }
-    // Create a filedata from this information
-    wxFileData( const wxString &filePath, const wxString &fileName,
-                fileType type, int image_id );
-
-    // make a full copy of the other wxFileData
-    void Copy( const wxFileData &other );
-
-    // (re)read the extra data about the file from the system
-    void ReadData();
-
-    // get the name of the file, dir, drive
-    wxString GetFileName() const { return m_fileName; }
-    // get the full path + name of the file, dir, path
-    wxString GetFilePath() const { return m_filePath; }
-    // Set the path + name and name of the item
-    void SetNewName( const wxString &filePath, const wxString &fileName );
-
-    // Get the size of the file in bytes
-    wxFileOffset GetSize() const { return m_size; }
-    // Get the type of file, either file extension or <DIR>, <LINK>, <DRIVE>
-    wxString GetFileType() const;
-    // get the last modification time
-    wxDateTime GetDateTime() const { return m_dateTime; }
-    // Get the time as a formatted string
-    wxString GetModificationTime() const;
-    // in UNIX get rwx for file, in MSW get attributes ARHS
-    wxString GetPermissions() const { return m_permissions; }
-    // Get the id of the image used in a wxImageList
-    int GetImageId() const { return m_image; }
-
-    bool IsFile() const  { return !IsDir() && !IsLink() && !IsDrive(); }
-    bool IsDir() const   { return (m_type & is_dir  ) != 0; }
-    bool IsLink() const  { return (m_type & is_link ) != 0; }
-    bool IsExe() const   { return (m_type & is_exe  ) != 0; }
-    bool IsDrive() const { return (m_type & is_drive) != 0; }
-
-    // Get/Set the type of file, file/dir/drive/link
-    int GetType() const { return m_type; }
-
-    // the wxFileListCtrl fields in report view
-    enum fileListFieldType
-    {
-        FileList_Name,
-        FileList_Size,
-        FileList_Type,
-        FileList_Time,
-#if defined(__UNIX__) || defined(__WIN32__)
-        FileList_Perm,
-#endif // defined(__UNIX__) || defined(__WIN32__)
-        FileList_Max
-    };
-
-    // Get the entry for report view of wxFileListCtrl
-    wxString GetEntry( fileListFieldType num ) const;
-
-    // Get a string representation of the file info
-    wxString GetHint() const;
-    // initialize a wxListItem attributes
-    void MakeItem( wxListItem &item );
-
-    // operators
-    wxFileData& operator = (const wxFileData& fd) { Copy(fd); return *this; }
-
-protected:
-    wxString m_fileName;
-    wxString   m_filePath;
-    wxFileOffset m_size;
-    wxDateTime m_dateTime;
-    wxString m_permissions;
-    int      m_type;
-    int      m_image;
-
-private:
-    void Init();
-};
-
-//-----------------------------------------------------------------------------
-//  wxFileListCtrl
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileListCtrl : public wxListCtrl
-{
-public:
-    wxFileListCtrl();
-    wxFileListCtrl( wxWindow *win,
-                wxWindowID id,
-                const wxString &wild,
-                bool showHidden,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = wxLC_LIST,
-                const wxValidator &validator = wxDefaultValidator,
-                const wxString &name = wxT("filelist") );
-    virtual ~wxFileListCtrl();
-
-    virtual void ChangeToListMode();
-    virtual void ChangeToReportMode();
-    virtual void ChangeToSmallIconMode();
-    virtual void ShowHidden( bool show = true );
-    bool GetShowHidden() const { return m_showHidden; }
-
-    virtual long Add( wxFileData *fd, wxListItem &item );
-    virtual void UpdateItem(const wxListItem &item);
-    virtual void UpdateFiles();
-    virtual void MakeDir();
-    virtual void GoToParentDir();
-    virtual void GoToHomeDir();
-    virtual void GoToDir( const wxString &dir );
-    virtual void SetWild( const wxString &wild );
-    wxString GetWild() const { return m_wild; }
-    wxString GetDir() const { return m_dirName; }
-
-    void OnListDeleteItem( wxListEvent &event );
-    void OnListDeleteAllItems( wxListEvent &event );
-    void OnListEndLabelEdit( wxListEvent &event );
-    void OnListColClick( wxListEvent &event );
-
-    virtual void SortItems(wxFileData::fileListFieldType field, bool forward);
-    bool GetSortDirection() const { return m_sort_forward; }
-    wxFileData::fileListFieldType GetSortField() const { return m_sort_field; }
-
-protected:
-    void FreeItemData(wxListItem& item);
-    void FreeAllItemsData();
-
-    wxString      m_dirName;
-    bool          m_showHidden;
-    wxString      m_wild;
-
-    bool m_sort_forward;
-    wxFileData::fileListFieldType m_sort_field;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFileListCtrl)
-    DECLARE_EVENT_TABLE()
-};
-
-class WXDLLIMPEXP_CORE wxGenericFileCtrl : public wxNavigationEnabled<wxControl>,
-                                           public wxFileCtrlBase
-{
-public:
-    wxGenericFileCtrl()
-    {
-        m_ignoreChanges = false;
-    }
-
-    wxGenericFileCtrl ( wxWindow *parent,
-                        wxWindowID id,
-                        const wxString& defaultDirectory = wxEmptyString,
-                        const wxString& defaultFilename = wxEmptyString,
-                        const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
-                        long style = wxFC_DEFAULT_STYLE,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        const wxString& name = wxFileCtrlNameStr )
-    {
-        m_ignoreChanges = false;
-        Create(parent, id, defaultDirectory, defaultFilename, wildCard,
-               style, pos, size, name );
-    }
-
-    virtual ~wxGenericFileCtrl() {}
-
-    bool Create( wxWindow *parent,
-                 wxWindowID id,
-                 const wxString& defaultDirectory = wxEmptyString,
-                 const wxString& defaultFileName = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
-                 long style = wxFC_DEFAULT_STYLE,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 const wxString& name = wxFileCtrlNameStr );
-
-    virtual void SetWildcard( const wxString& wildCard );
-    virtual void SetFilterIndex( int filterindex );
-    virtual bool SetDirectory( const wxString& dir );
-
-    // Selects a certain file.
-    // In case the filename specified isn't found/couldn't be shown with
-    // currently selected filter, false is returned and nothing happens
-    virtual bool SetFilename( const wxString& name );
-
-    // Changes to a certain directory and selects a certain file.
-    // In case the filename specified isn't found/couldn't be shown with
-    // currently selected filter, false is returned and if directory exists
-    // it's chdir'ed to
-    virtual bool SetPath( const wxString& path );
-
-    virtual wxString GetFilename() const;
-    virtual wxString GetDirectory() const;
-    virtual wxString GetWildcard() const { return this->m_wildCard; }
-    virtual wxString GetPath() const;
-    virtual void GetPaths( wxArrayString& paths ) const;
-    virtual void GetFilenames( wxArrayString& files ) const;
-    virtual int GetFilterIndex() const { return m_filterIndex; }
-
-    virtual bool HasMultipleFileSelection() const
-        { return HasFlag(wxFC_MULTIPLE); }
-    virtual void ShowHidden(bool show) { m_list->ShowHidden( show ); }
-
-    void GoToParentDir();
-    void GoToHomeDir();
-
-    // get the directory currently shown in the control: this can be different
-    // from GetDirectory() if the user entered a full path (with a path other
-    // than the one currently shown in the control) in the text control
-    // manually
-    wxString GetShownDirectory() const { return m_list->GetDir(); }
-
-    wxFileListCtrl *GetFileList() { return m_list; }
-
-    void ChangeToReportMode() { m_list->ChangeToReportMode(); }
-    void ChangeToListMode() { m_list->ChangeToListMode(); }
-
-
-private:
-    void OnChoiceFilter( wxCommandEvent &event );
-    void OnCheck( wxCommandEvent &event );
-    void OnActivated( wxListEvent &event );
-    void OnTextEnter( wxCommandEvent &WXUNUSED( event ) );
-    void OnTextChange( wxCommandEvent &WXUNUSED( event ) );
-    void OnSelected( wxListEvent &event );
-    void HandleAction( const wxString &fn );
-
-    void DoSetFilterIndex( int filterindex );
-    void UpdateControls();
-
-    // the first of these methods can only be used for the controls with single
-    // selection (i.e. without wxFC_MULTIPLE style), the second one in any case
-    wxFileName DoGetFileName() const;
-    void DoGetFilenames( wxArrayString& filenames, bool fullPath ) const;
-
-    int m_style;
-
-    wxString         m_filterExtension;
-    wxChoice        *m_choice;
-    wxTextCtrl      *m_text;
-    wxFileListCtrl  *m_list;
-    wxCheckBox      *m_check;
-    wxStaticText    *m_static;
-
-    wxString        m_dir;
-    wxString        m_fileName;
-    wxString        m_wildCard; // wild card in one string as we got it
-
-    int     m_filterIndex;
-    bool    m_inSelected;
-    bool    m_ignoreChanges;
-    bool    m_noSelChgEvent; // suppress selection changed events.
-
-    DECLARE_DYNAMIC_CLASS( wxGenericFileCtrl )
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // wxUSE_FILECTRL
-
-#endif // _WX_GENERIC_FILECTRL_H_
diff --git a/Source/3rd Party/wx/include/wx/generic/filepickerg.h b/Source/3rd Party/wx/include/wx/generic/filepickerg.h
index aec59350e..769d20b4a 100644
--- a/Source/3rd Party/wx/include/wx/generic/filepickerg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/filepickerg.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filepickerg.h 40100 2006-07-15 15:13:04Z VS $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,8 +17,8 @@
 #include "wx/dirdlg.h"
 
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );
+extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_DIRPICKER_CHANGED;
+extern WXDLLEXPORT_DATA(const wxEventType) wxEVT_COMMAND_FILEPICKER_CHANGED;
 
 
 //-----------------------------------------------------------------------------
@@ -29,7 +29,7 @@ class WXDLLIMPEXP_CORE wxGenericFileDirButton : public wxButton,
                                                 public wxFileDirPickerWidgetBase
 {
 public:
-    wxGenericFileDirButton() { Init(); }
+    wxGenericFileDirButton() { }
     wxGenericFileDirButton(wxWindow *parent,
                            wxWindowID id,
                            const wxString& label = wxFilePickerWidgetLabel,
@@ -42,14 +42,15 @@ public:
                            const wxValidator& validator = wxDefaultValidator,
                            const wxString& name = wxFilePickerWidgetNameStr)
     {
-        Init();
         Create(parent, id, label, path, message, wildcard,
                pos, size, style, validator, name);
     }
 
+    virtual ~wxGenericFileDirButton() {}
+
     virtual wxControl *AsControl() { return this; }
 
-public:     // overridable
+public:     // overrideable
 
     virtual wxDialog *CreateDialog() = 0;
 
@@ -58,8 +59,6 @@ public:     // overridable
 
     virtual wxEventType GetEventType() const = 0;
 
-    virtual void SetInitialDirectory(const wxString& dir);
-
 public:
 
     bool Create(wxWindow *parent, wxWindowID id,
@@ -78,18 +77,6 @@ public:
 
 protected:
     wxString m_message, m_wildcard;
-
-    // we just store the style passed to the ctor here instead of passing it to
-    // wxButton as some of our bits can conflict with wxButton styles and it
-    // just doesn't make sense to use picker styles for wxButton anyhow
-    long m_pickerStyle;
-
-    // Initial directory set by SetInitialDirectory() call or empty.
-    wxString m_initialDir;
-
-private:
-    // common part of all ctors
-    void Init() { m_pickerStyle = -1; }
 };
 
 
@@ -119,33 +106,36 @@ public:
                pos, size, style, validator, name);
     }
 
-public:     // overridable
+public:     // overrideable
 
     virtual long GetDialogStyle() const
     {
-        // the derived class must initialize it if it doesn't use the
-        // non-default wxGenericFileDirButton ctor
-        wxASSERT_MSG( m_pickerStyle != -1,
-                      "forgot to initialize m_pickerStyle?" );
-
-
         long filedlgstyle = 0;
 
-        if ( m_pickerStyle & wxFLP_OPEN )
+        if (this->HasFlag(wxFLP_OPEN))
             filedlgstyle |= wxFD_OPEN;
-        if ( m_pickerStyle & wxFLP_SAVE )
+        if (this->HasFlag(wxFLP_SAVE))
             filedlgstyle |= wxFD_SAVE;
-        if ( m_pickerStyle & wxFLP_OVERWRITE_PROMPT )
+        if (this->HasFlag(wxFLP_OVERWRITE_PROMPT))
             filedlgstyle |= wxFD_OVERWRITE_PROMPT;
-        if ( m_pickerStyle & wxFLP_FILE_MUST_EXIST )
+        if (this->HasFlag(wxFLP_FILE_MUST_EXIST))
             filedlgstyle |= wxFD_FILE_MUST_EXIST;
-        if ( m_pickerStyle & wxFLP_CHANGE_DIR )
+        if (this->HasFlag(wxFLP_CHANGE_DIR))
             filedlgstyle |= wxFD_CHANGE_DIR;
 
         return filedlgstyle;
     }
 
-    virtual wxDialog *CreateDialog();
+    virtual wxDialog *CreateDialog()
+    {
+        wxFileDialog *p = new wxFileDialog(GetDialogParent(), m_message,
+                                    wxEmptyString, wxEmptyString,
+                                    m_wildcard, GetDialogStyle());
+
+        // this sets both the default folder and the default file of the dialog
+        p->SetPath(m_path);
+        return p;
+    }
 
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_FILEPICKER_CHANGED; }
@@ -156,10 +146,6 @@ protected:
     void UpdatePathFromDialog(wxDialog *p)
         { m_path = wxStaticCast(p, wxFileDialog)->GetPath(); }
 
-    // Set the initial directory for the dialog but without overriding the
-    // directory of the currently selected file, if any.
-    void DoSetInitialDirectory(wxFileDialog* dialog, const wxString& dir);
-
 private:
     DECLARE_DYNAMIC_CLASS(wxGenericFileButton)
 };
@@ -190,21 +176,25 @@ public:
                pos, size, style, validator, name);
     }
 
-public:     // overridable
+public:     // overrideable
 
     virtual long GetDialogStyle() const
     {
         long dirdlgstyle = wxDD_DEFAULT_STYLE;
 
-        if ( m_pickerStyle & wxDIRP_DIR_MUST_EXIST )
+        if (this->HasFlag(wxDIRP_DIR_MUST_EXIST))
             dirdlgstyle |= wxDD_DIR_MUST_EXIST;
-        if ( m_pickerStyle & wxDIRP_CHANGE_DIR )
+        if (this->HasFlag(wxDIRP_CHANGE_DIR))
             dirdlgstyle |= wxDD_CHANGE_DIR;
 
         return dirdlgstyle;
     }
 
-    virtual wxDialog *CreateDialog();
+    virtual wxDialog *CreateDialog()
+    {
+        return new wxDirDialog(GetDialogParent(), m_message, m_path,
+                                   GetDialogStyle());
+    }
 
     wxEventType GetEventType() const
         { return wxEVT_COMMAND_DIRPICKER_CHANGED; }
diff --git a/Source/3rd Party/wx/include/wx/generic/fontpickerg.h b/Source/3rd Party/wx/include/wx/generic/fontpickerg.h
index c31a0b014..cfa612aa9 100644
--- a/Source/3rd Party/wx/include/wx/generic/fontpickerg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/fontpickerg.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontpickerg.h 42999 2006-11-03 21:54:13Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,12 +13,15 @@
 #define _WX_FONTPICKER_H_
 
 #include "wx/button.h"
-#include "wx/fontdata.h"
+#include "wx/cmndata.h"
 
 //-----------------------------------------------------------------------------
-// wxGenericFontButton: a button which brings up a wxFontDialog
+// wxGenericFontButton: a button which brings up a wxColourDialog
 //-----------------------------------------------------------------------------
 
+#define wxFONTBTN_DEFAULT_STYLE \
+    (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL)
+
 class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton,
                                              public wxFontPickerWidgetBase
 {
@@ -44,8 +47,8 @@ public:     // API extensions specific for wxGenericFontButton
     // user can override this to init font data in a different way
     virtual void InitFontData();
 
-    // returns the font data shown in wxFontDialog
-    wxFontData *GetFontData() { return &m_data; }
+    // returns the font data shown in wxColourDialog
+    wxFontData *GetFontData() { return &ms_data; }
 
 
 public:
@@ -66,7 +69,10 @@ protected:
 
     void UpdateFont();
 
-    wxFontData m_data;
+    // the colour data shown in wxColourPickerCtrlGeneric
+    // controls. This member is static so that all colour pickers
+    // in the program share the same set of custom colours.
+    static wxFontData ms_data;
 
 private:
    DECLARE_DYNAMIC_CLASS(wxGenericFontButton)
diff --git a/Source/3rd Party/wx/include/wx/generic/fswatcher.h b/Source/3rd Party/wx/include/wx/generic/fswatcher.h
deleted file mode 100644
index 9f16ab150..000000000
--- a/Source/3rd Party/wx/include/wx/generic/fswatcher.h	
+++ /dev/null
@@ -1,26 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/fswatcher.h
-// Purpose:     wxPollingFileSystemWatcher
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FSWATCHER_GENERIC_H_
-#define _WX_FSWATCHER_GENERIC_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_FSWATCHER
-
-class WXDLLIMPEXP_BASE wxPollingFileSystemWatcher : public wxFileSystemWatcherBase
-{
-public:
-
-};
-
-#endif // wxUSE_FSWATCHER
-
-#endif /* _WX_FSWATCHER_GENERIC_H_ */
diff --git a/Source/3rd Party/wx/include/wx/generic/infobar.h b/Source/3rd Party/wx/include/wx/generic/infobar.h
deleted file mode 100644
index 45f085b52..000000000
--- a/Source/3rd Party/wx/include/wx/generic/infobar.h	
+++ /dev/null
@@ -1,133 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/infobar.h
-// Purpose:     generic wxInfoBar class declaration
-// Author:      Vadim Zeitlin
-// Created:     2009-07-28
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_INFOBAR_H_
-#define _WX_GENERIC_INFOBAR_H_
-
-class WXDLLIMPEXP_FWD_CORE wxBitmapButton;
-class WXDLLIMPEXP_FWD_CORE wxStaticBitmap;
-class WXDLLIMPEXP_FWD_CORE wxStaticText;
-
-// ----------------------------------------------------------------------------
-// wxInfoBar
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxInfoBarGeneric : public wxInfoBarBase
-{
-public:
-    // the usual ctors and Create() but remember that info bar is created
-    // hidden
-    wxInfoBarGeneric() { Init(); }
-
-    wxInfoBarGeneric(wxWindow *parent, wxWindowID winid = wxID_ANY)
-    {
-        Init();
-        Create(parent, winid);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY);
-
-
-    // implement base class methods
-    // ----------------------------
-
-    virtual void ShowMessage(const wxString& msg,
-                             int flags = wxICON_INFORMATION);
-
-    virtual void Dismiss();
-
-    virtual void AddButton(wxWindowID btnid, const wxString& label = wxString());
-
-    virtual void RemoveButton(wxWindowID btnid);
-
-    // methods specific to this version
-    // --------------------------------
-
-    // set the effect(s) to use when showing/hiding the bar, may be
-    // wxSHOW_EFFECT_NONE to disable any effects entirely
-    //
-    // by default, slide to bottom/top is used when it's positioned on the top
-    // of the window for showing/hiding it and top/bottom when it's positioned
-    // at the bottom
-    void SetShowHideEffects(wxShowEffect showEffect, wxShowEffect hideEffect)
-    {
-        m_showEffect = showEffect;
-        m_hideEffect = hideEffect;
-    }
-
-    // get effect used when showing/hiding the window
-    wxShowEffect GetShowEffect() const;
-    wxShowEffect GetHideEffect() const;
-
-    // set the duration of animation used when showing/hiding the bar, in ms
-    void SetEffectDuration(int duration) { m_effectDuration = duration; }
-
-    // get the currently used effect animation duration
-    int GetEffectDuration() const { return m_effectDuration; }
-
-
-    // overridden base class methods
-    // -----------------------------
-
-    // setting the font of this window sets it for the text control inside it
-    // (default font is a larger and bold version of the normal one)
-    virtual bool SetFont(const wxFont& font);
-
-protected:
-    // info bar shouldn't have any border by default, the colour difference
-    // between it and the main window separates it well enough
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-
-    // update the parent to take our new or changed size into account (notably
-    // should be called when we're shown or hidden)
-    void UpdateParent();
-
-private:
-    // common part of all ctors
-    void Init();
-
-    // handler for the close button
-    void OnButton(wxCommandEvent& event);
-
-    // show/hide the bar
-    void DoShow();
-    void DoHide();
-
-    // determine the placement of the bar from its position in the containing
-    // sizer
-    enum BarPlacement
-    {
-        BarPlacement_Top,
-        BarPlacement_Bottom,
-        BarPlacement_Unknown
-    };
-
-    BarPlacement GetBarPlacement() const;
-
-
-    // different controls making up the bar
-    wxStaticBitmap *m_icon;
-    wxStaticText *m_text;
-    wxBitmapButton *m_button;
-
-    // the effects to use when showing/hiding and duration for them: by default
-    // the effect is determined by the info bar automatically depending on its
-    // position and the default duration is used
-    wxShowEffect m_showEffect,
-                 m_hideEffect;
-    int m_effectDuration;
-
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxInfoBarGeneric);
-};
-
-#endif // _WX_GENERIC_INFOBAR_H_
-
diff --git a/Source/3rd Party/wx/include/wx/generic/logg.h b/Source/3rd Party/wx/include/wx/generic/logg.h
index 161f4f5c8..240b30fbd 100644
--- a/Source/3rd Party/wx/include/wx/generic/logg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/logg.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: logg.h 41020 2006-09-05 20:47:48Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,10 +14,6 @@
 
 #if wxUSE_GUI
 
-class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-class WXDLLIMPEXP_FWD_CORE wxLogFrame;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
 // ----------------------------------------------------------------------------
 // the following log targets are only compiled in if the we're compiling the
 // GUI part (andnot just the base one) of the library, they're implemented in
@@ -27,20 +23,20 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
 #if wxUSE_TEXTCTRL
 
 // log everything to a text window (GUI only of course)
-class WXDLLIMPEXP_CORE wxLogTextCtrl : public wxLog
+class WXDLLEXPORT wxLogTextCtrl : public wxLog
 {
 public:
     wxLogTextCtrl(wxTextCtrl *pTextCtrl);
 
 protected:
     // implement sink function
-    virtual void DoLogText(const wxString& msg);
+    virtual void DoLogString(const wxChar *szString, time_t t);
 
 private:
     // the control we use
     wxTextCtrl *m_pTextCtrl;
 
-    wxDECLARE_NO_COPY_CLASS(wxLogTextCtrl);
+    DECLARE_NO_COPY_CLASS(wxLogTextCtrl)
 };
 
 #endif // wxUSE_TEXTCTRL
@@ -51,7 +47,7 @@ private:
 
 #if wxUSE_LOGGUI
 
-class WXDLLIMPEXP_CORE wxLogGui : public wxLog
+class WXDLLEXPORT wxLogGui : public wxLog
 {
 public:
     // ctor
@@ -61,22 +57,11 @@ public:
     virtual void Flush();
 
 protected:
-    virtual void DoLogRecord(wxLogLevel level,
-                             const wxString& msg,
-                             const wxLogRecordInfo& info);
-
-    // return the title to be used for the log dialog, depending on m_bErrors
-    // and m_bWarnings values
-    wxString GetTitle() const;
-
-    // return the icon (one of wxICON_XXX constants) to be used for the dialog
-    // depending on m_bErrors/m_bWarnings
-    int GetSeverityIcon() const;
+    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t);
 
     // empty everything
     void Clear();
 
-
     wxArrayString m_aMessages;      // the log message texts
     wxArrayInt    m_aSeverity;      // one of wxLOG_XXX values
     wxArrayLong   m_aTimes;         // the time of each message
@@ -84,19 +69,6 @@ protected:
                   m_bWarnings,      // any warnings?
                   m_bHasMessages;   // any messages at all?
 
-private:
-    // this method is called to show a single log message, it uses
-    // wxMessageBox() by default
-    virtual void DoShowSingleLogMessage(const wxString& message,
-                                        const wxString& title,
-                                        int style);
-
-    // this method is called to show multiple log messages, it uses wxLogDialog
-    virtual void DoShowMultipleLogMessages(const wxArrayString& messages,
-                                           const wxArrayInt& severities,
-                                           const wxArrayLong& times,
-                                           const wxString& title,
-                                           int style);
 };
 
 #endif // wxUSE_LOGGUI
@@ -104,17 +76,17 @@ private:
 // ----------------------------------------------------------------------------
 // (background) log window: this class forwards all log messages to the log
 // target which was active when it was instantiated, but also collects them
-// to the log window. This window has its own menu which allows the user to
+// to the log window. This window has it's own menu which allows the user to
 // close it, clear the log contents or save it to the file.
 // ----------------------------------------------------------------------------
 
 #if wxUSE_LOGWINDOW
 
-class WXDLLIMPEXP_CORE wxLogWindow : public wxLogPassThrough
+class WXDLLEXPORT wxLogWindow : public wxLogPassThrough
 {
 public:
-    wxLogWindow(wxWindow *pParent,        // the parent frame (can be NULL)
-                const wxString& szTitle,  // the title of the frame
+    wxLogWindow(wxWindow *pParent,         // the parent frame (can be NULL)
+                const wxChar *szTitle,    // the title of the frame
                 bool bShow = true,        // show window immediately?
                 bool bPassToOld = true);  // pass messages to the old target?
 
@@ -140,12 +112,13 @@ public:
     virtual void OnFrameDelete(wxFrame *frame);
 
 protected:
-    virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg);
+    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t);
+    virtual void DoLogString(const wxChar *szString, time_t t);
 
 private:
     wxLogFrame *m_pLogFrame;      // the log frame
 
-    wxDECLARE_NO_COPY_CLASS(wxLogWindow);
+    DECLARE_NO_COPY_CLASS(wxLogWindow)
 };
 
 #endif // wxUSE_LOGWINDOW
diff --git a/Source/3rd Party/wx/include/wx/generic/msgdlgg.h b/Source/3rd Party/wx/include/wx/generic/msgdlgg.h
index 2088374bc..4776b106a 100644
--- a/Source/3rd Party/wx/include/wx/generic/msgdlgg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/msgdlgg.h	
@@ -4,53 +4,41 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: msgdlgg.h 49765 2007-11-09 18:32:38Z DE $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_GENERIC_MSGDLGG_H_
-#define _WX_GENERIC_MSGDLGG_H_
+#ifndef __MSGDLGH_G__
+#define __MSGDLGH_G__
 
-class WXDLLIMPEXP_FWD_CORE wxSizer;
+#include "wx/defs.h"
+#include "wx/dialog.h"
 
-class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase
+// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO
+// Returns wxYES/NO/OK/CANCEL
+
+extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[];
+
+class WXDLLEXPORT wxGenericMessageDialog: public wxDialog, public wxMessageDialogBase
 {
+DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
+
 public:
-    wxGenericMessageDialog(wxWindow *parent,
-                           const wxString& message,
-                           const wxString& caption = wxMessageBoxCaptionStr,
-                           long style = wxOK|wxCENTRE,
-                           const wxPoint& pos = wxDefaultPosition);
-
-    virtual int ShowModal();
-
-protected:
-    // Creates a message dialog taking any options that have been set after
-    // object creation into account such as custom labels.
-    void DoCreateMsgdialog();
+    wxGenericMessageDialog(wxWindow *parent, const wxString& message,
+        const wxString& caption = wxMessageBoxCaptionStr,
+        long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
     void OnYes(wxCommandEvent& event);
     void OnNo(wxCommandEvent& event);
-    void OnHelp(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
 
-    // can be overridden to provide more contents to the dialog
-    virtual void AddMessageDialogCheckBox(wxSizer *WXUNUSED(sizer)) { }
-    virtual void AddMessageDialogDetails(wxSizer *WXUNUSED(sizer)) { }
-
 private:
-    // Creates and returns a standard button sizer using the style of this
-    // dialog and the custom labels, if any.
-    //
-    // May return NULL on smart phone platforms not using buttons at all.
-    wxSizer *CreateMsgDlgButtonSizer();
-
-    wxPoint m_pos;
-    bool m_created;
-
     DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxGenericMessageDialog)
 };
 
-#endif // _WX_GENERIC_MSGDLGG_H_
+#if (!defined( __WXMSW__ ) && !defined( __WXMAC__) && !defined(__WXPM__) && !defined(__WXCOCOA__)) || defined(__WXUNIVERSAL__)
+#define wxMessageDialog wxGenericMessageDialog
+#endif
+
+#endif // __MSGDLGH_G__
diff --git a/Source/3rd Party/wx/include/wx/generic/notebook.h b/Source/3rd Party/wx/include/wx/generic/notebook.h
index f330ca07e..5b96a204b 100644
--- a/Source/3rd Party/wx/include/wx/generic/notebook.h	
+++ b/Source/3rd Party/wx/include/wx/generic/notebook.h	
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/notebook.h
+// Name:        notebook.h
 // Purpose:     wxNotebook class (a.k.a. property sheet, tabbed dialog)
 // Author:      Julian Smart
 // Modified by:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: notebook.h 41738 2006-10-08 17:37:23Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,9 +22,9 @@
 // ----------------------------------------------------------------------------
 
 // fwd declarations
-class WXDLLIMPEXP_FWD_CORE wxImageList;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxTabView;
+class WXDLLEXPORT wxImageList;
+class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxTabView;
 
 // ----------------------------------------------------------------------------
 // wxNotebook
@@ -56,15 +56,17 @@ public:
 
   // accessors
   // ---------
-  // Find the position of the wxNotebookPage, wxNOT_FOUND if not found.
+  // Find the position of the wxNotebookPage, -1 if not found.
   int FindPagePosition(wxNotebookPage* page) const;
 
     // set the currently selected page, return the index of the previously
-    // selected one (or wxNOT_FOUND on error)
+    // selected one (or -1 on error)
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
   int SetSelection(size_t nPage);
     // cycle thru the tabs
   //  void AdvanceSelection(bool bForward = true);
+    // get the currently selected page
+  int GetSelection() const { return m_nSelection; }
 
     // changes selected page without sending events
   int ChangeSelection(size_t nPage);
@@ -107,13 +109,13 @@ public:
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = false,
-                  int imageId = NO_IMAGE);
+                  int imageId = -1);
 
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
   void OnInternalIdle();
-  void OnSelChange(wxBookCtrlEvent& event);
+  void OnSelChange(wxNotebookEvent& event);
   void OnSetFocus(wxFocusEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
 
@@ -147,6 +149,8 @@ protected:
   // helper functions
   void ChangePage(int nOldSel, int nSel); // change pages
 
+  int m_nSelection;           // the current selection (-1 if none)
+
   wxTabView*   m_tabView;
 
   DECLARE_DYNAMIC_CLASS(wxNotebook)
diff --git a/Source/3rd Party/wx/include/wx/generic/numdlgg.h b/Source/3rd Party/wx/include/wx/generic/numdlgg.h
index 7a51f5a3e..cbebd0918 100644
--- a/Source/3rd Party/wx/include/wx/generic/numdlgg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/numdlgg.h	
@@ -4,7 +4,7 @@
 // Author:      John Labenski
 // Modified by:
 // Created:     07.02.04 (extracted from textdlgg.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: numdlgg.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,7 +28,7 @@
 // wxNumberEntryDialog: a dialog with spin control, [ok] and [cancel] buttons
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxNumberEntryDialog : public wxDialog
+class WXDLLEXPORT wxNumberEntryDialog : public wxDialog
 {
 public:
     wxNumberEntryDialog(wxWindow *parent,
@@ -57,22 +57,22 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxNumberEntryDialog)
-    wxDECLARE_NO_COPY_CLASS(wxNumberEntryDialog);
+    DECLARE_NO_COPY_CLASS(wxNumberEntryDialog)
 };
 
 // ----------------------------------------------------------------------------
 // function to get a number from user
 // ----------------------------------------------------------------------------
 
-WXDLLIMPEXP_CORE long
-    wxGetNumberFromUser(const wxString& message,
-                        const wxString& prompt,
-                        const wxString& caption,
-                        long value = 0,
-                        long min = 0,
-                        long max = 100,
-                        wxWindow *parent = NULL,
-                        const wxPoint& pos = wxDefaultPosition);
+long WXDLLEXPORT
+wxGetNumberFromUser(const wxString& message,
+                    const wxString& prompt,
+                    const wxString& caption,
+                    long value = 0,
+                    long min = 0,
+                    long max = 100,
+                    wxWindow *parent = (wxWindow *)NULL,
+                    const wxPoint& pos = wxDefaultPosition);
 
 #endif // wxUSE_NUMBERDLG
 
diff --git a/Source/3rd Party/wx/include/wx/generic/panelg.h b/Source/3rd Party/wx/include/wx/generic/panelg.h
new file mode 100644
index 000000000..f211a995c
--- /dev/null
+++ b/Source/3rd Party/wx/include/wx/generic/panelg.h	
@@ -0,0 +1,95 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/generic/panelg.h
+// Purpose:     wxPanel: a container for child controls
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: panelg.h 49563 2007-10-31 20:46:21Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GENERIC_PANEL_H_
+#define _WX_GENERIC_PANEL_H_
+
+// ----------------------------------------------------------------------------
+// headers and forward declarations
+// ----------------------------------------------------------------------------
+
+#include "wx/window.h"
+#include "wx/containr.h"
+
+class WXDLLIMPEXP_FWD_CORE wxControlContainer;
+
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
+
+// ----------------------------------------------------------------------------
+// wxPanel contains other controls and implements TAB traversal between them
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxPanel : public wxWindow
+{
+public:
+    wxPanel() { Init(); }
+
+    // Old-style constructor (no default values for coordinates to avoid
+    // ambiguity with the new one)
+    wxPanel(wxWindow *parent,
+            int x, int y, int width, int height,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Init();
+
+        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+    }
+
+    // Constructor
+    wxPanel(wxWindow *parent,
+            wxWindowID winid = wxID_ANY,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+            const wxString& name = wxPanelNameStr)
+    {
+        Init();
+
+        Create(parent, winid, pos, size, style, name);
+    }
+
+    // Pseudo ctor
+    bool Create(wxWindow *parent,
+                wxWindowID winid = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+                const wxString& name = wxPanelNameStr);
+
+    virtual ~wxPanel();
+
+    // implementation from now on
+    // --------------------------
+
+        // calls layout for layout constraints and sizers
+    void OnSize(wxSizeEvent& event);
+
+    virtual void InitDialog();
+
+#ifdef __WXUNIVERSAL__
+    virtual bool IsCanvasWindow() const { return true; }
+#endif
+
+
+    WX_DECLARE_CONTROL_CONTAINER();
+
+protected:
+    // common part of all ctors
+    void Init();
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel)
+    DECLARE_EVENT_TABLE()
+};
+
+#endif
+    // _WX_GENERIC_PANEL_H_
diff --git a/Source/3rd Party/wx/include/wx/generic/private/markuptext.h b/Source/3rd Party/wx/include/wx/generic/private/markuptext.h
deleted file mode 100644
index 146b1a16a..000000000
--- a/Source/3rd Party/wx/include/wx/generic/private/markuptext.h	
+++ /dev/null
@@ -1,78 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/private/markuptext.h
-// Purpose:     Generic wxMarkupText class for managing text with markup.
-// Author:      Vadim Zeitlin
-// Created:     2011-02-21
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_PRIVATE_MARKUPTEXT_H_
-#define _WX_GENERIC_PRIVATE_MARKUPTEXT_H_
-
-#include "wx/defs.h"
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxRect;
-
-// ----------------------------------------------------------------------------
-// wxMarkupText: allows to measure and draw the text containing markup.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMarkupText
-{
-public:
-    // Constants for Render() flags.
-    enum
-    {
-        Render_Default = 0,     // Don't show mnemonics visually.
-        Render_ShowAccels = 1   // Underline mnemonics.
-    };
-
-
-    // Initialize with the given string containing markup (which is supposed to
-    // be valid, the caller must check for it before constructing this object).
-    //
-    // Notice that the usual rules for mnemonics apply to the markup text: if
-    // it contains any '&' characters they must be escaped by doubling them,
-    // otherwise they indicate that the next character is the mnemonic for this
-    // field.
-    //
-    // TODO-MULTILINE-MARKUP: Currently only single line labels are supported,
-    // search for other occurrences of this comment to find the places which
-    // need to be updated to support multiline labels with markup.
-    wxMarkupText(const wxString& markup)
-        : m_markup(markup)
-    {
-    }
-
-    // Default copy ctor, assignment operator and dtor are ok.
-
-    // Update the markup string.
-    //
-    // The same rules for mnemonics as in the ctor apply to this string.
-    void SetMarkup(const wxString& markup) { m_markup = markup; }
-
-
-    // Return the width and height required by the given string and optionally
-    // the height of the visible part above the baseline (i.e. ascent minus
-    // internal leading).
-    //
-    // The font currently selected into the DC is used for measuring (notice
-    // that it is changed by this function but normally -- i.e. if markup is
-    // valid -- restored to its original value when it returns).
-    wxSize Measure(wxDC& dc, int *visibleHeight = NULL) const;
-
-    // Render the markup string into the given DC in the specified rectangle.
-    //
-    // Notice that while the function uses the provided rectangle for alignment
-    // (it centers the text in it), no clipping is done by it so use Measure()
-    // and set the clipping region before rendering if necessary.
-    void Render(wxDC& dc, const wxRect& rect, int flags);
-
-private:
-    wxString m_markup;
-};
-
-#endif // _WX_GENERIC_PRIVATE_MARKUPTEXT_H_
diff --git a/Source/3rd Party/wx/include/wx/generic/prntdlgg.h b/Source/3rd Party/wx/include/wx/generic/prntdlgg.h
index f43b05b88..ef57d47cc 100644
--- a/Source/3rd Party/wx/include/wx/generic/prntdlgg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/prntdlgg.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/prntdlgg.h
+// Name:        prntdlgg.h
 // Purpose:     wxGenericPrintDialog, wxGenericPrintSetupDialog,
 //              wxGenericPageSetupDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: prntdlgg.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,7 +23,6 @@
 #include "wx/printdlg.h"
 #include "wx/listctrl.h"
 
-#include "wx/dc.h"
 #if wxUSE_POSTSCRIPT
     #include "wx/dcps.h"
 #endif
@@ -34,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox;
 class WXDLLIMPEXP_FWD_CORE wxComboBox;
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
 class WXDLLIMPEXP_FWD_CORE wxRadioBox;
-class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogData;
+class WXDLLIMPEXP_FWD_CORE wxPageSetupData;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -78,7 +77,7 @@ enum
 // wxPostScriptNativeData
 //----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPostScriptPrintNativeData: public wxPrintNativeDataBase
+class WXDLLEXPORT wxPostScriptPrintNativeData: public wxPrintNativeDataBase
 {
 public:
     wxPostScriptPrintNativeData();
@@ -137,11 +136,11 @@ private:
 // Windows using PostScript print/preview)
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGenericPrintDialog : public wxPrintDialogBase
+class WXDLLEXPORT wxGenericPrintDialog : public wxPrintDialogBase
 {
 public:
     wxGenericPrintDialog(wxWindow *parent,
-                         wxPrintDialogData* data = NULL);
+                         wxPrintDialogData* data = (wxPrintDialogData*)NULL);
     wxGenericPrintDialog(wxWindow *parent, wxPrintData* data);
 
     virtual ~wxGenericPrintDialog();
@@ -182,7 +181,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
 };
 
-class WXDLLIMPEXP_CORE wxGenericPrintSetupDialog : public wxDialog
+class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog
 {
 public:
     // There are no configuration options for the dialog, so we
@@ -220,7 +219,7 @@ private:
 #endif
     // wxUSE_POSTSCRIPT
 
-class WXDLLIMPEXP_CORE wxGenericPageSetupDialog : public wxPageSetupDialogBase
+class WXDLLEXPORT wxGenericPageSetupDialog : public wxPageSetupDialogBase
 {
 public:
     wxGenericPageSetupDialog(wxWindow *parent = NULL,
diff --git a/Source/3rd Party/wx/include/wx/generic/progdlgg.h b/Source/3rd Party/wx/include/wx/generic/progdlgg.h
index 4a36eb08e..6382d1fc8 100644
--- a/Source/3rd Party/wx/include/wx/generic/progdlgg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/progdlgg.h	
@@ -1,197 +1,132 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/progdlgg.h
-// Purpose:     wxGenericProgressDialog class
+////////////////////////////////////////////////////
+// Name:        progdlgg.h
+// Purpose:     wxProgressDialog class
 // Author:      Karsten Ballueder
-// Modified by: Francesco Montorsi
+// Modified by:
 // Created:     09.05.1999
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: progdlgg.h 50711 2007-12-15 02:57:58Z VZ $
 // Copyright:   (c) Karsten Ballueder
 // Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////
 
 #ifndef __PROGDLGH_G__
 #define __PROGDLGH_G__
 
+#include "wx/defs.h"
+#include "wx/progdlg.h"
+
+#if wxUSE_PROGRESSDLG
+
 #include "wx/dialog.h"
 
 class WXDLLIMPEXP_FWD_CORE wxButton;
-class WXDLLIMPEXP_FWD_CORE wxEventLoop;
 class WXDLLIMPEXP_FWD_CORE wxGauge;
 class WXDLLIMPEXP_FWD_CORE wxStaticText;
-class WXDLLIMPEXP_FWD_CORE wxWindowDisabler;
 
-/*
-    Progress dialog which shows a moving progress bar.
-    Taken from the Mahogany project.
-*/
-class WXDLLIMPEXP_CORE wxGenericProgressDialog : public wxDialog
+/* Progress dialog which shows a moving progress bar.
+    Taken from the Mahogany project.*/
+
+class WXDLLEXPORT wxProgressDialog : public wxDialog
 {
+DECLARE_DYNAMIC_CLASS(wxProgressDialog)
 public:
-    wxGenericProgressDialog();
-    wxGenericProgressDialog(const wxString& title, const wxString& message,
-                            int maximum = 100,
-                            wxWindow *parent = NULL,
-                            int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE);
+   /* Creates and displays dialog, disables event handling for other
+       frames or parent frame to avoid recursion problems.
+       @param title title for window
+       @param message message to display in window
+       @param maximum value for status bar, if <= 0, no bar is shown
+       @param parent window or NULL
+       @param style is the bit mask of wxPD_XXX constants from wx/defs.h
+   */
+   wxProgressDialog(const wxString &title, wxString const &message,
+                    int maximum = 100,
+                    wxWindow *parent = NULL,
+                    int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE);
+   /* Destructor.
+       Re-enables event handling for other windows.
+   */
+   virtual ~wxProgressDialog();
 
-    virtual ~wxGenericProgressDialog();
+   /* Update the status bar to the new value.
+       @param value new value
+       @param newmsg if used, new message to display
+       @returns true if ABORT button has not been pressed
+   */
+   virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
 
-    bool Create(const wxString& title,
-                const wxString& message,
-                int maximum = 100,
-                wxWindow *parent = NULL,
-                int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE);
-
-    virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
+    /* Switches the dialog to use a gauge in indeterminate mode and calls
+       wxGauge::Pulse() to show to the user a bit of progress */
     virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL);
 
-    void Resume();
-
-    int GetValue() const;
-    int GetRange() const;
-    wxString GetMessage() const;
-
-    void SetRange(int maximum);
-
-    // Return whether "Cancel" or "Skip" button was pressed, always return
-    // false if the corresponding button is not shown.
-    bool WasCancelled() const;
-    bool WasSkipped() const;
-
     // Must provide overload to avoid hiding it (and warnings about it)
     virtual void Update() { wxDialog::Update(); }
 
-    virtual bool Show( bool show = true );
+   /* Can be called to continue after the cancel button has been pressed, but
+       the program decided to continue the operation (e.g., user didn't
+       confirm it)
+   */
+   void Resume();
 
-    // This enum is an implementation detail and should not be used
-    // by user code.
-    enum State
+   virtual bool Show( bool show = true );
+
+protected:
+   // callback for optional abort button
+   void OnCancel(wxCommandEvent& event);
+
+   // callback for optional skip button
+   void OnSkip(wxCommandEvent& event);
+
+   // callback to disable "hard" window closing
+   void OnClose(wxCloseEvent& event);
+
+   // must be called to reenable the other windows temporarily disabled while
+   // the dialog was shown
+   void ReenableOtherWindows();
+
+private:
+   // create the label with given text and another one to show the time nearby
+   // as the next windows in the sizer, returns the created control
+   wxStaticText *CreateLabel(const wxString& text, wxSizer *sizer);
+
+    // updates the label message
+   void UpdateMessage(const wxString &newmsg);
+
+   // common part of Update() and Pulse(), returns true if not cancelled
+   bool DoAfterUpdate(bool *skip);
+
+   // shortcuts for enabling buttons
+   void EnableClose();
+   void EnableSkip(bool enable=true);
+   void EnableAbort(bool enable=true);
+   inline void DisableSkip() { EnableSkip(false); }
+   inline void DisableAbort() { EnableAbort(false); }
+
+   // the status bar
+   wxGauge *m_gauge;
+   // the message displayed
+   wxStaticText *m_msg;
+   // displayed elapsed, estimated, remaining time
+   class wxStaticText *m_elapsed,
+                      *m_estimated,
+                      *m_remaining;
+   // time when the dialog was created
+   unsigned long m_timeStart;
+   // time when the dialog was closed or cancelled
+   unsigned long m_timeStop;
+   // time between the moment the dialog was closed/cancelled and resume
+   unsigned long m_break;
+
+   // parent top level window (may be NULL)
+   wxWindow *m_parentTop;
+
+    // continue processing or not (return value for Update())
+    enum
     {
         Uncancelable = -1,   // dialog can't be canceled
         Canceled,            // can be cancelled and, in fact, was
         Continue,            // can be cancelled but wasn't
-        Finished,            // finished, waiting to be removed from screen
-        Dismissed            // was closed by user after finishing
-    };
-
-protected:
-    // Update just the m_maximum field, this is used by public SetRange() but,
-    // unlike it, doesn't update the controls state. This makes it useful for
-    // both this class and its derived classes that don't use m_gauge to
-    // display progress.
-    void SetMaximum(int maximum);
-
-    // Return the labels to use for showing the elapsed/estimated/remaining
-    // times respectively.
-    static wxString GetElapsedLabel() { return wxGetTranslation("Elapsed time:"); }
-    static wxString GetEstimatedLabel() { return wxGetTranslation("Estimated time:"); }
-    static wxString GetRemainingLabel() { return wxGetTranslation("Remaining time:"); }
-
-
-    // Similar to wxWindow::HasFlag() but tests for a presence of a wxPD_XXX
-    // flag in our (separate) flags instead of using m_windowStyle.
-    bool HasPDFlag(int flag) const { return (m_pdStyle & flag) != 0; }
-
-    // Return the progress dialog style. Prefer to use HasPDFlag() if possible.
-    int GetPDStyle() const { return m_pdStyle; }
-    void SetPDStyle(int pdStyle) { m_pdStyle = pdStyle; }
-
-    // Updates estimated times from a given progress bar value and stores the
-    // results in provided arguments.
-    void UpdateTimeEstimates(int value,
-                             unsigned long &elapsedTime,
-                             unsigned long &estimatedTime,
-                             unsigned long &remainingTime);
-
-    // Converts seconds to HH:mm:ss format.
-    static wxString GetFormattedTime(unsigned long timeInSec);
-
-    // callback for optional abort button
-    void OnCancel(wxCommandEvent&);
-
-    // callback for optional skip button
-    void OnSkip(wxCommandEvent&);
-
-    // callback to disable "hard" window closing
-    void OnClose(wxCloseEvent&);
-
-    // called to disable the other windows while this dialog is shown
-    void DisableOtherWindows();
-
-    // must be called to reenable the other windows temporarily disabled while
-    // the dialog was shown
-    void ReenableOtherWindows();
-
-    // Set the top level parent we store from the parent window provided when
-    // creating the dialog.
-    void SetTopParent(wxWindow* parent);
-
-    // return the top level parent window of this dialog (may be NULL)
-    wxWindow *GetTopParent() const { return m_parentTop; }
-
-
-    // continue processing or not (return value for Update())
-    State m_state;
-
-    // the maximum value
-    int m_maximum;
-
-#if defined(__WXMSW__ ) || defined(__WXPM__)
-    // the factor we use to always keep the value in 16 bit range as the native
-    // control only supports ranges from 0 to 65,535
-    size_t m_factor;
-#endif // __WXMSW__
-
-    // time when the dialog was created
-    unsigned long m_timeStart;
-    // time when the dialog was closed or cancelled
-    unsigned long m_timeStop;
-    // time between the moment the dialog was closed/cancelled and resume
-    unsigned long m_break;
-
-private:
-    // update the label to show the given time (in seconds)
-    static void SetTimeLabel(unsigned long val, wxStaticText *label);
-
-    // common part of all ctors
-    void Init();
-
-    // create the label with given text and another one to show the time nearby
-    // as the next windows in the sizer, returns the created control
-    wxStaticText *CreateLabel(const wxString& text, wxSizer *sizer);
-
-    // updates the label message
-    void UpdateMessage(const wxString &newmsg);
-
-    // common part of Update() and Pulse(), returns true if not cancelled
-    bool DoBeforeUpdate(bool *skip);
-
-    // common part of Update() and Pulse()
-    void DoAfterUpdate();
-
-    // shortcuts for enabling buttons
-    void EnableClose();
-    void EnableSkip(bool enable = true);
-    void EnableAbort(bool enable = true);
-    void DisableSkip() { EnableSkip(false); }
-    void DisableAbort() { EnableAbort(false); }
-
-    // the widget displaying current status (may be NULL)
-    wxGauge *m_gauge;
-    // the message displayed
-    wxStaticText *m_msg;
-    // displayed elapsed, estimated, remaining time
-    wxStaticText *m_elapsed,
-                 *m_estimated,
-                 *m_remaining;
-
-    // parent top level window (may be NULL)
-    wxWindow *m_parentTop;
-
-    // Progress dialog styles: this is not the same as m_windowStyle because
-    // wxPD_XXX constants clash with the existing TLW styles so to be sure we
-    // don't have any conflicts we just use a separate variable for storing
-    // them.
-    int m_pdStyle;
+        Finished             // finished, waiting to be removed from screen
+    } m_state;
 
     // skip some portion
     bool m_skip;
@@ -202,29 +137,36 @@ private:
     wxButton *m_btnSkip;
 #endif
 
+    // the maximum value
+    int m_maximum;
+
     // saves the time when elapsed time was updated so there is only one
     // update per second
     unsigned long m_last_timeupdate;
-
     // tells how often a change of the estimated time has to be confirmed
-    // before it is actually displayed - this reduces the frequency of updates
+    // before it is actually displayed - this reduces the frequence of updates
     // of estimated and remaining time
-    int m_delay;
-
+    const int m_delay;
     // counts the confirmations
     int m_ctdelay;
     unsigned long m_display_estimated;
 
+    bool m_hasAbortButton,
+         m_hasSkipButton;
+
+#if defined(__WXMSW__ ) || defined(__WXPM__)
+    // the factor we use to always keep the value in 16 bit range as the native
+    // control only supports ranges from 0 to 65,535
+    size_t m_factor;
+#endif // __WXMSW__
+
     // for wxPD_APP_MODAL case
-    wxWindowDisabler *m_winDisabler;
-
-    // Temporary event loop created by the dialog itself if there is no
-    // currently active loop when it is created.
-    wxEventLoop *m_tempEventLoop;
-
+    class WXDLLIMPEXP_FWD_CORE wxWindowDisabler *m_winDisabler;
 
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxGenericProgressDialog);
+    DECLARE_NO_COPY_CLASS(wxProgressDialog)
 };
 
+#endif // wxUSE_PROGRESSDLG
+
 #endif // __PROGDLGH_G__
diff --git a/Source/3rd Party/wx/include/wx/generic/richmsgdlgg.h b/Source/3rd Party/wx/include/wx/generic/richmsgdlgg.h
deleted file mode 100644
index c39642d88..000000000
--- a/Source/3rd Party/wx/include/wx/generic/richmsgdlgg.h	
+++ /dev/null
@@ -1,49 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/richmsgdlgg.h
-// Purpose:     wxGenericRichMessageDialog
-// Author:      Rickard Westerlund
-// Created:     2010-07-04
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_RICHMSGDLGG_H_
-#define _WX_GENERIC_RICHMSGDLGG_H_
-
-class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-class WXDLLIMPEXP_FWD_CORE wxCollapsiblePane;
-class WXDLLIMPEXP_FWD_CORE wxCollapsiblePaneEvent;
-
-class WXDLLIMPEXP_CORE wxGenericRichMessageDialog
-                        : public wxRichMessageDialogBase
-{
-public:
-    wxGenericRichMessageDialog(wxWindow *parent,
-                               const wxString& message,
-                               const wxString& caption,
-                               long style)
-        : wxRichMessageDialogBase( parent, message, caption, style ),
-          m_checkBox(NULL),
-          m_detailsPane(NULL)
-    { }
-
-    virtual bool IsCheckBoxChecked() const;
-
-protected:
-    wxCheckBox *m_checkBox;
-    wxCollapsiblePane *m_detailsPane;
-
-    // overrides methods in the base class
-    virtual void AddMessageDialogCheckBox(wxSizer *sizer);
-    virtual void AddMessageDialogDetails(wxSizer *sizer);
-
-private:
-    void OnPaneChanged(wxCollapsiblePaneEvent& event);
-
-    DECLARE_EVENT_TABLE()
-
-    wxDECLARE_NO_COPY_CLASS(wxGenericRichMessageDialog);
-};
-
-#endif // _WX_GENERIC_RICHMSGDLGG_H_
diff --git a/Source/3rd Party/wx/include/wx/generic/scrolwin.h b/Source/3rd Party/wx/include/wx/generic/scrolwin.h
index 07e529c1b..b1cea5de7 100644
--- a/Source/3rd Party/wx/include/wx/generic/scrolwin.h	
+++ b/Source/3rd Party/wx/include/wx/generic/scrolwin.h	
@@ -1,10 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/generic/scrolwin.h
-// Purpose:     generic wxScrollHelper
-// Author:      Vadim Zeitlin
-// Created:     2008-12-24 (replacing old file with the same name)
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
+// Purpose:     wxGenericScrolledWindow class
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: scrolwin.h 35875 2005-10-10 18:24:27Z VZ $
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -12,42 +13,15 @@
 #define _WX_GENERIC_SCROLLWIN_H_
 
 // ----------------------------------------------------------------------------
-// generic wxScrollHelper implementation
+// headers and constants
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase
-{
-public:
-    wxScrollHelper(wxWindow *winToScroll);
+#include "wx/window.h"
+#include "wx/panel.h"
 
-    // implement base class pure virtuals
-    virtual void AdjustScrollbars();
-
-protected:
-    virtual void DoScroll(int x, int y);
-    virtual void DoShowScrollbars(wxScrollbarVisibility horz,
-                                  wxScrollbarVisibility vert);
-
-private:
-    // helper of AdjustScrollbars(): does the work for the single scrollbar
-    //
-    // notice that the parameters passed by non-const references are modified
-    // by this function
-    void DoAdjustScrollbar(int orient,
-                           int clientSize,
-                           int virtSize,
-                           int pixelsPerUnit,
-                           int& scrollUnits,
-                           int& scrollPosition,
-                           int& scrollLinesPerPage,
-                           wxScrollbarVisibility visibility);
-
-
-    wxScrollbarVisibility m_xVisibility,
-                          m_yVisibility;
-
-    wxDECLARE_NO_COPY_CLASS(wxScrollHelper);
-};
+// ----------------------------------------------------------------------------
+// wxGenericScrolledWindow
+// ----------------------------------------------------------------------------
 
 #endif // _WX_GENERIC_SCROLLWIN_H_
 
diff --git a/Source/3rd Party/wx/include/wx/generic/spinctlg.h b/Source/3rd Party/wx/include/wx/generic/spinctlg.h
index 2df3e94bc..59a62d6a4 100644
--- a/Source/3rd Party/wx/include/wx/generic/spinctlg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/spinctlg.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     28.10.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: spinctlg.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,248 +22,108 @@
 
 #if wxUSE_SPINBTN
 
-class WXDLLIMPEXP_FWD_CORE wxSpinButton;
-class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-
-class wxSpinCtrlTextGeneric; // wxTextCtrl used for the wxSpinCtrlGenericBase
-
-// The !wxUSE_SPINBTN version's GetValue() function conflicts with the
-// wxTextCtrl's GetValue() and so you have to input a dummy int value.
-#define wxSPINCTRL_GETVALUE_FIX
+class WXDLLEXPORT wxSpinButton;
+class WXDLLEXPORT wxTextCtrl;
 
 // ----------------------------------------------------------------------------
-// wxSpinCtrlGeneric is a combination of wxTextCtrl and wxSpinButton
-//
-// This class manages a double valued generic spinctrl through the DoGet/SetXXX
-// functions that are made public as Get/SetXXX functions for int or double
-// for the wxSpinCtrl and wxSpinCtrlDouble classes respectively to avoid
-// function ambiguity.
+// wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxSpinCtrlBase
+class WXDLLEXPORT wxSpinCtrl : public wxControl
 {
 public:
-    wxSpinCtrlGenericBase() { Init(); }
+    wxSpinCtrl() { Init(); }
+
+    wxSpinCtrl(wxWindow *parent,
+               wxWindowID id = wxID_ANY,
+               const wxString& value = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxSP_ARROW_KEYS,
+               int min = 0, int max = 100, int initial = 0,
+               const wxString& name = wxT("wxSpinCtrl"))
+    {
+        Init();
+        Create(parent, id, value, pos, size, style, min, max, initial, name);
+    }
 
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
-                double min = 0, double max = 100, double initial = 0,
-                double inc = 1,
+                long style = wxSP_ARROW_KEYS,
+                int min = 0, int max = 100, int initial = 0,
                 const wxString& name = wxT("wxSpinCtrl"));
 
-    virtual ~wxSpinCtrlGenericBase();
-
-    // accessors
-    // T GetValue() const
-    // T GetMin() const
-    // T GetMax() const
-    // T GetIncrement() const
-    virtual bool GetSnapToTicks() const { return m_snap_to_ticks; }
-    // unsigned GetDigits() const                   - wxSpinCtrlDouble only
+    virtual ~wxSpinCtrl();
 
     // operations
-    virtual void SetValue(const wxString& text);
-    // void SetValue(T val)
-    // void SetRange(T minVal, T maxVal)
-    // void SetIncrement(T inc)
-    virtual void SetSnapToTicks(bool snap_to_ticks);
-    // void SetDigits(unsigned digits)              - wxSpinCtrlDouble only
-
-    // Select text in the textctrl
+    void SetValue(int val);
+    void SetValue(const wxString& text);
+    void SetRange(int min, int max);
     void SetSelection(long from, long to);
 
+    // accessors
+    int GetValue() const;
+    int GetMin() const;
+    int GetMax() const;
+
     // implementation from now on
 
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = true);
     virtual bool Show(bool show = true);
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip(wxToolTip *tip);
-#endif // wxUSE_TOOLTIPS
+    virtual bool Reparent(wxWindow *newParent);
 
     // get the subcontrols
-    wxTextCtrl   *GetText() const       { return m_textCtrl; }
-    wxSpinButton *GetSpinButton() const { return m_spinButton; }
+    wxTextCtrl *GetText() const { return m_text; }
+    wxSpinButton *GetSpinButton() const { return m_btn; }
 
-    // forwarded events from children windows
-    void OnSpinButton(wxSpinEvent& event);
-    void OnTextLostFocus(wxFocusEvent& event);
-    void OnTextChar(wxKeyEvent& event);
+    // set the value of the text (only)
+    void SetTextValue(int val);
 
-    // this window itself is used only as a container for its sub windows so it
-    // shouldn't accept the focus at all and any attempts to explicitly set
-    // focus to it should give focus to its text constol part
-    virtual bool AcceptsFocus() const { return false; }
-    virtual void SetFocus();
-
-    friend class wxSpinCtrlTextGeneric;
+    // put the numeric value of the string in the text ctrl into val and return
+    // true or return false if the text ctrl doesn't contain a number or if the
+    // number is out of range
+    bool GetTextValue(int *val) const;
 
 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
-#ifdef __WXMSW__
-    // and, for MSW, enabling this window itself
-    virtual void DoEnable(bool enable);
-#endif // __WXMSW__
-
-    // generic double valued functions
-    double DoGetValue() const { return m_value; }
-    bool DoSetValue(double val);
-    void DoSetRange(double min_val, double max_val);
-    void DoSetIncrement(double inc);
-
-    // update our value to reflect the text control contents (if it has been
-    // modified by user, do nothing otherwise)
-    //
-    // can also change the text control if its value is invalid
-    //
-    // return true if our value has changed
-    bool SyncSpinToText();
-
-    // Send the correct event type
-    virtual void DoSendEvent() = 0;
-
-    // check if the value is in range
-    bool InRange(double n) const { return (n >= m_min) && (n <= m_max); }
-
-    // ensure that the value is in range wrapping it round if necessary
-    double AdjustToFitInRange(double value) const;
-
-
-    double m_value;
-    double m_min;
-    double m_max;
-    double m_increment;
-    bool   m_snap_to_ticks;
-    wxString m_format;
-
-    int m_spin_value;
-
-    // the subcontrols
-    wxTextCtrl   *m_textCtrl;
-    wxSpinButton *m_spinButton;
-
-private:
     // common part of all ctors
     void Init();
 
-    DECLARE_EVENT_TABLE()
+private:
+    // the subcontrols
+    wxTextCtrl *m_text;
+    wxSpinButton *m_btn;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 
 #else // !wxUSE_SPINBTN
 
-#define wxSPINCTRL_GETVALUE_FIX int = 1
-
 // ----------------------------------------------------------------------------
 // wxSpinCtrl is just a text control
 // ----------------------------------------------------------------------------
 
 #include "wx/textctrl.h"
 
-class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxTextCtrl
+class WXDLLEXPORT wxSpinCtrl : public wxTextCtrl
 {
 public:
-    wxSpinCtrlGenericBase() : m_value(0), m_min(0), m_max(100),
-                              m_increment(1), m_snap_to_ticks(false),
-                              m_format(wxT("%g")) { }
+    wxSpinCtrl() { Init(); }
 
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxString& value = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
-                double min = 0, double max = 100, double initial = 0,
-                double inc = 1,
-                const wxString& name = wxT("wxSpinCtrl"))
-    {
-        m_min = min;
-        m_max = max;
-        m_value = initial;
-        m_increment = inc;
-
-        bool ok = wxTextCtrl::Create(parent, id, value, pos, size, style,
-                                     wxDefaultValidator, name);
-        DoSetValue(initial);
-
-        return ok;
-    }
-
-    // accessors
-    // T GetValue() const
-    // T GetMin() const
-    // T GetMax() const
-    // T GetIncrement() const
-    virtual bool GetSnapToTicks() const { return m_snap_to_ticks; }
-    // unsigned GetDigits() const                   - wxSpinCtrlDouble only
-
-    // operations
-    virtual void SetValue(const wxString& text) { wxTextCtrl::SetValue(text); }
-    // void SetValue(T val)
-    // void SetRange(T minVal, T maxVal)
-    // void SetIncrement(T inc)
-    virtual void SetSnapToTicks(bool snap_to_ticks)
-        { m_snap_to_ticks = snap_to_ticks; }
-    // void SetDigits(unsigned digits)              - wxSpinCtrlDouble only
-
-    // Select text in the textctrl
-    //void SetSelection(long from, long to);
-
-protected:
-    // generic double valued
-    double DoGetValue() const
-    {
-        double n;
-        if ( (wxSscanf(wxTextCtrl::GetValue(), wxT("%lf"), &n) != 1) )
-            n = INT_MIN;
-
-        return n;
-    }
-
-    bool DoSetValue(double val)
-    {
-        wxTextCtrl::SetValue(wxString::Format(m_format.c_str(), val));
-        return true;
-    }
-    void DoSetRange(double min_val, double max_val)
-    {
-        m_min = min_val;
-        m_max = max_val;
-    }
-    void DoSetIncrement(double inc) { m_increment = inc; } // Note: unused
-
-    double m_value;
-    double m_min;
-    double m_max;
-    double m_increment;
-    bool   m_snap_to_ticks;
-    wxString m_format;
-};
-
-#endif // wxUSE_SPINBTN/!wxUSE_SPINBTN
-
-#if !defined(wxHAS_NATIVE_SPINCTRL)
-
-//-----------------------------------------------------------------------------
-// wxSpinCtrl
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlGenericBase
-{
-public:
-    wxSpinCtrl() {}
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = wxID_ANY,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+               long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
                const wxString& name = wxT("wxSpinCtrl"))
     {
@@ -275,94 +135,49 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
                 const wxString& name = wxT("wxSpinCtrl"))
     {
-        return wxSpinCtrlGenericBase::Create(parent, id, value, pos, size,
-                                             style, min, max, initial, 1, name);
+        SetRange(min, max);
+
+        bool ok = wxTextCtrl::Create(parent, id, value, pos, size, style,
+                                     wxDefaultValidator, name);
+        SetValue(initial);
+
+        return ok;
     }
 
     // accessors
-    int GetValue(wxSPINCTRL_GETVALUE_FIX) const { return int(DoGetValue()); }
-    int GetMin() const { return int(m_min); }
-    int GetMax() const { return int(m_max); }
-    int GetIncrement() const { return int(m_increment); }
+    int GetValue(int WXUNUSED(dummy) = 1) const
+    {
+        int n;
+        if ( (wxSscanf(wxTextCtrl::GetValue(), wxT("%d"), &n) != 1) )
+            n = INT_MIN;
+
+        return n;
+    }
+
+    int GetMin() const { return m_min; }
+    int GetMax() const { return m_max; }
 
     // operations
-    void SetValue(const wxString& value)
-        { wxSpinCtrlGenericBase::SetValue(value); }
-    void SetValue( int value )              { DoSetValue(value); }
-    void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); }
-    void SetIncrement(int inc) { DoSetIncrement(inc); }
+    void SetValue(const wxString& value) { wxTextCtrl::SetValue(value); }
+    void SetValue(int val) { wxString s; s << val; wxTextCtrl::SetValue(s); }
+    void SetRange(int min, int max) { m_min = min; m_max = max; }
 
 protected:
-    virtual void DoSendEvent();
+    // initialize m_min/max with the default values
+    void Init() { SetRange(0, 100); }
 
+    int   m_min;
+    int   m_max;
+
+private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 
-#endif // wxHAS_NATIVE_SPINCTRL
-
-//-----------------------------------------------------------------------------
-// wxSpinCtrlDouble
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlGenericBase
-{
-public:
-    wxSpinCtrlDouble() : m_digits(0) { }
-    wxSpinCtrlDouble(wxWindow *parent,
-                     wxWindowID id = wxID_ANY,
-                     const wxString& value = wxEmptyString,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
-                     double min = 0, double max = 100, double initial = 0,
-                     double inc = 1,
-                     const wxString& name = wxT("wxSpinCtrlDouble"))
-    {
-        m_digits = 0;
-        Create(parent, id, value, pos, size, style,
-               min, max, initial, inc, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxString& value = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
-                double min = 0, double max = 100, double initial = 0,
-                double inc = 1,
-                const wxString& name = wxT("wxSpinCtrlDouble"))
-    {
-        return wxSpinCtrlGenericBase::Create(parent, id, value, pos, size,
-                                             style, min, max, initial,
-                                             inc, name);
-    }
-
-    // accessors
-    double GetValue(wxSPINCTRL_GETVALUE_FIX) const { return DoGetValue(); }
-    double GetMin() const { return m_min; }
-    double GetMax() const { return m_max; }
-    double GetIncrement() const { return m_increment; }
-    unsigned GetDigits() const { return m_digits; }
-
-    // operations
-    void SetValue(const wxString& value)
-        { wxSpinCtrlGenericBase::SetValue(value); }
-    void SetValue(double value)                 { DoSetValue(value); }
-    void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); }
-    void SetIncrement(double inc)               { DoSetIncrement(inc); }
-    void SetDigits(unsigned digits);
-
-protected:
-    virtual void DoSendEvent();
-
-    unsigned m_digits;
-
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
-};
+#endif // wxUSE_SPINBTN/!wxUSE_SPINBTN
 
 #endif // _WX_GENERIC_SPINCTRL_H_
+
diff --git a/Source/3rd Party/wx/include/wx/generic/splitter.h b/Source/3rd Party/wx/include/wx/generic/splitter.h
index d35e32550..14012b1b8 100644
--- a/Source/3rd Party/wx/include/wx/generic/splitter.h	
+++ b/Source/3rd Party/wx/include/wx/generic/splitter.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/splitter.h
+// Name:        wx/splitter.h
 // Purpose:     wxSplitterWindow class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: splitter.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -49,7 +49,7 @@ enum
 //    to prevent flickering. (WS_CLIPCHILDREN doesn't work in all cases so can't be
 //    standard).
 
-class WXDLLIMPEXP_CORE wxSplitterWindow: public wxNavigationEnabled<wxWindow>
+class WXDLLEXPORT wxSplitterWindow: public wxWindow
 {
 public:
 
@@ -119,7 +119,7 @@ public:
 
     // Removes the specified (or second) window from the view
     // Doesn't actually delete the window.
-    bool Unsplit(wxWindow *toRemove = NULL);
+    bool Unsplit(wxWindow *toRemove = (wxWindow *) NULL);
 
     // Replaces one of the windows with another one (neither old nor new
     // parameter should be NULL)
@@ -133,17 +133,14 @@ public:
     // Is the window split?
     bool IsSplit() const { return (m_windowTwo != NULL); }
 
+    // Sets the sash size
+    void SetSashSize(int width) { m_sashSize = width; }
+
     // Sets the border size
     void SetBorderSize(int WXUNUSED(width)) { }
 
-    // Hide or show the sash and test whether it's currently hidden.
-    void SetSashInvisible(bool invisible = true);
-    bool IsSashInvisible() const { return HasFlag(wxSP_NOSASH); }
-
-    // Gets the current sash size which may be 0 if it's hidden and the default
-    // sash size.
+    // Gets the sash size
     int GetSashSize() const;
-    int GetDefaultSashSize() const;
 
     // Gets the border size
     int GetBorderSize() const;
@@ -196,9 +193,6 @@ public:
     // Handles mouse events
     void OnMouseEvent(wxMouseEvent& ev);
 
-    // Aborts dragging mode
-    void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
-
     // Adjusts the panes
     void OnSize(wxSizeEvent& event);
 
@@ -217,14 +211,13 @@ public:
     // Resizes subwindows
     virtual void SizeWindows();
 
+    void SetNeedUpdating(bool needUpdating) { m_needUpdating = needUpdating; }
+    bool GetNeedUpdating() const { return m_needUpdating ; }
+
 #ifdef __WXMAC__
     virtual bool MacClipGrandChildren() const { return true ; }
 #endif
 
-    // Sets the sash size: this doesn't do anything and shouldn't be used at
-    // all any more.
-    wxDEPRECATED_INLINE( void SetSashSize(int WXUNUSED(width)), return; )
-
 protected:
     // event handlers
 #if defined(__WXMSW__) || defined(__WXMAC__)
@@ -282,15 +275,16 @@ protected:
     wxWindow*   m_windowOne;
     wxWindow*   m_windowTwo;
     int         m_dragMode;
-    int         m_oldX;         // current tracker position if not live mode
-    int         m_oldY;         // current tracker position if not live mode
+    int         m_oldX;
+    int         m_oldY;
     int         m_sashPosition; // Number of pixels from left or top
     double      m_sashGravity;
+    int         m_sashSize;
     wxSize      m_lastSize;
     int         m_requestedSashPosition;
     int         m_sashPositionCurrent; // while dragging
-    wxPoint     m_ptStart;      // mouse position when dragging started
-    int         m_sashStart;    // sash position when dragging started
+    int         m_firstX;
+    int         m_firstY;
     int         m_minimumPaneSize;
     wxCursor    m_sashCursorWE;
     wxCursor    m_sashCursorNS;
@@ -300,11 +294,14 @@ protected:
     bool        m_needUpdating:1;
     bool        m_permitUnsplitAlways:1;
     bool        m_isHot:1;
+    bool        m_checkRequestedSashPosition:1;
 
 private:
+    WX_DECLARE_CONTROL_CONTAINER();
+
     DECLARE_DYNAMIC_CLASS(wxSplitterWindow)
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxSplitterWindow);
+    DECLARE_NO_COPY_CLASS(wxSplitterWindow)
 };
 
 // ----------------------------------------------------------------------------
@@ -315,18 +312,16 @@ private:
 // usual wxWin convention, but the three event types have different kind of
 // data associated with them, so the accessors can be only used if the real
 // event type matches with the one for which the accessors make sense
-class WXDLLIMPEXP_CORE wxSplitterEvent : public wxNotifyEvent
+class WXDLLEXPORT wxSplitterEvent : public wxNotifyEvent
 {
 public:
     wxSplitterEvent(wxEventType type = wxEVT_NULL,
-                    wxSplitterWindow *splitter = NULL)
+                    wxSplitterWindow *splitter = (wxSplitterWindow *)NULL)
         : wxNotifyEvent(type)
     {
         SetEventObject(splitter);
         if (splitter) m_id = splitter->GetId();
     }
-    wxSplitterEvent(const wxSplitterEvent& event)
-        : wxNotifyEvent(event), m_data(event.m_data) { }
 
     // SASH_POS_CHANGED methods
 
@@ -371,8 +366,6 @@ public:
         return m_data.pt.y;
     }
 
-    virtual wxEvent *Clone() const { return new wxSplitterEvent(*this); }
-
 private:
     friend class WXDLLIMPEXP_FWD_CORE wxSplitterWindow;
 
@@ -387,13 +380,13 @@ private:
         } pt;               // position of double click for DCLICK event
     } m_data;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSplitterEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSplitterEvent)
 };
 
 typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
 
 #define wxSplitterEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxSplitterEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSplitterEventFunction, &func)
 
 #define wx__DECLARE_SPLITTEREVT(evt, id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_SPLITTER_ ## evt, id, wxSplitterEventHandler(fn))
diff --git a/Source/3rd Party/wx/include/wx/generic/srchctlg.h b/Source/3rd Party/wx/include/wx/generic/srchctlg.h
index 8f515ccfd..8f7a42e52 100644
--- a/Source/3rd Party/wx/include/wx/generic/srchctlg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/srchctlg.h	
@@ -3,7 +3,7 @@
 // Purpose:     generic wxSearchCtrl class
 // Author:      Vince Harron
 // Created:     2006-02-19
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: srchctlg.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   Vince Harron
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@ class WXDLLIMPEXP_FWD_CORE wxSearchTextCtrl;
 // wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase
+class WXDLLEXPORT wxSearchCtrl : public wxSearchCtrlBase
 {
 public:
     // creation
@@ -62,13 +62,18 @@ public:
     virtual void ShowCancelButton( bool show );
     virtual bool IsCancelButtonVisible() const;
 
+#if wxABI_VERSION >= 20802
     // TODO: In 2.9 these should probably be virtual, and declared in the base class...
     void SetDescriptiveText(const wxString& text);
     wxString GetDescriptiveText() const;
+#endif
 
     // accessors
     // ---------
 
+    virtual wxString GetValue() const;
+    virtual void SetValue(const wxString& value);
+
     virtual wxString GetRange(long from, long to) const;
 
     virtual int GetLineLength(long lineNo) const;
@@ -191,7 +196,6 @@ public:
 
     // wxWindow overrides
     virtual bool SetFont(const wxFont& font);
-    virtual bool SetBackgroundColour(const wxColour& colour);
 
     // search control generic only
     void SetSearchBitmap( const wxBitmap& bitmap );
@@ -201,11 +205,7 @@ public:
 #endif // wxUSE_MENUS
 
 protected:
-    virtual void DoSetValue(const wxString& value, int flags);
-    virtual wxString DoGetValue() const;
-
-    virtual bool DoLoadFile(const wxString& file, int fileType);
-    virtual bool DoSaveFile(const wxString& file, int fileType);
+    virtual void DoSetValue(const wxString& value, int flags = 0);
 
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
@@ -236,9 +236,6 @@ protected:
 private:
     friend class wxSearchButton;
 
-    // Implement pure virtual function inherited from wxCompositeWindow.
-    virtual wxWindowList GetCompositeWindowParts() const;
-
 #if wxUSE_MENUS
     void PopupSearchMenu();
 #endif // wxUSE_MENUS
diff --git a/Source/3rd Party/wx/include/wx/generic/statbmpg.h b/Source/3rd Party/wx/include/wx/generic/statbmpg.h
deleted file mode 100644
index f7f645b36..000000000
--- a/Source/3rd Party/wx/include/wx/generic/statbmpg.h	
+++ /dev/null
@@ -1,76 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/statbmpg.h
-// Purpose:     wxGenericStaticBitmap header
-// Author:      Marcin Wojdyr, Stefan Csomor
-// Created:     2008-06-16
-// RCS-ID:      $Id$
-// Copyright:   wxWidgets developers
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_STATBMP_H_
-#define _WX_GENERIC_STATBMP_H_
-
-#include "wx/statbmp.h"
-
-class WXDLLIMPEXP_CORE wxGenericStaticBitmap : public wxStaticBitmapBase
-{
-public:
-    wxGenericStaticBitmap() {}
-    wxGenericStaticBitmap(wxWindow *parent,
-                          wxWindowID id,
-                          const wxBitmap& bitmap,
-                          const wxPoint& pos = wxDefaultPosition,
-                          const wxSize& size = wxDefaultSize,
-                          long style = 0,
-                          const wxString& name = wxStaticBitmapNameStr)
-    {
-            Create(parent, id, bitmap, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxBitmap& bitmap,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxStaticBitmapNameStr);
-
-    virtual void SetBitmap(const wxBitmap& bitmap)
-    {
-        m_bitmap = bitmap;
-        SetInitialSize(GetBitmapSize());
-        Refresh();
-    }
-
-    virtual wxBitmap GetBitmap() const { return m_bitmap; }
-
-    virtual void SetIcon(const wxIcon& icon)
-    {
-        m_bitmap.CopyFromIcon(icon);
-        SetInitialSize(GetBitmapSize());
-        Refresh();
-    }
-
-#if defined(__WXGTK20__) || defined(__WXMAC__)
-    // icons and bitmaps are really the same thing in wxGTK and wxMac
-    wxIcon GetIcon() const  { return (const wxIcon &)m_bitmap; }
-#endif
-
-
-private:
-    wxSize GetBitmapSize()
-    {
-        return m_bitmap.IsOk() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight())
-                             : wxSize(16, 16); // this is completely arbitrary
-    }
-
-    void OnPaint(wxPaintEvent& event);
-
-    wxBitmap m_bitmap;
-
-    DECLARE_DYNAMIC_CLASS(wxGenericStaticBitmap)
-};
-
-
-#endif //_WX_GENERIC_STATBMP_H_
diff --git a/Source/3rd Party/wx/include/wx/generic/statline.h b/Source/3rd Party/wx/include/wx/generic/statline.h
index 170c6626b..4ad6f17fd 100644
--- a/Source/3rd Party/wx/include/wx/generic/statline.h	
+++ b/Source/3rd Party/wx/include/wx/generic/statline.h	
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/statline.h
+// Name:        generic/statline.h
 // Purpose:     a generic wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id$
+// Version:     $Id: statline.h 43874 2006-12-09 14:52:59Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,7 @@ class wxStaticBox;
 // wxStaticLine
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
+class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 {
     DECLARE_DYNAMIC_CLASS(wxStaticLine)
 
diff --git a/Source/3rd Party/wx/include/wx/generic/stattextg.h b/Source/3rd Party/wx/include/wx/generic/stattextg.h
deleted file mode 100644
index 2e82dc2a1..000000000
--- a/Source/3rd Party/wx/include/wx/generic/stattextg.h	
+++ /dev/null
@@ -1,91 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/stattextg.h
-// Purpose:     wxGenericStaticText header
-// Author:      Marcin Wojdyr
-// Created:     2008-06-26
-// Id:          $Id$
-// Copyright:   Marcin Wojdyr
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_STATTEXTG_H_
-#define _WX_GENERIC_STATTEXTG_H_
-
-// prevent it from including the platform-specific wxStaticText declaration as
-// this is not going to compile if it derives from wxGenericStaticText defined
-// below (currently this is only the case in wxUniv but it could also happen
-// with other ports)
-#define wxNO_PORT_STATTEXT_INCLUDE
-#include "wx/stattext.h"
-#undef wxNO_PORT_STATTEXT_INCLUDE
-
-class WXDLLIMPEXP_CORE wxGenericStaticText : public wxStaticTextBase
-{
-public:
-    wxGenericStaticText() { Init(); }
-
-    wxGenericStaticText(wxWindow *parent,
-                 wxWindowID id,
-                 const wxString& label,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = 0,
-                 const wxString& name = wxStaticTextNameStr)
-    {
-        Init();
-
-        Create(parent, id, label, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxStaticTextNameStr);
-
-    virtual ~wxGenericStaticText();
-
-
-    // overridden base class virtual methods
-    virtual void SetLabel(const wxString& label);
-    virtual bool SetFont(const wxFont &font);
-
-protected:
-    virtual wxSize DoGetBestClientSize() const;
-
-    virtual wxString DoGetLabel() const { return m_label; }
-    virtual void DoSetLabel(const wxString& label);
-
-    void DoSetSize(int x, int y, int width, int height, int sizeFlags);
-
-#if wxUSE_MARKUP
-    virtual bool DoSetLabelMarkup(const wxString& markup);
-#endif // wxUSE_MARKUP
-
-private:
-    void Init()
-    {
-#if wxUSE_MARKUP
-        m_markupText = NULL;
-#endif // wxUSE_MARKUP
-    }
-
-    void OnPaint(wxPaintEvent& event);
-
-    void DoDrawLabel(wxDC& dc, const wxRect& rect);
-
-    // These fields are only used if m_markupText == NULL.
-    wxString m_label;
-    int m_mnemonic;
-
-#if wxUSE_MARKUP
-    class wxMarkupText *m_markupText;
-#endif // wxUSE_MARKUP
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericStaticText)
-};
-
-#endif // _WX_GENERIC_STATTEXTG_H_
-
diff --git a/Source/3rd Party/wx/include/wx/generic/statusbr.h b/Source/3rd Party/wx/include/wx/generic/statusbr.h
index 779e487a5..5934a9472 100644
--- a/Source/3rd Party/wx/include/wx/generic/statusbr.h	
+++ b/Source/3rd Party/wx/include/wx/generic/statusbr.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: VZ at 05.02.00 to derive from wxStatusBarBase
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: statusbr.h 41200 2006-09-13 19:10:31Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,18 +19,13 @@
 #include "wx/pen.h"
 #include "wx/arrstr.h"
 
-
-// ----------------------------------------------------------------------------
-// wxStatusBarGeneric
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStatusBarGeneric : public wxStatusBarBase
+class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 public:
     wxStatusBarGeneric() { Init(); }
     wxStatusBarGeneric(wxWindow *parent,
                        wxWindowID winid = wxID_ANY,
-                       long style = wxSTB_DEFAULT_STYLE,
+                       long style = wxST_SIZEGRIP,
                        const wxString& name = wxStatusBarNameStr)
     {
         Init();
@@ -41,75 +36,67 @@ public:
     virtual ~wxStatusBarGeneric();
 
     bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY,
-                long style = wxSTB_DEFAULT_STYLE,
+                long style = wxST_SIZEGRIP,
                 const wxString& name = wxStatusBarNameStr);
 
-    // implement base class methods
+    // Create status line
+    virtual void SetFieldsCount(int number = 1,
+                                const int *widths = (const int *) NULL);
+
+    // Set status line text
+    virtual void SetStatusText(const wxString& text, int number = 0);
+    virtual wxString GetStatusText(int number = 0) const;
+
+    // Set status line widths
     virtual void SetStatusWidths(int n, const int widths_field[]);
+
+    // Get the position and size of the field's internal bounding rectangle
     virtual bool GetFieldRect(int i, wxRect& rect) const;
+
+    // sets the minimal vertical size of the status bar
     virtual void SetMinHeight(int height);
 
     virtual int GetBorderX() const { return m_borderX; }
     virtual int GetBorderY() const { return m_borderY; }
 
+    ////////////////////////////////////////////////////////////////////////
+    // Implementation
 
-    // implementation only (not part of wxStatusBar public API):
+    virtual void DrawFieldText(wxDC& dc, int i);
+    virtual void DrawField(wxDC& dc, int i);
 
-    int GetFieldFromPoint(const wxPoint& point) const;
+    void SetBorderX(int x);
+    void SetBorderY(int y);
 
-protected:
-    virtual void DoUpdateStatusText(int number);
-
-    // event handlers
     void OnPaint(wxPaintEvent& event);
-    void OnSize(wxSizeEvent& event);
 
     void OnLeftDown(wxMouseEvent& event);
     void OnRightDown(wxMouseEvent& event);
 
+    virtual void InitColours();
+
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
 protected:
-
-    virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight);
-    virtual void DrawField(wxDC& dc, int i, int textHeight);
-
-    void SetBorderX(int x);
-    void SetBorderY(int y);
-
-    virtual void InitColours();
-
-    // true if the status bar shows the size grip: for this it must have
-    // wxSTB_SIZEGRIP style and the window it is attached to must be resizable
-    // and not maximized
-    bool ShowsSizeGrip() const;
-
-    // returns the position and the size of the size grip
-    wxRect GetSizeGripRect() const;
-
     // common part of all ctors
     void Init();
 
-    // the last known size, fields widths must be updated whenever it's out of
-    // date
-    wxSize m_lastClientSize;
+    wxArrayString     m_statusStrings;
 
-    // the absolute widths of the status bar panes in pixels
+    // the last known width of the client rect (used to rebuild cache)
+    int               m_lastClientWidth;
+    // the widths of the status bar panes in pixels
     wxArrayInt        m_widthsAbs;
 
     int               m_borderX;
     int               m_borderY;
-
     wxPen             m_mediumShadowPen;
     wxPen             m_hilightPen;
 
     virtual wxSize DoGetBestSize() const;
 
 private:
-    // Update m_lastClientSize and m_widthsAbs from the current size.
-    void DoUpdateFieldWidths();
-
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
 };
diff --git a/Source/3rd Party/wx/include/wx/generic/textdlgg.h b/Source/3rd Party/wx/include/wx/generic/textdlgg.h
index 1b10489ce..fab9a1012 100644
--- a/Source/3rd Party/wx/include/wx/generic/textdlgg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/textdlgg.h	
@@ -1,16 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/generic/textdlgg.h
+// Name:        textdlgg.h
 // Purpose:     wxTextEntryDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: textdlgg.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_TEXTDLGG_H_
-#define _WX_TEXTDLGG_H_
+#ifndef __TEXTDLGH_G__
+#define __TEXTDLGH_G__
 
 #include "wx/defs.h"
 
@@ -20,13 +20,12 @@
 
 #if wxUSE_VALIDATORS
 #include "wx/valtext.h"
-#include "wx/textctrl.h"
 #endif
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxGetTextFromUserPromptStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxGetTextFromUserPromptStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxGetPasswordFromUserPromptStr[];
 
 #define wxTextEntryDialogStyle (wxOK | wxCANCEL | wxCENTRE | wxWS_EX_VALIDATE_RECURSIVELY)
 
@@ -34,7 +33,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxGetPasswordFromUserPromptStr[];
 // wxTextEntryDialog: a dialog with text control, [ok] and [cancel] buttons
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTextEntryDialog : public wxDialog
+class WXDLLEXPORT wxTextEntryDialog : public wxDialog
 {
 public:
     wxTextEntryDialog(wxWindow *parent,
@@ -49,10 +48,7 @@ public:
 
 #if wxUSE_VALIDATORS
     void SetTextValidator( const wxTextValidator& validator );
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( void SetTextValidator( long style ) );
-#endif
-    void SetTextValidator( wxTextValidatorStyle style = wxFILTER_NONE );
+    void SetTextValidator( long style = wxFILTER_NONE );
     wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
 #endif
   // wxUSE_VALIDATORS
@@ -68,14 +64,14 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTextEntryDialog)
-    wxDECLARE_NO_COPY_CLASS(wxTextEntryDialog);
+    DECLARE_NO_COPY_CLASS(wxTextEntryDialog)
 };
 
 // ----------------------------------------------------------------------------
 // wxPasswordEntryDialog: dialog with password control, [ok] and [cancel]
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPasswordEntryDialog : public wxTextEntryDialog
+class WXDLLEXPORT wxPasswordEntryDialog : public wxTextEntryDialog
 {
 public:
     wxPasswordEntryDialog(wxWindow *parent,
@@ -86,31 +82,32 @@ public:
                       const wxPoint& pos = wxDefaultPosition);
 private:
     DECLARE_DYNAMIC_CLASS(wxPasswordEntryDialog)
-    wxDECLARE_NO_COPY_CLASS(wxPasswordEntryDialog);
+    DECLARE_NO_COPY_CLASS(wxPasswordEntryDialog)
 };
 
 // ----------------------------------------------------------------------------
 // function to get a string from user
 // ----------------------------------------------------------------------------
 
-WXDLLIMPEXP_CORE wxString
-    wxGetTextFromUser(const wxString& message,
-                    const wxString& caption = wxGetTextFromUserPromptStr,
-                    const wxString& default_value = wxEmptyString,
-                    wxWindow *parent = NULL,
-                    wxCoord x = wxDefaultCoord,
-                    wxCoord y = wxDefaultCoord,
-                    bool centre = true);
+wxString WXDLLEXPORT
+wxGetTextFromUser(const wxString& message,
+                  const wxString& caption = wxGetTextFromUserPromptStr,
+                  const wxString& default_value = wxEmptyString,
+                  wxWindow *parent = (wxWindow *) NULL,
+                  wxCoord x = wxDefaultCoord,
+                  wxCoord y = wxDefaultCoord,
+                  bool centre = true);
 
-WXDLLIMPEXP_CORE wxString
-    wxGetPasswordFromUser(const wxString& message,
-                        const wxString& caption = wxGetPasswordFromUserPromptStr,
-                        const wxString& default_value = wxEmptyString,
-                        wxWindow *parent = NULL,
-                        wxCoord x = wxDefaultCoord,
-                        wxCoord y = wxDefaultCoord,
-                        bool centre = true);
+wxString WXDLLEXPORT
+wxGetPasswordFromUser(const wxString& message,
+                      const wxString& caption = wxGetPasswordFromUserPromptStr,
+                      const wxString& default_value = wxEmptyString,
+                      wxWindow *parent = (wxWindow *) NULL,
+                      wxCoord x = wxDefaultCoord,
+                      wxCoord y = wxDefaultCoord,
+                      bool centre = true);
 
 #endif
     // wxUSE_TEXTDLG
-#endif // _WX_TEXTDLGG_H_
+#endif
+    // __TEXTDLGH_G__
diff --git a/Source/3rd Party/wx/include/wx/generic/timer.h b/Source/3rd Party/wx/include/wx/generic/timer.h
new file mode 100644
index 000000000..0f52c1b4a
--- /dev/null
+++ b/Source/3rd Party/wx/include/wx/generic/timer.h	
@@ -0,0 +1,45 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        timer.h
+// Purpose:     Generic implementation of wxTimer class
+// Author:      Vaclav Slavik
+// Id:          $Id: timer.h 41020 2006-09-05 20:47:48Z VZ $
+// Copyright:   (c) Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef __WX_TIMER_H__
+#define __WX_TIMER_H__
+
+//-----------------------------------------------------------------------------
+// wxTimer
+//-----------------------------------------------------------------------------
+
+class wxTimerDesc;
+
+class WXDLLEXPORT wxTimer : public wxTimerBase
+{
+public:
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)
+        { Init(); }
+    virtual ~wxTimer();
+
+    virtual bool Start(int millisecs = -1, bool oneShot = false);
+    virtual void Stop();
+
+    virtual bool IsRunning() const;
+
+    // implementation
+    static void NotifyTimers();
+
+protected:
+    void Init();
+
+private:
+    wxTimerDesc *m_desc;
+
+    DECLARE_ABSTRACT_CLASS(wxTimer)
+};
+
+#endif // __WX_TIMER_H__
diff --git a/Source/3rd Party/wx/include/wx/generic/treectlg.h b/Source/3rd Party/wx/include/wx/generic/treectlg.h
index ee4bc39be..818c8a31c 100644
--- a/Source/3rd Party/wx/include/wx/generic/treectlg.h	
+++ b/Source/3rd Party/wx/include/wx/generic/treectlg.h	
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: treectlg.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) 1997,1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 // wxGenericTreeCtrl - the tree control
 // -----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGenericTreeCtrl : public wxTreeCtrlBase,
+class WXDLLEXPORT wxGenericTreeCtrl : public wxTreeCtrlBase,
                                       public wxScrollHelper
 {
 public:
@@ -112,18 +112,8 @@ public:
     // ----------
 
     virtual wxTreeItemId GetRootItem() const { return m_anchor; }
-    virtual wxTreeItemId GetSelection() const
-    {
-        wxASSERT_MSG( !HasFlag(wxTR_MULTIPLE),
-                       wxT("must use GetSelections() with this control") );
-
-        return m_current;
-    }
+    virtual wxTreeItemId GetSelection() const { return m_current; }
     virtual size_t GetSelections(wxArrayTreeItemIds&) const;
-    virtual wxTreeItemId GetFocusedItem() const { return m_current; }
-
-    virtual void ClearFocusedItem();
-    virtual void SetFocusedItem(const wxTreeItemId& item);
 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,
@@ -158,13 +148,12 @@ public:
     virtual void Unselect();
     virtual void UnselectAll();
     virtual void SelectItem(const wxTreeItemId& item, bool select = true);
-    virtual void SelectChildren(const wxTreeItemId& parent);
 
     virtual void EnsureVisible(const wxTreeItemId& item);
     virtual void ScrollTo(const wxTreeItemId& item);
 
     virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
-                          wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl));
+                          wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl));
     virtual wxTextCtrl *GetEditControl() const;
     virtual void EndEditLabel(const wxTreeItemId& item,
                               bool discardChanges = false);
@@ -196,12 +185,29 @@ public:
     void Edit( const wxTreeItemId& item ) { EditLabel(item); }
 #endif // WXWIN_COMPATIBILITY_2_6
 
+#if WXWIN_COMPATIBILITY_2_4
+    // deprecated functions: use Set/GetItemImage directly
+    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
+    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );
+
+    // use the versions taking wxTreeItemIdValue cookies (note that
+    // GetNextChild() is not inside wxDEPRECATED on purpose, as otherwise we
+    // get twice as many warnings without any added benefit: it is always used
+    // with GetFirstChild() anyhow)
+    wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,
+                                             long& cookie) const );
+    wxTreeItemId GetNextChild(const wxTreeItemId& item,
+                              long& cookie) const;
+#endif // WXWIN_COMPATIBILITY_2_4
+
     // implementation only from now on
 
     // overridden base class virtuals
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
 
+    virtual void Freeze();
+    virtual void Thaw();
     virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL);
 
     virtual bool SetFont( const wxFont &font );
@@ -211,7 +217,6 @@ public:
     void OnPaint( wxPaintEvent &event );
     void OnSetFocus( wxFocusEvent &event );
     void OnKillFocus( wxFocusEvent &event );
-    void OnKeyDown( wxKeyEvent &event );
     void OnChar( wxKeyEvent &event );
     void OnMouse( wxMouseEvent &event );
     void OnGetToolTip( wxTreeEvent &event );
@@ -257,19 +262,15 @@ protected:
     bool                 m_lastOnSame;  // last click on the same item as prev
     wxImageList         *m_imageListButtons;
 
+    int                  m_freezeCount;
     int                  m_dragCount;
     wxPoint              m_dragStart;
     wxGenericTreeItem   *m_dropTarget;
     wxCursor             m_oldCursor;  // cursor is changed while dragging
     wxGenericTreeItem   *m_oldSelection;
     wxGenericTreeItem   *m_underMouse; // for visual effects
-
-    enum { NoEffect, BorderEffect, AboveEffect, BelowEffect } m_dndEffect;
-    wxGenericTreeItem   *m_dndEffectItem;
-
     wxTreeTextCtrl      *m_textCtrl;
 
-
     wxTimer             *m_renameTimer;
 
     // incremental search data
@@ -281,9 +282,6 @@ protected:
     // the common part of all ctors
     void Init();
 
-    // overridden wxWindow methods
-    virtual void DoThaw();
-
     // misc helpers
     void SendDeleteEvent(wxGenericTreeItem *itemBeingDeleted);
 
@@ -295,9 +293,6 @@ protected:
                       bool unselect_others = true,
                       bool extended_select = false);
 
-    virtual int DoGetItemState(const wxTreeItemId& item) const;
-    virtual void DoSetItemState(const wxTreeItemId& item, int state);
-
     virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
                                       size_t previous,
                                       const wxString& text,
@@ -326,6 +321,7 @@ protected:
 
     void CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y );
     void CalculatePositions();
+    void CalculateSize( wxGenericTreeItem *item, wxDC &dc );
 
     void RefreshSubtree( wxGenericTreeItem *item );
     void RefreshLine( wxGenericTreeItem *item );
@@ -354,7 +350,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
-    wxDECLARE_NO_COPY_CLASS(wxGenericTreeCtrl);
+    DECLARE_NO_COPY_CLASS(wxGenericTreeCtrl)
 };
 
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
@@ -363,7 +359,7 @@ private:
  * the run-time information.
  */
 
-class WXDLLIMPEXP_CORE wxTreeCtrl: public wxGenericTreeCtrl
+class WXDLLEXPORT wxTreeCtrl: public wxGenericTreeCtrl
 {
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
 
diff --git a/Source/3rd Party/wx/include/wx/geometry.h b/Source/3rd Party/wx/include/wx/geometry.h
index 6b01c4c86..c4e67817f 100644
--- a/Source/3rd Party/wx/include/wx/geometry.h	
+++ b/Source/3rd Party/wx/include/wx/geometry.h	
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     08/05/99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: geometry.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) 1999 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,7 +34,7 @@ enum wxOutCode
     wxOutBottom = 0x04
 };
 
-class WXDLLIMPEXP_CORE wxPoint2DInt
+class WXDLLEXPORT wxPoint2DInt
 {
 public :
     inline wxPoint2DInt();
@@ -88,9 +88,12 @@ inline wxPoint2DInt operator+(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2)
 inline wxPoint2DInt operator-(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2);
 inline wxPoint2DInt operator*(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2);
 inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt);
+inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt);
+inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n);
 inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n);
 inline wxPoint2DInt operator/(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2);
 inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n);
+inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n);
 
 inline wxPoint2DInt::wxPoint2DInt()
 {
@@ -154,7 +157,7 @@ inline wxDouble wxPoint2DInt::GetDistance( const wxPoint2DInt &pt ) const
 
 inline wxDouble wxPoint2DInt::GetDistanceSquare( const wxPoint2DInt &pt ) const
 {
-    return ( (pt.m_x-m_x)*(pt.m_x-m_x) + (pt.m_y-m_y)*(pt.m_y-m_y) );
+    return ( (wxDouble)(pt.m_x-m_x)*(pt.m_x-m_x) + (wxDouble)(pt.m_y-m_y)*(pt.m_y-m_y) );
 }
 
 inline wxInt32 wxPoint2DInt::GetDotProduct( const wxPoint2DInt &vec ) const
@@ -179,11 +182,8 @@ inline wxPoint2DInt wxPoint2DInt::operator-()
 
 inline wxPoint2DInt& wxPoint2DInt::operator=(const wxPoint2DInt& pt)
 {
-    if (this != &pt)
-    {
-        m_x = pt.m_x;
-        m_y = pt.m_y;
-    }
+    m_x = pt.m_x;
+    m_y = pt.m_y;
     return *this;
 }
 
@@ -278,7 +278,7 @@ inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n)
 
 // wxPoint2Ds represent a point or a vector in a 2d coordinate system
 
-class WXDLLIMPEXP_CORE wxPoint2DDouble
+class WXDLLEXPORT wxPoint2DDouble
 {
 public :
     inline wxPoint2DDouble();
@@ -411,11 +411,8 @@ inline wxPoint2DDouble wxPoint2DDouble::operator-()
 
 inline wxPoint2DDouble& wxPoint2DDouble::operator=(const wxPoint2DDouble& pt)
 {
-    if (this != &pt)
-    {
-        m_x = pt.m_x;
-        m_y = pt.m_y;
-    }
+    m_x = pt.m_x;
+    m_y = pt.m_y;
     return *this;
 }
 
@@ -512,7 +509,7 @@ inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n)
 // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if
 // left <= x < right  and top <= m_y < bottom , thus it is a half open interval.
 
-class WXDLLIMPEXP_CORE wxRect2DDouble
+class WXDLLEXPORT wxRect2DDouble
 {
 public:
     wxRect2DDouble()
@@ -531,8 +528,8 @@ public:
     inline wxSize GetSize()
         { return wxSize((int) m_width, (int) m_height); }
 
-    // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their
-        // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately
+    // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their
+        // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately
 
     inline wxDouble GetLeft() const { return m_x; }
     inline void SetLeft( wxDouble n ) { m_width += m_x - n; m_x = n; }
@@ -643,7 +640,7 @@ public:
 // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if
 // left <= x < right  and top <= m_y < bottom , thus it is a half open interval.
 
-class WXDLLIMPEXP_CORE wxRect2DInt
+class WXDLLEXPORT wxRect2DInt
 {
 public:
        wxRect2DInt() { m_x = m_y = m_width = m_height = 0; }
@@ -658,8 +655,8 @@ public:
       inline wxPoint2DInt GetPosition() { return wxPoint2DInt(m_x, m_y); }
        inline wxSize GetSize() { return wxSize(m_width, m_height); }
 
-        // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their
-        // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately
+        // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their
+        // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately
 
       inline wxInt32 GetLeft() const { return m_x; }
        inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; }
diff --git a/Source/3rd Party/wx/include/wx/gifdecod.h b/Source/3rd Party/wx/include/wx/gifdecod.h
index 121a6afdd..3ada1a19d 100644
--- a/Source/3rd Party/wx/include/wx/gifdecod.h	
+++ b/Source/3rd Party/wx/include/wx/gifdecod.h	
@@ -3,7 +3,7 @@
 // Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     3.02
-// CVS-ID:      $Id$
+// CVS-ID:      $Id: gifdecod.h 45563 2007-04-21 18:17:50Z VZ $
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@ enum wxGIFErrorCode
 // wxGIFDecoder class
 // --------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGIFDecoder : public wxAnimationDecoder
+class WXDLLEXPORT wxGIFDecoder : public wxAnimationDecoder
 {
 public:
     // constructor, destructor, etc.
@@ -76,6 +76,7 @@ public:
     void Destroy();
 
     // implementation of wxAnimationDecoder's pure virtuals
+    virtual bool CanRead( wxInputStream& stream ) const;
     virtual bool Load( wxInputStream& stream )
         { return LoadGIF(stream) == wxGIF_OK; }
 
@@ -87,15 +88,6 @@ public:
         { return wxANIMATION_TYPE_GIF; }
 
 private:
-    // wxAnimationDecoder pure virtual
-    virtual bool DoCanRead( wxInputStream& stream ) const;
-        // modifies current stream position (see wxAnimationDecoder::CanRead)
-
-    int getcode(wxInputStream& stream, int bits, int abfin);
-    wxGIFErrorCode dgif(wxInputStream& stream,
-                        GIFImage *img, int interl, int bits);
-
-
     // array of all frames
     wxArrayPtrVoid m_frames;
 
@@ -106,9 +98,13 @@ private:
     unsigned char m_buffer[256];    // buffer for reading
     unsigned char *m_bufp;          // pointer to next byte in buffer
 
-    wxDECLARE_NO_COPY_CLASS(wxGIFDecoder);
+    int getcode(wxInputStream& stream, int bits, int abfin);
+    wxGIFErrorCode dgif(wxInputStream& stream,
+                        GIFImage *img, int interl, int bits);
+
+    DECLARE_NO_COPY_CLASS(wxGIFDecoder)
 };
 
-#endif // wxUSE_STREAMS && wxUSE_GIF
+#endif // wxUSE_STREAM && wxUSE_GIF
 
 #endif // _WX_GIFDECOD_H_
diff --git a/Source/3rd Party/wx/include/wx/graphics.h b/Source/3rd Party/wx/include/wx/graphics.h
index 2b9b74b1e..6d4333bd2 100644
--- a/Source/3rd Party/wx/include/wx/graphics.h	
+++ b/Source/3rd Party/wx/include/wx/graphics.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Stefan Csomor
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: graphics.h 60190 2009-04-16 00:57:35Z KO $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -18,76 +18,18 @@
 
 #include "wx/geometry.h"
 #include "wx/dynarray.h"
-#include "wx/dc.h"
-#include "wx/image.h"
-#include "wx/vector.h"
 
-enum wxAntialiasMode
-{
-    wxANTIALIAS_NONE, // should be 0
-    wxANTIALIAS_DEFAULT
-};
-
-enum wxInterpolationQuality
-{
-    // default interpolation
-    wxINTERPOLATION_DEFAULT,
-    // no interpolation
-    wxINTERPOLATION_NONE, 
-    // fast interpolation, suited for interactivity
-    wxINTERPOLATION_FAST,
-    // better quality
-    wxINTERPOLATION_GOOD,
-    // best quality, not suited for interactivity
-    wxINTERPOLATION_BEST
-};
-
-enum wxCompositionMode
-{
-    // R = Result, S = Source, D = Destination, premultiplied with alpha
-    // Ra, Sa, Da their alpha components
-
-    // classic Porter-Duff compositions
-    // http://keithp.com/~keithp/porterduff/p253-porter.pdf
-
-    wxCOMPOSITION_INVALID = -1, /* indicates invalid/unsupported mode */
-    wxCOMPOSITION_CLEAR, /* R = 0 */
-    wxCOMPOSITION_SOURCE, /* R = S */
-    wxCOMPOSITION_OVER, /* R = S + D*(1 - Sa) */
-    wxCOMPOSITION_IN, /* R = S*Da */
-    wxCOMPOSITION_OUT, /* R = S*(1 - Da) */
-    wxCOMPOSITION_ATOP, /* R = S*Da + D*(1 - Sa) */
-
-    wxCOMPOSITION_DEST, /* R = D, essentially a noop */
-    wxCOMPOSITION_DEST_OVER, /* R = S*(1 - Da) + D */
-    wxCOMPOSITION_DEST_IN, /* R = D*Sa */
-    wxCOMPOSITION_DEST_OUT, /* R = D*(1 - Sa) */
-    wxCOMPOSITION_DEST_ATOP, /* R = S*(1 - Da) + D*Sa */
-    wxCOMPOSITION_XOR, /* R = S*(1 - Da) + D*(1 - Sa) */
-
-    // mathematical compositions
-    wxCOMPOSITION_ADD /* R = S + D */
-};
-
-class WXDLLIMPEXP_FWD_CORE wxWindowDC;
-class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
-#if wxUSE_PRINTING_ARCHITECTURE
-class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
-#endif
-#ifdef __WXMSW__
-#if wxUSE_ENH_METAFILE
-class WXDLLIMPEXP_FWD_CORE wxEnhMetaFileDC;
-#endif
-#endif
-class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsPath;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsFigure;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsRenderer;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsPen;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsBrush;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsFont;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmap;
+class WXDLLIMPEXP_CORE wxWindowDC;
+class WXDLLIMPEXP_CORE wxMemoryDC;
+class WXDLLIMPEXP_CORE wxGraphicsContext;
+class WXDLLIMPEXP_CORE wxGraphicsPath;
+class WXDLLIMPEXP_CORE wxGraphicsMatrix;
+class WXDLLIMPEXP_CORE wxGraphicsFigure;
+class WXDLLIMPEXP_CORE wxGraphicsRenderer;
+class WXDLLIMPEXP_CORE wxGraphicsPen;
+class WXDLLIMPEXP_CORE wxGraphicsBrush;
+class WXDLLIMPEXP_CORE wxGraphicsFont;
+class WXDLLIMPEXP_CORE wxGraphicsBitmap;
 
 /*
  * notes about the graphics context apis
@@ -106,93 +48,164 @@ class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmap;
 // instance from the other instances that were shared - using copy on write semantics
 //
 
-class WXDLLIMPEXP_FWD_CORE wxGraphicsObjectRefData;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsBitmapData;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrixData;
-class WXDLLIMPEXP_FWD_CORE wxGraphicsPathData;
+class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData
+{
+public :
+    wxGraphicsObjectRefData( wxGraphicsRenderer* renderer );
+    wxGraphicsObjectRefData( const wxGraphicsObjectRefData* data );
+    wxGraphicsRenderer* GetRenderer() const ;
+    virtual wxGraphicsObjectRefData* Clone() const ;
+
+protected :
+    wxGraphicsRenderer* m_renderer;
+} ;
 
 class WXDLLIMPEXP_CORE wxGraphicsObject : public wxObject
 {
-public:
-    wxGraphicsObject();
-    wxGraphicsObject( wxGraphicsRenderer* renderer );
-    virtual ~wxGraphicsObject();
+public :
+    wxGraphicsObject() ;
+#if wxABI_VERSION >= 20810
+    wxGraphicsObject( const wxGraphicsObject& other) : wxObject( other ) {}
+    wxGraphicsObject& operator= (const wxGraphicsObject & other) { Ref(other); return *this;}
+#endif
+    wxGraphicsObject( wxGraphicsRenderer* renderer ) ;
+    virtual ~wxGraphicsObject() ;
 
-    bool IsNull() const;
+    bool IsNull() const ;
 
     // returns the renderer that was used to create this instance, or NULL if it has not been initialized yet
-    wxGraphicsRenderer* GetRenderer() const;
-    wxGraphicsObjectRefData* GetGraphicsData() const;
-protected:
+    wxGraphicsRenderer* GetRenderer() const ;
+    wxGraphicsObjectRefData* GetGraphicsData() const ;
+protected :
     virtual wxObjectRefData* CreateRefData() const;
     virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
 
     DECLARE_DYNAMIC_CLASS(wxGraphicsObject)
-};
+} ;
 
 class WXDLLIMPEXP_CORE wxGraphicsPen : public wxGraphicsObject
 {
-public:
+public :
     wxGraphicsPen() {}
+#if wxABI_VERSION >= 20810
+    wxGraphicsPen( const wxGraphicsPen& other) : wxGraphicsObject( other ) {}
+    wxGraphicsPen& operator= (const wxGraphicsPen & other) { Ref(other); return *this;}
+#endif
     virtual ~wxGraphicsPen() {}
-private:
+private :
     DECLARE_DYNAMIC_CLASS(wxGraphicsPen)
-};
+} ;
 
-extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen;
+extern WXDLLEXPORT_DATA(wxGraphicsPen) wxNullGraphicsPen;
 
 class WXDLLIMPEXP_CORE wxGraphicsBrush : public wxGraphicsObject
 {
-public:
+public :
     wxGraphicsBrush() {}
+#if wxABI_VERSION >= 20810
+    wxGraphicsBrush( const wxGraphicsBrush& other) : wxGraphicsObject( other ) {}
+    wxGraphicsBrush& operator= (const wxGraphicsBrush & other) { Ref(other); return *this;}
+#endif
     virtual ~wxGraphicsBrush() {}
-private:
+private :
     DECLARE_DYNAMIC_CLASS(wxGraphicsBrush)
-};
+} ;
 
-extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush;
+extern WXDLLEXPORT_DATA(wxGraphicsBrush) wxNullGraphicsBrush;
 
 class WXDLLIMPEXP_CORE wxGraphicsFont : public wxGraphicsObject
 {
-public:
+public :
     wxGraphicsFont() {}
+#if wxABI_VERSION >= 20810
+    wxGraphicsFont( const wxGraphicsFont& other) : wxGraphicsObject( other ) {}
+    wxGraphicsFont& operator= (const wxGraphicsFont & other) { Ref(other); return *this;}
+#endif
     virtual ~wxGraphicsFont() {}
-private:
+private :
     DECLARE_DYNAMIC_CLASS(wxGraphicsFont)
-};
+} ;
 
-extern WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont;
+extern WXDLLEXPORT_DATA(wxGraphicsFont) wxNullGraphicsFont;
 
 class WXDLLIMPEXP_CORE wxGraphicsBitmap : public wxGraphicsObject
 {
-public:
+public :
     wxGraphicsBitmap() {}
+#if wxABI_VERSION >= 20810
+    wxGraphicsBitmap( const wxGraphicsBitmap& other) : wxGraphicsObject( other ) {}
+    wxGraphicsBitmap& operator= (const wxGraphicsBitmap & other) { Ref(other); return *this;}
+#endif
     virtual ~wxGraphicsBitmap() {}
-
-    // Convert bitmap to wxImage: this is more efficient than converting to
-    // wxBitmap first and then to wxImage and also works without X server
-    // connection under Unix that wxBitmap requires.
-#if wxUSE_IMAGE
-    wxImage ConvertToImage() const;
-#endif // wxUSE_IMAGE
-    
-    void* GetNativeBitmap() const;
-
-    const wxGraphicsBitmapData* GetBitmapData() const
-    { return (const wxGraphicsBitmapData*) GetRefData(); }
-    wxGraphicsBitmapData* GetBitmapData()
-    { return (wxGraphicsBitmapData*) GetRefData(); }
-
-private:
+private :
     DECLARE_DYNAMIC_CLASS(wxGraphicsBitmap)
-};
+} ;
 
-extern WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap;
+extern WXDLLEXPORT_DATA(wxGraphicsBitmap) wxNullGraphicsBitmap;
+
+class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData
+{
+public :
+    wxGraphicsMatrixData( wxGraphicsRenderer* renderer) :
+       wxGraphicsObjectRefData(renderer) {}
+
+       virtual ~wxGraphicsMatrixData() {}
+
+       // concatenates the matrix
+       virtual void Concat( const wxGraphicsMatrixData *t ) = 0;
+
+       // sets the matrix to the respective values
+       virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
+           wxDouble tx=0.0, wxDouble ty=0.0) = 0;
+
+       // gets the component valuess of the matrix
+       virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
+                        wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0;
+
+       // makes this the inverse matrix
+       virtual void Invert() = 0;
+
+       // returns true if the elements of the transformation matrix are equal ?
+       virtual bool IsEqual( const wxGraphicsMatrixData* t) const  = 0;
+
+       // return true if this is the identity matrix
+       virtual bool IsIdentity() const = 0;
+
+       //
+       // transformation
+       //
+
+       // add the translation to this matrix
+       virtual void Translate( wxDouble dx , wxDouble dy ) = 0;
+
+       // add the scale to this matrix
+       virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0;
+
+       // add the rotation to this matrix (radians)
+       virtual void Rotate( wxDouble angle ) = 0;
+
+       //
+       // apply the transforms
+       //
+
+       // applies that matrix to the point
+       virtual void TransformPoint( wxDouble *x, wxDouble *y ) const = 0;
+
+       // applies the matrix except for translations
+       virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const =0;
+
+       // returns the native representation
+       virtual void * GetNativeMatrix() const = 0;
+} ;
 
 class WXDLLIMPEXP_CORE wxGraphicsMatrix : public wxGraphicsObject
 {
-public:
+public :
     wxGraphicsMatrix() {}
+#if wxABI_VERSION >= 20810
+    wxGraphicsMatrix( const wxGraphicsMatrix& other) : wxGraphicsObject( other ) {}
+    wxGraphicsMatrix& operator= (const wxGraphicsMatrix & other) { Ref(other); return *this;}
+#endif
 
     virtual ~wxGraphicsMatrix() {}
 
@@ -249,16 +262,89 @@ public:
     wxGraphicsMatrixData* GetMatrixData()
     { return (wxGraphicsMatrixData*) GetRefData(); }
 
-private:
+private :
     DECLARE_DYNAMIC_CLASS(wxGraphicsMatrix)
-};
+} ;
 
-extern WXDLLIMPEXP_DATA_CORE(wxGraphicsMatrix) wxNullGraphicsMatrix;
+extern WXDLLEXPORT_DATA(wxGraphicsMatrix) wxNullGraphicsMatrix;
+
+class WXDLLIMPEXP_CORE wxGraphicsPathData : public wxGraphicsObjectRefData
+{
+public :
+    wxGraphicsPathData(wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData(renderer) {}
+    virtual ~wxGraphicsPathData() {}
+
+    //
+    // These are the path primitives from which everything else can be constructed
+    //
+
+    // begins a new subpath at (x,y)
+    virtual void MoveToPoint( wxDouble x, wxDouble y ) = 0;
+
+    // adds a straight line from the current point to (x,y)
+    virtual void AddLineToPoint( wxDouble x, wxDouble y ) = 0;
+
+    // adds a cubic Bezier curve from the current point, using two control points and an end point
+    virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) = 0;
+
+    // adds another path
+    virtual void AddPath( const wxGraphicsPathData* path ) =0;
+
+    // closes the current sub-path
+    virtual void CloseSubpath() = 0;
+
+    // gets the last point of the current path, (0,0) if not yet set
+    virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const = 0;
+
+    // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
+    virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) = 0;
+
+    //
+    // These are convenience functions which - if not available natively will be assembled
+    // using the primitives from above
+    //
+
+    // adds a quadratic Bezier curve from the current point, using a control point and an end point
+    virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y );
+
+    // appends a rectangle as a new closed subpath
+    virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+
+    // appends an ellipsis as a new closed subpath fitting the passed rectangle
+    virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r );
+
+    // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
+    virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ;
+
+    // appends an ellipse
+    virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
+
+    // appends a rounded rectangle
+    virtual void AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius);
+
+    // returns the native path
+    virtual void * GetNativePath() const = 0;
+
+    // give the native path returned by GetNativePath() back (there might be some deallocations necessary)
+    virtual void UnGetNativePath(void *p) const= 0;
+
+    // transforms each point of this path by the matrix
+    virtual void Transform( const wxGraphicsMatrixData* matrix ) =0;
+
+    // gets the bounding box enclosing all points (possibly including control points)
+    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const=0;
+
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const=0;
+};
 
 class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject
 {
-public:
+public :
     wxGraphicsPath()  {}
+#if wxABI_VERSION >= 20810
+    wxGraphicsPath( const wxGraphicsPath& other) : wxGraphicsObject( other ) {}
+    wxGraphicsPath& operator= (const wxGraphicsPath & other) { Ref(other); return *this;}
+#endif
     virtual ~wxGraphicsPath() {}
 
     //
@@ -274,21 +360,21 @@ public:
     void AddLineToPoint( const wxPoint2DDouble& p);
 
     // adds a cubic Bezier curve from the current point, using two control points and an end point
-    virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y );
+    virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) ;
     void AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e);
 
     // adds another path
     virtual void AddPath( const wxGraphicsPath& path );
 
     // closes the current sub-path
-    virtual void CloseSubpath();
+    virtual void CloseSubpath() ;
 
     // gets the last point of the current path, (0,0) if not yet set
     virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const;
     wxPoint2DDouble GetCurrentPoint() const;
 
     // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
-    virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise );
+    virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) ;
     void AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise);
 
     //
@@ -306,7 +392,7 @@ public:
     virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r );
 
     // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
-    virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r );
+    virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ;
 
     // appends an ellipse
     virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
@@ -327,97 +413,21 @@ public:
     virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const;
     wxRect2DDouble GetBox()const;
 
-    virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE)const;
-    bool Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle = wxODDEVEN_RULE)const;
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE)const;
+    bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE)const;
 
     const wxGraphicsPathData* GetPathData() const
     { return (const wxGraphicsPathData*) GetRefData(); }
     wxGraphicsPathData* GetPathData()
     { return (wxGraphicsPathData*) GetRefData(); }
 
-private:
+private :
     DECLARE_DYNAMIC_CLASS(wxGraphicsPath)
-};
+} ;
 
-extern WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath;
+extern WXDLLEXPORT_DATA(wxGraphicsPath) wxNullGraphicsPath;
 
 
-// Describes a single gradient stop.
-class wxGraphicsGradientStop
-{
-public:
-    wxGraphicsGradientStop(wxColour col = wxTransparentColour,
-                           float pos = 0.)
-        : m_col(col),
-          m_pos(pos)
-    {
-    }
-
-    // default copy ctor, assignment operator and dtor are ok
-
-    const wxColour& GetColour() const { return m_col; }
-    void SetColour(const wxColour& col) { m_col = col; }
-
-    float GetPosition() const { return m_pos; }
-    void SetPosition(float pos)
-    {
-        wxASSERT_MSG( pos >= 0 && pos <= 1, "invalid gradient stop position" );
-
-        m_pos = pos;
-    }
-
-private:
-    // The colour of this gradient band.
-    wxColour m_col;
-
-    // Its starting position: 0 is the beginning and 1 is the end.
-    float m_pos;
-};
-
-// A collection of gradient stops ordered by their positions (from lowest to
-// highest). The first stop (index 0, position 0.0) is always the starting
-// colour and the last one (index GetCount() - 1, position 1.0) is the end
-// colour.
-class WXDLLIMPEXP_CORE wxGraphicsGradientStops
-{
-public:
-    wxGraphicsGradientStops(wxColour startCol = wxTransparentColour,
-                            wxColour endCol = wxTransparentColour)
-    {
-        // we can't use Add() here as it relies on having start/end stops as
-        // first/last array elements so do it manually
-        m_stops.push_back(wxGraphicsGradientStop(startCol, 0.f));
-        m_stops.push_back(wxGraphicsGradientStop(endCol, 1.f));
-    }
-
-    // default copy ctor, assignment operator and dtor are ok for this class
-
-
-    // Add a stop in correct order.
-    void Add(const wxGraphicsGradientStop& stop);
-    void Add(wxColour col, float pos) { Add(wxGraphicsGradientStop(col, pos)); }
-
-    // Get the number of stops.
-    unsigned GetCount() const { return m_stops.size(); }
-
-    // Return the stop at the given index (which must be valid).
-    wxGraphicsGradientStop Item(unsigned n) const { return m_stops.at(n); }
-
-    // Get/set start and end colours.
-    void SetStartColour(wxColour col)
-        { m_stops[0].SetColour(col); }
-    wxColour GetStartColour() const
-        { return m_stops[0].GetColour(); }
-    void SetEndColour(wxColour col)
-        { m_stops[m_stops.size() - 1].SetColour(col); }
-    wxColour GetEndColour() const
-        { return m_stops[m_stops.size() - 1].GetColour(); }
-
-private:
-    // All the stops stored in ascending order of positions.
-    wxVector<wxGraphicsGradientStop> m_stops;
-};
-
 class WXDLLIMPEXP_CORE wxGraphicsContext : public wxGraphicsObject
 {
 public:
@@ -425,109 +435,49 @@ public:
 
     virtual ~wxGraphicsContext();
 
-    static wxGraphicsContext* Create( const wxWindowDC& dc);
-    static wxGraphicsContext * Create( const wxMemoryDC& dc);
-#if wxUSE_PRINTING_ARCHITECTURE
-    static wxGraphicsContext * Create( const wxPrinterDC& dc);
-#endif
+    static wxGraphicsContext* Create( const wxWindowDC& dc) ;
+
 #ifdef __WXMSW__
-#if wxUSE_ENH_METAFILE
-    static wxGraphicsContext * Create( const wxEnhMetaFileDC& dc);
-#endif
+    static wxGraphicsContext * Create( const wxMemoryDC& dc) ;
 #endif
 
-    static wxGraphicsContext* CreateFromNative( void * context );
+    static wxGraphicsContext* CreateFromNative( void * context ) ;
 
-    static wxGraphicsContext* CreateFromNativeWindow( void * window );
+    static wxGraphicsContext* CreateFromNativeWindow( void * window ) ;
 
-    static wxGraphicsContext* Create( wxWindow* window );
-
-#if wxUSE_IMAGE
-    // Create a context for drawing onto a wxImage. The image life time must be
-    // greater than that of the context itself as when the context is destroyed
-    // it will copy its contents to the specified image.
-    static wxGraphicsContext* Create(wxImage& image);
-#endif // wxUSE_IMAGE
+    static wxGraphicsContext* Create( wxWindow* window ) ;
 
     // create a context that can be used for measuring texts only, no drawing allowed
     static wxGraphicsContext * Create();
 
-    // begin a new document (relevant only for printing / pdf etc) if there is a progress dialog, message will be shown
-    virtual bool StartDoc( const wxString& message );
-
-    // done with that document (relevant only for printing / pdf etc)
-    virtual void EndDoc();
-
-    // opens a new page  (relevant only for printing / pdf etc) with the given size in points
-    // (if both are null the default page size will be used)
-    virtual void StartPage( wxDouble width = 0, wxDouble height = 0 );
-
-    // ends the current page  (relevant only for printing / pdf etc)
-    virtual void EndPage();
-
-    // make sure that the current content of this context is immediately visible
-    virtual void Flush();
-
     wxGraphicsPath CreatePath() const;
 
     virtual wxGraphicsPen CreatePen(const wxPen& pen) const;
 
     virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) const;
 
-    // sets the brush to a linear gradient, starting at (x1,y1) and ending at
-    // (x2,y2) with the given boundary colours or the specified stops
-    wxGraphicsBrush
-    CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                              wxDouble x2, wxDouble y2,
-                              const wxColour& c1, const wxColour& c2) const;
-    wxGraphicsBrush
-    CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                              wxDouble x2, wxDouble y2,
-                              const wxGraphicsGradientStops& stops) const;
+    // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+    virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+        const wxColour&c1, const wxColour&c2) const;
 
-    // sets the brush to a radial gradient originating at (xo,yc) and ending
-    // on a circle around (xc,yc) with the given radius; the colours may be
-    // specified by just the two extremes or the full array of gradient stops
-    wxGraphicsBrush
-    CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                              wxDouble xc, wxDouble yc, wxDouble radius,
-                              const wxColour& oColor, const wxColour& cColor) const;
+    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc)
+    // with radius r and color cColor
+    virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor) const;
 
-    wxGraphicsBrush
-    CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                              wxDouble xc, wxDouble yc, wxDouble radius,
-                              const wxGraphicsGradientStops& stops) const;
-
-    // creates a font
+    // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) const;
-    virtual wxGraphicsFont CreateFont(double sizeInPixels,
-                                      const wxString& facename,
-                                      int flags = wxFONTFLAG_DEFAULT,
-                                      const wxColour& col = *wxBLACK) const;
+    
+#if wxABI_VERSION >= 20809
+    wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) const;
+#endif
 
-    // create a native bitmap representation
-    virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) const;
-#if wxUSE_IMAGE
-    wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) const;
-#endif // wxUSE_IMAGE
-
-    // create a native bitmap representation
-    virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  ) const;
+    //virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  ) const;
 
     // create a 'native' matrix corresponding to these values
     virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
         wxDouble tx=0.0, wxDouble ty=0.0) const;
 
-    wxGraphicsMatrix CreateMatrix( const wxAffineMatrix2DBase& mat ) const
-    {
-        wxMatrix2D mat2D;
-        wxPoint2DDouble tr;
-        mat.Get(&mat2D, &tr);
-
-        return CreateMatrix(mat2D.m_11, mat2D.m_12, mat2D.m_21, mat2D.m_22,
-                            tr.m_x, tr.m_y);
-    }
-
     // push the current state of the context, ie the transformation matrix on a stack
     virtual void PushState() = 0;
 
@@ -541,55 +491,16 @@ public:
     virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
 
     // resets the clipping to original extent
-    virtual void ResetClip() = 0;
+    virtual void ResetClip() = 0 ;
 
     // returns the native context
     virtual void * GetNativeContext() = 0;
 
-    // returns the current shape antialiasing mode
-    virtual wxAntialiasMode GetAntialiasMode() const { return m_antialias; }
+    // returns the current logical function
+    virtual int GetLogicalFunction() const { return m_logicalFunction; }
 
-    // sets the antialiasing mode, returns true if it supported
-    virtual bool SetAntialiasMode(wxAntialiasMode antialias) = 0;
-
-    // returns the current interpolation quality
-    virtual wxInterpolationQuality GetInterpolationQuality() const { return m_interpolation; }
-    
-    // sets the interpolation quality, returns true if it supported
-    virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation) = 0;
-    
-    // returns the current compositing operator
-    virtual wxCompositionMode GetCompositionMode() const { return m_composition; }
-
-    // sets the compositing operator, returns true if it supported
-    virtual bool SetCompositionMode(wxCompositionMode op) = 0;
-
-    // returns the size of the graphics context in device coordinates
-    void GetSize(wxDouble* width, wxDouble* height)
-    {
-        if ( width )
-            *width = m_width;
-        if ( height )
-            *height = m_height;
-    }
-
-    // returns the resolution of the graphics context in device points per inch
-    virtual void GetDPI( wxDouble* dpiX, wxDouble* dpiY);
-
-#if 0
-    // sets the current alpha on this context
-    virtual void SetAlpha( wxDouble alpha );
-
-    // returns the alpha on this context
-    virtual wxDouble GetAlpha() const;
-#endif
-
-    // all rendering is done into a fully transparent temporary context
-    virtual void BeginLayer(wxDouble opacity) = 0;
-
-    // composites back the drawings into the context with the opacity given at
-    // the BeginLayer call
-    virtual void EndLayer() = 0;
+    // sets the current logical function, returns true if it supported
+    virtual bool SetLogicalFunction(int function) ;
 
     //
     // transformation : changes the current transformation matrix CTM of the context
@@ -636,41 +547,35 @@ public:
     virtual void StrokePath( const wxGraphicsPath& path ) = 0;
 
     // fills a path with the current brush
-    virtual void FillPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ) = 0;
+    virtual void FillPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE ) = 0;
 
     // draws a path by first filling and then stroking
-    virtual void DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
+    virtual void DrawPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE );
 
     //
     // text
     //
 
-    void DrawText( const wxString &str, wxDouble x, wxDouble y )
-        { DoDrawText(str, x, y); }
+    virtual void DrawText( const wxString &str, wxDouble x, wxDouble y ) = 0;
 
-    void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle )
-        { DoDrawRotatedText(str, x, y, angle); }
+    virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle );
 
-    void DrawText( const wxString &str, wxDouble x, wxDouble y,
-                   const wxGraphicsBrush& backgroundBrush )
-        { DoDrawFilledText(str, x, y, backgroundBrush); }
-
-    void DrawText( const wxString &str, wxDouble x, wxDouble y,
-                   wxDouble angle, const wxGraphicsBrush& backgroundBrush )
-        { DoDrawRotatedFilledText(str, x, y, angle, backgroundBrush); }
+    virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush ) ;
 
+    virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush );
 
     virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height,
-        wxDouble *descent = NULL, wxDouble *externalLeading = NULL ) const  = 0;
+        wxDouble *descent, wxDouble *externalLeading ) const  = 0;
 
     virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const = 0;
 
     //
     // image support
     //
-
-    virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
-
+#if wxABI_VERSION >= 20809
+    void DrawGraphicsBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+#endif
+    
     virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
 
     virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
@@ -689,9 +594,9 @@ public:
     virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints);
 
     // draws a polygon
-    virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
+    virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxODDEVEN_RULE );
 
-    // draws a rectangle
+    // draws a polygon
     virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
 
     // draws an ellipse
@@ -704,42 +609,16 @@ public:
 
     // helper to determine if a 0.5 offset should be applied for the drawing operation
     virtual bool ShouldOffset() const { return false; }
-    
-    // indicates whether the context should try to offset for pixel boundaries, this only makes sense on 
-    // bitmap devices like screen, by default this is turned off
-    virtual void EnableOffset(bool enable = true);
-    
-    void DisableOffset() { EnableOffset(false); }
-    bool OffsetEnabled() { return m_enableOffset; }
-    
-protected:
-    // These fields must be initialized in the derived class ctors.
-    wxDouble m_width,
-             m_height;
+
+protected :
 
     wxGraphicsPen m_pen;
     wxGraphicsBrush m_brush;
     wxGraphicsFont m_font;
-    wxAntialiasMode m_antialias;
-    wxCompositionMode m_composition;
-    wxInterpolationQuality m_interpolation;
-    bool m_enableOffset;
+    int m_logicalFunction;
 
-protected:
-    // implementations of overloaded public functions: we use different names
-    // for them to avoid the virtual function hiding problems in the derived
-    // classes
-    virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y) = 0;
-    virtual void DoDrawRotatedText(const wxString& str, wxDouble x, wxDouble y,
-                                   wxDouble angle);
-    virtual void DoDrawFilledText(const wxString& str, wxDouble x, wxDouble y,
-                                  const wxGraphicsBrush& backgroundBrush);
-    virtual void DoDrawRotatedFilledText(const wxString& str,
-                                         wxDouble x, wxDouble y,
-                                         wxDouble angle,
-                                         const wxGraphicsBrush& backgroundBrush);
-
-    wxDECLARE_NO_COPY_CLASS(wxGraphicsContext);
+private :
+    DECLARE_NO_COPY_CLASS(wxGraphicsContext)
     DECLARE_ABSTRACT_CLASS(wxGraphicsContext)
 };
 
@@ -751,10 +630,14 @@ protected:
 
 class WXDLLIMPEXP_CORE wxGraphicsFigure : public wxGraphicsObject
 {
-public:
-    wxGraphicsFigure(wxGraphicsRenderer* renderer);
+public :
+    wxGraphicsFigure(wxGraphicsRenderer* renderer) ;
+#if wxABI_VERSION >= 20810
+    wxGraphicsFigure( const wxGraphicsFigure& other) : wxGraphicsObject( other ) {}
+    wxGraphicsFigure& operator= (const wxGraphicsFigure & other) { Ref(other); return *this;}
+#endif
 
-    virtual ~wxGraphicsFigure();
+    virtual ~wxGraphicsFigure() ;
 
     void SetPath( wxGraphicsMatrix* matrix );
 
@@ -769,12 +652,12 @@ public:
     // returns the transformation matrix of this object, may be null if there is no transformation necessary
     wxGraphicsMatrix* GetMatrix() { return m_matrix; }
 
-private:
+private :
     wxGraphicsMatrix* m_matrix;
     wxGraphicsPath* m_path;
 
     DECLARE_DYNAMIC_CLASS(wxGraphicsFigure)
-};
+} ;
 
 #endif
 
@@ -786,37 +669,28 @@ private:
 
 class WXDLLIMPEXP_CORE wxGraphicsRenderer : public wxObject
 {
-public:
+public :
     wxGraphicsRenderer() {}
 
     virtual ~wxGraphicsRenderer() {}
 
     static wxGraphicsRenderer* GetDefaultRenderer();
 
+#if wxABI_VERSION >= 20811
     static wxGraphicsRenderer* GetCairoRenderer();
+#endif
     // Context
 
-    virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0;
-    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0;
-#if wxUSE_PRINTING_ARCHITECTURE
-    virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc) = 0;
-#endif
+    virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0 ;
 #ifdef __WXMSW__
-#if wxUSE_ENH_METAFILE
-    virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc) = 0;
+    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0 ;
 #endif
-#endif
-
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0;
 
     virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0;
 
     virtual wxGraphicsContext * CreateContext( wxWindow* window ) = 0;
 
-#if wxUSE_IMAGE
-    virtual wxGraphicsContext * CreateContextFromImage(wxImage& image) = 0;
-#endif // wxUSE_IMAGE
-
     // create a context that can be used for measuring texts only, no drawing allowed
     virtual wxGraphicsContext * CreateMeasuringContext() = 0;
 
@@ -831,59 +705,31 @@ public:
 
     // Paints
 
-    virtual wxGraphicsPen CreatePen(const wxPen& pen) = 0;
+    virtual wxGraphicsPen CreatePen(const wxPen& pen) = 0 ;
 
-    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) = 0;
+    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) = 0 ;
 
-    // Gradient brush creation functions may not honour all the stops specified
-    // stops and use just its boundary colours (this is currently the case
-    // under OS X)
-    virtual wxGraphicsBrush
-    CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                              wxDouble x2, wxDouble y2,
-                              const wxGraphicsGradientStops& stops) = 0;
+    // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+    virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+        const wxColour&c1, const wxColour&c2) = 0;
 
-    virtual wxGraphicsBrush
-    CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                              wxDouble xc, wxDouble yc,
-                              wxDouble radius,
-                              const wxGraphicsGradientStops& stops) = 0;
+    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc)
+    // with radius r and color cColor
+    virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor) = 0;
 
-    // sets the font
+   // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) = 0;
-    virtual wxGraphicsFont CreateFont(double sizeInPixels,
-                                      const wxString& facename,
-                                      int flags = wxFONTFLAG_DEFAULT,
-                                      const wxColour& col = *wxBLACK) = 0;
 
-    // create a native bitmap representation
-    virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) = 0;
-#if wxUSE_IMAGE
-    virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image) = 0;
-    virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp) = 0;
-#endif // wxUSE_IMAGE
+#if wxABI_VERSION >= 20809
+    wxGraphicsBitmap CreateBitmap( const wxBitmap &bmp );
+#endif
 
-    // create a graphics bitmap from a native bitmap
-    virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap ) = 0;
-
-    // create a subimage from a native image representation
-    virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  ) = 0;
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxGraphicsRenderer);
+private :
+    DECLARE_NO_COPY_CLASS(wxGraphicsRenderer)
     DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer)
-};
+} ;
 
-
-#if wxUSE_IMAGE
-inline
-wxImage wxGraphicsBitmap::ConvertToImage() const
-{
-    wxGraphicsRenderer* renderer = GetRenderer();
-    return renderer ? renderer->CreateImageFromBitmap(*this) : wxNullImage;
-}
-#endif // wxUSE_IMAGE
-
-#endif // wxUSE_GRAPHICS_CONTEXT
+#endif
 
 #endif // _WX_GRAPHICS_H_
diff --git a/Source/3rd Party/wx/include/wx/gsocket.h b/Source/3rd Party/wx/include/wx/gsocket.h
new file mode 100644
index 000000000..83d8ee49b
--- /dev/null
+++ b/Source/3rd Party/wx/include/wx/gsocket.h	
@@ -0,0 +1,184 @@
+/* -------------------------------------------------------------------------
+ * Project:     GSocket (Generic Socket)
+ * Name:        gsocket.h
+ * Author:      Guilhem Lavaux
+ *              Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Purpose:     GSocket include file (system independent)
+ * CVSID:       $Id: gsocket.h 33948 2005-05-04 18:57:50Z JS $
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef __GSOCKET_H
+#define __GSOCKET_H
+
+#ifndef __GSOCKET_STANDALONE__
+#include "wx/defs.h"
+
+#include "wx/dlimpexp.h" /* for WXDLLIMPEXP_NET */
+
+#endif
+
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+
+#include <stddef.h>
+
+/*
+   Including sys/types.h under cygwin results in the warnings about "fd_set
+   having been defined in sys/types.h" when winsock.h is included later and
+   doesn't seem to be necessary anyhow. It's not needed under Mac neither.
+ */
+#if !defined(__WXMAC__) && !defined(__CYGWIN__) && !defined(__WXWINCE__)
+#include <sys/types.h>
+#endif
+
+#ifdef __WXWINCE__
+#include <stdlib.h>
+#endif
+
+class GSocket;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _GAddress GAddress;
+
+typedef enum {
+  GSOCK_NOFAMILY = 0,
+  GSOCK_INET,
+  GSOCK_INET6,
+  GSOCK_UNIX
+} GAddressType;
+
+typedef enum {
+  GSOCK_STREAMED,
+  GSOCK_UNSTREAMED
+} GSocketStream;
+
+typedef enum {
+  GSOCK_NOERROR = 0,
+  GSOCK_INVOP,
+  GSOCK_IOERR,
+  GSOCK_INVADDR,
+  GSOCK_INVSOCK,
+  GSOCK_NOHOST,
+  GSOCK_INVPORT,
+  GSOCK_WOULDBLOCK,
+  GSOCK_TIMEDOUT,
+  GSOCK_MEMERR,
+  GSOCK_OPTERR
+} GSocketError;
+
+/* See below for an explanation on how events work.
+ */
+typedef enum {
+  GSOCK_INPUT  = 0,
+  GSOCK_OUTPUT = 1,
+  GSOCK_CONNECTION = 2,
+  GSOCK_LOST = 3,
+  GSOCK_MAX_EVENT = 4
+} GSocketEvent;
+
+enum {
+  GSOCK_INPUT_FLAG = 1 << GSOCK_INPUT,
+  GSOCK_OUTPUT_FLAG = 1 << GSOCK_OUTPUT,
+  GSOCK_CONNECTION_FLAG = 1 << GSOCK_CONNECTION,
+  GSOCK_LOST_FLAG = 1 << GSOCK_LOST
+};
+
+typedef int GSocketEventFlags;
+
+typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event,
+                                char *cdata);
+
+
+/* Functions tables for internal use by GSocket code: */
+
+/* Actually this is a misnomer now, but reusing this name means I don't
+   have to ifdef app traits or common socket code */
+class GSocketGUIFunctionsTable
+{
+public:
+    // needed since this class declares virtual members
+    virtual ~GSocketGUIFunctionsTable() { }
+    virtual bool OnInit() = 0;
+    virtual void OnExit() = 0;
+    virtual bool CanUseEventLoop() = 0;
+    virtual bool Init_Socket(GSocket *socket) = 0;
+    virtual void Destroy_Socket(GSocket *socket) = 0;
+#ifndef __WINDOWS__
+    virtual void Install_Callback(GSocket *socket, GSocketEvent event) = 0;
+    virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event) = 0;
+#endif
+    virtual void Enable_Events(GSocket *socket) = 0;
+    virtual void Disable_Events(GSocket *socket) = 0;
+};
+
+
+/* Global initializers */
+
+/* Sets GUI functions callbacks. Must be called *before* GSocket_Init
+   if the app uses async sockets. */
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc);
+
+/* GSocket_Init() must be called at the beginning */
+int GSocket_Init(void);
+
+/* GSocket_Cleanup() must be called at the end */
+void GSocket_Cleanup(void);
+
+
+/* Constructors / Destructors */
+
+GSocket *GSocket_new(void);
+
+
+/* GAddress */
+
+GAddress *GAddress_new(void);
+GAddress *GAddress_copy(GAddress *address);
+void GAddress_destroy(GAddress *address);
+
+void GAddress_SetFamily(GAddress *address, GAddressType type);
+GAddressType GAddress_GetFamily(GAddress *address);
+
+/* The use of any of the next functions will set the address family to
+ * the specific one. For example if you use GAddress_INET_SetHostName,
+ * address family will be implicitly set to AF_INET.
+ */
+
+GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname);
+GSocketError GAddress_INET_SetAnyAddress(GAddress *address);
+GSocketError GAddress_INET_SetHostAddress(GAddress *address,
+                                          unsigned long hostaddr);
+GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
+                                       const char *protocol);
+GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port);
+
+GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname,
+                                       size_t sbuf);
+unsigned long GAddress_INET_GetHostAddress(GAddress *address);
+unsigned short GAddress_INET_GetPort(GAddress *address);
+
+/* TODO: Define specific parts (INET6, UNIX) */
+
+GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path);
+GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+# if defined(__WINDOWS__)
+#  include "wx/msw/gsockmsw.h"
+# elif defined(__WXMAC__) && !defined(__DARWIN__)
+#  include "wx/mac/gsockmac.h"
+# else
+#  include "wx/unix/gsockunx.h"
+# endif
+
+#endif    /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+
+#endif    /* __GSOCKET_H */
diff --git a/Source/3rd Party/wx/include/wx/hash.h b/Source/3rd Party/wx/include/wx/hash.h
index bed013171..9937bbe4e 100644
--- a/Source/3rd Party/wx/include/wx/hash.h	
+++ b/Source/3rd Party/wx/include/wx/hash.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: hash.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,12 +13,23 @@
 #define _WX_HASH_H__
 
 #include "wx/defs.h"
-#include "wx/string.h"
 
-#if !wxUSE_STD_CONTAINERS
+#if !wxUSE_STL && WXWIN_COMPATIBILITY_2_4
+    #define wxUSE_OLD_HASH_TABLE 1
+#else
+    #define wxUSE_OLD_HASH_TABLE 0
+#endif
+
+#if !wxUSE_STL
     #include "wx/object.h"
 #else
-    class WXDLLIMPEXP_FWD_BASE wxObject;
+    class WXDLLIMPEXP_BASE wxObject;
+#endif
+#if wxUSE_OLD_HASH_TABLE
+    #include "wx/list.h"
+#endif
+#if WXWIN_COMPATIBILITY_2_4
+    #include "wx/dynarray.h"
 #endif
 
 // the default size of the hash
@@ -31,10 +42,69 @@
  * the list to find the desired item.
 */
 
+// ----------------------------------------------------------------------------
+// this is the base class for object hashes: hash tables which contain
+// pointers to objects
+// ----------------------------------------------------------------------------
+
+#if wxUSE_OLD_HASH_TABLE
+
+class WXDLLIMPEXP_BASE wxHashTableBase : public wxObject
+{
+public:
+    wxHashTableBase();
+
+    void Create(wxKeyType keyType = wxKEY_INTEGER,
+                size_t size = wxHASH_SIZE_DEFAULT);
+    void Destroy();
+
+    size_t GetSize() const { return m_hashSize; }
+    size_t GetCount() const { return m_count; }
+
+    void DeleteContents(bool flag);
+
+protected:
+    // find the node for (key, value)
+    wxNodeBase *GetNode(long key, long value) const;
+
+    // the array of lists in which we store the values for given key hash
+    wxListBase **m_hashTable;
+
+    // the size of m_lists array
+    size_t m_hashSize;
+
+    // the type of indexing we use
+    wxKeyType m_keyType;
+
+    // the total number of elements in the hash
+    size_t m_count;
+
+    // should we delete our data?
+    bool m_deleteContents;
+
+private:
+    // no copy ctor/assignment operator (yet)
+    DECLARE_NO_COPY_CLASS(wxHashTableBase)
+};
+
+#else // if !wxUSE_OLD_HASH_TABLE
+
+#if !defined(wxENUM_KEY_TYPE_DEFINED)
+#define wxENUM_KEY_TYPE_DEFINED
+
+enum wxKeyType
+{
+    wxKEY_NONE,
+    wxKEY_INTEGER,
+    wxKEY_STRING
+};
+
+#endif
+
 union wxHashKeyValue
 {
     long integer;
-    wxString *string;
+    wxChar *string;
 };
 
 // for some compilers (AIX xlC), defining it as friend inside the class is not
@@ -48,12 +118,12 @@ class WXDLLIMPEXP_BASE wxHashTableBase_Node
 public:
     wxHashTableBase_Node( long key, void* value,
                           wxHashTableBase* table );
-    wxHashTableBase_Node( const wxString&  key, void* value,
+    wxHashTableBase_Node( const wxChar* key, void* value,
                           wxHashTableBase* table );
     ~wxHashTableBase_Node();
 
     long GetKeyInteger() const { return m_key.integer; }
-    const wxString& GetKeyString() const { return *m_key.string; }
+    const wxChar* GetKeyString() const { return m_key.string; }
 
     void* GetData() const { return m_value; }
     void SetData( void* data ) { m_value = data; }
@@ -80,7 +150,7 @@ protected:
 };
 
 class WXDLLIMPEXP_BASE wxHashTableBase
-#if !wxUSE_STD_CONTAINERS
+#if !wxUSE_STL
     : public wxObject
 #endif
 {
@@ -101,15 +171,15 @@ public:
 
     void DeleteContents( bool flag ) { m_deleteContents = flag; }
 
-    static long MakeKey(const wxString& string);
+    static long MakeKey(const wxChar *string);
 
 protected:
     void DoPut( long key, long hash, void* data );
-    void DoPut( const wxString&  key, long hash, void* data );
+    void DoPut( const wxChar* key, long hash, void* data );
     void* DoGet( long key, long hash ) const;
-    void* DoGet( const wxString&  key, long hash ) const;
+    void* DoGet( const wxChar* key, long hash ) const;
     void* DoDelete( long key, long hash );
-    void* DoDelete( const wxString&  key, long hash );
+    void* DoDelete( const wxChar* key, long hash );
 
 private:
     // Remove the node from the hash, *only called from
@@ -150,13 +220,96 @@ protected:
     bool m_deleteContents;
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxHashTableBase);
+    DECLARE_NO_COPY_CLASS(wxHashTableBase)
 };
 
+#endif // wxUSE_OLD_HASH_TABLE
+
+#if !wxUSE_STL
+
+#if WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// a hash table which stores longs
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxHashTableLong : public wxObject
+{
+public:
+    wxHashTableLong(size_t size = wxHASH_SIZE_DEFAULT)
+        { Init(size); }
+    virtual ~wxHashTableLong();
+
+    void Create(size_t size = wxHASH_SIZE_DEFAULT);
+    void Destroy();
+
+    size_t GetSize() const { return m_hashSize; }
+    size_t GetCount() const { return m_count; }
+
+    void Put(long key, long value);
+    long Get(long key) const;
+    long Delete(long key);
+
+protected:
+    void Init(size_t size);
+
+private:
+    wxArrayLong **m_values,
+                **m_keys;
+
+    // the size of array above
+    size_t m_hashSize;
+
+    // the total number of elements in the hash
+    size_t m_count;
+
+    // not implemented yet
+    DECLARE_NO_COPY_CLASS(wxHashTableLong)
+};
+
+// ----------------------------------------------------------------------------
+// wxStringHashTable: a hash table which indexes strings with longs
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxStringHashTable : public wxObject
+{
+public:
+    wxStringHashTable(size_t sizeTable = wxHASH_SIZE_DEFAULT);
+    virtual ~wxStringHashTable();
+
+    // add a string associated with this key to the table
+    void Put(long key, const wxString& value);
+
+    // get the string from the key: if not found, an empty string is returned
+    // and the wasFound is set to false if not NULL
+    wxString Get(long key, bool *wasFound = NULL) const;
+
+    // remove the item, returning true if the item was found and deleted
+    bool Delete(long key) const;
+
+    // clean up
+    void Destroy();
+
+private:
+    wxArrayLong **m_keys;
+    wxArrayString **m_values;
+
+    // the size of array above
+    size_t m_hashSize;
+
+    DECLARE_NO_COPY_CLASS(wxStringHashTable)
+};
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
+#endif // !wxUSE_STL
+
 // ----------------------------------------------------------------------------
 // for compatibility only
 // ----------------------------------------------------------------------------
 
+#if !wxUSE_OLD_HASH_TABLE
+
 class WXDLLIMPEXP_BASE wxHashTable_Node : public wxHashTableBase_Node
 {
     friend class WXDLLIMPEXP_FWD_BASE wxHashTable;
@@ -164,7 +317,7 @@ public:
     wxHashTable_Node( long key, void* value,
                       wxHashTableBase* table )
         : wxHashTableBase_Node( key, value, table ) { }
-    wxHashTable_Node( const wxString&  key, void* value,
+    wxHashTable_Node( const wxChar* key, void* value,
                       wxHashTableBase* table )
         : wxHashTableBase_Node( key, value, table ) { }
 
@@ -200,9 +353,9 @@ public:
         { DoPut( value, value, object ); }
     void Put(long lhash, long value, wxObject *object)
         { DoPut( value, lhash, object ); }
-    void Put(const wxString& value, wxObject *object)
+    void Put(const wxChar *value, wxObject *object)
         { DoPut( value, MakeKey( value ), object ); }
-    void Put(long lhash, const wxString& value, wxObject *object)
+    void Put(long lhash, const wxChar *value, wxObject *object)
         { DoPut( value, lhash, object ); }
 
     // key and value are the same
@@ -210,9 +363,9 @@ public:
         { return (wxObject*)DoGet( value, value ); }
     wxObject *Get(long lhash, long value) const
         { return (wxObject*)DoGet( value, lhash ); }
-    wxObject *Get(const wxString& value) const
+    wxObject *Get(const wxChar *value) const
         { return (wxObject*)DoGet( value, MakeKey( value ) ); }
-    wxObject *Get(long lhash, const wxString& value) const
+    wxObject *Get(long lhash, const wxChar *value) const
         { return (wxObject*)DoGet( value, lhash ); }
 
     // Deletes entry and returns data if found
@@ -220,11 +373,16 @@ public:
         { return (wxObject*)DoDelete( key, key ); }
     wxObject *Delete(long lhash, long key)
         { return (wxObject*)DoDelete( key, lhash ); }
-    wxObject *Delete(const wxString& key)
+    wxObject *Delete(const wxChar *key)
         { return (wxObject*)DoDelete( key, MakeKey( key ) ); }
-    wxObject *Delete(long lhash, const wxString& key)
+    wxObject *Delete(long lhash, const wxChar *key)
         { return (wxObject*)DoDelete( key, lhash ); }
 
+    // Construct your own integer key from a string, e.g. in case
+    // you need to combine it with something
+    long MakeKey(const wxChar *string) const
+        { return wxHashTableBase::MakeKey(string); }
+
     // Way of iterating through whole hash table (e.g. to delete everything)
     // Not necessary, of course, if you're only storing pointers to
     // objects maintained separately
@@ -251,6 +409,101 @@ private:
     size_t m_currBucket;
 };
 
+#else // if wxUSE_OLD_HASH_TABLE
+
+class WXDLLIMPEXP_BASE wxHashTable : public wxObject
+{
+public:
+    typedef wxNode Node;
+    typedef wxNode* compatibility_iterator;
+
+    int n;
+    int current_position;
+    wxNode *current_node;
+
+    unsigned int key_type;
+    wxList **hash_table;
+
+    wxHashTable(int the_key_type = wxKEY_INTEGER,
+                int size = wxHASH_SIZE_DEFAULT);
+    virtual ~wxHashTable();
+
+    // copy ctor and assignment operator
+    wxHashTable(const wxHashTable& table) : wxObject()
+        { DoCopy(table); }
+    wxHashTable& operator=(const wxHashTable& table)
+        { Clear(); DoCopy(table); return *this; }
+
+    void DoCopy(const wxHashTable& table);
+
+    void Destroy();
+
+    bool Create(int the_key_type = wxKEY_INTEGER,
+                int size = wxHASH_SIZE_DEFAULT);
+
+    // Note that there are 2 forms of Put, Get.
+    // With a key and a value, the *value* will be checked
+    // when a collision is detected. Otherwise, if there are
+    // 2 items with a different value but the same key,
+    // we'll retrieve the WRONG ONE. So where possible,
+    // supply the required value along with the key.
+    // In fact, the value-only versions make a key, and still store
+    // the value. The use of an explicit key might be required
+    // e.g. when combining several values into one key.
+    // When doing that, it's highly likely we'll get a collision,
+    // e.g. 1 + 2 = 3, 2 + 1 = 3.
+
+    // key and value are NOT necessarily the same
+    void Put(long key, long value, wxObject *object);
+    void Put(long key, const wxChar *value, wxObject *object);
+
+    // key and value are the same
+    void Put(long value, wxObject *object);
+    void Put(const wxChar *value, wxObject *object);
+
+    // key and value not the same
+    wxObject *Get(long key, long value) const;
+    wxObject *Get(long key, const wxChar *value) const;
+
+    // key and value are the same
+    wxObject *Get(long value) const;
+    wxObject *Get(const wxChar *value) const;
+
+    // Deletes entry and returns data if found
+    wxObject *Delete(long key);
+    wxObject *Delete(const wxChar *key);
+
+    wxObject *Delete(long key, int value);
+    wxObject *Delete(long key, const wxChar *value);
+
+    // Construct your own integer key from a string, e.g. in case
+    // you need to combine it with something
+    long MakeKey(const wxChar *string) const;
+
+    // Way of iterating through whole hash table (e.g. to delete everything)
+    // Not necessary, of course, if you're only storing pointers to
+    // objects maintained separately
+
+    void BeginFind();
+    Node* Next();
+
+    void DeleteContents(bool flag);
+    void Clear();
+
+    // Returns number of nodes
+    size_t GetCount() const { return m_count; }
+
+private:
+    size_t m_count;             // number of elements in the hashtable
+    bool m_deleteContents;
+
+    DECLARE_DYNAMIC_CLASS(wxHashTable)
+};
+
+#endif // wxUSE_OLD_HASH_TABLE
+
+#if !wxUSE_OLD_HASH_TABLE
+
 // defines a new type safe hash table which stores the elements of type eltype
 // in lists of class listclass
 #define _WX_DECLARE_HASH(eltype, dummy, hashclass, classexp)                  \
@@ -279,6 +532,69 @@ private:
         DECLARE_NO_COPY_CLASS(hashclass)                                      \
     }
 
+#else // if wxUSE_OLD_HASH_TABLE
+
+#define _WX_DECLARE_HASH(eltype, listclass, hashclass, classexp)               \
+    classexp hashclass : public wxHashTableBase                                \
+    {                                                                          \
+    public:                                                                    \
+        hashclass(wxKeyType keyType = wxKEY_INTEGER,                           \
+                  size_t size = wxHASH_SIZE_DEFAULT)                           \
+            { Create(keyType, size); }                                         \
+                                                                               \
+        virtual ~hashclass() { Destroy(); }                                            \
+                                                                               \
+        void Put(long key, long val, eltype *data) { DoPut(key, val, data); }  \
+        void Put(long key, eltype *data) { DoPut(key, key, data); }            \
+                                                                               \
+        eltype *Get(long key, long value) const                                \
+        {                                                                      \
+            wxNodeBase *node = GetNode(key, value);                            \
+            return node ? ((listclass::Node *)node)->GetData() : (eltype *)0;  \
+        }                                                                      \
+        eltype *Get(long key) const { return Get(key, key); }                  \
+                                                                               \
+        eltype *Delete(long key, long value)                                   \
+        {                                                                      \
+            eltype *data;                                                      \
+                                                                               \
+            wxNodeBase *node = GetNode(key, value);                            \
+            if ( node )                                                        \
+            {                                                                  \
+                data = ((listclass::Node *)node)->GetData();                   \
+                                                                               \
+                delete node;                                                   \
+                m_count--;                                                     \
+            }                                                                  \
+            else                                                               \
+            {                                                                  \
+                data = (eltype *)0;                                            \
+            }                                                                  \
+                                                                               \
+            return data;                                                       \
+        }                                                                      \
+        eltype *Delete(long key) { return Delete(key, key); }                  \
+                                                                               \
+    protected:                                                                 \
+        void DoPut(long key, long value, eltype *data)                         \
+        {                                                                      \
+            size_t slot = (size_t)abs((int)(key % (long)m_hashSize));          \
+                                                                               \
+            if ( !m_hashTable[slot] )                                          \
+            {                                                                  \
+                m_hashTable[slot] = new listclass(m_keyType);                  \
+                if ( m_deleteContents )                                        \
+                    m_hashTable[slot]->DeleteContents(true);                   \
+            }                                                                  \
+                                                                               \
+            ((listclass *)m_hashTable[slot])->Append(value, data);             \
+            m_count++;                                                         \
+        }                                                                      \
+                                                                               \
+        DECLARE_NO_COPY_CLASS(hashclass)                                       \
+    }
+
+#endif // wxUSE_OLD_HASH_TABLE
 
 // this macro is to be used in the user code
 #define WX_DECLARE_HASH(el, list, hash) \
@@ -287,7 +603,7 @@ private:
 // and this one does exactly the same thing but should be used inside the
 // library
 #define WX_DECLARE_EXPORTED_HASH(el, list, hash)  \
-    _WX_DECLARE_HASH(el, list, hash, class WXDLLIMPEXP_CORE)
+    _WX_DECLARE_HASH(el, list, hash, class WXDLLEXPORT)
 
 #define WX_DECLARE_USER_EXPORTED_HASH(el, list, hash, usergoo)  \
     _WX_DECLARE_HASH(el, list, hash, class usergoo)
@@ -310,4 +626,5 @@ private:
         (hash).Clear();                                                      \
     }
 
-#endif // _WX_HASH_H__
+#endif
+    // _WX_HASH_H__
diff --git a/Source/3rd Party/wx/include/wx/hashmap.h b/Source/3rd Party/wx/include/wx/hashmap.h
index 18a939c02..44b081fb3 100644
--- a/Source/3rd Party/wx/include/wx/hashmap.h	
+++ b/Source/3rd Party/wx/include/wx/hashmap.h	
@@ -4,7 +4,7 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     29/01/2002
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: hashmap.h 57388 2008-12-17 09:34:48Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,11 +13,10 @@
 #define _WX_HASHMAP_H_
 
 #include "wx/string.h"
-#include "wx/wxcrt.h"
 
-// In wxUSE_STD_CONTAINERS build we prefer to use the standard hash map class
-// but it can be either in non-standard hash_map header (old g++ and some other
-// STL implementations) or in C++0x standard unordered_map which can in turn be
+// In wxUSE_STL build we prefer to use the standard hash map class but it can
+// be either in non-standard hash_map header (old g++ and some other STL
+// implementations) or in C++0x standard unordered_map which can in turn be
 // available either in std::tr1 or std namespace itself
 //
 // To summarize: if std::unordered_map is available use it, otherwise use tr1
@@ -28,7 +27,7 @@
     #define HAVE_STL_HASH_MAP
 #endif
 
-#if wxUSE_STD_CONTAINERS && \
+#if wxUSE_STL && \
     (defined(HAVE_STD_UNORDERED_MAP) || defined(HAVE_TR1_UNORDERED_MAP))
 
 #if defined(HAVE_STD_UNORDERED_MAP)
@@ -42,7 +41,7 @@
 #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \
     typedef WX_HASH_MAP_NAMESPACE::unordered_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME
 
-#elif wxUSE_STD_CONTAINERS && defined(HAVE_STL_HASH_MAP)
+#elif wxUSE_STL && defined(HAVE_STL_HASH_MAP)
 
 #if defined(HAVE_EXT_HASH_MAP)
     #include <ext/hash_map>
@@ -59,7 +58,7 @@
 #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \
     typedef WX_HASH_MAP_NAMESPACE::hash_map< KEY_T, VALUE_T, HASH_T, KEY_EQ_T > CLASSNAME
 
-#else // !wxUSE_STD_CONTAINERS || no std::{hash,unordered}_map class available
+#else // !wxUSE_STL || no std::{hash,unordered}_map class available
 
 #define wxNEEDS_WX_HASH_MAP
 
@@ -72,12 +71,12 @@ typedef int ptrdiff_t;
 // private
 struct WXDLLIMPEXP_BASE _wxHashTable_NodeBase
 {
-    _wxHashTable_NodeBase() : m_next(NULL) {}
+    _wxHashTable_NodeBase() : m_nxt(0) {}
 
-    _wxHashTable_NodeBase* m_next;
+    _wxHashTable_NodeBase* m_nxt;
 
 // Cannot do this:
-//  wxDECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase);
+//  DECLARE_NO_COPY_CLASS(_wxHashTable_NodeBase)
 // without rewriting the macros, which require a public copy constructor.
 };
 
@@ -98,7 +97,7 @@ protected:
         for( size_t i = 0; i < buckets; ++i )
             if( table[i] )
                 return table[i];
-        return NULL;
+        return 0;
     }
 
     // as static const unsigned prime_count = 31 but works with all compilers
@@ -127,9 +126,7 @@ protected:
     }
 };
 
-#define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T,\
-                               PTROPERATOR, CLASSNAME, CLASSEXP, \
-                               SHOULD_GROW, SHOULD_SHRINK ) \
+#define _WX_DECLARE_HASHTABLE( VALUE_T, KEY_T, HASH_T, KEY_EX_T, KEY_EQ_T, CLASSNAME, CLASSEXP, SHOULD_GROW, SHOULD_SHRINK ) \
 CLASSEXP CLASSNAME : protected _wxHashTableBase2 \
 { \
 public: \
@@ -148,10 +145,11 @@ public: \
     typedef const KEY_T const_key_type; \
     typedef const VALUE_T const_mapped_type; \
 public: \
+    struct Node; \
     typedef KEY_EX_T key_extractor; \
     typedef CLASSNAME Self; \
 protected: \
-    _wxHashTable_NodeBase** m_table; \
+    Node** m_table; \
     size_t m_tableBuckets; \
     size_t m_items; \
     hasher m_hasher; \
@@ -163,15 +161,17 @@ public: \
     public: \
         Node( const value_type& value ) \
             : m_value( value ) {} \
-        Node* next() { return static_cast<Node*>(m_next); } \
+        Node* m_next() { return (Node*)this->m_nxt; } \
  \
         value_type m_value; \
     }; \
  \
+    CLASSEXP Iterator; \
+    friend CLASSEXP Iterator; \
 protected: \
     static void DeleteNode( _wxHashTable_NodeBase* node ) \
     { \
-        delete static_cast<Node*>(node); \
+        delete (Node*)node; \
     } \
 public: \
     /*                  */ \
@@ -183,9 +183,9 @@ public: \
         Node* m_node; \
         Self* m_ht; \
  \
-        Iterator() : m_node(NULL), m_ht(NULL) {} \
+        Iterator() : m_node(0), m_ht(0) {} \
         Iterator( Node* node, const Self* ht ) \
-            : m_node(node), m_ht(const_cast<Self*>(ht)) {} \
+            : m_node(node), m_ht((Self*)ht) {} \
         bool operator ==( const Iterator& it ) const \
             { return m_node == it.m_node; } \
         bool operator !=( const Iterator& it ) const \
@@ -197,18 +197,17 @@ public: \
             for( size_type i = bucket + 1; i < m_ht->m_tableBuckets; ++i ) \
             { \
                 if( m_ht->m_table[i] ) \
-                    return static_cast<Node*>(m_ht->m_table[i]); \
+                    return m_ht->m_table[i]; \
             } \
-            return NULL; \
+            return 0; \
         } \
  \
         void PlusPlus() \
         { \
-            Node* next = m_node->next(); \
+            Node* next = m_node->m_next(); \
             m_node = next ? next : GetNextNode(); \
         } \
     }; \
-    friend class Iterator; \
  \
 public: \
     CLASSEXP iterator : public Iterator \
@@ -219,7 +218,7 @@ public: \
         iterator& operator++() { PlusPlus(); return *this; } \
         iterator operator++(int) { iterator it=*this;PlusPlus();return it; } \
         reference operator *() const { return m_node->m_value; } \
-        PTROPERATOR(pointer) \
+        pointer operator ->() const { return &(m_node->m_value); } \
     }; \
  \
     CLASSEXP const_iterator : public Iterator \
@@ -228,11 +227,11 @@ public: \
         const_iterator() : Iterator() {} \
         const_iterator(iterator i) : Iterator(i) {} \
         const_iterator( Node* node, const Self* ht ) \
-            : Iterator(node, const_cast<Self*>(ht)) {} \
+            : Iterator( node, (Self*)ht ) {} \
         const_iterator& operator++() { PlusPlus();return *this; } \
         const_iterator operator++(int) { const_iterator it=*this;PlusPlus();return it; } \
         const_reference operator *() const { return m_node->m_value; } \
-        PTROPERATOR(const_pointer) \
+        const_pointer operator ->() const { return &(m_node->m_value); } \
     }; \
  \
     CLASSNAME( size_type sz = 10, const hasher& hfun = hasher(), \
@@ -244,11 +243,11 @@ public: \
           m_equals( k_eq ), \
           m_getKey( k_ex ) \
     { \
-        m_table = (_wxHashTable_NodeBase**)AllocTable(m_tableBuckets); \
+        m_table = (Node**)AllocTable( m_tableBuckets ); \
     } \
  \
     CLASSNAME( const Self& ht ) \
-        : m_table(NULL), \
+        : m_table( 0 ), \
           m_tableBuckets( 0 ), \
           m_items( ht.m_items ), \
           m_hasher( ht.m_hasher ), \
@@ -260,15 +259,12 @@ public: \
  \
     const Self& operator=( const Self& ht ) \
     { \
-         if (&ht != this) \
-         { \
-             clear(); \
-             m_hasher = ht.m_hasher; \
-             m_equals = ht.m_equals; \
-             m_getKey = ht.m_getKey; \
-             m_items = ht.m_items; \
-             HashCopy( ht ); \
-         } \
+         clear(); \
+         m_hasher = ht.m_hasher; \
+         m_equals = ht.m_equals; \
+         m_getKey = ht.m_getKey; \
+         m_items = ht.m_items; \
+         HashCopy( ht ); \
          return *this; \
     } \
  \
@@ -286,7 +282,8 @@ public: \
     /* shrink it ( perhaps it should ) */ \
     void clear() \
     { \
-        DeleteNodes(m_tableBuckets, m_table, DeleteNode); \
+        DeleteNodes( m_tableBuckets, (_wxHashTable_NodeBase**)m_table, \
+                     DeleteNode ); \
         m_items = 0; \
     } \
  \
@@ -294,23 +291,23 @@ public: \
     size_type max_size() const { return size_type(-1); } \
     bool empty() const { return size() == 0; } \
  \
-    const_iterator end() const { return const_iterator(NULL, this); } \
-    iterator end() { return iterator(NULL, this); } \
+    const_iterator end() const { return const_iterator( 0, this ); } \
+    iterator end() { return iterator( 0, this ); } \
     const_iterator begin() const \
-        { return const_iterator(static_cast<Node*>(GetFirstNode(m_tableBuckets, m_table)), this); } \
+        { return const_iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \
     iterator begin() \
-        { return iterator(static_cast<Node*>(GetFirstNode(m_tableBuckets, m_table)), this); } \
+        { return iterator( (Node*)GetFirstNode( m_tableBuckets, (_wxHashTable_NodeBase**)m_table ), this ); } \
  \
     size_type erase( const const_key_type& key ) \
     { \
-        _wxHashTable_NodeBase** node = GetNodePtr(key); \
+        Node** node = GetNodePtr( key ); \
  \
         if( !node ) \
             return 0; \
  \
         --m_items; \
-        _wxHashTable_NodeBase* temp = (*node)->m_next; \
-        delete static_cast<Node*>(*node); \
+        Node* temp = (*node)->m_next(); \
+        delete *node; \
         (*node) = temp; \
         if( SHOULD_SHRINK( m_tableBuckets, m_items ) ) \
             ResizeTable( GetPreviousPrime( (unsigned long) m_tableBuckets ) - 1 ); \
@@ -329,7 +326,7 @@ protected: \
     { \
         const const_key_type& key = m_getKey( value ); \
         size_t bucket = m_hasher( key ) % m_tableBuckets; \
-        Node* node = static_cast<Node*>(m_table[bucket]); \
+        Node* node = m_table[bucket]; \
  \
         while( node ) \
         { \
@@ -338,7 +335,7 @@ protected: \
                 created = false; \
                 return node; \
             } \
-            node = node->next(); \
+            node = node->m_next(); \
         } \
         created = true; \
         return CreateNode( value, bucket); \
@@ -346,7 +343,7 @@ protected: \
     Node * CreateNode( const value_type& value, size_t bucket ) \
     {\
         Node* node = new Node( value ); \
-        node->m_next = m_table[bucket]; \
+        node->m_nxt = m_table[bucket]; \
         m_table[bucket] = node; \
  \
         /* must be after the node is inserted */ \
@@ -362,16 +359,17 @@ protected: \
     }\
  \
     /* returns NULL if not found */ \
-    _wxHashTable_NodeBase** GetNodePtr(const const_key_type& key) const \
+    Node** GetNodePtr( const const_key_type& key ) const \
     { \
         size_t bucket = m_hasher( key ) % m_tableBuckets; \
-        _wxHashTable_NodeBase** node = &m_table[bucket]; \
+        Node** node = &m_table[bucket]; \
  \
         while( *node ) \
         { \
-            if (m_equals(m_getKey(static_cast<Node*>(*node)->m_value), key)) \
+            if( m_equals( m_getKey( (*node)->m_value ), key ) ) \
                 return node; \
-            node = &(*node)->m_next; \
+            /* Tell the compiler to not do any strict-aliasing assumptions with a void cast? Can we make such a runtime guarantee? */ \
+            node = (Node**)&(*node)->m_nxt; \
         } \
  \
         return NULL; \
@@ -382,28 +380,28 @@ protected: \
     Node* GetNode( const const_key_type& key ) const \
     { \
         size_t bucket = m_hasher( key ) % m_tableBuckets; \
-        Node* node = static_cast<Node*>(m_table[bucket]); \
+        Node* node = m_table[bucket]; \
  \
         while( node ) \
         { \
             if( m_equals( m_getKey( node->m_value ), key ) ) \
                 return node; \
-            node = node->next(); \
+            node = node->m_next(); \
         } \
  \
-        return NULL; \
+        return 0; \
     } \
  \
     void ResizeTable( size_t newSize ) \
     { \
         newSize = GetNextPrime( (unsigned long)newSize ); \
-        _wxHashTable_NodeBase** srcTable = m_table; \
+        Node** srcTable = m_table; \
         size_t srcBuckets = m_tableBuckets; \
-        m_table = (_wxHashTable_NodeBase**)AllocTable( newSize ); \
+        m_table = (Node**)AllocTable( newSize ); \
         m_tableBuckets = newSize; \
  \
-        CopyHashTable( srcTable, srcBuckets, \
-                       this, m_table, \
+        CopyHashTable( (_wxHashTable_NodeBase**)srcTable, srcBuckets, \
+                       this, (_wxHashTable_NodeBase**)m_table, \
                        (BucketFromNode)GetBucketForNode,\
                        (ProcessNode)&DummyProcessNode ); \
         FreeTable(srcTable); \
@@ -413,9 +411,9 @@ protected: \
     void HashCopy( const Self& ht ) \
     { \
         ResizeTable( ht.size() ); \
-        CopyHashTable( ht.m_table, ht.m_tableBuckets, \
+        CopyHashTable( (_wxHashTable_NodeBase**)ht.m_table, ht.m_tableBuckets,\
                        (_wxHashTableBase2*)this, \
-                       m_table, \
+                       (_wxHashTable_NodeBase**)m_table, \
                        (BucketFromNode)GetBucketForNode, \
                        (ProcessNode)CopyNode ); \
     } \
@@ -427,15 +425,12 @@ protected: \
 CLASSEXP CLASSNAME \
 { \
 public: \
-    typedef KEY_T first_type; \
-    typedef VALUE_T second_type; \
     typedef KEY_T t1; \
     typedef VALUE_T t2; \
     typedef const KEY_T const_t1; \
     typedef const VALUE_T const_t2; \
  \
-    CLASSNAME(const const_t1& f, const const_t2& s) \
-        : first(const_cast<t1&>(f)), second(const_cast<t2&>(s)) {} \
+    CLASSNAME( const const_t1& f, const const_t2& s ):first(t1(f)),second(t2(s)) {} \
  \
     t1 first; \
     t2 second; \
@@ -467,7 +462,7 @@ inline bool never_grow( size_t, size_t ) { return false; }
 inline bool never_shrink( size_t, size_t ) { return false; }
 inline bool grow_lf70( size_t buckets, size_t items )
 {
-    return float(items)/float(buckets) >= 0.85f;
+    return float(items)/float(buckets) >= 0.85;
 }
 
 #endif // various hash map implementations
@@ -492,7 +487,7 @@ class WXDLLIMPEXP_BASE wxIntegerHash
     WX_HASH_MAP_NAMESPACE::hash<short> shortHash;
     WX_HASH_MAP_NAMESPACE::hash<unsigned short> ushortHash;
 
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+#if defined wxLongLong_t && !defined wxLongLongIsLong
     // hash<wxLongLong_t> ought to work but doesn't on some compilers
     #if (!defined SIZEOF_LONG_LONG && SIZEOF_LONG == 4) \
         || (defined SIZEOF_LONG_LONG && SIZEOF_LONG_LONG == SIZEOF_LONG * 2)
@@ -506,7 +501,7 @@ class WXDLLIMPEXP_BASE wxIntegerHash
     #else
     WX_HASH_MAP_NAMESPACE::hash<wxLongLong_t> longlongHash;
     #endif
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+#endif
 
 public:
     wxIntegerHash() { }
@@ -516,10 +511,10 @@ public:
     size_t operator()( unsigned int x ) const { return uintHash( x ); }
     size_t operator()( short x ) const { return shortHash( x ); }
     size_t operator()( unsigned short x ) const { return ushortHash( x ); }
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+#if defined wxLongLong_t && !defined wxLongLongIsLong
     size_t operator()( wxLongLong_t x ) const { return longlongHash(x); }
     size_t operator()( wxULongLong_t x ) const { return longlongHash(x); }
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+#endif
 
     wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }
 };
@@ -537,10 +532,10 @@ public:
     unsigned long operator()( unsigned int x ) const { return x; }
     unsigned long operator()( short x ) const { return (unsigned long)x; }
     unsigned long operator()( unsigned short x ) const { return x; }
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-    wxULongLong_t operator()( wxLongLong_t x ) const { return static_cast<wxULongLong_t>(x); }
+#if defined wxLongLong_t && !defined wxLongLongIsLong
+    wxULongLong_t operator()( wxLongLong_t x ) const { return wx_static_cast(wxULongLong_t, x); }
     wxULongLong_t operator()( wxULongLong_t x ) const { return x; }
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+#endif
 
     wxIntegerHash& operator=(const wxIntegerHash&) { return *this; }
 };
@@ -557,10 +552,10 @@ public:
     bool operator()( unsigned int a, unsigned int b ) const { return a == b; }
     bool operator()( short a, short b ) const { return a == b; }
     bool operator()( unsigned short a, unsigned short b ) const { return a == b; }
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+#if defined wxLongLong_t && !defined wxLongLongIsLong
     bool operator()( wxLongLong_t a, wxLongLong_t b ) const { return a == b; }
     bool operator()( wxULongLong_t a, wxULongLong_t b ) const { return a == b; }
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+#endif
 
     wxIntegerEqual& operator=(const wxIntegerEqual&) { return *this; }
 };
@@ -574,7 +569,7 @@ public:
 #ifdef wxNEEDS_WX_HASH_MAP
     wxUIntPtr operator()( const void* k ) const { return wxPtrToUInt(k); }
 #else
-    size_t operator()( const void* k ) const { return (size_t)k; }
+    wxUIntPtr operator()( const void* k ) const { return wxPtrToUInt(k); }
 #endif
 
     wxPointerHash& operator=(const wxPointerHash&) { return *this; }
@@ -589,29 +584,21 @@ public:
     wxPointerEqual& operator=(const wxPointerEqual&) { return *this; }
 };
 
-// wxString, char*, wchar_t*
+// wxString, char*, wxChar*
 class WXDLLIMPEXP_BASE wxStringHash
 {
 public:
     wxStringHash() {}
     unsigned long operator()( const wxString& x ) const
-        { return stringHash( x.wx_str() ); }
-    unsigned long operator()( const wchar_t* x ) const
-        { return stringHash( x ); }
+        { return wxCharStringHash( x.c_str() ); }
+    unsigned long operator()( const wxChar* x ) const
+        { return wxCharStringHash( x ); }
+    static unsigned long wxCharStringHash( const wxChar* );
+#if wxUSE_UNICODE
     unsigned long operator()( const char* x ) const
-        { return stringHash( x ); }
-
-#if WXWIN_COMPATIBILITY_2_8
-    static unsigned long wxCharStringHash( const wxChar* x )
-        { return stringHash(x); }
-    #if wxUSE_UNICODE
-    static unsigned long charStringHash( const char* x )
-        { return stringHash(x); }
-    #endif
-#endif // WXWIN_COMPATIBILITY_2_8
-
-    static unsigned long stringHash( const wchar_t* );
-    static unsigned long stringHash( const char* );
+        { return charStringHash( x ); }
+    static unsigned long charStringHash( const char* );
+#endif // wxUSE_UNICODE
 
     wxStringHash& operator=(const wxStringHash&) { return *this; }
 };
@@ -634,16 +621,10 @@ public:
 
 #ifdef wxNEEDS_WX_HASH_MAP
 
-#define wxPTROP_NORMAL(pointer) \
-    pointer operator ->() const { return &(m_node->m_value); }
-#define wxPTROP_NOP(pointer)
-
 #define _WX_DECLARE_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP ) \
 _WX_DECLARE_PAIR( KEY_T, VALUE_T, CLASSNAME##_wxImplementation_Pair, CLASSEXP ) \
 _WX_DECLARE_HASH_MAP_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_Pair, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \
-_WX_DECLARE_HASHTABLE( CLASSNAME##_wxImplementation_Pair, KEY_T, HASH_T, \
-    CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, wxPTROP_NORMAL, \
-    CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \
+_WX_DECLARE_HASHTABLE( CLASSNAME##_wxImplementation_Pair, KEY_T, HASH_T, CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \
 CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable \
 { \
 public: \
@@ -684,12 +665,14 @@ public: \
  \
     size_type erase( const key_type& k ) \
         { return CLASSNAME##_wxImplementation_HashTable::erase( k ); } \
-    void erase( const iterator& it ) { erase( (*it).first ); } \
+    void erase( const iterator& it ) { erase( it->first ); } \
+    void erase( const const_iterator& it ) { erase( it->first ); } \
  \
     /* count() == 0 | 1 */ \
     size_type count( const const_key_type& key ) \
     { \
-        return GetNode( key ) ? 1u : 0u; \
+        /* explicit cast needed to suppress CodeWarrior warnings */ \
+        return (size_type)(GetNode( key ) ? 1 : 0); \
     } \
 }
 
@@ -714,7 +697,7 @@ public: \
 
 #define WX_DECLARE_EXPORTED_HASH_MAP( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, CLASSNAME) \
     WX_DECLARE_HASH_MAP_WITH_DECL( KEY_T, VALUE_T, HASH_T, KEY_EQ_T, \
-                                   CLASSNAME, class WXDLLIMPEXP_CORE )
+                                   CLASSNAME, class WXDLLEXPORT )
 
 #define WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \
     _WX_DECLARE_HASH_MAP( wxString, VALUE_T, wxStringHash, wxStringEqual, \
@@ -722,7 +705,7 @@ public: \
 
 #define WX_DECLARE_EXPORTED_STRING_HASH_MAP( VALUE_T, CLASSNAME ) \
     WX_DECLARE_STRING_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \
-                                          class WXDLLIMPEXP_CORE )
+                                          class WXDLLEXPORT )
 
 #define WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, DECL ) \
     _WX_DECLARE_HASH_MAP( void*, VALUE_T, wxPointerHash, wxPointerEqual, \
@@ -730,7 +713,7 @@ public: \
 
 #define WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP( VALUE_T, CLASSNAME ) \
     WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL( VALUE_T, CLASSNAME, \
-                                           class WXDLLIMPEXP_CORE )
+                                           class WXDLLEXPORT )
 
 // delete all hash elements
 //
@@ -752,11 +735,5 @@ public: \
 WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
                                wxLongToLongHashMap, class WXDLLIMPEXP_BASE );
 
-WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, wxStringToStringHashMap,
-                                      class WXDLLIMPEXP_BASE );
-
-WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxUIntPtr, wxStringToNumHashMap,
-                                      class WXDLLIMPEXP_BASE );
-
 
 #endif // _WX_HASHMAP_H_
diff --git a/Source/3rd Party/wx/include/wx/hashset.h b/Source/3rd Party/wx/include/wx/hashset.h
index c6806b953..b5e7892ff 100644
--- a/Source/3rd Party/wx/include/wx/hashset.h	
+++ b/Source/3rd Party/wx/include/wx/hashset.h	
@@ -4,7 +4,7 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     11/08/2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: hashset.h 55215 2008-08-23 18:54:04Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,20 +17,22 @@
 // see comment in wx/hashmap.h which also applies to different standard hash
 // set classes
 
-#if wxUSE_STD_CONTAINERS && \
+#if wxUSE_STL && \
     (defined(HAVE_STD_UNORDERED_SET) || defined(HAVE_TR1_UNORDERED_SET))
 
 #if defined(HAVE_STD_UNORDERED_SET)
     #include <unordered_set>
-    #define WX_HASH_SET_BASE_TEMPLATE std::unordered_set
+    #define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP )\
+        typedef std::unordered_set< KEY_T, HASH_T, KEY_EQ_T > CLASSNAME
 #elif defined(HAVE_TR1_UNORDERED_SET)
     #include <tr1/unordered_set>
-    #define WX_HASH_SET_BASE_TEMPLATE std::tr1::unordered_set
+    #define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP )\
+        typedef std::tr1::unordered_set< KEY_T, HASH_T, KEY_EQ_T > CLASSNAME
 #else
-    #error Update this code: unordered_set is available, but I do not know where.
+#error Update this code: unordered_set is available, but I do not know where.
 #endif
 
-#elif wxUSE_STD_CONTAINERS && defined(HAVE_STL_HASH_MAP)
+#elif wxUSE_STL && defined(HAVE_STL_HASH_MAP)
 
 #if defined(HAVE_EXT_HASH_MAP)
     #include <ext/hash_set>
@@ -38,38 +40,10 @@
     #include <hash_set>
 #endif
 
-#define WX_HASH_SET_BASE_TEMPLATE WX_HASH_MAP_NAMESPACE::hash_set
+#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP )\
+    typedef WX_HASH_MAP_NAMESPACE::hash_set< KEY_T, HASH_T, KEY_EQ_T > CLASSNAME
 
-#endif // different hash_set/unordered_set possibilities
-
-#ifdef WX_HASH_SET_BASE_TEMPLATE
-
-// we need to define the class declared by _WX_DECLARE_HASH_SET as a class and
-// not a typedef to allow forward declaring it
-#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP )  \
-CLASSEXP CLASSNAME                                                            \
-    : public WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >             \
-{                                                                             \
-public:                                                                       \
-    explicit CLASSNAME(size_type n = 3,                                       \
-                       const hasher& h = hasher(),                            \
-                       const key_equal& ke = key_equal(),                     \
-                       const allocator_type& a = allocator_type())            \
-        : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(n, h, ke, a)   \
-    {}                                                                        \
-    template <class InputIterator>                                            \
-    CLASSNAME(InputIterator f, InputIterator l,                               \
-              const hasher& h = hasher(),                                     \
-              const key_equal& ke = key_equal(),                              \
-              const allocator_type& a = allocator_type())                     \
-        : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(f, l, h, ke, a)\
-    {}                                                                        \
-    CLASSNAME(const WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >& s)  \
-        : WX_HASH_SET_BASE_TEMPLATE< KEY_T, HASH_T, KEY_EQ_T >(s)             \
-    {}                                                                        \
-}
-
-#else // no appropriate STL class, use our own implementation
+#else // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
 
 // this is a complex way of defining an easily inlineable identity function...
 #define _WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME, CLASSEXP )            \
@@ -89,11 +63,9 @@ public:                                                                      \
     CLASSNAME& operator=(const CLASSNAME&) { return *this; }                 \
 };
 
-#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, PTROP, CLASSNAME, CLASSEXP )\
+#define _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, CLASSEXP )\
 _WX_DECLARE_HASH_SET_KEY_EX( KEY_T, CLASSNAME##_wxImplementation_KeyEx, CLASSEXP ) \
-_WX_DECLARE_HASHTABLE( KEY_T, KEY_T, HASH_T,                                 \
-    CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, PTROP,                     \
-    CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \
+_WX_DECLARE_HASHTABLE( KEY_T, KEY_T, HASH_T, CLASSNAME##_wxImplementation_KeyEx, KEY_EQ_T, CLASSNAME##_wxImplementation_HashTable, CLASSEXP, grow_lf70, never_shrink ) \
 CLASSEXP CLASSNAME:public CLASSNAME##_wxImplementation_HashTable             \
 {                                                                            \
 public:                                                                      \
@@ -127,35 +99,24 @@ public:                                                                      \
     void erase( const const_iterator& it ) { erase( *it ); }                 \
                                                                              \
     /* count() == 0 | 1 */                                                   \
-    size_type count( const const_key_type& key ) const                       \
+    size_type count( const const_key_type& key )                             \
         { return GetNode( key ) ? 1 : 0; }                                   \
 }
 
-#endif // STL/wx implementations
-
+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
 
 // these macros are to be used in the user code
 #define WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \
-    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NORMAL, CLASSNAME, class )
+    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, class )
 
 // and these do exactly the same thing but should be used inside the
 // library
 #define WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \
-    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NORMAL, CLASSNAME, DECL )
+    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL )
 
 #define WX_DECLARE_EXPORTED_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \
     WX_DECLARE_HASH_SET_WITH_DECL( KEY_T, HASH_T, KEY_EQ_T, \
-                                   CLASSNAME, class WXDLLIMPEXP_CORE )
-
-// Finally these versions allow to define hash sets of non-objects (including
-// pointers, hence the confusing but wxArray-compatible name) without
-// operator->() which can't be used for them. This is mostly used inside the
-// library itself to avoid warnings when using such hash sets with some less
-// common compilers (notably Sun CC).
-#define WX_DECLARE_HASH_SET_PTR( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME) \
-    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NOP, CLASSNAME, class )
-#define WX_DECLARE_HASH_SET_WITH_DECL_PTR( KEY_T, HASH_T, KEY_EQ_T, CLASSNAME, DECL) \
-    _WX_DECLARE_HASH_SET( KEY_T, HASH_T, KEY_EQ_T, wxPTROP_NOP, CLASSNAME, DECL )
+                                   CLASSNAME, class WXDLLEXPORT )
 
 // delete all hash elements
 //
diff --git a/Source/3rd Party/wx/include/wx/headercol.h b/Source/3rd Party/wx/include/wx/headercol.h
deleted file mode 100644
index e5a84eda2..000000000
--- a/Source/3rd Party/wx/include/wx/headercol.h	
+++ /dev/null
@@ -1,289 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/headercol.h
-// Purpose:     declaration of wxHeaderColumn class
-// Author:      Vadim Zeitlin
-// Created:     2008-12-02
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_HEADERCOL_H_
-#define _WX_HEADERCOL_H_
-
-#include "wx/bitmap.h"
-
-#if wxUSE_HEADERCTRL
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-enum
-{
-    // special value for column width meaning unspecified/default
-    wxCOL_WIDTH_DEFAULT = -1,
-
-    // size the column automatically to fit all values
-    wxCOL_WIDTH_AUTOSIZE = -2
-};
-
-// bit masks for the various column attributes
-enum
-{
-    // column can be resized (included in default flags)
-    wxCOL_RESIZABLE   = 1,
-
-    // column can be clicked to toggle the sort order by its contents
-    wxCOL_SORTABLE    = 2,
-
-    // column can be dragged to change its order (included in default)
-    wxCOL_REORDERABLE = 4,
-
-    // column is not shown at all
-    wxCOL_HIDDEN      = 8,
-
-    // default flags for wxHeaderColumn ctor
-    wxCOL_DEFAULT_FLAGS = wxCOL_RESIZABLE | wxCOL_REORDERABLE
-};
-
-// ----------------------------------------------------------------------------
-// wxHeaderColumn: interface for a column in a header of controls such as
-//                 wxListCtrl, wxDataViewCtrl or wxGrid
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxHeaderColumn
-{
-public:
-    // ctors and dtor
-    // --------------
-
-    /*
-       Derived classes must provide ctors with the following signatures
-       (notice that they shouldn't be explicit to allow passing strings/bitmaps
-       directly to methods such wxHeaderCtrl::AppendColumn()):
-    wxHeaderColumn(const wxString& title,
-                   int width = wxCOL_WIDTH_DEFAULT,
-                   wxAlignment align = wxALIGN_NOT,
-                   int flags = wxCOL_DEFAULT_FLAGS);
-    wxHeaderColumn(const wxBitmap &bitmap,
-                   int width = wxDVC_DEFAULT_WIDTH,
-                   wxAlignment align = wxALIGN_CENTER,
-                   int flags = wxCOL_DEFAULT_FLAGS);
-    */
-
-    // virtual dtor for the base class to avoid gcc warnings even though we
-    // don't normally delete the objects of this class via a pointer to
-    // wxHeaderColumn so it's not necessary, strictly speaking
-    virtual ~wxHeaderColumn() { }
-
-    // getters for various attributes
-    // ------------------------------
-
-    // notice that wxHeaderColumn only provides getters as this is all the
-    // wxHeaderCtrl needs, various derived class must also provide some way to
-    // change these attributes but this can be done either at the column level
-    // (in which case they should inherit from wxSettableHeaderColumn) or via
-    // the methods of the main control in which case you don't need setters in
-    // the column class at all
-
-    // title is the string shown for this column
-    virtual wxString GetTitle() const = 0;
-
-    // bitmap shown (instead of text) in the column header
-    virtual wxBitmap GetBitmap() const = 0;                                   \
-
-    // width of the column in pixels, can be set to wxCOL_WIDTH_DEFAULT meaning
-    // unspecified/default
-    virtual int GetWidth() const = 0;
-
-    // minimal width can be set for resizable columns to forbid resizing them
-    // below the specified size (set to 0 to remove)
-    virtual int GetMinWidth() const = 0;
-
-    // alignment of the text: wxALIGN_CENTRE, wxALIGN_LEFT or wxALIGN_RIGHT
-    virtual wxAlignment GetAlignment() const = 0;
-
-
-    // flags manipulations:
-    // --------------------
-
-    // notice that while we make GetFlags() pure virtual here and implement the
-    // individual flags access in terms of it, for some derived classes it is
-    // more natural to implement access to each flag individually, in which
-    // case they can use our GetFromIndividualFlags() helper below to implement
-    // GetFlags()
-
-    // retrieve all column flags at once: combination of wxCOL_XXX values above
-    virtual int GetFlags() const = 0;
-
-    bool HasFlag(int flag) const { return (GetFlags() & flag) != 0; }
-
-
-    // wxCOL_RESIZABLE
-    virtual bool IsResizeable() const
-        { return HasFlag(wxCOL_RESIZABLE); }
-
-    // wxCOL_SORTABLE
-    virtual bool IsSortable() const
-        { return HasFlag(wxCOL_SORTABLE); }
-
-    // wxCOL_REORDERABLE
-    virtual bool IsReorderable() const
-        { return HasFlag(wxCOL_REORDERABLE); }
-
-    // wxCOL_HIDDEN
-    virtual bool IsHidden() const
-        { return HasFlag(wxCOL_HIDDEN); }
-    bool IsShown() const
-        { return !IsHidden(); }
-
-
-    // sorting
-    // -------
-
-    // return true if the column is the one currently used for sorting
-    virtual bool IsSortKey() const = 0;
-
-    // for sortable columns indicate whether we should sort in ascending or
-    // descending order (this should only be taken into account if IsSortKey())
-    virtual bool IsSortOrderAscending() const = 0;
-
-protected:
-    // helper for the class overriding IsXXX()
-    int GetFromIndividualFlags() const;
-};
-
-// ----------------------------------------------------------------------------
-// wxSettableHeaderColumn: column which allows to change its fields too
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxSettableHeaderColumn : public wxHeaderColumn
-{
-public:
-    virtual void SetTitle(const wxString& title) = 0;
-    virtual void SetBitmap(const wxBitmap& bitmap) = 0;
-    virtual void SetWidth(int width) = 0;
-    virtual void SetMinWidth(int minWidth) = 0;
-    virtual void SetAlignment(wxAlignment align) = 0;
-
-    // see comment for wxHeaderColumn::GetFlags() about the relationship
-    // between SetFlags() and Set{Sortable,Reorderable,...}
-
-    // change, set, clear, toggle or test for any individual flag
-    virtual void SetFlags(int flags) = 0;
-    void ChangeFlag(int flag, bool set);
-    void SetFlag(int flag);
-    void ClearFlag(int flag);
-    void ToggleFlag(int flag);
-
-    virtual void SetResizeable(bool resizable)
-        { ChangeFlag(wxCOL_RESIZABLE, resizable); }
-    virtual void SetSortable(bool sortable)
-        { ChangeFlag(wxCOL_SORTABLE, sortable); }
-    virtual void SetReorderable(bool reorderable)
-        { ChangeFlag(wxCOL_REORDERABLE, reorderable); }
-    virtual void SetHidden(bool hidden)
-        { ChangeFlag(wxCOL_HIDDEN, hidden); }
-
-    // This function can be called to indicate that this column is not used for
-    // sorting any more. Under some platforms it's not necessary to do anything
-    // in this case as just setting another column as a sort key takes care of
-    // everything but under MSW we currently need to call this explicitly to
-    // reset the sort indicator displayed on the column.
-    virtual void UnsetAsSortKey() { }
-
-    virtual void SetSortOrder(bool ascending) = 0;
-    void ToggleSortOrder() { SetSortOrder(!IsSortOrderAscending()); }
-
-protected:
-    // helper for the class overriding individual SetXXX() methods instead of
-    // overriding SetFlags()
-    void SetIndividualFlags(int flags);
-};
-
-// ----------------------------------------------------------------------------
-// wxHeaderColumnSimple: trivial generic implementation of wxHeaderColumn
-// ----------------------------------------------------------------------------
-
-class wxHeaderColumnSimple : public wxSettableHeaderColumn
-{
-public:
-    // ctors and dtor
-    wxHeaderColumnSimple(const wxString& title,
-                         int width = wxCOL_WIDTH_DEFAULT,
-                         wxAlignment align = wxALIGN_NOT,
-                         int flags = wxCOL_DEFAULT_FLAGS)
-        : m_title(title),
-          m_width(width),
-          m_align(align),
-          m_flags(flags)
-    {
-        Init();
-    }
-
-    wxHeaderColumnSimple(const wxBitmap& bitmap,
-                         int width = wxCOL_WIDTH_DEFAULT,
-                         wxAlignment align = wxALIGN_CENTER,
-                         int flags = wxCOL_DEFAULT_FLAGS)
-        : m_bitmap(bitmap),
-          m_width(width),
-          m_align(align),
-          m_flags(flags)
-    {
-        Init();
-    }
-
-    // implement base class pure virtuals
-    virtual void SetTitle(const wxString& title) { m_title = title; }
-    virtual wxString GetTitle() const { return m_title; }
-
-    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
-    wxBitmap GetBitmap() const { return m_bitmap; }
-
-    virtual void SetWidth(int width) { m_width = width; }
-    virtual int GetWidth() const { return m_width; }
-
-    virtual void SetMinWidth(int minWidth) { m_minWidth = minWidth; }
-    virtual int GetMinWidth() const { return m_minWidth; }
-
-    virtual void SetAlignment(wxAlignment align) { m_align = align; }
-    virtual wxAlignment GetAlignment() const { return m_align; }
-
-    virtual void SetFlags(int flags) { m_flags = flags; }
-    virtual int GetFlags() const { return m_flags; }
-
-    virtual bool IsSortKey() const { return m_sort; }
-    virtual void UnsetAsSortKey() { m_sort = false; }
-
-    virtual void SetSortOrder(bool ascending)
-    {
-        m_sort = true;
-        m_sortAscending = ascending;
-    }
-
-    virtual bool IsSortOrderAscending() const { return m_sortAscending; }
-
-private:
-    // common part of all ctors
-    void Init()
-    {
-        m_minWidth = 0;
-        m_sort = false;
-        m_sortAscending = true;
-    }
-
-    wxString m_title;
-    wxBitmap m_bitmap;
-    int m_width,
-        m_minWidth;
-    wxAlignment m_align;
-    int m_flags;
-    bool m_sort,
-         m_sortAscending;
-};
-
-#endif // wxUSE_HEADERCTRL
-
-#endif // _WX_HEADERCOL_H_
-
diff --git a/Source/3rd Party/wx/include/wx/headerctrl.h b/Source/3rd Party/wx/include/wx/headerctrl.h
deleted file mode 100644
index 1f9829ee4..000000000
--- a/Source/3rd Party/wx/include/wx/headerctrl.h	
+++ /dev/null
@@ -1,474 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/headerctrl.h
-// Purpose:     wxHeaderCtrlBase class: interface of wxHeaderCtrl
-// Author:      Vadim Zeitlin
-// Created:     2008-12-01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_HEADERCTRL_H_
-#define _WX_HEADERCTRL_H_
-
-#include "wx/control.h"
-
-#if wxUSE_HEADERCTRL
-
-#include "wx/dynarray.h"
-#include "wx/vector.h"
-
-#include "wx/headercol.h"
-
-// notice that the classes in this header are defined in the core library even
-// although currently they're only used by wxGrid which is in wxAdv because we
-// plan to use it in wxListCtrl which is in core too in the future
-class WXDLLIMPEXP_FWD_CORE wxHeaderCtrlEvent;
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-enum
-{
-    // allow column drag and drop
-    wxHD_ALLOW_REORDER = 0x0001,
-
-    // allow hiding (and showing back) the columns using the menu shown by
-    // right clicking the header
-    wxHD_ALLOW_HIDE = 0x0002,
-
-    // style used by default when creating the control
-    wxHD_DEFAULT_STYLE = wxHD_ALLOW_REORDER
-};
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[];
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrlBase defines the interface of a header control
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxHeaderCtrlBase : public wxControl
-{
-public:
-    /*
-        Derived classes must provide default ctor as well as a ctor and
-        Create() function with the following signatures:
-
-    wxHeaderCtrl(wxWindow *parent,
-                 wxWindowID winid = wxID_ANY,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxHD_DEFAULT_STYLE,
-                 const wxString& name = wxHeaderCtrlNameStr);
-
-    bool Create(wxWindow *parent,
-                wxWindowID winid = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxHD_DEFAULT_STYLE,
-                const wxString& name = wxHeaderCtrlNameStr);
-     */
-
-    // column-related methods
-    // ----------------------
-
-    // set the number of columns in the control
-    //
-    // this also calls UpdateColumn() for all columns
-    void SetColumnCount(unsigned int count);
-
-    // return the number of columns in the control as set by SetColumnCount()
-    unsigned int GetColumnCount() const { return DoGetCount(); }
-
-    // return whether the control has any columns
-    bool IsEmpty() const { return DoGetCount() == 0; }
-
-    // update the column with the given index
-    void UpdateColumn(unsigned int idx)
-    {
-        wxCHECK_RET( idx < GetColumnCount(), "invalid column index" );
-
-        DoUpdate(idx);
-    }
-
-
-    // columns order
-    // -------------
-
-    // set the columns order: the array defines the column index which appears
-    // the given position, it must have GetColumnCount() elements and contain
-    // all indices exactly once
-    void SetColumnsOrder(const wxArrayInt& order);
-    wxArrayInt GetColumnsOrder() const;
-
-    // get the index of the column at the given display position
-    unsigned int GetColumnAt(unsigned int pos) const;
-
-    // get the position at which this column is currently displayed
-    unsigned int GetColumnPos(unsigned int idx) const;
-
-    // reset the columns order to the natural one
-    void ResetColumnsOrder();
-
-    // helper function used by the generic version of this control and also
-    // wxGrid: reshuffles the array of column indices indexed by positions
-    // (i.e. using the same convention as for SetColumnsOrder()) so that the
-    // column with the given index is found at the specified position
-    static void MoveColumnInOrderArray(wxArrayInt& order,
-                                       unsigned int idx,
-                                       unsigned int pos);
-
-
-    // UI helpers
-    // ----------
-
-#if wxUSE_MENUS
-    // show the popup menu containing all columns with check marks for the ones
-    // which are currently shown and return true if something was done using it
-    // (in this case UpdateColumnVisibility() will have been called) or false
-    // if the menu was cancelled
-    //
-    // this is called from the default right click handler for the controls
-    // with wxHD_ALLOW_HIDE style
-    bool ShowColumnsMenu(const wxPoint& pt, const wxString& title = wxString());
-
-    // append the entries for all our columns to the given menu, with the
-    // currently visible columns being checked
-    //
-    // this is used by ShowColumnsMenu() but can also be used if you use your
-    // own custom columns menu but nevertheless want to show all the columns in
-    // it
-    //
-    // the ids of the items corresponding to the columns are consecutive and
-    // start from idColumnsBase
-    void AddColumnsItems(wxMenu& menu, int idColumnsBase = 0);
-#endif // wxUSE_MENUS
-
-    // show the columns customization dialog and return true if something was
-    // changed using it (in which case UpdateColumnVisibility() and/or
-    // UpdateColumnsOrder() will have been called)
-    //
-    // this is called by the control itself from ShowColumnsMenu() (which in
-    // turn is only called by the control if wxHD_ALLOW_HIDE style was
-    // specified) and if the control has wxHD_ALLOW_REORDER style as well
-    bool ShowCustomizeDialog();
-
-    // compute column title width
-    int GetColumnTitleWidth(const wxHeaderColumn& col);
-
-    // implementation only from now on
-    // -------------------------------
-
-    // the user doesn't need to TAB to this control
-    virtual bool AcceptsFocusFromKeyboard() const { return false; }
-
-    // this method is only overridden in order to synchronize the control with
-    // the main window when it is scrolled, the derived class must implement
-    // DoScrollHorz()
-    virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
-
-protected:
-    // this method must be implemented by the derived classes to return the
-    // information for the given column
-    virtual const wxHeaderColumn& GetColumn(unsigned int idx) const = 0;
-
-    // this method is called from the default EVT_HEADER_SEPARATOR_DCLICK
-    // handler to update the fitting column width of the given column, it
-    // should return true if the width was really updated
-    virtual bool UpdateColumnWidthToFit(unsigned int WXUNUSED(idx),
-                                        int WXUNUSED(widthTitle))
-    {
-        return false;
-    }
-
-    // this method is called from ShowColumnsMenu() and must be overridden to
-    // update the internal column visibility (there is no need to call
-    // UpdateColumn() from here, this will be done internally)
-    virtual void UpdateColumnVisibility(unsigned int WXUNUSED(idx),
-                                        bool WXUNUSED(show))
-    {
-        wxFAIL_MSG( "must be overridden if called" );
-    }
-
-    // this method is called from ShowCustomizeDialog() to reorder all columns
-    // at once and should be implemented for controls using wxHD_ALLOW_REORDER
-    // style (there is no need to call SetColumnsOrder() from here, this is
-    // done by the control itself)
-    virtual void UpdateColumnsOrder(const wxArrayInt& WXUNUSED(order))
-    {
-        wxFAIL_MSG( "must be overridden if called" );
-    }
-
-    // this method can be overridden in the derived classes to do something
-    // (e.g. update/resize some internal data structures) before the number of
-    // columns in the control changes
-    virtual void OnColumnCountChanging(unsigned int WXUNUSED(count)) { }
-
-
-    // helper function for the derived classes: update the array of column
-    // indices after the number of columns changed
-    void DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int count);
-
-protected:
-    // this window doesn't look nice with the border so don't use it by default
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-private:
-    // methods implementing our public API and defined in platform-specific
-    // implementations
-    virtual void DoSetCount(unsigned int count) = 0;
-    virtual unsigned int DoGetCount() const = 0;
-    virtual void DoUpdate(unsigned int idx) = 0;
-
-    virtual void DoScrollHorz(int dx) = 0;
-
-    virtual void DoSetColumnsOrder(const wxArrayInt& order) = 0;
-    virtual wxArrayInt DoGetColumnsOrder() const = 0;
-
-
-    // event handlers
-    void OnSeparatorDClick(wxHeaderCtrlEvent& event);
-#if wxUSE_MENUS
-    void OnRClick(wxHeaderCtrlEvent& event);
-#endif // wxUSE_MENUS
-
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl: port-specific header control implementation, notice that this
-//               is still an ABC which is meant to be used as part of another
-//               control, see wxHeaderCtrlSimple for a standalone version
-// ----------------------------------------------------------------------------
-
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    #include "wx/msw/headerctrl.h"
-#else
-    #define wxHAS_GENERIC_HEADERCTRL
-    #include "wx/generic/headerctrlg.h"
-#endif // platform
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrlSimple: concrete header control which can be used standalone
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxHeaderCtrlSimple : public wxHeaderCtrl
-{
-public:
-    // control creation
-    // ----------------
-
-    wxHeaderCtrlSimple() { Init(); }
-    wxHeaderCtrlSimple(wxWindow *parent,
-                       wxWindowID winid = wxID_ANY,
-                       const wxPoint& pos = wxDefaultPosition,
-                       const wxSize& size = wxDefaultSize,
-                       long style = wxHD_DEFAULT_STYLE,
-                       const wxString& name = wxHeaderCtrlNameStr)
-    {
-        Init();
-
-        Create(parent, winid, pos, size, style, name);
-    }
-
-    // managing the columns
-    // --------------------
-
-    // insert the column at the given position, using GetColumnCount() as
-    // position appends it at the end
-    void InsertColumn(const wxHeaderColumnSimple& col, unsigned int idx)
-    {
-        wxCHECK_RET( idx <= GetColumnCount(), "invalid column index" );
-
-        DoInsert(col, idx);
-    }
-
-    // append the column to the end of the control
-    void AppendColumn(const wxHeaderColumnSimple& col)
-    {
-        DoInsert(col, GetColumnCount());
-    }
-
-    // delete the column at the given index
-    void DeleteColumn(unsigned int idx)
-    {
-        wxCHECK_RET( idx < GetColumnCount(), "invalid column index" );
-
-        DoDelete(idx);
-    }
-
-    // delete all the existing columns
-    void DeleteAllColumns();
-
-
-    // modifying columns
-    // -----------------
-
-    // show or hide the column, notice that even when a column is hidden we
-    // still account for it when using indices
-    void ShowColumn(unsigned int idx, bool show = true)
-    {
-        wxCHECK_RET( idx < GetColumnCount(), "invalid column index" );
-
-        DoShowColumn(idx, show);
-    }
-
-    void HideColumn(unsigned int idx)
-    {
-        ShowColumn(idx, false);
-    }
-
-    // indicate that the column is used for sorting
-    void ShowSortIndicator(unsigned int idx, bool ascending = true)
-    {
-        wxCHECK_RET( idx < GetColumnCount(), "invalid column index" );
-
-        DoShowSortIndicator(idx, ascending);
-    }
-
-    // remove the sort indicator completely
-    void RemoveSortIndicator();
-
-protected:
-    // implement/override base class methods
-    virtual const wxHeaderColumn& GetColumn(unsigned int idx) const;
-    virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle);
-
-    // and define another one to be overridden in the derived classes: it
-    // should return the best width for the given column contents or -1 if not
-    // implemented, we use it to implement UpdateColumnWidthToFit()
-    virtual int GetBestFittingWidth(unsigned int WXUNUSED(idx)) const
-    {
-        return -1;
-    }
-
-private:
-    // functions implementing our public API
-    void DoInsert(const wxHeaderColumnSimple& col, unsigned int idx);
-    void DoDelete(unsigned int idx);
-    void DoShowColumn(unsigned int idx, bool show);
-    void DoShowSortIndicator(unsigned int idx, bool ascending);
-
-    // common part of all ctors
-    void Init();
-
-    // bring the column count in sync with the number of columns we store
-    void UpdateColumnCount()
-    {
-        SetColumnCount(static_cast<int>(m_cols.size()));
-    }
-
-
-    // all our current columns
-    typedef wxVector<wxHeaderColumnSimple> Columns;
-    Columns m_cols;
-
-    // the column currently used for sorting or -1 if none
-    unsigned int m_sortKey;
-
-
-    wxDECLARE_NO_COPY_CLASS(wxHeaderCtrlSimple);
-};
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl events
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxHeaderCtrlEvent : public wxNotifyEvent
-{
-public:
-    wxHeaderCtrlEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
-        : wxNotifyEvent(commandType, winid),
-          m_col(-1),
-          m_width(0),
-          m_order(static_cast<unsigned int>(-1))
-    {
-    }
-
-    wxHeaderCtrlEvent(const wxHeaderCtrlEvent& event)
-        : wxNotifyEvent(event),
-          m_col(event.m_col),
-          m_width(event.m_width),
-          m_order(event.m_order)
-    {
-    }
-
-    // the column which this event pertains to: valid for all header events
-    int GetColumn() const { return m_col; }
-    void SetColumn(int col) { m_col = col; }
-
-    // the width of the column: valid for column resizing/dragging events only
-    int GetWidth() const { return m_width; }
-    void SetWidth(int width) { m_width = width; }
-
-    // the new position of the column: for end reorder events only
-    unsigned int GetNewOrder() const { return m_order; }
-    void SetNewOrder(unsigned int order) { m_order = order; }
-
-    virtual wxEvent *Clone() const { return new wxHeaderCtrlEvent(*this); }
-
-protected:
-    // the column affected by the event
-    int m_col;
-
-    // the current width for the dragging events
-    int m_width;
-
-    // the new column position for end reorder event
-    unsigned int m_order;
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHeaderCtrlEvent)
-};
-
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_CLICK, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent );
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_DCLICK, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent );
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent );
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_RESIZING, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_END_RESIZE, wxHeaderCtrlEvent );
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_END_REORDER, wxHeaderCtrlEvent );
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent );
-
-typedef void (wxEvtHandler::*wxHeaderCtrlEventFunction)(wxHeaderCtrlEvent&);
-
-#define wxHeaderCtrlEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxHeaderCtrlEventFunction, func)
-
-#define wx__DECLARE_HEADER_EVT(evt, id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_HEADER_ ## evt, id, wxHeaderCtrlEventHandler(fn))
-
-#define EVT_HEADER_CLICK(id, fn) wx__DECLARE_HEADER_EVT(CLICK, id, fn)
-#define EVT_HEADER_RIGHT_CLICK(id, fn) wx__DECLARE_HEADER_EVT(RIGHT_CLICK, id, fn)
-#define EVT_HEADER_MIDDLE_CLICK(id, fn) wx__DECLARE_HEADER_EVT(MIDDLE_CLICK, id, fn)
-
-#define EVT_HEADER_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(DCLICK, id, fn)
-#define EVT_HEADER_RIGHT_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(RIGHT_DCLICK, id, fn)
-#define EVT_HEADER_MIDDLE_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(MIDDLE_DCLICK, id, fn)
-
-#define EVT_HEADER_SEPARATOR_DCLICK(id, fn) wx__DECLARE_HEADER_EVT(SEPARATOR_DCLICK, id, fn)
-
-#define EVT_HEADER_BEGIN_RESIZE(id, fn) wx__DECLARE_HEADER_EVT(BEGIN_RESIZE, id, fn)
-#define EVT_HEADER_RESIZING(id, fn) wx__DECLARE_HEADER_EVT(RESIZING, id, fn)
-#define EVT_HEADER_END_RESIZE(id, fn) wx__DECLARE_HEADER_EVT(END_RESIZE, id, fn)
-
-#define EVT_HEADER_BEGIN_REORDER(id, fn) wx__DECLARE_HEADER_EVT(BEGIN_REORDER, id, fn)
-#define EVT_HEADER_END_REORDER(id, fn) wx__DECLARE_HEADER_EVT(END_REORDER, id, fn)
-
-#define EVT_HEADER_DRAGGING_CANCELLED(id, fn) wx__DECLARE_HEADER_EVT(DRAGGING_CANCELLED, id, fn)
-
-#endif // wxUSE_HEADERCTRL
-
-#endif // _WX_HEADERCTRL_H_
diff --git a/Source/3rd Party/wx/include/wx/help.h b/Source/3rd Party/wx/include/wx/help.h
index f6a8f69bb..1cc09d42c 100644
--- a/Source/3rd Party/wx/include/wx/help.h	
+++ b/Source/3rd Party/wx/include/wx/help.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/help.h
+// Name:        help.h
 // Purpose:     wxHelpController base header
 // Author:      wxWidgets Team
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: help.h 33948 2005-05-04 18:57:50Z JS $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -22,6 +22,10 @@
     #include "wx/msw/wince/helpwce.h"
 
     #define wxHelpController wxWinceHelpController
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/help.h"
+
+    #define wxHelpController wxPalmHelpController
 #elif defined(__WXMSW__)
     #include "wx/msw/helpchm.h"
 
diff --git a/Source/3rd Party/wx/include/wx/helpbase.h b/Source/3rd Party/wx/include/wx/helpbase.h
index c0bb23b6f..0ab778205 100644
--- a/Source/3rd Party/wx/include/wx/helpbase.h	
+++ b/Source/3rd Party/wx/include/wx/helpbase.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/helpbase.h
+// Name:        helpbase.h
 // Purpose:     Help system base classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: helpbase.h 45498 2007-04-16 13:03:05Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,7 +32,7 @@ enum wxHelpSearchMode
 };
 
 // Defines the API for help controllers
-class WXDLLIMPEXP_CORE wxHelpControllerBase: public wxObject
+class WXDLLEXPORT wxHelpControllerBase: public wxObject
 {
 public:
     inline wxHelpControllerBase(wxWindow* parentWindow = NULL) { m_parentWindow = parentWindow; }
@@ -82,7 +82,7 @@ public:
         wxPoint *WXUNUSED(pos) = NULL,
         bool *WXUNUSED(newFrameEachTime) = NULL)
     {
-        return NULL; // does nothing by default
+        return (wxFrame*) NULL; // does nothing by default
     }
 
     virtual bool Quit() = 0;
diff --git a/Source/3rd Party/wx/include/wx/icon.h b/Source/3rd Party/wx/include/wx/icon.h
index d5f531357..8a73884ca 100644
--- a/Source/3rd Party/wx/include/wx/icon.h	
+++ b/Source/3rd Party/wx/include/wx/icon.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: icon.h 41538 2006-09-30 20:45:15Z RR $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,50 +14,28 @@
 
 #include "wx/iconloc.h"
 
-
-// a more readable way to tell
-#define wxICON_SCREEN_DEPTH     (-1)
-
-
-// the wxICON_DEFAULT_TYPE (the wxIcon equivalent of wxBITMAP_DEFAULT_TYPE)
-// constant defines the default argument value for wxIcon ctor and wxIcon::LoadFile()
-// functions.
-
-#if defined(__WXMSW__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
+#if defined(__WXPALMOS__)
+  #include "wx/generic/icon.h"
+#elif defined(__WXMSW__)
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK20__)
-  #ifdef __WINDOWS__
-    #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
-  #else
-    #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
-  #endif
   #include "wx/generic/icon.h"
 #elif defined(__WXGTK__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
   #include "wx/generic/icon.h"
 #elif defined(__WXX11__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
+  #include "wx/generic/icon.h"
+#elif defined(__WXMGL__)
+  #define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_ICO_RESOURCE
   #include "wx/generic/icon.h"
 #elif defined(__WXDFB__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_XPM
   #include "wx/generic/icon.h"
 #elif defined(__WXMAC__)
-#if wxOSX_USE_COCOA_OR_CARBON
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE
-  #include "wx/osx/icon.h"
-#else
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_PNG_RESOURCE
-  #include "wx/generic/icon.h"
-#endif
+  #include "wx/mac/icon.h"
 #elif defined(__WXCOCOA__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICON_RESOURCE
   #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)
-  #define wxICON_DEFAULT_TYPE   wxBITMAP_TYPE_ICO_RESOURCE
   #include "wx/os2/icon.h"
 #endif
 
@@ -67,7 +45,7 @@
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
-DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT)
 #endif
 
 
diff --git a/Source/3rd Party/wx/include/wx/iconbndl.h b/Source/3rd Party/wx/include/wx/iconbndl.h
index 651c4d29b..ced8dbba6 100644
--- a/Source/3rd Party/wx/include/wx/iconbndl.h	
+++ b/Source/3rd Party/wx/include/wx/iconbndl.h	
@@ -4,7 +4,7 @@
 // Author:      Mattia barbon
 // Modified by:
 // Created:     23.03.02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: iconbndl.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,122 +12,58 @@
 #ifndef _WX_ICONBNDL_H_
 #define _WX_ICONBNDL_H_
 
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"      // for wxSize
-#include "wx/icon.h"
-
 #include "wx/dynarray.h"
+// for wxSize
+#include "wx/gdicmn.h"
 
-class WXDLLIMPEXP_FWD_BASE wxInputStream;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_BASE wxString;
 
-WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
+WX_DECLARE_EXPORTED_OBJARRAY( wxIcon, wxIconArray );
 
 // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE,
 // if you need them, you have to load them manually and call
 // wxIconCollection::AddIcon
-class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject
+class WXDLLEXPORT wxIconBundle
 {
 public:
-    // Flags that determine what happens if GetIcon() doesn't find the icon of
-    // exactly the requested size.
-    enum
-    {
-        // Return invalid icon if exact size is not found.
-        FALLBACK_NONE = 0,
-
-        // Return the icon of the system icon size if exact size is not found.
-        // May be combined with other non-NONE enum elements to determine what
-        // happens if the system icon size is not found neither.
-        FALLBACK_SYSTEM = 1,
-
-        // Return the icon of closest larger size or, if there is no icon of
-        // larger size in the bundle, the closest icon of smaller size.
-        FALLBACK_NEAREST_LARGER = 2
-    };
-
     // default constructor
-    wxIconBundle();
-
+    wxIconBundle() : m_icons() {}
     // initializes the bundle with the icon(s) found in the file
-#if wxUSE_STREAMS && wxUSE_IMAGE
-#if wxUSE_FFILE || wxUSE_FILE
-    wxIconBundle(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
-#endif // wxUSE_FFILE || wxUSE_FILE
-    wxIconBundle(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
-#endif // wxUSE_STREAMS && wxUSE_IMAGE
-
+    wxIconBundle( const wxString& file, long type ) : m_icons()
+        { AddIcon( file, type ); }
     // initializes the bundle with a single icon
-    wxIconBundle(const wxIcon& icon);
+    wxIconBundle( const wxIcon& icon ) : m_icons()
+        { AddIcon( icon ); }
 
-    // default copy ctor and assignment operator are OK
+    const wxIconBundle& operator =( const wxIconBundle& ic );
+    wxIconBundle( const wxIconBundle& ic ) : m_icons()
+        { *this = ic; }
+
+    ~wxIconBundle() { DeleteIcons(); }
 
     // adds all the icons contained in the file to the collection,
     // if the collection already contains icons with the same
     // width and height, they are replaced
-#if wxUSE_STREAMS && wxUSE_IMAGE
-#if wxUSE_FFILE || wxUSE_FILE
-    void AddIcon(const wxString& file, wxBitmapType type = wxBITMAP_TYPE_ANY);
-#endif // wxUSE_FFILE || wxUSE_FILE
-    void AddIcon(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY);
-#endif // wxUSE_STREAMS && wxUSE_IMAGE
-
+    void AddIcon( const wxString& file, long type );
     // adds the icon to the collection, if the collection already
     // contains an icon with the same width and height, it is
     // replaced
-    void AddIcon(const wxIcon& icon);
+    void AddIcon( const wxIcon& icon );
 
     // returns the icon with the given size; if no such icon exists,
-    // behavior is specified by the flags.
-    wxIcon GetIcon(const wxSize& size, int flags = FALLBACK_SYSTEM) const;
-
-    // equivalent to GetIcon(wxSize(size, size))
-    wxIcon GetIcon(wxCoord size = wxDefaultCoord,
-                   int flags = FALLBACK_SYSTEM) const
-        { return GetIcon(wxSize(size, size), flags); }
-
-    // returns the icon exactly of the specified size or wxNullIcon if no icon
-    // of exactly given size are available
-    wxIcon GetIconOfExactSize(const wxSize& size) const;
-    wxIcon GetIconOfExactSize(wxCoord size) const
-        { return GetIconOfExactSize(wxSize(size, size)); }
-
-    // enumerate all icons in the bundle: don't use these functions if ti can
-    // be avoided, using GetIcon() directly is better
-
-    // return the number of available icons
-    size_t GetIconCount() const;
-
-    // return the icon at index (must be < GetIconCount())
-    wxIcon GetIconByIndex(size_t n) const;
-
-    // check if we have any icons at all
-    bool IsEmpty() const { return GetIconCount() == 0; }
-
-#if WXWIN_COMPATIBILITY_2_8
-#if wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE)
-    wxDEPRECATED( void AddIcon(const wxString& file, long type)
-        {
-            AddIcon(file, (wxBitmapType)type);
-        }
-    )
-
-    wxDEPRECATED_CONSTRUCTOR( wxIconBundle (const wxString& file, long type)
-        {
-            AddIcon(file, (wxBitmapType)type);
-        }
-    )
-#endif // wxUSE_STREAMS && wxUSE_IMAGE && (wxUSE_FFILE || wxUSE_FILE)
-#endif // WXWIN_COMPATIBILITY_2_8
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
+    // returns the icon with size wxSYS_ICON_[XY]; if no such icon exists,
+    // returns the first icon in the bundle
+    const wxIcon& GetIcon( const wxSize& size ) const;
+    // equivalent to GetIcon( wxSize( size, size ) )
+    const wxIcon& GetIcon( wxCoord size = wxDefaultCoord ) const
+        { return GetIcon( wxSize( size, size ) ); }
 private:
     // delete all icons
     void DeleteIcons();
-
-    DECLARE_DYNAMIC_CLASS(wxIconBundle)
+public:
+    wxIconArray m_icons;
 };
 
-#endif // _WX_ICONBNDL_H_
+#endif
+    // _WX_ICONBNDL_H_
diff --git a/Source/3rd Party/wx/include/wx/iconloc.h b/Source/3rd Party/wx/include/wx/iconloc.h
index df2cf92e2..e89d45d4e 100644
--- a/Source/3rd Party/wx/include/wx/iconloc.h	
+++ b/Source/3rd Party/wx/include/wx/iconloc.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: iconloc.h 27408 2004-05-23 20:53:33Z JS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,9 +39,9 @@ private:
     wxString m_filename;
 };
 
-// under Windows the same file may contain several icons so we also store the
+// under MSW the same file may contain several icons so we also store the
 // index of the icon
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 
 class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase
 {
@@ -65,7 +65,7 @@ wxIconLocation::wxIconLocation(const wxString& file, int num)
     SetIndex(num);
 }
 
-#else // !__WINDOWS__
+#else // !MSW
 
 // must be a class because we forward declare it as class
 class WXDLLIMPEXP_BASE wxIconLocation : public wxIconLocationBase
diff --git a/Source/3rd Party/wx/include/wx/imagbmp.h b/Source/3rd Party/wx/include/wx/imagbmp.h
index 130630865..e32fc509b 100644
--- a/Source/3rd Party/wx/include/wx/imagbmp.h	
+++ b/Source/3rd Party/wx/include/wx/imagbmp.h	
@@ -2,7 +2,7 @@
 // Name:        wx/imagbmp.h
 // Purpose:     wxImage BMP, ICO, CUR and ANI handlers
 // Author:      Robert Roebling, Chris Elliott
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imagbmp.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Robert Roebling, Chris Elliott
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,6 +21,13 @@
 #define wxIMAGE_OPTION_CUR_HOTSPOT_X  wxT("HotSpotX")
 #define wxIMAGE_OPTION_CUR_HOTSPOT_Y  wxT("HotSpotY")
 
+#if WXWIN_COMPATIBILITY_2_4
+    // Do not use these macros, they are deprecated
+    #define wxBMP_FORMAT    wxIMAGE_OPTION_BMP_FORMAT
+    #define wxCUR_HOTSPOT_X wxIMAGE_OPTION_CUR_HOTSPOT_X
+    #define wxCUR_HOTSPOT_Y wxIMAGE_OPTION_CUR_HOTSPOT_Y
+#endif
+
 
 enum
 {
@@ -40,7 +47,7 @@ enum
 // wxBMPHandler
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBMPHandler : public wxImageHandler
+class WXDLLEXPORT wxBMPHandler : public wxImageHandler
 {
 public:
     wxBMPHandler()
@@ -74,7 +81,7 @@ private:
 // wxICOHandler
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxICOHandler : public wxBMPHandler
+class WXDLLEXPORT wxICOHandler : public wxBMPHandler
 {
 public:
     wxICOHandler()
@@ -89,9 +96,8 @@ public:
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
     virtual bool DoLoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index );
-
+    virtual int GetImageCount( wxInputStream& stream );
 protected:
-    virtual int DoGetImageCount( wxInputStream& stream );
     virtual bool DoCanRead( wxInputStream& stream );
 #endif // wxUSE_STREAMS
 
@@ -104,7 +110,7 @@ private:
 // wxCURHandler
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxCURHandler : public wxICOHandler
+class WXDLLEXPORT wxCURHandler : public wxICOHandler
 {
 public:
     wxCURHandler()
@@ -131,7 +137,7 @@ private:
 // wxANIHandler
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxANIHandler : public wxCURHandler
+class WXDLLEXPORT wxANIHandler : public wxCURHandler
 {
 public:
     wxANIHandler()
@@ -146,9 +152,8 @@ public:
 #if wxUSE_STREAMS
     virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose=true) ){return false ;}
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
-
+    virtual int GetImageCount( wxInputStream& stream );
 protected:
-    virtual int DoGetImageCount( wxInputStream& stream );
     virtual bool DoCanRead( wxInputStream& stream );
 #endif // wxUSE_STREAMS
 
diff --git a/Source/3rd Party/wx/include/wx/image.h b/Source/3rd Party/wx/include/wx/image.h
index 36e136116..8dc2d8500 100644
--- a/Source/3rd Party/wx/include/wx/image.h	
+++ b/Source/3rd Party/wx/include/wx/image.h	
@@ -2,7 +2,7 @@
 // Name:        wx/image.h
 // Purpose:     wxImage class
 // Author:      Robert Roebling
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: image.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,6 @@
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 #include "wx/hashmap.h"
-#include "wx/arrstr.h"
 
 #if wxUSE_STREAMS
 #  include "wx/stream.h"
@@ -28,50 +27,27 @@
 // which breaks the compilation below
 #undef index
 
-#define wxIMAGE_OPTION_QUALITY               wxString(wxS("quality"))
-#define wxIMAGE_OPTION_FILENAME              wxString(wxS("FileName"))
+#define wxIMAGE_OPTION_QUALITY  wxString(wxT("quality"))
+#define wxIMAGE_OPTION_FILENAME wxString(wxT("FileName"))
 
-#define wxIMAGE_OPTION_RESOLUTION            wxString(wxS("Resolution"))
-#define wxIMAGE_OPTION_RESOLUTIONX           wxString(wxS("ResolutionX"))
-#define wxIMAGE_OPTION_RESOLUTIONY           wxString(wxS("ResolutionY"))
+#define wxIMAGE_OPTION_RESOLUTION            wxString(wxT("Resolution"))
+#define wxIMAGE_OPTION_RESOLUTIONX           wxString(wxT("ResolutionX"))
+#define wxIMAGE_OPTION_RESOLUTIONY           wxString(wxT("ResolutionY"))
 
-#define wxIMAGE_OPTION_RESOLUTIONUNIT        wxString(wxS("ResolutionUnit"))
-
-#define wxIMAGE_OPTION_MAX_WIDTH             wxString(wxS("MaxWidth"))
-#define wxIMAGE_OPTION_MAX_HEIGHT            wxString(wxS("MaxHeight"))
-
-#define wxIMAGE_OPTION_ORIGINAL_WIDTH        wxString(wxS("OriginalWidth"))
-#define wxIMAGE_OPTION_ORIGINAL_HEIGHT       wxString(wxS("OriginalHeight"))
+#define wxIMAGE_OPTION_RESOLUTIONUNIT        wxString(wxT("ResolutionUnit"))
 
 // constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
-//
-// NB: don't change these values, they correspond to libjpeg constants
-enum wxImageResolution
+enum
 {
-    // Resolution not specified
-    wxIMAGE_RESOLUTION_NONE = 0,
-
-    // Resolution specified in inches
     wxIMAGE_RESOLUTION_INCHES = 1,
-
-    // Resolution specified in centimeters
     wxIMAGE_RESOLUTION_CM = 2
 };
 
 // Constants for wxImage::Scale() for determining the level of quality
-enum wxImageResizeQuality
+enum
 {
-    // different image resizing algorithms used by Scale() and Rescale()
-    wxIMAGE_QUALITY_NEAREST = 0,
-    wxIMAGE_QUALITY_BILINEAR = 1,
-    wxIMAGE_QUALITY_BICUBIC = 2,
-    wxIMAGE_QUALITY_BOX_AVERAGE = 3,
-
-    // default quality is low (but fast)
-    wxIMAGE_QUALITY_NORMAL = wxIMAGE_QUALITY_NEAREST,
-
-    // highest (but best) quality
-    wxIMAGE_QUALITY_HIGH
+    wxIMAGE_QUALITY_NORMAL = 0,
+    wxIMAGE_QUALITY_HIGH = 1
 };
 
 // alpha channel values: fully transparent, default threshold separating
@@ -95,32 +71,25 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 #if wxUSE_VARIANT
 #include "wx/variant.h"
-DECLARE_VARIANT_OBJECT_EXPORTED(wxImage,WXDLLIMPEXP_CORE)
+DECLARE_VARIANT_OBJECT_EXPORTED(wxImage,WXDLLEXPORT)
 #endif
 
 //-----------------------------------------------------------------------------
 // wxImageHandler
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxImageHandler: public wxObject
+class WXDLLEXPORT wxImageHandler: public wxObject
 {
 public:
     wxImageHandler()
-        : m_name(wxEmptyString), m_extension(wxEmptyString), m_mime(), m_type(wxBITMAP_TYPE_INVALID)
+        : m_name(wxEmptyString), m_extension(wxEmptyString), m_mime(), m_type(0)
         { }
 
 #if wxUSE_STREAMS
-    // NOTE: LoadFile and SaveFile are not pure virtuals to allow derived classes
-    //       to implement only one of the two
-    virtual bool LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream),
-                           bool WXUNUSED(verbose)=true, int WXUNUSED(index)=-1 )
-        { return false; }
-    virtual bool SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream),
-                           bool WXUNUSED(verbose)=true )
-        { return false; }
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
 
-    int GetImageCount( wxInputStream& stream );
-        // save the stream position, call DoGetImageCount() and restore the position
+    virtual int GetImageCount( wxInputStream& stream );
 
     bool CanRead( wxInputStream& stream ) { return CallDoCanRead(stream); }
     bool CanRead( const wxString& name );
@@ -128,48 +97,25 @@ public:
 
     void SetName(const wxString& name) { m_name = name; }
     void SetExtension(const wxString& ext) { m_extension = ext; }
-    void SetAltExtensions(const wxArrayString& exts) { m_altExtensions = exts; }
-    void SetType(wxBitmapType type) { m_type = type; }
+    void SetType(long type) { m_type = type; }
     void SetMimeType(const wxString& type) { m_mime = type; }
     const wxString& GetName() const { return m_name; }
     const wxString& GetExtension() const { return m_extension; }
-    const wxArrayString& GetAltExtensions() const { return m_altExtensions; }
-    wxBitmapType GetType() const { return m_type; }
+    long GetType() const { return m_type; }
     const wxString& GetMimeType() const { return m_mime; }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED(
-        void SetType(long type) { SetType((wxBitmapType)type); }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
 #if wxUSE_STREAMS
-    // NOTE: this function is allowed to change the current stream position
-    //       since GetImageCount() will take care of restoring it later
-    virtual int DoGetImageCount( wxInputStream& WXUNUSED(stream) )
-        { return 1; }       // default return value is 1 image
-
-    // NOTE: this function is allowed to change the current stream position
-    //       since CallDoCanRead() will take care of restoring it later
     virtual bool DoCanRead( wxInputStream& stream ) = 0;
 
     // save the stream position, call DoCanRead() and restore the position
     bool CallDoCanRead(wxInputStream& stream);
 #endif // wxUSE_STREAMS
 
-    // helper for the derived classes SaveFile() implementations: returns the
-    // values of x- and y-resolution options specified as the image options if
-    // any
-    static wxImageResolution
-    GetResolutionFromOptions(const wxImage& image, int *x, int *y);
-
-
     wxString  m_name;
     wxString  m_extension;
-    wxArrayString m_altExtensions;
     wxString  m_mime;
-    wxBitmapType m_type;
+    long      m_type;
 
 private:
     DECLARE_CLASS(wxImageHandler)
@@ -179,7 +125,7 @@ private:
 // wxImageHistogram
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxImageHistogramEntry
+class WXDLLEXPORT wxImageHistogramEntry
 {
 public:
     wxImageHistogramEntry() { index = value = 0; }
@@ -191,7 +137,7 @@ WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry,
                              wxIntegerHash, wxIntegerEqual,
                              wxImageHistogramBase);
 
-class WXDLLIMPEXP_CORE wxImageHistogram : public wxImageHistogramBase
+class WXDLLEXPORT wxImageHistogram : public wxImageHistogramBase
 {
 public:
     wxImageHistogram() : wxImageHistogramBase(256) { }
@@ -221,7 +167,7 @@ public:
 // wxImage
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxImage: public wxObject
+class WXDLLEXPORT wxImage: public wxObject
 {
 public:
     // red, green and blue are 8 bit unsigned integers in the range of 0..255
@@ -247,60 +193,30 @@ public:
         double value;
     };
 
-    wxImage() {}
-    wxImage( int width, int height, bool clear = true )
-        { Create( width, height, clear ); }
-    wxImage( int width, int height, unsigned char* data, bool static_data = false )
-        { Create( width, height, data, static_data ); }
-    wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false )
-        { Create( width, height, data, alpha, static_data ); }
-
-    // ctor variants using wxSize:
-    wxImage( const wxSize& sz, bool clear = true )
-        { Create( sz, clear ); }
-    wxImage( const wxSize& sz, unsigned char* data, bool static_data = false )
-        { Create( sz, data, static_data ); }
-    wxImage( const wxSize& sz, unsigned char* data, unsigned char* alpha, bool static_data = false )
-        { Create( sz, data, alpha, static_data ); }
-
-    wxImage( const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 )
-        { LoadFile( name, type, index ); }
-    wxImage( const wxString& name, const wxString& mimetype, int index = -1 )
-        { LoadFile( name, mimetype, index ); }
-    wxImage( const char* const* xpmData )
-        { Create(xpmData); }
+    wxImage(){}
+    wxImage( int width, int height, bool clear = true );
+    wxImage( int width, int height, unsigned char* data, bool static_data = false );
+    wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
+    wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
+    wxImage( const wxString& name, const wxString& mimetype, int index = -1 );
+    wxImage( const char* const* xpmData );
 
 #if wxUSE_STREAMS
-    wxImage( wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 )
-        { LoadFile( stream, type, index ); }
-    wxImage( wxInputStream& stream, const wxString& mimetype, int index = -1 )
-        { LoadFile( stream, mimetype, index ); }
+    wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
+    wxImage( wxInputStream& stream, const wxString& mimetype, int index = -1 );
 #endif // wxUSE_STREAMS
 
-    bool Create( const char* const* xpmData );
-#ifdef __BORLANDC__
-    // needed for Borland 5.5
-    wxImage( char** xpmData ) { Create(const_cast<const char* const*>(xpmData)); }
-    bool Create( char** xpmData ) { return Create(const_cast<const char* const*>(xpmData)); }
-#endif
-
     bool Create( int width, int height, bool clear = true );
     bool Create( int width, int height, unsigned char* data, bool static_data = false );
     bool Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
-
-    // Create() variants using wxSize:
-    bool Create( const wxSize& sz, bool clear = true )
-        { return Create(sz.GetWidth(), sz.GetHeight(), clear); }
-    bool Create( const wxSize& sz, unsigned char* data, bool static_data = false )
-        { return Create(sz.GetWidth(), sz.GetHeight(), data, static_data); }
-    bool Create( const wxSize& sz, unsigned char* data, unsigned char* alpha, bool static_data = false )
-        { return Create(sz.GetWidth(), sz.GetHeight(), data, alpha, static_data); }
-
+    bool Create( const char* const* xpmData );
+#ifdef __BORLANDC__
+    // needed for Borland 5.5
+    wxImage( char** xpmData ) { Create(wx_const_cast(const char* const*, xpmData)); }
+    bool Create( char** xpmData ) { return Create(wx_const_cast(const char* const*, xpmData)); }
+#endif
     void Destroy();
 
-    // initialize the image data with zeroes
-    void Clear(unsigned char value = 0);
-
     // creates an identical copy of the image (the = operator
     // just raises the ref count)
     wxImage Copy() const;
@@ -320,26 +236,21 @@ public:
     void Paste( const wxImage &image, int x, int y );
 
     // return the new image with size width*height
-    wxImage Scale( int width, int height,
-                   wxImageResizeQuality quality = wxIMAGE_QUALITY_NORMAL ) const;
+    wxImage Scale( int width, int height, int quality = wxIMAGE_QUALITY_NORMAL ) const;
 
     // box averager and bicubic filters for up/down sampling
-    wxImage ResampleNearest(int width, int height) const;
     wxImage ResampleBox(int width, int height) const;
-    wxImage ResampleBilinear(int width, int height) const;
     wxImage ResampleBicubic(int width, int height) const;
 
     // blur the image according to the specified pixel radius
-    wxImage Blur(int radius) const;
-    wxImage BlurHorizontal(int radius) const;
-    wxImage BlurVertical(int radius) const;
+    wxImage Blur(int radius);
+    wxImage BlurHorizontal(int radius);
+    wxImage BlurVertical(int radius);
 
     wxImage ShrinkBy( int xFactor , int yFactor ) const ;
 
     // rescales the image in place
-    wxImage& Rescale( int width, int height,
-                      wxImageResizeQuality quality = wxIMAGE_QUALITY_NORMAL )
-        { return *this = Scale(width, height, quality); }
+    wxImage& Rescale( int width, int height, int quality = wxIMAGE_QUALITY_NORMAL ) { return *this = Scale(width, height, quality); }
 
     // resizes the image in place
     wxImage& Resize( const wxSize& size, const wxPoint& pos,
@@ -348,10 +259,9 @@ public:
     // Rotates the image about the given point, 'angle' radians.
     // Returns the rotated image, leaving this image intact.
     wxImage Rotate(double angle, const wxPoint & centre_of_rotation,
-                   bool interpolating = true, wxPoint * offset_after_rotation = NULL) const;
+                   bool interpolating = true, wxPoint * offset_after_rotation = (wxPoint*) NULL) const;
 
     wxImage Rotate90( bool clockwise = true ) const;
-    wxImage Rotate180() const;
     wxImage Mirror( bool horizontally = true ) const;
 
     // replace one colour with another
@@ -359,17 +269,13 @@ public:
                   unsigned char r2, unsigned char g2, unsigned char b2 );
 
     // Convert to greyscale image. Uses the luminance component (Y) of the image.
-    // The luma value (YUV) is calculated using (R * weight_r) + (G * weight_g) + (B * weight_b), defaults to ITU-T BT.601
-    wxImage ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const;
-    wxImage ConvertToGreyscale(void) const;
+    // The luma value (YUV) is calculated using (R * lr) + (G * lg) + (B * lb), defaults to ITU-T BT.601
+    wxImage ConvertToGreyscale( double lr = 0.299, double lg = 0.587, double lb = 0.114 ) const;
 
     // convert to monochrome image (<r,g,b> will be replaced by white,
     // everything else by black)
     wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const;
 
-    // Convert to disabled (dimmed) image.
-    wxImage ConvertToDisabled(unsigned char brightness = 255) const;
-
     // these routines are slow but safe
     void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
     void SetRGB( const wxRect& rect, unsigned char r, unsigned char g, unsigned char b );
@@ -389,13 +295,9 @@ public:
     bool SetMaskFromImage(const wxImage & mask,
                           unsigned char mr, unsigned char mg, unsigned char mb);
 
-    // converts image's alpha channel to mask (choosing mask colour
-    // automatically or using the specified colour for the mask), if it has
-    // any, does nothing otherwise:
+    // converts image's alpha channel to mask, if it has any, does nothing
+    // otherwise:
     bool ConvertAlphaToMask(unsigned char threshold = wxIMAGE_ALPHA_THRESHOLD);
-    bool ConvertAlphaToMask(unsigned char mr, unsigned char mg, unsigned char mb,
-                            unsigned char threshold = wxIMAGE_ALPHA_THRESHOLD);
-
 
     // This method converts an image where the original alpha
     // information is only available as a shades of a colour
@@ -410,23 +312,23 @@ public:
     bool ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b );
 
     static bool CanRead( const wxString& name );
-    static int GetImageCount( const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY );
-    virtual bool LoadFile( const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 );
+    static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
+    virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
     virtual bool LoadFile( const wxString& name, const wxString& mimetype, int index = -1 );
 
 #if wxUSE_STREAMS
     static bool CanRead( wxInputStream& stream );
-    static int GetImageCount( wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY );
-    virtual bool LoadFile( wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 );
+    static int GetImageCount( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
+    virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
     virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 );
 #endif
 
     virtual bool SaveFile( const wxString& name ) const;
-    virtual bool SaveFile( const wxString& name, wxBitmapType type ) const;
+    virtual bool SaveFile( const wxString& name, int type ) const;
     virtual bool SaveFile( const wxString& name, const wxString& mimetype ) const;
 
 #if wxUSE_STREAMS
-    virtual bool SaveFile( wxOutputStream& stream, wxBitmapType type ) const;
+    virtual bool SaveFile( wxOutputStream& stream, int type ) const;
     virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ) const;
 #endif
 
@@ -435,17 +337,6 @@ public:
     int GetWidth() const;
     int GetHeight() const;
 
-    wxSize GetSize() const
-        { return wxSize(GetWidth(), GetHeight()); }
-
-    // Gets the type of image found by LoadFile or specified with SaveFile
-    wxBitmapType GetType() const;
-
-    // Set the image type, this is normally only called if the image is being
-    // created from data in the given format but not using LoadFile() (e.g.
-    // wxGIFDecoder uses this)
-    void SetType(wxBitmapType type);
-
     // these functions provide fastest access to wxImage data but should be
     // used carefully as no checks are done
     unsigned char *GetData() const;
@@ -456,7 +347,6 @@ public:
     bool HasAlpha() const { return GetAlpha() != NULL; }
     void SetAlpha(unsigned char *alpha = NULL, bool static_data=false);
     void InitAlpha();
-    void ClearAlpha();
 
     // return true if this pixel is masked or has alpha less than specified
     // threshold
@@ -507,9 +397,8 @@ public:
     static void InsertHandler( wxImageHandler *handler );
     static bool RemoveHandler( const wxString& name );
     static wxImageHandler *FindHandler( const wxString& name );
-    static wxImageHandler *FindHandler( const wxString& extension, wxBitmapType imageType );
-    static wxImageHandler *FindHandler( wxBitmapType imageType );
-
+    static wxImageHandler *FindHandler( const wxString& extension, long imageType );
+    static wxImageHandler *FindHandler( long imageType );
     static wxImageHandler *FindHandlerMime( const wxString& mimetype );
 
     static wxString GetImageExtWildcard();
@@ -520,65 +409,6 @@ public:
     static HSVValue RGBtoHSV(const RGBValue& rgb);
     static RGBValue HSVtoRGB(const HSVValue& hsv);
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR(
-        wxImage(const wxString& name, long type, int index = -1)
-        {
-            LoadFile(name, (wxBitmapType)type, index);
-        }
-    )
-
-#if wxUSE_STREAMS
-    wxDEPRECATED_CONSTRUCTOR(
-        wxImage(wxInputStream& stream, long type, int index = -1)
-        {
-            LoadFile(stream, (wxBitmapType)type, index);
-        }
-    )
-
-    wxDEPRECATED(
-        bool LoadFile(wxInputStream& stream, long type, int index = -1)
-        {
-            return LoadFile(stream, (wxBitmapType)type, index);
-        }
-    )
-
-    wxDEPRECATED(
-        bool SaveFile(wxOutputStream& stream, long type) const
-        {
-            return SaveFile(stream, (wxBitmapType)type);
-        }
-    )
-#endif // wxUSE_STREAMS
-
-    wxDEPRECATED(
-        bool LoadFile(const wxString& name, long type, int index = -1)
-        {
-            return LoadFile(name, (wxBitmapType)type, index);
-        }
-    )
-
-    wxDEPRECATED(
-        bool SaveFile(const wxString& name, long type) const
-        {
-            return SaveFile(name, (wxBitmapType)type);
-        }
-    )
-
-    static wxDEPRECATED(
-        wxImageHandler *FindHandler(const wxString& ext, long type)
-        {
-            return FindHandler(ext, (wxBitmapType)type);
-        }
-    )
-
-    static wxDEPRECATED(
-        wxImageHandler *FindHandler(long imageType)
-        {
-            return FindHandler((wxBitmapType)imageType);
-        }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
 
 protected:
     static wxList   sm_handlers;
@@ -595,41 +425,13 @@ protected:
 private:
     friend class WXDLLIMPEXP_FWD_CORE wxImageHandler;
 
-    // Possible values for MakeEmptyClone() flags.
-    enum
-    {
-        // Create an image with the same orientation as this one. This is the
-        // default and only exists for symmetry with SwapOrientation.
-        Clone_SameOrientation = 0,
-
-        // Create an image with the same height as this image width and the
-        // same width as this image height.
-        Clone_SwapOrientation = 1
-    };
-
-    // Returns a new blank image with the same dimensions (or with width and
-    // height swapped if Clone_SwapOrientation flag is given), alpha, and mask
-    // as this image itself. This is used by several functions creating
-    // modified versions of this image.
-    wxImage MakeEmptyClone(int flags = Clone_SameOrientation) const;
-
-#if wxUSE_STREAMS
-    // read the image from the specified stream updating image type if
-    // successful
-    bool DoLoad(wxImageHandler& handler, wxInputStream& stream, int index);
-
-    // write the image to the specified stream and also update the image type
-    // if successful
-    bool DoSave(wxImageHandler& handler, wxOutputStream& stream) const;
-#endif // wxUSE_STREAMS
-
     DECLARE_DYNAMIC_CLASS(wxImage)
 };
 
 
-extern void WXDLLIMPEXP_CORE wxInitAllImageHandlers();
+extern void WXDLLEXPORT wxInitAllImageHandlers();
 
-extern WXDLLIMPEXP_DATA_CORE(wxImage)    wxNullImage;
+extern WXDLLEXPORT_DATA(wxImage)    wxNullImage;
 
 //-----------------------------------------------------------------------------
 // wxImage handlers
diff --git a/Source/3rd Party/wx/include/wx/imaggif.h b/Source/3rd Party/wx/include/wx/imaggif.h
index fce797ae5..21b58e618 100644
--- a/Source/3rd Party/wx/include/wx/imaggif.h	
+++ b/Source/3rd Party/wx/include/wx/imaggif.h	
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/imaggif.h
+// Name:        imaggif.h
 // Purpose:     wxImage GIF handler
-// Author:      Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999-2011 Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K
+// Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
+// RCS-ID:      $Id: imaggif.h 37393 2006-02-08 21:47:09Z VZ $
+// Copyright:   (c) Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -19,13 +19,7 @@
 
 #if wxUSE_GIF
 
-#define wxIMAGE_OPTION_GIF_COMMENT wxT("GifComment")
-
-struct wxRGB;
-struct GifHashTableType;
-class WXDLLIMPEXP_FWD_CORE wxImageArray; // anidecod.h
-
-class WXDLLIMPEXP_CORE wxGIFHandler : public wxImageHandler
+class WXDLLEXPORT wxGIFHandler : public wxImageHandler
 {
 public:
     inline wxGIFHandler()
@@ -34,61 +28,21 @@ public:
         m_extension = wxT("gif");
         m_type = wxBITMAP_TYPE_GIF;
         m_mime = wxT("image/gif");
-        m_hashTable = NULL;
     }
 
 #if wxUSE_STREAMS
-    virtual bool LoadFile(wxImage *image, wxInputStream& stream,
-                          bool verbose = true, int index = -1);
-    virtual bool SaveFile(wxImage *image, wxOutputStream& stream,
-                          bool verbose=true);
-
-    // Save animated gif
-    bool SaveAnimation(const wxImageArray& images, wxOutputStream *stream,
-        bool verbose = true, int delayMilliSecs = 1000);
-
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
 protected:
-    virtual int DoGetImageCount(wxInputStream& stream);
-    virtual bool DoCanRead(wxInputStream& stream);
-
-    bool DoSaveFile(const wxImage&, wxOutputStream *, bool verbose,
-        bool first, int delayMilliSecs, bool loop,
-        const wxRGB *pal, int palCount,
-        int mask_index);
-#endif // wxUSE_STREAMS
-protected:
-
-    // Declarations for saving
-
-    unsigned long m_crntShiftDWord;   /* For bytes decomposition into codes. */
-    int m_pixelCount;
-    struct GifHashTableType *m_hashTable;
-    wxInt16
-      m_EOFCode,     /* The EOF LZ code. */
-      m_clearCode,   /* The CLEAR LZ code. */
-      m_runningCode, /* The next code algorithm can generate. */
-      m_runningBits, /* The number of bits required to represent RunningCode. */
-      m_maxCode1,    /* 1 bigger than max. possible code, in RunningBits bits. */
-      m_crntCode,    /* Current algorithm code. */
-      m_crntShiftState;    /* Number of bits in CrntShiftDWord. */
-    wxUint8 m_LZBuf[256];   /* Compressed input is buffered here. */
-
-    bool InitHashTable();
-    void ClearHashTable();
-    void InsertHashTable(unsigned long key, int code);
-    int  ExistsHashTable(unsigned long key);
-
-#if wxUSE_STREAMS
-    bool CompressOutput(wxOutputStream *, int code);
-    bool SetupCompress(wxOutputStream *, int bpp);
-    bool CompressLine(wxOutputStream *, const wxUint8 *line, int lineLen);
+    virtual bool DoCanRead( wxInputStream& stream );
 #endif
 
 private:
     DECLARE_DYNAMIC_CLASS(wxGIFHandler)
 };
+#endif
 
-#endif // wxUSE_GIF
 
-#endif // _WX_IMAGGIF_H_
+#endif
+  // _WX_IMAGGIF_H_
 
diff --git a/Source/3rd Party/wx/include/wx/imagiff.h b/Source/3rd Party/wx/include/wx/imagiff.h
index 06e1daefc..6b47da735 100644
--- a/Source/3rd Party/wx/include/wx/imagiff.h	
+++ b/Source/3rd Party/wx/include/wx/imagiff.h	
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/imagiff.h
+// Name:        imagiff.h
 // Purpose:     wxImage handler for Amiga IFF images
 // Author:      Steffen Gutmann
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imagiff.h 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) Steffen Gutmann, 2002
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@
 
 #if wxUSE_IMAGE && wxUSE_IFF
 
-class WXDLLIMPEXP_CORE wxIFFHandler : public wxImageHandler
+class WXDLLEXPORT wxIFFHandler : public wxImageHandler
 {
 public:
     wxIFFHandler()
@@ -32,10 +32,10 @@ public:
 #if wxUSE_STREAMS
     virtual bool LoadFile(wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1);
     virtual bool SaveFile(wxImage *image, wxOutputStream& stream, bool verbose=true);
-protected:
     virtual bool DoCanRead(wxInputStream& stream);
 #endif
 
+private:
     DECLARE_DYNAMIC_CLASS(wxIFFHandler)
 };
 
diff --git a/Source/3rd Party/wx/include/wx/imagjpeg.h b/Source/3rd Party/wx/include/wx/imagjpeg.h
index ad13c400d..410b7cc93 100644
--- a/Source/3rd Party/wx/include/wx/imagjpeg.h	
+++ b/Source/3rd Party/wx/include/wx/imagjpeg.h	
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/imagjpeg.h
+// Name:        imagjpeg.h
 // Purpose:     wxImage JPEG handler
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imagjpeg.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,23 +19,18 @@
 #if wxUSE_LIBJPEG
 
 #include "wx/image.h"
-#include "wx/versioninfo.h"
 
-class WXDLLIMPEXP_CORE wxJPEGHandler: public wxImageHandler
+class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
 {
 public:
     inline wxJPEGHandler()
     {
         m_name = wxT("JPEG file");
         m_extension = wxT("jpg");
-        m_altExtensions.Add(wxT("jpeg"));
-        m_altExtensions.Add(wxT("jpe"));
         m_type = wxBITMAP_TYPE_JPEG;
         m_mime = wxT("image/jpeg");
     }
 
-    static wxVersionInfo GetLibraryVersionInfo();
-
 #if wxUSE_STREAMS
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
diff --git a/Source/3rd Party/wx/include/wx/imaglist.h b/Source/3rd Party/wx/include/wx/imaglist.h
index 0a08bb5b7..91cf8eac6 100644
--- a/Source/3rd Party/wx/include/wx/imaglist.h	
+++ b/Source/3rd Party/wx/include/wx/imaglist.h	
@@ -5,15 +5,13 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imaglist.h 41288 2006-09-18 23:06:35Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IMAGLIST_H_BASE_
 #define _WX_IMAGLIST_H_BASE_
 
-#include "wx/defs.h"
-
 /*
  * wxImageList is used for wxListCtrl, wxTreeCtrl. These controls refer to
  * images for their items by an index into an image list.
@@ -42,7 +40,7 @@ enum
 #define wxIMAGELIST_DRAW_SELECTED       0x0004
 #define wxIMAGELIST_DRAW_FOCUSED        0x0008
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
+#if defined(__WXMSW__) || defined(__WXMAC_CARBON__)
     #define wxHAS_NATIVE_IMAGELIST
 #endif
 
@@ -50,8 +48,8 @@ enum
     #include "wx/generic/imaglist.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/imaglist.h"
-#elif defined(__WXMAC__)
-    #include "wx/osx/imaglist.h"
+#elif defined(__WXMAC_CARBON__)
+    #include "wx/mac/imaglist.h"
 #endif
 
 #endif // _WX_IMAGLIST_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/imagpcx.h b/Source/3rd Party/wx/include/wx/imagpcx.h
index 193bd4e71..f56048f84 100644
--- a/Source/3rd Party/wx/include/wx/imagpcx.h	
+++ b/Source/3rd Party/wx/include/wx/imagpcx.h	
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/imagpcx.h
+// Name:        imagpcx.h
 // Purpose:     wxImage PCX handler
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imagpcx.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) 1999 Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PCX
-class WXDLLIMPEXP_CORE wxPCXHandler : public wxImageHandler
+class WXDLLEXPORT wxPCXHandler : public wxImageHandler
 {
 public:
     inline wxPCXHandler()
diff --git a/Source/3rd Party/wx/include/wx/imagpng.h b/Source/3rd Party/wx/include/wx/imagpng.h
index 5524d6336..daea3a26f 100644
--- a/Source/3rd Party/wx/include/wx/imagpng.h	
+++ b/Source/3rd Party/wx/include/wx/imagpng.h	
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/imagpng.h
+// Name:        imagpng.h
 // Purpose:     wxImage PNG handler
 // Author:      Robert Roebling
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imagpng.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,25 +19,18 @@
 #if wxUSE_LIBPNG
 
 #include "wx/image.h"
-#include "wx/versioninfo.h"
 
 #define wxIMAGE_OPTION_PNG_FORMAT    wxT("PngFormat")
 #define wxIMAGE_OPTION_PNG_BITDEPTH  wxT("PngBitDepth")
-#define wxIMAGE_OPTION_PNG_FILTER    wxT("PngF")
-#define wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL       wxT("PngZL")
-#define wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL   wxT("PngZM")
-#define wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY    wxT("PngZS")
-#define wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE wxT("PngZB")
 
 enum
 {
     wxPNG_TYPE_COLOUR = 0,
     wxPNG_TYPE_GREY = 2,
-    wxPNG_TYPE_GREY_RED = 3,
-    wxPNG_TYPE_PALETTE = 4
+    wxPNG_TYPE_GREY_RED = 3
 };
 
-class WXDLLIMPEXP_CORE wxPNGHandler: public wxImageHandler
+class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
 public:
     inline wxPNGHandler()
@@ -48,8 +41,6 @@ public:
         m_mime = wxT("image/png");
     }
 
-    static wxVersionInfo GetLibraryVersionInfo();
-
 #if wxUSE_STREAMS
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
diff --git a/Source/3rd Party/wx/include/wx/imagpnm.h b/Source/3rd Party/wx/include/wx/imagpnm.h
index e8ca02a01..68b95efd9 100644
--- a/Source/3rd Party/wx/include/wx/imagpnm.h	
+++ b/Source/3rd Party/wx/include/wx/imagpnm.h	
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/imagpnm.h
+// Name:        imagpnm.h
 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imagpnm.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) Sylvain Bougnoux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,16 +17,13 @@
 //-----------------------------------------------------------------------------
 
 #if wxUSE_PNM
-class WXDLLIMPEXP_CORE wxPNMHandler : public wxImageHandler
+class WXDLLEXPORT wxPNMHandler : public wxImageHandler
 {
 public:
     inline wxPNMHandler()
     {
         m_name = wxT("PNM file");
         m_extension = wxT("pnm");
-        m_altExtensions.Add(wxT("ppm"));
-        m_altExtensions.Add(wxT("pgm"));
-        m_altExtensions.Add(wxT("pbm"));
         m_type = wxBITMAP_TYPE_PNM;
         m_mime = wxT("image/pnm");
     }
diff --git a/Source/3rd Party/wx/include/wx/imagtga.h b/Source/3rd Party/wx/include/wx/imagtga.h
index 361d88738..9b0a84187 100644
--- a/Source/3rd Party/wx/include/wx/imagtga.h	
+++ b/Source/3rd Party/wx/include/wx/imagtga.h	
@@ -2,7 +2,7 @@
 // Name:        wx/imagtga.h
 // Purpose:     wxImage TGA handler
 // Author:      Seth Jackson
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imagtga.h 43843 2006-12-07 05:44:44Z PC $
 // Copyright:   (c) 2005 Seth Jackson
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,14 +18,13 @@
 
 #if wxUSE_TGA
 
-class WXDLLIMPEXP_CORE wxTGAHandler : public wxImageHandler
+class WXDLLEXPORT wxTGAHandler : public wxImageHandler
 {
 public:
     wxTGAHandler()
     {
         m_name = wxT("TGA file");
         m_extension = wxT("tga");
-        m_altExtensions.Add(wxT("tpic"));
         m_type = wxBITMAP_TYPE_TGA;
         m_mime = wxT("image/tga");
     }
diff --git a/Source/3rd Party/wx/include/wx/imagtiff.h b/Source/3rd Party/wx/include/wx/imagtiff.h
index 5363fdfe5..53df633a3 100644
--- a/Source/3rd Party/wx/include/wx/imagtiff.h	
+++ b/Source/3rd Party/wx/include/wx/imagtiff.h	
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/imagtiff.h
+// Name:        imagtiff.h
 // Purpose:     wxImage TIFF handler
 // Author:      Robert Roebling
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imagtiff.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,34 +19,23 @@
 #if wxUSE_LIBTIFF
 
 #include "wx/image.h"
-#include "wx/versioninfo.h"
 
 // defines for wxImage::SetOption
-#define wxIMAGE_OPTION_TIFF_BITSPERSAMPLE               wxString(wxT("BitsPerSample"))
-#define wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL             wxString(wxT("SamplesPerPixel"))
-#define wxIMAGE_OPTION_TIFF_COMPRESSION                 wxString(wxT("Compression"))
-#define wxIMAGE_OPTION_TIFF_PHOTOMETRIC                 wxString(wxT("Photometric"))
-#define wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR             wxString(wxT("ImageDescriptor"))
+#define wxIMAGE_OPTION_BITSPERSAMPLE               wxString(wxT("BitsPerSample"))
+#define wxIMAGE_OPTION_SAMPLESPERPIXEL             wxString(wxT("SamplesPerPixel"))
+#define wxIMAGE_OPTION_COMPRESSION                 wxString(wxT("Compression"))
+#define wxIMAGE_OPTION_IMAGEDESCRIPTOR             wxString(wxT("ImageDescriptor"))
 
-// for backwards compatibility
-#define wxIMAGE_OPTION_BITSPERSAMPLE               wxIMAGE_OPTION_TIFF_BITSPERSAMPLE
-#define wxIMAGE_OPTION_SAMPLESPERPIXEL             wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL
-#define wxIMAGE_OPTION_COMPRESSION                 wxIMAGE_OPTION_TIFF_COMPRESSION
-#define wxIMAGE_OPTION_IMAGEDESCRIPTOR             wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR
-
-class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler
+class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
 {
 public:
     wxTIFFHandler();
 
-    static wxVersionInfo GetLibraryVersionInfo();
-
 #if wxUSE_STREAMS
     virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
     virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
-
+    virtual int GetImageCount( wxInputStream& stream );
 protected:
-    virtual int DoGetImageCount( wxInputStream& stream );
     virtual bool DoCanRead( wxInputStream& stream );
 #endif
 
diff --git a/Source/3rd Party/wx/include/wx/imagxpm.h b/Source/3rd Party/wx/include/wx/imagxpm.h
index 5dfd27f29..4bff4894f 100644
--- a/Source/3rd Party/wx/include/wx/imagxpm.h	
+++ b/Source/3rd Party/wx/include/wx/imagxpm.h	
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/imagxpm.h
+// Name:        imaggif.h
 // Purpose:     wxImage XPM handler
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imagxpm.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,13 +12,12 @@
 
 #include "wx/image.h"
 
-#if wxUSE_XPM
 
 //-----------------------------------------------------------------------------
 // wxXPMHandler
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxXPMHandler : public wxImageHandler
+class WXDLLEXPORT wxXPMHandler : public wxImageHandler
 {
 public:
     inline wxXPMHandler()
@@ -40,6 +39,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxXPMHandler)
 };
 
-#endif // wxUSE_XPM
 
-#endif // _WX_IMAGXPM_H_
+#endif
+  // _WX_IMAGXPM_H_
+
diff --git a/Source/3rd Party/wx/include/wx/infobar.h b/Source/3rd Party/wx/include/wx/infobar.h
deleted file mode 100644
index 5c3cfe379..000000000
--- a/Source/3rd Party/wx/include/wx/infobar.h	
+++ /dev/null
@@ -1,68 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/infobar.h
-// Purpose:     declaration of wxInfoBarBase defining common API of wxInfoBar
-// Author:      Vadim Zeitlin
-// Created:     2009-07-28
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_INFOBAR_H_
-#define _WX_INFOBAR_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_INFOBAR
-
-#include "wx/control.h"
-
-// ----------------------------------------------------------------------------
-// wxInfoBar shows non-critical but important information to the user
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxInfoBarBase : public wxControl
-{
-public:
-    // real ctors are provided by the derived classes, just notice that unlike
-    // most of the other windows, info bar is created hidden and must be
-    // explicitly shown when it is needed (this is done because it is supposed
-    // to be shown only intermittently and hiding it after creating it from the
-    // user code would result in flicker)
-    wxInfoBarBase() { }
-
-
-    // show the info bar with the given message and optionally an icon
-    virtual void ShowMessage(const wxString& msg,
-                             int flags = wxICON_INFORMATION) = 0;
-
-    // hide the info bar
-    virtual void Dismiss() = 0;
-
-    // add an extra button to the bar, near the message (replacing the default
-    // close button which is only shown if no extra buttons are used)
-    virtual void AddButton(wxWindowID btnid,
-                           const wxString& label = wxString()) = 0;
-
-    // remove a button previously added by AddButton()
-    virtual void RemoveButton(wxWindowID btnid) = 0;
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxInfoBarBase);
-};
-
-// currently only GTK+ has a native implementation
-#if defined(__WXGTK218__) && !defined(__WXUNIVERSAL__)
-    #include "wx/gtk/infobar.h"
-    #define wxHAS_NATIVE_INFOBAR
-#endif // wxGTK2
-
-// if the generic version is the only one we have, use it
-#ifndef wxHAS_NATIVE_INFOBAR
-    #include "wx/generic/infobar.h"
-    #define wxInfoBar wxInfoBarGeneric
-#endif
-
-#endif // wxUSE_INFOBAR
-
-#endif // _WX_INFOBAR_H_
diff --git a/Source/3rd Party/wx/include/wx/init.h b/Source/3rd Party/wx/include/wx/init.h
index 611a893dc..d07112ff5 100644
--- a/Source/3rd Party/wx/include/wx/init.h	
+++ b/Source/3rd Party/wx/include/wx/init.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: init.h 61558 2009-07-30 10:14:36Z VS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,7 @@
 #define _WX_INIT_H_
 
 #include "wx/defs.h"
-#include "wx/chartype.h"
+#include "wx/wxchar.h"
 
 // ----------------------------------------------------------------------------
 // wxEntry helper functions which allow to have more fine grained control
@@ -53,23 +53,16 @@ extern int WXDLLIMPEXP_BASE wxEntry(int& argc, char **argv);
 
 #endif// wxUSE_UNICODE
 
-// Under Windows we define additional wxEntry() overloads with signature
-// compatible with WinMain() and not the traditional main().
-#if wxUSE_GUI && defined(__WINDOWS__)
-    #include "wx/msw/init.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // Using the library without (explicit) application object: you may avoid using
-// wxDECLARE_APP and wxIMPLEMENT_APP macros and call the functions below instead at
+// DECLARE_APP and IMPLEMENT_APP macros and call the functions below instead at
 // the program startup and termination
 // ----------------------------------------------------------------------------
 
 // initialize the library (may be called as many times as needed, but each
 // call to wxInitialize() must be matched by wxUninitialize())
-extern bool WXDLLIMPEXP_BASE wxInitialize();
-extern bool WXDLLIMPEXP_BASE wxInitialize(int argc, wxChar **argv);
-#if wxUSE_UNICODE
+extern bool WXDLLIMPEXP_BASE wxInitialize(int argc = 0, wxChar **argv = NULL);
+#if wxUSE_UNICODE && wxABI_VERSION >= 20811
 extern bool WXDLLIMPEXP_BASE wxInitialize(int argc, char **argv);
 #endif
 
@@ -83,17 +76,12 @@ class WXDLLIMPEXP_BASE wxInitializer
 {
 public:
     // initialize the library
-    wxInitializer()
-    {
-        m_ok = wxInitialize();
-    }
-
-    wxInitializer(int argc, wxChar **argv)
+    wxInitializer(int argc = 0, wxChar **argv = NULL)
     {
         m_ok = wxInitialize(argc, argv);
     }
 
-#if wxUSE_UNICODE
+#if wxUSE_UNICODE && wxABI_VERSION >= 20811
     wxInitializer(int argc, char **argv)
     {
         m_ok = wxInitialize(argc, argv);
diff --git a/Source/3rd Party/wx/include/wx/intl.h b/Source/3rd Party/wx/include/wx/intl.h
index f84e4626d..ed5631a83 100644
--- a/Source/3rd Party/wx/include/wx/intl.h	
+++ b/Source/3rd Party/wx/include/wx/intl.h	
@@ -5,17 +5,19 @@
 // Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
 //              (2003/09/30 - plural forms support)
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: intl.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// WARNING: Parts of this file are generated. See misc/languages/README for
+// details.
+
 #ifndef _WX_INTL_H_
 #define _WX_INTL_H_
 
 #include "wx/defs.h"
 #include "wx/string.h"
-#include "wx/translation.h"
 
 // Make wxLayoutDirection enum available without need for wxUSE_INTL so wxWindow, wxApp
 // and other classes are not distrubed by wxUSE_INTL
@@ -30,7 +32,6 @@ enum wxLayoutDirection
 #if wxUSE_INTL
 
 #include "wx/fontenc.h"
-#include "wx/language.h"
 
 // ============================================================================
 // global decls
@@ -40,17 +41,290 @@ enum wxLayoutDirection
 // macros
 // ----------------------------------------------------------------------------
 
+// gettext() style macros (notice that xgettext should be invoked with
+// --keyword="_" --keyword="wxPLURAL:1,2" options
+// to extract the strings from the sources)
+#ifndef WXINTL_NO_GETTEXT_MACRO
+    #define _(s)                     wxGetTranslation(wxT(s))
+    #define wxPLURAL(sing, plur, n)  wxGetTranslation(wxT(sing), wxT(plur), n)
+#endif
+
+// another one which just marks the strings for extraction, but doesn't
+// perform the translation (use -kwxTRANSLATE with xgettext!)
+#define wxTRANSLATE(str) wxT(str)
+
 // ----------------------------------------------------------------------------
 // forward decls
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_BASE wxLocale;
 class WXDLLIMPEXP_FWD_BASE wxLanguageInfoArray;
+class wxMsgCatalog;
 
 // ============================================================================
 // locale support
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// wxLanguage: defines all supported languages
+// ----------------------------------------------------------------------------
+
+// --- --- --- generated code begins here --- --- ---
+
+// This enum is generated by misc/languages/genlang.py
+// When making changes, please put them into misc/languages/langtabl.txt
+enum wxLanguage
+{
+    // user's default/preffered language as got from OS:
+    wxLANGUAGE_DEFAULT,
+    // unknown language, if wxLocale::GetSystemLanguage fails:
+    wxLANGUAGE_UNKNOWN,
+
+    wxLANGUAGE_ABKHAZIAN,
+    wxLANGUAGE_AFAR,
+    wxLANGUAGE_AFRIKAANS,
+    wxLANGUAGE_ALBANIAN,
+    wxLANGUAGE_AMHARIC,
+    wxLANGUAGE_ARABIC,
+    wxLANGUAGE_ARABIC_ALGERIA,
+    wxLANGUAGE_ARABIC_BAHRAIN,
+    wxLANGUAGE_ARABIC_EGYPT,
+    wxLANGUAGE_ARABIC_IRAQ,
+    wxLANGUAGE_ARABIC_JORDAN,
+    wxLANGUAGE_ARABIC_KUWAIT,
+    wxLANGUAGE_ARABIC_LEBANON,
+    wxLANGUAGE_ARABIC_LIBYA,
+    wxLANGUAGE_ARABIC_MOROCCO,
+    wxLANGUAGE_ARABIC_OMAN,
+    wxLANGUAGE_ARABIC_QATAR,
+    wxLANGUAGE_ARABIC_SAUDI_ARABIA,
+    wxLANGUAGE_ARABIC_SUDAN,
+    wxLANGUAGE_ARABIC_SYRIA,
+    wxLANGUAGE_ARABIC_TUNISIA,
+    wxLANGUAGE_ARABIC_UAE,
+    wxLANGUAGE_ARABIC_YEMEN,
+    wxLANGUAGE_ARMENIAN,
+    wxLANGUAGE_ASSAMESE,
+    wxLANGUAGE_AYMARA,
+    wxLANGUAGE_AZERI,
+    wxLANGUAGE_AZERI_CYRILLIC,
+    wxLANGUAGE_AZERI_LATIN,
+    wxLANGUAGE_BASHKIR,
+    wxLANGUAGE_BASQUE,
+    wxLANGUAGE_BELARUSIAN,
+    wxLANGUAGE_BENGALI,
+    wxLANGUAGE_BHUTANI,
+    wxLANGUAGE_BIHARI,
+    wxLANGUAGE_BISLAMA,
+    wxLANGUAGE_BRETON,
+    wxLANGUAGE_BULGARIAN,
+    wxLANGUAGE_BURMESE,
+    wxLANGUAGE_CAMBODIAN,
+    wxLANGUAGE_CATALAN,
+    wxLANGUAGE_CHINESE,
+    wxLANGUAGE_CHINESE_SIMPLIFIED,
+    wxLANGUAGE_CHINESE_TRADITIONAL,
+    wxLANGUAGE_CHINESE_HONGKONG,
+    wxLANGUAGE_CHINESE_MACAU,
+    wxLANGUAGE_CHINESE_SINGAPORE,
+    wxLANGUAGE_CHINESE_TAIWAN,
+    wxLANGUAGE_CORSICAN,
+    wxLANGUAGE_CROATIAN,
+    wxLANGUAGE_CZECH,
+    wxLANGUAGE_DANISH,
+    wxLANGUAGE_DUTCH,
+    wxLANGUAGE_DUTCH_BELGIAN,
+    wxLANGUAGE_ENGLISH,
+    wxLANGUAGE_ENGLISH_UK,
+    wxLANGUAGE_ENGLISH_US,
+    wxLANGUAGE_ENGLISH_AUSTRALIA,
+    wxLANGUAGE_ENGLISH_BELIZE,
+    wxLANGUAGE_ENGLISH_BOTSWANA,
+    wxLANGUAGE_ENGLISH_CANADA,
+    wxLANGUAGE_ENGLISH_CARIBBEAN,
+    wxLANGUAGE_ENGLISH_DENMARK,
+    wxLANGUAGE_ENGLISH_EIRE,
+    wxLANGUAGE_ENGLISH_JAMAICA,
+    wxLANGUAGE_ENGLISH_NEW_ZEALAND,
+    wxLANGUAGE_ENGLISH_PHILIPPINES,
+    wxLANGUAGE_ENGLISH_SOUTH_AFRICA,
+    wxLANGUAGE_ENGLISH_TRINIDAD,
+    wxLANGUAGE_ENGLISH_ZIMBABWE,
+    wxLANGUAGE_ESPERANTO,
+    wxLANGUAGE_ESTONIAN,
+    wxLANGUAGE_FAEROESE,
+    wxLANGUAGE_FARSI,
+    wxLANGUAGE_FIJI,
+    wxLANGUAGE_FINNISH,
+    wxLANGUAGE_FRENCH,
+    wxLANGUAGE_FRENCH_BELGIAN,
+    wxLANGUAGE_FRENCH_CANADIAN,
+    wxLANGUAGE_FRENCH_LUXEMBOURG,
+    wxLANGUAGE_FRENCH_MONACO,
+    wxLANGUAGE_FRENCH_SWISS,
+    wxLANGUAGE_FRISIAN,
+    wxLANGUAGE_GALICIAN,
+    wxLANGUAGE_GEORGIAN,
+    wxLANGUAGE_GERMAN,
+    wxLANGUAGE_GERMAN_AUSTRIAN,
+    wxLANGUAGE_GERMAN_BELGIUM,
+    wxLANGUAGE_GERMAN_LIECHTENSTEIN,
+    wxLANGUAGE_GERMAN_LUXEMBOURG,
+    wxLANGUAGE_GERMAN_SWISS,
+    wxLANGUAGE_GREEK,
+    wxLANGUAGE_GREENLANDIC,
+    wxLANGUAGE_GUARANI,
+    wxLANGUAGE_GUJARATI,
+    wxLANGUAGE_HAUSA,
+    wxLANGUAGE_HEBREW,
+    wxLANGUAGE_HINDI,
+    wxLANGUAGE_HUNGARIAN,
+    wxLANGUAGE_ICELANDIC,
+    wxLANGUAGE_INDONESIAN,
+    wxLANGUAGE_INTERLINGUA,
+    wxLANGUAGE_INTERLINGUE,
+    wxLANGUAGE_INUKTITUT,
+    wxLANGUAGE_INUPIAK,
+    wxLANGUAGE_IRISH,
+    wxLANGUAGE_ITALIAN,
+    wxLANGUAGE_ITALIAN_SWISS,
+    wxLANGUAGE_JAPANESE,
+    wxLANGUAGE_JAVANESE,
+    wxLANGUAGE_KANNADA,
+    wxLANGUAGE_KASHMIRI,
+    wxLANGUAGE_KASHMIRI_INDIA,
+    wxLANGUAGE_KAZAKH,
+    wxLANGUAGE_KERNEWEK,
+    wxLANGUAGE_KINYARWANDA,
+    wxLANGUAGE_KIRGHIZ,
+    wxLANGUAGE_KIRUNDI,
+    wxLANGUAGE_KONKANI,
+    wxLANGUAGE_KOREAN,
+    wxLANGUAGE_KURDISH,
+    wxLANGUAGE_LAOTHIAN,
+    wxLANGUAGE_LATIN,
+    wxLANGUAGE_LATVIAN,
+    wxLANGUAGE_LINGALA,
+    wxLANGUAGE_LITHUANIAN,
+    wxLANGUAGE_MACEDONIAN,
+    wxLANGUAGE_MALAGASY,
+    wxLANGUAGE_MALAY,
+    wxLANGUAGE_MALAYALAM,
+    wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,
+    wxLANGUAGE_MALAY_MALAYSIA,
+    wxLANGUAGE_MALTESE,
+    wxLANGUAGE_MANIPURI,
+    wxLANGUAGE_MAORI,
+    wxLANGUAGE_MARATHI,
+    wxLANGUAGE_MOLDAVIAN,
+    wxLANGUAGE_MONGOLIAN,
+    wxLANGUAGE_NAURU,
+    wxLANGUAGE_NEPALI,
+    wxLANGUAGE_NEPALI_INDIA,
+    wxLANGUAGE_NORWEGIAN_BOKMAL,
+    wxLANGUAGE_NORWEGIAN_NYNORSK,
+    wxLANGUAGE_OCCITAN,
+    wxLANGUAGE_ORIYA,
+    wxLANGUAGE_OROMO,
+    wxLANGUAGE_PASHTO,
+    wxLANGUAGE_POLISH,
+    wxLANGUAGE_PORTUGUESE,
+    wxLANGUAGE_PORTUGUESE_BRAZILIAN,
+    wxLANGUAGE_PUNJABI,
+    wxLANGUAGE_QUECHUA,
+    wxLANGUAGE_RHAETO_ROMANCE,
+    wxLANGUAGE_ROMANIAN,
+    wxLANGUAGE_RUSSIAN,
+    wxLANGUAGE_RUSSIAN_UKRAINE,
+    wxLANGUAGE_SAMOAN,
+    wxLANGUAGE_SANGHO,
+    wxLANGUAGE_SANSKRIT,
+    wxLANGUAGE_SCOTS_GAELIC,
+    wxLANGUAGE_SERBIAN,
+    wxLANGUAGE_SERBIAN_CYRILLIC,
+    wxLANGUAGE_SERBIAN_LATIN,
+    wxLANGUAGE_SERBO_CROATIAN,
+    wxLANGUAGE_SESOTHO,
+    wxLANGUAGE_SETSWANA,
+    wxLANGUAGE_SHONA,
+    wxLANGUAGE_SINDHI,
+    wxLANGUAGE_SINHALESE,
+    wxLANGUAGE_SISWATI,
+    wxLANGUAGE_SLOVAK,
+    wxLANGUAGE_SLOVENIAN,
+    wxLANGUAGE_SOMALI,
+    wxLANGUAGE_SPANISH,
+    wxLANGUAGE_SPANISH_ARGENTINA,
+    wxLANGUAGE_SPANISH_BOLIVIA,
+    wxLANGUAGE_SPANISH_CHILE,
+    wxLANGUAGE_SPANISH_COLOMBIA,
+    wxLANGUAGE_SPANISH_COSTA_RICA,
+    wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
+    wxLANGUAGE_SPANISH_ECUADOR,
+    wxLANGUAGE_SPANISH_EL_SALVADOR,
+    wxLANGUAGE_SPANISH_GUATEMALA,
+    wxLANGUAGE_SPANISH_HONDURAS,
+    wxLANGUAGE_SPANISH_MEXICAN,
+    wxLANGUAGE_SPANISH_MODERN,
+    wxLANGUAGE_SPANISH_NICARAGUA,
+    wxLANGUAGE_SPANISH_PANAMA,
+    wxLANGUAGE_SPANISH_PARAGUAY,
+    wxLANGUAGE_SPANISH_PERU,
+    wxLANGUAGE_SPANISH_PUERTO_RICO,
+    wxLANGUAGE_SPANISH_URUGUAY,
+    wxLANGUAGE_SPANISH_US,
+    wxLANGUAGE_SPANISH_VENEZUELA,
+    wxLANGUAGE_SUNDANESE,
+    wxLANGUAGE_SWAHILI,
+    wxLANGUAGE_SWEDISH,
+    wxLANGUAGE_SWEDISH_FINLAND,
+    wxLANGUAGE_TAGALOG,
+    wxLANGUAGE_TAJIK,
+    wxLANGUAGE_TAMIL,
+    wxLANGUAGE_TATAR,
+    wxLANGUAGE_TELUGU,
+    wxLANGUAGE_THAI,
+    wxLANGUAGE_TIBETAN,
+    wxLANGUAGE_TIGRINYA,
+    wxLANGUAGE_TONGA,
+    wxLANGUAGE_TSONGA,
+    wxLANGUAGE_TURKISH,
+    wxLANGUAGE_TURKMEN,
+    wxLANGUAGE_TWI,
+    wxLANGUAGE_UIGHUR,
+    wxLANGUAGE_UKRAINIAN,
+    wxLANGUAGE_URDU,
+    wxLANGUAGE_URDU_INDIA,
+    wxLANGUAGE_URDU_PAKISTAN,
+    wxLANGUAGE_UZBEK,
+    wxLANGUAGE_UZBEK_CYRILLIC,
+    wxLANGUAGE_UZBEK_LATIN,
+    wxLANGUAGE_VIETNAMESE,
+    wxLANGUAGE_VOLAPUK,
+    wxLANGUAGE_WELSH,
+    wxLANGUAGE_WOLOF,
+    wxLANGUAGE_XHOSA,
+    wxLANGUAGE_YIDDISH,
+    wxLANGUAGE_YORUBA,
+    wxLANGUAGE_ZHUANG,
+    wxLANGUAGE_ZULU,
+
+    // for custom, user-defined languages:
+    wxLANGUAGE_USER_DEFINED
+
+
+#if wxABI_VERSION >= 20808
+    // For binary compatibility, we can't put new items in their normal
+    // position in the enum, because it would change other values.  We have to
+    // put it somewhere well outside normal range -- the particular value used
+    // is arbitrary:
+    , wxLANGUAGE_VALENCIAN = 0x1fffffff,
+    wxLANGUAGE_SAMI
+#endif
+};
+
+// --- --- --- generated code ends here --- --- ---
+
 // ----------------------------------------------------------------------------
 // wxLanguageInfo: encapsulates wxLanguage to OS native lang.desc.
 //                 translation information
@@ -60,30 +334,14 @@ struct WXDLLIMPEXP_BASE wxLanguageInfo
 {
     int Language;                   // wxLanguage id
     wxString CanonicalName;         // Canonical name, e.g. fr_FR
-#ifdef __WINDOWS__
+#ifdef __WIN32__
     wxUint32 WinLang,               // Win32 language identifiers
              WinSublang;
-#endif // __WINDOWS__
+#endif // __WIN32__
     wxString Description;           // human-readable name of the language
     wxLayoutDirection LayoutDirection;
-
-#ifdef __WINDOWS__
-    // return the LCID corresponding to this language
-    wxUint32 GetLCID() const;
-#endif // __WINDOWS__
-
-    // return the locale name corresponding to this language usable with
-    // setlocale() on the current system
-    wxString GetLocaleName() const;
 };
 
-// for Unix systems GetLocaleName() is trivial so implement it inline here, for
-// MSW it's implemented in intl.cpp
-#ifndef __WINDOWS__
-inline wxString wxLanguageInfo::GetLocaleName() const { return CanonicalName; }
-#endif // !__WINDOWS__
-
-
 // ----------------------------------------------------------------------------
 // wxLocaleCategory: the category of locale settings
 // ----------------------------------------------------------------------------
@@ -99,10 +357,6 @@ enum wxLocaleCategory
     // monetary value
     wxLOCALE_CAT_MONEY,
 
-    // default category for wxLocaleInfo values which only apply to a single
-    // category (e.g. wxLOCALE_SHORT_DATE_FMT)
-    wxLOCALE_CAT_DEFAULT,
-
     wxLOCALE_CAT_MAX
 };
 
@@ -112,21 +366,11 @@ enum wxLocaleCategory
 
 enum wxLocaleInfo
 {
-    // the thousands separator (for wxLOCALE_CAT_NUMBER or MONEY)
+    // the thounsands separator
     wxLOCALE_THOUSANDS_SEP,
 
-    // the character used as decimal point (for wxLOCALE_CAT_NUMBER or MONEY)
-    wxLOCALE_DECIMAL_POINT,
-
-    // the stftime()-formats used for short/long date and time representations
-    // (under some platforms short and long date formats are the same)
-    //
-    // NB: these elements should appear in this order, code in GetInfo() relies
-    //     on it
-    wxLOCALE_SHORT_DATE_FMT,
-    wxLOCALE_LONG_DATE_FMT,
-    wxLOCALE_DATE_TIME_FMT,
-    wxLOCALE_TIME_FMT
+    // the character used as decimal point
+    wxLOCALE_DECIMAL_POINT
 
 };
 
@@ -137,12 +381,8 @@ enum wxLocaleInfo
 
 enum wxLocaleInitFlags
 {
-    wxLOCALE_DONT_LOAD_DEFAULT = 0x0000,     // don't load wxwin.mo
-    wxLOCALE_LOAD_DEFAULT      = 0x0001      // load wxwin.mo?
-#if WXWIN_COMPATIBILITY_2_8
-   ,wxLOCALE_CONV_ENCODING     = 0x0002      // no longer used, simply remove
-                                             // it from the existing code
-#endif
+    wxLOCALE_LOAD_DEFAULT  = 0x0001,     // load wxwin.mo?
+    wxLOCALE_CONV_ENCODING = 0x0002      // convert encoding on the fly?
 };
 
 class WXDLLIMPEXP_BASE wxLocale
@@ -155,26 +395,19 @@ public:
     wxLocale() { DoCommonInit(); }
 
         // the ctor has a side effect of changing current locale
-    wxLocale(const wxString& name,                               // name (for messages)
-             const wxString& shortName = wxEmptyString,      // dir prefix (for msg files)
-             const wxString& locale = wxEmptyString,     // locale (for setlocale)
-             bool bLoadDefault = true                            // preload wxstd.mo?
-#if WXWIN_COMPATIBILITY_2_8
-             ,bool bConvertEncoding = true                      // convert Win<->Unix if necessary?
-#endif
-             )
+    wxLocale(const wxChar *szName,                               // name (for messages)
+             const wxChar *szShort = (const wxChar *) NULL,      // dir prefix (for msg files)
+             const wxChar *szLocale = (const wxChar *) NULL,     // locale (for setlocale)
+             bool bLoadDefault = true,                           // preload wxstd.mo?
+             bool bConvertEncoding = false)                      // convert Win<->Unix if necessary?
         {
             DoCommonInit();
 
-#if WXWIN_COMPATIBILITY_2_8
-            Init(name, shortName, locale, bLoadDefault, bConvertEncoding);
-#else
-            Init(name, shortName, locale, bLoadDefault);
-#endif
+            Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding);
         }
 
     wxLocale(int language, // wxLanguage id or custom language
-             int flags = wxLOCALE_LOAD_DEFAULT)
+             int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING)
         {
             DoCommonInit();
 
@@ -182,18 +415,15 @@ public:
         }
 
         // the same as a function (returns true on success)
-    bool Init(const wxString& name,
-              const wxString& shortName = wxEmptyString,
-              const wxString& locale = wxEmptyString,
-              bool bLoadDefault = true
-#if WXWIN_COMPATIBILITY_2_8
-              ,bool bConvertEncoding = true
-#endif
-              );
+    bool Init(const wxChar *szName,
+              const wxChar *szShort = (const wxChar *) NULL,
+              const wxChar *szLocale = (const wxChar *) NULL,
+              bool bLoadDefault = true,
+              bool bConvertEncoding = false);
 
         // same as second ctor (returns true on success)
     bool Init(int language = wxLANGUAGE_DEFAULT,
-              int flags = wxLOCALE_LOAD_DEFAULT);
+              int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
 
         // restores old locale
     virtual ~wxLocale();
@@ -212,14 +442,13 @@ public:
 
     // get the values of the given locale-dependent datum: the current locale
     // is used, the US default value is returned if everything else fails
-    static wxString GetInfo(wxLocaleInfo index,
-                            wxLocaleCategory cat = wxLOCALE_CAT_DEFAULT);
+    static wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat);
 
     // return true if the locale was set successfully
     bool IsOk() const { return m_pszOldLocale != NULL; }
 
     // returns locale name
-    const wxString& GetLocale() const { return m_strLocale; }
+    const wxChar *GetLocale() const { return m_strLocale; }
 
     // return current locale wxLanguage value
     int GetLanguage() const { return m_language; }
@@ -237,8 +466,7 @@ public:
     // (in this order).
     //
     // This only applies to subsequent invocations of AddCatalog()!
-    static void AddCatalogLookupPathPrefix(const wxString& prefix)
-        { wxFileTranslationsLoader::AddCatalogLookupPathPrefix(prefix); }
+    static void AddCatalogLookupPathPrefix(const wxString& prefix);
 
     // add a catalog: it's searched for in standard places (current directory
     // first, system one after), but the you may prepend additional directories to
@@ -247,16 +475,15 @@ public:
     // The loaded catalog will be used for message lookup by GetString().
     //
     // Returns 'true' if it was successfully loaded
-    bool AddCatalog(const wxString& domain);
-    bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage);
-    bool AddCatalog(const wxString& domain,
-                    wxLanguage msgIdLanguage, const wxString& msgIdCharset);
+    bool AddCatalog(const wxChar *szDomain);
+    bool AddCatalog(const wxChar *szDomain,
+                    wxLanguage msgIdLanguage, const wxChar *msgIdCharset);
 
     // check if the given locale is provided by OS and C run time
     static bool IsAvailable(int lang);
 
     // check if the given catalog is loaded
-    bool IsLoaded(const wxString& domain) const;
+    bool IsLoaded(const wxChar *szDomain) const;
 
     // Retrieve the language info struct for the given language
     //
@@ -267,10 +494,6 @@ public:
     // is not in database
     static wxString GetLanguageName(int lang);
 
-    // Returns ISO code ("canonical name") of language or empty string if the
-    // language is not in database
-    static wxString GetLanguageCanonicalName(int lang);
-
     // Find the language for the given locale string which may be either a
     // canonical ISO 2 letter language code ("xx"), a language code followed by
     // the country code ("xx_XX") or a Windows full language name ("Xxxxx...")
@@ -294,32 +517,20 @@ public:
     //
     // domains are searched in the last to first order, i.e. catalogs
     // added later override those added before.
-    const wxString& GetString(const wxString& origString,
-                              const wxString& domain = wxEmptyString) const
-    {
-        return wxGetTranslation(origString, domain);
-    }
+    virtual const wxChar *GetString(const wxChar *szOrigString,
+                                    const wxChar *szDomain = NULL) const;
     // plural form version of the same:
-    const wxString& GetString(const wxString& origString,
-                              const wxString& origString2,
-                              unsigned n,
-                              const wxString& domain = wxEmptyString) const
-    {
-        return wxGetTranslation(origString, origString2, n, domain);
-    }
-
-    // this is hack to work around a problem with wxGetTranslation() which
-    // returns const wxString& and not wxString, so when it returns untranslated
-    // string, it needs to have a copy of it somewhere
-    static const wxString& GetUntranslatedString(const wxString& str)
-        { return wxTranslations::GetUntranslatedString(str); }
+    virtual const wxChar *GetString(const wxChar *szOrigString,
+                                    const wxChar *szOrigString2,
+                                    size_t n,
+                                    const wxChar *szDomain = NULL) const;
 
     // Returns the current short name for the locale
     const wxString& GetName() const { return m_strShort; }
 
     // return the contents of .po file header
-    wxString GetHeaderValue(const wxString& header,
-                            const wxString& domain = wxEmptyString) const;
+    wxString GetHeaderValue( const wxChar* szHeader,
+                             const wxChar* szDomain = NULL ) const;
 
     // These two methods are for internal use only. First one creates
     // ms_languagesDB if it doesn't already exist, second one destroys
@@ -328,9 +539,8 @@ public:
     static void DestroyLanguagesDB();
 
 private:
-    bool DoInit(const wxString& name,
-                const wxString& shortName,
-                const wxString& locale);
+    // find catalog by name in a linked list, return NULL if !found
+    wxMsgCatalog  *FindCatalog(const wxChar *szDomain) const;
 
     // copy default table of languages from global static array to
     // m_langugagesInfo, called by InitLanguagesDB
@@ -343,16 +553,18 @@ private:
                    m_strShort;        // short name for the locale
     int            m_language;        // this locale wxLanguage value
 
-    const char  *m_pszOldLocale;      // previous locale from setlocale()
+    const wxChar  *m_pszOldLocale;    // previous locale from setlocale()
     wxLocale      *m_pOldLocale;      // previous wxLocale
 
+    wxMsgCatalog  *m_pMsgCat;         // pointer to linked list of catalogs
+
+    bool           m_bConvertEncoding;
+
     bool           m_initialized;
 
-    wxTranslations m_translations;
-
     static wxLanguageInfoArray *ms_languagesDB;
 
-    wxDECLARE_NO_COPY_CLASS(wxLocale);
+    DECLARE_NO_COPY_CLASS(wxLocale)
 };
 
 // ----------------------------------------------------------------------------
@@ -362,6 +574,59 @@ private:
 // get the current locale object (note that it may be NULL!)
 extern WXDLLIMPEXP_BASE wxLocale* wxGetLocale();
 
-#endif // wxUSE_INTL
+// get the translation of the string in the current locale
+inline const wxChar *
+wxGetTranslation(const wxChar *sz, const wxChar* domain = NULL)
+{
+    wxLocale *pLoc = wxGetLocale();
+    if (pLoc)
+        return pLoc->GetString(sz, domain);
+    else
+        return sz;
+}
+
+inline const wxChar *
+wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
+                 size_t n,
+                 const wxChar *domain = NULL)
+{
+    wxLocale *pLoc = wxGetLocale();
+    if (pLoc)
+        return pLoc->GetString(sz1, sz2, n, domain);
+    else
+        return n == 1 ? sz1 : sz2;
+}
+
+#else // !wxUSE_INTL
+
+// the macros should still be defined - otherwise compilation would fail
+
+#if !defined(WXINTL_NO_GETTEXT_MACRO)
+    #if !defined(_)
+        #define _(s)                 (wxT(s))
+    #endif
+    #define wxPLURAL(sing, plur, n)  ((n) == 1 ? wxT(sing) : wxT(plur))
+#endif
+
+#define wxTRANSLATE(str) wxT(str)
+
+inline const wxChar *
+wxGetTranslation(const wxChar *sz, const wxChar * WXUNUSED(domain) = NULL)
+{
+    return sz;
+}
+
+#endif // wxUSE_INTL/!wxUSE_INTL
+
+// define this one just in case it occurs somewhere (instead of preferred
+// wxTRANSLATE) too
+#if !defined(WXINTL_NO_GETTEXT_MACRO)
+    #if !defined(gettext_noop)
+        #define gettext_noop(str) wxT(str)
+    #endif
+    #if !defined(N_)
+        #define N_(s)             wxT(s)
+    #endif
+#endif
 
 #endif // _WX_INTL_H_
diff --git a/Source/3rd Party/wx/include/wx/iosfwrap.h b/Source/3rd Party/wx/include/wx/iosfwrap.h
index c3471596e..0a68afcc2 100644
--- a/Source/3rd Party/wx/include/wx/iosfwrap.h	
+++ b/Source/3rd Party/wx/include/wx/iosfwrap.h	
@@ -4,7 +4,7 @@
 // Author:      Jan van Dijk <jan@etpmod.phys.tue.nl>
 // Modified by:
 // Created:     18.12.2002
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: iosfwrap.h 33555 2005-04-12 21:06:03Z ABX $
 // Copyright:   wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@
 #   include <iosfwd>
 #endif
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #   include "wx/msw/winundef.h"
 #endif
 
diff --git a/Source/3rd Party/wx/include/wx/ioswrap.h b/Source/3rd Party/wx/include/wx/ioswrap.h
index 7008ce727..19292af5d 100644
--- a/Source/3rd Party/wx/include/wx/ioswrap.h	
+++ b/Source/3rd Party/wx/include/wx/ioswrap.h	
@@ -4,24 +4,20 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.02.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: ioswrap.h 33555 2005-04-12 21:06:03Z ABX $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #if wxUSE_STD_IOSTREAM
 
-#include "wx/beforestd.h"
-
 #if wxUSE_IOSTREAMH
 #   include <iostream.h>
 #else
 #   include <iostream>
 #endif
 
-#include "wx/afterstd.h"
-
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #   include "wx/msw/winundef.h"
 #endif
 
diff --git a/Source/3rd Party/wx/include/wx/ipcbase.h b/Source/3rd Party/wx/include/wx/ipcbase.h
index 7a010c2d8..d2a48f621 100644
--- a/Source/3rd Party/wx/include/wx/ipcbase.h	
+++ b/Source/3rd Party/wx/include/wx/ipcbase.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ipcbase.h
+// Name:        ipcbase.h
 // Purpose:     Base classes for IPC
 // Author:      Julian Smart
 // Modified by:
 // Created:     4/1/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: ipcbase.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,19 +31,10 @@ enum wxIPCFormat
   wxIPC_PENDATA =          10,
   wxIPC_RIFF =             11,
   wxIPC_WAVE =             12,
-  wxIPC_UTF16TEXT =        13, /* CF_UNICODE */
+  wxIPC_UNICODETEXT =      13,
   wxIPC_ENHMETAFILE =      14,
   wxIPC_FILENAME =         15, /* CF_HDROP */
   wxIPC_LOCALE =           16,
-  wxIPC_UTF8TEXT =         17,
-  wxIPC_UTF32TEXT =        18,
-#if SIZEOF_WCHAR_T == 2
-  wxIPC_UNICODETEXT = wxIPC_UTF16TEXT,
-#elif SIZEOF_WCHAR_T == 4
-  wxIPC_UNICODETEXT = wxIPC_UTF32TEXT,
-#else
-#  error "Unknown wchar_t size"
-#endif
   wxIPC_PRIVATE =          20
 };
 
@@ -52,201 +43,110 @@ class WXDLLIMPEXP_FWD_BASE wxClientBase;
 
 class WXDLLIMPEXP_BASE wxConnectionBase: public wxObject
 {
+  DECLARE_CLASS(wxConnectionBase)
+
 public:
-  wxConnectionBase(void *buffer, size_t size); // use external buffer
+  wxConnectionBase(wxChar *buffer, int size); // use external buffer
   wxConnectionBase(); // use internal, adaptive buffer
   wxConnectionBase(const wxConnectionBase& copy);
-  virtual ~wxConnectionBase();
+  virtual ~wxConnectionBase(void);
 
   void SetConnected( bool c ) { m_connected = c; }
   bool GetConnected() { return m_connected; }
 
   // Calls that CLIENT can make
-  bool Execute(const void *data, size_t size, wxIPCFormat fmt = wxIPC_PRIVATE)
-      { return DoExecute(data, size, fmt); }
-  bool Execute(const char *s, size_t size = wxNO_LEN)
-      { return DoExecute(s, size == wxNO_LEN ? strlen(s) + 1
-                                             : size, wxIPC_TEXT); }
-  bool Execute(const wchar_t *ws, size_t size = wxNO_LEN)
-      { return DoExecute(ws, size == wxNO_LEN ? (wcslen(ws) + 1)*sizeof(wchar_t)
-                                              : size, wxIPC_UNICODETEXT); }
-  bool Execute(const wxString& s)
-  {
-      const wxScopedCharBuffer buf = s.utf8_str();
-      return DoExecute(buf, strlen(buf) + 1, wxIPC_UTF8TEXT);
-  }
-  bool Execute(const wxCStrData& cs)
-      { return Execute(cs.AsString()); }
-
-  virtual const void *Request(const wxString& item,
-                              size_t *size = NULL,
-                              wxIPCFormat format = wxIPC_TEXT) = 0;
-
-  bool Poke(const wxString& item, const void *data, size_t size,
-            wxIPCFormat fmt = wxIPC_PRIVATE)
-      { return DoPoke(item, data, size, fmt); }
-  bool Poke(const wxString& item, const char *s, size_t size = wxNO_LEN)
-      { return DoPoke(item, s, size == wxNO_LEN ? strlen(s) + 1
-                                                : size, wxIPC_TEXT); }
-  bool Poke(const wxString& item, const wchar_t *ws, size_t size = wxNO_LEN)
-      { return DoPoke(item, ws,
-                      size == wxNO_LEN ? (wcslen(ws) + 1)*sizeof(wchar_t)
-                                       : size, wxIPC_UNICODETEXT); }
-  bool Poke(const wxString& item, const wxString s)
-  {
-      const wxScopedCharBuffer buf = s.utf8_str();
-      return DoPoke(item, buf,  strlen(buf) + 1, wxIPC_UTF8TEXT);
-  }
-  bool Poke(const wxString& item, const wxCStrData& cs)
-      { return Poke(item, cs.AsString()); }
-
+  virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT ) = 0;
+  virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); }
+  virtual wxChar *Request(const wxString& item, int *size = (int *) NULL, wxIPCFormat format = wxIPC_TEXT) = 0;
+  virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT) = 0;
   virtual bool StartAdvise(const wxString& item) = 0;
   virtual bool StopAdvise(const wxString& item) = 0;
 
   // Calls that SERVER can make
-  bool Advise(const wxString& item, const void *data, size_t size,
-              wxIPCFormat fmt = wxIPC_PRIVATE)
-      { return DoAdvise(item, data, size, fmt); }
-  bool Advise(const wxString& item, const char *s, size_t size = wxNO_LEN)
-      { return DoAdvise(item, s, size == wxNO_LEN ? strlen(s) + 1
-                                                  : size, wxIPC_TEXT); }
-  bool Advise(const wxString& item, const wchar_t *ws, size_t size = wxNO_LEN)
-      { return DoAdvise(item, ws,
-                        size == wxNO_LEN ? (wcslen(ws) + 1)*sizeof(wchar_t)
-                                         : size, wxIPC_UNICODETEXT); }
-  bool Advise(const wxString& item, const wxString s)
-  {
-      const wxScopedCharBuffer buf = s.utf8_str();
-      return DoAdvise(item, buf,  strlen(buf) + 1, wxIPC_UTF8TEXT);
-  }
-  bool Advise(const wxString& item, const wxCStrData& cs)
-      { return Advise(item, cs.AsString()); }
+  virtual bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT) = 0;
 
   // Calls that both can make
-  virtual bool Disconnect() = 0;
-
+  virtual bool Disconnect(void) = 0;
 
   // Callbacks to SERVER - override at will
-  virtual bool OnExec(const wxString& WXUNUSED(topic),
-                      const wxString& WXUNUSED(data))
-  {
-      wxFAIL_MSG( "This method shouldn't be called, if it is, it probably "
-                  "means that you didn't update your old code overriding "
-                  "OnExecute() to use the new parameter types (\"const void *\" "
-                  "instead of \"wxChar *\" and \"size_t\" instead of \"int\"), "
-                  "you must do it or your code wouldn't be executed at all!" );
-      return false;
-  }
+  virtual bool OnExecute     ( const wxString& WXUNUSED(topic),
+                               wxChar *WXUNUSED(data),
+                               int WXUNUSED(size),
+                               wxIPCFormat WXUNUSED(format) )
+                             { return false; }
 
-  // deprecated function kept for backwards compatibility: usually you will
-  // want to override OnExec() above instead which receives its data in a more
-  // convenient format
-  virtual bool OnExecute(const wxString& topic,
-                         const void *data,
-                         size_t size,
-                         wxIPCFormat format)
-      { return OnExec(topic, GetTextFromData(data, size, format)); }
+  virtual wxChar *OnRequest    ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item),
+                               int *WXUNUSED(size),
+                               wxIPCFormat WXUNUSED(format) )
+                             { return (wxChar *) NULL; }
 
-  virtual const void *OnRequest(const wxString& WXUNUSED(topic),
-                                const wxString& WXUNUSED(item),
-                                size_t *size,
-                                wxIPCFormat WXUNUSED(format))
-      { *size = 0; return NULL; }
+  virtual bool OnPoke        ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item),
+                               wxChar *WXUNUSED(data),
+                               int WXUNUSED(size),
+                               wxIPCFormat WXUNUSED(format) )
+                             { return false; }
 
-  virtual bool OnPoke(const wxString& WXUNUSED(topic),
-                      const wxString& WXUNUSED(item),
-                      const void *WXUNUSED(data),
-                      size_t WXUNUSED(size),
-                      wxIPCFormat WXUNUSED(format))
-      { return false; }
+  virtual bool OnStartAdvise ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item) )
+                             { return false; }
 
-  virtual bool OnStartAdvise(const wxString& WXUNUSED(topic),
-                             const wxString& WXUNUSED(item))
-      { return false; }
-
-  virtual bool OnStopAdvise(const wxString& WXUNUSED(topic),
-                            const wxString& WXUNUSED(item))
-      { return false; }
+  virtual bool OnStopAdvise  ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item) )
+                             { return false; }
 
   // Callbacks to CLIENT - override at will
-  virtual bool OnAdvise(const wxString& WXUNUSED(topic),
-                        const wxString& WXUNUSED(item),
-                        const void *WXUNUSED(data),
-                        size_t WXUNUSED(size),
-                        wxIPCFormat WXUNUSED(format))
-      { return false; }
-
-  // Callbacks to BOTH
-  virtual bool OnDisconnect() { delete this; return true; }
-
-
-  // return true if this is one of the formats used for textual data
-  // transmission
-  static bool IsTextFormat(wxIPCFormat format)
-  {
-      return format == wxIPC_TEXT ||
-             format == wxIPC_UTF8TEXT ||
-             format == wxIPC_UTF16TEXT ||
-             format == wxIPC_UTF32TEXT;
-  }
-
-  // converts from the data and format into a wxString automatically
-  //
-  // this function accepts data in all of wxIPC_TEXT, wxIPC_UNICODETEXT, and
-  // wxIPC_UTF8TEXT formats but asserts if the format is anything else (i.e.
-  // such that IsTextFormat(format) doesn't return true)
-  //
-  // notice that the size parameter here contains the total size of the data,
-  // including the terminating '\0' or L'\0'
-  static
-  wxString GetTextFromData(const void *data, size_t size, wxIPCFormat format);
+  virtual bool OnAdvise      ( const wxString& WXUNUSED(topic),
+                               const wxString& WXUNUSED(item),
+                               wxChar *WXUNUSED(data),
+                               int WXUNUSED(size),
+                               wxIPCFormat WXUNUSED(format) )
+                             { return false; }
 
+  // Callbacks to BOTH - override at will
+  // Default behaviour is to delete connection and return true
+  virtual bool OnDisconnect(void) = 0;
 
   // return a buffer at least this size, reallocating buffer if needed
-  // returns NULL if using an inadequate user buffer which can't be resized
-  void *GetBufferAtLeast(size_t bytes);
-
-protected:
-  virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) = 0;
-  virtual bool DoPoke(const wxString& item, const void *data, size_t size,
-                      wxIPCFormat format) = 0;
-  virtual bool DoAdvise(const wxString& item, const void *data, size_t size,
-                        wxIPCFormat format) = 0;
-
-
-private:
-  char         *m_buffer;
-  size_t        m_buffersize;
-  bool          m_deletebufferwhendone;
+  // returns NULL if using an inadequate user buffer - it can't be resized
+  wxChar *      GetBufferAtLeast( size_t bytes );
 
 protected:
   bool          m_connected;
+private:
+  wxChar *      m_buffer;
+  size_t        m_buffersize;
+  bool          m_deletebufferwhendone;
 
-  wxDECLARE_NO_ASSIGN_CLASS(wxConnectionBase);
-  DECLARE_CLASS(wxConnectionBase)
+  // can't use DECLARE_NO_COPY_CLASS(wxConnectionBase) because we already
+  // have copy ctor but still forbid the default assignment operator
+  wxConnectionBase& operator=(const wxConnectionBase&);
 };
 
 
-class WXDLLIMPEXP_BASE wxServerBase : public wxObject
+class WXDLLIMPEXP_BASE wxServerBase: public wxObject
 {
+  DECLARE_CLASS(wxServerBase)
+
 public:
-  wxServerBase() { }
-  virtual ~wxServerBase() { }
+  inline wxServerBase(void) {}
+  inline ~wxServerBase(void) {}
 
   // Returns false on error (e.g. port number is already in use)
   virtual bool Create(const wxString& serverName) = 0;
 
   // Callbacks to SERVER - override at will
   virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) = 0;
-
-  DECLARE_CLASS(wxServerBase)
 };
 
-class WXDLLIMPEXP_BASE wxClientBase : public wxObject
+class WXDLLIMPEXP_BASE wxClientBase: public wxObject
 {
+  DECLARE_CLASS(wxClientBase)
+
 public:
-  wxClientBase() { }
-  virtual ~wxClientBase() { }
+  inline wxClientBase(void) {}
+  inline ~wxClientBase(void) {}
 
   virtual bool ValidHost(const wxString& host) = 0;
 
@@ -256,9 +156,8 @@ public:
                                            const wxString& topic) = 0;
 
   // Callbacks to CLIENT - override at will
-  virtual wxConnectionBase *OnMakeConnection() = 0;
-
-  DECLARE_CLASS(wxClientBase)
+  virtual wxConnectionBase *OnMakeConnection(void) = 0;
 };
 
-#endif // _WX_IPCBASEH__
+#endif
+    // _WX_IPCBASEH__
diff --git a/Source/3rd Party/wx/include/wx/itemid.h b/Source/3rd Party/wx/include/wx/itemid.h
deleted file mode 100644
index 5f147081c..000000000
--- a/Source/3rd Party/wx/include/wx/itemid.h	
+++ /dev/null
@@ -1,62 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/itemid.h
-// Purpose:     wxItemId class declaration.
-// Author:      Vadim Zeitlin
-// Created:     2011-08-17
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ITEMID_H_
-#define _WX_ITEMID_H_
-
-// ----------------------------------------------------------------------------
-// wxItemId: an opaque item identifier used with wx{Tree,TreeList,DataView}Ctrl.
-// ----------------------------------------------------------------------------
-
-// The template argument T is typically a pointer to some opaque type. While
-// wxTreeItemId and wxDataViewItem use a pointer to void, this is dangerous and
-// not recommended for the new item id classes.
-template <typename T>
-class wxItemId
-{
-public:
-    typedef T Type;
-
-    // This ctor is implicit which is fine for non-void* types, but if you use
-    // this class with void* you're strongly advised to make the derived class
-    // ctor explicit as implicitly converting from any pointer is simply too
-    // dangerous.
-    wxItemId(Type item = NULL) : m_pItem(item) { }
-
-    // Default copy ctor, assignment operator and dtor are ok.
-
-    bool IsOk() const { return m_pItem != NULL; }
-    Type GetID() const { return m_pItem; }
-    operator const Type() const { return m_pItem; }
-
-    // This is used for implementation purposes only.
-    Type operator->() const { return m_pItem; }
-
-    void Unset() { m_pItem = NULL; }
-
-    // This field is public *only* for compatibility with the old wxTreeItemId
-    // implementation and must not be used in any new code.
-//private:
-    Type m_pItem;
-};
-
-template <typename T>
-bool operator==(const wxItemId<T>& left, const wxItemId<T>& right)
-{
-    return left.GetID() == right.GetID();
-}
-
-template <typename T>
-bool operator!=(const wxItemId<T>& left, const wxItemId<T>& right)
-{
-    return !(left == right);
-}
-
-#endif // _WX_ITEMID_H_
diff --git a/Source/3rd Party/wx/include/wx/kbdstate.h b/Source/3rd Party/wx/include/wx/kbdstate.h
deleted file mode 100644
index 801605879..000000000
--- a/Source/3rd Party/wx/include/wx/kbdstate.h	
+++ /dev/null
@@ -1,115 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/kbdstate.h
-// Purpose:     Declaration of wxKeyboardState class
-// Author:      Vadim Zeitlin
-// Created:     2008-09-19
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_KBDSTATE_H_
-#define _WX_KBDSTATE_H_
-
-#include "wx/defs.h"
-
-// ----------------------------------------------------------------------------
-// wxKeyboardState stores the state of the keyboard modifier keys
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxKeyboardState
-{
-public:
-    wxKeyboardState(bool controlDown = false,
-                    bool shiftDown = false,
-                    bool altDown = false,
-                    bool metaDown = false)
-        : m_controlDown(controlDown),
-          m_shiftDown(shiftDown),
-          m_altDown(altDown),
-          m_metaDown(metaDown)
-#ifdef __WXOSX__
-          ,m_rawControlDown(false)
-#endif
-    {
-    }
-
-    // default copy ctor, assignment operator and dtor are ok
-
-
-    // accessors for the various modifier keys
-    // ---------------------------------------
-
-    // should be used check if the key event has exactly the given modifiers:
-    // "GetModifiers() = wxMOD_CONTROL" is easier to write than "ControlDown()
-    // && !MetaDown() && !AltDown() && !ShiftDown()"
-    int GetModifiers() const
-    {
-        return (m_controlDown ? wxMOD_CONTROL : 0) |
-               (m_shiftDown ? wxMOD_SHIFT : 0) |
-               (m_metaDown ? wxMOD_META : 0) |
-#ifdef __WXOSX__
-               (m_rawControlDown ? wxMOD_RAW_CONTROL : 0) |
-#endif
-               (m_altDown ? wxMOD_ALT : 0);
-    }
-
-    // returns true if any modifiers at all are pressed
-    bool HasModifiers() const { return GetModifiers() != wxMOD_NONE; }
-
-    // accessors for individual modifier keys
-    bool ControlDown() const { return m_controlDown; }
-    bool RawControlDown() const 
-    { 
-#ifdef __WXOSX__
-        return m_rawControlDown; 
-#else
-        return m_controlDown;
-#endif
-    }
-    bool ShiftDown() const { return m_shiftDown; }
-    bool MetaDown() const { return m_metaDown; }
-    bool AltDown() const { return m_altDown; }
-
-    // "Cmd" is a pseudo key which is Control for PC and Unix platforms but
-    // Apple ("Command") key under Macs: it makes often sense to use it instead
-    // of, say, ControlDown() because Cmd key is used for the same thing under
-    // Mac as Ctrl elsewhere (but Ctrl still exists, just not used for this
-    // purpose under Mac)
-    bool CmdDown() const
-    {
-        return ControlDown();
-    }
-
-    // these functions are mostly used by wxWidgets itself
-    // ---------------------------------------------------
-
-    void SetControlDown(bool down) { m_controlDown = down; }
-    void SetRawControlDown(bool down) 
-    { 
-#ifdef __WXOSX__
-        m_rawControlDown = down; 
-#else
-        m_controlDown = down; 
-#endif
-    }
-    void SetShiftDown(bool down)   { m_shiftDown = down; }
-    void SetAltDown(bool down)     { m_altDown = down; }
-    void SetMetaDown(bool down)    { m_metaDown = down; }
-
-
-    // for backwards compatibility with the existing code accessing these
-    // members of wxKeyEvent directly, these variables are public, however you
-    // should not use them in any new code, please use the accessors instead
-public:
-    bool m_controlDown     : 1;
-    bool m_shiftDown       : 1;
-    bool m_altDown         : 1;
-    bool m_metaDown        : 1;
-#ifdef __WXOSX__
-    bool m_rawControlDown : 1;
-#endif
-};
-
-#endif // _WX_KBDSTATE_H_
-
diff --git a/Source/3rd Party/wx/include/wx/language.h b/Source/3rd Party/wx/include/wx/language.h
deleted file mode 100644
index 2bd803d70..000000000
--- a/Source/3rd Party/wx/include/wx/language.h	
+++ /dev/null
@@ -1,282 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/language.h
-// Purpose:     wxLanguage enum
-// Author:      Vadim Zeitlin
-// Created:     2010-04-23
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// WARNING: Parts of this file are generated. See misc/languages/README for
-// details.
-
-#ifndef _WX_LANGUAGE_H_
-#define _WX_LANGUAGE_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_INTL
-
-// ----------------------------------------------------------------------------
-// wxLanguage: defines all supported languages
-// ----------------------------------------------------------------------------
-
-// --- --- --- generated code begins here --- --- ---
-
-/**
-    The languages supported by wxLocale.
-
-    This enum is generated by misc/languages/genlang.py
-    When making changes, please put them into misc/languages/langtabl.txt
-*/
-enum wxLanguage
-{
-    /// User's default/preffered language as got from OS.
-    wxLANGUAGE_DEFAULT,
-
-    /// Unknown language, returned if wxLocale::GetSystemLanguage fails.
-    wxLANGUAGE_UNKNOWN,
-
-    wxLANGUAGE_ABKHAZIAN,
-    wxLANGUAGE_AFAR,
-    wxLANGUAGE_AFRIKAANS,
-    wxLANGUAGE_ALBANIAN,
-    wxLANGUAGE_AMHARIC,
-    wxLANGUAGE_ARABIC,
-    wxLANGUAGE_ARABIC_ALGERIA,
-    wxLANGUAGE_ARABIC_BAHRAIN,
-    wxLANGUAGE_ARABIC_EGYPT,
-    wxLANGUAGE_ARABIC_IRAQ,
-    wxLANGUAGE_ARABIC_JORDAN,
-    wxLANGUAGE_ARABIC_KUWAIT,
-    wxLANGUAGE_ARABIC_LEBANON,
-    wxLANGUAGE_ARABIC_LIBYA,
-    wxLANGUAGE_ARABIC_MOROCCO,
-    wxLANGUAGE_ARABIC_OMAN,
-    wxLANGUAGE_ARABIC_QATAR,
-    wxLANGUAGE_ARABIC_SAUDI_ARABIA,
-    wxLANGUAGE_ARABIC_SUDAN,
-    wxLANGUAGE_ARABIC_SYRIA,
-    wxLANGUAGE_ARABIC_TUNISIA,
-    wxLANGUAGE_ARABIC_UAE,
-    wxLANGUAGE_ARABIC_YEMEN,
-    wxLANGUAGE_ARMENIAN,
-    wxLANGUAGE_ASSAMESE,
-    wxLANGUAGE_ASTURIAN,
-    wxLANGUAGE_AYMARA,
-    wxLANGUAGE_AZERI,
-    wxLANGUAGE_AZERI_CYRILLIC,
-    wxLANGUAGE_AZERI_LATIN,
-    wxLANGUAGE_BASHKIR,
-    wxLANGUAGE_BASQUE,
-    wxLANGUAGE_BELARUSIAN,
-    wxLANGUAGE_BENGALI,
-    wxLANGUAGE_BHUTANI,
-    wxLANGUAGE_BIHARI,
-    wxLANGUAGE_BISLAMA,
-    wxLANGUAGE_BOSNIAN,
-    wxLANGUAGE_BRETON,
-    wxLANGUAGE_BULGARIAN,
-    wxLANGUAGE_BURMESE,
-    wxLANGUAGE_CAMBODIAN,
-    wxLANGUAGE_CATALAN,
-    wxLANGUAGE_CHINESE,
-    wxLANGUAGE_CHINESE_SIMPLIFIED,
-    wxLANGUAGE_CHINESE_TRADITIONAL,
-    wxLANGUAGE_CHINESE_HONGKONG,
-    wxLANGUAGE_CHINESE_MACAU,
-    wxLANGUAGE_CHINESE_SINGAPORE,
-    wxLANGUAGE_CHINESE_TAIWAN,
-    wxLANGUAGE_CORSICAN,
-    wxLANGUAGE_CROATIAN,
-    wxLANGUAGE_CZECH,
-    wxLANGUAGE_DANISH,
-    wxLANGUAGE_DUTCH,
-    wxLANGUAGE_DUTCH_BELGIAN,
-    wxLANGUAGE_ENGLISH,
-    wxLANGUAGE_ENGLISH_UK,
-    wxLANGUAGE_ENGLISH_US,
-    wxLANGUAGE_ENGLISH_AUSTRALIA,
-    wxLANGUAGE_ENGLISH_BELIZE,
-    wxLANGUAGE_ENGLISH_BOTSWANA,
-    wxLANGUAGE_ENGLISH_CANADA,
-    wxLANGUAGE_ENGLISH_CARIBBEAN,
-    wxLANGUAGE_ENGLISH_DENMARK,
-    wxLANGUAGE_ENGLISH_EIRE,
-    wxLANGUAGE_ENGLISH_JAMAICA,
-    wxLANGUAGE_ENGLISH_NEW_ZEALAND,
-    wxLANGUAGE_ENGLISH_PHILIPPINES,
-    wxLANGUAGE_ENGLISH_SOUTH_AFRICA,
-    wxLANGUAGE_ENGLISH_TRINIDAD,
-    wxLANGUAGE_ENGLISH_ZIMBABWE,
-    wxLANGUAGE_ESPERANTO,
-    wxLANGUAGE_ESTONIAN,
-    wxLANGUAGE_FAEROESE,
-    wxLANGUAGE_FARSI,
-    wxLANGUAGE_FIJI,
-    wxLANGUAGE_FINNISH,
-    wxLANGUAGE_FRENCH,
-    wxLANGUAGE_FRENCH_BELGIAN,
-    wxLANGUAGE_FRENCH_CANADIAN,
-    wxLANGUAGE_FRENCH_LUXEMBOURG,
-    wxLANGUAGE_FRENCH_MONACO,
-    wxLANGUAGE_FRENCH_SWISS,
-    wxLANGUAGE_FRISIAN,
-    wxLANGUAGE_GALICIAN,
-    wxLANGUAGE_GEORGIAN,
-    wxLANGUAGE_GERMAN,
-    wxLANGUAGE_GERMAN_AUSTRIAN,
-    wxLANGUAGE_GERMAN_BELGIUM,
-    wxLANGUAGE_GERMAN_LIECHTENSTEIN,
-    wxLANGUAGE_GERMAN_LUXEMBOURG,
-    wxLANGUAGE_GERMAN_SWISS,
-    wxLANGUAGE_GREEK,
-    wxLANGUAGE_GREENLANDIC,
-    wxLANGUAGE_GUARANI,
-    wxLANGUAGE_GUJARATI,
-    wxLANGUAGE_HAUSA,
-    wxLANGUAGE_HEBREW,
-    wxLANGUAGE_HINDI,
-    wxLANGUAGE_HUNGARIAN,
-    wxLANGUAGE_ICELANDIC,
-    wxLANGUAGE_INDONESIAN,
-    wxLANGUAGE_INTERLINGUA,
-    wxLANGUAGE_INTERLINGUE,
-    wxLANGUAGE_INUKTITUT,
-    wxLANGUAGE_INUPIAK,
-    wxLANGUAGE_IRISH,
-    wxLANGUAGE_ITALIAN,
-    wxLANGUAGE_ITALIAN_SWISS,
-    wxLANGUAGE_JAPANESE,
-    wxLANGUAGE_JAVANESE,
-    wxLANGUAGE_KANNADA,
-    wxLANGUAGE_KASHMIRI,
-    wxLANGUAGE_KASHMIRI_INDIA,
-    wxLANGUAGE_KAZAKH,
-    wxLANGUAGE_KERNEWEK,
-    wxLANGUAGE_KINYARWANDA,
-    wxLANGUAGE_KIRGHIZ,
-    wxLANGUAGE_KIRUNDI,
-    wxLANGUAGE_KONKANI,
-    wxLANGUAGE_KOREAN,
-    wxLANGUAGE_KURDISH,
-    wxLANGUAGE_LAOTHIAN,
-    wxLANGUAGE_LATIN,
-    wxLANGUAGE_LATVIAN,
-    wxLANGUAGE_LINGALA,
-    wxLANGUAGE_LITHUANIAN,
-    wxLANGUAGE_MACEDONIAN,
-    wxLANGUAGE_MALAGASY,
-    wxLANGUAGE_MALAY,
-    wxLANGUAGE_MALAYALAM,
-    wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,
-    wxLANGUAGE_MALAY_MALAYSIA,
-    wxLANGUAGE_MALTESE,
-    wxLANGUAGE_MANIPURI,
-    wxLANGUAGE_MAORI,
-    wxLANGUAGE_MARATHI,
-    wxLANGUAGE_MOLDAVIAN,
-    wxLANGUAGE_MONGOLIAN,
-    wxLANGUAGE_NAURU,
-    wxLANGUAGE_NEPALI,
-    wxLANGUAGE_NEPALI_INDIA,
-    wxLANGUAGE_NORWEGIAN_BOKMAL,
-    wxLANGUAGE_NORWEGIAN_NYNORSK,
-    wxLANGUAGE_OCCITAN,
-    wxLANGUAGE_ORIYA,
-    wxLANGUAGE_OROMO,
-    wxLANGUAGE_PASHTO,
-    wxLANGUAGE_POLISH,
-    wxLANGUAGE_PORTUGUESE,
-    wxLANGUAGE_PORTUGUESE_BRAZILIAN,
-    wxLANGUAGE_PUNJABI,
-    wxLANGUAGE_QUECHUA,
-    wxLANGUAGE_RHAETO_ROMANCE,
-    wxLANGUAGE_ROMANIAN,
-    wxLANGUAGE_RUSSIAN,
-    wxLANGUAGE_RUSSIAN_UKRAINE,
-    wxLANGUAGE_SAMI,
-    wxLANGUAGE_SAMOAN,
-    wxLANGUAGE_SANGHO,
-    wxLANGUAGE_SANSKRIT,
-    wxLANGUAGE_SCOTS_GAELIC,
-    wxLANGUAGE_SERBIAN,
-    wxLANGUAGE_SERBIAN_CYRILLIC,
-    wxLANGUAGE_SERBIAN_LATIN,
-    wxLANGUAGE_SERBO_CROATIAN,
-    wxLANGUAGE_SESOTHO,
-    wxLANGUAGE_SETSWANA,
-    wxLANGUAGE_SHONA,
-    wxLANGUAGE_SINDHI,
-    wxLANGUAGE_SINHALESE,
-    wxLANGUAGE_SISWATI,
-    wxLANGUAGE_SLOVAK,
-    wxLANGUAGE_SLOVENIAN,
-    wxLANGUAGE_SOMALI,
-    wxLANGUAGE_SPANISH,
-    wxLANGUAGE_SPANISH_ARGENTINA,
-    wxLANGUAGE_SPANISH_BOLIVIA,
-    wxLANGUAGE_SPANISH_CHILE,
-    wxLANGUAGE_SPANISH_COLOMBIA,
-    wxLANGUAGE_SPANISH_COSTA_RICA,
-    wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
-    wxLANGUAGE_SPANISH_ECUADOR,
-    wxLANGUAGE_SPANISH_EL_SALVADOR,
-    wxLANGUAGE_SPANISH_GUATEMALA,
-    wxLANGUAGE_SPANISH_HONDURAS,
-    wxLANGUAGE_SPANISH_MEXICAN,
-    wxLANGUAGE_SPANISH_MODERN,
-    wxLANGUAGE_SPANISH_NICARAGUA,
-    wxLANGUAGE_SPANISH_PANAMA,
-    wxLANGUAGE_SPANISH_PARAGUAY,
-    wxLANGUAGE_SPANISH_PERU,
-    wxLANGUAGE_SPANISH_PUERTO_RICO,
-    wxLANGUAGE_SPANISH_URUGUAY,
-    wxLANGUAGE_SPANISH_US,
-    wxLANGUAGE_SPANISH_VENEZUELA,
-    wxLANGUAGE_SUNDANESE,
-    wxLANGUAGE_SWAHILI,
-    wxLANGUAGE_SWEDISH,
-    wxLANGUAGE_SWEDISH_FINLAND,
-    wxLANGUAGE_TAGALOG,
-    wxLANGUAGE_TAJIK,
-    wxLANGUAGE_TAMIL,
-    wxLANGUAGE_TATAR,
-    wxLANGUAGE_TELUGU,
-    wxLANGUAGE_THAI,
-    wxLANGUAGE_TIBETAN,
-    wxLANGUAGE_TIGRINYA,
-    wxLANGUAGE_TONGA,
-    wxLANGUAGE_TSONGA,
-    wxLANGUAGE_TURKISH,
-    wxLANGUAGE_TURKMEN,
-    wxLANGUAGE_TWI,
-    wxLANGUAGE_UIGHUR,
-    wxLANGUAGE_UKRAINIAN,
-    wxLANGUAGE_URDU,
-    wxLANGUAGE_URDU_INDIA,
-    wxLANGUAGE_URDU_PAKISTAN,
-    wxLANGUAGE_UZBEK,
-    wxLANGUAGE_UZBEK_CYRILLIC,
-    wxLANGUAGE_UZBEK_LATIN,
-    wxLANGUAGE_VALENCIAN,
-    wxLANGUAGE_VIETNAMESE,
-    wxLANGUAGE_VOLAPUK,
-    wxLANGUAGE_WELSH,
-    wxLANGUAGE_WOLOF,
-    wxLANGUAGE_XHOSA,
-    wxLANGUAGE_YIDDISH,
-    wxLANGUAGE_YORUBA,
-    wxLANGUAGE_ZHUANG,
-    wxLANGUAGE_ZULU,
-
-    /// For custom, user-defined languages.
-    wxLANGUAGE_USER_DEFINED
-};
-
-// --- --- --- generated code ends here --- --- ---
-
-#endif // wxUSE_INTL
-
-#endif // _WX_LANGUAGE_H_
diff --git a/Source/3rd Party/wx/include/wx/layout.h b/Source/3rd Party/wx/include/wx/layout.h
index be529ea30..4a6d82d7b 100644
--- a/Source/3rd Party/wx/include/wx/layout.h	
+++ b/Source/3rd Party/wx/include/wx/layout.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: layout.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -64,7 +64,7 @@ enum wxRelationship
 // wxIndividualLayoutConstraint: a constraint on window position
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxIndividualLayoutConstraint : public wxObject
+class WXDLLEXPORT wxIndividualLayoutConstraint : public wxObject
 {
 public:
     wxIndividualLayoutConstraint();
@@ -155,7 +155,7 @@ protected:
 // wxLayoutConstraints: the complete set of constraints for a window
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxLayoutConstraints : public wxObject
+class WXDLLEXPORT wxLayoutConstraints : public wxObject
 {
 public:
     // Edge constraints
diff --git a/Source/3rd Party/wx/include/wx/list.h b/Source/3rd Party/wx/include/wx/list.h
index 7caaaa376..1d3a69af3 100644
--- a/Source/3rd Party/wx/include/wx/list.h	
+++ b/Source/3rd Party/wx/include/wx/list.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: list.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,8 +22,8 @@
   like the old class.
 */
 
-#ifndef _WX_LIST_H_
-#define _WX_LIST_H_
+#ifndef _WX_LISTH__
+#define _WX_LISTH__
 
 // -----------------------------------------------------------------------------
 // headers
@@ -33,7 +33,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
-#if wxUSE_STD_CONTAINERS
+#if wxUSE_STL
     #include "wx/beforestd.h"
     #include <algorithm>
     #include <iterator>
@@ -45,10 +45,38 @@
 // types
 // ----------------------------------------------------------------------------
 
+// type of compare function for list sort operation (as in 'qsort'): it should
+// return a negative value, 0 or positive value if the first element is less
+// than, equal or greater than the second
+
+extern "C"
+{
+typedef int (* LINKAGEMODE wxSortCompareFunction)(const void *elem1, const void *elem2);
+}
+
 class WXDLLIMPEXP_FWD_BASE wxObjectListNode;
 typedef wxObjectListNode wxNode;
 
-#if wxUSE_STD_CONTAINERS
+//
+typedef int (* LINKAGEMODE wxListIterateFunction)(void *current);
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#if !defined(wxENUM_KEY_TYPE_DEFINED)
+#define wxENUM_KEY_TYPE_DEFINED
+
+enum wxKeyType
+{
+    wxKEY_NONE,
+    wxKEY_INTEGER,
+    wxKEY_STRING
+};
+
+#endif
+
+#if wxUSE_STL
 
 #define wxLIST_COMPATIBILITY
 
@@ -65,10 +93,10 @@ typedef wxObjectListNode wxNode;
 #define WX_DECLARE_LIST_WITH_DECL(elT, liT, decl) \
     WX_DECLARE_LIST_XO(elT*, liT, decl)
 
-#if !defined(__VISUALC__) || __VISUALC__ >= 1300 // == !VC6
+#if !defined( __VISUALC__ )
 
 template<class T>
-class wxList_SortFunction
+class WXDLLIMPEXP_BASE wxList_SortFunction
 {
 public:
     wxList_SortFunction(wxSortCompareFunction f) : m_f(f) { }
@@ -79,12 +107,12 @@ private:
 };
 
 #define WX_LIST_SORTFUNCTION( elT, f ) wxList_SortFunction<elT>(f)
-#define WX_LIST_VC6_WORKAROUND(elT, liT, decl)
+#define VC6_WORKAROUND(elT, liT, decl)
 
-#else // if defined( __VISUALC__ ) && __VISUALC__ < 1300 // == VC6
+#else // if defined( __VISUALC__ )
 
 #define WX_LIST_SORTFUNCTION( elT, f ) std::greater<elT>( f )
-#define WX_LIST_VC6_WORKAROUND(elT, liT, decl)                                \
+#define VC6_WORKAROUND(elT, liT, decl)                                        \
     decl liT;                                                                 \
                                                                               \
     /* Workaround for broken VC6 STL incorrectly requires a std::greater<> */ \
@@ -100,26 +128,19 @@ private:
             bool operator()(const elT X, const elT Y) const                   \
                 {                                                             \
                     return m_CompFunc ?                                       \
-                        ( m_CompFunc( wxListCastElementToVoidPtr(X),          \
-                                      wxListCastElementToVoidPtr(Y) ) < 0 ) : \
+                        ( m_CompFunc( X, Y ) < 0 ) :                          \
                         ( X > Y );                                            \
                 }                                                             \
     };
 
-// helper for std::greater<elT> above:
-template<typename T>
-inline const void *wxListCastElementToVoidPtr(const T* ptr) { return ptr; }
-inline const void *wxListCastElementToVoidPtr(const wxString& str)
-    { return (const char*)str; }
-
-#endif // VC6/!VC6
+#endif // defined( __VISUALC__ )
 
 /*
     Note 1: the outer helper class _WX_LIST_HELPER_##liT below is a workaround
     for mingw 3.2.3 compiler bug that prevents a static function of liT class
     from being exported into dll. A minimal code snippet reproducing the bug:
 
-         struct WXDLLIMPEXP_CORE Foo
+         struct WXDLLEXPORT Foo
          {
             static void Bar();
             struct SomeInnerClass
@@ -152,7 +173,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
         static void DeleteFunction( _WX_LIST_ITEM_TYPE_##liT X );             \
     };                                                                        \
                                                                               \
-    WX_LIST_VC6_WORKAROUND(elT, liT, decl)                                    \
+    VC6_WORKAROUND(elT, liT, decl)                                            \
     decl liT : public std::list<elT>                                          \
     {                                                                         \
     private:                                                                  \
@@ -258,7 +279,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
             iterator i = const_cast< liT* >(this)->end();                     \
             return compatibility_iterator( this, !empty() ? --i : i );        \
         }                                                                     \
-        bool Member( elT e ) const                                            \
+        compatibility_iterator Member( elT e ) const                          \
             { return Find( e ); }                                             \
         compatibility_iterator Nth( int n ) const                             \
             { return Item( n ); }                                             \
@@ -275,7 +296,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
             push_front( e );                                                  \
             return compatibility_iterator( this, begin() );                   \
         }                                                                     \
-        compatibility_iterator Insert(const compatibility_iterator & i, elT e)\
+        compatibility_iterator Insert(const compatibility_iterator &i, elT e) \
         {                                                                     \
             return compatibility_iterator( this, insert( i.m_iter, e ) );     \
         }                                                                     \
@@ -321,7 +342,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
         ~liT() { Clear(); }                                                   \
                                                                               \
         /* It needs access to our EmptyList */                                \
-        friend class compatibility_iterator;                                  \
+        friend decl compatibility_iterator;                                   \
     }
 
 #define WX_DECLARE_LIST(elementtype, listname)                              \
@@ -330,7 +351,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
     WX_DECLARE_LIST(elementtype, listname)
 
 #define WX_DECLARE_EXPORTED_LIST(elementtype, listname)                     \
-    WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLIMPEXP_CORE)
+    WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLEXPORT)
 #define WX_DECLARE_EXPORTED_LIST_PTR(elementtype, listname)                 \
     WX_DECLARE_EXPORTED_LIST(elementtype, listname)
 
@@ -346,8 +367,13 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
 #define WX_DEFINE_EXPORTED_LIST(name)      WX_DEFINE_LIST(name)
 #define WX_DEFINE_USER_EXPORTED_LIST(name) WX_DEFINE_LIST(name)
 
-#else // if !wxUSE_STD_CONTAINERS
+#else // if !wxUSE_STL
 
+// due to circular header dependencies this function has to be declared here
+// (normally it's found in utils.h which includes itself list.h...)
+#if WXWIN_COMPATIBILITY_2_4
+extern WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s);
+#endif
 
 // undef it to get rid of old, deprecated functions
 #define wxLIST_COMPATIBILITY
@@ -359,7 +385,7 @@ inline const void *wxListCastElementToVoidPtr(const wxString& str)
 union wxListKeyValue
 {
     long integer;
-    wxString *string;
+    wxChar *string;
 };
 
 // a struct which may contain both types of keys
@@ -376,17 +402,15 @@ public:
         { }
     wxListKey(long i) : m_keyType(wxKEY_INTEGER)
         { m_key.integer = i; }
+    wxListKey(const wxChar *s) : m_keyType(wxKEY_STRING)
+        { m_key.string = wxStrdup(s); }
     wxListKey(const wxString& s) : m_keyType(wxKEY_STRING)
-        { m_key.string = new wxString(s); }
-    wxListKey(const char *s) : m_keyType(wxKEY_STRING)
-        { m_key.string = new wxString(s); }
-    wxListKey(const wchar_t *s) : m_keyType(wxKEY_STRING)
-        { m_key.string = new wxString(s); }
+        { m_key.string = wxStrdup(s.c_str()); }
 
     // accessors
     wxKeyType GetKeyType() const { return m_keyType; }
-    const wxString GetString() const
-        { wxASSERT( m_keyType == wxKEY_STRING ); return *m_key.string; }
+    const wxChar *GetString() const
+        { wxASSERT( m_keyType == wxKEY_STRING ); return m_key.string; }
     long GetNumber() const
         { wxASSERT( m_keyType == wxKEY_INTEGER ); return m_key.integer; }
 
@@ -399,7 +423,7 @@ public:
     ~wxListKey()
     {
         if ( m_keyType == wxKEY_STRING )
-            delete m_key.string;
+            free(m_key.string);
     }
 
 private:
@@ -420,20 +444,20 @@ class WXDLLIMPEXP_BASE wxNodeBase
 friend class wxListBase;
 public:
     // ctor
-    wxNodeBase(wxListBase *list = NULL,
-               wxNodeBase *previous = NULL,
-               wxNodeBase *next = NULL,
+    wxNodeBase(wxListBase *list = (wxListBase *)NULL,
+               wxNodeBase *previous = (wxNodeBase *)NULL,
+               wxNodeBase *next = (wxNodeBase *)NULL,
                void *data = NULL,
                const wxListKey& key = wxDefaultListKey);
 
     virtual ~wxNodeBase();
 
     // FIXME no check is done that the list is really keyed on strings
-    wxString GetKeyString() const { return *m_key.string; }
+    const wxChar *GetKeyString() const { return m_key.string; }
     long GetKeyInteger() const { return m_key.integer; }
 
     // Necessary for some existing code
-    void SetKeyString(const wxString& s) { m_key.string = new wxString(s); }
+    void SetKeyString(wxChar* s) { m_key.string = s; }
     void SetKeyInteger(long i) { m_key.integer = i; }
 
 #ifdef wxLIST_COMPATIBILITY
@@ -457,7 +481,7 @@ protected:
     virtual void DeleteData() { }
 public:
     // for wxList::iterator
-    void** GetDataPtr() const { return &(const_cast<wxNodeBase*>(this)->m_data); }
+    void** GetDataPtr() const { return &(((wxNodeBase*)this)->m_data); }
 private:
     // optional key stuff
     wxListKeyValue m_key;
@@ -468,7 +492,7 @@ private:
 
     wxListBase  *m_list;        // list we belong to
 
-    wxDECLARE_NO_COPY_CLASS(wxNodeBase);
+    DECLARE_NO_COPY_CLASS(wxNodeBase)
 };
 
 // -----------------------------------------------------------------------------
@@ -477,9 +501,9 @@ private:
 
 class WXDLLIMPEXP_FWD_BASE wxList;
 
-class WXDLLIMPEXP_BASE wxListBase
+class WXDLLIMPEXP_BASE wxListBase : public wxObject
 {
-friend class wxNodeBase; // should be able to call DetachNode()
+friend class WXDLLIMPEXP_FWD_BASE wxNodeBase; // should be able to call DetachNode()
 friend class wxHashTableBase;   // should be able to call untyped Find()
 
 public:
@@ -536,6 +560,10 @@ protected:
                                    void *data,
                                    const wxListKey& key = wxDefaultListKey) = 0;
 
+// Can't access these from derived classes otherwise (bug in Salford C++?)
+#ifdef __SALFORDC__
+public:
+#endif
 
     // ctors
         // from an array
@@ -559,7 +587,7 @@ protected:
     {
         wxNodeBase *node = Item(n);
 
-        return node ? node->GetData() : NULL;
+        return node ? node->GetData() : (wxNodeBase *)NULL;
     }
 
     // operations
@@ -569,8 +597,7 @@ protected:
         // append to beginning of list
     wxNodeBase *Append(void *object);
         // insert a new item at the beginning of the list
-    wxNodeBase *Insert(void *object)
-        { return Insert(static_cast<wxNodeBase *>(NULL), object); }
+    wxNodeBase *Insert(void *object) { return Insert( (wxNodeBase*)NULL, object); }
         // insert a new item at the given position
     wxNodeBase *Insert(size_t pos, void *object)
         { return pos == GetCount() ? Append(object)
@@ -580,7 +607,7 @@ protected:
 
         // keyed append
     wxNodeBase *Append(long key, void *object);
-    wxNodeBase *Append(const wxString& key, void *object);
+    wxNodeBase *Append(const wxChar *key, void *object);
 
         // removes node from the list but doesn't delete it (returns pointer
         // to the node or NULL if it wasn't found in the list)
@@ -674,10 +701,10 @@ private:
     classexp nodetype : public wxNodeBase                                   \
     {                                                                       \
     public:                                                                 \
-        nodetype(wxListBase *list = NULL,                                   \
-                 nodetype *previous = NULL,                                 \
-                 nodetype *next = NULL,                                     \
-                 T *data = NULL,                                            \
+        nodetype(wxListBase *list = (wxListBase *)NULL,                     \
+                 nodetype *previous = (nodetype *)NULL,                     \
+                 nodetype *next = (nodetype *)NULL,                         \
+                 T *data = (T *)NULL,                                       \
                  const wxListKey& key = wxDefaultListKey)                   \
             : wxNodeBase(list, previous, next, data, key) { }               \
                                                                             \
@@ -721,7 +748,7 @@ private:
             : wxListBase(count, (void **)elements) { }                      \
                                                                             \
         name& operator=(const name& list)                                   \
-            { if (&list != this) Assign(list); return *this; }              \
+            { Assign(list); return *this; }                                 \
                                                                             \
         nodetype *GetFirst() const                                          \
             { return (nodetype *)wxListBase::GetFirst(); }                  \
@@ -734,14 +761,13 @@ private:
         T *operator[](size_t index) const                                   \
         {                                                                   \
             nodetype *node = Item(index);                                   \
-            return node ? (T*)(node->GetData()) : NULL;                     \
+            return node ? (T*)(node->GetData()) : (T*)NULL;                 \
         }                                                                   \
                                                                             \
         nodetype *Append(Tbase *object)                                     \
             { return (nodetype *)wxListBase::Append(object); }              \
         nodetype *Insert(Tbase *object)                                     \
-            { return (nodetype *)Insert(static_cast<nodetype *>(NULL),      \
-                                        object); }                          \
+            { return (nodetype *)Insert((nodetype*)NULL, object); }         \
         nodetype *Insert(size_t pos, Tbase *object)                         \
             { return (nodetype *)wxListBase::Insert(pos, object); }         \
         nodetype *Insert(nodetype *prev, Tbase *object)                     \
@@ -767,9 +793,6 @@ private:
         virtual nodetype *Find(const wxListKey& key) const                  \
             { return (nodetype *)wxListBase::Find(key); }                   \
                                                                             \
-        bool Member(const Tbase *object) const                              \
-            { return Find(object) != NULL; }                                \
-                                                                            \
         int IndexOf(Tbase *object) const                                    \
             { return wxListBase::IndexOf(object); }                         \
                                                                             \
@@ -819,19 +842,9 @@ private:
             reference_type operator*() const                                \
                 { return *(pointer_type)m_node->GetDataPtr(); }             \
             ptrop                                                           \
-            itor& operator++()                                              \
-            {                                                               \
-                wxASSERT_MSG( m_node, wxT("uninitialized iterator") );      \
-                m_node = m_node->GetNext();                                 \
-                return *this;                                               \
-            }                                                               \
+            itor& operator++() { m_node = m_node->GetNext(); return *this; }\
             const itor operator++(int)                                      \
-            {                                                               \
-                itor tmp = *this;                                           \
-                wxASSERT_MSG( m_node, wxT("uninitialized iterator") );      \
-                m_node = m_node->GetNext();                                 \
-                return tmp;                                                 \
-            }                                                               \
+                { itor tmp = *this; m_node = m_node->GetNext(); return tmp; }\
             itor& operator--()                                              \
             {                                                               \
                 m_node = m_node ? m_node->GetPrevious() : m_init;           \
@@ -872,19 +885,9 @@ private:
             reference_type operator*() const                                \
                 { return *(pointer_type)m_node->GetDataPtr(); }             \
             ptrop                                                           \
-            itor& operator++()                                              \
-            {                                                               \
-                wxASSERT_MSG( m_node, wxT("uninitialized iterator") );      \
-                m_node = m_node->GetNext();                                 \
-                return *this;                                               \
-            }                                                               \
+            itor& operator++() { m_node = m_node->GetNext(); return *this; }\
             const itor operator++(int)                                      \
-            {                                                               \
-                itor tmp = *this;                                           \
-                wxASSERT_MSG( m_node, wxT("uninitialized iterator") );      \
-                m_node = m_node->GetNext();                                 \
-                return tmp;                                                 \
-            }                                                               \
+                { itor tmp = *this; m_node = m_node->GetNext(); return tmp; }\
             itor& operator--()                                              \
             {                                                               \
                 m_node = m_node ? m_node->GetPrevious() : m_init;           \
@@ -1030,33 +1033,21 @@ private:
             for(size_type i = 0; i < n; ++i)                                \
                 Append((const_base_reference)v);                            \
         }                                                                   \
-        iterator insert(const iterator& it, const_reference v)              \
+        iterator insert(const iterator& it, const_reference v = value_type())\
         {                                                                   \
             if ( it == end() )                                              \
-            {                                                               \
                 Append((const_base_reference)v);                            \
-                /*                                                          \
-                    note that this is the new end(), the old one was        \
-                    invalidated by the Append() call, and this is why we    \
-                    can't use the same code as in the normal case below     \
-                 */                                                         \
-                iterator itins(end());                                      \
-                return --itins;                                             \
-            }                                                               \
             else                                                            \
-            {                                                               \
                 Insert(it.m_node, (const_base_reference)v);                 \
-                iterator itins(it);                                         \
-                return --itins;                                             \
-            }                                                               \
+            iterator itprev(it);                                            \
+            return itprev--;                                                \
         }                                                                   \
-        void insert(const iterator& it, size_type n, const_reference v)     \
+        void insert(const iterator& it, size_type n, const_reference v = value_type())\
         {                                                                   \
             for(size_type i = 0; i < n; ++i)                                \
                 insert(it, v);                                              \
         }                                                                   \
-        void insert(const iterator& it,                                     \
-                    const_iterator first, const const_iterator& last)       \
+        void insert(const iterator& it, const_iterator first, const const_iterator& last)\
         {                                                                   \
             for(; first != last; ++first)                                   \
                 insert(it, *first);                                         \
@@ -1128,11 +1119,11 @@ private:
     WX_DECLARE_LIST_2(elementtype, listname, wx##listname##Node, decl)
 
 #define WX_DECLARE_EXPORTED_LIST(elementtype, listname)                     \
-    WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLIMPEXP_CORE)
+    WX_DECLARE_LIST_WITH_DECL(elementtype, listname, class WXDLLEXPORT)
 
 #define WX_DECLARE_EXPORTED_LIST_PTR(elementtype, listname)                     \
     typedef elementtype _WX_LIST_ITEM_TYPE_##listname;                      \
-    WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class WXDLLIMPEXP_CORE)
+    WX_DECLARE_LIST_PTR_2(elementtype, listname, wx##listname##Node, class WXDLLEXPORT)
 
 #define WX_DECLARE_USER_EXPORTED_LIST(elementtype, listname, usergoo)       \
     typedef elementtype _WX_LIST_ITEM_TYPE_##listname;                      \
@@ -1148,7 +1139,7 @@ private:
 #define WX_DEFINE_EXPORTED_LIST(name)      WX_DEFINE_LIST(name)
 #define WX_DEFINE_USER_EXPORTED_LIST(name) WX_DEFINE_LIST(name)
 
-#endif // !wxUSE_STD_CONTAINERS
+#endif // !wxUSE_STL
 
 // ============================================================================
 // now we can define classes 100% compatible with the old ones
@@ -1162,7 +1153,7 @@ private:
 
 // inline compatibility functions
 
-#if !wxUSE_STD_CONTAINERS
+#if !wxUSE_STL
 
 // ----------------------------------------------------------------------------
 // wxNodeBase deprecated methods
@@ -1197,26 +1188,36 @@ WX_DECLARE_LIST_2(wxObject, wxObjectList, wxObjectListNode,
 class WXDLLIMPEXP_BASE wxList : public wxObjectList
 {
 public:
-#if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STD_CONTAINERS
-    wxList() { }
+#if defined(wxWARN_COMPAT_LIST_USE) && !wxUSE_STL
+    wxList() { };
     wxDEPRECATED( wxList(int key_type) );
-#elif !wxUSE_STD_CONTAINERS
+#elif !wxUSE_STL
     wxList(int key_type = wxKEY_NONE);
 #endif
 
     // this destructor is required for Darwin
    ~wxList() { }
 
-#if !wxUSE_STD_CONTAINERS
+#if !wxUSE_STL
     wxList& operator=(const wxList& list)
-        { if (&list != this) Assign(list); return *this; }
+        { (void) wxListBase::operator=(list); return *this; }
 
     // compatibility methods
     void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
-#endif // !wxUSE_STD_CONTAINERS
+#endif
+
+#if wxUSE_STL
+#else
+    wxNode *Member(wxObject *object) const { return (wxNode *)Find(object); }
+#endif
+
+private:
+#if !wxUSE_STL
+    DECLARE_DYNAMIC_CLASS(wxList)
+#endif
 };
 
-#if !wxUSE_STD_CONTAINERS
+#if !wxUSE_STL
 
 // -----------------------------------------------------------------------------
 // wxStringList class for compatibility with the old code
@@ -1230,24 +1231,17 @@ public:
         // default
 #ifdef wxWARN_COMPAT_LIST_USE
     wxStringList();
-    wxDEPRECATED( wxStringList(const wxChar *first ...) ); // FIXME-UTF8
+    wxDEPRECATED( wxStringList(const wxChar *first ...) );
 #else
     wxStringList();
-    wxStringList(const wxChar *first ...); // FIXME-UTF8
+    wxStringList(const wxChar *first ...);
 #endif
 
         // copying the string list: the strings are copied, too (extremely
         // inefficient!)
     wxStringList(const wxStringList& other) : wxStringListBase() { DeleteContents(true); DoCopy(other); }
     wxStringList& operator=(const wxStringList& other)
-    {
-        if (&other != this)
-        {
-            Clear();
-            DoCopy(other);
-        }
-        return *this;
-    }
+        { Clear(); DoCopy(other); return *this; }
 
     // operations
         // makes a copy of the string
@@ -1266,9 +1260,11 @@ public:
 
 private:
     void DoCopy(const wxStringList&); // common part of copy ctor and operator=
+
+    DECLARE_DYNAMIC_CLASS(wxStringList)
 };
 
-#else // if wxUSE_STD_CONTAINERS
+#else // if wxUSE_STL
 
 WX_DECLARE_LIST_XO(wxString, wxStringListBase, class WXDLLIMPEXP_BASE);
 
@@ -1291,7 +1287,7 @@ public:
         { push_front(s); return GetFirst(); }
 };
 
-#endif // wxUSE_STD_CONTAINERS
+#endif // wxUSE_STL
 
 #endif // wxLIST_COMPATIBILITY
 
@@ -1309,15 +1305,4 @@ public:
         (list).clear();                                                      \
     }
 
-// append all element of one list to another one
-#define WX_APPEND_LIST(list, other)                                           \
-    {                                                                         \
-        wxList::compatibility_iterator node = other->GetFirst();              \
-        while ( node )                                                        \
-        {                                                                     \
-            (list)->push_back(node->GetData());                               \
-            node = node->GetNext();                                           \
-        }                                                                     \
-    }
-
 #endif // _WX_LISTH__
diff --git a/Source/3rd Party/wx/include/wx/listbase.h b/Source/3rd Party/wx/include/wx/listbase.h
index d6a6aafaa..152864786 100644
--- a/Source/3rd Party/wx/include/wx/listbase.h	
+++ b/Source/3rd Party/wx/include/wx/listbase.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.12.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listbase.h 46313 2007-06-03 22:38:28Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,17 +16,13 @@
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/event.h"
-#include "wx/control.h"
-
-class WXDLLIMPEXP_FWD_CORE wxImageList;
 
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
 
 // type of compare function for wxListCtrl sort operation
-typedef
-int (wxCALLBACK *wxListCtrlCompare)(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortData);
+typedef int (wxCALLBACK *wxListCtrlCompare)(long item1, long item2, long sortData);
 
 // ----------------------------------------------------------------------------
 // wxListCtrl constants
@@ -165,7 +161,7 @@ enum
 // TODO: this should be renamed to wxItemAttr or something general like this
 //       and used as base class for wxTextAttr which duplicates this class
 //       entirely currently
-class WXDLLIMPEXP_CORE wxListItemAttr
+class WXDLLEXPORT wxListItemAttr
 {
 public:
     // ctors
@@ -186,9 +182,9 @@ public:
     void SetFont(const wxFont& font) { m_font = font; }
 
     // accessors
-    bool HasTextColour() const { return m_colText.IsOk(); }
-    bool HasBackgroundColour() const { return m_colBack.IsOk(); }
-    bool HasFont() const { return m_font.IsOk(); }
+    bool HasTextColour() const { return m_colText.Ok(); }
+    bool HasBackgroundColour() const { return m_colBack.Ok(); }
+    bool HasFont() const { return m_font.Ok(); }
 
     const wxColour& GetTextColour() const { return m_colText; }
     const wxColour& GetBackgroundColour() const { return m_colBack; }
@@ -217,7 +213,7 @@ private:
 // wxListItem: the item or column info, used to exchange data with wxListCtrl
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxListItem : public wxObject
+class WXDLLEXPORT wxListItem : public wxObject
 {
 public:
     wxListItem() { Init(); m_attr = NULL; }
@@ -239,27 +235,6 @@ public:
         if ( item.HasAttributes() )
             m_attr = new wxListItemAttr(*item.GetAttributes());
     }
-
-    wxListItem& operator=(const wxListItem& item)
-    {
-        if ( &item != this )
-        {
-            m_mask = item.m_mask;
-            m_itemId = item.m_itemId;
-            m_col = item.m_col;
-            m_state = item.m_state;
-            m_stateMask = item.m_stateMask;
-            m_text = item.m_text;
-            m_image = item.m_image;
-            m_data = item.m_data;
-            m_format = item.m_format;
-            m_width = item.m_width;
-            m_attr = item.m_attr ? new wxListItemAttr(*item.m_attr) : NULL;
-        }
-
-        return *this;
-    }
-
     virtual ~wxListItem() { delete m_attr; }
 
     // resetting
@@ -357,7 +332,7 @@ protected:
     void Init()
     {
         m_mask = 0;
-        m_itemId = -1;
+        m_itemId = 0;
         m_col = 0;
         m_state = 0;
         m_stateMask = 0;
@@ -371,110 +346,25 @@ protected:
     wxListItemAttr *m_attr;     // optional pointer to the items style
 
 private:
+    // VZ: this is strange, we have a copy ctor but not operator=(), why?
+    wxListItem& operator=(const wxListItem& item);
+
     DECLARE_DYNAMIC_CLASS(wxListItem)
 };
 
-// ----------------------------------------------------------------------------
-// wxListCtrlBase: the base class for the main control itself.
-// ----------------------------------------------------------------------------
-
-// Unlike other base classes, this class doesn't currently define the API of
-// the real control class but is just used for implementation convenience. We
-// should define the public class functions as pure virtual here in the future
-// however.
-class WXDLLIMPEXP_CORE wxListCtrlBase : public wxControl
-{
-public:
-    wxListCtrlBase() { }
-
-    // Image list methods.
-    // -------------------
-
-    // Associate the given (possibly NULL to indicate that no images will be
-    // used) image list with the control. The ownership of the image list
-    // passes to the control, i.e. it will be deleted when the control itself
-    // is destroyed.
-    //
-    // The value of "which" must be one of wxIMAGE_LIST_{NORMAL,SMALL,STATE}.
-    virtual void AssignImageList(wxImageList* imageList, int which) = 0;
-
-    // Same as AssignImageList() but the control does not delete the image list
-    // so it can be shared among several controls.
-    virtual void SetImageList(wxImageList* imageList, int which) = 0;
-
-    // Return the currently used image list, may be NULL.
-    virtual wxImageList* GetImageList(int which) const = 0;
-
-
-    // Column-related methods.
-    // -----------------------
-
-    // All these methods can only be used in report view mode.
-
-    // Appends a new column.
-    //
-    // Returns the index of the newly inserted column or -1 on error.
-    long AppendColumn(const wxString& heading,
-                      int format = wxLIST_FORMAT_LEFT,
-                      int width = -1);
-
-    // Add a new column to the control at the position "col".
-    //
-    // Returns the index of the newly inserted column or -1 on error.
-    long InsertColumn(long col, const wxListItem& info);
-    long InsertColumn(long col,
-                      const wxString& heading,
-                      int format = wxLIST_FORMAT_LEFT,
-                      int width = wxLIST_AUTOSIZE);
-
-    // Delete the given or all columns.
-    virtual bool DeleteColumn(int col) = 0;
-    virtual bool DeleteAllColumns() = 0;
-
-    // Return the current number of columns.
-    virtual int GetColumnCount() const = 0;
-
-    // Get or update information about the given column. Set item mask to
-    // indicate the fields to retrieve or change.
-    //
-    // Returns false on error, e.g. if the column index is invalid.
-    virtual bool GetColumn(int col, wxListItem& item) const = 0;
-    virtual bool SetColumn(int col, const wxListItem& item) = 0;
-
-    // Convenient wrappers for the above methods which get or update just the
-    // column width.
-    virtual int GetColumnWidth(int col) const = 0;
-    virtual bool SetColumnWidth(int col, int width) = 0;
-
-
-    // Other miscellaneous accessors.
-    // ------------------------------
-
-    // Convenient functions for testing the list control mode:
-    bool InReportView() const { return HasFlag(wxLC_REPORT); }
-    bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
-
-protected:
-    // Real implementations methods to which our public forwards.
-    virtual long DoInsertColumn(long col, const wxListItem& info) = 0;
-
-    // Overridden methods of the base class.
-    virtual wxSize DoGetBestClientSize() const;
-};
-
 // ----------------------------------------------------------------------------
 // wxListEvent - the event class for the wxListCtrl notifications
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxListEvent : public wxNotifyEvent
+class WXDLLEXPORT wxListEvent : public wxNotifyEvent
 {
 public:
     wxListEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
         : wxNotifyEvent(commandType, winid)
-        , m_code(-1)
-        , m_oldItemIndex(-1)
-        , m_itemIndex(-1)
-        , m_col(-1)
+        , m_code(0)
+        , m_oldItemIndex(0)
+        , m_itemIndex(0)
+        , m_col(0)
         , m_pointDrag()
         , m_item()
         , m_editCancelled(false)
@@ -498,7 +388,7 @@ public:
     const wxString& GetLabel() const { return m_item.m_text; }
     const wxString& GetText() const { return m_item.m_text; }
     int GetImage() const { return m_item.m_image; }
-    long GetData() const { return static_cast<long>(m_item.m_data); }
+    long GetData() const { return wx_static_cast(long, m_item.m_data); }
     long GetMask() const { return m_item.m_mask; }
     const wxListItem& GetItem() const { return m_item; }
 
@@ -532,32 +422,37 @@ private:
 // wxListCtrl event macros
 // ----------------------------------------------------------------------------
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_BEGIN_DRAG, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_BEGIN_RDRAG, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_DELETE_ITEM, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, wxListEvent );
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_KEY_DOWN, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_INSERT_ITEM, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_CLICK, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_CACHE_HINT, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_DRAGGING, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_COL_END_DRAG, wxListEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LIST_ITEM_FOCUSED, wxListEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG, 700)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG, 701)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, 702)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT, 703)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM, 704)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 705)
+#if WXWIN_COMPATIBILITY_2_4
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO, 706)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO, 707)
+#endif
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED, 708)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED, 709)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN, 710)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM, 711)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK, 712)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, 713)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 714)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, 715)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT, 716)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, 717)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, 718)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING, 719)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG, 720)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED, 721)
+END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 
 #define wxListEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxListEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxListEventFunction, &func)
 
 #define wx__DECLARE_LISTEVT(evt, id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_LIST_ ## evt, id, wxListEventHandler(fn))
@@ -587,5 +482,10 @@ typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 #define EVT_LIST_CACHE_HINT(id, fn) wx__DECLARE_LISTEVT(CACHE_HINT, id, fn)
 
 
+#if WXWIN_COMPATIBILITY_2_4
+#define EVT_LIST_GET_INFO(id, fn) wx__DECLARE_LISTEVT(GET_INFO, id, fn)
+#define EVT_LIST_SET_INFO(id, fn) wx__DECLARE_LISTEVT(SET_INFO, id, fn)
+#endif
+
 #endif
     // _WX_LISTCTRL_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/listbook.h b/Source/3rd Party/wx/include/wx/listbook.h
index a74bc6613..b14ee4cdb 100644
--- a/Source/3rd Party/wx/include/wx/listbook.h	
+++ b/Source/3rd Party/wx/include/wx/listbook.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listbook.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,13 +17,12 @@
 #if wxUSE_LISTBOOK
 
 #include "wx/bookctrl.h"
-#include "wx/containr.h"
 
 class WXDLLIMPEXP_FWD_CORE wxListView;
 class WXDLLIMPEXP_FWD_CORE wxListEvent;
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING;
 
 // wxListbook flags
 #define wxLB_DEFAULT          wxBK_DEFAULT
@@ -37,10 +36,13 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING
 // wxListbook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxListbook : public wxNavigationEnabled<wxBookCtrlBase>
+class WXDLLEXPORT wxListbook : public wxBookCtrlBase
 {
 public:
-    wxListbook() { }
+    wxListbook()
+    {
+        Init();
+    }
 
     wxListbook(wxWindow *parent,
                wxWindowID id,
@@ -49,6 +51,8 @@ public:
                long style = 0,
                const wxString& name = wxEmptyString)
     {
+        Init();
+
         (void)Create(parent, id, pos, size, style, name);
     }
 
@@ -62,15 +66,17 @@ public:
 
 
     // overridden base class methods
+    virtual int GetSelection() const;
     virtual bool SetPageText(size_t n, const wxString& strText);
     virtual wxString GetPageText(size_t n) const;
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageImage(size_t n, int imageId);
+    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
     virtual bool InsertPage(size_t n,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
-                            int imageId = NO_IMAGE);
+                            int imageId = -1);
     virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
     virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
@@ -83,19 +89,24 @@ public:
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
+    // get the size which the list control should have
+    virtual wxSize GetControllerSize() const;
+
     void UpdateSelectedPage(size_t newsel);
 
-    wxBookCtrlEvent* CreatePageChangingEvent() const;
-    void MakeChangedEvent(wxBookCtrlEvent &event);
+    wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
+    void MakeChangedEvent(wxBookCtrlBaseEvent &event);
 
     // event handlers
     void OnListSelected(wxListEvent& event);
     void OnSize(wxSizeEvent& event);
 
-private:
-    // this should be called when we need to be relaid out
-    void UpdateSize();
+    // the currently selected page or wxNOT_FOUND if none
+    int m_selection;
 
+private:
+    // common part of all constructors
+    void Init();
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxListbook)
@@ -105,18 +116,36 @@ private:
 // listbook event class and related stuff
 // ----------------------------------------------------------------------------
 
-// wxListbookEvent is obsolete and defined for compatibility only (notice that
-// we use #define and not typedef to also keep compatibility with the existing
-// code which forward declares it)
-#define wxListbookEvent wxBookCtrlEvent
-typedef wxBookCtrlEventFunction wxListbookEventFunction;
-#define wxListbookEventHandler(func) wxBookCtrlEventHandler(func)
+class WXDLLEXPORT wxListbookEvent : public wxBookCtrlBaseEvent
+{
+public:
+    wxListbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
+                    int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)
+        : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel)
+    {
+    }
+
+    wxListbookEvent(const wxListbookEvent& event)
+        : wxBookCtrlBaseEvent(event)
+    {
+    }
+
+    virtual wxEvent *Clone() const { return new wxListbookEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxListbookEvent)
+};
+
+typedef void (wxEvtHandler::*wxListbookEventFunction)(wxListbookEvent&);
+
+#define wxListbookEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxListbookEventFunction, &func)
 
 #define EVT_LISTBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, winid, wxListbookEventHandler(fn))
 
 #define EVT_LISTBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, winid, wxListbookEventHandler(fn))
 
 #endif // wxUSE_LISTBOOK
 
diff --git a/Source/3rd Party/wx/include/wx/listbox.h b/Source/3rd Party/wx/include/wx/listbox.h
index 863aad3ab..a3b98fc48 100644
--- a/Source/3rd Party/wx/include/wx/listbox.h	
+++ b/Source/3rd Party/wx/include/wx/listbox.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.10.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listbox.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,26 +30,38 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 // global data
 // ----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxListBoxNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxListBoxBase : public wxControlWithItems
+class WXDLLEXPORT wxListBoxBase : public wxControlWithItems
 {
 public:
     wxListBoxBase() { }
     virtual ~wxListBoxBase();
 
-    void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos)
-        { Insert(nItems, items, pos); }
+    // all generic methods are in wxControlWithItems, except for the following
+    // ones which are not yet implemented by wxChoice/wxComboBox
+    void Insert(const wxString& item, unsigned int pos)
+        { /* return*/ wxControlWithItems::Insert(item,pos); }
+    void Insert(const wxString& item, unsigned int pos, void *clientData)
+        { /* return*/ wxControlWithItems::Insert(item,pos,clientData); }
+    void Insert(const wxString& item, unsigned int pos, wxClientData *clientData)
+        { /* return*/ wxControlWithItems::Insert(item,pos,clientData); }
+
+    void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos);
     void InsertItems(const wxArrayString& items, unsigned int pos)
-        { Insert(items, pos); }
+        { DoInsertItems(items, pos); }
+
+    void Set(int n, const wxString* items, void **clientData = NULL);
+    void Set(const wxArrayString& items, void **clientData = NULL)
+        { DoSetItems(items, clientData); }
 
     // multiple selection logic
     virtual bool IsSelected(int n) const = 0;
-    virtual void SetSelection(int n);
+    virtual void SetSelection(int n) { DoSetSelection(n, true); }
     void SetSelection(int n, bool select) { DoSetSelection(n, select); }
     void Deselect(int n) { DoSetSelection(n, false); }
     void DeselectAll(int itemToLeaveSelected = -1);
@@ -84,19 +96,32 @@ public:
                (m_windowStyle & wxLB_EXTENDED);
     }
 
-    // override wxItemContainer::IsSorted
-    virtual bool IsSorted() const { return HasFlag( wxLB_SORT ); }
+    // return true if this listbox is sorted
+    bool IsSorted() const { return (m_windowStyle & wxLB_SORT) != 0; }
 
     // emulate selecting or deselecting the item event.GetInt() (depending on
     // event.GetExtraLong())
     void Command(wxCommandEvent& event);
 
-    // return the index of the item at this position or wxNOT_FOUND
+    // returns the item number at a point or wxNOT_FOUND
     int HitTest(const wxPoint& point) const { return DoListHitTest(point); }
-    int HitTest(int x, int y) const { return DoListHitTest(wxPoint(x, y)); }
 
+#if WXWIN_COMPATIBILITY_2_6
+    // compatibility - these functions are deprecated, use the new ones
+    // instead
+    wxDEPRECATED( bool Selected(int n) const );
+#endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
+    // NB: due to wxGTK implementation details, DoInsert() is implemented
+    //     using DoInsertItems() and not the other way round
+    virtual int DoInsert(const wxString& item, unsigned int pos)
+        { InsertItems(1, &item, pos); return pos; }
+
+    // to be implemented in derived classes
+    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos) = 0;
+    virtual void DoSetItems(const wxArrayString& items, void **clientData) = 0;
+
     virtual void DoSetFirstItem(int n) = 0;
 
     virtual void DoSetSelection(int n, bool select) = 0;
@@ -105,39 +130,14 @@ protected:
     virtual int DoListHitTest(const wxPoint& WXUNUSED(point)) const
         { return wxNOT_FOUND; }
 
-    // Helper for the code generating events in single selection mode: updates
-    // m_oldSelections and return true if the selection really changed.
-    // Otherwise just returns false.
-    bool DoChangeSingleSelection(int item);
 
-    // Helper for generating events in multiple and extended mode: compare the
-    // current selections with the previously recorded ones (in
-    // m_oldSelections) and send the appropriate event if they differ,
-    // otherwise just return false.
-    bool CalcAndSendEvent();
-
-    // Send a listbox (de)selection or double click event.
-    //
-    // Returns true if the event was processed.
-    bool SendEvent(wxEventType evtType, int item, bool selected);
-
-    // Array storing the indices of all selected items that we already notified
-    // the user code about for multi selection list boxes.
-    //
-    // For single selection list boxes, we reuse this array to store the single
-    // currently selected item, this is used by DoChangeSingleSelection().
-    //
-    // TODO-OPT: wxSelectionStore would be more efficient for big list boxes.
-    wxArrayInt m_oldSelections;
-
-    // Update m_oldSelections with currently selected items (does nothing in
-    // single selection mode on platforms other than MSW).
-    void UpdateOldSelections();
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxListBoxBase);
+    DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };
 
+#if WXWIN_COMPATIBILITY_2_6
+    inline bool wxListBoxBase::Selected(int n) const { return IsSelected(n); }
+#endif // WXWIN_COMPATIBILITY_2_6
+
 // ----------------------------------------------------------------------------
 // include the platform-specific class declaration
 // ----------------------------------------------------------------------------
@@ -153,7 +153,7 @@ private:
 #elif defined(__WXGTK__)
   #include "wx/gtk1/listbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/listbox.h"
+    #include "wx/mac/listbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/listbox.h"
 #elif defined(__WXCOCOA__)
diff --git a/Source/3rd Party/wx/include/wx/listctrl.h b/Source/3rd Party/wx/include/wx/listctrl.h
index 0d2347642..efccc7300 100644
--- a/Source/3rd Party/wx/include/wx/listctrl.h	
+++ b/Source/3rd Party/wx/include/wx/listctrl.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.12.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listctrl.h 46432 2007-06-13 03:46:20Z SC $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -22,16 +22,16 @@
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
 
 // ----------------------------------------------------------------------------
 // include the wxListCtrl class declaration
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
-#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
-    #include "wx/osx/listctrl.h"
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
+    #include "wx/mac/carbon/listctrl.h"
 #else
     #include "wx/generic/listctrl.h"
 #endif
@@ -40,7 +40,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
 // wxListView: a class which provides a better API for list control
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxListView : public wxListCtrl
+class WXDLLEXPORT wxListView : public wxListCtrl
 {
 public:
     wxListView() { }
diff --git a/Source/3rd Party/wx/include/wx/listimpl.cpp b/Source/3rd Party/wx/include/wx/listimpl.cpp
index 358134d6f..d05fda13e 100644
--- a/Source/3rd Party/wx/include/wx/listimpl.cpp	
+++ b/Source/3rd Party/wx/include/wx/listimpl.cpp	
@@ -1,15 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/listimpl.cpp
+// Name:        listimpl.cpp
 // Purpose:     second-part of macro based implementation of template lists
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16/11/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listimpl.cpp 38893 2006-04-24 17:59:10Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if wxUSE_STD_CONTAINERS
+#if wxUSE_STL
 
 #undef  WX_DEFINE_LIST
 #define WX_DEFINE_LIST(name)                                                  \
@@ -19,9 +19,9 @@
     }                                                                         \
     name::BaseListType name::EmptyList;
 
-#else // !wxUSE_STD_CONTAINERS
-    #undef WX_DEFINE_LIST_2
-    #define WX_DEFINE_LIST_2(T, name)     \
+#else // !wxUSE_STL
+
+    #define _DEFINE_LIST(T, name)         \
         void wx##name##Node::DeleteData() \
         {                                 \
             delete (T *)GetData();        \
@@ -30,7 +30,10 @@
     // redefine the macro so that now it will generate the class implementation
     // old value would provoke a compile-time error if this file is not included
     #undef  WX_DEFINE_LIST
-    #define WX_DEFINE_LIST(name) WX_DEFINE_LIST_2(_WX_LIST_ITEM_TYPE_##name, name)
+    #define WX_DEFINE_LIST(name) _DEFINE_LIST(_WX_LIST_ITEM_TYPE_##name, name)
 
-#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
+    // don't pollute preprocessor's name space
+    //#undef  _DEFINE_LIST
+
+#endif // wxUSE_STL/!wxUSE_STL
 
diff --git a/Source/3rd Party/wx/include/wx/log.h b/Source/3rd Party/wx/include/wx/log.h
index 83787a085..5e23bcf92 100644
--- a/Source/3rd Party/wx/include/wx/log.h	
+++ b/Source/3rd Party/wx/include/wx/log.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: log.h 50993 2008-01-02 21:18:15Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,44 +14,37 @@
 
 #include "wx/defs.h"
 
+// ----------------------------------------------------------------------------
+// common constants for use in wxUSE_LOG/!wxUSE_LOG
+// ----------------------------------------------------------------------------
+
+// the trace masks have been superceded by symbolic trace constants, they're
+// for compatibility only andwill be removed soon - do NOT use them
+
+// meaning of different bits of the trace mask (which allows selectively
+// enable/disable some trace messages)
+#define wxTraceMemAlloc 0x0001  // trace memory allocation (new/delete)
+#define wxTraceMessages 0x0002  // trace window messages/X callbacks
+#define wxTraceResAlloc 0x0004  // trace GDI resource allocation
+#define wxTraceRefCount 0x0008  // trace various ref counting operations
+
+#ifdef  __WXMSW__
+    #define wxTraceOleCalls 0x0100  // OLE interface calls
+#endif
+
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
 
-// NB: this is needed even if wxUSE_LOG == 0
+// NB: these types are needed even if wxUSE_LOG == 0
+typedef unsigned long wxTraceMask;
 typedef unsigned long wxLogLevel;
 
-// the trace masks have been superseded by symbolic trace constants, they're
-// for compatibility only and will be removed soon - do NOT use them
-#if WXWIN_COMPATIBILITY_2_8
-    #define wxTraceMemAlloc 0x0001  // trace memory allocation (new/delete)
-    #define wxTraceMessages 0x0002  // trace window messages/X callbacks
-    #define wxTraceResAlloc 0x0004  // trace GDI resource allocation
-    #define wxTraceRefCount 0x0008  // trace various ref counting operations
-
-    #ifdef  __WINDOWS__
-        #define wxTraceOleCalls 0x0100  // OLE interface calls
-    #endif
-
-    typedef unsigned long wxTraceMask;
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #include "wx/string.h"
-#include "wx/strvararg.h"
-
-// ----------------------------------------------------------------------------
-// forward declarations
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_BASE wxObject;
-
-#if wxUSE_GUI
-    class WXDLLIMPEXP_FWD_CORE wxFrame;
-#endif // wxUSE_GUI
 
 #if wxUSE_LOG
 
@@ -62,49 +55,32 @@ class WXDLLIMPEXP_FWD_BASE wxObject;
 #endif
 
 #include "wx/dynarray.h"
-#include "wx/hashmap.h"
 
-#if wxUSE_THREADS
-    #include "wx/thread.h"
-#endif // wxUSE_THREADS
-
-// wxUSE_LOG_DEBUG enables the debug log messages
 #ifndef wxUSE_LOG_DEBUG
-    #if wxDEBUG_LEVEL
-        #define wxUSE_LOG_DEBUG 1
-    #else // !wxDEBUG_LEVEL
-        #define wxUSE_LOG_DEBUG 0
-    #endif
+#  ifdef __WXDEBUG__
+#    define wxUSE_LOG_DEBUG 1
+#  else // !__WXDEBUG__
+#    define wxUSE_LOG_DEBUG 0
+#  endif
 #endif
 
-// wxUSE_LOG_TRACE enables the trace messages, they are disabled by default
-#ifndef wxUSE_LOG_TRACE
-    #if wxDEBUG_LEVEL
-        #define wxUSE_LOG_TRACE 1
-    #else // !wxDEBUG_LEVEL
-        #define wxUSE_LOG_TRACE 0
-    #endif
-#endif // wxUSE_LOG_TRACE
+// ----------------------------------------------------------------------------
+// forward declarations
+// ----------------------------------------------------------------------------
 
-// wxLOG_COMPONENT identifies the component which generated the log record and
-// can be #define'd to a user-defined value when compiling the user code to use
-// component-based filtering (see wxLog::SetComponentLevel())
-#ifndef wxLOG_COMPONENT
-    // this is a variable and not a macro in order to allow the user code to
-    // just #define wxLOG_COMPONENT without #undef'ining it first
-    extern WXDLLIMPEXP_DATA_BASE(const char *) wxLOG_COMPONENT;
-
-    #ifdef WXBUILDING
-        #define wxLOG_COMPONENT "wx"
-    #endif
-#endif
+#if wxUSE_GUI
+    class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+    class WXDLLIMPEXP_FWD_CORE wxLogFrame;
+    class WXDLLIMPEXP_FWD_CORE wxFrame;
+    class WXDLLIMPEXP_FWD_CORE wxWindow;
+#endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 // different standard log levels (you may also define your own)
-enum wxLogLevelValues
+enum
 {
     wxLOG_FatalError, // program can't continue, abort immediately
     wxLOG_Error,      // a serious error, user must be informed about it
@@ -128,213 +104,12 @@ enum wxLogLevelValues
 #define wxTRACE_ResAlloc wxT("resalloc") // trace GDI resource allocation
 #define wxTRACE_RefCount wxT("refcount") // trace various ref counting operations
 
-#ifdef  __WINDOWS__
+#ifdef  __WXMSW__
     #define wxTRACE_OleCalls wxT("ole")  // OLE interface calls
 #endif
 
 #include "wx/iosfwrap.h"
 
-// ----------------------------------------------------------------------------
-// information about a log record, i.e. unit of log output
-// ----------------------------------------------------------------------------
-
-class wxLogRecordInfo
-{
-public:
-    // default ctor creates an uninitialized object
-    wxLogRecordInfo()
-    {
-        memset(this, 0, sizeof(*this));
-    }
-
-    // normal ctor, used by wxLogger specifies the location of the log
-    // statement; its time stamp and thread id are set up here
-    wxLogRecordInfo(const char *filename_,
-                    int line_,
-                    const char *func_,
-                    const char *component_)
-    {
-        filename = filename_;
-        func = func_;
-        line = line_;
-        component = component_;
-
-        timestamp = time(NULL);
-
-#if wxUSE_THREADS
-        threadId = wxThread::GetCurrentId();
-#endif // wxUSE_THREADS
-
-        m_data = NULL;
-    }
-
-    // we need to define copy ctor and assignment operator because of m_data
-    wxLogRecordInfo(const wxLogRecordInfo& other)
-    {
-        Copy(other);
-    }
-
-    wxLogRecordInfo& operator=(const wxLogRecordInfo& other)
-    {
-        if ( &other != this )
-        {
-            delete m_data;
-            Copy(other);
-        }
-
-        return *this;
-    }
-
-    // dtor is non-virtual, this class is not meant to be derived from
-    ~wxLogRecordInfo()
-    {
-        delete m_data;
-    }
-
-
-    // the file name and line number of the file where the log record was
-    // generated, if available or NULL and 0 otherwise
-    const char *filename;
-    int line;
-
-    // the name of the function where the log record was generated (may be NULL
-    // if the compiler doesn't support __FUNCTION__)
-    const char *func;
-
-    // the name of the component which generated this message, may be NULL if
-    // not set (i.e. wxLOG_COMPONENT not defined)
-    const char *component;
-
-    // time of record generation
-    time_t timestamp;
-
-#if wxUSE_THREADS
-    // id of the thread which logged this record
-    wxThreadIdType threadId;
-#endif // wxUSE_THREADS
-
-
-    // store an arbitrary value in this record context
-    //
-    // wxWidgets always uses keys starting with "wx.", e.g. "wx.sys_error"
-    void StoreValue(const wxString& key, wxUIntPtr val)
-    {
-        if ( !m_data )
-            m_data = new ExtraData;
-
-        m_data->numValues[key] = val;
-    }
-
-    void StoreValue(const wxString& key, const wxString& val)
-    {
-        if ( !m_data )
-            m_data = new ExtraData;
-
-        m_data->strValues[key] = val;
-    }
-
-
-    // these functions retrieve the value of either numeric or string key,
-    // return false if not found
-    bool GetNumValue(const wxString& key, wxUIntPtr *val) const
-    {
-        if ( !m_data )
-            return false;
-
-        wxStringToNumHashMap::const_iterator it = m_data->numValues.find(key);
-        if ( it == m_data->numValues.end() )
-            return false;
-
-        *val = it->second;
-
-        return true;
-    }
-
-    bool GetStrValue(const wxString& key, wxString *val) const
-    {
-        if ( !m_data )
-            return false;
-
-        wxStringToStringHashMap::const_iterator it = m_data->strValues.find(key);
-        if ( it == m_data->strValues.end() )
-            return false;
-
-        *val = it->second;
-
-        return true;
-    }
-
-private:
-    void Copy(const wxLogRecordInfo& other)
-    {
-        memcpy(this, &other, sizeof(*this));
-        if ( other.m_data )
-           m_data = new ExtraData(*other.m_data);
-    }
-
-    // extra data associated with the log record: this is completely optional
-    // and can be used to pass information from the log function to the log
-    // sink (e.g. wxLogSysError() uses this to pass the error code)
-    struct ExtraData
-    {
-        wxStringToNumHashMap numValues;
-        wxStringToStringHashMap strValues;
-    };
-
-    // NULL if not used
-    ExtraData *m_data;
-};
-
-#define wxLOG_KEY_TRACE_MASK "wx.trace_mask"
-
-// ----------------------------------------------------------------------------
-// log record: a unit of log output
-// ----------------------------------------------------------------------------
-
-struct wxLogRecord
-{
-    wxLogRecord(wxLogLevel level_,
-                const wxString& msg_,
-                const wxLogRecordInfo& info_)
-        : level(level_),
-          msg(msg_),
-          info(info_)
-    {
-    }
-
-    wxLogLevel level;
-    wxString msg;
-    wxLogRecordInfo info;
-};
-
-// ----------------------------------------------------------------------------
-// Derive from this class to customize format of log messages.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxLogFormatter
-{
-public:
-    // Default constructor.
-    wxLogFormatter() { }
-
-    // Trivial but virtual destructor for the base class.
-    virtual ~wxLogFormatter() { }
-
-
-    // Override this method to implement custom formatting of the given log
-    // record. The default implementation simply prepends a level-dependent
-    // prefix to the message and optionally adds a time stamp.
-    virtual wxString Format(wxLogLevel level,
-                            const wxString& msg,
-                            const wxLogRecordInfo& info) const;
-
-protected:
-    // Override this method to change just the time stamp formatting. It is
-    // called by default Format() implementation.
-    virtual wxString FormatTime(time_t t) const;
-};
-
-
 // ----------------------------------------------------------------------------
 // derive from this class to redirect (or suppress, or ...) log messages
 // normally, only a single instance of this class exists but it's not enforced
@@ -344,106 +119,46 @@ class WXDLLIMPEXP_BASE wxLog
 {
 public:
     // ctor
-    wxLog() : m_formatter(new wxLogFormatter) { }
+    wxLog(){}
 
-    // make dtor virtual for all derived classes
-    virtual ~wxLog();
+    // these functions allow to completely disable all log messages
 
-
-    // log messages selection
-    // ----------------------
-
-    // these functions allow to completely disable all log messages or disable
-    // log messages at level less important than specified for the current
-    // thread
-
-    // is logging enabled at all now?
-    static bool IsEnabled()
-    {
-#if wxUSE_THREADS
-        if ( !wxThread::IsMain() )
-            return IsThreadLoggingEnabled();
-#endif // wxUSE_THREADS
-
-        return ms_doLog;
-    }
+    // is logging disabled now?
+    static bool IsEnabled() { return ms_doLog; }
 
     // change the flag state, return the previous one
-    static bool EnableLogging(bool enable = true)
-    {
-#if wxUSE_THREADS
-        if ( !wxThread::IsMain() )
-            return EnableThreadLogging(enable);
-#endif // wxUSE_THREADS
-
-        bool doLogOld = ms_doLog;
-        ms_doLog = enable;
-        return doLogOld;
-    }
-
-    // return the current global log level
-    static wxLogLevel GetLogLevel() { return ms_logLevel; }
-
-    // set global log level: messages with level > logLevel will not be logged
-    static void SetLogLevel(wxLogLevel logLevel) { ms_logLevel = logLevel; }
-
-    // set the log level for the given component
-    static void SetComponentLevel(const wxString& component, wxLogLevel level);
-
-    // return the effective log level for this component, falling back to
-    // parent component and to the default global log level if necessary
-    //
-    // NB: component argument is passed by value and not const reference in an
-    //     attempt to encourage compiler to avoid an extra copy: as we modify
-    //     the component internally, we'd create one anyhow and like this it
-    //     can be avoided if the string is a temporary anyhow
-    static wxLogLevel GetComponentLevel(wxString component);
-
-
-    // is logging of messages from this component enabled at this level?
-    //
-    // usually always called with wxLOG_COMPONENT as second argument
-    static bool IsLevelEnabled(wxLogLevel level, wxString component)
-    {
-        return IsEnabled() && level <= GetComponentLevel(component);
-    }
-
-
-    // enable/disable messages at wxLOG_Verbose level (only relevant if the
-    // current log level is greater or equal to it)
-    //
-    // notice that verbose mode can be activated by the standard command-line
-    // '--verbose' option
-    static void SetVerbose(bool bVerbose = true) { ms_bVerbose = bVerbose; }
-
-    // check if verbose messages are enabled
-    static bool GetVerbose() { return ms_bVerbose; }
+    static bool EnableLogging(bool doIt = true)
+        { bool doLogOld = ms_doLog; ms_doLog = doIt; return doLogOld; }
 
+    // static sink function - see DoLog() for function to overload in the
+    // derived classes
+    static void OnLog(wxLogLevel level, const wxChar *szString, time_t t);
 
     // message buffering
-    // -----------------
 
     // flush shows all messages if they're not logged immediately (FILE
-    // and iostream logs don't need it, but wxLogGui does to avoid showing
+    // and iostream logs don't need it, but wxGuiLog does to avoid showing
     // 17 modal dialogs one after another)
     virtual void Flush();
 
-    // flush the active target if any and also output any pending messages from
-    // background threads
-    static void FlushActive();
+    // flush the active target if any
+    static void FlushActive()
+    {
+        if ( !ms_suspendCount )
+        {
+            wxLog *log = GetActiveTarget();
+            if ( log )
+                log->Flush();
+        }
+    }
 
-    // only one sink is active at each moment get current log target, will call
-    // wxAppTraits::CreateLogTarget() to create one if none exists
+    // only one sink is active at each moment
+    // get current log target, will call wxApp::CreateLogTarget() to
+    // create one if none exists
     static wxLog *GetActiveTarget();
 
-    // change log target, logger may be NULL
-    static wxLog *SetActiveTarget(wxLog *logger);
-
-#if wxUSE_THREADS
-    // change log target for the current thread only, shouldn't be called from
-    // the main thread as it doesn't use thread-specific log target
-    static wxLog *SetThreadActiveTarget(wxLog *logger);
-#endif // wxUSE_THREADS
+    // change log target, pLogger may be NULL
+    static wxLog *SetActiveTarget(wxLog *pLogger);
 
     // suspend the message flushing of the main target until the next call
     // to Resume() - this is mainly for internal use (to prevent wxYield()
@@ -453,9 +168,19 @@ public:
     // must be called for each Suspend()!
     static void Resume() { ms_suspendCount--; }
 
+    // functions controlling the default wxLog behaviour
+    // verbose mode is activated by standard command-line '-verbose'
+    // option
+    static void SetVerbose(bool bVerbose = true) { ms_bVerbose = bVerbose; }
+
+    // Set log level.  Log messages with level > logLevel will not be logged.
+    static void SetLogLevel(wxLogLevel logLevel) { ms_logLevel = logLevel; }
+
+#if wxABI_VERSION >= 20805 /* 2.8.5+ only */
     // should GetActiveTarget() try to create a new log object if the
     // current is NULL?
     static void DontCreateOnDemand();
+#endif
 
     // Make GetActiveTarget() create a new log object again.
     static void DoCreateOnDemand();
@@ -468,8 +193,12 @@ public:
     // gets duplicate counting status
     static bool GetRepetitionCounting() { return ms_bRepetCounting; }
 
+    // trace mask (see wxTraceXXX constants for details)
+    static void SetTraceMask(wxTraceMask ulMask) { ms_ulTraceMask = ulMask; }
+
     // add string trace mask
-    static void AddTraceMask(const wxString& str);
+    static void AddTraceMask(const wxString& str)
+        { ms_aTraceMasks.push_back(str); }
 
     // add string trace mask
     static void RemoveTraceMask(const wxString& str);
@@ -477,88 +206,41 @@ public:
     // remove all string trace masks
     static void ClearTraceMasks();
 
-    // get string trace masks: note that this is MT-unsafe if other threads can
-    // call AddTraceMask() concurrently
-    static const wxArrayString& GetTraceMasks();
+    // get string trace masks
+    static const wxArrayString &GetTraceMasks() { return ms_aTraceMasks; }
+
+    // sets the timestamp string: this is used as strftime() format string
+    // for the log targets which add time stamps to the messages - set it
+    // to NULL to disable time stamping completely.
+    static void SetTimestamp(const wxChar *ts) { ms_timestamp = ts; }
+
+
+    // accessors
+
+    // gets the verbose status
+    static bool GetVerbose() { return ms_bVerbose; }
+
+    // get trace mask
+    static wxTraceMask GetTraceMask() { return ms_ulTraceMask; }
 
     // is this trace mask in the list?
-    static bool IsAllowedTraceMask(const wxString& mask);
+    static bool IsAllowedTraceMask(const wxChar *mask);
+
+    // return the current loglevel limit
+    static wxLogLevel GetLogLevel() { return ms_logLevel; }
+
+    // get the current timestamp format string (may be NULL)
+    static const wxChar *GetTimestamp() { return ms_timestamp; }
 
 
-    // log formatting
-    // -----------------
+    // helpers
 
-    // Change wxLogFormatter object used by wxLog to format the log messages.
-    //
-    // wxLog takes ownership of the pointer passed in but the caller is
-    // responsible for deleting the returned pointer.
-    wxLogFormatter* SetFormatter(wxLogFormatter* formatter);
-
-
-    // All the time stamp related functions below only work when the default
-    // wxLogFormatter is being used. Defining a custom formatter overrides them
-    // as it could use its own time stamp format or format messages without
-    // using time stamp at all.
-
-
-    // sets the time stamp string format: this is used as strftime() format
-    // string for the log targets which add time stamps to the messages; set
-    // it to empty string to disable time stamping completely.
-    static void SetTimestamp(const wxString& ts) { ms_timestamp = ts; }
-
-    // disable time stamping of log messages
-    static void DisableTimestamp() { SetTimestamp(wxEmptyString); }
-
-
-    // get the current timestamp format string (maybe empty)
-    static const wxString& GetTimestamp() { return ms_timestamp; }
-
-
-
-    // helpers: all functions in this section are mostly for internal use only,
-    // don't call them from your code even if they are not formally deprecated
-
-    // put the time stamp into the string if ms_timestamp is not empty (don't
-    // change it otherwise); the first overload uses the current time.
+    // put the time stamp into the string if ms_timestamp != NULL (don't
+    // change it otherwise)
     static void TimeStamp(wxString *str);
-    static void TimeStamp(wxString *str, time_t t);
 
-    // these methods should only be called from derived classes DoLogRecord(),
-    // DoLogTextAtLevel() and DoLogText() implementations respectively and
-    // shouldn't be called directly, use logging functions instead
-    void LogRecord(wxLogLevel level,
-                   const wxString& msg,
-                   const wxLogRecordInfo& info)
-    {
-        DoLogRecord(level, msg, info);
-    }
-
-    void LogTextAtLevel(wxLogLevel level, const wxString& msg)
-    {
-        DoLogTextAtLevel(level, msg);
-    }
-
-    void LogText(const wxString& msg)
-    {
-        DoLogText(msg);
-    }
-
-    // this is a helper used by wxLogXXX() functions, don't call it directly
-    // and see DoLog() for function to overload in the derived classes
-    static void OnLog(wxLogLevel level,
-                      const wxString& msg,
-                      const wxLogRecordInfo& info);
-
-    // version called when no information about the location of the log record
-    // generation is available (but the time stamp is), it mainly exists for
-    // backwards compatibility, don't use it in new code
-    static void OnLog(wxLogLevel level, const wxString& msg, time_t t);
-
-    // a helper calling the above overload with current time
-    static void OnLog(wxLogLevel level, const wxString& msg)
-    {
-        OnLog(level, msg, time(NULL));
-    }
+    // make dtor virtual for all derived classes
+    virtual ~wxLog();
 
 
     // this method exists for backwards compatibility only, don't use
@@ -566,117 +248,35 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_6
     // this function doesn't do anything any more, don't call it
-    static wxDEPRECATED_INLINE(
-        wxChar *SetLogBuffer(wxChar *, size_t = 0), return NULL;
-    );
-#endif // WXWIN_COMPATIBILITY_2_6
-
-    // don't use integer masks any more, use string trace masks instead
-#if WXWIN_COMPATIBILITY_2_8
-    static wxDEPRECATED_INLINE( void SetTraceMask(wxTraceMask ulMask),
-        ms_ulTraceMask = ulMask; )
-
-    // this one can't be marked deprecated as it's used in our own wxLogger
-    // below but it still is deprecated and shouldn't be used
-    static wxTraceMask GetTraceMask() { return ms_ulTraceMask; }
-#endif // WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( static wxChar *SetLogBuffer(wxChar *buf, size_t size = 0) );
+#endif
 
 protected:
-    // the logging functions that can be overridden: DoLogRecord() is called
-    // for every "record", i.e. a unit of log output, to be logged and by
-    // default formats the message and passes it to DoLogTextAtLevel() which in
-    // turn passes it to DoLogText() by default
+    // the logging functions that can be overriden
 
-    // override this method if you want to change message formatting or do
-    // dynamic filtering
-    virtual void DoLogRecord(wxLogLevel level,
-                             const wxString& msg,
-                             const wxLogRecordInfo& info);
+    // default DoLog() prepends the time stamp and a prefix corresponding
+    // to the message to szString and then passes it to DoLogString()
+    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t);
 
-    // override this method to redirect output to different channels depending
-    // on its level only; if even the level doesn't matter, override
-    // DoLogText() instead
-    virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg);
+    // default DoLogString does nothing but is not pure virtual because if
+    // you override DoLog() you might not need it at all
+    virtual void DoLogString(const wxChar *szString, time_t t);
 
-    // this function is not pure virtual as it might not be needed if you do
-    // the logging in overridden DoLogRecord() or DoLogTextAtLevel() directly
-    // but if you do not override them in your derived class you must override
-    // this one as the default implementation of it simply asserts
-    virtual void DoLogText(const wxString& msg);
-
-
-    // the rest of the functions are for backwards compatibility only, don't
-    // use them in new code; if you're updating your existing code you need to
-    // switch to overriding DoLogRecord/Text() above (although as long as these
-    // functions exist, log classes using them will continue to work)
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual void DoLog(wxLogLevel level, const char *szString, time_t t)
-    );
-
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual void DoLog(wxLogLevel level, const wchar_t *wzString, time_t t)
-    );
-
-    // these shouldn't be used by new code
-    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
-        virtual void DoLogString(const char *WXUNUSED(szString),
-                                 time_t WXUNUSED(t)),
-        wxEMPTY_PARAMETER_VALUE
-    )
-
-    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
-        virtual void DoLogString(const wchar_t *WXUNUSED(wzString),
-                                 time_t WXUNUSED(t)),
-        wxEMPTY_PARAMETER_VALUE
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
-    // log a message indicating the number of times the previous message was
-    // repeated if previous repetition counter is strictly positive, does
-    // nothing otherwise; return the old value of repetition counter
-    unsigned LogLastRepeatIfNeeded();
+    // log a line containing the number of times the previous message was
+    // repeated and returns this number (which can be 0)
+    static unsigned DoLogNumberOfRepeats();
 
 private:
-#if wxUSE_THREADS
-    // called from FlushActive() to really log any buffered messages logged
-    // from the other threads
-    void FlushThreadMessages();
-
-    // these functions are called for non-main thread only by IsEnabled() and
-    // EnableLogging() respectively
-    static bool IsThreadLoggingEnabled();
-    static bool EnableThreadLogging(bool enable = true);
-#endif // wxUSE_THREADS
-
-    // get the active log target for the main thread, auto-creating it if
-    // necessary
-    //
-    // this is called from GetActiveTarget() and OnLog() when they're called
-    // from the main thread
-    static wxLog *GetMainThreadActiveTarget();
-
-    // called from OnLog() if it's called from the main thread or if we have a
-    // (presumably MT-safe) thread-specific logger and by FlushThreadMessages()
-    // when it plays back the buffered messages logged from the other threads
-    void CallDoLogNow(wxLogLevel level,
-                      const wxString& msg,
-                      const wxLogRecordInfo& info);
-
-
-    // variables
-    // ----------------
-
-    wxLogFormatter    *m_formatter; // We own this pointer.
-
-
     // static variables
     // ----------------
 
-    // if true, don't log the same message multiple times, only log it once
-    // with the number of times it was repeated
+    // traditional behaviour or counting repetitions
     static bool        ms_bRepetCounting;
+    static wxString    ms_prevString;   // previous message that was logged
+    // how many times the previous message was logged
+    static unsigned    ms_prevCounter;
+    static time_t      ms_prevTimeStamp;// timestamp of the previous message
+    static wxLogLevel  ms_prevLevel;    // level of the previous message
 
     static wxLog      *ms_pLogger;      // currently active log sink
     static bool        ms_doLog;        // false => all logging disabled
@@ -687,21 +287,28 @@ private:
 
     static size_t      ms_suspendCount; // if positive, logs are not flushed
 
-    // format string for strftime(), if empty, time stamping log messages is
+    // format string for strftime(), if NULL, time stamping log messages is
     // disabled
-    static wxString    ms_timestamp;
+    static const wxChar *ms_timestamp;
 
-#if WXWIN_COMPATIBILITY_2_8
     static wxTraceMask ms_ulTraceMask;   // controls wxLogTrace behaviour
-#endif // WXWIN_COMPATIBILITY_2_8
+    static wxArrayString ms_aTraceMasks; // more powerful filter for wxLogTrace
+
+
+    // this is the replacement of DoLogNumberOfRepeats() (which has to be kept
+    // to avoid breaking ABI in this version)
+    unsigned LogLastRepeatIfNeeded();
+
+    // implementation of the function above which supposes that the caller had
+    // already locked gs_prevCS
+    unsigned LogLastRepeatIfNeededUnlocked();
 };
 
 // ----------------------------------------------------------------------------
 // "trivial" derivations of wxLog
 // ----------------------------------------------------------------------------
 
-// log everything except for the debug/trace messages (which are passed to
-// wxMessageOutputDebug) to a buffer
+// log everything to a buffer
 class WXDLLIMPEXP_BASE wxLogBuffer : public wxLog
 {
 public:
@@ -715,12 +322,13 @@ public:
     virtual void Flush();
 
 protected:
-    virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg);
+    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t);
+    virtual void DoLogString(const wxChar *szString, time_t t);
 
 private:
     wxString m_str;
 
-    wxDECLARE_NO_COPY_CLASS(wxLogBuffer);
+    DECLARE_NO_COPY_CLASS(wxLogBuffer)
 };
 
 
@@ -729,15 +337,15 @@ class WXDLLIMPEXP_BASE wxLogStderr : public wxLog
 {
 public:
     // redirect log output to a FILE
-    wxLogStderr(FILE *fp = NULL);
+    wxLogStderr(FILE *fp = (FILE *) NULL);
 
 protected:
     // implement sink function
-    virtual void DoLogText(const wxString& msg);
+    virtual void DoLogString(const wxChar *szString, time_t t);
 
     FILE *m_fp;
 
-    wxDECLARE_NO_COPY_CLASS(wxLogStderr);
+    DECLARE_NO_COPY_CLASS(wxLogStderr)
 };
 
 #if wxUSE_STD_IOSTREAM
@@ -751,7 +359,7 @@ public:
 
 protected:
     // implement sink function
-    virtual void DoLogText(const wxString& msg);
+    virtual void DoLogString(const wxChar *szString, time_t t);
 
     // using ptr here to avoid including <iostream.h> from this file
     wxSTD ostream *m_ostr;
@@ -821,13 +429,13 @@ public:
     virtual void Flush();
 
     // call to avoid destroying the old log target
+#if wxABI_VERSION >= 20805 /* 2.8.5+ only */
     void DetachOldLog() { m_logOld = NULL; }
+#endif
 
 protected:
-    // pass the record to the old logger if needed
-    virtual void DoLogRecord(wxLogLevel level,
-                             const wxString& msg,
-                             const wxLogRecordInfo& info);
+    // pass the chain to the old logger if needed
+    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t);
 
 private:
     // the current log target
@@ -839,32 +447,17 @@ private:
     // do we pass the messages to the old logger?
     bool m_bPassMessages;
 
-    wxDECLARE_NO_COPY_CLASS(wxLogChain);
+    DECLARE_NO_COPY_CLASS(wxLogChain)
 };
 
 // a chain log target which uses itself as the new logger
-
-#define wxLogPassThrough wxLogInterposer
-
-class WXDLLIMPEXP_BASE wxLogInterposer : public wxLogChain
+class WXDLLIMPEXP_BASE wxLogPassThrough : public wxLogChain
 {
 public:
-    wxLogInterposer();
+    wxLogPassThrough();
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxLogInterposer);
-};
-
-// a temporary interposer which doesn't destroy the old log target
-// (calls DetachOldLog)
-
-class WXDLLIMPEXP_BASE wxLogInterposerTemp : public wxLogChain
-{
-public:
-    wxLogInterposerTemp();
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxLogInterposerTemp);
+    DECLARE_NO_COPY_CLASS(wxLogPassThrough)
 };
 
 #if wxUSE_GUI
@@ -872,404 +465,15 @@ private:
     #include "wx/generic/logg.h"
 #endif // wxUSE_GUI
 
-// ----------------------------------------------------------------------------
-// wxLogger
-// ----------------------------------------------------------------------------
-
-// wxLogger is a helper class used by wxLogXXX() functions implementation,
-// don't use it directly as it's experimental and subject to change (OTOH it
-// might become public in the future if it's deemed to be useful enough)
-
-// contains information about the context from which a log message originates
-// and provides Log() vararg method which forwards to wxLog::OnLog() and passes
-// this context to it
-class wxLogger
-{
-public:
-    // ctor takes the basic information about the log record
-    wxLogger(wxLogLevel level,
-             const char *filename,
-             int line,
-             const char *func,
-             const char *component)
-        : m_level(level),
-          m_info(filename, line, func, component)
-    {
-    }
-
-    // store extra data in our log record and return this object itself (so
-    // that further calls to its functions could be chained)
-    template <typename T>
-    wxLogger& Store(const wxString& key, T val)
-    {
-        m_info.StoreValue(key, val);
-        return *this;
-    }
-
-    // hack for "overloaded" wxLogXXX() functions: calling this method
-    // indicates that we may have an extra first argument preceding the format
-    // string and that if we do have it, we should store it in m_info using the
-    // given key (while by default 0 value will be used)
-    wxLogger& MaybeStore(const wxString& key, wxUIntPtr value = 0)
-    {
-        wxASSERT_MSG( m_optKey.empty(), "can only have one optional value" );
-        m_optKey = key;
-
-        m_info.StoreValue(key, value);
-        return *this;
-    }
-
-
-    // non-vararg function used by wxVLogXXX():
-
-    // log the message at the level specified in the ctor if this log message
-    // is enabled
-    void LogV(const wxString& format, va_list argptr)
-    {
-        // remember that fatal errors can't be disabled
-        if ( m_level == wxLOG_FatalError ||
-                wxLog::IsLevelEnabled(m_level, m_info.component) )
-            DoCallOnLog(format, argptr);
-    }
-
-    // overloads used by functions with optional leading arguments (whose
-    // values are stored in the key passed to MaybeStore())
-    void LogV(long num, const wxString& format, va_list argptr)
-    {
-        Store(m_optKey, num);
-
-        LogV(format, argptr);
-    }
-
-    void LogV(void *ptr, const wxString& format, va_list argptr)
-    {
-        Store(m_optKey, wxPtrToUInt(ptr));
-
-        LogV(format, argptr);
-    }
-
-    void LogVTrace(const wxString& mask, const wxString& format, va_list argptr)
-    {
-        if ( !wxLog::IsAllowedTraceMask(mask) )
-            return;
-
-        Store(wxLOG_KEY_TRACE_MASK, mask);
-
-        LogV(format, argptr);
-    }
-
-
-    // vararg functions used by wxLogXXX():
-
-    // will log the message at the level specified in the ctor
-    //
-    // notice that this function supposes that the caller already checked that
-    // the level was enabled and does no checks itself
-    WX_DEFINE_VARARG_FUNC_VOID
-    (
-        Log,
-        1, (const wxFormatString&),
-        DoLog, DoLogUtf8
-    )
-
-    // same as Log() but with an extra numeric or pointer parameters: this is
-    // used to pass an optional value by storing it in m_info under the name
-    // passed to MaybeStore() and is required to support "overloaded" versions
-    // of wxLogStatus() and wxLogSysError()
-    WX_DEFINE_VARARG_FUNC_VOID
-    (
-        Log,
-        2, (long, const wxFormatString&),
-        DoLogWithNum, DoLogWithNumUtf8
-    )
-
-    // unfortunately we can't use "void *" here as we get overload ambiguities
-    // with Log(wxFormatString, ...) when the first argument is a "char *" or
-    // "wchar_t *" then -- so we only allow passing wxObject here, which is
-    // ugly but fine in practice as this overload is only used by wxLogStatus()
-    // whose first argument is a wxFrame
-    WX_DEFINE_VARARG_FUNC_VOID
-    (
-        Log,
-        2, (wxObject *, const wxFormatString&),
-        DoLogWithPtr, DoLogWithPtrUtf8
-    )
-
-    // log the message at the level specified as its first argument
-    //
-    // as the macros don't have access to the level argument in this case, this
-    // function does check that the level is enabled itself
-    WX_DEFINE_VARARG_FUNC_VOID
-    (
-        LogAtLevel,
-        2, (wxLogLevel, const wxFormatString&),
-        DoLogAtLevel, DoLogAtLevelUtf8
-    )
-
-    // special versions for wxLogTrace() which is passed either string or
-    // integer mask as first argument determining whether the message should be
-    // logged or not
-    WX_DEFINE_VARARG_FUNC_VOID
-    (
-        LogTrace,
-        2, (const wxString&, const wxFormatString&),
-        DoLogTrace, DoLogTraceUtf8
-    )
-
-#if WXWIN_COMPATIBILITY_2_8
-    WX_DEFINE_VARARG_FUNC_VOID
-    (
-        LogTrace,
-        2, (wxTraceMask, const wxFormatString&),
-        DoLogTraceMask, DoLogTraceMaskUtf8
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
-#ifdef __WATCOMC__
-    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               1, (const wxString&),
-                               (wxFormatString(f1)))
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               1, (const wxCStrData&),
-                               (wxFormatString(f1)))
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               1, (const char*),
-                               (wxFormatString(f1)))
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               1, (const wchar_t*),
-                               (wxFormatString(f1)))
-
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               2, (long, const wxString&),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               2, (long, const wxCStrData&),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               2, (long, const char *),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               2, (long, const wchar_t *),
-                               (f1, wxFormatString(f2)))
-
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               2, (wxObject *, const wxString&),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               2, (wxObject *, const wxCStrData&),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               2, (wxObject *, const char *),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, Log,
-                               2, (wxObject *, const wchar_t *),
-                               (f1, wxFormatString(f2)))
-
-    WX_VARARG_WATCOM_WORKAROUND(void, LogAtLevel,
-                               2, (wxLogLevel, const wxString&),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, LogAtLevel,
-                               2, (wxLogLevel, const wxCStrData&),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, LogAtLevel,
-                               2, (wxLogLevel, const char *),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, LogAtLevel,
-                               2, (wxLogLevel, const wchar_t *),
-                               (f1, wxFormatString(f2)))
-
-    WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
-                               2, (const wxString&, const wxString&),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
-                               2, (const wxString&, const wxCStrData&),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
-                               2, (const wxString&, const char *),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
-                               2, (const wxString&, const wchar_t *),
-                               (f1, wxFormatString(f2)))
-
-#if WXWIN_COMPATIBILITY_2_8
-    WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
-                               2, (wxTraceMask, wxTraceMask),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
-                               2, (wxTraceMask, const wxCStrData&),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
-                               2, (wxTraceMask, const char *),
-                               (f1, wxFormatString(f2)))
-    WX_VARARG_WATCOM_WORKAROUND(void, LogTrace,
-                               2, (wxTraceMask, const wchar_t *),
-                               (f1, wxFormatString(f2)))
-#endif // WXWIN_COMPATIBILITY_2_8
-#endif // __WATCOMC__
-
-private:
-#if !wxUSE_UTF8_LOCALE_ONLY
-    void DoLog(const wxChar *format, ...)
-    {
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-
-    void DoLogWithNum(long num, const wxChar *format, ...)
-    {
-        Store(m_optKey, num);
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-
-    void DoLogWithPtr(void *ptr, const wxChar *format, ...)
-    {
-        Store(m_optKey, wxPtrToUInt(ptr));
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-
-    void DoLogAtLevel(wxLogLevel level, const wxChar *format, ...)
-    {
-        if ( !wxLog::IsLevelEnabled(level, m_info.component) )
-            return;
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(level, format, argptr);
-        va_end(argptr);
-    }
-
-    void DoLogTrace(const wxString& mask, const wxChar *format, ...)
-    {
-        if ( !wxLog::IsAllowedTraceMask(mask) )
-            return;
-
-        Store(wxLOG_KEY_TRACE_MASK, mask);
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-
-#if WXWIN_COMPATIBILITY_2_8
-    void DoLogTraceMask(wxTraceMask mask, const wxChar *format, ...)
-    {
-        if ( (wxLog::GetTraceMask() & mask) != mask )
-            return;
-
-        Store(wxLOG_KEY_TRACE_MASK, mask);
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-#endif // WXWIN_COMPATIBILITY_2_8
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-    void DoLogUtf8(const char *format, ...)
-    {
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-
-    void DoLogWithNumUtf8(long num, const char *format, ...)
-    {
-        Store(m_optKey, num);
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-
-    void DoLogWithPtrUtf8(void *ptr, const char *format, ...)
-    {
-        Store(m_optKey, wxPtrToUInt(ptr));
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-
-    void DoLogAtLevelUtf8(wxLogLevel level, const char *format, ...)
-    {
-        if ( !wxLog::IsLevelEnabled(level, m_info.component) )
-            return;
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(level, format, argptr);
-        va_end(argptr);
-    }
-
-    void DoLogTraceUtf8(const wxString& mask, const char *format, ...)
-    {
-        if ( !wxLog::IsAllowedTraceMask(mask) )
-            return;
-
-        Store(wxLOG_KEY_TRACE_MASK, mask);
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-
-#if WXWIN_COMPATIBILITY_2_8
-    void DoLogTraceMaskUtf8(wxTraceMask mask, const char *format, ...)
-    {
-        if ( (wxLog::GetTraceMask() & mask) != mask )
-            return;
-
-        Store(wxLOG_KEY_TRACE_MASK, mask);
-
-        va_list argptr;
-        va_start(argptr, format);
-        DoCallOnLog(format, argptr);
-        va_end(argptr);
-    }
-#endif // WXWIN_COMPATIBILITY_2_8
-#endif // wxUSE_UNICODE_UTF8
-
-    void DoCallOnLog(wxLogLevel level, const wxString& format, va_list argptr)
-    {
-        wxLog::OnLog(level, wxString::FormatV(format, argptr), m_info);
-    }
-
-    void DoCallOnLog(const wxString& format, va_list argptr)
-    {
-        DoCallOnLog(m_level, format, argptr);
-    }
-
-
-    const wxLogLevel m_level;
-    wxLogRecordInfo m_info;
-
-    wxString m_optKey;
-
-    wxDECLARE_NO_COPY_CLASS(wxLogger);
-};
-
 // ============================================================================
 // global functions
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// Log functions should be used by application instead of stdio, iostream &c
+// for log messages for easy redirection
+// ----------------------------------------------------------------------------
+
 // ----------------------------------------------------------------------------
 // get error code/error message from system in a portable way
 // ----------------------------------------------------------------------------
@@ -1281,222 +485,36 @@ WXDLLIMPEXP_BASE unsigned long wxSysErrorCode();
 WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
 
 // ----------------------------------------------------------------------------
-// define wxLog<level>() functions which can be used by application instead of
-// stdio, iostream &c for log messages for easy redirection
+// define wxLog<level>
 // ----------------------------------------------------------------------------
 
-/*
-    The code below is unreadable because it (unfortunately unavoidably)
-    contains a lot of macro magic but all it does is to define wxLogXXX() such
-    that you can call them as vararg functions to log a message at the
-    corresponding level.
-
-    More precisely, it defines:
-
-        - wxLog{FatalError,Error,Warning,Message,Verbose,Debug}() functions
-        taking the format string and additional vararg arguments if needed.
-        - wxLogGeneric(wxLogLevel level, const wxString& format, ...) which
-        takes the log level explicitly.
-        - wxLogSysError(const wxString& format, ...) and wxLogSysError(long
-        err, const wxString& format, ...) which log a wxLOG_Error severity
-        message with the error message corresponding to the system error code
-        err or the last error.
-        - wxLogStatus(const wxString& format, ...) which logs the message into
-        the status bar of the main application window and its overload
-        wxLogStatus(wxFrame *frame, const wxString& format, ...) which logs it
-        into the status bar of the specified frame.
-        - wxLogTrace(Mask mask, const wxString& format, ...) which only logs
-        the message is the specified mask is enabled. This comes in two kinds:
-        Mask can be a wxString or a long. Both are deprecated.
-
-    In addition, wxVLogXXX() versions of all the functions above are also
-    defined. They take a va_list argument instead of "...".
- */
-
-// creates wxLogger object for the current location
-#define wxMAKE_LOGGER(level) \
-    wxLogger(wxLOG_##level, __FILE__, __LINE__, __WXFUNCTION__, wxLOG_COMPONENT)
-
-// this macro generates the expression which logs whatever follows it in
-// parentheses at the level specified as argument
-#define wxDO_LOG(level) wxMAKE_LOGGER(level).Log
-
-// this is the non-vararg equivalent
-#define wxDO_LOGV(level, format, argptr) \
-    wxMAKE_LOGGER(level).LogV(format, argptr)
-
-// this macro declares wxLog<level>() macro which logs whatever follows it if
-// logging at specified level is enabled (notice that if it is false, the
-// following arguments are not even evaluated which is good as it avoids
-// unnecessary overhead)
-//
-// Note: the strange if/else construct is needed to make the following code
-//
-//          if ( cond )
-//              wxLogError("!!!");
-//          else
-//              ...
-//
-//       work as expected, without it the second "else" would match the "if"
-//       inside wxLogError(). Unfortunately code like
-//
-//          if ( cond )
-//              wxLogError("!!!");
-//
-//       now provokes "suggest explicit braces to avoid ambiguous 'else'"
-//       warnings from g++ 4.3 and later with -Wparentheses on but they can be
-//       easily fixed by adding curly braces around wxLogError() and at least
-//       the code still does do the right thing.
-#define wxDO_LOG_IF_ENABLED(level)                                            \
-    if ( !wxLog::IsLevelEnabled(wxLOG_##level, wxLOG_COMPONENT) )             \
-    {}                                                                        \
-    else                                                                      \
-        wxDO_LOG(level)
-
-// wxLogFatalError() is special as it can't be disabled
-#define wxLogFatalError wxDO_LOG(FatalError)
-#define wxVLogFatalError(format, argptr) wxDO_LOGV(FatalError, format, argptr)
-
-#define wxLogError wxDO_LOG_IF_ENABLED(Error)
-#define wxVLogError(format, argptr) wxDO_LOGV(Error, format, argptr)
-
-#define wxLogWarning wxDO_LOG_IF_ENABLED(Warning)
-#define wxVLogWarning(format, argptr) wxDO_LOGV(Warning, format, argptr)
-
-#define wxLogMessage wxDO_LOG_IF_ENABLED(Message)
-#define wxVLogMessage(format, argptr) wxDO_LOGV(Message, format, argptr)
-
-// this one is special as it only logs if we're in verbose mode
-#define wxLogVerbose                                                          \
-    if ( !(wxLog::IsLevelEnabled(wxLOG_Info, wxLOG_COMPONENT) &&              \
-            wxLog::GetVerbose()) )                                            \
-    {}                                                                        \
-    else                                                                      \
-        wxDO_LOG(Info)
-#define wxVLogVerbose(format, argptr)                                         \
-    if ( !(wxLog::IsLevelEnabled(wxLOG_Info, wxLOG_COMPONENT) &&              \
-            wxLog::GetVerbose()) )                                            \
-    {}                                                                        \
-    else                                                                      \
-        wxDO_LOGV(Info, format, argptr)
-
-// deprecated synonyms for wxLogVerbose() and wxVLogVerbose()
-#define wxLogInfo wxLogVerbose
-#define wxVLogInfo wxVLogVerbose
-
-
-// another special case: the level is passed as first argument of the function
-// and so is not available to the macro
-//
-// notice that because of this, arguments of wxLogGeneric() are currently
-// always evaluated, unlike for the other log functions
-#define wxLogGeneric wxMAKE_LOGGER(Max).LogAtLevel
-#define wxVLogGeneric(level, format, argptr) \
-    if ( !wxLog::IsLevelEnabled(wxLOG_##level, wxLOG_COMPONENT) )             \
-    {}                                                                        \
-    else                                                                      \
-        wxDO_LOGV(level, format, argptr)
-
-
-// wxLogSysError() needs to stash the error code value in the log record info
-// so it needs special handling too; additional complications arise because the
-// error code may or not be present as the first argument
-//
-// notice that we unfortunately can't avoid the call to wxSysErrorCode() even
-// though it may be unneeded if an explicit error code is passed to us because
-// the message might not be logged immediately (e.g. it could be queued for
-// logging from the main thread later) and so we can't to wait until it is
-// logged to determine whether we have last error or not as it will be too late
-// and it will have changed already by then (in fact it even changes when
-// wxString::Format() is called because of vsnprintf() inside it so it can
-// change even much sooner)
-#define wxLOG_KEY_SYS_ERROR_CODE "wx.sys_error"
-
-#define wxLogSysError                                                         \
-    if ( !wxLog::IsLevelEnabled(wxLOG_Error, wxLOG_COMPONENT) )               \
-    {}                                                                        \
-    else                                                                      \
-        wxMAKE_LOGGER(Error).MaybeStore(wxLOG_KEY_SYS_ERROR_CODE,             \
-                                        wxSysErrorCode()).Log
-
-// unfortunately we can't have overloaded macros so we can't define versions
-// both with and without error code argument and have to rely on LogV()
-// overloads in wxLogger to select between them
-#define wxVLogSysError \
-    wxMAKE_LOGGER(Error).MaybeStore(wxLOG_KEY_SYS_ERROR_CODE, \
-                                    wxSysErrorCode()).LogV
-
-#if wxUSE_GUI
-    // wxLogStatus() is similar to wxLogSysError() as it allows to optionally
-    // specify the frame to which the message should go
-    #define wxLOG_KEY_FRAME "wx.frame"
-
-    #define wxLogStatus                                                       \
-        if ( !wxLog::IsLevelEnabled(wxLOG_Status, wxLOG_COMPONENT) )          \
-        {}                                                                    \
-        else                                                                  \
-            wxMAKE_LOGGER(Status).MaybeStore(wxLOG_KEY_FRAME).Log
-
-    #define wxVLogStatus(format, argptr) \
-        wxMAKE_LOGGER(Status).MaybeStore(wxLOG_KEY_FRAME).LogV
-#endif // wxUSE_GUI
-
-
+#define DECLARE_LOG_FUNCTION(level)                                         \
+extern void WXDLLIMPEXP_BASE wxVLog##level(const wxChar *szFormat,          \
+                                           va_list argptr);                 \
+extern void WXDLLIMPEXP_BASE wxLog##level(const wxChar *szFormat,           \
+                                          ...) ATTRIBUTE_PRINTF_1
+#define DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, expdecl)            \
+extern void expdecl wxVLog##level(argclass arg,                             \
+                                  const wxChar *szFormat,                   \
+                                  va_list argptr);                          \
+extern void expdecl wxLog##level(argclass arg,                              \
+                                 const wxChar *szFormat,                    \
+                                 ...) ATTRIBUTE_PRINTF_2
 #else // !wxUSE_LOG
 
-#undef wxUSE_LOG_DEBUG
-#define wxUSE_LOG_DEBUG 0
-
-#undef wxUSE_LOG_TRACE
-#define wxUSE_LOG_TRACE 0
-
-#if defined(__WATCOMC__) || defined(__MINGW32__)
-    // Mingw has similar problem with wxLogSysError:
-    #define WX_WATCOM_OR_MINGW_ONLY_CODE( x )  x
-#else
-    #define WX_WATCOM_OR_MINGW_ONLY_CODE( x )
-#endif
-
-// define macros for defining log functions which do nothing at all
-//
-// WX_WATCOM_ONLY_CODE is needed to work around
-// http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-#define wxDEFINE_EMPTY_LOG_FUNCTION(level)                                  \
-    WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const wxFormatString&))     \
-    WX_WATCOM_ONLY_CODE(                                                    \
-        WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const char*))           \
-        WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const wchar_t*))        \
-        WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 1, (const wxCStrData&))     \
-    )                                                                       \
-    inline void wxVLog##level(const wxFormatString& WXUNUSED(format),       \
-                              va_list WXUNUSED(argptr)) { }                 \
-
-#define wxDEFINE_EMPTY_LOG_FUNCTION2(level, argclass)                       \
-    WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wxFormatString&)) \
-    WX_WATCOM_OR_MINGW_ONLY_CODE(                                           \
-        WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const char*)) \
-        WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wchar_t*)) \
-        WX_DEFINE_VARARG_FUNC_NOP(wxLog##level, 2, (argclass, const wxCStrData&)) \
-    )                                                                       \
-    inline void wxVLog##level(argclass WXUNUSED(arg),                       \
-                              const wxFormatString& WXUNUSED(format),       \
-                              va_list WXUNUSED(argptr)) {}
-
-wxDEFINE_EMPTY_LOG_FUNCTION(FatalError);
-wxDEFINE_EMPTY_LOG_FUNCTION(Error);
-wxDEFINE_EMPTY_LOG_FUNCTION(SysError);
-wxDEFINE_EMPTY_LOG_FUNCTION2(SysError, long);
-wxDEFINE_EMPTY_LOG_FUNCTION(Warning);
-wxDEFINE_EMPTY_LOG_FUNCTION(Message);
-wxDEFINE_EMPTY_LOG_FUNCTION(Info);
-wxDEFINE_EMPTY_LOG_FUNCTION(Verbose);
-
-wxDEFINE_EMPTY_LOG_FUNCTION2(Generic, wxLogLevel);
-
-#if wxUSE_GUI
-    wxDEFINE_EMPTY_LOG_FUNCTION(Status);
-    wxDEFINE_EMPTY_LOG_FUNCTION2(Status, wxFrame *);
-#endif // wxUSE_GUI
+// log functions do nothing at all
+#define DECLARE_LOG_FUNCTION(level)                                         \
+inline void wxVLog##level(const wxChar *WXUNUSED(szFormat),                 \
+                          va_list WXUNUSED(argptr)) { }                     \
+inline void wxLog##level(const wxChar *WXUNUSED(szFormat),                  \
+                         ...) { }
+#define DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, expdecl)            \
+inline void wxVLog##level(argclass WXUNUSED(arg),                           \
+                          const wxChar *WXUNUSED(szFormat),                 \
+                          va_list WXUNUSED(argptr)) {}                      \
+inline void wxLog##level(argclass WXUNUSED(arg),                            \
+                         const wxChar *WXUNUSED(szFormat),                  \
+                         ...) { }
 
 // Empty Class to fake wxLogNull
 class WXDLLIMPEXP_BASE wxLogNull
@@ -1514,70 +532,85 @@ public:
 
 #endif // wxUSE_LOG/!wxUSE_LOG
 
+#define DECLARE_LOG_FUNCTION2(level, argclass, arg)                         \
+    DECLARE_LOG_FUNCTION2_EXP(level, argclass, arg, WXDLLIMPEXP_BASE)
 
-// debug functions can be completely disabled in optimized builds
 
-// if these log functions are disabled, we prefer to define them as (empty)
-// variadic macros as this completely removes them and their argument
-// evaluation from the object code but if this is not supported by compiler we
-// use empty inline functions instead (defining them as nothing would result in
-// compiler warnings)
-//
-// note that making wxVLogDebug/Trace() themselves (empty inline) functions is
-// a bad idea as some compilers are stupid enough to not inline even empty
-// functions if their parameters are complicated enough, but by defining them
-// as an empty inline function we ensure that even dumbest compilers optimise
-// them away
-#ifdef __BORLANDC__
-    // but Borland gives "W8019: Code has no effect" for wxLogNop() so we need
-    // to define it differently for it to avoid these warnings (same problem as
-    // with wxUnusedVar())
-    #define wxLogNop() { }
-#else
+// a generic function for all levels (level is passes as parameter)
+DECLARE_LOG_FUNCTION2(Generic, wxLogLevel, level);
+
+// one function per each level
+DECLARE_LOG_FUNCTION(FatalError);
+DECLARE_LOG_FUNCTION(Error);
+DECLARE_LOG_FUNCTION(Warning);
+DECLARE_LOG_FUNCTION(Message);
+DECLARE_LOG_FUNCTION(Info);
+DECLARE_LOG_FUNCTION(Verbose);
+
+// this function sends the log message to the status line of the top level
+// application frame, if any
+DECLARE_LOG_FUNCTION(Status);
+
+#if wxUSE_GUI
+    // this one is the same as previous except that it allows to explicitly
+    class WXDLLIMPEXP_FWD_CORE wxFrame;
+    // specify the frame to which the output should go
+    DECLARE_LOG_FUNCTION2_EXP(Status, wxFrame *, pFrame, WXDLLIMPEXP_CORE);
+#endif // wxUSE_GUI
+
+// additional one: as wxLogError, but also logs last system call error code
+// and the corresponding error message if available
+DECLARE_LOG_FUNCTION(SysError);
+
+// and another one which also takes the error code (for those broken APIs
+// that don't set the errno (like registry APIs in Win32))
+DECLARE_LOG_FUNCTION2(SysError, long, lErrCode);
+
+// debug functions do nothing in release mode
+#if wxUSE_LOG && wxUSE_LOG_DEBUG
+    DECLARE_LOG_FUNCTION(Debug);
+
+    // there is no more unconditional LogTrace: it is not different from
+    // LogDebug and it creates overload ambiguities
+    //DECLARE_LOG_FUNCTION(Trace);
+
+    // this version only logs the message if the mask had been added to the
+    // list of masks with AddTraceMask()
+    DECLARE_LOG_FUNCTION2(Trace, const wxChar *, mask);
+
+    // and this one does nothing if all of level bits are not set in
+    // wxLog::GetActive()->GetTraceMask() -- it's deprecated in favour of
+    // string identifiers
+    DECLARE_LOG_FUNCTION2(Trace, wxTraceMask, mask);
+#else   //!debug || !wxUSE_LOG
+    // these functions do nothing in release builds, but don't define them as
+    // nothing as it could result in different code structure in debug and
+    // release and this could result in trouble when these macros are used
+    // inside if/else
+    //
+    // note that making wxVLogDebug/Trace() themselves (empty inline) functions
+    // is a bad idea as some compilers are stupid enough to not inline even
+    // empty functions if their parameters are complicated enough, but by
+    // defining them as an empty inline function we ensure that even dumbest
+    // compilers optimise them away
     inline void wxLogNop() { }
-#endif
 
-#if wxUSE_LOG_DEBUG
-    #define wxLogDebug wxDO_LOG_IF_ENABLED(Debug)
-    #define wxVLogDebug(format, argptr) wxDO_LOGV(Debug, format, argptr)
-#else // !wxUSE_LOG_DEBUG
     #define wxVLogDebug(fmt, valist) wxLogNop()
-
-    #ifdef HAVE_VARIADIC_MACROS
-        #define wxLogDebug(fmt, ...) wxLogNop()
-    #else // !HAVE_VARIADIC_MACROS
-        WX_DEFINE_VARARG_FUNC_NOP(wxLogDebug, 1, (const wxFormatString&))
-    #endif
-#endif // wxUSE_LOG_DEBUG/!wxUSE_LOG_DEBUG
-
-#if wxUSE_LOG_TRACE
-    #define wxLogTrace                                                        \
-        if ( !wxLog::IsLevelEnabled(wxLOG_Trace, wxLOG_COMPONENT) )           \
-        {}                                                                    \
-        else                                                                  \
-            wxMAKE_LOGGER(Trace).LogTrace
-    #define wxVLogTrace                                                       \
-        if ( !wxLog::IsLevelEnabled(wxLOG_Trace, wxLOG_COMPONENT) )           \
-        {}                                                                    \
-        else                                                                  \
-            wxMAKE_LOGGER(Trace).LogVTrace
-#else  // !wxUSE_LOG_TRACE
     #define wxVLogTrace(mask, fmt, valist) wxLogNop()
 
     #ifdef HAVE_VARIADIC_MACROS
+        // unlike the inline functions below, this completely removes the
+        // wxLogXXX calls from the object file:
+        #define wxLogDebug(fmt, ...) wxLogNop()
         #define wxLogTrace(mask, fmt, ...) wxLogNop()
     #else // !HAVE_VARIADIC_MACROS
-        #if WXWIN_COMPATIBILITY_2_8
-        WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (wxTraceMask, const wxFormatString&))
-        #endif
-        WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wxString&, const wxFormatString&))
-        #ifdef __WATCOMC__
-        // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-        WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const char*, const char*))
-        WX_DEFINE_VARARG_FUNC_NOP(wxLogTrace, 2, (const wchar_t*, const wchar_t*))
-        #endif
+        // note that leaving out "fmt" in the vararg functions provokes a warning
+        // from SGI CC: "the last argument of the varargs function is unnamed"
+        inline void wxLogDebug(const wxChar *fmt, ...) { wxUnusedVar(fmt); }
+        inline void wxLogTrace(wxTraceMask, const wxChar *fmt, ...) { wxUnusedVar(fmt); }
+        inline void wxLogTrace(const wxChar *, const wxChar *fmt, ...) { wxUnusedVar(fmt); }
     #endif // HAVE_VARIADIC_MACROS/!HAVE_VARIADIC_MACROS
-#endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE
+#endif // debug/!debug
 
 // wxLogFatalError helper: show the (fatal) error to the user in a safe way,
 // i.e. without using wxMessageBox() for example because it could crash
@@ -1588,46 +621,33 @@ wxSafeShowMessage(const wxString& title, const wxString& text);
 // debug only logging functions: use them with API name and error code
 // ----------------------------------------------------------------------------
 
-#if wxUSE_LOG_DEBUG
+#ifdef __WXDEBUG__
     // make life easier for people using VC++ IDE: clicking on the message
     // will take us immediately to the place of the failed API
 #ifdef __VISUALC__
     #define wxLogApiError(api, rc)                                            \
         wxLogDebug(wxT("%s(%d): '%s' failed with error 0x%08lx (%s)."),       \
-                   __FILE__, __LINE__, api,                                   \
+                   __TFILE__, __LINE__, api,                                  \
                    (long)rc, wxSysErrorMsg(rc))
 #else // !VC++
     #define wxLogApiError(api, rc)                                            \
         wxLogDebug(wxT("In file %s at line %d: '%s' failed with ")            \
                    wxT("error 0x%08lx (%s)."),                                \
-                   __FILE__, __LINE__, api,                                   \
+                   __TFILE__, __LINE__, api,                                  \
                    (long)rc, wxSysErrorMsg(rc))
 #endif // VC++/!VC++
 
     #define wxLogLastError(api) wxLogApiError(api, wxSysErrorCode())
 
-#else // !wxUSE_LOG_DEBUG
+#else   //!debug
     #define wxLogApiError(api, err) wxLogNop()
     #define wxLogLastError(api) wxLogNop()
-#endif // wxUSE_LOG_DEBUG/!wxUSE_LOG_DEBUG
+#endif  //debug/!debug
 
 // wxCocoa has additiional trace masks
 #if defined(__WXCOCOA__)
 #include "wx/cocoa/log.h"
 #endif
 
-#ifdef WX_WATCOM_ONLY_CODE
-    #undef WX_WATCOM_ONLY_CODE
-#endif
-
-// macro which disables debug logging in release builds: this is done by
-// default by wxIMPLEMENT_APP() so usually it doesn't need to be used explicitly
-#if defined(NDEBUG) && wxUSE_LOG_DEBUG
-    #define wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD() \
-        wxLog::SetLogLevel(wxLOG_Info)
-#else // !NDEBUG
-    #define wxDISABLE_DEBUG_LOGGING_IN_RELEASE_BUILD()
-#endif // NDEBUG/!NDEBUG
-
 #endif  // _WX_LOG_H_
 
diff --git a/Source/3rd Party/wx/include/wx/longlong.h b/Source/3rd Party/wx/include/wx/longlong.h
index 7a29d86ef..304001d8d 100644
--- a/Source/3rd Party/wx/include/wx/longlong.h	
+++ b/Source/3rd Party/wx/include/wx/longlong.h	
@@ -5,7 +5,7 @@
 // Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
 // Modified by:
 // Created:     10.02.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: longlong.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,8 +67,8 @@
         #define wxUSE_LONGLONG_NATIVE 0
     #endif
 
-    class WXDLLIMPEXP_FWD_BASE wxLongLongWx;
-    class WXDLLIMPEXP_FWD_BASE wxULongLongWx;
+    class WXDLLIMPEXP_BASE wxLongLongWx;
+    class WXDLLIMPEXP_BASE wxULongLongWx;
 #if defined(__VISUALC__) && !defined(__WIN32__)
     #define wxLongLong wxLongLongWx
     #define wxULongLong wxULongLongWx
@@ -404,20 +404,15 @@ public:
         // convert to ulong with range checking in debug mode (only!)
     unsigned long ToULong() const
     {
-        wxASSERT_MSG( m_ll <= ULONG_MAX,
+        wxASSERT_MSG( m_ll <= LONG_MAX,
                       wxT("wxULongLong to long conversion loss of precision") );
 
         return wx_truncate_cast(unsigned long, m_ll);
     }
 
         // convert to double
-        //
-        // For some completely obscure reasons compiling the cast below with
-        // VC6 in DLL builds only (!) results in "error C2520: conversion from
-        // unsigned __int64 to double not implemented, use signed __int64" so
-        // we must use a different version for that compiler.
-#ifdef __VISUALC6__
-    double ToDouble() const;
+#ifdef _MSC_VER
+    double ToDouble() const { return wx_truncate_cast(double, (__int64) m_ll); }
 #else
     double ToDouble() const { return wx_truncate_cast(double, m_ll); }
 #endif
@@ -1080,66 +1075,6 @@ WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &st
 
 #endif
 
-// ----------------------------------------------------------------------------
-// Specialize numeric_limits<> for our long long wrapper classes.
-// ----------------------------------------------------------------------------
-
-#if wxUSE_LONGLONG_NATIVE
-
-// VC6 is known to not have __int64 specializations of numeric_limits<> in its
-// <limits> anyhow so don't bother including it, especially as it results in
-// tons of warnings because the standard header itself uses obsolete template
-// specialization syntax.
-#ifndef __VISUALC6__
-
-#include <limits>
-
-namespace std
-{
-
-#ifdef __clang__
-  // libstdc++ (used by Clang) uses struct for numeric_limits; unlike gcc, clang
-  // warns about this
-  template<> struct numeric_limits<wxLongLong>  : public numeric_limits<wxLongLong_t> {};
-  template<> struct numeric_limits<wxULongLong> : public numeric_limits<wxULongLong_t> {};
-#else
-  template<> class numeric_limits<wxLongLong>  : public numeric_limits<wxLongLong_t> {};
-  template<> class numeric_limits<wxULongLong> : public numeric_limits<wxULongLong_t> {};
-#endif
-
-} // namespace std
-
-#endif // !VC6
-
-#endif // wxUSE_LONGLONG_NATIVE
-
-// ----------------------------------------------------------------------------
-// Specialize wxArgNormalizer to allow using wxLongLong directly with wx pseudo
-// vararg functions.
-// ----------------------------------------------------------------------------
-
-// Notice that this must be done here and not in wx/strvararg.h itself because
-// we can't include wx/longlong.h from there as this header itself includes
-// wx/string.h which includes wx/strvararg.h too, so to avoid the circular
-// dependencies we can only do it here (or add another header just for this but
-// it doesn't seem necessary).
-#include "wx/strvararg.h"
-
-template<>
-struct WXDLLIMPEXP_BASE wxArgNormalizer<wxLongLong>
-{
-     wxArgNormalizer(wxLongLong value,
-                     const wxFormatString *fmt, unsigned index)
-         : m_value(value)
-     {
-         wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_LongLongInt );
-     }
-
-     wxLongLong_t get() const { return m_value.GetValue(); }
-
-     wxLongLong m_value;
-};
-
 #endif // wxUSE_LONGLONG
 
 #endif // _WX_LONGLONG_H
diff --git a/Source/3rd Party/wx/include/wx/math.h b/Source/3rd Party/wx/include/wx/math.h
index 1c98bb21a..5ac102151 100644
--- a/Source/3rd Party/wx/include/wx/math.h	
+++ b/Source/3rd Party/wx/include/wx/math.h	
@@ -4,7 +4,7 @@
 * Author:      John Labenski and others
 * Modified by:
 * Created:     02/02/03
-* RCS-ID:      $Id$
+* RCS-ID:      $Id: math.h 62541 2009-11-03 14:10:46Z VZ $
 * Copyright:   (c) John Labenski
 * Licence:     wxWindows licence
 */
@@ -22,9 +22,9 @@
     #define M_PI 3.1415926535897932384626433832795
 #endif
 
-/* Scaling factors for various unit conversions: 1 inch = 2.54 cm */
+/* Scaling factors for various unit conversions */
 #ifndef METRIC_CONVERSION_CONSTANT
-    #define METRIC_CONVERSION_CONSTANT (1/25.4)
+    #define METRIC_CONVERSION_CONSTANT 0.0393700787
 #endif
 
 #ifndef mm2inches
@@ -57,18 +57,9 @@
 #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)
     #include <float.h>
     #define wxFinite(x) _finite(x)
-#elif defined(__MINGW64__) || defined(__clang__)
-    /*
-        add more compilers with C99 support here: using C99 isfinite() is
-        preferable to using BSD-ish finite()
-     */
-    #define wxFinite(x) isfinite(x)
-#elif ( defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
+#elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
-      defined(__HPUX__) ) && ( !defined(wxOSX_USE_IPHONE) || wxOSX_USE_IPHONE == 0 )
-#ifdef __SOLARIS__
-#include <ieeefp.h>
-#endif
+      defined(__HPUX__)||defined(__MWERKS__)
     #define wxFinite(x) finite(x)
 #else
     #define wxFinite(x) ((x) == (x))
@@ -79,7 +70,7 @@
     #define wxIsNaN(x) _isnan(x)
 #elif defined(__GNUG__)||defined(__GNUWIN32__)||defined(__DJGPP__)|| \
       defined(__SGI_CC__)||defined(__SUNCC__)||defined(__XLC__)|| \
-      defined(__HPUX__)
+      defined(__HPUX__)||defined(__MWERKS__)
     #define wxIsNaN(x) isnan(x)
 #else
     #define wxIsNaN(x) ((x) != (x))
@@ -95,7 +86,7 @@
             //     shouldn't be used with doubles, but we get too many of them and
             //     removing these operators is probably not a good idea
             //
-            //     Maybe we should always compare doubles up to some "epsilon" precision
+            //     Maybe we should alway compare doubles up to some "epsilon" precision
             #pragma warning(push)
 
             // floating-point equality and inequality comparisons are unreliable
@@ -116,9 +107,6 @@
 
     inline int wxRound(double x)
     {
-        wxASSERT_MSG( x > INT_MIN - 0.5 && x < INT_MAX + 0.5,
-                      wxT("argument out of supported range") );
-
         #if defined(HAVE_ROUND)
             return int(round(x));
         #else
@@ -128,10 +116,12 @@
 #endif /* __cplusplus */
 
 
-#if defined(__WINDOWS__) && !defined(__WXWINCE__)
+#if defined(__WXMSW__) && !defined(__WXWINCE__)
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
+#elif defined( __WXMAC__ )
+    #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) )
 #else
-    #define wxMulDivInt32( a , b , c ) (wxRound((a)*(((wxDouble)b)/((wxDouble)c))))
+    #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))
 #endif
 
 #if wxUSE_APPLE_IEEE
@@ -139,15 +129,8 @@
     extern "C" {
 #endif
     /* functions from common/extended.c */
-    WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes);
-    WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
-
-    /* use wxConvertFromIeeeExtended() and wxConvertToIeeeExtended() instead */
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes) );
-    wxDEPRECATED( WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes) );
-#endif
-
+    WXDLLEXPORT wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes);
+    WXDLLEXPORT void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes);
 #ifdef __cplusplus
     }
 #endif
diff --git a/Source/3rd Party/wx/include/wx/matrix.h b/Source/3rd Party/wx/include/wx/matrix.h
index 11eb95236..11c688ba4 100644
--- a/Source/3rd Party/wx/include/wx/matrix.h	
+++ b/Source/3rd Party/wx/include/wx/matrix.h	
@@ -4,7 +4,7 @@
 // Author:       Chris Breeze, Julian Smart
 // Modified by:  Klaas Holwerda
 // Created:      01/02/97
-// RCS-ID:       $Id$
+// RCS-ID:       $Id: matrix.h 45498 2007-04-16 13:03:05Z VZ $
 // Copyright:    (c) Julian Smart, Chris Breeze
 // Licence:      wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,7 +32,7 @@
 //  at a certain coordinate and angle within another parent picture.
 //  At all times m_isIdentity is set if the matrix itself is an Identity matrix.
 //  It is used where possible to optimize calculations.
-class WXDLLIMPEXP_CORE wxTransformMatrix: public wxObject
+class WXDLLEXPORT wxTransformMatrix: public wxObject
 {
 public:
     wxTransformMatrix(void);
diff --git a/Source/3rd Party/wx/include/wx/mdi.h b/Source/3rd Party/wx/include/wx/mdi.h
index 6e7ba5c27..7a9eeca59 100644
--- a/Source/3rd Party/wx/include/wx/mdi.h	
+++ b/Source/3rd Party/wx/include/wx/mdi.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/mdi.h
 // Purpose:     wxMDI base header
-// Author:      Julian Smart (original)
-//              Vadim Zeitlin (base MDI classes refactoring)
-// Copyright:   (c) 1998 Julian Smart
-//              (c) 2008 Vadim Zeitlin
-// RCS-ID:      $Id$
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id: mdi.h 37066 2006-01-23 03:27:34Z MR $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,359 +16,25 @@
 
 #if wxUSE_MDI
 
-#include "wx/frame.h"
-#include "wx/menu.h"
-
-// forward declarations
-class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame;
-class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
-class WXDLLIMPEXP_FWD_CORE wxMDIClientWindowBase;
-class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
-
-// ----------------------------------------------------------------------------
-// wxMDIParentFrameBase: base class for parent frame for MDI children
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMDIParentFrameBase : public wxFrame
-{
-public:
-    wxMDIParentFrameBase()
-    {
-        m_clientWindow = NULL;
-        m_currentChild = NULL;
-#if wxUSE_MENUS
-        m_windowMenu = NULL;
-#endif // wxUSE_MENUS
-    }
-
-    /*
-        Derived classes should provide ctor and Create() with the following
-        declaration:
-
-    bool Create(wxWindow *parent,
-                wxWindowID winid,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                const wxString& name = wxFrameNameStr);
-     */
-
-#if wxUSE_MENUS
-    virtual ~wxMDIParentFrameBase()
-    {
-        delete m_windowMenu;
-    }
-#endif // wxUSE_MENUS
-
-    // accessors
-    // ---------
-
-    // Get or change the active MDI child window
-    virtual wxMDIChildFrame *GetActiveChild() const
-        { return m_currentChild; }
-    virtual void SetActiveChild(wxMDIChildFrame *child)
-        { m_currentChild = child; }
-
-
-    // Get the client window
-    wxMDIClientWindowBase *GetClientWindow() const { return m_clientWindow; }
-
-
-    // MDI windows menu functions
-    // --------------------------
-
-#if wxUSE_MENUS
-    // return the pointer to the current window menu or NULL if we don't have
-    // because of wxFRAME_NO_WINDOW_MENU style
-    wxMenu* GetWindowMenu() const { return m_windowMenu; }
-
-    // use the given menu instead of the default window menu
-    //
-    // menu can be NULL to disable the window menu completely
-    virtual void SetWindowMenu(wxMenu *menu)
-    {
-        if ( menu != m_windowMenu )
-        {
-            delete m_windowMenu;
-            m_windowMenu = menu;
-        }
-    }
-#endif // wxUSE_MENUS
-
-
-    // standard MDI window management functions
-    // ----------------------------------------
-
-    virtual void Cascade() { }
-    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { }
-    virtual void ArrangeIcons() { }
-    virtual void ActivateNext() = 0;
-    virtual void ActivatePrevious() = 0;
-
-    /*
-        Derived classes must provide the following function:
-
-    static bool IsTDI();
-    */
-
-    // Create the client window class (don't Create() the window here, just
-    // return a new object of a wxMDIClientWindow-derived class)
-    //
-    // Notice that if you override this method you should use the default
-    // constructor and Create() and not the constructor creating the window
-    // when creating the frame or your overridden version is not going to be
-    // called (as the call to a virtual function from ctor will be dispatched
-    // to this class version)
-    virtual wxMDIClientWindow *OnCreateClient();
-
-protected:
-    // This is wxMDIClientWindow for all the native implementations but not for
-    // the generic MDI version which has its own wxGenericMDIClientWindow and
-    // so we store it as just a base class pointer because we don't need its
-    // exact type anyhow
-    wxMDIClientWindowBase *m_clientWindow;
-    wxMDIChildFrame *m_currentChild;
-
-#if wxUSE_MENUS
-    // the current window menu or NULL if we are not using it
-    wxMenu *m_windowMenu;
-#endif // wxUSE_MENUS
-};
-
-// ----------------------------------------------------------------------------
-// wxMDIChildFrameBase: child frame managed by wxMDIParentFrame
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMDIChildFrameBase : public wxFrame
-{
-public:
-    wxMDIChildFrameBase() { m_mdiParent = NULL; }
-
-    /*
-        Derived classes should provide Create() with the following signature:
-
-    bool Create(wxMDIParentFrame *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-        And setting m_mdiParent to parent parameter.
-     */
-
-    // MDI children specific methods
-    virtual void Activate() = 0;
-
-    // Return the MDI parent frame: notice that it may not be the same as
-    // GetParent() (our parent may be the client window or even its subwindow
-    // in some implementations)
-    wxMDIParentFrame *GetMDIParent() const { return m_mdiParent; }
-
-    // Synonym for GetMDIParent(), was used in some other ports
-    wxMDIParentFrame *GetMDIParentFrame() const { return GetMDIParent(); }
-
-
-    // in most ports MDI children frames are not really top-level, the only
-    // exception are the Mac ports in which MDI children are just normal top
-    // level windows too
-    virtual bool IsTopLevel() const { return false; }
-
-    // In all ports keyboard navigation must stop at MDI child frame level and
-    // can't cross its boundary. Indicate this by overriding this function to
-    // return true.
-    virtual bool IsTopNavigationDomain() const { return true; }
-
-    // Raising any frame is supposed to show it but wxFrame Raise()
-    // implementation doesn't work for MDI child frames in most forms so
-    // forward this to Activate() which serves the same purpose by default.
-    virtual void Raise() { Activate(); }
-
-protected:
-    wxMDIParentFrame *m_mdiParent;
-};
-
-// ----------------------------------------------------------------------------
-// wxTDIChildFrame: child frame used by TDI implementations
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTDIChildFrame : public wxMDIChildFrameBase
-{
-public:
-    // override wxFrame methods for this non top-level window
-
-#if wxUSE_STATUSBAR
-    // no status bars
-    //
-    // TODO: MDI children should have their own status bars, why not?
-    virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,
-                                         long WXUNUSED(style) = 1,
-                                         wxWindowID WXUNUSED(id) = 1,
-                                         const wxString& WXUNUSED(name)
-                                            = wxEmptyString)
-      { return NULL; }
-
-    virtual wxStatusBar *GetStatusBar() const
-        { return NULL; }
-    virtual void SetStatusText(const wxString &WXUNUSED(text),
-                               int WXUNUSED(number)=0)
-        { }
-    virtual void SetStatusWidths(int WXUNUSED(n),
-                                 const int WXUNUSED(widths)[])
-        { }
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
-    // no toolbar
-    //
-    // TODO: again, it should be possible to have tool bars
-    virtual wxToolBar *CreateToolBar(long WXUNUSED(style),
-                                     wxWindowID WXUNUSED(id),
-                                     const wxString& WXUNUSED(name))
-        { return NULL; }
-    virtual wxToolBar *GetToolBar() const { return NULL; }
-#endif // wxUSE_TOOLBAR
-
-    // no icon
-    virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { }
-
-    // title is used as the tab label
-    virtual wxString GetTitle() const { return m_title; }
-    virtual void SetTitle(const wxString& title) = 0;
-
-    // no maximize etc
-    virtual void Maximize(bool WXUNUSED(maximize) = true) { }
-    virtual bool IsMaximized() const { return true; }
-    virtual bool IsAlwaysMaximized() const { return true; }
-    virtual void Iconize(bool WXUNUSED(iconize) = true) { }
-    virtual bool IsIconized() const { return false; }
-    virtual void Restore() { }
-
-    virtual bool ShowFullScreen(bool WXUNUSED(show),
-                                long WXUNUSED(style)) { return false; }
-    virtual bool IsFullScreen() const { return false; }
-
-
-    // we need to override these functions to ensure that a child window is
-    // created even though we derive from wxFrame -- basically we make it
-    // behave as just a wxWindow by short-circuiting wxTLW changes to the base
-    // class behaviour
-
-    virtual void AddChild(wxWindowBase *child) { wxWindow::AddChild(child); }
-
-    virtual bool Destroy() { return wxWindow::Destroy(); }
-
-    // extra platform-specific hacks
-#ifdef __WXMSW__
-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const
-    {
-        return wxWindow::MSWGetStyle(flags, exstyle);
-    }
-
-    virtual WXHWND MSWGetParent() const
-    {
-        return wxWindow::MSWGetParent();
-    }
-
-    WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-    {
-        return wxWindow::MSWWindowProc(message, wParam, lParam);
-    }
-#endif // __WXMSW__
-
-protected:
-    virtual void DoGetSize(int *width, int *height) const
-    {
-        wxWindow::DoGetSize(width, height);
-    }
-
-    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags)
-    {
-        wxWindow::DoSetSize(x, y, width, height, sizeFlags);
-    }
-
-    virtual void DoGetClientSize(int *width, int *height) const
-    {
-        wxWindow::DoGetClientSize(width, height);
-    }
-
-    virtual void DoSetClientSize(int width, int height)
-    {
-        wxWindow::DoSetClientSize(width, height);
-    }
-
-    // no size hints
-    virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
-                                int WXUNUSED(maxW), int WXUNUSED(maxH),
-                                int WXUNUSED(incW), int WXUNUSED(incH)) { }
-
-    wxString m_title;
-};
-
-// ----------------------------------------------------------------------------
-// wxMDIClientWindowBase: child of parent frame, parent of children frames
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMDIClientWindowBase : public wxWindow
-{
-public:
-    /*
-        The derived class must provide the default ctor only (CreateClient()
-        will be called later).
-    */
-
-    // Can be overridden in the derived classes but the base class version must
-    // be usually called first to really create the client window.
-    virtual bool CreateClient(wxMDIParentFrame *parent,
-                              long style = wxVSCROLL | wxHSCROLL) = 0;
-};
-
-// ----------------------------------------------------------------------------
-// Include the port-specific implementation of the base classes defined above
-// ----------------------------------------------------------------------------
-
-// wxUSE_GENERIC_MDI_AS_NATIVE may be predefined to force the generic MDI
-// implementation use even on the platforms which usually don't use it
-//
-// notice that generic MDI can still be used without this, but you would need
-// to explicitly use wxGenericMDIXXX classes in your code (and currently also
-// add src/generic/mdig.cpp to your build as it's not compiled in if generic
-// MDI is not used by default -- but this may change later...)
-#ifndef wxUSE_GENERIC_MDI_AS_NATIVE
-    // wxUniv always uses the generic MDI implementation and so do the ports
-    // without native version (although wxCocoa seems to have one -- but it's
-    // probably not functional?)
-    #if defined(__WXCOCOA__) || \
-        defined(__WXMOTIF__) || \
-        defined(__WXPM__) || \
-        defined(__WXUNIVERSAL__)
-        #define wxUSE_GENERIC_MDI_AS_NATIVE   1
-    #else
-        #define wxUSE_GENERIC_MDI_AS_NATIVE   0
-    #endif
-#endif // wxUSE_GENERIC_MDI_AS_NATIVE
-
-#if wxUSE_GENERIC_MDI_AS_NATIVE
+#if defined(__WXUNIVERSAL__)
     #include "wx/generic/mdig.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/mdi.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/mdi.h"
 #elif defined(__WXGTK20__)
     #include "wx/gtk/mdi.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/mdi.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/mdi.h"
+    #include "wx/mac/mdi.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/mdi.h"
+#elif defined(__WXPM__)
+    #include "wx/generic/mdig.h"
 #endif
 
-inline wxMDIClientWindow *wxMDIParentFrameBase::OnCreateClient()
-{
-    return new wxMDIClientWindow;
-}
-
 #endif // wxUSE_MDI
 
-#endif // _WX_MDI_H_BASE_
+#endif
+    // _WX_MDI_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/memconf.h b/Source/3rd Party/wx/include/wx/memconf.h
index f794a807b..9508b1fef 100644
--- a/Source/3rd Party/wx/include/wx/memconf.h	
+++ b/Source/3rd Party/wx/include/wx/memconf.h	
@@ -6,7 +6,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.01.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: memconf.h 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@ public:
     {
     }
 
-    wxDECLARE_NO_COPY_CLASS(wxMemoryConfig);
+    DECLARE_NO_COPY_CLASS(wxMemoryConfig)
 };
 
 #endif // wxUSE_CONFIG
diff --git a/Source/3rd Party/wx/include/wx/memory.h b/Source/3rd Party/wx/include/wx/memory.h
index adaf21ffb..e4594f66e 100644
--- a/Source/3rd Party/wx/include/wx/memory.h	
+++ b/Source/3rd Party/wx/include/wx/memory.h	
@@ -4,22 +4,29 @@
 // Author:      Arthur Seaton, Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: memory.h 39634 2006-06-08 12:51:01Z ABX $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_MEMORY_H_
-#define _WX_MEMORY_H_
+#ifndef _WX_MEMORYH__
+#define _WX_MEMORYH__
 
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/msgout.h"
 
-#if wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT
+/*
+  The macro which will be expanded to include the file and line number
+  info, or to be a straight call to the new operator.
+*/
+
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 #include <stddef.h>
 
+#ifdef __WXDEBUG__
+
 WXDLLIMPEXP_BASE void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool isVect = false);
 WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false);
 
@@ -43,14 +50,14 @@ WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false);
 
 #if defined(__SUNCC__)
     #define wxUSE_ARRAY_MEMORY_OPERATORS 0
-#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) )
+#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__)
     #define wxUSE_ARRAY_MEMORY_OPERATORS 1
 #elif defined (__SGI_CC_)
     // only supported by -n32 compilers
     #ifndef __EDG_ABI_COMPATIBILITY_VERSION
         #define wxUSE_ARRAY_MEMORY_OPERATORS 0
     #endif
-#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) )
+#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__)
     #define wxUSE_ARRAY_MEMORY_OPERATORS 1
 #else
     // ::operator new[] is a recent C++ feature, so assume it's not supported
@@ -60,7 +67,7 @@ WXDLLIMPEXP_BASE void wxDebugFree(void * buf, bool isVect = false);
 // devik 2000-8-29: All new/delete ops are now inline because they can't
 // be marked as dllexport/dllimport. It then leads to weird bugs when
 // used on MSW as DLL
-#if defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
+#if defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
 inline void * operator new (size_t size, wxChar * fileName, int lineNum)
 {
     return wxDebugAlloc(size, fileName, lineNum, false, false);
@@ -108,10 +115,10 @@ void * operator new[] (size_t size, wxChar * fileName, int lineNum);
 
 void operator delete[] (void * buf);
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
-#endif // defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
+#endif // defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE))
 
-// VC++ 6.0
-#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) )
+// VC++ 6.0 and MWERKS
+#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)
 inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
     wxDebugFree(pData, false);
@@ -122,6 +129,7 @@ inline void operator delete[](void* pData, wxChar* /* fileName */, int /* lineNu
 }
 #endif // __VISUALC__>=1200
 #endif // wxUSE_GLOBAL_MEMORY_OPERATORS
+#endif // __WXDEBUG__
 
 //**********************************************************************************
 
@@ -134,7 +142,7 @@ typedef unsigned int wxMarkerType;
 
 class WXDLLIMPEXP_BASE wxMemStruct {
 
-friend class WXDLLIMPEXP_FWD_BASE wxDebugContext; // access to the m_next pointer for list traversal.
+friend class WXDLLIMPEXP_BASE wxDebugContext; // access to the m_next pointer for list traversal.
 
 public:
 public:
@@ -199,9 +207,6 @@ public:
 
 typedef void (wxMemStruct::*PmSFV) ();
 
-// Type of the app function that can be installed and called at wxWidgets shutdown
-// (after all other registered files with global destructors have been closed down).
-typedef void (*wxShutdownNotifyFunction)();
 
 /*
   Debugging class. This will only have a single instance, but it's
@@ -302,8 +307,6 @@ public:
     // This function is used to output the dump
     static void OutputDumpLine(const wxChar *szFormat, ...);
 
-    static void SetShutdownNotifyFunction(wxShutdownNotifyFunction shutdownFn);
-
 private:
     // Store these here to allow access to the list without
     // needing to have a wxMemStruct object.
@@ -313,25 +316,23 @@ private:
     // Set to false if we're not checking all previous nodes when
     // we do a new. Set to true when we are.
     static bool                 m_checkPrevious;
-
-    // Holds a pointer to an optional application function to call at shutdown.
-    static wxShutdownNotifyFunction sm_shutdownFn;
-
-    // Have to access our shutdown hook
-    friend class wxDebugContextDumpDelayCounter;
 };
 
 // Final cleanup (e.g. deleting the log object and doing memory leak checking)
 // will be delayed until all wxDebugContextDumpDelayCounter objects have been
 // destructed. Adding one wxDebugContextDumpDelayCounter per file will delay
 // memory leak checking until after destructing all global objects.
-
 class WXDLLIMPEXP_BASE wxDebugContextDumpDelayCounter
 {
 public:
-    wxDebugContextDumpDelayCounter();
-    ~wxDebugContextDumpDelayCounter();
+    wxDebugContextDumpDelayCounter() {
+        sm_count++;
+    }
 
+    ~wxDebugContextDumpDelayCounter() {
+        sm_count--;
+        if(!sm_count) DoDump();
+    }
 private:
     void DoDump();
     static int sm_count;
@@ -343,13 +344,13 @@ static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_File;
     static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_Extra;
 
 // Output a debug message, in a system dependent fashion.
-void WXDLLIMPEXP_BASE wxTrace(const wxChar *fmt ...) WX_ATTRIBUTE_PRINTF_1;
-void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) WX_ATTRIBUTE_PRINTF_2;
+void WXDLLIMPEXP_BASE wxTrace(const wxChar *fmt ...) ATTRIBUTE_PRINTF_1;
+void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) ATTRIBUTE_PRINTF_2;
 
 #define WXTRACE wxTrace
 #define WXTRACELEVEL wxTraceLevel
 
-#else // wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#else // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 #define WXDEBUG_DUMPDELAYCOUNTER
 
@@ -366,6 +367,7 @@ void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) WX_ATTRIBUT
 #define WXTRACE true ? (void)0 : wxTrace
 #define WXTRACELEVEL true ? (void)0 : wxTraceLevel
 
-#endif // wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
-#endif // _WX_MEMORY_H_
+#endif
+    // _WX_MEMORYH__
diff --git a/Source/3rd Party/wx/include/wx/memtext.h b/Source/3rd Party/wx/include/wx/memtext.h
index 48d71911f..16706092a 100644
--- a/Source/3rd Party/wx/include/wx/memtext.h	
+++ b/Source/3rd Party/wx/include/wx/memtext.h	
@@ -41,11 +41,11 @@ protected:
         { return true; }
 
     virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew),
-                         const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8())
+                         const wxMBConv& WXUNUSED(conv) = wxConvUTF8)
         { return true; }
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxMemoryText);
+    DECLARE_NO_COPY_CLASS(wxMemoryText)
 };
 
 #endif // wxUSE_TEXTBUFFER
diff --git a/Source/3rd Party/wx/include/wx/menu.h b/Source/3rd Party/wx/include/wx/menu.h
index 70500e8a9..dad76c795 100644
--- a/Source/3rd Party/wx/include/wx/menu.h	
+++ b/Source/3rd Party/wx/include/wx/menu.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.10.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: menu.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,6 @@
 // included wx/menu.h
 #include "wx/menuitem.h"
 
-class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxMenu;
 class WXDLLIMPEXP_FWD_CORE wxMenuBarBase;
 class WXDLLIMPEXP_FWD_CORE wxMenuBar;
@@ -41,7 +40,7 @@ WX_DECLARE_EXPORTED_LIST(wxMenuItem, wxMenuItemList);
 // wxMenu
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMenuBase : public wxEvtHandler
+class WXDLLEXPORT wxMenuBase : public wxEvtHandler
 {
 public:
     // create a menu
@@ -69,7 +68,7 @@ public:
     }
 
     // append a separator to the menu
-    wxMenuItem* AppendSeparator() { return Append(wxID_SEPARATOR); }
+    wxMenuItem* AppendSeparator() { return Append(wxID_SEPARATOR, wxEmptyString); }
 
     // append a check item
     wxMenuItem* AppendCheckItem(int itemid,
@@ -238,9 +237,6 @@ public:
     void SetLabel(int itemid, const wxString& label);
     wxString GetLabel(int itemid) const;
 
-    //  Returns the stripped label
-    wxString GetLabelText(int itemid) const { return wxMenuItem::GetLabelText(GetLabel(itemid)); }
-
     virtual void SetHelpString(int itemid, const wxString& helpString);
     virtual wxString GetHelpString(int itemid) const;
 
@@ -249,27 +245,16 @@ public:
 
     // the title
     virtual void SetTitle(const wxString& title) { m_title = title; }
-    const wxString& GetTitle() const { return m_title; }
+    const wxString GetTitle() const { return m_title; }
 
     // event handler
     void SetEventHandler(wxEvtHandler *handler) { m_eventHandler = handler; }
     wxEvtHandler *GetEventHandler() const { return m_eventHandler; }
 
-    // Invoking window: this is set by wxWindow::PopupMenu() before showing a
-    // popup menu and reset after it's hidden. Notice that you probably want to
-    // use GetWindow() below instead of GetInvokingWindow() as the latter only
-    // returns non-NULL for the top level menus
-    //
-    // NB: avoid calling SetInvokingWindow() directly if possible, use
-    //     wxMenuInvokingWindowSetter class below instead
-    void SetInvokingWindow(wxWindow *win);
+    // invoking window
+    void SetInvokingWindow(wxWindow *win) { m_invokingWindow = win; }
     wxWindow *GetInvokingWindow() const { return m_invokingWindow; }
 
-    // the window associated with this menu: this is the invoking window for
-    // popup menus or the top level window to which the menu bar is attached
-    // for menus which are part of a menu bar
-    wxWindow *GetWindow() const;
-
     // style
     long GetStyle() const { return m_style; }
 
@@ -279,7 +264,7 @@ public:
     // Updates the UI for a menu and all submenus recursively. source is the
     // object that has the update event handlers defined for it. If NULL, the
     // menu or associated window will be used.
-    void UpdateUI(wxEvtHandler* source = NULL);
+    void UpdateUI(wxEvtHandler* source = (wxEvtHandler*)NULL);
 
     // get the menu bar this menu is attached to (may be NULL, always NULL for
     // popup menus).  Traverse up the menu hierarchy to find it.
@@ -389,47 +374,22 @@ protected:
 
     static bool      ms_locked;
 
-    wxDECLARE_NO_COPY_CLASS(wxMenuBase);
-};
+    DECLARE_NO_COPY_CLASS(wxMenuBase)
 
-#if wxUSE_EXTENDED_RTTI    
-
-// ----------------------------------------------------------------------------
-// XTI accessor
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxMenuInfoHelper : public wxObject
-{
 public:
-    wxMenuInfoHelper() { m_menu = NULL; }
-    virtual ~wxMenuInfoHelper() { }
-    
-    bool Create( wxMenu *menu, const wxString &title )
-    { 
-        m_menu = menu; 
-        m_title = title; 
-        return true;
-    }
-    
-    wxMenu* GetMenu() const { return m_menu; }
-    wxString GetTitle() const { return m_title; }
-    
-private:
-    wxMenu *m_menu;
-    wxString m_title;
-    
-    DECLARE_DYNAMIC_CLASS(wxMenuInfoHelper)
-};
-
-WX_DECLARE_EXPORTED_LIST(wxMenuInfoHelper, wxMenuInfoHelperList );
 
+#if wxABI_VERSION >= 20805
+    //  Returns the stripped label
+    wxString GetLabelText(int itemid) const { return wxMenuItem::GetLabelFromText(GetLabel(itemid)); }
 #endif
 
+};
+
 // ----------------------------------------------------------------------------
 // wxMenuBar
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMenuBarBase : public wxWindow
+class WXDLLEXPORT wxMenuBarBase : public wxWindow
 {
 public:
     // default ctor
@@ -472,11 +432,8 @@ public:
     virtual bool IsEnabledTop(size_t WXUNUSED(pos)) const { return true; }
 
     // get or change the label of the menu at given position
-    virtual void SetMenuLabel(size_t pos, const wxString& label) = 0;
-    virtual wxString GetMenuLabel(size_t pos) const = 0;
-
-    // get the stripped label of the menu at given position
-    virtual wxString GetMenuLabelText(size_t pos) const { return wxMenuItem::GetLabelText(GetMenuLabel(pos)); }
+    virtual void SetLabelTop(size_t pos, const wxString& label) = 0;
+    virtual wxString GetLabelTop(size_t pos) const = 0;
 
     // item search
     // -----------
@@ -539,36 +496,29 @@ public:
     // update all menu item states in all menus
     virtual void UpdateMenus();
 
-    virtual bool CanBeOutsideClientArea() const { return true; }
-
-#if wxUSE_EXTENDED_RTTI    
-    // XTI helpers:
-    bool AppendMenuInfo( const wxMenuInfoHelper *info )
-    { return Append( info->GetMenu(), info->GetTitle() ); }
-    const wxMenuInfoHelperList& GetMenuInfos() const;
-#endif
-    
-#if WXWIN_COMPATIBILITY_2_8
-    // get or change the label of the menu at given position
-    // Deprecated in favour of SetMenuLabel
-    wxDEPRECATED( void SetLabelTop(size_t pos, const wxString& label) );
-    // Deprecated in favour of GetMenuLabelText
-    wxDEPRECATED( wxString GetLabelTop(size_t pos) const );
-#endif
-
 protected:
     // the list of all our menus
     wxMenuList m_menus;
 
-#if wxUSE_EXTENDED_RTTI    
-    // used by XTI
-    wxMenuInfoHelperList m_menuInfos;
-#endif
-    
     // the frame we are attached to (may be NULL)
     wxFrame *m_menuBarFrame;
 
-    wxDECLARE_NO_COPY_CLASS(wxMenuBarBase);
+    DECLARE_NO_COPY_CLASS(wxMenuBarBase)
+
+public:
+
+#if wxABI_VERSION >= 20805
+    // Replacement for SetLabelTop
+    void SetMenuLabel(size_t pos, const wxString& label) { SetLabelTop(pos, label); }
+
+    // Gets the original label at the top-level of the menubar
+    // Implemented per port, since we can't have virtual functions in the stable branch.
+    // wxString GetMenuLabel(size_t pos) const;
+
+    // Get the text only, from the label at the top-level of the menubar
+    wxString GetMenuLabelText(size_t pos) const;
+#endif
+
 };
 
 // ----------------------------------------------------------------------------
@@ -580,6 +530,8 @@ protected:
 #else // !wxUSE_BASE_CLASSES_ONLY
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/menu.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/menu.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/menu.h"
 #elif defined(__WXMOTIF__)
@@ -589,7 +541,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menu.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/menu.h"
+    #include "wx/mac/menu.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menu.h"
 #elif defined(__WXPM__)
@@ -597,35 +549,7 @@ protected:
 #endif
 #endif // wxUSE_BASE_CLASSES_ONLY/!wxUSE_BASE_CLASSES_ONLY
 
-// ----------------------------------------------------------------------------
-// Helper class used in the implementation only: sets the invoking window of
-// the given menu in its ctor and resets it in dtor.
-// ----------------------------------------------------------------------------
-
-class wxMenuInvokingWindowSetter
-{
-public:
-    // Ctor sets the invoking window for the given menu.
-    //
-    // The menu lifetime must be greater than that of this class.
-    wxMenuInvokingWindowSetter(wxMenu& menu, wxWindow *win)
-        : m_menu(menu)
-    {
-        menu.SetInvokingWindow(win);
-    }
-
-    // Dtor resets the invoking window.
-    ~wxMenuInvokingWindowSetter()
-    {
-        m_menu.SetInvokingWindow(NULL);
-    }
-
-private:
-    wxMenu& m_menu;
-
-    wxDECLARE_NO_COPY_CLASS(wxMenuInvokingWindowSetter);
-};
-
 #endif // wxUSE_MENUS
 
-#endif // _WX_MENU_H_BASE_
+#endif
+    // _WX_MENU_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/menuitem.h b/Source/3rd Party/wx/include/wx/menuitem.h
index 1a49e1199..2a55e582b 100644
--- a/Source/3rd Party/wx/include/wx/menuitem.h	
+++ b/Source/3rd Party/wx/include/wx/menuitem.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.10.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: menuitem.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -35,16 +35,16 @@ class WXDLLIMPEXP_FWD_CORE wxMenu;
 // menu or a separator
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMenuItemBase : public wxObject
+class WXDLLEXPORT wxMenuItemBase : public wxObject
 {
 public:
     // creation
-    static wxMenuItem *New(wxMenu *parentMenu = NULL,
+    static wxMenuItem *New(wxMenu *parentMenu = (wxMenu *)NULL,
                            int itemid = wxID_SEPARATOR,
                            const wxString& text = wxEmptyString,
                            const wxString& help = wxEmptyString,
                            wxItemKind kind = wxITEM_NORMAL,
-                           wxMenu *subMenu = NULL);
+                           wxMenu *subMenu = (wxMenu *)NULL);
 
     // destruction: wxMenuItem will delete its submenu
     virtual ~wxMenuItemBase();
@@ -56,31 +56,25 @@ public:
     // get/set id
     void SetId(int itemid) { m_id = itemid; }
     int  GetId() const { return m_id; }
+    bool IsSeparator() const { return m_id == wxID_SEPARATOR; }
 
     // the item's text (or name)
     //
-    // NB: the item's label includes the accelerators and mnemonics info (if
+    // NB: the item's text includes the accelerators and mnemonics info (if
     //     any), i.e. it may contain '&' or '_' or "\t..." and thus is
-    //     different from the item's text which only contains the text shown
-    //     in the menu. This used to be called SetText.
-    virtual void SetItemLabel(const wxString& str);
+    //     different from the item's label which only contains the text shown
+    //     in the menu
+    virtual void SetText(const wxString& str);
 
-    // return the item label including any mnemonics and accelerators.
-    // This used to be called GetText.
-    virtual wxString GetItemLabel() const { return m_text; }
+    wxString GetLabel() const { return GetLabelFromText(m_text); }
+    const wxString& GetText() const { return m_text; }
 
-    // return just the text of the item label, without any mnemonics
-    // This used to be called GetLabel.
-    virtual wxString GetItemLabelText() const { return GetLabelText(m_text); }
-
-    // return just the text part of the given label (implemented in platform-specific code)
-    // This used to be called GetLabelFromText.
-    static wxString GetLabelText(const wxString& label);
+    // get the label from text (implemented in platform-specific code)
+    static wxString GetLabelFromText(const wxString& text);
 
     // what kind of menu item we are
     wxItemKind GetKind() const { return m_kind; }
     void SetKind(wxItemKind kind) { m_kind = kind; }
-    bool IsSeparator() const { return m_kind == wxITEM_SEPARATOR; }
 
     virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; }
     bool IsCheckable() const
@@ -115,37 +109,23 @@ public:
     virtual void SetAccel(wxAcceleratorEntry *accel);
 #endif // wxUSE_ACCEL
 
-#if WXWIN_COMPATIBILITY_2_8
     // compatibility only, use new functions in the new code
-    wxDEPRECATED( void SetName(const wxString& str) );
-    wxDEPRECATED( wxString GetName() const );
-
-    // Now use GetItemLabelText
-    wxDEPRECATED( wxString GetLabel() const ) ;
-
-    // Now use GetItemLabel
-    wxDEPRECATED( const wxString& GetText() const );
-
-    // Now use GetLabelText to strip the accelerators
-    static wxDEPRECATED( wxString GetLabelFromText(const wxString& text) );
-
-    // Now use SetItemLabel
-    wxDEPRECATED( virtual void SetText(const wxString& str) );
-#endif // WXWIN_COMPATIBILITY_2_8
+    void SetName(const wxString& str) { SetText(str); }
+    const wxString& GetName() const { return GetText(); }
 
     static wxMenuItem *New(wxMenu *parentMenu,
                            int itemid,
                            const wxString& text,
                            const wxString& help,
                            bool isCheckable,
-                           wxMenu *subMenu = NULL)
+                           wxMenu *subMenu = (wxMenu *)NULL)
     {
         return New(parentMenu, itemid, text, help,
                    isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu);
     }
 
 protected:
-    wxWindowIDRef m_id;             // numeric id of the item >= 0 or wxID_ANY or wxID_SEPARATOR
+    int           m_id;             // numeric id of the item >= 0 or wxID_ANY or wxID_SEPARATOR
     wxMenu       *m_parentMenu,     // the menu we belong to
                  *m_subMenu;        // our sub menu or NULL
     wxString      m_text,           // label of the item
@@ -155,30 +135,39 @@ protected:
     bool          m_isEnabled;      // is enabled?
 
     // this ctor is for the derived classes only, we're never created directly
-    wxMenuItemBase(wxMenu *parentMenu = NULL,
+    wxMenuItemBase(wxMenu *parentMenu = (wxMenu *)NULL,
                    int itemid = wxID_SEPARATOR,
                    const wxString& text = wxEmptyString,
                    const wxString& help = wxEmptyString,
                    wxItemKind kind = wxITEM_NORMAL,
-                   wxMenu *subMenu = NULL);
+                   wxMenu *subMenu = (wxMenu *)NULL);
 
 private:
     // and, if we have one ctor, compiler won't generate a default copy one, so
     // declare them ourselves - but don't implement as they shouldn't be used
     wxMenuItemBase(const wxMenuItemBase& item);
     wxMenuItemBase& operator=(const wxMenuItemBase& item);
-};
 
-#if WXWIN_COMPATIBILITY_2_8
-inline void wxMenuItemBase::SetName(const wxString &str)
-    { SetItemLabel(str); }
-inline wxString wxMenuItemBase::GetName() const
-    { return GetItemLabel(); }
-inline wxString wxMenuItemBase::GetLabel() const
-    { return GetLabelText(m_text); }
-inline const wxString& wxMenuItemBase::GetText() const { return m_text; }
-inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text); }
-#endif // WXWIN_COMPATIBILITY_2_8
+public:
+
+#if wxABI_VERSION >= 20805
+    // Sets the label. This function replaces SetText.
+    void SetItemLabel(const wxString& str) { SetText(str); }
+
+    // return the item label including any mnemonics and accelerators.
+    // This used to be called GetText.
+    // We can't implement this in the base class (no new virtuals in stable branch)
+    // wxString GetItemLabel() const;
+
+    // return just the text of the item label, without any mnemonics
+    // This used to be called GetLabel.
+    wxString GetItemLabelText() const { return GetLabelText(m_text); }
+
+    // return just the text part of the given label. In 2.9 and up, this is implemented in
+    // platform-specific code, but is now implemented in terms of GetLabelFromText.
+    static wxString GetLabelText(const wxString& label);
+#endif
+};
 
 // ----------------------------------------------------------------------------
 // include the real class declaration
@@ -189,6 +178,8 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text);
 #else // !wxUSE_BASE_CLASSES_ONLY
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/menuitem.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/menuitem.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/menuitem.h"
 #elif defined(__WXMOTIF__)
@@ -198,7 +189,7 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text);
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menuitem.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/menuitem.h"
+    #include "wx/mac/menuitem.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menuitem.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/meta/convertible.h b/Source/3rd Party/wx/include/wx/meta/convertible.h
deleted file mode 100644
index 4e8d10af7..000000000
--- a/Source/3rd Party/wx/include/wx/meta/convertible.h	
+++ /dev/null
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/meta/convertible.h
-// Purpose:     Test if types are convertible
-// Author:      Arne Steinarson
-// Created:     2008-01-10
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Arne Steinarson
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_META_CONVERTIBLE_H_
-#define _WX_META_CONVERTIBLE_H_
-
-//
-// Introduce an extra class to make this header compilable with g++3.2
-//
-template <class D, class B>
-struct wxConvertibleTo_SizeHelper
-{
-    static char Match(B* pb);
-    static int  Match(...);
-};
-
-// Helper to decide if an object of type D is convertible to type B (the test
-// succeeds in particular when D derives from B)
-template <class D, class B>
-struct wxConvertibleTo
-{
-    enum
-    {
-        value =
-            sizeof(wxConvertibleTo_SizeHelper<D,B>::Match(static_cast<D*>(NULL)))
-            ==
-            sizeof(char)
-    };
-};
-
-#endif // _WX_META_CONVERTIBLE_H_
-
diff --git a/Source/3rd Party/wx/include/wx/meta/if.h b/Source/3rd Party/wx/include/wx/meta/if.h
deleted file mode 100644
index ad661d0c7..000000000
--- a/Source/3rd Party/wx/include/wx/meta/if.h	
+++ /dev/null
@@ -1,73 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/meta/if.h
-// Purpose:     declares wxIf<> metaprogramming construct
-// Author:      Vaclav Slavik
-// Created:     2008-01-22
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_META_IF_H_
-#define _WX_META_IF_H_
-
-#include "wx/defs.h"
-
-// NB: This code is intentionally written without partial templates
-//     specialization, because some older compilers (notably VC6) don't
-//     support it.
-
-namespace wxPrivate
-{
-
-template <bool Cond>
-struct wxIfImpl
-
-// broken VC6 needs not just an incomplete template class declaration but a
-// "skeleton" declaration of the specialized versions below as it apparently
-// tries to look up the types in the generic template definition at some moment
-// even though it ends up by using the correct specialization in the end -- but
-// without this skeleton it doesn't recognize Result as a class at all below
-#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
-{
-    template<typename TTrue, typename TFalse> struct Result {};
-}
-#endif // VC++ <= 6
-;
-
-// specialization for true:
-template <>
-struct wxIfImpl<true>
-{
-    template<typename TTrue, typename TFalse> struct Result
-    {
-        typedef TTrue value;
-    };
-};
-
-// specialization for false:
-template<>
-struct wxIfImpl<false>
-{
-    template<typename TTrue, typename TFalse> struct Result
-    {
-        typedef TFalse value;
-    };
-};
-
-} // namespace wxPrivate
-
-// wxIf<> template defines nested type "value" which is the same as
-// TTrue if the condition Cond (boolean compile-time constant) was met and
-// TFalse if it wasn't.
-//
-// See wxVector<T> in vector.h for usage example
-template<bool Cond, typename TTrue, typename TFalse>
-struct wxIf
-{
-    typedef typename wxPrivate::wxIfImpl<Cond>
-                     ::template Result<TTrue, TFalse>::value
-            value;
-};
-
-#endif // _WX_META_IF_H_
diff --git a/Source/3rd Party/wx/include/wx/meta/implicitconversion.h b/Source/3rd Party/wx/include/wx/meta/implicitconversion.h
deleted file mode 100644
index f6d73219e..000000000
--- a/Source/3rd Party/wx/include/wx/meta/implicitconversion.h	
+++ /dev/null
@@ -1,113 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/meta/implicitconversion.h
-// Purpose:     Determine resulting type from implicit conversion
-// Author:      Vaclav Slavik
-// Created:     2010-10-22
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_META_IMPLICITCONVERSION_H_
-#define _WX_META_IMPLICITCONVERSION_H_
-
-#include "wx/defs.h"
-#include "wx/meta/if.h"
-
-// C++ hierarchy of data types is:
-//
-//   Long double (highest)
-//   Double
-//   Float
-//   Unsigned long int
-//   Long int
-//   Unsigned int
-//   Int (lowest)
-//
-// Types lower in the hierarchy are converted into ones higher up if both are
-// involved e.g. in arithmetic expressions.
-
-namespace wxPrivate
-{
-
-// Helper macro to define a constant inside a template class: it's needed
-// because MSVC6 doesn't support initializing static integer members but the
-// usual workaround of using enums instead doesn't work for Borland (at least
-// in template classes).
-#ifdef __VISUALC6__
-    #define wxDEFINE_CLASS_INT_CONST(name, value) enum { name = value }
-#else
-    #define wxDEFINE_CLASS_INT_CONST(name, value) static const int name = value
-#endif
-
-template<typename T>
-struct TypeHierarchy
-{
-    // consider unknown types (e.g. objects, pointers) to be of highest
-    // level, always convert to them if they occur
-    wxDEFINE_CLASS_INT_CONST( level, 9999 );
-};
-
-#define WX_TYPE_HIERARCHY_LEVEL(level_num, type)        \
-    template<> struct TypeHierarchy<type>               \
-    {                                                   \
-        wxDEFINE_CLASS_INT_CONST( level, level_num );   \
-    }
-
-WX_TYPE_HIERARCHY_LEVEL( 1, char);
-WX_TYPE_HIERARCHY_LEVEL( 2, unsigned char);
-WX_TYPE_HIERARCHY_LEVEL( 3, short);
-WX_TYPE_HIERARCHY_LEVEL( 4, unsigned short);
-WX_TYPE_HIERARCHY_LEVEL( 5, int);
-WX_TYPE_HIERARCHY_LEVEL( 6, unsigned int);
-WX_TYPE_HIERARCHY_LEVEL( 7, long);
-WX_TYPE_HIERARCHY_LEVEL( 8, unsigned long);
-#ifdef wxLongLong_t
-WX_TYPE_HIERARCHY_LEVEL( 9, wxLongLong_t);
-WX_TYPE_HIERARCHY_LEVEL(10, wxULongLong_t);
-#endif
-WX_TYPE_HIERARCHY_LEVEL(11, float);
-WX_TYPE_HIERARCHY_LEVEL(12, double);
-WX_TYPE_HIERARCHY_LEVEL(13, long double);
-
-#if wxWCHAR_T_IS_REAL_TYPE
-    #if SIZEOF_WCHAR_T == SIZEOF_SHORT
-      template<> struct TypeHierarchy<wchar_t> : public TypeHierarchy<short> {};
-    #elif SIZEOF_WCHAR_T == SIZEOF_INT
-      template<> struct TypeHierarchy<wchar_t> : public TypeHierarchy<int> {};
-    #elif SIZEOF_WCHAR_T == SIZEOF_LONG
-      template<> struct TypeHierarchy<wchar_t> : public TypeHierarchy<long> {};
-    #else
-      #error "weird wchar_t size, please update this code"
-    #endif
-#endif
-
-#undef WX_TYPE_HIERARCHY_LEVEL
-
-} // namespace wxPrivate
-
-// Helper to determine resulting type of implicit conversion in
-// an expression with two arithmetic types.
-template<typename T1, typename T2>
-struct wxImplicitConversionType
-{
-    typedef typename wxIf
-            <
-                // if T2 is "higher" type, convert to it
-                (int)(wxPrivate::TypeHierarchy<T1>::level) < (int)(wxPrivate::TypeHierarchy<T2>::level),
-                T2,
-                // otherwise use T1
-                T1
-            >::value
-            value;
-};
-
-
-template<typename T1, typename T2, typename T3>
-struct wxImplicitConversionType3 : public wxImplicitConversionType<
-                        T1,
-                        typename wxImplicitConversionType<T2,T3>::value>
-{
-};
-
-#endif // _WX_META_IMPLICITCONVERSION_H_
diff --git a/Source/3rd Party/wx/include/wx/meta/int2type.h b/Source/3rd Party/wx/include/wx/meta/int2type.h
deleted file mode 100644
index 1b1c25539..000000000
--- a/Source/3rd Party/wx/include/wx/meta/int2type.h	
+++ /dev/null
@@ -1,17 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/meta/int2type.h
-// Purpose:     Generate a unique type from a constant integer
-// Author:      Arne Steinarson
-// Created:     2008-01-10
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Arne Steinarson
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_META_INT2TYPE_H_
-#define _WX_META_INT2TYPE_H_
-
-template <int N>
-struct wxInt2Type { enum { value=N }; };
-
-#endif // _WX_META_INT2TYPE_H_
diff --git a/Source/3rd Party/wx/include/wx/meta/movable.h b/Source/3rd Party/wx/include/wx/meta/movable.h
deleted file mode 100644
index 24617008d..000000000
--- a/Source/3rd Party/wx/include/wx/meta/movable.h	
+++ /dev/null
@@ -1,45 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/meta/movable.h
-// Purpose:     Test if a type is movable using memmove() etc.
-// Author:      Vaclav Slavik
-// Created:     2008-01-21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_META_MOVABLE_H_
-#define _WX_META_MOVABLE_H_
-
-#include "wx/meta/pod.h"
-#include "wx/string.h" // for wxIsMovable<wxString> specialization
-
-// Helper to decide if an object of type T is "movable", i.e. if it can be
-// copied to another memory location using memmove() or realloc() C functions.
-// C++ only gurantees that POD types (including primitive types) are
-// movable.
-template<typename T>
-struct wxIsMovable
-{
-    wxDEFINE_TEMPLATE_BOOL_VALUE(wxIsPod<T>::value);
-};
-
-// Macro to add wxIsMovable<T> specialization for given type that marks it
-// as movable:
-#define WX_DECLARE_TYPE_MOVABLE(type)                       \
-    template<> struct wxIsMovable<type>                     \
-    {                                                       \
-        wxDEFINE_TEMPLATE_BOOL_VALUE(true);                 \
-    };
-
-// Our implementation of wxString is written in such way that it's safe to move
-// it around (unless position cache is used which unfortunately breaks this).
-// OTOH, we don't know anything about std::string.
-// (NB: we don't put this into string.h and choose to include wx/string.h from
-// here instead so that rarely-used wxIsMovable<T> code isn't included by
-// everything)
-#if !wxUSE_STD_STRING && !wxUSE_STRING_POS_CACHE
-WX_DECLARE_TYPE_MOVABLE(wxString)
-#endif
-
-#endif // _WX_META_MOVABLE_H_
diff --git a/Source/3rd Party/wx/include/wx/meta/pod.h b/Source/3rd Party/wx/include/wx/meta/pod.h
deleted file mode 100644
index 654517f9c..000000000
--- a/Source/3rd Party/wx/include/wx/meta/pod.h	
+++ /dev/null
@@ -1,88 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/meta/pod.h
-// Purpose:     Test if a type is POD
-// Author:      Vaclav Slavik, Jaakko Salli
-// Created:     2010-06-14
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_META_POD_H_
-#define _WX_META_POD_H_
-
-#include "wx/defs.h"
-
-//
-// TODO: Use TR1 is_pod<> implementation where available. VC9 SP1 has it
-//       in tr1 namespace, VC10 has it in std namespace. GCC 4.2 has it in
-//       <tr1/type_traits>, while GCC 4.3 and later have it in <type_traits>.
-//
-
-// This macro declares something called "value" inside a class declaration.
-//
-// It has to be used because VC6 doesn't handle initialization of the static
-// variables in the class declaration itself while BCC5.82 doesn't understand
-// enums (it compiles the template fine but can't use it later)
-#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
-    #define wxDEFINE_TEMPLATE_BOOL_VALUE(val) enum { value = val }
-#else
-    #define wxDEFINE_TEMPLATE_BOOL_VALUE(val) static const bool value = val
-#endif
-
-// Helper to decide if an object of type T is POD (Plain Old Data)
-template<typename T>
-struct wxIsPod
-{
-    wxDEFINE_TEMPLATE_BOOL_VALUE(false);
-};
-
-// Macro to add wxIsPod<T> specialization for given type that marks it
-// as Plain Old Data:
-#define WX_DECLARE_TYPE_POD(type)                           \
-    template<> struct wxIsPod<type>                         \
-    {                                                       \
-        wxDEFINE_TEMPLATE_BOOL_VALUE(true);                 \
-    };
-
-WX_DECLARE_TYPE_POD(bool)
-WX_DECLARE_TYPE_POD(unsigned char)
-WX_DECLARE_TYPE_POD(signed char)
-WX_DECLARE_TYPE_POD(unsigned int)
-WX_DECLARE_TYPE_POD(signed int)
-WX_DECLARE_TYPE_POD(unsigned short int)
-WX_DECLARE_TYPE_POD(signed short int)
-WX_DECLARE_TYPE_POD(signed long int)
-WX_DECLARE_TYPE_POD(unsigned long int)
-WX_DECLARE_TYPE_POD(float)
-WX_DECLARE_TYPE_POD(double)
-WX_DECLARE_TYPE_POD(long double)
-#if wxWCHAR_T_IS_REAL_TYPE
-WX_DECLARE_TYPE_POD(wchar_t)
-#endif
-#ifdef wxLongLong_t
-WX_DECLARE_TYPE_POD(wxLongLong_t)
-WX_DECLARE_TYPE_POD(wxULongLong_t)
-#endif
-
-// Visual C++ 6.0 can't compile partial template specializations and as this is
-// only an optimization, we can live with pointers not being recognized as
-// POD types under VC6
-#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)
-
-// pointers are Plain Old Data:
-template<typename T>
-struct wxIsPod<T*>
-{
-    static const bool value = true;
-};
-
-template<typename T>
-struct wxIsPod<const T*>
-{
-    static const bool value = true;
-};
-
-#endif // !VC++ < 7
-
-#endif // _WX_META_POD_H_
diff --git a/Source/3rd Party/wx/include/wx/metafile.h b/Source/3rd Party/wx/include/wx/metafile.h
index 11505cb0f..7d92ab0f3 100644
--- a/Source/3rd Party/wx/include/wx/metafile.h	
+++ b/Source/3rd Party/wx/include/wx/metafile.h	
@@ -4,7 +4,7 @@
 // Author:      wxWidgets team
 // Modified by:
 // Created:     13.01.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: metafile.h 39841 2006-06-26 14:37:34Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -25,7 +25,11 @@
 
 #if defined(__WXMSW__)
     #if wxUSE_ENH_METAFILE
-        #include "wx/msw/enhmeta.h"
+        #if defined(__WXPALMOS__)
+            #include "wx/palmos/enhmeta.h"
+        #else
+            #include "wx/msw/enhmeta.h"
+        #endif
 
         #if wxUSE_WIN_METAFILES_ALWAYS
             // use normal metafiles as well
@@ -41,12 +45,16 @@
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS
     #else // !wxUSE_ENH_METAFILE
-        #include "wx/msw/metafile.h"
+        #if defined(__WXPALMOS__)
+            #include "wx/palmos/metafile.h"
+        #else
+            #include "wx/msw/metafile.h"
+        #endif
     #endif
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/metafile.h"
+    #include "wx/mac/metafile.h"
 #endif
 
 #endif // wxUSE_METAFILE
diff --git a/Source/3rd Party/wx/include/wx/mimetype.h b/Source/3rd Party/wx/include/wx/mimetype.h
index 921c53029..8baf854c1 100644
--- a/Source/3rd Party/wx/include/wx/mimetype.h	
+++ b/Source/3rd Party/wx/include/wx/mimetype.h	
@@ -5,7 +5,7 @@
 // Modified by:
 //  Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32
 // Created:     23.09.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: mimetype.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
@@ -26,8 +26,6 @@
 #include "wx/dynarray.h"
 #include "wx/arrstr.h"
 
-#include <stdarg.h>
-
 // fwd decls
 class WXDLLIMPEXP_FWD_BASE wxIconLocation;
 class WXDLLIMPEXP_FWD_BASE wxFileTypeImpl;
@@ -118,107 +116,16 @@ private:
 
 class WXDLLIMPEXP_BASE wxFileTypeInfo
 {
-private:
-    void DoVarArgInit(const wxString& mimeType,
-                      const wxString& openCmd,
-                      const wxString& printCmd,
-                      const wxString& desc,
-                      va_list argptr);
-
-    void VarArgInit(const wxString *mimeType,
-                    const wxString *openCmd,
-                    const wxString *printCmd,
-                    const wxString *desc,
-                    // the other parameters form a NULL terminated list of
-                    // extensions
-                    ...);
-
 public:
-    // NB: This is a helper to get implicit conversion of variadic ctor's
-    //     fixed arguments into something that can be passed to VarArgInit().
-    //     Do not use, it's used by the ctor only.
-    struct CtorString
-    {
-        CtorString(const char *str) : m_str(str) {}
-        CtorString(const wchar_t *str) : m_str(str) {}
-        CtorString(const wxString& str) : m_str(str) {}
-        CtorString(const wxCStrData& str) : m_str(str) {}
-        CtorString(const wxScopedCharBuffer& str) : m_str(str) {}
-        CtorString(const wxScopedWCharBuffer& str) : m_str(str) {}
-
-        operator const wxString*() const { return &m_str; }
-
-        wxString m_str;
-    };
-
     // ctors
-
-    // Ctor specifying just the MIME type (which is mandatory), the other
-    // fields can be set later if needed.
-    wxFileTypeInfo(const wxString& mimeType)
-        : m_mimeType(mimeType)
-    {
-    }
-
-    // Ctor allowing to specify the values of all fields at once:
-    //
-    // wxFileTypeInfo(const wxString& mimeType,
-    //               const wxString& openCmd,
-    //               const wxString& printCmd,
-    //               const wxString& desc,
-    //               // the other parameters form a list of extensions for this
-    //               // file type and should be terminated with wxNullPtr (not
-    //               // just NULL!)
-    //               ...);
-    WX_DEFINE_VARARG_FUNC_CTOR(wxFileTypeInfo,
-                               4, (const CtorString&,
-                                   const CtorString&,
-                                   const CtorString&,
-                                   const CtorString&),
-                               VarArgInit, VarArgInit)
-#ifdef __WATCOMC__
-    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-    WX_VARARG_WATCOM_WORKAROUND_CTOR(
-                                wxFileTypeInfo,
-                                4, (const wxString&,
-                                    const wxString&,
-                                    const wxString&,
-                                    const wxString&),
-                                (CtorString(f1),
-                                 CtorString(f2),
-                                 CtorString(f3),
-                                 CtorString(f4)));
-    WX_VARARG_WATCOM_WORKAROUND_CTOR(
-                                wxFileTypeInfo,
-                                4, (const wxCStrData&,
-                                    const wxCStrData&,
-                                    const wxCStrData&,
-                                    const wxCStrData&),
-                                (CtorString(f1),
-                                 CtorString(f2),
-                                 CtorString(f3),
-                                 CtorString(f4)));
-    WX_VARARG_WATCOM_WORKAROUND_CTOR(
-                                wxFileTypeInfo,
-                                4, (const char*,
-                                    const char*,
-                                    const char*,
-                                    const char*),
-                                (CtorString(f1),
-                                 CtorString(f2),
-                                 CtorString(f3),
-                                 CtorString(f4)));
-    WX_VARARG_WATCOM_WORKAROUND_CTOR(
-                                wxFileTypeInfo,
-                                4, (const wchar_t*,
-                                    const wchar_t*,
-                                    const wchar_t*,
-                                    const wchar_t*),
-                                (CtorString(f1),
-                                 CtorString(f2),
-                                 CtorString(f3),
-                                 CtorString(f4)));
-#endif
+        // a normal item
+    wxFileTypeInfo(const wxChar *mimeType,
+                   const wxChar *openCmd,
+                   const wxChar *printCmd,
+                   const wxChar *desc,
+                   // the other parameters form a NULL terminated list of
+                   // extensions
+                   ...);
 
         // the array elements correspond to the parameters of the ctor above in
         // the same order
@@ -232,16 +139,6 @@ public:
     bool IsValid() const { return !m_mimeType.empty(); }
 
     // setters
-        // set the open/print commands
-    void SetOpenCommand(const wxString& command) { m_openCmd = command; }
-    void SetPrintCommand(const wxString& command) { m_printCmd = command; }
-
-        // set the description
-    void SetDescription(const wxString& desc) { m_desc = desc; }
-
-        // add another extension corresponding to this file type
-    void AddExtension(const wxString& ext) { m_exts.push_back(ext); }
-
         // set the icon info
     void SetIcon(const wxString& iconFile, int iconIndex = 0)
     {
@@ -389,7 +286,7 @@ public:
 
     // operations
         // expand a string in the format of GetOpenCommand (which may contain
-        // '%s' and '%t' format specifiers for the file name and mime type
+        // '%s' and '%t' format specificators for the file name and mime type
         // and %{param} constructions).
     static wxString ExpandCommand(const wxString& command,
                                   const MessageParameters& params);
@@ -428,7 +325,7 @@ public:
 
     static void Set( wxMimeTypesManagerFactory *factory );
     static wxMimeTypesManagerFactory *Get();
-
+    
 private:
     static wxMimeTypesManagerFactory *m_factory;
 };
@@ -479,13 +376,32 @@ public:
         // get file type from MIME type (in format <category>/<format>)
     wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
 
+    // other operations: return true if there were no errors or false if there
+    // were some unrecognized entries (the good entries are always read anyhow)
+    //
+    // FIXME: These ought to be private ??
+
+        // read in additional file (the standard ones are read automatically)
+        // in mailcap format (see mimetype.cpp for description)
+        //
+        // 'fallback' parameter may be set to true to avoid overriding the
+        // settings from other, previously parsed, files by this one: normally,
+        // the files read most recently would override the older files, but with
+        // fallback == true this won't happen
+
+    bool ReadMailcap(const wxString& filename, bool fallback = false);
+        // read in additional file in mime.types format
+    bool ReadMimeTypes(const wxString& filename);
+
     // enumerate all known MIME types
     //
     // returns the number of retrieved file types
     size_t EnumAllFileTypes(wxArrayString& mimetypes);
 
     // these functions can be used to provide default values for some of the
-    // MIME types inside the program itself
+    // MIME types inside the program itself (you may also use
+    // ReadMailcap(filenameWithDefaultTypes, true /* use as fallback */) to
+    // achieve the same goal, but this requires having this info in a file).
     //
     // The filetypes array should be terminated by either NULL entry or an
     // invalid wxFileTypeInfo (i.e. the one created with default ctor)
diff --git a/Source/3rd Party/wx/include/wx/minifram.h b/Source/3rd Party/wx/include/wx/minifram.h
index 3d0187b47..50df6006a 100644
--- a/Source/3rd Party/wx/include/wx/minifram.h	
+++ b/Source/3rd Party/wx/include/wx/minifram.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: minifram.h 49299 2007-10-21 18:07:29Z PC $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,7 +16,9 @@
 
 #if wxUSE_MINIFRAME
 
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+#include "wx/palmos/minifram.h"
+#elif defined(__WXMSW__)
 #include "wx/msw/minifram.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/minifram.h"
@@ -27,7 +29,7 @@
 #elif defined(__WXX11__)
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
-#include "wx/osx/minifram.h"
+#include "wx/mac/minifram.h"
 #elif defined(__WXPM__)
 #include "wx/os2/minifram.h"
 #else
diff --git a/Source/3rd Party/wx/include/wx/module.h b/Source/3rd Party/wx/include/wx/module.h
index c1190c74c..7cee6f226 100644
--- a/Source/3rd Party/wx/include/wx/module.h	
+++ b/Source/3rd Party/wx/include/wx/module.h	
@@ -4,7 +4,7 @@
 // Author:      Wolfram Gloger/adapted by Guilhem Lavaux
 // Modified by:
 // Created:     04/11/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: module.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Wolfram Gloger and Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,7 +14,6 @@
 
 #include "wx/object.h"
 #include "wx/list.h"
-#include "wx/arrstr.h"
 #include "wx/dynarray.h"
 
 // declare a linked list of modules
@@ -74,14 +73,6 @@ protected:
         m_dependencies.Add(dep);
     }
 
-    // same as the version above except it will look up wxClassInfo by name on
-    // its own
-    void AddDependency(const char *className)
-    {
-        m_namedDependencies.Add(className);
-    }
-
-
 private:
     // initialize module and Append it to initializedModules list recursively
     // calling itself to satisfy module dependencies if needed
@@ -93,19 +84,11 @@ private:
     // could be initialized) and also empty m_modules itself
     static void DoCleanUpModules(const wxModuleList& modules);
 
-    // resolve all named dependencies and add them to the normal m_dependencies
-    bool ResolveNamedDependencies();
 
-
-    // module dependencies: contains wxClassInfo pointers for all modules which
-    // must be initialized before this one
+    // module dependencies: contains
     wxArrayClassInfo m_dependencies;
 
-    // and the named dependencies: those will be resolved during run-time and
-    // added to m_dependencies
-    wxArrayString m_namedDependencies;
-
-    // used internally while initializing/cleaning up modules
+    // used internally while initiliazing/cleaning up modules
     enum
     {
         State_Registered,   // module registered but not initialized yet
diff --git a/Source/3rd Party/wx/include/wx/mousemanager.h b/Source/3rd Party/wx/include/wx/mousemanager.h
deleted file mode 100644
index b17da8820..000000000
--- a/Source/3rd Party/wx/include/wx/mousemanager.h	
+++ /dev/null
@@ -1,154 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mousemanager.h
-// Purpose:     wxMouseEventsManager class declaration
-// Author:      Vadim Zeitlin
-// Created:     2009-04-20
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOUSEMANAGER_H_
-#define _WX_MOUSEMANAGER_H_
-
-#include "wx/event.h"
-
-// ----------------------------------------------------------------------------
-// wxMouseEventsManager
-// ----------------------------------------------------------------------------
-
-/*
-    This class handles mouse events and synthesizes high-level notifications
-    such as clicks and drag events from low level mouse button presses and
-    mouse movement events. It is useful because handling the mouse events is
-    less obvious than might seem at a first glance: for example, clicks on an
-    object should only be generated if the mouse was both pressed and released
-    over it and not just released (so it requires storing the previous state)
-    and dragging shouldn't start before the mouse moves away far enough.
-
-    This class encapsulates all these dull details for controls containing
-    multiple items which can be identified by a positive integer index and you
-    just need to implement its pure virtual functions to use it.
- */
-class WXDLLIMPEXP_CORE wxMouseEventsManager : public wxEvtHandler
-{
-public:
-    // a mouse event manager is always associated with a window and must be
-    // deleted by the window when it is destroyed so if it is created using the
-    // default ctor Create() must be called later
-    wxMouseEventsManager() { Init(); }
-    wxMouseEventsManager(wxWindow *win) { Init(); Create(win); }
-    bool Create(wxWindow *win);
-
-    virtual ~wxMouseEventsManager();
-
-protected:
-    // called to find the item at the given position: return wxNOT_FOUND (-1)
-    // if there is no item here
-    virtual int MouseHitTest(const wxPoint& pos) = 0;
-
-    // called when the user clicked (i.e. pressed and released mouse over the
-    // same item), should normally generate a notification about this click and
-    // return true if it was handled or false otherwise, determining whether
-    // the original mouse event is skipped or not
-    virtual bool MouseClicked(int item) = 0;
-
-    // called to start dragging the given item, should generate the appropriate
-    // BEGIN_DRAG event and return false if dragging this item was forbidden
-    virtual bool MouseDragBegin(int item, const wxPoint& pos) = 0;
-
-    // called while the item is being dragged, should normally update the
-    // feedback on screen (usually using wxOverlay)
-    virtual void MouseDragging(int item, const wxPoint& pos) = 0;
-
-    // called when the mouse is released after dragging the item
-    virtual void MouseDragEnd(int item, const wxPoint& pos) = 0;
-
-    // called when mouse capture is lost while dragging the item, should remove
-    // the visual feedback drawn by MouseDragging()
-    virtual void MouseDragCancelled(int item) = 0;
-
-
-    // you don't need to override those but you will want to do if it your
-    // control renders pressed items differently
-
-    // called when the item is becomes pressed, can be used to change its
-    // appearance
-    virtual void MouseClickBegin(int WXUNUSED(item)) { }
-
-    // called if the mouse capture was lost while the item was pressed, can be
-    // used to restore the default item appearance if it was changed in
-    // MouseClickBegin()
-    virtual void MouseClickCancelled(int WXUNUSED(item)) { }
-
-private:
-    /*
-        Here is a small diagram explaining the switches between different
-        states:
-
-
-                /---------->NORMAL<--------------- Drag end
-               /     /   /    |                      event
-              /     /    |    |                        ^
-             /     /     |    |                        |
-           Click  /    N |    | mouse                  | mouse up
-           event /       |    | down                   |
-             |  /        |    |                     DRAGGING
-             | /         |    |                        ^
-            Y|/ N        \    v                        |Y
-      +-------------+     +--------+           N +-----------+
-      |On same item?|     |On item?|  -----------|Begin drag?|
-      +-------------+     +--------+ /           +-----------+
-             ^                |     /                  ^
-             |                |    /                   |
-              \      mouse    |   /   mouse moved      |
-                \     up      v  v     far enough     /
-                  \--------PRESSED-------------------/
-
-
-        There are also transitions from PRESSED and DRAGGING to NORMAL in case
-        the mouse capture is lost or Escape key is pressed which are not shown.
-     */
-    enum State
-    {
-        State_Normal,   // initial, default state
-        State_Pressed,  // mouse was pressed over an item
-        State_Dragging  // the item is being dragged
-    };
-
-    // common part of both ctors
-    void Init();
-
-    // various event handlers
-    void OnCaptureLost(wxMouseCaptureLostEvent& event);
-    void OnLeftDown(wxMouseEvent& event);
-    void OnLeftUp(wxMouseEvent& event);
-    void OnMove(wxMouseEvent& event);
-
-
-    // the associated window, never NULL except between the calls to the
-    // default ctor and Create()
-    wxWindow *m_win;
-
-    // the current state
-    State m_state;
-
-    // the details of the operation currently in progress, only valid if
-    // m_state is not normal
-
-    // the item being pressed or dragged (always valid, i.e. != wxNOT_FOUND if
-    // m_state != State_Normal)
-    int m_item;
-
-    // the position of the last mouse event of interest: either mouse press in
-    // State_Pressed or last movement event in State_Dragging
-    wxPoint m_posLast;
-
-
-    DECLARE_EVENT_TABLE()
-
-    wxDECLARE_NO_COPY_CLASS(wxMouseEventsManager);
-};
-
-#endif // _WX_MOUSEMANAGER_H_
-
diff --git a/Source/3rd Party/wx/include/wx/mousestate.h b/Source/3rd Party/wx/include/wx/mousestate.h
deleted file mode 100644
index 10b1f9320..000000000
--- a/Source/3rd Party/wx/include/wx/mousestate.h	
+++ /dev/null
@@ -1,152 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mousestate.h
-// Purpose:     Declaration of wxMouseState class
-// Author:      Vadim Zeitlin
-// Created:     2008-09-19 (extracted from wx/utils.h)
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOUSESTATE_H_
-#define _WX_MOUSESTATE_H_
-
-#include "wx/gdicmn.h"      // for wxPoint
-#include "wx/kbdstate.h"
-
-// the symbolic names for the mouse buttons
-enum wxMouseButton
-{
-    wxMOUSE_BTN_ANY     = -1,
-    wxMOUSE_BTN_NONE    = 0,
-    wxMOUSE_BTN_LEFT    = 1,
-    wxMOUSE_BTN_MIDDLE  = 2,
-    wxMOUSE_BTN_RIGHT   = 3,
-    wxMOUSE_BTN_AUX1    = 4,
-    wxMOUSE_BTN_AUX2    = 5,
-    wxMOUSE_BTN_MAX
-};
-
-// ----------------------------------------------------------------------------
-// wxMouseState contains the information about mouse position, buttons and also
-// key modifiers
-// ----------------------------------------------------------------------------
-
-// wxMouseState is used to hold information about button and modifier state
-// and is what is returned from wxGetMouseState.
-class WXDLLIMPEXP_CORE wxMouseState : public wxKeyboardState
-{
-public:
-    wxMouseState()
-        : m_leftDown(false), m_middleDown(false), m_rightDown(false),
-          m_aux1Down(false), m_aux2Down(false),
-          m_x(0), m_y(0)
-    {
-    }
-
-    // default copy ctor, assignment operator and dtor are ok
-
-
-    // accessors for the mouse position
-    wxCoord GetX() const { return m_x; }
-    wxCoord GetY() const { return m_y; }
-    wxPoint GetPosition() const { return wxPoint(m_x, m_y); }
-    void GetPosition(wxCoord *x, wxCoord *y) const
-    {
-        if ( x )
-            *x = m_x;
-        if ( y )
-            *y = m_y;
-    }
-
-    // this overload is for compatibility only
-    void GetPosition(long *x, long *y) const
-    {
-        if ( x )
-            *x = m_x;
-        if ( y )
-            *y = m_y;
-    }
-
-    // accessors for the pressed buttons
-    bool LeftIsDown()    const { return m_leftDown; }
-    bool MiddleIsDown()  const { return m_middleDown; }
-    bool RightIsDown()   const { return m_rightDown; }
-    bool Aux1IsDown()    const { return m_aux1Down; }
-    bool Aux2IsDown()    const { return m_aux2Down; }
-
-    bool ButtonIsDown(wxMouseButton but) const
-    {
-        switch ( but )
-        {
-            case wxMOUSE_BTN_ANY:
-                return LeftIsDown() || MiddleIsDown() || RightIsDown() ||
-                            Aux1IsDown() || Aux2IsDown();
-
-            case wxMOUSE_BTN_LEFT:
-                return LeftIsDown();
-
-            case wxMOUSE_BTN_MIDDLE:
-                return MiddleIsDown();
-
-            case wxMOUSE_BTN_RIGHT:
-                return RightIsDown();
-
-            case wxMOUSE_BTN_AUX1:
-                return Aux1IsDown();
-
-            case wxMOUSE_BTN_AUX2:
-                return Aux2IsDown();
-
-            case wxMOUSE_BTN_NONE:
-            case wxMOUSE_BTN_MAX:
-                wxFAIL_MSG(wxS("invalid parameter"));
-                return false;
-
-            default:
-                wxFAIL_MSG(wxS("unknown parameter"));
-                return false;
-        }
-    }
-
-
-    // these functions are mostly used by wxWidgets itself
-    void SetX(wxCoord x) { m_x = x; }
-    void SetY(wxCoord y) { m_y = y; }
-    void SetPosition(wxPoint pos) { m_x = pos.x, m_y = pos.y; }
-
-    void SetLeftDown(bool down)   { m_leftDown = down; }
-    void SetMiddleDown(bool down) { m_middleDown = down; }
-    void SetRightDown(bool down)  { m_rightDown = down; }
-    void SetAux1Down(bool down)   { m_aux1Down = down; }
-    void SetAux2Down(bool down)   { m_aux2Down = down; }
-
-    // this mostly makes sense in the derived classes such as wxMouseEvent
-    void SetState(const wxMouseState& state) { *this = state; }
-
-    // these functions are for compatibility only, they were used in 2.8
-    // version of wxMouseState but their names are confusing as wxMouseEvent
-    // has methods with the same names which do something quite different so
-    // don't use them any more
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE(bool LeftDown() const, return LeftIsDown(); )
-    wxDEPRECATED_INLINE(bool MiddleDown() const, return MiddleIsDown(); )
-    wxDEPRECATED_INLINE(bool RightDown() const, return RightIsDown(); )
-#endif // WXWIN_COMPATIBILITY_2_8
-
-    // for compatibility reasons these variables are public as the code using
-    // wxMouseEvent often uses them directly -- however they should not be
-    // accessed directly in this class, use the accessors above instead
-// private:
-    bool m_leftDown   : 1;
-    bool m_middleDown : 1;
-    bool m_rightDown  : 1;
-    bool m_aux1Down   : 1;
-    bool m_aux2Down   : 1;
-
-    wxCoord m_x,
-            m_y;
-};
-
-#endif // _WX_MOUSESTATE_H_
-
diff --git a/Source/3rd Party/wx/include/wx/msgdlg.h b/Source/3rd Party/wx/include/wx/msgdlg.h
index db1932f94..dabea34f9 100644
--- a/Source/3rd Party/wx/include/wx/msgdlg.h	
+++ b/Source/3rd Party/wx/include/wx/msgdlg.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msgdlg.h
+// Name:        wx/msgdlgg.h
 // Purpose:     common header and base class for wxMessageDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: msgdlg.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,297 +16,58 @@
 
 #if wxUSE_MSGDLG
 
-#include "wx/dialog.h"
-#include "wx/stockitem.h"
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxMessageBoxCaptionStr[];
-
-// ----------------------------------------------------------------------------
-// wxMessageDialogBase: base class defining wxMessageDialog interface
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMessageDialogBase : public wxDialog
+class WXDLLEXPORT wxMessageDialogBase
 {
-public:
-    // helper class for SetXXXLabels() methods: it makes it possible to pass
-    // either a stock id (wxID_CLOSE) or a string ("&Close") to them
-    class ButtonLabel
-    {
-    public:
-        // ctors are not explicit, objects of this class can be implicitly
-        // constructed from either stock ids or strings
-        ButtonLabel(int stockId)
-            : m_stockId(stockId)
-        {
-            wxASSERT_MSG( wxIsStockID(stockId), "invalid stock id" );
-        }
-
-        ButtonLabel(const wxString& label)
-            : m_label(label), m_stockId(wxID_NONE)
-        {
-        }
-
-        ButtonLabel(const char *label)
-            : m_label(label), m_stockId(wxID_NONE)
-        {
-        }
-
-        ButtonLabel(const wchar_t *label)
-            : m_label(label), m_stockId(wxID_NONE)
-        {
-        }
-
-        ButtonLabel(const wxCStrData& label)
-            : m_label(label), m_stockId(wxID_NONE)
-        {
-        }
-
-        // default copy ctor and dtor are ok
-
-        // get the string label, whether it was originally specified directly
-        // or as a stock id -- this is only useful for platforms without native
-        // stock items id support
-        wxString GetAsString() const
-        {
-            return m_stockId == wxID_NONE
-                    ? m_label
-                    : wxGetStockLabel(m_stockId, wxSTOCK_FOR_BUTTON);
-        }
-
-        // return the stock id or wxID_NONE if this is not a stock label
-        int GetStockId() const { return m_stockId; }
-
-    private:
-        // the label if explicitly given or empty if this is a stock item
-        const wxString m_label;
-
-        // the stock item id or wxID_NONE if m_label should be used
-        const int m_stockId;
-    };
-
-    // ctors
-    wxMessageDialogBase() { m_dialogStyle = 0; }
-    wxMessageDialogBase(wxWindow *parent,
-                        const wxString& message,
-                        const wxString& caption,
-                        long style)
-        : m_message(message),
-          m_caption(caption)
-    {
-        m_parent = parent;
-        SetMessageDialogStyle(style);
-    }
-
-    // virtual dtor for the base class
-    virtual ~wxMessageDialogBase() { }
-
-    wxString GetCaption() const { return m_caption; }
-
-    virtual void SetMessage(const wxString& message)
-    {
-        m_message = message;
-    }
-
-    wxString GetMessage() const { return m_message; }
-
-    void SetExtendedMessage(const wxString& extendedMessage)
-    {
-        m_extendedMessage = extendedMessage;
-    }
-
-    wxString GetExtendedMessage() const { return m_extendedMessage; }
-
-    // change the dialog style flag
+protected:
+    // common validation of wxMessageDialog style
     void SetMessageDialogStyle(long style)
     {
-        wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || !(style & wxYES_NO),
-                      "wxYES and wxNO may only be used together" );
-
-        wxASSERT_MSG( !(style & wxYES) || !(style & wxOK),
-                      "wxOK and wxYES/wxNO can't be used together" );
-
-        wxASSERT_MSG( (style & wxYES) || (style & wxOK),
-                      "one of wxOK and wxYES/wxNO must be used" );
+        wxASSERT_MSG( ((style & wxYES_NO) == wxYES_NO) || ((style & wxYES_NO) == 0),
+                      wxT("wxYES and wxNO may only be used together in wxMessageDialog") );
 
         wxASSERT_MSG( (style & wxID_OK) != wxID_OK,
-                      "wxMessageBox: Did you mean wxOK (and not wxID_OK)?" );
-
-        wxASSERT_MSG( !(style & wxNO_DEFAULT) || (style & wxNO),
-                      "wxNO_DEFAULT is invalid without wxNO" );
-
-        wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || (style & wxCANCEL),
-                      "wxCANCEL_DEFAULT is invalid without wxCANCEL" );
-
-        wxASSERT_MSG( !(style & wxCANCEL_DEFAULT) || !(style & wxNO_DEFAULT),
-                      "only one default button can be specified" );
+                      wxT("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") );
 
         m_dialogStyle = style;
     }
-
-    long GetMessageDialogStyle() const { return m_dialogStyle; }
-
-    // customization of the message box buttons
-    virtual bool SetYesNoLabels(const ButtonLabel& yes,const ButtonLabel& no)
+    inline long GetMessageDialogStyle() const
     {
-        DoSetCustomLabel(m_yes, yes);
-        DoSetCustomLabel(m_no, no);
-        return true;
+        return m_dialogStyle;
     }
 
-    virtual bool SetYesNoCancelLabels(const ButtonLabel& yes,
-                                      const ButtonLabel& no,
-                                      const ButtonLabel& cancel)
-    {
-        DoSetCustomLabel(m_yes, yes);
-        DoSetCustomLabel(m_no, no);
-        DoSetCustomLabel(m_cancel, cancel);
-        return true;
-    }
-
-    virtual bool SetOKLabel(const ButtonLabel& ok)
-    {
-        DoSetCustomLabel(m_ok, ok);
-        return true;
-    }
-
-    virtual bool SetOKCancelLabels(const ButtonLabel& ok,
-                                   const ButtonLabel& cancel)
-    {
-        DoSetCustomLabel(m_ok, ok);
-        DoSetCustomLabel(m_cancel, cancel);
-        return true;
-    }
-
-    virtual bool SetHelpLabel(const ButtonLabel& help)
-    {
-        DoSetCustomLabel(m_help, help);
-        return true;
-    }
-
-    // test if any custom labels were set
-    bool HasCustomLabels() const
-    {
-        return !(m_ok.empty() && m_cancel.empty() && m_help.empty() &&
-                 m_yes.empty() && m_no.empty());
-    }
-
-    // these functions return the label to be used for the button which is
-    // either a custom label explicitly set by the user or the default label,
-    // i.e. they always return a valid string
-    wxString GetYesLabel() const
-        { return m_yes.empty() ? GetDefaultYesLabel() : m_yes; }
-    wxString GetNoLabel() const
-        { return m_no.empty() ? GetDefaultNoLabel() : m_no; }
-    wxString GetOKLabel() const
-        { return m_ok.empty() ? GetDefaultOKLabel() : m_ok; }
-    wxString GetCancelLabel() const
-        { return m_cancel.empty() ? GetDefaultCancelLabel() : m_cancel; }
-    wxString GetHelpLabel() const
-        { return m_help.empty() ? GetDefaultHelpLabel() : m_help; }
-
-    // based on message dialog style, returns exactly one of: wxICON_NONE,
-    // wxICON_ERROR, wxICON_WARNING, wxICON_QUESTION, wxICON_INFORMATION
-    long GetEffectiveIcon() const
-    {
-        if ( m_dialogStyle & wxICON_NONE )
-            return wxICON_NONE;
-        else if ( m_dialogStyle & wxICON_ERROR )
-            return wxICON_ERROR;
-        else if ( m_dialogStyle & wxICON_WARNING )
-            return wxICON_WARNING;
-        else if ( m_dialogStyle & wxICON_QUESTION )
-            return wxICON_QUESTION;
-        else if ( m_dialogStyle & wxICON_INFORMATION )
-            return wxICON_INFORMATION;
-        else if ( m_dialogStyle & wxYES )
-            return wxICON_QUESTION;
-        else
-            return wxICON_INFORMATION;
-    }
-
-protected:
-    // for the platforms not supporting separate main and extended messages
-    // this function should be used to combine both of them in a single string
-    wxString GetFullMessage() const
-    {
-        wxString msg = m_message;
-        if ( !m_extendedMessage.empty() )
-            msg << "\n\n" << m_extendedMessage;
-
-        return msg;
-    }
-
-    wxString m_message,
-             m_extendedMessage,
-             m_caption;
-    long m_dialogStyle;
-
-    // this function is called by our public SetXXXLabels() and should assign
-    // the value to var with possibly some transformation (e.g. Cocoa version
-    // currently uses this to remove any accelerators from the button strings
-    // while GTK+ one handles stock items specifically here)
-    virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label)
-    {
-        var = label.GetAsString();
-    }
-
-    // these functions return the custom label or empty string and should be
-    // used only in specific circumstances such as creating the buttons with
-    // these labels (in which case it makes sense to only use a custom label if
-    // it was really given and fall back on stock label otherwise), use the
-    // Get{Yes,No,OK,Cancel}Label() methods above otherwise
-    const wxString& GetCustomYesLabel() const { return m_yes; }
-    const wxString& GetCustomNoLabel() const { return m_no; }
-    const wxString& GetCustomOKLabel() const { return m_ok; }
-    const wxString& GetCustomHelpLabel() const { return m_help; }
-    const wxString& GetCustomCancelLabel() const { return m_cancel; }
-
 private:
-    // these functions may be overridden to provide different defaults for the
-    // default button labels (this is used by wxGTK)
-    virtual wxString GetDefaultYesLabel() const { return wxGetTranslation("Yes"); }
-    virtual wxString GetDefaultNoLabel() const { return wxGetTranslation("No"); }
-    virtual wxString GetDefaultOKLabel() const { return wxGetTranslation("OK"); }
-    virtual wxString GetDefaultCancelLabel() const { return wxGetTranslation("Cancel"); }
-    virtual wxString GetDefaultHelpLabel() const { return wxGetTranslation("Help"); }
-
-    // labels for the buttons, initially empty meaning that the defaults should
-    // be used, use GetYes/No/OK/CancelLabel() to access them
-    wxString m_yes,
-             m_no,
-             m_ok,
-             m_cancel,
-             m_help;
-
-    wxDECLARE_NO_COPY_CLASS(wxMessageDialogBase);
+    long m_dialogStyle;
 };
 
+#if defined(__WX_COMPILING_MSGDLGG_CPP__)
 #include "wx/generic/msgdlgg.h"
-
-#if defined(__WX_COMPILING_MSGDLGG_CPP__) || \
-    defined(__WXUNIVERSAL__) || defined(__WXGPE__) || \
-    (defined(__WXGTK__) && !defined(__WXGTK20__))
-
-    #define wxMessageDialog wxGenericMessageDialog
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/msgdlg.h"
+#elif defined(__WXUNIVERSAL__) || defined(__WXGPE__)
+#include "wx/generic/msgdlgg.h"
+#elif defined(__WXPALMOS__)
+#include "wx/palmos/msgdlg.h"
 #elif defined(__WXMSW__)
-    #include "wx/msw/msgdlg.h"
+#include "wx/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)
-    #include "wx/motif/msgdlg.h"
+#include "wx/motif/msgdlg.h"
 #elif defined(__WXGTK20__)
-    #include "wx/gtk/msgdlg.h"
+#include "wx/gtk/msgdlg.h"
+#elif defined(__WXGTK__)
+#include "wx/generic/msgdlgg.h"
+#elif defined(__WXGTK__)
+#include "wx/generic/msgdlgg.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/msgdlg.h"
+#include "wx/mac/msgdlg.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/msgdlg.h"
 #elif defined(__WXPM__)
-    #include "wx/os2/msgdlg.h"
+#include "wx/os2/msgdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------
 // wxMessageBox: the simplest way to use wxMessageDialog
 // ----------------------------------------------------------------------------
 
-int WXDLLIMPEXP_CORE wxMessageBox(const wxString& message,
+int WXDLLEXPORT wxMessageBox(const wxString& message,
                              const wxString& caption = wxMessageBoxCaptionStr,
                              long style = wxOK | wxCENTRE,
                              wxWindow *parent = NULL,
@@ -314,4 +75,5 @@ int WXDLLIMPEXP_CORE wxMessageBox(const wxString& message,
 
 #endif // wxUSE_MSGDLG
 
-#endif // _WX_MSGDLG_H_BASE_
+#endif
+    // _WX_MSGDLG_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/msgout.h b/Source/3rd Party/wx/include/wx/msgout.h
index c5e011aa6..63803bfa3 100644
--- a/Source/3rd Party/wx/include/wx/msgout.h	
+++ b/Source/3rd Party/wx/include/wx/msgout.h	
@@ -4,7 +4,7 @@
 // Author:      Mattia Barbon
 // Modified by:
 // Created:     17.07.02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: msgout.h 35690 2005-09-25 20:23:30Z VZ $
 // Copyright:   (c) Mattia Barbon
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,67 +17,21 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
-#include "wx/chartype.h"
-#include "wx/strvararg.h"
+#include "wx/wxchar.h"
 
 // ----------------------------------------------------------------------------
 // wxMessageOutput is a class abstracting formatted output target, i.e.
 // something you can printf() to
 // ----------------------------------------------------------------------------
 
-// NB: VC6 has a bug that causes linker errors if you have template methods
-//     in a class using __declspec(dllimport). The solution is to split such
-//     class into two classes, one that contains the template methods and does
-//     *not* use WXDLLIMPEXP_BASE and another class that contains the rest
-//     (with DLL linkage).
-class wxMessageOutputBase
-{
-public:
-    virtual ~wxMessageOutputBase() { }
-
-    // show a message to the user
-    // void Printf(const wxString& format, ...) = 0;
-    WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxFormatString&),
-                               DoPrintfWchar, DoPrintfUtf8)
-#ifdef __WATCOMC__
-    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-    WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wxString&),
-                                (wxFormatString(f1)));
-    WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wxCStrData&),
-                                (wxFormatString(f1)));
-    WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const char*),
-                                (wxFormatString(f1)));
-    WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wchar_t*),
-                                (wxFormatString(f1)));
-#endif
-
-    // called by DoPrintf() to output formatted string but can also be called
-    // directly if no formatting is needed
-    virtual void Output(const wxString& str) = 0;
-
-protected:
-    // NB: this is pure virtual so that it can be implemented in dllexported
-    //     wxMessagOutput class
-#if !wxUSE_UTF8_LOCALE_ONLY
-    virtual void DoPrintfWchar(const wxChar *format, ...) = 0;
-#endif
-#if wxUSE_UNICODE_UTF8
-    virtual void DoPrintfUtf8(const char *format, ...) = 0;
-#endif
-};
-
-#ifdef __VISUALC__
-    // "non dll-interface class 'wxStringPrintfMixin' used as base interface
-    // for dll-interface class 'wxString'" -- this is OK in our case
-    #pragma warning (push)
-    #pragma warning (disable:4275)
-#endif
-
-class WXDLLIMPEXP_BASE wxMessageOutput : public wxMessageOutputBase
+class WXDLLIMPEXP_BASE wxMessageOutput
 {
 public:
     virtual ~wxMessageOutput() { }
 
+    // show a message to the user
+    virtual void Printf(const wxChar* format, ...)  ATTRIBUTE_PRINTF_2 = 0;
+
     // gets the current wxMessageOutput object (may be NULL during
     // initialization or shutdown)
     static wxMessageOutput* Get();
@@ -85,90 +39,62 @@ public:
     // sets the global wxMessageOutput instance; returns the previous one
     static wxMessageOutput* Set(wxMessageOutput* msgout);
 
-protected:
-#if !wxUSE_UTF8_LOCALE_ONLY
-    virtual void DoPrintfWchar(const wxChar *format, ...);
-#endif
-#if wxUSE_UNICODE_UTF8
-    virtual void DoPrintfUtf8(const char *format, ...);
-#endif
-
 private:
     static wxMessageOutput* ms_msgOut;
 };
 
-#ifdef __VISUALC__
-    #pragma warning (pop)
-#endif
+// ----------------------------------------------------------------------------
+// implementation showing the message to the user in "best" possible way: uses
+// native message box if available (currently only under Windows) and stderr
+// otherwise; unlike wxMessageOutputMessageBox this class is always safe to use
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxMessageOutputBest : public wxMessageOutput
+{
+public:
+    wxMessageOutputBest() { }
+
+    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+};
 
 // ----------------------------------------------------------------------------
-// implementation which sends output to stderr or specified file
+// implementation which sends output to stderr
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput
 {
 public:
-    wxMessageOutputStderr(FILE *fp = stderr) : m_fp(fp) { }
+    wxMessageOutputStderr() { }
 
-    virtual void Output(const wxString& str);
-
-protected:
-    // return the string with "\n" appended if it doesn't already terminate
-    // with it (in which case it's returned unchanged)
-    wxString AppendLineFeedIfNeeded(const wxString& str);
-
-    FILE *m_fp;
-};
-
-// ----------------------------------------------------------------------------
-// implementation showing the message to the user in "best" possible way:
-// uses stderr or message box if available according to the flag given to ctor.
-// ----------------------------------------------------------------------------
-
-enum wxMessageOutputFlags
-{
-    wxMSGOUT_PREFER_STDERR = 0, // use stderr if available (this is the default)
-    wxMSGOUT_PREFER_MSGBOX = 1  // always use message box if available
-};
-
-class WXDLLIMPEXP_BASE wxMessageOutputBest : public wxMessageOutputStderr
-{
-public:
-    wxMessageOutputBest(wxMessageOutputFlags flags = wxMSGOUT_PREFER_STDERR)
-        : m_flags(flags) { }
-
-    virtual void Output(const wxString& str);
-
-private:
-    wxMessageOutputFlags m_flags;
+    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
 // ----------------------------------------------------------------------------
 // implementation which shows output in a message box
 // ----------------------------------------------------------------------------
 
-#if wxUSE_GUI && wxUSE_MSGDLG
+#if wxUSE_GUI
 
 class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput
 {
 public:
     wxMessageOutputMessageBox() { }
 
-    virtual void Output(const wxString& str);
+    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
-#endif // wxUSE_GUI && wxUSE_MSGDLG
+#endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // implementation using the native way of outputting debug messages
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutputStderr
+class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutput
 {
 public:
     wxMessageOutputDebug() { }
 
-    virtual void Output(const wxString& str);
+    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
 // ----------------------------------------------------------------------------
@@ -180,7 +106,8 @@ class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput
 public:
     wxMessageOutputLog() { }
 
-    virtual void Output(const wxString& str);
+    virtual void Printf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
 };
 
-#endif // _WX_MSGOUT_H_
+#endif
+    // _WX_MSGOUT_H_
diff --git a/Source/3rd Party/wx/include/wx/mstream.h b/Source/3rd Party/wx/include/wx/mstream.h
index a621f918f..a81452284 100644
--- a/Source/3rd Party/wx/include/wx/mstream.h	
+++ b/Source/3rd Party/wx/include/wx/mstream.h	
@@ -4,7 +4,7 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     11/07/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: mstream.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,23 +25,11 @@ class WXDLLIMPEXP_BASE wxMemoryInputStream : public wxInputStream
 public:
     wxMemoryInputStream(const void *data, size_t length);
     wxMemoryInputStream(const wxMemoryOutputStream& stream);
-    wxMemoryInputStream(wxInputStream& stream,
-                        wxFileOffset lenFile = wxInvalidOffset)
-    {
-        InitFromStream(stream, lenFile);
-    }
-    wxMemoryInputStream(wxMemoryInputStream& stream)
-        : wxInputStream()
-    {
-        InitFromStream(stream, wxInvalidOffset);
-    }
-
     virtual ~wxMemoryInputStream();
     virtual wxFileOffset GetLength() const { return m_length; }
     virtual bool IsSeekable() const { return true; }
 
-    virtual char Peek();
-    virtual bool CanRead() const;
+    char Peek();
 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 
@@ -58,14 +46,9 @@ protected:
     wxFileOffset OnSysTell() const;
 
 private:
-    // common part of ctors taking wxInputStream
-    void InitFromStream(wxInputStream& stream, wxFileOffset lenFile);
-
     size_t m_length;
 
-    // copy ctor is implemented above: it copies the other stream in this one
-    DECLARE_ABSTRACT_CLASS(wxMemoryInputStream)
-    wxDECLARE_NO_ASSIGN_CLASS(wxMemoryInputStream);
+    DECLARE_NO_COPY_CLASS(wxMemoryInputStream)
 };
 
 class WXDLLIMPEXP_BASE wxMemoryOutputStream : public wxOutputStream
@@ -94,8 +77,7 @@ protected:
     wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
     wxFileOffset OnSysTell() const;
 
-    DECLARE_DYNAMIC_CLASS(wxMemoryOutputStream)
-    wxDECLARE_NO_COPY_CLASS(wxMemoryOutputStream);
+    DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
 };
 
 #if WXWIN_COMPATIBILITY_2_6
diff --git a/Source/3rd Party/wx/include/wx/msw/accel.h b/Source/3rd Party/wx/include/wx/msw/accel.h
index 2efa206e6..705146894 100644
--- a/Source/3rd Party/wx/include/wx/msw/accel.h	
+++ b/Source/3rd Party/wx/include/wx/msw/accel.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     31/7/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: accel.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
 // the accel table has all accelerators for a given window or menu
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxAcceleratorTable : public wxObject
+class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     // default ctor
diff --git a/Source/3rd Party/wx/include/wx/msw/anybutton.h b/Source/3rd Party/wx/include/wx/msw/anybutton.h
deleted file mode 100644
index bea368f6f..000000000
--- a/Source/3rd Party/wx/include/wx/msw/anybutton.h	
+++ /dev/null
@@ -1,81 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/anybutton.h
-// Purpose:     wxAnyButton class
-// Author:      Julian Smart
-// Created:     1997-02-01 (extracted from button.h)
-// RCS-ID:      $Id: anybutton.h 67065 2011-02-27 12:48:26Z VZ $
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_ANYBUTTON_H_
-#define _WX_MSW_ANYBUTTON_H_
-
-// ----------------------------------------------------------------------------
-// Common button functionality
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
-{
-public:
-    wxAnyButton()
-    {
-        m_imageData = NULL;
-#if wxUSE_MARKUP
-        m_markupText = NULL;
-#endif // wxUSE_MARKUP
-    }
-
-    virtual ~wxAnyButton();
-
-    // overridden base class methods
-    virtual void SetLabel(const wxString& label);
-    virtual bool SetBackgroundColour(const wxColour &colour);
-    virtual bool SetForegroundColour(const wxColour &colour);
-
-    // implementation from now on
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-    virtual State GetNormalState() const { return State_Normal; }
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-protected:
-    // usually overridden base class virtuals
-    virtual wxSize DoGetBestSize() const;
-
-    virtual wxBitmap DoGetBitmap(State which) const;
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual wxSize DoGetBitmapMargins() const;
-    virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
-    virtual void DoSetBitmapPosition(wxDirection dir);
-
-#if wxUSE_MARKUP
-    virtual bool DoSetLabelMarkup(const wxString& markup);
-#endif // wxUSE_MARKUP
-
-    // Increases the passed in size to account for the button image.
-    //
-    // Should only be called if we do have a button, i.e. if m_imageData is
-    // non-NULL.
-    void AdjustForBitmapSize(wxSize& size) const;
-
-    class wxButtonImageData *m_imageData;
-
-#if wxUSE_MARKUP
-    class wxMarkupText *m_markupText;
-#endif // wxUSE_MARKUP
-
-    // Switches button into owner-drawn mode: this is used if we need to draw
-    // something not supported by the native control, such as using non default
-    // colours or a bitmap on pre-XP systems.
-    void MakeOwnerDrawn();
-    bool IsOwnerDrawn() const;
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxAnyButton);
-};
-
-#endif // _WX_MSW_ANYBUTTON_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/app.h b/Source/3rd Party/wx/include/wx/msw/app.h
index 468a08576..4989c9c7a 100644
--- a/Source/3rd Party/wx/include/wx/msw/app.h	
+++ b/Source/3rd Party/wx/include/wx/msw/app.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/app.h
+// Name:        app.h
 // Purpose:     wxApp class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: app.h 53157 2008-04-13 12:17:37Z VS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,8 +23,10 @@ class WXDLLIMPEXP_FWD_BASE wxLog;
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
-class WXDLLIMPEXP_CORE wxApp : public wxAppBase
+class WXDLLEXPORT wxApp : public wxAppBase
 {
+    DECLARE_DYNAMIC_CLASS(wxApp)
+
 public:
     wxApp();
     virtual ~wxApp();
@@ -33,6 +35,7 @@ public:
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
 
+    virtual bool Yield(bool onlyIfNeeded = false);
     virtual void WakeUpIdle();
 
     virtual void SetPrintMode(int mode) { m_printMode = mode; }
@@ -47,40 +50,20 @@ public:
     virtual bool OnExceptionInMainLoop();
 #endif // wxUSE_EXCEPTIONS
 
-    // MSW-specific from now on
-    // ------------------------
-
-    // this suffix should be appended to all our Win32 class names to obtain a
-    // variant registered without CS_[HV]REDRAW styles
-    static const wxChar *GetNoRedrawClassSuffix() { return wxT("NR"); }
-
-    // get the name of the registered Win32 class with the given (unique) base
-    // name: this function constructs the unique class name using this name as
-    // prefix, checks if the class is already registered and registers it if it
-    // isn't and returns the name it was registered under (or NULL if it failed)
-    //
-    // the registered class will always have CS_[HV]REDRAW and CS_DBLCLKS
-    // styles as well as any additional styles specified as arguments here; and
-    // there will be also a companion registered class identical to this one
-    // but without CS_[HV]REDRAW whose name will be the same one but with
-    // GetNoRedrawClassSuffix()
-    //
-    // the background brush argument must be either a COLOR_XXX standard value
-    // or (default) -1 meaning that the class paints its background itself
-    static const wxChar *GetRegisteredClassName(const wxChar *name,
-                                                int bgBrushCol = -1,
-                                                int extraStyles = 0);
-
-    // return true if this name corresponds to one of the classes we registered
-    // in the previous GetRegisteredClassName() calls
-    static bool IsRegisteredClassName(const wxString& name);
+    // deprecated functions, use wxEventLoop directly instead
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( void DoMessage(WXMSG *pMsg) );
+    wxDEPRECATED( bool DoMessage() );
+    wxDEPRECATED( bool ProcessMessage(WXMSG* pMsg) );
+#endif // WXWIN_COMPATIBILITY_2_4
 
 protected:
     int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 
 public:
-    // unregister any window classes registered by GetRegisteredClassName()
-    static void UnregisterWindowClasses();
+    // Implementation
+    static bool RegisterWindowClasses();
+    static bool UnregisterWindowClasses();
 
 #if wxUSE_RICHEDIT
     // initialize the richedit DLL of (at least) given version, return true if
@@ -92,39 +75,73 @@ public:
     // wasn't found at all
     static int GetComCtl32Version();
 
-    // the same for shell32.dll: returns 400, 471, 500, 600, ... (4.70 not
-    // currently detected)
-    static int GetShell32Version();
-
     // the SW_XXX value to be used for the frames opened by the application
     // (currently seems unused which is a bug -- TODO)
     static int m_nCmdShow;
 
 protected:
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxApp);
-    DECLARE_DYNAMIC_CLASS(wxApp)
+    DECLARE_NO_COPY_CLASS(wxApp)
 };
 
+// ----------------------------------------------------------------------------
+// MSW-specific wxEntry() overload and IMPLEMENT_WXWIN_MAIN definition
+// ----------------------------------------------------------------------------
+
+// we need HINSTANCE declaration to define WinMain()
+#include "wx/msw/wrapwin.h"
+
+#ifndef SW_SHOWNORMAL
+    #define SW_SHOWNORMAL 1
+#endif
+
+// WinMain() is always ANSI, even in Unicode build, under normal Windows
+// but is always Unicode under CE
 #ifdef __WXWINCE__
+    typedef wchar_t *wxCmdLineArgType;
+#else
+    typedef char *wxCmdLineArgType;
+#endif
 
-// under CE provide a dummy implementation of GetComCtl32Version() returning
-// the value passing all ">= 470" tests (which are the only ones used in our
-// code currently) as commctrl.dll under CE 2.0 and later support comctl32.dll
-// functionality
-inline int wxApp::GetComCtl32Version()
-{
-    return 471;
-}
+extern int WXDLLEXPORT
+wxEntry(HINSTANCE hInstance,
+        HINSTANCE hPrevInstance = NULL,
+        wxCmdLineArgType pCmdLine = NULL,
+        int nCmdShow = SW_SHOWNORMAL);
 
-// this is not currently used at all under CE so it's not really clear what do
-// we need to return from here
-inline int wxApp::GetShell32Version()
-{
-    return 0;
-}
+#if defined(__BORLANDC__) && wxUSE_UNICODE
+    // Borland C++ has the following nonstandard behaviour: when the -WU
+    // command line flag is used, the linker expects to find wWinMain instead
+    // of WinMain. This flag causes the compiler to define _UNICODE and
+    // UNICODE symbols and there's no way to detect its use, so we have to
+    // define both WinMain and wWinMain so that IMPLEMENT_WXWIN_MAIN works
+    // for both code compiled with and without -WU.
+    // See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863
+    // for more details.
+    #define IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD                        \
+        extern "C" int WINAPI wWinMain(HINSTANCE hInstance,                 \
+                                      HINSTANCE hPrevInstance,              \
+                                      wchar_t * WXUNUSED(lpCmdLine),        \
+                                      int nCmdShow)                         \
+        {                                                                   \
+            /* NB: wxEntry expects lpCmdLine argument to be char*, not */   \
+            /*     wchar_t*, but fortunately it's not used anywhere    */   \
+            /*     and we can simply pass NULL in:                     */   \
+            return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);       \
+        }
+#else
+    #define IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
+#endif // defined(__BORLANDC__) && wxUSE_UNICODE
 
-#endif // __WXWINCE__
+#define IMPLEMENT_WXWIN_MAIN \
+    extern "C" int WINAPI WinMain(HINSTANCE hInstance,                    \
+                                  HINSTANCE hPrevInstance,                \
+                                  wxCmdLineArgType lpCmdLine,             \
+                                  int nCmdShow)                           \
+    {                                                                     \
+        return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);    \
+    }                                                                     \
+    IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
 
 #endif // _WX_APP_H_
 
diff --git a/Source/3rd Party/wx/include/wx/msw/apptbase.h b/Source/3rd Party/wx/include/wx/msw/apptbase.h
index 174f6a494..efab1ed33 100644
--- a/Source/3rd Party/wx/include/wx/msw/apptbase.h	
+++ b/Source/3rd Party/wx/include/wx/msw/apptbase.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.06.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: apptbase.h 40599 2006-08-13 21:00:32Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,47 +26,20 @@ public:
     // some opaque data which will be passed later to AfterChildWaitLoop()
     virtual void *BeforeChildWaitLoop() = 0;
 
+    // process pending Windows messages, even in console app
+    virtual void AlwaysYield() = 0;
+
     // called after starting to wait for the child termination, the parameter
     // is the return value of BeforeChildWaitLoop()
     virtual void AfterChildWaitLoop(void *data) = 0;
 
 
-#if wxUSE_THREADS
     // wxThread helpers
     // ----------------
 
     // process a message while waiting for a(nother) thread, should return
     // false if and only if we have to exit the application
     virtual bool DoMessageFromThreadWait() = 0;
-
-    // wait for the handle to be signaled, return WAIT_OBJECT_0 if it is or, in
-    // the GUI code, WAIT_OBJECT_0 + 1 if a Windows message arrived
-    virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) = 0;
-#endif // wxUSE_THREADS
-
-
-#ifndef __WXWINCE__
-    // console helpers
-    // ---------------
-
-    // this method can be overridden by a derived class to always return true
-    // or false to force [not] using the console for output to stderr
-    //
-    // by default console applications always return true from here while the
-    // GUI ones only return true if they're being run from console and there is
-    // no other activity happening in this console
-    virtual bool CanUseStderr() = 0;
-
-    // write text to the console, return true if ok or false on error
-    virtual bool WriteToStderr(const wxString& text) = 0;
-#endif // !__WXWINCE__
-
-protected:
-#if wxUSE_THREADS
-    // implementation of WaitForThread() for the console applications which is
-    // also used by the GUI code if it doesn't [yet|already] dispatch events
-    WXDWORD DoSimpleWaitForThread(WXHANDLE hThread);
-#endif // wxUSE_THREADS
 };
 
 #endif // _WX_MSW_APPTBASE_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/apptrait.h b/Source/3rd Party/wx/include/wx/msw/apptrait.h
index f74b99b59..6b094ce29 100644
--- a/Source/3rd Party/wx/include/wx/msw/apptrait.h	
+++ b/Source/3rd Party/wx/include/wx/msw/apptrait.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: apptrait.h 40599 2006-08-13 21:00:32Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,20 +19,11 @@
 class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
-    virtual wxEventLoopBase *CreateEventLoop();
     virtual void *BeforeChildWaitLoop();
+    virtual void AlwaysYield();
     virtual void AfterChildWaitLoop(void *data);
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif // wxUSE_TIMER
-#if wxUSE_THREADS
+
     virtual bool DoMessageFromThreadWait();
-    virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
-#endif // wxUSE_THREADS
-#ifndef __WXWINCE__
-    virtual bool CanUseStderr() { return true; }
-    virtual bool WriteToStderr(const wxString& text);
-#endif // !__WXWINCE__
 };
 
 #if wxUSE_GUI
@@ -40,24 +31,15 @@ public:
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
-    virtual wxEventLoopBase *CreateEventLoop();
     virtual void *BeforeChildWaitLoop();
+    virtual void AlwaysYield();
     virtual void AfterChildWaitLoop(void *data);
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif // wxUSE_TIMER
-#if wxUSE_THREADS
-    virtual bool DoMessageFromThreadWait();
-    virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
-#endif // wxUSE_THREADS
-    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
-#ifndef __WXWINCE__
-    virtual bool CanUseStderr();
-    virtual bool WriteToStderr(const wxString& text);
-#endif // !__WXWINCE__
+    virtual bool DoMessageFromThreadWait();
+    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
 };
 
 #endif // wxUSE_GUI
 
 #endif // _WX_MSW_APPTRAIT_H_
+
diff --git a/Source/3rd Party/wx/include/wx/msw/bitmap.h b/Source/3rd Party/wx/include/wx/msw/bitmap.h
index a4287c5c2..4e71852a5 100644
--- a/Source/3rd Party/wx/include/wx/msw/bitmap.h	
+++ b/Source/3rd Party/wx/include/wx/msw/bitmap.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: bitmap.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,25 +25,16 @@ class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxDIB;
 #endif
 class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxImage;
 class WXDLLIMPEXP_FWD_CORE wxMask;
 class WXDLLIMPEXP_FWD_CORE wxPalette;
 class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
-// What kind of transparency should a bitmap copied from an icon or cursor
-// have?
-enum wxBitmapTransparency
-{
-  wxBitmapTransparency_Auto,    // default: copy alpha if the source has it
-  wxBitmapTransparency_None,    // never create alpha
-  wxBitmapTransparency_Always   // always use alpha
-};
-
 // ----------------------------------------------------------------------------
 // wxBitmap: a mono or colour bitmap
-// NOTE: for wxMSW we don't use the wxBitmapBase base class declared in bitmap.h!
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage
+class WXDLLEXPORT wxBitmap : public wxGDIImage
 {
 public:
     // default ctor creates an invalid bitmap, you must Create() it later
@@ -57,23 +48,22 @@ public:
 #ifdef wxNEEDS_CHARPP
     wxBitmap(char** data)
     {
-        *this = wxBitmap(const_cast<const char* const*>(data));
+        *this = wxBitmap(wx_const_cast(const char* const*, data));
     }
 #endif
 
     // Load a file or resource
-    wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
+    wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
 
     // New constructor for generalised creation from data
-    wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1);
+    wxBitmap(const void* data, long type, int width, int height, int depth = 1);
 
     // Create a new, uninitialized bitmap of the given size and depth (if it
     // is omitted, will create a bitmap compatible with the display)
     //
     // NB: this ctor will create a DIB for 24 and 32bpp bitmaps, use ctor
     //     taking a DC argument if you want to force using DDB in this case
-    wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); }
-    wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); }
+    wxBitmap(int width, int height, int depth = -1);
 
     // Create a bitmap compatible with the given DC
     wxBitmap(int width, int height, const wxDC& dc);
@@ -90,11 +80,7 @@ public:
 
     // we must have this, otherwise icons are silently copied into bitmaps using
     // the copy ctor but the resulting bitmap is invalid!
-    wxBitmap(const wxIcon& icon,
-             wxBitmapTransparency transp = wxBitmapTransparency_Auto)
-    {
-        CopyFromIcon(icon, transp);
-    }
+    wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
 
     wxBitmap& operator=(const wxIcon& icon)
     {
@@ -114,37 +100,31 @@ public:
 
 #if wxUSE_IMAGE
     wxImage ConvertToImage() const;
-    wxBitmap ConvertToDisabled(unsigned char brightness = 255) const;
 #endif // wxUSE_IMAGE
 
     // get the given part of bitmap
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
     // NB: This should not be called from user code. It is for wx internal
-    // use only.
+    // use only. 
     wxBitmap GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const;
 
     // copies the contents and mask of the given (colour) icon to the bitmap
-    bool CopyFromIcon(const wxIcon& icon,
-                      wxBitmapTransparency transp = wxBitmapTransparency_Auto);
+    bool CopyFromIcon(const wxIcon& icon);
 
     // copies the contents and mask of the given cursor to the bitmap
-    bool CopyFromCursor(const wxCursor& cursor,
-                        wxBitmapTransparency transp = wxBitmapTransparency_Auto);
+    bool CopyFromCursor(const wxCursor& cursor);
 
 #if wxUSE_WXDIB
     // copies from a device independent bitmap
     bool CopyFromDIB(const wxDIB& dib);
 #endif
 
-    virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
-    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
-        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
-
+    virtual bool Create(int width, int height, int depth = -1);
     virtual bool Create(int width, int height, const wxDC& dc);
-    virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
-    virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
-    virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
+    virtual bool Create(const void* data, long type, int width, int height, int depth = 1);
+    virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
+    virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
 
     wxBitmapRefData *GetBitmapData() const
         { return (wxBitmapRefData *)m_refData; }
@@ -167,6 +147,13 @@ public:
     bool HasAlpha() const;
     void UseAlpha();
 
+#if WXWIN_COMPATIBILITY_2_4
+    // these functions do nothing and are only there for backwards
+    // compatibility
+    wxDEPRECATED( int GetQuality() const );
+    wxDEPRECATED( void SetQuality(int quality) );
+#endif // WXWIN_COMPATIBILITY_2_4
+
     // implementation only from now on
     // -------------------------------
 
@@ -174,12 +161,14 @@ public:
     void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); }
     WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); }
 
+#ifdef __WXDEBUG__
     void SetSelectedInto(wxDC *dc);
     wxDC *GetSelectedInto() const;
+#endif // __WXDEBUG__
 
 protected:
     virtual wxGDIImageRefData *CreateData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     // creates an uninitialized bitmap, called from Create()s above
     bool DoCreate(int w, int h, int depth, WXHDC hdc);
@@ -197,9 +186,7 @@ protected:
 
 private:
     // common part of CopyFromIcon/CopyFromCursor for Win32
-    bool
-    CopyFromIconOrCursor(const wxGDIImage& icon,
-                         wxBitmapTransparency transp = wxBitmapTransparency_Auto);
+    bool CopyFromIconOrCursor(const wxGDIImage& icon);
 
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
@@ -209,7 +196,7 @@ private:
 // wxMask: a mono bitmap used for drawing bitmaps transparently.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMask : public wxObject
+class WXDLLEXPORT wxMask : public wxObject
 {
 public:
     wxMask();
@@ -247,49 +234,45 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxMask)
 };
 
-
 // ----------------------------------------------------------------------------
 // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
-// NOTE: for wxMSW we don't use the wxBitmapHandler class declared in bitmap.h!
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler
+class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler
 {
 public:
     wxBitmapHandler() { }
-    wxBitmapHandler(const wxString& name, const wxString& ext, wxBitmapType type)
-        : wxGDIImageHandler(name, ext, type) { }
-
-    // implement wxGDIImageHandler's pure virtuals:
-
-    virtual bool Create(wxGDIImage *image,
-                        const void* data,
-                        wxBitmapType type,
-                        int width, int height, int depth = 1);
-    virtual bool Load(wxGDIImage *image,
-                      const wxString& name,
-                      wxBitmapType type,
-                      int desiredWidth, int desiredHeight);
-    virtual bool Save(const wxGDIImage *image,
-                      const wxString& name,
-                      wxBitmapType type) const;
-
-
-    // make wxBitmapHandler compatible with the wxBitmapHandler interface
-    // declared in bitmap.h, even if it's derived from wxGDIImageHandler:
+    wxBitmapHandler(const wxString& name, const wxString& ext, long type)
+        : wxGDIImageHandler(name, ext, type)
+    {
+    }
 
+    // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the
+    // old class which worked only with bitmaps
     virtual bool Create(wxBitmap *bitmap,
                         const void* data,
-                        wxBitmapType type,
+                        long flags,
                         int width, int height, int depth = 1);
     virtual bool LoadFile(wxBitmap *bitmap,
                           const wxString& name,
-                          wxBitmapType type,
+                          long flags,
                           int desiredWidth, int desiredHeight);
-    virtual bool SaveFile(const wxBitmap *bitmap,
+    virtual bool SaveFile(wxBitmap *bitmap,
                           const wxString& name,
-                          wxBitmapType type,
-                          const wxPalette *palette = NULL) const;
+                          int type,
+                          const wxPalette *palette = NULL);
+
+    virtual bool Create(wxGDIImage *image,
+                        const void* data,
+                        long flags,
+                        int width, int height, int depth = 1);
+    virtual bool Load(wxGDIImage *image,
+                      const wxString& name,
+                      long flags,
+                      int desiredWidth, int desiredHeight);
+    virtual bool Save(wxGDIImage *image,
+                      const wxString& name,
+                      int type);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
diff --git a/Source/3rd Party/wx/include/wx/msw/bmpbuttn.h b/Source/3rd Party/wx/include/wx/msw/bmpbuttn.h
index 274d2435e..a9173613b 100644
--- a/Source/3rd Party/wx/include/wx/msw/bmpbuttn.h	
+++ b/Source/3rd Party/wx/include/wx/msw/bmpbuttn.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: bmpbuttn.h 36078 2005-11-03 19:38:20Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,10 +16,10 @@
 #include "wx/bitmap.h"
 #include "wx/brush.h"
 
-class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
+class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
 {
 public:
-    wxBitmapButton() {}
+    wxBitmapButton() { }
 
     wxBitmapButton(wxWindow *parent,
                    wxWindowID id,
@@ -42,7 +42,30 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
+    // Implementation
+    virtual bool SetBackgroundColour(const wxColour& colour);
+    virtual void SetDefault();
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+    virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
+    virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
+    virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
+
 protected:
+    // reimplement some base class virtuals
+    virtual wxSize DoGetBestSize() const;
+    virtual void OnSetBitmap();
+
+    // invalidate m_brushDisabled when system colours change
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
+
+    // change the currently bitmap if we have a hover one
+    void OnMouseEnterOrLeave(wxMouseEvent& event);
+
+
+    // the brush we use to draw disabled buttons
+    wxBrush m_brushDisabled;
+
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };
diff --git a/Source/3rd Party/wx/include/wx/msw/brush.h b/Source/3rd Party/wx/include/wx/msw/brush.h
index 70890da1d..37de6d77d 100644
--- a/Source/3rd Party/wx/include/wx/msw/brush.h	
+++ b/Source/3rd Party/wx/include/wx/msw/brush.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: brush.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,51 +12,49 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
+#include "wx/gdicmn.h"
+#include "wx/gdiobj.h"
+#include "wx/bitmap.h"
+
 class WXDLLIMPEXP_FWD_CORE wxBrush;
-class WXDLLIMPEXP_FWD_CORE wxColour;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 // ----------------------------------------------------------------------------
 // wxBrush
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
+class WXDLLEXPORT wxBrush : public wxBrushBase
 {
 public:
     wxBrush();
-    wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
-#endif
+    wxBrush(const wxColour& col, int style = wxSOLID);
     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
 
     virtual void SetColour(const wxColour& col);
     virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
-    virtual void SetStyle(wxBrushStyle style);
+    virtual void SetStyle(int style);
     virtual void SetStipple(const wxBitmap& stipple);
 
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
-    wxBrushStyle GetStyle() const;
+    virtual int GetStyle() const;
     wxBitmap *GetStipple() const;
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxBrushStyle)style); }
-#endif
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
 
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };
 
-#endif // _WX_BRUSH_H_
+#endif
+    // _WX_BRUSH_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/button.h b/Source/3rd Party/wx/include/wx/msw/button.h
index 98791722e..e36e44ff6 100644
--- a/Source/3rd Party/wx/include/wx/msw/button.h	
+++ b/Source/3rd Party/wx/include/wx/msw/button.h	
@@ -4,22 +4,22 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: button.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_MSW_BUTTON_H_
-#define _WX_MSW_BUTTON_H_
+#ifndef _WX_BUTTON_H_
+#define _WX_BUTTON_H_
 
 // ----------------------------------------------------------------------------
 // Pushbutton
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
+class WXDLLEXPORT wxButton : public wxButtonBase
 {
 public:
-    wxButton() { Init(); }
+    wxButton() { }
     wxButton(wxWindow *parent,
              wxWindowID id,
              const wxString& label = wxEmptyString,
@@ -29,8 +29,6 @@ public:
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {
-        Init();
-
         Create(parent, id, label, pos, size, style, validator, name);
     }
 
@@ -45,15 +43,23 @@ public:
 
     virtual ~wxButton();
 
-    virtual wxWindow *SetDefault();
+    virtual void SetDefault();
 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
+    // coloured buttons support
+    virtual bool SetBackgroundColour(const wxColour &colour);
+    virtual bool SetForegroundColour(const wxColour &colour);
+
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
+private:
+    void MakeOwnerDrawn();
+
 protected:
     // send a notification event, return true if processed
     bool SendClickEvent();
@@ -65,22 +71,12 @@ protected:
     // set or unset BS_DEFPUSHBUTTON style
     static void SetDefaultStyle(wxButton *btn, bool on);
 
-    virtual bool DoGetAuthNeeded() const;
-    virtual void DoSetAuthNeeded(bool show);
-
-    // true if the UAC symbol is shown
-    bool m_authNeeded;
+    // usually overridden base class virtuals
+    virtual wxSize DoGetBestSize() const;
 
 private:
-    void Init()
-    {
-        m_authNeeded = false;
-    }
-
-    void OnCharHook(wxKeyEvent& event);
-
-    wxDECLARE_EVENT_TABLE();
-    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxButton);
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
 };
 
-#endif // _WX_MSW_BUTTON_H_
+#endif
+    // _WX_BUTTON_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/caret.h b/Source/3rd Party/wx/include/wx/msw/caret.h
index 843489e0a..90b0d29cc 100644
--- a/Source/3rd Party/wx/include/wx/msw/caret.h	
+++ b/Source/3rd Party/wx/include/wx/msw/caret.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/caret.h
+// Name:        msw/caret.h
 // Purpose:     wxCaret class - the MSW implementation of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: caret.h 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
 #ifndef _WX_CARET_H_
 #define _WX_CARET_H_
 
-class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase
+class WXDLLEXPORT wxCaret : public wxCaretBase
 {
 public:
     wxCaret() { Init(); }
@@ -56,7 +56,7 @@ protected:
 private:
     bool m_hasCaret;
 
-    wxDECLARE_NO_COPY_CLASS(wxCaret);
+    DECLARE_NO_COPY_CLASS(wxCaret)
 };
 
 #endif // _WX_CARET_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/checkbox.h b/Source/3rd Party/wx/include/wx/msw/checkbox.h
index 46d9b5823..6f5605571 100644
--- a/Source/3rd Party/wx/include/wx/msw/checkbox.h	
+++ b/Source/3rd Party/wx/include/wx/msw/checkbox.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: checkbox.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,7 @@
 #define _WX_CHECKBOX_H_
 
 // Checkbox item (single checkbox)
-class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
+class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
 {
 public:
     wxCheckBox() { }
@@ -42,16 +42,11 @@ public:
     virtual bool GetValue() const;
 
     // override some base class virtuals
-    virtual void SetLabel(const wxString& label);
-
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);
     virtual bool SetForegroundColour(const wxColour& colour);
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
 protected:
     virtual wxSize DoGetBestSize() const;
 
diff --git a/Source/3rd Party/wx/include/wx/msw/checklst.h b/Source/3rd Party/wx/include/wx/msw/checklst.h
index bd01161f6..5f1272781 100644
--- a/Source/3rd Party/wx/include/wx/msw/checklst.h	
+++ b/Source/3rd Party/wx/include/wx/msw/checklst.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.11.97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: checklst.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,35 +19,35 @@
 class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;
 class WXDLLIMPEXP_FWD_CORE wxCheckListBoxItem; // fwd decl, defined in checklst.cpp
 
-class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
+class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
 {
 public:
-    // ctors
-    wxCheckListBox();
-    wxCheckListBox(wxWindow *parent, wxWindowID id,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   int nStrings = 0,
-                   const wxString choices[] = NULL,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr);
-    wxCheckListBox(wxWindow *parent, wxWindowID id,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   const wxArrayString& choices,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr);
+  // ctors
+  wxCheckListBox();
+  wxCheckListBox(wxWindow *parent, wxWindowID id,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 int nStrings = 0,
+                 const wxString choices[] = NULL,
+                 long style = 0,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxListBoxNameStr);
+  wxCheckListBox(wxWindow *parent, wxWindowID id,
+                 const wxPoint& pos,
+                 const wxSize& size,
+                 const wxArrayString& choices,
+                 long style = 0,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxListBoxNameStr);
 
-    bool Create(wxWindow *parent, wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
-    bool Create(wxWindow *parent, wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos,
                 const wxSize& size,
                 const wxArrayString& choices,
@@ -55,35 +55,42 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
 
-    // items may be checked
-    virtual bool IsChecked(unsigned int uiIndex) const;
-    virtual void Check(unsigned int uiIndex, bool bCheck = true);
-    virtual void Toggle(unsigned int uiIndex);
+  // override base class virtuals
+  virtual void Delete(unsigned int n);
 
-    // we create our items ourselves and they have non-standard size,
-    // so we need to override these functions
-    virtual wxOwnerDrawn *CreateLboxItem(size_t n);
-    virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
+  virtual bool SetFont( const wxFont &font );
+
+  // items may be checked
+  virtual bool IsChecked(unsigned int uiIndex) const;
+  virtual void Check(unsigned int uiIndex, bool bCheck = true);
+
+  // return the index of the item at this position or wxNOT_FOUND
+  int HitTest(const wxPoint& pt) const { return DoHitTestItem(pt.x, pt.y); }
+  int HitTest(wxCoord x, wxCoord y) const { return DoHitTestItem(x, y); }
+
+  // accessors
+  size_t GetItemHeight() const { return m_nItemHeight; }
+
+  // we create our items ourselves and they have non-standard size,
+  // so we need to override these functions
+  virtual wxOwnerDrawn *CreateLboxItem(size_t n);
+  virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 
 protected:
-    // pressing space or clicking the check box toggles the item
-    void OnKeyDown(wxKeyEvent& event);
-    void OnLeftClick(wxMouseEvent& event);
+  // this can't be called DoHitTest() because wxWindow already has this method
+  int DoHitTestItem(wxCoord x, wxCoord y) const;
 
-    // send an "item checked" event
-    void SendEvent(unsigned int uiIndex)
-    {
-        wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId());
-        event.SetInt(uiIndex);
-        event.SetEventObject(this);
-        event.SetString(GetString(uiIndex));
-        ProcessCommand(event);
-    }
+  // pressing space or clicking the check box toggles the item
+  void OnKeyDown(wxKeyEvent& event);
+  void OnLeftClick(wxMouseEvent& event);
 
-    wxSize DoGetBestClientSize() const;
+  wxSize DoGetBestSize() const;
 
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox)
+private:
+  size_t    m_nItemHeight;  // height of checklistbox items (the same for all)
+
+  DECLARE_EVENT_TABLE()
+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox)
 };
 
 #endif    //_CHECKLST_H
diff --git a/Source/3rd Party/wx/include/wx/msw/chkconf.h b/Source/3rd Party/wx/include/wx/msw/chkconf.h
index 0e91e3c46..022ca20dd 100644
--- a/Source/3rd Party/wx/include/wx/msw/chkconf.h	
+++ b/Source/3rd Party/wx/include/wx/msw/chkconf.h	
@@ -4,7 +4,7 @@
  * Author:      Julian Smart
  * Modified by:
  * Created:     01/02/97
- * RCS-ID:      $Id$
+ * RCS-ID:      $Id: chkconf.h 44436 2007-02-10 02:06:54Z RD $
  * Copyright:   (c) Julian Smart
  * Licence:     wxWindows licence
  */
@@ -15,22 +15,6 @@
 #define _WX_MSW_CHKCONF_H_
 
 /* ensure that MSW-specific settings are defined */
-#ifndef wxUSE_ACTIVEX
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_ACTIVEX must be defined."
-#    else
-#        define wxUSE_ACTIVEX 0
-#    endif
-#endif /* !defined(wxUSE_ACTIVEX) */
-
-#ifndef wxUSE_CRASHREPORT
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CRASHREPORT must be defined."
-#   else
-#       define wxUSE_CRASHREPORT 0
-#   endif
-#endif /* !defined(wxUSE_CRASHREPORT) */
-
 #ifndef wxUSE_DC_CACHEING
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DC_CACHEING must be defined"
@@ -39,69 +23,27 @@
 #   endif
 #endif /* wxUSE_DC_CACHEING */
 
-#ifndef wxUSE_DIALUP_MANAGER
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_DIALUP_MANAGER must be defined."
-#    else
-#        define wxUSE_DIALUP_MANAGER 0
-#    endif
-#endif /* !defined(wxUSE_DIALUP_MANAGER) */
 
-#ifndef wxUSE_MS_HTML_HELP
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_MS_HTML_HELP must be defined."
-#    else
-#        define wxUSE_MS_HTML_HELP 0
-#    endif
-#endif /* !defined(wxUSE_MS_HTML_HELP) */
+/*
+ * disable the settings which don't work for some compilers
+ */
 
-#ifndef wxUSE_INICONF
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_INICONF must be defined."
-#    else
-#        define wxUSE_INICONF 0
-#    endif
-#endif /* !defined(wxUSE_INICONF) */
+/*
+ * If using PostScript-in-MSW in Univ, must enable PostScript
+ */
+#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
+#   undef wxUSE_POSTSCRIPT
+#   define wxUSE_POSTSCRIPT 1
+#endif
 
-#ifndef wxUSE_OLE
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_OLE must be defined."
-#    else
-#        define wxUSE_OLE 0
-#    endif
-#endif /* !defined(wxUSE_OLE) */
-
-#ifndef wxUSE_OLE_AUTOMATION
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_OLE_AUTOMATION must be defined."
-#    else
-#        define wxUSE_OLE_AUTOMATION 0
-#    endif
-#endif /* !defined(wxUSE_OLE_AUTOMATION) */
-
-#ifndef wxUSE_TASKBARICON_BALLOONS
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TASKBARICON_BALLOONS must be defined."
+#ifndef wxUSE_NORLANDER_HEADERS
+#   if ( wxCHECK_WATCOM_VERSION(1,0) || defined(__WINE__) ) || \
+       ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
+#       define wxUSE_NORLANDER_HEADERS 1
 #   else
-#       define wxUSE_TASKBARICON_BALLOONS 0
+#       define wxUSE_NORLANDER_HEADERS 0
 #   endif
-#endif /* wxUSE_TASKBARICON_BALLOONS */
-
-#ifndef wxUSE_UNICODE_MSLU
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_UNICODE_MSLU must be defined."
-#    else
-#        define wxUSE_UNICODE_MSLU 0
-#    endif
-#endif  /* wxUSE_UNICODE_MSLU */
-
-#ifndef wxUSE_UXTHEME
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_UXTHEME must be defined."
-#    else
-#        define wxUSE_UXTHEME 0
-#    endif
-#endif  /* wxUSE_UXTHEME */
+#endif
 
 /*
  * We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but
@@ -115,28 +57,13 @@
 #   define wxUSE_UNICODE_MSLU 0
 #endif
 
-
 /*
- * disable the settings which don't work for some compilers
+ * Don't use MSLU if compiling with Wine
  */
 
-#ifndef wxUSE_NORLANDER_HEADERS
-#   if ( wxCHECK_WATCOM_VERSION(1,0) || defined(__WINE__) ) || \
-       ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
-#       define wxUSE_NORLANDER_HEADERS 1
-#   else
-#       define wxUSE_NORLANDER_HEADERS 0
-#   endif
-#endif
-
-/*
- * See WINVER definition in wx/msw/wrapwin.h for the explanation of this test
- * logic.
- */
-#if (defined(__VISUALC__) && (__VISUALC__ < 1300)) && \
-        (!defined(WINVER) || WINVER < 0x0500)
-#   undef wxUSE_TASKBARICON_BALLOONS
-#   define wxUSE_TASKBARICON_BALLOONS 0
+#if wxUSE_UNICODE_MSLU && defined(__WINE__)
+#   undef wxUSE_UNICODE_MSLU
+#   define wxUSE_UNICODE_MSLU 0
 #endif
 
 /*
@@ -155,6 +82,12 @@
 #    define wxUSE_STACKWALKER 0
 #endif /* compiler doesn't support SEH */
 
+/* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
+#if defined(__MWERKS__)
+#    undef wxUSE_DEBUG_NEW_ALWAYS
+#    define wxUSE_DEBUG_NEW_ALWAYS      0
+#endif
+
 #if defined(__GNUWIN32__)
     /* These don't work as expected for mingw32 and cygwin32 */
 #   undef  wxUSE_MEMORY_TRACING
@@ -218,6 +151,11 @@
  */
 #ifdef __WIN64__
 #   if wxUSE_STACKWALKER
+        /* this is not currently supported under Win64, volunteers needed to
+           make it work */
+#       undef wxUSE_STACKWALKER
+#       define wxUSE_STACKWALKER 0
+
 #       undef wxUSE_CRASHREPORT
 #       define wxUSE_CRASHREPORT 0
 #   endif
@@ -227,24 +165,18 @@
 /*
    Compiler-specific checks.
  */
-
-/* Borland */
-#ifdef __BORLANDC__
-
-#if __BORLANDC__ < 0x500
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
     /* BC++ 4.0 can't compile JPEG library */
 #   undef wxUSE_LIBJPEG
 #   define wxUSE_LIBJPEG 0
 #endif
 
 /* wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode */
-#if defined(WXMAKINGDLL) || defined(WXUSINGDLL)
+#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
 #   undef wxUSE_DEBUG_NEW_ALWAYS
 #   define wxUSE_DEBUG_NEW_ALWAYS 0
 #endif
 
-#endif /* __BORLANDC__ */
-
 /* DMC++ doesn't have definitions for date picker control, so use generic control
  */
 #ifdef __DMC__
@@ -257,34 +189,86 @@
 #endif
 
 
+/* check that MSW-specific options are defined too */
+#ifndef wxUSE_ACTIVEX
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_ACTIVEX must be defined."
+#    else
+#        define wxUSE_ACTIVEX 0
+#    endif
+#endif /* !defined(wxUSE_ACTIVEX) */
+
+#ifndef wxUSE_DIALUP_MANAGER
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_DIALUP_MANAGER must be defined."
+#    else
+#        define wxUSE_DIALUP_MANAGER 0
+#    endif
+#endif /* !defined(wxUSE_DIALUP_MANAGER) */
+
+#ifndef wxUSE_MS_HTML_HELP
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_MS_HTML_HELP must be defined."
+#    else
+#        define wxUSE_MS_HTML_HELP 0
+#    endif
+#endif /* !defined(wxUSE_MS_HTML_HELP) */
+
+#ifndef wxUSE_OLE
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_OLE must be defined."
+#    else
+#        define wxUSE_OLE 0
+#    endif
+#endif /* !defined(wxUSE_OLE) */
+
+#ifndef wxUSE_OLE_AUTOMATION
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_OLE_AUTOMATION must be defined."
+#    else
+#        define wxUSE_OLE_AUTOMATION 0
+#    endif
+#endif /* !defined(wxUSE_OLE_AUTOMATION) */
+
+#ifndef wxUSE_UNICODE_MSLU
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_UNICODE_MSLU must be defined."
+#    else
+#        define wxUSE_UNICODE_MSLU 0
+#    endif
+#endif  /* wxUSE_UNICODE_MSLU */
+
+#ifndef wxUSE_UXTHEME
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_UXTHEME must be defined."
+#    else
+#        define wxUSE_UXTHEME 0
+#    endif
+#endif  /* wxUSE_UXTHEME */
+
+#ifndef wxUSE_UXTHEME_AUTO
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_UXTHEME_AUTO must be defined."
+#    else
+#        define wxUSE_UXTHEME_AUTO 0
+#    endif
+#endif  /* wxUSE_UXTHEME_AUTO */
+
 
 /*
    un/redefine the options which we can't compile (after checking that they're
    defined
  */
 #ifdef __WINE__
-#   if wxUSE_ACTIVEX
-#       undef wxUSE_ACTIVEX
-#       define wxUSE_ACTIVEX 0
-#   endif /* wxUSE_ACTIVEX */
-
-#   if wxUSE_UNICODE_MSLU
-#       undef wxUSE_UNICODE_MSLU
-#       define wxUSE_UNICODE_MSLU 0
-#   endif /* wxUSE_UNICODE_MSLU */
-#endif /* __WINE__ */
+    /* apparently it doesn't compile under Wine, remove it/when it does */
+    #if wxUSE_ACTIVEX
+        #undef wxUSE_ACTIVEX
+        #define wxUSE_ACTIVEX 0
+    #endif // wxUSE_ACTIVEX
+#endif // __WINE__
 
 
 /* check settings consistency for MSW-specific ones */
-#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
-#   else
-#       undef wxUSE_CRASHREPORT
-#       define wxUSE_CRASHREPORT 0
-#   endif
-#endif /* wxUSE_CRASHREPORT */
-
 #if !wxUSE_VARIANT
 #   if wxUSE_ACTIVEX
 #       ifdef wxABORT_ON_CONFIG_ERROR
@@ -325,14 +309,6 @@
 #endif  /* !wxUSE_DYNAMIC_LOADER */
 
 #if !wxUSE_DYNLIB_CLASS
-#   if wxUSE_DC_TRANSFORM_MATRIX
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_DC_TRANSFORM_MATRIX requires wxUSE_DYNLIB_CLASS"
-#       else
-#           undef wxUSE_DC_TRANSFORM_MATRIX
-#           define wxUSE_DC_TRANSFORM_MATRIX 0
-#       endif
-#   endif
 #   if wxUSE_UXTHEME
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxUSE_UXTHEME requires wxUSE_DYNLIB_CLASS"
@@ -397,42 +373,15 @@
 #           define wxUSE_MEDIACTRL 0
 #       endif
 #   endif
-#    if wxUSE_WEB
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxWebView requires wxActiveXContainer under MSW"
-#       else
-#           undef wxUSE_WEB
-#           define wxUSE_WEB 0
-#       endif
-#   endif
 #endif /* !wxUSE_ACTIVEX */
 
-#if !wxUSE_THREADS
-#   if wxUSE_FSWATCHER
+#if defined(_MSC_VER) && _MSC_VER <= 1200 && wxUSE_GRAPHICS_CONTEXT
 #       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxFileSystemWatcher requires wxThread under MSW"
+#           error "wxGraphicsContext needs MSVC 7 or newer"
 #       else
-#           undef wxUSE_FSWATCHER
-#           define wxUSE_FSWATCHER 0
+#           undef wxUSE_GRAPHICS_CONTEXT
+#           define wxUSE_GRAPHICS_CONTEXT 0
 #       endif
-#   endif
-#endif /* !wxUSE_THREADS */
-
-
-#if !wxUSE_OLE_AUTOMATION
-#    if wxUSE_WEB
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW"
-#       else
-#           undef wxUSE_WEB
-#           define wxUSE_WEB 0
-#       endif
-#   endif
-#endif /* !wxUSE_OLE_AUTOMATION */
-
-#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
-#   undef wxUSE_POSTSCRIPT
-#   define wxUSE_POSTSCRIPT 1
 #endif
 
 #endif /* _WX_MSW_CHKCONF_H_ */
diff --git a/Source/3rd Party/wx/include/wx/msw/choice.h b/Source/3rd Party/wx/include/wx/msw/choice.h
index 26eb9300d..6dccdafa4 100644
--- a/Source/3rd Party/wx/include/wx/msw/choice.h	
+++ b/Source/3rd Party/wx/include/wx/msw/choice.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to derive from wxChoiceBase
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: choice.h 51616 2008-02-09 15:22:15Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
 // Choice item
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
+class WXDLLEXPORT wxChoice : public wxChoiceBase
 {
 public:
     // ctors
@@ -66,10 +66,11 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
 
-    virtual bool Show(bool show = true);
-
     virtual void SetLabel(const wxString& label);
 
+    virtual void Delete(unsigned int n);
+    virtual void Clear();
+
     virtual unsigned int GetCount() const;
     virtual int GetSelection() const;
     virtual int GetCurrentSelection() const;
@@ -79,14 +80,6 @@ public:
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);
 
-    virtual wxVisualAttributes GetDefaultAttributes() const
-    {
-        return GetClassDefaultAttributes(GetWindowVariant());
-    }
-
-    static wxVisualAttributes
-    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
@@ -94,30 +87,17 @@ public:
     virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
 protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
     // common part of all ctors
-    void Init()
-    {
-        m_lastAcceptedSelection = wxID_NONE;
-        m_heightOwn = wxDefaultCoord;
-    }
-
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
+    void Init() { m_lastAcceptedSelection = wxID_NONE; }
 
+    virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, unsigned int pos);
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
 
     // MSW implementation
     virtual wxSize DoGetBestSize() const;
@@ -126,15 +106,9 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
-    // Show or hide the popup part of the control.
-    void MSWDoPopupOrDismiss(bool show);
-
     // update the height of the drop down list to fit the number of items we
     // have (without changing the visible height)
-    void MSWUpdateDropDownHeight();
-
-    // set the height of the visible part of the control to m_heightOwn
-    void MSWUpdateVisibleHeight();
+    void UpdateVisibleHeight();
 
     // create and initialize the control
     bool CreateAndInit(wxWindow *parent, wxWindowID id,
@@ -148,21 +122,12 @@ protected:
     // free all memory we have (used by Clear() and dtor)
     void Free();
 
-    // set the height for simple combo box
-    int SetHeightSimpleComboBox(int nItems) const;
-
-#if wxUSE_DEFERRED_SIZING
-    virtual void MSWEndDeferWindowPos();
-#endif // wxUSE_DEFERRED_SIZING
 
     // last "completed" selection, i.e. not the transient one while the user is
     // browsing the popup list: this is only used when != wxID_NONE which is
     // the case while the drop down is opened
     int m_lastAcceptedSelection;
 
-    // the height of the control itself if it was set explicitly or
-    // wxDefaultCoord if it hadn't
-    int m_heightOwn;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)
 };
diff --git a/Source/3rd Party/wx/include/wx/msw/clipbrd.h b/Source/3rd Party/wx/include/wx/msw/clipbrd.h
index a4da27893..a8cf81c3c 100644
--- a/Source/3rd Party/wx/include/wx/msw/clipbrd.h	
+++ b/Source/3rd Party/wx/include/wx/msw/clipbrd.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: clipbrd.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,28 +14,32 @@
 
 #if wxUSE_CLIPBOARD
 
+#include "wx/list.h"
+#include "wx/module.h"
+#include "wx/dataobj.h"     // for wxDataFormat
+
 // These functions superceded by wxClipboard, but retained in order to
 // implement wxClipboard, and for compatibility.
 
 // open/close the clipboard
-WXDLLIMPEXP_CORE bool wxOpenClipboard();
-WXDLLIMPEXP_CORE bool wxIsClipboardOpened();
+WXDLLEXPORT bool wxOpenClipboard();
+WXDLLEXPORT bool wxIsClipboardOpened();
 #define wxClipboardOpen wxIsClipboardOpened
-WXDLLIMPEXP_CORE bool wxCloseClipboard();
+WXDLLEXPORT bool wxCloseClipboard();
 
 // get/set data
-WXDLLIMPEXP_CORE bool wxEmptyClipboard();
-WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat,
+WXDLLEXPORT bool wxEmptyClipboard();
+WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat,
                                     const void *data,
                                     int width = 0, int height = 0);
-WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat,
+WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
                                      long *len = NULL);
 
 // clipboard formats
-WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLIMPEXP_CORE int  wxRegisterClipboardFormat(wxChar *formatName);
-WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat,
+WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
+WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
+WXDLLEXPORT int  wxRegisterClipboardFormat(wxChar *formatName);
+WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
                                           wxChar *formatName,
                                           int maxCount);
 
@@ -43,8 +47,11 @@ WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 // wxClipboard
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
+class WXDLLIMPEXP_FWD_CORE wxDataObject;
+class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
+    DECLARE_DYNAMIC_CLASS(wxClipboard)
+
 public:
     wxClipboard();
     virtual ~wxClipboard();
@@ -78,13 +85,14 @@ public:
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 
+    // X11 has two clipboards which get selected by this call. Empty on MSW.
+    void UsePrimarySelection( bool WXUNUSED(primary) = false ) { }
+
 private:
     IDataObject *m_lastDataObject;
     bool m_isOpened;
-
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 
 #endif // wxUSE_CLIPBOARD
-
-#endif // _WX_CLIPBRD_H_
+#endif
+    // _WX_CLIPBRD_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/colordlg.h b/Source/3rd Party/wx/include/wx/msw/colordlg.h
index 32006c6dd..fa0913473 100644
--- a/Source/3rd Party/wx/include/wx/msw/colordlg.h	
+++ b/Source/3rd Party/wx/include/wx/msw/colordlg.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: colordlg.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,22 +12,19 @@
 #ifndef _WX_COLORDLG_H_
 #define _WX_COLORDLG_H_
 
+#include "wx/defs.h"
 #include "wx/dialog.h"
+#include "wx/cmndata.h"
 
 // ----------------------------------------------------------------------------
 // wxColourDialog: dialog for choosing a colours
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog
+class WXDLLEXPORT wxColourDialog : public wxDialog
 {
 public:
-    wxColourDialog() { Init(); }
-    wxColourDialog(wxWindow *parent, wxColourData *data = NULL)
-    {
-        Init();
-
-        Create(parent, data);
-    }
+    wxColourDialog();
+    wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
 
     bool Create(wxWindow *parent, wxColourData *data = NULL);
 
@@ -39,36 +36,21 @@ public:
 
     virtual int ShowModal();
 
-    // wxMSW-specific implementation from now on
-    // -----------------------------------------
-
-    // called from the hook procedure on WM_INITDIALOG reception
-    virtual void MSWOnInitDone(WXHWND hDlg);
-
 protected:
-    // common part of all ctors
-    void Init();
-
-#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual void DoCentre(int dir);
-#endif // !(__SMARTPHONE__ && __WXWINCE__)
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
 
     wxColourData        m_colourData;
     wxString            m_title;
 
-    // indicates that the dialog should be centered in this direction if non 0
-    // (set by DoCentre(), used by MSWOnInitDone())
-    int m_centreDir;
-
-    // true if DoMoveWindow() had been called
-    bool m_movedWindow;
-
+    wxPoint             m_pos;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourDialog)
 };
 
-#endif // _WX_COLORDLG_H_
+#endif
+    // _WX_COLORDLG_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/colour.h b/Source/3rd Party/wx/include/wx/msw/colour.h
index c9dc909b8..d66b838d7 100644
--- a/Source/3rd Party/wx/include/wx/msw/colour.h	
+++ b/Source/3rd Party/wx/include/wx/msw/colour.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: colour.h 51769 2008-02-13 22:36:43Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,17 +18,30 @@
 // Colour
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxColour : public wxColourBase
+class WXDLLEXPORT wxColour : public wxColourBase
 {
 public:
     // constructors
     // ------------
-    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+
+    wxColour() { Init(); }
+    wxColour( ChannelType red, ChannelType green, ChannelType blue,
+              ChannelType alpha = wxALPHA_OPAQUE )
+        { Set(red, green, blue, alpha); }
+    wxColour( unsigned long colRGB ) { Set(colRGB); }
+    wxColour(const wxString& colourName) { Init(); Set(colourName); }
+    wxColour(const wxChar *colourName) { Init(); Set(colourName); }
+
+
+    // dtor
+    virtual ~wxColour();
+
 
     // accessors
     // ---------
 
-    virtual bool IsOk() const { return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_isInit; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
@@ -45,10 +58,11 @@ public:
             && m_alpha == colour.m_alpha;
     }
 
-    bool operator!=(const wxColour& colour) const { return !(*this == colour); }
+    bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     WXCOLORREF GetPixel() const { return m_pixel; }
 
+
 public:
     WXCOLORREF m_pixel;
 
@@ -70,4 +84,5 @@ private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 
-#endif // _WX_COLOUR_H_
+#endif
+        // _WX_COLOUR_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/combo.h b/Source/3rd Party/wx/include/wx/msw/combo.h
index 5f830483b..0cd58b32d 100644
--- a/Source/3rd Party/wx/include/wx/msw/combo.h	
+++ b/Source/3rd Party/wx/include/wx/msw/combo.h	
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: combo.h 43881 2006-12-09 19:48:21Z PC $
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,9 +33,9 @@
 // Define this only if native implementation includes all features
 #define wxCOMBOCONTROL_FULLY_FEATURED
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxComboBoxNameStr[];
 
-class WXDLLIMPEXP_CORE wxComboCtrl : public wxComboCtrlBase
+class WXDLLEXPORT wxComboCtrl : public wxComboCtrlBase
 {
 public:
     // ctors and such
@@ -73,29 +73,22 @@ public:
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
-    void OnTimerEvent(wxTimerEvent& WXUNUSED(event)) { DoTimerEvent(); }
-
+    void OnTimerEvent( wxTimerEvent& event );
 protected:
-    void DoTimerEvent();
-
     virtual bool AnimateShow( const wxRect& rect, int flags );
-#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
+#endif
 
 protected:
 
-    // Dummy method - we override all functions that call this
-    virtual WXHWND GetEditHWND() const { return NULL; }
-
     // customization
     virtual void OnResize();
     virtual wxCoord GetNativeTextIndent() const;
+    virtual void OnThemeChange();
 
     // event handlers
     void OnPaintEvent( wxPaintEvent& event );
     void OnMouseEvent( wxMouseEvent& event );
 
-    virtual bool HasTransparentBackground() { return IsDoubleBuffered(); }
-
 private:
     void Init();
 
diff --git a/Source/3rd Party/wx/include/wx/msw/combobox.h b/Source/3rd Party/wx/include/wx/msw/combobox.h
index e930a8b23..5d4d7761f 100644
--- a/Source/3rd Party/wx/include/wx/msw/combobox.h	
+++ b/Source/3rd Party/wx/include/wx/msw/combobox.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: combobox.h 45818 2007-05-05 13:15:47Z RR $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,6 @@
 #define _WX_COMBOBOX_H_
 
 #include "wx/choice.h"
-#include "wx/textentry.h"
 
 #if wxUSE_COMBOBOX
 
@@ -21,11 +20,10 @@
 // Combobox control
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
-                                    public wxTextEntry
+class WXDLLEXPORT wxComboBox: public wxChoice
 {
 public:
-    wxComboBox() { Init(); }
+    wxComboBox() { }
 
     wxComboBox(wxWindow *parent, wxWindowID id,
             const wxString& value = wxEmptyString,
@@ -36,11 +34,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {
-        Init();
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
-
     }
-
     wxComboBox(wxWindow *parent, wxWindowID id,
             const wxString& value,
             const wxPoint& pos,
@@ -50,8 +45,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr)
     {
-        Init();
-
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 
@@ -75,32 +68,46 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
 
-    // See wxComboBoxBase discussion of IsEmpty().
-    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
-    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
+    // List functions: see wxChoice
 
-    // resolve ambiguities among virtual functions inherited from both base
-    // classes
-    virtual void Clear();
+    // Text field functions
     virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
-    virtual wxString GetStringSelection() const
-        { return wxChoice::GetStringSelection(); }
-    virtual void Popup() { MSWDoPopupOrDismiss(true); }
-    virtual void Dismiss() { MSWDoPopupOrDismiss(false); }
-    virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
-    virtual void SetSelection(long from, long to)
-        { wxTextEntry::SetSelection(from, to); }
-    virtual int GetSelection() const { return wxChoice::GetSelection(); }
-    virtual void GetSelection(long *from, long *to) const;
 
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual wxTextPos GetLastPosition() const;
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+    virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
+    virtual void SetSelection(long from, long to);
+    virtual int GetSelection() const { return wxChoice::GetSelection(); }
+    virtual void GetSelection(long* from, long* to) const;
+    virtual void SetEditable(bool editable);
+
+    virtual void Undo();
+    virtual void Redo();
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+    virtual void SelectAll();
     virtual bool IsEditable() const;
+    virtual bool HasSelection() const;
 
     // implementation only from now on
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     bool MSWShouldPreProcessMessage(WXMSG *pMsg);
+    
+    WXHWND GetEditHWND() const;
 
     // Standard event handling
     void OnCut(wxCommandEvent& event);
@@ -121,49 +128,11 @@ public:
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-#if wxUSE_UXTHEME
-    // override wxTextEntry method to work around Windows bug
-    virtual bool SetHint(const wxString& hint);
-#endif // wxUSE_UXTHEME
-
-protected:
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip(wxToolTip *tip);
-#endif
-
-    // this is the implementation of GetEditHWND() which can also be used when
-    // we don't have the edit control, it simply returns NULL then
-    //
-    // try not to use this function unless absolutely necessary (as in the
-    // message handling code where the edit control might not be created yet
-    // for the messages we receive during the control creation) as normally
-    // just testing for IsEditable() and using GetEditHWND() should be enough
-    WXHWND GetEditHWNDIfAvailable() const;
-
-    virtual void EnableTextChangedEvents(bool enable)
-    {
-        m_allowTextEvents = enable;
-    }
-
 private:
-    // there are the overridden wxTextEntry methods which should only be called
-    // when we do have an edit control so they assert if this is not the case
-    virtual wxWindow *GetEditableWindow();
-    virtual WXHWND GetEditHWND() const;
-
-    // common part of all ctors
-    void Init()
-    {
-        m_allowTextEvents = true;
-    }
-
-    // normally true, false if text events are currently disabled
-    bool m_allowTextEvents;
-
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
     DECLARE_EVENT_TABLE()
 };
 
 #endif // wxUSE_COMBOBOX
-
-#endif // _WX_COMBOBOX_H_
+#endif
+    // _WX_COMBOBOX_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/control.h b/Source/3rd Party/wx/include/wx/msw/control.h
index 7646487eb..c70454cbc 100644
--- a/Source/3rd Party/wx/include/wx/msw/control.h	
+++ b/Source/3rd Party/wx/include/wx/msw/control.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: control.h 45498 2007-04-16 13:03:05Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,7 +15,7 @@
 #include "wx/dynarray.h"
 
 // General item class
-class WXDLLIMPEXP_CORE wxControl : public wxControlBase
+class WXDLLEXPORT wxControl : public wxControlBase
 {
 public:
     wxControl() { }
@@ -35,6 +35,7 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 
+    virtual ~wxControl();
 
     // Simulates an event
     virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
@@ -122,6 +123,13 @@ protected:
     // one
     virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd);
 
+    // this is a helper for the derived class GetClassDefaultAttributes()
+    // implementation: it returns the right colours for the classes which
+    // contain something else (e.g. wxListBox, wxTextCtrl, ...) instead of
+    // being simple controls (such as wxButton, wxCheckBox, ...)
+    static wxVisualAttributes
+        GetCompositeControlsDefaultAttributes(wxWindowVariant variant);
+
     // for controls like radiobuttons which are really composite this array
     // holds the ids (not HWNDs!) of the sub controls
     wxArrayLong m_subControls;
diff --git a/Source/3rd Party/wx/include/wx/msw/crashrpt.h b/Source/3rd Party/wx/include/wx/msw/crashrpt.h
index 19786acac..3933a387d 100644
--- a/Source/3rd Party/wx/include/wx/msw/crashrpt.h	
+++ b/Source/3rd Party/wx/include/wx/msw/crashrpt.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.07.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: crashrpt.h 34436 2005-05-31 09:20:43Z JS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -94,10 +94,10 @@ struct WXDLLIMPEXP_BASE wxCrashReport
 {
     // set the name of the file to which the report is written, it is
     // constructed from the .exe name by default
-    static void SetFileName(const wxString& filename);
+    static void SetFileName(const wxChar *filename);
 
     // return the current file name
-    static wxString GetFileName();
+    static const wxChar *GetFileName();
 
     // write the exception report to the file, return true if it could be done
     // or false otherwise
diff --git a/Source/3rd Party/wx/include/wx/msw/ctrlsub.h b/Source/3rd Party/wx/include/wx/msw/ctrlsub.h
deleted file mode 100644
index 3a6298801..000000000
--- a/Source/3rd Party/wx/include/wx/msw/ctrlsub.h	
+++ /dev/null
@@ -1,43 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/ctrlsub.h
-// Purpose:     common functionality of wxItemContainer-derived controls
-// Author:      Vadim Zeitlin
-// Created:     2007-07-25
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_CTRLSUB_H_
-#define _WX_MSW_CTRLSUB_H_
-
-// ----------------------------------------------------------------------------
-// wxControlWithItems
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsBase
-{
-public:
-    wxControlWithItems() { }
-
-protected:
-    // preallocate memory for inserting the given new items into the control
-    // using the wm message (normally either LB_INITSTORAGE or CB_INITSTORAGE)
-    void MSWAllocStorage(const wxArrayStringsAdapter& items, unsigned wm);
-
-    // insert or append a string to the controls using the given message
-    // (one of {CB,LB}_{ADD,INSERT}STRING, pos must be 0 when appending)
-    int MSWInsertOrAppendItem(unsigned pos, const wxString& item, unsigned wm);
-
-    // normally the control containing the items is this window itself but if
-    // the derived control is composed of several windows, this method can be
-    // overridden to return the real list/combobox control
-    virtual WXHWND MSWGetItemsHWND() const { return GetHWND(); }
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxControlWithItems)
-    wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
-};
-
-#endif // _WX_MSW_CTRLSUB_H_
-
diff --git a/Source/3rd Party/wx/include/wx/msw/cursor.h b/Source/3rd Party/wx/include/wx/msw/cursor.h
index f1df68b64..3cf280d43 100644
--- a/Source/3rd Party/wx/include/wx/msw/cursor.h	
+++ b/Source/3rd Party/wx/include/wx/msw/cursor.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: cursor.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,19 +17,19 @@
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Cursor
-class WXDLLIMPEXP_CORE wxCursor : public wxGDIImage
+class WXDLLEXPORT wxCursor : public wxGDIImage
 {
 public:
     // constructors
     wxCursor();
     wxCursor(const wxImage& image);
+    wxCursor(const char bits[], int width, int height,
+             int hotSpotX = -1, int hotSpotY = -1,
+             const char maskBits[] = NULL);
     wxCursor(const wxString& name,
-             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
+             long flags = wxBITMAP_TYPE_CUR_RESOURCE,
              int hotSpotX = 0, int hotSpotY = 0);
-    wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
+    wxCursor(int idCursor);
     virtual ~wxCursor();
 
     // implementation only
@@ -37,8 +37,6 @@ public:
     WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); }
 
 protected:
-    void InitFromStock(wxStockCursor);
-
     virtual wxGDIImageRefData *CreateData() const;
 
 private:
diff --git a/Source/3rd Party/wx/include/wx/msw/dc.h b/Source/3rd Party/wx/include/wx/msw/dc.h
index 2bfd30133..97b1444fc 100644
--- a/Source/3rd Party/wx/include/wx/msw/dc.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dc.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dc.h 42612 2006-10-29 10:46:49Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,6 @@
 #define _WX_MSW_DC_H_
 
 #include "wx/defs.h"
-#include "wx/dc.h"
 
 // ---------------------------------------------------------------------------
 // macros
@@ -43,11 +42,11 @@ public:
 
 // this is an ABC: use one of the derived classes to create a DC associated
 // with a window, screen, printer and so on
-class WXDLLIMPEXP_CORE wxMSWDCImpl: public wxDCImpl
+class WXDLLEXPORT wxDC : public wxDCBase
 {
 public:
-    wxMSWDCImpl(wxDC *owner, WXHDC hDC);
-    virtual ~wxMSWDCImpl();
+    wxDC(WXHDC hDC) { Init(); m_hDC = hDC; }
+    virtual ~wxDC();
 
     // implement base class pure virtuals
     // ----------------------------------
@@ -79,22 +78,14 @@ public:
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
 
-
-    virtual void SetMapMode(wxMappingMode mode);
+    virtual void SetMapMode(int mode);
     virtual void SetUserScale(double x, double y);
+    virtual void SetSystemScale(double x, double y);
     virtual void SetLogicalScale(double x, double y);
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
-
-#if wxUSE_DC_TRANSFORM_MATRIX
-    virtual bool CanUseTransformMatrix() const;
-    virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix);
-    virtual wxAffineMatrix2D GetTransformMatrix() const;
-    virtual void ResetTransformMatrix();
-#endif // wxUSE_DC_TRANSFORM_MATRIX
-
-    virtual void SetLogicalFunction(wxRasterOperationMode function);
+    virtual void SetLogicalFunction(int function);
 
     // implementation from now on
     // --------------------------
@@ -102,9 +93,10 @@ public:
     virtual void SetRop(WXHDC cdc);
     virtual void SelectOldObjects(WXHDC dc);
 
+    wxWindow *GetWindow() const { return m_canvas; }
     void SetWindow(wxWindow *win)
     {
-        m_window = win;
+        m_canvas = win;
 
 #if wxUSE_PALETTE
         // if we have palettes use the correct one for this window
@@ -152,6 +144,7 @@ public:
 protected:
     void Init()
     {
+        m_canvas = NULL;
         m_bOwnsDC = false;
         m_hDC = NULL;
 
@@ -167,26 +160,17 @@ protected:
 
     // create an uninitialized DC: this should be only used by the derived
     // classes
-    wxMSWDCImpl( wxDC *owner ) : wxDCImpl( owner ) { Init(); }
+    wxDC() { Init(); }
 
-    void RealizeScaleAndOrigin();
-
-public:
-    virtual void DoGetFontMetrics(int *height,
-                                  int *ascent,
-                                  int *descent,
-                                  int *internalLeading,
-                                  int *externalLeading,
-                                  int *averageWidth) const;
     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
-                                 const wxFont *theFont = NULL) const;
+                                 wxFont *theFont = NULL) const;
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             wxFloodFillStyle style = wxFLOOD_SURFACE);
+                             int style = wxFLOOD_SURFACE);
 
     virtual void DoGradientFillLinear(const wxRect& rect,
                                       const wxColour& initialColour,
@@ -212,8 +196,8 @@ public:
                                         double radius);
     virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 
-#if wxUSE_SPLINES && !defined(__WXWINCE__)
-    virtual void DoDrawSpline(const wxPointList *points);
+#if wxUSE_SPLINES
+    virtual void DoDrawSpline(wxList *points);
 #endif
 
     virtual void DoCrossHair(wxCoord x, wxCoord y);
@@ -228,20 +212,13 @@ public:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
-                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-                        wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
-
-    virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
-                               wxCoord dstWidth, wxCoord dstHeight,
-                               wxDC *source,
-                               wxCoord xsrc, wxCoord ysrc,
-                               wxCoord srcWidth, wxCoord srcHeight,
-                               wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-                               wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
 
+    // this is gnarly - we can't even call this function DoSetClippingRegion()
+    // because of virtual function hiding
+    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
                                      wxCoord width, wxCoord height);
-    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
     virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
                                   wxCoord *w, wxCoord *h) const;
 
@@ -251,15 +228,12 @@ public:
                              wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
-                               wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+                               int fillStyle = wxODDEVEN_RULE);
     virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
                                    wxCoord xoffset, wxCoord yoffset,
-                                   wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
-    {
-        return subrect == NULL ? GetSelectedBitmap()
-                               : GetSelectedBitmap().GetSubBitmap(*subrect);
-    }
+                                   int fillStyle = wxODDEVEN_RULE);
+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
 
 
 #if wxUSE_PALETTE
@@ -273,11 +247,10 @@ public:
     void InitializePalette();
 #endif // wxUSE_PALETTE
 
-protected:
     // common part of DoDrawText() and DoDrawRotatedText()
     void DrawAnyText(const wxString& text, wxCoord x, wxCoord y);
 
-    // common part of DoSetClippingRegion() and DoSetDeviceClippingRegion()
+    // common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
     void SetClippingHrgn(WXHRGN hrgn);
 
     // implementation of DoGetSize() for wxScreen/PrinterDC: this simply
@@ -318,12 +291,12 @@ protected:
 #endif // wxUSE_PALETTE
 
 #if wxUSE_DC_CACHEING
-    static wxObjectList     sm_bitmapCache;
-    static wxObjectList     sm_dcCache;
+    static wxList     sm_bitmapCache;
+    static wxList     sm_dcCache;
 #endif
 
-    DECLARE_CLASS(wxMSWDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxMSWDCImpl);
+    DECLARE_DYNAMIC_CLASS(wxDC)
+    DECLARE_NO_COPY_CLASS(wxDC)
 };
 
 // ----------------------------------------------------------------------------
@@ -331,27 +304,28 @@ protected:
 // only/mainly)
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDCTempImpl : public wxMSWDCImpl
+class WXDLLEXPORT wxDCTemp : public wxDC
 {
 public:
     // construct a temporary DC with the specified HDC and size (it should be
     // specified whenever we know it for this HDC)
-    wxDCTempImpl(wxDC *owner, WXHDC hdc, const wxSize& size )
-        : wxMSWDCImpl( owner, hdc ),
+    wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize)
+        : wxDC(hdc),
           m_size(size)
     {
     }
 
-    virtual ~wxDCTempImpl()
+    virtual ~wxDCTemp()
     {
         // prevent base class dtor from freeing it
         SetHDC((WXHDC)NULL);
     }
 
+protected:
     virtual void DoGetSize(int *w, int *h) const
     {
         wxASSERT_MSG( m_size.IsFullySpecified(),
-                      wxT("size of this DC hadn't been set and is unknown") );
+                      _T("size of this DC hadn't been set and is unknown") );
 
         if ( w )
             *w = m_size.x;
@@ -364,16 +338,7 @@ private:
     // find it ourselves
     const wxSize m_size;
 
-    wxDECLARE_NO_COPY_CLASS(wxDCTempImpl);
-};
-
-class WXDLLIMPEXP_CORE wxDCTemp : public wxDC
-{
-public:
-    wxDCTemp(WXHDC hdc, const wxSize& size = wxDefaultSize)
-        : wxDC(new wxDCTempImpl(this, hdc, size))
-    {
-    }
+    DECLARE_NO_COPY_CLASS(wxDCTemp)
 };
 
 #endif // _WX_MSW_DC_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/dcclient.h b/Source/3rd Party/wx/include/wx/msw/dcclient.h
index 6f1b77e6a..e01171e3e 100644
--- a/Source/3rd Party/wx/include/wx/msw/dcclient.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dcclient.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/dcclient.h
+// Name:        dcclient.h
 // Purpose:     wxClientDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcclient.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,8 +17,6 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/dc.h"
-#include "wx/msw/dc.h"
-#include "wx/dcclient.h"
 #include "wx/dynarray.h"
 
 // ----------------------------------------------------------------------------
@@ -34,54 +32,56 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
 // DC classes
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMSWDCImpl
+class WXDLLEXPORT wxWindowDC : public wxDC
 {
 public:
     // default ctor
-    wxWindowDCImpl( wxDC *owner );
+    wxWindowDC();
 
     // Create a DC corresponding to the whole window
-    wxWindowDCImpl( wxDC *owner, wxWindow *win );
-
-    virtual void DoGetSize(int *width, int *height) const;
+    wxWindowDC(wxWindow *win);
 
 protected:
     // initialize the newly created DC
     void InitDC();
 
-    DECLARE_CLASS(wxWindowDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
+    // override some base class virtuals
+    virtual void DoGetSize(int *width, int *height) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowDC)
 };
 
-class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
+class WXDLLEXPORT wxClientDC : public wxWindowDC
 {
 public:
     // default ctor
-    wxClientDCImpl( wxDC *owner );
+    wxClientDC();
 
     // Create a DC corresponding to the client area of the window
-    wxClientDCImpl( wxDC *owner, wxWindow *win );
+    wxClientDC(wxWindow *win);
 
-    virtual ~wxClientDCImpl();
-
-    virtual void DoGetSize(int *width, int *height) const;
+    virtual ~wxClientDC();
 
 protected:
     void InitDC();
 
-    DECLARE_CLASS(wxClientDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
+    // override some base class virtuals
+    virtual void DoGetSize(int *width, int *height) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxClientDC)
 };
 
-class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
+class WXDLLEXPORT wxPaintDC : public wxClientDC
 {
 public:
-    wxPaintDCImpl( wxDC *owner );
+    wxPaintDC();
 
     // Create a DC corresponding for painting the window in OnPaint()
-    wxPaintDCImpl( wxDC *owner, wxWindow *win );
+    wxPaintDC(wxWindow *win);
 
-    virtual ~wxPaintDCImpl();
+    virtual ~wxPaintDC();
 
     // find the entry for this DC in the cache (keyed by the window)
     static WXHDC FindDCInCache(wxWindow* win);
@@ -92,8 +92,8 @@ protected:
     // find the entry for this DC in the cache (keyed by the window)
     wxPaintDCInfo *FindInCache(size_t *index = NULL) const;
 
-    DECLARE_CLASS(wxPaintDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPaintDC)
 };
 
 /*
@@ -102,13 +102,16 @@ protected:
  * message. It is used in HandlePaint and need not be used by an application.
  */
 
-class WXDLLIMPEXP_CORE wxPaintDCEx : public wxPaintDC
+class WXDLLEXPORT wxPaintDCEx : public wxPaintDC
 {
 public:
     wxPaintDCEx(wxWindow *canvas, WXHDC dc);
+    virtual ~wxPaintDCEx();
+private:
+    int saveState;
 
     DECLARE_CLASS(wxPaintDCEx)
-    wxDECLARE_NO_COPY_CLASS(wxPaintDCEx);
+    DECLARE_NO_COPY_CLASS(wxPaintDCEx)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/msw/dcmemory.h b/Source/3rd Party/wx/include/wx/msw/dcmemory.h
index a4ef0f9d0..fced2bc4f 100644
--- a/Source/3rd Party/wx/include/wx/msw/dcmemory.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dcmemory.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcmemory.h 48236 2007-08-20 23:43:32Z KO $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,33 +12,33 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#include "wx/dcmemory.h"
-#include "wx/msw/dc.h"
+#include "wx/dcclient.h"
 
-class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxMSWDCImpl
+class WXDLLEXPORT wxMemoryDC : public wxDC, public wxMemoryDCBase
 {
 public:
-    wxMemoryDCImpl( wxMemoryDC *owner );
-    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
-    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); // Create compatible DC
+    wxMemoryDC() { CreateCompatible(NULL); Init(); }
+    wxMemoryDC(wxBitmap& bitmap) { CreateCompatible(NULL); Init(); SelectObject(bitmap); }
+    wxMemoryDC(wxDC *dc); // Create compatible DC
 
+
+protected:
     // override some base class virtuals
     virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoGetSize(int* width, int* height) const;
     virtual void DoSelect(const wxBitmap& bitmap);
 
-    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const
+    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const 
     { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );}
 
-protected:
     // create DC compatible with the given one or screen if dc == NULL
     bool CreateCompatible(wxDC *dc);
 
     // initialize the newly created DC
     void Init();
 
-    DECLARE_CLASS(wxMemoryDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMemoryDC)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/msw/dcprint.h b/Source/3rd Party/wx/include/wx/msw/dcprint.h
index 2f91ac8d3..948b52e45 100644
--- a/Source/3rd Party/wx/include/wx/msw/dcprint.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dcprint.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcprint.h 42522 2006-10-27 13:07:40Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,20 +14,19 @@
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
-#include "wx/dcprint.h"
+#include "wx/dc.h"
 #include "wx/cmndata.h"
-#include "wx/msw/dc.h"
 
-// ------------------------------------------------------------------------
-//    wxPrinterDCImpl
-//
-
-class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxMSWDCImpl
+class WXDLLEXPORT wxPrinterDC : public wxDC
 {
 public:
+    // Create a printer DC (obsolete function: use wxPrintData version now)
+    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = true, int orientation = wxPORTRAIT);
+
     // Create from print data
-    wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
-    wxPrinterDCImpl( wxPrinterDC *owner, WXHDC theDC );
+    wxPrinterDC(const wxPrintData& data);
+
+    wxPrinterDC(WXHDC theDC);
 
     // override some base class virtuals
     virtual bool StartDoc(const wxString& message);
@@ -35,7 +34,7 @@ public:
     virtual void StartPage();
     virtual void EndPage();
 
-    virtual wxRect GetPaperRect() const;
+    wxRect GetPaperRect();
 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
@@ -43,8 +42,7 @@ protected:
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
-                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-                        wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
     virtual void DoGetSize(int *w, int *h) const
     {
         GetDeviceSize(w, h);
@@ -57,25 +55,14 @@ protected:
     wxPrintData m_printData;
 
 private:
-    DECLARE_CLASS(wxPrinterDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPrinterDC)
 };
 
+// Gets an HDC for the default printer configuration
+// WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation);
+
 // Gets an HDC for the specified printer configuration
-WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& data);
-
-// ------------------------------------------------------------------------
-//    wxPrinterDCromHDC
-//
-
-class WXDLLIMPEXP_CORE wxPrinterDCFromHDC: public wxPrinterDC
-{
-public:
-    wxPrinterDCFromHDC( WXHDC theDC )
-        : wxPrinterDC(new wxPrinterDCImpl(this, theDC))
-    {
-    }
-};
+WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
diff --git a/Source/3rd Party/wx/include/wx/msw/dcscreen.h b/Source/3rd Party/wx/include/wx/msw/dcscreen.h
index c0c07eeb7..89c83ae7f 100644
--- a/Source/3rd Party/wx/include/wx/msw/dcscreen.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dcscreen.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcscreen.h 36565 2005-12-25 12:52:53Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,22 +12,28 @@
 #ifndef _WX_MSW_DCSCREEN_H_
 #define _WX_MSW_DCSCREEN_H_
 
-#include "wx/dcscreen.h"
-#include "wx/msw/dc.h"
+#include "wx/dc.h"
 
-class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxMSWDCImpl
+class WXDLLEXPORT wxScreenDC : public wxDC
 {
 public:
     // Create a DC representing the whole screen
-    wxScreenDCImpl( wxScreenDC *owner );
+    wxScreenDC();
 
+    // Compatibility with X's requirements for drawing on top of all windows:
+    // they don't do anything under MSW
+    static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; }
+    static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return true; }
+    static bool EndDrawingOnTop() { return true; }
+
+protected:
     virtual void DoGetSize(int *w, int *h) const
     {
         GetDeviceSize(w, h);
     }
 
-    DECLARE_CLASS(wxScreenDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxScreenDC)
 };
 
 #endif // _WX_MSW_DCSCREEN_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/dde.h b/Source/3rd Party/wx/include/wx/msw/dde.h
index d3414a8d6..fe8f23c2f 100644
--- a/Source/3rd Party/wx/include/wx/msw/dde.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dde.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/dde.h
+// Name:        dde.h
 // Purpose:     DDE class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dde.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -41,98 +41,104 @@
 class WXDLLIMPEXP_FWD_BASE wxDDEServer;
 class WXDLLIMPEXP_FWD_BASE wxDDEClient;
 
-class WXDLLIMPEXP_BASE wxDDEConnection : public wxConnectionBase
+class WXDLLIMPEXP_BASE wxDDEConnection: public wxConnectionBase
 {
+  DECLARE_DYNAMIC_CLASS(wxDDEConnection)
 public:
-  wxDDEConnection(void *buffer, size_t size); // use external buffer
+  wxDDEConnection(wxChar *buffer, int size); // use external buffer
   wxDDEConnection(); // use internal buffer
-  virtual ~wxDDEConnection();
+  virtual ~wxDDEConnection(void);
 
-  // implement base class pure virtual methods
-  virtual const void *Request(const wxString& item,
-                              size_t *size = NULL,
-                              wxIPCFormat format = wxIPC_TEXT);
+  // Calls that CLIENT can make
+  virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
+  virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); }
+  virtual wxChar *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT);
+  virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
   virtual bool StartAdvise(const wxString& item);
   virtual bool StopAdvise(const wxString& item);
-  virtual bool Disconnect();
 
-protected:
-  virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format);
-  virtual bool DoPoke(const wxString& item, const void *data, size_t size,
-                      wxIPCFormat format);
-  virtual bool DoAdvise(const wxString& item, const void *data, size_t size,
-                        wxIPCFormat format);
+  // Calls that SERVER can make
+  virtual bool Advise(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
 
-public:
+  // Calls that both can make
+  virtual bool Disconnect(void);
+
+  // Default behaviour is to delete connection and return true
+  virtual bool OnDisconnect(void);
+
+ public:
   wxString      m_topicName;
   wxDDEServer*  m_server;
   wxDDEClient*  m_client;
 
   WXHCONV       m_hConv;
-  const void*   m_sendingData;
+  wxChar*       m_sendingData;
   int           m_dataSize;
-  wxIPCFormat   m_dataType;
+  wxIPCFormat  m_dataType;
 
-  wxDECLARE_NO_COPY_CLASS(wxDDEConnection);
-  DECLARE_DYNAMIC_CLASS(wxDDEConnection)
+    DECLARE_NO_COPY_CLASS(wxDDEConnection)
 };
 
-class WXDLLIMPEXP_BASE wxDDEServer : public wxServerBase
+class WXDLLIMPEXP_BASE wxDDEServer: public wxServerBase
 {
-public:
-    wxDDEServer();
-    bool Create(const wxString& server_name);
-    virtual ~wxDDEServer();
+  DECLARE_DYNAMIC_CLASS(wxDDEServer)
+ public:
 
-    virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
+  wxDDEServer(void);
+  virtual ~wxDDEServer(void);
+  bool Create(const wxString& server_name); // Returns false if can't create server (e.g. port
+                                  // number is already in use)
+  virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
 
-    // Find/delete wxDDEConnection corresponding to the HCONV
-    wxDDEConnection *FindConnection(WXHCONV conv);
-    bool DeleteConnection(WXHCONV conv);
-    wxString& GetServiceName() const { return (wxString&) m_serviceName; }
+  ////////////////////////////////////////////////////////////
+  // Implementation
 
-    wxDDEConnectionList& GetConnections() const
-        { return (wxDDEConnectionList&) m_connections; }
+  // Find/delete wxDDEConnection corresponding to the HCONV
+  wxDDEConnection *FindConnection(WXHCONV conv);
+  bool DeleteConnection(WXHCONV conv);
+  inline wxString& GetServiceName(void) const { return (wxString&) m_serviceName; }
+    inline wxDDEConnectionList& GetConnections(void) const
+    {
+        return (wxDDEConnectionList&) m_connections;
+    }
 
 protected:
     int       m_lastError;
     wxString  m_serviceName;
     wxDDEConnectionList m_connections;
-
-    DECLARE_DYNAMIC_CLASS(wxDDEServer)
 };
 
 class WXDLLIMPEXP_BASE wxDDEClient: public wxClientBase
 {
-public:
-    wxDDEClient();
-    virtual ~wxDDEClient();
+  DECLARE_DYNAMIC_CLASS(wxDDEClient)
+ public:
+  wxDDEClient(void);
+  virtual ~wxDDEClient(void);
+  bool ValidHost(const wxString& host);
+  virtual wxConnectionBase *MakeConnection(const wxString& host, const wxString& server, const wxString& topic);
+                                                // Call this to make a connection.
+                                                // Returns NULL if cannot.
+  virtual wxConnectionBase *OnMakeConnection(void); // Tailor this to return own connection.
 
-    bool ValidHost(const wxString& host);
+  ////////////////////////////////////////////////////////////
+  // Implementation
 
-    // Call this to make a connection. Returns NULL if cannot.
-    virtual wxConnectionBase *MakeConnection(const wxString& host,
-                                             const wxString& server,
-                                             const wxString& topic);
+  // Find/delete wxDDEConnection corresponding to the HCONV
+  wxDDEConnection *FindConnection(WXHCONV conv);
+  bool DeleteConnection(WXHCONV conv);
 
-    // Tailor this to return own connection.
-    virtual wxConnectionBase *OnMakeConnection();
-
-    // Find/delete wxDDEConnection corresponding to the HCONV
-    wxDDEConnection *FindConnection(WXHCONV conv);
-    bool DeleteConnection(WXHCONV conv);
-
-    wxDDEConnectionList& GetConnections() const
-        { return (wxDDEConnectionList&) m_connections; }
+    inline wxDDEConnectionList& GetConnections(void) const
+    {
+        return (wxDDEConnectionList&) m_connections;
+    }
 
 protected:
     int       m_lastError;
     wxDDEConnectionList m_connections;
-
-    DECLARE_DYNAMIC_CLASS(wxDDEClient)
 };
 
 void WXDLLIMPEXP_BASE wxDDEInitialize();
 void WXDLLIMPEXP_BASE wxDDECleanUp();
 
-#endif // _WX_DDE_H_
+#endif
+    // _WX_DDE_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/debughlp.h b/Source/3rd Party/wx/include/wx/msw/debughlp.h
index 61c944c22..65ca85d82 100644
--- a/Source/3rd Party/wx/include/wx/msw/debughlp.h	
+++ b/Source/3rd Party/wx/include/wx/msw/debughlp.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/debughlp.h
+// Name:        wx/msw/wrapdbgh.h
 // Purpose:     wraps dbghelp.h standard file
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-08 (extracted from msw/crashrpt.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: debughlp.h 31443 2005-01-18 10:10:23Z ABX $
 // Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -146,9 +146,9 @@ public:
                                        PGET_MODULE_BASE_ROUTINE,
                                        PTRANSLATE_ADDRESS_ROUTINE);
     typedef BOOL (WINAPI *SymFromAddr_t)(HANDLE, DWORD64, PDWORD64, PSYMBOL_INFO);
-    typedef LPVOID (WINAPI *SymFunctionTableAccess_t)(HANDLE, DWORD_PTR);
-    typedef DWORD_PTR (WINAPI *SymGetModuleBase_t)(HANDLE, DWORD_PTR);
-    typedef BOOL (WINAPI *SymGetLineFromAddr_t)(HANDLE, DWORD_PTR,
+    typedef LPVOID (WINAPI *SymFunctionTableAccess_t)(HANDLE, DWORD);
+    typedef DWORD (WINAPI *SymGetModuleBase_t)(HANDLE, DWORD);
+    typedef BOOL (WINAPI *SymGetLineFromAddr_t)(HANDLE, DWORD,
                                                 PDWORD, PIMAGEHLP_LINE);
     typedef BOOL (WINAPI *SymSetContext_t)(HANDLE, PIMAGEHLP_STACK_FRAME,
                                            PIMAGEHLP_CONTEXT);
@@ -164,44 +164,23 @@ public:
                                                CONST PMINIDUMP_USER_STREAM_INFORMATION,
                                                CONST PMINIDUMP_CALLBACK_INFORMATION);
 
-    // The macro called by wxDO_FOR_ALL_SYM_FUNCS() below takes 2 arguments:
-    // the name of the function in the program code, which never has "64"
-    // suffix, and the name of the function in the DLL which can have "64"
-    // suffix in some cases. These 2 helper macros call the macro with the
-    // correct arguments in both cases.
-    #define wxSYM_CALL(what, name)  what(name, name)
-#if defined(_M_AMD64)
-    #define wxSYM_CALL_64(what, name)  what(name, name ## 64)
-
-    // Also undo all the "helpful" definitions done by imagehlp.h that map 32
-    // bit functions to 64 bit ones, we don't need this as we do it ourselves.
-    #undef StackWalk
-    #undef SymFunctionTableAccess
-    #undef SymGetModuleBase
-    #undef SymGetLineFromAddr
-    #undef EnumerateLoadedModules
-#else
-    #define wxSYM_CALL_64(what, name)  what(name, name)
-#endif
-
     #define wxDO_FOR_ALL_SYM_FUNCS(what)                                      \
-        wxSYM_CALL_64(what, StackWalk);                                       \
-        wxSYM_CALL_64(what, SymFunctionTableAccess);                          \
-        wxSYM_CALL_64(what, SymGetModuleBase);                                \
-        wxSYM_CALL_64(what, SymGetLineFromAddr);                              \
-        wxSYM_CALL_64(what, EnumerateLoadedModules);                          \
-                                                                              \
-        wxSYM_CALL(what, SymGetOptions);                                      \
-        wxSYM_CALL(what, SymSetOptions);                                      \
-        wxSYM_CALL(what, SymInitialize);                                      \
-        wxSYM_CALL(what, SymFromAddr);                                        \
-        wxSYM_CALL(what, SymSetContext);                                      \
-        wxSYM_CALL(what, SymEnumSymbols);                                     \
-        wxSYM_CALL(what, SymGetTypeInfo);                                     \
-        wxSYM_CALL(what, SymCleanup);                                         \
-        wxSYM_CALL(what, MiniDumpWriteDump)
+        what(SymGetOptions);                                                  \
+        what(SymSetOptions);                                                  \
+        what(SymInitialize);                                                  \
+        what(StackWalk);                                                      \
+        what(SymFromAddr);                                                    \
+        what(SymFunctionTableAccess);                                         \
+        what(SymGetModuleBase);                                               \
+        what(SymGetLineFromAddr);                                             \
+        what(SymSetContext);                                                  \
+        what(SymEnumSymbols);                                                 \
+        what(SymGetTypeInfo);                                                 \
+        what(SymCleanup);                                                     \
+        what(EnumerateLoadedModules);                                         \
+        what(MiniDumpWriteDump)
 
-    #define wxDECLARE_SYM_FUNCTION(func, name) static func ## _t func
+    #define wxDECLARE_SYM_FUNCTION(func) static func ## _t func
 
     wxDO_FOR_ALL_SYM_FUNCS(wxDECLARE_SYM_FUNCTION);
 
diff --git a/Source/3rd Party/wx/include/wx/msw/dialog.h b/Source/3rd Party/wx/include/wx/msw/dialog.h
index 7822d7a05..15f8ba10f 100644
--- a/Source/3rd Party/wx/include/wx/msw/dialog.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dialog.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dialog.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,26 +14,17 @@
 
 #include "wx/panel.h"
 
-// this option is always enabled (there doesn't seem to be any good reason to
-// disable it) for desktop Windows versions but Windows CE dialogs are usually
-// not resizable and never show resize gripper anyhow so don't use it there
-#ifdef __WXWINCE__
-    #define wxUSE_DIALOG_SIZEGRIP 0
-#else
-    #define wxUSE_DIALOG_SIZEGRIP 1
-#endif
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
 
 #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
 class WXDLLIMPEXP_FWD_CORE wxToolBar;
-extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
 #endif
 
 // Dialog boxes
-class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
+class WXDLLEXPORT wxDialog : public wxDialogBase
 {
 public:
     wxDialog() { Init(); }
@@ -92,9 +83,7 @@ public:
     // override some base class virtuals
     virtual bool Show(bool show = true);
 
-#if wxUSE_DIALOG_SIZEGRIP
-    virtual void SetWindowStyleFlag(long style);
-#endif // wxUSE_DIALOG_SIZEGRIP
+    virtual void Raise();
 
 #ifdef __POCKETPC__
     // Responds to the OK button in a PocketPC titlebar. This
@@ -107,26 +96,34 @@ public:
     // Windows callbacks
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
+#if WXWIN_COMPATIBILITY_2_6
+    // use the other ctor
+    wxDEPRECATED( wxDialog(wxWindow *parent,
+             const wxString& title, bool modal,
+             int x = wxDefaultCoord, int y = wxDefaultCoord, int width = 500, int height = 500,
+             long style = wxDEFAULT_DIALOG_STYLE,
+             const wxString& name = wxDialogNameStr) );
+
+    // just call Show() or ShowModal()
+    wxDEPRECATED( void SetModal(bool flag) );
+
+    // use IsModal()
+    wxDEPRECATED( bool IsModalShowing() const );
+#endif // WXWIN_COMPATIBILITY_2_6
+
 protected:
+    // find the window to use as parent for this dialog if none has been
+    // specified explicitly by the user
+    //
+    // may return NULL
+    wxWindow *FindSuitableParent() const;
+
     // common part of all ctors
     void Init();
 
 private:
-#if wxUSE_DIALOG_SIZEGRIP
-    // these functions deal with the gripper window shown in the corner of
-    // resizable dialogs
-    void CreateGripper();
-    void DestroyGripper();
-    void ShowGripper(bool show);
-    void ResizeGripper();
-
-    // this function is used to adjust Z-order of new children relative to the
-    // gripper if we have one
-    void OnWindowCreate(wxWindowCreateEvent& event);
-
-    // gripper window for a resizable dialog, NULL if we're not resizable
-    WXHWND m_hGripper;
-#endif // wxUSE_DIALOG_SIZEGRIP
+    wxWindow*   m_oldFocus;
+    bool        m_endModalCalled; // allow for closing within InitDialog
 
 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     wxToolBar*  m_dialogToolBar;
@@ -136,7 +133,7 @@ private:
     wxDialogModalData *m_modalData;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
-    wxDECLARE_NO_COPY_CLASS(wxDialog);
+    DECLARE_NO_COPY_CLASS(wxDialog)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/msw/dib.h b/Source/3rd Party/wx/include/wx/msw/dib.h
index af8ae120a..71ae02bb7 100644
--- a/Source/3rd Party/wx/include/wx/msw/dib.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dib.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dib.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) 1997-2003 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,21 +12,18 @@
 #ifndef _WX_MSW_DIB_H_
 #define _WX_MSW_DIB_H_
 
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 #include "wx/msw/private.h"
 
 #if wxUSE_WXDIB
 
-#ifdef __WXMSW__
-    #include "wx/bitmap.h"
-#endif // __WXMSW__
-
 // ----------------------------------------------------------------------------
 // wxDIB: represents a DIB section
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDIB
+class WXDLLEXPORT wxDIB
 {
 public:
     // ctors and such
@@ -40,11 +37,9 @@ public:
     wxDIB(int width, int height, int depth)
         { Init(); (void)Create(width, height, depth); }
 
-#ifdef __WXMSW__
     // create a DIB from the DDB
     wxDIB(const wxBitmap& bmp)
         { Init(); (void)Create(bmp); }
-#endif // __WXMSW__
 
     // create a DIB from the Windows DDB
     wxDIB(HBITMAP hbmp)
@@ -58,9 +53,7 @@ public:
 
     // same as the corresponding ctors but with return value
     bool Create(int width, int height, int depth);
-#ifdef __WXMSW__
-    bool Create(const wxBitmap& bmp) { return Create(GetHbitmapOf(bmp)); }
-#endif
+    bool Create(const wxBitmap& bmp);
     bool Create(HBITMAP hbmp);
     bool Load(const wxString& filename);
 
@@ -145,28 +138,12 @@ public:
     // ------------------
 
 #if wxUSE_IMAGE
-    // Possible formats for DIBs created by the functions below.
-    enum PixelFormat
-    {
-        PixelFormat_PreMultiplied = 0,
-        PixelFormat_NotPreMultiplied = 1
-    };
-
-    // Create a DIB from the given image, the DIB will be either 24 or 32 (if
-    // the image has alpha channel) bpp.
-    //
-    // By default the DIB stores pixel data in pre-multiplied format so that it
-    // can be used with ::AlphaBlend() but it is also possible to disable
-    // pre-multiplication for the DIB to be usable with ImageList_Draw() which
-    // does pre-multiplication internally.
-    wxDIB(const wxImage& image, PixelFormat pf = PixelFormat_PreMultiplied)
-    {
-        Init();
-        (void)Create(image, pf);
-    }
+    // create a DIB from the given image, the DIB will be either 24 or 32 (if
+    // the image has alpha channel) bpp
+    wxDIB(const wxImage& image) { Init(); (void)Create(image); }
 
     // same as the above ctor but with the return code
-    bool Create(const wxImage& image, PixelFormat pf = PixelFormat_PreMultiplied);
+    bool Create(const wxImage& image);
 
     // create wxImage having the same data as this DIB
     wxImage ConvertToImage() const;
@@ -223,6 +200,11 @@ private:
     // the case
     bool m_ownsHandle;
 
+    // if true, we have alpha, if false we don't (note that we can still have
+    // m_depth == 32 but the last component is then simply padding and not
+    // alpha)
+    bool m_hasAlpha;
+
 
     // DIBs can't be copied
     wxDIB(const wxDIB&);
@@ -238,6 +220,7 @@ void wxDIB::Init()
 {
     m_handle = 0;
     m_ownsHandle = true;
+    m_hasAlpha = false;
 
     m_data = NULL;
 
diff --git a/Source/3rd Party/wx/include/wx/msw/dirdlg.h b/Source/3rd Party/wx/include/wx/msw/dirdlg.h
index 825c3b75d..8e27d57e3 100644
--- a/Source/3rd Party/wx/include/wx/msw/dirdlg.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dirdlg.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dirdlg.h 38956 2006-04-30 09:44:29Z RR $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
-class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
+class WXDLLEXPORT wxDirDialog : public wxDirDialogBase
 {
 public:
     wxDirDialog(wxWindow *parent,
@@ -28,11 +28,6 @@ public:
     virtual int ShowModal();
 
 private:
-    // The real implementations of ShowModal(), used for Windows versions
-    // before and since Vista.
-    int ShowSHBrowseForFolder(WXHWND owner);
-    int ShowIFileDialog(WXHWND owner);
-
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDirDialog)
 };
 
diff --git a/Source/3rd Party/wx/include/wx/msw/dragimag.h b/Source/3rd Party/wx/include/wx/msw/dragimag.h
index 03211aac5..ce944200e 100644
--- a/Source/3rd Party/wx/include/wx/msw/dragimag.h	
+++ b/Source/3rd Party/wx/include/wx/msw/dragimag.h	
@@ -5,7 +5,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     08/04/99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dragimag.h 45845 2007-05-05 19:00:35Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,7 @@
  * wxDragImage
  */
 
-class WXDLLIMPEXP_CORE wxDragImage: public wxObject
+class WXDLLEXPORT wxDragImage: public wxObject
 {
 public:
 
@@ -114,6 +114,14 @@ public:
         Create(image, cursor);
     }
 
+    // Deprecated form of the above
+    wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
+    {
+        Init();
+
+        Create(image, cursor, cursorHotspot);
+    }
+
     wxDragImage(const wxIcon& image, const wxCursor& cursor = wxNullCursor)
     {
         Init();
@@ -121,6 +129,14 @@ public:
         Create(image, cursor);
     }
 
+    // Deprecated form of the above
+    wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot)
+    {
+        Init();
+
+        Create(image, cursor, cursorHotspot);
+    }
+
     wxDragImage(const wxString& str, const wxCursor& cursor = wxNullCursor)
     {
         Init();
@@ -128,6 +144,14 @@ public:
         Create(str, cursor);
     }
 
+    // Deprecated form of the above
+    wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot)
+    {
+        Init();
+
+        Create(str, cursor, cursorHotspot);
+    }
+
 #if wxUSE_TREECTRL
     wxDragImage(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
     {
@@ -156,12 +180,27 @@ public:
 
     // Create a drag image from a bitmap and optional cursor
     bool Create(const wxBitmap& image, const wxCursor& cursor = wxNullCursor);
+    bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+    {
+        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
+        return Create(image, cursor);
+    }
 
     // Create a drag image from an icon and optional cursor
     bool Create(const wxIcon& image, const wxCursor& cursor = wxNullCursor);
+    bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+    {
+        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
+        return Create(image, cursor);
+    }
 
     // Create a drag image from a string and optional cursor
     bool Create(const wxString& str, const wxCursor& cursor = wxNullCursor);
+    bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
+    {
+        wxLogDebug(wxT("wxDragImage::Create: use of a cursor hotspot is now deprecated. Please omit this argument."));
+        return Create(str, cursor);
+    }
 
 #if wxUSE_TREECTRL
     // Create a drag image for the given tree control item
@@ -175,7 +214,7 @@ public:
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image.
-    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = NULL);
+    bool BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullScreen = false, wxRect* rect = (wxRect*) NULL);
 
     // Begin drag. hotspot is the location of the drag position relative to the upper-left
     // corner of the image. This is full screen only. fullScreenRect gives the
@@ -209,16 +248,6 @@ public:
     WXHIMAGELIST GetCursorHIMAGELIST() const { return m_hCursorImageList; }
 #endif
 
-    // don't use in new code, use versions without hot spot parameter
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED_CONSTRUCTOR( wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-    wxDEPRECATED( bool Create(const wxString& str, const wxCursor& cursor, const wxPoint& cursorHotspot) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
 protected:
     WXHIMAGELIST    m_hImageList;
 
@@ -237,7 +266,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDragImage)
-    wxDECLARE_NO_COPY_CLASS(wxDragImage);
+    DECLARE_NO_COPY_CLASS(wxDragImage)
 };
 
 #endif // wxUSE_DRAGIMAGE
diff --git a/Source/3rd Party/wx/include/wx/msw/enhmeta.h b/Source/3rd Party/wx/include/wx/msw/enhmeta.h
index d2c7e1dce..59631b5af 100644
--- a/Source/3rd Party/wx/include/wx/msw/enhmeta.h	
+++ b/Source/3rd Party/wx/include/wx/msw/enhmeta.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.01.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: enhmeta.h 60850 2009-06-01 10:16:13Z JS $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -13,22 +13,24 @@
 #define _WX_MSW_ENHMETA_H_
 
 #include "wx/dc.h"
-#include "wx/gdiobj.h"
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dataobj.h"
 #endif
 
+// Change this to 1 if you set wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW to 1 in prntbase.cpp
+#define wxUSE_ENH_METAFILE_FROM_DC 0
+
 // ----------------------------------------------------------------------------
 // wxEnhMetaFile: encapsulation of Win32 HENHMETAFILE
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxEnhMetaFile : public wxGDIObject
+class WXDLLEXPORT wxEnhMetaFile : public wxObject
 {
 public:
     wxEnhMetaFile(const wxString& file = wxEmptyString) : m_filename(file)
         { Init(); }
-    wxEnhMetaFile(const wxEnhMetaFile& metafile) : wxGDIObject()
+    wxEnhMetaFile(const wxEnhMetaFile& metafile) : wxObject()
         { Init(); Assign(metafile); }
     wxEnhMetaFile& operator=(const wxEnhMetaFile& metafile)
         { Free(); Assign(metafile); return *this; }
@@ -37,10 +39,11 @@ public:
         { Free(); }
 
     // display the picture stored in the metafile on the given DC
-    bool Play(wxDC *dc, wxRect *rectBound = NULL);
+    bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL);
 
     // accessors
-    virtual bool IsOk() const { return m_hMF != 0; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_hMF != 0; }
 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }
@@ -62,11 +65,6 @@ protected:
     void Free();
     void Assign(const wxEnhMetaFile& mf);
 
-    // we don't use these functions (but probably should) but have to implement
-    // them as they're pure virtual in the base class
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
 private:
     wxString m_filename;
     WXHANDLE m_hMF;
@@ -78,7 +76,7 @@ private:
 // wxEnhMetaFileDC: allows to create a wxEnhMetaFile
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxEnhMetaFileDC : public wxDC
+class WXDLLEXPORT wxEnhMetaFileDC : public wxDC
 {
 public:
     // the ctor parameters specify the filename (empty for memory metafiles),
@@ -87,18 +85,28 @@ public:
                     int width = 0, int height = 0,
                     const wxString& description = wxEmptyString);
 
+#if wxUSE_ENH_METAFILE_FROM_DC
     // as above, but takes reference DC as first argument to take resolution,
     // size, font metrics etc. from
-    wxEXPLICIT
     wxEnhMetaFileDC(const wxDC& referenceDC,
                     const wxString& filename = wxEmptyString,
                     int width = 0, int height = 0,
                     const wxString& description = wxEmptyString);
+#endif
+
+    virtual ~wxEnhMetaFileDC();
 
     // obtain a pointer to the new metafile (caller should delete it)
     wxEnhMetaFile *Close();
 
+protected:
+    virtual void DoGetSize(int *width, int *height) const;
+
 private:
+    // size passed to ctor and returned by DoGetSize()
+    int m_width,
+        m_height;
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxEnhMetaFileDC)
 };
 
@@ -110,7 +118,7 @@ private:
 
 // notice that we want to support both CF_METAFILEPICT and CF_ENHMETAFILE and
 // so we derive from wxDataObject and not from wxDataObjectSimple
-class WXDLLIMPEXP_CORE wxEnhMetaFileDataObject : public wxDataObject
+class WXDLLEXPORT wxEnhMetaFileDataObject : public wxDataObject
 {
 public:
     // ctors
@@ -137,7 +145,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
-    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject);
+    DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject)
 };
 
 
@@ -148,7 +156,7 @@ protected:
 // CF_ENHMETAFILE
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple
+class WXDLLEXPORT wxEnhMetaFileSimpleDataObject : public wxDataObjectSimple
 {
 public:
     // ctors
@@ -180,7 +188,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
-    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject);
+    DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject)
 };
 
 #endif // wxUSE_DRAG_AND_DROP
diff --git a/Source/3rd Party/wx/include/wx/msw/evtloop.h b/Source/3rd Party/wx/include/wx/msw/evtloop.h
index f7d8fb8a7..d6f4312ac 100644
--- a/Source/3rd Party/wx/include/wx/msw/evtloop.h	
+++ b/Source/3rd Party/wx/include/wx/msw/evtloop.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-07-31
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: evtloop.h 36881 2006-01-15 10:13:40Z ABX $
 // Copyright:   (c) 2003-2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,51 +12,31 @@
 #ifndef _WX_MSW_EVTLOOP_H_
 #define _WX_MSW_EVTLOOP_H_
 
-#if wxUSE_GUI
-#include "wx/dynarray.h"
-#include "wx/msw/wrapwin.h"
 #include "wx/window.h"
-#endif
 
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxMSWEventLoopBase : public wxEventLoopManual
+class WXDLLEXPORT wxEventLoop : public wxEventLoopManual
 {
 public:
-    wxMSWEventLoopBase();
+    wxEventLoop();
 
     // implement base class pure virtuals
     virtual bool Pending() const;
+    virtual bool Dispatch();
 
-protected:
-    // get the next message from queue and return true or return false if we
-    // got WM_QUIT or an error occurred
-    bool GetNextMessage(WXMSG *msg);
-
-    // same as above but with a timeout and return value can be -1 meaning that
-    // time out expired in addition to
-    int GetNextMessageTimeout(WXMSG *msg, unsigned long timeout);
-};
-
-#if wxUSE_GUI
-
-WX_DECLARE_EXPORTED_OBJARRAY(MSG, wxMSGArray);
-
-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxMSWEventLoopBase
-{
-public:
-    wxGUIEventLoop() { }
-
-    // process a single message: calls PreProcessMessage() before dispatching
-    // it
-    virtual void ProcessMessage(WXMSG *msg);
+    // MSW-specific methods
+    // --------------------
 
     // preprocess a message, return true if processed (i.e. no further
     // dispatching required)
     virtual bool PreProcessMessage(WXMSG *msg);
 
+    // process a single message
+    virtual void ProcessMessage(WXMSG *msg);
+
     // set the critical window: this is the window such that all the events
     // except those to this window (and its children) stop to be processed
     // (typical examples: assert or crash report dialog)
@@ -72,48 +52,18 @@ public:
         return !ms_winCritical || IsChildOfCriticalWindow(win);
     }
 
-    // override/implement base class virtuals
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout);
-    virtual void WakeUp();
-    virtual bool YieldFor(long eventsToProcess);
-
 protected:
+    // override/implement base class virtuals
+    virtual void WakeUp();
     virtual void OnNextIteration();
 
-private:
     // check if the given window is a child of ms_winCritical (which must be
     // non NULL)
     static bool IsChildOfCriticalWindow(wxWindowMSW *win);
 
-    // array of messages used for temporary storage by YieldFor()
-    wxMSGArray m_arrMSG;
 
     // critical window or NULL
     static wxWindowMSW *ms_winCritical;
 };
 
-#else // !wxUSE_GUI
-
-#if wxUSE_CONSOLE_EVENTLOOP
-
-class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxMSWEventLoopBase
-{
-public:
-    wxConsoleEventLoop() { }
-
-    // override/implement base class virtuals
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout);
-    virtual void WakeUp();
-    virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
-
-    // MSW-specific function to process a single message
-    virtual void ProcessMessage(WXMSG *msg);
-};
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif // wxUSE_GUI/!wxUSE_GUI
-
 #endif // _WX_MSW_EVTLOOP_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/fdrepdlg.h b/Source/3rd Party/wx/include/wx/msw/fdrepdlg.h
index dc10512c5..1e534ae85 100644
--- a/Source/3rd Party/wx/include/wx/msw/fdrepdlg.h	
+++ b/Source/3rd Party/wx/include/wx/msw/fdrepdlg.h	
@@ -4,7 +4,7 @@
 // Author:      Markus Greither
 // Modified by: 31.07.01: VZ: integrated into wxWidgets
 // Created:     23/03/2001
-// RCS-ID:      $Id$
+// RCS-ID:
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
 // wxFindReplaceDialog: dialog for searching / replacing text
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFindReplaceDialog : public wxFindReplaceDialogBase
+class WXDLLEXPORT wxFindReplaceDialog : public wxFindReplaceDialogBase
 {
 public:
     // ctors and such
@@ -56,7 +56,7 @@ protected:
     wxFindReplaceDialogImpl *m_impl;
 
     DECLARE_DYNAMIC_CLASS(wxFindReplaceDialog)
-    wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialog);
+    DECLARE_NO_COPY_CLASS(wxFindReplaceDialog)
 };
 
 #endif // _WX_MSW_FDREPDLG_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/filedlg.h b/Source/3rd Party/wx/include/wx/msw/filedlg.h
index de4416634..4608a2ed9 100644
--- a/Source/3rd Party/wx/include/wx/msw/filedlg.h	
+++ b/Source/3rd Party/wx/include/wx/msw/filedlg.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filedlg.h 39402 2006-05-28 23:32:12Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
 // wxFileDialog
 //-------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
+class WXDLLEXPORT wxFileDialog: public wxFileDialogBase
 {
 public:
     wxFileDialog(wxWindow *parent,
@@ -29,40 +29,26 @@ public:
                  const wxSize& sz = wxDefaultSize,
                  const wxString& name = wxFileDialogNameStr);
 
+    virtual void SetPath(const wxString& path);
     virtual void GetPaths(wxArrayString& paths) const;
     virtual void GetFilenames(wxArrayString& files) const;
-#ifndef __WXWINCE__
-    virtual bool SupportsExtraControl() const { return true; }
-    void MSWOnInitDialogHook(WXHWND hwnd);
-#endif // __WXWINCE__
 
     virtual int ShowModal();
 
-    // wxMSW-specific implementation from now on
-    // -----------------------------------------
-
-    // called from the hook procedure on CDN_INITDONE reception
-    virtual void MSWOnInitDone(WXHWND hDlg);
-
 protected:
 
 #if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
     virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual void DoCentre(int dir);
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoGetPosition( int *x, int *y ) const;
 #endif // !(__SMARTPHONE__ && __WXWINCE__)
 
 private:
     wxArrayString m_fileNames;
-
-    // remember if our SetPosition() or Centre() (which requires special
-    // treatment) was called
     bool m_bMovedWindow;
-    int m_centreDir;        // nothing to do if 0
 
     DECLARE_DYNAMIC_CLASS(wxFileDialog)
-    wxDECLARE_NO_COPY_CLASS(wxFileDialog);
+    DECLARE_NO_COPY_CLASS(wxFileDialog)
 };
 
 #endif // _WX_FILEDLG_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/font.h b/Source/3rd Party/wx/include/wx/msw/font.h
index 576d7f83d..925355dfb 100644
--- a/Source/3rd Party/wx/include/wx/msw/font.h	
+++ b/Source/3rd Party/wx/include/wx/msw/font.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: font.h 39411 2006-05-29 00:03:36Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,13 +18,12 @@
 // wxFont
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFont : public wxFontBase
+class WXDLLEXPORT wxFont : public wxFontBase
 {
 public:
     // ctors and such
     wxFont() { }
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
            int style,
@@ -33,34 +32,9 @@ public:
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
-        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
-    }
-#endif
-
-    wxFont(int size,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(size, family, style, weight, underlined, face, encoding);
+        (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
-    bool Create(int size,
-                wxFontFamily family,
-                wxFontStyle style,
-                wxFontWeight weight,
-                bool underlined = false,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        return DoCreate(size, wxDefaultSize, false, family, style,
-                        weight, underlined, face, encoding);
-    }
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
     wxFont(const wxSize& pixelSize,
            int family,
            int style,
@@ -68,19 +42,6 @@ public:
            bool underlined = false,
            const wxString& face = wxEmptyString,
            wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        (void)Create(pixelSize, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight,
-                     underlined, face, encoding);
-    }
-#endif
-
-    wxFont(const wxSize& pixelSize,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
     {
         (void)Create(pixelSize, family, style, weight,
                      underlined, face, encoding);
@@ -91,19 +52,24 @@ public:
         Create(info, hFont);
     }
 
-    wxFont(int pointSize,
-           wxFontFamily family,
-           int flags = wxFONTFLAG_DEFAULT,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
     wxFont(const wxString& fontDesc);
 
+    bool Create(int size,
+                int family,
+                int style,
+                int weight,
+                bool underlined = false,
+                const wxString& face = wxEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        return DoCreate(size, wxDefaultSize, false, family, style,
+                        weight, underlined, face, encoding);
+    }
 
     bool Create(const wxSize& pixelSize,
-                wxFontFamily family,
-                wxFontStyle style,
-                wxFontWeight weight,
+                int family,
+                int style,
+                int weight,
                 bool underlined = false,
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
@@ -116,30 +82,31 @@ public:
 
     virtual ~wxFont();
 
+    // wxFontBase overridden functions
+    virtual wxString GetNativeFontInfoDesc() const;
+    virtual wxString GetNativeFontInfoUserDesc() const;
+
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual wxSize GetPixelSize() const;
     virtual bool IsUsingSizeInPixels() const;
-    virtual wxFontStyle GetStyle() const;
-    virtual wxFontWeight GetWeight() const;
+    virtual int GetFamily() const;
+    virtual int GetStyle() const;
+    virtual int GetWeight() const;
     virtual bool GetUnderlined() const;
-    virtual bool GetStrikethrough() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
     virtual const wxNativeFontInfo *GetNativeFontInfo() const;
 
     virtual void SetPointSize(int pointSize);
     virtual void SetPixelSize(const wxSize& pixelSize);
-    virtual void SetFamily(wxFontFamily family);
-    virtual void SetStyle(wxFontStyle style);
-    virtual void SetWeight(wxFontWeight weight);
+    virtual void SetFamily(int family);
+    virtual void SetStyle(int style);
+    virtual void SetWeight(int weight);
     virtual bool SetFaceName(const wxString& faceName);
     virtual void SetUnderlined(bool underlined);
-    virtual void SetStrikethrough(bool strikethrough);
     virtual void SetEncoding(wxFontEncoding encoding);
 
-    wxDECLARE_COMMON_FONT_METHODS();
-
     virtual bool IsFixedWidth() const;
 
     // implementation only from now on
@@ -153,24 +120,26 @@ public:
     // for consistency with other wxMSW classes
     WXHFONT GetHFONT() const;
 
+    /*
+       virtual bool UseResource();
+       virtual bool ReleaseResource();
+     */
+
 protected:
     // real font creation function, used in all cases
     bool DoCreate(int size,
                   const wxSize& pixelSize,
                   bool sizeUsingPixels,
-                  wxFontFamily family,
-                  wxFontStyle style,
-                  wxFontWeight weight,
+                  int family,
+                  int style,
+                  int weight,
                   bool underlined = false,
                   const wxString& face = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
-    virtual wxFontFamily DoGetFamily() const;
 
-    // implement wxObject virtuals which are used by AllocExclusive()
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    void Unshare();
 
 private:
     DECLARE_DYNAMIC_CLASS(wxFont)
diff --git a/Source/3rd Party/wx/include/wx/msw/fontdlg.h b/Source/3rd Party/wx/include/wx/msw/fontdlg.h
index 59904f3af..f3c3562d3 100644
--- a/Source/3rd Party/wx/include/wx/msw/fontdlg.h	
+++ b/Source/3rd Party/wx/include/wx/msw/fontdlg.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontdlg.h 38448 2006-03-30 14:04:17Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
 // wxFontDialog
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase
+class WXDLLEXPORT wxFontDialog : public wxFontDialogBase
 {
 public:
     wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
diff --git a/Source/3rd Party/wx/include/wx/msw/frame.h b/Source/3rd Party/wx/include/wx/msw/frame.h
index e532de97c..dc3a58be5 100644
--- a/Source/3rd Party/wx/include/wx/msw/frame.h	
+++ b/Source/3rd Party/wx/include/wx/msw/frame.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: frame.h 45498 2007-04-16 13:03:05Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
-class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
+class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 public:
     // construction
@@ -42,6 +42,7 @@ public:
 
     // implement base class pure virtuals
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual void Raise();
 
     // implementation only from now on
     // -------------------------------
@@ -59,7 +60,7 @@ public:
     // Status bar
 #if wxUSE_STATUSBAR
     virtual wxStatusBar* OnCreateStatusBar(int number = 1,
-                                           long style = wxSTB_DEFAULT_STYLE,
+                                           long style = wxST_SIZEGRIP,
                                            wxWindowID id = 0,
                                            const wxString& name = wxStatusLineNameStr);
 
@@ -74,10 +75,16 @@ public:
         { return m_useNativeStatusBar; }
 #endif // wxUSE_STATUSBAR
 
+#if wxUSE_MENUS
+    WXHMENU GetWinMenu() const { return m_hMenu; }
+#endif // wxUSE_MENUS
+
     // event handlers
+    bool HandlePaint();
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
+    bool HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup);
 
     // tooltip management
 #if wxUSE_TOOLTIPS
@@ -85,8 +92,9 @@ public:
     void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
 #endif // tooltips
 
-    // override the base class function to handle iconized/maximized frames
-    virtual void SendSizeEvent(int flags = 0);
+    // a MSW only function which sends a size event to the window using its
+    // current size - this has an effect of refreshing the window layout
+    virtual void SendSizeEvent();
 
     virtual wxPoint GetClientAreaOrigin() const;
 
@@ -101,12 +109,6 @@ public:
                                     WXWPARAM wParam,
                                     WXLPARAM lParam);
 
-#if wxUSE_MENUS
-    // get the currently active menu: this is the same as the frame menu for
-    // normal frames but is overridden by wxMDIParentFrame
-    virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; }
-#endif // wxUSE_MENUS
-
 protected:
     // common part of all ctors
     void Init();
@@ -131,17 +133,8 @@ protected:
     // wxMDIChildFrame
     bool MSWDoTranslateMessage(wxFrame *frame, WXMSG *msg);
 
-#if wxUSE_MENUS
-    // handle WM_EXITMENULOOP message for Win95 only
-    bool HandleExitMenuLoop(WXWORD isPopup);
-
-    // handle WM_(UN)INITMENUPOPUP message to generate wxEVT_MENU_OPEN/CLOSE
-    bool HandleMenuPopup(wxEventType evtType, WXHMENU hMenu);
-
-    // Command part of HandleMenuPopup() and HandleExitMenuLoop().
-    bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup);
-#endif // wxUSE_MENUS
-
+    // handle WM_INITMENUPOPUP message to generate wxEVT_MENU_OPEN
+    bool HandleInitMenuPopup(WXHMENU hMenu);
 
     virtual bool IsMDIChild() const { return false; }
 
diff --git a/Source/3rd Party/wx/include/wx/msw/fswatcher.h b/Source/3rd Party/wx/include/wx/msw/fswatcher.h
deleted file mode 100644
index 2937a0d6f..000000000
--- a/Source/3rd Party/wx/include/wx/msw/fswatcher.h	
+++ /dev/null
@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/fswatcher.h
-// Purpose:     wxMSWFileSystemWatcher
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FSWATCHER_MSW_H_
-#define _WX_FSWATCHER_MSW_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_FSWATCHER
-
-class WXDLLIMPEXP_BASE wxMSWFileSystemWatcher : public wxFileSystemWatcherBase
-{
-public:
-    wxMSWFileSystemWatcher();
-
-    wxMSWFileSystemWatcher(const wxFileName& path,
-                           int events = wxFSW_EVENT_ALL);
-
-    // Override the base class function to provide a much more efficient
-    // implementation for it using the platform native support for watching the
-    // entire directory trees.
-    virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL,
-                         const wxString& filter = wxEmptyString);
-
-protected:
-    bool Init();
-};
-
-#endif // wxUSE_FSWATCHER
-
-#endif /* _WX_FSWATCHER_MSW_H_ */
diff --git a/Source/3rd Party/wx/include/wx/msw/gauge.h b/Source/3rd Party/wx/include/wx/msw/gauge95.h
similarity index 51%
rename from Source/3rd Party/wx/include/wx/msw/gauge.h
rename to Source/3rd Party/wx/include/wx/msw/gauge95.h
index bc887a4c4..c6c74df20 100644
--- a/Source/3rd Party/wx/include/wx/msw/gauge.h	
+++ b/Source/3rd Party/wx/include/wx/msw/gauge95.h	
@@ -1,78 +1,70 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/gauge.h
-// Purpose:     wxGauge implementation for MSW
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_GAUGE_H_
-#define _WX_MSW_GAUGE_H_
-
-#if wxUSE_GAUGE
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[];
-
-// Group box
-class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase
-{
-public:
-    wxGauge() { }
-
-    wxGauge(wxWindow *parent,
-            wxWindowID id,
-            int range,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxGA_HORIZONTAL,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxGaugeNameStr)
-    {
-        (void)Create(parent, id, range, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                int range,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxGA_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxGaugeNameStr);
-
-    // set gauge range/value
-    virtual void SetRange(int range);
-    virtual void SetValue(int pos);
-
-    // overridden base class virtuals
-    virtual bool SetForegroundColour(const wxColour& col);
-    virtual bool SetBackgroundColour(const wxColour& col);
-
-    virtual void Pulse();
-
-    WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-private:
-    // returns true if the control is currently in indeterminate (a.k.a.
-    // "marquee") mode
-    bool IsInIndeterminateMode() const;
-
-    // switch to/from indeterminate mode
-    void SetIndeterminateMode();
-    void SetDeterminateMode();
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)
-};
-
-#endif // wxUSE_GAUGE
-
-#endif // _WX_MSW_GAUGE_H_
+/////////////////////////////////////////////////////////////////////////////
+// Name:        gauge95.h
+// Purpose:     wxGauge95 class
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: gauge95.h 43881 2006-12-09 19:48:21Z PC $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _GAUGE95_H_
+#define _GAUGE95_H_
+
+#if wxUSE_GAUGE
+
+extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
+
+// Group box
+class WXDLLEXPORT wxGauge95 : public wxGaugeBase
+{
+public:
+    wxGauge95() { }
+
+    wxGauge95(wxWindow *parent,
+              wxWindowID id,
+              int range,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxGA_HORIZONTAL,
+              const wxValidator& validator = wxDefaultValidator,
+              const wxString& name = wxGaugeNameStr)
+    {
+        (void)Create(parent, id, range, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                int range,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxGA_HORIZONTAL,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxGaugeNameStr);
+
+    // set gauge range/value
+    virtual void SetRange(int range);
+    virtual void SetValue(int pos);
+
+    // overriden base class virtuals
+    virtual bool SetForegroundColour(const wxColour& col);
+    virtual bool SetBackgroundColour(const wxColour& col);
+
+
+    void SetIndeterminateMode();
+    void SetDeterminateMode();
+    void Pulse();
+
+    WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge95)
+};
+
+#endif // wxUSE_GAUGE
+
+#endif
+    // _GAUGEMSW_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/gdiimage.h b/Source/3rd Party/wx/include/wx/msw/gdiimage.h
index 1118db1c9..d78f5b620 100644
--- a/Source/3rd Party/wx/include/wx/msw/gdiimage.h	
+++ b/Source/3rd Party/wx/include/wx/msw/gdiimage.h	
@@ -1,11 +1,11 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/gdiimage.h
+// Name:        include/wx/msw/gdiimage.h
 // Purpose:     wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
 //              under MSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.11.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: gdiimage.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@ WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
 // wxGDIImageRefData: common data fields for all derived classes
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData
+class WXDLLEXPORT wxGDIImageRefData : public wxGDIRefData
 {
 public:
     wxGDIImageRefData()
@@ -40,7 +40,7 @@ public:
         m_handle = 0;
     }
 
-    wxGDIImageRefData(const wxGDIImageRefData& data) : wxGDIRefData()
+    wxGDIImageRefData(const wxGDIImageRefData& data) : wxGDIRefData(data)
     {
         m_width = data.m_width;
         m_height = data.m_height;
@@ -51,7 +51,7 @@ public:
     }
 
     // accessors
-    virtual bool IsOk() const { return m_handle != 0; }
+    bool IsOk() const { return m_handle != 0; }
 
     void SetSize(int w, int h) { m_width = w; m_height = h; }
 
@@ -76,13 +76,58 @@ public:
     };
 };
 
+// ----------------------------------------------------------------------------
+// wxGDIImageHandler: a class which knows how to load/save wxGDIImages.
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGDIImageHandler : public wxObject
+{
+public:
+    // ctor
+    wxGDIImageHandler() { m_type = wxBITMAP_TYPE_INVALID; }
+    wxGDIImageHandler(const wxString& name,
+                      const wxString& ext,
+                      long type)
+        : m_name(name), m_extension(ext)
+    {
+        m_type = type;
+    }
+
+    // accessors
+    void SetName(const wxString& name) { m_name = name; }
+    void SetExtension(const wxString& ext) { m_extension = ext; }
+    void SetType(long type) { m_type = type; }
+
+    const wxString& GetName() const { return m_name; }
+    const wxString& GetExtension() const { return m_extension; }
+    long GetType() const { return m_type; }
+
+    // real handler operations: to implement in derived classes
+    virtual bool Create(wxGDIImage *image,
+                        const void* data,
+                        long flags,
+                        int width, int height, int depth = 1) = 0;
+    virtual bool Load(wxGDIImage *image,
+                      const wxString& name,
+                      long flags,
+                      int desiredWidth, int desiredHeight) = 0;
+    virtual bool Save(wxGDIImage *image,
+                      const wxString& name,
+                      int type) = 0;
+
+protected:
+    wxString  m_name;
+    wxString  m_extension;
+    long      m_type;
+};
+
 // ----------------------------------------------------------------------------
 // wxGDIImage: this class supports GDI image handlers which may be registered
 // dynamically and will be used for loading/saving the images in the specified
 // format. It also falls back to wxImage if no appropriate image is found.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject
+class WXDLLEXPORT wxGDIImage : public wxGDIObject
 {
 public:
     // handlers list interface
@@ -109,16 +154,13 @@ public:
     void SetHandle(WXHANDLE handle)
         { AllocExclusive(); GetGDIImageData()->m_handle = handle; }
 
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return GetHandle() != 0; }
+
     int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_width; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; }
     int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_depth; }
 
-    wxSize GetSize() const
-    {
-        return IsNull() ? wxSize(0,0) :
-               wxSize(GetGDIImageData()->m_width, GetGDIImageData()->m_height);
-    }
-
     void SetWidth(int w) { AllocExclusive(); GetGDIImageData()->m_width = w; }
     void SetHeight(int h) { AllocExclusive(); GetGDIImageData()->m_height = h; }
     void SetDepth(int d) { AllocExclusive(); GetGDIImageData()->m_depth = d; }
@@ -138,61 +180,10 @@ protected:
     // create the data for the derived class here
     virtual wxGDIImageRefData *CreateData() const = 0;
 
-    // implement the wxGDIObject method in terms of our, more specific, one
-    virtual wxGDIRefData *CreateGDIRefData() const { return CreateData(); }
-
-    // we can't [efficiently] clone objects of this class
-    virtual wxGDIRefData *
-    CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
-    {
-        wxFAIL_MSG( wxT("must be implemented if used") );
-
-        return NULL;
-    }
+    // implement the wxObject method in terms of our, more specific, one
+    virtual wxObjectRefData *CreateRefData() const { return CreateData(); }
 
     static wxGDIImageHandlerList ms_handlers;
 };
 
-// ----------------------------------------------------------------------------
-// wxGDIImageHandler: a class which knows how to load/save wxGDIImages.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject
-{
-public:
-    // ctor
-    wxGDIImageHandler() { m_type = wxBITMAP_TYPE_INVALID; }
-    wxGDIImageHandler(const wxString& name,
-                      const wxString& ext,
-                      wxBitmapType type)
-        : m_name(name), m_extension(ext), m_type(type) { }
-
-    // accessors
-    void SetName(const wxString& name) { m_name = name; }
-    void SetExtension(const wxString& ext) { m_extension = ext; }
-    void SetType(wxBitmapType type) { m_type = type; }
-
-    const wxString& GetName() const { return m_name; }
-    const wxString& GetExtension() const { return m_extension; }
-    wxBitmapType GetType() const { return m_type; }
-
-    // real handler operations: to implement in derived classes
-    virtual bool Create(wxGDIImage *image,
-                        const void* data,
-                        wxBitmapType flags,
-                        int width, int height, int depth = 1) = 0;
-    virtual bool Load(wxGDIImage *image,
-                      const wxString& name,
-                      wxBitmapType flags,
-                      int desiredWidth, int desiredHeight) = 0;
-    virtual bool Save(const wxGDIImage *image,
-                      const wxString& name,
-                      wxBitmapType type) const = 0;
-
-protected:
-    wxString  m_name;
-    wxString  m_extension;
-    wxBitmapType m_type;
-};
-
 #endif // _WX_MSW_GDIIMAGE_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/genrcdefs.h b/Source/3rd Party/wx/include/wx/msw/genrcdefs.h
index 68c6fc4ac..d96634cfe 100644
--- a/Source/3rd Party/wx/include/wx/msw/genrcdefs.h	
+++ b/Source/3rd Party/wx/include/wx/msw/genrcdefs.h	
@@ -2,7 +2,7 @@
  * Name:        wx/msw/genrcdefs.h
  * Purpose:     Emit preprocessor symbols into rcdefs.h for resource compiler
  * Author:      Mike Wetherell
- * RCS-ID:      $Id$
+ * RCS-ID:      $Id: genrcdefs.h 36133 2005-11-08 22:49:46Z MW $
  * Copyright:   (c) 2005 Mike Wetherell
  * Licence:     wxWindows licence
  */
diff --git a/Source/3rd Party/wx/include/wx/msw/gsockmsw.h b/Source/3rd Party/wx/include/wx/msw/gsockmsw.h
new file mode 100644
index 000000000..6e5486992
--- /dev/null
+++ b/Source/3rd Party/wx/include/wx/msw/gsockmsw.h	
@@ -0,0 +1,145 @@
+/* -------------------------------------------------------------------------
+ * Project:     GSocket (Generic Socket) for WX
+ * Name:        gsockmsw.h
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Purpose:     GSocket MSW header
+ * CVSID:       $Id: gsockmsw.h 33948 2005-05-04 18:57:50Z JS $
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef __GSOCK_MSW_H
+#define __GSOCK_MSW_H
+
+#ifndef __GSOCKET_STANDALONE__
+#include "wx/setup.h"
+#endif
+
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+
+#ifndef __GSOCKET_STANDALONE__
+#include "wx/gsocket.h"
+#else
+#include "gsocket.h"
+#endif
+
+#include "wx/msw/wrapwin.h"
+
+#if defined(__CYGWIN__)
+    //CYGWIN gives annoying warning about runtime stuff if we don't do this
+#   define USE_SYS_TYPES_FD_SET
+#   include <sys/types.h>
+#endif
+
+#if defined(__WXWINCE__) || defined(__CYGWIN__) || defined(__WXMSW__)
+#include <winsock.h>
+#endif
+
+class GSocketGUIFunctionsTableConcrete: public GSocketGUIFunctionsTable
+{
+public:
+    virtual bool OnInit();
+    virtual void OnExit();
+    virtual bool CanUseEventLoop();
+    virtual bool Init_Socket(GSocket *socket);
+    virtual void Destroy_Socket(GSocket *socket);
+    virtual void Enable_Events(GSocket *socket);
+    virtual void Disable_Events(GSocket *socket);
+};
+
+/* Definition of GSocket */
+class GSocket
+{
+public:
+  GSocket();
+  ~GSocket();
+  bool IsOk() { return m_ok; }
+  void Close();
+  void Shutdown();
+  GSocketError SetLocal(GAddress *address);
+  GSocketError SetPeer(GAddress *address);
+  GAddress *GetLocal();
+  GAddress *GetPeer();
+  GSocketError SetServer();
+  GSocket *WaitConnection();
+  bool SetReusable();
+  GSocketError Connect(GSocketStream stream);
+  GSocketError SetNonOriented();
+  int Read(char *buffer, int size);
+  int Write(const char *buffer, int size);
+  GSocketEventFlags Select(GSocketEventFlags flags);
+  void SetNonBlocking(bool non_block);
+  void SetTimeout(unsigned long millis);
+  GSocketError WXDLLIMPEXP_NET GetError();
+  void SetCallback(GSocketEventFlags flags,
+    GSocketCallback callback, char *cdata);
+  void UnsetCallback(GSocketEventFlags flags);
+  GSocketError GetSockOpt(int level, int optname,
+    void *optval, int *optlen);
+  GSocketError SetSockOpt(int level, int optname,
+    const void *optval, int optlen);
+protected:
+  GSocketError Input_Timeout();
+  GSocketError Output_Timeout();
+  GSocketError Connect_Timeout();
+  int Recv_Stream(char *buffer, int size);
+  int Recv_Dgram(char *buffer, int size);
+  int Send_Stream(const char *buffer, int size);
+  int Send_Dgram(const char *buffer, int size);
+  bool m_ok;
+
+/* TODO: Make these protected */
+public:
+  SOCKET m_fd;
+  GAddress *m_local;
+  GAddress *m_peer;
+  GSocketError m_error;
+
+  /* Attributes */
+  bool m_non_blocking;
+  bool m_server;
+  bool m_stream;
+  bool m_establishing;
+  bool m_reusable;
+  struct timeval m_timeout;
+
+  /* Callbacks */
+  GSocketEventFlags m_detected;
+  GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
+  char *m_data[GSOCK_MAX_EVENT];
+  int m_msgnumber;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Definition of GAddress */
+struct _GAddress
+{
+  struct sockaddr *m_addr;
+  size_t m_len;
+
+  GAddressType m_family;
+  int m_realfamily;
+
+  GSocketError m_error;
+};
+
+
+/* GAddress */
+
+GSocketError _GAddress_translate_from(GAddress *address,
+                                      struct sockaddr *addr, int len);
+GSocketError _GAddress_translate_to  (GAddress *address,
+                                      struct sockaddr **addr, int *len);
+GSocketError _GAddress_Init_INET(GAddress *address);
+GSocketError _GAddress_Init_UNIX(GAddress *address);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+
+#endif  /* __GSOCK_MSW_H */
diff --git a/Source/3rd Party/wx/include/wx/msw/headerctrl.h b/Source/3rd Party/wx/include/wx/msw/headerctrl.h
deleted file mode 100644
index 42b8d57e2..000000000
--- a/Source/3rd Party/wx/include/wx/msw/headerctrl.h	
+++ /dev/null
@@ -1,133 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/headerctrl.h
-// Purpose:     wxMSW native wxHeaderCtrl
-// Author:      Vadim Zeitlin
-// Created:     2008-12-01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_HEADERCTRL_H_
-#define _WX_MSW_HEADERCTRL_H_
-
-class WXDLLIMPEXP_FWD_CORE wxImageList;
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxHeaderCtrl : public wxHeaderCtrlBase
-{
-public:
-    wxHeaderCtrl()
-    {
-        Init();
-    }
-
-    wxHeaderCtrl(wxWindow *parent,
-                 wxWindowID id = wxID_ANY,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxHD_DEFAULT_STYLE,
-                 const wxString& name = wxHeaderCtrlNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxHD_DEFAULT_STYLE,
-                const wxString& name = wxHeaderCtrlNameStr);
-
-    virtual ~wxHeaderCtrl();
-
-
-private:
-    // implement base class pure virtuals
-    virtual void DoSetCount(unsigned int count);
-    virtual unsigned int DoGetCount() const;
-    virtual void DoUpdate(unsigned int idx);
-
-    virtual void DoScrollHorz(int dx);
-
-    virtual void DoSetColumnsOrder(const wxArrayInt& order);
-    virtual wxArrayInt DoGetColumnsOrder() const;
-
-    // override wxWindow methods which must be implemented by a new control
-    virtual wxSize DoGetBestSize() const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    // override MSW-specific methods needed for new control
-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
-    // common part of all ctors
-    void Init();
-
-    // wrapper around Header_InsertItem(): insert the item using information
-    // from the given column at the given index
-    void DoInsertItem(const wxHeaderColumn& col, unsigned int idx);
-
-    // get the number of currently visible items: this is also the total number
-    // of items contained in the native control
-    int GetShownColumnsCount() const;
-
-    // due to the discrepancy for the hidden columns which we know about but
-    // the native control does not, there can be a difference between the
-    // column indices we use and the ones used by the native control; these
-    // functions translate between them
-    //
-    // notice that MSWToNativeIdx() shouldn't be called for hidden columns and
-    // MSWFromNativeIdx() always returns an index of a visible column
-    int MSWToNativeIdx(int idx);
-    int MSWFromNativeIdx(int item);
-
-    // this is the same as above but for order, not index
-    int MSWToNativeOrder(int order);
-    int MSWFromNativeOrder(int order);
-
-    // get the event type corresponding to a click or double click event
-    // (depending on dblclk value) with the specified (using MSW convention)
-    // mouse button
-    wxEventType GetClickEventType(bool dblclk, int button);
-
-
-    // the number of columns in the control, including the hidden ones (not
-    // taken into account by the native control, see comment in DoGetCount())
-    unsigned int m_numColumns;
-
-    // this is a lookup table allowing us to check whether the column with the
-    // given index is currently shown in the native control, in which case the
-    // value of this array element with this index is 0, or hidden
-    //
-    // notice that this may be different from GetColumn(idx).IsHidden() and in
-    // fact we need this array precisely because it will be different from it
-    // in DoUpdate() when the column hidden flag gets toggled and we need it to
-    // handle this transition correctly
-    wxArrayInt m_isHidden;
-
-    // the order of our columns: this array contains the index of the column
-    // shown at the position n as the n-th element
-    //
-    // this is necessary only to handle the hidden columns: the native control
-    // doesn't know about them and so we can't use Header_GetOrderArray()
-    wxArrayInt m_colIndices;
-
-    // the image list: initially NULL, created on demand
-    wxImageList *m_imageList;
-
-    // the offset of the window used to emulate scrolling it
-    int m_scrollOffset;
-
-    wxDECLARE_NO_COPY_CLASS(wxHeaderCtrl);
-};
-
-#endif // _WX_MSW_HEADERCTRL_H_
-
diff --git a/Source/3rd Party/wx/include/wx/msw/helpchm.h b/Source/3rd Party/wx/include/wx/msw/helpchm.h
index f4c511831..a6c3e8440 100644
--- a/Source/3rd Party/wx/include/wx/msw/helpchm.h	
+++ b/Source/3rd Party/wx/include/wx/msw/helpchm.h	
@@ -1,22 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/helpchm.h
+// Name:        helpchm.h
 // Purpose:     Help system: MS HTML Help implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     16/04/2000
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: helpchm.h 39725 2006-06-14 17:46:51Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_MSW_HELPCHM_H_
-#define _WX_MSW_HELPCHM_H_
+#ifndef _WX_HELPCHM_H_
+#define _WX_HELPCHM_H_
 
 #if wxUSE_MS_HTML_HELP
 
 #include "wx/helpbase.h"
 
-class WXDLLIMPEXP_CORE wxCHMHelpController : public wxHelpControllerBase
+class WXDLLEXPORT wxCHMHelpController : public wxHelpControllerBase
 {
 public:
     wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { }
@@ -45,46 +45,16 @@ public:
                                      wxWindow *window);
 
 protected:
-    // get the name of the CHM file we use from our m_helpFile
-    wxString GetValidFilename() const;
-
-    // Call HtmlHelp() with the provided parameters (both overloads do the same
-    // thing but allow to avoid casts in the calling code) and return false
-    // (but don't crash) if HTML help is unavailable
-    static bool CallHtmlHelp(wxWindow *win, const wxChar *str,
-                             unsigned cmd, WXWPARAM param);
-    static bool CallHtmlHelp(wxWindow *win, const wxChar *str,
-                             unsigned cmd, const void *param = NULL)
-    {
-        return CallHtmlHelp(win, str, cmd, reinterpret_cast<WXWPARAM>(param));
-    }
-
-    // even simpler wrappers using GetParentWindow() and GetValidFilename() as
-    // the first 2 HtmlHelp() parameters
-    bool CallHtmlHelp(unsigned cmd, WXWPARAM param)
-    {
-        return CallHtmlHelp(GetParentWindow(), GetValidFilename().t_str(),
-                            cmd, param);
-    }
-
-    bool CallHtmlHelp(unsigned cmd, const void *param = NULL)
-    {
-        return CallHtmlHelp(cmd, reinterpret_cast<WXWPARAM>(param));
-    }
-
-    // wrapper around CallHtmlHelp(HH_DISPLAY_TEXT_POPUP): only one of text and
-    // contextId parameters can be non-NULL/non-zero
-    static bool DoDisplayTextPopup(const wxChar *text,
-                                   const wxPoint& pos,
-                                   int contextId,
-                                   wxWindow *window);
-
+    // Append extension if necessary.
+    wxString GetValidFilename(const wxString& file) const;
 
+protected:
     wxString m_helpFile;
 
-    DECLARE_DYNAMIC_CLASS(wxCHMHelpController)
+    DECLARE_CLASS(wxCHMHelpController)
 };
 
 #endif // wxUSE_MS_HTML_HELP
 
-#endif // _WX_MSW_HELPCHM_H_
+#endif
+// _WX_HELPCHM_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/helpwin.h b/Source/3rd Party/wx/include/wx/msw/helpwin.h
index a8b00e1ab..e563c8e9c 100644
--- a/Source/3rd Party/wx/include/wx/msw/helpwin.h	
+++ b/Source/3rd Party/wx/include/wx/msw/helpwin.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/helpwin.h
+// Name:        helpwin.h
 // Purpose:     Help system: WinHelp implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: helpwin.h 41020 2006-09-05 20:47:48Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,9 +18,9 @@
 
 #include "wx/helpbase.h"
 
-class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase
+class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 {
-    DECLARE_DYNAMIC_CLASS(wxWinHelpController)
+    DECLARE_CLASS(wxWinHelpController)
 
 public:
     wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}
diff --git a/Source/3rd Party/wx/include/wx/msw/htmlhelp.h b/Source/3rd Party/wx/include/wx/msw/htmlhelp.h
index ff3622c65..960ee155c 100644
--- a/Source/3rd Party/wx/include/wx/msw/htmlhelp.h	
+++ b/Source/3rd Party/wx/include/wx/msw/htmlhelp.h	
@@ -3,9 +3,9 @@
  * Copyright 2004 Jacek Caban
  *
  * Originally written for the Wine project, and issued under
- * the wxWindows licence by kind permission of the author.
+ * the wxWindows License by kind permission of the author.
  *
- * Licence:     wxWindows licence
+ * License:     wxWindows License
  */
 
 #ifndef __HTMLHELP_H__
diff --git a/Source/3rd Party/wx/include/wx/msw/icon.h b/Source/3rd Party/wx/include/wx/msw/icon.h
index ab0c357cf..d716a26a5 100644
--- a/Source/3rd Party/wx/include/wx/msw/icon.h	
+++ b/Source/3rd Party/wx/include/wx/msw/icon.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: icon.h 42752 2006-10-30 19:26:48Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,7 +24,7 @@
 
 // notice that although wxIconRefData inherits from wxBitmapRefData, it is not
 // a valid wxBitmapRefData
-class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData
+class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData
 {
 public:
     wxIconRefData() { }
@@ -37,7 +37,7 @@ public:
 // Icon
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxIcon : public wxGDIImage
+class WXDLLEXPORT wxIcon : public wxGDIImage
 {
 public:
     // ctors
@@ -48,13 +48,13 @@ public:
     wxIcon(const char bits[], int width, int height);
 
         // from XPM data
-    wxIcon(const char* const* data) { CreateIconFromXpm(data); }
-#ifdef wxNEEDS_CHARPP
-    wxIcon(char **data) { CreateIconFromXpm(const_cast<const char* const*>(data)); }
-#endif
+    wxIcon(const char **data) { CreateIconFromXpm(data); }
+
+    wxIcon(char **data) { CreateIconFromXpm((const char **)data); }
+
         // from resource/file
     wxIcon(const wxString& name,
-           wxBitmapType type = wxICON_DEFAULT_TYPE,
+           long type = wxBITMAP_TYPE_ICO_RESOURCE,
            int desiredWidth = -1, int desiredHeight = -1);
 
     wxIcon(const wxIconLocation& loc);
@@ -62,7 +62,7 @@ public:
     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,
-                          wxBitmapType type = wxICON_DEFAULT_TYPE,
+                          long type = wxBITMAP_TYPE_ICO_RESOURCE,
                           int desiredWidth = -1, int desiredHeight = -1);
 
     // implementation only from now on
@@ -85,7 +85,7 @@ protected:
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     // create from XPM data
-    void CreateIconFromXpm(const char* const* data);
+    void CreateIconFromXpm(const char **data);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
diff --git a/Source/3rd Party/wx/include/wx/msw/imaglist.h b/Source/3rd Party/wx/include/wx/msw/imaglist.h
index be5b5cc9c..b31c73539 100644
--- a/Source/3rd Party/wx/include/wx/msw/imaglist.h	
+++ b/Source/3rd Party/wx/include/wx/msw/imaglist.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imaglist.h 41271 2006-09-18 04:41:09Z KO $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@
 // now, the app must take care of ownership issues. That is, the
 // image lists must be explicitly deleted after the control(s) that uses them
 // is (are) deleted, or when the app exits.
-class WXDLLIMPEXP_CORE wxImageList : public wxObject
+class WXDLLEXPORT wxImageList : public wxObject
 {
 public:
   /*
@@ -199,7 +199,7 @@ public:
 protected:
   WXHIMAGELIST m_hImageList;
 
-  DECLARE_DYNAMIC_CLASS_NO_COPY(wxImageList)
+  DECLARE_DYNAMIC_CLASS(wxImageList)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/msw/iniconf.h b/Source/3rd Party/wx/include/wx/msw/iniconf.h
new file mode 100644
index 000000000..61b9d0c8d
--- /dev/null
+++ b/Source/3rd Party/wx/include/wx/msw/iniconf.h	
@@ -0,0 +1,101 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/msw/iniconf.h
+// Purpose:     INI-file based wxConfigBase implementation
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     27.07.98
+// RCS-ID:      $Id: iniconf.h 62185 2009-09-28 10:02:42Z JS $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef   _INICONF_H
+#define   _INICONF_H
+
+#include "wx/defs.h"
+
+#if wxUSE_CONFIG
+
+// ----------------------------------------------------------------------------
+// wxIniConfig is a wxConfig implementation which uses MS Windows INI files to
+// store the data. Because INI files don't really support arbitrary nesting of
+// groups, we do the following:
+//  (1) in win.ini file we store all entries in the [vendor] section and
+//      the value group1/group2/key is mapped to the value group1_group2_key
+//      in this section, i.e. all path separators are replaced with underscore
+//  (2) in appname.ini file we map group1/group2/group3/key to the entry
+//      group2_group3_key in [group1]
+//
+// Of course, it might lead to indesirable results if '_' is also used in key
+// names (i.e. group/key is the same as group_key) and also GetPath() result
+// may be not what you would expect it to be.
+//
+// Another limitation: the keys and section names are never case-sensitive
+// which might differ from wxFileConfig it it was compiled with
+// wxCONFIG_CASE_SENSITIVE option.
+// ----------------------------------------------------------------------------
+
+// for this class, "local" file is the file appname.ini and the global file
+// is the [vendor] subsection of win.ini (default for "vendor" is to be the
+// same as appname). The file name (strAppName parameter) may, in fact,
+// contain the full path to the file. If it doesn't, the file is searched for
+// in the Windows directory.
+class WXDLLEXPORT wxIniConfig : public wxConfigBase
+{
+public:
+  // ctor & dtor
+    // if strAppName doesn't contain the extension and is not an absolute path,
+    // ".ini" is appended to it. if strVendor is empty, it's taken to be the
+    // same as strAppName.
+  wxIniConfig(const wxString& strAppName = wxEmptyString, const wxString& strVendor = wxEmptyString,
+    const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString, long style = wxCONFIG_USE_LOCAL_FILE);
+  virtual ~wxIniConfig();
+
+  // implement inherited pure virtual functions
+  virtual void SetPath(const wxString& strPath);
+  virtual const wxString& GetPath() const;
+
+  virtual bool GetFirstGroup(wxString& str, long& lIndex) const;
+  virtual bool GetNextGroup (wxString& str, long& lIndex) const;
+  virtual bool GetFirstEntry(wxString& str, long& lIndex) const;
+  virtual bool GetNextEntry (wxString& str, long& lIndex) const;
+
+  virtual size_t GetNumberOfEntries(bool bRecursive = false) const;
+  virtual size_t GetNumberOfGroups(bool bRecursive = false) const;
+
+  virtual bool HasGroup(const wxString& strName) const;
+  virtual bool HasEntry(const wxString& strName) const;
+
+  // return true if the current group is empty
+  bool IsEmpty() const;
+
+  virtual bool Flush(bool bCurrentOnly = false);
+
+  virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
+  virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
+
+  virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = true);
+  virtual bool DeleteGroup(const wxString& szKey);
+  virtual bool DeleteAll();
+
+protected:
+  // read/write
+  bool DoReadString(const wxString& key, wxString *pStr) const;
+  bool DoReadLong(const wxString& key, long *plResult) const;
+
+  bool DoWriteString(const wxString& key, const wxString& szValue);
+  bool DoWriteLong(const wxString& key, long lValue);
+
+private:
+  // helpers
+  wxString GetPrivateKeyName(const wxString& szKey) const;
+  wxString GetKeyName(const wxString& szKey) const;
+
+  wxString m_strLocalFilename;  // name of the private INI file
+  wxString m_strGroup,    // current group in appname.ini file
+           m_strPath;     // the rest of the path (no trailing '_'!)
+};
+
+#endif // wxUSE_CONFIG
+
+#endif // _INICONF_H
diff --git a/Source/3rd Party/wx/include/wx/msw/init.h b/Source/3rd Party/wx/include/wx/msw/init.h
deleted file mode 100644
index 7914e7496..000000000
--- a/Source/3rd Party/wx/include/wx/msw/init.h	
+++ /dev/null
@@ -1,91 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/init.h
-// Purpose:     Windows-specific wxEntry() overload
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_INIT_H_
-#define _WX_MSW_INIT_H_
-
-// ----------------------------------------------------------------------------
-// Windows-specific wxEntry() overload and wxIMPLEMENT_WXWIN_MAIN definition
-// ----------------------------------------------------------------------------
-
-// we need HINSTANCE declaration to define WinMain()
-#include "wx/msw/wrapwin.h"
-
-#ifndef SW_SHOWNORMAL
-    #define SW_SHOWNORMAL 1
-#endif
-
-// WinMain() is always ANSI, even in Unicode build, under normal Windows
-// but is always Unicode under CE
-#ifdef __WXWINCE__
-    typedef wchar_t *wxCmdLineArgType;
-#else
-    typedef char *wxCmdLineArgType;
-#endif
-
-// Windows-only overloads of wxEntry() and wxEntryStart() which take the
-// parameters passed to WinMain() instead of those passed to main()
-extern WXDLLIMPEXP_CORE bool
-    wxEntryStart(HINSTANCE hInstance,
-                HINSTANCE hPrevInstance = NULL,
-                wxCmdLineArgType pCmdLine = NULL,
-                int nCmdShow = SW_SHOWNORMAL);
-
-extern WXDLLIMPEXP_CORE int
-    wxEntry(HINSTANCE hInstance,
-            HINSTANCE hPrevInstance = NULL,
-            wxCmdLineArgType pCmdLine = NULL,
-            int nCmdShow = SW_SHOWNORMAL);
-
-#if defined(__BORLANDC__) && wxUSE_UNICODE
-    // Borland C++ has the following nonstandard behaviour: when the -WU
-    // command line flag is used, the linker expects to find wWinMain instead
-    // of WinMain. This flag causes the compiler to define _UNICODE and
-    // UNICODE symbols and there's no way to detect its use, so we have to
-    // define both WinMain and wWinMain so that wxIMPLEMENT_WXWIN_MAIN works
-    // for both code compiled with and without -WU.
-    // See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863
-    // for more details.
-    #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD                      \
-        extern "C" int WINAPI wWinMain(HINSTANCE hInstance,                 \
-                                      HINSTANCE hPrevInstance,              \
-                                      wchar_t * WXUNUSED(lpCmdLine),        \
-                                      int nCmdShow)                         \
-        {                                                                   \
-            wxDISABLE_DEBUG_SUPPORT();                                      \
-                                                                            \
-            /* NB: wxEntry expects lpCmdLine argument to be char*, not */   \
-            /*     wchar_t*, but fortunately it's not used anywhere    */   \
-            /*     and we can simply pass NULL in:                     */   \
-            return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);       \
-        }
-#else
-    #define wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
-#endif // defined(__BORLANDC__) && wxUSE_UNICODE
-
-#define wxIMPLEMENT_WXWIN_MAIN                                              \
-    extern "C" int WINAPI WinMain(HINSTANCE hInstance,                      \
-                                  HINSTANCE hPrevInstance,                  \
-                                  wxCmdLineArgType WXUNUSED(lpCmdLine),     \
-                                  int nCmdShow)                             \
-    {                                                                       \
-        wxDISABLE_DEBUG_SUPPORT();                                          \
-                                                                            \
-        /* NB: We pass NULL in place of lpCmdLine to behave the same as  */ \
-        /*     Borland-specific wWinMain() above. If it becomes needed   */ \
-        /*     to pass lpCmdLine to wxEntry() here, you'll have to fix   */ \
-        /*     wWinMain() above too.                                     */ \
-        return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);           \
-    }                                                                       \
-    wxIMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD
-
-
-#endif // _WX_MSW_INIT_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/libraries.h b/Source/3rd Party/wx/include/wx/msw/libraries.h
index 27f3cbf7b..efd7389e0 100644
--- a/Source/3rd Party/wx/include/wx/msw/libraries.h	
+++ b/Source/3rd Party/wx/include/wx/msw/libraries.h	
@@ -3,7 +3,7 @@
  * Purpose:     Pragmas for linking libs conditionally
  * Author:      Michael Wetherell
  * Modified by:
- * RCS-ID:      $Id$
+ * RCS-ID:      $Id: libraries.h 37045 2006-01-21 22:50:46Z MW $
  * Copyright:   (c) 2005 Michael Wetherell
  * Licence:     wxWindows licence
  */
diff --git a/Source/3rd Party/wx/include/wx/msw/listbox.h b/Source/3rd Party/wx/include/wx/msw/listbox.h
index 6518aec47..518b78303 100644
--- a/Source/3rd Party/wx/include/wx/msw/listbox.h	
+++ b/Source/3rd Party/wx/include/wx/msw/listbox.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listbox.h 66941 2011-02-17 11:01:22Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,6 +14,10 @@
 
 #if wxUSE_LISTBOX
 
+// Fixing spurious selection events breaks binary compatibility, so this is normally 0.
+// See ticket #12143
+#define wxUSE_LISTBOX_SELECTION_FIX 0
+
 // ----------------------------------------------------------------------------
 // simple types
 // ----------------------------------------------------------------------------
@@ -34,11 +38,11 @@ class WXDLLIMPEXP_FWD_BASE wxArrayInt;
 // List box control
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
+class WXDLLEXPORT wxListBox : public wxListBoxBase
 {
 public:
     // ctors and such
-    wxListBox() { Init(); }
+    wxListBox();
     wxListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
@@ -47,8 +51,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {
-        Init();
-
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     wxListBox(wxWindow *parent, wxWindowID id,
@@ -59,8 +61,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {
-        Init();
-
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 
@@ -81,6 +81,10 @@ public:
 
     virtual ~wxListBox();
 
+    // implement base class pure virtuals
+    virtual void Clear();
+    virtual void Delete(unsigned int n);
+
     virtual unsigned int GetCount() const;
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& s);
@@ -90,15 +94,8 @@ public:
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
-    // return the index of the item at this position or wxNOT_FOUND
-    int HitTest(const wxPoint& pt) const { return DoHitTestList(pt); }
-    int HitTest(wxCoord x, wxCoord y) const { return DoHitTestList(wxPoint(x, y)); }
-
-    // ownerdrawn wxListBox and wxCheckListBox support
+    // wxCheckListBox support
 #if wxUSE_OWNER_DRAWN
-    // override base class virtuals
-    virtual bool SetFont(const wxFont &font);
-
     bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
     bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 
@@ -110,12 +107,6 @@ public:
 
     // get the index of the given item
     int GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
-
-    // get rect of the given item index
-    bool GetItemRect(size_t n, wxRect& rect) const;
-
-    // redraw the given item
-    bool RefreshItem(size_t n);
 #endif // wxUSE_OWNER_DRAWN
 
     // Windows-specific code to update the horizontal extent of the listbox, if
@@ -146,59 +137,43 @@ public:
         return GetCompositeControlsDefaultAttributes(variant);
     }
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-    virtual void OnInternalIdle();
-
+#if wxUSE_LISTBOX_SELECTION_FIX
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#endif
 
 protected:
-    virtual wxSize DoGetBestClientSize() const;
-
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
-
     virtual void DoSetSelection(int n, bool select);
-
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-
+    virtual int DoAppend(const wxString& item);
+    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
+    virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoSetFirstItem(int n);
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void* DoGetItemClientData(unsigned int n) const;
-
-    // this can't be called DoHitTest() because wxWindow already has this method
-    virtual int DoHitTestList(const wxPoint& point) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
+    virtual int DoListHitTest(const wxPoint& point) const;
 
     // free memory (common part of Clear() and dtor)
     void Free();
 
     unsigned int m_noItems;
+    int m_selected;
+
+    virtual wxSize DoGetBestSize() const;
 
 #if wxUSE_OWNER_DRAWN
     // control items
     wxListBoxItemsArray m_aItems;
 #endif
 
-private:
-    // common part of all ctors
-    void Init();
-
-    // call this when items are added to or deleted from the listbox or an
-    // items text changes
-    void MSWOnItemsChanged();
-
-    // flag indicating whether the max horizontal extent should be updated,
-    // i.e. if we need to call SetHorizontalExtent() from OnInternalIdle()
-    bool m_updateHorizontalExtent;
-
+#if wxUSE_LISTBOX_SELECTION_FIX
     // flag set to true when we get a keyboard event and reset to false when we
     // get a mouse one: this is used to find the correct item for the selection
     // event
     bool m_selectedByKeyboard;
+#endif
 
+private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)
 };
 
diff --git a/Source/3rd Party/wx/include/wx/msw/listctrl.h b/Source/3rd Party/wx/include/wx/msw/listctrl.h
index d96369245..de4c7d839 100644
--- a/Source/3rd Party/wx/include/wx/msw/listctrl.h	
+++ b/Source/3rd Party/wx/include/wx/msw/listctrl.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Agron Selimaj
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listctrl.h 54419 2008-06-29 01:35:24Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,14 +13,8 @@
 #define _WX_LISTCTRL_H_
 
 #include "wx/textctrl.h"
-#include "wx/dynarray.h"
-#include "wx/vector.h"
 
-class wxMSWListItemData;
-
-// define this symbol to indicate the availability of SetColumnsOrder() and
-// related functions
-#define wxHAS_LISTCTRL_COLUMN_ORDER
+class WXDLLIMPEXP_FWD_CORE wxImageList;
 
 /*
     The wxListCtrl can show lists of items in four different modes:
@@ -76,7 +70,7 @@ class wxMSWListItemData;
 
  */
 
-class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
+class WXDLLEXPORT wxListCtrl: public wxControl
 {
 public:
     /*
@@ -120,25 +114,13 @@ public:
     bool GetColumn(int col, wxListItem& item) const;
 
     // Sets information about this column
-    bool SetColumn(int col, const wxListItem& item);
+    bool SetColumn(int col, const wxListItem& item) ;
 
     // Gets the column width
     int GetColumnWidth(int col) const;
 
     // Sets the column width
-    bool SetColumnWidth(int col, int width);
-
-
-    // Gets the column order from its index or index from its order
-    int GetColumnOrder(int col) const;
-    int GetColumnIndexFromOrder(int order) const;
-
-    // Gets the column order for all columns
-    wxArrayInt GetColumnsOrder() const;
-
-    // Sets the column order for all columns
-    bool SetColumnsOrder(const wxArrayInt& orders);
-
+    bool SetColumnWidth(int col, int width) ;
 
     // Gets the number of items that can fit vertically in the
     // visible area of the list control (list or report view)
@@ -153,48 +135,50 @@ public:
     wxTextCtrl* GetEditControl() const;
 
     // Gets information about the item
-    bool GetItem(wxListItem& info) const;
+    bool GetItem(wxListItem& info) const ;
 
     // Sets information about the item
-    bool SetItem(wxListItem& info);
+    bool SetItem(wxListItem& info) ;
 
     // Sets a string field at a particular column
     long SetItem(long index, int col, const wxString& label, int imageId = -1);
 
     // Gets the item state
-    int  GetItemState(long item, long stateMask) const;
+    int  GetItemState(long item, long stateMask) const ;
 
     // Sets the item state
-    bool SetItemState(long item, long state, long stateMask);
+    bool SetItemState(long item, long state, long stateMask) ;
 
     // Sets the item image
-    bool SetItemImage(long item, int image, int selImage = -1);
+    bool SetItemImage(long item, int image, int selImage = -1) ;
     bool SetItemColumnImage(long item, long column, int image);
 
     // Gets the item text
-    wxString GetItemText(long item, int col = 0) const;
+    wxString GetItemText(long item) const ;
 
     // Sets the item text
-    void SetItemText(long item, const wxString& str);
+    void SetItemText(long item, const wxString& str) ;
 
     // Gets the item data
-    wxUIntPtr GetItemData(long item) const;
+    wxUIntPtr GetItemData(long item) const ;
 
     // Sets the item data
+#if wxABI_VERSION >= 20804
     bool SetItemPtrData(long item, wxUIntPtr data);
-    bool SetItemData(long item, long data) { return SetItemPtrData(item, data); }
+#endif // wxABI 2.8.4+
+    bool SetItemData(long item, long data);
 
     // Gets the item rectangle
-    bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const;
+    bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
 
     // Gets the subitem rectangle in report mode
-    bool GetSubItemRect(long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const;
+    bool GetSubItemRect(long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
 
     // Gets the item position
-    bool GetItemPosition(long item, wxPoint& pos) const;
+    bool GetItemPosition(long item, wxPoint& pos) const ;
 
     // Sets the item position
-    bool SetItemPosition(long item, const wxPoint& pos);
+    bool SetItemPosition(long item, const wxPoint& pos) ;
 
     // Gets the number of items in the list control
     int GetItemCount() const;
@@ -228,22 +212,22 @@ public:
 
     // Gets the index of the topmost visible item when in
     // list or report view
-    long GetTopItem() const;
+    long GetTopItem() const ;
 
     // Add or remove a single window style
-    void SetSingleStyle(long style, bool add = true);
+    void SetSingleStyle(long style, bool add = true) ;
 
     // Set the whole window style
-    void SetWindowStyleFlag(long style);
+    void SetWindowStyleFlag(long style) ;
 
     // Searches for an item, starting from 'item'.
     // item can be -1 to find the first item that matches the
     // specified flags.
     // Returns the item or -1 if unsuccessful.
-    long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const;
+    long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ;
 
     // Gets one of the three image lists
-    wxImageList *GetImageList(int which) const;
+    wxImageList *GetImageList(int which) const ;
 
     // Sets the image list
     // N.B. There's a quirk in the Win95 list view implementation.
@@ -252,8 +236,14 @@ public:
     // haven't specified wxLIST_MASK_IMAGE when inserting.
     // So you have to set a NULL small-icon image list to be sure that
     // the wxLC_LIST mode works without icons. Of course, you may want icons...
-    void SetImageList(wxImageList *imageList, int which);
-    void AssignImageList(wxImageList *imageList, int which);
+    void SetImageList(wxImageList *imageList, int which) ;
+    void AssignImageList(wxImageList *imageList, int which) ;
+
+    // are we in report mode?
+    bool InReportView() const { return HasFlag(wxLC_REPORT); }
+
+    // are we in virtual report mode?
+    bool IsVirtual() const { return HasFlag(wxLC_VIRTUAL); }
 
     // refresh items selectively (only useful for virtual list controls)
     void RefreshItem(long item);
@@ -269,7 +259,7 @@ public:
     bool DeleteItem(long item);
 
     // Deletes all items
-    bool DeleteAllItems();
+    bool DeleteAllItems() ;
 
     // Deletes a column
     bool DeleteColumn(int col);
@@ -281,13 +271,13 @@ public:
     void ClearAll();
 
     // Edit the label
-    wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));
+    wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
 
     // End label editing, optionally cancelling the edit
     bool EndEditLabel(bool cancel);
 
     // Ensures this item is visible
-    bool EnsureVisible(long item);
+    bool EnsureVisible(long item) ;
 
     // Find an item whose label matches this string, starting from the item after 'start'
     // or the beginning if 'start' is -1.
@@ -319,6 +309,14 @@ public:
     // Insert an image/string item
     long InsertItem(long index, const wxString& label, int imageIndex);
 
+    // For list view mode (only), inserts a column.
+    long InsertColumn(long col, const wxListItem& info);
+
+    long InsertColumn(long col,
+                      const wxString& heading,
+                      int format = wxLIST_FORMAT_LEFT,
+                      int width = -1);
+
     // set the number of items in a virtual list control
     void SetItemCount(long count);
 
@@ -340,7 +338,7 @@ public:
     // or zero if the two items are equivalent.
 
     // data is arbitrary data to be passed to the sort function.
-    bool SortItems(wxListCtrlCompare fn, wxIntPtr data);
+    bool SortItems(wxListCtrlCompare fn, long data);
 
     // IMPLEMENTATION
     virtual bool MSWCommand(WXUINT param, WXWORD id);
@@ -384,26 +382,12 @@ protected:
     // common part of all ctors
     void Init();
 
-    // Implement constrained best size calculation.
-    virtual int DoGetBestClientHeight(int width) const
-        { return MSWGetBestViewRect(width, -1).y; }
-    virtual int DoGetBestClientWidth(int height) const
-        { return MSWGetBestViewRect(-1, height).x; }
-
-    wxSize MSWGetBestViewRect(int x, int y) const;
-
-    // Implement base class pure virtual methods.
-    long DoInsertColumn(long col, const wxListItem& info);
-
     // free memory taken by all internal data
     void FreeAllInternalData();
 
-    // get the internal data object for this item (may return NULL)
-    wxMSWListItemData *MSWGetItemData(long item) const;
-
     // get the item attribute, either by quering it for virtual control, or by
     // returning the one previously set using setter methods for a normal one
-    wxListItemAttr *DoGetItemColumnAttr(long item, long column) const;
+    wxListItemAttr *DoGetItemAttr(long item) const;
 
 
     wxTextCtrl*       m_textCtrl;        // The control used for editing a label
@@ -418,9 +402,10 @@ protected:
                                     // keep track of inserted/deleted columns
     long              m_count;      // Keep track of item count to save calls to
                                     // ListView_GetItemCount
+    bool              m_ignoreChangeMessages;
 
-    // all wxMSWListItemData objects we use
-    wxVector<wxMSWListItemData *> m_internalData;
+    // true if we have any internal data (user data & attributes)
+    bool m_AnyInternalData;
 
     // true if we have any items with custom attributes
     bool m_hasAnyAttr;
@@ -442,12 +427,6 @@ protected:
     // return the attribute for the item (may return NULL if none)
     virtual wxListItemAttr *OnGetItemAttr(long item) const;
 
-    // return the attribute for the given item and column (may return NULL if none)
-    virtual wxListItemAttr *OnGetItemColumnAttr(long item, long WXUNUSED(column)) const
-    {
-        return OnGetItemAttr(item);
-    }
-
 private:
     // process NM_CUSTOMDRAW notification message
     WXLPARAM OnCustomDraw(WXLPARAM lParam);
@@ -462,14 +441,9 @@ private:
     // destroy m_textCtrl if it's currently valid and reset it to NULL
     void DeleteEditControl();
 
-    // Intercept Escape and Enter keys to avoid them being stolen from our
-    // in-place editor control.
-    void OnCharHook(wxKeyEvent& event);
-
-
     DECLARE_DYNAMIC_CLASS(wxListCtrl)
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxListCtrl);
+    DECLARE_NO_COPY_CLASS(wxListCtrl)
 };
 
 #endif // _WX_LISTCTRL_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/mdi.h b/Source/3rd Party/wx/include/wx/msw/mdi.h
index 8d9965684..46f7f1059 100644
--- a/Source/3rd Party/wx/include/wx/msw/mdi.h	
+++ b/Source/3rd Party/wx/include/wx/msw/mdi.h	
@@ -2,29 +2,31 @@
 // Name:        wx/msw/mdi.h
 // Purpose:     MDI (Multiple Document Interface) classes
 // Author:      Julian Smart
-// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
+// Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) 1997 Julian Smart
-//              (c) 2008 Vadim Zeitlin
+// RCS-ID:      $Id: mdi.h 53135 2008-04-12 02:31:04Z VZ $
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_MSW_MDI_H_
-#define _WX_MSW_MDI_H_
+#ifndef _WX_MDI_H_
+#define _WX_MDI_H_
 
 #include "wx/frame.h"
 
-class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
+
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 
 // ---------------------------------------------------------------------------
 // wxMDIParentFrame
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase
+class WXDLLEXPORT wxMDIParentFrame : public wxFrame
 {
 public:
-    wxMDIParentFrame() { Init(); }
+    wxMDIParentFrame();
     wxMDIParentFrame(wxWindow *parent,
                      wxWindowID id,
                      const wxString& title,
@@ -33,8 +35,6 @@ public:
                      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                      const wxString& name = wxFrameNameStr)
     {
-        Init();
-
         Create(parent, id, title, pos, size, style, name);
     }
 
@@ -48,44 +48,32 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                 const wxString& name = wxFrameNameStr);
 
-    // override/implement base class [pure] virtual methods
-    // ----------------------------------------------------
+    // accessors
+    // ---------
 
-    static bool IsTDI() { return false; }
+    // Get the active MDI child window (Windows only)
+    wxMDIChildFrame *GetActiveChild() const;
 
-    // we don't store the active child in m_currentChild so override this
-    // function to find it dynamically
-    virtual wxMDIChildFrame *GetActiveChild() const;
+    // Get the client window
+    wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; }
 
+    // Create the client window class (don't Create the window,
+    // just return a new class)
+    virtual wxMDIClientWindow *OnCreateClient(void);
+
+    // MDI windows menu
+    wxMenu* GetWindowMenu() const { return m_windowMenu; }
+    void SetWindowMenu(wxMenu* menu) ;
+    virtual void DoMenuUpdates(wxMenu* menu = NULL);
+
+    // MDI operations
+    // --------------
     virtual void Cascade();
     virtual void Tile(wxOrientation orient = wxHORIZONTAL);
     virtual void ArrangeIcons();
     virtual void ActivateNext();
     virtual void ActivatePrevious();
 
-#if wxUSE_MENUS
-    virtual void SetWindowMenu(wxMenu* menu);
-
-    virtual void DoMenuUpdates(wxMenu* menu = NULL);
-
-    // return the active child menu, if any
-    virtual WXHMENU MSWGetActiveMenu() const;
-#endif // wxUSE_MENUS
-
-
-    // implementation only from now on
-
-    // MDI helpers
-    // -----------
-
-#if wxUSE_MENUS
-    // called by wxMDIChildFrame after it was successfully created
-    virtual void AddMDIChild(wxMDIChildFrame *child);
-
-    // called by wxMDIChildFrame just before it is destroyed
-    virtual void RemoveMDIChild(wxMDIChildFrame *child);
-#endif // wxUSE_MENUS
-
     // handlers
     // --------
 
@@ -96,6 +84,7 @@ public:
     void OnIconized(wxIconizeEvent& event);
 
     bool HandleActivate(int state, bool minimized, WXHWND activate);
+    bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     // override window proc for MDI-specific message processing
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
@@ -103,16 +92,7 @@ public:
     virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM);
     virtual bool MSWTranslateMessage(WXMSG* msg);
 
-#if wxUSE_MENUS
-    // override wxFrameBase function to also look in the active child menu bar
-    // and the "Window" menu
-    virtual wxMenuItem *FindItemInMenuBar(int menuId) const;
-#endif // wxUSE_MENUS
-
 protected:
-    // override to pass menu/toolbar events to the active child first
-    virtual bool TryBefore(wxEvent& event);
-
 #if wxUSE_MENUS_NATIVE
     virtual void InternalSetMenuBar();
 #endif // wxUSE_MENUS_NATIVE
@@ -122,45 +102,27 @@ protected:
     // set the size of the MDI client window to match the frame size
     void UpdateClientSize();
 
+
+    wxMDIClientWindow *             m_clientWindow;
+    wxMDIChildFrame *               m_currentChild;
+    wxMenu*                         m_windowMenu;
+
+    // true if MDI Frame is intercepting commands, not child
+    bool m_parentFrameActive;
+
 private:
-    // common part of all ctors
-    void Init();
-
-#if wxUSE_MENUS
-    // "Window" menu commands event handlers
-    void OnMDICommand(wxCommandEvent& event);
-    void OnMDIChild(wxCommandEvent& event);
-
-
-    // add/remove window menu if we have it (i.e. m_windowMenu != NULL)
-    void AddWindowMenu();
-    void RemoveWindowMenu();
-
-    // update the window menu (if we have it) to enable or disable the commands
-    // which only make sense when we have more than one child
-    void UpdateWindowMenu(bool enable);
-
-#if wxUSE_ACCEL
-    wxAcceleratorTable *m_accelWindowMenu;
-#endif // wxUSE_ACCEL
-#endif // wxUSE_MENUS
-
-    // return the number of child frames we currently have (maybe 0)
-    int GetChildFramesCount() const;
-
-
     friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-    wxDECLARE_NO_COPY_CLASS(wxMDIParentFrame);
+    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
 };
 
 // ---------------------------------------------------------------------------
 // wxMDIChildFrame
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxMDIChildFrameBase
+class WXDLLEXPORT wxMDIChildFrame : public wxFrame
 {
 public:
     wxMDIChildFrame() { Init(); }
@@ -177,6 +139,8 @@ public:
         Create(parent, id, title, pos, size, style, name);
     }
 
+    virtual ~wxMDIChildFrame();
+
     bool Create(wxMDIParentFrame *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -185,16 +149,12 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual ~wxMDIChildFrame();
+    virtual bool IsTopLevel() const { return false; }
 
-    // implement MDI operations
-    virtual void Activate();
-
-    // Override some frame operations too
+    // MDI operations
     virtual void Maximize(bool maximize = true);
     virtual void Restore();
-
-    virtual bool Show(bool show = true);
+    virtual void Activate();
 
     // Implementation only from now on
     // -------------------------------
@@ -202,6 +162,7 @@ public:
     // Handlers
     bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
     bool HandleWindowPosChanging(void *lpPos);
+    bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     bool HandleGetMinMaxInfo(void *mmInfo);
 
     virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
@@ -214,10 +175,11 @@ public:
 
     void OnIdle(wxIdleEvent& event);
 
+    virtual bool Show(bool show = true);
+
 protected:
     virtual void DoGetScreenPosition(int *x, int *y) const;
     virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
     virtual void DoSetClientSize(int width, int height);
     virtual void InternalSetMenuBar();
     virtual bool IsMDIChild() const { return true; }
@@ -240,10 +202,16 @@ private:
 // wxMDIClientWindow
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
+class WXDLLEXPORT wxMDIClientWindow : public wxWindow
 {
 public:
     wxMDIClientWindow() { Init(); }
+    wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
+    {
+        Init();
+
+        CreateClient(parent, style);
+    }
 
     // Note: this is virtual, to allow overridden behaviour.
     virtual bool CreateClient(wxMDIParentFrame *parent,
@@ -266,4 +234,5 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIClientWindow)
 };
 
-#endif // _WX_MSW_MDI_H_
+#endif
+    // _WX_MDI_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/menu.h b/Source/3rd Party/wx/include/wx/msw/menu.h
index 165bb57ef..b25f77d5d 100644
--- a/Source/3rd Party/wx/include/wx/msw/menu.h	
+++ b/Source/3rd Party/wx/include/wx/msw/menu.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (wxMenuItem is now in separate file)
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: menu.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,7 +25,6 @@ class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxToolBar;
 #endif
 
-class wxMenuRadioItemsData;
 
 // Not using a combined wxToolBar/wxMenuBar? then use
 // a commandbar in WinCE .NET to implement the
@@ -46,7 +45,7 @@ class wxMenuRadioItemsData;
 // Menu
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
+class WXDLLEXPORT wxMenu : public wxMenuBase
 {
 public:
     // ctors & dtor
@@ -61,31 +60,23 @@ public:
 
     virtual void SetTitle(const wxString& title);
 
-    // MSW-only methods
-    // ----------------
-
-    // Create a new menu from the given native HMENU. Takes ownership of the
-    // menu handle and will delete it when this object is destroyed.
-    static wxMenu *MSWNewFromHMENU(WXHMENU hMenu) { return new wxMenu(hMenu); }
-
-
     // implementation only from now on
     // -------------------------------
 
+    virtual void Attach(wxMenuBarBase *menubar);
+
     bool MSWCommand(WXUINT param, WXWORD id);
 
-    // get the native menu handle
+    // semi-private accessors
+        // get the window which contains this menu
+    wxWindow *GetWindow() const;
+        // get the menu handle
     WXHMENU GetHMenu() const { return m_hMenu; }
 
-    // Return the start and end position of the radio group to which the item
-    // at the given position belongs. Returns false if there is no radio group
-    // containing this position.
-    bool MSWGetRadioGroupRange(int pos, int *start, int *end) const;
-
 #if wxUSE_ACCEL
     // called by wxMenuBar to build its accel table from the accels of all menus
-    bool HasAccels() const { return !m_accels.empty(); }
-    size_t GetAccelCount() const { return m_accels.size(); }
+    bool HasAccels() const { return !m_accels.IsEmpty(); }
+    size_t GetAccelCount() const { return m_accels.GetCount(); }
     size_t CopyAccels(wxAcceleratorEntry *accels) const;
 
     // called by wxMenuItem when its accels changes
@@ -93,65 +84,29 @@ public:
 
     // helper used by wxMenu itself (returns the index in m_accels)
     int FindAccel(int id) const;
-
-    // used only by wxMDIParentFrame currently but could be useful elsewhere:
-    // returns a new accelerator table with accelerators for just this menu
-    // (shouldn't be called if we don't have any accelerators)
-    wxAcceleratorTable *CreateAccelTable() const;
 #endif // wxUSE_ACCEL
 
-#if wxUSE_OWNER_DRAWN
-
-    int GetMaxAccelWidth()
-    {
-        if (m_maxAccelWidth == -1)
-            CalculateMaxAccelWidth();
-        return m_maxAccelWidth;
-    }
-
-    void ResetMaxAccelWidth()
-    {
-        m_maxAccelWidth = -1;
-    }
-
-    // get the menu with given handle (recursively)
-    wxMenu* MSWGetMenu(WXHMENU hMenu);
-
-private:
-    void CalculateMaxAccelWidth();
-
-#endif // wxUSE_OWNER_DRAWN
-
 protected:
     virtual wxMenuItem* DoAppend(wxMenuItem *item);
     virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
     virtual wxMenuItem* DoRemove(wxMenuItem *item);
 
 private:
-    // This constructor is private, use MSWNewFromHMENU() to use it.
-    wxMenu(WXHMENU hMenu);
-
-    // Common part of all ctors, it doesn't create a new HMENU.
-    void InitNoCreate();
-
-    // Common part of all ctors except of the one above taking a native menu
-    // handler: calls InitNoCreate() and also creates a new menu.
+    // common part of all ctors
     void Init();
 
     // common part of Append/Insert (behaves as Append is pos == (size_t)-1)
     bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1);
 
-
-    // This variable contains the description of the radio item groups and
-    // allows to find whether an item at the given position is part of the
-    // group and also where its group starts and ends.
-    //
-    // It is initially NULL and only allocated if we have any radio items.
-    wxMenuRadioItemsData *m_radioData;
+    // terminate the current radio group, if any
+    void EndRadioGroup();
 
     // if true, insert a breal before appending the next item
     bool m_doBreak;
 
+    // the position of the first item in the current radio group or -1
+    int m_startRadioGroup;
+
     // the menu handle of this menu
     WXHMENU m_hMenu;
 
@@ -160,17 +115,6 @@ private:
     wxAcceleratorArray m_accels;
 #endif // wxUSE_ACCEL
 
-#if wxUSE_OWNER_DRAWN
-    // true if the menu has any ownerdrawn items
-    bool m_ownerDrawn;
-
-    // the max width of menu items bitmaps
-    int m_maxBitmapWidth;
-
-    // the max width of menu items accels
-    int m_maxAccelWidth;
-#endif // wxUSE_OWNER_DRAWN
-
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenu)
 };
 
@@ -178,7 +122,26 @@ private:
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
+class WXDLLEXPORT wxMenuInfo : public wxObject
+{
+public :
+    wxMenuInfo() { m_menu = NULL; }
+    virtual ~wxMenuInfo() { }
+
+    void Create( wxMenu *menu , const wxString &title )
+    { m_menu = menu; m_title = title; }
+    wxMenu* GetMenu() const { return m_menu; }
+    wxString GetTitle() const { return m_title; }
+private :
+    wxMenu *m_menu;
+    wxString m_title;
+
+    DECLARE_DYNAMIC_CLASS(wxMenuInfo)
+};
+
+WX_DECLARE_EXPORTED_LIST(wxMenuInfo, wxMenuInfoList );
+
+class WXDLLEXPORT wxMenuBar : public wxMenuBarBase
 {
 public:
     // ctors & dtor
@@ -191,15 +154,17 @@ public:
     virtual ~wxMenuBar();
 
     // menubar construction
+    bool Append( wxMenuInfo *info ) { return Append( info->GetMenu() , info->GetTitle() ); }
+    const wxMenuInfoList& GetMenuInfos() const;
+
     virtual bool Append( wxMenu *menu, const wxString &title );
     virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
     virtual wxMenu *Remove(size_t pos);
 
     virtual void EnableTop( size_t pos, bool flag );
-    virtual bool IsEnabledTop(size_t pos) const;
-    virtual void SetMenuLabel( size_t pos, const wxString& label );
-    virtual wxString GetMenuLabel( size_t pos ) const;
+    virtual void SetLabelTop( size_t pos, const wxString& label );
+    virtual wxString GetLabelTop( size_t pos ) const;
 
     // implementation from now on
     WXHMENU Create();
@@ -218,6 +183,9 @@ public:
 #endif
 
 #if wxUSE_ACCEL
+    // get the accel table for all the menus
+    const wxAcceleratorTable& GetAccelTable() const { return m_accelTable; }
+
     // update the accel table (must be called after adding/deleting a menu)
     void RebuildAccelTable();
 #endif // wxUSE_ACCEL
@@ -233,18 +201,22 @@ public:
     void Refresh( bool eraseBackground,
                           const wxRect *rect = (const wxRect *) NULL ) { wxWindow::Refresh(eraseBackground, rect); }
 
-    // get the menu with given handle (recursively)
-    wxMenu* MSWGetMenu(WXHMENU hMenu);
-
 protected:
     // common part of all ctors
     void Init();
 
+    wxArrayString m_titles;
+    wxMenuInfoList m_menuInfos;
+
     WXHMENU       m_hMenu;
 
     // Return the MSW position for a wxMenu which is sometimes different from
     // the wxWidgets position.
     int MSWPositionForWxMenu(wxMenu *menu, int wxpos);
+#if wxUSE_ACCEL
+    // the accelerator table for all accelerators in all our menus
+    wxAcceleratorTable m_accelTable;
+#endif // wxUSE_ACCEL
 
 #if defined(__WXWINCE__) && wxUSE_TOOLBAR
     wxToolBar*  m_toolBar;
@@ -257,6 +229,13 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuBar)
+
+public:
+
+#if wxABI_VERSION >= 20805
+    // Gets the original label at the top-level of the menubar
+    wxString GetMenuLabel(size_t pos) const;
+#endif
 };
 
 #endif // _WX_MENU_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/menuitem.h b/Source/3rd Party/wx/include/wx/msw/menuitem.h
index a79d385cd..641365848 100644
--- a/Source/3rd Party/wx/include/wx/msw/menuitem.h	
+++ b/Source/3rd Party/wx/include/wx/msw/menuitem.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/menuitem.h
+// Name:        menuitem.h
 // Purpose:     wxMenuItem class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.11.97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: menuitem.h 48053 2007-08-13 17:07:01Z JS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,33 +17,31 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OWNER_DRAWN
-    #include "wx/ownerdrw.h"
-    #include "wx/bitmap.h"
-
-    struct tagRECT;
+    #include  "wx/ownerdrw.h"   // base class
 #endif
 
 // ----------------------------------------------------------------------------
 // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
+class WXDLLEXPORT wxMenuItem : public wxMenuItemBase
 #if wxUSE_OWNER_DRAWN
                              , public wxOwnerDrawn
 #endif
 {
 public:
     // ctor & dtor
-    wxMenuItem(wxMenu *parentMenu = NULL,
+    wxMenuItem(wxMenu *parentMenu = (wxMenu *)NULL,
                int id = wxID_SEPARATOR,
                const wxString& name = wxEmptyString,
                const wxString& help = wxEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
-               wxMenu *subMenu = NULL);
+               wxMenu *subMenu = (wxMenu *)NULL);
     virtual ~wxMenuItem();
 
     // override base class virtuals
-    virtual void SetItemLabel(const wxString& strName);
+    virtual void SetText(const wxString& strName);
+    virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool bDoEnable = true);
     virtual void Check(bool bDoCheck = true);
@@ -55,94 +53,48 @@ public:
 
     // the id for a popup menu is really its menu handle (as required by
     // ::AppendMenu() API), so this function will return either the id or the
-    // menu handle depending on what we are
-    //
-    // notice that it also returns the id as an unsigned int, as required by
-    // Win32 API
-    WXWPARAM GetMSWId() const;
+    // menu handle depending on what we're
+    int GetRealId() const;
+
+    // mark item as belonging to the given radio group
+    void SetAsRadioGroupStart();
+    void SetRadioGroupStart(int start);
+    void SetRadioGroupEnd(int end);
 
-#if WXWIN_COMPATIBILITY_2_8
     // compatibility only, don't use in new code
-    wxDEPRECATED(
     wxMenuItem(wxMenu *parentMenu,
                int id,
                const wxString& text,
                const wxString& help,
                bool isCheckable,
-               wxMenu *subMenu = NULL)
-    );
-#endif
-
-#if wxUSE_OWNER_DRAWN
-
-    void SetBitmaps(const wxBitmap& bmpChecked,
-                    const wxBitmap& bmpUnchecked = wxNullBitmap)
-    {
-        m_bmpChecked = bmpChecked;
-        m_bmpUnchecked = bmpUnchecked;
-        SetOwnerDrawn(true);
-    }
-
-    void SetBitmap(const wxBitmap& bmp, bool bChecked = true)
-    {
-        if ( bChecked )
-            m_bmpChecked = bmp;
-        else
-            m_bmpUnchecked = bmp;
-        SetOwnerDrawn(true);
-    }
-
-    void SetDisabledBitmap(const wxBitmap& bmpDisabled)
-    {
-        m_bmpDisabled = bmpDisabled;
-        SetOwnerDrawn(true);
-    }
-
-    const wxBitmap& GetBitmap(bool bChecked = true) const
-        { return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
-
-    const wxBitmap& GetDisabledBitmap() const
-        { return m_bmpDisabled; }
-
-    int MeasureAccelWidth() const;
-
-    // override wxOwnerDrawn base class virtuals
-    virtual wxString GetName() const;
-    virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight);
-    virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
-
-protected:
-    virtual void GetFontToUse(wxFont& font) const;
-    virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const;
-
-private:
-    // helper function for draw std menu check mark
-    void DrawStdCheckMark(WXHDC hdc, const tagRECT* rc, wxODStatus stat);
-
-#else // !wxUSE_OWNER_DRAWN
-    // Provide stubs for the public functions above to ensure that the code
-    // still compiles without wxUSE_OWNER_DRAWN -- it makes sense to just drop
-    // the bitmaps then instead of failing compilation.
-    void SetBitmaps(const wxBitmap& WXUNUSED(bmpChecked),
-                    const wxBitmap& WXUNUSED(bmpUnchecked) = wxNullBitmap) { }
-    void SetBitmap(const wxBitmap& WXUNUSED(bmp),
-                   bool WXUNUSED(bChecked) = true) { }
-    const wxBitmap& GetBitmap() const { return wxNullBitmap; }
-#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
+               wxMenu *subMenu = (wxMenu *)NULL);
 
 private:
     // common part of all ctors
     void Init();
 
+    // the positions of the first and last items of the radio group this item
+    // belongs to or -1: start is the radio group start and is valid for all
+    // but first radio group items (m_isRadioGroupStart == false), end is valid
+    // only for the first one
+    union
+    {
+        int start;
+        int end;
+    } m_radioGroup;
 
-#if wxUSE_OWNER_DRAWN
-    // item bitmaps
-    wxBitmap m_bmpChecked,     // bitmap to put near the item
-             m_bmpUnchecked,   // (checked is used also for 'uncheckable' items)
-             m_bmpDisabled;
-#endif // wxUSE_OWNER_DRAWN
+    // does this item start a radio group?
+    bool m_isRadioGroupStart;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMenuItem)
+
+public:
+
+#if wxABI_VERSION >= 20805
+    // return the item label including any mnemonics and accelerators.
+    // This used to be called GetText.
+    wxString GetItemLabel() const { return GetText(); }
+#endif
 };
 
 #endif  //_MENUITEM_H
diff --git a/Source/3rd Party/wx/include/wx/msw/mimetype.h b/Source/3rd Party/wx/include/wx/msw/mimetype.h
index c47bbb7a5..9052d07dc 100644
--- a/Source/3rd Party/wx/include/wx/msw/mimetype.h	
+++ b/Source/3rd Party/wx/include/wx/msw/mimetype.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.09.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: mimetype.h 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
@@ -66,7 +66,7 @@ public:
 private:
     // helper function: reads the command corresponding to the specified verb
     // from the registry (returns an empty string if not found)
-    wxString GetCommand(const wxString& verb) const;
+    wxString GetCommand(const wxChar *verb) const;
 
     // get the registry path for the given verb
     wxString GetVerbPath(const wxString& verb) const;
@@ -102,6 +102,12 @@ public:
 
     size_t EnumAllFileTypes(wxArrayString& mimetypes);
 
+    // this are NOPs under Windows
+    bool ReadMailcap(const wxString& WXUNUSED(filename), bool WXUNUSED(fallback) = true)
+        { return true; }
+    bool ReadMimeTypes(const wxString& WXUNUSED(filename))
+        { return true; }
+
     // create a new filetype association
     wxFileType *Associate(const wxFileTypeInfo& ftInfo);
 
diff --git a/Source/3rd Party/wx/include/wx/msw/minifram.h b/Source/3rd Party/wx/include/wx/msw/minifram.h
index 23f47b744..d2e23d9cf 100644
--- a/Source/3rd Party/wx/include/wx/msw/minifram.h	
+++ b/Source/3rd Party/wx/include/wx/msw/minifram.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: minifram.h 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,7 +14,7 @@
 
 #include "wx/frame.h"
 
-class WXDLLIMPEXP_CORE wxMiniFrame : public wxFrame
+class WXDLLEXPORT wxMiniFrame : public wxFrame
 {
 public:
   wxMiniFrame() { }
diff --git a/Source/3rd Party/wx/include/wx/msw/missing.h b/Source/3rd Party/wx/include/wx/msw/missing.h
index 32a31d42c..c84134bdf 100644
--- a/Source/3rd Party/wx/include/wx/msw/missing.h	
+++ b/Source/3rd Party/wx/include/wx/msw/missing.h	
@@ -3,7 +3,7 @@
 // Purpose:     Declarations for parts of the Win32 SDK that are missing in
 //              the versions that come with some compilers
 // Created:     2002/04/23
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: missing.h 48436 2007-08-28 19:26:16Z JS $
 // Copyright:   (c) 2002 Mattia Barbon
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,26 +29,19 @@
     #define WM_CONTEXTMENU      0x007B
 #endif
 
-#ifndef WM_CHANGEUISTATE
-    #define WM_CHANGEUISTATE    0x0127
-#endif
-
+// Needed by toplevel.cpp
 #ifndef WM_UPDATEUISTATE
     #define WM_UPDATEUISTATE    0x0128
 #endif
 
-#ifndef WM_QUERYUISTATE
-    #define WM_QUERYUISTATE     0x0129
+#ifndef WM_CHANGEUISTATE
+    #define WM_CHANGEUISTATE    0x0127
 #endif
 
 #ifndef WM_PRINTCLIENT
     #define WM_PRINTCLIENT 0x318
 #endif
 
-#ifndef DT_HIDEPREFIX
-    #define DT_HIDEPREFIX 0x00100000
-#endif
-
 // Needed by toplevel.cpp
 #ifndef UIS_SET
     #define UIS_SET         1
@@ -77,9 +70,6 @@
     #ifndef WM_MOUSEWHEEL
         #define WM_MOUSEWHEEL           0x020A
     #endif
-    #ifndef WM_MOUSEHWHEEL
-        #define WM_MOUSEHWHEEL          0x020E
-    #endif
     #ifndef WHEEL_DELTA
         #define WHEEL_DELTA             120
     #endif
@@ -97,7 +87,6 @@
     #define VK_OEM_5        0xDC
     #define VK_OEM_6        0xDD
     #define VK_OEM_7        0xDE
-    #define VK_OEM_102      0xE2
 #endif
 
 #ifndef VK_OEM_COMMA
@@ -149,8 +138,38 @@
 #define LWA_ALPHA 2
 #endif
 
-#ifndef QS_ALLPOSTMESSAGE
-#define QS_ALLPOSTMESSAGE 0
+#if defined __VISUALC__ && __VISUALC__ <= 1200 && !defined MIIM_BITMAP
+#define MIIM_STRING      0x00000040
+#define MIIM_BITMAP      0x00000080
+#define MIIM_FTYPE       0x00000100
+#define HBMMENU_CALLBACK            ((HBITMAP) -1)
+typedef struct tagMENUINFO
+{
+    DWORD   cbSize;
+    DWORD   fMask;
+    DWORD   dwStyle;
+    UINT    cyMax;
+    HBRUSH  hbrBack;
+    DWORD   dwContextHelpID;
+    DWORD   dwMenuData;
+}   MENUINFO, FAR *LPMENUINFO;
+struct wxMENUITEMINFO_
+{
+    UINT cbSize;
+    UINT fMask;
+    UINT fType;
+    UINT fState;
+    UINT wID;
+    HMENU hSubMenu;
+    HBITMAP hbmpChecked;
+    HBITMAP hbmpUnchecked;
+    DWORD dwItemData;
+    LPTSTR dwTypeData;
+    UINT cch;
+    HBITMAP hbmpItem;
+};
+#else
+#define wxMENUITEMINFO_ MENUITEMINFO
 #endif
 
 /*
@@ -222,42 +241,15 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 #endif // defined __VISUALC__ && __VISUALC__ <= 1100
 
 // ----------------------------------------------------------------------------
-// menu stuff
+// ListView common control
+// Needed by listctrl.cpp
 // ----------------------------------------------------------------------------
 
-#ifndef MIIM_BITMAP
-    #define MIIM_STRING      0x00000040
-    #define MIIM_BITMAP      0x00000080
-    #define MIIM_FTYPE       0x00000100
-    #define HBMMENU_CALLBACK            ((HBITMAP) -1)
-
-    typedef struct tagMENUINFO
-    {
-        DWORD   cbSize;
-        DWORD   fMask;
-        DWORD   dwStyle;
-        UINT    cyMax;
-        HBRUSH  hbrBack;
-        DWORD   dwContextHelpID;
-        DWORD   dwMenuData;
-    }   MENUINFO, FAR *LPMENUINFO;
-#endif // MIIM_BITMAP &c
-
-// ----------------------------------------------------------------------------
-// definitions related to ListView and Header common controls, needed by
-// msw/listctrl.cpp and msw/headerctrl.cpp
-// ----------------------------------------------------------------------------
-
-#ifndef I_IMAGENONE
-    #define I_IMAGENONE (-2)
-#endif
-
 #ifndef LVS_EX_FULLROWSELECT
     #define LVS_EX_FULLROWSELECT 0x00000020
 #endif
 
-// LVS_EX_LABELTIP is not supported by Windows CE, don't define it there
-#if !defined(LVS_EX_LABELTIP) && !defined(__WXWINCE__)
+#ifndef LVS_EX_LABELTIP
     #define LVS_EX_LABELTIP 0x00004000
 #endif
 
@@ -269,18 +261,6 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
     #define HDN_GETDISPINFOW (HDN_FIRST-29)
 #endif
 
-#ifndef HDS_HOTTRACK
-    #define HDS_HOTTRACK 4
-#endif
-#ifndef HDS_FLAT
-    #define HDS_FLAT 0x0200
-#endif
-
-#ifndef HDF_SORTUP
-    #define HDF_SORTUP   0x0400
-    #define HDF_SORTDOWN 0x0200
-#endif
-
  /*
   * In addition to the above, the following are required for several compilers.
   */
@@ -336,7 +316,6 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 
 #ifdef __DMC__
 
-#ifndef VER_NT_WORKSTATION
 typedef struct _OSVERSIONINFOEX {
     DWORD dwOSVersionInfoSize;
     DWORD dwMajorVersion;
@@ -350,7 +329,6 @@ typedef struct _OSVERSIONINFOEX {
     BYTE  wProductType;
     BYTE  wReserved;
 } OSVERSIONINFOEX;
-#endif // !defined(VER_NT_WORKSTATION)
 
 #ifndef _TrackMouseEvent
     #define _TrackMouseEvent TrackMouseEvent
@@ -389,34 +367,6 @@ typedef struct _OSVERSIONINFOEX {
     #define LVM_GETHEADER (LVM_FIRST+31)
 #endif
 
-#ifndef HDLAYOUT
-    #define HDLAYOUT HD_LAYOUT
-#endif
-
-#ifndef HDITEM
-    #define HDITEM HD_ITEM
-#endif
-
-#ifndef NMHEADER
-    #define NMHEADER HD_NOTIFY
-#endif
-
-#ifndef HDS_DRAGDROP
-    #define HDS_DRAGDROP 0x0040
-#endif
-#ifndef HDS_FULLDRAG
-    #define HDS_FULLDRAG 0x0080
-#endif
-
-
-#ifndef HDN_BEGINDRAG
-    #define HDN_BEGINDRAG (HDN_FIRST - 11)
-#endif
-
-#ifndef HDN_ENDDRAG
-    #define HDN_ENDDRAG (HDN_FIRST - 10)
-#endif
-
 #ifndef LVSICF_NOSCROLL
     #define LVSICF_NOINVALIDATEALL  0x0001
     #define LVSICF_NOSCROLL         0x0002
@@ -518,152 +468,6 @@ typedef struct
 
 #endif
 
-#endif
-
-//Various defines that will be needed by mingw and possibly VC++6
-//Used by the webview library
-
-#ifndef DISPID_COMMANDSTATECHANGE
-#define DISPID_COMMANDSTATECHANGE 105
-#endif
-
-#ifndef DISPID_NAVIGATECOMPLETE2
-#define DISPID_NAVIGATECOMPLETE2 252
-#endif
-
-#ifndef DISPID_NAVIGATEERROR
-#define DISPID_NAVIGATEERROR 271
-#endif
-
-#ifndef DISPID_NEWWINDOW3
-#define DISPID_NEWWINDOW3 273
-#endif
-
-#ifndef INET_E_ERROR_FIRST
-#define INET_E_ERROR_FIRST 0x800C0002L
-#endif
-
-#ifndef INET_E_INVALID_URL
-#define INET_E_INVALID_URL 0x800C0002L
-#endif
-
-#ifndef INET_E_NO_SESSION
-#define INET_E_NO_SESSION 0x800C0003L
-#endif
-
-#ifndef INET_E_CANNOT_CONNECT
-#define INET_E_CANNOT_CONNECT 0x800C0004L
-#endif
-
-#ifndef INET_E_RESOURCE_NOT_FOUND
-#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L
-#endif
-
-#ifndef INET_E_OBJECT_NOT_FOUND
-#define INET_E_OBJECT_NOT_FOUND 0x800C0006L
-#endif
-
-#ifndef INET_E_DATA_NOT_AVAILABLE
-#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L
-#endif
-
-#ifndef INET_E_DOWNLOAD_FAILURE
-#define INET_E_DOWNLOAD_FAILURE 0x800C0008L
-#endif
-
-#ifndef INET_E_AUTHENTICATION_REQUIRED
-#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L
-#endif
-
-#ifndef INET_E_NO_VALID_MEDIA
-#define INET_E_NO_VALID_MEDIA 0x800C000AL
-#endif
-
-#ifndef INET_E_CONNECTION_TIMEOUT
-#define INET_E_CONNECTION_TIMEOUT 0x800C000BL
-#endif
-
-#ifndef INET_E_INVALID_REQUEST
-#define INET_E_INVALID_REQUEST 0x800C000CL
-#endif
-
-#ifndef INET_E_UNKNOWN_PROTOCOL
-#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL
-#endif
-
-#ifndef INET_E_SECURITY_PROBLEM
-#define INET_E_SECURITY_PROBLEM 0x800C000EL
-#endif
-
-#ifndef INET_E_CANNOT_LOAD_DATA
-#define INET_E_CANNOT_LOAD_DATA 0x800C000FL
-#endif
-
-#ifndef INET_E_CANNOT_INSTANTIATE_OBJECT
-#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L
-#endif
-
-#ifndef INET_E_QUERYOPTION_UNKNOWN
-#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L
-#endif
-
-#ifndef INET_E_REDIRECT_FAILED
-#define INET_E_REDIRECT_FAILED 0x800C0014L
-#endif
-
-#ifndef INET_E_REDIRECT_TO_DIR
-#define INET_E_REDIRECT_TO_DIR 0x800C0015L
-#endif
-
-#ifndef INET_E_CANNOT_LOCK_REQUEST
-#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L
-#endif
-
-#ifndef INET_E_USE_EXTEND_BINDING
-#define INET_E_USE_EXTEND_BINDING 0x800C0017L
-#endif
-
-#ifndef INET_E_TERMINATED_BIND
-#define INET_E_TERMINATED_BIND 0x800C0018L
-#endif
-
-#ifndef INET_E_INVALID_CERTIFICATE
-#define INET_E_INVALID_CERTIFICATE 0x800C0019L
-#endif
-
-#ifndef INET_E_CODE_DOWNLOAD_DECLINED
-#define INET_E_CODE_DOWNLOAD_DECLINED 0x800C0100L
-#endif
-
-#ifndef INET_E_RESULT_DISPATCHED
-#define INET_E_RESULT_DISPATCHED 0x800C0200L
-#endif
-
-#ifndef INET_E_CANNOT_REPLACE_SFP_FILE
-#define INET_E_CANNOT_REPLACE_SFP_FILE 0x800C0300L
-#endif
-
-#ifndef INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY
-#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L
-#endif
-
-#ifndef INET_E_CODE_INSTALL_SUPPRESSED
-#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
-#endif
-
-//We need to check if we are using MinGW or mingw-w64 as their
-//definitions are different
-
-#ifdef __MINGW32__
-#include <_mingw.h>
-#endif
-
-#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
-typedef enum CommandStateChangeConstants {
-    CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
-    CSC_NAVIGATEFORWARD = 0x1,
-    CSC_NAVIGATEBACK = 0x2
-} CommandStateChangeConstants;
 #endif
 
  /*
@@ -687,9 +491,5 @@ typedef enum CommandStateChangeConstants {
     #endif
 #endif  // defined __WINE__
 
-#ifndef INVALID_FILE_ATTRIBUTES
-    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-#endif
-
 #endif
     // _WX_MISSING_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/msgdlg.h b/Source/3rd Party/wx/include/wx/msw/msgdlg.h
index 56b41c566..690678b8d 100644
--- a/Source/3rd Party/wx/include/wx/msw/msgdlg.h	
+++ b/Source/3rd Party/wx/include/wx/msw/msgdlg.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: msgdlg.h 37164 2006-01-26 17:20:50Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,62 +12,31 @@
 #ifndef _WX_MSGBOXDLG_H_
 #define _WX_MSGBOXDLG_H_
 
-class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
+#include "wx/defs.h"
+#include "wx/dialog.h"
+
+/*
+ * Message box dialog
+ */
+
+extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[];
+
+class WXDLLEXPORT wxMessageDialog: public wxDialog, public wxMessageDialogBase
 {
-public:
-    wxMessageDialog(wxWindow *parent,
-                    const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
-                    long style = wxOK|wxCENTRE,
-                    const wxPoint& WXUNUSED(pos) = wxDefaultPosition)
-        : wxMessageDialogBase(parent, message, caption, style)
-    {
-        m_hook = NULL;
-    }
-
-    virtual int ShowModal();
-
-    // implementation-specific
-
-    // return the font used for the text in the message box
-    static wxFont GetMessageFont();
-
+DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 protected:
-    // Override this as task dialogs are always centered on parent.
-    virtual void DoCentre(int dir);
+    wxString    m_caption;
+    wxString    m_message;
+    wxWindow *  m_parent;
+public:
+    wxMessageDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
+        long style = wxOK|wxCENTRE, const wxPoint& pos = wxDefaultPosition);
 
-private:
-    // hook procedure used to adjust the message box beyond what the standard
-    // MessageBox() function can do for us
-    static WXLRESULT wxCALLBACK HookFunction(int code, WXWPARAM, WXLPARAM);
+    int ShowModal(void);
 
-    static const struct ButtonAccessors
-    {
-        int id;
-        wxString (wxMessageDialog::*getter)() const;
-    } ms_buttons[];
-
-    // replace the static text control with a text control in order to show
-    // scrollbar (and also, incidentally, allow text selection)
-    void ReplaceStaticWithEdit();
-
-    // adjust the button labels
-    //
-    // this is called from HookFunction() and our HWND is valid at this moment
-    void AdjustButtonLabels();
-
-    // offset all buttons starting from the first one given by dx to the right
-    void OffsetButtonsStartingFrom(int first, int dx);
-
-    // used by ShowModal() to display a message box when task dialogs
-    // aren't available.
-    int ShowMessageBox();
-
-
-    WXHANDLE m_hook; // HHOOK used to position the message box
-
-    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMessageDialog);
+    DECLARE_NO_COPY_CLASS(wxMessageDialog)
 };
 
 
-#endif // _WX_MSGBOXDLG_H_
+#endif
+    // _WX_MSGBOXDLG_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/mslu.h b/Source/3rd Party/wx/include/wx/msw/mslu.h
index 2af955973..83f4060d7 100644
--- a/Source/3rd Party/wx/include/wx/msw/mslu.h	
+++ b/Source/3rd Party/wx/include/wx/msw/mslu.h	
@@ -5,7 +5,7 @@
 // Modified by: Vadim Zeitlin to move out various functions to other files
 //              to fix header inter-dependencies
 // Created:     2002/02/17
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: mslu.h 42462 2006-10-26 19:06:51Z VZ $
 // Copyright:   (c) 2002 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Source/3rd Party/wx/include/wx/msw/msvcrt.h b/Source/3rd Party/wx/include/wx/msw/msvcrt.h
index f211fe401..15c4dfbde 100644
--- a/Source/3rd Party/wx/include/wx/msw/msvcrt.h	
+++ b/Source/3rd Party/wx/include/wx/msw/msvcrt.h	
@@ -5,7 +5,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.01.1999
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: msvcrt.h 42363 2006-10-24 23:19:12Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,8 +14,7 @@
 // used like this:
 //      wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
 // to turn on memory leak checks for programs compiled with Microsoft Visual
-// C++ (5.0+). The macro will not be defined under other compilers or if it
-// can't be used with MSVC for whatever reason.
+// C++ (5.0+). The macro will expand to nothing under other compilers.
 
 #ifndef _MSW_MSVCRT_H_
 #define _MSW_MSVCRT_H_
@@ -23,7 +22,7 @@
 // use debug CRT functions for memory leak detections in VC++ 5.0+ in debug
 // builds
 #undef wxUSE_VC_CRTDBG
-#if defined(_DEBUG) && defined(__VISUALC__) && (__VISUALC__ >= 1000) \
+#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ >= 1000) \
     && !defined(UNDER_CE)
     // it doesn't combine well with wxWin own memory debugging methods
     #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__)
@@ -32,6 +31,11 @@
 #endif
 
 #ifdef wxUSE_VC_CRTDBG
+    // VC++ uses this macro as debug/release mode indicator
+    #ifndef _DEBUG
+        #define _DEBUG
+    #endif
+
     // Need to undef new if including crtdbg.h which may redefine new itself
     #ifdef new
         #undef new
@@ -39,7 +43,7 @@
 
     #include <stdlib.h>
     #ifndef _CRTBLD
-        // Needed when building with pure MS SDK
+        // Need when builded with pure MS SDK
         #define _CRTBLD
     #endif
 
@@ -50,7 +54,7 @@
 
     // this define works around a bug with inline declarations of new, see
     //
-    //      http://support.microsoft.com/kb/q140858/
+    //      http://support.microsoft.com/support/kb/articles/Q140/8/58.asp
     //
     // for the details
     #define new  WXDEBUG_NEW
diff --git a/Source/3rd Party/wx/include/wx/msw/nonownedwnd.h b/Source/3rd Party/wx/include/wx/msw/nonownedwnd.h
deleted file mode 100644
index e87ae8e7c..000000000
--- a/Source/3rd Party/wx/include/wx/msw/nonownedwnd.h	
+++ /dev/null
@@ -1,39 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/nonownedwnd.h
-// Purpose:     wxNonOwnedWindow declaration for wxMSW.
-// Author:      Vadim Zeitlin
-// Created:     2011-10-09
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_NONOWNEDWND_H_
-#define _WX_MSW_NONOWNEDWND_H_
-
-class wxNonOwnedWindowShapeImpl;
-
-// ----------------------------------------------------------------------------
-// wxNonOwnedWindow
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase
-{
-public:
-    wxNonOwnedWindow();
-    virtual ~wxNonOwnedWindow();
-
-protected:
-    virtual bool DoClearShape();
-    virtual bool DoSetRegionShape(const wxRegion& region);
-#if wxUSE_GRAPHICS_CONTEXT
-    virtual bool DoSetPathShape(const wxGraphicsPath& path);
-
-private:
-    wxNonOwnedWindowShapeImpl* m_shapeImpl;
-#endif // wxUSE_GRAPHICS_CONTEXT
-
-    wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindow);
-};
-
-#endif // _WX_MSW_NONOWNEDWND_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/notebook.h b/Source/3rd Party/wx/include/wx/msw/notebook.h
index e141bf523..5832c2d0e 100644
--- a/Source/3rd Party/wx/include/wx/msw/notebook.h	
+++ b/Source/3rd Party/wx/include/wx/msw/notebook.h	
@@ -3,7 +3,7 @@
 // Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
 // Author:      Robert Roebling
 // Modified by: Vadim Zeitlin for Windows version
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: notebook.h 41797 2006-10-09 12:10:01Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,7 +23,41 @@
 // wxNotebook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
+class WXDLLEXPORT wxNotebookPageInfo : public wxObject
+{
+public :
+    wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; }
+    virtual ~wxNotebookPageInfo() { }
+
+    void Create(wxNotebookPage *page,
+                const wxString& text,
+                bool selected,
+                int imageId)
+    {
+        m_page = page;
+        m_text = text;
+        m_selected = selected;
+        m_imageId = imageId;
+    }
+
+    wxNotebookPage* GetPage() const { return m_page; }
+    wxString GetText() const { return m_text; }
+    bool GetSelected() const { return m_selected; }
+    int GetImageId() const { return m_imageId; }
+
+private:
+    wxNotebookPage *m_page;
+    wxString m_text;
+    bool m_selected;
+    int m_imageId;
+
+    DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo)
+};
+
+
+WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
+
+class WXDLLEXPORT wxNotebook : public wxNotebookBase
 {
 public:
   // ctors
@@ -52,9 +86,11 @@ public:
   virtual size_t GetPageCount() const;
 
     // set the currently selected page, return the index of the previously
-    // selected one (or wxNOT_FOUND on error)
+    // selected one (or -1 on error)
     // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
   int SetSelection(size_t nPage);
+    // get the currently selected page
+  int GetSelection() const { return m_nSelection; }
 
     // changes selected page without sending events
   int ChangeSelection(size_t nPage);
@@ -96,7 +132,10 @@ public:
                   wxNotebookPage *pPage,
                   const wxString& strText,
                   bool bSelect = false,
-                  int imageId = NO_IMAGE);
+                  int imageId = -1);
+
+  void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ); }
+  const wxNotebookPageInfoList& GetPageInfos() const;
 
     // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
     // style.
@@ -111,6 +150,7 @@ public:
   // callbacks
   // ---------
   void OnSize(wxSizeEvent& event);
+  void OnSelChange(wxNotebookEvent& event);
   void OnNavigationKey(wxNavigationKeyEvent& event);
 
   // base class virtuals
@@ -142,10 +182,11 @@ public:
       return true;
   }
 
+  // return the themed brush for painting our children
+  virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, WXHWND hWnd);
+
   // draw child background
   virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win);
-
-  virtual bool MSWHasInheritableBackground() const { return true; }
 #endif // wxUSE_UXTHEME
 
   // translate wxWin styles to the Windows ones
@@ -156,7 +197,7 @@ protected:
   void Init();
 
   // hides the currently shown page and shows the given one (if not -1) and
-  // updates m_selection accordingly
+  // updates m_nSelection accordingly
   void UpdateSelection(int selNew);
 
   // remove one page from the notebook, without deleting
@@ -171,9 +212,6 @@ protected:
   void AdjustPageSize(wxNotebookPage *page);
 
 #if wxUSE_UXTHEME
-  // return the themed brush for painting our children
-  virtual WXHBRUSH MSWGetCustomBgBrush() { return m_hbrBackground; }
-
   // gets the bitmap of notebook background and returns a brush from it
   WXHBRUSH QueryBgBitmap();
 
@@ -194,11 +232,13 @@ protected:
 
   // true if we have already subclassed our updown control
   bool m_hasSubclassedUpdown;
-
-  // true if we already refreshed the current page after showing the window
-  bool m_doneUpdateHack;
 #endif // __WXWINCE__
 
+  // the current selection (-1 if none)
+  int m_nSelection;
+
+  wxNotebookPageInfoList m_pageInfos;
+
 #if wxUSE_UXTHEME
   // background brush used to paint the tab control
   WXHBRUSH m_hbrBackground;
diff --git a/Source/3rd Party/wx/include/wx/msw/ole/activex.h b/Source/3rd Party/wx/include/wx/msw/ole/activex.h
index a599fb2fe..20de45c2d 100644
--- a/Source/3rd Party/wx/include/wx/msw/ole/activex.h	
+++ b/Source/3rd Party/wx/include/wx/msw/ole/activex.h	
@@ -4,7 +4,7 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>
 // Modified by:
 // Created:     8/18/05
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: activex.h 41793 2006-10-09 09:32:08Z ABX $
 // Copyright:   (c) Ryan Norton
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -27,8 +27,6 @@
 #include "wx/window.h"
 #include "wx/variant.h"
 
-class FrameSite;
-
 //---------------------------------------------------------------------------
 // MSW COM includes
 //---------------------------------------------------------------------------
@@ -71,94 +69,78 @@ class FrameSite;
 //
 //---------------------------------------------------------------------------
 
-template<typename I>
-class wxAutoOleInterface
-{
-public:
-    typedef I Interface;
-
-    explicit wxAutoOleInterface(I *pInterface = NULL) : m_interface(pInterface)
-        {}
-    wxAutoOleInterface(REFIID riid, IUnknown *pUnk) : m_interface(NULL)
-        { QueryInterface(riid, pUnk); }
-    wxAutoOleInterface(REFIID riid, IDispatch *pDispatch) : m_interface(NULL)
-        { QueryInterface(riid, pDispatch); }
-    wxAutoOleInterface(REFCLSID clsid, REFIID riid) : m_interface(NULL)
-        { CreateInstance(clsid, riid); }
-    wxAutoOleInterface(const wxAutoOleInterface& ti) : m_interface(NULL)
-        { operator=(ti); }
-
-    wxAutoOleInterface& operator=(const wxAutoOleInterface& ti)
-    {
-        if ( ti.m_interface )
-            ti.m_interface->AddRef();
-        Free();
-        m_interface = ti.m_interface;
-        return *this;
-    }
-
-    wxAutoOleInterface& operator=(I*& ti)
-    {
-        Free();
-        m_interface = ti;
-        return *this;
-    }
-
-    ~wxAutoOleInterface() { Free(); }
-
-    void Free()
-    {
-        if ( m_interface )
-            m_interface->Release();
-        m_interface = NULL;
-    }
-
-    HRESULT QueryInterface(REFIID riid, IUnknown *pUnk)
-    {
-        Free();
-        wxASSERT(pUnk != NULL);
-        return pUnk->QueryInterface(riid, (void **)&m_interface);
-    }
-
-    HRESULT CreateInstance(REFCLSID clsid, REFIID riid)
-    {
-        Free();
-        return CoCreateInstance
-               (
-                   clsid,
-                   NULL,
-                   CLSCTX_ALL,
-                   riid,
-                   (void **)&m_interface
-               );
-    }
-
-    operator I*() const {return m_interface; }
-    I* operator->() {return m_interface; }
-    I** GetRef() {return &m_interface; }
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_interface != NULL; }
-
-protected:
-    I *m_interface;
+#define WX_DECLARE_AUTOOLE(wxAutoOleInterface, I) \
+class wxAutoOleInterface \
+{   \
+    protected: \
+    I *m_interface; \
+\
+    public: \
+    explicit wxAutoOleInterface(I *pInterface = NULL) : m_interface(pInterface) {} \
+    wxAutoOleInterface(REFIID riid, IUnknown *pUnk) : m_interface(NULL) \
+    {   QueryInterface(riid, pUnk); } \
+    wxAutoOleInterface(REFIID riid, IDispatch *pDispatch) : m_interface(NULL) \
+    {   QueryInterface(riid, pDispatch); } \
+    wxAutoOleInterface(REFCLSID clsid, REFIID riid) : m_interface(NULL)\
+    {   CreateInstance(clsid, riid); }\
+    wxAutoOleInterface(const wxAutoOleInterface& ti) : m_interface(NULL)\
+    {   operator = (ti); }\
+\
+    wxAutoOleInterface& operator = (const wxAutoOleInterface& ti)\
+    {\
+        if (ti.m_interface)\
+            ti.m_interface->AddRef();\
+        Free();\
+        m_interface = ti.m_interface;\
+        return *this;\
+    }\
+\
+    wxAutoOleInterface& operator = (I *&ti)\
+    {\
+        Free();\
+        m_interface = ti;\
+        return *this;\
+    }\
+\
+    ~wxAutoOleInterface() {   Free();   }\
+\
+    inline void Free()\
+    {\
+        if (m_interface)\
+            m_interface->Release();\
+        m_interface = NULL;\
+    }\
+\
+    HRESULT QueryInterface(REFIID riid, IUnknown *pUnk)\
+    {\
+        Free();\
+        wxASSERT(pUnk != NULL);\
+        return pUnk->QueryInterface(riid, (void **) &m_interface);\
+    }\
+\
+    HRESULT CreateInstance(REFCLSID clsid, REFIID riid)\
+    {\
+        Free();\
+        return CoCreateInstance(clsid, NULL, CLSCTX_ALL, riid, (void **) &m_interface);\
+    }\
+\
+    inline operator I *() const {return m_interface;}\
+    inline I* operator ->() {return m_interface;}\
+    inline I** GetRef()    {return &m_interface;}\
+    inline bool Ok() const { return IsOk(); }\
+    inline bool IsOk() const    {return m_interface != NULL;}\
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-// this macro is kept for compatibility with older wx versions
-#define WX_DECLARE_AUTOOLE(wxAutoOleInterfaceType, I) \
-    typedef wxAutoOleInterface<I> wxAutoOleInterfaceType;
-#endif // WXWIN_COMPATIBILITY_2_8
+WX_DECLARE_AUTOOLE(wxAutoIDispatch, IDispatch)
+WX_DECLARE_AUTOOLE(wxAutoIOleClientSite, IOleClientSite)
+WX_DECLARE_AUTOOLE(wxAutoIUnknown, IUnknown)
+WX_DECLARE_AUTOOLE(wxAutoIOleObject, IOleObject)
+WX_DECLARE_AUTOOLE(wxAutoIOleInPlaceObject, IOleInPlaceObject)
+WX_DECLARE_AUTOOLE(wxAutoIOleInPlaceActiveObject, IOleInPlaceActiveObject)
+WX_DECLARE_AUTOOLE(wxAutoIOleDocumentView, IOleDocumentView)
+WX_DECLARE_AUTOOLE(wxAutoIViewObject, IViewObject)
 
-typedef wxAutoOleInterface<IDispatch> wxAutoIDispatch;
-typedef wxAutoOleInterface<IOleClientSite> wxAutoIOleClientSite;
-typedef wxAutoOleInterface<IUnknown> wxAutoIUnknown;
-typedef wxAutoOleInterface<IOleObject> wxAutoIOleObject;
-typedef wxAutoOleInterface<IOleInPlaceObject> wxAutoIOleInPlaceObject;
-typedef wxAutoOleInterface<IOleInPlaceActiveObject> wxAutoIOleInPlaceActiveObject;
-typedef wxAutoOleInterface<IOleDocumentView> wxAutoIOleDocumentView;
-typedef wxAutoOleInterface<IViewObject> wxAutoIViewObject;
-
-class WXDLLIMPEXP_CORE wxActiveXContainer : public wxWindow
+class wxActiveXContainer : public wxWindow
 {
 public:
     wxActiveXContainer(wxWindow * parent, REFIID iid, IUnknown* pUnk);
@@ -168,14 +150,11 @@ public:
     void OnPaint(wxPaintEvent&);
     void OnSetFocus(wxFocusEvent&);
     void OnKillFocus(wxFocusEvent&);
-    virtual bool MSWTranslateMessage(WXMSG* pMsg);
-    virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc);
 
 protected:
     friend class FrameSite;
     friend class wxActiveXEvents;
 
-    FrameSite *m_frameSite;
     wxAutoIDispatch            m_Dispatch;
     wxAutoIOleClientSite      m_clientSite;
     wxAutoIUnknown         m_ActiveX;
@@ -192,30 +171,9 @@ protected:
     void CreateActiveX(REFIID, IUnknown*);
 };
 
-///\brief Store native event parameters.
-///\detail Store OLE 'Invoke' parameters for event handlers that need to access them.
-/// These are the exact values for the event as they are passed to the wxActiveXContainer.
-struct wxActiveXEventNativeMSW
-{
-    DISPID  dispIdMember;
-    REFIID  riid;
-    LCID    lcid;
-    WORD    wFlags;
-    DISPPARAMS  *pDispParams;
-    VARIANT     *pVarResult;
-    EXCEPINFO   *pExcepInfo;
-    unsigned int *puArgErr;
-
-    wxActiveXEventNativeMSW
-        (DISPID a_dispIdMember, REFIID a_riid, LCID a_lcid, WORD a_wFlags, DISPPARAMS  *a_pDispParams,
-        VARIANT *a_pVarResult, EXCEPINFO *a_pExcepInfo, unsigned int *a_puArgErr)
-        :dispIdMember(a_dispIdMember), riid(a_riid), lcid(a_lcid), wFlags(a_wFlags), pDispParams(a_pDispParams),
-        pVarResult(a_pVarResult), pExcepInfo(a_pExcepInfo), puArgErr(a_puArgErr)
-    { }
-};
 
 // Events
-class WXDLLIMPEXP_CORE wxActiveXEvent : public wxCommandEvent
+class wxActiveXEvent : public wxCommandEvent
 {
 private:
     friend class wxActiveXEvents;
@@ -226,38 +184,37 @@ public:
     virtual wxEvent *Clone() const
     { return new wxActiveXEvent(*this); }
 
-    size_t ParamCount() const;
+    size_t ParamCount() const
+    {   return m_params.GetCount();  }
 
     wxString ParamType(size_t idx) const
     {
-        wxASSERT(idx < ParamCount());
+        wxASSERT(idx < m_params.GetCount());
         return m_params[idx].GetType();
     }
 
     wxString ParamName(size_t idx) const
     {
-        wxASSERT(idx < ParamCount());
+        wxASSERT(idx < m_params.GetCount());
         return m_params[idx].GetName();
     }
 
-    wxVariant& operator[] (size_t idx);
+    wxVariant& operator[] (size_t idx)
+    {
+        wxASSERT(idx < ParamCount());
+        return m_params[idx];
+    }
 
     DISPID GetDispatchId() const
     {   return m_dispid;    }
-
-    wxActiveXEventNativeMSW *GetNativeParameters() const
-    {   return (wxActiveXEventNativeMSW*)GetClientData(); }
 };
 
-// #define wxACTIVEX_ID    14001
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_ACTIVEX, wxActiveXEvent );
-
+#define wxACTIVEX_ID    14001
+DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_ACTIVEX, wxACTIVEX_ID)
 typedef void (wxEvtHandler::*wxActiveXEventFunction)(wxActiveXEvent&);
-
+#define EVT_ACTIVEX(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_ACTIVEX, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxActiveXEventFunction) & fn, (wxObject *) NULL ),
 #define wxActiveXEventHandler(func) \
-    wxEVENT_HANDLER_CAST( wxActiveXEventFunction, func )
-
-#define EVT_ACTIVEX(id, fn)     wxDECLARE_EVENT_TABLE_ENTRY(wxEVT_ACTIVEX, id, -1, wxActiveXEventHandler( fn ), NULL ),
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxActiveXEventFunction, &func)
 
 #endif // wxUSE_ACTIVEX
 
diff --git a/Source/3rd Party/wx/include/wx/msw/ole/automtn.h b/Source/3rd Party/wx/include/wx/msw/ole/automtn.h
index 028819470..9dd1e3763 100644
--- a/Source/3rd Party/wx/include/wx/msw/ole/automtn.h	
+++ b/Source/3rd Party/wx/include/wx/msw/ole/automtn.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/ole/automtn.h
+// Name:        automtn.h
 // Purpose:     OLE automation utilities
 // Author:      Julian Smart
 // Modified by:
 // Created:     11/6/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: automtn.h 45498 2007-04-16 13:03:05Z VZ $
 // Copyright:   (c) 1998, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,43 +26,27 @@ typedef unsigned short* WXBSTR;
 #undef GetObject
 #endif
 
-// Flags used with wxAutomationObject::GetInstance()
-enum wxAutomationInstanceFlags
-{
-    // Only use the existing instance, never create a new one.
-    wxAutomationInstance_UseExistingOnly = 0,
-
-    // Create a new instance if there are no existing ones.
-    wxAutomationInstance_CreateIfNeeded = 1,
-
-    // Do not log errors if we failed to get the existing instance because none
-    // is available.
-    wxAutomationInstance_SilentIfNone = 2
-};
-
 /*
  * wxAutomationObject
  * Wraps up an IDispatch pointer and invocation; does variant conversion.
  */
 
-class WXDLLIMPEXP_CORE wxAutomationObject: public wxObject
+class WXDLLEXPORT wxAutomationObject: public wxObject
 {
 public:
     wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL);
     virtual ~wxAutomationObject();
 
     // Set/get dispatch pointer
-    void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }
-    WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
-    bool IsOk() const { return m_dispatchPtr != NULL; }
+    inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }
+    inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
 
     // Get a dispatch pointer from the current object associated
-    // with a ProgID, such as "Excel.Application"
-    bool GetInstance(const wxString& progId,
-                     int flags = wxAutomationInstance_CreateIfNeeded) const;
+    // with a class id, such as "Excel.Application"
+    bool GetInstance(const wxString& classId) const;
 
-    // Get a dispatch pointer from a new instance of the class
-    bool CreateInstance(const wxString& progId) const;
+    // Get a dispatch pointer from a new instance of the the class
+    bool CreateInstance(const wxString& classId) const;
 
     // Low-level invocation function. Pass either an array of variants,
     // or an array of pointers to variants.
@@ -80,7 +64,7 @@ public:
         const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant);
 
     // Get/Put property
-    wxVariant GetProperty(const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const;
+    wxVariant GetProperty(const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const;
     wxVariant GetPropertyArray(const wxString& property, int noArgs, const wxVariant **args) const;
     wxVariant GetProperty(const wxString& property,
         const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant,
@@ -103,13 +87,13 @@ public:
 
     // A way of initialising another wxAutomationObject with a dispatch object,
     // without having to deal with nasty IDispatch pointers.
-    bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const;
+    bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const;
     bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs, const wxVariant **args) const;
 
 public:
     WXIDISPATCH*  m_dispatchPtr;
 
-    wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
+    DECLARE_NO_COPY_CLASS(wxAutomationObject)
 };
 
 #endif // wxUSE_OLE_AUTOMATION
diff --git a/Source/3rd Party/wx/include/wx/msw/ole/dataform.h b/Source/3rd Party/wx/include/wx/msw/ole/dataform.h
index a0eb5702a..f94c87f86 100644
--- a/Source/3rd Party/wx/include/wx/msw/ole/dataform.h	
+++ b/Source/3rd Party/wx/include/wx/msw/ole/dataform.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/ole/dataform.h
+// Name:        msw/ole/dataform.h
 // Purpose:     declaration of the wxDataFormat class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.10.99 (extracted from msw/ole/dataobj.h)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dataform.h 28812 2004-08-16 12:45:46Z ABX $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,21 +16,14 @@
 // wxDataFormat identifies the single format of data
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDataFormat
+class WXDLLEXPORT wxDataFormat
 {
 public:
     // the clipboard formats under Win32 are WORD's
     typedef unsigned short NativeFormat;
 
     wxDataFormat(NativeFormat format = wxDF_INVALID) { m_format = format; }
-
-    // we need constructors from all string types as implicit conversions to
-    // wxString don't apply when we already rely on implicit conversion of a,
-    // for example, "char *" string to wxDataFormat, and existing code does it
-    wxDataFormat(const wxString& format) { SetId(format); }
-    wxDataFormat(const char *format) { SetId(format); }
-    wxDataFormat(const wchar_t *format) { SetId(format); }
-    wxDataFormat(const wxCStrData& format) { SetId(format); }
+    wxDataFormat(const wxChar *format) { SetId(format); }
 
     wxDataFormat& operator=(NativeFormat format)
         { m_format = format; return *this; }
@@ -62,7 +55,7 @@ public:
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
-    void SetId(const wxString& format);
+    void SetId(const wxChar *format);
 
     // returns true if the format is one of those defined in wxDataFormatId
     bool IsStandard() const { return m_format > 0 && m_format < wxDF_PRIVATE; }
diff --git a/Source/3rd Party/wx/include/wx/msw/ole/dataobj.h b/Source/3rd Party/wx/include/wx/msw/ole/dataobj.h
index 152793d5e..71cd44553 100644
--- a/Source/3rd Party/wx/include/wx/msw/ole/dataobj.h	
+++ b/Source/3rd Party/wx/include/wx/msw/ole/dataobj.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/ole/dataobj.h
+// Name:        msw/ole/dataobj.h
 // Purpose:     declaration of the wxDataObject class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.05.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dataobj.h 37406 2006-02-09 03:45:14Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@ struct IDataObject;
 // wxDataObject is a "smart" and polymorphic piece of data.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
+class WXDLLEXPORT wxDataObject : public wxDataObjectBase
 {
 public:
     // ctor & dtor
@@ -59,7 +59,7 @@ public:
 
     #define wxGetFormatName(format) wxDataObject::GetFormatName(format)
 #else // !Debug
-    #define wxGetFormatName(format) wxT("")
+    #define wxGetFormatName(format) _T("")
 #endif // Debug/!Debug
     // they need to be accessed from wxIDataObject, so made them public,
     // or wxIDataObject friend
@@ -73,7 +73,7 @@ public:
 private:
     IDataObject *m_pIDataObject; // pointer to the COM interface
 
-    wxDECLARE_NO_COPY_CLASS(wxDataObject);
+    DECLARE_NO_COPY_CLASS(wxDataObject)
 };
 
 #endif  //_WX_MSW_OLE_DATAOBJ_H
diff --git a/Source/3rd Party/wx/include/wx/msw/ole/dataobj2.h b/Source/3rd Party/wx/include/wx/msw/ole/dataobj2.h
index cc5e7ba2a..dc1954d0b 100644
--- a/Source/3rd Party/wx/include/wx/msw/ole/dataobj2.h	
+++ b/Source/3rd Party/wx/include/wx/msw/ole/dataobj2.h	
@@ -5,7 +5,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.10.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dataobj2.h 40772 2006-08-23 13:38:45Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -21,7 +21,7 @@
 //     rarely used). This is ugly, but I haven't found a solution for it yet.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
+class WXDLLEXPORT wxBitmapDataObject : public wxBitmapDataObjectBase
 {
 public:
     // ctors
@@ -51,7 +51,7 @@ private:
     // the DIB data
     void /* BITMAPINFO */ *m_data;
 
-    wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject);
+    DECLARE_NO_COPY_CLASS(wxBitmapDataObject)
 };
 
 // ----------------------------------------------------------------------------
@@ -60,7 +60,7 @@ private:
 // FIXME did I already mention it was ugly?
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBitmapDataObject2 : public wxBitmapDataObjectBase
+class WXDLLEXPORT wxBitmapDataObject2 : public wxBitmapDataObjectBase
 {
 public:
     // ctors
@@ -84,14 +84,14 @@ public:
         { return SetData(len, buf); }
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxBitmapDataObject2);
+    DECLARE_NO_COPY_CLASS(wxBitmapDataObject2)
 };
 
 // ----------------------------------------------------------------------------
 // wxFileDataObject - data object for CF_HDROP
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
+class WXDLLEXPORT wxFileDataObject : public wxFileDataObjectBase
 {
 public:
     wxFileDataObject() { }
@@ -112,14 +112,14 @@ public:
         { return SetData(len, buf); }
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxFileDataObject);
+    DECLARE_NO_COPY_CLASS(wxFileDataObject)
 };
 
 // ----------------------------------------------------------------------------
 // wxURLDataObject: data object for URLs
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite
+class WXDLLEXPORT wxURLDataObject : public wxDataObjectComposite
 {
 public:
     // initialize with URL in ctor or use SetURL later
@@ -140,7 +140,7 @@ private:
     // last data object we got data in
     wxDataObjectSimple *m_dataObjectLast;
 
-    wxDECLARE_NO_COPY_CLASS(wxURLDataObject);
+    DECLARE_NO_COPY_CLASS(wxURLDataObject)
 };
 
 #endif // _WX_MSW_OLE_DATAOBJ2_H
diff --git a/Source/3rd Party/wx/include/wx/msw/ole/dropsrc.h b/Source/3rd Party/wx/include/wx/msw/ole/dropsrc.h
index e8eb6e257..8646558f9 100644
--- a/Source/3rd Party/wx/include/wx/msw/ole/dropsrc.h	
+++ b/Source/3rd Party/wx/include/wx/msw/ole/dropsrc.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/ole/dropsrc.h
+// Name:        ole/dropsrc.h
 // Purpose:     declaration of the wxDropSource class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.03.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dropsrc.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,14 +30,14 @@ class WXDLLIMPEXP_FWD_CORE wxWindow;
 // the cursor 'name' from the resources under MSW, but will expand to
 // something else under GTK. If you don't use it, you will have to use #ifdef
 // in the application code.
-#define wxDROP_ICON(name)   wxCursor(wxT(#name))
+#define wxDROP_ICON(name)   wxCursor(_T(#name))
 
 // ----------------------------------------------------------------------------
 // wxDropSource is used to start the drag-&-drop operation on associated
 // wxDataObject object. It's responsible for giving UI feedback while dragging.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDropSource : public wxDropSourceBase
+class WXDLLEXPORT wxDropSource : public wxDropSourceBase
 {
 public:
     // ctors: if you use default ctor you must call SetData() later!
@@ -71,7 +71,7 @@ protected:
 private:
     wxIDropSource *m_pIDropSource;  // the pointer to COM interface
 
-    wxDECLARE_NO_COPY_CLASS(wxDropSource);
+    DECLARE_NO_COPY_CLASS(wxDropSource)
 };
 
 #endif  //wxUSE_DRAG_AND_DROP
diff --git a/Source/3rd Party/wx/include/wx/msw/ole/droptgt.h b/Source/3rd Party/wx/include/wx/msw/ole/droptgt.h
index fe82962f7..a1d44a0ef 100644
--- a/Source/3rd Party/wx/include/wx/msw/ole/droptgt.h	
+++ b/Source/3rd Party/wx/include/wx/msw/ole/droptgt.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/ole/droptgt.h
+// Name:        ole/droptgt.h
 // Purpose:     declaration of the wxDropTarget class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.03.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: droptgt.h 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -31,7 +31,7 @@ struct IDataObject;
 // (all of them, including protected ones which are called by the class itself)
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase
+class WXDLLEXPORT wxDropTarget : public wxDropTargetBase
 {
 public:
     // ctor & dtor
@@ -47,27 +47,24 @@ public:
     virtual bool OnDrop(wxCoord x, wxCoord y);
     virtual bool GetData();
 
-    // Can only be called during OnXXX methods.
-    wxDataFormat GetMatchingPair();
-
     // implementation only from now on
     // -------------------------------
 
     // do we accept this kind of data?
-    bool MSWIsAcceptedData(IDataObject *pIDataSource) const;
+    bool IsAcceptedData(IDataObject *pIDataSource) const;
 
     // give us the data source from IDropTarget::Drop() - this is later used by
     // GetData() when it's called from inside OnData()
-    void MSWSetDataSource(IDataObject *pIDataSource);
+    void SetDataSource(IDataObject *pIDataSource);
 
 private:
     // helper used by IsAcceptedData() and GetData()
-    wxDataFormat MSWGetSupportedFormat(IDataObject *pIDataSource) const;
+    wxDataFormat GetSupportedFormat(IDataObject *pIDataSource) const;
 
     wxIDropTarget *m_pIDropTarget; // the pointer to our COM interface
     IDataObject   *m_pIDataSource; // the pointer to the source data object
 
-    wxDECLARE_NO_COPY_CLASS(wxDropTarget);
+    DECLARE_NO_COPY_CLASS(wxDropTarget)
 };
 
 #endif  //wxUSE_DRAG_AND_DROP
diff --git a/Source/3rd Party/wx/include/wx/msw/ole/oleutils.h b/Source/3rd Party/wx/include/wx/msw/ole/oleutils.h
index 833acd1ac..635c11b19 100644
--- a/Source/3rd Party/wx/include/wx/msw/ole/oleutils.h	
+++ b/Source/3rd Party/wx/include/wx/msw/ole/oleutils.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/ole/oleutils.h
+// Name:        oleutils.h
 // Purpose:     OLE helper routines, OLE debugging support &c
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.02.1998
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: oleutils.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -36,19 +36,12 @@
 // return true if ok, false otherwise
 inline bool wxOleInitialize()
 {
-    HRESULT
+    // we need to initialize OLE library
 #ifdef __WXWINCE__
-     hr = ::CoInitializeEx(NULL, COINIT_MULTITHREADED);
+    if ( FAILED(::CoInitializeEx(NULL, COINIT_MULTITHREADED)) )
 #else
-     hr = ::OleInitialize(NULL);
+    if ( FAILED(::OleInitialize(NULL)) )
 #endif
-
-    // RPC_E_CHANGED_MODE indicates that OLE had been already initialized
-    // before, albeit with different mode. Don't consider it to be an error as
-    // we don't actually care ourselves about the mode used so this allows the
-    // main application to call OleInitialize() on its own before we do if it
-    // needs non-default mode.
-    if ( hr != RPC_E_CHANGED_MODE && FAILED(hr) )
     {
         wxLogError(_("Cannot initialize OLE"));
 
@@ -82,7 +75,7 @@ inline void ReleaseInterface(IUnknown *pIUnk)
 #define   RELEASE_AND_NULL(p)   if ( (p) != NULL ) { p->Release(); p = NULL; };
 
 // return true if the iid is in the array
-extern WXDLLIMPEXP_CORE bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
+extern bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 
 // ============================================================================
 // IUnknown implementation helpers
@@ -140,10 +133,9 @@ private:
     wxAutoULong           m_cRef
 
 // macros for declaring supported interfaces
-// NB: ADD_IID prepends IID_I whereas ADD_RAW_IID does not
+// NB: you should write ADD_INTERFACE(Foo) and not ADD_INTERFACE(IID_IFoo)!
 #define BEGIN_IID_TABLE(cname)  const IID *cname::ms_aIids[] = {
 #define ADD_IID(iid)                                             &IID_I##iid,
-#define ADD_RAW_IID(iid)                                         &iid,
 #define END_IID_TABLE                                          }
 
 // implementation is as straightforward as possible
@@ -151,7 +143,7 @@ private:
 #define   IMPLEMENT_IUNKNOWN_METHODS(classname)                               \
   STDMETHODIMP classname::QueryInterface(REFIID riid, void **ppv)             \
   {                                                                           \
-    wxLogQueryInterface(wxT(#classname), riid);                               \
+    wxLogQueryInterface(_T(#classname), riid);                                \
                                                                               \
     if ( IsIidFromList(riid, ms_aIids, WXSIZEOF(ms_aIids)) ) {                \
       *ppv = this;                                                            \
@@ -168,14 +160,14 @@ private:
                                                                               \
   STDMETHODIMP_(ULONG) classname::AddRef()                                    \
   {                                                                           \
-    wxLogAddRef(wxT(#classname), m_cRef);                                     \
+    wxLogAddRef(_T(#classname), m_cRef);                                      \
                                                                               \
     return ++m_cRef;                                                          \
   }                                                                           \
                                                                               \
   STDMETHODIMP_(ULONG) classname::Release()                                   \
   {                                                                           \
-    wxLogRelease(wxT(#classname), m_cRef);                                    \
+    wxLogRelease(_T(#classname), m_cRef);                                     \
                                                                               \
     if ( --m_cRef == wxAutoULong(0) ) {                                                    \
       delete this;                                                            \
@@ -192,17 +184,17 @@ private:
 // VZ: I don't know it's not done for compilers other than VC++ but I leave it
 //     as is. Please note, though, that tracing OLE interface calls may be
 //     incredibly useful when debugging OLE programs.
-#if defined(__WXDEBUG__) && (( defined(__VISUALC__) && (__VISUALC__ >= 1000) ))
+#if defined(__WXDEBUG__) && ( ( defined(__VISUALC__) && (__VISUALC__ >= 1000) ) || defined(__MWERKS__) )
 // ----------------------------------------------------------------------------
 // All OLE specific log functions have DebugTrace level (as LogTrace)
 // ----------------------------------------------------------------------------
 
 // tries to translate riid into a symbolic name, if possible
-WXDLLIMPEXP_CORE void wxLogQueryInterface(const wxChar *szInterface, REFIID riid);
+void wxLogQueryInterface(const wxChar *szInterface, REFIID riid);
 
 // these functions print out the new value of reference counter
-WXDLLIMPEXP_CORE void wxLogAddRef (const wxChar *szInterface, ULONG cRef);
-WXDLLIMPEXP_CORE void wxLogRelease(const wxChar *szInterface, ULONG cRef);
+void wxLogAddRef (const wxChar *szInterface, ULONG cRef);
+void wxLogRelease(const wxChar *szInterface, ULONG cRef);
 
 #else   //!__WXDEBUG__
   #define   wxLogQueryInterface(szInterface, riid)
@@ -212,40 +204,43 @@ WXDLLIMPEXP_CORE void wxLogRelease(const wxChar *szInterface, ULONG cRef);
 
 // wrapper around BSTR type (by Vadim Zeitlin)
 
-class WXDLLIMPEXP_CORE wxBasicString
+class WXDLLEXPORT wxBasicString
 {
 public:
     // ctors & dtor
+    wxBasicString(const char *sz);
     wxBasicString(const wxString& str);
-    wxBasicString(const wxBasicString& bstr);
     ~wxBasicString();
 
-    wxBasicString& operator=(const wxBasicString& bstr);
+    void Init(const char* sz);
 
     // accessors
-        // just get the string
-    operator BSTR() const { return m_bstrBuf; }
-        // retrieve a copy of our string - caller must SysFreeString() it later!
-    BSTR Get() const { return SysAllocString(m_bstrBuf); }
+    // just get the string
+    operator BSTR() const { return m_wzBuf; }
+    // retrieve a copy of our string - caller must SysFreeString() it later!
+    BSTR Get() const { return SysAllocString(m_wzBuf); }
 
 private:
-    // actual string
-    BSTR m_bstrBuf;
+    // @@@ not implemented (but should be)
+    wxBasicString(const wxBasicString&);
+    wxBasicString& operator=(const wxBasicString&);
+
+    OLECHAR *m_wzBuf;     // actual string
 };
 
 #if wxUSE_VARIANT
 // Convert variants
 class WXDLLIMPEXP_FWD_BASE wxVariant;
 
-WXDLLIMPEXP_CORE bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
-WXDLLIMPEXP_CORE bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
+WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant);
+WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant);
 #endif // wxUSE_VARIANT
 
 // Convert string to Unicode
-WXDLLIMPEXP_CORE BSTR wxConvertStringToOle(const wxString& str);
+WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str);
 
 // Convert string from BSTR to wxString
-WXDLLIMPEXP_CORE wxString wxConvertStringFromOle(BSTR bStr);
+WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr);
 
 #else // !wxUSE_OLE
 
diff --git a/Source/3rd Party/wx/include/wx/msw/ole/uuid.h b/Source/3rd Party/wx/include/wx/msw/ole/uuid.h
index 8ef85de48..0609448ec 100644
--- a/Source/3rd Party/wx/include/wx/msw/ole/uuid.h	
+++ b/Source/3rd Party/wx/include/wx/msw/ole/uuid.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/ole/uuid.h
+// Name:        ole/uuid.h
 // Purpose:     encapsulates an UUID with some added helper functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.07.97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: uuid.h 55113 2008-08-18 11:30:10Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 //
@@ -14,7 +14,7 @@
 #ifndef   _WX_OLEUUID_H
 #define   _WX_OLEUUID_H
 
-#include "wx/chartype.h"
+#include "wx/wxchar.h"
 // ------------------------------------------------------------------
 // UUID (Universally Unique IDentifier) definition
 // ------------------------------------------------------------------
@@ -44,7 +44,7 @@ typedef unsigned char uchar;
 // ------------------------------------------------------------------
 
 // uses RPC functions to create/convert Universally Unique Identifiers
-class WXDLLIMPEXP_CORE Uuid
+class WXDLLEXPORT Uuid
 {
 private:
   UUID  m_uuid;
@@ -74,9 +74,11 @@ public:
   bool Set(const wxChar *pc); // from a string, returns true if ok
   void Set(const UUID& uuid); // from another UUID (never fails)
 
+#if wxABI_VERSION >= 20809
   // comparison operators
   bool operator==(const Uuid& uuid) const;
-  bool operator!=(const Uuid& uuid) const { return !(*this == uuid); }
+  bool operator!=(const Uuid& uuid) const;
+#endif // wxABI_VERSION >= 2.8.9
 
   // accessors
   operator const UUID*()   const { return &m_uuid;               }
diff --git a/Source/3rd Party/wx/include/wx/msw/ownerdrw.h b/Source/3rd Party/wx/include/wx/msw/ownerdrw.h
deleted file mode 100644
index a6d659b68..000000000
--- a/Source/3rd Party/wx/include/wx/msw/ownerdrw.h	
+++ /dev/null
@@ -1,29 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/ownerdrw.h
-// Purpose:     wxOwnerDrawn class
-// Author:      Marcin Malich
-// Modified by:
-// Created:     2009-09-22
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Marcin Malich <me@malcom.pl>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OWNERDRW_H_
-#define _WX_OWNERDRW_H_
-
-#if wxUSE_OWNER_DRAWN
-
-class WXDLLIMPEXP_CORE wxOwnerDrawn : public wxOwnerDrawnBase
-{
-public:
-    wxOwnerDrawn() {}
-    virtual ~wxOwnerDrawn() {}
-
-    virtual bool OnDrawItem(wxDC& dc, const wxRect& rc,
-                            wxODAction act, wxODStatus stat);
-};
-
-#endif // wxUSE_OWNER_DRAWN
-
-#endif // _WX_OWNERDRW_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/palette.h b/Source/3rd Party/wx/include/wx/msw/palette.h
index 74a6f0900..87b59ec33 100644
--- a/Source/3rd Party/wx/include/wx/msw/palette.h	
+++ b/Source/3rd Party/wx/include/wx/msw/palette.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: palette.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,38 +14,45 @@
 
 #include "wx/gdiobj.h"
 
-class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
+class WXDLLIMPEXP_FWD_CORE wxPalette;
+
+class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
+{
+    friend class WXDLLIMPEXP_FWD_CORE wxPalette;
+public:
+    wxPaletteRefData(void);
+    virtual ~wxPaletteRefData(void);
+protected:
+ WXHPALETTE m_hPalette;
+};
+
+#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
+
+class WXDLLEXPORT wxPalette: public wxPaletteBase
 {
 public:
-    wxPalette() { }
-    wxPalette(int n,
-              const unsigned char *red, const unsigned char *green, const unsigned char *blue)
-    {
-        Create(n, red, green, blue);
-    }
-
-    bool Create(int n,
-                const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+    wxPalette();
+    wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+    virtual ~wxPalette(void);
+    bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+    
+    int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
+    bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     virtual int GetColoursCount() const;
 
-    int
-    GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk(void) const { return (m_refData != NULL) ; }
 
-    bool
-    GetRGB(int pixel,
-           unsigned char *red, unsigned char *green, unsigned char *blue) const;
+    virtual bool FreeResource(bool force = false);
 
     // implemetation
-    WXHPALETTE GetHPALETTE() const;
+    inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
     void SetHPALETTE(WXHPALETTE pal);
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
+  
 private:
     DECLARE_DYNAMIC_CLASS(wxPalette)
 };
 
-#endif // _WX_PALETTE_H_
+#endif
+    // _WX_PALETTE_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/panel.h b/Source/3rd Party/wx/include/wx/msw/panel.h
deleted file mode 100644
index 0b01f7285..000000000
--- a/Source/3rd Party/wx/include/wx/msw/panel.h	
+++ /dev/null
@@ -1,57 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/panel.h
-// Purpose:     wxMSW-specific wxPanel class.
-// Author:      Vadim Zeitlin
-// Created:     2011-03-18
-// RCS-ID:      $Id$
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_PANEL_H_
-#define _WX_MSW_PANEL_H_
-
-class WXDLLIMPEXP_FWD_CORE wxBrush;
-
-// ----------------------------------------------------------------------------
-// wxPanel
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
-{
-public:
-    wxPanel() { }
-
-    wxPanel(wxWindow *parent,
-            wxWindowID winid = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
-    {
-        Create(parent, winid, pos, size, style, name);
-    }
-
-    // This is overridden for MSW to return true for all panels that are child
-    // of a window with themed background (such as wxNotebook) which should
-    // show through the child panels.
-    virtual bool HasTransparentBackground();
-
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR(
-    wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
-    {
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
-    }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
-private:
-    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
-};
-
-#endif // _WX_MSW_PANEL_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/pen.h b/Source/3rd Party/wx/include/wx/msw/pen.h
index fa1a5cfb3..caf378d33 100644
--- a/Source/3rd Party/wx/include/wx/msw/pen.h	
+++ b/Source/3rd Party/wx/include/wx/msw/pen.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=()
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: pen.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,66 +13,119 @@
 #define _WX_PEN_H_
 
 #include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
+#include "wx/bitmap.h"
+#include "wx/colour.h"
+
+typedef WXDWORD wxMSWDash;
+
+class WXDLLIMPEXP_FWD_CORE wxPen;
+
+// VZ: this class should be made private
+class WXDLLEXPORT wxPenRefData : public wxGDIRefData
+{
+public:
+    wxPenRefData();
+    wxPenRefData(const wxPenRefData& data);
+    virtual ~wxPenRefData();
+
+    bool operator==(const wxPenRefData& data) const
+    {
+        // we intentionally don't compare m_hPen fields here
+        return m_style == data.m_style &&
+               m_width == data.m_width &&
+               m_join == data.m_join &&
+               m_cap == data.m_cap &&
+               m_colour == data.m_colour &&
+               (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
+               (m_style != wxUSER_DASH ||
+                (m_nbDash == data.m_nbDash &&
+                    memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
+    }
+
+protected:
+    int           m_width;
+    int           m_style;
+    int           m_join;
+    int           m_cap;
+    wxBitmap      m_stipple;
+    int           m_nbDash;
+    wxDash *      m_dash;
+    wxColour      m_colour;
+    WXHPEN        m_hPen;
+
+private:
+    friend class WXDLLIMPEXP_FWD_CORE wxPen;
+
+    // Cannot use
+    //  DECLARE_NO_COPY_CLASS(wxPenRefData)
+    // because copy constructor is explicitly declared above;
+    // but no copy assignment operator is defined, so declare
+    // it private to prevent the compiler from defining it:
+    wxPenRefData& operator=(const wxPenRefData&);
+};
+
+#define M_PENDATA ((wxPenRefData *)m_refData)
+#define wxPENDATA(x) ((wxPenRefData *)(x).m_refData)
 
 // ----------------------------------------------------------------------------
 // Pen
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPen : public wxPenBase
+class WXDLLEXPORT wxPen : public wxGDIObject
 {
 public:
-    wxPen() { }
-    wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
-#endif
-
+    wxPen();
+    wxPen(const wxColour& col, int width = 1, int style = wxSOLID);
     wxPen(const wxBitmap& stipple, int width);
-    virtual ~wxPen() { }
+    virtual ~wxPen();
+
+    bool operator==(const wxPen& pen) const
+    {
+        const wxPenRefData *penData = (wxPenRefData *)pen.m_refData;
+
+        // an invalid pen is only equal to another invalid pen
+        return m_refData ? penData && *M_PENDATA == *penData : !penData;
+    }
 
-    bool operator==(const wxPen& pen) const;
     bool operator!=(const wxPen& pen) const { return !(*this == pen); }
 
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL); }
+
     // Override in order to recreate the pen
     void SetColour(const wxColour& col);
     void SetColour(unsigned char r, unsigned char g, unsigned char b);
 
     void SetWidth(int width);
-    void SetStyle(wxPenStyle style);
+    void SetStyle(int style);
     void SetStipple(const wxBitmap& stipple);
     void SetDashes(int nb_dashes, const wxDash *dash);
-    void SetJoin(wxPenJoin join);
-    void SetCap(wxPenCap cap);
+    void SetJoin(int join);
+    void SetCap(int cap);
 
-    wxColour GetColour() const;
-    int GetWidth() const;
-    wxPenStyle GetStyle() const;
-    wxPenJoin GetJoin() const;
-    wxPenCap GetCap() const;
-    int GetDashes(wxDash** ptr) const;
-    wxDash* GetDash() const;
-    int GetDashCount() const;
-    wxBitmap* GetStipple() const;
+    wxColour& GetColour() const { return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); }
+    int GetWidth() const { return (M_PENDATA ? M_PENDATA->m_width : 0); }
+    int GetStyle() const { return (M_PENDATA ? M_PENDATA->m_style : 0); }
+    int GetJoin() const { return (M_PENDATA ? M_PENDATA->m_join : 0); }
+    int GetCap() const { return (M_PENDATA ? M_PENDATA->m_cap : 0); }
+    int GetDashes(wxDash **ptr) const
+    {
+        *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL);
+        return (M_PENDATA ? M_PENDATA->m_nbDash : 0);
+    }
+    wxDash* GetDash() const { return (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*)NULL); }
+    inline int GetDashCount() const { return (M_PENDATA ? M_PENDATA->m_nbDash : 0); }
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxPenStyle)style); }
-#endif
+    inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); }
 
-    // internal: wxGDIObject methods
-    virtual bool RealizeResource();
-    virtual bool FreeResource(bool force = false);
-    virtual WXHANDLE GetResourceHandle() const;
-    virtual bool IsFree() const;
-
-protected:
-    virtual wxGDIRefData* CreateGDIRefData() const;
-    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
-
-    // same as FreeResource() + RealizeResource()
-    bool Recreate();
+    // Internal
+    bool RealizeResource();
+    bool FreeResource(bool force = false);
+    WXHANDLE GetResourceHandle() const;
+    bool IsFree() const;
+    void Unshare();
 
+private:
     DECLARE_DYNAMIC_CLASS(wxPen)
 };
 
diff --git a/Source/3rd Party/wx/include/wx/msw/popupwin.h b/Source/3rd Party/wx/include/wx/msw/popupwin.h
index 6087a6d4b..56f63fef4 100644
--- a/Source/3rd Party/wx/include/wx/msw/popupwin.h	
+++ b/Source/3rd Party/wx/include/wx/msw/popupwin.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.01.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: popupwin.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
 // wxPopupWindow
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
+class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
 {
 public:
     wxPopupWindow() { }
diff --git a/Source/3rd Party/wx/include/wx/msw/printdlg.h b/Source/3rd Party/wx/include/wx/msw/printdlg.h
index 77365caa2..25b21a50f 100644
--- a/Source/3rd Party/wx/include/wx/msw/printdlg.h	
+++ b/Source/3rd Party/wx/include/wx/msw/printdlg.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/printdlg.h
+// Name:        printdlg.h
 // Purpose:     wxPrintDialog, wxPageSetupDialog classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: printdlg.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,30 +20,28 @@
 #include "wx/printdlg.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDC;
-class WinPrinter;
 
 //----------------------------------------------------------------------------
 // wxWindowsPrintNativeData
 //----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase
+class WXDLLEXPORT wxWindowsPrintNativeData: public wxPrintNativeDataBase
 {
 public:
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();
-
+    
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
-
+    
     virtual bool Ok() const { return IsOk(); }
     virtual bool IsOk() const;
-
-    void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL);
+    
     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }
     void SetDevNames(void* data) { m_devNames = data; }
-
+   
 private:
     void* m_devMode;
     void* m_devNames;
@@ -53,12 +51,12 @@ private:
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };
-
+    
 // ---------------------------------------------------------------------------
 // wxWindowsPrintDialog: the MSW dialog for printing
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxWindowsPrintDialog : public wxPrintDialogBase
+class WXDLLEXPORT wxWindowsPrintDialog : public wxPrintDialogBase
 {
 public:
     wxWindowsPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
@@ -78,24 +76,24 @@ private:
     wxPrinterDC*      m_printerDC;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;
-
+    
 private:
     bool ConvertToNative( wxPrintDialogData &data );
     bool ConvertFromNative( wxPrintDialogData &data );
-
+    
     // holds MSW handle
     void*             m_printDlg;
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);
+    DECLARE_NO_COPY_CLASS(wxWindowsPrintDialog)
     DECLARE_CLASS(wxWindowsPrintDialog)
 };
 
 // ---------------------------------------------------------------------------
-// wxWindowsPageSetupDialog: the MSW page setup dialog
+// wxWindowsPageSetupDialog: the MSW page setup dialog 
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase
+class WXDLLEXPORT wxWindowsPageSetupDialog: public wxPageSetupDialogBase
 {
 public:
     wxWindowsPageSetupDialog();
@@ -107,12 +105,12 @@ public:
     bool ConvertToNative( wxPageSetupDialogData &data );
     bool ConvertFromNative( wxPageSetupDialogData &data );
 
-    virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; }
+    virtual wxPageSetupData& GetPageSetupDialogData() { return m_pageSetupData; }
 
 private:
     wxPageSetupDialogData   m_pageSetupData;
     wxWindow*               m_dialogParent;
-
+    
     // holds MSW handle
     void*                   m_pageDlg;
 
diff --git a/Source/3rd Party/wx/include/wx/msw/printwin.h b/Source/3rd Party/wx/include/wx/msw/printwin.h
index 10c4f4376..4240682a6 100644
--- a/Source/3rd Party/wx/include/wx/msw/printwin.h	
+++ b/Source/3rd Party/wx/include/wx/msw/printwin.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/printwin.h
+// Name:        printwin.h
 // Purpose:     wxWindowsPrinter, wxWindowsPrintPreview classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: printwin.h 42522 2006-10-27 13:07:40Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,12 +18,13 @@
 // Represents the printer: manages printing a wxPrintout object
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxWindowsPrinter : public wxPrinterBase
+class WXDLLEXPORT wxWindowsPrinter : public wxPrinterBase
 {
     DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
 
 public:
     wxWindowsPrinter(wxPrintDialogData *data = NULL);
+    virtual ~wxWindowsPrinter();
 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,
@@ -33,7 +34,9 @@ public:
     virtual bool Setup(wxWindow *parent);
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
+    WXFARPROC     m_lpAbortProc;
+
+    DECLARE_NO_COPY_CLASS(wxWindowsPrinter)
 };
 
 // ---------------------------------------------------------------------------
@@ -41,7 +44,7 @@ private:
 // wxPrintout.
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase
+class WXDLLEXPORT wxWindowsPrintPreview : public wxPrintPreviewBase
 {
 public:
     wxWindowsPrintPreview(wxPrintout *printout,
@@ -55,11 +58,7 @@ public:
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 
-protected:
-#if wxUSE_ENH_METAFILE
-    virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
-#endif
-
+private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
 };
 
diff --git a/Source/3rd Party/wx/include/wx/msw/private.h b/Source/3rd Party/wx/include/wx/msw/private.h
index 2c3e9fa4c..c4d37c8c3 100644
--- a/Source/3rd Party/wx/include/wx/msw/private.h	
+++ b/Source/3rd Party/wx/include/wx/msw/private.h	
@@ -6,7 +6,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: private.h 62189 2009-09-28 16:02:08Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,10 +23,6 @@
 
 #include "wx/log.h"
 
-#if wxUSE_GUI
-    #include "wx/window.h"
-#endif // wxUSE_GUI
-
 class WXDLLIMPEXP_FWD_CORE wxFont;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxWindowBase;
@@ -46,13 +42,13 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase;
 
 #if wxUSE_GUI
 
-extern WXDLLIMPEXP_DATA_CORE(HICON) wxSTD_FRAME_ICON;
-extern WXDLLIMPEXP_DATA_CORE(HICON) wxSTD_MDIPARENTFRAME_ICON;
-extern WXDLLIMPEXP_DATA_CORE(HICON) wxSTD_MDICHILDFRAME_ICON;
-extern WXDLLIMPEXP_DATA_CORE(HICON) wxDEFAULT_FRAME_ICON;
-extern WXDLLIMPEXP_DATA_CORE(HICON) wxDEFAULT_MDIPARENTFRAME_ICON;
-extern WXDLLIMPEXP_DATA_CORE(HICON) wxDEFAULT_MDICHILDFRAME_ICON;
-extern WXDLLIMPEXP_DATA_CORE(HFONT) wxSTATUS_LINE_FONT;
+extern WXDLLEXPORT_DATA(HICON) wxSTD_FRAME_ICON;
+extern WXDLLEXPORT_DATA(HICON) wxSTD_MDIPARENTFRAME_ICON;
+extern WXDLLEXPORT_DATA(HICON) wxSTD_MDICHILDFRAME_ICON;
+extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_FRAME_ICON;
+extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_MDIPARENTFRAME_ICON;
+extern WXDLLEXPORT_DATA(HICON) wxDEFAULT_MDICHILDFRAME_ICON;
+extern WXDLLEXPORT_DATA(HFONT) wxSTATUS_LINE_FONT;
 
 #endif // wxUSE_GUI
 
@@ -62,13 +58,6 @@ extern WXDLLIMPEXP_DATA_CORE(HFONT) wxSTATUS_LINE_FONT;
 
 extern WXDLLIMPEXP_DATA_BASE(HINSTANCE) wxhInstance;
 
-extern "C"
-{
-    WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
-}
-
-WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
-
 // ---------------------------------------------------------------------------
 // define things missing from some compilers' headers
 // ---------------------------------------------------------------------------
@@ -169,9 +158,9 @@ extern LONG APIENTRY _EXPORT
 
 // This one is a macro so that it can be tested with #ifdef, it will be
 // undefined if it cannot be implemented for a given compiler.
-// Vc++, bcc, dmc, ow, mingw akk have _get_osfhandle() and Cygwin has
-// get_osfhandle. Others are currently unknown, e.g. Salford, Intel, Visual
-// Age.
+// Vc++, bcc, dmc, ow, mingw, codewarrior (and rsxnt) have _get_osfhandle.
+// Cygwin has get_osfhandle. Others are currently unknown, e.g. Salford,
+// Intel, Visual Age.
 #if defined(__WXWINCE__)
     #define wxGetOSFHandle(fd) ((HANDLE)fd)
     #define wxOpenOSFHandle(h, flags) ((int)wxPtrToUInt(h))
@@ -181,7 +170,8 @@ extern LONG APIENTRY _EXPORT
    || defined(__BORLANDC__) \
    || defined(__DMC__) \
    || defined(__WATCOMC__) \
-   || defined(__MINGW32__)
+   || defined(__MINGW32__) \
+   || (defined(__MWERKS__) && defined(__MSL__))
     #define wxGetOSFHandle(fd) ((HANDLE)_get_osfhandle(fd))
     #define wxOpenOSFHandle(h, flags) (_open_osfhandle(wxPtrToUInt(h), flags))
     #define wx_fdopen _fdopen
@@ -218,21 +208,6 @@ struct WinStruct : public T
 };
 
 
-// Macros for converting wxString to the type expected by API functions.
-//
-// Normally it is enough to just use wxString::t_str() which is implicitly
-// convertible to LPCTSTR, but in some cases an explicit conversion is required.
-//
-// In such cases wxMSW_CONV_LPCTSTR() should be used. But if an API function
-// takes a non-const pointer, wxMSW_CONV_LPTSTR() which casts away the
-// constness (but doesn't make it possible to really modify the returned
-// pointer, of course) should be used. And if a string is passed as LPARAM, use
-// wxMSW_CONV_LPARAM() which does the required ugly reinterpret_cast<> too.
-#define wxMSW_CONV_LPCTSTR(s) static_cast<const wxChar *>((s).t_str())
-#define wxMSW_CONV_LPTSTR(s) const_cast<wxChar *>(wxMSW_CONV_LPCTSTR(s))
-#define wxMSW_CONV_LPARAM(s) reinterpret_cast<LPARAM>(wxMSW_CONV_LPCTSTR(s))
-
-
 #if wxUSE_GUI
 
 #include "wx/gdicmn.h"
@@ -251,10 +226,7 @@ inline COLORREF wxColourToPalRGB(const wxColour& c)
 
 inline wxColour wxRGBToColour(COLORREF rgb)
 {
-	unsigned char red = (unsigned char)((rgb >> 16) & 0xFF); 
-	unsigned char green = (unsigned char)(((rgb & 0xFFFF) >> 8) & 0xFF);
-	unsigned char blue = (unsigned char)(rgb & 0xFF) ;
-    return wxColour(red, green, blue);
+    return wxColour(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb));
 }
 
 inline void wxRGBToColour(wxColour& c, COLORREF rgb)
@@ -279,7 +251,7 @@ enum wxSTD_COLOUR
     wxSTD_COL_MAX
 };
 
-struct WXDLLIMPEXP_CORE wxCOLORMAP
+struct WXDLLEXPORT wxCOLORMAP
 {
     COLORREF from, to;
 };
@@ -313,9 +285,7 @@ inline void wxCopyRectToRECT(const wxRect& rect, RECT& rc)
 // translations between HIMETRIC units (which OLE likes) and pixels (which are
 // liked by all the others) - implemented in msw/utilsexc.cpp
 extern void HIMETRICToPixel(LONG *x, LONG *y);
-extern void HIMETRICToPixel(LONG *x, LONG *y, HDC hdcRef);
 extern void PixelToHIMETRIC(LONG *x, LONG *y);
-extern void PixelToHIMETRIC(LONG *x, LONG *y, HDC hdcRef);
 
 // Windows convention of the mask is opposed to the wxWidgets one, so we need
 // to invert the mask each time we pass one/get one to/from Windows
@@ -332,22 +302,6 @@ extern HICON wxBitmapToHICON(const wxBitmap& bmp);
 extern
 HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY);
 
-
-#if wxUSE_OWNER_DRAWN
-
-// Draw the bitmap in specified state (this is used by owner drawn controls)
-enum wxDSBStates
-{
-    wxDSB_NORMAL = 0,
-    wxDSB_SELECTED,
-    wxDSB_DISABLED
-};
-
-extern
-BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState);
-
-#endif // wxUSE_OWNER_DRAWN
-
 // get (x, y) from DWORD - notice that HI/LOWORD can *not* be used because they
 // will fail on system with multiple monitors where the coords may be negative
 //
@@ -357,32 +311,21 @@ BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState);
     #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
 #endif // GET_X_LPARAM
 
-// get the current state of SHIFT/CTRL/ALT keys
-inline bool wxIsModifierDown(int vk)
-{
-    // GetKeyState() returns different negative values on WinME and WinNT,
-    // so simply test for negative value.
-    return ::GetKeyState(vk) < 0;
-}
-
+// get the current state of SHIFT/CTRL keys
 inline bool wxIsShiftDown()
 {
-    return wxIsModifierDown(VK_SHIFT);
+//    return (::GetKeyState(VK_SHIFT) & 0x100) != 0;
+    // Returns different negative values on WinME and WinNT,
+    // so simply test for negative value.
+    return ::GetKeyState(VK_SHIFT) < 0;
 }
 
 inline bool wxIsCtrlDown()
 {
-    return wxIsModifierDown(VK_CONTROL);
-}
-
-inline bool wxIsAltDown()
-{
-    return wxIsModifierDown(VK_MENU);
-}
-
-inline bool wxIsAnyModifierDown()
-{
-    return wxIsShiftDown() || wxIsCtrlDown() || wxIsAltDown();
+//    return (::GetKeyState(VK_CONTROL) & 0x100) != 0;
+    // Returns different negative values on WinME and WinNT,
+    // so simply test for negative value.
+    return ::GetKeyState(VK_CONTROL) < 0;
 }
 
 // wrapper around GetWindowRect() and GetClientRect() APIs doing error checking
@@ -392,9 +335,7 @@ inline RECT wxGetWindowRect(HWND hwnd)
     RECT rect;
 
     if ( !::GetWindowRect(hwnd, &rect) )
-    {
-        wxLogLastError(wxT("GetWindowRect"));
-    }
+        wxLogLastError(_T("GetWindowRect"));
 
     return rect;
 }
@@ -404,9 +345,7 @@ inline RECT wxGetClientRect(HWND hwnd)
     RECT rect;
 
     if ( !::GetClientRect(hwnd, &rect) )
-    {
-        wxLogLastError(wxT("GetClientRect"));
-    }
+        wxLogLastError(_T("GetClientRect"));
 
     return rect;
 }
@@ -428,16 +367,15 @@ public:
 private:
     HDC m_hdc;
 
-    wxDECLARE_NO_COPY_CLASS(ScreenHDC);
+    DECLARE_NO_COPY_CLASS(ScreenHDC)
 };
 
 // the same as ScreenHDC but for window DCs
 class WindowHDC
 {
 public:
-    WindowHDC() : m_hwnd(NULL), m_hdc(NULL) { }
     WindowHDC(HWND hwnd) { m_hdc = ::GetDC(m_hwnd = hwnd); }
-   ~WindowHDC() { if ( m_hwnd && m_hdc ) { ::ReleaseDC(m_hwnd, m_hdc); } }
+   ~WindowHDC() { ::ReleaseDC(m_hwnd, m_hdc); }
 
     operator HDC() const { return m_hdc; }
 
@@ -445,7 +383,7 @@ private:
    HWND m_hwnd;
    HDC m_hdc;
 
-   wxDECLARE_NO_COPY_CLASS(WindowHDC);
+   DECLARE_NO_COPY_CLASS(WindowHDC)
 };
 
 // the same as ScreenHDC but for memory DCs: creates the HDC compatible with
@@ -461,7 +399,7 @@ public:
 private:
     HDC m_hdc;
 
-    wxDECLARE_NO_COPY_CLASS(MemoryHDC);
+    DECLARE_NO_COPY_CLASS(MemoryHDC)
 };
 
 // a class which selects a GDI object into a DC in its ctor and deselects in
@@ -472,12 +410,12 @@ private:
     void DoInit(HGDIOBJ hgdiobj) { m_hgdiobj = ::SelectObject(m_hdc, hgdiobj); }
 
 public:
-    SelectInHDC() : m_hdc(NULL), m_hgdiobj(NULL) { }
+    SelectInHDC() : m_hdc(NULL) { }
     SelectInHDC(HDC hdc, HGDIOBJ hgdiobj) : m_hdc(hdc) { DoInit(hgdiobj); }
 
     void Init(HDC hdc, HGDIOBJ hgdiobj)
     {
-        wxASSERT_MSG( !m_hdc, wxT("initializing twice?") );
+        wxASSERT_MSG( !m_hdc, _T("initializing twice?") );
 
         m_hdc = hdc;
 
@@ -493,7 +431,7 @@ private:
     HDC m_hdc;
     HGDIOBJ m_hgdiobj;
 
-    wxDECLARE_NO_COPY_CLASS(SelectInHDC);
+    DECLARE_NO_COPY_CLASS(SelectInHDC)
 };
 
 // a class which cleans up any GDI object
@@ -506,7 +444,7 @@ protected:
 
     void InitGdiobj(HGDIOBJ gdiobj)
     {
-        wxASSERT_MSG( !m_gdiobj, wxT("initializing twice?") );
+        wxASSERT_MSG( !m_gdiobj, _T("initializing twice?") );
 
         m_gdiobj = gdiobj;
     }
@@ -559,13 +497,8 @@ public:
 class AutoHBITMAP : private AutoGDIObject
 {
 public:
-    AutoHBITMAP()
-        : AutoGDIObject() { }
-
     AutoHBITMAP(HBITMAP hbmp) : AutoGDIObject(hbmp) { }
 
-    void Init(HBITMAP hbmp) { InitGdiobj(hbmp); }
-
     operator HBITMAP() const { return (HBITMAP)GetObject(); }
 };
 
@@ -604,9 +537,7 @@ public:
         : m_hdc(hdc)
     {
         if ( !::SelectClipRgn(hdc, hrgn) )
-        {
-            wxLogLastError(wxT("SelectClipRgn"));
-        }
+            wxLogLastError(_T("SelectClipRgn"));
     }
 
     ~HDCClipper()
@@ -617,7 +548,7 @@ public:
 private:
     HDC m_hdc;
 
-    wxDECLARE_NO_COPY_CLASS(HDCClipper);
+    DECLARE_NO_COPY_CLASS(HDCClipper)
 };
 
 // set the given map mode for the life time of this object
@@ -635,9 +566,7 @@ private:
         {
             m_modeOld = ::SetMapMode(hdc, mm);
             if ( !m_modeOld )
-            {
-                wxLogLastError(wxT("SelectClipRgn"));
-            }
+                wxLogLastError(_T("SelectClipRgn"));
         }
 
         ~HDCMapModeChanger()
@@ -650,44 +579,29 @@ private:
         HDC m_hdc;
         int m_modeOld;
 
-        wxDECLARE_NO_COPY_CLASS(HDCMapModeChanger);
+        DECLARE_NO_COPY_CLASS(HDCMapModeChanger)
     };
 
     #define wxCHANGE_HDC_MAP_MODE(hdc, mm) \
         HDCMapModeChanger wxMAKE_UNIQUE_NAME(wxHDCMapModeChanger)(hdc, mm)
 #endif // __WXWINCE__/!__WXWINCE__
 
-// smart pointer using GlobalAlloc/GlobalFree()
+// smart buffeer using GlobalAlloc/GlobalFree()
 class GlobalPtr
 {
 public:
-    // default ctor, call Init() later
-    GlobalPtr()
-    {
-        m_hGlobal = NULL;
-    }
-
     // allocates a block of given size
-    void Init(size_t size, unsigned flags = GMEM_MOVEABLE)
+    GlobalPtr(size_t size, unsigned flags = GMEM_MOVEABLE)
     {
         m_hGlobal = ::GlobalAlloc(flags, size);
         if ( !m_hGlobal )
-        {
-            wxLogLastError(wxT("GlobalAlloc"));
-        }
-    }
-
-    GlobalPtr(size_t size, unsigned flags = GMEM_MOVEABLE)
-    {
-        Init(size, flags);
+            wxLogLastError(_T("GlobalAlloc"));
     }
 
     ~GlobalPtr()
     {
         if ( m_hGlobal && ::GlobalFree(m_hGlobal) )
-        {
-            wxLogLastError(wxT("GlobalFree"));
-        }
+            wxLogLastError(_T("GlobalFree"));
     }
 
     // implicit conversion
@@ -696,7 +610,7 @@ public:
 private:
     HGLOBAL m_hGlobal;
 
-    wxDECLARE_NO_COPY_CLASS(GlobalPtr);
+    DECLARE_NO_COPY_CLASS(GlobalPtr)
 };
 
 // when working with global pointers (which is unfortunately still necessary
@@ -705,56 +619,35 @@ private:
 class GlobalPtrLock
 {
 public:
-    // default ctor, use Init() later -- should only be used if the HGLOBAL can
-    // be NULL (in which case Init() shouldn't be called)
-    GlobalPtrLock()
+    GlobalPtrLock(HGLOBAL hGlobal) : m_hGlobal(hGlobal)
     {
-        m_hGlobal = NULL;
-        m_ptr = NULL;
-    }
-
-    // initialize the object, may be only called if we were created using the
-    // default ctor; HGLOBAL must not be NULL
-    void Init(HGLOBAL hGlobal)
-    {
-        m_hGlobal = hGlobal;
-
-        // NB: GlobalLock() is a macro, not a function, hence don't use the
-        //     global scope operator with it (and neither with GlobalUnlock())
         m_ptr = GlobalLock(hGlobal);
         if ( !m_ptr )
-        {
-            wxLogLastError(wxT("GlobalLock"));
-        }
-    }
-
-    // initialize the object, HGLOBAL must not be NULL
-    GlobalPtrLock(HGLOBAL hGlobal)
-    {
-        Init(hGlobal);
+            wxLogLastError(_T("GlobalLock"));
     }
 
     ~GlobalPtrLock()
     {
-        if ( m_hGlobal && !GlobalUnlock(m_hGlobal) )
+        if ( !GlobalUnlock(m_hGlobal) )
         {
+#ifdef __WXDEBUG__
             // this might happen simply because the block became unlocked
             DWORD dwLastError = ::GetLastError();
             if ( dwLastError != NO_ERROR )
             {
-                wxLogApiError(wxT("GlobalUnlock"), dwLastError);
+                wxLogApiError(_T("GlobalUnlock"), dwLastError);
             }
+#endif // __WXDEBUG__
         }
     }
 
-    void *Get() const { return m_ptr; }
     operator void *() const { return m_ptr; }
 
 private:
     HGLOBAL m_hGlobal;
     void *m_ptr;
 
-    wxDECLARE_NO_COPY_CLASS(GlobalPtrLock);
+    DECLARE_NO_COPY_CLASS(GlobalPtrLock)
 };
 
 // register the class when it is first needed and unregister it in dtor
@@ -775,12 +668,12 @@ public:
     {
         // we should only be called if we hadn't been initialized yet
         wxASSERT_MSG( m_registered == -1,
-                        wxT("calling ClassRegistrar::Register() twice?") );
+                        _T("calling ClassRegistrar::Register() twice?") );
 
         m_registered = ::RegisterClass(&wc) ? 1 : 0;
         if ( !IsRegistered() )
         {
-            wxLogLastError(wxT("RegisterClassEx()"));
+            wxLogLastError(_T("RegisterClassEx()"));
         }
         else
         {
@@ -799,9 +692,9 @@ public:
     {
         if ( IsRegistered() )
         {
-            if ( !::UnregisterClass(m_clsname.t_str(), wxGetInstance()) )
+            if ( !::UnregisterClass(m_clsname, wxhInstance) )
             {
-                wxLogLastError(wxT("UnregisterClass"));
+                wxLogLastError(_T("UnregisterClass"));
             }
         }
     }
@@ -843,7 +736,7 @@ private:
 #define GetHbrushOf(brush)      ((HBRUSH)(brush).GetResourceHandle())
 
 #define GetHmenu()              ((HMENU)GetHMenu())
-#define GetHmenuOf(menu)        ((HMENU)(menu)->GetHMenu())
+#define GetHmenuOf(menu)        ((HMENU)menu->GetHMenu())
 
 #define GetHcursor()            ((HCURSOR)GetHCURSOR())
 #define GetHcursorOf(cursor)    ((HCURSOR)(cursor).GetHCURSOR())
@@ -852,7 +745,7 @@ private:
 #define GetHfontOf(font)        ((HFONT)(font).GetHFONT())
 
 #define GetHimagelist()         ((HIMAGELIST)GetHIMAGELIST())
-#define GetHimagelistOf(imgl)   ((HIMAGELIST)(imgl)->GetHIMAGELIST())
+#define GetHimagelistOf(imgl)   ((HIMAGELIST)imgl->GetHIMAGELIST())
 
 #define GetHpalette()           ((HPALETTE)GetHPALETTE())
 #define GetHpaletteOf(pal)      ((HPALETTE)(pal).GetHPALETTE())
@@ -869,6 +762,13 @@ private:
 // global functions
 // ---------------------------------------------------------------------------
 
+extern "C"
+{
+    WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
+}
+
+WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
+
 // return the full path of the given module
 inline wxString wxGetFullModuleName(HMODULE hmod)
 {
@@ -880,7 +780,7 @@ inline wxString wxGetFullModuleName(HMODULE hmod)
                 MAX_PATH
             ) )
     {
-        wxLogLastError(wxT("GetModuleFileName"));
+        wxLogLastError(_T("GetModuleFileName"));
     }
 
     return fullname;
@@ -899,10 +799,9 @@ inline wxString wxGetFullModuleName()
 //      0x0400      Windows 95, NT4
 //      0x0410      Windows 98
 //      0x0500      Windows ME, 2000
-//      0x0501      Windows XP, 2003
-//      0x0502      Windows XP SP2, 2003 SP1
-//      0x0600      Windows Vista, 2008
-//      0x0601      Windows 7
+//      0x0501      Windows XP
+//      0x0502      Windows 2003
+//      0x0600      Longhorn
 //
 // for the other Windows versions 0 is currently returned
 enum wxWinVersion
@@ -922,15 +821,10 @@ enum wxWinVersion
     wxWinVersion_NT5 = wxWinVersion_5,
     wxWinVersion_2000 = wxWinVersion_5,
     wxWinVersion_XP = 0x0501,
-    wxWinVersion_2003 = 0x0501,
-    wxWinVersion_XP_SP2 = 0x0502,
-    wxWinVersion_2003_SP1 = 0x0502,
+    wxWinVersion_2003 = 0x0502,
 
     wxWinVersion_6 = 0x0600,
-    wxWinVersion_Vista = wxWinVersion_6,
-    wxWinVersion_NT6 = wxWinVersion_6,
-
-    wxWinVersion_7 = 0x601
+    wxWinVersion_NT6 = 0x0600
 };
 
 WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
@@ -941,33 +835,30 @@ WXDLLIMPEXP_BASE wxWinVersion wxGetWinVersion();
 extern HCURSOR wxGetCurrentBusyCursor();    // from msw/utils.cpp
 extern const wxCursor *wxGetGlobalCursor(); // from msw/cursor.cpp
 
-// GetCursorPos can fail without populating the POINT. This falls back to GetMessagePos.
-WXDLLIMPEXP_CORE void wxGetCursorPosMSW(POINT* pt);
+WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font);
+WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, const wxFont *font);
+WXDLLEXPORT wxFont wxCreateFontFromLogFont(const LOGFONT *logFont);
+WXDLLEXPORT wxFontEncoding wxGetFontEncFromCharSet(int charset);
 
-WXDLLIMPEXP_CORE void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font);
-WXDLLIMPEXP_CORE void wxFillLogFont(LOGFONT *logFont, const wxFont *font);
-WXDLLIMPEXP_CORE wxFont wxCreateFontFromLogFont(const LOGFONT *logFont);
-WXDLLIMPEXP_CORE wxFontEncoding wxGetFontEncFromCharSet(int charset);
-
-WXDLLIMPEXP_CORE void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
-WXDLLIMPEXP_CORE void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);
+WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
+WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);
 
 // Find maximum size of window/rectangle
-extern WXDLLIMPEXP_CORE void wxFindMaxSize(WXHWND hwnd, RECT *rect);
+extern WXDLLEXPORT void wxFindMaxSize(WXHWND hwnd, RECT *rect);
 
 // Safely get the window text (i.e. without using fixed size buffer)
-extern WXDLLIMPEXP_CORE wxString wxGetWindowText(WXHWND hWnd);
+extern WXDLLEXPORT wxString wxGetWindowText(WXHWND hWnd);
 
 // get the window class name
-extern WXDLLIMPEXP_CORE wxString wxGetWindowClass(WXHWND hWnd);
+extern WXDLLEXPORT wxString wxGetWindowClass(WXHWND hWnd);
 
 // get the window id (should be unsigned, hence this is not wxWindowID which
 // is, for mainly historical reasons, signed)
-extern WXDLLIMPEXP_CORE int wxGetWindowId(WXHWND hWnd);
+extern WXDLLEXPORT WXWORD wxGetWindowId(WXHWND hWnd);
 
 // check if hWnd's WNDPROC is wndProc. Return true if yes, false if they are
 // different
-extern WXDLLIMPEXP_CORE bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc);
+extern WXDLLEXPORT bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc);
 
 // Does this window style specify any border?
 inline bool wxStyleHasBorder(long style)
@@ -976,41 +867,26 @@ inline bool wxStyleHasBorder(long style)
                      wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0;
 }
 
-inline long wxGetWindowExStyle(const wxWindowMSW *win)
-{
-    return ::GetWindowLong(GetHwndOf(win), GWL_EXSTYLE);
-}
-
-inline bool wxHasWindowExStyle(const wxWindowMSW *win, long style)
-{
-    return (wxGetWindowExStyle(win) & style) != 0;
-}
-
-inline long wxSetWindowExStyle(const wxWindowMSW *win, long style)
-{
-    return ::SetWindowLong(GetHwndOf(win), GWL_EXSTYLE, style);
-}
-
 // ----------------------------------------------------------------------------
 // functions mapping HWND to wxWindow
 // ----------------------------------------------------------------------------
 
-// this function simply checks whether the given hwnd corresponds to a wxWindow
+// this function simply checks whether the given hWnd corresponds to a wxWindow
 // and returns either that window if it does or NULL otherwise
-extern WXDLLIMPEXP_CORE wxWindow* wxFindWinFromHandle(HWND hwnd);
+extern WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 
 // find the window for HWND which is part of some wxWindow, i.e. unlike
 // wxFindWinFromHandle() above it will also work for "sub controls" of a
 // wxWindow.
 //
 // returns the wxWindow corresponding to the given HWND or NULL.
-extern WXDLLIMPEXP_CORE wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
+extern WXDLLEXPORT wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
 
 // Get the size of an icon
-extern WXDLLIMPEXP_CORE wxSize wxGetHiconSize(HICON hicon);
+extern WXDLLEXPORT wxSize wxGetHiconSize(HICON hicon);
 
 // Lines are drawn differently for WinCE and regular WIN32
-WXDLLIMPEXP_CORE void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);
+WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);
 
 // fill the client rect of the given window on the provided dc using this brush
 inline void wxFillRect(HWND hwnd, HDC hdc, HBRUSH hbr)
diff --git a/Source/3rd Party/wx/include/wx/msw/private/button.h b/Source/3rd Party/wx/include/wx/msw/private/button.h
deleted file mode 100644
index 9a642118f..000000000
--- a/Source/3rd Party/wx/include/wx/msw/private/button.h	
+++ /dev/null
@@ -1,77 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/private/button.h
-// Purpose:     helper functions used with native BUTTON control
-// Author:      Vadim Zeitlin
-// Created:     2008-06-07
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_PRIVATE_BUTTON_H_
-#define _WX_MSW_PRIVATE_BUTTON_H_
-
-// define some standard button constants which may be missing in the headers
-#ifndef BS_PUSHLIKE
-    #define BS_PUSHLIKE 0x00001000L
-#endif
-
-#ifndef BST_UNCHECKED
-    #define BST_UNCHECKED 0x0000
-#endif
-
-#ifndef BST_CHECKED
-    #define BST_CHECKED 0x0001
-#endif
-
-#ifndef BST_INDETERMINATE
-    #define BST_INDETERMINATE 0x0002
-#endif
-
-namespace wxMSWButton
-{
-
-// returns BS_MULTILINE if the label contains new lines or 0 otherwise
-inline int GetMultilineStyle(const wxString& label)
-{
-    return label.find(wxT('\n')) == wxString::npos ? 0 : BS_MULTILINE;
-}
-
-// update the style of the specified HWND to include or exclude BS_MULTILINE
-// depending on whether the label contains the new lines
-void UpdateMultilineStyle(HWND hwnd, const wxString& label);
-
-// flags for ComputeBestSize() and GetFittingSize()
-enum
-{
-    Size_AuthNeeded = 1,
-    Size_ExactFit   = 2
-};
-
-// NB: All the functions below are implemented in src/msw/button.cpp
-
-// Compute the button size (as if wxBU_EXACTFIT were specified, i.e. without
-// adjusting it to be of default size if it's smaller) for the given label size
-WXDLLIMPEXP_CORE wxSize
-GetFittingSize(wxWindow *win, const wxSize& sizeLabel, int flags = 0);
-
-// Compute the button size (as if wxBU_EXACTFIT were specified) by computing
-// its label size and then calling GetFittingSize().
-wxSize ComputeBestFittingSize(wxControl *btn, int flags = 0);
-
-// Increase the size passed as parameter to be at least the standard button
-// size if the control doesn't have wxBU_EXACTFIT style and also cache it as
-// the best size and return its value -- this is used in DoGetBestSize()
-// implementation.
-wxSize IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size);
-
-// helper of wxToggleButton::DoGetBestSize()
-inline wxSize ComputeBestSize(wxControl *btn, int flags = 0)
-{
-    return IncreaseToStdSizeAndCache(btn, ComputeBestFittingSize(btn, flags));
-}
-
-} // namespace wxMSWButton
-
-#endif // _WX_MSW_PRIVATE_BUTTON_H_
-
diff --git a/Source/3rd Party/wx/include/wx/msw/private/comptr.h b/Source/3rd Party/wx/include/wx/msw/private/comptr.h
deleted file mode 100644
index fa611f5b4..000000000
--- a/Source/3rd Party/wx/include/wx/msw/private/comptr.h	
+++ /dev/null
@@ -1,130 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/private/comptr.h
-// Purpose:     Smart pointer for COM interfaces.
-// Author:      PB
-// Created:     2012-04-16
-// RCS-ID:      $Id$
-// Copyright:   (c) 2012 wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_PRIVATE_COMPTR_H_
-#define _WX_MSW_PRIVATE_COMPTR_H_
-
-// ----------------------------------------------------------------------------
-// wxCOMPtr: A minimalistic smart pointer for use with COM interfaces.
-// ----------------------------------------------------------------------------
-
-template <class T>
-class wxCOMPtr
-{
-public:
-    typedef T element_type;
-
-    wxCOMPtr()
-        : m_ptr(NULL)
-    {
-    }
-
-    wxEXPLICIT wxCOMPtr(T* ptr)
-        : m_ptr(ptr)
-    {
-        if ( m_ptr )
-            m_ptr->AddRef();
-    }
-
-    wxCOMPtr(const wxCOMPtr& ptr)
-        : m_ptr(ptr.get())
-    {
-        if ( m_ptr )
-            m_ptr->AddRef();
-    }
-
-    ~wxCOMPtr()
-    {
-        if ( m_ptr )
-            m_ptr->Release();
-    }
-
-    void reset(T* ptr = NULL)
-    {
-        if ( m_ptr != ptr)
-        {
-            if ( ptr )
-                ptr->AddRef();
-            if ( m_ptr )
-                m_ptr->Release();
-            m_ptr = ptr;
-        }
-    }
-
-    wxCOMPtr& operator=(const wxCOMPtr& ptr)
-    {
-        reset(ptr.get());
-        return *this;
-    }
-
-    wxCOMPtr& operator=(T* ptr)
-    {
-        reset(ptr);
-        return *this;
-    }
-
-    operator T*() const
-    {
-        return m_ptr;
-    }
-
-    T& operator*() const
-    {
-        return *m_ptr;
-    }
-
-    T* operator->() const
-    {
-        return m_ptr;
-    }
-
-    // It would be better to forbid direct access completely but we do need
-    // for QueryInterface() and similar functions, so provide it but it can
-    // only be used to initialize the pointer, not to modify an existing one.
-    T** operator&()
-    {
-        wxASSERT_MSG(!m_ptr,
-                     wxS("Can't get direct access to initialized pointer"));
-
-        return &m_ptr;
-    }
-
-    T* get() const
-    {
-        return m_ptr;
-    }
-
-    bool operator<(T* ptr) const
-    {
-        return get() < ptr;
-    }
-
-private:
-    T* m_ptr;
-};
-
-// Define a helper for the macro below: we just need a function taking a
-// pointer and not returning anything to avoid warnings about unused return
-// value of the cast in the macro itself.
-namespace wxPrivate { inline void PPV_ARGS_CHECK(void*) { } }
-
-// Takes the interface name and a pointer to a pointer of the interface type
-// and expands into the IID of this interface and the same pointer but after a
-// type-safety check.
-//
-// This is similar to the standard IID_PPV_ARGS macro but takes the pointer
-// type instead of relying on the non-standard Microsoft __uuidof().
-#define wxIID_PPV_ARGS(IType, pType) \
-    IID_##IType, \
-    (wxPrivate::PPV_ARGS_CHECK(static_cast<IType*>(*pType)), \
-     reinterpret_cast<void**>(pType))
-
-#endif // _WX_MSW_PRIVATE_COMPTR_H_
-
diff --git a/Source/3rd Party/wx/include/wx/msw/private/dc.h b/Source/3rd Party/wx/include/wx/msw/private/dc.h
deleted file mode 100644
index 18a7d539f..000000000
--- a/Source/3rd Party/wx/include/wx/msw/private/dc.h	
+++ /dev/null
@@ -1,148 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/private/dc.h
-// Purpose:     private wxMSW helpers for working with HDCs
-// Author:      Vadim Zeitlin
-// Created:     2009-06-16 (extracted from src/msw/dc.cpp)
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSW_PRIVATE_DC_H_
-#define _MSW_PRIVATE_DC_H_
-
-#include "wx/msw/dc.h"
-#include "wx/msw/wrapwin.h"
-
-namespace wxMSWImpl
-{
-
-// various classes to change some DC property temporarily
-
-// text background and foreground colours
-class wxTextColoursChanger
-{
-public:
-    wxTextColoursChanger(HDC hdc, const wxMSWDCImpl& dc)
-        : m_hdc(hdc)
-    {
-        Change(dc.GetTextForeground(), dc.GetTextBackground());
-    }
-
-    wxTextColoursChanger(HDC hdc, const wxColour& colFg, const wxColour& colBg)
-        : m_hdc(hdc)
-    {
-        Change(colFg, colBg);
-    }
-
-    wxTextColoursChanger(HDC hdc, COLORREF colFg, COLORREF colBg)
-        : m_hdc(hdc)
-    {
-        Change(colFg, colBg);
-    }
-
-    ~wxTextColoursChanger()
-    {
-        if ( m_oldColFg != CLR_INVALID )
-            ::SetTextColor(m_hdc, m_oldColFg);
-        if ( m_oldColBg != CLR_INVALID )
-            ::SetBkColor(m_hdc, m_oldColBg);
-    }
-
-protected:
-    // this ctor doesn't change mode immediately, call Change() later to do it
-    // only if needed
-    wxTextColoursChanger(HDC hdc)
-        : m_hdc(hdc)
-    {
-        m_oldColFg =
-        m_oldColBg = CLR_INVALID;
-    }
-
-    void Change(const wxColour& colFg, const wxColour& colBg)
-    {
-        Change(colFg.IsOk() ? colFg.GetPixel() : CLR_INVALID,
-               colBg.IsOk() ? colBg.GetPixel() : CLR_INVALID);
-    }
-
-    void Change(COLORREF colFg, COLORREF colBg)
-    {
-        if ( colFg != CLR_INVALID )
-        {
-            m_oldColFg = ::SetTextColor(m_hdc, colFg);
-            if ( m_oldColFg == CLR_INVALID )
-            {
-                wxLogLastError(wxT("SetTextColor"));
-            }
-        }
-        else
-        {
-            m_oldColFg = CLR_INVALID;
-        }
-
-        if ( colBg != CLR_INVALID )
-        {
-            m_oldColBg = ::SetBkColor(m_hdc, colBg);
-            if ( m_oldColBg == CLR_INVALID )
-            {
-                wxLogLastError(wxT("SetBkColor"));
-            }
-        }
-        else
-        {
-            m_oldColBg = CLR_INVALID;
-        }
-    }
-
-private:
-    const HDC m_hdc;
-    COLORREF m_oldColFg,
-             m_oldColBg;
-
-    wxDECLARE_NO_COPY_CLASS(wxTextColoursChanger);
-};
-
-// background mode
-class wxBkModeChanger
-{
-public:
-    // set background mode to opaque if mode != wxBRUSHSTYLE_TRANSPARENT
-    wxBkModeChanger(HDC hdc, int mode)
-        : m_hdc(hdc)
-    {
-        Change(mode);
-    }
-
-    ~wxBkModeChanger()
-    {
-        if ( m_oldMode )
-            ::SetBkMode(m_hdc, m_oldMode);
-    }
-
-protected:
-    // this ctor doesn't change mode immediately, call Change() later to do it
-    // only if needed
-    wxBkModeChanger(HDC hdc) : m_hdc(hdc) { m_oldMode = 0; }
-
-    void Change(int mode)
-    {
-        m_oldMode = ::SetBkMode(m_hdc, mode == wxBRUSHSTYLE_TRANSPARENT
-                                        ? TRANSPARENT
-                                        : OPAQUE);
-        if ( !m_oldMode )
-        {
-            wxLogLastError(wxT("SetBkMode"));
-        }
-    }
-
-private:
-    const HDC m_hdc;
-    int m_oldMode;
-
-    wxDECLARE_NO_COPY_CLASS(wxBkModeChanger);
-};
-
-} // namespace wxMSWImpl
-
-#endif // _MSW_PRIVATE_DC_H_
-
diff --git a/Source/3rd Party/wx/include/wx/msw/private/fswatcher.h b/Source/3rd Party/wx/include/wx/msw/private/fswatcher.h
deleted file mode 100644
index f431cf45a..000000000
--- a/Source/3rd Party/wx/include/wx/msw/private/fswatcher.h	
+++ /dev/null
@@ -1,302 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/private/fswatcher.h
-// Purpose:     File system watcher impl classes
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef WX_MSW_PRIVATE_FSWATCHER_H_
-#define WX_MSW_PRIVATE_FSWATCHER_H_
-
-#include "wx/filename.h"
-#include "wx/vector.h"
-#include "wx/msw/private.h"
-
-// ============================================================================
-// wxFSWatcherEntry implementation & helper declarations
-// ============================================================================
-
-class wxFSWatcherImplMSW;
-
-class wxFSWatchEntryMSW : public wxFSWatchInfo
-{
-public:
-    enum
-    {
-        BUFFER_SIZE = 4096   // TODO parametrize
-    };
-
-    wxFSWatchEntryMSW(const wxFSWatchInfo& winfo) :
-        wxFSWatchInfo(winfo)
-    {
-        // get handle for this path
-        m_handle = OpenDir(m_path);
-        m_overlapped = (OVERLAPPED*)calloc(1, sizeof(OVERLAPPED));
-        wxZeroMemory(m_buffer);
-    }
-
-    virtual ~wxFSWatchEntryMSW()
-    {
-        wxLogTrace(wxTRACE_FSWATCHER, "Deleting entry '%s'", m_path);
-
-        if (m_handle != INVALID_HANDLE_VALUE)
-        {
-            if (!CloseHandle(m_handle))
-            {
-                wxLogSysError(_("Unable to close the handle for '%s'"),
-                                m_path);
-            }
-        }
-        free(m_overlapped);
-    }
-
-    bool IsOk() const
-    {
-        return m_handle != INVALID_HANDLE_VALUE;
-    }
-
-    HANDLE GetHandle() const
-    {
-        return m_handle;
-    }
-
-    void* GetBuffer()
-    {
-        return m_buffer;
-    }
-
-    OVERLAPPED* GetOverlapped() const
-    {
-        return m_overlapped;
-    }
-
-private:
-    // opens dir with all flags, attributes etc. necessary to be later
-    // asynchronous watched with ReadDirectoryChangesW
-    static HANDLE OpenDir(const wxString& path)
-    {
-        HANDLE handle = CreateFile(path.t_str(),
-                                   FILE_LIST_DIRECTORY,
-                                   FILE_SHARE_READ |
-                                   FILE_SHARE_WRITE |
-                                   FILE_SHARE_DELETE,
-                                   NULL,
-                                   OPEN_EXISTING,
-                                   FILE_FLAG_BACKUP_SEMANTICS |
-                                   FILE_FLAG_OVERLAPPED,
-                                   NULL);
-        if (handle == INVALID_HANDLE_VALUE)
-        {
-            wxLogSysError(_("Failed to open directory \"%s\" for monitoring."),
-                            path);
-        }
-
-        return handle;
-    }
-
-    HANDLE m_handle;             // handle to opened directory
-    char m_buffer[BUFFER_SIZE];  // buffer for fs events
-    OVERLAPPED* m_overlapped;
-
-    wxDECLARE_NO_COPY_CLASS(wxFSWatchEntryMSW);
-};
-
-// ============================================================================
-// wxFSWatcherImplMSW helper classes implementations
-// ============================================================================
-
-class wxIOCPService
-{
-public:
-    wxIOCPService() :
-        m_iocp(INVALID_HANDLE_VALUE)
-    {
-        Init();
-    }
-
-    ~wxIOCPService()
-    {
-        if (m_iocp != INVALID_HANDLE_VALUE)
-        {
-            if (!CloseHandle(m_iocp))
-            {
-                wxLogSysError(_("Unable to close I/O completion port handle"));
-            }
-        }
-        m_watches.clear();
-    }
-
-    // associates a wxFSWatchEntryMSW with completion port
-    bool Add(wxSharedPtr<wxFSWatchEntryMSW> watch)
-    {
-        wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" );
-        wxCHECK_MSG( watch->IsOk(), false, "Invalid watch" );
-
-        // associate with IOCP
-        HANDLE ret = CreateIoCompletionPort(watch->GetHandle(), m_iocp,
-                                            (ULONG_PTR)watch.get(), 0);
-        if (ret == NULL)
-        {
-            wxLogSysError(_("Unable to associate handle with "
-                            "I/O completion port"));
-            return false;
-        }
-        else if (ret != m_iocp)
-        {
-            wxFAIL_MSG(_("Unexpectedly new I/O completion port was created"));
-            return false;
-        }
-
-        // add to watch map
-        wxFSWatchEntries::value_type val(watch->GetPath(), watch);
-        return m_watches.insert(val).second;
-    }
-
-    // Removes a watch we're currently using. Notice that this doesn't happen
-    // immediately, CompleteRemoval() must be called later when it's really
-    // safe to delete the watch, i.e. after completion of the IO operation
-    // using it.
-    bool ScheduleForRemoval(const wxSharedPtr<wxFSWatchEntryMSW>& watch)
-    {
-        wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" );
-        wxCHECK_MSG( watch->IsOk(), false, "Invalid watch" );
-
-        const wxString path = watch->GetPath();
-        wxFSWatchEntries::iterator it = m_watches.find(path);
-        wxCHECK_MSG( it != m_watches.end(), false,
-                     "Can't remove a watch we don't use" );
-
-        // We can't just delete the watch here as we can have pending events
-        // for it and if we destroyed it now, we could get a dangling (or,
-        // worse, reused to point to another object) pointer in ReadEvents() so
-        // just remember that this one should be removed when CompleteRemoval()
-        // is called later.
-        m_removedWatches.insert(wxFSWatchEntries::value_type(path, watch));
-        m_watches.erase(it);
-
-        return true;
-    }
-
-    // Really remove the watch previously passed to ScheduleForRemoval().
-    //
-    // It's ok to call this for a watch that hadn't been removed before, in
-    // this case we'll just return false and do nothing.
-    bool CompleteRemoval(wxFSWatchEntryMSW* watch)
-    {
-        wxFSWatchEntries::iterator it = m_removedWatches.find(watch->GetPath());
-        if ( it == m_removedWatches.end() )
-            return false;
-
-        // Removing the object from the map will result in deleting the watch
-        // itself as it's not referenced from anywhere else now.
-        m_removedWatches.erase(it);
-
-        return true;
-    }
-
-    // post completion packet
-    bool PostEmptyStatus()
-    {
-        wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" );
-
-        int ret = PostQueuedCompletionStatus(m_iocp, 0, 0, NULL);
-        if (!ret)
-        {
-            wxLogSysError(_("Unable to post completion status"));
-        }
-
-        return ret != 0;
-    }
-
-    // Wait for completion status to arrive.
-    // This function can block forever in it's wait for completion status.
-    // Use PostEmptyStatus() to wake it up (and end the worker thread)
-    bool GetStatus(unsigned long* count, wxFSWatchEntryMSW** watch,
-                   OVERLAPPED** overlapped)
-    {
-        wxCHECK_MSG( m_iocp != INVALID_HANDLE_VALUE, false, "IOCP not init" );
-        wxCHECK_MSG( count != NULL, false, "Null out parameter 'count'");
-        wxCHECK_MSG( watch != NULL, false, "Null out parameter 'watch'");
-        wxCHECK_MSG( overlapped != NULL, false,
-                     "Null out parameter 'overlapped'");
-
-        int ret = GetQueuedCompletionStatus(m_iocp, count, (ULONG_PTR *)watch,
-                                            overlapped, INFINITE);
-        if (!ret)
-        {
-            wxLogSysError(_("Unable to dequeue completion packet"));
-        }
-        return ret != 0;
-    }
-
-protected:
-    bool Init()
-    {
-        m_iocp = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
-        if (m_iocp == NULL)
-        {
-            wxLogSysError(_("Unable to create I/O completion port"));
-        }
-        return m_iocp != NULL;
-    }
-
-    HANDLE m_iocp;
-
-    // The hash containing all the wxFSWatchEntryMSW objects currently being
-    // watched keyed by their paths.
-    wxFSWatchEntries m_watches;
-
-    // Contains the watches which had been removed but are still pending.
-    wxFSWatchEntries m_removedWatches;
-};
-
-
-class wxIOCPThread : public wxThread
-{
-public:
-    wxIOCPThread(wxFSWatcherImplMSW* service, wxIOCPService* iocp);
-
-    // finishes this thread
-    bool Finish();
-
-protected:
-    // structure to hold information needed to process one native event
-    // this is just a dummy holder, so it doesn't take ownership of it's data
-    struct wxEventProcessingData
-    {
-        wxEventProcessingData(const FILE_NOTIFY_INFORMATION* ne,
-                              const wxFSWatchEntryMSW* watch) :
-            nativeEvent(ne), watch(watch)
-        {}
-
-        const FILE_NOTIFY_INFORMATION* nativeEvent;
-        const wxFSWatchEntryMSW* watch;
-    };
-
-    virtual ExitCode Entry();
-
-    // wait for events to occur, read them and send to interested parties
-    // returns false it empty status was read, which means we whould exit
-    //         true otherwise
-    bool ReadEvents();
-
-    void ProcessNativeEvents(wxVector<wxEventProcessingData>& events);
-
-    void SendEvent(wxFileSystemWatcherEvent& evt);
-
-    static int Native2WatcherFlags(int flags);
-
-    static wxString FileNotifyInformationToString(
-                                            const FILE_NOTIFY_INFORMATION& e);
-
-    static wxFileName GetEventPath(const wxFSWatchEntryMSW& watch,
-                                   const FILE_NOTIFY_INFORMATION& e);
-
-    wxFSWatcherImplMSW* m_service;
-    wxIOCPService* m_iocp;
-};
-
-#endif /* WX_MSW_PRIVATE_FSWATCHER_H_ */
diff --git a/Source/3rd Party/wx/include/wx/msw/private/hiddenwin.h b/Source/3rd Party/wx/include/wx/msw/private/hiddenwin.h
deleted file mode 100644
index 080104d75..000000000
--- a/Source/3rd Party/wx/include/wx/msw/private/hiddenwin.h	
+++ /dev/null
@@ -1,31 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/private/hiddenwin.h
-// Purpose:     Helper for creating a hidden window used by wxMSW internally.
-// Author:      Vadim Zeitlin
-// Created:     2011-09-16
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_PRIVATE_HIDDENWIN_H_
-#define _WX_MSW_PRIVATE_HIDDENWIN_H_
-
-#include "wx/msw/private.h"
-
-/*
-  Creates a hidden window with supplied window proc registering the class for
-  it if necessary (i.e. the first time only). Caller is responsible for
-  destroying the window and unregistering the class (note that this must be
-  done because wxWidgets may be used as a DLL and so may be loaded/unloaded
-  multiple times into/from the same process so we can't rely on automatic
-  Windows class unregistration).
-
-  pclassname is a pointer to a caller stored classname, which must initially be
-  NULL. classname is the desired wndclass classname. If function successfully
-  registers the class, pclassname will be set to classname.
- */
-extern "C" WXDLLIMPEXP_BASE HWND
-wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
-
-#endif // _WX_MSW_PRIVATE_HIDDENWIN_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/private/keyboard.h b/Source/3rd Party/wx/include/wx/msw/private/keyboard.h
deleted file mode 100644
index edd46e3af..000000000
--- a/Source/3rd Party/wx/include/wx/msw/private/keyboard.h	
+++ /dev/null
@@ -1,42 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/private/keyboard.h
-// Purpose:     Helper keyboard-related functions.
-// Author:      Vadim Zeitlin
-// Created:     2010-09-09
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2010 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_PRIVATE_KEYBOARD_H_
-#define _WX_MSW_PRIVATE_KEYBOARD_H_
-
-#include "wx/defs.h"
-
-namespace wxMSWKeyboard
-{
-
-// ----------------------------------------------------------------------------
-// Functions for translating between MSW virtual keys codes and wx key codes
-//
-// These functions are currently implemented in src/msw/window.cpp.
-// ----------------------------------------------------------------------------
-
-// Translate MSW virtual key code to wx key code. lParam is used to distinguish
-// between numpad and extended version of the keys, extended is assumed by
-// default if lParam == 0.
-//
-// Returns WXK_NONE if translation couldn't be done at all (this happens e.g.
-// for dead keys and in this case uc will be WXK_NONE too) or if the key
-// corresponds to a non-Latin-1 character in which case uc is filled with its
-// Unicode value.
-WXDLLIMPEXP_CORE int VKToWX(WXWORD vk, WXLPARAM lParam = 0, wchar_t *uc = NULL);
-
-// Translate wxKeyCode enum element (passed as int for compatibility reasons)
-// to MSW virtual key code. isExtended is set to true if the key corresponds to
-// a non-numpad version of a key that exists both on numpad and outside it.
-WXDLLIMPEXP_CORE WXWORD WXToVK(int id, bool *isExtended = NULL);
-
-} // namespace wxMSWKeyboard
-
-#endif // _WX_MSW_PRIVATE_KEYBOARD_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/private/metrics.h b/Source/3rd Party/wx/include/wx/msw/private/metrics.h
deleted file mode 100644
index ed25d46c3..000000000
--- a/Source/3rd Party/wx/include/wx/msw/private/metrics.h	
+++ /dev/null
@@ -1,49 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/private/metrics.h
-// Purpose:     various helper functions to retrieve system metrics
-// Author:      Vadim Zeitlin
-// Created:     2008-09-05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_PRIVATE_METRICS_H_
-#define _WX_MSW_PRIVATE_METRICS_H_
-
-namespace wxMSWImpl
-{
-
-// return NONCLIENTMETRICS as retrieved by SystemParametersInfo()
-//
-// currently this is not cached as the values may change when system settings
-// do and we don't react to this to invalidate the cache but it could be done
-// in the future
-//
-// MT-safety: this function is only meant to be called from the main thread
-inline const NONCLIENTMETRICS& GetNonClientMetrics()
-{
-    static WinStruct<NONCLIENTMETRICS> nm;
-    if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0) )
-    {
-#if WINVER >= 0x0600
-        // a new field has been added to NONCLIENTMETRICS under Vista, so
-        // the call to SystemParametersInfo() fails if we use the struct
-        // size incorporating this new value on an older system -- retry
-        // without it
-        nm.cbSize -= sizeof(int);
-        if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0) )
-#endif // WINVER >= 0x0600
-        {
-            // maybe we should initialize the struct with some defaults?
-            wxLogLastError(wxT("SystemParametersInfo(SPI_GETNONCLIENTMETRICS)"));
-        }
-    }
-
-    return nm;
-}
-
-} // namespace wxMSWImpl
-
-#endif // _WX_MSW_PRIVATE_METRICS_H_
-
diff --git a/Source/3rd Party/wx/include/wx/msw/private/msgdlg.h b/Source/3rd Party/wx/include/wx/msw/private/msgdlg.h
deleted file mode 100644
index c463fe3d8..000000000
--- a/Source/3rd Party/wx/include/wx/msw/private/msgdlg.h	
+++ /dev/null
@@ -1,94 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/private/msgdlg.h
-// Purpose:     helper functions used with native message dialog
-// Author:      Rickard Westerlund
-// Created:     2010-07-12
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_PRIVATE_MSGDLG_H_
-#define _WX_MSW_PRIVATE_MSGDLG_H_
-
-#include "wx/msw/wrapcctl.h"
-#include "wx/scopedarray.h"
-
-// Macro to help identify if task dialogs are available: we rely on
-// TD_WARNING_ICON being defined in the headers for this as this symbol is used
-// by the task dialogs only. Also notice that task dialogs are available for
-// Unicode applications only.
-#if defined(TD_WARNING_ICON) && wxUSE_UNICODE
-    #define wxHAS_MSW_TASKDIALOG
-#endif
-
-// Provides methods for creating a task dialog.
-namespace wxMSWMessageDialog
-{
-
-#ifdef wxHAS_MSW_TASKDIALOG
-    class wxMSWTaskDialogConfig
-    {
-    public:
-        enum { MAX_BUTTONS = 4  };
-
-        wxMSWTaskDialogConfig()
-            : buttons(new TASKDIALOG_BUTTON[MAX_BUTTONS]),
-              parent(NULL),
-              iconId(0),
-              style(0),
-              useCustomLabels(false)
-            { }
-
-        // initializes the object from a message dialog.
-        wxMSWTaskDialogConfig(const wxMessageDialogBase& dlg);
-
-        wxScopedArray<TASKDIALOG_BUTTON> buttons;
-        wxWindow *parent;
-        wxString caption;
-        wxString message;
-        wxString extendedMessage;
-        long iconId;
-        long style;
-        bool useCustomLabels;
-        wxString btnYesLabel;
-        wxString btnNoLabel;
-        wxString btnOKLabel;
-        wxString btnCancelLabel;
-        wxString btnHelpLabel;
-
-        // Will create a task dialog with it's paremeters for it's creation
-        // stored in the provided TASKDIALOGCONFIG parameter.
-        // NOTE: The wxMSWTaskDialogConfig object needs to remain accessible
-        // during the subsequent call to TaskDialogIndirect().
-        void MSWCommonTaskDialogInit(TASKDIALOGCONFIG &tdc);
-
-        // Used by MSWCommonTaskDialogInit() to add a regular button or a
-        // button with a custom label if used.
-        void AddTaskDialogButton(TASKDIALOGCONFIG &tdc,
-                                 int btnCustomId,
-                                 int btnCommonId,
-                                 const wxString& customLabel);
-    }; // class wxMSWTaskDialogConfig
-
-
-    typedef HRESULT (WINAPI *TaskDialogIndirect_t)(const TASKDIALOGCONFIG *,
-                                                   int *, int *, BOOL *);
-
-    // Return the pointer to TaskDialogIndirect(). This should only be called
-    // if HasNativeTaskDialog() returned true and is normally guaranteed to
-    // succeed in this case.
-    TaskDialogIndirect_t GetTaskDialogIndirectFunc();
-#endif // wxHAS_MSW_TASKDIALOG
-
-
-    // Check if the task dialog is available: this simply checks the OS version
-    // as we know that it's only present in Vista and later.
-    bool HasNativeTaskDialog();
-
-    // Translates standard MSW button IDs like IDCANCEL into an equivalent
-    // wx constant such as wxCANCEL.
-    int MSWTranslateReturnCode(int msAns);
-}; // namespace wxMSWMessageDialog
-
-#endif // _WX_MSW_PRIVATE_MSGDLG_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/private/timer.h b/Source/3rd Party/wx/include/wx/msw/private/timer.h
deleted file mode 100644
index c9d68e3c9..000000000
--- a/Source/3rd Party/wx/include/wx/msw/private/timer.h	
+++ /dev/null
@@ -1,37 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/private/timer.h
-// Purpose:     wxTimer class
-// Author:      Julian Smart
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_PRIVATE_TIMER_H_
-#define _WX_MSW_PRIVATE_TIMER_H_
-
-#if wxUSE_TIMER
-
-#include "wx/private/timer.h"
-#include "wx/msw/wrapwin.h"     // for WPARAM
-
-class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl
-{
-public:
-    wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; }
-
-    virtual bool Start(int milliseconds = -1, bool oneShot = false);
-    virtual void Stop();
-
-    virtual bool IsRunning() const { return m_id != 0; }
-
-protected:
-    // this must be 64 bit under Win64 as WPARAM (storing timer ids) is 64 bit
-    // there and so the ids may possibly not fit in 32 bits
-    WPARAM m_id;
-};
-
-#endif // wxUSE_TIMER
-
-#endif // _WX_TIMERH_
diff --git a/Source/3rd Party/wx/include/wx/msw/progdlg.h b/Source/3rd Party/wx/include/wx/msw/progdlg.h
deleted file mode 100644
index 5d6a4fd71..000000000
--- a/Source/3rd Party/wx/include/wx/msw/progdlg.h	
+++ /dev/null
@@ -1,74 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/progdlg.h
-// Purpose:     wxProgressDialog
-// Author:      Rickard Westerlund
-// Created:     2010-07-22
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROGDLG_H_
-#define _WX_PROGDLG_H_
-
-class wxProgressDialogTaskRunner;
-class wxProgressDialogSharedData;
-
-class WXDLLIMPEXP_CORE wxProgressDialog : public wxGenericProgressDialog
-{
-public:
-    wxProgressDialog(const wxString& title, const wxString& message,
-                     int maximum = 100,
-                     wxWindow *parent = NULL,
-                     int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE);
-
-    virtual ~wxProgressDialog();
-
-    virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
-    virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL);
-
-    void Resume();
-
-    int GetValue() const;
-    wxString GetMessage() const;
-
-    void SetRange(int maximum);
-
-    // Return whether "Cancel" or "Skip" button was pressed, always return
-    // false if the corresponding button is not shown.
-    bool WasSkipped() const;
-    bool WasCancelled() const;
-
-    virtual void SetTitle(const wxString& title);
-    virtual wxString GetTitle() const;
-
-    virtual bool Show( bool show = true );
-
-    // Must provide overload to avoid hiding it (and warnings about it)
-    virtual void Update() { wxGenericProgressDialog::Update(); }
-
-    virtual WXWidget GetHandle() const;
-
-private:
-    // Performs common routines to Update() and Pulse(). Requires the
-    // shared object to have been entered.
-    bool DoNativeBeforeUpdate(bool *skip);
-
-    // Updates the various timing informations for both determinate
-    // and indeterminate modes. Requires the shared object to have
-    // been entered.
-    void UpdateExpandedInformation(int value);
-
-    wxProgressDialogTaskRunner *m_taskDialogRunner;
-
-    wxProgressDialogSharedData *m_sharedData;
-
-    // Store the message and title we currently use to be able to return it
-    // from Get{Message,Title}()
-    wxString m_message,
-             m_title;
-
-    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxProgressDialog);
-};
-
-#endif // _WX_PROGDLG_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/radiobox.h b/Source/3rd Party/wx/include/wx/msw/radiobox.h
index 7b4f57b18..8012dd8b9 100644
--- a/Source/3rd Party/wx/include/wx/msw/radiobox.h	
+++ b/Source/3rd Party/wx/include/wx/msw/radiobox.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: radiobox.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,7 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxSubwindows;
 // wxRadioBox
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxRadioBox : public wxStaticBox, public wxRadioBoxBase
+class WXDLLEXPORT wxRadioBox : public wxStaticBox, public wxRadioBoxBase
 {
 public:
     wxRadioBox() { Init(); }
@@ -32,7 +32,7 @@ public:
                const wxSize& size = wxDefaultSize,
                int n = 0, const wxString choices[] = NULL,
                int majorDim = 0,
-               long style = wxRA_SPECIFY_COLS,
+               long style = wxRA_HORIZONTAL,
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
@@ -49,7 +49,7 @@ public:
                const wxSize& size,
                const wxArrayString& choices,
                int majorDim = 0,
-               long style = wxRA_SPECIFY_COLS,
+               long style = wxRA_HORIZONTAL,
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
     {
@@ -68,7 +68,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
                 int majorDim = 0,
-                long style = wxRA_SPECIFY_COLS,
+                long style = wxRA_HORIZONTAL,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
     bool Create(wxWindow *parent,
@@ -78,7 +78,7 @@ public:
                 const wxSize& size,
                 const wxArrayString& choices,
                 int majorDim = 0,
-                long style = wxRA_SPECIFY_COLS,
+                long style = wxRA_HORIZONTAL,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
@@ -117,20 +117,12 @@ public:
     // it to behave normally
     virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
     void SetLabelFont(const wxFont& WXUNUSED(font)) {}
     void SetButtonFont(const wxFont& font) { SetFont(font); }
 
-
     // implementation only from now on
     // -------------------------------
 
-    // This function can be used to check if the given radio button HWND
-    // belongs to one of our radio boxes. If it doesn't, NULL is returned.
-    static wxRadioBox *GetFromRadioButtonHWND(WXHWND hwnd);
-
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     void Command(wxCommandEvent& event);
 
@@ -149,13 +141,9 @@ protected:
     // get the total size occupied by the radio box buttons
     wxSize GetTotalButtonSize(const wxSize& sizeBtn) const;
 
-    // Adjust all the buttons to the new window size.
-    void PositionAllButtons(int x, int y, int width, int height);
-
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
 
 #if wxUSE_TOOLTIPS
@@ -166,16 +154,10 @@ protected:
     virtual WXHRGN MSWGetRegionWithoutChildren();
 #endif // __WXWINCE__
 
-    // resolve ambiguity in base classes
-    virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); }
 
     // the buttons we contain
     wxSubwindows *m_radioButtons;
 
-    // and the special dummy button used only as a tab group boundary
-    WXHWND m_dummyHwnd;
-    wxWindowIDRef m_dummyId;
-
     // array of widths and heights of the buttons, may be wxDefaultCoord if the
     // corresponding quantity should be computed
     int *m_radioWidth;
@@ -186,7 +168,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
-    wxDECLARE_NO_COPY_CLASS(wxRadioBox);
+    DECLARE_NO_COPY_CLASS(wxRadioBox)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/msw/radiobut.h b/Source/3rd Party/wx/include/wx/msw/radiobut.h
index 8e768d899..6e48bf3f3 100644
--- a/Source/3rd Party/wx/include/wx/msw/radiobut.h	
+++ b/Source/3rd Party/wx/include/wx/msw/radiobut.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/radiobut.h
+// Name:        radiobut.h
 // Purpose:     wxRadioButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: radiobut.h 41144 2006-09-10 23:08:13Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
-class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
+class WXDLLEXPORT wxRadioButton: public wxControl
 {
 public:
     // ctors and creation functions
@@ -53,7 +53,6 @@ public:
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
     virtual wxSize DoGetBestSize() const;
 
 private:
diff --git a/Source/3rd Party/wx/include/wx/msw/regconf.h b/Source/3rd Party/wx/include/wx/msw/regconf.h
index 4b7dd492f..a256e98c8 100644
--- a/Source/3rd Party/wx/include/wx/msw/regconf.h	
+++ b/Source/3rd Party/wx/include/wx/msw/regconf.h	
@@ -1,25 +1,27 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/regconf.h
+// Name:        msw/regconf.h
 // Purpose:     Registry based implementation of wxConfigBase
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.04.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: regconf.h 62185 2009-09-28 10:02:42Z JS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_MSW_REGCONF_H_
-#define _WX_MSW_REGCONF_H_
+#ifndef   _REGCONF_H
+#define   _REGCONF_H
 
 #include "wx/defs.h"
 
-#if wxUSE_CONFIG && wxUSE_REGKEY
+#if wxUSE_CONFIG
+
+#ifndef   _REGISTRY_H
+  #include "wx/msw/registry.h"
+#endif
 
-#include "wx/msw/registry.h"
 #include "wx/object.h"
 #include "wx/confbase.h"
-#include "wx/buffer.h"
 
 // ----------------------------------------------------------------------------
 // wxRegConfig
@@ -92,24 +94,23 @@ protected:
   // implement read/write methods
   virtual bool DoReadString(const wxString& key, wxString *pStr) const;
   virtual bool DoReadLong(const wxString& key, long *plResult) const;
-  virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const;
 
   virtual bool DoWriteString(const wxString& key, const wxString& szValue);
   virtual bool DoWriteLong(const wxString& key, long lValue);
-  virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf);
 
 private:
+  // no copy ctor/assignment operator
+  wxRegConfig(const wxRegConfig&);
+  wxRegConfig& operator=(const wxRegConfig&);
+
   // these keys are opened during all lifetime of wxRegConfig object
   wxRegKey  m_keyLocalRoot,  m_keyLocal,
             m_keyGlobalRoot, m_keyGlobal;
 
   // current path (not '/' terminated)
   wxString  m_strPath;
-
-  wxDECLARE_NO_COPY_CLASS(wxRegConfig);
-  DECLARE_ABSTRACT_CLASS(wxRegConfig)
 };
 
-#endif // wxUSE_CONFIG && wxUSE_REGKEY
+#endif // wxUSE_CONFIG
 
-#endif // _WX_MSW_REGCONF_H_
+#endif // _REGCONF_H
diff --git a/Source/3rd Party/wx/include/wx/msw/region.h b/Source/3rd Party/wx/include/wx/msw/region.h
index 81a3fee13..881214c7e 100644
--- a/Source/3rd Party/wx/include/wx/msw/region.h	
+++ b/Source/3rd Party/wx/include/wx/msw/region.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: region.h 59602 2009-03-18 10:07:58Z VZ $
 // Copyright:   (c) 1997-2002 wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
 #ifndef _WX_MSW_REGION_H_
 #define _WX_MSW_REGION_H_
 
-class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine
+class WXDLLEXPORT wxRegion : public wxRegionWithCombine
 {
 public:
     wxRegion();
@@ -20,7 +20,7 @@ public:
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(WXHRGN hRegion); // Hangs on to this region
-    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
+    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
 #if wxUSE_IMAGE
     wxRegion( const wxBitmap& bmp)
     {
@@ -43,8 +43,8 @@ public:
     WXHRGN GetHRGN() const;
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     virtual bool DoIsEqual(const wxRegion& region) const;
     virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
@@ -59,7 +59,7 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxRegion)
 };
 
-class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject
+class WXDLLEXPORT wxRegionIterator : public wxObject
 {
 public:
     wxRegionIterator() { Init(); }
diff --git a/Source/3rd Party/wx/include/wx/msw/registry.h b/Source/3rd Party/wx/include/wx/msw/registry.h
index 9d157b081..04758d280 100644
--- a/Source/3rd Party/wx/include/wx/msw/registry.h	
+++ b/Source/3rd Party/wx/include/wx/msw/registry.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.1998
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: registry.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,10 +12,6 @@
 #ifndef _WX_MSW_REGISTRY_H_
 #define _WX_MSW_REGISTRY_H_
 
-#include "wx/defs.h"
-
-#if wxUSE_REGKEY
-
 class WXDLLIMPEXP_FWD_BASE wxOutputStream;
 
 // ----------------------------------------------------------------------------
@@ -66,22 +62,6 @@ public:
       Write     // read and write
   };
 
-  // Different registry views supported under WOW64.
-  enum WOW64ViewMode
-  {
-      // 32 bit registry for 32 bit applications, 64 bit registry
-      // for 64 bit ones.
-      WOW64ViewMode_Default,
-
-      // Can be used in 64 bit apps to access 32 bit registry,
-      // has no effect (i.e. treated as default) in 32 bit apps.
-      WOW64ViewMode_32,
-
-      // Can be used in 32 bit apps to access 64 bit registry,
-      // has no effect (i.e. treated as default) in 64 bit apps.
-      WOW64ViewMode_64
-  };
-
   // information about standard (predefined) registry keys
     // number of standard keys
   static const size_t nStdKeys;
@@ -92,23 +72,17 @@ public:
     // get StdKey from root HKEY
   static StdKey GetStdKeyFromHkey(WXHKEY hkey);
 
-  // extracts the std key prefix from the string (return value) and
+  // extacts the std key prefix from the string (return value) and
   // leaves only the part after it (i.e. modifies the string passed!)
   static StdKey ExtractKeyName(wxString& str);
 
   // ctors
     // root key is set to HKCR (the only root key under Win16)
-    wxRegKey(WOW64ViewMode viewMode = WOW64ViewMode_Default);
-
+  wxRegKey();
     // strKey is the full name of the key (i.e. starting with HKEY_xxx...)
-    wxRegKey(const wxString& strKey,
-        WOW64ViewMode viewMode = WOW64ViewMode_Default);
-
+  wxRegKey(const wxString& strKey);
     // strKey is the name of key under (standard key) keyParent
-    wxRegKey(StdKey keyParent,
-        const wxString& strKey,
-        WOW64ViewMode viewMode = WOW64ViewMode_Default);
-
+  wxRegKey(StdKey keyParent, const wxString& strKey);
     // strKey is the name of key under (previously created) keyParent
   wxRegKey(const wxRegKey& keyParent, const wxString& strKey);
     // dtor closes the key
@@ -127,8 +101,6 @@ public:
   // get infomation about the key
     // get the (full) key name. Abbreviate std root keys if bShortPrefix.
   wxString GetName(bool bShortPrefix = true) const;
-    // Retrieves the registry view used by this key.
-    WOW64ViewMode GetView() const { return m_viewMode; }
     // return true if the key exists
   bool  Exists() const;
     // get the info about key (any number of these pointers may be NULL)
@@ -148,16 +120,15 @@ public:
     // create the key: will fail if the key already exists and !bOkIfExists
   bool  Create(bool bOkIfExists = true);
     // rename a value from old name to new one
-  bool  RenameValue(const wxString& szValueOld, const wxString& szValueNew);
+  bool  RenameValue(const wxChar *szValueOld, const wxChar *szValueNew);
     // rename the key
-  bool  Rename(const wxString& szNewName);
+  bool  Rename(const wxChar *szNewName);
     // copy value to another key possibly changing its name (by default it will
     // remain the same)
-  bool  CopyValue(const wxString& szValue, wxRegKey& keyDst,
-                  const wxString& szNewName = wxEmptyString);
-
+  bool  CopyValue(const wxChar *szValue, wxRegKey& keyDst,
+                  const wxChar *szNewName = NULL);
     // copy the entire contents of the key recursively to another location
-  bool  Copy(const wxString& szNewName);
+  bool  Copy(const wxChar *szNewName);
     // same as Copy() but using a key and not the name
   bool  Copy(wxRegKey& keyDst);
     // close the key (will be automatically done in dtor)
@@ -167,19 +138,21 @@ public:
     // deletes this key and all of it's subkeys/values
   bool  DeleteSelf();
     // deletes the subkey with all of it's subkeys/values recursively
-  bool  DeleteKey(const wxString& szKey);
-    // deletes the named value (may be empty string to remove the default value)
-  bool DeleteValue(const wxString& szValue);
+  bool  DeleteKey(const wxChar *szKey);
+    // deletes the named value (may be NULL to remove the default value)
+  bool  DeleteValue(const wxChar *szValue);
 
   // access to values and subkeys
     // get value type
-  ValueType GetValueType(const wxString& szValue) const;
+  ValueType GetValueType(const wxChar *szValue) const;
     // returns true if the value contains a number (else it's some string)
-  bool IsNumericValue(const wxString& szValue) const;
+  bool IsNumericValue(const wxChar *szValue) const;
 
     // assignment operators set the default value of the key
   wxRegKey& operator=(const wxString& strValue)
-    { SetValue(wxEmptyString, strValue); return *this; }
+    { SetValue(NULL, strValue); return *this; }
+  wxRegKey& operator=(long lValue)
+    { SetValue(NULL, lValue); return *this; }
 
     // query the default value of the key: implicitly or explicitly
   wxString QueryDefaultValue() const;
@@ -188,30 +161,30 @@ public:
     // named values
 
     // set the string value
-  bool  SetValue(const wxString& szValue, const wxString& strValue);
+  bool  SetValue(const wxChar *szValue, const wxString& strValue);
     // retrieve the string value
-  bool  QueryValue(const wxString& szValue, wxString& strValue) const
+  bool  QueryValue(const wxChar *szValue, wxString& strValue) const
     { return QueryValue(szValue, strValue, false); }
     // retrieve raw string value
-  bool  QueryRawValue(const wxString& szValue, wxString& strValue) const
+  bool  QueryRawValue(const wxChar *szValue, wxString& strValue) const
     { return QueryValue(szValue, strValue, true); }
     // retrieve either raw or expanded string value
-  bool  QueryValue(const wxString& szValue, wxString& strValue, bool raw) const;
+  bool  QueryValue(const wxChar *szValue, wxString& strValue, bool raw) const;
 
     // set the numeric value
-  bool  SetValue(const wxString& szValue, long lValue);
+  bool  SetValue(const wxChar *szValue, long lValue);
     // return the numeric value
-  bool  QueryValue(const wxString& szValue, long *plValue) const;
+  bool  QueryValue(const wxChar *szValue, long *plValue) const;
     // set the binary value
-  bool  SetValue(const wxString& szValue, const wxMemoryBuffer& buf);
+  bool  SetValue(const wxChar *szValue, const wxMemoryBuffer& buf);
     // return the binary value
-  bool  QueryValue(const wxString& szValue, wxMemoryBuffer& buf) const;
+  bool  QueryValue(const wxChar *szValue, wxMemoryBuffer& buf) const;
 
   // query existence of a key/value
     // return true if value exists
-  bool HasValue(const wxString& szKey) const;
+  bool HasValue(const wxChar *szKey) const;
     // return true if given subkey exists
-  bool HasSubKey(const wxString& szKey) const;
+  bool HasSubKey(const wxChar *szKey) const;
     // return true if any subkeys exist
   bool HasSubkeys() const;
     // return true if any values exist
@@ -259,18 +232,16 @@ private:
   wxString FormatValue(const wxString& name) const;
 
 
-  WXHKEY        m_hKey,          // our handle
-                m_hRootKey;      // handle of the top key (i.e. StdKey)
-  wxString      m_strKey;        // key name (relative to m_hRootKey)
-  WOW64ViewMode m_viewMode;      // which view to select under WOW64
-  AccessMode    m_mode;          // valid only if key is opened
-  long          m_dwLastError;   // last error (0 if none)
+  WXHKEY      m_hKey,           // our handle
+              m_hRootKey;       // handle of the top key (i.e. StdKey)
+  wxString    m_strKey;         // key name (relative to m_hRootKey)
+
+  AccessMode  m_mode;           // valid only if key is opened
+  long        m_dwLastError;    // last error (0 if none)
 
 
-  wxDECLARE_NO_COPY_CLASS(wxRegKey);
+  DECLARE_NO_COPY_CLASS(wxRegKey)
 };
 
-#endif // wxUSE_REGKEY
-
 #endif // _WX_MSW_REGISTRY_H_
 
diff --git a/Source/3rd Party/wx/include/wx/msw/richmsgdlg.h b/Source/3rd Party/wx/include/wx/msw/richmsgdlg.h
deleted file mode 100644
index 6ef416325..000000000
--- a/Source/3rd Party/wx/include/wx/msw/richmsgdlg.h	
+++ /dev/null
@@ -1,31 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/richmsgdlg.h
-// Purpose:     wxRichMessageDialog
-// Author:      Rickard Westerlund
-// Created:     2010-07-04
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_RICHMSGDLG_H_
-#define _WX_MSW_RICHMSGDLG_H_
-
-class WXDLLIMPEXP_CORE wxRichMessageDialog : public wxGenericRichMessageDialog
-{
-public:
-    wxRichMessageDialog(wxWindow *parent,
-                        const wxString& message,
-                        const wxString& caption,
-                        long style)
-        : wxGenericRichMessageDialog(parent, message, caption, style)
-        { }
-
-    // overridden base class method showing the native task dialog if possible
-    virtual int ShowModal();
-
-private:
-    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog);
-};
-
-#endif // _WX_MSW_RICHMSGDLG_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/scrolbar.h b/Source/3rd Party/wx/include/wx/msw/scrolbar.h
index 68d269d46..bfe86c6a8 100644
--- a/Source/3rd Party/wx/include/wx/msw/scrolbar.h	
+++ b/Source/3rd Party/wx/include/wx/msw/scrolbar.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/scrolbar.h
+// Name:        scrollbar.h
 // Purpose:     wxScrollBar class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: scrolbar.h 41020 2006-09-05 20:47:48Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,7 @@
 #define _WX_SCROLBAR_H_
 
 // Scrollbar item
-class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase
+class WXDLLEXPORT wxScrollBar: public wxScrollBarBase
 {
 public:
     wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
@@ -58,9 +58,6 @@ public:
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
 protected:
     virtual wxSize DoGetBestSize() const;
 
diff --git a/Source/3rd Party/wx/include/wx/msw/seh.h b/Source/3rd Party/wx/include/wx/msw/seh.h
index 1231c930d..23053fab0 100644
--- a/Source/3rd Party/wx/include/wx/msw/seh.h	
+++ b/Source/3rd Party/wx/include/wx/msw/seh.h	
@@ -3,7 +3,7 @@
 // Purpose:     declarations for SEH (structured exceptions handling) support
 // Author:      Vadim Zeitlin
 // Created:     2006-04-26
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: seh.h 44451 2007-02-11 02:17:28Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -55,11 +55,11 @@
     // as division by 0 or access violation) to C++ pseudo-exceptions
     extern void wxSETranslator(unsigned int code, EXCEPTION_POINTERS *ep);
 
-    // up to VC 9 this warning ("calling _set_se_translator() requires /EHa")
+    // up to VC 7.1 this warning ("calling _set_se_translator() requires /EHa")
     // is harmless and it's easier to suppress it than use different makefiles
     // for VC5 and 6 (which don't support /EHa at all) and VC7 (which does
     // accept it but it seems to change nothing for it anyhow)
-    #if __VISUALC__ < 1600
+    #if __VISUALC__ <= 1310
         #pragma warning(disable: 4535)
     #endif
 
diff --git a/Source/3rd Party/wx/include/wx/msw/setup.h b/Source/3rd Party/wx/include/wx/msw/setup.h
index acb2276b9..36147b18f 100644
--- a/Source/3rd Party/wx/include/wx/msw/setup.h	
+++ b/Source/3rd Party/wx/include/wx/msw/setup.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: setup0.h 60190 2009-04-16 00:57:35Z KO $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,6 +27,14 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
+// This setting determines the compatibility with 2.4 API: set it to 1 to
+// enable it but please consider updating your code instead.
+//
+// Default is 0
+//
+// Recommended setting: 0 (please update your code)
+#define WXWIN_COMPATIBILITY_2_4 0
+
 // This setting determines the compatibility with 2.6 API: set it to 0 to
 // flag all cases of using deprecated functions.
 //
@@ -35,17 +43,7 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
+#define WXWIN_COMPATIBILITY_2_6 1
 
 // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
 // default system font is used for wxWindow::GetCharWidth/Height() instead of
@@ -60,50 +58,6 @@
 // debugging settings
 // ----------------------------------------------------------------------------
 
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
 // Generic comment about debugging settings: they are very useful if you don't
 // use any other memory leak detection tools such as Purify/BoundsChecker, but
 // are probably redundant otherwise. Also, Visual C++ CRT has the same features
@@ -111,13 +65,10 @@
 // may prefer to use it instead of built in memory debugging code because it is
 // faster and more fool proof.
 //
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
+// Using VC++ CRT memory debugging is enabled by default in debug mode
+// (__WXDEBUG__) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
 // and if __NO_VC_CRTDBG__ is not defined.
 
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
 // If 1, enables wxDebugContext, for writing error messages to file, etc. If
 // __WXDEBUG__ is not defined, will still use the normal memory operators.
 //
@@ -151,27 +102,72 @@
 // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
 // this causes problems (e.g. link errors), set this to 0. You may need to set
 // this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
+// ignored for mingw / cygwin / CodeWarrior
 //
 // Default is 0
 //
 // Recommended setting: 0
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 
+// wxHandleFatalExceptions() may be used to catch the program faults at run
+// time and, instead of terminating the program with a usual GPF message box,
+// call the user-defined wxApp::OnFatalException() function. If you set
+// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
+//
+// This setting is for Win32 only and can only be enabled if your compiler
+// supports Win32 structured exception handling (currently only VC++ does)
+//
+// Default is 1
+//
+// Recommended setting: 1 if your compiler supports it.
+#define wxUSE_ON_FATAL_EXCEPTION 1
+
+// Set this to 1 to be able to generate a human-readable (unlike
+// machine-readable minidump created by wxCrashReport::Generate()) stack back
+// trace when your program crashes using wxStackWalker
+//
+// Default is 1 if supported by the compiler.
+//
+// Recommended setting: 1, set to 0 if your programs never crash
+#define wxUSE_STACKWALKER 1
+
+// Set this to 1 to compile in wxDebugReport class which allows you to create
+// and optionally upload to your web site a debug report consisting of back
+// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
+//
+// Default is 1 if supported by the compiler.
+//
+// Recommended setting: 1, it is compiled into a separate library so there
+//                         is no overhead if you don't use it
+#define wxUSE_DEBUGREPORT 0
 
 // ----------------------------------------------------------------------------
 // Unicode support
 // ----------------------------------------------------------------------------
 
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
+// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be
+// defined as wchar_t, wxString will use Unicode internally. If you set this
+// to 1, you must use wxT() macro for all literal strings in the program.
+//
+// Unicode is currently only fully supported under Windows NT/2000/XP
+// (Windows 9x doesn't support it and the programs compiled in Unicode mode
+// will not run under 9x -- but see wxUSE_UNICODE_MSLU below).
+//
+// Default is 0
+//
+// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP)
 #ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
+    #define wxUSE_UNICODE 0
 #endif
 
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
+// Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without
+// compiling the program in Unicode mode. More precisely, it will be possible
+// to construct wxString from a wide (Unicode) string and convert any wxString
+// to Unicode.
+//
+// Default is 1
+//
+// Recommended setting: 1
 #define wxUSE_WCHAR_T 1
 
 // ----------------------------------------------------------------------------
@@ -201,6 +197,15 @@
 // Recommended setting: 0 (this is still work in progress...)
 #define wxUSE_EXTENDED_RTTI 0
 
+// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from
+// std::list<Foo*> and std::vector<Foo*>, with a compatibility interface,
+// and for wxHashMap to be implemented with templates.
+//
+// Default is 0
+//
+// Recommended setting: YMMV
+#define wxUSE_STL 0
+
 // Support for message/error logging. This includes wxLogXXX() functions and
 // wxLog and derived classes. Don't set this to 0 unless you really know what
 // you are doing.
@@ -252,6 +257,37 @@
 // Recommended setting: 1 as setting it to 0 disables many other things
 #define wxUSE_STREAMS       1
 
+// Use standard C++ streams if 1 instead of wx streams in some places. If
+// disabled (default), wx streams are used everywhere and wxWidgets doesn't
+// depend on the standard streams library.
+//
+// Notice that enabling this does not replace wx streams with std streams
+// everywhere, in a lot of places wx streams are used no matter what.
+//
+// Default is 0
+//
+// Recommended setting: 1 if you use the standard streams anyhow and so
+//                      dependency on the standard streams library is not a
+//                      problem
+#define wxUSE_STD_IOSTREAM  0
+
+// Enable conversion to standard C++ string if 1.
+//
+// Default is 1 for most compilers.
+//
+// Currently the Digital Mars and Watcom compilers come without standard C++
+// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
+// them (e.g. from STLPort).
+//
+// VC++ 5.0 does include standard C++ library header, however they produce
+// many warnings that can't be turned off when compiled at warning level 4.
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_STRING  0
+#else
+    #define wxUSE_STD_STRING  1
+#endif
+
 // Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
 // Note that if the system's implementation does not support positional
 // parameters, setting this to 1 forces the use of the wxWidgets implementation
@@ -267,118 +303,6 @@
 // Recommended setting: 1 if you want to support multiple languages
 #define wxUSE_PRINTF_POS_PARAMS      1
 
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but must
-// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
-// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
-// support that results in crashes when any TLS variables are used. So if you
-// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
-// this to 0.
-//
-// Default is 1, but set to 0 if the scenario above is applicable.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------
@@ -396,24 +320,6 @@
 // Recommended setting: 1
 #define wxUSE_LONGLONG      1
 
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
 // Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
 // POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
 //
@@ -449,21 +355,6 @@
 // i18n support: _() macro, wxLocale class. Requires wxTextFile.
 #define wxUSE_INTL          1
 
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
 // Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
 // allow to manipulate dates, times and time intervals. wxDateTime replaces the
 // old wxTime and wxDate classes which are still provided for backwards
@@ -495,13 +386,6 @@
 // Recommended setting: 1 (needed by wxSocket)
 #define wxUSE_STOPWATCH     1
 
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
 // Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
 // which allow the application to store its settings in the persistent
 // storage. Setting this to 1 will also enable on-demand creation of the
@@ -550,17 +434,6 @@
 // Set to 1 to use socket classes
 #define wxUSE_SOCKETS       1
 
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
 // Set to 1 to enable virtual file systems (required by wxHTML)
 #define wxUSE_FILESYSTEM    1
 
@@ -598,9 +471,6 @@
 // Joystick support class
 #define wxUSE_JOYSTICK            1
 
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
 // wxFontMapper class
 #define wxUSE_FONTMAP 1
 
@@ -642,14 +512,6 @@
 // possible in which case setting this to 0 can gain up to 100KB.
 #define wxUSE_VARIANT 1
 
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
 // Support for regular expression matching via wxRegEx class: enable this to
 // use POSIX regular expressions in your code. You need to compile regex
 // library from src/regex to use it under Windows.
@@ -658,7 +520,7 @@
 //
 // Recommended setting: 1 if your compiler supports it, if it doesn't please
 // contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
+#define wxUSE_REGEX       0
 
 // wxSystemOptions class
 #define wxUSE_SYSTEM_OPTIONS 1
@@ -671,14 +533,21 @@
 // Default is 1.
 //
 // Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
+#define wxUSE_MEDIACTRL     0
+
+// Use GStreamer for Unix (req a lot of dependancies)
+//
+// Default is 0
+//
+// Recommended setting: 1 (wxMediaCtrl won't work by default without it)
+#define wxUSE_GSTREAMER    0
 
 // Use wxWidget's XRC XML-based resource system.  Recommended.
 //
 // Default is 1
 //
 // Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
+#define wxUSE_XRC       0
 
 // XML parsing classes. Note that their API will change in the future, so
 // using wxXmlDocument and wxXmlNode in your app is not recommended.
@@ -693,107 +562,34 @@
 // Default is 1
 //
 // Recommended setting: 1
-#define wxUSE_AUI       1
+#define wxUSE_AUI       0
 
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
 
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)
 //
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
+// Please note that on Windows you will need to link with gdiplus.lib (use
+// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your
+// application if you want it to be runnable on pre-XP systems.
 //
 // Default is 0
 //
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
+// Recommended setting: 1
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
 
+// Enable the new wxCairoContext classes for an advanced
+// 2D drawing API.  (Still somewhat experimental)
+//
+// Please note that you will need to link with Cairo for this to work.
+//
+// Default is 0
+//
+// Recommended setting: 1
+#ifndef wxUSE_CAIRO
+#define wxUSE_CAIRO 0
+#endif
 
 // ----------------------------------------------------------------------------
 // Individual GUI controls
@@ -807,15 +603,6 @@
 // Recommended setting: 1 (don't change except for very special programs)
 #define wxUSE_CONTROLS     1
 
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
 // wxPopupWindow class is a top level transient window. It is currently used
 // to implement wxTipWindow
 //
@@ -842,7 +629,6 @@
 //
 // Recommended setting: 1
 #define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
 #define wxUSE_BUTTON        1   // wxButton
 #define wxUSE_BMPBUTTON     1   // wxBitmapButton
 #define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
@@ -852,22 +638,17 @@
 #define wxUSE_COLLPANE      1   // wxCollapsiblePane
 #define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
 #define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
 #define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
 #define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
 #define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
 #define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
 #define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
 #define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
 #define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
 #define wxUSE_LISTBOX       1   // wxListBox
 #define wxUSE_LISTCTRL      1   // wxListCtrl
 #define wxUSE_RADIOBOX      1   // wxRadioBox
 #define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
 #define wxUSE_SCROLLBAR     1   // wxScrollBar
 #define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
 #define wxUSE_SLIDER        1   // wxSlider
@@ -878,10 +659,8 @@
 #define wxUSE_STATTEXT      1   // wxStaticText
 #define wxUSE_STATBMP       1   // wxStaticBitmap
 #define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
 #define wxUSE_TOGGLEBTN     1   // requires wxButton
 #define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
 
 // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
 // below either wxStatusBar95 or a generic wxStatusBar will be used.
@@ -952,13 +731,13 @@
 // Recommended setting: 1
 #define wxUSE_TOOLBOOK 1
 
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
+// wxTabDialog is a generic version of wxNotebook but it is incompatible with
+// the new class. It shouldn't be used in new code.
 //
-// Default is 1.
+// Default is 0.
 //
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
+// Recommended setting: 0 (use wxNotebook)
+#define wxUSE_TAB_DIALOG    0
 
 // wxGrid class
 //
@@ -1001,15 +780,6 @@
 // Recommended setting: 1 but can be safely set to 0
 #define wxUSE_BITMAPCOMBOBOX 1
 
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
 // ----------------------------------------------------------------------------
 // Miscellaneous GUI stuff
 // ----------------------------------------------------------------------------
@@ -1017,29 +787,6 @@
 // wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
 #define wxUSE_ACCEL 1
 
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
 // Hotkey support (currently Windows only)
 #define wxUSE_HOTKEY 1
 
@@ -1072,14 +819,6 @@
 // enumerated above, then this class is mostly useless too)
 #define wxUSE_IMAGLIST      1
 
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
 // Use wxMenu, wxMenuBar, wxMenuItem.
 //
 // Default is 1.
@@ -1087,25 +826,6 @@
 // Recommended setting: 1 (can't be disabled under MSW)
 #define wxUSE_MENUS         1
 
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
 // Use wxSashWindow class.
 //
 // Default is 1.
@@ -1130,20 +850,6 @@
 // wxValidator class and related methods
 #define wxUSE_VALIDATORS 1
 
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------
@@ -1234,13 +940,6 @@
 //                      use this function
 #define wxUSE_ABOUTDLG 1
 
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
 // ----------------------------------------------------------------------------
 // Metafiles support
 // ----------------------------------------------------------------------------
@@ -1297,16 +996,14 @@
 
 // Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
 // headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
+// set to 1. Note that for some compilers (notably Microsoft Visual C++) you
+// will need to manually add opengl32.lib and glu32.lib to the list of
+// libraries linked with your program if you use OpenGL.
 //
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
+// Default is 0.
 //
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
+// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise
+#define wxUSE_GLCANVAS       0
 
 // wxRichTextCtrl allows editing of styled text.
 //
@@ -1314,7 +1011,7 @@
 //
 // Recommended setting: 1, set to 0 if you want compile a
 // smaller library.
-#define wxUSE_RICHTEXT       1
+#define wxUSE_RICHTEXT       0
 
 // ----------------------------------------------------------------------------
 // Data transfer
@@ -1385,6 +1082,8 @@
 // Use wxHTML-based help controller?
 #define wxUSE_WXHTML_HELP 1
 
+#define wxUSE_RESOURCES   0
+                                // 0 for no wxGetResource/wxWriteResource
 #define wxUSE_CONSTRAINTS 1
                                 // 0 for no window layout constraint system
 
@@ -1394,11 +1093,8 @@
 #define wxUSE_MOUSEWHEEL        1
                                 // Include mouse wheel support
 
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
 // ----------------------------------------------------------------------------
-// wxDC classes for various output formats
+// postscript support settings
 // ----------------------------------------------------------------------------
 
 // Set to 1 for PostScript device context.
@@ -1407,19 +1103,50 @@
 // Set to 1 to use font metric files in GetTextExtent
 #define wxUSE_AFM_FOR_POSTSCRIPT 1
 
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
+// ----------------------------------------------------------------------------
+// database classes
+// ----------------------------------------------------------------------------
 
-// Should wxDC provide SetTransformMatrix() and related methods?
+// Define 1 to use ODBC classes
+#define wxUSE_ODBC          0
+
+// For backward compatibility reasons, this parameter now only controls the
+// default scrolling method used by cursors.  This default behavior can be
+// overriden by setting the second param of wxDB::wxDbGetConnection() or
+// wxDb() constructor to indicate whether the connection (and any wxDbTable()s
+// that use the connection) should support forward only scrolling of cursors,
+// or both forward and backward support for backward scrolling cursors is
+// dependent on the data source as well as the ODBC driver being used.
+#define wxODBC_FWD_ONLY_CURSORS	 1
+
+// Default is 0.  Set to 1 to use the deprecated classes, enum types, function,
+// member variables.  With a setting of 1, full backward compatibility with the
+// 2.0.x release is possible. It is STRONGLY recommended that this be set to 0,
+// as future development will be done only on the non-deprecated
+// functions/classes/member variables/etc.
+#define wxODBC_BACKWARD_COMPATABILITY 0
+
+// ----------------------------------------------------------------------------
+// other compiler (mis)features
+// ----------------------------------------------------------------------------
+
+// Set this to 0 if your compiler can't cope with omission of prototype
+// parameters.
 //
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
+// Default is 1.
 //
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
+// Recommended setting: 1 (should never need to set this to 0)
+#define REMOVE_UNUSED_ARG   1
+
+// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
+// them. Set to 1 for <iostream.h>, 0 for <iostream>. Note that VC++ 7.1
+// and later doesn't support wxUSE_IOSTREAMH == 1 and so <iostream> will be
+// used anyhow.
+//
+// Default is 1.
+//
+// Recommended setting: whatever your compiler likes more
+#define wxUSE_IOSTREAMH     1
 
 // ----------------------------------------------------------------------------
 // image format support
@@ -1443,25 +1170,25 @@
 #define wxUSE_LIBJPEG       1
 
 // Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
+#define wxUSE_LIBTIFF       0
 
 // Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
+#define wxUSE_TGA           0
 
 // Set to 1 for GIF format support
-#define wxUSE_GIF           1
+#define wxUSE_GIF           0
 
 // Set to 1 for PNM format support
-#define wxUSE_PNM           1
+#define wxUSE_PNM           0
 
 // Set to 1 for PCX format support
-#define wxUSE_PCX           1
+#define wxUSE_PCX           0
 
 // Set to 1 for IFF format support (Amiga format)
 #define wxUSE_IFF           0
 
 // Set to 1 for XPM format support
-#define wxUSE_XPM           1
+#define wxUSE_XPM           0
 
 // Set to 1 for MS Icons and Cursors format support
 #define wxUSE_ICO_CUR       1
@@ -1487,7 +1214,6 @@
 
 /* --- end common options --- */
 
-/* --- start MSW options --- */
 // ----------------------------------------------------------------------------
 // Windows-only settings
 // ----------------------------------------------------------------------------
@@ -1543,11 +1269,15 @@
 // Recommended setting: 1, required by wxMediaCtrl
 #define wxUSE_ACTIVEX 1
 
-// wxDC caching implementation
+// wxDC cacheing implementation
 #define wxUSE_DC_CACHEING 1
 
+// Set this to 1 to enable the use of DIB's for wxBitmap to support
+// bitmaps > 16MB on Win95/98/Me.  Set to 0 to use DDB's only.
+#define wxUSE_DIB_FOR_BITMAP 0
+
 // Set this to 1 to enable wxDIB class used internally for manipulating
-// wxBitmap data.
+// wxBitmao data.
 //
 // Default is 1, set it to 0 only if you don't use wxImage neither
 //
@@ -1558,13 +1288,6 @@
 // (just use Windows printing).
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
-// Set this to 1 to compile in wxRegKey class.
-//
-// Default is 1
-//
-// Recommended setting: 1, this is used internally by wx in a few places
-#define wxUSE_REGKEY 1
-
 // Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
 // which allows to put more than ~32Kb of text in it even under Win9x (NT
 // doesn't have such limitation).
@@ -1590,28 +1313,16 @@
 // Recommended setting: 1, set to 0 for a small library size reduction
 #define wxUSE_OWNER_DRAWN 1
 
-// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It
-// is required by native wxNotificationMessage implementation.
-//
-// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain
-// the necessary declarations.
-//
-// Recommended setting: 1, set to 0 for a tiny library size reduction
-#define wxUSE_TASKBARICON_BALLOONS 1
-
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           1
 
+// Set to 1 to auto-adapt to MS Windows XP themes where possible
+// (notably, wxNotebook pages)
+#define wxUSE_UXTHEME_AUTO      1
+
 // Set to 1 to use InkEdit control (Tablet PC), if available
 #define wxUSE_INKEDIT  0
 
-// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
-//
-// Default is 0.
-//
-// Recommended setting: 0, nobody uses .INI files any more
-#define wxUSE_INICONF 0
-
 // ----------------------------------------------------------------------------
 // Generic versions of native controls
 // ----------------------------------------------------------------------------
@@ -1624,14 +1335,6 @@
 // Recommended setting: 0, this is mainly used for testing
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
-// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the
-// native wxTimePickerCtrl for the platforms that have the latter (MSW).
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_TIMEPICKCTRL_GENERIC 0
-
 // ----------------------------------------------------------------------------
 // Crash debugging helpers
 // ----------------------------------------------------------------------------
@@ -1643,7 +1346,16 @@
 //
 // Recommended setting: 1, set to 0 if your programs never crash
 #define wxUSE_CRASHREPORT 1
-/* --- end MSW options --- */
+
+// ----------------------------------------------------------------------------
+// obsolete settings
+// ----------------------------------------------------------------------------
+
+// NB: all settings in this section are obsolete and should not be used/changed
+//     at all, they will disappear
+
+// Define 1 to use bitmap messages.
+#define wxUSE_BITMAP_MESSAGE         1
 
 #endif // _WX_SETUP_H_
 
diff --git a/Source/3rd Party/wx/include/wx/msw/slider.h b/Source/3rd Party/wx/include/wx/msw/slider95.h
similarity index 76%
rename from Source/3rd Party/wx/include/wx/msw/slider.h
rename to Source/3rd Party/wx/include/wx/msw/slider95.h
index 9d3e3a9b0..55415c789 100644
--- a/Source/3rd Party/wx/include/wx/msw/slider.h	
+++ b/Source/3rd Party/wx/include/wx/msw/slider95.h	
@@ -1,142 +1,137 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/slider.h
-// Purpose:     wxSlider class implementation using trackbar control
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SLIDER_H_
-#define _WX_SLIDER_H_
-
-class WXDLLIMPEXP_FWD_CORE wxSubwindows;
-
-// Slider
-class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase
-{
-public:
-    wxSlider() { Init(); }
-
-    wxSlider(wxWindow *parent,
-             wxWindowID id,
-             int value,
-             int minValue,
-             int maxValue,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = wxSL_HORIZONTAL,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxSliderNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, value, minValue, maxValue,
-                     pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                int value,
-                int minValue, int maxValue,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSL_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
-
-    virtual ~wxSlider();
-
-    // slider methods
-    virtual int GetValue() const;
-    virtual void SetValue(int);
-
-    void SetRange(int minValue, int maxValue);
-
-    int GetMin() const { return m_rangeMin; }
-    int GetMax() const { return m_rangeMax; }
-
-    // Win32-specific slider methods
-    int GetTickFreq() const { return m_tickFreq; }
-    void SetPageSize(int pageSize);
-    int GetPageSize() const;
-    void ClearSel();
-    void ClearTicks();
-    void SetLineSize(int lineSize);
-    int GetLineSize() const;
-    int GetSelEnd() const;
-    int GetSelStart() const;
-    void SetSelection(int minPos, int maxPos);
-    void SetThumbLength(int len);
-    int GetThumbLength() const;
-    void SetTick(int tickPos);
-
-    // implementation only from now on
-    WXHWND GetStaticMin() const;
-    WXHWND GetStaticMax() const;
-    WXHWND GetEditValue() const;
-    virtual bool ContainsHWND(WXHWND hWnd) const;
-
-    // we should let background show through the slider (and its labels)
-    virtual bool HasTransparentBackground() { return true; }
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-    void Command(wxCommandEvent& event);
-    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
-                             WXWORD pos, WXHWND control);
-
-    virtual bool Show(bool show = true);
-    virtual bool Enable(bool show = true);
-    virtual bool SetFont(const wxFont& font);
-
-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // format an integer value as string
-    static wxString Format(int n) { return wxString::Format(wxT("%d"), n); }
-
-    // get the boundig box for the slider and possible labels
-    wxRect GetBoundingBox() const;
-
-    // Get the height and, if the pointers are non NULL, widths of both labels.
-    //
-    // Notice that the return value will be 0 if we don't have wxSL_LABELS
-    // style but we do fill widthMin and widthMax even if we don't have
-    // wxSL_MIN_MAX_LABELS style set so the caller should account for it.
-    int GetLabelsSize(int *widthMin = NULL, int *widthMax = NULL) const;
-
-
-    // overridden base class virtuals
-    virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual wxSize DoGetBestSize() const;
-
-    // the labels windows, if any
-    wxSubwindows  *m_labels;
-
-    int           m_rangeMin;
-    int           m_rangeMax;
-    int           m_pageSize;
-    int           m_lineSize;
-    int           m_tickFreq;
-
-    // flag needed to detect whether we're getting THUMBRELEASE event because
-    // of dragging the thumb or scrolling the mouse wheel
-    bool m_isDragging;
-
-    // Platform-specific implementation of SetTickFreq
-    virtual void DoSetTickFreq(int freq);
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
-};
-
-#endif // _WX_SLIDER_H_
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/slider95.h
+// Purpose:     wxSlider class, using the Win95 (and later) trackbar control
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: slider95.h 53135 2008-04-12 02:31:04Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_SLIDER95_H_
+#define _WX_SLIDER95_H_
+
+class WXDLLIMPEXP_FWD_CORE wxSubwindows;
+
+// Slider
+class WXDLLEXPORT wxSlider : public wxSliderBase
+{
+public:
+    wxSlider() { Init(); }
+
+    wxSlider(wxWindow *parent,
+             wxWindowID id,
+             int value,
+             int minValue,
+             int maxValue,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxSL_HORIZONTAL,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxSliderNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, value, minValue, maxValue,
+                     pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                int value,
+                int minValue, int maxValue,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxSL_HORIZONTAL,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxSliderNameStr);
+
+    virtual ~wxSlider();
+
+    // slider methods
+    virtual int GetValue() const;
+    virtual void SetValue(int);
+
+    void SetRange(int minValue, int maxValue);
+
+    int GetMin() const { return m_rangeMin; }
+    int GetMax() const { return m_rangeMax; }
+
+    // Win32-specific slider methods
+    void SetTickFreq(int n, int pos);
+    int GetTickFreq() const { return m_tickFreq; }
+    void SetPageSize(int pageSize);
+    int GetPageSize() const;
+    void ClearSel();
+    void ClearTicks();
+    void SetLineSize(int lineSize);
+    int GetLineSize() const;
+    int GetSelEnd() const;
+    int GetSelStart() const;
+    void SetSelection(int minPos, int maxPos);
+    void SetThumbLength(int len);
+    int GetThumbLength() const;
+    void SetTick(int tickPos);
+
+    // implementation only from now on
+    WXHWND GetStaticMin() const;
+    WXHWND GetStaticMax() const;
+    WXHWND GetEditValue() const;
+    virtual bool ContainsHWND(WXHWND hWnd) const;
+
+    // we should let background show through the slider (and its labels)
+    virtual bool HasTransparentBackground() { return true; }
+
+
+    void Command(wxCommandEvent& event);
+    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
+                             WXWORD pos, WXHWND control);
+
+    virtual bool Show(bool show = true);
+    virtual bool Enable(bool show = true);
+    virtual bool SetFont(const wxFont& font);
+
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
+protected:
+    // common part of all ctors
+    void Init();
+
+    // format an integer value as string
+    static wxString Format(int n) { return wxString::Format(_T("%d"), n); }
+
+    // get the boundig box for the slider and possible labels
+    wxRect GetBoundingBox() const;
+
+    // get the height and, if the pointer is not NULL, width of our labels
+    int GetLabelsSize(int *width = NULL) const;
+
+
+    // overridden base class virtuals
+    virtual void DoGetPosition(int *x, int *y) const;
+    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual wxSize DoGetBestSize() const;
+
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
+
+    // the labels windows, if any
+    wxSubwindows *m_labels;
+
+    int           m_rangeMin;
+    int           m_rangeMax;
+    int           m_pageSize;
+    int           m_lineSize;
+    int           m_tickFreq;
+
+    // flag needed to detect whether we're getting THUMBRELEASE event because
+    // of dragging the thumb or scrolling the mouse wheel
+    bool m_isDragging;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider)
+};
+
+#endif // _WX_SLIDER95_H_
+
diff --git a/Source/3rd Party/wx/include/wx/msw/spinbutt.h b/Source/3rd Party/wx/include/wx/msw/spinbutt.h
index 458912975..dcfb0a370 100644
--- a/Source/3rd Party/wx/include/wx/msw/spinbutt.h	
+++ b/Source/3rd Party/wx/include/wx/msw/spinbutt.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/spinbutt.h
+// Name:        wx/univ/spinbutt.h
 // Purpose:     wxSpinButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: spinbutt.h 41316 2006-09-20 14:15:14Z RR $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,7 @@
 
 #if wxUSE_SPINBTN
 
-class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
+class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
 {
 public:
     // construction
@@ -57,9 +57,6 @@ public:
     // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
     virtual bool AcceptsFocus() const { return false; }
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
 protected:
    virtual wxSize DoGetBestSize() const;
 
diff --git a/Source/3rd Party/wx/include/wx/msw/spinctrl.h b/Source/3rd Party/wx/include/wx/msw/spinctrl.h
index 9ec9f9264..08b619450 100644
--- a/Source/3rd Party/wx/include/wx/msw/spinctrl.h	
+++ b/Source/3rd Party/wx/include/wx/msw/spinctrl.h	
@@ -1,10 +1,10 @@
 ////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/spinctrl.h
+// Name:        msw/spinctrl.h
 // Purpose:     wxSpinCtrl class declaration for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: spinctrl.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,22 +27,20 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
 // control is clicked.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton
+class WXDLLEXPORT wxSpinCtrl : public wxSpinButton
 {
 public:
-    wxSpinCtrl() { Init(); }
+    wxSpinCtrl() { }
 
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = wxID_ANY,
                const wxString& value = wxEmptyString,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
-               long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+               long style = wxSP_ARROW_KEYS,
                int min = 0, int max = 100, int initial = 0,
-               const wxString& name = wxT("wxSpinCtrl"))
+               const wxString& name = _T("wxSpinCtrl"))
     {
-        Init();
-
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }
 
@@ -51,9 +49,9 @@ public:
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
+                long style = wxSP_ARROW_KEYS,
                 int min = 0, int max = 100, int initial = 0,
-                const wxString& name = wxT("wxSpinCtrl"));
+                const wxString& name = _T("wxSpinCtrl"));
 
     // a wxTextCtrl-like method (but we can't have GetValue returning wxString
     // because the base class already has one returning int!)
@@ -69,7 +67,6 @@ public:
 
     virtual void SetValue(int val);
     virtual int  GetValue() const;
-    virtual void SetRange(int minVal, int maxVal);
     virtual bool SetFont(const wxFont &font);
     virtual void SetFocus();
 
@@ -81,18 +78,6 @@ public:
     // wxSpinButton doesn't accept focus, but we do
     virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
 
-    // we're like wxTextCtrl and not (default) wxButton
-    virtual wxVisualAttributes GetDefaultAttributes() const
-    {
-        return GetClassDefaultAttributes(GetWindowVariant());
-    }
-
-    static wxVisualAttributes
-    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL)
-    {
-        return GetCompositeControlsDefaultAttributes(variant);
-    }
-
     // for internal use only
 
     // get the subclassed window proc of the buddy text
@@ -104,22 +89,21 @@ public:
     // process a WM_COMMAND generated by the buddy text control
     bool ProcessTextCommand(WXWORD cmd, WXWORD id);
 
-    // recognize buddy window as part of this control at wx level
-    virtual bool ContainsHWND(WXHWND hWnd) const { return hWnd == m_hwndBuddy; }
-
 protected:
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual wxSize DoGetBestSize() const;
     virtual void DoGetSize(int *width, int *height) const;
+#if wxABI_VERSION >= 20808
     virtual void DoGetClientSize(int *x, int *y) const;
+#endif
+
 #if wxUSE_TOOLTIPS
     virtual void DoSetToolTip( wxToolTip *tip );
 #endif // wxUSE_TOOLTIPS
 
-    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
-                             WXWORD pos, WXHWND control);
+    // the handler for wxSpinButton events
+    void OnSpinChange(wxSpinEvent& event);
 
     // handle processing of special keys
     void OnChar(wxKeyEvent& event);
@@ -141,16 +125,14 @@ protected:
     WXHWND     m_hwndBuddy;
     WXFARPROC  m_wndProcBuddy;
 
-    // Block text update event after SetValue()
-    bool m_blockEvent;
+    // all existing wxSpinCtrls - this allows to find the one corresponding to
+    // the given buddy window in GetSpinForTextCtrl()
+    static wxArraySpins ms_allSpins;
 
 private:
-    // Common part of all ctors.
-    void Init();
-
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxSpinCtrl);
+    DECLARE_NO_COPY_CLASS(wxSpinCtrl)
 };
 
 #endif // wxUSE_SPINCTRL
diff --git a/Source/3rd Party/wx/include/wx/msw/stackwalk.h b/Source/3rd Party/wx/include/wx/msw/stackwalk.h
index 988a2f917..2aeba90c5 100644
--- a/Source/3rd Party/wx/include/wx/msw/stackwalk.h	
+++ b/Source/3rd Party/wx/include/wx/msw/stackwalk.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-08
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stackwalk.h 43346 2006-11-12 14:33:03Z RR $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@ class WXDLLIMPEXP_BASE wxStackFrame : public wxStackFrameBase
 {
 private:
     wxStackFrame *ConstCast() const
-        { return const_cast<wxStackFrame *>(this); }
+        { return wx_const_cast(wxStackFrame *, this); }
 
     size_t DoGetParamCount() const { return m_paramTypes.GetCount(); }
 
@@ -65,7 +65,7 @@ protected:
     // helper for debug API: it wants to have addresses as DWORDs
     size_t GetSymAddr() const
     {
-        return reinterpret_cast<size_t>(m_address);
+        return wx_reinterpret_cast(size_t, m_address);
     }
 
 private:
@@ -90,15 +90,13 @@ public:
     // only
     wxStackWalker(const char * WXUNUSED(argv0) = NULL) { }
 
-    virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH);
-#if wxUSE_ON_FATAL_EXCEPTION
-    virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH);
-#endif // wxUSE_ON_FATAL_EXCEPTION
+    virtual void Walk(size_t skip = 1, size_t maxDepth = 200);
+    virtual void WalkFromException();
 
 
     // enumerate stack frames from the given context
-    void WalkFrom(const _CONTEXT *ctx, size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH);
-    void WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH);
+    void WalkFrom(const _CONTEXT *ctx, size_t skip = 1);
+    void WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip = 1);
 };
 
 #endif // _WX_MSW_STACKWALK_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/statbmp.h b/Source/3rd Party/wx/include/wx/msw/statbmp.h
index aaf99d10a..99bc98595 100644
--- a/Source/3rd Party/wx/include/wx/msw/statbmp.h	
+++ b/Source/3rd Party/wx/include/wx/msw/statbmp.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: statbmp.h 51824 2008-02-16 01:59:21Z SN $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,10 +16,10 @@
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
 
 // a control showing an icon or a bitmap
-class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
 public:
     wxStaticBitmap() { Init(); }
@@ -54,11 +54,9 @@ public:
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
 protected:
-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxBorder GetDefaultBorder() const;
+    virtual wxSize DoGetBestSize() const;
 
     // ctor/dtor helpers
     void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }
@@ -70,12 +68,11 @@ protected:
     void SetImage(const wxGDIImage* image);
     void SetImageNoCopy( wxGDIImage* image );
 
-#ifndef __WXWINCE__
+#if wxABI_VERSION >= 20808
     // draw the bitmap ourselves here if the OS can't do it correctly (if it
     // can we leave it to it)
     void DoPaintManually(wxPaintEvent& event);
-#endif // !__WXWINCE__
-
+#endif
 
     // we can have either an icon or a bitmap
     bool m_isIcon;
@@ -86,7 +83,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);
+    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/msw/statbox.h b/Source/3rd Party/wx/include/wx/msw/statbox.h
index 6db8953d4..99604516d 100644
--- a/Source/3rd Party/wx/include/wx/msw/statbox.h	
+++ b/Source/3rd Party/wx/include/wx/msw/statbox.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: statbox.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,7 @@
 #define _WX_MSW_STATBOX_H_
 
 // Group box
-class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
+class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
 {
 public:
     wxStaticBox() { }
@@ -40,12 +40,12 @@ public:
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
 protected:
     virtual wxSize DoGetBestSize() const;
 
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const;
+
 #ifndef __WXWINCE__
 public:
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
diff --git a/Source/3rd Party/wx/include/wx/msw/statbr95.h b/Source/3rd Party/wx/include/wx/msw/statbr95.h
new file mode 100644
index 000000000..1e3155ad0
--- /dev/null
+++ b/Source/3rd Party/wx/include/wx/msw/statbr95.h	
@@ -0,0 +1,76 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        msw/statbr95.h
+// Purpose:     native implementation of wxStatusBar
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     04.04.98
+// RCS-ID:      $Id: statbr95.h 41035 2006-09-06 17:36:22Z PC $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef   _STATBR95_H
+#define   _STATBR95_H
+
+#if wxUSE_NATIVE_STATUSBAR
+
+class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase
+{
+public:
+    // ctors and such
+    wxStatusBar95();
+    wxStatusBar95(wxWindow *parent,
+                  wxWindowID id = wxID_ANY,
+                  long style = wxST_SIZEGRIP,
+                  const wxString& name = wxStatusBarNameStr)
+    {
+        (void)Create(parent, id, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxStatusBarNameStr);
+
+    virtual ~wxStatusBar95();
+
+    // a status line can have several (<256) fields numbered from 0
+    virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
+
+    // each field of status line has it's own text
+    virtual void     SetStatusText(const wxString& text, int number = 0);
+    virtual wxString GetStatusText(int number = 0) const;
+
+    // set status line fields' widths
+    virtual void SetStatusWidths(int n, const int widths_field[]);
+
+    // set status line fields' styles
+    virtual void SetStatusStyles(int n, const int styles[]);
+
+    // sets the minimal vertical size of the status bar
+    virtual void SetMinHeight(int height);
+
+    // get the position and size of the field's internal bounding rectangle
+    virtual bool GetFieldRect(int i, wxRect& rect) const;
+
+    // get the border size
+    virtual int GetBorderX() const;
+    virtual int GetBorderY() const;
+
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
+                                    WXWPARAM wParam,
+                                    WXLPARAM lParam);
+protected:
+    void CopyFieldsWidth(const int widths[]);
+    void SetFieldsWidth();
+
+    // override base class virtual
+    void DoMoveWindow(int x, int y, int width, int height);
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)
+};
+
+#endif  // wxUSE_NATIVE_STATUSBAR
+
+#endif
diff --git a/Source/3rd Party/wx/include/wx/msw/statline.h b/Source/3rd Party/wx/include/wx/msw/statline.h
index 9f2af45ca..7b7edf930 100644
--- a/Source/3rd Party/wx/include/wx/msw/statline.h	
+++ b/Source/3rd Party/wx/include/wx/msw/statline.h	
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/statline.h
+// Name:        msw/statline.h
 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id$
+// Version:     $Id: statline.h 43874 2006-12-09 14:52:59Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,7 +15,7 @@
 // wxStaticLine
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
+class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 {
 public:
     // constructors and pseudo-constructors
@@ -38,7 +38,7 @@ public:
                  long style = wxLI_HORIZONTAL,
                  const wxString &name = wxStaticLineNameStr );
 
-    // overridden base class virtuals
+    // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
 
     // usually overridden base class virtuals
diff --git a/Source/3rd Party/wx/include/wx/msw/stattext.h b/Source/3rd Party/wx/include/wx/msw/stattext.h
index 9208ecafb..2338315cb 100644
--- a/Source/3rd Party/wx/include/wx/msw/stattext.h	
+++ b/Source/3rd Party/wx/include/wx/msw/stattext.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stattext.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
-class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
+class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:
     wxStaticText() { }
@@ -44,12 +44,10 @@ public:
 
 protected:
     // implement/override some base class virtuals
+    virtual wxBorder GetDefaultBorder() const;
     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);
-    virtual wxSize DoGetBestClientSize() const;
-
-    virtual wxString DoGetLabel() const;
-    virtual void DoSetLabel(const wxString& str);
+    virtual wxSize DoGetBestSize() const;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
 };
diff --git a/Source/3rd Party/wx/include/wx/msw/statusbar.h b/Source/3rd Party/wx/include/wx/msw/statusbar.h
deleted file mode 100644
index 758b47eef..000000000
--- a/Source/3rd Party/wx/include/wx/msw/statusbar.h	
+++ /dev/null
@@ -1,112 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/statusbar.h
-// Purpose:     native implementation of wxStatusBar
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     04.04.98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_STATUSBAR_H_
-#define _WX_MSW_STATUSBAR_H_
-
-#if wxUSE_NATIVE_STATUSBAR
-
-#include "wx/vector.h"
-#include "wx/tooltip.h"
-
-class WXDLLIMPEXP_FWD_CORE wxClientDC;
-
-class WXDLLIMPEXP_CORE wxStatusBar : public wxStatusBarBase
-{
-public:
-    // ctors and such
-    wxStatusBar();
-    wxStatusBar(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                long style = wxSTB_DEFAULT_STYLE,
-                const wxString& name = wxStatusBarNameStr)
-    {
-        m_pDC = NULL;
-        (void)Create(parent, id, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                long style = wxSTB_DEFAULT_STYLE,
-                const wxString& name = wxStatusBarNameStr);
-
-    virtual ~wxStatusBar();
-
-    // implement base class methods
-    virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
-    virtual void SetStatusWidths(int n, const int widths_field[]);
-    virtual void SetStatusStyles(int n, const int styles[]);
-    virtual void SetMinHeight(int height);
-    virtual bool GetFieldRect(int i, wxRect& rect) const;
-
-    virtual int GetBorderX() const;
-    virtual int GetBorderY() const;
-
-    // override some wxWindow virtual methods too
-    virtual bool SetFont(const wxFont& font);
-
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
-                                    WXWPARAM wParam,
-                                    WXLPARAM lParam);
-
-protected:
-    // implement base class pure virtual method
-    virtual void DoUpdateStatusText(int number);
-
-    // override some base class virtuals
-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
-    virtual wxSize DoGetBestSize() const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-#if wxUSE_TOOLTIPS
-    virtual bool MSWProcessMessage(WXMSG* pMsg);
-    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result);
-#endif
-
-    // implementation of the public SetStatusWidths()
-    void MSWUpdateFieldsWidths();
-
-    // used by DoUpdateStatusText()
-    wxClientDC *m_pDC;
-
-#if wxUSE_TOOLTIPS
-    // the tooltips used when wxSTB_SHOW_TIPS is given
-    wxVector<wxToolTip*> m_tooltips;
-#endif
-
-private:
-    struct MSWBorders
-    {
-        int horz,
-            vert,
-            between;
-    };
-
-    // retrieve all status bar borders using SB_GETBORDERS
-    MSWBorders MSWGetBorders() const;
-
-    // return the size of the border between the fields
-    int MSWGetBorderWidth() const;
-
-    struct MSWMetrics
-    {
-        int gripWidth,
-            textMargin;
-    };
-
-    // return the various status bar metrics
-    static const MSWMetrics& MSWGetMetrics();
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar)
-};
-
-#endif  // wxUSE_NATIVE_STATUSBAR
-
-#endif // _WX_MSW_STATUSBAR_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/stdpaths.h b/Source/3rd Party/wx/include/wx/msw/stdpaths.h
index f350cdfff..55f8f2d98 100644
--- a/Source/3rd Party/wx/include/wx/msw/stdpaths.h	
+++ b/Source/3rd Party/wx/include/wx/msw/stdpaths.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stdpaths.h 43340 2006-11-12 12:58:10Z RR $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,10 +19,6 @@
 class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
 {
 public:
-    // ctor calls IgnoreAppBuildSubDirs() and also sets up the object to use
-    // both vendor and application name by default
-    wxStandardPaths();
-
     // implement base class pure virtuals
     virtual wxString GetExecutablePath() const;
     virtual wxString GetConfigDir() const;
@@ -33,48 +29,12 @@ public:
     virtual wxString GetPluginsDir() const;
     virtual wxString GetDocumentsDir() const;
 
-
-    // MSW-specific methods
-
-    // This class supposes that data, plugins &c files are located under the
-    // program directory which is the directory containing the application
-    // binary itself. But sometimes this binary may be in a subdirectory of the
-    // main program directory, e.g. this happens in at least the following
-    // common cases:
-    //  1. The program is in "bin" subdirectory of the installation directory.
-    //  2. The program is in "debug" subdirectory of the directory containing
-    //     sources and data files during development
-    //
-    // By calling this function you instruct the class to remove the last
-    // component of the path if it matches its argument. Notice that it may be
-    // called more than once, e.g. you can call both IgnoreAppSubDir("bin") and
-    // IgnoreAppSubDir("debug") to take care of both production and development
-    // cases above but that each call will only remove the last path component.
-    // Finally note that the argument can contain wild cards so you can also
-    // call IgnoreAppSubDir("vc*msw*") to ignore all build directories at once
-    // when using wxWidgets-inspired output directories names.
-    void IgnoreAppSubDir(const wxString& subdirPattern);
-
-    // This function is used to ignore all common build directories and is
-    // called from the ctor -- use DontIgnoreAppSubDir() to undo this.
-    void IgnoreAppBuildSubDirs();
-
-    // Undo the effects of all preceding IgnoreAppSubDir() calls.
-    void DontIgnoreAppSubDir();
-
-
-    // Returns the directory corresponding to the specified Windows shell CSIDL
-    static wxString MSWGetShellDir(int csidl);
-
 protected:
     // get the path corresponding to the given standard CSIDL_XXX constant
     static wxString DoGetDirectory(int csidl);
 
     // return the directory of the application itself
-    wxString GetAppDir() const;
-
-    // directory returned by GetAppDir()
-    mutable wxString m_appDir;
+    static wxString GetAppDir();
 };
 
 // ----------------------------------------------------------------------------
diff --git a/Source/3rd Party/wx/include/wx/msw/subwin.h b/Source/3rd Party/wx/include/wx/msw/subwin.h
index 44d296a57..75f8dad6d 100644
--- a/Source/3rd Party/wx/include/wx/msw/subwin.h	
+++ b/Source/3rd Party/wx/include/wx/msw/subwin.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-12-11
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: subwin.h 30981 2004-12-13 01:02:32Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@
 // wxSubwindows contains all HWNDs making part of a single wx control
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSubwindows
+class WXDLLEXPORT wxSubwindows
 {
 public:
     // the number of subwindows can be specified either as parameter to ctor or
@@ -28,11 +28,10 @@ public:
     // allocate enough space for the given number of windows
     void Create(size_t n)
     {
-        wxASSERT_MSG( !m_hwnds, wxT("Create() called twice?") );
+        wxASSERT_MSG( !m_hwnds, _T("Create() called twice?") );
 
         m_count = n;
         m_hwnds = (HWND *)calloc(n, sizeof(HWND));
-        m_ids = new wxWindowIDRef[n];
     }
 
     // non-virtual dtor, this class is not supposed to be used polymorphically
@@ -40,12 +39,10 @@ public:
     {
         for ( size_t n = 0; n < m_count; n++ )
         {
-            if ( m_hwnds[n] )
-                ::DestroyWindow(m_hwnds[n]);
+            ::DestroyWindow(m_hwnds[n]);
         }
 
         free(m_hwnds);
-        delete [] m_ids;
     }
 
     // get the number of subwindows
@@ -54,24 +51,15 @@ public:
     // access a given window
     HWND& Get(size_t n)
     {
-        wxASSERT_MSG( n < m_count, wxT("subwindow index out of range") );
+        wxASSERT_MSG( n < m_count, _T("subwindow index out of range") );
 
         return m_hwnds[n];
     }
 
+    HWND& operator[](size_t n) { return Get(n); }
     HWND operator[](size_t n) const
     {
-        return const_cast<wxSubwindows *>(this)->Get(n);
-    }
-
-    // initialize the given window: id will be stored in wxWindowIDRef ensuring
-    // that it is not reused while this object exists
-    void Set(size_t n, HWND hwnd, wxWindowID id)
-    {
-        wxASSERT_MSG( n < m_count, wxT("subwindow index out of range") );
-
-        m_hwnds[n] = hwnd;
-        m_ids[n] = id;
+        return wx_const_cast(wxSubwindows *, this)->Get(n);
     }
 
     // check if we have this window
@@ -96,8 +84,7 @@ public:
         int sw = show ? SW_SHOW : SW_HIDE;
         for ( size_t n = 0; n < m_count; n++ )
         {
-            if ( m_hwnds[n] )
-                ::ShowWindow(m_hwnds[n], sw);
+            ::ShowWindow(m_hwnds[n], sw);
         }
     }
 
@@ -106,8 +93,7 @@ public:
     {
         for ( size_t n = 0; n < m_count; n++ )
         {
-            if ( m_hwnds[n] )
-                ::EnableWindow(m_hwnds[n], enable);
+            ::EnableWindow(m_hwnds[n], enable);
         }
     }
 
@@ -115,17 +101,14 @@ public:
     void SetFont(const wxFont& font)
     {
         HFONT hfont = GetHfontOf(font);
-        wxCHECK_RET( hfont, wxT("invalid font") );
+        wxCHECK_RET( hfont, _T("invalid font") );
 
         for ( size_t n = 0; n < m_count; n++ )
         {
-            if ( m_hwnds[n] )
-            {
-                ::SendMessage(m_hwnds[n], WM_SETFONT, (WPARAM)hfont, 0);
+            ::SendMessage(m_hwnds[n], WM_SETFONT, (WPARAM)hfont, 0);
 
-                // otherwise the window might not be redrawn correctly
-                ::InvalidateRect(m_hwnds[n], NULL, FALSE /* don't erase bg */);
-            }
+            // otherwise the window might not be redrawn correctly
+            ::InvalidateRect(m_hwnds[n], NULL, FALSE /* don't erase bg */);
         }
     }
 
@@ -135,14 +118,10 @@ public:
         wxRect r;
         for ( size_t n = 0; n < m_count; n++ )
         {
-            if ( m_hwnds[n] )
-            {
-                RECT rc;
+            RECT rc;
+            ::GetWindowRect(m_hwnds[n], &rc);
 
-                ::GetWindowRect(m_hwnds[n], &rc);
-
-                r.Union(wxRectFromRECT(rc));
-            }
+            r.Union(wxRectFromRECT(rc));
         }
 
         return r;
@@ -161,11 +140,8 @@ private:
     // the HWNDs we contain
     HWND *m_hwnds;
 
-    // the IDs of the windows
-    wxWindowIDRef *m_ids;
 
-
-    wxDECLARE_NO_COPY_CLASS(wxSubwindows);
+    DECLARE_NO_COPY_CLASS(wxSubwindows)
 };
 
 // convenient macro to forward a few methods which are usually propagated to
diff --git a/Source/3rd Party/wx/include/wx/msw/toolbar.h b/Source/3rd Party/wx/include/wx/msw/tbar95.h
similarity index 69%
rename from Source/3rd Party/wx/include/wx/msw/toolbar.h
rename to Source/3rd Party/wx/include/wx/msw/tbar95.h
index 9b8334747..4b1d4b66d 100644
--- a/Source/3rd Party/wx/include/wx/msw/toolbar.h	
+++ b/Source/3rd Party/wx/include/wx/msw/tbar95.h	
@@ -1,182 +1,156 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/toolbar.h
-// Purpose:     wxToolBar (Windows 95 toolbar) class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_TBAR95_H_
-#define _WX_MSW_TBAR95_H_
-
-#if wxUSE_TOOLBAR
-
-#include "wx/dynarray.h"
-#include "wx/imaglist.h"
-
-class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
-{
-public:
-    // ctors and dtor
-    wxToolBar() { Init(); }
-
-    wxToolBar(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                const wxString& name = wxToolBarNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                const wxString& name = wxToolBarNameStr);
-
-    virtual ~wxToolBar();
-
-    // override/implement base class virtuals
-    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-
-    virtual bool Realize();
-
-    virtual void SetToolBitmapSize(const wxSize& size);
-    virtual wxSize GetToolSize() const;
-
-    virtual void SetRows(int nRows);
-
-    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
-    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
-
-    // implementation only from now on
-    // -------------------------------
-
-    virtual void SetWindowStyleFlag(long style);
-
-    virtual bool MSWCommand(WXUINT param, WXWORD id);
-    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
-    void OnMouseEvent(wxMouseEvent& event);
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-    void OnEraseBackground(wxEraseEvent& event);
-
-    void SetFocus() {}
-
-    static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
-
-    // override WndProc mainly to process WM_SIZE
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
-    virtual bool MSWEraseBgHook(WXHDC hDC);
-    virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child);
-#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
-
-    virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled = wxNullBitmap,
-                                          wxItemKind kind = wxITEM_NORMAL,
-                                          wxObject *clientData = NULL,
-                                          const wxString& shortHelp = wxEmptyString,
-                                          const wxString& longHelp = wxEmptyString);
-
-    virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label);
-protected:
-    // common part of all ctors
-    void Init();
-
-    // create the native toolbar control
-    bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size);
-
-    // recreate the control completely
-    void Recreate();
-
-    // implement base class pure virtuals
-    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
-    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-
-    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
-    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
-    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-
-    // return the appropriate size and flags for the toolbar control
-    virtual wxSize DoGetBestSize() const;
-
-    // handlers for various events
-    bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
-#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
-    bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
-#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
-    void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
-
-    // should be called whenever the toolbar size changes
-    void UpdateSize();
-
-    // create m_disabledImgList (but doesn't fill it), set it to NULL if it is
-    // unneeded
-    void CreateDisabledImageList();
-
-    // get the Windows toolbar style of this control
-    long GetMSWToolbarStyle() const;
-
-
-    // the big bitmap containing all bitmaps of the toolbar buttons
-    WXHBITMAP m_hBitmap;
-
-    // the image list with disabled images, may be NULL if we use
-    // system-provided versions of them
-    wxImageList *m_disabledImgList;
-
-    // the total number of toolbar elements
-    size_t m_nButtons;
-
-    // the sum of the sizes of the fixed items (i.e. excluding stretchable
-    // spaces) in the toolbar direction
-    int m_totalFixedSize;
-
-    // the tool the cursor is in
-    wxToolBarToolBase *m_pInTool;
-
-private:
-    // makes sure tool bitmap size is sufficient for all tools
-    void AdjustToolBitmapSize();
-
-    // update the sizes of stretchable spacers to consume all extra space we
-    // have
-    void UpdateStretchableSpacersSize();
-
-#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
-    // do erase the toolbar background, always do it for the entire control as
-    // the caller sets the clipping region correctly to exclude parts which
-    // should not be erased
-    void MSWDoEraseBackground(WXHDC hDC);
-
-    // return the brush to use for erasing the toolbar background
-    WXHBRUSH MSWGetToolbarBgBrush();
-#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
-    wxDECLARE_NO_COPY_CLASS(wxToolBar);
-};
-
-#endif // wxUSE_TOOLBAR
-
-#endif // _WX_MSW_TBAR95_H_
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/msw/tbar95.h
+// Purpose:     wxToolBar (Windows 95 toolbar) class
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: tbar95.h 58446 2009-01-26 23:32:16Z VS $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_TBAR95_H_
+#define _WX_MSW_TBAR95_H_
+
+#if wxUSE_TOOLBAR
+
+#include "wx/dynarray.h"
+#include "wx/imaglist.h"
+
+class WXDLLEXPORT wxToolBar : public wxToolBarBase
+{
+public:
+    // ctors and dtor
+    wxToolBar() { Init(); }
+
+    wxToolBar(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                const wxString& name = wxToolBarNameStr)
+    {
+        Init();
+
+        Create(parent, id, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                const wxString& name = wxToolBarNameStr);
+
+    virtual ~wxToolBar();
+
+    // override/implement base class virtuals
+    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
+
+    virtual bool Realize();
+
+    virtual void SetToolBitmapSize(const wxSize& size);
+    virtual wxSize GetToolSize() const;
+
+    virtual void SetRows(int nRows);
+
+#if wxABI_VERSION >= 20802
+    // TODO: In 2.9 these should probably be virtual, and declared in the base class...
+    void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+    void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+#endif
+    
+    // implementation only from now on
+    // -------------------------------
+
+    virtual void SetWindowStyleFlag(long style);
+
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+    virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
+
+    void OnMouseEvent(wxMouseEvent& event);
+    void OnSysColourChanged(wxSysColourChangedEvent& event);
+    void OnEraseBackground(wxEraseEvent& event);
+
+    void SetFocus() {}
+
+    static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
+
+    // override WndProc mainly to process WM_SIZE
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+protected:
+    // common part of all ctors
+    void Init();
+
+    // create the native toolbar control
+    bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size);
+
+    // recreate the control completely
+    void Recreate();
+
+    // implement base class pure virtuals
+    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
+    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
+
+    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
+    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
+    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
+
+    virtual wxToolBarToolBase *CreateTool(int id,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
+                                          wxObject *clientData,
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+
+    // return the appropriate size and flags for the toolbar control
+    virtual wxSize DoGetBestSize() const;
+
+    // handlers for various events
+    bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
+    bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
+    void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
+
+    // should be called whenever the toolbar size changes
+    void UpdateSize();
+
+    // create m_disabledImgList (but doesn't fill it), set it to NULL if it is
+    // unneeded
+    void CreateDisabledImageList();
+
+    // get the Windows toolbar style of this control
+    long GetMSWToolbarStyle() const;
+
+
+    // the big bitmap containing all bitmaps of the toolbar buttons
+    WXHBITMAP m_hBitmap;
+
+    // the image list with disabled images, may be NULL if we use
+    // system-provided versions of them
+    wxImageList *m_disabledImgList;
+
+    // the total number of toolbar elements
+    size_t m_nButtons;
+
+    // the tool the cursor is in
+    wxToolBarToolBase *m_pInTool;
+
+private:
+    // makes sure tool bitmap size is sufficient for all tools
+    void AdjustToolBitmapSize();
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxToolBar)
+    DECLARE_NO_COPY_CLASS(wxToolBar)
+};
+
+#endif // wxUSE_TOOLBAR
+
+#endif // _WX_MSW_TBAR95_H_
+
diff --git a/Source/3rd Party/wx/include/wx/msw/textctrl.h b/Source/3rd Party/wx/include/wx/msw/textctrl.h
index 4e9054fc4..5790a7c93 100644
--- a/Source/3rd Party/wx/include/wx/msw/textctrl.h	
+++ b/Source/3rd Party/wx/include/wx/msw/textctrl.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: textctrl.h 52547 2008-03-15 12:33:04Z VS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
-class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
+class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
 public:
     // creation
@@ -41,40 +41,45 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxTextCtrlNameStr);
 
-    // overridden wxTextEntry methods
-    // ------------------------------
+    // implement base class pure virtuals
+    // ----------------------------------
 
     virtual wxString GetValue() const;
-    virtual wxString GetRange(long from, long to) const;
-
     virtual bool IsEmpty() const;
 
-    virtual void WriteText(const wxString& text);
-    virtual void AppendText(const wxString& text);
-    virtual void Clear();
+    virtual wxString GetRange(long from, long to) const;
 
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
 
-    virtual void SetMaxLength(unsigned long len);
-
-    virtual void GetSelection(long *from, long *to) const;
-
-    virtual void Redo();
-    virtual bool CanRedo() const;
-
-    virtual void SetInsertionPointEnd();
-    virtual long GetInsertionPoint() const;
-    virtual wxTextPos GetLastPosition() const;
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
     virtual bool IsModified() const;
+    virtual bool IsEditable() const;
+
+    virtual void GetSelection(long* from, long* to) const;
+
+    // operations
+    // ----------
+
+    // editing
+    virtual void Clear();
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+
+    // load the control's contents from the file
+    virtual bool DoLoadFile(const wxString& file, int fileType);
+
+    // clears the dirty flag
     virtual void MarkDirty();
     virtual void DiscardEdits();
 
+    virtual void SetMaxLength(unsigned long len);
+
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text);
+    virtual void AppendText(const wxString& text);
+
 #ifdef __WIN32__
     virtual bool EmulateKeyPress(const wxKeyEvent& event);
 #endif // __WIN32__
@@ -102,17 +107,39 @@ public:
         return wxTextCtrlBase::HitTest(pt, col, row);
     }
 
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+
+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;
+
+    // Undo/redo
+    virtual void Undo();
+    virtual void Redo();
+
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+
+    // Insertion point
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual wxTextPos GetLastPosition() const;
+
+    virtual void SetSelection(long from, long to);
+    virtual void SetEditable(bool editable);
+
     // Caret handling (Windows only)
+
     bool ShowNativeCaret(bool show = true);
     bool HideNativeCaret() { return ShowNativeCaret(false); }
 
     // Implementation from now on
     // --------------------------
 
-#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
-    virtual void SetDropTarget(wxDropTarget *dropTarget);
-#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
-
     virtual void SetWindowStyleFlag(long style);
 
     virtual void Command(wxCommandEvent& event);
@@ -125,11 +152,10 @@ public:
     int GetRichVersion() const { return m_verRichEdit; }
     bool IsRich() const { return m_verRichEdit != 0; }
 
-    // rich edit controls are not compatible with normal ones and we must set
-    // the colours and font for them otherwise
+    // rich edit controls are not compatible with normal ones and wem ust set
+    // the colours for them otherwise
     virtual bool SetBackgroundColour(const wxColour& colour);
     virtual bool SetForegroundColour(const wxColour& colour);
-    virtual bool SetFont(const wxFont& font);
 #else
     bool IsRich() const { return false; }
 #endif // wxUSE_RICHEDIT
@@ -142,10 +168,7 @@ public:
 
     virtual void AdoptAttributesFromHWND();
 
-    virtual bool AcceptsFocusFromKeyboard() const;
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const;
+    virtual bool AcceptsFocus() const;
 
     // callbacks
     void OnDropFiles(wxDropFilesEvent& event);
@@ -180,13 +203,12 @@ public:
 
     virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+    virtual wxVisualAttributes GetDefaultAttributes() const;
 
 protected:
     // common part of all ctors
     void Init();
 
-    virtual bool DoLoadFile(const wxString& file, int fileType);
-
     // creates the control of appropriate class (plain or rich edit) with the
     // styles corresponding to m_windowStyle
     //
@@ -198,8 +220,6 @@ protected:
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 
-    virtual wxPoint DoPositionToCoords(long pos) const;
-
     // return true if this control has a user-set limit on amount of text (i.e.
     // the limit is due to a previous call to SetMaxLength() and not built in)
     bool HasSpaceLimit(unsigned int *len) const;
@@ -225,8 +245,11 @@ protected:
     void DoWriteText(const wxString& text,
                      int flags = SetValue_SendEvent | SetValue_SelectionOnly);
 
-    // set the selection (possibly without scrolling the caret into view)
-    void DoSetSelection(long from, long to, int flags);
+    // set the selection possibly without scrolling the caret into view
+    void DoSetSelection(long from, long to, bool scrollCaret = true);
+
+    // return true if there is a non empty selection in the control
+    bool HasSelection() const;
 
     // get the length of the line containing the character at the given
     // position
@@ -238,23 +261,9 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 #if wxUSE_RICHEDIT
-    // Apply the character-related parts of wxTextAttr to the given selection
-    // or the entire control if start == end == -1.
-    //
-    // This function is private and should only be called for rich edit
-    // controls and with (from, to) already in correct order, i.e. from <= to.
-    bool MSWSetCharFormat(const wxTextAttr& attr, long from = -1, long to = -1);
-
-    // Same as above for paragraph-related parts of wxTextAttr. Note that this
-    // can only be applied to the selection as RichEdit doesn't support setting
-    // the paragraph styles globally.
-    bool MSWSetParaFormat(const wxTextAttr& attr, long from, long to);
-
-
     // we're using RICHEDIT (and not simple EDIT) control if this field is not
-    // 0, it also gives the version of the RICHEDIT control being used
-    // (although not directly: 1 is for 1.0, 2 is for either 2.0 or 3.0 as we
-    // can't nor really need to distinguish between them and 4 is for 4.1)
+    // 0, it also gives the version of the RICHEDIT control being used (1, 2 or
+    // 3 so far)
     int m_verRichEdit;
 #endif // wxUSE_RICHEDIT
 
@@ -263,15 +272,6 @@ protected:
     int m_updatesCount;
 
 private:
-    virtual void EnableTextChangedEvents(bool enable)
-    {
-        m_updatesCount = enable ? -1 : -2;
-    }
-
-    // implement wxTextEntry pure virtual: it implements all the operations for
-    // the simple EDIT controls
-    virtual WXHWND GetEditHWND() const { return m_hWnd; }
-
     void OnKeyDown(wxKeyEvent& event);
 
     DECLARE_EVENT_TABLE()
@@ -287,4 +287,5 @@ private:
 
 };
 
-#endif // _WX_TEXTCTRL_H_
+#endif
+    // _WX_TEXTCTRL_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/textentry.h b/Source/3rd Party/wx/include/wx/msw/textentry.h
deleted file mode 100644
index f7154f306..000000000
--- a/Source/3rd Party/wx/include/wx/msw/textentry.h	
+++ /dev/null
@@ -1,101 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/textentry.h
-// Purpose:     wxMSW-specific wxTextEntry implementation
-// Author:      Vadim Zeitlin
-// Created:     2007-09-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_TEXTENTRY_H_
-#define _WX_MSW_TEXTENTRY_H_
-
-class wxTextAutoCompleteData; // private class used only by wxTextEntry itself
-
-// ----------------------------------------------------------------------------
-// wxTextEntry: common part of wxComboBox and (single line) wxTextCtrl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
-{
-public:
-    wxTextEntry();
-    virtual ~wxTextEntry();
-
-    // implement wxTextEntryBase pure virtual methods
-    virtual void WriteText(const wxString& text);
-    virtual void Remove(long from, long to);
-
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    virtual void Undo();
-    virtual void Redo();
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
-    virtual void SetInsertionPoint(long pos);
-    virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
-
-    virtual void SetSelection(long from, long to)
-        { DoSetSelection(from, to); }
-    virtual void GetSelection(long *from, long *to) const;
-
-    virtual bool IsEditable() const;
-    virtual void SetEditable(bool editable);
-
-    virtual void SetMaxLength(unsigned long len);
-
-#if wxUSE_UXTHEME
-    virtual bool SetHint(const wxString& hint);
-    virtual wxString GetHint() const;
-#endif // wxUSE_UXTHEME
-
-protected:
-    virtual wxString DoGetValue() const;
-
-    // this is really a hook for multiline text controls as the single line
-    // ones don't need to ever scroll to show the selection but having it here
-    // allows us to put Remove() in the base class
-    enum
-    {
-        SetSel_NoScroll = 0,    // don't do anything special
-        SetSel_Scroll = 1       // default: scroll to make the selection visible
-    };
-    virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll);
-
-    // margins functions
-    virtual bool DoSetMargins(const wxPoint& pt);
-    virtual wxPoint DoGetMargins() const;
-
-    // auto-completion uses COM under Windows so they won't work without
-    // wxUSE_OLE as OleInitialize() is not called then
-#if wxUSE_OLE
-    virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
-    virtual bool DoAutoCompleteFileNames(int flags);
-    virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
-#endif // wxUSE_OLE
-
-private:
-    // implement this to return the HWND of the EDIT control
-    virtual WXHWND GetEditHWND() const = 0;
-
-#if wxUSE_OLE
-    // Get the auto-complete object creating it if necessary. Returns NULL if
-    // creating it failed.
-    wxTextAutoCompleteData *GetOrCreateCompleter();
-
-    // Various auto-completion-related stuff, only used if any of AutoComplete()
-    // methods are called. Use the function above to access it.
-    wxTextAutoCompleteData *m_autoCompleteData;
-
-    // It needs to call our GetEditableWindow() and GetEditHWND() methods.
-    friend class wxTextAutoCompleteData;
-#endif // wxUSE_OLE
-};
-
-#endif // _WX_MSW_TEXTENTRY_H_
-
diff --git a/Source/3rd Party/wx/include/wx/msw/tglbtn.h b/Source/3rd Party/wx/include/wx/msw/tglbtn.h
index 9656dbf8f..ae45202c2 100644
--- a/Source/3rd Party/wx/include/wx/msw/tglbtn.h	
+++ b/Source/3rd Party/wx/include/wx/msw/tglbtn.h	
@@ -5,21 +5,21 @@
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tglbtn.h 37393 2006-02-08 21:47:09Z VZ $
 // Copyright:   (c) 2000 Johnny C. Norris II
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
-#include "wx/bitmap.h"
+extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
 
 // Checkbox item (single checkbox)
-class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
+class WXDLLEXPORT wxToggleButton : public wxControl
 {
 public:
-    wxToggleButton() { Init(); }
+    wxToggleButton() {}
     wxToggleButton(wxWindow *parent,
                    wxWindowID id,
                    const wxString& label,
@@ -46,66 +46,15 @@ public:
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);
-
-    virtual State GetNormalState() const;
-
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
     virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
 
-    void Init();
-
-    // current state of the button (when owner-drawn)
-    bool m_state;
+protected:
+    virtual wxSize DoGetBestSize() const;
+    virtual wxBorder GetDefaultBorder() const;
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
 };
 
-//-----------------------------------------------------------------------------
-// wxBitmapToggleButton
-//-----------------------------------------------------------------------------
-
-
-class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton
-{
-public:
-    // construction/destruction
-    wxBitmapToggleButton() {}
-    wxBitmapToggleButton(wxWindow *parent,
-                   wxWindowID id,
-                   const wxBitmap& label,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    // Create the control
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxBitmap& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
-
-    // deprecated synonym for SetBitmapLabel()
-    wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
-       SetBitmapLabel(bitmap); )
-    // prevent virtual function hiding
-    virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton)
-};
-
 #endif // _WX_TOGGLEBUTTON_H_
 
diff --git a/Source/3rd Party/wx/include/wx/msw/timer.h b/Source/3rd Party/wx/include/wx/msw/timer.h
new file mode 100644
index 000000000..449543300
--- /dev/null
+++ b/Source/3rd Party/wx/include/wx/msw/timer.h	
@@ -0,0 +1,40 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        timer.h
+// Purpose:     wxTimer class
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: timer.h 41020 2006-09-05 20:47:48Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_TIMER_H_
+#define _WX_TIMER_H_
+
+class WXDLLEXPORT wxTimer : public wxTimerBase
+{
+friend void wxProcessTimer(wxTimer& timer);
+
+public:
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = wxID_ANY) : wxTimerBase(owner, id)
+        { Init(); }
+    virtual ~wxTimer();
+
+    virtual bool Start(int milliseconds = -1, bool oneShot = false);
+    virtual void Stop();
+
+    virtual bool IsRunning() const { return m_id != 0; }
+
+protected:
+    void Init();
+
+    unsigned long m_id;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)
+};
+
+#endif
+    // _WX_TIMERH_
diff --git a/Source/3rd Party/wx/include/wx/msw/tooltip.h b/Source/3rd Party/wx/include/wx/msw/tooltip.h
index 7972c0833..3e623a39a 100644
--- a/Source/3rd Party/wx/include/wx/msw/tooltip.h	
+++ b/Source/3rd Party/wx/include/wx/msw/tooltip.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.01.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tooltip.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 1999 Robert Roebling, Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -13,23 +13,16 @@
 #define _WX_MSW_TOOLTIP_H_
 
 #include "wx/object.h"
-#include "wx/gdicmn.h"
 
 class WXDLLIMPEXP_FWD_CORE wxWindow;
-class wxToolTipOtherWindows;
 
-class WXDLLIMPEXP_CORE wxToolTip : public wxObject
+class WXDLLEXPORT wxToolTip : public wxObject
 {
 public:
     // ctor & dtor
     wxToolTip(const wxString &tip);
     virtual ~wxToolTip();
 
-    // ctor used by wxStatusBar to associate a tooltip to a portion of
-    // the status bar window:
-    wxToolTip(wxWindow* win, unsigned int id,
-              const wxString &tip, const wxRect& rc);
-
     // accessors
         // tip text
     void SetTip(const wxString& tip);
@@ -44,44 +37,20 @@ public:
     static void Enable(bool flag);
         // set the delay after which the tooltip appears
     static void SetDelay(long milliseconds);
-        // set the delay after which the tooltip disappears or how long the
-        // tooltip remains visible
-    static void SetAutoPop(long milliseconds);
-        // set the delay between subsequent tooltips to appear
-    static void SetReshow(long milliseconds);
-        // set maximum width for the new tooltips: -1 disables wrapping
-        // entirely, 0 restores the default behaviour
-    static void SetMaxWidth(int width);
 
     // implementation only from now on
     // -------------------------------
 
-    // should be called in response to WM_MOUSEMOVE
+    // should be called in responde to WM_MOUSEMOVE
     static void RelayEvent(WXMSG *msg);
 
     // add a window to the tooltip control
-    void AddOtherWindow(WXHWND hwnd);
+    void Add(WXHWND hwnd);
 
     // remove any tooltip from the window
-    static void Remove(WXHWND hwnd, unsigned int id, const wxRect& rc);
-
-    // Set the rectangle we're associated with. This rectangle is only used for
-    // the main window, not any sub-windows added with Add() so in general it
-    // makes sense to use it for tooltips associated with a single window only.
-    void SetRect(const wxRect& rc);
+    static void Remove(WXHWND hwnd);
 
 private:
-    // Adds a window other than our main m_window to this tooltip.
-    void DoAddHWND(WXHWND hWnd);
-
-    // Perform the specified operation for the given window only.
-    void DoSetTip(WXHWND hWnd);
-    void DoRemove(WXHWND hWnd);
-
-    // Call the given function for all windows we're associated with.
-    void DoForAllWindows(void (wxToolTip::*func)(WXHWND));
-
-
     // the one and only one tooltip control we use - never access it directly
     // but use GetToolTipCtrl() which will create it when needed
     static WXHWND ms_hwndTT;
@@ -89,21 +58,14 @@ private:
     // create the tooltip ctrl if it doesn't exist yet and return its HWND
     static WXHWND GetToolTipCtrl();
 
-    // new tooltip maximum width, defaults to min(display width, 400)
-    static int ms_maxWidth;
-
     // remove this tooltip from the tooltip control
     void Remove();
 
     wxString  m_text;           // tooltip text
-    wxWindow* m_window;         // main window we're associated with
-    wxToolTipOtherWindows *m_others; // other windows associated with it or NULL
-    wxRect    m_rect;           // the rect of the window for which this tooltip is shown
-                                // (or a rect with width/height == 0 to show it for the entire window)
-    unsigned int m_id;          // the id of this tooltip (ignored when m_rect width/height is 0)
+    wxWindow *m_window;         // window we're associated with
 
     DECLARE_ABSTRACT_CLASS(wxToolTip)
-    wxDECLARE_NO_COPY_CLASS(wxToolTip);
+    DECLARE_NO_COPY_CLASS(wxToolTip)
 };
 
 #endif // _WX_MSW_TOOLTIP_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/toplevel.h b/Source/3rd Party/wx/include/wx/msw/toplevel.h
index b51f57b39..30ddeeda9 100644
--- a/Source/3rd Party/wx/include/wx/msw/toplevel.h	
+++ b/Source/3rd Party/wx/include/wx/msw/toplevel.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: toplevel.h 50999 2008-01-03 01:13:44Z VZ $
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
 // wxTopLevelWindowMSW
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTopLevelWindowMSW : public wxTopLevelWindowBase
+class WXDLLEXPORT wxTopLevelWindowMSW : public wxTopLevelWindowBase
 {
 public:
     // constructors and such
@@ -52,17 +52,19 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
+    virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons );
     virtual void Restore();
-
+    
     virtual void SetLayoutDirection(wxLayoutDirection dir);
 
+#ifndef __WXWINCE__
+    virtual bool SetShape(const wxRegion& region);
+#endif // __WXWINCE__
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
     virtual bool Show(bool show = true);
-    virtual void Raise();
 
-    virtual void ShowWithoutActivating();
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
@@ -74,20 +76,7 @@ public:
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
-
-    // MSW-specific methods
-    // --------------------
-
-    // Return the menu representing the "system" menu of the window. You can
-    // call wxMenu::AppendWhatever() methods on it but removing items from it
-    // is in general not a good idea.
-    //
-    // The pointer returned by this method belongs to the window and will be
-    // deleted when the window itself is, do not delete it yourself. May return
-    // NULL if getting the system menu failed.
-    wxMenu *MSWGetSystemMenu() const;
-
-
+    
     // implementation from now on
     // --------------------------
 
@@ -119,9 +108,6 @@ public:
     // window proc for the frames
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
-
 protected:
     // common part of all ctors
     void Init();
@@ -141,30 +127,6 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
-    // override those to return the normal window coordinates even when the
-    // window is minimized
-#ifndef __WXWINCE__
-    virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoGetSize(int *width, int *height) const;
-#endif // __WXWINCE__
-
-    // Top level windows have different freeze semantics on Windows
-    virtual void DoFreeze();
-    virtual void DoThaw();
-
-    // helper of SetIcons(): calls gets the icon with the size specified by the
-    // given system metrics (SM_C{X|Y}[SM]ICON) from the bundle and sets it
-    // using WM_SETICON with the specified wParam (ICOM_SMALL or ICON_BIG);
-    // returns true if the icon was set
-    bool DoSelectAndSetIcon(const wxIconBundle& icons, int smX, int smY, int i);
-
-    // override wxWindow virtual method to use CW_USEDEFAULT if necessary
-    virtual void MSWGetCreateWindowCoords(const wxPoint& pos,
-                                          const wxSize& size,
-                                          int& x, int& y,
-                                          int& w, int& h) const;
-
-
     // is the window currently iconized?
     bool m_iconized;
 
@@ -179,16 +141,7 @@ protected:
     bool                  m_fsIsMaximized;
     bool                  m_fsIsShowing;
 
-    // Save the current focus to m_winLastFocused if we're not iconized (the
-    // focus is always NULL when we're iconized).
-    void DoSaveLastFocus();
-
-    // Restore focus to m_winLastFocused if possible and needed.
-    void DoRestoreLastFocus();
-
-    // The last focused child: we remember it when we're deactivated and
-    // restore focus to it when we're activated (this is done here) or restored
-    // from iconic state (done by wxFrame).
+    // the last focused child: we restore focus to it on activation
     wxWindow             *m_winLastFocused;
 
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
@@ -227,17 +180,18 @@ protected:
 #endif // __SMARTPHONE__ && __WXWINCE__
 
 private:
+    // helper of SetIcons(): calls gets the icon with the size specified by the
+    // given system metrics (SM_C{X|Y}[SM]ICON) from the bundle and sets it
+    // using WM_SETICON with the specified wParam (ICOM_SMALL or ICON_BIG)
+    void DoSelectAndSetIcon(const wxIconBundle& icons, int smX, int smY, int i);
+
 
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     void* m_activateInfo;
 #endif
 
-    // The system menu: initially NULL but can be set (once) by
-    // MSWGetSystemMenu(). Owned by this window.
-    wxMenu *m_menuSystem;
-
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW);
+    DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
 };
 
 #endif // _WX_MSW_TOPLEVEL_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/treectrl.h b/Source/3rd Party/wx/include/wx/msw/treectrl.h
index 09f4c3e1d..d3a6a2e35 100644
--- a/Source/3rd Party/wx/include/wx/msw/treectrl.h	
+++ b/Source/3rd Party/wx/include/wx/msw/treectrl.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10/10/98
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: treectrl.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@ WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
 // wxTreeCtrl
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTreeCtrl : public wxTreeCtrlBase
+class WXDLLEXPORT wxTreeCtrl : public wxTreeCtrlBase
 {
 public:
     // creation
@@ -127,11 +127,6 @@ public:
     virtual wxTreeItemId GetRootItem() const;
     virtual wxTreeItemId GetSelection() const;
     virtual size_t GetSelections(wxArrayTreeItemIds& selections) const;
-    virtual wxTreeItemId GetFocusedItem() const;
-
-    virtual void ClearFocusedItem();
-    virtual void SetFocusedItem(const wxTreeItemId& item);
-
 
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,
@@ -166,13 +161,12 @@ public:
     virtual void Unselect();
     virtual void UnselectAll();
     virtual void SelectItem(const wxTreeItemId& item, bool select = true);
-    virtual void SelectChildren(const wxTreeItemId& parent);
 
     virtual void EnsureVisible(const wxTreeItemId& item);
     virtual void ScrollTo(const wxTreeItemId& item);
 
     virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
-                          wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl));
+                          wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl));
     virtual wxTextCtrl *GetEditControl() const;
     virtual void EndEditLabel(const wxTreeItemId& WXUNUSED(item),
                               bool discardChanges = false)
@@ -186,6 +180,34 @@ public:
                                  wxRect& rect,
                                  bool textOnly = false) const;
 
+    // deprecated
+    // ----------
+
+#if WXWIN_COMPATIBILITY_2_4
+    // these methods are deprecated and will be removed in future versions of
+    // wxWidgets, they're here for compatibility only, don't use them in new
+    // code (the comments indicate why these methods are now useless and how to
+    // replace them)
+
+        // use Expand, Collapse, CollapseAndReset or Toggle
+    wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) );
+
+        // use Set/GetImageList and Set/GetStateImageList
+        // Use base class GetImageList()
+    wxDEPRECATED( void SetImageList(wxImageList *imageList, int) );
+
+        // use Set/GetItemImage directly
+    wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const );
+    wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) );
+
+    // use the versions taking wxTreeItemIdValue cookies
+    wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item,
+                                             long& cookie) const );
+    wxDEPRECATED( wxTreeItemId GetNextChild(const wxTreeItemId& item,
+                                            long& cookie) const );
+#endif // WXWIN_COMPATIBILITY_2_4
+
+
     // implementation
     // --------------
 
@@ -208,8 +230,13 @@ public:
     virtual bool SetBackgroundColour(const wxColour &colour);
     virtual bool SetForegroundColour(const wxColour &colour);
 
-    // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
+    // get/set the check state for the item (only for wxTR_MULTIPLE)
+    bool IsItemChecked(const wxTreeItemId& item) const;
+    void SetItemCheck(const wxTreeItemId& item, bool check = true);
+
+    // set/get the item state.image (state == -1 means cycle to the next one)
+    void SetState(const wxTreeItemId& node, int state);
+    int GetState(const wxTreeItemId& node);
 
 protected:
     // SetImageList helper
@@ -221,9 +248,6 @@ protected:
     // end edit label
     void DoEndEditLabel(bool discardChanges = false);
 
-    virtual int DoGetItemState(const wxTreeItemId& item) const;
-    virtual void DoSetItemState(const wxTreeItemId& item, int state);
-
     virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
                                       size_t pos,
                                       const wxString& text,
@@ -239,28 +263,6 @@ protected:
     // obtain the user data for the lParam member of TV_ITEM
     class wxTreeItemParam *GetItemParam(const wxTreeItemId& item) const;
 
-    // update the event to include the items client data and pass it to
-    // HandleWindowEvent(), return true if it processed it
-    bool HandleTreeEvent(wxTreeEvent& event) const;
-
-    // pass the event to HandleTreeEvent() and return true if the event was
-    // either unprocessed or not vetoed
-    bool IsTreeEventAllowed(wxTreeEvent& event) const
-    {
-        return !HandleTreeEvent(event) || event.IsAllowed();
-    }
-
-    // generate a wxEVT_KEY_DOWN event from the specified WPARAM/LPARAM values
-    // having the same meaning as for WM_KEYDOWN, return true if it was
-    // processed
-    bool MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam);
-
-    // handle a key event in a multi-selection control, should be only called
-    // for keys which can be used to change the selection
-    //
-    // return true if the key was processed, false otherwise
-    bool MSWHandleSelectionKey(unsigned vkey);
-
 
     // data used only while editing the item label:
     wxTextCtrl  *m_textCtrl;        // text control in which it is edited
@@ -276,13 +278,6 @@ private:
 
     void DoExpand(const wxTreeItemId& item, int flag);
 
-    void DoSelectItem(const wxTreeItemId& item, bool select = true);
-    void DoUnselectItem(const wxTreeItemId& item);
-    void DoToggleItemSelection(const wxTreeItemId& item);
-
-    void DoUnselectAll();
-    void DoSelectChildren(const wxTreeItemId& parent);
-
     void DeleteTextCtrl();
 
     // return true if the item is the hidden root one (i.e. it's the root item
@@ -290,14 +285,6 @@ private:
     bool IsHiddenRoot(const wxTreeItemId& item) const;
 
 
-    // check if the given flags (taken from TV_HITTESTINFO structure)
-    // indicate a position "on item": this is less trivial than just checking
-    // for TVHT_ONITEM because we consider that points to the left and right of
-    // item text are also "on item" when wxTR_FULL_ROW_HIGHLIGHT is used as the
-    // item visually spans the entire breadth of the window then
-    bool MSWIsOnItem(unsigned flags) const;
-
-
     // the hash storing the items attributes (indexed by item ids)
     wxMapTreeAttr m_attrs;
 
@@ -316,27 +303,11 @@ private:
     wxTreeItemId m_htSelStart, m_htClickedItem;
     wxPoint m_ptClick;
 
-    // whether dragging has started
-    bool m_dragStarted;
-
-    // whether focus was lost between subsequent clicks of a single item
-    bool m_focusLost;
-
-    // set when we are changing selection ourselves (only used in multi
-    // selection mode)
-    bool m_changingSelection;
-
-    // whether we need to trigger a state image click event
-    bool m_triggerStateImageClick;
-
-    // whether we need to deselect other items on mouse up
-    bool m_mouseUpDeselect;
-
     friend class wxTreeItemIndirectData;
     friend class wxTreeSortHelper;
 
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
-    wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);
+    DECLARE_NO_COPY_CLASS(wxTreeCtrl)
 };
 
 #endif // wxUSE_TREECTRL
diff --git a/Source/3rd Party/wx/include/wx/msw/uxtheme.h b/Source/3rd Party/wx/include/wx/msw/uxtheme.h
index d95eeac01..23e745fc9 100644
--- a/Source/3rd Party/wx/include/wx/msw/uxtheme.h	
+++ b/Source/3rd Party/wx/include/wx/msw/uxtheme.h	
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/uxtheme.h
+// Name:        include/wx/msw/uxtheme.h
 // Purpose:     wxUxThemeEngine class: support for XP themes
 // Author:      John Platts, Vadim Zeitlin
 // Modified by:
 // Created:     2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: uxtheme.h 42725 2006-10-30 15:37:42Z VZ $
 // Copyright:   (c) 2003 John Platts, Vadim Zeitlin
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UXTHEME_H_
@@ -17,74 +17,6 @@
 #include "wx/msw/private.h"     // we use GetHwndOf()
 #include "wx/msw/uxthemep.h"
 
-// Amazingly, GetThemeFont() and GetThemeSysFont() functions use LOGFONTA under
-// XP but LOGFONTW (even in non-Unicode build) under later versions of Windows.
-// If we declare them as taking LOGFONT below, the code would be able to
-// silently pass LOGFONTA to them in ANSI build and would crash at run-time
-// under Windows Vista/7 because of a buffer overrun (LOGFONTA being smaller
-// than LOGFONTW expected by these functions). If we we declare them as taking
-// LOGFONTW, the code wouldn't work correctly under XP. So we use a special
-// wxUxThemeFont class to encapsulate this and intentionally change the LOGFONT
-// output parameters of the theme functions to take it instead.
-
-class wxUxThemeFont
-{
-public:
-    // Trivial default ctor.
-    wxUxThemeFont() { }
-
-    // Just some unique type.
-    struct Ptr { };
-
-#if wxUSE_UNICODE
-    // In Unicode build we always use LOGFONT anyhow so this class is
-    // completely trivial.
-    Ptr *GetPtr() { return reinterpret_cast<Ptr *>(&m_lfW); }
-    const LOGFONTW& GetLOGFONT() { return m_lfW; }
-#else // !wxUSE_UNICODE
-    // Return either LOGFONTA or LOGFONTW pointer as required by the current
-    // Windows version.
-    Ptr *GetPtr()
-    {
-        return UseLOGFONTW() ? reinterpret_cast<Ptr *>(&m_lfW)
-                             : reinterpret_cast<Ptr *>(&m_lfA);
-    }
-
-    // This method returns LOGFONT (i.e. LOGFONTA in ANSI build and LOGFONTW in
-    // Unicode one) which can be used with other, normal, Windows or wx
-    // functions. Internally it may need to transform LOGFONTW to LOGFONTA.
-    const LOGFONTA& GetLOGFONT()
-    {
-        if ( UseLOGFONTW() )
-        {
-            // Most of the fields are the same in LOGFONTA and LOGFONTW so just
-            // copy everything by default.
-            memcpy(&m_lfA, &m_lfW, sizeof(m_lfA));
-
-            // But the face name must be converted from Unicode.
-            WideCharToMultiByte(CP_ACP, 0, m_lfW.lfFaceName, -1,
-                                m_lfA.lfFaceName, sizeof(m_lfA.lfFaceName),
-                                NULL, NULL);
-        }
-
-        return m_lfA;
-    }
-
-private:
-    static bool UseLOGFONTW()
-    {
-        return wxGetWinVersion() >= wxWinVersion_Vista;
-    }
-
-    LOGFONTA m_lfA;
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
-private:
-    LOGFONTW m_lfW;
-
-    wxDECLARE_NO_COPY_CLASS(wxUxThemeFont);
-};
-
 typedef HTHEME  (__stdcall *PFNWXUOPENTHEMEDATA)(HWND, const wchar_t *);
 typedef HRESULT (__stdcall *PFNWXUCLOSETHEMEDATA)(HTHEME);
 typedef HRESULT (__stdcall *PFNWXUDRAWTHEMEBACKGROUND)(HTHEME, HDC, int, int, const RECT *, const RECT *);
@@ -107,7 +39,7 @@ typedef HRESULT (__stdcall *PFNWXUGETTHEMEBOOL)(HTHEME, int, int, int, BOOL *);
 typedef HRESULT (__stdcall *PFNWXUGETTHEMEINT)(HTHEME, int, int, int, int *);
 typedef HRESULT (__stdcall *PFNWXUGETTHEMEENUMVALUE)(HTHEME, int, int, int, int *);
 typedef HRESULT (__stdcall *PFNWXUGETTHEMEPOSITION)(HTHEME, int, int, int, POINT *);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMEFONT)(HTHEME, HDC, int, int, int, wxUxThemeFont::Ptr *);
+typedef HRESULT (__stdcall *PFNWXUGETTHEMEFONT)(HTHEME, HDC, int, int, int, LOGFONT *);
 typedef HRESULT (__stdcall *PFNWXUGETTHEMERECT)(HTHEME, int, int, int, RECT *);
 typedef HRESULT (__stdcall *PFNWXUGETTHEMEMARGINS)(HTHEME, HDC, int, int, int, RECT *, MARGINS *);
 typedef HRESULT (__stdcall *PFNWXUGETTHEMEINTLIST)(HTHEME, int, int, int, INTLIST*);
@@ -118,7 +50,7 @@ typedef COLORREF(__stdcall *PFNWXUGETTHEMESYSCOLOR)(HTHEME, int);
 typedef HBRUSH  (__stdcall *PFNWXUGETTHEMESYSCOLORBRUSH)(HTHEME, int);
 typedef BOOL    (__stdcall *PFNWXUGETTHEMESYSBOOL)(HTHEME, int);
 typedef int     (__stdcall *PFNWXUGETTHEMESYSSIZE)(HTHEME, int);
-typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSFONT)(HTHEME, int, wxUxThemeFont::Ptr *);
+typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSFONT)(HTHEME, int, LOGFONT *);
 typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSSTRING)(HTHEME, int, wchar_t *, int);
 typedef HRESULT (__stdcall *PFNWXUGETTHEMESYSINT)(HTHEME, int, int *);
 typedef BOOL    (__stdcall *PFNWXUISTHEMEACTIVE)();
@@ -147,7 +79,7 @@ typedef HRESULT (__stdcall *PFNWXUENABLETHEMING)(BOOL);
     #define wxUX_THEME_DECLARE(type, func) type func(...) { return 0; }
 #endif
 
-class WXDLLIMPEXP_CORE wxUxThemeEngine
+class WXDLLEXPORT wxUxThemeEngine
 {
 public:
     // get the theme engine or NULL if themes are not available
@@ -236,7 +168,7 @@ private:
     friend class wxUxThemeModule;
 #endif // wxUSE_UXTHEME
 
-    wxDECLARE_NO_COPY_CLASS(wxUxThemeEngine);
+    DECLARE_NO_COPY_CLASS(wxUxThemeEngine)
 };
 
 #if wxUSE_UXTHEME
@@ -291,7 +223,7 @@ public:
 private:
     HTHEME m_hTheme;
 
-    wxDECLARE_NO_COPY_CLASS(wxUxThemeHandle);
+    DECLARE_NO_COPY_CLASS(wxUxThemeHandle)
 };
 
 #endif // _WX_UXTHEME_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/uxthemep.h b/Source/3rd Party/wx/include/wx/msw/uxthemep.h
index 6f52b694a..bc2fda91d 100644
--- a/Source/3rd Party/wx/include/wx/msw/uxthemep.h	
+++ b/Source/3rd Party/wx/include/wx/msw/uxthemep.h	
@@ -4,9 +4,9 @@
  * Copyright (C) 2003 Kevin Koltzau
  *
  * Originally written for the Wine project, and issued under
- * the wxWindows licence by kind permission of the author.
+ * the wxWindows License by kind permission of the author.
  *
- * Licence:     wxWindows licence
+ * License:     wxWindows License
  */
 
 #ifndef __WINE_UXTHEME_H
diff --git a/Source/3rd Party/wx/include/wx/msw/window.h b/Source/3rd Party/wx/include/wx/msw/window.h
index 22c3147ad..b765ac1db 100644
--- a/Source/3rd Party/wx/include/wx/msw/window.h	
+++ b/Source/3rd Party/wx/include/wx/msw/window.h	
@@ -5,7 +5,7 @@
 // Modified by: Vadim Zeitlin on 13.05.99: complete refont of message handling,
 //              elimination of Default(), ...
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: window.h 53929 2008-06-02 18:27:16Z RD $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,23 +13,24 @@
 #ifndef _WX_WINDOW_H_
 #define _WX_WINDOW_H_
 
-#include "wx/settings.h"        // solely for wxSystemColour
+// ---------------------------------------------------------------------------
+// constants
+// ---------------------------------------------------------------------------
 
-// if this is set to 1, we use deferred window sizing to reduce flicker when
-// resizing complicated window hierarchies, but this can in theory result in
-// different behaviour than the old code so we keep the possibility to use it
-// by setting this to 0 (in the future this should be removed completely)
-#ifdef __WXWINCE__
-    #define wxUSE_DEFERRED_SIZING 0
-#else
-    #define wxUSE_DEFERRED_SIZING 1
+#if WXWIN_COMPATIBILITY_2_4
+// they're unused by wxWidgets...
+enum
+{
+    wxKEY_SHIFT = 1,
+    wxKEY_CTRL  = 2
+};
 #endif
 
 // ---------------------------------------------------------------------------
 // wxWindow declaration for MSW
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxWindowMSW : public wxWindowBase
+class WXDLLEXPORT wxWindowMSW : public wxWindowBase
 {
     friend class wxSpinCtrl;
     friend class wxSlider;
@@ -67,17 +68,8 @@ public:
     virtual void Raise();
     virtual void Lower();
 
-    virtual bool Show(bool show = true);
-    virtual bool ShowWithEffect(wxShowEffect effect,
-                                unsigned timeout = 0)
-    {
-        return MSWShowWithEffect(true, effect, timeout);
-    }
-    virtual bool HideWithEffect(wxShowEffect effect,
-                                unsigned timeout = 0)
-    {
-        return MSWShowWithEffect(false, effect, timeout);
-    }
+    virtual bool Show( bool show = true );
+    virtual bool Enable( bool enable = true );
 
     virtual void SetFocus();
     virtual void SetFocusFromKbd();
@@ -89,6 +81,9 @@ public:
     virtual void Refresh( bool eraseBackground = true,
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Update();
+    virtual void Freeze();
+    virtual void Thaw();
+    virtual bool IsFrozen() const { return m_frozenness > 0; }
 
     virtual void SetWindowStyleFlag(long style);
     virtual void SetExtraStyle(long exStyle);
@@ -97,6 +92,12 @@ public:
 
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
+    virtual void GetTextExtent(const wxString& string,
+                               int *x, int *y,
+                               int *descent = (int *) NULL,
+                               int *externalLeading = (int *) NULL,
+                               const wxFont *theFont = (const wxFont *) NULL)
+                               const;
 
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = true );
@@ -105,7 +106,7 @@ public:
     virtual int GetScrollThumb( int orient ) const;
     virtual int GetScrollRange( int orient ) const;
     virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = NULL );
+                               const wxRect* rect = (wxRect *) NULL );
 
     virtual bool ScrollLines(int lines);
     virtual bool ScrollPages(int pages);
@@ -123,6 +124,12 @@ public:
     // Accept files for dragging
     virtual void DragAcceptFiles(bool accept);
 
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( bool GetUseCtl3D() const );
+    wxDEPRECATED( bool GetTransparentBackground() const );
+    wxDEPRECATED( void SetTransparent(bool t = true) );
+#endif // WXWIN_COMPATIBILITY_2_4
+
 #ifndef __WXUNIVERSAL__
     // Native resource loading (implemented in src/msw/nativdlg.cpp)
     // FIXME: should they really be all virtual?
@@ -156,29 +163,6 @@ public:
     // does this window have deferred position and/or size?
     bool IsSizeDeferred() const;
 
-    // these functions allow to register a global handler for the given Windows
-    // message: it will be called from MSWWindowProc() of any window which gets
-    // this event if it's not processed before (i.e. unlike a hook procedure it
-    // does not override the normal processing)
-    //
-    // notice that if you want to process a message for a given window only you
-    // should override its MSWWindowProc() instead
-
-    // type of the handler: it is called with the message parameters (except
-    // that the window object is passed instead of window handle) and should
-    // return true if it handled the message or false if it should be passed to
-    // DefWindowProc()
-    typedef bool (*MSWMessageHandler)(wxWindowMSW *win,
-                                      WXUINT nMsg,
-                                      WXWPARAM wParam,
-                                      WXLPARAM lParam);
-
-    // install a handler, shouldn't be called more than one for the same message
-    static bool MSWRegisterMessageHandler(int msg, MSWMessageHandler handler);
-
-    // unregister a previously registered handler
-    static void MSWUnregisterMessageHandler(int msg, MSWMessageHandler handler);
-
 
     // implementation from now on
     // ==========================
@@ -187,6 +171,7 @@ public:
     // --------------
 
     void OnPaint(wxPaintEvent& event);
+    void OnEraseBackground(wxEraseEvent& event);
 #ifdef __WXWINCE__
     void OnInitDialog(wxInitDialogEvent& event);
 #endif
@@ -234,12 +219,24 @@ public:
     // created yet)
     void MSWUpdateStyle(long flagsOld, long exflagsOld);
 
+#if wxABI_VERSION >= 20805
+    // Helper for getting an appropriate theme style for the application. Unnecessary in
+    // 2.9 and above.
+	wxBorder GetThemedBorderStyle() const;
+#endif
+
+    // translate wxWidgets coords into Windows ones suitable to be passed to
+    // ::CreateWindow()
+    //
+    // returns true if non default coords are returned, false otherwise
+    bool MSWGetCreateWindowCoords(const wxPoint& pos,
+                                  const wxSize& size,
+                                  int& x, int& y,
+                                  int& w, int& h) const;
+
     // get the HWND to be used as parent of this window with CreateWindow()
     virtual WXHWND MSWGetParent() const;
 
-    // get the Win32 window class name used by all wxWindow objects by default
-    static const wxChar *MSWGetRegisteredClassName();
-
     // creates the window of specified Windows class with given style, extended
     // style, title and geometry (default values
     //
@@ -318,8 +315,6 @@ public:
     bool HandleSize(int x, int y, WXUINT flag);
     bool HandleSizing(wxRect& rect);
     bool HandleGetMinMaxInfo(void *mmInfo);
-    bool HandleEnterSizeMove();
-    bool HandleExitSizeMove();
 
     bool HandleShow(bool show, int status);
     bool HandleActivate(int flag, bool minimized, WXHWND activate);
@@ -345,10 +340,9 @@ public:
 
     bool HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags);
     bool HandleMouseMove(int x, int y, WXUINT flags);
-    bool HandleMouseWheel(wxMouseWheelAxis axis,
-                          WXWPARAM wParam, WXLPARAM lParam);
+    bool HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam);
 
-    bool HandleChar(WXWPARAM wParam, WXLPARAM lParam);
+    bool HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII = false);
     bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam);
     bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam);
 #if wxUSE_ACCEL
@@ -367,21 +361,7 @@ public:
     bool HandlePower(WXWPARAM wParam, WXLPARAM lParam, bool *vetoed);
 
 
-    // The main body of common window proc for all wxWindow objects. It tries
-    // to handle the given message and returns true if it was handled (the
-    // appropriate return value is then put in result, which must be non-NULL)
-    // or false if it wasn't.
-    //
-    // This function should be overridden in any new code instead of
-    // MSWWindowProc() even if currently most of the code overrides
-    // MSWWindowProc() as it had been written before this function was added.
-    virtual bool MSWHandleMessage(WXLRESULT *result,
-                                  WXUINT message,
-                                  WXWPARAM wParam,
-                                  WXLPARAM lParam);
-
-    // Common Window procedure for all wxWindow objects: forwards to
-    // MSWHandleMessage() and MSWDefWindowProc() if the message wasn't handled.
+    // Window procedure
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     // Calls an appropriate default window procedure
@@ -403,50 +383,21 @@ public:
     virtual void MSWDestroyWindow();
 
 
-    // Functions dealing with painting the window background. The derived
-    // classes should normally only need to reimplement MSWGetBgBrush() if they
-    // need to use a non-solid brush for erasing their background. This
-    // function is called by MSWGetBgBrushForChild() which only exists for the
-    // weird wxToolBar case and MSWGetBgBrushForChild() itself is used by
-    // MSWGetBgBrush() to actually find the right brush to use.
-
-    // The brush returned from here must remain valid at least until the next
-    // event loop iteration. Returning 0, as is done by default, indicates
-    // there is no custom background brush.
-    virtual WXHBRUSH MSWGetCustomBgBrush() { return 0; }
-
     // this function should return the brush to paint the children controls
     // background or 0 if this window doesn't impose any particular background
     // on its children
     //
-    // the hDC parameter is the DC background will be drawn on, it can be used
-    // to call SetBrushOrgEx() on it if the returned brush is a bitmap one
-    //
-    // child parameter is never NULL, it can be this window itself or one of
-    // its (grand)children
-    //
     // the base class version returns a solid brush if we have a non default
     // background colour or 0 otherwise
-    virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child);
+    virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, WXHWND hWnd);
 
     // return the background brush to use for painting the given window by
-    // querying the parent windows via MSWGetBgBrushForChild() recursively
-    WXHBRUSH MSWGetBgBrush(WXHDC hDC);
-
-    enum MSWThemeColour
-    {
-        ThemeColourText = 0,
-        ThemeColourBackground,
-        ThemeColourBorder
-    };
-
-    // returns a specific theme colour, or if that is not possible then
-    // wxSystemSettings::GetColour(fallback)
-    wxColour MSWGetThemeColour(const wchar_t *themeName,
-                               int themePart,
-                               int themeState,
-                               MSWThemeColour themeColour,
-                               wxSystemColour fallback) const;
+    // quering the parent windows via their MSWGetBgBrushForChild() recursively
+    //
+    // hWndToPaint is normally NULL meaning this window itself, but it can also
+    // be a child of this window which is used by the static box and could be
+    // potentially useful for other transparent controls
+    WXHBRUSH MSWGetBgBrush(WXHDC hDC, WXHWND hWndToPaint = NULL);
 
     // gives the parent the possibility to draw its children background, e.g.
     // this is used by wxNotebook to do it using DrawThemeBackground()
@@ -465,42 +416,6 @@ public:
         return true;
     }
 
-    // This should be overridden to return true for the controls which have
-    // themed background that should through their children. Currently only
-    // wxNotebook uses this.
-    //
-    // The base class version already returns true if we have a solid
-    // background colour that should be propagated to our children.
-    virtual bool MSWHasInheritableBackground() const
-    {
-        return InheritsBackgroundColour();
-    }
-
-#if !defined(__WXWINCE__) && !defined(__WXUNIVERSAL__)
-    #define wxHAS_MSW_BACKGROUND_ERASE_HOOK
-#endif
-
-#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
-    // allows the child to hook into its parent WM_ERASEBKGND processing: call
-    // MSWSetEraseBgHook() with a non-NULL window to make parent call
-    // MSWEraseBgHook() on this window (don't forget to reset it to NULL
-    // afterwards)
-    //
-    // this hack is used by wxToolBar, see comments there
-    void MSWSetEraseBgHook(wxWindow *child);
-
-    // return true if WM_ERASEBKGND is currently hooked
-    bool MSWHasEraseBgHook() const;
-
-    // called when the window on which MSWSetEraseBgHook() had been called
-    // receives WM_ERASEBKGND
-    virtual bool MSWEraseBgHook(WXHDC WXUNUSED(hDC)) { return false; }
-#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
-
-    // common part of Show/HideWithEffect()
-    bool MSWShowWithEffect(bool show,
-                           wxShowEffect effect,
-                           unsigned timeout);
 
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -513,9 +428,11 @@ public:
 
     // check if a native double-buffering applies for this window
     virtual bool IsDoubleBuffered() const;
-
+    
+#if wxABI_VERSION >= 20808
     void SetDoubleBuffered(bool on);
-
+#endif
+    
     // synthesize a wxEVT_LEAVE_WINDOW event and set m_mouseInWindow to false
     void GenerateMouseLeave();
 
@@ -524,17 +441,6 @@ public:
     virtual void OnInternalIdle();
 
 protected:
-    // this allows you to implement standard control borders without
-    // repeating the code in different classes that are not derived from
-    // wxControl
-    virtual wxBorder GetDefaultBorderForControl() const;
-
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const;
-
-    // Translate wxBORDER_THEME (and other border styles if necessary to the value
-    // that makes most sense for this Windows environment
-    virtual wxBorder TranslateBorder(wxBorder border) const;
 
 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
@@ -555,11 +461,6 @@ protected:
     int                   m_yThumbSize;
 
     // implement the base class pure virtuals
-    virtual void DoGetTextExtent(const wxString& string,
-                                 int *x, int *y,
-                                 int *descent = NULL,
-                                 int *externalLeading = NULL,
-                                 const wxFont *font = NULL) const;
     virtual void DoClientToScreen( int *x, int *y ) const;
     virtual void DoScreenToClient( int *x, int *y ) const;
     virtual void DoGetPosition( int *x, int *y ) const;
@@ -570,16 +471,9 @@ protected:
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
 
-    virtual wxSize DoGetBorderSize() const;
-
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();
 
-    virtual void DoEnable(bool enable);
-
-    virtual void DoFreeze();
-    virtual void DoThaw();
-
     // this simply moves/resizes the given HWND which is supposed to be our
     // sibling (this is useful for controls which are composite at MSW level
     // and for which DoMoveWindow() is not enough)
@@ -604,29 +498,9 @@ protected:
                              const wxString& ttip);
 #endif // wxUSE_TOOLTIPS
 
-    // This is used by CreateKeyEvent() and also for wxEVT_CHAR[_HOOK] event
-    // creation. Notice that this method doesn't initialize wxKeyEvent
-    // m_keyCode and m_uniChar fields.
-    void InitAnyKeyEvent(wxKeyEvent& event,
-                         WXWPARAM wParam,
-                         WXLPARAM lParam) const;
-
-    // Helper functions used by HandleKeyXXX() methods and some derived
-    // classes, wParam and lParam have the same meaning as in WM_KEY{DOWN,UP}.
-    //
-    // NB: evType here must be wxEVT_KEY_{DOWN,UP} as wParam here contains the
-    //     virtual key code, not character!
-    wxKeyEvent CreateKeyEvent(wxEventType evType,
-                              WXWPARAM wParam,
-                              WXLPARAM lParam = 0) const;
-
-    // Another helper for creating wxKeyEvent for wxEVT_CHAR and related types.
-    //
-    // The wParam and lParam here must come from WM_CHAR event parameters, i.e.
-    // wParam must be a character and not a virtual code.
-    wxKeyEvent CreateCharEvent(wxEventType evType,
-                               WXWPARAM wParam,
-                               WXLPARAM lParam) const;
+    // the helper functions used by HandleChar/KeyXXX methods
+    wxKeyEvent CreateKeyEvent(wxEventType evType, int id,
+                              WXLPARAM lParam = 0, WXWPARAM wParam = 0) const;
 
 
     // default OnEraseBackground() implementation, return true if we did erase
@@ -641,15 +515,6 @@ protected:
     // for state as the system will decide for us what needs to be set
     void MSWUpdateUIState(int action, int state = 0);
 
-    // translate wxWidgets coords into Windows ones suitable to be passed to
-    // ::CreateWindow(), called from MSWCreate()
-    virtual void MSWGetCreateWindowCoords(const wxPoint& pos,
-                                          const wxSize& size,
-                                          int& x, int& y,
-                                          int& w, int& h) const;
-
-    bool MSWEnableHWND(WXHWND hWnd, bool enable);
-
 private:
     // common part of all ctors
     void Init();
@@ -660,24 +525,21 @@ private:
     bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags);
     bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
-#if wxUSE_DEFERRED_SIZING
-protected:
-    // this function is called after the window was resized to its new size
-    virtual void MSWEndDeferWindowPos()
-    {
-        m_pendingPosition = wxDefaultPosition;
-        m_pendingSize = wxDefaultSize;
-    }
+    // list of disabled children before last call to our Disable()
+    wxWindowList *m_childrenDisabled;
+
+    // number of calls to Freeze() minus number of calls to Thaw()
+    unsigned int m_frozenness;
 
     // current defer window position operation handle (may be NULL)
     WXHANDLE m_hDWP;
 
+protected:
     // When deferred positioning is done these hold the pending changes, and
     // are used for the default values if another size/pos changes is done on
     // this window before the group of deferred changes is completed.
     wxPoint     m_pendingPosition;
     wxSize      m_pendingSize;
-#endif // wxUSE_DEFERRED_SIZING
 
 private:
 #ifdef __POCKETPC__
@@ -685,10 +547,30 @@ private:
 #endif
 
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
-    wxDECLARE_NO_COPY_CLASS(wxWindowMSW);
+    DECLARE_NO_COPY_CLASS(wxWindowMSW)
     DECLARE_EVENT_TABLE()
 };
 
+// ----------------------------------------------------------------------------
+// inline functions
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+
+inline bool wxWindowMSW::GetUseCtl3D() const { return false; }
+inline bool wxWindowMSW::GetTransparentBackground() const { return false; }
+inline void wxWindowMSW::SetTransparent(bool WXUNUSED(t)) { }
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
+// ---------------------------------------------------------------------------
+// global functions
+// ---------------------------------------------------------------------------
+
+// kbd code translation
+WXDLLEXPORT int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0);
+WXDLLEXPORT WXWORD wxCharCodeWXToMSW(int id, bool *IsVirtual = NULL);
+
 // window creation helper class: before creating a new HWND, instantiate an
 // object of this class on stack - this allows to process the messages sent to
 // the window even before CreateWindow() returns
@@ -699,4 +581,21 @@ public:
     ~wxWindowCreationHook();
 };
 
+// ----------------------------------------------------------------------------
+// global objects
+// ----------------------------------------------------------------------------
+
+// notice that this hash must be defined after wxWindow declaration as it
+// needs to "see" its dtor and not just forward declaration
+#include "wx/hash.h"
+
+// pseudo-template HWND <-> wxWindow hash table
+#if WXWIN_COMPATIBILITY_2_4
+WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable);
+#else
+WX_DECLARE_HASH(wxWindowMSW, wxWindowList, wxWinHashTable);
+#endif
+
+extern wxWinHashTable *wxWinHandleHash;
+
 #endif // _WX_WINDOW_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/winundef.h b/Source/3rd Party/wx/include/wx/msw/winundef.h
index 677773a08..b8acb68b7 100644
--- a/Source/3rd Party/wx/include/wx/msw/winundef.h	
+++ b/Source/3rd Party/wx/include/wx/msw/winundef.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.05.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: winundef.h 36044 2005-10-31 19:35:41Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -123,11 +123,11 @@
 
     inline HWND APIENTRY FindText(LPFINDREPLACE lpfindreplace)
     {
-        #ifdef _UNICODE
+        #ifdef UNICODE
             return FindTextW(lpfindreplace);
         #else
             return FindTextA(lpfindreplace);
-        #endif
+        #endif // !UNICODE
     }
 #endif
 
@@ -248,20 +248,26 @@
 #endif
 
 
+/*
+  When this file is included, sometimes the wxCHECK_W32API_VERSION macro
+  is undefined. With for example CodeWarrior this gives problems with
+  the following code:
+  #if 0 && wxCHECK_W32API_VERSION( 0, 5 )
+  Because CodeWarrior does macro expansion before test evaluation.
+  We define wxCHECK_W32API_VERSION here if it's undefined.
+*/
+#if !defined(__GNUG__) && !defined(wxCHECK_W32API_VERSION)
+    #define wxCHECK_W32API_VERSION(maj, min) (0)
+#endif
+
 // StartDoc
 
 #ifdef StartDoc
    #undef StartDoc
-
-   // Work around a bug in very old MinGW headers that didn't define DOCINFOW
-   // and DOCINFOA but only DOCINFO in both ANSI and Unicode.
-   #if defined( __GNUG__ )
-      #if !wxCHECK_W32API_VERSION( 0, 5 )
-        #define DOCINFOW DOCINFO
-        #define DOCINFOA DOCINFO
-      #endif
+   #if defined( __GNUG__ ) && !wxCHECK_W32API_VERSION( 0, 5 )
+      #define DOCINFOW DOCINFO
+      #define DOCINFOA DOCINFO
    #endif
-
    #ifdef _UNICODE
    inline int StartDoc(HDC h, CONST DOCINFOW* info)
    {
diff --git a/Source/3rd Party/wx/include/wx/msw/wrapcctl.h b/Source/3rd Party/wx/include/wx/msw/wrapcctl.h
index 020e65adf..eaa68be04 100644
--- a/Source/3rd Party/wx/include/wx/msw/wrapcctl.h	
+++ b/Source/3rd Party/wx/include/wx/msw/wrapcctl.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.08.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: wrapcctl.h 41054 2006-09-07 19:01:45Z ABX $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,6 +12,28 @@
 #ifndef _WX_MSW_WRAPCCTL_H_
 #define _WX_MSW_WRAPCCTL_H_
 
+// define _WIN32_IE to a high value because we always check for the version
+// of installed DLLs at runtime anyway (see wxApp::GetComCtl32Version()) unless
+// the user really doesn't want it and had defined it to a (presumably lower)
+// value
+//
+// just for the reference, here is the table showing what the different value
+// of _WIN32_IE correspond to:
+//
+// 0x0200     for comctl32.dll 4.00 shipped with Win95/NT 4.0
+// 0x0300                      4.70              IE 3.x
+// 0x0400                      4.71              IE 4.0
+// 0x0401                      4.72              IE 4.01 and Win98
+// 0x0500                      5.80              IE 5.x
+// 0x0500                      5.81              Win2k/ME
+// 0x0600                      6.00              WinXP
+
+#ifndef _WIN32_IE
+    // use maximal set of features by default, we check for them during
+    // run-time anyhow
+    #define _WIN32_IE 0x0600
+#endif // !defined(_WIN32_IE)
+
 #include "wx/msw/wrapwin.h"
 
 #include <commctrl.h>
@@ -35,17 +57,6 @@ inline void wxSetCCUnicodeFormat(HWND WXUNUSED_IN_WINCE(hwnd))
 // this is implemented in msw/settings.cpp
 class wxFont;
 extern wxFont wxGetCCDefaultFont();
-
-// this is just a wrapper for HDITEM which we can't use in the public header
-// because we don't want to include commctrl.h (and hence windows.h) from there
-struct wxHDITEM : public HDITEM
-{
-    wxHDITEM()
-    {
-        ::ZeroMemory(this, sizeof(*this));
-    }
-};
-
-#endif // wxUSE_GUI
+#endif
 
 #endif // _WX_MSW_WRAPCCTL_H_
diff --git a/Source/3rd Party/wx/include/wx/msw/wrapcdlg.h b/Source/3rd Party/wx/include/wx/msw/wrapcdlg.h
index dc602044c..907515291 100644
--- a/Source/3rd Party/wx/include/wx/msw/wrapcdlg.h	
+++ b/Source/3rd Party/wx/include/wx/msw/wrapcdlg.h	
@@ -4,7 +4,7 @@
 // Author:      Wlodzimierz ABX Skiba
 // Modified by:
 // Created:     22.03.2005
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: wrapcdlg.h 43151 2006-11-07 09:08:33Z JS $
 // Copyright:   (c) 2005 Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Source/3rd Party/wx/include/wx/msw/wrapgdip.h b/Source/3rd Party/wx/include/wx/msw/wrapgdip.h
deleted file mode 100644
index 3c79fe174..000000000
--- a/Source/3rd Party/wx/include/wx/msw/wrapgdip.h	
+++ /dev/null
@@ -1,32 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/wrapgdip.h
-// Purpose:     wrapper around <gdiplus.h> header
-// Author:      Vadim Zeitlin
-// Created:     2007-03-15
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_WRAPGDIP_H_
-#define _WX_MSW_WRAPGDIP_H_
-
-#include "wx/msw/wrapwin.h"
-
-// these macros must be defined before gdiplus.h is included but we explicitly
-// prevent windows.h from defining them in wx/msw/wrapwin.h as they conflict
-// with standard functions of the same name elsewhere, so we have to pay for it
-// by manually redefining them ourselves here
-#ifndef max
-    #define max(a,b)            (((a) > (b)) ? (a) : (b))
-#endif
-
-#ifndef min
-    #define min(a,b)            (((a) < (b)) ? (a) : (b))
-#endif
-
-#include <gdiplus.h>
-using namespace Gdiplus;
-
-#endif // _WX_MSW_WRAPGDIP_H_
-
diff --git a/Source/3rd Party/wx/include/wx/msw/wrapshl.h b/Source/3rd Party/wx/include/wx/msw/wrapshl.h
index 7490b0754..282a81c01 100644
--- a/Source/3rd Party/wx/include/wx/msw/wrapshl.h	
+++ b/Source/3rd Party/wx/include/wx/msw/wrapshl.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: wrapshl.h 40367 2006-07-29 19:19:50Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,21 +12,16 @@
 #ifndef _WX_MSW_WRAPSHL_H_
 #define _WX_MSW_WRAPSHL_H_
 
-#include "wx/msw/wrapwin.h"
-
 #ifdef __WXWINCE__
     #include <winreg.h>
     #include <objbase.h>
     #include <shlguid.h>
-    #include <shellapi.h>
 #endif
 
 #include <shlobj.h>
 
 #include "wx/msw/winundef.h"
 
-#include "wx/log.h"
-
 // ----------------------------------------------------------------------------
 // wxItemIdList implements RAII on top of ITEMIDLIST
 // ----------------------------------------------------------------------------
@@ -72,7 +67,7 @@ public:
         wxString path;
         if ( !SHGetPathFromIDList(m_pidl, wxStringBuffer(path, MAX_PATH)) )
         {
-            wxLogLastError(wxT("SHGetPathFromIDList"));
+            wxLogLastError(_T("SHGetPathFromIDList"));
         }
 
         return path;
@@ -81,7 +76,7 @@ public:
 private:
     LPITEMIDLIST m_pidl;
 
-    wxDECLARE_NO_COPY_CLASS(wxItemIdList);
+    DECLARE_NO_COPY_CLASS(wxItemIdList)
 };
 
 // enable autocompleting filenames in the text control with given HWND
diff --git a/Source/3rd Party/wx/include/wx/msw/wrapwin.h b/Source/3rd Party/wx/include/wx/msw/wrapwin.h
index 7d0be0846..d1e6a0a86 100644
--- a/Source/3rd Party/wx/include/wx/msw/wrapwin.h	
+++ b/Source/3rd Party/wx/include/wx/msw/wrapwin.h	
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/wrapwin.h
+// Name:        msw/wrapwin.h
 // Purpose:     Wrapper around <windows.h>, to be included instead of it
 // Author:      Vaclav Slavik
 // Created:     2003/07/22
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: wrapwin.h 53877 2008-05-31 12:43:44Z SN $
 // Copyright:   (c) 2003 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,30 +39,15 @@
     #endif
 #endif
 
-// define _WIN32_WINNT and _WIN32_IE to the highest possible values because we
-// always check for the version of installed DLLs at runtime anyway (see
-// wxGetWinVersion() and wxApp::GetComCtl32Version()) unless the user really
-// doesn't want to use APIs only available on later OS versions and had defined
-// them to (presumably lower) values
 #ifndef _WIN32_WINNT
     #define _WIN32_WINNT 0x0600
 #endif
 
-#ifndef _WIN32_IE
-    #define _WIN32_IE 0x0700
-#endif
-
 /* Deal with clash with __WINDOWS__ include guard */
 #if defined(__WXWINCE__) && defined(__WINDOWS__)
 #undef __WINDOWS__
 #endif
 
-// For IPv6 support, we must include winsock2.h before winsock.h, and
-// windows.h include winsock.h so do it before including it
-#if wxUSE_IPV6
-    #include <winsock2.h>
-#endif
-
 #include <windows.h>
 
 #if defined(__WXWINCE__) && !defined(__WINDOWS__)
@@ -72,15 +57,13 @@
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"
 
-// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability
+// Types DWORD_PTR, ULONG_PTR and so on are used for 64-bit compatability 
 // in the WINAPI SDK (they are an integral type that is the size of a
-// pointer) on MSVC 7 and later. However, they are not available in older
-// Platform SDKs, and since they are typedefs and not #defines we simply
+// pointer) on MSVC 7 and later. However, they are not available in older 
+// Platform SDKs, and since they are typedefs and not #defines we simply 
 // overwrite them if there is a chance that they're not defined
 #if (!defined(_MSC_VER) || (_MSC_VER < 1300)) && !defined(__WIN64__)
     #define UINT_PTR unsigned int
-    #define INT_PTR int
-    #define HANDLE_PTR unsigned long
     #define LONG_PTR long
     #define ULONG_PTR unsigned long
     #define DWORD_PTR unsigned long
@@ -94,7 +77,7 @@
 
 #if wxUSE_GUI
 
-WXDLLIMPEXP_CORE int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
+WXDLLEXPORT int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFunc,
                                   WXLPARAM lData, WXWPARAM wData,
                                   int x, int y, int cx, int cy,
                                   unsigned int flags);
@@ -102,10 +85,10 @@ WXDLLIMPEXP_CORE int wxMSLU_DrawStateW(WXHDC dc, WXHBRUSH br, WXFARPROC outputFu
     wxMSLU_DrawStateW((WXHDC)dc,(WXHBRUSH)br,(WXFARPROC)func, \
                       ld, wd, x, y, cx, cy, flags)
 
-WXDLLIMPEXP_CORE int wxMSLU_GetOpenFileNameW(void *ofn);
+WXDLLEXPORT int wxMSLU_GetOpenFileNameW(void *ofn);
 #define GetOpenFileNameW(ofn) wxMSLU_GetOpenFileNameW((void*)ofn)
 
-WXDLLIMPEXP_CORE int wxMSLU_GetSaveFileNameW(void *ofn);
+WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn);
 #define GetSaveFileNameW(ofn) wxMSLU_GetSaveFileNameW((void*)ofn)
 
 #endif // wxUSE_GUI
@@ -114,4 +97,3 @@ WXDLLIMPEXP_CORE int wxMSLU_GetSaveFileNameW(void *ofn);
 
 #endif // _WX_WRAPWIN_H_
 
-
diff --git a/Source/3rd Party/wx/include/wx/nativewin.h b/Source/3rd Party/wx/include/wx/nativewin.h
deleted file mode 100644
index 500b4e4ed..000000000
--- a/Source/3rd Party/wx/include/wx/nativewin.h	
+++ /dev/null
@@ -1,169 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/nativewin.h
-// Purpose:     classes allowing to wrap a native window handle
-// Author:      Vadim Zeitlin
-// Created:     2008-03-05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_NATIVEWIN_H_
-#define _WX_NATIVEWIN_H_
-
-#include "wx/toplevel.h"
-
-// this symbol can be tested in the user code to see if the current wx port has
-// support for creating wxNativeContainerWindow from native windows
-//
-// be optimistic by default, we undefine it below if we don't have it finally
-#define wxHAS_NATIVE_CONTAINER_WINDOW
-
-// we define the following typedefs for each of the platform supporting native
-// windows wrapping:
-//
-//  - wxNativeContainerWindowHandle is the toolkit-level handle of the native
-//    window, i.e. HWND/GdkWindow*/NSWindow
-//
-//  - wxNativeContainerWindowId is the lowest level identifier of the native
-//    window, i.e. HWND/GdkNativeWindow/NSWindow (so it's the same as above for
-//    all platforms except GTK where we also can work with Window/XID)
-//
-// later we'll also have
-//
-//  - wxNativeWindowHandle for child windows (which will be wrapped by
-//    wxNativeWindow<T> class), it is HWND/GtkWidget*/ControlRef
-#if defined(__WXMSW__)
-    #include "wx/msw/wrapwin.h"
-
-    typedef HWND wxNativeContainerWindowId;
-    typedef HWND wxNativeContainerWindowHandle;
-#elif defined(__WXGTK__)
-    typedef unsigned long wxNativeContainerWindowId;
-    typedef GdkWindow *wxNativeContainerWindowHandle;
-#else
-    // no support for using native windows under this platform yet
-    #undef wxHAS_NATIVE_CONTAINER_WINDOW
-#endif
-
-#ifdef wxHAS_NATIVE_CONTAINER_WINDOW
-
-// ----------------------------------------------------------------------------
-// wxNativeContainerWindow: can be used for creating other wxWindows inside it
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNativeContainerWindow : public wxTopLevelWindow
-{
-public:
-    // default ctor, call Create() later
-    wxNativeContainerWindow() { }
-
-    // create a window from an existing native window handle
-    //
-    // use GetHandle() to check if the creation was successful, it will return
-    // 0 if the handle was invalid
-    wxNativeContainerWindow(wxNativeContainerWindowHandle handle)
-    {
-        Create(handle);
-    }
-
-    // same as ctor above but with a return code
-    bool Create(wxNativeContainerWindowHandle handle);
-
-#if defined(__WXGTK__)
-    // this is a convenient ctor for wxGTK applications which can also create
-    // the objects of this class from the really native window handles and not
-    // only the GdkWindow objects
-    //
-    // wxNativeContainerWindowId is Window (i.e. an XID, i.e. an int) under X11
-    // (when GDK_WINDOWING_X11 is defined) or HWND under Win32
-    wxNativeContainerWindow(wxNativeContainerWindowId winid) { Create(winid); }
-
-    bool Create(wxNativeContainerWindowId winid);
-#endif // wxGTK
-
-    // unlike for the normal windows, dtor will not destroy the native window
-    // as it normally doesn't belong to us
-    virtual ~wxNativeContainerWindow();
-
-
-    // provide (trivial) implementation of the base class pure virtuals
-    virtual void SetTitle(const wxString& WXUNUSED(title))
-    {
-        wxFAIL_MSG( "not implemented for native windows" );
-    }
-
-    virtual wxString GetTitle() const
-    {
-        wxFAIL_MSG( "not implemented for native windows" );
-
-        return wxString();
-    }
-
-    virtual void Maximize(bool WXUNUSED(maximize) = true)
-    {
-        wxFAIL_MSG( "not implemented for native windows" );
-    }
-
-    virtual bool IsMaximized() const
-    {
-        wxFAIL_MSG( "not implemented for native windows" );
-
-        return false;
-    }
-
-    virtual void Iconize(bool WXUNUSED(iconize) = true)
-    {
-        wxFAIL_MSG( "not implemented for native windows" );
-    }
-
-    virtual bool IsIconized() const
-    {
-        // this is called by wxGTK implementation so don't assert
-        return false;
-    }
-
-    virtual void Restore()
-    {
-        wxFAIL_MSG( "not implemented for native windows" );
-    }
-
-    virtual bool ShowFullScreen(bool WXUNUSED(show),
-                                long WXUNUSED(style) = wxFULLSCREEN_ALL)
-    {
-        wxFAIL_MSG( "not implemented for native windows" );
-
-        return false;
-    }
-
-    virtual bool IsFullScreen() const
-    {
-        wxFAIL_MSG( "not implemented for native windows" );
-
-        return false;
-    }
-
-#ifdef __WXMSW__
-    virtual bool IsShown() const;
-#endif // __WXMSW__
-
-    // this is an implementation detail: called when the native window is
-    // destroyed by an outside agency; deletes the C++ object too but can in
-    // principle be overridden to something else (knowing that the window
-    // handle of this object and all of its children is invalid any more)
-    virtual void OnNativeDestroyed();
-
-protected:
-#ifdef __WXMSW__
-    virtual WXLRESULT
-    MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-#endif // __WXMSW__
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxNativeContainerWindow);
-};
-
-#endif // wxHAS_NATIVE_CONTAINER_WINDOW
-
-#endif // _WX_NATIVEWIN_H_
-
diff --git a/Source/3rd Party/wx/include/wx/nonownedwnd.h b/Source/3rd Party/wx/include/wx/nonownedwnd.h
deleted file mode 100644
index efc024922..000000000
--- a/Source/3rd Party/wx/include/wx/nonownedwnd.h	
+++ /dev/null
@@ -1,114 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/nonownedwnd.h
-// Purpose:     declares wxNonTopLevelWindow class
-// Author:      Vaclav Slavik
-// Modified by:
-// Created:     2006-12-24
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 TT-Solutions
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_NONOWNEDWND_H_
-#define _WX_NONOWNEDWND_H_
-
-#include "wx/window.h"
-
-// Styles that can be used with any wxNonOwnedWindow:
-#define wxFRAME_SHAPED          0x0010  // Create a window that is able to be shaped
-
-class WXDLLIMPEXP_FWD_CORE wxGraphicsPath;
-
-// ----------------------------------------------------------------------------
-// wxNonOwnedWindow: a window that is not a child window of another one.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNonOwnedWindowBase : public wxWindow
-{
-public:
-    // Set the shape of the window to the given region.
-    // Returns true if the platform supports this feature (and the
-    // operation is successful.)
-    bool SetShape(const wxRegion& region)
-    {
-        // This style is in fact only needed by wxOSX/Carbon so once we don't
-        // use this port any more, we could get rid of this requirement, but
-        // for now you must specify wxFRAME_SHAPED for SetShape() to work on
-        // all platforms.
-        wxCHECK_MSG
-        (
-            HasFlag(wxFRAME_SHAPED), false,
-            wxS("Shaped windows must be created with the wxFRAME_SHAPED style.")
-        );
-
-        return region.IsEmpty() ? DoClearShape() : DoSetRegionShape(region);
-    }
-
-#if wxUSE_GRAPHICS_CONTEXT
-    // Set the shape using the specified path.
-    bool SetShape(const wxGraphicsPath& path)
-    {
-        wxCHECK_MSG
-        (
-            HasFlag(wxFRAME_SHAPED), false,
-            wxS("Shaped windows must be created with the wxFRAME_SHAPED style.")
-        );
-
-        return DoSetPathShape(path);
-    }
-#endif // wxUSE_GRAPHICS_CONTEXT
-
-
-    // Overridden base class methods.
-    // ------------------------------
-
-    virtual void AdjustForParentClientOrigin(int& WXUNUSED(x), int& WXUNUSED(y),
-                                             int WXUNUSED(sizeFlags) = 0) const
-    {
-        // Non owned windows positions don't need to be adjusted for parent
-        // client area origin so simply do nothing here.
-    }
-
-    virtual void InheritAttributes()
-    {
-        // Non owned windows don't inherit attributes from their parent window
-        // (if the parent frame is red, it doesn't mean that all dialogs shown
-        // by it should be red as well), so don't do anything here neither.
-    }
-
-protected:
-    virtual bool DoClearShape()
-    {
-        return false;
-    }
-
-    virtual bool DoSetRegionShape(const wxRegion& WXUNUSED(region))
-    {
-        return false;
-    }
-
-#if wxUSE_GRAPHICS_CONTEXT
-    virtual bool DoSetPathShape(const wxGraphicsPath& WXUNUSED(path))
-    {
-        return false;
-    }
-#endif // wxUSE_GRAPHICS_CONTEXT
-};
-
-#if defined(__WXDFB__)
-    #include "wx/dfb/nonownedwnd.h"
-#elif defined(__WXGTK20__)
-    #include "wx/gtk/nonownedwnd.h"
-#elif defined(__WXMAC__)
-    #include "wx/osx/nonownedwnd.h"
-#elif defined(__WXMSW__) && !defined(__WXWINCE__)
-    #include "wx/msw/nonownedwnd.h"
-#else
-    // No special class needed in other ports, they can derive both wxTLW and
-    // wxPopupWindow directly from wxWindow and don't implement SetShape().
-    class wxNonOwnedWindow : public wxNonOwnedWindowBase
-    {
-    };
-#endif
-
-#endif // _WX_NONOWNEDWND_H_
diff --git a/Source/3rd Party/wx/include/wx/notebook.h b/Source/3rd Party/wx/include/wx/notebook.h
index 80d2425dd..db1dc1361 100644
--- a/Source/3rd Party/wx/include/wx/notebook.h	
+++ b/Source/3rd Party/wx/include/wx/notebook.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.02.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: notebook.h 42152 2006-10-20 09:16:41Z VZ $
 // Copyright:   (c) 1996-2000 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -54,55 +54,17 @@ enum
 
 typedef wxWindow wxNotebookPage;  // so far, any window can be a page
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxNotebookNameStr[];
-
-#if wxUSE_EXTENDED_RTTI
-
-// ----------------------------------------------------------------------------
-// XTI accessor
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxNotebookPageInfo : public wxObject
-{
-public:
-    wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; }
-    virtual ~wxNotebookPageInfo() { }
-    
-    bool Create(wxNotebookPage *page,
-                const wxString& text,
-                bool selected,
-                int imageId)
-    {
-        m_page = page;
-        m_text = text;
-        m_selected = selected;
-        m_imageId = imageId;
-        return true;
-    }
-    
-    wxNotebookPage* GetPage() const { return m_page; }
-    wxString GetText() const { return m_text; }
-    bool GetSelected() const { return m_selected; }
-    int GetImageId() const { return m_imageId; }
-    
-private:
-    wxNotebookPage *m_page;
-    wxString m_text;
-    bool m_selected;
-    int m_imageId;
-    
-    DECLARE_DYNAMIC_CLASS(wxNotebookPageInfo)
-};
-
-WX_DECLARE_EXPORTED_LIST(wxNotebookPageInfo, wxNotebookPageInfoList );
+extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[];
 
+#if WXWIN_COMPATIBILITY_2_4
+    #define wxNOTEBOOK_NAME wxNotebookNameStr
 #endif
 
 // ----------------------------------------------------------------------------
 // wxNotebookBase: define wxNotebook interface
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxNotebookBase : public wxBookCtrlBase
+class WXDLLEXPORT wxNotebookBase : public wxBookCtrlBase
 {
 public:
     // ctors
@@ -110,6 +72,13 @@ public:
 
     wxNotebookBase() { }
 
+    wxNotebookBase(wxWindow *parent,
+                   wxWindowID winid,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxString& name = wxNotebookNameStr) ;
+
     // wxNotebook-specific additions to wxBookCtrlBase interface
     // ---------------------------------------------------------
 
@@ -138,45 +107,53 @@ public:
     bool SendPageChangingEvent(int nPage);
 
     // sends the event about page change from old to new (or GetSelection() if
-    // new is wxNOT_FOUND)
-    void SendPageChangedEvent(int nPageOld, int nPageNew = wxNOT_FOUND);
+    // new is -1)
+    void SendPageChangedEvent(int nPageOld, int nPageNew = -1);
 
-    // wxBookCtrlBase overrides this method to return false but we do need
-    // focus because we have tabs
-    virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
 
-#if wxUSE_EXTENDED_RTTI    
-    // XTI accessors
-    virtual void AddPageInfo( wxNotebookPageInfo* info );
-    virtual const wxNotebookPageInfoList& GetPageInfos() const;
-#endif
-        
 protected:
-#if wxUSE_EXTENDED_RTTI    
-    wxNotebookPageInfoList m_pageInfos;
-#endif    
-    wxDECLARE_NO_COPY_CLASS(wxNotebookBase);
+    DECLARE_NO_COPY_CLASS(wxNotebookBase)
 };
 
 // ----------------------------------------------------------------------------
 // notebook event class and related stuff
 // ----------------------------------------------------------------------------
 
-// wxNotebookEvent is obsolete and defined for compatibility only (notice that
-// we use #define and not typedef to also keep compatibility with the existing
-// code which forward declares it)
-#define wxNotebookEvent wxBookCtrlEvent
-typedef wxBookCtrlEventFunction wxNotebookEventFunction;
-#define wxNotebookEventHandler(func) wxBookCtrlEventHandler(func)
+class WXDLLEXPORT wxNotebookEvent : public wxBookCtrlBaseEvent
+{
+public:
+    wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
+                    int nSel = -1, int nOldSel = -1)
+        : wxBookCtrlBaseEvent(commandType, winid, nSel, nOldSel)
+    {
+    }
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+    wxNotebookEvent(const wxNotebookEvent& event)
+        : wxBookCtrlBaseEvent(event)
+    {
+    }
+
+    virtual wxEvent *Clone() const { return new wxNotebookEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotebookEvent)
+};
+
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 802)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 803)
+END_DECLARE_EVENT_TYPES()
+
+typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
+
+#define wxNotebookEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxNotebookEventFunction, &func)
 
 #define EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, winid, wxNotebookEventHandler(fn))
 
 #define EVT_NOTEBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, winid, wxNotebookEventHandler(fn))
 
 // ----------------------------------------------------------------------------
 // wxNotebook class itself
@@ -193,7 +170,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
 #elif defined(__WXGTK__)
     #include  "wx/gtk1/notebook.h"
 #elif defined(__WXMAC__)
-    #include  "wx/osx/notebook.h"
+    #include  "wx/mac/notebook.h"
 #elif defined(__WXCOCOA__)
     #include  "wx/cocoa/notebook.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/numdlg.h b/Source/3rd Party/wx/include/wx/numdlg.h
index b212a46fa..741bc72fa 100644
--- a/Source/3rd Party/wx/include/wx/numdlg.h	
+++ b/Source/3rd Party/wx/include/wx/numdlg.h	
@@ -4,7 +4,7 @@
 // Author:      John Labenski
 // Modified by:
 // Created:     07.02.04 (extracted from wx/textdlg.h)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: numdlg.h 37157 2006-01-26 15:33:27Z ABX $
 // Copyright:   (c) John Labenski
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Source/3rd Party/wx/include/wx/numformatter.h b/Source/3rd Party/wx/include/wx/numformatter.h
deleted file mode 100644
index a4064485e..000000000
--- a/Source/3rd Party/wx/include/wx/numformatter.h	
+++ /dev/null
@@ -1,78 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/numformatter.h
-// Purpose:     wxNumberFormatter class
-// Author:      Fulvio Senore, Vadim Zeitlin
-// Created:     2010-11-06
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_NUMFORMATTER_H_
-#define _WX_NUMFORMATTER_H_
-
-#include "wx/string.h"
-
-// Helper class for formatting numbers with thousands separators which also
-// supports parsing the numbers formatted by it.
-class WXDLLIMPEXP_BASE wxNumberFormatter
-{
-public:
-    // Bit masks for ToString()
-    enum Style
-    {
-        Style_None              = 0x00,
-        Style_WithThousandsSep  = 0x01,
-        Style_NoTrailingZeroes  = 0x02      // Only for floating point numbers
-    };
-
-    // Format a number as a string. By default, the thousands separator is
-    // used, specify Style_None to prevent this. For floating point numbers,
-    // precision can also be specified.
-    static wxString ToString(long val,
-                             int style = Style_WithThousandsSep);
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-    static wxString ToString(wxLongLong_t val,
-                             int style = Style_WithThousandsSep);
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-    static wxString ToString(double val,
-                             int precision,
-                             int style = Style_WithThousandsSep);
-
-    // Parse a string representing a number, possibly with thousands separator.
-    //
-    // Return true on success and stores the result in the provided location
-    // which must be a valid non-NULL pointer.
-    static bool FromString(wxString s, long *val);
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-    static bool FromString(wxString s, wxLongLong_t *val);
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-    static bool FromString(wxString s, double *val);
-
-
-    // Get the decimal separator for the current locale. It is always defined
-    // and we fall back to returning '.' in case of an error.
-    static wxChar GetDecimalSeparator();
-
-    // Get the thousands separator if grouping of the digits is used by the
-    // current locale. The value returned in sep should be only used if the
-    // function returns true.
-    static bool GetThousandsSeparatorIfUsed(wxChar *sep);
-
-private:
-    // Post-process the string representing an integer.
-    static wxString PostProcessIntString(wxString s, int style);
-
-    // Add the thousands separators to a string representing a number without
-    // the separators. This is used by ToString(Style_WithThousandsSep).
-    static void AddThousandsSeparators(wxString& s);
-
-    // Remove trailing zeroes and, if there is nothing left after it, the
-    // decimal separator itself from a string representing a floating point
-    // number. Also used by ToString().
-    static void RemoveTrailingZeroes(wxString& s);
-
-    // Remove all thousands separators from a string representing a number.
-    static void RemoveThousandsSeparators(wxString& s);
-};
-
-#endif // _WX_NUMFORMATTER_H_
diff --git a/Source/3rd Party/wx/include/wx/object.h b/Source/3rd Party/wx/include/wx/object.h
index 97e7a7e41..37b11e6ec 100644
--- a/Source/3rd Party/wx/include/wx/object.h	
+++ b/Source/3rd Party/wx/include/wx/object.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Ron Lee
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: object.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2001 Ron Lee <ron@debian.org>
 // Licence:     wxWindows licence
@@ -19,49 +19,204 @@
 
 #include "wx/memory.h"
 
-#define wxDECLARE_CLASS_INFO_ITERATORS()                                     \
-class WXDLLIMPEXP_BASE const_iterator                                    \
-    {                                                                        \
-    typedef wxHashTable_Node Node;                                       \
-    public:                                                                  \
-    typedef const wxClassInfo* value_type;                               \
-    typedef const value_type& const_reference;                           \
-    typedef const_iterator itor;                                         \
-    typedef value_type* ptr_type;                                        \
-    \
-    Node* m_node;                                                        \
-    wxHashTable* m_table;                                                \
-    public:                                                                  \
-    typedef const_reference reference_type;                              \
-    typedef ptr_type pointer_type;                                       \
-    \
-    const_iterator(Node* node, wxHashTable* table)                       \
-    : m_node(node), m_table(table) { }                               \
-    const_iterator() : m_node(NULL), m_table(NULL) { }                   \
-    value_type operator*() const;                                        \
-    itor& operator++();                                                  \
-    const itor operator++(int);                                          \
-    bool operator!=(const itor& it) const                                \
-            { return it.m_node != m_node; }                                  \
-            bool operator==(const itor& it) const                                \
-            { return it.m_node == m_node; }                                  \
-    };                                                                       \
-    \
-    static const_iterator begin_classinfo();                                 \
-    static const_iterator end_classinfo()
+class WXDLLIMPEXP_FWD_BASE wxObject;
 
-// based on the value of wxUSE_EXTENDED_RTTI symbol,
-// only one of the RTTI system will be compiled:
-// - the "old" one (defined by rtti.h) or
-// - the "new" one (defined by xti.h)
+#ifndef wxUSE_EXTENDED_RTTI
+#define wxUSE_EXTENDED_RTTI 0
+#endif
+
+#if wxUSE_EXTENDED_RTTI
 #include "wx/xti.h"
-#include "wx/rtti.h"
+#else
 
-#define wxIMPLEMENT_CLASS(name, basename)                                     \
-    wxIMPLEMENT_ABSTRACT_CLASS(name, basename)
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_FWD_BASE wxClassInfo;
+class WXDLLIMPEXP_FWD_BASE wxHashTable;
+class WXDLLIMPEXP_FWD_BASE wxObjectRefData;
+
+// ----------------------------------------------------------------------------
+// wxClassInfo
+// ----------------------------------------------------------------------------
+
+typedef wxObject *(*wxObjectConstructorFn)(void);
+
+class WXDLLIMPEXP_BASE wxClassInfo
+{
+public:
+    wxClassInfo( const wxChar *className,
+                 const wxClassInfo *baseInfo1,
+                 const wxClassInfo *baseInfo2,
+                 int size,
+                 wxObjectConstructorFn ctor )
+        : m_className(className)
+        , m_objectSize(size)
+        , m_objectConstructor(ctor)
+        , m_baseInfo1(baseInfo1)
+        , m_baseInfo2(baseInfo2)
+        , m_next(sm_first)
+        {
+            sm_first = this;
+            Register();
+        }
+
+    ~wxClassInfo();
+
+    wxObject *CreateObject() const
+        { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
+    bool IsDynamic() const { return (NULL != m_objectConstructor); }
+
+    const wxChar       *GetClassName() const { return m_className; }
+    const wxChar       *GetBaseClassName1() const
+        { return m_baseInfo1 ? m_baseInfo1->GetClassName() : NULL; }
+    const wxChar       *GetBaseClassName2() const
+        { return m_baseInfo2 ? m_baseInfo2->GetClassName() : NULL; }
+    const wxClassInfo  *GetBaseClass1() const { return m_baseInfo1; }
+    const wxClassInfo  *GetBaseClass2() const { return m_baseInfo2; }
+    int                 GetSize() const { return m_objectSize; }
+
+    wxObjectConstructorFn      GetConstructor() const
+        { return m_objectConstructor; }
+    static const wxClassInfo  *GetFirst() { return sm_first; }
+    const wxClassInfo         *GetNext() const { return m_next; }
+    static wxClassInfo        *FindClass(const wxChar *className);
+
+        // Climb upwards through inheritance hierarchy.
+        // Dual inheritance is catered for.
+
+    bool IsKindOf(const wxClassInfo *info) const
+    {
+        return info != 0 &&
+               ( info == this ||
+                 ( m_baseInfo1 && m_baseInfo1->IsKindOf(info) ) ||
+                 ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
+    }
+
+#if WXWIN_COMPATIBILITY_2_4
+    // Initializes parent pointers and hash table for fast searching.
+    wxDEPRECATED( static void InitializeClasses() );
+    // Cleans up hash table used for fast searching.
+    wxDEPRECATED( static void CleanUpClasses() );
+#endif
+
+public:
+    const wxChar            *m_className;
+    int                      m_objectSize;
+    wxObjectConstructorFn    m_objectConstructor;
+
+        // Pointers to base wxClassInfos: set in InitializeClasses
+
+    const wxClassInfo       *m_baseInfo1;
+    const wxClassInfo       *m_baseInfo2;
+
+        // class info object live in a linked list:
+        // pointers to its head and the next element in it
+
+    static wxClassInfo      *sm_first;
+    wxClassInfo             *m_next;
+
+    // FIXME: this should be private (currently used directly by way too
+    //        many clients)
+    static wxHashTable      *sm_classTable;
+
+private:
+    // InitializeClasses() helper
+    static wxClassInfo *GetBaseByName(const wxChar *name);
+
+    DECLARE_NO_COPY_CLASS(wxClassInfo)
+
+protected:
+    // registers the class
+    void Register();
+    void Unregister();
+};
+
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
+
+#if WXWIN_COMPATIBILITY_2_4
+inline void wxClassInfo::InitializeClasses() {}
+inline void wxClassInfo::CleanUpClasses() {}
+#endif
+
+// ----------------------------------------------------------------------------
+// Dynamic class macros
+// ----------------------------------------------------------------------------
+
+#define DECLARE_ABSTRACT_CLASS(name)                                          \
+    public:                                                                   \
+        static wxClassInfo ms_classInfo;                                      \
+        virtual wxClassInfo *GetClassInfo() const;
+
+#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)                                 \
+    DECLARE_NO_ASSIGN_CLASS(name)                                             \
+    DECLARE_DYNAMIC_CLASS(name)
+
+#define DECLARE_DYNAMIC_CLASS_NO_COPY(name)                                   \
+    DECLARE_NO_COPY_CLASS(name)                                               \
+    DECLARE_DYNAMIC_CLASS(name)
+
+#define DECLARE_DYNAMIC_CLASS(name)                                           \
+    DECLARE_ABSTRACT_CLASS(name)                                              \
+    static wxObject* wxCreateObject();
+
+#define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
+
+
+// common part of the macros below
+#define wxIMPLEMENT_CLASS_COMMON(name, basename, baseclsinfo2, func)          \
+    wxClassInfo name::ms_classInfo(wxT(#name),                                \
+            &basename::ms_classInfo,                                          \
+            baseclsinfo2,                                                     \
+            (int) sizeof(name),                                               \
+            (wxObjectConstructorFn) func);                                    \
+                                                                              \
+    wxClassInfo *name::GetClassInfo() const                                   \
+        { return &name::ms_classInfo; }
+
+#define wxIMPLEMENT_CLASS_COMMON1(name, basename, func)                       \
+    wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func)
+
+#define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func)           \
+    wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo, func)
+
+// -----------------------------------
+// for concrete classes
+// -----------------------------------
+
+    // Single inheritance with one base class
+#define IMPLEMENT_DYNAMIC_CLASS(name, basename)                               \
+    wxIMPLEMENT_CLASS_COMMON1(name, basename, name::wxCreateObject)           \
+    wxObject* name::wxCreateObject()                                          \
+        { return new name; }
+
+    // Multiple inheritance with two base classes
+#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)                  \
+    wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2,                     \
+                              name::wxCreateObject)                           \
+    wxObject* name::wxCreateObject()                                          \
+        { return new name; }
+
+// -----------------------------------
+// for abstract classes
+// -----------------------------------
+
+    // Single inheritance with one base class
+
+#define IMPLEMENT_ABSTRACT_CLASS(name, basename)                              \
+    wxIMPLEMENT_CLASS_COMMON1(name, basename, NULL)
+
+    // Multiple inheritance with two base classes
+
+#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)                 \
+    wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, NULL)
+
+#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
+#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
+
+#endif // !wxUSE_EXTENDED_RTTI
 
-#define wxIMPLEMENT_CLASS2(name, basename1, basename2)                        \
-    wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)
 
 // -----------------------------------
 // for pluggable classes
@@ -83,7 +238,7 @@ public:                                         \
     name##PluginSentinel();                     \
     ~name##PluginSentinel();                    \
 };                                              \
-name##PluginSentinel  m_pluginsentinel
+name##PluginSentinel  m_pluginsentinel;
 
 #define _IMPLEMENT_DL_SENTINEL(name)                                \
  const wxString name::name##PluginSentinel::sm_className(#name);    \
@@ -102,35 +257,35 @@ name##PluginSentinel  m_pluginsentinel
 
 #endif  // wxUSE_NESTED_CLASSES
 
-#define wxDECLARE_PLUGGABLE_CLASS(name) \
- wxDECLARE_DYNAMIC_CLASS(name); _DECLARE_DL_SENTINEL(name, WXDLLIMPEXP_CORE)
-#define wxDECLARE_ABSTRACT_PLUGGABLE_CLASS(name)  \
- wxDECLARE_ABSTRACT_CLASS(name); _DECLARE_DL_SENTINEL(name, WXDLLIMPEXP_CORE)
+#define DECLARE_PLUGGABLE_CLASS(name) \
+ DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLEXPORT)
+#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(name)  \
+ DECLARE_ABSTRACT_CLASS(name) _DECLARE_DL_SENTINEL(name, WXDLLEXPORT)
 
-#define wxDECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo) \
- wxDECLARE_DYNAMIC_CLASS(name); _DECLARE_DL_SENTINEL(name, usergoo)
-#define wxDECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, usergoo)  \
- wxDECLARE_ABSTRACT_CLASS(name); _DECLARE_DL_SENTINEL(name, usergoo)
+#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo) \
+ DECLARE_DYNAMIC_CLASS(name) _DECLARE_DL_SENTINEL(name, usergoo)
+#define DECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, usergoo)  \
+ DECLARE_ABSTRACT_CLASS(name) _DECLARE_DL_SENTINEL(name, usergoo)
 
-#define wxIMPLEMENT_PLUGGABLE_CLASS(name, basename) \
- wxIMPLEMENT_DYNAMIC_CLASS(name, basename) _IMPLEMENT_DL_SENTINEL(name)
-#define wxIMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
- wxIMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) _IMPLEMENT_DL_SENTINEL(name)
-#define wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename) \
- wxIMPLEMENT_ABSTRACT_CLASS(name, basename) _IMPLEMENT_DL_SENTINEL(name)
-#define wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
- wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) _IMPLEMENT_DL_SENTINEL(name)
+#define IMPLEMENT_PLUGGABLE_CLASS(name, basename) \
+ IMPLEMENT_DYNAMIC_CLASS(name, basename) _IMPLEMENT_DL_SENTINEL(name)
+#define IMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
+ IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) _IMPLEMENT_DL_SENTINEL(name)
+#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename) \
+ IMPLEMENT_ABSTRACT_CLASS(name, basename) _IMPLEMENT_DL_SENTINEL(name)
+#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
+ IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) _IMPLEMENT_DL_SENTINEL(name)
 
-#define wxIMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(name, basename) \
- wxIMPLEMENT_PLUGGABLE_CLASS(name, basename)
-#define wxIMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(name, basename1, basename2)  \
- wxIMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)
-#define wxIMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, basename) \
- wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename)
-#define wxIMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
- wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
+#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(name, basename) \
+ IMPLEMENT_PLUGGABLE_CLASS(name, basename)
+#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(name, basename1, basename2)  \
+ IMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)
+#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, basename) \
+ IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename)
+#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
+ IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
 
-#define wxCLASSINFO(name) (&name::ms_classInfo)
+#define CLASSINFO(name) (&name::ms_classInfo)
 
 #define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo)
 
@@ -144,8 +299,8 @@ name##PluginSentinel  m_pluginsentinel
 // be replaced by it as long as there are any compilers not supporting it
 #define wxDynamicCast(obj, className) \
     ((className *) wxCheckDynamicCast( \
-        const_cast<wxObject *>(static_cast<const wxObject *>(\
-          const_cast<className *>(static_cast<const className *>(obj)))), \
+        wx_const_cast(wxObject *, wx_static_cast(const wxObject *, \
+          wx_const_cast(className *, wx_static_cast(const className *, obj)))), \
         &className::ms_classInfo))
 
 // The 'this' pointer is always true, so use this version
@@ -153,16 +308,20 @@ name##PluginSentinel  m_pluginsentinel
 #define wxDynamicCastThis(className) \
      (IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0)
 
-// FIXME-VC6: dummy argument needed because VC6 doesn't support explicitly
-//            choosing the template function to call
-template <class T>
-inline T *wxCheckCast(const void *ptr, T * = NULL)
+#ifdef __WXDEBUG__
+inline void* wxCheckCast(void *ptr)
 {
-    wxASSERT_MSG( wxDynamicCast(ptr, T), "wxStaticCast() used incorrectly" );
-    return const_cast<T *>(static_cast<const T *>(ptr));
+    wxASSERT_MSG( ptr, wxT("wxStaticCast() used incorrectly") );
+    return ptr;
 }
+#define wxStaticCast(obj, className) \
+ ((className *)wxCheckCast(wxDynamicCast(obj, className)))
 
-#define wxStaticCast(obj, className) wxCheckCast((obj), (className *)NULL)
+#else  // !__WXDEBUG__
+#define wxStaticCast(obj, className) \
+    wx_const_cast(className *, wx_static_cast(const className *, obj))
+
+#endif  // __WXDEBUG__
 
 // ----------------------------------------------------------------------------
 // set up memory debugging macros
@@ -180,7 +339,7 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
     _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT     = void operator delete[] (void* buf, wxChar*, int )
 */
 
-#if wxUSE_MEMORY_TRACING
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
 
 // All compilers get this one
 #define _WX_WANT_NEW_SIZET_WXCHAR_INT
@@ -195,8 +354,9 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
     #define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
 #endif
 
-// Only VC++ 6 gets overloaded delete that matches new
-#if (defined(__VISUALC__) && (__VISUALC__ >= 1200))
+// Only VC++ 6 and CodeWarrior get overloaded delete that matches new
+#if (defined(__VISUALC__) && (__VISUALC__ >= 1200)) || \
+        (defined(__MWERKS__) && (__MWERKS__ >= 0x2400))
     #define _WX_WANT_DELETE_VOID_WXCHAR_INT
 #endif
 
@@ -212,141 +372,32 @@ inline T *wxCheckCast(const void *ptr, T * = NULL)
     #if !defined(__VISUALC__)
         #define _WX_WANT_ARRAY_DELETE_VOID
     #endif
+
+    // Only CodeWarrior 6 or higher
+    #if defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+        #define _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
+    #endif
+
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 
-#endif // wxUSE_MEMORY_TRACING
-
-// ----------------------------------------------------------------------------
-// Compatibility macro aliases DECLARE group
-// ----------------------------------------------------------------------------
-// deprecated variants _not_ requiring a semicolon after them and without wx prefix.
-// (note that also some wx-prefixed macro do _not_ require a semicolon because
-//  it's not always possible to force the compire to require it)
-
-#define DECLARE_CLASS_INFO_ITERATORS()                              wxDECLARE_CLASS_INFO_ITERATORS();
-#define DECLARE_ABSTRACT_CLASS(n)                                   wxDECLARE_ABSTRACT_CLASS(n);
-#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(n)                          wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(n);
-#define DECLARE_DYNAMIC_CLASS_NO_COPY(n)                            wxDECLARE_DYNAMIC_CLASS_NO_COPY(n);
-#define DECLARE_DYNAMIC_CLASS(n)                                    wxDECLARE_DYNAMIC_CLASS(n);
-#define DECLARE_CLASS(n)                                            wxDECLARE_CLASS(n);
-
-#define DECLARE_PLUGGABLE_CLASS(n)                                  wxDECLARE_PLUGGABLE_CLASS(n);
-#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(n)                         wxDECLARE_ABSTRACT_PLUGGABLE_CLASS(n);
-#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(n,u)                  wxDECLARE_USER_EXPORTED_PLUGGABLE_CLASS(n,u);
-#define DECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(n,u)         wxDECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(n,u);
-
-// ----------------------------------------------------------------------------
-// wxRefCounter: ref counted data "manager"
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxRefCounter
-{
-public:
-    wxRefCounter() { m_count = 1; }
-
-    int GetRefCount() const { return m_count; }
-
-    void IncRef() { m_count++; }
-    void DecRef();
-
-protected:
-    // this object should never be destroyed directly but only as a
-    // result of a DecRef() call:
-    virtual ~wxRefCounter() { }
-
-private:
-    // our refcount:
-    int m_count;
-
-    // It doesn't make sense to copy the reference counted objects, a new ref
-    // counter should be created for a new object instead and compilation
-    // errors in the code using wxRefCounter due to the lack of copy ctor often
-    // indicate a problem, e.g. a forgotten copy ctor implementation somewhere.
-    wxDECLARE_NO_COPY_CLASS(wxRefCounter);
-};
+#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
 
 // ----------------------------------------------------------------------------
 // wxObjectRefData: ref counted data meant to be stored in wxObject
 // ----------------------------------------------------------------------------
 
-typedef wxRefCounter wxObjectRefData;
-
-// ----------------------------------------------------------------------------
-// wxObjectDataPtr: helper class to avoid memleaks because of missing calls
-//                  to wxObjectRefData::DecRef
-// ----------------------------------------------------------------------------
-
-template <class T>
-class wxObjectDataPtr
+class WXDLLIMPEXP_BASE wxObjectRefData
 {
+    friend class WXDLLIMPEXP_FWD_BASE wxObject;
+
 public:
-    typedef T element_type;
+    wxObjectRefData() : m_count(1) { }
+    virtual ~wxObjectRefData() { }
 
-    wxEXPLICIT wxObjectDataPtr(T *ptr = NULL) : m_ptr(ptr) {}
-
-    // copy ctor
-    wxObjectDataPtr(const wxObjectDataPtr<T> &tocopy)
-        : m_ptr(tocopy.m_ptr)
-    {
-        if (m_ptr)
-            m_ptr->IncRef();
-    }
-
-    ~wxObjectDataPtr()
-    {
-        if (m_ptr)
-            m_ptr->DecRef();
-    }
-
-    T *get() const { return m_ptr; }
-
-    // test for pointer validity: defining conversion to unspecified_bool_type
-    // and not more obvious bool to avoid implicit conversions to integer types
-    typedef T *(wxObjectDataPtr<T>::*unspecified_bool_type)() const;
-    operator unspecified_bool_type() const
-    {
-        return m_ptr ? &wxObjectDataPtr<T>::get : NULL;
-    }
-
-    T& operator*() const
-    {
-        wxASSERT(m_ptr != NULL);
-        return *(m_ptr);
-    }
-
-    T *operator->() const
-    {
-        wxASSERT(m_ptr != NULL);
-        return get();
-    }
-
-    void reset(T *ptr)
-    {
-        if (m_ptr)
-            m_ptr->DecRef();
-        m_ptr = ptr;
-    }
-
-    wxObjectDataPtr& operator=(const wxObjectDataPtr &tocopy)
-    {
-        if (m_ptr)
-            m_ptr->DecRef();
-        m_ptr = tocopy.m_ptr;
-        if (m_ptr)
-            m_ptr->IncRef();
-        return *this;
-    }
-
-    wxObjectDataPtr& operator=(T *ptr)
-    {
-        if (m_ptr)
-            m_ptr->DecRef();
-        m_ptr = ptr;
-        return *this;
-    }
+    int GetRefCount() const { return m_count; }
 
 private:
-    T *m_ptr;
+    int m_count;
 };
 
 // ----------------------------------------------------------------------------
@@ -355,7 +406,7 @@ private:
 
 class WXDLLIMPEXP_BASE wxObject
 {
-    wxDECLARE_ABSTRACT_CLASS(wxObject);
+    DECLARE_ABSTRACT_CLASS(wxObject)
 
 public:
     wxObject() { m_refData = NULL; }
@@ -365,7 +416,7 @@ public:
     {
          m_refData = other.m_refData;
          if (m_refData)
-             m_refData->IncRef();
+             m_refData->m_count++;
     }
 
     wxObject& operator=(const wxObject& other)
@@ -377,7 +428,7 @@ public:
         return *this;
     }
 
-    bool IsKindOf(const wxClassInfo *info) const;
+    bool IsKindOf(wxClassInfo *info) const;
 
 
     // Turn on the correct set of new and delete operators
@@ -451,48 +502,68 @@ inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
     return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : NULL;
 }
 
-#include "wx/xti2.h"
+#if wxUSE_EXTENDED_RTTI
+class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject
+{
+    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;
+public:
+    // instantiates this object with an instance of its superclass
+    wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) ;
+    virtual ~wxDynamicObject();
+
+    void SetProperty (const wxChar *propertyName, const wxxVariant &value);
+    wxxVariant GetProperty (const wxChar *propertyName) const ;
+
+    // get the runtime identity of this object
+    wxClassInfo *GetClassInfo() const
+    {
+#ifdef _MSC_VER
+        return (wxClassInfo*) m_classInfo;
+#else
+        return wx_const_cast(wxClassInfo *, m_classInfo);
+#endif
+    }
+
+    wxObject* GetSuperClassInstance() const
+    {
+        return m_superClassInstance ;
+    }
+private :
+    // removes an existing runtime-property
+    void RemoveProperty( const wxChar *propertyName ) ;
+
+    // renames an existing runtime-property
+    void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ;
+
+    wxObject *m_superClassInstance ;
+    const wxDynamicClassInfo *m_classInfo;
+    struct wxDynamicObjectInternal;
+    wxDynamicObjectInternal *m_data;
+};
+#endif
 
 // ----------------------------------------------------------------------------
 // more debugging macros
 // ----------------------------------------------------------------------------
 
-#if wxUSE_DEBUG_NEW_ALWAYS
+// Redefine new to be the debugging version. This doesn't work with all
+// compilers, in which case you need to use WXDEBUG_NEW explicitly if you wish
+// to use the debugging version.
+
+#ifdef __WXDEBUG__
     #define WXDEBUG_NEW new(__TFILE__,__LINE__)
 
-    #if wxUSE_GLOBAL_MEMORY_OPERATORS
-        #define new WXDEBUG_NEW
-    #elif defined(__VISUALC__)
-        // Including this file redefines new and allows leak reports to
-        // contain line numbers
-        #include "wx/msw/msvcrt.h"
-    #endif
-#endif // wxUSE_DEBUG_NEW_ALWAYS
-
-// ----------------------------------------------------------------------------
-// Compatibility macro aliases IMPLEMENT group
-// ----------------------------------------------------------------------------
-
-// deprecated variants _not_ requiring a semicolon after them and without wx prefix.
-// (note that also some wx-prefixed macro do _not_ require a semicolon because
-//  it's not always possible to force the compire to require it)
-
-#define IMPLEMENT_DYNAMIC_CLASS(n,b)                                wxIMPLEMENT_DYNAMIC_CLASS(n,b)
-#define IMPLEMENT_DYNAMIC_CLASS2(n,b1,b2)                           wxIMPLEMENT_DYNAMIC_CLASS2(n,b1,b2)
-#define IMPLEMENT_ABSTRACT_CLASS(n,b)                               wxIMPLEMENT_ABSTRACT_CLASS(n,b)
-#define IMPLEMENT_ABSTRACT_CLASS2(n,b1,b2)                          wxIMPLEMENT_ABSTRACT_CLASS2(n,b1,b2)
-#define IMPLEMENT_CLASS(n,b)                                        wxIMPLEMENT_CLASS(n,b)
-#define IMPLEMENT_CLASS2(n,b1,b2)                                   wxIMPLEMENT_CLASS2(n,b1,b2)
-
-#define IMPLEMENT_PLUGGABLE_CLASS(n,b)                              wxIMPLEMENT_PLUGGABLE_CLASS(n,b)
-#define IMPLEMENT_PLUGGABLE_CLASS2(n,b,b2)                          wxIMPLEMENT_PLUGGABLE_CLASS2(n,b,b2)
-#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(n,b)                     wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(n,b)
-#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(n,b,b2)                 wxIMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(n,b,b2)
-#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(n,b)                wxIMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(n,b)
-#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(n,b,b2)            wxIMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(n,b,b2)
-#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(n,b)       wxIMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(n,b)
-#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(n,b,b2)   wxIMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(n,b,b2)
-
-#define CLASSINFO(n)                                wxCLASSINFO(n)
+    #if wxUSE_DEBUG_NEW_ALWAYS
+        #if wxUSE_GLOBAL_MEMORY_OPERATORS
+            #define new WXDEBUG_NEW
+        #elif defined(__VISUALC__)
+            // Including this file redefines new and allows leak reports to
+            // contain line numbers
+            #include "wx/msw/msvcrt.h"
+        #endif
+    #endif // wxUSE_DEBUG_NEW_ALWAYS
+#else // !__WXDEBUG__
+    #define WXDEBUG_NEW new
+#endif // __WXDEBUG__/!__WXDEBUG__
 
 #endif // _WX_OBJECTH__
diff --git a/Source/3rd Party/wx/include/wx/overlay.h b/Source/3rd Party/wx/include/wx/overlay.h
index 05ab1c1e2..d0d2a11aa 100644
--- a/Source/3rd Party/wx/include/wx/overlay.h	
+++ b/Source/3rd Party/wx/include/wx/overlay.h	
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: overlay.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,7 +14,7 @@
 
 #include "wx/defs.h"
 
-#if defined(__WXMAC__) && wxOSX_USE_CARBON
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
     #define wxHAS_NATIVE_OVERLAY 1
 #elif defined(__WXDFB__)
     #define wxHAS_NATIVE_OVERLAY 1
@@ -29,9 +29,9 @@
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_FWD_CORE wxOverlayImpl;
-class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 
-class WXDLLIMPEXP_CORE wxOverlay
+class WXDLLEXPORT wxOverlay
 {
 public:
     wxOverlay();
@@ -50,32 +50,32 @@ private:
     // returns true if it has been setup
     bool IsOk();
 
-    void Init(wxDC* dc, int x , int y , int width , int height);
+    void Init(wxWindowDC* dc, int x , int y , int width , int height);
 
-    void BeginDrawing(wxDC* dc);
+    void BeginDrawing(wxWindowDC* dc);
 
-    void EndDrawing(wxDC* dc);
+    void EndDrawing(wxWindowDC* dc);
 
-    void Clear(wxDC* dc);
+    void Clear(wxWindowDC* dc);
 
     wxOverlayImpl* m_impl;
 
     bool m_inDrawing;
 
 
-    wxDECLARE_NO_COPY_CLASS(wxOverlay);
+    DECLARE_NO_COPY_CLASS(wxOverlay)
 };
 
 
-class WXDLLIMPEXP_CORE wxDCOverlay
+class WXDLLEXPORT wxDCOverlay
 {
 public:
     // connects this overlay to the corresponding drawing dc, if the overlay is
     // not initialized yet this call will do so
-    wxDCOverlay(wxOverlay &overlay, wxDC *dc, int x , int y , int width , int height);
+    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc, int x , int y , int width , int height);
 
     // convenience wrapper that behaves the same using the entire area of the dc
-    wxDCOverlay(wxOverlay &overlay, wxDC *dc);
+    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc);
 
     // removes the connection between the overlay and the dc
     virtual ~wxDCOverlay();
@@ -84,14 +84,14 @@ public:
     void Clear();
 
 private:
-    void Init(wxDC *dc, int x , int y , int width , int height);
+    void Init(wxWindowDC *dc, int x , int y , int width , int height);
 
     wxOverlay& m_overlay;
 
-    wxDC* m_dc;
+    wxWindowDC* m_dc;
 
 
-    wxDECLARE_NO_COPY_CLASS(wxDCOverlay);
+    DECLARE_NO_COPY_CLASS(wxDCOverlay)
 };
 
 #endif // _WX_OVERLAY_H_
diff --git a/Source/3rd Party/wx/include/wx/ownerdrw.h b/Source/3rd Party/wx/include/wx/ownerdrw.h
index 5811ef62a..fe673cec8 100644
--- a/Source/3rd Party/wx/include/wx/ownerdrw.h	
+++ b/Source/3rd Party/wx/include/wx/ownerdrw.h	
@@ -1,25 +1,24 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ownerdrw.h
+// Name:        ownerdrw.h
 // Purpose:     interface for owner-drawn GUI elements
 // Author:      Vadim Zeitlin
-// Modified by: Marcin Malich
+// Modified by:
 // Created:     11.11.97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: ownerdrw.h 62511 2009-10-30 14:11:03Z JMS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_OWNERDRW_H_BASE
-#define _WX_OWNERDRW_H_BASE
+#ifndef   _OWNERDRW_H
+#define   _OWNERDRW_H
 
 #include "wx/defs.h"
 
 #if wxUSE_OWNER_DRAWN
 
-#include "wx/font.h"
+#include "wx/bitmap.h"
 #include "wx/colour.h"
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
+#include "wx/font.h"
 
 // ----------------------------------------------------------------------------
 // wxOwnerDrawn - a mix-in base class, derive from it to implement owner-drawn
@@ -30,116 +29,156 @@ class WXDLLIMPEXP_FWD_CORE wxDC;
 // element or one unchangeable bitmap otherwise.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxOwnerDrawnBase
+class WXDLLEXPORT wxOwnerDrawn
 {
 public:
-    wxOwnerDrawnBase()
-    {
-        m_ownerDrawn = false;
-        m_margin = ms_defaultMargin;
-    }
+  // ctor & dtor
+  wxOwnerDrawn(const wxString& str = wxEmptyString,
+               bool bCheckable = false,
+               bool bMenuItem = false); // FIXME kludge for colors
+  virtual ~wxOwnerDrawn();
 
-    virtual ~wxOwnerDrawnBase() {}
+  // fix appearance
+  void SetFont(const wxFont& font)
+      { m_font = font; m_bOwnerDrawn = true; }
 
-    void SetFont(const wxFont& font)
-        { m_font = font; m_ownerDrawn = true; }
+  wxFont& GetFont() const { return (wxFont &)m_font; }
 
-    wxFont& GetFont() const
-        { return (wxFont&) m_font; }
+  void SetTextColour(const wxColour& colText)
+      { m_colText = colText; m_bOwnerDrawn = true; }
 
+  wxColour& GetTextColour() const { return (wxColour&) m_colText; }
 
-    void SetTextColour(const wxColour& colText)
-        { m_colText = colText; m_ownerDrawn = true; }
+  void SetBackgroundColour(const wxColour& colBack)
+      { m_colBack = colBack; m_bOwnerDrawn = true; }
 
-    wxColour& GetTextColour() const
-        { return (wxColour&) m_colText; }
+  wxColour& GetBackgroundColour() const
+      { return (wxColour&) m_colBack ; }
 
-    void SetBackgroundColour(const wxColour& colBack)
-        { m_colBack = colBack; m_ownerDrawn = true; }
+  void SetBitmaps(const wxBitmap& bmpChecked,
+                  const wxBitmap& bmpUnchecked = wxNullBitmap)
+      { m_bmpChecked = bmpChecked;
+        m_bmpUnchecked = bmpUnchecked;
+        m_bOwnerDrawn = true; }
 
-    wxColour& GetBackgroundColour() const
-        { return (wxColour&) m_colBack ; }
+  void SetBitmap(const wxBitmap& bmpChecked)
+      { m_bmpChecked = bmpChecked;
+        m_bOwnerDrawn = true; }
 
+  void SetDisabledBitmap( const wxBitmap& bmpDisabled )
+      { m_bmpDisabled = bmpDisabled;
+        m_bOwnerDrawn = true; }
 
-    void SetMarginWidth(int width)
-        { m_margin = width; }
+  const wxBitmap& GetBitmap(bool bChecked = true) const
+      { return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
 
-    int GetMarginWidth() const
-        { return m_margin; }
+  const wxBitmap& GetDisabledBitmap() const
+      { return m_bmpDisabled; }
 
-    static int GetDefaultMarginWidth()
-        { return ms_defaultMargin; }
+  // the height of the menu checkmark (or bitmap) is determined by the font
+  // for the current item, but the width should be always the same (for the
+  // items to be aligned), so by default it's taken to be the same as for
+  // the last item (and default width for the first one).
+  //
+  // NB: default is too small for bitmaps, but ok for checkmarks.
+  void SetMarginWidth(int nWidth)
+  {
+      ms_nLastMarginWidth = m_nMarginWidth = (size_t) nWidth;
+      if ( ((size_t) nWidth) != ms_nDefaultMarginWidth )
+          m_bOwnerDrawn = true;
+  }
 
+  int GetMarginWidth() const { return (int) m_nMarginWidth; }
+  static int GetDefaultMarginWidth() { return (int) ms_nDefaultMarginWidth; }
 
-    // get item name (with mnemonics if exist)
-    virtual wxString GetName() const = 0;
+  // accessors
+  void SetName(const wxString& strName)  { m_strName = strName; }
+  const wxString& GetName() const { return m_strName;    }
+  void SetCheckable(bool checkable) { m_bCheckable = checkable; }
+  bool IsCheckable() const { return m_bCheckable; }
 
+  // this is for menu items only: accel string is drawn right aligned after the
+  // menu item if not empty
+  void SetAccelString(const wxString& strAccel) { m_strAccel = strAccel; }
 
   // this function might seem strange, but if it returns false it means that
   // no non-standard attribute are set, so there is no need for this control
   // to be owner-drawn. Moreover, you can force owner-drawn to false if you
   // want to change, say, the color for the item but only if it is owner-drawn
   // (see wxMenuItem::wxMenuItem for example)
-    bool IsOwnerDrawn() const
-        { return m_ownerDrawn; }
+  bool IsOwnerDrawn() const { return m_bOwnerDrawn;   }
 
-    // switch on/off owner-drawing the item
-    void SetOwnerDrawn(bool ownerDrawn = true)
-        { m_ownerDrawn = ownerDrawn; }
+  // switch on/off owner-drawing the item
+  void SetOwnerDrawn(bool ownerDrawn = true) { m_bOwnerDrawn = ownerDrawn; }
+  void ResetOwnerDrawn() { m_bOwnerDrawn = false;  }
 
+public:
+  // constants used in OnDrawItem
+  // (they have the same values as corresponding Win32 constants)
+  enum wxODAction
+  {
+    wxODDrawAll       = 0x0001,   // redraw entire control
+    wxODSelectChanged = 0x0002,   // selection changed (see Status.Select)
+    wxODFocusChanged  = 0x0004    // keyboard focus changed (see Status.Focus)
+  };
 
-    // constants used in OnDrawItem
-    // (they have the same values as corresponding Win32 constants)
-    enum wxODAction
-    {
-        wxODDrawAll       = 0x0001,     // redraw entire control
-        wxODSelectChanged = 0x0002,     // selection changed (see Status.Select)
-        wxODFocusChanged  = 0x0004      // keyboard focus changed (see Status.Focus)
-    };
+  enum wxODStatus
+  {
+    wxODSelected  = 0x0001,         // control is currently selected
+    wxODGrayed    = 0x0002,         // item is to be grayed
+    wxODDisabled  = 0x0004,         // item is to be drawn as disabled
+    wxODChecked   = 0x0008,         // item is to be checked
+    wxODHasFocus  = 0x0010,         // item has the keyboard focus
+    wxODDefault   = 0x0020,         // item is the default item
+    wxODHidePrefix= 0x0100          // hide keyboard cues (w2k and xp only)
+  };
 
-    enum wxODStatus
-    {
-        wxODSelected  = 0x0001,         // control is currently selected
-        wxODGrayed    = 0x0002,         // item is to be grayed
-        wxODDisabled  = 0x0004,         // item is to be drawn as disabled
-        wxODChecked   = 0x0008,         // item is to be checked
-        wxODHasFocus  = 0x0010,         // item has the keyboard focus
-        wxODDefault   = 0x0020,         // item is the default item
-        wxODHidePrefix= 0x0100          // hide keyboard cues (w2k and xp only)
-    };
-
-    // virtual functions to implement drawing (return true if processed)
-    virtual bool OnMeasureItem(size_t *width, size_t *height);
-    virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) = 0;
+  // virtual functions to implement drawing (return true if processed)
+  virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight);
+  virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
 protected:
+  // return true if this is a menu item
+  bool IsMenuItem() const;
 
-    // get the font and colour to use, whether it is set or not
-    virtual void GetFontToUse(wxFont& font) const;
-    virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const;
+  // get the font to use, whether m_font is set or not
+  wxFont GetFontToUse() const;
+
+  // Same as wxOwnerDrawn::SetMarginWidth() but does not affect
+  // ms_nLastMarginWidth. Exists solely to work around bug #4068,
+  // and will not exist in wxWidgets 2.9.0 and later.
+  void SetOwnMarginWidth(int nWidth)
+  {
+      m_nMarginWidth = (size_t) nWidth;
+      if ( ((size_t) nWidth) != ms_nDefaultMarginWidth )
+          m_bOwnerDrawn = true;
+  }
+
+
+  wxString  m_strName,      // label for a manu item
+            m_strAccel;     // the accel string ("Ctrl-F17") if any
 
 private:
-    bool        m_ownerDrawn;       // true if something is non standard
+  static size_t ms_nDefaultMarginWidth; // menu check mark width
+  static size_t ms_nLastMarginWidth;    // handy for aligning all items
 
-    wxFont      m_font;             // font to use for drawing
-    wxColour    m_colText,          // color ----"---"---"----
-                m_colBack;          // background color
+  bool      m_bCheckable,   // used only for menu or check listbox items
+            m_bOwnerDrawn,  // true if something is non standard
+            m_isMenuItem;   // true if this is a menu item
 
-    int         m_margin;           // space occupied by bitmap to the left of the item
+  wxFont    m_font;         // font to use for drawing
+  wxColour  m_colText,      // color ----"---"---"----
+            m_colBack;      // background color
+  wxBitmap  m_bmpChecked,   // bitmap to put near the item
+            m_bmpUnchecked, // (checked is used also for 'uncheckable' items)
+            m_bmpDisabled;
 
-    static int  ms_defaultMargin;
+  size_t    m_nHeight,      // font height
+            m_nMinHeight,   // minimum height, as determined by user's system settings
+            m_nMarginWidth; // space occupied by bitmap to the left of the item
 };
 
-// ----------------------------------------------------------------------------
-// include the platform-specific class declaration
-// ----------------------------------------------------------------------------
-
-#if defined(__WXMSW__)
-    #include "wx/msw/ownerdrw.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/ownerdrw.h"
-#endif
-
 #endif // wxUSE_OWNER_DRAWN
 
-#endif // _WX_OWNERDRW_H_BASE
+#endif
+  // _OWNERDRW_H
diff --git a/Source/3rd Party/wx/include/wx/palette.h b/Source/3rd Party/wx/include/wx/palette.h
index 2972af570..3b2e3cb78 100644
--- a/Source/3rd Party/wx/include/wx/palette.h	
+++ b/Source/3rd Party/wx/include/wx/palette.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: palette.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,26 +20,40 @@
 #include "wx/gdiobj.h"
 
 // wxPaletteBase
-class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject
+class WXDLLEXPORT wxPaletteBase: public wxGDIObject
 {
 public:
     virtual ~wxPaletteBase() { }
 
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;
     virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; }
 };
 
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/palette.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/palette.h"
-#elif defined(__WXX11__) || defined(__WXMOTIF__)
-    #include "wx/x11/palette.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/palette.h"
 #elif defined(__WXGTK__) || defined(__WXCOCOA__)
     #include "wx/generic/paletteg.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/palette.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/palette.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/palette.h"
+    #include "wx/mac/palette.h"
 #elif defined(__WXPM__)
     #include "wx/os2/palette.h"
 #endif
 
+#if WXWIN_COMPATIBILITY_2_4
+    #define wxColorMap wxPalette
+    #define wxColourMap wxPalette
+#endif
+
 #endif // wxUSE_PALETTE
 
-#endif // _WX_PALETTE_H_BASE_
+#endif
+    // _WX_PALETTE_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/panel.h b/Source/3rd Party/wx/include/wx/panel.h
index 4ed7c95a8..260e2b972 100644
--- a/Source/3rd Party/wx/include/wx/panel.h	
+++ b/Source/3rd Party/wx/include/wx/panel.h	
@@ -4,70 +4,15 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: panel.h 33948 2005-05-04 18:57:50Z JS $
 // Copyright:   (c) Julian Smart
-//              (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PANEL_H_BASE_
 #define _WX_PANEL_H_BASE_
 
-// ----------------------------------------------------------------------------
-// headers and forward declarations
-// ----------------------------------------------------------------------------
+#include "wx/generic/panelg.h"
 
-#include "wx/window.h"
-#include "wx/containr.h"
-
-class WXDLLIMPEXP_FWD_CORE wxControlContainer;
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
-
-// ----------------------------------------------------------------------------
-// wxPanel contains other controls and implements TAB traversal between them
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled<wxWindow>
-{
-public:
-    wxPanelBase() { }
-
-    // Derived classes should also provide this constructor:
-    /*
-    wxPanelBase(wxWindow *parent,
-                wxWindowID winid = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-                const wxString& name = wxPanelNameStr);
-    */
-
-    // Pseudo ctor
-    bool Create(wxWindow *parent,
-                wxWindowID winid = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-                const wxString& name = wxPanelNameStr);
-
-
-    // implementation from now on
-    // --------------------------
-
-    virtual void InitDialog();
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxPanelBase);
-};
-
-#if defined(__WXUNIVERSAL__)
-    #include "wx/univ/panel.h"
-#elif defined(__WXMSW__)
-    #include "wx/msw/panel.h"
-#else
-    #define wxHAS_GENERIC_PANEL
-    #include "wx/generic/panelg.h"
 #endif
-
-#endif // _WX_PANELH_BASE_
+    // _WX_PANELH_BASE_
diff --git a/Source/3rd Party/wx/include/wx/paper.h b/Source/3rd Party/wx/include/wx/paper.h
index d980961d8..fe69bd471 100644
--- a/Source/3rd Party/wx/include/wx/paper.h	
+++ b/Source/3rd Party/wx/include/wx/paper.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/paper.h
+// Name:        paper.h
 // Purpose:     Paper database types and classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: paper.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@
 #define WXADDPAPER(paperId, platformId, name, w, h) AddPaperType(paperId, 0, name, w, h)
 #endif
 
-class WXDLLIMPEXP_CORE wxPrintPaperType: public wxObject
+class WXDLLEXPORT wxPrintPaperType: public wxObject
 {
 public:
     wxPrintPaperType();
@@ -70,7 +70,7 @@ WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
 
 class WXDLLIMPEXP_FWD_CORE wxPrintPaperTypeList;
 
-class WXDLLIMPEXP_CORE wxPrintPaperDatabase
+class WXDLLEXPORT wxPrintPaperDatabase
 {
 public:
     wxPrintPaperDatabase();
@@ -115,7 +115,7 @@ private:
     // DECLARE_DYNAMIC_CLASS(wxPrintPaperDatabase)
 };
 
-extern WXDLLIMPEXP_DATA_CORE(wxPrintPaperDatabase*) wxThePrintPaperDatabase;
+extern WXDLLEXPORT_DATA(wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/pen.h b/Source/3rd Party/wx/include/wx/pen.h
index 28100cf21..cd28212f5 100644
--- a/Source/3rd Party/wx/include/wx/pen.h	
+++ b/Source/3rd Party/wx/include/wx/pen.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: pen.h 40865 2006-08-27 09:42:42Z VS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,154 +12,29 @@
 #ifndef _WX_PEN_H_BASE_
 #define _WX_PEN_H_BASE_
 
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
+#include "wx/defs.h"
 
-enum wxPenStyle
-{
-    wxPENSTYLE_INVALID = -1,
-
-    wxPENSTYLE_SOLID = wxSOLID,
-    wxPENSTYLE_DOT = wxDOT,
-    wxPENSTYLE_LONG_DASH = wxLONG_DASH,
-    wxPENSTYLE_SHORT_DASH = wxSHORT_DASH,
-    wxPENSTYLE_DOT_DASH = wxDOT_DASH,
-    wxPENSTYLE_USER_DASH = wxUSER_DASH,
-
-    wxPENSTYLE_TRANSPARENT = wxTRANSPARENT,
-
-    wxPENSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE,
-    wxPENSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
-    wxPENSTYLE_STIPPLE = wxSTIPPLE,
-
-    wxPENSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL,
-    wxPENSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG,
-    wxPENSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL,
-    wxPENSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS,
-    wxPENSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL,
-    wxPENSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL,
-    wxPENSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST,
-    wxPENSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST
-};
-
-enum wxPenJoin
-{
-    wxJOIN_INVALID = -1,
-
-    wxJOIN_BEVEL = 120,
-    wxJOIN_MITER,
-    wxJOIN_ROUND
-};
-
-enum wxPenCap
-{
-    wxCAP_INVALID = -1,
-
-    wxCAP_ROUND = 130,
-    wxCAP_PROJECTING,
-    wxCAP_BUTT
-};
-
-
-class WXDLLIMPEXP_CORE wxPenBase : public wxGDIObject
-{
-public:
-    virtual ~wxPenBase() { }
-
-    virtual void SetColour(const wxColour& col) = 0;
-    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0;
-
-    virtual void SetWidth(int width) = 0;
-    virtual void SetStyle(wxPenStyle style) = 0;
-    virtual void SetStipple(const wxBitmap& stipple) = 0;
-    virtual void SetDashes(int nb_dashes, const wxDash *dash) = 0;
-    virtual void SetJoin(wxPenJoin join) = 0;
-    virtual void SetCap(wxPenCap cap) = 0;
-
-    virtual wxColour GetColour() const = 0;
-    virtual wxBitmap *GetStipple() const = 0;
-    virtual wxPenStyle GetStyle() const = 0;
-    virtual wxPenJoin GetJoin() const = 0;
-    virtual wxPenCap GetCap() const = 0;
-    virtual int GetWidth() const = 0;
-    virtual int GetDashes(wxDash **ptr) const = 0;
-
-    // Convenient helpers for testing whether the pen is a transparent one:
-    // unlike GetStyle() == wxPENSTYLE_TRANSPARENT, they work correctly even if
-    // the pen is invalid (they both return false in this case).
-    bool IsTransparent() const
-    {
-        return IsOk() && GetStyle() == wxPENSTYLE_TRANSPARENT;
-    }
-
-    bool IsNonTransparent() const
-    {
-        return IsOk() && GetStyle() != wxPENSTYLE_TRANSPARENT;
-    }
-};
-
-#if defined(__WXMSW__)
-    #include "wx/msw/pen.h"
+#if defined(__WXPALMOS__)
+#include "wx/palmos/pen.h"
+#elif defined(__WXMSW__)
+#include "wx/msw/pen.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
-    #include "wx/x11/pen.h"
+#include "wx/x11/pen.h"
 #elif defined(__WXGTK20__)
-    #include "wx/gtk/pen.h"
+#include "wx/gtk/pen.h"
 #elif defined(__WXGTK__)
-    #include "wx/gtk1/pen.h"
+#include "wx/gtk1/pen.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/pen.h"
 #elif defined(__WXDFB__)
-    #include "wx/dfb/pen.h"
+#include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/pen.h"
+#include "wx/mac/pen.h"
 #elif defined(__WXCOCOA__)
-    #include "wx/cocoa/pen.h"
+#include "wx/cocoa/pen.h"
 #elif defined(__WXPM__)
-    #include "wx/os2/pen.h"
+#include "wx/os2/pen.h"
 #endif
 
-class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase
-{
-public:
-    wxPen *FindOrCreatePen(const wxColour& colour,
-                           int width = 1,
-                           wxPenStyle style = wxPENSTYLE_SOLID);
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxPen *FindOrCreatePen(const wxColour& colour, int width, int style)
-        { return FindOrCreatePen(colour, width, (wxPenStyle)style); }
 #endif
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( void AddPen(wxPen*) );
-    wxDEPRECATED( void RemovePen(wxPen*) );
-#endif
-};
-
-extern WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
-
-// provide comparison operators to allow code such as
-//
-//      if ( pen.GetStyle() == wxTRANSPARENT )
-//
-// to compile without warnings which it would otherwise provoke from some
-// compilers as it compares elements of different enums
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-
-// Unfortunately some compilers have ambiguity issues when enum comparisons are
-// overloaded so we have to disable the overloads in this case, see
-// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
-#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
-
-inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t)
-{
-    return static_cast<int>(s) == static_cast<int>(t);
-}
-
-inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
-{
-    return !(s == t);
-}
-
-#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
-
-#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
-
-#endif // _WX_PEN_H_BASE_
+    // _WX_PEN_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/persist.h b/Source/3rd Party/wx/include/wx/persist.h
deleted file mode 100644
index c94d89b71..000000000
--- a/Source/3rd Party/wx/include/wx/persist.h	
+++ /dev/null
@@ -1,264 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/persist.h
-// Purpose:     common classes for persistence support
-// Author:      Vadim Zeitlin
-// Created:     2009-01-18
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PERSIST_H_
-#define _WX_PERSIST_H_
-
-#include "wx/string.h"
-#include "wx/hashmap.h"
-#include "wx/confbase.h"
-
-class wxPersistentObject;
-
-WX_DECLARE_VOIDPTR_HASH_MAP(wxPersistentObject *, wxPersistentObjectsMap);
-
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-/*
-   We do _not_ declare this function as doing this would force us to specialize
-   it for the user classes deriving from the standard persistent classes.
-   However we do define overloads of wxCreatePersistentObject() for all the wx
-   classes which means that template wxPersistentObject::Restore() picks up the
-   right overload to use provided that the header defining the correct overload
-   is included before calling it. And a compilation error happens if this is
-   not done.
-
-template <class T>
-wxPersistentObject *wxCreatePersistentObject(T *obj);
-
- */
-
-// ----------------------------------------------------------------------------
-// wxPersistenceManager: global aspects of persistent windows
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPersistenceManager
-{
-public:
-    // Call this method to specify a non-default persistence manager to use.
-    // This function should usually be called very early to affect creation of
-    // all persistent controls and the object passed to it must have a lifetime
-    // long enough to be still alive when the persistent controls are destroyed
-    // and need it to save their state so typically this would be a global or a
-    // wxApp member.
-    static void Set(wxPersistenceManager& manager);
-
-    // accessor to the unique persistence manager object
-    static wxPersistenceManager& Get();
-
-    // trivial but virtual dtor
-    //
-    // FIXME-VC6: this only needs to be public because of VC6 bug
-    virtual ~wxPersistenceManager();
-
-
-    // globally disable restoring or saving the persistent properties (both are
-    // enabled by default)
-    void DisableSaving() { m_doSave = false; }
-    void DisableRestoring() { m_doRestore = false; }
-
-
-    // register an object with the manager: when using the first overload,
-    // wxCreatePersistentObject() must be specialized for this object class;
-    // with the second one the persistent adapter is created by the caller
-    //
-    // the object shouldn't be already registered with us
-    template <class T>
-    wxPersistentObject *Register(T *obj)
-    {
-        return Register(obj, wxCreatePersistentObject(obj));
-    }
-
-    wxPersistentObject *Register(void *obj, wxPersistentObject *po);
-
-    // check if the object is registered and return the associated
-    // wxPersistentObject if it is or NULL otherwise
-    wxPersistentObject *Find(void *obj) const;
-
-    // unregister the object, this is called by wxPersistentObject itself so
-    // there is usually no need to do it explicitly
-    //
-    // deletes the associated wxPersistentObject
-    void Unregister(void *obj);
-
-
-    // save/restore the state of an object
-    //
-    // these methods do nothing if DisableSaving/Restoring() was called
-    //
-    // Restore() returns true if the object state was really restored
-    void Save(void *obj);
-    bool Restore(void *obj);
-
-    // combines both Save() and Unregister() calls
-    void SaveAndUnregister(void *obj)
-    {
-        Save(obj);
-        Unregister(obj);
-    }
-
-    // combines both Register() and Restore() calls
-    template <class T>
-    bool RegisterAndRestore(T *obj)
-    {
-        return Register(obj) && Restore(obj);
-    }
-
-    bool RegisterAndRestore(void *obj, wxPersistentObject *po)
-    {
-        return Register(obj, po) && Restore(obj);
-    }
-
-
-    // methods used by the persistent objects to save and restore the data
-    //
-    // currently these methods simply use wxConfig::Get() but they may be
-    // overridden in the derived class (once we allow creating custom
-    // persistent managers)
-#define wxPERSIST_DECLARE_SAVE_RESTORE_FOR(Type)                              \
-    virtual bool SaveValue(const wxPersistentObject& who,                     \
-                           const wxString& name,                              \
-                           Type value);                                       \
-                                                                              \
-    virtual bool                                                              \
-    RestoreValue(const wxPersistentObject& who,                               \
-                 const wxString& name,                                        \
-                 Type *value)
-
-    wxPERSIST_DECLARE_SAVE_RESTORE_FOR(bool);
-    wxPERSIST_DECLARE_SAVE_RESTORE_FOR(int);
-    wxPERSIST_DECLARE_SAVE_RESTORE_FOR(long);
-    wxPERSIST_DECLARE_SAVE_RESTORE_FOR(wxString);
-
-#undef wxPERSIST_DECLARE_SAVE_RESTORE_FOR
-
-protected:
-    // ctor is private, use Get()
-    wxPersistenceManager()
-    {
-        m_doSave =
-        m_doRestore = true;
-    }
-
-
-    // Return the config object to use, by default just the global one but a
-    // different one could be used by the derived class if needed.
-    virtual wxConfigBase *GetConfig() const { return wxConfigBase::Get(); }
-
-    // Return the path to use for saving the setting with the given name for
-    // the specified object (notice that the name is the name of the setting,
-    // not the name of the object itself which can be retrieved with GetName()).
-    virtual wxString GetKey(const wxPersistentObject& who,
-                            const wxString& name) const;
-
-
-private:
-    // map with the registered objects as keys and associated
-    // wxPersistentObjects as values
-    wxPersistentObjectsMap m_persistentObjects;
-
-    // true if we should restore/save the settings (it doesn't make much sense
-    // to use this class when both of them are false but setting one of them to
-    // false may make sense in some situations)
-    bool m_doSave,
-         m_doRestore;
-
-    wxDECLARE_NO_COPY_CLASS(wxPersistenceManager);
-};
-
-// ----------------------------------------------------------------------------
-// wxPersistentObject: ABC for anything persistent
-// ----------------------------------------------------------------------------
-
-class wxPersistentObject
-{
-public:
-    // ctor associates us with the object whose options we save/restore
-    wxPersistentObject(void *obj) : m_obj(obj) { }
-
-    // trivial but virtual dtor
-    virtual ~wxPersistentObject() { }
-
-
-    // methods used by wxPersistenceManager
-    // ------------------------------------
-
-    // save/restore the corresponding objects settings
-    //
-    // these methods shouldn't be used directly as they don't respect the
-    // global wxPersistenceManager::DisableSaving/Restoring() settings, use
-    // wxPersistenceManager methods with the same name instead
-    virtual void Save() const = 0;
-    virtual bool Restore() = 0;
-
-
-    // get the kind of the objects we correspond to, e.g. "Frame"
-    virtual wxString GetKind() const = 0;
-
-    // get the name of the object we correspond to, e.g. "Main"
-    virtual wxString GetName() const = 0;
-
-
-    // return the associated object
-    void *GetObject() const { return m_obj; }
-
-protected:
-    // wrappers for wxPersistenceManager methods which don't require passing
-    // "this" as the first parameter all the time
-    template <typename T>
-    bool SaveValue(const wxString& name, T value) const
-    {
-        return wxPersistenceManager::Get().SaveValue(*this, name, value);
-    }
-
-    template <typename T>
-    bool RestoreValue(const wxString& name, T *value)
-    {
-        return wxPersistenceManager::Get().RestoreValue(*this, name, value);
-    }
-
-private:
-    void * const m_obj;
-
-    wxDECLARE_NO_COPY_CLASS(wxPersistentObject);
-};
-
-// FIXME-VC6: VC6 has troubles with template methods of DLL-exported classes,
-//            apparently it believes they should be defined in the DLL (which
-//            is, of course, impossible as the DLL doesn't know for which types
-//            will they be instantiated) instead of compiling them when
-//            building the main application itself. Because of this problem
-//            (which only arises in debug build!) we can't use the usual
-//            RegisterAndRestore(obj) with it and need to explicitly create the
-//            persistence adapter. To hide this ugliness we define a global
-//            function which does it for us.
-template <typename T>
-inline bool wxPersistentRegisterAndRestore(T *obj)
-{
-    wxPersistentObject * const pers = wxCreatePersistentObject(obj);
-
-    return wxPersistenceManager::Get().RegisterAndRestore(obj, pers);
-
-}
-
-// A helper function which also sets the name for the (wxWindow-derived) object
-// before registering and restoring it.
-template <typename T>
-inline bool wxPersistentRegisterAndRestore(T *obj, const wxString& name)
-{
-    obj->SetName(name);
-
-    return wxPersistentRegisterAndRestore(obj);
-}
-
-#endif // _WX_PERSIST_H_
-
diff --git a/Source/3rd Party/wx/include/wx/pickerbase.h b/Source/3rd Party/wx/include/wx/pickerbase.h
index 0a489a45e..da79f2dea 100644
--- a/Source/3rd Party/wx/include/wx/pickerbase.h	
+++ b/Source/3rd Party/wx/include/wx/pickerbase.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: pickerbase.h 49804 2007-11-10 01:09:42Z VZ $
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -19,7 +19,7 @@
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 class WXDLLIMPEXP_FWD_CORE wxToolTip;
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxPickerBase is the base class for the picker controls which support
@@ -31,14 +31,13 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
 // ----------------------------------------------------------------------------
 
 #define wxPB_USE_TEXTCTRL           0x0002
-#define wxPB_SMALL                  0x8000
 
-class WXDLLIMPEXP_CORE wxPickerBase : public wxNavigationEnabled<wxControl>
+class WXDLLIMPEXP_CORE wxPickerBase : public wxControl
 {
 public:
     // ctor: text is the associated text control
     wxPickerBase() : m_text(NULL), m_picker(NULL), m_sizer(NULL)
-        { }
+        { m_container.SetContainerWindow(this); }
     virtual ~wxPickerBase() {}
 
 
@@ -106,11 +105,6 @@ public:     // public API
     wxControl *GetPickerCtrl()
         { return m_picker; }
 
-    void SetTextCtrl(wxTextCtrl* text)
-        { m_text = text; }
-    void SetPickerCtrl(wxControl* picker)
-        { m_picker = picker; }
-
     // methods that derived class must/may override
     virtual void UpdatePickerFromTextCtrl() = 0;
     virtual void UpdateTextCtrlFromPicker() = 0;
@@ -127,6 +121,8 @@ protected:
     void OnTextCtrlUpdate(wxCommandEvent &);
     void OnTextCtrlKillFocus(wxFocusEvent &);
 
+    void OnSize(wxSizeEvent &);
+
     // returns the set of styles for the attached wxTextCtrl
     // from given wxPickerBase's styles
     virtual long GetTextCtrlStyle(long style) const
@@ -182,6 +178,10 @@ protected:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPickerBase)
+    DECLARE_EVENT_TABLE()
+
+    // This class must be something just like a panel...
+    WX_DECLARE_CONTROL_CONTAINER();
 };
 
 
diff --git a/Source/3rd Party/wx/include/wx/platform.h b/Source/3rd Party/wx/include/wx/platform.h
index 05b132af1..471e28eba 100644
--- a/Source/3rd Party/wx/include/wx/platform.h	
+++ b/Source/3rd Party/wx/include/wx/platform.h	
@@ -4,7 +4,7 @@
 * Author:      Vadim Zeitlin
 * Modified by:
 * Created:     29.10.01 (extracted from wx/defs.h)
-* RCS-ID:      $Id$
+* RCS-ID:      $Id: platform.h 63300 2010-01-28 21:36:09Z MW $
 * Copyright:   (c) 1997-2001 Vadim Zeitlin
 * Licence:     wxWindows licence
 */
@@ -14,28 +14,52 @@
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 
-#ifdef __WXMAC_XCODE__
-#    include <unistd.h>
-#    include <TargetConditionals.h>
-#    include <AvailabilityMacros.h>
-#    ifndef MAC_OS_X_VERSION_10_4
-#       define MAC_OS_X_VERSION_10_4 1040
-#    endif
-#    ifndef MAC_OS_X_VERSION_10_5
-#       define MAC_OS_X_VERSION_10_5 1050
-#    endif
-#    ifndef MAC_OS_X_VERSION_10_6
-#       define MAC_OS_X_VERSION_10_6 1060
-#    endif
-#    include "wx/osx/config_xcode.h"
-#    ifndef __WXOSX__
-#        define __WXOSX__ 1
-#    endif
-#    ifndef __WXMAC__
-#        define __WXMAC__ 1
+
+/*
+    Codewarrior doesn't define any Windows symbols until some headers
+    are included
+*/
+#ifdef __MWERKS__
+#    include <stddef.h>
+#endif
+
+/*
+    WXMAC variants
+    __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
+    carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
+    builds, running under 10.2 + only
+*/
+#ifdef __WXMAC__
+#    if defined(__MACH__)
+#        define __WXMAC_OSX__
+#        define __WXMAC_CARBON__
+#        include <AvailabilityMacros.h>
+#        ifndef MAC_OS_X_VERSION_10_4
+#           define MAC_OS_X_VERSION_10_4 1040
+#        endif
+#        ifndef MAC_OS_X_VERSION_10_5
+#           define MAC_OS_X_VERSION_10_5 1050
+#        endif
+#        ifdef __WXMAC_XCODE__
+#            include <unistd.h>
+#            include "wx/mac/carbon/config_xcode.h"
+#        endif
+#    else
+#        if TARGET_CARBON
+#            define __WXMAC_CARBON__
+#        else
+#            define __WXMAC_CLASSIC__
+#        endif
 #    endif
 #endif
 
+/*
+    __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
+ */
+#if defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
+#   define __WXOSX__
+#endif
+
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
@@ -44,6 +68,41 @@
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
+
+#    ifndef _WIN32
+#        define _WIN32
+#    endif
+
+#    ifndef WIN32
+#        define WIN32
+#    endif
+#endif
+
+#if defined(__PALMOS__)
+#   if __PALMOS__ == 0x06000000
+#       define __WXPALMOS6__
+#   endif
+#   if __PALMOS__ == 0x05000000
+#       define __WXPALMOS5__
+#   endif
+#   ifndef __WXPALMOS__
+#       define __WXPALMOS__
+#   endif
+#   ifdef __WXMSW__
+#       undef __WXMSW__
+#   endif
+#   ifdef __WINDOWS__
+#       undef __WINDOWS__
+#   endif
+#   ifdef __WIN32__
+#       undef __WIN32__
+#   endif
+#   ifdef WIN32
+#       undef WIN32
+#   endif
+#   ifdef _WIN32
+#       undef _WIN32
+#   endif
 #endif
 
 #if defined(_WIN64)
@@ -66,25 +125,17 @@
 #    ifndef __WXMSW__
 #        define __WXMSW__
 #    endif
+
+#    ifndef __WIN32__
+#        define __WIN32__
+#    endif
 #endif /* Win32 */
 
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) || defined(__WIN32__)
 #   if !defined(__WINDOWS__)
 #       define __WINDOWS__
 #   endif
-
-#   ifndef _WIN32
-#        define _WIN32
-#   endif
-
-#   ifndef WIN32
-#        define WIN32
-#   endif
-
-#   ifndef __WIN32__
-#        define __WIN32__
-#   endif
-#endif /* __WXMSW__ */
+#endif
 
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
@@ -131,19 +182,10 @@
 #   endif
 #endif
 
-#if defined(__WXWINCE__) && defined(_MSC_VER) && (_MSC_VER == 1201)
-    #define __EVC4__
-#endif
-
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__)
 #   define __WXHANDHELD__
 #endif
 
-#ifdef __ANDROID__
-#   define __WXANDROID__
-#   include "wx/android/config_android.h"
-#endif
-
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options
@@ -153,14 +195,6 @@
  */
 #include "wx/setup.h"
 
-/*
-   Convenience for any optional classes that use the wxAnyButton base class.
- */
-#if wxUSE_TOGGLEBTN || wxUSE_BUTTON
-    #define wxHAS_ANY_BUTTON
-#endif
-
-
 /*
    Hardware platform detection.
 
@@ -217,61 +251,76 @@
 #   endif
 #endif /* wxUSE_UNICODE */
 
+#if defined( __MWERKS__ ) && !defined(__INTEL__)
+/* otherwise MSL headers bring in WIN32 dependant APIs */
+#undef UNICODE
+#endif
 
 /*
-   test for old versions of Borland C, normally need at least 5.82, Turbo
-   explorer, available for free at http://www.turboexplorer.com/downloads
+   Notice that Turbo Explorer (BCC 5.82) is available for free at
+   http://www.turboexplorer.com/downloads, you can get it if you have trouble
+   compiling wxWidgets with your current Borland compiler.
 */
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x540)
+#   error "wxWidgets requires a newer version of Borland, we recommend upgrading to 5.82 (Turbo Explorer). You may at your own risk remove this line and try building but be prepared to get build errors."
+#endif /* __BORLANDC__ */
 
-
-/*
-    Older versions of Borland C have some compiler bugs that need
-    workarounds. Mostly pertains to the free command line compiler 5.5.1.
-*/
-#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x551)
-    /*
-        The Borland free compiler is unable to handle overloaded enum
-        comparisons under certain conditions e.g. when any class has a
-        conversion ctor for an integral type and there's an overload to
-        compare between an integral type and that class type.
-    */
-#   define wxCOMPILER_NO_OVERLOAD_ON_ENUM
-
-    /*
-        This is needed to overcome bugs in 5.5.1 STL, linking errors will
-        result if it is not defined.
-     */
-#   define _RWSTD_COMPILE_INSTANTIATE
-
-    /*
-        Preprocessor in older Borland compilers have major problems
-        concatenating with ##. Specifically, if the string operands being
-        concatenated have special meaning (e.g. L"str", 123i64 etc)
-        then ## will not concatenate the operands correctly.
-
-        As a workaround, define wxPREPEND* and wxAPPEND* without using
-        wxCONCAT_HELPER.
-    */
-#   define wxCOMPILER_BROKEN_CONCAT_OPER
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x582) && (__BORLANDC__ > 0x559)
+#   ifndef _USE_OLD_RW_STL
+#       error "wxWidgets is incompatible with default Borland C++ 5.6 STL library, please add -D_USE_OLD_RW_STL to your bcc32.cfg to use RogueWave STL implementation."
+#   endif
 #endif /* __BORLANDC__ */
 
 /*
-   Define Watcom-specific macros.
+   This macro can be used to test the Open Watcom version.
 */
 #ifndef __WATCOMC__
 #   define wxWATCOM_VERSION(major,minor) 0
 #   define wxCHECK_WATCOM_VERSION(major,minor) 0
 #   define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0
-#   define WX_WATCOM_ONLY_CODE( x )
+#elif defined(__WATCOMC__) && __WATCOMC__ < 1200
+#   error "Only Open Watcom is supported in this release"
 #else
-#   if __WATCOMC__ < 1200
-#       error "Only Open Watcom is supported in this release"
-#   endif
-
 #   define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 )
 #   define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) )
 #   define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) )
-#   define WX_WATCOM_ONLY_CODE( x )  x
+#endif
+
+/*
+   check the consistency of the settings in setup.h: note that this must be
+   done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
+ */
+#include "wx/chkconf.h"
+
+
+/*
+   some compilers don't support iostream.h any longer, while some of theme
+   are not updated with <iostream> yet, so override the users setting here
+   in such case.
+ */
+#if defined(_MSC_VER) && (_MSC_VER >= 1310)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 0
+#elif defined(__DMC__) || defined(__WATCOMC__)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 1
+#elif defined(__MINGW32__)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 0
+#endif /* compilers with/without iostream.h */
+
+/*
+   old C++ headers (like <iostream.h>) declare classes in the global namespace
+   while the new, standard ones (like <iostream>) do it in std:: namespace,
+   unless it's an old gcc version.
+
+   using this macro allows constuctions like "wxSTD iostream" to work in
+   either case
+ */
+#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+#    define wxSTD std::
+#else
+#    define wxSTD
 #endif
 
 /*
@@ -323,18 +372,16 @@
 #       endif
 #    endif  /* SGI */
 
-#    if defined(__SUNPRO_CC)
-#       ifndef __SUNCC__
-#           define __SUNCC__ __SUNPRO_CC
-#       endif /* Sun CC */
-#    endif /* Sun CC */
+#    if defined(sun) || defined(__SUN__)
+#        ifndef __GNUG__
+#            ifndef __SUNCC__
+#                define __SUNCC__
+#            endif /* Sun CC */
+#        endif
+#    endif /* Sun */
 
 #    ifdef __EMX__
 #        define OS2EMX_PLAIN_CHAR
-#    endif
-#    if defined(__INNOTEK_LIBC__)
-        /* Ensure visibility of strnlen declaration */
-#        define _GNU_SOURCE
 #    endif
 
     /* define __HPUX__ for HP-UX where standard macro is __hpux */
@@ -373,6 +420,17 @@
 #        endif
 #    endif
 
+/*
+   OS: Classic Mac OS
+ */
+#elif defined(applec) || \
+      defined(THINK_C) || \
+      (defined(__MWERKS__) && !defined(__INTEL__))
+      /* MacOS */
+#    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+#        define wxSIZE_T_IS_ULONG
+#    endif
+
 /*
    OS: OS/2
  */
@@ -396,6 +454,20 @@
 #    endif
 #    define wxSIZE_T_IS_UINT
 
+/*
+   OS: Palm OS
+ */
+#elif defined(__PALMOS__)
+#    ifdef __WIN32__
+#        error "__WIN32__ should not be defined for PalmOS"
+#    endif
+#    ifdef __WINDOWS__
+#        error "__WINDOWS__ should not be defined for PalmOS"
+#    endif
+#    ifdef __WXMSW__
+#        error "__WXMSW__ should not be defined for PalmOS"
+#    endif
+
 /*
    OS: Otherwise it must be Windows
  */
@@ -411,37 +483,10 @@
 
     /*
        define another standard symbol for Microsoft Visual C++: the standard
-       one (_MSC_VER) is also defined by some other compilers.
+       one (_MSC_VER) is also defined by Metrowerks compiler
      */
-#    if defined(_MSC_VER)
+#    if defined(_MSC_VER) && !defined(__MWERKS__)
 #        define __VISUALC__ _MSC_VER
-
-    /*
-       define special symbols for different VC version instead of writing tests
-       for magic numbers such as 1200, 1300 &c repeatedly
-     */
-#   if __VISUALC__ < 1100
-#       error "This Visual C++ version is too old and not supported any longer."
-#   elif __VISUALC__ < 1200
-#       define __VISUALC5__
-#   elif __VISUALC__ < 1300
-#       define __VISUALC6__
-#   elif __VISUALC__ < 1400
-#       define __VISUALC7__
-#   elif __VISUALC__ < 1500
-#       define __VISUALC8__
-#   elif __VISUALC__ < 1600
-#       define __VISUALC9__
-#   elif __VISUALC__ < 1700
-#       define __VISUALC10__
-#   elif __VISUALC__ < 1800
-#       define __VISUALC11__
-#   elif __VISUALC__ < 1900
-# define __VISUALC12__
-#   else
-#       pragma message("Please update wx/platform.h to recognize this VC++ version")
-#   endif
-
 #    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
 #        define __BORLANDC__
 #    elif defined(__WATCOMC__)
@@ -516,17 +561,6 @@
 #define wxNEEDS_CHARPP
 #endif
 
-/*
-   This macro can be used to test the Visual C++ version.
-*/
-#ifndef __VISUALC__
-#   define wxVISUALC_VERSION(major) 0
-#   define wxCHECK_VISUALC_VERSION(major) 0
-#else
-#   define wxVISUALC_VERSION(major) ( (6 + major) * 100 )
-#   define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
-#endif
-
 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
@@ -538,7 +572,8 @@
     !defined(__WXPM__) && \
     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
-    !defined(__WXX11__)
+    !defined(__WXX11__) && \
+    !defined(__WXPALMOS__)
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION
@@ -547,16 +582,13 @@
 #    define wxCHECK_MINGW32_VERSION(maj, min) (0)
 #endif
 
-/**
-    This is similar to wxCHECK_GCC_VERSION but for Sun CC compiler.
- */
-#ifdef __SUNCC__
-    /*
-       __SUNCC__ is 0xVRP where V is major version, R release and P patch level
-     */
-    #define wxCHECK_SUNCC_VERSION(maj, min) (__SUNCC__ >= (((maj)<<8) | ((min)<<4)))
-#else
-    #define wxCHECK_SUNCC_VERSION(maj, min) (0)
+#if defined (__WXMSW__)
+#    if !wxONLY_WATCOM_EARLIER_THAN(1, 8)
+#        define wxHAVE_RAW_BITMAP
+#    endif
+#endif
+#if defined(__WXGTK20__) || defined(__WXMAC__)
+#    define wxHAVE_RAW_BITMAP
 #endif
 
 /*
@@ -576,155 +608,6 @@
 /*  According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */
 #    warning "Compiling wxMac with probably wrong endianness"
 #endif
-/* also the 32/64 bit universal builds must be handled accordingly */
-#ifdef __DARWIN__
-#    ifdef __LP64__
-#        undef SIZEOF_VOID_P
-#        undef SIZEOF_LONG
-#        undef SIZEOF_SIZE_T
-#        define SIZEOF_VOID_P 8
-#        define SIZEOF_LONG 8
-#        define SIZEOF_SIZE_T 8
-#    else
-#        undef SIZEOF_VOID_P
-#        undef SIZEOF_LONG
-#        undef SIZEOF_SIZE_T
-#        define SIZEOF_VOID_P 4
-#        define SIZEOF_LONG 4
-#        define SIZEOF_SIZE_T 4
-#    endif
-#endif
-
-/*
-    Define various OS X symbols before including wx/chkconf.h which uses them.
-
-    __WXOSX_MAC__ means Mac OS X, non embedded
-    __WXOSX_IPHONE__ means OS X iPhone
- */
-
-/*
-    Normally all of __WXOSX_XXX__, __WXOSX__ and __WXMAC__ are defined by
-    configure but ensure that we also define them if configure was not used for
-    whatever reason.
-
-    The primary symbol remains __WXOSX_XXX__ one, __WXOSX__ exists to allow
-    checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
-    for it.
- */
-#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__) \
-        || (defined(__DARWIN__) && !wxUSE_GUI)
-#   ifndef __WXOSX__
-#       define __WXOSX__ 1
-#   endif
-#   ifndef __WXMAC__
-#       define __WXMAC__ 1
-#   endif
-#endif
-
-#ifdef __WXOSX__
-/* setup precise defines according to sdk used */
-#   include <TargetConditionals.h>
-#   if defined(__WXOSX_IPHONE__)
-#       if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
-#           error "incorrect SDK for an iPhone build"
-#       endif
-#   else
-#       if wxUSE_GUI && !(defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__))
-#           error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined for the GUI build"
-#       endif
-#       if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
-#           error "incorrect SDK for a Mac OS X build"
-#       endif
-#       define __WXOSX_MAC__ 1
-#   endif
-#endif
-
-#ifdef __WXOSX_MAC__
-#    if defined(__MACH__)
-#        include <AvailabilityMacros.h>
-#        ifndef MAC_OS_X_VERSION_10_4
-#           define MAC_OS_X_VERSION_10_4 1040
-#        endif
-#        ifndef MAC_OS_X_VERSION_10_5
-#           define MAC_OS_X_VERSION_10_5 1050
-#        endif
-#        ifndef MAC_OS_X_VERSION_10_6
-#           define MAC_OS_X_VERSION_10_6 1060
-#        endif
-#    else
-#        error "only mach-o configurations are supported"
-#    endif
-#endif
-
-/*
-    __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) and wxCocoa ports under OS X.
-
-    DO NOT use this define in base library code.  Although wxMac has its own
-    private base library (and thus __WXOSX_OR_COCOA__,__WXMAC__ and related defines are
-    valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
-
-    To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ for wxCocoa when
-    not compiling the base library.  We determine this by first checking if
-    wxUSE_BASE is not defined.  If it is not defined, then we're not buildling
-    the base library, and possibly not building wx at all (but actually building
-    user code that's using wx). If it is defined then we must check to make sure
-    it is not true.  If it is true, we're building base.
-
-    If you want it in the common darwin base library then use __DARWIN__.  You
-    can use any Darwin-available libraries like CoreFoundation but please avoid
-    using OS X libraries like Carbon or CoreServices.
-
- */
-#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
-#   define __WXOSX_OR_COCOA__ 1
-#endif
-
-/*
-   check the consistency of the settings in setup.h: note that this must be
-   done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
-   and after defining the compiler macros which are used in it too
- */
-#include "wx/chkconf.h"
-
-
-/*
-   some compilers don't support iostream.h any longer, while some of theme
-   are not updated with <iostream> yet, so override the users setting here
-   in such case.
- */
-#if defined(_MSC_VER) && (_MSC_VER >= 1310)
-#    undef wxUSE_IOSTREAMH
-#    define wxUSE_IOSTREAMH 0
-#elif defined(__DMC__) || defined(__WATCOMC__)
-#    undef wxUSE_IOSTREAMH
-#    define wxUSE_IOSTREAMH 1
-#elif defined(__MINGW32__)
-#    undef wxUSE_IOSTREAMH
-#    define wxUSE_IOSTREAMH 0
-#endif /* compilers with/without iostream.h */
-
-/*
-   old C++ headers (like <iostream.h>) declare classes in the global namespace
-   while the new, standard ones (like <iostream>) do it in std:: namespace,
-   unless it's an old gcc version.
-
-   using this macro allows constuctions like "wxSTD iostream" to work in
-   either case
- */
-#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
-#    define wxSTD std::
-#else
-#    define wxSTD
-#endif
-
-/* On OpenVMS with the most recent HP C++ compiler some function (i.e. wscanf)
- * are only available in the std-namespace. (BUG???)
- */
-#if defined(  __VMS ) && (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
-# define wxVMS_USE_STD std::
-#else
-# define wxVMS_USE_STD
-#endif
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
@@ -740,7 +623,7 @@
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
  */
 #ifndef wxUSE_IDLEMENUUPDATES
-#    if (defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXOSX__)) && !defined(__WXUNIVERSAL__)
+#    if (defined(__WXMSW__) || defined(__WXGTK__)) && !defined(__WXUNIVERSAL__)
 #        define wxUSE_IDLEMENUUPDATES 0
 #    else
 #        define wxUSE_IDLEMENUUPDATES 1
@@ -754,7 +637,7 @@
  */
 
 #ifndef wxUSE_FILECONFIG
-#    if wxUSE_CONFIG && wxUSE_TEXTFILE
+#    if wxUSE_CONFIG
 #        define wxUSE_FILECONFIG 1
 #    else
 #        define wxUSE_FILECONFIG 0
@@ -770,28 +653,12 @@
 #endif
 
 /*
-    Optionally supported C++ features.
- */
-
-/*
-    RTTI: if it is disabled in build/msw/makefile.* then this symbol will
-    already be defined but it's also possible to do it from configure (with
-    g++) or by editing project files with MSVC so test for it here too.
- */
-#ifndef wxNO_RTTI
-    /*
-        Only 4.3 defines __GXX_RTTI by default so its absence is not an
-        indication of disabled RTTI with the previous versions.
-     */
-#   if wxCHECK_GCC_VERSION(4, 3)
-#       ifndef __GXX_RTTI
-#           define wxNO_RTTI
-#       endif
-#   elif defined(_MSC_VER)
-#       ifndef _CPPRTTI
-#           define wxNO_RTTI
-#       endif
-#   endif
-#endif /* wxNO_RTTI */
+    We need AvailabilityMacros.h for ifdefing out things that don't exist on
+    OSX 10.2 and lower
+    FIXME:  We need a better way to detect for 10.3 then including a system header
+*/
+#ifdef __DARWIN__
+    #include <AvailabilityMacros.h>
+#endif
 
 #endif /* _WX_PLATFORM_H_ */
diff --git a/Source/3rd Party/wx/include/wx/platinfo.h b/Source/3rd Party/wx/include/wx/platinfo.h
index a203dc9cb..d9382dd2e 100644
--- a/Source/3rd Party/wx/include/wx/platinfo.h	
+++ b/Source/3rd Party/wx/include/wx/platinfo.h	
@@ -4,9 +4,9 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     07.07.2006 (based on wxToolkitInfo)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: platinfo.h 41807 2006-10-09 15:58:56Z VZ $
 // Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
+// License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PLATINFO_H_
@@ -15,7 +15,7 @@
 #include "wx/string.h"
 
 // ----------------------------------------------------------------------------
-// wxPlatformInfo enums & structs
+// wxPlatformInfo
 // ----------------------------------------------------------------------------
 
 // VERY IMPORTANT: when changing these enum values, also change the relative
@@ -72,14 +72,15 @@ enum wxPortId
     wxPORT_MSW      = 1 << 1,       // wxMSW, native toolkit is Windows API
     wxPORT_MOTIF    = 1 << 2,       // wxMotif, using [Open]Motif or Lesstif
     wxPORT_GTK      = 1 << 3,       // wxGTK, using GTK+ 1.x, 2.x, GPE or Maemo
-    wxPORT_DFB      = 1 << 4,       // wxDFB, using wxUniversal
+    wxPORT_MGL      = 1 << 4,       // wxMGL, using wxUniversal
     wxPORT_X11      = 1 << 5,       // wxX11, using wxUniversal
     wxPORT_PM       = 1 << 6,       // wxOS2, using OS/2 Presentation Manager
     wxPORT_OS2      = wxPORT_PM,    // wxOS2, using OS/2 Presentation Manager
-    wxPORT_MAC      = 1 << 7,       // wxOSX (former wxMac), using Cocoa, Carbon or iPhone API
-    wxPORT_OSX      = wxPORT_MAC,   // wxOSX, using Cocoa, Carbon or iPhone API
+    wxPORT_MAC      = 1 << 7,       // wxMac, using Carbon or Classic Mac API
     wxPORT_COCOA    = 1 << 8,       // wxCocoa, using Cocoa NextStep/Mac API
-    wxPORT_WINCE    = 1 << 9        // wxWinCE, toolkit is WinCE SDK API
+    wxPORT_WINCE    = 1 << 9,       // wxWinCE, toolkit is WinCE SDK API
+    wxPORT_PALMOS   = 1 << 10,      // wxPalmOS, toolkit is PalmOS API
+    wxPORT_DFB      = 1 << 11       // wxDFB, using wxUniversal
 };
 
 // architecture of the operating system
@@ -108,31 +109,6 @@ enum wxEndianness
     wxENDIAN_MAX
 };
 
-// informations about a linux distro returned by the lsb_release utility
-struct wxLinuxDistributionInfo
-{
-    wxString Id;
-    wxString Release;
-    wxString CodeName;
-    wxString Description;
-
-    bool operator==(const wxLinuxDistributionInfo& ldi) const
-    {
-        return Id == ldi.Id &&
-               Release == ldi.Release &&
-               CodeName == ldi.CodeName &&
-               Description == ldi.Description;
-    }
-
-    bool operator!=(const wxLinuxDistributionInfo& ldi) const
-    { return !(*this == ldi); }
-};
-
-
-// ----------------------------------------------------------------------------
-// wxPlatformInfo
-// ----------------------------------------------------------------------------
-
 // Information about the toolkit that the app is running under and some basic
 // platform and architecture info
 class WXDLLIMPEXP_BASE wxPlatformInfo
@@ -180,7 +156,6 @@ public:
     static wxString GetArchName(wxArchitecture arch);
     static wxString GetEndiannessName(wxEndianness end);
 
-
     // getters
     // -----------------
 
@@ -216,8 +191,6 @@ public:
 
     wxOperatingSystemId GetOperatingSystemId() const
         { return m_os; }
-    wxLinuxDistributionInfo GetLinuxDistributionInfo() const
-        { return m_ldi; }
     wxPortId GetPortId() const
         { return m_port; }
     wxArchitecture GetArchitecture() const
@@ -241,16 +214,6 @@ public:
         { return GetArchName(m_arch); }
     wxString GetEndiannessName() const
         { return GetEndiannessName(m_endian); }
-    wxString GetOperatingSystemDescription() const
-        { return m_osDesc; }
-    wxString GetDesktopEnvironment() const
-        { return m_desktopEnv; }
-
-    static wxString GetOperatingSystemDirectory();
-        // doesn't make sense to store inside wxPlatformInfo the OS directory,
-        // thus this function is static; note that this function simply calls
-        // wxGetOSDirectory() and is here just to make it easier for the user to
-        // find it that feature (global functions can be difficult to find in the docs)
 
     // setters
     // -----------------
@@ -262,8 +225,6 @@ public:
 
     void SetOperatingSystemId(wxOperatingSystemId n)
         { m_os = n; }
-    void SetOperatingSystemDescription(const wxString& desc)
-        { m_osDesc = desc; }
     void SetPortId(wxPortId n)
         { m_port = n; }
     void SetArchitecture(wxArchitecture n)
@@ -271,12 +232,6 @@ public:
     void SetEndianness(wxEndianness n)
         { m_endian = n; }
 
-    void SetDesktopEnvironment(const wxString& de)
-        { m_desktopEnv = de; }
-    void SetLinuxDistributionInfo(const wxLinuxDistributionInfo& di)
-        { m_ldi = di; }
-
-
     // miscellaneous
     // -----------------
 
@@ -284,13 +239,9 @@ public:
     {
         return m_osVersionMajor != -1 && m_osVersionMinor != -1 &&
                m_os != wxOS_UNKNOWN &&
-               !m_osDesc.IsEmpty() &&
                m_tkVersionMajor != -1 && m_tkVersionMinor != -1 &&
                m_port != wxPORT_UNKNOWN &&
-               m_arch != wxARCH_INVALID &&
-               m_endian != wxENDIAN_INVALID;
-
-               // do not check linux-specific info; it's ok to have them empty
+               m_arch != wxARCH_INVALID && m_endian != wxENDIAN_INVALID;
     }
 
 
@@ -314,16 +265,6 @@ protected:
     // Operating system ID.
     wxOperatingSystemId m_os;
 
-    // Operating system description.
-    wxString m_osDesc;
-
-
-    // linux-specific
-    // -----------------
-
-    wxString m_desktopEnv;
-    wxLinuxDistributionInfo m_ldi;
-
 
     // toolkit
     // -----------------
@@ -342,7 +283,7 @@ protected:
     // others
     // -----------------
 
-    // architecture of the OS/machine
+    // architecture of the OS
     wxArchitecture m_arch;
 
     // endianness of the machine
@@ -360,7 +301,9 @@ protected:
     #define wxWinCE                 wxOS_WINDOWS_CE
     #define wxWIN32S                wxOS_WINDOWS_9X
 
+    #define wxPalmOS                wxPORT_PALMOS
     #define wxOS2                   wxPORT_OS2
+    #define wxMGL                   wxPORT_MGL
     #define wxCocoa                 wxPORT_MAC
     #define wxMac                   wxPORT_MAC
     #define wxMotif                 wxPORT_MOTIF
diff --git a/Source/3rd Party/wx/include/wx/popupwin.h b/Source/3rd Party/wx/include/wx/popupwin.h
index 2ea2d0cf5..c72eafeb6 100644
--- a/Source/3rd Party/wx/include/wx/popupwin.h	
+++ b/Source/3rd Party/wx/include/wx/popupwin.h	
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     06.01.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: popupwin.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_POPUPWIN_H_BASE_
@@ -16,14 +16,14 @@
 
 #if wxUSE_POPUPWIN
 
-#include "wx/nonownedwnd.h"
+#include "wx/window.h"
 
 // ----------------------------------------------------------------------------
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPopupWindowBase : public wxNonOwnedWindow
+class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
@@ -47,7 +47,7 @@ public:
 
     virtual bool IsTopLevel() const { return true; }
 
-    wxDECLARE_NO_COPY_CLASS(wxPopupWindowBase);
+    DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
 };
 
 
@@ -64,10 +64,10 @@ public:
     #include "wx/x11/popupwin.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/popupwin.h"
-#elif defined(__WXDFB__)
-    #include "wx/dfb/popupwin.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/popupwin.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/popupwin.h"
+    #include "wx/mac/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif
@@ -80,7 +80,7 @@ public:
 class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler;
 class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler;
 
-class WXDLLIMPEXP_CORE wxPopupTransientWindow : public wxPopupWindow
+class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 {
 public:
     // ctors
@@ -104,15 +104,12 @@ public:
 
     // called when a mouse is pressed while the popup is shown: return true
     // from here to prevent its normal processing by the popup (which consists
-    // in dismissing it if the mouse is clicked outside it)
+    // in dismissing it if the mouse is cilcked outside it)
     virtual bool ProcessLeftDown(wxMouseEvent& event);
 
     // Overridden to grab the input on some plaforms
     virtual bool Show( bool show = true );
 
-    // Override to implement delayed destruction of this window.
-    virtual bool Destroy();
-
 protected:
     // common part of all ctors
     void Init();
@@ -130,9 +127,8 @@ protected:
     // get alerted when child gets deleted from under us
     void OnDestroy(wxWindowDestroyEvent& event);
 
-#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
-    // Check if the mouse needs to be captured or released: we must release
-    // when it's inside our window if we want the embedded controls to work.
+#if defined( __WXMSW__ ) || defined( __WXMAC__ )
+    // check if the mouse needs captured or released
     void OnIdle(wxIdleEvent& event);
 #endif
 
@@ -152,7 +148,7 @@ protected:
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
-    wxDECLARE_NO_COPY_CLASS(wxPopupTransientWindow);
+    DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
@@ -161,10 +157,10 @@ protected:
 // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_FWD_CORE wxComboBox;
-class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
+class WXDLLEXPORT wxComboBox;
+class WXDLLEXPORT wxComboCtrl;
 
-class WXDLLIMPEXP_CORE wxPopupComboWindow : public wxPopupTransientWindow
+class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
     wxPopupComboWindow() { m_combo = NULL; }
diff --git a/Source/3rd Party/wx/include/wx/position.h b/Source/3rd Party/wx/include/wx/position.h
deleted file mode 100644
index 3dfdd6060..000000000
--- a/Source/3rd Party/wx/include/wx/position.h	
+++ /dev/null
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/position.h
-// Purpose:     Common structure and methods for positional information.
-// Author:      Vadim Zeitlin, Robin Dunn, Brad Anderson, Bryan Petty
-// Created:     2007-03-13
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 The wxWidgets Team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_POSITION_H_
-#define _WX_POSITION_H_
-
-#include "wx/gdicmn.h"
-
-class WXDLLIMPEXP_CORE wxPosition
-{
-public:
-    wxPosition() : m_row(0), m_column(0) {}
-    wxPosition(int row, int col) : m_row(row), m_column(col) {}
-
-    // default copy ctor and assignment operator are okay.
-
-    int GetRow() const          { return m_row; }
-    int GetColumn() const       { return m_column; }
-    int GetCol() const          { return GetColumn(); }
-    void SetRow(int row)        { m_row = row; }
-    void SetColumn(int column)  { m_column = column; }
-    void SetCol(int column)     { SetColumn(column); }
-
-    bool operator==(const wxPosition& p) const
-        { return m_row == p.m_row && m_column == p.m_column; }
-    bool operator!=(const wxPosition& p) const
-        { return !(*this == p); }
-
-    wxPosition& operator+=(const wxPosition& p)
-        { m_row += p.m_row; m_column += p.m_column; return *this; }
-    wxPosition& operator-=(const wxPosition& p)
-        { m_row -= p.m_row; m_column -= p.m_column; return *this; }
-    wxPosition& operator+=(const wxSize& s)
-        { m_row += s.y; m_column += s.x; return *this; }
-    wxPosition& operator-=(const wxSize& s)
-        { m_row -= s.y; m_column -= s.x; return *this; }
-
-    wxPosition operator+(const wxPosition& p) const
-        { return wxPosition(m_row + p.m_row, m_column + p.m_column); }
-    wxPosition operator-(const wxPosition& p) const
-        { return wxPosition(m_row - p.m_row, m_column - p.m_column); }
-    wxPosition operator+(const wxSize& s) const
-        { return wxPosition(m_row + s.y, m_column + s.x); }
-    wxPosition operator-(const wxSize& s) const
-        { return wxPosition(m_row - s.y, m_column - s.x); }
-
-private:
-    int m_row;
-    int m_column;
-};
-
-#endif // _WX_POSITION_H_
-
diff --git a/Source/3rd Party/wx/include/wx/power.h b/Source/3rd Party/wx/include/wx/power.h
index c9c73b2cc..66492cb55 100644
--- a/Source/3rd Party/wx/include/wx/power.h	
+++ b/Source/3rd Party/wx/include/wx/power.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-05-27
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: power.h 48811 2007-09-19 23:11:28Z RD $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -42,16 +42,13 @@ enum wxBatteryState
 // compiling in the code for handling them which is never going to be invoked
 // under the other platforms, we define wxHAS_POWER_EVENTS symbol if this event
 // is available, it should be used to guard all code using wxPowerEvent
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 
 #define wxHAS_POWER_EVENTS
 
 class WXDLLIMPEXP_BASE wxPowerEvent : public wxEvent
 {
 public:
-    wxPowerEvent()            // just for use by wxRTTI
-        : m_veto(false) { }
-
     wxPowerEvent(wxEventType evtType) : wxEvent(wxID_NONE, evtType)
     {
         m_veto = false;
@@ -70,18 +67,23 @@ public:
 private:
     bool m_veto;
 
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPowerEvent)
+#if wxABI_VERSION >= 20806
+    DECLARE_ABSTRACT_CLASS(wxPowerEvent)
+#endif
 };
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDING, wxPowerEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDED, wxPowerEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPEND_CANCEL, wxPowerEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_POWER_RESUME, wxPowerEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDING, 406)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPENDED, 407)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_SUSPEND_CANCEL, 408)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_POWER_RESUME, 444)
+END_DECLARE_EVENT_TYPES()
 
 typedef void (wxEvtHandler::*wxPowerEventFunction)(wxPowerEvent&);
 
 #define wxPowerEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxPowerEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction) \
+        wxStaticCastEvent(wxPowerEventFunction, &func)
 
 #define EVT_POWER_SUSPENDING(func) \
     wx__DECLARE_EVT0(wxEVT_POWER_SUSPENDING, wxPowerEventHandler(func))
diff --git a/Source/3rd Party/wx/include/wx/print.h b/Source/3rd Party/wx/include/wx/print.h
index c78386814..e4cf1e2e7 100644
--- a/Source/3rd Party/wx/include/wx/print.h	
+++ b/Source/3rd Party/wx/include/wx/print.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: print.h 41240 2006-09-15 16:45:48Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,7 @@
 
 #elif defined(__WXMAC__)
 
-#include "wx/osx/printmac.h"
+#include "wx/mac/printmac.h"
 
 #elif defined(__WXPM__)
 
diff --git a/Source/3rd Party/wx/include/wx/printdlg.h b/Source/3rd Party/wx/include/wx/printdlg.h
index 38540df21..4c98d251d 100644
--- a/Source/3rd Party/wx/include/wx/printdlg.h	
+++ b/Source/3rd Party/wx/include/wx/printdlg.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: printdlg.h 41020 2006-09-05 20:47:48Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,7 +26,7 @@
 // wxPrintDialogBase: interface for the dialog for printing
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPrintDialogBase : public wxDialog
+class WXDLLEXPORT wxPrintDialogBase : public wxDialog
 {
 public:
     wxPrintDialogBase() { }
@@ -36,21 +36,21 @@ public:
                       const wxPoint &pos = wxDefaultPosition,
                       const wxSize &size = wxDefaultSize,
                       long style = wxDEFAULT_DIALOG_STYLE);
-
+            
     virtual wxPrintDialogData& GetPrintDialogData() = 0;
     virtual wxPrintData& GetPrintData() = 0;
     virtual wxDC *GetPrintDC() = 0;
-
+    
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintDialogBase)
-    wxDECLARE_NO_COPY_CLASS(wxPrintDialogBase);
+    DECLARE_NO_COPY_CLASS(wxPrintDialogBase)
 };
 
 // ---------------------------------------------------------------------------
 // wxPrintDialog: the dialog for printing.
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPrintDialog : public wxObject
+class WXDLLEXPORT wxPrintDialog : public wxObject
 {
 public:
     wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
@@ -62,20 +62,20 @@ public:
     virtual wxPrintDialogData& GetPrintDialogData();
     virtual wxPrintData& GetPrintData();
     virtual wxDC *GetPrintDC();
-
+    
 private:
     wxPrintDialogBase  *m_pimpl;
-
+    
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
-    wxDECLARE_NO_COPY_CLASS(wxPrintDialog);
+    DECLARE_NO_COPY_CLASS(wxPrintDialog)
 };
 
 // ---------------------------------------------------------------------------
 // wxPageSetupDialogBase: interface for the page setup dialog
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPageSetupDialogBase: public wxDialog
+class WXDLLEXPORT wxPageSetupDialogBase: public wxDialog
 {
 public:
     wxPageSetupDialogBase() { }
@@ -90,14 +90,14 @@ public:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPageSetupDialogBase)
-    wxDECLARE_NO_COPY_CLASS(wxPageSetupDialogBase);
+    DECLARE_NO_COPY_CLASS(wxPageSetupDialogBase)
 };
 
 // ---------------------------------------------------------------------------
 // wxPageSetupDialog: the page setup dialog
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxObject
+class WXDLLEXPORT wxPageSetupDialog: public wxObject
 {
 public:
     wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
@@ -110,10 +110,10 @@ public:
 
 private:
     wxPageSetupDialogBase  *m_pimpl;
-
+    
 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
-    wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);
+    DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/private/browserhack28.h b/Source/3rd Party/wx/include/wx/private/browserhack28.h
new file mode 100644
index 000000000..28d6da71b
--- /dev/null
+++ b/Source/3rd Party/wx/include/wx/private/browserhack28.h	
@@ -0,0 +1,20 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/private/browserhack28.h
+// Purpose:     Allows GUI library to override base wxLaunchDefaultBrowser.
+// Author:      David Elliott
+// Modified by:
+// Created:     2007-08-19
+// RCS-ID:      $Id: browserhack28.h 48184 2007-08-19 19:22:09Z DE $
+// Copyright:   (c) David Elliott
+// Licence:     wxWidgets licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PRIVATE_BROWSERHACK28_H_
+#define _WX_PRIVATE_BROWSERHACK28_H_
+
+typedef bool (*wxLaunchDefaultBrowserImpl_t)(const wxString& url, int flags);
+
+// Function the GUI library can call to provide a better implementation
+WXDLLIMPEXP_BASE void wxSetLaunchDefaultBrowserImpl(wxLaunchDefaultBrowserImpl_t newImpl);
+
+#endif //ndef _WX_PRIVATE_BROWSERHACK28_H_
diff --git a/Source/3rd Party/wx/include/wx/private/fileback.h b/Source/3rd Party/wx/include/wx/private/fileback.h
index 9d9f6d882..1ef8a4305 100644
--- a/Source/3rd Party/wx/include/wx/private/fileback.h	
+++ b/Source/3rd Party/wx/include/wx/private/fileback.h	
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/fileback.h
+// Name:        include/wx/private/fileback.h
 // Purpose:     Back an input stream with memory or a file
 // Author:      Mike Wetherell
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fileback.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 2006 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -75,7 +75,7 @@ private:
     wxBackingFile m_backer;
     wxFileOffset m_pos;
 
-    wxDECLARE_NO_COPY_CLASS(wxBackedInputStream);
+    DECLARE_NO_COPY_CLASS(wxBackedInputStream)
 };
 
 #endif // wxUSE_FILESYSTEM
diff --git a/Source/3rd Party/wx/include/wx/private/filename.h b/Source/3rd Party/wx/include/wx/private/filename.h
index a527fdb88..f25e33c8b 100644
--- a/Source/3rd Party/wx/include/wx/private/filename.h	
+++ b/Source/3rd Party/wx/include/wx/private/filename.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/filename.h
+// Name:        include/wx/private/filename.h
 // Purpose:     Internal declarations for src/common/filename.cpp
 // Author:      Mike Wetherell
 // Modified by:
 // Created:     2006-10-22
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filename.h 42277 2006-10-23 13:10:12Z MW $
 // Copyright:   (c) 2006 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Source/3rd Party/wx/include/wx/private/flagscheck.h b/Source/3rd Party/wx/include/wx/private/flagscheck.h
deleted file mode 100644
index 84386bb14..000000000
--- a/Source/3rd Party/wx/include/wx/private/flagscheck.h	
+++ /dev/null
@@ -1,117 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/flagscheck.h
-// Purpose:     helpers for checking that (bit)flags don't overlap
-// Author:      Vaclav Slavik
-// Created:     2008-02-21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_FLAGSCHECK_H_
-#define _WX_PRIVATE_FLAGSCHECK_H_
-
-#include "wx/debug.h"
-
-// IBM xlC 8 can't parse the template syntax
-#if !defined(__IBMCPP__)
-
-#include "wx/meta/if.h"
-
-namespace wxPrivate
-{
-
-// These templates are used to implement wxADD_FLAG macro below.
-//
-// The idea is that we want to trigger *compilation* error if the flags
-// overlap, not just runtime assert failure. We can't implement the check
-// using just a simple logical operation, we need checks equivalent to this
-// code:
-//
-//   mask = wxFLAG_1;
-//   assert( (mask & wxFLAG_2) == 0 ); // no overlap
-//   mask |= wxFLAG_3;
-//   assert( (mask & wxFLAG_3) == 0 ); // no overlap
-//   mask |= wxFLAG_3;
-//   ...
-//
-// This can be done at compilation time by using templates metaprogramming
-// technique that makes the compiler carry on the computation.
-//
-// NB: If any of this doesn't compile with your compiler and would be too
-//     hard to make work, it's probably best to disable this code and replace
-//     the macros below with empty stubs, this isn't anything critical.
-
-template<int val> struct FlagsHaveConflictingValues
-{
-    // no value here - triggers compilation error
-};
-
-template<int val> struct FlagValue
-{
-    enum { value = val };
-};
-
-// This template adds its template parameter integer 'add' to another integer
-// 'all' and produces their OR-combination (all | add). The result is "stored"
-// as constant SafelyAddToMask<>::value. Combination of many flags is achieved
-// by chaining parameter lists: the 'add' parameter is value member of
-// another (different) SafelyAddToMask<> instantiation.
-template<int all, int add> struct SafelyAddToMask
-{
-    // This typedefs ensures that no flags in the list conflict. If there's
-    // any overlap between the already constructed part of the mask ('all')
-    // and the value being added to it ('add'), the test that is wxIf<>'s
-    // first parameter will be non-zero and so Added value will be
-    // FlagsHaveConflictingValues<add>. The next statement will try to use
-    // AddedValue::value, but there's no such thing in
-    // FlagsHaveConflictingValues<> and so compilation will fail.
-    typedef typename wxIf<(all & add) == 0,
-                          FlagValue<add>,
-                          FlagsHaveConflictingValues<add> >::value
-            AddedValue;
-
-    enum { value = all | AddedValue::value };
-};
-
-} // wxPrivate namespace
-
-
-
-// This macro is used to ensure that no two flags that can be combined in
-// the same integer value have overlapping bits. This is sometimes not entirely
-// trivial to ensure, for example in wxWindow styles or flags for wxSizerItem
-// that span several enums, some of them used for multiple purposes.
-//
-// By constructing allowed flags mask using wxADD_FLAG macro and then using
-// this mask to check flags passed as arguments, you can ensure that
-//
-// a) if any of the allowed flags overlap, you will get compilation error
-// b) if invalid flag is used, there will be an assert at runtime
-//
-// Example usage:
-//
-//   static const int SIZER_FLAGS_MASK =
-//       wxADD_FLAG(wxCENTRE,
-//       wxADD_FLAG(wxHORIZONTAL,
-//       wxADD_FLAG(wxVERTICAL,
-//       ...
-//       0))...);
-//
-// And wherever flags are used:
-//
-//   wxASSERT_VALID_FLAG( m_flag, SIZER_FLAGS_MASK );
-
-#define wxADD_FLAG(f, others) \
-    ::wxPrivate::SafelyAddToMask<f, others>::value
-
-#else
-    #define wxADD_FLAG(f, others) (f | others)
-#endif
-
-// Checks if flags value 'f' is within the mask of allowed values
-#define wxASSERT_VALID_FLAGS(f, mask)                   \
-    wxASSERT_MSG( (f & mask) == f,                      \
-                  "invalid flag: not within " #mask )
-
-#endif // _WX_PRIVATE_FLAGSCHECK_H_
diff --git a/Source/3rd Party/wx/include/wx/private/fswatcher.h b/Source/3rd Party/wx/include/wx/private/fswatcher.h
deleted file mode 100644
index 3b10c41de..000000000
--- a/Source/3rd Party/wx/include/wx/private/fswatcher.h	
+++ /dev/null
@@ -1,92 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/fswatcher.h
-// Purpose:     File system watcher impl classes
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef WX_PRIVATE_FSWATCHER_H_
-#define WX_PRIVATE_FSWATCHER_H_
-
-#include "wx/sharedptr.h"
-
-#ifdef wxHAS_INOTIFY
-    class wxFSWatchEntryUnix;
-    #define wxFSWatchEntry wxFSWatchEntryUnix
-    WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxFSWatchEntry>,wxFSWatchEntries);
-    #include "wx/unix/private/fswatcher_inotify.h"
-#elif defined(wxHAS_KQUEUE)
-    class wxFSWatchEntryKq;
-    #define wxFSWatchEntry wxFSWatchEntryKq
-    WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxFSWatchEntry>,wxFSWatchEntries);
-    #include "wx/unix/private/fswatcher_kqueue.h"
-#elif defined(__WINDOWS__)
-    class wxFSWatchEntryMSW;
-    #define wxFSWatchEntry wxFSWatchEntryMSW
-    WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxFSWatchEntry>,wxFSWatchEntries);
-    #include "wx/msw/private/fswatcher.h"
-#else
-    #define wxFSWatchEntry wxFSWatchEntryPolling
-#endif
-
-class wxFSWatcherImpl
-{
-public:
-    wxFSWatcherImpl(wxFileSystemWatcherBase* watcher) :
-        m_watcher(watcher)
-    {
-    }
-
-    virtual ~wxFSWatcherImpl()
-    {
-        (void) RemoveAll();
-    }
-
-    virtual bool Init() = 0;
-
-    virtual bool Add(const wxFSWatchInfo& winfo)
-    {
-        wxCHECK_MSG( m_watches.find(winfo.GetPath()) == m_watches.end(), false,
-                     "Path '%s' is already watched");
-
-        // construct watch entry
-        wxSharedPtr<wxFSWatchEntry> watch(new wxFSWatchEntry(winfo));
-
-        if (!DoAdd(watch))
-            return false;
-
-        // add watch to our map (always succeedes, checked above)
-        wxFSWatchEntries::value_type val(watch->GetPath(), watch);
-        return m_watches.insert(val).second;
-    }
-
-    virtual bool Remove(const wxFSWatchInfo& winfo)
-    {
-        wxFSWatchEntries::iterator it = m_watches.find(winfo.GetPath());
-        wxCHECK_MSG( it != m_watches.end(), false, "Path '%s' is not watched");
-
-        wxSharedPtr<wxFSWatchEntry> watch = it->second;
-        m_watches.erase(it);
-        return DoRemove(watch);
-    }
-
-    virtual bool RemoveAll()
-    {
-        m_watches.clear();
-        return true;
-    }
-
-protected:
-    virtual bool DoAdd(wxSharedPtr<wxFSWatchEntry> watch) = 0;
-
-    virtual bool DoRemove(wxSharedPtr<wxFSWatchEntry> watch) = 0;
-
-    wxFSWatchEntries m_watches;
-    wxFileSystemWatcherBase* m_watcher;
-};
-
-
-#endif /* WX_PRIVATE_FSWATCHER_H_ */
diff --git a/Source/3rd Party/wx/include/wx/private/graphics.h b/Source/3rd Party/wx/include/wx/private/graphics.h
deleted file mode 100644
index 90636c67a..000000000
--- a/Source/3rd Party/wx/include/wx/private/graphics.h	
+++ /dev/null
@@ -1,169 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/graphics.h
-// Purpose:     private graphics context header
-// Author:      Stefan Csomor
-// Modified by:
-// Created:
-// Copyright:   (c) Stefan Csomor
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GRAPHICS_PRIVATE_H_
-#define _WX_GRAPHICS_PRIVATE_H_
-
-#if wxUSE_GRAPHICS_CONTEXT
-
-#include "wx/graphics.h"
-
-class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData
-{
-    public :
-    wxGraphicsObjectRefData( wxGraphicsRenderer* renderer );
-    wxGraphicsObjectRefData( const wxGraphicsObjectRefData* data );
-    wxGraphicsRenderer* GetRenderer() const ;
-    virtual wxGraphicsObjectRefData* Clone() const ;
-
-    protected :
-    wxGraphicsRenderer* m_renderer;
-} ;
-
-class WXDLLIMPEXP_CORE wxGraphicsBitmapData : public wxGraphicsObjectRefData
-{
-public :
-    wxGraphicsBitmapData( wxGraphicsRenderer* renderer) :
-       wxGraphicsObjectRefData(renderer) {}
-
-       virtual ~wxGraphicsBitmapData() {}
-
-       // returns the native representation
-       virtual void * GetNativeBitmap() const = 0;
-} ;
-
-class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData
-{
-public :
-    wxGraphicsMatrixData( wxGraphicsRenderer* renderer) :
-       wxGraphicsObjectRefData(renderer) {}
-
-       virtual ~wxGraphicsMatrixData() {}
-
-       // concatenates the matrix
-       virtual void Concat( const wxGraphicsMatrixData *t ) = 0;
-
-       // sets the matrix to the respective values
-       virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
-           wxDouble tx=0.0, wxDouble ty=0.0) = 0;
-
-       // gets the component valuess of the matrix
-       virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
-                        wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0;
-
-       // makes this the inverse matrix
-       virtual void Invert() = 0;
-
-       // returns true if the elements of the transformation matrix are equal ?
-       virtual bool IsEqual( const wxGraphicsMatrixData* t) const  = 0;
-
-       // return true if this is the identity matrix
-       virtual bool IsIdentity() const = 0;
-
-       //
-       // transformation
-       //
-
-       // add the translation to this matrix
-       virtual void Translate( wxDouble dx , wxDouble dy ) = 0;
-
-       // add the scale to this matrix
-       virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0;
-
-       // add the rotation to this matrix (radians)
-       virtual void Rotate( wxDouble angle ) = 0;
-
-       //
-       // apply the transforms
-       //
-
-       // applies that matrix to the point
-       virtual void TransformPoint( wxDouble *x, wxDouble *y ) const = 0;
-
-       // applies the matrix except for translations
-       virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const =0;
-
-       // returns the native representation
-       virtual void * GetNativeMatrix() const = 0;
-} ;
-
-class WXDLLIMPEXP_CORE wxGraphicsPathData : public wxGraphicsObjectRefData
-{
-public :
-    wxGraphicsPathData(wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData(renderer) {}
-    virtual ~wxGraphicsPathData() {}
-
-    //
-    // These are the path primitives from which everything else can be constructed
-    //
-
-    // begins a new subpath at (x,y)
-    virtual void MoveToPoint( wxDouble x, wxDouble y ) = 0;
-
-    // adds a straight line from the current point to (x,y)
-    virtual void AddLineToPoint( wxDouble x, wxDouble y ) = 0;
-
-    // adds a cubic Bezier curve from the current point, using two control points and an end point
-    virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) = 0;
-
-    // adds another path
-    virtual void AddPath( const wxGraphicsPathData* path ) =0;
-
-    // closes the current sub-path
-    virtual void CloseSubpath() = 0;
-
-    // gets the last point of the current path, (0,0) if not yet set
-    virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const = 0;
-
-    // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
-    virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) = 0;
-
-    //
-    // These are convenience functions which - if not available natively will be assembled
-    // using the primitives from above
-    //
-
-    // adds a quadratic Bezier curve from the current point, using a control point and an end point
-    virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y );
-
-    // appends a rectangle as a new closed subpath
-    virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
-
-    // appends an ellipsis as a new closed subpath fitting the passed rectangle
-    virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r );
-
-    // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
-    virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ;
-
-    // appends an ellipse
-    virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
-
-    // appends a rounded rectangle
-    virtual void AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius);
-
-    // returns the native path
-    virtual void * GetNativePath() const = 0;
-
-    // give the native path returned by GetNativePath() back (there might be some deallocations necessary)
-    virtual void UnGetNativePath(void *p) const= 0;
-
-    // transforms each point of this path by the matrix
-    virtual void Transform( const wxGraphicsMatrixData* matrix ) =0;
-
-    // gets the bounding box enclosing all points (possibly including control points)
-    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const=0;
-
-    virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const=0;
-};
-
-#endif
-
-#endif // _WX_GRAPHICS_PRIVATE_H_
diff --git a/Source/3rd Party/wx/include/wx/private/markupparser.h b/Source/3rd Party/wx/include/wx/private/markupparser.h
deleted file mode 100644
index 21b98b5d5..000000000
--- a/Source/3rd Party/wx/include/wx/private/markupparser.h	
+++ /dev/null
@@ -1,177 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/markupparser.h
-// Purpose:     Classes for parsing simple markup.
-// Author:      Vadim Zeitlin
-// Created:     2011-02-16
-// RCS-ID:      $Id: $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_MARKUPPARSER_H_
-#define _WX_PRIVATE_MARKUPPARSER_H_
-
-#include "wx/string.h"
-
-// ----------------------------------------------------------------------------
-// wxMarkupSpanAttributes: information about attributes for a markup span.
-// ----------------------------------------------------------------------------
-
-struct wxMarkupSpanAttributes
-{
-    enum OptionalBool
-    {
-        Unspecified = -1,
-        No,
-        Yes
-    };
-
-    wxMarkupSpanAttributes()
-    {
-        m_sizeKind = Size_Unspecified;
-
-        m_isBold =
-        m_isItalic =
-        m_isUnderlined =
-        m_isStrikethrough = Unspecified;
-    }
-
-    // If a string is empty, it means that the corresponding attribute is not
-    // set.
-    wxString m_fgCol,
-             m_bgCol,
-             m_fontFace;
-
-    // There are many ways of specifying the size. First of all, the size may
-    // be relative in which case m_fontSize is either -1 or +1 meaning that
-    // it's one step smaller or larger than the current font. Second, it may be
-    // absolute in which case m_fontSize contains either the size in 1024th of
-    // a point (Pango convention) or its values are in [-3, 3] interval and map
-    // to [xx-small, xx-large] CSS-like font size specification. And finally it
-    // may be not specified at all, of course, in which case the value of
-    // m_fontSize doesn't matter and it shouldn't be used.
-    enum
-    {
-        Size_Unspecified,
-        Size_Relative,
-        Size_Symbolic,
-        Size_PointParts
-    } m_sizeKind;
-    int m_fontSize;
-
-    // If the value is Unspecified, the attribute wasn't given.
-    OptionalBool m_isBold,
-                 m_isItalic,
-                 m_isUnderlined,
-                 m_isStrikethrough;
-};
-
-// ----------------------------------------------------------------------------
-// wxMarkupParserOutput: gathers the results of parsing markup.
-// ----------------------------------------------------------------------------
-
-// A class deriving directly from this one needs to implement all the pure
-// virtual functions below but as the handling of all simple tags (bold, italic
-// &c) is often very similar, it is usually more convenient to inherit from
-// wxMarkupParserFontOutput defined in wx/private/markupparserfont.h instead.
-class wxMarkupParserOutput
-{
-public:
-    wxMarkupParserOutput() { }
-    virtual ~wxMarkupParserOutput() { }
-
-    // Virtual functions called by wxMarkupParser while parsing the markup.
-
-    // Called for a run of normal text.
-    virtual void OnText(const wxString& text) = 0;
-
-    // These functions correspond to the simple tags without parameters.
-    virtual void OnBoldStart() = 0;
-    virtual void OnBoldEnd() = 0;
-
-    virtual void OnItalicStart() = 0;
-    virtual void OnItalicEnd() = 0;
-
-    virtual void OnUnderlinedStart() = 0;
-    virtual void OnUnderlinedEnd() = 0;
-
-    virtual void OnStrikethroughStart() = 0;
-    virtual void OnStrikethroughEnd() = 0;
-
-    virtual void OnBigStart() = 0;
-    virtual void OnBigEnd() = 0;
-
-    virtual void OnSmallStart() = 0;
-    virtual void OnSmallEnd() = 0;
-
-    virtual void OnTeletypeStart() = 0;
-    virtual void OnTeletypeEnd() = 0;
-
-    // The generic span start and end functions.
-    virtual void OnSpanStart(const wxMarkupSpanAttributes& attrs) = 0;
-    virtual void OnSpanEnd(const wxMarkupSpanAttributes& attrs) = 0;
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxMarkupParserOutput);
-};
-
-// ----------------------------------------------------------------------------
-// wxMarkupParser: parses the given markup text into wxMarkupParserOutput.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMarkupParser
-{
-public:
-    // Initialize the parser with the object that will receive parsing results.
-    // This object lifetime must be greater than ours.
-    explicit wxMarkupParser(wxMarkupParserOutput& output)
-        : m_output(output)
-    {
-    }
-
-    // Parse the entire string and call wxMarkupParserOutput methods.
-    //
-    // Return true if the string was successfully parsed or false if it failed
-    // (presumably because of syntax errors in the markup).
-    bool Parse(const wxString& text);
-
-    // Quote a normal string, not meant to be interpreted as markup, so that it
-    // produces the same string when parsed as markup. This means, for example,
-    // replacing '<' in the input string with "&lt;" to prevent them from being
-    // interpreted as tag opening characters.
-    static wxString Quote(const wxString& text);
-
-    // Strip markup from a string, i.e. simply remove all tags and replace
-    // XML entities with their values (or with "&&" in case of "&amp;" to
-    // prevent it from being interpreted as mnemonic marker).
-    static wxString Strip(const wxString& text);
-
-private:
-    // Simple struct combining the name of a tag and its attributes.
-    struct TagAndAttrs
-    {
-        TagAndAttrs(const wxString& name_) : name(name_) { }
-
-        wxString name;
-        wxMarkupSpanAttributes attrs;
-    };
-
-    // Call the wxMarkupParserOutput method corresponding to the given tag.
-    //
-    // Return false if the tag doesn't match any of the known ones.
-    bool OutputTag(const TagAndAttrs& tagAndAttrs, bool start);
-
-    // Parse the attributes and fill the provided TagAndAttrs object with the
-    // information about them. Does nothing if attrs string is empty.
-    //
-    // Returns empty string on success of a [fragment of an] error message if
-    // we failed to parse the attributes.
-    wxString ParseAttrs(wxString attrs, TagAndAttrs& tagAndAttrs);
-
-
-    wxMarkupParserOutput& m_output;
-
-    wxDECLARE_NO_COPY_CLASS(wxMarkupParser);
-};
-
-#endif // _WX_PRIVATE_MARKUPPARSER_H_
diff --git a/Source/3rd Party/wx/include/wx/private/markupparserattr.h b/Source/3rd Party/wx/include/wx/private/markupparserattr.h
deleted file mode 100644
index b1c7d50a2..000000000
--- a/Source/3rd Party/wx/include/wx/private/markupparserattr.h	
+++ /dev/null
@@ -1,232 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/markupparserattr.h
-// Purpose:     Classes mapping markup attributes to wxFont/wxColour.
-// Author:      Vadim Zeitlin
-// Created:     2011-02-18
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_MARKUPPARSERATTR_H_
-#define _WX_PRIVATE_MARKUPPARSERATTR_H_
-
-#include "wx/private/markupparser.h"
-
-#include "wx/stack.h"
-
-#include "wx/colour.h"
-#include "wx/font.h"
-
-// ----------------------------------------------------------------------------
-// wxMarkupParserAttrOutput: simplified wxFont-using version of the above.
-// ----------------------------------------------------------------------------
-
-// This class assumes that wxFont and wxColour are used to perform all the
-// markup tags and implements the base class virtual functions in terms of
-// OnAttr{Start,End}() only.
-//
-// Notice that you still must implement OnText() inherited from the base class
-// when deriving from this one.
-class wxMarkupParserAttrOutput : public wxMarkupParserOutput
-{
-public:
-    // A simple container of font and colours.
-    struct Attr
-    {
-        Attr(const wxFont& font_,
-             const wxColour& foreground_ = wxColour(),
-             const wxColour& background_ = wxColour())
-            : font(font_), foreground(foreground_), background(background_)
-        {
-        }
-
-        wxFont font;
-        wxColour foreground,
-                 background;
-    };
-
-
-    // This object must be initialized with the font and colours to use
-    // initially, i.e. the ones used before any tags in the string.
-    wxMarkupParserAttrOutput(const wxFont& font,
-                             const wxColour& foreground,
-                             const wxColour& background)
-    {
-        m_attrs.push(Attr(font, foreground, background));
-    }
-
-    // Indicates the change of the font and/or colours used. Any of the
-    // fields of the argument may be invalid indicating that the corresponding
-    // attribute didn't actually change.
-    virtual void OnAttrStart(const Attr& attr) = 0;
-
-    // Indicates the end of the region affected by the given attributes
-    // (the same ones that were passed to the matching OnAttrStart(), use
-    // GetAttr() to get the ones that will be used from now on).
-    virtual void OnAttrEnd(const Attr& attr) = 0;
-
-
-    // Implement all pure virtual methods inherited from the base class in
-    // terms of our own ones.
-    virtual void OnBoldStart() { DoChangeFont(&wxFont::Bold); }
-    virtual void OnBoldEnd() { DoEndAttr(); }
-
-    virtual void OnItalicStart() { DoChangeFont(&wxFont::Italic); }
-    virtual void OnItalicEnd() { DoEndAttr(); }
-
-    virtual void OnUnderlinedStart() { DoChangeFont(&wxFont::Underlined); }
-    virtual void OnUnderlinedEnd() { DoEndAttr(); }
-
-    virtual void OnStrikethroughStart() { DoChangeFont(&wxFont::Strikethrough); }
-    virtual void OnStrikethroughEnd() { DoEndAttr(); }
-
-    virtual void OnBigStart() { DoChangeFont(&wxFont::Larger); }
-    virtual void OnBigEnd() { DoEndAttr(); }
-
-    virtual void OnSmallStart() { DoChangeFont(&wxFont::Smaller); }
-    virtual void OnSmallEnd() { DoEndAttr(); }
-
-    virtual void OnTeletypeStart()
-    {
-        wxFont font(GetFont());
-        font.SetFamily(wxFONTFAMILY_TELETYPE);
-        DoSetFont(font);
-    }
-    virtual void OnTeletypeEnd() { DoEndAttr(); }
-
-    virtual void OnSpanStart(const wxMarkupSpanAttributes& spanAttr)
-    {
-        wxFont font(GetFont());
-        if ( !spanAttr.m_fontFace.empty() )
-            font.SetFaceName(spanAttr.m_fontFace);
-
-        FontModifier<wxFontWeight>()(spanAttr.m_isBold,
-                                     font, &wxFont::SetWeight,
-                                     wxFONTWEIGHT_NORMAL, wxFONTWEIGHT_BOLD);
-
-        FontModifier<wxFontStyle>()(spanAttr.m_isItalic,
-                                    font, &wxFont::SetStyle,
-                                    wxFONTSTYLE_NORMAL, wxFONTSTYLE_ITALIC);
-
-        FontModifier<bool>()(spanAttr.m_isUnderlined,
-                             font, &wxFont::SetUnderlined,
-                             false, true);
-
-        // TODO: No support for strike-through yet.
-
-        switch ( spanAttr.m_sizeKind )
-        {
-            case wxMarkupSpanAttributes::Size_Unspecified:
-                break;
-
-            case wxMarkupSpanAttributes::Size_Relative:
-                if ( spanAttr.m_fontSize > 0 )
-                    font.MakeLarger();
-                else
-                    font.MakeSmaller();
-                break;
-
-            case wxMarkupSpanAttributes::Size_Symbolic:
-                // The values of font size intentionally coincide with the
-                // values of wxFontSymbolicSize enum elements so simply cast
-                // one to the other.
-                font.SetSymbolicSize(
-                    static_cast<wxFontSymbolicSize>(spanAttr.m_fontSize)
-                );
-                break;
-
-            case wxMarkupSpanAttributes::Size_PointParts:
-                font.SetPointSize((spanAttr.m_fontSize + 1023)/1024);
-                break;
-        }
-
-
-        const Attr attr(font, spanAttr.m_fgCol, spanAttr.m_bgCol);
-        OnAttrStart(attr);
-
-        m_attrs.push(attr);
-    }
-
-    virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(spanAttr))
-    {
-        DoEndAttr();
-    }
-
-protected:
-    // Get the current attributes, i.e. the ones that should be used for
-    // rendering (or measuring or whatever) the text at the current position in
-    // the string.
-    //
-    // It may be called from OnAttrStart() to get the old attributes used
-    // before and from OnAttrEnd() to get the new attributes that will be used
-    // from now on but is mostly meant to be used from overridden OnText()
-    // implementations.
-    const Attr& GetAttr() const { return m_attrs.top(); }
-
-    // A shortcut for accessing the font of the current attribute.
-    const wxFont& GetFont() const { return GetAttr().font; }
-
-private:
-    // Change only the font to the given one. Call OnAttrStart() to notify
-    // about the change and update the attributes stack.
-    void DoSetFont(const wxFont& font)
-    {
-        const Attr attr(font);
-
-        OnAttrStart(attr);
-
-        m_attrs.push(attr);
-    }
-
-    // Apply the given function to the font currently on top of the font stack,
-    // push the new font on the stack and call OnAttrStart() with it.
-    void DoChangeFont(wxFont (wxFont::*func)() const)
-    {
-        DoSetFont((GetFont().*func)());
-    }
-
-    void DoEndAttr()
-    {
-        const Attr attr(m_attrs.top());
-        m_attrs.pop();
-
-        OnAttrEnd(attr);
-    }
-
-    // A helper class used to apply the given function to a wxFont object
-    // depending on the value of an OptionalBool.
-    template <typename T>
-    struct FontModifier
-    {
-        FontModifier() { }
-
-        void operator()(wxMarkupSpanAttributes::OptionalBool isIt,
-                        wxFont& font,
-                        void (wxFont::*func)(T),
-                        T noValue,
-                        T yesValue)
-        {
-            switch ( isIt )
-            {
-                case wxMarkupSpanAttributes::Unspecified:
-                    break;
-
-                case wxMarkupSpanAttributes::No:
-                    (font.*func)(noValue);
-                    break;
-
-                case wxMarkupSpanAttributes::Yes:
-                    (font.*func)(yesValue);
-                    break;
-            }
-        }
-    };
-
-
-    wxStack<Attr> m_attrs;
-
-    wxDECLARE_NO_COPY_CLASS(wxMarkupParserAttrOutput);
-};
-
-#endif // _WX_PRIVATE_MARKUPPARSERATTR_H_
diff --git a/Source/3rd Party/wx/include/wx/private/overlay.h b/Source/3rd Party/wx/include/wx/private/overlay.h
index f7eff9ccb..9203503ce 100644
--- a/Source/3rd Party/wx/include/wx/private/overlay.h	
+++ b/Source/3rd Party/wx/include/wx/private/overlay.h	
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-20
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: overlay.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,7 @@
 #ifdef wxHAS_NATIVE_OVERLAY
 
 #if defined(__WXMAC__)
-    #include "wx/osx/carbon/private/overlay.h"
+    #include "wx/mac/carbon/private/overlay.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/private/overlay.h"
 #else
@@ -45,13 +45,13 @@ public:
     // returns true if it has been setup
     bool IsOk();
 
-    void Init(wxDC* dc, int x , int y , int width , int height);
+    void Init(wxWindowDC* dc, int x , int y , int width , int height);
 
-    void BeginDrawing(wxDC* dc);
+    void BeginDrawing(wxWindowDC* dc);
 
-    void EndDrawing(wxDC* dc);
+    void EndDrawing(wxWindowDC* dc);
 
-    void Clear(wxDC* dc);
+    void Clear(wxWindowDC* dc);
 
 private:
     wxBitmap m_bmpSaved ;
@@ -59,8 +59,13 @@ private:
     int m_y ;
     int m_width ;
     int m_height ;
+// this is to enable wxMOTIF and UNIV to compile....
+// currently (10 oct 06) we don't use m_window
+// ce - how do we fix this
+#if defined(__WXGTK__) || defined(__WXMSW__)
     wxWindow* m_window ;
-};
+#endif
+} ;
 
 #endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY
 
diff --git a/Source/3rd Party/wx/include/wx/private/threadinfo.h b/Source/3rd Party/wx/include/wx/private/threadinfo.h
deleted file mode 100644
index e227bf47a..000000000
--- a/Source/3rd Party/wx/include/wx/private/threadinfo.h	
+++ /dev/null
@@ -1,54 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/threadinfo.h
-// Purpose:     declaration of wxThreadSpecificInfo: thread-specific information
-// Author:      Vadim Zeitlin
-// Created:     2009-07-13
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_THREADINFO_H_
-#define _WX_PRIVATE_THREADINFO_H_
-
-#if wxUSE_THREADS
-
-#include "wx/tls.h"
-
-class WXDLLIMPEXP_FWD_BASE wxLog;
-
-// ----------------------------------------------------------------------------
-// wxThreadSpecificInfo: contains all thread-specific information used by wx
-// ----------------------------------------------------------------------------
-
-// currently the only thread-specific information we use is the active wxLog
-// target but more could be added in the future (e.g. current wxLocale would be
-// a likely candidate) and we will group all of them in this struct to avoid
-// consuming more TLS slots than necessary as there is only a limited number of
-// them
-
-// NB: this must be a POD to be stored in TLS
-struct wxThreadSpecificInfo
-{
-    // the thread-specific logger or NULL if the thread is using the global one
-    // (this is not used for the main thread which always uses the global
-    // logger)
-    wxLog *logger;
-
-    // true if logging is currently disabled for this thread (this is also not
-    // used for the main thread which uses wxLog::ms_doLog)
-    //
-    // NB: we use a counter-intuitive "disabled" flag instead of "enabled" one
-    //     because the default, for 0-initialized struct, should be to enable
-    //     logging
-    bool loggingDisabled;
-};
-
-// currently this is defined in src/common/log.cpp
-extern wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar;
-#define wxThreadInfo wxTLS_VALUE(wxThreadInfoVar)
-
-#endif // wxUSE_THREADS
-
-#endif // _WX_PRIVATE_THREADINFO_H_
-
diff --git a/Source/3rd Party/wx/include/wx/private/timer.h b/Source/3rd Party/wx/include/wx/private/timer.h
deleted file mode 100644
index 63e032a8a..000000000
--- a/Source/3rd Party/wx/include/wx/private/timer.h	
+++ /dev/null
@@ -1,73 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/timer.h
-// Purpose:     Base class for wxTimer implementations
-// Author:      Lukasz Michalski <lmichalski@sf.net>
-// Created:     31.10.2006
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006-2007 wxWidgets dev team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TIMERIMPL_H_BASE_
-#define _WX_TIMERIMPL_H_BASE_
-
-#include "wx/defs.h"
-#include "wx/event.h"
-#include "wx/timer.h"
-
-// ----------------------------------------------------------------------------
-// wxTimerImpl: abstract base class for wxTimer implementations
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxTimerImpl
-{
-public:
-    // default ctor, SetOwner() must be called after it (wxTimer does it)
-    wxTimerImpl(wxTimer *owner);
-
-    // this must be called initially but may be also called later
-    void SetOwner(wxEvtHandler *owner, int timerid);
-
-    // empty but virtual base class dtor, the caller is responsible for
-    // stopping the timer before it's destroyed (it can't be done from here as
-    // it's too late)
-    virtual ~wxTimerImpl() { }
-
-
-    // start the timer. When overriding call base version first.
-    virtual bool Start(int milliseconds = -1, bool oneShot = false);
-
-    // stop the timer, only called if the timer is really running (unlike
-    // wxTimer::Stop())
-    virtual void Stop() = 0;
-
-    // return true if the timer is running
-    virtual bool IsRunning() const = 0;
-
-    // this should be called by the port-specific code when the timer expires
-    virtual void Notify() { m_timer->Notify(); }
-
-    // the default implementation of wxTimer::Notify(): generate a wxEVT_TIMER
-    void SendEvent();
-
-
-    // accessors for wxTimer:
-    wxEvtHandler *GetOwner() const { return m_owner; }
-    int GetId() const { return m_idTimer; }
-    int GetInterval() const { return m_milli; }
-    bool IsOneShot() const { return m_oneShot; }
-
-protected:
-    wxTimer *m_timer;
-
-    wxEvtHandler *m_owner;
-
-    int     m_idTimer;      // id passed to wxTimerEvent
-    int     m_milli;        // the timer interval
-    bool    m_oneShot;      // true if one shot
-
-
-    wxDECLARE_NO_COPY_CLASS(wxTimerImpl);
-};
-
-#endif // _WX_TIMERIMPL_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/private/window.h b/Source/3rd Party/wx/include/wx/private/window.h
deleted file mode 100644
index 46f01c818..000000000
--- a/Source/3rd Party/wx/include/wx/private/window.h	
+++ /dev/null
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/window.h
-// Purpose:     misc wxWindow helpers
-// Author:      Vaclav Slavik
-// Created:     2010-01-21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_WINDOW_H_
-#define _WX_PRIVATE_WINDOW_H_
-
-#include "wx/gdicmn.h"
-
-namespace wxPrivate
-{
-
-// Windows' computes dialog units using average character width over upper-
-// and lower-case ASCII alphabet and not using the average character width
-// metadata stored in the font; see
-// http://support.microsoft.com/default.aspx/kb/145994 for detailed discussion.
-//
-// This helper function computes font dimensions in the same way. It works with
-// either wxDC or wxWindow argument.
-template<typename T>
-inline wxSize GetAverageASCIILetterSize(const T& of_what)
-{
-    const wxStringCharType *TEXT_TO_MEASURE =
-        wxS("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
-
-    wxSize s = of_what.GetTextExtent(TEXT_TO_MEASURE);
-    s.x = (s.x / 26 + 1) / 2;
-    return s;
-}
-
-} // namespace wxPrivate
-
-#endif // _WX_PRIVATE_WINDOW_H_
diff --git a/Source/3rd Party/wx/include/wx/private/wxprintf.h b/Source/3rd Party/wx/include/wx/private/wxprintf.h
deleted file mode 100644
index 1cee5026e..000000000
--- a/Source/3rd Party/wx/include/wx/private/wxprintf.h	
+++ /dev/null
@@ -1,935 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/private/wxprintf.h
-// Purpose:     wxWidgets wxPrintf() implementation
-// Author:      Ove Kaven
-// Modified by: Ron Lee, Francesco Montorsi
-// Created:     09/04/99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets copyright
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_WXPRINTF_H_
-#define _WX_PRIVATE_WXPRINTF_H_
-
-// ---------------------------------------------------------------------------
-// headers and macros
-// ---------------------------------------------------------------------------
-
-#include "wx/crt.h"
-#include "wx/log.h"
-#include "wx/utils.h"
-
-#include <string.h>
-
-// prefer snprintf over sprintf
-#if defined(__VISUALC__) || \
-        (defined(__BORLANDC__) && __BORLANDC__ >= 0x540)
-    #define system_sprintf(buff, max, flags, data)      \
-        ::_snprintf(buff, max, flags, data)
-#elif defined(HAVE_SNPRINTF)
-    #define system_sprintf(buff, max, flags, data)      \
-        ::snprintf(buff, max, flags, data)
-#else       // NB: at least sprintf() should always be available
-    // since 'max' is not used in this case, wxVsnprintf() should always
-    // ensure that 'buff' is big enough for all common needs
-    // (see wxMAX_SVNPRINTF_FLAGBUFFER_LEN and wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN)
-    #define system_sprintf(buff, max, flags, data)      \
-        ::sprintf(buff, flags, data)
-
-    #define SYSTEM_SPRINTF_IS_UNSAFE
-#endif
-
-// ---------------------------------------------------------------------------
-// printf format string parsing
-// ---------------------------------------------------------------------------
-
-// some limits of our implementation
-#define wxMAX_SVNPRINTF_ARGUMENTS         64
-#define wxMAX_SVNPRINTF_FLAGBUFFER_LEN    32
-#define wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN   512
-
-
-// the conversion specifiers accepted by wxCRT_VsnprintfW
-enum wxPrintfArgType
-{
-    wxPAT_INVALID = -1,
-
-    wxPAT_INT,          // %d, %i, %o, %u, %x, %X
-    wxPAT_LONGINT,      // %ld, etc
-#ifdef wxLongLong_t
-    wxPAT_LONGLONGINT,  // %Ld, etc
-#endif
-    wxPAT_SIZET,        // %zd, etc
-
-    wxPAT_DOUBLE,       // %e, %E, %f, %g, %G
-    wxPAT_LONGDOUBLE,   // %le, etc
-
-    wxPAT_POINTER,      // %p
-
-    wxPAT_CHAR,         // %hc  (in ANSI mode: %c, too)
-    wxPAT_WCHAR,        // %lc  (in Unicode mode: %c, too)
-
-    wxPAT_PCHAR,        // %s   (related to a char *)
-    wxPAT_PWCHAR,       // %s   (related to a wchar_t *)
-
-    wxPAT_NINT,         // %n
-    wxPAT_NSHORTINT,    // %hn
-    wxPAT_NLONGINT,     // %ln
-
-    wxPAT_STAR          // '*' used for width or precision
-};
-
-// an argument passed to wxCRT_VsnprintfW
-union wxPrintfArg
-{
-    int pad_int;                        //  %d, %i, %o, %u, %x, %X
-    long int pad_longint;               // %ld, etc
-#ifdef wxLongLong_t
-    wxLongLong_t pad_longlongint;       // %Ld, etc
-#endif
-    size_t pad_sizet;                   // %zd, etc
-
-    double pad_double;                  // %e, %E, %f, %g, %G
-    long double pad_longdouble;         // %le, etc
-
-    void *pad_pointer;                  // %p
-
-    char pad_char;                      // %hc  (in ANSI mode: %c, too)
-    wchar_t pad_wchar;                  // %lc  (in Unicode mode: %c, too)
-
-    void *pad_str;                      // %s
-
-    int *pad_nint;                      // %n
-    short int *pad_nshortint;           // %hn
-    long int *pad_nlongint;             // %ln
-};
-
-// helper for converting string into either char* or wchar_t* depending
-// on the type of wxPrintfConvSpec<T> instantiation:
-template<typename CharType> struct wxPrintfStringHelper {};
-
-template<> struct wxPrintfStringHelper<char>
-{
-    typedef const wxWX2MBbuf ConvertedType;
-    static ConvertedType Convert(const wxString& s) { return s.mb_str(); }
-};
-
-template<> struct wxPrintfStringHelper<wchar_t>
-{
-    typedef const wxWX2WCbuf ConvertedType;
-    static ConvertedType Convert(const wxString& s) { return s.wc_str(); }
-};
-
-
-// Contains parsed data relative to a conversion specifier given to
-// wxCRT_VsnprintfW and parsed from the format string
-// NOTE: in C++ there is almost no difference between struct & classes thus
-//       there is no performance gain by using a struct here...
-template<typename CharType>
-class wxPrintfConvSpec
-{
-public:
-
-    // the position of the argument relative to this conversion specifier
-    size_t m_pos;
-
-    // the type of this conversion specifier
-    wxPrintfArgType m_type;
-
-    // the minimum and maximum width
-    // when one of this var is set to -1 it means: use the following argument
-    // in the stack as minimum/maximum width for this conversion specifier
-    int m_nMinWidth, m_nMaxWidth;
-
-    // does the argument need to the be aligned to left ?
-    bool m_bAlignLeft;
-
-    // pointer to the '%' of this conversion specifier in the format string
-    // NOTE: this points somewhere in the string given to the Parse() function -
-    //       it's task of the caller ensure that memory is still valid !
-    const CharType *m_pArgPos;
-
-    // pointer to the last character of this conversion specifier in the
-    // format string
-    // NOTE: this points somewhere in the string given to the Parse() function -
-    //       it's task of the caller ensure that memory is still valid !
-    const CharType *m_pArgEnd;
-
-    // a little buffer where formatting flags like #+\.hlqLz are stored by Parse()
-    // for use in Process()
-    char m_szFlags[wxMAX_SVNPRINTF_FLAGBUFFER_LEN];
-
-
-public:
-
-    // we don't declare this as a constructor otherwise it would be called
-    // automatically and we don't want this: to be optimized, wxCRT_VsnprintfW
-    // calls this function only on really-used instances of this class.
-    void Init();
-
-    // Parses the first conversion specifier in the given string, which must
-    // begin with a '%'. Returns false if the first '%' does not introduce a
-    // (valid) conversion specifier and thus should be ignored.
-    bool Parse(const CharType *format);
-
-    // Process this conversion specifier and puts the result in the given
-    // buffer. Returns the number of characters written in 'buf' or -1 if
-    // there's not enough space.
-    int Process(CharType *buf, size_t lenMax, wxPrintfArg *p, size_t written);
-
-    // Loads the argument of this conversion specifier from given va_list.
-    bool LoadArg(wxPrintfArg *p, va_list &argptr);
-
-private:
-    // An helper function of LoadArg() which is used to handle the '*' flag
-    void ReplaceAsteriskWith(int w);
-};
-
-template<typename CharType>
-void wxPrintfConvSpec<CharType>::Init()
-{
-    m_nMinWidth = 0;
-    m_nMaxWidth = 0xFFFF;
-    m_pos = 0;
-    m_bAlignLeft = false;
-    m_pArgPos = m_pArgEnd = NULL;
-    m_type = wxPAT_INVALID;
-
-    memset(m_szFlags, 0, sizeof(m_szFlags));
-    // this character will never be removed from m_szFlags array and
-    // is important when calling sprintf() in wxPrintfConvSpec::Process() !
-    m_szFlags[0] = '%';
-}
-
-template<typename CharType>
-bool wxPrintfConvSpec<CharType>::Parse(const CharType *format)
-{
-    bool done = false;
-
-    // temporary parse data
-    size_t flagofs = 1;
-    bool in_prec,       // true if we found the dot in some previous iteration
-         prec_dot;      // true if the dot has been already added to m_szFlags
-    int ilen = 0;
-
-    m_bAlignLeft = in_prec = prec_dot = false;
-    m_pArgPos = m_pArgEnd = format;
-    do
-    {
-#define CHECK_PREC \
-        if (in_prec && !prec_dot) \
-        { \
-            m_szFlags[flagofs++] = '.'; \
-            prec_dot = true; \
-        }
-
-        // what follows '%'?
-        const CharType ch = *(++m_pArgEnd);
-        switch ( ch )
-        {
-            case wxT('\0'):
-                return false;       // not really an argument
-
-            case wxT('%'):
-                return false;       // not really an argument
-
-            case wxT('#'):
-            case wxT('0'):
-            case wxT(' '):
-            case wxT('+'):
-            case wxT('\''):
-                CHECK_PREC
-                m_szFlags[flagofs++] = char(ch);
-                break;
-
-            case wxT('-'):
-                CHECK_PREC
-                m_bAlignLeft = true;
-                m_szFlags[flagofs++] = char(ch);
-                break;
-
-            case wxT('.'):
-                // don't use CHECK_PREC here to avoid warning about the value
-                // assigned to prec_dot inside it being never used (because
-                // overwritten just below) from Borland in release build
-                if (in_prec && !prec_dot)
-                    m_szFlags[flagofs++] = '.';
-                in_prec = true;
-                prec_dot = false;
-                m_nMaxWidth = 0;
-                // dot will be auto-added to m_szFlags if non-negative
-                // number follows
-                break;
-
-            case wxT('h'):
-                ilen = -1;
-                CHECK_PREC
-                m_szFlags[flagofs++] = char(ch);
-                break;
-
-            case wxT('l'):
-                // NB: it's safe to use flagofs-1 as flagofs always start from 1
-                if (m_szFlags[flagofs-1] == 'l')       // 'll' modifier is the same as 'L' or 'q'
-                    ilen = 2;
-                else
-                ilen = 1;
-                CHECK_PREC
-                m_szFlags[flagofs++] = char(ch);
-                break;
-
-            case wxT('q'):
-            case wxT('L'):
-                ilen = 2;
-                CHECK_PREC
-                m_szFlags[flagofs++] = char(ch);
-                break;
-#ifdef __WINDOWS__
-            // under Windows we support the special '%I64' notation as longlong
-            // integer conversion specifier for MSVC compatibility
-            // (it behaves exactly as '%lli' or '%Li' or '%qi')
-            case wxT('I'):
-                if (*(m_pArgEnd+1) == wxT('6') &&
-                    *(m_pArgEnd+2) == wxT('4'))
-                {
-                    m_pArgEnd++;
-                    m_pArgEnd++;
-
-                    ilen = 2;
-                    CHECK_PREC
-                    m_szFlags[flagofs++] = char(ch);
-                    m_szFlags[flagofs++] = '6';
-                    m_szFlags[flagofs++] = '4';
-                    break;
-                }
-                // else: fall-through, 'I' is MSVC equivalent of C99 'z'
-#endif      // __WINDOWS__
-
-            case wxT('z'):
-            case wxT('Z'):
-                // 'z' is C99 standard for size_t and ptrdiff_t, 'Z' was used
-                // for this purpose in libc5 and by wx <= 2.8
-                ilen = 3;
-                CHECK_PREC
-                m_szFlags[flagofs++] = char(ch);
-                break;
-
-            case wxT('*'):
-                if (in_prec)
-                {
-                    CHECK_PREC
-
-                    // tell Process() to use the next argument
-                    // in the stack as maxwidth...
-                    m_nMaxWidth = -1;
-                }
-                else
-                {
-                    // tell Process() to use the next argument
-                    // in the stack as minwidth...
-                    m_nMinWidth = -1;
-                }
-
-                // save the * in our formatting buffer...
-                // will be replaced later by Process()
-                m_szFlags[flagofs++] = char(ch);
-                break;
-
-            case wxT('1'): case wxT('2'): case wxT('3'):
-            case wxT('4'): case wxT('5'): case wxT('6'):
-            case wxT('7'): case wxT('8'): case wxT('9'):
-                {
-                    int len = 0;
-                    CHECK_PREC
-                    while ( (*m_pArgEnd >= CharType('0')) &&
-                            (*m_pArgEnd <= CharType('9')) )
-                    {
-                        m_szFlags[flagofs++] = char(*m_pArgEnd);
-                        len = len*10 + (*m_pArgEnd - wxT('0'));
-                        m_pArgEnd++;
-                    }
-
-                    if (in_prec)
-                        m_nMaxWidth = len;
-                    else
-                        m_nMinWidth = len;
-
-                    m_pArgEnd--; // the main loop pre-increments n again
-                }
-                break;
-
-            case wxT('$'):      // a positional parameter (e.g. %2$s) ?
-                {
-                    if (m_nMinWidth <= 0)
-                        break;      // ignore this formatting flag as no
-                                    // numbers are preceding it
-
-                    // remove from m_szFlags all digits previously added
-                    do {
-                        flagofs--;
-                    } while (m_szFlags[flagofs] >= '1' &&
-                             m_szFlags[flagofs] <= '9');
-
-                    // re-adjust the offset making it point to the
-                    // next free char of m_szFlags
-                    flagofs++;
-
-                    m_pos = m_nMinWidth;
-                    m_nMinWidth = 0;
-                }
-                break;
-
-            case wxT('d'):
-            case wxT('i'):
-            case wxT('o'):
-            case wxT('u'):
-            case wxT('x'):
-            case wxT('X'):
-                CHECK_PREC
-                m_szFlags[flagofs++] = char(ch);
-                if (ilen == 0)
-                    m_type = wxPAT_INT;
-                else if (ilen == -1)
-                    // NB: 'short int' value passed through '...'
-                    //      is promoted to 'int', so we have to get
-                    //      an int from stack even if we need a short
-                    m_type = wxPAT_INT;
-                else if (ilen == 1)
-                    m_type = wxPAT_LONGINT;
-                else if (ilen == 2)
-#ifdef wxLongLong_t
-                    m_type = wxPAT_LONGLONGINT;
-#else // !wxLongLong_t
-                    m_type = wxPAT_LONGINT;
-#endif // wxLongLong_t/!wxLongLong_t
-                else if (ilen == 3)
-                    m_type = wxPAT_SIZET;
-                done = true;
-                break;
-
-            case wxT('e'):
-            case wxT('E'):
-            case wxT('f'):
-            case wxT('g'):
-            case wxT('G'):
-                CHECK_PREC
-                m_szFlags[flagofs++] = char(ch);
-                if (ilen == 2)
-                    m_type = wxPAT_LONGDOUBLE;
-                else
-                    m_type = wxPAT_DOUBLE;
-                done = true;
-                break;
-
-            case wxT('p'):
-                m_type = wxPAT_POINTER;
-                m_szFlags[flagofs++] = char(ch);
-                done = true;
-                break;
-
-            case wxT('c'):
-                if (ilen == -1)
-                {
-                    // in Unicode mode %hc == ANSI character
-                    // and in ANSI mode, %hc == %c == ANSI...
-                    m_type = wxPAT_CHAR;
-                }
-                else if (ilen == 1)
-                {
-                    // in ANSI mode %lc == Unicode character
-                    // and in Unicode mode, %lc == %c == Unicode...
-                    m_type = wxPAT_WCHAR;
-                }
-                else
-                {
-#if wxUSE_UNICODE
-                    // in Unicode mode, %c == Unicode character
-                    m_type = wxPAT_WCHAR;
-#else
-                    // in ANSI mode, %c == ANSI character
-                    m_type = wxPAT_CHAR;
-#endif
-                }
-                done = true;
-                break;
-
-            case wxT('s'):
-                if (ilen == -1)
-                {
-                    // Unicode mode wx extension: we'll let %hs mean non-Unicode
-                    // strings (when in ANSI mode, %s == %hs == ANSI string)
-                    m_type = wxPAT_PCHAR;
-                }
-                else if (ilen == 1)
-                {
-                    // in Unicode mode, %ls == %s == Unicode string
-                    // in ANSI mode, %ls == Unicode string
-                    m_type = wxPAT_PWCHAR;
-                }
-                else
-                {
-#if wxUSE_UNICODE
-                    m_type = wxPAT_PWCHAR;
-#else
-                    m_type = wxPAT_PCHAR;
-#endif
-                }
-                done = true;
-                break;
-
-            case wxT('n'):
-                if (ilen == 0)
-                    m_type = wxPAT_NINT;
-                else if (ilen == -1)
-                    m_type = wxPAT_NSHORTINT;
-                else if (ilen >= 1)
-                    m_type = wxPAT_NLONGINT;
-                done = true;
-                break;
-
-            default:
-                // bad format, don't consider this an argument;
-                // leave it unchanged
-                return false;
-        }
-
-        if (flagofs == wxMAX_SVNPRINTF_FLAGBUFFER_LEN)
-        {
-            wxLogDebug(wxT("Too many flags specified for a single conversion specifier!"));
-            return false;
-        }
-    }
-    while (!done);
-
-    return true;        // parsing was successful
-}
-
-template<typename CharType>
-void wxPrintfConvSpec<CharType>::ReplaceAsteriskWith(int width)
-{
-    char temp[wxMAX_SVNPRINTF_FLAGBUFFER_LEN];
-
-    // find the first * in our flag buffer
-    char *pwidth = strchr(m_szFlags, '*');
-    wxCHECK_RET(pwidth, wxT("field width must be specified"));
-
-    // save what follows the * (the +1 is to skip the asterisk itself!)
-    strcpy(temp, pwidth+1);
-    if (width < 0)
-    {
-        pwidth[0] = wxT('-');
-        pwidth++;
-    }
-
-    // replace * with the actual integer given as width
-#ifndef SYSTEM_SPRINTF_IS_UNSAFE
-    int maxlen = (m_szFlags + wxMAX_SVNPRINTF_FLAGBUFFER_LEN - pwidth) /
-                        sizeof(*m_szFlags);
-#endif
-    int offset = system_sprintf(pwidth, maxlen, "%d", abs(width));
-
-    // restore after the expanded * what was following it
-    strcpy(pwidth+offset, temp);
-}
-
-template<typename CharType>
-bool wxPrintfConvSpec<CharType>::LoadArg(wxPrintfArg *p, va_list &argptr)
-{
-    // did the '*' width/precision specifier was used ?
-    if (m_nMaxWidth == -1)
-    {
-        // take the maxwidth specifier from the stack
-        m_nMaxWidth = va_arg(argptr, int);
-        if (m_nMaxWidth < 0)
-            m_nMaxWidth = 0;
-        else
-            ReplaceAsteriskWith(m_nMaxWidth);
-    }
-
-    if (m_nMinWidth == -1)
-    {
-        // take the minwidth specifier from the stack
-        m_nMinWidth = va_arg(argptr, int);
-
-        ReplaceAsteriskWith(m_nMinWidth);
-        if (m_nMinWidth < 0)
-        {
-            m_bAlignLeft = !m_bAlignLeft;
-            m_nMinWidth = -m_nMinWidth;
-        }
-    }
-
-    switch (m_type) {
-        case wxPAT_INT:
-            p->pad_int = va_arg(argptr, int);
-            break;
-        case wxPAT_LONGINT:
-            p->pad_longint = va_arg(argptr, long int);
-            break;
-#ifdef wxLongLong_t
-        case wxPAT_LONGLONGINT:
-            p->pad_longlongint = va_arg(argptr, wxLongLong_t);
-            break;
-#endif // wxLongLong_t
-        case wxPAT_SIZET:
-            p->pad_sizet = va_arg(argptr, size_t);
-            break;
-        case wxPAT_DOUBLE:
-            p->pad_double = va_arg(argptr, double);
-            break;
-        case wxPAT_LONGDOUBLE:
-            p->pad_longdouble = va_arg(argptr, long double);
-            break;
-        case wxPAT_POINTER:
-            p->pad_pointer = va_arg(argptr, void *);
-            break;
-
-        case wxPAT_CHAR:
-            p->pad_char = (char)va_arg(argptr, int);  // char is promoted to int when passed through '...'
-            break;
-        case wxPAT_WCHAR:
-            p->pad_wchar = (wchar_t)va_arg(argptr, int);  // char is promoted to int when passed through '...'
-            break;
-
-        case wxPAT_PCHAR:
-        case wxPAT_PWCHAR:
-            p->pad_str = va_arg(argptr, void *);
-            break;
-
-        case wxPAT_NINT:
-            p->pad_nint = va_arg(argptr, int *);
-            break;
-        case wxPAT_NSHORTINT:
-            p->pad_nshortint = va_arg(argptr, short int *);
-            break;
-        case wxPAT_NLONGINT:
-            p->pad_nlongint = va_arg(argptr, long int *);
-            break;
-
-        case wxPAT_STAR:
-            // this will be handled as part of the next argument
-            return true;
-
-        case wxPAT_INVALID:
-        default:
-            return false;
-    }
-
-    return true;    // loading was successful
-}
-
-template<typename CharType>
-int wxPrintfConvSpec<CharType>::Process(CharType *buf, size_t lenMax, wxPrintfArg *p, size_t written)
-{
-    // buffer to avoid dynamic memory allocation each time for small strings;
-    // note that this buffer is used only to hold results of number formatting,
-    // %s directly writes user's string in buf, without using szScratch
-    char szScratch[wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN];
-    size_t lenScratch = 0, lenCur = 0;
-
-#define APPEND_CH(ch) \
-                { \
-                    if ( lenCur == lenMax ) \
-                        return -1; \
-                    \
-                    buf[lenCur++] = ch; \
-                }
-
-    switch ( m_type )
-    {
-        case wxPAT_INT:
-            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_int);
-            break;
-
-        case wxPAT_LONGINT:
-            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longint);
-            break;
-
-#ifdef wxLongLong_t
-        case wxPAT_LONGLONGINT:
-            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longlongint);
-            break;
-#endif // SIZEOF_LONG_LONG
-
-        case wxPAT_SIZET:
-            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_sizet);
-            break;
-
-        case wxPAT_LONGDOUBLE:
-            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longdouble);
-            break;
-
-        case wxPAT_DOUBLE:
-            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_double);
-            break;
-
-        case wxPAT_POINTER:
-            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_pointer);
-            break;
-
-        case wxPAT_CHAR:
-        case wxPAT_WCHAR:
-            {
-                wxUniChar ch;
-                if (m_type == wxPAT_CHAR)
-                    ch = p->pad_char;
-                else // m_type == wxPAT_WCHAR
-                    ch = p->pad_wchar;
-
-                CharType val = ch;
-
-                size_t i;
-
-                if (!m_bAlignLeft)
-                    for (i = 1; i < (size_t)m_nMinWidth; i++)
-                        APPEND_CH(wxT(' '));
-
-                APPEND_CH(val);
-
-                if (m_bAlignLeft)
-                    for (i = 1; i < (size_t)m_nMinWidth; i++)
-                        APPEND_CH(wxT(' '));
-            }
-            break;
-
-        case wxPAT_PCHAR:
-        case wxPAT_PWCHAR:
-            {
-                wxString s;
-                if ( !p->pad_str )
-                {
-                    if ( m_nMaxWidth >= 6 )
-                        s = wxT("(null)");
-                }
-                else if (m_type == wxPAT_PCHAR)
-                    s.assign(static_cast<const char *>(p->pad_str));
-                else // m_type == wxPAT_PWCHAR
-                    s.assign(static_cast<const wchar_t *>(p->pad_str));
-
-                typename wxPrintfStringHelper<CharType>::ConvertedType strbuf(
-                        wxPrintfStringHelper<CharType>::Convert(s));
-
-                // at this point we are sure that m_nMaxWidth is positive or
-                // null (see top of wxPrintfConvSpec::LoadArg)
-                int len = wxMin((unsigned int)m_nMaxWidth, wxStrlen(strbuf));
-
-                int i;
-
-                if (!m_bAlignLeft)
-                {
-                    for (i = len; i < m_nMinWidth; i++)
-                        APPEND_CH(wxT(' '));
-                }
-
-                len = wxMin((unsigned int)len, lenMax-lenCur);
-                wxStrncpy(buf+lenCur, strbuf, len);
-                lenCur += len;
-
-                if (m_bAlignLeft)
-                {
-                    for (i = len; i < m_nMinWidth; i++)
-                        APPEND_CH(wxT(' '));
-                }
-            }
-            break;
-
-        case wxPAT_NINT:
-            *p->pad_nint = written;
-            break;
-
-        case wxPAT_NSHORTINT:
-            *p->pad_nshortint = (short int)written;
-            break;
-
-        case wxPAT_NLONGINT:
-            *p->pad_nlongint = written;
-            break;
-
-        case wxPAT_INVALID:
-        default:
-            return -1;
-    }
-
-    // if we used system's sprintf() then we now need to append the s_szScratch
-    // buffer to the given one...
-    switch (m_type)
-    {
-        case wxPAT_INT:
-        case wxPAT_LONGINT:
-#ifdef wxLongLong_t
-        case wxPAT_LONGLONGINT:
-#endif
-        case wxPAT_SIZET:
-        case wxPAT_LONGDOUBLE:
-        case wxPAT_DOUBLE:
-        case wxPAT_POINTER:
-            wxASSERT(lenScratch < wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN);
-            // NB: 1) we can compare lenMax (for CharType*, i.e. possibly
-            //        wchar_t*) with lenScratch (char*) because this code is
-            //        formatting integers and that will have the same length
-            //        even in UTF-8 (the only case when char* length may be
-            //        more than wchar_t* length of the same string)
-            //     2) wxStrncpy converts the 2nd argument to 1st argument's
-            //        type transparently if their types differ, so this code
-            //        works for both instantiations
-            if (lenMax < lenScratch)
-            {
-                // fill output buffer and then return -1
-                wxStrncpy(buf, szScratch, lenMax);
-                return -1;
-            }
-            wxStrncpy(buf, szScratch, lenScratch);
-            lenCur += lenScratch;
-            break;
-
-        default:
-            break;      // all other cases were completed previously
-    }
-
-    return lenCur;
-}
-
-
-// helper that parses format string
-template<typename CharType>
-struct wxPrintfConvSpecParser
-{
-    typedef wxPrintfConvSpec<CharType> ConvSpec;
-
-    wxPrintfConvSpecParser(const CharType *fmt)
-    {
-        nargs = 0;
-        posarg_present =
-        nonposarg_present = false;
-
-        memset(pspec, 0, sizeof(pspec));
-
-        // parse the format string
-        for ( const CharType *toparse = fmt; *toparse != wxT('\0'); toparse++ )
-        {
-            // skip everything except format specifications
-            if ( *toparse != '%' )
-                continue;
-
-            // also skip escaped percent signs
-            if ( toparse[1] == '%' )
-            {
-                toparse++;
-                continue;
-            }
-
-            ConvSpec *spec = &specs[nargs];
-            spec->Init();
-
-            // attempt to parse this format specification
-            if ( !spec->Parse(toparse) )
-                continue;
-
-            // advance to the end of this specifier
-            toparse = spec->m_pArgEnd;
-
-            // special handling for specifications including asterisks: we need
-            // to reserve an extra slot (or two if asterisks were used for both
-            // width and precision) in specs array in this case
-            if ( const char *f = strchr(spec->m_szFlags, '*') )
-            {
-                unsigned numAsterisks = 1;
-                if ( strchr(++f, '*') )
-                    numAsterisks++;
-
-                for ( unsigned n = 0; n < numAsterisks; n++ )
-                {
-                    if ( nargs++ == wxMAX_SVNPRINTF_ARGUMENTS )
-                        break;
-
-                    // TODO: we need to support specifiers of the form "%2$*1$s"
-                    // (this is the same as "%*s") as if any positional arguments
-                    // are used all asterisks must be positional as well but this
-                    // requires a lot of changes in this code (basically we'd need
-                    // to rewrite Parse() to return "*" and conversion itself as
-                    // separate entries)
-                    if ( posarg_present )
-                    {
-                        wxFAIL_MSG
-                        (
-                            wxString::Format
-                            (
-                                "Format string \"%s\" uses both positional "
-                                "parameters and '*' but this is not currently "
-                                "supported by this implementation, sorry.",
-                                fmt
-                            )
-                        );
-                    }
-
-                    specs[nargs] = *spec;
-
-                    // make an entry for '*' and point to it from pspec
-                    spec->Init();
-                    spec->m_type = wxPAT_STAR;
-                    pspec[nargs - 1] = spec;
-
-                    spec = &specs[nargs];
-                }
-            }
-
-
-            // check if this is a positional or normal argument
-            if ( spec->m_pos > 0 )
-            {
-                // the positional arguments start from number 1 so we need
-                // to adjust the index
-                spec->m_pos--;
-                posarg_present = true;
-            }
-            else // not a positional argument...
-            {
-                spec->m_pos = nargs;
-                nonposarg_present = true;
-            }
-
-            // this conversion specifier is tied to the pos-th argument...
-            pspec[spec->m_pos] = spec;
-
-            if ( nargs++ == wxMAX_SVNPRINTF_ARGUMENTS )
-                break;
-        }
-
-
-        // warn if we lost any arguments (the program probably will crash
-        // anyhow because of stack corruption...)
-        if ( nargs == wxMAX_SVNPRINTF_ARGUMENTS )
-        {
-            wxFAIL_MSG
-            (
-                wxString::Format
-                (
-                    "wxVsnprintf() currently supports only %d arguments, "
-                    "but format string \"%s\" defines more of them.\n"
-                    "You need to change wxMAX_SVNPRINTF_ARGUMENTS and "
-                    "recompile if more are really needed.",
-                    fmt, wxMAX_SVNPRINTF_ARGUMENTS
-                )
-            );
-        }
-    }
-
-    // total number of valid elements in specs
-    unsigned nargs;
-
-    // all format specifications in this format string in order of their
-    // appearance (which may be different from arguments order)
-    ConvSpec specs[wxMAX_SVNPRINTF_ARGUMENTS];
-
-    // pointer to specs array element for the N-th argument
-    ConvSpec *pspec[wxMAX_SVNPRINTF_ARGUMENTS];
-
-    // true if any positional/non-positional parameters are used
-    bool posarg_present,
-         nonposarg_present;
-};
-
-#undef APPEND_CH
-#undef CHECK_PREC
-
-#endif // _WX_PRIVATE_WXPRINTF_H_
diff --git a/Source/3rd Party/wx/include/wx/prntbase.h b/Source/3rd Party/wx/include/wx/prntbase.h
index 4710cd335..4c442a011 100644
--- a/Source/3rd Party/wx/include/wx/prntbase.h	
+++ b/Source/3rd Party/wx/include/wx/prntbase.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: prntbase.h 62502 2009-10-27 16:39:01Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,6 @@
 #include "wx/scrolwin.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"
-#include "wx/dc.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxButton;
@@ -39,9 +38,6 @@ class WXDLLIMPEXP_FWD_CORE wxPreviewControlBar;
 class WXDLLIMPEXP_FWD_CORE wxPreviewFrame;
 class WXDLLIMPEXP_FWD_CORE wxPrintFactory;
 class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
-class WXDLLIMPEXP_FWD_CORE wxPrintPreview;
-class wxPrintPageMaxCtrl;
-class wxPrintPageTextCtrl;
 
 //----------------------------------------------------------------------------
 // error consts
@@ -54,24 +50,11 @@ enum wxPrinterError
     wxPRINTER_ERROR
 };
 
-// Preview frame modality kind used with wxPreviewFrame::Initialize()
-enum wxPreviewFrameModalityKind
-{
-    // Disable all the other top level windows while the preview is shown.
-    wxPreviewFrame_AppModal,
-
-    // Disable only the parent window while the preview is shown.
-    wxPreviewFrame_WindowModal,
-
-    // Don't disable any windows.
-    wxPreviewFrame_NonModal
-};
-
 //----------------------------------------------------------------------------
 // wxPrintFactory
 //----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPrintFactory
+class WXDLLEXPORT wxPrintFactory
 {
 public:
     wxPrintFactory() {}
@@ -94,7 +77,7 @@ public:
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL ) = 0;
 
-    virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ) = 0;
+    virtual wxDC* CreatePrinterDC( const wxPrintData& data ) = 0;
 
     // What to do and what to show in the wxPrintDialog
     // a) Use the generic print setup dialog or a native one?
@@ -118,7 +101,7 @@ private:
     static wxPrintFactory *m_factory;
 };
 
-class WXDLLIMPEXP_CORE wxNativePrintFactory: public wxPrintFactory
+class WXDLLEXPORT wxNativePrintFactory: public wxPrintFactory
 {
 public:
     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
@@ -138,7 +121,7 @@ public:
     virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
                                                           wxPageSetupDialogData * data = NULL );
 
-    virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
+    virtual wxDC* CreatePrinterDC( const wxPrintData& data );
 
     virtual bool HasPrintSetupDialog();
     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
@@ -155,7 +138,7 @@ public:
 // wxPrintNativeDataBase
 //----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPrintNativeDataBase: public wxObject
+class WXDLLEXPORT wxPrintNativeDataBase: public wxObject
 {
 public:
     wxPrintNativeDataBase();
@@ -171,7 +154,7 @@ public:
 
 private:
     DECLARE_CLASS(wxPrintNativeDataBase)
-    wxDECLARE_NO_COPY_CLASS(wxPrintNativeDataBase);
+    DECLARE_NO_COPY_CLASS(wxPrintNativeDataBase)
 };
 
 //----------------------------------------------------------------------------
@@ -182,10 +165,10 @@ private:
  * Represents the printer: manages printing a wxPrintout object
  */
 
-class WXDLLIMPEXP_CORE wxPrinterBase: public wxObject
+class WXDLLEXPORT wxPrinterBase: public wxObject
 {
 public:
-    wxPrinterBase(wxPrintDialogData *data = NULL);
+    wxPrinterBase(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     virtual ~wxPrinterBase();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
@@ -215,17 +198,17 @@ public:
 
 private:
     DECLARE_CLASS(wxPrinterBase)
-    wxDECLARE_NO_COPY_CLASS(wxPrinterBase);
+    DECLARE_NO_COPY_CLASS(wxPrinterBase)
 };
 
 //----------------------------------------------------------------------------
 // wxPrinter
 //----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase
+class WXDLLEXPORT wxPrinter: public wxPrinterBase
 {
 public:
-    wxPrinter(wxPrintDialogData *data = NULL);
+    wxPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     virtual ~wxPrinter();
 
     virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
@@ -242,7 +225,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxPrinter)
-    wxDECLARE_NO_COPY_CLASS(wxPrinter);
+    DECLARE_NO_COPY_CLASS(wxPrinter)
 };
 
 //----------------------------------------------------------------------------
@@ -256,10 +239,10 @@ private:
  * object for previewing.
  */
 
-class WXDLLIMPEXP_CORE wxPrintout: public wxObject
+class WXDLLEXPORT wxPrintout: public wxObject
 {
 public:
-    wxPrintout(const wxString& title = _("Printout"));
+    wxPrintout(const wxString& title = wxT("Printout"));
     virtual ~wxPrintout();
 
     virtual bool OnBeginDocument(int startPage, int endPage);
@@ -300,26 +283,20 @@ public:
     void GetPageSizeMM(int *w, int  *h) const { *w = m_pageWidthMM; *h = m_pageHeightMM; }
 
     void SetPPIScreen(int x, int y) { m_PPIScreenX = x; m_PPIScreenY = y; }
-    void SetPPIScreen(const wxSize& ppi) { SetPPIScreen(ppi.x, ppi.y); }
     void GetPPIScreen(int *x, int *y) const { *x = m_PPIScreenX; *y = m_PPIScreenY; }
     void SetPPIPrinter(int x, int y) { m_PPIPrinterX = x; m_PPIPrinterY = y; }
-    void SetPPIPrinter(const wxSize& ppi) { SetPPIPrinter(ppi.x, ppi.y); }
     void GetPPIPrinter(int *x, int *y) const { *x = m_PPIPrinterX; *y = m_PPIPrinterY; }
 
     void SetPaperRectPixels(const wxRect& paperRectPixels) { m_paperRectPixels = paperRectPixels; }
     wxRect GetPaperRectPixels() const { return m_paperRectPixels; }
 
-    // This must be called by wxPrintPreview to associate itself with the
-    // printout it uses.
-    virtual void SetPreview(wxPrintPreview *preview) { m_preview = preview; }
+    virtual bool IsPreview() const { return m_isPreview; }
 
-    wxPrintPreview *GetPreview() const { return m_preview; }
-    virtual bool IsPreview() const { return GetPreview() != NULL; }
+    virtual void SetIsPreview(bool p) { m_isPreview = p; }
 
 private:
     wxString         m_printoutTitle;
     wxDC*            m_printoutDC;
-    wxPrintPreview  *m_preview;
 
     int              m_pageWidthPixels;
     int              m_pageHeightPixels;
@@ -334,9 +311,11 @@ private:
 
     wxRect           m_paperRectPixels;
 
+    bool             m_isPreview;
+
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintout)
-    wxDECLARE_NO_COPY_CLASS(wxPrintout);
+    DECLARE_NO_COPY_CLASS(wxPrintout)
 };
 
 //----------------------------------------------------------------------------
@@ -347,7 +326,7 @@ private:
  * Canvas upon which a preview is drawn.
  */
 
-class WXDLLIMPEXP_CORE wxPreviewCanvas: public wxScrolledWindow
+class WXDLLEXPORT wxPreviewCanvas: public wxScrolledWindow
 {
 public:
     wxPreviewCanvas(wxPrintPreviewBase *preview,
@@ -358,8 +337,6 @@ public:
                     const wxString& name = wxT("canvas"));
     virtual ~wxPreviewCanvas();
 
-    void SetPreview(wxPrintPreviewBase *preview) { m_printPreview = preview; }
-
     void OnPaint(wxPaintEvent& event);
     void OnChar(wxKeyEvent &event);
     // Responds to colour changes
@@ -369,13 +346,12 @@ private:
 #if wxUSE_MOUSEWHEEL
     void OnMouseWheel(wxMouseEvent& event);
 #endif // wxUSE_MOUSEWHEEL
-    void OnIdle(wxIdleEvent& event);
 
     wxPrintPreviewBase* m_printPreview;
 
     DECLARE_CLASS(wxPreviewCanvas)
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxPreviewCanvas);
+    DECLARE_NO_COPY_CLASS(wxPreviewCanvas)
 };
 
 //----------------------------------------------------------------------------
@@ -386,38 +362,20 @@ private:
  * Default frame for showing preview.
  */
 
-class WXDLLIMPEXP_CORE wxPreviewFrame: public wxFrame
+class WXDLLEXPORT wxPreviewFrame: public wxFrame
 {
 public:
     wxPreviewFrame(wxPrintPreviewBase *preview,
                    wxWindow *parent,
-                   const wxString& title = _("Print Preview"),
+                   const wxString& title = wxT("Print Preview"),
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT,
                    const wxString& name = wxFrameNameStr);
     virtual ~wxPreviewFrame();
 
-    // Either Initialize() or InitializeWithModality() must be called before
-    // showing the preview frame, the former being just a particular case of
-    // the latter initializing the frame for being showing app-modally.
-
-    // Notice that we must keep Initialize() with its existing signature to
-    // avoid breaking the old code that overrides it and we can't reuse the
-    // same name for the other functions to avoid virtual function hiding
-    // problem and the associated warnings given by some compilers (e.g. from
-    // g++ with -Woverloaded-virtual).
-    virtual void Initialize()
-    {
-        InitializeWithModality(wxPreviewFrame_AppModal);
-    }
-
-    // Also note that this method is not virtual as it doesn't need to be
-    // overridden: it's never called by wxWidgets (of course, the same is true
-    // for Initialize() but, again, it must remain virtual for compatibility).
-    void InitializeWithModality(wxPreviewFrameModalityKind kind);
-
     void OnCloseWindow(wxCloseEvent& event);
+    virtual void Initialize();
     virtual void CreateCanvas();
     virtual void CreateControlBar();
 
@@ -429,15 +387,10 @@ protected:
     wxPrintPreviewBase*   m_printPreview;
     wxWindowDisabler*     m_windowDisabler;
 
-    wxPreviewFrameModalityKind m_modalityKind;
-
-
 private:
-    void OnChar(wxKeyEvent& event);
-
-    DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxPreviewFrame)
-    wxDECLARE_NO_COPY_CLASS(wxPreviewFrame);
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxPreviewFrame)
 };
 
 //----------------------------------------------------------------------------
@@ -470,10 +423,8 @@ private:
 #define wxID_PREVIEW_FIRST      6
 #define wxID_PREVIEW_LAST       7
 #define wxID_PREVIEW_GOTO       8
-#define wxID_PREVIEW_ZOOM_IN    9
-#define wxID_PREVIEW_ZOOM_OUT   10
 
-class WXDLLIMPEXP_CORE wxPreviewControlBar: public wxPanel
+class WXDLLEXPORT wxPreviewControlBar: public wxPanel
 {
     DECLARE_CLASS(wxPreviewControlBar)
 
@@ -488,73 +439,42 @@ public:
     virtual ~wxPreviewControlBar();
 
     virtual void CreateButtons();
-    virtual void SetPageInfo(int minPage, int maxPage);
     virtual void SetZoomControl(int zoom);
     virtual int GetZoomControl();
     virtual wxPrintPreviewBase *GetPrintPreview() const
         { return m_printPreview; }
 
-
-    // Implementation only from now on.
     void OnWindowClose(wxCommandEvent& event);
     void OnNext();
     void OnPrevious();
     void OnFirst();
     void OnLast();
-    void OnGotoPage();
+    void OnGoto();
     void OnPrint();
-
     void OnPrintButton(wxCommandEvent& WXUNUSED(event)) { OnPrint(); }
     void OnNextButton(wxCommandEvent & WXUNUSED(event)) { OnNext(); }
     void OnPreviousButton(wxCommandEvent & WXUNUSED(event)) { OnPrevious(); }
     void OnFirstButton(wxCommandEvent & WXUNUSED(event)) { OnFirst(); }
     void OnLastButton(wxCommandEvent & WXUNUSED(event)) { OnLast(); }
+    void OnGotoButton(wxCommandEvent & WXUNUSED(event)) { OnGoto(); }
+    void OnZoom(wxCommandEvent& event);
     void OnPaint(wxPaintEvent& event);
 
-    void OnUpdateNextButton(wxUpdateUIEvent& event)
-        { event.Enable(IsNextEnabled()); }
-    void OnUpdatePreviousButton(wxUpdateUIEvent& event)
-        { event.Enable(IsPreviousEnabled()); }
-    void OnUpdateFirstButton(wxUpdateUIEvent& event)
-        { event.Enable(IsFirstEnabled()); }
-    void OnUpdateLastButton(wxUpdateUIEvent& event)
-        { event.Enable(IsLastEnabled()); }
-    void OnUpdateZoomInButton(wxUpdateUIEvent& event)
-        { event.Enable(IsZoomInEnabled()); }
-    void OnUpdateZoomOutButton(wxUpdateUIEvent& event)
-        { event.Enable(IsZoomOutEnabled()); }
-
-    // These methods are not private because they are called by wxPreviewCanvas.
-    void DoZoomIn();
-    void DoZoomOut();
-
 protected:
     wxPrintPreviewBase*   m_printPreview;
     wxButton*             m_closeButton;
+    wxButton*             m_nextPageButton;
+    wxButton*             m_previousPageButton;
+    wxButton*             m_printButton;
     wxChoice*             m_zoomControl;
-    wxPrintPageTextCtrl*  m_currentPageText;
-    wxPrintPageMaxCtrl*   m_maxPageText;
-
+    wxButton*             m_firstPageButton;
+    wxButton*             m_lastPageButton;
+    wxButton*             m_gotoPageButton;
     long                  m_buttonFlags;
 
 private:
-    void DoGotoPage(int page);
-
-    void DoZoom();
-
-    bool IsNextEnabled() const;
-    bool IsPreviousEnabled() const;
-    bool IsFirstEnabled() const;
-    bool IsLastEnabled() const;
-    bool IsZoomInEnabled() const;
-    bool IsZoomOutEnabled() const;
-
-    void OnZoomInButton(wxCommandEvent & WXUNUSED(event)) { DoZoomIn(); }
-    void OnZoomOutButton(wxCommandEvent & WXUNUSED(event)) { DoZoomOut(); }
-    void OnZoomChoice(wxCommandEvent& WXUNUSED(event)) { DoZoom(); }
-
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxPreviewControlBar);
+    DECLARE_NO_COPY_CLASS(wxPreviewControlBar)
 };
 
 //----------------------------------------------------------------------------
@@ -565,12 +485,12 @@ private:
  * Programmer creates an object of this class to preview a wxPrintout.
  */
 
-class WXDLLIMPEXP_CORE wxPrintPreviewBase: public wxObject
+class WXDLLEXPORT wxPrintPreviewBase: public wxObject
 {
 public:
     wxPrintPreviewBase(wxPrintout *printout,
-                       wxPrintout *printoutForPrinting = NULL,
-                       wxPrintDialogData *data = NULL);
+                       wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
+                       wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     wxPrintPreviewBase(wxPrintout *printout,
                        wxPrintout *printoutForPrinting,
                        wxPrintData *data);
@@ -596,10 +516,6 @@ public:
     // The preview canvas should call this from OnPaint
     virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
 
-    // Updates rendered page by calling RenderPage() if needed, returns true
-    // if there was some change. Preview canvas should call it at idle time
-    virtual bool UpdatePageRendering();
-
     // This draws a blank page onto the preview canvas
     virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
 
@@ -635,20 +551,11 @@ public:
     // the currently selected printer.
     virtual void DetermineScaling() = 0;
 
-protected:
-    // helpers for RenderPage():
-    virtual bool RenderPageIntoDC(wxDC& dc, int pageNum);
-    // renders preview into m_previewBitmap
-    virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
-
-    void InvalidatePreviewBitmap();
-
 protected:
     wxPrintDialogData m_printDialogData;
     wxPreviewCanvas*  m_previewCanvas;
     wxFrame*          m_previewFrame;
     wxBitmap*         m_previewBitmap;
-    bool              m_previewFailed;
     wxPrintout*       m_previewPrintout;
     wxPrintout*       m_printPrintout;
     int               m_currentPage;
@@ -668,7 +575,11 @@ protected:
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
-    wxDECLARE_NO_COPY_CLASS(wxPrintPreviewBase);
+    // helpers for RenderPage():
+    bool RenderPageIntoDC(wxDC& dc, int pageNum);
+    bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
+
+    DECLARE_NO_COPY_CLASS(wxPrintPreviewBase)
     DECLARE_CLASS(wxPrintPreviewBase)
 };
 
@@ -676,12 +587,12 @@ private:
 // wxPrintPreview
 //----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase
+class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
 {
 public:
     wxPrintPreview(wxPrintout *printout,
-                   wxPrintout *printoutForPrinting = NULL,
-                   wxPrintDialogData *data = NULL);
+                   wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
+                   wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     wxPrintPreview(wxPrintout *printout,
                    wxPrintout *printoutForPrinting,
                    wxPrintData *data);
@@ -698,7 +609,6 @@ public:
     virtual wxFrame *GetFrame() const;
     virtual wxPreviewCanvas *GetCanvas() const;
     virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
-    virtual bool UpdatePageRendering();
     virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
     virtual void AdjustScrollbars(wxPreviewCanvas *canvas);
     virtual bool RenderPage(int pageNum);
@@ -722,14 +632,14 @@ private:
 
 private:
     DECLARE_CLASS(wxPrintPreview)
-    wxDECLARE_NO_COPY_CLASS(wxPrintPreview);
+    DECLARE_NO_COPY_CLASS(wxPrintPreview)
 };
 
 //----------------------------------------------------------------------------
 // wxPrintAbortDialog
 //----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxPrintAbortDialog: public wxDialog
+class WXDLLEXPORT wxPrintAbortDialog: public wxDialog
 {
 public:
     wxPrintAbortDialog(wxWindow *parent,
@@ -746,7 +656,7 @@ public:
 
 private:
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxPrintAbortDialog);
+    DECLARE_NO_COPY_CLASS(wxPrintAbortDialog)
 };
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/Source/3rd Party/wx/include/wx/process.h b/Source/3rd Party/wx/include/wx/process.h
index 981b7b5a5..2c2f6185e 100644
--- a/Source/3rd Party/wx/include/wx/process.h	
+++ b/Source/3rd Party/wx/include/wx/process.h	
@@ -4,7 +4,7 @@
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to check error codes, added Detach() method
 // Created:     24/06/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: process.h 42713 2006-10-30 11:56:12Z ABX $
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ public:
 
 
     // ctors
-    wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY)
+    wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int nId = wxID_ANY)
         { Init(parent, nId, wxPROCESS_DEFAULT); }
 
     wxProcess(int flags) { Init(NULL, wxID_ANY, flags); }
@@ -104,14 +104,9 @@ public:
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 
-    // implementation only - don't use!
-    // --------------------------------
-
-    // needs to be public since it needs to be used from wxExecute() global func
-    void SetPid(long pid) { m_pid = pid; }
-
 protected:
     void Init(wxEvtHandler *parent, int id, int flags);
+    void SetPid(long pid) { m_pid = pid; }
 
     int m_id;
     long m_pid;
@@ -128,16 +123,16 @@ protected:
     bool m_redirect;
 
     DECLARE_DYNAMIC_CLASS(wxProcess)
-    wxDECLARE_NO_COPY_CLASS(wxProcess);
+    DECLARE_NO_COPY_CLASS(wxProcess)
 };
 
 // ----------------------------------------------------------------------------
 // wxProcess events
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_FWD_BASE wxProcessEvent;
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, wxProcessEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, 440)
+END_DECLARE_EVENT_TYPES()
 
 class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
 {
@@ -169,7 +164,7 @@ public:
 typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
 
 #define wxProcessEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxProcessEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func)
 
 #define EVT_END_PROCESS(id, func) \
    wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))
diff --git a/Source/3rd Party/wx/include/wx/progdlg.h b/Source/3rd Party/wx/include/wx/progdlg.h
index 0e74800c0..196192bce 100644
--- a/Source/3rd Party/wx/include/wx/progdlg.h	
+++ b/Source/3rd Party/wx/include/wx/progdlg.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: progdlg.h 41089 2006-09-09 13:36:54Z RR $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,8 +14,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_PROGRESSDLG
-
 /*
  * wxProgressDialog flags
  */
@@ -29,28 +27,10 @@
 #define wxPD_CAN_SKIP           0x0080
 
 
-#include "wx/generic/progdlgg.h"
-
-#if defined(__WXMSW__) && wxUSE_THREADS && !defined(__WXUNIVERSAL__)
-    #include "wx/msw/progdlg.h"
+#ifdef __WXPALMOS__
+    #include "wx/palmos/progdlg.h"
 #else
-    class WXDLLIMPEXP_CORE wxProgressDialog
-                           : public wxGenericProgressDialog
-    {
-    public:
-        wxProgressDialog( const wxString& title, const wxString& message,
-                          int maximum = 100,
-                          wxWindow *parent = NULL,
-                          int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE )
-            : wxGenericProgressDialog( title, message, maximum,
-                                       parent, style )
-            { }
-
-    private:
-        wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxProgressDialog );
-    };
-#endif // defined(__WXMSW__) && wxUSE_THREADS
-
-#endif // wxUSE_PROGRESSDLG
+    #include "wx/generic/progdlgg.h"
+#endif
 
 #endif // _WX_PROGDLG_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/ptr_scpd.h b/Source/3rd Party/wx/include/wx/ptr_scpd.h
index 2ed0e6023..19c6588b7 100644
--- a/Source/3rd Party/wx/include/wx/ptr_scpd.h	
+++ b/Source/3rd Party/wx/include/wx/ptr_scpd.h	
@@ -1,14 +1,222 @@
-///////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 // Name:        wx/ptr_scpd.h
-// Purpose:     compatibility wrapper for wxScoped{Ptr,Array}
-// Author:      Vadim Zeitlin
-// Created:     2009-02-03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
+// Purpose:     scoped smart pointer class
+// Author:      Jesse Lovelace <jllovela@eos.ncsu.edu>
+// Modified by:
+// Created:     06/01/02
+// RCS-ID:      $Id: ptr_scpd.h 35688 2005-09-25 19:59:19Z VZ $
+// Copyright:   (c) Jesse Lovelace and original Boost authors (see below)
 // Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+//  This class closely follows the implementation of the boost
+//  library scoped_ptr and is an adaption for c++ macro's in
+//  the wxWidgets project. The original authors of the boost
+//  scoped_ptr are given below with their respective copyrights.
+
+//  (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
+//  Copyright (c) 2001, 2002 Peter Dimov
+//
+//  Permission to copy, use, modify, sell and distribute this software
+//  is granted provided this copyright notice appears in all copies.
+//  This software is provided "as is" without express or implied
+//  warranty, and with no claim as to its suitability for any purpose.
+//
+//  See http://www.boost.org/libs/smart_ptr/scoped_ptr.htm for documentation.
+//
+
+#ifndef __WX_SCOPED_POINTER__
+#define __WX_SCOPED_POINTER__
+
+#include "wx/defs.h"
+
+/*
+   checked deleters are used to make sure that the type being deleted is really
+   a complete type.: otherwise sizeof() would result in a compile-time error
+
+   do { ... } while ( 0 ) construct is used to have an anonymous scope
+   (otherwise we could have name clashes between different "complete"s) but
+   still force a semicolon after the macro
+*/
+
+#ifdef __WATCOMC__
+    #define wxFOR_ONCE(name)              for(int name=0; name<1; name++)
+    #define wxPRE_NO_WARNING_SCOPE(name)  wxFOR_ONCE(wxMAKE_UNIQUE_NAME(name))
+    #define wxPOST_NO_WARNING_SCOPE(name)
+#else
+    #define wxPRE_NO_WARNING_SCOPE(name)  do
+    #define wxPOST_NO_WARNING_SCOPE(name) while ( wxFalse )
+#endif
+
+#define wxCHECKED_DELETE(ptr)                                                 \
+    wxPRE_NO_WARNING_SCOPE(scope_var1)                                        \
+    {                                                                         \
+        typedef char complete[sizeof(*ptr)];                                  \
+        delete ptr;                                                           \
+    } wxPOST_NO_WARNING_SCOPE(scope_var1)
+
+#define wxCHECKED_DELETE_ARRAY(ptr)                                           \
+    wxPRE_NO_WARNING_SCOPE(scope_var2)                                        \
+    {                                                                         \
+        typedef char complete[sizeof(*ptr)];                                  \
+        delete [] ptr;                                                        \
+    } wxPOST_NO_WARNING_SCOPE(scope_var2)
+
+/* These scoped pointers are *not* assignable and cannot be used
+   within a container.  Look for wxDECLARE_SHARED_PTR for this
+   functionality.
+
+   In addition, the type being used *must* be complete at the time
+   that wxDEFINE_SCOPED_* is called or a compiler error will result.
+   This is because the class checks for the completeness of the type
+   being used.
+*/
+
+
+#define wxDECLARE_SCOPED_PTR(T, name) \
+class name                          \
+{                                   \
+private:                            \
+    T * m_ptr;                      \
+                                    \
+    name(name const &);             \
+    name & operator=(name const &); \
+                                    \
+public:                             \
+    wxEXPLICIT name(T * ptr = NULL) \
+    : m_ptr(ptr) { }                \
+                                    \
+    ~name();                        \
+                                    \
+    void reset(T * ptr = NULL)      \
+    {                               \
+        if (m_ptr != ptr)           \
+        {                           \
+            delete m_ptr;           \
+            m_ptr = ptr;            \
+        }                           \
+    }                               \
+                                    \
+    T *release()                    \
+    {                               \
+        T *ptr = m_ptr;             \
+        m_ptr = NULL;               \
+        return ptr;                 \
+    }                               \
+                                    \
+    T & operator*() const           \
+    {                               \
+        wxASSERT(m_ptr != NULL);    \
+        return *m_ptr;              \
+    }                               \
+                                    \
+    T * operator->() const          \
+    {                               \
+        wxASSERT(m_ptr != NULL);    \
+        return m_ptr;               \
+    }                               \
+                                    \
+    T * get() const                 \
+    {                               \
+        return m_ptr;               \
+    }                               \
+                                    \
+    void swap(name & ot)            \
+    {                               \
+        T * tmp = ot.m_ptr;         \
+        ot.m_ptr = m_ptr;           \
+        m_ptr = tmp;                \
+    }                               \
+};
+
+#define wxDEFINE_SCOPED_PTR(T, name)\
+name::~name()                       \
+{                                   \
+    wxCHECKED_DELETE(m_ptr);        \
+}
+
+// this macro can be used for the most common case when you want to declare and
+// define the scoped pointer at the same time and want to use the standard
+// naming convention: auto pointer to Foo is called FooPtr
+#define wxDEFINE_SCOPED_PTR_TYPE(T)    \
+    wxDECLARE_SCOPED_PTR(T, T ## Ptr)  \
+    wxDEFINE_SCOPED_PTR(T, T ## Ptr)
+
+// the same but for arrays instead of simple pointers
+#define wxDECLARE_SCOPED_ARRAY(T, name)\
+class name                          \
+{                                   \
+private:                            \
+    T * m_ptr;                      \
+    name(name const &);             \
+    name & operator=(name const &); \
+                                    \
+public:                             \
+    wxEXPLICIT name(T * p = NULL) : m_ptr(p) \
+    {}                              \
+                                    \
+    ~name();                        \
+    void reset(T * p = NULL);       \
+                                    \
+    T & operator[](long int i) const\
+    {                               \
+        wxASSERT(m_ptr != NULL);    \
+        wxASSERT(i >= 0);           \
+        return m_ptr[i];            \
+    }                               \
+                                    \
+    T * get() const                 \
+    {                               \
+        return m_ptr;               \
+    }                               \
+                                    \
+    void swap(name & ot)            \
+    {                               \
+        T * tmp = ot.m_ptr;         \
+        ot.m_ptr = m_ptr;           \
+        m_ptr = tmp;                \
+    }                               \
+};
+
+#define wxDEFINE_SCOPED_ARRAY(T, name)  \
+name::~name()                           \
+{                                       \
+    wxCHECKED_DELETE_ARRAY(m_ptr);      \
+}                                       \
+void name::reset(T * p){                \
+    if (m_ptr != p)                     \
+    {                                   \
+       wxCHECKED_DELETE_ARRAY(m_ptr);   \
+       m_ptr = p;                       \
+    }                                   \
+}
+
+// ----------------------------------------------------------------------------
+// "Tied" scoped pointer: same as normal one but also sets the value of
+//                        some other variable to the pointer value
+// ----------------------------------------------------------------------------
+
+#define wxDEFINE_TIED_SCOPED_PTR_TYPE(T)                                      \
+    wxDEFINE_SCOPED_PTR_TYPE(T)                                               \
+    class T ## TiedPtr : public T ## Ptr                                      \
+    {                                                                         \
+    public:                                                                   \
+        T ## TiedPtr(T **pp, T *p)                                            \
+            : T ## Ptr(p), m_pp(pp)                                           \
+        {                                                                     \
+            m_pOld = *pp;                                                     \
+            *pp = p;                                                          \
+        }                                                                     \
+                                                                              \
+        ~ T ## TiedPtr()                                                      \
+        {                                                                     \
+            *m_pp = m_pOld;                                                   \
+        }                                                                     \
+                                                                              \
+    private:                                                                  \
+        T **m_pp;                                                             \
+        T *m_pOld;                                                            \
+    };
+
+#endif // __WX_SCOPED_POINTER__
 
-// do not include this file in any new code, include either wx/scopedptr.h or
-// wx/scopedarray.h (or both) instead
-#include "wx/scopedarray.h"
-#include "wx/scopedptr.h"
diff --git a/Source/3rd Party/wx/include/wx/quantize.h b/Source/3rd Party/wx/include/wx/quantize.h
index ac8a71b10..dd43f7a05 100644
--- a/Source/3rd Party/wx/include/wx/quantize.h	
+++ b/Source/3rd Party/wx/include/wx/quantize.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     22/6/2000
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: quantize.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxPalette;
 #define wxQUANTIZE_RETURN_8BIT_DATA             0x02
 #define wxQUANTIZE_FILL_DESTINATION_IMAGE       0x04
 
-class WXDLLIMPEXP_CORE wxQuantize: public wxObject
+class WXDLLEXPORT wxQuantize: public wxObject
 {
 public:
 DECLARE_DYNAMIC_CLASS(wxQuantize)
diff --git a/Source/3rd Party/wx/include/wx/radiobox.h b/Source/3rd Party/wx/include/wx/radiobox.h
index d31e28ad5..e54aa7e71 100644
--- a/Source/3rd Party/wx/include/wx/radiobox.h	
+++ b/Source/3rd Party/wx/include/wx/radiobox.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.09.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: radiobox.h 54930 2008-08-02 19:45:23Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,8 +12,6 @@
 #ifndef _WX_RADIOBOX_H_BASE_
 #define _WX_RADIOBOX_H_BASE_
 
-#include "wx/defs.h"
-
 #if wxUSE_RADIOBOX
 
 #include "wx/ctrlsub.h"
@@ -28,7 +26,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray);
 
 #endif // wxUSE_TOOLTIPS
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioBoxNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxRadioBoxBase is not a normal base class, but rather a mix-in because the
@@ -36,7 +34,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioBoxNameStr[];
 // example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxRadioBoxBase : public wxItemContainerImmutable
+class WXDLLEXPORT wxRadioBoxBase : public wxItemContainerImmutable
 {
 public:
     virtual ~wxRadioBoxBase();
@@ -87,6 +85,14 @@ public:
     }
 
 
+    // deprecated functions
+    // --------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( int GetNumberOfRowsOrCols() const );
+    wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
+#endif // WXWIN_COMPATIBILITY_2_4
+
 protected:
     wxRadioBoxBase()
     {
@@ -99,8 +105,6 @@ protected:
 #endif // wxUSE_TOOLTIPS
     }
 
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
     // return the number of items in major direction (which depends on whether
     // we have wxRA_SPECIFY_COLS or wxRA_SPECIFY_ROWS style)
     unsigned int GetMajorDim() const { return m_majorDim; }
@@ -163,11 +167,13 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/radiobox.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/radiobox.h"
+    #include "wx/mac/radiobox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/radiobox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobox.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/radiobox.h"
 #endif
 
 #endif // wxUSE_RADIOBOX
diff --git a/Source/3rd Party/wx/include/wx/radiobut.h b/Source/3rd Party/wx/include/wx/radiobut.h
index 9963507ce..2543ea8dc 100644
--- a/Source/3rd Party/wx/include/wx/radiobut.h	
+++ b/Source/3rd Party/wx/include/wx/radiobut.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.09.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: radiobut.h 37066 2006-01-23 03:27:34Z MR $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -33,7 +33,7 @@
 
 #include "wx/control.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[];
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/radiobut.h"
@@ -46,11 +46,13 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[];
 #elif defined(__WXGTK__)
     #include "wx/gtk1/radiobut.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/radiobut.h"
+    #include "wx/mac/radiobut.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/radiobut.h"
 #elif defined(__WXPM__)
     #include "wx/os2/radiobut.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/radiobut.h"
 #endif
 
 #endif // wxUSE_RADIOBTN
diff --git a/Source/3rd Party/wx/include/wx/range.h b/Source/3rd Party/wx/include/wx/range.h
deleted file mode 100644
index 563098e6f..000000000
--- a/Source/3rd Party/wx/include/wx/range.h	
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/range.h
-// Purpose:     Range Value Class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     2011-01-07
-// RCS-ID:      $Id$
-// Copyright:   (c) 2011 Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RANGE_H_
-#define _WX_RANGE_H_
-
-#include "wx/defs.h"
-
-class wxRange
-{
-public :
-    wxRange(): m_minVal(0), m_maxVal(0) {}
-    wxRange( int minVal, int maxVal) : m_minVal(minVal), m_maxVal(maxVal) {}
-    int GetMin() const { return m_minVal; }
-    int GetMax() const { return m_maxVal; }
-private :
-    int m_minVal;
-    int m_maxVal;
-};
-
-#endif // _WX_RANGE_H_
diff --git a/Source/3rd Party/wx/include/wx/rawbmp.h b/Source/3rd Party/wx/include/wx/rawbmp.h
index 5548dd6a1..c46028526 100644
--- a/Source/3rd Party/wx/include/wx/rawbmp.h	
+++ b/Source/3rd Party/wx/include/wx/rawbmp.h	
@@ -4,20 +4,15 @@
 // Author:      Eric Kidd, Vadim Zeitlin
 // Modified by:
 // Created:     10.03.03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: rawbmp.h 41661 2006-10-06 16:34:45Z PC $
 // Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_RAWBMP_H_
-#define _WX_RAWBMP_H_
-
-#include "wx/defs.h"
-
-#ifdef wxHAS_RAW_BITMAP
+#ifndef _WX_RAWBMP_H_BASE_
+#define _WX_RAWBMP_H_BASE_
 
 #include "wx/image.h"
-#include "wx/bitmap.h"
 
 // ----------------------------------------------------------------------------
 // Abstract Pixel API
@@ -77,7 +72,7 @@
  */
 
 /*
-    Note: we do not use WXDLLIMPEXP_CORE with classes in this file because VC++ has
+    Note: we do not use WXDLLEXPORT with classes in this file because VC++ has
     problems with exporting inner class defined inside a specialization of a
     template class from a DLL. Besides, as all the methods are inline it's not
     really necessary to put them in DLL at all.
@@ -172,16 +167,6 @@ typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
     // Under GTK+ 2.X we use GdkPixbuf, which is standard RGB or RGBA
     typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
 
-    #define wxPIXEL_FORMAT_ALPHA 3
-#elif defined(__WXPM__)
-    // Under PM, we can use standard RGB or RGBA
-    typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
-
-    #define wxPIXEL_FORMAT_ALPHA 3
-#elif defined(__WXDFB__)
-    // Under DirectFB, RGB components are reversed, they're in BGR order
-    typedef wxPixelFormat<unsigned char, 24, 2, 1, 0> wxNativePixelFormat;
-
     #define wxPIXEL_FORMAT_ALPHA 3
 #endif
 
@@ -318,6 +303,9 @@ struct wxPixelDataOut<wxImage>
             // the pixel format we use
             typedef wxImagePixelFormat PixelFormat;
 
+            // the type of the pixel components
+            typedef typename dummyPixelFormat::ChannelType ChannelType;
+
             // the pixel data we're working with
             typedef
                 wxPixelDataOut<wxImage>::wxPixelDataIn<PixelFormat> PixelData;
@@ -412,19 +400,11 @@ struct wxPixelDataOut<wxImage>
             // data access
             // -----------
 
-            // access to individual colour components
-            PixelFormat::ChannelType& Red() { return m_pRGB[PixelFormat::RED]; }
-            PixelFormat::ChannelType& Green() { return m_pRGB[PixelFormat::GREEN]; }
-            PixelFormat::ChannelType& Blue() { return m_pRGB[PixelFormat::BLUE]; }
-            PixelFormat::ChannelType& Alpha() { return *m_pAlpha; }
-
-            // address the pixel contents directly (always RGB, without alpha)
-            //
-            // this can't be used to modify the image as assigning a 32bpp
-            // value to 24bpp pixel would overwrite an extra byte in the next
-            // pixel or beyond the end of image
-            const typename PixelFormat::PixelType& Data()
-                { return *(typename PixelFormat::PixelType *)m_pRGB; }
+            // access to invidividual colour components
+            ChannelType& Red() { return m_pRGB[PixelFormat::RED]; }
+            ChannelType& Green() { return m_pRGB[PixelFormat::GREEN]; }
+            ChannelType& Blue() { return m_pRGB[PixelFormat::BLUE]; }
+            ChannelType& Alpha() { return *m_pAlpha; }
 
         // private: -- see comment in the beginning of the file
 
@@ -440,7 +420,7 @@ struct wxPixelDataOut<wxImage>
         {
             m_width = image.GetWidth();
             m_height = image.GetHeight();
-            m_stride = Iterator::PixelFormat::SizePixel * m_width;
+            m_stride = Iterator::SizePixel * m_width;
         }
 
         // initializes us with the given region of the specified image
@@ -448,7 +428,7 @@ struct wxPixelDataOut<wxImage>
                       const wxPoint& pt,
                       const wxSize& sz) : m_image(image), m_pixels(image)
         {
-            m_stride = Iterator::PixelFormat::SizePixel * m_width;
+            m_stride = Iterator::SizePixel * m_width;
 
             InitRect(pt, sz);
         }
@@ -457,7 +437,7 @@ struct wxPixelDataOut<wxImage>
         wxPixelDataIn(ImageType& image,
                       const wxRect& rect) : m_image(image), m_pixels(image)
         {
-            m_stride = Iterator::PixelFormat::SizePixel * m_width;
+            m_stride = Iterator::SizePixel * m_width;
 
             InitRect(rect.GetPosition(), rect.GetSize());
         }
@@ -545,7 +525,7 @@ struct wxPixelDataOut<wxBitmap>
             {
                 m_ptr = NULL;
             }
-
+            
             // return true if this iterator is valid
             bool IsOk() const { return m_ptr != NULL; }
 
@@ -601,7 +581,7 @@ struct wxPixelDataOut<wxBitmap>
             // data access
             // -----------
 
-            // access to individual colour components
+            // access to invidividual colour components
             ChannelType& Red() { return m_ptr[PixelFormat::RED]; }
             ChannelType& Green() { return m_ptr[PixelFormat::GREEN]; }
             ChannelType& Blue() { return m_ptr[PixelFormat::BLUE]; }
@@ -610,10 +590,6 @@ struct wxPixelDataOut<wxBitmap>
             // address the pixel contents directly
             //
             // warning: the format is platform dependent
-            //
-            // warning 2: assigning to Data() only works correctly for 16bpp or
-            //            32bpp formats but using it for 24bpp ones overwrites
-            //            one extra byte and so can't be done
             typename PixelFormat::PixelType& Data()
                 { return *(typename PixelFormat::PixelType *)m_ptr; }
 
@@ -655,22 +631,11 @@ struct wxPixelDataOut<wxBitmap>
         // dtor unlocks the bitmap
         ~wxPixelDataIn()
         {
-            if ( m_pixels.IsOk() )
-            {
-#if defined(__WXMSW__) || defined(__WXMAC__)
-                // this is a hack to mark wxBitmap as using alpha channel
-                if ( Format::HasAlpha )
-                    m_bmp.UseAlpha();
-#endif
-                m_bmp.UngetRawData(*this);
-            }
-            // else: don't call UngetRawData() if GetRawData() failed
+            m_bmp.UngetRawData(*this);
         }
 
-#if WXWIN_COMPATIBILITY_2_8
-        // not needed anymore, calls to it should be simply removed
-        wxDEPRECATED_INLINE( void UseAlpha(), wxEMPTY_PARAMETER_VALUE )
-#endif
+        // call this to indicate that we should use the alpha channel
+        void UseAlpha() { m_bmp.UseAlpha(); }
 
     // private: -- see comment in the beginning of the file
 
@@ -691,21 +656,9 @@ struct wxPixelDataOut<wxBitmap>
         }
     };
 };
-
 #endif //wxUSE_GUI
 
-// FIXME-VC6: VC6 doesn't like typename in default template parameters while
-//            it is necessary with standard-conforming compilers, remove this
-//            #define and just use typename when we drop VC6 support
-#if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(7)
-    #define wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM
-#else
-    #define wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM typename
-#endif
-
-template <class Image,
-          class PixelFormat = wxTYPENAME_IN_TEMPLATE_DEFAULT_PARAM
-                                wxPixelFormatFor<Image>::Format >
+template <class Image, class PixelFormat = wxPixelFormatFor<Image> >
 class wxPixelData :
     public wxPixelDataOut<Image>::template wxPixelDataIn<PixelFormat>
 {
@@ -724,6 +677,7 @@ public:
     }
 };
 
+
 // some "predefined" pixel data classes
 #if wxUSE_IMAGE
 typedef wxPixelData<wxImage> wxImagePixelData;
@@ -755,5 +709,5 @@ struct wxPixelIterator : public wxPixelData<Image, PixelFormat>::Iterator
 {
 };
 
-#endif // wxHAS_RAW_BITMAP
-#endif // _WX_RAWBMP_H_
+#endif // _WX_RAWBMP_H_BASE_
+
diff --git a/Source/3rd Party/wx/include/wx/rearrangectrl.h b/Source/3rd Party/wx/include/wx/rearrangectrl.h
deleted file mode 100644
index 063f0ac91..000000000
--- a/Source/3rd Party/wx/include/wx/rearrangectrl.h	
+++ /dev/null
@@ -1,233 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/rearrangectrl.h
-// Purpose:     various controls for rearranging the items interactively
-// Author:      Vadim Zeitlin
-// Created:     2008-12-15
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_REARRANGECTRL_H_
-#define _WX_REARRANGECTRL_H_
-
-#include "wx/checklst.h"
-
-#if wxUSE_REARRANGECTRL
-
-#include "wx/panel.h"
-#include "wx/dialog.h"
-
-#include "wx/arrstr.h"
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeListNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeDialogNameStr[];
-
-// ----------------------------------------------------------------------------
-// wxRearrangeList: a (check) list box allowing to move items around
-// ----------------------------------------------------------------------------
-
-// This class works allows to change the order of the items shown in it as well
-// as to check or uncheck them individually. The data structure used to allow
-// this is the order array which contains the items indices indexed by their
-// position with an added twist that the unchecked items are represented by the
-// bitwise complement of the corresponding index (for any architecture using
-// two's complement for negative numbers representation (i.e. just about any at
-// all) this means that a checked item N is represented by -N-1 in unchecked
-// state).
-//
-// So, for example, the array order [1 -3 0] used in conjunction with the items
-// array ["first", "second", "third"] means that the items are displayed in the
-// order "second", "third", "first" and the "third" item is unchecked while the
-// other two are checked.
-class WXDLLIMPEXP_CORE wxRearrangeList : public wxCheckListBox
-{
-public:
-    // ctors and such
-    // --------------
-
-    // default ctor, call Create() later
-    wxRearrangeList() { }
-
-    // ctor creating the control, the arguments are the same as for
-    // wxCheckListBox except for the extra order array which defines the
-    // (initial) display order of the items as well as their statuses, see the
-    // description above
-    wxRearrangeList(wxWindow *parent,
-                    wxWindowID id,
-                    const wxPoint& pos,
-                    const wxSize& size,
-                    const wxArrayInt& order,
-                    const wxArrayString& items,
-                    long style = 0,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxRearrangeListNameStr)
-    {
-        Create(parent, id, pos, size, order, items, style, validator, name);
-    }
-
-    // Create() function takes the same parameters as the base class one and
-    // the order array determining the initial display order
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayInt& order,
-                const wxArrayString& items,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxRearrangeListNameStr);
-
-
-    // items order
-    // -----------
-
-    // get the current items order; the returned array uses the same convention
-    // as the one passed to the ctor
-    const wxArrayInt& GetCurrentOrder() const { return m_order; }
-
-    // return true if the current item can be moved up or down (i.e. just that
-    // it's not the first or the last one)
-    bool CanMoveCurrentUp() const;
-    bool CanMoveCurrentDown() const;
-
-    // move the current item one position up or down, return true if it was moved
-    // or false if the current item was the first/last one and so nothing was done
-    bool MoveCurrentUp();
-    bool MoveCurrentDown();
-
-private:
-    // swap two items at the given positions in the listbox
-    void Swap(int pos1, int pos2);
-
-    // event handler for item checking/unchecking
-    void OnCheck(wxCommandEvent& event);
-
-
-    // the current order array
-    wxArrayInt m_order;
-
-
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxRearrangeList);
-};
-
-// ----------------------------------------------------------------------------
-// wxRearrangeCtrl: composite control containing a wxRearrangeList and buttons
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxRearrangeCtrl : public wxPanel
-{
-public:
-    // ctors/Create function are the same as for wxRearrangeList
-    wxRearrangeCtrl()
-    {
-        Init();
-    }
-
-    wxRearrangeCtrl(wxWindow *parent,
-                    wxWindowID id,
-                    const wxPoint& pos,
-                    const wxSize& size,
-                    const wxArrayInt& order,
-                    const wxArrayString& items,
-                    long style = 0,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxRearrangeListNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, order, items, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayInt& order,
-                const wxArrayString& items,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxRearrangeListNameStr);
-
-    // get the underlying listbox
-    wxRearrangeList *GetList() const { return m_list; }
-
-private:
-    // common part of all ctors
-    void Init();
-
-    // event handlers for the buttons
-    void OnUpdateButtonUI(wxUpdateUIEvent& event);
-    void OnButton(wxCommandEvent& event);
-
-
-    wxRearrangeList *m_list;
-
-
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxRearrangeCtrl);
-};
-
-// ----------------------------------------------------------------------------
-// wxRearrangeDialog: dialog containing a wxRearrangeCtrl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxRearrangeDialog : public wxDialog
-{
-public:
-    // default ctor, use Create() later
-    wxRearrangeDialog() { Init(); }
-
-    // ctor for the dialog: message is shown inside the dialog itself, order
-    // and items are passed to wxRearrangeList used internally
-    wxRearrangeDialog(wxWindow *parent,
-                      const wxString& message,
-                      const wxString& title,
-                      const wxArrayInt& order,
-                      const wxArrayString& items,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxString& name = wxRearrangeDialogNameStr)
-    {
-        Init();
-
-        Create(parent, message, title, order, items, pos, name);
-    }
-
-    bool Create(wxWindow *parent,
-                const wxString& message,
-                const wxString& title,
-                const wxArrayInt& order,
-                const wxArrayString& items,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxString& name = wxRearrangeDialogNameStr);
-
-
-    // methods for the dialog customization
-
-    // add extra contents to the dialog below the wxRearrangeCtrl part: the
-    // given window (usually a wxPanel containing more control inside it) must
-    // have the dialog as its parent and will be inserted into it at the right
-    // place by this method
-    void AddExtraControls(wxWindow *win);
-
-    // return the wxRearrangeList control used by the dialog
-    wxRearrangeList *GetList() const;
-
-
-    // get the order of items after it was modified by the user
-    wxArrayInt GetOrder() const;
-
-private:
-    // common part of all ctors
-    void Init() { m_ctrl = NULL; }
-
-    wxRearrangeCtrl *m_ctrl;
-
-    wxDECLARE_NO_COPY_CLASS(wxRearrangeDialog);
-};
-
-#endif // wxUSE_REARRANGECTRL
-
-#endif // _WX_REARRANGECTRL_H_
-
diff --git a/Source/3rd Party/wx/include/wx/recguard.h b/Source/3rd Party/wx/include/wx/recguard.h
index d2f72d441..045c27b26 100644
--- a/Source/3rd Party/wx/include/wx/recguard.h	
+++ b/Source/3rd Party/wx/include/wx/recguard.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     14.08.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: recguard.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/Source/3rd Party/wx/include/wx/regex.h b/Source/3rd Party/wx/include/wx/regex.h
index fa89c0c22..87f319126 100644
--- a/Source/3rd Party/wx/include/wx/regex.h	
+++ b/Source/3rd Party/wx/include/wx/regex.h	
@@ -4,7 +4,7 @@
 // Author:      Karsten Ballueder
 // Modified by: VZ at 13.07.01 (integrated to wxWin)
 // Created:     05.02.2000
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: regex.h 57779 2009-01-02 17:35:16Z PC $
 // Copyright:   (c) 2000 Karsten Ballueder <ballueder@gmx.net>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -97,9 +97,10 @@ public:
     // len may be the length of text (ignored by most system regex libs)
     //
     // may only be called after successful call to Compile()
-    bool Matches(const wxString& text, int flags = 0) const;
-    bool Matches(const wxChar *text, int flags, size_t len) const
-        { return Matches(wxString(text, len), flags); }
+    bool Matches(const wxChar *text, int flags = 0) const;
+    bool Matches(const wxChar *text, int flags, size_t len) const;
+    bool Matches(const wxString& text, int flags = 0) const
+        { return Matches(text.c_str(), flags, text.length()); }
 
     // get the start index and the length of the match of the expression
     // (index 0) or a bracketed subexpression (index != 0)
@@ -130,16 +131,16 @@ public:
     // pattern match
     //
     // maxMatches may be used to limit the number of replacements made, setting
-    // it to 1, for example, will only replace first occurrence (if any) of the
+    // it to 1, for example, will only replace first occurence (if any) of the
     // pattern in the text while default value of 0 means replace all
     int Replace(wxString *text, const wxString& replacement,
                 size_t maxMatches = 0) const;
 
-    // replace the first occurrence
+    // replace the first occurence
     int ReplaceFirst(wxString *text, const wxString& replacement) const
         { return Replace(text, replacement, 1); }
 
-    // replace all occurrences: this is actually a synonym for Replace()
+    // replace all occurences: this is actually a synonym for Replace()
     int ReplaceAll(wxString *text, const wxString& replacement) const
         { return Replace(text, replacement, 0); }
 
diff --git a/Source/3rd Party/wx/include/wx/region.h b/Source/3rd Party/wx/include/wx/region.h
index c6c24a5f3..2bbaed5e0 100644
--- a/Source/3rd Party/wx/include/wx/region.h	
+++ b/Source/3rd Party/wx/include/wx/region.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: region.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ enum wxRegionOp
 // wxRegionBase defines wxRegion API
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxRegionBase : public wxGDIObject
+class WXDLLEXPORT wxRegionBase : public wxGDIObject
 {
 public:
     // ctors
@@ -67,7 +67,7 @@ public:
     wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
-    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+    wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE);
     wxRegion(const wxBitmap& bmp);
     wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);
 #endif // 0
@@ -82,6 +82,9 @@ public:
     // accessors
     // ---------
 
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_refData != NULL; }
+
     // Is region empty?
     virtual bool IsEmpty() const = 0;
     bool Empty() const { return IsEmpty(); }
@@ -181,13 +184,14 @@ protected:
 // some ports implement a generic Combine() function while others only
 // implement individual wxRegion operations, factor out the common code for the
 // ports with Combine() in this class
-#if defined(__WXMSW__) || \
-    ( defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON ) || \
+#if defined(__WXPALMOS__) || \
+    defined(__WXMSW__) || \
+    defined(__WXMAC__) || \
     defined(__WXPM__)
 
 #define wxHAS_REGION_COMBINE
 
-class WXDLLIMPEXP_CORE wxRegionWithCombine : public wxRegionBase
+class WXDLLEXPORT wxRegionWithCombine : public wxRegionBase
 {
 public:
     // these methods are not part of public API as they're not implemented on
@@ -212,7 +216,9 @@ protected:
 
 #endif // ports with wxRegion::Combine()
 
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/region.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/region.h"
 #elif defined(__WXGTK20__)
     #include "wx/gtk/region.h"
@@ -220,10 +226,12 @@ protected:
     #include "wx/gtk1/region.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
     #include "wx/x11/region.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/region.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/region.h"
+    #include "wx/mac/region.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/region.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/renderer.h b/Source/3rd Party/wx/include/wx/renderer.h
index 8b4051f49..b28ec8531 100644
--- a/Source/3rd Party/wx/include/wx/renderer.h	
+++ b/Source/3rd Party/wx/include/wx/renderer.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: renderer.h 53667 2008-05-20 09:28:48Z VS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -28,24 +28,19 @@
 class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 
-#include "wx/gdicmn.h" // for wxPoint, wxSize
+#include "wx/gdicmn.h" // for wxPoint
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/bitmap.h"
 #include "wx/string.h"
 
 // some platforms have their own renderers, others use the generic one
-#if defined(__WXMSW__) || ( defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON ) || defined(__WXGTK__)
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK__)
     #define wxHAS_NATIVE_RENDERER
 #else
     #undef wxHAS_NATIVE_RENDERER
 #endif
 
-// only MSW and OS X currently provides DrawTitleBarBitmap() method
-#if defined(__WXMSW__) || (defined(__WXMAC__) && wxUSE_LIBPNG && wxUSE_IMAGE)
-    #define wxHAS_DRAW_TITLE_BAR_BITMAP
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -61,7 +56,6 @@ enum
     wxCONTROL_ISSUBMENU  = wxCONTROL_SPECIAL, // only for the menu items
     wxCONTROL_EXPANDED   = wxCONTROL_SPECIAL, // only for the tree items
     wxCONTROL_SIZEGRIP   = wxCONTROL_SPECIAL, // only for the status bar panes
-    wxCONTROL_FLAT       = wxCONTROL_SPECIAL, // checkboxes only: flat border
     wxCONTROL_CURRENT    = 0x00000010,  // mouse is currently over the control
     wxCONTROL_SELECTED   = 0x00000020,  // selected item in e.g. listbox
     wxCONTROL_CHECKED    = 0x00000040,  // (check/radio button) is checked
@@ -75,25 +69,12 @@ enum
     wxCONTROL_DIRTY      = 0x80000000
 };
 
-// title bar buttons supported by DrawTitleBarBitmap()
-//
-// NB: they have the same values as wxTOPLEVEL_BUTTON_XXX constants in
-//     wx/univ/toplevel.h as they really represent the same things
-enum wxTitleBarButton
-{
-    wxTITLEBAR_BUTTON_CLOSE    = 0x01000000,
-    wxTITLEBAR_BUTTON_MAXIMIZE = 0x02000000,
-    wxTITLEBAR_BUTTON_ICONIZE  = 0x04000000,
-    wxTITLEBAR_BUTTON_RESTORE  = 0x08000000,
-    wxTITLEBAR_BUTTON_HELP     = 0x10000000
-};
-
 // ----------------------------------------------------------------------------
 // helper structs
 // ----------------------------------------------------------------------------
 
 // wxSplitterWindow parameters
-struct WXDLLIMPEXP_CORE wxSplitterRenderParams
+struct WXDLLEXPORT wxSplitterRenderParams
 {
     // the only way to initialize this struct is by using this ctor
     wxSplitterRenderParams(wxCoord widthSash_, wxCoord border_, bool isSens_)
@@ -113,7 +94,7 @@ struct WXDLLIMPEXP_CORE wxSplitterRenderParams
 
 
 // extra optional parameters for DrawHeaderButton
-struct WXDLLIMPEXP_CORE wxHeaderButtonParams
+struct WXDLLEXPORT wxHeaderButtonParams
 {
     wxHeaderButtonParams()
         : m_labelAlignment(wxALIGN_LEFT)
@@ -128,16 +109,15 @@ struct WXDLLIMPEXP_CORE wxHeaderButtonParams
     int         m_labelAlignment;
 };
 
-enum wxHeaderSortIconType
-{
+enum wxHeaderSortIconType {
     wxHDR_SORT_ICON_NONE,        // Header button has no sort arrow
-    wxHDR_SORT_ICON_UP,          // Header button an up sort arrow icon
-    wxHDR_SORT_ICON_DOWN         // Header button a down sort arrow icon
+    wxHDR_SORT_ICON_UP,          // Header button an an up sort arrow icon
+    wxHDR_SORT_ICON_DOWN         // Header button an a down sort arrow icon
 };
 
 
 // wxRendererNative interface version
-struct WXDLLIMPEXP_CORE wxRendererVersion
+struct WXDLLEXPORT wxRendererVersion
 {
     wxRendererVersion(int version_, int age_) : version(version_), age(age_) { }
 
@@ -171,7 +151,7 @@ struct WXDLLIMPEXP_CORE wxRendererVersion
 // wxRendererNative: abstracts drawing methods needed by the native controls
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxRendererNative
+class WXDLLEXPORT wxRendererNative
 {
 public:
     // drawing functions
@@ -200,9 +180,6 @@ public:
     // height if available, or a generic height based on the window's font.
     virtual int GetHeaderButtonHeight(wxWindow *win) = 0;
 
-    // Returns the margin on left and right sides of header button's label
-    virtual int GetHeaderButtonMargin(wxWindow *win) = 0;
-
 
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton(wxWindow *win,
@@ -249,9 +226,6 @@ public:
                               const wxRect& rect,
                               int flags = 0) = 0;
 
-    // Returns the default size of a check box.
-    virtual wxSize GetCheckBoxSize(wxWindow *win) = 0;
-
     // draw blank button
     //
     // flags may use wxCONTROL_PRESSED, wxCONTROL_CURRENT and wxCONTROL_ISDEFAULT
@@ -272,56 +246,6 @@ public:
                                        const wxRect& rect,
                                        int flags = 0) = 0;
 
-    // draw the focus rectangle around the label contained in the given rect
-    //
-    // only wxCONTROL_SELECTED makes sense in flags here
-    virtual void DrawFocusRect(wxWindow* win,
-                               wxDC& dc,
-                               const wxRect& rect,
-                               int flags = 0) = 0;
-
-    // Draw a native wxChoice
-    virtual void DrawChoice(wxWindow* win,
-                            wxDC& dc,
-                            const wxRect& rect,
-                            int flags = 0) = 0;
-
-    // Draw a native wxComboBox
-    virtual void DrawComboBox(wxWindow* win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags = 0) = 0;
-
-    // Draw a native wxTextCtrl frame
-    virtual void DrawTextCtrl(wxWindow* win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags = 0) = 0;
-
-    // Draw a native wxRadioButton bitmap
-    virtual void DrawRadioBitmap(wxWindow* win,
-                                 wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags = 0) = 0;
-
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-    // Draw one of the standard title bar buttons
-    //
-    // This is currently implemented only for MSW and OS X (for the close
-    // button only) because there is no way to render standard title bar
-    // buttons under the other platforms, the best can be done is to use normal
-    // (only) images which wxArtProvider provides for wxART_HELP and
-    // wxART_CLOSE (but not any other title bar buttons)
-    //
-    // NB: make sure PNG handler is enabled if using this function under OS X
-    virtual void DrawTitleBarBitmap(wxWindow *win,
-                                    wxDC& dc,
-                                    const wxRect& rect,
-                                    wxTitleBarButton button,
-                                    int flags = 0) = 0;
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-
-
     // geometry functions
     // ------------------
 
@@ -375,7 +299,7 @@ public:
 // wxDelegateRendererNative: allows reuse of renderers code
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDelegateRendererNative : public wxRendererNative
+class WXDLLEXPORT wxDelegateRendererNative : public wxRendererNative
 {
 public:
     wxDelegateRendererNative()
@@ -404,9 +328,6 @@ public:
     virtual int GetHeaderButtonHeight(wxWindow *win)
         { return m_rendererNative.GetHeaderButtonHeight(win); }
 
-    virtual int GetHeaderButtonMargin(wxWindow *win)
-        { return m_rendererNative.GetHeaderButtonMargin(win); }
-
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
@@ -443,63 +364,21 @@ public:
     virtual void DrawCheckBox(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,
-                              int flags = 0)
+                              int flags = 0 )
         { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); }
 
-    virtual wxSize GetCheckBoxSize(wxWindow *win)
-        { return m_rendererNative.GetCheckBoxSize(win); }
-
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
-                                int flags = 0)
+                                int flags = 0 )
         { m_rendererNative.DrawPushButton( win, dc, rect, flags ); }
 
     virtual void DrawItemSelectionRect(wxWindow *win,
                                        wxDC& dc,
                                        const wxRect& rect,
-                                       int flags = 0)
+                                       int flags = 0 )
         { m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); }
 
-    virtual void DrawFocusRect(wxWindow* win,
-                               wxDC& dc,
-                               const wxRect& rect,
-                               int flags = 0)
-        { m_rendererNative.DrawFocusRect( win, dc, rect, flags ); }
-
-    virtual void DrawChoice(wxWindow* win,
-                            wxDC& dc,
-                            const wxRect& rect,
-                            int flags = 0)
-        { m_rendererNative.DrawChoice( win, dc, rect, flags); }
-
-    virtual void DrawComboBox(wxWindow* win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags = 0)
-        { m_rendererNative.DrawComboBox( win, dc, rect, flags); }
-
-    virtual void DrawTextCtrl(wxWindow* win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags = 0)
-        { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); }
-
-    virtual void DrawRadioBitmap(wxWindow* win,
-                                 wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags = 0)
-        { m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); }
-
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-    virtual void DrawTitleBarBitmap(wxWindow *win,
-                                    wxDC& dc,
-                                    const wxRect& rect,
-                                    wxTitleBarButton button,
-                                    int flags = 0)
-        { m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); }
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)
         { return m_rendererNative.GetSplitterParams(win); }
 
@@ -509,7 +388,7 @@ public:
 protected:
     wxRendererNative& m_rendererNative;
 
-    wxDECLARE_NO_COPY_CLASS(wxDelegateRendererNative);
+    DECLARE_NO_COPY_CLASS(wxDelegateRendererNative)
 };
 
 // ----------------------------------------------------------------------------
@@ -527,4 +406,31 @@ wxRendererNative& wxRendererNative::GetDefault()
 
 #endif // !wxHAS_NATIVE_RENDERER
 
+
+// ----------------------------------------------------------------------------
+// Other renderer functions to be merged in to wxRenderer class in 2.9, but
+// they are standalone functions here to protect the ABI.
+// ----------------------------------------------------------------------------
+
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK20__)
+#if wxABI_VERSION >= 20808
+
+// Draw a native wxChoice
+void WXDLLEXPORT wxRenderer_DrawChoice(wxWindow* win, wxDC& dc,
+                                       const wxRect& rect, int flags=0);
+
+// Draw a native wxComboBox
+void WXDLLEXPORT wxRenderer_DrawComboBox(wxWindow* win, wxDC& dc,
+                                         const wxRect& rect, int flags=0);
+
+// Draw a native wxTextCtrl frame
+void WXDLLEXPORT wxRenderer_DrawTextCtrl(wxWindow* win, wxDC& dc,
+                                         const wxRect& rect, int flags=0);
+
+// Draw a native wxRadioButton (just the graphical portion)
+void WXDLLEXPORT wxRenderer_DrawRadioButton(wxWindow* win, wxDC& dc,
+                                            const wxRect& rect, int flags=0);
+#endif // wxABI_VERSION
+#endif // (platforms)
+
 #endif // _WX_RENDERER_H_
diff --git a/Source/3rd Party/wx/include/wx/richmsgdlg.h b/Source/3rd Party/wx/include/wx/richmsgdlg.h
deleted file mode 100644
index be3e409d3..000000000
--- a/Source/3rd Party/wx/include/wx/richmsgdlg.h	
+++ /dev/null
@@ -1,89 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richmsgdlg.h
-// Purpose:     wxRichMessageDialogBase
-// Author:      Rickard Westerlund
-// Created:     2010-07-03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHMSGDLG_H_BASE_
-#define _WX_RICHMSGDLG_H_BASE_
-
-#include "wx/defs.h"
-
-#if wxUSE_RICHMSGDLG
-
-#include "wx/msgdlg.h"
-
-// Extends a message dialog with an optional checkbox and user-expandable
-// detailed text.
-class WXDLLIMPEXP_CORE wxRichMessageDialogBase : public wxGenericMessageDialog
-{
-public:
-    wxRichMessageDialogBase( wxWindow *parent,
-                             const wxString& message,
-                             const wxString& caption,
-                             long style )
-        : wxGenericMessageDialog( parent, message, caption, style ),
-          m_detailsExpanderCollapsedLabel( _("&See details") ),
-          m_detailsExpanderExpandedLabel( _("&Hide details") ),
-          m_checkBoxValue( false )
-        { }
-
-    void ShowCheckBox(const wxString& checkBoxText, bool checked = false)
-    {
-        m_checkBoxText = checkBoxText;
-        m_checkBoxValue = checked;
-    }
-
-    wxString GetCheckBoxText() const { return m_checkBoxText; }
-
-    void ShowDetailedText(const wxString& detailedText)
-        { m_detailedText = detailedText; }
-
-    wxString GetDetailedText() const { return m_detailedText; }
-
-    virtual bool IsCheckBoxChecked() const { return m_checkBoxValue; }
-
-protected:
-    const wxString m_detailsExpanderCollapsedLabel;
-    const wxString m_detailsExpanderExpandedLabel;
-
-    wxString m_checkBoxText;
-    bool m_checkBoxValue;
-    wxString m_detailedText;
-
-private:
-    void ShowDetails(bool shown);
-
-    wxDECLARE_NO_COPY_CLASS(wxRichMessageDialogBase);
-};
-
-// Always include the generic version as it's currently used as the base class
-// by the MSW native implementation too.
-#include "wx/generic/richmsgdlgg.h"
-
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    #include "wx/msw/richmsgdlg.h"
-#else
-    class WXDLLIMPEXP_CORE wxRichMessageDialog
-                           : public wxGenericRichMessageDialog
-    {
-    public:
-        wxRichMessageDialog( wxWindow *parent,
-                             const wxString& message,
-                             const wxString& caption,
-                             long style )
-            : wxGenericRichMessageDialog( parent, message, caption, style )
-            { }
-
-    private:
-        wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog);
-    };
-#endif
-
-#endif // wxUSE_RICHMSGDLG
-
-#endif // _WX_RICHMSGDLG_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/rtti.h b/Source/3rd Party/wx/include/wx/rtti.h
deleted file mode 100644
index e28921960..000000000
--- a/Source/3rd Party/wx/include/wx/rtti.h	
+++ /dev/null
@@ -1,320 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/rtti.h
-// Purpose:     old RTTI macros (use XTI when possible instead)
-// Author:      Julian Smart
-// Modified by: Ron Lee
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) 1997 Julian Smart
-//              (c) 2001 Ron Lee <ron@debian.org>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RTTIH__
-#define _WX_RTTIH__
-
-#if !wxUSE_EXTENDED_RTTI     // XTI system is meant to replace these macros
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/memory.h"
-
-// ----------------------------------------------------------------------------
-// forward declarations
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_BASE wxObject;
-class WXDLLIMPEXP_FWD_BASE wxString;
-class WXDLLIMPEXP_FWD_BASE wxClassInfo;
-class WXDLLIMPEXP_FWD_BASE wxHashTable;
-class WXDLLIMPEXP_FWD_BASE wxObject;
-class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;
-class WXDLLIMPEXP_FWD_BASE wxHashTable_Node;
-
-// ----------------------------------------------------------------------------
-// wxClassInfo
-// ----------------------------------------------------------------------------
-
-typedef wxObject *(*wxObjectConstructorFn)(void);
-
-class WXDLLIMPEXP_BASE wxClassInfo
-{
-    friend class WXDLLIMPEXP_FWD_BASE wxObject;
-    friend WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
-public:
-    wxClassInfo( const wxChar *className,
-                 const wxClassInfo *baseInfo1,
-                 const wxClassInfo *baseInfo2,
-                 int size,
-                 wxObjectConstructorFn ctor )
-        : m_className(className)
-        , m_objectSize(size)
-        , m_objectConstructor(ctor)
-        , m_baseInfo1(baseInfo1)
-        , m_baseInfo2(baseInfo2)
-        , m_next(sm_first)
-        {
-            sm_first = this;
-            Register();
-        }
-
-    ~wxClassInfo();
-
-    wxObject *CreateObject() const
-        { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
-    bool IsDynamic() const { return (NULL != m_objectConstructor); }
-
-    const wxChar       *GetClassName() const { return m_className; }
-    const wxChar       *GetBaseClassName1() const
-        { return m_baseInfo1 ? m_baseInfo1->GetClassName() : NULL; }
-    const wxChar       *GetBaseClassName2() const
-        { return m_baseInfo2 ? m_baseInfo2->GetClassName() : NULL; }
-    const wxClassInfo  *GetBaseClass1() const { return m_baseInfo1; }
-    const wxClassInfo  *GetBaseClass2() const { return m_baseInfo2; }
-    int                 GetSize() const { return m_objectSize; }
-
-    wxObjectConstructorFn      GetConstructor() const
-        { return m_objectConstructor; }
-    static const wxClassInfo  *GetFirst() { return sm_first; }
-    const wxClassInfo         *GetNext() const { return m_next; }
-    static wxClassInfo        *FindClass(const wxString& className);
-
-        // Climb upwards through inheritance hierarchy.
-        // Dual inheritance is catered for.
-
-    bool IsKindOf(const wxClassInfo *info) const
-    {
-        return info != 0 &&
-               ( info == this ||
-                 ( m_baseInfo1 && m_baseInfo1->IsKindOf(info) ) ||
-                 ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
-    }
-
-    wxDECLARE_CLASS_INFO_ITERATORS();
-
-private:
-    const wxChar            *m_className;
-    int                      m_objectSize;
-    wxObjectConstructorFn    m_objectConstructor;
-
-        // Pointers to base wxClassInfos
-
-    const wxClassInfo       *m_baseInfo1;
-    const wxClassInfo       *m_baseInfo2;
-
-        // class info object live in a linked list:
-        // pointers to its head and the next element in it
-
-    static wxClassInfo      *sm_first;
-    wxClassInfo             *m_next;
-
-    static wxHashTable      *sm_classTable;
-
-protected:
-    // registers the class
-    void Register();
-    void Unregister();
-
-    wxDECLARE_NO_COPY_CLASS(wxClassInfo);
-};
-
-WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
-
-// ----------------------------------------------------------------------------
-// Dynamic class macros
-// ----------------------------------------------------------------------------
-
-#define wxDECLARE_ABSTRACT_CLASS(name)                                        \
-    public:                                                                   \
-        static wxClassInfo ms_classInfo;                                      \
-        virtual wxClassInfo *GetClassInfo() const
-
-#define wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)                               \
-    wxDECLARE_NO_ASSIGN_CLASS(name);                                          \
-    wxDECLARE_DYNAMIC_CLASS(name)
-
-#define wxDECLARE_DYNAMIC_CLASS_NO_COPY(name)                                 \
-    wxDECLARE_NO_COPY_CLASS(name);                                            \
-    wxDECLARE_DYNAMIC_CLASS(name)
-
-#define wxDECLARE_DYNAMIC_CLASS(name)                                         \
-    wxDECLARE_ABSTRACT_CLASS(name);                                           \
-    static wxObject* wxCreateObject()
-
-#define wxDECLARE_CLASS(name)                                                 \
-    wxDECLARE_ABSTRACT_CLASS(name)
-
-
-// common part of the macros below
-#define wxIMPLEMENT_CLASS_COMMON(name, basename, baseclsinfo2, func)          \
-    wxClassInfo name::ms_classInfo(wxT(#name),                                \
-            &basename::ms_classInfo,                                          \
-            baseclsinfo2,                                                     \
-            (int) sizeof(name),                                               \
-            func);                                                            \
-                                                                              \
-    wxClassInfo *name::GetClassInfo() const                                   \
-        { return &name::ms_classInfo; }
-
-#define wxIMPLEMENT_CLASS_COMMON1(name, basename, func)                       \
-    wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func)
-
-#define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func)           \
-    wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo, func)
-
-// -----------------------------------
-// for concrete classes
-// -----------------------------------
-
-    // Single inheritance with one base class
-#define wxIMPLEMENT_DYNAMIC_CLASS(name, basename)                             \
-    wxIMPLEMENT_CLASS_COMMON1(name, basename, name::wxCreateObject)           \
-    wxObject* name::wxCreateObject()                                          \
-        { return new name; }
-
-    // Multiple inheritance with two base classes
-#define wxIMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)                \
-    wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2,                     \
-                              name::wxCreateObject)                           \
-    wxObject* name::wxCreateObject()                                          \
-        { return new name; }
-
-// -----------------------------------
-// for abstract classes
-// -----------------------------------
-
-    // Single inheritance with one base class
-#define wxIMPLEMENT_ABSTRACT_CLASS(name, basename)                            \
-    wxIMPLEMENT_CLASS_COMMON1(name, basename, NULL)
-
-    // Multiple inheritance with two base classes
-#define wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)               \
-    wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, NULL)
-
-// -----------------------------------
-// XTI-compatible macros
-// -----------------------------------
-
-#include "wx/flags.h"
-
-// these macros only do something when wxUSE_EXTENDED_RTTI=1
-// (and in that case they are defined by xti.h); however to avoid
-// to be forced to wrap these macros (in user's source files) with
-//
-//  #if wxUSE_EXTENDED_RTTI
-//  ...
-//  #endif
-//
-// blocks, we define them here as empty.
-
-#define wxEMPTY_PARAMETER_VALUE /**/
-
-#define wxBEGIN_ENUM( e ) wxEMPTY_PARAMETER_VALUE
-#define wxENUM_MEMBER( v ) wxEMPTY_PARAMETER_VALUE
-#define wxEND_ENUM( e ) wxEMPTY_PARAMETER_VALUE
-
-#define wxIMPLEMENT_SET_STREAMING(SetName,e) wxEMPTY_PARAMETER_VALUE
-
-#define wxBEGIN_FLAGS( e ) wxEMPTY_PARAMETER_VALUE
-#define wxFLAGS_MEMBER( v ) wxEMPTY_PARAMETER_VALUE
-#define wxEND_FLAGS( e ) wxEMPTY_PARAMETER_VALUE
-
-#define wxCOLLECTION_TYPE_INFO( element, collection ) wxEMPTY_PARAMETER_VALUE
-
-#define wxHANDLER(name,eventClassType) wxEMPTY_PARAMETER_VALUE
-#define wxBEGIN_HANDLERS_TABLE(theClass) wxEMPTY_PARAMETER_VALUE
-#define wxEND_HANDLERS_TABLE() wxEMPTY_PARAMETER_VALUE
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_XTI( name, basename, unit ) \
-    wxIMPLEMENT_DYNAMIC_CLASS( name, basename )
-#define wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name, basename, unit, callback ) \
-    wxIMPLEMENT_DYNAMIC_CLASS( name, basename )
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name, basename, unit ) \
-    wxIMPLEMENT_DYNAMIC_CLASS( name, basename)
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name, basename,  \
-                                                             unit, toString,    \
-                                                             fromString ) wxEMPTY_PARAMETER_VALUE
-#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name, unit ) wxEMPTY_PARAMETER_VALUE
-#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name, basename, unit ) wxEMPTY_PARAMETER_VALUE
-
-#define wxIMPLEMENT_DYNAMIC_CLASS2_XTI( name, basename, basename2, unit) wxIMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2 )
-
-#define wxCONSTRUCTOR_0(klass) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxCONSTRUCTOR_DUMMY(klass) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxDIRECT_CONSTRUCTOR_0(klass) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxCONSTRUCTOR_1(klass,t0,v0) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxDIRECT_CONSTRUCTOR_1(klass,t0,v0) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxCONSTRUCTOR_2(klass,t0,v0,t1,v1) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxDIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxCONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxDIRECT_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxCONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxDIRECT_CONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxCONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxDIRECT_CONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxCONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxDIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxCONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxDIRECT_CONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxCONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \
-    wxEMPTY_PARAMETER_VALUE
-#define wxDIRECT_CONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \
-    wxEMPTY_PARAMETER_VALUE
-
-#define wxSETTER( property, Klass, valueType, setterMethod ) wxEMPTY_PARAMETER_VALUE
-#define wxGETTER( property, Klass, valueType, gettermethod ) wxEMPTY_PARAMETER_VALUE
-#define wxADDER( property, Klass, valueType, addermethod ) wxEMPTY_PARAMETER_VALUE
-#define wxCOLLECTION_GETTER( property, Klass, valueType, gettermethod ) wxEMPTY_PARAMETER_VALUE
-
-#define wxBEGIN_PROPERTIES_TABLE(theClass) wxEMPTY_PARAMETER_VALUE
-#define wxEND_PROPERTIES_TABLE() wxEMPTY_PARAMETER_VALUE
-#define wxHIDE_PROPERTY( pname ) wxEMPTY_PARAMETER_VALUE
-
-#define wxPROPERTY( pname, type, setter, getter, defaultValue, flags, help, group) \
-    wxEMPTY_PARAMETER_VALUE
-
-#define wxPROPERTY_FLAGS( pname, flags, type, setter, getter,defaultValue,    \
-                          pflags, help, group) wxEMPTY_PARAMETER_VALUE
-
-#define wxREADONLY_PROPERTY( pname, type, getter,defaultValue, flags, help, group) \
-    wxGETTER( pname, class_t, type, getter ) wxEMPTY_PARAMETER_VALUE
-
-#define wxREADONLY_PROPERTY_FLAGS( pname, flags, type, getter,defaultValue,    \
-                                   pflags, help, group)  wxEMPTY_PARAMETER_VALUE
-
-#define wxPROPERTY_COLLECTION( pname, colltype, addelemtype, adder, getter,    \
-                               flags, help, group )  wxEMPTY_PARAMETER_VALUE
-
-#define wxREADONLY_PROPERTY_COLLECTION( pname, colltype, addelemtype, getter,   \
-                                        flags, help, group) wxEMPTY_PARAMETER_VALUE
-#define wxEVENT_PROPERTY( name, eventType, eventClass ) wxEMPTY_PARAMETER_VALUE
-
-#define wxEVENT_RANGE_PROPERTY( name, eventType, lastEventType, eventClass ) wxEMPTY_PARAMETER_VALUE
-
-#define wxIMPLEMENT_PROPERTY(name, type) wxEMPTY_PARAMETER_VALUE
-
-#define wxEMPTY_HANDLERS_TABLE(name) wxEMPTY_PARAMETER_VALUE
-
-#endif // !wxUSE_EXTENDED_RTTI
-#endif // _WX_RTTIH__
diff --git a/Source/3rd Party/wx/include/wx/scopedarray.h b/Source/3rd Party/wx/include/wx/scopedarray.h
deleted file mode 100644
index 5be7f354c..000000000
--- a/Source/3rd Party/wx/include/wx/scopedarray.h	
+++ /dev/null
@@ -1,120 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/scopedarray.h
-// Purpose:     scoped smart pointer class
-// Author:      Vadim Zeitlin
-// Created:     2009-02-03
-// RCS-ID:      $Id$
-// Copyright:   (c) Jesse Lovelace and original Boost authors (see below)
-//              (c) 2009 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SCOPED_ARRAY_H_
-#define _WX_SCOPED_ARRAY_H_
-
-#include "wx/defs.h"
-#include "wx/checkeddelete.h"
-
-// ----------------------------------------------------------------------------
-// wxScopedArray: A scoped array
-// ----------------------------------------------------------------------------
-
-template <class T>
-class wxScopedArray
-{
-public:
-    typedef T element_type;
-
-    wxEXPLICIT wxScopedArray(T * array = NULL) : m_array(array) { }
-
-    ~wxScopedArray() { delete [] m_array; }
-
-    // test for pointer validity: defining conversion to unspecified_bool_type
-    // and not more obvious bool to avoid implicit conversions to integer types
-    typedef T *(wxScopedArray<T>::*unspecified_bool_type)() const;
-    operator unspecified_bool_type() const
-    {
-        return m_array ? &wxScopedArray<T>::get : NULL;
-    }
-
-    void reset(T *array = NULL)
-    {
-        if ( array != m_array )
-        {
-            delete [] m_array;
-            m_array = array;
-        }
-    }
-
-    T& operator[](size_t n) const { return m_array[n]; }
-
-    T *get() const { return m_array; }
-
-    void swap(wxScopedArray &other)
-    {
-        T * const tmp = other.m_array;
-        other.m_array = m_array;
-        m_array = tmp;
-    }
-
-private:
-    T *m_array;
-
-    DECLARE_NO_COPY_TEMPLATE_CLASS(wxScopedArray, T)
-};
-
-// ----------------------------------------------------------------------------
-// old macro based implementation
-// ----------------------------------------------------------------------------
-
-// the same but for arrays instead of simple pointers
-#define wxDECLARE_SCOPED_ARRAY(T, name)\
-class name                          \
-{                                   \
-private:                            \
-    T * m_ptr;                      \
-    name(name const &);             \
-    name & operator=(name const &); \
-                                    \
-public:                             \
-    wxEXPLICIT name(T * p = NULL) : m_ptr(p) \
-    {}                              \
-                                    \
-    ~name();                        \
-    void reset(T * p = NULL);       \
-                                    \
-    T & operator[](long int i) const\
-    {                               \
-        wxASSERT(m_ptr != NULL);    \
-        wxASSERT(i >= 0);           \
-        return m_ptr[i];            \
-    }                               \
-                                    \
-    T * get() const                 \
-    {                               \
-        return m_ptr;               \
-    }                               \
-                                    \
-    void swap(name & ot)            \
-    {                               \
-        T * tmp = ot.m_ptr;         \
-        ot.m_ptr = m_ptr;           \
-        m_ptr = tmp;                \
-    }                               \
-};
-
-#define wxDEFINE_SCOPED_ARRAY(T, name)  \
-name::~name()                           \
-{                                       \
-    wxCHECKED_DELETE_ARRAY(m_ptr);      \
-}                                       \
-void name::reset(T * p){                \
-    if (m_ptr != p)                     \
-    {                                   \
-       wxCHECKED_DELETE_ARRAY(m_ptr);   \
-       m_ptr = p;                       \
-    }                                   \
-}
-
-#endif // _WX_SCOPED_ARRAY_H_
-
diff --git a/Source/3rd Party/wx/include/wx/scopedptr.h b/Source/3rd Party/wx/include/wx/scopedptr.h
deleted file mode 100644
index 1cae0f011..000000000
--- a/Source/3rd Party/wx/include/wx/scopedptr.h	
+++ /dev/null
@@ -1,215 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/scopedptr.h
-// Purpose:     scoped smart pointer class
-// Author:      Jesse Lovelace <jllovela@eos.ncsu.edu>
-// Created:     06/01/02
-// RCS-ID:      $Id$
-// Copyright:   (c) Jesse Lovelace and original Boost authors (see below)
-//              (c) 2009 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-//  This class closely follows the implementation of the boost
-//  library scoped_ptr and is an adaption for c++ macro's in
-//  the wxWidgets project. The original authors of the boost
-//  scoped_ptr are given below with their respective copyrights.
-
-//  (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
-//  Copyright (c) 2001, 2002 Peter Dimov
-//
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies.
-//  This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  See http://www.boost.org/libs/smart_ptr/scoped_ptr.htm for documentation.
-//
-
-#ifndef _WX_SCOPED_PTR_H_
-#define _WX_SCOPED_PTR_H_
-
-#include "wx/defs.h"
-#include "wx/checkeddelete.h"
-
-// ----------------------------------------------------------------------------
-// wxScopedPtr: A scoped pointer
-// ----------------------------------------------------------------------------
-
-template <class T>
-class wxScopedPtr
-{
-public:
-    typedef T element_type;
-
-    wxEXPLICIT wxScopedPtr(T * ptr = NULL) : m_ptr(ptr) { }
-
-    ~wxScopedPtr() { wxCHECKED_DELETE(m_ptr); }
-
-    // test for pointer validity: defining conversion to unspecified_bool_type
-    // and not more obvious bool to avoid implicit conversions to integer types
-#ifdef __BORLANDC__
-    // this compiler is too dumb to use unspecified_bool_type operator in tests
-    // of the form "if ( !ptr )"
-    typedef bool unspecified_bool_type;
-#else
-    typedef T *(wxScopedPtr<T>::*unspecified_bool_type)() const;
-#endif // __BORLANDC__
-    operator unspecified_bool_type() const
-    {
-        return m_ptr ? &wxScopedPtr<T>::get : NULL;
-    }
-
-    void reset(T * ptr = NULL)
-    {
-        if ( ptr != m_ptr )
-        {
-            wxCHECKED_DELETE(m_ptr);
-            m_ptr = ptr;
-        }
-    }
-
-    T *release()
-    {
-        T *ptr = m_ptr;
-        m_ptr = NULL;
-        return ptr;
-    }
-
-    T & operator*() const
-    {
-        wxASSERT(m_ptr != NULL);
-        return *m_ptr;
-    }
-
-    T * operator->() const
-    {
-        wxASSERT(m_ptr != NULL);
-        return m_ptr;
-    }
-
-    T * get() const
-    {
-        return m_ptr;
-    }
-
-    void swap(wxScopedPtr& other)
-    {
-        T * const tmp = other.m_ptr;
-        other.m_ptr = m_ptr;
-        m_ptr = tmp;
-    }
-
-private:
-    T * m_ptr;
-
-    DECLARE_NO_COPY_TEMPLATE_CLASS(wxScopedPtr, T)
-};
-
-// ----------------------------------------------------------------------------
-// old macro based implementation
-// ----------------------------------------------------------------------------
-
-/* The type being used *must* be complete at the time
-   that wxDEFINE_SCOPED_* is called or a compiler error will result.
-   This is because the class checks for the completeness of the type
-   being used. */
-
-#define wxDECLARE_SCOPED_PTR(T, name) \
-class name                          \
-{                                   \
-private:                            \
-    T * m_ptr;                      \
-                                    \
-    name(name const &);             \
-    name & operator=(name const &); \
-                                    \
-public:                             \
-    wxEXPLICIT name(T * ptr = NULL) \
-    : m_ptr(ptr) { }                \
-                                    \
-    ~name();                        \
-                                    \
-    void reset(T * ptr = NULL);     \
-                                    \
-    T *release()                    \
-    {                               \
-        T *ptr = m_ptr;             \
-        m_ptr = NULL;               \
-        return ptr;                 \
-    }                               \
-                                    \
-    T & operator*() const           \
-    {                               \
-        wxASSERT(m_ptr != NULL);    \
-        return *m_ptr;              \
-    }                               \
-                                    \
-    T * operator->() const          \
-    {                               \
-        wxASSERT(m_ptr != NULL);    \
-        return m_ptr;               \
-    }                               \
-                                    \
-    T * get() const                 \
-    {                               \
-        return m_ptr;               \
-    }                               \
-                                    \
-    void swap(name & ot)            \
-    {                               \
-        T * tmp = ot.m_ptr;         \
-        ot.m_ptr = m_ptr;           \
-        m_ptr = tmp;                \
-    }                               \
-};
-
-#define wxDEFINE_SCOPED_PTR(T, name)\
-void name::reset(T * ptr)           \
-{                                   \
-    if (m_ptr != ptr)               \
-    {                               \
-        wxCHECKED_DELETE(m_ptr);    \
-        m_ptr = ptr;                \
-    }                               \
-}                                   \
-name::~name()                       \
-{                                   \
-    wxCHECKED_DELETE(m_ptr);        \
-}
-
-// this macro can be used for the most common case when you want to declare and
-// define the scoped pointer at the same time and want to use the standard
-// naming convention: auto pointer to Foo is called FooPtr
-#define wxDEFINE_SCOPED_PTR_TYPE(T)    \
-    wxDECLARE_SCOPED_PTR(T, T ## Ptr)  \
-    wxDEFINE_SCOPED_PTR(T, T ## Ptr)
-
-// ----------------------------------------------------------------------------
-// "Tied" scoped pointer: same as normal one but also sets the value of
-//                        some other variable to the pointer value
-// ----------------------------------------------------------------------------
-
-#define wxDEFINE_TIED_SCOPED_PTR_TYPE(T)                                      \
-    wxDEFINE_SCOPED_PTR_TYPE(T)                                               \
-    class T ## TiedPtr : public T ## Ptr                                      \
-    {                                                                         \
-    public:                                                                   \
-        T ## TiedPtr(T **pp, T *p)                                            \
-            : T ## Ptr(p), m_pp(pp)                                           \
-        {                                                                     \
-            m_pOld = *pp;                                                     \
-            *pp = p;                                                          \
-        }                                                                     \
-                                                                              \
-        ~ T ## TiedPtr()                                                      \
-        {                                                                     \
-            *m_pp = m_pOld;                                                   \
-        }                                                                     \
-                                                                              \
-    private:                                                                  \
-        T **m_pp;                                                             \
-        T *m_pOld;                                                            \
-    };
-
-#endif // _WX_SCOPED_PTR_H_
-
diff --git a/Source/3rd Party/wx/include/wx/scopeguard.h b/Source/3rd Party/wx/include/wx/scopeguard.h
index 3c80ea8a6..2517e86e4 100644
--- a/Source/3rd Party/wx/include/wx/scopeguard.h	
+++ b/Source/3rd Party/wx/include/wx/scopeguard.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.07.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: scopeguard.h 44111 2007-01-07 13:28:16Z SN $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -51,8 +51,14 @@
 
 #else
 
+#if !defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 95)
+// namespace support was first implemented in gcc-2.95,
+// so avoid using it for older versions.
 namespace wxPrivate
 {
+#else
+#define wxPrivate
+#endif
     // in the original implementation this was a member template function of
     // ScopeGuardImplBase but gcc 2.8 which is still used for OS/2 doesn't
     // support member templates and so we must make it global
@@ -75,7 +81,9 @@ namespace wxPrivate
     void Use(const T& WXUNUSED(t))
     {
     }
+#if !defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 95)
 } // namespace wxPrivate
+#endif
 
 #define wxPrivateOnScopeExit(n) wxPrivate::OnScopeExit(n)
 #define wxPrivateUse(n) wxPrivate::Use(n)
@@ -95,12 +103,6 @@ class wxScopeGuardImplBase
 public:
     wxScopeGuardImplBase() : m_wasDismissed(false) { }
 
-    wxScopeGuardImplBase(const wxScopeGuardImplBase& other)
-        : m_wasDismissed(other.m_wasDismissed)
-    {
-        other.Dismiss();
-    }
-
     void Dismiss() const { m_wasDismissed = true; }
 
     // for OnScopeExit() only (we can't make it friend, unfortunately)!
@@ -109,6 +111,12 @@ public:
 protected:
     ~wxScopeGuardImplBase() { }
 
+    wxScopeGuardImplBase(const wxScopeGuardImplBase& other)
+        : m_wasDismissed(other.m_wasDismissed)
+    {
+        other.Dismiss();
+    }
+
     // must be mutable for copy ctor to work
     mutable bool m_wasDismissed;
 
@@ -116,9 +124,6 @@ private:
     wxScopeGuardImplBase& operator=(const wxScopeGuardImplBase&);
 };
 
-// wxScopeGuard is just a reference, see the explanation in CUJ article
-typedef const wxScopeGuardImplBase& wxScopeGuard;
-
 // ----------------------------------------------------------------------------
 // wxScopeGuardImpl0: scope guard for actions without parameters
 // ----------------------------------------------------------------------------
@@ -215,41 +220,6 @@ inline wxScopeGuardImpl2<F, P1, P2> wxMakeGuard(F fun, P1 p1, P2 p2)
     return wxScopeGuardImpl2<F, P1, P2>::MakeGuard(fun, p1, p2);
 }
 
-// ----------------------------------------------------------------------------
-// wxScopeGuardImpl3: scope guard for actions with 3 parameters
-// ----------------------------------------------------------------------------
-
-template <class F, class P1, class P2, class P3>
-class wxScopeGuardImpl3 : public wxScopeGuardImplBase
-{
-public:
-    static wxScopeGuardImpl3<F, P1, P2, P3> MakeGuard(F fun, P1 p1, P2 p2, P3 p3)
-    {
-        return wxScopeGuardImpl3<F, P1, P2, P3>(fun, p1, p2, p3);
-    }
-
-    ~wxScopeGuardImpl3() { wxPrivateOnScopeExit(*this); }
-
-    void Execute() { m_fun(m_p1, m_p2, m_p3); }
-
-protected:
-    wxScopeGuardImpl3(F fun, P1 p1, P2 p2, P3 p3)
-        : m_fun(fun), m_p1(p1), m_p2(p2), m_p3(p3) { }
-
-    F m_fun;
-    const P1 m_p1;
-    const P2 m_p2;
-    const P3 m_p3;
-
-    wxScopeGuardImpl3& operator=(const wxScopeGuardImpl3&);
-};
-
-template <class F, class P1, class P2, class P3>
-inline wxScopeGuardImpl3<F, P1, P2, P3> wxMakeGuard(F fun, P1 p1, P2 p2, P3 p3)
-{
-    return wxScopeGuardImpl3<F, P1, P2, P3>::MakeGuard(fun, p1, p2, p3);
-}
-
 // ============================================================================
 // wxScopeGuards for object methods
 // ============================================================================
@@ -348,125 +318,21 @@ wxMakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2)
                                             MakeObjGuard(obj, memFun, p1, p2);
 }
 
-template <class Obj, class MemFun, class P1, class P2, class P3>
-class wxObjScopeGuardImpl3 : public wxScopeGuardImplBase
-{
-public:
-    static wxObjScopeGuardImpl3<Obj, MemFun, P1, P2, P3>
-        MakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2, P3 p3)
-    {
-        return wxObjScopeGuardImpl3<Obj, MemFun, P1, P2, P3>(obj, memFun, p1, p2, p3);
-    }
-
-    ~wxObjScopeGuardImpl3() { wxPrivateOnScopeExit(*this); }
-
-    void Execute() { (m_obj.*m_memfun)(m_p1, m_p2, m_p3); }
-
-protected:
-    wxObjScopeGuardImpl3(Obj& obj, MemFun memFun, P1 p1, P2 p2, P3 p3)
-        : m_obj(obj), m_memfun(memFun), m_p1(p1), m_p2(p2), m_p3(p3) { }
-
-    Obj& m_obj;
-    MemFun m_memfun;
-    const P1 m_p1;
-    const P2 m_p2;
-    const P3 m_p3;
-};
-
-template <class Obj, class MemFun, class P1, class P2, class P3>
-inline wxObjScopeGuardImpl3<Obj, MemFun, P1, P2, P3>
-wxMakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2, P3 p3)
-{
-    return wxObjScopeGuardImpl3<Obj, MemFun, P1, P2, P3>::
-                                        MakeObjGuard(obj, memFun, p1, p2, p3);
-}
-
-// ----------------------------------------------------------------------------
-// wxVariableSetter: use the same technique as for wxScopeGuard to allow
-//                   setting a variable to some value on block exit
-// ----------------------------------------------------------------------------
-
-namespace wxPrivate
-{
-
-// empty class just to be able to define a reference to it
-class VariableSetterBase : public wxScopeGuardImplBase { };
-
-typedef const VariableSetterBase& VariableSetter;
-
-template <typename T, typename U>
-class VariableSetterImpl : public VariableSetterBase
-{
-public:
-    VariableSetterImpl(T& var, U value)
-        : m_var(var),
-          m_value(value)
-    {
-    }
-
-    ~VariableSetterImpl() { wxPrivateOnScopeExit(*this); }
-
-    void Execute() { m_var = m_value; }
-
-private:
-    T& m_var;
-    const U m_value;
-
-    // suppress the warning about assignment operator not being generated
-    VariableSetterImpl<T, U>& operator=(const VariableSetterImpl<T, U>&);
-};
-
-template <typename T>
-class VariableNullerImpl : public VariableSetterBase
-{
-public:
-    VariableNullerImpl(T& var)
-        : m_var(var)
-    {
-    }
-
-    ~VariableNullerImpl() { wxPrivateOnScopeExit(*this); }
-
-    void Execute() { m_var = NULL; }
-
-private:
-    T& m_var;
-
-    VariableNullerImpl<T>& operator=(const VariableNullerImpl<T>&);
-};
-
-} // namespace wxPrivate
-
-template <typename T, typename U>
-inline
-wxPrivate::VariableSetterImpl<T, U> wxMakeVarSetter(T& var, U value)
-{
-      return wxPrivate::VariableSetterImpl<T, U>(var, value);
-}
-
-// calling wxMakeVarSetter(ptr, NULL) doesn't work because U is deduced to be
-// "int" and subsequent assignment of "U" to "T *" fails, so provide a special
-// function for this special case
-template <typename T>
-inline
-wxPrivate::VariableNullerImpl<T> wxMakeVarNuller(T& var)
-{
-    return wxPrivate::VariableNullerImpl<T>(var);
-}
-
 // ============================================================================
-// macros for declaring unnamed scoped guards (which can't be dismissed)
+// public stuff
 // ============================================================================
 
+// wxScopeGuard is just a reference, see the explanation in CUJ article
+typedef const wxScopeGuardImplBase& wxScopeGuard;
+
+// when an unnamed scope guard is needed, the macros below may be used
+//
 // NB: the original code has a single (and much nicer) ON_BLOCK_EXIT macro
 //     but this results in compiler warnings about unused variables and I
 //     didn't find a way to work around this other than by having different
-//     macros with different names or using a less natural syntax for passing
-//     the arguments (e.g. as Boost preprocessor sequences, which would mean
-//     having to write wxON_BLOCK_EXIT(fwrite, (buf)(size)(n)(fp)) instead of
-//     wxON_BLOCK_EXIT4(fwrite, buf, size, n, fp)).
+//     macros with different names
 
-#define wxGuardName    wxMAKE_UNIQUE_NAME(wxScopeGuard)
+#define wxGuardName    wxMAKE_UNIQUE_NAME(scopeGuard)
 
 #define wxON_BLOCK_EXIT0_IMPL(n, f) \
     wxScopeGuard n = wxMakeGuard(f); \
@@ -480,10 +346,6 @@ wxPrivate::VariableNullerImpl<T> wxMakeVarNuller(T& var)
 #define wxON_BLOCK_EXIT_OBJ0(o, m) \
     wxON_BLOCK_EXIT_OBJ0_IMPL(wxGuardName, o, &m)
 
-#define wxON_BLOCK_EXIT_THIS0(m) \
-    wxON_BLOCK_EXIT_OBJ0(*this, m)
-
-
 #define wxON_BLOCK_EXIT1_IMPL(n, f, p1) \
     wxScopeGuard n = wxMakeGuard(f, p1); \
     wxPrivateUse(n)
@@ -496,10 +358,6 @@ wxPrivate::VariableNullerImpl<T> wxMakeVarNuller(T& var)
 #define wxON_BLOCK_EXIT_OBJ1(o, m, p1) \
     wxON_BLOCK_EXIT_OBJ1_IMPL(wxGuardName, o, &m, p1)
 
-#define wxON_BLOCK_EXIT_THIS1(m, p1) \
-    wxON_BLOCK_EXIT_OBJ1(*this, m, p1)
-
-
 #define wxON_BLOCK_EXIT2_IMPL(n, f, p1, p2) \
     wxScopeGuard n = wxMakeGuard(f, p1, p2); \
     wxPrivateUse(n)
@@ -512,40 +370,4 @@ wxPrivate::VariableNullerImpl<T> wxMakeVarNuller(T& var)
 #define wxON_BLOCK_EXIT_OBJ2(o, m, p1, p2) \
     wxON_BLOCK_EXIT_OBJ2_IMPL(wxGuardName, o, &m, p1, p2)
 
-#define wxON_BLOCK_EXIT_THIS2(m, p1, p2) \
-    wxON_BLOCK_EXIT_OBJ2(*this, m, p1, p2)
-
-
-#define wxON_BLOCK_EXIT3_IMPL(n, f, p1, p2, p3) \
-    wxScopeGuard n = wxMakeGuard(f, p1, p2, p3); \
-    wxPrivateUse(n)
-#define wxON_BLOCK_EXIT3(f, p1, p2, p3) \
-    wxON_BLOCK_EXIT3_IMPL(wxGuardName, f, p1, p2, p3)
-
-#define wxON_BLOCK_EXIT_OBJ3_IMPL(n, o, m, p1, p2, p3) \
-    wxScopeGuard n = wxMakeObjGuard(o, m, p1, p2, p3); \
-    wxPrivateUse(n)
-#define wxON_BLOCK_EXIT_OBJ3(o, m, p1, p2, p3) \
-    wxON_BLOCK_EXIT_OBJ3_IMPL(wxGuardName, o, &m, p1, p2, p3)
-
-#define wxON_BLOCK_EXIT_THIS3(m, p1, p2, p3) \
-    wxON_BLOCK_EXIT_OBJ3(*this, m, p1, p2, p3)
-
-
-#define wxSetterName wxMAKE_UNIQUE_NAME(wxVarSetter)
-
-#define wxON_BLOCK_EXIT_SET_IMPL(n, var, value) \
-    wxPrivate::VariableSetter n = wxMakeVarSetter(var, value); \
-    wxPrivateUse(n)
-
-#define wxON_BLOCK_EXIT_SET(var, value) \
-    wxON_BLOCK_EXIT_SET_IMPL(wxSetterName, var, value)
-
-#define wxON_BLOCK_EXIT_NULL_IMPL(n, var) \
-    wxPrivate::VariableSetter n = wxMakeVarNuller(var); \
-    wxPrivateUse(n)
-
-#define wxON_BLOCK_EXIT_NULL(ptr) \
-    wxON_BLOCK_EXIT_NULL_IMPL(wxSetterName, ptr)
-
 #endif // _WX_SCOPEGUARD_H_
diff --git a/Source/3rd Party/wx/include/wx/scrolbar.h b/Source/3rd Party/wx/include/wx/scrolbar.h
index 99dbc3036..97dab1af9 100644
--- a/Source/3rd Party/wx/include/wx/scrolbar.h	
+++ b/Source/3rd Party/wx/include/wx/scrolbar.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/scrolbar.h
+// Name:        scrolbar.h
 // Purpose:     wxScrollBar base header
 // Author:      Julian Smart
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: scrolbar.h 37066 2006-01-23 03:27:34Z MR $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -18,21 +18,18 @@
 
 #include "wx/control.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxScrollBarNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxScrollBarBase : public wxControl
+class WXDLLEXPORT wxScrollBarBase : public wxControl
 {
 public:
     wxScrollBarBase() { }
 
-    /*
-        Derived classes should provide the following method and ctor with the
-        same parameters:
-
+    // scrollbar construction
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
@@ -40,7 +37,6 @@ public:
                 long style = wxSB_HORIZONTAL,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxScrollBarNameStr);
-    */
 
     // accessors
     virtual int GetThumbPosition() const = 0;
@@ -56,11 +52,8 @@ public:
                               int range, int pageSize,
                               bool refresh = true) = 0;
 
-    // implementation-only
-    bool IsNeeded() const { return GetRange() > GetThumbSize(); }
-
 private:
-    wxDECLARE_NO_COPY_CLASS(wxScrollBarBase);
+    DECLARE_NO_COPY_CLASS(wxScrollBarBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -74,7 +67,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/scrolbar.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/scrolbar.h"
+    #include "wx/mac/scrolbar.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/scrolbar.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/scrolwin.h b/Source/3rd Party/wx/include/wx/scrolwin.h
index 747b6e62e..c5d06fa1e 100644
--- a/Source/3rd Party/wx/include/wx/scrolwin.h	
+++ b/Source/3rd Party/wx/include/wx/scrolwin.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/scrolwin.h
+// Name:        include/wx/scrolwin.h
 // Purpose:     wxScrolledWindow, wxScrolledControl and wxScrollHelper
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     30.08.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: scrolwin.h 50864 2007-12-20 18:36:19Z VS $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,19 +15,11 @@
 #include "wx/panel.h"
 
 class WXDLLIMPEXP_FWD_CORE wxScrollHelperEvtHandler;
-class WXDLLIMPEXP_FWD_BASE wxTimer;
+class WXDLLIMPEXP_FWD_CORE wxTimer;
 
 // default scrolled window style: scroll in both directions
 #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
 
-// values for the second argument of wxScrollHelper::ShowScrollbars()
-enum wxScrollbarVisibility
-{
-    wxSHOW_SB_NEVER = -1,   // never show the scrollbar at all
-    wxSHOW_SB_DEFAULT,      // show scrollbar only if it is needed
-    wxSHOW_SB_ALWAYS        // always show scrollbar, even if not needed
-};
-
 // ----------------------------------------------------------------------------
 // The hierarchy of scrolling classes is a bit complicated because we want to
 // put as much functionality as possible in a mix-in class not deriving from
@@ -37,11 +29,11 @@ enum wxScrollbarVisibility
 //
 // So we have
 //
-//                           wxScrollHelperBase
+//                             wxScrollHelper
 //                                   |
 //                                   |
 //                                  \|/
-//      wxWindow               wxScrollHelper
+//      wxWindow            wxScrollHelperNative
 //       |  \                   /        /
 //       |   \                 /        /
 //       |    _|             |_        /
@@ -56,12 +48,12 @@ enum wxScrollbarVisibility
 //
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxScrollHelperBase
+class WXDLLEXPORT wxScrollHelper
 {
 public:
     // ctor must be given the associated window
-    wxScrollHelperBase(wxWindow *winToScroll);
-    virtual ~wxScrollHelperBase();
+    wxScrollHelper(wxWindow *winToScroll);
+    virtual ~wxScrollHelper();
 
     // configure the scrolling
     virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
@@ -70,18 +62,13 @@ public:
                                bool noRefresh = false );
 
     // scroll to the given (in logical coords) position
-    //
-    // notice that for backwards compatibility reasons Scroll() is virtual as
-    // the existing code could override it but new code should override
-    // DoScroll() instead
-    virtual void Scroll(int x, int y) { DoScroll(x, y); }
-    virtual void Scroll(const wxPoint& pt) { DoScroll(pt.x, pt.y); }
+    virtual void Scroll(int x, int y);
 
     // get/set the page size for this orientation (wxVERTICAL/wxHORIZONTAL)
     int GetScrollPageSize(int orient) const;
     void SetScrollPageSize(int orient, int pageSize);
 
-    // get the number of lines the window can scroll,
+    // get the number of lines the window can scroll, 
     // returns 0 if no scrollbars are there.
     int GetScrollLines( int orient ) const;
 
@@ -89,17 +76,8 @@ public:
     void SetScrollRate( int xstep, int ystep );
 
     // get the size of one logical unit in physical ones
-    void GetScrollPixelsPerUnit(int *pixelsPerUnitX, int *pixelsPerUnitY) const;
-
-    // Set scrollbar visibility: it is possible to show scrollbar only if it is
-    // needed (i.e. if our virtual size is greater than the current size of the
-    // associated window), always (as wxALWAYS_SHOW_SB style does) or never (in
-    // which case you should provide some other way to scroll the window as the
-    // user wouldn't be able to do it at all)
-    void ShowScrollbars(wxScrollbarVisibility horz, wxScrollbarVisibility vert)
-    {
-        DoShowScrollbars(horz, vert);
-    }
+    virtual void GetScrollPixelsPerUnit(int *pixelsPerUnitX,
+                                        int *pixelsPerUnitY) const;
 
     // Enable/disable Windows scrolling in either direction. If true, wxWidgets
     // scrolls the canvas and only a bit of the canvas is invalidated; no
@@ -108,26 +86,8 @@ public:
     // actually scroll a non-constant distance
     virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
 
-    // Disable use of keyboard keys for scrolling. By default cursor movement
-    // keys (including Home, End, Page Up and Down) are used to scroll the
-    // window appropriately. If the derived class uses these keys for something
-    // else, e.g. changing the currently selected item, this function can be
-    // used to disable this behaviour as it's not only not necessary then but
-    // can actually be actively harmful if another object forwards a keyboard
-    // event corresponding to one of the above keys to us using
-    // ProcessWindowEvent() because the event will always be processed which
-    // can be undesirable.
-    void DisableKeyboardScrolling() { m_kbdScrollingEnabled = false; }
-
     // Get the view start
-    void GetViewStart(int *x, int *y) const { DoGetViewStart(x, y); }
-
-    wxPoint GetViewStart() const
-    {
-        wxPoint pt;
-        DoGetViewStart(&pt.x, &pt.y);
-        return pt;
-    }
+    virtual void GetViewStart(int *x, int *y) const;
 
     // Set the scale factor, used in PrepareDC
     void SetScale(double xs, double ys) { m_scaleX = xs; m_scaleY = ys; }
@@ -153,21 +113,21 @@ public:
         return p2;
     }
 
-    void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
-    void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
+    virtual void DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const;
+    virtual void DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
 
     // Adjust the scrollbars
-    virtual void AdjustScrollbars() = 0;
+    virtual void AdjustScrollbars(void);
 
     // Calculate scroll increment
-    int CalcScrollInc(wxScrollWinEvent& event);
+    virtual int CalcScrollInc(wxScrollWinEvent& event);
 
     // Normally the wxScrolledWindow will scroll itself, but in some rare
     // occasions you might want it to scroll [part of] another window (e.g. a
     // child of it in order to scroll only a portion the area between the
     // scrollbars (spreadsheet: only cell area will move).
-    void SetTargetWindow(wxWindow *target);
-    wxWindow *GetTargetWindow() const;
+    virtual void SetTargetWindow(wxWindow *target);
+    virtual wxWindow *GetTargetWindow() const;
 
     void SetTargetRect(const wxRect& rect) { m_rectToScroll = rect; }
     wxRect GetTargetRect() const { return m_rectToScroll; }
@@ -202,13 +162,14 @@ public:
 #if wxUSE_MOUSEWHEEL
     void HandleOnMouseWheel(wxMouseEvent& event);
 #endif // wxUSE_MOUSEWHEEL
-    void HandleOnChildFocus(wxChildFocusEvent& event);
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED(
-        void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
+#if wxABI_VERSION >= 20808
+    void HandleOnChildFocus(wxChildFocusEvent& event);
+#endif
+
+    // FIXME: this is needed for now for wxPlot compilation, should be removed
+    //        once it is fixed!
+    void OnScroll(wxScrollWinEvent& event) { HandleOnScroll(event); }
 
 protected:
     // get pointer to our scroll rect if we use it or NULL
@@ -233,17 +194,12 @@ protected:
             *h = size.y;
     }
 
-    // implementation of public methods with the same name
-    virtual void DoGetViewStart(int *x, int *y) const;
-    virtual void DoScroll(int x, int y) = 0;
-    virtual void DoShowScrollbars(wxScrollbarVisibility horz,
-                                  wxScrollbarVisibility vert) = 0;
-
     // implementations of various wxWindow virtual methods which should be
     // forwarded to us (this can be done by WX_FORWARD_TO_SCROLL_HELPER())
     bool ScrollLayout();
     void ScrollDoSetVirtualSize(int x, int y);
     wxSize ScrollGetBestVirtualSize() const;
+    wxSize ScrollGetWindowSizeForVirtualSize(const wxSize& size) const;
 
     // change just the target window (unlike SetWindow which changes m_win as
     // well)
@@ -252,26 +208,6 @@ protected:
     // delete the event handler we installed
     void DeleteEvtHandler();
 
-    // calls wxScrollHelperEvtHandler::ResetDrawnFlag(), see explanation
-    // in wxScrollHelperEvtHandler::ProcessEvent()
-    void ResetDrawnFlag();
-
-    // this function should be overridden to return the size available for
-    // m_targetWindow inside m_win of the given size
-    //
-    // the default implementation is only good for m_targetWindow == m_win
-    // case, if we're scrolling a subwindow you must override this method
-    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size)
-    {
-        // returning just size from here is wrong but it was decided that it is
-        // not wrong enough to break the existing code (which doesn't override
-        // this recently added function at all) by adding this assert
-        //
-        // wxASSERT_MSG( m_targetWindow == m_win, "must be overridden" );
-
-        return size;
-    }
-
 
     double                m_scaleX;
     double                m_scaleY;
@@ -295,15 +231,13 @@ protected:
     bool                  m_xScrollingEnabled;
     bool                  m_yScrollingEnabled;
 
-    bool                  m_kbdScrollingEnabled;
-
 #if wxUSE_MOUSEWHEEL
     int m_wheelRotation;
 #endif // wxUSE_MOUSEWHEEL
 
     wxScrollHelperEvtHandler *m_handler;
 
-    wxDECLARE_NO_COPY_CLASS(wxScrollHelperBase);
+    DECLARE_NO_COPY_CLASS(wxScrollHelper)
 };
 
 // this macro can be used in a wxScrollHelper-derived class to forward wxWindow
@@ -315,143 +249,66 @@ public:                                                                       \
     virtual void DoSetVirtualSize(int x, int y)                               \
         { ScrollDoSetVirtualSize(x, y); }                                     \
     virtual wxSize GetBestVirtualSize() const                                 \
-        { return ScrollGetBestVirtualSize(); }
+        { return ScrollGetBestVirtualSize(); }                                \
+protected:                                                                    \
+    virtual wxSize GetWindowSizeForVirtualSize(const wxSize& size) const      \
+        { return ScrollGetWindowSizeForVirtualSize(size); }
 
-// include the declaration of the real wxScrollHelper
+// include the declaration of wxScrollHelperNative if needed
 #if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/scrolwin.h"
 #elif defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk1/scrolwin.h"
 #else
-    #define wxHAS_GENERIC_SCROLLWIN
-    #include "wx/generic/scrolwin.h"
+    typedef wxScrollHelper wxScrollHelperNative;
 #endif
 
 // ----------------------------------------------------------------------------
-// wxScrolled<T>: a wxWindow which knows how to scroll
+// wxScrolledWindow: a wxWindow which knows how to scroll
 // ----------------------------------------------------------------------------
 
-// helper class for wxScrolled<T> below
-struct WXDLLIMPEXP_CORE wxScrolledT_Helper
-{
-    static wxSize FilterBestSize(const wxWindow *win,
-                                 const wxScrollHelper *helper,
-                                 const wxSize& origBest);
-#ifdef __WXMSW__
-    static WXLRESULT FilterMSWWindowProc(WXUINT nMsg, WXLRESULT origResult);
-#endif
-};
-
-// Scrollable window base on window type T. This used to be wxScrolledWindow,
-// but wxScrolledWindow includes wxControlContainer functionality and that's
-// not always desirable.
-template<class T>
-class wxScrolled : public T,
-                   public wxScrollHelper,
-                   private wxScrolledT_Helper
+class WXDLLEXPORT wxScrolledWindow : public wxPanel,
+                                     public wxScrollHelperNative
 {
 public:
-    wxScrolled() : wxScrollHelper(this) { }
-    wxScrolled(wxWindow *parent,
-               wxWindowID winid = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxScrolledWindowStyle,
-               const wxString& name = wxPanelNameStr)
-        : wxScrollHelper(this)
-    {
-        Create(parent, winid, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID winid,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxScrolledWindowStyle,
-                const wxString& name = wxPanelNameStr)
-    {
-        m_targetWindow = this;
-
-#ifdef __WXMAC__
-        this->MacSetClipChildren(true);
-#endif
-
-        this->Connect(wxEVT_PAINT, wxPaintEventHandler(wxScrolled::OnPaint));
-
-        // by default, we're scrollable in both directions (but if one of the
-        // styles is specified explicitly, we shouldn't add the other one
-        // automatically)
-        if ( !(style & (wxHSCROLL | wxVSCROLL)) )
-            style |= wxHSCROLL | wxVSCROLL;
-
-        return T::Create(parent, winid, pos, size, style, name);
-    }
-
-    // we need to return a special WM_GETDLGCODE value to process just the
-    // arrows but let the other navigation characters through
-#ifdef __WXMSW__
-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-    {
-        return FilterMSWWindowProc(nMsg, T::MSWWindowProc(nMsg, wParam, lParam));
-    }
-#endif // __WXMSW__
-
-    WX_FORWARD_TO_SCROLL_HELPER()
-
-protected:
-    virtual wxSize DoGetBestSize() const
-    {
-        return FilterBestSize(this, this, T::DoGetBestSize());
-    }
-
-private:
-    // this is needed for wxEVT_PAINT processing hack described in
-    // wxScrollHelperEvtHandler::ProcessEvent()
-    void OnPaint(wxPaintEvent& event)
-    {
-        // the user code didn't really draw the window if we got here, so set
-        // this flag to try to call OnDraw() later
-        ResetDrawnFlag();
-        event.Skip();
-    }
-
-    // VC++ 6 gives warning for the declaration of template member function
-    // without definition
-#ifndef __VISUALC6__
-    wxDECLARE_NO_COPY_CLASS(wxScrolled);
-#endif
-};
-
-#ifdef __VISUALC6__
-    // disable the warning about non dll-interface class used as base for
-    // dll-interface class: it's harmless in this case
-    #pragma warning(push)
-    #pragma warning(disable:4275)
-#endif
-
-// for compatibility with existing code, we provide wxScrolledWindow
-// "typedef" for wxScrolled<wxPanel>. It's not a real typedef because we
-// want wxScrolledWindow to show in wxRTTI information (the class is widely
-// used and likelihood of its wxRTTI information being used too is high):
-class WXDLLIMPEXP_CORE wxScrolledWindow : public wxScrolled<wxPanel>
-{
-public:
-    wxScrolledWindow() : wxScrolled<wxPanel>() {}
+    wxScrolledWindow() : wxScrollHelperNative(this) { }
     wxScrolledWindow(wxWindow *parent,
                      wxWindowID winid = wxID_ANY,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxScrolledWindowStyle,
                      const wxString& name = wxPanelNameStr)
-        : wxScrolled<wxPanel>(parent, winid, pos, size, style, name) {}
+        : wxScrollHelperNative(this)
+    {
+        Create(parent, winid, pos, size, style, name);
+    }
 
+    virtual ~wxScrolledWindow();
+
+    bool Create(wxWindow *parent,
+                wxWindowID winid,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxScrolledWindowStyle,
+                const wxString& name = wxPanelNameStr);
+
+    // we need to return a special WM_GETDLGCODE value to process just the
+    // arrows but let the other navigation characters through
+#ifdef __WXMSW__
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#endif // __WXMSW__
+
+    WX_FORWARD_TO_SCROLL_HELPER()
+
+protected:
+    // this is needed for wxEVT_PAINT processing hack described in
+    // wxScrollHelperEvtHandler::ProcessEvent()
+    void OnPaint(wxPaintEvent& event);
+
+private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow)
+    DECLARE_EVENT_TABLE()
 };
 
-typedef wxScrolled<wxWindow> wxScrolledCanvas;
-
-#ifdef __VISUALC6__
-    #pragma warning(pop)
-#endif
-
 #endif // _WX_SCROLWIN_H_BASE_
+
diff --git a/Source/3rd Party/wx/include/wx/selstore.h b/Source/3rd Party/wx/include/wx/selstore.h
index 7ae71e366..56b11e4af 100644
--- a/Source/3rd Party/wx/include/wx/selstore.h	
+++ b/Source/3rd Party/wx/include/wx/selstore.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.03 (extracted from src/generic/listctrl.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: selstore.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,12 +18,14 @@
 // wxSelectedIndices is just a sorted array of indices
 // ----------------------------------------------------------------------------
 
-inline int CMPFUNC_CONV wxUIntCmp(unsigned n1, unsigned n2)
+inline int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2)
 {
     return (int)(n1 - n2);
 }
 
-WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_INT(unsigned, wxUIntCmp, wxSelectedIndices);
+WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_SIZE_T(size_t,
+                                           wxSizeTCmpFn,
+                                           wxSelectedIndices);
 
 // ----------------------------------------------------------------------------
 // wxSelectionStore is used to store the selected items in the virtual
@@ -37,43 +39,43 @@ WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_INT(unsigned, wxUIntCmp, wxSelectedIndices);
 // individual items) without changing its API.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSelectionStore
+class WXDLLEXPORT wxSelectionStore
 {
 public:
-    wxSelectionStore() : m_itemsSel(wxUIntCmp) { Init(); }
+    wxSelectionStore() : m_itemsSel(wxSizeTCmpFn) { Init(); }
 
     // set the total number of items we handle
-    void SetItemCount(unsigned count);
+    void SetItemCount(size_t count) { m_count = count; }
 
     // special case of SetItemCount(0)
     void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = false; }
 
     // must be called when a new item is inserted/added
-    void OnItemAdd(unsigned WXUNUSED(item)) { wxFAIL_MSG( wxT("TODO") ); }
+    void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( wxT("TODO") ); }
 
     // must be called when an item is deleted
-    void OnItemDelete(unsigned item);
+    void OnItemDelete(size_t item);
 
     // select one item, use SelectRange() insted if possible!
     //
     // returns true if the items selection really changed
-    bool SelectItem(unsigned item, bool select = true);
+    bool SelectItem(size_t item, bool select = true);
 
-    // select the range of items (inclusive)
+    // select the range of items
     //
     // return true and fill the itemsChanged array with the indices of items
     // which have changed state if "few" of them did, otherwise return false
     // (meaning that too many items changed state to bother counting them
     // individually)
-    bool SelectRange(unsigned itemFrom, unsigned itemTo,
+    bool SelectRange(size_t itemFrom, size_t itemTo,
                      bool select = true,
                      wxArrayInt *itemsChanged = NULL);
 
     // return true if the given item is selected
-    bool IsSelected(unsigned item) const;
+    bool IsSelected(size_t item) const;
 
     // return the total number of selected items
-    unsigned GetSelectedCount() const
+    size_t GetSelectedCount() const
     {
         return m_defaultState ? m_count - m_itemsSel.GetCount()
                               : m_itemsSel.GetCount();
@@ -84,7 +86,7 @@ private:
     void Init() { m_defaultState = false; }
 
     // the total number of items we handle
-    unsigned m_count;
+    size_t m_count;
 
     // the default state: normally, false (i.e. off) but maybe set to true if
     // there are more selected items than non selected ones - this allows to
@@ -94,8 +96,9 @@ private:
     // the array of items whose selection state is different from default
     wxSelectedIndices m_itemsSel;
 
-    wxDECLARE_NO_COPY_CLASS(wxSelectionStore);
+    DECLARE_NO_COPY_CLASS(wxSelectionStore)
 };
 
+
 #endif // _WX_SELSTORE_H_
 
diff --git a/Source/3rd Party/wx/include/wx/settings.h b/Source/3rd Party/wx/include/wx/settings.h
index 10bfcf6f1..5d732d0d2 100644
--- a/Source/3rd Party/wx/include/wx/settings.h	
+++ b/Source/3rd Party/wx/include/wx/settings.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: settings.h 67017 2011-02-25 09:37:28Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,15 +28,8 @@ enum wxSystemFont
     wxSYS_ANSI_VAR_FONT,
     wxSYS_SYSTEM_FONT,
     wxSYS_DEVICE_DEFAULT_FONT,
-
-    // don't use: this is here just to make the values of enum elements
-    // coincide with the corresponding MSW constants
     wxSYS_DEFAULT_PALETTE,
-
-    // don't use: MSDN says that this is a stock object provided only
-    // for compatibility with 16-bit Windows versions earlier than 3.0!
     wxSYS_SYSTEM_FIXED_FONT,
-
     wxSYS_DEFAULT_GUI_FONT,
 
     // this was just a temporary aberration, do not use it any more
@@ -50,7 +43,8 @@ enum wxSystemFont
 enum wxSystemColour
 {
     wxSYS_COLOUR_SCROLLBAR,
-    wxSYS_COLOUR_DESKTOP,
+    wxSYS_COLOUR_BACKGROUND,
+    wxSYS_COLOUR_DESKTOP = wxSYS_COLOUR_BACKGROUND,
     wxSYS_COLOUR_ACTIVECAPTION,
     wxSYS_COLOUR_INACTIVECAPTION,
     wxSYS_COLOUR_MENU,
@@ -65,11 +59,16 @@ enum wxSystemColour
     wxSYS_COLOUR_HIGHLIGHT,
     wxSYS_COLOUR_HIGHLIGHTTEXT,
     wxSYS_COLOUR_BTNFACE,
+    wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,
     wxSYS_COLOUR_BTNSHADOW,
+    wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW,
     wxSYS_COLOUR_GRAYTEXT,
     wxSYS_COLOUR_BTNTEXT,
     wxSYS_COLOUR_INACTIVECAPTIONTEXT,
     wxSYS_COLOUR_BTNHIGHLIGHT,
+    wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
+    wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
+    wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
     wxSYS_COLOUR_3DDKSHADOW,
     wxSYS_COLOUR_3DLIGHT,
     wxSYS_COLOUR_INFOTEXT,
@@ -83,16 +82,7 @@ enum wxSystemColour
     wxSYS_COLOUR_LISTBOXTEXT,
     wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT,
 
-    wxSYS_COLOUR_MAX,
-
-    // synonyms
-    wxSYS_COLOUR_BACKGROUND = wxSYS_COLOUR_DESKTOP,
-    wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,
-    wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW,
-    wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
-    wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
-    wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
-    wxSYS_COLOUR_FRAMEBK = wxSYS_COLOUR_BTNFACE
+    wxSYS_COLOUR_MAX
 };
 
 // possible values for wxSystemSettings::GetMetric() index parameter
@@ -137,8 +127,7 @@ enum wxSystemMetric
     wxSYS_NETWORK_PRESENT,
     wxSYS_PENWINDOWS_PRESENT,
     wxSYS_SHOW_SOUNDS,
-    wxSYS_SWAP_BUTTONS,
-    wxSYS_DCLICK_MSEC
+    wxSYS_SWAP_BUTTONS
 };
 
 // possible values for wxSystemSettings::HasFeature() parameter
@@ -171,7 +160,7 @@ enum wxSystemScreenType
 // files (i.e. this is not a real base class as we can't override its virtual
 // functions because it doesn't have any)
 
-class WXDLLIMPEXP_CORE wxSystemSettingsNative
+class WXDLLEXPORT wxSystemSettingsNative
 {
 public:
     // get a standard system colour
@@ -191,7 +180,7 @@ public:
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSystemSettings : public wxSystemSettingsNative
+class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative
 {
 public:
 #ifdef __WXUNIVERSAL__
@@ -199,10 +188,6 @@ public:
     // system ones, otherwise wxSystemSettings is just the same as
     // wxSystemSettingsNative
     static wxColour GetColour(wxSystemColour index);
-
-    // some metrics are toolkit-dependent and provided by wxUniv, some are
-    // lowlevel
-    static int GetMetric(wxSystemMetric index, wxWindow *win = NULL);
 #endif // __WXUNIVERSAL__
 
     // Get system screen design (desktop, pda, ..) used for
@@ -215,6 +200,13 @@ public:
     // Value
     static wxSystemScreenType ms_screen;
 
+#if WXWIN_COMPATIBILITY_2_4
+    // the backwards compatible versions of wxSystemSettingsNative functions,
+    // don't use these methods in the new code!
+    wxDEPRECATED(static wxColour GetSystemColour(int index));
+    wxDEPRECATED(static wxFont GetSystemFont(int index));
+    wxDEPRECATED(static int GetSystemMetric(int index));
+#endif
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/sharedptr.h b/Source/3rd Party/wx/include/wx/sharedptr.h
deleted file mode 100644
index ed4735f19..000000000
--- a/Source/3rd Party/wx/include/wx/sharedptr.h	
+++ /dev/null
@@ -1,141 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/sharedptr.h
-// Purpose:     Shared pointer based on the counted_ptr<> template, which
-//              is in the public domain
-// Author:      Robert Roebling, Yonat Sharon
-// RCS-ID:      $Id$
-// Copyright:   Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SHAREDPTR_H_
-#define _WX_SHAREDPTR_H_
-
-#include "wx/defs.h"
-#include "wx/atomic.h"
-
-// ----------------------------------------------------------------------------
-// wxSharedPtr: A smart pointer with non-intrusive reference counting.
-// ----------------------------------------------------------------------------
-
-template <class T>
-class wxSharedPtr
-{
-public:
-    typedef T element_type;
-
-    wxEXPLICIT wxSharedPtr( T* ptr = NULL )
-        : m_ref(NULL)
-    {
-        if (ptr)
-            m_ref = new reftype(ptr);
-    }
-
-    ~wxSharedPtr()                           { Release(); }
-    wxSharedPtr(const wxSharedPtr& tocopy)   { Acquire(tocopy.m_ref); }
-
-    wxSharedPtr& operator=( const wxSharedPtr& tocopy )
-    {
-        if (this != &tocopy)
-        {
-            Release();
-            Acquire(tocopy.m_ref);
-        }
-        return *this;
-    }
-
-    wxSharedPtr& operator=( T* ptr )
-    {
-        if (get() != ptr)
-        {
-            Release();
-            if (ptr)
-                m_ref = new reftype(ptr);
-        }
-        return *this;
-    }
-
-    // test for pointer validity: defining conversion to unspecified_bool_type
-    // and not more obvious bool to avoid implicit conversions to integer types
-    typedef T *(wxSharedPtr<T>::*unspecified_bool_type)() const;
-    operator unspecified_bool_type() const
-    {
-        if (m_ref && m_ref->m_ptr)
-           return  &wxSharedPtr<T>::get;
-        else
-           return NULL;
-    }
-
-    T& operator*() const
-    {
-        wxASSERT(m_ref != NULL);
-        wxASSERT(m_ref->m_ptr != NULL);
-        return *(m_ref->m_ptr);
-    }
-
-    T* operator->() const
-    {
-        wxASSERT(m_ref != NULL);
-        wxASSERT(m_ref->m_ptr != NULL);
-        return m_ref->m_ptr;
-    }
-
-    T* get() const
-    {
-        return m_ref ? m_ref->m_ptr : NULL;
-    }
-
-    void reset( T* ptr = NULL )
-    {
-        Release();
-        if (ptr)
-            m_ref = new reftype(ptr);
-    }
-
-    bool unique()   const    { return (m_ref ? m_ref->m_count == 1 : true); }
-    long use_count() const   { return (m_ref ? (long)m_ref->m_count : 0); }
-
-private:
-
-    struct reftype
-    {
-        reftype( T* ptr = NULL, unsigned count = 1 ) : m_ptr(ptr), m_count(count) {}
-        T*          m_ptr;
-        wxAtomicInt m_count;
-    }* m_ref;
-
-    void Acquire(reftype* ref)
-    {
-        m_ref = ref;
-        if (ref)
-            wxAtomicInc( ref->m_count );
-    }
-
-    void Release()
-    {
-        if (m_ref)
-        {
-            wxAtomicDec( m_ref->m_count );
-            if (m_ref->m_count == 0)
-            {
-                delete m_ref->m_ptr;
-                delete m_ref;
-            }
-            m_ref = NULL;
-        }
-    }
-};
-
-template <class T, class U>
-bool operator == (wxSharedPtr<T> const &a, wxSharedPtr<U> const &b )
-{
-    return a.get() == b.get();
-}
-
-template <class T, class U>
-bool operator != (wxSharedPtr<T> const &a, wxSharedPtr<U> const &b )
-{
-    return a.get() != b.get();
-}
-
-#endif // _WX_SHAREDPTR_H_
diff --git a/Source/3rd Party/wx/include/wx/sizer.h b/Source/3rd Party/wx/include/wx/sizer.h
index 3c53081c3..e95ab437e 100644
--- a/Source/3rd Party/wx/include/wx/sizer.h	
+++ b/Source/3rd Party/wx/include/wx/sizer.h	
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling and Robin Dunn
 // Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: sizer.h 52331 2008-03-05 15:02:22Z VS $
 // Copyright:   (c) Robin Dunn, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -24,6 +24,8 @@ class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxBoxSizer;
 class WXDLLIMPEXP_FWD_CORE wxSizerItem;
 class WXDLLIMPEXP_FWD_CORE wxSizer;
+class WXDLLIMPEXP_FWD_CORE wxFlexGridSizer;
+class WXDLLIMPEXP_FWD_CORE wxGridBagSizer;
 
 #ifndef wxUSE_BORDER_BY_DEFAULT
     #ifdef __SMARTPHONE__
@@ -38,7 +40,7 @@ class WXDLLIMPEXP_FWD_CORE wxSizer;
 // wxSizerFlags: flags used for an item in the sizer
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSizerFlags
+class WXDLLEXPORT wxSizerFlags
 {
 public:
     // construct the flags object initialized with the given proportion (0 by
@@ -58,15 +60,6 @@ public:
         return *this;
     }
 
-    wxSizerFlags& Expand()
-    {
-        m_flags |= wxEXPAND;
-        return *this;
-    }
-
-    // notice that Align() replaces the current alignment flags, use specific
-    // methods below such as Top(), Left() &c if you want to set just the
-    // vertical or horizontal alignment
     wxSizerFlags& Align(int alignment) // combination of wxAlignment values
     {
         m_flags &= ~wxALIGN_MASK;
@@ -75,48 +68,30 @@ public:
         return *this;
     }
 
+    wxSizerFlags& Expand()
+    {
+        m_flags |= wxEXPAND;
+        return *this;
+    }
+
     // some shortcuts for Align()
-    wxSizerFlags& Centre() { return Align(wxALIGN_CENTRE); }
+    wxSizerFlags& Centre() { return Align(wxCENTRE); }
     wxSizerFlags& Center() { return Centre(); }
+    wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }
+    wxSizerFlags& Right() { return Align(wxALIGN_RIGHT); }
 
-    wxSizerFlags& Top()
-    {
-        m_flags &= ~(wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL);
-        return *this;
-    }
-
-    wxSizerFlags& Left()
-    {
-        m_flags &= ~(wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL);
-        return *this;
-    }
-
-    wxSizerFlags& Right()
-    {
-        m_flags = (m_flags & ~wxALIGN_CENTRE_HORIZONTAL) | wxALIGN_RIGHT;
-        return *this;
-    }
-
-    wxSizerFlags& Bottom()
-    {
-        m_flags = (m_flags & ~wxALIGN_CENTRE_VERTICAL) | wxALIGN_BOTTOM;
-        return *this;
-    }
-
+#if wxABI_VERSION >= 20802
+    wxSizerFlags& Top() { return Align(wxALIGN_TOP); }
+    wxSizerFlags& Bottom() { return Align(wxALIGN_BOTTOM); }
+#endif // wxABI 2.8.2+
 
     // default border size used by Border() below
     static int GetDefaultBorder()
     {
 #if wxUSE_BORDER_BY_DEFAULT
-    #ifdef __WXGTK20__
-        // GNOME HIG says to use 6px as the base unit:
-        // http://library.gnome.org/devel/hig-book/stable/design-window.html.en
-        return 6;
-    #else
         // FIXME: default border size shouldn't be hardcoded and at the very
         //        least they should depend on the current font size
         return 5;
-    #endif
 #else
         return 0;
 #endif
@@ -185,6 +160,7 @@ public:
 #endif
     }
 
+#if wxABI_VERSION >= 20802
     // setters for the others flags
     wxSizerFlags& Shaped()
     {
@@ -199,13 +175,12 @@ public:
 
         return *this;
     }
+#endif // wx 2.8.2+
 
+#if wxABI_VERSION >= 20808
     // makes the item ignore window's visibility status
-    wxSizerFlags& ReserveSpaceEvenIfHidden()
-    {
-        m_flags |= wxRESERVE_SPACE_EVEN_IF_HIDDEN;
-        return *this;
-    }
+    wxSizerFlags& ReserveSpaceEvenIfHidden();
+#endif
 
     // accessors for wxSizer only
     int GetProportion() const { return m_proportion; }
@@ -223,7 +198,7 @@ private:
 // wxSizerSpacer: used by wxSizerItem to represent a spacer
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSizerSpacer
+class WXDLLEXPORT wxSizerSpacer
 {
 public:
     wxSizerSpacer(const wxSize& size) : m_size(size), m_isShown(true) { }
@@ -246,53 +221,53 @@ private:
 // wxSizerItem
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSizerItem : public wxObject
+class WXDLLEXPORT wxSizerItem : public wxObject
 {
 public:
     // window
     wxSizerItem( wxWindow *window,
-                 int proportion=0,
-                 int flag=0,
-                 int border=0,
-                 wxObject* userData=NULL );
+                 int proportion,
+                 int flag,
+                 int border,
+                 wxObject* userData );
 
     // window with flags
     wxSizerItem(wxWindow *window, const wxSizerFlags& flags)
     {
         Init(flags);
 
-        DoSetWindow(window);
+        SetWindow(window);
     }
 
     // subsizer
     wxSizerItem( wxSizer *sizer,
-                 int proportion=0,
-                 int flag=0,
-                 int border=0,
-                 wxObject* userData=NULL );
+                 int proportion,
+                 int flag,
+                 int border,
+                 wxObject* userData );
 
     // sizer with flags
     wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags)
     {
         Init(flags);
 
-        DoSetSizer(sizer);
+        SetSizer(sizer);
     }
 
     // spacer
     wxSizerItem( int width,
                  int height,
-                 int proportion=0,
-                 int flag=0,
-                 int border=0,
-                 wxObject* userData=NULL);
+                 int proportion,
+                 int flag,
+                 int border,
+                 wxObject* userData);
 
     // spacer with flags
     wxSizerItem(int width, int height, const wxSizerFlags& flags)
     {
         Init(flags);
 
-        DoSetSpacer(wxSize(width, height));
+        SetSpacer(width, height);
     }
 
     wxSizerItem();
@@ -335,11 +310,6 @@ public:
 
     virtual wxRect GetRect() { return m_rect; }
 
-    // set a sizer item id (different from a window id, all sizer items,
-    // including spacers, can have an associated id)
-    void SetId(int id) { m_id = id; }
-    int GetId() const { return m_id; }
-
     bool IsWindow() const { return m_kind == Item_Window; }
     bool IsSizer() const { return m_kind == Item_Sizer; }
     bool IsSpacer() const { return m_kind == Item_Spacer; }
@@ -369,12 +339,10 @@ public:
         { return m_kind == Item_Sizer ? m_sizer : NULL; }
     wxSize GetSpacer() const;
 
-    // This function behaves obviously for the windows and spacers but for the
+    // this function behaves obviously for the windows and spacers but for the
     // sizers it returns true if any sizer element is shown and only returns
-    // false if all of them are hidden. Also, it always returns true if
-    // wxRESERVE_SPACE_EVEN_IF_HIDDEN flag was used.
+    // false if all of them are hidden
     bool IsShown() const;
-
     void Show(bool show);
 
     void SetUserData(wxObject* userData)
@@ -384,57 +352,20 @@ public:
     wxPoint GetPosition() const
         { return m_pos; }
 
-    // Called once the first component of an item has been decided. This is
-    // used in algorithms that depend on knowing the size in one direction
-    // before the min size in the other direction can be known.
-    // Returns true if it made use of the information (and min size was changed).
-    bool InformFirstDirection( int direction, int size, int availableOtherDir=-1 );
 
-    // these functions delete the current contents of the item if it's a sizer
-    // or a spacer but not if it is a window
-    void AssignWindow(wxWindow *window)
-    {
-        Free();
-        DoSetWindow(window);
-    }
-
-    void AssignSizer(wxSizer *sizer)
-    {
-        Free();
-        DoSetSizer(sizer);
-    }
-
-    void AssignSpacer(const wxSize& size)
-    {
-        Free();
-        DoSetSpacer(size);
-    }
-
-    void AssignSpacer(int w, int h) { AssignSpacer(wxSize(w, h)); }
-
-#if WXWIN_COMPATIBILITY_2_8
-    // these functions do not free the old sizer/spacer and so can easily
-    // provoke the memory leaks and so shouldn't be used, use Assign() instead
-    wxDEPRECATED( void SetWindow(wxWindow *window) );
-    wxDEPRECATED( void SetSizer(wxSizer *sizer) );
-    wxDEPRECATED( void SetSpacer(const wxSize& size) );
-    wxDEPRECATED( void SetSpacer(int width, int height) );
-#endif // WXWIN_COMPATIBILITY_2_8
+    // these functions do not free old sizer/spacer
+    void SetWindow(wxWindow *window);
+    void SetSizer(wxSizer *sizer);
+    void SetSpacer(const wxSize& size);
+    void SetSpacer(int width, int height) { SetSpacer(wxSize(width, height)); }
 
 protected:
     // common part of several ctors
-    void Init() { m_userData = NULL; m_kind = Item_None; }
+    void Init() { m_userData = NULL; }
 
     // common part of ctors taking wxSizerFlags
     void Init(const wxSizerFlags& flags);
 
-    // free current contents
-    void Free();
-
-    // common parts of Set/AssignXXX()
-    void DoSetWindow(wxWindow *window);
-    void DoSetSizer(wxSizer *sizer);
-    void DoSetSpacer(const wxSize& size);
 
     // discriminated union: depending on m_kind one of the fields is valid
     enum
@@ -457,7 +388,6 @@ protected:
     int          m_proportion;
     int          m_border;
     int          m_flag;
-    int          m_id;
 
     // on screen rectangle of this item (not including borders)
     wxRect       m_rect;
@@ -470,8 +400,15 @@ protected:
     wxObject    *m_userData;
 
 private:
+    // 2.8-only implementation detail for wxRESERVE_SPACE_EVEN_IF_HIDDEN
+    bool ShouldAccountFor() const;
+
     DECLARE_CLASS(wxSizerItem)
-    wxDECLARE_NO_COPY_CLASS(wxSizerItem);
+    DECLARE_NO_COPY_CLASS(wxSizerItem)
+
+    friend class wxBoxSizer;
+    friend class wxFlexGridSizer;
+    friend class wxGridBagSizer;
 };
 
 WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList );
@@ -481,7 +418,7 @@ WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList );
 // wxSizer
 //---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSizer: public wxObject, public wxClientDataContainer
+class WXDLLEXPORT wxSizer: public wxObject, public wxClientDataContainer
 {
 public:
     wxSizer() { m_containingWindow = NULL; }
@@ -507,10 +444,9 @@ public:
                      wxObject* userData = NULL);
     wxSizerItem* Add( wxWindow *window, const wxSizerFlags& flags);
     wxSizerItem* Add( wxSizer *sizer, const wxSizerFlags& flags);
-    wxSizerItem* Add( int width, int height, const wxSizerFlags& flags);
     wxSizerItem* Add( wxSizerItem *item);
 
-    virtual wxSizerItem *AddSpacer(int size);
+    wxSizerItem* AddSpacer(int size);
     wxSizerItem* AddStretchSpacer(int prop = 1);
 
     wxSizerItem* Insert(size_t index,
@@ -538,15 +474,7 @@ public:
     wxSizerItem* Insert(size_t index,
                         wxSizer *sizer,
                         const wxSizerFlags& flags);
-    wxSizerItem* Insert(size_t index,
-                        int width,
-                        int height,
-                        const wxSizerFlags& flags);
-
-    // NB: do _not_ override this function in the derived classes, this one is
-    //     virtual for compatibility reasons only to allow old code overriding
-    //     it to continue to work, override DoInsert() instead in the new code
-    virtual wxSizerItem* Insert(size_t index, wxSizerItem *item);
+    virtual wxSizerItem* Insert( size_t index, wxSizerItem *item);
 
     wxSizerItem* InsertSpacer(size_t index, int size);
     wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);
@@ -569,7 +497,6 @@ public:
                          wxObject* userData = NULL);
     wxSizerItem* Prepend(wxWindow *window, const wxSizerFlags& flags);
     wxSizerItem* Prepend(wxSizer *sizer, const wxSizerFlags& flags);
-    wxSizerItem* Prepend(int width, int height, const wxSizerFlags& flags);
     wxSizerItem* Prepend(wxSizerItem *item);
 
     wxSizerItem* PrependSpacer(int size);
@@ -600,11 +527,6 @@ public:
     virtual void Clear( bool delete_windows = false );
     virtual void DeleteWindows();
 
-    // Inform sizer about the first direction that has been decided (by parent item)
-    // Returns true if it made use of the informtion (and recalculated min size)
-    virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) )
-        { return false; }
-
     void SetMinSize( int width, int height )
         { DoSetMinSize( width, height ); }
     void SetMinSize( const wxSize& size )
@@ -635,51 +557,29 @@ public:
     // Calculate the minimal size or return m_minSize if bigger.
     wxSize GetMinSize();
 
-    // These virtual functions are used by the layout algorithm: first
-    // CalcMin() is called to calculate the minimal size of the sizer and
-    // prepare for laying it out and then RecalcSizes() is called to really
-    // update all the sizer items
-    virtual wxSize CalcMin() = 0;
     virtual void RecalcSizes() = 0;
+    virtual wxSize CalcMin() = 0;
 
     virtual void Layout();
 
+#if wxABI_VERSION >= 20808
     wxSize ComputeFittingClientSize(wxWindow *window);
     wxSize ComputeFittingWindowSize(wxWindow *window);
+#endif
 
     wxSize Fit( wxWindow *window );
     void FitInside( wxWindow *window );
     void SetSizeHints( wxWindow *window );
-#if WXWIN_COMPATIBILITY_2_8
-    // This only calls FitInside() since 2.9
-    wxDEPRECATED( void SetVirtualSizeHints( wxWindow *window ) );
-#endif
+    void SetVirtualSizeHints( wxWindow *window );
 
     wxSizerItemList& GetChildren()
         { return m_children; }
-    const wxSizerItemList& GetChildren() const
-        { return m_children; }
 
-    void SetDimension(const wxPoint& pos, const wxSize& size)
-    {
-        m_position = pos;
-        m_size = size;
-        Layout();
-
-        // This call is required for wxWrapSizer to be able to calculate its
-        // minimal size correctly.
-        InformFirstDirection(wxHORIZONTAL, size.x, size.y);
-    }
-    void SetDimension(int x, int y, int width, int height)
-        { SetDimension(wxPoint(x, y), wxSize(width, height)); }
-
-    size_t GetItemCount() const { return m_children.GetCount(); }
-    bool IsEmpty() const { return m_children.IsEmpty(); }
+    void SetDimension( int x, int y, int width, int height );
 
     wxSizerItem* GetItem( wxWindow *window, bool recursive = false );
     wxSizerItem* GetItem( wxSizer *sizer, bool recursive = false );
     wxSizerItem* GetItem( size_t index );
-    wxSizerItem* GetItemById( int id, bool recursive = false );
 
     // Manage whether individual scene items are considered
     // in the layout calculations or not.
@@ -712,6 +612,8 @@ protected:
     // the window this sizer is used in, can be NULL
     wxWindow *m_containingWindow;
 
+    wxSize GetMaxWindowSize( wxWindow *window ) const;
+    wxSize GetMinWindowSize( wxWindow *window );
     wxSize GetMaxClientSize( wxWindow *window ) const;
     wxSize GetMinClientSize( wxWindow *window );
     wxSize VirtualFitSize( wxWindow *window );
@@ -721,10 +623,6 @@ protected:
     virtual bool DoSetItemMinSize( wxSizer *sizer, int width, int height );
     virtual bool DoSetItemMinSize( size_t index, int width, int height );
 
-    // insert a new item into m_children at given index and return the item
-    // itself
-    virtual wxSizerItem* DoInsert(size_t index, wxSizerItem *item);
-
 private:
     DECLARE_CLASS(wxSizer)
 };
@@ -733,33 +631,17 @@ private:
 // wxGridSizer
 //---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxGridSizer: public wxSizer
+class WXDLLEXPORT wxGridSizer: public wxSizer
 {
 public:
-    // ctors specifying the number of columns only: number of rows will be
-    // deduced automatically depending on the number of sizer elements
-    wxGridSizer( int cols, int vgap, int hgap );
-    wxGridSizer( int cols, const wxSize& gap = wxSize(0, 0) );
-
-    // ctors specifying the number of rows and columns
     wxGridSizer( int rows, int cols, int vgap, int hgap );
-    wxGridSizer( int rows, int cols, const wxSize& gap );
+    wxGridSizer( int cols, int vgap = 0, int hgap = 0 );
 
     virtual void RecalcSizes();
     virtual wxSize CalcMin();
 
-    void SetCols( int cols )
-    {
-        wxASSERT_MSG( cols >= 0, "Number of columns must be non-negative");
-        m_cols = cols;
-    }
-
-    void SetRows( int rows )
-    {
-        wxASSERT_MSG( rows >= 0, "Number of rows must be non-negative");
-        m_rows = rows;
-    }
-
+    void SetCols( int cols )    { m_cols = cols; }
+    void SetRows( int rows )    { m_rows = rows; }
     void SetVGap( int gap )     { m_vgap = gap; }
     void SetHGap( int gap )     { m_hgap = gap; }
     int GetCols() const         { return m_cols; }
@@ -767,51 +649,17 @@ public:
     int GetVGap() const         { return m_vgap; }
     int GetHGap() const         { return m_hgap; }
 
-    int GetEffectiveColsCount() const   { return m_cols ? m_cols : CalcCols(); }
-    int GetEffectiveRowsCount() const   { return m_rows ? m_rows : CalcRows(); }
-
-    // return the number of total items and the number of columns and rows
-    // (for internal use only)
-    int CalcRowsCols(int& rows, int& cols) const;
-
 protected:
-    // the number of rows/columns in the sizer, if 0 then it is determined
-    // dynamically depending on the total number of items
     int    m_rows;
     int    m_cols;
-
-    // gaps between rows and columns
     int    m_vgap;
     int    m_hgap;
 
-    virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item);
+    // return the number of total items and the number of columns and rows
+    int CalcRowsCols(int& rows, int& cols) const;
 
     void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
 
-    // returns the number of columns/rows needed for the current total number
-    // of children (and the fixed number of rows/columns)
-    int CalcCols() const
-    {
-        wxCHECK_MSG
-        (
-            m_rows, 0,
-            "Can't calculate number of cols if number of rows is not specified"
-        );
-
-        return (m_children.GetCount() + m_rows - 1) / m_rows;
-    }
-
-    int CalcRows() const
-    {
-        wxCHECK_MSG
-        (
-            m_cols, 0,
-            "Can't calculate number of cols if number of rows is not specified"
-        );
-
-        return (m_children.GetCount() + m_cols - 1) / m_cols;
-    }
-
 private:
     DECLARE_CLASS(wxGridSizer)
 };
@@ -820,8 +668,8 @@ private:
 // wxFlexGridSizer
 //---------------------------------------------------------------------------
 
-// values which define the behaviour for resizing wxFlexGridSizer cells in the
-// "non-flexible" direction
+// the bevaiour for resizing wxFlexGridSizer cells in the "non-flexible"
+// direction
 enum wxFlexSizerGrowMode
 {
     // don't resize the cells in non-flexible direction at all
@@ -834,21 +682,15 @@ enum wxFlexSizerGrowMode
     wxFLEX_GROWMODE_ALL
 };
 
-class WXDLLIMPEXP_CORE wxFlexGridSizer: public wxGridSizer
+class WXDLLEXPORT wxFlexGridSizer: public wxGridSizer
 {
 public:
-    // ctors specifying the number of columns only: number of rows will be
-    // deduced automatically depending on the number of sizer elements
-    wxFlexGridSizer( int cols, int vgap, int hgap );
-    wxFlexGridSizer( int cols, const wxSize& gap = wxSize(0, 0) );
-
-    // ctors specifying the number of rows and columns
+    // ctors/dtor
     wxFlexGridSizer( int rows, int cols, int vgap, int hgap );
-    wxFlexGridSizer( int rows, int cols, const wxSize& gap );
-
-    // dtor
+    wxFlexGridSizer( int cols, int vgap = 0, int hgap = 0 );
     virtual ~wxFlexGridSizer();
 
+
     // set the rows/columns which will grow (the others will remain of the
     // constant initial size)
     void AddGrowableRow( size_t idx, int proportion = 0 );
@@ -856,8 +698,6 @@ public:
     void AddGrowableCol( size_t idx, int proportion = 0 );
     void RemoveGrowableCol( size_t idx );
 
-    bool IsRowGrowable( size_t idx );
-    bool IsColGrowable( size_t idx );
 
     // the sizer cells may grow in both directions, not grow at all or only
     // grow in one direction but not the other
@@ -881,8 +721,8 @@ public:
 
 protected:
     void AdjustForFlexDirection();
-    void AdjustForGrowables(const wxSize& sz);
-    void FindWidthsAndHeights(int nrows, int ncols);
+    void AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
+                            int nrows, int ncols);
 
     // the heights/widths of all rows/columns
     wxArrayInt  m_rowHeights,
@@ -906,93 +746,34 @@ protected:
 
 private:
     DECLARE_CLASS(wxFlexGridSizer)
-    wxDECLARE_NO_COPY_CLASS(wxFlexGridSizer);
+    DECLARE_NO_COPY_CLASS(wxFlexGridSizer)
 };
 
 //---------------------------------------------------------------------------
 // wxBoxSizer
 //---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxBoxSizer: public wxSizer
+class WXDLLEXPORT wxBoxSizer: public wxSizer
 {
 public:
-    wxBoxSizer(int orient)
-    {
-        m_orient = orient;
-        m_totalProportion = 0;
+    wxBoxSizer( int orient );
 
-        wxASSERT_MSG( m_orient == wxHORIZONTAL || m_orient == wxVERTICAL,
-                      wxT("invalid value for wxBoxSizer orientation") );
-    }
+    void RecalcSizes();
+    wxSize CalcMin();
 
-    virtual wxSizerItem *AddSpacer(int size);
+    int GetOrientation() const
+        { return m_orient; }
 
-    int GetOrientation() const { return m_orient; }
-
-    bool IsVertical() const { return m_orient == wxVERTICAL; }
-
-    void SetOrientation(int orient) { m_orient = orient; }
-
-    // implementation of our resizing logic
-    virtual wxSize CalcMin();
-    virtual void RecalcSizes();
+    void SetOrientation(int orient)
+        { m_orient = orient; }
 
 protected:
-    // helpers for our code: this returns the component of the given wxSize in
-    // the direction of the sizer and in the other direction, respectively
-    int GetSizeInMajorDir(const wxSize& sz) const
-    {
-        return m_orient == wxHORIZONTAL ? sz.x : sz.y;
-    }
-
-    int& SizeInMajorDir(wxSize& sz)
-    {
-        return m_orient == wxHORIZONTAL ? sz.x : sz.y;
-    }
-
-    int& PosInMajorDir(wxPoint& pt)
-    {
-        return m_orient == wxHORIZONTAL ? pt.x : pt.y;
-    }
-
-    int GetSizeInMinorDir(const wxSize& sz) const
-    {
-        return m_orient == wxHORIZONTAL ? sz.y : sz.x;
-    }
-
-    int& SizeInMinorDir(wxSize& sz)
-    {
-        return m_orient == wxHORIZONTAL ? sz.y : sz.x;
-    }
-
-    int& PosInMinorDir(wxPoint& pt)
-    {
-        return m_orient == wxHORIZONTAL ? pt.y : pt.x;
-    }
-
-    // another helper: creates wxSize from major and minor components
-    wxSize SizeFromMajorMinor(int major, int minor) const
-    {
-        if ( m_orient == wxHORIZONTAL )
-        {
-            return wxSize(major, minor);
-        }
-        else // wxVERTICAL
-        {
-            return wxSize(minor, major);
-        }
-    }
-
-
-    // either wxHORIZONTAL or wxVERTICAL
     int m_orient;
-
-    // the sum of proportion of all of our elements
-    int m_totalProportion;
-
-    // the minimal size needed for this sizer as calculated by the last call to
-    // our CalcMin()
-    wxSize m_minSize;
+    int m_stretchable;
+    int m_minWidth;
+    int m_minHeight;
+    int m_fixedWidth;
+    int m_fixedHeight;
 
 private:
     DECLARE_CLASS(wxBoxSizer)
@@ -1006,7 +787,7 @@ private:
 
 class WXDLLIMPEXP_FWD_CORE wxStaticBox;
 
-class WXDLLIMPEXP_CORE wxStaticBoxSizer: public wxBoxSizer
+class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {
 public:
     wxStaticBoxSizer(wxStaticBox *box, int orient);
@@ -1031,18 +812,14 @@ protected:
 
 private:
     DECLARE_CLASS(wxStaticBoxSizer)
-    wxDECLARE_NO_COPY_CLASS(wxStaticBoxSizer);
+    DECLARE_NO_COPY_CLASS(wxStaticBoxSizer)
 };
 
 #endif // wxUSE_STATBOX
 
-//---------------------------------------------------------------------------
-// wxStdDialogButtonSizer
-//---------------------------------------------------------------------------
-
 #if wxUSE_BUTTON
 
-class WXDLLIMPEXP_CORE wxStdDialogButtonSizer: public wxBoxSizer
+class WXDLLEXPORT wxStdDialogButtonSizer: public wxBoxSizer
 {
 public:
     // Constructor just creates a new wxBoxSizer, not much else.
@@ -1076,54 +853,87 @@ public:
 
 protected:
     wxButton *m_buttonAffirmative;  // wxID_OK, wxID_YES, wxID_SAVE go here
-    wxButton *m_buttonApply;        // wxID_APPLY
+    wxButton *m_buttonApply;
     wxButton *m_buttonNegative;     // wxID_NO
-    wxButton *m_buttonCancel;       // wxID_CANCEL, wxID_CLOSE
-    wxButton *m_buttonHelp;         // wxID_HELP, wxID_CONTEXT_HELP
+    wxButton *m_buttonCancel;
+    wxButton *m_buttonHelp;
 
 private:
     DECLARE_CLASS(wxStdDialogButtonSizer)
-    wxDECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer);
+    DECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer)
 };
 
 #endif // wxUSE_BUTTON
 
+#if WXWIN_COMPATIBILITY_2_4
+// NB: wxBookCtrlSizer and wxNotebookSizer are deprecated, they
+//     don't do anything. wxBookCtrlBase::DoGetBestSize does the job now.
+
+// ----------------------------------------------------------------------------
+// wxBookCtrlSizer
+// ----------------------------------------------------------------------------
+
+#if wxUSE_BOOKCTRL
+
+// this sizer works with wxNotebook/wxListbook/... and sizes the control to
+// fit its pages
+class WXDLLIMPEXP_FWD_CORE wxBookCtrlBase;
+
+class WXDLLEXPORT wxBookCtrlSizer : public wxSizer
+{
+public:
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( wxBookCtrlSizer(wxBookCtrlBase *bookctrl) );
+#endif // WXWIN_COMPATIBILITY_2_6
+
+    wxBookCtrlBase *GetControl() const { return m_bookctrl; }
+
+    virtual void RecalcSizes();
+    virtual wxSize CalcMin();
+
+protected:
+    // this protected ctor lets us mark the real one above as deprecated
+    // and still have warning-free build of the library itself:
+    wxBookCtrlSizer() {}
+
+    wxBookCtrlBase *m_bookctrl;
+
+private:
+    DECLARE_CLASS(wxBookCtrlSizer)
+    DECLARE_NO_COPY_CLASS(wxBookCtrlSizer)
+};
+
+
+#if wxUSE_NOTEBOOK
+
+// before wxBookCtrlBase we only had wxNotebookSizer, keep it for backwards
+// compatibility
+class WXDLLIMPEXP_FWD_CORE wxNotebook;
+
+class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
+{
+public:
+#if WXWIN_COMPATIBILITY_2_6
+    wxDEPRECATED( wxNotebookSizer(wxNotebook *nb) );
+#endif // WXWIN_COMPATIBILITY_2_6
+
+    wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }
+
+private:
+    DECLARE_CLASS(wxNotebookSizer)
+    DECLARE_NO_COPY_CLASS(wxNotebookSizer)
+};
+
+#endif // wxUSE_NOTEBOOK
+
+#endif // wxUSE_BOOKCTRL
+
+#endif // WXWIN_COMPATIBILITY_2_4
 
 // ----------------------------------------------------------------------------
 // inline functions implementation
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_8
-
-inline void wxSizerItem::SetWindow(wxWindow *window)
-{
-    DoSetWindow(window);
-}
-
-inline void wxSizerItem::SetSizer(wxSizer *sizer)
-{
-    DoSetSizer(sizer);
-}
-
-inline void wxSizerItem::SetSpacer(const wxSize& size)
-{
-    DoSetSpacer(size);
-}
-
-inline void wxSizerItem::SetSpacer(int width, int height)
-{
-    DoSetSpacer(wxSize(width, height));
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
-inline wxSizerItem*
-wxSizer::Insert(size_t index, wxSizerItem *item)
-{
-    return DoInsert(index, item);
-}
-
-
 inline wxSizerItem*
 wxSizer::Add( wxSizerItem *item )
 {
@@ -1160,12 +970,6 @@ wxSizer::Add( wxSizer *sizer, const wxSizerFlags& flags )
     return Add( new wxSizerItem(sizer, flags) );
 }
 
-inline wxSizerItem*
-wxSizer::Add( int width, int height, const wxSizerFlags& flags )
-{
-    return Add( new wxSizerItem(width, height, flags) );
-}
-
 inline wxSizerItem*
 wxSizer::AddSpacer(int size)
 {
@@ -1226,12 +1030,6 @@ wxSizer::Prepend( wxSizer *sizer, const wxSizerFlags& flags )
     return Prepend( new wxSizerItem(sizer, flags) );
 }
 
-inline wxSizerItem*
-wxSizer::Prepend( int width, int height, const wxSizerFlags& flags )
-{
-    return Prepend( new wxSizerItem(width, height, flags) );
-}
-
 inline wxSizerItem*
 wxSizer::Insert( size_t index,
                  wxWindow *window,
@@ -1278,12 +1076,6 @@ wxSizer::Insert( size_t index, wxSizer *sizer, const wxSizerFlags& flags )
     return Insert( index, new wxSizerItem(sizer, flags) );
 }
 
-inline wxSizerItem*
-wxSizer::Insert( size_t index, int width, int height, const wxSizerFlags& flags )
-{
-    return Insert( index, new wxSizerItem(width, height, flags) );
-}
-
 inline wxSizerItem*
 wxSizer::InsertSpacer(size_t index, int size)
 {
@@ -1296,4 +1088,5 @@ wxSizer::InsertStretchSpacer(size_t index, int prop)
     return Insert(index, 0, 0, prop);
 }
 
+
 #endif // __WXSIZER_H__
diff --git a/Source/3rd Party/wx/include/wx/slider.h b/Source/3rd Party/wx/include/wx/slider.h
index 446f9cef8..77fcef253 100644
--- a/Source/3rd Party/wx/include/wx/slider.h	
+++ b/Source/3rd Party/wx/include/wx/slider.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     09.02.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: slider.h 38717 2006-04-14 17:01:16Z ABX $
 // Copyright:   (c) 1996-2001 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -31,6 +31,7 @@
 
 #define wxSL_TICKS           0x0010
 #define wxSL_AUTOTICKS       wxSL_TICKS // we don't support manual ticks
+#define wxSL_LABELS          0x0020
 #define wxSL_LEFT            0x0040
 #define wxSL_TOP             0x0080
 #define wxSL_RIGHT           0x0100
@@ -38,22 +39,19 @@
 #define wxSL_BOTH            0x0400
 #define wxSL_SELRANGE        0x0800
 #define wxSL_INVERSE         0x1000
-#define wxSL_MIN_MAX_LABELS  0x2000
-#define wxSL_VALUE_LABEL     0x4000
-#define wxSL_LABELS          (wxSL_MIN_MAX_LABELS|wxSL_VALUE_LABEL)
 
 #if WXWIN_COMPATIBILITY_2_6
     // obsolete
     #define wxSL_NOTIFY_DRAG     0x0000
 #endif // WXWIN_COMPATIBILITY_2_6
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxSliderNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSliderBase : public wxControl
+class WXDLLEXPORT wxSliderBase : public wxControl
 {
 public:
     /* the ctor of the derived class should have the following form:
@@ -95,7 +93,7 @@ public:
     // warning: most of subsequent methods are currently only implemented in
     //          wxMSW under Win95 and are silently ignored on other platforms
 
-    void SetTickFreq(int freq) { DoSetTickFreq(freq); }
+    virtual void SetTickFreq(int WXUNUSED(n), int WXUNUSED(pos)) { }
     virtual int GetTickFreq() const { return 0; }
     virtual void ClearTicks() { }
     virtual void SetTick(int WXUNUSED(tickPos)) { }
@@ -105,16 +103,7 @@ public:
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); )
-#endif
-
 protected:
-    // Platform-specific implementation of SetTickFreq
-    virtual void DoSetTickFreq(int WXUNUSED(freq)) { /* unsupported by default */ }
-
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // adjust value according to wxSL_INVERSE style
     virtual int ValueInvertOrNot(int value) const
@@ -126,7 +115,7 @@ protected:
     }
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxSliderBase);
+    DECLARE_NO_COPY_CLASS(wxSliderBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -136,7 +125,10 @@ private:
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)
-    #include "wx/msw/slider.h"
+    #include "wx/msw/slider95.h"
+    #if WXWIN_COMPATIBILITY_2_4
+         #define wxSlider95 wxSlider
+    #endif
 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK20__)
@@ -144,11 +136,13 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/slider.h"
+    #include "wx/mac/slider.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)
     #include "wx/os2/slider.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/slider.h"
 #endif
 
 #endif // wxUSE_SLIDER
diff --git a/Source/3rd Party/wx/include/wx/snglinst.h b/Source/3rd Party/wx/include/wx/snglinst.h
index 9a27229bd..50a856332 100644
--- a/Source/3rd Party/wx/include/wx/snglinst.h	
+++ b/Source/3rd Party/wx/include/wx/snglinst.h	
@@ -5,7 +5,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: snglinst.h 49563 2007-10-31 20:46:21Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -15,9 +15,6 @@
 
 #if wxUSE_SNGLINST_CHECKER
 
-#include "wx/app.h"
-#include "wx/utils.h"
-
 // ----------------------------------------------------------------------------
 // wxSingleInstanceChecker
 // ----------------------------------------------------------------------------
@@ -36,11 +33,9 @@ public:
         Create(name, path);
     }
 
-    // notice that calling Create() is optional now, if you don't do it before
-    // calling IsAnotherRunning(), CreateDefault() is used automatically
-    //
-    // name it is used as the mutex name under Win32 and the lock file name
-    // under Unix so it should be as unique as possible and must be non-empty
+    // name must be given and be as unique as possible, it is used as the mutex
+    // name under Win32 and the lock file name under Unix -
+    // wxTheApp->GetAppName() may be a good value for this parameter
     //
     // path is optional and is ignored under Win32 and used as the directory to
     // create the lock file in under Unix (default is wxGetHomeDir())
@@ -49,32 +44,8 @@ public:
     // instance is running - use IsAnotherRunning() to check it
     bool Create(const wxString& name, const wxString& path = wxEmptyString);
 
-    // use the default name, which is a combination of wxTheApp->GetAppName()
-    // and wxGetUserId() for mutex/lock file
-    //
-    // this is called implicitly by IsAnotherRunning() if the checker hadn't
-    // been created until then
-    bool CreateDefault()
-    {
-        wxCHECK_MSG( wxTheApp, false, "must have application instance" );
-        return Create(wxTheApp->GetAppName() + '-' + wxGetUserId());
-    }
-
     // is another copy of this program already running?
-    bool IsAnotherRunning() const
-    {
-        if ( !m_impl )
-        {
-            if ( !const_cast<wxSingleInstanceChecker *>(this)->CreateDefault() )
-            {
-                // if creation failed, return false as it's better to not
-                // prevent this instance from starting up if there is an error
-                return false;
-            }
-        }
-
-        return DoIsAnotherRunning();
-    }
+    bool IsAnotherRunning() const;
 
     // dtor is not virtual, this class is not meant to be used polymorphically
     ~wxSingleInstanceChecker();
@@ -83,13 +54,10 @@ private:
     // common part of all ctors
     void Init() { m_impl = NULL; }
 
-    // do check if another instance is running, called only if m_impl != NULL
-    bool DoIsAnotherRunning() const;
-
     // the implementation details (platform specific)
     class WXDLLIMPEXP_FWD_BASE wxSingleInstanceCheckerImpl *m_impl;
 
-    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceChecker);
+    DECLARE_NO_COPY_CLASS(wxSingleInstanceChecker)
 };
 
 #endif // wxUSE_SNGLINST_CHECKER
diff --git a/Source/3rd Party/wx/include/wx/spinbutt.h b/Source/3rd Party/wx/include/wx/spinbutt.h
index 078adaa36..c24f35f01 100644
--- a/Source/3rd Party/wx/include/wx/spinbutt.h	
+++ b/Source/3rd Party/wx/include/wx/spinbutt.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     23.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: spinbutt.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,7 +22,6 @@
 
 #include "wx/control.h"
 #include "wx/event.h"
-#include "wx/range.h"
 
 #define wxSPIN_BUTTON_NAME wxT("wxSpinButton")
 
@@ -37,7 +36,7 @@
 //  wxSP_WRAP:         value wraps at either end
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSpinButtonBase : public wxControl
+class WXDLLEXPORT wxSpinButtonBase : public wxControl
 {
 public:
     // ctor initializes the range with the default (0..100) values
@@ -47,7 +46,6 @@ public:
     virtual int GetValue() const = 0;
     virtual int GetMin() const { return m_min; }
     virtual int GetMax() const { return m_max; }
-    wxRange GetRange() const { return wxRange( GetMin(), GetMax() );}
 
     // operations
     virtual void SetValue(int val) = 0;
@@ -58,7 +56,6 @@ public:
         m_min = minVal;
         m_max = maxVal;
     }
-    void SetRange( const wxRange& range) { SetRange( range.GetMin(), range.GetMax()); }
 
     // is this spin button vertically oriented?
     bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }
@@ -68,7 +65,7 @@ protected:
     int   m_min;
     int   m_max;
 
-    wxDECLARE_NO_COPY_CLASS(wxSpinButtonBase);
+    DECLARE_NO_COPY_CLASS(wxSpinButtonBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -86,7 +83,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/spinbutt.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/spinbutt.h"
+    #include "wx/mac/spinbutt.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/spinbutt.h"
 #elif defined(__WXPM__)
@@ -97,7 +94,7 @@ protected:
 // the wxSpinButton event
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSpinEvent : public wxNotifyEvent
+class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent
 {
 public:
     wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
@@ -105,37 +102,26 @@ public:
     {
     }
 
-    wxSpinEvent(const wxSpinEvent& event) : wxNotifyEvent(event) {}
-
     // get the current value of the control
-    int GetValue() const { return m_commandInt; }
-    void SetValue(int value) { m_commandInt = value; }
-
     int GetPosition() const { return m_commandInt; }
     void SetPosition(int pos) { m_commandInt = pos; }
 
-    virtual wxEvent *Clone() const { return new wxSpinEvent(*this); }
-
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinEvent)
 };
 
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 
 #define wxSpinEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxSpinEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSpinEventFunction, &func)
 
-// macros for handling spin events: notice that we must use the real values of
-// the event type constants and not their references (wxEVT_SPIN[_UP/DOWN])
-// here as otherwise the event tables could end up with non-initialized
-// (because of undefined initialization order of the globals defined in
-// different translation units) references in them
+// macros for handling spin events
 #define EVT_SPIN_UP(winid, func) \
-    wx__DECLARE_EVT1(wxEVT_SPIN_UP, winid, wxSpinEventHandler(func))
+    wx__DECLARE_EVT1(wxEVT_SCROLL_LINEUP, winid, wxSpinEventHandler(func))
 #define EVT_SPIN_DOWN(winid, func) \
-    wx__DECLARE_EVT1(wxEVT_SPIN_DOWN, winid, wxSpinEventHandler(func))
+    wx__DECLARE_EVT1(wxEVT_SCROLL_LINEDOWN, winid, wxSpinEventHandler(func))
 #define EVT_SPIN(winid, func) \
-    wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func))
+    wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxSpinEventHandler(func))
 
 #endif // wxUSE_SPINBTN
 
diff --git a/Source/3rd Party/wx/include/wx/spinctrl.h b/Source/3rd Party/wx/include/wx/spinctrl.h
index 8bad7d433..e27c1892d 100644
--- a/Source/3rd Party/wx/include/wx/spinctrl.h	
+++ b/Source/3rd Party/wx/include/wx/spinctrl.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/spinctrl.h
+// Name:        spinctrl.h
 // Purpose:     wxSpinCtrlBase class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: spinctrl.h 37066 2006-01-23 03:27:34Z MR $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,126 +18,65 @@
 
 #include "wx/spinbutt.h"        // should make wxSpinEvent visible to the app
 
-// Events
-class WXDLLIMPEXP_FWD_CORE wxSpinDoubleEvent;
-
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxSpinDoubleEvent);
-
 // ----------------------------------------------------------------------------
-// A spin ctrl is a text control with a spin button which is usually used to
-// prompt the user for a numeric input.
-// There are two kinds for number types T=integer or T=double.
+// a spin ctrl is a text control with a spin button which is usually used to
+// prompt the user for a numeric input
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSpinCtrlBase : public wxControl
+/* there is no generic base class for this control because it's imlpemented
+   very differently under MSW and other platforms
+
+class WXDLLEXPORT wxSpinCtrlBase : public wxControl
 {
 public:
-    wxSpinCtrlBase() {}
+    wxSpinCtrlBase() { Init(); }
 
-    // accessor functions that derived classes are expected to have
-    // T GetValue() const
-    // T GetMin() const
-    // T GetMax() const
-    // T GetIncrement() const
-    virtual bool GetSnapToTicks() const = 0;
-    // unsigned GetDigits() const                   - wxSpinCtrlDouble only
+    // accessors
+    virtual int GetValue() const = 0;
+    virtual int GetMin() const { return m_min; }
+    virtual int GetMax() const { return m_max; }
 
-    // operation functions that derived classes are expected to have
+    // operations
     virtual void SetValue(const wxString& value) = 0;
-    // void SetValue(T val)
-    // void SetRange(T minVal, T maxVal)
-    // void SetIncrement(T inc)
-    virtual void SetSnapToTicks(bool snap_to_ticks) = 0;
-    // void SetDigits(unsigned digits)              - wxSpinCtrlDouble only
+    virtual void SetValue(int val) = 0;
+    virtual void SetRange(int minVal, int maxVal) = 0;
 
-    // Select text in the textctrl
+    // as the wxTextCtrl method
     virtual void SetSelection(long from, long to) = 0;
 
-private:
-    wxDECLARE_NO_COPY_CLASS(wxSpinCtrlBase);
-};
-
-// ----------------------------------------------------------------------------
-// wxSpinDoubleEvent - a wxSpinEvent for double valued controls
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxSpinDoubleEvent : public wxNotifyEvent
-{
-public:
-    wxSpinDoubleEvent(wxEventType commandType = wxEVT_NULL, int winid = 0,
-                      double value = 0)
-        : wxNotifyEvent(commandType, winid), m_value(value)
-    {
-    }
-
-    wxSpinDoubleEvent(const wxSpinDoubleEvent& event)
-        : wxNotifyEvent(event), m_value(event.GetValue())
-    {
-    }
-
-    double GetValue() const       { return m_value; }
-    void   SetValue(double value) { m_value = value; }
-
-    virtual wxEvent *Clone() const { return new wxSpinDoubleEvent(*this); }
-
 protected:
-    double m_value;
+    // initialize m_min/max with the default values
+    void Init() { m_min = 0; m_max = 100; }
 
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSpinDoubleEvent)
+    int   m_min;
+    int   m_max;
 };
-
-// ----------------------------------------------------------------------------
-// wxSpinDoubleEvent event type, see also wxSpinEvent in wx/spinbutt.h
-// ----------------------------------------------------------------------------
-
-typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
-
-#define wxSpinDoubleEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxSpinDoubleEventFunction, func)
-
-// macros for handling spinctrl events
-
-#define EVT_SPINCTRL(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn))
-
-#define EVT_SPINCTRLDOUBLE(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, id, wxSpinDoubleEventHandler(fn))
+*/
 
 // ----------------------------------------------------------------------------
 // include the platform-dependent class implementation
 // ----------------------------------------------------------------------------
 
-// we may have a native wxSpinCtrl implementation, native wxSpinCtrl and
-// wxSpinCtrlDouble implementations or neither, define the appropriate symbols
-// and include the generic version if necessary to provide the missing class(es)
-
-#if defined(__WXUNIVERSAL__) || \
-    defined(__WXMOTIF__) || \
-    defined(__WXCOCOA__)
-    // nothing, use generic controls
+#if defined(__WXUNIVERSAL__)
+    #include "wx/generic/spinctlg.h"
 #elif defined(__WXMSW__)
-    #define wxHAS_NATIVE_SPINCTRL
     #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
-    #define wxHAS_NATIVE_SPINCTRL
     #include "wx/os2/spinctrl.h"
 #elif defined(__WXGTK20__)
-    #define wxHAS_NATIVE_SPINCTRL
-    #define wxHAS_NATIVE_SPINCTRLDOUBLE
     #include "wx/gtk/spinctrl.h"
 #elif defined(__WXGTK__)
-    #define wxHAS_NATIVE_SPINCTRL
     #include "wx/gtk1/spinctrl.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/generic/spinctlg.h"
 #elif defined(__WXMAC__)
-    #define wxHAS_NATIVE_SPINCTRL
-    #include "wx/osx/spinctrl.h"
+    #include "wx/mac/spinctrl.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/generic/spinctlg.h"
 #endif // platform
 
-#if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)
-    #include "wx/generic/spinctlg.h"
-#endif
+#define EVT_SPINCTRL(id, fn) \
+    wx__DECLARE_EVT1(wxEVT_COMMAND_SPINCTRL_UPDATED, id, wxSpinEventHandler(fn))
 
 #endif // wxUSE_SPINCTRL
 
diff --git a/Source/3rd Party/wx/include/wx/splitter.h b/Source/3rd Party/wx/include/wx/splitter.h
index 04c255961..fb96799f1 100644
--- a/Source/3rd Party/wx/include/wx/splitter.h	
+++ b/Source/3rd Party/wx/include/wx/splitter.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: splitter.h 38717 2006-04-14 17:01:16Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,7 +19,6 @@
 // ----------------------------------------------------------------------------
 
 #define wxSP_NOBORDER         0x0000
-#define wxSP_THIN_SASH        0x0000    // NB: the default is 3D sash
 #define wxSP_NOSASH           0x0010
 #define wxSP_PERMIT_UNSPLIT   0x0040
 #define wxSP_LIVE_UPDATE      0x0080
@@ -35,13 +34,14 @@
     #define wxSP_FULLSASH         0
 #endif // WXWIN_COMPATIBILITY_2_6
 
-class WXDLLIMPEXP_FWD_CORE wxSplitterEvent;
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, wxSplitterEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_SPLITTER_UNSPLIT, wxSplitterEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 850)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 851)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 852)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT, 853)
+END_DECLARE_EVENT_TYPES()
 
 #include "wx/generic/splitter.h"
 
-#endif // _WX_SPLITTER_H_BASE_
+#endif
+    // _WX_SPLITTER_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/srchctrl.h b/Source/3rd Party/wx/include/wx/srchctrl.h
index 14025c88e..af831bd0b 100644
--- a/Source/3rd Party/wx/include/wx/srchctrl.h	
+++ b/Source/3rd Party/wx/include/wx/srchctrl.h	
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/srchctrl.h
+// Name:        srchctrl.h
 // Purpose:     wxSearchCtrlBase class
 // Author:      Vince Harron
 // Created:     2006-02-18
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: srchctrl.h 45828 2007-05-05 14:51:51Z VZ $
 // Copyright:   (c) Vince Harron
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,8 @@
 
 #include "wx/textctrl.h"
 
-#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__)
+#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__) && defined(__WXMAC_OSX__) \
+        && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
     // search control was introduced in Mac OS X 10.3 Panther
     #define wxUSE_NATIVE_SEARCH_CONTROL 1
 
@@ -26,31 +27,26 @@
     // no native version, use the generic one
     #define wxUSE_NATIVE_SEARCH_CONTROL 0
 
-    #include "wx/compositewin.h"
-    #include "wx/containr.h"
-
-    class WXDLLIMPEXP_CORE wxSearchCtrlBaseBaseClass
-        : public wxCompositeWindow< wxNavigationEnabled<wxControl> >,
-          public wxTextCtrlIface
-    {
-    };
+    #define wxSearchCtrlBaseBaseClass wxTextCtrlBase
 #endif
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxSearchCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxSearchCtrlNameStr[];
 
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, wxCommandEvent);
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1120)
+END_DECLARE_EVENT_TYPES()
 
 // ----------------------------------------------------------------------------
 // a search ctrl is a text control with a search button and a cancel button
 // it is based on the MacOSX 10.3 control HISearchFieldCreate
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass
+class WXDLLEXPORT wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass
 {
 public:
     wxSearchCtrlBase() { }
@@ -68,17 +64,13 @@ public:
 
     virtual void ShowCancelButton( bool show ) = 0;
     virtual bool IsCancelButtonVisible() const = 0;
-
-private:
-    // implement wxTextEntry pure virtual method
-    virtual wxWindow *GetEditableWindow() { return this; }
 };
 
 
 // include the platform-dependent class implementation
 #if wxUSE_NATIVE_SEARCH_CONTROL
     #if defined(__WXMAC__)
-        #include "wx/osx/srchctrl.h"
+        #include "wx/mac/srchctrl.h"
     #endif
 #else
     #include "wx/generic/srchctlg.h"
diff --git a/Source/3rd Party/wx/include/wx/sstream.h b/Source/3rd Party/wx/include/wx/sstream.h
index dec08ec79..febf2cf0d 100644
--- a/Source/3rd Party/wx/include/wx/sstream.h	
+++ b/Source/3rd Party/wx/include/wx/sstream.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-09-19
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: sstream.h 45732 2007-05-01 13:52:19Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,9 +26,9 @@ public:
     // ctor associates the stream with the given string which makes a copy of
     // it
     wxStringInputStream(const wxString& s);
+    virtual ~wxStringInputStream();
 
     virtual wxFileOffset GetLength() const;
-    virtual bool IsSeekable() const { return true; }
 
 protected:
     virtual wxFileOffset OnSysSeek(wxFileOffset ofs, wxSeekMode mode);
@@ -40,7 +40,7 @@ private:
     wxString m_str;
 
     // the buffer we're reading from
-    wxCharBuffer m_buf;
+    char* m_buf;
 
     // length of the buffer we're reading from
     size_t m_len;
@@ -48,7 +48,7 @@ private:
     // position in the stream in bytes, *not* in chars
     size_t m_pos;
 
-    wxDECLARE_NO_COPY_CLASS(wxStringInputStream);
+    DECLARE_NO_COPY_CLASS(wxStringInputStream)
 };
 
 // ----------------------------------------------------------------------------
@@ -60,25 +60,19 @@ class WXDLLIMPEXP_BASE wxStringOutputStream : public wxOutputStream
 public:
     // The stream will write data either to the provided string or to an
     // internal string which can be retrieved using GetString()
-    //
-    // Note that the conversion object should have the life time greater than
-    // this stream.
-    wxStringOutputStream(wxString *pString = NULL,
-                         wxMBConv& conv = wxConvUTF8)
-        : m_conv(conv)
-#if wxUSE_UNICODE
-        , m_unconv(0)
-#endif // wxUSE_UNICODE
+    wxStringOutputStream(wxString *pString = NULL)
     {
         m_str = pString ? pString : &m_strInternal;
         m_pos = m_str->length() / sizeof(wxChar);
     }
 
+#if wxABI_VERSION >= 20804 && wxUSE_UNICODE
+    virtual ~wxStringOutputStream();
+#endif // wx 2.8.4+
+
     // get the string containing current output
     const wxString& GetString() const { return *m_str; }
 
-    virtual bool IsSeekable() const { return true; }
-
 protected:
     virtual wxFileOffset OnSysTell() const;
     virtual size_t OnSysWrite(const void *buffer, size_t size);
@@ -93,17 +87,14 @@ private:
     // position in the stream in bytes, *not* in chars
     size_t m_pos;
 
-    // converter to use: notice that with the default UTF-8 one the input
-    // stream must contain valid UTF-8 data, use wxConvISO8859_1 to work with
-    // arbitrary 8 bit data
-    wxMBConv& m_conv;
+#if wxUSE_WCHAR_T
+    // string encoding converter (UTF8 is the standard)
+    wxMBConvUTF8 m_conv;
+#else
+    wxMBConv m_conv;
+#endif
 
-#if wxUSE_UNICODE
-    // unconverted data from the last call to OnSysWrite()
-    wxMemoryBuffer m_unconv;
-#endif // wxUSE_UNICODE
-
-    wxDECLARE_NO_COPY_CLASS(wxStringOutputStream);
+    DECLARE_NO_COPY_CLASS(wxStringOutputStream)
 };
 
 #endif // wxUSE_STREAMS
diff --git a/Source/3rd Party/wx/include/wx/stack.h b/Source/3rd Party/wx/include/wx/stack.h
index a5f8c0a30..e58c0675d 100644
--- a/Source/3rd Party/wx/include/wx/stack.h	
+++ b/Source/3rd Party/wx/include/wx/stack.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/stack.h
 // Purpose:     STL stack clone
-// Author:      Lindsay Mathieson, Vadim Zeitlin
+// Author:      Lindsay Mathieson
+// Modified by:
 // Created:     30.07.2001
-// Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org> (WX_DECLARE_STACK)
-//                  2011 Vadim Zeitlin <vadim@wxwidgets.org>
+// Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -13,71 +13,30 @@
 
 #include "wx/vector.h"
 
-#if wxUSE_STD_CONTAINERS
-
-#include <stack>
-#define wxStack std::stack
-
-#else // !wxUSE_STD_CONTAINERS
-
-// Notice that unlike std::stack, wxStack currently always uses wxVector and
-// can't be used with any other underlying container type.
-//
-// Another difference is that comparison operators between stacks are not
-// implemented (but they should be, see 23.2.3.3 of ISO/IEC 14882:1998).
-
-template <typename T>
-class wxStack
-{
-public:
-    typedef wxVector<T> container_type;
-    typedef typename container_type::size_type size_type;
-    typedef typename container_type::value_type value_type;
-
-    wxStack() { }
-    explicit wxStack(const container_type& cont) : m_cont(cont) { }
-
-    // Default copy ctor, assignment operator and dtor are ok.
-
-
-    bool empty() const { return m_cont.empty(); }
-    size_type size() const { return m_cont.size(); }
-
-    value_type& top() { return m_cont.back(); }
-    const value_type& top() const { return m_cont.back(); }
-
-    void push(const value_type& val) { m_cont.push_back(val); }
-    void pop() { m_cont.pop_back(); }
-
-private:
-    container_type m_cont;
-};
-
-#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
-
-
-// Deprecated macro-based class for compatibility only, don't use any more.
-#define WX_DECLARE_STACK(obj, cls) \
-class cls : public wxVector<obj> \
+#define WX_DECLARE_STACK(obj, cls)\
+class cls : public wxVectorBase\
 {\
+    WX_DECLARE_VECTORBASE(obj, cls);\
 public:\
     void push(const obj& o)\
     {\
-        push_back(o); \
+        bool rc = Alloc(size() + 1);\
+        wxASSERT(rc);\
+        Append(new obj(o));\
     };\
 \
     void pop()\
     {\
-        pop_back(); \
+        RemoveAt(size() - 1);\
     };\
 \
     obj& top()\
     {\
-        return at(size() - 1);\
+        return *(obj *) GetItem(size() - 1);\
     };\
     const obj& top() const\
     {\
-        return at(size() - 1); \
+        return *(obj *) GetItem(size() - 1);\
     };\
 }
 
diff --git a/Source/3rd Party/wx/include/wx/stackwalk.h b/Source/3rd Party/wx/include/wx/stackwalk.h
index b70d644bb..e051c71f1 100644
--- a/Source/3rd Party/wx/include/wx/stackwalk.h	
+++ b/Source/3rd Party/wx/include/wx/stackwalk.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/stackwalk.h
+// Name:        wx/wx/stackwalk.h
 // Purpose:     wxStackWalker and related classes, common part
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-07
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stackwalk.h 43346 2006-11-12 14:33:03Z RR $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,9 +16,7 @@
 
 #if wxUSE_STACKWALKER
 
-class WXDLLIMPEXP_FWD_BASE wxStackFrame;
-
-#define wxSTACKWALKER_MAX_DEPTH       (200)
+class WXDLLIMPEXP_BASE wxStackFrame;
 
 // ----------------------------------------------------------------------------
 // wxStackFrame: a single stack level
@@ -29,7 +27,7 @@ class WXDLLIMPEXP_BASE wxStackFrameBase
 private:
     // put this inline function here so that it is defined before use
     wxStackFrameBase *ConstCast() const
-        { return const_cast<wxStackFrameBase *>(this); }
+        { return wx_const_cast(wxStackFrameBase *, this); }
 
 public:
     wxStackFrameBase(size_t level, void *address = NULL)
@@ -132,21 +130,19 @@ public:
     // number of them (this can be useful when Walk() is called from some known
     // location and you don't want to see the first few frames anyhow; also
     // notice that Walk() frame itself is not included if skip >= 1)
-    virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) = 0;
+    virtual void Walk(size_t skip = 1, size_t maxDepth = 200) = 0;
 
-#if wxUSE_ON_FATAL_EXCEPTION
     // enumerate stack frames from the location of uncaught exception
     //
     // this version can only be called from wxApp::OnFatalException()
-    virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) = 0;
-#endif // wxUSE_ON_FATAL_EXCEPTION
+    virtual void WalkFromException() = 0;
 
 protected:
     // this function must be overrided to process the given frame
     virtual void OnStackFrame(const wxStackFrame& frame) = 0;
 };
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
     #include "wx/msw/stackwalk.h"
 #elif defined(__UNIX__)
     #include "wx/unix/stackwalk.h"
diff --git a/Source/3rd Party/wx/include/wx/statbmp.h b/Source/3rd Party/wx/include/wx/statbmp.h
index f47dceac1..e32c0cca7 100644
--- a/Source/3rd Party/wx/include/wx/statbmp.h	
+++ b/Source/3rd Party/wx/include/wx/statbmp.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: statbmp.h 37066 2006-01-23 03:27:34Z MR $
 // Copyright:   (c) 2000 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,10 +20,10 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
 
 // a control showing an icon or a bitmap
-class WXDLLIMPEXP_CORE wxStaticBitmapBase : public wxControl
+class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 {
 public:
     wxStaticBitmapBase() { }
@@ -40,17 +40,14 @@ public:
         return wxIcon();
     }
 
-    // overridden base class virtuals
+    // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
     virtual bool HasTransparentBackground() { return true; }
 
 protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
     virtual wxSize DoGetBestSize() const;
 
-    wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase);
+    DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -64,7 +61,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbmp.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/statbmp.h"
+    #include "wx/mac/statbmp.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbmp.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/statbox.h b/Source/3rd Party/wx/include/wx/statbox.h
index ae0b912f2..182881c93 100644
--- a/Source/3rd Party/wx/include/wx/statbox.h	
+++ b/Source/3rd Party/wx/include/wx/statbox.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/statbox.h
+// Name:        statbox.h
 // Purpose:     wxStaticBox base header
 // Author:      Julian Smart
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: statbox.h 37066 2006-01-23 03:27:34Z MR $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -18,18 +18,18 @@
 
 #include "wx/control.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl
+class WXDLLEXPORT wxStaticBoxBase : public wxControl
 {
 public:
     wxStaticBoxBase() { }
 
-    // overridden base class virtuals
+    // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
     virtual bool HasTransparentBackground() { return true; }
 
@@ -46,11 +46,8 @@ public:
         *borderOther = BORDER;
     }
 
-protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);
+private:
+    DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -64,7 +61,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/statbox.h"
+    #include "wx/mac/statbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/statline.h b/Source/3rd Party/wx/include/wx/statline.h
index 4f4ec8725..eac9078f4 100644
--- a/Source/3rd Party/wx/include/wx/statline.h	
+++ b/Source/3rd Party/wx/include/wx/statline.h	
@@ -3,7 +3,7 @@
 // Purpose:     wxStaticLine class interface
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id$
+// Version:     $Id: statline.h 43874 2006-12-09 14:52:59Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,13 +28,13 @@
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine
-extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticLineNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxStaticLineBase : public wxControl
+class WXDLLEXPORT wxStaticLineBase : public wxControl
 {
 public:
     // constructor
@@ -46,13 +46,10 @@ public:
     // get the default size for the "lesser" dimension of the static line
     static int GetDefaultSize() { return 2; }
 
-    // overridden base class virtuals
+    // overriden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
 
 protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
     // set the right size for the right dimension
     wxSize AdjustSize(const wxSize& size) const
     {
@@ -76,7 +73,7 @@ protected:
         return AdjustSize(wxDefaultSize);
     }
 
-    wxDECLARE_NO_COPY_CLASS(wxStaticLineBase);
+    DECLARE_NO_COPY_CLASS(wxStaticLineBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -94,7 +91,7 @@ protected:
 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/statline.h"
+    #include "wx/mac/statline.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statline.h"
 #else // use generic implementation for all other platforms
diff --git a/Source/3rd Party/wx/include/wx/stattext.h b/Source/3rd Party/wx/include/wx/stattext.h
index 5fe8d1d4a..99862b22e 100644
--- a/Source/3rd Party/wx/include/wx/stattext.h	
+++ b/Source/3rd Party/wx/include/wx/stattext.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/stattext.h
+// Name:        stattext.h
 // Purpose:     wxStaticText base header
 // Author:      Julian Smart
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stattext.h 37066 2006-01-23 03:27:34Z MR $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -18,74 +18,31 @@
 
 #include "wx/control.h"
 
-/*
- * wxStaticText flags
- */
-#define wxST_NO_AUTORESIZE         0x0001
-// free 0x0002 bit
-#define wxST_ELLIPSIZE_START       0x0004
-#define wxST_ELLIPSIZE_MIDDLE      0x0008
-#define wxST_ELLIPSIZE_END         0x0010
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[];
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticTextNameStr[];
-
-class WXDLLIMPEXP_CORE wxStaticTextBase : public wxControl
+class WXDLLEXPORT wxStaticTextBase : public wxControl
 {
 public:
     wxStaticTextBase() { }
 
+    // in wxGTK wxStaticText doesn't derive from wxStaticTextBase so we have to
+    // declare this function directly in gtk header
+#if !defined(__WXGTK__) || defined(__WXUNIVERSAL__)
     // wrap the text of the control so that no line is longer than the given
     // width (if possible: this function won't break words)
-    // This function will modify the value returned by GetLabel()!
+    //
+    // NB: implemented in dlgcmn.cpp for now
     void Wrap(int width);
+#endif // ! native __WXGTK__
 
-    // overridden base virtuals
+    // overriden base virtuals
     virtual bool AcceptsFocus() const { return false; }
     virtual bool HasTransparentBackground() { return true; }
 
-    bool IsEllipsized() const
-    {
-        return HasFlag(wxST_ELLIPSIZE_START) ||
-               HasFlag(wxST_ELLIPSIZE_MIDDLE) ||
-               HasFlag(wxST_ELLIPSIZE_END);
-    }
-
-protected:      // functions required for wxST_ELLIPSIZE_* support
-
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    // Calls Ellipsize() on the real label if necessary. Unlike GetLabelText(),
-    // keeps the mnemonics instead of removing them.
-    virtual wxString GetEllipsizedLabel() const;
-
-    // Replaces parts of the string with ellipsis according to the ellipsize
-    // style. Shouldn't be called if we don't have any.
-    wxString Ellipsize(const wxString& label) const;
-
-    // to be called when updating the size of the static text:
-    // updates the label redoing ellipsization calculations
-    void UpdateLabel();
-
-    // These functions are platform-specific and must be overridden in ports
-    // which do not natively support ellipsization and they must be implemented
-    // in a way so that the m_labelOrig member of wxControl is not touched:
-
-    // returns the real label currently displayed inside the control.
-    virtual wxString DoGetLabel() const { return wxEmptyString; }
-
-    // sets the real label currently displayed inside the control,
-    // _without_ invalidating the size. The text passed is always markup-free
-    // but may contain the mnemonic characters.
-    virtual void DoSetLabel(const wxString& WXUNUSED(str)) { }
-
 private:
-    wxDECLARE_NO_COPY_CLASS(wxStaticTextBase);
+    DECLARE_NO_COPY_CLASS(wxStaticTextBase)
 };
 
-// see wx/generic/stattextg.h for the explanation
-#ifndef wxNO_PORT_STATTEXT_INCLUDE
-
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/stattext.h"
 #elif defined(__WXMSW__)
@@ -97,15 +54,16 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/stattext.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/stattext.h"
+    #include "wx/mac/stattext.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/stattext.h"
 #elif defined(__WXPM__)
     #include "wx/os2/stattext.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/stattext.h"
 #endif
 
-#endif // !wxNO_PORT_STATTEXT_INCLUDE
-
 #endif // wxUSE_STATTEXT
 
-#endif // _WX_STATTEXT_H_BASE_
+#endif
+    // _WX_STATTEXT_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/statusbr.h b/Source/3rd Party/wx/include/wx/statusbr.h
index fcbb55a95..5a19e7503 100644
--- a/Source/3rd Party/wx/include/wx/statusbr.h	
+++ b/Source/3rd Party/wx/include/wx/statusbr.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.02.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: statusbr.h 41035 2006-09-06 17:36:22Z PC $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,97 +16,28 @@
 
 #if wxUSE_STATUSBAR
 
-#include "wx/control.h"
+#include "wx/window.h"
 #include "wx/list.h"
 #include "wx/dynarray.h"
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusBarNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxStatusBarNameStr[];
+
+WX_DECLARE_LIST(wxString, wxListString);
 
 // ----------------------------------------------------------------------------
 // wxStatusBar constants
 // ----------------------------------------------------------------------------
 
-// wxStatusBar styles
-#define wxSTB_SIZEGRIP         0x0010
-#define wxSTB_SHOW_TIPS        0x0020
-
-#define wxSTB_ELLIPSIZE_START   0x0040
-#define wxSTB_ELLIPSIZE_MIDDLE  0x0080
-#define wxSTB_ELLIPSIZE_END     0x0100
-
-#define wxSTB_DEFAULT_STYLE    (wxSTB_SIZEGRIP|wxSTB_ELLIPSIZE_END|wxSTB_SHOW_TIPS|wxFULL_REPAINT_ON_RESIZE)
-
-
-// old compat style name:
-#define wxST_SIZEGRIP    wxSTB_SIZEGRIP
-
-
-// style flags for wxStatusBar fields
+// style flags for fields
 #define wxSB_NORMAL    0x0000
 #define wxSB_FLAT      0x0001
 #define wxSB_RAISED    0x0002
 
-// ----------------------------------------------------------------------------
-// wxStatusBarPane: an helper for wxStatusBar
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStatusBarPane
-{
-public:
-    wxStatusBarPane(int style = wxSB_NORMAL, size_t width = 0)
-        : m_nStyle(style), m_nWidth(width)
-        { m_bEllipsized = false; }
-
-    int GetWidth() const { return m_nWidth; }
-    int GetStyle() const { return m_nStyle; }
-    wxString GetText() const { return m_text; }
-
-
-    // implementation-only from now on
-    // -------------------------------
-
-    bool IsEllipsized() const
-        { return m_bEllipsized; }
-    void SetIsEllipsized(bool isEllipsized) { m_bEllipsized = isEllipsized; }
-
-    void SetWidth(int width) { m_nWidth = width; }
-    void SetStyle(int style) { m_nStyle = style; }
-
-    // set text, return true if it changed or false if it was already set to
-    // this value
-    bool SetText(const wxString& text);
-
-    // save the existing text on top of our stack and make the new text
-    // current; return true if the text really changed
-    bool PushText(const wxString& text);
-
-    // restore the message saved by the last call to Push() (unless it was
-    // changed by an intervening call to SetText()) and return true if we
-    // really restored anything
-    bool PopText();
-
-private:
-    int m_nStyle;
-    int m_nWidth;     // may be negative, indicating a variable-width field
-    wxString m_text;
-
-    // the array used to keep the previous values of this pane after a
-    // PushStatusText() call, its top element is the value to restore after the
-    // next PopStatusText() call while the currently shown value is always in
-    // m_text
-    wxArrayString m_arrStack;
-
-    // is the currently shown value shown with ellipsis in the status bar?
-    bool m_bEllipsized;
-};
-
-WX_DECLARE_EXPORTED_OBJARRAY(wxStatusBarPane, wxStatusBarPaneArray);
-
 // ----------------------------------------------------------------------------
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxStatusBarBase : public wxControl
+class WXDLLEXPORT wxStatusBarBase : public wxWindow
 {
 public:
     wxStatusBarBase();
@@ -119,17 +50,14 @@ public:
     // set the number of fields and call SetStatusWidths(widths) if widths are
     // given
     virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
-    int GetFieldsCount() const { return m_panes.GetCount(); }
+    int GetFieldsCount() const { return m_nFields; }
 
     // field text
     // ----------
 
-    // just change or get the currently shown text
-    void SetStatusText(const wxString& text, int number = 0);
-    wxString GetStatusText(int number = 0) const;
+    virtual void SetStatusText(const wxString& text, int number = 0) = 0;
+    virtual wxString GetStatusText(int number = 0) const = 0;
 
-    // change the currently shown text to the new one and save the current
-    // value to be restored by the next call to PopStatusText()
     void PushStatusText(const wxString& text, int number = 0);
     void PopStatusText(int number = 0);
 
@@ -144,9 +72,6 @@ public:
     // -2 grows twice as much as one with width -1 &c)
     virtual void SetStatusWidths(int n, const int widths[]);
 
-    int GetStatusWidth(int n) const
-        { return m_panes[n].GetWidth(); }
-
     // field styles
     // ------------
 
@@ -156,9 +81,6 @@ public:
     // Setting field styles only works on wxMSW
     virtual void SetStatusStyles(int n, const int styles[]);
 
-    int GetStatusStyle(int n) const
-        { return m_panes[n].GetStyle(); }
-
     // geometry
     // --------
 
@@ -172,59 +94,51 @@ public:
     virtual int GetBorderX() const = 0;
     virtual int GetBorderY() const = 0;
 
-    wxSize GetBorders() const
-        { return wxSize(GetBorderX(), GetBorderY()); }
-
-    // miscellaneous
-    // -------------
-
-    const wxStatusBarPane& GetField(int n) const
-        { return m_panes[n]; }
-
-    // wxWindow overrides:
-
     // don't want status bars to accept the focus at all
     virtual bool AcceptsFocus() const { return false; }
 
-    // the client size of a toplevel window doesn't include the status bar
-    virtual bool CanBeOutsideClientArea() const { return true; }
-
 protected:
-    // called after the status bar pane text changed and should update its
-    // display
-    virtual void DoUpdateStatusText(int number) = 0;
+    // set the widths array to NULL
+    void InitWidths();
 
+    // free the status widths arrays
+    void FreeWidths();
 
-    // wxWindow overrides:
+    // reset the widths
+    void ReinitWidths() { FreeWidths(); InitWidths(); }
 
-#if wxUSE_TOOLTIPS
-   virtual void DoSetToolTip( wxToolTip *tip )
-        {
-            wxASSERT_MSG(!HasFlag(wxSTB_SHOW_TIPS),
-                         "Do not set tooltip(s) manually when using wxSTB_SHOW_TIPS!");
-            wxWindow::DoSetToolTip(tip);
-        }
-#endif // wxUSE_TOOLTIPS
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    // same, for field styles
+    void InitStyles();
+    void FreeStyles();
+    void ReinitStyles() { FreeStyles(); InitStyles(); }
 
-
-    // internal helpers & data:
+    // same, for text stacks
+    void InitStacks();
+    void FreeStacks();
+    void ReinitStacks() { FreeStacks(); InitStacks(); }
 
     // calculate the real field widths for the given total available size
     wxArrayInt CalculateAbsWidths(wxCoord widthTotal) const;
 
-    // should be called to remember if the pane text is currently being show
-    // ellipsized or not
-    void SetEllipsizedFlag(int n, bool isEllipsized);
+    // use these functions to access the stacks of field strings
+    wxListString *GetStatusStack(int i) const;
+    wxListString *GetOrCreateStatusStack(int i);
 
+    // the current number of fields
+    int        m_nFields;
 
-    // the array with the pane infos:
-    wxStatusBarPaneArray m_panes;
+    // the widths of the fields in pixels if !NULL, all fields have the same
+    // width otherwise
+    int       *m_statusWidths;
 
-    // if true overrides the width info of the wxStatusBarPanes
-    bool m_bSameWidthForAllPanes;
+    // the styles of the fields
+    int       *m_statusStyles;
 
-    wxDECLARE_NO_COPY_CLASS(wxStatusBarBase);
+    // stacks of previous values for PushStatusText/PopStatusText
+    // this is created on demand, use GetStatusStack/GetOrCreateStatusStack
+    wxListString **m_statusTextStacks;
+
+    DECLARE_NO_COPY_CLASS(wxStatusBarBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -233,15 +147,24 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #define wxStatusBarUniv wxStatusBar
+
     #include "wx/univ/statusbr.h"
-#elif defined(__WXMSW__) && wxUSE_NATIVE_STATUSBAR
-    #include "wx/msw/statusbar.h"
+#elif defined(__WXPALMOS__)
+    #define wxStatusBarPalm wxStatusBar
+
+    #include "wx/palmos/statusbr.h"
+#elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
+    #define wxStatusBar95 wxStatusBar
+
+    #include "wx/msw/statbr95.h"
 #elif defined(__WXMAC__)
     #define wxStatusBarMac wxStatusBar
+
     #include "wx/generic/statusbr.h"
-    #include "wx/osx/statusbr.h"
+    #include "wx/mac/statusbr.h"
 #else
     #define wxStatusBarGeneric wxStatusBar
+
     #include "wx/generic/statusbr.h"
 #endif
 
diff --git a/Source/3rd Party/wx/include/wx/stdpaths.h b/Source/3rd Party/wx/include/wx/stdpaths.h
index 6feeac4ae..beb8b13b7 100644
--- a/Source/3rd Party/wx/include/wx/stdpaths.h	
+++ b/Source/3rd Party/wx/include/wx/stdpaths.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-17
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stdpaths.h 43340 2006-11-12 12:58:10Z RR $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -14,21 +14,19 @@
 
 #include "wx/defs.h"
 
+#if wxUSE_STDPATHS
+
 #include "wx/string.h"
 #include "wx/filefn.h"
 
-class WXDLLIMPEXP_FWD_BASE wxStandardPaths;
-
 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------
 
-// NB: This is always compiled in, wxUSE_STDPATHS=0 only disables native
-//     wxStandardPaths class, but a minimal version is always available
 class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:
-    // possible resources categories
+    // possible resources categorires
     enum ResourceCat
     {
         // no special category
@@ -41,18 +39,9 @@ public:
         ResourceCat_Max
     };
 
-    // what should we use to construct paths unique to this application:
-    // (AppInfo_AppName and AppInfo_VendorName can be combined together)
-    enum
-    {
-        AppInfo_None       = 0,  // nothing
-        AppInfo_AppName    = 1,  // the application name
-        AppInfo_VendorName = 2   // the vendor name
-    };
-
 
     // return the global standard paths object
-    static wxStandardPaths& Get();
+    static wxStandardPathsBase& Get();
 
     // return the path (directory+filename) of the running executable or
     // wxEmptyString if it couldn't be determined.
@@ -120,7 +109,7 @@ public:
     // different under Unix for message catalog category (namely the standard
     // prefix/share/locale/lang/LC_MESSAGES)
     virtual wxString
-    GetLocalizedResourcesDir(const wxString& lang,
+    GetLocalizedResourcesDir(const wxChar *lang,
                              ResourceCat WXUNUSED(category)
                                 = ResourceCat_None) const
     {
@@ -129,72 +118,40 @@ public:
 
     // return the "Documents" directory for the current user
     //
-    // C:\Documents and Settings\username\My Documents under Windows,
+    // C:\Documents and Settings\username\Documents under Windows,
     // $HOME under Unix and ~/Documents under Mac
     virtual wxString GetDocumentsDir() const;
 
-    // return the directory for the documents files used by this application:
-    // it's a subdirectory of GetDocumentsDir() constructed using the
-    // application name/vendor if it exists or just GetDocumentsDir() otherwise
-    virtual wxString GetAppDocumentsDir() const;
-
     // return the temporary directory for the current user
     virtual wxString GetTempDir() const;
 
 
-    // ctor for the base class
-    wxStandardPathsBase();
-
     // virtual dtor for the base class
     virtual ~wxStandardPathsBase();
 
-    // Information used by AppendAppInfo
-    void UseAppInfo(int info)
-    {
-        m_usedAppInfo = info;
-    }
-
-    bool UsesAppInfo(int info) const { return (m_usedAppInfo & info) != 0; }
-
-
 protected:
-    // append the path component, with a leading path separator if a
-    // path separator or dot (.) is not already at the end of dir
-    static wxString AppendPathComponent(const wxString& dir, const wxString& component);
-
-    // append application information determined by m_usedAppInfo to dir
-    wxString AppendAppInfo(const wxString& dir) const;
-
-
-    // combination of AppInfo_XXX flags used by AppendAppInfo()
-    int m_usedAppInfo;
+    // append "/appname" suffix if the app name is set (doesn't append the
+    // slash if dir already ends with a slash or dot)
+    static wxString AppendAppName(const wxString& dir);
 };
 
-#if wxUSE_STDPATHS
-    #if defined(__WINDOWS__)
-        #include "wx/msw/stdpaths.h"
-        #define wxHAS_NATIVE_STDPATHS
-    // We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
-    #elif defined(__WXMAC__) || defined(__DARWIN__)
-        #include "wx/osx/core/stdpaths.h"
-        #define wxHAS_NATIVE_STDPATHS
-    #elif defined(__OS2__)
-        #include "wx/os2/stdpaths.h"
-        #define wxHAS_NATIVE_STDPATHS
-    #elif defined(__UNIX__)
-        #include "wx/unix/stdpaths.h"
-        #define wxHAS_NATIVE_STDPATHS
-    #endif
-#endif
+#if defined(__WXMSW__)
+    #include "wx/msw/stdpaths.h"
+// We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
+#elif defined(__WXMAC__) || defined(__DARWIN__)
+    #include "wx/mac/corefoundation/stdpaths.h"
+#elif defined(__OS2__)
+    #include "wx/os2/stdpaths.h"
+#elif defined(__UNIX__)
+    #include "wx/unix/stdpaths.h"
+#elif defined(__PALMOS__)
+    #include "wx/palmos/stdpaths.h"
+#else
 
 // ----------------------------------------------------------------------------
 // Minimal generic implementation
 // ----------------------------------------------------------------------------
 
-// NB: Note that this minimal implementation is compiled in even if
-//     wxUSE_STDPATHS=0, so that our code can still use wxStandardPaths.
-
-#ifndef wxHAS_NATIVE_STDPATHS
 class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
 {
 public:
@@ -213,7 +170,10 @@ public:
 private:
     wxString m_prefix;
 };
-#endif // !wxHAS_NATIVE_STDPATHS
+
+#endif
+
+#endif // wxUSE_STDPATHS
 
 #endif // _WX_STDPATHS_H_
 
diff --git a/Source/3rd Party/wx/include/wx/stdstream.h b/Source/3rd Party/wx/include/wx/stdstream.h
deleted file mode 100644
index 36845673f..000000000
--- a/Source/3rd Party/wx/include/wx/stdstream.h	
+++ /dev/null
@@ -1,123 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/stdstream.h
-// Purpose:     Header of std::istream and std::ostream derived wrappers for
-//              wxInputStream and wxOutputStream
-// Author:      Jonathan Liu <net147@gmail.com>
-// Created:     2009-05-02
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Jonathan Liu
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STDSTREAM_H_
-#define _WX_STDSTREAM_H_
-
-#include "wx/defs.h"    // wxUSE_STD_IOSTREAM
-
-#if wxUSE_STREAMS && wxUSE_STD_IOSTREAM
-
-#include "wx/defs.h"
-#include "wx/stream.h"
-#include "wx/ioswrap.h"
-
-// ==========================================================================
-// wxStdInputStreamBuffer
-// ==========================================================================
-
-class WXDLLIMPEXP_BASE wxStdInputStreamBuffer : public std::streambuf
-{
-public:
-    wxStdInputStreamBuffer(wxInputStream& stream);
-    virtual ~wxStdInputStreamBuffer() { }
-
-protected:
-    virtual std::streambuf *setbuf(char *s, std::streamsize n);
-    virtual std::streampos seekoff(std::streamoff off,
-                                   std::ios_base::seekdir way,
-                                   std::ios_base::openmode which =
-                                       std::ios_base::in |
-                                       std::ios_base::out);
-    virtual std::streampos seekpos(std::streampos sp,
-                                   std::ios_base::openmode which =
-                                       std::ios_base::in |
-                                       std::ios_base::out);
-    virtual std::streamsize showmanyc();
-    virtual std::streamsize xsgetn(char *s, std::streamsize n);
-    virtual int underflow();
-    virtual int uflow();
-    virtual int pbackfail(int c = EOF);
-
-    // Special work around for VC8/9 (this bug was fixed in VC10 and later):
-    // these versions have non-standard _Xsgetn_s() that it being called from
-    // the stream code instead of xsgetn() and so our overridden implementation
-    // never actually gets used. To work around this, forward to it explicitly.
-#if defined(__VISUALC8__) || defined(__VISUALC9__)
-    virtual std::streamsize
-    _Xsgetn_s(char *s, size_t WXUNUSED(size), std::streamsize n)
-    {
-        return xsgetn(s, n);
-    }
-#endif // VC8 or VC9
-
-    wxInputStream& m_stream;
-    int m_lastChar;
-};
-
-// ==========================================================================
-// wxStdInputStream
-// ==========================================================================
-
-class WXDLLIMPEXP_BASE wxStdInputStream : public std::istream
-{
-public:
-    wxStdInputStream(wxInputStream& stream);
-    virtual ~wxStdInputStream() { }
-
-protected:
-    wxStdInputStreamBuffer m_streamBuffer;
-};
-
-// ==========================================================================
-// wxStdOutputStreamBuffer
-// ==========================================================================
-
-class WXDLLIMPEXP_BASE wxStdOutputStreamBuffer : public std::streambuf
-{
-public:
-    wxStdOutputStreamBuffer(wxOutputStream& stream);
-    virtual ~wxStdOutputStreamBuffer() { }
-
-protected:
-    virtual std::streambuf *setbuf(char *s, std::streamsize n);
-    virtual std::streampos seekoff(std::streamoff off,
-                                   std::ios_base::seekdir way,
-                                   std::ios_base::openmode which =
-                                       std::ios_base::in |
-                                       std::ios_base::out);
-    virtual std::streampos seekpos(std::streampos sp,
-                                   std::ios_base::openmode which =
-                                       std::ios_base::in |
-                                       std::ios_base::out);
-    virtual std::streamsize xsputn(const char *s, std::streamsize n);
-    virtual int overflow(int c);
-
-    wxOutputStream& m_stream;
-};
-
-// ==========================================================================
-// wxStdOutputStream
-// ==========================================================================
-
-class WXDLLIMPEXP_BASE wxStdOutputStream : public std::ostream
-{
-public:
-    wxStdOutputStream(wxOutputStream& stream);
-    virtual ~wxStdOutputStream() { }
-
-protected:
-    wxStdOutputStreamBuffer m_streamBuffer;
-};
-
-#endif // wxUSE_STREAMS && wxUSE_STD_IOSTREAM
-
-#endif // _WX_STDSTREAM_H_
diff --git a/Source/3rd Party/wx/include/wx/stockitem.h b/Source/3rd Party/wx/include/wx/stockitem.h
index 675f039df..31ac5213a 100644
--- a/Source/3rd Party/wx/include/wx/stockitem.h	
+++ b/Source/3rd Party/wx/include/wx/stockitem.h	
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004-08-15
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stockitem.h 42935 2006-11-02 09:51:49Z JS $
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,7 +13,7 @@
 #define _WX_STOCKITEM_H_
 
 #include "wx/defs.h"
-#include "wx/chartype.h"
+#include "wx/wxchar.h"
 #include "wx/string.h"
 #include "wx/accel.h"
 
@@ -22,40 +22,32 @@
 // ----------------------------------------------------------------------------
 
 // Returns true if the ID is in the list of recognized stock actions
-WXDLLIMPEXP_CORE bool wxIsStockID(wxWindowID id);
+WXDLLEXPORT bool wxIsStockID(wxWindowID id);
 
 // Returns true of the label is empty or label of a stock button with
 // given ID
-WXDLLIMPEXP_CORE bool wxIsStockLabel(wxWindowID id, const wxString& label);
+WXDLLEXPORT bool wxIsStockLabel(wxWindowID id, const wxString& label);
 
 enum wxStockLabelQueryFlag
 {
     wxSTOCK_NOFLAGS = 0,
 
     wxSTOCK_WITH_MNEMONIC = 1,
-    wxSTOCK_WITH_ACCELERATOR = 2,
-
-    // by default, stock items text is returned with ellipsis, if appropriate,
-    // this flag allows to avoid having it
-    wxSTOCK_WITHOUT_ELLIPSIS = 4,
-
-    // return label for button, not menu item: buttons should always use
-    // mnemonics and never use ellipsis
-    wxSTOCK_FOR_BUTTON = wxSTOCK_WITHOUT_ELLIPSIS | wxSTOCK_WITH_MNEMONIC
+    wxSTOCK_WITH_ACCELERATOR = 2
 };
 
 // Returns label that should be used for given stock UI element (e.g. "&OK"
 // for wxSTOCK_OK); if wxSTOCK_WITH_MNEMONIC is given, the & character
 // is included; if wxSTOCK_WITH_ACCELERATOR is given, the stock accelerator
 // for given ID is concatenated to the label using \t as separator
-WXDLLIMPEXP_CORE wxString wxGetStockLabel(wxWindowID id,
+WXDLLEXPORT wxString wxGetStockLabel(wxWindowID id,
                                      long flags = wxSTOCK_WITH_MNEMONIC);
 
 #if wxUSE_ACCEL
 
     // Returns the accelerator that should be used for given stock UI element
     // (e.g. "Ctrl+x" for wxSTOCK_EXIT)
-    WXDLLIMPEXP_CORE wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id);
+    WXDLLEXPORT wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id);
 
 #endif
 
@@ -67,14 +59,14 @@ enum wxStockHelpStringClient
 };
 
 // Returns an help string for the given stock UI element and for the given "context".
-WXDLLIMPEXP_CORE wxString wxGetStockHelpString(wxWindowID id,
+WXDLLEXPORT wxString wxGetStockHelpString(wxWindowID id,
                                           wxStockHelpStringClient client = wxSTOCK_MENU);
 
 
 #ifdef __WXGTK20__
 
 // Translates stock ID to GTK+'s stock item string indentifier:
-WXDLLIMPEXP_CORE const char *wxGetStockGtkID(wxWindowID id);
+WXDLLEXPORT const char *wxGetStockGtkID(wxWindowID id);
 
 #endif
 
diff --git a/Source/3rd Party/wx/include/wx/stopwatch.h b/Source/3rd Party/wx/include/wx/stopwatch.h
index cd6929446..8733708c8 100644
--- a/Source/3rd Party/wx/include/wx/stopwatch.h	
+++ b/Source/3rd Party/wx/include/wx/stopwatch.h	
@@ -1,12 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/stopwatch.h
 // Purpose:     wxStopWatch and global time-related functions
-// Author:      Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch),
-//              Vadim Zeitlin (time functions, current wxStopWatch)
+// Author:      Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch)
 // Created:     26.06.03 (extracted from wx/timer.h)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stopwatch.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998-2003 Julian Smart, Sylvain Bougnoux
-//              (c) 2011 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,11 +14,6 @@
 #include "wx/defs.h"
 #include "wx/longlong.h"
 
-// Time-related functions are also available via this header for compatibility
-// but you should include wx/time.h directly if you need only them and not
-// wxStopWatch itself.
-#include "wx/time.h"
-
 // ----------------------------------------------------------------------------
 // wxStopWatch: measure time intervals with up to 1ms resolution
 // ----------------------------------------------------------------------------
@@ -33,16 +26,14 @@ public:
     // ctor starts the stop watch
     wxStopWatch() { m_pauseCount = 0; Start(); }
 
-    // Start the stop watch at the moment t0 expressed in milliseconds (i.e.
-    // calling Time() immediately afterwards returns t0). This can be used to
-    // restart an existing stopwatch.
+    // start the stop watch at the moment t0
     void Start(long t0 = 0);
 
     // pause the stop watch
     void Pause()
     {
         if ( m_pauseCount++ == 0 )
-            m_elapsedBeforePause = GetCurrentClockValue() - m_t0;
+            m_pause = GetElapsedTime();
     }
 
     // resume it
@@ -52,37 +43,22 @@ public:
                       wxT("Resuming stop watch which is not paused") );
 
         if ( --m_pauseCount == 0 )
-        {
-            DoStart();
-            m_t0 -= m_elapsedBeforePause;
-        }
+            Start(m_pause);
     }
 
-    // Get elapsed time since the last Start() in microseconds.
-    wxLongLong TimeInMicro() const;
-
     // get elapsed time since the last Start() in milliseconds
-    long Time() const { return (TimeInMicro()/1000).ToLong(); }
+    long Time() const;
+
+protected:
+    // returns the elapsed time since t0
+    long GetElapsedTime() const;
 
 private:
-    // Really starts the stop watch. The initial time is set to current clock
-    // value.
-    void DoStart();
-
-    // Returns the current clock value in its native units.
-    wxLongLong GetCurrentClockValue() const;
-
-    // Return the frequency of the clock used in its ticks per second.
-    wxLongLong GetClockFreq() const;
-
-
-    // The clock value when the stop watch was last started. Its units vary
-    // depending on the platform.
+    // the time of the last Start()
     wxLongLong m_t0;
 
-    // The elapsed time as of last Pause() call (only valid if m_pauseCount >
-    // 0) in the same units as m_t0.
-    wxLongLong m_elapsedBeforePause;
+    // the time of the last Pause() (only valid if m_pauseCount > 0)
+    long m_pause;
 
     // if > 0, the stop watch is paused, otherwise it is running
     int m_pauseCount;
@@ -102,4 +78,25 @@ private:
 
 #endif // wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6
 
+// ----------------------------------------------------------------------------
+// global time functions
+// ----------------------------------------------------------------------------
+
+// Get number of seconds since local time 00:00:00 Jan 1st 1970.
+extern long WXDLLIMPEXP_BASE wxGetLocalTime();
+
+// Get number of seconds since GMT 00:00:00, Jan 1st 1970.
+extern long WXDLLIMPEXP_BASE wxGetUTCTime();
+
+#if wxUSE_LONGLONG
+    typedef wxLongLong wxMilliClock_t;
+#else
+    typedef double wxMilliClock_t;
+#endif // wxUSE_LONGLONG
+
+// Get number of milliseconds since local time 00:00:00 Jan 1st 1970
+extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
+
+#define wxGetCurrentTime() wxGetLocalTime()
+
 #endif // _WX_STOPWATCH_H_
diff --git a/Source/3rd Party/wx/include/wx/strconv.h b/Source/3rd Party/wx/include/wx/strconv.h
index 526075105..7d167fab7 100644
--- a/Source/3rd Party/wx/include/wx/strconv.h	
+++ b/Source/3rd Party/wx/include/wx/strconv.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/strconv.h
+// Name:        strconv.h
 // Purpose:     conversion routines for char sets any Unicode
 // Author:      Ove Kaaven, Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: strconv.h 45893 2007-05-08 20:05:16Z VZ $
 // Copyright:   (c) 1998 Ove Kaaven, Robert Roebling
 //              (c) 1998-2006 Vadim Zeitlin
 // Licence:     wxWindows licence
@@ -14,7 +14,7 @@
 #define _WX_STRCONV_H_
 
 #include "wx/defs.h"
-#include "wx/chartype.h"
+#include "wx/wxchar.h"
 #include "wx/buffer.h"
 
 #ifdef __DIGITALMARS__
@@ -27,11 +27,15 @@
 
 #include <stdlib.h>
 
-class WXDLLIMPEXP_FWD_BASE wxString;
+#if wxUSE_WCHAR_T
 
 // the error value returned by wxMBConv methods
 #define wxCONV_FAILED ((size_t)-1)
 
+// the default value for some length parameters meaning that the string is
+// NUL-terminated
+#define wxNO_LEN ((size_t)-1)
+
 // ----------------------------------------------------------------------------
 // wxMBConv (abstract base class for conversions)
 // ----------------------------------------------------------------------------
@@ -57,21 +61,19 @@ public:
     // there is not enough space for everything, including the trailing NUL
     // character(s), in the output buffer, wxCONV_FAILED is returned.
     //
-    // In the special case when dst is NULL (the value of dstLen is ignored
-    // then) the return value is the length of the needed buffer but nothing
-    // happens otherwise. If srcLen is wxNO_LEN, the entire string, up to and
+    // In the special case when dstLen is 0 (outputBuf may be NULL then) the
+    // return value is the length of the needed buffer but nothing happens
+    // otherwise. If srcLen is wxNO_LEN, the entire string, up to and
     // including the trailing NUL(s), is converted, otherwise exactly srcLen
     // bytes are.
     //
     // Typical usage:
     //
     //          size_t dstLen = conv.ToWChar(NULL, 0, src);
-    //          if ( dstLen == wxCONV_FAILED )
+    //          if ( dstLen != wxCONV_FAILED )
     //              ... handle error ...
     //          wchar_t *wbuf = new wchar_t[dstLen];
     //          conv.ToWChar(wbuf, dstLen, src);
-    //          ... work with wbuf ...
-    //          delete [] wbuf;
     //
     virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
                            const char *src, size_t srcLen = wxNO_LEN) const;
@@ -89,29 +91,20 @@ public:
     // Convenience functions for converting strings which may contain embedded
     // NULs and don't have to be NUL-terminated.
     //
-    // inLen is the length of the buffer including trailing NUL if any or
-    // wxNO_LEN if the input is NUL-terminated.
+    // inLen is the length of the buffer including trailing NUL if any: if the
+    // last 4 bytes of the buffer are all NULs, these functions are more
+    // efficient as they avoid copying the string, but otherwise a copy is made
+    // internally which could be quite bad for (very) long strings.
     //
     // outLen receives, if not NULL, the length of the converted string or 0 if
     // the conversion failed (returning 0 and not -1 in this case makes it
     // difficult to distinguish between failed conversion and empty input but
-    // this is done for backwards compatibility). Notice that the rules for
-    // whether outLen accounts or not for the last NUL are the same as for
-    // To/FromWChar() above: if inLen is specified, outLen is exactly the
-    // number of characters converted, whether the last one of them was NUL or
-    // not. But if inLen == wxNO_LEN then outLen doesn't account for the last
-    // NUL even though it is present.
+    // this is done for backwards compatibility)
     const wxWCharBuffer
         cMB2WC(const char *in, size_t inLen, size_t *outLen) const;
     const wxCharBuffer
         cWC2MB(const wchar_t *in, size_t inLen, size_t *outLen) const;
 
-    // And yet more convenience functions for converting the entire buffers:
-    // these are the simplest and least error-prone as you never need to bother
-    // with lengths/sizes directly.
-    const wxWCharBuffer cMB2WC(const wxScopedCharBuffer& in) const;
-    const wxCharBuffer cWC2MB(const wxScopedWCharBuffer& in) const;
-
     // convenience functions for converting MB or WC to/from wxWin default
 #if wxUSE_UNICODE
     const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); }
@@ -142,12 +135,6 @@ public:
     // encoding
     static size_t GetMaxMBNulLen() { return 4 /* for UTF-32 */; }
 
-#if wxUSE_UNICODE_UTF8
-    // return true if the converter's charset is UTF-8, i.e. char* strings
-    // decoded using this object can be directly copied to wxString's internal
-    // storage without converting to WC and than back to UTF-8 MB string
-    virtual bool IsUTF8() const { return false; }
-#endif
 
     // The old conversion functions. The existing classes currently mostly
     // implement these ones but we're in transition to using To/FromWChar()
@@ -188,10 +175,6 @@ public:
     virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
 
     virtual wxMBConv *Clone() const { return new wxMBConvLibc; }
-
-#if wxUSE_UNICODE_UTF8
-    virtual bool IsUTF8() const { return wxLocaleIsUtf8; }
-#endif
 };
 
 #ifdef __UNIX__
@@ -206,7 +189,7 @@ public:
 class WXDLLIMPEXP_BASE wxConvBrokenFileNames : public wxMBConv
 {
 public:
-    wxConvBrokenFileNames(const wxString& charset);
+    wxConvBrokenFileNames(const wxChar *charset);
     wxConvBrokenFileNames(const wxConvBrokenFileNames& conv)
         : wxMBConv(),
           m_conv(conv.m_conv ? conv.m_conv->Clone() : NULL)
@@ -230,17 +213,13 @@ public:
         return m_conv->GetMBNulLen();
     }
 
-#if wxUSE_UNICODE_UTF8
-    virtual bool IsUTF8() const { return m_conv->IsUTF8(); }
-#endif
-
     virtual wxMBConv *Clone() const { return new wxConvBrokenFileNames(*this); }
 
 private:
     // the conversion object we forward to
     wxMBConv *m_conv;
 
-    wxDECLARE_NO_ASSIGN_CLASS(wxConvBrokenFileNames);
+    DECLARE_NO_ASSIGN_CLASS(wxConvBrokenFileNames)
 };
 
 #endif // __UNIX__
@@ -252,113 +231,17 @@ private:
 class WXDLLIMPEXP_BASE wxMBConvUTF7 : public wxMBConv
 {
 public:
-    wxMBConvUTF7() { }
-
-    // compiler-generated copy ctor, assignment operator and dtor are ok
-    // (assuming it's ok to copy the shift state -- not really sure about it)
-
-    virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
-                           const char *src, size_t srcLen = wxNO_LEN) const;
-    virtual size_t FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen = wxNO_LEN) const;
+    virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const;
+    virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
 
     virtual wxMBConv *Clone() const { return new wxMBConvUTF7; }
-
-private:
-    // UTF-7 decoder/encoder may be in direct mode or in shifted mode after a
-    // '+' (and until the '-' or any other non-base64 character)
-    struct StateMode
-    {
-        enum Mode
-        {
-            Direct,     // pass through state
-            Shifted     // after a '+' (and before '-')
-        };
-    };
-
-    // the current decoder state: this is only used by ToWChar() if srcLen
-    // parameter is not wxNO_LEN, when working on the entire NUL-terminated
-    // strings we neither update nor use the state
-    class DecoderState : private StateMode
-    {
-    private:
-        // current state: this one is private as we want to enforce the use of
-        // ToDirect/ToShifted() methods below
-        Mode mode;
-
-    public:
-        // the initial state is direct
-        DecoderState() { mode = Direct; }
-
-        // switch to/from shifted mode
-        void ToDirect() { mode = Direct; }
-        void ToShifted() { mode = Shifted; accum = bit = 0; isLSB = false; }
-
-        bool IsDirect() const { return mode == Direct; }
-        bool IsShifted() const { return mode == Shifted; }
-
-
-        // these variables are only used in shifted mode
-
-        unsigned int accum; // accumulator of the bit we've already got
-        unsigned int bit;   // the number of bits consumed mod 8
-        unsigned char msb;  // the high byte of UTF-16 word
-        bool isLSB;         // whether we're decoding LSB or MSB of UTF-16 word
-    };
-
-    DecoderState m_stateDecoder;
-
-
-    // encoder state is simpler as we always receive entire Unicode characters
-    // on input
-    class EncoderState : private StateMode
-    {
-    private:
-        Mode mode;
-
-    public:
-        EncoderState() { mode = Direct; }
-
-        void ToDirect() { mode = Direct; }
-        void ToShifted() { mode = Shifted; accum = bit = 0; }
-
-        bool IsDirect() const { return mode == Direct; }
-        bool IsShifted() const { return mode == Shifted; }
-
-        unsigned int accum;
-        unsigned int bit;
-    };
-
-    EncoderState m_stateEncoder;
 };
 
 // ----------------------------------------------------------------------------
 // wxMBConvUTF8 (for conversion using UTF8 encoding)
 // ----------------------------------------------------------------------------
 
-// this is the real UTF-8 conversion class, it has to be called "strict UTF-8"
-// for compatibility reasons: the wxMBConvUTF8 class below also supports lossy
-// conversions if it is created with non default options
-class WXDLLIMPEXP_BASE wxMBConvStrictUTF8 : public wxMBConv
-{
-public:
-    // compiler-generated default ctor and other methods are ok
-
-    virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
-                           const char *src, size_t srcLen = wxNO_LEN) const;
-    virtual size_t FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen = wxNO_LEN) const;
-
-    virtual wxMBConv *Clone() const { return new wxMBConvStrictUTF8(); }
-
-#if wxUSE_UNICODE_UTF8
-    // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't
-    //     take the shortcut in that case
-    virtual bool IsUTF8() const { return true; }
-#endif
-};
-
-class WXDLLIMPEXP_BASE wxMBConvUTF8 : public wxMBConvStrictUTF8
+class WXDLLIMPEXP_BASE wxMBConvUTF8 : public wxMBConv
 {
 public:
     enum
@@ -369,20 +252,11 @@ public:
     };
 
     wxMBConvUTF8(int options = MAP_INVALID_UTF8_NOT) : m_options(options) { }
-
-    virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
-                           const char *src, size_t srcLen = wxNO_LEN) const;
-    virtual size_t FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen = wxNO_LEN) const;
+    virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const;
+    virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
 
     virtual wxMBConv *Clone() const { return new wxMBConvUTF8(m_options); }
 
-#if wxUSE_UNICODE_UTF8
-    // NB: other mapping modes are not, strictly speaking, UTF-8, so we can't
-    //     take the shortcut in that case
-    virtual bool IsUTF8() const { return m_options == MAP_INVALID_UTF8_NOT; }
-#endif
-
 private:
     int m_options;
 };
@@ -491,7 +365,7 @@ class WXDLLIMPEXP_BASE wxCSConv : public wxMBConv
 public:
     // we can be created either from charset name or from an encoding constant
     // but we can't have both at once
-    wxCSConv(const wxString& charset);
+    wxCSConv(const wxChar *charset);
     wxCSConv(wxFontEncoding encoding);
 
     wxCSConv(const wxCSConv& conv);
@@ -503,53 +377,42 @@ public:
                            const char *src, size_t srcLen = wxNO_LEN) const;
     virtual size_t FromWChar(char *dst, size_t dstLen,
                              const wchar_t *src, size_t srcLen = wxNO_LEN) const;
+    virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const;
+    virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const;
     virtual size_t GetMBNulLen() const;
 
-#if wxUSE_UNICODE_UTF8
-    virtual bool IsUTF8() const;
-#endif
-
     virtual wxMBConv *Clone() const { return new wxCSConv(*this); }
 
     void Clear();
 
-    // return true if the conversion could be initialized successfully
+#if wxABI_VERSION >= 20802
+    // return true if the conversion could be initilized successfully
     bool IsOk() const;
+#endif // wx 2.8.2+
 
 private:
     // common part of all ctors
     void Init();
 
-    // Creates the conversion to use, called from all ctors to initialize
-    // m_convReal.
+    // creates m_convReal if necessary
+    void CreateConvIfNeeded() const;
+
+    // do create m_convReal (unconditionally)
     wxMBConv *DoCreate() const;
 
-    // Set the name (may be only called when m_name == NULL), makes copy of
-    // the charset string.
-    void SetName(const char *charset);
-
-    // Set m_encoding field respecting the rules below, i.e. making sure it has
-    // a valid value if m_name == NULL (thus this should be always called after
-    // SetName()).
-    //
-    // Input encoding may be valid or not.
-    void SetEncoding(wxFontEncoding encoding);
+    // set the name (may be only called when m_name == NULL), makes copy of
+    // charset string
+    void SetName(const wxChar *charset);
 
 
-    // The encoding we use is specified by the two fields below:
-    //
-    //  1. If m_name != NULL, m_encoding corresponds to it if it's one of
-    //     encodings we know about (i.e. member of wxFontEncoding) or is
-    //     wxFONTENCODING_SYSTEM otherwise.
-    //
-    //  2. If m_name == NULL, m_encoding is always valid, i.e. not one of
-    //     wxFONTENCODING_{SYSTEM,DEFAULT,MAX}.
-    char *m_name;
+    // note that we can't use wxString here because of compilation
+    // dependencies: we're included from wx/string.h
+    wxChar *m_name;
     wxFontEncoding m_encoding;
 
-    // The conversion object for our encoding or NULL if we failed to create it
-    // in which case we fall back to hard-coded ISO8859-1 conversion.
+    // use CreateConvIfNeeded() before accessing m_convReal!
     wxMBConv *m_convReal;
+    bool m_deferred;
 };
 
 
@@ -557,35 +420,14 @@ private:
 // declare predefined conversion objects
 // ----------------------------------------------------------------------------
 
-// Note: this macro is an implementation detail (see the comment in
-// strconv.cpp). The wxGet_XXX() and wxGet_XXXPtr() functions shouldn't be
-// used by user code and neither should XXXPtr, use the wxConvXXX macro
-// instead.
-#define WX_DECLARE_GLOBAL_CONV(klass, name)                             \
-    extern WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr;                     \
-    extern WXDLLIMPEXP_BASE klass* wxGet_##name##Ptr();                 \
-    inline klass& wxGet_##name()                                        \
-    {                                                                   \
-        if ( !name##Ptr )                                               \
-            name##Ptr = wxGet_##name##Ptr();                            \
-        return *name##Ptr;                                              \
-    }
-
-
 // conversion to be used with all standard functions affected by locale, e.g.
 // strtol(), strftime(), ...
-WX_DECLARE_GLOBAL_CONV(wxMBConv, wxConvLibc)
-#define wxConvLibc wxGet_wxConvLibc()
+extern WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc;
 
 // conversion ISO-8859-1/UTF-7/UTF-8 <-> wchar_t
-WX_DECLARE_GLOBAL_CONV(wxCSConv, wxConvISO8859_1)
-#define wxConvISO8859_1 wxGet_wxConvISO8859_1()
-
-WX_DECLARE_GLOBAL_CONV(wxMBConvStrictUTF8, wxConvUTF8)
-#define wxConvUTF8 wxGet_wxConvUTF8()
-
-WX_DECLARE_GLOBAL_CONV(wxMBConvUTF7, wxConvUTF7)
-#define wxConvUTF7 wxGet_wxConvUTF7()
+extern WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1;
+extern WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7;
+extern WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8;
 
 // conversion used for the file names on the systems where they're not Unicode
 // (basically anything except Windows)
@@ -604,8 +446,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName;
 extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent;
 
 // the conversion corresponding to the current locale
-WX_DECLARE_GLOBAL_CONV(wxCSConv, wxConvLocal)
-#define wxConvLocal wxGet_wxConvLocal()
+extern WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal;
 
 // the conversion corresponding to the encoding of the standard UI elements
 //
@@ -613,8 +454,6 @@ WX_DECLARE_GLOBAL_CONV(wxCSConv, wxConvLocal)
 // needs to use a fixed encoding
 extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
 
-#undef WX_DECLARE_GLOBAL_CONV
-
 // ----------------------------------------------------------------------------
 // endianness-dependent conversions
 // ----------------------------------------------------------------------------
@@ -632,11 +471,17 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
 // ----------------------------------------------------------------------------
 
 // filenames are multibyte on Unix and widechar on Windows
+#if defined(__UNIX__) || defined(__WXMAC__)
+    #define wxMBFILES 1
+#else
+    #define wxMBFILES 0
+#endif
+
 #if wxMBFILES && wxUSE_UNICODE
     #define wxFNCONV(name) wxConvFileName->cWX2MB(name)
     #define wxFNSTRINGCAST wxMBSTRINGCAST
 #else
-#if defined( __WXOSX_OR_COCOA__ ) && wxMBFILES
+#if defined( __WXOSX__ ) && wxMBFILES
     #define wxFNCONV(name) wxConvFileName->cWC2MB( wxConvLocal.cWX2WC(name) )
 #else
     #define wxFNCONV(name) name
@@ -644,6 +489,36 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
     #define wxFNSTRINGCAST WXSTRINGCAST
 #endif
 
+#else // !wxUSE_WCHAR_T
+
+// ----------------------------------------------------------------------------
+// stand-ins in absence of wchar_t
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxMBConv
+{
+public:
+    const char* cMB2WX(const char *psz) const { return psz; }
+    const char* cWX2MB(const char *psz) const { return psz; }
+    wxMBConv *Clone() const { return NULL; }
+};
+
+#define wxConvFile wxConvLocal
+#define wxConvUI wxConvCurrent
+
+typedef wxMBConv wxCSConv;
+
+extern WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
+                                       wxConvLocal,
+                                       wxConvISO8859_1,
+                                       wxConvUTF8;
+extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent;
+
+#define wxFNCONV(name) name
+#define wxFNSTRINGCAST WXSTRINGCAST
+
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
+
 // ----------------------------------------------------------------------------
 // macros for the most common conversions
 // ----------------------------------------------------------------------------
@@ -652,6 +527,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
     #define wxConvertWX2MB(s)   wxConvCurrent->cWX2MB(s)
     #define wxConvertMB2WX(s)   wxConvCurrent->cMB2WX(s)
 
+#if wxABI_VERSION >= 20802
     // these functions should be used when the conversions really, really have
     // to succeed (usually because we pass their results to a standard C
     // function which would crash if we passed NULL to it), so these functions
@@ -664,6 +540,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI;
     // this function uses wxConvLibc and wxConvUTF8(MAP_INVALID_UTF8_TO_OCTAL)
     // if it fails
     extern WXDLLIMPEXP_BASE wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws);
+#endif // wxABI 2.8.2+
 #else // ANSI
     // no conversions to do
     #define wxConvertWX2MB(s)   (s)
diff --git a/Source/3rd Party/wx/include/wx/stream.h b/Source/3rd Party/wx/include/wx/stream.h
index ff0fe9041..bea273189 100644
--- a/Source/3rd Party/wx/include/wx/stream.h	
+++ b/Source/3rd Party/wx/include/wx/stream.h	
@@ -4,7 +4,7 @@
 // Author:      Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin
 // Modified by:
 // Created:     11/07/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stream.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -52,7 +52,7 @@ const int wxEOF = -1;
 // wxStreamBase: common (but non virtual!) base for all stream classes
 // ---------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxStreamBase : public wxObject
+class WXDLLIMPEXP_BASE wxStreamBase
 {
 public:
     wxStreamBase();
@@ -64,7 +64,7 @@ public:
     bool operator!() const { return !IsOk(); }
 
     // reset the stream state
-    void Reset(wxStreamError error = wxSTREAM_NO_ERROR) { m_lasterror = error; }
+    void Reset() { m_lasterror = wxSTREAM_NO_ERROR; }
 
     // this doesn't make sense for all streams, always test its return value
     virtual size_t GetSize() const;
@@ -82,8 +82,7 @@ protected:
 
     friend class wxStreamBuffer;
 
-    DECLARE_ABSTRACT_CLASS(wxStreamBase)
-    wxDECLARE_NO_COPY_CLASS(wxStreamBase);
+    DECLARE_NO_COPY_CLASS(wxStreamBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -217,8 +216,7 @@ protected:
 
     friend class wxStreamBuffer;
 
-    DECLARE_ABSTRACT_CLASS(wxInputStream)
-    wxDECLARE_NO_COPY_CLASS(wxInputStream);
+    DECLARE_NO_COPY_CLASS(wxInputStream)
 };
 
 // ----------------------------------------------------------------------------
@@ -253,8 +251,7 @@ protected:
 
     friend class wxStreamBuffer;
 
-    DECLARE_ABSTRACT_CLASS(wxOutputStream)
-    wxDECLARE_NO_COPY_CLASS(wxOutputStream);
+    DECLARE_NO_COPY_CLASS(wxOutputStream)
 };
 
 // ============================================================================
@@ -281,8 +278,7 @@ protected:
 
     size_t m_currentPos;
 
-    DECLARE_DYNAMIC_CLASS(wxCountingOutputStream)
-    wxDECLARE_NO_COPY_CLASS(wxCountingOutputStream);
+    DECLARE_NO_COPY_CLASS(wxCountingOutputStream)
 };
 
 // ---------------------------------------------------------------------------
@@ -307,8 +303,7 @@ protected:
     wxInputStream *m_parent_i_stream;
     bool m_owns;
 
-    DECLARE_ABSTRACT_CLASS(wxFilterInputStream)
-    wxDECLARE_NO_COPY_CLASS(wxFilterInputStream);
+    DECLARE_NO_COPY_CLASS(wxFilterInputStream)
 };
 
 class WXDLLIMPEXP_BASE wxFilterOutputStream : public wxOutputStream
@@ -329,8 +324,7 @@ protected:
     wxOutputStream *m_parent_o_stream;
     bool m_owns;
 
-    DECLARE_ABSTRACT_CLASS(wxFilterOutputStream)
-    wxDECLARE_NO_COPY_CLASS(wxFilterOutputStream);
+    DECLARE_NO_COPY_CLASS(wxFilterOutputStream)
 };
 
 enum wxStreamProtocolType
@@ -354,12 +348,12 @@ public:
     virtual const wxChar * const *GetProtocols(wxStreamProtocolType type
                                                = wxSTREAM_PROTOCOL) const = 0;
 
-    bool CanHandle(const wxString& protocol,
+    bool CanHandle(const wxChar *protocol,
                    wxStreamProtocolType type
                    = wxSTREAM_PROTOCOL) const;
 
 protected:
-    wxString::size_type FindExtension(const wxString& location) const;
+    wxString::size_type FindExtension(const wxChar *location) const;
 
     DECLARE_ABSTRACT_CLASS(wxFilterClassFactoryBase)
 };
@@ -374,7 +368,7 @@ public:
     virtual wxFilterInputStream  *NewStream(wxInputStream *stream)  const = 0;
     virtual wxFilterOutputStream *NewStream(wxOutputStream *stream) const = 0;
 
-    static const wxFilterClassFactory *Find(const wxString& protocol,
+    static const wxFilterClassFactory *Find(const wxChar *protocol,
                                             wxStreamProtocolType type
                                             = wxSTREAM_PROTOCOL);
 
@@ -416,23 +410,7 @@ public:
         read_write
     };
 
-    wxStreamBuffer(wxStreamBase& stream, BufMode mode)
-    {
-        InitWithStream(stream, mode);
-    }
-
-    wxStreamBuffer(size_t bufsize, wxInputStream& stream)
-    {
-        InitWithStream(stream, read);
-        SetBufferIO(bufsize);
-    }
-
-    wxStreamBuffer(size_t bufsize, wxOutputStream& stream)
-    {
-        InitWithStream(stream, write);
-        SetBufferIO(bufsize);
-    }
-
+    wxStreamBuffer(wxStreamBase& stream, BufMode mode);
     wxStreamBuffer(const wxStreamBuffer& buf);
     virtual ~wxStreamBuffer();
 
@@ -450,7 +428,6 @@ public:
 
     // Buffer control
     void ResetBuffer();
-    void Truncate();
 
     // NB: the buffer must always be allocated with malloc() if takeOwn is
     //     true as it will be deallocated by free()
@@ -460,7 +437,7 @@ public:
     void *GetBufferStart() const { return m_buffer_start; }
     void *GetBufferEnd() const { return m_buffer_end; }
     void *GetBufferPos() const { return m_buffer_pos; }
-    size_t GetBufferSize() const { return m_buffer_end - m_buffer_start; }
+    size_t GetBufferSize() const { return m_buffer_size; }
     size_t GetIntPosition() const { return m_buffer_pos - m_buffer_start; }
     void SetIntPosition(size_t pos) { m_buffer_pos = m_buffer_start + pos; }
     size_t GetLastAccess() const { return m_buffer_end - m_buffer_start; }
@@ -475,7 +452,7 @@ public:
 
     // misc accessors
     wxStreamBase *GetStream() const { return m_stream; }
-    bool HasBuffer() const { return m_buffer_start != m_buffer_end; }
+    bool HasBuffer() const { return m_buffer_size != 0; }
 
     bool IsFixed() const { return m_fixed; }
     bool IsFlushable() const { return m_flushable; }
@@ -503,9 +480,6 @@ protected:
     // common part of several ctors
     void Init();
 
-    // common part of ctors taking wxStreamBase parameter
-    void InitWithStream(wxStreamBase& stream, BufMode mode);
-
     // init buffer variables to be empty
     void InitBuffer();
 
@@ -518,6 +492,10 @@ protected:
          *m_buffer_end,
          *m_buffer_pos;
 
+    // the buffer size
+    // FIXME: isn't it the same as m_buffer_end - m_buffer_start? (VZ)
+    size_t m_buffer_size;
+
     // the stream we're associated with
     wxStreamBase *m_stream;
 
@@ -529,8 +507,13 @@ protected:
          m_fixed,
          m_flushable;
 
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxStreamBuffer);
+private:
+// Cannot use
+//  DECLARE_NO_COPY_CLASS(wxStreamBuffer)
+// because copy constructor is explicitly declared above;
+// but no copy assignment operator is defined, so declare
+// it private to prevent the compiler from defining it:
+    wxStreamBuffer& operator=(const wxStreamBuffer&);
 };
 
 // ---------------------------------------------------------------------------
@@ -540,19 +523,9 @@ protected:
 class WXDLLIMPEXP_BASE wxBufferedInputStream : public wxFilterInputStream
 {
 public:
-    // create a buffered stream on top of the specified low-level stream
-    //
-    // if a non NULL buffer is given to the stream, it will be deleted by it,
-    // otherwise a default 1KB buffer will be used
+    // if a non NULL buffer is given to the stream, it will be deleted by it
     wxBufferedInputStream(wxInputStream& stream,
                           wxStreamBuffer *buffer = NULL);
-
-    // ctor allowing to specify the buffer size, it's just a more convenient
-    // alternative to creating wxStreamBuffer, calling its SetBufferIO(bufsize)
-    // and using the ctor above
-    wxBufferedInputStream(wxInputStream& stream, size_t bufsize);
-
-
     virtual ~wxBufferedInputStream();
 
     char Peek();
@@ -579,7 +552,7 @@ protected:
 
     wxStreamBuffer *m_i_streambuf;
 
-    wxDECLARE_NO_COPY_CLASS(wxBufferedInputStream);
+    DECLARE_NO_COPY_CLASS(wxBufferedInputStream)
 };
 
 // ----------------------------------------------------------------------------
@@ -589,18 +562,9 @@ protected:
 class WXDLLIMPEXP_BASE wxBufferedOutputStream : public wxFilterOutputStream
 {
 public:
-    // create a buffered stream on top of the specified low-level stream
-    //
-    // if a non NULL buffer is given to the stream, it will be deleted by it,
-    // otherwise a default 1KB buffer will be used
+    // if a non NULL buffer is given to the stream, it will be deleted by it
     wxBufferedOutputStream(wxOutputStream& stream,
                            wxStreamBuffer *buffer = NULL);
-
-    // ctor allowing to specify the buffer size, it's just a more convenient
-    // alternative to creating wxStreamBuffer, calling its SetBufferIO(bufsize)
-    // and using the ctor above
-    wxBufferedOutputStream(wxOutputStream& stream, size_t bufsize);
-
     virtual ~wxBufferedOutputStream();
 
     wxOutputStream& Write(const void *buffer, size_t size);
@@ -631,7 +595,7 @@ protected:
 
     wxStreamBuffer *m_o_streambuf;
 
-    wxDECLARE_NO_COPY_CLASS(wxBufferedOutputStream);
+    DECLARE_NO_COPY_CLASS(wxBufferedOutputStream)
 };
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -640,54 +604,6 @@ protected:
     inline wxStreamBuffer *wxBufferedOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
 #endif // WXWIN_COMPATIBILITY_2_6
 
-// ---------------------------------------------------------------------------
-// wxWrapperInputStream: forwards all IO to another stream.
-// ---------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxWrapperInputStream : public wxFilterInputStream
-{
-public:
-    // Constructor fully initializing the stream. The overload taking pointer
-    // takes ownership of the parent stream, the one taking reference does not.
-    //
-    // Notice that this class also has a default ctor but it's protected as the
-    // derived class is supposed to take care of calling InitParentStream() if
-    // it's used.
-    wxWrapperInputStream(wxInputStream& stream);
-    wxWrapperInputStream(wxInputStream* stream);
-
-    // Override the base class methods to forward to the wrapped stream.
-    virtual wxFileOffset GetLength() const;
-    virtual bool IsSeekable() const;
-
-protected:
-    virtual size_t OnSysRead(void *buffer, size_t size);
-    virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
-    virtual wxFileOffset OnSysTell() const;
-
-    // Ensure that our own last error is the same as that of the real stream.
-    //
-    // This method is const because the error must be updated even from const
-    // methods (in other words, it really should have been mutable in the first
-    // place).
-    void SynchronizeLastError() const
-    {
-        const_cast<wxWrapperInputStream*>(this)->
-            Reset(m_parent_i_stream->GetLastError());
-    }
-
-    // Default constructor, use InitParentStream() later.
-    wxWrapperInputStream();
-
-    // Set up the wrapped stream for an object initialized using the default
-    // constructor. The ownership logic is the same as above.
-    void InitParentStream(wxInputStream& stream);
-    void InitParentStream(wxInputStream* stream);
-
-    wxDECLARE_NO_COPY_CLASS(wxWrapperInputStream);
-};
-
-
 #endif // wxUSE_STREAMS
 
 #endif // _WX_WXSTREAM_H__
diff --git a/Source/3rd Party/wx/include/wx/string.h b/Source/3rd Party/wx/include/wx/string.h
index b3e613821..b478747c8 100644
--- a/Source/3rd Party/wx/include/wx/string.h	
+++ b/Source/3rd Party/wx/include/wx/string.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/string.h
-// Purpose:     wxString class
+// Purpose:     wxString and wxArrayString classes
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: string.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -15,8 +15,8 @@
     missing from string.h.
 */
 
-#ifndef _WX_WXSTRING_H__
-#define _WX_WXSTRING_H__
+#ifndef _WX_WXSTRINGH__
+#define _WX_WXSTRINGH__
 
 // ----------------------------------------------------------------------------
 // headers
@@ -47,59 +47,16 @@
     #include <strings.h>    // for strcasecmp()
 #endif // HAVE_STRCASECMP_IN_STRINGS_H
 
-#include "wx/wxcrtbase.h"   // for wxChar, wxStrlen() etc.
-#include "wx/strvararg.h"
+#ifdef __WXPALMOS__
+    #include <StringMgr.h>
+#endif
+
+#include "wx/wxchar.h"      // for wxChar
 #include "wx/buffer.h"      // for wxCharBuffer
 #include "wx/strconv.h"     // for wxConvertXXX() macros and wxMBConv classes
-#include "wx/stringimpl.h"
-#include "wx/stringops.h"
-#include "wx/unichar.h"
-
-// by default we cache the mapping of the positions in UTF-8 string to the byte
-// offset as this results in noticeable performance improvements for loops over
-// strings using indices; comment out this line to disable this
-//
-// notice that this optimization is well worth using even in debug builds as it
-// changes asymptotic complexity of algorithms using indices to iterate over
-// wxString back to expected linear from quadratic
-//
-// also notice that wxTLS_TYPE() (__declspec(thread) in this case) is unsafe to
-// use in DLL build under pre-Vista Windows so we disable this code for now, if
-// anybody really needs to use UTF-8 build under Windows with this optimization
-// it would have to be re-tested and probably corrected
-// CS: under OSX release builds the string destructor/cache cleanup sometimes
-// crashes, disable until we find the true reason or a better workaround
-#if wxUSE_UNICODE_UTF8 && !defined(__WINDOWS__) && !defined(__WXOSX__)
-    #define wxUSE_STRING_POS_CACHE 1
-#else
-    #define wxUSE_STRING_POS_CACHE 0
-#endif
-
-#if wxUSE_STRING_POS_CACHE
-    #include "wx/tls.h"
-
-    // change this 0 to 1 to enable additional (very expensive) asserts
-    // verifying that string caching logic works as expected
-    #if 0
-        #define wxSTRING_CACHE_ASSERT(cond) wxASSERT(cond)
-    #else
-        #define wxSTRING_CACHE_ASSERT(cond)
-    #endif
-#endif // wxUSE_STRING_POS_CACHE
 
 class WXDLLIMPEXP_FWD_BASE wxString;
 
-// unless this symbol is predefined to disable the compatibility functions, do
-// use them
-#ifndef WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
-    #define WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER 1
-#endif
-
-namespace wxPrivate
-{
-    template <typename T> struct wxStringAsBufHelper;
-}
-
 // ---------------------------------------------------------------------------
 // macros
 // ---------------------------------------------------------------------------
@@ -111,6 +68,10 @@ namespace wxPrivate
 #define   wxMBSTRINGCAST (char *)(const char *)
 #define   wxWCSTRINGCAST (wchar_t *)(const wchar_t *)
 
+// implementation only
+#define   wxASSERT_VALID_INDEX(i) \
+    wxASSERT_MSG( (size_t)(i) <= length(), wxT("invalid index in wxString") )
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -120,30 +81,33 @@ namespace wxPrivate
 // deprecated in favour of wxString::npos, don't use in new code
 //
 // maximum possible length for a string means "take all string" everywhere
-#define wxSTRING_MAXLEN wxString::npos
+#define wxSTRING_MAXLEN wxStringBase::npos
 
 #endif // WXWIN_COMPATIBILITY_2_6
 
+// ----------------------------------------------------------------------------
+// global data
+// ----------------------------------------------------------------------------
+
+// global pointer to empty string
+extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString;
+
 // ---------------------------------------------------------------------------
 // global functions complementing standard C string library replacements for
 // strlen() and portable strcasecmp()
 //---------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_8
-// Use wxXXX() functions from wxcrt.h instead! These functions are for
+// Use wxXXX() functions from wxchar.h instead! These functions are for
 // backwards compatibility only.
 
 // checks whether the passed in pointer is NULL and if the string is empty
-wxDEPRECATED( inline bool IsEmpty(const char *p) );
 inline bool IsEmpty(const char *p) { return (!p || !*p); }
 
 // safe version of strlen() (returns 0 if passed NULL pointer)
-wxDEPRECATED( inline size_t Strlen(const char *psz) );
 inline size_t Strlen(const char *psz)
   { return psz ? strlen(psz) : 0; }
 
 // portable strcasecmp/_stricmp
-wxDEPRECATED( inline int Stricmp(const char *psz1, const char *psz2) );
 inline int Stricmp(const char *psz1, const char *psz2)
 {
 #if defined(__VISUALC__) && defined(__WXWINCE__)
@@ -154,10 +118,12 @@ inline int Stricmp(const char *psz1, const char *psz2)
   } while ( c1 && (c1 == c2) );
 
   return c1 - c2;
-#elif defined(__VISUALC__)
+#elif defined(__VISUALC__) || ( defined(__MWERKS__) && defined(__INTEL__) )
   return _stricmp(psz1, psz2);
 #elif defined(__SC__)
   return _stricmp(psz1, psz2);
+#elif defined(__SALFORDC__)
+  return stricmp(psz1, psz2);
 #elif defined(__BORLANDC__)
   return stricmp(psz1, psz2);
 #elif defined(__WATCOMC__)
@@ -168,10 +134,19 @@ inline int Stricmp(const char *psz1, const char *psz2)
   return stricmp(psz1, psz2);
 #elif defined(__WXPM__)
   return stricmp(psz1, psz2);
-#elif defined(HAVE_STRCASECMP_IN_STRING_H) || \
+#elif defined(__WXPALMOS__) || \
+      defined(HAVE_STRCASECMP_IN_STRING_H) || \
       defined(HAVE_STRCASECMP_IN_STRINGS_H) || \
       defined(__GNUWIN32__)
   return strcasecmp(psz1, psz2);
+#elif defined(__MWERKS__) && !defined(__INTEL__)
+  register char c1, c2;
+  do {
+    c1 = tolower(*psz1++);
+    c2 = tolower(*psz2++);
+  } while ( c1 && (c1 == c2) );
+
+  return c1 - c2;
 #else
   // almost all compilers/libraries provide this function (unfortunately under
   // different names), that's why we don't implement our own which will surely
@@ -190,266 +165,506 @@ inline int Stricmp(const char *psz1, const char *psz2)
 #endif  // OS/compiler
 }
 
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // ----------------------------------------------------------------------------
-// wxCStrData
+// deal with STL/non-STL/non-STL-but-wxUSE_STD_STRING
 // ----------------------------------------------------------------------------
 
-// Lightweight object returned by wxString::c_str() and implicitly convertible
-// to either const char* or const wchar_t*.
-class wxCStrData
-{
-private:
-    // Ctors; for internal use by wxString and wxCStrData only
-    wxCStrData(const wxString *str, size_t offset = 0, bool owned = false)
-        : m_str(str), m_offset(offset), m_owned(owned) {}
+// in both cases we need to define wxStdString
+#if wxUSE_STL || wxUSE_STD_STRING
 
-public:
-    // Ctor constructs the object from char literal; they are needed to make
-    // operator?: compile and they intentionally take char*, not const char*
-    inline wxCStrData(char *buf);
-    inline wxCStrData(wchar_t *buf);
-    inline wxCStrData(const wxCStrData& data);
+#include "wx/beforestd.h"
+#include <string>
+#include "wx/afterstd.h"
 
-    inline ~wxCStrData();
+#if wxUSE_UNICODE
+    #ifdef HAVE_STD_WSTRING
+        typedef std::wstring wxStdString;
+    #else
+        typedef std::basic_string<wxChar> wxStdString;
+    #endif
+#else
+    typedef std::string wxStdString;
+#endif
 
-    // AsWChar() and AsChar() can't be defined here as they use wxString and so
-    // must come after it and because of this won't be inlined when called from
-    // wxString methods (without a lot of work to extract these wxString methods
-    // from inside the class itself). But we still define them being inline
-    // below to let compiler inline them from elsewhere. And because of this we
-    // must declare them as inline here because otherwise some compilers give
-    // warnings about them, e.g. mingw32 3.4.5 warns about "<symbol> defined
-    // locally after being referenced with dllimport linkage" while IRIX
-    // mipsPro 7.4 warns about "function declared inline after being called".
-    inline const wchar_t* AsWChar() const;
-    operator const wchar_t*() const { return AsWChar(); }
+#endif // need <string>
 
-    inline const char* AsChar() const;
-    const unsigned char* AsUnsignedChar() const
-        { return (const unsigned char *) AsChar(); }
-    operator const char*() const { return AsChar(); }
-    operator const unsigned char*() const { return AsUnsignedChar(); }
+#if wxUSE_STL
 
-    operator const void*() const { return AsChar(); }
+    // we don't need an extra ctor from std::string when copy ctor already does
+    // the work
+    #undef wxUSE_STD_STRING
+    #define wxUSE_STD_STRING 0
 
-    // returns buffers that are valid as long as the associated wxString exists
-    const wxScopedCharBuffer AsCharBuf() const
-    {
-        return wxScopedCharBuffer::CreateNonOwned(AsChar());
-    }
+    #if (defined(__GNUG__) && (__GNUG__ < 3)) || \
+        (defined(_MSC_VER) && (_MSC_VER <= 1200))
+        #define wxSTRING_BASE_HASNT_CLEAR
+    #endif
 
-    const wxScopedWCharBuffer AsWCharBuf() const
-    {
-        return wxScopedWCharBuffer::CreateNonOwned(AsWChar());
-    }
+    typedef wxStdString wxStringBase;
+#else // if !wxUSE_STL
 
-    inline wxString AsString() const;
+#if !defined(HAVE_STD_STRING_COMPARE) && \
+    (!defined(__WX_SETUP_H__) || wxUSE_STL == 0)
+    #define HAVE_STD_STRING_COMPARE
+#endif
 
-    // returns the value as C string in internal representation (equivalent
-    // to AsString().wx_str(), but more efficient)
-    const wxStringCharType *AsInternal() const;
-
-    // allow expressions like "c_str()[0]":
-    inline wxUniChar operator[](size_t n) const;
-    wxUniChar operator[](int n) const { return operator[](size_t(n)); }
-    wxUniChar operator[](long n) const { return operator[](size_t(n)); }
-#ifndef wxSIZE_T_IS_UINT
-    wxUniChar operator[](unsigned int n) const { return operator[](size_t(n)); }
-#endif // size_t != unsigned int
-
-    // These operators are needed to emulate the pointer semantics of c_str():
-    // expressions like "wxChar *p = str.c_str() + 1;" should continue to work
-    // (we need both versions to resolve ambiguities). Note that this means
-    // the 'n' value is interpreted as addition to char*/wchar_t* pointer, it
-    // is *not* number of Unicode characters in wxString.
-    wxCStrData operator+(int n) const
-        { return wxCStrData(m_str, m_offset + n, m_owned); }
-    wxCStrData operator+(long n) const
-        { return wxCStrData(m_str, m_offset + n, m_owned); }
-    wxCStrData operator+(size_t n) const
-        { return wxCStrData(m_str, m_offset + n, m_owned); }
-
-    // and these for "str.c_str() + (p2 - p1)" (it also works for any integer
-    // expression but it must be ptrdiff_t and not e.g. int to work in this
-    // example):
-    wxCStrData operator-(ptrdiff_t n) const
-    {
-        wxASSERT_MSG( n <= (ptrdiff_t)m_offset,
-                      wxT("attempt to construct address before the beginning of the string") );
-        return wxCStrData(m_str, m_offset - n, m_owned);
-    }
-
-    // this operator is needed to make expressions like "*c_str()" or
-    // "*(c_str() + 2)" work
-    inline wxUniChar operator*() const;
-
-private:
-    // the wxString this object was returned for
-    const wxString *m_str;
-    // Offset into c_str() return value. Note that this is *not* offset in
-    // m_str in Unicode characters. Instead, it is index into the
-    // char*/wchar_t* buffer returned by c_str(). It's interpretation depends
-    // on how is the wxCStrData instance used: if it is eventually cast to
-    // const char*, m_offset will be in bytes form string's start; if it is
-    // cast to const wchar_t*, it will be in wchar_t values.
-    size_t m_offset;
-    // should m_str be deleted, i.e. is it owned by us?
-    bool m_owned;
-
-    friend class WXDLLIMPEXP_FWD_BASE wxString;
-};
-
-// ----------------------------------------------------------------------------
-// wxStringPrintfMixin
+// ---------------------------------------------------------------------------
+// string data prepended with some housekeeping info (used by wxString class),
+// is never used directly (but had to be put here to allow inlining)
 // ---------------------------------------------------------------------------
 
-// NB: VC6 has a bug that causes linker errors if you have template methods
-//     in a class using __declspec(dllimport). The solution is to split such
-//     class into two classes, one that contains the template methods and does
-//     *not* use WXDLLIMPEXP_BASE and another class that contains the rest
-//     (with DLL linkage).
-//
-//     We only do this for VC6 here, because the code is less efficient
-//     (Printf() has to use dynamic_cast<>) and because OpenWatcom compiler
-//     cannot compile this code.
-
-#if defined(__VISUALC__) && __VISUALC__ < 1300
-    #define wxNEEDS_WXSTRING_PRINTF_MIXIN
-#endif
-
-#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
-// this class contains implementation of wxString's vararg methods, it's
-// exported from wxBase DLL
-class WXDLLIMPEXP_BASE wxStringPrintfMixinBase
+struct WXDLLIMPEXP_BASE wxStringData
 {
-protected:
-    wxStringPrintfMixinBase() {}
+  int     nRefs;        // reference count
+  size_t  nDataLength,  // actual string length
+          nAllocLength; // allocated memory size
 
-#if !wxUSE_UTF8_LOCALE_ONLY
-    int DoPrintfWchar(const wxChar *format, ...);
-    static wxString DoFormatWchar(const wxChar *format, ...);
+  // mimics declaration 'wxChar data[nAllocLength]'
+  wxChar* data() const { return (wxChar*)(this + 1); }
+
+  // empty string has a special ref count so it's never deleted
+  bool  IsEmpty()   const { return (nRefs == -1); }
+  bool  IsShared()  const { return (nRefs > 1);   }
+
+  // lock/unlock
+  void  Lock()   { if ( !IsEmpty() ) nRefs++;                    }
+
+  // VC++ will refuse to inline Unlock but profiling shows that it is wrong
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+  __forceinline
 #endif
-#if wxUSE_UNICODE_UTF8
-    int DoPrintfUtf8(const char *format, ...);
-    static wxString DoFormatUtf8(const char *format, ...);
+  // VC++ free must take place in same DLL as allocation when using non dll
+  // run-time library (e.g. Multithreaded instead of Multithreaded DLL)
+#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
+  void  Unlock() { if ( !IsEmpty() && --nRefs == 0) Free();  }
+  // we must not inline deallocation since allocation is not inlined
+  void  Free();
+#else
+  void  Unlock() { if ( !IsEmpty() && --nRefs == 0) free(this);  }
 #endif
+
+  // if we had taken control over string memory (GetWriteBuf), it's
+  // intentionally put in invalid state
+  void  Validate(bool b)  { nRefs = (b ? 1 : 0); }
+  bool  IsValid() const   { return (nRefs != 0); }
 };
 
-// this class contains template wrappers for wxString's vararg methods, it's
-// intentionally *not* exported from the DLL in order to fix the VC6 bug
-// described above
-class wxStringPrintfMixin : public wxStringPrintfMixinBase
+class WXDLLIMPEXP_BASE wxStringBase
 {
-private:
-    // to further complicate things, we can't return wxString from
-    // wxStringPrintfMixin::Format() because wxString is not yet declared at
-    // this point; the solution is to use this fake type trait template - this
-    // way the compiler won't know the return type until Format() is used
-    // (this doesn't compile with Watcom, but VC6 compiles it just fine):
-    template<typename T> struct StringReturnType
-    {
-        typedef wxString type;
-    };
+#if !wxUSE_STL
+friend class WXDLLIMPEXP_FWD_BASE wxArrayString;
+#endif
+public :
+  // an 'invalid' value for string index, moved to this place due to a CW bug
+  static const size_t npos;
+protected:
+  // points to data preceded by wxStringData structure with ref count info
+  wxChar *m_pchData;
 
+  // accessor to string data
+  wxStringData* GetStringData() const { return (wxStringData*)m_pchData - 1; }
+
+  // string (re)initialization functions
+    // initializes the string to the empty value (must be called only from
+    // ctors, use Reinit() otherwise)
+  void Init() { m_pchData = (wxChar *)wxEmptyString; }
+    // initializes the string with (a part of) C-string
+  void InitWith(const wxChar *psz, size_t nPos = 0, size_t nLen = npos);
+    // as Init, but also frees old data
+  void Reinit() { GetStringData()->Unlock(); Init(); }
+
+  // memory allocation
+    // allocates memory for string of length nLen
+  bool AllocBuffer(size_t nLen);
+    // copies data to another string
+  bool AllocCopy(wxString&, int, int) const;
+    // effectively copies data to string
+  bool AssignCopy(size_t, const wxChar *);
+
+  // append a (sub)string
+  bool ConcatSelf(size_t nLen, const wxChar *src, size_t nMaxLen);
+  bool ConcatSelf(size_t nLen, const wxChar *src)
+    { return ConcatSelf(nLen, src, nLen); }
+
+  // functions called before writing to the string: they copy it if there
+  // are other references to our data (should be the only owner when writing)
+  bool CopyBeforeWrite();
+  bool AllocBeforeWrite(size_t);
+
+    // compatibility with wxString
+  bool Alloc(size_t nLen);
 public:
-    // these are duplicated wxString methods, they're also declared below
-    // if !wxNEEDS_WXSTRING_PRINTF_MIXIN:
+  // standard types
+  typedef wxChar value_type;
+  typedef wxChar char_type;
+  typedef size_t size_type;
+  typedef value_type& reference;
+  typedef const value_type& const_reference;
+  typedef value_type* pointer;
+  typedef const value_type* const_pointer;
+  typedef value_type *iterator;
+  typedef const value_type *const_iterator;
 
-    // static wxString Format(const wString& format, ...) WX_ATTRIBUTE_PRINTF_1;
-    WX_DEFINE_VARARG_FUNC_SANS_N0(static typename StringReturnType<T1>::type,
-                                  Format, 1, (const wxFormatString&),
-                                  DoFormatWchar, DoFormatUtf8)
-    // We have to implement the version without template arguments manually
-    // because of the StringReturnType<> hack, although WX_DEFINE_VARARG_FUNC
-    // normally does it itself. It has to be a template so that we can use
-    // the hack, even though there's no real template parameter. We can't move
-    // it to wxStrig, because it would shadow these versions of Format() then.
-    template<typename T>
-    inline static typename StringReturnType<T>::type
-    Format(const T& fmt)
-    {
-        // NB: this doesn't compile if T is not (some form of) a string;
-        //     this makes Format's prototype equivalent to
-        //     Format(const wxFormatString& fmt)
-        return DoFormatWchar(wxFormatString(fmt));
+#define wxSTRING_REVERSE_ITERATOR(name, const_or_not)                         \
+  class name                                                                  \
+  {                                                                           \
+  public:                                                                     \
+      typedef wxChar value_type;                                              \
+      typedef const_or_not value_type& reference;                             \
+      typedef const_or_not value_type *pointer;                               \
+      typedef const_or_not value_type *iterator_type;                         \
+                                                                              \
+      name(iterator_type i) : m_cur(i) { }                                    \
+      name(const name& ri) : m_cur(ri.m_cur) { }                              \
+                                                                              \
+      iterator_type base() const { return m_cur; }                            \
+                                                                              \
+      reference operator*() const { return *(m_cur - 1); }                    \
+                                                                              \
+      name& operator++() { --m_cur; return *this; }                           \
+      name operator++(int) { name tmp = *this; --m_cur; return tmp; }         \
+      name& operator--() { ++m_cur; return *this; }                           \
+      name operator--(int) { name tmp = *this; ++m_cur; return tmp; }         \
+                                                                              \
+      bool operator==(name ri) const { return m_cur == ri.m_cur; }            \
+      bool operator!=(name ri) const { return !(*this == ri); }               \
+                                                                              \
+  private:                                                                    \
+      iterator_type m_cur;                                                    \
+  }
+
+  wxSTRING_REVERSE_ITERATOR(const_reverse_iterator, const);
+
+  #define wxSTRING_CONST
+  wxSTRING_REVERSE_ITERATOR(reverse_iterator, wxSTRING_CONST);
+  #undef wxSTRING_CONST
+
+  #undef wxSTRING_REVERSE_ITERATOR
+
+
+  // constructors and destructor
+    // ctor for an empty string
+  wxStringBase() { Init(); }
+    // copy ctor
+  wxStringBase(const wxStringBase& stringSrc)
+  {
+    wxASSERT_MSG( stringSrc.GetStringData()->IsValid(),
+                  wxT("did you forget to call UngetWriteBuf()?") );
+
+    if ( stringSrc.empty() ) {
+      // nothing to do for an empty string
+      Init();
     }
+    else {
+      m_pchData = stringSrc.m_pchData;            // share same data
+      GetStringData()->Lock();                    // => one more copy
+    }
+  }
+    // string containing nRepeat copies of ch
+  wxStringBase(size_type nRepeat, wxChar ch);
+    // ctor takes first nLength characters from C string
+    // (default value of npos means take all the string)
+  wxStringBase(const wxChar *psz)
+      { InitWith(psz, 0, npos); }
+  wxStringBase(const wxChar *psz, size_t nLength)
+      { InitWith(psz, 0, nLength); }
+  wxStringBase(const wxChar *psz,
+               const wxMBConv& WXUNUSED(conv),
+               size_t nLength = npos)
+      { InitWith(psz, 0, nLength); }
+    // take nLen chars starting at nPos
+  wxStringBase(const wxStringBase& str, size_t nPos, size_t nLen)
+  {
+    wxASSERT_MSG( str.GetStringData()->IsValid(),
+                  wxT("did you forget to call UngetWriteBuf()?") );
+    Init();
+    size_t strLen = str.length() - nPos; nLen = strLen < nLen ? strLen : nLen;
+    InitWith(str.c_str(), nPos, nLen);
+  }
+    // take all characters from pStart to pEnd
+  wxStringBase(const void *pStart, const void *pEnd);
 
-    // int Printf(const wxString& format, ...);
-    WX_DEFINE_VARARG_FUNC(int, Printf, 1, (const wxFormatString&),
-                          DoPrintfWchar, DoPrintfUtf8)
-    // int sprintf(const wxString& format, ...) WX_ATTRIBUTE_PRINTF_2;
-    WX_DEFINE_VARARG_FUNC(int, sprintf, 1, (const wxFormatString&),
-                          DoPrintfWchar, DoPrintfUtf8)
+    // dtor is not virtual, this class must not be inherited from!
+  ~wxStringBase()
+  {
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+      //RN - according to the above VC++ does indeed inline this,
+      //even though it spits out two warnings
+      #pragma warning (disable:4714)
+#endif
 
-protected:
-    wxStringPrintfMixin() : wxStringPrintfMixinBase() {}
+      GetStringData()->Unlock();
+  }
+
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+    //re-enable inlining warning
+    #pragma warning (default:4714)
+#endif
+  // overloaded assignment
+    // from another wxString
+  wxStringBase& operator=(const wxStringBase& stringSrc);
+    // from a character
+  wxStringBase& operator=(wxChar ch);
+    // from a C string
+  wxStringBase& operator=(const wxChar *psz);
+
+    // return the length of the string
+  size_type length() const { return GetStringData()->nDataLength; }
+    // return the length of the string
+  size_type size() const { return length(); }
+    // return the maximum size of the string
+  size_type max_size() const { return npos; }
+    // resize the string, filling the space with c if c != 0
+  void resize(size_t nSize, wxChar ch = wxT('\0'));
+    // delete the contents of the string
+  void clear() { erase(0, npos); }
+    // returns true if the string is empty
+  bool empty() const { return length() == 0; }
+    // inform string about planned change in size
+  void reserve(size_t sz) { Alloc(sz); }
+  size_type capacity() const { return GetStringData()->nAllocLength; }
+
+  // lib.string.access
+    // return the character at position n
+  value_type at(size_type n) const
+    { wxASSERT_VALID_INDEX( n ); return m_pchData[n]; }
+    // returns the writable character at position n
+  reference at(size_type n)
+    { wxASSERT_VALID_INDEX( n ); CopyBeforeWrite(); return m_pchData[n]; }
+
+  // lib.string.modifiers
+    // append elements str[pos], ..., str[pos+n]
+  wxStringBase& append(const wxStringBase& str, size_t pos, size_t n)
+  {
+    wxASSERT(pos <= str.length());
+    ConcatSelf(n, str.c_str() + pos, str.length() - pos);
+    return *this;
+  }
+    // append a string
+  wxStringBase& append(const wxStringBase& str)
+    { ConcatSelf(str.length(), str.c_str()); return *this; }
+    // append first n (or all if n == npos) characters of sz
+  wxStringBase& append(const wxChar *sz)
+    { ConcatSelf(wxStrlen(sz), sz); return *this; }
+  wxStringBase& append(const wxChar *sz, size_t n)
+    { ConcatSelf(n, sz); return *this; }
+    // append n copies of ch
+  wxStringBase& append(size_t n, wxChar ch);
+    // append from first to last
+  wxStringBase& append(const_iterator first, const_iterator last)
+    { ConcatSelf(last - first, first); return *this; }
+
+    // same as `this_string = str'
+  wxStringBase& assign(const wxStringBase& str)
+    { return *this = str; }
+    // same as ` = str[pos..pos + n]
+  wxStringBase& assign(const wxStringBase& str, size_t pos, size_t n)
+    { clear(); return append(str, pos, n); }
+    // same as `= first n (or all if n == npos) characters of sz'
+  wxStringBase& assign(const wxChar *sz)
+    { clear(); return append(sz, wxStrlen(sz)); }
+  wxStringBase& assign(const wxChar *sz, size_t n)
+    { clear(); return append(sz, n); }
+    // same as `= n copies of ch'
+  wxStringBase& assign(size_t n, wxChar ch)
+    { clear(); return append(n, ch); }
+    // assign from first to last
+  wxStringBase& assign(const_iterator first, const_iterator last)
+    { clear(); return append(first, last); }
+
+    // first valid index position
+  const_iterator begin() const { return m_pchData; }
+  iterator begin();
+    // position one after the last valid one
+  const_iterator end() const { return m_pchData + length(); }
+  iterator end();
+
+    // first element of the reversed string
+  const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
+  reverse_iterator rbegin() { return reverse_iterator(end()); }
+    // one beyond the end of the reversed string
+  const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
+  reverse_iterator rend() { return reverse_iterator(begin()); }
+
+    // insert another string
+  wxStringBase& insert(size_t nPos, const wxStringBase& str)
+  {
+    wxASSERT( str.GetStringData()->IsValid() );
+    return insert(nPos, str.c_str(), str.length());
+  }
+    // insert n chars of str starting at nStart (in str)
+  wxStringBase& insert(size_t nPos, const wxStringBase& str, size_t nStart, size_t n)
+  {
+    wxASSERT( str.GetStringData()->IsValid() );
+    wxASSERT( nStart < str.length() );
+    size_t strLen = str.length() - nStart;
+    n = strLen < n ? strLen : n;
+    return insert(nPos, str.c_str() + nStart, n);
+  }
+    // insert first n (or all if n == npos) characters of sz
+  wxStringBase& insert(size_t nPos, const wxChar *sz, size_t n = npos);
+    // insert n copies of ch
+  wxStringBase& insert(size_t nPos, size_t n, wxChar ch)
+    { return insert(nPos, wxStringBase(n, ch)); }
+  iterator insert(iterator it, wxChar ch)
+    { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; }
+  void insert(iterator it, const_iterator first, const_iterator last)
+    { insert(it - begin(), first, last - first); }
+  void insert(iterator it, size_type n, wxChar ch)
+    { insert(it - begin(), n, ch); }
+
+    // delete characters from nStart to nStart + nLen
+  wxStringBase& erase(size_type pos = 0, size_type n = npos);
+  iterator erase(iterator first, iterator last)
+  {
+    size_t idx = first - begin();
+    erase(idx, last - first);
+    return begin() + idx;
+  }
+  iterator erase(iterator first);
+
+  // explicit conversion to C string (use this with printf()!)
+  const wxChar* c_str() const { return m_pchData; }
+  const wxChar* data() const { return m_pchData; }
+
+    // replaces the substring of length nLen starting at nStart
+  wxStringBase& replace(size_t nStart, size_t nLen, const wxChar* sz);
+    // replaces the substring of length nLen starting at nStart
+  wxStringBase& replace(size_t nStart, size_t nLen, const wxStringBase& str)
+    { return replace(nStart, nLen, str.c_str()); }
+    // replaces the substring with nCount copies of ch
+  wxStringBase& replace(size_t nStart, size_t nLen, size_t nCount, wxChar ch);
+    // replaces a substring with another substring
+  wxStringBase& replace(size_t nStart, size_t nLen,
+                        const wxStringBase& str, size_t nStart2, size_t nLen2);
+    // replaces the substring with first nCount chars of sz
+  wxStringBase& replace(size_t nStart, size_t nLen,
+                        const wxChar* sz, size_t nCount);
+  wxStringBase& replace(iterator first, iterator last, const_pointer s)
+    { return replace(first - begin(), last - first, s); }
+  wxStringBase& replace(iterator first, iterator last, const_pointer s,
+                        size_type n)
+    { return replace(first - begin(), last - first, s, n); }
+  wxStringBase& replace(iterator first, iterator last, const wxStringBase& s)
+    { return replace(first - begin(), last - first, s); }
+  wxStringBase& replace(iterator first, iterator last, size_type n, wxChar c)
+    { return replace(first - begin(), last - first, n, c); }
+  wxStringBase& replace(iterator first, iterator last,
+                        const_iterator first1, const_iterator last1)
+    { return replace(first - begin(), last - first, first1, last1 - first1); }
+
+    // swap two strings
+  void swap(wxStringBase& str);
+
+    // All find() functions take the nStart argument which specifies the
+    // position to start the search on, the default value is 0. All functions
+    // return npos if there were no match.
+
+    // find a substring
+  size_t find(const wxStringBase& str, size_t nStart = 0) const;
+
+    // find first n characters of sz
+  size_t find(const wxChar* sz, size_t nStart = 0, size_t n = npos) const;
+
+    // find the first occurence of character ch after nStart
+  size_t find(wxChar ch, size_t nStart = 0) const;
+
+    // rfind() family is exactly like find() but works right to left
+
+    // as find, but from the end
+  size_t rfind(const wxStringBase& str, size_t nStart = npos) const;
+
+    // as find, but from the end
+  size_t rfind(const wxChar* sz, size_t nStart = npos,
+               size_t n = npos) const;
+    // as find, but from the end
+  size_t rfind(wxChar ch, size_t nStart = npos) const;
+
+    // find first/last occurence of any character in the set
+
+    // as strpbrk() but starts at nStart, returns npos if not found
+  size_t find_first_of(const wxStringBase& str, size_t nStart = 0) const
+    { return find_first_of(str.c_str(), nStart); }
+    // same as above
+  size_t find_first_of(const wxChar* sz, size_t nStart = 0) const;
+  size_t find_first_of(const wxChar* sz, size_t nStart, size_t n) const;
+    // same as find(char, size_t)
+  size_t find_first_of(wxChar c, size_t nStart = 0) const
+    { return find(c, nStart); }
+    // find the last (starting from nStart) char from str in this string
+  size_t find_last_of (const wxStringBase& str, size_t nStart = npos) const
+    { return find_last_of(str.c_str(), nStart); }
+    // same as above
+  size_t find_last_of (const wxChar* sz, size_t nStart = npos) const;
+  size_t find_last_of(const wxChar* sz, size_t nStart, size_t n) const;
+    // same as above
+  size_t find_last_of(wxChar c, size_t nStart = npos) const
+    { return rfind(c, nStart); }
+
+    // find first/last occurence of any character not in the set
+
+    // as strspn() (starting from nStart), returns npos on failure
+  size_t find_first_not_of(const wxStringBase& str, size_t nStart = 0) const
+    { return find_first_not_of(str.c_str(), nStart); }
+    // same as above
+  size_t find_first_not_of(const wxChar* sz, size_t nStart = 0) const;
+  size_t find_first_not_of(const wxChar* sz, size_t nStart, size_t n) const;
+    // same as above
+  size_t find_first_not_of(wxChar ch, size_t nStart = 0) const;
+    //  as strcspn()
+  size_t find_last_not_of(const wxStringBase& str, size_t nStart = npos) const
+    { return find_last_not_of(str.c_str(), nStart); }
+    // same as above
+  size_t find_last_not_of(const wxChar* sz, size_t nStart = npos) const;
+  size_t find_last_not_of(const wxChar* sz, size_t nStart, size_t n) const;
+    // same as above
+  size_t find_last_not_of(wxChar ch, size_t nStart = npos) const;
+
+    // All compare functions return -1, 0 or 1 if the [sub]string is less,
+    // equal or greater than the compare() argument.
+
+    // comparison with another string
+  int compare(const wxStringBase& str) const;
+    // comparison with a substring
+  int compare(size_t nStart, size_t nLen, const wxStringBase& str) const;
+    // comparison of 2 substrings
+  int compare(size_t nStart, size_t nLen,
+              const wxStringBase& str, size_t nStart2, size_t nLen2) const;
+    // comparison with a c string
+  int compare(const wxChar* sz) const;
+    // substring comparison with first nCount characters of sz
+  int compare(size_t nStart, size_t nLen,
+              const wxChar* sz, size_t nCount = npos) const;
+
+  size_type copy(wxChar* s, size_type n, size_type pos = 0);
+
+  // substring extraction
+  wxStringBase substr(size_t nStart = 0, size_t nLen = npos) const;
+
+      // string += string
+  wxStringBase& operator+=(const wxStringBase& s) { return append(s); }
+      // string += C string
+  wxStringBase& operator+=(const wxChar *psz) { return append(psz); }
+      // string += char
+  wxStringBase& operator+=(wxChar ch) { return append(1, ch); }
 };
-#endif // wxNEEDS_WXSTRING_PRINTF_MIXIN
 
+#endif // !wxUSE_STL
 
 // ----------------------------------------------------------------------------
 // wxString: string class trying to be compatible with std::string, MFC
 //           CString and wxWindows 1.x wxString all at once
 // ---------------------------------------------------------------------------
 
-#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
-    // "non dll-interface class 'wxStringPrintfMixin' used as base interface
-    // for dll-interface class 'wxString'" -- this is OK in our case
-    #pragma warning (push)
-    #pragma warning (disable:4275)
+class WXDLLIMPEXP_BASE wxString : public wxStringBase
+{
+#if !wxUSE_STL
+friend class WXDLLIMPEXP_FWD_BASE wxArrayString;
 #endif
 
-#if wxUSE_UNICODE_UTF8
-// see the comment near wxString::iterator for why we need this
-class WXDLLIMPEXP_BASE wxStringIteratorNode
-{
-public:
-    wxStringIteratorNode()
-        : m_str(NULL), m_citer(NULL), m_iter(NULL), m_prev(NULL), m_next(NULL) {}
-    wxStringIteratorNode(const wxString *str,
-                          wxStringImpl::const_iterator *citer)
-        { DoSet(str, citer, NULL); }
-    wxStringIteratorNode(const wxString *str, wxStringImpl::iterator *iter)
-        { DoSet(str, NULL, iter); }
-    ~wxStringIteratorNode()
-        { clear(); }
-
-    inline void set(const wxString *str, wxStringImpl::const_iterator *citer)
-        { clear(); DoSet(str, citer, NULL); }
-    inline void set(const wxString *str, wxStringImpl::iterator *iter)
-        { clear(); DoSet(str, NULL, iter); }
-
-    const wxString *m_str;
-    wxStringImpl::const_iterator *m_citer;
-    wxStringImpl::iterator *m_iter;
-    wxStringIteratorNode *m_prev, *m_next;
-
-private:
-    inline void clear();
-    inline void DoSet(const wxString *str,
-                      wxStringImpl::const_iterator *citer,
-                      wxStringImpl::iterator *iter);
-
-    // the node belongs to a particular iterator instance, it's not copied
-    // when a copy of the iterator is made
-    wxDECLARE_NO_COPY_CLASS(wxStringIteratorNode);
-};
-#endif // wxUSE_UNICODE_UTF8
-
-class WXDLLIMPEXP_BASE wxString
-#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
-                                : public wxStringPrintfMixin
-#endif
-{
   // NB: special care was taken in arranging the member functions in such order
   //     that all inline functions can be effectively inlined, verify that all
   //     performance critical functions are still inlined if you change order!
-public:
-  // an 'invalid' value for string index, moved to this place due to a CW bug
-  static const size_t npos;
-
 private:
   // if we hadn't made these operators private, it would be possible to
   // compile "wxString s; s = 17;" without any warnings as 17 is implicitly
@@ -466,1073 +681,64 @@ private:
   // try `s << i' or `s.Printf("%d", i)' instead
   wxString(int);
 
-
-  // buffer for holding temporary substring when using any of the methods
-  // that take (char*,size_t) or (wchar_t*,size_t) arguments:
-  template<typename T>
-  struct SubstrBufFromType
-  {
-      T data;
-      size_t len;
-
-      SubstrBufFromType(const T& data_, size_t len_)
-          : data(data_), len(len_)
-      {
-          wxASSERT_MSG( len != npos, "must have real length" );
-      }
-  };
-
-#if wxUSE_UNICODE_UTF8
-  // even char* -> char* needs conversion, from locale charset to UTF-8
-  typedef SubstrBufFromType<wxScopedCharBuffer>    SubstrBufFromWC;
-  typedef SubstrBufFromType<wxScopedCharBuffer>    SubstrBufFromMB;
-#elif wxUSE_UNICODE_WCHAR
-  typedef SubstrBufFromType<const wchar_t*>        SubstrBufFromWC;
-  typedef SubstrBufFromType<wxScopedWCharBuffer>   SubstrBufFromMB;
-#else
-  typedef SubstrBufFromType<const char*>           SubstrBufFromMB;
-  typedef SubstrBufFromType<wxScopedCharBuffer>    SubstrBufFromWC;
-#endif
-
-
-  // Functions implementing primitive operations on string data; wxString
-  // methods and iterators are implemented in terms of it. The differences
-  // between UTF-8 and wchar_t* representations of the string are mostly
-  // contained here.
-
-#if wxUSE_UNICODE_UTF8
-  static SubstrBufFromMB ConvertStr(const char *psz, size_t nLength,
-                                    const wxMBConv& conv);
-  static SubstrBufFromWC ConvertStr(const wchar_t *pwz, size_t nLength,
-                                    const wxMBConv& conv);
-#elif wxUSE_UNICODE_WCHAR
-  static SubstrBufFromMB ConvertStr(const char *psz, size_t nLength,
-                                    const wxMBConv& conv);
-#else
-  static SubstrBufFromWC ConvertStr(const wchar_t *pwz, size_t nLength,
-                                    const wxMBConv& conv);
-#endif
-
-#if !wxUSE_UNICODE_UTF8 // wxUSE_UNICODE_WCHAR or !wxUSE_UNICODE
-  // returns C string encoded as the implementation expects:
-  #if wxUSE_UNICODE
-  static const wchar_t* ImplStr(const wchar_t* str)
-    { return str ? str : wxT(""); }
-  static const SubstrBufFromWC ImplStr(const wchar_t* str, size_t n)
-    { return SubstrBufFromWC(str, (str && n == npos) ? wxWcslen(str) : n); }
-  static wxScopedWCharBuffer ImplStr(const char* str,
-                                     const wxMBConv& conv = wxConvLibc)
-    { return ConvertStr(str, npos, conv).data; }
-  static SubstrBufFromMB ImplStr(const char* str, size_t n,
-                                 const wxMBConv& conv = wxConvLibc)
-    { return ConvertStr(str, n, conv); }
-  #else
-  static const char* ImplStr(const char* str,
-                             const wxMBConv& WXUNUSED(conv) = wxConvLibc)
-    { return str ? str : ""; }
-  static const SubstrBufFromMB ImplStr(const char* str, size_t n,
-                                       const wxMBConv& WXUNUSED(conv) = wxConvLibc)
-    { return SubstrBufFromMB(str, (str && n == npos) ? wxStrlen(str) : n); }
-  static wxScopedCharBuffer ImplStr(const wchar_t* str)
-    { return ConvertStr(str, npos, wxConvLibc).data; }
-  static SubstrBufFromWC ImplStr(const wchar_t* str, size_t n)
-    { return ConvertStr(str, n, wxConvLibc); }
-  #endif
-
-  // translates position index in wxString to/from index in underlying
-  // wxStringImpl:
-  static size_t PosToImpl(size_t pos) { return pos; }
-  static void PosLenToImpl(size_t pos, size_t len,
-                           size_t *implPos, size_t *implLen)
-    { *implPos = pos; *implLen = len; }
-  static size_t LenToImpl(size_t len) { return len; }
-  static size_t PosFromImpl(size_t pos) { return pos; }
-
-  // we don't want to define these as empty inline functions as it could
-  // result in noticeable (and quite unnecessary in non-UTF-8 build) slowdown
-  // in debug build where the inline functions are not effectively inlined
-  #define wxSTRING_INVALIDATE_CACHE()
-  #define wxSTRING_INVALIDATE_CACHED_LENGTH()
-  #define wxSTRING_UPDATE_CACHED_LENGTH(n)
-  #define wxSTRING_SET_CACHED_LENGTH(n)
-
-#else // wxUSE_UNICODE_UTF8
-
-  static wxScopedCharBuffer ImplStr(const char* str,
-                                    const wxMBConv& conv = wxConvLibc)
-    { return ConvertStr(str, npos, conv).data; }
-  static SubstrBufFromMB ImplStr(const char* str, size_t n,
-                                 const wxMBConv& conv = wxConvLibc)
-    { return ConvertStr(str, n, conv); }
-
-  static wxScopedCharBuffer ImplStr(const wchar_t* str)
-    { return ConvertStr(str, npos, wxMBConvUTF8()).data; }
-  static SubstrBufFromWC ImplStr(const wchar_t* str, size_t n)
-    { return ConvertStr(str, n, wxMBConvUTF8()); }
-
-#if wxUSE_STRING_POS_CACHE
-  // this is an extremely simple cache used by PosToImpl(): each cache element
-  // contains the string it applies to and the index corresponding to the last
-  // used position in this wxString in its m_impl string
-  //
-  // NB: notice that this struct (and nested Element one) must be a POD or we
-  //     wouldn't be able to use a thread-local variable of this type, in
-  //     particular it should have no ctor -- we rely on statics being
-  //     initialized to 0 instead
-  struct Cache
-  {
-      enum { SIZE = 8 };
-
-      struct Element
-      {
-          const wxString *str;  // the string to which this element applies
-          size_t pos,           // the cached index in this string
-                 impl,          // the corresponding position in its m_impl
-                 len;           // cached length or npos if unknown
-
-          // reset cached index to 0
-          void ResetPos() { pos = impl = 0; }
-
-          // reset position and length
-          void Reset() { ResetPos(); len = npos; }
-      };
-
-      // cache the indices mapping for the last few string used
-      Element cached[SIZE];
-
-      // the last used index
-      unsigned lastUsed;
-  };
-
-#ifndef wxHAS_COMPILER_TLS
-  // we must use an accessor function and not a static variable when the TLS
-  // variables support is implemented in the library (and not by the compiler)
-  // because the global s_cache variable could be not yet initialized when a
-  // ctor of another global object is executed and if that ctor uses any
-  // wxString methods, bad things happen
-  //
-  // however notice that this approach does not work when compiler TLS is used,
-  // at least not with g++ 4.1.2 under amd64 as it apparently compiles code
-  // using this accessor incorrectly when optimizations are enabled (-O2 is
-  // enough) -- luckily we don't need it then neither as static __thread
-  // variables are initialized by 0 anyhow then and so we can use the variable
-  // directly
-  WXEXPORT static Cache& GetCache()
-  {
-      static wxTLS_TYPE(Cache) s_cache;
-
-      return wxTLS_VALUE(s_cache);
-  }
-
-  // this helper struct is used to ensure that GetCache() is called during
-  // static initialization time, i.e. before any threads creation, as otherwise
-  // the static s_cache construction inside GetCache() wouldn't be MT-safe
-  friend struct wxStrCacheInitializer;
-#else // wxHAS_COMPILER_TLS
-  static wxTLS_TYPE(Cache) ms_cache;
-  static Cache& GetCache() { return wxTLS_VALUE(ms_cache); }
-#endif // !wxHAS_COMPILER_TLS/wxHAS_COMPILER_TLS
-
-  static Cache::Element *GetCacheBegin() { return GetCache().cached; }
-  static Cache::Element *GetCacheEnd() { return GetCacheBegin() + Cache::SIZE; }
-  static unsigned& LastUsedCacheElement() { return GetCache().lastUsed; }
-
-  // this is used in debug builds only to provide a convenient function,
-  // callable from a debugger, to show the cache contents
-  friend struct wxStrCacheDumper;
-
-  // uncomment this to have access to some profiling statistics on program
-  // termination
-  //#define wxPROFILE_STRING_CACHE
-
-#ifdef wxPROFILE_STRING_CACHE
-  static struct PosToImplCacheStats
-  {
-      unsigned postot,  // total non-trivial calls to PosToImpl
-               poshits, // cache hits from PosToImpl()
-               mishits, // cached position beyond the needed one
-               sumpos,  // sum of all positions, used to compute the
-                        // average position after dividing by postot
-               sumofs,  // sum of all offsets after using the cache, used to
-                        // compute the average after dividing by hits
-               lentot,  // number of total calls to length()
-               lenhits; // number of cache hits in length()
-  } ms_cacheStats;
-
-  friend struct wxStrCacheStatsDumper;
-
-  #define wxCACHE_PROFILE_FIELD_INC(field) ms_cacheStats.field++
-  #define wxCACHE_PROFILE_FIELD_ADD(field, val) ms_cacheStats.field += (val)
-#else // !wxPROFILE_STRING_CACHE
-  #define wxCACHE_PROFILE_FIELD_INC(field)
-  #define wxCACHE_PROFILE_FIELD_ADD(field, val)
-#endif // wxPROFILE_STRING_CACHE/!wxPROFILE_STRING_CACHE
-
-  // note: it could seem that the functions below shouldn't be inline because
-  // they are big, contain loops and so the compiler shouldn't be able to
-  // inline them anyhow, however moving them into string.cpp does decrease the
-  // code performance by ~5%, at least when using g++ 4.1 so do keep them here
-  // unless tests show that it's not advantageous any more
-
-  // return the pointer to the cache element for this string or NULL if not
-  // cached
-  Cache::Element *FindCacheElement() const
-  {
-      // profiling seems to show a small but consistent gain if we use this
-      // simple loop instead of starting from the last used element (there are
-      // a lot of misses in this function...)
-      Cache::Element * const cacheBegin = GetCacheBegin();
-#ifndef wxHAS_COMPILER_TLS
-      // during destruction tls calls may return NULL, in this case return NULL
-      // immediately without accessing anything else
-      if ( cacheBegin == NULL )
-        return NULL;
-#endif
-      Cache::Element * const cacheEnd = GetCacheEnd();
-      for ( Cache::Element *c = cacheBegin; c != cacheEnd; c++ )
-      {
-          if ( c->str == this )
-              return c;
-      }
-
-      return NULL;
-  }
-
-  // unlike FindCacheElement(), this one always returns a valid pointer to the
-  // cache element for this string, it may have valid last cached position and
-  // its corresponding index in the byte string or not
-  Cache::Element *GetCacheElement() const
-  {
-      Cache::Element * const cacheBegin = GetCacheBegin();
-      Cache::Element * const cacheEnd = GetCacheEnd();
-      Cache::Element * const cacheStart = cacheBegin + LastUsedCacheElement();
-
-      // check the last used first, this does no (measurable) harm for a miss
-      // but does help for simple loops addressing the same string all the time
-      if ( cacheStart->str == this )
-          return cacheStart;
-
-      // notice that we're going to check cacheStart again inside this call but
-      // profiling shows that it's still faster to use a simple loop like
-      // inside FindCacheElement() than manually looping with wrapping starting
-      // from the cache entry after the start one
-      Cache::Element *c = FindCacheElement();
-      if ( !c )
-      {
-          // claim the next cache entry for this string
-          c = cacheStart;
-          if ( ++c == cacheEnd )
-              c = cacheBegin;
-
-          c->str = this;
-          c->Reset();
-
-          // and remember the last used element
-          LastUsedCacheElement() = c - cacheBegin;
-      }
-
-      return c;
-  }
-
-  size_t DoPosToImpl(size_t pos) const
-  {
-      wxCACHE_PROFILE_FIELD_INC(postot);
-
-      // NB: although the case of pos == 1 (and offset from cached position
-      //     equal to 1) are common, nothing is gained by writing special code
-      //     for handling them, the compiler (at least g++ 4.1 used) seems to
-      //     optimize the code well enough on its own
-
-      wxCACHE_PROFILE_FIELD_ADD(sumpos, pos);
-
-      Cache::Element * const cache = GetCacheElement();
-
-      // cached position can't be 0 so if it is, it means that this entry was
-      // used for length caching only so far, i.e. it doesn't count as a hit
-      // from our point of view
-      if ( cache->pos )
-      {
-          wxCACHE_PROFILE_FIELD_INC(poshits);
-      }
-
-      if ( pos == cache->pos )
-          return cache->impl;
-
-      // this seems to happen only rarely so just reset the cache in this case
-      // instead of complicating code even further by seeking backwards in this
-      // case
-      if ( cache->pos > pos )
-      {
-          wxCACHE_PROFILE_FIELD_INC(mishits);
-
-          cache->ResetPos();
-      }
-
-      wxCACHE_PROFILE_FIELD_ADD(sumofs, pos - cache->pos);
-
-
-      wxStringImpl::const_iterator i(m_impl.begin() + cache->impl);
-      for ( size_t n = cache->pos; n < pos; n++ )
-          wxStringOperations::IncIter(i);
-
-      cache->pos = pos;
-      cache->impl = i - m_impl.begin();
-
-      wxSTRING_CACHE_ASSERT(
-          (int)cache->impl == (begin() + pos).impl() - m_impl.begin() );
-
-      return cache->impl;
-  }
-
-  void InvalidateCache()
-  {
-      Cache::Element * const cache = FindCacheElement();
-      if ( cache )
-          cache->Reset();
-  }
-
-  void InvalidateCachedLength()
-  {
-      Cache::Element * const cache = FindCacheElement();
-      if ( cache )
-          cache->len = npos;
-  }
-
-  void SetCachedLength(size_t len)
-  {
-      // we optimistically cache the length here even if the string wasn't
-      // present in the cache before, this seems to do no harm and the
-      // potential for avoiding length recomputation for long strings looks
-      // interesting
-      GetCacheElement()->len = len;
-  }
-
-  void UpdateCachedLength(ptrdiff_t delta)
-  {
-      Cache::Element * const cache = FindCacheElement();
-      if ( cache && cache->len != npos )
-      {
-          wxSTRING_CACHE_ASSERT( (ptrdiff_t)cache->len + delta >= 0 );
-
-          cache->len += delta;
-      }
-  }
-
-  #define wxSTRING_INVALIDATE_CACHE() InvalidateCache()
-  #define wxSTRING_INVALIDATE_CACHED_LENGTH() InvalidateCachedLength()
-  #define wxSTRING_UPDATE_CACHED_LENGTH(n) UpdateCachedLength(n)
-  #define wxSTRING_SET_CACHED_LENGTH(n) SetCachedLength(n)
-#else // !wxUSE_STRING_POS_CACHE
-  size_t DoPosToImpl(size_t pos) const
-  {
-      return (begin() + pos).impl() - m_impl.begin();
-  }
-
-  #define wxSTRING_INVALIDATE_CACHE()
-  #define wxSTRING_INVALIDATE_CACHED_LENGTH()
-  #define wxSTRING_UPDATE_CACHED_LENGTH(n)
-  #define wxSTRING_SET_CACHED_LENGTH(n)
-#endif // wxUSE_STRING_POS_CACHE/!wxUSE_STRING_POS_CACHE
-
-  size_t PosToImpl(size_t pos) const
-  {
-      return pos == 0 || pos == npos ? pos : DoPosToImpl(pos);
-  }
-
-  void PosLenToImpl(size_t pos, size_t len, size_t *implPos, size_t *implLen) const;
-
-  size_t LenToImpl(size_t len) const
-  {
-      size_t pos, len2;
-      PosLenToImpl(0, len, &pos, &len2);
-      return len2;
-  }
-
-  size_t PosFromImpl(size_t pos) const
-  {
-      if ( pos == 0 || pos == npos )
-          return pos;
-      else
-          return const_iterator(this, m_impl.begin() + pos) - begin();
-  }
-#endif // !wxUSE_UNICODE_UTF8/wxUSE_UNICODE_UTF8
-
-public:
-  // standard types
-  typedef wxUniChar value_type;
-  typedef wxUniChar char_type;
-  typedef wxUniCharRef reference;
-  typedef wxChar* pointer;
-  typedef const wxChar* const_pointer;
-
-  typedef size_t size_type;
-  typedef wxUniChar const_reference;
-
-#if wxUSE_STD_STRING
-  #if wxUSE_UNICODE_UTF8
-    // random access is not O(1), as required by Random Access Iterator
-    #define WX_STR_ITERATOR_TAG std::bidirectional_iterator_tag
-  #else
-    #define WX_STR_ITERATOR_TAG std::random_access_iterator_tag
-  #endif
-  #define WX_DEFINE_ITERATOR_CATEGORY(cat) typedef cat iterator_category;
-#else
-  // not defining iterator_category at all in this case is better than defining
-  // it as some dummy type -- at least it results in more intelligible error
-  // messages
-  #define WX_DEFINE_ITERATOR_CATEGORY(cat)
-#endif
-
-  #define WX_STR_ITERATOR_IMPL(iterator_name, pointer_type, reference_type) \
-      private:                                                              \
-          typedef wxStringImpl::iterator_name underlying_iterator;          \
-      public:                                                               \
-          WX_DEFINE_ITERATOR_CATEGORY(WX_STR_ITERATOR_TAG)                  \
-          typedef wxUniChar value_type;                                     \
-          typedef int difference_type;                                      \
-          typedef reference_type reference;                                 \
-          typedef pointer_type pointer;                                     \
-                                                                            \
-          reference operator[](size_t n) const { return *(*this + n); }     \
-                                                                            \
-          iterator_name& operator++()                                       \
-            { wxStringOperations::IncIter(m_cur); return *this; }           \
-          iterator_name& operator--()                                       \
-            { wxStringOperations::DecIter(m_cur); return *this; }           \
-          iterator_name operator++(int)                                     \
-          {                                                                 \
-              iterator_name tmp = *this;                                    \
-              wxStringOperations::IncIter(m_cur);                           \
-              return tmp;                                                   \
-          }                                                                 \
-          iterator_name operator--(int)                                     \
-          {                                                                 \
-              iterator_name tmp = *this;                                    \
-              wxStringOperations::DecIter(m_cur);                           \
-              return tmp;                                                   \
-          }                                                                 \
-                                                                            \
-          iterator_name& operator+=(ptrdiff_t n)                            \
-          {                                                                 \
-              m_cur = wxStringOperations::AddToIter(m_cur, n);              \
-              return *this;                                                 \
-          }                                                                 \
-          iterator_name& operator-=(ptrdiff_t n)                            \
-          {                                                                 \
-              m_cur = wxStringOperations::AddToIter(m_cur, -n);             \
-              return *this;                                                 \
-          }                                                                 \
-                                                                            \
-          difference_type operator-(const iterator_name& i) const           \
-            { return wxStringOperations::DiffIters(m_cur, i.m_cur); }       \
-                                                                            \
-          bool operator==(const iterator_name& i) const                     \
-            { return m_cur == i.m_cur; }                                    \
-          bool operator!=(const iterator_name& i) const                     \
-            { return m_cur != i.m_cur; }                                    \
-                                                                            \
-          bool operator<(const iterator_name& i) const                      \
-            { return m_cur < i.m_cur; }                                     \
-          bool operator>(const iterator_name& i) const                      \
-            { return m_cur > i.m_cur; }                                     \
-          bool operator<=(const iterator_name& i) const                     \
-            { return m_cur <= i.m_cur; }                                    \
-          bool operator>=(const iterator_name& i) const                     \
-            { return m_cur >= i.m_cur; }                                    \
-                                                                            \
-      private:                                                              \
-          /* for internal wxString use only: */                             \
-          underlying_iterator impl() const { return m_cur; }                \
-                                                                            \
-          friend class wxString;                                            \
-          friend class wxCStrData;                                          \
-                                                                            \
-      private:                                                              \
-          underlying_iterator m_cur
-
-  class WXDLLIMPEXP_FWD_BASE const_iterator;
-
-#if wxUSE_UNICODE_UTF8
-  // NB: In UTF-8 build, (non-const) iterator needs to keep reference
-  //     to the underlying wxStringImpl, because UTF-8 is variable-length
-  //     encoding and changing the value pointer to by an iterator (using
-  //     its operator*) requires calling wxStringImpl::replace() if the old
-  //     and new values differ in their encoding's length.
-  //
-  //     Furthermore, the replace() call may invalid all iterators for the
-  //     string, so we have to keep track of outstanding iterators and update
-  //     them if replace() happens.
-  //
-  //     This is implemented by maintaining linked list of iterators for every
-  //     string and traversing it in wxUniCharRef::operator=(). Head of the
-  //     list is stored in wxString. (FIXME-UTF8)
-
-  class WXDLLIMPEXP_BASE iterator
-  {
-      WX_STR_ITERATOR_IMPL(iterator, wxChar*, wxUniCharRef);
-
-  public:
-      iterator() {}
-      iterator(const iterator& i)
-          : m_cur(i.m_cur), m_node(i.str(), &m_cur) {}
-      iterator& operator=(const iterator& i)
-      {
-          if (&i != this)
-          {
-              m_cur = i.m_cur;
-              m_node.set(i.str(), &m_cur);
-          }
-          return *this;
-      }
-
-      reference operator*()
-        { return wxUniCharRef::CreateForString(*str(), m_cur); }
-
-      iterator operator+(ptrdiff_t n) const
-        { return iterator(str(), wxStringOperations::AddToIter(m_cur, n)); }
-      iterator operator-(ptrdiff_t n) const
-        { return iterator(str(), wxStringOperations::AddToIter(m_cur, -n)); }
-
-      // Normal iterators need to be comparable with the const_iterators so
-      // declare the comparison operators and implement them below after the
-      // full const_iterator declaration.
-      bool operator==(const const_iterator& i) const;
-      bool operator!=(const const_iterator& i) const;
-      bool operator<(const const_iterator& i) const;
-      bool operator>(const const_iterator& i) const;
-      bool operator<=(const const_iterator& i) const;
-      bool operator>=(const const_iterator& i) const;
-
-  private:
-      iterator(wxString *wxstr, underlying_iterator ptr)
-          : m_cur(ptr), m_node(wxstr, &m_cur) {}
-
-      wxString* str() const { return const_cast<wxString*>(m_node.m_str); }
-
-      wxStringIteratorNode m_node;
-
-      friend class const_iterator;
-  };
-
-  class WXDLLIMPEXP_BASE const_iterator
-  {
-      // NB: reference_type is intentionally value, not reference, the character
-      //     may be encoded differently in wxString data:
-      WX_STR_ITERATOR_IMPL(const_iterator, const wxChar*, wxUniChar);
-
-  public:
-      const_iterator() {}
-      const_iterator(const const_iterator& i)
-          : m_cur(i.m_cur), m_node(i.str(), &m_cur) {}
-      const_iterator(const iterator& i)
-          : m_cur(i.m_cur), m_node(i.str(), &m_cur) {}
-
-      const_iterator& operator=(const const_iterator& i)
-      {
-          if (&i != this)
-          {
-              m_cur = i.m_cur;
-              m_node.set(i.str(), &m_cur);
-          }
-          return *this;
-      }
-      const_iterator& operator=(const iterator& i)
-        { m_cur = i.m_cur; m_node.set(i.str(), &m_cur); return *this; }
-
-      reference operator*() const
-        { return wxStringOperations::DecodeChar(m_cur); }
-
-      const_iterator operator+(ptrdiff_t n) const
-        { return const_iterator(str(), wxStringOperations::AddToIter(m_cur, n)); }
-      const_iterator operator-(ptrdiff_t n) const
-        { return const_iterator(str(), wxStringOperations::AddToIter(m_cur, -n)); }
-
-      // Notice that comparison operators taking non-const iterator are not
-      // needed here because of the implicit conversion from non-const iterator
-      // to const ones ensure that the versions for const_iterator declared
-      // inside WX_STR_ITERATOR_IMPL can be used.
-
-  private:
-      // for internal wxString use only:
-      const_iterator(const wxString *wxstr, underlying_iterator ptr)
-          : m_cur(ptr), m_node(wxstr, &m_cur) {}
-
-      const wxString* str() const { return m_node.m_str; }
-
-      wxStringIteratorNode m_node;
-  };
-
-  size_t IterToImplPos(wxString::iterator i) const
-    { return wxStringImpl::const_iterator(i.impl()) - m_impl.begin(); }
-
-  iterator GetIterForNthChar(size_t n)
-    { return iterator(this, m_impl.begin() + PosToImpl(n)); }
-  const_iterator GetIterForNthChar(size_t n) const
-    { return const_iterator(this, m_impl.begin() + PosToImpl(n)); }
-#else // !wxUSE_UNICODE_UTF8
-
-  class WXDLLIMPEXP_BASE iterator
-  {
-      WX_STR_ITERATOR_IMPL(iterator, wxChar*, wxUniCharRef);
-
-  public:
-      iterator() {}
-      iterator(const iterator& i) : m_cur(i.m_cur) {}
-
-      reference operator*()
-        { return wxUniCharRef::CreateForString(m_cur); }
-
-      iterator operator+(ptrdiff_t n) const
-        { return iterator(wxStringOperations::AddToIter(m_cur, n)); }
-      iterator operator-(ptrdiff_t n) const
-        { return iterator(wxStringOperations::AddToIter(m_cur, -n)); }
-
-      // As in UTF-8 case above, define comparison operators taking
-      // const_iterator too.
-      bool operator==(const const_iterator& i) const;
-      bool operator!=(const const_iterator& i) const;
-      bool operator<(const const_iterator& i) const;
-      bool operator>(const const_iterator& i) const;
-      bool operator<=(const const_iterator& i) const;
-      bool operator>=(const const_iterator& i) const;
-
-  private:
-      // for internal wxString use only:
-      iterator(underlying_iterator ptr) : m_cur(ptr) {}
-      iterator(wxString *WXUNUSED(str), underlying_iterator ptr) : m_cur(ptr) {}
-
-      friend class const_iterator;
-  };
-
-  class WXDLLIMPEXP_BASE const_iterator
-  {
-      // NB: reference_type is intentionally value, not reference, the character
-      //     may be encoded differently in wxString data:
-      WX_STR_ITERATOR_IMPL(const_iterator, const wxChar*, wxUniChar);
-
-  public:
-      const_iterator() {}
-      const_iterator(const const_iterator& i) : m_cur(i.m_cur) {}
-      const_iterator(const iterator& i) : m_cur(i.m_cur) {}
-
-      reference operator*() const
-        { return wxStringOperations::DecodeChar(m_cur); }
-
-      const_iterator operator+(ptrdiff_t n) const
-        { return const_iterator(wxStringOperations::AddToIter(m_cur, n)); }
-      const_iterator operator-(ptrdiff_t n) const
-        { return const_iterator(wxStringOperations::AddToIter(m_cur, -n)); }
-
-      // As in UTF-8 case above, we don't need comparison operators taking
-      // iterator because we have an implicit conversion from iterator to
-      // const_iterator so the operators declared by WX_STR_ITERATOR_IMPL will
-      // be used.
-
-  private:
-      // for internal wxString use only:
-      const_iterator(underlying_iterator ptr) : m_cur(ptr) {}
-      const_iterator(const wxString *WXUNUSED(str), underlying_iterator ptr)
-          : m_cur(ptr) {}
-  };
-
-  iterator GetIterForNthChar(size_t n) { return begin() + n; }
-  const_iterator GetIterForNthChar(size_t n) const { return begin() + n; }
-#endif // wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8
-
-  #undef WX_STR_ITERATOR_TAG
-  #undef WX_STR_ITERATOR_IMPL
-
-  // This method is mostly used by wxWidgets itself and return the offset of
-  // the given iterator in bytes relative to the start of the buffer
-  // representing the current string contents in the current locale encoding.
-  //
-  // It is inefficient as it involves converting part of the string to this
-  // encoding (and also unsafe as it simply returns 0 if the conversion fails)
-  // and so should be avoided if possible, wx itself only uses it to implement
-  // backwards-compatible API.
-  ptrdiff_t IterOffsetInMBStr(const const_iterator& i) const
-  {
-      const wxString str(begin(), i);
-
-      // This is logically equivalent to strlen(str.mb_str()) but avoids
-      // actually converting the string to multibyte and just computes the
-      // length that it would have after conversion.
-      size_t ofs = wxConvLibc.FromWChar(NULL, 0, str.wc_str(), str.length());
-      return ofs == wxCONV_FAILED ? 0 : static_cast<ptrdiff_t>(ofs);
-  }
-
-  friend class iterator;
-  friend class const_iterator;
-
-  template <typename T>
-  class reverse_iterator_impl
-  {
-  public:
-      typedef T iterator_type;
-
-      WX_DEFINE_ITERATOR_CATEGORY(typename T::iterator_category)
-      typedef typename T::value_type value_type;
-      typedef typename T::difference_type difference_type;
-      typedef typename T::reference reference;
-      typedef typename T::pointer *pointer;
-
-      reverse_iterator_impl() {}
-      reverse_iterator_impl(iterator_type i) : m_cur(i) {}
-      reverse_iterator_impl(const reverse_iterator_impl& ri)
-          : m_cur(ri.m_cur) {}
-
-      iterator_type base() const { return m_cur; }
-
-      reference operator*() const { return *(m_cur-1); }
-      reference operator[](size_t n) const { return *(*this + n); }
-
-      reverse_iterator_impl& operator++()
-        { --m_cur; return *this; }
-      reverse_iterator_impl operator++(int)
-        { reverse_iterator_impl tmp = *this; --m_cur; return tmp; }
-      reverse_iterator_impl& operator--()
-        { ++m_cur; return *this; }
-      reverse_iterator_impl operator--(int)
-        { reverse_iterator_impl tmp = *this; ++m_cur; return tmp; }
-
-      // NB: explicit <T> in the functions below is to keep BCC 5.5 happy
-      reverse_iterator_impl operator+(ptrdiff_t n) const
-        { return reverse_iterator_impl<T>(m_cur - n); }
-      reverse_iterator_impl operator-(ptrdiff_t n) const
-        { return reverse_iterator_impl<T>(m_cur + n); }
-      reverse_iterator_impl operator+=(ptrdiff_t n)
-        { m_cur -= n; return *this; }
-      reverse_iterator_impl operator-=(ptrdiff_t n)
-        { m_cur += n; return *this; }
-
-      unsigned operator-(const reverse_iterator_impl& i) const
-        { return i.m_cur - m_cur; }
-
-      bool operator==(const reverse_iterator_impl& ri) const
-        { return m_cur == ri.m_cur; }
-      bool operator!=(const reverse_iterator_impl& ri) const
-        { return !(*this == ri); }
-
-      bool operator<(const reverse_iterator_impl& i) const
-        { return m_cur > i.m_cur; }
-      bool operator>(const reverse_iterator_impl& i) const
-        { return m_cur < i.m_cur; }
-      bool operator<=(const reverse_iterator_impl& i) const
-        { return m_cur >= i.m_cur; }
-      bool operator>=(const reverse_iterator_impl& i) const
-        { return m_cur <= i.m_cur; }
-
-  private:
-      iterator_type m_cur;
-  };
-
-  typedef reverse_iterator_impl<iterator> reverse_iterator;
-  typedef reverse_iterator_impl<const_iterator> const_reverse_iterator;
-
-private:
-  // used to transform an expression built using c_str() (and hence of type
-  // wxCStrData) to an iterator into the string
-  static const_iterator CreateConstIterator(const wxCStrData& data)
-  {
-      return const_iterator(data.m_str,
-                            (data.m_str->begin() + data.m_offset).impl());
-  }
-
-  // in UTF-8 STL build, creation from std::string requires conversion under
-  // non-UTF8 locales, so we can't have and use wxString(wxStringImpl) ctor;
-  // instead we define dummy type that lets us have wxString ctor for creation
-  // from wxStringImpl that couldn't be used by user code (in all other builds,
-  // "standard" ctors can be used):
-#if wxUSE_UNICODE_UTF8 && wxUSE_STL_BASED_WXSTRING
-  struct CtorFromStringImplTag {};
-
-  wxString(CtorFromStringImplTag* WXUNUSED(dummy), const wxStringImpl& src)
-      : m_impl(src) {}
-
-  static wxString FromImpl(const wxStringImpl& src)
-      { return wxString((CtorFromStringImplTag*)NULL, src); }
-#else
-  #if !wxUSE_STL_BASED_WXSTRING
-  wxString(const wxStringImpl& src) : m_impl(src) { }
-  // else: already defined as wxString(wxStdString) below
-  #endif
-  static wxString FromImpl(const wxStringImpl& src) { return wxString(src); }
-#endif
-
 public:
   // constructors and destructor
     // ctor for an empty string
-  wxString() {}
-
+  wxString() : wxStringBase() { }
     // copy ctor
-  wxString(const wxString& stringSrc) : m_impl(stringSrc.m_impl) { }
-
+  wxString(const wxStringBase& stringSrc) : wxStringBase(stringSrc) { }
+  wxString(const wxString& stringSrc) : wxStringBase(stringSrc) { }
     // string containing nRepeat copies of ch
-  wxString(wxUniChar ch, size_t nRepeat = 1 )
-    { assign(nRepeat, ch); }
-  wxString(size_t nRepeat, wxUniChar ch)
-    { assign(nRepeat, ch); }
-  wxString(wxUniCharRef ch, size_t nRepeat = 1)
-    { assign(nRepeat, ch); }
-  wxString(size_t nRepeat, wxUniCharRef ch)
-    { assign(nRepeat, ch); }
-  wxString(char ch, size_t nRepeat = 1)
-    { assign(nRepeat, ch); }
-  wxString(size_t nRepeat, char ch)
-    { assign(nRepeat, ch); }
-  wxString(wchar_t ch, size_t nRepeat = 1)
-    { assign(nRepeat, ch); }
-  wxString(size_t nRepeat, wchar_t ch)
-    { assign(nRepeat, ch); }
+  wxString(wxChar ch, size_t nRepeat = 1)
+      : wxStringBase(nRepeat, ch) { }
+  wxString(size_t nRepeat, wxChar ch)
+      : wxStringBase(nRepeat, ch) { }
+    // ctor takes first nLength characters from C string
+    // (default value of npos means take all the string)
+  wxString(const wxChar *psz)
+      : wxStringBase(psz ? psz : wxT("")) { }
+  wxString(const wxChar *psz, size_t nLength)
+      : wxStringBase(psz, nLength) { }
+  wxString(const wxChar *psz,
+           const wxMBConv& WXUNUSED(conv),
+           size_t nLength = npos)
+      : wxStringBase(psz, nLength == npos ? wxStrlen(psz) : nLength) { }
 
-    // ctors from char* strings:
-  wxString(const char *psz)
-    : m_impl(ImplStr(psz)) {}
-  wxString(const char *psz, const wxMBConv& conv)
-    : m_impl(ImplStr(psz, conv)) {}
-  wxString(const char *psz, size_t nLength)
-    { assign(psz, nLength); }
-  wxString(const char *psz, const wxMBConv& conv, size_t nLength)
-  {
-    SubstrBufFromMB str(ImplStr(psz, nLength, conv));
-    m_impl.assign(str.data, str.len);
-  }
-
-    // and unsigned char*:
-  wxString(const unsigned char *psz)
-    : m_impl(ImplStr((const char*)psz)) {}
-  wxString(const unsigned char *psz, const wxMBConv& conv)
-    : m_impl(ImplStr((const char*)psz, conv)) {}
-  wxString(const unsigned char *psz, size_t nLength)
-    { assign((const char*)psz, nLength); }
-  wxString(const unsigned char *psz, const wxMBConv& conv, size_t nLength)
-  {
-    SubstrBufFromMB str(ImplStr((const char*)psz, nLength, conv));
-    m_impl.assign(str.data, str.len);
-  }
-
-    // ctors from wchar_t* strings:
-  wxString(const wchar_t *pwz)
-    : m_impl(ImplStr(pwz)) {}
-  wxString(const wchar_t *pwz, const wxMBConv& WXUNUSED(conv))
-    : m_impl(ImplStr(pwz)) {}
-  wxString(const wchar_t *pwz, size_t nLength)
-    { assign(pwz, nLength); }
-  wxString(const wchar_t *pwz, const wxMBConv& WXUNUSED(conv), size_t nLength)
-    { assign(pwz, nLength); }
-
-  wxString(const wxScopedCharBuffer& buf)
-    { assign(buf.data(), buf.length()); }
-  wxString(const wxScopedWCharBuffer& buf)
-    { assign(buf.data(), buf.length()); }
-
-    // NB: this version uses m_impl.c_str() to force making a copy of the
-    //     string, so that "wxString(str.c_str())" idiom for passing strings
-    //     between threads works
-  wxString(const wxCStrData& cstr)
-      : m_impl(cstr.AsString().m_impl.c_str()) { }
-
-    // as we provide both ctors with this signature for both char and unsigned
-    // char string, we need to provide one for wxCStrData to resolve ambiguity
-  wxString(const wxCStrData& cstr, size_t nLength)
-      : m_impl(cstr.AsString().Mid(0, nLength).m_impl) {}
-
-    // and because wxString is convertible to wxCStrData and const wxChar *
-    // we also need to provide this one
-  wxString(const wxString& str, size_t nLength)
-    { assign(str, nLength); }
-
-
-#if wxUSE_STRING_POS_CACHE
-  ~wxString()
-  {
-      // we need to invalidate our cache entry as another string could be
-      // recreated at the same address (unlikely, but still possible, with the
-      // heap-allocated strings but perfectly common with stack-allocated ones)
-      InvalidateCache();
-  }
-#endif // wxUSE_STRING_POS_CACHE
-
-  // even if we're not built with wxUSE_STD_STRING_CONV_IN_WXSTRING == 1 it is
-  // very convenient to allow implicit conversions from std::string to wxString
-  // and vice verse as this allows to use the same strings in non-GUI and GUI
-  // code, however we don't want to unconditionally add this ctor as it would
-  // make wx lib dependent on libstdc++ on some Linux versions which is bad, so
-  // instead we ask the client code to define this wxUSE_STD_STRING symbol if
-  // they need it
+  // even if we're not built with wxUSE_STL == 1 it is very convenient to allow
+  // implicit conversions from std::string to wxString as this allows to use
+  // the same strings in non-GUI and GUI code, however we don't want to
+  // unconditionally add this ctor as it would make wx lib dependent on
+  // libstdc++ on some Linux versions which is bad, so instead we ask the
+  // client code to define this wxUSE_STD_STRING symbol if they need it
 #if wxUSE_STD_STRING
-  #if wxUSE_UNICODE_WCHAR
-    wxString(const wxStdWideString& str) : m_impl(str) {}
-  #else // UTF-8 or ANSI
-    wxString(const wxStdWideString& str)
-        { assign(str.c_str(), str.length()); }
-  #endif
-
-  #if !wxUSE_UNICODE // ANSI build
-    // FIXME-UTF8: do this in UTF8 build #if wxUSE_UTF8_LOCALE_ONLY, too
-    wxString(const std::string& str) : m_impl(str) {}
-  #else // Unicode
-    wxString(const std::string& str)
-        { assign(str.c_str(), str.length()); }
-  #endif
+  wxString(const wxStdString& s)
+      : wxStringBase(s.c_str()) { }
 #endif // wxUSE_STD_STRING
 
-  // Also always provide explicit conversions to std::[w]string in any case,
-  // see below for the implicit ones.
-#if wxUSE_STD_STRING
-  // We can avoid a copy if we already use this string type internally,
-  // otherwise we create a copy on the fly:
-  #if wxUSE_UNICODE_WCHAR && wxUSE_STL_BASED_WXSTRING
-    #define wxStringToStdWstringRetType const wxStdWideString&
-    const wxStdWideString& ToStdWstring() const { return m_impl; }
-  #else
-    // wxStringImpl is either not std::string or needs conversion
-    #define wxStringToStdWstringRetType wxStdWideString
-    wxStdWideString ToStdWstring() const
-    {
-#if wxUSE_UNICODE_WCHAR
-        wxScopedWCharBuffer buf =
-            wxScopedWCharBuffer::CreateNonOwned(m_impl.c_str(), m_impl.length());
-#else // !wxUSE_UNICODE_WCHAR
-        wxScopedWCharBuffer buf(wc_str());
-#endif
+#if wxUSE_UNICODE
+    // from multibyte string
+  wxString(const char *psz, const wxMBConv& conv, size_t nLength = npos);
+    // from wxWCharBuffer (i.e. return from wxGetString)
+  wxString(const wxWCharBuffer& psz) : wxStringBase(psz.data()) { }
+#else // ANSI
+    // from C string (for compilers using unsigned char)
+  wxString(const unsigned char* psz)
+      : wxStringBase((const char*)psz) { }
+    // from part of C string (for compilers using unsigned char)
+  wxString(const unsigned char* psz, size_t nLength)
+      : wxStringBase((const char*)psz, nLength) { }
 
-        return wxStdWideString(buf.data(), buf.length());
-    }
-  #endif
+#if wxUSE_WCHAR_T
+    // from wide (Unicode) string
+  wxString(const wchar_t *pwz,
+           const wxMBConv& conv = wxConvLibc,
+           size_t nLength = npos);
+#endif // !wxUSE_WCHAR_T
 
-  #if (!wxUSE_UNICODE || wxUSE_UTF8_LOCALE_ONLY) && wxUSE_STL_BASED_WXSTRING
-    // wxStringImpl is std::string in the encoding we want
-    #define wxStringToStdStringRetType const std::string&
-    const std::string& ToStdString() const { return m_impl; }
-  #else
-    // wxStringImpl is either not std::string or needs conversion
-    #define wxStringToStdStringRetType std::string
-    std::string ToStdString() const
-    {
-        wxScopedCharBuffer buf(mb_str());
-        return std::string(buf.data(), buf.length());
-    }
-  #endif
-
-#if wxUSE_STD_STRING_CONV_IN_WXSTRING
-    // Implicit conversions to std::[w]string are not provided by default as
-    // they conflict with the implicit conversions to "const char/wchar_t *"
-    // which we use for backwards compatibility but do provide them if
-    // explicitly requested.
-  operator wxStringToStdStringRetType() const { return ToStdString(); }
-  operator wxStringToStdWstringRetType() const { return ToStdWstring(); }
-#endif // wxUSE_STD_STRING_CONV_IN_WXSTRING
-
-#undef wxStringToStdStringRetType
-#undef wxStringToStdWstringRetType
-
-#endif // wxUSE_STD_STRING
-
-  wxString Clone() const
-  {
-      // make a deep copy of the string, i.e. the returned string will have
-      // ref count = 1 with refcounted implementation
-      return wxString::FromImpl(wxStringImpl(m_impl.c_str(), m_impl.length()));
-  }
-
-  // first valid index position
-  const_iterator begin() const { return const_iterator(this, m_impl.begin()); }
-  iterator begin() { return iterator(this, m_impl.begin()); }
-  // position one after the last valid one
-  const_iterator end() const { return const_iterator(this, m_impl.end()); }
-  iterator end() { return iterator(this, m_impl.end()); }
-
-  // first element of the reversed string
-  const_reverse_iterator rbegin() const
-    { return const_reverse_iterator(end()); }
-  reverse_iterator rbegin()
-    { return reverse_iterator(end()); }
-  // one beyond the end of the reversed string
-  const_reverse_iterator rend() const
-    { return const_reverse_iterator(begin()); }
-  reverse_iterator rend()
-    { return reverse_iterator(begin()); }
-
-  // std::string methods:
-#if wxUSE_UNICODE_UTF8
-  size_t length() const
-  {
-#if wxUSE_STRING_POS_CACHE
-      wxCACHE_PROFILE_FIELD_INC(lentot);
-
-      Cache::Element * const cache = GetCacheElement();
-
-      if ( cache->len == npos )
-      {
-          // it's probably not worth trying to be clever and using cache->pos
-          // here as it's probably 0 anyhow -- you usually call length() before
-          // starting to index the string
-          cache->len = end() - begin();
-      }
-      else
-      {
-          wxCACHE_PROFILE_FIELD_INC(lenhits);
-
-          wxSTRING_CACHE_ASSERT( (int)cache->len == end() - begin() );
-      }
-
-      return cache->len;
-#else // !wxUSE_STRING_POS_CACHE
-      return end() - begin();
-#endif // wxUSE_STRING_POS_CACHE/!wxUSE_STRING_POS_CACHE
-  }
-#else
-  size_t length() const { return m_impl.length(); }
-#endif
-
-  size_type size() const { return length(); }
-  size_type max_size() const { return npos; }
-
-  bool empty() const { return m_impl.empty(); }
-
-  // NB: these methods don't have a well-defined meaning in UTF-8 case
-  size_type capacity() const { return m_impl.capacity(); }
-  void reserve(size_t sz) { m_impl.reserve(sz); }
-
-  void resize(size_t nSize, wxUniChar ch = wxT('\0'))
-  {
-    const size_t len = length();
-    if ( nSize == len)
-        return;
-
-#if wxUSE_UNICODE_UTF8
-    if ( nSize < len )
-    {
-        wxSTRING_INVALIDATE_CACHE();
-
-        // we can't use wxStringImpl::resize() for truncating the string as it
-        // counts in bytes, not characters
-        erase(nSize);
-        return;
-    }
-
-    // we also can't use (presumably more efficient) resize() if we have to
-    // append characters taking more than one byte
-    if ( !ch.IsAscii() )
-    {
-        append(nSize - len, ch);
-    }
-    else // can use (presumably faster) resize() version
-#endif // wxUSE_UNICODE_UTF8
-    {
-        wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-        m_impl.resize(nSize, (wxStringCharType)ch);
-    }
-  }
-
-  wxString substr(size_t nStart = 0, size_t nLen = npos) const
-  {
-    size_t pos, len;
-    PosLenToImpl(nStart, nLen, &pos, &len);
-    return FromImpl(m_impl.substr(pos, len));
-  }
+    // from wxCharBuffer
+  wxString(const wxCharBuffer& psz)
+      : wxStringBase(psz) { }
+#endif // Unicode/ANSI
 
   // generic attributes & operations
     // as standard strlen()
@@ -1544,9 +750,18 @@ public:
     // truncate the string to given length
   wxString& Truncate(size_t uiLen);
     // empty string contents
-  void Empty() { clear(); }
+  void Empty()
+  {
+    Truncate(0);
+
+    wxASSERT_MSG( empty(), wxT("string not empty after call to Empty()?") );
+  }
     // empty the string and free memory
-  void Clear() { clear(); }
+  void Clear()
+  {
+    wxString tmp(wxEmptyString);
+    swap(tmp);
+  }
 
   // contents test
     // Is an ascii value
@@ -1558,162 +773,79 @@ public:
 
   // data access (all indexes are 0 based)
     // read access
-    wxUniChar at(size_t n) const
-      { return wxStringOperations::DecodeChar(m_impl.begin() + PosToImpl(n)); }
-    wxUniChar GetChar(size_t n) const
+    wxChar  GetChar(size_t n) const
       { return at(n); }
     // read/write access
-    wxUniCharRef at(size_t n)
-      { return *GetIterForNthChar(n); }
-    wxUniCharRef GetWritableChar(size_t n)
+    wxChar& GetWritableChar(size_t n)
       { return at(n); }
     // write access
-    void SetChar(size_t n, wxUniChar ch)
+    void  SetChar(size_t n, wxChar ch)
       { at(n) = ch; }
 
     // get last character
-    wxUniChar Last() const
-    {
-      wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") );
-      return *rbegin();
-    }
+    wxChar  Last() const
+      {
+          wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") );
+
+          return at(length() - 1);
+      }
 
     // get writable last character
-    wxUniCharRef Last()
-    {
-      wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") );
-      return *rbegin();
-    }
+    wxChar& Last()
+      {
+          wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") );
+          return at(length() - 1);
+      }
 
     /*
        Note that we we must define all of the overloads below to avoid
-       ambiguity when using str[0].
+       ambiguity when using str[0]. Also note that for a conforming compiler we
+       don't need const version of operatorp[] at all as indexed access to
+       const string is provided by implicit conversion to "const wxChar *"
+       below and defining them would only result in ambiguities, but some other
+       compilers refuse to compile "str[0]" without them.
      */
-    wxUniChar operator[](int n) const
-      { return at(n); }
-    wxUniChar operator[](long n) const
-      { return at(n); }
-    wxUniChar operator[](size_t n) const
-      { return at(n); }
+
+#if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__MWERKS__)
+    wxChar operator[](int n) const
+      { return wxStringBase::at(n); }
+    wxChar operator[](size_type n) const
+      { return wxStringBase::at(n); }
 #ifndef wxSIZE_T_IS_UINT
-    wxUniChar operator[](unsigned int n) const
-      { return at(n); }
+    wxChar operator[](unsigned int n) const
+      { return wxStringBase::at(n); }
 #endif // size_t != unsigned int
+#endif // broken compiler
+
 
     // operator versions of GetWriteableChar()
-    wxUniCharRef operator[](int n)
-      { return at(n); }
-    wxUniCharRef operator[](long n)
-      { return at(n); }
-    wxUniCharRef operator[](size_t n)
-      { return at(n); }
+    wxChar& operator[](int n)
+      { return wxStringBase::at(n); }
+    wxChar& operator[](size_type n)
+      { return wxStringBase::at(n); }
 #ifndef wxSIZE_T_IS_UINT
-    wxUniCharRef operator[](unsigned int n)
-      { return at(n); }
+    wxChar& operator[](unsigned int n)
+      { return wxStringBase::at(n); }
 #endif // size_t != unsigned int
 
+    // implicit conversion to C string
+    operator const wxChar*() const { return c_str(); }
 
-    /*
-        Overview of wxString conversions, implicit and explicit:
-
-        - wxString has a std::[w]string-like c_str() method, however it does
-          not return a C-style string directly but instead returns wxCStrData
-          helper object which is convertible to either "char *" narrow string
-          or "wchar_t *" wide string. Usually the correct conversion will be
-          applied by the compiler automatically but if this doesn't happen you
-          need to explicitly choose one using wxCStrData::AsChar() or AsWChar()
-          methods or another wxString conversion function.
-
-        - One of the places where the conversion does *NOT* happen correctly is
-          when c_str() is passed to a vararg function such as printf() so you
-          must *NOT* use c_str() with them. Either use wxPrintf() (all wx
-          functions do handle c_str() correctly, even if they appear to be
-          vararg (but they're not, really)) or add an explicit AsChar() or, if
-          compatibility with previous wxWidgets versions is important, add a
-          cast to "const char *".
-
-        - In non-STL mode only, wxString is also implicitly convertible to
-          wxCStrData. The same warning as above applies.
-
-        - c_str() is polymorphic as it can be converted to either narrow or
-          wide string. If you explicitly need one or the other, choose to use
-          mb_str() (for narrow) or wc_str() (for wide) instead. Notice that
-          these functions can return either the pointer to string directly (if
-          this is what the string uses internally) or a temporary buffer
-          containing the string and convertible to it. Again, conversion will
-          usually be done automatically by the compiler but beware of the
-          vararg functions: you need an explicit cast when using them.
-
-        - There are also non-const versions of mb_str() and wc_str() called
-          char_str() and wchar_str(). They are only meant to be used with
-          non-const-correct functions and they always return buffers.
-
-        - Finally wx_str() returns whatever string representation is used by
-          wxString internally. It may be either a narrow or wide string
-          depending on wxWidgets build mode but it will always be a raw pointer
-          (and not a buffer).
-     */
-
-    // explicit conversion to wxCStrData
-    wxCStrData c_str() const { return wxCStrData(this); }
-    wxCStrData data() const { return c_str(); }
-
-    // implicit conversion to wxCStrData
-    operator wxCStrData() const { return c_str(); }
-
-    // the first two operators conflict with operators for conversion to
-    // std::string and they must be disabled if those conversions are enabled;
-    // the next one only makes sense if conversions to char* are also defined
-    // and not defining it in STL build also helps us to get more clear error
-    // messages for the code which relies on implicit conversion to char* in
-    // STL build
-#if !wxUSE_STD_STRING_CONV_IN_WXSTRING
-    operator const char*() const { return c_str(); }
-    operator const wchar_t*() const { return c_str(); }
-
-    // implicit conversion to untyped pointer for compatibility with previous
-    // wxWidgets versions: this is the same as conversion to const char * so it
-    // may fail!
-    operator const void*() const { return c_str(); }
-#endif // !wxUSE_STD_STRING_CONV_IN_WXSTRING
-
+    // identical to c_str(), for wxWin 1.6x compatibility
+    const wxChar* wx_str()  const { return c_str(); }
     // identical to c_str(), for MFC compatibility
-    const wxCStrData GetData() const { return c_str(); }
-
-    // explicit conversion to C string in internal representation (char*,
-    // wchar_t*, UTF-8-encoded char*, depending on the build):
-    const wxStringCharType *wx_str() const { return m_impl.c_str(); }
+    const wxChar* GetData() const { return c_str(); }
 
+#if wxABI_VERSION >= 20804
     // conversion to *non-const* multibyte or widestring buffer; modifying
     // returned buffer won't affect the string, these methods are only useful
     // for passing values to const-incorrect functions
     wxWritableCharBuffer char_str(const wxMBConv& conv = wxConvLibc) const
-        { return mb_str(conv); }
-    wxWritableWCharBuffer wchar_str() const { return wc_str(); }
-
-    // conversion to the buffer of the given type T (= char or wchar_t) and
-    // also optionally return the buffer length
-    //
-    // this is mostly/only useful for the template functions
-    //
-    // FIXME-VC6: the second argument only exists for VC6 which doesn't support
-    //            explicit template function selection, do not use it unless
-    //            you must support VC6!
-    template <typename T>
-    wxCharTypeBuffer<T> tchar_str(size_t *len = NULL,
-                                  T * WXUNUSED(dummy) = NULL) const
-    {
-#if wxUSE_UNICODE
-        // we need a helper dispatcher depending on type
-        return wxPrivate::wxStringAsBufHelper<T>::Get(*this, len);
-#else // ANSI
-        // T can only be char in ANSI build
-        if ( len )
-            *len = length();
-
-        return wxCharTypeBuffer<T>::CreateNonOwned(wx_str(), length());
-#endif // Unicode build kind
-    }
+      { return mb_str(conv); }
+#if wxUSE_WCHAR_T
+    wxWritableWCharBuffer wchar_str() const { return wc_str(wxConvLibc); }
+#endif
+#endif // wxABI_VERSION >= 20804
 
     // conversion to/from plain (i.e. 7 bit) ASCII: this is useful for
     // converting numbers or strings which are certain not to contain special
@@ -1722,113 +854,40 @@ public:
     // the behaviour of these functions with the strings containing anything
     // else than 7 bit ASCII characters is undefined, use at your own risk.
 #if wxUSE_UNICODE
-    static wxString FromAscii(const char *ascii, size_t len);
-    static wxString FromAscii(const char *ascii);
-    static wxString FromAscii(char ascii);
-    const wxScopedCharBuffer ToAscii() const;
+    static wxString FromAscii(const char *ascii);  // string
+    static wxString FromAscii(const char ascii);   // char
+    const wxCharBuffer ToAscii() const;
 #else // ANSI
     static wxString FromAscii(const char *ascii) { return wxString( ascii ); }
-    static wxString FromAscii(const char *ascii, size_t len)
-        { return wxString( ascii, len ); }
-    static wxString FromAscii(char ascii) { return wxString( ascii ); }
+    static wxString FromAscii(const char ascii) { return wxString( ascii ); }
     const char *ToAscii() const { return c_str(); }
 #endif // Unicode/!Unicode
 
-    // also provide unsigned char overloads as signed/unsigned doesn't matter
-    // for 7 bit ASCII characters
-    static wxString FromAscii(const unsigned char *ascii)
-        { return FromAscii((const char *)ascii); }
-    static wxString FromAscii(const unsigned char *ascii, size_t len)
-        { return FromAscii((const char *)ascii, len); }
-
+#if wxABI_VERSION >= 20804
     // conversion to/from UTF-8:
-#if wxUSE_UNICODE_UTF8
-    static wxString FromUTF8Unchecked(const char *utf8)
-    {
-      if ( !utf8 )
-          return wxEmptyString;
-
-      wxASSERT( wxStringOperations::IsValidUtf8String(utf8) );
-      return FromImpl(wxStringImpl(utf8));
-    }
-    static wxString FromUTF8Unchecked(const char *utf8, size_t len)
-    {
-      if ( !utf8 )
-          return wxEmptyString;
-      if ( len == npos )
-          return FromUTF8Unchecked(utf8);
-
-      wxASSERT( wxStringOperations::IsValidUtf8String(utf8, len) );
-      return FromImpl(wxStringImpl(utf8, len));
-    }
-
+#if wxUSE_UNICODE
     static wxString FromUTF8(const char *utf8)
-    {
-        if ( !utf8 || !wxStringOperations::IsValidUtf8String(utf8) )
-            return "";
-
-        return FromImpl(wxStringImpl(utf8));
-    }
+      { return wxString(utf8, wxConvUTF8); }
+    static wxString FromUTF8(const char *utf8, size_t len)
+      { return wxString(utf8, wxConvUTF8, len); }
+    const wxCharBuffer utf8_str() const { return mb_str(wxConvUTF8); }
+    const wxCharBuffer ToUTF8() const { return utf8_str(); }
+#elif wxUSE_WCHAR_T // ANSI
+    static wxString FromUTF8(const char *utf8)
+      { return wxString(wxConvUTF8.cMB2WC(utf8)); }
     static wxString FromUTF8(const char *utf8, size_t len)
     {
-        if ( len == npos )
-            return FromUTF8(utf8);
-
-        if ( !utf8 || !wxStringOperations::IsValidUtf8String(utf8, len) )
-            return "";
-
-        return FromImpl(wxStringImpl(utf8, len));
+      size_t wlen;
+      wxWCharBuffer buf(wxConvUTF8.cMB2WC(utf8, len == npos ? wxNO_LEN : len, &wlen));
+      return wxString(buf.data(), wxConvLibc, wlen);
     }
+    const wxCharBuffer utf8_str() const
+      { return wxConvUTF8.cWC2MB(wc_str(wxConvLibc)); }
+    const wxCharBuffer ToUTF8() const { return utf8_str(); }
+#endif // Unicode/ANSI
+#endif // wxABI_VERSION >= 20804
 
-    const wxScopedCharBuffer utf8_str() const
-        { return wxCharBuffer::CreateNonOwned(m_impl.c_str(), m_impl.length()); }
-
-    // this function exists in UTF-8 build only and returns the length of the
-    // internal UTF-8 representation
-    size_t utf8_length() const { return m_impl.length(); }
-#elif wxUSE_UNICODE_WCHAR
-    static wxString FromUTF8(const char *utf8, size_t len = npos)
-      { return wxString(utf8, wxMBConvUTF8(), len); }
-    static wxString FromUTF8Unchecked(const char *utf8, size_t len = npos)
-    {
-        const wxString s(utf8, wxMBConvUTF8(), len);
-        wxASSERT_MSG( !utf8 || !*utf8 || !s.empty(),
-                      "string must be valid UTF-8" );
-        return s;
-    }
-    const wxScopedCharBuffer utf8_str() const { return mb_str(wxMBConvUTF8()); }
-#else // ANSI
-    static wxString FromUTF8(const char *utf8)
-      { return wxString(wxMBConvUTF8().cMB2WC(utf8)); }
-    static wxString FromUTF8(const char *utf8, size_t len)
-    {
-        size_t wlen;
-        wxScopedWCharBuffer buf(wxMBConvUTF8().cMB2WC(utf8, len == npos ? wxNO_LEN : len, &wlen));
-        return wxString(buf.data(), wlen);
-    }
-    static wxString FromUTF8Unchecked(const char *utf8, size_t len = npos)
-    {
-        size_t wlen;
-        wxScopedWCharBuffer buf
-                            (
-                              wxMBConvUTF8().cMB2WC
-                                             (
-                                               utf8,
-                                               len == npos ? wxNO_LEN : len,
-                                               &wlen
-                                             )
-                            );
-        wxASSERT_MSG( !utf8 || !*utf8 || wlen,
-                      "string must be valid UTF-8" );
-
-        return wxString(buf.data(), wlen);
-    }
-    const wxScopedCharBuffer utf8_str() const
-      { return wxMBConvUTF8().cWC2MB(wc_str()); }
-#endif
-
-    const wxScopedCharBuffer ToUTF8() const { return utf8_str(); }
-
+#if wxABI_VERSION >= 20804
     // functions for storing binary data in wxString:
 #if wxUSE_UNICODE
     static wxString From8BitData(const char *data, size_t len)
@@ -1836,17 +895,16 @@ public:
     // version for NUL-terminated data:
     static wxString From8BitData(const char *data)
       { return wxString(data, wxConvISO8859_1); }
-    const wxScopedCharBuffer To8BitData() const
-        { return mb_str(wxConvISO8859_1); }
+    const wxCharBuffer To8BitData() const { return mb_str(wxConvISO8859_1); }
 #else // ANSI
     static wxString From8BitData(const char *data, size_t len)
       { return wxString(data, len); }
     // version for NUL-terminated data:
     static wxString From8BitData(const char *data)
       { return wxString(data); }
-    const wxScopedCharBuffer To8BitData() const
-        { return wxScopedCharBuffer::CreateNonOwned(wx_str(), length()); }
+    const char *To8BitData() const { return c_str(); }
 #endif // Unicode/ANSI
+#endif // wxABI_VERSION >= 20804
 
     // conversions with (possible) format conversions: have to return a
     // buffer with temporary data
@@ -1857,162 +915,71 @@ public:
     // accepting the file names. The return value is always the same, but the
     // type differs because a function may either return pointer to the buffer
     // directly or have to use intermediate buffer for translation.
-
 #if wxUSE_UNICODE
-
-    // this is an optimization: even though using mb_str(wxConvLibc) does the
-    // same thing (i.e. returns pointer to internal representation as locale is
-    // always an UTF-8 one) in wxUSE_UTF8_LOCALE_ONLY case, we can avoid the
-    // extra checks and the temporary buffer construction by providing a
-    // separate mb_str() overload
-#if wxUSE_UTF8_LOCALE_ONLY
-    const char* mb_str() const { return wx_str(); }
-    const wxScopedCharBuffer mb_str(const wxMBConv& conv) const
-    {
-        return AsCharBuf(conv);
-    }
-#else // !wxUSE_UTF8_LOCALE_ONLY
-    const wxScopedCharBuffer mb_str(const wxMBConv& conv = wxConvLibc) const
-    {
-        return AsCharBuf(conv);
-    }
-#endif // wxUSE_UTF8_LOCALE_ONLY/!wxUSE_UTF8_LOCALE_ONLY
+    const wxCharBuffer mb_str(const wxMBConv& conv = wxConvLibc) const;
 
     const wxWX2MBbuf mbc_str() const { return mb_str(*wxConvCurrent); }
 
-#if wxUSE_UNICODE_WCHAR
-    const wchar_t* wc_str() const { return wx_str(); }
-#elif wxUSE_UNICODE_UTF8
-    const wxScopedWCharBuffer wc_str() const
-        { return AsWCharBuf(wxMBConvStrictUTF8()); }
-#endif
+    const wxChar* wc_str() const { return c_str(); }
+
     // for compatibility with !wxUSE_UNICODE version
-    const wxWX2WCbuf wc_str(const wxMBConv& WXUNUSED(conv)) const
-      { return wc_str(); }
+    const wxChar* wc_str(const wxMBConv& WXUNUSED(conv)) const { return c_str(); }
 
 #if wxMBFILES
-    const wxScopedCharBuffer fn_str() const { return mb_str(wxConvFile); }
+    const wxCharBuffer fn_str() const { return mb_str(wxConvFile); }
 #else // !wxMBFILES
-    const wxWX2WCbuf fn_str() const { return wc_str(); }
+    const wxChar* fn_str() const { return c_str(); }
 #endif // wxMBFILES/!wxMBFILES
-
 #else // ANSI
-    const char* mb_str() const { return wx_str(); }
+    const wxChar* mb_str() const { return c_str(); }
 
     // for compatibility with wxUSE_UNICODE version
-    const char* mb_str(const wxMBConv& WXUNUSED(conv)) const { return wx_str(); }
+    const wxChar* mb_str(const wxMBConv& WXUNUSED(conv)) const { return c_str(); }
 
     const wxWX2MBbuf mbc_str() const { return mb_str(); }
 
-    const wxScopedWCharBuffer wc_str(const wxMBConv& conv = wxConvLibc) const
-        { return AsWCharBuf(conv); }
-
-    const wxScopedCharBuffer fn_str() const
-        { return wxConvFile.cWC2WX( wc_str( wxConvLibc ) ); }
-#endif // Unicode/ANSI
-
-#if wxUSE_UNICODE_UTF8
-    const wxScopedWCharBuffer t_str() const { return wc_str(); }
-#elif wxUSE_UNICODE_WCHAR
-    const wchar_t* t_str() const { return wx_str(); }
+#if wxUSE_WCHAR_T
+    const wxWCharBuffer wc_str(const wxMBConv& conv) const;
+#endif // wxUSE_WCHAR_T
+#ifdef __WXOSX__
+    const wxCharBuffer fn_str() const { return wxConvFile.cWC2WX( wc_str( wxConvLocal ) ); }
 #else
-    const char* t_str() const { return wx_str(); }
+    const wxChar* fn_str() const { return c_str(); }
 #endif
-
+#endif // Unicode/ANSI
 
   // overloaded assignment
     // from another wxString
-  wxString& operator=(const wxString& stringSrc)
-  {
-    if ( this != &stringSrc )
-    {
-        wxSTRING_INVALIDATE_CACHE();
-
-        m_impl = stringSrc.m_impl;
-    }
-
-    return *this;
-  }
-
-  wxString& operator=(const wxCStrData& cstr)
-    { return *this = cstr.AsString(); }
+  wxString& operator=(const wxStringBase& stringSrc)
+    { return (wxString&)wxStringBase::operator=(stringSrc); }
     // from a character
-  wxString& operator=(wxUniChar ch)
-  {
-    wxSTRING_INVALIDATE_CACHE();
-
-#if wxUSE_UNICODE_UTF8
-    if ( !ch.IsAscii() )
-        m_impl = wxStringOperations::EncodeChar(ch);
-    else
-#endif // wxUSE_UNICODE_UTF8
-        m_impl = (wxStringCharType)ch;
-    return *this;
-  }
-
-  wxString& operator=(wxUniCharRef ch)
-    { return operator=((wxUniChar)ch); }
-  wxString& operator=(char ch)
-    { return operator=(wxUniChar(ch)); }
-  wxString& operator=(unsigned char ch)
-    { return operator=(wxUniChar(ch)); }
-  wxString& operator=(wchar_t ch)
-    { return operator=(wxUniChar(ch)); }
+  wxString& operator=(wxChar ch)
+    { return (wxString&)wxStringBase::operator=(ch); }
     // from a C string - STL probably will crash on NULL,
     // so we need to compensate in that case
-#if wxUSE_STL_BASED_WXSTRING
-  wxString& operator=(const char *psz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
+#if wxUSE_STL
+  wxString& operator=(const wxChar *psz)
+    { if(psz) wxStringBase::operator=(psz); else Clear(); return *this; }
+#else
+  wxString& operator=(const wxChar *psz)
+    { return (wxString&)wxStringBase::operator=(psz); }
+#endif
 
-      if ( psz )
-          m_impl = ImplStr(psz);
-      else
-          clear();
-
-      return *this;
-  }
-
-  wxString& operator=(const wchar_t *pwz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      if ( pwz )
-          m_impl = ImplStr(pwz);
-      else
-          clear();
-
-      return *this;
-  }
-#else // !wxUSE_STL_BASED_WXSTRING
-  wxString& operator=(const char *psz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl = ImplStr(psz);
-
-      return *this;
-  }
-
-  wxString& operator=(const wchar_t *pwz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl = ImplStr(pwz);
-
-      return *this;
-  }
-#endif // wxUSE_STL_BASED_WXSTRING/!wxUSE_STL_BASED_WXSTRING
-
-  wxString& operator=(const unsigned char *psz)
-    { return operator=((const char*)psz); }
-
-    // from wxScopedWCharBuffer
-  wxString& operator=(const wxScopedWCharBuffer& s)
-    { return assign(s); }
-    // from wxScopedCharBuffer
-  wxString& operator=(const wxScopedCharBuffer& s)
-    { return assign(s); }
+#if wxUSE_UNICODE
+    // from wxWCharBuffer
+  wxString& operator=(const wxWCharBuffer& psz)
+    { (void) operator=((const wchar_t *)psz); return *this; }
+#else // ANSI
+    // from another kind of C string
+  wxString& operator=(const unsigned char* psz);
+#if wxUSE_WCHAR_T
+    // from a wide string
+  wxString& operator=(const wchar_t *pwz);
+#endif
+    // from wxCharBuffer
+  wxString& operator=(const wxCharBuffer& psz)
+    { (void) operator=((const char *)psz); return *this; }
+#endif // Unicode/ANSI
 
   // string concatenation
     // in place concatenation
@@ -2024,8 +991,8 @@ public:
       // string += string
   wxString& operator<<(const wxString& s)
   {
-#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-    wxASSERT_MSG( s.IsValid(),
+#if !wxUSE_STL
+    wxASSERT_MSG( s.GetStringData()->IsValid(),
                   wxT("did you forget to call UngetWriteBuf()?") );
 #endif
 
@@ -2033,24 +1000,23 @@ public:
     return *this;
   }
       // string += C string
-  wxString& operator<<(const char *psz)
+  wxString& operator<<(const wxChar *psz)
     { append(psz); return *this; }
-  wxString& operator<<(const wchar_t *pwz)
-    { append(pwz); return *this; }
-  wxString& operator<<(const wxCStrData& psz)
-    { append(psz.AsString()); return *this; }
       // string += char
-  wxString& operator<<(wxUniChar ch) { append(1, ch); return *this; }
-  wxString& operator<<(wxUniCharRef ch) { append(1, ch); return *this; }
-  wxString& operator<<(char ch) { append(1, ch); return *this; }
-  wxString& operator<<(unsigned char ch) { append(1, ch); return *this; }
-  wxString& operator<<(wchar_t ch) { append(1, ch); return *this; }
+  wxString& operator<<(wxChar ch) { append(1, ch); return *this; }
 
       // string += buffer (i.e. from wxGetString)
-  wxString& operator<<(const wxScopedWCharBuffer& s)
-    { return append(s); }
-  wxString& operator<<(const wxScopedCharBuffer& s)
-    { return append(s); }
+#if wxUSE_UNICODE
+  wxString& operator<<(const wxWCharBuffer& s)
+    { (void)operator<<((const wchar_t *)s); return *this; }
+  void operator+=(const wxWCharBuffer& s)
+    { (void)operator<<((const wchar_t *)s); }
+#else // !wxUSE_UNICODE
+  wxString& operator<<(const wxCharBuffer& s)
+    { (void)operator<<((const char *)s); return *this; }
+  void operator+=(const wxCharBuffer& s)
+    { (void)operator<<((const char *)s); }
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
     // string += C string
   wxString& Append(const wxString& s)
@@ -2062,37 +1028,13 @@ public:
             append(s);
         return *this;
     }
-  wxString& Append(const char* psz)
+  wxString& Append(const wxChar* psz)
     { append(psz); return *this; }
-  wxString& Append(const wchar_t* pwz)
-    { append(pwz); return *this; }
-  wxString& Append(const wxCStrData& psz)
-    { append(psz); return *this; }
-  wxString& Append(const wxScopedCharBuffer& psz)
-    { append(psz); return *this; }
-  wxString& Append(const wxScopedWCharBuffer& psz)
-    { append(psz); return *this; }
-  wxString& Append(const char* psz, size_t nLen)
-    { append(psz, nLen); return *this; }
-  wxString& Append(const wchar_t* pwz, size_t nLen)
-    { append(pwz, nLen); return *this; }
-  wxString& Append(const wxCStrData& psz, size_t nLen)
-    { append(psz, nLen); return *this; }
-  wxString& Append(const wxScopedCharBuffer& psz, size_t nLen)
-    { append(psz, nLen); return *this; }
-  wxString& Append(const wxScopedWCharBuffer& psz, size_t nLen)
-    { append(psz, nLen); return *this; }
     // append count copies of given character
-  wxString& Append(wxUniChar ch, size_t count = 1u)
-    { append(count, ch); return *this; }
-  wxString& Append(wxUniCharRef ch, size_t count = 1u)
-    { append(count, ch); return *this; }
-  wxString& Append(char ch, size_t count = 1u)
-    { append(count, ch); return *this; }
-  wxString& Append(unsigned char ch, size_t count = 1u)
-    { append(count, ch); return *this; }
-  wxString& Append(wchar_t ch, size_t count = 1u)
+  wxString& Append(wxChar ch, size_t count = 1u)
     { append(count, ch); return *this; }
+  wxString& Append(const wxChar* psz, size_t nLen)
+    { append(psz, nLen); return *this; }
 
     // prepend a string, return the string itself
   wxString& Prepend(const wxString& str)
@@ -2103,18 +1045,14 @@ public:
   friend wxString WXDLLIMPEXP_BASE operator+(const wxString& string1,
                                              const wxString& string2);
       // string with a single char
-  friend wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxUniChar ch);
+  friend wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxChar ch);
       // char with a string
-  friend wxString WXDLLIMPEXP_BASE operator+(wxUniChar ch, const wxString& string);
+  friend wxString WXDLLIMPEXP_BASE operator+(wxChar ch, const wxString& string);
       // string with C string
   friend wxString WXDLLIMPEXP_BASE operator+(const wxString& string,
-                                             const char *psz);
-  friend wxString WXDLLIMPEXP_BASE operator+(const wxString& string,
-                                             const wchar_t *pwz);
+                                             const wxChar *psz);
       // C string with string
-  friend wxString WXDLLIMPEXP_BASE operator+(const char *psz,
-                                             const wxString& string);
-  friend wxString WXDLLIMPEXP_BASE operator+(const wchar_t *pwz,
+  friend wxString WXDLLIMPEXP_BASE operator+(const wxChar *psz,
                                              const wxString& string);
 
   // stream-like functions
@@ -2130,18 +1068,20 @@ public:
       // insert an unsigned long into string
   wxString& operator<<(unsigned long ul)
     { return (*this) << Format(wxT("%lu"), ul); }
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+#if defined wxLongLong_t && !defined wxLongLongIsLong
       // insert a long long if they exist and aren't longs
   wxString& operator<<(wxLongLong_t ll)
     {
-      return (*this) << Format("%" wxLongLongFmtSpec "d", ll);
+      const wxChar *fmt = wxT("%") wxLongLongFmtSpec wxT("d");
+      return (*this) << Format(fmt, ll);
     }
       // insert an unsigned long long
   wxString& operator<<(wxULongLong_t ull)
     {
-      return (*this) << Format("%" wxLongLongFmtSpec "u" , ull);
+      const wxChar *fmt = wxT("%") wxLongLongFmtSpec wxT("u");
+      return (*this) << Format(fmt , ull);
     }
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
+#endif
       // insert a float into string
   wxString& operator<<(float f)
     { return (*this) << Format(wxT("%f"), f); }
@@ -2151,56 +1091,21 @@ public:
 
   // string comparison
     // case-sensitive comparison (returns a value < 0, = 0 or > 0)
-  int Cmp(const char *psz) const
-    { return compare(psz); }
-  int Cmp(const wchar_t *pwz) const
-    { return compare(pwz); }
-  int Cmp(const wxString& s) const
-    { return compare(s); }
-  int Cmp(const wxCStrData& s) const
-    { return compare(s); }
-  int Cmp(const wxScopedCharBuffer& s) const
-    { return compare(s); }
-  int Cmp(const wxScopedWCharBuffer& s) const
-    { return compare(s); }
+  int Cmp(const wxChar *psz) const;
+  int Cmp(const wxString& s) const;
     // same as Cmp() but not case-sensitive
+  int CmpNoCase(const wxChar *psz) const;
   int CmpNoCase(const wxString& s) const;
-
     // test for the string equality, either considering case or not
     // (if compareWithCase then the case matters)
-  bool IsSameAs(const wxString& str, bool compareWithCase = true) const
-  {
-#if !wxUSE_UNICODE_UTF8
-      // in UTF-8 build, length() is O(n) and doing this would be _slower_
-      if ( length() != str.length() )
-          return false;
-#endif
-      return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0;
-  }
-  bool IsSameAs(const char *str, bool compareWithCase = true) const
-    { return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; }
-  bool IsSameAs(const wchar_t *str, bool compareWithCase = true) const
-    { return (compareWithCase ? Cmp(str) : CmpNoCase(str)) == 0; }
-
-  bool IsSameAs(const wxCStrData& str, bool compareWithCase = true) const
-    { return IsSameAs(str.AsString(), compareWithCase); }
-  bool IsSameAs(const wxScopedCharBuffer& str, bool compareWithCase = true) const
-    { return IsSameAs(str.data(), compareWithCase); }
-  bool IsSameAs(const wxScopedWCharBuffer& str, bool compareWithCase = true) const
-    { return IsSameAs(str.data(), compareWithCase); }
+  bool IsSameAs(const wxChar *psz, bool compareWithCase = true) const
+    { return (compareWithCase ? Cmp(psz) : CmpNoCase(psz)) == 0; }
     // comparison with a single character: returns true if equal
-  bool IsSameAs(wxUniChar c, bool compareWithCase = true) const;
-  // FIXME-UTF8: remove these overloads
-  bool IsSameAs(wxUniCharRef c, bool compareWithCase = true) const
-    { return IsSameAs(wxUniChar(c), compareWithCase); }
-  bool IsSameAs(char c, bool compareWithCase = true) const
-    { return IsSameAs(wxUniChar(c), compareWithCase); }
-  bool IsSameAs(unsigned char c, bool compareWithCase = true) const
-    { return IsSameAs(wxUniChar(c), compareWithCase); }
-  bool IsSameAs(wchar_t c, bool compareWithCase = true) const
-    { return IsSameAs(wxUniChar(c), compareWithCase); }
-  bool IsSameAs(int c, bool compareWithCase = true) const
-    { return IsSameAs(wxUniChar(c), compareWithCase); }
+  bool IsSameAs(wxChar c, bool compareWithCase = true) const
+    {
+      return (length() == 1) && (compareWithCase ? GetChar(0u) == c
+                              : wxToupper(GetChar(0u)) == wxToupper(c));
+    }
 
   // simple sub-string extraction
       // return substring starting at nFirst of length nCount (or till the end
@@ -2214,193 +1119,111 @@ public:
       // check if the string starts with the given prefix and return the rest
       // of the string in the provided pointer if it is not NULL; otherwise
       // return false
-  bool StartsWith(const wxString& prefix, wxString *rest = NULL) const;
+  bool StartsWith(const wxChar *prefix, wxString *rest = NULL) const;
       // check if the string ends with the given suffix and return the
       // beginning of the string before the suffix in the provided pointer if
       // it is not NULL; otherwise return false
-  bool EndsWith(const wxString& suffix, wxString *rest = NULL) const;
+  bool EndsWith(const wxChar *suffix, wxString *rest = NULL) const;
 
       // get first nCount characters
   wxString Left(size_t nCount) const;
       // get last nCount characters
   wxString Right(size_t nCount) const;
-      // get all characters before the first occurrence of ch
-      // (returns the whole string if ch not found) and also put everything
-      // following the first occurrence of ch into rest if it's non-NULL
-  wxString BeforeFirst(wxUniChar ch, wxString *rest = NULL) const;
-      // get all characters before the last occurrence of ch
-      // (returns empty string if ch not found) and also put everything
-      // following the last occurrence of ch into rest if it's non-NULL
-  wxString BeforeLast(wxUniChar ch, wxString *rest = NULL) const;
-      // get all characters after the first occurrence of ch
-      // (returns empty string if ch not found)
-  wxString AfterFirst(wxUniChar ch) const;
-      // get all characters after the last occurrence of ch
+      // get all characters before the first occurance of ch
       // (returns the whole string if ch not found)
-  wxString AfterLast(wxUniChar ch) const;
+  wxString BeforeFirst(wxChar ch) const;
+      // get all characters before the last occurence of ch
+      // (returns empty string if ch not found)
+  wxString BeforeLast(wxChar ch) const;
+      // get all characters after the first occurence of ch
+      // (returns empty string if ch not found)
+  wxString AfterFirst(wxChar ch) const;
+      // get all characters after the last occurence of ch
+      // (returns the whole string if ch not found)
+  wxString AfterLast(wxChar ch) const;
 
     // for compatibility only, use more explicitly named functions above
-  wxString Before(wxUniChar ch) const { return BeforeLast(ch); }
-  wxString After(wxUniChar ch) const { return AfterFirst(ch); }
+  wxString Before(wxChar ch) const { return BeforeLast(ch); }
+  wxString After(wxChar ch) const { return AfterFirst(ch); }
 
   // case conversion
       // convert to upper case in place, return the string itself
   wxString& MakeUpper();
       // convert to upper case, return the copy of the string
-  wxString Upper() const { return wxString(*this).MakeUpper(); }
+      // Here's something to remember: BC++ doesn't like returns in inlines.
+  wxString Upper() const ;
       // convert to lower case in place, return the string itself
   wxString& MakeLower();
       // convert to lower case, return the copy of the string
-  wxString Lower() const { return wxString(*this).MakeLower(); }
-      // convert the first character to the upper case and the rest to the
-      // lower one, return the modified string itself
-  wxString& MakeCapitalized();
-      // convert the first character to the upper case and the rest to the
-      // lower one, return the copy of the string
-  wxString Capitalize() const { return wxString(*this).MakeCapitalized(); }
+  wxString Lower() const ;
 
   // trimming/padding whitespace (either side) and truncating
       // remove spaces from left or from right (default) side
   wxString& Trim(bool bFromRight = true);
       // add nCount copies chPad in the beginning or at the end (default)
-  wxString& Pad(size_t nCount, wxUniChar chPad = wxT(' '), bool bFromRight = true);
+  wxString& Pad(size_t nCount, wxChar chPad = wxT(' '), bool bFromRight = true);
 
   // searching and replacing
       // searching (return starting index, or -1 if not found)
-  int Find(wxUniChar ch, bool bFromEnd = false) const;   // like strchr/strrchr
-  int Find(wxUniCharRef ch, bool bFromEnd = false) const
-    { return Find(wxUniChar(ch), bFromEnd); }
-  int Find(char ch, bool bFromEnd = false) const
-    { return Find(wxUniChar(ch), bFromEnd); }
-  int Find(unsigned char ch, bool bFromEnd = false) const
-    { return Find(wxUniChar(ch), bFromEnd); }
-  int Find(wchar_t ch, bool bFromEnd = false) const
-    { return Find(wxUniChar(ch), bFromEnd); }
+  int Find(wxChar ch, bool bFromEnd = false) const;   // like strchr/strrchr
       // searching (return starting index, or -1 if not found)
-  int Find(const wxString& sub) const               // like strstr
-  {
-    size_type idx = find(sub);
-    return (idx == npos) ? wxNOT_FOUND : (int)idx;
-  }
-  int Find(const char *sub) const               // like strstr
-  {
-    size_type idx = find(sub);
-    return (idx == npos) ? wxNOT_FOUND : (int)idx;
-  }
-  int Find(const wchar_t *sub) const               // like strstr
-  {
-    size_type idx = find(sub);
-    return (idx == npos) ? wxNOT_FOUND : (int)idx;
-  }
-
-  int Find(const wxCStrData& sub) const
-    { return Find(sub.AsString()); }
-  int Find(const wxScopedCharBuffer& sub) const
-    { return Find(sub.data()); }
-  int Find(const wxScopedWCharBuffer& sub) const
-    { return Find(sub.data()); }
-
-      // replace first (or all of bReplaceAll) occurrences of substring with
+  int Find(const wxChar *pszSub) const;               // like strstr
+      // replace first (or all of bReplaceAll) occurences of substring with
       // another string, returns the number of replacements made
-  size_t Replace(const wxString& strOld,
-                 const wxString& strNew,
+  size_t Replace(const wxChar *szOld,
+                 const wxChar *szNew,
                  bool bReplaceAll = true);
 
     // check if the string contents matches a mask containing '*' and '?'
-  bool Matches(const wxString& mask) const;
+  bool Matches(const wxChar *szMask) const;
 
-  // conversion to numbers: all functions return true only if the whole
-  // string is a number and put the value of this number into the pointer
-  // provided, the base is the numeric base in which the conversion should be
-  // done and must be comprised between 2 and 36 or be 0 in which case the
-  // standard C rules apply (leading '0' => octal, "0x" => hex)
-      // convert to a signed integer
-  bool ToLong(long *val, int base = 10) const;
-      // convert to an unsigned integer
-  bool ToULong(unsigned long *val, int base = 10) const;
-      // convert to wxLongLong
+    // conversion to numbers: all functions return true only if the whole
+    // string is a number and put the value of this number into the pointer
+    // provided, the base is the numeric base in which the conversion should be
+    // done and must be comprised between 2 and 36 or be 0 in which case the
+    // standard C rules apply (leading '0' => octal, "0x" => hex)
+        // convert to a signed integer
+    bool ToLong(long *val, int base = 10) const;
+        // convert to an unsigned integer
+    bool ToULong(unsigned long *val, int base = 10) const;
+        // convert to wxLongLong
 #if defined(wxLongLong_t)
-  bool ToLongLong(wxLongLong_t *val, int base = 10) const;
-      // convert to wxULongLong
-  bool ToULongLong(wxULongLong_t *val, int base = 10) const;
+    bool ToLongLong(wxLongLong_t *val, int base = 10) const;
+        // convert to wxULongLong
+    bool ToULongLong(wxULongLong_t *val, int base = 10) const;
 #endif // wxLongLong_t
-      // convert to a double
-  bool ToDouble(double *val) const;
+        // convert to a double
+    bool ToDouble(double *val) const;
 
-  // conversions to numbers using C locale
-      // convert to a signed integer
-  bool ToCLong(long *val, int base = 10) const;
-      // convert to an unsigned integer
-  bool ToCULong(unsigned long *val, int base = 10) const;
-      // convert to a double
-  bool ToCDouble(double *val) const;
 
-  // create a string representing the given floating point number with the
-  // default (like %g) or fixed (if precision >=0) precision
-    // in the current locale
-  static wxString FromDouble(double val, int precision = -1);
-    // in C locale
-  static wxString FromCDouble(double val, int precision = -1);
 
-#ifndef wxNEEDS_WXSTRING_PRINTF_MIXIN
   // formatted input/output
     // as sprintf(), returns the number of characters written or < 0 on error
     // (take 'this' into account in attribute parameter count)
-  // int Printf(const wxString& format, ...);
-  WX_DEFINE_VARARG_FUNC(int, Printf, 1, (const wxFormatString&),
-                        DoPrintfWchar, DoPrintfUtf8)
-#ifdef __WATCOMC__
-  // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-  WX_VARARG_WATCOM_WORKAROUND(int, Printf, 1, (const wxString&),
-                              (wxFormatString(f1)));
-  WX_VARARG_WATCOM_WORKAROUND(int, Printf, 1, (const wxCStrData&),
-                              (wxFormatString(f1)));
-  WX_VARARG_WATCOM_WORKAROUND(int, Printf, 1, (const char*),
-                              (wxFormatString(f1)));
-  WX_VARARG_WATCOM_WORKAROUND(int, Printf, 1, (const wchar_t*),
-                              (wxFormatString(f1)));
-#endif
-#endif // !wxNEEDS_WXSTRING_PRINTF_MIXIN
+  int Printf(const wxChar *pszFormat, ...) ATTRIBUTE_PRINTF_2;
     // as vprintf(), returns the number of characters written or < 0 on error
-  int PrintfV(const wxString& format, va_list argptr);
+  int PrintfV(const wxChar* pszFormat, va_list argptr);
 
-#ifndef wxNEEDS_WXSTRING_PRINTF_MIXIN
     // returns the string containing the result of Printf() to it
-  // static wxString Format(const wxString& format, ...) WX_ATTRIBUTE_PRINTF_1;
-  WX_DEFINE_VARARG_FUNC(static wxString, Format, 1, (const wxFormatString&),
-                        DoFormatWchar, DoFormatUtf8)
-#ifdef __WATCOMC__
-  // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-  WX_VARARG_WATCOM_WORKAROUND(static wxString, Format, 1, (const wxString&),
-                              (wxFormatString(f1)));
-  WX_VARARG_WATCOM_WORKAROUND(static wxString, Format, 1, (const wxCStrData&),
-                              (wxFormatString(f1)));
-  WX_VARARG_WATCOM_WORKAROUND(static wxString, Format, 1, (const char*),
-                              (wxFormatString(f1)));
-  WX_VARARG_WATCOM_WORKAROUND(static wxString, Format, 1, (const wchar_t*),
-                              (wxFormatString(f1)));
-#endif
-#endif
+  static wxString Format(const wxChar *pszFormat, ...) ATTRIBUTE_PRINTF_1;
     // the same as above, but takes a va_list
-  static wxString FormatV(const wxString& format, va_list argptr);
+  static wxString FormatV(const wxChar *pszFormat, va_list argptr);
 
   // raw access to string memory
     // ensure that string has space for at least nLen characters
     // only works if the data of this string is not shared
-  bool Alloc(size_t nLen) { reserve(nLen); return capacity() >= nLen; }
+  bool Alloc(size_t nLen) { reserve(nLen); /*return capacity() >= nLen;*/ return true; }
     // minimize the string's memory
     // only works if the data of this string is not shared
   bool Shrink();
-#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-    // These are deprecated, use wxStringBuffer or wxStringBufferLength instead
-    //
+#if !wxUSE_STL
     // get writable buffer of at least nLen bytes. Unget() *must* be called
     // a.s.a.p. to put string back in a reasonable state!
-  wxDEPRECATED( wxStringCharType *GetWriteBuf(size_t nLen) );
+  wxChar *GetWriteBuf(size_t nLen);
     // call this immediately after GetWriteBuf() has been used
-  wxDEPRECATED( void UngetWriteBuf() );
-  wxDEPRECATED( void UngetWriteBuf(size_t nLen) );
-#endif // WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && wxUSE_UNICODE_UTF8
+  void UngetWriteBuf();
+  void UngetWriteBuf(size_t nLen);
+#endif
 
   // wxWidgets version 1 compatibility functions
 
@@ -2412,33 +1235,18 @@ public:
     // values for first parameter of Strip function
   enum stripType {leading = 0x1, trailing = 0x2, both = 0x3};
 
-#ifndef wxNEEDS_WXSTRING_PRINTF_MIXIN
   // use Printf()
   // (take 'this' into account in attribute parameter count)
-  // int sprintf(const wxString& format, ...) WX_ATTRIBUTE_PRINTF_2;
-  WX_DEFINE_VARARG_FUNC(int, sprintf, 1, (const wxFormatString&),
-                        DoPrintfWchar, DoPrintfUtf8)
-#ifdef __WATCOMC__
-  // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-  WX_VARARG_WATCOM_WORKAROUND(int, sprintf, 1, (const wxString&),
-                              (wxFormatString(f1)));
-  WX_VARARG_WATCOM_WORKAROUND(int, sprintf, 1, (const wxCStrData&),
-                              (wxFormatString(f1)));
-  WX_VARARG_WATCOM_WORKAROUND(int, sprintf, 1, (const char*),
-                              (wxFormatString(f1)));
-  WX_VARARG_WATCOM_WORKAROUND(int, sprintf, 1, (const wchar_t*),
-                              (wxFormatString(f1)));
-#endif
-#endif // wxNEEDS_WXSTRING_PRINTF_MIXIN
+  int sprintf(const wxChar *pszFormat, ...) ATTRIBUTE_PRINTF_2;
 
     // use Cmp()
-  int CompareTo(const wxChar* psz, caseCompare cmp = exact) const
+  inline int CompareTo(const wxChar* psz, caseCompare cmp = exact) const
     { return cmp == exact ? Cmp(psz) : CmpNoCase(psz); }
 
-    // use length()
+    // use Len
   size_t Length() const { return length(); }
     // Count the number of characters
-  int Freq(wxUniChar ch) const;
+  int Freq(wxChar ch) const;
     // use MakeLower
   void LowerCase() { MakeLower(); }
     // use MakeUpper
@@ -2448,7 +1256,7 @@ public:
 
     // use Find (more general variants not yet supported)
   size_t Index(const wxChar* psz) const { return Find(psz); }
-  size_t Index(wxUniChar ch)         const { return Find(ch);  }
+  size_t Index(wxChar ch)         const { return Find(ch);  }
     // use Truncate
   wxString& Remove(size_t pos) { return Truncate(pos); }
   wxString& RemoveLast(size_t n = 1) { return Truncate(length() - n); }
@@ -2457,13 +1265,10 @@ public:
       { return (wxString&)erase( nStart, nLen ); }
 
     // use Find()
-  int First( wxUniChar ch ) const { return Find(ch); }
-  int First( wxUniCharRef ch ) const { return Find(ch); }
-  int First( char ch ) const { return Find(ch); }
-  int First( unsigned char ch ) const { return Find(ch); }
-  int First( wchar_t ch ) const { return Find(ch); }
-  int First( const wxString& str ) const { return Find(str); }
-  int Last( wxUniChar ch ) const { return Find(ch, true); }
+  int First( const wxChar ch ) const { return Find(ch); }
+  int First( const wxChar* psz ) const { return Find(psz); }
+  int First( const wxString &str ) const { return Find(str); }
+  int Last( const wxChar ch ) const { return Find(ch, true); }
   bool Contains(const wxString& str) const { return Find(str) != wxNOT_FOUND; }
 
     // use empty()
@@ -2473,1899 +1278,376 @@ public:
 
     // take nLen chars starting at nPos
   wxString(const wxString& str, size_t nPos, size_t nLen)
-      { assign(str, nPos, nLen); }
-    // take all characters from first to last
+      : wxStringBase(str, nPos, nLen) { }
+    // take all characters from pStart to pEnd
+  wxString(const void *pStart, const void *pEnd)
+      : wxStringBase((const wxChar*)pStart, (const wxChar*)pEnd) { }
+#if wxUSE_STL
   wxString(const_iterator first, const_iterator last)
-      : m_impl(first.impl(), last.impl()) { }
-#if WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
-    // the 2 overloads below are for compatibility with the existing code using
-    // pointers instead of iterators
-  wxString(const char *first, const char *last)
-  {
-      SubstrBufFromMB str(ImplStr(first, last - first));
-      m_impl.assign(str.data, str.len);
-  }
-  wxString(const wchar_t *first, const wchar_t *last)
-  {
-      SubstrBufFromWC str(ImplStr(first, last - first));
-      m_impl.assign(str.data, str.len);
-  }
-    // and this one is needed to compile code adding offsets to c_str() result
-  wxString(const wxCStrData& first, const wxCStrData& last)
-      : m_impl(CreateConstIterator(first).impl(),
-               CreateConstIterator(last).impl())
-  {
-      wxASSERT_MSG( first.m_str == last.m_str,
-                    wxT("pointers must be into the same string") );
-  }
-#endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
+      : wxStringBase(first, last) { }
+#endif
 
   // lib.string.modifiers
     // append elements str[pos], ..., str[pos+n]
   wxString& append(const wxString& str, size_t pos, size_t n)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(n);
-
-      size_t from, len;
-      str.PosLenToImpl(pos, n, &from, &len);
-      m_impl.append(str.m_impl, from, len);
-      return *this;
-  }
+    { return (wxString&)wxStringBase::append(str, pos, n); }
     // append a string
   wxString& append(const wxString& str)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(str.length());
-
-      m_impl.append(str.m_impl);
-      return *this;
-  }
-
+    { return (wxString&)wxStringBase::append(str); }
     // append first n (or all if n == npos) characters of sz
-  wxString& append(const char *sz)
-  {
-      wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-      m_impl.append(ImplStr(sz));
-      return *this;
-  }
-
-  wxString& append(const wchar_t *sz)
-  {
-      wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-      m_impl.append(ImplStr(sz));
-      return *this;
-  }
-
-  wxString& append(const char *sz, size_t n)
-  {
-      wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-      SubstrBufFromMB str(ImplStr(sz, n));
-      m_impl.append(str.data, str.len);
-      return *this;
-  }
-  wxString& append(const wchar_t *sz, size_t n)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(n);
-
-      SubstrBufFromWC str(ImplStr(sz, n));
-      m_impl.append(str.data, str.len);
-      return *this;
-  }
-
-  wxString& append(const wxCStrData& str)
-    { return append(str.AsString()); }
-  wxString& append(const wxScopedCharBuffer& str)
-    { return append(str.data(), str.length()); }
-  wxString& append(const wxScopedWCharBuffer& str)
-    { return append(str.data(), str.length()); }
-  wxString& append(const wxCStrData& str, size_t n)
-    { return append(str.AsString(), 0, n); }
-  wxString& append(const wxScopedCharBuffer& str, size_t n)
-    { return append(str.data(), n); }
-  wxString& append(const wxScopedWCharBuffer& str, size_t n)
-    { return append(str.data(), n); }
-
+  wxString& append(const wxChar *sz)
+    { return (wxString&)wxStringBase::append(sz); }
+  wxString& append(const wxChar *sz, size_t n)
+    { return (wxString&)wxStringBase::append(sz, n); }
     // append n copies of ch
-  wxString& append(size_t n, wxUniChar ch)
-  {
-#if wxUSE_UNICODE_UTF8
-      if ( !ch.IsAscii() )
-      {
-          wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-          m_impl.append(wxStringOperations::EncodeNChars(n, ch));
-      }
-      else // ASCII
-#endif
-      {
-          wxSTRING_UPDATE_CACHED_LENGTH(n);
-
-          m_impl.append(n, (wxStringCharType)ch);
-      }
-
-      return *this;
-  }
-
-  wxString& append(size_t n, wxUniCharRef ch)
-    { return append(n, wxUniChar(ch)); }
-  wxString& append(size_t n, char ch)
-    { return append(n, wxUniChar(ch)); }
-  wxString& append(size_t n, unsigned char ch)
-    { return append(n, wxUniChar(ch)); }
-  wxString& append(size_t n, wchar_t ch)
-    { return append(n, wxUniChar(ch)); }
-
+  wxString& append(size_t n, wxChar ch)
+    { return (wxString&)wxStringBase::append(n, ch); }
     // append from first to last
   wxString& append(const_iterator first, const_iterator last)
-  {
-      wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-      m_impl.append(first.impl(), last.impl());
-      return *this;
-  }
-#if WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
-  wxString& append(const char *first, const char *last)
-    { return append(first, last - first); }
-  wxString& append(const wchar_t *first, const wchar_t *last)
-    { return append(first, last - first); }
-  wxString& append(const wxCStrData& first, const wxCStrData& last)
-    { return append(CreateConstIterator(first), CreateConstIterator(last)); }
-#endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
+    { return (wxString&)wxStringBase::append(first, last); }
 
     // same as `this_string = str'
   wxString& assign(const wxString& str)
-  {
-      wxSTRING_SET_CACHED_LENGTH(str.length());
-
-      m_impl = str.m_impl;
-
-      return *this;
-  }
-
-    // This is a non-standard-compliant overload taking the first "len"
-    // characters of the source string.
-  wxString& assign(const wxString& str, size_t len)
-  {
-#if wxUSE_STRING_POS_CACHE
-      // It is legal to pass len > str.length() to wxStringImpl::assign() but
-      // by restricting it here we save some work for that function so it's not
-      // really less efficient and, at the same time, ensure that we don't
-      // cache invalid length.
-      const size_t lenSrc = str.length();
-      if ( len > lenSrc )
-          len = lenSrc;
-
-      wxSTRING_SET_CACHED_LENGTH(len);
-#endif // wxUSE_STRING_POS_CACHE
-
-      m_impl.assign(str.m_impl, 0, str.LenToImpl(len));
-
-      return *this;
-  }
-
+    { return (wxString&)wxStringBase::assign(str); }
     // same as ` = str[pos..pos + n]
   wxString& assign(const wxString& str, size_t pos, size_t n)
-  {
-      size_t from, len;
-      str.PosLenToImpl(pos, n, &from, &len);
-      m_impl.assign(str.m_impl, from, len);
-
-      // it's important to call this after PosLenToImpl() above in case str is
-      // the same string as this one
-      wxSTRING_SET_CACHED_LENGTH(n);
-
-      return *this;
-  }
-
+    { return (wxString&)wxStringBase::assign(str, pos, n); }
     // same as `= first n (or all if n == npos) characters of sz'
-  wxString& assign(const char *sz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.assign(ImplStr(sz));
-
-      return *this;
-  }
-
-  wxString& assign(const wchar_t *sz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.assign(ImplStr(sz));
-
-      return *this;
-  }
-
-  wxString& assign(const char *sz, size_t n)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      SubstrBufFromMB str(ImplStr(sz, n));
-      m_impl.assign(str.data, str.len);
-
-      return *this;
-  }
-
-  wxString& assign(const wchar_t *sz, size_t n)
-  {
-      wxSTRING_SET_CACHED_LENGTH(n);
-
-      SubstrBufFromWC str(ImplStr(sz, n));
-      m_impl.assign(str.data, str.len);
-
-      return *this;
-  }
-
-  wxString& assign(const wxCStrData& str)
-    { return assign(str.AsString()); }
-  wxString& assign(const wxScopedCharBuffer& str)
-    { return assign(str.data(), str.length()); }
-  wxString& assign(const wxScopedWCharBuffer& str)
-    { return assign(str.data(), str.length()); }
-  wxString& assign(const wxCStrData& str, size_t len)
-    { return assign(str.AsString(), len); }
-  wxString& assign(const wxScopedCharBuffer& str, size_t len)
-    { return assign(str.data(), len); }
-  wxString& assign(const wxScopedWCharBuffer& str, size_t len)
-    { return assign(str.data(), len); }
-
+  wxString& assign(const wxChar *sz)
+    { return (wxString&)wxStringBase::assign(sz); }
+  wxString& assign(const wxChar *sz, size_t n)
+    { return (wxString&)wxStringBase::assign(sz, n); }
     // same as `= n copies of ch'
-  wxString& assign(size_t n, wxUniChar ch)
-  {
-      wxSTRING_SET_CACHED_LENGTH(n);
-
-#if wxUSE_UNICODE_UTF8
-      if ( !ch.IsAscii() )
-          m_impl.assign(wxStringOperations::EncodeNChars(n, ch));
-      else
-#endif
-          m_impl.assign(n, (wxStringCharType)ch);
-
-      return *this;
-  }
-
-  wxString& assign(size_t n, wxUniCharRef ch)
-    { return assign(n, wxUniChar(ch)); }
-  wxString& assign(size_t n, char ch)
-    { return assign(n, wxUniChar(ch)); }
-  wxString& assign(size_t n, unsigned char ch)
-    { return assign(n, wxUniChar(ch)); }
-  wxString& assign(size_t n, wchar_t ch)
-    { return assign(n, wxUniChar(ch)); }
-
+  wxString& assign(size_t n, wxChar ch)
+    { return (wxString&)wxStringBase::assign(n, ch); }
     // assign from first to last
   wxString& assign(const_iterator first, const_iterator last)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.assign(first.impl(), last.impl());
-
-      return *this;
-  }
-#if WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
-  wxString& assign(const char *first, const char *last)
-    { return assign(first, last - first); }
-  wxString& assign(const wchar_t *first, const wchar_t *last)
-    { return assign(first, last - first); }
-  wxString& assign(const wxCStrData& first, const wxCStrData& last)
-    { return assign(CreateConstIterator(first), CreateConstIterator(last)); }
-#endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
+    { return (wxString&)wxStringBase::assign(first, last); }
 
     // string comparison
-  int compare(const wxString& str) const;
-  int compare(const char* sz) const;
-  int compare(const wchar_t* sz) const;
-  int compare(const wxCStrData& str) const
-    { return compare(str.AsString()); }
-  int compare(const wxScopedCharBuffer& str) const
-    { return compare(str.data()); }
-  int compare(const wxScopedWCharBuffer& str) const
-    { return compare(str.data()); }
+#if !defined(HAVE_STD_STRING_COMPARE)
+  int compare(const wxStringBase& str) const;
     // comparison with a substring
-  int compare(size_t nStart, size_t nLen, const wxString& str) const;
+  int compare(size_t nStart, size_t nLen, const wxStringBase& str) const;
     // comparison of 2 substrings
   int compare(size_t nStart, size_t nLen,
-              const wxString& str, size_t nStart2, size_t nLen2) const;
+              const wxStringBase& str, size_t nStart2, size_t nLen2) const;
+    // just like strcmp()
+  int compare(const wxChar* sz) const;
     // substring comparison with first nCount characters of sz
   int compare(size_t nStart, size_t nLen,
-              const char* sz, size_t nCount = npos) const;
-  int compare(size_t nStart, size_t nLen,
-              const wchar_t* sz, size_t nCount = npos) const;
+              const wxChar* sz, size_t nCount = npos) const;
+#endif // !defined HAVE_STD_STRING_COMPARE
 
     // insert another string
   wxString& insert(size_t nPos, const wxString& str)
-    { insert(GetIterForNthChar(nPos), str.begin(), str.end()); return *this; }
+    { return (wxString&)wxStringBase::insert(nPos, str); }
     // insert n chars of str starting at nStart (in str)
   wxString& insert(size_t nPos, const wxString& str, size_t nStart, size_t n)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(n);
-
-      size_t from, len;
-      str.PosLenToImpl(nStart, n, &from, &len);
-      m_impl.insert(PosToImpl(nPos), str.m_impl, from, len);
-
-      return *this;
-  }
-
+    { return (wxString&)wxStringBase::insert(nPos, str, nStart, n); }
     // insert first n (or all if n == npos) characters of sz
-  wxString& insert(size_t nPos, const char *sz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.insert(PosToImpl(nPos), ImplStr(sz));
-
-      return *this;
-  }
-
-  wxString& insert(size_t nPos, const wchar_t *sz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.insert(PosToImpl(nPos), ImplStr(sz)); return *this;
-  }
-
-  wxString& insert(size_t nPos, const char *sz, size_t n)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(n);
-
-      SubstrBufFromMB str(ImplStr(sz, n));
-      m_impl.insert(PosToImpl(nPos), str.data, str.len);
-
-      return *this;
-  }
-
-  wxString& insert(size_t nPos, const wchar_t *sz, size_t n)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(n);
-
-      SubstrBufFromWC str(ImplStr(sz, n));
-      m_impl.insert(PosToImpl(nPos), str.data, str.len);
-
-      return *this;
-  }
-
+  wxString& insert(size_t nPos, const wxChar *sz)
+    { return (wxString&)wxStringBase::insert(nPos, sz); }
+  wxString& insert(size_t nPos, const wxChar *sz, size_t n)
+    { return (wxString&)wxStringBase::insert(nPos, sz, n); }
     // insert n copies of ch
-  wxString& insert(size_t nPos, size_t n, wxUniChar ch)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(n);
-
-#if wxUSE_UNICODE_UTF8
-      if ( !ch.IsAscii() )
-          m_impl.insert(PosToImpl(nPos), wxStringOperations::EncodeNChars(n, ch));
-      else
-#endif
-          m_impl.insert(PosToImpl(nPos), n, (wxStringCharType)ch);
-      return *this;
-  }
-
-  iterator insert(iterator it, wxUniChar ch)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(1);
-
-#if wxUSE_UNICODE_UTF8
-      if ( !ch.IsAscii() )
-      {
-          size_t pos = IterToImplPos(it);
-          m_impl.insert(pos, wxStringOperations::EncodeChar(ch));
-          return iterator(this, m_impl.begin() + pos);
-      }
-      else
-#endif
-          return iterator(this, m_impl.insert(it.impl(), (wxStringCharType)ch));
-  }
-
+  wxString& insert(size_t nPos, size_t n, wxChar ch)
+    { return (wxString&)wxStringBase::insert(nPos, n, ch); }
+  iterator insert(iterator it, wxChar ch)
+    { return wxStringBase::insert(it, ch); }
   void insert(iterator it, const_iterator first, const_iterator last)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.insert(it.impl(), first.impl(), last.impl());
-  }
-
-#if WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
-  void insert(iterator it, const char *first, const char *last)
-    { insert(it - begin(), first, last - first); }
-  void insert(iterator it, const wchar_t *first, const wchar_t *last)
-    { insert(it - begin(), first, last - first); }
-  void insert(iterator it, const wxCStrData& first, const wxCStrData& last)
-    { insert(it, CreateConstIterator(first), CreateConstIterator(last)); }
-#endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
-
-  void insert(iterator it, size_type n, wxUniChar ch)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(n);
-
-#if wxUSE_UNICODE_UTF8
-      if ( !ch.IsAscii() )
-          m_impl.insert(IterToImplPos(it), wxStringOperations::EncodeNChars(n, ch));
-      else
-#endif
-          m_impl.insert(it.impl(), n, (wxStringCharType)ch);
-  }
+    { wxStringBase::insert(it, first, last); }
+  void insert(iterator it, size_type n, wxChar ch)
+    { wxStringBase::insert(it, n, ch); }
 
     // delete characters from nStart to nStart + nLen
   wxString& erase(size_type pos = 0, size_type n = npos)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      size_t from, len;
-      PosLenToImpl(pos, n, &from, &len);
-      m_impl.erase(from, len);
-
-      return *this;
-  }
-
-    // delete characters from first up to last
+    { return (wxString&)wxStringBase::erase(pos, n); }
   iterator erase(iterator first, iterator last)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      return iterator(this, m_impl.erase(first.impl(), last.impl()));
-  }
-
+    { return wxStringBase::erase(first, last); }
   iterator erase(iterator first)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(-1);
-
-      return iterator(this, m_impl.erase(first.impl()));
-  }
+    { return wxStringBase::erase(first); }
 
 #ifdef wxSTRING_BASE_HASNT_CLEAR
   void clear() { erase(); }
-#else
-  void clear()
-  {
-      wxSTRING_SET_CACHED_LENGTH(0);
-
-      m_impl.clear();
-  }
 #endif
 
     // replaces the substring of length nLen starting at nStart
-  wxString& replace(size_t nStart, size_t nLen, const char* sz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      size_t from, len;
-      PosLenToImpl(nStart, nLen, &from, &len);
-      m_impl.replace(from, len, ImplStr(sz));
-
-      return *this;
-  }
-
-  wxString& replace(size_t nStart, size_t nLen, const wchar_t* sz)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      size_t from, len;
-      PosLenToImpl(nStart, nLen, &from, &len);
-      m_impl.replace(from, len, ImplStr(sz));
-
-      return *this;
-  }
-
+  wxString& replace(size_t nStart, size_t nLen, const wxChar* sz)
+    { return (wxString&)wxStringBase::replace(nStart, nLen, sz); }
     // replaces the substring of length nLen starting at nStart
   wxString& replace(size_t nStart, size_t nLen, const wxString& str)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      size_t from, len;
-      PosLenToImpl(nStart, nLen, &from, &len);
-      m_impl.replace(from, len, str.m_impl);
-
-      return *this;
-  }
-
+    { return (wxString&)wxStringBase::replace(nStart, nLen, str); }
     // replaces the substring with nCount copies of ch
-  wxString& replace(size_t nStart, size_t nLen, size_t nCount, wxUniChar ch)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      size_t from, len;
-      PosLenToImpl(nStart, nLen, &from, &len);
-#if wxUSE_UNICODE_UTF8
-      if ( !ch.IsAscii() )
-          m_impl.replace(from, len, wxStringOperations::EncodeNChars(nCount, ch));
-      else
-#endif
-          m_impl.replace(from, len, nCount, (wxStringCharType)ch);
-
-      return *this;
-  }
-
+  wxString& replace(size_t nStart, size_t nLen, size_t nCount, wxChar ch)
+    { return (wxString&)wxStringBase::replace(nStart, nLen, nCount, ch); }
     // replaces a substring with another substring
   wxString& replace(size_t nStart, size_t nLen,
                     const wxString& str, size_t nStart2, size_t nLen2)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      size_t from, len;
-      PosLenToImpl(nStart, nLen, &from, &len);
-
-      size_t from2, len2;
-      str.PosLenToImpl(nStart2, nLen2, &from2, &len2);
-
-      m_impl.replace(from, len, str.m_impl, from2, len2);
-
-      return *this;
-  }
-
+    { return (wxString&)wxStringBase::replace(nStart, nLen, str,
+                                              nStart2, nLen2); }
      // replaces the substring with first nCount chars of sz
   wxString& replace(size_t nStart, size_t nLen,
-                    const char* sz, size_t nCount)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      size_t from, len;
-      PosLenToImpl(nStart, nLen, &from, &len);
-
-      SubstrBufFromMB str(ImplStr(sz, nCount));
-
-      m_impl.replace(from, len, str.data, str.len);
-
-      return *this;
-  }
-
-  wxString& replace(size_t nStart, size_t nLen,
-                    const wchar_t* sz, size_t nCount)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      size_t from, len;
-      PosLenToImpl(nStart, nLen, &from, &len);
-
-      SubstrBufFromWC str(ImplStr(sz, nCount));
-
-      m_impl.replace(from, len, str.data, str.len);
-
-      return *this;
-  }
-
-  wxString& replace(size_t nStart, size_t nLen,
-                    const wxString& s, size_t nCount)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      size_t from, len;
-      PosLenToImpl(nStart, nLen, &from, &len);
-      m_impl.replace(from, len, s.m_impl.c_str(), s.LenToImpl(nCount));
-
-      return *this;
-  }
-
-  wxString& replace(iterator first, iterator last, const char* s)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.replace(first.impl(), last.impl(), ImplStr(s));
-
-      return *this;
-  }
-
-  wxString& replace(iterator first, iterator last, const wchar_t* s)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.replace(first.impl(), last.impl(), ImplStr(s));
-
-      return *this;
-  }
-
-  wxString& replace(iterator first, iterator last, const char* s, size_type n)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      SubstrBufFromMB str(ImplStr(s, n));
-      m_impl.replace(first.impl(), last.impl(), str.data, str.len);
-
-      return *this;
-  }
-
-  wxString& replace(iterator first, iterator last, const wchar_t* s, size_type n)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      SubstrBufFromWC str(ImplStr(s, n));
-      m_impl.replace(first.impl(), last.impl(), str.data, str.len);
-
-      return *this;
-  }
-
+                    const wxChar* sz, size_t nCount)
+    { return (wxString&)wxStringBase::replace(nStart, nLen, sz, nCount); }
+  wxString& replace(iterator first, iterator last, const_pointer s)
+    { return (wxString&)wxStringBase::replace(first, last, s); }
+  wxString& replace(iterator first, iterator last, const_pointer s,
+                    size_type n)
+    { return (wxString&)wxStringBase::replace(first, last, s, n); }
   wxString& replace(iterator first, iterator last, const wxString& s)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.replace(first.impl(), last.impl(), s.m_impl);
-
-      return *this;
-  }
-
-  wxString& replace(iterator first, iterator last, size_type n, wxUniChar ch)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-#if wxUSE_UNICODE_UTF8
-      if ( !ch.IsAscii() )
-          m_impl.replace(first.impl(), last.impl(),
-                  wxStringOperations::EncodeNChars(n, ch));
-      else
-#endif
-          m_impl.replace(first.impl(), last.impl(), n, (wxStringCharType)ch);
-
-      return *this;
-  }
-
+    { return (wxString&)wxStringBase::replace(first, last, s); }
+  wxString& replace(iterator first, iterator last, size_type n, wxChar c)
+    { return (wxString&)wxStringBase::replace(first, last, n, c); }
   wxString& replace(iterator first, iterator last,
                     const_iterator first1, const_iterator last1)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.replace(first.impl(), last.impl(), first1.impl(), last1.impl());
-
-      return *this;
-  }
-
-  wxString& replace(iterator first, iterator last,
-                    const char *first1, const char *last1)
-    { replace(first, last, first1, last1 - first1); return *this; }
-  wxString& replace(iterator first, iterator last,
-                    const wchar_t *first1, const wchar_t *last1)
-    { replace(first, last, first1, last1 - first1); return *this; }
-
-  // swap two strings
-  void swap(wxString& str)
-  {
-#if wxUSE_STRING_POS_CACHE
-      // we modify not only this string but also the other one directly so we
-      // need to invalidate cache for both of them (we could also try to
-      // exchange their cache entries but it seems unlikely to be worth it)
-      InvalidateCache();
-      str.InvalidateCache();
-#endif // wxUSE_STRING_POS_CACHE
-
-      m_impl.swap(str.m_impl);
-  }
-
-    // find a substring
-  size_t find(const wxString& str, size_t nStart = 0) const
-    { return PosFromImpl(m_impl.find(str.m_impl, PosToImpl(nStart))); }
-
-    // find first n characters of sz
-  size_t find(const char* sz, size_t nStart = 0, size_t n = npos) const
-  {
-      SubstrBufFromMB str(ImplStr(sz, n));
-      return PosFromImpl(m_impl.find(str.data, PosToImpl(nStart), str.len));
-  }
-  size_t find(const wchar_t* sz, size_t nStart = 0, size_t n = npos) const
-  {
-      SubstrBufFromWC str(ImplStr(sz, n));
-      return PosFromImpl(m_impl.find(str.data, PosToImpl(nStart), str.len));
-  }
-  size_t find(const wxScopedCharBuffer& s, size_t nStart = 0, size_t n = npos) const
-    { return find(s.data(), nStart, n); }
-  size_t find(const wxScopedWCharBuffer& s, size_t nStart = 0, size_t n = npos) const
-    { return find(s.data(), nStart, n); }
-  size_t find(const wxCStrData& s, size_t nStart = 0, size_t n = npos) const
-    { return find(s.AsWChar(), nStart, n); }
-
-    // find the first occurrence of character ch after nStart
-  size_t find(wxUniChar ch, size_t nStart = 0) const
-  {
-#if wxUSE_UNICODE_UTF8
-    if ( !ch.IsAscii() )
-        return PosFromImpl(m_impl.find(wxStringOperations::EncodeChar(ch),
-                                       PosToImpl(nStart)));
-    else
-#endif
-        return PosFromImpl(m_impl.find((wxStringCharType)ch,
-                                       PosToImpl(nStart)));
-
-  }
-  size_t find(wxUniCharRef ch, size_t nStart = 0) const
-    {  return find(wxUniChar(ch), nStart); }
-  size_t find(char ch, size_t nStart = 0) const
-    {  return find(wxUniChar(ch), nStart); }
-  size_t find(unsigned char ch, size_t nStart = 0) const
-    {  return find(wxUniChar(ch), nStart); }
-  size_t find(wchar_t ch, size_t nStart = 0) const
-    {  return find(wxUniChar(ch), nStart); }
-
-    // rfind() family is exactly like find() but works right to left
-
-    // as find, but from the end
-  size_t rfind(const wxString& str, size_t nStart = npos) const
-    { return PosFromImpl(m_impl.rfind(str.m_impl, PosToImpl(nStart))); }
-
-    // as find, but from the end
-  size_t rfind(const char* sz, size_t nStart = npos, size_t n = npos) const
-  {
-      SubstrBufFromMB str(ImplStr(sz, n));
-      return PosFromImpl(m_impl.rfind(str.data, PosToImpl(nStart), str.len));
-  }
-  size_t rfind(const wchar_t* sz, size_t nStart = npos, size_t n = npos) const
-  {
-      SubstrBufFromWC str(ImplStr(sz, n));
-      return PosFromImpl(m_impl.rfind(str.data, PosToImpl(nStart), str.len));
-  }
-  size_t rfind(const wxScopedCharBuffer& s, size_t nStart = npos, size_t n = npos) const
-    { return rfind(s.data(), nStart, n); }
-  size_t rfind(const wxScopedWCharBuffer& s, size_t nStart = npos, size_t n = npos) const
-    { return rfind(s.data(), nStart, n); }
-  size_t rfind(const wxCStrData& s, size_t nStart = npos, size_t n = npos) const
-    { return rfind(s.AsWChar(), nStart, n); }
-    // as find, but from the end
-  size_t rfind(wxUniChar ch, size_t nStart = npos) const
-  {
-#if wxUSE_UNICODE_UTF8
-    if ( !ch.IsAscii() )
-        return PosFromImpl(m_impl.rfind(wxStringOperations::EncodeChar(ch),
-                                        PosToImpl(nStart)));
-    else
-#endif
-        return PosFromImpl(m_impl.rfind((wxStringCharType)ch,
-                                        PosToImpl(nStart)));
-  }
-  size_t rfind(wxUniCharRef ch, size_t nStart = npos) const
-    {  return rfind(wxUniChar(ch), nStart); }
-  size_t rfind(char ch, size_t nStart = npos) const
-    {  return rfind(wxUniChar(ch), nStart); }
-  size_t rfind(unsigned char ch, size_t nStart = npos) const
-    {  return rfind(wxUniChar(ch), nStart); }
-  size_t rfind(wchar_t ch, size_t nStart = npos) const
-    {  return rfind(wxUniChar(ch), nStart); }
-
-  // find first/last occurrence of any character (not) in the set:
-#if wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-  // FIXME-UTF8: this is not entirely correct, because it doesn't work if
-  //             sizeof(wchar_t)==2 and surrogates are present in the string;
-  //             should we care? Probably not.
-  size_t find_first_of(const wxString& str, size_t nStart = 0) const
-    { return m_impl.find_first_of(str.m_impl, nStart); }
-  size_t find_first_of(const char* sz, size_t nStart = 0) const
-    { return m_impl.find_first_of(ImplStr(sz), nStart); }
-  size_t find_first_of(const wchar_t* sz, size_t nStart = 0) const
-    { return m_impl.find_first_of(ImplStr(sz), nStart); }
-  size_t find_first_of(const char* sz, size_t nStart, size_t n) const
-    { return m_impl.find_first_of(ImplStr(sz), nStart, n); }
-  size_t find_first_of(const wchar_t* sz, size_t nStart, size_t n) const
-    { return m_impl.find_first_of(ImplStr(sz), nStart, n); }
-  size_t find_first_of(wxUniChar c, size_t nStart = 0) const
-    { return m_impl.find_first_of((wxChar)c, nStart); }
-
-  size_t find_last_of(const wxString& str, size_t nStart = npos) const
-    { return m_impl.find_last_of(str.m_impl, nStart); }
-  size_t find_last_of(const char* sz, size_t nStart = npos) const
-    { return m_impl.find_last_of(ImplStr(sz), nStart); }
-  size_t find_last_of(const wchar_t* sz, size_t nStart = npos) const
-    { return m_impl.find_last_of(ImplStr(sz), nStart); }
-  size_t find_last_of(const char* sz, size_t nStart, size_t n) const
-    { return m_impl.find_last_of(ImplStr(sz), nStart, n); }
-  size_t find_last_of(const wchar_t* sz, size_t nStart, size_t n) const
-    { return m_impl.find_last_of(ImplStr(sz), nStart, n); }
-  size_t find_last_of(wxUniChar c, size_t nStart = npos) const
-    { return m_impl.find_last_of((wxChar)c, nStart); }
-
-  size_t find_first_not_of(const wxString& str, size_t nStart = 0) const
-    { return m_impl.find_first_not_of(str.m_impl, nStart); }
-  size_t find_first_not_of(const char* sz, size_t nStart = 0) const
-    { return m_impl.find_first_not_of(ImplStr(sz), nStart); }
-  size_t find_first_not_of(const wchar_t* sz, size_t nStart = 0) const
-    { return m_impl.find_first_not_of(ImplStr(sz), nStart); }
-  size_t find_first_not_of(const char* sz, size_t nStart, size_t n) const
-    { return m_impl.find_first_not_of(ImplStr(sz), nStart, n); }
-  size_t find_first_not_of(const wchar_t* sz, size_t nStart, size_t n) const
-    { return m_impl.find_first_not_of(ImplStr(sz), nStart, n); }
-  size_t find_first_not_of(wxUniChar c, size_t nStart = 0) const
-    { return m_impl.find_first_not_of((wxChar)c, nStart); }
-
-  size_t find_last_not_of(const wxString& str, size_t nStart = npos) const
-    { return m_impl.find_last_not_of(str.m_impl, nStart); }
-  size_t find_last_not_of(const char* sz, size_t nStart = npos) const
-    { return m_impl.find_last_not_of(ImplStr(sz), nStart); }
-  size_t find_last_not_of(const wchar_t* sz, size_t nStart = npos) const
-    { return m_impl.find_last_not_of(ImplStr(sz), nStart); }
-  size_t find_last_not_of(const char* sz, size_t nStart, size_t n) const
-    { return m_impl.find_last_not_of(ImplStr(sz), nStart, n); }
-  size_t find_last_not_of(const wchar_t* sz, size_t nStart, size_t n) const
-    { return m_impl.find_last_not_of(ImplStr(sz), nStart, n); }
-  size_t find_last_not_of(wxUniChar c, size_t nStart = npos) const
-    { return m_impl.find_last_not_of((wxChar)c, nStart); }
-#else
-  // we can't use std::string implementation in UTF-8 build, because the
-  // character sets would be interpreted wrongly:
-
-    // as strpbrk() but starts at nStart, returns npos if not found
-  size_t find_first_of(const wxString& str, size_t nStart = 0) const
-#if wxUSE_UNICODE // FIXME-UTF8: temporary
-    { return find_first_of(str.wc_str(), nStart); }
-#else
-    { return find_first_of(str.mb_str(), nStart); }
-#endif
-    // same as above
-  size_t find_first_of(const char* sz, size_t nStart = 0) const;
-  size_t find_first_of(const wchar_t* sz, size_t nStart = 0) const;
-  size_t find_first_of(const char* sz, size_t nStart, size_t n) const;
-  size_t find_first_of(const wchar_t* sz, size_t nStart, size_t n) const;
-    // same as find(char, size_t)
-  size_t find_first_of(wxUniChar c, size_t nStart = 0) const
-    { return find(c, nStart); }
-    // find the last (starting from nStart) char from str in this string
-  size_t find_last_of (const wxString& str, size_t nStart = npos) const
-#if wxUSE_UNICODE // FIXME-UTF8: temporary
-    { return find_last_of(str.wc_str(), nStart); }
-#else
-    { return find_last_of(str.mb_str(), nStart); }
-#endif
-    // same as above
-  size_t find_last_of (const char* sz, size_t nStart = npos) const;
-  size_t find_last_of (const wchar_t* sz, size_t nStart = npos) const;
-  size_t find_last_of(const char* sz, size_t nStart, size_t n) const;
-  size_t find_last_of(const wchar_t* sz, size_t nStart, size_t n) const;
-    // same as above
-  size_t find_last_of(wxUniChar c, size_t nStart = npos) const
-    { return rfind(c, nStart); }
-
-    // find first/last occurrence of any character not in the set
-
-    // as strspn() (starting from nStart), returns npos on failure
-  size_t find_first_not_of(const wxString& str, size_t nStart = 0) const
-#if wxUSE_UNICODE // FIXME-UTF8: temporary
-    { return find_first_not_of(str.wc_str(), nStart); }
-#else
-    { return find_first_not_of(str.mb_str(), nStart); }
-#endif
-    // same as above
-  size_t find_first_not_of(const char* sz, size_t nStart = 0) const;
-  size_t find_first_not_of(const wchar_t* sz, size_t nStart = 0) const;
-  size_t find_first_not_of(const char* sz, size_t nStart, size_t n) const;
-  size_t find_first_not_of(const wchar_t* sz, size_t nStart, size_t n) const;
-    // same as above
-  size_t find_first_not_of(wxUniChar ch, size_t nStart = 0) const;
-    //  as strcspn()
-  size_t find_last_not_of(const wxString& str, size_t nStart = npos) const
-#if wxUSE_UNICODE // FIXME-UTF8: temporary
-    { return find_last_not_of(str.wc_str(), nStart); }
-#else
-    { return find_last_not_of(str.mb_str(), nStart); }
-#endif
-    // same as above
-  size_t find_last_not_of(const char* sz, size_t nStart = npos) const;
-  size_t find_last_not_of(const wchar_t* sz, size_t nStart = npos) const;
-  size_t find_last_not_of(const char* sz, size_t nStart, size_t n) const;
-  size_t find_last_not_of(const wchar_t* sz, size_t nStart, size_t n) const;
-    // same as above
-  size_t find_last_not_of(wxUniChar ch, size_t nStart = npos) const;
-#endif // wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8 or not
-
-  // provide char/wchar_t/wxUniCharRef overloads for char-finding functions
-  // above to resolve ambiguities:
-  size_t find_first_of(wxUniCharRef ch, size_t nStart = 0) const
-    {  return find_first_of(wxUniChar(ch), nStart); }
-  size_t find_first_of(char ch, size_t nStart = 0) const
-    {  return find_first_of(wxUniChar(ch), nStart); }
-  size_t find_first_of(unsigned char ch, size_t nStart = 0) const
-    {  return find_first_of(wxUniChar(ch), nStart); }
-  size_t find_first_of(wchar_t ch, size_t nStart = 0) const
-    {  return find_first_of(wxUniChar(ch), nStart); }
-  size_t find_last_of(wxUniCharRef ch, size_t nStart = npos) const
-    {  return find_last_of(wxUniChar(ch), nStart); }
-  size_t find_last_of(char ch, size_t nStart = npos) const
-    {  return find_last_of(wxUniChar(ch), nStart); }
-  size_t find_last_of(unsigned char ch, size_t nStart = npos) const
-    {  return find_last_of(wxUniChar(ch), nStart); }
-  size_t find_last_of(wchar_t ch, size_t nStart = npos) const
-    {  return find_last_of(wxUniChar(ch), nStart); }
-  size_t find_first_not_of(wxUniCharRef ch, size_t nStart = 0) const
-    {  return find_first_not_of(wxUniChar(ch), nStart); }
-  size_t find_first_not_of(char ch, size_t nStart = 0) const
-    {  return find_first_not_of(wxUniChar(ch), nStart); }
-  size_t find_first_not_of(unsigned char ch, size_t nStart = 0) const
-    {  return find_first_not_of(wxUniChar(ch), nStart); }
-  size_t find_first_not_of(wchar_t ch, size_t nStart = 0) const
-    {  return find_first_not_of(wxUniChar(ch), nStart); }
-  size_t find_last_not_of(wxUniCharRef ch, size_t nStart = npos) const
-    {  return find_last_not_of(wxUniChar(ch), nStart); }
-  size_t find_last_not_of(char ch, size_t nStart = npos) const
-    {  return find_last_not_of(wxUniChar(ch), nStart); }
-  size_t find_last_not_of(unsigned char ch, size_t nStart = npos) const
-    {  return find_last_not_of(wxUniChar(ch), nStart); }
-  size_t find_last_not_of(wchar_t ch, size_t nStart = npos) const
-    {  return find_last_not_of(wxUniChar(ch), nStart); }
-
-  // and additional overloads for the versions taking strings:
-  size_t find_first_of(const wxCStrData& sz, size_t nStart = 0) const
-    { return find_first_of(sz.AsString(), nStart); }
-  size_t find_first_of(const wxScopedCharBuffer& sz, size_t nStart = 0) const
-    { return find_first_of(sz.data(), nStart); }
-  size_t find_first_of(const wxScopedWCharBuffer& sz, size_t nStart = 0) const
-    { return find_first_of(sz.data(), nStart); }
-  size_t find_first_of(const wxCStrData& sz, size_t nStart, size_t n) const
-    { return find_first_of(sz.AsWChar(), nStart, n); }
-  size_t find_first_of(const wxScopedCharBuffer& sz, size_t nStart, size_t n) const
-    { return find_first_of(sz.data(), nStart, n); }
-  size_t find_first_of(const wxScopedWCharBuffer& sz, size_t nStart, size_t n) const
-    { return find_first_of(sz.data(), nStart, n); }
-
-  size_t find_last_of(const wxCStrData& sz, size_t nStart = 0) const
-    { return find_last_of(sz.AsString(), nStart); }
-  size_t find_last_of(const wxScopedCharBuffer& sz, size_t nStart = 0) const
-    { return find_last_of(sz.data(), nStart); }
-  size_t find_last_of(const wxScopedWCharBuffer& sz, size_t nStart = 0) const
-    { return find_last_of(sz.data(), nStart); }
-  size_t find_last_of(const wxCStrData& sz, size_t nStart, size_t n) const
-    { return find_last_of(sz.AsWChar(), nStart, n); }
-  size_t find_last_of(const wxScopedCharBuffer& sz, size_t nStart, size_t n) const
-    { return find_last_of(sz.data(), nStart, n); }
-  size_t find_last_of(const wxScopedWCharBuffer& sz, size_t nStart, size_t n) const
-    { return find_last_of(sz.data(), nStart, n); }
-
-  size_t find_first_not_of(const wxCStrData& sz, size_t nStart = 0) const
-    { return find_first_not_of(sz.AsString(), nStart); }
-  size_t find_first_not_of(const wxScopedCharBuffer& sz, size_t nStart = 0) const
-    { return find_first_not_of(sz.data(), nStart); }
-  size_t find_first_not_of(const wxScopedWCharBuffer& sz, size_t nStart = 0) const
-    { return find_first_not_of(sz.data(), nStart); }
-  size_t find_first_not_of(const wxCStrData& sz, size_t nStart, size_t n) const
-    { return find_first_not_of(sz.AsWChar(), nStart, n); }
-  size_t find_first_not_of(const wxScopedCharBuffer& sz, size_t nStart, size_t n) const
-    { return find_first_not_of(sz.data(), nStart, n); }
-  size_t find_first_not_of(const wxScopedWCharBuffer& sz, size_t nStart, size_t n) const
-    { return find_first_not_of(sz.data(), nStart, n); }
-
-  size_t find_last_not_of(const wxCStrData& sz, size_t nStart = 0) const
-    { return find_last_not_of(sz.AsString(), nStart); }
-  size_t find_last_not_of(const wxScopedCharBuffer& sz, size_t nStart = 0) const
-    { return find_last_not_of(sz.data(), nStart); }
-  size_t find_last_not_of(const wxScopedWCharBuffer& sz, size_t nStart = 0) const
-    { return find_last_not_of(sz.data(), nStart); }
-  size_t find_last_not_of(const wxCStrData& sz, size_t nStart, size_t n) const
-    { return find_last_not_of(sz.AsWChar(), nStart, n); }
-  size_t find_last_not_of(const wxScopedCharBuffer& sz, size_t nStart, size_t n) const
-    { return find_last_not_of(sz.data(), nStart, n); }
-  size_t find_last_not_of(const wxScopedWCharBuffer& sz, size_t nStart, size_t n) const
-    { return find_last_not_of(sz.data(), nStart, n); }
+    { return (wxString&)wxStringBase::replace(first, last, first1, last1); }
 
       // string += string
   wxString& operator+=(const wxString& s)
-  {
-      wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-      m_impl += s.m_impl;
-      return *this;
-  }
+    { return (wxString&)wxStringBase::operator+=(s); }
       // string += C string
-  wxString& operator+=(const char *psz)
-  {
-      wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-      m_impl += ImplStr(psz);
-      return *this;
-  }
-  wxString& operator+=(const wchar_t *pwz)
-  {
-      wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-      m_impl += ImplStr(pwz);
-      return *this;
-  }
-  wxString& operator+=(const wxCStrData& s)
-  {
-      wxSTRING_INVALIDATE_CACHED_LENGTH();
-
-      m_impl += s.AsString().m_impl;
-      return *this;
-  }
-  wxString& operator+=(const wxScopedCharBuffer& s)
-    { return append(s); }
-  wxString& operator+=(const wxScopedWCharBuffer& s)
-    { return append(s); }
+  wxString& operator+=(const wxChar *psz)
+    { return (wxString&)wxStringBase::operator+=(psz); }
       // string += char
-  wxString& operator+=(wxUniChar ch)
-  {
-      wxSTRING_UPDATE_CACHED_LENGTH(1);
-
-#if wxUSE_UNICODE_UTF8
-      if ( !ch.IsAscii() )
-          m_impl += wxStringOperations::EncodeChar(ch);
-      else
-#endif
-          m_impl += (wxStringCharType)ch;
-      return *this;
-  }
-  wxString& operator+=(wxUniCharRef ch) { return *this += wxUniChar(ch); }
-  wxString& operator+=(int ch) { return *this += wxUniChar(ch); }
-  wxString& operator+=(char ch) { return *this += wxUniChar(ch); }
-  wxString& operator+=(unsigned char ch) { return *this += wxUniChar(ch); }
-  wxString& operator+=(wchar_t ch) { return *this += wxUniChar(ch); }
-
-private:
-#if !wxUSE_STL_BASED_WXSTRING
-  // helpers for wxStringBuffer and wxStringBufferLength
-  wxStringCharType *DoGetWriteBuf(size_t nLen)
-  {
-      return m_impl.DoGetWriteBuf(nLen);
-  }
-
-  void DoUngetWriteBuf()
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.DoUngetWriteBuf();
-  }
-
-  void DoUngetWriteBuf(size_t nLen)
-  {
-      wxSTRING_INVALIDATE_CACHE();
-
-      m_impl.DoUngetWriteBuf(nLen);
-  }
-#endif // !wxUSE_STL_BASED_WXSTRING
-
-#ifndef wxNEEDS_WXSTRING_PRINTF_MIXIN
-  #if !wxUSE_UTF8_LOCALE_ONLY
-  int DoPrintfWchar(const wxChar *format, ...);
-  static wxString DoFormatWchar(const wxChar *format, ...);
-  #endif
-  #if wxUSE_UNICODE_UTF8
-  int DoPrintfUtf8(const char *format, ...);
-  static wxString DoFormatUtf8(const char *format, ...);
-  #endif
-#endif
-
-#if !wxUSE_STL_BASED_WXSTRING
-  // check string's data validity
-  bool IsValid() const { return m_impl.GetStringData()->IsValid(); }
-#endif
-
-private:
-  wxStringImpl m_impl;
-
-  // buffers for compatibility conversion from (char*)c_str() and
-  // (wchar_t*)c_str(): the pointers returned by these functions should remain
-  // valid until the string itself is modified for compatibility with the
-  // existing code and consistency with std::string::c_str() so returning a
-  // temporary buffer won't do and we need to cache the conversion results
-
-  // TODO-UTF8: benchmark various approaches to keeping compatibility buffers
-  template<typename T>
-  struct ConvertedBuffer
-  {
-      // notice that there is no need to initialize m_len here as it's unused
-      // as long as m_str is NULL
-      ConvertedBuffer() : m_str(NULL) {}
-      ~ConvertedBuffer()
-          { free(m_str); }
-
-      bool Extend(size_t len)
-      {
-          // add extra 1 for the trailing NUL
-          void * const str = realloc(m_str, sizeof(T)*(len + 1));
-          if ( !str )
-              return false;
-
-          m_str = static_cast<T *>(str);
-          m_len = len;
-
-          return true;
-      }
-
-      const wxScopedCharTypeBuffer<T> AsScopedBuffer() const
-      {
-          return wxScopedCharTypeBuffer<T>::CreateNonOwned(m_str, m_len);
-      }
-
-      T *m_str;     // pointer to the string data
-      size_t m_len; // length, not size, i.e. in chars and without last NUL
-  };
-
-
-#if wxUSE_UNICODE
-  // common mb_str() and wxCStrData::AsChar() helper: performs the conversion
-  // and returns either m_convertedToChar.m_str (in which case its m_len is
-  // also updated) or NULL if it failed
-  //
-  // there is an important exception: in wxUSE_UNICODE_UTF8 build if conv is a
-  // UTF-8 one, we return m_impl.c_str() directly, without doing any conversion
-  // as optimization and so the caller needs to check for this before using
-  // m_convertedToChar
-  //
-  // NB: AsChar() returns char* in any build, unlike mb_str()
-  const char *AsChar(const wxMBConv& conv) const;
-
-  // mb_str() implementation helper
-  wxScopedCharBuffer AsCharBuf(const wxMBConv& conv) const
-  {
-#if wxUSE_UNICODE_UTF8
-      // avoid conversion if we can
-      if ( conv.IsUTF8() )
-      {
-          return wxScopedCharBuffer::CreateNonOwned(m_impl.c_str(),
-                  m_impl.length());
-      }
-#endif // wxUSE_UNICODE_UTF8
-
-      // call this solely in order to fill in m_convertedToChar as AsChar()
-      // updates it as a side effect: this is a bit ugly but it's a completely
-      // internal function so the users of this class shouldn't care or know
-      // about it and doing it like this, i.e. having a separate AsChar(),
-      // allows us to avoid the creation and destruction of a temporary buffer
-      // when using wxCStrData without duplicating any code
-      if ( !AsChar(conv) )
-      {
-          // although it would be probably more correct to return NULL buffer
-          // from here if the conversion fails, a lot of existing code doesn't
-          // expect mb_str() (or wc_str()) to ever return NULL so return an
-          // empty string otherwise to avoid crashes in it
-          //
-          // also, some existing code does check for the conversion success and
-          // so asserting here would be bad too -- even if it does mean that
-          // silently losing data is possible for badly written code
-          return wxScopedCharBuffer::CreateNonOwned("", 0);
-      }
-
-      return m_convertedToChar.AsScopedBuffer();
-  }
-
-  ConvertedBuffer<char> m_convertedToChar;
-#endif // !wxUSE_UNICODE
-
-#if !wxUSE_UNICODE_WCHAR
-  // common wc_str() and wxCStrData::AsWChar() helper for both UTF-8 and ANSI
-  // builds: converts the string contents into m_convertedToWChar and returns
-  // NULL if the conversion failed (this can only happen in ANSI build)
-  //
-  // NB: AsWChar() returns wchar_t* in any build, unlike wc_str()
-  const wchar_t *AsWChar(const wxMBConv& conv) const;
-
-  // wc_str() implementation helper
-  wxScopedWCharBuffer AsWCharBuf(const wxMBConv& conv) const
-  {
-      if ( !AsWChar(conv) )
-          return wxScopedWCharBuffer::CreateNonOwned(L"", 0);
-
-      return m_convertedToWChar.AsScopedBuffer();
-  }
-
-  ConvertedBuffer<wchar_t> m_convertedToWChar;
-#endif // !wxUSE_UNICODE_WCHAR
-
-#if wxUSE_UNICODE_UTF8
-  // FIXME-UTF8: (try to) move this elsewhere (TLS) or solve differently
-  //             assigning to character pointer to by wxString::iterator may
-  //             change the underlying wxStringImpl iterator, so we have to
-  //             keep track of all iterators and update them as necessary:
-  struct wxStringIteratorNodeHead
-  {
-      wxStringIteratorNodeHead() : ptr(NULL) {}
-      wxStringIteratorNode *ptr;
-
-      // copying is disallowed as it would result in more than one pointer into
-      // the same linked list
-      wxDECLARE_NO_COPY_CLASS(wxStringIteratorNodeHead);
-  };
-
-  wxStringIteratorNodeHead m_iterators;
-
-  friend class WXDLLIMPEXP_FWD_BASE wxStringIteratorNode;
-  friend class WXDLLIMPEXP_FWD_BASE wxUniCharRef;
-#endif // wxUSE_UNICODE_UTF8
-
-  friend class WXDLLIMPEXP_FWD_BASE wxCStrData;
-  friend class wxStringInternalBuffer;
-  friend class wxStringInternalBufferLength;
+  wxString& operator+=(wxChar ch)
+    { return (wxString&)wxStringBase::operator+=(ch); }
 };
 
-#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
-    #pragma warning (pop)
-#endif
-
-// string iterator operators that satisfy STL Random Access Iterator
-// requirements:
-inline wxString::iterator operator+(ptrdiff_t n, wxString::iterator i)
-  { return i + n; }
-inline wxString::const_iterator operator+(ptrdiff_t n, wxString::const_iterator i)
-  { return i + n; }
-inline wxString::reverse_iterator operator+(ptrdiff_t n, wxString::reverse_iterator i)
-  { return i + n; }
-inline wxString::const_reverse_iterator operator+(ptrdiff_t n, wxString::const_reverse_iterator i)
-  { return i + n; }
-
 // notice that even though for many compilers the friend declarations above are
 // enough, from the point of view of C++ standard we must have the declarations
 // here as friend ones are not injected in the enclosing namespace and without
 // them the code fails to compile with conforming compilers such as xlC or g++4
-wxString WXDLLIMPEXP_BASE operator+(const wxString& string1, const wxString& string2);
-wxString WXDLLIMPEXP_BASE operator+(const wxString& string, const char *psz);
-wxString WXDLLIMPEXP_BASE operator+(const wxString& string, const wchar_t *pwz);
-wxString WXDLLIMPEXP_BASE operator+(const char *psz, const wxString& string);
-wxString WXDLLIMPEXP_BASE operator+(const wchar_t *pwz, const wxString& string);
-
-wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxUniChar ch);
-wxString WXDLLIMPEXP_BASE operator+(wxUniChar ch, const wxString& string);
-
-inline wxString operator+(const wxString& string, wxUniCharRef ch)
-    { return string + (wxUniChar)ch; }
-inline wxString operator+(const wxString& string, char ch)
-    { return string + wxUniChar(ch); }
-inline wxString operator+(const wxString& string, wchar_t ch)
-    { return string + wxUniChar(ch); }
-inline wxString operator+(wxUniCharRef ch, const wxString& string)
-    { return (wxUniChar)ch + string; }
-inline wxString operator+(char ch, const wxString& string)
-    { return wxUniChar(ch) + string; }
-inline wxString operator+(wchar_t ch, const wxString& string)
-    { return wxUniChar(ch) + string; }
+wxString WXDLLIMPEXP_BASE operator+(const wxString& string1,  const wxString& string2);
+wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxChar ch);
+wxString WXDLLIMPEXP_BASE operator+(wxChar ch, const wxString& string);
+wxString WXDLLIMPEXP_BASE operator+(const wxString& string, const wxChar *psz);
+wxString WXDLLIMPEXP_BASE operator+(const wxChar *psz, const wxString& string);
 
 
-#define wxGetEmptyString() wxString()
+// define wxArrayString, for compatibility
+#if WXWIN_COMPATIBILITY_2_4 && !wxUSE_STL
+    #include "wx/arrstr.h"
+#endif
 
-// ----------------------------------------------------------------------------
-// helper functions which couldn't be defined inline
-// ----------------------------------------------------------------------------
-
-namespace wxPrivate
-{
-
-#if wxUSE_UNICODE_WCHAR
-
-template <>
-struct wxStringAsBufHelper<char>
-{
-    static wxScopedCharBuffer Get(const wxString& s, size_t *len)
+#if wxUSE_STL
+    // return an empty wxString (not very useful with wxUSE_STL == 1)
+    inline const wxString wxGetEmptyString() { return wxString(); }
+#else // !wxUSE_STL
+    // return an empty wxString (more efficient than wxString() here)
+    inline const wxString& wxGetEmptyString()
     {
-        wxScopedCharBuffer buf(s.mb_str());
-        if ( len )
-            *len = buf ? strlen(buf) : 0;
-        return buf;
+        return *(wxString *)&wxEmptyString;
     }
-};
-
-template <>
-struct wxStringAsBufHelper<wchar_t>
-{
-    static wxScopedWCharBuffer Get(const wxString& s, size_t *len)
-    {
-        const size_t length = s.length();
-        if ( len )
-            *len = length;
-        return wxScopedWCharBuffer::CreateNonOwned(s.wx_str(), length);
-    }
-};
-
-#elif wxUSE_UNICODE_UTF8
-
-template <>
-struct wxStringAsBufHelper<char>
-{
-    static wxScopedCharBuffer Get(const wxString& s, size_t *len)
-    {
-        const size_t length = s.utf8_length();
-        if ( len )
-            *len = length;
-        return wxScopedCharBuffer::CreateNonOwned(s.wx_str(), length);
-    }
-};
-
-template <>
-struct wxStringAsBufHelper<wchar_t>
-{
-    static wxScopedWCharBuffer Get(const wxString& s, size_t *len)
-    {
-        wxScopedWCharBuffer wbuf(s.wc_str());
-        if ( len )
-            *len = wxWcslen(wbuf);
-        return wbuf;
-    }
-};
-
-#endif // Unicode build kind
-
-} // namespace wxPrivate
+#endif // wxUSE_STL/!wxUSE_STL
 
 // ----------------------------------------------------------------------------
 // wxStringBuffer: a tiny class allowing to get a writable pointer into string
 // ----------------------------------------------------------------------------
 
-#if !wxUSE_STL_BASED_WXSTRING
-// string buffer for direct access to string data in their native
-// representation:
-class wxStringInternalBuffer
+#if wxUSE_STL
+
+class WXDLLIMPEXP_BASE wxStringBuffer
 {
 public:
-    typedef wxStringCharType CharType;
+    wxStringBuffer(wxString& str, size_t lenWanted = 1024)
+        : m_str(str), m_buf(lenWanted)
+        { }
 
-    wxStringInternalBuffer(wxString& str, size_t lenWanted = 1024)
-        : m_str(str), m_buf(NULL)
-        { m_buf = m_str.DoGetWriteBuf(lenWanted); }
+    ~wxStringBuffer() { m_str.assign(m_buf.data(), wxStrlen(m_buf.data())); }
 
-    ~wxStringInternalBuffer() { m_str.DoUngetWriteBuf(); }
-
-    operator wxStringCharType*() const { return m_buf; }
+    operator wxChar*() { return m_buf.data(); }
 
 private:
-    wxString&         m_str;
-    wxStringCharType *m_buf;
+    wxString& m_str;
+#if wxUSE_UNICODE
+    wxWCharBuffer m_buf;
+#else
+    wxCharBuffer m_buf;
+#endif
 
-    wxDECLARE_NO_COPY_CLASS(wxStringInternalBuffer);
+    DECLARE_NO_COPY_CLASS(wxStringBuffer)
 };
 
-class wxStringInternalBufferLength
+class WXDLLIMPEXP_BASE wxStringBufferLength
 {
 public:
-    typedef wxStringCharType CharType;
+    wxStringBufferLength(wxString& str, size_t lenWanted = 1024)
+        : m_str(str), m_buf(lenWanted), m_len(0), m_lenSet(false)
+        { }
 
-    wxStringInternalBufferLength(wxString& str, size_t lenWanted = 1024)
+    ~wxStringBufferLength()
+    {
+        wxASSERT(m_lenSet);
+        m_str.assign(m_buf.data(), m_len);
+    }
+
+    operator wxChar*() { return m_buf.data(); }
+    void SetLength(size_t length) { m_len = length; m_lenSet = true; }
+
+private:
+    wxString& m_str;
+#if wxUSE_UNICODE
+    wxWCharBuffer m_buf;
+#else
+    wxCharBuffer  m_buf;
+#endif
+    size_t        m_len;
+    bool          m_lenSet;
+
+    DECLARE_NO_COPY_CLASS(wxStringBufferLength)
+};
+
+#else // if !wxUSE_STL
+
+class WXDLLIMPEXP_BASE wxStringBuffer
+{
+public:
+    wxStringBuffer(wxString& str, size_t lenWanted = 1024)
+        : m_str(str), m_buf(NULL)
+        { m_buf = m_str.GetWriteBuf(lenWanted); }
+
+    ~wxStringBuffer() { m_str.UngetWriteBuf(); }
+
+    operator wxChar*() const { return m_buf; }
+
+private:
+    wxString& m_str;
+    wxChar   *m_buf;
+
+    DECLARE_NO_COPY_CLASS(wxStringBuffer)
+};
+
+class WXDLLIMPEXP_BASE wxStringBufferLength
+{
+public:
+    wxStringBufferLength(wxString& str, size_t lenWanted = 1024)
         : m_str(str), m_buf(NULL), m_len(0), m_lenSet(false)
     {
-        m_buf = m_str.DoGetWriteBuf(lenWanted);
+        m_buf = m_str.GetWriteBuf(lenWanted);
         wxASSERT(m_buf != NULL);
     }
 
-    ~wxStringInternalBufferLength()
+    ~wxStringBufferLength()
     {
         wxASSERT(m_lenSet);
-        m_str.DoUngetWriteBuf(m_len);
+        m_str.UngetWriteBuf(m_len);
     }
 
-    operator wxStringCharType*() const { return m_buf; }
+    operator wxChar*() const { return m_buf; }
     void SetLength(size_t length) { m_len = length; m_lenSet = true; }
 
 private:
-    wxString&         m_str;
-    wxStringCharType *m_buf;
-    size_t            m_len;
-    bool              m_lenSet;
-
-    wxDECLARE_NO_COPY_CLASS(wxStringInternalBufferLength);
-};
-
-#endif // !wxUSE_STL_BASED_WXSTRING
-
-template<typename T>
-class wxStringTypeBufferBase
-{
-public:
-    typedef T CharType;
-
-    wxStringTypeBufferBase(wxString& str, size_t lenWanted = 1024)
-        : m_str(str), m_buf(lenWanted)
-    {
-        // for compatibility with old wxStringBuffer which provided direct
-        // access to wxString internal buffer, initialize ourselves with the
-        // string initial contents
-
-        // FIXME-VC6: remove the ugly (CharType *)NULL and use normal
-        //            tchar_str<CharType>
-        size_t len;
-        const wxCharTypeBuffer<CharType> buf(str.tchar_str(&len, (CharType *)NULL));
-        if ( buf )
-        {
-            if ( len > lenWanted )
-            {
-                // in this case there is not enough space for terminating NUL,
-                // ensure that we still put it there
-                m_buf.data()[lenWanted] = 0;
-                len = lenWanted - 1;
-            }
-
-            memcpy(m_buf.data(), buf, (len + 1)*sizeof(CharType));
-        }
-        //else: conversion failed, this can happen when trying to get Unicode
-        //      string contents into a char string
-    }
-
-    operator CharType*() { return m_buf.data(); }
-
-protected:
     wxString& m_str;
-    wxCharTypeBuffer<CharType> m_buf;
+    wxChar   *m_buf;
+    size_t    m_len;
+    bool      m_lenSet;
+
+    DECLARE_NO_COPY_CLASS(wxStringBufferLength)
 };
 
-template<typename T>
-class wxStringTypeBufferLengthBase : public wxStringTypeBufferBase<T>
-{
-public:
-    wxStringTypeBufferLengthBase(wxString& str, size_t lenWanted = 1024)
-        : wxStringTypeBufferBase<T>(str, lenWanted),
-          m_len(0),
-          m_lenSet(false)
-        { }
-
-    ~wxStringTypeBufferLengthBase()
-    {
-        wxASSERT_MSG( this->m_lenSet, "forgot to call SetLength()" );
-    }
-
-    void SetLength(size_t length) { m_len = length; m_lenSet = true; }
-
-protected:
-    size_t m_len;
-    bool m_lenSet;
-};
-
-template<typename T>
-class wxStringTypeBuffer : public wxStringTypeBufferBase<T>
-{
-public:
-    wxStringTypeBuffer(wxString& str, size_t lenWanted = 1024)
-        : wxStringTypeBufferBase<T>(str, lenWanted)
-        { }
-
-    ~wxStringTypeBuffer()
-    {
-        this->m_str.assign(this->m_buf.data());
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxStringTypeBuffer);
-};
-
-template<typename T>
-class wxStringTypeBufferLength : public wxStringTypeBufferLengthBase<T>
-{
-public:
-    wxStringTypeBufferLength(wxString& str, size_t lenWanted = 1024)
-        : wxStringTypeBufferLengthBase<T>(str, lenWanted)
-        { }
-
-    ~wxStringTypeBufferLength()
-    {
-        this->m_str.assign(this->m_buf.data(), this->m_len);
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxStringTypeBufferLength);
-};
-
-#if wxUSE_STL_BASED_WXSTRING
-
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxStringTypeBufferBase<wxStringCharType> )
-
-class wxStringInternalBuffer : public wxStringTypeBufferBase<wxStringCharType>
-{
-public:
-    wxStringInternalBuffer(wxString& str, size_t lenWanted = 1024)
-        : wxStringTypeBufferBase<wxStringCharType>(str, lenWanted) {}
-    ~wxStringInternalBuffer()
-        { m_str.m_impl.assign(m_buf.data()); }
-
-    wxDECLARE_NO_COPY_CLASS(wxStringInternalBuffer);
-};
-
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE(
-    wxStringTypeBufferLengthBase<wxStringCharType> )
-
-class wxStringInternalBufferLength
-    : public wxStringTypeBufferLengthBase<wxStringCharType>
-{
-public:
-    wxStringInternalBufferLength(wxString& str, size_t lenWanted = 1024)
-        : wxStringTypeBufferLengthBase<wxStringCharType>(str, lenWanted) {}
-
-    ~wxStringInternalBufferLength()
-    {
-        m_str.m_impl.assign(m_buf.data(), m_len);
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxStringInternalBufferLength);
-};
-
-#endif // wxUSE_STL_BASED_WXSTRING
-
-
-#if wxUSE_STL_BASED_WXSTRING || wxUSE_UNICODE_UTF8
-typedef wxStringTypeBuffer<wxChar>        wxStringBuffer;
-typedef wxStringTypeBufferLength<wxChar>  wxStringBufferLength;
-#else // if !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-typedef wxStringInternalBuffer                wxStringBuffer;
-typedef wxStringInternalBufferLength          wxStringBufferLength;
-#endif // !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-
-#if wxUSE_UNICODE_UTF8
-typedef wxStringInternalBuffer                wxUTF8StringBuffer;
-typedef wxStringInternalBufferLength          wxUTF8StringBufferLength;
-#elif wxUSE_UNICODE_WCHAR
-
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxStringTypeBufferBase<char> )
-
-// Note about inlined dtors in the classes below: this is done not for
-// performance reasons but just to avoid linking errors in the MSVC DLL build
-// under Windows: if a class has non-inline methods it must be declared as
-// being DLL-exported but, due to an extremely interesting feature of MSVC 7
-// and later, any template class which is used as a base of a DLL-exported
-// class is implicitly made DLL-exported too, as explained at the bottom of
-// http://msdn.microsoft.com/en-us/library/twa2aw10.aspx (just to confirm: yes,
-// _inheriting_ from a class can change whether it is being exported from DLL)
-//
-// But this results in link errors because the base template class is not DLL-
-// exported, whether it is declared with WXDLLIMPEXP_BASE or not, because it
-// does have only inline functions. So the simplest fix is to just make all the
-// functions of these classes inline too.
-
-class wxUTF8StringBuffer : public wxStringTypeBufferBase<char>
-{
-public:
-    wxUTF8StringBuffer(wxString& str, size_t lenWanted = 1024)
-        : wxStringTypeBufferBase<char>(str, lenWanted) {}
-    ~wxUTF8StringBuffer()
-    {
-        wxMBConvStrictUTF8 conv;
-        size_t wlen = conv.ToWChar(NULL, 0, m_buf);
-        wxCHECK_RET( wlen != wxCONV_FAILED, "invalid UTF-8 data in string buffer?" );
-
-        wxStringInternalBuffer wbuf(m_str, wlen);
-        conv.ToWChar(wbuf, wlen, m_buf);
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxUTF8StringBuffer);
-};
-
-WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE( wxStringTypeBufferLengthBase<char> )
-
-class wxUTF8StringBufferLength : public wxStringTypeBufferLengthBase<char>
-{
-public:
-    wxUTF8StringBufferLength(wxString& str, size_t lenWanted = 1024)
-        : wxStringTypeBufferLengthBase<char>(str, lenWanted) {}
-    ~wxUTF8StringBufferLength()
-    {
-        wxCHECK_RET(m_lenSet, "length not set");
-
-        wxMBConvStrictUTF8 conv;
-        size_t wlen = conv.ToWChar(NULL, 0, m_buf, m_len);
-        wxCHECK_RET( wlen != wxCONV_FAILED, "invalid UTF-8 data in string buffer?" );
-
-        wxStringInternalBufferLength wbuf(m_str, wlen);
-        conv.ToWChar(wbuf, wlen, m_buf, m_len);
-        wbuf.SetLength(wlen);
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxUTF8StringBufferLength);
-};
-#endif // wxUSE_UNICODE_UTF8/wxUSE_UNICODE_WCHAR
-
+#endif // !wxUSE_STL
 
 // ---------------------------------------------------------------------------
 // wxString comparison functions: operator versions are always case sensitive
 // ---------------------------------------------------------------------------
 
-#define wxCMP_WXCHAR_STRING(p, s, op) 0 op s.Cmp(p)
-
-wxDEFINE_ALL_COMPARISONS(const wxChar *, const wxString&, wxCMP_WXCHAR_STRING)
-
-#undef wxCMP_WXCHAR_STRING
+// note that when wxUSE_STL == 1 the comparison operators taking std::string
+// are used and defining them also for wxString would only result in
+// compilation ambiguities when comparing std::string and wxString
+#if !wxUSE_STL
 
 inline bool operator==(const wxString& s1, const wxString& s2)
-    { return s1.IsSameAs(s2); }
+    { return (s1.Len() == s2.Len()) && (s1.Cmp(s2) == 0); }
+inline bool operator==(const wxString& s1, const wxChar  * s2)
+    { return s1.Cmp(s2) == 0; }
+inline bool operator==(const wxChar  * s1, const wxString& s2)
+    { return s2.Cmp(s1) == 0; }
 inline bool operator!=(const wxString& s1, const wxString& s2)
-    { return !s1.IsSameAs(s2); }
+    { return (s1.Len() != s2.Len()) || (s1.Cmp(s2) != 0); }
+inline bool operator!=(const wxString& s1, const wxChar  * s2)
+    { return s1.Cmp(s2) != 0; }
+inline bool operator!=(const wxChar  * s1, const wxString& s2)
+    { return s2.Cmp(s1) != 0; }
 inline bool operator< (const wxString& s1, const wxString& s2)
     { return s1.Cmp(s2) < 0; }
+inline bool operator< (const wxString& s1, const wxChar  * s2)
+    { return s1.Cmp(s2) <  0; }
+inline bool operator< (const wxChar  * s1, const wxString& s2)
+    { return s2.Cmp(s1) >  0; }
 inline bool operator> (const wxString& s1, const wxString& s2)
     { return s1.Cmp(s2) >  0; }
+inline bool operator> (const wxString& s1, const wxChar  * s2)
+    { return s1.Cmp(s2) >  0; }
+inline bool operator> (const wxChar  * s1, const wxString& s2)
+    { return s2.Cmp(s1) <  0; }
 inline bool operator<=(const wxString& s1, const wxString& s2)
     { return s1.Cmp(s2) <= 0; }
+inline bool operator<=(const wxString& s1, const wxChar  * s2)
+    { return s1.Cmp(s2) <= 0; }
+inline bool operator<=(const wxChar  * s1, const wxString& s2)
+    { return s2.Cmp(s1) >= 0; }
 inline bool operator>=(const wxString& s1, const wxString& s2)
     { return s1.Cmp(s2) >= 0; }
+inline bool operator>=(const wxString& s1, const wxChar  * s2)
+    { return s1.Cmp(s2) >= 0; }
+inline bool operator>=(const wxChar  * s1, const wxString& s2)
+    { return s2.Cmp(s1) <= 0; }
 
-inline bool operator==(const wxString& s1, const wxCStrData& s2)
-    { return s1 == s2.AsString(); }
-inline bool operator==(const wxCStrData& s1, const wxString& s2)
-    { return s1.AsString() == s2; }
-inline bool operator!=(const wxString& s1, const wxCStrData& s2)
-    { return s1 != s2.AsString(); }
-inline bool operator!=(const wxCStrData& s1, const wxString& s2)
-    { return s1.AsString() != s2; }
-
-inline bool operator==(const wxString& s1, const wxScopedWCharBuffer& s2)
-    { return (s1.Cmp((const wchar_t *)s2) == 0); }
-inline bool operator==(const wxScopedWCharBuffer& s1, const wxString& s2)
-    { return (s2.Cmp((const wchar_t *)s1) == 0); }
-inline bool operator!=(const wxString& s1, const wxScopedWCharBuffer& s2)
-    { return (s1.Cmp((const wchar_t *)s2) != 0); }
-inline bool operator!=(const wxScopedWCharBuffer& s1, const wxString& s2)
-    { return (s2.Cmp((const wchar_t *)s1) != 0); }
-
-inline bool operator==(const wxString& s1, const wxScopedCharBuffer& s2)
-    { return (s1.Cmp((const char *)s2) == 0); }
-inline bool operator==(const wxScopedCharBuffer& s1, const wxString& s2)
-    { return (s2.Cmp((const char *)s1) == 0); }
-inline bool operator!=(const wxString& s1, const wxScopedCharBuffer& s2)
-    { return (s1.Cmp((const char *)s2) != 0); }
-inline bool operator!=(const wxScopedCharBuffer& s1, const wxString& s2)
-    { return (s2.Cmp((const char *)s1) != 0); }
-
-inline wxString operator+(const wxString& string, const wxScopedWCharBuffer& buf)
-    { return string + (const wchar_t *)buf; }
-inline wxString operator+(const wxScopedWCharBuffer& buf, const wxString& string)
-    { return (const wchar_t *)buf + string; }
-
-inline wxString operator+(const wxString& string, const wxScopedCharBuffer& buf)
-    { return string + (const char *)buf; }
-inline wxString operator+(const wxScopedCharBuffer& buf, const wxString& string)
-    { return (const char *)buf + string; }
-
-// comparison with char
-inline bool operator==(const wxUniChar& c, const wxString& s) { return s.IsSameAs(c); }
-inline bool operator==(const wxUniCharRef& c, const wxString& s) { return s.IsSameAs(c); }
-inline bool operator==(char c, const wxString& s) { return s.IsSameAs(c); }
-inline bool operator==(wchar_t c, const wxString& s) { return s.IsSameAs(c); }
-inline bool operator==(int c, const wxString& s) { return s.IsSameAs(c); }
-inline bool operator==(const wxString& s, const wxUniChar& c) { return s.IsSameAs(c); }
-inline bool operator==(const wxString& s, const wxUniCharRef& c) { return s.IsSameAs(c); }
-inline bool operator==(const wxString& s, char c) { return s.IsSameAs(c); }
-inline bool operator==(const wxString& s, wchar_t c) { return s.IsSameAs(c); }
-inline bool operator!=(const wxUniChar& c, const wxString& s) { return !s.IsSameAs(c); }
-inline bool operator!=(const wxUniCharRef& c, const wxString& s) { return !s.IsSameAs(c); }
-inline bool operator!=(char c, const wxString& s) { return !s.IsSameAs(c); }
-inline bool operator!=(wchar_t c, const wxString& s) { return !s.IsSameAs(c); }
-inline bool operator!=(int c, const wxString& s) { return !s.IsSameAs(c); }
-inline bool operator!=(const wxString& s, const wxUniChar& c) { return !s.IsSameAs(c); }
-inline bool operator!=(const wxString& s, const wxUniCharRef& c) { return !s.IsSameAs(c); }
-inline bool operator!=(const wxString& s, char c) { return !s.IsSameAs(c); }
-inline bool operator!=(const wxString& s, wchar_t c) { return !s.IsSameAs(c); }
-
-
-// wxString iterators comparisons
-inline bool wxString::iterator::operator==(const const_iterator& i) const
-    { return i == *this; }
-inline bool wxString::iterator::operator!=(const const_iterator& i) const
-    { return i != *this; }
-inline bool wxString::iterator::operator<(const const_iterator& i) const
-    { return i > *this; }
-inline bool wxString::iterator::operator>(const const_iterator& i) const
-    { return i < *this; }
-inline bool wxString::iterator::operator<=(const const_iterator& i) const
-    { return i >= *this; }
-inline bool wxString::iterator::operator>=(const const_iterator& i) const
-    { return i <= *this; }
-
-// comparison with C string in Unicode build
 #if wxUSE_UNICODE
+inline bool operator==(const wxString& s1, const wxWCharBuffer& s2)
+    { return (s1.Cmp((const wchar_t *)s2) == 0); }
+inline bool operator==(const wxWCharBuffer& s1, const wxString& s2)
+    { return (s2.Cmp((const wchar_t *)s1) == 0); }
+inline bool operator!=(const wxString& s1, const wxWCharBuffer& s2)
+    { return (s1.Cmp((const wchar_t *)s2) != 0); }
+inline bool operator!=(const wxWCharBuffer& s1, const wxString& s2)
+    { return (s2.Cmp((const wchar_t *)s1) != 0); }
+#else // !wxUSE_UNICODE
+inline bool operator==(const wxString& s1, const wxCharBuffer& s2)
+    { return (s1.Cmp((const char *)s2) == 0); }
+inline bool operator==(const wxCharBuffer& s1, const wxString& s2)
+    { return (s2.Cmp((const char *)s1) == 0); }
+inline bool operator!=(const wxString& s1, const wxCharBuffer& s2)
+    { return (s1.Cmp((const char *)s2) != 0); }
+inline bool operator!=(const wxCharBuffer& s1, const wxString& s2)
+    { return (s2.Cmp((const char *)s1) != 0); }
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
-#define wxCMP_CHAR_STRING(p, s, op) wxString(p) op s
+#if wxUSE_UNICODE
+inline wxString operator+(const wxString& string, const wxWCharBuffer& buf)
+    { return string + (const wchar_t *)buf; }
+inline wxString operator+(const wxWCharBuffer& buf, const wxString& string)
+    { return (const wchar_t *)buf + string; }
+#else // !wxUSE_UNICODE
+inline wxString operator+(const wxString& string, const wxCharBuffer& buf)
+    { return string + (const char *)buf; }
+inline wxString operator+(const wxCharBuffer& buf, const wxString& string)
+    { return (const char *)buf + string; }
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
-wxDEFINE_ALL_COMPARISONS(const char *, const wxString&, wxCMP_CHAR_STRING)
+#endif // !wxUSE_STL
 
-#undef wxCMP_CHAR_STRING
-
-#endif // wxUSE_UNICODE
-
-// we also need to provide the operators for comparison with wxCStrData to
-// resolve ambiguity between operator(const wxChar *,const wxString &) and
-// operator(const wxChar *, const wxChar *) for "p == s.c_str()"
-//
-// notice that these are (shallow) pointer comparisons, not (deep) string ones
-#define wxCMP_CHAR_CSTRDATA(p, s, op) p op s.AsChar()
-#define wxCMP_WCHAR_CSTRDATA(p, s, op) p op s.AsWChar()
-
-wxDEFINE_ALL_COMPARISONS(const wchar_t *, const wxCStrData&, wxCMP_WCHAR_CSTRDATA)
-wxDEFINE_ALL_COMPARISONS(const char *, const wxCStrData&, wxCMP_CHAR_CSTRDATA)
-
-#undef wxCMP_CHAR_CSTRDATA
-#undef wxCMP_WCHAR_CSTRDATA
+// comparison with char (those are not defined by std::[w]string and so should
+// be always available)
+inline bool operator==(wxChar c, const wxString& s) { return s.IsSameAs(c); }
+inline bool operator==(const wxString& s, wxChar c) { return s.IsSameAs(c); }
+inline bool operator!=(wxChar c, const wxString& s) { return !s.IsSameAs(c); }
+inline bool operator!=(const wxString& s, wxChar c) { return !s.IsSameAs(c); }
 
 // ---------------------------------------------------------------------------
 // Implementation only from here until the end of file
 // ---------------------------------------------------------------------------
 
+// don't pollute the library user's name space
+#undef wxASSERT_VALID_INDEX
+
 #if wxUSE_STD_IOSTREAM
 
 #include "wx/iosfwrap.h"
 
 WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxString&);
-WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxCStrData&);
-WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxScopedCharBuffer&);
-#ifndef __BORLANDC__
-WXDLLIMPEXP_BASE wxSTD ostream& operator<<(wxSTD ostream&, const wxScopedWCharBuffer&);
-#endif
 
-#if wxUSE_UNICODE && defined(HAVE_WOSTREAM)
+#endif  // wxSTD_STRING_COMPATIBILITY
 
-WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxString&);
-WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxCStrData&);
-WXDLLIMPEXP_BASE wxSTD wostream& operator<<(wxSTD wostream&, const wxScopedWCharBuffer&);
-
-#endif  // wxUSE_UNICODE && defined(HAVE_WOSTREAM)
-
-#endif  // wxUSE_STD_IOSTREAM
-
-// ---------------------------------------------------------------------------
-// wxCStrData implementation
-// ---------------------------------------------------------------------------
-
-inline wxCStrData::wxCStrData(char *buf)
-    : m_str(new wxString(buf)), m_offset(0), m_owned(true) {}
-inline wxCStrData::wxCStrData(wchar_t *buf)
-    : m_str(new wxString(buf)), m_offset(0), m_owned(true) {}
-
-inline wxCStrData::wxCStrData(const wxCStrData& data)
-    : m_str(data.m_owned ? new wxString(*data.m_str) : data.m_str),
-      m_offset(data.m_offset),
-      m_owned(data.m_owned)
-{
-}
-
-inline wxCStrData::~wxCStrData()
-{
-    if ( m_owned )
-        delete const_cast<wxString*>(m_str); // cast to silence warnings
-}
-
-// AsChar() and AsWChar() implementations simply forward to wxString methods
-
-inline const wchar_t* wxCStrData::AsWChar() const
-{
-    const wchar_t * const p =
-#if wxUSE_UNICODE_WCHAR
-        m_str->wc_str();
-#elif wxUSE_UNICODE_UTF8
-        m_str->AsWChar(wxMBConvStrictUTF8());
-#else
-        m_str->AsWChar(wxConvLibc);
-#endif
-
-    // in Unicode build the string always has a valid Unicode representation
-    // and even if a conversion is needed (as in UTF8 case) it can't fail
-    //
-    // but in ANSI build the string contents might be not convertible to
-    // Unicode using the current locale encoding so we do need to check for
-    // errors
-#if !wxUSE_UNICODE
-    if ( !p )
-    {
-        // if conversion fails, return empty string and not NULL to avoid
-        // crashes in code written with either wxWidgets 2 wxString or
-        // std::string behaviour in mind: neither of them ever returns NULL
-        // from its c_str() and so we shouldn't neither
-        //
-        // notice that the same is done in AsChar() below and
-        // wxString::wc_str() and mb_str() for the same reasons
-        return L"";
-    }
-#endif // !wxUSE_UNICODE
-
-    return p + m_offset;
-}
-
-inline const char* wxCStrData::AsChar() const
-{
-#if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY
-    const char * const p = m_str->AsChar(wxConvLibc);
-    if ( !p )
-        return "";
-#else // !wxUSE_UNICODE || wxUSE_UTF8_LOCALE_ONLY
-    const char * const p = m_str->mb_str();
-#endif // wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY
-
-    return p + m_offset;
-}
-
-inline wxString wxCStrData::AsString() const
-{
-    if ( m_offset == 0 )
-        return *m_str;
-    else
-        return m_str->Mid(m_offset);
-}
-
-inline const wxStringCharType *wxCStrData::AsInternal() const
-{
-#if wxUSE_UNICODE_UTF8
-    return wxStringOperations::AddToIter(m_str->wx_str(), m_offset);
-#else
-    return m_str->wx_str() + m_offset;
-#endif
-}
-
-inline wxUniChar wxCStrData::operator*() const
-{
-    if ( m_str->empty() )
-        return wxUniChar(wxT('\0'));
-    else
-        return (*m_str)[m_offset];
-}
-
-inline wxUniChar wxCStrData::operator[](size_t n) const
-{
-    // NB: we intentionally use operator[] and not at() here because the former
-    //     works for the terminating NUL while the latter does not
-    return (*m_str)[m_offset + n];
-}
-
-// ----------------------------------------------------------------------------
-// more wxCStrData operators
-// ----------------------------------------------------------------------------
-
-// we need to define those to allow "size_t pos = p - s.c_str()" where p is
-// some pointer into the string
-inline size_t operator-(const char *p, const wxCStrData& cs)
-{
-    return p - cs.AsChar();
-}
-
-inline size_t operator-(const wchar_t *p, const wxCStrData& cs)
-{
-    return p - cs.AsWChar();
-}
-
-// ----------------------------------------------------------------------------
-// implementation of wx[W]CharBuffer inline methods using wxCStrData
-// ----------------------------------------------------------------------------
-
-// FIXME-UTF8: move this to buffer.h
-inline wxCharBuffer::wxCharBuffer(const wxCStrData& cstr)
-                    : wxCharTypeBufferBase(cstr.AsCharBuf())
-{
-}
-
-inline wxWCharBuffer::wxWCharBuffer(const wxCStrData& cstr)
-                    : wxCharTypeBufferBase(cstr.AsWCharBuf())
-{
-}
-
-#if wxUSE_UNICODE_UTF8
-// ----------------------------------------------------------------------------
-// implementation of wxStringIteratorNode inline methods
-// ----------------------------------------------------------------------------
-
-void wxStringIteratorNode::DoSet(const wxString *str,
-                                 wxStringImpl::const_iterator *citer,
-                                 wxStringImpl::iterator *iter)
-{
-    m_prev = NULL;
-    m_iter = iter;
-    m_citer = citer;
-    m_str = str;
-    if ( str )
-    {
-        m_next = str->m_iterators.ptr;
-        const_cast<wxString*>(m_str)->m_iterators.ptr = this;
-        if ( m_next )
-            m_next->m_prev = this;
-    }
-    else
-    {
-        m_next = NULL;
-    }
-}
-
-void wxStringIteratorNode::clear()
-{
-    if ( m_next )
-        m_next->m_prev = m_prev;
-    if ( m_prev )
-        m_prev->m_next = m_next;
-    else if ( m_str ) // first in the list
-        const_cast<wxString*>(m_str)->m_iterators.ptr = m_next;
-
-    m_next = m_prev = NULL;
-    m_citer = NULL;
-    m_iter = NULL;
-    m_str = NULL;
-}
-#endif // wxUSE_UNICODE_UTF8
-
-#if WXWIN_COMPATIBILITY_2_8
-    // lot of code out there doesn't explicitly include wx/crt.h, but uses
-    // CRT wrappers that are now declared in wx/wxcrt.h and wx/wxcrtvararg.h,
-    // so let's include this header now that wxString is defined and it's safe
-    // to do it:
-    #include "wx/crt.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// Checks on wxString characters
-// ----------------------------------------------------------------------------
-
-template<bool (T)(const wxUniChar& c)>
-    inline bool wxStringCheck(const wxString& val)
-    {
-        for ( wxString::const_iterator i = val.begin();
-              i != val.end();
-              ++i )
-            if (T(*i) == 0)
-                return false;
-        return true;
-    }
-
-#endif  // _WX_WXSTRING_H_
+#endif  // _WX_WXSTRINGH__
diff --git a/Source/3rd Party/wx/include/wx/stringimpl.h b/Source/3rd Party/wx/include/wx/stringimpl.h
deleted file mode 100644
index ec0d0b4d5..000000000
--- a/Source/3rd Party/wx/include/wx/stringimpl.h	
+++ /dev/null
@@ -1,565 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/stringimpl.h
-// Purpose:     wxStringImpl class, implementation of wxString
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-/*
-    This header implements std::string-like string class, wxStringImpl, that is
-    used by wxString to store the data. Alternatively, if wxUSE_STD_STRING=1,
-    wxStringImpl is just a typedef to std:: string class.
-*/
-
-#ifndef _WX_WXSTRINGIMPL_H__
-#define _WX_WXSTRINGIMPL_H__
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/defs.h"        // everybody should include this
-#include "wx/chartype.h"    // for wxChar
-#include "wx/wxcrtbase.h"   // for wxStrlen() etc.
-
-#include <stdlib.h>
-
-// ---------------------------------------------------------------------------
-// macros
-// ---------------------------------------------------------------------------
-
-// implementation only
-#define   wxASSERT_VALID_INDEX(i) \
-    wxASSERT_MSG( (size_t)(i) <= length(), wxT("invalid index in wxString") )
-
-
-// ----------------------------------------------------------------------------
-// global data
-// ----------------------------------------------------------------------------
-
-// global pointer to empty string
-extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString;
-#if wxUSE_UNICODE_UTF8
-// FIXME-UTF8: we should have only one wxEmptyString
-extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl;
-#endif
-
-
-// ----------------------------------------------------------------------------
-// deal with various build options
-// ----------------------------------------------------------------------------
-
-// we use STL-based string internally if we use std::string at all now, there
-// should be no reason to prefer our internal implement but if you really need
-// it you can predefine wxUSE_STL_BASED_WXSTRING as 0 when building the library
-#ifndef wxUSE_STL_BASED_WXSTRING
-    #define wxUSE_STL_BASED_WXSTRING  wxUSE_STD_STRING
-#endif
-
-// in both cases we need to define wxStdString
-#if wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING
-
-#include "wx/beforestd.h"
-#include <string>
-#include "wx/afterstd.h"
-
-#ifdef HAVE_STD_WSTRING
-    typedef std::wstring wxStdWideString;
-#else
-    typedef std::basic_string<wchar_t> wxStdWideString;
-#endif
-
-#if wxUSE_UNICODE_WCHAR
-    typedef wxStdWideString wxStdString;
-#else
-    typedef std::string wxStdString;
-#endif
-
-#endif // wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING
-
-
-#if wxUSE_STL_BASED_WXSTRING
-
-    // we always want ctor from std::string when using std::string internally
-    #undef wxUSE_STD_STRING
-    #define wxUSE_STD_STRING 1
-
-    // the versions of std::string included with gcc 2.95 and VC6 (for which
-    // _MSC_VER == 1200) and eVC4 (_MSC_VER == 1201) lack clear() method
-    #if (defined(__GNUG__) && (__GNUG__ < 3)) || \
-        !wxCHECK_VISUALC_VERSION(7) || defined(__EVC4__)
-        #define wxSTRING_BASE_HASNT_CLEAR
-    #endif
-
-    typedef wxStdString wxStringImpl;
-#else // if !wxUSE_STL_BASED_WXSTRING
-
-// in non-STL mode, compare() is implemented in wxString and not wxStringImpl
-#undef HAVE_STD_STRING_COMPARE
-
-// ---------------------------------------------------------------------------
-// string data prepended with some housekeeping info (used by wxString class),
-// is never used directly (but had to be put here to allow inlining)
-// ---------------------------------------------------------------------------
-
-struct WXDLLIMPEXP_BASE wxStringData
-{
-  int     nRefs;        // reference count
-  size_t  nDataLength,  // actual string length
-          nAllocLength; // allocated memory size
-
-  // mimics declaration 'wxStringCharType data[nAllocLength]'
-  wxStringCharType* data() const { return (wxStringCharType*)(this + 1); }
-
-  // empty string has a special ref count so it's never deleted
-  bool  IsEmpty()   const { return (nRefs == -1); }
-  bool  IsShared()  const { return (nRefs > 1);   }
-
-  // lock/unlock
-  void  Lock()   { if ( !IsEmpty() ) nRefs++;                    }
-
-  // VC++ will refuse to inline Unlock but profiling shows that it is wrong
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-  __forceinline
-#endif
-  // VC++ free must take place in same DLL as allocation when using non dll
-  // run-time library (e.g. Multithreaded instead of Multithreaded DLL)
-#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
-  void  Unlock() { if ( !IsEmpty() && --nRefs == 0) Free();  }
-  // we must not inline deallocation since allocation is not inlined
-  void  Free();
-#else
-  void  Unlock() { if ( !IsEmpty() && --nRefs == 0) free(this);  }
-#endif
-
-  // if we had taken control over string memory (GetWriteBuf), it's
-  // intentionally put in invalid state
-  void  Validate(bool b)  { nRefs = (b ? 1 : 0); }
-  bool  IsValid() const   { return (nRefs != 0); }
-};
-
-class WXDLLIMPEXP_BASE wxStringImpl
-{
-public:
-  // an 'invalid' value for string index, moved to this place due to a CW bug
-  static const size_t npos;
-
-protected:
-  // points to data preceded by wxStringData structure with ref count info
-  wxStringCharType *m_pchData;
-
-  // accessor to string data
-  wxStringData* GetStringData() const { return (wxStringData*)m_pchData - 1; }
-
-  // string (re)initialization functions
-    // initializes the string to the empty value (must be called only from
-    // ctors, use Reinit() otherwise)
-#if wxUSE_UNICODE_UTF8
-  void Init() { m_pchData = (wxStringCharType *)wxEmptyStringImpl; } // FIXME-UTF8
-#else
-  void Init() { m_pchData = (wxStringCharType *)wxEmptyString; }
-#endif
-    // initializes the string with (a part of) C-string
-  void InitWith(const wxStringCharType *psz, size_t nPos = 0, size_t nLen = npos);
-    // as Init, but also frees old data
-  void Reinit() { GetStringData()->Unlock(); Init(); }
-
-  // memory allocation
-    // allocates memory for string of length nLen
-  bool AllocBuffer(size_t nLen);
-    // effectively copies data to string
-  bool AssignCopy(size_t, const wxStringCharType *);
-
-  // append a (sub)string
-  bool ConcatSelf(size_t nLen, const wxStringCharType *src, size_t nMaxLen);
-  bool ConcatSelf(size_t nLen, const wxStringCharType *src)
-    { return ConcatSelf(nLen, src, nLen); }
-
-  // functions called before writing to the string: they copy it if there
-  // are other references to our data (should be the only owner when writing)
-  bool CopyBeforeWrite();
-  bool AllocBeforeWrite(size_t);
-
-    // compatibility with wxString
-  bool Alloc(size_t nLen);
-
-public:
-  // standard types
-  typedef wxStringCharType value_type;
-  typedef wxStringCharType char_type;
-  typedef size_t size_type;
-  typedef value_type& reference;
-  typedef const value_type& const_reference;
-  typedef value_type* pointer;
-  typedef const value_type* const_pointer;
-
-  // macro to define the bulk of iterator and const_iterator classes
-  #define WX_DEFINE_STRINGIMPL_ITERATOR(iterator_name, ref_type, ptr_type)    \
-    public:                                                                   \
-        typedef wxStringCharType value_type;                                  \
-        typedef ref_type reference;                                           \
-        typedef ptr_type pointer;                                             \
-        typedef int difference_type;                                          \
-                                                                              \
-        iterator_name() : m_ptr(NULL) { }                                     \
-        iterator_name(pointer ptr) : m_ptr(ptr) { }                           \
-                                                                              \
-        reference operator*() const { return *m_ptr; }                        \
-                                                                              \
-        iterator_name& operator++() { m_ptr++; return *this; }                \
-        iterator_name operator++(int)                                         \
-        {                                                                     \
-            const iterator_name tmp(*this);                                   \
-            m_ptr++;                                                          \
-            return tmp;                                                       \
-        }                                                                     \
-                                                                              \
-        iterator_name& operator--() { m_ptr--; return *this; }                \
-        iterator_name operator--(int)                                         \
-        {                                                                     \
-            const iterator_name tmp(*this);                                   \
-            m_ptr--;                                                          \
-            return tmp;                                                       \
-        }                                                                     \
-                                                                              \
-        iterator_name operator+(ptrdiff_t n) const                            \
-            { return iterator_name(m_ptr + n); }                              \
-        iterator_name operator-(ptrdiff_t n) const                            \
-            { return iterator_name(m_ptr - n); }                              \
-        iterator_name& operator+=(ptrdiff_t n)                                \
-            { m_ptr += n; return *this; }                                     \
-        iterator_name& operator-=(ptrdiff_t n)                                \
-            { m_ptr -= n; return *this; }                                     \
-                                                                              \
-        difference_type operator-(const iterator_name& i) const               \
-            { return m_ptr - i.m_ptr; }                                       \
-                                                                              \
-        bool operator==(const iterator_name& i) const                         \
-          { return m_ptr == i.m_ptr; }                                        \
-        bool operator!=(const iterator_name& i) const                         \
-          { return m_ptr != i.m_ptr; }                                        \
-                                                                              \
-        bool operator<(const iterator_name& i) const                          \
-          { return m_ptr < i.m_ptr; }                                         \
-        bool operator>(const iterator_name& i) const                          \
-          { return m_ptr > i.m_ptr; }                                         \
-        bool operator<=(const iterator_name& i) const                         \
-          { return m_ptr <= i.m_ptr; }                                        \
-        bool operator>=(const iterator_name& i) const                         \
-          { return m_ptr >= i.m_ptr; }                                        \
-                                                                              \
-    private:                                                                  \
-        /* for wxStringImpl use only */                                       \
-        pointer GetPtr() const { return m_ptr; }                              \
-                                                                              \
-        friend class wxStringImpl;                                            \
-                                                                              \
-        pointer m_ptr
-
-  // we need to declare const_iterator in wxStringImpl scope, the friend
-  // declaration inside iterator class itself is not enough, or at least not
-  // for g++ 3.4 (g++ 4 is ok)
-  class WXDLLIMPEXP_FWD_BASE const_iterator;
-
-  class WXDLLIMPEXP_BASE iterator
-  {
-    WX_DEFINE_STRINGIMPL_ITERATOR(iterator,
-                                  wxStringCharType&,
-                                  wxStringCharType*);
-
-    friend class const_iterator;
-  };
-
-  class WXDLLIMPEXP_BASE const_iterator
-  {
-  public:
-      const_iterator(iterator i) : m_ptr(i.m_ptr) { }
-
-      WX_DEFINE_STRINGIMPL_ITERATOR(const_iterator,
-                                    const wxStringCharType&,
-                                    const wxStringCharType*);
-  };
-
-  #undef WX_DEFINE_STRINGIMPL_ITERATOR
-
-
-  // constructors and destructor
-    // ctor for an empty string
-  wxStringImpl() { Init(); }
-    // copy ctor
-  wxStringImpl(const wxStringImpl& stringSrc)
-  {
-    wxASSERT_MSG( stringSrc.GetStringData()->IsValid(),
-                  wxT("did you forget to call UngetWriteBuf()?") );
-
-    if ( stringSrc.empty() ) {
-      // nothing to do for an empty string
-      Init();
-    }
-    else {
-      m_pchData = stringSrc.m_pchData;            // share same data
-      GetStringData()->Lock();                    // => one more copy
-    }
-  }
-    // string containing nRepeat copies of ch
-  wxStringImpl(size_type nRepeat, wxStringCharType ch);
-    // ctor takes first nLength characters from C string
-    // (default value of npos means take all the string)
-  wxStringImpl(const wxStringCharType *psz)
-      { InitWith(psz, 0, npos); }
-  wxStringImpl(const wxStringCharType *psz, size_t nLength)
-      { InitWith(psz, 0, nLength); }
-    // take nLen chars starting at nPos
-  wxStringImpl(const wxStringImpl& str, size_t nPos, size_t nLen)
-  {
-    wxASSERT_MSG( str.GetStringData()->IsValid(),
-                  wxT("did you forget to call UngetWriteBuf()?") );
-    Init();
-    size_t strLen = str.length() - nPos; nLen = strLen < nLen ? strLen : nLen;
-    InitWith(str.c_str(), nPos, nLen);
-  }
-    // take everything between start and end
-  wxStringImpl(const_iterator start, const_iterator end);
-
-
-    // ctor from and conversion to std::string
-#if wxUSE_STD_STRING
-  wxStringImpl(const wxStdString& impl)
-      { InitWith(impl.c_str(), 0, impl.length()); }
-
-  operator wxStdString() const
-      { return wxStdString(c_str(), length()); }
-#endif
-
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-    // disable warning about Unlock() below not being inlined (first, it
-    // seems to be inlined nevertheless and second, even if it isn't, there
-    // is nothing we can do about this
-    #pragma warning(push)
-    #pragma warning (disable:4714)
-#endif
-
-    // dtor is not virtual, this class must not be inherited from!
-  ~wxStringImpl()
-  {
-      GetStringData()->Unlock();
-  }
-
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-    #pragma warning(pop)
-#endif
-
-  // overloaded assignment
-    // from another wxString
-  wxStringImpl& operator=(const wxStringImpl& stringSrc);
-    // from a character
-  wxStringImpl& operator=(wxStringCharType ch);
-    // from a C string
-  wxStringImpl& operator=(const wxStringCharType *psz);
-
-    // return the length of the string
-  size_type length() const { return GetStringData()->nDataLength; }
-    // return the length of the string
-  size_type size() const { return length(); }
-    // return the maximum size of the string
-  size_type max_size() const { return npos; }
-    // resize the string, filling the space with c if c != 0
-  void resize(size_t nSize, wxStringCharType ch = '\0');
-    // delete the contents of the string
-  void clear() { erase(0, npos); }
-    // returns true if the string is empty
-  bool empty() const { return length() == 0; }
-    // inform string about planned change in size
-  void reserve(size_t sz) { Alloc(sz); }
-  size_type capacity() const { return GetStringData()->nAllocLength; }
-
-  // lib.string.access
-    // return the character at position n
-  value_type operator[](size_type n) const { return m_pchData[n]; }
-  value_type at(size_type n) const
-    { wxASSERT_VALID_INDEX( n ); return m_pchData[n]; }
-    // returns the writable character at position n
-  reference operator[](size_type n) { CopyBeforeWrite(); return m_pchData[n]; }
-  reference at(size_type n)
-  {
-    wxASSERT_VALID_INDEX( n );
-    CopyBeforeWrite();
-    return m_pchData[n];
-  } // FIXME-UTF8: not useful for us...?
-
-  // lib.string.modifiers
-    // append elements str[pos], ..., str[pos+n]
-  wxStringImpl& append(const wxStringImpl& str, size_t pos, size_t n)
-  {
-    wxASSERT(pos <= str.length());
-    ConcatSelf(n, str.c_str() + pos, str.length() - pos);
-    return *this;
-  }
-    // append a string
-  wxStringImpl& append(const wxStringImpl& str)
-    { ConcatSelf(str.length(), str.c_str()); return *this; }
-    // append first n (or all if n == npos) characters of sz
-  wxStringImpl& append(const wxStringCharType *sz)
-    { ConcatSelf(wxStrlen(sz), sz); return *this; }
-  wxStringImpl& append(const wxStringCharType *sz, size_t n)
-    { ConcatSelf(n, sz); return *this; }
-    // append n copies of ch
-  wxStringImpl& append(size_t n, wxStringCharType ch);
-    // append from first to last
-  wxStringImpl& append(const_iterator first, const_iterator last)
-    { ConcatSelf(last - first, first.GetPtr()); return *this; }
-
-    // same as `this_string = str'
-  wxStringImpl& assign(const wxStringImpl& str)
-    { return *this = str; }
-    // same as ` = str[pos..pos + n]
-  wxStringImpl& assign(const wxStringImpl& str, size_t pos, size_t n)
-    { return replace(0, npos, str, pos, n); }
-    // same as `= first n (or all if n == npos) characters of sz'
-  wxStringImpl& assign(const wxStringCharType *sz)
-    { return replace(0, npos, sz, wxStrlen(sz)); }
-  wxStringImpl& assign(const wxStringCharType *sz, size_t n)
-    { return replace(0, npos, sz, n); }
-    // same as `= n copies of ch'
-  wxStringImpl& assign(size_t n, wxStringCharType ch)
-    { return replace(0, npos, n, ch); }
-    // assign from first to last
-  wxStringImpl& assign(const_iterator first, const_iterator last)
-    { return replace(begin(), end(), first, last); }
-
-    // first valid index position
-  const_iterator begin() const { return m_pchData; }
-  iterator begin();
-    // position one after the last valid one
-  const_iterator end() const { return m_pchData + length(); }
-  iterator end();
-
-    // insert another string
-  wxStringImpl& insert(size_t nPos, const wxStringImpl& str)
-  {
-    wxASSERT( str.GetStringData()->IsValid() );
-    return insert(nPos, str.c_str(), str.length());
-  }
-    // insert n chars of str starting at nStart (in str)
-  wxStringImpl& insert(size_t nPos, const wxStringImpl& str, size_t nStart, size_t n)
-  {
-    wxASSERT( str.GetStringData()->IsValid() );
-    wxASSERT( nStart < str.length() );
-    size_t strLen = str.length() - nStart;
-    n = strLen < n ? strLen : n;
-    return insert(nPos, str.c_str() + nStart, n);
-  }
-    // insert first n (or all if n == npos) characters of sz
-  wxStringImpl& insert(size_t nPos, const wxStringCharType *sz, size_t n = npos);
-    // insert n copies of ch
-  wxStringImpl& insert(size_t nPos, size_t n, wxStringCharType ch)
-    { return insert(nPos, wxStringImpl(n, ch)); }
-  iterator insert(iterator it, wxStringCharType ch)
-    { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; }
-  void insert(iterator it, const_iterator first, const_iterator last)
-    { insert(it - begin(), first.GetPtr(), last - first); }
-  void insert(iterator it, size_type n, wxStringCharType ch)
-    { insert(it - begin(), n, ch); }
-
-    // delete characters from nStart to nStart + nLen
-  wxStringImpl& erase(size_type pos = 0, size_type n = npos);
-  iterator erase(iterator first, iterator last)
-  {
-    size_t idx = first - begin();
-    erase(idx, last - first);
-    return begin() + idx;
-  }
-  iterator erase(iterator first);
-
-  // explicit conversion to C string (use this with printf()!)
-  const wxStringCharType* c_str() const { return m_pchData; }
-  const wxStringCharType* data() const { return m_pchData; }
-
-    // replaces the substring of length nLen starting at nStart
-  wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringCharType* sz)
-    { return replace(nStart, nLen, sz, npos); }
-    // replaces the substring of length nLen starting at nStart
-  wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringImpl& str)
-    { return replace(nStart, nLen, str.c_str(), str.length()); }
-    // replaces the substring with nCount copies of ch
-  wxStringImpl& replace(size_t nStart, size_t nLen,
-                        size_t nCount, wxStringCharType ch)
-    { return replace(nStart, nLen, wxStringImpl(nCount, ch)); }
-    // replaces a substring with another substring
-  wxStringImpl& replace(size_t nStart, size_t nLen,
-                        const wxStringImpl& str, size_t nStart2, size_t nLen2)
-    { return replace(nStart, nLen, str.substr(nStart2, nLen2)); }
-    // replaces the substring with first nCount chars of sz
-  wxStringImpl& replace(size_t nStart, size_t nLen,
-                        const wxStringCharType* sz, size_t nCount);
-
-  wxStringImpl& replace(iterator first, iterator last, const_pointer s)
-    { return replace(first - begin(), last - first, s); }
-  wxStringImpl& replace(iterator first, iterator last, const_pointer s,
-                        size_type n)
-    { return replace(first - begin(), last - first, s, n); }
-  wxStringImpl& replace(iterator first, iterator last, const wxStringImpl& s)
-    { return replace(first - begin(), last - first, s); }
-  wxStringImpl& replace(iterator first, iterator last, size_type n, wxStringCharType c)
-    { return replace(first - begin(), last - first, n, c); }
-  wxStringImpl& replace(iterator first, iterator last,
-                        const_iterator first1, const_iterator last1)
-    { return replace(first - begin(), last - first, first1.GetPtr(), last1 - first1); }
-
-    // swap two strings
-  void swap(wxStringImpl& str);
-
-    // All find() functions take the nStart argument which specifies the
-    // position to start the search on, the default value is 0. All functions
-    // return npos if there were no match.
-
-    // find a substring
-  size_t find(const wxStringImpl& str, size_t nStart = 0) const;
-
-    // find first n characters of sz
-  size_t find(const wxStringCharType* sz, size_t nStart = 0, size_t n = npos) const;
-
-    // find the first occurrence of character ch after nStart
-  size_t find(wxStringCharType ch, size_t nStart = 0) const;
-
-    // rfind() family is exactly like find() but works right to left
-
-    // as find, but from the end
-  size_t rfind(const wxStringImpl& str, size_t nStart = npos) const;
-
-    // as find, but from the end
-  size_t rfind(const wxStringCharType* sz, size_t nStart = npos,
-               size_t n = npos) const;
-    // as find, but from the end
-  size_t rfind(wxStringCharType ch, size_t nStart = npos) const;
-
-  size_type copy(wxStringCharType* s, size_type n, size_type pos = 0);
-
-  // substring extraction
-  wxStringImpl substr(size_t nStart = 0, size_t nLen = npos) const;
-
-      // string += string
-  wxStringImpl& operator+=(const wxStringImpl& s) { return append(s); }
-      // string += C string
-  wxStringImpl& operator+=(const wxStringCharType *psz) { return append(psz); }
-      // string += char
-  wxStringImpl& operator+=(wxStringCharType ch) { return append(1, ch); }
-
-  // helpers for wxStringBuffer and wxStringBufferLength
-  wxStringCharType *DoGetWriteBuf(size_t nLen);
-  void DoUngetWriteBuf();
-  void DoUngetWriteBuf(size_t nLen);
-
-  friend class WXDLLIMPEXP_FWD_BASE wxString;
-};
-
-#endif // !wxUSE_STL_BASED_WXSTRING
-
-// don't pollute the library user's name space
-#undef wxASSERT_VALID_INDEX
-
-#endif  // _WX_WXSTRINGIMPL_H__
diff --git a/Source/3rd Party/wx/include/wx/stringops.h b/Source/3rd Party/wx/include/wx/stringops.h
deleted file mode 100644
index 929dffc37..000000000
--- a/Source/3rd Party/wx/include/wx/stringops.h	
+++ /dev/null
@@ -1,175 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/stringops.h
-// Purpose:     implementation of wxString primitive operations
-// Author:      Vaclav Slavik
-// Modified by:
-// Created:     2007-04-16
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 REA Elektronik GmbH
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WXSTRINGOPS_H__
-#define _WX_WXSTRINGOPS_H__
-
-#include "wx/chartype.h"
-#include "wx/stringimpl.h"
-#include "wx/unichar.h"
-#include "wx/buffer.h"
-
-// This header contains wxStringOperations "namespace" class that implements
-// elementary operations on string data as static methods; wxString methods and
-// iterators are implemented in terms of it. Two implementations are available,
-// one for UTF-8 encoded char* string and one for "raw" wchar_t* strings (or
-// char* in ANSI build).
-
-// FIXME-UTF8: only wchar after we remove ANSI build
-#if wxUSE_UNICODE_WCHAR || !wxUSE_UNICODE
-struct WXDLLIMPEXP_BASE wxStringOperationsWchar
-{
-    // moves the iterator to the next Unicode character
-    template <typename Iterator>
-    static void IncIter(Iterator& i) { ++i; }
-
-    // moves the iterator to the previous Unicode character
-    template <typename Iterator>
-    static void DecIter(Iterator& i) { --i; }
-
-    // moves the iterator by n Unicode characters
-    template <typename Iterator>
-    static Iterator AddToIter(const Iterator& i, ptrdiff_t n)
-        { return i + n; }
-
-    // returns distance of the two iterators in Unicode characters
-    template <typename Iterator>
-    static ptrdiff_t DiffIters(const Iterator& i1, const Iterator& i2)
-        { return i1 - i2; }
-
-    // encodes the character to a form used to represent it in internal
-    // representation (returns a string in UTF8 version)
-    static wxChar EncodeChar(const wxUniChar& ch) { return (wxChar)ch; }
-
-    static wxUniChar DecodeChar(const wxStringImpl::const_iterator& i)
-        { return *i; }
-};
-#endif // wxUSE_UNICODE_WCHAR || !wxUSE_UNICODE
-
-
-#if wxUSE_UNICODE_UTF8
-struct WXDLLIMPEXP_BASE wxStringOperationsUtf8
-{
-    // checks correctness of UTF-8 sequence
-    static bool IsValidUtf8String(const char *c,
-                                  size_t len = wxStringImpl::npos);
-    static bool IsValidUtf8LeadByte(unsigned char c)
-    {
-        return (c <= 0x7F) || (c >= 0xC2 && c <= 0xF4);
-    }
-
-    // table of offsets to skip forward when iterating over UTF-8 sequence
-    static const unsigned char ms_utf8IterTable[256];
-
-
-    template<typename Iterator>
-    static void IncIter(Iterator& i)
-    {
-        wxASSERT( IsValidUtf8LeadByte(*i) );
-        i += ms_utf8IterTable[(unsigned char)*i];
-    }
-
-    template<typename Iterator>
-    static void DecIter(Iterator& i)
-    {
-        wxASSERT( IsValidUtf8LeadByte(*i) );
-
-        // Non-lead bytes are all in the 0x80..0xBF range (i.e. 10xxxxxx in
-        // binary), so we just have to go back until we hit a byte that is
-        // either < 0x80 (i.e. 0xxxxxxx in binary) or 0xC0..0xFF (11xxxxxx in
-        // binary; this includes some invalid values, but we can ignore it
-        // here, because we assume valid UTF-8 input for the purpose of
-        // efficient implementation).
-        --i;
-        while ( ((*i) & 0xC0) == 0x80 /* 2 highest bits are '10' */ )
-            --i;
-    }
-
-    template<typename Iterator>
-    static Iterator AddToIter(const Iterator& i, ptrdiff_t n)
-    {
-        Iterator out(i);
-
-        if ( n > 0 )
-        {
-            for ( ptrdiff_t j = 0; j < n; ++j )
-                IncIter(out);
-        }
-        else if ( n < 0 )
-        {
-            for ( ptrdiff_t j = 0; j > n; --j )
-                DecIter(out);
-        }
-
-        return out;
-    }
-
-    template<typename Iterator>
-    static ptrdiff_t DiffIters(Iterator i1, Iterator i2)
-    {
-        ptrdiff_t dist = 0;
-
-        if ( i1 < i2 )
-        {
-            while ( i1 != i2 )
-            {
-                IncIter(i1);
-                dist--;
-            }
-        }
-        else if ( i2 < i1 )
-        {
-            while ( i2 != i1 )
-            {
-                IncIter(i2);
-                dist++;
-            }
-        }
-
-        return dist;
-    }
-
-    // encodes the character as UTF-8:
-    typedef wxUniChar::Utf8CharBuffer Utf8CharBuffer;
-    static Utf8CharBuffer EncodeChar(const wxUniChar& ch)
-        { return ch.AsUTF8(); }
-
-    // returns n copies of ch encoded in UTF-8 string
-    static wxCharBuffer EncodeNChars(size_t n, const wxUniChar& ch);
-
-    // returns the length of UTF-8 encoding of the character with lead byte 'c'
-    static size_t GetUtf8CharLength(char c)
-    {
-        wxASSERT( IsValidUtf8LeadByte(c) );
-        return ms_utf8IterTable[(unsigned char)c];
-    }
-
-    // decodes single UTF-8 character from UTF-8 string
-    static wxUniChar DecodeChar(wxStringImpl::const_iterator i)
-    {
-        if ( (unsigned char)*i < 0x80 )
-            return (int)*i;
-        return DecodeNonAsciiChar(i);
-    }
-
-private:
-    static wxUniChar DecodeNonAsciiChar(wxStringImpl::const_iterator i);
-};
-#endif // wxUSE_UNICODE_UTF8
-
-
-#if wxUSE_UNICODE_UTF8
-typedef wxStringOperationsUtf8 wxStringOperations;
-#else
-typedef wxStringOperationsWchar wxStringOperations;
-#endif
-
-#endif  // _WX_WXSTRINGOPS_H_
diff --git a/Source/3rd Party/wx/include/wx/strvararg.h b/Source/3rd Party/wx/include/wx/strvararg.h
deleted file mode 100644
index 095052360..000000000
--- a/Source/3rd Party/wx/include/wx/strvararg.h	
+++ /dev/null
@@ -1,1224 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/strvararg.h
-// Purpose:     macros for implementing type-safe vararg passing of strings
-// Author:      Vaclav Slavik
-// Created:     2007-02-19
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 REA Elektronik GmbH
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STRVARARG_H_
-#define _WX_STRVARARG_H_
-
-#include "wx/platform.h"
-#if wxONLY_WATCOM_EARLIER_THAN(1,4)
-    #error "OpenWatcom version >= 1.4 is required to compile this code"
-#endif
-
-#include "wx/cpp.h"
-#include "wx/chartype.h"
-#include "wx/strconv.h"
-#include "wx/buffer.h"
-#include "wx/unichar.h"
-
-#if defined(HAVE_TYPE_TRAITS)
-    #include <type_traits>
-#elif defined(HAVE_TR1_TYPE_TRAITS)
-    #ifdef __VISUALC__
-        #include <type_traits>
-    #else
-        #include <tr1/type_traits>
-    #endif
-#endif
-
-class WXDLLIMPEXP_FWD_BASE wxCStrData;
-class WXDLLIMPEXP_FWD_BASE wxString;
-
-// ----------------------------------------------------------------------------
-// WX_DEFINE_VARARG_FUNC* macros
-// ----------------------------------------------------------------------------
-
-// This macro is used to implement type-safe wrappers for variadic functions
-// that accept strings as arguments. This makes it possible to pass char*,
-// wchar_t* or even wxString (as opposed to having to use wxString::c_str())
-// to e.g. wxPrintf().
-//
-// This is done by defining a set of N template function taking 1..N arguments
-// (currently, N is set to 30 in this header). These functions are just thin
-// wrappers around another variadic function ('impl' or 'implUtf8' arguments,
-// see below) and the only thing the wrapper does is that it normalizes the
-// arguments passed in so that they are of the type expected by variadic
-// functions taking string arguments, i.e., char* or wchar_t*, depending on the
-// build:
-//   * char* in the current locale's charset in ANSI build
-//   * char* with UTF-8 encoding if wxUSE_UNICODE_UTF8 and the app is running
-//     under an UTF-8 locale
-//   * wchar_t* if wxUSE_UNICODE_WCHAR or if wxUSE_UNICODE_UTF8 and the current
-//     locale is not UTF-8
-//
-// Note that wxFormatString *must* be used for the format parameter of these
-// functions, otherwise the implementation won't work correctly. Furthermore,
-// it must be passed by value, not reference, because it's modified by the
-// vararg templates internally.
-//
-// Parameters:
-// [ there are examples in square brackets showing values of the parameters
-//   for the wxFprintf() wrapper for fprintf() function with the following
-//   prototype:
-//   int wxFprintf(FILE *stream, const wxString& format, ...); ]
-//
-//        rettype   Functions' return type  [int]
-//        name      Name of the function  [fprintf]
-//        numfixed  The number of leading "fixed" (i.e., not variadic)
-//                  arguments of the function (e.g. "stream" and "format"
-//                  arguments of fprintf()); their type is _not_ converted
-//                  using wxArgNormalizer<T>, unlike the rest of
-//                  the function's arguments  [2]
-//        fixed     List of types of the leading "fixed" arguments, in
-//                  parenthesis  [(FILE*,const wxString&)]
-//        impl      Name of the variadic function that implements 'name' for
-//                  the native strings representation (wchar_t* if
-//                  wxUSE_UNICODE_WCHAR or wxUSE_UNICODE_UTF8 when running under
-//                  non-UTF8 locale, char* in ANSI build)  [wxCrt_Fprintf]
-//        implUtf8  Like 'impl', but for the UTF-8 char* version to be used
-//                  if wxUSE_UNICODE_UTF8 and running under UTF-8 locale
-//                  (ignored otherwise)  [fprintf]
-//
-#define WX_DEFINE_VARARG_FUNC(rettype, name, numfixed, fixed, impl, implUtf8) \
-    _WX_VARARG_DEFINE_FUNC_N0(rettype, name, impl, implUtf8, numfixed, fixed) \
-    WX_DEFINE_VARARG_FUNC_SANS_N0(rettype, name, numfixed, fixed, impl, implUtf8)
-
-// ditto, but without the version with 0 template/vararg arguments
-#define WX_DEFINE_VARARG_FUNC_SANS_N0(rettype, name,                          \
-                                       numfixed, fixed, impl, implUtf8)       \
-    _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS,                                      \
-                    _WX_VARARG_DEFINE_FUNC,                                   \
-                    rettype, name, impl, implUtf8, numfixed, fixed)
-
-// Like WX_DEFINE_VARARG_FUNC, but for variadic functions that don't return
-// a value.
-#define WX_DEFINE_VARARG_FUNC_VOID(name, numfixed, fixed, impl, implUtf8)     \
-    _WX_VARARG_DEFINE_FUNC_VOID_N0(name, impl, implUtf8, numfixed, fixed)     \
-    _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS,                                      \
-                    _WX_VARARG_DEFINE_FUNC_VOID,                              \
-                    void, name, impl, implUtf8, numfixed, fixed)
-
-// Like WX_DEFINE_VARARG_FUNC_VOID, but instead of wrapping an implementation
-// function, does nothing in defined functions' bodies.
-//
-// Used to implement wxLogXXX functions if wxUSE_LOG=0.
-#define WX_DEFINE_VARARG_FUNC_NOP(name, numfixed, fixed)                      \
-        _WX_VARARG_DEFINE_FUNC_NOP_N0(name, numfixed, fixed)                  \
-        _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS,                                  \
-                        _WX_VARARG_DEFINE_FUNC_NOP,                           \
-                        void, name, dummy, dummy, numfixed, fixed)
-
-// Like WX_DEFINE_VARARG_FUNC_CTOR, but for defining template constructors
-#define WX_DEFINE_VARARG_FUNC_CTOR(name, numfixed, fixed, impl, implUtf8)     \
-    _WX_VARARG_DEFINE_FUNC_CTOR_N0(name, impl, implUtf8, numfixed, fixed)     \
-    _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS,                                      \
-                    _WX_VARARG_DEFINE_FUNC_CTOR,                              \
-                    void, name, impl, implUtf8, numfixed, fixed)
-
-
-// ----------------------------------------------------------------------------
-// wxFormatString
-// ----------------------------------------------------------------------------
-
-// This class must be used for format string argument of the functions
-// defined using WX_DEFINE_VARARG_FUNC_* macros. It converts the string to
-// char* or wchar_t* for passing to implementation function efficiently (i.e.
-// without keeping the converted string in memory for longer than necessary,
-// like c_str()). It also converts format string to the correct form that
-// accounts for string changes done by wxArgNormalizer<>
-//
-// Note that this class can _only_ be used for function arguments!
-class WXDLLIMPEXP_BASE wxFormatString
-{
-public:
-    wxFormatString(const char *str)
-        : m_char(wxScopedCharBuffer::CreateNonOwned(str)), m_str(NULL), m_cstr(NULL) {}
-    wxFormatString(const wchar_t *str)
-        : m_wchar(wxScopedWCharBuffer::CreateNonOwned(str)), m_str(NULL), m_cstr(NULL) {}
-    wxFormatString(const wxString& str)
-        : m_str(&str), m_cstr(NULL) {}
-    wxFormatString(const wxCStrData& str)
-        : m_str(NULL), m_cstr(&str) {}
-    wxFormatString(const wxScopedCharBuffer& str)
-        : m_char(str), m_str(NULL), m_cstr(NULL)  {}
-    wxFormatString(const wxScopedWCharBuffer& str)
-        : m_wchar(str), m_str(NULL), m_cstr(NULL) {}
-
-    // Possible argument types. These are or-combinable for wxASSERT_ARG_TYPE
-    // convenience. Some of the values are or-combined with another value, this
-    // expresses "supertypes" for use with wxASSERT_ARG_TYPE masks. For example,
-    // a char* string is also a pointer and an integer is also a char.
-    enum ArgumentType
-    {
-        Arg_Char        = 0x0001,    // character as char %c
-        Arg_Pointer     = 0x0002,    // %p
-        Arg_String      = 0x0004 | Arg_Pointer, // any form of string (%s and %p too)
-
-        Arg_Int         = 0x0008 | Arg_Char, // (ints can be used with %c)
-#if SIZEOF_INT == SIZEOF_LONG
-        Arg_LongInt     = Arg_Int,
-#else
-        Arg_LongInt     = 0x0010,
-#endif
-#if defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG == SIZEOF_LONG
-        Arg_LongLongInt = Arg_LongInt,
-#elif defined(wxLongLong_t)
-        Arg_LongLongInt = 0x0020,
-#endif
-
-        Arg_Double      = 0x0040,
-        Arg_LongDouble  = 0x0080,
-
-#if defined(wxSIZE_T_IS_UINT)
-        Arg_Size_t      = Arg_Int,
-#elif defined(wxSIZE_T_IS_ULONG)
-        Arg_Size_t      = Arg_LongInt,
-#elif defined(SIZEOF_LONG_LONG) && SIZEOF_SIZE_T == SIZEOF_LONG_LONG
-        Arg_Size_t      = Arg_LongLongInt,
-#else
-        Arg_Size_t      = 0x0100,
-#endif
-
-        Arg_IntPtr      = 0x0200,    // %n -- store # of chars written
-        Arg_ShortIntPtr = 0x0400,
-        Arg_LongIntPtr  = 0x0800,
-
-        Arg_Unknown     = 0x8000     // unrecognized specifier (likely error)
-    };
-
-    // returns the type of format specifier for n-th variadic argument (this is
-    // not necessarily n-th format specifier if positional specifiers are used);
-    // called by wxArgNormalizer<> specializations to get information about
-    // n-th variadic argument desired representation
-    ArgumentType GetArgumentType(unsigned n) const;
-
-    // returns the value passed to ctor, only converted to wxString, similarly
-    // to other InputAsXXX() methods
-    wxString InputAsString() const;
-
-#if !wxUSE_UNICODE_WCHAR
-    operator const char*() const
-        { return const_cast<wxFormatString*>(this)->AsChar(); }
-private:
-    // InputAsChar() returns the value passed to ctor, only converted
-    // to char, while AsChar() takes the string returned by InputAsChar()
-    // and does format string conversion on it as well (and similarly for
-    // ..AsWChar() below)
-    const char* InputAsChar();
-    const char* AsChar();
-    wxScopedCharBuffer m_convertedChar;
-#endif // !wxUSE_UNICODE_WCHAR
-
-#if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY
-public:
-    operator const wchar_t*() const
-        { return const_cast<wxFormatString*>(this)->AsWChar(); }
-private:
-    const wchar_t* InputAsWChar();
-    const wchar_t* AsWChar();
-    wxScopedWCharBuffer m_convertedWChar;
-#endif // wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY
-
-private:
-    wxScopedCharBuffer  m_char;
-    wxScopedWCharBuffer m_wchar;
-
-    // NB: we can use a pointer here, because wxFormatString is only used
-    //     as function argument, so it has shorter life than the string
-    //     passed to the ctor
-    const wxString * const m_str;
-    const wxCStrData * const m_cstr;
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxFormatString);
-};
-
-// these two helper classes are used to find wxFormatString argument among fixed
-// arguments passed to a vararg template
-struct wxFormatStringArgument
-{
-    wxFormatStringArgument(const wxFormatString *s = NULL) : m_str(s) {}
-    const wxFormatString *m_str;
-
-    // overriding this operator allows us to reuse _WX_VARARG_JOIN macro
-    wxFormatStringArgument operator,(const wxFormatStringArgument& a) const
-    {
-        wxASSERT_MSG( m_str == NULL || a.m_str == NULL,
-                      "can't have two format strings in vararg function" );
-        return wxFormatStringArgument(m_str ? m_str : a.m_str);
-    }
-
-    operator const wxFormatString*() const { return m_str; }
-};
-
-template<typename T>
-struct wxFormatStringArgumentFinder
-{
-    static wxFormatStringArgument find(T)
-    {
-        // by default, arguments are not format strings, so return "not found"
-        return wxFormatStringArgument();
-    }
-};
-
-template<>
-struct wxFormatStringArgumentFinder<const wxFormatString&>
-{
-    static wxFormatStringArgument find(const wxFormatString& arg)
-        { return wxFormatStringArgument(&arg); }
-};
-
-template<>
-struct wxFormatStringArgumentFinder<wxFormatString>
-    : public wxFormatStringArgumentFinder<const wxFormatString&> {};
-
-// avoid passing big objects by value to wxFormatStringArgumentFinder::find()
-// (and especially wx[W]CharBuffer with its auto_ptr<> style semantics!):
-template<>
-struct wxFormatStringArgumentFinder<wxString>
-    : public wxFormatStringArgumentFinder<const wxString&> {};
-
-template<>
-struct wxFormatStringArgumentFinder<wxScopedCharBuffer>
-    : public wxFormatStringArgumentFinder<const wxScopedCharBuffer&> {};
-
-template<>
-struct wxFormatStringArgumentFinder<wxScopedWCharBuffer>
-    : public wxFormatStringArgumentFinder<const wxScopedWCharBuffer&> {};
-
-template<>
-struct wxFormatStringArgumentFinder<wxCharBuffer>
-    : public wxFormatStringArgumentFinder<const wxCharBuffer&> {};
-
-template<>
-struct wxFormatStringArgumentFinder<wxWCharBuffer>
-    : public wxFormatStringArgumentFinder<const wxWCharBuffer&> {};
-
-
-// ----------------------------------------------------------------------------
-// wxArgNormalizer*<T> converters
-// ----------------------------------------------------------------------------
-
-#if wxDEBUG_LEVEL
-    // Check that the format specifier for index-th argument in 'fmt' has
-    // the correct type (one of wxFormatString::Arg_XXX or-combination in
-    // 'expected_mask').
-    #define wxASSERT_ARG_TYPE(fmt, index, expected_mask)                    \
-        do                                                                  \
-        {                                                                   \
-            if ( !fmt )                                                     \
-                break;                                                      \
-            const int argtype = fmt->GetArgumentType(index);                \
-            wxASSERT_MSG( (argtype & (expected_mask)) == argtype,           \
-                          "format specifier doesn't match argument type" ); \
-        } while ( wxFalse )
-#else
-    // Just define it to suppress "unused parameter" warnings for the
-    // parameters which we don't use otherwise
-    #define wxASSERT_ARG_TYPE(fmt, index, expected_mask)                      \
-        wxUnusedVar(fmt);                                                     \
-        wxUnusedVar(index)
-#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
-
-
-#if defined(HAVE_TYPE_TRAITS) || defined(HAVE_TR1_TYPE_TRAITS)
-
-// Note: this type is misnamed, so that the error message is easier to
-// understand (no error happens for enums, because the IsEnum=true case is
-// specialized).
-template<bool IsEnum>
-struct wxFormatStringSpecifierNonPodType {};
-
-template<>
-struct wxFormatStringSpecifierNonPodType<true>
-{
-    enum { value = wxFormatString::Arg_Int };
-};
-
-template<typename T>
-struct wxFormatStringSpecifier
-{
-#ifdef HAVE_TYPE_TRAITS
-    typedef std::is_enum<T> is_enum;
-#elif defined HAVE_TR1_TYPE_TRAITS
-    typedef std::tr1::is_enum<T> is_enum;
-#endif
-    enum { value = wxFormatStringSpecifierNonPodType<is_enum::value>::value };
-};
-
-#else // !HAVE_(TR1_)TYPE_TRAITS
-
-template<typename T>
-struct wxFormatStringSpecifier
-{
-    // We can't detect enums without is_enum, so the only thing we can
-    // do is to accept unknown types. However, the only acceptable unknown
-    // types still are enums, which are promoted to ints, so return Arg_Int
-    // here. This will at least catch passing of non-POD types through ... at
-    // runtime.
-    //
-    // Furthermore, if the compiler doesn't have partial template
-    // specialization, we didn't cover pointers either.
-#ifdef HAVE_PARTIAL_SPECIALIZATION
-    enum { value = wxFormatString::Arg_Int };
-#else
-    enum { value = wxFormatString::Arg_Int | wxFormatString::Arg_Pointer };
-#endif
-};
-
-#endif // HAVE_TR1_TYPE_TRAITS/!HAVE_TR1_TYPE_TRAITS
-
-
-#ifdef HAVE_PARTIAL_SPECIALIZATION
-template<typename T>
-struct wxFormatStringSpecifier<T*>
-{
-    enum { value = wxFormatString::Arg_Pointer };
-};
-
-template<typename T>
-struct wxFormatStringSpecifier<const T*>
-{
-    enum { value = wxFormatString::Arg_Pointer };
-};
-#endif // !HAVE_PARTIAL_SPECIALIZATION
-
-
-#define wxFORMAT_STRING_SPECIFIER(T, arg)                                   \
-    template<> struct wxFormatStringSpecifier<T>                            \
-    {                                                                       \
-        enum { value = arg };                                               \
-    };
-
-wxFORMAT_STRING_SPECIFIER(bool, wxFormatString::Arg_Int)
-wxFORMAT_STRING_SPECIFIER(int, wxFormatString::Arg_Int)
-wxFORMAT_STRING_SPECIFIER(unsigned int, wxFormatString::Arg_Int)
-wxFORMAT_STRING_SPECIFIER(short int, wxFormatString::Arg_Int)
-wxFORMAT_STRING_SPECIFIER(short unsigned int, wxFormatString::Arg_Int)
-wxFORMAT_STRING_SPECIFIER(long int, wxFormatString::Arg_LongInt)
-wxFORMAT_STRING_SPECIFIER(long unsigned int, wxFormatString::Arg_LongInt)
-#ifdef wxLongLong_t
-wxFORMAT_STRING_SPECIFIER(wxLongLong_t, wxFormatString::Arg_LongLongInt)
-wxFORMAT_STRING_SPECIFIER(wxULongLong_t, wxFormatString::Arg_LongLongInt)
-#endif
-wxFORMAT_STRING_SPECIFIER(float, wxFormatString::Arg_Double)
-wxFORMAT_STRING_SPECIFIER(double, wxFormatString::Arg_Double)
-wxFORMAT_STRING_SPECIFIER(long double, wxFormatString::Arg_LongDouble)
-
-#if wxWCHAR_T_IS_REAL_TYPE
-wxFORMAT_STRING_SPECIFIER(wchar_t, wxFormatString::Arg_Char | wxFormatString::Arg_Int)
-#endif
-
-#if !wxUSE_UNICODE
-wxFORMAT_STRING_SPECIFIER(char, wxFormatString::Arg_Char | wxFormatString::Arg_Int)
-wxFORMAT_STRING_SPECIFIER(signed char, wxFormatString::Arg_Char | wxFormatString::Arg_Int)
-wxFORMAT_STRING_SPECIFIER(unsigned char, wxFormatString::Arg_Char | wxFormatString::Arg_Int)
-#endif
-
-wxFORMAT_STRING_SPECIFIER(char*, wxFormatString::Arg_String)
-wxFORMAT_STRING_SPECIFIER(unsigned char*, wxFormatString::Arg_String)
-wxFORMAT_STRING_SPECIFIER(signed char*, wxFormatString::Arg_String)
-wxFORMAT_STRING_SPECIFIER(const char*, wxFormatString::Arg_String)
-wxFORMAT_STRING_SPECIFIER(const unsigned char*, wxFormatString::Arg_String)
-wxFORMAT_STRING_SPECIFIER(const signed char*, wxFormatString::Arg_String)
-wxFORMAT_STRING_SPECIFIER(wchar_t*, wxFormatString::Arg_String)
-wxFORMAT_STRING_SPECIFIER(const wchar_t*, wxFormatString::Arg_String)
-
-wxFORMAT_STRING_SPECIFIER(int*, wxFormatString::Arg_IntPtr | wxFormatString::Arg_Pointer)
-wxFORMAT_STRING_SPECIFIER(short int*, wxFormatString::Arg_ShortIntPtr | wxFormatString::Arg_Pointer)
-wxFORMAT_STRING_SPECIFIER(long int*, wxFormatString::Arg_LongIntPtr | wxFormatString::Arg_Pointer)
-
-#undef wxFORMAT_STRING_SPECIFIER
-
-
-// Converts an argument passed to wxPrint etc. into standard form expected,
-// by wxXXX functions, e.g. all strings (wxString, char*, wchar_t*) are
-// converted into wchar_t* or char* depending on the build.
-template<typename T>
-struct wxArgNormalizer
-{
-    // Ctor. 'value' is the value passed as variadic argument, 'fmt' is pointer
-    // to printf-like format string or NULL if the variadic function doesn't
-    // use format string and 'index' is index of 'value' in variadic arguments
-    // list (starting at 1)
-    wxArgNormalizer(T value,
-                    const wxFormatString *fmt, unsigned index)
-        : m_value(value)
-    {
-        wxASSERT_ARG_TYPE( fmt, index, wxFormatStringSpecifier<T>::value );
-    }
-
-    // Returns the value in a form that can be safely passed to real vararg
-    // functions. In case of strings, this is char* in ANSI build and wchar_t*
-    // in Unicode build.
-    T get() const { return m_value; }
-
-    T m_value;
-};
-
-// normalizer for passing arguments to functions working with wchar_t* (and
-// until ANSI build is removed, char* in ANSI build as well - FIXME-UTF8)
-// string representation
-#if !wxUSE_UTF8_LOCALE_ONLY
-template<typename T>
-struct wxArgNormalizerWchar : public wxArgNormalizer<T>
-{
-    wxArgNormalizerWchar(T value,
-                         const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizer<T>(value, fmt, index) {}
-};
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-// normalizer for passing arguments to functions working with UTF-8 encoded
-// char* strings
-#if wxUSE_UNICODE_UTF8
-    template<typename T>
-    struct wxArgNormalizerUtf8 : public wxArgNormalizer<T>
-    {
-        wxArgNormalizerUtf8(T value,
-                            const wxFormatString *fmt, unsigned index)
-            : wxArgNormalizer<T>(value, fmt, index) {}
-    };
-
-    #define wxArgNormalizerNative wxArgNormalizerUtf8
-#else // wxUSE_UNICODE_WCHAR
-    #define wxArgNormalizerNative wxArgNormalizerWchar
-#endif // wxUSE_UNICODE_UTF8 // wxUSE_UNICODE_UTF8
-
-
-
-// special cases for converting strings:
-
-
-// base class for wxArgNormalizer<T> specializations that need to do conversion;
-// CharType is either wxStringCharType or wchar_t in UTF-8 build when wrapping
-// widechar CRT function
-template<typename CharType>
-struct wxArgNormalizerWithBuffer
-{
-    typedef wxScopedCharTypeBuffer<CharType> CharBuffer;
-
-    wxArgNormalizerWithBuffer() {}
-    wxArgNormalizerWithBuffer(const CharBuffer& buf,
-                              const wxFormatString *fmt,
-                              unsigned index)
-        : m_value(buf)
-    {
-        wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String );
-    }
-
-    const CharType *get() const { return m_value; }
-
-    CharBuffer m_value;
-};
-
-// string objects:
-template<>
-struct WXDLLIMPEXP_BASE wxArgNormalizerNative<const wxString&>
-{
-    wxArgNormalizerNative(const wxString& s,
-                          const wxFormatString *fmt,
-                          unsigned index)
-        : m_value(s)
-    {
-        wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String );
-    }
-
-    const wxStringCharType *get() const;
-
-    const wxString& m_value;
-};
-
-// c_str() values:
-template<>
-struct WXDLLIMPEXP_BASE wxArgNormalizerNative<const wxCStrData&>
-{
-    wxArgNormalizerNative(const wxCStrData& value,
-                          const wxFormatString *fmt,
-                          unsigned index)
-        : m_value(value)
-    {
-        wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String );
-    }
-
-    const wxStringCharType *get() const;
-
-    const wxCStrData& m_value;
-};
-
-// wxString/wxCStrData conversion to wchar_t* value
-#if wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY
-template<>
-struct WXDLLIMPEXP_BASE wxArgNormalizerWchar<const wxString&>
-    : public wxArgNormalizerWithBuffer<wchar_t>
-{
-    wxArgNormalizerWchar(const wxString& s,
-                         const wxFormatString *fmt, unsigned index);
-};
-
-template<>
-struct WXDLLIMPEXP_BASE wxArgNormalizerWchar<const wxCStrData&>
-    : public wxArgNormalizerWithBuffer<wchar_t>
-{
-    wxArgNormalizerWchar(const wxCStrData& s,
-                         const wxFormatString *fmt, unsigned index);
-};
-#endif // wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY
-
-
-// C string pointers of the wrong type (wchar_t* for ANSI or UTF8 build,
-// char* for wchar_t Unicode build or UTF8):
-#if wxUSE_UNICODE_WCHAR
-
-template<>
-struct wxArgNormalizerWchar<const char*>
-    : public wxArgNormalizerWithBuffer<wchar_t>
-{
-    wxArgNormalizerWchar(const char* s,
-                         const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerWithBuffer<wchar_t>(wxConvLibc.cMB2WC(s), fmt, index) {}
-};
-
-#elif wxUSE_UNICODE_UTF8
-
-template<>
-struct wxArgNormalizerUtf8<const wchar_t*>
-    : public wxArgNormalizerWithBuffer<char>
-{
-    wxArgNormalizerUtf8(const wchar_t* s,
-                        const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerWithBuffer<char>(wxConvUTF8.cWC2MB(s), fmt, index) {}
-};
-
-template<>
-struct wxArgNormalizerUtf8<const char*>
-    : public wxArgNormalizerWithBuffer<char>
-{
-    wxArgNormalizerUtf8(const char* s,
-                        const wxFormatString *fmt,
-                        unsigned index)
-    {
-        wxASSERT_ARG_TYPE( fmt, index, wxFormatString::Arg_String );
-
-        if ( wxLocaleIsUtf8 )
-        {
-            m_value = wxScopedCharBuffer::CreateNonOwned(s);
-        }
-        else
-        {
-            // convert to widechar string first:
-            wxScopedWCharBuffer buf(wxConvLibc.cMB2WC(s));
-
-            // then to UTF-8:
-            if ( buf )
-                m_value = wxConvUTF8.cWC2MB(buf);
-        }
-    }
-};
-
-// UTF-8 build needs conversion to wchar_t* too:
-#if !wxUSE_UTF8_LOCALE_ONLY
-template<>
-struct wxArgNormalizerWchar<const char*>
-    : public wxArgNormalizerWithBuffer<wchar_t>
-{
-    wxArgNormalizerWchar(const char* s,
-                         const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerWithBuffer<wchar_t>(wxConvLibc.cMB2WC(s), fmt, index) {}
-};
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#else // ANSI - FIXME-UTF8
-
-template<>
-struct wxArgNormalizerWchar<const wchar_t*>
-    : public wxArgNormalizerWithBuffer<char>
-{
-    wxArgNormalizerWchar(const wchar_t* s,
-                         const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerWithBuffer<char>(wxConvLibc.cWC2MB(s), fmt, index) {}
-};
-
-#endif // wxUSE_UNICODE_WCHAR/wxUSE_UNICODE_UTF8/ANSI
-
-
-// this macro is used to implement specialization that are exactly same as
-// some other specialization, i.e. to "forward" the implementation (e.g. for
-// T=wxString and T=const wxString&). Note that the ctor takes BaseT argument,
-// not T!
-#if wxUSE_UNICODE_UTF8
-    #if wxUSE_UTF8_LOCALE_ONLY
-        #define WX_ARG_NORMALIZER_FORWARD(T, BaseT)                         \
-          _WX_ARG_NORMALIZER_FORWARD_IMPL(wxArgNormalizerUtf8, T, BaseT)
-    #else // possibly non-UTF8 locales
-        #define WX_ARG_NORMALIZER_FORWARD(T, BaseT)                         \
-          _WX_ARG_NORMALIZER_FORWARD_IMPL(wxArgNormalizerWchar, T, BaseT);  \
-          _WX_ARG_NORMALIZER_FORWARD_IMPL(wxArgNormalizerUtf8, T, BaseT)
-    #endif
-#else // wxUSE_UNICODE_WCHAR
-    #define WX_ARG_NORMALIZER_FORWARD(T, BaseT)                             \
-        _WX_ARG_NORMALIZER_FORWARD_IMPL(wxArgNormalizerWchar, T, BaseT)
-#endif // wxUSE_UNICODE_UTF8/wxUSE_UNICODE_WCHAR
-
-#define _WX_ARG_NORMALIZER_FORWARD_IMPL(Normalizer, T, BaseT)               \
-    template<>                                                              \
-    struct Normalizer<T> : public Normalizer<BaseT>                         \
-    {                                                                       \
-        Normalizer(BaseT value,                                             \
-                   const wxFormatString *fmt, unsigned index)               \
-            : Normalizer<BaseT>(value, fmt, index) {}                       \
-    }
-
-// non-reference versions of specializations for string objects
-WX_ARG_NORMALIZER_FORWARD(wxString, const wxString&);
-WX_ARG_NORMALIZER_FORWARD(wxCStrData, const wxCStrData&);
-
-// versions for passing non-const pointers:
-WX_ARG_NORMALIZER_FORWARD(char*, const char*);
-WX_ARG_NORMALIZER_FORWARD(wchar_t*, const wchar_t*);
-
-// versions for passing wx[W]CharBuffer:
-WX_ARG_NORMALIZER_FORWARD(wxScopedCharBuffer, const char*);
-WX_ARG_NORMALIZER_FORWARD(const wxScopedCharBuffer&, const char*);
-WX_ARG_NORMALIZER_FORWARD(wxScopedWCharBuffer, const wchar_t*);
-WX_ARG_NORMALIZER_FORWARD(const wxScopedWCharBuffer&, const wchar_t*);
-WX_ARG_NORMALIZER_FORWARD(wxCharBuffer, const char*);
-WX_ARG_NORMALIZER_FORWARD(const wxCharBuffer&, const char*);
-WX_ARG_NORMALIZER_FORWARD(wxWCharBuffer, const wchar_t*);
-WX_ARG_NORMALIZER_FORWARD(const wxWCharBuffer&, const wchar_t*);
-
-// versions for std::[w]string:
-#if wxUSE_STD_STRING
-
-#include "wx/stringimpl.h"
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-template<>
-struct wxArgNormalizerWchar<const std::string&>
-    : public wxArgNormalizerWchar<const char*>
-{
-    wxArgNormalizerWchar(const std::string& s,
-                         const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerWchar<const char*>(s.c_str(), fmt, index) {}
-};
-
-template<>
-struct wxArgNormalizerWchar<const wxStdWideString&>
-    : public wxArgNormalizerWchar<const wchar_t*>
-{
-    wxArgNormalizerWchar(const wxStdWideString& s,
-                         const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerWchar<const wchar_t*>(s.c_str(), fmt, index) {}
-};
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-template<>
-struct wxArgNormalizerUtf8<const std::string&>
-    : public wxArgNormalizerUtf8<const char*>
-{
-    wxArgNormalizerUtf8(const std::string& s,
-                        const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerUtf8<const char*>(s.c_str(), fmt, index) {}
-};
-
-template<>
-struct wxArgNormalizerUtf8<const wxStdWideString&>
-    : public wxArgNormalizerUtf8<const wchar_t*>
-{
-    wxArgNormalizerUtf8(const wxStdWideString& s,
-                        const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerUtf8<const wchar_t*>(s.c_str(), fmt, index) {}
-};
-#endif // wxUSE_UNICODE_UTF8
-
-WX_ARG_NORMALIZER_FORWARD(std::string, const std::string&);
-WX_ARG_NORMALIZER_FORWARD(wxStdWideString, const wxStdWideString&);
-
-#endif // wxUSE_STD_STRING
-
-
-// versions for wxUniChar, wxUniCharRef:
-// (this is same for UTF-8 and Wchar builds, we just convert to wchar_t)
-template<>
-struct wxArgNormalizer<const wxUniChar&> : public wxArgNormalizer<wchar_t>
-{
-    wxArgNormalizer(const wxUniChar& s,
-                    const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizer<wchar_t>(s.GetValue(), fmt, index) {}
-};
-
-// for wchar_t, default handler does the right thing
-
-// char has to be treated differently in Unicode builds: a char argument may
-// be used either for a character value (which should be converted into
-// wxUniChar) or as an integer value (which should be left as-is). We take
-// advantage of the fact that both char and wchar_t are converted into int
-// in variadic arguments here.
-#if wxUSE_UNICODE
-template<typename T>
-struct wxArgNormalizerNarrowChar
-{
-    wxArgNormalizerNarrowChar(T value,
-                              const wxFormatString *fmt, unsigned index)
-    {
-        wxASSERT_ARG_TYPE( fmt, index,
-                           wxFormatString::Arg_Char | wxFormatString::Arg_Int );
-
-        // FIXME-UTF8: which one is better default in absence of fmt string
-        //             (i.e. when used like e.g. Foo("foo", "bar", 'c', NULL)?
-        if ( !fmt || fmt->GetArgumentType(index) == wxFormatString::Arg_Char )
-            m_value = wx_truncate_cast(T, wxUniChar(value).GetValue());
-        else
-            m_value = value;
-    }
-
-    int get() const { return m_value; }
-
-    T m_value;
-};
-
-template<>
-struct wxArgNormalizer<char> : public wxArgNormalizerNarrowChar<char>
-{
-    wxArgNormalizer(char value,
-                    const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerNarrowChar<char>(value, fmt, index) {}
-};
-
-template<>
-struct wxArgNormalizer<unsigned char>
-    : public wxArgNormalizerNarrowChar<unsigned char>
-{
-    wxArgNormalizer(unsigned char value,
-                    const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerNarrowChar<unsigned char>(value, fmt, index) {}
-};
-
-template<>
-struct wxArgNormalizer<signed char>
-    : public wxArgNormalizerNarrowChar<signed char>
-{
-    wxArgNormalizer(signed char value,
-                    const wxFormatString *fmt, unsigned index)
-        : wxArgNormalizerNarrowChar<signed char>(value, fmt, index) {}
-};
-
-#endif // wxUSE_UNICODE
-
-// convert references:
-WX_ARG_NORMALIZER_FORWARD(wxUniChar, const wxUniChar&);
-WX_ARG_NORMALIZER_FORWARD(const wxUniCharRef&, const wxUniChar&);
-WX_ARG_NORMALIZER_FORWARD(wxUniCharRef, const wxUniChar&);
-WX_ARG_NORMALIZER_FORWARD(const wchar_t&, wchar_t);
-
-WX_ARG_NORMALIZER_FORWARD(const char&, char);
-WX_ARG_NORMALIZER_FORWARD(const unsigned char&, unsigned char);
-WX_ARG_NORMALIZER_FORWARD(const signed char&, signed char);
-
-
-#undef WX_ARG_NORMALIZER_FORWARD
-#undef _WX_ARG_NORMALIZER_FORWARD_IMPL
-
-// NB: Don't #undef wxASSERT_ARG_TYPE here as it's also used in wx/longlong.h.
-
-// ----------------------------------------------------------------------------
-// WX_VA_ARG_STRING
-// ----------------------------------------------------------------------------
-
-// Replacement for va_arg() for use with strings in functions that accept
-// strings normalized by wxArgNormalizer<T>:
-
-struct WXDLLIMPEXP_BASE wxArgNormalizedString
-{
-    wxArgNormalizedString(const void* ptr) : m_ptr(ptr) {}
-
-    // returns true if non-NULL string was passed in
-    bool IsValid() const { return m_ptr != NULL; }
-    operator bool() const { return IsValid(); }
-
-    // extracts the string, returns empty string if NULL was passed in
-    wxString GetString() const;
-    operator wxString() const;
-
-private:
-    const void *m_ptr;
-};
-
-#define WX_VA_ARG_STRING(ap) wxArgNormalizedString(va_arg(ap, const void*))
-
-// ----------------------------------------------------------------------------
-// implementation of the WX_DEFINE_VARARG_* macros
-// ----------------------------------------------------------------------------
-
-// NB: The vararg emulation code is limited to 30 variadic and 4 fixed
-//     arguments at the moment.
-//     If you need more variadic arguments, you need to
-//        1) increase the value of _WX_VARARG_MAX_ARGS
-//        2) add _WX_VARARG_JOIN_* and _WX_VARARG_ITER_* up to the new
-//           _WX_VARARG_MAX_ARGS value to the lists below
-//     If you need more fixed arguments, you need to
-//        1) increase the value of _WX_VARARG_MAX_FIXED_ARGS
-//        2) add _WX_VARARG_FIXED_EXPAND_* and _WX_VARARG_FIXED_UNUSED_EXPAND_*
-//           macros below
-#define _WX_VARARG_MAX_ARGS        30
-#define _WX_VARARG_MAX_FIXED_ARGS   4
-
-#define _WX_VARARG_JOIN_1(m)                                 m(1)
-#define _WX_VARARG_JOIN_2(m)       _WX_VARARG_JOIN_1(m),     m(2)
-#define _WX_VARARG_JOIN_3(m)       _WX_VARARG_JOIN_2(m),     m(3)
-#define _WX_VARARG_JOIN_4(m)       _WX_VARARG_JOIN_3(m),     m(4)
-#define _WX_VARARG_JOIN_5(m)       _WX_VARARG_JOIN_4(m),     m(5)
-#define _WX_VARARG_JOIN_6(m)       _WX_VARARG_JOIN_5(m),     m(6)
-#define _WX_VARARG_JOIN_7(m)       _WX_VARARG_JOIN_6(m),     m(7)
-#define _WX_VARARG_JOIN_8(m)       _WX_VARARG_JOIN_7(m),     m(8)
-#define _WX_VARARG_JOIN_9(m)       _WX_VARARG_JOIN_8(m),     m(9)
-#define _WX_VARARG_JOIN_10(m)      _WX_VARARG_JOIN_9(m),     m(10)
-#define _WX_VARARG_JOIN_11(m)      _WX_VARARG_JOIN_10(m),    m(11)
-#define _WX_VARARG_JOIN_12(m)      _WX_VARARG_JOIN_11(m),    m(12)
-#define _WX_VARARG_JOIN_13(m)      _WX_VARARG_JOIN_12(m),    m(13)
-#define _WX_VARARG_JOIN_14(m)      _WX_VARARG_JOIN_13(m),    m(14)
-#define _WX_VARARG_JOIN_15(m)      _WX_VARARG_JOIN_14(m),    m(15)
-#define _WX_VARARG_JOIN_16(m)      _WX_VARARG_JOIN_15(m),    m(16)
-#define _WX_VARARG_JOIN_17(m)      _WX_VARARG_JOIN_16(m),    m(17)
-#define _WX_VARARG_JOIN_18(m)      _WX_VARARG_JOIN_17(m),    m(18)
-#define _WX_VARARG_JOIN_19(m)      _WX_VARARG_JOIN_18(m),    m(19)
-#define _WX_VARARG_JOIN_20(m)      _WX_VARARG_JOIN_19(m),    m(20)
-#define _WX_VARARG_JOIN_21(m)      _WX_VARARG_JOIN_20(m),    m(21)
-#define _WX_VARARG_JOIN_22(m)      _WX_VARARG_JOIN_21(m),    m(22)
-#define _WX_VARARG_JOIN_23(m)      _WX_VARARG_JOIN_22(m),    m(23)
-#define _WX_VARARG_JOIN_24(m)      _WX_VARARG_JOIN_23(m),    m(24)
-#define _WX_VARARG_JOIN_25(m)      _WX_VARARG_JOIN_24(m),    m(25)
-#define _WX_VARARG_JOIN_26(m)      _WX_VARARG_JOIN_25(m),    m(26)
-#define _WX_VARARG_JOIN_27(m)      _WX_VARARG_JOIN_26(m),    m(27)
-#define _WX_VARARG_JOIN_28(m)      _WX_VARARG_JOIN_27(m),    m(28)
-#define _WX_VARARG_JOIN_29(m)      _WX_VARARG_JOIN_28(m),    m(29)
-#define _WX_VARARG_JOIN_30(m)      _WX_VARARG_JOIN_29(m),    m(30)
-
-#define _WX_VARARG_ITER_1(m,a,b,c,d,e,f)                                    m(1,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_2(m,a,b,c,d,e,f)  _WX_VARARG_ITER_1(m,a,b,c,d,e,f)  m(2,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_3(m,a,b,c,d,e,f)  _WX_VARARG_ITER_2(m,a,b,c,d,e,f)  m(3,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_4(m,a,b,c,d,e,f)  _WX_VARARG_ITER_3(m,a,b,c,d,e,f)  m(4,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_5(m,a,b,c,d,e,f)  _WX_VARARG_ITER_4(m,a,b,c,d,e,f)  m(5,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_6(m,a,b,c,d,e,f)  _WX_VARARG_ITER_5(m,a,b,c,d,e,f)  m(6,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_7(m,a,b,c,d,e,f)  _WX_VARARG_ITER_6(m,a,b,c,d,e,f)  m(7,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_8(m,a,b,c,d,e,f)  _WX_VARARG_ITER_7(m,a,b,c,d,e,f)  m(8,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_9(m,a,b,c,d,e,f)  _WX_VARARG_ITER_8(m,a,b,c,d,e,f)  m(9,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_10(m,a,b,c,d,e,f) _WX_VARARG_ITER_9(m,a,b,c,d,e,f)  m(10,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_11(m,a,b,c,d,e,f) _WX_VARARG_ITER_10(m,a,b,c,d,e,f) m(11,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_12(m,a,b,c,d,e,f) _WX_VARARG_ITER_11(m,a,b,c,d,e,f) m(12,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_13(m,a,b,c,d,e,f) _WX_VARARG_ITER_12(m,a,b,c,d,e,f) m(13,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_14(m,a,b,c,d,e,f) _WX_VARARG_ITER_13(m,a,b,c,d,e,f) m(14,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_15(m,a,b,c,d,e,f) _WX_VARARG_ITER_14(m,a,b,c,d,e,f) m(15,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_16(m,a,b,c,d,e,f) _WX_VARARG_ITER_15(m,a,b,c,d,e,f) m(16,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_17(m,a,b,c,d,e,f) _WX_VARARG_ITER_16(m,a,b,c,d,e,f) m(17,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_18(m,a,b,c,d,e,f) _WX_VARARG_ITER_17(m,a,b,c,d,e,f) m(18,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_19(m,a,b,c,d,e,f) _WX_VARARG_ITER_18(m,a,b,c,d,e,f) m(19,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_20(m,a,b,c,d,e,f) _WX_VARARG_ITER_19(m,a,b,c,d,e,f) m(20,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_21(m,a,b,c,d,e,f) _WX_VARARG_ITER_20(m,a,b,c,d,e,f) m(21,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_22(m,a,b,c,d,e,f) _WX_VARARG_ITER_21(m,a,b,c,d,e,f) m(22,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_23(m,a,b,c,d,e,f) _WX_VARARG_ITER_22(m,a,b,c,d,e,f) m(23,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_24(m,a,b,c,d,e,f) _WX_VARARG_ITER_23(m,a,b,c,d,e,f) m(24,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_25(m,a,b,c,d,e,f) _WX_VARARG_ITER_24(m,a,b,c,d,e,f) m(25,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_26(m,a,b,c,d,e,f) _WX_VARARG_ITER_25(m,a,b,c,d,e,f) m(26,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_27(m,a,b,c,d,e,f) _WX_VARARG_ITER_26(m,a,b,c,d,e,f) m(27,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_28(m,a,b,c,d,e,f) _WX_VARARG_ITER_27(m,a,b,c,d,e,f) m(28,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_29(m,a,b,c,d,e,f) _WX_VARARG_ITER_28(m,a,b,c,d,e,f) m(29,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_30(m,a,b,c,d,e,f) _WX_VARARG_ITER_29(m,a,b,c,d,e,f) m(30,a,b,c,d,e,f)
-
-
-#define _WX_VARARG_FIXED_EXPAND_1(t1) \
-         t1 f1
-#define _WX_VARARG_FIXED_EXPAND_2(t1,t2) \
-         t1 f1, t2 f2
-#define _WX_VARARG_FIXED_EXPAND_3(t1,t2,t3) \
-         t1 f1, t2 f2, t3 f3
-#define _WX_VARARG_FIXED_EXPAND_4(t1,t2,t3,t4) \
-         t1 f1, t2 f2, t3 f3, t4 f4
-
-#define _WX_VARARG_FIXED_UNUSED_EXPAND_1(t1) \
-         t1 WXUNUSED(f1)
-#define _WX_VARARG_FIXED_UNUSED_EXPAND_2(t1,t2) \
-         t1 WXUNUSED(f1), t2 WXUNUSED(f2)
-#define _WX_VARARG_FIXED_UNUSED_EXPAND_3(t1,t2,t3) \
-         t1 WXUNUSED(f1), t2 WXUNUSED(f2), t3 WXUNUSED(f3)
-#define _WX_VARARG_FIXED_UNUSED_EXPAND_4(t1,t2,t3,t4) \
-         t1 WXUNUSED(f1), t2 WXUNUSED(f2), t3 WXUNUSED(f3), t4 WXUNUSED(f4)
-
-#define _WX_VARARG_FIXED_TYPEDEFS_1(t1) \
-             typedef t1 TF1
-#define _WX_VARARG_FIXED_TYPEDEFS_2(t1,t2) \
-             _WX_VARARG_FIXED_TYPEDEFS_1(t1); typedef t2 TF2
-#define _WX_VARARG_FIXED_TYPEDEFS_3(t1,t2,t3) \
-             _WX_VARARG_FIXED_TYPEDEFS_2(t1,t2); typedef t3 TF3
-#define _WX_VARARG_FIXED_TYPEDEFS_4(t1,t2,t3,t4) \
-             _WX_VARARG_FIXED_TYPEDEFS_3(t1,t2,t3); typedef t4 TF4
-
-// This macro expands N-items tuple of fixed arguments types into part of
-// function's declaration. For example,
-// "_WX_VARARG_FIXED_EXPAND(3, (int, char*, int))" expands into
-// "int f1, char* f2, int f3".
-#define _WX_VARARG_FIXED_EXPAND(N, args) \
-                _WX_VARARG_FIXED_EXPAND_IMPL(N, args)
-#define _WX_VARARG_FIXED_EXPAND_IMPL(N, args) \
-                _WX_VARARG_FIXED_EXPAND_##N args
-
-// Ditto for unused arguments
-#define _WX_VARARG_FIXED_UNUSED_EXPAND(N, args) \
-                _WX_VARARG_FIXED_UNUSED_EXPAND_IMPL(N, args)
-#define _WX_VARARG_FIXED_UNUSED_EXPAND_IMPL(N, args) \
-                _WX_VARARG_FIXED_UNUSED_EXPAND_##N args
-
-// Declarates typedefs for fixed arguments types; i-th fixed argument types
-// will have TFi typedef.
-#define _WX_VARARG_FIXED_TYPEDEFS(N, args) \
-                _WX_VARARG_FIXED_TYPEDEFS_IMPL(N, args)
-#define _WX_VARARG_FIXED_TYPEDEFS_IMPL(N, args) \
-                _WX_VARARG_FIXED_TYPEDEFS_##N args
-
-
-// This macro calls another macro 'm' passed as second argument 'N' times,
-// with its only argument set to 1..N, and concatenates the results using
-// comma as separator.
-//
-// An example:
-//     #define foo(i)  x##i
-//     // this expands to "x1,x2,x3,x4"
-//     _WX_VARARG_JOIN(4, foo)
-//
-//
-// N must not be greater than _WX_VARARG_MAX_ARGS (=30).
-#define _WX_VARARG_JOIN(N, m)             _WX_VARARG_JOIN_IMPL(N, m)
-#define _WX_VARARG_JOIN_IMPL(N, m)        _WX_VARARG_JOIN_##N(m)
-
-
-// This macro calls another macro 'm' passed as second argument 'N' times, with
-// its first argument set to 1..N and the remaining arguments set to 'a', 'b',
-// 'c', 'd', 'e' and 'f'. The results are separated with whitespace in the
-// expansion.
-//
-// An example:
-//     // this macro expands to:
-//     //     foo(1,a,b,c,d,e,f)
-//     //     foo(2,a,b,c,d,e,f)
-//     //     foo(3,a,b,c,d,e,f)
-//     _WX_VARARG_ITER(3, foo, a, b, c, d, e, f)
-//
-// N must not be greater than _WX_VARARG_MAX_ARGS (=30).
-#define _WX_VARARG_ITER(N,m,a,b,c,d,e,f) \
-        _WX_VARARG_ITER_IMPL(N,m,a,b,c,d,e,f)
-#define _WX_VARARG_ITER_IMPL(N,m,a,b,c,d,e,f) \
-        _WX_VARARG_ITER_##N(m,a,b,c,d,e,f)
-
-// Generates code snippet for i-th "variadic" argument in vararg function's
-// prototype:
-#define _WX_VARARG_ARG(i)               T##i a##i
-
-// Like _WX_VARARG_ARG_UNUSED, but outputs argument's type with WXUNUSED:
-#define _WX_VARARG_ARG_UNUSED(i)        T##i WXUNUSED(a##i)
-
-// Generates code snippet for i-th type in vararg function's template<...>:
-#define _WX_VARARG_TEMPL(i)             typename T##i
-
-// Generates code snippet for passing i-th argument of vararg function
-// wrapper to its implementation, normalizing it in the process:
-#define _WX_VARARG_PASS_WCHAR(i) \
-    wxArgNormalizerWchar<T##i>(a##i, fmt, i).get()
-#define _WX_VARARG_PASS_UTF8(i) \
-    wxArgNormalizerUtf8<T##i>(a##i, fmt, i).get()
-
-
-// And the same for fixed arguments, _not_ normalizing it:
-#define _WX_VARARG_PASS_FIXED(i)        f##i
-
-#define _WX_VARARG_FIND_FMT(i) \
-            (wxFormatStringArgumentFinder<TF##i>::find(f##i))
-
-#define _WX_VARARG_FORMAT_STRING(numfixed, fixed)                             \
-    _WX_VARARG_FIXED_TYPEDEFS(numfixed, fixed);                               \
-    const wxFormatString *fmt =                                               \
-            (_WX_VARARG_JOIN(numfixed, _WX_VARARG_FIND_FMT))
-
-#if wxUSE_UNICODE_UTF8
-    #define _WX_VARARG_DO_CALL_UTF8(return_kw, impl, implUtf8, N, numfixed)   \
-        return_kw implUtf8(_WX_VARARG_JOIN(numfixed, _WX_VARARG_PASS_FIXED),  \
-                        _WX_VARARG_JOIN(N, _WX_VARARG_PASS_UTF8))
-    #define _WX_VARARG_DO_CALL0_UTF8(return_kw, impl, implUtf8, numfixed)     \
-        return_kw implUtf8(_WX_VARARG_JOIN(numfixed, _WX_VARARG_PASS_FIXED))
-#endif // wxUSE_UNICODE_UTF8
-
-#define _WX_VARARG_DO_CALL_WCHAR(return_kw, impl, implUtf8, N, numfixed)      \
-    return_kw impl(_WX_VARARG_JOIN(numfixed, _WX_VARARG_PASS_FIXED),          \
-                    _WX_VARARG_JOIN(N, _WX_VARARG_PASS_WCHAR))
-#define _WX_VARARG_DO_CALL0_WCHAR(return_kw, impl, implUtf8, numfixed)        \
-    return_kw impl(_WX_VARARG_JOIN(numfixed, _WX_VARARG_PASS_FIXED))
-
-#if wxUSE_UNICODE_UTF8
-    #if wxUSE_UTF8_LOCALE_ONLY
-        #define _WX_VARARG_DO_CALL _WX_VARARG_DO_CALL_UTF8
-        #define _WX_VARARG_DO_CALL0 _WX_VARARG_DO_CALL0_UTF8
-    #else // possibly non-UTF8 locales
-        #define _WX_VARARG_DO_CALL(return_kw, impl, implUtf8, N, numfixed)    \
-            if ( wxLocaleIsUtf8 )                                             \
-              _WX_VARARG_DO_CALL_UTF8(return_kw, impl, implUtf8, N, numfixed);\
-            else                                                              \
-              _WX_VARARG_DO_CALL_WCHAR(return_kw, impl, implUtf8, N, numfixed)
-
-        #define _WX_VARARG_DO_CALL0(return_kw, impl, implUtf8, numfixed)      \
-            if ( wxLocaleIsUtf8 )                                             \
-              _WX_VARARG_DO_CALL0_UTF8(return_kw, impl, implUtf8, numfixed);  \
-            else                                                              \
-              _WX_VARARG_DO_CALL0_WCHAR(return_kw, impl, implUtf8, numfixed)
-    #endif // wxUSE_UTF8_LOCALE_ONLY or not
-#else // wxUSE_UNICODE_WCHAR or ANSI
-    #define _WX_VARARG_DO_CALL _WX_VARARG_DO_CALL_WCHAR
-    #define _WX_VARARG_DO_CALL0 _WX_VARARG_DO_CALL0_WCHAR
-#endif // wxUSE_UNICODE_UTF8 / wxUSE_UNICODE_WCHAR
-
-
-// Macro to be used with _WX_VARARG_ITER in the implementation of
-// WX_DEFINE_VARARG_FUNC (see its documentation for the meaning of arguments)
-#define _WX_VARARG_DEFINE_FUNC(N, rettype, name,                              \
-                               impl, implUtf8, numfixed, fixed)               \
-    template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)>                            \
-    rettype name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed),                    \
-                 _WX_VARARG_JOIN(N, _WX_VARARG_ARG))                          \
-    {                                                                         \
-        _WX_VARARG_FORMAT_STRING(numfixed, fixed);                            \
-        _WX_VARARG_DO_CALL(return, impl, implUtf8, N, numfixed);              \
-    }
-
-#define _WX_VARARG_DEFINE_FUNC_N0(rettype, name,                              \
-                                  impl, implUtf8, numfixed, fixed)            \
-    inline rettype name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed))             \
-    {                                                                         \
-        _WX_VARARG_DO_CALL0(return, impl, implUtf8, numfixed);                \
-    }
-
-// Macro to be used with _WX_VARARG_ITER in the implementation of
-// WX_DEFINE_VARARG_FUNC_VOID (see its documentation for the meaning of
-// arguments; rettype is ignored and is used only to satisfy _WX_VARARG_ITER's
-// requirements).
-#define _WX_VARARG_DEFINE_FUNC_VOID(N, rettype, name,                         \
-                                    impl, implUtf8, numfixed, fixed)          \
-    template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)>                            \
-    void name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed),                       \
-                 _WX_VARARG_JOIN(N, _WX_VARARG_ARG))                          \
-    {                                                                         \
-        _WX_VARARG_FORMAT_STRING(numfixed, fixed);                            \
-        _WX_VARARG_DO_CALL(wxEMPTY_PARAMETER_VALUE,                           \
-                           impl, implUtf8, N, numfixed);                      \
-    }
-
-#define _WX_VARARG_DEFINE_FUNC_VOID_N0(name, impl, implUtf8, numfixed, fixed) \
-    inline void name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed))                \
-    {                                                                         \
-        _WX_VARARG_DO_CALL0(wxEMPTY_PARAMETER_VALUE,                          \
-                            impl, implUtf8, numfixed);                        \
-    }
-
-// Macro to be used with _WX_VARARG_ITER in the implementation of
-// WX_DEFINE_VARARG_FUNC_CTOR (see its documentation for the meaning of
-// arguments; rettype is ignored and is used only to satisfy _WX_VARARG_ITER's
-// requirements).
-#define _WX_VARARG_DEFINE_FUNC_CTOR(N, rettype, name,                         \
-                                    impl, implUtf8, numfixed, fixed)          \
-    template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)>                            \
-    name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed),                            \
-                _WX_VARARG_JOIN(N, _WX_VARARG_ARG))                           \
-    {                                                                         \
-        _WX_VARARG_FORMAT_STRING(numfixed, fixed);                            \
-        _WX_VARARG_DO_CALL(wxEMPTY_PARAMETER_VALUE,                           \
-                           impl, implUtf8, N, numfixed);                      \
-    }
-
-#define _WX_VARARG_DEFINE_FUNC_CTOR_N0(name, impl, implUtf8, numfixed, fixed) \
-    inline name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed))                     \
-    {                                                                         \
-        _WX_VARARG_DO_CALL0(wxEMPTY_PARAMETER_VALUE,                          \
-                            impl, implUtf8, numfixed);                        \
-    }
-
-// Macro to be used with _WX_VARARG_ITER in the implementation of
-// WX_DEFINE_VARARG_FUNC_NOP, i.e. empty stub for a disabled vararg function.
-// The rettype and impl arguments are ignored.
-#define _WX_VARARG_DEFINE_FUNC_NOP(N, rettype, name,                          \
-                                   impl, implUtf8, numfixed, fixed)           \
-    template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)>                            \
-    void name(_WX_VARARG_FIXED_UNUSED_EXPAND(numfixed, fixed),                \
-                 _WX_VARARG_JOIN(N, _WX_VARARG_ARG_UNUSED))                   \
-    {}
-
-#define _WX_VARARG_DEFINE_FUNC_NOP_N0(name, numfixed, fixed)                  \
-    inline void name(_WX_VARARG_FIXED_UNUSED_EXPAND(numfixed, fixed))         \
-    {}
-
-
-// ----------------------------------------------------------------------------
-// workaround for OpenWatcom bug #351
-// ----------------------------------------------------------------------------
-
-#ifdef __WATCOMC__
-// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-
-// This macro can be used to forward a 'vararg' template to another one with
-// different fixed arguments types. Parameters are same as for
-// WX_DEFINE_VARARG_FUNC (rettype=void can be used here), 'convfixed' is how
-// to convert fixed arguments. For example, this is typical code for dealing
-// with different forms of format string:
-//
-// WX_DEFINE_VARARG_FUNC_VOID(Printf, 1, (const wxFormatString&),
-//                            DoPrintfWchar, DoPrintfUtf8)
-// #ifdef __WATCOMC__
-// WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const wxString&),
-//                             (wxFormatString(f1)))
-// WX_VARARG_WATCOM_WORKAROUND(void, Printf, 1, (const char*),
-//                             (wxFormatString(f1)))
-// ...
-#define WX_VARARG_WATCOM_WORKAROUND(rettype, name, numfixed, fixed, convfixed)\
-    _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS,                                      \
-                    _WX_VARARG_WATCOM_WORKAROUND,                             \
-                    rettype, name, convfixed, dummy, numfixed, fixed)
-
-#define WX_VARARG_WATCOM_WORKAROUND_CTOR(name, numfixed, fixed, convfixed)    \
-    _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS,                                      \
-                    _WX_VARARG_WATCOM_WORKAROUND_CTOR,                        \
-                    dummy, name, convfixed, dummy, numfixed, fixed)
-
-#define _WX_VARARG_WATCOM_UNPACK_1(a1)               a1
-#define _WX_VARARG_WATCOM_UNPACK_2(a1, a2)           a1, a2
-#define _WX_VARARG_WATCOM_UNPACK_3(a1, a2, a3)       a1, a2, a3
-#define _WX_VARARG_WATCOM_UNPACK_4(a1, a2, a3, a4)   a1, a2, a3, a4
-#define _WX_VARARG_WATCOM_UNPACK(N, convfixed) \
-        _WX_VARARG_WATCOM_UNPACK_##N convfixed
-
-#define _WX_VARARG_PASS_WATCOM(i) a##i
-
-#define _WX_VARARG_WATCOM_WORKAROUND(N, rettype, name,                        \
-                                     convfixed, dummy, numfixed, fixed)       \
-    template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)>                            \
-    rettype name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed),                    \
-                 _WX_VARARG_JOIN(N, _WX_VARARG_ARG))                          \
-    {                                                                         \
-         return name(_WX_VARARG_WATCOM_UNPACK(numfixed, convfixed),           \
-                     _WX_VARARG_JOIN(N, _WX_VARARG_PASS_WATCOM));             \
-    }
-
-#define _WX_VARARG_WATCOM_WORKAROUND_CTOR(N, dummy1, name,                    \
-                                     convfixed, dummy2, numfixed, fixed)      \
-    template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)>                            \
-    name(_WX_VARARG_FIXED_EXPAND(numfixed, fixed),                            \
-                 _WX_VARARG_JOIN(N, _WX_VARARG_ARG))                          \
-    {                                                                         \
-         name(_WX_VARARG_WATCOM_UNPACK(numfixed, convfixed),                  \
-                     _WX_VARARG_JOIN(N, _WX_VARARG_PASS_WATCOM));             \
-    }
-
-#endif // __WATCOMC__
-
-#endif // _WX_STRVARARG_H_
diff --git a/Source/3rd Party/wx/include/wx/sysopt.h b/Source/3rd Party/wx/include/wx/sysopt.h
index 11e5de560..5c79a5478 100644
--- a/Source/3rd Party/wx/include/wx/sysopt.h	
+++ b/Source/3rd Party/wx/include/wx/sysopt.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/sysopt.h
+// Name:        sysopt.h
 // Purpose:     wxSystemOptions
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-07-10
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: sysopt.h 33004 2005-03-23 20:48:50Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,11 +18,7 @@
 // Enables an application to influence the wxWidgets implementation
 // ----------------------------------------------------------------------------
 
-class
-#if wxUSE_SYSTEM_OPTIONS
-WXDLLIMPEXP_BASE
-#endif
-wxSystemOptions : public wxObject
+class WXDLLIMPEXP_BASE wxSystemOptions : public wxObject
 {
 public:
     wxSystemOptions() { }
diff --git a/Source/3rd Party/wx/include/wx/tarstrm.h b/Source/3rd Party/wx/include/wx/tarstrm.h
index 05a27bbbb..c18400225 100644
--- a/Source/3rd Party/wx/include/wx/tarstrm.h	
+++ b/Source/3rd Party/wx/include/wx/tarstrm.h	
@@ -2,7 +2,7 @@
 // Name:        wx/tarstrm.h
 // Purpose:     Streams for Tar files
 // Author:      Mike Wetherell
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tarstrm.h 43887 2006-12-09 22:28:11Z MW $
 // Copyright:   (c) 2004 Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,8 +22,7 @@
 // Constants
 
 // TypeFlag values
-enum wxTarType
-{
+enum {
     wxTAR_REGTYPE   = '0',      // regular file
     wxTAR_LNKTYPE   = '1',      // hard link
     wxTAR_SYMTYPE   = '2',      // symbolic link
@@ -200,7 +199,7 @@ private:
     wxTarHeaderRecords *m_HeaderRecs;
     wxTarHeaderRecords *m_GlobalHeaderRecs;
 
-    wxDECLARE_NO_COPY_CLASS(wxTarInputStream);
+    DECLARE_NO_COPY_CLASS(wxTarInputStream)
 };
 
 
@@ -281,9 +280,8 @@ private:
     char *m_extendedHdr;
     size_t m_extendedSize;
     wxString m_badfit;
-    bool m_endrecWritten;
 
-    wxDECLARE_NO_COPY_CLASS(wxTarOutputStream);
+    DECLARE_NO_COPY_CLASS(wxTarOutputStream)
 };
 
 
diff --git a/Source/3rd Party/wx/include/wx/tbarbase.h b/Source/3rd Party/wx/include/wx/tbarbase.h
index 5187250bd..1c0814955 100644
--- a/Source/3rd Party/wx/include/wx/tbarbase.h	
+++ b/Source/3rd Party/wx/include/wx/tbarbase.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tbarbase.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,9 +32,9 @@ class WXDLLIMPEXP_FWD_CORE wxImage;
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[];
-extern WXDLLIMPEXP_DATA_CORE(const wxSize) wxDefaultSize;
-extern WXDLLIMPEXP_DATA_CORE(const wxPoint) wxDefaultPosition;
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
+extern WXDLLEXPORT_DATA(const wxSize) wxDefaultSize;
+extern WXDLLEXPORT_DATA(const wxPoint) wxDefaultPosition;
 
 enum wxToolBarToolStyle
 {
@@ -54,54 +54,58 @@ enum wxToolBarToolStyle
 // for the applications status bar.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxToolBarToolBase : public wxObject
+class WXDLLEXPORT wxToolBarToolBase : public wxObject
 {
 public:
     // ctors & dtor
     // ------------
 
-    // generic ctor for any kind of tool
-    wxToolBarToolBase(wxToolBarBase *tbar = NULL,
+    wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL,
                       int toolid = wxID_SEPARATOR,
                       const wxString& label = wxEmptyString,
                       const wxBitmap& bmpNormal = wxNullBitmap,
                       const wxBitmap& bmpDisabled = wxNullBitmap,
                       wxItemKind kind = wxITEM_NORMAL,
-                      wxObject *clientData = NULL,
+                      wxObject *clientData = (wxObject *) NULL,
                       const wxString& shortHelpString = wxEmptyString,
                       const wxString& longHelpString = wxEmptyString)
         : m_label(label),
           m_shortHelpString(shortHelpString),
           m_longHelpString(longHelpString)
     {
-        Init
-        (
-            tbar,
-            toolid == wxID_SEPARATOR ? wxTOOL_STYLE_SEPARATOR
-                                     : wxTOOL_STYLE_BUTTON,
-            toolid == wxID_ANY ? wxWindow::NewControlId()
-                               : toolid,
-            kind
-        );
-
+        m_tbar = tbar;
+        m_id = toolid;
+        if (m_id == wxID_ANY)
+            m_id = wxNewId();
         m_clientData = clientData;
 
         m_bmpNormal = bmpNormal;
         m_bmpDisabled = bmpDisabled;
+
+        m_kind = kind;
+
+        m_enabled = true;
+        m_toggled = false;
+
+        m_toolStyle = toolid == wxID_SEPARATOR ? wxTOOL_STYLE_SEPARATOR
+                                           : wxTOOL_STYLE_BUTTON;
     }
 
-    // ctor for controls only
-    wxToolBarToolBase(wxToolBarBase *tbar,
-                      wxControl *control,
-                      const wxString& label)
-        : m_label(label)
+    wxToolBarToolBase(wxToolBarBase *tbar, wxControl *control)
     {
-        Init(tbar, wxTOOL_STYLE_CONTROL, control->GetId(), wxITEM_MAX);
-
+        m_tbar = tbar;
         m_control = control;
+        m_id = control->GetId();
+
+        m_kind = wxITEM_MAX;    // invalid value
+
+        m_enabled = true;
+        m_toggled = false;
+
+        m_toolStyle = wxTOOL_STYLE_CONTROL;
     }
 
-    virtual ~wxToolBarToolBase();
+    virtual ~wxToolBarToolBase(){}
 
     // accessors
     // ---------
@@ -118,12 +122,10 @@ public:
 
     wxToolBarBase *GetToolBar() const { return m_tbar; }
 
-    // style/kind
-    bool IsStretchable() const { return m_stretchable; }
+    // style
     bool IsButton() const { return m_toolStyle == wxTOOL_STYLE_BUTTON; }
     bool IsControl() const { return m_toolStyle == wxTOOL_STYLE_CONTROL; }
     bool IsSeparator() const { return m_toolStyle == wxTOOL_STYLE_SEPARATOR; }
-    bool IsStretchableSpace() const { return IsSeparator() && IsStretchable(); }
     int GetStyle() const { return m_toolStyle; }
     wxItemKind GetKind() const
     {
@@ -132,13 +134,6 @@ public:
         return m_kind;
     }
 
-    void MakeStretchable()
-    {
-        wxASSERT_MSG( IsSeparator(), "only separators can be stretchable" );
-
-        m_stretchable = true;
-    }
-
     // state
     bool IsEnabled() const { return m_enabled; }
     bool IsToggled() const { return m_toggled; }
@@ -170,16 +165,16 @@ public:
     }
 
     // modifiers: return true if the state really changed
-    virtual bool Enable(bool enable);
-    virtual bool Toggle(bool toggle);
-    virtual bool SetToggle(bool toggle);
-    virtual bool SetShortHelp(const wxString& help);
-    virtual bool SetLongHelp(const wxString& help);
+    bool Enable(bool enable);
+    bool Toggle(bool toggle);
+    bool SetToggle(bool toggle);
+    bool SetShortHelp(const wxString& help);
+    bool SetLongHelp(const wxString& help);
 
     void Toggle() { Toggle(!IsToggled()); }
 
-    virtual void SetNormalBitmap(const wxBitmap& bmp) { m_bmpNormal = bmp; }
-    virtual void SetDisabledBitmap(const wxBitmap& bmp) { m_bmpDisabled = bmp; }
+    void SetNormalBitmap(const wxBitmap& bmp) { m_bmpNormal = bmp; }
+    void SetDisabledBitmap(const wxBitmap& bmp) { m_bmpDisabled = bmp; }
 
     virtual void SetLabel(const wxString& label) { m_label = label; }
 
@@ -196,45 +191,15 @@ public:
     }
 
     // add tool to/remove it from a toolbar
-    virtual void Detach() { m_tbar = NULL; }
+    virtual void Detach() { m_tbar = (wxToolBarBase *)NULL; }
     virtual void Attach(wxToolBarBase *tbar) { m_tbar = tbar; }
 
-#if wxUSE_MENUS
-    // these methods are only for tools of wxITEM_DROPDOWN kind (but even such
-    // tools can have a NULL associated menu)
-    virtual void SetDropdownMenu(wxMenu *menu);
-    wxMenu *GetDropdownMenu() const { return m_dropdownMenu; }
-#endif
-
 protected:
-    // common part of all ctors
-    void Init(wxToolBarBase *tbar,
-              wxToolBarToolStyle style,
-              int toolid,
-              wxItemKind kind)
-    {
-        m_tbar = tbar;
-        m_toolStyle = style;
-        m_id = toolid;
-        m_kind = kind;
-
-        m_clientData = NULL;
-
-        m_stretchable = false;
-        m_toggled = false;
-        m_enabled = true;
-
-#if wxUSE_MENUS
-        m_dropdownMenu = NULL;
-#endif
-
-    }
-
     wxToolBarBase *m_tbar;  // the toolbar to which we belong (may be NULL)
 
     // tool parameters
-    wxToolBarToolStyle m_toolStyle;
-    wxWindowIDRef m_id; // the tool id, wxID_SEPARATOR for separator
+    int m_toolStyle;    // see enum wxToolBarToolStyle
+    int m_id;           // the tool id, wxID_SEPARATOR for separator
     wxItemKind m_kind;  // for normal buttons may be wxITEM_NORMAL/CHECK/RADIO
 
     // as controls have their own client data, no need to waste memory
@@ -244,9 +209,6 @@ protected:
         wxControl        *m_control;
     };
 
-    // true if this tool is stretchable: currently is only value for separators
-    bool m_stretchable;
-
     // tool state
     bool m_toggled;
     bool m_enabled;
@@ -262,10 +224,6 @@ protected:
     wxString m_shortHelpString;
     wxString m_longHelpString;
 
-#if wxUSE_MENUS
-    wxMenu *m_dropdownMenu;
-#endif
-
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarToolBase)
 };
 
@@ -276,7 +234,7 @@ WX_DECLARE_EXPORTED_LIST(wxToolBarToolBase, wxToolBarToolsList);
 // the base class for all toolbars
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxToolBarBase : public wxControl
+class WXDLLEXPORT wxToolBarBase : public wxControl
 {
 public:
     wxToolBarBase();
@@ -358,17 +316,13 @@ public:
     virtual wxToolBarToolBase *AddTool (wxToolBarToolBase *tool);
     virtual wxToolBarToolBase *InsertTool (size_t pos, wxToolBarToolBase *tool);
 
-    // add an arbitrary control to the toolbar (notice that the control will be
-    // deleted by the toolbar and that it will also adjust its position/size)
+    // add an arbitrary control to the toolbar (notice that
+    // the control will be deleted by the toolbar and that it will also adjust
+    // its position/size)
     //
-    // the label is optional and, if specified, will be shown near the control
     // NB: the control should have toolbar as its parent
-    virtual wxToolBarToolBase *
-    AddControl(wxControl *control, const wxString& label = wxEmptyString);
-
-    virtual wxToolBarToolBase *
-    InsertControl(size_t pos, wxControl *control,
-                  const wxString& label = wxEmptyString);
+    virtual wxToolBarToolBase *AddControl(wxControl *control);
+    virtual wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
 
     // get the control with the given id or return NULL
     virtual wxControl *FindControl( int toolid );
@@ -377,12 +331,6 @@ public:
     virtual wxToolBarToolBase *AddSeparator();
     virtual wxToolBarToolBase *InsertSeparator(size_t pos);
 
-    // add a stretchable space to the toolbar: this is similar to a separator
-    // except that it's always blank and that all the extra space the toolbar
-    // has is [equally] distributed among the stretchable spaces in it
-    virtual wxToolBarToolBase *AddStretchableSpace();
-    virtual wxToolBarToolBase *InsertStretchableSpace(size_t pos);
-
     // remove the tool from the toolbar: the caller is responsible for actually
     // deleting the pointer
     virtual wxToolBarToolBase *RemoveTool(int toolid);
@@ -396,9 +344,6 @@ public:
 
     // must be called after all buttons have been created to finish toolbar
     // initialisation
-    //
-    // derived class versions should call the base one first, before doing
-    // platform-specific stuff
     virtual bool Realize();
 
     // tools state
@@ -427,12 +372,6 @@ public:
     virtual void SetToolLongHelp(int toolid, const wxString& helpString);
     virtual wxString GetToolLongHelp(int toolid) const;
 
-    virtual void SetToolNormalBitmap(int WXUNUSED(id),
-                                     const wxBitmap& WXUNUSED(bitmap)) {}
-    virtual void SetToolDisabledBitmap(int WXUNUSED(id),
-                                       const wxBitmap& WXUNUSED(bitmap)) {}
-
-
     // margins/packing/separation
     // --------------------------
 
@@ -473,7 +412,7 @@ public:
         { return GetToolBitmapSize(); }
 
     // returns a (non separator) tool containing the point (x, y) or NULL if
-    // there is no tool at this point (coordinates are client)
+    // there is no tool at this point (corrdinates are client)
     virtual wxToolBarToolBase *FindToolForPosition(wxCoord x,
                                                    wxCoord y) const = 0;
 
@@ -481,17 +420,13 @@ public:
     wxToolBarToolBase *FindById(int toolid) const;
 
     // return true if this is a vertical toolbar, otherwise false
-    bool IsVertical() const;
+    bool IsVertical() const { return HasFlag(wxTB_LEFT | wxTB_RIGHT); }
 
-    // these methods allow to access tools by their index in the toolbar
-    size_t GetToolsCount() const { return m_tools.GetCount(); }
-    const wxToolBarToolBase *GetToolByPos(int pos) const { return m_tools[pos]; }
 
-#if WXWIN_COMPATIBILITY_2_8
     // the old versions of the various methods kept for compatibility
     // don't use in the new code!
     // --------------------------------------------------------------
-    wxDEPRECATED_INLINE(
+
     wxToolBarToolBase *AddTool(int toolid,
                                const wxBitmap& bitmap,
                                const wxBitmap& bmpDisabled,
@@ -499,23 +434,23 @@ public:
                                wxObject *clientData = NULL,
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
-    ,
+    {
         return AddTool(toolid, wxEmptyString,
                        bitmap, bmpDisabled,
                        toggle ? wxITEM_CHECK : wxITEM_NORMAL,
                        shortHelpString, longHelpString, clientData);
-    )
-    wxDEPRECATED_INLINE(
+    }
+
     wxToolBarToolBase *AddTool(int toolid,
                                const wxBitmap& bitmap,
                                const wxString& shortHelpString = wxEmptyString,
                                const wxString& longHelpString = wxEmptyString)
-    ,
+    {
         return AddTool(toolid, wxEmptyString,
                        bitmap, wxNullBitmap, wxITEM_NORMAL,
                        shortHelpString, longHelpString, NULL);
-    )
-    wxDEPRECATED_INLINE(
+    }
+
     wxToolBarToolBase *AddTool(int toolid,
                                const wxBitmap& bitmap,
                                const wxBitmap& bmpDisabled,
@@ -525,12 +460,12 @@ public:
                                wxObject *clientData = NULL,
                                const wxString& shortHelp = wxEmptyString,
                                const wxString& longHelp = wxEmptyString)
-    ,
+    {
         return DoAddTool(toolid, wxEmptyString, bitmap, bmpDisabled,
                          toggle ? wxITEM_CHECK : wxITEM_NORMAL,
                          shortHelp, longHelp, clientData, xPos, yPos);
-    )
-    wxDEPRECATED_INLINE(
+    }
+
     wxToolBarToolBase *InsertTool(size_t pos,
                                   int toolid,
                                   const wxBitmap& bitmap,
@@ -539,12 +474,11 @@ public:
                                   wxObject *clientData = NULL,
                                   const wxString& shortHelp = wxEmptyString,
                                   const wxString& longHelp = wxEmptyString)
-    ,
+    {
         return InsertTool(pos, toolid, wxEmptyString, bitmap, bmpDisabled,
                           toggle ? wxITEM_CHECK : wxITEM_NORMAL,
                           shortHelp, longHelp, clientData);
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
+    }
 
     // event handlers
     // --------------
@@ -567,47 +501,17 @@ public:
     // use GetToolMargins() instead
     wxSize GetMargins() const { return GetToolMargins(); }
 
-    // Tool factories,
-    // helper functions to create toolbar tools
-    // -------------------------
-    virtual wxToolBarToolBase *CreateTool(int toolid,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled = wxNullBitmap,
-                                          wxItemKind kind = wxITEM_NORMAL,
-                                          wxObject *clientData = NULL,
-                                          const wxString& shortHelp = wxEmptyString,
-                                          const wxString& longHelp = wxEmptyString) = 0;
-
-    virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label) = 0;
-
-    // this one is not virtual but just a simple helper/wrapper around
-    // CreateTool() for separators
-    wxToolBarToolBase *CreateSeparator()
-    {
-        return CreateTool(wxID_SEPARATOR,
-                          wxEmptyString,
-                          wxNullBitmap, wxNullBitmap,
-                          wxITEM_SEPARATOR, NULL,
-                          wxEmptyString, wxEmptyString);
-    }
-
-    
     // implementation only from now on
     // -------------------------------
 
+    size_t GetToolsCount() const { return m_tools.GetCount(); }
+
     // Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
     virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) ;
 
     // don't want toolbars to accept the focus
     virtual bool AcceptsFocus() const { return false; }
 
-#if wxUSE_MENUS
-    // Set dropdown menu
-    bool SetDropdownMenu(int toolid, wxMenu *menu);
-#endif
-
 protected:
     // to implement in derived classes
     // -------------------------------
@@ -645,6 +549,17 @@ protected:
     // called when the tools "can be toggled" flag changes
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) = 0;
 
+    // the functions to create toolbar tools
+    virtual wxToolBarToolBase *CreateTool(int toolid,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
+                                          wxObject *clientData,
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp) = 0;
+
+    virtual wxToolBarToolBase *CreateTool(wxControl *control) = 0;
 
     // helper functions
     // ----------------
@@ -659,21 +574,6 @@ protected:
     // un-toggle all buttons in the same radio group
     void UnToggleRadioGroup(wxToolBarToolBase *tool);
 
-    // make the size of the buttons big enough to fit the largest bitmap size
-    void AdjustToolBitmapSize();
-
-    // calls InsertTool() and deletes the tool if inserting it failed
-    wxToolBarToolBase *DoInsertNewTool(size_t pos, wxToolBarToolBase *tool)
-    {
-        if ( !InsertTool(pos, tool) )
-        {
-            delete tool;
-            return NULL;
-        }
-
-        return tool;
-    }
-
     // the list of all our tools
     wxToolBarToolsList m_tools;
 
@@ -694,17 +594,11 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxToolBarBase);
+    DECLARE_NO_COPY_CLASS(wxToolBarBase)
 };
 
-// deprecated function for creating the image for disabled buttons, use
-// wxImage::ConvertToGreyscale() instead
-#if WXWIN_COMPATIBILITY_2_8
-
-wxDEPRECATED( bool wxCreateGreyedImage(const wxImage& in, wxImage& out) );
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
+// Helper function for creating the image for disabled buttons
+bool wxCreateGreyedImage(const wxImage& in, wxImage& out) ;
 
 #endif // wxUSE_TOOLBAR
 
diff --git a/Source/3rd Party/wx/include/wx/textbuf.h b/Source/3rd Party/wx/include/wx/textbuf.h
index 88ba61111..97246b6b2 100644
--- a/Source/3rd Party/wx/include/wx/textbuf.h	
+++ b/Source/3rd Party/wx/include/wx/textbuf.h	
@@ -99,10 +99,8 @@ public:
     size_t GetLineCount() const { return m_aLines.size(); }
 
     // the returned line may be modified (but don't add CR/LF at the end!)
-          wxString& GetLine(size_t n)          { return m_aLines[n]; }
-    const wxString& GetLine(size_t n)    const { return m_aLines[n]; }
-          wxString& operator[](size_t n)       { return m_aLines[n]; }
-    const wxString& operator[](size_t n) const { return m_aLines[n]; }
+    wxString& GetLine(size_t n)    const { return (wxString&)m_aLines[n]; }
+    wxString& operator[](size_t n) const { return (wxString&)m_aLines[n]; }
 
     // the current line has meaning only when you're using
     // GetFirstLine()/GetNextLine() functions, it doesn't get updated when
@@ -134,7 +132,7 @@ public:
     wxTextFileType GuessType() const;
 
     // get the name of the buffer
-    const wxString& GetName() const { return m_strBufferName; }
+    const wxChar *GetName() const { return m_strBufferName.c_str(); }
 
     // add/remove lines
     // ----------------
diff --git a/Source/3rd Party/wx/include/wx/textcompleter.h b/Source/3rd Party/wx/include/wx/textcompleter.h
deleted file mode 100644
index ca1b29cb2..000000000
--- a/Source/3rd Party/wx/include/wx/textcompleter.h	
+++ /dev/null
@@ -1,87 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/textcompleter.h
-// Purpose:     Declaration of wxTextCompleter class.
-// Author:      Vadim Zeitlin
-// Created:     2011-04-13
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TEXTCOMPLETER_H_
-#define _WX_TEXTCOMPLETER_H_
-
-// ----------------------------------------------------------------------------
-// wxTextCompleter: used by wxTextEnter::AutoComplete()
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextCompleter
-{
-public:
-    wxTextCompleter() { }
-
-    // The virtual functions to be implemented by the derived classes: the
-    // first one is called to start preparing for completions for the given
-    // prefix and, if it returns true, GetNext() is called until it returns an
-    // empty string indicating that there are no more completions.
-    virtual bool Start(const wxString& prefix) = 0;
-    virtual wxString GetNext() = 0;
-
-    virtual ~wxTextCompleter();
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxTextCompleter);
-};
-
-// ----------------------------------------------------------------------------
-// wxTextCompleterSimple: returns the entire set of completions at once
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextCompleterSimple : public wxTextCompleter
-{
-public:
-    wxTextCompleterSimple() { }
-
-    // Must be implemented to return all the completions for the given prefix.
-    virtual void GetCompletions(const wxString& prefix, wxArrayString& res) = 0;
-
-    virtual bool Start(const wxString& prefix);
-    virtual wxString GetNext();
-
-private:
-    wxArrayString m_completions;
-    unsigned m_index;
-
-    wxDECLARE_NO_COPY_CLASS(wxTextCompleterSimple);
-};
-
-// ----------------------------------------------------------------------------
-// wxTextCompleterFixed: Trivial wxTextCompleter implementation which always
-// returns the same fixed array of completions.
-// ----------------------------------------------------------------------------
-
-// NB: This class is private and intentionally not documented as it is
-//     currently used only for implementation of completion with the fixed list
-//     of strings only by wxWidgets itself, do not use it outside of wxWidgets.
-
-class wxTextCompleterFixed : public wxTextCompleterSimple
-{
-public:
-    void SetCompletions(const wxArrayString& strings)
-    {
-        m_strings = strings;
-    }
-
-    virtual void GetCompletions(const wxString& WXUNUSED(prefix),
-                                wxArrayString& res)
-    {
-        res = m_strings;
-    }
-
-private:
-    wxArrayString m_strings;
-};
-
-
-#endif // _WX_TEXTCOMPLETER_H_
-
diff --git a/Source/3rd Party/wx/include/wx/textctrl.h b/Source/3rd Party/wx/include/wx/textctrl.h
index d1c569163..b1b4c0a25 100644
--- a/Source/3rd Party/wx/include/wx/textctrl.h	
+++ b/Source/3rd Party/wx/include/wx/textctrl.h	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/textctrl.h
-// Purpose:     wxTextAttr and wxTextCtrlBase class - the interface of wxTextCtrl
+// Purpose:     wxTextCtrlBase class - the interface of wxTextCtrl
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: textctrl.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -21,14 +21,16 @@
 #if wxUSE_TEXTCTRL
 
 #include "wx/control.h"         // the base class
-#include "wx/textentry.h"       // single-line text entry interface
 #include "wx/dynarray.h"        // wxArrayInt
 #include "wx/gdicmn.h"          // wxPoint
 
-// some compilers don't have standard compliant rdbuf() (and MSVC has it only
-// in its new iostream library, not in the old one used with iostream.h)
+// Open Watcom 1.3 does allow only ios::rdbuf() while
+// we want something with streambuf parameter
+// Also, can't use streambuf if making or using a DLL :-(
+
 #if defined(__WATCOMC__) || \
-    ((defined(__VISUALC5__) || defined(__VISUALC6__)) && wxUSE_IOSTREAMH)
+    defined(__MWERKS__) || \
+    (defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL)))
     #define wxHAS_TEXT_WINDOW_STREAM 0
 #elif wxUSE_STD_IOSTREAM
     #include "wx/ioswrap.h"
@@ -37,6 +39,11 @@
     #define wxHAS_TEXT_WINDOW_STREAM 0
 #endif
 
+#if WXWIN_COMPATIBILITY_2_4 && !wxHAS_TEXT_WINDOW_STREAM
+    // define old flag if one could use it somewhere
+    #define NO_TEXT_WINDOW_STREAM
+#endif
+
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 class WXDLLIMPEXP_FWD_CORE wxTextCtrlBase;
 
@@ -44,6 +51,9 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrlBase;
 // wxTextCtrl types
 // ----------------------------------------------------------------------------
 
+// wxTextPos is the position in the text
+typedef long wxTextPos;
+
 // wxTextCoord is the line or row number (which should have been unsigned but
 // is long for backwards compatibility)
 typedef long wxTextCoord;
@@ -52,7 +62,7 @@ typedef long wxTextCoord;
 // constants
 // ----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_DATA_CORE(const char) wxTextCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[];
 
 // this is intentionally not enum to avoid warning fixes with
 // typecasting from enum type to wxTextCoord
@@ -64,6 +74,7 @@ const wxTextCoord wxInvalidTextCoord    = -2;
 // ----------------------------------------------------------------------------
 
 #define wxTE_NO_VSCROLL     0x0002
+#define wxTE_AUTO_SCROLL    0x0008
 
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
@@ -106,11 +117,6 @@ const wxTextCoord wxInvalidTextCoord    = -2;
     #define wxTE_LINEWRAP       wxTE_CHARWRAP
 #endif // WXWIN_COMPATIBILITY_2_6
 
-#if WXWIN_COMPATIBILITY_2_8
-    // this style is (or at least should be) on by default now, don't use it
-    #define wxTE_AUTO_SCROLL    0
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // force using RichEdit version 2.0 or 3.0 instead of 1.0 (default) for
 // wxTE_RICH controls - can be used together with or instead of wxTE_RICH
 #define wxTE_RICH2          0x8000
@@ -160,288 +166,39 @@ enum wxTextAttrAlignment
 };
 
 // Flags to indicate which attributes are being applied
-enum wxTextAttrFlags
-{
-    wxTEXT_ATTR_TEXT_COLOUR          = 0x00000001,
-    wxTEXT_ATTR_BACKGROUND_COLOUR    = 0x00000002,
 
-    wxTEXT_ATTR_FONT_FACE            = 0x00000004,
-    wxTEXT_ATTR_FONT_POINT_SIZE      = 0x00000008,
-    wxTEXT_ATTR_FONT_PIXEL_SIZE      = 0x10000000,
-    wxTEXT_ATTR_FONT_WEIGHT          = 0x00000010,
-    wxTEXT_ATTR_FONT_ITALIC          = 0x00000020,
-    wxTEXT_ATTR_FONT_UNDERLINE       = 0x00000040,
-    wxTEXT_ATTR_FONT_STRIKETHROUGH   = 0x08000000,
-    wxTEXT_ATTR_FONT_ENCODING        = 0x02000000,
-    wxTEXT_ATTR_FONT_FAMILY          = 0x04000000,
-    wxTEXT_ATTR_FONT_SIZE = \
-        ( wxTEXT_ATTR_FONT_POINT_SIZE | wxTEXT_ATTR_FONT_PIXEL_SIZE ),
-    wxTEXT_ATTR_FONT = \
-        ( wxTEXT_ATTR_FONT_FACE | wxTEXT_ATTR_FONT_SIZE | wxTEXT_ATTR_FONT_WEIGHT | \
-            wxTEXT_ATTR_FONT_ITALIC | wxTEXT_ATTR_FONT_UNDERLINE | wxTEXT_ATTR_FONT_STRIKETHROUGH | wxTEXT_ATTR_FONT_ENCODING | wxTEXT_ATTR_FONT_FAMILY ),
-
-    wxTEXT_ATTR_ALIGNMENT            = 0x00000080,
-    wxTEXT_ATTR_LEFT_INDENT          = 0x00000100,
-    wxTEXT_ATTR_RIGHT_INDENT         = 0x00000200,
-    wxTEXT_ATTR_TABS                 = 0x00000400,
-    wxTEXT_ATTR_PARA_SPACING_AFTER   = 0x00000800,
-    wxTEXT_ATTR_PARA_SPACING_BEFORE  = 0x00001000,
-    wxTEXT_ATTR_LINE_SPACING         = 0x00002000,
-    wxTEXT_ATTR_CHARACTER_STYLE_NAME = 0x00004000,
-    wxTEXT_ATTR_PARAGRAPH_STYLE_NAME = 0x00008000,
-    wxTEXT_ATTR_LIST_STYLE_NAME      = 0x00010000,
-
-    wxTEXT_ATTR_BULLET_STYLE         = 0x00020000,
-    wxTEXT_ATTR_BULLET_NUMBER        = 0x00040000,
-    wxTEXT_ATTR_BULLET_TEXT          = 0x00080000,
-    wxTEXT_ATTR_BULLET_NAME          = 0x00100000,
-
-    wxTEXT_ATTR_BULLET = \
-        ( wxTEXT_ATTR_BULLET_STYLE | wxTEXT_ATTR_BULLET_NUMBER | wxTEXT_ATTR_BULLET_TEXT | \
-          wxTEXT_ATTR_BULLET_NAME ),
-
-
-    wxTEXT_ATTR_URL                  = 0x00200000,
-    wxTEXT_ATTR_PAGE_BREAK           = 0x00400000,
-    wxTEXT_ATTR_EFFECTS              = 0x00800000,
-    wxTEXT_ATTR_OUTLINE_LEVEL        = 0x01000000,
-
-    /*!
-    * Character and paragraph combined styles
-    */
-
-    wxTEXT_ATTR_CHARACTER = \
-        (wxTEXT_ATTR_FONT|wxTEXT_ATTR_EFFECTS| \
-            wxTEXT_ATTR_BACKGROUND_COLOUR|wxTEXT_ATTR_TEXT_COLOUR|wxTEXT_ATTR_CHARACTER_STYLE_NAME|wxTEXT_ATTR_URL),
-
-    wxTEXT_ATTR_PARAGRAPH = \
-        (wxTEXT_ATTR_ALIGNMENT|wxTEXT_ATTR_LEFT_INDENT|wxTEXT_ATTR_RIGHT_INDENT|wxTEXT_ATTR_TABS|\
-            wxTEXT_ATTR_PARA_SPACING_BEFORE|wxTEXT_ATTR_PARA_SPACING_AFTER|wxTEXT_ATTR_LINE_SPACING|\
-            wxTEXT_ATTR_BULLET|wxTEXT_ATTR_PARAGRAPH_STYLE_NAME|wxTEXT_ATTR_LIST_STYLE_NAME|wxTEXT_ATTR_OUTLINE_LEVEL|wxTEXT_ATTR_PAGE_BREAK),
-
-    wxTEXT_ATTR_ALL = (wxTEXT_ATTR_CHARACTER|wxTEXT_ATTR_PARAGRAPH)
-};
-
-/*!
- * Styles for wxTextAttr::SetBulletStyle
- */
-enum wxTextAttrBulletStyle
-{
-    wxTEXT_ATTR_BULLET_STYLE_NONE            = 0x00000000,
-    wxTEXT_ATTR_BULLET_STYLE_ARABIC          = 0x00000001,
-    wxTEXT_ATTR_BULLET_STYLE_LETTERS_UPPER   = 0x00000002,
-    wxTEXT_ATTR_BULLET_STYLE_LETTERS_LOWER   = 0x00000004,
-    wxTEXT_ATTR_BULLET_STYLE_ROMAN_UPPER     = 0x00000008,
-    wxTEXT_ATTR_BULLET_STYLE_ROMAN_LOWER     = 0x00000010,
-    wxTEXT_ATTR_BULLET_STYLE_SYMBOL          = 0x00000020,
-    wxTEXT_ATTR_BULLET_STYLE_BITMAP          = 0x00000040,
-    wxTEXT_ATTR_BULLET_STYLE_PARENTHESES     = 0x00000080,
-    wxTEXT_ATTR_BULLET_STYLE_PERIOD          = 0x00000100,
-    wxTEXT_ATTR_BULLET_STYLE_STANDARD        = 0x00000200,
-    wxTEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS = 0x00000400,
-    wxTEXT_ATTR_BULLET_STYLE_OUTLINE         = 0x00000800,
-
-    wxTEXT_ATTR_BULLET_STYLE_ALIGN_LEFT      = 0x00000000,
-    wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT     = 0x00001000,
-    wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE    = 0x00002000
-};
-
-/*!
- * Styles for wxTextAttr::SetTextEffects
- */
-enum wxTextAttrEffects
-{
-    wxTEXT_ATTR_EFFECT_NONE                  = 0x00000000,
-    wxTEXT_ATTR_EFFECT_CAPITALS              = 0x00000001,
-    wxTEXT_ATTR_EFFECT_SMALL_CAPITALS        = 0x00000002,
-    wxTEXT_ATTR_EFFECT_STRIKETHROUGH         = 0x00000004,
-    wxTEXT_ATTR_EFFECT_DOUBLE_STRIKETHROUGH  = 0x00000008,
-    wxTEXT_ATTR_EFFECT_SHADOW                = 0x00000010,
-    wxTEXT_ATTR_EFFECT_EMBOSS                = 0x00000020,
-    wxTEXT_ATTR_EFFECT_OUTLINE               = 0x00000040,
-    wxTEXT_ATTR_EFFECT_ENGRAVE               = 0x00000080,
-    wxTEXT_ATTR_EFFECT_SUPERSCRIPT           = 0x00000100,
-    wxTEXT_ATTR_EFFECT_SUBSCRIPT             = 0x00000200
-};
-
-/*!
- * Line spacing values
- */
-enum wxTextAttrLineSpacing
-{
-    wxTEXT_ATTR_LINE_SPACING_NORMAL         = 10,
-    wxTEXT_ATTR_LINE_SPACING_HALF           = 15,
-    wxTEXT_ATTR_LINE_SPACING_TWICE          = 20
-};
+#define wxTEXT_ATTR_TEXT_COLOUR             0x0001
+#define wxTEXT_ATTR_BACKGROUND_COLOUR       0x0002
+#define wxTEXT_ATTR_FONT_FACE               0x0004
+#define wxTEXT_ATTR_FONT_SIZE               0x0008
+#define wxTEXT_ATTR_FONT_WEIGHT             0x0010
+#define wxTEXT_ATTR_FONT_ITALIC             0x0020
+#define wxTEXT_ATTR_FONT_UNDERLINE          0x0040
+#define wxTEXT_ATTR_FONT \
+  ( wxTEXT_ATTR_FONT_FACE | wxTEXT_ATTR_FONT_SIZE | wxTEXT_ATTR_FONT_WEIGHT | \
+    wxTEXT_ATTR_FONT_ITALIC | wxTEXT_ATTR_FONT_UNDERLINE )
+#define wxTEXT_ATTR_ALIGNMENT               0x0080
+#define wxTEXT_ATTR_LEFT_INDENT             0x0100
+#define wxTEXT_ATTR_RIGHT_INDENT            0x0200
+#define wxTEXT_ATTR_TABS                    0x0400
 
 // ----------------------------------------------------------------------------
 // wxTextAttr: a structure containing the visual attributes of a text
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTextAttr
+class WXDLLEXPORT wxTextAttr
 {
 public:
     // ctors
     wxTextAttr() { Init(); }
-    wxTextAttr(const wxTextAttr& attr) { Init(); Copy(attr); }
     wxTextAttr(const wxColour& colText,
                const wxColour& colBack = wxNullColour,
                const wxFont& font = wxNullFont,
                wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT);
 
-    // Initialise this object.
+    // operations
     void Init();
 
-    // Copy
-    void Copy(const wxTextAttr& attr);
-
-    // Assignment
-    void operator= (const wxTextAttr& attr);
-
-    // Equality test
-    bool operator== (const wxTextAttr& attr) const;
-
-    // Partial equality test.  If @a weakTest is @true, attributes of this object do not
-    // have to be present if those attributes of @a attr are present. If @a weakTest is
-    // @false, the function will fail if an attribute is present in @a attr but not
-    // in this object.
-    bool EqPartial(const wxTextAttr& attr, bool weakTest = true) const;
-
-    // Get attributes from font.
-    bool GetFontAttributes(const wxFont& font, int flags = wxTEXT_ATTR_FONT);
-
-    // setters
-    void SetTextColour(const wxColour& colText) { m_colText = colText; m_flags |= wxTEXT_ATTR_TEXT_COLOUR; }
-    void SetBackgroundColour(const wxColour& colBack) { m_colBack = colBack; m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; }
-    void SetAlignment(wxTextAttrAlignment alignment) { m_textAlignment = alignment; m_flags |= wxTEXT_ATTR_ALIGNMENT; }
-    void SetTabs(const wxArrayInt& tabs) { m_tabs = tabs; m_flags |= wxTEXT_ATTR_TABS; }
-    void SetLeftIndent(int indent, int subIndent = 0) { m_leftIndent = indent; m_leftSubIndent = subIndent; m_flags |= wxTEXT_ATTR_LEFT_INDENT; }
-    void SetRightIndent(int indent) { m_rightIndent = indent; m_flags |= wxTEXT_ATTR_RIGHT_INDENT; }
-
-    void SetFontSize(int pointSize) { m_fontSize = pointSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_POINT_SIZE; }
-    void SetFontPointSize(int pointSize) { m_fontSize = pointSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_POINT_SIZE; }
-    void SetFontPixelSize(int pixelSize) { m_fontSize = pixelSize; m_flags &= ~wxTEXT_ATTR_FONT_SIZE; m_flags |= wxTEXT_ATTR_FONT_PIXEL_SIZE; }
-    void SetFontStyle(wxFontStyle fontStyle) { m_fontStyle = fontStyle; m_flags |= wxTEXT_ATTR_FONT_ITALIC; }
-    void SetFontWeight(wxFontWeight fontWeight) { m_fontWeight = fontWeight; m_flags |= wxTEXT_ATTR_FONT_WEIGHT; }
-    void SetFontFaceName(const wxString& faceName) { m_fontFaceName = faceName; m_flags |= wxTEXT_ATTR_FONT_FACE; }
-    void SetFontUnderlined(bool underlined) { m_fontUnderlined = underlined; m_flags |= wxTEXT_ATTR_FONT_UNDERLINE; }
-    void SetFontStrikethrough(bool strikethrough) { m_fontStrikethrough = strikethrough; m_flags |= wxTEXT_ATTR_FONT_STRIKETHROUGH; }
-    void SetFontEncoding(wxFontEncoding encoding) { m_fontEncoding = encoding; m_flags |= wxTEXT_ATTR_FONT_ENCODING; }
-    void SetFontFamily(wxFontFamily family) { m_fontFamily = family; m_flags |= wxTEXT_ATTR_FONT_FAMILY; }
-
-    // Set font
-    void SetFont(const wxFont& font, int flags = (wxTEXT_ATTR_FONT & ~wxTEXT_ATTR_FONT_PIXEL_SIZE)) { GetFontAttributes(font, flags); }
-
-    void SetFlags(long flags) { m_flags = flags; }
-
-    void SetCharacterStyleName(const wxString& name) { m_characterStyleName = name; m_flags |= wxTEXT_ATTR_CHARACTER_STYLE_NAME; }
-    void SetParagraphStyleName(const wxString& name) { m_paragraphStyleName = name; m_flags |= wxTEXT_ATTR_PARAGRAPH_STYLE_NAME; }
-    void SetListStyleName(const wxString& name) { m_listStyleName = name; SetFlags(GetFlags() | wxTEXT_ATTR_LIST_STYLE_NAME); }
-    void SetParagraphSpacingAfter(int spacing) { m_paragraphSpacingAfter = spacing; m_flags |= wxTEXT_ATTR_PARA_SPACING_AFTER; }
-    void SetParagraphSpacingBefore(int spacing) { m_paragraphSpacingBefore = spacing; m_flags |= wxTEXT_ATTR_PARA_SPACING_BEFORE; }
-    void SetLineSpacing(int spacing) { m_lineSpacing = spacing; m_flags |= wxTEXT_ATTR_LINE_SPACING; }
-    void SetBulletStyle(int style) { m_bulletStyle = style; m_flags |= wxTEXT_ATTR_BULLET_STYLE; }
-    void SetBulletNumber(int n) { m_bulletNumber = n; m_flags |= wxTEXT_ATTR_BULLET_NUMBER; }
-    void SetBulletText(const wxString& text) { m_bulletText = text; m_flags |= wxTEXT_ATTR_BULLET_TEXT; }
-    void SetBulletFont(const wxString& bulletFont) { m_bulletFont = bulletFont; }
-    void SetBulletName(const wxString& name) { m_bulletName = name; m_flags |= wxTEXT_ATTR_BULLET_NAME; }
-    void SetURL(const wxString& url) { m_urlTarget = url; m_flags |= wxTEXT_ATTR_URL; }
-    void SetPageBreak(bool pageBreak = true) { SetFlags(pageBreak ? (GetFlags() | wxTEXT_ATTR_PAGE_BREAK) : (GetFlags() & ~wxTEXT_ATTR_PAGE_BREAK)); }
-    void SetTextEffects(int effects) { m_textEffects = effects; SetFlags(GetFlags() | wxTEXT_ATTR_EFFECTS); }
-    void SetTextEffectFlags(int effects) { m_textEffectFlags = effects; }
-    void SetOutlineLevel(int level) { m_outlineLevel = level; SetFlags(GetFlags() | wxTEXT_ATTR_OUTLINE_LEVEL); }
-
-    const wxColour& GetTextColour() const { return m_colText; }
-    const wxColour& GetBackgroundColour() const { return m_colBack; }
-    wxTextAttrAlignment GetAlignment() const { return m_textAlignment; }
-    const wxArrayInt& GetTabs() const { return m_tabs; }
-    long GetLeftIndent() const { return m_leftIndent; }
-    long GetLeftSubIndent() const { return m_leftSubIndent; }
-    long GetRightIndent() const { return m_rightIndent; }
-    long GetFlags() const { return m_flags; }
-
-    int GetFontSize() const { return m_fontSize; }
-    wxFontStyle GetFontStyle() const { return m_fontStyle; }
-    wxFontWeight GetFontWeight() const { return m_fontWeight; }
-    bool GetFontUnderlined() const { return m_fontUnderlined; }
-    bool GetFontStrikethrough() const { return m_fontStrikethrough; }
-    const wxString& GetFontFaceName() const { return m_fontFaceName; }
-    wxFontEncoding GetFontEncoding() const { return m_fontEncoding; }
-    wxFontFamily GetFontFamily() const { return m_fontFamily; }
-
-    wxFont GetFont() const;
-
-    const wxString& GetCharacterStyleName() const { return m_characterStyleName; }
-    const wxString& GetParagraphStyleName() const { return m_paragraphStyleName; }
-    const wxString& GetListStyleName() const { return m_listStyleName; }
-    int GetParagraphSpacingAfter() const { return m_paragraphSpacingAfter; }
-    int GetParagraphSpacingBefore() const { return m_paragraphSpacingBefore; }
-
-    int GetLineSpacing() const { return m_lineSpacing; }
-    int GetBulletStyle() const { return m_bulletStyle; }
-    int GetBulletNumber() const { return m_bulletNumber; }
-    const wxString& GetBulletText() const { return m_bulletText; }
-    const wxString& GetBulletFont() const { return m_bulletFont; }
-    const wxString& GetBulletName() const { return m_bulletName; }
-    const wxString& GetURL() const { return m_urlTarget; }
-    int GetTextEffects() const { return m_textEffects; }
-    int GetTextEffectFlags() const { return m_textEffectFlags; }
-    int GetOutlineLevel() const { return m_outlineLevel; }
-
-    // accessors
-    bool HasTextColour() const { return m_colText.IsOk() && HasFlag(wxTEXT_ATTR_TEXT_COLOUR) ; }
-    bool HasBackgroundColour() const { return m_colBack.IsOk() && HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) ; }
-    bool HasAlignment() const { return (m_textAlignment != wxTEXT_ALIGNMENT_DEFAULT) && HasFlag(wxTEXT_ATTR_ALIGNMENT) ; }
-    bool HasTabs() const { return HasFlag(wxTEXT_ATTR_TABS) ; }
-    bool HasLeftIndent() const { return HasFlag(wxTEXT_ATTR_LEFT_INDENT); }
-    bool HasRightIndent() const { return HasFlag(wxTEXT_ATTR_RIGHT_INDENT); }
-    bool HasFontWeight() const { return HasFlag(wxTEXT_ATTR_FONT_WEIGHT); }
-    bool HasFontSize() const { return HasFlag(wxTEXT_ATTR_FONT_SIZE); }
-    bool HasFontPointSize() const { return HasFlag(wxTEXT_ATTR_FONT_POINT_SIZE); }
-    bool HasFontPixelSize() const { return HasFlag(wxTEXT_ATTR_FONT_PIXEL_SIZE); }
-    bool HasFontItalic() const { return HasFlag(wxTEXT_ATTR_FONT_ITALIC); }
-    bool HasFontUnderlined() const { return HasFlag(wxTEXT_ATTR_FONT_UNDERLINE); }
-    bool HasFontStrikethrough() const { return HasFlag(wxTEXT_ATTR_FONT_STRIKETHROUGH); }
-    bool HasFontFaceName() const { return HasFlag(wxTEXT_ATTR_FONT_FACE); }
-    bool HasFontEncoding() const { return HasFlag(wxTEXT_ATTR_FONT_ENCODING); }
-    bool HasFontFamily() const { return HasFlag(wxTEXT_ATTR_FONT_FAMILY); }
-    bool HasFont() const { return HasFlag(wxTEXT_ATTR_FONT); }
-
-    bool HasParagraphSpacingAfter() const { return HasFlag(wxTEXT_ATTR_PARA_SPACING_AFTER); }
-    bool HasParagraphSpacingBefore() const { return HasFlag(wxTEXT_ATTR_PARA_SPACING_BEFORE); }
-    bool HasLineSpacing() const { return HasFlag(wxTEXT_ATTR_LINE_SPACING); }
-    bool HasCharacterStyleName() const { return HasFlag(wxTEXT_ATTR_CHARACTER_STYLE_NAME) && !m_characterStyleName.IsEmpty(); }
-    bool HasParagraphStyleName() const { return HasFlag(wxTEXT_ATTR_PARAGRAPH_STYLE_NAME) && !m_paragraphStyleName.IsEmpty(); }
-    bool HasListStyleName() const { return HasFlag(wxTEXT_ATTR_LIST_STYLE_NAME) || !m_listStyleName.IsEmpty(); }
-    bool HasBulletStyle() const { return HasFlag(wxTEXT_ATTR_BULLET_STYLE); }
-    bool HasBulletNumber() const { return HasFlag(wxTEXT_ATTR_BULLET_NUMBER); }
-    bool HasBulletText() const { return HasFlag(wxTEXT_ATTR_BULLET_TEXT); }
-    bool HasBulletName() const { return HasFlag(wxTEXT_ATTR_BULLET_NAME); }
-    bool HasURL() const { return HasFlag(wxTEXT_ATTR_URL); }
-    bool HasPageBreak() const { return HasFlag(wxTEXT_ATTR_PAGE_BREAK); }
-    bool HasTextEffects() const { return HasFlag(wxTEXT_ATTR_EFFECTS); }
-    bool HasTextEffect(int effect) const { return HasFlag(wxTEXT_ATTR_EFFECTS) && ((GetTextEffectFlags() & effect) != 0); }
-    bool HasOutlineLevel() const { return HasFlag(wxTEXT_ATTR_OUTLINE_LEVEL); }
-
-    bool HasFlag(long flag) const { return (m_flags & flag) != 0; }
-    void RemoveFlag(long flag) { m_flags &= ~flag; }
-    void AddFlag(long flag) { m_flags |= flag; }
-
-    // Is this a character style?
-    bool IsCharacterStyle() const { return HasFlag(wxTEXT_ATTR_CHARACTER); }
-    bool IsParagraphStyle() const { return HasFlag(wxTEXT_ATTR_PARAGRAPH); }
-
-    // returns false if we have any attributes set, true otherwise
-    bool IsDefault() const
-    {
-        return GetFlags() == 0;
-    }
-
-    // Merges the given attributes. If compareWith
-    // is non-NULL, then it will be used to mask out those attributes that are the same in style
-    // and compareWith, for situations where we don't want to explicitly set inherited attributes.
-    bool Apply(const wxTextAttr& style, const wxTextAttr* compareWith = NULL);
-
     // merges the attributes of the base and the overlay objects and returns
     // the result; the parameter attributes take precedence
     //
@@ -457,6 +214,47 @@ public:
         *this = Merge(*this, overlay);
     }
 
+
+    // operators
+    void operator= (const wxTextAttr& attr);
+
+    // setters
+    void SetTextColour(const wxColour& colText) { m_colText = colText; m_flags |= wxTEXT_ATTR_TEXT_COLOUR; }
+    void SetBackgroundColour(const wxColour& colBack) { m_colBack = colBack; m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR; }
+    void SetFont(const wxFont& font, long flags = wxTEXT_ATTR_FONT) { m_font = font; m_flags |= flags; }
+    void SetAlignment(wxTextAttrAlignment alignment) { m_textAlignment = alignment; m_flags |= wxTEXT_ATTR_ALIGNMENT; }
+    void SetTabs(const wxArrayInt& tabs) { m_tabs = tabs; m_flags |= wxTEXT_ATTR_TABS; }
+    void SetLeftIndent(int indent, int subIndent = 0) { m_leftIndent = indent; m_leftSubIndent = subIndent; m_flags |= wxTEXT_ATTR_LEFT_INDENT; }
+    void SetRightIndent(int indent) { m_rightIndent = indent; m_flags |= wxTEXT_ATTR_RIGHT_INDENT; }
+    void SetFlags(long flags) { m_flags = flags; }
+
+    // accessors
+    bool HasTextColour() const { return m_colText.Ok() && HasFlag(wxTEXT_ATTR_TEXT_COLOUR) ; }
+    bool HasBackgroundColour() const { return m_colBack.Ok() && HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) ; }
+    bool HasFont() const { return m_font.Ok() && HasFlag(wxTEXT_ATTR_FONT) ; }
+    bool HasAlignment() const { return (m_textAlignment != wxTEXT_ALIGNMENT_DEFAULT) && ((m_flags & wxTEXT_ATTR_ALIGNMENT) != 0) ; }
+    bool HasTabs() const { return (m_flags & wxTEXT_ATTR_TABS) != 0 ; }
+    bool HasLeftIndent() const { return (m_flags & wxTEXT_ATTR_LEFT_INDENT) != 0 ; }
+    bool HasRightIndent() const { return (m_flags & wxTEXT_ATTR_RIGHT_INDENT) != 0 ; }
+    bool HasFlag(long flag) const { return (m_flags & flag) != 0; }
+
+    const wxColour& GetTextColour() const { return m_colText; }
+    const wxColour& GetBackgroundColour() const { return m_colBack; }
+    const wxFont& GetFont() const { return m_font; }
+    wxTextAttrAlignment GetAlignment() const { return m_textAlignment; }
+    const wxArrayInt& GetTabs() const { return m_tabs; }
+    long GetLeftIndent() const { return m_leftIndent; }
+    long GetLeftSubIndent() const { return m_leftSubIndent; }
+    long GetRightIndent() const { return m_rightIndent; }
+    long GetFlags() const { return m_flags; }
+
+    // returns false if we have any attributes set, true otherwise
+    bool IsDefault() const
+    {
+        return !HasTextColour() && !HasBackgroundColour() && !HasFont() && !HasAlignment() &&
+               !HasTabs() && !HasLeftIndent() && !HasRightIndent() ;
+    }
+
     // return the attribute having the valid font and colours: it uses the
     // attributes set in attr and falls back first to attrDefault and then to
     // the text control font/colours for those attributes which are not set
@@ -464,98 +262,84 @@ public:
                               const wxTextAttr& attrDef,
                               const wxTextCtrlBase *text);
 
-    // Compare tabs
-    static bool TabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2);
-
-    // Remove attributes
-    static bool RemoveStyle(wxTextAttr& destStyle, const wxTextAttr& style);
-
-    // Combine two bitlists, specifying the bits of interest with separate flags.
-    static bool CombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB);
-
-    // Compare two bitlists
-    static bool BitlistsEqPartial(int valueA, int valueB, int flags);
-
-    // Split into paragraph and character styles
-    static bool SplitParaCharStyles(const wxTextAttr& style, wxTextAttr& parStyle, wxTextAttr& charStyle);
-
 private:
     long                m_flags;
-
-    // Paragraph styles
+    wxColour            m_colText,
+                        m_colBack;
+    wxFont              m_font;
+    wxTextAttrAlignment m_textAlignment;
     wxArrayInt          m_tabs; // array of int: tab stops in 1/10 mm
     int                 m_leftIndent; // left indent in 1/10 mm
     int                 m_leftSubIndent; // left indent for all but the first
                                          // line in a paragraph relative to the
                                          // first line, in 1/10 mm
     int                 m_rightIndent; // right indent in 1/10 mm
-    wxTextAttrAlignment m_textAlignment;
-
-    int                 m_paragraphSpacingAfter;
-    int                 m_paragraphSpacingBefore;
-    int                 m_lineSpacing;
-    int                 m_bulletStyle;
-    int                 m_bulletNumber;
-    int                 m_textEffects;
-    int                 m_textEffectFlags;
-    int                 m_outlineLevel;
-    wxString            m_bulletText;
-    wxString            m_bulletFont;
-    wxString            m_bulletName;
-    wxString            m_urlTarget;
-    wxFontEncoding      m_fontEncoding;
-
-    // Character styles
-    wxColour            m_colText,
-                        m_colBack;
-    int                 m_fontSize;
-    wxFontStyle         m_fontStyle;
-    wxFontWeight        m_fontWeight;
-    wxFontFamily        m_fontFamily;
-    bool                m_fontUnderlined;
-    bool                m_fontStrikethrough;
-    wxString            m_fontFaceName;
-
-    // Character style
-    wxString            m_characterStyleName;
-
-    // Paragraph style
-    wxString            m_paragraphStyleName;
-
-    // List style
-    wxString            m_listStyleName;
 };
 
 // ----------------------------------------------------------------------------
-// wxTextAreaBase: multiline text control specific methods
+// wxTextCtrl: a single or multiple line text zone where user can enter and
+// edit text
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTextAreaBase
+class WXDLLEXPORT wxTextCtrlBase : public wxControl
+#if wxHAS_TEXT_WINDOW_STREAM
+                                 , public wxSTD streambuf
+#endif
+
 {
 public:
-    wxTextAreaBase() { }
-    virtual ~wxTextAreaBase() { }
+    // creation
+    // --------
 
-    // lines access
-    // ------------
+    wxTextCtrlBase(){}
+    virtual ~wxTextCtrlBase(){}
+
+    // accessors
+    // ---------
+
+    virtual wxString GetValue() const = 0;
+    virtual bool IsEmpty() const { return GetValue().empty(); }
+
+    virtual void SetValue(const wxString& value)
+        { DoSetValue(value, SetValue_SendEvent); }
+    virtual void ChangeValue(const wxString& value)
+        { DoSetValue(value); }
+
+    virtual wxString GetRange(long from, long to) const;
 
     virtual int GetLineLength(long lineNo) const = 0;
     virtual wxString GetLineText(long lineNo) const = 0;
     virtual int GetNumberOfLines() const = 0;
 
-
-    // file IO
-    // -------
-
-    bool LoadFile(const wxString& file, int fileType = wxTEXT_TYPE_ANY)
-        { return DoLoadFile(file, fileType); }
-    bool SaveFile(const wxString& file = wxEmptyString,
-                  int fileType = wxTEXT_TYPE_ANY);
-
-    // dirty flag handling
-    // -------------------
-
     virtual bool IsModified() const = 0;
+    virtual bool IsEditable() const = 0;
+
+    // more readable flag testing methods
+    bool IsSingleLine() const { return !HasFlag(wxTE_MULTILINE); }
+    bool IsMultiLine() const { return !IsSingleLine(); }
+
+    // If the return values from and to are the same, there is no selection.
+    virtual void GetSelection(long* from, long* to) const = 0;
+
+    virtual wxString GetStringSelection() const;
+
+    // operations
+    // ----------
+
+    // editing
+    virtual void Clear() = 0;
+    virtual void Replace(long from, long to, const wxString& value) = 0;
+    virtual void Remove(long from, long to) = 0;
+
+    // load/save the control's contents from/to a file
+    bool LoadFile(const wxString& file, int fileType = wxTEXT_TYPE_ANY) { return DoLoadFile(file, fileType); }
+    bool SaveFile(const wxString& file = wxEmptyString, int fileType = wxTEXT_TYPE_ANY);
+
+    // implementation for loading/saving
+    virtual bool DoLoadFile(const wxString& file, int fileType);
+    virtual bool DoSaveFile(const wxString& file, int fileType);
+
+    // sets/clears the dirty flag
     virtual void MarkDirty() = 0;
     virtual void DiscardEdits() = 0;
     void SetModified(bool modified)
@@ -566,21 +350,26 @@ public:
             DiscardEdits();
     }
 
+    // set the max number of characters which may be entered in a single line
+    // text control
+    virtual void SetMaxLength(unsigned long WXUNUSED(len)) { }
 
-    // styles handling
-    // ---------------
+    // writing text inserts it at the current position, appending always
+    // inserts it at the end
+    virtual void WriteText(const wxString& text) = 0;
+    virtual void AppendText(const wxString& text) = 0;
+
+    // insert the character which would have resulted from this key event,
+    // return true if anything has been inserted
+    virtual bool EmulateKeyPress(const wxKeyEvent& event);
 
     // text control under some platforms supports the text styles: these
     // methods allow to apply the given text style to the given selection or to
     // set/get the style which will be used for all appended text
-    virtual bool SetStyle(long start, long end, const wxTextAttr& style) = 0;
-    virtual bool GetStyle(long position, wxTextAttr& style) = 0;
-    virtual bool SetDefaultStyle(const wxTextAttr& style) = 0;
-    virtual const wxTextAttr& GetDefaultStyle() const { return m_defaultStyle; }
-
-
-    // coordinates translation
-    // -----------------------
+    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
+    virtual bool GetStyle(long position, wxTextAttr& style);
+    virtual bool SetDefaultStyle(const wxTextAttr& style);
+    virtual const wxTextAttr& GetDefaultStyle() const;
 
     // translate between the position (which is just an index in the text ctrl
     // considering all its contents as a single strings) and (x, y) coordinates
@@ -588,11 +377,6 @@ public:
     virtual long XYToPosition(long x, long y) const = 0;
     virtual bool PositionToXY(long pos, long *x, long *y) const = 0;
 
-    // translate the given position (which is just an index in the text control)
-    // to client coordinates
-    wxPoint PositionToCoords(long pos) const;
-
-
     virtual void ShowPosition(long pos) = 0;
 
     // find the character at position given in pixels
@@ -603,21 +387,66 @@ public:
     virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
                                             wxTextCoord *col,
                                             wxTextCoord *row) const;
-    virtual wxString GetValue() const = 0;
-    virtual void SetValue(const wxString& value) = 0;
+
+    // Clipboard operations
+    virtual void Copy() = 0;
+    virtual void Cut() = 0;
+    virtual void Paste() = 0;
+
+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;
+
+    // Undo/redo
+    virtual void Undo() = 0;
+    virtual void Redo() = 0;
+
+    virtual bool CanUndo() const = 0;
+    virtual bool CanRedo() const = 0;
+
+    // Insertion point
+    virtual void SetInsertionPoint(long pos) = 0;
+    virtual void SetInsertionPointEnd() = 0;
+    virtual long GetInsertionPoint() const = 0;
+    virtual wxTextPos GetLastPosition() const = 0;
+
+    virtual void SetSelection(long from, long to) = 0;
+    virtual void SelectAll();
+    virtual void SetEditable(bool editable) = 0;
+
+    // stream-like insertion operators: these are always available, whether we
+    // were, or not, compiled with streambuf support
+    wxTextCtrl& operator<<(const wxString& s);
+    wxTextCtrl& operator<<(int i);
+    wxTextCtrl& operator<<(long i);
+    wxTextCtrl& operator<<(float f);
+    wxTextCtrl& operator<<(double d);
+    wxTextCtrl& operator<<(const wxChar c);
+
+    // generate the wxEVT_COMMAND_TEXT_UPDATED event, like SetValue() does
+    void SendTextUpdatedEvent();
+
+    // do the window-specific processing after processing the update event
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
+
+    virtual bool ShouldInheritColours() const { return false; }
 
 protected:
-    // implementation of loading/saving
-    virtual bool DoLoadFile(const wxString& file, int fileType);
-    virtual bool DoSaveFile(const wxString& file, int fileType);
+    // override streambuf method
+#if wxHAS_TEXT_WINDOW_STREAM
+    int overflow(int i);
+#endif // wxHAS_TEXT_WINDOW_STREAM
 
-    // Return true if the given position is valid, i.e. positive and less than
-    // the last position.
-    virtual bool IsValidPosition(long pos) const = 0;
+    // flags for DoSetValue(): common part of SetValue() and ChangeValue() and
+    // also used to implement WriteText() in wxMSW
+    enum
+    {
+        SetValue_SendEvent = 1,
+        SetValue_SelectionOnly = 2
+    };
+
+    virtual void DoSetValue(const wxString& value, int flags = 0) = 0;
 
-    // Default stub implementation of PositionToCoords() always returns
-    // wxDefaultPosition.
-    virtual wxPoint DoPositionToCoords(long pos) const;
 
     // the name of the last file loaded with LoadFile() which will be used by
     // SaveFile() by default
@@ -626,142 +455,7 @@ protected:
     // the text style which will be used for any new text added to the control
     wxTextAttr m_defaultStyle;
 
-
-    wxDECLARE_NO_COPY_CLASS(wxTextAreaBase);
-};
-
-// this class defines wxTextCtrl interface, wxTextCtrlBase actually implements
-// too much things because it derives from wxTextEntry and not wxTextEntryBase
-// and so any classes which "look like" wxTextCtrl (such as wxRichTextCtrl)
-// but don't need the (native) implementation bits from wxTextEntry should
-// actually derive from this one and not wxTextCtrlBase
-class WXDLLIMPEXP_CORE wxTextCtrlIface : public wxTextAreaBase,
-                                         public wxTextEntryBase
-{
-public:
-    wxTextCtrlIface() { }
-
-    // wxTextAreaBase overrides
-    virtual wxString GetValue() const
-    {
-       return wxTextEntryBase::GetValue();
-    }
-    virtual void SetValue(const wxString& value)
-    {
-       wxTextEntryBase::SetValue(value);
-    }
-
-protected:
-    virtual bool IsValidPosition(long pos) const
-    {
-        return pos >= 0 && pos <= GetLastPosition();
-    }
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxTextCtrlIface);
-};
-
-// ----------------------------------------------------------------------------
-// wxTextCtrl: a single or multiple line text zone where user can edit text
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextCtrlBase : public wxControl,
-#if wxHAS_TEXT_WINDOW_STREAM
-                                   public wxSTD streambuf,
-#endif
-                                   public wxTextAreaBase,
-                                   public wxTextEntry
-{
-public:
-    // creation
-    // --------
-
-    wxTextCtrlBase() { }
-    virtual ~wxTextCtrlBase() { }
-
-
-    // more readable flag testing methods
-    bool IsSingleLine() const { return !HasFlag(wxTE_MULTILINE); }
-    bool IsMultiLine() const { return !IsSingleLine(); }
-
-    // stream-like insertion operators: these are always available, whether we
-    // were, or not, compiled with streambuf support
-    wxTextCtrl& operator<<(const wxString& s);
-    wxTextCtrl& operator<<(int i);
-    wxTextCtrl& operator<<(long i);
-    wxTextCtrl& operator<<(float f) { return *this << double(f); }
-    wxTextCtrl& operator<<(double d);
-    wxTextCtrl& operator<<(char c) { return *this << wxString(c); }
-    wxTextCtrl& operator<<(wchar_t c) { return *this << wxString(c); }
-
-    // insert the character which would have resulted from this key event,
-    // return true if anything has been inserted
-    virtual bool EmulateKeyPress(const wxKeyEvent& event);
-
-
-    // do the window-specific processing after processing the update event
-    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
-
-    virtual bool ShouldInheritColours() const { return false; }
-
-    // work around the problem with having HitTest() both in wxControl and
-    // wxTextAreaBase base classes
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const
-    {
-        return wxTextAreaBase::HitTest(pt, pos);
-    }
-
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
-                                            wxTextCoord *col,
-                                            wxTextCoord *row) const
-    {
-        return wxTextAreaBase::HitTest(pt, col, row);
-    }
-
-    // we provide stubs for these functions as not all platforms have styles
-    // support, but we really should leave them pure virtual here
-    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
-    virtual bool GetStyle(long position, wxTextAttr& style);
-    virtual bool SetDefaultStyle(const wxTextAttr& style);
-
-    // wxTextAreaBase overrides
-    virtual wxString GetValue() const
-    {
-       return wxTextEntry::GetValue();
-    }
-    virtual void SetValue(const wxString& value)
-    {
-       wxTextEntry::SetValue(value);
-    }
-
-    // wxWindow overrides
-    virtual wxVisualAttributes GetDefaultAttributes() const
-    {
-        return GetClassDefaultAttributes(GetWindowVariant());
-    }
-
-    static wxVisualAttributes
-    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL)
-    {
-        return GetCompositeControlsDefaultAttributes(variant);
-    }
-
-protected:
-    // override streambuf method
-#if wxHAS_TEXT_WINDOW_STREAM
-    int overflow(int i);
-#endif // wxHAS_TEXT_WINDOW_STREAM
-
-    // Another wxTextAreaBase override.
-    virtual bool IsValidPosition(long pos) const
-    {
-        return pos >= 0 && pos <= GetLastPosition();
-    }
-
-    // implement the wxTextEntry pure virtual method
-    virtual wxWindow *GetEditableWindow() { return this; }
-
-    wxDECLARE_NO_COPY_CLASS(wxTextCtrlBase);
+    DECLARE_NO_COPY_CLASS(wxTextCtrlBase)
     DECLARE_ABSTRACT_CLASS(wxTextCtrlBase)
 };
 
@@ -784,7 +478,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/textctrl.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/textctrl.h"
+    #include "wx/mac/textctrl.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/textctrl.h"
 #elif defined(__WXPM__)
@@ -795,26 +489,25 @@ protected:
 // wxTextCtrl events
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_FWD_CORE wxTextUrlEvent;
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
 
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_URL, wxTextUrlEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_MAXLEN, wxCommandEvent);
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED, 7)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER, 8)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL, 13)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN, 14)
+END_DECLARE_EVENT_TYPES()
 
-class WXDLLIMPEXP_CORE wxTextUrlEvent : public wxCommandEvent
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+class WXDLLEXPORT wxTextUrlEvent : public wxCommandEvent
 {
 public:
     wxTextUrlEvent(int winid, const wxMouseEvent& evtMouse,
                    long start, long end)
-        : wxCommandEvent(wxEVT_COMMAND_TEXT_URL, winid),
-          m_evtMouse(evtMouse), m_start(start), m_end(end)
+        : wxCommandEvent(wxEVT_COMMAND_TEXT_URL, winid)
+        , m_evtMouse(evtMouse), m_start(start), m_end(end)
         { }
-    wxTextUrlEvent(const wxTextUrlEvent& event)
-        : wxCommandEvent(event),
-          m_evtMouse(event.m_evtMouse),
-          m_start(event.m_start),
-          m_end(event.m_end) { }
 
     // get the mouse event which happend over the URL
     const wxMouseEvent& GetMouseEvent() const { return m_evtMouse; }
@@ -825,8 +518,6 @@ public:
     // get the end of the URL
     long GetURLEnd() const { return m_end; }
 
-    virtual wxEvent *Clone() const { return new wxTextUrlEvent(*this); }
-
 protected:
     // the corresponding mouse event
     wxMouseEvent m_evtMouse;
@@ -836,7 +527,7 @@ protected:
          m_end;
 
 private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTextUrlEvent)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextUrlEvent)
 
 public:
     // for wxWin RTTI only, don't use
@@ -847,7 +538,7 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&);
 
 #define wxTextEventHandler(func) wxCommandEventHandler(func)
 #define wxTextUrlEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxTextUrlEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTextUrlEventFunction, &func)
 
 #define wx__DECLARE_TEXTEVT(evt, id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_ ## evt, id, wxTextEventHandler(fn))
@@ -867,7 +558,7 @@ typedef void (wxEvtHandler::*wxTextUrlEventFunction)(wxTextUrlEvent&);
 // C++ stream to the wxTextCtrl given to its ctor during its lifetime.
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxStreamToTextRedirector
+class WXDLLEXPORT wxStreamToTextRedirector
 {
 private:
     void Init(wxTextCtrl *text)
diff --git a/Source/3rd Party/wx/include/wx/textdlg.h b/Source/3rd Party/wx/include/wx/textdlg.h
index e70cdcd2d..787233d4f 100644
--- a/Source/3rd Party/wx/include/wx/textdlg.h	
+++ b/Source/3rd Party/wx/include/wx/textdlg.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/textdlg.h
+// Name:        textdlg.h
 // Purpose:     wxTextEntryDialog class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: textdlg.h 27408 2004-05-23 20:53:33Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,5 +14,10 @@
 
 #include "wx/generic/textdlgg.h"
 
+#if WXWIN_COMPATIBILITY_2_4
+    // for wxGetNumberFromUser()
+    #include "wx/numdlg.h"
+#endif // WXWIN_COMPATIBILITY_2_4
+
 #endif // _WX_TEXTDLG_H_BASE_
 
diff --git a/Source/3rd Party/wx/include/wx/textentry.h b/Source/3rd Party/wx/include/wx/textentry.h
deleted file mode 100644
index 69211806b..000000000
--- a/Source/3rd Party/wx/include/wx/textentry.h	
+++ /dev/null
@@ -1,331 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/textentry.h
-// Purpose:     declares wxTextEntry interface defining a simple text entry
-// Author:      Vadim Zeitlin
-// Created:     2007-09-24
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TEXTENTRY_H_
-#define _WX_TEXTENTRY_H_
-
-// wxTextPos is the position in the text (currently it's hardly used anywhere
-// and should probably be replaced with int anyhow)
-typedef long wxTextPos;
-
-class WXDLLIMPEXP_FWD_BASE wxArrayString;
-class WXDLLIMPEXP_FWD_CORE wxTextCompleter;
-class WXDLLIMPEXP_FWD_CORE wxTextEntryHintData;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-#include "wx/filefn.h"              // for wxFILE and wxDIR only
-#include "wx/gdicmn.h"              // for wxPoint
-
-// ----------------------------------------------------------------------------
-// wxTextEntryBase
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextEntryBase
-{
-public:
-    wxTextEntryBase() { m_eventsBlock = 0; m_hintData = NULL; }
-    virtual ~wxTextEntryBase();
-
-
-    // accessing the value
-    // -------------------
-
-    // SetValue() generates a text change event, ChangeValue() doesn't
-    virtual void SetValue(const wxString& value)
-        { DoSetValue(value, SetValue_SendEvent); }
-    virtual void ChangeValue(const wxString& value);
-
-    // writing text inserts it at the current position replacing any current
-    // selection, appending always inserts it at the end and doesn't remove any
-    // existing text (but it will reset the selection if there is any)
-    virtual void WriteText(const wxString& text) = 0;
-    virtual void AppendText(const wxString& text);
-
-    virtual wxString GetValue() const;
-    virtual wxString GetRange(long from, long to) const;
-    bool IsEmpty() const { return GetLastPosition() <= 0; }
-
-
-    // editing operations
-    // ------------------
-
-    virtual void Replace(long from, long to, const wxString& value);
-    virtual void Remove(long from, long to) = 0;
-    virtual void Clear() { SetValue(wxString()); }
-    void RemoveSelection();
-
-
-    // clipboard operations
-    // --------------------
-
-    virtual void Copy() = 0;
-    virtual void Cut() = 0;
-    virtual void Paste() = 0;
-
-    virtual bool CanCopy() const;
-    virtual bool CanCut() const;
-    virtual bool CanPaste() const;
-
-    // undo/redo
-    // ---------
-
-    virtual void Undo() = 0;
-    virtual void Redo() = 0;
-
-    virtual bool CanUndo() const = 0;
-    virtual bool CanRedo() const = 0;
-
-
-    // insertion point
-    // ---------------
-
-    // note that moving insertion point removes any current selection
-    virtual void SetInsertionPoint(long pos) = 0;
-    virtual void SetInsertionPointEnd() { SetInsertionPoint(-1); }
-    virtual long GetInsertionPoint() const = 0;
-    virtual long GetLastPosition() const = 0;
-
-
-    // selection
-    // ---------
-
-    virtual void SetSelection(long from, long to) = 0;
-    virtual void SelectAll() { SetSelection(-1, -1); }
-    virtual void GetSelection(long *from, long *to) const = 0;
-    bool HasSelection() const;
-    virtual wxString GetStringSelection() const;
-
-
-    // auto-completion
-    // ---------------
-
-    // these functions allow to auto-complete the text already entered into the
-    // control using either the given fixed list of strings, the paths from the
-    // file system or an arbitrary user-defined completer
-    //
-    // they all return true if completion was enabled or false on error (most
-    // commonly meaning that this functionality is not available under the
-    // current platform)
-
-    bool AutoComplete(const wxArrayString& choices)
-        { return DoAutoCompleteStrings(choices); }
-
-    bool AutoCompleteFileNames()
-        { return DoAutoCompleteFileNames(wxFILE); }
-
-    bool AutoCompleteDirectories()
-        { return DoAutoCompleteFileNames(wxDIR); }
-
-    // notice that we take ownership of the pointer and will delete it
-    //
-    // if the pointer is NULL auto-completion is disabled
-    bool AutoComplete(wxTextCompleter *completer)
-        { return DoAutoCompleteCustom(completer); }
-
-
-    // status
-    // ------
-
-    virtual bool IsEditable() const = 0;
-    virtual void SetEditable(bool editable) = 0;
-
-
-    // set the max number of characters which may be entered in a single line
-    // text control
-    virtual void SetMaxLength(unsigned long WXUNUSED(len)) { }
-
-
-    // hints
-    // -----
-
-    // hint is the (usually greyed out) text shown in the control as long as
-    // it's empty and doesn't have focus, it is typically used in controls used
-    // for searching to let the user know what is supposed to be entered there
-
-    virtual bool SetHint(const wxString& hint);
-    virtual wxString GetHint() const;
-
-
-    // margins
-    // -------
-
-    // margins are the empty space between borders of control and the text
-    // itself. When setting margin, use value -1 to indicate that specific
-    // margin should not be changed.
-
-    bool SetMargins(const wxPoint& pt)
-        { return DoSetMargins(pt); }
-    bool SetMargins(wxCoord left, wxCoord top = -1)
-        { return DoSetMargins(wxPoint(left, top)); }
-    wxPoint GetMargins() const
-        { return DoGetMargins(); }
-
-
-    // implementation only
-    // -------------------
-
-    // generate the wxEVT_COMMAND_TEXT_UPDATED event for GetEditableWindow(),
-    // like SetValue() does and return true if the event was processed
-    //
-    // NB: this is public for wxRichTextCtrl use only right now, do not call it
-    static bool SendTextUpdatedEvent(wxWindow *win);
-
-    // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window
-    bool SendTextUpdatedEvent()
-    {
-        return SendTextUpdatedEvent(GetEditableWindow());
-    }
-
-
-    // generate the wxEVT_COMMAND_TEXT_UPDATED event for this window if the
-    // events are not currently disabled
-    void SendTextUpdatedEventIfAllowed()
-    {
-        if ( EventsAllowed() )
-            SendTextUpdatedEvent();
-    }
-
-    // this function is provided solely for the purpose of forwarding text
-    // change notifications state from one control to another, e.g. it can be
-    // used by a wxComboBox which derives from wxTextEntry if it delegates all
-    // of its methods to another wxTextCtrl
-    void ForwardEnableTextChangedEvents(bool enable)
-    {
-        // it's important to call the functions which update m_eventsBlock here
-        // and not just our own EnableTextChangedEvents() because our state
-        // (i.e. the result of EventsAllowed()) must change as well
-        if ( enable )
-            ResumeTextChangedEvents();
-        else
-            SuppressTextChangedEvents();
-    }
-
-protected:
-    // flags for DoSetValue(): common part of SetValue() and ChangeValue() and
-    // also used to implement WriteText() in wxMSW
-    enum
-    {
-        SetValue_NoEvent = 0,
-        SetValue_SendEvent = 1,
-        SetValue_SelectionOnly = 2
-    };
-
-    virtual void DoSetValue(const wxString& value, int flags);
-    virtual wxString DoGetValue() const = 0;
-
-    // override this to return the associated window, it will be used for event
-    // generation and also by generic hints implementation
-    virtual wxWindow *GetEditableWindow() = 0;
-
-    // margins functions
-    virtual bool DoSetMargins(const wxPoint& pt);
-    virtual wxPoint DoGetMargins() const;
-
-    // the derived classes should override these virtual methods to implement
-    // auto-completion, they do the same thing as their public counterparts but
-    // have different names to allow overriding just one of them without hiding
-    // the other one(s)
-    virtual bool DoAutoCompleteStrings(const wxArrayString& WXUNUSED(choices))
-        { return false; }
-    virtual bool DoAutoCompleteFileNames(int WXUNUSED(flags)) // wxFILE | wxDIR
-        { return false; }
-    virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
-
-
-    // class which should be used to temporarily disable text change events
-    //
-    // if suppress argument in ctor is false, nothing is done
-    class EventsSuppressor
-    {
-    public:
-        EventsSuppressor(wxTextEntryBase *text, bool suppress = true)
-            : m_text(text),
-              m_suppress(suppress)
-        {
-            if ( m_suppress )
-                m_text->SuppressTextChangedEvents();
-        }
-
-        ~EventsSuppressor()
-        {
-            if ( m_suppress )
-                m_text->ResumeTextChangedEvents();
-        }
-
-    private:
-        wxTextEntryBase *m_text;
-        bool m_suppress;
-    };
-
-    friend class EventsSuppressor;
-
-private:
-    // suppress or resume the text changed events generation: don't use these
-    // functions directly, use EventsSuppressor class above instead
-    void SuppressTextChangedEvents()
-    {
-        if ( !m_eventsBlock++ )
-            EnableTextChangedEvents(false);
-    }
-
-    void ResumeTextChangedEvents()
-    {
-        if ( !--m_eventsBlock )
-            EnableTextChangedEvents(true);
-    }
-
-
-    // this must be overridden in the derived classes if our implementation of
-    // SetValue() or Replace() is used to disable (and enable back) generation
-    // of the text changed events
-    //
-    // initially the generation of the events is enabled
-    virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) { }
-
-    // return true if the events are currently not suppressed
-    bool EventsAllowed() const { return m_eventsBlock == 0; }
-
-
-    // if this counter is non-null, events are blocked
-    unsigned m_eventsBlock;
-
-    // hint-related stuff, only allocated if/when SetHint() is used
-    wxTextEntryHintData *m_hintData;
-
-    // It needs to call our Do{Get,Set}Value() to work with the real control
-    // contents.
-    friend class wxTextEntryHintData;
-};
-
-#ifdef __WXUNIVERSAL__
-    // TODO: we need to use wxTextEntryDelegate here, but for now just prevent
-    //       the GTK/MSW classes from being used in wxUniv build
-    class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
-    {
-    };
-#elif defined(__WXGTK20__)
-    #include "wx/gtk/textentry.h"
-#elif defined(__WXMAC__)
-    #include "wx/osx/textentry.h"
-#elif defined(__WXMSW__)
-    #include "wx/msw/textentry.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/textentry.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/textentry.h"
-#else
-    // no platform-specific implementation of wxTextEntry yet
-    class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
-    {
-    };
-#endif
-
-#endif // _WX_TEXTENTRY_H_
-
diff --git a/Source/3rd Party/wx/include/wx/textfile.h b/Source/3rd Party/wx/include/wx/textfile.h
index f21f0fbd9..5d9bcdb4a 100644
--- a/Source/3rd Party/wx/include/wx/textfile.h	
+++ b/Source/3rd Party/wx/include/wx/textfile.h	
@@ -6,7 +6,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: textfile.h 38570 2006-04-05 14:37:47Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@ private:
 
     wxFile m_file;
 
-    wxDECLARE_NO_COPY_CLASS(wxTextFile);
+    DECLARE_NO_COPY_CLASS(wxTextFile)
 };
 
 #else // !wxUSE_TEXTFILE
diff --git a/Source/3rd Party/wx/include/wx/textwrapper.h b/Source/3rd Party/wx/include/wx/textwrapper.h
deleted file mode 100644
index f1f9216d7..000000000
--- a/Source/3rd Party/wx/include/wx/textwrapper.h	
+++ /dev/null
@@ -1,129 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/textwrapper.h
-// Purpose:     declaration of wxTextWrapper class
-// Author:      Vadim Zeitlin
-// Created:     2009-05-31 (extracted from dlgcmn.cpp via wx/private/stattext.h)
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999, 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TEXTWRAPPER_H_
-#define _WX_TEXTWRAPPER_H_
-
-#include "wx/window.h"
-
-// ----------------------------------------------------------------------------
-// wxTextWrapper
-// ----------------------------------------------------------------------------
-
-// this class is used to wrap the text on word boundary: wrapping is done by
-// calling OnStartLine() and OnOutputLine() functions
-class WXDLLIMPEXP_CORE wxTextWrapper
-{
-public:
-    wxTextWrapper() { m_eol = false; }
-
-    // win is used for getting the font, text is the text to wrap, width is the
-    // max line width or -1 to disable wrapping
-    void Wrap(wxWindow *win, const wxString& text, int widthMax);
-
-    // we don't need it, but just to avoid compiler warnings
-    virtual ~wxTextWrapper() { }
-
-protected:
-    // line may be empty
-    virtual void OnOutputLine(const wxString& line) = 0;
-
-    // called at the start of every new line (except the very first one)
-    virtual void OnNewLine() { }
-
-private:
-    // call OnOutputLine() and set m_eol to true
-    void DoOutputLine(const wxString& line)
-    {
-        OnOutputLine(line);
-
-        m_eol = true;
-    }
-
-    // this function is a destructive inspector: when it returns true it also
-    // resets the flag to false so calling it again wouldn't return true any
-    // more
-    bool IsStartOfNewLine()
-    {
-        if ( !m_eol )
-            return false;
-
-        m_eol = false;
-
-        return true;
-    }
-
-
-    bool m_eol;
-
-    wxDECLARE_NO_COPY_CLASS(wxTextWrapper);
-};
-
-#if wxUSE_STATTEXT
-
-#include "wx/sizer.h"
-#include "wx/stattext.h"
-
-// A class creating a sizer with one static text per line of text. Creation of
-// the controls used for each line can be customized by overriding
-// OnCreateLine() function.
-//
-// This class is currently private to wxWidgets and used only by wxDialog
-// itself. We may make it public later if there is sufficient interest.
-class wxTextSizerWrapper : public wxTextWrapper
-{
-public:
-    wxTextSizerWrapper(wxWindow *win)
-    {
-        m_win = win;
-        m_hLine = 0;
-    }
-
-    wxSizer *CreateSizer(const wxString& text, int widthMax)
-    {
-        m_sizer = new wxBoxSizer(wxVERTICAL);
-        Wrap(m_win, text, widthMax);
-        return m_sizer;
-    }
-
-    wxWindow *GetParent() const { return m_win; }
-
-protected:
-    virtual wxWindow *OnCreateLine(const wxString& line)
-    {
-        return new wxStaticText(m_win, wxID_ANY,
-                                wxControl::EscapeMnemonics(line));
-    }
-
-    virtual void OnOutputLine(const wxString& line)
-    {
-        if ( !line.empty() )
-        {
-            m_sizer->Add(OnCreateLine(line));
-        }
-        else // empty line, no need to create a control for it
-        {
-            if ( !m_hLine )
-                m_hLine = m_win->GetCharHeight();
-
-            m_sizer->Add(5, m_hLine);
-        }
-    }
-
-private:
-    wxWindow *m_win;
-    wxSizer *m_sizer;
-    int m_hLine;
-};
-
-#endif // wxUSE_STATTEXT
-
-#endif // _WX_TEXTWRAPPER_H_
-
diff --git a/Source/3rd Party/wx/include/wx/tglbtn.h b/Source/3rd Party/wx/include/wx/tglbtn.h
index d34c7d034..c20b9e4a0 100644
--- a/Source/3rd Party/wx/include/wx/tglbtn.h	
+++ b/Source/3rd Party/wx/include/wx/tglbtn.h	
@@ -5,9 +5,9 @@
 // Author:      John Norris, minor changes by Axel Schlueter
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tglbtn.h 39293 2006-05-23 17:53:50Z JS $
 // Copyright:   (c) 2000 Johnny C. Norris II
-// Licence:     wxWindows Licence
+// License:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_BASE_
@@ -18,58 +18,11 @@
 #if wxUSE_TOGGLEBTN
 
 #include "wx/event.h"
-#include "wx/anybutton.h"     // base class
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
-
-// ----------------------------------------------------------------------------
-// wxToggleButtonBase
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxToggleButtonBase : public wxAnyButton
-{
-public:
-    wxToggleButtonBase() { }
-
-    // Get/set the value
-    virtual void SetValue(bool state) = 0;
-    virtual bool GetValue() const = 0;
-
-    void UpdateWindowUI(long flags)
-    {
-        wxControl::UpdateWindowUI(flags);
-
-        if ( !IsShown() )
-            return;
-
-        wxWindow *tlw = wxGetTopLevelParent( this );
-        if (tlw && wxPendingDelete.Member( tlw ))
-           return;
-
-        wxUpdateUIEvent event( GetId() );
-        event.SetEventObject(this);
-
-        if (GetEventHandler()->ProcessEvent(event) )
-        {
-            if ( event.GetSetChecked() )
-                SetValue( event.GetChecked() );
-        }
-    }
-
-    // Buttons on MSW can look bad if they are not native colours, because
-    // then they become owner-drawn and not theme-drawn.  Disable it here
-    // in wxToggleButtonBase to make it consistent.
-    virtual bool ShouldInheritColours() const { return false; }
-
-protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    wxDECLARE_NO_COPY_CLASS(wxToggleButtonBase);
-};
+#include "wx/control.h"     // base class
 
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 19)
+END_DECLARE_EVENT_TYPES()
 
 #define EVT_TOGGLEBUTTON(id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, wxCommandEventHandler(fn))
@@ -78,17 +31,16 @@ protected:
     #include "wx/univ/tglbtn.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/tglbtn.h"
-    #define wxHAS_BITMAPTOGGLEBUTTON
 #elif defined(__WXGTK20__)
     #include "wx/gtk/tglbtn.h"
-    #define wxHAS_BITMAPTOGGLEBUTTON
 #elif defined(__WXGTK__)
     #include "wx/gtk1/tglbtn.h"
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
-    #include "wx/osx/tglbtn.h"
-    #define wxHAS_BITMAPTOGGLEBUTTON
+    #include "wx/mac/tglbtn.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/tglbtn.h"
 #elif defined(__WXPM__)
     #include "wx/os2/tglbtn.h"
 #endif
diff --git a/Source/3rd Party/wx/include/wx/thread.h b/Source/3rd Party/wx/include/wx/thread.h
index c5ccdeea2..bd913fe81 100644
--- a/Source/3rd Party/wx/include/wx/thread.h	
+++ b/Source/3rd Party/wx/include/wx/thread.h	
@@ -5,7 +5,7 @@
 // Modified by: Vadim Zeitlin (modifications partly inspired by omnithreads
 //              package from Olivetti & Oracle Research Laboratory)
 // Created:     04/13/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: thread.h 66924 2011-02-16 22:58:53Z JS $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,6 +22,11 @@
 
 #if wxUSE_THREADS
 
+// Windows headers define it
+#ifdef Yield
+    #undef Yield
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -33,7 +38,6 @@ enum wxMutexError
     wxMUTEX_DEAD_LOCK,      // mutex is already locked by the calling thread
     wxMUTEX_BUSY,           // mutex is already locked by another thread
     wxMUTEX_UNLOCKED,       // attempt to unlock a mutex which is not locked
-    wxMUTEX_TIMEOUT,        // LockTimeout() has timed out
     wxMUTEX_MISC_ERROR      // any other error
 };
 
@@ -71,21 +75,6 @@ enum wxThreadKind
     wxTHREAD_JOINABLE
 };
 
-enum wxThreadWait
-{
-    wxTHREAD_WAIT_BLOCK,
-    wxTHREAD_WAIT_YIELD,       // process events while waiting; MSW only
-
-    // For compatibility reasons we use wxTHREAD_WAIT_YIELD by default as this
-    // was the default behaviour of wxMSW 2.8 but it should be avoided as it's
-    // dangerous and not portable.
-#if WXWIN_COMPATIBILITY_2_8
-    wxTHREAD_WAIT_DEFAULT = wxTHREAD_WAIT_YIELD
-#else
-    wxTHREAD_WAIT_DEFAULT = wxTHREAD_WAIT_BLOCK
-#endif
-};
-
 // defines the interval of priority
 enum
 {
@@ -160,10 +149,6 @@ public:
     // The caller must call Unlock() later if Lock() returned wxMUTEX_NO_ERROR.
     wxMutexError Lock();
 
-    // Same as Lock() but return wxMUTEX_TIMEOUT if the mutex can't be locked
-    // during the given number of milliseconds
-    wxMutexError LockTimeout(unsigned long ms);
-
     // Try to lock the mutex: if it is currently locked, return immediately
     // with an error. Otherwise the caller must call Unlock().
     wxMutexError TryLock();
@@ -176,7 +161,7 @@ protected:
 
     friend class wxConditionInternal;
 
-    wxDECLARE_NO_COPY_CLASS(wxMutex);
+    DECLARE_NO_COPY_CLASS(wxMutex)
 };
 
 // a helper class which locks the mutex in the ctor and unlocks it in the dtor:
@@ -219,46 +204,35 @@ private:
 
 // in order to avoid any overhead under platforms where critical sections are
 // just mutexes make all wxCriticalSection class functions inline
-#if !defined(__WINDOWS__)
+#if !defined(__WXMSW__) && !defined(__WXMAC__)
     #define wxCRITSECT_IS_MUTEX 1
 
-    #define wxCRITSECT_INLINE WXEXPORT inline
+    #define wxCRITSECT_INLINE inline
 #else // MSW
     #define wxCRITSECT_IS_MUTEX 0
 
     #define wxCRITSECT_INLINE
 #endif // MSW/!MSW
 
-enum wxCriticalSectionType
-{
-    // recursive critical section
-    wxCRITSEC_DEFAULT,
-
-    // non-recursive critical section
-    wxCRITSEC_NON_RECURSIVE
-};
-
 // you should consider wxCriticalSectionLocker whenever possible instead of
 // directly working with wxCriticalSection class - it is safer
 class WXDLLIMPEXP_BASE wxCriticalSection
 {
 public:
     // ctor & dtor
-    wxCRITSECT_INLINE wxCriticalSection( wxCriticalSectionType critSecType = wxCRITSEC_DEFAULT );
+    wxCRITSECT_INLINE wxCriticalSection();
     wxCRITSECT_INLINE ~wxCriticalSection();
+
     // enter the section (the same as locking a mutex)
     wxCRITSECT_INLINE void Enter();
 
-    // try to enter the section (the same as trying to lock a mutex)
-    wxCRITSECT_INLINE bool TryEnter();
-
     // leave the critical section (same as unlocking a mutex)
     wxCRITSECT_INLINE void Leave();
 
 private:
 #if wxCRITSECT_IS_MUTEX
     wxMutex m_mutex;
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
     // we can't allocate any memory in the ctor, so use placement new -
     // unfortunately, we have to hardcode the sizeof() here because we can't
     // include windows.h from this public header and we also have to use the
@@ -266,6 +240,10 @@ private:
     //
     // if CRITICAL_SECTION size changes in Windows, you'll get an assert from
     // thread.cpp and will need to increase the buffer size
+    //
+    // finally, we need this typedef instead of declaring m_buffer directly
+    // because otherwise the assert mentioned above wouldn't compile with some
+    // compilers (notably CodeWarrior 8)
 #ifdef __WIN64__
     typedef char wxCritSectBuffer[40];
 #else // __WIN32__
@@ -278,19 +256,19 @@ private:
 
         wxCritSectBuffer m_buffer;
     };
+#elif defined(__WXMAC__)
+    void *m_critRegion ;
 #endif // Unix&OS2/Win32
 
-    wxDECLARE_NO_COPY_CLASS(wxCriticalSection);
+    DECLARE_NO_COPY_CLASS(wxCriticalSection)
 };
 
 #if wxCRITSECT_IS_MUTEX
     // implement wxCriticalSection using mutexes
-    inline wxCriticalSection::wxCriticalSection( wxCriticalSectionType critSecType )
-       : m_mutex( critSecType == wxCRITSEC_DEFAULT ? wxMUTEX_RECURSIVE : wxMUTEX_DEFAULT )  { }
+    inline wxCriticalSection::wxCriticalSection() { }
     inline wxCriticalSection::~wxCriticalSection() { }
 
     inline void wxCriticalSection::Enter() { (void)m_mutex.Lock(); }
-    inline bool wxCriticalSection::TryEnter() { return m_mutex.TryLock() == wxMUTEX_NO_ERROR; }
     inline void wxCriticalSection::Leave() { (void)m_mutex.Unlock(); }
 #endif // wxCRITSECT_IS_MUTEX
 
@@ -316,7 +294,7 @@ public:
 private:
     wxCriticalSection& m_critsect;
 
-    wxDECLARE_NO_COPY_CLASS(wxCriticalSectionLocker);
+    DECLARE_NO_COPY_CLASS(wxCriticalSectionLocker)
 };
 
 // ----------------------------------------------------------------------------
@@ -379,7 +357,7 @@ public:
 private:
     wxConditionInternal *m_internal;
 
-    wxDECLARE_NO_COPY_CLASS(wxCondition);
+    DECLARE_NO_COPY_CLASS(wxCondition)
 };
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -424,7 +402,7 @@ public:
 private:
     wxSemaphoreInternal *m_internal;
 
-    wxDECLARE_NO_COPY_CLASS(wxSemaphore);
+    DECLARE_NO_COPY_CLASS(wxSemaphore)
 };
 
 // ----------------------------------------------------------------------------
@@ -462,24 +440,14 @@ public:
     static wxThread *This();
 
         // Returns true if current thread is the main thread.
-        //
-        // Notice that it also returns true if main thread id hadn't been
-        // initialized yet on the assumption that it's too early in wx startup
-        // process for any other threads to have been created in this case.
-    static bool IsMain()
-    {
-        return !ms_idMainThread || GetCurrentId() == ms_idMainThread;
-    }
-
-        // Return the main thread id
-    static wxThreadIdType GetMainId() { return ms_idMainThread; }
+    static bool IsMain();
 
         // Release the rest of our time slice letting the other threads run
     static void Yield();
 
         // Sleep during the specified period of time in milliseconds
         //
-        // This is the same as wxMilliSleep().
+        // NB: at least under MSW worker threads can not call ::wxSleep()!
     static void Sleep(unsigned long milliseconds);
 
         // get the number of system CPUs - useful with SetConcurrency()
@@ -491,7 +459,7 @@ public:
         // Get the platform specific thread ID and return as a long.  This
         // can be used to uniquely identify threads, even if they are not
         // wxThreads.  This is used by wxPython.
-    static wxThreadIdType GetCurrentId();
+   static wxThreadIdType GetCurrentId();
 
         // sets the concurrency level: this is, roughly, the number of threads
         // the system tries to schedule to run in parallel. 0 means the
@@ -531,14 +499,13 @@ public:
         // does it!
         //
         // will fill the rc pointer with the thread exit code if it's !NULL
-    wxThreadError Delete(ExitCode *rc = NULL,
-                         wxThreadWait waitMode = wxTHREAD_WAIT_DEFAULT);
+    wxThreadError Delete(ExitCode *rc = (ExitCode *)NULL);
 
         // waits for a joinable thread to finish and returns its exit code
         //
         // Returns (ExitCode)-1 on error (for example, if the thread is not
         // joinable)
-    ExitCode Wait(wxThreadWait waitMode = wxTHREAD_WAIT_DEFAULT);
+    ExitCode Wait();
 
         // kills the thread without giving it any chance to clean up - should
         // not be used under normal circumstances, use Delete() instead.
@@ -581,8 +548,10 @@ public:
     // identifies a thread inside a process
     wxThreadIdType GetId() const;
 
-    wxThreadKind GetKind() const
-        { return m_isDetached ? wxTHREAD_DETACHED : wxTHREAD_JOINABLE; }
+    // called when the thread exits - in the context of this thread
+    //
+    // NB: this function will not be called if the thread is Kill()ed
+    virtual void OnExit() { }
 
     // Returns true if the thread was asked to terminate: this function should
     // be called by the thread from time to time, otherwise the main thread
@@ -601,35 +570,12 @@ protected:
     // of this thread.
     virtual void *Entry() = 0;
 
-
-    // Callbacks which may be overridden by the derived class to perform some
-    // specific actions when the thread is deleted or killed. By default they
-    // do nothing.
-
-    // This one is called by Delete() before actually deleting the thread and
-    // is executed in the context of the thread that called Delete().
-    virtual void OnDelete() {}
-
-    // This one is called by Kill() before killing the thread and is executed
-    // in the context of the thread that called Kill().
-    virtual void OnKill() {}
-
 private:
     // no copy ctor/assignment operator
     wxThread(const wxThread&);
     wxThread& operator=(const wxThread&);
 
-    // called when the thread exits - in the context of this thread
-    //
-    // NB: this function will not be called if the thread is Kill()ed
-    virtual void OnExit() { }
-
     friend class wxThreadInternal;
-    friend class wxThreadModule;
-
-
-    // the main thread identifier, should be set on startup
-    static wxThreadIdType ms_idMainThread;
 
     // the (platform-dependent) thread class implementation
     wxThreadInternal *m_internal;
@@ -649,8 +595,8 @@ class WXDLLIMPEXP_BASE wxThreadHelperThread : public wxThread
 public:
     // constructor only creates the C++ thread object and doesn't create (or
     // start) the real thread
-    wxThreadHelperThread(wxThreadHelper& owner, wxThreadKind kind)
-        : wxThread(kind), m_owner(owner)
+    wxThreadHelperThread(wxThreadHelper& owner)
+        : wxThread(wxTHREAD_JOINABLE), m_owner(owner)
         { }
 
 protected:
@@ -677,44 +623,27 @@ class WXDLLIMPEXP_BASE wxThreadHelper
 private:
     void KillThread()
     {
-        // If wxThreadHelperThread is detached and is about to finish, it will
-        // set m_thread to NULL so don't delete it then.
-        // But if KillThread is called before wxThreadHelperThread (in detached mode)
-        // sets it to NULL, then the thread object still exists and can be killed
-        wxCriticalSectionLocker locker(m_critSection);
-
         if ( m_thread )
         {
             m_thread->Kill();
-
-            if ( m_kind == wxTHREAD_JOINABLE )
-              delete m_thread;
-
-            m_thread = NULL;
+            delete m_thread;
         }
     }
 
 public:
     // constructor only initializes m_thread to NULL
-    wxThreadHelper(wxThreadKind kind = wxTHREAD_JOINABLE)
-        : m_thread(NULL), m_kind(kind) { }
+    wxThreadHelper() : m_thread(NULL) { }
 
     // destructor deletes m_thread
     virtual ~wxThreadHelper() { KillThread(); }
 
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( wxThreadError Create(unsigned int stackSize = 0) );
-#endif
-
     // create a new thread (and optionally set the stack size on platforms that
     // support/need that), call Run() to start it
-    wxThreadError CreateThread(wxThreadKind kind = wxTHREAD_JOINABLE,
-                               unsigned int stackSize = 0)
+    wxThreadError Create(unsigned int stackSize = 0)
     {
         KillThread();
 
-        m_kind = kind;
-        m_thread = new wxThreadHelperThread(*this, m_kind);
+        m_thread = new wxThreadHelperThread(*this);
 
         return m_thread->Create(stackSize);
     }
@@ -724,43 +653,16 @@ public:
     virtual void *Entry() = 0;
 
     // returns a pointer to the thread which can be used to call Run()
-    wxThread *GetThread() const
-    {
-        wxCriticalSectionLocker locker((wxCriticalSection&)m_critSection);
-
-        wxThread* thread = m_thread;
-
-        return thread;
-    }
+    wxThread *GetThread() const { return m_thread; }
 
 protected:
     wxThread *m_thread;
-    wxThreadKind m_kind;
-    wxCriticalSection m_critSection; // To guard the m_thread variable
-
-    friend class wxThreadHelperThread;
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-inline wxThreadError wxThreadHelper::Create(unsigned int stackSize)
-{ return CreateThread(m_kind, stackSize); }
-#endif
-
 // call Entry() in owner, put it down here to avoid circular declarations
 inline void *wxThreadHelperThread::Entry()
 {
-    void * const result = m_owner.Entry();
-
-    wxCriticalSectionLocker locker(m_owner.m_critSection);
-
-    // Detached thread will be deleted after returning, so make sure
-    // wxThreadHelper::GetThread will not return an invalid pointer.
-    // And that wxThreadHelper::KillThread will not try to kill
-    // an already deleted thread
-    if ( m_owner.m_kind == wxTHREAD_DETACHED )
-        m_owner.m_thread = NULL;
-
-    return result;
+    return m_owner.Entry();
 }
 
 // ----------------------------------------------------------------------------
@@ -786,8 +688,8 @@ inline bool wxIsMainThread() { return wxThread::IsMain(); }
 #else // !wxUSE_THREADS
 
 // no thread support
-inline void wxMutexGuiEnter() { }
-inline void wxMutexGuiLeave() { }
+inline void WXDLLIMPEXP_BASE wxMutexGuiEnter() { }
+inline void WXDLLIMPEXP_BASE wxMutexGuiLeave() { }
 
 // macros for entering/leaving critical sections which may be used without
 // having to take them inside "#if wxUSE_THREADS"
@@ -840,7 +742,7 @@ public:
 
 #if wxUSE_THREADS
 
-#if defined(__WINDOWS__) || defined(__OS2__) || defined(__EMX__) || defined(__WXOSX__)
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__OS2__) || defined(__EMX__)
     // unlock GUI if there are threads waiting for and lock it back when
     // there are no more of them - should be called periodically by the main
     // thread
@@ -852,12 +754,10 @@ public:
     // wakes up the main thread if it's sleeping inside ::GetMessage()
     extern void WXDLLIMPEXP_BASE wxWakeUpMainThread();
 
-#ifndef __WXOSX__
     // return true if the main thread is waiting for some other to terminate:
     // wxApp then should block all "dangerous" messages
     extern bool WXDLLIMPEXP_BASE wxIsWaitingForThread();
-#endif
-#endif // MSW, OS/2
+#endif // MSW, Mac, OS/2
 
 #endif // wxUSE_THREADS
 
diff --git a/Source/3rd Party/wx/include/wx/thrimpl.cpp b/Source/3rd Party/wx/include/wx/thrimpl.cpp
index 34f9cfdcc..27780b8ab 100644
--- a/Source/3rd Party/wx/include/wx/thrimpl.cpp	
+++ b/Source/3rd Party/wx/include/wx/thrimpl.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/thrimpl.cpp
+// Name:        include/wx/thrimpl.cpp
 // Purpose:     common part of wxThread Implementations
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     04.06.02 (extracted from src/*/thread.cpp files)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: thrimpl.cpp 66922 2011-02-16 22:26:57Z JS $
 // Copyright:   (c) Vadim Zeitlin (2002)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -44,14 +44,6 @@ wxMutexError wxMutex::Lock()
     return m_internal->Lock();
 }
 
-wxMutexError wxMutex::LockTimeout(unsigned long ms)
-{
-    wxCHECK_MSG( m_internal, wxMUTEX_INVALID,
-                 wxT("wxMutex::Lock(): not initialized") );
-
-    return m_internal->Lock(ms);
-}
-
 wxMutexError wxMutex::TryLock()
 {
     wxCHECK_MSG( m_internal, wxMUTEX_INVALID,
@@ -76,7 +68,7 @@ wxMutexError wxMutex::Unlock()
 // variables and their events/event semaphores have quite different semantics,
 // so we reimplement the conditions from scratch using the mutexes and
 // semaphores
-#if defined(__WINDOWS__) || defined(__OS2__) || defined(__EMX__)
+#if defined(__WXMSW__) || defined(__OS2__) || defined(__EMX__)
 
 class wxConditionInternal
 {
@@ -101,7 +93,7 @@ private:
     wxMutex& m_mutex;
     wxSemaphore m_semaphore;
 
-    wxDECLARE_NO_COPY_CLASS(wxConditionInternal);
+    DECLARE_NO_COPY_CLASS(wxConditionInternal)
 };
 
 wxConditionInternal::wxConditionInternal(wxMutex& mutex)
@@ -223,7 +215,7 @@ wxCondError wxConditionInternal::Broadcast()
     return wxCOND_NO_ERROR;
 }
 
-#endif // __WINDOWS__ || __OS2__ || __EMX__
+#endif // MSW or OS2
 
 // ----------------------------------------------------------------------------
 // wxCondition
@@ -338,13 +330,3 @@ wxSemaError wxSemaphore::Post()
     return m_internal->Post();
 }
 
-// ----------------------------------------------------------------------------
-// wxThread
-// ----------------------------------------------------------------------------
-
-#include "wx/utils.h"
-
-void wxThread::Sleep(unsigned long milliseconds)
-{
-    wxMilliSleep(milliseconds);
-}
diff --git a/Source/3rd Party/wx/include/wx/time.h b/Source/3rd Party/wx/include/wx/time.h
deleted file mode 100644
index 1db7179be..000000000
--- a/Source/3rd Party/wx/include/wx/time.h	
+++ /dev/null
@@ -1,77 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/time.h
-// Purpose:     Miscellaneous time-related functions.
-// Author:      Vadim Zeitlin
-// Created:     2011-11-26
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TIME_H_
-#define _WX_TIME_H_
-
-#include "wx/longlong.h"
-
-// Returns the difference between UTC and local time in seconds.
-WXDLLIMPEXP_BASE int wxGetTimeZone();
-
-// Get number of seconds since local time 00:00:00 Jan 1st 1970.
-extern long WXDLLIMPEXP_BASE wxGetLocalTime();
-
-// Get number of seconds since GMT 00:00:00, Jan 1st 1970.
-extern long WXDLLIMPEXP_BASE wxGetUTCTime();
-
-#if wxUSE_LONGLONG
-    typedef wxLongLong wxMilliClock_t;
-    inline long wxMilliClockToLong(wxLongLong ll) { return ll.ToLong(); }
-#else
-    typedef double wxMilliClock_t;
-    inline long wxMilliClockToLong(double d) { return wx_truncate_cast(long, d); }
-#endif // wxUSE_LONGLONG
-
-// Get number of milliseconds since local time 00:00:00 Jan 1st 1970
-extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
-
-#if wxUSE_LONGLONG
-
-// Get the number of milliseconds or microseconds since the Epoch.
-wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeMillis();
-wxLongLong WXDLLIMPEXP_BASE wxGetUTCTimeUSec();
-
-#endif // wxUSE_LONGLONG
-
-#define wxGetCurrentTime() wxGetLocalTime()
-
-// on some really old systems gettimeofday() doesn't have the second argument,
-// define wxGetTimeOfDay() to hide this difference
-#ifdef HAVE_GETTIMEOFDAY
-    #ifdef WX_GETTIMEOFDAY_NO_TZ
-        #define wxGetTimeOfDay(tv)      gettimeofday(tv)
-    #else
-        #define wxGetTimeOfDay(tv)      gettimeofday((tv), NULL)
-    #endif
-#endif // HAVE_GETTIMEOFDAY
-
-/* Two wrapper functions for thread safety */
-#ifdef HAVE_LOCALTIME_R
-#define wxLocaltime_r localtime_r
-#else
-WXDLLIMPEXP_BASE struct tm *wxLocaltime_r(const time_t*, struct tm*);
-#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__)
-     // On Windows, localtime _is_ threadsafe!
-#warning using pseudo thread-safe wrapper for localtime to emulate localtime_r
-#endif
-#endif
-
-#ifdef HAVE_GMTIME_R
-#define wxGmtime_r gmtime_r
-#else
-WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*);
-#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__)
-     // On Windows, gmtime _is_ threadsafe!
-#warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r
-#endif
-#endif
-
-#endif // _WX_TIME_H_
diff --git a/Source/3rd Party/wx/include/wx/timer.h b/Source/3rd Party/wx/include/wx/timer.h
index 98939d9a5..f81cd3860 100644
--- a/Source/3rd Party/wx/include/wx/timer.h	
+++ b/Source/3rd Party/wx/include/wx/timer.h	
@@ -5,7 +5,7 @@
 // Modified by: Vadim Zeitlin (wxTimerBase)
 //              Guillermo Rodriguez (global clean up)
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: timer.h 44244 2007-01-18 17:00:52Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,13 +15,13 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_TIMER
+#if wxUSE_GUI && wxUSE_TIMER
 
 #include "wx/object.h"
 #include "wx/longlong.h"
 #include "wx/event.h"
 #include "wx/stopwatch.h" // for backwards compatibility
-#include "wx/utils.h"
+#include "wx/window.h"    // only for NewControlId()
 
 
 // more readable flags for Start():
@@ -32,14 +32,8 @@
 // only send the notification once and then stop the timer
 #define wxTIMER_ONE_SHOT true
 
-class WXDLLIMPEXP_FWD_BASE wxTimerImpl;
-class WXDLLIMPEXP_FWD_BASE wxTimerEvent;
-
-// timer event type
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_TIMER, wxTimerEvent);
-
 // the interface of wxTimer class
-class WXDLLIMPEXP_BASE wxTimer : public wxEvtHandler
+class WXDLLEXPORT wxTimerBase : public wxEvtHandler
 {
 public:
     // ctors and initializers
@@ -47,33 +41,29 @@ public:
 
     // default: if you don't call SetOwner(), your only chance to get timer
     // notifications is to override Notify() in the derived class
-    wxTimer()
-    {
-        Init();
-        SetOwner(this);
-    }
+    wxTimerBase()
+        { Init(); SetOwner(this); }
 
     // ctor which allows to avoid having to override Notify() in the derived
     // class: the owner will get timer notifications which can be handled with
     // EVT_TIMER
-    wxTimer(wxEvtHandler *owner, int timerid = wxID_ANY)
-    {
-        Init();
-        SetOwner(owner, timerid);
-    }
+    wxTimerBase(wxEvtHandler *owner, int timerid = wxID_ANY)
+        { Init(); SetOwner(owner, timerid); }
 
     // same as ctor above
-    void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY);
+    void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY)
+    {
+        m_owner = owner;
+        m_idTimer = timerid == wxID_ANY ? wxWindow::NewControlId() : timerid;
+    }
 
-    virtual ~wxTimer();
+    wxEvtHandler *GetOwner() const { return m_owner; }
 
+    virtual ~wxTimerBase();
 
     // working with the timer
     // ----------------------
 
-    // NB: Start() and Stop() are not supposed to be overridden, they are only
-    //     virtual for historical reasons, only Notify() can be overridden
-
     // start the timer: if milliseconds == -1, use the same value as for the
     // last Start()
     //
@@ -81,46 +71,68 @@ public:
     // timer if it is already running
     virtual bool Start(int milliseconds = -1, bool oneShot = false);
 
-    // stop the timer, does nothing if the timer is not running
-    virtual void Stop();
+    // stop the timer
+    virtual void Stop() = 0;
 
     // override this in your wxTimer-derived class if you want to process timer
     // messages in it, use non default ctor or SetOwner() otherwise
     virtual void Notify();
 
-
-    // accessors
-    // ---------
-
-    // get the object notified about the timer events
-    wxEvtHandler *GetOwner() const;
+    // getting info
+    // ------------
 
     // return true if the timer is running
-    bool IsRunning() const;
+    virtual bool IsRunning() const = 0;
 
     // return the timer ID
-    int GetId() const;
+    int GetId() const { return m_idTimer; }
 
     // get the (last) timer interval in milliseconds
-    int GetInterval() const;
+    int GetInterval() const { return m_milli; }
 
     // return true if the timer is one shot
-    bool IsOneShot() const;
+    bool IsOneShot() const { return m_oneShot; }
 
 protected:
     // common part of all ctors
-    void Init();
+    void Init()
+        { m_owner = NULL; m_idTimer = wxID_ANY; m_milli = 0; m_oneShot = false; }
 
-    wxTimerImpl *m_impl;
+    wxEvtHandler *m_owner;
+    int     m_idTimer;
+    int     m_milli;        // the timer interval
+    bool    m_oneShot;      // true if one shot
 
-    wxDECLARE_NO_COPY_CLASS(wxTimer);
+    DECLARE_NO_COPY_CLASS(wxTimerBase)
 };
 
+// ----------------------------------------------------------------------------
+// wxTimer itself
+// ----------------------------------------------------------------------------
+
+#if defined(__WXMSW__)
+    #include "wx/msw/timer.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/timer.h"
+#elif defined(__WXGTK20__)
+    #include "wx/gtk/timer.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/timer.h"
+#elif defined(__WXX11__) || defined(__WXMGL__) || defined(__WXDFB__)
+    #include "wx/generic/timer.h"
+#elif defined (__WXCOCOA__)
+    #include "wx/cocoa/timer.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/timer.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/timer.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxTimerRunner
+class WXDLLEXPORT wxTimerRunner
 {
 public:
     wxTimerRunner(wxTimer& timer) : m_timer(timer) { }
@@ -146,36 +158,31 @@ public:
 private:
     wxTimer& m_timer;
 
-    wxDECLARE_NO_COPY_CLASS(wxTimerRunner);
+    DECLARE_NO_COPY_CLASS(wxTimerRunner)
 };
 
 // ----------------------------------------------------------------------------
 // wxTimerEvent
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent
+class WXDLLEXPORT wxTimerEvent : public wxEvent
 {
 public:
-    wxTimerEvent()
-        : wxEvent(wxID_ANY, wxEVT_TIMER) { m_timer=NULL; }
-
-    wxTimerEvent(wxTimer& timer)
-        : wxEvent(timer.GetId(), wxEVT_TIMER),
-          m_timer(&timer)
+    wxTimerEvent(int timerid = 0, int interval = 0) : wxEvent(timerid)
     {
-        SetEventObject(timer.GetOwner());
+        m_eventType = wxEVT_TIMER;
+
+        m_interval = interval;
     }
 
     // accessors
-    int GetInterval() const { return m_timer->GetInterval(); }
-    wxTimer& GetTimer() const { return *m_timer; }
+    int GetInterval() const { return m_interval; }
 
     // implement the base class pure virtual
     virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
-    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_TIMER; }
 
 private:
-    wxTimer* m_timer;
+    int m_interval;
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent)
 };
@@ -183,11 +190,12 @@ private:
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 
 #define wxTimerEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxTimerEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTimerEventFunction, &func)
 
 #define EVT_TIMER(timerid, func) \
     wx__DECLARE_EVT1(wxEVT_TIMER, timerid, wxTimerEventHandler(func))
 
-#endif // wxUSE_TIMER
+#endif // wxUSE_GUI && wxUSE_TIMER
 
-#endif // _WX_TIMER_H_BASE_
+#endif
+    // _WX_TIMER_H_BASE_
diff --git a/Source/3rd Party/wx/include/wx/tipwin.h b/Source/3rd Party/wx/include/wx/tipwin.h
index e8225550e..b6c8d350a 100644
--- a/Source/3rd Party/wx/include/wx/tipwin.h	
+++ b/Source/3rd Party/wx/include/wx/tipwin.h	
@@ -5,7 +5,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.09.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tipwin.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxTipWindowView;
 // wxTipWindow
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTipWindow : public wxTipWindowBase
+class WXDLLEXPORT wxTipWindow : public wxTipWindowBase
 {
 public:
     // the mandatory ctor parameters are: the parent window and the text to
@@ -90,7 +90,7 @@ private:
 
     friend class wxTipWindowView;
 
-    wxDECLARE_NO_COPY_CLASS(wxTipWindow);
+    DECLARE_NO_COPY_CLASS(wxTipWindow)
 };
 
 #endif // wxUSE_TIPWINDOW
diff --git a/Source/3rd Party/wx/include/wx/tls.h b/Source/3rd Party/wx/include/wx/tls.h
deleted file mode 100644
index 44345a49c..000000000
--- a/Source/3rd Party/wx/include/wx/tls.h	
+++ /dev/null
@@ -1,144 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/tls.h
-// Purpose:     Implementation of thread local storage
-// Author:      Vadim Zeitlin
-// Created:     2008-08-08
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TLS_H_
-#define _WX_TLS_H_
-
-#include "wx/defs.h"
-
-// ----------------------------------------------------------------------------
-// check for compiler support of thread-specific variables
-// ----------------------------------------------------------------------------
-
-// when not using threads at all, there is no need for thread-specific
-// values to be really thread-specific
-#if !wxUSE_THREADS
-    #define wxHAS_COMPILER_TLS
-    #define wxTHREAD_SPECIFIC_DECL
-// otherwise try to find the compiler-specific way to handle TLS unless
-// explicitly disabled by setting wxUSE_COMPILER_TLS to 0 (it is 1 by default).
-#elif wxUSE_COMPILER_TLS
-// __thread keyword is not supported correctly by MinGW, at least in some
-// configurations, see http://sourceforge.net/support/tracker.php?aid=2837047
-// and when in doubt we prefer to not use it at all.
-#if defined(HAVE___THREAD_KEYWORD) && !defined(__MINGW32__)
-    #define wxHAS_COMPILER_TLS
-    #define wxTHREAD_SPECIFIC_DECL __thread
-// MSVC has its own version which might be supported by some other Windows
-// compilers, to be tested
-#elif wxCHECK_VISUALC_VERSION(7)
-    #define wxHAS_COMPILER_TLS
-    #define wxTHREAD_SPECIFIC_DECL __declspec(thread)
-#endif // compilers
-#endif // wxUSE_COMPILER_TLS
-
-// ----------------------------------------------------------------------------
-// define wxTLS_TYPE()
-// ----------------------------------------------------------------------------
-
-#ifdef wxHAS_COMPILER_TLS
-    #define wxTLS_TYPE(T) wxTHREAD_SPECIFIC_DECL T
-    #define wxTLS_PTR(var) (&(var))
-    #define wxTLS_VALUE(var) (var)
-#else // !wxHAS_COMPILER_TLS
-
-    extern "C"
-    {
-        typedef void (*wxTlsDestructorFunction)(void*);
-    }
-
-    #if defined(__WINDOWS__)
-        #include "wx/msw/tls.h"
-    #elif defined(__OS2__)
-        #include "wx/os2/tls.h"
-    #elif defined(__UNIX__)
-        #include "wx/unix/tls.h"
-    #else
-        // TODO: we could emulate TLS for such platforms...
-        #error Neither compiler nor OS support thread-specific variables.
-    #endif
-
-    #include <stdlib.h> // for calloc()
-
-    // wxTlsValue<T> represents a thread-specific value of type T but, unlike
-    // with native compiler thread-specific variables, it behaves like a
-    // (never NULL) pointer to T and so needs to be dereferenced before use
-    //
-    // Note: T must be a POD!
-    //
-    // Note: On Unix, thread-specific T value is freed when the thread exits.
-    //       On Windows, thread-specific values are freed later, when given
-    //       wxTlsValue<T> is destroyed.  The only exception to this is the
-    //       value for the main thread, which is always freed when
-    //       wxTlsValue<T> is destroyed.
-    template <typename T>
-    class wxTlsValue
-    {
-    public:
-        typedef T ValueType;
-
-        // ctor doesn't do anything, the object is created on first access
-        wxTlsValue() : m_key(free) {}
-
-        // dtor is only called in the main thread context and so is not enough
-        // to free memory allocated by us for the other threads, we use
-        // destructor function when using Pthreads for this (which is not
-        // called for the main thread as it doesn't call pthread_exit() but
-        // just to be safe we also reset the key anyhow)
-        ~wxTlsValue()
-        {
-            if ( m_key.Get() )
-                m_key.Set(NULL); // this deletes the value
-        }
-
-        // access the object creating it on demand
-        ValueType *Get()
-        {
-            void *value = m_key.Get();
-            if ( !value )
-            {
-                // ValueType must be POD to be used in wxHAS_COMPILER_TLS case
-                // anyhow (at least gcc doesn't accept non-POD values being
-                // declared with __thread) so initialize it as a POD too
-                value = calloc(1, sizeof(ValueType));
-
-                if ( !m_key.Set(value) )
-                {
-                    free(value);
-
-                    // this will probably result in a crash in the caller but
-                    // it's arguably better to crash immediately instead of
-                    // slowly dying from out-of-memory errors which would
-                    // happen as the next access to this object would allocate
-                    // another ValueType instance and so on forever
-                    value = NULL;
-                }
-            }
-
-            return static_cast<ValueType *>(value);
-        }
-
-        // pointer-like accessors
-        ValueType *operator->() { return Get(); }
-        ValueType& operator*() { return *Get(); }
-
-    private:
-        wxTlsKey m_key;
-
-        DECLARE_NO_COPY_TEMPLATE_CLASS(wxTlsValue, T)
-    };
-
-    #define wxTLS_TYPE(T) wxTlsValue<T>
-    #define wxTLS_PTR(var) ((var).Get())
-    #define wxTLS_VALUE(var) (*(var))
-#endif // wxHAS_COMPILER_TLS/!wxHAS_COMPILER_TLS
-
-#endif // _WX_TLS_H_
-
diff --git a/Source/3rd Party/wx/include/wx/tokenzr.h b/Source/3rd Party/wx/include/wx/tokenzr.h
index 6e35e0214..e67b20176 100644
--- a/Source/3rd Party/wx/include/wx/tokenzr.h	
+++ b/Source/3rd Party/wx/include/wx/tokenzr.h	
@@ -4,7 +4,7 @@
 // Author:      Guilhem Lavaux
 // Modified by: (or rather rewritten by) Vadim Zeitlin
 // Created:     04/22/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tokenzr.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -72,12 +72,12 @@ public:
     // get current tokenizer state
         // returns the part of the string which remains to tokenize (*not* the
         // initial string)
-    wxString GetString() const { return wxString(m_pos, m_string.end()); }
+    wxString GetString() const { return m_string.substr(m_pos); }
 
         // returns the current position (i.e. one index after the last
         // returned token or 0 if GetNextToken() has never been called) in the
         // original string
-    size_t GetPosition() const { return m_pos - m_string.begin(); }
+    size_t GetPosition() const { return m_pos; }
 
     // misc
         // get the current mode - can be different from the one passed to the
@@ -111,24 +111,10 @@ public:
 protected:
     bool IsOk() const { return m_mode != wxTOKEN_INVALID; }
 
-    bool DoHasMoreTokens() const;
+    wxString m_string,              // the string we tokenize
+             m_delims;              // all possible delimiters
 
-    enum MoreTokensState
-    {
-        MoreTokens_Unknown,
-        MoreTokens_Yes,
-        MoreTokens_No
-    };
-
-    MoreTokensState m_hasMoreTokens;
-
-    wxString m_string;              // the string we tokenize
-    wxString::const_iterator m_stringEnd;
-    // FIXME-UTF8: use wxWcharBuffer
-    wxWxCharBuffer m_delims;        // all possible delimiters
-    size_t m_delimsLen;
-
-    wxString::const_iterator m_pos; // the current position in m_string
+    size_t   m_pos;                 // the current position in m_string
 
     wxStringTokenizerMode m_mode;   // see wxTOKEN_XXX values
 
diff --git a/Source/3rd Party/wx/include/wx/toolbar.h b/Source/3rd Party/wx/include/wx/toolbar.h
index 25941cc0a..a64868e48 100644
--- a/Source/3rd Party/wx/include/wx/toolbar.h	
+++ b/Source/3rd Party/wx/include/wx/toolbar.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.11.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: toolbar.h 42645 2006-10-29 19:12:52Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -68,18 +68,20 @@ enum
 
     #if defined(__WXUNIVERSAL__)
        #include "wx/univ/toolbar.h"
+    #elif defined(__WXPALMOS__)
+       #include "wx/palmos/toolbar.h"
     #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
-       #include "wx/msw/toolbar.h"
+       #include "wx/msw/tbar95.h"
     #elif defined(__WXWINCE__)
        #include "wx/msw/wince/tbarwce.h"
     #elif defined(__WXMOTIF__)
        #include "wx/motif/toolbar.h"
     #elif defined(__WXGTK20__)
-        #include "wx/gtk/toolbar.h"
+        #include "wx/gtk/tbargtk.h"
     #elif defined(__WXGTK__)
-        #include "wx/gtk1/toolbar.h"
+        #include "wx/gtk1/tbargtk.h"
     #elif defined(__WXMAC__)
-       #include "wx/osx/toolbar.h"
+       #include "wx/mac/toolbar.h"
     #elif defined(__WXCOCOA__)
        #include "wx/cocoa/toolbar.h"
     #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/toolbook.h b/Source/3rd Party/wx/include/wx/toolbook.h
index 39c2b7f87..695ffa883 100644
--- a/Source/3rd Party/wx/include/wx/toolbook.h	
+++ b/Source/3rd Party/wx/include/wx/toolbook.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2006-01-29
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: toolbook.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) 2006 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,31 +17,22 @@
 #if wxUSE_TOOLBOOK
 
 #include "wx/bookctrl.h"
-#include "wx/containr.h"
 
 class WXDLLIMPEXP_FWD_CORE wxToolBarBase;
 class WXDLLIMPEXP_FWD_CORE wxCommandEvent;
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent );
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING;
 
 
 // Use wxButtonToolBar
-#define wxTBK_BUTTONBAR            0x0100
-
-// Use wxTB_HORZ_LAYOUT style for the controlling toolbar
-#define wxTBK_HORZ_LAYOUT          0x8000
-
-// deprecated synonym, don't use
-#if WXWIN_COMPATIBILITY_2_8
-    #define wxBK_BUTTONBAR wxTBK_BUTTONBAR
-#endif
+#define wxBK_BUTTONBAR            0x0100
 
 // ----------------------------------------------------------------------------
 // wxToolbook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxToolbook : public wxNavigationEnabled<wxBookCtrlBase>
+class WXDLLEXPORT wxToolbook : public wxBookCtrlBase
 {
 public:
     wxToolbook()
@@ -71,15 +62,17 @@ public:
 
 
     // implement base class virtuals
+    virtual int GetSelection() const;
     virtual bool SetPageText(size_t n, const wxString& strText);
     virtual wxString GetPageText(size_t n) const;
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageImage(size_t n, int imageId);
+    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
     virtual bool InsertPage(size_t n,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
-                            int imageId = NO_IMAGE);
+                            int imageId = -1);
     virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
     virtual void SetImageList(wxImageList *imageList);
@@ -100,6 +93,9 @@ public:
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
+    // get the size which the list control should have
+    virtual wxSize GetControllerSize() const;
+
     // event handlers
     void OnToolSelected(wxCommandEvent& event);
     void OnSize(wxSizeEvent& event);
@@ -107,8 +103,11 @@ protected:
 
     void UpdateSelectedPage(size_t newsel);
 
-    wxBookCtrlEvent* CreatePageChangingEvent() const;
-    void MakeChangedEvent(wxBookCtrlEvent &event);
+    wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
+    void MakeChangedEvent(wxBookCtrlBaseEvent &event);
+
+    // the currently selected page or wxNOT_FOUND if none
+    int m_selection;
 
     // whether the toolbar needs to be realized
     bool m_needsRealizing;
@@ -128,17 +127,36 @@ private:
 // listbook event class and related stuff
 // ----------------------------------------------------------------------------
 
-// wxToolbookEvent is obsolete and defined for compatibility only
-#define wxToolbookEvent wxBookCtrlEvent
-typedef wxBookCtrlEventFunction wxToolbookEventFunction;
-#define wxToolbookEventHandler(func) wxBookCtrlEventHandler(func)
+class WXDLLEXPORT wxToolbookEvent : public wxBookCtrlBaseEvent
+{
+public:
+    wxToolbookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
+                    int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)
+        : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel)
+    {
+    }
 
+    wxToolbookEvent(const wxToolbookEvent& event)
+        : wxBookCtrlBaseEvent(event)
+    {
+    }
+
+    virtual wxEvent *Clone() const { return new wxToolbookEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxToolbookEvent)
+};
+
+typedef void (wxEvtHandler::*wxToolbookEventFunction)(wxToolbookEvent&);
+
+#define wxToolbookEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxToolbookEventFunction, &func)
 
 #define EVT_TOOLBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, winid, wxToolbookEventHandler(fn))
 
 #define EVT_TOOLBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, winid, wxToolbookEventHandler(fn))
 
 #endif // wxUSE_TOOLBOOK
 
diff --git a/Source/3rd Party/wx/include/wx/tooltip.h b/Source/3rd Party/wx/include/wx/tooltip.h
index 2c943dff9..af29741f4 100644
--- a/Source/3rd Party/wx/include/wx/tooltip.h	
+++ b/Source/3rd Party/wx/include/wx/tooltip.h	
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/tooltip.h
+// Name:        tooltip.h
 // Purpose:     wxToolTip base header
 // Author:      Robert Roebling
 // Modified by:
 // Created:
 // Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tooltip.h 37066 2006-01-23 03:27:34Z MR $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -25,7 +25,7 @@
 #elif defined(__WXGTK__)
 #include "wx/gtk1/tooltip.h"
 #elif defined(__WXMAC__)
-#include "wx/osx/tooltip.h"
+#include "wx/mac/tooltip.h"
 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/tooltip.h"
 #elif defined(__WXPM__)
diff --git a/Source/3rd Party/wx/include/wx/toplevel.h b/Source/3rd Party/wx/include/wx/toplevel.h
index f2a5c2af2..2351d7cd9 100644
--- a/Source/3rd Party/wx/include/wx/toplevel.h	
+++ b/Source/3rd Party/wx/include/wx/toplevel.h	
@@ -5,7 +5,7 @@
 // Author:      Vadim Zeitlin, Vaclav Slavik
 // Modified by:
 // Created:     06.08.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: toplevel.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 //                       Vaclav Slavik <vaclav@wxwidgets.org>
 // Licence:     wxWindows licence
@@ -18,13 +18,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/nonownedwnd.h"
+#include "wx/window.h"
 #include "wx/iconbndl.h"
-#include "wx/containr.h"
-#include "wx/weakref.h"
 
 // the default names for various classes
-extern WXDLLIMPEXP_DATA_CORE(const char) wxFrameNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
 
 class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;
 
@@ -32,59 +30,19 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowBase;
 // constants
 // ----------------------------------------------------------------------------
 
-/*
-    Summary of the bits used (some of them are defined in wx/frame.h and
-    wx/dialog.h and not here):
-
-    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
-    |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
-    +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
-      |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |
-      |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  \_ wxCENTRE
-      |  |  |  |  |  |  |  |  |  |  |  |  |  |  \____ wxFRAME_NO_TASKBAR
-      |  |  |  |  |  |  |  |  |  |  |  |  |  \_______ wxFRAME_TOOL_WINDOW
-      |  |  |  |  |  |  |  |  |  |  |  |  \__________ wxFRAME_FLOAT_ON_PARENT
-      |  |  |  |  |  |  |  |  |  |  |  \_____________ wxFRAME_SHAPED
-      |  |  |  |  |  |  |  |  |  |  \________________ wxDIALOG_NO_PARENT
-      |  |  |  |  |  |  |  |  |  \___________________ wxRESIZE_BORDER
-      |  |  |  |  |  |  |  |  \______________________ wxTINY_CAPTION_VERT
-      |  |  |  |  |  |  |  \_________________________
-      |  |  |  |  |  |  \____________________________ wxMAXIMIZE_BOX
-      |  |  |  |  |  \_______________________________ wxMINIMIZE_BOX
-      |  |  |  |  \__________________________________ wxSYSTEM_MENU
-      |  |  |  \_____________________________________ wxCLOSE_BOX
-      |  |  \________________________________________ wxMAXIMIZE
-      |  \___________________________________________ wxMINIMIZE
-      \______________________________________________ wxSTAY_ON_TOP
-
-
-    Notice that the 8 lower bits overlap with wxCENTRE and the button selection
-    bits (wxYES, wxOK wxNO, wxCANCEL, wxAPPLY, wxCLOSE and wxNO_DEFAULT) which
-    can be combined with the dialog style for several standard dialogs and
-    hence shouldn't overlap with any styles which can be used for the dialogs.
-    Additionally, wxCENTRE can be used with frames also.
- */
-
 // style common to both wxFrame and wxDialog
 #define wxSTAY_ON_TOP           0x8000
 #define wxICONIZE               0x4000
 #define wxMINIMIZE              wxICONIZE
 #define wxMAXIMIZE              0x2000
-#define wxCLOSE_BOX             0x1000  // == wxHELP so can't be used with it
+#define wxCLOSE_BOX             0x1000
 
 #define wxSYSTEM_MENU           0x0800
 #define wxMINIMIZE_BOX          0x0400
 #define wxMAXIMIZE_BOX          0x0200
-
-#define wxTINY_CAPTION          0x0080  // clashes with wxNO_DEFAULT
-#define wxRESIZE_BORDER         0x0040  // == wxCLOSE
-
-#if WXWIN_COMPATIBILITY_2_8
-    // HORIZ and VERT styles are equivalent anyhow so don't use different names
-    // for them
-    #define wxTINY_CAPTION_HORIZ    wxTINY_CAPTION
-    #define wxTINY_CAPTION_VERT     wxTINY_CAPTION
-#endif
+#define wxTINY_CAPTION_HORIZ    0x0100
+#define wxTINY_CAPTION_VERT     0x0080
+#define wxRESIZE_BORDER         0x0040
 
 #if WXWIN_COMPATIBILITY_2_6
 
@@ -157,8 +115,7 @@ enum
 // wxTopLevelWindow: a top level (as opposed to child) window
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTopLevelWindowBase :
-    public wxNavigationEnabled<wxNonOwnedWindow>
+class WXDLLEXPORT wxTopLevelWindowBase : public wxWindow
 {
 public:
     // construction
@@ -188,26 +145,20 @@ public:
     virtual bool IsIconized() const = 0;
 
     // get the frame icon
-    wxIcon GetIcon() const;
+    const wxIcon& GetIcon() const { return m_icons.GetIcon( -1 ); }
 
     // get the frame icons
     const wxIconBundle& GetIcons() const { return m_icons; }
 
-    // set the frame icon: implemented in terms of SetIcons()
-    void SetIcon(const wxIcon& icon);
+    // set the frame icon
+    virtual void SetIcon(const wxIcon& icon) { m_icons = wxIconBundle( icon ); }
 
     // set the frame icons
-    virtual void SetIcons(const wxIconBundle& icons) { m_icons = icons; }
+    virtual void SetIcons(const wxIconBundle& icons ) { m_icons = icons; }
 
     // maximize the window to cover entire screen
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0;
 
-    // shows the window, but doesn't activate it. If the base code is being run,
-    // it means the port doesn't implement this method yet and so alert the user.
-    virtual void ShowWithoutActivating() {
-        wxFAIL_MSG("ShowWithoutActivating not implemented on this platform.");
-    }
-
     // return true if the frame is in fullscreen mode
     virtual bool IsFullScreen() const = 0;
 
@@ -217,16 +168,19 @@ public:
     virtual wxString GetTitle() const = 0;
 
     // enable/disable close button [x]
-    virtual bool EnableCloseButton(bool WXUNUSED(enable) ) { return false; }
+    virtual bool EnableCloseButton(bool WXUNUSED(enable) ) { return false; } 
+
+    // Set the shape of the window to the given region.
+    // Returns true if the platform supports this feature (and the
+    // operation is successful.)
+    virtual bool SetShape(const wxRegion& WXUNUSED(region)) { return false; }
 
     // Attracts the users attention to this window if the application is
     // inactive (should be called when a background event occurs)
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
     // Is this the active frame (highlighted in the taskbar)?
-    //
-    // A TLW is active only if it contains the currently focused window.
-    virtual bool IsActive() { return IsDescendant(FindFocus()); }
+    virtual bool IsActive() { return wxGetTopLevelParent(FindFocus()) == this; }
 
     // this function may be overridden to return false to allow closing the
     // application even when this top level window is still open
@@ -245,10 +199,6 @@ public:
     void CentreOnScreen(int dir = wxBOTH) { DoCentre(dir | wxCENTRE_ON_SCREEN); }
     void CenterOnScreen(int dir = wxBOTH) { CentreOnScreen(dir); }
 
-    // Get the default size for a new top level window. This is used when
-    // creating a wxTLW under some platforms if no explicit size given.
-    static wxSize GetDefaultSize();
-
 
     // default item access: we have a permanent default item which is the one
     // set by the user code but we may also have a temporary default item which
@@ -256,6 +206,9 @@ public:
     // reverts to the "permanent" default as soon as this temporary default
     // item loses focus
 
+    // used to reset default if pointing to removed child
+    virtual void RemoveChild(wxWindowBase *child);
+
     // get the default item, temporary or permanent
     wxWindow *GetDefaultItem() const
         { return m_winTmpDefault ? m_winTmpDefault : m_winDefault; }
@@ -279,7 +232,6 @@ public:
     // override some base class virtuals
     virtual bool Destroy();
     virtual bool IsTopLevel() const { return true; }
-    virtual bool IsTopNavigationDomain() const { return true; }
     virtual bool IsVisible() const { return IsShown(); }
 
     // event handlers
@@ -300,10 +252,10 @@ public:
     virtual void SetMinSize(const wxSize& minSize);
     virtual void SetMaxSize(const wxSize& maxSize);
 
-    virtual void OSXSetModified(bool modified) { m_modified = modified; }
-    virtual bool OSXIsModified() const { return m_modified; }
-
-    virtual void SetRepresentedFilename(const wxString& WXUNUSED(filename)) { }
+    // set size hints for "window manager"
+    virtual void DoSetSizeHints( int minW, int minH,
+                                 int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
+                                 int incW = wxDefaultCoord, int incH = wxDefaultCoord );
 
 protected:
     // the frame client to screen translation should take account of the
@@ -336,28 +288,32 @@ protected:
     // client area
     void DoLayout();
 
+    // Get the default size for the new window if no explicit size given. If
+    // there are better default sizes then these can be changed, just as long
+    // as they are not too small for TLWs (and not larger than screen).
+    static wxSize GetDefaultSize();
     static int WidthDefault(int w) { return w == wxDefaultCoord ? GetDefaultSize().x : w; }
     static int HeightDefault(int h) { return h == wxDefaultCoord ? GetDefaultSize().y : h; }
 
-
     // the frame icon
     wxIconBundle m_icons;
 
     // a default window (usually a button) or NULL
-    wxWindowRef m_winDefault;
+    wxWindow *m_winDefault;
 
     // a temporary override of m_winDefault, use the latter if NULL
-    wxWindowRef m_winTmpDefault;
+    wxWindow *m_winTmpDefault;
 
-    bool m_modified;
-
-    wxDECLARE_NO_COPY_CLASS(wxTopLevelWindowBase);
+    DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)
     DECLARE_EVENT_TABLE()
 };
 
 
 // include the real class declaration
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowPalm
+#elif defined(__WXMSW__)
     #include "wx/msw/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMSW
 #elif defined(__WXGTK20__)
@@ -369,11 +325,14 @@ protected:
 #elif defined(__WXX11__)
     #include "wx/x11/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowX11
+#elif defined(__WXMGL__)
+    #include "wx/mgl/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowMGL
 #elif defined(__WXDFB__)
     #include "wx/dfb/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowDFB
 #elif defined(__WXMAC__)
-    #include "wx/osx/toplevel.h"
+    #include "wx/mac/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMac
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/toplevel.h"
@@ -389,25 +348,28 @@ protected:
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/toplevel.h"
 #else // !__WXUNIVERSAL__
-    class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative
-    {
-    public:
-        // construction
-        wxTopLevelWindow() { }
-        wxTopLevelWindow(wxWindow *parent,
-                   wxWindowID winid,
-                   const wxString& title,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxDEFAULT_FRAME_STYLE,
-                   const wxString& name = wxFrameNameStr)
-            : wxTopLevelWindowNative(parent, winid, title,
-                                     pos, size, style, name)
+    #ifdef wxTopLevelWindowNative
+        class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative
         {
-        }
+        public:
+            // construction
+            wxTopLevelWindow() { Init(); }
+            wxTopLevelWindow(wxWindow *parent,
+                       wxWindowID winid,
+                       const wxString& title,
+                       const wxPoint& pos = wxDefaultPosition,
+                       const wxSize& size = wxDefaultSize,
+                       long style = wxDEFAULT_FRAME_STYLE,
+                       const wxString& name = wxFrameNameStr)
+            {
+                Init();
+                Create(parent, winid, title, pos, size, style, name);
+            }
 
-        DECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow)
-    };
+            DECLARE_DYNAMIC_CLASS_NO_COPY(wxTopLevelWindow)
+        };
+    #endif // wxTopLevelWindowNative
 #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
+
 #endif // _WX_TOPLEVEL_BASE_H_
diff --git a/Source/3rd Party/wx/include/wx/tracker.h b/Source/3rd Party/wx/include/wx/tracker.h
deleted file mode 100644
index ef2375741..000000000
--- a/Source/3rd Party/wx/include/wx/tracker.h	
+++ /dev/null
@@ -1,92 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/tracker.h
-// Purpose:     Support class for object lifetime tracking (wxWeakRef<T>)
-// Author:      Arne Steinarson
-// Created:     28 Dec 07
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Arne Steinarson
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TRACKER_H_
-#define _WX_TRACKER_H_
-
-#include "wx/defs.h"
-
-class wxEventConnectionRef;
-
-// This class represents an object tracker and is stored in a linked list
-// in the tracked object. It is only used in one of its derived forms.
-class WXDLLIMPEXP_BASE wxTrackerNode
-{
-public:
-    wxTrackerNode() : m_nxt(NULL) { }
-    virtual ~wxTrackerNode() { }
-
-    virtual void OnObjectDestroy() = 0;
-
-    virtual wxEventConnectionRef *ToEventConnection() { return NULL; }
-
-private:
-    wxTrackerNode *m_nxt;
-
-    friend class wxTrackable;        // For list access
-    friend class wxEvtHandler;       // For list access
-};
-
-// Add-on base class for a trackable object.
-class WXDLLIMPEXP_BASE wxTrackable
-{
-public:
-    void AddNode(wxTrackerNode *prn)
-    {
-        prn->m_nxt = m_first;
-        m_first = prn;
-    }
-
-    void RemoveNode(wxTrackerNode *prn)
-    {
-        for ( wxTrackerNode **pprn = &m_first; *pprn; pprn = &(*pprn)->m_nxt )
-        {
-            if ( *pprn == prn )
-            {
-                *pprn = prn->m_nxt;
-                return;
-            }
-        }
-
-        wxFAIL_MSG( "removing invalid tracker node" );
-    }
-
-    wxTrackerNode *GetFirst() const { return m_first; }
-
-protected:
-    // this class is only supposed to be used as a base class but never be
-    // created nor destroyed directly so all ctors and dtor are protected
-
-    wxTrackable() : m_first(NULL) { }
-
-    // copy ctor and assignment operator intentionally do not copy m_first: the
-    // objects which track the original trackable shouldn't track the new copy
-    wxTrackable(const wxTrackable& WXUNUSED(other)) : m_first(NULL) { }
-    wxTrackable& operator=(const wxTrackable& WXUNUSED(other)) { return *this; }
-
-    // dtor is not virtual: this class is not supposed to be used
-    // polymorphically and adding a virtual table to it would add unwanted
-    // overhead
-    ~wxTrackable()
-    {
-        // Notify all registered refs
-        while ( m_first )
-        {
-            wxTrackerNode * const first = m_first;
-            m_first = first->m_nxt;
-            first->OnObjectDestroy();
-        }
-    }
-
-    wxTrackerNode *m_first;
-};
-
-#endif // _WX_TRACKER_H_
-
diff --git a/Source/3rd Party/wx/include/wx/translation.h b/Source/3rd Party/wx/include/wx/translation.h
deleted file mode 100644
index ee5341624..000000000
--- a/Source/3rd Party/wx/include/wx/translation.h	
+++ /dev/null
@@ -1,320 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/translation.h
-// Purpose:     Internationalization and localisation for wxWidgets
-// Author:      Vadim Zeitlin, Vaclav Slavik,
-//              Michael N. Filippov <michael@idisys.iae.nsk.su>
-// Created:     2010-04-23
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-//              (c) 2010 Vaclav Slavik <vslavik@fastmail.fm>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TRANSLATION_H_
-#define _WX_TRANSLATION_H_
-
-#include "wx/defs.h"
-#include "wx/string.h"
-
-#if wxUSE_INTL
-
-#include "wx/buffer.h"
-#include "wx/language.h"
-#include "wx/hashmap.h"
-#include "wx/strconv.h"
-#include "wx/scopedptr.h"
-
-// ============================================================================
-// global decls
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// gettext() style macros (notice that xgettext should be invoked with
-// --keyword="_" --keyword="wxPLURAL:1,2" options
-// to extract the strings from the sources)
-#ifndef WXINTL_NO_GETTEXT_MACRO
-    #define _(s)                     wxGetTranslation((s))
-    #define wxPLURAL(sing, plur, n)  wxGetTranslation((sing), (plur), n)
-#endif
-
-// another one which just marks the strings for extraction, but doesn't
-// perform the translation (use -kwxTRANSLATE with xgettext!)
-#define wxTRANSLATE(str) str
-
-// ----------------------------------------------------------------------------
-// forward decls
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_BASE wxArrayString;
-class WXDLLIMPEXP_FWD_BASE wxTranslationsLoader;
-class WXDLLIMPEXP_FWD_BASE wxLocale;
-
-class wxPluralFormsCalculator;
-wxDECLARE_SCOPED_PTR(wxPluralFormsCalculator, wxPluralFormsCalculatorPtr)
-
-// ----------------------------------------------------------------------------
-// wxMsgCatalog corresponds to one loaded message catalog.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxMsgCatalog
-{
-public:
-    // Ctor is protected, because CreateFromXXX functions must be used,
-    // but destruction should be unrestricted
-#if !wxUSE_UNICODE
-    ~wxMsgCatalog();
-#endif
-
-    // load the catalog from disk or from data; caller is responsible for
-    // deleting them if not NULL
-    static wxMsgCatalog *CreateFromFile(const wxString& filename,
-                                        const wxString& domain);
-
-    static wxMsgCatalog *CreateFromData(const wxScopedCharBuffer& data,
-                                        const wxString& domain);
-
-    // get name of the catalog
-    wxString GetDomain() const { return m_domain; }
-
-    // get the translated string: returns NULL if not found
-    const wxString *GetString(const wxString& sz, unsigned n = UINT_MAX) const;
-
-protected:
-    wxMsgCatalog(const wxString& domain)
-        : m_pNext(NULL), m_domain(domain)
-#if !wxUSE_UNICODE
-        , m_conv(NULL)
-#endif
-    {}
-
-private:
-    // variable pointing to the next element in a linked list (or NULL)
-    wxMsgCatalog *m_pNext;
-    friend class wxTranslations;
-
-    wxStringToStringHashMap m_messages; // all messages in the catalog
-    wxString                m_domain;   // name of the domain
-
-#if !wxUSE_UNICODE
-    // the conversion corresponding to this catalog charset if we installed it
-    // as the global one
-    wxCSConv *m_conv;
-#endif
-
-    wxPluralFormsCalculatorPtr m_pluralFormsCalculator;
-};
-
-// ----------------------------------------------------------------------------
-// wxTranslations: message catalogs
-// ----------------------------------------------------------------------------
-
-// this class allows to get translations for strings
-class WXDLLIMPEXP_BASE wxTranslations
-{
-public:
-    wxTranslations();
-    ~wxTranslations();
-
-    // returns current translations object, may return NULL
-    static wxTranslations *Get();
-    // sets current translations object (takes ownership; may be NULL)
-    static void Set(wxTranslations *t);
-
-    // changes loader to non-default one; takes ownership of 'loader'
-    void SetLoader(wxTranslationsLoader *loader);
-
-    void SetLanguage(wxLanguage lang);
-    void SetLanguage(const wxString& lang);
-
-    // get languages available for this app
-    wxArrayString GetAvailableTranslations(const wxString& domain) const;
-
-    // add standard wxWidgets catalog ("wxstd")
-    bool AddStdCatalog();
-
-    // add catalog with given domain name and language, looking it up via
-    // wxTranslationsLoader
-    bool AddCatalog(const wxString& domain);
-    bool AddCatalog(const wxString& domain, wxLanguage msgIdLanguage);
-#if !wxUSE_UNICODE
-    bool AddCatalog(const wxString& domain,
-                    wxLanguage msgIdLanguage,
-                    const wxString& msgIdCharset);
-#endif
-
-    // check if the given catalog is loaded
-    bool IsLoaded(const wxString& domain) const;
-
-    // access to translations
-    const wxString& GetString(const wxString& origString,
-                              const wxString& domain = wxEmptyString) const;
-    const wxString& GetString(const wxString& origString,
-                              const wxString& origString2,
-                              unsigned n,
-                              const wxString& domain = wxEmptyString) const;
-
-    wxString GetHeaderValue(const wxString& header,
-                            const wxString& domain = wxEmptyString) const;
-
-    // this is hack to work around a problem with wxGetTranslation() which
-    // returns const wxString& and not wxString, so when it returns untranslated
-    // string, it needs to have a copy of it somewhere
-    static const wxString& GetUntranslatedString(const wxString& str);
-
-private:
-    // perform loading of the catalog via m_loader
-    bool LoadCatalog(const wxString& domain, const wxString& lang);
-
-    // find best translation for given domain
-    wxString ChooseLanguageForDomain(const wxString& domain,
-                                     const wxString& msgIdLang);
-
-    // find catalog by name in a linked list, return NULL if !found
-    wxMsgCatalog *FindCatalog(const wxString& domain) const;
-
-    // same as Set(), without taking ownership; only for wxLocale
-    static void SetNonOwned(wxTranslations *t);
-    friend class wxLocale;
-
-private:
-    wxString m_lang;
-    wxTranslationsLoader *m_loader;
-
-    wxMsgCatalog *m_pMsgCat; // pointer to linked list of catalogs
-};
-
-
-// abstraction of translations discovery and loading
-class WXDLLIMPEXP_BASE wxTranslationsLoader
-{
-public:
-    wxTranslationsLoader() {}
-    virtual ~wxTranslationsLoader() {}
-
-    virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
-                                      const wxString& lang) = 0;
-
-    virtual wxArrayString GetAvailableTranslations(const wxString& domain) const = 0;
-};
-
-
-// standard wxTranslationsLoader implementation, using filesystem
-class WXDLLIMPEXP_BASE wxFileTranslationsLoader
-    : public wxTranslationsLoader
-{
-public:
-    static void AddCatalogLookupPathPrefix(const wxString& prefix);
-
-    virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
-                                      const wxString& lang);
-
-    virtual wxArrayString GetAvailableTranslations(const wxString& domain) const;
-};
-
-
-#ifdef __WINDOWS__
-// loads translations from win32 resources
-class WXDLLIMPEXP_BASE wxResourceTranslationsLoader
-    : public wxTranslationsLoader
-{
-public:
-    virtual wxMsgCatalog *LoadCatalog(const wxString& domain,
-                                      const wxString& lang);
-
-    virtual wxArrayString GetAvailableTranslations(const wxString& domain) const;
-
-protected:
-    // returns resource type to use for translations
-    virtual wxString GetResourceType() const { return "MOFILE"; }
-
-    // returns module to load resources from
-    virtual WXHINSTANCE GetModule() const { return 0; }
-};
-#endif // __WINDOWS__
-
-
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-// get the translation of the string in the current locale
-inline const wxString& wxGetTranslation(const wxString& str,
-                                        const wxString& domain = wxEmptyString)
-{
-    wxTranslations *trans = wxTranslations::Get();
-    if ( trans )
-        return trans->GetString(str, domain);
-    else
-        // NB: this function returns reference to a string, so we have to keep
-        //     a copy of it somewhere
-        return wxTranslations::GetUntranslatedString(str);
-}
-
-inline const wxString& wxGetTranslation(const wxString& str1,
-                                        const wxString& str2,
-                                        unsigned n,
-                                        const wxString& domain = wxEmptyString)
-{
-    wxTranslations *trans = wxTranslations::Get();
-    if ( trans )
-        return trans->GetString(str1, str2, n, domain);
-    else
-        // NB: this function returns reference to a string, so we have to keep
-        //     a copy of it somewhere
-        return n == 1
-               ? wxTranslations::GetUntranslatedString(str1)
-               : wxTranslations::GetUntranslatedString(str2);
-}
-
-#else // !wxUSE_INTL
-
-// the macros should still be defined - otherwise compilation would fail
-
-#if !defined(WXINTL_NO_GETTEXT_MACRO)
-    #if !defined(_)
-        #define _(s)                 (s)
-    #endif
-    #define wxPLURAL(sing, plur, n)  ((n) == 1 ? (sing) : (plur))
-#endif
-
-#define wxTRANSLATE(str) str
-
-// NB: we use a template here in order to avoid using
-//     wxLocale::GetUntranslatedString() above, which would be required if
-//     we returned const wxString&; this way, the compiler should be able to
-//     optimize wxGetTranslation() away
-
-template<typename TString>
-inline TString wxGetTranslation(TString str)
-    { return str; }
-
-template<typename TString, typename TDomain>
-inline TString wxGetTranslation(TString str, TDomain WXUNUSED(domain))
-    { return str; }
-
-template<typename TString, typename TDomain>
-inline TString wxGetTranslation(TString str1, TString str2, size_t n)
-    { return n == 1 ? str1 : str2; }
-
-template<typename TString, typename TDomain>
-inline TString wxGetTranslation(TString str1, TString str2, size_t n,
-                                TDomain WXUNUSED(domain))
-    { return n == 1 ? str1 : str2; }
-
-#endif // wxUSE_INTL/!wxUSE_INTL
-
-// define this one just in case it occurs somewhere (instead of preferred
-// wxTRANSLATE) too
-#if !defined(WXINTL_NO_GETTEXT_MACRO)
-    #if !defined(gettext_noop)
-        #define gettext_noop(str) (str)
-    #endif
-    #if !defined(N_)
-        #define N_(s)             (s)
-    #endif
-#endif
-
-#endif // _WX_TRANSLATION_H_
diff --git a/Source/3rd Party/wx/include/wx/treebase.h b/Source/3rd Party/wx/include/wx/treebase.h
index e0a7b7fe7..a89786268 100644
--- a/Source/3rd Party/wx/include/wx/treebase.h	
+++ b/Source/3rd Party/wx/include/wx/treebase.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart et al
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: treebase.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) 1997,1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,7 +23,6 @@
 #include "wx/window.h"  // for wxClientData
 #include "wx/event.h"
 #include "wx/dynarray.h"
-#include "wx/itemid.h"
 
 #if WXWIN_COMPATIBILITY_2_6
 
@@ -39,19 +38,59 @@ enum
 #endif // WXWIN_COMPATIBILITY_2_6
 
 // ----------------------------------------------------------------------------
-// wxTreeItemId identifies an element of the tree. It's opaque for the
-// application and the only method which can be used by user code is IsOk().
+// wxTreeItemId identifies an element of the tree. In this implementation, it's
+// just a trivial wrapper around Win32 HTREEITEM or a pointer to some private
+// data structure in the generic version. It's opaque for the application and
+// the only method which can be used by user code is IsOk().
 // ----------------------------------------------------------------------------
 
-// This is a class and not a typedef because existing code may forward declare
-// wxTreeItemId as a class and we don't want to break it without good reason.
-class wxTreeItemId : public wxItemId<void*>
+// Using this typedef removes an ambiguity when calling Remove()
+typedef void *wxTreeItemIdValue;
+
+class WXDLLEXPORT wxTreeItemId
 {
+    friend bool operator==(const wxTreeItemId&, const wxTreeItemId&);
 public:
-    wxTreeItemId() : wxItemId<void*>() { }
-    wxTreeItemId(void* pItem) : wxItemId<void*>(pItem) { }
+    // ctors
+        // 0 is invalid value for HTREEITEM
+    wxTreeItemId() { m_pItem = 0; }
+
+        // construct wxTreeItemId from the native item id
+    wxTreeItemId(void *pItem) { m_pItem = pItem; }
+
+        // default copy ctor/assignment operator are ok for us
+
+    // accessors
+        // is this a valid tree item?
+    bool IsOk() const { return m_pItem != 0; }
+        // return true if this item is not valid
+    bool operator!() const { return !IsOk(); }
+
+    // operations
+        // invalidate the item
+    void Unset() { m_pItem = 0; }
+
+#if WXWIN_COMPATIBILITY_2_4
+    // deprecated: only for compatibility, don't work on 64 bit archs
+    wxTreeItemId(long item) { m_pItem = wxUIntToPtr(item); }
+    operator long() const { return (long)wxPtrToUInt(m_pItem); }
+#else // !WXWIN_COMPATIBILITY_2_4
+    operator bool() const { return IsOk(); }
+#endif // WXWIN_COMPATIBILITY_2_4/!WXWIN_COMPATIBILITY_2_4
+
+    wxTreeItemIdValue m_pItem;
 };
 
+inline bool operator==(const wxTreeItemId& i1, const wxTreeItemId& i2)
+{
+    return i1.m_pItem == i2.m_pItem;
+}
+
+inline bool operator!=(const wxTreeItemId& i1, const wxTreeItemId& i2)
+{
+    return i1.m_pItem != i2.m_pItem;
+}
+
 // ----------------------------------------------------------------------------
 // wxTreeItemData is some (arbitrary) user class associated with some item. The
 // main advantage of having this class (compared to old untyped interface) is
@@ -66,7 +105,7 @@ public:
 // always be allocated on the heap!
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTreeItemData: public wxClientData
+class WXDLLEXPORT wxTreeItemData: public wxClientData
 {
 friend class WXDLLIMPEXP_FWD_CORE wxTreeCtrl;
 friend class WXDLLIMPEXP_FWD_CORE wxGenericTreeCtrl;
@@ -86,14 +125,12 @@ protected:
     wxTreeItemId m_pItem;
 };
 
-typedef void *wxTreeItemIdValue;
-
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxTreeItemIdValue, wxArrayTreeItemIdsBase);
 
 // this is a wrapper around the array class defined above which allow to wok
-// with values of natural wxTreeItemId type instead of using wxTreeItemIdValue
+// with vaue of natural wxTreeItemId type instead of using wxTreeItemIdValue
 // and does it without any loss of efficiency
-class WXDLLIMPEXP_CORE wxArrayTreeItemIds : public wxArrayTreeItemIdsBase
+class WXDLLEXPORT wxArrayTreeItemIds : public wxArrayTreeItemIdsBase
 {
 public:
     void Add(const wxTreeItemId& id)
@@ -119,11 +156,6 @@ enum wxTreeItemIcon
     wxTreeItemIcon_Max
 };
 
-// special values for the 'state' parameter of wxTreeCtrl::SetItemState()
-static const int wxTREE_ITEMSTATE_NONE  = -1;   // not state (no display state image)
-static const int wxTREE_ITEMSTATE_NEXT  = -2;   // cycle to the next state
-static const int wxTREE_ITEMSTATE_PREV  = -3;   // cycle to the previous state
-
 // ----------------------------------------------------------------------------
 // wxTreeCtrl flags
 // ----------------------------------------------------------------------------
@@ -136,11 +168,7 @@ static const int wxTREE_ITEMSTATE_PREV  = -3;   // cycle to the previous state
 
 #define wxTR_SINGLE                  0x0000     // for convenience
 #define wxTR_MULTIPLE                0x0020     // can select multiple items
-
-#if WXWIN_COMPATIBILITY_2_8
-    #define wxTR_EXTENDED            0x0040     // deprecated, don't use
-#endif // WXWIN_COMPATIBILITY_2_8
-
+#define wxTR_EXTENDED                0x0040     // TODO: allow extended selection
 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080     // what it says
 
 #define wxTR_EDIT_LABELS             0x0200     // can edit item labels
@@ -149,15 +177,10 @@ static const int wxTREE_ITEMSTATE_PREV  = -3;   // cycle to the previous state
 
 #define wxTR_FULL_ROW_HIGHLIGHT      0x2000     // highlight full horz space
 
-// make the default control appearance look more native-like depending on the
-// platform
-#if defined(__WXGTK20__)
-    #define wxTR_DEFAULT_STYLE       (wxTR_HAS_BUTTONS | wxTR_NO_LINES)
-#elif defined(__WXMAC__)
-    #define wxTR_DEFAULT_STYLE \
-        (wxTR_HAS_BUTTONS | wxTR_NO_LINES | wxTR_FULL_ROW_HIGHLIGHT)
+#ifdef __WXGTK20__
+#define wxTR_DEFAULT_STYLE           (wxTR_HAS_BUTTONS | wxTR_NO_LINES)
 #else
-    #define wxTR_DEFAULT_STYLE       (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)
+#define wxTR_DEFAULT_STYLE           (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)
 #endif
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -199,13 +222,13 @@ static const int wxTREE_HITTEST_ONITEM  = wxTREE_HITTEST_ONITEMICON |
                                           wxTREE_HITTEST_ONITEMLABEL;
 
 // tree ctrl default name
-extern WXDLLIMPEXP_DATA_CORE(const char) wxTreeCtrlNameStr[];
+extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxTreeItemAttr: a structure containing the visual attributes of an item
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTreeItemAttr
+class WXDLLEXPORT wxTreeItemAttr
 {
 public:
     // ctors
@@ -221,9 +244,9 @@ public:
     void SetFont(const wxFont& font) { m_font = font; }
 
     // accessors
-    bool HasTextColour() const { return m_colText.IsOk(); }
-    bool HasBackgroundColour() const { return m_colBack.IsOk(); }
-    bool HasFont() const { return m_font.IsOk(); }
+    bool HasTextColour() const { return m_colText.Ok(); }
+    bool HasBackgroundColour() const { return m_colBack.Ok(); }
+    bool HasFont() const { return m_font.Ok(); }
 
     const wxColour& GetTextColour() const { return m_colText; }
     const wxColour& GetBackgroundColour() const { return m_colBack; }
@@ -244,13 +267,13 @@ private:
 
 class WXDLLIMPEXP_FWD_CORE wxTreeCtrlBase;
 
-class WXDLLIMPEXP_CORE wxTreeEvent : public wxNotifyEvent
+class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
 {
 public:
-    wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
     wxTreeEvent(wxEventType commandType,
                 wxTreeCtrlBase *tree,
                 const wxTreeItemId &item = wxTreeItemId());
+    wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
     wxTreeEvent(const wxTreeEvent& event);
 
     virtual wxEvent *Clone() const { return new wxTreeEvent(*this); }
@@ -309,30 +332,32 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 // tree control events and macros for handling them
 // ----------------------------------------------------------------------------
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_BEGIN_RDRAG, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_END_LABEL_EDIT, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_DELETE_ITEM, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_GET_INFO, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_SET_INFO, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_EXPANDED, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_COLLAPSING, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_SEL_CHANGING, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_KEY_DOWN, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_END_DRAG, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, wxTreeEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEvent );
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_BEGIN_DRAG, 600)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_BEGIN_RDRAG, 601)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, 602)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_END_LABEL_EDIT, 603)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_DELETE_ITEM, 604)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_GET_INFO, 605)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_SET_INFO, 606)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_EXPANDED, 607)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_EXPANDING, 608)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, 609)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, 610)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_SEL_CHANGED, 611)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_SEL_CHANGING, 612)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_KEY_DOWN, 613)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, 614)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, 615)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 616)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_END_DRAG, 617)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 618)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 619)
+    DECLARE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_MENU, 620)
+END_DECLARE_EVENT_TYPES()
 
 #define wxTreeEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxTreeEventFunction, func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTreeEventFunction, &func)
 
 #define wx__DECLARE_TREEEVT(evt, id, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_TREE_ ## evt, id, wxTreeEventHandler(fn))
diff --git a/Source/3rd Party/wx/include/wx/treebook.h b/Source/3rd Party/wx/include/wx/treebook.h
index 058e23b74..dba636352 100644
--- a/Source/3rd Party/wx/include/wx/treebook.h	
+++ b/Source/3rd Party/wx/include/wx/treebook.h	
@@ -4,7 +4,7 @@
 // Author:      Evgeniy Tarassov, Vadim Zeitlin
 // Modified by:
 // Created:     2005-09-15
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: treebook.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,8 +17,8 @@
 #if wxUSE_TREEBOOK
 
 #include "wx/bookctrl.h"
-#include "wx/containr.h"
 #include "wx/treectrl.h"        // for wxArrayTreeItemIds
+#include "wx/containr.h"
 
 typedef wxWindow wxTreebookPage;
 
@@ -28,7 +28,7 @@ class WXDLLIMPEXP_FWD_CORE wxTreeEvent;
 // wxTreebook
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTreebook : public wxNavigationEnabled<wxBookCtrlBase>
+class WXDLLEXPORT wxTreebook : public wxBookCtrlBase
 {
 public:
     // Constructors and such
@@ -75,27 +75,27 @@ public:
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
-                            int imageId = NO_IMAGE);
+                            int imageId = wxNOT_FOUND);
 
     // Inserts a new sub-page to the end of children of the page at given pos.
     virtual bool InsertSubPage(size_t pos,
                                wxWindow *page,
                                const wxString& text,
                                bool bSelect = false,
-                               int imageId = NO_IMAGE);
+                               int imageId = wxNOT_FOUND);
 
     // Adds a new page at top level after all other pages.
     virtual bool AddPage(wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,
-                         int imageId = NO_IMAGE);
+                         int imageId = wxNOT_FOUND);
 
     // Adds a new child-page to the last top-level page inserted.
     // Useful when constructing 1 level tree structure.
     virtual bool AddSubPage(wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
-                            int imageId = NO_IMAGE);
+                            int imageId = wxNOT_FOUND);
 
     // Deletes the page and ALL its children. Could trigger page selection
     // change in a case when selected page is removed. In that case its parent
@@ -127,10 +127,12 @@ public:
     // Standard operations inherited from wxBookCtrlBase
     // -------------------------------------------------
 
+    virtual int GetSelection() const;
     virtual bool SetPageText(size_t n, const wxString& strText);
     virtual wxString GetPageText(size_t n) const;
     virtual int GetPageImage(size_t n) const;
     virtual bool SetPageImage(size_t n, int imageId);
+    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
     virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
     virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
     virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
@@ -152,6 +154,9 @@ protected:
     // array of page ids and page windows
     wxArrayTreeItemIds m_treeIds;
 
+    // the currently selected page or wxNOT_FOUND if none
+    int m_selection;
+
     // in the situation when m_selection page is not wxNOT_FOUND but page is
     // NULL this is the first (sub)child that has a non-NULL page
     int m_actualSelection;
@@ -170,16 +175,16 @@ private:
                       wxWindow *page,
                       const wxString& text,
                       bool bSelect = false,
-                      int imageId = NO_IMAGE);
+                      int imageId = wxNOT_FOUND);
     bool DoInsertSubPage(size_t pos,
                          wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,
-                         int imageId = NO_IMAGE);
+                         int imageId = wxNOT_FOUND);
     bool DoAddSubPage(wxWindow *page,
                          const wxString& text,
                          bool bSelect = false,
-                         int imageId = NO_IMAGE);
+                         int imageId = wxNOT_FOUND);
 
     // Sets selection in the tree control and updates the page being shown.
     int DoSetSelection(size_t pos, int flags = 0);
@@ -217,11 +222,12 @@ private:
 
     // Returns internal number of pages which can be different from
     // GetPageCount() while performing a page insertion or removal.
-    size_t DoInternalGetPageCount() const { return m_treeIds.GetCount(); }
+    size_t DoInternalGetPageCount() const { return m_treeIds.Count(); }
 
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTreebook)
+    WX_DECLARE_CONTROL_CONTAINER();
 };
 
 
@@ -229,28 +235,47 @@ private:
 // treebook event class and related stuff
 // ----------------------------------------------------------------------------
 
-// wxTreebookEvent is obsolete and defined for compatibility only
-#define wxTreebookEvent wxBookCtrlEvent
-typedef wxBookCtrlEventFunction wxTreebookEventFunction;
-#define wxTreebookEventHandler(func) wxBookCtrlEventHandler(func)
+class WXDLLEXPORT wxTreebookEvent : public wxBookCtrlBaseEvent
+{
+public:
+    wxTreebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
+                    int nSel = wxNOT_FOUND, int nOldSel = wxNOT_FOUND)
+        : wxBookCtrlBaseEvent(commandType, id, nSel, nOldSel)
+    {
+    }
 
+    wxTreebookEvent(const wxTreebookEvent& event)
+        : wxBookCtrlBaseEvent(event)
+    {
+    }
 
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, wxBookCtrlEvent );
+    virtual wxEvent *Clone() const { return new wxTreebookEvent(*this); }
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTreebookEvent)
+};
+
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED;
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED;
+
+typedef void (wxEvtHandler::*wxTreebookEventFunction)(wxTreebookEvent&);
+
+#define wxTreebookEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTreebookEventFunction, &func)
 
 #define EVT_TREEBOOK_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, winid, wxTreebookEventHandler(fn))
 
 #define EVT_TREEBOOK_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, winid, wxTreebookEventHandler(fn))
 
 #define EVT_TREEBOOK_NODE_COLLAPSED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, winid, wxTreebookEventHandler(fn))
 
 #define EVT_TREEBOOK_NODE_EXPANDED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, winid, wxBookCtrlEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, winid, wxTreebookEventHandler(fn))
 
 
 #endif // wxUSE_TREEBOOK
diff --git a/Source/3rd Party/wx/include/wx/treectrl.h b/Source/3rd Party/wx/include/wx/treectrl.h
index 33bd88dda..2b919cbd5 100644
--- a/Source/3rd Party/wx/include/wx/treectrl.h	
+++ b/Source/3rd Party/wx/include/wx/treectrl.h	
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Karsten Ballueder
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: treectrl.h 49563 2007-10-31 20:46:21Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -22,7 +22,7 @@
 
 #include "wx/control.h"
 #include "wx/treebase.h"
-#include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through wxCLASSINFO macro
+#include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through CLASSINFO macro
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
@@ -30,10 +30,23 @@ class WXDLLIMPEXP_FWD_CORE wxImageList;
 // wxTreeCtrlBase
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxTreeCtrlBase : public wxControl
+class WXDLLEXPORT wxTreeCtrlBase : public wxControl
 {
 public:
-    wxTreeCtrlBase();
+    wxTreeCtrlBase()
+    {
+        m_imageListNormal =
+        m_imageListState = NULL;
+        m_ownsImageListNormal =
+        m_ownsImageListState = false;
+
+        // arbitrary default
+        m_spacing = 18;
+
+        // quick DoGetBestSize calculation
+        m_quickBestSize = true;
+    }
+
     virtual ~wxTreeCtrlBase();
 
     // accessors
@@ -105,18 +118,12 @@ public:
         // get the item's font
     virtual wxFont GetItemFont(const wxTreeItemId& item) const = 0;
 
-        // get the items state
-    int GetItemState(const wxTreeItemId& item) const
-    {
-        return DoGetItemState(item);
-    }
-
     // modifiers
     // ---------
 
         // set items label
     virtual void SetItemText(const wxTreeItemId& item, const wxString& text) = 0;
-        // set one of the images associated with the item (normal by default)
+        // get one of the images associated with the item (normal by default)
     virtual void SetItemImage(const wxTreeItemId& item,
                               int image,
                               wxTreeItemIcon which = wxTreeItemIcon_Normal) = 0;
@@ -149,9 +156,6 @@ public:
     virtual void SetItemFont(const wxTreeItemId& item,
                              const wxFont& font) = 0;
 
-        // set the items state (special state values: wxTREE_ITEMSTATE_NONE/NEXT/PREV)
-    void SetItemState(const wxTreeItemId& item, int state);
-
     // item status inquiries
     // ---------------------
 
@@ -168,8 +172,10 @@ public:
     virtual bool IsSelected(const wxTreeItemId& item) const = 0;
         // is item text in bold font?
     virtual bool IsBold(const wxTreeItemId& item) const = 0;
+#if wxABI_VERSION >= 20801
         // is the control empty?
     bool IsEmpty() const;
+#endif // wxABI 2.8.1+
 
 
     // number of children
@@ -197,17 +203,6 @@ public:
         //     control with a lot of items (~ O(number of items)).
     virtual size_t GetSelections(wxArrayTreeItemIds& selections) const = 0;
 
-        // get the last item to be clicked when the control has wxTR_MULTIPLE
-        // equivalent to GetSelection() if not wxTR_MULTIPLE
-    virtual wxTreeItemId GetFocusedItem() const = 0;
-
-
-        // Clears the currently focused item
-    virtual void ClearFocusedItem() = 0;
-        // Sets the currently focused item. Item should be valid
-    virtual void SetFocusedItem(const wxTreeItemId& item) = 0;
-
-
         // get the parent of this item (may return NULL if root)
     virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const = 0;
 
@@ -297,16 +292,18 @@ public:
 
         // expand this item
     virtual void Expand(const wxTreeItemId& item) = 0;
-        // expand the item and all its children recursively
+        // expand the item and all its childs and thats childs
     void ExpandAllChildren(const wxTreeItemId& item);
         // expand all items
     void ExpandAll();
         // collapse the item without removing its children
     virtual void Collapse(const wxTreeItemId& item) = 0;
-        // collapse the item and all its children
+#if wxABI_VERSION >= 20801
+        // collapse the item and all its childs and thats childs
     void CollapseAllChildren(const wxTreeItemId& item);
         // collapse all items
     void CollapseAll();
+#endif // wxABI 2.8.1+
         // collapse the item and remove all children
     virtual void CollapseAndReset(const wxTreeItemId& item) = 0;
         // toggles the current state
@@ -318,9 +315,6 @@ public:
     virtual void UnselectAll() = 0;
         // select this item
     virtual void SelectItem(const wxTreeItemId& item, bool select = true) = 0;
-        // selects all (direct) children for given parent (only for
-        // multiselection controls)
-    virtual void SelectChildren(const wxTreeItemId& parent) = 0;
         // unselect this item
     void UnselectItem(const wxTreeItemId& item) { SelectItem(item, false); }
         // toggle item selection
@@ -340,7 +334,7 @@ public:
         // been before. textCtrlClass parameter allows you to create an edit
         // control of arbitrary user-defined class deriving from wxTextCtrl.
     virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
-                      wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) = 0;
+                      wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl)) = 0;
         // returns the same pointer as StartEdit() if the item is being edited,
         // NULL otherwise (it's assumed that no more than one item may be
         // edited simultaneously)
@@ -397,10 +391,6 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
 
-    // common part of Get/SetItemState()
-    virtual int DoGetItemState(const wxTreeItemId& item) const = 0;
-    virtual void DoSetItemState(const wxTreeItemId& item, int state) = 0;
-
     // common part of Append/Prepend/InsertItem()
     //
     // pos is the position at which to insert the item or (size_t)-1 to append
@@ -439,14 +429,7 @@ protected:
     bool        m_quickBestSize;
 
 
-private:
-    // Intercept Escape and Return keys to ensure that our in-place edit
-    // control always gets them before they're used for dialog navigation or
-    // anything else.
-    void OnCharHook(wxKeyEvent& event);
-
-
-    wxDECLARE_NO_COPY_CLASS(wxTreeCtrlBase);
+    DECLARE_NO_COPY_CLASS(wxTreeCtrlBase)
 };
 
 // ----------------------------------------------------------------------------
@@ -455,6 +438,8 @@ private:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/treectlg.h"
+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/treectrl.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/treectrl.h"
 #elif defined(__WXMOTIF__)
diff --git a/Source/3rd Party/wx/include/wx/txtstrm.h b/Source/3rd Party/wx/include/wx/txtstrm.h
index e9ab0ae73..0e2b0c955 100644
--- a/Source/3rd Party/wx/include/wx/txtstrm.h	
+++ b/Source/3rd Party/wx/include/wx/txtstrm.h	
@@ -4,7 +4,7 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     28/06/1998
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: txtstrm.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -45,8 +45,6 @@ public:
 #endif
     ~wxTextInputStream();
 
-    const wxInputStream& GetInputStream() const { return m_input; }
-
     wxUint32 Read32(int base = 10); // base may be between 2 and 36, inclusive, or the special 0 (= C format)
     wxUint16 Read16(int base = 10);
     wxUint8  Read8(int base = 10);
@@ -95,7 +93,7 @@ protected:
     wxChar NextChar();   // this should be used instead of GetC() because of Unicode issues
     wxChar NextNonSeparators();
 
-    wxDECLARE_NO_COPY_CLASS(wxTextInputStream);
+    DECLARE_NO_COPY_CLASS(wxTextInputStream)
 };
 
 typedef enum
@@ -118,8 +116,6 @@ public:
 #endif
     virtual ~wxTextOutputStream();
 
-    const wxOutputStream& GetOutputStream() const { return m_output; }
-
     void SetMode( wxEOL mode = wxEOL_NATIVE );
     wxEOL GetMode() { return m_mode; }
 
@@ -131,8 +127,7 @@ public:
 
     wxTextOutputStream& PutChar(wxChar c);
 
-    void Flush();
-
+    wxTextOutputStream& operator<<(const wxChar *string);
     wxTextOutputStream& operator<<(const wxString& string);
     wxTextOutputStream& operator<<(char c);
 #if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
@@ -155,7 +150,7 @@ protected:
     wxMBConv *m_conv;
 #endif
 
-    wxDECLARE_NO_COPY_CLASS(wxTextOutputStream);
+    DECLARE_NO_COPY_CLASS(wxTextOutputStream)
 };
 
 #endif
diff --git a/Source/3rd Party/wx/include/wx/typeinfo.h b/Source/3rd Party/wx/include/wx/typeinfo.h
deleted file mode 100644
index e2f858084..000000000
--- a/Source/3rd Party/wx/include/wx/typeinfo.h	
+++ /dev/null
@@ -1,148 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/typeinfo.h
-// Purpose:     wxTypeId implementation
-// Author:      Jaakko Salli
-// Created:     2009-11-19
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets Team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TYPEINFO_H_
-#define _WX_TYPEINFO_H_
-
-//
-// This file defines wxTypeId macro that should be used internally in
-// wxWidgets instead of typeid(), for compatibility with builds that do
-// not implement C++ RTTI. Also, type defining macros in this file are
-// intended for internal use only at this time and may change in future
-// versions.
-//
-// The reason why we need this simple RTTI system in addition to the older
-// wxObject-based one is that the latter does not work in template
-// classes.
-//
-
-#include "wx/defs.h"
-
-#ifndef wxNO_RTTI
-
-//
-// Let's trust that Visual C++ versions 9.0 and later implement C++
-// RTTI well enough, so we can use it and work around harmless memory
-// leaks reported by the static run-time libraries.
-//
-#if wxCHECK_VISUALC_VERSION(9)
-    #define wxTRUST_CPP_RTTI    1
-#else
-    #define wxTRUST_CPP_RTTI    0
-#endif
-
-#include <typeinfo>
-#include <string.h>
-
-#define _WX_DECLARE_TYPEINFO_CUSTOM(CLS, IDENTFUNC)
-#define WX_DECLARE_TYPEINFO_INLINE(CLS)
-#define WX_DECLARE_TYPEINFO(CLS)
-#define WX_DEFINE_TYPEINFO(CLS)
-#define WX_DECLARE_ABSTRACT_TYPEINFO(CLS)
-
-#if wxTRUST_CPP_RTTI
-
-#define wxTypeId    typeid
-
-#else /*  !wxTRUST_CPP_RTTI */
-
-//
-// For improved type-safety, let's make the check using class name
-// comparison. Most modern compilers already do this, but we cannot
-// rely on all supported compilers to work this well. However, in
-// cases where we'd know that typeid() would be flawless (as such),
-// wxTypeId could of course simply be defined as typeid.
-//
-
-class wxTypeIdentifier
-{
-public:
-    wxTypeIdentifier(const char* className)
-    {
-        m_className = className;
-    }
-
-    bool operator==(const wxTypeIdentifier& other)
-    {
-        return strcmp(m_className, other.m_className) == 0;
-    }
-
-    bool operator!=(const wxTypeIdentifier& other)
-    {
-        return strcmp(m_className, other.m_className) != 0;
-    }
-private:
-    const char* m_className;
-};
-
-#define wxTypeId(OBJ) wxTypeIdentifier(typeid(OBJ).name())
-
-#endif /*  wxTRUST_CPP_RTTI/!wxTRUST_CPP_RTTI */
-
-#else // if !wxNO_RTTI
-
-#define wxTRUST_CPP_RTTI    0
-
-//
-// When C++ RTTI is not available, we will have to make the type comparison
-// using pointer to a dummy static member function. This will fail if
-// declared type is used across DLL boundaries, although using
-// WX_DECLARE_TYPEINFO() and WX_DEFINE_TYPEINFO() pair instead of
-// WX_DECLARE_TYPEINFO_INLINE() should fix this. However, that approach is
-// usually not possible when type info needs to be declared for a template
-// class.
-//
-
-typedef void (*wxTypeIdentifier)();
-
-// Use this macro to declare type info with specified static function
-// IDENTFUNC used as type identifier. Usually you should only use
-// WX_DECLARE_TYPEINFO() or WX_DECLARE_TYPEINFO_INLINE() however.
-#define _WX_DECLARE_TYPEINFO_CUSTOM(CLS, IDENTFUNC) \
-public: \
-    virtual wxTypeIdentifier GetWxTypeId() const \
-    { \
-        return reinterpret_cast<wxTypeIdentifier> \
-            (&IDENTFUNC); \
-    }
-
-// Use this macro to declare type info with externally specified
-// type identifier, defined with WX_DEFINE_TYPEINFO().
-#define WX_DECLARE_TYPEINFO(CLS) \
-private: \
-    static CLS sm_wxClassInfo(); \
-_WX_DECLARE_TYPEINFO_CUSTOM(CLS, sm_wxClassInfo)
-
-// Use this macro to implement type identifier function required by
-// WX_DECLARE_TYPEINFO().
-// NOTE: CLS is required to have default ctor. If it doesn't
-//       already, you should provide a private dummy one.
-#define WX_DEFINE_TYPEINFO(CLS) \
-CLS CLS::sm_wxClassInfo() { return CLS(); }
-
-// Use this macro to declare type info fully inline in class.
-// NOTE: CLS is required to have default ctor. If it doesn't
-//       already, you should provide a private dummy one.
-#define WX_DECLARE_TYPEINFO_INLINE(CLS) \
-private: \
-    static CLS sm_wxClassInfo() { return CLS(); } \
-_WX_DECLARE_TYPEINFO_CUSTOM(CLS, sm_wxClassInfo)
-
-#define wxTypeId(OBJ) (OBJ).GetWxTypeId()
-
-// Because abstract classes cannot be instantiated, we use
-// this macro to define pure virtual type interface for them.
-#define WX_DECLARE_ABSTRACT_TYPEINFO(CLS) \
-public: \
-    virtual wxTypeIdentifier GetWxTypeId() const = 0;
-
-#endif // wxNO_RTTI/!wxNO_RTTI
-
-#endif // _WX_TYPEINFO_H_
diff --git a/Source/3rd Party/wx/include/wx/uiaction.h b/Source/3rd Party/wx/include/wx/uiaction.h
deleted file mode 100644
index 4801659c3..000000000
--- a/Source/3rd Party/wx/include/wx/uiaction.h	
+++ /dev/null
@@ -1,89 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/uiaction.h
-// Purpose:     wxUIActionSimulator interface
-// Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
-// Modified by:
-// Created:     2010-03-06
-// RCS-ID:      $Id$
-// Copyright:   (c) Kevin Ollivier
-//              (c) 2010 Steven Lamerton
-//              (c) 2010 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UIACTIONSIMULATOR_H_
-#define _WX_UIACTIONSIMULATOR_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_UIACTIONSIMULATOR
-
-#include "wx/mousestate.h"  // for wxMOUSE_BTN_XXX constants
-
-class WXDLLIMPEXP_CORE wxUIActionSimulator
-{
-public:
-    wxUIActionSimulator() { }
-
-
-    // Default dtor, copy ctor and assignment operator are ok (even though the
-    // last two don't make much sense for this class).
-
-
-    // Mouse simulation
-    // ----------------
-
-    // Low level methods
-    bool MouseMove(long x, long y);
-    bool MouseMove(const wxPoint& point) { return MouseMove(point.x, point.y); }
-
-    bool MouseDown(int button = wxMOUSE_BTN_LEFT);
-    bool MouseUp(int button = wxMOUSE_BTN_LEFT);
-
-    // Higher level interface, use it if possible instead
-    bool MouseClick(int button = wxMOUSE_BTN_LEFT);
-    bool MouseDblClick(int button = wxMOUSE_BTN_LEFT);
-    bool MouseDragDrop(long x1, long y1, long x2, long y2,
-                       int button = wxMOUSE_BTN_LEFT);
-
-
-    // Keyboard simulation
-    // -------------------
-
-    // Low level methods for generating key presses and releases
-    bool KeyDown(int keycode, int modifiers = wxMOD_NONE)
-        { return Key(keycode, modifiers, true); }
-
-    bool KeyUp(int keycode, int modifiers = wxMOD_NONE)
-        { return Key(keycode, modifiers, false); }
-
-    // Higher level methods for generating both the key press and release for a
-    // single key or for all characters in the ASCII string "text" which can currently
-    // contain letters, digits and characters for the definition of numbers [+-., ].
-    bool Char(int keycode, int modifiers = wxMOD_NONE);
-
-    bool Text(const char *text);
-
-private:
-    // This is the common part of Key{Down,Up}() methods: while we keep them
-    // separate at public API level for consistency with Mouse{Down,Up}(), at
-    // implementation level it makes more sense to have them in a single
-    // function.
-    //
-    // It calls DoModifiers() to simulate pressing the modifier keys if
-    // necessary and then DoKey() for the key itself.
-    bool Key(int keycode, int modifiers, bool isDown);
-
-    // Call DoKey() for all modifier keys whose bits are set in the parameter.
-    void SimulateModifiers(int modifier, bool isDown);
-
-
-    // The low-level port-specific function which really generates the key
-    // presses. It should generate exactly one key event with the given
-    // parameters.
-    bool DoKey(int keycode, int modifiers, bool isDown);
-};
-
-#endif // wxUSE_UIACTIONSIMULATOR
-
-#endif // _WX_UIACTIONSIMULATOR_H_
diff --git a/Source/3rd Party/wx/include/wx/unichar.h b/Source/3rd Party/wx/include/wx/unichar.h
deleted file mode 100644
index 3a47eda28..000000000
--- a/Source/3rd Party/wx/include/wx/unichar.h	
+++ /dev/null
@@ -1,349 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unichar.h
-// Purpose:     wxUniChar and wxUniCharRef classes
-// Author:      Vaclav Slavik
-// Created:     2007-03-19
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 REA Elektronik GmbH
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNICHAR_H_
-#define _WX_UNICHAR_H_
-
-#include "wx/defs.h"
-#include "wx/chartype.h"
-#include "wx/stringimpl.h"
-
-class WXDLLIMPEXP_FWD_BASE wxUniCharRef;
-class WXDLLIMPEXP_FWD_BASE wxString;
-
-// This class represents single Unicode character. It can be converted to
-// and from char or wchar_t and implements commonly used character operations.
-class WXDLLIMPEXP_BASE wxUniChar
-{
-public:
-    // NB: this is not wchar_t on purpose, it needs to represent the entire
-    //     Unicode code points range and wchar_t may be too small for that
-    //     (e.g. on Win32 where wchar_t* is encoded in UTF-16)
-    typedef wxUint32 value_type;
-
-    wxUniChar() : m_value(0) {}
-
-    // Create the character from 8bit character value encoded in the current
-    // locale's charset.
-    wxUniChar(char c) { m_value = From8bit(c); }
-    wxUniChar(unsigned char c) { m_value = From8bit((char)c); }
-
-    // Create the character from a wchar_t character value.
-#if wxWCHAR_T_IS_REAL_TYPE
-    wxUniChar(wchar_t c) { m_value = c; }
-#endif
-
-    wxUniChar(int c) { m_value = c; }
-    wxUniChar(unsigned int c) { m_value = c; }
-    wxUniChar(long int c) { m_value = c; }
-    wxUniChar(unsigned long int c) { m_value = c; }
-    wxUniChar(short int c) { m_value = c; }
-    wxUniChar(unsigned short int c) { m_value = c; }
-
-    wxUniChar(const wxUniCharRef& c);
-
-    // Returns Unicode code point value of the character
-    value_type GetValue() const { return m_value; }
-
-#if wxUSE_UNICODE_UTF8
-    // buffer for single UTF-8 character
-    struct Utf8CharBuffer
-    {
-        char data[5];
-        operator const char*() const { return data; }
-    };
-
-    // returns the character encoded as UTF-8
-    // (NB: implemented in stringops.cpp)
-    Utf8CharBuffer AsUTF8() const;
-#endif // wxUSE_UNICODE_UTF8
-
-    // Returns true if the character is an ASCII character:
-    bool IsAscii() const { return m_value < 0x80; }
-
-    // Returns true if the character is representable as a single byte in the
-    // current locale encoding and return this byte in output argument c (which
-    // must be non-NULL)
-    bool GetAsChar(char *c) const
-    {
-#if wxUSE_UNICODE
-        if ( !IsAscii() )
-        {
-#if !wxUSE_UTF8_LOCALE_ONLY
-            if ( GetAsHi8bit(m_value, c) )
-                return true;
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-            return false;
-        }
-#endif // wxUSE_UNICODE
-
-        *c = wx_truncate_cast(char, m_value);
-        return true;
-    }
-
-    // Conversions to char and wchar_t types: all of those are needed to be
-    // able to pass wxUniChars to verious standard narrow and wide character
-    // functions
-    operator char() const { return To8bit(m_value); }
-    operator unsigned char() const { return (unsigned char)To8bit(m_value); }
-#if wxWCHAR_T_IS_REAL_TYPE
-    operator wchar_t() const { return (wchar_t)m_value; }
-#endif
-    operator int() const { return (int)m_value; }
-    operator unsigned int() const { return (unsigned int)m_value; }
-    operator long int() const { return (long int)m_value; }
-    operator unsigned long int() const { return (unsigned long)m_value; }
-    operator short int() const { return (short int)m_value; }
-    operator unsigned short int() const { return (unsigned short int)m_value; }
-
-    // We need this operator for the "*p" part of expressions like "for (
-    // const_iterator p = begin() + nStart; *p; ++p )". In this case,
-    // compilation would fail without it because the conversion to bool would
-    // be ambiguous (there are all these int types conversions...). (And adding
-    // operator unspecified_bool_type() would only makes the ambiguity worse.)
-    operator bool() const { return m_value != 0; }
-    bool operator!() const { return !((bool)*this); }
-
-    // And this one is needed by some (not all, but not using ifdefs makes the
-    // code easier) compilers to parse "str[0] && *p" successfully
-    bool operator&&(bool v) const { return (bool)*this && v; }
-
-    // Assignment operators:
-    wxUniChar& operator=(const wxUniChar& c) { if (&c != this) m_value = c.m_value; return *this; }
-    wxUniChar& operator=(const wxUniCharRef& c);
-    wxUniChar& operator=(char c) { m_value = From8bit(c); return *this; }
-    wxUniChar& operator=(unsigned char c) { m_value = From8bit((char)c); return *this; }
-#if wxWCHAR_T_IS_REAL_TYPE
-    wxUniChar& operator=(wchar_t c) { m_value = c; return *this; }
-#endif
-    wxUniChar& operator=(int c) { m_value = c; return *this; }
-    wxUniChar& operator=(unsigned int c) { m_value = c; return *this; }
-    wxUniChar& operator=(long int c) { m_value = c; return *this; }
-    wxUniChar& operator=(unsigned long int c) { m_value = c; return *this; }
-    wxUniChar& operator=(short int c) { m_value = c; return *this; }
-    wxUniChar& operator=(unsigned short int c) { m_value = c; return *this; }
-
-    // Comparison operators:
-
-    // define the given comparison operator for all the types
-#define wxDEFINE_UNICHAR_OPERATOR(op)                                         \
-    bool operator op(const wxUniChar& c) const { return m_value op c.m_value; }\
-    bool operator op(char c) const { return m_value op From8bit(c); }         \
-    bool operator op(unsigned char c) const { return m_value op From8bit((char)c); } \
-    wxIF_WCHAR_T_TYPE( bool operator op(wchar_t c) const { return m_value op (value_type)c; } )    \
-    bool operator op(int c) const { return m_value op (value_type)c; }        \
-    bool operator op(unsigned int c) const { return m_value op (value_type)c; }        \
-    bool operator op(short int c) const { return m_value op (value_type)c; }  \
-    bool operator op(unsigned short int c) const { return m_value op (value_type)c; }  \
-    bool operator op(long int c) const { return m_value op (value_type)c; }   \
-    bool operator op(unsigned long int c) const { return m_value op (value_type)c; }
-
-    wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHAR_OPERATOR)
-
-#undef wxDEFINE_UNICHAR_OPERATOR
-
-    // this is needed for expressions like 'Z'-c
-    int operator-(const wxUniChar& c) const { return m_value - c.m_value; }
-    int operator-(char c) const { return m_value - From8bit(c); }
-    int operator-(unsigned char c) const { return m_value - From8bit((char)c); }
-    int operator-(wchar_t c) const { return m_value - (value_type)c; }
-
-
-private:
-    // notice that we implement these functions inline for 7-bit ASCII
-    // characters purely for performance reasons
-    static value_type From8bit(char c)
-    {
-#if wxUSE_UNICODE
-        if ( (unsigned char)c < 0x80 )
-            return c;
-
-        return FromHi8bit(c);
-#else
-        return c;
-#endif
-    }
-
-    static char To8bit(value_type c)
-    {
-#if wxUSE_UNICODE
-        if ( c < 0x80 )
-            return wx_truncate_cast(char, c);
-
-        return ToHi8bit(c);
-#else
-        return c;
-#endif
-    }
-
-    // helpers of the functions above called to deal with non-ASCII chars
-    static value_type FromHi8bit(char c);
-    static char ToHi8bit(value_type v);
-    static bool GetAsHi8bit(value_type v, char *c);
-
-private:
-    value_type m_value;
-};
-
-
-// Writeable reference to a character in wxString.
-//
-// This class can be used in the same way wxChar is used, except that changing
-// its value updates the underlying string object.
-class WXDLLIMPEXP_BASE wxUniCharRef
-{
-private:
-    typedef wxStringImpl::iterator iterator;
-
-    // create the reference
-#if wxUSE_UNICODE_UTF8
-    wxUniCharRef(wxString& str, iterator pos) : m_str(str), m_pos(pos) {}
-#else
-    wxUniCharRef(iterator pos) : m_pos(pos) {}
-#endif
-
-public:
-    // NB: we have to make this public, because we don't have wxString
-    //     declaration available here and so can't declare wxString::iterator
-    //     as friend; so at least don't use a ctor but a static function
-    //     that must be used explicitly (this is more than using 'explicit'
-    //     keyword on ctor!):
-#if wxUSE_UNICODE_UTF8
-    static wxUniCharRef CreateForString(wxString& str, iterator pos)
-        { return wxUniCharRef(str, pos); }
-#else
-    static wxUniCharRef CreateForString(iterator pos)
-        { return wxUniCharRef(pos); }
-#endif
-
-    wxUniChar::value_type GetValue() const { return UniChar().GetValue(); }
-
-#if wxUSE_UNICODE_UTF8
-    wxUniChar::Utf8CharBuffer AsUTF8() const { return UniChar().AsUTF8(); }
-#endif // wxUSE_UNICODE_UTF8
-
-    bool IsAscii() const { return UniChar().IsAscii(); }
-    bool GetAsChar(char *c) const { return UniChar().GetAsChar(c); }
-
-    // Assignment operators:
-#if wxUSE_UNICODE_UTF8
-    wxUniCharRef& operator=(const wxUniChar& c);
-#else
-    wxUniCharRef& operator=(const wxUniChar& c) { *m_pos = c; return *this; }
-#endif
-
-    wxUniCharRef& operator=(const wxUniCharRef& c)
-        { if (&c != this) *this = c.UniChar(); return *this; }
-
-    wxUniCharRef& operator=(char c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(unsigned char c) { return *this = wxUniChar(c); }
-#if wxWCHAR_T_IS_REAL_TYPE
-    wxUniCharRef& operator=(wchar_t c) { return *this = wxUniChar(c); }
-#endif
-    wxUniCharRef& operator=(int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(unsigned int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(short int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(unsigned short int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(long int c) { return *this = wxUniChar(c); }
-    wxUniCharRef& operator=(unsigned long int c) { return *this = wxUniChar(c); }
-
-    // Conversions to the same types as wxUniChar is convertible too:
-    operator char() const { return UniChar(); }
-    operator unsigned char() const { return UniChar(); }
-#if wxWCHAR_T_IS_REAL_TYPE
-    operator wchar_t() const { return UniChar(); }
-#endif
-    operator int() const { return UniChar(); }
-    operator unsigned int() const { return UniChar(); }
-    operator short int() const { return UniChar(); }
-    operator unsigned short int() const { return UniChar(); }
-    operator long int() const { return UniChar(); }
-    operator unsigned long int() const { return UniChar(); }
-
-    // see wxUniChar::operator bool etc. for explanation
-    operator bool() const { return (bool)UniChar(); }
-    bool operator!() const { return !UniChar(); }
-    bool operator&&(bool v) const { return UniChar() && v; }
-
-    // Comparison operators:
-#define wxDEFINE_UNICHARREF_OPERATOR(op)                                      \
-    bool operator op(const wxUniCharRef& c) const { return UniChar() op c.UniChar(); }\
-    bool operator op(const wxUniChar& c) const { return UniChar() op c; }     \
-    bool operator op(char c) const { return UniChar() op c; }                 \
-    bool operator op(unsigned char c) const { return UniChar() op c; }        \
-    wxIF_WCHAR_T_TYPE( bool operator op(wchar_t c) const { return UniChar() op c; } ) \
-    bool operator op(int c) const { return UniChar() op c; }                  \
-    bool operator op(unsigned int c) const { return UniChar() op c; }         \
-    bool operator op(short int c) const { return UniChar() op c; }             \
-    bool operator op(unsigned short int c) const { return UniChar() op c; }    \
-    bool operator op(long int c) const { return UniChar() op c; }             \
-    bool operator op(unsigned long int c) const { return UniChar() op c; }
-
-    wxFOR_ALL_COMPARISONS(wxDEFINE_UNICHARREF_OPERATOR)
-
-#undef wxDEFINE_UNICHARREF_OPERATOR
-
-    // for expressions like c-'A':
-    int operator-(const wxUniCharRef& c) const { return UniChar() - c.UniChar(); }
-    int operator-(const wxUniChar& c) const { return UniChar() - c; }
-    int operator-(char c) const { return UniChar() - c; }
-    int operator-(unsigned char c) const { return UniChar() - c; }
-    int operator-(wchar_t c) const { return UniChar() - c; }
-
-private:
-#if wxUSE_UNICODE_UTF8
-    wxUniChar UniChar() const;
-#else
-    wxUniChar UniChar() const { return *m_pos; }
-#endif
-
-    friend class WXDLLIMPEXP_FWD_BASE wxUniChar;
-
-private:
-    // reference to the string and pointer to the character in string
-#if wxUSE_UNICODE_UTF8
-    wxString& m_str;
-#endif
-    iterator m_pos;
-};
-
-inline wxUniChar::wxUniChar(const wxUniCharRef& c)
-{
-    m_value = c.UniChar().m_value;
-}
-
-inline wxUniChar& wxUniChar::operator=(const wxUniCharRef& c)
-{
-    m_value = c.UniChar().m_value;
-    return *this;
-}
-
-// Comparison operators for the case when wxUniChar(Ref) is the second operand
-// implemented in terms of member comparison functions
-
-#define wxCMP_REVERSE(c1, c2, op) c2 op c1
-
-wxDEFINE_COMPARISONS(char, const wxUniChar&, wxCMP_REVERSE)
-wxDEFINE_COMPARISONS(char, const wxUniCharRef&, wxCMP_REVERSE)
-
-wxDEFINE_COMPARISONS(wchar_t, const wxUniChar&, wxCMP_REVERSE)
-wxDEFINE_COMPARISONS(wchar_t, const wxUniCharRef&, wxCMP_REVERSE)
-
-wxDEFINE_COMPARISONS(const wxUniChar&, const wxUniCharRef&, wxCMP_REVERSE)
-
-#undef wxCMP_REVERSE
-
-// for expressions like c-'A':
-inline int operator-(char c1, const wxUniCharRef& c2) { return -(c2 - c1); }
-inline int operator-(const wxUniChar& c1, const wxUniCharRef& c2) { return -(c2 - c1); }
-inline int operator-(wchar_t c1, const wxUniCharRef& c2) { return -(c2 - c1); }
-
-#endif /* _WX_UNICHAR_H_ */
diff --git a/Source/3rd Party/wx/include/wx/uri.h b/Source/3rd Party/wx/include/wx/uri.h
index 40e474e39..33d843c60 100644
--- a/Source/3rd Party/wx/include/wx/uri.h	
+++ b/Source/3rd Party/wx/include/wx/uri.h	
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/uri.h
+// Name:        uri.h
 // Purpose:     wxURI - Class for parsing URIs
 // Author:      Ryan Norton
-//              Vadim Zeitlin (UTF-8 URI support, many other changes)
+// Modified By:
 // Created:     07/01/2004
-// RCS-ID:      $Id$
-// Copyright:   (c) 2004 Ryan Norton
-//                  2008 Vadim Zeitlin
+// RCS-ID:      $Id: uri.h 35650 2005-09-23 12:56:45Z MR $
+// Copyright:   (c) Ryan Norton
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -16,7 +15,6 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
-#include "wx/arrstr.h"
 
 // Host Type that the server component can be
 enum wxURIHostType
@@ -54,119 +52,84 @@ class WXDLLIMPEXP_BASE wxURI : public wxObject
 public:
     wxURI();
     wxURI(const wxString& uri);
+    wxURI(const wxURI& uri);
 
-    // default copy ctor, assignment operator and dtor are ok
+    virtual ~wxURI();
 
-    bool Create(const wxString& uri);
+    const wxChar* Create(const wxString& uri);
 
-    wxURI& operator=(const wxString& string)
-    {
-        Create(string);
-        return *this;
-    }
+    bool HasScheme() const      {   return (m_fields & wxURI_SCHEME) == wxURI_SCHEME;       }
+    bool HasUserInfo() const    {   return (m_fields & wxURI_USERINFO) == wxURI_USERINFO;   }
+    bool HasServer() const      {   return (m_fields & wxURI_SERVER) == wxURI_SERVER;       }
+    bool HasPort() const        {   return (m_fields & wxURI_PORT) == wxURI_PORT;           }
+    bool HasPath() const        {   return (m_fields & wxURI_PATH) == wxURI_PATH;           }
+    bool HasQuery() const       {   return (m_fields & wxURI_QUERY) == wxURI_QUERY;         }
+    bool HasFragment() const    {   return (m_fields & wxURI_FRAGMENT) == wxURI_FRAGMENT;   }
 
-    bool operator==(const wxURI& uri) const;
+    const wxString& GetScheme() const           {   return m_scheme;    }
+    const wxString& GetPath() const             {   return m_path;      }
+    const wxString& GetQuery() const            {   return m_query;     }
+    const wxString& GetFragment() const         {   return m_fragment;  }
+    const wxString& GetPort() const             {   return m_port;      }
+    const wxString& GetUserInfo() const         {   return m_userinfo;  }
+    const wxString& GetServer() const           {   return m_server;    }
+    const wxURIHostType& GetHostType() const    {   return m_hostType;  }
 
-    // various accessors
-
-    bool HasScheme() const      { return (m_fields & wxURI_SCHEME) != 0;   }
-    bool HasUserInfo() const    { return (m_fields & wxURI_USERINFO) != 0; }
-    bool HasServer() const      { return (m_fields & wxURI_SERVER) != 0;   }
-    bool HasPort() const        { return (m_fields & wxURI_PORT) != 0;     }
-    bool HasPath() const        { return (m_fields & wxURI_PATH) != 0;     }
-    bool HasQuery() const       { return (m_fields & wxURI_QUERY) != 0;    }
-    bool HasFragment() const    { return (m_fields & wxURI_FRAGMENT) != 0; }
-
-    const wxString& GetScheme() const    { return m_scheme;   }
-    const wxString& GetPath() const      { return m_path;     }
-    const wxString& GetQuery() const     { return m_query;    }
-    const wxString& GetFragment() const  { return m_fragment; }
-    const wxString& GetPort() const      { return m_port;     }
-    const wxString& GetUserInfo() const  { return m_userinfo; }
-    const wxString& GetServer() const    { return m_server;   }
-    wxURIHostType GetHostType() const    { return m_hostType; }
-
-    // these functions only work if the user information part of the URI is in
-    // the usual (but insecure and hence explicitly recommended against by the
-    // RFC) "user:password" form
+    //Note that the following two get functions are explicitly depreciated by RFC 2396
     wxString GetUser() const;
     wxString GetPassword() const;
 
-
-    // combine all URI components into a single string
-    //
-    // BuildURI() returns the real URI suitable for use with network libraries,
-    // for example, while BuildUnescapedURI() returns a string suitable to be
-    // shown to the user.
-    wxString BuildURI() const { return DoBuildURI(&wxURI::Nothing); }
-    wxString BuildUnescapedURI() const { return DoBuildURI(&wxURI::Unescape); }
-
-    // the escaped URI should contain only ASCII characters, including possible
-    // escape sequences
-    static wxString Unescape(const wxString& escapedURI);
-
+    wxString BuildURI() const;
+    wxString BuildUnescapedURI() const;
 
     void Resolve(const wxURI& base, int flags = wxURI_STRICT);
     bool IsReference() const;
 
+    wxURI& operator = (const wxURI& uri);
+    wxURI& operator = (const wxString& string);
+    bool operator == (const wxURI& uri) const;
+
+    static wxString Unescape (const wxString& szEscapedURI);
+
 protected:
+    wxURI& Assign(const wxURI& uri);
+
     void Clear();
 
-    // common part of BuildURI() and BuildUnescapedURI()
-    wxString DoBuildURI(wxString (*funcDecode)(const wxString&)) const;
-
-    // function which returns its argument unmodified, this is used by
-    // BuildURI() to tell DoBuildURI() that nothing needs to be done with the
-    // URI components
-    static wxString Nothing(const wxString& value) { return value; }
-
-    bool Parse(const char* uri);
-
-    const char* ParseAuthority (const char* uri);
-    const char* ParseScheme    (const char* uri);
-    const char* ParseUserInfo  (const char* uri);
-    const char* ParseServer    (const char* uri);
-    const char* ParsePort      (const char* uri);
-    const char* ParsePath      (const char* uri);
-    const char* ParseQuery     (const char* uri);
-    const char* ParseFragment  (const char* uri);
+    const wxChar* Parse          (const wxChar* uri);
+    const wxChar* ParseAuthority (const wxChar* uri);
+    const wxChar* ParseScheme    (const wxChar* uri);
+    const wxChar* ParseUserInfo  (const wxChar* uri);
+    const wxChar* ParseServer    (const wxChar* uri);
+    const wxChar* ParsePort      (const wxChar* uri);
+    const wxChar* ParsePath      (const wxChar* uri,
+                                  bool bReference = false,
+                                  bool bNormalize = true);
+    const wxChar* ParseQuery     (const wxChar* uri);
+    const wxChar* ParseFragment  (const wxChar* uri);
 
 
-    static bool ParseH16(const char*& uri);
-    static bool ParseIPv4address(const char*& uri);
-    static bool ParseIPv6address(const char*& uri);
-    static bool ParseIPvFuture(const char*& uri);
+    static bool ParseH16(const wxChar*& uri);
+    static bool ParseIPv4address(const wxChar*& uri);
+    static bool ParseIPv6address(const wxChar*& uri);
+    static bool ParseIPvFuture(const wxChar*& uri);
 
-    // should be called with i pointing to '%', returns the encoded character
-    // following it or -1 if invalid and advances i past it (so that it points
-    // to the last character consumed on return)
-    static int DecodeEscape(wxString::const_iterator& i);
+    static void Normalize(wxChar* uri, bool bIgnoreLeads = false);
+    static void UpTree(const wxChar* uristart, const wxChar*& uri);
 
-    // append next character pointer to by p to the string in an escaped form
-    // and advance p past it
-    //
-    // if the next character is '%' and it's followed by 2 hex digits, they are
-    // not escaped (again) by this function, this allows to keep (backwards-
-    // compatible) ambiguity about the input format to wxURI::Create(): it can
-    // be either already escaped or not
-    void AppendNextEscaped(wxString& s, const char *& p);
+    static wxChar TranslateEscape(const wxChar* s);
+    static void Escape  (wxString& s, const wxChar& c);
+    static bool IsEscape(const wxChar*& uri);
 
-    // convert hexadecimal digit to its value; return -1 if c isn't valid
-    static int CharToHex(char c);
+    static wxChar CharToHex(const wxChar& c);
 
-    // split an URI path string in its component segments (including empty and
-    // "." ones, no post-processing is done)
-    static wxArrayString SplitInSegments(const wxString& path);
-
-    // various URI grammar helpers
-    static bool IsUnreserved(char c);
-    static bool IsReserved(char c);
-    static bool IsGenDelim(char c);
-    static bool IsSubDelim(char c);
-    static bool IsHex(char c);
-    static bool IsAlpha(char c);
-    static bool IsDigit(char c);
-    static bool IsEndPath(char c);
+    static bool IsUnreserved (const wxChar& c);
+    static bool IsReserved (const wxChar& c);
+    static bool IsGenDelim (const wxChar& c);
+    static bool IsSubDelim (const wxChar& c);
+    static bool IsHex(const wxChar& c);
+    static bool IsAlpha(const wxChar& c);
+    static bool IsDigit(const wxChar& c);
 
     wxString m_scheme;
     wxString m_path;
diff --git a/Source/3rd Party/wx/include/wx/ustring.h b/Source/3rd Party/wx/include/wx/ustring.h
deleted file mode 100644
index 25aa1b77b..000000000
--- a/Source/3rd Party/wx/include/wx/ustring.h	
+++ /dev/null
@@ -1,750 +0,0 @@
-
-// Name:        wx/ustring.h
-// Purpose:     32-bit string (UCS-4)
-// Author:      Robert Roebling
-// Copyright:   (c) Robert Roebling
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_USTRING_H_
-#define _WX_USTRING_H_
-
-#include "wx/defs.h"
-#include "wx/string.h"
-
-#include <string>
-
-#if SIZEOF_WCHAR_T == 2
-typedef wxWCharBuffer wxU16CharBuffer;
-typedef wxScopedWCharBuffer wxScopedU16CharBuffer;
-#else
-typedef wxCharTypeBuffer<wxChar16> wxU16CharBuffer;
-typedef wxScopedCharTypeBuffer<wxChar16> wxScopedU16CharBuffer;
-#endif
-
-#if SIZEOF_WCHAR_T == 4
-typedef wxWCharBuffer wxU32CharBuffer;
-typedef wxScopedWCharBuffer wxScopedU32CharBuffer;
-#else
-typedef wxCharTypeBuffer<wxChar32> wxU32CharBuffer;
-typedef wxScopedCharTypeBuffer<wxChar32> wxScopedU32CharBuffer;
-#endif
-
-#ifdef __VISUALC__
-    // "non dll-interface class 'std::basic_string<wxChar32>' used as base
-    // interface for dll-interface class 'wxString'" -- this is OK in our case
-    // (and warning is unavoidable anyhow)
-    #pragma warning(push)
-    #pragma warning(disable:4275)
-#endif
-
-class WXDLLIMPEXP_BASE wxUString: public std::basic_string<wxChar32>
-{
-public:
-    wxUString() { }
-
-    wxUString( const wxChar32 *str )                            { assign(str); }
-    wxUString( const wxScopedU32CharBuffer &buf )                     { assign(buf); }
-
-    wxUString( const char *str )                                { assign(str); }
-    wxUString( const wxScopedCharBuffer &buf )                        { assign(buf); }
-    wxUString( const char *str, const wxMBConv &conv )          { assign(str,conv); }
-    wxUString( const wxScopedCharBuffer &buf, const wxMBConv &conv )  { assign(buf,conv); }
-
-    wxUString( const wxChar16 *str )                            { assign(str); }
-    wxUString( const wxScopedU16CharBuffer &buf )                     { assign(buf); }
-
-    wxUString( const wxCStrData *cstr )                         { assign(cstr); }
-    wxUString( const wxString &str )                            { assign(str); }
-
-    wxUString( char ch )                                        { assign(ch); }
-    wxUString( wxChar16 ch )                                    { assign(ch); }
-    wxUString( wxChar32 ch )                                    { assign(ch); }
-    wxUString( wxUniChar ch )                                   { assign(ch); }
-    wxUString( wxUniCharRef ch )                                { assign(ch); }
-    wxUString( size_type n, char ch )                           { assign(n,ch); }
-    wxUString( size_type n, wxChar16 ch )                       { assign(n,ch); }
-    wxUString( size_type n, wxChar32 ch )                       { assign(n,ch); }
-    wxUString( size_type n, wxUniChar ch )                      { assign(n,ch); }
-    wxUString( size_type n, wxUniCharRef ch )                   { assign(n,ch); }
-
-    // static construction
-
-    static wxUString FromAscii( const char *str, size_type n )
-    {
-        wxUString ret;
-        ret.assignFromAscii( str, n );
-        return ret;
-    }
-
-    static wxUString FromAscii( const char *str )
-    {
-        wxUString ret;
-        ret.assignFromAscii( str );
-        return ret;
-    }
-
-    static wxUString FromUTF8( const char *str, size_type n )
-    {
-        wxUString ret;
-        ret.assignFromUTF8( str, n );
-        return ret;
-    }
-
-    static wxUString FromUTF8( const char *str )
-    {
-        wxUString ret;
-        ret.assignFromUTF8( str );
-        return ret;
-    }
-
-    static wxUString FromUTF16( const wxChar16 *str, size_type n )
-    {
-        wxUString ret;
-        ret.assignFromUTF16( str, n );
-        return ret;
-    }
-
-    static wxUString FromUTF16( const wxChar16 *str )
-    {
-        wxUString ret;
-        ret.assignFromUTF16( str );
-        return ret;
-    }
-
-    // assign from encoding
-
-    wxUString &assignFromAscii( const char *str );
-    wxUString &assignFromAscii( const char *str, size_type n );
-    wxUString &assignFromUTF8( const char *str );
-    wxUString &assignFromUTF8( const char *str, size_type n );
-    wxUString &assignFromUTF16( const wxChar16* str );
-    wxUString &assignFromUTF16( const wxChar16* str, size_type n );
-    wxUString &assignFromCString( const char* str );
-    wxUString &assignFromCString( const char* str, const wxMBConv &conv );
-
-    // conversions
-
-    wxScopedCharBuffer utf8_str() const;
-    wxScopedU16CharBuffer utf16_str() const;
-
-#if SIZEOF_WCHAR_T == 2
-    wxScopedWCharBuffer wc_str() const
-    {
-       return utf16_str();
-    }
-#else
-    wchar_t *wc_str() const
-    {
-        return (wchar_t*) c_str();
-    }
-#endif
-
-    operator wxString() const
-    {
-#if wxUSE_UNICODE_UTF8
-        return wxString::FromUTF8( utf8_str() );
-#else
-#if SIZEOF_WCHAR_T == 2
-        return wxString( utf16_str() );
-#else
-        return wxString( c_str() );
-#endif
-#endif
-    }
-
-#if wxUSE_UNICODE_UTF8
-    wxScopedCharBuffer wx_str()
-    {
-        return utf8_str();
-    }
-#else
-#if SIZEOF_WCHAR_T == 2
-    wxScopedWCharBuffer wx_str()
-    {
-        return utf16_str();
-    }
-#else
-    const wchar_t* wx_str()
-    {
-        return c_str();
-    }
-#endif
-#endif
-
-    // assign
-
-    wxUString &assign( const wxChar32* str )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->assign( str );
-    }
-
-    wxUString &assign( const wxChar32* str, size_type n )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->assign( str, n );
-    }
-
-    wxUString &assign( const wxUString &str )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->assign( str );
-    }
-
-    wxUString &assign( const wxUString &str, size_type pos, size_type n )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->assign( str, pos, n );
-    }
-
-    // FIXME-VC6:  VC 6.0 stl does not support all types of assign functions
-    #ifdef __VISUALC6__
-        wxUString &assign( wxChar32 ch )
-        {
-            wxChar32 chh[1];
-            chh[0] = ch;
-            std::basic_string<wxChar32> *base = this;
-            return (wxUString &)base->assign(chh);
-        }
-
-        wxUString &assign( size_type n, wxChar32 ch )
-        {
-            wxU32CharBuffer buffer(n);
-            wxChar32 *p = buffer.data();
-            size_type i;
-            for (i = 0; i < n; i++)
-            {
-               *p = ch;
-               p++;
-            }
-
-            std::basic_string<wxChar32> *base = this;
-            return (wxUString &)base->assign(buffer.data());
-        }
-    #else
-        wxUString &assign( wxChar32 ch )
-        {
-            std::basic_string<wxChar32> *base = this;
-            return (wxUString &) base->assign( (size_type) 1, ch );
-        }
-
-        wxUString &assign( size_type n, wxChar32 ch )
-        {
-            std::basic_string<wxChar32> *base = this;
-            return (wxUString &) base->assign( n, ch );
-        }
-    #endif // __VISUALC6__
-
-    wxUString &assign( const wxScopedU32CharBuffer &buf )
-    {
-        return assign( buf.data() );
-    }
-
-    wxUString &assign( const char *str )
-    {
-        return assignFromCString( str );
-    }
-
-    wxUString &assign( const wxScopedCharBuffer &buf )
-    {
-        return assignFromCString( buf.data() );
-    }
-
-    wxUString &assign( const char *str, const wxMBConv &conv )
-    {
-        return assignFromCString( str, conv );
-    }
-
-    wxUString &assign( const wxScopedCharBuffer &buf, const wxMBConv &conv )
-    {
-        return assignFromCString( buf.data(), conv );
-    }
-
-    wxUString &assign( const wxChar16 *str )
-    {
-        return assignFromUTF16( str );
-    }
-
-    wxUString &assign( const wxScopedU16CharBuffer &buf )
-    {
-        return assignFromUTF16( buf.data() );
-    }
-
-    wxUString &assign( const wxCStrData *cstr )
-    {
-#if SIZEOF_WCHAR_T == 2
-        return assignFromUTF16( cstr->AsWChar() );
-#else
-        return assign( cstr->AsWChar() );
-#endif
-    }
-
-    wxUString &assign( const wxString &str )
-    {
-#if wxUSE_UNICODE_UTF8
-        return assignFromUTF8( str.wx_str() );
-#else
-   #if SIZEOF_WCHAR_T == 2
-        return assignFromUTF16( str.wc_str() );
-   #else
-        return assign( str.wc_str() );
-   #endif
-#endif
-    }
-
-    wxUString &assign( char ch )
-    {
-        char buf[2];
-        buf[0] = ch;
-        buf[1] = 0;
-        return assignFromCString( buf );
-    }
-
-    wxUString &assign( size_type n, char ch )
-    {
-        wxCharBuffer buffer(n);
-        char *p = buffer.data();
-        size_type i;
-        for (i = 0; i < n; i++)
-        {
-           *p = ch;
-           p++;
-        }
-        return assignFromCString( buffer.data() );
-    }
-
-    wxUString &assign( wxChar16 ch )
-    {
-        wxChar16 buf[2];
-        buf[0] = ch;
-        buf[1] = 0;
-        return assignFromUTF16( buf );
-    }
-
-    wxUString &assign( size_type n, wxChar16 ch )
-    {
-        wxU16CharBuffer buffer(n);
-        wxChar16 *p = buffer.data();
-        size_type i;
-        for (i = 0; i < n; i++)
-        {
-           *p = ch;
-           p++;
-        }
-        return assignFromUTF16( buffer.data() );
-    }
-
-    wxUString &assign( wxUniChar ch )
-    {
-        return assign( (wxChar32) ch.GetValue() );
-    }
-
-    wxUString &assign( size_type n, wxUniChar ch )
-    {
-        return assign( n, (wxChar32) ch.GetValue() );
-    }
-
-    wxUString &assign( wxUniCharRef ch )
-    {
-        return assign( (wxChar32) ch.GetValue() );
-    }
-
-    wxUString &assign( size_type n, wxUniCharRef ch )
-    {
-        return assign( n, (wxChar32) ch.GetValue() );
-    }
-
-    // append [STL overload]
-
-    wxUString &append( const wxUString &s )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->append( s );
-    }
-
-    wxUString &append( const wxUString &s, size_type pos, size_type n )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->append( s, pos, n );
-    }
-
-    wxUString &append( const wxChar32* s )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->append( s );
-    }
-
-    wxUString &append( const wxChar32* s, size_type n )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->append( s, n );
-    }
-
-    // FIXME-VC6:  VC 6.0 stl does not support all types of append functions
-    #ifdef __VISUALC6__
-        wxUString &append( size_type n, wxChar32 c )
-        {
-            wxU32CharBuffer buffer(n);
-            wxChar32 *p = buffer.data();
-            size_type i;
-            for (i = 0; i < n; i++)
-            {
-               *p = c;
-               p++;
-            }
-
-            std::basic_string<wxChar32> *base = this;
-            return (wxUString &) base->append(buffer.data());
-        }
-    #else
-        wxUString &append( size_type n, wxChar32 c )
-        {
-            std::basic_string<wxChar32> *base = this;
-            return (wxUString &) base->append( n, c );
-        }
-    #endif // __VISUALC6__
-
-    wxUString &append( wxChar32 c )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->append( 1, c );
-    }
-
-    // append [wx overload]
-
-    wxUString &append( const wxScopedU16CharBuffer &buf )
-    {
-        return append( buf.data() );
-    }
-
-    wxUString &append( const wxScopedU32CharBuffer &buf )
-    {
-        return append( buf.data() );
-    }
-
-    wxUString &append( const char *str )
-    {
-        return append( wxUString( str ) );
-    }
-
-    wxUString &append( const wxScopedCharBuffer &buf )
-    {
-        return append( wxUString( buf ) );
-    }
-
-    wxUString &append( const wxChar16 *str )
-    {
-        return append( wxUString( str ) );
-    }
-
-    wxUString &append( const wxString &str )
-    {
-        return append( wxUString( str ) );
-    }
-
-    wxUString &append( const wxCStrData *cstr )
-    {
-        return append( wxUString( cstr ) );
-    }
-
-    wxUString &append( char ch )
-    {
-        char buf[2];
-        buf[0] = ch;
-        buf[1] = 0;
-        return append( buf );
-    }
-
-    wxUString &append( wxChar16 ch )
-    {
-        wxChar16 buf[2];
-        buf[0] = ch;
-        buf[1] = 0;
-        return append( buf );
-    }
-
-    wxUString &append( wxUniChar ch )
-    {
-        return append( (size_type) 1, (wxChar32) ch.GetValue() );
-    }
-
-    wxUString &append( wxUniCharRef ch )
-    {
-        return append( (size_type) 1, (wxChar32) ch.GetValue() );
-    }
-
-
-    // insert [STL overloads]
-
-    wxUString &insert( size_type pos, const wxUString &s )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->insert( pos, s );
-    }
-
-    wxUString &insert( size_type pos, const wxUString &s, size_type pos1, size_type n )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->insert( pos, s, pos1, n );
-    }
-
-    wxUString &insert( size_type pos, const wxChar32 *s )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->insert( pos, s );
-    }
-
-    wxUString &insert( size_type pos, const wxChar32 *s, size_type n )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->insert( pos, s, n );
-    }
-
-    wxUString &insert( size_type pos, size_type n, wxChar32 c )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return (wxUString &) base->insert( pos, n, c );
-    }
-
-
-    // insert [STL overloads]
-
-    wxUString &insert( size_type n, const char *s )
-    {
-        return insert( n, wxUString( s ) );
-    }
-
-    wxUString &insert( size_type n, const wxChar16 *s )
-    {
-        return insert( n, wxUString( s ) );
-    }
-
-    wxUString &insert( size_type n, const wxScopedCharBuffer &buf )
-    {
-        return insert( n, wxUString( buf ) );
-    }
-
-    wxUString &insert( size_type n, const wxScopedU16CharBuffer &buf )
-    {
-        return insert( n, wxUString( buf ) );
-    }
-
-    wxUString &insert( size_type n, const wxScopedU32CharBuffer &buf )
-    {
-        return insert( n, buf.data() );
-    }
-
-    wxUString &insert( size_type n, const wxString &s )
-    {
-        return insert( n, wxUString( s ) );
-    }
-
-    wxUString &insert( size_type n, const wxCStrData *cstr )
-    {
-        return insert( n, wxUString( cstr ) );
-    }
-
-    wxUString &insert( size_type n, char ch )
-    {
-        char buf[2];
-        buf[0] = ch;
-        buf[1] = 0;
-        return insert( n, buf );
-    }
-
-    wxUString &insert( size_type n, wchar_t ch )
-    {
-        wchar_t buf[2];
-        buf[0] = ch;
-        buf[1] = 0;
-        return insert( n, buf );
-    }
-
-    // insert iterator
-
-    iterator insert( iterator it, wxChar32 ch )
-    {
-        std::basic_string<wxChar32> *base = this;
-        return base->insert( it, ch );
-    }
-
-    void insert(iterator it, const_iterator first, const_iterator last)
-    {
-        std::basic_string<wxChar32> *base = this;
-        base->insert( it, first, last );
-    }
-
-
-    // operator =
-    wxUString& operator=(const wxString& s)
-        { return assign( s ); }
-    wxUString& operator=(const wxCStrData* s)
-        { return assign( s ); }
-    wxUString& operator=(const char *s)
-        { return assign( s ); }
-    wxUString& operator=(const wxChar16 *s)
-        { return assign( s ); }
-    wxUString& operator=(const wxChar32 *s)
-        { return assign( s ); }
-    wxUString& operator=(const wxScopedCharBuffer &s)
-        { return assign( s ); }
-    wxUString& operator=(const wxScopedU16CharBuffer &s)
-        { return assign( s ); }
-    wxUString& operator=(const wxScopedU32CharBuffer &s)
-        { return assign( s ); }
-    wxUString& operator=(const char ch)
-        { return assign( ch ); }
-    wxUString& operator=(const wxChar16 ch)
-        { return assign( ch ); }
-    wxUString& operator=(const wxChar32 ch)
-        { return assign( ch ); }
-    wxUString& operator=(const wxUniChar ch)
-        { return assign( ch ); }
-    wxUString& operator=(const wxUniCharRef ch)
-        { return assign( ch ); }
-
-    // operator +=
-    wxUString& operator+=(const wxUString& s)
-        { return append( s ); }
-    wxUString& operator+=(const wxString& s)
-        { return append( s ); }
-    wxUString& operator+=(const wxCStrData* s)
-        { return append( s ); }
-    wxUString& operator+=(const char *s)
-        { return append( s ); }
-    wxUString& operator+=(const wxChar16 *s)
-        { return append( s ); }
-    wxUString& operator+=(const wxChar32 *s)
-        { return append( s ); }
-    wxUString& operator+=(const wxScopedCharBuffer &s)
-        { return append( s ); }
-    wxUString& operator+=(const wxScopedU16CharBuffer &s)
-        { return append( s ); }
-    wxUString& operator+=(const wxScopedU32CharBuffer &s)
-        { return append( s ); }
-    wxUString& operator+=(const char ch)
-        { return append( ch ); }
-    wxUString& operator+=(const wxChar16 ch)
-        { return append( ch ); }
-    wxUString& operator+=(const wxChar32 ch)
-        { return append( ch ); }
-    wxUString& operator+=(const wxUniChar ch)
-        { return append( ch ); }
-    wxUString& operator+=(const wxUniCharRef ch)
-        { return append( ch ); }
-
-};
-
-#ifdef __VISUALC__
-    #pragma warning(pop)
-#endif
-
-inline wxUString operator+(const wxUString &s1, const wxUString &s2)
-    { wxUString ret( s1 ); ret.append( s2 ); return ret; }
-inline wxUString operator+(const wxUString &s1, const char *s2)
-    { return s1 + wxUString(s2); }
-inline wxUString operator+(const wxUString &s1, const wxString &s2)
-    { return s1 + wxUString(s2); }
-inline wxUString operator+(const wxUString &s1, const wxCStrData *s2)
-    { return s1 + wxUString(s2); }
-inline wxUString operator+(const wxUString &s1, const wxChar16* s2)
-    { return s1 + wxUString(s2); }
-inline wxUString operator+(const wxUString &s1, const wxChar32 *s2)
-    { return s1 + wxUString(s2); }
-inline wxUString operator+(const wxUString &s1, const wxScopedCharBuffer &s2)
-    { return s1 + wxUString(s2); }
-inline wxUString operator+(const wxUString &s1, const wxScopedU16CharBuffer &s2)
-    { return s1 + wxUString(s2); }
-inline wxUString operator+(const wxUString &s1, const wxScopedU32CharBuffer &s2)
-    { return s1 + wxUString(s2); }
-inline wxUString operator+(const wxUString &s1, char s2)
-    { return s1 + wxUString(s2); }
-inline wxUString operator+(const wxUString &s1, wxChar32 s2)
-    { wxUString ret( s1 ); ret.append( s2 ); return ret; }
-inline wxUString operator+(const wxUString &s1, wxChar16 s2)
-    { wxUString ret( s1 ); ret.append( (wxChar32) s2 ); return ret; }
-inline wxUString operator+(const wxUString &s1, wxUniChar s2)
-    { wxUString ret( s1 ); ret.append( (wxChar32) s2.GetValue() ); return ret; }
-inline wxUString operator+(const wxUString &s1, wxUniCharRef s2)
-    { wxUString ret( s1 ); ret.append( (wxChar32) s2.GetValue() ); return ret; }
-
-inline wxUString operator+(const char *s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(const wxString &s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(const wxCStrData *s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(const wxChar16* s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(const wxChar32 *s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(const wxScopedCharBuffer &s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(const wxScopedU16CharBuffer &s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(const wxScopedU32CharBuffer &s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(char s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(wxChar32 s1, const wxUString &s2 )
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(wxChar16 s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(wxUniChar s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-inline wxUString operator+(wxUniCharRef s1, const wxUString &s2)
-    { return wxUString(s1) + s2; }
-
-
-inline bool operator==(const wxUString& s1, const wxUString& s2)
-    { return s1.compare( s2 ) == 0; }
-inline bool operator!=(const wxUString& s1, const wxUString& s2)
-    { return s1.compare( s2 ) != 0; }
-inline bool operator< (const wxUString& s1, const wxUString& s2)
-    { return s1.compare( s2 ) < 0; }
-inline bool operator> (const wxUString& s1, const wxUString& s2)
-    { return s1.compare( s2 ) > 0; }
-inline bool operator<=(const wxUString& s1, const wxUString& s2)
-    { return s1.compare( s2 ) <= 0; }
-inline bool operator>=(const wxUString& s1, const wxUString& s2)
-    { return s1.compare( s2 ) >= 0; }
-
-#define wxUSTRING_COMP_OPERATORS( T )                       \
-inline bool operator==(const wxUString& s1, T s2)           \
-    { return s1.compare( wxUString(s2) ) == 0; }            \
-inline bool operator!=(const wxUString& s1, T s2)           \
-    { return s1.compare( wxUString(s2) ) != 0; }            \
-inline bool operator< (const wxUString& s1, T s2)           \
-    { return s1.compare( wxUString(s2) ) < 0; }             \
-inline bool operator> (const wxUString& s1, T s2)           \
-    { return s1.compare( wxUString(s2) ) > 0; }             \
-inline bool operator<=(const wxUString& s1, T s2)           \
-    { return s1.compare( wxUString(s2) ) <= 0; }            \
-inline bool operator>=(const wxUString& s1, T s2)           \
-    { return s1.compare( wxUString(s2) ) >= 0; }            \
-\
-inline bool operator==(T s2, const wxUString& s1)           \
-    { return s1.compare( wxUString(s2) ) == 0; }            \
-inline bool operator!=(T s2, const wxUString& s1)           \
-    { return s1.compare( wxUString(s2) ) != 0; }            \
-inline bool operator< (T s2, const wxUString& s1)           \
-    { return s1.compare( wxUString(s2) ) > 0; }             \
-inline bool operator> (T s2, const wxUString& s1)           \
-    { return s1.compare( wxUString(s2) ) < 0; }             \
-inline bool operator<=(T s2, const wxUString& s1)           \
-    { return s1.compare( wxUString(s2) ) >= 0; }            \
-inline bool operator>=(T s2, const wxUString& s1)           \
-    { return s1.compare( wxUString(s2) ) <= 0; }
-
-wxUSTRING_COMP_OPERATORS( const wxString & )
-wxUSTRING_COMP_OPERATORS( const char * )
-wxUSTRING_COMP_OPERATORS( const wxChar16 * )
-wxUSTRING_COMP_OPERATORS( const wxChar32 * )
-wxUSTRING_COMP_OPERATORS( const wxScopedCharBuffer & )
-wxUSTRING_COMP_OPERATORS( const wxScopedU16CharBuffer & )
-wxUSTRING_COMP_OPERATORS( const wxScopedU32CharBuffer & )
-wxUSTRING_COMP_OPERATORS( const wxCStrData * )
-
-#endif // _WX_USTRING_H_
diff --git a/Source/3rd Party/wx/include/wx/utils.h b/Source/3rd Party/wx/include/wx/utils.h
index 132aa0274..3ceca747a 100644
--- a/Source/3rd Party/wx/include/wx/utils.h	
+++ b/Source/3rd Party/wx/include/wx/utils.h	
@@ -4,13 +4,12 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: utils.h 62544 2009-11-03 14:11:30Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UTILS_H_
-#define _WX_UTILS_H_
+#ifndef _WX_UTILSH__
+#define _WX_UTILSH__
 
 // ----------------------------------------------------------------------------
 // headers
@@ -19,13 +18,8 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/filefn.h"
-#include "wx/hashmap.h"
-#include "wx/versioninfo.h"
-#include "wx/meta/implicitconversion.h"
-
 #if wxUSE_GUI
     #include "wx/gdicmn.h"
-    #include "wx/mousestate.h"
 #endif
 
 class WXDLLIMPEXP_FWD_BASE wxArrayString;
@@ -35,7 +29,7 @@ class WXDLLIMPEXP_FWD_BASE wxArrayInt;
 // wxLongLong
 #include "wx/longlong.h"
 
-// needed for wxOperatingSystemId, wxLinuxDistributionInfo
+// need for wxOperatingSystemId
 #include "wx/platinfo.h"
 
 #ifdef __WATCOMC__
@@ -55,50 +49,14 @@ class WXDLLIMPEXP_FWD_BASE wxProcess;
 class WXDLLIMPEXP_FWD_CORE wxFrame;
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class WXDLLIMPEXP_FWD_CORE wxWindowList;
-class WXDLLIMPEXP_FWD_CORE wxEventLoop;
 
 // ----------------------------------------------------------------------------
-// Arithmetic functions
+// Macros
 // ----------------------------------------------------------------------------
 
-template<typename T1, typename T2>
-inline typename wxImplicitConversionType<T1,T2>::value
-wxMax(T1 a, T2 b)
-{
-    typedef typename wxImplicitConversionType<T1,T2>::value ResultType;
-
-    // Cast both operands to the same type before comparing them to avoid
-    // warnings about signed/unsigned comparisons from some compilers:
-    return static_cast<ResultType>(a) > static_cast<ResultType>(b) ? a : b;
-}
-
-template<typename T1, typename T2>
-inline typename wxImplicitConversionType<T1,T2>::value
-wxMin(T1 a, T2 b)
-{
-    typedef typename wxImplicitConversionType<T1,T2>::value ResultType;
-
-    return static_cast<ResultType>(a) < static_cast<ResultType>(b) ? a : b;
-}
-
-template<typename T1, typename T2, typename T3>
-inline typename wxImplicitConversionType3<T1,T2,T3>::value
-wxClip(T1 a, T2 b, T3 c)
-{
-    typedef typename wxImplicitConversionType3<T1,T2,T3>::value ResultType;
-
-    if ( static_cast<ResultType>(a) < static_cast<ResultType>(b) )
-        return b;
-
-    if ( static_cast<ResultType>(a) > static_cast<ResultType>(c) )
-        return c;
-
-    return a;
-}
-
-// ----------------------------------------------------------------------------
-// wxMemorySize
-// ----------------------------------------------------------------------------
+#define wxMax(a,b)            (((a) > (b)) ? (a) : (b))
+#define wxMin(a,b)            (((a) < (b)) ? (a) : (b))
+#define wxClip(a,b,c)         (((a) < (b)) ? (b) : (((a) > (c)) ? (c) : (a)))
 
 // wxGetFreeMemory can return huge amount of memory on 32-bit platforms as well
 // so to always use long long for its result type on all platforms which
@@ -113,38 +71,32 @@ wxClip(T1 a, T2 b, T3 c)
 // String functions (deprecated, use wxString)
 // ----------------------------------------------------------------------------
 
-#if WXWIN_COMPATIBILITY_2_8
+// Make a copy of this string using 'new'
+#if WXWIN_COMPATIBILITY_2_4
+wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* copystring(const wxChar *s) );
+#endif
+
 // A shorter way of using strcmp
-wxDEPRECATED_INLINE(inline bool wxStringEq(const char *s1, const char *s2),
-    return wxCRT_StrcmpA(s1, s2) == 0; )
-
-#if wxUSE_UNICODE
-wxDEPRECATED_INLINE(inline bool wxStringEq(const wchar_t *s1, const wchar_t *s2),
-    return wxCRT_StrcmpW(s1, s2) == 0; )
-#endif // wxUSE_UNICODE
-
-#endif // WXWIN_COMPATIBILITY_2_8
+#define wxStringEq(s1, s2) (s1 && s2 && (wxStrcmp(s1, s2) == 0))
 
 // ----------------------------------------------------------------------------
 // Miscellaneous functions
 // ----------------------------------------------------------------------------
 
 // Sound the bell
+#if !defined __EMX__ && \
+    (defined __WXMOTIF__ || defined __WXGTK__ || defined __WXX11__)
 WXDLLIMPEXP_CORE void wxBell();
-
-#if wxUSE_MSGDLG
-// Show wxWidgets information
-WXDLLIMPEXP_CORE void wxInfoMessageBox(wxWindow* parent);
-#endif // wxUSE_MSGDLG
-
-WXDLLIMPEXP_CORE wxVersionInfo wxGetLibraryVersionInfo();
+#else
+WXDLLIMPEXP_BASE void wxBell();
+#endif
 
 // Get OS description as a user-readable string
 WXDLLIMPEXP_BASE wxString wxGetOsDescription();
 
 // Get OS version
-WXDLLIMPEXP_BASE wxOperatingSystemId wxGetOsVersion(int *majorVsn = NULL,
-                                                    int *minorVsn = NULL);
+WXDLLIMPEXP_BASE wxOperatingSystemId wxGetOsVersion(int *majorVsn = (int *) NULL,
+                                                    int *minorVsn = (int *) NULL);
 
 // Get platform endianness
 WXDLLIMPEXP_BASE bool wxIsPlatformLittleEndian();
@@ -152,11 +104,6 @@ WXDLLIMPEXP_BASE bool wxIsPlatformLittleEndian();
 // Get platform architecture
 WXDLLIMPEXP_BASE bool wxIsPlatform64Bit();
 
-#ifdef __LINUX__
-// Get linux-distro informations
-WXDLLIMPEXP_BASE wxLinuxDistributionInfo wxGetLinuxDistributionInfo();
-#endif
-
 // Return a string with the current date/time
 WXDLLIMPEXP_BASE wxString wxNow();
 
@@ -165,27 +112,6 @@ WXDLLIMPEXP_BASE const wxChar *wxGetInstallPrefix();
 // Return path to wxWin data (/usr/share/wx/%{version}) (Unices)
 WXDLLIMPEXP_BASE wxString wxGetDataDir();
 
-#if wxUSE_GUI
-
-// Get the state of a key (true if pressed, false if not)
-// This is generally most useful getting the state of
-// the modifier or toggle keys.
-WXDLLIMPEXP_CORE bool wxGetKeyState(wxKeyCode key);
-
-// Don't synthesize KeyUp events holding down a key and producing
-// KeyDown events with autorepeat. On by default and always on
-// in wxMSW.
-WXDLLIMPEXP_CORE bool wxSetDetectableAutoRepeat( bool flag );
-
-// Returns the current state of the mouse position, buttons and modifers
-WXDLLIMPEXP_CORE wxMouseState wxGetMouseState();
-
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// wxPlatform
-// ----------------------------------------------------------------------------
-
 /*
  * Class to make it easier to specify platform-dependent values
  *
@@ -209,7 +135,7 @@ class WXDLLIMPEXP_BASE wxPlatform
 public:
     wxPlatform() { Init(); }
     wxPlatform(const wxPlatform& platform) { Copy(platform); }
-    void operator = (const wxPlatform& platform) { if (&platform != this) Copy(platform); }
+    void operator = (const wxPlatform& platform) { Copy(platform); }
     void Copy(const wxPlatform& platform);
 
     // Specify an optional default value
@@ -249,7 +175,8 @@ public:
     operator int() const { return (int) GetInteger(); }
     operator long() const { return GetInteger(); }
     operator double() const { return GetDouble(); }
-    operator const wxString&() const { return GetString(); }
+    operator const wxString() const { return GetString(); }
+    operator const wxChar*() const { return (const wxChar*) GetString(); }
 
     static void AddPlatform(int platform);
     static bool Is(int platform);
@@ -268,48 +195,130 @@ private:
 /// Function for testing current platform
 inline bool wxPlatformIs(int platform) { return wxPlatform::Is(platform); }
 
+#if wxUSE_GUI
+
+// Get the state of a key (true if pressed, false if not)
+// This is generally most useful getting the state of
+// the modifier or toggle keys.
+WXDLLEXPORT bool wxGetKeyState(wxKeyCode key);
+
+
+// Don't synthesize KeyUp events holding down a key and producing
+// KeyDown events with autorepeat. On by default and always on
+// in wxMSW.
+WXDLLEXPORT bool wxSetDetectableAutoRepeat( bool flag );
+
+
+// wxMouseState is used to hold information about button and modifier state
+// and is what is returned from wxGetMouseState.
+class WXDLLEXPORT wxMouseState
+{
+public:
+    wxMouseState()
+        : m_x(0), m_y(0),
+          m_leftDown(false), m_middleDown(false), m_rightDown(false),
+          m_controlDown(false), m_shiftDown(false), m_altDown(false),
+          m_metaDown(false)
+    {}
+
+    wxCoord     GetX() { return m_x; }
+    wxCoord     GetY() { return m_y; }
+
+    bool        LeftDown()    { return m_leftDown; }
+    bool        MiddleDown()  { return m_middleDown; }
+    bool        RightDown()   { return m_rightDown; }
+
+#if wxABI_VERSION >= 20811
+    bool        LeftIsDown()    { return m_leftDown; }
+    bool        MiddleIsDown()  { return m_middleDown; }
+    bool        RightIsDown()   { return m_rightDown; }
+#endif // wx >= 2.8.11
+
+    bool        ControlDown() { return m_controlDown; }
+    bool        ShiftDown()   { return m_shiftDown; }
+    bool        AltDown()     { return m_altDown; }
+    bool        MetaDown()    { return m_metaDown; }
+    bool        CmdDown()
+    {
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+        return MetaDown();
+#else
+        return ControlDown();
+#endif
+    }
+
+    void        SetX(wxCoord x) { m_x = x; }
+    void        SetY(wxCoord y) { m_y = y; }
+
+    void        SetLeftDown(bool down)   { m_leftDown = down; }
+    void        SetMiddleDown(bool down) { m_middleDown = down; }
+    void        SetRightDown(bool down)  { m_rightDown = down; }
+
+    void        SetControlDown(bool down) { m_controlDown = down; }
+    void        SetShiftDown(bool down)   { m_shiftDown = down; }
+    void        SetAltDown(bool down)     { m_altDown = down; }
+    void        SetMetaDown(bool down)    { m_metaDown = down; }
+
+private:
+    wxCoord     m_x;
+    wxCoord     m_y;
+
+    bool        m_leftDown : 1;
+    bool        m_middleDown : 1;
+    bool        m_rightDown : 1;
+
+    bool        m_controlDown : 1;
+    bool        m_shiftDown : 1;
+    bool        m_altDown : 1;
+    bool        m_metaDown : 1;
+};
+
+
+// Returns the current state of the mouse position, buttons and modifers
+WXDLLEXPORT wxMouseState wxGetMouseState();
+
+
 // ----------------------------------------------------------------------------
 // Window ID management
 // ----------------------------------------------------------------------------
 
+// Generate a unique ID
+WXDLLEXPORT long wxNewId();
+
 // Ensure subsequent IDs don't clash with this one
-WXDLLIMPEXP_BASE void wxRegisterId(long id);
+WXDLLEXPORT void wxRegisterId(long id);
 
 // Return the current ID
-WXDLLIMPEXP_BASE long wxGetCurrentId();
+WXDLLEXPORT long wxGetCurrentId();
 
-// Generate a unique ID
-WXDLLIMPEXP_BASE long wxNewId();
+#endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 // Various conversions
 // ----------------------------------------------------------------------------
 
+// these functions are deprecated, use wxString methods instead!
+#if WXWIN_COMPATIBILITY_2_4
+
+extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxFloatToStringStr;
+extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDoubleToStringStr;
+
+wxDEPRECATED( WXDLLIMPEXP_BASE void StringToFloat(const wxChar *s, float *number) );
+wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* FloatToString(float number, const wxChar *fmt = wxFloatToStringStr) );
+wxDEPRECATED( WXDLLIMPEXP_BASE void StringToDouble(const wxChar *s, double *number) );
+wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* DoubleToString(double number, const wxChar *fmt = wxDoubleToStringStr) );
+wxDEPRECATED( WXDLLIMPEXP_BASE void StringToInt(const wxChar *s, int *number) );
+wxDEPRECATED( WXDLLIMPEXP_BASE void StringToLong(const wxChar *s, long *number) );
+wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* IntToString(int number) );
+wxDEPRECATED( WXDLLIMPEXP_BASE wxChar* LongToString(long number) );
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
 // Convert 2-digit hex number to decimal
 WXDLLIMPEXP_BASE int wxHexToDec(const wxString& buf);
 
-// Convert 2-digit hex number to decimal
-inline int wxHexToDec(const char* buf)
-{
-    int firstDigit, secondDigit;
-
-    if (buf[0] >= 'A')
-        firstDigit = buf[0] - 'A' + 10;
-    else
-        firstDigit = buf[0] - '0';
-
-    if (buf[1] >= 'A')
-        secondDigit = buf[1] - 'A' + 10;
-    else
-        secondDigit = buf[1] - '0';
-
-    return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
-}
-
-
 // Convert decimal integer to 2-character hex string
 WXDLLIMPEXP_BASE void wxDecToHex(int dec, wxChar *buf);
-WXDLLIMPEXP_BASE void wxDecToHex(int dec, char* ch1, char* ch2);
 WXDLLIMPEXP_BASE wxString wxDecToHex(int dec);
 
 // ----------------------------------------------------------------------------
@@ -329,46 +338,16 @@ enum
 
     // under Windows, don't hide the child even if it's IO is redirected (this
     // is done by default)
-    wxEXEC_SHOW_CONSOLE   = 2,
-
-    // deprecated synonym for wxEXEC_SHOW_CONSOLE, use the new name as it's
-    // more clear
-    wxEXEC_NOHIDE = wxEXEC_SHOW_CONSOLE,
+    wxEXEC_NOHIDE   = 2,
 
     // under Unix, if the process is the group leader then passing wxKILL_CHILDREN to wxKill
     // kills all children as well as pid
-    // under Windows (NT family only), sets the CREATE_NEW_PROCESS_GROUP flag,
-    // which allows to target Ctrl-Break signal to the spawned process.
-    // applies to console processes only.
     wxEXEC_MAKE_GROUP_LEADER = 4,
 
     // by default synchronous execution disables all program windows to avoid
     // that the user interacts with the program while the child process is
     // running, you can use this flag to prevent this from happening
-    wxEXEC_NODISABLE = 8,
-
-    // by default, the event loop is run while waiting for synchronous execution
-    // to complete and this flag can be used to simply block the main process
-    // until the child process finishes
-    wxEXEC_NOEVENTS = 16,
-
-    // under Windows, hide the console of the child process if it has one, even
-    // if its IO is not redirected
-    wxEXEC_HIDE_CONSOLE = 32,
-
-    // convenient synonym for flags given system()-like behaviour
-    wxEXEC_BLOCK = wxEXEC_SYNC | wxEXEC_NOEVENTS
-};
-
-// Map storing environment variables.
-typedef wxStringToStringHashMap wxEnvVariableHashMap;
-
-// Used to pass additional parameters for child process to wxExecute(). Could
-// be extended with other fields later.
-struct wxExecuteEnv
-{
-    wxString cwd;               // If empty, CWD is not changed.
-    wxEnvVariableHashMap env;   // If empty, environment is unchanged.
+    wxEXEC_NODISABLE = 8
 };
 
 // Execute another program.
@@ -376,41 +355,29 @@ struct wxExecuteEnv
 // If flags contain wxEXEC_SYNC, return -1 on failure and the exit code of the
 // process if everything was ok. Otherwise (i.e. if wxEXEC_ASYNC), return 0 on
 // failure and the PID of the launched process if ok.
-WXDLLIMPEXP_BASE long wxExecute(const wxString& command,
-                                int flags = wxEXEC_ASYNC,
-                                wxProcess *process = NULL,
-                                const wxExecuteEnv *env = NULL);
-WXDLLIMPEXP_BASE long wxExecute(char **argv,
-                                int flags = wxEXEC_ASYNC,
-                                wxProcess *process = NULL,
-                                const wxExecuteEnv *env = NULL);
-#if wxUSE_UNICODE
-WXDLLIMPEXP_BASE long wxExecute(wchar_t **argv,
-                                int flags = wxEXEC_ASYNC,
-                                wxProcess *process = NULL,
-                                const wxExecuteEnv *env = NULL);
-#endif // wxUSE_UNICODE
+WXDLLIMPEXP_BASE long wxExecute(wxChar **argv, int flags = wxEXEC_ASYNC,
+                           wxProcess *process = (wxProcess *) NULL);
+WXDLLIMPEXP_BASE long wxExecute(const wxString& command, int flags = wxEXEC_ASYNC,
+                           wxProcess *process = (wxProcess *) NULL);
 
 // execute the command capturing its output into an array line by line, this is
 // always synchronous
 WXDLLIMPEXP_BASE long wxExecute(const wxString& command,
                                 wxArrayString& output,
-                                int flags = 0,
-                                const wxExecuteEnv *env = NULL);
+                                int flags = 0);
 
 // also capture stderr (also synchronous)
 WXDLLIMPEXP_BASE long wxExecute(const wxString& command,
                                 wxArrayString& output,
                                 wxArrayString& error,
-                                int flags = 0,
-                                const wxExecuteEnv *env = NULL);
+                                int flags = 0);
 
-#if defined(__WINDOWS__) && wxUSE_IPC
+#if defined(__WXMSW__) && wxUSE_IPC
 // ask a DDE server to execute the DDE request with given parameters
 WXDLLIMPEXP_BASE bool wxExecuteDDE(const wxString& ddeServer,
                                    const wxString& ddeTopic,
                                    const wxString& ddeCommand);
-#endif // __WINDOWS__ && wxUSE_IPC
+#endif // __WXMSW__ && wxUSE_IPC
 
 enum wxSignal
 {
@@ -452,14 +419,12 @@ enum wxKillFlags
 
 enum wxShutdownFlags
 {
-    wxSHUTDOWN_FORCE    = 1,// can be combined with other flags (MSW-only)
-    wxSHUTDOWN_POWEROFF = 2,// power off the computer
-    wxSHUTDOWN_REBOOT   = 4,// shutdown and reboot
-    wxSHUTDOWN_LOGOFF   = 8 // close session (currently MSW-only)
+    wxSHUTDOWN_POWEROFF,    // power off the computer
+    wxSHUTDOWN_REBOOT       // shutdown and reboot
 };
 
 // Shutdown or reboot the PC
-WXDLLIMPEXP_BASE bool wxShutdown(int flags = wxSHUTDOWN_POWEROFF);
+WXDLLIMPEXP_BASE bool wxShutdown(wxShutdownFlags wFlags);
 
 // send the given signal to the process (only NONE and KILL are supported under
 // Windows, all others mean TERM), return 0 if ok and -1 on error
@@ -487,10 +452,8 @@ WXDLLIMPEXP_BASE void wxMilliSleep(unsigned long milliseconds);
 // Sleep for a given amount of microseconds
 WXDLLIMPEXP_BASE void wxMicroSleep(unsigned long microseconds);
 
-#if WXWIN_COMPATIBILITY_2_8
 // Sleep for a given amount of milliseconds (old, bad name), use wxMilliSleep
 wxDEPRECATED( WXDLLIMPEXP_BASE void wxUsleep(unsigned long milliseconds) );
-#endif
 
 // Get the process id of the current process
 WXDLLIMPEXP_BASE unsigned long wxGetProcessId();
@@ -505,6 +468,15 @@ WXDLLIMPEXP_BASE bool wxHandleFatalExceptions(bool doit = true);
 
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
+// flags for wxLaunchDefaultBrowser
+enum
+{
+    wxBROWSER_NEW_WINDOW = 1
+};
+
+// Launch url in the user's default internet browser
+WXDLLIMPEXP_BASE bool wxLaunchDefaultBrowser(const wxString& url, int flags = 0);
+
 // ----------------------------------------------------------------------------
 // Environment variables
 // ----------------------------------------------------------------------------
@@ -514,37 +486,10 @@ WXDLLIMPEXP_BASE bool wxHandleFatalExceptions(bool doit = true);
 WXDLLIMPEXP_BASE bool wxGetEnv(const wxString& var, wxString *value);
 
 // set the env var name to the given value, return true on success
-WXDLLIMPEXP_BASE bool wxSetEnv(const wxString& var, const wxString& value);
+WXDLLIMPEXP_BASE bool wxSetEnv(const wxString& var, const wxChar *value);
 
 // remove the env var from environment
-WXDLLIMPEXP_BASE bool wxUnsetEnv(const wxString& var);
-
-#if WXWIN_COMPATIBILITY_2_8
-inline bool wxSetEnv(const wxString& var, const char *value)
-    { return wxSetEnv(var, wxString(value)); }
-inline bool wxSetEnv(const wxString& var, const wchar_t *value)
-    { return wxSetEnv(var, wxString(value)); }
-template<typename T>
-inline bool wxSetEnv(const wxString& var, const wxScopedCharTypeBuffer<T>& value)
-    { return wxSetEnv(var, wxString(value)); }
-inline bool wxSetEnv(const wxString& var, const wxCStrData& value)
-    { return wxSetEnv(var, wxString(value)); }
-
-// this one is for passing NULL directly - don't use it, use wxUnsetEnv instead
-wxDEPRECATED( inline bool wxSetEnv(const wxString& var, int value) );
-inline bool wxSetEnv(const wxString& var, int value)
-{
-    wxASSERT_MSG( value == 0, "using non-NULL integer as string?" );
-
-    wxUnusedVar(value); // fix unused parameter warning in release build
-
-    return wxUnsetEnv(var);
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-// Retrieve the complete environment by filling specified map.
-// Returns true on success or false if an error occurred.
-WXDLLIMPEXP_BASE bool wxGetEnvMap(wxEnvVariableHashMap *map);
+inline bool wxUnsetEnv(const wxString& var) { return wxSetEnv(var, NULL); }
 
 // ----------------------------------------------------------------------------
 // Network and username functions.
@@ -576,10 +521,13 @@ WXDLLIMPEXP_BASE wxString wxGetUserName();
 WXDLLIMPEXP_BASE wxString wxGetHomeDir();
 WXDLLIMPEXP_BASE const wxChar* wxGetHomeDir(wxString *pstr);
 
-// Get the user's (by default use the current user name) home dir,
-// return empty string on error
-WXDLLIMPEXP_BASE wxString wxGetUserHome(const wxString& user = wxEmptyString);
-
+// Get the user's home dir (caller must copy --- volatile)
+// returns NULL is no HOME dir is known
+#if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WINE__)
+WXDLLIMPEXP_BASE const wxMB2WXbuf wxGetUserHome(const wxString& user = wxEmptyString);
+#else
+WXDLLIMPEXP_BASE wxChar* wxGetUserHome(const wxString& user = wxEmptyString);
+#endif
 
 #if wxUSE_LONGLONG
     typedef wxLongLong wxDiskspaceSize_t;
@@ -592,37 +540,8 @@ WXDLLIMPEXP_BASE bool wxGetDiskSpace(const wxString& path,
                                      wxDiskspaceSize_t *pTotal = NULL,
                                      wxDiskspaceSize_t *pFree = NULL);
 
-
-
-typedef int (*wxSortCallback)(const void* pItem1,
-                              const void* pItem2,
-                              const void* user_data);
-
-
-WXDLLIMPEXP_BASE void wxQsort(void* pbase, size_t total_elems,
-                              size_t size, wxSortCallback cmp,
-                              const void* user_data);
-
-
 #if wxUSE_GUI // GUI only things from now on
 
-// ----------------------------------------------------------------------------
-// Launch default browser
-// ----------------------------------------------------------------------------
-
-// flags for wxLaunchDefaultBrowser
-enum
-{
-    wxBROWSER_NEW_WINDOW   = 0x01,
-    wxBROWSER_NOBUSYCURSOR = 0x02
-};
-
-// Launch url in the user's default internet browser
-WXDLLIMPEXP_CORE bool wxLaunchDefaultBrowser(const wxString& url, int flags = 0);
-
-// Launch document in the user's default application
-WXDLLIMPEXP_CORE bool wxLaunchDefaultApplication(const wxString& path, int flags = 0);
-
 // ----------------------------------------------------------------------------
 // Menu accelerators related things
 // ----------------------------------------------------------------------------
@@ -641,13 +560,13 @@ enum
 };
 
 // strip mnemonics and/or accelerators from the label
-WXDLLIMPEXP_CORE wxString
+WXDLLEXPORT wxString
 wxStripMenuCodes(const wxString& str, int flags = wxStrip_All);
 
 #if WXWIN_COMPATIBILITY_2_6
 // obsolete and deprecated version, do not use, use the above overload instead
 wxDEPRECATED(
-    WXDLLIMPEXP_CORE wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = NULL)
+    WXDLLEXPORT wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = NULL)
 );
 
 #if wxUSE_ACCEL
@@ -655,7 +574,7 @@ class WXDLLIMPEXP_FWD_CORE wxAcceleratorEntry;
 
 // use wxAcceleratorEntry::Create() or FromString() methods instead
 wxDEPRECATED(
-    WXDLLIMPEXP_CORE wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
+    WXDLLEXPORT wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
 );
 #endif // wxUSE_ACCEL
 
@@ -666,68 +585,54 @@ wxDEPRECATED(
 // ----------------------------------------------------------------------------
 
 // Returns menu item id or wxNOT_FOUND if none.
-WXDLLIMPEXP_CORE int wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString);
+WXDLLEXPORT int wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString);
 
 // Find the wxWindow at the given point. wxGenericFindWindowAtPoint
 // is always present but may be less reliable than a native version.
-WXDLLIMPEXP_CORE wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt);
-WXDLLIMPEXP_CORE wxWindow* wxFindWindowAtPoint(const wxPoint& pt);
+WXDLLEXPORT wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt);
+WXDLLEXPORT wxWindow* wxFindWindowAtPoint(const wxPoint& pt);
 
 // NB: this function is obsolete, use wxWindow::FindWindowByLabel() instead
 //
 // Find the window/widget with the given title or label.
 // Pass a parent to begin the search from, or NULL to look through
 // all windows.
-WXDLLIMPEXP_CORE wxWindow* wxFindWindowByLabel(const wxString& title, wxWindow *parent = NULL);
+WXDLLEXPORT wxWindow* wxFindWindowByLabel(const wxString& title, wxWindow *parent = (wxWindow *) NULL);
 
 // NB: this function is obsolete, use wxWindow::FindWindowByName() instead
 //
 // Find window by name, and if that fails, by label.
-WXDLLIMPEXP_CORE wxWindow* wxFindWindowByName(const wxString& name, wxWindow *parent = NULL);
+WXDLLEXPORT wxWindow* wxFindWindowByName(const wxString& name, wxWindow *parent = (wxWindow *) NULL);
 
 // ----------------------------------------------------------------------------
 // Message/event queue helpers
 // ----------------------------------------------------------------------------
 
 // Yield to other apps/messages and disable user input
-WXDLLIMPEXP_CORE bool wxSafeYield(wxWindow *win = NULL, bool onlyIfNeeded = false);
+WXDLLEXPORT bool wxSafeYield(wxWindow *win = NULL, bool onlyIfNeeded = false);
 
 // Enable or disable input to all top level windows
-WXDLLIMPEXP_CORE void wxEnableTopLevelWindows(bool enable = true);
+WXDLLEXPORT void wxEnableTopLevelWindows(bool enable = true);
 
 // Check whether this window wants to process messages, e.g. Stop button
 // in long calculations.
-WXDLLIMPEXP_CORE bool wxCheckForInterrupt(wxWindow *wnd);
+WXDLLEXPORT bool wxCheckForInterrupt(wxWindow *wnd);
 
 // Consume all events until no more left
-WXDLLIMPEXP_CORE void wxFlushEvents();
+WXDLLEXPORT void wxFlushEvents();
 
-// a class which disables all windows (except, may be, the given one) in its
+// a class which disables all windows (except, may be, thegiven one) in its
 // ctor and enables them back in its dtor
-class WXDLLIMPEXP_CORE wxWindowDisabler
+class WXDLLEXPORT wxWindowDisabler
 {
 public:
-    // this ctor conditionally disables all windows: if the argument is false,
-    // it doesn't do anything
-    wxWindowDisabler(bool disable = true);
-
-    // ctor disables all windows except winToSkip
-    wxWindowDisabler(wxWindow *winToSkip);
-
-    // dtor enables back all windows disabled by the ctor
+    wxWindowDisabler(wxWindow *winToSkip = (wxWindow *)NULL);
     ~wxWindowDisabler();
 
 private:
-    // disable all windows except the given one (used by both ctors)
-    void DoDisable(wxWindow *winToSkip = NULL);
-
-#if defined(__WXOSX__) && wxOSX_USE_COCOA
-    wxEventLoop* m_modalEventLoop;
-#endif
     wxWindowList *m_winDisabled;
-    bool m_disabled;
 
-    wxDECLARE_NO_COPY_CLASS(wxWindowDisabler);
+    DECLARE_NO_COPY_CLASS(wxWindowDisabler)
 };
 
 // ----------------------------------------------------------------------------
@@ -738,13 +643,13 @@ private:
 WXDLLIMPEXP_CORE void wxBeginBusyCursor(const wxCursor *cursor = wxHOURGLASS_CURSOR);
 
 // Restore cursor to normal
-WXDLLIMPEXP_CORE void wxEndBusyCursor();
+WXDLLEXPORT void wxEndBusyCursor();
 
 // true if we're between the above two calls
-WXDLLIMPEXP_CORE bool wxIsBusy();
+WXDLLEXPORT bool wxIsBusy();
 
 // Convenience class so we can just create a wxBusyCursor object on the stack
-class WXDLLIMPEXP_CORE wxBusyCursor
+class WXDLLEXPORT wxBusyCursor
 {
 public:
     wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR)
@@ -761,16 +666,38 @@ public:
     static const wxCursor GetBusyCursor();
 };
 
-void WXDLLIMPEXP_CORE wxGetMousePosition( int* x, int* y );
 
 // ----------------------------------------------------------------------------
-// X11 Display access
+// Reading and writing resources (eg WIN.INI, .Xdefaults)
 // ----------------------------------------------------------------------------
 
-#if defined(__X__) || defined(__WXGTK__)
+#if wxUSE_RESOURCES
+WXDLLEXPORT bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = wxEmptyString);
+WXDLLEXPORT bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file = wxEmptyString);
+WXDLLEXPORT bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file = wxEmptyString);
+WXDLLEXPORT bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file = wxEmptyString);
+
+WXDLLEXPORT bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file = wxEmptyString);
+WXDLLEXPORT bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file = wxEmptyString);
+WXDLLEXPORT bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file = wxEmptyString);
+WXDLLEXPORT bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file = wxEmptyString);
+#endif // wxUSE_RESOURCES
+
+void WXDLLEXPORT wxGetMousePosition( int* x, int* y );
+
+// MSW only: get user-defined resource from the .res file.
+// Returns NULL or newly-allocated memory, so use delete[] to clean up.
+#ifdef __WXMSW__
+    extern WXDLLEXPORT const wxChar* wxUserResourceStr;
+    WXDLLEXPORT wxChar* wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr);
+#endif // MSW
+
+// ----------------------------------------------------------------------------
+// Display and colorss (X only)
+// ----------------------------------------------------------------------------
 
 #ifdef __WXGTK__
-    WXDLLIMPEXP_CORE void *wxGetDisplay();
+    void *wxGetDisplay();
 #endif
 
 #ifdef __X__
@@ -779,13 +706,18 @@ void WXDLLIMPEXP_CORE wxGetMousePosition( int* x, int* y );
     WXDLLIMPEXP_CORE wxString wxGetDisplayName();
 #endif // X or GTK+
 
-// use this function instead of the functions above in implementation code
-inline struct _XDisplay *wxGetX11Display()
-{
-    return (_XDisplay *)wxGetDisplay();
-}
+#ifdef __X__
 
-#endif // X11 || wxGTK
+#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
+               // The resulting warnings are switched off here
+#pragma message disable nosimpint
+#endif
+// #include <X11/Xlib.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+
+#endif //__X__
 
 #endif // wxUSE_GUI
 
@@ -799,46 +731,16 @@ inline struct _XDisplay *wxGetX11Display()
 #define wx_YIELD_DECLARED
 
 // Yield to other apps/messages
-WXDLLIMPEXP_CORE bool wxYield();
+WXDLLIMPEXP_BASE bool wxYield();
 
 #endif // wx_YIELD_DECLARED
 
 // Like wxYield, but fails silently if the yield is recursive.
-WXDLLIMPEXP_CORE bool wxYieldIfNeeded();
+WXDLLIMPEXP_BASE bool wxYieldIfNeeded();
 
 // ----------------------------------------------------------------------------
-// Windows resources access
+// Error message functions used by wxWidgets (deprecated, use wxLog)
 // ----------------------------------------------------------------------------
 
-// Windows only: get user-defined resource from the .res file.
-#ifdef __WINDOWS__
-    // default resource type for wxLoadUserResource()
-    extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxUserResourceStr;
-
-    // Return the pointer to the resource data. This pointer is read-only, use
-    // the overload below if you need to modify the data.
-    //
-    // Returns true on success, false on failure. Doesn't log an error message
-    // if the resource is not found (because this could be expected) but does
-    // log one if any other error occurs.
-    WXDLLIMPEXP_BASE bool
-    wxLoadUserResource(const void **outData,
-                       size_t *outLen,
-                       const wxString& resourceName,
-                       const wxString& resourceType = wxUserResourceStr,
-                       WXHINSTANCE module = 0);
-
-    // This function allocates a new buffer and makes a copy of the resource
-    // data, remember to delete[] the buffer. And avoid using it entirely if
-    // the overload above can be used.
-    //
-    // Returns NULL on failure.
-    WXDLLIMPEXP_BASE char*
-    wxLoadUserResource(const wxString& resourceName,
-                       const wxString& resourceType = wxUserResourceStr,
-                       int* pLen = NULL,
-                       WXHINSTANCE module = 0);
-#endif // __WINDOWS__
-
 #endif
     // _WX_UTILSH__
diff --git a/Source/3rd Party/wx/include/wx/valgen.h b/Source/3rd Party/wx/include/wx/valgen.h
index ac6c93942..fd39c7e7d 100644
--- a/Source/3rd Party/wx/include/wx/valgen.h	
+++ b/Source/3rd Party/wx/include/wx/valgen.h	
@@ -1,9 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/valgen.h
+// Name:        valgen.h
 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
+// Modified by:
 // Created:     Jan 22 1999
-// RCS-ID:      $Id$
+// RCS-ID:
 // Copyright:   (c) 1999 Julian Smart (assigned from Kevin)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,81 +16,54 @@
 
 #if wxUSE_VALIDATORS
 
-class WXDLLIMPEXP_FWD_BASE wxDateTime;
-class WXDLLIMPEXP_FWD_BASE wxFileName;
-
-// ----------------------------------------------------------------------------
-// wxGenericValidator performs data transfer between many standard controls and
-// variables of the type corresponding to their values.
-//
-// It doesn't do any validation so its name is a slight misnomer.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGenericValidator: public wxValidator
+class WXDLLEXPORT wxGenericValidator: public wxValidator
 {
+DECLARE_CLASS(wxGenericValidator)
 public:
-    // Different constructors: each of them creates a validator which can only
-    // be used with some controls, the comments before each constructor
-    // indicate which ones:
-        // wxCheckBox, wxRadioButton, wx(Bitmap)ToggleButton
-    wxGenericValidator(bool* val);
-        // wxChoice, wxGauge, wxRadioBox, wxScrollBar, wxSlider, wxSpinButton
-    wxGenericValidator(int* val);
-        // wxComboBox, wxTextCtrl, wxButton, wxStaticText (read-only)
-    wxGenericValidator(wxString* val);
-        // wxListBox, wxCheckListBox
-    wxGenericValidator(wxArrayInt* val);
-#if wxUSE_DATETIME
-        // wxDatePickerCtrl
-    wxGenericValidator(wxDateTime* val);
-#endif // wxUSE_DATETIME
-        // wxTextCtrl
-    wxGenericValidator(wxFileName* val);
-        // wxTextCtrl
-    wxGenericValidator(float* val);
-        // wxTextCtrl
-    wxGenericValidator(double* val);
+  wxGenericValidator(bool* val);
+  wxGenericValidator(int* val);
+  wxGenericValidator(wxString* val);
+  wxGenericValidator(wxArrayInt* val);
+  wxGenericValidator(const wxGenericValidator& copyFrom);
 
-    wxGenericValidator(const wxGenericValidator& copyFrom);
+  virtual ~wxGenericValidator(){}
 
-    virtual ~wxGenericValidator(){}
+  // Make a clone of this validator (or return NULL) - currently necessary
+  // if you're passing a reference to a validator.
+  // Another possibility is to always pass a pointer to a new validator
+  // (so the calling code can use a copy constructor of the relevant class).
+  virtual wxObject *Clone() const { return new wxGenericValidator(*this); }
+  bool Copy(const wxGenericValidator& val);
 
-    // Make a clone of this validator (or return NULL) - currently necessary
-    // if you're passing a reference to a validator.
-    // Another possibility is to always pass a pointer to a new validator
-    // (so the calling code can use a copy constructor of the relevant class).
-    virtual wxObject *Clone() const { return new wxGenericValidator(*this); }
-    bool Copy(const wxGenericValidator& val);
+  // Called when the value in the window must be validated.
+  // This function can pop up an error message.
+  virtual bool Validate(wxWindow * WXUNUSED(parent)) { return true; }
 
-    // Called when the value in the window must be validated: this is not used
-    // by this class
-    virtual bool Validate(wxWindow * WXUNUSED(parent)) { return true; }
+  // Called to transfer data to the window
+  virtual bool TransferToWindow();
 
-    // Called to transfer data to the window
-    virtual bool TransferToWindow();
-
-    // Called to transfer data to the window
-    virtual bool TransferFromWindow();
+  // Called to transfer data to the window
+  virtual bool TransferFromWindow();
 
 protected:
-    void Initialize();
+  void Initialize();
 
-    bool*       m_pBool;
-    int*        m_pInt;
-    wxString*   m_pString;
-    wxArrayInt* m_pArrayInt;
-#if wxUSE_DATETIME
-    wxDateTime* m_pDateTime;
-#endif // wxUSE_DATETIME
-    wxFileName* m_pFileName;
-    float*      m_pFloat;
-    double*     m_pDouble;
+  bool*       m_pBool;
+  int*        m_pInt;
+  wxString*   m_pString;
+  wxArrayInt* m_pArrayInt;
 
 private:
-    DECLARE_CLASS(wxGenericValidator)
-    wxDECLARE_NO_ASSIGN_CLASS(wxGenericValidator);
+// Cannot use
+//  DECLARE_NO_COPY_CLASS(wxGenericValidator)
+// because copy constructor is explicitly declared above;
+// but no copy assignment operator is defined, so declare
+// it private to prevent the compiler from defining it:
+    wxGenericValidator& operator=(const wxGenericValidator&);
 };
 
-#endif // wxUSE_VALIDATORS
+#endif
+  // wxUSE_VALIDATORS
 
-#endif // _WX_VALGENH__
+#endif
+  // _WX_VALGENH__
diff --git a/Source/3rd Party/wx/include/wx/validate.h b/Source/3rd Party/wx/include/wx/validate.h
index 1dcca1966..ea8c80897 100644
--- a/Source/3rd Party/wx/include/wx/validate.h	
+++ b/Source/3rd Party/wx/include/wx/validate.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: validate.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxWindowBase;
  Note that wxValidator and derived classes use reference counting.
 */
 
-class WXDLLIMPEXP_CORE wxValidator : public wxEvtHandler
+class WXDLLEXPORT wxValidator : public wxEvtHandler
 {
 public:
     wxValidator();
@@ -44,7 +44,7 @@ public:
     // Another possibility is to always pass a pointer to a new validator
     // (so the calling code can use a copy constructor of the relevant class).
     virtual wxObject *Clone() const
-        { return NULL; }
+        { return (wxValidator *)NULL; }
     bool Copy(const wxValidator& val)
         { m_validatorWindow = val.m_validatorWindow; return true; }
 
@@ -62,23 +62,10 @@ public:
     wxWindow *GetWindow() const { return (wxWindow *)m_validatorWindow; }
     void SetWindow(wxWindowBase *win) { m_validatorWindow = win; }
 
-    // validators beep by default if invalid key is pressed, this function
-    // allows to change this
-    static void SuppressBellOnError(bool suppress = true)
-        { ms_isSilent = suppress; }
-
-    // test if beep is currently disabled
+    // validators beep by default if invalid key is pressed, these functions
+    // allow to change it
     static bool IsSilent() { return ms_isSilent; }
-
-    // this function is deprecated because it handled its parameter
-    // unnaturally: it disabled the bell when it was true, not false as could
-    // be expected; use SuppressBellOnError() instead
-#if WXWIN_COMPATIBILITY_2_8
-    static wxDEPRECATED_INLINE(
-        void SetBellOnError(bool doIt = true),
-        ms_isSilent = doIt;
-    )
-#endif
+    static void SetBellOnError(bool doIt = true) { ms_isSilent = doIt; }
 
 protected:
     wxWindowBase *m_validatorWindow;
@@ -87,10 +74,10 @@ private:
     static bool ms_isSilent;
 
     DECLARE_DYNAMIC_CLASS(wxValidator)
-    wxDECLARE_NO_COPY_CLASS(wxValidator);
+    DECLARE_NO_COPY_CLASS(wxValidator)
 };
 
-extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
+extern WXDLLEXPORT_DATA(const wxValidator) wxDefaultValidator;
 
 #define wxVALIDATOR_PARAM(val) val
 
@@ -99,8 +86,8 @@ extern WXDLLIMPEXP_DATA_CORE(const wxValidator) wxDefaultValidator;
     // want to be able to pass wxDefaultValidator to the functions which take
     // a wxValidator parameter to avoid using "#if wxUSE_VALIDATORS"
     // everywhere
-    class WXDLLIMPEXP_FWD_CORE wxValidator;
-    #define wxDefaultValidator (*reinterpret_cast<wxValidator*>(NULL))
+    class WXDLLEXPORT wxValidator;
+    #define wxDefaultValidator (*((wxValidator *)NULL))
 
     // this macro allows to avoid warnings about unused parameters when
     // wxUSE_VALIDATORS == 0
diff --git a/Source/3rd Party/wx/include/wx/valnum.h b/Source/3rd Party/wx/include/wx/valnum.h
deleted file mode 100644
index 4f7642dbf..000000000
--- a/Source/3rd Party/wx/include/wx/valnum.h	
+++ /dev/null
@@ -1,463 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/valnum.h
-// Purpose:     Numeric validator classes.
-// Author:      Vadim Zeitlin based on the submission of Fulvio Senore
-// Created:     2010-11-06
-// Copyright:   (c) 2010 wxWidgets team
-//              (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_VALNUM_H_
-#define _WX_VALNUM_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_VALIDATORS
-
-#include "wx/validate.h"
-
-#include <limits>
-
-// Bit masks used for numeric validator styles.
-enum wxNumValidatorStyle
-{
-    wxNUM_VAL_DEFAULT               = 0x0,
-    wxNUM_VAL_THOUSANDS_SEPARATOR   = 0x1,
-    wxNUM_VAL_ZERO_AS_BLANK         = 0x2,
-    wxNUM_VAL_NO_TRAILING_ZEROES    = 0x4
-};
-
-// ----------------------------------------------------------------------------
-// Base class for all numeric validators.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNumValidatorBase : public wxValidator
-{
-public:
-    // Change the validator style. Usually it's specified during construction.
-    void SetStyle(int style) { m_style = style; }
-
-
-    // Override base class method to not do anything but always return success:
-    // we don't need this as we do our validation on the fly here.
-    virtual bool Validate(wxWindow * WXUNUSED(parent)) { return true; }
-
-protected:
-    wxNumValidatorBase(int style)
-    {
-        m_style = style;
-    }
-
-    wxNumValidatorBase(const wxNumValidatorBase& other) : wxValidator()
-    {
-        m_style = other.m_style;
-    }
-
-    bool HasFlag(wxNumValidatorStyle style) const
-    {
-        return (m_style & style) != 0;
-    }
-
-    // Get the text entry of the associated control. Normally shouldn't ever
-    // return NULL (and will assert if it does return it) but the caller should
-    // still test the return value for safety.
-    wxTextEntry *GetTextEntry() const;
-
-    // Convert wxNUM_VAL_THOUSANDS_SEPARATOR and wxNUM_VAL_NO_TRAILING_ZEROES
-    // bits of our style to the corresponding wxNumberFormatter::Style values.
-    int GetFormatFlags() const;
-
-    // Return true if pressing a '-' key is acceptable for the current control
-    // contents and insertion point. This is meant to be called from the
-    // derived class IsCharOk() implementation.
-    bool IsMinusOk(const wxString& val, int pos) const;
-
-    // Return the string which would result from inserting the given character
-    // at the specified position.
-    wxString GetValueAfterInsertingChar(wxString val, int pos, wxChar ch) const
-    {
-        val.insert(pos, ch);
-        return val;
-    }
-
-private:
-    // Check whether the specified character can be inserted in the control at
-    // the given position in the string representing the current controls
-    // contents.
-    //
-    // Notice that the base class checks for '-' itself so it's never passed to
-    // this function.
-    virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const = 0;
-
-    // NormalizeString the contents of the string if it's a valid number, return
-    // empty string otherwise.
-    virtual wxString NormalizeString(const wxString& s) const = 0;
-
-
-    // Event handlers.
-    void OnChar(wxKeyEvent& event);
-    void OnKillFocus(wxFocusEvent& event);
-
-
-    // Determine the current insertion point and text in the associated control.
-    void GetCurrentValueAndInsertionPoint(wxString& val, int& pos) const;
-
-
-    // Combination of wxVAL_NUM_XXX values.
-    int m_style;
-
-
-    wxDECLARE_EVENT_TABLE();
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxNumValidatorBase);
-};
-
-namespace wxPrivate
-{
-
-// This is a helper class used by wxIntegerValidator and wxFloatingPointValidator
-// below that implements Transfer{To,From}Window() adapted to the type of the
-// variable.
-//
-// The template argument B is the name of the base class which must derive from
-// wxNumValidatorBase and define LongestValueType type and {To,As}String()
-// methods i.e. basically be one of wx{Integer,Number}ValidatorBase classes.
-//
-// The template argument T is just the type handled by the validator that will
-// inherit from this one.
-template <class B, typename T>
-class wxNumValidator : public B
-{
-public:
-    typedef B BaseValidator;
-    typedef T ValueType;
-
-    typedef typename BaseValidator::LongestValueType LongestValueType;
-
-    // FIXME-VC6: This compiler fails to compile the assert below with a
-    // nonsensical error C2248: "'LongestValueType' : cannot access protected
-    // typedef declared in class 'wxIntegerValidatorBase'" so just disable the
-    // check for it.
-#ifndef __VISUALC6__
-    wxCOMPILE_TIME_ASSERT
-    (
-        sizeof(ValueType) <= sizeof(LongestValueType),
-        UnsupportedType
-    );
-#endif // __VISUALC6__
-
-    void SetMin(ValueType min)
-    {
-        this->DoSetMin(min);
-    }
-
-    void SetMax(ValueType max)
-    {
-        this->DoSetMax(max);
-    }
-
-    void SetRange(ValueType min, ValueType max)
-    {
-        SetMin(min);
-        SetMax(max);
-    }
-
-    virtual bool TransferToWindow()
-    {
-        if ( m_value )
-        {
-            wxTextEntry * const control = BaseValidator::GetTextEntry();
-            if ( !control )
-                return false;
-
-            control->SetValue(NormalizeValue(*m_value));
-        }
-
-        return true;
-    }
-
-    virtual bool TransferFromWindow()
-    {
-        if ( m_value )
-        {
-            wxTextEntry * const control = BaseValidator::GetTextEntry();
-            if ( !control )
-                return false;
-
-            const wxString s(control->GetValue());
-            LongestValueType value;
-            if ( s.empty() && BaseValidator::HasFlag(wxNUM_VAL_ZERO_AS_BLANK) )
-                value = 0;
-            else if ( !BaseValidator::FromString(s, &value) )
-                return false;
-
-            if ( !this->IsInRange(value) )
-                return false;
-
-            *m_value = static_cast<ValueType>(value);
-        }
-
-        return true;
-    }
-
-protected:
-    wxNumValidator(ValueType *value, int style)
-        : BaseValidator(style),
-          m_value(value)
-    {
-    }
-
-    // Implement wxNumValidatorBase virtual method which is the same for
-    // both integer and floating point numbers.
-    virtual wxString NormalizeString(const wxString& s) const
-    {
-        LongestValueType value;
-        return BaseValidator::FromString(s, &value) ? NormalizeValue(value)
-                                                    : wxString();
-    }
-
-private:
-    // Just a helper which is a common part of TransferToWindow() and
-    // NormalizeString(): returns string representation of a number honouring
-    // wxNUM_VAL_ZERO_AS_BLANK flag.
-    wxString NormalizeValue(LongestValueType value) const
-    {
-        wxString s;
-        if ( value != 0 || !BaseValidator::HasFlag(wxNUM_VAL_ZERO_AS_BLANK) )
-            s = this->ToString(value);
-
-        return s;
-    }
-
-
-    ValueType * const m_value;
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxNumValidator);
-};
-
-} // namespace wxPrivate
-
-// ----------------------------------------------------------------------------
-// Validators for integer numbers.
-// ----------------------------------------------------------------------------
-
-// Base class for integer numbers validator. This class contains all non
-// type-dependent code of wxIntegerValidator<> and always works with values of
-// type LongestValueType. It is not meant to be used directly, please use
-// wxIntegerValidator<> only instead.
-class WXDLLIMPEXP_CORE wxIntegerValidatorBase : public wxNumValidatorBase
-{
-protected:
-    // Define the type we use here, it should be the maximal-sized integer type
-    // we support to make it possible to base wxIntegerValidator<> for any type
-    // on it.
-#ifdef wxLongLong_t
-    typedef wxLongLong_t LongestValueType;
-#else
-    typedef long LongestValueType;
-#endif
-
-    wxIntegerValidatorBase(int style)
-        : wxNumValidatorBase(style)
-    {
-        wxASSERT_MSG( !(style & wxNUM_VAL_NO_TRAILING_ZEROES),
-                      "This style doesn't make sense for integers." );
-    }
-
-    wxIntegerValidatorBase(const wxIntegerValidatorBase& other)
-        : wxNumValidatorBase(other)
-    {
-        m_min = other.m_min;
-        m_max = other.m_max;
-    }
-
-    // Provide methods for wxNumValidator use.
-    wxString ToString(LongestValueType value) const;
-    static bool FromString(const wxString& s, LongestValueType *value);
-
-    void DoSetMin(LongestValueType min) { m_min = min; }
-    void DoSetMax(LongestValueType max) { m_max = max; }
-
-    bool IsInRange(LongestValueType value) const
-    {
-        return m_min <= value && value <= m_max;
-    }
-
-    // Implement wxNumValidatorBase pure virtual method.
-    virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const;
-
-private:
-    // Minimal and maximal values accepted (inclusive).
-    LongestValueType m_min, m_max;
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxIntegerValidatorBase);
-};
-
-// Validator for integer numbers. It can actually work with any integer type
-// (short, int or long and long long if supported) and their unsigned versions
-// as well.
-template <typename T>
-class wxIntegerValidator
-    : public wxPrivate::wxNumValidator<wxIntegerValidatorBase, T>
-{
-public:
-    typedef T ValueType;
-
-    typedef
-        wxPrivate::wxNumValidator<wxIntegerValidatorBase, T> Base;
-
-    // Ctor for an integer validator.
-    //
-    // Sets the range appropriately for the type, including setting 0 as the
-    // minimal value for the unsigned types.
-    wxIntegerValidator(ValueType *value = NULL, int style = wxNUM_VAL_DEFAULT)
-        : Base(value, style)
-    {
-        this->DoSetMin(std::numeric_limits<ValueType>::min());
-        this->DoSetMax(std::numeric_limits<ValueType>::max());
-    }
-
-    virtual wxObject *Clone() const { return new wxIntegerValidator(*this); }
-
-private:
-    wxDECLARE_NO_ASSIGN_CLASS(wxIntegerValidator);
-};
-
-// Helper function for creating integer validators which allows to avoid
-// explicitly specifying the type as it deduces it from its parameter.
-template <typename T>
-inline wxIntegerValidator<T>
-wxMakeIntegerValidator(T *value, int style = wxNUM_VAL_DEFAULT)
-{
-    return wxIntegerValidator<T>(value, style);
-}
-
-// ----------------------------------------------------------------------------
-// Validators for floating point numbers.
-// ----------------------------------------------------------------------------
-
-// Similar to wxIntegerValidatorBase, this class is not meant to be used
-// directly, only wxFloatingPointValidator<> should be used in the user code.
-class WXDLLIMPEXP_CORE wxFloatingPointValidatorBase : public wxNumValidatorBase
-{
-public:
-    // Set precision i.e. the number of digits shown (and accepted on input)
-    // after the decimal point. By default this is set to the maximal precision
-    // supported by the type handled by the validator.
-    void SetPrecision(unsigned precision) { m_precision = precision; }
-
-protected:
-    // Notice that we can't use "long double" here because it's not supported
-    // by wxNumberFormatter yet, so restrict ourselves to just double (and
-    // float).
-    typedef double LongestValueType;
-
-    wxFloatingPointValidatorBase(int style)
-        : wxNumValidatorBase(style)
-    {
-    }
-
-    wxFloatingPointValidatorBase(const wxFloatingPointValidatorBase& other)
-        : wxNumValidatorBase(other)
-    {
-        m_precision = other.m_precision;
-
-        m_min = other.m_min;
-        m_max = other.m_max;
-    }
-
-    // Provide methods for wxNumValidator use.
-    wxString ToString(LongestValueType value) const;
-    static bool FromString(const wxString& s, LongestValueType *value);
-
-    void DoSetMin(LongestValueType min) { m_min = min; }
-    void DoSetMax(LongestValueType max) { m_max = max; }
-
-    bool IsInRange(LongestValueType value) const
-    {
-        return m_min <= value && value <= m_max;
-    }
-
-    // Implement wxNumValidatorBase pure virtual method.
-    virtual bool IsCharOk(const wxString& val, int pos, wxChar ch) const;
-
-private:
-    // Maximum number of decimals digits after the decimal separator.
-    unsigned m_precision;
-
-    // Minimal and maximal values accepted (inclusive).
-    LongestValueType m_min, m_max;
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxFloatingPointValidatorBase);
-};
-
-// Validator for floating point numbers. It can be used with float, double or
-// long double values.
-template <typename T>
-class wxFloatingPointValidator
-    : public wxPrivate::wxNumValidator<wxFloatingPointValidatorBase, T>
-{
-public:
-    typedef T ValueType;
-    typedef wxPrivate::wxNumValidator<wxFloatingPointValidatorBase, T> Base;
-
-    // Ctor using implicit (maximal) precision for this type.
-    wxFloatingPointValidator(ValueType *value = NULL,
-                             int style = wxNUM_VAL_DEFAULT)
-        : Base(value, style)
-    {
-        DoSetMinMax();
-
-        this->SetPrecision(std::numeric_limits<ValueType>::digits10);
-    }
-
-    // Ctor specifying an explicit precision.
-    wxFloatingPointValidator(int precision,
-                      ValueType *value = NULL,
-                      int style = wxNUM_VAL_DEFAULT)
-        : Base(value, style)
-    {
-        DoSetMinMax();
-
-        this->SetPrecision(precision);
-    }
-
-    virtual wxObject *Clone() const
-    {
-        return new wxFloatingPointValidator(*this);
-    }
-
-private:
-    void DoSetMinMax()
-    {
-        // NB: Do not use min(), it's not the smallest representable value for
-        //     the floating point types but rather the smallest representable
-        //     positive value.
-        this->DoSetMin(-std::numeric_limits<ValueType>::max());
-        this->DoSetMax( std::numeric_limits<ValueType>::max());
-    }
-};
-
-// Helper similar to wxMakeIntValidator().
-//
-// NB: Unfortunately we can't just have a wxMakeNumericValidator() which would
-//     return either wxIntegerValidator<> or wxFloatingPointValidator<> so we
-//     do need two different functions.
-template <typename T>
-inline wxFloatingPointValidator<T>
-wxMakeFloatingPointValidator(T *value, int style = wxNUM_VAL_DEFAULT)
-{
-    return wxFloatingPointValidator<T>(value, style);
-}
-
-template <typename T>
-inline wxFloatingPointValidator<T>
-wxMakeFloatingPointValidator(int precision, T *value, int style = wxNUM_VAL_DEFAULT)
-{
-    return wxFloatingPointValidator<T>(precision, value, style);
-}
-
-#endif // wxUSE_VALIDATORS
-
-#endif // _WX_VALNUM_H_
diff --git a/Source/3rd Party/wx/include/wx/valtext.h b/Source/3rd Party/wx/include/wx/valtext.h
index 18d96582e..7f2e1e693 100644
--- a/Source/3rd Party/wx/include/wx/valtext.h	
+++ b/Source/3rd Party/wx/include/wx/valtext.h	
@@ -1,44 +1,40 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/valtext.h
+// Name:        valtext.h
 // Purpose:     wxTextValidator class
 // Author:      Julian Smart
-// Modified by: Francesco Montorsi
+// Modified by:
 // Created:     29/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: valtext.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 1998 Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_VALTEXT_H_
-#define _WX_VALTEXT_H_
+#ifndef _WX_VALTEXTH__
+#define _WX_VALTEXTH__
 
 #include "wx/defs.h"
 
-#if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
-
-class WXDLLIMPEXP_FWD_CORE wxTextEntry;
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
+#include "wx/textctrl.h"
 #include "wx/validate.h"
 
-enum wxTextValidatorStyle
-{
-    wxFILTER_NONE = 0x0,
-    wxFILTER_EMPTY = 0x1,
-    wxFILTER_ASCII = 0x2,
-    wxFILTER_ALPHA = 0x4,
-    wxFILTER_ALPHANUMERIC = 0x8,
-    wxFILTER_DIGITS = 0x10,
-    wxFILTER_NUMERIC = 0x20,
-    wxFILTER_INCLUDE_LIST = 0x40,
-    wxFILTER_INCLUDE_CHAR_LIST = 0x80,
-    wxFILTER_EXCLUDE_LIST = 0x100,
-    wxFILTER_EXCLUDE_CHAR_LIST = 0x200
-};
+#define wxFILTER_NONE           0x0000
+#define wxFILTER_ASCII          0x0001
+#define wxFILTER_ALPHA          0x0002
+#define wxFILTER_ALPHANUMERIC   0x0004
+#define wxFILTER_NUMERIC        0x0008
+#define wxFILTER_INCLUDE_LIST   0x0010
+#define wxFILTER_EXCLUDE_LIST   0x0020
+#define wxFILTER_INCLUDE_CHAR_LIST 0x0040
+#define wxFILTER_EXCLUDE_CHAR_LIST 0x0080
 
-class WXDLLIMPEXP_CORE wxTextValidator: public wxValidator
+class WXDLLEXPORT wxTextValidator: public wxValidator
 {
+DECLARE_DYNAMIC_CLASS(wxTextValidator)
 public:
-    wxTextValidator(long style = wxFILTER_NONE, wxString *val = NULL);
+
+    wxTextValidator(long style = wxFILTER_NONE, wxString *val = 0);
     wxTextValidator(const wxTextValidator& val);
 
     virtual ~wxTextValidator(){}
@@ -60,50 +56,67 @@ public:
     // Called to transfer data from the window
     virtual bool TransferFromWindow();
 
-    // Filter keystrokes
-    void OnChar(wxKeyEvent& event);
-
     // ACCESSORS
     inline long GetStyle() const { return m_validatorStyle; }
-    void SetStyle(long style);
+    inline void SetStyle(long style) { m_validatorStyle = style; }
 
-    wxTextEntry *GetTextEntry();
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( void SetIncludeList(const wxStringList& list) );
+    wxDEPRECATED( wxStringList& GetIncludeList() );
+
+    wxDEPRECATED( void SetExcludeList(const wxStringList& list) );
+    wxDEPRECATED( wxStringList& GetExcludeList() );
+
+    wxDEPRECATED( bool IsInCharIncludeList(const wxString& val) );
+    wxDEPRECATED( bool IsNotInCharExcludeList(const wxString& val) );
+#endif
 
-    void SetCharIncludes(const wxString& chars);
     void SetIncludes(const wxArrayString& includes) { m_includes = includes; }
     inline wxArrayString& GetIncludes() { return m_includes; }
 
-    void SetCharExcludes(const wxString& chars);
     void SetExcludes(const wxArrayString& excludes) { m_excludes = excludes; }
     inline wxArrayString& GetExcludes() { return m_excludes; }
 
-    bool HasFlag(wxTextValidatorStyle style) const
-        { return (m_validatorStyle & style) != 0; }
+    bool IsInCharIncludes(const wxString& val);
+    bool IsNotInCharExcludes(const wxString& val);
+
+    // Filter keystrokes
+    void OnChar(wxKeyEvent& event);
+
+
+DECLARE_EVENT_TABLE()
 
 protected:
+    long            m_validatorStyle;
+    wxString *      m_stringValue;
+#if WXWIN_COMPATIBILITY_2_4
+    wxStringList    m_includeList;
+    wxStringList    m_excludeList;
+#endif
+    wxArrayString   m_includes;
+    wxArrayString   m_excludes;
 
-    // returns true if all characters of the given string are present in m_includes
-    bool ContainsOnlyIncludedCharacters(const wxString& val) const;
+    bool CheckValidator() const
+    {
+        wxCHECK_MSG( m_validatorWindow, false,
+                     wxT("No window associated with validator") );
+        wxCHECK_MSG( m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)), false,
+                     wxT("wxTextValidator is only for wxTextCtrl's") );
 
-    // returns true if at least one character of the given string is present in m_excludes
-    bool ContainsExcludedCharacters(const wxString& val) const;
-
-    // returns the error message if the contents of 'val' are invalid
-    virtual wxString IsValid(const wxString& val) const;
-
-protected:
-    long                 m_validatorStyle;
-    wxString*            m_stringValue;
-    wxArrayString        m_includes;
-    wxArrayString        m_excludes;
+        return true;
+    }
 
 private:
-    wxDECLARE_NO_ASSIGN_CLASS(wxTextValidator);
-    DECLARE_DYNAMIC_CLASS(wxTextValidator)
-    DECLARE_EVENT_TABLE()
+// Cannot use
+//  DECLARE_NO_COPY_CLASS(wxTextValidator)
+// because copy constructor is explicitly declared above;
+// but no copy assignment operator is defined, so declare
+// it private to prevent the compiler from defining it:
+    wxTextValidator& operator=(const wxTextValidator&);
 };
 
 #endif
-  // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
+  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
-#endif // _WX_VALTEXT_H_
+#endif
+  // _WX_VALTEXTH__
diff --git a/Source/3rd Party/wx/include/wx/variant.h b/Source/3rd Party/wx/include/wx/variant.h
index 42302598b..bccf32e88 100644
--- a/Source/3rd Party/wx/include/wx/variant.h	
+++ b/Source/3rd Party/wx/include/wx/variant.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/09/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: variant.h 42997 2006-11-03 21:37:08Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,21 +21,26 @@
 #include "wx/arrstr.h"
 #include "wx/list.h"
 #include "wx/cpp.h"
-#include "wx/longlong.h"
 
 #if wxUSE_DATETIME
     #include "wx/datetime.h"
 #endif // wxUSE_DATETIME
 
-#include "wx/iosfwrap.h"
+#if wxUSE_ODBC
+    #include "wx/db.h"  // will #include sqltypes.h
+#endif //ODBC
 
-class wxAny;
+#include "wx/iosfwrap.h"
 
 /*
  * wxVariantData stores the actual data in a wxVariant object,
  * to allow it to store any type of data.
  * Derive from this to provide custom data handling.
  *
+ * NB: To prevent addition of extra vtbl pointer to wxVariantData,
+ *     we don't multiple-inherit from wxObjectRefData. Instead,
+ *     we simply replicate the wxObject ref-counting scheme.
+ *
  * NB: When you construct a wxVariantData, it will have refcount
  *     of one. Refcount will not be further increased when
  *     it is passed to wxVariant. This simulates old common
@@ -54,11 +59,13 @@ class wxAny;
  * overloading wxVariant with unnecessary functionality.
  */
 
-class WXDLLIMPEXP_BASE wxVariantData : public wxObjectRefData
+class WXDLLIMPEXP_BASE wxVariantData: public wxObject
 {
     friend class wxVariant;
 public:
-    wxVariantData() { }
+    wxVariantData()
+        : wxObject(), m_count(1)
+    { }
 
     // Override these to provide common functionality
     virtual bool Eq(wxVariantData& data) const = 0;
@@ -76,20 +83,26 @@ public:
     // If it based on wxObject return the ClassInfo.
     virtual wxClassInfo* GetValueClassInfo() { return NULL; }
 
-    // Implement this to make wxVariant::UnShare work. Returns
-    // a copy of the data.
-    virtual wxVariantData* Clone() const { return NULL; }
+    void IncRef() { m_count++; }
+    void DecRef()
+    {
+        if ( --m_count == 0 )
+            delete this;
+    }
 
-#if wxUSE_ANY
-    // Converts value to wxAny, if possible. Return true if successful.
-    virtual bool GetAsAny(wxAny* WXUNUSED(any)) const { return false; }
-#endif
+    int GetRefCount() const { return m_count; }
 
 protected:
     // Protected dtor should make some incompatible code
     // break more louder. That is, they should do data->DecRef()
     // instead of delete data.
     virtual ~wxVariantData() { }
+
+private:
+    int     m_count;
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxVariantData)
 };
 
 /*
@@ -97,10 +110,6 @@ protected:
  * built in.
  */
 
-class WXDLLIMPEXP_FWD_BASE wxVariant;
-
-WX_DECLARE_LIST_WITH_DECL(wxVariant, wxVariantList, class WXDLLIMPEXP_BASE);
-
 class WXDLLIMPEXP_BASE wxVariant: public wxObject
 {
 public:
@@ -108,9 +117,6 @@ public:
 
     wxVariant(const wxVariant& variant);
     wxVariant(wxVariantData* data, const wxString& name = wxEmptyString);
-#if wxUSE_ANY
-    wxVariant(const wxAny& any);
-#endif
     virtual ~wxVariant();
 
     // generic assignment
@@ -132,17 +138,14 @@ public:
 
     // For compatibility with wxWidgets <= 2.6, this doesn't increase
     // reference count.
-    wxVariantData* GetData() const
-    {
-        return (wxVariantData*) m_refData;
-    }
+    wxVariantData* GetData() const { return m_data; }
     void SetData(wxVariantData* data) ;
 
     // make a 'clone' of the object
-    void Ref(const wxVariant& clone) { wxObject::Ref(clone); }
+    void Ref(const wxVariant& clone);
 
-    // ensure that the data is exclusive to this variant, and not shared
-    bool Unshare();
+    // destroy a reference
+    void UnRef();
 
     // Make NULL (i.e. delete the data)
     void MakeNull();
@@ -160,10 +163,6 @@ public:
     // write contents to a string (e.g. for debugging)
     wxString MakeString() const;
 
-#if wxUSE_ANY
-    wxAny GetAny() const;
-#endif
-
     // double
     wxVariant(double val, const wxString& name = wxEmptyString);
     bool operator== (double value) const;
@@ -185,99 +184,59 @@ public:
     long GetLong() const;
 
     // bool
+#ifdef HAVE_BOOL
     wxVariant(bool val, const wxString& name = wxEmptyString);
     bool operator== (bool value) const;
     bool operator!= (bool value) const;
     void operator= (bool value) ;
     inline operator bool () const {  return GetBool(); }
     bool GetBool() const ;
+#endif
 
     // wxDateTime
 #if wxUSE_DATETIME
     wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString);
+#if wxUSE_ODBC
+    wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString);
+    wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString);
+    wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString);
+#endif
     bool operator== (const wxDateTime& value) const;
     bool operator!= (const wxDateTime& value) const;
     void operator= (const wxDateTime& value) ;
+#if wxUSE_ODBC
+    void operator= (const DATE_STRUCT* value) ;
+    void operator= (const TIME_STRUCT* value) ;
+    void operator= (const TIMESTAMP_STRUCT* value) ;
+#endif
     inline operator wxDateTime () const { return GetDateTime(); }
     wxDateTime GetDateTime() const;
 #endif
 
     // wxString
     wxVariant(const wxString& val, const wxString& name = wxEmptyString);
-    // these overloads are necessary to prevent the compiler from using bool
-    // version instead of wxString one:
-    wxVariant(const char* val, const wxString& name = wxEmptyString);
-    wxVariant(const wchar_t* val, const wxString& name = wxEmptyString);
-    wxVariant(const wxCStrData& val, const wxString& name = wxEmptyString);
-    wxVariant(const wxScopedCharBuffer& val, const wxString& name = wxEmptyString);
-    wxVariant(const wxScopedWCharBuffer& val, const wxString& name = wxEmptyString);
-
+    wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool!
     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;
-    wxVariant& operator=(const wxString& value);
-    // these overloads are necessary to prevent the compiler from using bool
-    // version instead of wxString one:
-    wxVariant& operator=(const char* value)
-        { return *this = wxString(value); }
-    wxVariant& operator=(const wchar_t* value)
-        { return *this = wxString(value); }
-    wxVariant& operator=(const wxCStrData& value)
-        { return *this = value.AsString(); }
-    template<typename T>
-    wxVariant& operator=(const wxScopedCharTypeBuffer<T>& value)
-        { return *this = value.data(); }
-
+    void operator= (const wxString& value) ;
+    void operator= (const wxChar* value) ; // Necessary or VC++ assumes bool!
     inline operator wxString () const {  return MakeString(); }
     wxString GetString() const;
 
-#if wxUSE_STD_STRING
-    wxVariant(const std::string& val, const wxString& name = wxEmptyString);
-    bool operator==(const std::string& value) const
-        { return operator==(wxString(value)); }
-    bool operator!=(const std::string& value) const
-        { return operator!=(wxString(value)); }
-    wxVariant& operator=(const std::string& value)
-        { return operator=(wxString(value)); }
-    operator std::string() const { return (operator wxString()).ToStdString(); }
-
-    wxVariant(const wxStdWideString& val, const wxString& name = wxEmptyString);
-    bool operator==(const wxStdWideString& value) const
-        { return operator==(wxString(value)); }
-    bool operator!=(const wxStdWideString& value) const
-        { return operator!=(wxString(value)); }
-    wxVariant& operator=(const wxStdWideString& value)
-        { return operator=(wxString(value)); }
-    operator wxStdWideString() const { return (operator wxString()).ToStdWstring(); }
-#endif // wxUSE_STD_STRING
-
-    // wxUniChar
-    wxVariant(const wxUniChar& val, const wxString& name = wxEmptyString);
-    wxVariant(const wxUniCharRef& val, const wxString& name = wxEmptyString);
-    wxVariant(char val, const wxString& name = wxEmptyString);
-    wxVariant(wchar_t val, const wxString& name = wxEmptyString);
-    bool operator==(const wxUniChar& value) const;
-    bool operator==(const wxUniCharRef& value) const { return *this == wxUniChar(value); }
-    bool operator==(char value) const { return *this == wxUniChar(value); }
-    bool operator==(wchar_t value) const { return *this == wxUniChar(value); }
-    bool operator!=(const wxUniChar& value) const { return !(*this == value); }
-    bool operator!=(const wxUniCharRef& value) const { return !(*this == value); }
-    bool operator!=(char value) const { return !(*this == value); }
-    bool operator!=(wchar_t value) const { return !(*this == value); }
-    wxVariant& operator=(const wxUniChar& value);
-    wxVariant& operator=(const wxUniCharRef& value) { return *this = wxUniChar(value); }
-    wxVariant& operator=(char value) { return *this = wxUniChar(value); }
-    wxVariant& operator=(wchar_t value) { return *this = wxUniChar(value); }
-    operator wxUniChar() const { return GetChar(); }
-    operator char() const { return GetChar(); }
-    operator wchar_t() const { return GetChar(); }
-    wxUniChar GetChar() const;
+    // wxChar
+    wxVariant(wxChar val, const wxString& name = wxEmptyString);
+    bool operator== (wxChar value) const;
+    bool operator!= (wxChar value) const;
+    void operator= (wxChar value) ;
+    inline operator wxChar () const { return GetChar(); }
+    wxChar GetChar() const ;
 
     // wxArrayString
     wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString);
     bool operator== (const wxArrayString& value) const;
     bool operator!= (const wxArrayString& value) const;
     void operator= (const wxArrayString& value);
-    operator wxArrayString () const { return GetArrayString(); }
+    inline operator wxArrayString () const { return GetArrayString(); }
     wxArrayString GetArrayString() const;
 
     // void*
@@ -285,7 +244,7 @@ public:
     bool operator== (void* value) const;
     bool operator!= (void* value) const;
     void operator= (void* value);
-    operator void* () const {  return GetVoidPtr(); }
+    inline operator void* () const {  return GetVoidPtr(); }
     void* GetVoidPtr() const;
 
     // wxObject*
@@ -295,36 +254,27 @@ public:
     void operator= (wxObject* value);
     wxObject* GetWxObjectPtr() const;
 
-#if wxUSE_LONGLONG
-    // wxLongLong
-    wxVariant(wxLongLong, const wxString& name = wxEmptyString);
-    bool operator==(wxLongLong value) const;
-    bool operator!=(wxLongLong value) const;
-    void operator=(wxLongLong value);
-    operator wxLongLong() const { return GetLongLong(); }
-    wxLongLong GetLongLong() const;
 
-    // wxULongLong
-    wxVariant(wxULongLong, const wxString& name = wxEmptyString);
-    bool operator==(wxULongLong value) const;
-    bool operator!=(wxULongLong value) const;
-    void operator=(wxULongLong value);
-    operator wxULongLong() const { return GetULongLong(); }
-    wxULongLong GetULongLong() const;
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( wxVariant(const wxStringList& val, const wxString& name = wxEmptyString) );
+    wxDEPRECATED( bool operator== (const wxStringList& value) const );
+    wxDEPRECATED( bool operator!= (const wxStringList& value) const );
+    wxDEPRECATED( void operator= (const wxStringList& value) );
+    wxDEPRECATED( wxStringList& GetStringList() const );
 #endif
 
     // ------------------------------
     // list operations
     // ------------------------------
 
-    wxVariant(const wxVariantList& val, const wxString& name = wxEmptyString); // List of variants
-    bool operator== (const wxVariantList& value) const;
-    bool operator!= (const wxVariantList& value) const;
-    void operator= (const wxVariantList& value) ;
+    wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants
+    bool operator== (const wxList& value) const;
+    bool operator!= (const wxList& value) const;
+    void operator= (const wxList& value) ;
     // Treat a list variant as an array
     wxVariant operator[] (size_t idx) const;
     wxVariant& operator[] (size_t idx) ;
-    wxVariantList& GetList() const ;
+    wxList& GetList() const ;
 
     // Return the number of elements in a list
     size_t GetCount() const;
@@ -353,124 +303,20 @@ public:
     bool Convert(bool* value) const;
     bool Convert(double* value) const;
     bool Convert(wxString* value) const;
-    bool Convert(wxUniChar* value) const;
-    bool Convert(char* value) const;
-    bool Convert(wchar_t* value) const;
+    bool Convert(wxChar* value) const;
 #if wxUSE_DATETIME
     bool Convert(wxDateTime* value) const;
 #endif // wxUSE_DATETIME
-#if wxUSE_LONGLONG
-    bool Convert(wxLongLong* value) const;
-    bool Convert(wxULongLong* value) const;
-  #ifdef wxLongLong_t
-    bool Convert(wxLongLong_t* value) const
-    {
-        wxLongLong temp;
-        if ( !Convert(&temp) )
-            return false;
-        *value = temp.GetValue();
-        return true;
-    }
-    bool Convert(wxULongLong_t* value) const
-    {
-        wxULongLong temp;
-        if ( !Convert(&temp) )
-            return false;
-        *value = temp.GetValue();
-        return true;
-    }
-  #endif // wxLongLong_t
-#endif // wxUSE_LONGLONG
 
 // Attributes
 protected:
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-
+    wxVariantData*  m_data;
     wxString        m_name;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxVariant)
 };
 
-
-//
-// wxVariant <-> wxAny conversion code
-//
-#if wxUSE_ANY
-
-#include "wx/any.h"
-
-// In order to convert wxAny to wxVariant, we need to be able to associate
-// wxAnyValueType with a wxVariantData factory function.
-typedef wxVariantData* (*wxVariantDataFactory)(const wxAny& any);
-
-// Actual Any-to-Variant registration must be postponed to a time when all
-// global variables have been initialized. Hence this arrangement.
-// wxAnyToVariantRegistration instances are kept in global scope and
-// wxAnyValueTypeGlobals in any.cpp will use their data when the time is
-// right.
-class WXDLLIMPEXP_BASE wxAnyToVariantRegistration
-{
-public:
-    wxAnyToVariantRegistration(wxVariantDataFactory factory);
-    virtual ~wxAnyToVariantRegistration();
-
-    virtual wxAnyValueType* GetAssociatedType() = 0;
-    wxVariantDataFactory GetFactory() const { return m_factory; }
-private:
-    wxVariantDataFactory    m_factory;
-};
-
-template<typename T>
-class wxAnyToVariantRegistrationImpl : public wxAnyToVariantRegistration
-{
-public:
-    wxAnyToVariantRegistrationImpl(wxVariantDataFactory factory)
-        : wxAnyToVariantRegistration(factory)
-    {
-    }
-
-    virtual wxAnyValueType* GetAssociatedType()
-    {
-        return wxAnyValueTypeImpl<T>::GetInstance();
-    }
-private:
-};
-
-#define DECLARE_WXANY_CONVERSION() \
-virtual bool GetAsAny(wxAny* any) const; \
-static wxVariantData* VariantDataFactory(const wxAny& any);
-
-#define _REGISTER_WXANY_CONVERSION(T, CLASSNAME, FUNC) \
-static wxAnyToVariantRegistrationImpl<T> \
-    gs_##CLASSNAME##AnyToVariantRegistration = \
-    wxAnyToVariantRegistrationImpl<T>(&FUNC);
-
-#define REGISTER_WXANY_CONVERSION(T, CLASSNAME) \
-_REGISTER_WXANY_CONVERSION(T, CLASSNAME, CLASSNAME::VariantDataFactory)
-
-#define IMPLEMENT_TRIVIAL_WXANY_CONVERSION(T, CLASSNAME) \
-bool CLASSNAME::GetAsAny(wxAny* any) const \
-{ \
-    *any = m_value; \
-    return true; \
-} \
-wxVariantData* CLASSNAME::VariantDataFactory(const wxAny& any) \
-{ \
-    return new CLASSNAME(wxANY_AS(any, T)); \
-} \
-REGISTER_WXANY_CONVERSION(T, CLASSNAME)
-
-#else // if !wxUSE_ANY
-
-#define DECLARE_WXANY_CONVERSION()
-#define REGISTER_WXANY_CONVERSION(T, CLASSNAME)
-#define IMPLEMENT_TRIVIAL_WXANY_CONVERSION(T, CLASSNAME)
-
-#endif // wxUSE_ANY/!wxUSE_ANY
-
-
 #define DECLARE_VARIANT_OBJECT(classname) \
     DECLARE_VARIANT_OBJECT_EXPORTED(classname, wxEMPTY_PARAMETER_VALUE)
 
@@ -495,13 +341,15 @@ public:\
     virtual wxString GetType() const; \
     virtual wxClassInfo* GetValueClassInfo(); \
 \
-    virtual wxVariantData* Clone() const { return new classname##VariantData(m_value); } \
-\
-    DECLARE_WXANY_CONVERSION() \
 protected:\
     classname m_value; \
+\
+private: \
+    DECLARE_CLASS(classname##VariantData) \
 };\
 \
+IMPLEMENT_CLASS(classname##VariantData, wxVariantData)\
+\
 wxString classname##VariantData::GetType() const\
 {\
     return m_value.GetClassInfo()->GetClassName();\
@@ -514,7 +362,7 @@ wxClassInfo* classname##VariantData::GetValueClassInfo()\
 \
 expdecl classname& operator << ( classname &value, const wxVariant &variant )\
 {\
-    wxASSERT( variant.GetType() == #classname );\
+    wxASSERT( wxIsKindOf( variant.GetData(), classname##VariantData ) );\
     \
     classname##VariantData *data = (classname##VariantData*) variant.GetData();\
     value = data->GetValue();\
@@ -526,8 +374,7 @@ expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\
     classname##VariantData *data = new classname##VariantData( value );\
     variant.SetData( data );\
     return variant;\
-} \
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(classname, classname##VariantData)
+}
 
 // implements a wxVariantData-derived class using for the Eq() method the
 // operator== which must have been provided by "classname"
@@ -536,7 +383,7 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdec
 \
 bool classname##VariantData::Eq(wxVariantData& data) const \
 {\
-    wxASSERT( GetType() == data.GetType() );\
+    wxASSERT( wxIsKindOf((&data), classname##VariantData) );\
 \
     classname##VariantData & otherData = (classname##VariantData &) data;\
 \
@@ -553,7 +400,7 @@ IMPLEMENT_VARIANT_OBJECT_EXPORTED_NO_EQ(classname,wxEMPTY_PARAMETER_VALUE expdec
 \
 bool classname##VariantData::Eq(wxVariantData& data) const \
 {\
-    wxASSERT( GetType() == data.GetType() );\
+    wxASSERT( wxIsKindOf((&data), classname##VariantData) );\
 \
     classname##VariantData & otherData = (classname##VariantData &) data;\
 \
@@ -569,9 +416,6 @@ bool classname##VariantData::Eq(wxVariantData& data) const \
     ((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\
                   var.GetWxObjectPtr() : NULL));
 
-// Replacement for using wxDynamicCast on a wxVariantData object
-#define wxDynamicCastVariantData(data, classname) dynamic_cast<classname*>(data)
-
 extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 #endif // wxUSE_VARIANT
diff --git a/Source/3rd Party/wx/include/wx/vector.h b/Source/3rd Party/wx/include/wx/vector.h
index d1b27f049..b05d779ec 100644
--- a/Source/3rd Party/wx/include/wx/vector.h	
+++ b/Source/3rd Party/wx/include/wx/vector.h	
@@ -2,10 +2,9 @@
 // Name:        wx/vector.h
 // Purpose:     STL vector clone
 // Author:      Lindsay Mathieson
-// Modified by: Vaclav Slavik - make it a template
+// Modified by:
 // Created:     30.07.2001
-// Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>,
-//                  2007 Vaclav Slavik <vslavik@fastmail.fm>
+// Copyright:   (c) 2001 Lindsay Mathieson <lindsay@mathieson.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -14,252 +13,100 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_STD_CONTAINERS
-
-#include <vector>
-#include <algorithm>
-
-#define wxVector std::vector
-template<typename T>
-inline void wxVectorSort(wxVector<T>& v)
+class WXDLLIMPEXP_BASE wxVectorBase
 {
-    std::sort(v.begin(), v.end());
-}
-
-#else // !wxUSE_STD_CONTAINERS
-
-#include "wx/utils.h"
-#include "wx/scopeguard.h"
-#include "wx/meta/movable.h"
-#include "wx/meta/if.h"
-
-#include "wx/beforestd.h"
-#include <new> // for placement new
-#include "wx/afterstd.h"
-
-namespace wxPrivate
-{
-
-// These templates encapsulate memory operations for use by wxVector; there are
-// two implementations, both in generic way for any C++ types and as an
-// optimized version for "movable" types that uses realloc() and memmove().
-
-// version for movable types:
-template<typename T>
-struct wxVectorMemOpsMovable
-{
-    static void Free(T* array)
-        { free(array); }
-
-    static T* Realloc(T* old, size_t newCapacity, size_t WXUNUSED(occupiedSize))
-        { return (T*)realloc(old, newCapacity * sizeof(T)); }
-
-    static void MemmoveBackward(T* dest, T* source, size_t count)
-        { memmove(dest, source, count * sizeof(T)); }
-
-    static void MemmoveForward(T* dest, T* source, size_t count)
-        { memmove(dest, source, count * sizeof(T)); }
-};
-
-// generic version for non-movable types:
-template<typename T>
-struct wxVectorMemOpsGeneric
-{
-    static void Free(T* array)
-        { ::operator delete(array); }
-
-    static T* Realloc(T* old, size_t newCapacity, size_t occupiedSize)
-    {
-        T *mem = (T*)::operator new(newCapacity * sizeof(T));
-        for ( size_t i = 0; i < occupiedSize; i++ )
-        {
-            ::new(mem + i) T(old[i]);
-            old[i].~T();
-        }
-        ::operator delete(old);
-        return mem;
-    }
-
-    static void MemmoveBackward(T* dest, T* source, size_t count)
-    {
-        wxASSERT( dest < source );
-        T* destptr = dest;
-        T* sourceptr = source;
-        for ( size_t i = count; i > 0; --i, ++destptr, ++sourceptr )
-        {
-            ::new(destptr) T(*sourceptr);
-            sourceptr->~T();
-        }
-    }
-
-    static void MemmoveForward(T* dest, T* source, size_t count)
-    {
-        wxASSERT( dest > source );
-        T* destptr = dest + count - 1;
-        T* sourceptr = source + count - 1;
-        for ( size_t i = count; i > 0; --i, --destptr, --sourceptr )
-        {
-            ::new(destptr) T(*sourceptr);
-            sourceptr->~T();
-        }
-    }
-};
-
-
-} // namespace wxPrivate
-
-template<typename T>
-class wxVector
-{
-private:
-    // This cryptic expression means "typedef Ops to wxVectorMemOpsMovable if
-    // type T is movable type, otherwise to wxVectorMemOpsGeneric".
-    //
-    // Note that we use typedef instead of privately deriving from this (which
-    // would allowed us to omit "Ops::" prefixes below) to keep VC6 happy,
-    // it can't compile code that derives from wxIf<...>::value.
-    //
-    // Note that bcc needs the extra parentheses for non-type template
-    // arguments to compile this expression.
-    typedef typename wxIf< (wxIsMovable<T>::value),
-                           wxPrivate::wxVectorMemOpsMovable<T>,
-                           wxPrivate::wxVectorMemOpsGeneric<T> >::value
-            Ops;
-
 public:
     typedef size_t size_type;
-    typedef size_t difference_type;
-    typedef T value_type;
-    typedef value_type* pointer;
-    typedef value_type* iterator;
-    typedef const value_type* const_iterator;
-    typedef value_type& reference;
+private:
+    size_type m_allocsize;
+    size_type m_size,
+              m_capacity;
+    void **m_objects;
 
-    class reverse_iterator
+protected:
+    bool Alloc(size_type sz)
     {
-    public:
-        reverse_iterator() : m_ptr(NULL) { }
-        wxEXPLICIT reverse_iterator(iterator it) : m_ptr(it) { }
-        reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
+        // work in multiples of m_allocsize;
+        sz = (sz / m_allocsize + 1) * m_allocsize;
+        if (sz <= m_capacity)
+            return true;
 
-        reference operator*() const { return *m_ptr; }
-        pointer operator->() const { return m_ptr; }
-
-        iterator base() const { return m_ptr; }
-
-        reverse_iterator& operator++()
-            { --m_ptr; return *this; }
-        reverse_iterator operator++(int)
-            { reverse_iterator tmp = *this; --m_ptr; return tmp; }
-        reverse_iterator& operator--()
-            { ++m_ptr; return *this; }
-        reverse_iterator operator--(int)
-            { reverse_iterator tmp = *this; ++m_ptr; return tmp; }
-
-        reverse_iterator operator+(difference_type n) const
-            { return reverse_iterator(m_ptr - n); }
-        reverse_iterator& operator+=(difference_type n)
-            { m_ptr -= n; return *this; }
-        reverse_iterator operator-(difference_type n) const
-            { return reverse_iterator(m_ptr + n); }
-        reverse_iterator& operator-=(difference_type n)
-            { m_ptr += n; return *this; }
-
-        reference operator[](difference_type n) const
-            { return *(*this + n); }
-
-        bool operator ==(const reverse_iterator& it) const
-            { return m_ptr == it.m_ptr; }
-        bool operator !=(const reverse_iterator& it) const
-            { return m_ptr != it.m_ptr; }
-
-    private:
-        value_type *m_ptr;
-    };
-
-    wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
-
-    wxVector(size_type p_size)
-        : m_size(0), m_capacity(0), m_values(NULL)
-    {
-        reserve(p_size);
-        for ( size_t n = 0; n < p_size; n++ )
-            push_back(value_type());
+        // try to realloc
+        void *mem = realloc(m_objects, sizeof(void *) * sz);
+        if (! mem)
+            return false; // failed
+        // success
+        m_objects = (void **) mem;
+        m_capacity = sz;
+        return true;
     }
 
-    wxVector(size_type p_size, const value_type& v)
-        : m_size(0), m_capacity(0), m_values(NULL)
+    // untyped destructor of elements - must be overriden
+    virtual void Free(void *) = 0;
+    // untyped copy constructor of elements - must be overriden
+    virtual void *Copy(const void *) const = 0;
+
+    const void *GetItem(size_type idx) const
     {
-        reserve(p_size);
-        for ( size_t n = 0; n < p_size; n++ )
-            push_back(v);
+        wxASSERT(idx < m_size);
+        return m_objects[idx];
     }
 
-    wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL)
+    void Append(void *obj)
     {
-        Copy(c);
+        wxASSERT(m_size < m_capacity);
+        m_objects[m_size] = obj;
+        m_size++;
     }
 
-    ~wxVector()
+    void RemoveAt(size_type idx)
+    {
+        wxASSERT(idx < m_size);
+        Free(m_objects[idx]);
+        if (idx < m_size - 1)
+            memcpy(
+                m_objects + idx,
+                m_objects + idx + 1,
+                ( m_size - idx - 1 ) * sizeof(void*) );
+        m_size--;
+    }
+
+    bool copy(const wxVectorBase& vb)
     {
         clear();
+        if (! Alloc(vb.size()))
+            return false;
+
+        for (size_type i = 0; i < vb.size(); i++)
+        {
+            void *o = vb.Copy(vb.GetItem(i));
+            if (! o)
+                return false;
+            Append(o);
+        }
+
+        return true;
     }
 
-    void swap(wxVector& v)
-    {
-        wxSwap(m_size, v.m_size);
-        wxSwap(m_capacity, v.m_capacity);
-        wxSwap(m_values, v.m_values);
-    }
+public:
+    wxVectorBase() : m_allocsize(16), m_size(0), m_capacity(0), m_objects(0) {}
+    virtual ~wxVectorBase() {} // calm down GCC
 
     void clear()
     {
-        // call destructors of stored objects:
-        for ( size_type i = 0; i < m_size; i++ )
-        {
-            m_values[i].~T();
-        }
-
-        Ops::Free(m_values);
-        m_values = NULL;
-        m_size =
-        m_capacity = 0;
+        for (size_type i = 0; i < size(); i++)
+            Free(m_objects[i]);
+        free(m_objects);
+        m_objects = 0;
+        m_size = m_capacity = 0;
     }
 
     void reserve(size_type n)
     {
-        if ( n <= m_capacity )
-            return;
-
-        // increase the size twice, unless we're already too big or unless
-        // more is requested
-        //
-        // NB: casts to size_type are needed to suppress mingw32 warnings about
-        //     mixing enums and ints in the same expression
-        const size_type increment = m_size > 0
-                                     ? wxMin(m_size, (size_type)ALLOC_MAX_SIZE)
-                                     : (size_type)ALLOC_INITIAL_SIZE;
-        if ( m_capacity + increment > n )
-            n = m_capacity + increment;
-
-        m_values = Ops::Realloc(m_values, n * sizeof(value_type), m_size);
-        m_capacity = n;
-    }
-
-    void resize(size_type n)
-    {
-        if ( n < m_size )
-            Shrink(n);
-        else if ( n > m_size )
-            Extend(n, value_type());
-    }
-
-    void resize(size_type n, const value_type& v)
-    {
-        if ( n < m_size )
-            Shrink(n);
-        else if ( n > m_size )
-            Extend(n, v);
+        if ( !Alloc(n) )
+        {
+            wxFAIL_MSG( wxT("out of memory in wxVector::reserve()") );
+        }
     }
 
     size_type size() const
@@ -277,220 +124,89 @@ public:
         return size() == 0;
     }
 
-    wxVector& operator=(const wxVector& vb)
+    wxVectorBase& operator = (const wxVectorBase& vb)
     {
-        if (this != &vb)
-        {
-            clear();
-            Copy(vb);
-        }
+        wxCHECK(copy(vb), *this);
         return *this;
     }
-
-    void push_back(const value_type& v)
-    {
-        reserve(size() + 1);
-
-        // use placement new to initialize new object in preallocated place in
-        // m_values and store 'v' in it:
-        void* const place = m_values + m_size;
-        ::new(place) value_type(v);
-
-        // only increase m_size if the ctor didn't throw an exception; notice
-        // that if it _did_ throw, everything is OK, because we only increased
-        // vector's capacity so far and possibly written some data to
-        // uninitialized memory at the end of m_values
-        m_size++;
-    }
-
-    void pop_back()
-    {
-        erase(end() - 1);
-    }
-
-    const value_type& at(size_type idx) const
-    {
-        wxASSERT(idx < m_size);
-        return m_values[idx];
-    }
-
-    value_type& at(size_type idx)
-    {
-        wxASSERT(idx < m_size);
-        return m_values[idx];
-    }
-
-    const value_type& operator[](size_type idx) const  { return at(idx); }
-    value_type& operator[](size_type idx) { return at(idx); }
-    const value_type& front() const { return at(0); }
-    value_type& front() { return at(0); }
-    const value_type& back() const { return at(size() - 1); }
-    value_type& back() { return at(size() - 1); }
-
-    const_iterator begin() const { return m_values; }
-    iterator begin() { return m_values; }
-    const_iterator end() const { return m_values + size(); }
-    iterator end() { return m_values + size(); }
-
-    reverse_iterator rbegin() { return reverse_iterator(end() - 1); }
-    reverse_iterator rend() { return reverse_iterator(begin() - 1); }
-
-    iterator insert(iterator it, const value_type& v = value_type())
-    {
-        // NB: this must be done before reserve(), because reserve()
-        //     invalidates iterators!
-        const size_t idx = it - begin();
-        const size_t after = end() - it;
-
-        reserve(size() + 1);
-
-        // the place where the new element is going to be inserted
-        value_type * const place = m_values + idx;
-
-        // unless we're inserting at the end, move following elements out of
-        // the way:
-        if ( after > 0 )
-            Ops::MemmoveForward(place + 1, place, after);
-
-        // if the ctor called below throws an exception, we need to move all
-        // the elements back to their original positions in m_values
-        wxScopeGuard moveBack = wxMakeGuard(
-                Ops::MemmoveBackward, place, place + 1, after);
-        if ( !after )
-            moveBack.Dismiss();
-
-        // use placement new to initialize new object in preallocated place in
-        // m_values and store 'v' in it:
-        ::new(place) value_type(v);
-
-        // now that we did successfully add the new element, increment the size
-        // and disable moving the items back
-        moveBack.Dismiss();
-        m_size++;
-
-        return begin() + idx;
-    }
-
-    iterator erase(iterator it)
-    {
-        return erase(it, it + 1);
-    }
-
-    iterator erase(iterator first, iterator last)
-    {
-        if ( first == last )
-            return first;
-        wxASSERT( first < end() && last <= end() );
-
-        const size_type idx = first - begin();
-        const size_type count = last - first;
-        const size_type after = end() - last;
-
-        // erase elements by calling their destructors:
-        for ( iterator i = first; i < last; ++i )
-            i->~T();
-
-        // once that's done, move following elements over to the freed space:
-        if ( after > 0 )
-        {
-            Ops::MemmoveBackward(m_values + idx, m_values + idx + count, after);
-        }
-
-        m_size -= count;
-
-        return begin() + idx;
-    }
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( size_type erase(size_type n) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
-private:
-    // VC6 can't compile static const int members
-    enum { ALLOC_INITIAL_SIZE = 16 };
-    enum { ALLOC_MAX_SIZE = 4096 };
-
-    void Copy(const wxVector& vb)
-    {
-        reserve(vb.size());
-
-        for ( const_iterator i = vb.begin(); i != vb.end(); ++i )
-            push_back(*i);
-    }
-
-private:
-    void Shrink(size_type n)
-    {
-        for ( size_type i = n; i < m_size; i++ )
-            m_values[i].~T();
-        m_size = n;
-    }
-
-    void Extend(size_type n, const value_type& v)
-    {
-        reserve(n);
-        for ( size_type i = m_size; i < n; i++ )
-            push_back(v);
-    }
-
-    size_type m_size,
-              m_capacity;
-    value_type *m_values;
 };
 
-#if WXWIN_COMPATIBILITY_2_8
-template<typename T>
-inline typename wxVector<T>::size_type wxVector<T>::erase(size_type n)
-{
-    erase(begin() + n);
-    return n;
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
-
-namespace wxPrivate
-{
-
-// This is a helper for the wxVectorSort function, and should not be used
-// directly in user's code.
-template<typename T>
-struct wxVectorComparator
-{
-    static int
-    Compare(const void* pitem1, const void* pitem2, const void* )
-    {
-        const T& item1 = *reinterpret_cast<const T*>(pitem1);
-        const T& item2 = *reinterpret_cast<const T*>(pitem2);
-
-        if (item1 < item2)
-            return -1;
-        else if (item2 < item1)
-            return 1;
-        else
-            return 0;
+#define WX_DECLARE_VECTORBASE(obj, cls)\
+protected:\
+    virtual void Free(void *o)\
+    {\
+        delete (obj *) o;\
+    }\
+    virtual void *Copy(const void *o) const\
+    {\
+        return new obj(*(obj *) o);\
+    }\
+public:\
+    cls() {}\
+    cls(const cls& c) : wxVectorBase()\
+    {\
+        wxCHECK2(copy(c), return);\
+    }\
+    ~cls()\
+    {\
+        clear();\
     }
-};
 
-}  // namespace wxPrivate
-
-
-
-template<typename T>
-void wxVectorSort(wxVector<T>& v)
-{
-    wxQsort(v.begin(), v.size(), sizeof(T),
-            wxPrivate::wxVectorComparator<T>::Compare, NULL);
+#define _WX_DECLARE_VECTOR(obj, cls, exp)\
+class exp cls : public wxVectorBase\
+{\
+    WX_DECLARE_VECTORBASE(obj, cls)\
+public:\
+    void push_back(const obj& o)\
+    {\
+        wxCHECK2(Alloc(size() + 1), return);\
+        Append(new obj(o));\
+    }\
+    void pop_back()\
+    {\
+        RemoveAt(size() - 1);\
+    }\
+    const obj& at(size_type idx) const\
+    {\
+        return *(obj *) GetItem(idx);\
+    }\
+    obj& at(size_type idx)\
+    {\
+        return *(obj *) GetItem(idx);\
+    }\
+    const obj& operator[](size_type idx) const\
+    {\
+        return at(idx);\
+    }\
+    obj& operator[](size_type idx)\
+    {\
+        return at(idx);\
+    }\
+    const obj& front() const\
+    {\
+        return at(0);\
+    }\
+    obj& front()\
+    {\
+        return at(0);\
+    }\
+    const obj& back() const\
+    {\
+        return at(size() - 1);\
+    }\
+    obj& back()\
+    {\
+        return at(size() - 1);\
+    }\
+    size_type erase(size_type idx)\
+    {\
+        RemoveAt(idx);\
+        return idx;\
+    }\
 }
 
-
-
-#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
-
-#if WXWIN_COMPATIBILITY_2_8
-    #define WX_DECLARE_VECTORBASE(obj, cls) typedef wxVector<obj> cls
-    #define _WX_DECLARE_VECTOR(obj, cls, exp) WX_DECLARE_VECTORBASE(obj, cls)
-    #define WX_DECLARE_VECTOR(obj, cls) WX_DECLARE_VECTORBASE(obj, cls)
-#endif // WXWIN_COMPATIBILITY_2_8
+#define WX_DECLARE_VECTOR(obj, cls) \
+  _WX_DECLARE_VECTOR(obj, cls, WXDLLEXPORT)
 
 #endif // _WX_VECTOR_H_
+
diff --git a/Source/3rd Party/wx/include/wx/version.h b/Source/3rd Party/wx/include/wx/version.h
index 314c8deda..11cf33112 100644
--- a/Source/3rd Party/wx/include/wx/version.h	
+++ b/Source/3rd Party/wx/include/wx/version.h	
@@ -4,7 +4,7 @@
  *  Author:      Julian Smart
  *  Modified by: Ryan Norton (Converted to C)
  *  Created:     29/01/98
- *  RCS-ID:      $Id$
+ *  RCS-ID:      $Id: version.h 66910 2011-02-16 20:53:53Z JS $
  *  Copyright:   (c) 1998 Julian Smart
  *  Licence:     wxWindows licence
  */
@@ -27,10 +27,10 @@
 
 /*  NB: this file is parsed by automatic tools so don't change its format! */
 #define wxMAJOR_VERSION      2
-#define wxMINOR_VERSION      9
-#define wxRELEASE_NUMBER     4
+#define wxMINOR_VERSION      8
+#define wxRELEASE_NUMBER     12
 #define wxSUBRELEASE_NUMBER  0
-#define wxVERSION_STRING   wxT("wxWidgets 2.9.4")
+#define wxVERSION_STRING   wxT("wxWidgets 2.8.12")
 
 /*  nothing to update below this line when updating the version */
 /*  ---------------------------------------------------------------------------- */
diff --git a/Source/3rd Party/wx/include/wx/versioninfo.h b/Source/3rd Party/wx/include/wx/versioninfo.h
deleted file mode 100644
index 59cb34c2b..000000000
--- a/Source/3rd Party/wx/include/wx/versioninfo.h	
+++ /dev/null
@@ -1,78 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/versioninfo.h
-// Purpose:     declaration of wxVersionInfo class
-// Author:      Troels K
-// Created:     2010-11-22
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_VERSIONINFO_H_
-#define _WX_VERSIONINFO_H_
-
-#include "wx/string.h"
-
-// ----------------------------------------------------------------------------
-// wxVersionInfo: represents version information
-// ----------------------------------------------------------------------------
-
-class wxVersionInfo
-{
-public:
-    wxVersionInfo(const wxString& name = wxString(),
-                  int major = 0,
-                  int minor = 0,
-                  int micro = 0,
-                  const wxString& description = wxString(),
-                  const wxString& copyright = wxString())
-    {
-        m_name = name;
-        m_major = major;
-        m_minor = minor;
-        m_micro = micro;
-        m_description = description;
-        m_copyright = copyright;
-    }
-
-    // Default copy ctor, assignment operator and dtor are ok.
-
-
-    const wxString& GetName() const { return m_name; }
-
-    int GetMajor() const { return m_major; }
-    int GetMinor() const { return m_minor; }
-    int GetMicro() const { return m_micro; }
-
-    wxString ToString() const
-    {
-        return HasDescription() ? GetDescription() : GetVersionString();
-    }
-
-    wxString GetVersionString() const
-    {
-        wxString str;
-        str << m_name << ' ' << GetMajor() << '.' << GetMinor();
-        if ( GetMicro() )
-            str << '.' << GetMicro();
-
-        return str;
-    }
-
-    bool HasDescription() const { return !m_description.empty(); }
-    const wxString& GetDescription() const { return m_description; }
-
-    bool HasCopyright() const { return !m_copyright.empty(); }
-    const wxString& GetCopyright() const { return m_copyright; }
-
-private:
-    wxString m_name,
-             m_description,
-             m_copyright;
-
-    int m_major,
-        m_minor,
-        m_micro;
-};
-
-#endif // _WX_VERSIONINFO_H_
diff --git a/Source/3rd Party/wx/include/wx/vidmode.h b/Source/3rd Party/wx/include/wx/vidmode.h
index 3fe733c93..343d0de94 100644
--- a/Source/3rd Party/wx/include/wx/vidmode.h	
+++ b/Source/3rd Party/wx/include/wx/vidmode.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.09.2003 (extracted from wx/display.h)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: vidmode.h 27408 2004-05-23 20:53:33Z JS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
 // wxVideoMode: a simple struct containing video mode parameters for a display
 // ----------------------------------------------------------------------------
 
-struct WXDLLIMPEXP_CORE wxVideoMode
+struct WXDLLEXPORT wxVideoMode
 {
     wxVideoMode(int width = 0, int height = 0, int depth = 0, int freq = 0)
     {
@@ -54,7 +54,6 @@ struct WXDLLIMPEXP_CORE wxVideoMode
     int GetWidth() const { return w; }
     int GetHeight() const { return h; }
     int GetDepth() const { return bpp; }
-    int GetRefresh() const { return refresh; }
 
     // returns true if the object has been initialized
     bool IsOk() const { return w && h; }
diff --git a/Source/3rd Party/wx/include/wx/vlbox.h b/Source/3rd Party/wx/include/wx/vlbox.h
index ef68ee006..4aa3bf5d3 100644
--- a/Source/3rd Party/wx/include/wx/vlbox.h	
+++ b/Source/3rd Party/wx/include/wx/vlbox.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: vlbox.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,8 @@
 #include "wx/bitmap.h"
 
 class WXDLLIMPEXP_FWD_CORE wxSelectionStore;
-extern WXDLLIMPEXP_DATA_CORE(const char) wxVListBoxNameStr[];
+
+#define wxVListBoxNameStr wxT("wxVListBox")
 
 // ----------------------------------------------------------------------------
 // wxVListBox
@@ -31,7 +32,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxVListBoxNameStr[];
     It emits the same events as wxListBox and the same event macros may be used
     with it.
  */
-class WXDLLIMPEXP_CORE wxVListBox : public wxVScrolledWindow
+class WXDLLEXPORT wxVListBox : public wxVScrolledWindow
 {
 public:
     // constructors and such
@@ -74,7 +75,7 @@ public:
     // ---------
 
     // get the number of items in the control
-    size_t GetItemCount() const { return GetRowCount(); }
+    size_t GetItemCount() const { return GetLineCount(); }
 
     // does this control use multiple selection?
     bool HasMultipleSelection() const { return m_selStore != NULL; }
@@ -126,15 +127,13 @@ public:
     // get the background colour of selected cells
     const wxColour& GetSelectionBackground() const { return m_colBgSel; }
 
-    // get the item rect, returns empty rect if the item is not visible
-    wxRect GetItemRect(size_t n) const;
 
     // operations
     // ----------
 
     // set the number of items to be shown in the control
     //
-    // this is just a synonym for wxVScrolledWindow::SetRowCount()
+    // this is just a synonym for wxVScrolledWindow::SetLineCount()
     virtual void SetItemCount(size_t count);
 
     // delete all items from the control
@@ -190,9 +189,6 @@ public:
     // change the background colour of the selected cells
     void SetSelectionBackground(const wxColour& col);
 
-    // refreshes only the selected items
-    void RefreshSelected();
-
 
     virtual wxVisualAttributes GetDefaultAttributes() const
     {
@@ -203,8 +199,6 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_THEME; }
-
     // the derived class must implement this function to actually draw the item
     // with the given index on the provided DC
     virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const = 0;
@@ -229,11 +223,11 @@ protected:
     // current
     virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const;
 
-    // we implement OnGetRowHeight() in terms of OnMeasureItem() because this
+    // we implement OnGetLineHeight() in terms of OnMeasureItem() because this
     // allows us to add borders to the items easily
     //
     // this function is not supposed to be overridden by the derived classes
-    virtual wxCoord OnGetRowHeight(size_t line) const;
+    virtual wxCoord OnGetLineHeight(size_t line) const;
 
 
     // event handlers
@@ -241,15 +235,13 @@ protected:
     void OnKeyDown(wxKeyEvent& event);
     void OnLeftDown(wxMouseEvent& event);
     void OnLeftDClick(wxMouseEvent& event);
-    void OnSetOrKillFocus(wxFocusEvent& event);
-    void OnSize(wxSizeEvent& event);
+
 
     // common part of all ctors
     void Init();
 
     // send the wxEVT_COMMAND_LISTBOX_SELECTED event
     void SendSelectedEvent();
-    virtual void InitEvent(wxCommandEvent& event, int n);
 
     // common implementation of SelectAll() and DeselectAll()
     bool DoSelectAll(bool select);
@@ -272,14 +264,6 @@ protected:
     // common part of keyboard and mouse handling processing code
     void DoHandleItemClick(int item, int flags);
 
-    // paint the background of the given item using the provided colour if it's
-    // valid, otherwise just return false and do nothing (this is used by
-    // OnDrawBackground())
-    bool DoDrawSolidBackground(const wxColour& col,
-                               wxDC& dc,
-                               const wxRect& rect,
-                               size_t n) const;
-
 private:
     // the current item or wxNOT_FOUND
     //
@@ -304,7 +288,7 @@ private:
     wxColour m_colBgSel;
 
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxVListBox);
+    DECLARE_NO_COPY_CLASS(wxVListBox)
     DECLARE_ABSTRACT_CLASS(wxVListBox)
 };
 
diff --git a/Source/3rd Party/wx/include/wx/volume.h b/Source/3rd Party/wx/include/wx/volume.h
index 40aa99beb..7a958b98a 100644
--- a/Source/3rd Party/wx/include/wx/volume.h	
+++ b/Source/3rd Party/wx/include/wx/volume.h	
@@ -4,13 +4,13 @@
 // Author:      George Policello
 // Modified by:
 // Created:     28 Jan 02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: volume.h 39399 2006-05-28 23:08:31Z ABX $
 // Copyright:   (c) 2002 George Policello
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
-// wxFSVolume represents a volume/drive in a file system
+// wxFSVolume represents a volume/drive/mount point in a file system
 // ----------------------------------------------------------------------------
 
 #ifndef _WX_FSVOLUME_H_
@@ -23,7 +23,7 @@
 #include "wx/arrstr.h"
 
 // the volume flags
-enum wxFSVolumeFlags
+enum
 {
     // is the volume mounted?
     wxFS_VOL_MOUNTED = 0x0001,
diff --git a/Source/3rd Party/wx/include/wx/vscroll.h b/Source/3rd Party/wx/include/wx/vscroll.h
index 221e635ee..9063e108b 100644
--- a/Source/3rd Party/wx/include/wx/vscroll.h	
+++ b/Source/3rd Party/wx/include/wx/vscroll.h	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/vscroll.h
-// Purpose:     Variable scrolled windows (wx[V/H/HV]ScrolledWindow)
+// Name:        include/wx/vscroll.h
+// Purpose:     wxVScrolledWindow: generalization of wxScrolledWindow
 // Author:      Vadim Zeitlin
-// Modified by: Brad Anderson, Bryan Petty
+// Modified by:
 // Created:     30.05.03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: vscroll.h 38917 2006-04-26 00:17:52Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,683 +12,34 @@
 #ifndef _WX_VSCROLL_H_
 #define _WX_VSCROLL_H_
 
-#include "wx/panel.h"
-#include "wx/position.h"
+#include "wx/panel.h"           // base class
 
-class WXDLLIMPEXP_FWD_CORE wxVarScrollHelperEvtHandler;
-
-
-// Using the same techniques as the wxScrolledWindow class      |
-// hierarchy, the wx[V/H/HV]ScrolledWindow classes are slightly |
-// more complex (compare with the diagram outlined in           |
-// scrolwin.h) for the purpose of reducing code duplication     |
-// through the use of mix-in classes.                           |
-//                                                              |
-//                  wxVarScrollHelperBase                       |
-//                   /                 \                        |
-//                  /                   \                       |
-//                 V                     V                      |
-//  wxVarHScrollHelper                 wxVarVScrollHelper       |
-//       |          \                   /           |           |
-//       |           \                 /            |           |
-//       |            V               V             |           |
-//       |           wxVarHVScrollHelper            |           |
-//       |                      |                   |           |
-//       |                      |                   V           |
-//       |         wxPanel      |    wxVarVScrollLegacyAdaptor  |
-//       |         /  \  \      |                   |           |
-//       |        /    \  `-----|----------.        |           |
-//       |       /      \       |           \       |           |
-//       |      /        \      |            \      |           |
-//       V     V          \     |             V     V           |
-//  wxHScrolledWindow      \    |        wxVScrolledWindow      |
-//                          V   V                               |
-//                    wxHVScrolledWindow                        |
-//                                                              |
-//                                                              |
-//   Border added to suppress GCC multi-line comment warnings ->|
-
-
-// ===========================================================================
-// wxVarScrollHelperBase
-// ===========================================================================
-
-// Provides all base common scroll calculations needed for either orientation,
-// automatic scrollbar functionality, saved scroll positions, functionality
-// for changing the target window to be scrolled, as well as defining all
-// required virtual functions that need to be implemented for any orientation
-// specific work.
-
-class WXDLLIMPEXP_CORE wxVarScrollHelperBase
-{
-public:
-    // constructors and such
-    // ---------------------
-
-    wxVarScrollHelperBase(wxWindow *winToScroll);
-    virtual ~wxVarScrollHelperBase();
-
-    // operations
-    // ----------
-
-    // with physical scrolling on, the device origin is changed properly when
-    // a wxPaintDC is prepared, children are actually moved and laid out
-    // properly, and the contents of the window (pixels) are actually moved
-    void EnablePhysicalScrolling(bool scrolling = true)
-        { m_physicalScrolling = scrolling; }
-
-    // wxNOT_FOUND if none, i.e. if it is below the last item
-    int VirtualHitTest(wxCoord coord) const;
-
-    // recalculate all our parameters and redisplay all units
-    virtual void RefreshAll();
-
-    // accessors
-    // ---------
-
-    // get the first currently visible unit
-    size_t GetVisibleBegin() const { return m_unitFirst; }
-
-    // get the last currently visible unit
-    size_t GetVisibleEnd() const
-        { return m_unitFirst + m_nUnitsVisible; }
-
-    // is this unit currently visible?
-    bool IsVisible(size_t unit) const
-        { return unit >= m_unitFirst && unit < GetVisibleEnd(); }
-
-    // translate between scrolled and unscrolled coordinates
-    int CalcScrolledPosition(int coord) const
-        {  return DoCalcScrolledPosition(coord); }
-    int CalcUnscrolledPosition(int coord) const
-        {  return DoCalcUnscrolledPosition(coord); }
-
-    virtual int DoCalcScrolledPosition(int coord) const;
-    virtual int DoCalcUnscrolledPosition(int coord) const;
-
-    // update the thumb size shown by the scrollbar
-    virtual void UpdateScrollbar();
-    void RemoveScrollbar();
-
-    // Normally the wxScrolledWindow will scroll itself, but in some rare
-    // occasions you might want it to scroll [part of] another window (e.g. a
-    // child of it in order to scroll only a portion the area between the
-    // scrollbars (spreadsheet: only cell area will move).
-    virtual void SetTargetWindow(wxWindow *target);
-    virtual wxWindow *GetTargetWindow() const { return m_targetWindow; }
-
-    // Override this function to draw the graphic (or just process EVT_PAINT)
-    //virtual void OnDraw(wxDC& WXUNUSED(dc)) { }
-
-    // change the DC origin according to the scroll position. To properly
-    // forward calls to wxWindow::Layout use WX_FORWARD_TO_SCROLL_HELPER()
-    // derived class
-    virtual void DoPrepareDC(wxDC& dc);
-
-    // the methods to be called from the window event handlers
-    void HandleOnScroll(wxScrollWinEvent& event);
-    void HandleOnSize(wxSizeEvent& event);
-#if wxUSE_MOUSEWHEEL
-    void HandleOnMouseWheel(wxMouseEvent& event);
-#endif // wxUSE_MOUSEWHEEL
-
-    // these functions must be overidden in the derived class to return
-    // orientation specific data (e.g. the width for vertically scrolling
-    // derivatives in the case of GetOrientationTargetSize())
-    virtual int GetOrientationTargetSize() const = 0;
-    virtual int GetNonOrientationTargetSize() const = 0;
-    virtual wxOrientation GetOrientation() const = 0;
-
-protected:
-    // all *Unit* functions are protected to be exposed by
-    // wxVarScrollHelperBase implementations (with appropriate names)
-
-    // get the number of units this window contains (previously set by
-    // SetUnitCount())
-    size_t GetUnitCount() const { return m_unitMax; }
-
-    // set the number of units the helper contains: the derived class must
-    // provide the sizes for all units with indices up to the one given here
-    // in its OnGetUnitSize()
-    void SetUnitCount(size_t count);
-
-    // redraw the specified unit
-    virtual void RefreshUnit(size_t unit);
-
-    // redraw all units in the specified range (inclusive)
-    virtual void RefreshUnits(size_t from, size_t to);
-
-    // scroll to the specified unit: it will become the first visible unit in
-    // the window
-    //
-    // return true if we scrolled the window, false if nothing was done
-    bool DoScrollToUnit(size_t unit);
-
-    // scroll by the specified number of units/pages
-    virtual bool DoScrollUnits(int units);
-    virtual bool DoScrollPages(int pages);
-
-    // this function must be overridden in the derived class and it should
-    // return the size of the given unit in pixels
-    virtual wxCoord OnGetUnitSize(size_t n) const = 0;
-
-    // this function doesn't have to be overridden but it may be useful to do
-    // it if calculating the units' sizes is a relatively expensive operation
-    // as it gives the user code a possibility to calculate several of them at
-    // once
-    //
-    // OnGetUnitsSizeHint() is normally called just before OnGetUnitSize() but
-    // you shouldn't rely on the latter being called for all units in the
-    // interval specified here. It is also possible that OnGetUnitHeight() will
-    // be called for the units outside of this interval, so this is really just
-    // a hint, not a promise.
-    //
-    // finally note that unitMin is inclusive, while unitMax is exclusive, as
-    // usual
-    virtual void OnGetUnitsSizeHint(size_t WXUNUSED(unitMin),
-                                    size_t WXUNUSED(unitMax)) const
-        { }
-
-    // when the number of units changes, we try to estimate the total size
-    // of all units which is a rather expensive operation in terms of unit
-    // access, so if the user code may estimate the average size
-    // better/faster than we do, it should override this function to implement
-    // its own logic
-    //
-    // this function should return the best guess for the total size it may
-    // make
-    virtual wxCoord EstimateTotalSize() const { return DoEstimateTotalSize(); }
-
-    wxCoord DoEstimateTotalSize() const;
-
-    // find the index of the unit we need to show to fit the specified unit on
-    // the opposite side either fully or partially (depending on fullyVisible)
-    size_t FindFirstVisibleFromLast(size_t last,
-                                    bool fullyVisible = false) const;
-
-    // get the total size of the units between unitMin (inclusive) and
-    // unitMax (exclusive)
-    wxCoord GetUnitsSize(size_t unitMin, size_t unitMax) const;
-
-    // get the offset of the first visible unit
-    wxCoord GetScrollOffset() const
-        { return GetUnitsSize(0, GetVisibleBegin()); }
-
-    // get the size of the target window
-    wxSize GetTargetSize() const { return m_targetWindow->GetClientSize(); }
-
-    void GetTargetSize(int *w, int *h)
-    {
-        wxSize size = GetTargetSize();
-        if ( w )
-            *w = size.x;
-        if ( h )
-            *h = size.y;
-    }
-
-    // calculate the new scroll position based on scroll event type
-    size_t GetNewScrollPosition(wxScrollWinEvent& event) const;
-
-    // replacement implementation of wxWindow::Layout virtual method.  To
-    // properly forward calls to wxWindow::Layout use
-    // WX_FORWARD_TO_SCROLL_HELPER() derived class
-    bool ScrollLayout();
-
-#ifdef __WXMAC__
-    // queue mac window update after handling scroll event
-    virtual void UpdateMacScrollWindow() { }
-#endif // __WXMAC__
-
-    // change the target window
-    void DoSetTargetWindow(wxWindow *target);
-
-    // delete the event handler we installed
-    void DeleteEvtHandler();
-
-    // helper function abstracting the orientation test: with vertical
-    // orientation, it assigns the first value to x and the second one to y,
-    // with horizontal orientation it reverses them, i.e. the first value is
-    // assigned to y and the second one to x
-    void AssignOrient(wxCoord& x, wxCoord& y, wxCoord first, wxCoord second);
-
-    // similar to "oriented assignment" above but does "oriented increment":
-    // for vertical orientation, y is incremented by the given value and x if
-    // left unchanged, for horizontal orientation x is incremented
-    void IncOrient(wxCoord& x, wxCoord& y, wxCoord inc);
-
-private:
-
-    // the window that receives the scroll events and the window to actually
-    // scroll, respectively
-    wxWindow    *m_win,
-                *m_targetWindow;
-
-    // the total number of (logical) units
-    size_t m_unitMax;
-
-    // the total (estimated) size
-    wxCoord m_sizeTotal;
-
-    // the first currently visible unit
-    size_t m_unitFirst;
-
-    // the number of currently visible units (including the last, possibly only
-    // partly, visible one)
-    size_t m_nUnitsVisible;
-
-    // accumulated mouse wheel rotation
-#if wxUSE_MOUSEWHEEL
-    int m_sumWheelRotation;
-#endif
-
-    // do child scrolling (used in DoPrepareDC())
-    bool m_physicalScrolling;
-
-    // handler injected into target window to forward some useful events to us
-    wxVarScrollHelperEvtHandler *m_handler;
-};
-
-
-
-// ===========================================================================
-// wxVarVScrollHelper
-// ===========================================================================
-
-// Provides public API functions targeted for vertical-specific scrolling,
-// wrapping the functionality of wxVarScrollHelperBase.
-
-class WXDLLIMPEXP_CORE wxVarVScrollHelper : public wxVarScrollHelperBase
-{
-public:
-    // constructors and such
-    // ---------------------
-
-    // ctor must be given the associated window
-    wxVarVScrollHelper(wxWindow *winToScroll)
-        : wxVarScrollHelperBase(winToScroll)
-    {
-    }
-
-    // operators
-
-    void SetRowCount(size_t rowCount) { SetUnitCount(rowCount); }
-    bool ScrollToRow(size_t row) { return DoScrollToUnit(row); }
-
-    virtual bool ScrollRows(int rows)
-        { return DoScrollUnits(rows); }
-    virtual bool ScrollRowPages(int pages)
-        { return DoScrollPages(pages); }
-
-    virtual void RefreshRow(size_t row)
-        { RefreshUnit(row); }
-    virtual void RefreshRows(size_t from, size_t to)
-        { RefreshUnits(from, to); }
-
-    // accessors
-
-    size_t GetRowCount() const                  { return GetUnitCount(); }
-    size_t GetVisibleRowsBegin() const          { return GetVisibleBegin(); }
-    size_t GetVisibleRowsEnd() const            { return GetVisibleEnd(); }
-    bool IsRowVisible(size_t row) const         { return IsVisible(row); }
-
-    virtual int GetOrientationTargetSize() const
-        { return GetTargetWindow()->GetClientSize().y; }
-    virtual int GetNonOrientationTargetSize() const
-        { return GetTargetWindow()->GetClientSize().x; }
-    virtual wxOrientation GetOrientation() const { return wxVERTICAL; }
-
-protected:
-    // this function must be overridden in the derived class and it should
-    // return the size of the given row in pixels
-    virtual wxCoord OnGetRowHeight(size_t n) const = 0;
-    wxCoord OnGetUnitSize(size_t n) const       { return OnGetRowHeight(n); }
-
-    virtual void OnGetRowsHeightHint(size_t WXUNUSED(rowMin),
-                                     size_t WXUNUSED(rowMax)) const { }
-
-    // forward calls to OnGetRowsHeightHint()
-    virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const
-        { OnGetRowsHeightHint(unitMin, unitMax); }
-
-    // again, if not overridden, it will fall back on default method
-    virtual wxCoord EstimateTotalHeight() const
-        { return DoEstimateTotalSize(); }
-
-    // forward calls to EstimateTotalHeight()
-    virtual wxCoord EstimateTotalSize() const { return EstimateTotalHeight(); }
-
-    wxCoord GetRowsHeight(size_t rowMin, size_t rowMax) const
-        { return GetUnitsSize(rowMin, rowMax); }
-};
-
-
-
-// ===========================================================================
-// wxVarHScrollHelper
-// ===========================================================================
-
-// Provides public API functions targeted for horizontal-specific scrolling,
-// wrapping the functionality of wxVarScrollHelperBase.
-
-class WXDLLIMPEXP_CORE wxVarHScrollHelper : public wxVarScrollHelperBase
-{
-public:
-    // constructors and such
-    // ---------------------
-
-    // ctor must be given the associated window
-    wxVarHScrollHelper(wxWindow *winToScroll)
-        : wxVarScrollHelperBase(winToScroll)
-    {
-    }
-
-    // operators
-
-    void SetColumnCount(size_t columnCount)
-        { SetUnitCount(columnCount); }
-
-    bool ScrollToColumn(size_t column)
-        { return DoScrollToUnit(column); }
-    virtual bool ScrollColumns(int columns)
-        { return DoScrollUnits(columns); }
-    virtual bool ScrollColumnPages(int pages)
-        { return DoScrollPages(pages); }
-
-    virtual void RefreshColumn(size_t column)
-        { RefreshUnit(column); }
-    virtual void RefreshColumns(size_t from, size_t to)
-        { RefreshUnits(from, to); }
-
-    // accessors
-
-    size_t GetColumnCount() const
-        { return GetUnitCount(); }
-    size_t GetVisibleColumnsBegin() const
-        { return GetVisibleBegin(); }
-    size_t GetVisibleColumnsEnd() const
-        { return GetVisibleEnd(); }
-    bool IsColumnVisible(size_t column) const
-        { return IsVisible(column); }
-
-
-    virtual int GetOrientationTargetSize() const
-        { return GetTargetWindow()->GetClientSize().x; }
-    virtual int GetNonOrientationTargetSize() const
-        { return GetTargetWindow()->GetClientSize().y; }
-    virtual wxOrientation GetOrientation() const   { return wxHORIZONTAL; }
-
-protected:
-    // this function must be overridden in the derived class and it should
-    // return the size of the given column in pixels
-    virtual wxCoord OnGetColumnWidth(size_t n) const = 0;
-    wxCoord OnGetUnitSize(size_t n) const { return OnGetColumnWidth(n); }
-
-    virtual void OnGetColumnsWidthHint(size_t WXUNUSED(columnMin),
-                                        size_t WXUNUSED(columnMax)) const
-        { }
-
-    // forward calls to OnGetColumnsWidthHint()
-    virtual void OnGetUnitsSizeHint(size_t unitMin, size_t unitMax) const
-        { OnGetColumnsWidthHint(unitMin, unitMax); }
-
-    // again, if not overridden, it will fall back on default method
-    virtual wxCoord EstimateTotalWidth() const { return DoEstimateTotalSize(); }
-
-    // forward calls to EstimateTotalWidth()
-    virtual wxCoord EstimateTotalSize() const { return EstimateTotalWidth(); }
-
-    wxCoord GetColumnsWidth(size_t columnMin, size_t columnMax) const
-        { return GetUnitsSize(columnMin, columnMax); }
-};
-
-
-
-// ===========================================================================
-// wxVarHVScrollHelper
-// ===========================================================================
-
-// Provides public API functions targeted at functions with similar names in
-// both wxVScrollHelper and wxHScrollHelper so class scope doesn't need to be
-// specified (since we are using multiple inheritance). It also provides
-// functions to make changing values for both orientations at the same time
-// easier.
-
-class WXDLLIMPEXP_CORE wxVarHVScrollHelper : public wxVarVScrollHelper,
-                                        public wxVarHScrollHelper
-{
-public:
-    // constructors and such
-    // ---------------------
-
-    // ctor must be given the associated window
-    wxVarHVScrollHelper(wxWindow *winToScroll)
-        : wxVarVScrollHelper(winToScroll), wxVarHScrollHelper(winToScroll) { }
-
-    // operators
-    // ---------
-
-    // set the number of units the window contains for each axis: the derived
-    // class must provide the widths and heights for all units with indices up
-    // to each of the one given here in its OnGetColumnWidth() and
-    // OnGetRowHeight()
-    void SetRowColumnCount(size_t rowCount, size_t columnCount);
-
-
-    // with physical scrolling on, the device origin is changed properly when
-    // a wxPaintDC is prepared, children are actually moved and laid out
-    // properly, and the contents of the window (pixels) are actually moved
-    void EnablePhysicalScrolling(bool vscrolling = true, bool hscrolling = true)
-    {
-        wxVarVScrollHelper::EnablePhysicalScrolling(vscrolling);
-        wxVarHScrollHelper::EnablePhysicalScrolling(hscrolling);
-    }
-
-    // scroll to the specified row/column: it will become the first visible
-    // cell in the window
-    //
-    // return true if we scrolled the window, false if nothing was done
-    bool ScrollToRowColumn(size_t row, size_t column);
-    bool ScrollToRowColumn(const wxPosition &pos)
-        { return ScrollToRowColumn(pos.GetRow(), pos.GetColumn()); }
-
-    // redraw the specified cell
-    virtual void RefreshRowColumn(size_t row, size_t column);
-    virtual void RefreshRowColumn(const wxPosition &pos)
-        { RefreshRowColumn(pos.GetRow(), pos.GetColumn()); }
-
-    // redraw the specified regions (inclusive).  If the target window for
-    // both orientations is the same the rectangle of cells is refreshed; if
-    // the target windows differ the entire client size opposite the
-    // orientation direction is refreshed between the specified limits
-    virtual void RefreshRowsColumns(size_t fromRow, size_t toRow,
-                                    size_t fromColumn, size_t toColumn);
-    virtual void RefreshRowsColumns(const wxPosition& from,
-                                    const wxPosition& to)
-    {
-        RefreshRowsColumns(from.GetRow(), to.GetRow(),
-                          from.GetColumn(), to.GetColumn());
-    }
-
-    // locate the virtual position from the given device coordinates
-    wxPosition VirtualHitTest(wxCoord x, wxCoord y) const;
-    wxPosition VirtualHitTest(const wxPoint &pos) const
-        { return VirtualHitTest(pos.x, pos.y); }
-
-    // change the DC origin according to the scroll position. To properly
-    // forward calls to wxWindow::Layout use WX_FORWARD_TO_SCROLL_HELPER()
-    // derived class. We use this version to call both base classes'
-    // DoPrepareDC()
-    virtual void DoPrepareDC(wxDC& dc);
-
-    // replacement implementation of wxWindow::Layout virtual method.  To
-    // properly forward calls to wxWindow::Layout use
-    // WX_FORWARD_TO_SCROLL_HELPER() derived class. We use this version to
-    // call both base classes' ScrollLayout()
-    bool ScrollLayout();
-
-    // accessors
-    // ---------
-
-    // get the number of units this window contains (previously set by
-    // Set[Column/Row/RowColumn/Unit]Count())
-    wxSize GetRowColumnCount() const;
-
-    // get the first currently visible units
-    wxPosition GetVisibleBegin() const;
-    wxPosition GetVisibleEnd() const;
-
-    // is this cell currently visible?
-    bool IsVisible(size_t row, size_t column) const;
-    bool IsVisible(const wxPosition &pos) const
-        { return IsVisible(pos.GetRow(), pos.GetColumn()); }
-};
-
-
-
-#if WXWIN_COMPATIBILITY_2_8
-
-// ===========================================================================
-// wxVarVScrollLegacyAdaptor
-// ===========================================================================
-
-// Provides backwards compatible API for applications originally built using
-// wxVScrolledWindow in 2.6 or 2.8. Originally, wxVScrolledWindow referred
-// to scrolling "lines". We use "units" in wxVarScrollHelperBase to avoid
-// implying any orientation (since the functions are used for both horizontal
-// and vertical scrolling in derived classes). And in the new
-// wxVScrolledWindow and wxHScrolledWindow classes, we refer to them as
-// "rows" and "columns", respectively. This is to help clear some confusion
-// in not only those classes, but also in wxHVScrolledWindow where functions
-// are inherited from both.
-
-class WXDLLIMPEXP_CORE wxVarVScrollLegacyAdaptor : public wxVarVScrollHelper
-{
-public:
-    // constructors and such
-    // ---------------------
-    wxVarVScrollLegacyAdaptor(wxWindow *winToScroll)
-        : wxVarVScrollHelper(winToScroll)
-    {
-    }
-
-    // accessors
-    // ---------
-
-    // this is the same as GetVisibleRowsBegin(), exists to match
-    // GetLastVisibleLine() and for backwards compatibility only
-    wxDEPRECATED( size_t GetFirstVisibleLine() const );
-
-    // get the last currently visible line
-    //
-    // this function is unsafe as it returns (size_t)-1 (i.e. a huge positive
-    // number) if the control is empty, use GetVisibleRowsEnd() instead, this
-    // one is kept for backwards compatibility
-    wxDEPRECATED( size_t GetLastVisibleLine() const );
-
-    // "line" to "unit" compatibility functions
-    // ----------------------------------------
-
-    // get the number of lines this window contains (set by SetLineCount())
-    wxDEPRECATED( size_t GetLineCount() const );
-
-    // set the number of lines the helper contains: the derived class must
-    // provide the sizes for all lines with indices up to the one given here
-    // in its OnGetLineHeight()
-    wxDEPRECATED( void SetLineCount(size_t count) );
-
-    // redraw the specified line
-    wxDEPRECATED( virtual void RefreshLine(size_t line) );
-
-    // redraw all lines in the specified range (inclusive)
-    wxDEPRECATED( virtual void RefreshLines(size_t from, size_t to) );
-
-    // scroll to the specified line: it will become the first visible line in
-    // the window
-    //
-    // return true if we scrolled the window, false if nothing was done
-    wxDEPRECATED( bool ScrollToLine(size_t line) );
-
-    // scroll by the specified number of lines/pages
-    wxDEPRECATED( virtual bool ScrollLines(int lines) );
-    wxDEPRECATED( virtual bool ScrollPages(int pages) );
-
-protected:
-    // unless the code has been updated to override OnGetRowHeight() instead,
-    // this function must be overridden in the derived class and it should
-    // return the height of the given row in pixels
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual wxCoord OnGetLineHeight(size_t n) const );
-
-    // forwards the calls from base class pure virtual function to pure virtual
-    // OnGetLineHeight instead (backwards compatible name)
-    // note that we don't need to forward OnGetUnitSize() as it is already
-    // forwarded to OnGetRowHeight() in wxVarVScrollHelper
-    virtual wxCoord OnGetRowHeight(size_t n) const;
-
-    // this function doesn't have to be overridden but it may be useful to do
-    // it if calculating the lines heights is a relatively expensive operation
-    // as it gives the user code a possibility to calculate several of them at
-    // once
-    //
-    // OnGetLinesHint() is normally called just before OnGetLineHeight() but you
-    // shouldn't rely on the latter being called for all lines in the interval
-    // specified here. It is also possible that OnGetLineHeight() will be
-    // called for the lines outside of this interval, so this is really just a
-    // hint, not a promise.
-    //
-    // finally note that lineMin is inclusive, while lineMax is exclusive, as
-    // usual
-    wxDEPRECATED_BUT_USED_INTERNALLY( virtual void OnGetLinesHint(
-        size_t lineMin, size_t lineMax) const );
-
-    // forwards the calls from base class pure virtual function to pure virtual
-    // OnGetLinesHint instead (backwards compatible name)
-    void OnGetRowsHeightHint(size_t rowMin, size_t rowMax) const;
-};
-
-#else // !WXWIN_COMPATIBILITY_2_8
-
-// shortcut to avoid checking compatibility modes later
-// remove this and all references to wxVarVScrollLegacyAdaptor once
-// wxWidgets 2.6 and 2.8 compatibility is removed
-typedef wxVarVScrollHelper wxVarVScrollLegacyAdaptor;
-
-#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8
-
-
-// this macro must be used in declaration of wxVarScrollHelperBase-derived
-// classes
-#define WX_FORWARD_TO_VAR_SCROLL_HELPER()                                     \
-public:                                                                       \
-    virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }                     \
-    virtual bool Layout() { return ScrollLayout(); }
-
-
-
-// ===========================================================================
+// ----------------------------------------------------------------------------
 // wxVScrolledWindow
-// ===========================================================================
+// ----------------------------------------------------------------------------
 
-// In the name of this class, "V" may stand for "variable" because it can be
-// used for scrolling rows of variable heights; "virtual", because it is not
-// necessary to know the heights of all rows in advance -- only those which
-// are shown on the screen need to be measured; or even "vertical", because
-// this class only supports scrolling vertically.
+/*
+   In the name of this class, "V" may stand for "variable" because it can be
+   used for scrolling lines of variable heights; "virtual" because it is not
+   necessary to know the heights of all lines in advance -- only those which
+   are shown on the screen need to be measured; or, even, "vertical" because
+   this class only supports scrolling in one direction currently (this could
+   and probably will change in the future however).
 
-// In any case, this is a generalization of the wxScrolledWindow class which
-// can be only used when all rows have the same heights. It lacks some other
-// wxScrolledWindow features however, notably it can't scroll only a rectangle
-// of the window and not its entire client area.
-
-class WXDLLIMPEXP_CORE wxVScrolledWindow : public wxPanel,
-                                      public wxVarVScrollLegacyAdaptor
+   In any case, this is a generalization of the wxScrolledWindow class which
+   can be only used when all lines have the same height. It lacks some other
+   wxScrolledWindow features however, notably it currently lacks support for
+   horizontal scrolling; it can't scroll another window nor only a rectangle
+   of the window and not its entire client area.
+ */
+class WXDLLEXPORT wxVScrolledWindow : public wxPanel
 {
 public:
     // constructors and such
     // ---------------------
 
     // default ctor, you must call Create() later
-    wxVScrolledWindow() : wxVarVScrollLegacyAdaptor(this) { }
+    wxVScrolledWindow() { Init(); }
 
     // normal ctor, no need to call Create() after this one
     //
@@ -700,8 +51,9 @@ public:
                       const wxSize& size = wxDefaultSize,
                       long style = 0,
                       const wxString& name = wxPanelNameStr)
-    : wxVarVScrollLegacyAdaptor(this)
     {
+        Init();
+
         (void)Create(parent, id, pos, size, style, name);
     }
 
@@ -719,158 +71,153 @@ public:
         return wxPanel::Create(parent, id, pos, size, style | wxVSCROLL, name);
     }
 
-#if WXWIN_COMPATIBILITY_2_8
-    // Make sure we prefer our version of HitTest rather than wxWindow's
-    // These functions should no longer be masked in favor of VirtualHitTest()
-    int HitTest(wxCoord WXUNUSED(x), wxCoord y) const
-        { return wxVarVScrollHelper::VirtualHitTest(y); }
-    int HitTest(const wxPoint& pt) const
-        { return HitTest(pt.x, pt.y); }
-#endif // WXWIN_COMPATIBILITY_2_8
 
-    WX_FORWARD_TO_VAR_SCROLL_HELPER()
+    // operations
+    // ----------
+
+    // set the number of lines the window contains: the derived class must
+    // provide the heights for all lines with indices up to the one given here
+    // in its OnGetLineHeight()
+    void SetLineCount(size_t count);
+
+    // scroll to the specified line: it will become the first visible line in
+    // the window
+    //
+    // return true if we scrolled the window, false if nothing was done
+    bool ScrollToLine(size_t line);
+
+    // scroll by the specified number of lines/pages
+    virtual bool ScrollLines(int lines);
+    virtual bool ScrollPages(int pages);
+
+    // redraw the specified line
+    virtual void RefreshLine(size_t line);
+
+    // redraw all lines in the specified range (inclusive)
+    virtual void RefreshLines(size_t from, size_t to);
+
+    // return the item at the specified (in physical coordinates) position or.
+
+    // wxNOT_FOUND if none, i.e. if it is below the last item
+    int HitTest(wxCoord x, wxCoord y) const;
+    int HitTest(const wxPoint& pt) const { return HitTest(pt.x, pt.y); }
+
+    // recalculate all our parameters and redisplay all lines
+    virtual void RefreshAll();
+
+
+    // accessors
+    // ---------
+
+    // get the number of lines this window contains (previously set by
+    // SetLineCount())
+    size_t GetLineCount() const { return m_lineMax; }
+
+    // get the first currently visible line
+    size_t GetVisibleBegin() const { return m_lineFirst; }
+
+    // get the first currently visible line
+    size_t GetVisibleEnd() const { return m_lineFirst + m_nVisible; }
+
+    // is this line currently visible?
+    bool IsVisible(size_t line) const
+        { return line >= GetVisibleBegin() && line < GetVisibleEnd(); }
+
+
+    // this is the same as GetVisibleBegin(), exists to match
+    // GetLastVisibleLine() and for backwards compatibility only
+    size_t GetFirstVisibleLine() const { return m_lineFirst; }
+
+    // get the last currently visible line
+    //
+    // this function is unsafe as it returns (size_t)-1 (i.e. a huge positive
+    // number) if the control is empty, use GetVisibleEnd() instead, this one
+    // is kept for backwards compatibility
+    size_t GetLastVisibleLine() const { return GetVisibleEnd() - 1; }
+
+    // layout the children (including the sizer if needed)
+    virtual bool Layout();
 
-#ifdef __WXMAC__
 protected:
-    virtual void UpdateMacScrollWindow() { Update(); }
-#endif // __WXMAC__
+    // this function must be overridden in the derived class and it should
+    // return the height of the given line in pixels
+    virtual wxCoord OnGetLineHeight(size_t n) const = 0;
+
+    // this function doesn't have to be overridden but it may be useful to do
+    // it if calculating the lines heights is a relatively expensive operation
+    // as it gives the user code a possibility to calculate several of them at
+    // once
+    //
+    // OnGetLinesHint() is normally called just before OnGetLineHeight() but you
+    // shouldn't rely on the latter being called for all lines in the interval
+    // specified here. It is also possible that OnGetLineHeight() will be
+    // called for the lines outside of this interval, so this is really just a
+    // hint, not a promise.
+    //
+    // finally note that lineMin is inclusive, while lineMax is exclusive, as
+    // usual
+    virtual void OnGetLinesHint(size_t WXUNUSED(lineMin),
+                                size_t WXUNUSED(lineMax)) const { }
+
+    // when the number of lines changes, we try to estimate the total height
+    // of all lines which is a rather expensive operation in terms of lines
+    // access, so if the user code may estimate the average height
+    // better/faster than we do, it should override this function to implement
+    // its own logic
+    //
+    // this function should return the best guess for the total height it may
+    // make
+    virtual wxCoord EstimateTotalHeight() const;
+
+
+    // the event handlers
+    void OnSize(wxSizeEvent& event);
+    void OnScroll(wxScrollWinEvent& event);
+#if wxUSE_MOUSEWHEEL
+    void OnMouseWheel(wxMouseEvent& event);
+#endif
+
+    // find the index of the line we need to show at the top of the window such
+    // that the last (fully or partially) visible line is the given one
+    size_t FindFirstFromBottom(size_t lineLast, bool fullyVisible = false);
+
+    // get the total height of the lines between lineMin (inclusive) and
+    // lineMax (exclusive)
+    wxCoord GetLinesHeight(size_t lineMin, size_t lineMax) const;
+
+    // update the thumb size shown by the scrollbar
+    void UpdateScrollbar();
+
+    // remove the scrollbar completely because we don't need it
+    void RemoveScrollbar();
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxVScrolledWindow);
+    // common part of all ctors
+    void Init();
+
+
+    // the total number of (logical) lines
+    size_t m_lineMax;
+
+    // the total (estimated) height
+    wxCoord m_heightTotal;
+
+    // the first currently visible line
+    size_t m_lineFirst;
+
+    // the number of currently visible lines (including the last, possibly only
+    // partly, visible one)
+    size_t m_nVisible;
+
+    // accumulated mouse wheel rotation
+#if wxUSE_MOUSEWHEEL
+    int m_sumWheelRotation;
+#endif
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxVScrolledWindow)
     DECLARE_ABSTRACT_CLASS(wxVScrolledWindow)
 };
 
-
-
-// ===========================================================================
-// wxHScrolledWindow
-// ===========================================================================
-
-// In the name of this class, "H" stands for "horizontal" because it can be
-// used for scrolling columns of variable widths. It is not necessary to know
-// the widths of all columns in advance -- only those which are shown on the
-// screen need to be measured.
-
-// This is a generalization of the wxScrolledWindow class which can be only
-// used when all columns have the same width. It lacks some other
-// wxScrolledWindow features however, notably it can't scroll only a rectangle
-// of the window and not its entire client area.
-
-class WXDLLIMPEXP_CORE wxHScrolledWindow : public wxPanel,
-                                      public wxVarHScrollHelper
-{
-public:
-    // constructors and such
-    // ---------------------
-
-    // default ctor, you must call Create() later
-    wxHScrolledWindow() : wxVarHScrollHelper(this) { }
-
-    // normal ctor, no need to call Create() after this one
-    //
-    // note that wxHSCROLL is always automatically added to our style, there is
-    // no need to specify it explicitly
-    wxHScrolledWindow(wxWindow *parent,
-                      wxWindowID id = wxID_ANY,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize,
-                      long style = 0,
-                      const wxString& name = wxPanelNameStr)
-        : wxVarHScrollHelper(this)
-    {
-        (void)Create(parent, id, pos, size, style, name);
-    }
-
-    // same as the previous ctor but returns status code: true if ok
-    //
-    // just as with the ctor above, wxHSCROLL style is always used, there is no
-    // need to specify it
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr)
-    {
-        return wxPanel::Create(parent, id, pos, size, style | wxHSCROLL, name);
-    }
-
-    WX_FORWARD_TO_VAR_SCROLL_HELPER()
-
-#ifdef __WXMAC__
-protected:
-    virtual void UpdateMacScrollWindow() { Update(); }
-#endif // __WXMAC__
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxHScrolledWindow);
-    DECLARE_ABSTRACT_CLASS(wxHScrolledWindow)
-};
-
-
-
-// ===========================================================================
-// wxHVScrolledWindow
-// ===========================================================================
-
-// This window inherits all functionality of both vertical and horizontal
-// scrolled windows automatically handling everything needed to scroll both
-// axis simultaneously.
-
-class WXDLLIMPEXP_CORE wxHVScrolledWindow : public wxPanel,
-                                       public wxVarHVScrollHelper
-{
-public:
-    // constructors and such
-    // ---------------------
-
-    // default ctor, you must call Create() later
-    wxHVScrolledWindow()
-        : wxPanel(),
-          wxVarHVScrollHelper(this) { }
-
-    // normal ctor, no need to call Create() after this one
-    //
-    // note that wxVSCROLL and wxHSCROLL are always automatically added to our
-    // style, there is no need to specify them explicitly
-    wxHVScrolledWindow(wxWindow *parent,
-                       wxWindowID id = wxID_ANY,
-                       const wxPoint& pos = wxDefaultPosition,
-                       const wxSize& size = wxDefaultSize,
-                       long style = 0,
-                       const wxString& name = wxPanelNameStr)
-        : wxPanel(),
-          wxVarHVScrollHelper(this)
-    {
-        (void)Create(parent, id, pos, size, style, name);
-    }
-
-    // same as the previous ctor but returns status code: true if ok
-    //
-    // just as with the ctor above, wxVSCROLL and wxHSCROLL styles are always
-    // used, there is no need to specify them
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr)
-    {
-        return wxPanel::Create(parent, id, pos, size,
-                               style | wxVSCROLL | wxHSCROLL, name);
-    }
-
-    WX_FORWARD_TO_VAR_SCROLL_HELPER()
-
-#ifdef __WXMAC__
-protected:
-    virtual void UpdateMacScrollWindow() { Update(); }
-#endif // __WXMAC__
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxHVScrolledWindow);
-    DECLARE_ABSTRACT_CLASS(wxHVScrolledWindow)
-};
-
 #endif // _WX_VSCROLL_H_
 
diff --git a/Source/3rd Party/wx/include/wx/weakref.h b/Source/3rd Party/wx/include/wx/weakref.h
deleted file mode 100644
index 4558b110c..000000000
--- a/Source/3rd Party/wx/include/wx/weakref.h	
+++ /dev/null
@@ -1,353 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/weakref.h
-// Purpose:     wxWeakRef - Generic weak references for wxWidgets
-// Author:      Arne Steinarson
-// Created:     27 Dec 07
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Arne Steinarson
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WEAKREF_H_
-#define _WX_WEAKREF_H_
-
-#include "wx/tracker.h"
-
-
-// Some compilers (VC6, Borland, g++ < 3.3) have problem with template specialization.
-// However, this is only used for optimization purposes (a smaller wxWeakRef pointer)
-// (and the corner case of wxWeakRef<wxObject>). So for those compilers, we can fall
-// back to the non-optimal case, where we use the same type of weak ref (static one)
-// in all cases. See defs.h for various setting these defines depending on compiler.
-
-#if !defined(HAVE_PARTIAL_SPECIALIZATION) || \
-    !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) || \
-    (defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 3))
-    #define USE_ONLY_STATIC_WEAKREF
-#endif
-
-
-#ifndef USE_ONLY_STATIC_WEAKREF
-
-// Avoid including this for simpler compilers
-#include "wx/meta/convertible.h"
-#include "wx/meta/int2type.h"
-
-template <class T>
-struct wxIsStaticTrackable
-{
-    enum { value = wxConvertibleTo<T, wxTrackable>::value };
-};
-
-#endif // !USE_ONLY_STATIC_WEAKREF
-
-
-// Weak ref implementation when T has wxTrackable as a known base class
-template <class T>
-class wxWeakRefStatic : public wxTrackerNode
-{
-public:
-    wxWeakRefStatic() : m_pobj(NULL) { }
-
-    void Release()
-    {
-        // Release old object if any
-        if ( m_pobj )
-        {
-            // Remove ourselves from object tracker list
-            wxTrackable *pt = static_cast<wxTrackable*>(m_pobj);
-            pt->RemoveNode(this);
-            m_pobj = NULL;
-        }
-    }
-
-    virtual void OnObjectDestroy()
-    {
-        // Tracked object itself removes us from list of trackers
-        wxASSERT(m_pobj != NULL);
-        m_pobj = NULL;
-    }
-
-protected:
-    void Assign(T* pobj)
-    {
-        if ( m_pobj == pobj )
-            return;
-
-        Release();
-
-        // Now set new trackable object
-        if ( pobj )
-        {
-            // Add ourselves to object tracker list
-            wxTrackable *pt = static_cast<wxTrackable*>(pobj);
-            pt->AddNode(this);
-            m_pobj = pobj;
-        }
-    }
-
-    void AssignCopy(const wxWeakRefStatic& wr)
-    {
-        Assign( wr.m_pobj );
-    }
-
-    T *m_pobj;
-};
-
-
-
-#ifndef USE_ONLY_STATIC_WEAKREF
-
-template<class T,bool use_static>
-struct wxWeakRefImpl;
-
-// Intermediate class, to select the static case above.
-template <class T>
-struct wxWeakRefImpl<T, true> : public wxWeakRefStatic<T>
-{
-    enum { value = 1 };
-};
-
-// Weak ref implementation when T does not have wxTrackable as known base class
-template<class T>
-struct wxWeakRefImpl<T, false> : public wxTrackerNode
-{
-    void Release()
-    {
-        // Release old object if any
-        if ( m_pobj )
-        {
-            // Remove ourselves from object tracker list
-            m_ptbase->RemoveNode(this);
-            m_pobj = NULL;
-            m_ptbase = NULL;
-        }
-    }
-
-    virtual void OnObjectDestroy()
-    {
-        // Tracked object itself removes us from list of trackers
-        wxASSERT(m_pobj != NULL);
-        m_pobj = NULL;
-        m_ptbase = NULL;
-    }
-
-protected:
-    wxWeakRefImpl() : m_pobj(NULL), m_ptbase(NULL) { }
-
-    // Assign receives most derived class here and can use that
-    template <class TDerived>
-    void Assign( TDerived* pobj )
-    {
-        AssignHelper( pobj, wxInt2Type<wxIsStaticTrackable<TDerived>::value>() );
-    }
-
-    template <class TDerived>
-    void AssignHelper(TDerived* pobj, wxInt2Type<true>)
-    {
-        wxTrackable *ptbase = static_cast<wxTrackable*>(pobj);
-        DoAssign( pobj, ptbase );
-    }
-
-#ifndef wxNO_RTTI
-    void AssignHelper(T* pobj, wxInt2Type<false>)
-    {
-        // A last way to get a trackable pointer
-        wxTrackable *ptbase = dynamic_cast<wxTrackable*>(pobj);
-        if ( ptbase )
-        {
-            DoAssign( pobj, ptbase );
-        }
-        else
-        {
-            wxFAIL_MSG( "Tracked class should inherit from wxTrackable" );
-
-            Release();
-        }
-    }
-#endif // RTTI enabled
-
-    void AssignCopy(const wxWeakRefImpl& wr)
-    {
-        DoAssign(wr.m_pobj, wr.m_ptbase);
-    }
-
-    void DoAssign( T* pobj, wxTrackable *ptbase ) {
-        if( m_pobj==pobj ) return;
-        Release();
-
-        // Now set new trackable object
-        if( pobj )
-        {
-            // Add ourselves to object tracker list
-            wxASSERT( ptbase );
-            ptbase->AddNode( this );
-            m_pobj = pobj;
-            m_ptbase = ptbase;
-        }
-    }
-
-    T *m_pobj;
-    wxTrackable *m_ptbase;
-};
-
-#endif // #ifndef USE_ONLY_STATIC_WEAKREF
-
-
-
-// A weak reference to an object of type T, where T has base wxTrackable
-// (usually statically but if not dynamic_cast<> is tried).
-template <class T>
-class wxWeakRef : public
-#ifdef USE_ONLY_STATIC_WEAKREF
-                  wxWeakRefStatic<T>
-#else
-                  wxWeakRefImpl<T, wxIsStaticTrackable<T>::value != 0>
-#endif
-{
-public:
-    typedef T element_type;
-
-    // Default ctor
-    wxWeakRef() { }
-
-    // Enabling this ctor for VC6 results in mysterious compilation failures in
-    // wx/window.h when assigning wxWindow pointers (FIXME-VC6)
-#ifndef __VISUALC6__
-    // Ctor from the object of this type: this is needed as the template ctor
-    // below is not used by at least g++4 when a literal NULL is used
-    wxWeakRef(T *pobj)
-    {
-        this->Assign(pobj);
-    }
-#endif // !__VISUALC6__
-
-    // When we have the full type here, static_cast<> will always work
-    // (or give a straight compiler error).
-    template <class TDerived>
-    wxWeakRef(TDerived* pobj)
-    {
-        this->Assign(pobj);
-    }
-
-    // We need this copy ctor, since otherwise a default compiler (binary) copy
-    // happens (if embedded as an object member).
-    wxWeakRef(const wxWeakRef<T>& wr)
-    {
-        this->Assign(wr.get());
-    }
-
-    wxWeakRef<T>& operator=(const wxWeakRef<T>& wr)
-    {
-        this->AssignCopy(wr);
-        return *this;
-    }
-
-    virtual ~wxWeakRef() { this->Release(); }
-
-    // Smart pointer functions
-    T& operator*() const    { return *this->m_pobj; }
-    T* operator->() const   { return this->m_pobj; }
-
-    T* get() const          { return this->m_pobj; }
-    operator T*() const     { return this->m_pobj; }
-};
-
-
-#ifndef wxNO_RTTI
-
-// Weak ref implementation assign objects are queried for wxTrackable
-// using dynamic_cast<>
-template <class T>
-class wxWeakRefDynamic : public wxTrackerNode
-{
-public:
-    wxWeakRefDynamic() : m_pobj(NULL) { }
-
-    wxWeakRefDynamic(T* pobj) : m_pobj(pobj)
-    {
-        Assign(pobj);
-    }
-
-    wxWeakRefDynamic(const wxWeakRef<T>& wr)
-    {
-        Assign(wr.get());
-    }
-
-    virtual ~wxWeakRefDynamic() { Release(); }
-
-    // Smart pointer functions
-    T& operator*() const    { wxASSERT(m_pobj); return *m_pobj; }
-    T* operator->() const   { wxASSERT(m_pobj); return m_pobj; }
-
-    T* get() const          { return m_pobj; }
-    operator T* () const    { return m_pobj; }
-
-    T* operator = (T* pobj) { Assign(pobj); return m_pobj; }
-
-    // Assign from another weak ref, point to same object
-    T* operator = (const wxWeakRef<T> &wr) { Assign( wr.get() ); return m_pobj; }
-
-    void Release()
-    {
-        // Release old object if any
-        if( m_pobj )
-        {
-            // Remove ourselves from object tracker list
-            wxTrackable *pt = dynamic_cast<wxTrackable*>(m_pobj);
-            wxASSERT(pt);
-            pt->RemoveNode(this);
-            m_pobj = NULL;
-        }
-    }
-
-    virtual void OnObjectDestroy()
-    {
-        wxASSERT_MSG(m_pobj, "tracked object should have removed us itself");
-
-        m_pobj = NULL;
-    }
-
-protected:
-    void Assign(T *pobj)
-    {
-        if ( m_pobj == pobj )
-            return;
-
-        Release();
-
-        // Now set new trackable object
-        if ( pobj )
-        {
-            // Add ourselves to object tracker list
-            wxTrackable *pt = dynamic_cast<wxTrackable*>(pobj);
-            if ( pt )
-            {
-                pt->AddNode(this);
-                m_pobj = pobj;
-            }
-            else
-            {
-                // If the object we want to track does not support wxTackable, then
-                // log a message and keep the NULL object pointer.
-                wxFAIL_MSG( "Tracked class should inherit from wxTrackable" );
-            }
-        }
-    }
-
-    T *m_pobj;
-};
-
-#endif // RTTI enabled
-
-
-// Provide some basic types of weak references
-class WXDLLIMPEXP_FWD_BASE wxEvtHandler;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-
-typedef wxWeakRef<wxEvtHandler>  wxEvtHandlerRef;
-typedef wxWeakRef<wxWindow>      wxWindowRef;
-
-#endif // _WX_WEAKREF_H_
-
diff --git a/Source/3rd Party/wx/include/wx/wfstream.h b/Source/3rd Party/wx/include/wx/wfstream.h
index 1454683a8..ead92d641 100644
--- a/Source/3rd Party/wx/include/wx/wfstream.h	
+++ b/Source/3rd Party/wx/include/wx/wfstream.h	
@@ -4,7 +4,7 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     11/07/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: wfstream.h 61872 2009-09-09 22:37:05Z VZ $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -53,7 +53,7 @@ protected:
     wxFile *m_file;
     bool m_file_destroy;
 
-    wxDECLARE_NO_COPY_CLASS(wxFileInputStream);
+    DECLARE_NO_COPY_CLASS(wxFileInputStream)
 };
 
 class WXDLLIMPEXP_BASE wxFileOutputStream : public wxOutputStream
@@ -83,7 +83,7 @@ protected:
     wxFile *m_file;
     bool m_file_destroy;
 
-    wxDECLARE_NO_COPY_CLASS(wxFileOutputStream);
+    DECLARE_NO_COPY_CLASS(wxFileOutputStream)
 };
 
 class WXDLLIMPEXP_BASE wxTempFileOutputStream : public wxOutputStream
@@ -93,8 +93,8 @@ public:
     virtual ~wxTempFileOutputStream();
 
     bool Close() { return Commit(); }
-    WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); }
-    WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); }
+    virtual bool Commit() { return m_file->Commit(); }
+    virtual void Discard() { m_file->Discard(); }
 
     wxFileOffset GetLength() const { return m_file->Length(); }
     bool IsSeekable() const { return true; }
@@ -108,7 +108,7 @@ protected:
 private:
     wxTempFile *m_file;
 
-    wxDECLARE_NO_COPY_CLASS(wxTempFileOutputStream);
+    DECLARE_NO_COPY_CLASS(wxTempFileOutputStream)
 };
 
 class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
@@ -116,35 +116,9 @@ class WXDLLIMPEXP_BASE wxFileStream : public wxFileInputStream,
 {
 public:
     wxFileStream(const wxString& fileName);
-    virtual bool IsOk() const;
-
-    // override (some) virtual functions inherited from both classes to resolve
-    // ambiguities (this wouldn't be necessary if wxStreamBase were a virtual
-    // base class but it isn't)
-
-    virtual bool IsSeekable() const
-    {
-        return wxFileInputStream::IsSeekable();
-    }
-
-    virtual wxFileOffset GetLength() const
-    {
-        return wxFileInputStream::GetLength();
-    }
-
-protected:
-    virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-    {
-        return wxFileInputStream::OnSysSeek(pos, mode);
-    }
-
-    virtual wxFileOffset OnSysTell() const
-    {
-        return wxFileInputStream::OnSysTell();
-    }
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxFileStream);
+    DECLARE_NO_COPY_CLASS(wxFileStream)
 };
 
 #endif //wxUSE_FILE
@@ -158,7 +132,7 @@ private:
 class WXDLLIMPEXP_BASE wxFFileInputStream : public wxInputStream
 {
 public:
-    wxFFileInputStream(const wxString& fileName, const wxString& mode = "rb");
+    wxFFileInputStream(const wxString& fileName, const wxChar *mode = wxT("rb"));
     wxFFileInputStream(wxFFile& file);
     wxFFileInputStream(FILE *file);
     virtual ~wxFFileInputStream();
@@ -180,13 +154,13 @@ protected:
     wxFFile *m_file;
     bool m_file_destroy;
 
-    wxDECLARE_NO_COPY_CLASS(wxFFileInputStream);
+    DECLARE_NO_COPY_CLASS(wxFFileInputStream)
 };
 
 class WXDLLIMPEXP_BASE wxFFileOutputStream : public wxOutputStream
 {
 public:
-    wxFFileOutputStream(const wxString& fileName, const wxString& mode = "wb");
+    wxFFileOutputStream(const wxString& fileName, const wxChar *mode = wxT("w+b"));
     wxFFileOutputStream(wxFFile& file);
     wxFFileOutputStream(FILE *file);
     virtual ~wxFFileOutputStream();
@@ -196,7 +170,7 @@ public:
     wxFileOffset GetLength() const;
 
     bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const;
+    virtual bool IsOk() const ;
     bool IsSeekable() const { return m_file->GetKind() == wxFILE_KIND_DISK; }
 
 protected:
@@ -210,43 +184,17 @@ protected:
     wxFFile *m_file;
     bool m_file_destroy;
 
-    wxDECLARE_NO_COPY_CLASS(wxFFileOutputStream);
+    DECLARE_NO_COPY_CLASS(wxFFileOutputStream)
 };
 
 class WXDLLIMPEXP_BASE wxFFileStream : public wxFFileInputStream,
                                        public wxFFileOutputStream
 {
 public:
-    wxFFileStream(const wxString& fileName, const wxString& mode = "w+b");
-
-    // override some virtual functions to resolve ambiguities, just as in
-    // wxFileStream
-
-    virtual bool IsOk() const;
-
-    virtual bool IsSeekable() const
-    {
-        return wxFFileInputStream::IsSeekable();
-    }
-
-    virtual wxFileOffset GetLength() const
-    {
-        return wxFFileInputStream::GetLength();
-    }
-
-protected:
-    virtual wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-    {
-        return wxFFileInputStream::OnSysSeek(pos, mode);
-    }
-
-    virtual wxFileOffset OnSysTell() const
-    {
-        return wxFFileInputStream::OnSysTell();
-    }
+    wxFFileStream(const wxString& fileName);
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxFFileStream);
+    DECLARE_NO_COPY_CLASS(wxFFileStream)
 };
 
 #endif //wxUSE_FFILE
diff --git a/Source/3rd Party/wx/include/wx/window.h b/Source/3rd Party/wx/include/wx/window.h
index ed74d891d..fc9e13e88 100644
--- a/Source/3rd Party/wx/include/wx/window.h	
+++ b/Source/3rd Party/wx/include/wx/window.h	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by: Ron Lee
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: window.h 56758 2008-11-13 22:32:21Z VS $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -49,19 +49,6 @@
     #define wxUSE_MENUS_NATIVE wxUSE_MENUS
 #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
-
-// Define this macro if the corresponding operating system handles the state
-// of children windows automatically when the parent is enabled/disabled.
-// Otherwise wx itself must ensure that when the parent is disabled its
-// children are disabled too, and their initial state is restored when the
-// parent is enabled back.
-#if defined(__WXMSW__) || defined(__WXPM__)
-    // must do everything ourselves
-    #undef wxHAS_NATIVE_ENABLED_MANAGEMENT
-#else
-    #define wxHAS_NATIVE_ENABLED_MANAGEMENT
-#endif
-
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
@@ -71,7 +58,9 @@ class WXDLLIMPEXP_FWD_CORE wxControl;
 class WXDLLIMPEXP_FWD_CORE wxCursor;
 class WXDLLIMPEXP_FWD_CORE wxDC;
 class WXDLLIMPEXP_FWD_CORE wxDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxItemResource;
 class WXDLLIMPEXP_FWD_CORE wxLayoutConstraints;
+class WXDLLIMPEXP_FWD_CORE wxResourceTable;
 class WXDLLIMPEXP_FWD_CORE wxSizer;
 class WXDLLIMPEXP_FWD_CORE wxToolTip;
 class WXDLLIMPEXP_FWD_CORE wxWindowBase;
@@ -87,7 +76,7 @@ class WXDLLIMPEXP_FWD_CORE wxAccessible;
 // ----------------------------------------------------------------------------
 
 // struct containing all the visual attributes of a control
-struct WXDLLIMPEXP_CORE wxVisualAttributes
+struct WXDLLEXPORT wxVisualAttributes
 {
     // the font used for control label/text inside it
     wxFont font;
@@ -115,43 +104,18 @@ enum wxWindowVariant
     #define wxWINDOW_DEFAULT_VARIANT wxT("window-default-variant")
 #endif
 
-// valid values for Show/HideWithEffect()
-enum wxShowEffect
-{
-    wxSHOW_EFFECT_NONE,
-    wxSHOW_EFFECT_ROLL_TO_LEFT,
-    wxSHOW_EFFECT_ROLL_TO_RIGHT,
-    wxSHOW_EFFECT_ROLL_TO_TOP,
-    wxSHOW_EFFECT_ROLL_TO_BOTTOM,
-    wxSHOW_EFFECT_SLIDE_TO_LEFT,
-    wxSHOW_EFFECT_SLIDE_TO_RIGHT,
-    wxSHOW_EFFECT_SLIDE_TO_TOP,
-    wxSHOW_EFFECT_SLIDE_TO_BOTTOM,
-    wxSHOW_EFFECT_BLEND,
-    wxSHOW_EFFECT_EXPAND,
-    wxSHOW_EFFECT_MAX
-};
-
-// flags for SendSizeEvent()
-enum
-{
-    wxSEND_EVENT_POST = 1
-};
-
 // ----------------------------------------------------------------------------
 // (pseudo)template list classes
 // ----------------------------------------------------------------------------
 
-WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class WXDLLIMPEXP_CORE);
+WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class WXDLLEXPORT);
 
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows;
-
-// declared here for compatibility only, main declaration is in wx/app.h
-extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
+extern WXDLLEXPORT_DATA(wxWindowList) wxTopLevelWindows;
+extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
 
 // ----------------------------------------------------------------------------
 // wxWindowBase is the base class for all GUI controls/widgets, this is the public
@@ -164,7 +128,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
 // temporarily switches event handlers).
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxWindowBase : public wxEvtHandler
+class WXDLLEXPORT wxWindowBase : public wxEvtHandler
 {
 public:
     // creating the window
@@ -174,6 +138,15 @@ public:
         // Create()
     wxWindowBase() ;
 
+        // pseudo ctor (can't be virtual, called from ctor)
+    bool CreateBase(wxWindowBase *parent,
+                    wxWindowID winid,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = 0,
+                    const wxValidator& validator = wxDefaultValidator,
+                    const wxString& name = wxPanelNameStr);
+
     virtual ~wxWindowBase();
 
     // deleting the window
@@ -193,7 +166,7 @@ public:
     bool DestroyChildren();
 
         // is the window being deleted?
-    bool IsBeingDeleted() const;
+    bool IsBeingDeleted() const { return m_isBeingDeleted; }
 
     // window attributes
     // -----------------
@@ -215,6 +188,11 @@ public:
     wxWindowVariant GetWindowVariant() const { return m_windowVariant; }
 
 
+        // window id uniquely identifies the window among its siblings unless
+        // it is wxID_ANY which means "don't care"
+    void SetId( wxWindowID winid ) { m_windowId = winid; }
+    wxWindowID GetId() const { return m_windowId; }
+
         // get or change the layout direction (LTR or RTL) for this window,
         // wxLayout_Default is returned if layout direction is not supported
     virtual wxLayoutDirection GetLayoutDirection() const
@@ -228,28 +206,15 @@ public:
                                              wxCoord width,
                                              wxCoord widthTotal) const;
 
-
-        // window id uniquely identifies the window among its siblings unless
-        // it is wxID_ANY which means "don't care"
-    void SetId( wxWindowID winid ) { m_windowId = winid; }
-    wxWindowID GetId() const { return m_windowId; }
-
-        // generate a unique id (or count of them consecutively), returns a
-        // valid id in the auto-id range or wxID_NONE if failed.  If using
-        // autoid management, it will mark the id as reserved until it is
-        // used (by assigning it to a wxWindowIDRef) or unreserved.
-    static wxWindowID NewControlId(int count = 1)
-    {
-        return wxIdManager::ReserveId(count);
-    }
-
-        // If an ID generated from NewControlId is not assigned to a wxWindowIDRef,
-        // it must be unreserved
-    static void UnreserveControlId(wxWindowID id, int count = 1)
-    {
-        wxIdManager::UnreserveId(id, count);
-    }
-
+        // generate a control id for the controls which were not given one by
+        // user
+    static int NewControlId() { return --ms_lastControlId; }
+        // get the id of the control following the one with the given
+        // (autogenerated) id
+    static int NextControlId(int winid) { return winid - 1; }
+        // get the id of the control preceding the one with the given
+        // (autogenerated) id
+    static int PrevControlId(int winid) { return winid + 1; }
 
     // moving/resizing
     // ---------------
@@ -361,15 +326,21 @@ public:
         return wxRect(GetClientAreaOrigin(), GetClientSize());
     }
 
+#if wxABI_VERSION >= 20808
     // client<->window size conversion
-    virtual wxSize ClientToWindowSize(const wxSize& size) const;
-    virtual wxSize WindowToClientSize(const wxSize& size) const;
+    wxSize ClientToWindowSize(const wxSize& size) const;
+    wxSize WindowToClientSize(const wxSize& size) const;
+#endif
 
         // get the size best suited for the window (in fact, minimal
         // acceptable size using which it will still look "nice" in
         // most situations)
-    wxSize GetBestSize() const;
-
+    wxSize GetBestSize() const
+    {
+        if (m_bestSizeCache.IsFullySpecified())
+            return m_bestSizeCache;
+        return DoGetBestSize();
+    }
     void GetBestSize(int *w, int *h) const
     {
         wxSize s = GetBestSize();
@@ -379,13 +350,6 @@ public:
             *h = s.y;
     }
 
-        // Determine the best size in the other direction if one of them is
-        // fixed. This is used with windows that can wrap their contents and
-        // returns input-independent best size for the others.
-    int GetBestHeight(int width) const;
-    int GetBestWidth(int height) const;
-
-
     void SetScrollHelper( wxScrollHelper *sh )   { m_scrollHelper = sh; }
     wxScrollHelper *GetScrollHelper()            { return m_scrollHelper; }
 
@@ -399,7 +363,7 @@ public:
         // This function will merge the window's best size into the window's
         // minimum size, giving priority to the min size components, and
         // returns the results.
-    virtual wxSize GetEffectiveMinSize() const;
+    wxSize GetEffectiveMinSize() const;
     wxDEPRECATED( wxSize GetBestFittingSize() const );  // replaced by GetEffectiveMinSize
     wxDEPRECATED( wxSize GetAdjustedMinSize() const );  // replaced by GetEffectiveMinSize
 
@@ -408,14 +372,14 @@ public:
     void SetInitialSize(const wxSize& size=wxDefaultSize);
     wxDEPRECATED( void SetBestFittingSize(const wxSize& size=wxDefaultSize) );  // replaced by SetInitialSize
 
-
+    
         // the generic centre function - centers the window on parent by`
         // default or on screen if it doesn't have parent or
         // wxCENTER_ON_SCREEN flag is given
     void Centre(int dir = wxBOTH) { DoCentre(dir); }
     void Center(int dir = wxBOTH) { DoCentre(dir); }
 
-        // centre with respect to the parent window
+        // centre with respect to the the parent window
     void CentreOnParent(int dir = wxBOTH) { DoCentre(dir); }
     void CenterOnParent(int dir = wxBOTH) { CentreOnParent(dir); }
 
@@ -431,7 +395,7 @@ public:
         // and it is therefore overridden in wxTLW to do that.
         // In wxWindow(Base), it has (unfortunately) been abused
         // to mean the same as SetMinSize() and SetMaxSize().
-
+        
     virtual void SetSizeHints( int minW, int minH,
                                int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
                                int incW = wxDefaultCoord, int incH = wxDefaultCoord )
@@ -442,40 +406,34 @@ public:
                        const wxSize& incSize=wxDefaultSize)
     { DoSetSizeHints(minSize.x, minSize.y, maxSize.x, maxSize.y, incSize.x, incSize.y); }
 
+    virtual void DoSetSizeHints( int minW, int minH,
+                                 int maxW, int maxH,
+                                 int incW, int incH );
 
-#if WXWIN_COMPATIBILITY_2_8
-    // these are useless and do nothing since wxWidgets 2.9
-    wxDEPRECATED( virtual void SetVirtualSizeHints( int minW, int minH,
-                                      int maxW = wxDefaultCoord, int maxH = wxDefaultCoord ) );
-    wxDEPRECATED( void SetVirtualSizeHints( const wxSize& minSize,
-                                            const wxSize& maxSize=wxDefaultSize) );
-#endif // WXWIN_COMPATIBILITY_2_8
+        // Methods for setting virtual size hints
+        // FIXME: What are virtual size hints?
+
+    virtual void SetVirtualSizeHints( int minW, int minH,
+                                      int maxW = wxDefaultCoord, int maxH = wxDefaultCoord );
+    void SetVirtualSizeHints( const wxSize& minSize,
+                              const wxSize& maxSize=wxDefaultSize)
+    {
+        SetVirtualSizeHints(minSize.x, minSize.y, maxSize.x, maxSize.y);
+    }
 
 
-        // Call these to override what GetBestSize() returns. This
-        // method is only virtual because it is overridden in wxTLW
+        // Call these to override what GetBestSize() returns. This 
+        // method is only virtual because it is overriden in wxTLW
         // as a different API for SetSizeHints().
-    virtual void SetMinSize(const wxSize& minSize);
-    virtual void SetMaxSize(const wxSize& maxSize);
-
-        // Like Set*Size, but for client, not window, size
-    virtual void SetMinClientSize(const wxSize& size)
-        { SetMinSize(ClientToWindowSize(size)); }
-    virtual void SetMaxClientSize(const wxSize& size)
-        { SetMaxSize(ClientToWindowSize(size)); }
+    virtual void SetMinSize(const wxSize& minSize) { m_minWidth = minSize.x; m_minHeight = minSize.y; }
+    virtual void SetMaxSize(const wxSize& maxSize) { m_maxWidth = maxSize.x; m_maxHeight = maxSize.y; }
 
         // Override these methods to impose restrictions on min/max size.
-        // The easier way is to call SetMinSize() and SetMaxSize() which
+        // The easier way is to call SetMinSize() and SetMaxSize() which  
         // will have the same effect. Doing both is non-sense.
     virtual wxSize GetMinSize() const { return wxSize(m_minWidth, m_minHeight); }
     virtual wxSize GetMaxSize() const { return wxSize(m_maxWidth, m_maxHeight); }
 
-        // Like Get*Size, but for client, not window, size
-    virtual wxSize GetMinClientSize() const
-        { return WindowToClientSize(GetMinSize()); }
-    virtual wxSize GetMaxClientSize() const
-        { return WindowToClientSize(GetMaxSize()); }
-
         // Get the min and max values one by one
     int GetMinWidth() const { return GetMinSize().x; }
     int GetMinHeight() const { return GetMinSize().y; }
@@ -487,7 +445,7 @@ public:
         // windows this is just the client area of the window, but for
         // some like scrolled windows it is more or less independent of
         // the screen window size.  You may override the DoXXXVirtual
-        // methods below for classes where that is the case.
+        // methods below for classes where that is is the case.
 
     void SetVirtualSize( const wxSize &size ) { DoSetVirtualSize( size.x, size.y ); }
     void SetVirtualSize( int x, int y ) { DoSetVirtualSize( x, y ); }
@@ -525,36 +483,6 @@ public:
     // components of the result respectively
     virtual wxSize GetWindowBorderSize() const;
 
-    // wxSizer and friends use this to give a chance to a component to recalc
-    // its min size once one of the final size components is known. Override
-    // this function when that is useful (such as for wxStaticText which can
-    // stretch over several lines). Parameter availableOtherDir
-    // tells the item how much more space there is available in the opposite
-    // direction (-1 if unknown).
-    virtual bool
-    InformFirstDirection(int direction, int size, int availableOtherDir);
-
-    // sends a size event to the window using its current size -- this has an
-    // effect of refreshing the window layout
-    //
-    // by default the event is sent, i.e. processed immediately, but if flags
-    // value includes wxSEND_EVENT_POST then it's posted, i.e. only schedule
-    // for later processing
-    virtual void SendSizeEvent(int flags = 0);
-
-    // this is a safe wrapper for GetParent()->SendSizeEvent(): it checks that
-    // we have a parent window and it's not in process of being deleted
-    //
-    // this is used by controls such as tool/status bars changes to which must
-    // also result in parent re-layout
-    void SendSizeEventToParent(int flags = 0);
-
-    // this is a more readable synonym for SendSizeEvent(wxSEND_EVENT_POST)
-    void PostSizeEvent() { SendSizeEvent(wxSEND_EVENT_POST); }
-
-    // this is the same as SendSizeEventToParent() but using PostSizeEvent()
-    void PostSizeEventToParent() { SendSizeEventToParent(wxSEND_EVENT_POST); }
-
 
     // window state
     // ------------
@@ -564,43 +492,12 @@ public:
     virtual bool Show( bool show = true );
     bool Hide() { return Show(false); }
 
-        // show or hide the window with a special effect, not implemented on
-        // most platforms (where it is the same as Show()/Hide() respectively)
-        //
-        // timeout specifies how long the animation should take, in ms, the
-        // default value of 0 means to use the default (system-dependent) value
-    virtual bool ShowWithEffect(wxShowEffect WXUNUSED(effect),
-                                unsigned WXUNUSED(timeout) = 0)
-    {
-        return Show();
-    }
-
-    virtual bool HideWithEffect(wxShowEffect WXUNUSED(effect),
-                                unsigned WXUNUSED(timeout) = 0)
-    {
-        return Hide();
-    }
-
         // returns true if window was enabled/disabled, false if nothing done
     virtual bool Enable( bool enable = true );
     bool Disable() { return Enable(false); }
 
     virtual bool IsShown() const { return m_isShown; }
-        // returns true if the window is really enabled and false otherwise,
-        // whether because it had been explicitly disabled itself or because
-        // its parent is currently disabled -- then this method returns false
-        // whatever is the intrinsic state of this window, use IsThisEnabled(0
-        // to retrieve it. In other words, this relation always holds:
-        //
-        //   IsEnabled() == IsThisEnabled() && parent.IsEnabled()
-        //
-    bool IsEnabled() const;
-
-        // returns the internal window state independently of the parent(s)
-        // state, i.e. the state in which the window would be if all its
-        // parents were enabled (use IsEnabled() above to get the effective
-        // window state)
-    bool IsThisEnabled() const { return m_isEnabled; }
+    virtual bool IsEnabled() const { return m_isEnabled; }
 
     // returns true if the window is visible, i.e. IsShown() returns true
     // if called on it and all its parents up to the first TLW
@@ -611,7 +508,7 @@ public:
     virtual void SetWindowStyleFlag( long style ) { m_windowStyle = style; }
     virtual long GetWindowStyleFlag() const { return m_windowStyle; }
 
-        // just some (somewhat shorter) synonyms
+        // just some (somewhat shorter) synonims
     void SetWindowStyle( long style ) { SetWindowStyleFlag(style); }
     long GetWindowStyle() const { return GetWindowStyleFlag(); }
 
@@ -628,12 +525,9 @@ public:
     virtual void SetExtraStyle(long exStyle) { m_exStyle = exStyle; }
     long GetExtraStyle() const { return m_exStyle; }
 
-    bool HasExtraStyle(int exFlag) const { return (m_exStyle & exFlag) != 0; }
-
-#if WXWIN_COMPATIBILITY_2_8
         // make the window modal (all other windows unresponsive)
-    wxDEPRECATED( virtual void MakeModal(bool modal = true) );
-#endif
+    virtual void MakeModal(bool modal = true);
+
 
     // (primitive) theming support
     // ---------------------------
@@ -656,73 +550,23 @@ public:
 
     static wxWindow *DoFindFocus() /* = 0: implement in derived classes */;
 
-        // return true if the window has focus (handles composite windows
-        // correctly - returns true if GetMainWindowOfCompositeControl()
-        // has focus)
-    virtual bool HasFocus() const;
-
-        // can this window have focus in principle?
-        //
-        // the difference between AcceptsFocus[FromKeyboard]() and CanAcceptFocus
-        // [FromKeyboard]() is that the former functions are meant to be
-        // overridden in the derived classes to simply return false if the
-        // control can't have focus, while the latter are meant to be used by
-        // this class clients and take into account the current window state
-    virtual bool AcceptsFocus() const { return true; }
-
-        // can this window or one of its children accept focus?
-        //
-        // usually it's the same as AcceptsFocus() but is overridden for
-        // container windows
-    virtual bool AcceptsFocusRecursively() const { return AcceptsFocus(); }
+        // can this window have focus?
+    virtual bool AcceptsFocus() const { return IsShown() && IsEnabled(); }
 
         // can this window be given focus by keyboard navigation? if not, the
         // only way to give it focus (provided it accepts it at all) is to
         // click it
     virtual bool AcceptsFocusFromKeyboard() const { return AcceptsFocus(); }
 
-
-        // this is mostly a helper for the various functions using it below
-    bool CanBeFocused() const { return IsShown() && IsEnabled(); }
-
-        // can this window itself have focus?
-    bool IsFocusable() const { return AcceptsFocus() && CanBeFocused(); }
-
-        // can this window have focus right now?
-        //
-        // if this method returns true, it means that calling SetFocus() will
-        // put focus either to this window or one of its children, if you need
-        // to know whether this window accepts focus itself, use IsFocusable()
-    bool CanAcceptFocus() const
-        { return AcceptsFocusRecursively() && CanBeFocused(); }
-
-        // can this window be assigned focus from keyboard right now?
-    bool CanAcceptFocusFromKeyboard() const
-        { return AcceptsFocusFromKeyboard() && CanBeFocused(); }
-
-        // call this when the return value of AcceptsFocus() changes
-    virtual void SetCanFocus(bool WXUNUSED(canFocus)) { }
-
-        // navigates inside this window
-    bool NavigateIn(int flags = wxNavigationKeyEvent::IsForward)
-        { return DoNavigateIn(flags); }
-
-        // navigates in the specified direction from this window, this is
-        // equivalent to GetParent()->NavigateIn()
-    bool Navigate(int flags = wxNavigationKeyEvent::IsForward)
-        { return m_parent && ((wxWindowBase *)m_parent)->DoNavigateIn(flags); }
-
-    // this function will generate the appropriate call to Navigate() if the
-    // key event is one normally used for keyboard navigation and return true
-    // in this case
-    bool HandleAsNavigationKey(const wxKeyEvent& event);
+        // navigates in the specified direction by sending a wxNavigationKeyEvent
+    virtual bool Navigate(int flags = wxNavigationKeyEvent::IsForward);
 
         // move this window just before/after the specified one in tab order
         // (the other window must be our sibling!)
     void MoveBeforeInTabOrder(wxWindow *win)
-        { DoMoveInTabOrder(win, OrderBefore); }
+        { DoMoveInTabOrder(win, MoveBefore); }
     void MoveAfterInTabOrder(wxWindow *win)
-        { DoMoveInTabOrder(win, OrderAfter); }
+        { DoMoveInTabOrder(win, MoveAfter); }
 
 
     // parent/children relations
@@ -735,10 +579,12 @@ public:
     // needed just for extended runtime
     const wxWindowList& GetWindowChildren() const { return GetChildren() ; }
 
+#if wxABI_VERSION >= 20808
         // get the window before/after this one in the parents children list,
         // returns NULL if this is the first/last window
-    wxWindow *GetPrevSibling() const { return DoGetSibling(OrderBefore); }
-    wxWindow *GetNextSibling() const { return DoGetSibling(OrderAfter); }
+    wxWindow *GetPrevSibling() const { return DoGetSibling(MoveBefore); }
+    wxWindow *GetNextSibling() const { return DoGetSibling(MoveAfter); }
+#endif // wx 2.8.8+
 
         // get the parent or the parent of the parent
     wxWindow *GetParent() const { return m_parent; }
@@ -747,10 +593,6 @@ public:
         // is this window a top level one?
     virtual bool IsTopLevel() const;
 
-        // is this window a child or grand child of this one (inside the same
-        // TLW)?
-    bool IsDescendant(wxWindowBase* win) const;
-
         // it doesn't really change parent, use Reparent() instead
     void SetParent( wxWindowBase *parent ) { m_parent = (wxWindow *)parent; }
         // change the real parent of this window, return true if the parent
@@ -761,11 +603,6 @@ public:
     virtual void AddChild( wxWindowBase *child );
     virtual void RemoveChild( wxWindowBase *child );
 
-    // returns true if the child is in the client area of the window, i.e. is
-    // not scrollbar, toolbar etc.
-    virtual bool IsClientAreaChild(const wxWindow *WXUNUSED(child)) const
-        { return true; }
-
     // looking for windows
     // -------------------
 
@@ -789,7 +626,7 @@ public:
 
         // replace the event handler (allows to completely subclass the
         // window)
-    void SetEventHandler( wxEvtHandler *handler );
+    void SetEventHandler( wxEvtHandler *handler ) { m_eventHandler = handler; }
 
         // push/pop event handler: allows to chain a custom event handler to
         // alreasy existing ones
@@ -803,59 +640,6 @@ public:
         // be there)
     bool RemoveEventHandler(wxEvtHandler *handler);
 
-        // Process an event by calling GetEventHandler()->ProcessEvent(): this
-        // is a straightforward replacement for ProcessEvent() itself which
-        // shouldn't be used directly with windows as it doesn't take into
-        // account any event handlers associated with the window
-    bool ProcessWindowEvent(wxEvent& event)
-        { return GetEventHandler()->ProcessEvent(event); }
-
-        // Call GetEventHandler()->ProcessEventLocally(): this should be used
-        // instead of calling ProcessEventLocally() directly on the window
-        // itself as this wouldn't take any pushed event handlers into account
-        // correctly
-    bool ProcessWindowEventLocally(wxEvent& event)
-        { return GetEventHandler()->ProcessEventLocally(event); }
-
-        // Process an event by calling GetEventHandler()->ProcessEvent() and
-        // handling any exceptions thrown by event handlers. It's mostly useful
-        // when processing wx events when called from C code (e.g. in GTK+
-        // callback) when the exception wouldn't correctly propagate to
-        // wxEventLoop.
-    bool HandleWindowEvent(wxEvent& event) const;
-
-        // disable wxEvtHandler double-linked list mechanism:
-    virtual void SetNextHandler(wxEvtHandler *handler);
-    virtual void SetPreviousHandler(wxEvtHandler *handler);
-
-
-    // Watcom doesn't allow reducing access with using access declaration, see
-    // #10749
-#ifndef __WATCOMC__
-protected:
-
-    // NOTE: we change the access specifier of the following wxEvtHandler functions
-    //       so that the user won't be able to call them directly.
-    //       Calling wxWindow::ProcessEvent in fact only works when there are NO
-    //       event handlers pushed on the window.
-    //       To ensure correct operation, instead of wxWindow::ProcessEvent
-    //       you must always call wxWindow::GetEventHandler()->ProcessEvent()
-    //       or HandleWindowEvent().
-    //       The same holds for all other wxEvtHandler functions.
-
-    using wxEvtHandler::ProcessEvent;
-    using wxEvtHandler::ProcessEventLocally;
-#if wxUSE_THREADS
-    using wxEvtHandler::ProcessThreadEvent;
-#endif
-    using wxEvtHandler::SafelyProcessEvent;
-    using wxEvtHandler::ProcessPendingEvents;
-    using wxEvtHandler::AddPendingEvent;
-    using wxEvtHandler::QueueEvent;
-#endif // __WATCOMC__
-
-public:
-
     // validators
     // ----------
 
@@ -901,16 +685,16 @@ public:
     // dialog units translations
     // -------------------------
 
-    wxPoint ConvertPixelsToDialog( const wxPoint& pt ) const;
-    wxPoint ConvertDialogToPixels( const wxPoint& pt ) const;
-    wxSize ConvertPixelsToDialog( const wxSize& sz ) const
+    wxPoint ConvertPixelsToDialog( const wxPoint& pt );
+    wxPoint ConvertDialogToPixels( const wxPoint& pt );
+    wxSize ConvertPixelsToDialog( const wxSize& sz )
     {
         wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y)));
 
         return wxSize(pt.x, pt.y);
     }
 
-    wxSize ConvertDialogToPixels( const wxSize& sz ) const
+    wxSize ConvertDialogToPixels( const wxSize& sz )
     {
         wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y)));
 
@@ -958,13 +742,13 @@ public:
     virtual void ClearBackground();
 
         // freeze the window: don't redraw it until it is thawed
-    void Freeze();
+    virtual void Freeze() { }
 
         // thaw the window: redraw it after it had been frozen
-    void Thaw();
+    virtual void Thaw() { }
 
         // return true if window had been frozen and not unthawed yet
-    bool IsFrozen() const { return m_freezeCount != 0; }
+    virtual bool IsFrozen() const { return false; }
 
         // adjust DC for drawing on this window
     virtual void PrepareDC( wxDC & WXUNUSED(dc) ) { }
@@ -1041,22 +825,15 @@ public:
     wxColour GetForegroundColour() const;
 
         // Set/get the background style.
-    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
-    wxBackgroundStyle GetBackgroundStyle() const
-        { return m_backgroundStyle; }
+        // Pass one of wxBG_STYLE_SYSTEM, wxBG_STYLE_COLOUR, wxBG_STYLE_CUSTOM
+    virtual bool SetBackgroundStyle(wxBackgroundStyle style) { m_backgroundStyle = style; return true; }
+    virtual wxBackgroundStyle GetBackgroundStyle() const { return m_backgroundStyle; }
 
         // returns true if the control has "transparent" areas such as a
         // wxStaticText and wxCheckBox and the background should be adapted
         // from a parent window
     virtual bool HasTransparentBackground() { return false; }
 
-        // Returns true if background transparency is supported for this
-        // window, i.e. if calling SetBackgroundStyle(wxBG_STYLE_TRANSPARENT)
-        // has a chance of succeeding. If reason argument is non-NULL, returns a
-        // user-readable explanation of why it isn't supported if the return
-        // value is false.
-    virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const;
-
         // set/retrieve the font for the window (SetFont() returns true if the
         // font really changed)
     virtual bool SetFont(const wxFont& font) = 0;
@@ -1085,21 +862,12 @@ public:
 
         // get the width/height/... of the text using current or specified
         // font
-    void GetTextExtent(const wxString& string,
-                       int *x, int *y,
-                       int *descent = NULL,
-                       int *externalLeading = NULL,
-                       const wxFont *font = NULL) const
-    {
-        DoGetTextExtent(string, x, y, descent, externalLeading, font);
-    }
-
-    wxSize GetTextExtent(const wxString& string) const
-    {
-        wxCoord w, h;
-        GetTextExtent(string, &w, &h);
-        return wxSize(w, h);
-    }
+    virtual void GetTextExtent(const wxString& string,
+                               int *x, int *y,
+                               int *descent = (int *) NULL,
+                               int *externalLeading = (int *) NULL,
+                               const wxFont *theFont = (const wxFont *) NULL)
+                               const = 0;
 
     // client <-> screen coords
     // ------------------------
@@ -1152,19 +920,10 @@ public:
     virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
 
 #if wxUSE_MENUS
-    // show popup menu at the given position, generate events for the items
-    // selected in it
     bool PopupMenu(wxMenu *menu, const wxPoint& pos = wxDefaultPosition)
-        { return PopupMenu(menu, pos.x, pos.y); }
-    bool PopupMenu(wxMenu *menu, int x, int y);
-
-    // simply return the id of the selected item or wxID_NONE without
-    // generating any events
-    int GetPopupMenuSelectionFromUser(wxMenu& menu,
-                                      const wxPoint& pos = wxDefaultPosition)
-        { return DoGetPopupMenuSelectionFromUser(menu, pos.x, pos.y); }
-    int GetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y)
-        { return DoGetPopupMenuSelectionFromUser(menu, x, y); }
+        { return DoPopupMenu(menu, pos.x, pos.y); }
+    bool PopupMenu(wxMenu *menu, int x, int y)
+        { return DoPopupMenu(menu, x, y); }
 #endif // wxUSE_MENUS
 
     // override this method to return true for controls having multiple pages
@@ -1174,16 +933,13 @@ public:
     // scrollbars
     // ----------
 
-        // can the window have the scrollbar in this orientation?
-    bool CanScroll(int orient) const
+        // does the window have the scrollbar for this orientation?
+    bool HasScrollbar(int orient) const
     {
         return (m_windowStyle &
                 (orient == wxHORIZONTAL ? wxHSCROLL : wxVSCROLL)) != 0;
     }
 
-        // does the window have the scrollbar in this orientation?
-    bool HasScrollbar(int orient) const;
-
         // configure the window scrollbars
     virtual void SetScrollbar( int orient,
                                int pos,
@@ -1197,7 +953,7 @@ public:
 
         // scroll window to the specified position
     virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = NULL ) = 0;
+                               const wxRect* rect = (wxRect *) NULL ) = 0;
 
         // scrolls window by line/page: note that not all controls support this
         //
@@ -1211,20 +967,6 @@ public:
     bool PageUp() { return ScrollPages(-1); }
     bool PageDown() { return ScrollPages(1); }
 
-        // call this to always show one or both scrollbars, even if the window
-        // is big enough to not require them
-    virtual void AlwaysShowScrollbars(bool WXUNUSED(horz) = true,
-                                      bool WXUNUSED(vert) = true)
-    {
-    }
-
-        // return true if AlwaysShowScrollbars() had been called before for the
-        // corresponding orientation
-    virtual bool IsScrollbarAlwaysShown(int WXUNUSED(orient)) const
-    {
-        return false;
-    }
-
     // context-sensitive help
     // ----------------------
 
@@ -1233,13 +975,9 @@ public:
 #if wxUSE_HELP
         // associate this help text with this window
     void SetHelpText(const wxString& text);
-
-#if WXWIN_COMPATIBILITY_2_8
-    // Associate this help text with all windows with the same id as this one.
-    // Don't use this, do wxHelpProvider::Get()->AddHelp(id, text);
-    wxDEPRECATED( void SetHelpTextForId(const wxString& text) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
+        // associate this help text with all windows with the same id as this
+        // one
+    void SetHelpTextForId(const wxString& text);
         // get the help string associated with the given position in this window
         //
         // notice that pt may be invalid if event origin is keyboard or unknown
@@ -1264,28 +1002,22 @@ public:
 #if wxUSE_TOOLTIPS
         // the easiest way to set a tooltip for a window is to use this method
     void SetToolTip( const wxString &tip );
-        // attach a tooltip to the window, pointer can be NULL to remove
-        // existing tooltip
+        // attach a tooltip to the window
     void SetToolTip( wxToolTip *tip ) { DoSetToolTip(tip); }
+#if wxABI_VERSION >= 20809
         // more readable synonym for SetToolTip(NULL)
     void UnsetToolTip() { SetToolTip(NULL); }
+#endif // wxABI_VERSION >= 2.8.9
         // get the associated tooltip or NULL if none
     wxToolTip* GetToolTip() const { return m_tooltip; }
-    wxString GetToolTipText() const;
-
-    // Use the same tool tip as the given one (which can be NULL to indicate
-    // that no tooltip should be used) for this window. This is currently only
-    // used by wxCompositeWindow::DoSetToolTip() implementation and is not part
-    // of the public wx API.
-    //
-    // Returns true if tip was valid and we copied it or false if it was NULL
-    // and we reset our own tooltip too.
-    bool CopyToolTip(wxToolTip *tip);
+    wxString GetToolTipText() const ;
 #else // !wxUSE_TOOLTIPS
         // make it much easier to compile apps in an environment
         // that doesn't support tooltips, such as PocketPC
-    void SetToolTip(const wxString & WXUNUSED(tip)) { }
+    void SetToolTip( const wxString & WXUNUSED(tip) ) {}
+#if wxABI_VERSION >= 20809
     void UnsetToolTip() { }
+#endif // wxABI_VERSION >= 2.8.9
 #endif // wxUSE_TOOLTIPS/!wxUSE_TOOLTIPS
 
     // drag and drop
@@ -1296,14 +1028,12 @@ public:
     virtual void SetDropTarget( wxDropTarget *dropTarget ) = 0;
     virtual wxDropTarget *GetDropTarget() const { return m_dropTarget; }
 
+#ifndef __WXMSW__ // MSW version is in msw/window.h
+#if wxABI_VERSION >= 20810
     // Accept files for dragging
-    virtual void DragAcceptFiles(bool accept)
-#ifdef __WXMSW__
-    // it does have common implementation but not for MSW which has its own
-    // native version of it
-    = 0
-#endif // __WXMSW__
-    ;
+    void DragAcceptFiles(bool accept);
+#endif // wxABI_VERSION >= 20810
+#endif // !__WXMSW__
 
 #endif // wxUSE_DRAG_AND_DROP
 
@@ -1392,11 +1122,10 @@ public:
 
         // virtual function for implementing internal idle
         // behaviour
-        virtual void OnInternalIdle();
+        virtual void OnInternalIdle() {}
 
-    // Send idle event to window and all subwindows
-    // Returns true if more idle time is requested.
-    virtual bool SendIdleEvents(wxIdleEvent& event);
+        // call internal idle recursively
+//        void ProcessInternalIdle() ;
 
         // get the handle of the window for the underlying window system: this
         // is only used for wxWin itself or for user code which wants to call
@@ -1435,13 +1164,32 @@ public:
     // behaviour in the most common case
     virtual bool ShouldInheritColours() const { return false; }
 
-    // returns true if the window can be positioned outside of parent's client
-    // area (normal windows can't, but e.g. menubar or statusbar can):
-    virtual bool CanBeOutsideClientArea() const { return false; }
+protected:
+    // event handling specific to wxWindow
+    virtual bool TryValidator(wxEvent& event);
+    virtual bool TryParent(wxEvent& event);
 
-    // returns true if the platform should explicitly apply a theme border. Currently
-    // used only by Windows
-    virtual bool CanApplyThemeBorder() const { return true; }
+    enum MoveKind
+    {
+        MoveBefore,     // insert before the given window
+        MoveAfter       // insert after the given window
+    };
+
+#if wxABI_VERSION >= 20808
+    // common part of GetPrev/NextSibling()
+    wxWindow *DoGetSibling(MoveKind order) const;
+#endif // wx 2.8.8+
+
+    // common part of MoveBefore/AfterInTabOrder()
+    virtual void DoMoveInTabOrder(wxWindow *win, MoveKind move);
+
+#if wxUSE_CONSTRAINTS
+    // satisfy the constraints for the windows but don't set the window sizes
+    void SatisfyConstraints();
+#endif // wxUSE_CONSTRAINTS
+
+    // Send the wxWindowDestroyEvent
+    void SendDestroyEvent();
 
     // returns the main window of composite control; this is the window
     // that FindFocus returns if the focus is in one of composite control's
@@ -1449,77 +1197,9 @@ public:
     virtual wxWindow *GetMainWindowOfCompositeControl()
         { return (wxWindow*)this; }
 
-    // If this function returns true, keyboard navigation events shouldn't
-    // escape from it. A typical example of such "navigation domain" is a top
-    // level window because pressing TAB in one of them must not transfer focus
-    // to a different top level window. But it's not limited to them, e.g. MDI
-    // children frames are not top level windows (and their IsTopLevel()
-    // returns false) but still are self-contained navigation domains as well.
-    virtual bool IsTopNavigationDomain() const { return false; }
-
-
-protected:
-    // helper for the derived class Create() methods: the first overload, with
-    // validator parameter, should be used for child windows while the second
-    // one is used for top level ones
-    bool CreateBase(wxWindowBase *parent,
-                    wxWindowID winid,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = 0,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxPanelNameStr);
-
-    bool CreateBase(wxWindowBase *parent,
-                    wxWindowID winid,
-                    const wxPoint& pos,
-                    const wxSize& size,
-                    long style,
-                    const wxString& name);
-
-    // event handling specific to wxWindow
-    virtual bool TryBefore(wxEvent& event);
-    virtual bool TryAfter(wxEvent& event);
-
-    enum WindowOrder
-    {
-        OrderBefore,     // insert before the given window
-        OrderAfter       // insert after the given window
-    };
-
-    // common part of GetPrev/NextSibling()
-    wxWindow *DoGetSibling(WindowOrder order) const;
-
-    // common part of MoveBefore/AfterInTabOrder()
-    virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move);
-
-    // implementation of Navigate() and NavigateIn()
-    virtual bool DoNavigateIn(int flags);
-
-#if wxUSE_CONSTRAINTS
-    // satisfy the constraints for the windows but don't set the window sizes
-    void SatisfyConstraints();
-#endif // wxUSE_CONSTRAINTS
-
-    // Send the wxWindowDestroyEvent if not done yet and sets m_isBeingDeleted
-    // to true
-    void SendDestroyEvent();
-
-    // this method should be implemented to use operating system specific code
-    // to really enable/disable the widget, it will only be called when we
-    // really need to enable/disable window and so no additional checks on the
-    // widgets state are necessary
-    virtual void DoEnable(bool WXUNUSED(enable)) { }
-
-    // called when the on-screen widget state changes and provides an
-    // an opportunity for the widget to update its visual state (colours,
-    // fonts, anything else) as necessary
-    virtual void OnEnabled(bool WXUNUSED(enabled)) { }
-
-
     // the window id - a number which uniquely identifies a window among
     // its siblings unless it is wxID_ANY
-    wxWindowIDRef        m_windowId;
+    wxWindowID           m_windowId;
 
     // the parent window of this window (or NULL) and the list of the children
     // of this window
@@ -1623,17 +1303,17 @@ protected:
 
     wxScrollHelper       *m_scrollHelper;
 
+    int                   m_minVirtualWidth;    // VirtualSizeHints
+    int                   m_minVirtualHeight;
+    int                   m_maxVirtualWidth;
+    int                   m_maxVirtualHeight;
+
     wxWindowVariant       m_windowVariant ;
 
     // override this to change the default (i.e. used when no style is
     // specified) border for the window class
     virtual wxBorder GetDefaultBorder() const;
 
-    // this allows you to implement standard control borders without
-    // repeating the code in different classes that are not derived from
-    // wxControl
-    virtual wxBorder GetDefaultBorderForControl() const { return wxBORDER_THEME; }
-
     // Get the default size for the new window if no explicit size given. TLWs
     // have their own default size so this is just for non top-level windows.
     static int WidthDefault(int w) { return w == wxDefaultCoord ? 20 : w; }
@@ -1661,13 +1341,6 @@ protected:
     //     overloaded Something()s in terms of DoSomething() which will be the
     //     only one to be virtual.
 
-    // text extent
-    virtual void DoGetTextExtent(const wxString& string,
-                                 int *x, int *y,
-                                 int *descent = NULL,
-                                 int *externalLeading = NULL,
-                                 const wxFont *font = NULL) const = 0;
-
     // coordinates translation
     virtual void DoClientToScreen( int *x, int *y ) const = 0;
     virtual void DoScreenToClient( int *x, int *y ) const = 0;
@@ -1689,20 +1362,15 @@ protected:
     // same size as it would have after a call to Fit()
     virtual wxSize DoGetBestSize() const;
 
-    // this method can be overridden instead of DoGetBestSize() if it computes
-    // the best size of the client area of the window only, excluding borders
-    // (GetBorderSize() will be used to add them)
-    virtual wxSize DoGetBestClientSize() const { return wxDefaultSize; }
+    // called from DoGetBestSize() to convert best virtual size (returned by
+    // the window sizer) to the best size for the window itself; this is
+    // overridden at wxScrolledWindow level to clump down virtual size to real
+    virtual wxSize GetWindowSizeForVirtualSize(const wxSize& size) const
+    {
+        return size;
+    }
 
-    // These two methods can be overridden to implement intelligent
-    // width-for-height and/or height-for-width best size determination for the
-    // window. By default the fixed best size is used.
-    virtual int DoGetBestClientHeight(int WXUNUSED(width)) const
-        { return wxDefaultCoord; }
-    virtual int DoGetBestClientWidth(int WXUNUSED(height)) const
-        { return wxDefaultCoord; }
-
-    // this is the virtual function to be overridden in any derived class which
+    // this is the virtual function to be overriden in any derived class which
     // wants to change how SetSize() or Move() works - it is called by all
     // versions of these functions in the base class
     virtual void DoSetSize(int x, int y,
@@ -1712,19 +1380,6 @@ protected:
     // same as DoSetSize() for the client size
     virtual void DoSetClientSize(int width, int height) = 0;
 
-    virtual void DoSetSizeHints( int minW, int minH,
-                                 int maxW, int maxH,
-                                 int incW, int incH );
-
-    // return the total size of the window borders, i.e. the sum of the widths
-    // of the left and the right border in the x component of the returned size
-    // and the sum of the heights of the top and bottom borders in the y one
-    //
-    // NB: this is currently only implemented properly for wxMSW, wxGTK and
-    //     wxUniv and doesn't behave correctly in the presence of scrollbars in
-    //     the other ports
-    virtual wxSize DoGetBorderSize() const;
-
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just
     // reposition this window except for composite controls which will want to
@@ -1757,55 +1412,23 @@ protected:
     // implements the window variants
     virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
 
-
-    // really freeze/thaw the window (should have port-specific implementation)
-    virtual void DoFreeze() { }
-    virtual void DoThaw() { }
-
-
     // Must be called when mouse capture is lost to send
     // wxMouseCaptureLostEvent to windows on capture stack.
     static void NotifyCaptureLost();
 
 private:
-    // recursively call our own and our children OnEnabled() when the
-    // enabled/disabled status changed because a parent window had been
-    // enabled/disabled
-    void NotifyWindowOnEnableChange(bool enabled);
-
-#if wxUSE_MENUS
-    // temporary event handlers used by GetPopupMenuSelectionFromUser()
-    void InternalOnPopupMenu(wxCommandEvent& event);
-    void InternalOnPopupMenuUpdate(wxUpdateUIEvent& event);
-
-    // implementation of the public GetPopupMenuSelectionFromUser() method
-    int DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y);
-#endif // wxUSE_MENUS
-
-    // layout the window children when its size changes unless this was
-    // explicitly disabled with SetAutoLayout(false)
-    void InternalOnSize(wxSizeEvent& event);
-
-    // base for dialog unit conversion, i.e. average character size
-    wxSize GetDlgUnitBase() const;
+    // contains the last id generated by NewControlId
+    static int ms_lastControlId;
 
     // the stack of windows which have captured the mouse
     static struct WXDLLIMPEXP_FWD_CORE wxWindowNext *ms_winCaptureNext;
-
     // the window that currently has mouse capture
     static wxWindow *ms_winCaptureCurrent;
-
     // indicates if execution is inside CaptureMouse/ReleaseMouse
     static bool ms_winCaptureChanging;
 
-
-    // number of Freeze() calls minus the number of Thaw() calls: we're frozen
-    // (i.e. not being updated) if it is positive
-    unsigned int m_freezeCount;
-
-
     DECLARE_ABSTRACT_CLASS(wxWindowBase)
-    wxDECLARE_NO_COPY_CLASS(wxWindowBase);
+    DECLARE_NO_COPY_CLASS(wxWindowBase)
     DECLARE_EVENT_TABLE()
 };
 
@@ -1838,7 +1461,14 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
 // ----------------------------------------------------------------------------
 
 // include the declaration of the platform-specific class
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+    #ifdef __WXUNIVERSAL__
+        #define wxWindowNative wxWindowPalm
+    #else // !wxUniv
+        #define wxWindowPalm wxWindow
+    #endif // wxUniv/!wxUniv
+    #include "wx/palmos/window.h"
+#elif defined(__WXMSW__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowMSW
     #else // !wxUniv
@@ -1868,6 +1498,9 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
         #define wxWindowX11 wxWindow
     #endif // wxUniv
     #include "wx/x11/window.h"
+#elif defined(__WXMGL__)
+    #define wxWindowNative wxWindowMGL
+    #include "wx/mgl/window.h"
 #elif defined(__WXDFB__)
     #define wxWindowNative wxWindowDFB
     #include "wx/dfb/window.h"
@@ -1877,7 +1510,7 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
     #else // !wxUniv
         #define wxWindowMac wxWindow
     #endif // wxUniv
-    #include "wx/osx/window.h"
+    #include "wx/mac/window.h"
 #elif defined(__WXCOCOA__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowCocoa
@@ -1911,7 +1544,7 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
 
 inline wxWindow *wxWindowBase::GetGrandParent() const
 {
-    return m_parent ? m_parent->GetParent() : NULL;
+    return m_parent ? m_parent->GetParent() : (wxWindow *)NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -1920,21 +1553,21 @@ inline wxWindow *wxWindowBase::GetGrandParent() const
 
 // Find the wxWindow at the current mouse position, also returning the mouse
 // position.
-extern WXDLLIMPEXP_CORE wxWindow* wxFindWindowAtPointer(wxPoint& pt);
+extern WXDLLEXPORT wxWindow* wxFindWindowAtPointer(wxPoint& pt);
 
 // Get the current mouse position.
-extern WXDLLIMPEXP_CORE wxPoint wxGetMousePosition();
+extern WXDLLEXPORT wxPoint wxGetMousePosition();
 
 // get the currently active window of this application or NULL
-extern WXDLLIMPEXP_CORE wxWindow *wxGetActiveWindow();
+extern WXDLLEXPORT wxWindow *wxGetActiveWindow();
 
 // get the (first) top level parent window
-WXDLLIMPEXP_CORE wxWindow* wxGetTopLevelParent(wxWindow *win);
+WXDLLEXPORT wxWindow* wxGetTopLevelParent(wxWindow *win);
 
 #if WXWIN_COMPATIBILITY_2_6
     // deprecated (doesn't start with 'wx' prefix), use wxWindow::NewControlId()
-    wxDEPRECATED( wxWindowID NewControlId() );
-    inline wxWindowID NewControlId() { return wxWindowBase::NewControlId(); }
+    wxDEPRECATED( int NewControlId() );
+    inline int NewControlId() { return wxWindowBase::NewControlId(); }
 #endif // WXWIN_COMPATIBILITY_2_6
 
 #if wxUSE_ACCESSIBILITY
@@ -1942,7 +1575,7 @@ WXDLLIMPEXP_CORE wxWindow* wxGetTopLevelParent(wxWindow *win);
 // accessible object for windows
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxWindowAccessible: public wxAccessible
+class WXDLLEXPORT wxWindowAccessible: public wxAccessible
 {
 public:
     wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); }
diff --git a/Source/3rd Party/wx/include/wx/windowid.h b/Source/3rd Party/wx/include/wx/windowid.h
deleted file mode 100644
index 117605378..000000000
--- a/Source/3rd Party/wx/include/wx/windowid.h	
+++ /dev/null
@@ -1,190 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/windowid.h
-// Purpose:     wxWindowID class - a class for managing window ids
-// Author:      Brian Vanderburg II
-// Created:     2007-09-21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Brian Vanderburg II
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WINDOWID_H_
-#define _WX_WINDOWID_H_
-
-// NB: do not include defs.h as we are included from it
-
-typedef int wxWindowID;
-
-// ----------------------------------------------------------------------------
-// wxWindowIDRef: reference counted id value
-// ----------------------------------------------------------------------------
-
-// A wxWindowIDRef object wraps an id value and marks it as (un)used as
-// necessary. All ids returned from wxWindow::NewControlId() should be assigned
-// to an instance of this class to ensure that the id is marked as being in
-// use.
-//
-// This class is always defined but it is trivial if wxUSE_AUTOID_MANAGEMENT is
-// off.
-class WXDLLIMPEXP_CORE wxWindowIDRef
-{
-public:
-    // default ctor
-    wxWindowIDRef()
-    {
-        m_id = wxID_NONE;
-    }
-
-    // ctor taking id values
-    wxWindowIDRef(int id)
-    {
-        Init(id);
-    }
-
-    wxWindowIDRef(long id)
-    {
-        Init(id);
-    }
-
-    wxWindowIDRef(const wxWindowIDRef& id)
-    {
-        Init(id.m_id);
-    }
-
-    // dtor
-    ~wxWindowIDRef()
-    {
-        Assign(wxID_NONE);
-    }
-
-    // assignment
-    wxWindowIDRef& operator=(int id)
-    {
-        Assign(id);
-        return *this;
-    }
-
-    wxWindowIDRef& operator=(long id)
-    {
-        Assign(id);
-        return *this;
-    }
-
-    wxWindowIDRef& operator=(const wxWindowIDRef& id)
-    {
-        if (&id != this)
-            Assign(id.m_id);
-        return *this;
-    }
-
-    // access to the stored id value
-    wxWindowID GetValue() const
-    {
-        return m_id;
-    }
-
-    operator wxWindowID() const
-    {
-        return m_id;
-    }
-
-private:
-#if wxUSE_AUTOID_MANAGEMENT
-    // common part of all ctors: call Assign() for our new id
-    void Init(wxWindowID id)
-    {
-        // m_id must be initialized before calling Assign()
-        m_id = wxID_NONE;
-        Assign(id);
-    }
-
-    // increase reference count of id, decrease the one of m_id
-    void Assign(wxWindowID id);
-#else // !wxUSE_AUTOID_MANAGEMENT
-    // trivial stubs for the functions above
-    void Init(wxWindowID id)
-    {
-        m_id = id;
-    }
-
-    void Assign(wxWindowID id)
-    {
-        m_id = id;
-    }
-#endif // wxUSE_AUTOID_MANAGEMENT/!wxUSE_AUTOID_MANAGEMENT
-
-
-    wxWindowID m_id;
-};
-
-// comparison operators
-inline bool operator==(const wxWindowIDRef& lhs, const wxWindowIDRef& rhs)
-{
-    return lhs.GetValue() == rhs.GetValue();
-}
-
-inline bool operator==(const wxWindowIDRef& lhs, int rhs)
-{
-    return lhs.GetValue() == rhs;
-}
-
-inline bool operator==(const wxWindowIDRef& lhs, long rhs)
-{
-    return lhs.GetValue() == rhs;
-}
-
-inline bool operator==(int lhs, const wxWindowIDRef& rhs)
-{
-    return rhs == lhs;
-}
-
-inline bool operator==(long lhs, const wxWindowIDRef& rhs)
-{
-    return rhs == lhs;
-}
-
-inline bool operator!=(const wxWindowIDRef& lhs, const wxWindowIDRef& rhs)
-{
-    return !(lhs == rhs);
-}
-
-inline bool operator!=(const wxWindowIDRef& lhs, int rhs)
-{
-    return !(lhs == rhs);
-}
-
-inline bool operator!=(const wxWindowIDRef& lhs, long rhs)
-{
-    return !(lhs == rhs);
-}
-
-inline bool operator!=(int lhs, const wxWindowIDRef& rhs)
-{
-    return !(lhs == rhs);
-}
-
-inline bool operator!=(long lhs, const wxWindowIDRef& rhs)
-{
-    return !(lhs == rhs);
-}
-
-// ----------------------------------------------------------------------------
-// wxIdManager
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxIdManager
-{
-public:
-    // This returns an id value and not an wxWindowIDRef.  The returned value
-    // should be assigned a.s.a.p to a wxWindowIDRef.  The IDs are marked as
-    // reserved so that another call to ReserveId before assigning the id to a
-    // wxWindowIDRef will not use the same ID
-    static wxWindowID ReserveId(int count = 1);
-
-    // This will release an unused reserved ID.  This should only be called
-    // if the ID returned by ReserveId was NOT assigned to a wxWindowIDRef
-    // for some purpose, maybe an early return from a function
-    static void UnreserveId(wxWindowID id, int count = 1);
-};
-
-#endif // _WX_WINDOWID_H_
diff --git a/Source/3rd Party/wx/include/wx/withimages.h b/Source/3rd Party/wx/include/wx/withimages.h
deleted file mode 100644
index d56b37dec..000000000
--- a/Source/3rd Party/wx/include/wx/withimages.h	
+++ /dev/null
@@ -1,97 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/withimages.h
-// Purpose:     Declaration of a simple wxWithImages class.
-// Author:      Vadim Zeitlin
-// Created:     2011-08-17
-// RCS-ID:      $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WITHIMAGES_H_
-#define _WX_WITHIMAGES_H_
-
-#include "wx/defs.h"
-#include "wx/icon.h"
-#include "wx/imaglist.h"
-
-// ----------------------------------------------------------------------------
-// wxWithImages: mix-in class providing access to wxImageList.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWithImages
-{
-public:
-    enum
-    {
-        NO_IMAGE = -1
-    };
-
-    wxWithImages()
-    {
-        m_imageList = NULL;
-        m_ownsImageList = false;
-    }
-
-    virtual ~wxWithImages()
-    {
-        FreeIfNeeded();
-    }
-
-    // Sets the image list to use, it is *not* deleted by the control.
-    virtual void SetImageList(wxImageList* imageList)
-    {
-        FreeIfNeeded();
-        m_imageList = imageList;
-    }
-
-    // As SetImageList() but we will delete the image list ourselves.
-    void AssignImageList(wxImageList* imageList)
-    {
-        SetImageList(imageList);
-        m_ownsImageList = true;
-    }
-
-    // Get pointer (may be NULL) to the associated image list.
-    wxImageList* GetImageList() const { return m_imageList; }
-
-protected:
-    // Return true if we have a valid image list.
-    bool HasImageList() const { return m_imageList != NULL; }
-
-    // Return the image with the given index from the image list.
-    //
-    // If there is no image list or if index == NO_IMAGE, silently returns
-    // wxNullIcon.
-    wxIcon GetImage(int iconIndex) const
-    {
-        return m_imageList && iconIndex != NO_IMAGE
-                    ? m_imageList->GetIcon(iconIndex)
-                    : wxNullIcon;
-    }
-
-private:
-    // Free the image list if necessary, i.e. if we own it.
-    void FreeIfNeeded()
-    {
-        if ( m_ownsImageList )
-        {
-            delete m_imageList;
-            m_imageList = NULL;
-
-            // We don't own it any more.
-            m_ownsImageList = false;
-        }
-    }
-
-
-    // The associated image list or NULL.
-    wxImageList* m_imageList;
-
-    // False by default, if true then we delete m_imageList.
-    bool m_ownsImageList;
-
-    wxDECLARE_NO_COPY_CLASS(wxWithImages);
-};
-
-#endif // _WX_WITHIMAGES_H_
diff --git a/Source/3rd Party/wx/include/wx/wrapsizer.h b/Source/3rd Party/wx/include/wx/wrapsizer.h
deleted file mode 100644
index 3e91a700b..000000000
--- a/Source/3rd Party/wx/include/wx/wrapsizer.h	
+++ /dev/null
@@ -1,100 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/wrapsizer.h
-// Purpose:     provide wrapping sizer for layout (wxWrapSizer)
-// Author:      Arne Steinarson
-// Created:     2008-05-08
-// RCS-ID:      $Id$
-// Copyright:   (c) Arne Steinarson
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WRAPSIZER_H_
-#define _WX_WRAPSIZER_H_
-
-#include "wx/sizer.h"
-
-// flags for wxWrapSizer
-enum
-{
-    wxEXTEND_LAST_ON_EACH_LINE = 1,
-    // don't leave spacers in the beginning of a new row
-    wxREMOVE_LEADING_SPACES = 2,
-
-    wxWRAPSIZER_DEFAULT_FLAGS = wxEXTEND_LAST_ON_EACH_LINE |
-                                wxREMOVE_LEADING_SPACES
-};
-
-// ----------------------------------------------------------------------------
-// A box sizer that can wrap items on several lines when sum of widths exceed
-// available line width.
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxWrapSizer : public wxBoxSizer
-{
-public:
-    wxWrapSizer(int orient = wxHORIZONTAL, int flags = wxWRAPSIZER_DEFAULT_FLAGS);
-    virtual ~wxWrapSizer();
-
-    // override base class virtual methods
-    virtual wxSize CalcMin();
-    virtual void RecalcSizes();
-
-    virtual bool InformFirstDirection(int direction,
-                                      int size,
-                                      int availableOtherDir);
-
-protected:
-    // This method is called to decide if an item represents empty space or
-    // not. We do this to avoid having space-only items first or last on a
-    // wrapped line (left alignment).
-    //
-    // By default only spacers are considered to be empty items but a derived
-    // class may override this item if some other kind of sizer elements should
-    // be also considered empty for some reason.
-    virtual bool IsSpaceItem(wxSizerItem *item) const
-    {
-        return item->IsSpacer();
-    }
-
-    // helpers of CalcMin()
-    void CalcMinFromMinor(int totMinor);
-    void CalcMinFromMajor(int totMajor);
-    void CalcMinUsingCurrentLayout();
-    void CalcMinFittingSize(const wxSize& szBoundary);
-    void CalcMaxSingleItemSize();
-
-    // temporarily change the proportion of the last item of the N-th row to
-    // extend to the end of line if the appropriate flag is set
-    void AdjustLastRowItemProp(size_t n, wxSizerItem *itemLast);
-
-    // remove all the items from m_rows
-    void ClearRows();
-
-    // return the N-th row sizer from m_rows creating it if necessary
-    wxSizer *GetRowSizer(size_t n);
-
-    // should be called after completion of each row
-    void FinishRow(size_t n, int rowMajor, int rowMinor, wxSizerItem *itemLast);
-
-
-    const int m_flags;       // Flags specified in the ctor
-
-    int m_dirInform;         // Direction for size information
-    int m_availSize;         // Size available in m_dirInform direction
-    int m_availableOtherDir; // Size available in the other direction
-    bool m_lastUsed;         // Indicates whether value from InformFirst... has
-                             //  been used yet
-
-    // The sizes below are computed by RecalcSizes(), i.e. they don't have
-    // valid values during the initial call to CalcMin() and they are only
-    // valid for the current layout (i.e. the current number of rows)
-    int m_minSizeMinor;      // Min size in minor direction
-    int m_maxSizeMajor;      // Size of longest row
-    int m_minItemMajor;      // Size of smallest item in major direction
-
-    wxBoxSizer m_rows;       // Sizer containing multiple rows of our items
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWrapSizer)
-};
-
-#endif // _WX_WRAPSIZER_H_
diff --git a/Source/3rd Party/wx/include/wx/wupdlock.h b/Source/3rd Party/wx/include/wx/wupdlock.h
index 3e4eaf02b..c30ae00b1 100644
--- a/Source/3rd Party/wx/include/wx/wupdlock.h	
+++ b/Source/3rd Party/wx/include/wx/wupdlock.h	
@@ -3,7 +3,7 @@
 // Purpose:     wxWindowUpdateLocker prevents window redrawing
 // Author:      Vadim Zeitlin
 // Created:     2006-03-06
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: wupdlock.h 37842 2006-03-07 01:50:21Z VZ $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@ public:
 private:
     wxWindow *m_win;
 
-    wxDECLARE_NO_COPY_CLASS(wxWindowUpdateLocker);
+    DECLARE_NO_COPY_CLASS(wxWindowUpdateLocker)
 };
 
 #endif // _WX_WUPDLOCK_H_
diff --git a/Source/3rd Party/wx/include/wx/wx.h b/Source/3rd Party/wx/include/wx/wx.h
index cbb045cb8..8c71e8ba1 100644
--- a/Source/3rd Party/wx/include/wx/wx.h	
+++ b/Source/3rd Party/wx/include/wx/wx.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: wx.h 40943 2006-08-31 19:31:43Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,10 +29,7 @@
 #include "wx/memory.h"
 #include "wx/math.h"
 #include "wx/stopwatch.h"
-#include "wx/timer.h"
 #include "wx/module.h"
-#include "wx/wxcrt.h"
-#include "wx/wxcrtvararg.h"
 
 #if wxUSE_GUI
 
@@ -62,8 +59,10 @@
 #include "wx/icon.h"
 #include "wx/cursor.h"
 #include "wx/dialog.h"
+#include "wx/timer.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
+#include "wx/cmndata.h"
 #include "wx/dataobj.h"
 
 #include "wx/control.h"
@@ -88,19 +87,12 @@
 #include "wx/combobox.h"
 #include "wx/layout.h"
 #include "wx/sizer.h"
+#include "wx/mdi.h"
 #include "wx/statusbr.h"
 #include "wx/choicdlg.h"
 #include "wx/textdlg.h"
 #include "wx/filedlg.h"
 
-// this one is included by exactly one file (mdi.cpp) during wx build so even
-// although we keep it here for the library users, don't include it to avoid
-// bloating the PCH and (worse) rebuilding the entire library when it changes
-// when building the library itself
-#ifndef WXBUILDING
-    #include "wx/mdi.h"
-#endif
-
 // always include, even if !wxUSE_VALIDATORS because we need wxDefaultValidator
 #include "wx/validate.h"
 
diff --git a/Source/3rd Party/wx/include/wx/wxchar.h b/Source/3rd Party/wx/include/wx/wxchar.h
new file mode 100644
index 000000000..0c33d6c96
--- /dev/null
+++ b/Source/3rd Party/wx/include/wx/wxchar.h	
@@ -0,0 +1,1413 @@
+/*
+ * Name:        wx/wxchar.h
+ * Purpose:     Declarations common to wx char/wchar_t usage (wide chars)
+ * Author:      Joel Farley, Ove Kaaven
+ * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
+ * Created:     1998/06/12
+ * RCS-ID:      $Id: wxchar.h 66970 2011-02-19 13:54:14Z VZ $
+ * Copyright:   (c) 1998-2006 wxWidgets dev team
+ * Licence:     wxWindows licence
+ */
+
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
+
+#ifndef _WX_WXCHAR_H_
+#define _WX_WXCHAR_H_
+
+/* defs.h indirectly includes this file, so don't include it here */
+#include "wx/platform.h"
+#include "wx/dlimpexp.h"
+
+#include <stdio.h>  /* we use FILE below */
+
+#if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
+    char *strtok_r(char *, const char *, char **);
+#endif
+
+/* check whether we have wchar_t and which size it is if we do */
+#if !defined(wxUSE_WCHAR_T)
+    #if defined(__UNIX__)
+        #if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__)
+            #define wxUSE_WCHAR_T 1
+        #else
+            #define wxUSE_WCHAR_T 0
+        #endif
+    #elif defined(__GNUWIN32__) && !defined(__MINGW32__)
+        #define wxUSE_WCHAR_T 0
+    #elif defined(__WATCOMC__)
+        #define wxUSE_WCHAR_T 0
+    #elif defined(__VISAGECPP__) && (__IBMCPP__ < 400)
+        #define wxUSE_WCHAR_T 0
+    #else
+        /* add additional compiler checks if this fails */
+        #define wxUSE_WCHAR_T 1
+    #endif
+#endif /* !defined(wxUSE_WCHAR_T) */
+
+/* Unicode support requires wchar_t */
+#if wxUSE_UNICODE && !wxUSE_WCHAR_T
+    #error "wchar_t must be available in Unicode build"
+#endif /* Unicode */
+
+/*
+    Standard headers we need here.
+
+    NB: don't include any wxWidgets headers here because almost all of them include
+        this one!
+ */
+
+/* Required for wxPrintf() etc */
+#include <stdarg.h>
+
+/* Almost all compiler have strdup(), but not quite all: CodeWarrior under Mac */
+/* and VC++ for Windows CE don't provide it */
+#if defined(__VISUALC__) && __VISUALC__ >= 1400
+    #define wxStrdupA _strdup
+#elif !(defined(__MWERKS__) && defined(__WXMAC__)) && !defined(__WXWINCE__)
+    /* use #define, not inline wrapper, as it is tested with #ifndef below */
+    #define wxStrdupA strdup
+#endif
+
+/*
+   non Unix compilers which do have wchar.h (but not tchar.h which is included
+   below and which includes wchar.h anyhow).
+
+   Actually MinGW has tchar.h, but it does not include wchar.h
+ */
+#if defined(__MWERKS__) || defined(__VISAGECPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
+    #ifndef HAVE_WCHAR_H
+        #define HAVE_WCHAR_H
+    #endif
+#endif
+#if defined(__MWERKS__) && !defined(__MACH__)
+    #ifndef HAVE_WCSLEN
+        #define HAVE_WCSLEN
+    #endif
+#endif
+
+#if wxUSE_WCHAR_T
+    #ifdef HAVE_WCHAR_H
+        /* the current (as of Nov 2002) version of cygwin has a bug in its */
+        /* wchar.h -- there is no extern "C" around the declarations in it and */
+        /* this results in linking errors later; also, at least on some */
+        /* Cygwin versions, wchar.h requires sys/types.h */
+        #ifdef __CYGWIN__
+            #include <sys/types.h>
+            #ifdef __cplusplus
+                extern "C" {
+            #endif
+        #endif /* Cygwin */
+
+        #include <wchar.h>
+
+        #if defined(__CYGWIN__) && defined(__cplusplus)
+            }
+        #endif /* Cygwin and C++ */
+
+    #elif defined(HAVE_WCSTR_H)
+        /* old compilers have relevant declarations here */
+        #include <wcstr.h>
+    #elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
+        /* include stdlib.h for wchar_t */
+        #include <stdlib.h>
+    #endif /* HAVE_WCHAR_H */
+
+    #ifdef HAVE_WIDEC_H
+        #include <widec.h>
+    #endif
+#endif /* wxUSE_WCHAR_T */
+
+/* ---------------------------------------------------------------------------- */
+/* define wxHAVE_TCHAR_SUPPORT for the compilers which support the TCHAR type */
+/* mapped to either char or wchar_t depending on the ASCII/Unicode mode and have */
+/* the function mapping _tfoo() -> foo() or wfoo() */
+/* ---------------------------------------------------------------------------- */
+
+/* VC++ and BC++ starting with 5.2 have TCHAR support */
+#ifdef __VISUALC__
+    #define wxHAVE_TCHAR_SUPPORT
+#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
+    #define wxHAVE_TCHAR_SUPPORT
+    #include <ctype.h>
+    #include <memory.h>
+#elif defined(__WATCOMC__)
+    #define wxHAVE_TCHAR_SUPPORT
+#elif defined(__DMC__)
+    #define wxHAVE_TCHAR_SUPPORT
+#elif defined(__WXPALMOS__)
+    #include <stddef.h>
+#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
+    #define wxHAVE_TCHAR_SUPPORT
+    #include <stddef.h>
+    #include <string.h>
+    #include <ctype.h>
+#elif 0 && defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
+    /* VZ: the old VisualAge definitions were completely wrong and had no */
+    /*     chance at all to work in Unicode build anyhow so let's pretend that */
+    /*     VisualAge does _not_ support TCHAR for the moment (as indicated by */
+    /*     "0 &&" above) until someone really has time to delve into Unicode */
+    /*     issues under OS/2 */
+
+    /* VisualAge 4.0+ supports TCHAR */
+    #define wxHAVE_TCHAR_SUPPORT
+#endif /* compilers with (good) TCHAR support */
+
+#if defined(__MWERKS__)
+    /* Metrowerks only has wide char support for OS X >= 10.3 */
+    #if !defined(__DARWIN__) || \
+         (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+        #define wxHAVE_MWERKS_UNICODE
+    #endif
+
+    #ifdef wxHAVE_MWERKS_UNICODE
+        #define HAVE_WPRINTF   1
+        #define HAVE_WCSRTOMBS 1
+        #define HAVE_VSWPRINTF 1
+    #endif
+#endif /* __MWERKS__ */
+
+#ifdef wxHAVE_TCHAR_SUPPORT
+    /* get TCHAR definition if we've got it */
+    #include <tchar.h>
+
+    /* we surely do have wchar_t if we have TCHAR */
+    #ifndef wxUSE_WCHAR_T
+        #define wxUSE_WCHAR_T 1
+    #endif /* !defined(wxUSE_WCHAR_T) */
+
+    /* and we also do have wcslen() */
+    #ifndef HAVE_WCSLEN
+        #define HAVE_WCSLEN
+    #endif
+#endif /* wxHAVE_TCHAR_SUPPORT */
+
+/* ---------------------------------------------------------------------------- */
+/* define wxChar type */
+/* ---------------------------------------------------------------------------- */
+
+/* TODO: define wxCharInt to be equal to either int or wint_t? */
+
+#if !wxUSE_UNICODE
+    typedef char wxChar;
+    typedef signed char wxSChar;
+    typedef unsigned char wxUChar;
+#else /* Unicode */
+    /* VZ: note that VC++ defines _T[SU]CHAR simply as wchar_t and not as */
+    /*     signed/unsigned version of it which (a) makes sense to me (unlike */
+    /*     char wchar_t is always unsigned) and (b) was how the previous */
+    /*     definitions worked so keep it like this */
+
+    /* Sun's SunPro compiler supports the wchar_t type and wide character */
+    /* functions, but does not define __WCHAR_TYPE__. Define it here to */
+    /* allow unicode enabled builds. */
+    #if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
+    #define __WCHAR_TYPE__ wxchar_t
+    #endif
+
+    /* GNU libc has __WCHAR_TYPE__ which requires special treatment, see */
+    /* comment below */
+    #if !defined(__WCHAR_TYPE__) || \
+        (!defined(__GNUC__) || wxCHECK_GCC_VERSION(2, 96))
+        /* standard case */
+        typedef wchar_t wxChar;
+        typedef wchar_t wxSChar;
+        typedef wchar_t wxUChar;
+    #else /* __WCHAR_TYPE__ and gcc < 2.96 */
+        /* VS: wxWidgets used to define wxChar as __WCHAR_TYPE__ here. However, */
+        /*     this doesn't work with new GCC 3.x compilers because wchar_t is */
+        /*     C++'s builtin type in the new standard. OTOH, old compilers (GCC */
+        /*     2.x) won't accept new definition of wx{S,U}Char, therefore we */
+        /*     have to define wxChar conditionally depending on detected */
+        /*     compiler & compiler version. */
+        /*     with old definition of wxChar. */
+        typedef __WCHAR_TYPE__ wxChar;
+        typedef __WCHAR_TYPE__ wxSChar;
+        typedef __WCHAR_TYPE__ wxUChar;
+    #endif /* __WCHAR_TYPE__ */
+#endif /* ASCII/Unicode */
+
+/* ---------------------------------------------------------------------------- */
+/* define wxT() and related macros */
+/* ---------------------------------------------------------------------------- */
+
+#if wxUSE_UNICODE
+    /* use wxCONCAT_HELPER so that x could be expanded if it's a macro */
+    #define wxT(x) wxCONCAT_HELPER(L, x)
+#else /* !Unicode */
+    #define wxT(x) x
+#endif /* Unicode/!Unicode */
+
+/*
+    This macro is defined for forward compatibility with wxWidgets 3. It should
+    be used in the places where wxWidgets 2 API requires wxT() (in Unicode
+    build) but wxWidgets 3 doesn't accept it, e.g. wxCmdLineEntryDesc struct
+    elements initializers.
+ */
+#define wxT_2(x) wxT(x)
+
+/*
+    We define _T() as a synonym of wxT() for backwards compatibility and also
+    for the benefit of Windows programmers used to it. But this identifier is a
+    reserved one and this does create problems in practice, notably with Sun CC
+    which uses it in the recent versions of its standard headers. So avoid
+    defining it for this compiler at all, unless it was explicitly requested by
+    predefining wxNEEDS__T macro before including this header or if we're
+    building wx itself which does need and compiles fine thanks to the special
+    workarounds for Sun CC in wx/{before,after}std.h.
+ */
+#ifndef wxNEEDS__T
+    #if defined(WXBUILDING) || !(defined (__SUNPRO_C) || defined(__SUNPRO_CC))
+        #define wxNEEDS__T
+    #endif
+#endif
+
+#ifdef wxNEEDS__T
+    /* BSDs define _T() to be something different in ctype.h, override it */
+    #if defined(__FreeBSD__) || defined(__DARWIN__)
+        #include <ctype.h>
+    #endif
+    #undef _T
+
+    #define _T(x) wxT(x)
+#endif /* wxNEEDS__T */
+
+/* this macro exists only for forward compatibility with wx 3.0 */
+#define wxS(x)       wxT(x)
+
+/* a helper macro allowing to make another macro Unicode-friendly, see below */
+#define wxAPPLY_T(x) wxT(x)
+
+/* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */
+#ifndef __TFILE__
+    #define __TFILE__ wxAPPLY_T(__FILE__)
+#endif
+
+#ifndef __TDATE__
+    #define __TDATE__ wxAPPLY_T(__DATE__)
+#endif
+
+#ifndef __TTIME__
+    #define __TTIME__ wxAPPLY_T(__TIME__)
+#endif
+
+/*
+    define wxFoo() function for each standard foo() function whose signature
+    (exceptionally including the return type) includes any mention of char:
+    wxFoo() is going to be a Unicode-friendly version of foo(), i.e. will have
+    the same signature but with char replaced by wxChar which allows us to use
+    it in Unicode build as well
+ */
+
+#ifdef wxHAVE_TCHAR_SUPPORT
+    #include <ctype.h>
+
+    #if defined(__WATCOMC__) && defined(UNICODE)
+      #define WXWCHAR_T_CAST(c) (wint_t)(c)
+    #else
+      #define WXWCHAR_T_CAST(c) c
+    #endif
+
+    /* ctype.h functions */
+    #define  wxIsalnum(c)   _istalnum(WXWCHAR_T_CAST(c))
+    #define  wxIsalpha(c)   _istalpha(WXWCHAR_T_CAST(c))
+    #define  wxIscntrl(c)   _istcntrl(WXWCHAR_T_CAST(c))
+    #define  wxIsdigit(c)   _istdigit(WXWCHAR_T_CAST(c))
+    #define  wxIsgraph(c)   _istgraph(WXWCHAR_T_CAST(c))
+    #define  wxIslower(c)   _istlower(WXWCHAR_T_CAST(c))
+    #define  wxIsprint(c)   _istprint(WXWCHAR_T_CAST(c))
+    #define  wxIspunct(c)   _istpunct(WXWCHAR_T_CAST(c))
+    #define  wxIsspace(c)   _istspace(WXWCHAR_T_CAST(c))
+    #define  wxIsupper(c)   _istupper(WXWCHAR_T_CAST(c))
+    #define  wxIsxdigit(c)  _istxdigit(WXWCHAR_T_CAST(c))
+
+    /*
+       There is a bug in VC6 C RTL: toxxx() functions dosn't do anything with
+       signed chars < 0, so "fix" it here.
+     */
+    #define  wxTolower(c) _totlower((wxUChar)(c))
+    #define  wxToupper(c) _totupper((wxUChar)(c))
+
+    /* locale.h functons */
+    #define  wxSetlocale _tsetlocale
+
+    /* string.h functions */
+    #define  wxStrcat    _tcscat
+    #define  wxStrchr    _tcschr
+    #define  wxStrcmp    _tcscmp
+    #define  wxStrcoll   _tcscoll
+    #define  wxStrcpy    _tcscpy
+    #define  wxStrcspn   _tcscspn
+    #define  wxStrdupW   _wcsdup        /* notice the 'W'! */
+    #define  wxStrftime  _tcsftime
+    #define  wxStricmp   _tcsicmp
+    #define  wxStrnicmp  _tcsnicmp
+    #define  wxStrlen_   _tcslen        /* used in wxStrlen inline function */
+    #define  wxStrncat   _tcsncat
+    #define  wxStrncmp   _tcsncmp
+    #define  wxStrncpy   _tcsncpy
+    #define  wxStrpbrk   _tcspbrk
+    #define  wxStrrchr   _tcsrchr
+    #define  wxStrspn    _tcsspn
+    #define  wxStrstr    _tcsstr
+    #define  wxStrtod    _tcstod
+    #define  wxStrtol    _tcstol
+    #define  wxStrtoul   _tcstoul
+    #ifdef __VISUALC__
+        #if __VISUALC__ >= 1300 && !defined(__WXWINCE__)
+            #define wxStrtoll  _tcstoi64
+            #define wxStrtoull _tcstoui64
+        #endif /* VC++ 7+ */
+    #endif
+    #define  wxStrxfrm   _tcsxfrm
+
+    /* stdio.h functions */
+    #define  wxFgetc     _fgettc
+    #define  wxFgetchar  _fgettchar
+    #define  wxFgets     _fgetts
+    #if wxUSE_UNICODE_MSLU
+        WXDLLIMPEXP_BASE FILE * wxMSLU__tfopen(const wxChar *name, const wxChar *mode);
+
+        #define  wxFopen    wxMSLU__tfopen
+    #else
+        #define  wxFopen     _tfopen
+    #endif
+    #define  wxFputc     _fputtc
+    #define  wxFputchar  _fputtchar
+    #define  wxFprintf   _ftprintf
+    #define  wxFputs     _fputts
+    #define  wxFreopen   _tfreopen
+    #define  wxFscanf    _ftscanf
+    #define  wxGetc      _gettc
+    #define  wxGetchar   _gettchar
+    #define  wxGets      _getts
+    #define  wxPerror    _tperror
+    #define  wxPrintf    _tprintf
+    #define  wxPutc(c,f) _puttc(WXWCHAR_T_CAST(c),f)
+    #define  wxPutchar   _puttchar
+    #define  wxPuts      _putts
+    #define  wxScanf     _tscanf
+    #if defined(__DMC__)
+        #if wxUSE_UNICODE
+            /* Digital Mars adds count to _stprintf (C99) so prototype conversion see wxchar.cpp */
+            int wxSprintf (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... ) ;
+        #else
+            /* and there is a bug in D Mars tchar.h prior to 8.39.4n, so define as sprintf */
+            #define wxSprintf sprintf
+        #endif
+    #elif defined(__MINGW32__) && ( defined(_STLPORT_VERSION) && _STLPORT_VERSION >= 0x510 )
+        #if wxUSE_UNICODE
+            /* MinGW with STLPort 5.1 adds count to swprintf (C99) so prototype conversion see wxchar.cpp */
+            int wxSprintf (wchar_t*, const wchar_t*, ...);
+        #else
+            /* MinGW with STLPort 5.1 has clashing defines for _stprintf so use sprintf */
+            #define wxSprintf sprintf
+        #endif
+    #else
+        #define  wxSprintf   _stprintf
+    #endif
+
+    #define  wxSscanf    _stscanf
+    #define  wxTmpnam    _ttmpnam
+    #define  wxUngetc    _tungetc
+    #define  wxVfprintf  _vftprintf
+    #define  wxVprintf   _vtprintf
+    #define  wxVsscanf   _vstscanf
+    #define  wxVsprintf  _vstprintf
+
+    /* special case: these functions are missing under Win9x with Unicows so we */
+    /* have to implement them ourselves */
+    #if wxUSE_UNICODE_MSLU
+        WXDLLIMPEXP_BASE int wxMSLU__trename(const wxChar *oldname, const wxChar *newname);
+        WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name);
+
+        #define  wxRemove    wxMSLU__tremove
+        #define  wxRename    wxMSLU__trename
+    #else
+        #ifdef __WXWINCE__
+            /* carefully: wxRemove() must return 0 on success while DeleteFile()
+               returns 0 on error, so don't just define one as the other */
+            int wxRemove(const wxChar *path);
+        #else
+            #define  wxRemove    _tremove
+            #define  wxRename    _trename
+        #endif
+    #endif
+
+    /* stdlib.h functions */
+    #define  wxAtoi      _ttoi
+    #define  wxAtol      _ttol
+    /* #define  wxAtof   _tttof -- notice that there is no such thing (why?) */
+    /* there are no env vars at all under CE, so no _tgetenv neither */
+    #ifdef __WXWINCE__
+        /* can't define as inline function as this is a C file... */
+        #define wxGetenv(name)  ((wxChar *)NULL)
+    #else
+        #define  wxGetenv    _tgetenv
+    #endif
+    #define  wxSystem    _tsystem
+
+    /* time.h functions */
+    #define  wxAsctime   _tasctime
+    #define  wxCtime     _tctime
+
+    #define wxMbstowcs mbstowcs
+    #define wxWcstombs wcstombs
+#else /* !TCHAR-aware compilers */
+    /*
+        There are 2 unrelated problems with these functions under Mac:
+            a) Metrowerks MSL CRT implements them strictly in C99 sense and
+               doesn't support (very common) extension of allowing to call
+               mbstowcs(NULL, ...) which makes it pretty useless as you can't
+               know the size of the needed buffer
+            b) OS X <= 10.2 declares and even defined these functions but
+               doesn't really implement them -- they always return an error
+
+        So use our own replacements in both cases.
+     */
+    #if defined(__MWERKS__) && defined(__MSL__)
+        #define wxNEED_WX_MBSTOWCS
+    #endif
+
+    #ifdef __DARWIN__
+        #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
+            #define wxNEED_WX_MBSTOWCS
+        #endif
+    #endif
+
+    #ifdef wxNEED_WX_MBSTOWCS
+        /* even though they are defined and "implemented", they are bad and just
+           stubs so we need our own - we need these even in ANSI builds!! */
+        WXDLLIMPEXP_BASE size_t wxMbstowcs (wchar_t *, const char *, size_t);
+        WXDLLIMPEXP_BASE size_t wxWcstombs (char *, const wchar_t *, size_t);
+    #else
+        #define wxMbstowcs mbstowcs
+        #define wxWcstombs wcstombs
+    #endif
+
+    /*
+       The system C library on Mac OS X 10.2 and below does not support
+       unicode: in other words all wide-character functions such as towupper et
+       al. do simply not exist so we need to provide our own in that context,
+       except for the wchar_t definition/typedef itself.
+
+       We need to do this for both project builder and CodeWarrior as
+       the latter uses the system C library in Mach builds for wide character
+       support, which as mentioned does not exist on 10.2 and below.
+    */
+    #if wxUSE_UNICODE && \
+        defined(__DARWIN__) && \
+            ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
+        /* we need everything! */
+        #define wxNEED_WX_STRING_H
+        #define wxNEED_WX_CTYPE_H
+
+        #define  wxFgetchar(c)  wxFgetc(c, stdin)
+        #define  wxFputc     wxPutc
+        #define  wxFputchar(c)  wxPutc(c, stdout)
+        #define  wxGetc      wxFgetc
+        #define  wxGetchar(c)   wxFgetc(c, stdin)
+
+        #include <stdio.h>
+
+        #define wxNEED_FGETC
+        #define wxNEED_FGETS
+        #define wxNEED_GETS
+        #define wxNEED_UNGETC
+
+        #define wxNEED_FPUTS
+        #define wxNEED_PUTS
+        #define wxNEED_PUTC
+
+        int wxFputs(const wxChar *ch, FILE *stream);
+        int wxPuts(const wxChar *ws);
+        int wxPutc(wxChar ch, FILE *stream);
+
+        #ifdef __cplusplus
+        extern "C" {
+        #endif
+            WXDLLIMPEXP_BASE size_t   wxStrlen_(const wxChar *s);
+        #ifdef __cplusplus
+        }
+        #endif
+
+        #define wxPutchar(wch) wxPutc(wch, stdout)
+
+        #define wxNEED_PRINTF_CONVERSION
+        #define wxNEED_WX_STDIO_H
+        #define wxNEED_WX_STDLIB_H
+        #define wxNEED_WX_TIME_H
+
+    #elif wxUSE_UNICODE
+        #include <wctype.h>
+
+        /* this is probably glibc-specific */
+        #if defined(__WCHAR_TYPE__) && !defined(__MWERKS__)
+            /* ctype.h functions (wctype.h) */
+            #define  wxIsalnum   iswalnum
+            #define  wxIsalpha   iswalpha
+            #define  wxIscntrl   iswcntrl
+            #define  wxIsdigit   iswdigit
+            #define  wxIsgraph   iswgraph
+            #define  wxIslower   iswlower
+            #define  wxIsprint   iswprint
+            #define  wxIspunct   iswpunct
+            #define  wxIsspace   iswspace
+            #define  wxIsupper   iswupper
+            #define  wxIsxdigit  iswxdigit
+
+            #if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)
+                /* /usr/include/wctype.h incorrectly declares translations */
+                /* tables which provokes tons of compile-time warnings -- try */
+                /* to correct this */
+                #define  wxTolower(wc)   towctrans((wc), (wctrans_t)__ctype_tolower)
+                #define  wxToupper(wc)   towctrans((wc), (wctrans_t)__ctype_toupper)
+            #else /* !glibc 2.0 */
+                #define  wxTolower   towlower
+                #define  wxToupper   towupper
+            #endif /* gcc/!gcc */
+
+            /* string.h functions (wchar.h) */
+            #define  wxStrcat    wcscat
+            #define  wxStrchr    wcschr
+            #define  wxStrcmp    wcscmp
+            #define  wxStrcoll   wcscoll
+            #define  wxStrcpy    wcscpy
+            #define  wxStrcspn   wcscspn
+            #define  wxStrlen_   wxWcslen /* wxStrlen_() is used in wxStrlen() */
+            #define  wxStrncat   wcsncat
+            #define  wxStrncmp   wcsncmp
+            #define  wxStrncpy   wcsncpy
+            #define  wxStrpbrk   wcspbrk
+            #define  wxStrrchr   wcsrchr
+            #define  wxStrspn    wcsspn
+            #define  wxStrstr    wcsstr
+            #define  wxStrtod    wcstod
+            #define  wxStrtol    wcstol
+            #define  wxStrtoul   wcstoul
+            #ifdef HAVE_WCSTOULL
+                /* assume that we have wcstoull(), which is also C99, too */
+                #define  wxStrtoll   wcstoll
+                #define  wxStrtoull  wcstoull
+            #endif /* HAVE_WCSTOULL */
+            #define  wxStrxfrm   wcsxfrm
+
+            #define  wxFgetc     fgetwc
+            #define  wxFgetchar  fgetwchar
+            #define  wxFgets     fgetws
+            #define  wxFputc     fputwc
+            #define  wxFputchar  fputwchar
+            #define  wxGetc      getwc
+            #define  wxGetchar   getwchar
+            #define  wxGets      getws
+            #define  wxUngetc    ungetwc
+
+            #ifdef HAVE_FPUTWS
+                #define wxFputs     fputws
+            #else
+                #define wxNEED_FPUTS
+                #include <stdio.h>
+                int wxFputs(const wxChar *ch, FILE *stream);
+            #endif
+
+            #ifdef HAVE_WPUTC
+                #define wxPutc      wputc
+            #else
+                #define wxNEED_PUTC
+                #include <stdio.h>
+                int wxPutc(wxChar ch, FILE *stream);
+            #endif
+
+            #ifdef HAVE_WPUTCHAR
+                #define wxPutchar   wputchar
+            #else
+                #define wxPutchar(wch) wxPutc(wch, stdout)
+            #endif
+
+            #ifdef HAVE_PUTWS
+                #define wxPuts      putws
+            #else
+                #define wxNEED_PUTS
+                int wxPuts(const wxChar *ws);
+            #endif
+
+            /* we need %s to %ls conversion for printf and scanf etc */
+            #define wxNEED_PRINTF_CONVERSION
+
+            /* glibc doesn't have wide char equivalents of the other stuff so */
+            /* use our own versions */
+            #define wxNEED_WX_STDIO_H
+            #define wxNEED_WX_STDLIB_H
+            #define wxNEED_WX_TIME_H
+        #elif defined(__MWERKS__) && ( defined(__MSL__) || defined(__MACH__) )
+            /* ctype.h functions (wctype.h) */
+            #define  wxIsalnum   iswalnum
+            #define  wxIsalpha   iswalpha
+            #define  wxIscntrl   iswcntrl
+            #define  wxIsdigit   iswdigit
+            #define  wxIsgraph   iswgraph
+            #define  wxIslower   iswlower
+            #define  wxIsprint   iswprint
+            #define  wxIspunct   iswpunct
+            #define  wxIsspace   iswspace
+            #define  wxIsupper   iswupper
+            #define  wxIsxdigit  iswxdigit
+            #define  wxTolower   towlower
+            #define  wxToupper   towupper
+
+            /* string.h functions (wchar.h) */
+            #define  wxStrcat    wcscat
+            #define  wxStrchr    wcschr
+            #define  wxStrcmp    wcscmp
+            #define  wxStrcoll   wcscoll
+            #define  wxStrcpy    wcscpy
+            #define  wxStrcspn   wcscspn
+            #define  wxStrlen_   wxWcslen /* wxStrlen_() is used in wxStrlen() */
+            #define  wxStrncat   wcsncat
+            #define  wxStrncmp   wcsncmp
+            #define  wxStrncpy   wcsncpy
+            #define  wxStrpbrk   wcspbrk
+            #define  wxStrrchr   wcsrchr
+            #define  wxStrspn    wcsspn
+            #define  wxStrstr    wcsstr
+            #define  wxStrtod    wcstod
+            #define  wxStrtol    wcstol
+            #define  wxStrtoul   wcstoul
+            #define  wxStrxfrm   wcsxfrm
+
+            #define  wxFgetc     fgetwc
+            #define  wxFgetchar  fgetwchar
+            #define  wxFgets     fgetws
+            #define  wxFputc     fputwc
+            #define  wxFputchar  fputwchar
+            #define  wxGetc      getwc
+            #define  wxGetchar   getwchar
+            #define  wxGets      getws
+            #define  wxUngetc    ungetwc
+
+            #define wxNEED_PRINTF_CONVERSION
+
+            #define  wxPutc      putwc
+            #define  wxPutchar   putwchar
+            #define  wxFputs     fputws
+
+            /* stdio.h functions */
+
+            #define wxNEED_WX_STDIO_H
+
+            /* stdlib.h functions */
+            #ifdef __MACH__
+            #define wxNEED_WX_STDLIB_H
+            #else
+            #define  wxAtof      watof
+            #define  wxAtoi      watoi
+            #define  wxAtol      watol
+            #define  wxGetenv(a)    ((wxChar*)NULL)
+            #define  wxSystem(a)    ((int)NULL)
+            #endif
+            /* time.h functions */
+            #define  wxAsctime   wasciitime
+            #define  wxCtime     wctime
+            /* #define  wxStrftime  wcsftime */
+
+            #define wxNEED_WX_TIME_H
+        #else /* !metrowerks for apple */
+            #error  "Please define wide character functions for your environment"
+        #endif
+    #else /* ASCII */
+        #include <ctype.h>
+        #include <string.h>
+
+        /* ctype.h functions */
+        #define  wxIsalnum   isalnum
+        #define  wxIsalpha   isalpha
+        #define  wxIscntrl   iscntrl
+        #define  wxIsdigit   isdigit
+        #define  wxIsgraph   isgraph
+        #define  wxIslower   islower
+        #define  wxIsprint   isprint
+        #define  wxIspunct   ispunct
+        #define  wxIsspace   isspace
+        #define  wxIsupper   isupper
+        #define  wxIsxdigit  isxdigit
+        #define  wxTolower   tolower
+        #define  wxToupper   toupper
+
+         /* locale.h functons */
+        #define  wxSetlocale setlocale
+
+         /* string.h functions */
+        #define  wxStrcat    strcat
+        #define  wxStrchr    strchr
+        #define  wxStrcmp    strcmp
+        #define  wxStrcoll   strcoll
+        #define  wxStrcpy    strcpy
+        #define  wxStrcspn   strcspn
+
+        /* wxStricmp and wxStrnicmp are defined below */
+        #define  wxStrlen_   strlen /* used in wxStrlen inline function */
+        #define  wxStrncat   strncat
+        #define  wxStrncmp   strncmp
+        #define  wxStrncpy   strncpy
+        #define  wxStrpbrk   strpbrk
+        #define  wxStrrchr   strrchr
+        #define  wxStrspn    strspn
+        #define  wxStrstr    strstr
+        #define  wxStrtod    strtod
+        #ifdef HAVE_STRTOK_R
+            #define  wxStrtok(str, sep, last)    strtok_r(str, sep, last)
+        #endif
+        #define  wxStrtol    strtol
+        #define  wxStrtoul   strtoul
+        #ifdef HAVE_STRTOULL
+            /* assume that we have wcstoull(), which is also C99, too */
+            #define  wxStrtoll   strtoll
+            #define  wxStrtoull  strtoull
+        #endif /* HAVE_WCSTOULL */
+        #define  wxStrxfrm   strxfrm
+
+        /* stdio.h functions */
+        #define  wxFopen     fopen
+        #define  wxFreopen   freopen
+        #define  wxRemove    remove
+        #define  wxRename    rename
+
+        #define  wxPerror    perror
+        #define  wxTmpnam    tmpnam
+
+        #define  wxFgetc     fgetc
+        #define  wxFgetchar  fgetchar
+        #define  wxFgets     fgets
+        #define  wxFputc     fputc
+        #define  wxFputs     fputs
+        #define  wxFputchar  fputchar
+        #define  wxFprintf   fprintf
+        #define  wxFscanf    fscanf
+        #define  wxGetc      getc
+        #define  wxGetchar   getchar
+        #define  wxGets      gets
+        #define  wxPrintf    printf
+        #define  wxPutc      putc
+        #define  wxPutchar   putchar
+        #define  wxPuts      puts
+        #define  wxScanf     scanf
+        #define  wxSprintf   sprintf
+        #define  wxSscanf    sscanf
+        #define  wxUngetc    ungetc
+        #define  wxVfprintf  vfprintf
+        #define  wxVprintf   vprintf
+        #define  wxVsscanf   vsscanf
+        #define  wxVsprintf  vsprintf
+
+        /* stdlib.h functions */
+        #define  wxAtof      atof
+        #define  wxAtoi      atoi
+        #define  wxAtol      atol
+        #define  wxGetenv    getenv
+        #define  wxSystem    system
+
+        /* time.h functions */
+        #define  wxAsctime   asctime
+        #define  wxCtime     ctime
+        #define  wxStrftime  strftime
+    #endif /* Unicode/ASCII */
+#endif /* TCHAR-aware compilers/the others */
+
+#ifdef wxStrtoll
+    #define wxHAS_STRTOLL
+#endif
+
+/*
+    various special cases
+ */
+
+/* define wxStricmp and wxStrnicmp for various compilers */
+
+/* note that in Unicode mode we definitely are going to need our own version */
+#if !defined(wxStricmp) && !wxUSE_UNICODE
+    #if defined(__BORLANDC__) || defined(__WATCOMC__) || \
+            defined(__SALFORDC__) || defined(__VISAGECPP__) || \
+            defined(__EMX__) || defined(__DJGPP__)
+        #define wxStricmp stricmp
+        #define wxStrnicmp strnicmp
+    #elif defined(__WXPALMOS__)
+        /* FIXME: There is no equivalent to strnicmp in the Palm OS API.  This
+         * quick hack should do until one can be written.
+         */
+        #define wxStricmp StrCaselessCompare
+        #define wxStrnicmp strnicmp
+    #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
+            (defined(__MWERKS__) && defined(__INTEL__))
+        #define wxStricmp _stricmp
+        #define wxStrnicmp _strnicmp
+    #elif defined(__UNIX__) || defined(__GNUWIN32__)
+        #define wxStricmp strcasecmp
+        #define wxStrnicmp strncasecmp
+    /* #else -- use wxWidgets implementation */
+    #endif
+#endif /* !defined(wxStricmp) */
+
+/* define wxWcslen() which should be always available if wxUSE_WCHAR_T == 1 (as */
+/* it's used in wx/buffer.h -- and also might be used just below by wxStrlen() */
+/* when wxStrlen_() is #define'd as wxWcslen so do it before defining wxStrlen) */
+#if wxUSE_WCHAR_T
+    #ifdef HAVE_WCSLEN
+        #define wxWcslen wcslen
+    #else
+        WXDLLIMPEXP_BASE size_t wxWcslen(const wchar_t *s);
+    #endif
+#endif /* wxUSE_WCHAR_T */
+
+#ifdef __cplusplus
+/* checks whether the passed in pointer is NULL and if the string is empty */
+inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
+
+/* safe version of strlen() (returns 0 if passed NULL pointer) */
+inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; }
+#endif
+
+/*
+    each of strdup() and wcsdup() may or may not be available but we need both
+    of them anyhow for wx/buffer.h so we define the missing one(s) in
+    wxchar.cpp and so we should always have both wxStrdupA and wxStrdupW
+    defined -- if this is somehow not the case in some situations, please
+    correct that and not the lines here
+ */
+#if wxUSE_UNICODE
+    #define wxStrdup wxStrdupW
+#else
+    #define wxStrdup wxStrdupA
+#endif
+
+#ifdef __cplusplus
+WXDLLIMPEXP_BASE bool wxOKlibc(); /* for internal use */
+#endif
+
+/* printf() family saga */
+
+/*
+   For some systems [v]snprintf() exists in the system libraries but not in the
+   headers, so we need to declare it ourselves to be able to use it.
+ */
+#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)
+#ifdef __cplusplus
+    extern "C"
+#else
+    extern
+#endif
+    int vsnprintf(char *str, size_t size, const char *format, va_list ap);
+#endif /* !HAVE_VSNPRINTF_DECL */
+
+#if defined(HAVE_SNPRINTF) && !defined(HAVE_SNPRINTF_DECL)
+#ifdef __cplusplus
+    extern "C"
+#else
+    extern
+#endif
+    WXDLLIMPEXP_BASE int snprintf(char *str, size_t size, const char *format, ...);
+#endif /* !HAVE_SNPRINTF_DECL */
+
+/* Wrapper for vsnprintf if it's 3rd parameter is non-const. Note: the
+ * same isn't done for snprintf below, the builtin wxSnprintf_ is used
+ * instead since it's already a simple wrapper */
+#if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL
+    inline int wx_fixed_vsnprintf(char *str, size_t size, const char *format, va_list ap)
+    {
+        return vsnprintf(str, size, (char*)format, ap);
+    }
+#endif
+
+/*
+   MinGW MSVCRT has non-standard vswprintf() (for MSVC compatibility
+   presumably) and normally _vsnwprintf() is used instead (but as
+   STLPort 5.1 defines standard vswprintf(), don't do this for it)
+ */
+#if defined(HAVE_VSWPRINTF) && defined(__MINGW32__) && !( defined(_STLPORT_VERSION) && _STLPORT_VERSION >= 0x510 )
+    #undef HAVE_VSWPRINTF
+#endif
+
+#if wxUSE_PRINTF_POS_PARAMS
+    /*
+        The systems where vsnprintf() supports positional parameters should
+        define the HAVE_UNIX98_PRINTF symbol.
+
+        On systems which don't (e.g. Windows) we are forced to use
+        our wxVsnprintf() implementation.
+    */
+    #if defined(HAVE_UNIX98_PRINTF)
+        #if wxUSE_UNICODE
+            #ifdef HAVE_VSWPRINTF
+                #define wxVsnprintf_        vswprintf
+            #endif
+        #else /* ASCII */
+            #ifdef HAVE_BROKEN_VSNPRINTF_DECL
+                #define wxVsnprintf_    wx_fixed_vsnprintf
+            #else
+                #define wxVsnprintf_    vsnprintf
+            #endif
+        #endif
+    #else /* !HAVE_UNIX98_PRINTF */
+        /*
+            The only compiler with positional parameters support under Windows
+            is VC++ 8.0 which provides a new xxprintf_p() functions family.
+            The 2003 PSDK includes a slightly earlier version of VC8 than the
+            main release and does not have the printf_p functions.
+         */
+        #if defined _MSC_FULL_VER && _MSC_FULL_VER >= 140050727 && !defined __WXWINCE__
+            #if wxUSE_UNICODE
+                #define wxVsnprintf_    _vswprintf_p
+            #else
+                #define wxVsnprintf_    _vsprintf_p
+            #endif
+        #endif
+    #endif /* HAVE_UNIX98_PRINTF/!HAVE_UNIX98_PRINTF */
+#else /* !wxUSE_PRINTF_POS_PARAMS */
+    /*
+       We always want to define safe snprintf() function to be used instead of
+       sprintf(). Some compilers already have it (or rather vsnprintf() which
+       we really need...), otherwise we implement it using our own printf()
+       code.
+
+       We define function with a trailing underscore here because the real one
+       is a wrapper around it as explained below
+     */
+
+    /* first deal with TCHAR-aware compilers which have _vsntprintf */
+    #ifndef wxVsnprintf_
+        #if defined(__VISUALC__) || \
+                (defined(__BORLANDC__) && __BORLANDC__ >= 0x540)
+            #define wxVsnprintf_    _vsntprintf
+            #define wxSnprintf_     _sntprintf
+        #endif
+    #endif
+
+    /* if this didn't work, define it separately for Unicode and ANSI builds */
+    #ifndef wxVsnprintf_
+        #if wxUSE_UNICODE
+            #if defined(HAVE__VSNWPRINTF)
+                #define wxVsnprintf_    _vsnwprintf
+            #elif defined(HAVE_VSWPRINTF)
+                #define wxVsnprintf_     vswprintf
+            #elif defined(__WATCOMC__)
+                #define wxVsnprintf_    _vsnwprintf
+                #define wxSnprintf_     _snwprintf
+            #endif
+        #else /* ASCII */
+            /*
+               All versions of CodeWarrior supported by wxWidgets apparently
+               have both snprintf() and vsnprintf()
+             */
+            #if defined(HAVE_SNPRINTF) \
+                || defined(__MWERKS__) || defined(__WATCOMC__)
+                #ifndef HAVE_BROKEN_SNPRINTF_DECL
+                    #define wxSnprintf_     snprintf
+                #endif
+            #endif
+            #if defined(HAVE_VSNPRINTF) \
+                || defined(__MWERKS__) || defined(__WATCOMC__)
+                #ifdef HAVE_BROKEN_VSNPRINTF_DECL
+                    #define wxVsnprintf_    wx_fixed_vsnprintf
+                #else
+                    #define wxVsnprintf_    vsnprintf
+                #endif
+            #endif
+        #endif /* Unicode/ASCII */
+    #endif /* wxVsnprintf_ */
+#endif /* wxUSE_PRINTF_POS_PARAMS/!wxUSE_PRINTF_POS_PARAMS */
+
+#ifndef wxSnprintf_
+    /* no snprintf(), cook our own */
+    WXDLLIMPEXP_BASE int
+    wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...) ATTRIBUTE_PRINTF_3;
+#endif
+#ifndef wxVsnprintf_
+    /* no (suitable) vsnprintf(), cook our own */
+    WXDLLIMPEXP_BASE int
+    wxVsnprintf_(wxChar *buf, size_t len, const wxChar *format, va_list argptr);
+
+    #define wxUSE_WXVSNPRINTF 1
+#else
+    #define wxUSE_WXVSNPRINTF 0
+#endif
+
+/*
+   In Unicode mode we need to have all standard functions such as wprintf() and
+   so on but not all systems have them so use our own implementations in this
+   case.
+ */
+#if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF)
+    #define wxNEED_WPRINTF
+#endif
+
+/*
+   More Unicode complications: although both ANSI C and C++ define a number of
+   wide character functions such as wprintf(), not all environments have them.
+   Worse, those which do have different behaviours: under Windows, %s format
+   specifier changes its meaning in Unicode build and expects a Unicode string
+   while under Unix/POSIX it still means an ASCII string even for wprintf() and
+   %ls has to be used for wide strings.
+
+   We choose to always emulate Windows behaviour as more useful for us so even
+   if we have wprintf() we still must wrap it in a non trivial wxPrintf().
+
+*/
+
+#if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF)
+    /*
+        we need to implement all wide character printf and scanf functions
+        either because we don't have them at all or because they don't have the
+        semantics we need
+     */
+    int wxScanf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_1;
+    int wxSscanf( const wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_2;
+    int wxFscanf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_2;
+    int wxVsscanf( const wxChar *str, const wxChar *format, va_list ap );
+    int wxPrintf( const wxChar *format, ... ) ATTRIBUTE_PRINTF_1;
+    int wxSprintf( wxChar *str, const wxChar *format, ... ) ATTRIBUTE_PRINTF_2;
+    int wxFprintf( FILE *stream, const wxChar *format, ... ) ATTRIBUTE_PRINTF_2;
+    int wxVfprintf( FILE *stream, const wxChar *format, va_list ap );
+    int wxVprintf( const wxChar *format, va_list ap );
+    int wxVsprintf( wxChar *str, const wxChar *format, va_list ap );
+#endif /* wxNEED_PRINTF_CONVERSION */
+
+/* these 2 can be simply mapped to the versions with underscore at the end */
+/* if we don't have to do the conversion */
+/*
+   However, if we don't have any vswprintf() at all we don't need to redefine
+   anything as our own wxVsnprintf_() already behaves as needed.
+*/
+#if defined(wxNEED_PRINTF_CONVERSION) && defined(wxVsnprintf_)
+    int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... ) ATTRIBUTE_PRINTF_3;
+    int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list ap );
+#else
+    #define wxSnprintf wxSnprintf_
+    #define wxVsnprintf wxVsnprintf_
+#endif
+
+/*
+    various functions which might not be available in libc and for which we
+    provide our own replacements in wxchar.cpp
+ */
+
+/* ctype.h functions */
+
+/* RN: Used only under OSX <= 10.2 currently */
+#ifdef wxNEED_WX_CTYPE_H
+    WXDLLIMPEXP_BASE int wxIsalnum(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIsalpha(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIscntrl(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIsdigit(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIsgraph(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIslower(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIsprint(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIspunct(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIsspace(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIsupper(wxChar ch);
+    WXDLLIMPEXP_BASE int wxIsxdigit(wxChar ch);
+    WXDLLIMPEXP_BASE int wxTolower(wxChar ch);
+    WXDLLIMPEXP_BASE int wxToupper(wxChar ch);
+#endif /* wxNEED_WX_CTYPE_H */
+
+/* under VC++ 6.0 isspace() returns 1 for 8 bit chars which completely breaks */
+/* the file parsing -- this may be true for 5.0 as well, update #ifdef then */
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200) && !wxUSE_UNICODE
+    #undef wxIsspace
+    #define wxIsspace(c) ((((unsigned)c) < 128) && isspace(c))
+#endif /* VC++ */
+
+/*
+   a few compilers don't have the (non standard but common) isascii function,
+   define it ourselves for them
+ */
+#ifndef isascii
+    #if defined(__MWERKS__)
+        #define wxNEED_ISASCII
+    #elif defined(_WIN32_WCE)
+        #if _WIN32_WCE <= 211
+            #define wxNEED_ISASCII
+        #endif
+    #endif
+#endif /* isascii */
+
+#ifdef wxNEED_ISASCII
+    inline int isascii(int c) { return (unsigned)c < 0x80; }
+#endif
+
+#ifdef _WIN32_WCE
+    #if _WIN32_WCE <= 211
+        #define isspace(c) ((c) == wxT(' ') || (c) == wxT('\t'))
+    #endif
+#endif /* _WIN32_WCE */
+
+/*
+   we had goofed and defined wxIsctrl() instead of (correct) wxIscntrl() in the
+   initial versions of this header -- now it is too late to remove it so
+   although we fixed the function/macro name above, still provide the
+   backwards-compatible synonym.
+ */
+#define wxIsctrl wxIscntrl
+
+/* string.h functions */
+#ifndef strdup
+    #if defined(__MWERKS__) && !defined(__MACH__) && (__MSL__ < 0x00008000)
+        #define wxNEED_STRDUP
+    #elif defined(__WXWINCE__)
+        #if _WIN32_WCE <= 211
+            #define wxNEED_STRDUP
+        #endif
+    #endif
+#endif /* strdup */
+
+#ifdef wxNEED_STRDUP
+    WXDLLIMPEXP_BASE char *strdup(const char* s);
+#endif
+
+/* RN: Used only under OSX <= 10.2 currently
+   The __cplusplus ifdefs are messy, but they are required to build
+   the regex library, since c does not support function overloading
+*/
+#ifdef wxNEED_WX_STRING_H
+# ifdef __cplusplus
+    extern "C" {
+# endif
+        WXDLLIMPEXP_BASE wxChar * wxStrcat(wxChar *dest, const wxChar *src);
+        WXDLLIMPEXP_BASE const wxChar * wxStrchr(const wxChar *s, wxChar c);
+        WXDLLIMPEXP_BASE int      wxStrcmp(const wxChar *s1, const wxChar *s2);
+        WXDLLIMPEXP_BASE int      wxStrcoll(const wxChar *s1, const wxChar *s2);
+        WXDLLIMPEXP_BASE wxChar * wxStrcpy(wxChar *dest, const wxChar *src);
+        WXDLLIMPEXP_BASE size_t   wxStrcspn(const wxChar *s, const wxChar *reject);
+        WXDLLIMPEXP_BASE wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n);
+        WXDLLIMPEXP_BASE int      wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n);
+        WXDLLIMPEXP_BASE wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n);
+        WXDLLIMPEXP_BASE const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept);
+        WXDLLIMPEXP_BASE const wxChar * wxStrrchr(const wxChar *s, wxChar c);
+        WXDLLIMPEXP_BASE size_t   wxStrspn(const wxChar *s, const wxChar *accept);
+        WXDLLIMPEXP_BASE const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
+# ifdef __cplusplus
+    }
+# endif
+
+    /* These functions use C++, so we can't c extern them */
+    WXDLLIMPEXP_BASE double   wxStrtod(const wxChar *nptr, wxChar **endptr);
+    WXDLLIMPEXP_BASE long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base);
+    WXDLLIMPEXP_BASE unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base);
+    WXDLLIMPEXP_BASE size_t   wxStrxfrm(wxChar *dest, const wxChar *src, size_t n);
+
+    /* inlined versions */
+    #ifdef __cplusplus
+        inline wxChar * wxStrchr(wxChar *s, wxChar c)
+            { return (wxChar *)wxStrchr((const wxChar *)s, c); }
+        inline wxChar * wxStrpbrk(wxChar *s, const wxChar *accept)
+            { return (wxChar *)wxStrpbrk((const wxChar *)s, accept); }
+        inline wxChar * wxStrrchr(wxChar *s, wxChar c)
+            { return (wxChar *)wxStrrchr((const wxChar *)s, c); }
+        inline wxChar *wxStrstr(wxChar *haystack, const wxChar *needle)
+            { return (wxChar *)wxStrstr((const wxChar *)haystack, needle); }
+    #endif
+
+#endif /* wxNEED_WX_STRING_H */
+
+#ifndef wxStrdupA
+WXDLLIMPEXP_BASE char *wxStrdupA(const char *psz);
+#endif
+
+#ifndef wxStrdupW
+WXDLLIMPEXP_BASE wchar_t *wxStrdupW(const wchar_t *pwz);
+#endif
+
+#ifndef wxStricmp
+WXDLLIMPEXP_BASE int wxStricmp(const wxChar *psz1, const wxChar *psz2);
+#endif
+
+#ifndef wxStrnicmp
+WXDLLIMPEXP_BASE int wxStrnicmp(const wxChar *psz1, const wxChar *psz2, size_t len);
+#endif
+
+#ifndef wxStrtok
+WXDLLIMPEXP_BASE wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr);
+#endif
+
+#ifdef __cplusplus
+#ifndef wxSetlocale
+class WXDLLIMPEXP_BASE wxWCharBuffer;
+WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
+#endif
+#endif
+
+/* stdio.h functions */
+#ifdef wxNEED_WX_STDIO_H
+    #include <stdio.h>
+    WXDLLIMPEXP_BASE FILE *   wxFopen(const wxChar *path, const wxChar *mode);
+    WXDLLIMPEXP_BASE FILE *   wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream);
+    WXDLLIMPEXP_BASE int      wxRemove(const wxChar *path);
+    WXDLLIMPEXP_BASE int      wxRename(const wxChar *oldpath, const wxChar *newpath);
+
+    /* *printf() family is handled separately */
+#endif /* wxNEED_WX_STDIO_H */
+
+
+/* stdlib.h functions */
+#ifndef wxAtof
+WXDLLIMPEXP_BASE double   wxAtof(const wxChar *psz);
+#endif
+
+/*
+   mingw32 doesn't provide _tsystem() even though it does provide all the other
+   stdlib.h functions wrappers so check for it separately:
+ */
+#if defined(__MINGW32__) && wxUSE_UNICODE && !defined(_tsystem)
+    #define wxNEED_WXSYSTEM
+#endif
+
+#ifdef wxNEED_WX_STDLIB_H
+WXDLLIMPEXP_BASE int      wxAtoi(const wxChar *psz);
+WXDLLIMPEXP_BASE long     wxAtol(const wxChar *psz);
+WXDLLIMPEXP_BASE wxChar * wxGetenv(const wxChar *name);
+#define wxNEED_WXSYSTEM
+#endif
+
+#ifdef wxNEED_WXSYSTEM
+WXDLLIMPEXP_BASE int      wxSystem(const wxChar *psz);
+#endif
+
+
+/* time.h functions */
+#ifdef wxNEED_WX_TIME_H
+#if defined(__MWERKS__) && defined(macintosh)
+    #include <time.h>
+#endif
+    /*silent gabby compilers*/
+    struct tm;
+    WXDLLIMPEXP_BASE size_t wxStrftime(wxChar *s, size_t max,
+                                  const wxChar *fmt, const struct tm *tm);
+#endif /* wxNEED_WX_TIME_H */
+
+#ifndef wxCtime
+#include <time.h>
+WXDLLIMPEXP_BASE wxChar *wxCtime(const time_t *timep);
+#endif
+
+
+/* missing functions in some WinCE versions */
+#ifdef _WIN32_WCE
+#if (_WIN32_WCE < 300)
+WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
+#endif
+#endif /* _WIN32_WCE */
+
+/* multibyte to wide char conversion functions and macros */
+
+#if wxUSE_WCHAR_T
+    /* multibyte<->widechar conversion */
+    WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
+    WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
+
+    #if wxUSE_UNICODE
+        #define wxMB2WX wxMB2WC
+        #define wxWX2MB wxWC2MB
+        #define wxWC2WX wxStrncpy
+        #define wxWX2WC wxStrncpy
+    #else
+        #define wxMB2WX wxStrncpy
+        #define wxWX2MB wxStrncpy
+        #define wxWC2WX wxWC2MB
+        #define wxWX2WC wxMB2WC
+    #endif
+#else /* !wxUSE_UNICODE */
+/* Why is this here?
+#error ha */
+    /* No wxUSE_WCHAR_T: we have to do something (JACS) */
+    #define wxMB2WC wxStrncpy
+    #define wxWC2MB wxStrncpy
+    #define wxMB2WX wxStrncpy
+    #define wxWX2MB wxStrncpy
+    #define wxWC2WX wxWC2MB
+    #define wxWX2WC wxMB2WC
+#endif
+
+/*
+    RN:  The following are not normal versions of memcpy et al., rather
+    these are either char or widechar versions depending on
+    if unicode is used or not.
+*/
+
+#ifdef __cplusplus
+
+    //
+    //  RN: We could do the usual tricky compiler detection here,
+    //  and use their variant (such as wmemchr, etc.).  The problem
+    //  is that these functions are quite rare, even though they are
+    //  part of the current POSIX standard.  In addition, most compilers
+    //  (including even MSC) inline them just like we do right in their
+    //  headers.
+    //
+    #include <string.h>
+    #if wxUSE_UNICODE
+        //implement our own wmem variants
+        inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l)
+        {
+            for(;l && *s != c;--l, ++s) {}
+
+            if(l)
+                return (wxChar*)s;
+            return NULL;
+        }
+
+        inline int wxTmemcmp(const wxChar* sz1, const wxChar* sz2, size_t len)
+        {
+            for(; *sz1 == *sz2 && len; --len, ++sz1, ++sz2) {}
+
+            if(len)
+                return *sz1 < *sz2 ? -1 : *sz1 > *sz2;
+            else
+                return 0;
+        }
+
+        inline wxChar* wxTmemcpy(wxChar* szOut, const wxChar* szIn, size_t len)
+        {
+            return (wxChar*) memcpy(szOut, szIn, len * sizeof(wxChar));
+        }
+
+        inline wxChar* wxTmemmove(wxChar* szOut, const wxChar* szIn, size_t len)
+        {
+            return (wxChar*) memmove(szOut, szIn, len * sizeof(wxChar));
+        }
+
+        inline wxChar* wxTmemset(wxChar* szOut, const wxChar cIn, size_t len)
+        {
+            wxChar* szRet = szOut;
+
+            while (len--)
+                *szOut++ = cIn;
+
+            return szRet;
+        }
+    #else /* !wxUSE_UNICODE */
+        #if wxABI_VERSION >= 20805
+            // for compatibility with earlier versions, these functions take
+            // "void *" but in the next wx version they will take "char *" so
+            // don't use them with void pointers (use the standard memxxx()
+            // with them)
+            inline char* wxTmemchr(const void* s, int c, size_t len)
+                { return (char*)memchr(s, c, len); }
+            inline int wxTmemcmp(const void* sz1, const void* sz2, size_t len)
+                { return memcmp(sz1, sz2, len); }
+            inline char* wxTmemcpy(void* szOut, const void* szIn, size_t len)
+                { return (char*)memcpy(szOut, szIn, len); }
+            inline char* wxTmemmove(void* szOut, const void* szIn, size_t len)
+                { return (char*)memmove(szOut, szIn, len); }
+            inline char* wxTmemset(void* szOut, int c, size_t len)
+                { return (char*)memset(szOut, c, len); }
+        #else
+        #   define wxTmemchr memchr
+        #   define wxTmemcmp memcmp
+        #   define wxTmemcpy memcpy
+        #   define wxTmemmove memmove
+        #   define wxTmemset memset
+        #endif
+    #endif /* wxUSE_UNICODE/!wxUSE_UNICODE */
+
+#endif /*__cplusplus*/
+
+
+#endif /* _WX_WXCHAR_H_ */
+
diff --git a/Source/3rd Party/wx/include/wx/wxcrt.h b/Source/3rd Party/wx/include/wx/wxcrt.h
deleted file mode 100644
index 38727d20a..000000000
--- a/Source/3rd Party/wx/include/wx/wxcrt.h	
+++ /dev/null
@@ -1,987 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/wxcrt.h
-// Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
-//              CRT functions
-// Author:      Joel Farley, Ove Kaaven
-// Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee, Vaclav Slavik
-// Created:     1998/06/12
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998-2006 wxWidgets dev team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WXCRT_H_
-#define _WX_WXCRT_H_
-
-#include "wx/wxcrtbase.h"
-#include "wx/string.h"
-
-#ifndef __WX_SETUP_H__
-// For non-configure builds assume vsscanf is available, if not Visual C or DMC
-#if !defined (__VISUALC__) && !defined (__DMC__)
-    #define HAVE_VSSCANF 1
-#endif
-#endif
-
-// ============================================================================
-//                              misc functions
-// ============================================================================
-
-/* checks whether the passed in pointer is NULL and if the string is empty */
-inline bool wxIsEmpty(const char *s) { return !s || !*s; }
-inline bool wxIsEmpty(const wchar_t *s) { return !s || !*s; }
-inline bool wxIsEmpty(const wxScopedCharBuffer& s) { return wxIsEmpty(s.data()); }
-inline bool wxIsEmpty(const wxScopedWCharBuffer& s) { return wxIsEmpty(s.data()); }
-inline bool wxIsEmpty(const wxString& s) { return s.empty(); }
-inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
-
-
-
-/* multibyte to wide char conversion functions and macros */
-
-/* multibyte<->widechar conversion */
-WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
-WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
-
-#if wxUSE_UNICODE
-    #define wxMB2WX wxMB2WC
-    #define wxWX2MB wxWC2MB
-    #define wxWC2WX wxStrncpy
-    #define wxWX2WC wxStrncpy
-#else
-    #define wxMB2WX wxStrncpy
-    #define wxWX2MB wxStrncpy
-    #define wxWC2WX wxWC2MB
-    #define wxWX2WC wxMB2WC
-#endif
-
-
-//  RN: We could do the usual tricky compiler detection here,
-//  and use their variant (such as wmemchr, etc.).  The problem
-//  is that these functions are quite rare, even though they are
-//  part of the current POSIX standard.  In addition, most compilers
-//  (including even MSC) inline them just like we do right in their
-//  headers.
-//
-#include <string.h>
-
-#if wxUSE_UNICODE
-    //implement our own wmem variants
-    inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l)
-    {
-        for(;l && *s != c;--l, ++s) {}
-
-        if(l)
-            return const_cast<wxChar*>(s);
-        return NULL;
-    }
-
-    inline int wxTmemcmp(const wxChar* sz1, const wxChar* sz2, size_t len)
-    {
-        for(; *sz1 == *sz2 && len; --len, ++sz1, ++sz2) {}
-
-        if(len)
-            return *sz1 < *sz2 ? -1 : *sz1 > *sz2;
-        else
-            return 0;
-    }
-
-    inline wxChar* wxTmemcpy(wxChar* szOut, const wxChar* szIn, size_t len)
-    {
-        return (wxChar*) memcpy(szOut, szIn, len * sizeof(wxChar));
-    }
-
-    inline wxChar* wxTmemmove(wxChar* szOut, const wxChar* szIn, size_t len)
-    {
-        return (wxChar*) memmove(szOut, szIn, len * sizeof(wxChar));
-    }
-
-    inline wxChar* wxTmemset(wxChar* szOut, const wxChar cIn, size_t len)
-    {
-        wxChar* szRet = szOut;
-
-        while (len--)
-            *szOut++ = cIn;
-
-        return szRet;
-    }
-#endif /* wxUSE_UNICODE */
-
-// provide trivial wrappers for char* versions for both ANSI and Unicode builds
-// (notice that these intentionally return "char *" and not "void *" unlike the
-// standard memxxx() for symmetry with the wide char versions):
-inline char* wxTmemchr(const char* s, char c, size_t len)
-    { return (char*)memchr(s, c, len); }
-inline int wxTmemcmp(const char* sz1, const char* sz2, size_t len)
-    { return memcmp(sz1, sz2, len); }
-inline char* wxTmemcpy(char* szOut, const char* szIn, size_t len)
-    { return (char*)memcpy(szOut, szIn, len); }
-inline char* wxTmemmove(char* szOut, const char* szIn, size_t len)
-    { return (char*)memmove(szOut, szIn, len); }
-inline char* wxTmemset(char* szOut, const char cIn, size_t len)
-    { return (char*)memset(szOut, cIn, len); }
-
-
-// ============================================================================
-//     wx wrappers for CRT functions in both char* and wchar_t* versions
-// ============================================================================
-
-// A few notes on implementation of these wrappers:
-//
-// We need both char* and wchar_t* versions of functions like wxStrlen() for
-// compatibility with both ANSI and Unicode builds.
-//
-// This makes passing wxString or c_str()/mb_str()/wc_str() result to them
-// ambiguous, so we need to provide overrides for that as well (in cases where
-// it makes sense).
-//
-// We can do this without problems for some functions (wxStrlen()), but in some
-// cases, we can't stay compatible with both ANSI and Unicode builds, e.g. for
-// wxStrcpy(const wxString&), which can only return either char* or wchar_t*.
-// In these cases, we preserve ANSI build compatibility by returning char*.
-
-// ----------------------------------------------------------------------------
-//                              locale functions
-// ----------------------------------------------------------------------------
-
-// NB: we can't provide const wchar_t* (= wxChar*) overload, because calling
-//     wxSetlocale(category, NULL) -- which is a common thing to do -- would be
-//     ambiguous
-WXDLLIMPEXP_BASE char* wxSetlocale(int category, const char *locale);
-inline char* wxSetlocale(int category, const wxScopedCharBuffer& locale)
-    { return wxSetlocale(category, locale.data()); }
-inline char* wxSetlocale(int category, const wxString& locale)
-    { return wxSetlocale(category, locale.mb_str()); }
-inline char* wxSetlocale(int category, const wxCStrData& locale)
-    { return wxSetlocale(category, locale.AsCharBuf()); }
-
-// ----------------------------------------------------------------------------
-//                              string functions
-// ----------------------------------------------------------------------------
-
-/* safe version of strlen() (returns 0 if passed NULL pointer) */
-// NB: these are defined in wxcrtbase.h, see the comment there
-// inline size_t wxStrlen(const char *s) { return s ? strlen(s) : 0; }
-// inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_Strlen_(s) : 0; }
-inline size_t wxStrlen(const wxScopedCharBuffer& s) { return wxStrlen(s.data()); }
-inline size_t wxStrlen(const wxScopedWCharBuffer& s) { return wxStrlen(s.data()); }
-inline size_t wxStrlen(const wxString& s) { return s.length(); }
-inline size_t wxStrlen(const wxCStrData& s) { return s.AsString().length(); }
-
-// this is a function new in 2.9 so we don't care about backwards compatibility and
-// so don't need to support wxScopedCharBuffer/wxScopedWCharBuffer overloads
-#if defined(wxCRT_StrnlenA)
-inline size_t wxStrnlen(const char *str, size_t maxlen) { return wxCRT_StrnlenA(str, maxlen); }
-#else
-inline size_t wxStrnlen(const char *str, size_t maxlen)
-{
-    size_t n;
-    for ( n = 0; n < maxlen; n++ )
-        if ( !str[n] )
-            break;
-
-    return n;
-}
-#endif
-
-#if defined(wxCRT_StrnlenW)
-inline size_t wxStrnlen(const wchar_t *str, size_t maxlen) { return wxCRT_StrnlenW(str, maxlen); }
-#else
-inline size_t wxStrnlen(const wchar_t *str, size_t maxlen)
-{
-    size_t n;
-    for ( n = 0; n < maxlen; n++ )
-        if ( !str[n] )
-            break;
-
-    return n;
-}
-#endif
-
-// NB: these are defined in wxcrtbase.h, see the comment there
-// inline char* wxStrdup(const char *s) { return wxStrdupA(s); }
-// inline wchar_t* wxStrdup(const wchar_t *s) { return wxStrdupW(s); }
-inline char* wxStrdup(const wxScopedCharBuffer& s) { return wxStrdup(s.data()); }
-inline wchar_t* wxStrdup(const wxScopedWCharBuffer& s) { return wxStrdup(s.data()); }
-inline char* wxStrdup(const wxString& s) { return wxStrdup(s.mb_str()); }
-inline char* wxStrdup(const wxCStrData& s) { return wxStrdup(s.AsCharBuf()); }
-
-inline char *wxStrcpy(char *dest, const char *src)
-    { return wxCRT_StrcpyA(dest, src); }
-inline wchar_t *wxStrcpy(wchar_t *dest, const wchar_t *src)
-    { return wxCRT_StrcpyW(dest, src); }
-inline char *wxStrcpy(char *dest, const wxString& src)
-    { return wxCRT_StrcpyA(dest, src.mb_str()); }
-inline char *wxStrcpy(char *dest, const wxCStrData& src)
-    { return wxCRT_StrcpyA(dest, src.AsCharBuf()); }
-inline char *wxStrcpy(char *dest, const wxScopedCharBuffer& src)
-    { return wxCRT_StrcpyA(dest, src.data()); }
-inline wchar_t *wxStrcpy(wchar_t *dest, const wxString& src)
-    { return wxCRT_StrcpyW(dest, src.wc_str()); }
-inline wchar_t *wxStrcpy(wchar_t *dest, const wxCStrData& src)
-    { return wxCRT_StrcpyW(dest, src.AsWCharBuf()); }
-inline wchar_t *wxStrcpy(wchar_t *dest, const wxScopedWCharBuffer& src)
-    { return wxCRT_StrcpyW(dest, src.data()); }
-inline char *wxStrcpy(char *dest, const wchar_t *src)
-    { return wxCRT_StrcpyA(dest, wxConvLibc.cWC2MB(src)); }
-inline wchar_t *wxStrcpy(wchar_t *dest, const char *src)
-    { return wxCRT_StrcpyW(dest, wxConvLibc.cMB2WC(src)); }
-
-inline char *wxStrncpy(char *dest, const char *src, size_t n)
-    { return wxCRT_StrncpyA(dest, src, n); }
-inline wchar_t *wxStrncpy(wchar_t *dest, const wchar_t *src, size_t n)
-    { return wxCRT_StrncpyW(dest, src, n); }
-inline char *wxStrncpy(char *dest, const wxString& src, size_t n)
-    { return wxCRT_StrncpyA(dest, src.mb_str(), n); }
-inline char *wxStrncpy(char *dest, const wxCStrData& src, size_t n)
-    { return wxCRT_StrncpyA(dest, src.AsCharBuf(), n); }
-inline char *wxStrncpy(char *dest, const wxScopedCharBuffer& src, size_t n)
-    { return wxCRT_StrncpyA(dest, src.data(), n); }
-inline wchar_t *wxStrncpy(wchar_t *dest, const wxString& src, size_t n)
-    { return wxCRT_StrncpyW(dest, src.wc_str(), n); }
-inline wchar_t *wxStrncpy(wchar_t *dest, const wxCStrData& src, size_t n)
-    { return wxCRT_StrncpyW(dest, src.AsWCharBuf(), n); }
-inline wchar_t *wxStrncpy(wchar_t *dest, const wxScopedWCharBuffer& src, size_t n)
-    { return wxCRT_StrncpyW(dest, src.data(), n); }
-inline char *wxStrncpy(char *dest, const wchar_t *src, size_t n)
-    { return wxCRT_StrncpyA(dest, wxConvLibc.cWC2MB(src), n); }
-inline wchar_t *wxStrncpy(wchar_t *dest, const char *src, size_t n)
-    { return wxCRT_StrncpyW(dest, wxConvLibc.cMB2WC(src), n); }
-
-// this is a function new in 2.9 so we don't care about backwards compatibility and
-// so don't need to support wchar_t/char overloads
-inline size_t wxStrlcpy(char *dest, const char *src, size_t n)
-{
-    const size_t len = wxCRT_StrlenA(src);
-
-    if ( n )
-    {
-        if ( n-- > len )
-            n = len;
-        wxCRT_StrncpyA(dest, src, n);
-        dest[n] = '\0';
-    }
-
-    return len;
-}
-inline size_t wxStrlcpy(wchar_t *dest, const wchar_t *src, size_t n)
-{
-    const size_t len = wxCRT_StrlenW(src);
-    if ( n )
-    {
-        if ( n-- > len )
-            n = len;
-        wxCRT_StrncpyW(dest, src, n);
-        dest[n] = L'\0';
-    }
-
-    return len;
-}
-
-inline char *wxStrcat(char *dest, const char *src)
-    { return wxCRT_StrcatA(dest, src); }
-inline wchar_t *wxStrcat(wchar_t *dest, const wchar_t *src)
-    { return wxCRT_StrcatW(dest, src); }
-inline char *wxStrcat(char *dest, const wxString& src)
-    { return wxCRT_StrcatA(dest, src.mb_str()); }
-inline char *wxStrcat(char *dest, const wxCStrData& src)
-    { return wxCRT_StrcatA(dest, src.AsCharBuf()); }
-inline char *wxStrcat(char *dest, const wxScopedCharBuffer& src)
-    { return wxCRT_StrcatA(dest, src.data()); }
-inline wchar_t *wxStrcat(wchar_t *dest, const wxString& src)
-    { return wxCRT_StrcatW(dest, src.wc_str()); }
-inline wchar_t *wxStrcat(wchar_t *dest, const wxCStrData& src)
-    { return wxCRT_StrcatW(dest, src.AsWCharBuf()); }
-inline wchar_t *wxStrcat(wchar_t *dest, const wxScopedWCharBuffer& src)
-    { return wxCRT_StrcatW(dest, src.data()); }
-inline char *wxStrcat(char *dest, const wchar_t *src)
-    { return wxCRT_StrcatA(dest, wxConvLibc.cWC2MB(src)); }
-inline wchar_t *wxStrcat(wchar_t *dest, const char *src)
-    { return wxCRT_StrcatW(dest, wxConvLibc.cMB2WC(src)); }
-
-inline char *wxStrncat(char *dest, const char *src, size_t n)
-    { return wxCRT_StrncatA(dest, src, n); }
-inline wchar_t *wxStrncat(wchar_t *dest, const wchar_t *src, size_t n)
-    { return wxCRT_StrncatW(dest, src, n); }
-inline char *wxStrncat(char *dest, const wxString& src, size_t n)
-    { return wxCRT_StrncatA(dest, src.mb_str(), n); }
-inline char *wxStrncat(char *dest, const wxCStrData& src, size_t n)
-    { return wxCRT_StrncatA(dest, src.AsCharBuf(), n); }
-inline char *wxStrncat(char *dest, const wxScopedCharBuffer& src, size_t n)
-    { return wxCRT_StrncatA(dest, src.data(), n); }
-inline wchar_t *wxStrncat(wchar_t *dest, const wxString& src, size_t n)
-    { return wxCRT_StrncatW(dest, src.wc_str(), n); }
-inline wchar_t *wxStrncat(wchar_t *dest, const wxCStrData& src, size_t n)
-    { return wxCRT_StrncatW(dest, src.AsWCharBuf(), n); }
-inline wchar_t *wxStrncat(wchar_t *dest, const wxScopedWCharBuffer& src, size_t n)
-    { return wxCRT_StrncatW(dest, src.data(), n); }
-inline char *wxStrncat(char *dest, const wchar_t *src, size_t n)
-    { return wxCRT_StrncatA(dest, wxConvLibc.cWC2MB(src), n); }
-inline wchar_t *wxStrncat(wchar_t *dest, const char *src, size_t n)
-    { return wxCRT_StrncatW(dest, wxConvLibc.cMB2WC(src), n); }
-
-
-#define WX_STR_DECL(name, T1, T2)  name(T1 s1, T2 s2)
-#define WX_STR_CALL(func, a1, a2)  func(a1, a2)
-
-// This macro defines string function for all possible variants of arguments,
-// except for those taking wxString or wxCStrData as second argument.
-// Parameters:
-//   rettype   - return type
-//   name      - name of the (overloaded) function to define
-//   crtA      - function to call for char* versions (takes two arguments)
-//   crtW      - ditto for wchar_t* function
-//   forString - function to call when the *first* argument is wxString;
-//               the second argument can be any string type, so this is
-//               typically a template
-#define WX_STR_FUNC_NO_INVERT(rettype, name, crtA, crtW, forString)           \
-    inline rettype WX_STR_DECL(name, const char *, const char *)              \
-        { return WX_STR_CALL(crtA, s1, s2); }                                 \
-    inline rettype WX_STR_DECL(name, const char *, const wchar_t *)           \
-        { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
-    inline rettype WX_STR_DECL(name, const char *, const wxScopedCharBuffer&)       \
-        { return WX_STR_CALL(crtA, s1, s2.data()); }                          \
-    inline rettype WX_STR_DECL(name, const char *, const wxScopedWCharBuffer&)      \
-        { return WX_STR_CALL(forString, wxString(s1), s2.data()); }           \
-                                                                              \
-    inline rettype WX_STR_DECL(name, const wchar_t *, const wchar_t *)        \
-        { return WX_STR_CALL(crtW, s1, s2); }                                 \
-    inline rettype WX_STR_DECL(name, const wchar_t *, const char *)           \
-        { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
-    inline rettype WX_STR_DECL(name, const wchar_t *, const wxScopedWCharBuffer&)   \
-        { return WX_STR_CALL(crtW, s1, s2.data()); }                          \
-    inline rettype WX_STR_DECL(name, const wchar_t *, const wxScopedCharBuffer&)    \
-        { return WX_STR_CALL(forString, wxString(s1), s2.data()); }           \
-                                                                              \
-    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const char *)       \
-        { return WX_STR_CALL(crtA, s1.data(), s2); }                          \
-    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wchar_t *)    \
-        { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
-    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxScopedCharBuffer&)\
-        { return WX_STR_CALL(crtA, s1.data(), s2.data()); }                   \
-    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxScopedWCharBuffer&)   \
-        { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
-                                                                              \
-    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wchar_t *)   \
-        { return WX_STR_CALL(crtW, s1.data(), s2); }                          \
-    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const char *)      \
-        { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
-    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxScopedWCharBuffer&)  \
-        { return WX_STR_CALL(crtW, s1.data(), s2.data()); }                   \
-    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxScopedCharBuffer&)   \
-        { return WX_STR_CALL(forString, wxString(s1), wxString(s2)); }        \
-                                                                              \
-    inline rettype WX_STR_DECL(name, const wxString&, const char*)            \
-        { return WX_STR_CALL(forString, s1, s2); }                            \
-    inline rettype WX_STR_DECL(name, const wxString&, const wchar_t*)         \
-        { return WX_STR_CALL(forString, s1, s2); }                            \
-    inline rettype WX_STR_DECL(name, const wxString&, const wxScopedCharBuffer&)    \
-        { return WX_STR_CALL(forString, s1, s2); }                            \
-    inline rettype WX_STR_DECL(name, const wxString&, const wxScopedWCharBuffer&)   \
-        { return WX_STR_CALL(forString, s1, s2); }                            \
-    inline rettype WX_STR_DECL(name, const wxString&, const wxString&)        \
-        { return WX_STR_CALL(forString, s1, s2); }                            \
-    inline rettype WX_STR_DECL(name, const wxString&, const wxCStrData&)      \
-        { return WX_STR_CALL(forString, s1, s2); }                            \
-                                                                              \
-    inline rettype WX_STR_DECL(name, const wxCStrData&, const char*)          \
-        { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
-    inline rettype WX_STR_DECL(name, const wxCStrData&, const wchar_t*)       \
-        { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
-    inline rettype WX_STR_DECL(name, const wxCStrData&, const wxScopedCharBuffer&)  \
-        { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
-    inline rettype WX_STR_DECL(name, const wxCStrData&, const wxScopedWCharBuffer&) \
-        { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
-    inline rettype WX_STR_DECL(name, const wxCStrData&, const wxString&)      \
-        { return WX_STR_CALL(forString, s1.AsString(), s2); }                 \
-    inline rettype WX_STR_DECL(name, const wxCStrData&, const wxCStrData&)    \
-        { return WX_STR_CALL(forString, s1.AsString(), s2); }
-
-// This defines strcmp-like function, i.e. one returning the result of
-// comparison; see WX_STR_FUNC_NO_INVERT for explanation of the arguments
-#define WX_STRCMP_FUNC(name, crtA, crtW, forString)                           \
-    WX_STR_FUNC_NO_INVERT(int, name, crtA, crtW, forString)                   \
-                                                                              \
-    inline int WX_STR_DECL(name, const char *, const wxCStrData&)             \
-        { return -WX_STR_CALL(forString, s2.AsString(), s1); }                \
-    inline int WX_STR_DECL(name, const char *, const wxString&)               \
-        { return -WX_STR_CALL(forString, s2, s1); }                           \
-                                                                              \
-    inline int WX_STR_DECL(name, const wchar_t *, const wxCStrData&)          \
-        { return -WX_STR_CALL(forString, s2.AsString(), s1); }                \
-    inline int WX_STR_DECL(name, const wchar_t *, const wxString&)            \
-        { return -WX_STR_CALL(forString, s2, s1); }                           \
-                                                                              \
-    inline int WX_STR_DECL(name, const wxScopedCharBuffer&, const wxCStrData&)      \
-        { return -WX_STR_CALL(forString, s2.AsString(), s1.data()); }         \
-    inline int WX_STR_DECL(name, const wxScopedCharBuffer&, const wxString&)        \
-        { return -WX_STR_CALL(forString, s2, s1.data()); }                    \
-                                                                              \
-    inline int WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxCStrData&)     \
-        { return -WX_STR_CALL(forString, s2.AsString(), s1.data()); }         \
-    inline int WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxString&)       \
-        { return -WX_STR_CALL(forString, s2, s1.data()); }
-
-
-// This defines a string function that is *not* strcmp-like, i.e. doesn't
-// return the result of comparison and so if the second argument is a string,
-// it has to be converted to char* or wchar_t*
-#define WX_STR_FUNC(rettype, name, crtA, crtW, forString)                     \
-    WX_STR_FUNC_NO_INVERT(rettype, name, crtA, crtW, forString)               \
-                                                                              \
-    inline rettype WX_STR_DECL(name, const char *, const wxCStrData&)         \
-        { return WX_STR_CALL(crtA, s1, s2.AsCharBuf()); }                     \
-    inline rettype WX_STR_DECL(name, const char *, const wxString&)           \
-        { return WX_STR_CALL(crtA, s1, s2.mb_str()); }                        \
-                                                                              \
-    inline rettype WX_STR_DECL(name, const wchar_t *, const wxCStrData&)      \
-        { return WX_STR_CALL(crtW, s1, s2.AsWCharBuf()); }                    \
-    inline rettype WX_STR_DECL(name, const wchar_t *, const wxString&)        \
-        { return WX_STR_CALL(crtW, s1, s2.wc_str()); }                        \
-                                                                              \
-    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxCStrData&)  \
-        { return WX_STR_CALL(crtA, s1.data(), s2.AsCharBuf()); }              \
-    inline rettype WX_STR_DECL(name, const wxScopedCharBuffer&, const wxString&)    \
-        { return WX_STR_CALL(crtA, s1.data(), s2.mb_str()); }                 \
-                                                                              \
-    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxCStrData&) \
-        { return WX_STR_CALL(crtW, s1.data(), s2.AsWCharBuf()); }             \
-    inline rettype WX_STR_DECL(name, const wxScopedWCharBuffer&, const wxString&)   \
-        { return WX_STR_CALL(crtW, s1.data(), s2.wc_str()); }
-
-template<typename T>
-inline int wxStrcmp_String(const wxString& s1, const T& s2)
-    { return s1.compare(s2); }
-WX_STRCMP_FUNC(wxStrcmp, wxCRT_StrcmpA, wxCRT_StrcmpW, wxStrcmp_String)
-
-template<typename T>
-inline int wxStricmp_String(const wxString& s1, const T& s2)
-    { return s1.CmpNoCase(s2); }
-WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String)
-
-#if defined(wxCRT_StrcollA) && defined(wxCRT_StrcollW)
-
-// GCC 3.4 and other compilers have a bug that causes it to fail compilation if
-// the template's implementation uses overloaded function declared later (see
-// the wxStrcoll() call in wxStrcoll_String<T>()), so we have to
-// forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH,
-// this fails to compile with VC6, so don't do it for VC. It also causes
-// problems with GCC visibility in newer GCC versions.
-#if !(defined(__VISUALC__) || (wxCHECK_GCC_VERSION(3,5) && !wxCHECK_GCC_VERSION(4,7))) || defined(__clang__)
-    #define wxNEEDS_DECL_BEFORE_TEMPLATE
-#endif
-
-#ifdef wxNEEDS_DECL_BEFORE_TEMPLATE
-template<typename T>
-inline int wxStrcoll_String(const wxString& s1, const T& s2);
-WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
-#endif // wxNEEDS_DECL_BEFORE_TEMPLATE
-
-template<typename T>
-inline int wxStrcoll_String(const wxString& s1, const T& s2)
-{
-#if wxUSE_UNICODE
-    // NB: strcoll() doesn't work correctly on UTF-8 strings, so we have to use
-    //     wc_str() even if wxUSE_UNICODE_UTF8; the (const wchar_t*) cast is
-    //     there just as optimization to avoid going through
-    //     wxStrcoll<wxScopedWCharBuffer>:
-    return wxStrcoll((const wchar_t*)s1.wc_str(), s2);
-#else
-    return wxStrcoll((const char*)s1.mb_str(), s2);
-#endif
-}
-
-#ifndef wxNEEDS_DECL_BEFORE_TEMPLATE
-// this is exactly the same WX_STRCMP_FUNC line as above, insde the
-// wxNEEDS_DECL_BEFORE_TEMPLATE case
-WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
-#endif
-
-#endif // defined(wxCRT_Strcoll[AW])
-
-template<typename T>
-inline size_t wxStrspn_String(const wxString& s1, const T& s2)
-{
-    size_t pos = s1.find_first_not_of(s2);
-    return pos == wxString::npos ? s1.length() : pos;
-}
-WX_STR_FUNC(size_t, wxStrspn, wxCRT_StrspnA, wxCRT_StrspnW, wxStrspn_String)
-
-template<typename T>
-inline size_t wxStrcspn_String(const wxString& s1, const T& s2)
-{
-    size_t pos = s1.find_first_of(s2);
-    return pos == wxString::npos ? s1.length() : pos;
-}
-WX_STR_FUNC(size_t, wxStrcspn, wxCRT_StrcspnA, wxCRT_StrcspnW, wxStrcspn_String)
-
-#undef WX_STR_DECL
-#undef WX_STR_CALL
-#define WX_STR_DECL(name, T1, T2)  name(T1 s1, T2 s2, size_t n)
-#define WX_STR_CALL(func, a1, a2)  func(a1, a2, n)
-
-template<typename T>
-inline int wxStrncmp_String(const wxString& s1, const T& s2, size_t n)
-    { return s1.compare(0, n, s2, 0, n); }
-WX_STRCMP_FUNC(wxStrncmp, wxCRT_StrncmpA, wxCRT_StrncmpW, wxStrncmp_String)
-
-template<typename T>
-inline int wxStrnicmp_String(const wxString& s1, const T& s2, size_t n)
-    { return s1.substr(0, n).CmpNoCase(wxString(s2).substr(0, n)); }
-WX_STRCMP_FUNC(wxStrnicmp, wxCRT_StrnicmpA, wxCRT_StrnicmpW, wxStrnicmp_String)
-
-#undef WX_STR_DECL
-#undef WX_STR_CALL
-#undef WX_STRCMP_FUNC
-#undef WX_STR_FUNC
-#undef WX_STR_FUNC_NO_INVERT
-
-#if defined(wxCRT_StrxfrmA) && defined(wxCRT_StrxfrmW)
-
-inline size_t wxStrxfrm(char *dest, const char *src, size_t n)
-    { return wxCRT_StrxfrmA(dest, src, n); }
-inline size_t wxStrxfrm(wchar_t *dest, const wchar_t *src, size_t n)
-    { return wxCRT_StrxfrmW(dest, src, n); }
-template<typename T>
-inline size_t wxStrxfrm(T *dest, const wxScopedCharTypeBuffer<T>& src, size_t n)
-    { return wxStrxfrm(dest, src.data(), n); }
-inline size_t wxStrxfrm(char *dest, const wxString& src, size_t n)
-    { return wxCRT_StrxfrmA(dest, src.mb_str(), n); }
-inline size_t wxStrxfrm(wchar_t *dest, const wxString& src, size_t n)
-    { return wxCRT_StrxfrmW(dest, src.wc_str(), n); }
-inline size_t wxStrxfrm(char *dest, const wxCStrData& src, size_t n)
-    { return wxCRT_StrxfrmA(dest, src.AsCharBuf(), n); }
-inline size_t wxStrxfrm(wchar_t *dest, const wxCStrData& src, size_t n)
-    { return wxCRT_StrxfrmW(dest, src.AsWCharBuf(), n); }
-
-#endif // defined(wxCRT_Strxfrm[AW])
-
-inline char *wxStrtok(char *str, const char *delim, char **saveptr)
-    { return wxCRT_StrtokA(str, delim, saveptr); }
-inline wchar_t *wxStrtok(wchar_t *str, const wchar_t *delim, wchar_t **saveptr)
-    { return wxCRT_StrtokW(str, delim, saveptr); }
-template<typename T>
-inline T *wxStrtok(T *str, const wxScopedCharTypeBuffer<T>& delim, T **saveptr)
-    { return wxStrtok(str, delim.data(), saveptr); }
-inline char *wxStrtok(char *str, const wxCStrData& delim, char **saveptr)
-    { return wxCRT_StrtokA(str, delim.AsCharBuf(), saveptr); }
-inline wchar_t *wxStrtok(wchar_t *str, const wxCStrData& delim, wchar_t **saveptr)
-    { return wxCRT_StrtokW(str, delim.AsWCharBuf(), saveptr); }
-inline char *wxStrtok(char *str, const wxString& delim, char **saveptr)
-    { return wxCRT_StrtokA(str, delim.mb_str(), saveptr); }
-inline wchar_t *wxStrtok(wchar_t *str, const wxString& delim, wchar_t **saveptr)
-    { return wxCRT_StrtokW(str, delim.wc_str(), saveptr); }
-
-inline const char *wxStrstr(const char *haystack, const char *needle)
-    { return wxCRT_StrstrA(haystack, needle); }
-inline const wchar_t *wxStrstr(const wchar_t *haystack, const wchar_t *needle)
-    { return wxCRT_StrstrW(haystack, needle); }
-inline const char *wxStrstr(const char *haystack, const wxString& needle)
-    { return wxCRT_StrstrA(haystack, needle.mb_str()); }
-inline const wchar_t *wxStrstr(const wchar_t *haystack, const wxString& needle)
-    { return wxCRT_StrstrW(haystack, needle.wc_str()); }
-// these functions return char* pointer into the non-temporary conversion buffer
-// used by c_str()'s implicit conversion to char*, for ANSI build compatibility
-inline const char *wxStrstr(const wxString& haystack, const wxString& needle)
-    { return wxCRT_StrstrA(haystack.c_str(), needle.mb_str()); }
-inline const char *wxStrstr(const wxCStrData& haystack, const wxString& needle)
-    { return wxCRT_StrstrA(haystack, needle.mb_str()); }
-inline const char *wxStrstr(const wxCStrData& haystack, const wxCStrData& needle)
-    { return wxCRT_StrstrA(haystack, needle.AsCharBuf()); }
-// if 'needle' is char/wchar_t, then the same is probably wanted as return value
-inline const char *wxStrstr(const wxString& haystack, const char *needle)
-    { return wxCRT_StrstrA(haystack.c_str(), needle); }
-inline const char *wxStrstr(const wxCStrData& haystack, const char *needle)
-    { return wxCRT_StrstrA(haystack, needle); }
-inline const wchar_t *wxStrstr(const wxString& haystack, const wchar_t *needle)
-    { return wxCRT_StrstrW(haystack.c_str(), needle); }
-inline const wchar_t *wxStrstr(const wxCStrData& haystack, const wchar_t *needle)
-    { return wxCRT_StrstrW(haystack, needle); }
-
-inline const char *wxStrchr(const char *s, char c)
-    { return wxCRT_StrchrA(s, c); }
-inline const wchar_t *wxStrchr(const wchar_t *s, wchar_t c)
-    { return wxCRT_StrchrW(s, c); }
-inline const char *wxStrrchr(const char *s, char c)
-    { return wxCRT_StrrchrA(s, c); }
-inline const wchar_t *wxStrrchr(const wchar_t *s, wchar_t c)
-    { return wxCRT_StrrchrW(s, c); }
-inline const char *wxStrchr(const char *s, const wxUniChar& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }
-inline const wchar_t *wxStrchr(const wchar_t *s, const wxUniChar& c)
-    { return wxCRT_StrchrW(s, (wchar_t)c); }
-inline const char *wxStrrchr(const char *s, const wxUniChar& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }
-inline const wchar_t *wxStrrchr(const wchar_t *s, const wxUniChar& c)
-    { return wxCRT_StrrchrW(s, (wchar_t)c); }
-inline const char *wxStrchr(const char *s, const wxUniCharRef& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }
-inline const wchar_t *wxStrchr(const wchar_t *s, const wxUniCharRef& c)
-    { return wxCRT_StrchrW(s, (wchar_t)c); }
-inline const char *wxStrrchr(const char *s, const wxUniCharRef& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }
-inline const wchar_t *wxStrrchr(const wchar_t *s, const wxUniCharRef& c)
-    { return wxCRT_StrrchrW(s, (wchar_t)c); }
-template<typename T>
-inline const T* wxStrchr(const wxScopedCharTypeBuffer<T>& s, T c)
-    { return wxStrchr(s.data(), c); }
-template<typename T>
-inline const T* wxStrrchr(const wxScopedCharTypeBuffer<T>& s, T c)
-    { return wxStrrchr(s.data(), c); }
-template<typename T>
-inline const T* wxStrchr(const wxScopedCharTypeBuffer<T>& s, const wxUniChar& c)
-    { return wxStrchr(s.data(), (T)c); }
-template<typename T>
-inline const T* wxStrrchr(const wxScopedCharTypeBuffer<T>& s, const wxUniChar& c)
-    { return wxStrrchr(s.data(), (T)c); }
-template<typename T>
-inline const T* wxStrchr(const wxScopedCharTypeBuffer<T>& s, const wxUniCharRef& c)
-    { return wxStrchr(s.data(), (T)c); }
-template<typename T>
-inline const T* wxStrrchr(const wxScopedCharTypeBuffer<T>& s, const wxUniCharRef& c)
-    { return wxStrrchr(s.data(), (T)c); }
-// these functions return char* pointer into the non-temporary conversion buffer
-// used by c_str()'s implicit conversion to char*, for ANSI build compatibility
-inline const char* wxStrchr(const wxString& s, char c)
-    { return wxCRT_StrchrA((const char*)s.c_str(), c); }
-inline const char* wxStrrchr(const wxString& s, char c)
-    { return wxCRT_StrrchrA((const char*)s.c_str(), c); }
-inline const char* wxStrchr(const wxString& s, int c)
-    { return wxCRT_StrchrA((const char*)s.c_str(), c); }
-inline const char* wxStrrchr(const wxString& s, int c)
-    { return wxCRT_StrrchrA((const char*)s.c_str(), c); }
-inline const char* wxStrchr(const wxString& s, const wxUniChar& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s.c_str(), c) : NULL; }
-inline const char* wxStrrchr(const wxString& s, const wxUniChar& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s.c_str(), c) : NULL; }
-inline const char* wxStrchr(const wxString& s, const wxUniCharRef& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s.c_str(), c) : NULL; }
-inline const char* wxStrrchr(const wxString& s, const wxUniCharRef& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s.c_str(), c) : NULL; }
-inline const wchar_t* wxStrchr(const wxString& s, wchar_t c)
-    { return wxCRT_StrchrW((const wchar_t*)s.c_str(), c); }
-inline const wchar_t* wxStrrchr(const wxString& s, wchar_t c)
-    { return wxCRT_StrrchrW((const wchar_t*)s.c_str(), c); }
-inline const char* wxStrchr(const wxCStrData& s, char c)
-    { return wxCRT_StrchrA(s.AsChar(), c); }
-inline const char* wxStrrchr(const wxCStrData& s, char c)
-    { return wxCRT_StrrchrA(s.AsChar(), c); }
-inline const char* wxStrchr(const wxCStrData& s, int c)
-    { return wxCRT_StrchrA(s.AsChar(), c); }
-inline const char* wxStrrchr(const wxCStrData& s, int c)
-    { return wxCRT_StrrchrA(s.AsChar(), c); }
-inline const char* wxStrchr(const wxCStrData& s, const wxUniChar& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }
-inline const char* wxStrrchr(const wxCStrData& s, const wxUniChar& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }
-inline const char* wxStrchr(const wxCStrData& s, const wxUniCharRef& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }
-inline const char* wxStrrchr(const wxCStrData& s, const wxUniCharRef& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }
-inline const wchar_t* wxStrchr(const wxCStrData& s, wchar_t c)
-    { return wxCRT_StrchrW(s.AsWChar(), c); }
-inline const wchar_t* wxStrrchr(const wxCStrData& s, wchar_t c)
-    { return wxCRT_StrrchrW(s.AsWChar(), c); }
-
-inline const char *wxStrpbrk(const char *s, const char *accept)
-    { return wxCRT_StrpbrkA(s, accept); }
-inline const wchar_t *wxStrpbrk(const wchar_t *s, const wchar_t *accept)
-    { return wxCRT_StrpbrkW(s, accept); }
-inline const char *wxStrpbrk(const char *s, const wxString& accept)
-    { return wxCRT_StrpbrkA(s, accept.mb_str()); }
-inline const char *wxStrpbrk(const char *s, const wxCStrData& accept)
-    { return wxCRT_StrpbrkA(s, accept.AsCharBuf()); }
-inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxString& accept)
-    { return wxCRT_StrpbrkW(s, accept.wc_str()); }
-inline const wchar_t *wxStrpbrk(const wchar_t *s, const wxCStrData& accept)
-    { return wxCRT_StrpbrkW(s, accept.AsWCharBuf()); }
-inline const char *wxStrpbrk(const wxString& s, const wxString& accept)
-    { return wxCRT_StrpbrkA(s.c_str(), accept.mb_str()); }
-inline const char *wxStrpbrk(const wxString& s, const char *accept)
-    { return wxCRT_StrpbrkA(s.c_str(), accept); }
-inline const wchar_t *wxStrpbrk(const wxString& s, const wchar_t *accept)
-    { return wxCRT_StrpbrkW(s.wc_str(), accept); }
-inline const char *wxStrpbrk(const wxString& s, const wxCStrData& accept)
-    { return wxCRT_StrpbrkA(s.c_str(), accept.AsCharBuf()); }
-inline const char *wxStrpbrk(const wxCStrData& s, const wxString& accept)
-    { return wxCRT_StrpbrkA(s.AsChar(), accept.mb_str()); }
-inline const char *wxStrpbrk(const wxCStrData& s, const char *accept)
-    { return wxCRT_StrpbrkA(s.AsChar(), accept); }
-inline const wchar_t *wxStrpbrk(const wxCStrData& s, const wchar_t *accept)
-    { return wxCRT_StrpbrkW(s.AsWChar(), accept); }
-inline const char *wxStrpbrk(const wxCStrData& s, const wxCStrData& accept)
-    { return wxCRT_StrpbrkA(s.AsChar(), accept.AsCharBuf()); }
-template <typename S, typename T>
-inline const T *wxStrpbrk(const S& s, const wxScopedCharTypeBuffer<T>& accept)
-    { return wxStrpbrk(s, accept.data()); }
-
-
-/* inlined non-const versions */
-template <typename T>
-inline char *wxStrstr(char *haystack, T needle)
-    { return const_cast<char*>(wxStrstr(const_cast<const char*>(haystack), needle)); }
-template <typename T>
-inline wchar_t *wxStrstr(wchar_t *haystack, T needle)
-    { return const_cast<wchar_t*>(wxStrstr(const_cast<const wchar_t*>(haystack), needle)); }
-
-template <typename T>
-inline char * wxStrchr(char *s, T c)
-    { return const_cast<char*>(wxStrchr(const_cast<const char*>(s), c)); }
-template <typename T>
-inline wchar_t * wxStrchr(wchar_t *s, T c)
-    { return (wchar_t *)wxStrchr((const wchar_t *)s, c); }
-template <typename T>
-inline char * wxStrrchr(char *s, T c)
-    { return const_cast<char*>(wxStrrchr(const_cast<const char*>(s), c)); }
-template <typename T>
-inline wchar_t * wxStrrchr(wchar_t *s, T c)
-    { return const_cast<wchar_t*>(wxStrrchr(const_cast<const wchar_t*>(s), c)); }
-
-template <typename T>
-inline char * wxStrpbrk(char *s, T accept)
-    { return const_cast<char*>(wxStrpbrk(const_cast<const char*>(s), accept)); }
-template <typename T>
-inline wchar_t * wxStrpbrk(wchar_t *s, T accept)
-    { return const_cast<wchar_t*>(wxStrpbrk(const_cast<const wchar_t*>(s), accept)); }
-
-
-// ----------------------------------------------------------------------------
-//                              stdio.h functions
-// ----------------------------------------------------------------------------
-
-// NB: using fn_str() for mode is a hack to get the same type (char*/wchar_t*)
-//     as needed, the conversion itself doesn't matter, it's ASCII
-inline FILE *wxFopen(const wxString& path, const wxString& mode)
-    { return wxCRT_Fopen(path.fn_str(), mode.fn_str()); }
-inline FILE *wxFreopen(const wxString& path, const wxString& mode, FILE *stream)
-    { return wxCRT_Freopen(path.fn_str(), mode.fn_str(), stream); }
-inline int wxRemove(const wxString& path)
-    { return wxCRT_Remove(path.fn_str()); }
-inline int wxRename(const wxString& oldpath, const wxString& newpath)
-    { return wxCRT_Rename(oldpath.fn_str(), newpath.fn_str()); }
-
-extern WXDLLIMPEXP_BASE int wxPuts(const wxString& s);
-extern WXDLLIMPEXP_BASE int wxFputs(const wxString& s, FILE *stream);
-extern WXDLLIMPEXP_BASE void wxPerror(const wxString& s);
-
-extern WXDLLIMPEXP_BASE int wxFputc(const wxUniChar& c, FILE *stream);
-
-#define wxPutc(c, stream)  wxFputc(c, stream)
-#define wxPutchar(c)       wxFputc(c, stdout)
-#define wxFputchar(c)      wxPutchar(c)
-
-// NB: We only provide ANSI version of fgets() because fgetws() interprets the
-//     stream according to current locale, which is rarely what is desired.
-inline char *wxFgets(char *s, int size, FILE *stream)
-    { return wxCRT_FgetsA(s, size, stream); }
-// This version calls ANSI version and converts the string using wxConvLibc
-extern WXDLLIMPEXP_BASE wchar_t *wxFgets(wchar_t *s, int size, FILE *stream);
-
-#define wxGets(s) wxGets_is_insecure_and_dangerous_use_wxFgets_instead
-
-// NB: We only provide ANSI versions of this for the same reasons as in the
-//     case of wxFgets() above
-inline int wxFgetc(FILE *stream) { return wxCRT_FgetcA(stream); }
-inline int wxUngetc(int c, FILE *stream) { return wxCRT_UngetcA(c, stream); }
-
-#define wxGetc(stream)     wxFgetc(stream)
-#define wxGetchar()        wxFgetc(stdin)
-#define wxFgetchar()       wxGetchar()
-
-// ----------------------------------------------------------------------------
-//                             stdlib.h functions
-// ----------------------------------------------------------------------------
-
-#ifdef wxCRT_AtoiW
-inline int wxAtoi(const wxString& str) { return wxCRT_AtoiW(str.wc_str()); }
-#else
-inline int wxAtoi(const wxString& str) { return wxCRT_AtoiA(str.mb_str()); }
-#endif
-
-#ifdef wxCRT_AtolW
-inline long wxAtol(const wxString& str) { return wxCRT_AtolW(str.wc_str()); }
-#else
-inline long wxAtol(const wxString& str) { return wxCRT_AtolA(str.mb_str()); }
-#endif
-
-#ifdef wxCRT_AtofW
-inline double wxAtof(const wxString& str) { return wxCRT_AtofW(str.wc_str()); }
-#else
-inline double wxAtof(const wxString& str) { return wxCRT_AtofA(str.mb_str()); }
-#endif
-
-inline double wxStrtod(const char *nptr, char **endptr)
-    { return wxCRT_StrtodA(nptr, endptr); }
-inline double wxStrtod(const wchar_t *nptr, wchar_t **endptr)
-    { return wxCRT_StrtodW(nptr, endptr); }
-template<typename T>
-inline double wxStrtod(const wxScopedCharTypeBuffer<T>& nptr, T **endptr)
-    { return wxStrtod(nptr.data(), endptr); }
-
-// We implement wxStrto*() like this so that the code compiles when NULL is
-// passed in - - if we had just char** and wchar_t** overloads for 'endptr', it
-// would be ambiguous. The solution is to use a template so that endptr can be
-// any type: when NULL constant is used, the type will be int and we can handle
-// that case specially. Otherwise, we infer the type that 'nptr' should be
-// converted to from the type of 'endptr'. We need wxStrtoxCharType<T> template
-// to make the code compile even for T=int (that's the case when it's not going
-// to be ever used, but it still has to compile).
-template<typename T> struct wxStrtoxCharType {};
-template<> struct wxStrtoxCharType<char**>
-{
-    typedef const char* Type;
-    static char** AsPointer(char **p) { return p; }
-};
-template<> struct wxStrtoxCharType<wchar_t**>
-{
-    typedef const wchar_t* Type;
-    static wchar_t** AsPointer(wchar_t **p) { return p; }
-};
-template<> struct wxStrtoxCharType<int>
-{
-    typedef const char* Type; /* this one is never used */
-    static char** AsPointer(int WXUNUSED_UNLESS_DEBUG(p))
-    {
-        wxASSERT_MSG( p == 0, "passing non-NULL int is invalid" );
-        return NULL;
-    }
-};
-
-template<typename T>
-inline double wxStrtod(const wxString& nptr, T endptr)
-{
-    if ( endptr == 0 )
-    {
-        // when we don't care about endptr, use the string representation that
-        // doesn't require any conversion (it doesn't matter for this function
-        // even if its UTF-8):
-        return wxStrtod(nptr.wx_str(), (wxStringCharType**)NULL);
-    }
-    else
-    {
-        // note that it is important to use c_str() here and not mb_str() or
-        // wc_str(), because we store the pointer into (possibly converted)
-        // buffer in endptr and so it must be valid even when wxStrtod() returns
-        typedef typename wxStrtoxCharType<T>::Type CharType;
-        return wxStrtod((CharType)nptr.c_str(),
-                        wxStrtoxCharType<T>::AsPointer(endptr));
-    }
-}
-template<typename T>
-inline double wxStrtod(const wxCStrData& nptr, T endptr)
-    { return wxStrtod(nptr.AsString(), endptr); }
-
-
-#define WX_STRTOX_FUNC(rettype, name, implA, implW)                           \
-    /* see wxStrtod() above for explanation of this code: */                  \
-    inline rettype name(const char *nptr, char **endptr, int base)            \
-        { return implA(nptr, endptr, base); }                                 \
-    inline rettype name(const wchar_t *nptr, wchar_t **endptr, int base)      \
-        { return implW(nptr, endptr, base); }                                 \
-    template<typename T>                                                      \
-    inline rettype name(const wxScopedCharTypeBuffer<T>& nptr, T **endptr, int)\
-        { return name(nptr.data(), endptr); }                                 \
-    template<typename T>                                                      \
-    inline rettype name(const wxString& nptr, T endptr, int base)             \
-    {                                                                         \
-        if ( endptr == 0 )                                                    \
-            return name(nptr.wx_str(), (wxStringCharType**)NULL, base);       \
-        else                                                                  \
-        {                                                                     \
-            typedef typename wxStrtoxCharType<T>::Type CharType;              \
-            return name((CharType)nptr.c_str(),                               \
-                        wxStrtoxCharType<T>::AsPointer(endptr),               \
-                        base);                                                \
-        }                                                                     \
-    }                                                                         \
-    template<typename T>                                                      \
-    inline rettype name(const wxCStrData& nptr, T endptr, int base)           \
-        { return name(nptr.AsString(), endptr, base); }
-
-WX_STRTOX_FUNC(long, wxStrtol, wxCRT_StrtolA, wxCRT_StrtolW)
-WX_STRTOX_FUNC(unsigned long, wxStrtoul, wxCRT_StrtoulA, wxCRT_StrtoulW)
-#ifdef wxLongLong_t
-WX_STRTOX_FUNC(wxLongLong_t, wxStrtoll, wxCRT_StrtollA, wxCRT_StrtollW)
-WX_STRTOX_FUNC(wxULongLong_t, wxStrtoull, wxCRT_StrtoullA, wxCRT_StrtoullW)
-#endif // wxLongLong_t
-
-#undef WX_STRTOX_FUNC
-
-
-// there is no command interpreter under CE, hence no system()
-#ifndef __WXWINCE__
-
-// mingw32 doesn't provide _tsystem() even though it provides other stdlib.h
-// functions in their wide versions
-#ifdef wxCRT_SystemW
-inline int wxSystem(const wxString& str) { return wxCRT_SystemW(str.wc_str()); }
-#else
-inline int wxSystem(const wxString& str) { return wxCRT_SystemA(str.mb_str()); }
-#endif
-
-#endif // !__WXWINCE__/__WXWINCE__
-
-inline char* wxGetenv(const char *name) { return wxCRT_GetenvA(name); }
-inline wchar_t* wxGetenv(const wchar_t *name) { return wxCRT_GetenvW(name); }
-inline char* wxGetenv(const wxString& name) { return wxCRT_GetenvA(name.mb_str()); }
-inline char* wxGetenv(const wxCStrData& name) { return wxCRT_GetenvA(name.AsCharBuf()); }
-inline char* wxGetenv(const wxScopedCharBuffer& name) { return wxCRT_GetenvA(name.data()); }
-inline wchar_t* wxGetenv(const wxScopedWCharBuffer& name) { return wxCRT_GetenvW(name.data()); }
-
-// ----------------------------------------------------------------------------
-//                            time.h functions
-// ----------------------------------------------------------------------------
-
-inline size_t wxStrftime(char *s, size_t max,
-                         const wxString& format, const struct tm *tm)
-    { return wxCRT_StrftimeA(s, max, format.mb_str(), tm); }
-
-inline size_t wxStrftime(wchar_t *s, size_t max,
-                         const wxString& format, const struct tm *tm)
-    { return wxCRT_StrftimeW(s, max, format.wc_str(), tm); }
-
-// NB: we can't provide both char* and wchar_t* versions for obvious reasons
-//     and returning wxString wouldn't work either (it would be immediately
-//     destroyed and if assigned to char*/wchar_t*, the pointer would be
-//     invalid), so we only keep ASCII version, because the returned value
-//     is always ASCII anyway
-#define  wxAsctime   asctime
-#define  wxCtime     ctime
-
-
-// ----------------------------------------------------------------------------
-//                             ctype.h functions
-// ----------------------------------------------------------------------------
-
-// FIXME-UTF8: we'd be better off implementing these ourselves, as the CRT
-//             version is locale-dependent
-// FIXME-UTF8: these don't work when EOF is passed in because of wxUniChar,
-//             is this OK or not?
-
-inline bool wxIsalnum(const wxUniChar& c)  { return wxCRT_IsalnumW(c) != 0; }
-inline bool wxIsalpha(const wxUniChar& c)  { return wxCRT_IsalphaW(c) != 0; }
-inline bool wxIscntrl(const wxUniChar& c)  { return wxCRT_IscntrlW(c) != 0; }
-inline bool wxIsdigit(const wxUniChar& c)  { return wxCRT_IsdigitW(c) != 0; }
-inline bool wxIsgraph(const wxUniChar& c)  { return wxCRT_IsgraphW(c) != 0; }
-inline bool wxIslower(const wxUniChar& c)  { return wxCRT_IslowerW(c) != 0; }
-inline bool wxIsprint(const wxUniChar& c)  { return wxCRT_IsprintW(c) != 0; }
-inline bool wxIspunct(const wxUniChar& c)  { return wxCRT_IspunctW(c) != 0; }
-inline bool wxIsspace(const wxUniChar& c)  { return wxCRT_IsspaceW(c) != 0; }
-inline bool wxIsupper(const wxUniChar& c)  { return wxCRT_IsupperW(c) != 0; }
-inline bool wxIsxdigit(const wxUniChar& c) { return wxCRT_IsxdigitW(c) != 0; }
-
-inline wxUniChar wxTolower(const wxUniChar& c) { return wxCRT_TolowerW(c); }
-inline wxUniChar wxToupper(const wxUniChar& c) { return wxCRT_ToupperW(c); }
-
-#if WXWIN_COMPATIBILITY_2_8
-// we had goofed and defined wxIsctrl() instead of (correct) wxIscntrl() in the
-// initial versions of this header -- now it is too late to remove it so
-// although we fixed the function/macro name above, still provide the
-// backwards-compatible synonym.
-wxDEPRECATED( inline int wxIsctrl(const wxUniChar& c) );
-inline int wxIsctrl(const wxUniChar& c) { return wxIscntrl(c); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
-inline bool wxIsascii(const wxUniChar& c) { return c.IsAscii(); }
-
-#endif /* _WX_WXCRT_H_ */
diff --git a/Source/3rd Party/wx/include/wx/wxcrtbase.h b/Source/3rd Party/wx/include/wx/wxcrtbase.h
deleted file mode 100644
index b30de539b..000000000
--- a/Source/3rd Party/wx/include/wx/wxcrtbase.h	
+++ /dev/null
@@ -1,708 +0,0 @@
-/*
- * Name:        wx/wxcrtbase.h
- * Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
- *              CRT functions
- * Author:      Joel Farley, Ove Kaaven
- * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
- * Created:     1998/06/12
- * RCS-ID:      $Id$
- * Copyright:   (c) 1998-2006 wxWidgets dev team
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-
-#ifndef _WX_WXCRTBASE_H_
-#define _WX_WXCRTBASE_H_
-
-/* -------------------------------------------------------------------------
-                        headers and missing declarations
-   ------------------------------------------------------------------------- */
-
-#include "wx/chartype.h"
-
-/*
-    Standard headers we need here.
-
-    NB: don't include any wxWidgets headers here because almost all of them
-        include this one!
-
-    NB2: User code should include wx/crt.h instead of including this
-         header directly.
-
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <wctype.h>
-#include <time.h>
-
-#if defined(__WINDOWS__) && !defined(__WXWINCE__)
-    #include <io.h>
-#endif
-
-#if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
-    char *strtok_r(char *, const char *, char **);
-#endif
-
-/*
-    Using -std=c++{98,0x} option with mingw32 disables most of standard
-    library extensions, so we can't rely on the presence of common non-ANSI
-    functions, define a special symbol to test for this. Notice that this
-    doesn't need to be done for g++ under Linux where _GNU_SOURCE (which is
-    defined by default) still makes all common extensions available even in
-    ANSI mode.
- */
-#if defined(__MINGW32__) && defined(__STRICT_ANSI__)
-    #define __WX_STRICT_ANSI_GCC__
-#endif
-
-/*
-   a few compilers don't have the (non standard but common) isascii function,
-   define it ourselves for them
- */
-#ifndef isascii
-    #if defined(__WX_STRICT_ANSI_GCC__)
-        #define wxNEED_ISASCII
-    #elif defined(_WIN32_WCE)
-        #if _WIN32_WCE <= 211
-            #define wxNEED_ISASCII
-        #endif
-    #endif
-#endif /* isascii */
-
-#ifdef wxNEED_ISASCII
-    inline int isascii(int c) { return (unsigned)c < 0x80; }
-#endif
-
-#ifdef _WIN32_WCE
-    #if _WIN32_WCE <= 211
-        #define isspace(c) ((c) == wxT(' ') || (c) == wxT('\t'))
-    #endif
-#endif /* _WIN32_WCE */
-
-/* string.h functions */
-#ifndef strdup
-    #if defined(__WXWINCE__)
-        #if _WIN32_WCE <= 211
-            #define wxNEED_STRDUP
-        #endif
-    #endif
-#endif /* strdup */
-
-#ifdef wxNEED_STRDUP
-    WXDLLIMPEXP_BASE char *strdup(const char* s);
-#endif
-
-/* missing functions in some WinCE versions */
-#ifdef _WIN32_WCE
-#if (_WIN32_WCE < 300)
-WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
-#endif
-#endif /* _WIN32_WCE */
-
-
-/* -------------------------------------------------------------------------
-                            UTF-8 locale handling
-   ------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-    #if wxUSE_UNICODE_UTF8
-        /* flag indicating whether the current locale uses UTF-8 or not; must be
-           updated every time the locale is changed! */
-        #if wxUSE_UTF8_LOCALE_ONLY
-        #define wxLocaleIsUtf8 true
-        #else
-        extern WXDLLIMPEXP_BASE bool wxLocaleIsUtf8;
-        #endif
-        /* function used to update the flag: */
-        extern WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8();
-    #else /* !wxUSE_UNICODE_UTF8 */
-        inline void wxUpdateLocaleIsUtf8() {}
-    #endif /* wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8 */
-#endif /* __cplusplus */
-
-
-/* -------------------------------------------------------------------------
-                                 string.h
-   ------------------------------------------------------------------------- */
-
-#define wxCRT_StrcatA    strcat
-#define wxCRT_StrchrA    strchr
-#define wxCRT_StrcmpA    strcmp
-#define wxCRT_StrcpyA    strcpy
-#define wxCRT_StrcspnA   strcspn
-#define wxCRT_StrlenA    strlen
-#define wxCRT_StrncatA   strncat
-#define wxCRT_StrncmpA   strncmp
-#define wxCRT_StrncpyA   strncpy
-#define wxCRT_StrpbrkA   strpbrk
-#define wxCRT_StrrchrA   strrchr
-#define wxCRT_StrspnA    strspn
-#define wxCRT_StrstrA    strstr
-
-#define wxCRT_StrcatW    wcscat
-#define wxCRT_StrchrW    wcschr
-#define wxCRT_StrcmpW    wcscmp
-#define wxCRT_StrcpyW    wcscpy
-#define wxCRT_StrcspnW   wcscspn
-#define wxCRT_StrncatW   wcsncat
-#define wxCRT_StrncmpW   wcsncmp
-#define wxCRT_StrncpyW   wcsncpy
-#define wxCRT_StrpbrkW   wcspbrk
-#define wxCRT_StrrchrW   wcsrchr
-#define wxCRT_StrspnW    wcsspn
-#define wxCRT_StrstrW    wcsstr
-
-/* these functions are not defined under CE, at least in VC8 CRT */
-#if !defined(__WXWINCE__)
-    #define wxCRT_StrcollA   strcoll
-    #define wxCRT_StrxfrmA   strxfrm
-
-    #define wxCRT_StrcollW   wcscoll
-    #define wxCRT_StrxfrmW   wcsxfrm
-#endif /* __WXWINCE__ */
-
-/* Almost all compiler have strdup(), but VC++ for CE doesn't provide it.
-   Another special case is gcc in strict ANSI mode: normally it doesn't provide
-   strdup() but MinGW does provide it under MSVC-compatible name so test for it
-   before checking __WX_STRICT_ANSI_GCC__. */
-#if (defined(__VISUALC__) && __VISUALC__ >= 1400) || \
-    defined(__MINGW32__)
-    #define wxCRT_StrdupA _strdup
-#elif !(defined(__WXWINCE__) || defined(__WX_STRICT_ANSI_GCC__))
-    #define wxCRT_StrdupA strdup
-#endif
-
-/* most Windows compilers provide _wcsdup() */
-#if defined(__WINDOWS__) && \
-        !(defined(__CYGWIN__) || defined(__WX_STRICT_ANSI_GCC__))
-    #define wxCRT_StrdupW _wcsdup
-#elif defined(HAVE_WCSDUP)
-    #define wxCRT_StrdupW wcsdup
-#endif
-
-#ifdef wxHAVE_TCHAR_SUPPORT
-    /* we surely have wchar_t if we have TCHAR have wcslen() */
-    #ifndef HAVE_WCSLEN
-        #define HAVE_WCSLEN
-    #endif
-#endif /* wxHAVE_TCHAR_SUPPORT */
-
-#ifdef HAVE_WCSLEN
-    #define wxCRT_StrlenW wcslen
-#endif
-
-#define wxCRT_StrtodA    strtod
-#define wxCRT_StrtolA    strtol
-#define wxCRT_StrtoulA   strtoul
-#define wxCRT_StrtodW    wcstod
-#define wxCRT_StrtolW    wcstol
-#define wxCRT_StrtoulW   wcstoul
-
-#ifdef __VISUALC__
-    #if __VISUALC__ >= 1300 && !defined(__WXWINCE__)
-        #define wxCRT_StrtollA   _strtoi64
-        #define wxCRT_StrtoullA  _strtoui64
-        #define wxCRT_StrtollW   _wcstoi64
-        #define wxCRT_StrtoullW  _wcstoui64
-    #endif /* VC++ 7+ */
-#else
-    #ifdef HAVE_STRTOULL
-        #define wxCRT_StrtollA   strtoll
-        #define wxCRT_StrtoullA  strtoull
-    #endif /* HAVE_STRTOULL */
-    #ifdef HAVE_WCSTOULL
-        /* assume that we have wcstoull(), which is also C99, too */
-        #define wxCRT_StrtollW   wcstoll
-        #define wxCRT_StrtoullW  wcstoull
-    #endif /* HAVE_WCSTOULL */
-#endif
-
-/*
-    Only VC8 and later provide strnlen() and wcsnlen() functions under Windows
-    and it's also only available starting from Windows CE 6.0 only in CE build.
- */
-#if wxCHECK_VISUALC_VERSION(8) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 0x600))
-    #ifndef HAVE_STRNLEN
-        #define HAVE_STRNLEN
-    #endif
-    #ifndef HAVE_WCSNLEN
-        #define HAVE_WCSNLEN
-    #endif
-#endif
-
-#ifdef HAVE_STRNLEN
-    #define wxCRT_StrnlenA  strnlen
-#endif
-
-#ifdef HAVE_WCSNLEN
-    #define wxCRT_StrnlenW  wcsnlen
-#endif
-
-/* define wxCRT_StricmpA/W and wxCRT_StrnicmpA/W for various compilers */
-
-#if defined(__BORLANDC__) || defined(__WATCOMC__) || \
-        defined(__VISAGECPP__) || \
-        defined(__EMX__) || defined(__DJGPP__)
-    #define wxCRT_StricmpA stricmp
-    #define wxCRT_StrnicmpA strnicmp
-#elif defined(__SYMANTEC__) || defined(__VISUALC__)
-    #define wxCRT_StricmpA _stricmp
-    #define wxCRT_StrnicmpA _strnicmp
-#elif defined(__UNIX__) || (defined(__GNUWIN32__) && !defined(__WX_STRICT_ANSI_GCC__))
-    #define wxCRT_StricmpA strcasecmp
-    #define wxCRT_StrnicmpA strncasecmp
-/* #else -- use wxWidgets implementation */
-#endif
-
-#ifdef __VISUALC__
-    #define wxCRT_StricmpW _wcsicmp
-    #define wxCRT_StrnicmpW _wcsnicmp
-#elif defined(__UNIX__)
-    #ifdef HAVE_WCSCASECMP
-        #define wxCRT_StricmpW wcscasecmp
-    #endif
-    #ifdef HAVE_WCSNCASECMP
-        #define wxCRT_StrnicmpW wcsncasecmp
-    #endif
-/* #else -- use wxWidgets implementation */
-#endif
-
-#ifdef HAVE_STRTOK_R
-    #define  wxCRT_StrtokA(str, sep, last)    strtok_r(str, sep, last)
-#endif
-/* FIXME-UTF8: detect and use wcstok() if available for wxCRT_StrtokW */
-
-/* these are extern "C" because they are used by regex lib: */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef wxCRT_StrlenW
-WXDLLIMPEXP_BASE size_t wxCRT_StrlenW(const wchar_t *s);
-#endif
-
-#ifndef wxCRT_StrncmpW
-WXDLLIMPEXP_BASE int wxCRT_StrncmpW(const wchar_t *s1, const wchar_t *s2, size_t n);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-/* FIXME-UTF8: remove this once we are Unicode only */
-#if wxUSE_UNICODE
-    #define wxCRT_StrlenNative  wxCRT_StrlenW
-    #define wxCRT_StrncmpNative wxCRT_StrncmpW
-    #define wxCRT_ToupperNative wxCRT_ToupperW
-    #define wxCRT_TolowerNative wxCRT_TolowerW
-#else
-    #define wxCRT_StrlenNative  wxCRT_StrlenA
-    #define wxCRT_StrncmpNative wxCRT_StrncmpA
-    #define wxCRT_ToupperNative toupper
-    #define wxCRT_TolowerNative tolower
-#endif
-
-#ifndef wxCRT_StrcatW
-WXDLLIMPEXP_BASE wchar_t *wxCRT_StrcatW(wchar_t *dest, const wchar_t *src);
-#endif
-
-#ifndef wxCRT_StrchrW
-WXDLLIMPEXP_BASE const wchar_t *wxCRT_StrchrW(const wchar_t *s, wchar_t c);
-#endif
-
-#ifndef wxCRT_StrcmpW
-WXDLLIMPEXP_BASE int wxCRT_StrcmpW(const wchar_t *s1, const wchar_t *s2);
-#endif
-
-#ifndef wxCRT_StrcollW
-WXDLLIMPEXP_BASE int wxCRT_StrcollW(const wchar_t *s1, const wchar_t *s2);
-#endif
-
-#ifndef wxCRT_StrcpyW
-WXDLLIMPEXP_BASE wchar_t *wxCRT_StrcpyW(wchar_t *dest, const wchar_t *src);
-#endif
-
-#ifndef wxCRT_StrcspnW
-WXDLLIMPEXP_BASE size_t wxCRT_StrcspnW(const wchar_t *s, const wchar_t *reject);
-#endif
-
-#ifndef wxCRT_StrncatW
-WXDLLIMPEXP_BASE wchar_t *wxCRT_StrncatW(wchar_t *dest, const wchar_t *src, size_t n);
-#endif
-
-#ifndef wxCRT_StrncpyW
-WXDLLIMPEXP_BASE wchar_t *wxCRT_StrncpyW(wchar_t *dest, const wchar_t *src, size_t n);
-#endif
-
-#ifndef wxCRT_StrpbrkW
-WXDLLIMPEXP_BASE const wchar_t *wxCRT_StrpbrkW(const wchar_t *s, const wchar_t *accept);
-#endif
-
-#ifndef wxCRT_StrrchrW
-WXDLLIMPEXP_BASE const wchar_t *wxCRT_StrrchrW(const wchar_t *s, wchar_t c);
-#endif
-
-#ifndef wxCRT_StrspnW
-WXDLLIMPEXP_BASE size_t wxCRT_StrspnW(const wchar_t *s, const wchar_t *accept);
-#endif
-
-#ifndef wxCRT_StrstrW
-WXDLLIMPEXP_BASE const wchar_t *wxCRT_StrstrW(const wchar_t *haystack, const wchar_t *needle);
-#endif
-
-#ifndef wxCRT_StrtodW
-WXDLLIMPEXP_BASE double wxCRT_StrtodW(const wchar_t *nptr, wchar_t **endptr);
-#endif
-
-#ifndef wxCRT_StrtolW
-WXDLLIMPEXP_BASE long int wxCRT_StrtolW(const wchar_t *nptr, wchar_t **endptr, int base);
-#endif
-
-#ifndef wxCRT_StrtoulW
-WXDLLIMPEXP_BASE unsigned long int wxCRT_StrtoulW(const wchar_t *nptr, wchar_t **endptr, int base);
-#endif
-
-#ifndef wxCRT_StrxfrmW
-WXDLLIMPEXP_BASE size_t wxCRT_StrxfrmW(wchar_t *dest, const wchar_t *src, size_t n);
-#endif
-
-#ifndef wxCRT_StrdupA
-WXDLLIMPEXP_BASE char *wxCRT_StrdupA(const char *psz);
-#endif
-
-#ifndef wxCRT_StrdupW
-WXDLLIMPEXP_BASE wchar_t *wxCRT_StrdupW(const wchar_t *pwz);
-#endif
-
-#ifndef wxCRT_StricmpA
-WXDLLIMPEXP_BASE int wxCRT_StricmpA(const char *psz1, const char *psz2);
-#endif
-
-#ifndef wxCRT_StricmpW
-WXDLLIMPEXP_BASE int wxCRT_StricmpW(const wchar_t *psz1, const wchar_t *psz2);
-#endif
-
-#ifndef wxCRT_StrnicmpA
-WXDLLIMPEXP_BASE int wxCRT_StrnicmpA(const char *psz1, const char *psz2, size_t len);
-#endif
-
-#ifndef wxCRT_StrnicmpW
-WXDLLIMPEXP_BASE int wxCRT_StrnicmpW(const wchar_t *psz1, const wchar_t *psz2, size_t len);
-#endif
-
-#ifndef wxCRT_StrtokA
-WXDLLIMPEXP_BASE char *wxCRT_StrtokA(char *psz, const char *delim, char **save_ptr);
-#endif
-
-#ifndef wxCRT_StrtokW
-WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wchar_t **save_ptr);
-#endif
-
-/* supply strtoll and strtoull, if needed */
-#ifdef wxLongLong_t
-    #ifndef wxCRT_StrtollA
-        WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollA(const char* nptr,
-                                                     char** endptr,
-                                                     int base);
-        WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullA(const char* nptr,
-                                                       char** endptr,
-                                                       int base);
-    #endif
-    #ifndef wxCRT_StrtollW
-        WXDLLIMPEXP_BASE wxLongLong_t wxCRT_StrtollW(const wchar_t* nptr,
-                                                     wchar_t** endptr,
-                                                     int base);
-        WXDLLIMPEXP_BASE wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr,
-                                                       wchar_t** endptr,
-                                                       int base);
-    #endif
-#endif /* wxLongLong_t */
-
-
-/* -------------------------------------------------------------------------
-                                  stdio.h
-   ------------------------------------------------------------------------- */
-
-#if defined(__UNIX__) || defined(__WXMAC__)
-    #define wxMBFILES 1
-#else
-    #define wxMBFILES 0
-#endif
-
-
-/* these functions are only needed in the form used for filenames (i.e. char*
-   on Unix, wchar_t* on Windows), so we don't need to use A/W suffix: */
-#if wxMBFILES || !wxUSE_UNICODE /* ANSI filenames */
-
-    #define wxCRT_Fopen   fopen
-    #define wxCRT_Freopen freopen
-    #define wxCRT_Remove  remove
-    #define wxCRT_Rename  rename
-
-#else /* Unicode filenames */
-    /* special case: these functions are missing under Win9x with Unicows so we
-       have to implement them ourselves */
-    #if wxUSE_UNICODE_MSLU || defined(__WX_STRICT_ANSI_GCC__)
-            WXDLLIMPEXP_BASE FILE* wxMSLU__wfopen(const wchar_t *name, const wchar_t *mode);
-            WXDLLIMPEXP_BASE FILE* wxMSLU__wfreopen(const wchar_t *name, const wchar_t *mode, FILE *stream);
-            WXDLLIMPEXP_BASE int wxMSLU__wrename(const wchar_t *oldname, const wchar_t *newname);
-            WXDLLIMPEXP_BASE int wxMSLU__wremove(const wchar_t *name);
-            #define wxCRT_Fopen     wxMSLU__wfopen
-            #define wxCRT_Freopen   wxMSLU__wfreopen
-            #define wxCRT_Remove    wxMSLU__wremove
-            #define wxCRT_Rename    wxMSLU__wrename
-    #else
-        /* WinCE CRT doesn't provide these functions so use our own */
-        #ifdef __WXWINCE__
-            WXDLLIMPEXP_BASE int wxCRT_Rename(const wchar_t *src,
-                                              const wchar_t *dst);
-            WXDLLIMPEXP_BASE int wxCRT_Remove(const wchar_t *path);
-        #else
-            #define wxCRT_Rename   _wrename
-            #define wxCRT_Remove _wremove
-        #endif
-        #define wxCRT_Fopen    _wfopen
-        #define wxCRT_Freopen  _wfreopen
-    #endif
-
-#endif /* wxMBFILES/!wxMBFILES */
-
-#define wxCRT_PutsA       puts
-#define wxCRT_FputsA      fputs
-#define wxCRT_FgetsA      fgets
-#define wxCRT_FputcA      fputc
-#define wxCRT_FgetcA      fgetc
-#define wxCRT_UngetcA     ungetc
-
-#ifdef wxHAVE_TCHAR_SUPPORT
-    #define wxCRT_PutsW   _putws
-    #define wxCRT_FputsW  fputws
-    #define wxCRT_FputcW  fputwc
-#endif
-#ifdef HAVE_FPUTWS
-    #define wxCRT_FputsW  fputws
-#endif
-#ifdef HAVE_PUTWS
-    #define wxCRT_PutsW   putws
-#endif
-#ifdef HAVE_FPUTWC
-    #define wxCRT_FputcW  fputwc
-#endif
-#define wxCRT_FgetsW  fgetws
-
-#ifndef wxCRT_PutsW
-WXDLLIMPEXP_BASE int wxCRT_PutsW(const wchar_t *ws);
-#endif
-
-#ifndef wxCRT_FputsW
-WXDLLIMPEXP_BASE int wxCRT_FputsW(const wchar_t *ch, FILE *stream);
-#endif
-
-#ifndef wxCRT_FputcW
-WXDLLIMPEXP_BASE int wxCRT_FputcW(wchar_t wc, FILE *stream);
-#endif
-
-/*
-   NB: tmpnam() is unsafe and thus is not wrapped!
-       Use other wxWidgets facilities instead:
-        wxFileName::CreateTempFileName, wxTempFile, or wxTempFileOutputStream
-*/
-#define wxTmpnam(x)         wxTmpnam_is_insecure_use_wxTempFile_instead
-
-/* FIXME-CE: provide our own perror() using ::GetLastError() */
-#ifndef __WXWINCE__
-
-#define wxCRT_PerrorA   perror
-#ifdef wxHAVE_TCHAR_SUPPORT
-    #define wxCRT_PerrorW _wperror
-#endif
-
-#endif /* !__WXWINCE__ */
-
-/* -------------------------------------------------------------------------
-                                  stdlib.h
-   ------------------------------------------------------------------------- */
-
-/* there are no env vars at all under CE, so no _tgetenv neither */
-#ifdef __WXWINCE__
-    /* can't define as inline function as this is a C file... */
-    #define wxCRT_GetenvA(name)     (name, NULL)
-    #define wxCRT_GetenvW(name)     (name, NULL)
-#else
-    #define wxCRT_GetenvA           getenv
-    #ifdef _tgetenv
-        #define wxCRT_GetenvW       _wgetenv
-    #endif
-#endif
-
-#ifndef wxCRT_GetenvW
-WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name);
-#endif
-
-
-#define wxCRT_SystemA               system
-/* mingw32 doesn't provide _tsystem() or _wsystem(): */
-#if defined(_tsystem)
-    #define  wxCRT_SystemW          _wsystem
-#endif
-
-#define wxCRT_AtofA                 atof
-#define wxCRT_AtoiA                 atoi
-#define wxCRT_AtolA                 atol
-
-#if defined(wxHAVE_TCHAR_SUPPORT) && !defined(__WX_STRICT_ANSI_GCC__)
-    #define  wxCRT_AtoiW           _wtoi
-    #define  wxCRT_AtolW           _wtol
-    /* _wtof doesn't exist */
-#else
-#ifndef __VMS
-    #define wxCRT_AtofW(s)         wcstod(s, NULL)
-#endif
-    #define wxCRT_AtolW(s)         wcstol(s, NULL, 10)
-    /* wcstoi doesn't exist */
-#endif
-
-#ifdef __DARWIN__
-    #if !defined(__WXOSX_IPHONE__) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
-        #define wxNEED_WX_MBSTOWCS
-    #endif
-#endif
-
-#ifdef wxNEED_WX_MBSTOWCS
-    /* even though they are defined and "implemented", they are bad and just
-       stubs so we need our own - we need these even in ANSI builds!! */
-    WXDLLIMPEXP_BASE size_t wxMbstowcs(wchar_t *, const char *, size_t);
-    WXDLLIMPEXP_BASE size_t wxWcstombs(char *, const wchar_t *, size_t);
-#else
-    #define wxMbstowcs mbstowcs
-    #define wxWcstombs wcstombs
-#endif
-
-
-
-/* -------------------------------------------------------------------------
-                                time.h
-   ------------------------------------------------------------------------- */
-
-#define wxCRT_StrftimeA  strftime
-#ifdef __SGI__
-    /*
-        IRIX provides not one but two versions of wcsftime(): XPG4 one which
-        uses "const char*" for the third parameter and so can't be used and the
-        correct, XPG5, one. Unfortunately we can't just define _XOPEN_SOURCE
-        high enough to get XPG5 version as this undefines other symbols which
-        make other functions we use unavailable (see <standards.h> for gory
-        details). So just declare the XPG5 version ourselves, we're extremely
-        unlikely to ever be compiled on a system without it. But if we ever do,
-        a configure test would need to be added for it (and _MIPS_SYMBOL_PRESENT
-        should be used to check for its presence during run-time, i.e. it would
-        probably be simpler to just always use our own wxCRT_StrftimeW() below
-        if it does ever become a problem).
-     */
-#ifdef __cplusplus
-    extern "C"
-#endif
-    size_t
-    _xpg5_wcsftime(wchar_t *, size_t, const wchar_t *, const struct tm * );
-    #define wxCRT_StrftimeW _xpg5_wcsftime
-#else
-    /*
-        Assume it's always available under non-Unix systems as this does seem
-        to be the case for now. And under Unix we trust configure to detect it
-        (except for SGI special case above).
-     */
-    #if defined(HAVE_WCSFTIME) || !defined(__UNIX__)
-        #define wxCRT_StrftimeW  wcsftime
-    #endif
-#endif
-
-#ifndef wxCRT_StrftimeW
-WXDLLIMPEXP_BASE size_t wxCRT_StrftimeW(wchar_t *s, size_t max,
-                                        const wchar_t *fmt,
-                                        const struct tm *tm);
-#endif
-
-
-
-/* -------------------------------------------------------------------------
-                                ctype.h
-   ------------------------------------------------------------------------- */
-
-#ifdef __WATCOMC__
-  #define WXWCHAR_T_CAST(c) (wint_t)(c)
-#else
-  #define WXWCHAR_T_CAST(c) c
-#endif
-
-#define wxCRT_IsalnumW(c)   iswalnum(WXWCHAR_T_CAST(c))
-#define wxCRT_IsalphaW(c)   iswalpha(WXWCHAR_T_CAST(c))
-#define wxCRT_IscntrlW(c)   iswcntrl(WXWCHAR_T_CAST(c))
-#define wxCRT_IsdigitW(c)   iswdigit(WXWCHAR_T_CAST(c))
-#define wxCRT_IsgraphW(c)   iswgraph(WXWCHAR_T_CAST(c))
-#define wxCRT_IslowerW(c)   iswlower(WXWCHAR_T_CAST(c))
-#define wxCRT_IsprintW(c)   iswprint(WXWCHAR_T_CAST(c))
-#define wxCRT_IspunctW(c)   iswpunct(WXWCHAR_T_CAST(c))
-#define wxCRT_IsspaceW(c)   iswspace(WXWCHAR_T_CAST(c))
-#define wxCRT_IsupperW(c)   iswupper(WXWCHAR_T_CAST(c))
-#define wxCRT_IsxdigitW(c)  iswxdigit(WXWCHAR_T_CAST(c))
-
-#ifdef __GLIBC__
-    #if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)
-        /* /usr/include/wctype.h incorrectly declares translations */
-        /* tables which provokes tons of compile-time warnings -- try */
-        /* to correct this */
-        #define wxCRT_TolowerW(wc) towctrans((wc), (wctrans_t)__ctype_tolower)
-        #define wxCRT_ToupperW(wc) towctrans((wc), (wctrans_t)__ctype_toupper)
-    #else /* !glibc 2.0 */
-        #define wxCRT_TolowerW   towlower
-        #define wxCRT_ToupperW   towupper
-    #endif
-#else /* !__GLIBC__ */
-    /* There is a bug in VC6 C RTL: toxxx() functions dosn't do anything
-       with signed chars < 0, so "fix" it here. */
-    #define wxCRT_TolowerW(c)   towlower((wxUChar)(wxChar)(c))
-    #define wxCRT_ToupperW(c)   towupper((wxUChar)(wxChar)(c))
-#endif /* __GLIBC__/!__GLIBC__ */
-
-
-
-
-
-/* -------------------------------------------------------------------------
-       wx wrappers for CRT functions in both char* and wchar_t* versions
-   ------------------------------------------------------------------------- */
-
-#ifdef __cplusplus
-
-/* NB: this belongs to wxcrt.h and not this header, but it makes life easier
- *     for buffer.h and stringimpl.h (both of which must be included before
- *     string.h, which is required by wxcrt.h) to have them here: */
-
-/* safe version of strlen() (returns 0 if passed NULL pointer) */
-inline size_t wxStrlen(const char *s) { return s ? wxCRT_StrlenA(s) : 0; }
-inline size_t wxStrlen(const wchar_t *s) { return s ? wxCRT_StrlenW(s) : 0; }
-#ifndef wxWCHAR_T_IS_WXCHAR16
-       WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar16 *s );
-#endif
-#ifndef wxWCHAR_T_IS_WXCHAR32
-       WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar32 *s );
-#endif
-#define wxWcslen wxCRT_StrlenW
-
-#define wxStrdupA wxCRT_StrdupA
-#define wxStrdupW wxCRT_StrdupW
-inline char* wxStrdup(const char *s) { return wxCRT_StrdupA(s); }
-inline wchar_t* wxStrdup(const wchar_t *s) { return wxCRT_StrdupW(s); }
-#ifndef wxWCHAR_T_IS_WXCHAR16
-       WXDLLIMPEXP_BASE wxChar16* wxStrdup(const wxChar16* s);
-#endif
-#ifndef wxWCHAR_T_IS_WXCHAR32
-       WXDLLIMPEXP_BASE wxChar32* wxStrdup(const wxChar32* s);
-#endif
-
-#endif /* __cplusplus */
-
-#endif /* _WX_WXCRTBASE_H_ */
diff --git a/Source/3rd Party/wx/include/wx/wxcrtvararg.h b/Source/3rd Party/wx/include/wx/wxcrtvararg.h
deleted file mode 100644
index a97ca1690..000000000
--- a/Source/3rd Party/wx/include/wx/wxcrtvararg.h	
+++ /dev/null
@@ -1,487 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/wxcrtvararg.h
-// Purpose:     Type-safe ANSI and Unicode builds compatible wrappers for
-//              printf(), scanf() and related CRT functions
-// Author:      Joel Farley, Ove Kåven
-// Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
-// Created:     2007-02-19
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 REA Elektronik GmbH
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WXCRTVARARG_H_
-#define _WX_WXCRTVARARG_H_
-
-// NB: User code should include wx/crt.h instead of including this
-//     header directly.
-
-#include "wx/wxcrt.h"
-#include "wx/strvararg.h"
-
-#include "wx/string.h"
-
-// ----------------------------------------------------------------------------
-// CRT functions aliases
-// ----------------------------------------------------------------------------
-
-/* Required for wxPrintf() etc */
-#include <stdarg.h>
-
-/* printf() family saga */
-
-/*
-   For many old Unix systems [v]snprintf()/vsscanf() exists in the system
-   libraries but not in the headers, so we need to declare it ourselves to be
-   able to use it.
- */
-#ifdef __UNIX__
-
-#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)
-#ifdef __cplusplus
-    extern "C"
-#else
-    extern
-#endif
-    int vsnprintf(char *str, size_t size, const char *format, va_list ap);
-#endif /* !HAVE_VSNPRINTF_DECL */
-
-#if defined(HAVE_SNPRINTF) && !defined(HAVE_SNPRINTF_DECL)
-#ifdef __cplusplus
-    extern "C"
-#else
-    extern
-#endif
-    int snprintf(char *str, size_t size, const char *format, ...);
-#endif /* !HAVE_SNPRINTF_DECL */
-
-#if defined(HAVE_VSSCANF) && !defined(HAVE_VSSCANF_DECL)
-#ifdef __cplusplus
-    extern "C"
-#else
-    extern
-#endif
-    int vsscanf(const char *str, const char *format, va_list ap);
-#endif /* !HAVE_VSSCANF_DECL */
-
-/* Wrapper for vsnprintf if it's 3rd parameter is non-const. Note: the
- * same isn't done for snprintf below, the builtin wxSnprintf_ is used
- * instead since it's already a simple wrapper */
-#if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL
-    inline int wx_fixed_vsnprintf(char *str, size_t size, const char *format, va_list ap)
-    {
-        return vsnprintf(str, size, (char*)format, ap);
-    }
-#endif
-
-#endif /* __UNIX__ */
-
-/*
-   mingw32 normally uses MSVCRT which has non-standard vswprintf() and so
-   normally _vsnwprintf() is used instead, the only exception is when mingw32
-   is used with STLPort which does have a standard vswprintf() starting from
-   version 5.1 which we can use.
- */
-#ifdef __MINGW32__
-    #if defined(_STLPORT_VERSION) && _STLPORT_VERSION >= 0x510
-        #ifndef HAVE_VSWPRINTF
-            #define HAVE_VSWPRINTF
-        #endif
-    #elif defined(HAVE_VSWPRINTF)
-        /* can't use non-standard vswprintf() */
-        #undef HAVE_VSWPRINTF
-    #endif
-#endif /* __MINGW32__ */
-
-#if defined(__WATCOMC__)
-    #define HAVE_VSWPRINTF 1
-#endif
-
-#if wxUSE_PRINTF_POS_PARAMS
-    /*
-        The systems where vsnprintf() supports positional parameters should
-        define the HAVE_UNIX98_PRINTF symbol.
-
-        On systems which don't (e.g. Windows) we are forced to use
-        our wxVsnprintf() implementation.
-    */
-    #if defined(HAVE_UNIX98_PRINTF)
-        #ifdef HAVE_VSWPRINTF
-            #define wxCRT_VsnprintfW   vswprintf
-        #endif
-        #ifdef HAVE_BROKEN_VSNPRINTF_DECL
-            #define wxCRT_VsnprintfA    wx_fixed_vsnprintf
-        #else
-            #define wxCRT_VsnprintfA    vsnprintf
-        #endif
-    #else /* !HAVE_UNIX98_PRINTF */
-        /*
-            The only compiler with positional parameters support under Windows
-            is VC++ 8.0 which provides a new xxprintf_p() functions family.
-            The 2003 PSDK includes a slightly earlier version of VC8 than the
-            main release and does not have the printf_p functions.
-         */
-        #if defined _MSC_FULL_VER && _MSC_FULL_VER >= 140050727 && !defined __WXWINCE__
-            #define wxCRT_VsnprintfA    _vsprintf_p
-            #define wxCRT_VsnprintfW    _vswprintf_p
-        #endif
-    #endif /* HAVE_UNIX98_PRINTF/!HAVE_UNIX98_PRINTF */
-#else /* !wxUSE_PRINTF_POS_PARAMS */
-    /*
-       We always want to define safe snprintf() function to be used instead of
-       sprintf(). Some compilers already have it (or rather vsnprintf() which
-       we really need...), otherwise we implement it using our own printf()
-       code.
-
-       We define function with a trailing underscore here because the real one
-       is a wrapper around it as explained below
-     */
-
-    #if defined(__VISUALC__) || \
-            (defined(__BORLANDC__) && __BORLANDC__ >= 0x540)
-        #define wxCRT_VsnprintfA    _vsnprintf
-        #define wxCRT_VsnprintfW    _vsnwprintf
-    #else
-        #if defined(HAVE__VSNWPRINTF)
-            #define wxCRT_VsnprintfW    _vsnwprintf
-        #elif defined(HAVE_VSWPRINTF)
-            #define wxCRT_VsnprintfW     vswprintf
-        #elif defined(__WATCOMC__)
-            #define wxCRT_VsnprintfW    _vsnwprintf
-        #endif
-
-        #if defined(HAVE_VSNPRINTF) \
-            || defined(__WATCOMC__)
-            #ifdef HAVE_BROKEN_VSNPRINTF_DECL
-                #define wxCRT_VsnprintfA    wx_fixed_vsnprintf
-            #else
-                #define wxCRT_VsnprintfA    vsnprintf
-            #endif
-        #endif
-    #endif
-#endif /* wxUSE_PRINTF_POS_PARAMS/!wxUSE_PRINTF_POS_PARAMS */
-
-#ifndef wxCRT_VsnprintfW
-    /* no (suitable) vsnprintf(), cook our own */
-    WXDLLIMPEXP_BASE int
-    wxCRT_VsnprintfW(wchar_t *buf, size_t len, const wchar_t *format, va_list argptr);
-    #define wxUSE_WXVSNPRINTFW 1
-#else
-    #define wxUSE_WXVSNPRINTFW 0
-#endif
-
-#ifndef wxCRT_VsnprintfA
-        /* no (suitable) vsnprintf(), cook our own */
-        WXDLLIMPEXP_BASE int
-        wxCRT_VsnprintfA(char *buf, size_t len, const char *format, va_list argptr);
-        #define wxUSE_WXVSNPRINTFA 1
-#else
-        #define wxUSE_WXVSNPRINTFA 0
-#endif
-
-// for wxString code, define wxUSE_WXVSNPRINTF to indicate that wx
-// implementation is used no matter what (in UTF-8 build, either *A or *W
-// version may be called):
-#if !wxUSE_UNICODE
-    #define wxUSE_WXVSNPRINTF wxUSE_WXVSNPRINTFA
-#elif wxUSE_UNICODE_WCHAR
-    #define wxUSE_WXVSNPRINTF wxUSE_WXVSNPRINTFW
-#elif wxUSE_UTF8_LOCALE_ONLY
-    #define wxUSE_WXVSNPRINTF wxUSE_WXVSNPRINTFA
-#else // UTF-8 under any locale
-    #define wxUSE_WXVSNPRINTF (wxUSE_WXVSNPRINTFA && wxUSE_WXVSNPRINTFW)
-#endif
-
-#define wxCRT_FprintfA       fprintf
-#define wxCRT_PrintfA        printf
-#define wxCRT_VfprintfA      vfprintf
-#define wxCRT_VprintfA       vprintf
-#define wxCRT_VsprintfA      vsprintf
-
-/*
-   In Unicode mode we need to have all standard functions such as wprintf() and
-   so on but not all systems have them so use our own implementations in this
-   case.
- */
-#if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF)
-    #define wxNEED_WPRINTF
-#endif
-#if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_VSWSCANF)
-    #define wxNEED_VSWSCANF
-#endif
-
-
-#if defined(wxNEED_WPRINTF)
-    /*
-        we need to implement all wide character printf functions either because
-        we don't have them at all or because they don't have the semantics we
-        need
-     */
-    int wxCRT_PrintfW( const wchar_t *format, ... );
-    int wxCRT_FprintfW( FILE *stream, const wchar_t *format, ... );
-    int wxCRT_VfprintfW( FILE *stream, const wchar_t *format, va_list ap );
-    int wxCRT_VprintfW( const wchar_t *format, va_list ap );
-    int wxCRT_VsprintfW( wchar_t *str, const wchar_t *format, va_list ap );
-#else /* !wxNEED_WPRINTF */
-    #define wxCRT_FprintfW      fwprintf
-    #define wxCRT_PrintfW       wprintf
-    #define wxCRT_VfprintfW     vfwprintf
-    #define wxCRT_VprintfW      vwprintf
-
-    #if defined(__WINDOWS__) && !defined(HAVE_VSWPRINTF)
-        // only non-standard vswprintf() without buffer size argument can be used here
-        #define  wxCRT_VsprintfW     vswprintf
-    #endif
-#endif /* wxNEED_WPRINTF */
-
-
-/* Required for wxScanf() etc. */
-#define wxCRT_ScanfA     scanf
-#define wxCRT_SscanfA    sscanf
-#define wxCRT_FscanfA    fscanf
-#define wxCRT_VsscanfA   vsscanf
-
-#if defined(wxNEED_WPRINTF)
-    int wxCRT_ScanfW(const wchar_t *format, ...);
-    int wxCRT_SscanfW(const wchar_t *str, const wchar_t *format, ...);
-    int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...);
-#else
-    #define wxCRT_ScanfW     wxVMS_USE_STD wscanf
-    #define wxCRT_SscanfW    wxVMS_USE_STD swscanf
-    #define wxCRT_FscanfW    wxVMS_USE_STD fwscanf
-#endif
-#ifdef wxNEED_VSWSCANF
-    int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list ap);
-#else
-    #define wxCRT_VsscanfW   wxVMS_USE_STD vswscanf
-#endif
-
-// ----------------------------------------------------------------------------
-// user-friendly wrappers to CRT functions
-// ----------------------------------------------------------------------------
-
-#ifdef __WATCOMC__
-    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-    #define wxPrintf    wxPrintf_Impl
-    #define wxFprintf   wxFprintf_Impl
-    #define wxSprintf   wxSprintf_Impl
-    #define wxSnprintf  wxSnprintf_Impl
-#endif
-
-    // FIXME-UTF8: remove this
-#if wxUSE_UNICODE
-    #define wxCRT_PrintfNative wxCRT_PrintfW
-    #define wxCRT_FprintfNative wxCRT_FprintfW
-#else
-    #define wxCRT_PrintfNative wxCRT_PrintfA
-    #define wxCRT_FprintfNative wxCRT_FprintfA
-#endif
-
-
-WX_DEFINE_VARARG_FUNC_SANS_N0(int, wxPrintf, 1, (const wxFormatString&),
-                              wxCRT_PrintfNative, wxCRT_PrintfA)
-inline int wxPrintf(const wxFormatString& s)
-{
-    return wxPrintf("%s", s.InputAsString());
-}
-
-WX_DEFINE_VARARG_FUNC_SANS_N0(int, wxFprintf, 2, (FILE*, const wxFormatString&),
-                              wxCRT_FprintfNative, wxCRT_FprintfA)
-inline int wxFprintf(FILE *f, const wxFormatString& s)
-{
-    return wxFprintf(f, "%s", s.InputAsString());
-}
-
-// va_list versions of printf functions simply forward to the respective
-// CRT function; note that they assume that va_list was created using
-// wxArgNormalizer<T>!
-#if wxUSE_UNICODE_UTF8
-    #if wxUSE_UTF8_LOCALE_ONLY
-        #define WX_VARARG_VFOO_IMPL(args, implW, implA)              \
-            return implA args
-    #else
-        #define WX_VARARG_VFOO_IMPL(args, implW, implA)              \
-            if ( wxLocaleIsUtf8 ) return implA args;                 \
-            else return implW args
-    #endif
-#elif wxUSE_UNICODE_WCHAR
-    #define WX_VARARG_VFOO_IMPL(args, implW, implA)                  \
-        return implW args
-#else // ANSI
-    #define WX_VARARG_VFOO_IMPL(args, implW, implA)                  \
-        return implA args
-#endif
-
-inline int
-wxVprintf(const wxString& format, va_list ap)
-{
-    WX_VARARG_VFOO_IMPL((wxFormatString(format), ap),
-                        wxCRT_VprintfW, wxCRT_VprintfA);
-}
-
-inline int
-wxVfprintf(FILE *f, const wxString& format, va_list ap)
-{
-    WX_VARARG_VFOO_IMPL((f, wxFormatString(format), ap),
-                        wxCRT_VfprintfW, wxCRT_VfprintfA);
-}
-
-#undef WX_VARARG_VFOO_IMPL
-
-
-// wxSprintf() and friends have to be implemented in two forms, one for
-// writing to char* buffer and one for writing to wchar_t*:
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-int WXDLLIMPEXP_BASE wxDoSprintfWchar(char *str, const wxChar *format, ...);
-#endif
-#if wxUSE_UNICODE_UTF8
-int WXDLLIMPEXP_BASE wxDoSprintfUtf8(char *str, const char *format, ...);
-#endif
-WX_DEFINE_VARARG_FUNC(int, wxSprintf, 2, (char*, const wxFormatString&),
-                      wxDoSprintfWchar, wxDoSprintfUtf8)
-
-int WXDLLIMPEXP_BASE
-wxVsprintf(char *str, const wxString& format, va_list argptr);
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-int WXDLLIMPEXP_BASE wxDoSnprintfWchar(char *str, size_t size, const wxChar *format, ...);
-#endif
-#if wxUSE_UNICODE_UTF8
-int WXDLLIMPEXP_BASE wxDoSnprintfUtf8(char *str, size_t size, const char *format, ...);
-#endif
-WX_DEFINE_VARARG_FUNC(int, wxSnprintf, 3, (char*, size_t, const wxFormatString&),
-                      wxDoSnprintfWchar, wxDoSnprintfUtf8)
-
-int WXDLLIMPEXP_BASE
-wxVsnprintf(char *str, size_t size, const wxString& format, va_list argptr);
-
-#if wxUSE_UNICODE
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-int WXDLLIMPEXP_BASE wxDoSprintfWchar(wchar_t *str, const wxChar *format, ...);
-#endif
-#if wxUSE_UNICODE_UTF8
-int WXDLLIMPEXP_BASE wxDoSprintfUtf8(wchar_t *str, const char *format, ...);
-#endif
-WX_DEFINE_VARARG_FUNC(int, wxSprintf, 2, (wchar_t*, const wxFormatString&),
-                      wxDoSprintfWchar, wxDoSprintfUtf8)
-
-int WXDLLIMPEXP_BASE
-wxVsprintf(wchar_t *str, const wxString& format, va_list argptr);
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-int WXDLLIMPEXP_BASE wxDoSnprintfWchar(wchar_t *str, size_t size, const wxChar *format, ...);
-#endif
-#if wxUSE_UNICODE_UTF8
-int WXDLLIMPEXP_BASE wxDoSnprintfUtf8(wchar_t *str, size_t size, const char *format, ...);
-#endif
-WX_DEFINE_VARARG_FUNC(int, wxSnprintf, 3, (wchar_t*, size_t, const wxFormatString&),
-                      wxDoSnprintfWchar, wxDoSnprintfUtf8)
-
-int WXDLLIMPEXP_BASE
-wxVsnprintf(wchar_t *str, size_t size, const wxString& format, va_list argptr);
-
-#endif // wxUSE_UNICODE
-
-#ifdef __WATCOMC__
-    // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
-    //
-    // fortunately, OpenWatcom implements __VA_ARGS__, so we can provide macros
-    // that cast the format argument to wxString:
-    #undef wxPrintf
-    #undef wxFprintf
-    #undef wxSprintf
-    #undef wxSnprintf
-
-    #define wxPrintf(fmt, ...) \
-            wxPrintf_Impl(wxFormatString(fmt), __VA_ARGS__)
-    #define wxFprintf(f, fmt, ...) \
-            wxFprintf_Impl(f, wxFormatString(fmt), __VA_ARGS__)
-    #define wxSprintf(s, fmt, ...) \
-            wxSprintf_Impl(s, wxFormatString(fmt), __VA_ARGS__)
-    #define wxSnprintf(s, n, fmt, ...) \
-            wxSnprintf_Impl(s, n, wxFormatString(fmt), __VA_ARGS__)
-#endif // __WATCOMC__
-
-
-// We can't use wxArgNormalizer<T> for variadic arguments to wxScanf() etc.
-// because they are writable, so instead of providing friendly template
-// vararg-like functions, we just provide both char* and wchar_t* variants
-// of these functions. The type of output variadic arguments for %s must match
-// the type of 'str' and 'format' arguments.
-//
-// For compatibility with earlier wx versions, we also provide wxSscanf()
-// version with the first argument (input string) wxString; for this version,
-// the type of output string values is determined by the type of format string
-// only.
-
-#define _WX_SCANFUNC_EXTRACT_ARGS_1(x)   x
-#define _WX_SCANFUNC_EXTRACT_ARGS_2(x,y) x, y
-#define _WX_SCANFUNC_EXTRACT_ARGS(N, args) _WX_SCANFUNC_EXTRACT_ARGS_##N args
-
-#define _WX_VARARG_PASS_WRITABLE(i) a##i
-
-#define _WX_DEFINE_SCANFUNC(N, dummy1, name, impl, passfixed, numfixed, fixed)\
-    template<_WX_VARARG_JOIN(N, _WX_VARARG_TEMPL)>                            \
-    int name(_WX_SCANFUNC_EXTRACT_ARGS(numfixed, fixed),                      \
-             _WX_VARARG_JOIN(N, _WX_VARARG_ARG))                              \
-    {                                                                         \
-        return  impl(_WX_SCANFUNC_EXTRACT_ARGS(numfixed, passfixed),          \
-                     _WX_VARARG_JOIN(N, _WX_VARARG_PASS_WRITABLE));           \
-    }
-
-#define WX_DEFINE_SCANFUNC(name, numfixed, fixed, impl, passfixed)            \
-    _WX_VARARG_ITER(_WX_VARARG_MAX_ARGS,                                      \
-                    _WX_DEFINE_SCANFUNC,                                      \
-                    dummy1, name, impl, passfixed, numfixed, fixed)
-
-// this is needed to normalize the format string, see src/common/strvararg.cpp
-// for more details
-#ifdef __WINDOWS__
-    #define wxScanfConvertFormatW(fmt) fmt
-#else
-    const wxScopedWCharBuffer
-    WXDLLIMPEXP_BASE wxScanfConvertFormatW(const wchar_t *format);
-#endif
-
-WX_DEFINE_SCANFUNC(wxScanf, 1, (const char *format),
-                   wxCRT_ScanfA, (format))
-WX_DEFINE_SCANFUNC(wxScanf, 1, (const wchar_t *format),
-                   wxCRT_ScanfW, (wxScanfConvertFormatW(format)))
-
-WX_DEFINE_SCANFUNC(wxFscanf, 2, (FILE *stream, const char *format),
-                   wxCRT_FscanfA, (stream, format))
-WX_DEFINE_SCANFUNC(wxFscanf, 2, (FILE *stream, const wchar_t *format),
-                   wxCRT_FscanfW, (stream, wxScanfConvertFormatW(format)))
-
-WX_DEFINE_SCANFUNC(wxSscanf, 2, (const char *str, const char *format),
-                   wxCRT_SscanfA, (str, format))
-WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wchar_t *str, const wchar_t *format),
-                   wxCRT_SscanfW, (str, wxScanfConvertFormatW(format)))
-WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxScopedCharBuffer& str, const char *format),
-                   wxCRT_SscanfA, (str.data(), format))
-WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxScopedWCharBuffer& str, const wchar_t *format),
-                   wxCRT_SscanfW, (str.data(), wxScanfConvertFormatW(format)))
-WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxString& str, const char *format),
-                   wxCRT_SscanfA, (str.mb_str(), format))
-WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxString& str, const wchar_t *format),
-                   wxCRT_SscanfW, (str.wc_str(), wxScanfConvertFormatW(format)))
-WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxCStrData& str, const char *format),
-                   wxCRT_SscanfA, (str.AsCharBuf(), format))
-WX_DEFINE_SCANFUNC(wxSscanf, 2, (const wxCStrData& str, const wchar_t *format),
-                   wxCRT_SscanfW, (str.AsWCharBuf(), wxScanfConvertFormatW(format)))
-
-// Visual C++ doesn't provide vsscanf()
-#ifndef __VISUALC___
-int WXDLLIMPEXP_BASE wxVsscanf(const char *str, const char *format, va_list ap);
-int WXDLLIMPEXP_BASE wxVsscanf(const wchar_t *str, const wchar_t *format, va_list ap);
-int WXDLLIMPEXP_BASE wxVsscanf(const wxScopedCharBuffer& str, const char *format, va_list ap);
-int WXDLLIMPEXP_BASE wxVsscanf(const wxScopedWCharBuffer& str, const wchar_t *format, va_list ap);
-int WXDLLIMPEXP_BASE wxVsscanf(const wxString& str, const char *format, va_list ap);
-int WXDLLIMPEXP_BASE wxVsscanf(const wxString& str, const wchar_t *format, va_list ap);
-int WXDLLIMPEXP_BASE wxVsscanf(const wxCStrData& str, const char *format, va_list ap);
-int WXDLLIMPEXP_BASE wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap);
-#endif // !__VISUALC__
-
-#endif /* _WX_WXCRTVARARG_H_ */
diff --git a/Source/3rd Party/wx/include/wx/wxprec.h b/Source/3rd Party/wx/include/wx/wxprec.h
index 6df252622..184914e6c 100644
--- a/Source/3rd Party/wx/include/wx/wxprec.h	
+++ b/Source/3rd Party/wx/include/wx/wxprec.h	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: wxprec.h 39484 2006-05-31 12:18:02Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,9 +17,10 @@
 #if defined(__VISUALC__)   || \
     defined(__DMC__)       || \
     defined(__VISAGECPP__) || \
+    defined(__MWERKS__)    || \
     defined(__WATCOMC__)   || \
     defined(__BORLANDC__)
-
+         
 
     // If user did not request NOCPH and we're not building using configure
     // then assume user wants precompiled headers.
@@ -35,9 +36,9 @@
 
 #ifdef WX_PRECOMP
 
-// include "wx/chartype.h" first to ensure that UNICODE macro is correctly set
+// include "wx/wxchar.h" first to ensure that UNICODE macro is correctly set
 // _before_ including <windows.h>
-#include "wx/chartype.h"
+#include "wx/wxchar.h"
 
 // include standard Windows headers
 #if defined(__WXMSW__)
@@ -48,11 +49,21 @@
     #include "wx/msw/missing.h"
 #endif
 
+// include all PalmOS headers at once
+#ifdef __WXPALMOS__
+#   include <PalmOS.h>
+#endif
+
 // include <os2.h>
 #ifdef __OS2__
 #   include "wx/os2/private.h"
 #endif
 
+// include mgl headers
+#ifdef __WXMGL__
+#   include "wx/mgl/private.h"
+#endif
+
 // include the most common wx headers
 #include "wx/wx.h"
 
diff --git a/Source/3rd Party/wx/include/wx/xlocale.h b/Source/3rd Party/wx/include/wx/xlocale.h
deleted file mode 100644
index 8f4c4838e..000000000
--- a/Source/3rd Party/wx/include/wx/xlocale.h	
+++ /dev/null
@@ -1,341 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xlocale.h
-// Purpose:     Header to provide some xlocale wrappers
-// Author:      Brian Vanderburg II, Vadim Zeitlin
-// Created:     2008-01-07
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Brian Vanderburg II
-//                  2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-/*
-    This header defines portable wrappers around xlocale foo_l() functions or
-    their MSVC proprietary _foo_l() equivalents when they are available and
-    implements these functions for the "C" locale [only] if they are not. This
-    allows the program running under the default user locale to still use "C"
-    locale for operations such as reading data from files where they are stored
-    using decimal point &c.
-
-    TODO: Currently only the character classification and transformation
-          functions and number <-> string functions, are implemented,
-          we also need at least
-            - formatted IO: scanf_l(), printf_l() &c
-            - time: strftime_l(), strptime_l()
- */
-
-#ifndef _WX_XLOCALE_H_
-#define _WX_XLOCALE_H_
-
-#include "wx/defs.h"    // wxUSE_XLOCALE
-
-#if wxUSE_XLOCALE
-
-#include "wx/crt.h"     // Includes wx/chartype.h, wx/wxcrt.h(wx/string.h)
-#include "wx/intl.h"    // wxLanguage
-
-// The platform-specific locale type
-// If wxXLocale_t is not defined, then only "C" locale support is provided
-#ifdef wxHAS_XLOCALE_SUPPORT
-    #if wxCHECK_VISUALC_VERSION(8) && !defined(__WXWINCE__)
-        typedef _locale_t wxXLocale_t;
-        #define wxXLOCALE_IDENT(name) _ ## name
-    #elif defined(HAVE_LOCALE_T)
-        #include <locale.h>
-        #include <xlocale.h>
-        #include <ctype.h>
-        #include <stdlib.h>
-
-        #if wxUSE_UNICODE
-            #include <wctype.h>
-        #endif
-
-        // Locale type and identifier name
-        typedef locale_t wxXLocale_t;
-
-        #define wxXLOCALE_IDENT(name) name
-    #else
-        #error "Unknown xlocale support"
-    #endif
-#endif // wxHAS_XLOCALE_SUPPORT
-
-
-// wxXLocale is a wrapper around the native type representing a locale.
-//
-// It is not to be confused with wxLocale, which handles actually changing the
-// locale, loading message catalogs, etc.  This just stores a locale value.
-// The similarity of names is unfortunate, but there doesn't seem to be any
-// better alternative right now. Perhaps by wxWidgets 4.0 better naming could
-// be used, or this class could become wxLocale (a wrapper for the value), and
-// some other class could be used to load the language catalogs or something
-// that would be clearer
-#ifdef wxHAS_XLOCALE_SUPPORT
-
-class WXDLLIMPEXP_BASE wxXLocale
-{
-public:
-    // Construct an uninitialized locale
-    wxXLocale() { m_locale = NULL; }
-
-    // Construct from a symbolic language constant
-    wxXLocale(wxLanguage lang);
-
-    // Construct from the given language string
-    wxXLocale(const char *loc) { Init(loc); }
-
-    // Destroy the locale
-    ~wxXLocale() { Free(); }
-
-
-    // Get the global "C" locale object
-    static wxXLocale& GetCLocale();
-
-    // Check if the object represents a valid locale (notice that without
-    // wxHAS_XLOCALE_SUPPORT the only valid locale is the "C" one)
-    bool IsOk() const { return m_locale != NULL; }
-
-    // Get the type
-    wxXLocale_t Get() const { return m_locale; }
-
-    bool operator== (const wxXLocale& loc) const
-        { return m_locale == loc.m_locale; }
-
-private:
-    // Special ctor for the "C" locale, it's only used internally as the user
-    // code is supposed to use GetCLocale()
-    wxXLocale(struct wxXLocaleCTag * WXUNUSED(dummy)) { Init("C"); }
-
-    // Create from the given language string (called from ctors)
-    void Init(const char *loc);
-
-    // Free the locale if it's non-NULL
-    void Free();
-
-
-    // The corresponding locale handle, NULL if invalid
-    wxXLocale_t m_locale;
-
-
-    // POSIX xlocale API provides a duplocale() function but MSVC locale API
-    // doesn't give us any means to copy a _locale_t object so we reduce the
-    // functionality to least common denominator here -- it shouldn't be a
-    // problem as copying the locale objects shouldn't be often needed
-    wxDECLARE_NO_COPY_CLASS(wxXLocale);
-};
-
-#else // !wxHAS_XLOCALE_SUPPORT
-
-// Skeleton version supporting only the "C" locale for the systems without
-// xlocale support
-class WXDLLIMPEXP_BASE wxXLocale
-{
-public:
-    // Construct an uninitialized locale
-    wxXLocale() { m_isC = false; }
-
-    // Construct from a symbolic language constant: unless the language is
-    // wxLANGUAGE_ENGLISH_US (which we suppose to be the same as "C" locale)
-    // the object will be invalid
-    wxXLocale(wxLanguage lang)
-    {
-        m_isC = lang == wxLANGUAGE_ENGLISH_US;
-    }
-
-    // Construct from the given language string: unless the string is "C" or
-    // "POSIX" the object will be invalid
-    wxXLocale(const char *loc)
-    {
-        m_isC = loc && (strcmp(loc, "C") == 0 || strcmp(loc, "POSIX") == 0);
-    }
-
-    // Default copy ctor, assignment operator and dtor are ok (or would be if
-    // we didn't use DECLARE_NO_COPY_CLASS() for consistency with the xlocale
-    // version)
-
-
-    // Get the global "C" locale object
-    static wxXLocale& GetCLocale();
-
-    // Check if the object represents a valid locale (notice that without
-    // wxHAS_XLOCALE_SUPPORT the only valid locale is the "C" one)
-    bool IsOk() const { return m_isC; }
-
-private:
-    // Special ctor for the "C" locale, it's only used internally as the user
-    // code is supposed to use GetCLocale()
-    wxXLocale(struct wxXLocaleCTag * WXUNUSED(dummy)) { m_isC = true; }
-
-    // Without xlocale support this class can only represent "C" locale, if
-    // this is false the object is invalid
-    bool m_isC;
-
-
-    // although it's not a problem to copy the objects of this class, we use
-    // this macro in this implementation for consistency with the xlocale-based
-    // one which can't be copied when using MSVC locale API
-    wxDECLARE_NO_COPY_CLASS(wxXLocale);
-};
-
-#endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT
-
-
-// A shorter synonym for the most commonly used locale object
-#define wxCLocale (wxXLocale::GetCLocale())
-extern WXDLLIMPEXP_DATA_BASE(wxXLocale) wxNullXLocale;
-
-// Wrappers for various functions:
-#ifdef wxHAS_XLOCALE_SUPPORT
-
-    // ctype functions
-    #define wxCRT_Isalnum_lA wxXLOCALE_IDENT(isalnum_l)
-    #define wxCRT_Isalpha_lA wxXLOCALE_IDENT(isalpha_l)
-    #define wxCRT_Iscntrl_lA wxXLOCALE_IDENT(iscntrl_l)
-    #define wxCRT_Isdigit_lA wxXLOCALE_IDENT(isdigit_l)
-    #define wxCRT_Isgraph_lA wxXLOCALE_IDENT(isgraph_l)
-    #define wxCRT_Islower_lA wxXLOCALE_IDENT(islower_l)
-    #define wxCRT_Isprint_lA wxXLOCALE_IDENT(isprint_l)
-    #define wxCRT_Ispunct_lA wxXLOCALE_IDENT(ispunct_l)
-    #define wxCRT_Isspace_lA wxXLOCALE_IDENT(isspace_l)
-    #define wxCRT_Isupper_lA wxXLOCALE_IDENT(isupper_l)
-    #define wxCRT_Isxdigit_lA wxXLOCALE_IDENT(isxdigit_l)
-    #define wxCRT_Tolower_lA wxXLOCALE_IDENT(tolower_l)
-    #define wxCRT_Toupper_lA wxXLOCALE_IDENT(toupper_l)
-
-    inline int wxIsalnum_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isalnum_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIsalpha_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isalpha_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIscntrl_l(char c, const wxXLocale& loc)
-        { return wxCRT_Iscntrl_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIsdigit_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isdigit_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIsgraph_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isgraph_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIslower_l(char c, const wxXLocale& loc)
-        { return wxCRT_Islower_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIsprint_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isprint_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIspunct_l(char c, const wxXLocale& loc)
-        { return wxCRT_Ispunct_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIsspace_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isspace_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIsupper_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isupper_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxIsxdigit_l(char c, const wxXLocale& loc)
-        { return wxCRT_Isxdigit_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxTolower_l(char c, const wxXLocale& loc)
-        { return wxCRT_Tolower_lA(static_cast<unsigned char>(c), loc.Get()); }
-    inline int wxToupper_l(char c, const wxXLocale& loc)
-        { return wxCRT_Toupper_lA(static_cast<unsigned char>(c), loc.Get()); }
-
-
-    // stdlib functions for numeric <-> string conversion
-    // NOTE: GNU libc does not have ato[fil]_l functions;
-    //       MSVC++8 does not have _strto[u]ll_l functions;
-    //       thus we take the minimal set of functions provided in both environments:
-
-    #define wxCRT_Strtod_lA wxXLOCALE_IDENT(strtod_l)
-    #define wxCRT_Strtol_lA wxXLOCALE_IDENT(strtol_l)
-    #define wxCRT_Strtoul_lA wxXLOCALE_IDENT(strtoul_l)
-
-    inline double wxStrtod_lA(const char *c, char **endptr, const wxXLocale& loc)
-        { return wxCRT_Strtod_lA(c, endptr, loc.Get()); }
-    inline long wxStrtol_lA(const char *c, char **endptr, int base, const wxXLocale& loc)
-        { return wxCRT_Strtol_lA(c, endptr, base, loc.Get()); }
-    inline unsigned long wxStrtoul_lA(const char *c, char **endptr, int base, const wxXLocale& loc)
-        { return wxCRT_Strtoul_lA(c, endptr, base, loc.Get()); }
-
-    #if wxUSE_UNICODE
-
-        // ctype functions
-        #define wxCRT_Isalnum_lW wxXLOCALE_IDENT(iswalnum_l)
-        #define wxCRT_Isalpha_lW wxXLOCALE_IDENT(iswalpha_l)
-        #define wxCRT_Iscntrl_lW wxXLOCALE_IDENT(iswcntrl_l)
-        #define wxCRT_Isdigit_lW wxXLOCALE_IDENT(iswdigit_l)
-        #define wxCRT_Isgraph_lW wxXLOCALE_IDENT(iswgraph_l)
-        #define wxCRT_Islower_lW wxXLOCALE_IDENT(iswlower_l)
-        #define wxCRT_Isprint_lW wxXLOCALE_IDENT(iswprint_l)
-        #define wxCRT_Ispunct_lW wxXLOCALE_IDENT(iswpunct_l)
-        #define wxCRT_Isspace_lW wxXLOCALE_IDENT(iswspace_l)
-        #define wxCRT_Isupper_lW wxXLOCALE_IDENT(iswupper_l)
-        #define wxCRT_Isxdigit_lW wxXLOCALE_IDENT(iswxdigit_l)
-        #define wxCRT_Tolower_lW wxXLOCALE_IDENT(towlower_l)
-        #define wxCRT_Toupper_lW wxXLOCALE_IDENT(towupper_l)
-
-        inline int wxIsalnum_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Isalnum_lW(c, loc.Get()); }
-        inline int wxIsalpha_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Isalpha_lW(c, loc.Get()); }
-        inline int wxIscntrl_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Iscntrl_lW(c, loc.Get()); }
-        inline int wxIsdigit_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Isdigit_lW(c, loc.Get()); }
-        inline int wxIsgraph_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Isgraph_lW(c, loc.Get()); }
-        inline int wxIslower_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Islower_lW(c, loc.Get()); }
-        inline int wxIsprint_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Isprint_lW(c, loc.Get()); }
-        inline int wxIspunct_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Ispunct_lW(c, loc.Get()); }
-        inline int wxIsspace_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Isspace_lW(c, loc.Get()); }
-        inline int wxIsupper_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Isupper_lW(c, loc.Get()); }
-        inline int wxIsxdigit_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Isxdigit_lW(c, loc.Get()); }
-        inline wchar_t wxTolower_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Tolower_lW(c, loc.Get()); }
-        inline wchar_t wxToupper_l(wchar_t c, const wxXLocale& loc)
-            { return wxCRT_Toupper_lW(c, loc.Get()); }
-
-
-        // stdlib functions for numeric <-> string conversion
-        // (see notes above about missing functions)
-        #define wxCRT_Strtod_lW wxXLOCALE_IDENT(wcstod_l)
-        #define wxCRT_Strtol_lW wxXLOCALE_IDENT(wcstol_l)
-        #define wxCRT_Strtoul_lW wxXLOCALE_IDENT(wcstoul_l)
-
-        inline double wxStrtod_l(const wchar_t *c, wchar_t **endptr, const wxXLocale& loc)
-            { return wxCRT_Strtod_lW(c, endptr, loc.Get()); }
-        inline long wxStrtol_l(const wchar_t *c, wchar_t **endptr, int base, const wxXLocale& loc)
-            { return wxCRT_Strtol_lW(c, endptr, base, loc.Get()); }
-        inline unsigned long wxStrtoul_l(const wchar_t *c, wchar_t **endptr, int base, const wxXLocale& loc)
-            { return wxCRT_Strtoul_lW(c, endptr, base, loc.Get()); }
-    #else // !wxUSE_UNICODE
-        inline double wxStrtod_l(const char *c, char **endptr, const wxXLocale& loc)
-            { return wxCRT_Strtod_lA(c, endptr, loc.Get()); }
-        inline long wxStrtol_l(const char *c, char **endptr, int base, const wxXLocale& loc)
-            { return wxCRT_Strtol_lA(c, endptr, base, loc.Get()); }
-        inline unsigned long wxStrtoul_l(const char *c, char **endptr, int base, const wxXLocale& loc)
-            { return wxCRT_Strtoul_lA(c, endptr, base, loc.Get()); }
-    #endif // wxUSE_UNICODE
-#else // !wxHAS_XLOCALE_SUPPORT
-    // ctype functions
-    int WXDLLIMPEXP_BASE wxIsalnum_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIsalpha_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIscntrl_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIsdigit_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIsgraph_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIslower_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIsprint_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIspunct_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIsspace_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIsupper_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxIsxdigit_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxTolower_l(const wxUniChar& c, const wxXLocale& loc);
-    int WXDLLIMPEXP_BASE wxToupper_l(const wxUniChar& c, const wxXLocale& loc);
-
-    // stdlib functions
-    double WXDLLIMPEXP_BASE wxStrtod_l(const wchar_t* str, wchar_t **endptr, const wxXLocale& loc);
-    double WXDLLIMPEXP_BASE wxStrtod_l(const char* str, char **endptr, const wxXLocale& loc);
-    long WXDLLIMPEXP_BASE wxStrtol_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc);
-    long WXDLLIMPEXP_BASE wxStrtol_l(const char* str, char **endptr, int base, const wxXLocale& loc);
-    unsigned long WXDLLIMPEXP_BASE wxStrtoul_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc);
-    unsigned long WXDLLIMPEXP_BASE wxStrtoul_l(const char* str, char **endptr, int base, const wxXLocale& loc);
-
-#endif // wxHAS_XLOCALE_SUPPORT/!wxHAS_XLOCALE_SUPPORT
-
-#endif // wxUSE_XLOCALE
-
-#endif // _WX_XLOCALE_H_
diff --git a/Source/3rd Party/wx/include/wx/xpmdecod.h b/Source/3rd Party/wx/include/wx/xpmdecod.h
index fc141adf1..8cb516ae3 100644
--- a/Source/3rd Party/wx/include/wx/xpmdecod.h	
+++ b/Source/3rd Party/wx/include/wx/xpmdecod.h	
@@ -2,7 +2,7 @@
 // Name:        wx/xpmdecod.h
 // Purpose:     wxXPMDecoder, XPM reader for wxImage and wxBitmap
 // Author:      Vaclav Slavik
-// CVS-ID:      $Id$
+// CVS-ID:      $Id: xpmdecod.h 49804 2007-11-10 01:09:42Z VZ $
 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,7 +21,7 @@ class WXDLLIMPEXP_FWD_BASE wxInputStream;
 // wxXPMDecoder class
 // --------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxXPMDecoder
+class WXDLLEXPORT wxXPMDecoder
 {
 public:
     // constructor, destructor, etc.
@@ -30,20 +30,15 @@ public:
 
 #if wxUSE_STREAMS
     // Is the stream XPM file?
-    // NOTE: this function modifies the current stream position
     bool CanRead(wxInputStream& stream);
-
     // Read XPM file from the stream, parse it and create image from it
     wxImage ReadFile(wxInputStream& stream);
 #endif
-
     // Read directly from XPM data (as passed to wxBitmap ctor):
     wxImage ReadData(const char* const* xpm_data);
-
 #ifdef __BORLANDC__
     // needed for Borland 5.5
-    wxImage ReadData(char** xpm_data)
-        { return ReadData(const_cast<const char* const*>(xpm_data)); }
+    wxImage ReadData(char** xpm_data) { return ReadData(wx_const_cast(const char* const*, xpm_data)); }
 #endif
 };
 
diff --git a/Source/3rd Party/wx/include/wx/xti.h b/Source/3rd Party/wx/include/wx/xti.h
index e75312c15..5fd35efb4 100644
--- a/Source/3rd Party/wx/include/wx/xti.h	
+++ b/Source/3rd Party/wx/include/wx/xti.h	
@@ -2,9 +2,9 @@
 // Name:        wx/xti.h
 // Purpose:     runtime metadata information (extended class info)
 // Author:      Stefan Csomor
-// Modified by: Francesco Montorsi
+// Modified by:
 // Created:     27/07/03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: xti.h 52488 2008-03-14 14:13:05Z JS $
 // Copyright:   (c) 1997 Julian Smart
 //              (c) 2003 Stefan Csomor
 // Licence:     wxWindows licence
@@ -20,11 +20,11 @@
 // This means we have the following domains :
 //
 // - Type Information for categorizing built in types as well as custom types
-//   this includes information about enums, their values and names
-// - Type safe value storage : a kind of wxVariant, called right now wxAny
-//   which will be merged with wxVariant
+// this includes information about enums, their values and names
+// - Type safe value storage : a kind of wxVariant, called right now wxxVariant
+// which will be merged with wxVariant
 // - Property Information and Property Accessors providing access to a class'
-//   values and exposed event delegates
+// values and exposed event delegates
 // - Information about event handlers
 // - extended Class Information for accessing all these
 
@@ -33,96 +33,1588 @@
 // ----------------------------------------------------------------------------
 
 #include "wx/defs.h"
+#include "wx/memory.h"
+#include "wx/flags.h"
+#include "wx/string.h"
+#include "wx/arrstr.h"
+#include "wx/hashmap.h"
+#include "wx/log.h"
+#include  "wx/intl.h"
 
-#if wxUSE_EXTENDED_RTTI
+#include <typeinfo>
 
-class WXDLLIMPEXP_FWD_BASE wxAny;
-class WXDLLIMPEXP_FWD_BASE wxAnyList;
-class WXDLLIMPEXP_FWD_BASE wxObject;
-class WXDLLIMPEXP_FWD_BASE wxString;
-class WXDLLIMPEXP_FWD_BASE wxClassInfo;
-class WXDLLIMPEXP_FWD_BASE wxHashTable;
-class WXDLLIMPEXP_FWD_BASE wxObject;
-class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;
-class WXDLLIMPEXP_FWD_BASE wxHashTable;
-class WXDLLIMPEXP_FWD_BASE wxHashTable_Node;
+// we will move this later to defs.h
 
-class WXDLLIMPEXP_FWD_BASE wxStringToAnyHashMap;
-class WXDLLIMPEXP_FWD_BASE wxPropertyInfoMap;
-class WXDLLIMPEXP_FWD_BASE wxPropertyAccessor;
-class WXDLLIMPEXP_FWD_BASE wxObjectAllocatorAndCreator;
-class WXDLLIMPEXP_FWD_BASE wxObjectAllocator;
+#if defined(__GNUC__) && !wxCHECK_GCC_VERSION( 3 , 4 )
+#  define wxUSE_MEMBER_TEMPLATES 0
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+#  define wxUSE_MEMBER_TEMPLATES 0
+#  define wxUSE_FUNC_TEMPLATE_POINTER 0
+#endif
+
+#ifndef wxUSE_MEMBER_TEMPLATES
+#  define wxUSE_MEMBER_TEMPLATES 1
+#endif
+
+#ifndef wxUSE_FUNC_TEMPLATE_POINTER
+#  define wxUSE_FUNC_TEMPLATE_POINTER 1
+#endif
+
+#if wxUSE_MEMBER_TEMPLATES
+#  define wxTEMPLATED_MEMBER_CALL( method , type ) method<type>()
+#  define wxTEMPLATED_MEMBER_FIX( type )
+#else
+#  define wxTEMPLATED_MEMBER_CALL( method , type ) method((type*)NULL)
+#  define wxTEMPLATED_MEMBER_FIX( type ) type* =NULL
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER <= 1200
+#  define wxTEMPLATED_FUNCTION_FIX( type ) , wxTEMPLATED_MEMBER_FIX(type)
+#  define wxINFUNC_CLASS_TYPE_FIX( type ) typedef type type;
+#else
+#  define wxTEMPLATED_FUNCTION_FIX( type )
+#  define wxINFUNC_CLASS_TYPE_FIX( type )
+#endif
+
+#define EMPTY_MACROVALUE /**/
+
+class WXDLLIMPEXP_BASE wxObject;
+class WXDLLIMPEXP_BASE wxClassInfo;
+class WXDLLIMPEXP_BASE wxDynamicClassInfo;
+class WXDLLIMPEXP_BASE wxHashTable;
+class WXDLLIMPEXP_BASE wxObjectRefData;
+class WXDLLIMPEXP_BASE wxEvent;
+class WXDLLIMPEXP_BASE wxEvtHandler;
+
+typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
+
+#if wxUSE_FUNC_TEMPLATE_POINTER
+#  define wxTO_STRING(type) wxToStringConverter<type>
+#  define wxTO_STRING_IMP(type)
+#  define wxFROM_STRING(type) wxFromStringConverter<type>
+#  define wxFROM_STRING_IMP(type)
+#else
+#  define wxTO_STRING(type) ToString##type
+#  define wxTO_STRING_IMP(type) inline void ToString##type( const wxxVariant& data , wxString &result ) { wxToStringConverter<type>(data, result); }
+#  define wxFROM_STRING(type) FromString##type
+#  define wxFROM_STRING_IMP(type) inline void FromString##type( const wxString& data , wxxVariant &result ) { wxFromStringConverter<type>(data, result); }
+#endif
+
+// ----------------------------------------------------------------------------
+// Enum Support
+//
+// In the header files there would no change from pure c++ code, in the
+// implementation, an enum would have
+// to be enumerated eg :
+//
+// wxBEGIN_ENUM( wxFlavor )
+//   wxENUM_MEMBER( Vanilla )
+//   wxENUM_MEMBER( Chocolate )
+//   wxENUM_MEMBER( Strawberry )
+// wxEND_ENUM( wxFlavor )
+// ----------------------------------------------------------------------------
+
+struct WXDLLIMPEXP_BASE wxEnumMemberData
+{
+    const wxChar*   m_name;
+    int             m_value;
+};
+
+class WXDLLIMPEXP_BASE wxEnumData
+{
+public :
+    wxEnumData( wxEnumMemberData* data ) ;
+
+    // returns true if the member has been found and sets the int value
+    // pointed to accordingly (if ptr != null )
+    // if not found returns false, value left unchanged
+    bool HasEnumMemberValue( const wxChar *name , int *value = NULL ) const ;
+
+    // returns the value of the member, if not found in debug mode an
+    // assert is issued, in release 0 is returned
+    int GetEnumMemberValue(const wxChar *name ) const ;
+
+    // returns the name of the enum member having the passed in value
+    // returns an emtpy string if not found
+    const wxChar *GetEnumMemberName(int value) const ;
+
+    // returns the number of members in this enum
+    int GetEnumCount() const { return m_count ; }
+
+    // returns the value of the nth member
+    int GetEnumMemberValueByIndex( int n ) const ;
+
+    // returns the value of the nth member
+    const wxChar *GetEnumMemberNameByIndex( int n ) const ;
+private :
+    wxEnumMemberData *m_members;
+    int m_count ;
+};
+
+#define wxBEGIN_ENUM( e ) \
+    wxEnumMemberData s_enumDataMembers##e[] = {
+
+#define wxENUM_MEMBER( v ) { wxT(#v), v } ,
+
+#define wxEND_ENUM( e ) { NULL , 0 } } ; \
+    wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
+    wxEnumData *wxGetEnumData(e) { return &s_enumData##e ; } \
+    template<>  void wxStringReadValue(const wxString& s , e &data ) \
+{ \
+    data = (e) s_enumData##e.GetEnumMemberValue(s) ; \
+} \
+    template<>  void wxStringWriteValue(wxString &s , const e &data ) \
+{ \
+    s =  s_enumData##e.GetEnumMemberName((int)data) ; \
+} \
+    void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant((e)data) ;} \
+    void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e) ;} \
+    wxTO_STRING_IMP( e ) \
+    wxFROM_STRING_IMP( e ) \
+    wxEnumTypeInfo s_typeInfo##e(wxT_ENUM , &s_enumData##e , &wxTO_STRING( e ) , &wxFROM_STRING( e ) , &ToLong##e , &FromLong##e , typeid(e).name() ) ;
+
+// ----------------------------------------------------------------------------
+// Set Support
+//
+// in the header :
+//
+// enum wxFlavor
+// {
+//  Vanilla,
+//  Chocolate,
+//  Strawberry,
+// };
+//
+// typedef wxBitset<wxFlavor> wxCoupe ;
+//
+// in the implementation file :
+//
+// wxBEGIN_ENUM( wxFlavor )
+//  wxENUM_MEMBER( Vanilla )
+//  wxENUM_MEMBER( Chocolate )
+//  wxENUM_MEMBER( Strawberry )
+// wxEND_ENUM( wxFlavor )
+//
+// wxIMPLEMENT_SET_STREAMING( wxCoupe , wxFlavor )
+//
+// implementation note : no partial specialization for streaming, but a delegation to a
+// different class
+//
+// ----------------------------------------------------------------------------
+
+// in order to remove dependancy on string tokenizer
+void WXDLLIMPEXP_BASE wxSetStringToArray( const wxString &s , wxArrayString &array ) ;
+
+template<typename e>
+void wxSetFromString(const wxString &s , wxBitset<e> &data )
+{
+    wxEnumData* edata = wxGetEnumData((e) 0) ;
+    data.reset() ;
+
+    wxArrayString array ;
+    wxSetStringToArray( s , array ) ;
+    wxString flag;
+    for ( int i = 0 ; i < array.Count() ; ++i )
+    {
+        flag = array[i] ;
+        int ivalue ;
+        if ( edata->HasEnumMemberValue( flag , &ivalue ) )
+        {
+            data.set( (e) ivalue ) ;
+        }
+    }
+}
+
+template<typename e>
+void wxSetToString( wxString &s , const wxBitset<e> &data )
+{
+    wxEnumData* edata = wxGetEnumData((e) 0) ;
+    int count = edata->GetEnumCount() ;
+    int i ;
+    s.Clear() ;
+    for ( i = 0 ; i < count ; i++ )
+    {
+        e value = (e) edata->GetEnumMemberValueByIndex(i) ;
+        if ( data.test( value ) )
+        {
+            // this could also be done by the templated calls
+            if ( !s.empty() )
+                s +=wxT("|") ;
+            s += edata->GetEnumMemberNameByIndex(i) ;
+        }
+    }
+}
+
+#define wxIMPLEMENT_SET_STREAMING(SetName,e) \
+    template<>  void wxStringReadValue(const wxString &s , wxBitset<e> &data ) \
+{ \
+    wxSetFromString( s , data ) ; \
+} \
+    template<>  void wxStringWriteValue( wxString &s , const wxBitset<e> &data ) \
+{ \
+    wxSetToString( s , data ) ; \
+} \
+    void FromLong##SetName( long data , wxxVariant& result ) { result = wxxVariant(SetName((unsigned long)data)) ;} \
+    void ToLong##SetName( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , SetName).to_ulong() ;} \
+    wxTO_STRING_IMP( SetName ) \
+    wxFROM_STRING_IMP( SetName ) \
+    wxEnumTypeInfo s_typeInfo##SetName(wxT_SET , &s_enumData##e , &wxTO_STRING( SetName ) , &wxFROM_STRING( SetName ) , &ToLong##SetName , &FromLong##SetName, typeid(SetName).name() ) ;  \
+}
+
+template<typename e>
+void wxFlagsFromString(const wxString &s , e &data )
+{
+    wxEnumData* edata = wxGetEnumData((e*) 0) ;
+    data.m_data = 0 ;
+
+    wxArrayString array ;
+    wxSetStringToArray( s , array ) ;
+    wxString flag;
+    for ( size_t i = 0 ; i < array.Count() ; ++i )
+    {
+        flag = array[i] ;
+        int ivalue ;
+        if ( edata->HasEnumMemberValue( flag , &ivalue ) )
+        {
+            data.m_data |= ivalue ;
+        }
+    }
+}
+
+template<typename e>
+void wxFlagsToString( wxString &s , const e& data )
+{
+    wxEnumData* edata = wxGetEnumData((e*) 0) ;
+    int count = edata->GetEnumCount() ;
+    int i ;
+    s.Clear() ;
+    long dataValue = data.m_data ;
+    for ( i = 0 ; i < count ; i++ )
+    {
+        int value = edata->GetEnumMemberValueByIndex(i) ;
+        // make this to allow for multi-bit constants to work
+        if ( value && ( dataValue & value ) == value )
+        {
+            // clear the flags we just set
+            dataValue &= ~value ;
+            // this could also be done by the templated calls
+            if ( !s.empty() )
+                s +=wxT("|") ;
+            s += edata->GetEnumMemberNameByIndex(i) ;
+        }
+    }
+}
+
+#define wxBEGIN_FLAGS( e ) \
+    wxEnumMemberData s_enumDataMembers##e[] = {
+
+#define wxFLAGS_MEMBER( v ) { wxT(#v), v } ,
+
+#define wxEND_FLAGS( e ) { NULL , 0 } } ; \
+    wxEnumData s_enumData##e( s_enumDataMembers##e ) ; \
+    wxEnumData *wxGetEnumData(e*) { return &s_enumData##e ; } \
+    template<>  void wxStringReadValue(const wxString &s , e &data ) \
+{ \
+    wxFlagsFromString<e>( s , data ) ; \
+} \
+    template<>  void wxStringWriteValue( wxString &s , const e& data ) \
+{ \
+    wxFlagsToString<e>( s , data ) ; \
+} \
+    void FromLong##e( long data , wxxVariant& result ) { result = wxxVariant(e(data)) ;} \
+    void ToLong##e( const wxxVariant& data , long &result ) { result = (long) data.wxTEMPLATED_MEMBER_CALL(Get , e).m_data ;} \
+    wxTO_STRING_IMP( e ) \
+    wxFROM_STRING_IMP( e ) \
+    wxEnumTypeInfo s_typeInfo##e(wxT_SET , &s_enumData##e , &wxTO_STRING( e ) , &wxFROM_STRING( e ) , &ToLong##e , &FromLong##e, typeid(e).name()  ) ;
+// ----------------------------------------------------------------------------
+// Type Information
+// ----------------------------------------------------------------------------
+//
+//
+//  All data exposed by the RTTI is characterized using the following classes.
+//  The first characterization is done by wxTypeKind. All enums up to and including
+//  wxT_CUSTOM represent so called simple types. These cannot be divided any further.
+//  They can be converted to and from wxStrings, that's all.
 
 
-#define wx_dynamic_cast(t, x) dynamic_cast<t>(x)
+enum wxTypeKind
+{
+    wxT_VOID = 0, // unknown type
+    wxT_BOOL,
+    wxT_CHAR,
+    wxT_UCHAR,
+    wxT_INT,
+    wxT_UINT,
+    wxT_LONG,
+    wxT_ULONG,
+    wxT_FLOAT,
+    wxT_DOUBLE,
+    wxT_STRING, // must be wxString
+    wxT_SET, // must be wxBitset<> template
+    wxT_ENUM,
+    wxT_CUSTOM, // user defined type (e.g. wxPoint)
 
-#include "wx/xtitypes.h"
-#include "wx/xtihandler.h"
+    wxT_LAST_SIMPLE_TYPE_KIND = wxT_CUSTOM ,
 
+    wxT_OBJECT_PTR, // object reference
+    wxT_OBJECT , // embedded object
+    wxT_COLLECTION , // collection
+
+    wxT_DELEGATE , // for connecting against an event source
+
+    wxT_LAST_TYPE_KIND = wxT_DELEGATE // sentinel for bad data, asserts, debugging
+};
+
+class WXDLLIMPEXP_BASE wxxVariant ;
+class WXDLLIMPEXP_BASE wxTypeInfo ;
+
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxTypeInfo* , wxTypeInfoMap , class WXDLLIMPEXP_BASE ) ;
+
+class WXDLLIMPEXP_BASE wxTypeInfo
+{
+public :
+    typedef void (*converterToString_t)( const wxxVariant& data , wxString &result ) ;
+    typedef void (*converterFromString_t)( const wxString& data , wxxVariant &result ) ;
+
+    wxTypeInfo(wxTypeKind kind,
+               converterToString_t to = NULL, converterFromString_t from = NULL,
+               const wxString &name = wxEmptyString):
+            m_toString(to), m_fromString(from), m_kind(kind), m_name(name)
+    {
+        Register();
+    }
+#if wxUSE_UNICODE
+    wxTypeInfo(wxTypeKind kind,
+               converterToString_t to, converterFromString_t from,
+               const char *name):
+            m_toString(to), m_fromString(from), m_kind(kind), m_name(wxString::FromAscii(name))
+    {
+        Register();
+    }
+#endif
+
+    virtual ~wxTypeInfo()
+    {
+        Unregister() ;
+    }
+
+    // return the kind of this type (wxT_... constants)
+    wxTypeKind GetKind() const { return m_kind ; }
+
+    // returns the unique name of this type
+    const wxString& GetTypeName() const { return m_name ; }
+
+    // is this type a delegate type
+    bool IsDelegateType() const { return m_kind == wxT_DELEGATE ; }
+
+    // is this type a custom type
+    bool IsCustomType() const { return m_kind == wxT_CUSTOM ; }
+
+    // is this type an object type
+    bool IsObjectType() const { return m_kind == wxT_OBJECT || m_kind == wxT_OBJECT_PTR ; }
+
+    // can the content of this type be converted to and from strings ?
+    bool HasStringConverters() const { return m_toString != NULL && m_fromString != NULL ; }
+
+    // convert a wxxVariant holding data of this type into a string
+    void ConvertToString( const wxxVariant& data , wxString &result ) const
+
+    { if ( m_toString ) (*m_toString)( data , result ) ; else wxLogError( _("String conversions not supported") ) ; }
+
+    // convert a string into a wxxVariant holding the corresponding data in this type
+    void ConvertFromString( const wxString& data , wxxVariant &result ) const
+    { if( m_fromString ) (*m_fromString)( data , result ) ; else wxLogError( _("String conversions not supported") ) ; }
+
+#if wxUSE_UNICODE
+    static wxTypeInfo        *FindType(const char *typeName) { return FindType( wxString::FromAscii(typeName) ) ; }
+#endif
+    static wxTypeInfo        *FindType(const wxChar *typeName);
+
+private :
+
+    void Register();
+    void Unregister();
+
+    converterToString_t m_toString ;
+    converterFromString_t m_fromString ;
+
+    static wxTypeInfoMap*      ms_typeTable ;
+
+    wxTypeKind m_kind;
+    wxString m_name;
+};
+
+class WXDLLIMPEXP_BASE wxBuiltInTypeInfo : public wxTypeInfo
+{
+public :
+    wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to = NULL , converterFromString_t from = NULL , const wxString &name = wxEmptyString ) :
+       wxTypeInfo( kind , to , from , name )
+       { wxASSERT_MSG( GetKind() < wxT_SET , wxT("Illegal Kind for Base Type") ) ; }
+#if wxUSE_UNICODE
+    wxBuiltInTypeInfo( wxTypeKind kind , converterToString_t to  , converterFromString_t from  , const char *name  ) :
+       wxTypeInfo( kind , to , from , name )
+       { wxASSERT_MSG( GetKind() < wxT_SET , wxT("Illegal Kind for Base Type") ) ; }
+#endif
+} ;
+
+class WXDLLIMPEXP_BASE wxCustomTypeInfo : public wxTypeInfo
+{
+public :
+    wxCustomTypeInfo( const wxString &name , converterToString_t to , converterFromString_t from ) :
+       wxTypeInfo( wxT_CUSTOM , to , from , name )
+       {}
+#if wxUSE_UNICODE
+    wxCustomTypeInfo( const char *name  , converterToString_t to , converterFromString_t from ) :
+       wxTypeInfo( wxT_CUSTOM , to , from , name )
+       {}
+#endif
+} ;
+
+class WXDLLIMPEXP_BASE wxEnumTypeInfo : public wxTypeInfo
+{
+public :
+    typedef void (*converterToLong_t)( const wxxVariant& data , long &result ) ;
+    typedef void (*converterFromLong_t)( long data , wxxVariant &result ) ;
+
+    wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to , converterFromString_t from ,
+        converterToLong_t toLong , converterFromLong_t fromLong , const wxString &name  ) :
+    wxTypeInfo( kind , to , from , name ) , m_toLong( toLong ) , m_fromLong( fromLong )
+    { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_enumInfo = enumInfo ;}
+
+#if wxUSE_UNICODE
+    wxEnumTypeInfo( wxTypeKind kind , wxEnumData* enumInfo , converterToString_t to , converterFromString_t from ,
+        converterToLong_t toLong , converterFromLong_t fromLong , const char * name   ) :
+    wxTypeInfo( kind , to , from , name ) , m_toLong( toLong ) , m_fromLong( fromLong )
+    { wxASSERT_MSG( kind == wxT_ENUM || kind == wxT_SET , wxT("Illegal Kind for Enum Type")) ; m_enumInfo = enumInfo ;}
+#endif
+    const wxEnumData* GetEnumData() const { return m_enumInfo ; }
+
+    // convert a wxxVariant holding data of this type into a long
+    void ConvertToLong( const wxxVariant& data , long &result ) const
+
+    { if( m_toLong ) (*m_toLong)( data , result ) ; else wxLogError( _("Long Conversions not supported") ) ; }
+
+    // convert a long into a wxxVariant holding the corresponding data in this type
+    void ConvertFromLong( long data , wxxVariant &result ) const
+    { if( m_fromLong ) (*m_fromLong)( data , result ) ; else wxLogError( _("Long Conversions not supported") ) ;}
+
+private :
+    converterToLong_t m_toLong ;
+    converterFromLong_t m_fromLong ;
+
+    wxEnumData *m_enumInfo; // Kind == wxT_ENUM or Kind == wxT_SET
+} ;
+
+class WXDLLIMPEXP_BASE wxClassTypeInfo : public wxTypeInfo
+{
+public :
+    wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to = NULL , converterFromString_t from = NULL , const wxString &name = wxEmptyString) ;
+#if wxUSE_UNICODE
+    wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to  , converterFromString_t from  , const char *name ) ;
+#endif
+    const wxClassInfo *GetClassInfo() const { return m_classInfo ; }
+private :
+    wxClassInfo *m_classInfo; // Kind == wxT_OBJECT - could be NULL
+} ;
+
+class WXDLLIMPEXP_BASE wxCollectionTypeInfo : public wxTypeInfo
+{
+public :
+    wxCollectionTypeInfo( const wxString &elementName , converterToString_t to , converterFromString_t from  , const wxString &name) :
+       wxTypeInfo( wxT_COLLECTION , to , from , name )
+       { m_elementTypeName = elementName ; m_elementType = NULL ;}
+#if wxUSE_UNICODE
+    wxCollectionTypeInfo( const char *elementName , converterToString_t to , converterFromString_t from  , const char *name ) :
+       wxTypeInfo( wxT_COLLECTION , to , from , name )
+       { m_elementTypeName = wxString::FromAscii( elementName ) ; m_elementType = NULL ;}
+#endif
+       const wxTypeInfo* GetElementType() const
+       {
+           if ( m_elementType == NULL )
+               m_elementType = wxTypeInfo::FindType( m_elementTypeName ) ;
+           return m_elementType ; }
+private :
+    mutable wxTypeInfo * m_elementType ;
+    wxString    m_elementTypeName ;
+} ;
+
+// a delegate is an exposed event source
+
+class WXDLLIMPEXP_BASE wxDelegateTypeInfo : public wxTypeInfo
+{
+public :
+    wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ;
+    wxDelegateTypeInfo( int eventType , int lastEventType, wxClassInfo* eventClass , converterToString_t to = NULL , converterFromString_t from = NULL ) ;
+    int GetEventType() const { return m_eventType ; }
+    int GetLastEventType() const { return m_lastEventType ; }
+    const wxClassInfo* GetEventClass() const { return m_eventClass ; }
+private :
+    const wxClassInfo *m_eventClass; // (extended will merge into classinfo)
+    int m_eventType ;
+    int m_lastEventType ;
+} ;
+
+template<typename T> const wxTypeInfo* wxGetTypeInfo( T * ) { return wxTypeInfo::FindType(typeid(T).name()) ; }
+
+// this macro is for usage with custom, non-object derived classes and structs, wxPoint is such a custom type
+
+#if wxUSE_FUNC_TEMPLATE_POINTER
+#define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \
+    wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &toString , &fromString) ;
+#else
+#define wxCUSTOM_TYPE_INFO( e , toString , fromString ) \
+    void ToString##e( const wxxVariant& data , wxString &result ) { toString(data, result); } \
+    void FromString##e( const wxString& data , wxxVariant &result ) { fromString(data, result); } \
+    wxCustomTypeInfo s_typeInfo##e(typeid(e).name() , &ToString##e , &FromString##e) ;
+#endif
+
+#define wxCOLLECTION_TYPE_INFO( element , collection ) \
+    wxCollectionTypeInfo s_typeInfo##collection( typeid(element).name() , NULL , NULL , typeid(collection).name() ) ;
+
+// sometimes a compiler invents specializations that are nowhere called, use this macro to satisfy the refs, currently
+// we don't have to play tricks, but if we will have to according to the compiler, we will use that macro for that
+
+#define wxILLEGAL_TYPE_SPECIALIZATION( a )
+
+// ----------------------------------------------------------------------------
+// wxxVariant as typesafe data holder
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxxVariantData
+{
+public:
+    virtual ~wxxVariantData() {}
+
+    // return a heap allocated duplicate
+    virtual wxxVariantData* Clone() const = 0 ;
+
+    // returns the type info of the contentc
+    virtual const wxTypeInfo* GetTypeInfo() const = 0 ;
+} ;
+
+template<typename T> class wxxVariantDataT : public wxxVariantData
+{
+public:
+    wxxVariantDataT(const T& d) : m_data(d) {}
+    virtual ~wxxVariantDataT() {}
+
+    // get a ref to the stored data
+    T & Get() { return m_data; }
+
+    // get a const ref to the stored data
+    const T & Get() const { return m_data; }
+
+    // set the data
+    void Set(const T& d) { m_data =  d; }
+
+    // return a heap allocated duplicate
+    virtual wxxVariantData* Clone() const { return new wxxVariantDataT<T>( Get() ) ; }
+
+    // returns the type info of the contentc
+    virtual const wxTypeInfo* GetTypeInfo() const { return wxGetTypeInfo( (T*) NULL ) ; }
+
+private:
+    T m_data;
+};
+
+class WXDLLIMPEXP_BASE wxxVariant
+{
+public :
+    wxxVariant() { m_data = NULL ; }
+    wxxVariant( wxxVariantData* data , const wxString& name = wxEmptyString ) : m_data(data) , m_name(name) {}
+    wxxVariant( const wxxVariant &d ) { if ( d.m_data ) m_data = d.m_data->Clone() ; else m_data = NULL ; m_name = d.m_name ; }
+
+    template<typename T> wxxVariant( const T& data , const wxString& name = wxEmptyString ) :
+    m_data(new wxxVariantDataT<T>(data) ), m_name(name) {}
+
+    ~wxxVariant() { delete m_data ; }
+
+    // get a ref to the stored data
+    template<typename T> T& Get(wxTEMPLATED_MEMBER_FIX(T))
+    {
+        wxxVariantDataT<T> *dataptr = dynamic_cast<wxxVariantDataT<T>*> (m_data) ;
+        wxASSERT_MSG( dataptr , wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ) ;
+        return dataptr->Get() ;
+    }
+
+    // get a ref to the stored data
+    template<typename T> const T& Get(wxTEMPLATED_MEMBER_FIX(T)) const
+    {
+        const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
+        wxASSERT_MSG( dataptr , wxString::Format(wxT("Cast to %s not possible"), typeid(T).name()) ) ;
+        return dataptr->Get() ;
+    }
+
+    bool IsEmpty() const { return m_data == NULL ; }
+
+    template<typename T> bool HasData(wxTEMPLATED_MEMBER_FIX(T)) const
+    {
+        const wxxVariantDataT<T> *dataptr = dynamic_cast<const wxxVariantDataT<T>*> (m_data) ;
+        return dataptr != NULL ;
+    }
+
+    // stores the data
+    template<typename T> void Set(const T& data) const
+    {
+        delete m_data ;
+        m_data = new wxxVariantDataT<T>(data) ;
+    }
+
+    wxxVariant& operator=(const wxxVariant &d)
+    {
+        delete m_data;
+        m_data = d.m_data ? d.m_data->Clone() : NULL ;
+        m_name = d.m_name ;
+        return *this ;
+    }
+
+    // gets the stored data casted to a wxObject* , returning NULL if cast is not possible
+    wxObject* GetAsObject() ;
+
+    // get the typeinfo of the stored object
+    const wxTypeInfo* GetTypeInfo() const { return m_data->GetTypeInfo() ; }
+
+    // returns this value as string
+    wxString GetAsString() const
+    {
+        wxString s ;
+        GetTypeInfo()->ConvertToString( *this , s ) ;
+        return s ;
+    }
+    const wxString& GetName() const { return m_name ; }
+private :
+    wxxVariantData* m_data ;
+    wxString m_name ;
+} ;
+
+#include "wx/dynarray.h"
+
+WX_DECLARE_OBJARRAY_WITH_DECL(wxxVariant, wxxVariantArray, class WXDLLIMPEXP_BASE);
+
+// templated streaming, every type must have their specialization for these methods
+
+template<typename T>
+void wxStringReadValue( const wxString &s , T &data );
+
+template<typename T>
+void wxStringWriteValue( wxString &s , const T &data);
+
+template<typename T>
+void wxToStringConverter( const wxxVariant &v, wxString &s wxTEMPLATED_FUNCTION_FIX(T)) { wxStringWriteValue( s , v.wxTEMPLATED_MEMBER_CALL(Get , T) ) ; }
+
+template<typename T>
+void wxFromStringConverter( const wxString &s, wxxVariant &v wxTEMPLATED_FUNCTION_FIX(T)) { T d ; wxStringReadValue( s , d ) ; v = wxxVariant(d) ; }
+
+// ----------------------------------------------------------------------------
+// Property Support
+//
+// wxPropertyInfo is used to inquire of the property by name.  It doesn't
+// provide access to the property, only information about it.  If you
+// want access, look at wxPropertyAccessor.
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxSetter
+{
+public:
+    wxSetter( const wxString name ) { m_name = name ; }
+    virtual ~wxSetter() {}
+    virtual void Set( wxObject *object, const wxxVariant &variantValue ) const = 0;
+    const wxString& GetName() const { return m_name ; }
+private:
+    wxString m_name;
+};
+
+class WXDLLIMPEXP_BASE wxGetter
+{
+public:
+    wxGetter( const wxString name ) { m_name = name ; }
+    virtual ~wxGetter() {}
+    virtual void Get( const wxObject *object , wxxVariant& result) const = 0;
+    const wxString& GetName() const { return m_name ; }
+private:
+    wxString m_name;
+};
+
+class WXDLLIMPEXP_BASE wxCollectionGetter
+{
+public :
+    wxCollectionGetter( const wxString name ) { m_name = name ; }
+    virtual ~wxCollectionGetter() {}
+    virtual void Get( const wxObject *object , wxxVariantArray& result) const = 0;
+    const wxString& GetName() const { return m_name ; }
+private :
+    wxString m_name ;
+} ;
+
+template<typename coll_t> void WXDLLIMPEXP_BASE wxCollectionToVariantArray( const coll_t& coll , wxxVariantArray& result ) ;
+
+class WXDLLIMPEXP_BASE wxAdder
+{
+public :
+    wxAdder( const wxString name ) { m_name = name ; }
+    virtual ~wxAdder() {}
+    virtual void Add( wxObject *object, const wxxVariant &variantValue ) const= 0;
+    const wxString& GetName() const { return m_name ; }
+private :
+    wxString m_name ;
+} ;
+
+
+#define wxSETTER( property, Klass, valueType, setterMethod ) \
+class wxSetter##property : public wxSetter \
+{ \
+public: \
+    wxINFUNC_CLASS_TYPE_FIX(Klass) \
+    wxSetter##property() : wxSetter( wxT(#setterMethod) ) {} \
+    virtual ~wxSetter##property() {} \
+    void Set( wxObject *object, const wxxVariant &variantValue ) const \
+{ \
+    Klass *obj = dynamic_cast<Klass*>(object) ;  \
+    if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \
+    obj->setterMethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \
+            else \
+            obj->setterMethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \
+} \
+} ;
+
+#define wxGETTER( property, Klass, valueType , gettermethod ) \
+class wxGetter##property : public wxGetter \
+{ \
+public : \
+    wxINFUNC_CLASS_TYPE_FIX(Klass) \
+    wxGetter##property() : wxGetter( wxT(#gettermethod) ) {} \
+    virtual ~wxGetter##property() {} \
+    void Get( const wxObject *object , wxxVariant &result) const \
+{ \
+    const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
+    result = wxxVariant( obj->gettermethod() ) ; \
+} \
+} ;
+
+#define wxADDER( property, Klass, valueType , addermethod ) \
+class wxAdder##property : public wxAdder \
+{ \
+public: \
+    wxINFUNC_CLASS_TYPE_FIX(Klass) \
+    wxAdder##property() : wxAdder( wxT(#addermethod) ) {} \
+    virtual ~wxAdder##property() {} \
+    void Add( wxObject *object, const wxxVariant &variantValue ) const \
+{ \
+    Klass *obj = dynamic_cast<Klass*>(object) ;  \
+    if ( variantValue.wxTEMPLATED_MEMBER_CALL(HasData, valueType) ) \
+    obj->addermethod(variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType)) ; \
+            else \
+            obj->addermethod(*variantValue.wxTEMPLATED_MEMBER_CALL(Get , valueType*)) ; \
+} \
+} ;
+
+#define wxCOLLECTION_GETTER( property, Klass, valueType , gettermethod ) \
+class wxCollectionGetter##property : public wxCollectionGetter \
+{ \
+public : \
+    wxINFUNC_CLASS_TYPE_FIX(Klass) \
+    wxCollectionGetter##property() : wxCollectionGetter( wxT(#gettermethod) ) {} \
+    virtual ~wxCollectionGetter##property() {} \
+    void Get( const wxObject *object , wxxVariantArray &result) const \
+{ \
+    const Klass *obj = dynamic_cast<const Klass*>(object) ;  \
+    wxCollectionToVariantArray( obj->gettermethod() , result ) ; \
+} \
+} ;
+
+class WXDLLIMPEXP_BASE wxPropertyAccessor
+{
+public :
+    wxPropertyAccessor( wxSetter *setter , wxGetter *getter , wxAdder *adder , wxCollectionGetter *collectionGetter )
+    { m_setter = setter ; m_getter = getter ; m_adder = adder ; m_collectionGetter = collectionGetter ;}
+
+    virtual ~wxPropertyAccessor() {}
+
+    // Setting a simple property (non-collection)
+    virtual void SetProperty(wxObject *object, const wxxVariant &value) const
+    { if ( m_setter ) m_setter->Set( object , value ) ; else wxLogError( _("SetProperty called w/o valid setter") ) ;}
+
+    // Getting a simple property (non-collection)
+    virtual void GetProperty(const wxObject *object, wxxVariant &result) const
+    { if ( m_getter ) m_getter->Get( object , result ) ; else wxLogError( _("GetProperty called w/o valid getter") ) ;}
+
+    // Adding an element to a collection property
+    virtual void AddToPropertyCollection(wxObject *object, const wxxVariant &value) const
+    { if ( m_adder ) m_adder->Add( object , value ) ; else wxLogError( _("AddToPropertyCollection called w/o valid adder") ) ;}
+
+    // Getting a collection property
+    virtual void GetPropertyCollection( const wxObject *obj, wxxVariantArray &result) const
+    { if ( m_collectionGetter ) m_collectionGetter->Get( obj , result) ; else wxLogError( _("GetPropertyCollection called w/o valid collection getter") ) ;}
+
+    virtual bool HasSetter() const { return m_setter != NULL ; }
+    virtual bool HasCollectionGetter() const { return m_collectionGetter != NULL ; }
+    virtual bool HasGetter() const { return m_getter != NULL ; }
+    virtual bool HasAdder() const { return m_adder != NULL ; }
+
+    virtual const wxString& GetCollectionGetterName() const
+    { return m_collectionGetter->GetName() ; }
+    virtual const wxString&  GetGetterName() const
+    { return m_getter->GetName() ; }
+    virtual const wxString& GetSetterName() const
+    { return m_setter->GetName() ; }
+    virtual const wxString& GetAdderName() const
+    { return m_adder->GetName() ; }
+
+protected :
+    wxSetter *m_setter ;
+    wxAdder *m_adder ;
+    wxGetter *m_getter ;
+    wxCollectionGetter* m_collectionGetter ;
+};
+
+class WXDLLIMPEXP_BASE wxGenericPropertyAccessor : public wxPropertyAccessor
+{
+public :
+    wxGenericPropertyAccessor( const wxString &propName ) ;
+    virtual ~wxGenericPropertyAccessor() ;
+
+    void RenameProperty( const wxString& WXUNUSED_UNLESS_DEBUG(oldName),
+        const wxString& newName )
+    {
+        wxASSERT( oldName == m_propertyName ) ; m_propertyName = newName ;
+    }
+    virtual bool HasSetter() const { return true ; }
+    virtual bool HasGetter() const { return true ; }
+    virtual bool HasAdder() const { return false ; }
+    virtual bool HasCollectionGetter() const { return false ; }
+
+    virtual const wxString&  GetGetterName() const
+    { return m_getterName ; }
+    virtual const wxString& GetSetterName() const
+    { return m_setterName ; }
+
+    virtual void SetProperty(wxObject *object, const wxxVariant &value) const ;
+    virtual void GetProperty(const wxObject *object, wxxVariant &value) const ;
+
+    // Adding an element to a collection property
+    virtual void AddToPropertyCollection(wxObject *WXUNUSED(object), const wxxVariant &WXUNUSED(value)) const
+    { wxLogError( _("AddToPropertyCollection called on a generic accessor") ) ;}
+
+    // Getting a collection property
+    virtual void GetPropertyCollection( const wxObject *WXUNUSED(obj), wxxVariantArray &WXUNUSED(result)) const
+    { wxLogError ( _("GetPropertyCollection called on a generic accessor") ) ;}
+private :
+    struct wxGenericPropertyAccessorInternal ;
+    wxGenericPropertyAccessorInternal* m_data ;
+    wxString m_propertyName ;
+    wxString m_setterName ;
+    wxString m_getterName ;
+} ;
+
+typedef long wxPropertyInfoFlags ;
+enum {
+    // will be removed in future releases
+    wxPROP_DEPRECATED       = 0x00000001 ,
+    // object graph property, will be streamed with priority (after constructor properties)
+    wxPROP_OBJECT_GRAPH     = 0x00000002 ,
+    // this will only be streamed out and in as enum/set, the internal representation is still a long
+    wxPROP_ENUM_STORE_LONG  = 0x00000004 ,
+    // don't stream out this property, needed eg to avoid streaming out children that are always created by their parents
+    wxPROP_DONT_STREAM = 0x00000008 ,
+}  ;
+
+class WXDLLIMPEXP_BASE wxPropertyInfo
+{
+    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;
+public :
+    wxPropertyInfo(wxPropertyInfo* &iter,
+                   wxClassInfo* itsClass,
+                   const wxString& name,
+                   const wxString& typeName,
+                   wxPropertyAccessor *accessor,
+                   wxxVariant dv,
+                   wxPropertyInfoFlags flags = 0,
+                   const wxString& helpString = wxEmptyString,
+                   const wxString& groupString = wxEmptyString) :
+                   m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(NULL),
+           m_typeName(typeName) ,
+           m_collectionElementTypeInfo(NULL),
+           m_accessor(accessor),
+           m_defaultValue(dv),
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+
+#if wxUSE_UNICODE
+    wxPropertyInfo(wxPropertyInfo* &iter,
+                   wxClassInfo* itsClass,
+                   const wxString& name,
+                   const char* typeName,
+                   wxPropertyAccessor *accessor,
+                   wxxVariant dv,
+                   wxPropertyInfoFlags flags = 0,
+                   const wxString& helpString = wxEmptyString,
+                   const wxString& groupString = wxEmptyString) :
+                   m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(NULL),
+           m_typeName(wxString::FromAscii(typeName)) ,
+           m_collectionElementTypeInfo(NULL),
+           m_accessor(accessor),
+           m_defaultValue(dv),
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+#endif
+    wxPropertyInfo(wxPropertyInfo* &iter,
+                   wxClassInfo* itsClass,
+                   const wxString& name,
+                   wxDelegateTypeInfo* type,
+                   wxPropertyAccessor *accessor,
+                   wxxVariant dv,
+                   wxPropertyInfoFlags flags = 0,
+                   const wxString& helpString = wxEmptyString,
+                   const wxString& groupString = wxEmptyString) :
+           m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(type),
+           m_collectionElementTypeInfo(NULL),
+           m_accessor(accessor),
+           m_defaultValue(dv),
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+
+       wxPropertyInfo(wxPropertyInfo* &iter,
+                      wxClassInfo* itsClass, const wxString& name,
+                      const wxString& collectionTypeName,
+                      const wxString& elementTypeName,
+                      wxPropertyAccessor *accessor,
+                      wxPropertyInfoFlags flags = 0,
+                      const wxString& helpString = wxEmptyString,
+                      const wxString& groupString = wxEmptyString) :
+           m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(NULL),
+           m_typeName(collectionTypeName) ,
+           m_collectionElementTypeInfo(NULL),
+           m_collectionElementTypeName(elementTypeName),
+           m_accessor(accessor) ,
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+
+#if wxUSE_UNICODE
+              wxPropertyInfo(wxPropertyInfo* &iter,
+                      wxClassInfo* itsClass, const wxString& name,
+                      const char* collectionTypeName,
+                      const char* elementTypeName,
+                      wxPropertyAccessor *accessor,
+                      wxPropertyInfoFlags flags = 0,
+                      const wxString& helpString = wxEmptyString,
+                      const wxString& groupString = wxEmptyString) :
+           m_itsClass(itsClass),
+           m_name(name),
+           m_typeInfo(NULL),
+           m_typeName(wxString::FromAscii(collectionTypeName)) ,
+           m_collectionElementTypeInfo(NULL),
+           m_collectionElementTypeName(wxString::FromAscii(elementTypeName)),
+           m_accessor(accessor) ,
+           m_flags(flags),
+           m_helpString(helpString),
+           m_groupString(groupString)
+       {
+           Insert(iter);
+       }
+#endif
+       ~wxPropertyInfo() ;
+
+       // return the class this property is declared in
+       const wxClassInfo*  GetDeclaringClass() const { return m_itsClass ; }
+
+       // return the name of this property
+       const wxString&     GetName() const { return m_name ; }
+
+       // returns the flags of this property
+       wxPropertyInfoFlags GetFlags() const { return m_flags ;}
+
+       // returns the short help string of this property
+       const wxString&     GetHelpString() const { return m_helpString ; }
+
+       // returns the group string of this property
+       const wxString&     GetGroupString() const { return m_groupString ; }
+
+       // return the element type info of this property (for collections, otherwise NULL)
+       const wxTypeInfo *  GetCollectionElementTypeInfo() const
+       {
+           if ( m_collectionElementTypeInfo == NULL )
+               m_collectionElementTypeInfo = wxTypeInfo::FindType(m_collectionElementTypeName) ;
+           return m_collectionElementTypeInfo ;
+       }
+
+       // return the type info of this property
+       const wxTypeInfo *  GetTypeInfo() const
+       {
+           if ( m_typeInfo == NULL )
+               m_typeInfo = wxTypeInfo::FindType(m_typeName) ;
+           return m_typeInfo ;
+       }
+
+       // return the accessor for this property
+       wxPropertyAccessor* GetAccessor() const { return m_accessor ; }
+
+       // returns NULL if this is the last property of this class
+       wxPropertyInfo*     GetNext() const { return m_next ; }
+
+       // returns the default value of this property, its kind may be wxT_VOID if it is not valid
+       wxxVariant          GetDefaultValue() const { return m_defaultValue ; }
+private :
+    void Insert(wxPropertyInfo* &iter)
+    {
+        m_next = NULL ;
+        if ( iter == NULL )
+            iter = this ;
+        else
+        {
+            wxPropertyInfo* i = iter ;
+            while( i->m_next )
+                i = i->m_next ;
+
+            i->m_next = this ;
+        }
+    }
+
+    wxClassInfo*        m_itsClass ;
+    wxString            m_name ;
+    mutable wxTypeInfo*         m_typeInfo ;
+    wxString            m_typeName ;
+    mutable wxTypeInfo*         m_collectionElementTypeInfo ;
+    wxString            m_collectionElementTypeName ;
+    wxPropertyAccessor* m_accessor ;
+    wxxVariant          m_defaultValue;
+    wxPropertyInfoFlags m_flags ;
+    wxString            m_helpString ;
+    wxString            m_groupString ;
+    // string representation of the default value
+    //  to be assigned by the designer to the property
+    //  when the component is dropped on the container.
+    wxPropertyInfo*     m_next ;
+};
+
+WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxPropertyInfo* , wxPropertyInfoMap , class WXDLLIMPEXP_BASE ) ;
+
+#define wxBEGIN_PROPERTIES_TABLE(theClass) \
+    wxPropertyInfo *theClass::GetPropertiesStatic()  \
+{  \
+    typedef theClass class_t; \
+    static wxPropertyInfo* first = NULL ;
+
+#define wxEND_PROPERTIES_TABLE() \
+    return first ; }
+
+#define wxHIDE_PROPERTY( pname ) \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(void).name() ,NULL , wxxVariant() , wxPROP_DONT_STREAM , wxEmptyString , wxEmptyString ) ;
+
+#define wxPROPERTY( pname , type , setter , getter , defaultValue , flags , help , group) \
+    wxSETTER( pname , class_t , type , setter ) \
+    static wxSetter##pname _setter##pname ; \
+    wxGETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue) , flags , group , help ) ;
+
+#define wxPROPERTY_FLAGS( pname , flags , type , setter , getter ,defaultValue , pflags , help , group) \
+    wxSETTER( pname , class_t , type , setter ) \
+    static wxSetter##pname _setter##pname ; \
+    wxGETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( &_setter##pname , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
+
+#define wxREADONLY_PROPERTY( pname , type , getter ,defaultValue , flags , help , group) \
+    wxGETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(type).name() ,&_accessor##pname , wxxVariant(defaultValue), flags , help , group ) ;
+
+#define wxREADONLY_PROPERTY_FLAGS( pname , flags , type , getter ,defaultValue , pflags , help , group) \
+    wxGETTER( pname , class_t , type , getter ) \
+    static wxGetter##pname _getter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , &_getter##pname , NULL , NULL ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(flags).name() ,&_accessor##pname , wxxVariant(defaultValue), wxPROP_ENUM_STORE_LONG | pflags , help , group ) ;
+
+#define wxPROPERTY_COLLECTION( pname , colltype , addelemtype , adder , getter , flags , help , group ) \
+    wxADDER( pname , class_t , addelemtype , adder ) \
+    static wxAdder##pname _adder##pname ; \
+    wxCOLLECTION_GETTER( pname , class_t , colltype , getter ) \
+    static wxCollectionGetter##pname _collectionGetter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , NULL ,&_adder##pname , &_collectionGetter##pname ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first , class_t::GetClassInfoStatic() , wxT(#pname) , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group ) ;
+
+#define wxREADONLY_PROPERTY_COLLECTION( pname , colltype , addelemtype , getter , flags , help , group) \
+    wxCOLLECTION_GETTER( pname , class_t , colltype , getter ) \
+    static wxCollectionGetter##pname _collectionGetter##pname ; \
+    static wxPropertyAccessor _accessor##pname( NULL , NULL , NULL , &_collectionGetter##pname ) ; \
+    static wxPropertyInfo _propertyInfo##pname( first ,class_t::GetClassInfoStatic() ,  wxT(#pname) , typeid(colltype).name() ,typeid(addelemtype).name() ,&_accessor##pname , flags , help , group  ) ;
+
+
+#define wxEVENT_PROPERTY( name , eventType , eventClass ) \
+    static wxDelegateTypeInfo _typeInfo##name( eventType , CLASSINFO( eventClass ) ) ; \
+    static wxPropertyInfo _propertyInfo##name( first ,class_t::GetClassInfoStatic() , wxT(#name) , &_typeInfo##name , NULL , wxxVariant() ) ; \
+
+#define wxEVENT_RANGE_PROPERTY( name , eventType , lastEventType , eventClass ) \
+    static wxDelegateTypeInfo _typeInfo##name( eventType , lastEventType , CLASSINFO( eventClass ) ) ; \
+    static wxPropertyInfo _propertyInfo##name( first , class_t::GetClassInfoStatic() , wxT(#name) , &_typeInfo##name , NULL , wxxVariant() ) ; \
+
+// ----------------------------------------------------------------------------
+// Implementation Helper for Simple Properties
+// ----------------------------------------------------------------------------
+
+#define wxIMPLEMENT_PROPERTY(name, type) \
+private:\
+    type m_##name; \
+public: \
+  void  Set##name( type const & p) { m_##name = p; } \
+  type const & Get##name() const  { return m_##name; }
+
+// ----------------------------------------------------------------------------
+// Handler Info
+//
+// this is describing an event sink
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxHandlerInfo
+{
+    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;
+public :
+    wxHandlerInfo(wxHandlerInfo* &iter,
+                   wxClassInfo* itsClass,
+                  const wxString& name,
+                  wxObjectEventFunction address,
+                  const wxClassInfo* eventClassInfo) :
+            m_eventFunction(address),
+            m_name(name),
+            m_eventClassInfo(eventClassInfo) ,
+            m_itsClass(itsClass)
+       {
+           m_next = NULL ;
+           if ( iter == NULL )
+               iter = this ;
+           else
+           {
+               wxHandlerInfo* i = iter ;
+               while( i->m_next )
+                   i = i->m_next ;
+
+               i->m_next = this ;
+           }
+       }
+
+       ~wxHandlerInfo() ;
+
+       // return the name of this handler
+       const wxString& GetName() const { return m_name ; }
+
+       // return the class info of the event
+       const wxClassInfo *GetEventClassInfo() const { return m_eventClassInfo ; }
+
+       // get the handler function pointer
+       wxObjectEventFunction GetEventFunction() const { return m_eventFunction ; }
+
+       // returns NULL if this is the last handler of this class
+       wxHandlerInfo*     GetNext() const { return m_next ; }
+
+       // return the class this property is declared in
+       const wxClassInfo*   GetDeclaringClass() const { return m_itsClass ; }
+
+private :
+    wxObjectEventFunction m_eventFunction ;
+    wxString            m_name;
+    const wxClassInfo*  m_eventClassInfo ;
+    wxHandlerInfo*      m_next ;
+    wxClassInfo*        m_itsClass ;
+};
+
+#define wxHANDLER(name,eventClassType) \
+    static wxHandlerInfo _handlerInfo##name( first , class_t::GetClassInfoStatic() , wxT(#name) , (wxObjectEventFunction) (wxEventFunction) &name , CLASSINFO( eventClassType ) ) ;
+
+#define wxBEGIN_HANDLERS_TABLE(theClass) \
+    wxHandlerInfo *theClass::GetHandlersStatic()  \
+{  \
+    typedef theClass class_t; \
+    static wxHandlerInfo* first = NULL ;
+
+#define wxEND_HANDLERS_TABLE() \
+    return first ; }
+
+// ----------------------------------------------------------------------------
+// Constructor Bridges
+//
+// allow to set up constructors with params during runtime
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxConstructorBridge
+{
+public :
+    virtual void Create(wxObject * &o, wxxVariant *args) = 0;
+};
+
+// a direct constructor bridge calls the operator new for this class and
+// passes all params to the constructor. needed for classes that cannot be
+// instantiated using alloc-create semantics
+class WXDLLIMPEXP_BASE wxDirectConstructorBrigde : public wxConstructorBridge
+{
+public :
+    virtual void Create(wxObject * &o, wxxVariant *args) = 0;
+} ;
+
+// Creator Bridges for all Numbers of Params
+
+// no params
+
+template<typename Class>
+struct wxConstructorBridge_0 : public wxConstructorBridge
+{
+    void Create(wxObject * &o, wxxVariant *)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create();
+    }
+};
+
+struct wxConstructorBridge_Dummy : public wxConstructorBridge
+{
+    void Create(wxObject *&, wxxVariant *)
+    {
+    }
+} ;
+
+#define wxCONSTRUCTOR_0(klass) \
+    wxConstructorBridge_0<klass> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { NULL } ; \
+    const int klass::ms_constructorPropertiesCount = 0 ;
+
+#define wxCONSTRUCTOR_DUMMY(klass) \
+    wxConstructorBridge_Dummy constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { NULL } ; \
+    const int klass::ms_constructorPropertiesCount = 0 ;
+
+// 1 param
+
+template<typename Class, typename T0>
+struct wxConstructorBridge_1 : public wxConstructorBridge
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0)
+            );
+    }
+};
+
+#define wxCONSTRUCTOR_1(klass,t0,v0) \
+    wxConstructorBridge_1<klass,t0> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0) } ; \
+    const int klass::ms_constructorPropertiesCount = 1 ;
+
+// 2 params
+
+template<typename Class,
+typename T0, typename T1>
+struct wxConstructorBridge_2 : public wxConstructorBridge
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1)
+            );
+    }
+};
+
+#define wxCONSTRUCTOR_2(klass,t0,v0,t1,v1) \
+    wxConstructorBridge_2<klass,t0,t1> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  } ; \
+    const int klass::ms_constructorPropertiesCount = 2;
+
+// direct constructor version
+
+template<typename Class,
+typename T0, typename T1>
+struct wxDirectConstructorBridge_2 : public wxDirectConstructorBrigde
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        o = new Class(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1)
+            );
+    }
+};
+
+#define wxDIRECT_CONSTRUCTOR_2(klass,t0,v0,t1,v1) \
+    wxDirectConstructorBridge_2<klass,t0,t1> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  } ; \
+    const int klass::ms_constructorPropertiesCount = 2;
+
+
+// 3 params
+
+template<typename Class,
+typename T0, typename T1, typename T2>
+struct wxConstructorBridge_3 : public wxConstructorBridge
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2)
+            );
+    }
+};
+
+#define wxCONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
+    wxConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  } ; \
+    const int klass::ms_constructorPropertiesCount = 3 ;
+
+// direct constructor version
+
+template<typename Class,
+typename T0, typename T1, typename T2>
+struct wxDirectConstructorBridge_3 : public wxDirectConstructorBrigde
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        o = new Class(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2)
+            );
+    }
+};
+
+#define wxDIRECT_CONSTRUCTOR_3(klass,t0,v0,t1,v1,t2,v2) \
+    wxDirectConstructorBridge_3<klass,t0,t1,t2> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1) , wxT(#v2) } ; \
+    const int klass::ms_constructorPropertiesCount = 3;
+
+// 4 params
+
+template<typename Class,
+typename T0, typename T1, typename T2, typename T3>
+struct wxConstructorBridge_4 : public wxConstructorBridge
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3)
+            );
+    }
+};
+
+#define wxCONSTRUCTOR_4(klass,t0,v0,t1,v1,t2,v2,t3,v3) \
+    wxConstructorBridge_4<klass,t0,t1,t2,t3> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  } ; \
+    const int klass::ms_constructorPropertiesCount = 4 ;
+
+// 5 params
+
+template<typename Class,
+typename T0, typename T1, typename T2, typename T3, typename T4>
+struct wxConstructorBridge_5 : public wxConstructorBridge
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4)
+            );
+    }
+};
+
+#define wxCONSTRUCTOR_5(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4) \
+    wxConstructorBridge_5<klass,t0,t1,t2,t3,t4> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  } ; \
+    const int klass::ms_constructorPropertiesCount = 5;
+
+// 6 params
+
+template<typename Class,
+typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
+struct wxConstructorBridge_6 : public wxConstructorBridge
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
+            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5)
+            );
+    }
+};
+
+#define wxCONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
+    wxConstructorBridge_6<klass,t0,t1,t2,t3,t4,t5> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  } ; \
+    const int klass::ms_constructorPropertiesCount = 6;
+
+// direct constructor version
+
+template<typename Class,
+typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
+struct wxDirectConstructorBridge_6 : public wxDirectConstructorBrigde
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        o = new Class(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
+            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5)
+            );
+    }
+};
+
+#define wxDIRECT_CONSTRUCTOR_6(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5) \
+    wxDirectConstructorBridge_6<klass,t0,t1,t2,t3,t4,t5> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  } ; \
+    const int klass::ms_constructorPropertiesCount = 6;
+
+// 7 params
+
+template<typename Class,
+typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
+struct wxConstructorBridge_7 : public wxConstructorBridge
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
+            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) ,
+            args[6].wxTEMPLATED_MEMBER_CALL(Get , T6)
+            );
+    }
+};
+
+#define wxCONSTRUCTOR_7(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6) \
+    wxConstructorBridge_7<klass,t0,t1,t2,t3,t4,t5,t6> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  , wxT(#v6) } ; \
+    const int klass::ms_constructorPropertiesCount = 7;
+
+// 8 params
+
+template<typename Class,
+typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
+struct wxConstructorBridge_8 : public wxConstructorBridge
+{
+    void Create(wxObject * &o, wxxVariant *args)
+    {
+        Class *obj = dynamic_cast<Class*>(o);
+        obj->Create(
+            args[0].wxTEMPLATED_MEMBER_CALL(Get , T0) ,
+            args[1].wxTEMPLATED_MEMBER_CALL(Get , T1) ,
+            args[2].wxTEMPLATED_MEMBER_CALL(Get , T2) ,
+            args[3].wxTEMPLATED_MEMBER_CALL(Get , T3) ,
+            args[4].wxTEMPLATED_MEMBER_CALL(Get , T4) ,
+            args[5].wxTEMPLATED_MEMBER_CALL(Get , T5) ,
+            args[6].wxTEMPLATED_MEMBER_CALL(Get , T6) ,
+            args[7].wxTEMPLATED_MEMBER_CALL(Get , T7)
+            );
+    }
+};
+
+#define wxCONSTRUCTOR_8(klass,t0,v0,t1,v1,t2,v2,t3,v3,t4,v4,t5,v5,t6,v6,t7,v7) \
+    wxConstructorBridge_8<klass,t0,t1,t2,t3,t4,t5,t6,t7> constructor##klass ; \
+    wxConstructorBridge* klass::ms_constructor = &constructor##klass ; \
+    const wxChar *klass::ms_constructorProperties[] = { wxT(#v0)  , wxT(#v1)  , wxT(#v2)  , wxT(#v3)  , wxT(#v4)  , wxT(#v5)  , wxT(#v6) , wxT(#v7) } ; \
+    const int klass::ms_constructorPropertiesCount = 8;
 // ----------------------------------------------------------------------------
 // wxClassInfo
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxObjectFunctor
-{
-public:
-    virtual ~wxObjectFunctor();
-
-    // Invoke the actual event handler:
-    virtual void operator()(const wxObject *) = 0;
-};
-
-class WXDLLIMPEXP_FWD_BASE wxPropertyInfo;
-class WXDLLIMPEXP_FWD_BASE wxHandlerInfo;
-
 typedef wxObject *(*wxObjectConstructorFn)(void);
-typedef wxPropertyInfo *(*wxPropertyInfoFn)(void);
-typedef wxHandlerInfo *(*wxHandlerInfoFn)(void);
-typedef void (*wxVariantToObjectConverter)( const wxAny &data, wxObjectFunctor* fn );
-typedef wxObject* (*wxVariantToObjectPtrConverter) ( const wxAny& data);
-typedef wxAny (*wxObjectToVariantConverter)( wxObject* );
-
-WXDLLIMPEXP_BASE wxString wxAnyGetAsString( const wxAny& data);
-WXDLLIMPEXP_BASE const wxObject* wxAnyGetAsObjectPtr( const wxAny& data);
-
-class WXDLLIMPEXP_BASE wxObjectWriter;
-class WXDLLIMPEXP_BASE wxObjectWriterCallback;
-
-typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxObjectWriter *, \
-                                            wxObjectWriterCallback *, const wxStringToAnyHashMap & );
+typedef wxObject* (*wxVariantToObjectConverter)( wxxVariant &data ) ;
+typedef wxxVariant (*wxObjectToVariantConverter)( wxObject* ) ;
 
+class WXDLLIMPEXP_BASE wxWriter;
+class WXDLLIMPEXP_BASE wxPersister;
 
+typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxWriter * , wxPersister * , wxxVariantArray & ) ;
 
 class WXDLLIMPEXP_BASE wxClassInfo
 {
-    friend class WXDLLIMPEXP_BASE wxPropertyInfo;
-    friend class /* WXDLLIMPEXP_BASE */ wxHandlerInfo;
-    friend wxObject *wxCreateDynamicObject(const wxString& name);
-
+    friend class WXDLLIMPEXP_BASE wxPropertyInfo ;
+    friend class WXDLLIMPEXP_BASE wxHandlerInfo ;
 public:
     wxClassInfo(const wxClassInfo **_Parents,
-                const wxChar *_UnitName,
-                const wxChar *_ClassName,
-                int size,
-                wxObjectConstructorFn ctor,
-                wxPropertyInfoFn _Props,
-                wxHandlerInfoFn _Handlers,
-                wxObjectAllocatorAndCreator* _Constructor,
-                const wxChar ** _ConstructorProperties,
-                const int _ConstructorPropertiesCount,
-                wxVariantToObjectPtrConverter _PtrConverter1,
-                wxVariantToObjectConverter _Converter2,
-                wxObjectToVariantConverter _Converter3,
-                wxObjectStreamingCallback _streamingCallback = NULL) :
+        const wxChar *_UnitName,
+        const wxChar *_ClassName,
+        int size,
+        wxObjectConstructorFn ctor ,
+        wxPropertyInfo *_Props ,
+        wxHandlerInfo *_Handlers ,
+        wxConstructorBridge* _Constructor ,
+        const wxChar ** _ConstructorProperties ,
+        const int _ConstructorPropertiesCount ,
+        wxVariantToObjectConverter _PtrConverter1 ,
+        wxVariantToObjectConverter _Converter2 ,
+        wxObjectToVariantConverter _Converter3 ,
+        wxObjectStreamingCallback _streamingCallback = NULL
+        ) :
+
             m_className(_ClassName),
             m_objectSize(size),
             m_objectConstructor(ctor),
             m_next(sm_first),
-            m_firstPropertyFn(_Props),
-            m_firstHandlerFn(_Handlers),
-            m_firstProperty(NULL),
-            m_firstHandler(NULL),
-            m_firstInited(false),
+            m_firstProperty(_Props),
+            m_firstHandler(_Handlers),
             m_parents(_Parents),
             m_unitName(_UnitName),
             m_constructor(_Constructor),
@@ -134,7 +1626,7 @@ public:
             m_streamingCallback(_streamingCallback)
     {
         sm_first = this;
-        Register();
+        Register() ;
     }
 
     wxClassInfo(const wxChar *_UnitName, const wxChar *_ClassName,
@@ -143,11 +1635,8 @@ public:
             m_objectSize(0),
             m_objectConstructor(NULL),
             m_next(sm_first),
-            m_firstPropertyFn(NULL),
-            m_firstHandlerFn(NULL),
             m_firstProperty(NULL),
             m_firstHandler(NULL),
-            m_firstInited(true),
             m_parents(_Parents),
             m_unitName(_UnitName),
             m_constructor(NULL),
@@ -159,211 +1648,177 @@ public:
             m_streamingCallback(NULL)
     {
         sm_first = this;
-        Register();
+        Register() ;
     }
 
-    // ctor compatible with old RTTI system
-    wxClassInfo(const wxChar *_ClassName,
-                const wxClassInfo *_Parent1,
-                const wxClassInfo *_Parent2,
-                int size,
-                wxObjectConstructorFn ctor) :
-            m_className(_ClassName),
-            m_objectSize(size),
-            m_objectConstructor(ctor),
-            m_next(sm_first),
-            m_firstPropertyFn(NULL),
-            m_firstHandlerFn(NULL),
-            m_firstProperty(NULL),
-            m_firstHandler(NULL),
-            m_firstInited(true),
-            m_parents(NULL),
-            m_unitName(NULL),
-            m_constructor(NULL),
-            m_constructorProperties(NULL),
-            m_constructorPropertiesCount(0),
-            m_variantOfPtrToObjectConverter(NULL),
-            m_variantToObjectConverter(NULL),
-            m_objectToVariantConverter(NULL),
-            m_streamingCallback(NULL)
-    {
-        sm_first = this;
-        m_parents[0] = _Parent1;
-        m_parents[1] = _Parent2;
-        m_parents[2] = NULL;
-        Register();
-    }
+    virtual ~wxClassInfo() ;
 
-    virtual ~wxClassInfo();
-
-    // allocates an instance of this class, this object does not have to be 
-    // initialized or fully constructed as this call will be followed by a call to Create
-    virtual wxObject *AllocateObject() const 
-        { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
+    // allocates an instance of this class, this object does not have to be initialized or fully constructed
+    // as this call will be followed by a call to Create
+    virtual wxObject *AllocateObject() const { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
 
     // 'old naming' for AllocateObject staying here for backward compatibility
-    wxObject *CreateObject() const { return AllocateObject(); }
+    wxObject *CreateObject() const { return AllocateObject() ; }
 
     // direct construction call for classes that cannot construct instances via alloc/create
-    wxObject *ConstructObject(int ParamCount, wxAny *Params) const;
+    wxObject *ConstructObject(int ParamCount, wxxVariant *Params) const
+    {
+        if ( ParamCount != m_constructorPropertiesCount )
+        {
+            wxLogError( _("Illegal Parameter Count for ConstructObject Method") ) ;
+            return NULL ;
+        }
+        wxObject *object = NULL ;
+        m_constructor->Create( object , Params ) ;
+        return object ;
+    }
 
-    bool NeedsDirectConstruction() const;
-    
-    const wxChar       *GetClassName() const 
-        { return m_className; }
+    bool NeedsDirectConstruction() const { return dynamic_cast<wxDirectConstructorBrigde*>( m_constructor) != NULL ; }
+
+    const wxChar       *GetClassName() const { return m_className; }
     const wxChar       *GetBaseClassName1() const
         { return m_parents[0] ? m_parents[0]->GetClassName() : NULL; }
     const wxChar       *GetBaseClassName2() const
         { return (m_parents[0] && m_parents[1]) ? m_parents[1]->GetClassName() : NULL; }
+    const wxChar       *GetIncludeName() const { return m_unitName ; }
+    const wxClassInfo **GetParents() const { return m_parents; }
+    int                 GetSize() const { return m_objectSize; }
+    bool                IsDynamic() const { return (NULL != m_objectConstructor); }
 
-    const wxClassInfo  *GetBaseClass1() const
-        { return m_parents[0]; }
-    const wxClassInfo  *GetBaseClass2() const
-        { return m_parents[0] ? m_parents[1] : NULL; }
-
-    const wxChar       *GetIncludeName() const 
-        { return m_unitName; }
-    const wxClassInfo **GetParents() const 
-        { return m_parents; }
-    int                 GetSize() const 
-        { return m_objectSize; }
-    bool                IsDynamic() const 
-        { return (NULL != m_objectConstructor); }
-
-    wxObjectConstructorFn      GetConstructor() const 
-        { return m_objectConstructor; }
-    const wxClassInfo         *GetNext() const 
-        { return m_next; }
-
-    // statics:
-
-    static void                CleanUp();
-    static wxClassInfo        *FindClass(const wxString& className);
-    static const wxClassInfo  *GetFirst() 
-        { return sm_first; }
-
+    wxObjectConstructorFn      GetConstructor() const { return m_objectConstructor; }
+    static const wxClassInfo  *GetFirst() { return sm_first; }
+    const wxClassInfo         *GetNext() const { return m_next; }
+    static wxClassInfo        *FindClass(const wxChar *className);
 
     // Climb upwards through inheritance hierarchy.
     // Dual inheritance is catered for.
 
-    bool IsKindOf(const wxClassInfo *info) const;
+    bool IsKindOf(const wxClassInfo *info) const
+    {
+        if ( info != 0 )
+        {
+            if ( info == this )
+                return true ;
 
-    wxDECLARE_CLASS_INFO_ITERATORS();
+            for ( int i = 0 ; m_parents[i] ; ++ i )
+            {
+                if ( m_parents[i]->IsKindOf( info ) )
+                    return true ;
+            }
+        }
+        return false ;
+    }
 
     // if there is a callback registered with that class it will be called
     // before this object will be written to disk, it can veto streaming out
     // this object by returning false, if this class has not registered a
     // callback, the search will go up the inheritance tree if no callback has
     // been registered true will be returned by default
-    bool BeforeWriteObject( const wxObject *obj, wxObjectWriter *streamer, 
-                            wxObjectWriterCallback *writercallback, const wxStringToAnyHashMap &metadata) const;
+    bool BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const  ;
 
     // gets the streaming callback from this class or any superclass
-    wxObjectStreamingCallback GetStreamingCallback() const;
+    wxObjectStreamingCallback GetStreamingCallback() const ;
+
+#if WXWIN_COMPATIBILITY_2_4
+    // Initializes parent pointers and hash table for fast searching.
+    wxDEPRECATED( static void InitializeClasses() );
+    // Cleans up hash table used for fast searching.
+    wxDEPRECATED( static void CleanUpClasses() );
+#endif
+    static void CleanUp();
 
     // returns the first property
-    wxPropertyInfo* GetFirstProperty() const 
-        { EnsureInfosInited(); return m_firstProperty; }
+    const wxPropertyInfo* GetFirstProperty() const { return m_firstProperty ; }
 
     // returns the first handler
-    wxHandlerInfo* GetFirstHandler() const 
-        { EnsureInfosInited(); return m_firstHandler; }
+    const wxHandlerInfo* GetFirstHandler() const { return m_firstHandler ; }
 
     // Call the Create upon an instance of the class, in the end the object is fully
     // initialized
-    virtual bool Create (wxObject *object, int ParamCount, wxAny *Params) const;
+    virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) const
+    {
+        if ( ParamCount != m_constructorPropertiesCount )
+        {
+            wxLogError( _("Illegal Parameter Count for Create Method") ) ;
+            return ;
+        }
+        m_constructor->Create( object , Params ) ;
+    }
 
     // get number of parameters for constructor
-    virtual int GetCreateParamCount() const 
-        { return m_constructorPropertiesCount; }
+    virtual int GetCreateParamCount() const { return m_constructorPropertiesCount; }
 
     // get n-th constructor parameter
-    virtual const wxChar* GetCreateParamName(int n) const 
-        { return m_constructorProperties[n]; }
+    virtual const wxChar* GetCreateParamName(int n) const { return m_constructorProperties[n] ; }
 
-    // Runtime access to objects for simple properties (get/set) by property 
-    // name and variant data
-    virtual void SetProperty (wxObject *object, const wxChar *propertyName, 
-                              const wxAny &value) const;
-    virtual wxAny GetProperty (wxObject *object, const wxChar *propertyName) const;
+    // Runtime access to objects for simple properties (get/set) by property name, and variant data
+    virtual void SetProperty (wxObject *object, const wxChar *propertyName, const wxxVariant &value) const ;
+    virtual wxxVariant GetProperty (wxObject *object, const wxChar *propertyName) const;
 
     // Runtime access to objects for collection properties by property name
-    virtual wxAnyList GetPropertyCollection(wxObject *object, 
-                                                  const wxChar *propertyName) const;
-    virtual void AddToPropertyCollection(wxObject *object, const wxChar *propertyName, 
-                                         const wxAny& value) const;
+    virtual wxxVariantArray GetPropertyCollection(wxObject *object, const wxChar *propertyName) const ;
+    virtual void AddToPropertyCollection(wxObject *object, const wxChar *propertyName , const wxxVariant& value) const ;
 
-    // we must be able to cast variants to wxObject pointers, templates seem 
-    // not to be suitable
-    void CallOnAny( const wxAny &data, wxObjectFunctor* functor ) const;
+    // we must be able to cast variants to wxObject pointers, templates seem not to be suitable
+    wxObject* VariantToInstance( wxxVariant &data ) const
+    {
+        if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
+            return m_variantToObjectConverter( data ) ;
+        else
+            return m_variantOfPtrToObjectConverter( data ) ;
+    }
 
-    wxObject* AnyToObjectPtr( const wxAny &data) const;
-
-    wxAny ObjectPtrToAny( wxObject *object ) const;
+    wxxVariant InstanceToVariant( wxObject *object ) const { return m_objectToVariantConverter( object ) ; }
 
     // find property by name
-    virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const;
+    virtual const wxPropertyInfo *FindPropertyInfo (const wxChar *PropertyName) const ;
 
     // find handler by name
-    virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *handlerName) const;
+    virtual const wxHandlerInfo *FindHandlerInfo (const wxChar *PropertyName) const ;
 
     // find property by name
-    virtual wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const;
+    virtual wxPropertyInfo *FindPropertyInfoInThisClass (const wxChar *PropertyName) const ;
 
     // find handler by name
-    virtual wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *handlerName) const;
+    virtual wxHandlerInfo *FindHandlerInfoInThisClass (const wxChar *PropertyName) const ;
 
-    // puts all the properties of this class and its superclasses in the map, 
-    // as long as there is not yet an entry with the same name (overriding mechanism)
-    void GetProperties( wxPropertyInfoMap &map ) const;
-
-private:
+    // puts all the properties of this class and its superclasses in the map, as long as there is not yet
+    // an entry with the same name (overriding mechanism)
+    void GetProperties( wxPropertyInfoMap &map ) const ;
+public:
     const wxChar            *m_className;
     int                      m_objectSize;
-    wxObjectConstructorFn     m_objectConstructor;
+    wxObjectConstructorFn    m_objectConstructor;
 
     // class info object live in a linked list:
     // pointers to its head and the next element in it
 
     static wxClassInfo      *sm_first;
-    wxClassInfo              *m_next;
+    wxClassInfo             *m_next;
 
+    // FIXME: this should be private (currently used directly by way too
+    //        many clients)
     static wxHashTable      *sm_classTable;
 
-    wxPropertyInfoFn          m_firstPropertyFn;
-    wxHandlerInfoFn           m_firstHandlerFn;
-
-
-protected:
-    void                      EnsureInfosInited() const
-    {
-        if ( !m_firstInited)
-        {
-            if ( m_firstPropertyFn != NULL)
-                m_firstProperty = (*m_firstPropertyFn)();
-            if ( m_firstHandlerFn != NULL)
-                m_firstHandler = (*m_firstHandlerFn)();
-            m_firstInited = true;
-        }
-    }
-    mutable wxPropertyInfo*   m_firstProperty;
-    mutable wxHandlerInfo*    m_firstHandler;
-
+protected :
+    wxPropertyInfo *         m_firstProperty ;
+    wxHandlerInfo *          m_firstHandler ;
 private:
-    mutable bool              m_firstInited;
+    const wxClassInfo**      m_parents ;
+    const wxChar*            m_unitName;
 
-    const wxClassInfo**       m_parents;
-    const wxChar*             m_unitName;
+    wxConstructorBridge*     m_constructor ;
+    const wxChar **          m_constructorProperties ;
+    const int                m_constructorPropertiesCount ;
+    wxVariantToObjectConverter m_variantOfPtrToObjectConverter ;
+    wxVariantToObjectConverter m_variantToObjectConverter ;
+    wxObjectToVariantConverter m_objectToVariantConverter ;
+    wxObjectStreamingCallback m_streamingCallback ;
+    const wxPropertyAccessor *FindAccessor (const wxChar *propertyName) const ;
 
-    wxObjectAllocatorAndCreator*     m_constructor;
-    const wxChar **           m_constructorProperties;
-    const int                 m_constructorPropertiesCount;
-    wxVariantToObjectPtrConverter m_variantOfPtrToObjectConverter;
-    wxVariantToObjectConverter m_variantToObjectConverter;
-    wxObjectToVariantConverter m_objectToVariantConverter;
-    wxObjectStreamingCallback  m_streamingCallback;
 
-    const wxPropertyAccessor *FindAccessor (const wxChar *propertyName) const;
+    // InitializeClasses() helper
+    static wxClassInfo *GetBaseByName(const wxChar *name) ;
 
 protected:
     // registers the class
@@ -373,98 +1828,275 @@ protected:
     DECLARE_NO_COPY_CLASS(wxClassInfo)
 };
 
-WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
+
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 
 // ----------------------------------------------------------------------------
-// wxDynamicClassInfo
+// wxDynamicObject
 // ----------------------------------------------------------------------------
-
+//
 // this object leads to having a pure runtime-instantiation
 
 class WXDLLIMPEXP_BASE wxDynamicClassInfo : public wxClassInfo
 {
-    friend class WXDLLIMPEXP_BASE wxDynamicObject;
-
-public:
-    wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName, 
-                        const wxClassInfo* superClass );
-    virtual ~wxDynamicClassInfo();
+    friend class WXDLLIMPEXP_BASE wxDynamicObject ;
+public :
+    wxDynamicClassInfo( const wxChar *_UnitName, const wxChar *_ClassName , const wxClassInfo* superClass ) ;
+    virtual ~wxDynamicClassInfo() ;
 
     // constructs a wxDynamicObject with an instance
-    virtual wxObject *AllocateObject() const;
+    virtual wxObject *AllocateObject() const ;
 
     // Call the Create method for a class
-    virtual bool Create (wxObject *object, int ParamCount, wxAny *Params) const;
+    virtual void Create (wxObject *object, int ParamCount, wxxVariant *Params) const ;
 
     // get number of parameters for constructor
-    virtual int GetCreateParamCount() const;
+    virtual int GetCreateParamCount() const ;
 
     // get i-th constructor parameter
-    virtual const wxChar* GetCreateParamName(int i) const;
+    virtual const wxChar* GetCreateParamName(int i) const ;
 
     // Runtime access to objects by property name, and variant data
-    virtual void SetProperty (wxObject *object, const wxChar *PropertyName, 
-                              const wxAny &Value) const;
-    virtual wxAny GetProperty (wxObject *object, const wxChar *PropertyName) const;
+    virtual void SetProperty (wxObject *object, const wxChar *PropertyName, const wxxVariant &Value) const ;
+    virtual wxxVariant GetProperty (wxObject *object, const wxChar *PropertyName) const ;
 
     // adds a property to this class at runtime
-    void AddProperty( const wxChar *propertyName, const wxTypeInfo* typeInfo );
+    void AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo ) ;
 
     // removes an existing runtime-property
-    void RemoveProperty( const wxChar *propertyName );
+    void RemoveProperty( const wxChar *propertyName ) ;
 
     // renames an existing runtime-property
-    void RenameProperty( const wxChar *oldPropertyName, const wxChar *newPropertyName );
+    void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ;
 
     // as a handler to this class at runtime
-    void AddHandler( const wxChar *handlerName, wxObjectEventFunction address, 
-                     const wxClassInfo* eventClassInfo );
+    void AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo ) ;
 
     // removes an existing runtime-handler
-    void RemoveHandler( const wxChar *handlerName );
+    void RemoveHandler( const wxChar *handlerName ) ;
 
     // renames an existing runtime-handler
-    void RenameHandler( const wxChar *oldHandlerName, const wxChar *newHandlerName );
-
-private:
-    struct wxDynamicClassInfoInternal;
-    wxDynamicClassInfoInternal* m_data;
-};
+    void RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName ) ;
+private :
+    struct wxDynamicClassInfoInternal ;
+    wxDynamicClassInfoInternal* m_data ;
+} ;
 
 // ----------------------------------------------------------------------------
-// wxDECLARE class macros
+// Dynamic class macros
 // ----------------------------------------------------------------------------
 
-#define _DECLARE_DYNAMIC_CLASS(name)                        \
-    public:                                                 \
-        static wxClassInfo ms_classInfo;                    \
-        static const wxClassInfo* ms_classParents[];        \
-        static wxPropertyInfo* GetPropertiesStatic();       \
-        static wxHandlerInfo* GetHandlersStatic();          \
-        static wxClassInfo *GetClassInfoStatic()            \
-            { return &name::ms_classInfo; }                 \
-        virtual wxClassInfo *GetClassInfo() const           \
-            { return &name::ms_classInfo; }
+#define _DECLARE_DYNAMIC_CLASS(name)           \
+ public:                                      \
+ static wxClassInfo ms_classInfo;          \
+ static const wxClassInfo* ms_classParents[] ; \
+ static wxPropertyInfo* GetPropertiesStatic() ; \
+ static wxHandlerInfo* GetHandlersStatic() ; \
+ static wxClassInfo *GetClassInfoStatic()   \
+{ return &name::ms_classInfo; } \
+    virtual wxClassInfo *GetClassInfo() const   \
+{ return &name::ms_classInfo; }
 
-#define wxDECLARE_DYNAMIC_CLASS(name)                       \
-    static wxObjectAllocatorAndCreator* ms_constructor;           \
-    static const wxChar * ms_constructorProperties[];       \
-    static const int ms_constructorPropertiesCount;         \
+/*
+#define _DECLARE_DYNAMIC_CLASS(name)           \
+ public:                                      \
+ static wxClassInfo ms_class##name;          \
+ static const wxClassInfo* ms_classParents##name[] ; \
+ static wxPropertyInfo* GetPropertiesStatic() ; \
+ static wxHandlerInfo* GetHandlersStatic() ; \
+ static wxClassInfo *GetClassInfoStatic()   \
+{ return &name::ms_class##name; } \
+    virtual wxClassInfo *GetClassInfo() const   \
+{ return &name::ms_class##name; }
+*/
+#define DECLARE_DYNAMIC_CLASS(name)           \
+    static wxConstructorBridge* ms_constructor ; \
+    static const wxChar * ms_constructorProperties[] ; \
+    static const int ms_constructorPropertiesCount ; \
     _DECLARE_DYNAMIC_CLASS(name)
 
-#define wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)             \
-    wxDECLARE_NO_ASSIGN_CLASS(name);                        \
-    wxDECLARE_DYNAMIC_CLASS(name)
+#define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
+    DECLARE_NO_ASSIGN_CLASS(name)               \
+    DECLARE_DYNAMIC_CLASS(name)
 
-#define wxDECLARE_DYNAMIC_CLASS_NO_COPY(name)               \
-    wxDECLARE_NO_COPY_CLASS(name);                          \
-    wxDECLARE_DYNAMIC_CLASS(name)
+#define DECLARE_DYNAMIC_CLASS_NO_COPY(name)   \
+    DECLARE_NO_COPY_CLASS(name)               \
+    DECLARE_DYNAMIC_CLASS(name)
 
-#define wxDECLARE_CLASS(name)                               \
-    wxDECLARE_DYNAMIC_CLASS(name)
+#define DECLARE_ABSTRACT_CLASS(name) _DECLARE_DYNAMIC_CLASS(name)
+#define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
+
+// -----------------------------------
+// for concrete classes
+// -----------------------------------
+
+// Single inheritance with one base class
+
+#define _TYPEINFO_CLASSES(n , toString , fromString ) \
+    wxClassTypeInfo s_typeInfo##n(wxT_OBJECT , &n::ms_classInfo , toString , fromString , typeid(n).name()) ; \
+    wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR , &n::ms_classInfo , toString , fromString , typeid(n*).name()) ;
+
+#define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit , callback)                 \
+    wxObject* wxConstructorFor##name()                             \
+{ return new name; }                                          \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) wxConstructorFor##name   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties ,     \
+    name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , NULL , wxObjectToVariantConverter##name , callback);
+
+#define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback )                 \
+    wxObject* wxConstructorFor##name()                             \
+{ return new name; }                                          \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
+    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return &data.wxTEMPLATED_MEMBER_CALL(Get , name) ; } \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) wxConstructorFor##name   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties,     \
+    name::ms_constructorPropertiesCount , wxVariantOfPtrToObjectConverter##name , wxVariantToObjectConverter##name , wxObjectToVariantConverter##name, callback);
+
+#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename ) \
+    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , "" , NULL ) \
+    _TYPEINFO_CLASSES(name, NULL , NULL) \
+    const wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+    const wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+    wxCONSTRUCTOR_DUMMY( name )
+
+#define IMPLEMENT_DYNAMIC_CLASS( name , basename ) \
+    _IMPLEMENT_DYNAMIC_CLASS( name , basename , "" , NULL ) \
+     _TYPEINFO_CLASSES(name, NULL , NULL) \
+   wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+    wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+    wxCONSTRUCTOR_DUMMY( name )
+
+#define IMPLEMENT_DYNAMIC_CLASS_XTI( name , basename , unit ) \
+    _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , NULL ) \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+#define IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name , basename , unit , callback ) \
+    _IMPLEMENT_DYNAMIC_CLASS( name , basename , unit , &callback ) \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name , basename , unit ) \
+    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit , NULL  ) \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+#define IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name , basename , unit , toString , fromString ) \
+    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name , basename , unit , NULL  ) \
+    _TYPEINFO_CLASSES(name, toString , fromString)
+
+// this is for classes that do not derive from wxobject, there are no creators for these
+
+#define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \
+    const wxClassInfo* name::ms_classParents[] = { NULL } ; \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) 0   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
+    0 , 0 , 0 );    \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+// this is for subclasses that still do not derive from wxobject
+
+#define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) 0   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
+    0 , 0 , 0 );    \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+
+// Multiple inheritance with two base classes
+
+#define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit)                 \
+    wxObject* wxConstructorFor##name()                             \
+{ return new name; }                                          \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,&basename2::ms_classInfo , NULL } ; \
+    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxT(unit) , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) wxConstructorFor##name   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),name::ms_constructor , name::ms_constructorProperties ,     \
+    name::ms_constructorPropertiesCount , wxVariantToObjectConverter##name, wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
+
+#define IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2) \
+    _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , "") \
+    _TYPEINFO_CLASSES(name, NULL , NULL) \
+    wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; } \
+    wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+    wxCONSTRUCTOR_DUMMY( name )
+
+#define IMPLEMENT_DYNAMIC_CLASS2_XTI( name , basename , basename2, unit) \
+    _IMPLEMENT_DYNAMIC_CLASS2( name , basename , basename2 , unit) \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+
+// -----------------------------------
+// for abstract classes
+// -----------------------------------
+
+// Single inheritance with one base class
+
+#define _IMPLEMENT_ABSTRACT_CLASS(name, basename)                \
+    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
+    wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
+    wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data)  ) ; } \
+    wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name),   \
+    (int) sizeof(name),                              \
+    (wxObjectConstructorFn) 0   ,   \
+    name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 ,     \
+    0 , wxVariantOfPtrToObjectConverter##name ,wxVariantToObjectConverter##name , wxObjectToVariantConverter##name);    \
+    _TYPEINFO_CLASSES(name, NULL , NULL)
+
+#define IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
+    _IMPLEMENT_ABSTRACT_CLASS( name , basename ) \
+    wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL ; } \
+    wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL ; }
+
+// Multiple inheritance with two base classes
+
+#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)   \
+    wxClassInfo name::ms_classInfo(wxT(#name), wxT(#basename1),  \
+    wxT(#basename2), (int) sizeof(name),                \
+    (wxObjectConstructorFn) 0);
+
+#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
+#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
+
+#define wxBEGIN_EVENT_TABLE( a , b ) BEGIN_EVENT_TABLE( a , b )
+#define wxEND_EVENT_TABLE() END_EVENT_TABLE()
+
+// --------------------------------------------------------------------------
+// Collection Support
+// --------------------------------------------------------------------------
+
+template<typename iter , typename collection_t > void wxListCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value )
+{
+    iter current = coll.GetFirst() ;
+    while (current)
+    {
+        value.Add( new wxxVariant(current->GetData()) ) ;
+        current = current->GetNext();
+    }
+}
+
+template<typename collection_t> void wxArrayCollectionToVariantArray( const collection_t& coll , wxxVariantArray &value )
+{
+    for( size_t i = 0 ; i < coll.GetCount() ; i++ )
+    {
+        value.Add( new wxxVariant(coll[i]) ) ;
+    }
+}
 
-#define wxDECLARE_ABSTRACT_CLASS(name)    _DECLARE_DYNAMIC_CLASS(name)
-#define wxCLASSINFO(name)                 (&name::ms_classInfo)
 
-#endif  // wxUSE_EXTENDED_RTTI
 #endif // _WX_XTIH__
diff --git a/Source/3rd Party/wx/include/wx/xti2.h b/Source/3rd Party/wx/include/wx/xti2.h
deleted file mode 100644
index 581f8b11a..000000000
--- a/Source/3rd Party/wx/include/wx/xti2.h	
+++ /dev/null
@@ -1,294 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/wxt2.h
-// Purpose:     runtime metadata information (extended class info)
-// Author:      Stefan Csomor
-// Modified by: Francesco Montorsi
-// Created:     27/07/03
-// RCS-ID:      $Id$
-// Copyright:   (c) 1997 Julian Smart
-//              (c) 2003 Stefan Csomor
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XTI2H__
-#define _WX_XTI2H__
-
-// ----------------------------------------------------------------------------
-// second part of xti headers, is included from object.h
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-
-// ----------------------------------------------------------------------------
-// wxDynamicObject class, its instances connect to a 'super class instance'
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject
-{
-    friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ;
-public:
-    // instantiates this object with an instance of its superclass
-    wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) ;
-    virtual ~wxDynamicObject();
-
-    void SetProperty (const wxChar *propertyName, const wxAny &value);
-    wxAny GetProperty (const wxChar *propertyName) const ;
-
-    // get the runtime identity of this object
-    wxClassInfo *GetClassInfo() const
-    {
-#ifdef _MSC_VER
-        return (wxClassInfo*) m_classInfo;
-#else
-        wxDynamicClassInfo *nonconst = const_cast<wxDynamicClassInfo *>(m_classInfo);
-        return static_cast<wxClassInfo *>(nonconst);
-#endif
-    }
-
-    wxObject* GetSuperClassInstance() const
-    {
-        return m_superClassInstance ;
-    }
-private :
-    // removes an existing runtime-property
-    void RemoveProperty( const wxChar *propertyName ) ;
-
-    // renames an existing runtime-property
-    void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ;
-
-    wxObject *m_superClassInstance ;
-    const wxDynamicClassInfo *m_classInfo;
-    struct wxDynamicObjectInternal;
-    wxDynamicObjectInternal *m_data;
-};
-
-// ----------------------------------------------------------------------------
-// String conversion templates supporting older compilers
-// ----------------------------------------------------------------------------
-
-#if wxUSE_FUNC_TEMPLATE_POINTER
-#  define wxTO_STRING(type) wxToStringConverter<type>
-#  define wxTO_STRING_IMP(type)
-#  define wxFROM_STRING(type) wxFromStringConverter<type>
-#  define wxFROM_STRING_IMP(type)
-#else
-#  define wxTO_STRING(type) ToString##type
-#  define wxTO_STRING_IMP(type) \
-    inline void ToString##type( const wxAny& data, wxString &result ) \
-{ wxToStringConverter<type>(data, result); }
-
-#  define wxFROM_STRING(type) FromString##type
-#  define wxFROM_STRING_IMP(type) \
-    inline void FromString##type( const wxString& data, wxAny &result ) \
-{ wxFromStringConverter<type>(data, result); }
-#endif
-
-#include "wx/xtiprop.h"
-#include "wx/xtictor.h"
-
-// ----------------------------------------------------------------------------
-// wxIMPLEMENT class macros for concrete classes
-// ----------------------------------------------------------------------------
-
-// Single inheritance with one base class
-
-#define _DEFAULT_CONSTRUCTOR(name)                                          \
-wxObject* wxConstructorFor##name()                                          \
-{ return new name; }                                                        
-
-#define _DEFAULT_CONVERTERS(name)                                          \
-wxObject* wxVariantOfPtrToObjectConverter##name ( const wxAny &data )        \
-{ return data.As( (name**)NULL ); }                    \
-    wxAny wxObjectToVariantConverter##name ( wxObject *data )              \
-{ return wxAny( wx_dynamic_cast(name*, data)  ); }
-
-#define _TYPEINFO_CLASSES(n, toString, fromString )                           \
-    wxClassTypeInfo s_typeInfo##n(wxT_OBJECT, &n::ms_classInfo,               \
-    toString, fromString, typeid(n).name());    \
-    wxClassTypeInfo s_typeInfoPtr##n(wxT_OBJECT_PTR, &n::ms_classInfo,        \
-    toString, fromString, typeid(n*).name());
-
-#define _IMPLEMENT_DYNAMIC_CLASS(name, basename, unit, callback)                \
-    _DEFAULT_CONSTRUCTOR(name)                                                  \
-    _DEFAULT_CONVERTERS(name)                                                   \
-    \
-    const wxClassInfo* name::ms_classParents[] =                                \
-{ &basename::ms_classInfo, NULL };                                      \
-    wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit),            \
-    wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name,   \
-    name::GetPropertiesStatic, name::GetHandlersStatic, name::ms_constructor,     \
-    name::ms_constructorProperties, name::ms_constructorPropertiesCount,              \
-    wxVariantOfPtrToObjectConverter##name, NULL, wxObjectToVariantConverter##name,    \
-    callback);
-
-#define _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY(name, basename, unit, callback )         \
-    _DEFAULT_CONSTRUCTOR(name)                                                  \
-    _DEFAULT_CONVERTERS(name)                                                   \
-    void wxVariantToObjectConverter##name ( const wxAny &data, wxObjectFunctor* fn )                 \
-    { name o = wxANY_AS(data, name); (*fn)( &o ); }                        \
-    \
-    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo,NULL };  \
-    wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit),                \
-    wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name,  \
-    name::GetPropertiesStatic,name::GetHandlersStatic,name::ms_constructor,      \
-    name::ms_constructorProperties, name::ms_constructorPropertiesCount,             \
-    wxVariantOfPtrToObjectConverter##name, wxVariantToObjectConverter##name,         \
-    wxObjectToVariantConverter##name, callback);
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename )                   \
-    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, "", NULL )              \
-    _TYPEINFO_CLASSES(name, NULL, NULL)                                         \
-    const wxPropertyInfo *name::GetPropertiesStatic()                           \
-{ return (wxPropertyInfo*) NULL; }                                      \
-    const wxHandlerInfo *name::GetHandlersStatic()                              \
-{ return (wxHandlerInfo*) NULL; }                                       \
-    wxCONSTRUCTOR_DUMMY( name )
-
-#define wxIMPLEMENT_DYNAMIC_CLASS( name, basename )                             \
-    _IMPLEMENT_DYNAMIC_CLASS( name, basename, "", NULL )                        \
-    _TYPEINFO_CLASSES(name, NULL, NULL)                                         \
-    wxPropertyInfo *name::GetPropertiesStatic()                                 \
-{ return (wxPropertyInfo*) NULL; }                                      \
-    wxHandlerInfo *name::GetHandlersStatic()                                    \
-{ return (wxHandlerInfo*) NULL; }                                       \
-    wxCONSTRUCTOR_DUMMY( name )
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_XTI( name, basename, unit )                   \
-    _IMPLEMENT_DYNAMIC_CLASS( name, basename, unit, NULL )                      \
-    _TYPEINFO_CLASSES(name, NULL, NULL)
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK( name, basename, unit, callback )\
-    _IMPLEMENT_DYNAMIC_CLASS( name, basename, unit, &callback )                 \
-    _TYPEINFO_CLASSES(name, NULL, NULL)
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( name, basename, unit )         \
-    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, unit, NULL  )           \
-    _TYPEINFO_CLASSES(name, NULL, NULL)
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( name, basename,  \
-    unit, toString,    \
-    fromString )       \
-    _IMPLEMENT_DYNAMIC_CLASS_WITH_COPY( name, basename, unit, NULL  )           \
-    _TYPEINFO_CLASSES(name, toString, fromString)
-
-// this is for classes that do not derive from wxObject, there are no creators for these
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name, unit )         \
-    const wxClassInfo* name::ms_classParents[] = { NULL };                      \
-    wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString,        \
-    wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0,          \
-    name::GetPropertiesStatic,name::GetHandlersStatic, 0, 0,        \
-    0, 0, 0 );                                                          \
-    _TYPEINFO_CLASSES(name, NULL, NULL)
-
-// this is for subclasses that still do not derive from wxObject
-
-#define wxIMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name, basename, unit )           \
-    const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo, NULL }; \
-    wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString,            \
-    wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0,              \
-    name::GetPropertiesStatic,name::GetHandlersStatic, 0, 0,            \
-    0, 0, 0 );                                                              \
-    _TYPEINFO_CLASSES(name, NULL, NULL)
-
-
-// Multiple inheritance with two base classes
-
-#define _IMPLEMENT_DYNAMIC_CLASS2(name, basename, basename2, unit, callback)         \
-    _DEFAULT_CONSTRUCTOR(name)                                                  \
-    _DEFAULT_CONVERTERS(name)                                                   \
-    \
-    const wxClassInfo* name::ms_classParents[] =                                     \
-{ &basename::ms_classInfo,&basename2::ms_classInfo, NULL };                  \
-    wxClassInfo name::ms_classInfo(name::ms_classParents, wxT(unit),                 \
-    wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name, \
-    name::GetPropertiesStatic,name::GetHandlersStatic,name::ms_constructor,     \
-    name::ms_constructorProperties, name::ms_constructorPropertiesCount,            \
-    wxVariantOfPtrToObjectConverter##name, NULL, wxObjectToVariantConverter##name,  \
-    callback);
-
-#define wxIMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2)                      \
-    _IMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2, "", NULL)                 \
-    _TYPEINFO_CLASSES(name, NULL, NULL)                                             \
-    wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL; }  \
-    wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL; }      \
-    wxCONSTRUCTOR_DUMMY( name )
-
-#define wxIMPLEMENT_DYNAMIC_CLASS2_XTI( name, basename, basename2, unit) \
-    _IMPLEMENT_DYNAMIC_CLASS2( name, basename, basename2, unit, NULL)    \
-    _TYPEINFO_CLASSES(name, NULL, NULL)
-
-
-
-// ----------------------------------------------------------------------------
-// wxIMPLEMENT class macros for abstract classes
-// ----------------------------------------------------------------------------
-
-// Single inheritance with one base class
-
-#define _IMPLEMENT_ABSTRACT_CLASS(name, basename)                               \
-    _DEFAULT_CONVERTERS(name)                                                   \
-    \
-    const wxClassInfo* name::ms_classParents[] =                                \
-{ &basename::ms_classInfo,NULL };                                       \
-    wxClassInfo name::ms_classInfo(name::ms_classParents, wxEmptyString,        \
-    wxT(#name), (int) sizeof(name), (wxObjectConstructorFn) 0,              \
-    name::GetPropertiesStatic,name::GetHandlersStatic, 0, 0,            \
-    0, wxVariantOfPtrToObjectConverter##name,0, \
-    wxObjectToVariantConverter##name);                                         \
-    _TYPEINFO_CLASSES(name, NULL, NULL)
-
-#define wxIMPLEMENT_ABSTRACT_CLASS( name, basename )                            \
-    _IMPLEMENT_ABSTRACT_CLASS( name, basename )                                 \
-    wxHandlerInfo *name::GetHandlersStatic() { return (wxHandlerInfo*) NULL; }  \
-    wxPropertyInfo *name::GetPropertiesStatic() { return (wxPropertyInfo*) NULL; }
-
-// Multiple inheritance with two base classes
-
-#define wxIMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)                 \
-    wxClassInfo name::ms_classInfo(wxT(#name), wxT(#basename1),                 \
-    wxT(#basename2), (int) sizeof(name),         \
-    (wxObjectConstructorFn) 0);
-
-// templated streaming, every type that can be converted to wxString
-// must have their specialization for these methods
-
-template<typename T>
-void wxStringReadValue( const wxString &s, T &data );
-
-template<typename T>
-void wxStringWriteValue( wxString &s, const T &data);
-
-template<typename T>
-void wxToStringConverter( const wxAny &v, wxString &s ) 
-{ wxStringWriteValue(s, wxANY_AS(v, T)); }
-
-template<typename T>
-void wxFromStringConverter( const wxString &s, wxAny &v) 
-{ T d; wxStringReadValue(s, d); v = wxAny(d); }
-
-// --------------------------------------------------------------------------
-// Collection Support
-// --------------------------------------------------------------------------
-
-template<typename iter, typename collection_t > void wxListCollectionToAnyList( 
-                                                                               const collection_t& coll, wxAnyList &value )
-{
-    for ( iter current = coll.GetFirst(); current; 
-         current = current->GetNext() )
-    {
-        value.Append( new wxAny(current->GetData()) );
-    }
-}
-
-template<typename collection_t> void wxArrayCollectionToVariantArray( 
-                                                                     const collection_t& coll, wxAnyList &value )
-{
-    for( size_t i = 0; i < coll.GetCount(); i++ )
-    {
-        value.Append( new wxAny(coll[i]) );
-    }
-}
-
-#endif
-
-#endif // _WX_XTIH2__
diff --git a/Source/3rd Party/wx/include/wx/zipstrm.h b/Source/3rd Party/wx/include/wx/zipstrm.h
index b4c29f8eb..572b88a9f 100644
--- a/Source/3rd Party/wx/include/wx/zipstrm.h	
+++ b/Source/3rd Party/wx/include/wx/zipstrm.h	
@@ -2,7 +2,7 @@
 // Name:        wx/zipstrm.h
 // Purpose:     Streams for Zip files
 // Author:      Mike Wetherell
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: zipstrm.h 53135 2008-04-12 02:31:04Z VZ $
 // Copyright:   (c) Mike Wetherell
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -346,9 +346,8 @@ private:
     int m_level;
     wxFileOffset m_offsetAdjustment;
     wxString m_Comment;
-    bool m_endrecWritten;
 
-    wxDECLARE_NO_COPY_CLASS(wxZipOutputStream);
+    DECLARE_NO_COPY_CLASS(wxZipOutputStream)
 };
 
 
@@ -446,7 +445,7 @@ private:
     friend class wxArchiveFSHandler;
 #endif
 
-    wxDECLARE_NO_COPY_CLASS(wxZipInputStream);
+    DECLARE_NO_COPY_CLASS(wxZipInputStream)
 };
 
 
diff --git a/Source/3rd Party/wx/include/wx/zstream.h b/Source/3rd Party/wx/include/wx/zstream.h
index 78c121e95..cb7011d1f 100644
--- a/Source/3rd Party/wx/include/wx/zstream.h	
+++ b/Source/3rd Party/wx/include/wx/zstream.h	
@@ -4,7 +4,7 @@
 // Author:      Guilhem Lavaux
 // Modified by: Mike Wetherell
 // Created:     11/07/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: zstream.h 54688 2008-07-18 08:06:44Z MW $
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,10 +16,9 @@
 #if wxUSE_ZLIB && wxUSE_STREAMS
 
 #include "wx/stream.h"
-#include "wx/versioninfo.h"
 
 // Compression level
-enum wxZlibCompressionLevels {
+enum {
     wxZ_DEFAULT_COMPRESSION = -1,
     wxZ_NO_COMPRESSION = 0,
     wxZ_BEST_SPEED = 1,
@@ -27,7 +26,10 @@ enum wxZlibCompressionLevels {
 };
 
 // Flags
-enum wxZLibFlags {
+enum {
+#if WXWIN_COMPATIBILITY_2_4
+    wxZLIB_24COMPATIBLE = 4, // read v2.4.x data without error
+#endif
     wxZLIB_NO_HEADER = 0,    // raw deflate stream, no header or checksum
     wxZLIB_ZLIB = 1,         // zlib header and checksum
     wxZLIB_GZIP = 2,         // gzip header and checksum, requires zlib 1.2.1+
@@ -45,9 +47,6 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
 
   static bool CanHandleGZip();
 
-  bool SetDictionary(const char *data, const size_t datalen);
-  bool SetDictionary(const wxMemoryBuffer &buf);
-
  protected:
   size_t OnSysRead(void *buffer, size_t size);
   wxFileOffset OnSysTell() const { return m_pos; }
@@ -60,8 +59,11 @@ class WXDLLIMPEXP_BASE wxZlibInputStream: public wxFilterInputStream {
   unsigned char *m_z_buffer;
   struct z_stream_s *m_inflate;
   wxFileOffset m_pos;
+#if WXWIN_COMPATIBILITY_2_4
+  bool m_24compatibilty;
+#endif
 
-  wxDECLARE_NO_COPY_CLASS(wxZlibInputStream);
+  DECLARE_NO_COPY_CLASS(wxZlibInputStream)
 };
 
 class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
@@ -76,9 +78,6 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
 
   static bool CanHandleGZip();
 
-  bool SetDictionary(const char *data, const size_t datalen);
-  bool SetDictionary(const wxMemoryBuffer &buf);
-
  protected:
   size_t OnSysWrite(const void *buffer, size_t size);
   wxFileOffset OnSysTell() const { return m_pos; }
@@ -94,7 +93,7 @@ class WXDLLIMPEXP_BASE wxZlibOutputStream: public wxFilterOutputStream {
   struct z_stream_s *m_deflate;
   wxFileOffset m_pos;
 
-  wxDECLARE_NO_COPY_CLASS(wxZlibOutputStream);
+  DECLARE_NO_COPY_CLASS(wxZlibOutputStream)
 };
 
 class WXDLLIMPEXP_BASE wxZlibClassFactory: public wxFilterClassFactory
@@ -126,11 +125,11 @@ public:
     wxFilterInputStream *NewStream(wxInputStream& stream) const
         { return new wxZlibInputStream(stream); }
     wxFilterOutputStream *NewStream(wxOutputStream& stream) const
-        { return new wxZlibOutputStream(stream, -1); }
+        { return new wxZlibOutputStream(stream, -1, wxZLIB_GZIP); }
     wxFilterInputStream *NewStream(wxInputStream *stream) const
         { return new wxZlibInputStream(stream); }
     wxFilterOutputStream *NewStream(wxOutputStream *stream) const
-        { return new wxZlibOutputStream(stream, -1); }
+        { return new wxZlibOutputStream(stream, -1, wxZLIB_GZIP); }
 
     const wxChar * const *GetProtocols(wxStreamProtocolType type
                                        = wxSTREAM_PROTOCOL) const;
@@ -139,8 +138,6 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGzipClassFactory)
 };
 
-WXDLLIMPEXP_BASE wxVersionInfo wxGetZlibVersionInfo();
-
 #endif
   // wxUSE_ZLIB && wxUSE_STREAMS
 
diff --git a/Source/3rd Party/wx/lib/vc_lib/msw/setup.h b/Source/3rd Party/wx/lib/vc_lib/msw/setup.h
deleted file mode 100644
index acb2276b9..000000000
--- a/Source/3rd Party/wx/lib/vc_lib/msw/setup.h	
+++ /dev/null
@@ -1,1649 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/setup.h
-// Purpose:     Configuration for the library
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
-
-/* --- start common options --- */
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
-
-// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
-// default system font is used for wxWindow::GetCharWidth/Height() instead of
-// the current font.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWidgets memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 0
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 0
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
-
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#endif
-
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Note that like wxUSE_THREADS this option is automatically set to 0 if
-// wxNO_EXCEPTIONS is defined.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0 (this is still work in progress...)
-#define wxUSE_EXTENDED_RTTI 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
-// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effect.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled, compiles wxWidgets streams classes
-//
-// wx stream classes are used for image IO, process IO redirection, network
-// protocols implementation and much more and so disabling this results in a
-// lot of other functionality being lost.
-//
-// Default is 1
-//
-// Recommended setting: 1 as setting it to 0 disables many other things
-#define wxUSE_STREAMS       1
-
-// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
-// Note that if the system's implementation does not support positional
-// parameters, setting this to 1 forces the use of the wxWidgets implementation
-// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
-// many Unix systems but usually doesn't under Windows.
-//
-// Positional parameters are very useful when translating a program since using
-// them in formatting strings allow translators to correctly reorder the
-// translated sentences.
-//
-// Default is 1
-//
-// Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      1
-
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but must
-// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
-// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
-// support that results in crashes when any TLS variables are used. So if you
-// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
-// this to 0.
-//
-// Default is 1, but set to 0 if the scenario above is applicable.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// Use wxStandardPaths class which allows to retrieve some standard locations
-// in the file system
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be disabled to save space, but not much)
-#define wxUSE_STDPATHS      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   1
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ARCHIVE    1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS     1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxTarInput/OutputStream classes.
-#define wxUSE_TARSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG
-#define wxUSE_ZLIB          1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWidgets one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for wxVariant class used in several places throughout the library,
-// notably in wxDataViewCtrl API.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size as much as
-// possible in which case setting this to 0 can gain up to 100KB.
-#define wxUSE_VARIANT 1
-
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// Use wxMediaCtrl
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
-
-// Use wxWidget's XRC XML-based resource system.  Recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is the same as wxUSE_XRC, i.e. 1 by default.
-//
-// Recommended setting: 1 (required by XRC)
-#define wxUSE_XML       wxUSE_XRC
-
-// Use wxWidget's AUI docking system
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_AUI       1
-
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
-
-// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
-
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWidgets control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
-#define wxUSE_BUTTON        1   // wxButton
-#define wxUSE_BMPBUTTON     1   // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1   // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE        1   // wxChoice
-#define wxUSE_COLLPANE      1   // wxCollapsiblePane
-#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
-#define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
-#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
-#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
-#define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1   // wxListBox
-#define wxUSE_LISTCTRL      1   // wxListCtrl
-#define wxUSE_RADIOBOX      1   // wxRadioBox
-#define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
-#define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
-#define wxUSE_SLIDER        1   // wxSlider
-#define wxUSE_SPINBTN       1   // wxSpinButton
-#define wxUSE_SPINCTRL      1   // wxSpinCtrl
-#define wxUSE_STATBOX       1   // wxStaticBox
-#define wxUSE_STATLINE      1   // wxStaticLine
-#define wxUSE_STATTEXT      1   // wxStaticText
-#define wxUSE_STATBMP       1   // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
-#define wxUSE_TOGGLEBTN     1   // requires wxButton
-#define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1 for the platforms where native status bar is supported.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used to logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CHOICEBOOK 1
-
-// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TREEBOOK 1
-
-// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
-// tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLBOOK 1
-
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
-
-// wxGrid class
-//
-// Default is 1, set to 0 to cut down compilation time and binaries size if you
-// don't use it.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// wxMiniFrame class: a frame with narrow title bar
-//
-// Default is 1.
-//
-// Recommended setting: 1 (it doesn't cost almost anything)
-#define wxUSE_MINIFRAME 1
-
-// wxComboCtrl and related classes: combobox with custom popup window and
-// not necessarily a listbox.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
-//                      it used by wxComboBox
-#define wxUSE_COMBOCTRL 1
-
-// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
-// items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0, except where it is
-//                      needed as a base class for generic wxBitmapComboBox.
-#define wxUSE_ODCOMBOBOX 1
-
-// wxBitmapComboBox is a combobox that can have images in front of text items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0
-#define wxUSE_BITMAPCOMBOBOX 1
-
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// their geometries as well as finding the display on which the given point or
-// window lies.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// Compile in wxAboutBox() function showing the standard "About" dialog.
-//
-// Default is 1
-//
-// Recommended setting: 1 but can be set to 0 to save some space if you don't
-//                      use this function
-#define wxUSE_ABOUTDLG 1
-
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable MDI support.
-//
-// Requires wxUSE_NOTEBOOK under platforms other than MSW.
-//
-// Default is 1.
-//
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Set to 0 to disable MDI document/view architecture
-//
-// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
-//
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
-//
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
-
-// wxRichTextCtrl allows editing of styled text.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 if you want compile a
-// smaller library.
-#define wxUSE_RICHTEXT       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running.
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-
-// Should we use MS HTML help for wxHelpController? If disabled, neither
-// wxCHMHelpController nor wxBestHelpController are available.
-//
-// Default is 1 under MSW, 0 is always used for the other platforms.
-//
-// Recommended setting: 1, only set to 0 if you have trouble compiling
-// wxCHMHelpController (could be a problem with really ancient compilers)
-#define wxUSE_MS_HTML_HELP 1
-
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
-// ----------------------------------------------------------------------------
-// wxDC classes for various output formats
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
-
-// Should wxDC provide SetTransformMatrix() and related methods?
-//
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
-//
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-
-
-/* --- end common options --- */
-
-/* --- start MSW options --- */
-// ----------------------------------------------------------------------------
-// Windows-only settings
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
-// and want to run your programs under Windows 9x and not only NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
-// that you will have to modify the makefiles to include unicows.lib import
-// library as the first library (see installation instructions in install.txt
-// to learn how to do it when building the library or samples).
-//
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
-//
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
-#ifndef wxUSE_UNICODE_MSLU
-    #define wxUSE_UNICODE_MSLU 0
-#endif
-
-// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
-// will override some other settings (see below)
-//
-// Default is 0.
-//
-// Recommended setting: 0 unless you really have to use MFC
-#define wxUSE_MFC           0
-
-// Set this to 1 for generic OLE support: this is required for drag-and-drop,
-// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
-// can't compile/doesn't have the OLE headers.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_OLE           1
-
-// Set this to 1 to enable wxAutomationObject class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need to control other applications via OLE
-// Automation, can be safely set to 0 otherwise
-#define wxUSE_OLE_AUTOMATION 1
-
-// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE
-// controls in wx.
-//
-// Default is 1.
-//
-// Recommended setting: 1, required by wxMediaCtrl
-#define wxUSE_ACTIVEX 1
-
-// wxDC caching implementation
-#define wxUSE_DC_CACHEING 1
-
-// Set this to 1 to enable wxDIB class used internally for manipulating
-// wxBitmap data.
-//
-// Default is 1, set it to 0 only if you don't use wxImage neither
-//
-// Recommended setting: 1 (without it conversion to/from wxImage won't work)
-#define wxUSE_WXDIB 1
-
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-// Set this to 1 to compile in wxRegKey class.
-//
-// Default is 1
-//
-// Recommended setting: 1, this is used internally by wx in a few places
-#define wxUSE_REGKEY 1
-
-// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
-// which allows to put more than ~32Kb of text in it even under Win9x (NT
-// doesn't have such limitation).
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1, only set it to 0 if your compiler doesn't have
-//                      or can't compile <richedit.h>
-#define wxUSE_RICHEDIT  1
-
-// Set this to 1 to use extra features of richedit v2 and later controls
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1
-#define wxUSE_RICHEDIT2 1
-
-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 1
-
-// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It
-// is required by native wxNotificationMessage implementation.
-//
-// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain
-// the necessary declarations.
-//
-// Recommended setting: 1, set to 0 for a tiny library size reduction
-#define wxUSE_TASKBARICON_BALLOONS 1
-
-// Set to 1 to compile MS Windows XP theme engine support
-#define wxUSE_UXTHEME           1
-
-// Set to 1 to use InkEdit control (Tablet PC), if available
-#define wxUSE_INKEDIT  0
-
-// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
-//
-// Default is 0.
-//
-// Recommended setting: 0, nobody uses .INI files any more
-#define wxUSE_INICONF 0
-
-// ----------------------------------------------------------------------------
-// Generic versions of native controls
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the
-// native wxDatePickerCtrl
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_DATEPICKCTRL_GENERIC 0
-
-// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the
-// native wxTimePickerCtrl for the platforms that have the latter (MSW).
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_TIMEPICKCTRL_GENERIC 0
-
-// ----------------------------------------------------------------------------
-// Crash debugging helpers
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxCrashReport::Generate() to create mini
-// dumps of your program when it crashes (or at any other moment)
-//
-// Default is 1 if supported by the compiler (VC++ and recent BC++ only).
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_CRASHREPORT 1
-/* --- end MSW options --- */
-
-#endif // _WX_SETUP_H_
-
diff --git a/Source/3rd Party/wx/lib/vc_lib/msw/wx/msw/rcdefs.h b/Source/3rd Party/wx/lib/vc_lib/msw/wx/msw/rcdefs.h
index 66c9f7fcc..9f9e03b93 100644
--- a/Source/3rd Party/wx/lib/vc_lib/msw/wx/msw/rcdefs.h	
+++ b/Source/3rd Party/wx/lib/vc_lib/msw/wx/msw/rcdefs.h	
@@ -1,44 +1,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-#ifndef _WX_RCDEFS_H
-#define _WX_RCDEFS_H
-
-
-#define WX_MSC_FULL_VER 150030729
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#define WX_CPU_X86
-
-
-
-
-
-
-
-
-
-
-#endif
+
+
+
+
+
+
+
+
+
+
+
+
+#ifndef _WX_RCDEFS_H
+#define _WX_RCDEFS_H
+
+
+#define WX_MSC_FULL_VER 150021022
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#define WX_CPU_X86
+
+
+
+
+
+
+
+
+
+
+#endif
diff --git a/Source/3rd Party/wx/lib/vc_lib/msw/wx/setup.h b/Source/3rd Party/wx/lib/vc_lib/msw/wx/setup.h
deleted file mode 100644
index acb2276b9..000000000
--- a/Source/3rd Party/wx/lib/vc_lib/msw/wx/setup.h	
+++ /dev/null
@@ -1,1649 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/setup.h
-// Purpose:     Configuration for the library
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
-
-/* --- start common options --- */
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
-
-// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
-// default system font is used for wxWindow::GetCharWidth/Height() instead of
-// the current font.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWidgets memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 0
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 0
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
-
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#endif
-
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Note that like wxUSE_THREADS this option is automatically set to 0 if
-// wxNO_EXCEPTIONS is defined.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0 (this is still work in progress...)
-#define wxUSE_EXTENDED_RTTI 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
-// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effect.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled, compiles wxWidgets streams classes
-//
-// wx stream classes are used for image IO, process IO redirection, network
-// protocols implementation and much more and so disabling this results in a
-// lot of other functionality being lost.
-//
-// Default is 1
-//
-// Recommended setting: 1 as setting it to 0 disables many other things
-#define wxUSE_STREAMS       1
-
-// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
-// Note that if the system's implementation does not support positional
-// parameters, setting this to 1 forces the use of the wxWidgets implementation
-// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
-// many Unix systems but usually doesn't under Windows.
-//
-// Positional parameters are very useful when translating a program since using
-// them in formatting strings allow translators to correctly reorder the
-// translated sentences.
-//
-// Default is 1
-//
-// Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      1
-
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but must
-// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
-// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
-// support that results in crashes when any TLS variables are used. So if you
-// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
-// this to 0.
-//
-// Default is 1, but set to 0 if the scenario above is applicable.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// Use wxStandardPaths class which allows to retrieve some standard locations
-// in the file system
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be disabled to save space, but not much)
-#define wxUSE_STDPATHS      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   1
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ARCHIVE    1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS     1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxTarInput/OutputStream classes.
-#define wxUSE_TARSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG
-#define wxUSE_ZLIB          1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWidgets one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for wxVariant class used in several places throughout the library,
-// notably in wxDataViewCtrl API.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size as much as
-// possible in which case setting this to 0 can gain up to 100KB.
-#define wxUSE_VARIANT 1
-
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// Use wxMediaCtrl
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
-
-// Use wxWidget's XRC XML-based resource system.  Recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is the same as wxUSE_XRC, i.e. 1 by default.
-//
-// Recommended setting: 1 (required by XRC)
-#define wxUSE_XML       wxUSE_XRC
-
-// Use wxWidget's AUI docking system
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_AUI       1
-
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
-
-// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
-
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWidgets control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
-#define wxUSE_BUTTON        1   // wxButton
-#define wxUSE_BMPBUTTON     1   // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1   // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE        1   // wxChoice
-#define wxUSE_COLLPANE      1   // wxCollapsiblePane
-#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
-#define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
-#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
-#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
-#define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1   // wxListBox
-#define wxUSE_LISTCTRL      1   // wxListCtrl
-#define wxUSE_RADIOBOX      1   // wxRadioBox
-#define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
-#define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
-#define wxUSE_SLIDER        1   // wxSlider
-#define wxUSE_SPINBTN       1   // wxSpinButton
-#define wxUSE_SPINCTRL      1   // wxSpinCtrl
-#define wxUSE_STATBOX       1   // wxStaticBox
-#define wxUSE_STATLINE      1   // wxStaticLine
-#define wxUSE_STATTEXT      1   // wxStaticText
-#define wxUSE_STATBMP       1   // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
-#define wxUSE_TOGGLEBTN     1   // requires wxButton
-#define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1 for the platforms where native status bar is supported.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used to logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CHOICEBOOK 1
-
-// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TREEBOOK 1
-
-// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
-// tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLBOOK 1
-
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
-
-// wxGrid class
-//
-// Default is 1, set to 0 to cut down compilation time and binaries size if you
-// don't use it.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// wxMiniFrame class: a frame with narrow title bar
-//
-// Default is 1.
-//
-// Recommended setting: 1 (it doesn't cost almost anything)
-#define wxUSE_MINIFRAME 1
-
-// wxComboCtrl and related classes: combobox with custom popup window and
-// not necessarily a listbox.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
-//                      it used by wxComboBox
-#define wxUSE_COMBOCTRL 1
-
-// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
-// items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0, except where it is
-//                      needed as a base class for generic wxBitmapComboBox.
-#define wxUSE_ODCOMBOBOX 1
-
-// wxBitmapComboBox is a combobox that can have images in front of text items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0
-#define wxUSE_BITMAPCOMBOBOX 1
-
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// their geometries as well as finding the display on which the given point or
-// window lies.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// Compile in wxAboutBox() function showing the standard "About" dialog.
-//
-// Default is 1
-//
-// Recommended setting: 1 but can be set to 0 to save some space if you don't
-//                      use this function
-#define wxUSE_ABOUTDLG 1
-
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable MDI support.
-//
-// Requires wxUSE_NOTEBOOK under platforms other than MSW.
-//
-// Default is 1.
-//
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Set to 0 to disable MDI document/view architecture
-//
-// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
-//
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
-//
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
-
-// wxRichTextCtrl allows editing of styled text.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 if you want compile a
-// smaller library.
-#define wxUSE_RICHTEXT       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running.
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-
-// Should we use MS HTML help for wxHelpController? If disabled, neither
-// wxCHMHelpController nor wxBestHelpController are available.
-//
-// Default is 1 under MSW, 0 is always used for the other platforms.
-//
-// Recommended setting: 1, only set to 0 if you have trouble compiling
-// wxCHMHelpController (could be a problem with really ancient compilers)
-#define wxUSE_MS_HTML_HELP 1
-
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
-// ----------------------------------------------------------------------------
-// wxDC classes for various output formats
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
-
-// Should wxDC provide SetTransformMatrix() and related methods?
-//
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
-//
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-
-
-/* --- end common options --- */
-
-/* --- start MSW options --- */
-// ----------------------------------------------------------------------------
-// Windows-only settings
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
-// and want to run your programs under Windows 9x and not only NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
-// that you will have to modify the makefiles to include unicows.lib import
-// library as the first library (see installation instructions in install.txt
-// to learn how to do it when building the library or samples).
-//
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
-//
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
-#ifndef wxUSE_UNICODE_MSLU
-    #define wxUSE_UNICODE_MSLU 0
-#endif
-
-// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
-// will override some other settings (see below)
-//
-// Default is 0.
-//
-// Recommended setting: 0 unless you really have to use MFC
-#define wxUSE_MFC           0
-
-// Set this to 1 for generic OLE support: this is required for drag-and-drop,
-// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
-// can't compile/doesn't have the OLE headers.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_OLE           1
-
-// Set this to 1 to enable wxAutomationObject class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need to control other applications via OLE
-// Automation, can be safely set to 0 otherwise
-#define wxUSE_OLE_AUTOMATION 1
-
-// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE
-// controls in wx.
-//
-// Default is 1.
-//
-// Recommended setting: 1, required by wxMediaCtrl
-#define wxUSE_ACTIVEX 1
-
-// wxDC caching implementation
-#define wxUSE_DC_CACHEING 1
-
-// Set this to 1 to enable wxDIB class used internally for manipulating
-// wxBitmap data.
-//
-// Default is 1, set it to 0 only if you don't use wxImage neither
-//
-// Recommended setting: 1 (without it conversion to/from wxImage won't work)
-#define wxUSE_WXDIB 1
-
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-// Set this to 1 to compile in wxRegKey class.
-//
-// Default is 1
-//
-// Recommended setting: 1, this is used internally by wx in a few places
-#define wxUSE_REGKEY 1
-
-// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
-// which allows to put more than ~32Kb of text in it even under Win9x (NT
-// doesn't have such limitation).
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1, only set it to 0 if your compiler doesn't have
-//                      or can't compile <richedit.h>
-#define wxUSE_RICHEDIT  1
-
-// Set this to 1 to use extra features of richedit v2 and later controls
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1
-#define wxUSE_RICHEDIT2 1
-
-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 1
-
-// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It
-// is required by native wxNotificationMessage implementation.
-//
-// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain
-// the necessary declarations.
-//
-// Recommended setting: 1, set to 0 for a tiny library size reduction
-#define wxUSE_TASKBARICON_BALLOONS 1
-
-// Set to 1 to compile MS Windows XP theme engine support
-#define wxUSE_UXTHEME           1
-
-// Set to 1 to use InkEdit control (Tablet PC), if available
-#define wxUSE_INKEDIT  0
-
-// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
-//
-// Default is 0.
-//
-// Recommended setting: 0, nobody uses .INI files any more
-#define wxUSE_INICONF 0
-
-// ----------------------------------------------------------------------------
-// Generic versions of native controls
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the
-// native wxDatePickerCtrl
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_DATEPICKCTRL_GENERIC 0
-
-// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the
-// native wxTimePickerCtrl for the platforms that have the latter (MSW).
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_TIMEPICKCTRL_GENERIC 0
-
-// ----------------------------------------------------------------------------
-// Crash debugging helpers
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxCrashReport::Generate() to create mini
-// dumps of your program when it crashes (or at any other moment)
-//
-// Default is 1 if supported by the compiler (VC++ and recent BC++ only).
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_CRASHREPORT 1
-/* --- end MSW options --- */
-
-#endif // _WX_SETUP_H_
-
diff --git a/Source/3rd Party/wx/lib/vc_lib/mswd/wx/setup.h b/Source/3rd Party/wx/lib/vc_lib/mswd/wx/setup.h
deleted file mode 100644
index acb2276b9..000000000
--- a/Source/3rd Party/wx/lib/vc_lib/mswd/wx/setup.h	
+++ /dev/null
@@ -1,1649 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/setup.h
-// Purpose:     Configuration for the library
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
-
-/* --- start common options --- */
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
-
-// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
-// default system font is used for wxWindow::GetCharWidth/Height() instead of
-// the current font.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWidgets memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 0
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 0
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
-
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#endif
-
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Note that like wxUSE_THREADS this option is automatically set to 0 if
-// wxNO_EXCEPTIONS is defined.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0 (this is still work in progress...)
-#define wxUSE_EXTENDED_RTTI 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
-// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effect.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled, compiles wxWidgets streams classes
-//
-// wx stream classes are used for image IO, process IO redirection, network
-// protocols implementation and much more and so disabling this results in a
-// lot of other functionality being lost.
-//
-// Default is 1
-//
-// Recommended setting: 1 as setting it to 0 disables many other things
-#define wxUSE_STREAMS       1
-
-// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
-// Note that if the system's implementation does not support positional
-// parameters, setting this to 1 forces the use of the wxWidgets implementation
-// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
-// many Unix systems but usually doesn't under Windows.
-//
-// Positional parameters are very useful when translating a program since using
-// them in formatting strings allow translators to correctly reorder the
-// translated sentences.
-//
-// Default is 1
-//
-// Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      1
-
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but must
-// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
-// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
-// support that results in crashes when any TLS variables are used. So if you
-// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
-// this to 0.
-//
-// Default is 1, but set to 0 if the scenario above is applicable.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// Use wxStandardPaths class which allows to retrieve some standard locations
-// in the file system
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be disabled to save space, but not much)
-#define wxUSE_STDPATHS      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   1
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ARCHIVE    1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS     1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxTarInput/OutputStream classes.
-#define wxUSE_TARSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG
-#define wxUSE_ZLIB          1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWidgets one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for wxVariant class used in several places throughout the library,
-// notably in wxDataViewCtrl API.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size as much as
-// possible in which case setting this to 0 can gain up to 100KB.
-#define wxUSE_VARIANT 1
-
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// Use wxMediaCtrl
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
-
-// Use wxWidget's XRC XML-based resource system.  Recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is the same as wxUSE_XRC, i.e. 1 by default.
-//
-// Recommended setting: 1 (required by XRC)
-#define wxUSE_XML       wxUSE_XRC
-
-// Use wxWidget's AUI docking system
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_AUI       1
-
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
-
-// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
-
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWidgets control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
-#define wxUSE_BUTTON        1   // wxButton
-#define wxUSE_BMPBUTTON     1   // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1   // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE        1   // wxChoice
-#define wxUSE_COLLPANE      1   // wxCollapsiblePane
-#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
-#define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
-#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
-#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
-#define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1   // wxListBox
-#define wxUSE_LISTCTRL      1   // wxListCtrl
-#define wxUSE_RADIOBOX      1   // wxRadioBox
-#define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
-#define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
-#define wxUSE_SLIDER        1   // wxSlider
-#define wxUSE_SPINBTN       1   // wxSpinButton
-#define wxUSE_SPINCTRL      1   // wxSpinCtrl
-#define wxUSE_STATBOX       1   // wxStaticBox
-#define wxUSE_STATLINE      1   // wxStaticLine
-#define wxUSE_STATTEXT      1   // wxStaticText
-#define wxUSE_STATBMP       1   // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
-#define wxUSE_TOGGLEBTN     1   // requires wxButton
-#define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1 for the platforms where native status bar is supported.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used to logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CHOICEBOOK 1
-
-// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TREEBOOK 1
-
-// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
-// tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLBOOK 1
-
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
-
-// wxGrid class
-//
-// Default is 1, set to 0 to cut down compilation time and binaries size if you
-// don't use it.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// wxMiniFrame class: a frame with narrow title bar
-//
-// Default is 1.
-//
-// Recommended setting: 1 (it doesn't cost almost anything)
-#define wxUSE_MINIFRAME 1
-
-// wxComboCtrl and related classes: combobox with custom popup window and
-// not necessarily a listbox.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
-//                      it used by wxComboBox
-#define wxUSE_COMBOCTRL 1
-
-// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
-// items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0, except where it is
-//                      needed as a base class for generic wxBitmapComboBox.
-#define wxUSE_ODCOMBOBOX 1
-
-// wxBitmapComboBox is a combobox that can have images in front of text items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0
-#define wxUSE_BITMAPCOMBOBOX 1
-
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// their geometries as well as finding the display on which the given point or
-// window lies.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// Compile in wxAboutBox() function showing the standard "About" dialog.
-//
-// Default is 1
-//
-// Recommended setting: 1 but can be set to 0 to save some space if you don't
-//                      use this function
-#define wxUSE_ABOUTDLG 1
-
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable MDI support.
-//
-// Requires wxUSE_NOTEBOOK under platforms other than MSW.
-//
-// Default is 1.
-//
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Set to 0 to disable MDI document/view architecture
-//
-// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
-//
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
-//
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
-
-// wxRichTextCtrl allows editing of styled text.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 if you want compile a
-// smaller library.
-#define wxUSE_RICHTEXT       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running.
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-
-// Should we use MS HTML help for wxHelpController? If disabled, neither
-// wxCHMHelpController nor wxBestHelpController are available.
-//
-// Default is 1 under MSW, 0 is always used for the other platforms.
-//
-// Recommended setting: 1, only set to 0 if you have trouble compiling
-// wxCHMHelpController (could be a problem with really ancient compilers)
-#define wxUSE_MS_HTML_HELP 1
-
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
-// ----------------------------------------------------------------------------
-// wxDC classes for various output formats
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
-
-// Should wxDC provide SetTransformMatrix() and related methods?
-//
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
-//
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-
-
-/* --- end common options --- */
-
-/* --- start MSW options --- */
-// ----------------------------------------------------------------------------
-// Windows-only settings
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
-// and want to run your programs under Windows 9x and not only NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
-// that you will have to modify the makefiles to include unicows.lib import
-// library as the first library (see installation instructions in install.txt
-// to learn how to do it when building the library or samples).
-//
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
-//
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
-#ifndef wxUSE_UNICODE_MSLU
-    #define wxUSE_UNICODE_MSLU 0
-#endif
-
-// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
-// will override some other settings (see below)
-//
-// Default is 0.
-//
-// Recommended setting: 0 unless you really have to use MFC
-#define wxUSE_MFC           0
-
-// Set this to 1 for generic OLE support: this is required for drag-and-drop,
-// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
-// can't compile/doesn't have the OLE headers.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_OLE           1
-
-// Set this to 1 to enable wxAutomationObject class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need to control other applications via OLE
-// Automation, can be safely set to 0 otherwise
-#define wxUSE_OLE_AUTOMATION 1
-
-// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE
-// controls in wx.
-//
-// Default is 1.
-//
-// Recommended setting: 1, required by wxMediaCtrl
-#define wxUSE_ACTIVEX 1
-
-// wxDC caching implementation
-#define wxUSE_DC_CACHEING 1
-
-// Set this to 1 to enable wxDIB class used internally for manipulating
-// wxBitmap data.
-//
-// Default is 1, set it to 0 only if you don't use wxImage neither
-//
-// Recommended setting: 1 (without it conversion to/from wxImage won't work)
-#define wxUSE_WXDIB 1
-
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-// Set this to 1 to compile in wxRegKey class.
-//
-// Default is 1
-//
-// Recommended setting: 1, this is used internally by wx in a few places
-#define wxUSE_REGKEY 1
-
-// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
-// which allows to put more than ~32Kb of text in it even under Win9x (NT
-// doesn't have such limitation).
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1, only set it to 0 if your compiler doesn't have
-//                      or can't compile <richedit.h>
-#define wxUSE_RICHEDIT  1
-
-// Set this to 1 to use extra features of richedit v2 and later controls
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1
-#define wxUSE_RICHEDIT2 1
-
-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 1
-
-// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It
-// is required by native wxNotificationMessage implementation.
-//
-// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain
-// the necessary declarations.
-//
-// Recommended setting: 1, set to 0 for a tiny library size reduction
-#define wxUSE_TASKBARICON_BALLOONS 1
-
-// Set to 1 to compile MS Windows XP theme engine support
-#define wxUSE_UXTHEME           1
-
-// Set to 1 to use InkEdit control (Tablet PC), if available
-#define wxUSE_INKEDIT  0
-
-// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
-//
-// Default is 0.
-//
-// Recommended setting: 0, nobody uses .INI files any more
-#define wxUSE_INICONF 0
-
-// ----------------------------------------------------------------------------
-// Generic versions of native controls
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the
-// native wxDatePickerCtrl
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_DATEPICKCTRL_GENERIC 0
-
-// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the
-// native wxTimePickerCtrl for the platforms that have the latter (MSW).
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_TIMEPICKCTRL_GENERIC 0
-
-// ----------------------------------------------------------------------------
-// Crash debugging helpers
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxCrashReport::Generate() to create mini
-// dumps of your program when it crashes (or at any other moment)
-//
-// Default is 1 if supported by the compiler (VC++ and recent BC++ only).
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_CRASHREPORT 1
-/* --- end MSW options --- */
-
-#endif // _WX_SETUP_H_
-
diff --git a/Source/3rd Party/wx/lib/vc_lib/mswu/wx/setup.h b/Source/3rd Party/wx/lib/vc_lib/mswu/wx/setup.h
deleted file mode 100644
index acb2276b9..000000000
--- a/Source/3rd Party/wx/lib/vc_lib/mswu/wx/setup.h	
+++ /dev/null
@@ -1,1649 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/setup.h
-// Purpose:     Configuration for the library
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
-
-/* --- start common options --- */
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
-
-// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
-// default system font is used for wxWindow::GetCharWidth/Height() instead of
-// the current font.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWidgets memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 0
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 0
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
-
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#endif
-
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Note that like wxUSE_THREADS this option is automatically set to 0 if
-// wxNO_EXCEPTIONS is defined.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0 (this is still work in progress...)
-#define wxUSE_EXTENDED_RTTI 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
-// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effect.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled, compiles wxWidgets streams classes
-//
-// wx stream classes are used for image IO, process IO redirection, network
-// protocols implementation and much more and so disabling this results in a
-// lot of other functionality being lost.
-//
-// Default is 1
-//
-// Recommended setting: 1 as setting it to 0 disables many other things
-#define wxUSE_STREAMS       1
-
-// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
-// Note that if the system's implementation does not support positional
-// parameters, setting this to 1 forces the use of the wxWidgets implementation
-// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
-// many Unix systems but usually doesn't under Windows.
-//
-// Positional parameters are very useful when translating a program since using
-// them in formatting strings allow translators to correctly reorder the
-// translated sentences.
-//
-// Default is 1
-//
-// Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      1
-
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but must
-// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
-// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
-// support that results in crashes when any TLS variables are used. So if you
-// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
-// this to 0.
-//
-// Default is 1, but set to 0 if the scenario above is applicable.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// Use wxStandardPaths class which allows to retrieve some standard locations
-// in the file system
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be disabled to save space, but not much)
-#define wxUSE_STDPATHS      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   1
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ARCHIVE    1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS     1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxTarInput/OutputStream classes.
-#define wxUSE_TARSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG
-#define wxUSE_ZLIB          1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWidgets one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for wxVariant class used in several places throughout the library,
-// notably in wxDataViewCtrl API.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size as much as
-// possible in which case setting this to 0 can gain up to 100KB.
-#define wxUSE_VARIANT 1
-
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// Use wxMediaCtrl
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
-
-// Use wxWidget's XRC XML-based resource system.  Recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is the same as wxUSE_XRC, i.e. 1 by default.
-//
-// Recommended setting: 1 (required by XRC)
-#define wxUSE_XML       wxUSE_XRC
-
-// Use wxWidget's AUI docking system
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_AUI       1
-
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
-
-// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
-
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWidgets control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
-#define wxUSE_BUTTON        1   // wxButton
-#define wxUSE_BMPBUTTON     1   // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1   // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE        1   // wxChoice
-#define wxUSE_COLLPANE      1   // wxCollapsiblePane
-#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
-#define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
-#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
-#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
-#define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1   // wxListBox
-#define wxUSE_LISTCTRL      1   // wxListCtrl
-#define wxUSE_RADIOBOX      1   // wxRadioBox
-#define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
-#define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
-#define wxUSE_SLIDER        1   // wxSlider
-#define wxUSE_SPINBTN       1   // wxSpinButton
-#define wxUSE_SPINCTRL      1   // wxSpinCtrl
-#define wxUSE_STATBOX       1   // wxStaticBox
-#define wxUSE_STATLINE      1   // wxStaticLine
-#define wxUSE_STATTEXT      1   // wxStaticText
-#define wxUSE_STATBMP       1   // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
-#define wxUSE_TOGGLEBTN     1   // requires wxButton
-#define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1 for the platforms where native status bar is supported.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used to logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CHOICEBOOK 1
-
-// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TREEBOOK 1
-
-// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
-// tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLBOOK 1
-
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
-
-// wxGrid class
-//
-// Default is 1, set to 0 to cut down compilation time and binaries size if you
-// don't use it.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// wxMiniFrame class: a frame with narrow title bar
-//
-// Default is 1.
-//
-// Recommended setting: 1 (it doesn't cost almost anything)
-#define wxUSE_MINIFRAME 1
-
-// wxComboCtrl and related classes: combobox with custom popup window and
-// not necessarily a listbox.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
-//                      it used by wxComboBox
-#define wxUSE_COMBOCTRL 1
-
-// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
-// items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0, except where it is
-//                      needed as a base class for generic wxBitmapComboBox.
-#define wxUSE_ODCOMBOBOX 1
-
-// wxBitmapComboBox is a combobox that can have images in front of text items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0
-#define wxUSE_BITMAPCOMBOBOX 1
-
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// their geometries as well as finding the display on which the given point or
-// window lies.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// Compile in wxAboutBox() function showing the standard "About" dialog.
-//
-// Default is 1
-//
-// Recommended setting: 1 but can be set to 0 to save some space if you don't
-//                      use this function
-#define wxUSE_ABOUTDLG 1
-
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable MDI support.
-//
-// Requires wxUSE_NOTEBOOK under platforms other than MSW.
-//
-// Default is 1.
-//
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Set to 0 to disable MDI document/view architecture
-//
-// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
-//
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
-//
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
-
-// wxRichTextCtrl allows editing of styled text.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 if you want compile a
-// smaller library.
-#define wxUSE_RICHTEXT       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running.
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-
-// Should we use MS HTML help for wxHelpController? If disabled, neither
-// wxCHMHelpController nor wxBestHelpController are available.
-//
-// Default is 1 under MSW, 0 is always used for the other platforms.
-//
-// Recommended setting: 1, only set to 0 if you have trouble compiling
-// wxCHMHelpController (could be a problem with really ancient compilers)
-#define wxUSE_MS_HTML_HELP 1
-
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
-// ----------------------------------------------------------------------------
-// wxDC classes for various output formats
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
-
-// Should wxDC provide SetTransformMatrix() and related methods?
-//
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
-//
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-
-
-/* --- end common options --- */
-
-/* --- start MSW options --- */
-// ----------------------------------------------------------------------------
-// Windows-only settings
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
-// and want to run your programs under Windows 9x and not only NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
-// that you will have to modify the makefiles to include unicows.lib import
-// library as the first library (see installation instructions in install.txt
-// to learn how to do it when building the library or samples).
-//
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
-//
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
-#ifndef wxUSE_UNICODE_MSLU
-    #define wxUSE_UNICODE_MSLU 0
-#endif
-
-// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
-// will override some other settings (see below)
-//
-// Default is 0.
-//
-// Recommended setting: 0 unless you really have to use MFC
-#define wxUSE_MFC           0
-
-// Set this to 1 for generic OLE support: this is required for drag-and-drop,
-// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
-// can't compile/doesn't have the OLE headers.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_OLE           1
-
-// Set this to 1 to enable wxAutomationObject class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need to control other applications via OLE
-// Automation, can be safely set to 0 otherwise
-#define wxUSE_OLE_AUTOMATION 1
-
-// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE
-// controls in wx.
-//
-// Default is 1.
-//
-// Recommended setting: 1, required by wxMediaCtrl
-#define wxUSE_ACTIVEX 1
-
-// wxDC caching implementation
-#define wxUSE_DC_CACHEING 1
-
-// Set this to 1 to enable wxDIB class used internally for manipulating
-// wxBitmap data.
-//
-// Default is 1, set it to 0 only if you don't use wxImage neither
-//
-// Recommended setting: 1 (without it conversion to/from wxImage won't work)
-#define wxUSE_WXDIB 1
-
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-// Set this to 1 to compile in wxRegKey class.
-//
-// Default is 1
-//
-// Recommended setting: 1, this is used internally by wx in a few places
-#define wxUSE_REGKEY 1
-
-// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
-// which allows to put more than ~32Kb of text in it even under Win9x (NT
-// doesn't have such limitation).
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1, only set it to 0 if your compiler doesn't have
-//                      or can't compile <richedit.h>
-#define wxUSE_RICHEDIT  1
-
-// Set this to 1 to use extra features of richedit v2 and later controls
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1
-#define wxUSE_RICHEDIT2 1
-
-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 1
-
-// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It
-// is required by native wxNotificationMessage implementation.
-//
-// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain
-// the necessary declarations.
-//
-// Recommended setting: 1, set to 0 for a tiny library size reduction
-#define wxUSE_TASKBARICON_BALLOONS 1
-
-// Set to 1 to compile MS Windows XP theme engine support
-#define wxUSE_UXTHEME           1
-
-// Set to 1 to use InkEdit control (Tablet PC), if available
-#define wxUSE_INKEDIT  0
-
-// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
-//
-// Default is 0.
-//
-// Recommended setting: 0, nobody uses .INI files any more
-#define wxUSE_INICONF 0
-
-// ----------------------------------------------------------------------------
-// Generic versions of native controls
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the
-// native wxDatePickerCtrl
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_DATEPICKCTRL_GENERIC 0
-
-// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the
-// native wxTimePickerCtrl for the platforms that have the latter (MSW).
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_TIMEPICKCTRL_GENERIC 0
-
-// ----------------------------------------------------------------------------
-// Crash debugging helpers
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxCrashReport::Generate() to create mini
-// dumps of your program when it crashes (or at any other moment)
-//
-// Default is 1 if supported by the compiler (VC++ and recent BC++ only).
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_CRASHREPORT 1
-/* --- end MSW options --- */
-
-#endif // _WX_SETUP_H_
-
diff --git a/Source/3rd Party/wx/lib/vc_lib/mswud/wx/setup.h b/Source/3rd Party/wx/lib/vc_lib/mswud/wx/setup.h
deleted file mode 100644
index acb2276b9..000000000
--- a/Source/3rd Party/wx/lib/vc_lib/mswud/wx/setup.h	
+++ /dev/null
@@ -1,1649 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/setup.h
-// Purpose:     Configuration for the library
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
-
-/* --- start common options --- */
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
-
-// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
-// default system font is used for wxWindow::GetCharWidth/Height() instead of
-// the current font.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWidgets memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 0
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 0
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
-
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#endif
-
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Note that like wxUSE_THREADS this option is automatically set to 0 if
-// wxNO_EXCEPTIONS is defined.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0 (this is still work in progress...)
-#define wxUSE_EXTENDED_RTTI 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
-// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effect.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled, compiles wxWidgets streams classes
-//
-// wx stream classes are used for image IO, process IO redirection, network
-// protocols implementation and much more and so disabling this results in a
-// lot of other functionality being lost.
-//
-// Default is 1
-//
-// Recommended setting: 1 as setting it to 0 disables many other things
-#define wxUSE_STREAMS       1
-
-// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
-// Note that if the system's implementation does not support positional
-// parameters, setting this to 1 forces the use of the wxWidgets implementation
-// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
-// many Unix systems but usually doesn't under Windows.
-//
-// Positional parameters are very useful when translating a program since using
-// them in formatting strings allow translators to correctly reorder the
-// translated sentences.
-//
-// Default is 1
-//
-// Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      1
-
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but must
-// not use it if wxWidgets is used in a dynamically loaded Win32 (i.e. using
-// LoadLibrary()/GetProcAddress()) as this triggers a bug in compiler TLS
-// support that results in crashes when any TLS variables are used. So if you
-// are building a Win32 DLL using wxWidgets that can be loaded dynamically, set
-// this to 0.
-//
-// Default is 1, but set to 0 if the scenario above is applicable.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// Use wxStandardPaths class which allows to retrieve some standard locations
-// in the file system
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be disabled to save space, but not much)
-#define wxUSE_STDPATHS      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   1
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ARCHIVE    1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS     1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxTarInput/OutputStream classes.
-#define wxUSE_TARSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG
-#define wxUSE_ZLIB          1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWidgets one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for wxVariant class used in several places throughout the library,
-// notably in wxDataViewCtrl API.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size as much as
-// possible in which case setting this to 0 can gain up to 100KB.
-#define wxUSE_VARIANT 1
-
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// Use wxMediaCtrl
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
-
-// Use wxWidget's XRC XML-based resource system.  Recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is the same as wxUSE_XRC, i.e. 1 by default.
-//
-// Recommended setting: 1 (required by XRC)
-#define wxUSE_XML       wxUSE_XRC
-
-// Use wxWidget's AUI docking system
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_AUI       1
-
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
-
-// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
-
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWidgets control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
-#define wxUSE_BUTTON        1   // wxButton
-#define wxUSE_BMPBUTTON     1   // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1   // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE        1   // wxChoice
-#define wxUSE_COLLPANE      1   // wxCollapsiblePane
-#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
-#define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
-#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
-#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
-#define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1   // wxListBox
-#define wxUSE_LISTCTRL      1   // wxListCtrl
-#define wxUSE_RADIOBOX      1   // wxRadioBox
-#define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
-#define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
-#define wxUSE_SLIDER        1   // wxSlider
-#define wxUSE_SPINBTN       1   // wxSpinButton
-#define wxUSE_SPINCTRL      1   // wxSpinCtrl
-#define wxUSE_STATBOX       1   // wxStaticBox
-#define wxUSE_STATLINE      1   // wxStaticLine
-#define wxUSE_STATTEXT      1   // wxStaticText
-#define wxUSE_STATBMP       1   // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
-#define wxUSE_TOGGLEBTN     1   // requires wxButton
-#define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1 for the platforms where native status bar is supported.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used to logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CHOICEBOOK 1
-
-// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TREEBOOK 1
-
-// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
-// tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLBOOK 1
-
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
-
-// wxGrid class
-//
-// Default is 1, set to 0 to cut down compilation time and binaries size if you
-// don't use it.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// wxMiniFrame class: a frame with narrow title bar
-//
-// Default is 1.
-//
-// Recommended setting: 1 (it doesn't cost almost anything)
-#define wxUSE_MINIFRAME 1
-
-// wxComboCtrl and related classes: combobox with custom popup window and
-// not necessarily a listbox.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
-//                      it used by wxComboBox
-#define wxUSE_COMBOCTRL 1
-
-// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
-// items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0, except where it is
-//                      needed as a base class for generic wxBitmapComboBox.
-#define wxUSE_ODCOMBOBOX 1
-
-// wxBitmapComboBox is a combobox that can have images in front of text items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0
-#define wxUSE_BITMAPCOMBOBOX 1
-
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// their geometries as well as finding the display on which the given point or
-// window lies.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// Compile in wxAboutBox() function showing the standard "About" dialog.
-//
-// Default is 1
-//
-// Recommended setting: 1 but can be set to 0 to save some space if you don't
-//                      use this function
-#define wxUSE_ABOUTDLG 1
-
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable MDI support.
-//
-// Requires wxUSE_NOTEBOOK under platforms other than MSW.
-//
-// Default is 1.
-//
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Set to 0 to disable MDI document/view architecture
-//
-// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
-//
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
-//
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
-
-// wxRichTextCtrl allows editing of styled text.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 if you want compile a
-// smaller library.
-#define wxUSE_RICHTEXT       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running.
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-
-// Should we use MS HTML help for wxHelpController? If disabled, neither
-// wxCHMHelpController nor wxBestHelpController are available.
-//
-// Default is 1 under MSW, 0 is always used for the other platforms.
-//
-// Recommended setting: 1, only set to 0 if you have trouble compiling
-// wxCHMHelpController (could be a problem with really ancient compilers)
-#define wxUSE_MS_HTML_HELP 1
-
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
-// ----------------------------------------------------------------------------
-// wxDC classes for various output formats
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
-
-// Should wxDC provide SetTransformMatrix() and related methods?
-//
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
-//
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-
-
-/* --- end common options --- */
-
-/* --- start MSW options --- */
-// ----------------------------------------------------------------------------
-// Windows-only settings
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
-// and want to run your programs under Windows 9x and not only NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
-// that you will have to modify the makefiles to include unicows.lib import
-// library as the first library (see installation instructions in install.txt
-// to learn how to do it when building the library or samples).
-//
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
-//
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
-#ifndef wxUSE_UNICODE_MSLU
-    #define wxUSE_UNICODE_MSLU 0
-#endif
-
-// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
-// will override some other settings (see below)
-//
-// Default is 0.
-//
-// Recommended setting: 0 unless you really have to use MFC
-#define wxUSE_MFC           0
-
-// Set this to 1 for generic OLE support: this is required for drag-and-drop,
-// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
-// can't compile/doesn't have the OLE headers.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_OLE           1
-
-// Set this to 1 to enable wxAutomationObject class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need to control other applications via OLE
-// Automation, can be safely set to 0 otherwise
-#define wxUSE_OLE_AUTOMATION 1
-
-// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE
-// controls in wx.
-//
-// Default is 1.
-//
-// Recommended setting: 1, required by wxMediaCtrl
-#define wxUSE_ACTIVEX 1
-
-// wxDC caching implementation
-#define wxUSE_DC_CACHEING 1
-
-// Set this to 1 to enable wxDIB class used internally for manipulating
-// wxBitmap data.
-//
-// Default is 1, set it to 0 only if you don't use wxImage neither
-//
-// Recommended setting: 1 (without it conversion to/from wxImage won't work)
-#define wxUSE_WXDIB 1
-
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-// Set this to 1 to compile in wxRegKey class.
-//
-// Default is 1
-//
-// Recommended setting: 1, this is used internally by wx in a few places
-#define wxUSE_REGKEY 1
-
-// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
-// which allows to put more than ~32Kb of text in it even under Win9x (NT
-// doesn't have such limitation).
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1, only set it to 0 if your compiler doesn't have
-//                      or can't compile <richedit.h>
-#define wxUSE_RICHEDIT  1
-
-// Set this to 1 to use extra features of richedit v2 and later controls
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1
-#define wxUSE_RICHEDIT2 1
-
-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 1
-
-// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It
-// is required by native wxNotificationMessage implementation.
-//
-// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain
-// the necessary declarations.
-//
-// Recommended setting: 1, set to 0 for a tiny library size reduction
-#define wxUSE_TASKBARICON_BALLOONS 1
-
-// Set to 1 to compile MS Windows XP theme engine support
-#define wxUSE_UXTHEME           1
-
-// Set to 1 to use InkEdit control (Tablet PC), if available
-#define wxUSE_INKEDIT  0
-
-// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
-//
-// Default is 0.
-//
-// Recommended setting: 0, nobody uses .INI files any more
-#define wxUSE_INICONF 0
-
-// ----------------------------------------------------------------------------
-// Generic versions of native controls
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the
-// native wxDatePickerCtrl
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_DATEPICKCTRL_GENERIC 0
-
-// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the
-// native wxTimePickerCtrl for the platforms that have the latter (MSW).
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_TIMEPICKCTRL_GENERIC 0
-
-// ----------------------------------------------------------------------------
-// Crash debugging helpers
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxCrashReport::Generate() to create mini
-// dumps of your program when it crashes (or at any other moment)
-//
-// Default is 1 if supported by the compiler (VC++ and recent BC++ only).
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_CRASHREPORT 1
-/* --- end MSW options --- */
-
-#endif // _WX_SETUP_H_
-
diff --git a/Source/3rd Party/wx/src/common/accelcmn.cpp b/Source/3rd Party/wx/src/common/accelcmn.cpp
deleted file mode 100644
index 3f6e0c63c..000000000
--- a/Source/3rd Party/wx/src/common/accelcmn.cpp	
+++ /dev/null
@@ -1,386 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/accelcmn.cpp
-// Purpose:     implementation of platform-independent wxAcceleratorEntry parts
-// Author:      Vadim Zeitlin
-// Created:     2007-05-05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ACCEL
-
-#ifndef WX_PRECOMP
-    #include "wx/accel.h"
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/crt.h"
-#endif //WX_PRECOMP
-
-wxAcceleratorTable wxNullAcceleratorTable;
-
-// ============================================================================
-// wxAcceleratorEntry implementation
-// ============================================================================
-
-static const struct wxKeyName
-{
-    wxKeyCode code;
-    const char *name;
-} wxKeyNames[] =
-{
-    { WXK_DELETE, wxTRANSLATE("DEL") },
-    { WXK_DELETE, wxTRANSLATE("DELETE") },
-    { WXK_BACK, wxTRANSLATE("BACK") },
-    { WXK_INSERT, wxTRANSLATE("INS") },
-    { WXK_INSERT, wxTRANSLATE("INSERT") },
-    { WXK_RETURN, wxTRANSLATE("ENTER") },
-    { WXK_RETURN, wxTRANSLATE("RETURN") },
-    { WXK_PAGEUP, wxTRANSLATE("PGUP") },
-    { WXK_PAGEDOWN, wxTRANSLATE("PGDN") },
-    { WXK_LEFT, wxTRANSLATE("LEFT") },
-    { WXK_RIGHT, wxTRANSLATE("RIGHT") },
-    { WXK_UP, wxTRANSLATE("UP") },
-    { WXK_DOWN, wxTRANSLATE("DOWN") },
-    { WXK_HOME, wxTRANSLATE("HOME") },
-    { WXK_END, wxTRANSLATE("END") },
-    { WXK_SPACE, wxTRANSLATE("SPACE") },
-    { WXK_TAB, wxTRANSLATE("TAB") },
-    { WXK_ESCAPE, wxTRANSLATE("ESC") },
-    { WXK_ESCAPE, wxTRANSLATE("ESCAPE") },
-    { WXK_CANCEL, wxTRANSLATE("CANCEL") },
-    { WXK_CLEAR, wxTRANSLATE("CLEAR") },
-    { WXK_MENU, wxTRANSLATE("MENU") },
-    { WXK_PAUSE, wxTRANSLATE("PAUSE") },
-    { WXK_CAPITAL, wxTRANSLATE("CAPITAL") },
-    { WXK_SELECT, wxTRANSLATE("SELECT") },
-    { WXK_PRINT, wxTRANSLATE("PRINT") },
-    { WXK_EXECUTE, wxTRANSLATE("EXECUTE") },
-    { WXK_SNAPSHOT, wxTRANSLATE("SNAPSHOT") },
-    { WXK_HELP, wxTRANSLATE("HELP") },
-    { WXK_ADD, wxTRANSLATE("ADD") },
-    { WXK_SEPARATOR, wxTRANSLATE("SEPARATOR") },
-    { WXK_SUBTRACT, wxTRANSLATE("SUBTRACT") },
-    { WXK_DECIMAL, wxTRANSLATE("DECIMAL") },
-    { WXK_DIVIDE, wxTRANSLATE("DIVIDE") },
-    { WXK_NUMLOCK, wxTRANSLATE("NUM_LOCK") },
-    { WXK_SCROLL, wxTRANSLATE("SCROLL_LOCK") },
-    { WXK_PAGEUP, wxTRANSLATE("PAGEUP") },
-    { WXK_PAGEDOWN, wxTRANSLATE("PAGEDOWN") },
-    { WXK_NUMPAD_SPACE, wxTRANSLATE("KP_SPACE") },
-    { WXK_NUMPAD_TAB, wxTRANSLATE("KP_TAB") },
-    { WXK_NUMPAD_ENTER, wxTRANSLATE("KP_ENTER") },
-    { WXK_NUMPAD_HOME, wxTRANSLATE("KP_HOME") },
-    { WXK_NUMPAD_LEFT, wxTRANSLATE("KP_LEFT") },
-    { WXK_NUMPAD_UP, wxTRANSLATE("KP_UP") },
-    { WXK_NUMPAD_RIGHT, wxTRANSLATE("KP_RIGHT") },
-    { WXK_NUMPAD_DOWN, wxTRANSLATE("KP_DOWN") },
-    { WXK_NUMPAD_PAGEUP, wxTRANSLATE("KP_PRIOR") },
-    { WXK_NUMPAD_PAGEUP, wxTRANSLATE("KP_PAGEUP") },
-    { WXK_NUMPAD_PAGEDOWN, wxTRANSLATE("KP_NEXT") },
-    { WXK_NUMPAD_PAGEDOWN, wxTRANSLATE("KP_PAGEDOWN") },
-    { WXK_NUMPAD_END, wxTRANSLATE("KP_END") },
-    { WXK_NUMPAD_BEGIN, wxTRANSLATE("KP_BEGIN") },
-    { WXK_NUMPAD_INSERT, wxTRANSLATE("KP_INSERT") },
-    { WXK_NUMPAD_DELETE, wxTRANSLATE("KP_DELETE") },
-    { WXK_NUMPAD_EQUAL, wxTRANSLATE("KP_EQUAL") },
-    { WXK_NUMPAD_MULTIPLY, wxTRANSLATE("KP_MULTIPLY") },
-    { WXK_NUMPAD_ADD, wxTRANSLATE("KP_ADD") },
-    { WXK_NUMPAD_SEPARATOR, wxTRANSLATE("KP_SEPARATOR") },
-    { WXK_NUMPAD_SUBTRACT, wxTRANSLATE("KP_SUBTRACT") },
-    { WXK_NUMPAD_DECIMAL, wxTRANSLATE("KP_DECIMAL") },
-    { WXK_NUMPAD_DIVIDE, wxTRANSLATE("KP_DIVIDE") },
-    { WXK_WINDOWS_LEFT, wxTRANSLATE("WINDOWS_LEFT") },
-    { WXK_WINDOWS_RIGHT, wxTRANSLATE("WINDOWS_RIGHT") },
-    { WXK_WINDOWS_MENU, wxTRANSLATE("WINDOWS_MENU") },
-    { WXK_COMMAND, wxTRANSLATE("COMMAND") },
-};
-
-// return true if the 2 strings refer to the same accel
-//
-// as accels can be either translated or not, check for both possibilities and
-// also compare case-insensitively as the key names case doesn't count
-static inline bool CompareAccelString(const wxString& str, const char *accel)
-{
-    return str.CmpNoCase(accel) == 0
-#if wxUSE_INTL
-            || str.CmpNoCase(wxGetTranslation(accel)) == 0
-#endif
-            ;
-}
-
-// return prefixCode+number if the string is of the form "<prefix><number>" and
-// 0 if it isn't
-//
-// first and last parameter specify the valid domain for "number" part
-static int IsNumberedAccelKey(const wxString& str,
-                              const char *prefix,
-                              wxKeyCode prefixCode,
-                              unsigned first,
-                              unsigned last)
-{
-    const size_t lenPrefix = wxStrlen(prefix);
-    if ( !CompareAccelString(str.Left(lenPrefix), prefix) )
-        return 0;
-
-    unsigned long num;
-    if ( !str.Mid(lenPrefix).ToULong(&num) )
-        return 0;
-
-    if ( num < first || num > last )
-    {
-        // this must be a mistake, chances that this is a valid name of another
-        // key are vanishingly small
-        wxLogDebug(wxT("Invalid key string \"%s\""), str.c_str());
-        return 0;
-    }
-
-    return prefixCode + num - first;
-}
-
-/* static */
-bool
-wxAcceleratorEntry::ParseAccel(const wxString& text, int *flagsOut, int *keyOut)
-{
-    // the parser won't like trailing spaces
-    wxString label = text;
-    label.Trim(true);
-
-    // For compatibility with the old wx versions which accepted (and actually
-    // even required) a TAB character in the string passed to this function we
-    // ignore anything up to the first TAB. Notice however that the correct
-    // input consists of just the accelerator itself and nothing else, this is
-    // done for compatibility and compatibility only.
-    int posTab = label.Find(wxT('\t'));
-    if ( posTab == wxNOT_FOUND )
-        posTab = 0;
-    else
-        posTab++;
-
-    // parse the accelerator string
-    int accelFlags = wxACCEL_NORMAL;
-    wxString current;
-    for ( size_t n = (size_t)posTab; n < label.length(); n++ )
-    {
-        if ( (label[n] == '+') || (label[n] == '-') )
-        {
-            if ( CompareAccelString(current, wxTRANSLATE("ctrl")) )
-                accelFlags |= wxACCEL_CTRL;
-            else if ( CompareAccelString(current, wxTRANSLATE("alt")) )
-                accelFlags |= wxACCEL_ALT;
-            else if ( CompareAccelString(current, wxTRANSLATE("shift")) )
-                accelFlags |= wxACCEL_SHIFT;
-            else if ( CompareAccelString(current, wxTRANSLATE("rawctrl")) )
-                accelFlags |= wxACCEL_RAW_CTRL;
-            else // not a recognized modifier name
-            {
-                // we may have "Ctrl-+", for example, but we still want to
-                // catch typos like "Crtl-A" so only give the warning if we
-                // have something before the current '+' or '-', else take
-                // it as a literal symbol
-                if ( current.empty() )
-                {
-                    current += label[n];
-
-                    // skip clearing it below
-                    continue;
-                }
-                else
-                {
-                    wxLogDebug(wxT("Unknown accel modifier: '%s'"),
-                               current.c_str());
-                }
-            }
-
-            current.clear();
-        }
-        else // not special character
-        {
-            current += (wxChar) wxTolower(label[n]);
-        }
-    }
-
-    int keyCode;
-    const size_t len = current.length();
-    switch ( len )
-    {
-        case 0:
-            wxLogDebug(wxT("No accel key found, accel string ignored."));
-            return false;
-
-        case 1:
-            // it's just a letter
-            keyCode = current[0U];
-
-            // if the key is used with any modifiers, make it an uppercase one
-            // because Ctrl-A and Ctrl-a are the same; but keep it as is if it's
-            // used alone as 'a' and 'A' are different
-            if ( accelFlags != wxACCEL_NORMAL )
-                keyCode = wxToupper(keyCode);
-            break;
-
-        default:
-            keyCode = IsNumberedAccelKey(current, wxTRANSLATE("F"),
-                                         WXK_F1, 1, 12);
-            if ( !keyCode )
-            {
-                for ( size_t n = 0; n < WXSIZEOF(wxKeyNames); n++ )
-                {
-                    const wxKeyName& kn = wxKeyNames[n];
-                    if ( CompareAccelString(current, kn.name) )
-                    {
-                        keyCode = kn.code;
-                        break;
-                    }
-                }
-            }
-
-            if ( !keyCode )
-                keyCode = IsNumberedAccelKey(current, wxTRANSLATE("KP_"),
-                                             WXK_NUMPAD0, 0, 9);
-            if ( !keyCode )
-                keyCode = IsNumberedAccelKey(current, wxTRANSLATE("SPECIAL"),
-                                             WXK_SPECIAL1, 1, 20);
-
-            if ( !keyCode )
-            {
-                wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
-                           current.c_str());
-                return false;
-            }
-    }
-
-
-    wxASSERT_MSG( keyCode, wxT("logic error: should have key code here") );
-
-    if ( flagsOut )
-        *flagsOut = accelFlags;
-    if ( keyOut )
-        *keyOut = keyCode;
-
-    return true;
-}
-
-/* static */
-wxAcceleratorEntry *wxAcceleratorEntry::Create(const wxString& str)
-{
-    const wxString accelStr = str.AfterFirst('\t');
-    if ( accelStr.empty() )
-    {
-        // It's ok to pass strings not containing any accelerators at all to
-        // this function, wxMenuItem code does it and we should just return
-        // NULL in this case.
-        return NULL;
-    }
-
-    int flags,
-        keyCode;
-    if ( !ParseAccel(accelStr, &flags, &keyCode) )
-        return NULL;
-
-    return new wxAcceleratorEntry(flags, keyCode);
-}
-
-bool wxAcceleratorEntry::FromString(const wxString& str)
-{
-    return ParseAccel(str, &m_flags, &m_keyCode);
-}
-
-namespace
-{
-
-wxString PossiblyLocalize(const wxString& str, bool localize)
-{
-    return localize ? wxGetTranslation(str) : str;
-}
-
-}
-
-wxString wxAcceleratorEntry::AsPossiblyLocalizedString(bool localized) const
-{
-    wxString text;
-
-    int flags = GetFlags();
-    if ( flags & wxACCEL_ALT )
-        text += PossiblyLocalize(wxTRANSLATE("Alt+"), localized);
-    if ( flags & wxACCEL_CTRL )
-        text += PossiblyLocalize(wxTRANSLATE("Ctrl+"), localized);
-    if ( flags & wxACCEL_SHIFT )
-        text += PossiblyLocalize(wxTRANSLATE("Shift+"), localized);
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
-    if ( flags & wxACCEL_RAW_CTRL )
-        text += PossiblyLocalize(wxTRANSLATE("RawCtrl+"), localized);
-#endif
-    
-    const int code = GetKeyCode();
-
-    if ( code >= WXK_F1 && code <= WXK_F12 )
-        text << PossiblyLocalize(wxTRANSLATE("F"), localized)
-             << code - WXK_F1 + 1;
-    else if ( code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9 )
-        text << PossiblyLocalize(wxTRANSLATE("KP_"), localized)
-             << code - WXK_NUMPAD0;
-    else if ( code >= WXK_SPECIAL1 && code <= WXK_SPECIAL20 )
-        text << PossiblyLocalize(wxTRANSLATE("SPECIAL"), localized)
-             << code - WXK_SPECIAL1 + 1;
-    else // check the named keys
-    {
-        size_t n;
-        for ( n = 0; n < WXSIZEOF(wxKeyNames); n++ )
-        {
-            const wxKeyName& kn = wxKeyNames[n];
-            if ( code == kn.code )
-            {
-                text << PossiblyLocalize(kn.name, localized);
-                break;
-            }
-        }
-
-        if ( n == WXSIZEOF(wxKeyNames) )
-        {
-            // must be a simple key
-            if (
-#if !wxUSE_UNICODE
-                 // we can't call wxIsalnum() for non-ASCII characters in ASCII
-                 // build as they're only defined for the ASCII range (or EOF)
-                 wxIsascii(code) &&
-#endif // ANSI
-                    wxIsprint(code) )
-            {
-                text << (wxChar)code;
-            }
-            else
-            {
-                wxFAIL_MSG( wxT("unknown keyboard accelerator code") );
-            }
-        }
-    }
-
-    return text;
-}
-
-wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
-{
-    return wxAcceleratorEntry::Create(label);
-}
-
-#endif // wxUSE_ACCEL
-
-
-
diff --git a/Source/3rd Party/wx/src/common/accesscmn.cpp b/Source/3rd Party/wx/src/common/accesscmn.cpp
index b5724ae52..168425822 100644
--- a/Source/3rd Party/wx/src/common/accesscmn.cpp	
+++ b/Source/3rd Party/wx/src/common/accesscmn.cpp	
@@ -1,26 +1,26 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/accesscmn.cpp
-// Author:      Julian Smart
-// Modified by:
-// Created:     2003-02-12
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ACCESSIBILITY
-
-#include "wx/access.h"
-
-#endif
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        common/accesscmn.cpp
+// Author:      Julian Smart
+// Modified by:
+// Created:     2003-02-12
+// RCS-ID:      $Id: accesscmn.cpp 35650 2005-09-23 12:56:45Z MR $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_ACCESSIBILITY
+
+#include "wx/access.h"
+
+#endif
+
diff --git a/Source/3rd Party/wx/src/common/affinematrix2d.cpp b/Source/3rd Party/wx/src/common/affinematrix2d.cpp
deleted file mode 100644
index 394b57264..000000000
--- a/Source/3rd Party/wx/src/common/affinematrix2d.cpp	
+++ /dev/null
@@ -1,186 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        affinematrix2d.cpp
-// Purpose:     implementation of wxAffineMatrix2D
-// Author:      Based on wxTransformMatrix by Chris Breeze, Julian Smart
-// Created:     2011-04-05
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_GEOMETRY
-
-#include "wx/affinematrix2d.h"
-#include "wx/math.h"
-
-// sets the matrix to the respective values
-void wxAffineMatrix2D::Set(const wxMatrix2D &mat2D, const wxPoint2DDouble &tr)
-{
-    m_11 = mat2D.m_11;
-    m_12 = mat2D.m_12;
-    m_21 = mat2D.m_21;
-    m_22 = mat2D.m_22;
-    m_tx = tr.m_x;
-    m_ty = tr.m_y;
-}
-
-// gets the component valuess of the matrix
-void wxAffineMatrix2D::Get(wxMatrix2D *mat2D, wxPoint2DDouble *tr) const
-{
-    mat2D->m_11 = m_11;
-    mat2D->m_12 = m_12;
-    mat2D->m_21 = m_21;
-    mat2D->m_22 = m_22;
-
-    if ( tr )
-    {
-        tr->m_x = m_tx;
-        tr->m_y = m_ty;
-    }
-}
-
-// concatenates the matrix
-// | t.m_11  t.m_12  0 |   | m_11  m_12   0 |
-// | t.m_21  t.m_22  0 | x | m_21  m_22   0 |
-// | t.m_tx  t.m_ty  1 |   | m_tx  m_ty   1 |
-void wxAffineMatrix2D::Concat(const wxAffineMatrix2DBase &t)
-{
-    wxMatrix2D mat;
-    wxPoint2DDouble tr;
-    t.Get(&mat, &tr);
-
-    m_tx += tr.m_x*m_11 + tr.m_y*m_21;
-    m_ty += tr.m_x*m_12 + tr.m_y*m_22;
-    wxDouble e11 = mat.m_11*m_11 + mat.m_12*m_21;
-    wxDouble e12 = mat.m_11*m_12 + mat.m_12*m_22;
-    wxDouble e21 = mat.m_21*m_11 + mat.m_22*m_21;
-    m_22 = mat.m_21*m_12 + mat.m_22*m_22;
-    m_11 = e11;
-    m_12 = e12;
-    m_21 = e21;
-}
-
-// makes this its inverse matrix.
-// Invert
-// | m_11  m_12   0 |
-// | m_21  m_22   0 |
-// | m_tx  m_ty   1 |
-bool wxAffineMatrix2D::Invert()
-{
-    const wxDouble det = m_11*m_22 - m_12*m_21;
-
-    if ( !det )
-        return false;
-
-    wxDouble ex = (m_21*m_ty - m_22*m_tx) / det;
-    m_ty = (-m_11*m_ty + m_12*m_tx) / det;
-    m_tx = ex;
-    wxDouble e11 = m_22 / det;
-    m_12 = -m_12 / det;
-    m_21 = -m_21 / det;
-    m_22 = m_11 / det;
-    m_11 = e11;
-
-    return true;
-}
-
-// returns true if the elements of the transformation matrix are equal
-bool wxAffineMatrix2D::IsEqual(const wxAffineMatrix2DBase& t) const
-{
-    wxMatrix2D mat;
-    wxPoint2DDouble tr;
-    t.Get(&mat, &tr);
-
-    return m_11 == mat.m_11 && m_12 == mat.m_12 &&
-           m_21 == mat.m_21 && m_22 == mat.m_22 &&
-           m_tx == tr.m_x && m_ty == tr.m_y;
-}
-
-//
-// transformations
-//
-
-// add the translation to this matrix
-// |  1   0   0 |   | m_11  m_12   0 |
-// |  0   1   0 | x | m_21  m_22   0 |
-// | dx  dy   1 |   | m_tx  m_ty   1 |
-void wxAffineMatrix2D::Translate(wxDouble dx, wxDouble dy)
-{
-    m_tx += m_11 * dx + m_21 * dy;
-    m_ty += m_12 * dx + m_22 * dy;
-}
-
-// add the scale to this matrix
-// | xScale   0      0 |   | m_11  m_12   0 |
-// |   0    yScale   0 | x | m_21  m_22   0 |
-// |   0      0      1 |   | m_tx  m_ty   1 |
-void wxAffineMatrix2D::Scale(wxDouble xScale, wxDouble yScale)
-{
-    m_11 *= xScale;
-    m_12 *= xScale;
-    m_21 *= yScale;
-    m_22 *= yScale;
-}
-
-// add the rotation to this matrix (clockwise, radians)
-// | cos    sin   0 |   | m_11  m_12   0 |
-// | -sin   cos   0 | x | m_21  m_22   0 |
-// |  0      0    1 |   | m_tx  m_ty   1 |
-void wxAffineMatrix2D::Rotate(wxDouble cRadians)
-{
-    wxDouble c = cos(cRadians);
-    wxDouble s = sin(cRadians);
-
-    wxDouble e11 = c*m_11 + s*m_21;
-    wxDouble e12 = c*m_12 + s*m_22;
-    m_21 = c*m_21 - s*m_11;
-    m_22 = c*m_22 - s*m_12;
-    m_11 = e11;
-    m_12 = e12;
-}
-
-//
-// apply the transforms
-//
-
-// applies that matrix to the point
-//                           | m_11  m_12   0 |
-// | src.m_x  src._my  1 | x | m_21  m_22   0 |
-//                           | m_tx  m_ty   1 |
-wxPoint2DDouble
-wxAffineMatrix2D::DoTransformPoint(const wxPoint2DDouble& src) const
-{
-    if ( IsIdentity() )
-        return src;
-
-    return wxPoint2DDouble(src.m_x * m_11 + src.m_y * m_21 + m_tx,
-                           src.m_x * m_12 + src.m_y * m_22 + m_ty);
-}
-
-// applies the matrix except for translations
-//                           | m_11  m_12   0 |
-// | src.m_x  src._my  0 | x | m_21  m_22   0 |
-//                           | m_tx  m_ty   1 |
-wxPoint2DDouble
-wxAffineMatrix2D::DoTransformDistance(const wxPoint2DDouble& src) const
-{
-    if ( IsIdentity() )
-        return src;
-
-    return wxPoint2DDouble(src.m_x * m_11 + src.m_y * m_21,
-                           src.m_x * m_12 + src.m_y * m_22);
-}
-
-bool wxAffineMatrix2D::IsIdentity() const
-{
-    return m_11 == 1 && m_12 == 0 &&
-           m_21 == 0 && m_22 == 1 &&
-           m_tx == 0 && m_ty == 0;
-}
-
-#endif // wxUSE_GEOMETRY
diff --git a/Source/3rd Party/wx/src/common/anidecod.cpp b/Source/3rd Party/wx/src/common/anidecod.cpp
index 938997069..4a905f802 100644
--- a/Source/3rd Party/wx/src/common/anidecod.cpp	
+++ b/Source/3rd Party/wx/src/common/anidecod.cpp	
@@ -1,369 +1,345 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/anidecod.cpp
-// Purpose:     wxANIDecoder, ANI reader for wxImage and wxAnimation
-// Author:      Francesco Montorsi
-// RCS-ID:      $Id$
-// Copyright:   (c) Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS && wxUSE_ICO_CUR
-
-#include "wx/anidecod.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/palette.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-// static
-wxCURHandler wxANIDecoder::sm_handler;
-
-//---------------------------------------------------------------------------
-// wxANIFrameInfo
-//---------------------------------------------------------------------------
-
-class wxANIFrameInfo
-{
-public:
-    wxANIFrameInfo(unsigned int delay = 0, int idx = -1)
-        { m_delay=delay; m_imageIndex=idx; }
-
-    unsigned int m_delay;
-    int m_imageIndex;
-};
-
-#include "wx/arrimpl.cpp" // this is a magic incantation which must be done!
-WX_DEFINE_OBJARRAY(wxImageArray)
-
-#include "wx/arrimpl.cpp" // this is a magic incantation which must be done!
-WX_DEFINE_OBJARRAY(wxANIFrameInfoArray)
-
-
-//---------------------------------------------------------------------------
-// wxANIDecoder
-//---------------------------------------------------------------------------
-
-wxANIDecoder::wxANIDecoder()
-{
-}
-
-wxANIDecoder::~wxANIDecoder()
-{
-}
-
-bool wxANIDecoder::ConvertToImage(unsigned int frame, wxImage *image) const
-{
-    unsigned int idx = m_info[frame].m_imageIndex;
-    *image = m_images[idx];       // copy
-    return image->IsOk();
-}
-
-
-//---------------------------------------------------------------------------
-// Data accessors
-//---------------------------------------------------------------------------
-
-wxSize wxANIDecoder::GetFrameSize(unsigned int WXUNUSED(frame)) const
-{
-    // all frames are of the same size...
-    return m_szAnimation;
-}
-
-wxPoint wxANIDecoder::GetFramePosition(unsigned int WXUNUSED(frame)) const
-{
-    // all frames are of the same size...
-    return wxPoint(0,0);
-}
-
-wxAnimationDisposal wxANIDecoder::GetDisposalMethod(unsigned int WXUNUSED(frame)) const
-{
-    // this disposal is implicit for all frames inside an ANI file
-    return wxANIM_TOBACKGROUND;
-}
-
-long wxANIDecoder::GetDelay(unsigned int frame) const
-{
-    return m_info[frame].m_delay;
-}
-
-wxColour wxANIDecoder::GetTransparentColour(unsigned int frame) const
-{
-    unsigned int idx = m_info[frame].m_imageIndex;
-
-    if (!m_images[idx].HasMask())
-        return wxNullColour;
-
-    return wxColour(m_images[idx].GetMaskRed(),
-                    m_images[idx].GetMaskGreen(),
-                    m_images[idx].GetMaskBlue());
-}
-
-
-//---------------------------------------------------------------------------
-// ANI reading and decoding
-//---------------------------------------------------------------------------
-
-bool wxANIDecoder::DoCanRead(wxInputStream& stream) const
-{
-    wxInt32 FCC1, FCC2;
-    wxUint32 datalen;
-
-    wxInt32 riff32;
-    memcpy( &riff32, "RIFF", 4 );
-    wxInt32 list32;
-    memcpy( &list32, "LIST", 4 );
-    wxInt32 ico32;
-    memcpy( &ico32, "icon", 4 );
-    wxInt32 anih32;
-    memcpy( &anih32, "anih", 4 );
-
-    if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset )
-    {
-        return false;
-    }
-
-    if ( !stream.Read(&FCC1, 4) )
-        return false;
-
-    if ( FCC1 != riff32 )
-        return false;
-
-    // we have a riff file:
-    while ( stream.IsOk() )
-    {
-        if ( FCC1 == anih32 )
-            return true;        // found the ANIH chunk - this should be an ANI file
-
-        // we always have a data size:
-        stream.Read(&datalen, 4);
-        datalen = wxINT32_SWAP_ON_BE(datalen) ;
-
-        // data should be padded to make even number of bytes
-        if (datalen % 2 == 1) datalen ++ ;
-
-        // now either data or a FCC:
-        if ( (FCC1 == riff32) || (FCC1 == list32) )
-        {
-            stream.Read(&FCC2, 4);
-        }
-        else
-        {
-            if ( stream.SeekI(stream.TellI() + datalen) == wxInvalidOffset )
-                return false;
-        }
-
-        // try to read next data chunk:
-        if ( !stream.Read(&FCC1, 4) )
-        {
-            // reading failed -- either EOF or IO error, bail out anyhow
-            return false;
-        }
-    }
-
-    return false;
-}
-
-// the "anih" RIFF chunk
-struct wxANIHeader
-{
-    wxInt32 cbSizeOf;     // Num bytes in AniHeader (36 bytes)
-    wxInt32 cFrames;      // Number of unique Icons in this cursor
-    wxInt32 cSteps;       // Number of Blits before the animation cycles
-    wxInt32 cx;           // width of the frames
-    wxInt32 cy;           // height of the frames
-    wxInt32 cBitCount;    // bit depth
-    wxInt32 cPlanes;      // 1
-    wxInt32 JifRate;      // Default Jiffies (1/60th of a second) if rate chunk not present.
-    wxInt32 flags;        // Animation Flag (see AF_ constants)
-
-    // ANI files are always little endian so we need to swap bytes on big
-    // endian architectures
-#ifdef WORDS_BIGENDIAN
-    void AdjustEndianness()
-    {
-        // this works because all our fields are wxInt32 and they must be
-        // packed without holes between them (if they're not, they wouldn't map
-        // to the file header!)
-        wxInt32 * const start = (wxInt32 *)this;
-        wxInt32 * const end = start + sizeof(wxANIHeader)/sizeof(wxInt32);
-        for ( wxInt32 *p = start; p != end; p++ )
-        {
-            *p = wxINT32_SWAP_ALWAYS(*p);
-        }
-    }
-#else
-    void AdjustEndianness() { }
-#endif
-};
-
-bool wxANIDecoder::Load( wxInputStream& stream )
-{
-    wxInt32 FCC1, FCC2;
-    wxUint32 datalen;
-    unsigned int globaldelay=0;
-
-    wxInt32 riff32;
-    memcpy( &riff32, "RIFF", 4 );
-    wxInt32 list32;
-    memcpy( &list32, "LIST", 4 );
-    wxInt32 ico32;
-    memcpy( &ico32, "icon", 4 );
-    wxInt32 anih32;
-    memcpy( &anih32, "anih", 4 );
-    wxInt32 rate32;
-    memcpy( &rate32, "rate", 4 );
-    wxInt32 seq32;
-    memcpy( &seq32, "seq ", 4 );
-
-    if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset )
-    {
-        return false;
-    }
-
-    if ( !stream.Read(&FCC1, 4) )
-        return false;
-    if ( FCC1 != riff32 )
-        return false;
-
-    m_nFrames = 0;
-    m_szAnimation = wxDefaultSize;
-
-    m_images.Clear();
-    m_info.Clear();
-
-    // we have a riff file:
-    while ( !stream.Eof() )
-    {
-        // we always have a data size:
-        if (!stream.Read(&datalen, 4))
-            return false;
-
-        datalen = wxINT32_SWAP_ON_BE(datalen);
-
-        //data should be padded to make even number of bytes
-        if (datalen % 2 == 1) datalen++;
-
-        // now either data or a FCC:
-        if ( (FCC1 == riff32) || (FCC1 == list32) )
-        {
-            if (!stream.Read(&FCC2, 4))
-                return false;
-        }
-        else if ( FCC1 == anih32 )
-        {
-            if ( datalen != sizeof(wxANIHeader) )
-                return false;
-
-            if (m_nFrames > 0)
-                return false;       // already parsed an ani header?
-
-            struct wxANIHeader header;
-            if (!stream.Read(&header, sizeof(wxANIHeader)))
-                return false;
-            header.AdjustEndianness();
-
-            // we should have a global frame size
-            m_szAnimation = wxSize(header.cx, header.cy);
-
-            // save interesting info from the header
-            m_nFrames = header.cSteps;   // NB: not cFrames!!
-            if ( m_nFrames == 0 )
-                return false;
-
-            globaldelay = header.JifRate * 1000 / 60;
-
-            m_images.Alloc(header.cFrames);
-            m_info.Add(wxANIFrameInfo(), m_nFrames);
-        }
-        else if ( FCC1 == rate32 )
-        {
-            // did we already process the anih32 chunk?
-            if (m_nFrames == 0)
-                return false;       // rate chunks should always be placed after anih chunk
-
-            wxASSERT(m_info.GetCount() == m_nFrames);
-            for (unsigned int i=0; i<m_nFrames; i++)
-            {
-                if (!stream.Read(&FCC2, 4))
-                    return false;
-                m_info[i].m_delay = wxINT32_SWAP_ON_BE(FCC2) * 1000 / 60;
-            }
-        }
-        else if ( FCC1 == seq32 )
-        {
-            // did we already process the anih32 chunk?
-            if (m_nFrames == 0)
-                return false;       // seq chunks should always be placed after anih chunk
-
-            wxASSERT(m_info.GetCount() == m_nFrames);
-            for (unsigned int i=0; i<m_nFrames; i++)
-            {
-                if (!stream.Read(&FCC2, 4))
-                    return false;
-                m_info[i].m_imageIndex = wxINT32_SWAP_ON_BE(FCC2);
-            }
-        }
-        else if ( FCC1 == ico32 )
-        {
-            // use DoLoadFile() and not LoadFile()!
-            wxImage image;
-            if (!sm_handler.DoLoadFile(&image, stream, false /* verbose */, -1))
-                return false;
-
-            image.SetType(wxBITMAP_TYPE_ANI);
-            m_images.Add(image);
-        }
-        else
-        {
-            if ( stream.SeekI(stream.TellI() + datalen) == wxInvalidOffset )
-                return false;
-        }
-
-        // try to read next data chunk:
-        if ( !stream.Read(&FCC1, 4) && !stream.Eof())
-        {
-            // we didn't reach the EOF! An other kind of error has occurred...
-            return false;
-        }
-        //else: proceed with the parsing of the next header block or
-        //      exiting this loop (if stream.Eof() == true)
-    }
-
-    if (m_nFrames==0)
-        return false;
-
-    if (m_nFrames==m_images.GetCount())
-    {
-        // if no SEQ chunk is available, display the frames in the order
-        // they were loaded
-        for (unsigned int i=0; i<m_nFrames; i++)
-            if (m_info[i].m_imageIndex == -1)
-                m_info[i].m_imageIndex = i;
-    }
-
-    // if some frame has an invalid delay, use the global delay given in the
-    // ANI header
-    for (unsigned int i=0; i<m_nFrames; i++)
-        if (m_info[i].m_delay == 0)
-            m_info[i].m_delay = globaldelay;
-
-    // if the header did not contain a valid frame size, try to grab
-    // it from the size of the first frame (all frames are of the same size)
-    if (m_szAnimation.GetWidth() == 0 ||
-        m_szAnimation.GetHeight() == 0)
-        m_szAnimation = wxSize(m_images[0].GetWidth(), m_images[0].GetHeight());
-
-    return m_szAnimation != wxDefaultSize;
-}
-
-#endif // wxUSE_STREAMS && wxUSE_ICO_CUR
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/anidecod.cpp
+// Purpose:     wxANIDecoder, ANI reader for wxImage and wxAnimation
+// Author:      Francesco Montorsi
+// RCS-ID:      $Id: anidecod.cpp 43898 2006-12-10 14:18:37Z VZ $
+// Copyright:   (c) Francesco Montorsi
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS && wxUSE_ICO_CUR
+
+#include "wx/anidecod.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/palette.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+// static
+wxCURHandler wxANIDecoder::sm_handler;
+
+//---------------------------------------------------------------------------
+// wxANIFrameInfo
+//---------------------------------------------------------------------------
+
+class wxANIFrameInfo
+{
+public:
+    wxANIFrameInfo(unsigned int delay = 0, int idx = -1)
+        { m_delay=delay; m_imageIndex=idx; }
+
+    unsigned int m_delay;
+    int m_imageIndex;
+};
+
+#include "wx/arrimpl.cpp" // this is a magic incantation which must be done!
+WX_DEFINE_OBJARRAY(wxImageArray)
+
+#include "wx/arrimpl.cpp" // this is a magic incantation which must be done!
+WX_DEFINE_OBJARRAY(wxANIFrameInfoArray)
+
+
+//---------------------------------------------------------------------------
+// wxANIDecoder
+//---------------------------------------------------------------------------
+
+wxANIDecoder::wxANIDecoder()
+{
+}
+
+wxANIDecoder::~wxANIDecoder()
+{
+}
+
+bool wxANIDecoder::ConvertToImage(unsigned int frame, wxImage *image) const
+{
+    unsigned int idx = m_info[frame].m_imageIndex;
+    *image = m_images[idx];       // copy
+    return image->IsOk();
+}
+
+
+//---------------------------------------------------------------------------
+// Data accessors
+//---------------------------------------------------------------------------
+
+wxSize wxANIDecoder::GetFrameSize(unsigned int WXUNUSED(frame)) const
+{
+    // all frames are of the same size...
+    return m_szAnimation;
+}
+
+wxPoint wxANIDecoder::GetFramePosition(unsigned int WXUNUSED(frame)) const
+{
+    // all frames are of the same size...
+    return wxPoint(0,0);
+}
+
+wxAnimationDisposal wxANIDecoder::GetDisposalMethod(unsigned int WXUNUSED(frame)) const
+{
+    // this disposal is implicit for all frames inside an ANI file
+    return wxANIM_TOBACKGROUND;
+}
+
+long wxANIDecoder::GetDelay(unsigned int frame) const
+{
+    return m_info[frame].m_delay;
+}
+
+wxColour wxANIDecoder::GetTransparentColour(unsigned int frame) const
+{
+    unsigned int idx = m_info[frame].m_imageIndex;
+
+    if (!m_images[idx].HasMask())
+        return wxNullColour;
+
+    return wxColour(m_images[idx].GetMaskRed(),
+                    m_images[idx].GetMaskGreen(),
+                    m_images[idx].GetMaskBlue());
+}
+
+
+//---------------------------------------------------------------------------
+// ANI reading and decoding
+//---------------------------------------------------------------------------
+
+bool wxANIDecoder::CanRead(wxInputStream& stream) const
+{
+    wxInt32 FCC1, FCC2;
+    wxUint32 datalen ;
+
+    wxInt32 riff32;
+    memcpy( &riff32, "RIFF", 4 );
+    wxInt32 list32;
+    memcpy( &list32, "LIST", 4 );
+    wxInt32 ico32;
+    memcpy( &ico32, "icon", 4 );
+    wxInt32 anih32;
+    memcpy( &anih32, "anih", 4 );
+
+    stream.SeekI(0);
+    if ( !stream.Read(&FCC1, 4) )
+        return false;
+
+    if ( FCC1 != riff32 )
+        return false;
+
+    // we have a riff file:
+    while ( stream.IsOk() )
+    {
+        if ( FCC1 == anih32 )
+            return true;        // found the ANIH chunk - this should be an ANI file
+
+        // we always have a data size:
+        stream.Read(&datalen, 4);
+        datalen = wxINT32_SWAP_ON_BE(datalen) ;
+
+        // data should be padded to make even number of bytes
+        if (datalen % 2 == 1) datalen ++ ;
+
+        // now either data or a FCC:
+        if ( (FCC1 == riff32) || (FCC1 == list32) )
+        {
+            stream.Read(&FCC2, 4);
+        }
+        else
+        {
+            stream.SeekI(stream.TellI() + datalen);
+        }
+
+        // try to read next data chunk:
+        if ( !stream.Read(&FCC1, 4) )
+        {
+            // reading failed -- either EOF or IO error, bail out anyhow
+            return false;
+        }
+    }
+
+    return false;
+}
+
+// the "anih" RIFF chunk
+struct wxANIHeader
+{
+    wxInt32 cbSizeOf;     // Num bytes in AniHeader (36 bytes)
+    wxInt32 cFrames;      // Number of unique Icons in this cursor
+    wxInt32 cSteps;       // Number of Blits before the animation cycles
+    wxInt32 cx;           // width of the frames
+    wxInt32 cy;           // height of the frames
+    wxInt32 cBitCount;    // bit depth
+    wxInt32 cPlanes;      // 1
+    wxInt32 JifRate;      // Default Jiffies (1/60th of a second) if rate chunk not present.
+    wxInt32 flags;        // Animation Flag (see AF_ constants)
+
+    // ANI files are always little endian so we need to swap bytes on big
+    // endian architectures
+#ifdef WORDS_BIGENDIAN
+    void AdjustEndianness()
+    {
+        // this works because all our fields are wxInt32 and they must be
+        // packed without holes between them (if they're not, they wouldn't map
+        // to the file header!)
+        wxInt32 * const start = (wxInt32 *)this;
+        wxInt32 * const end = start + sizeof(wxANIHeader)/sizeof(wxInt32);
+        for ( wxInt32 *p = start; p != end; p++ )
+        {
+            *p = wxINT32_SWAP_ALWAYS(*p);
+        }
+    }
+#else
+    void AdjustEndianness() { }
+#endif
+};
+
+bool wxANIDecoder::Load( wxInputStream& stream )
+{
+    wxInt32 FCC1, FCC2;
+    wxUint32 datalen;
+    unsigned int globaldelay=0;
+
+    wxInt32 riff32;
+    memcpy( &riff32, "RIFF", 4 );
+    wxInt32 list32;
+    memcpy( &list32, "LIST", 4 );
+    wxInt32 ico32;
+    memcpy( &ico32, "icon", 4 );
+    wxInt32 anih32;
+    memcpy( &anih32, "anih", 4 );
+    wxInt32 rate32;
+    memcpy( &rate32, "rate", 4 );
+    wxInt32 seq32;
+    memcpy( &seq32, "seq ", 4 );
+
+    stream.SeekI(0);
+    stream.Read(&FCC1, 4);
+    if ( FCC1 != riff32 )
+        return false;
+
+    m_nFrames = 0;
+    m_szAnimation = wxDefaultSize;
+
+    m_images.Clear();
+    m_info.Clear();
+
+    // we have a riff file:
+    while ( stream.IsOk() )
+    {
+        // we always have a data size:
+        stream.Read(&datalen, 4);
+        datalen = wxINT32_SWAP_ON_BE(datalen);
+
+        //data should be padded to make even number of bytes
+        if (datalen % 2 == 1) datalen++;
+
+        // now either data or a FCC:
+        if ( (FCC1 == riff32) || (FCC1 == list32) )
+        {
+            stream.Read(&FCC2, 4);
+        }
+        else if ( FCC1 == anih32 )
+        {
+            if ( datalen != sizeof(wxANIHeader) )
+                return false;
+
+            if (m_nFrames > 0)
+                return false;       // already parsed an ani header?
+
+            struct wxANIHeader header;
+            stream.Read(&header, sizeof(wxANIHeader));
+            header.AdjustEndianness();
+
+            // we should have a global frame size
+            m_szAnimation = wxSize(header.cx, header.cy);
+
+            // save interesting info from the header
+            m_nFrames = header.cSteps;   // NB: not cFrames!!
+            if ( m_nFrames == 0 )
+                return false;
+
+            globaldelay = header.JifRate * 1000 / 60;
+
+            m_images.Alloc(header.cFrames);
+            m_info.Add(wxANIFrameInfo(), m_nFrames);
+        }
+        else if ( FCC1 == rate32 )
+        {
+            // did we already process the anih32 chunk?
+            if (m_nFrames == 0)
+                return false;       // rate chunks should always be placed after anih chunk
+
+            wxASSERT(m_info.GetCount() == m_nFrames);
+            for (unsigned int i=0; i<m_nFrames; i++)
+            {
+                stream.Read(&FCC2, 4);
+                m_info[i].m_delay = wxINT32_SWAP_ON_BE(FCC2) * 1000 / 60;
+            }
+        }
+        else if ( FCC1 == seq32 )
+        {
+            // did we already process the anih32 chunk?
+            if (m_nFrames == 0)
+                return false;       // seq chunks should always be placed after anih chunk
+
+            wxASSERT(m_info.GetCount() == m_nFrames);
+            for (unsigned int i=0; i<m_nFrames; i++)
+            {
+                stream.Read(&FCC2, 4);
+                m_info[i].m_imageIndex = wxINT32_SWAP_ON_BE(FCC2);
+            }
+        }
+        else if ( FCC1 == ico32 )
+        {
+            // use DoLoadFile() and not LoadFile()!
+            wxImage image;
+            if (!sm_handler.DoLoadFile(&image, stream, false /* verbose */, -1))
+                return false;
+
+            m_images.Add(image);
+        }
+        else
+        {
+            stream.SeekI(stream.TellI() + datalen);
+        }
+
+        // try to read next data chunk:
+        stream.Read(&FCC1, 4);
+    }
+
+    if (m_nFrames==0)
+        return false;
+
+    if (m_nFrames==m_images.GetCount())
+    {
+        // if no SEQ chunk is available, display the frames in the order
+        // they were loaded
+        for (unsigned int i=0; i<m_nFrames; i++)
+            if (m_info[i].m_imageIndex == -1)
+                m_info[i].m_imageIndex = i;
+    }
+
+    // if some frame has an invalid delay, use the global delay given in the
+    // ANI header
+    for (unsigned int i=0; i<m_nFrames; i++)
+        if (m_info[i].m_delay == 0)
+            m_info[i].m_delay = globaldelay;
+
+    // if the header did not contain a valid frame size, try to grab
+    // it from the size of the first frame (all frames are of the same size)
+    if (m_szAnimation.GetWidth() == 0 ||
+        m_szAnimation.GetHeight() == 0)
+        m_szAnimation = wxSize(m_images[0].GetWidth(), m_images[0].GetHeight());
+
+    return m_szAnimation != wxDefaultSize;
+}
+
+#endif // wxUSE_STREAMS && wxUSE_ICO_CUR
diff --git a/Source/3rd Party/wx/src/common/any.cpp b/Source/3rd Party/wx/src/common/any.cpp
deleted file mode 100644
index 13e7b3368..000000000
--- a/Source/3rd Party/wx/src/common/any.cpp	
+++ /dev/null
@@ -1,538 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/any.cpp
-// Purpose:     wxAny class, container for any type
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     07/05/2009
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/any.h"
-
-#if wxUSE_ANY
-
-#ifndef WX_PRECOMP
-    #include "wx/math.h"
-    #include "wx/crt.h"
-#endif
-
-#include "wx/vector.h"
-#include "wx/module.h"
-#include "wx/hashmap.h"
-#include "wx/hashset.h"
-
-using namespace wxPrivate;
-
-#if wxUSE_VARIANT
-
-//-------------------------------------------------------------------------
-// wxAnyValueTypeGlobals
-//-------------------------------------------------------------------------
-
-WX_DECLARE_HASH_MAP(wxAnyValueType*,
-                    wxVariantDataFactory,
-                    wxPointerHash,
-                    wxPointerEqual,
-                    wxAnyTypeToVariantDataFactoryMap);
-
-//
-// Helper class to manage global variables related to type conversion
-// between wxAny and wxVariant.
-//
-class wxAnyValueTypeGlobals
-{
-public:
-    wxAnyValueTypeGlobals()
-    {
-    }
-    ~wxAnyValueTypeGlobals()
-    {
-        m_anyToVariant.clear();
-    }
-
-    void PreRegisterAnyToVariant(wxAnyToVariantRegistration* reg)
-    {
-        m_anyToVariantRegs.push_back(reg);
-    }
-
-    // Find wxVariantData factory function for given value type,
-    // (or compatible, if possible)
-    wxVariantDataFactory FindVariantDataFactory(const wxAnyValueType* type_)
-    {
-        // Ideally we'd have the hash map of type 'const wxAnyValueType*',
-        // but WX_DECLARE_HASH_MAP() has some trouble with it.
-        wxAnyValueType* type = const_cast<wxAnyValueType*>(type_);
-
-        wxAnyTypeToVariantDataFactoryMap& anyToVariant = m_anyToVariant;
-        wxAnyTypeToVariantDataFactoryMap::const_iterator it;
-        it = anyToVariant.find(type);
-        if ( it != anyToVariant.end() )
-            return it->second;
-
-        // Not found, handle pre-registrations
-        size_t i = m_anyToVariantRegs.size();
-        while ( i > 0 )
-        {
-            i--;
-            wxAnyToVariantRegistration* reg = m_anyToVariantRegs[i];
-            wxAnyValueType* assocType = reg->GetAssociatedType();
-            if ( assocType )
-            {
-                // Both variant data and wxAnyValueType have been
-                // now been properly initialized, so remove the
-                // pre-registration entry and move data to anyToVarian
-                // map.
-                anyToVariant[assocType] = reg->GetFactory();
-                m_anyToVariantRegs.erase( m_anyToVariantRegs.begin() + i );
-            }
-        }
-
-        // Then try again
-        it = anyToVariant.find(type);
-        if ( it != anyToVariant.end() )
-            return it->second;
-
-        // Finally, attempt to find a compatible type
-        for ( it = anyToVariant.begin(); it != anyToVariant.end(); it++ )
-        {
-            if ( type->IsSameType(it->first) )
-            {
-                wxVariantDataFactory f = it->second;
-                anyToVariant[type] = f;
-                return f;
-            }
-        }
-
-        // Nothing found
-        return NULL;
-    }
-
-private:
-    wxAnyTypeToVariantDataFactoryMap        m_anyToVariant;
-    wxVector<wxAnyToVariantRegistration*>   m_anyToVariantRegs;
-};
-
-static wxAnyValueTypeGlobals* g_wxAnyValueTypeGlobals = NULL;
-
-
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplVariantData)
-
-void wxPreRegisterAnyToVariant(wxAnyToVariantRegistration* reg)
-{
-    if ( !g_wxAnyValueTypeGlobals )
-        g_wxAnyValueTypeGlobals = new wxAnyValueTypeGlobals();
-    g_wxAnyValueTypeGlobals->PreRegisterAnyToVariant(reg);
-}
-
-bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
-{
-    if ( any.IsNull() )
-    {
-        variant->MakeNull();
-        return true;
-    }
-
-    // (signed) integer is a special case, because there is only one type
-    // in wxAny, and two ("long" and "longlong") in wxVariant. For better
-    // backwards compatibility, convert all values that fit in "long",
-    // and others to "longlong".
-    if ( wxANY_CHECK_TYPE(any, signed int) )
-    {
-#ifdef wxLongLong_t
-        wxLongLong_t ll = 0;
-        if ( any.GetAs(&ll) )
-        {
-            // NB: Do not use LONG_MAX here. Explicitly using 32-bit
-            //     integer constraint yields more consistent behaviour across
-            //     builds.
-            if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
-                *variant = wxLongLong(ll);
-            else
-                *variant = (long) wxLongLong(ll).GetLo();
-        }
-        else
-        {
-            return false;
-        }
-#else
-        long l;
-        if ( any.GetAs(&l) )
-            *variant = l;
-        else
-            return false;
-#endif
-        return true;
-    }
-
-    // Find matching factory function
-    wxVariantDataFactory f =
-        g_wxAnyValueTypeGlobals->FindVariantDataFactory(any.GetType());
-
-    wxVariantData* data = NULL;
-
-    if ( f )
-    {
-        data = f(any);
-    }
-    else
-    {
-        // Check if wxAny wrapped wxVariantData*
-        if ( !any.GetAs(&data) )
-        {
-            // Ok, one last chance: while unlikely, it is possible that the
-            // wxAny actually contains wxVariant.
-            if ( wxANY_CHECK_TYPE(any, wxVariant) )
-                *variant = wxANY_AS(any, wxVariant);
-            return false;
-        }
-
-        // Wrapper's GetValue() does not increase reference
-        // count, se have to do it before the data gets passed
-        // to a new variant.
-        data->IncRef();
-    }
-
-    variant->SetData(data);
-    return true;
-}
-
-//
-// This class is to make sure that wxAnyValueType instances
-// etc. get freed correctly. We must use a separate wxAnyValueTypeGlobals
-// because wxModule itself is instantiated too late.
-//
-class wxAnyValueTypeGlobalsManager : public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxAnyValueTypeGlobalsManager)
-public:
-    wxAnyValueTypeGlobalsManager() : wxModule() { }
-    virtual ~wxAnyValueTypeGlobalsManager() { }
-
-    virtual bool OnInit()
-    {
-        return true;
-    }
-    virtual void OnExit()
-    {
-        wxDELETE(g_wxAnyValueTypeGlobals);
-    }
-private:
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxAnyValueTypeGlobalsManager, wxModule)
-
-#endif // wxUSE_VARIANT
-
-
-//-------------------------------------------------------------------------
-// Dynamic conversion member functions
-//-------------------------------------------------------------------------
-
-//
-// Define integer minimum and maximum as helpers
-#ifdef wxLongLong_t
-    #define UseIntMin  (wxINT64_MIN)
-    #define UseIntMax  (wxINT64_MAX)
-    #define UseUintMax (wxUINT64_MAX)
-#else
-    #define UseIntMin  (LONG_MIN)
-    #define UseIntMax  (LONG_MAX)
-    #define UseUintMax (ULONG_MAX)
-#endif
-
-namespace
-{
-
-const double UseIntMinF = static_cast<double>(UseIntMin);
-const double UseIntMaxF = static_cast<double>(UseIntMax);
-const double UseUintMaxF = static_cast<double>(UseUintMax);
-
-} // anonymous namespace
-
-bool wxAnyValueTypeImplInt::ConvertValue(const wxAnyValueBuffer& src,
-                                         wxAnyValueType* dstType,
-                                         wxAnyValueBuffer& dst) const
-{
-    wxAnyBaseIntType value = GetValue(src);
-    if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
-    {
-#ifdef wxLongLong_t
-        wxLongLong ll(value);
-        wxString s = ll.ToString();
-#else
-        wxString s = wxString::Format(wxS("%ld"), (long)value);
-#endif
-        wxAnyValueTypeImpl<wxString>::SetValue(s, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseUintType) )
-    {
-        if ( value < 0 )
-            return false;
-        wxAnyBaseUintType ul = (wxAnyBaseUintType) value;
-        wxAnyValueTypeImplUint::SetValue(ul, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, double) )
-    {
-        double value2 = static_cast<double>(value);
-        wxAnyValueTypeImplDouble::SetValue(value2, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, bool) )
-    {
-        bool value2 = value ? true : false;
-        wxAnyValueTypeImpl<bool>::SetValue(value2, dst);
-    }
-    else
-        return false;
-
-    return true;
-}
-
-bool wxAnyValueTypeImplUint::ConvertValue(const wxAnyValueBuffer& src,
-                                          wxAnyValueType* dstType,
-                                          wxAnyValueBuffer& dst) const
-{
-    wxAnyBaseUintType value = GetValue(src);
-    if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
-    {
-#ifdef wxLongLong_t
-        wxULongLong ull(value);
-        wxString s = ull.ToString();
-#else
-        wxString s = wxString::Format(wxS("%lu"), (long)value);
-#endif
-        wxAnyValueTypeImpl<wxString>::SetValue(s, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseIntType) )
-    {
-        if ( value > UseIntMax )
-            return false;
-        wxAnyBaseIntType l = (wxAnyBaseIntType) value;
-        wxAnyValueTypeImplInt::SetValue(l, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, double) )
-    {
-#ifndef __VISUALC6__
-        double value2 = static_cast<double>(value);
-#else
-        // VC6 doesn't implement conversion from unsigned __int64 to double
-        wxAnyBaseIntType value0 = static_cast<wxAnyBaseIntType>(value);
-        double value2 = static_cast<double>(value0);
-#endif
-        wxAnyValueTypeImplDouble::SetValue(value2, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, bool) )
-    {
-        bool value2 = value ? true : false;
-        wxAnyValueTypeImpl<bool>::SetValue(value2, dst);
-    }
-    else
-        return false;
-
-    return true;
-}
-
-// Convert wxString to destination wxAny value type
-bool wxAnyConvertString(const wxString& value,
-                        wxAnyValueType* dstType,
-                        wxAnyValueBuffer& dst)
-{
-    if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
-    {
-        wxAnyValueTypeImpl<wxString>::SetValue(value, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseIntType) )
-    {
-        wxAnyBaseIntType value2;
-#ifdef wxLongLong_t
-        if ( !value.ToLongLong(&value2) )
-#else
-        if ( !value.ToLong(&value2) )
-#endif
-            return false;
-        wxAnyValueTypeImplInt::SetValue(value2, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseUintType) )
-    {
-        wxAnyBaseUintType value2;
-#ifdef wxLongLong_t
-        if ( !value.ToULongLong(&value2) )
-#else
-        if ( !value.ToULong(&value2) )
-#endif
-            return false;
-        wxAnyValueTypeImplUint::SetValue(value2, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, double) )
-    {
-        double value2;
-        if ( !value.ToDouble(&value2) )
-            return false;
-        wxAnyValueTypeImplDouble::SetValue(value2, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, bool) )
-    {
-        bool value2;
-        wxString s(value);
-        s.MakeLower();
-        if ( s == wxS("true") ||
-             s == wxS("yes") ||
-             s == wxS('1') )
-            value2 = true;
-        else if ( s == wxS("false") ||
-                  s == wxS("no") ||
-                  s == wxS('0') )
-            value2 = false;
-        else
-            return false;
-
-        wxAnyValueTypeImpl<bool>::SetValue(value2, dst);
-    }
-    else
-        return false;
-
-    return true;
-}
-
-bool wxAnyValueTypeImpl<bool>::ConvertValue(const wxAnyValueBuffer& src,
-                                            wxAnyValueType* dstType,
-                                            wxAnyValueBuffer& dst) const
-{
-    bool value = GetValue(src);
-    if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseIntType) )
-    {
-        wxAnyBaseIntType value2 = static_cast<wxAnyBaseIntType>(value);
-        wxAnyValueTypeImplInt::SetValue(value2, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseUintType) )
-    {
-        wxAnyBaseIntType value2 = static_cast<wxAnyBaseUintType>(value);
-        wxAnyValueTypeImplUint::SetValue(value2, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
-    {
-        wxString s;
-        if ( value )
-            s = wxS("true");
-        else
-            s = wxS("false");
-        wxAnyValueTypeImpl<wxString>::SetValue(s, dst);
-    }
-    else
-        return false;
-
-    return true;
-}
-
-bool wxAnyValueTypeImplDouble::ConvertValue(const wxAnyValueBuffer& src,
-                                            wxAnyValueType* dstType,
-                                            wxAnyValueBuffer& dst) const
-{
-    double value = GetValue(src);
-    if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseIntType) )
-    {
-        if ( value < UseIntMinF || value > UseIntMaxF )
-            return false;
-        wxAnyBaseUintType ul = static_cast<wxAnyBaseUintType>(value);
-        wxAnyValueTypeImplUint::SetValue(ul, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxAnyBaseUintType) )
-    {
-        if ( value < 0.0 || value > UseUintMaxF )
-            return false;
-        wxAnyBaseUintType ul = static_cast<wxAnyBaseUintType>(value);
-        wxAnyValueTypeImplUint::SetValue(ul, dst);
-    }
-    else if ( wxANY_VALUE_TYPE_CHECK_TYPE(dstType, wxString) )
-    {
-        wxString s = wxString::Format(wxS("%.14g"), value);
-        wxAnyValueTypeImpl<wxString>::SetValue(s, dst);
-    }
-    else
-        return false;
-
-    return true;
-}
-
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplInt)
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplUint)
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<bool>)
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplDouble)
-
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplwxString)
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplConstCharPtr)
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImplConstWchar_tPtr)
-
-#if wxUSE_DATETIME
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxDateTime>)
-#endif // wxUSE_DATETIME
-
-//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxObject*>)
-//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxArrayString>)
-
-//-------------------------------------------------------------------------
-// wxAnyNullValueType implementation
-//-------------------------------------------------------------------------
-
-class wxAnyNullValue
-{
-private:
-    void*   m_dummy;
-};
-
-template <>
-class wxAnyValueTypeImpl<wxAnyNullValue> : public wxAnyValueType
-{
-    WX_DECLARE_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxAnyNullValue>)
-public:
-    // Dummy implementations
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const
-    {
-        wxUnusedVar(buf);
-    }
-
-    virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const
-    {
-        wxUnusedVar(src);
-        wxUnusedVar(dst);
-    }
-
-    virtual bool ConvertValue(const wxAnyValueBuffer& src,
-                              wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const
-    {
-        wxUnusedVar(src);
-        wxUnusedVar(dstType);
-        wxUnusedVar(dst);
-        return false;
-    }
-
-#if wxUSE_EXTENDED_RTTI
-    virtual const wxTypeInfo* GetTypeInfo() const
-    {
-        wxFAIL_MSG("Null Type Info not available");
-        return NULL;
-    }
-#endif
-
-private:
-};
-
-WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxAnyNullValue>)
-
-wxAnyValueType* wxAnyNullValueType =
-    wxAnyValueTypeImpl<wxAnyNullValue>::GetInstance();
-
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxAnyList)
-
-#endif // wxUSE_ANY
diff --git a/Source/3rd Party/wx/src/common/appbase.cpp b/Source/3rd Party/wx/src/common/appbase.cpp
index c7df04a99..c696e9c07 100644
--- a/Source/3rd Party/wx/src/common/appbase.cpp	
+++ b/Source/3rd Party/wx/src/common/appbase.cpp	
@@ -1,1275 +1,846 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/appbase.cpp
-// Purpose:     implements wxAppConsoleBase class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     19.06.2003 (extracted from common/appcmn.cpp)
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #ifdef __WINDOWS__
-        #include  "wx/msw/wrapwin.h"  // includes windows.h for MessageBox()
-    #endif
-    #include "wx/list.h"
-    #include "wx/app.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/wxcrtvararg.h"
-#endif //WX_PRECOMP
-
-#include "wx/apptrait.h"
-#include "wx/cmdline.h"
-#include "wx/confbase.h"
-#include "wx/evtloop.h"
-#include "wx/filename.h"
-#include "wx/msgout.h"
-#include "wx/scopedptr.h"
-#include "wx/sysopt.h"
-#include "wx/tokenzr.h"
-#include "wx/thread.h"
-
-#if wxUSE_EXCEPTIONS && wxUSE_STL
-    #include <exception>
-    #include <typeinfo>
-#endif
-
-#if !defined(__WINDOWS__) || defined(__WXMICROWIN__)
-  #include  <signal.h>      // for SIGTRAP used by wxTrap()
-#endif  //Win/Unix
-
-#include <locale.h>
-
-#if wxUSE_FONTMAP
-    #include "wx/fontmap.h"
-#endif // wxUSE_FONTMAP
-
-#if wxDEBUG_LEVEL
-    #if wxUSE_STACKWALKER
-        #include "wx/stackwalk.h"
-        #ifdef __WINDOWS__
-            #include "wx/msw/debughlp.h"
-        #endif
-    #endif // wxUSE_STACKWALKER
-
-    #include "wx/recguard.h"
-#endif // wxDEBUG_LEVEL
-
-// wxABI_VERSION can be defined when compiling applications but it should be
-// left undefined when compiling the library itself, it is then set to its
-// default value in version.h
-#if wxABI_VERSION != wxMAJOR_VERSION * 10000 + wxMINOR_VERSION * 100 + 99
-#error "wxABI_VERSION should not be defined when compiling the library"
-#endif
-
-// ----------------------------------------------------------------------------
-// private functions prototypes
-// ----------------------------------------------------------------------------
-
-#if wxDEBUG_LEVEL
-    // really just show the assert dialog
-    static bool DoShowAssertDialog(const wxString& msg);
-
-    // prepare for showing the assert dialog, use the given traits or
-    // DoShowAssertDialog() as last fallback to really show it
-    static
-    void ShowAssertDialog(const wxString& file,
-                          int line,
-                          const wxString& func,
-                          const wxString& cond,
-                          const wxString& msg,
-                          wxAppTraits *traits = NULL);
-#endif // wxDEBUG_LEVEL
-
-#ifdef __WXDEBUG__
-    // turn on the trace masks specified in the env variable WXTRACE
-    static void LINKAGEMODE SetTraceMasks();
-#endif // __WXDEBUG__
-
-// ----------------------------------------------------------------------------
-// global vars
-// ----------------------------------------------------------------------------
-
-wxAppConsole *wxAppConsoleBase::ms_appInstance = NULL;
-
-wxAppInitializerFunction wxAppConsoleBase::ms_appInitFn = NULL;
-
-wxSocketManager *wxAppTraitsBase::ms_manager = NULL;
-
-WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
-
-// ----------------------------------------------------------------------------
-// wxEventLoopPtr
-// ----------------------------------------------------------------------------
-
-// this defines wxEventLoopPtr
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopBase)
-
-// ============================================================================
-// wxAppConsoleBase implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxAppConsoleBase::wxAppConsoleBase()
-{
-    m_traits = NULL;
-    m_mainLoop = NULL;
-    m_bDoPendingEventProcessing = true;
-
-    ms_appInstance = static_cast<wxAppConsole *>(this);
-
-#ifdef __WXDEBUG__
-    SetTraceMasks();
-#if wxUSE_UNICODE
-    // In unicode mode the SetTraceMasks call can cause an apptraits to be
-    // created, but since we are still in the constructor the wrong kind will
-    // be created for GUI apps.  Destroy it so it can be created again later.
-    wxDELETE(m_traits);
-#endif
-#endif
-
-    wxEvtHandler::AddFilter(this);
-}
-
-wxAppConsoleBase::~wxAppConsoleBase()
-{
-    wxEvtHandler::RemoveFilter(this);
-
-    // we're being destroyed and using this object from now on may not work or
-    // even crash so don't leave dangling pointers to it
-    ms_appInstance = NULL;
-
-    delete m_traits;
-}
-
-// ----------------------------------------------------------------------------
-// initialization/cleanup
-// ----------------------------------------------------------------------------
-
-bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **WXUNUSED(argv))
-{
-#if wxUSE_INTL
-    GetTraits()->SetLocale();
-#endif // wxUSE_INTL
-
-    return true;
-}
-
-wxString wxAppConsoleBase::GetAppName() const
-{
-    wxString name = m_appName;
-    if ( name.empty() )
-    {
-        if ( argv )
-        {
-            // the application name is, by default, the name of its executable file
-            wxFileName::SplitPath(argv[0], NULL, &name, NULL);
-        }
-    }
-    return name;
-}
-
-wxString wxAppConsoleBase::GetAppDisplayName() const
-{
-    // use the explicitly provided display name, if any
-    if ( !m_appDisplayName.empty() )
-        return m_appDisplayName;
-
-    // if the application name was explicitly set, use it as is as capitalizing
-    // it won't always produce good results
-    if ( !m_appName.empty() )
-        return m_appName;
-
-    // if neither is set, use the capitalized version of the program file as
-    // it's the most reasonable default
-    return GetAppName().Capitalize();
-}
-
-wxEventLoopBase *wxAppConsoleBase::CreateMainLoop()
-{
-    return GetTraits()->CreateEventLoop();
-}
-
-void wxAppConsoleBase::CleanUp()
-{
-    wxDELETE(m_mainLoop);
-}
-
-// ----------------------------------------------------------------------------
-// OnXXX() callbacks
-// ----------------------------------------------------------------------------
-
-bool wxAppConsoleBase::OnInit()
-{
-#if wxUSE_CMDLINE_PARSER
-    wxCmdLineParser parser(argc, argv);
-
-    OnInitCmdLine(parser);
-
-    bool cont;
-    switch ( parser.Parse(false /* don't show usage */) )
-    {
-        case -1:
-            cont = OnCmdLineHelp(parser);
-            break;
-
-        case 0:
-            cont = OnCmdLineParsed(parser);
-            break;
-
-        default:
-            cont = OnCmdLineError(parser);
-            break;
-    }
-
-    if ( !cont )
-        return false;
-#endif // wxUSE_CMDLINE_PARSER
-
-    return true;
-}
-
-int wxAppConsoleBase::OnRun()
-{
-    return MainLoop();
-}
-
-int wxAppConsoleBase::OnExit()
-{
-#if wxUSE_CONFIG
-    // delete the config object if any (don't use Get() here, but Set()
-    // because Get() could create a new config object)
-    delete wxConfigBase::Set(NULL);
-#endif // wxUSE_CONFIG
-
-    return 0;
-}
-
-void wxAppConsoleBase::Exit()
-{
-    if (m_mainLoop != NULL)
-        ExitMainLoop();
-    else
-        exit(-1);
-}
-
-// ----------------------------------------------------------------------------
-// traits stuff
-// ----------------------------------------------------------------------------
-
-wxAppTraits *wxAppConsoleBase::CreateTraits()
-{
-    return new wxConsoleAppTraits;
-}
-
-wxAppTraits *wxAppConsoleBase::GetTraits()
-{
-    // FIXME-MT: protect this with a CS?
-    if ( !m_traits )
-    {
-        m_traits = CreateTraits();
-
-        wxASSERT_MSG( m_traits, wxT("wxApp::CreateTraits() failed?") );
-    }
-
-    return m_traits;
-}
-
-/* static */
-wxAppTraits *wxAppConsoleBase::GetTraitsIfExists()
-{
-    wxAppConsole * const app = GetInstance();
-    return app ? app->GetTraits() : NULL;
-}
-
-// ----------------------------------------------------------------------------
-// wxEventLoop redirection
-// ----------------------------------------------------------------------------
-
-int wxAppConsoleBase::MainLoop()
-{
-    wxEventLoopBaseTiedPtr mainLoop(&m_mainLoop, CreateMainLoop());
-
-    return m_mainLoop ? m_mainLoop->Run() : -1;
-}
-
-void wxAppConsoleBase::ExitMainLoop()
-{
-    // we should exit from the main event loop, not just any currently active
-    // (e.g. modal dialog) event loop
-    if ( m_mainLoop && m_mainLoop->IsRunning() )
-    {
-        m_mainLoop->Exit(0);
-    }
-}
-
-bool wxAppConsoleBase::Pending()
-{
-    // use the currently active message loop here, not m_mainLoop, because if
-    // we're showing a modal dialog (with its own event loop) currently the
-    // main event loop is not running anyhow
-    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-
-    return loop && loop->Pending();
-}
-
-bool wxAppConsoleBase::Dispatch()
-{
-    // see comment in Pending()
-    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-
-    return loop && loop->Dispatch();
-}
-
-bool wxAppConsoleBase::Yield(bool onlyIfNeeded)
-{
-    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-    if ( loop )
-       return loop->Yield(onlyIfNeeded);
-
-    wxScopedPtr<wxEventLoopBase> tmpLoop(CreateMainLoop());
-    return tmpLoop->Yield(onlyIfNeeded);
-}
-
-void wxAppConsoleBase::WakeUpIdle()
-{
-    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-
-    if ( loop )
-        loop->WakeUp();
-}
-
-bool wxAppConsoleBase::ProcessIdle()
-{
-    // synthesize an idle event and check if more of them are needed
-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
-
-#if wxUSE_LOG
-    // flush the logged messages if any (do this after processing the events
-    // which could have logged new messages)
-    wxLog::FlushActive();
-#endif
-
-    // Garbage collect all objects previously scheduled for destruction.
-    DeletePendingObjects();
-
-    return event.MoreRequested();
-}
-
-bool wxAppConsoleBase::UsesEventLoop() const
-{
-    // in console applications we don't know whether we're going to have an
-    // event loop so assume we won't -- unless we already have one running
-    return wxEventLoopBase::GetActive() != NULL;
-}
-
-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxAppConsoleBase::IsMainLoopRunning()
-{
-    const wxAppConsole * const app = GetInstance();
-
-    return app && app->m_mainLoop != NULL;
-}
-
-int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event))
-{
-    // process the events normally by default
-    return Event_Skip;
-}
-
-void wxAppConsoleBase::DelayPendingEventHandler(wxEvtHandler* toDelay)
-{
-    wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker);
-
-    // move the handler from the list of handlers with processable pending events
-    // to the list of handlers with pending events which needs to be processed later
-    m_handlersWithPendingEvents.Remove(toDelay);
-
-    if (m_handlersWithPendingDelayedEvents.Index(toDelay) == wxNOT_FOUND)
-        m_handlersWithPendingDelayedEvents.Add(toDelay);
-
-    wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker);
-}
-
-void wxAppConsoleBase::RemovePendingEventHandler(wxEvtHandler* toRemove)
-{
-    wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker);
-
-    if (m_handlersWithPendingEvents.Index(toRemove) != wxNOT_FOUND)
-    {
-        m_handlersWithPendingEvents.Remove(toRemove);
-
-        // check that the handler was present only once in the list
-        wxASSERT_MSG( m_handlersWithPendingEvents.Index(toRemove) == wxNOT_FOUND,
-                        "Handler occurs twice in the m_handlersWithPendingEvents list!" );
-    }
-    //else: it wasn't in this list at all, it's ok
-
-    if (m_handlersWithPendingDelayedEvents.Index(toRemove) != wxNOT_FOUND)
-    {
-        m_handlersWithPendingDelayedEvents.Remove(toRemove);
-
-        // check that the handler was present only once in the list
-        wxASSERT_MSG( m_handlersWithPendingDelayedEvents.Index(toRemove) == wxNOT_FOUND,
-                        "Handler occurs twice in m_handlersWithPendingDelayedEvents list!" );
-    }
-    //else: it wasn't in this list at all, it's ok
-
-    wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker);
-}
-
-void wxAppConsoleBase::AppendPendingEventHandler(wxEvtHandler* toAppend)
-{
-    wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker);
-
-    if ( m_handlersWithPendingEvents.Index(toAppend) == wxNOT_FOUND )
-        m_handlersWithPendingEvents.Add(toAppend);
-
-    wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker);
-}
-
-bool wxAppConsoleBase::HasPendingEvents() const
-{
-    wxENTER_CRIT_SECT(const_cast<wxAppConsoleBase*>(this)->m_handlersWithPendingEventsLocker);
-
-    bool has = !m_handlersWithPendingEvents.IsEmpty();
-
-    wxLEAVE_CRIT_SECT(const_cast<wxAppConsoleBase*>(this)->m_handlersWithPendingEventsLocker);
-
-    return has;
-}
-
-void wxAppConsoleBase::SuspendProcessingOfPendingEvents()
-{
-    m_bDoPendingEventProcessing = false;
-}
-
-void wxAppConsoleBase::ResumeProcessingOfPendingEvents()
-{
-    m_bDoPendingEventProcessing = true;
-}
-
-void wxAppConsoleBase::ProcessPendingEvents()
-{
-    if ( m_bDoPendingEventProcessing )
-    {
-        wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker);
-
-        wxCHECK_RET( m_handlersWithPendingDelayedEvents.IsEmpty(),
-                     "this helper list should be empty" );
-
-        // iterate until the list becomes empty: the handlers remove themselves
-        // from it when they don't have any more pending events
-        while (!m_handlersWithPendingEvents.IsEmpty())
-        {
-            // In ProcessPendingEvents(), new handlers might be added
-            // and we can safely leave the critical section here.
-            wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker);
-
-            // NOTE: we always call ProcessPendingEvents() on the first event handler
-            //       with pending events because handlers auto-remove themselves
-            //       from this list (see RemovePendingEventHandler) if they have no
-            //       more pending events.
-            m_handlersWithPendingEvents[0]->ProcessPendingEvents();
-
-            wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker);
-        }
-
-        // now the wxHandlersWithPendingEvents is surely empty; however some event
-        // handlers may have moved themselves into wxHandlersWithPendingDelayedEvents
-        // because of a selective wxYield call in progress.
-        // Now we need to move them back to wxHandlersWithPendingEvents so the next
-        // call to this function has the chance of processing them:
-        if (!m_handlersWithPendingDelayedEvents.IsEmpty())
-        {
-            WX_APPEND_ARRAY(m_handlersWithPendingEvents, m_handlersWithPendingDelayedEvents);
-            m_handlersWithPendingDelayedEvents.Clear();
-        }
-
-        wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker);
-    }
-}
-
-void wxAppConsoleBase::DeletePendingEvents()
-{
-    wxENTER_CRIT_SECT(m_handlersWithPendingEventsLocker);
-
-    wxCHECK_RET( m_handlersWithPendingDelayedEvents.IsEmpty(),
-                 "this helper list should be empty" );
-
-    for (unsigned int i=0; i<m_handlersWithPendingEvents.GetCount(); i++)
-        m_handlersWithPendingEvents[i]->DeletePendingEvents();
-
-    m_handlersWithPendingEvents.Clear();
-
-    wxLEAVE_CRIT_SECT(m_handlersWithPendingEventsLocker);
-}
-
-// ----------------------------------------------------------------------------
-// delayed objects destruction
-// ----------------------------------------------------------------------------
-
-bool wxAppConsoleBase::IsScheduledForDestruction(wxObject *object) const
-{
-    return wxPendingDelete.Member(object);
-}
-
-void wxAppConsoleBase::ScheduleForDestruction(wxObject *object)
-{
-    if ( !UsesEventLoop() )
-    {
-        // we won't be able to delete it later so do it right now
-        delete object;
-        return;
-    }
-    //else: we either already have or will soon start an event loop
-
-    if ( !wxPendingDelete.Member(object) )
-        wxPendingDelete.Append(object);
-}
-
-void wxAppConsoleBase::DeletePendingObjects()
-{
-    wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
-    while (node)
-    {
-        wxObject *obj = node->GetData();
-
-        // remove it from the list first so that if we get back here somehow
-        // during the object deletion (e.g. wxYield called from its dtor) we
-        // wouldn't try to delete it the second time
-        if ( wxPendingDelete.Member(obj) )
-            wxPendingDelete.Erase(node);
-
-        delete obj;
-
-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        node = wxPendingDelete.GetFirst();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// exception handling
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXCEPTIONS
-
-void
-wxAppConsoleBase::HandleEvent(wxEvtHandler *handler,
-                              wxEventFunction func,
-                              wxEvent& event) const
-{
-    // by default, simply call the handler
-    (handler->*func)(event);
-}
-
-void wxAppConsoleBase::CallEventHandler(wxEvtHandler *handler,
-                                        wxEventFunctor& functor,
-                                        wxEvent& event) const
-{
-    // If the functor holds a method then, for backward compatibility, call
-    // HandleEvent():
-    wxEventFunction eventFunction = functor.GetEvtMethod();
-
-    if ( eventFunction )
-        HandleEvent(handler, eventFunction, event);
-    else
-        functor(handler, event);
-}
-
-void wxAppConsoleBase::OnUnhandledException()
-{
-#ifdef __WXDEBUG__
-    // we're called from an exception handler so we can re-throw the exception
-    // to recover its type
-    wxString what;
-    try
-    {
-        throw;
-    }
-#if wxUSE_STL
-    catch ( std::exception& e )
-    {
-        what.Printf("std::exception of type \"%s\", what() = \"%s\"",
-                    typeid(e).name(), e.what());
-    }
-#endif // wxUSE_STL
-    catch ( ... )
-    {
-        what = "unknown exception";
-    }
-
-    wxMessageOutputBest().Printf(
-        "*** Caught unhandled %s; terminating\n", what
-    );
-#endif // __WXDEBUG__
-}
-
-// ----------------------------------------------------------------------------
-// exceptions support
-// ----------------------------------------------------------------------------
-
-bool wxAppConsoleBase::OnExceptionInMainLoop()
-{
-    throw;
-
-    // some compilers are too stupid to know that we never return after throw
-#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200)
-    return false;
-#endif
-}
-
-#endif // wxUSE_EXCEPTIONS
-
-// ----------------------------------------------------------------------------
-// cmd line parsing
-// ----------------------------------------------------------------------------
-
-#if wxUSE_CMDLINE_PARSER
-
-#define OPTION_VERBOSE "verbose"
-
-void wxAppConsoleBase::OnInitCmdLine(wxCmdLineParser& parser)
-{
-    // the standard command line options
-    static const wxCmdLineEntryDesc cmdLineDesc[] =
-    {
-        {
-            wxCMD_LINE_SWITCH,
-            "h",
-            "help",
-            gettext_noop("show this help message"),
-            wxCMD_LINE_VAL_NONE,
-            wxCMD_LINE_OPTION_HELP
-        },
-
-#if wxUSE_LOG
-        {
-            wxCMD_LINE_SWITCH,
-            NULL,
-            OPTION_VERBOSE,
-            gettext_noop("generate verbose log messages"),
-            wxCMD_LINE_VAL_NONE,
-            0x0
-        },
-#endif // wxUSE_LOG
-
-        // terminator
-        wxCMD_LINE_DESC_END
-    };
-
-    parser.SetDesc(cmdLineDesc);
-}
-
-bool wxAppConsoleBase::OnCmdLineParsed(wxCmdLineParser& parser)
-{
-#if wxUSE_LOG
-    if ( parser.Found(OPTION_VERBOSE) )
-    {
-        wxLog::SetVerbose(true);
-    }
-#else
-    wxUnusedVar(parser);
-#endif // wxUSE_LOG
-
-    return true;
-}
-
-bool wxAppConsoleBase::OnCmdLineHelp(wxCmdLineParser& parser)
-{
-    parser.Usage();
-
-    return false;
-}
-
-bool wxAppConsoleBase::OnCmdLineError(wxCmdLineParser& parser)
-{
-    parser.Usage();
-
-    return false;
-}
-
-#endif // wxUSE_CMDLINE_PARSER
-
-// ----------------------------------------------------------------------------
-// debugging support
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxAppConsoleBase::CheckBuildOptions(const char *optionsSignature,
-                                         const char *componentName)
-{
-#if 0 // can't use wxLogTrace, not up and running yet
-    printf("checking build options object '%s' (ptr %p) in '%s'\n",
-             optionsSignature, optionsSignature, componentName);
-#endif
-
-    if ( strcmp(optionsSignature, WX_BUILD_OPTIONS_SIGNATURE) != 0 )
-    {
-        wxString lib = wxString::FromAscii(WX_BUILD_OPTIONS_SIGNATURE);
-        wxString prog = wxString::FromAscii(optionsSignature);
-        wxString progName = wxString::FromAscii(componentName);
-        wxString msg;
-
-        msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
-                   lib.c_str(), progName.c_str(), prog.c_str());
-
-        wxLogFatalError(msg.c_str());
-
-        // normally wxLogFatalError doesn't return
-        return false;
-    }
-
-    return true;
-}
-
-void wxAppConsoleBase::OnAssertFailure(const wxChar *file,
-                                       int line,
-                                       const wxChar *func,
-                                       const wxChar *cond,
-                                       const wxChar *msg)
-{
-#if wxDEBUG_LEVEL
-    ShowAssertDialog(file, line, func, cond, msg, GetTraits());
-#else
-    // this function is still present even in debug level 0 build for ABI
-    // compatibility reasons but is never called there and so can simply do
-    // nothing in it
-    wxUnusedVar(file);
-    wxUnusedVar(line);
-    wxUnusedVar(func);
-    wxUnusedVar(cond);
-    wxUnusedVar(msg);
-#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
-}
-
-void wxAppConsoleBase::OnAssert(const wxChar *file,
-                                int line,
-                                const wxChar *cond,
-                                const wxChar *msg)
-{
-    OnAssertFailure(file, line, NULL, cond, msg);
-}
-
-// ============================================================================
-// other classes implementations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxConsoleAppTraitsBase
-// ----------------------------------------------------------------------------
-
-#if wxUSE_LOG
-
-wxLog *wxConsoleAppTraitsBase::CreateLogTarget()
-{
-    return new wxLogStderr;
-}
-
-#endif // wxUSE_LOG
-
-wxMessageOutput *wxConsoleAppTraitsBase::CreateMessageOutput()
-{
-    return new wxMessageOutputStderr;
-}
-
-#if wxUSE_FONTMAP
-
-wxFontMapper *wxConsoleAppTraitsBase::CreateFontMapper()
-{
-    return (wxFontMapper *)new wxFontMapperBase;
-}
-
-#endif // wxUSE_FONTMAP
-
-wxRendererNative *wxConsoleAppTraitsBase::CreateRenderer()
-{
-    // console applications don't use renderers
-    return NULL;
-}
-
-bool wxConsoleAppTraitsBase::ShowAssertDialog(const wxString& msg)
-{
-    return wxAppTraitsBase::ShowAssertDialog(msg);
-}
-
-bool wxConsoleAppTraitsBase::HasStderr()
-{
-    // console applications always have stderr, even under Mac/Windows
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wxAppTraits
-// ----------------------------------------------------------------------------
-
-#if wxUSE_INTL
-void wxAppTraitsBase::SetLocale()
-{
-    wxSetlocale(LC_ALL, "");
-    wxUpdateLocaleIsUtf8();
-}
-#endif
-
-#if wxUSE_THREADS
-void wxMutexGuiEnterImpl();
-void wxMutexGuiLeaveImpl();
-
-void wxAppTraitsBase::MutexGuiEnter()
-{
-    wxMutexGuiEnterImpl();
-}
-
-void wxAppTraitsBase::MutexGuiLeave()
-{
-    wxMutexGuiLeaveImpl();
-}
-
-void WXDLLIMPEXP_BASE wxMutexGuiEnter()
-{
-    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
-    if ( traits )
-        traits->MutexGuiEnter();
-}
-
-void WXDLLIMPEXP_BASE wxMutexGuiLeave()
-{
-    wxAppTraits * const traits = wxAppConsoleBase::GetTraitsIfExists();
-    if ( traits )
-        traits->MutexGuiLeave();
-}
-#endif // wxUSE_THREADS
-
-bool wxAppTraitsBase::ShowAssertDialog(const wxString& msgOriginal)
-{
-#if wxDEBUG_LEVEL
-    wxString msg;
-
-#if wxUSE_STACKWALKER
-    const wxString stackTrace = GetAssertStackTrace();
-    if ( !stackTrace.empty() )
-    {
-        msg << wxT("\n\nCall stack:\n") << stackTrace;
-
-        wxMessageOutputDebug().Output(msg);
-    }
-#endif // wxUSE_STACKWALKER
-
-    return DoShowAssertDialog(msgOriginal + msg);
-#else // !wxDEBUG_LEVEL
-    wxUnusedVar(msgOriginal);
-
-    return false;
-#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
-}
-
-#if wxUSE_STACKWALKER
-wxString wxAppTraitsBase::GetAssertStackTrace()
-{
-#if wxDEBUG_LEVEL
-
-#if !defined(__WINDOWS__)
-    // on Unix stack frame generation may take some time, depending on the
-    // size of the executable mainly... warn the user that we are working
-    wxFprintf(stderr, "Collecting stack trace information, please wait...");
-    fflush(stderr);
-#endif // !__WINDOWS__
-
-
-    wxString stackTrace;
-
-    class StackDump : public wxStackWalker
-    {
-    public:
-        StackDump() { }
-
-        const wxString& GetStackTrace() const { return m_stackTrace; }
-
-    protected:
-        virtual void OnStackFrame(const wxStackFrame& frame)
-        {
-            m_stackTrace << wxString::Format
-                            (
-                              wxT("[%02d] "),
-                              wx_truncate_cast(int, frame.GetLevel())
-                            );
-
-            wxString name = frame.GetName();
-            if ( !name.empty() )
-            {
-                m_stackTrace << wxString::Format(wxT("%-40s"), name.c_str());
-            }
-            else
-            {
-                m_stackTrace << wxString::Format(wxT("%p"), frame.GetAddress());
-            }
-
-            if ( frame.HasSourceLocation() )
-            {
-                m_stackTrace << wxT('\t')
-                             << frame.GetFileName()
-                             << wxT(':')
-                             << frame.GetLine();
-            }
-
-            m_stackTrace << wxT('\n');
-        }
-
-    private:
-        wxString m_stackTrace;
-    };
-
-    // don't show more than maxLines or we could get a dialog too tall to be
-    // shown on screen: 20 should be ok everywhere as even with 15 pixel high
-    // characters it is still only 300 pixels...
-    static const int maxLines = 20;
-
-    StackDump dump;
-    dump.Walk(2, maxLines); // don't show OnAssert() call itself
-    stackTrace = dump.GetStackTrace();
-
-    const int count = stackTrace.Freq(wxT('\n'));
-    for ( int i = 0; i < count - maxLines; i++ )
-        stackTrace = stackTrace.BeforeLast(wxT('\n'));
-
-    return stackTrace;
-#else // !wxDEBUG_LEVEL
-    // this function is still present for ABI-compatibility even in debug level
-    // 0 build but is not used there and so can simply do nothing
-    return wxString();
-#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
-}
-#endif // wxUSE_STACKWALKER
-
-
-// ============================================================================
-// global functions implementation
-// ============================================================================
-
-void wxExit()
-{
-    if ( wxTheApp )
-    {
-        wxTheApp->Exit();
-    }
-    else
-    {
-        // what else can we do?
-        exit(-1);
-    }
-}
-
-void wxWakeUpIdle()
-{
-    if ( wxTheApp )
-    {
-        wxTheApp->WakeUpIdle();
-    }
-    //else: do nothing, what can we do?
-}
-
-// wxASSERT() helper
-bool wxAssertIsEqual(int x, int y)
-{
-    return x == y;
-}
-
-void wxAbort()
-{
-#ifdef __WXWINCE__
-    ExitThread(3);
-#else
-    abort();
-#endif
-}
-
-#if wxDEBUG_LEVEL
-
-// break into the debugger
-void wxTrap()
-{
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    DebugBreak();
-#elif defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
-    Debugger();
-#elif defined(__UNIX__)
-    raise(SIGTRAP);
-#else
-    // TODO
-#endif // Win/Unix
-}
-
-// default assert handler
-static void
-wxDefaultAssertHandler(const wxString& file,
-                       int line,
-                       const wxString& func,
-                       const wxString& cond,
-                       const wxString& msg)
-{
-    // If this option is set, we should abort immediately when assert happens.
-    if ( wxSystemOptions::GetOptionInt("exit-on-assert") )
-        wxAbort();
-
-    // FIXME MT-unsafe
-    static int s_bInAssert = 0;
-
-    wxRecursionGuard guard(s_bInAssert);
-    if ( guard.IsInside() )
-    {
-        // can't use assert here to avoid infinite loops, so just trap
-        wxTrap();
-
-        return;
-    }
-
-    if ( !wxTheApp )
-    {
-        // by default, show the assert dialog box -- we can't customize this
-        // behaviour
-        ShowAssertDialog(file, line, func, cond, msg);
-    }
-    else
-    {
-        // let the app process it as it wants
-        // FIXME-UTF8: use wc_str(), not c_str(), when ANSI build is removed
-        wxTheApp->OnAssertFailure(file.c_str(), line, func.c_str(),
-                                  cond.c_str(), msg.c_str());
-    }
-}
-
-wxAssertHandler_t wxTheAssertHandler = wxDefaultAssertHandler;
-
-void wxSetDefaultAssertHandler()
-{
-    wxTheAssertHandler = wxDefaultAssertHandler;
-}
-
-void wxOnAssert(const wxString& file,
-                int line,
-                const wxString& func,
-                const wxString& cond,
-                const wxString& msg)
-{
-    wxTheAssertHandler(file, line, func, cond, msg);
-}
-
-void wxOnAssert(const wxString& file,
-                int line,
-                const wxString& func,
-                const wxString& cond)
-{
-    wxTheAssertHandler(file, line, func, cond, wxString());
-}
-
-void wxOnAssert(const wxChar *file,
-                int line,
-                const char *func,
-                const wxChar *cond,
-                const wxChar *msg)
-{
-    // this is the backwards-compatible version (unless we don't use Unicode)
-    // so it could be called directly from the user code and this might happen
-    // even when wxTheAssertHandler is NULL
-#if wxUSE_UNICODE
-    if ( wxTheAssertHandler )
-#endif // wxUSE_UNICODE
-        wxTheAssertHandler(file, line, func, cond, msg);
-}
-
-void wxOnAssert(const char *file,
-                int line,
-                const char *func,
-                const char *cond,
-                const wxString& msg)
-{
-    wxTheAssertHandler(file, line, func, cond, msg);
-}
-
-void wxOnAssert(const char *file,
-                int line,
-                const char *func,
-                const char *cond,
-                const wxCStrData& msg)
-{
-    wxTheAssertHandler(file, line, func, cond, msg);
-}
-
-#if wxUSE_UNICODE
-void wxOnAssert(const char *file,
-                int line,
-                const char *func,
-                const char *cond)
-{
-    wxTheAssertHandler(file, line, func, cond, wxString());
-}
-
-void wxOnAssert(const char *file,
-                int line,
-                const char *func,
-                const char *cond,
-                const char *msg)
-{
-    wxTheAssertHandler(file, line, func, cond, msg);
-}
-
-void wxOnAssert(const char *file,
-                int line,
-                const char *func,
-                const char *cond,
-                const wxChar *msg)
-{
-    wxTheAssertHandler(file, line, func, cond, msg);
-}
-#endif // wxUSE_UNICODE
-
-#endif // wxDEBUG_LEVEL
-
-// ============================================================================
-// private functions implementation
-// ============================================================================
-
-#ifdef __WXDEBUG__
-
-static void LINKAGEMODE SetTraceMasks()
-{
-#if wxUSE_LOG
-    wxString mask;
-    if ( wxGetEnv(wxT("WXTRACE"), &mask) )
-    {
-        wxStringTokenizer tkn(mask, wxT(",;:"));
-        while ( tkn.HasMoreTokens() )
-            wxLog::AddTraceMask(tkn.GetNextToken());
-    }
-#endif // wxUSE_LOG
-}
-
-#endif // __WXDEBUG__
-
-#if wxDEBUG_LEVEL
-
-static
-bool DoShowAssertDialog(const wxString& msg)
-{
-    // under Windows we can show the dialog even in the console mode
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    wxString msgDlg(msg);
-
-    // this message is intentionally not translated -- it is for developers
-    // only -- and the less code we use here, less is the danger of recursively
-    // asserting and dying
-    msgDlg += wxT("\nDo you want to stop the program?\n")
-              wxT("You can also choose [Cancel] to suppress ")
-              wxT("further warnings.");
-
-    switch ( ::MessageBox(NULL, msgDlg.t_str(), wxT("wxWidgets Debug Alert"),
-                          MB_YESNOCANCEL | MB_ICONSTOP ) )
-    {
-        case IDYES:
-            wxTrap();
-            break;
-
-        case IDCANCEL:
-            // stop the asserts
-            return true;
-
-        //case IDNO: nothing to do
-    }
-#else // !__WINDOWS__
-    wxUnusedVar(msg);
-#endif // __WINDOWS__/!__WINDOWS__
-
-    // continue with the asserts by default
-    return false;
-}
-
-// show the standard assert dialog
-static
-void ShowAssertDialog(const wxString& file,
-                      int line,
-                      const wxString& func,
-                      const wxString& cond,
-                      const wxString& msgUser,
-                      wxAppTraits *traits)
-{
-    // this variable can be set to true to suppress "assert failure" messages
-    static bool s_bNoAsserts = false;
-
-    wxString msg;
-    msg.reserve(2048);
-
-    // make life easier for people using VC++ IDE by using this format: like
-    // this, clicking on the message will take us immediately to the place of
-    // the failed assert
-    msg.Printf(wxT("%s(%d): assert \"%s\" failed"), file, line, cond);
-
-    // add the function name, if any
-    if ( !func.empty() )
-        msg << wxT(" in ") << func << wxT("()");
-
-    // and the message itself
-    if ( !msgUser.empty() )
-    {
-        msg << wxT(": ") << msgUser;
-    }
-    else // no message given
-    {
-        msg << wxT('.');
-    }
-
-#if wxUSE_THREADS
-    // if we are not in the main thread, output the assert directly and trap
-    // since dialogs cannot be displayed
-    if ( !wxThread::IsMain() )
-    {
-        msg += wxString::Format(" [in thread %lx]", wxThread::GetCurrentId());
-    }
-#endif // wxUSE_THREADS
-
-    // log the assert in any case
-    wxMessageOutputDebug().Output(msg);
-
-    if ( !s_bNoAsserts )
-    {
-        if ( traits )
-        {
-            // delegate showing assert dialog (if possible) to that class
-            s_bNoAsserts = traits->ShowAssertDialog(msg);
-        }
-        else // no traits object
-        {
-            // fall back to the function of last resort
-            s_bNoAsserts = DoShowAssertDialog(msg);
-        }
-    }
-}
-
-#endif // wxDEBUG_LEVEL
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/appbase.cpp
+// Purpose:     implements wxAppConsole class
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     19.06.2003 (extracted from common/appcmn.cpp)
+// RCS-ID:      $Id: appbase.cpp 52093 2008-02-25 13:43:07Z VZ $
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// License:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include  "wx/msw/wrapwin.h"  // includes windows.h for MessageBox()
+    #endif
+    #include "wx/list.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+#endif //WX_PRECOMP
+
+#include "wx/apptrait.h"
+#include "wx/cmdline.h"
+#include "wx/confbase.h"
+#include "wx/filename.h"
+#include "wx/msgout.h"
+#include "wx/tokenzr.h"
+
+#if !defined(__WXMSW__) || defined(__WXMICROWIN__)
+  #include  <signal.h>      // for SIGTRAP used by wxTrap()
+#endif  //Win/Unix
+
+#if wxUSE_FONTMAP
+    #include "wx/fontmap.h"
+#endif // wxUSE_FONTMAP
+
+#if defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
+    // For MacTypes.h for Debugger function
+    #include <CoreFoundation/CFBase.h>
+#endif
+
+#if defined(__WXMAC__)
+    #ifdef __DARWIN__
+        #include  <CoreServices/CoreServices.h>
+    #else
+        #include  "wx/mac/private.h"  // includes mac headers
+    #endif
+#endif // __WXMAC__
+
+#ifdef __WXDEBUG__
+    #if wxUSE_STACKWALKER
+        #include "wx/stackwalk.h"
+        #ifdef __WXMSW__
+            #include "wx/msw/debughlp.h"
+        #endif
+    #endif // wxUSE_STACKWALKER
+
+    #include "wx/recguard.h"
+#endif // __WXDEBUG__
+
+// wxABI_VERSION can be defined when compiling applications but it should be
+// left undefined when compiling the library itself, it is then set to its
+// default value in version.h
+#if wxABI_VERSION != wxMAJOR_VERSION * 10000 + wxMINOR_VERSION * 100 + 99
+#error "wxABI_VERSION should not be defined when compiling the library"
+#endif
+
+// ----------------------------------------------------------------------------
+// private functions prototypes
+// ----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+    // really just show the assert dialog
+    static bool DoShowAssertDialog(const wxString& msg);
+
+    // prepare for showing the assert dialog, use the given traits or
+    // DoShowAssertDialog() as last fallback to really show it
+    static
+    void ShowAssertDialog(const wxChar *szFile,
+                          int nLine,
+                          const wxChar *szFunc,
+                          const wxChar *szCond,
+                          const wxChar *szMsg,
+                          wxAppTraits *traits = NULL);
+
+    // turn on the trace masks specified in the env variable WXTRACE
+    static void LINKAGEMODE SetTraceMasks();
+#endif // __WXDEBUG__
+
+// ----------------------------------------------------------------------------
+// global vars
+// ----------------------------------------------------------------------------
+
+wxAppConsole *wxAppConsole::ms_appInstance = NULL;
+
+wxAppInitializerFunction wxAppConsole::ms_appInitFn = NULL;
+
+// ============================================================================
+// wxAppConsole implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// ctor/dtor
+// ----------------------------------------------------------------------------
+
+wxAppConsole::wxAppConsole()
+{
+    m_traits = NULL;
+
+    ms_appInstance = this;
+
+#ifdef __WXDEBUG__
+    SetTraceMasks();
+#if wxUSE_UNICODE
+    // In unicode mode the SetTraceMasks call can cause an apptraits to be
+    // created, but since we are still in the constructor the wrong kind will
+    // be created for GUI apps.  Destroy it so it can be created again later.
+    delete m_traits;
+    m_traits = NULL;
+#endif
+#endif
+}
+
+wxAppConsole::~wxAppConsole()
+{
+    delete m_traits;
+}
+
+// ----------------------------------------------------------------------------
+// initilization/cleanup
+// ----------------------------------------------------------------------------
+
+bool wxAppConsole::Initialize(int& argcOrig, wxChar **argvOrig)
+{
+    // remember the command line arguments
+    argc = argcOrig;
+    argv = argvOrig;
+
+#ifndef __WXPALMOS__
+    if ( m_appName.empty() && argv )
+    {
+        // the application name is, by default, the name of its executable file
+        wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);
+    }
+#endif
+
+    return true;
+}
+
+void wxAppConsole::CleanUp()
+{
+}
+
+// ----------------------------------------------------------------------------
+// OnXXX() callbacks
+// ----------------------------------------------------------------------------
+
+bool wxAppConsole::OnInit()
+{
+#if wxUSE_CMDLINE_PARSER
+    wxCmdLineParser parser(argc, argv);
+
+    OnInitCmdLine(parser);
+
+    bool cont;
+    switch ( parser.Parse(false /* don't show usage */) )
+    {
+        case -1:
+            cont = OnCmdLineHelp(parser);
+            break;
+
+        case 0:
+            cont = OnCmdLineParsed(parser);
+            break;
+
+        default:
+            cont = OnCmdLineError(parser);
+            break;
+    }
+
+    if ( !cont )
+        return false;
+#endif // wxUSE_CMDLINE_PARSER
+
+    return true;
+}
+
+int wxAppConsole::OnExit()
+{
+#if wxUSE_CONFIG
+    // delete the config object if any (don't use Get() here, but Set()
+    // because Get() could create a new config object)
+    delete wxConfigBase::Set((wxConfigBase *) NULL);
+#endif // wxUSE_CONFIG
+
+    return 0;
+}
+
+void wxAppConsole::Exit()
+{
+    exit(-1);
+}
+
+// ----------------------------------------------------------------------------
+// traits stuff
+// ----------------------------------------------------------------------------
+
+wxAppTraits *wxAppConsole::CreateTraits()
+{
+    return new wxConsoleAppTraits;
+}
+
+wxAppTraits *wxAppConsole::GetTraits()
+{
+    // FIXME-MT: protect this with a CS?
+    if ( !m_traits )
+    {
+        m_traits = CreateTraits();
+
+        wxASSERT_MSG( m_traits, _T("wxApp::CreateTraits() failed?") );
+    }
+
+    return m_traits;
+}
+
+// we must implement CreateXXX() in wxApp itself for backwards compatibility
+#if WXWIN_COMPATIBILITY_2_4
+
+#if wxUSE_LOG
+
+wxLog *wxAppConsole::CreateLogTarget()
+{
+    wxAppTraits *traits = GetTraits();
+    return traits ? traits->CreateLogTarget() : NULL;
+}
+
+#endif // wxUSE_LOG
+
+wxMessageOutput *wxAppConsole::CreateMessageOutput()
+{
+    wxAppTraits *traits = GetTraits();
+    return traits ? traits->CreateMessageOutput() : NULL;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// event processing
+// ----------------------------------------------------------------------------
+
+void wxAppConsole::ProcessPendingEvents()
+{
+#if wxUSE_THREADS
+    if ( !wxPendingEventsLocker )
+        return;
+#endif
+
+    // ensure that we're the only thread to modify the pending events list
+    wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+
+    if ( !wxPendingEvents )
+    {
+        wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+        return;
+    }
+
+    // iterate until the list becomes empty
+    wxList::compatibility_iterator node = wxPendingEvents->GetFirst();
+    while (node)
+    {
+        wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
+        wxPendingEvents->Erase(node);
+
+        // In ProcessPendingEvents(), new handlers might be add
+        // and we can safely leave the critical section here.
+        wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+
+        handler->ProcessPendingEvents();
+
+        wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+
+        node = wxPendingEvents->GetFirst();
+    }
+
+    wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+}
+
+int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event))
+{
+    // process the events normally by default
+    return -1;
+}
+
+// ----------------------------------------------------------------------------
+// exception handling
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXCEPTIONS
+
+void
+wxAppConsole::HandleEvent(wxEvtHandler *handler,
+                          wxEventFunction func,
+                          wxEvent& event) const
+{
+    // by default, simply call the handler
+    (handler->*func)(event);
+}
+
+#endif // wxUSE_EXCEPTIONS
+
+// ----------------------------------------------------------------------------
+// cmd line parsing
+// ----------------------------------------------------------------------------
+
+#if wxUSE_CMDLINE_PARSER
+
+#define OPTION_VERBOSE _T("verbose")
+
+void wxAppConsole::OnInitCmdLine(wxCmdLineParser& parser)
+{
+    // the standard command line options
+    static const wxCmdLineEntryDesc cmdLineDesc[] =
+    {
+        {
+            wxCMD_LINE_SWITCH,
+            _T("h"),
+            _T("help"),
+            gettext_noop("show this help message"),
+            wxCMD_LINE_VAL_NONE,
+            wxCMD_LINE_OPTION_HELP
+        },
+
+#if wxUSE_LOG
+        {
+            wxCMD_LINE_SWITCH,
+            wxEmptyString,
+            OPTION_VERBOSE,
+            gettext_noop("generate verbose log messages"),
+            wxCMD_LINE_VAL_NONE,
+            0x0
+        },
+#endif // wxUSE_LOG
+
+        // terminator
+        {
+            wxCMD_LINE_NONE,
+            wxEmptyString,
+            wxEmptyString,
+            wxEmptyString,
+            wxCMD_LINE_VAL_NONE,
+            0x0
+        }
+    };
+
+    parser.SetDesc(cmdLineDesc);
+}
+
+bool wxAppConsole::OnCmdLineParsed(wxCmdLineParser& parser)
+{
+#if wxUSE_LOG
+    if ( parser.Found(OPTION_VERBOSE) )
+    {
+        wxLog::SetVerbose(true);
+    }
+#else
+    wxUnusedVar(parser);
+#endif // wxUSE_LOG
+
+    return true;
+}
+
+bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser)
+{
+    parser.Usage();
+
+    return false;
+}
+
+bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser)
+{
+    parser.Usage();
+
+    return false;
+}
+
+#endif // wxUSE_CMDLINE_PARSER
+
+// ----------------------------------------------------------------------------
+// debugging support
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
+                                     const char *componentName)
+{
+#if 0 // can't use wxLogTrace, not up and running yet
+    printf("checking build options object '%s' (ptr %p) in '%s'\n",
+             optionsSignature, optionsSignature, componentName);
+#endif
+
+    if ( strcmp(optionsSignature, WX_BUILD_OPTIONS_SIGNATURE) != 0 )
+    {
+        wxString lib = wxString::FromAscii(WX_BUILD_OPTIONS_SIGNATURE);
+        wxString prog = wxString::FromAscii(optionsSignature);
+        wxString progName = wxString::FromAscii(componentName);
+        wxString msg;
+
+        msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+                   lib.c_str(), progName.c_str(), prog.c_str());
+
+        wxLogFatalError(msg.c_str());
+
+        // normally wxLogFatalError doesn't return
+        return false;
+    }
+#undef wxCMP
+
+    return true;
+}
+
+#ifdef __WXDEBUG__
+
+void wxAppConsole::OnAssertFailure(const wxChar *file,
+                                   int line,
+                                   const wxChar *func,
+                                   const wxChar *cond,
+                                   const wxChar *msg)
+{
+    ShowAssertDialog(file, line, func, cond, msg, GetTraits());
+}
+
+void wxAppConsole::OnAssert(const wxChar *file,
+                            int line,
+                            const wxChar *cond,
+                            const wxChar *msg)
+{
+    OnAssertFailure(file, line, NULL, cond, msg);
+}
+
+#endif // __WXDEBUG__
+
+#if WXWIN_COMPATIBILITY_2_4
+
+bool wxAppConsole::CheckBuildOptions(const wxBuildOptions& buildOptions)
+{
+    return CheckBuildOptions(buildOptions.m_signature, "your program");
+}
+
+#endif
+
+// ============================================================================
+// other classes implementations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxConsoleAppTraitsBase
+// ----------------------------------------------------------------------------
+
+#if wxUSE_LOG
+
+wxLog *wxConsoleAppTraitsBase::CreateLogTarget()
+{
+    return new wxLogStderr;
+}
+
+#endif // wxUSE_LOG
+
+wxMessageOutput *wxConsoleAppTraitsBase::CreateMessageOutput()
+{
+    return new wxMessageOutputStderr;
+}
+
+#if wxUSE_FONTMAP
+
+wxFontMapper *wxConsoleAppTraitsBase::CreateFontMapper()
+{
+    return (wxFontMapper *)new wxFontMapperBase;
+}
+
+#endif // wxUSE_FONTMAP
+
+wxRendererNative *wxConsoleAppTraitsBase::CreateRenderer()
+{
+    // console applications don't use renderers
+    return NULL;
+}
+
+#ifdef __WXDEBUG__
+bool wxConsoleAppTraitsBase::ShowAssertDialog(const wxString& msg)
+{
+    return wxAppTraitsBase::ShowAssertDialog(msg);
+}
+#endif
+
+bool wxConsoleAppTraitsBase::HasStderr()
+{
+    // console applications always have stderr, even under Mac/Windows
+    return true;
+}
+
+void wxConsoleAppTraitsBase::ScheduleForDestroy(wxObject *object)
+{
+    delete object;
+}
+
+void wxConsoleAppTraitsBase::RemoveFromPendingDelete(wxObject * WXUNUSED(object))
+{
+    // nothing to do
+}
+
+#if wxUSE_SOCKETS
+GSocketGUIFunctionsTable* wxConsoleAppTraitsBase::GetSocketGUIFunctionsTable()
+{
+    return NULL;
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// wxAppTraits
+// ----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+bool wxAppTraitsBase::ShowAssertDialog(const wxString& msgOriginal)
+{
+    wxString msg = msgOriginal;
+
+#if wxUSE_STACKWALKER
+#if !defined(__WXMSW__)
+    // on Unix stack frame generation may take some time, depending on the
+    // size of the executable mainly... warn the user that we are working
+    wxFprintf(stderr, wxT("[Debug] Generating a stack trace... please wait"));
+    fflush(stderr);
+#endif
+
+    const wxString stackTrace = GetAssertStackTrace();
+    if ( !stackTrace.empty() )
+        msg << _T("\n\nCall stack:\n") << stackTrace;
+#endif // wxUSE_STACKWALKER
+
+    return DoShowAssertDialog(msg);
+}
+
+#if wxUSE_STACKWALKER
+wxString wxAppTraitsBase::GetAssertStackTrace()
+{
+    wxString stackTrace;
+
+    class StackDump : public wxStackWalker
+    {
+    public:
+        StackDump() { }
+
+        const wxString& GetStackTrace() const { return m_stackTrace; }
+
+    protected:
+        virtual void OnStackFrame(const wxStackFrame& frame)
+        {
+            m_stackTrace << wxString::Format
+                            (
+                              _T("[%02d] "),
+                              wx_truncate_cast(int, frame.GetLevel())
+                            );
+
+            wxString name = frame.GetName();
+            if ( !name.empty() )
+            {
+                m_stackTrace << wxString::Format(_T("%-40s"), name.c_str());
+            }
+            else
+            {
+                m_stackTrace << wxString::Format(_T("%p"), frame.GetAddress());
+            }
+
+            if ( frame.HasSourceLocation() )
+            {
+                m_stackTrace << _T('\t')
+                             << frame.GetFileName()
+                             << _T(':')
+                             << frame.GetLine();
+            }
+
+            m_stackTrace << _T('\n');
+        }
+
+    private:
+        wxString m_stackTrace;
+    };
+
+    // don't show more than maxLines or we could get a dialog too tall to be
+    // shown on screen: 20 should be ok everywhere as even with 15 pixel high
+    // characters it is still only 300 pixels...
+    static const int maxLines = 20;
+
+    StackDump dump;
+    dump.Walk(2, maxLines); // don't show OnAssert() call itself
+    stackTrace = dump.GetStackTrace();
+
+    const int count = stackTrace.Freq(wxT('\n'));
+    for ( int i = 0; i < count - maxLines; i++ )
+        stackTrace = stackTrace.BeforeLast(wxT('\n'));
+
+    return stackTrace;
+}
+#endif // wxUSE_STACKWALKER
+
+
+#endif // __WXDEBUG__
+
+// ============================================================================
+// global functions implementation
+// ============================================================================
+
+void wxExit()
+{
+    if ( wxTheApp )
+    {
+        wxTheApp->Exit();
+    }
+    else
+    {
+        // what else can we do?
+        exit(-1);
+    }
+}
+
+void wxWakeUpIdle()
+{
+    if ( wxTheApp )
+    {
+        wxTheApp->WakeUpIdle();
+    }
+    //else: do nothing, what can we do?
+}
+
+#ifdef  __WXDEBUG__
+
+// wxASSERT() helper
+bool wxAssertIsEqual(int x, int y)
+{
+    return x == y;
+}
+
+// break into the debugger
+void wxTrap()
+{
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+    DebugBreak();
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    #if __powerc
+        Debugger();
+    #else
+        SysBreak();
+    #endif
+#elif defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
+    Debugger();
+#elif defined(__UNIX__)
+    raise(SIGTRAP);
+#else
+    // TODO
+#endif // Win/Unix
+}
+
+// this function is called when an assert fails
+void wxOnAssert(const wxChar *szFile,
+                int nLine,
+                const char *szFunc,
+                const wxChar *szCond,
+                const wxChar *szMsg)
+{
+    // FIXME MT-unsafe
+    static int s_bInAssert = 0;
+
+    wxRecursionGuard guard(s_bInAssert);
+    if ( guard.IsInside() )
+    {
+        // can't use assert here to avoid infinite loops, so just trap
+        wxTrap();
+
+        return;
+    }
+
+    // __FUNCTION__ is always in ASCII, convert it to wide char if needed
+    const wxString strFunc = wxString::FromAscii(szFunc);
+
+    if ( !wxTheApp )
+    {
+        // by default, show the assert dialog box -- we can't customize this
+        // behaviour
+        ShowAssertDialog(szFile, nLine, strFunc, szCond, szMsg);
+    }
+    else
+    {
+        // let the app process it as it wants
+        wxTheApp->OnAssertFailure(szFile, nLine, strFunc, szCond, szMsg);
+    }
+}
+
+#endif // __WXDEBUG__
+
+// ============================================================================
+// private functions implementation
+// ============================================================================
+
+#ifdef __WXDEBUG__
+
+static void LINKAGEMODE SetTraceMasks()
+{
+#if wxUSE_LOG
+    wxString mask;
+    if ( wxGetEnv(wxT("WXTRACE"), &mask) )
+    {
+        wxStringTokenizer tkn(mask, wxT(",;:"));
+        while ( tkn.HasMoreTokens() )
+            wxLog::AddTraceMask(tkn.GetNextToken());
+    }
+#endif // wxUSE_LOG
+}
+
+bool DoShowAssertDialog(const wxString& msg)
+{
+    // under MSW we can show the dialog even in the console mode
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+    wxString msgDlg(msg);
+
+    // this message is intentionally not translated -- it is for
+    // developpers only
+    msgDlg += wxT("\nDo you want to stop the program?\n")
+              wxT("You can also choose [Cancel] to suppress ")
+              wxT("further warnings.");
+
+    switch ( ::MessageBox(NULL, msgDlg, _T("wxWidgets Debug Alert"),
+                          MB_YESNOCANCEL | MB_ICONSTOP ) )
+    {
+        case IDYES:
+            wxTrap();
+            break;
+
+        case IDCANCEL:
+            // stop the asserts
+            return true;
+
+        //case IDNO: nothing to do
+    }
+#else // !__WXMSW__
+    wxFprintf(stderr, wxT("%s\n"), msg.c_str());
+    fflush(stderr);
+
+    // TODO: ask the user to enter "Y" or "N" on the console?
+    wxTrap();
+#endif // __WXMSW__/!__WXMSW__
+
+    // continue with the asserts
+    return false;
+}
+
+// show the assert modal dialog
+static
+void ShowAssertDialog(const wxChar *szFile,
+                      int nLine,
+                      const wxChar *szFunc,
+                      const wxChar *szCond,
+                      const wxChar *szMsg,
+                      wxAppTraits *traits)
+{
+    // this variable can be set to true to suppress "assert failure" messages
+    static bool s_bNoAsserts = false;
+
+    wxString msg;
+    msg.reserve(2048);
+
+    // make life easier for people using VC++ IDE by using this format: like
+    // this, clicking on the message will take us immediately to the place of
+    // the failed assert
+    msg.Printf(wxT("%s(%d): assert \"%s\" failed"), szFile, nLine, szCond);
+
+    // add the function name, if any
+    if ( szFunc && *szFunc )
+        msg << _T(" in ") << szFunc << _T("()");
+
+    // and the message itself
+    if ( szMsg )
+    {
+        msg << _T(": ") << szMsg;
+    }
+    else // no message given
+    {
+        msg << _T('.');
+    }
+
+#if wxUSE_THREADS
+    // if we are not in the main thread, output the assert directly and trap
+    // since dialogs cannot be displayed
+    if ( !wxThread::IsMain() )
+    {
+        msg += wxT(" [in child thread]");
+
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+        msg << wxT("\r\n");
+        OutputDebugString(msg );
+#else
+        // send to stderr
+        wxFprintf(stderr, wxT("%s\n"), msg.c_str());
+        fflush(stderr);
+#endif
+        // He-e-e-e-elp!! we're asserting in a child thread
+        wxTrap();
+    }
+    else
+#endif // wxUSE_THREADS
+
+    if ( !s_bNoAsserts )
+    {
+        // send it to the normal log destination
+        wxLogDebug(_T("%s"), msg.c_str());
+
+        if ( traits )
+        {
+            // delegate showing assert dialog (if possible) to that class
+            s_bNoAsserts = traits->ShowAssertDialog(msg);
+        }
+        else // no traits object
+        {
+            // fall back to the function of last resort
+            s_bNoAsserts = DoShowAssertDialog(msg);
+        }
+    }
+}
+
+#endif // __WXDEBUG__
diff --git a/Source/3rd Party/wx/src/common/appcmn.cpp b/Source/3rd Party/wx/src/common/appcmn.cpp
index 9371b0f25..bc1a30c11 100644
--- a/Source/3rd Party/wx/src/common/appcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/appcmn.cpp	
@@ -1,487 +1,691 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/appcmn.cpp
-// Purpose:     wxAppBase methods common to all platforms
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     18.10.99
-// RCS-ID:      $Id$
-// Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#if defined(__BORLANDC__)
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/window.h"
-    #include "wx/bitmap.h"
-    #include "wx/log.h"
-    #include "wx/msgdlg.h"
-    #include "wx/confbase.h"
-    #include "wx/utils.h"
-    #include "wx/wxcrtvararg.h"
-#endif
-
-#include "wx/apptrait.h"
-#include "wx/cmdline.h"
-#include "wx/msgout.h"
-#include "wx/thread.h"
-#include "wx/vidmode.h"
-#include "wx/evtloop.h"
-
-#if wxUSE_FONTMAP
-    #include "wx/fontmap.h"
-#endif // wxUSE_FONTMAP
-
-// DLL options compatibility check:
-#include "wx/build.h"
-WX_CHECK_BUILD_OPTIONS("wxCore")
-
-// ============================================================================
-// wxAppBase implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// initialization
-// ----------------------------------------------------------------------------
-
-wxAppBase::wxAppBase()
-{
-    m_topWindow = NULL;
-
-    m_useBestVisual = false;
-    m_forceTrueColour = false;
-
-    m_isActive = true;
-
-    // We don't want to exit the app if the user code shows a dialog from its
-    // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete
-    // to Yes initially as this dialog would be the last top level window.
-    // OTOH, if we set it to No initially we'll have to overwrite it with Yes
-    // when we enter our OnRun() because we do want the default behaviour from
-    // then on. But this would be a problem if the user code calls
-    // SetExitOnFrameDelete(false) from OnInit().
-    //
-    // So we use the special "Later" value which is such that
-    // GetExitOnFrameDelete() returns false for it but which we know we can
-    // safely (i.e. without losing the effect of the users SetExitOnFrameDelete
-    // call) overwrite in OnRun()
-    m_exitOnFrameDelete = Later;
-}
-
-bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
-{
-    if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )
-        return false;
-
-    wxInitializeStockLists();
-
-    wxBitmap::InitStandardHandlers();
-
-    // for compatibility call the old initialization function too
-    if ( !OnInitGui() )
-        return false;
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// cleanup
-// ----------------------------------------------------------------------------
-
-wxAppBase::~wxAppBase()
-{
-    // this destructor is required for Darwin
-}
-
-void wxAppBase::CleanUp()
-{
-    // clean up all the pending objects
-    DeletePendingObjects();
-
-    // and any remaining TLWs (they remove themselves from wxTopLevelWindows
-    // when destroyed, so iterate until none are left)
-    while ( !wxTopLevelWindows.empty() )
-    {
-        // do not use Destroy() here as it only puts the TLW in pending list
-        // but we want to delete them now
-        delete wxTopLevelWindows.GetFirst()->GetData();
-    }
-
-    // undo everything we did in Initialize() above
-    wxBitmap::CleanUpHandlers();
-
-    wxStockGDI::DeleteAll();
-
-    wxDeleteStockLists();
-
-    wxDELETE(wxTheColourDatabase);
-
-    wxAppConsole::CleanUp();
-}
-
-// ----------------------------------------------------------------------------
-// various accessors
-// ----------------------------------------------------------------------------
-
-wxWindow* wxAppBase::GetTopWindow() const
-{
-    wxWindow* window = m_topWindow;
-    if (window == NULL && wxTopLevelWindows.GetCount() > 0)
-        window = wxTopLevelWindows.GetFirst()->GetData();
-    return window;
-}
-
-wxVideoMode wxAppBase::GetDisplayMode() const
-{
-    return wxVideoMode();
-}
-
-wxLayoutDirection wxAppBase::GetLayoutDirection() const
-{
-#if wxUSE_INTL
-    const wxLocale *const locale = wxGetLocale();
-    if ( locale )
-    {
-        const wxLanguageInfo *const
-            info = wxLocale::GetLanguageInfo(locale->GetLanguage());
-
-        if ( info )
-            return info->LayoutDirection;
-    }
-#endif // wxUSE_INTL
-
-    // we don't know
-    return wxLayout_Default;
-}
-
-#if wxUSE_CMDLINE_PARSER
-
-// ----------------------------------------------------------------------------
-// GUI-specific command line options handling
-// ----------------------------------------------------------------------------
-
-#define OPTION_THEME   "theme"
-#define OPTION_MODE    "mode"
-
-void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
-{
-    // first add the standard non GUI options
-    wxAppConsole::OnInitCmdLine(parser);
-
-    // the standard command line options
-    static const wxCmdLineEntryDesc cmdLineGUIDesc[] =
-    {
-#ifdef __WXUNIVERSAL__
-        {
-            wxCMD_LINE_OPTION,
-            NULL,
-            OPTION_THEME,
-            gettext_noop("specify the theme to use"),
-            wxCMD_LINE_VAL_STRING,
-            0x0
-        },
-#endif // __WXUNIVERSAL__
-
-#if defined(__WXDFB__)
-        // VS: this is not specific to wxDFB, all fullscreen (framebuffer) ports
-        //     should provide this option. That's why it is in common/appcmn.cpp
-        //     and not dfb/app.cpp
-        {
-            wxCMD_LINE_OPTION,
-            NULL,
-            OPTION_MODE,
-            gettext_noop("specify display mode to use (e.g. 640x480-16)"),
-            wxCMD_LINE_VAL_STRING,
-            0x0
-        },
-#endif // __WXDFB__
-
-        // terminator
-        wxCMD_LINE_DESC_END
-    };
-
-    parser.SetDesc(cmdLineGUIDesc);
-}
-
-bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
-{
-#ifdef __WXUNIVERSAL__
-    wxString themeName;
-    if ( parser.Found(OPTION_THEME, &themeName) )
-    {
-        wxTheme *theme = wxTheme::Create(themeName);
-        if ( !theme )
-        {
-            wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
-            return false;
-        }
-
-        // Delete the defaultly created theme and set the new theme.
-        delete wxTheme::Get();
-        wxTheme::Set(theme);
-    }
-#endif // __WXUNIVERSAL__
-
-#if defined(__WXDFB__)
-    wxString modeDesc;
-    if ( parser.Found(OPTION_MODE, &modeDesc) )
-    {
-        unsigned w, h, bpp;
-        if ( wxSscanf(modeDesc.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3 )
-        {
-            wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
-            return false;
-        }
-
-        if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
-            return false;
-    }
-#endif // __WXDFB__
-
-    return wxAppConsole::OnCmdLineParsed(parser);
-}
-
-#endif // wxUSE_CMDLINE_PARSER
-
-// ----------------------------------------------------------------------------
-// OnXXX() hooks
-// ----------------------------------------------------------------------------
-
-bool wxAppBase::OnInitGui()
-{
-#ifdef __WXUNIVERSAL__
-    if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
-        return false;
-#endif // __WXUNIVERSAL__
-
-    return true;
-}
-
-int wxAppBase::OnRun()
-{
-    // see the comment in ctor: if the initial value hasn't been changed, use
-    // the default Yes from now on
-    if ( m_exitOnFrameDelete == Later )
-    {
-        m_exitOnFrameDelete = Yes;
-    }
-    //else: it has been changed, assume the user knows what he is doing
-
-    return wxAppConsole::OnRun();
-}
-
-int wxAppBase::OnExit()
-{
-#ifdef __WXUNIVERSAL__
-    delete wxTheme::Set(NULL);
-#endif // __WXUNIVERSAL__
-
-    return wxAppConsole::OnExit();
-}
-
-wxAppTraits *wxAppBase::CreateTraits()
-{
-    return new wxGUIAppTraits;
-}
-
-// ----------------------------------------------------------------------------
-// misc
-// ----------------------------------------------------------------------------
-
-void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
-{
-    if ( active == m_isActive )
-        return;
-
-    m_isActive = active;
-
-    wxActivateEvent event(wxEVT_ACTIVATE_APP, active);
-    event.SetEventObject(this);
-
-    (void)ProcessEvent(event);
-}
-
-bool wxAppBase::SafeYield(wxWindow *win, bool onlyIfNeeded)
-{
-    wxWindowDisabler wd(win);
-
-    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-
-    return loop && loop->Yield(onlyIfNeeded);
-}
-
-bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess)
-{
-    wxWindowDisabler wd(win);
-
-    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-
-    return loop && loop->YieldFor(eventsToProcess);
-}
-
-
-// ----------------------------------------------------------------------------
-// idle handling
-// ----------------------------------------------------------------------------
-
-// Returns true if more time is needed.
-bool wxAppBase::ProcessIdle()
-{
-    // call the base class version first to send the idle event to wxTheApp
-    // itself
-    bool needMore = wxAppConsoleBase::ProcessIdle();
-    wxIdleEvent event;
-    wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-
-        // Don't send idle events to the windows that are about to be destroyed
-        // anyhow, this is wasteful and unexpected.
-        if ( !wxPendingDelete.Member(win) && win->SendIdleEvents(event) )
-            needMore = true;
-        node = node->GetNext();
-    }
-
-    wxUpdateUIEvent::ResetUpdateTime();
-
-    return needMore;
-}
-
-// ----------------------------------------------------------------------------
-// wxGUIAppTraitsBase
-// ----------------------------------------------------------------------------
-
-#if wxUSE_LOG
-
-wxLog *wxGUIAppTraitsBase::CreateLogTarget()
-{
-#if wxUSE_LOGGUI
-#ifndef __WXOSX_IPHONE__
-    return new wxLogGui;
-#else
-    return new wxLogStderr;
-#endif
-#else
-    // we must have something!
-    return new wxLogStderr;
-#endif
-}
-
-#endif // wxUSE_LOG
-
-wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput()
-{
-    // The standard way of printing help on command line arguments (app --help)
-    // is (according to common practice):
-    //     - console apps: to stderr (on any platform)
-    //     - GUI apps: stderr on Unix platforms (!)
-    //                 stderr if available and message box otherwise on others
-    //                 (currently stderr only Windows if app running from console)
-#ifdef __UNIX__
-    return new wxMessageOutputStderr;
-#else // !__UNIX__
-    // wxMessageOutputMessageBox doesn't work under Motif
-    #ifdef __WXMOTIF__
-        return new wxMessageOutputLog;
-    #elif wxUSE_MSGDLG
-        return new wxMessageOutputBest(wxMSGOUT_PREFER_STDERR);
-    #else
-        return new wxMessageOutputStderr;
-    #endif
-#endif // __UNIX__/!__UNIX__
-}
-
-#if wxUSE_FONTMAP
-
-wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper()
-{
-    return new wxFontMapper;
-}
-
-#endif // wxUSE_FONTMAP
-
-wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
-{
-    // use the default native renderer by default
-    return NULL;
-}
-
-bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
-{
-#if wxDEBUG_LEVEL
-    // under MSW we prefer to use the base class version using ::MessageBox()
-    // even if wxMessageBox() is available because it has less chances to
-    // double fault our app than our wxMessageBox()
-    //
-    // under DFB the message dialog is not always functional right now
-    //
-    // and finally we can't use wxMessageBox() if it wasn't compiled in, of
-    // course
-#if !defined(__WXMSW__) && !defined(__WXDFB__) && wxUSE_MSGDLG
-
-    // we can't (safely) show the GUI dialog from another thread, only do it
-    // for the asserts in the main thread
-    if ( wxIsMainThread() )
-    {
-        wxString msgDlg = msg;
-
-#if wxUSE_STACKWALKER
-        const wxString stackTrace = GetAssertStackTrace();
-        if ( !stackTrace.empty() )
-            msgDlg << wxT("\n\nCall stack:\n") << stackTrace;
-#endif // wxUSE_STACKWALKER
-
-        // this message is intentionally not translated -- it is for
-        // developpers only
-        msgDlg += wxT("\nDo you want to stop the program?\n")
-                  wxT("You can also choose [Cancel] to suppress ")
-                  wxT("further warnings.");
-
-        switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
-                              wxYES_NO | wxCANCEL | wxICON_STOP ) )
-        {
-            case wxYES:
-                wxTrap();
-                break;
-
-            case wxCANCEL:
-                // no more asserts
-                return true;
-
-            //case wxNO: nothing to do
-        }
-
-        return false;
-    }
-#endif // wxUSE_MSGDLG
-#endif // wxDEBUG_LEVEL
-
-    return wxAppTraitsBase::ShowAssertDialog(msg);
-}
-
-bool wxGUIAppTraitsBase::HasStderr()
-{
-    // we consider that under Unix stderr always goes somewhere, even if the
-    // user doesn't always see it under GUI desktops
-#ifdef __UNIX__
-    return true;
-#else
-    return false;
-#endif
-}
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/appcmn.cpp
+// Purpose:     wxAppConsole and wxAppBase methods common to all platforms
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     18.10.99
+// RCS-ID:      $Id: appcmn.cpp 47229 2007-07-08 05:31:32Z PC $
+// Copyright:   (c) Vadim Zeitlin
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/window.h"
+    #include "wx/bitmap.h"
+    #include "wx/log.h"
+    #include "wx/msgdlg.h"
+    #include "wx/confbase.h"
+    #include "wx/utils.h"
+#endif
+
+#include "wx/apptrait.h"
+#include "wx/cmdline.h"
+#include "wx/evtloop.h"
+#include "wx/msgout.h"
+#include "wx/thread.h"
+#include "wx/vidmode.h"
+#include "wx/ptr_scpd.h"
+
+#ifdef __WXDEBUG__
+    #if wxUSE_STACKWALKER
+        #include "wx/stackwalk.h"
+    #endif // wxUSE_STACKWALKER
+#endif // __WXDEBUG__
+
+#if defined(__WXMSW__)
+    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+#endif
+
+#if defined(__WXMAC__)
+    #include "wx/mac/private.h"
+#endif
+
+#if wxUSE_FONTMAP
+    #include "wx/fontmap.h"
+#endif // wxUSE_FONTMAP
+
+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxCore")
+
+WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
+
+// ----------------------------------------------------------------------------
+// wxEventLoopPtr
+// ----------------------------------------------------------------------------
+
+// this defines wxEventLoopPtr
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
+
+// ============================================================================
+// wxAppBase implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// initialization
+// ----------------------------------------------------------------------------
+
+wxAppBase::wxAppBase()
+{
+    m_topWindow = (wxWindow *)NULL;
+    
+    m_useBestVisual = false;
+    m_forceTrueColour = false;
+    
+    m_isActive = true;
+
+    m_mainLoop = NULL;
+
+    // We don't want to exit the app if the user code shows a dialog from its
+    // OnInit() -- but this is what would happen if we set m_exitOnFrameDelete
+    // to Yes initially as this dialog would be the last top level window.
+    // OTOH, if we set it to No initially we'll have to overwrite it with Yes
+    // when we enter our OnRun() because we do want the default behaviour from
+    // then on. But this would be a problem if the user code calls
+    // SetExitOnFrameDelete(false) from OnInit().
+    //
+    // So we use the special "Later" value which is such that
+    // GetExitOnFrameDelete() returns false for it but which we know we can
+    // safely (i.e. without losing the effect of the users SetExitOnFrameDelete
+    // call) overwrite in OnRun()
+    m_exitOnFrameDelete = Later;
+}
+
+bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
+{
+    if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )
+        return false;
+
+#if wxUSE_THREADS
+    wxPendingEventsLocker = new wxCriticalSection;
+#endif
+
+    wxInitializeStockLists();
+
+    wxBitmap::InitStandardHandlers();
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// cleanup
+// ----------------------------------------------------------------------------
+
+wxAppBase::~wxAppBase()
+{
+    // this destructor is required for Darwin
+}
+
+void wxAppBase::CleanUp()
+{
+    // clean up all the pending objects
+    DeletePendingObjects();
+
+    // and any remaining TLWs (they remove themselves from wxTopLevelWindows
+    // when destroyed, so iterate until none are left)
+    while ( !wxTopLevelWindows.empty() )
+    {
+        // do not use Destroy() here as it only puts the TLW in pending list
+        // but we want to delete them now
+        delete wxTopLevelWindows.GetFirst()->GetData();
+    }
+
+    // undo everything we did in Initialize() above
+    wxBitmap::CleanUpHandlers();
+
+    wxStockGDI::DeleteAll();
+
+    wxDeleteStockLists();
+
+    delete wxTheColourDatabase;
+    wxTheColourDatabase = NULL;
+
+    delete wxPendingEvents;
+    wxPendingEvents = NULL;
+
+#if wxUSE_THREADS
+    delete wxPendingEventsLocker;
+    wxPendingEventsLocker = NULL;
+
+    #if wxUSE_VALIDATORS
+        // If we don't do the following, we get an apparent memory leak.
+        ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
+    #endif // wxUSE_VALIDATORS
+#endif // wxUSE_THREADS
+}
+
+// ----------------------------------------------------------------------------
+// various accessors
+// ----------------------------------------------------------------------------
+
+wxWindow* wxAppBase::GetTopWindow() const
+{
+    wxWindow* window = m_topWindow;
+    if (window == NULL && wxTopLevelWindows.GetCount() > 0)
+        window = wxTopLevelWindows.GetFirst()->GetData();
+    return window;
+}
+
+wxVideoMode wxAppBase::GetDisplayMode() const
+{
+    return wxVideoMode();
+}
+
+wxLayoutDirection wxAppBase::GetLayoutDirection() const
+{
+#if wxUSE_INTL
+    const wxLocale *const locale = wxGetLocale();
+    if ( locale )
+    {
+        const wxLanguageInfo *const
+            info = wxLocale::GetLanguageInfo(locale->GetLanguage());
+
+        if ( info )
+            return info->LayoutDirection;
+    }
+#endif // wxUSE_INTL
+
+    // we don't know
+    return wxLayout_Default;
+}
+
+#if wxUSE_CMDLINE_PARSER
+
+// ----------------------------------------------------------------------------
+// GUI-specific command line options handling
+// ----------------------------------------------------------------------------
+
+#define OPTION_THEME   _T("theme")
+#define OPTION_MODE    _T("mode")
+
+void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
+{
+    // first add the standard non GUI options
+    wxAppConsole::OnInitCmdLine(parser);
+
+    // the standard command line options
+    static const wxCmdLineEntryDesc cmdLineGUIDesc[] =
+    {
+#ifdef __WXUNIVERSAL__
+        {
+            wxCMD_LINE_OPTION,
+            wxEmptyString,
+            OPTION_THEME,
+            gettext_noop("specify the theme to use"),
+            wxCMD_LINE_VAL_STRING,
+            0x0
+        },
+#endif // __WXUNIVERSAL__
+
+#if defined(__WXMGL__)
+        // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports
+        //     should provide this option. That's why it is in common/appcmn.cpp
+        //     and not mgl/app.cpp
+        {
+            wxCMD_LINE_OPTION,
+            wxEmptyString,
+            OPTION_MODE,
+            gettext_noop("specify display mode to use (e.g. 640x480-16)"),
+            wxCMD_LINE_VAL_STRING,
+            0x0
+        },
+#endif // __WXMGL__
+
+        // terminator
+        {
+            wxCMD_LINE_NONE,
+            wxEmptyString,
+            wxEmptyString,
+            wxEmptyString,
+            wxCMD_LINE_VAL_NONE,
+            0x0
+        }
+    };
+
+    parser.SetDesc(cmdLineGUIDesc);
+}
+
+bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
+{
+#ifdef __WXUNIVERSAL__
+    wxString themeName;
+    if ( parser.Found(OPTION_THEME, &themeName) )
+    {
+        wxTheme *theme = wxTheme::Create(themeName);
+        if ( !theme )
+        {
+            wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
+            return false;
+        }
+
+        // Delete the defaultly created theme and set the new theme.
+        delete wxTheme::Get();
+        wxTheme::Set(theme);
+    }
+#endif // __WXUNIVERSAL__
+
+#if defined(__WXMGL__)
+    wxString modeDesc;
+    if ( parser.Found(OPTION_MODE, &modeDesc) )
+    {
+        unsigned w, h, bpp;
+        if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
+        {
+            wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
+            return false;
+        }
+
+        if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
+            return false;
+    }
+#endif // __WXMGL__
+
+    return wxAppConsole::OnCmdLineParsed(parser);
+}
+
+#endif // wxUSE_CMDLINE_PARSER
+
+// ----------------------------------------------------------------------------
+// main event loop implementation
+// ----------------------------------------------------------------------------
+
+int wxAppBase::MainLoop()
+{
+    wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop);
+
+    return m_mainLoop->Run();
+}
+
+void wxAppBase::ExitMainLoop()
+{
+    // we should exit from the main event loop, not just any currently active
+    // (e.g. modal dialog) event loop
+    if ( m_mainLoop && m_mainLoop->IsRunning() )
+    {
+        m_mainLoop->Exit(0);
+    }
+}
+
+bool wxAppBase::Pending()
+{
+    // use the currently active message loop here, not m_mainLoop, because if
+    // we're showing a modal dialog (with its own event loop) currently the
+    // main event loop is not running anyhow
+    wxEventLoop * const loop = wxEventLoop::GetActive();
+
+    return loop && loop->Pending();
+}
+
+bool wxAppBase::Dispatch()
+{
+    // see comment in Pending()
+    wxEventLoop * const loop = wxEventLoop::GetActive();
+
+    return loop && loop->Dispatch();
+}
+
+// ----------------------------------------------------------------------------
+// OnXXX() hooks
+// ----------------------------------------------------------------------------
+
+bool wxAppBase::OnInitGui()
+{
+#ifdef __WXUNIVERSAL__
+    if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
+        return false;
+#endif // __WXUNIVERSAL__
+
+    return true;
+}
+
+int wxAppBase::OnRun()
+{
+    // see the comment in ctor: if the initial value hasn't been changed, use
+    // the default Yes from now on
+    if ( m_exitOnFrameDelete == Later )
+    {
+        m_exitOnFrameDelete = Yes;
+    }
+    //else: it has been changed, assume the user knows what he is doing
+
+    return MainLoop();
+}
+
+int wxAppBase::OnExit()
+{
+#ifdef __WXUNIVERSAL__
+    delete wxTheme::Set(NULL);
+#endif // __WXUNIVERSAL__
+
+    return wxAppConsole::OnExit();
+}
+
+void wxAppBase::Exit()
+{
+    ExitMainLoop();
+}
+
+wxAppTraits *wxAppBase::CreateTraits()
+{
+    return new wxGUIAppTraits;
+}
+
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
+
+void wxAppBase::SetActive(bool active, wxWindow * WXUNUSED(lastFocus))
+{
+    if ( active == m_isActive )
+        return;
+
+    m_isActive = active;
+
+    wxActivateEvent event(wxEVT_ACTIVATE_APP, active);
+    event.SetEventObject(this);
+
+    (void)ProcessEvent(event);
+}
+
+// ----------------------------------------------------------------------------
+// idle handling
+// ----------------------------------------------------------------------------
+
+void wxAppBase::DeletePendingObjects()
+{
+    wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
+    while (node)
+    {
+        wxObject *obj = node->GetData();
+
+        // remove it from the list first so that if we get back here somehow
+        // during the object deletion (e.g. wxYield called from its dtor) we
+        // wouldn't try to delete it the second time
+        if ( wxPendingDelete.Member(obj) )
+            wxPendingDelete.Erase(node);
+
+        delete obj;
+
+        // Deleting one object may have deleted other pending
+        // objects, so start from beginning of list again.
+        node = wxPendingDelete.GetFirst();
+    }
+}
+
+// Returns true if more time is needed.
+bool wxAppBase::ProcessIdle()
+{
+    // process pending wx events before sending idle events
+    ProcessPendingEvents();
+
+    wxIdleEvent event;
+    bool needMore = false;
+    wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+    while (node)
+    {
+        wxWindow* win = node->GetData();
+        if (SendIdleEvents(win, event))
+            needMore = true;
+        node = node->GetNext();
+    }
+
+    event.SetEventObject(this);
+    (void) ProcessEvent(event);
+    if (event.MoreRequested())
+        needMore = true;
+
+    // 'Garbage' collection of windows deleted with Close().
+    DeletePendingObjects();
+
+#if wxUSE_LOG
+    // flush the logged messages if any
+    wxLog::FlushActive();
+#endif
+
+    wxUpdateUIEvent::ResetUpdateTime();
+
+    return needMore;
+}
+
+// Send idle event to window and all subwindows
+bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
+{
+    bool needMore = false;
+
+    win->OnInternalIdle();
+
+    if (wxIdleEvent::CanSend(win))
+    {
+        event.SetEventObject(win);
+        win->GetEventHandler()->ProcessEvent(event);
+
+        if (event.MoreRequested())
+            needMore = true;
+    }
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow *child = node->GetData();
+        if (SendIdleEvents(child, event))
+            needMore = true;
+
+        node = node->GetNext();
+    }
+
+    return needMore;
+}
+
+void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
+{
+}
+
+// ----------------------------------------------------------------------------
+// exceptions support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXCEPTIONS
+
+bool wxAppBase::OnExceptionInMainLoop()
+{
+    throw;
+
+    // some compilers are too stupid to know that we never return after throw
+#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200)
+    return false;
+#endif
+}
+
+#endif // wxUSE_EXCEPTIONS
+
+// ----------------------------------------------------------------------------
+// wxGUIAppTraitsBase
+// ----------------------------------------------------------------------------
+
+#if wxUSE_LOG
+
+wxLog *wxGUIAppTraitsBase::CreateLogTarget()
+{
+#if wxUSE_LOGGUI
+    return new wxLogGui;
+#else
+    // we must have something!
+    return new wxLogStderr;
+#endif
+}
+
+#endif // wxUSE_LOG
+
+wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput()
+{
+    // The standard way of printing help on command line arguments (app --help)
+    // is (according to common practice):
+    //     - console apps: to stderr (on any platform)
+    //     - GUI apps: stderr on Unix platforms (!)
+    //                 message box under Windows and others
+#ifdef __UNIX__
+    return new wxMessageOutputStderr;
+#else // !__UNIX__
+    // wxMessageOutputMessageBox doesn't work under Motif
+    #ifdef __WXMOTIF__
+        return new wxMessageOutputLog;
+    #else
+        return new wxMessageOutputMessageBox;
+    #endif
+#endif // __UNIX__/!__UNIX__
+}
+
+#if wxUSE_FONTMAP
+
+wxFontMapper *wxGUIAppTraitsBase::CreateFontMapper()
+{
+    return new wxFontMapper;
+}
+
+#endif // wxUSE_FONTMAP
+
+wxRendererNative *wxGUIAppTraitsBase::CreateRenderer()
+{
+    // use the default native renderer by default
+    return NULL;
+}
+
+#ifdef __WXDEBUG__
+
+bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
+{
+#if defined(__WXMSW__) || !wxUSE_MSGDLG
+    // under MSW we prefer to use the base class version using ::MessageBox()
+    // even if wxMessageBox() is available because it has less chances to
+    // double fault our app than our wxMessageBox()
+    return wxAppTraitsBase::ShowAssertDialog(msg);
+#else // wxUSE_MSGDLG
+    wxString msgDlg = msg;
+
+#if wxUSE_STACKWALKER
+    // on Unix stack frame generation may take some time, depending on the
+    // size of the executable mainly... warn the user that we are working
+    wxFprintf(stderr, wxT("[Debug] Generating a stack trace... please wait"));
+    fflush(stderr);
+
+    const wxString stackTrace = GetAssertStackTrace();
+    if ( !stackTrace.empty() )
+        msgDlg << _T("\n\nCall stack:\n") << stackTrace;
+#endif // wxUSE_STACKWALKER
+
+    // this message is intentionally not translated -- it is for
+    // developpers only
+    msgDlg += wxT("\nDo you want to stop the program?\n")
+              wxT("You can also choose [Cancel] to suppress ")
+              wxT("further warnings.");
+
+#ifdef __WXMAC__
+    // in order to avoid reentrancy problems, use the lowest alert API available
+    CFOptionFlags exitButton;
+    wxMacCFStringHolder cfText(msgDlg);
+    OSStatus err = CFUserNotificationDisplayAlert(
+            0, kAlertStopAlert, NULL, NULL, NULL, CFSTR("wxWidgets Debug Alert"), cfText,
+            CFSTR("Yes"), CFSTR("No"), CFSTR("Cancel"), &exitButton );
+    if ( err == noErr )
+    {
+        switch( exitButton )
+        {
+            case 0 : // yes
+                wxTrap();
+                break;
+            case 2 : // cancel
+                // no more asserts
+                return true;
+            case 1 : // no -> nothing to do
+                break ;
+        }
+    }
+#else
+    switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
+                          wxYES_NO | wxCANCEL | wxICON_STOP ) )
+    {
+        case wxYES:
+            wxTrap();
+            break;
+
+        case wxCANCEL:
+            // no more asserts
+            return true;
+
+        //case wxNO: nothing to do
+    }
+#endif
+    return false;
+#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG
+}
+
+#endif // __WXDEBUG__
+
+bool wxGUIAppTraitsBase::HasStderr()
+{
+    // we consider that under Unix stderr always goes somewhere, even if the
+    // user doesn't always see it under GUI desktops
+#ifdef __UNIX__
+    return true;
+#else
+    return false;
+#endif
+}
+
+void wxGUIAppTraitsBase::ScheduleForDestroy(wxObject *object)
+{
+    if ( !wxPendingDelete.Member(object) )
+        wxPendingDelete.Append(object);
+}
+
+void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
+{
+    wxPendingDelete.DeleteObject(object);
+}
+
+#if wxUSE_SOCKETS
+
+#if defined(__WINDOWS__)
+    #include "wx/msw/gsockmsw.h"
+#elif defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
+    #include "wx/unix/gsockunx.h"
+#elif defined(__WXMAC__)
+    #include <MacHeaders.c>
+    #define OTUNIXERRORS 1
+    #include <OpenTransport.h>
+    #include <OpenTransportProviders.h>
+    #include <OpenTptInternet.h>
+
+    #include "wx/mac/gsockmac.h"
+#else
+    #error "Must include correct GSocket header here"
+#endif
+
+GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
+{
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+    // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and
+    //     so it doesn't need this table at all
+    return NULL;
+#else // !__WXMAC__ || __DARWIN__
+    static GSocketGUIFunctionsTableConcrete table;
+    return &table;
+#endif // !__WXMAC__ || __DARWIN__
+}
+
+#endif
diff --git a/Source/3rd Party/wx/src/common/arcall.cpp b/Source/3rd Party/wx/src/common/arcall.cpp
index 6db1c8981..bedf19bec 100644
--- a/Source/3rd Party/wx/src/common/arcall.cpp	
+++ b/Source/3rd Party/wx/src/common/arcall.cpp	
@@ -1,41 +1,41 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/arcall.cpp
-// Purpose:     wxArchive link all archive streams
-// Author:      Mike Wetherell
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 Mike Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ARCHIVE_STREAMS
-
-#if wxUSE_ZIPSTREAM
-#include "wx/zipstrm.h"
-#endif
-#if wxUSE_TARSTREAM
-#include "wx/tarstrm.h"
-#endif
-
-// Reference archive classes to ensure they are linked into a statically
-// linked program that uses Find or GetFirst to look for an archive handler.
-// It is in its own file so that the user can override this behaviour by
-// providing their own implementation.
-
-void wxUseArchiveClasses()
-{
-#if wxUSE_ZIPSTREAM
-    wxZipClassFactory();
-#endif
-#if wxUSE_TARSTREAM
-    wxTarClassFactory();
-#endif
-}
-
-#endif // wxUSE_ARCHIVE_STREAMS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/arcall.cpp
+// Purpose:     wxArchive link all archive streams
+// Author:      Mike Wetherell
+// RCS-ID:      $Id: arcall.cpp 42508 2006-10-27 09:53:38Z MW $
+// Copyright:   (c) 2006 Mike Wetherell
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_ARCHIVE_STREAMS
+
+#if wxUSE_ZIPSTREAM
+#include "wx/zipstrm.h"
+#endif
+#if wxUSE_TARSTREAM
+#include "wx/tarstrm.h"
+#endif
+
+// Reference archive classes to ensure they are linked into a statically
+// linked program that uses Find or GetFirst to look for an archive handler.
+// It is in its own file so that the user can override this behaviour by
+// providing their own implementation.
+
+void wxUseArchiveClasses()
+{
+#if wxUSE_ZIPSTREAM
+    wxZipClassFactory();
+#endif
+#if wxUSE_TARSTREAM
+    wxTarClassFactory();
+#endif
+}
+
+#endif // wxUSE_ARCHIVE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/arcfind.cpp b/Source/3rd Party/wx/src/common/arcfind.cpp
index 028dabf0a..c105dc640 100644
--- a/Source/3rd Party/wx/src/common/arcfind.cpp	
+++ b/Source/3rd Party/wx/src/common/arcfind.cpp	
@@ -1,43 +1,43 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/arcfind.cpp
-// Purpose:     Streams for archive formats
-// Author:      Mike Wetherell
-// RCS-ID:      $Id$
-// Copyright:   (c) Mike Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ARCHIVE_STREAMS
-
-#include "wx/archive.h"
-
-// These functions are in a separate file so that statically linked apps
-// that do not call them to search for archive handlers will only link in
-// the archive classes they use.
-
-const wxArchiveClassFactory *
-wxArchiveClassFactory::Find(const wxString& protocol, wxStreamProtocolType type)
-{
-    for (const wxArchiveClassFactory *f = GetFirst(); f; f = f->GetNext())
-        if (f->CanHandle(protocol, type))
-            return f;
-
-    return NULL;
-}
-
-// static
-const wxArchiveClassFactory *wxArchiveClassFactory::GetFirst()
-{
-    if (!sm_first)
-        wxUseArchiveClasses();
-    return sm_first;
-}
-
-#endif // wxUSE_ARCHIVE_STREAMS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/arcfind.cpp
+// Purpose:     Streams for archive formats
+// Author:      Mike Wetherell
+// RCS-ID:      $Id: arcfind.cpp 42508 2006-10-27 09:53:38Z MW $
+// Copyright:   (c) Mike Wetherell
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_ARCHIVE_STREAMS
+
+#include "wx/archive.h"
+
+// These functions are in a separate file so that statically linked apps
+// that do not call them to search for archive handlers will only link in
+// the archive classes they use.
+
+const wxArchiveClassFactory *
+wxArchiveClassFactory::Find(const wxChar *protocol, wxStreamProtocolType type)
+{
+    for (const wxArchiveClassFactory *f = GetFirst(); f; f = f->GetNext())
+        if (f->CanHandle(protocol, type))
+            return f;
+
+    return NULL;
+}
+
+// static
+const wxArchiveClassFactory *wxArchiveClassFactory::GetFirst()
+{
+    if (!sm_first)
+        wxUseArchiveClasses();
+    return sm_first;
+}
+
+#endif // wxUSE_ARCHIVE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/archive.cpp b/Source/3rd Party/wx/src/common/archive.cpp
index 7b0ec454f..1c2dfdb44 100644
--- a/Source/3rd Party/wx/src/common/archive.cpp	
+++ b/Source/3rd Party/wx/src/common/archive.cpp	
@@ -1,98 +1,98 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/archive.cpp
-// Purpose:     Streams for archive formats
-// Author:      Mike Wetherell
-// RCS-ID:      $Id$
-// Copyright:   (c) Mike Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
-
-#include "wx/archive.h"
-
-IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxFilterClassFactoryBase)
-
-
-/////////////////////////////////////////////////////////////////////////////
-// wxArchiveInputStream
-
-wxArchiveInputStream::wxArchiveInputStream(wxInputStream& stream,
-                                           wxMBConv& conv)
-  : wxFilterInputStream(stream),
-    m_conv(conv)
-{
-}
-
-wxArchiveInputStream::wxArchiveInputStream(wxInputStream *stream,
-                                           wxMBConv& conv)
-  : wxFilterInputStream(stream),
-    m_conv(conv)
-{
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// wxArchiveOutputStream
-
-wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream& stream,
-                                             wxMBConv& conv)
-  : wxFilterOutputStream(stream),
-    m_conv(conv)
-{
-}
-
-wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream *stream,
-                                             wxMBConv& conv)
-  : wxFilterOutputStream(stream),
-    m_conv(conv)
-{
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// wxArchiveEntry
-
-void wxArchiveEntry::SetNotifier(wxArchiveNotifier& notifier)
-{
-    UnsetNotifier();
-    m_notifier = &notifier;
-    m_notifier->OnEntryUpdated(*this);
-}
-
-wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e))
-{
-    m_notifier = NULL;
-    return *this;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// wxArchiveClassFactory
-
-wxArchiveClassFactory *wxArchiveClassFactory::sm_first = NULL;
-
-void wxArchiveClassFactory::Remove()
-{
-    if (m_next != this)
-    {
-        wxArchiveClassFactory **pp = &sm_first;
-
-        while (*pp != this)
-            pp = &(*pp)->m_next;
-
-        *pp = m_next;
-
-        m_next = this;
-    }
-}
-
-#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/archive.cpp
+// Purpose:     Streams for archive formats
+// Author:      Mike Wetherell
+// RCS-ID:      $Id: archive.cpp 42508 2006-10-27 09:53:38Z MW $
+// Copyright:   (c) Mike Wetherell
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
+
+#include "wx/archive.h"
+
+IMPLEMENT_ABSTRACT_CLASS(wxArchiveEntry, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxArchiveClassFactory, wxFilterClassFactoryBase)
+
+
+/////////////////////////////////////////////////////////////////////////////
+// wxArchiveInputStream
+
+wxArchiveInputStream::wxArchiveInputStream(wxInputStream& stream,
+                                           wxMBConv& conv)
+  : wxFilterInputStream(stream),
+    m_conv(conv)
+{
+}
+
+wxArchiveInputStream::wxArchiveInputStream(wxInputStream *stream,
+                                           wxMBConv& conv)
+  : wxFilterInputStream(stream),
+    m_conv(conv)
+{
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// wxArchiveOutputStream
+
+wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream& stream,
+                                             wxMBConv& conv)
+  : wxFilterOutputStream(stream),
+    m_conv(conv)
+{
+}
+
+wxArchiveOutputStream::wxArchiveOutputStream(wxOutputStream *stream,
+                                             wxMBConv& conv)
+  : wxFilterOutputStream(stream),
+    m_conv(conv)
+{
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// wxArchiveEntry
+
+void wxArchiveEntry::SetNotifier(wxArchiveNotifier& notifier)
+{
+    UnsetNotifier();
+    m_notifier = &notifier;
+    m_notifier->OnEntryUpdated(*this);
+}
+
+wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e))
+{
+    m_notifier = NULL;
+    return *this;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// wxArchiveClassFactory
+
+wxArchiveClassFactory *wxArchiveClassFactory::sm_first = NULL;
+
+void wxArchiveClassFactory::Remove()
+{
+    if (m_next != this)
+    {
+        wxArchiveClassFactory **pp = &sm_first;
+
+        while (*pp != this)
+            pp = &(*pp)->m_next;
+
+        *pp = m_next;
+
+        m_next = this;
+    }
+}
+
+#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/arrstr.cpp b/Source/3rd Party/wx/src/common/arrstr.cpp
deleted file mode 100644
index 4bfb2af74..000000000
--- a/Source/3rd Party/wx/src/common/arrstr.cpp	
+++ /dev/null
@@ -1,566 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/arrstr.cpp
-// Purpose:     wxArrayString class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// headers, declarations, constants
-// ===========================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/arrstr.h"
-
-#include "wx/beforestd.h"
-#include <algorithm>
-#include <functional>
-#include "wx/afterstd.h"
-
-// ============================================================================
-// ArrayString
-// ============================================================================
-
-wxArrayString::wxArrayString(size_t sz, const char** a)
-{
-#if !wxUSE_STD_CONTAINERS
-    Init(false);
-#endif
-    for (size_t i=0; i < sz; i++)
-        Add(a[i]);
-}
-
-wxArrayString::wxArrayString(size_t sz, const wchar_t** a)
-{
-#if !wxUSE_STD_CONTAINERS
-    Init(false);
-#endif
-    for (size_t i=0; i < sz; i++)
-        Add(a[i]);
-}
-
-wxArrayString::wxArrayString(size_t sz, const wxString* a)
-{
-#if !wxUSE_STD_CONTAINERS
-    Init(false);
-#endif
-    for (size_t i=0; i < sz; i++)
-        Add(a[i]);
-}
-
-#if !wxUSE_STD_CONTAINERS
-
-// size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
-#define   ARRAY_MAXSIZE_INCREMENT       4096
-
-#ifndef   ARRAY_DEFAULT_INITIAL_SIZE    // also defined in dynarray.h
-#define   ARRAY_DEFAULT_INITIAL_SIZE    (16)
-#endif
-
-// ctor
-void wxArrayString::Init(bool autoSort)
-{
-  m_nSize  =
-  m_nCount = 0;
-  m_pItems = NULL;
-  m_autoSort = autoSort;
-}
-
-// copy ctor
-wxArrayString::wxArrayString(const wxArrayString& src)
-{
-  Init(src.m_autoSort);
-
-  *this = src;
-}
-
-// assignment operator
-wxArrayString& wxArrayString::operator=(const wxArrayString& src)
-{
-  if ( m_nSize > 0 )
-    Clear();
-
-  Copy(src);
-
-  m_autoSort = src.m_autoSort;
-
-  return *this;
-}
-
-void wxArrayString::Copy(const wxArrayString& src)
-{
-  if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
-    Alloc(src.m_nCount);
-
-  for ( size_t n = 0; n < src.m_nCount; n++ )
-    Add(src[n]);
-}
-
-// grow the array
-void wxArrayString::Grow(size_t nIncrement)
-{
-  // only do it if no more place
-  if ( (m_nSize - m_nCount) < nIncrement ) {
-    // if ARRAY_DEFAULT_INITIAL_SIZE were set to 0, the initially empty would
-    // be never resized!
-    #if ARRAY_DEFAULT_INITIAL_SIZE == 0
-      #error "ARRAY_DEFAULT_INITIAL_SIZE must be > 0!"
-    #endif
-
-    if ( m_nSize == 0 ) {
-      // was empty, alloc some memory
-      m_nSize = ARRAY_DEFAULT_INITIAL_SIZE;
-      if (m_nSize < nIncrement)
-          m_nSize = nIncrement;
-      m_pItems = new wxString[m_nSize];
-    }
-    else {
-      // otherwise when it's called for the first time, nIncrement would be 0
-      // and the array would never be expanded
-      // add 50% but not too much
-      size_t ndefIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE
-                          ? ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1;
-      if ( ndefIncrement > ARRAY_MAXSIZE_INCREMENT )
-        ndefIncrement = ARRAY_MAXSIZE_INCREMENT;
-      if ( nIncrement < ndefIncrement )
-        nIncrement = ndefIncrement;
-      m_nSize += nIncrement;
-      wxString *pNew = new wxString[m_nSize];
-
-      // copy data to new location
-      for ( size_t j = 0; j < m_nCount; j++ )
-          pNew[j] = m_pItems[j];
-
-      // delete old memory (but do not release the strings!)
-      delete [] m_pItems;
-
-      m_pItems = pNew;
-    }
-  }
-}
-
-// deletes all the strings from the list
-void wxArrayString::Empty()
-{
-  m_nCount = 0;
-}
-
-// as Empty, but also frees memory
-void wxArrayString::Clear()
-{
-  m_nSize  =
-  m_nCount = 0;
-
-  wxDELETEA(m_pItems);
-}
-
-// dtor
-wxArrayString::~wxArrayString()
-{
-  delete [] m_pItems;
-}
-
-void wxArrayString::reserve(size_t nSize)
-{
-    Alloc(nSize);
-}
-
-// pre-allocates memory (frees the previous data!)
-void wxArrayString::Alloc(size_t nSize)
-{
-  // only if old buffer was not big enough
-  if ( nSize > m_nSize ) {
-    wxString *pNew = new wxString[nSize];
-    if ( !pNew )
-        return;
-
-    for ( size_t j = 0; j < m_nCount; j++ )
-        pNew[j] = m_pItems[j];
-    delete [] m_pItems;
-
-    m_pItems = pNew;
-    m_nSize  = nSize;
-  }
-}
-
-// minimizes the memory usage by freeing unused memory
-void wxArrayString::Shrink()
-{
-  // only do it if we have some memory to free
-  if( m_nCount < m_nSize ) {
-    // allocates exactly as much memory as we need
-    wxString *pNew = new wxString[m_nCount];
-
-    // copy data to new location
-    for ( size_t j = 0; j < m_nCount; j++ )
-        pNew[j] = m_pItems[j];
-    delete [] m_pItems;
-    m_pItems = pNew;
-    m_nSize = m_nCount;
-  }
-}
-
-// searches the array for an item (forward or backwards)
-int wxArrayString::Index(const wxString& str, bool bCase, bool bFromEnd) const
-{
-  if ( m_autoSort ) {
-    // use binary search in the sorted array
-    wxASSERT_MSG( bCase && !bFromEnd,
-                  wxT("search parameters ignored for auto sorted array") );
-
-    size_t i,
-           lo = 0,
-           hi = m_nCount;
-    int res;
-    while ( lo < hi ) {
-      i = (lo + hi)/2;
-
-      res = str.compare(m_pItems[i]);
-      if ( res < 0 )
-        hi = i;
-      else if ( res > 0 )
-        lo = i + 1;
-      else
-        return i;
-    }
-
-    return wxNOT_FOUND;
-  }
-  else {
-    // use linear search in unsorted array
-    if ( bFromEnd ) {
-      if ( m_nCount > 0 ) {
-        size_t ui = m_nCount;
-        do {
-          if ( m_pItems[--ui].IsSameAs(str, bCase) )
-            return ui;
-        }
-        while ( ui != 0 );
-      }
-    }
-    else {
-      for( size_t ui = 0; ui < m_nCount; ui++ ) {
-        if( m_pItems[ui].IsSameAs(str, bCase) )
-          return ui;
-      }
-    }
-  }
-
-  return wxNOT_FOUND;
-}
-
-// add item at the end
-size_t wxArrayString::Add(const wxString& str, size_t nInsert)
-{
-  if ( m_autoSort ) {
-    // insert the string at the correct position to keep the array sorted
-    size_t i,
-           lo = 0,
-           hi = m_nCount;
-    int res;
-    while ( lo < hi ) {
-      i = (lo + hi)/2;
-
-      res = str.Cmp(m_pItems[i]);
-      if ( res < 0 )
-        hi = i;
-      else if ( res > 0 )
-        lo = i + 1;
-      else {
-        lo = hi = i;
-        break;
-      }
-    }
-
-    wxASSERT_MSG( lo == hi, wxT("binary search broken") );
-
-    Insert(str, lo, nInsert);
-
-    return (size_t)lo;
-  }
-  else {
-    Grow(nInsert);
-
-    for (size_t i = 0; i < nInsert; i++)
-    {
-        // just append
-        m_pItems[m_nCount + i] = str;
-    }
-    size_t ret = m_nCount;
-    m_nCount += nInsert;
-    return ret;
-  }
-}
-
-// add item at the given position
-void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert)
-{
-  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Insert") );
-  wxCHECK_RET( m_nCount <= m_nCount + nInsert,
-               wxT("array size overflow in wxArrayString::Insert") );
-
-  Grow(nInsert);
-
-  for (int j = m_nCount - nIndex - 1; j >= 0; j--)
-      m_pItems[nIndex + nInsert + j] = m_pItems[nIndex + j];
-
-  for (size_t i = 0; i < nInsert; i++)
-  {
-      m_pItems[nIndex + i] = str;
-  }
-  m_nCount += nInsert;
-}
-
-// range insert (STL 23.2.4.3)
-void
-wxArrayString::insert(iterator it, const_iterator first, const_iterator last)
-{
-    const int idx = it - begin();
-
-    // grow it once
-    Grow(last - first);
-
-    // reset "it" since it can change inside Grow()
-    it = begin() + idx;
-
-    while ( first != last )
-    {
-        it = insert(it, *first);
-
-        // insert returns an iterator to the last element inserted but we need
-        // insert the next after this one, that is before the next one
-        ++it;
-
-        ++first;
-    }
-}
-
-void wxArrayString::resize(size_type n, value_type v)
-{
-  if ( n < m_nCount )
-      m_nCount = n;
-  else if ( n > m_nCount )
-      Add(v, n - m_nCount);
-}
-
-// expand the array
-void wxArrayString::SetCount(size_t count)
-{
-    Alloc(count);
-
-    wxString s;
-    while ( m_nCount < count )
-        m_pItems[m_nCount++] = s;
-}
-
-// removes item from array (by index)
-void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove)
-{
-  wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArrayString::Remove") );
-  wxCHECK_RET( nIndex + nRemove <= m_nCount,
-               wxT("removing too many elements in wxArrayString::Remove") );
-
-  for ( size_t j =  0; j < m_nCount - nIndex -nRemove; j++)
-      m_pItems[nIndex + j] = m_pItems[nIndex + nRemove + j];
-
-  m_nCount -= nRemove;
-}
-
-// removes item from array (by value)
-void wxArrayString::Remove(const wxString& sz)
-{
-  int iIndex = Index(sz);
-
-  wxCHECK_RET( iIndex != wxNOT_FOUND,
-               wxT("removing inexistent element in wxArrayString::Remove") );
-
-  RemoveAt(iIndex);
-}
-
-// ----------------------------------------------------------------------------
-// sorting
-// ----------------------------------------------------------------------------
-
-// we need an adaptor as our predicates use qsort() convention and so return
-// negative, null or positive value depending on whether the first item is less
-// than, equal to or greater than the other one while we need a real boolean
-// predicate now that we use std::sort()
-struct wxSortPredicateAdaptor
-{
-    wxSortPredicateAdaptor(wxArrayString::CompareFunction compareFunction)
-        : m_compareFunction(compareFunction)
-    {
-    }
-
-    bool operator()(const wxString& first, const wxString& second) const
-    {
-        return (*m_compareFunction)(first, second) < 0;
-    }
-
-    wxArrayString::CompareFunction m_compareFunction;
-};
-
-void wxArrayString::Sort(CompareFunction compareFunction)
-{
-    wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") );
-
-    std::sort(m_pItems, m_pItems + m_nCount,
-                wxSortPredicateAdaptor(compareFunction));
-}
-
-struct wxSortPredicateAdaptor2
-{
-    wxSortPredicateAdaptor2(wxArrayString::CompareFunction2 compareFunction)
-        : m_compareFunction(compareFunction)
-    {
-    }
-
-    bool operator()(const wxString& first, const wxString& second) const
-    {
-        return (*m_compareFunction)(const_cast<wxString *>(&first),
-                                    const_cast<wxString *>(&second)) < 0;
-    }
-
-    wxArrayString::CompareFunction2 m_compareFunction;
-};
-
-void wxArrayString::Sort(CompareFunction2 compareFunction)
-{
-    std::sort(m_pItems, m_pItems + m_nCount,
-                wxSortPredicateAdaptor2(compareFunction));
-}
-
-void wxArrayString::Sort(bool reverseOrder)
-{
-    if ( reverseOrder )
-        std::sort(m_pItems, m_pItems + m_nCount, std::greater<wxString>());
-    else // normal sort
-        std::sort(m_pItems, m_pItems + m_nCount);
-}
-
-bool wxArrayString::operator==(const wxArrayString& a) const
-{
-    if ( m_nCount != a.m_nCount )
-        return false;
-
-    for ( size_t n = 0; n < m_nCount; n++ )
-    {
-        if ( Item(n) != a[n] )
-            return false;
-    }
-
-    return true;
-}
-
-#endif // !wxUSE_STD_CONTAINERS
-
-// ===========================================================================
-// wxJoin and wxSplit
-// ===========================================================================
-
-#include "wx/tokenzr.h"
-
-wxString wxJoin(const wxArrayString& arr, const wxChar sep, const wxChar escape)
-{
-    size_t count = arr.size();
-    if ( count == 0 )
-        return wxEmptyString;
-
-    wxString str;
-
-    // pre-allocate memory using the estimation of the average length of the
-    // strings in the given array: this is very imprecise, of course, but
-    // better than nothing
-    str.reserve(count*(arr[0].length() + arr[count-1].length()) / 2);
-
-    if ( escape == wxT('\0') )
-    {
-        // escaping is disabled:
-        for ( size_t i = 0; i < count; i++ )
-        {
-            if ( i )
-                str += sep;
-            str += arr[i];
-        }
-    }
-    else // use escape character
-    {
-        for ( size_t n = 0; n < count; n++ )
-        {
-            if ( n )
-                str += sep;
-
-            for ( wxString::const_iterator i = arr[n].begin(),
-                                         end = arr[n].end();
-                  i != end;
-                  ++i )
-            {
-                const wxChar ch = *i;
-                if ( ch == sep )
-                    str += escape;      // escape this separator
-                str += ch;
-            }
-        }
-    }
-
-    str.Shrink(); // release extra memory if we allocated too much
-    return str;
-}
-
-wxArrayString wxSplit(const wxString& str, const wxChar sep, const wxChar escape)
-{
-    if ( escape == wxT('\0') )
-    {
-        // simple case: we don't need to honour the escape character
-        return wxStringTokenize(str, sep, wxTOKEN_RET_EMPTY_ALL);
-    }
-
-    wxArrayString ret;
-    wxString curr;
-    wxChar prev = wxT('\0');
-
-    for ( wxString::const_iterator i = str.begin(),
-                                 end = str.end();
-          i != end;
-          ++i )
-    {
-        const wxChar ch = *i;
-
-        if ( ch == sep )
-        {
-            if ( prev == escape )
-            {
-                // remove the escape character and don't consider this
-                // occurrence of 'sep' as a real separator
-                *curr.rbegin() = sep;
-            }
-            else // real separator
-            {
-                ret.push_back(curr);
-                curr.clear();
-            }
-        }
-        else // normal character
-        {
-            curr += ch;
-        }
-
-        prev = ch;
-    }
-
-    // add the last token
-    if ( !curr.empty() || prev == sep )
-        ret.Add(curr);
-
-    return ret;
-}
diff --git a/Source/3rd Party/wx/src/common/artprov.cpp b/Source/3rd Party/wx/src/common/artprov.cpp
index 479295c25..5fec0e1c9 100644
--- a/Source/3rd Party/wx/src/common/artprov.cpp	
+++ b/Source/3rd Party/wx/src/common/artprov.cpp	
@@ -1,463 +1,354 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/artprov.cpp
-// Purpose:     wxArtProvider class
-// Author:      Vaclav Slavik
-// Modified by:
-// Created:     18/03/2002
-// RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#if defined(__BORLANDC__)
-    #pragma hdrstop
-#endif
-
-#include "wx/artprov.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/list.h"
-    #include "wx/log.h"
-    #include "wx/hashmap.h"
-    #include "wx/image.h"
-    #include "wx/module.h"
-#endif
-
-// ===========================================================================
-// implementation
-// ===========================================================================
-
-#include "wx/listimpl.cpp"
-WX_DECLARE_LIST(wxArtProvider, wxArtProvidersList);
-WX_DEFINE_LIST(wxArtProvidersList)
-
-// ----------------------------------------------------------------------------
-// Cache class - stores already requested bitmaps
-// ----------------------------------------------------------------------------
-
-WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);
-WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxIconBundle, wxArtProviderIconBundlesHash);
-
-class WXDLLEXPORT wxArtProviderCache
-{
-public:
-    bool GetBitmap(const wxString& full_id, wxBitmap* bmp);
-    void PutBitmap(const wxString& full_id, const wxBitmap& bmp)
-        { m_bitmapsHash[full_id] = bmp; }
-
-    bool GetIconBundle(const wxString& full_id, wxIconBundle* bmp);
-    void PutIconBundle(const wxString& full_id, const wxIconBundle& iconbundle)
-        { m_iconBundlesHash[full_id] = iconbundle; }
-
-    void Clear();
-
-    static wxString ConstructHashID(const wxArtID& id,
-                                    const wxArtClient& client,
-                                    const wxSize& size);
-
-    static wxString ConstructHashID(const wxArtID& id,
-                                    const wxArtClient& client);
-
-private:
-    wxArtProviderBitmapsHash m_bitmapsHash;         // cache of wxBitmaps
-    wxArtProviderIconBundlesHash m_iconBundlesHash; // cache of wxIconBundles
-};
-
-bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp)
-{
-    wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id);
-    if ( entry == m_bitmapsHash.end() )
-    {
-        return false;
-    }
-    else
-    {
-        *bmp = entry->second;
-        return true;
-    }
-}
-
-bool wxArtProviderCache::GetIconBundle(const wxString& full_id, wxIconBundle* bmp)
-{
-    wxArtProviderIconBundlesHash::iterator entry = m_iconBundlesHash.find(full_id);
-    if ( entry == m_iconBundlesHash.end() )
-    {
-        return false;
-    }
-    else
-    {
-        *bmp = entry->second;
-        return true;
-    }
-}
-
-void wxArtProviderCache::Clear()
-{
-    m_bitmapsHash.clear();
-    m_iconBundlesHash.clear();
-}
-
-/* static */ wxString
-wxArtProviderCache::ConstructHashID(const wxArtID& id,
-                                    const wxArtClient& client)
-{
-    return id + wxT('-') + client;
-}
-
-
-/* static */ wxString
-wxArtProviderCache::ConstructHashID(const wxArtID& id,
-                                    const wxArtClient& client,
-                                    const wxSize& size)
-{
-    return ConstructHashID(id, client) + wxT('-') +
-            wxString::Format(wxT("%d-%d"), size.x, size.y);
-}
-
-// ============================================================================
-// wxArtProvider class
-// ============================================================================
-
-IMPLEMENT_ABSTRACT_CLASS(wxArtProvider, wxObject)
-
-wxArtProvidersList *wxArtProvider::sm_providers = NULL;
-wxArtProviderCache *wxArtProvider::sm_cache = NULL;
-
-// ----------------------------------------------------------------------------
-// wxArtProvider ctors/dtor
-// ----------------------------------------------------------------------------
-
-wxArtProvider::~wxArtProvider()
-{
-    Remove(this);
-}
-
-// ----------------------------------------------------------------------------
-// wxArtProvider operations on provider stack
-// ----------------------------------------------------------------------------
-
-/*static*/ void wxArtProvider::CommonAddingProvider()
-{
-    if ( !sm_providers )
-    {
-        sm_providers = new wxArtProvidersList;
-        sm_cache = new wxArtProviderCache;
-    }
-
-    sm_cache->Clear();
-}
-
-/*static*/ void wxArtProvider::Push(wxArtProvider *provider)
-{
-    CommonAddingProvider();
-    sm_providers->Insert(provider);
-}
-
-/*static*/ void wxArtProvider::PushBack(wxArtProvider *provider)
-{
-    CommonAddingProvider();
-    sm_providers->Append(provider);
-}
-
-/*static*/ bool wxArtProvider::Pop()
-{
-    wxCHECK_MSG( sm_providers, false, wxT("no wxArtProvider exists") );
-    wxCHECK_MSG( !sm_providers->empty(), false, wxT("wxArtProviders stack is empty") );
-
-    delete sm_providers->GetFirst()->GetData();
-    sm_cache->Clear();
-    return true;
-}
-
-/*static*/ bool wxArtProvider::Remove(wxArtProvider *provider)
-{
-    wxCHECK_MSG( sm_providers, false, wxT("no wxArtProvider exists") );
-
-    if ( sm_providers->DeleteObject(provider) )
-    {
-        sm_cache->Clear();
-        return true;
-    }
-
-    return false;
-}
-
-/*static*/ bool wxArtProvider::Delete(wxArtProvider *provider)
-{
-    // provider will remove itself from the stack in its dtor
-    delete provider;
-
-    return true;
-}
-
-/*static*/ void wxArtProvider::CleanUpProviders()
-{
-    if ( sm_providers )
-    {
-        while ( !sm_providers->empty() )
-            delete *sm_providers->begin();
-
-        wxDELETE(sm_providers);
-        wxDELETE(sm_cache);
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxArtProvider: retrieving bitmaps/icons
-// ----------------------------------------------------------------------------
-
-/*static*/ wxBitmap wxArtProvider::GetBitmap(const wxArtID& id,
-                                             const wxArtClient& client,
-                                             const wxSize& size)
-{
-    // safety-check against writing client,id,size instead of id,client,size:
-    wxASSERT_MSG( client.Last() == wxT('C'), wxT("invalid 'client' parameter") );
-
-    wxCHECK_MSG( sm_providers, wxNullBitmap, wxT("no wxArtProvider exists") );
-
-    wxString hashId = wxArtProviderCache::ConstructHashID(id, client, size);
-
-    wxBitmap bmp;
-    if ( !sm_cache->GetBitmap(hashId, &bmp) )
-    {
-        for (wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();
-             node; node = node->GetNext())
-        {
-            bmp = node->GetData()->CreateBitmap(id, client, size);
-            if ( bmp.IsOk() )
-                break;
-        }
-
-        wxSize sizeNeeded = size;
-        if ( !bmp.IsOk() )
-        {
-            // no bitmap created -- as a fallback, try if we can find desired
-            // icon in a bundle
-            wxIconBundle iconBundle = DoGetIconBundle(id, client);
-            if ( iconBundle.IsOk() )
-            {
-                if ( sizeNeeded == wxDefaultSize )
-                    sizeNeeded = GetNativeSizeHint(client);
-
-                wxIcon icon(iconBundle.GetIcon(sizeNeeded));
-                if ( icon.IsOk() )
-                {
-                    // this icon may be not of the correct size, it will be
-                    // rescaled below in such case
-                    bmp.CopyFromIcon(icon);
-                }
-            }
-        }
-
-        // if we didn't get the correct size, resize the bitmap
-#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
-        if ( bmp.IsOk() && sizeNeeded != wxDefaultSize )
-        {
-            if ( bmp.GetSize() != sizeNeeded )
-            {
-                wxImage img = bmp.ConvertToImage();
-                img.Rescale(sizeNeeded.x, sizeNeeded.y);
-                bmp = wxBitmap(img);
-            }
-        }
-#endif // wxUSE_IMAGE
-
-        sm_cache->PutBitmap(hashId, bmp);
-    }
-
-    return bmp;
-}
-
-/*static*/
-wxIconBundle wxArtProvider::GetIconBundle(const wxArtID& id, const wxArtClient& client)
-{
-    wxIconBundle iconbundle(DoGetIconBundle(id, client));
-
-    if ( iconbundle.IsOk() )
-    {
-        return iconbundle;
-    }
-    else
-    {
-        // fall back to single-icon bundle
-        return wxIconBundle(GetIcon(id, client));
-    }
-}
-
-/*static*/
-wxIconBundle wxArtProvider::DoGetIconBundle(const wxArtID& id, const wxArtClient& client)
-{
-    // safety-check against writing client,id,size instead of id,client,size:
-    wxASSERT_MSG( client.Last() == wxT('C'), wxT("invalid 'client' parameter") );
-
-    wxCHECK_MSG( sm_providers, wxNullIconBundle, wxT("no wxArtProvider exists") );
-
-    wxString hashId = wxArtProviderCache::ConstructHashID(id, client);
-
-    wxIconBundle iconbundle;
-    if ( !sm_cache->GetIconBundle(hashId, &iconbundle) )
-    {
-        for (wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();
-             node; node = node->GetNext())
-        {
-            iconbundle = node->GetData()->CreateIconBundle(id, client);
-            if ( iconbundle.IsOk() )
-                break;
-        }
-
-        sm_cache->PutIconBundle(hashId, iconbundle);
-    }
-
-    return iconbundle;
-}
-
-/*static*/ wxIcon wxArtProvider::GetIcon(const wxArtID& id,
-                                         const wxArtClient& client,
-                                         const wxSize& size)
-{
-    wxBitmap bmp = GetBitmap(id, client, size);
-
-    if ( !bmp.IsOk() )
-        return wxNullIcon;
-
-    wxIcon icon;
-    icon.CopyFromBitmap(bmp);
-    return icon;
-}
-
-/* static */
-wxArtID wxArtProvider::GetMessageBoxIconId(int flags)
-{
-    switch ( flags & wxICON_MASK )
-    {
-        default:
-            wxFAIL_MSG(wxT("incorrect message box icon flags"));
-            // fall through
-
-        case wxICON_ERROR:
-            return wxART_ERROR;
-
-        case wxICON_INFORMATION:
-            return wxART_INFORMATION;
-
-        case wxICON_WARNING:
-            return wxART_WARNING;
-
-        case wxICON_QUESTION:
-            return wxART_QUESTION;
-    }
-}
-
-/*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client,
-                                         bool platform_dependent)
-{
-    if (!platform_dependent)
-    {
-        wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();
-        if (node)
-            return node->GetData()->DoGetSizeHint(client);
-    }
-
-    return GetNativeSizeHint(client);
-}
-
-#ifndef wxHAS_NATIVE_ART_PROVIDER_IMPL
-/*static*/
-wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& WXUNUSED(client))
-{
-    // rather than returning some arbitrary value that doesn't make much
-    // sense (as 2.8 used to do), tell the caller that we don't have a clue:
-    return wxDefaultSize;
-}
-
-/*static*/
-void wxArtProvider::InitNativeProvider()
-{
-}
-#endif // !wxHAS_NATIVE_ART_PROVIDER_IMPL
-
-
-/* static */
-bool wxArtProvider::HasNativeProvider()
-{
-#ifdef __WXGTK20__
-    return true;
-#else
-    return false;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// deprecated wxArtProvider methods
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_6
-
-/* static */ void wxArtProvider::PushProvider(wxArtProvider *provider)
-{
-    Push(provider);
-}
-
-/* static */ void wxArtProvider::InsertProvider(wxArtProvider *provider)
-{
-    PushBack(provider);
-}
-
-/* static */ bool wxArtProvider::PopProvider()
-{
-    return Pop();
-}
-
-/* static */ bool wxArtProvider::RemoveProvider(wxArtProvider *provider)
-{
-    // RemoveProvider() used to delete the provider being removed so this is
-    // not a typo, we must call Delete() and not Remove() here
-    return Delete(provider);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
-#if WXWIN_COMPATIBILITY_2_8
-/* static */ void wxArtProvider::Insert(wxArtProvider *provider)
-{
-    PushBack(provider);
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-// ============================================================================
-// wxArtProviderModule
-// ============================================================================
-
-class wxArtProviderModule: public wxModule
-{
-public:
-    bool OnInit()
-    {
-        // The order here is such that the native provider will be used first
-        // and the standard one last as all these default providers add
-        // themselves to the bottom of the stack.
-        wxArtProvider::InitNativeProvider();
-#if wxUSE_ARTPROVIDER_TANGO
-        wxArtProvider::InitTangoProvider();
-#endif // wxUSE_ARTPROVIDER_TANGO
-#if wxUSE_ARTPROVIDER_STD
-        wxArtProvider::InitStdProvider();
-#endif // wxUSE_ARTPROVIDER_STD
-        return true;
-    }
-    void OnExit()
-    {
-        wxArtProvider::CleanUpProviders();
-    }
-
-    DECLARE_DYNAMIC_CLASS(wxArtProviderModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxArtProviderModule, wxModule)
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/artprov.cpp
+// Purpose:     wxArtProvider class
+// Author:      Vaclav Slavik
+// Modified by:
+// Created:     18/03/2002
+// RCS-ID:      $Id: artprov.cpp 57701 2008-12-31 23:40:06Z VS $
+// Copyright:   (c) Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#include "wx/artprov.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/log.h"
+    #include "wx/hashmap.h"
+    #include "wx/image.h"
+    #include "wx/module.h"
+#endif
+
+#ifdef __WXMSW__
+    #include "wx/msw/wrapwin.h"
+#endif
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+#include "wx/listimpl.cpp"
+WX_DECLARE_LIST(wxArtProvider, wxArtProvidersList);
+WX_DEFINE_LIST(wxArtProvidersList)
+
+// ----------------------------------------------------------------------------
+// Cache class - stores already requested bitmaps
+// ----------------------------------------------------------------------------
+
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);
+
+class WXDLLEXPORT wxArtProviderCache
+{
+public:
+    bool GetBitmap(const wxString& full_id, wxBitmap* bmp);
+    void PutBitmap(const wxString& full_id, const wxBitmap& bmp)
+        { m_bitmapsHash[full_id] = bmp; }
+
+    void Clear();
+
+    static wxString ConstructHashID(const wxArtID& id,
+                                    const wxArtClient& client,
+                                    const wxSize& size);
+
+private:
+    wxArtProviderBitmapsHash m_bitmapsHash;
+};
+
+bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp)
+{
+    wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id);
+    if ( entry == m_bitmapsHash.end() )
+    {
+        return false;
+    }
+    else
+    {
+        *bmp = entry->second;
+        return true;
+    }
+}
+
+void wxArtProviderCache::Clear()
+{
+    m_bitmapsHash.clear();
+}
+
+/*static*/ wxString wxArtProviderCache::ConstructHashID(
+                                const wxArtID& id, const wxArtClient& client,
+                                const wxSize& size)
+{
+    wxString str;
+    str.Printf(wxT("%s-%s-%i-%i"), id.c_str(), client.c_str(), size.x, size.y);
+    return str;
+}
+
+
+// ============================================================================
+// wxArtProvider class
+// ============================================================================
+
+IMPLEMENT_ABSTRACT_CLASS(wxArtProvider, wxObject)
+
+wxArtProvidersList *wxArtProvider::sm_providers = NULL;
+wxArtProviderCache *wxArtProvider::sm_cache = NULL;
+
+// ----------------------------------------------------------------------------
+// wxArtProvider ctors/dtor
+// ----------------------------------------------------------------------------
+
+wxArtProvider::~wxArtProvider()
+{
+    Remove(this);
+}
+
+// ----------------------------------------------------------------------------
+// wxArtProvider operations on provider stack
+// ----------------------------------------------------------------------------
+
+/*static*/ void wxArtProvider::CommonAddingProvider()
+{
+    if ( !sm_providers )
+    {
+        sm_providers = new wxArtProvidersList;
+        sm_cache = new wxArtProviderCache;
+    }
+
+    sm_cache->Clear();
+}
+
+/*static*/ void wxArtProvider::Push(wxArtProvider *provider)
+{
+    CommonAddingProvider();
+    sm_providers->Insert(provider);
+}
+
+/*static*/ void wxArtProvider::Insert(wxArtProvider *provider)
+{
+    CommonAddingProvider();
+    sm_providers->Append(provider);
+}
+
+/*static*/ void wxArtProvider::PushBack(wxArtProvider *provider)
+{
+    Insert(provider);
+}
+
+/*static*/ bool wxArtProvider::Pop()
+{
+    wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );
+    wxCHECK_MSG( !sm_providers->empty(), false, _T("wxArtProviders stack is empty") );
+
+    delete sm_providers->GetFirst()->GetData();
+    sm_cache->Clear();
+    return true;
+}
+
+/*static*/ bool wxArtProvider::Remove(wxArtProvider *provider)
+{
+    wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );
+
+    if ( sm_providers->DeleteObject(provider) )
+    {
+        sm_cache->Clear();
+        return true;
+    }
+
+    return false;
+}
+
+/*static*/ bool wxArtProvider::Delete(wxArtProvider *provider)
+{
+    // provider will remove itself from the stack in its dtor
+    delete provider;
+
+    return true;
+}
+
+/*static*/ void wxArtProvider::CleanUpProviders()
+{
+    if ( sm_providers )
+    {
+        while ( !sm_providers->empty() )
+            delete *sm_providers->begin();
+
+        delete sm_providers;
+        sm_providers = NULL;
+
+        delete sm_cache;
+        sm_cache = NULL;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxArtProvider: retrieving bitmaps/icons
+// ----------------------------------------------------------------------------
+
+/*static*/ wxBitmap wxArtProvider::GetBitmap(const wxArtID& id,
+                                             const wxArtClient& client,
+                                             const wxSize& size)
+{
+    // safety-check against writing client,id,size instead of id,client,size:
+    wxASSERT_MSG( client.Last() == _T('C'), _T("invalid 'client' parameter") );
+
+    wxCHECK_MSG( sm_providers, wxNullBitmap, _T("no wxArtProvider exists") );
+
+    wxString hashId = wxArtProviderCache::ConstructHashID(id, client, size);
+
+    wxBitmap bmp;
+    if ( !sm_cache->GetBitmap(hashId, &bmp) )
+    {
+        for (wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();
+             node; node = node->GetNext())
+        {
+            bmp = node->GetData()->CreateBitmap(id, client, size);
+            if ( bmp.Ok() )
+            {
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
+                if ( size != wxDefaultSize &&
+                     (bmp.GetWidth() != size.x || bmp.GetHeight() != size.y) )
+                {
+                    wxImage img = bmp.ConvertToImage();
+                    img.Rescale(size.x, size.y);
+                    bmp = wxBitmap(img);
+                }
+#endif
+                break;
+            }
+        }
+
+        sm_cache->PutBitmap(hashId, bmp);
+    }
+
+    return bmp;
+}
+
+/*static*/ wxIcon wxArtProvider::GetIcon(const wxArtID& id,
+                                         const wxArtClient& client,
+                                         const wxSize& size)
+{
+    wxCHECK_MSG( sm_providers, wxNullIcon, _T("no wxArtProvider exists") );
+
+    wxBitmap bmp = GetBitmap(id, client, size);
+    if ( !bmp.Ok() )
+        return wxNullIcon;
+
+    wxIcon icon;
+    icon.CopyFromBitmap(bmp);
+    return icon;
+}
+
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+    #include "wx/gtk/private.h"
+    extern GtkIconSize wxArtClientToIconSize(const wxArtClient& client);
+#endif // defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+
+/*static*/ wxSize wxArtProvider::GetSizeHint(const wxArtClient& client,
+                                         bool platform_dependent)
+{
+    if (!platform_dependent)
+    {
+        wxArtProvidersList::compatibility_iterator node = sm_providers->GetFirst();
+        if (node)
+            return node->GetData()->DoGetSizeHint(client);
+    }
+
+        // else return platform dependent size
+
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+    // Gtk has specific sizes for each client, see artgtk.cpp
+    GtkIconSize gtk_size = wxArtClientToIconSize(client);
+    // no size hints for this client
+    if (gtk_size == GTK_ICON_SIZE_INVALID)
+        return wxDefaultSize;
+    gint width, height;
+    gtk_icon_size_lookup( gtk_size, &width, &height);
+    return wxSize(width, height);
+#else // !GTK+ 2
+    // NB: These size hints may have to be adjusted per platform
+    if (client == wxART_TOOLBAR)
+        return wxSize(16, 15);
+    else if (client == wxART_MENU)
+        return wxSize(16, 15);
+    else if (client == wxART_FRAME_ICON)
+    {
+#ifdef __WXMSW__
+        return wxSize(::GetSystemMetrics(SM_CXSMICON),
+                      ::GetSystemMetrics(SM_CYSMICON));
+#else
+        return wxSize(16, 16);
+#endif // __WXMSW__/!__WXMSW__
+    }
+    else if (client == wxART_CMN_DIALOG || client == wxART_MESSAGE_BOX)
+        return wxSize(32, 32);
+    else if (client == wxART_HELP_BROWSER)
+        return wxSize(16, 15);
+    else if (client == wxART_BUTTON)
+        return wxSize(16, 15);
+    else // wxART_OTHER or perhaps a user's client, no specified size
+        return wxDefaultSize;
+#endif // GTK+ 2/else
+}
+
+// ----------------------------------------------------------------------------
+// deprecated wxArtProvider methods
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_6
+
+/* static */ void wxArtProvider::PushProvider(wxArtProvider *provider)
+{
+    Push(provider);
+}
+
+/* static */ void wxArtProvider::InsertProvider(wxArtProvider *provider)
+{
+    Insert(provider);
+}
+
+/* static */ bool wxArtProvider::PopProvider()
+{
+    return Pop();
+}
+
+/* static */ bool wxArtProvider::RemoveProvider(wxArtProvider *provider)
+{
+    // RemoveProvider() used to delete the provider being removed so this is
+    // not a typo, we must call Delete() and not Remove() here
+    return Delete(provider);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+// ============================================================================
+// wxArtProviderModule
+// ============================================================================
+
+class wxArtProviderModule: public wxModule
+{
+public:
+    bool OnInit()
+    {
+        wxArtProvider::InitStdProvider();
+        wxArtProvider::InitNativeProvider();
+        return true;
+    }
+    void OnExit()
+    {
+        wxArtProvider::CleanUpProviders();
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxArtProviderModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxArtProviderModule, wxModule)
diff --git a/Source/3rd Party/wx/src/common/artstd.cpp b/Source/3rd Party/wx/src/common/artstd.cpp
index c3e13be5d..c50aae5f6 100644
--- a/Source/3rd Party/wx/src/common/artstd.cpp	
+++ b/Source/3rd Party/wx/src/common/artstd.cpp	
@@ -1,257 +1,267 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/artstd.cpp
-// Purpose:     stock wxArtProvider instance with default wxWin art
-// Author:      Vaclav Slavik
-// Modified by:
-// Created:     18/03/2002
-// RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#if defined(__BORLANDC__)
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ARTPROVIDER_STD
-
-#ifndef WX_PRECOMP
-    #include "wx/image.h"
-#endif
-
-#include "wx/artprov.h"
-
-// ----------------------------------------------------------------------------
-// wxDefaultArtProvider
-// ----------------------------------------------------------------------------
-
-class wxDefaultArtProvider : public wxArtProvider
-{
-protected:
-    virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
-                                  const wxSize& size);
-};
-
-// ----------------------------------------------------------------------------
-// wxArtProvider::InitStdProvider
-// ----------------------------------------------------------------------------
-
-/*static*/ void wxArtProvider::InitStdProvider()
-{
-    wxArtProvider::PushBack(new wxDefaultArtProvider);
-}
-
-// ----------------------------------------------------------------------------
-// helper macros
-// ----------------------------------------------------------------------------
-
-// Standard macro for getting a resource from XPM file:
-#define ART(artId, xpmRc) \
-    if ( id == artId ) return wxBitmap(xpmRc##_xpm);
-
-// ----------------------------------------------------------------------------
-// XPMs with the art
-// ----------------------------------------------------------------------------
-
-#ifndef __WXUNIVERSAL__
-    #if defined(__WXGTK__)
-        #include "../../art/gtk/info.xpm"
-        #include "../../art/gtk/error.xpm"
-        #include "../../art/gtk/warning.xpm"
-        #include "../../art/gtk/question.xpm"
-    #elif defined(__WXMOTIF__)
-        #include "../../art/motif/info.xpm"
-        #include "../../art/motif/error.xpm"
-        #include "../../art/motif/warning.xpm"
-        #include "../../art/motif/question.xpm"
-    #endif
-#endif // !__WXUNIVERSAL__
-
-#if wxUSE_HTML
-    #include "../../art/htmsidep.xpm"
-    #include "../../art/htmoptns.xpm"
-    #include "../../art/htmbook.xpm"
-    #include "../../art/htmfoldr.xpm"
-    #include "../../art/htmpage.xpm"
-#endif // wxUSE_HTML
-
-#include "../../art/missimg.xpm"
-#include "../../art/addbookm.xpm"
-#include "../../art/delbookm.xpm"
-#include "../../art/back.xpm"
-#include "../../art/forward.xpm"
-#include "../../art/up.xpm"
-#include "../../art/down.xpm"
-#include "../../art/toparent.xpm"
-#include "../../art/fileopen.xpm"
-#include "../../art/print.xpm"
-#include "../../art/helpicon.xpm"
-#include "../../art/tipicon.xpm"
-#include "../../art/home.xpm"
-#include "../../art/first.xpm"
-#include "../../art/last.xpm"
-#include "../../art/repview.xpm"
-#include "../../art/listview.xpm"
-#include "../../art/new_dir.xpm"
-#include "../../art/harddisk.xpm"
-#include "../../art/cdrom.xpm"
-#include "../../art/floppy.xpm"
-#include "../../art/removable.xpm"
-#include "../../art/folder.xpm"
-#include "../../art/folder_open.xpm"
-#include "../../art/dir_up.xpm"
-#include "../../art/exefile.xpm"
-#include "../../art/deffile.xpm"
-#include "../../art/tick.xpm"
-#include "../../art/cross.xpm"
-
-#include "../../art/filesave.xpm"
-#include "../../art/filesaveas.xpm"
-#include "../../art/copy.xpm"
-#include "../../art/cut.xpm"
-#include "../../art/paste.xpm"
-#include "../../art/delete.xpm"
-#include "../../art/new.xpm"
-#include "../../art/undo.xpm"
-#include "../../art/redo.xpm"
-#include "../../art/plus.xpm"
-#include "../../art/minus.xpm"
-#include "../../art/close.xpm"
-#include "../../art/quit.xpm"
-#include "../../art/find.xpm"
-#include "../../art/findrepl.xpm"
-
-wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
-{
-#if !defined(__WXUNIVERSAL__) && (defined(__WXGTK__) || defined(__WXMOTIF__))
-    // wxMessageBox icons:
-    ART(wxART_ERROR,                               error)
-    ART(wxART_INFORMATION,                         info)
-    ART(wxART_WARNING,                             warning)
-    ART(wxART_QUESTION,                            question)
-#endif
-
-    // standard icons:
-#if wxUSE_HTML
-    ART(wxART_HELP_SIDE_PANEL,                     htmsidep)
-    ART(wxART_HELP_SETTINGS,                       htmoptns)
-    ART(wxART_HELP_BOOK,                           htmbook)
-    ART(wxART_HELP_FOLDER,                         htmfoldr)
-    ART(wxART_HELP_PAGE,                           htmpage)
-#endif // wxUSE_HTML
-    ART(wxART_MISSING_IMAGE,                       missimg)
-    ART(wxART_ADD_BOOKMARK,                        addbookm)
-    ART(wxART_DEL_BOOKMARK,                        delbookm)
-    ART(wxART_GO_BACK,                             back)
-    ART(wxART_GO_FORWARD,                          forward)
-    ART(wxART_GO_UP,                               up)
-    ART(wxART_GO_DOWN,                             down)
-    ART(wxART_GO_TO_PARENT,                        toparent)
-    ART(wxART_GO_HOME,                             home)
-    ART(wxART_GOTO_FIRST,                          first)
-    ART(wxART_GOTO_LAST,                           last)
-    ART(wxART_FILE_OPEN,                           fileopen)
-    ART(wxART_PRINT,                               print)
-    ART(wxART_HELP,                                helpicon)
-    ART(wxART_TIP,                                 tipicon)
-    ART(wxART_REPORT_VIEW,                         repview)
-    ART(wxART_LIST_VIEW,                           listview)
-    ART(wxART_NEW_DIR,                             new_dir)
-    ART(wxART_HARDDISK,                            harddisk)
-    ART(wxART_FLOPPY,                              floppy)
-    ART(wxART_CDROM,                               cdrom)
-    ART(wxART_REMOVABLE,                           removable)
-    ART(wxART_FOLDER,                              folder)
-    ART(wxART_FOLDER_OPEN,                         folder_open)
-    ART(wxART_GO_DIR_UP,                           dir_up)
-    ART(wxART_EXECUTABLE_FILE,                     exefile)
-    ART(wxART_NORMAL_FILE,                         deffile)
-    ART(wxART_TICK_MARK,                           tick)
-    ART(wxART_CROSS_MARK,                          cross)
-
-    ART(wxART_FILE_SAVE,                           filesave)
-    ART(wxART_FILE_SAVE_AS,                        filesaveas)
-    ART(wxART_COPY,                                copy)
-    ART(wxART_CUT,                                 cut)
-    ART(wxART_PASTE,                               paste)
-    ART(wxART_DELETE,                              delete)
-    ART(wxART_UNDO,                                undo)
-    ART(wxART_REDO,                                redo)
-    ART(wxART_PLUS,                                plus)
-    ART(wxART_MINUS,                               minus)
-    ART(wxART_CLOSE,                               close)
-    ART(wxART_QUIT,                                quit)
-    ART(wxART_FIND,                                find)
-    ART(wxART_FIND_AND_REPLACE,                    findrepl)
-    ART(wxART_NEW,                                 new)
-
-
-    return wxNullBitmap;
-}
-
-// ----------------------------------------------------------------------------
-// CreateBitmap routine
-// ----------------------------------------------------------------------------
-
-wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
-                                            const wxArtClient& client,
-                                            const wxSize& reqSize)
-{
-    wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
-
-#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
-    if (bmp.IsOk())
-    {
-        // fit into transparent image with desired size hint from the client
-        if (reqSize == wxDefaultSize)
-        {
-            // find out if there is a desired size for this client
-            wxSize bestSize = GetSizeHint(client);
-            if (bestSize != wxDefaultSize)
-            {
-                int bmp_w = bmp.GetWidth();
-                int bmp_h = bmp.GetHeight();
-
-                if (bmp_w == 16 && bmp_h == 15 && bestSize == wxSize(16, 16))
-                {
-                    // Do nothing in this special but quite common case, because scaling
-                    // with only a pixel difference will look horrible.
-                }
-                else if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
-                {
-                    // the caller wants default size, which is larger than
-                    // the image we have; to avoid degrading it visually by
-                    // scaling it up, paste it into transparent image instead:
-                    wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);
-                    wxImage img = bmp.ConvertToImage();
-                    img.Resize(bestSize, offset);
-                    bmp = wxBitmap(img);
-                }
-                else // scale (down or mixed, but not up)
-                {
-                    wxImage img = bmp.ConvertToImage();
-                    bmp = wxBitmap
-                          (
-                              img.Scale(bestSize.x, bestSize.y,
-                                        wxIMAGE_QUALITY_HIGH)
-                          );
-                }
-            }
-        }
-    }
-#else
-    wxUnusedVar(client);
-    wxUnusedVar(reqSize);
-#endif // wxUSE_IMAGE
-
-    return bmp;
-}
-
-#endif // wxUSE_ARTPROVIDER_STD
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/artstd.cpp
+// Purpose:     stock wxArtProvider instance with default wxWin art
+// Author:      Vaclav Slavik
+// Modified by:
+// Created:     18/03/2002
+// RCS-ID:      $Id: artstd.cpp 52561 2008-03-16 00:36:37Z VS $
+// Copyright:   (c) Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/image.h"
+#endif
+
+#include "wx/artprov.h"
+
+// ----------------------------------------------------------------------------
+// wxDefaultArtProvider
+// ----------------------------------------------------------------------------
+
+class wxDefaultArtProvider : public wxArtProvider
+{
+protected:
+    virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
+                                  const wxSize& size);
+};
+
+// ----------------------------------------------------------------------------
+// helper macros
+// ----------------------------------------------------------------------------
+
+// Standard macro for getting a resource from XPM file:
+#define ART(artId, xpmRc) \
+    if ( id == artId ) return wxBitmap(xpmRc##_xpm);
+
+// There are two ways of getting the standard icon: either via XPMs or via
+// wxIcon ctor. This depends on the platform:
+#if defined(__WXUNIVERSAL__)
+    #define CREATE_STD_ICON(iconId, xpmRc) return wxNullBitmap;
+#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+    #define CREATE_STD_ICON(iconId, xpmRc) return wxBitmap(xpmRc##_xpm);
+#else
+    #define CREATE_STD_ICON(iconId, xpmRc) \
+        { \
+            wxIcon icon(_T(iconId)); \
+            wxBitmap bmp; \
+            bmp.CopyFromIcon(icon); \
+            return bmp; \
+        }
+#endif
+
+// Macro used in CreateBitmap to get wxICON_FOO icons:
+#define ART_MSGBOX(artId, iconId, xpmRc) \
+    if ( id == artId ) \
+    { \
+        CREATE_STD_ICON(#iconId, xpmRc) \
+    }
+
+// ----------------------------------------------------------------------------
+// wxArtProvider::InitStdProvider
+// ----------------------------------------------------------------------------
+
+/*static*/ void wxArtProvider::InitStdProvider()
+{
+    wxArtProvider::Push(new wxDefaultArtProvider);
+}
+
+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+/*static*/ void wxArtProvider::InitNativeProvider()
+{
+}
+#endif
+
+
+// ----------------------------------------------------------------------------
+// XPMs with the art
+// ----------------------------------------------------------------------------
+
+
+#if defined(__WXGTK__)
+    #include "../../art/gtk/info.xpm"
+    #include "../../art/gtk/error.xpm"
+    #include "../../art/gtk/warning.xpm"
+    #include "../../art/gtk/question.xpm"
+#elif defined(__WXMOTIF__)
+    #include "../../art/motif/info.xpm"
+    #include "../../art/motif/error.xpm"
+    #include "../../art/motif/warning.xpm"
+    #include "../../art/motif/question.xpm"
+#endif
+
+#if wxUSE_HTML
+    #include "../../art/htmsidep.xpm"
+    #include "../../art/htmoptns.xpm"
+    #include "../../art/htmbook.xpm"
+    #include "../../art/htmfoldr.xpm"
+    #include "../../art/htmpage.xpm"
+#endif // wxUSE_HTML
+
+#include "../../art/missimg.xpm"
+#include "../../art/addbookm.xpm"
+#include "../../art/delbookm.xpm"
+#include "../../art/back.xpm"
+#include "../../art/forward.xpm"
+#include "../../art/up.xpm"
+#include "../../art/down.xpm"
+#include "../../art/toparent.xpm"
+#include "../../art/fileopen.xpm"
+#include "../../art/print.xpm"
+#include "../../art/helpicon.xpm"
+#include "../../art/tipicon.xpm"
+#include "../../art/home.xpm"
+#include "../../art/repview.xpm"
+#include "../../art/listview.xpm"
+#include "../../art/new_dir.xpm"
+#include "../../art/harddisk.xpm"
+#include "../../art/cdrom.xpm"
+#include "../../art/floppy.xpm"
+#include "../../art/removable.xpm"
+#include "../../art/folder.xpm"
+#include "../../art/folder_open.xpm"
+#include "../../art/dir_up.xpm"
+#include "../../art/exefile.xpm"
+#include "../../art/deffile.xpm"
+#include "../../art/tick.xpm"
+#include "../../art/cross.xpm"
+
+#include "../../art/filesave.xpm"
+#include "../../art/filesaveas.xpm"
+#include "../../art/copy.xpm"
+#include "../../art/cut.xpm"
+#include "../../art/paste.xpm"
+#include "../../art/delete.xpm"
+#include "../../art/new.xpm"
+#include "../../art/undo.xpm"
+#include "../../art/redo.xpm"
+#include "../../art/quit.xpm"
+#include "../../art/find.xpm"
+#include "../../art/findrepl.xpm"
+
+
+
+wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
+{
+    // wxMessageBox icons:
+    ART_MSGBOX(wxART_ERROR,       wxICON_ERROR,       error)
+    ART_MSGBOX(wxART_INFORMATION, wxICON_INFORMATION, info)
+    ART_MSGBOX(wxART_WARNING,     wxICON_WARNING,     warning)
+    ART_MSGBOX(wxART_QUESTION,    wxICON_QUESTION,    question)
+
+    // standard icons:
+#if wxUSE_HTML
+    ART(wxART_HELP_SIDE_PANEL,                     htmsidep)
+    ART(wxART_HELP_SETTINGS,                       htmoptns)
+    ART(wxART_HELP_BOOK,                           htmbook)
+    ART(wxART_HELP_FOLDER,                         htmfoldr)
+    ART(wxART_HELP_PAGE,                           htmpage)
+#endif // wxUSE_HTML
+    ART(wxART_MISSING_IMAGE,                       missimg)
+    ART(wxART_ADD_BOOKMARK,                        addbookm)
+    ART(wxART_DEL_BOOKMARK,                        delbookm)
+    ART(wxART_GO_BACK,                             back)
+    ART(wxART_GO_FORWARD,                          forward)
+    ART(wxART_GO_UP,                               up)
+    ART(wxART_GO_DOWN,                             down)
+    ART(wxART_GO_TO_PARENT,                        toparent)
+    ART(wxART_GO_HOME,                             home)
+    ART(wxART_FILE_OPEN,                           fileopen)
+    ART(wxART_PRINT,                               print)
+    ART(wxART_HELP,                                helpicon)
+    ART(wxART_TIP,                                 tipicon)
+    ART(wxART_REPORT_VIEW,                         repview)
+    ART(wxART_LIST_VIEW,                           listview)
+    ART(wxART_NEW_DIR,                             new_dir)
+    ART(wxART_HARDDISK,                            harddisk)
+    ART(wxART_FLOPPY,                              floppy)
+    ART(wxART_CDROM,                               cdrom)
+    ART(wxART_REMOVABLE,                           removable)
+    ART(wxART_FOLDER,                              folder)
+    ART(wxART_FOLDER_OPEN,                         folder_open)
+    ART(wxART_GO_DIR_UP,                           dir_up)
+    ART(wxART_EXECUTABLE_FILE,                     exefile)
+    ART(wxART_NORMAL_FILE,                         deffile)
+    ART(wxART_TICK_MARK,                           tick)
+    ART(wxART_CROSS_MARK,                          cross)
+
+    ART(wxART_FILE_SAVE,                           filesave)
+    ART(wxART_FILE_SAVE_AS,                        filesaveas)
+    ART(wxART_COPY,                                copy)
+    ART(wxART_CUT,                                 cut)
+    ART(wxART_PASTE,                               paste)
+    ART(wxART_DELETE,                              delete)
+    ART(wxART_UNDO,                                undo)
+    ART(wxART_REDO,                                redo)
+    ART(wxART_QUIT,                                quit)
+    ART(wxART_FIND,                                find)
+    ART(wxART_FIND_AND_REPLACE,                    findrepl)
+    ART(wxART_NEW,                                 new)
+
+
+    return wxNullBitmap;
+}
+
+// ----------------------------------------------------------------------------
+// CreateBitmap routine
+// ----------------------------------------------------------------------------
+
+wxBitmap wxDefaultArtProvider::CreateBitmap(const wxArtID& id,
+                                            const wxArtClient& client,
+                                            const wxSize& reqSize)
+{
+    wxBitmap bmp = wxDefaultArtProvider_CreateBitmap(id);
+
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
+    if (bmp.Ok())
+    {
+        // fit into transparent image with desired size hint from the client
+        if (reqSize == wxDefaultSize)
+        {
+            // find out if there is a desired size for this client
+            wxSize bestSize = GetSizeHint(client);
+            if (bestSize != wxDefaultSize)
+            {
+                int bmp_w = bmp.GetWidth();
+                int bmp_h = bmp.GetHeight();
+
+                if ((bmp_h < bestSize.x) && (bmp_w < bestSize.y))
+                {
+                    // the caller wants default size, which is larger than 
+                    // the image we have; to avoid degrading it visually by
+                    // scaling it up, paste it into transparent image instead:
+                    wxPoint offset((bestSize.x - bmp_w)/2, (bestSize.y - bmp_h)/2);
+                    wxImage img = bmp.ConvertToImage();
+                    img.Resize(bestSize, offset);
+                    bmp = wxBitmap(img);
+                }
+                else // scale (down or mixed, but not up)
+                {
+                    wxImage img = bmp.ConvertToImage();
+                    bmp = wxBitmap
+                          (
+                              img.Scale(bestSize.x, bestSize.y,
+                                        wxIMAGE_QUALITY_HIGH)
+                          );
+                }
+            }
+        }
+    }
+#else
+    wxUnusedVar(client);
+    wxUnusedVar(reqSize);
+#endif // wxUSE_IMAGE
+
+    return bmp;
+}
diff --git a/Source/3rd Party/wx/src/common/arttango.cpp b/Source/3rd Party/wx/src/common/arttango.cpp
deleted file mode 100644
index 106c0835b..000000000
--- a/Source/3rd Party/wx/src/common/arttango.cpp	
+++ /dev/null
@@ -1,328 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/arttango.cpp
-// Purpose:     art provider using embedded PNG versions of Tango icons
-// Author:      Vadim Zeitlin
-// Created:     2010-12-27
-// RCS-ID:      $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2010 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ARTPROVIDER_TANGO
-
-#ifndef WX_PRECOMP
-    #include "wx/image.h"
-    #include "wx/log.h"
-#endif // WX_PRECOMP
-
-#include "wx/artprov.h"
-
-#include "wx/mstream.h"
-
-// ----------------------------------------------------------------------------
-// image data
-// ----------------------------------------------------------------------------
-
-// All files in art/tango in alphabetical order:
-#include "../../art/tango/application_x_executable.h"
-#include "../../art/tango/dialog_error.h"
-#include "../../art/tango/dialog_information.h"
-#include "../../art/tango/dialog_warning.h"
-#include "../../art/tango/document_new.h"
-#include "../../art/tango/document_open.h"
-#include "../../art/tango/document_print.h"
-#include "../../art/tango/document_save.h"
-#include "../../art/tango/document_save_as.h"
-#include "../../art/tango/drive_harddisk.h"
-#include "../../art/tango/drive_optical.h"
-#include "../../art/tango/drive_removable_media.h"
-#include "../../art/tango/edit_copy.h"
-#include "../../art/tango/edit_cut.h"
-#include "../../art/tango/edit_delete.h"
-#include "../../art/tango/edit_find.h"
-#include "../../art/tango/edit_find_replace.h"
-#include "../../art/tango/edit_paste.h"
-#include "../../art/tango/edit_redo.h"
-#include "../../art/tango/edit_undo.h"
-#include "../../art/tango/folder.h"
-#include "../../art/tango/folder_new.h"
-#include "../../art/tango/folder_open.h"
-#include "../../art/tango/go_down.h"
-#include "../../art/tango/go_first.h"
-#include "../../art/tango/go_home.h"
-#include "../../art/tango/go_last.h"
-#include "../../art/tango/go_next.h"
-#include "../../art/tango/go_previous.h"
-#include "../../art/tango/go_up.h"
-#include "../../art/tango/image_missing.h"
-#include "../../art/tango/text_x_generic.h"
-#include "../../art/tango/list_add.h"
-#include "../../art/tango/list_remove.h"
-
-// ----------------------------------------------------------------------------
-// art provider class
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-class wxTangoArtProvider : public wxArtProvider
-{
-public:
-    wxTangoArtProvider()
-    {
-        m_imageHandledAdded = false;
-    }
-
-protected:
-    virtual wxBitmap CreateBitmap(const wxArtID& id,
-                                  const wxArtClient& client,
-                                  const wxSize& size);
-
-private:
-    bool m_imageHandledAdded;
-
-    wxDECLARE_NO_COPY_CLASS(wxTangoArtProvider);
-};
-
-} // anonymous namespace
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-wxBitmap
-wxTangoArtProvider::CreateBitmap(const wxArtID& id,
-                                 const wxArtClient& client,
-                                 const wxSize& sizeHint)
-{
-    // Array indexed by the id names with pointers to image data in 16 and 32
-    // pixel sizes as values. The order of the elements in this array is the
-    // same as the definition order in wx/artprov.h. While it's not very
-    // logical, this should make it simpler to add new icons later. Notice that
-    // most elements without Tango equivalents are simply omitted.
-
-    // To avoid repetition use BITMAP_DATA to only specify the image name once
-    // (this is especially important if we decide to add more image sizes
-    // later).
-    #define BITMAP_ARRAY_NAME(name, size) \
-        name ## _ ## size ## x ## size ## _png
-    #define BITMAP_DATA_FOR_SIZE(name, size) \
-        BITMAP_ARRAY_NAME(name, size), sizeof(BITMAP_ARRAY_NAME(name, size))
-    #define BITMAP_DATA(name) \
-        BITMAP_DATA_FOR_SIZE(name, 16), BITMAP_DATA_FOR_SIZE(name, 24)
-
-    static const struct BitmapEntry
-    {
-        const char *id;
-        const unsigned char *data16;
-        size_t len16;
-        const unsigned char *data24;
-        size_t len24;
-    } s_allBitmaps[] =
-    {
-        // Tango does have bookmark-new but no matching bookmark-delete and
-        // using mismatching icons would be ugly so we don't provide this one
-        // neither, we should add both of them if Tango ever adds the other one.
-        //{ wxART_ADD_BOOKMARK,       BITMAP_DATA(bookmark_new)},
-        //{ wxART_DEL_BOOKMARK,       BITMAP_DATA() },
-
-        { wxART_GO_BACK,            BITMAP_DATA(go_previous)                },
-        { wxART_GO_FORWARD,         BITMAP_DATA(go_next)                    },
-        { wxART_GO_UP,              BITMAP_DATA(go_up)                      },
-        { wxART_GO_DOWN,            BITMAP_DATA(go_down)                    },
-        // wxART_GO_TO_PARENT doesn't seem to exist in Tango
-        { wxART_GO_HOME,            BITMAP_DATA(go_home)                    },
-        { wxART_GOTO_FIRST,         BITMAP_DATA(go_first)                   },
-        { wxART_GOTO_LAST,          BITMAP_DATA(go_last)                    },
-
-        { wxART_FILE_OPEN,          BITMAP_DATA(document_open)              },
-        { wxART_FILE_SAVE,          BITMAP_DATA(document_save)              },
-        { wxART_FILE_SAVE_AS,       BITMAP_DATA(document_save_as)           },
-        { wxART_PRINT,              BITMAP_DATA(document_print)             },
-
-        // Should we use help-browser for wxART_HELP?
-
-        { wxART_NEW_DIR,            BITMAP_DATA(folder_new)                 },
-        { wxART_HARDDISK,           BITMAP_DATA(drive_harddisk)             },
-        // drive-removable-media seems to be better than media-floppy
-        { wxART_FLOPPY,             BITMAP_DATA(drive_removable_media)      },
-        { wxART_CDROM,              BITMAP_DATA(drive_optical)              },
-        { wxART_REMOVABLE,          BITMAP_DATA(drive_removable_media)      },
-
-        { wxART_FOLDER,             BITMAP_DATA(folder)                     },
-        { wxART_FOLDER_OPEN,        BITMAP_DATA(folder_open)                },
-        // wxART_GO_DIR_UP doesn't seem to exist in Tango
-
-        { wxART_EXECUTABLE_FILE,    BITMAP_DATA(application_x_executable)   },
-        { wxART_NORMAL_FILE,        BITMAP_DATA(text_x_generic)             },
-
-        // There is no dialog-question in Tango so use the information icon
-        // too, this is better for consistency and we do have a precedent for
-        // doing this as Windows Vista/7 does the same thing natively.
-        { wxART_ERROR,              BITMAP_DATA(dialog_error)               },
-        { wxART_QUESTION,           BITMAP_DATA(dialog_information)         },
-        { wxART_WARNING,            BITMAP_DATA(dialog_warning)             },
-        { wxART_INFORMATION,        BITMAP_DATA(dialog_information)         },
-
-        { wxART_MISSING_IMAGE,      BITMAP_DATA(image_missing)              },
-
-        { wxART_COPY,               BITMAP_DATA(edit_copy)                  },
-        { wxART_CUT,                BITMAP_DATA(edit_cut)                   },
-        { wxART_PASTE,              BITMAP_DATA(edit_paste)                 },
-        { wxART_DELETE,             BITMAP_DATA(edit_delete)                },
-        { wxART_NEW,                BITMAP_DATA(document_new)               },
-        { wxART_UNDO,               BITMAP_DATA(edit_undo)                  },
-        { wxART_REDO,               BITMAP_DATA(edit_redo)                  },
-
-        { wxART_PLUS,               BITMAP_DATA(list_add)                   },
-        { wxART_MINUS,              BITMAP_DATA(list_remove)                },
-
-        // Surprisingly Tango doesn't seem to have neither wxART_CLOSE nor
-        // wxART_QUIT. We could use system-log-out for the latter but it
-        // doesn't seem quite right.
-
-        { wxART_FIND,               BITMAP_DATA(edit_find)                  },
-        { wxART_FIND_AND_REPLACE,   BITMAP_DATA(edit_find_replace)          },
-    };
-
-    #undef BITMAP_ARRAY_NAME
-    #undef BITMAP_DATA_FOR_SIZE
-    #undef BITMAP_DATA
-
-    for ( unsigned n = 0; n < WXSIZEOF(s_allBitmaps); n++ )
-    {
-        const BitmapEntry& entry = s_allBitmaps[n];
-        if ( entry.id != id )
-            continue;
-
-        // This is one of the bitmaps that we have, determine in which size we
-        // should return it.
-
-        wxSize size;
-        bool sizeIsAHint;
-        if ( sizeHint == wxDefaultSize )
-        {
-            // Use the normal platform-specific icon size.
-            size = GetNativeSizeHint(client);
-
-            if ( size == wxDefaultSize )
-            {
-                // If we failed to get it, determine the best size more or less
-                // arbitrarily. This definitely won't look good but then it
-                // shouldn't normally happen, all platforms should implement
-                // GetNativeSizeHint() properly.
-                if ( client == wxART_MENU || client == wxART_BUTTON )
-                    size = wxSize(16, 16);
-                else
-                    size = wxSize(24, 24);
-            }
-
-            // We should return the icon of exactly this size so it's more than
-            // just a hint.
-            sizeIsAHint = false;
-        }
-        else // We have a size hint
-        {
-            // Use it for determining the version of the icon to return.
-            size = sizeHint;
-
-            // But we don't need to return the image of exactly the same size
-            // as the hint, after all it's just that, a hint.
-            sizeIsAHint = true;
-        }
-
-        enum
-        {
-            TangoSize_16,
-            TangoSize_24
-        } tangoSize;
-
-        // We prefer to downscale the image rather than upscale it if possible
-        // so use the smaller one if we can, otherwise the large one.
-        if ( size.x <= 16 && size.y <= 16 )
-            tangoSize = TangoSize_16;
-        else
-            tangoSize = TangoSize_24;
-
-        const unsigned char *data;
-        size_t len;
-        switch ( tangoSize )
-        {
-            default:
-                wxFAIL_MSG( "Unsupported Tango bitmap size" );
-                // fall through
-
-            case TangoSize_16:
-                data = entry.data16;
-                len = entry.len16;
-                break;
-
-            case TangoSize_24:
-                data = entry.data24;
-                len = entry.len24;
-                break;
-        }
-
-        wxMemoryInputStream is(data, len);
-
-        // Before reading the image data from the stream for the first time,
-        // add the handler for PNG images: we do it here and not in, say,
-        // InitTangoProvider() to do it as lately as possible and so to avoid
-        // the asserts about adding an already added handler if the user code
-        // adds the handler itself.
-        if ( !m_imageHandledAdded )
-        {
-            // Of course, if the user code did add it already, we have nothing
-            // to do.
-            if ( !wxImage::FindHandler(wxBITMAP_TYPE_PNG) )
-                wxImage::AddHandler(new wxPNGHandler);
-
-            // In any case, no need to do it again.
-            m_imageHandledAdded = true;
-        }
-
-        wxImage image(is, wxBITMAP_TYPE_PNG);
-        if ( !image.IsOk() )
-        {
-            // This should normally never happen as all the embedded images are
-            // well-formed.
-            wxLogDebug("Failed to load embedded PNG image for \"%s\"", id);
-            return wxNullBitmap;
-        }
-
-        if ( !sizeIsAHint )
-        {
-            // Notice that this won't do anything if the size is already right.
-            image.Rescale(size.x, size.y, wxIMAGE_QUALITY_HIGH);
-        }
-
-        return image;
-    }
-
-    // Not one of the bitmaps that we support.
-    return wxNullBitmap;
-}
-
-/* static */
-void wxArtProvider::InitTangoProvider()
-{
-    wxArtProvider::PushBack(new wxTangoArtProvider);
-}
-
-#endif // wxUSE_ARTPROVIDER_TANGO
diff --git a/Source/3rd Party/wx/src/common/base64.cpp b/Source/3rd Party/wx/src/common/base64.cpp
deleted file mode 100644
index ead24c7e3..000000000
--- a/Source/3rd Party/wx/src/common/base64.cpp	
+++ /dev/null
@@ -1,241 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/base64.cpp
-// Purpose:     implementation of BASE64 encoding/decoding functions
-// Author:      Charles Reimers, Vadim Zeitlin
-// Created:     2007-06-18
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_BASE64
-
-#include "wx/base64.h"
-
-size_t
-wxBase64Encode(char *dst, size_t dstLen, const void *src_, size_t srcLen)
-{
-    wxCHECK_MSG( src_, wxCONV_FAILED, wxT("NULL input buffer") );
-
-    const unsigned char *src = static_cast<const unsigned char *>(src_);
-
-    static const char b64[] =
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-
-    size_t encLen = 0;
-
-    // encode blocks of 3 bytes into 4 base64 characters
-    for ( ; srcLen >= 3; srcLen -= 3, src += 3 )
-    {
-        encLen += 4;
-        if ( dst )
-        {
-            if ( encLen > dstLen )
-                return wxCONV_FAILED;
-
-            *dst++ = b64[src[0] >> 2];
-            *dst++ = b64[((src[0] & 0x03) << 4) | ((src[1] & 0xf0) >> 4)];
-            *dst++ = b64[((src[1] & 0x0f) << 2) | ((src[2] & 0xc0) >> 6)];
-            *dst++ = b64[src[2] & 0x3f];
-        }
-    }
-
-    // finish with the remaining characters
-    if ( srcLen )
-    {
-        encLen += 4;
-        if ( dst )
-        {
-            if ( encLen > dstLen )
-                return wxCONV_FAILED;
-
-            // we have definitely one and maybe two bytes remaining
-            unsigned char next = srcLen == 2 ? src[1] : 0;
-            *dst++ = b64[src[0] >> 2];
-            *dst++ = b64[((src[0] & 0x03) << 4) | ((next & 0xf0) >> 4)];
-            *dst++ = srcLen == 2 ? b64[((next & 0x0f) << 2)] : '=';
-            *dst = '=';
-        }
-    }
-
-    return encLen;
-}
-
-size_t
-wxBase64Decode(void *dst_, size_t dstLen,
-               const char *src, size_t srcLen,
-               wxBase64DecodeMode mode,
-               size_t *posErr)
-{
-    wxCHECK_MSG( src, wxCONV_FAILED, wxT("NULL input buffer") );
-
-    unsigned char *dst = static_cast<unsigned char *>(dst_);
-
-    size_t decLen = 0;
-
-    if ( srcLen == wxNO_LEN )
-        srcLen = strlen(src);
-
-    // this table contains the values, in base 64, of all valid characters and
-    // special values WSP or INV for white space and invalid characters
-    // respectively as well as a special PAD value for '='
-    enum
-    {
-        WSP = 200,
-        INV,
-        PAD
-    };
-
-    static const unsigned char decode[256] =
-    {
-        WSP,INV,INV,INV,INV,INV,INV,INV,INV,WSP,WSP,INV,WSP,WSP,INV,INV,
-        INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
-        WSP,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,076,INV,INV,INV,077,
-        064,065,066,067,070,071,072,073,074,075,INV,INV,INV,PAD,INV,INV,
-        INV,000,001,002,003,004,005,006,007,010,011,012,013,014,015,016,
-        017,020,021,022,023,024,025,026,027,030,031,INV,INV,INV,INV,INV,
-        INV,032,033,034,035,036,037,040,041,042,043,044,045,046,047,050,
-        051,052,053,054,055,056,057,060,061,062,063,INV,INV,INV,INV,INV,
-        INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
-        INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
-        INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
-        INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
-        INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
-        INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
-        INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
-        INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,INV,
-    };
-
-    // we decode input by groups of 4 characters but things are complicated by
-    // the fact that there can be whitespace and other junk in it too so keep
-    // record of where exactly we're inside the current quartet in this var
-    int n = 0;
-    unsigned char in[4];                    // current quartet
-    bool end = false;                       // set when we find padding
-    size_t padLen = 0;                      // length lost to padding
-    const char *p;
-    for ( p = src; srcLen; p++, srcLen-- )
-    {
-        const unsigned char c = decode[static_cast<unsigned char>(*p)];
-        switch ( c )
-        {
-            case WSP:
-                if ( mode == wxBase64DecodeMode_SkipWS )
-                    continue;
-                // fall through
-
-            case INV:
-                if ( mode == wxBase64DecodeMode_Relaxed )
-                    continue;
-
-                // force the loop to stop and an error to be returned
-                n = -1;
-                srcLen = 1;
-                break;
-
-            case PAD:
-                // set the flag telling us that we're past the end now
-                end = true;
-
-                // there can be either a single '=' at the end of a quartet or
-                // "==" in positions 2 and 3
-                if ( n == 3 )
-                {
-                    padLen = 1;
-                    in[n++] = '\0';
-                }
-                else if ( (n == 2) && (--srcLen && *++p == '=') )
-                {
-                    padLen = 2;
-                    in[n++] = '\0';
-                    in[n++] = '\0';
-                }
-                else // invalid padding
-                {
-                    // force the loop terminate with an error
-                    n = -1;
-                    srcLen = 1;
-                }
-                break;
-
-            default:
-                if ( end )
-                {
-                    // nothing is allowed after the end so provoke error return
-                    n = -1;
-                    srcLen = 1;
-                    break;
-                }
-
-                in[n++] = c;
-        }
-
-        if ( n == 4 )
-        {
-            // got entire block, decode
-            decLen += 3 - padLen;
-            if ( dst )
-            {
-                if ( decLen > dstLen )
-                    return wxCONV_FAILED;
-
-                // undo the bit shifting done during encoding
-                *dst++ = in[0] << 2 | in[1] >> 4;
-
-                // be careful to not overwrite the output buffer with NUL pad
-                // bytes
-                if ( padLen != 2 )
-                {
-                    *dst++ = in[1] << 4 | in[2] >> 2;
-                    if ( !padLen )
-                        *dst++ = in[2] << 6 | in[3];
-                }
-            }
-
-            n = 0;
-        }
-    }
-
-    if ( n )
-    {
-        if ( posErr )
-        {
-            // notice that the error was on a previous position as we did one
-            // extra "p++" in the loop line after it
-            *posErr = p - src - 1;
-        }
-
-        return wxCONV_FAILED;
-    }
-
-    return decLen;
-}
-
-wxMemoryBuffer wxBase64Decode(const char *src,
-                              size_t srcLen,
-                              wxBase64DecodeMode mode,
-                              size_t *posErr)
-{
-    wxMemoryBuffer buf;
-    wxCHECK_MSG( src, buf, wxT("NULL input buffer") );
-
-    if ( srcLen == wxNO_LEN )
-        srcLen = strlen(src);
-
-    size_t len = wxBase64DecodedSize(srcLen);
-    len = wxBase64Decode(buf.GetWriteBuf(len), len, src, srcLen, mode, posErr);
-    if ( len == wxCONV_FAILED )
-        len = 0;
-
-    buf.SetDataLen(len);
-
-    return buf;
-}
-
-#endif // wxUSE_BASE64
diff --git a/Source/3rd Party/wx/src/common/bmpbase.cpp b/Source/3rd Party/wx/src/common/bmpbase.cpp
index af56deacb..0c7edd3ac 100644
--- a/Source/3rd Party/wx/src/common/bmpbase.cpp	
+++ b/Source/3rd Party/wx/src/common/bmpbase.cpp	
@@ -1,201 +1,211 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/bmpbase.cpp
-// Purpose:     wxBitmapBase
-// Author:      VaclavSlavik
-// Created:     2001/04/11
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001, Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/bitmap.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/colour.h"
-    #include "wx/icon.h"
-    #include "wx/image.h"
-#endif // WX_PRECOMP
-
-// ----------------------------------------------------------------------------
-// wxVariant support
-// ----------------------------------------------------------------------------
-
-#if wxUSE_VARIANT
-IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxBitmap,WXDLLEXPORT)
-IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT)
-#endif
-
-#if wxUSE_EXTENDED_RTTI
-//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxBitmap>)
-//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxIcon>)
-#endif
-
-// ----------------------------------------------------------------------------
-// wxBitmapBase
-// ----------------------------------------------------------------------------
-
-#if wxUSE_BITMAP_BASE
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/palette.h"
-    #include "wx/module.h"
-#endif // WX_PRECOMP
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)
-IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxObject)
-
-wxList wxBitmapBase::sm_handlers;
-
-void wxBitmapBase::AddHandler(wxBitmapHandler *handler)
-{
-    sm_handlers.Append(handler);
-}
-
-void wxBitmapBase::InsertHandler(wxBitmapHandler *handler)
-{
-    sm_handlers.Insert(handler);
-}
-
-bool wxBitmapBase::RemoveHandler(const wxString& name)
-{
-    wxBitmapHandler *handler = FindHandler(name);
-    if ( handler )
-    {
-        sm_handlers.DeleteObject(handler);
-        return true;
-    }
-    else
-        return false;
-}
-
-wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
-        if ( handler->GetName() == name )
-            return handler;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
-        if ( handler->GetExtension() == extension &&
-                    (bitmapType == wxBITMAP_TYPE_ANY || handler->GetType() == bitmapType) )
-            return handler;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
-        if (handler->GetType() == bitmapType)
-            return handler;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-void wxBitmapBase::CleanUpHandlers()
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
-        wxList::compatibility_iterator next = node->GetNext();
-        delete handler;
-        sm_handlers.Erase(node);
-        node = next;
-    }
-}
-
-class wxBitmapBaseModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
-public:
-    wxBitmapBaseModule() {}
-    bool OnInit() { wxBitmap::InitStandardHandlers(); return true; }
-    void OnExit() { wxBitmap::CleanUpHandlers(); }
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
-
-#endif // wxUSE_BITMAP_BASE
-
-// ----------------------------------------------------------------------------
-// wxBitmap common
-// ----------------------------------------------------------------------------
-
-#if !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))
-
-wxBitmap::wxBitmap(const char* const* bits)
-{
-    wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
-
-#if wxUSE_IMAGE && wxUSE_XPM
-    wxImage image(bits);
-    wxCHECK2_MSG(image.IsOk(), return, wxT("invalid bitmap data"));
-
-    *this = wxBitmap(image);
-#else
-    wxFAIL_MSG(wxT("creating bitmaps from XPMs not supported"));
-#endif // wxUSE_IMAGE && wxUSE_XPM
-}
-#endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))
-
-// ----------------------------------------------------------------------------
-// wxMaskBase
-// ----------------------------------------------------------------------------
-
-bool wxMaskBase::Create(const wxBitmap& bitmap, const wxColour& colour)
-{
-    FreeData();
-
-    return InitFromColour(bitmap, colour);
-}
-
-#if wxUSE_PALETTE
-
-bool wxMaskBase::Create(const wxBitmap& bitmap, int paletteIndex)
-{
-    wxPalette *pal = bitmap.GetPalette();
-
-    wxCHECK_MSG( pal, false,
-                 wxT("Cannot create mask from palette index of a bitmap without palette") );
-
-    unsigned char r,g,b;
-    pal->GetRGB(paletteIndex, &r, &g, &b);
-
-    return Create(bitmap, wxColour(r, g, b));
-}
-
-#endif // wxUSE_PALETTE
-
-bool wxMaskBase::Create(const wxBitmap& bitmap)
-{
-    FreeData();
-
-    return InitFromMonoBitmap(bitmap);
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/bmpbase.cpp
+// Purpose:     wxBitmapBase
+// Author:      VaclavSlavik
+// Created:     2001/04/11
+// RCS-ID:      $Id: bmpbase.cpp 42752 2006-10-30 19:26:48Z VZ $
+// Copyright:   (c) 2001, Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/colour.h"
+    #include "wx/icon.h"
+    #include "wx/image.h"
+#endif // WX_PRECOMP
+
+// ----------------------------------------------------------------------------
+// wxVariant support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_VARIANT
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxBitmap,WXDLLEXPORT)
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxIcon,WXDLLEXPORT)
+#endif
+
+// ----------------------------------------------------------------------------
+// wxBitmapBase
+// ----------------------------------------------------------------------------
+
+#if wxUSE_BITMAP_BASE
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/palette.h"
+    #include "wx/module.h"
+#endif // WX_PRECOMP
+
+
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase,wxObject)
+
+wxList wxBitmapBase::sm_handlers;
+
+void wxBitmapBase::AddHandler(wxBitmapHandlerBase *handler)
+{
+    sm_handlers.Append(handler);
+}
+
+void wxBitmapBase::InsertHandler(wxBitmapHandlerBase *handler)
+{
+    sm_handlers.Insert(handler);
+}
+
+bool wxBitmapBase::RemoveHandler(const wxString& name)
+{
+    wxBitmapHandler *handler = FindHandler(name);
+    if ( handler )
+    {
+        sm_handlers.DeleteObject(handler);
+        return true;
+    }
+    else
+        return false;
+}
+
+wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while ( node )
+    {
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
+        if ( handler->GetName() == name )
+            return handler;
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while ( node )
+    {
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
+        if ( handler->GetExtension() == extension &&
+                    (bitmapType == wxBITMAP_TYPE_ANY || handler->GetType() == bitmapType) )
+            return handler;
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while ( node )
+    {
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
+        if (handler->GetType() == bitmapType)
+            return handler;
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+void wxBitmapBase::CleanUpHandlers()
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while ( node )
+    {
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
+        delete handler;
+        sm_handlers.Erase(node);
+        node = next;
+    }
+}
+
+bool wxBitmapHandlerBase::Create(wxBitmap*, const void*, long, int, int, int)
+{
+    return false;
+}
+
+bool wxBitmapHandlerBase::LoadFile(wxBitmap*, const wxString&, long, int, int)
+{
+    return false;
+}
+
+bool wxBitmapHandlerBase::SaveFile(const wxBitmap*, const wxString&, int, const wxPalette*)
+{
+    return false;
+}
+
+class wxBitmapBaseModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
+public:
+    wxBitmapBaseModule() {}
+    bool OnInit() { wxBitmap::InitStandardHandlers(); return true; }
+    void OnExit() { wxBitmap::CleanUpHandlers(); }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
+
+#endif // wxUSE_BITMAP_BASE
+
+// ----------------------------------------------------------------------------
+// wxBitmap common
+// ----------------------------------------------------------------------------
+
+#if !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))
+
+wxBitmap::wxBitmap(const char* const* bits)
+{
+    wxCHECK2_MSG(bits != NULL, return, wxT("invalid bitmap data"));
+
+#if wxUSE_IMAGE && wxUSE_XPM
+    wxImage image(bits);
+    wxCHECK2_MSG(image.Ok(), return, wxT("invalid bitmap data"));
+
+    *this = wxBitmap(image);
+#else
+    wxFAIL_MSG(_T("creating bitmaps from XPMs not supported"));
+#endif // wxUSE_IMAGE && wxUSE_XPM
+}
+#endif // !(defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__))
+
+// ----------------------------------------------------------------------------
+// wxMaskBase
+// ----------------------------------------------------------------------------
+
+bool wxMaskBase::Create(const wxBitmap& bitmap, const wxColour& colour)
+{
+    FreeData();
+
+    return InitFromColour(bitmap, colour);
+}
+
+#if wxUSE_PALETTE
+
+bool wxMaskBase::Create(const wxBitmap& bitmap, int paletteIndex)
+{
+    wxPalette *pal = bitmap.GetPalette();
+
+    wxCHECK_MSG( pal, false,
+                 wxT("Cannot create mask from palette index of a bitmap without palette") );
+
+    unsigned char r,g,b;
+    pal->GetRGB(paletteIndex, &r, &g, &b);
+
+    return Create(bitmap, wxColour(r, g, b));
+}
+
+#endif // wxUSE_PALETTE
+
+bool wxMaskBase::Create(const wxBitmap& bitmap)
+{
+    FreeData();
+
+    return InitFromMonoBitmap(bitmap);
+}
diff --git a/Source/3rd Party/wx/src/common/bmpbtncmn.cpp b/Source/3rd Party/wx/src/common/bmpbtncmn.cpp
deleted file mode 100644
index 86779429d..000000000
--- a/Source/3rd Party/wx/src/common/bmpbtncmn.cpp	
+++ /dev/null
@@ -1,93 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/bmpbtncmn.cpp
-// Purpose:     wxBitmapButton common code
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_BMPBUTTON
-
-#include "wx/bmpbuttn.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/dcmemory.h"
-    #include "wx/image.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxBitmapButtonStyle )
-wxBEGIN_FLAGS( wxBitmapButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxBU_AUTODRAW)
-    wxFLAGS_MEMBER(wxBU_LEFT)
-    wxFLAGS_MEMBER(wxBU_RIGHT)
-    wxFLAGS_MEMBER(wxBU_TOP)
-    wxFLAGS_MEMBER(wxBU_BOTTOM)
-wxEND_FLAGS( wxBitmapButtonStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton, "wx/bmpbuttn.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxBitmapButton)
-    wxPROPERTY_FLAGS( WindowStyle, wxBitmapButtonStyle, long, \
-                      SetWindowStyleFlag, GetWindowStyleFlag, \
-                      wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \
-                      wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxBitmapButton)
-
-wxCONSTRUCTOR_5( wxBitmapButton, wxWindow*, Parent, wxWindowID, Id, \
-                 wxBitmap, Bitmap, wxPoint, Position, wxSize, Size )
-
-/*
-TODO PROPERTIES :
-
-long "style" , wxBU_AUTODRAW
-bool "default" , 0
-bitmap "selected" ,
-bitmap "focus" ,
-bitmap "disabled" ,
-*/
-
-#endif // wxUSE_BMPBUTTON
diff --git a/Source/3rd Party/wx/src/common/bookctrl.cpp b/Source/3rd Party/wx/src/common/bookctrl.cpp
index 600a9616b..ca6c2a590 100644
--- a/Source/3rd Party/wx/src/common/bookctrl.cpp	
+++ b/Source/3rd Party/wx/src/common/bookctrl.cpp	
@@ -1,504 +1,497 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/bookctrl.cpp
-// Purpose:     wxBookCtrlBase implementation
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     19.08.03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_BOOKCTRL
-
-#include "wx/imaglist.h"
-
-#include "wx/bookctrl.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// event table
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxBookCtrlBase, wxControl)
-
-BEGIN_EVENT_TABLE(wxBookCtrlBase, wxControl)
-    EVT_SIZE(wxBookCtrlBase::OnSize)
-#if wxUSE_HELP
-    EVT_HELP(wxID_ANY, wxBookCtrlBase::OnHelp)
-#endif // wxUSE_HELP
-END_EVENT_TABLE()
-
-// ----------------------------------------------------------------------------
-// constructors and destructors
-// ----------------------------------------------------------------------------
-
-void wxBookCtrlBase::Init()
-{
-    m_selection = wxNOT_FOUND;
-    m_bookctrl = NULL;
-    m_fitToCurrentPage = false;
-
-#if defined(__WXWINCE__)
-    m_internalBorder = 1;
-#else
-    m_internalBorder = 5;
-#endif
-
-    m_controlMargin = 0;
-    m_controlSizer = NULL;
-}
-
-bool
-wxBookCtrlBase::Create(wxWindow *parent,
-                       wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       long style,
-                       const wxString& name)
-{
-    return wxControl::Create
-                     (
-                        parent,
-                        id,
-                        pos,
-                        size,
-                        style,
-                        wxDefaultValidator,
-                        name
-                     );
-}
-
-// ----------------------------------------------------------------------------
-// geometry
-// ----------------------------------------------------------------------------
-
-void wxBookCtrlBase::DoInvalidateBestSize()
-{
-    // notice that it is not necessary to invalidate our own best size
-    // explicitly if we have m_bookctrl as it will already invalidate the best
-    // size of its parent when its own size is invalidated and its parent is
-    // this control
-    if ( m_bookctrl )
-        m_bookctrl->InvalidateBestSize();
-    else
-        wxControl::InvalidateBestSize();
-}
-
-wxSize wxBookCtrlBase::CalcSizeFromPage(const wxSize& sizePage) const
-{
-    // Add the size of the controller and the border between if it's shown.
-    if ( !m_bookctrl || !m_bookctrl->IsShown() )
-        return sizePage;
-
-    const wxSize sizeController = GetControllerSize();
-
-    wxSize size = sizePage;
-    if ( IsVertical() )
-    {
-        if ( sizeController.x > sizePage.x )
-            size.x = sizeController.x;
-        size.y += sizeController.y + GetInternalBorder();
-    }
-    else // left/right aligned
-    {
-        size.x += sizeController.x + GetInternalBorder();
-        if ( sizeController.y > sizePage.y )
-            size.y = sizeController.y;
-    }
-
-    return size;
-}
-
-void wxBookCtrlBase::SetPageSize(const wxSize& size)
-{
-    SetClientSize(CalcSizeFromPage(size));
-}
-
-wxSize wxBookCtrlBase::DoGetBestSize() const
-{
-    wxSize bestSize;
-
-    // iterate over all pages, get the largest width and height
-    const size_t nCount = m_pages.size();
-    for ( size_t nPage = 0; nPage < nCount; nPage++ )
-    {
-        const wxWindow * const pPage = m_pages[nPage];
-        if( pPage )
-        {
-            wxSize childBestSize(pPage->GetBestSize());
-
-            if ( childBestSize.x > bestSize.x )
-                bestSize.x = childBestSize.x;
-
-            if ( childBestSize.y > bestSize.y )
-                bestSize.y = childBestSize.y;
-        }
-    }
-
-    if (m_fitToCurrentPage && GetCurrentPage())
-        bestSize = GetCurrentPage()->GetBestSize();
-
-    // convert display area to window area, adding the size necessary for the
-    // tabs
-    wxSize best = CalcSizeFromPage(bestSize);
-    CacheBestSize(best);
-    return best;
-}
-
-wxRect wxBookCtrlBase::GetPageRect() const
-{
-    const wxSize size = GetControllerSize();
-
-    wxPoint pt;
-    wxRect rectPage(pt, GetClientSize());
-
-    switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
-    {
-        default:
-            wxFAIL_MSG( wxT("unexpected alignment") );
-            // fall through
-
-        case wxBK_TOP:
-            rectPage.y = size.y + GetInternalBorder();
-            // fall through
-
-        case wxBK_BOTTOM:
-            rectPage.height -= size.y + GetInternalBorder();
-            if (rectPage.height < 0)
-                rectPage.height = 0;
-            break;
-
-        case wxBK_LEFT:
-            rectPage.x = size.x + GetInternalBorder();
-            // fall through
-
-        case wxBK_RIGHT:
-            rectPage.width -= size.x + GetInternalBorder();
-            if (rectPage.width < 0)
-                rectPage.width = 0;
-            break;
-    }
-
-    return rectPage;
-}
-
-// Lay out controls
-void wxBookCtrlBase::DoSize()
-{
-    if ( !m_bookctrl )
-    {
-        // we're not fully created yet or OnSize() should be hidden by derived class
-        return;
-    }
-
-    if (GetSizer())
-        Layout();
-    else
-    {
-        // resize controller and the page area to fit inside our new size
-        const wxSize sizeClient( GetClientSize() ),
-                    sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ),
-                    sizeCtrl( GetControllerSize() );
-
-        m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );
-        // if this changes the visibility of the scrollbars the best size changes, relayout in this case
-        wxSize sizeCtrl2 = GetControllerSize();
-        if ( sizeCtrl != sizeCtrl2 )
-        {
-            wxSize sizeBorder2 = m_bookctrl->GetSize() - m_bookctrl->GetClientSize();
-            m_bookctrl->SetClientSize( sizeCtrl2.x - sizeBorder2.x, sizeCtrl2.y - sizeBorder2.y );
-        }
-
-        const wxSize sizeNew = m_bookctrl->GetSize();
-        wxPoint posCtrl;
-        switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
-        {
-            default:
-                wxFAIL_MSG( wxT("unexpected alignment") );
-                // fall through
-
-            case wxBK_TOP:
-            case wxBK_LEFT:
-                // posCtrl is already ok
-                break;
-
-            case wxBK_BOTTOM:
-                posCtrl.y = sizeClient.y - sizeNew.y;
-                break;
-
-            case wxBK_RIGHT:
-                posCtrl.x = sizeClient.x - sizeNew.x;
-                break;
-        }
-
-        if ( m_bookctrl->GetPosition() != posCtrl )
-            m_bookctrl->Move(posCtrl);
-    }
-
-    // resize all pages to fit the new control size
-    const wxRect pageRect = GetPageRect();
-    const unsigned pagesCount = m_pages.GetCount();
-    for ( unsigned int i = 0; i < pagesCount; ++i )
-    {
-        wxWindow * const page = m_pages[i];
-        if ( !page )
-        {
-            wxASSERT_MSG( AllowNullPage(),
-                wxT("Null page in a control that does not allow null pages?") );
-            continue;
-        }
-
-        page->SetSize(pageRect);
-    }
-}
-
-void wxBookCtrlBase::OnSize(wxSizeEvent& event)
-{
-    event.Skip();
-
-    DoSize();
-}
-
-wxSize wxBookCtrlBase::GetControllerSize() const
-{
-    // For at least some book controls (e.g. wxChoicebook) it may make sense to
-    // (temporarily?) hide the controller and we shouldn't leave extra space
-    // for the hidden control in this case.
-    if ( !m_bookctrl || !m_bookctrl->IsShown() )
-        return wxSize(0, 0);
-
-    const wxSize sizeClient = GetClientSize();
-
-    wxSize size;
-
-    // Ask for the best width/height considering the other direction.
-    if ( IsVertical() )
-    {
-        size.x = sizeClient.x;
-        size.y = m_bookctrl->GetBestHeight(sizeClient.x);
-    }
-    else // left/right aligned
-    {
-        size.x = m_bookctrl->GetBestWidth(sizeClient.y);
-        size.y = sizeClient.y;
-    }
-
-    return size;
-}
-
-// ----------------------------------------------------------------------------
-// miscellaneous stuff
-// ----------------------------------------------------------------------------
-
-#if wxUSE_HELP
-
-void wxBookCtrlBase::OnHelp(wxHelpEvent& event)
-{
-    // determine where does this even originate from to avoid redirecting it
-    // back to the page which generated it (resulting in an infinite loop)
-
-    // notice that we have to check in the hard(er) way instead of just testing
-    // if the event object == this because the book control can have other
-    // subcontrols inside it (e.g. wxSpinButton in case of a notebook in wxUniv)
-    wxWindow *source = wxStaticCast(event.GetEventObject(), wxWindow);
-    while ( source && source != this && source->GetParent() != this )
-    {
-        source = source->GetParent();
-    }
-
-    if ( source && m_pages.Index(source) == wxNOT_FOUND )
-    {
-        // this event is for the book control itself, redirect it to the
-        // corresponding page
-        wxWindow *page = NULL;
-
-        if ( event.GetOrigin() == wxHelpEvent::Origin_HelpButton )
-        {
-            // show help for the page under the mouse
-            const int pagePos = HitTest(ScreenToClient(event.GetPosition()));
-
-            if ( pagePos != wxNOT_FOUND)
-            {
-                page = GetPage((size_t)pagePos);
-            }
-        }
-        else // event from keyboard or unknown source
-        {
-            // otherwise show the current page help
-            page = GetCurrentPage();
-        }
-
-        if ( page )
-        {
-            // change event object to the page to avoid infinite recursion if
-            // we get this event ourselves if the page doesn't handle it
-            event.SetEventObject(page);
-
-            if ( page->GetEventHandler()->ProcessEvent(event) )
-            {
-                // don't call event.Skip()
-                return;
-            }
-        }
-    }
-    //else: event coming from one of our pages already
-
-    event.Skip();
-}
-
-#endif // wxUSE_HELP
-
-// ----------------------------------------------------------------------------
-// pages management
-// ----------------------------------------------------------------------------
-
-bool
-wxBookCtrlBase::InsertPage(size_t nPage,
-                           wxWindow *page,
-                           const wxString& WXUNUSED(text),
-                           bool WXUNUSED(bSelect),
-                           int WXUNUSED(imageId))
-{
-    wxCHECK_MSG( page || AllowNullPage(), false,
-                 wxT("NULL page in wxBookCtrlBase::InsertPage()") );
-    wxCHECK_MSG( nPage <= m_pages.size(), false,
-                 wxT("invalid page index in wxBookCtrlBase::InsertPage()") );
-
-    m_pages.Insert(page, nPage);
-    if ( page )
-        page->SetSize(GetPageRect());
-
-    DoInvalidateBestSize();
-
-    return true;
-}
-
-bool wxBookCtrlBase::DeletePage(size_t nPage)
-{
-    wxWindow *page = DoRemovePage(nPage);
-    if ( !(page || AllowNullPage()) )
-        return false;
-
-    // delete NULL is harmless
-    delete page;
-
-    return true;
-}
-
-wxWindow *wxBookCtrlBase::DoRemovePage(size_t nPage)
-{
-    wxCHECK_MSG( nPage < m_pages.size(), NULL,
-                 wxT("invalid page index in wxBookCtrlBase::DoRemovePage()") );
-
-    wxWindow *pageRemoved = m_pages[nPage];
-    m_pages.RemoveAt(nPage);
-    DoInvalidateBestSize();
-
-    return pageRemoved;
-}
-
-int wxBookCtrlBase::GetNextPage(bool forward) const
-{
-    int nPage;
-
-    int nMax = GetPageCount();
-    if ( nMax-- ) // decrement it to get the last valid index
-    {
-        int nSel = GetSelection();
-
-        // change selection wrapping if it becomes invalid
-        nPage = forward ? nSel == nMax ? 0
-                                       : nSel + 1
-                        : nSel == 0 ? nMax
-                                    : nSel - 1;
-    }
-    else // notebook is empty, no next page
-    {
-        nPage = wxNOT_FOUND;
-    }
-
-    return nPage;
-}
-
-bool wxBookCtrlBase::DoSetSelectionAfterInsertion(size_t n, bool bSelect)
-{
-    if ( bSelect )
-        SetSelection(n);
-    else if ( m_selection == wxNOT_FOUND )
-        ChangeSelection(0);
-    else // We're not going to select this page.
-        return false;
-
-    // Return true to indicate that we selected this page.
-    return true;
-}
-
-int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
-{
-    wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
-                 wxT("invalid page index in wxBookCtrlBase::DoSetSelection()") );
-
-    const int oldSel = GetSelection();
-
-    if ( n != (size_t)oldSel )
-    {
-        wxBookCtrlEvent *event = CreatePageChangingEvent();
-        bool allowed = false;
-
-        if ( flags & SetSelection_SendEvent )
-        {
-            event->SetSelection(n);
-            event->SetOldSelection(oldSel);
-            event->SetEventObject(this);
-
-            allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed();
-        }
-
-        if ( !(flags & SetSelection_SendEvent) || allowed)
-        {
-            if ( oldSel != wxNOT_FOUND )
-                m_pages[oldSel]->Hide();
-
-            wxWindow *page = m_pages[n];
-            page->SetSize(GetPageRect());
-            page->Show();
-
-            // change selection now to ignore the selection change event
-            UpdateSelectedPage(n);
-
-            if ( flags & SetSelection_SendEvent )
-            {
-                // program allows the page change
-                MakeChangedEvent(*event);
-                (void)GetEventHandler()->ProcessEvent(*event);
-            }
-        }
-
-        delete event;
-    }
-
-    return oldSel;
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxBookCtrlEvent, wxNotifyEvent)
-
-#endif // wxUSE_BOOKCTRL
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/bookctrl.cpp
+// Purpose:     wxBookCtrlBase implementation
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     19.08.03
+// RCS-ID:      $Id: bookctrl.cpp 53783 2008-05-27 14:15:14Z SC $
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_BOOKCTRL
+
+#include "wx/imaglist.h"
+
+#include "wx/bookctrl.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// event table
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxBookCtrlBase, wxControl)
+
+BEGIN_EVENT_TABLE(wxBookCtrlBase, wxControl)
+    EVT_SIZE(wxBookCtrlBase::OnSize)
+#if wxUSE_HELP
+    EVT_HELP(wxID_ANY, wxBookCtrlBase::OnHelp)
+#endif // wxUSE_HELP
+END_EVENT_TABLE()
+
+// ----------------------------------------------------------------------------
+// constructors and destructors
+// ----------------------------------------------------------------------------
+
+void wxBookCtrlBase::Init()
+{
+    m_bookctrl = NULL;
+    m_imageList = NULL;
+    m_ownsImageList = false;
+    m_fitToCurrentPage = false;
+
+#if defined(__WXWINCE__)
+    m_internalBorder = 1;
+#else
+    m_internalBorder = 5;
+#endif
+
+    m_controlMargin = 0;
+    m_controlSizer = NULL;
+}
+
+bool
+wxBookCtrlBase::Create(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxString& name)
+{
+    return wxControl::Create
+                     (
+                        parent,
+                        id,
+                        pos,
+                        size,
+                        style,
+                        wxDefaultValidator,
+                        name
+                     );
+}
+
+wxBookCtrlBase::~wxBookCtrlBase()
+{
+    if ( m_ownsImageList )
+    {
+        // may be NULL, ok
+        delete m_imageList;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// image list
+// ----------------------------------------------------------------------------
+
+void wxBookCtrlBase::SetImageList(wxImageList *imageList)
+{
+    if ( m_ownsImageList )
+    {
+        // may be NULL, ok
+        delete m_imageList;
+
+        m_ownsImageList = false;
+    }
+
+    m_imageList = imageList;
+}
+
+void wxBookCtrlBase::AssignImageList(wxImageList* imageList)
+{
+    SetImageList(imageList);
+
+    m_ownsImageList = true;
+}
+
+// ----------------------------------------------------------------------------
+// geometry
+// ----------------------------------------------------------------------------
+
+void wxBookCtrlBase::DoInvalidateBestSize()
+{
+    // notice that it is not necessary to invalidate our own best size
+    // explicitly if we have m_bookctrl as it will already invalidate the best
+    // size of its parent when its own size is invalidated and its parent is
+    // this control
+    if ( m_bookctrl )
+        m_bookctrl->InvalidateBestSize();
+    else
+        wxControl::InvalidateBestSize();
+}
+
+void wxBookCtrlBase::SetPageSize(const wxSize& size)
+{
+    SetClientSize(CalcSizeFromPage(size));
+}
+
+wxSize wxBookCtrlBase::DoGetBestSize() const
+{
+    wxSize bestSize;
+
+    // iterate over all pages, get the largest width and height
+    const size_t nCount = m_pages.size();
+    for ( size_t nPage = 0; nPage < nCount; nPage++ )
+    {
+        const wxWindow * const pPage = m_pages[nPage];
+        if( pPage )
+        {
+            wxSize childBestSize(pPage->GetBestSize());
+
+            if ( childBestSize.x > bestSize.x )
+                bestSize.x = childBestSize.x;
+
+            if ( childBestSize.y > bestSize.y )
+                bestSize.y = childBestSize.y;
+        }
+    }
+
+    if (m_fitToCurrentPage && GetCurrentPage())
+        bestSize = GetCurrentPage()->GetBestSize();
+
+    // convert display area to window area, adding the size necessary for the
+    // tabs
+    wxSize best = CalcSizeFromPage(bestSize);
+    CacheBestSize(best);
+    return best;
+}
+
+wxRect wxBookCtrlBase::GetPageRect() const
+{
+    const wxSize size = GetControllerSize();
+
+    wxPoint pt;
+    wxRect rectPage(pt, GetClientSize());
+
+    switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+    {
+        default:
+            wxFAIL_MSG( _T("unexpected alignment") );
+            // fall through
+
+        case wxBK_TOP:
+            rectPage.y = size.y + GetInternalBorder();
+            // fall through
+
+        case wxBK_BOTTOM:
+            rectPage.height -= size.y + GetInternalBorder();
+            if (rectPage.height < 0)
+                rectPage.height = 0;
+            break;
+
+        case wxBK_LEFT:
+            rectPage.x = size.x + GetInternalBorder();
+            // fall through
+
+        case wxBK_RIGHT:
+            rectPage.width -= size.x + GetInternalBorder();
+            if (rectPage.width < 0)
+                rectPage.width = 0;
+            break;
+    }
+
+    return rectPage;
+}
+
+// Lay out controls
+void wxBookCtrlBase::DoSize()
+{
+    if ( !m_bookctrl )
+    {
+        // we're not fully created yet or OnSize() should be hidden by derived class
+        return;
+    }
+
+    if (GetSizer())
+        Layout();
+    else
+    {
+        // resize controller and the page area to fit inside our new size
+        const wxSize sizeClient( GetClientSize() ),
+                    sizeBorder( m_bookctrl->GetSize() - m_bookctrl->GetClientSize() ),
+                    sizeCtrl( GetControllerSize() );
+
+        m_bookctrl->SetClientSize( sizeCtrl.x - sizeBorder.x, sizeCtrl.y - sizeBorder.y );
+        // if this changes the visibility of the scrollbars the best size changes, relayout in this case
+        wxSize sizeCtrl2 = GetControllerSize();
+        if ( sizeCtrl != sizeCtrl2 )
+        {
+            wxSize sizeBorder2 = m_bookctrl->GetSize() - m_bookctrl->GetClientSize();
+            m_bookctrl->SetClientSize( sizeCtrl2.x - sizeBorder2.x, sizeCtrl2.y - sizeBorder2.y );
+        }
+
+        const wxSize sizeNew = m_bookctrl->GetSize();
+        wxPoint posCtrl;
+        switch ( GetWindowStyle() & wxBK_ALIGN_MASK )
+        {
+            default:
+                wxFAIL_MSG( _T("unexpected alignment") );
+                // fall through
+
+            case wxBK_TOP:
+            case wxBK_LEFT:
+                // posCtrl is already ok
+                break;
+
+            case wxBK_BOTTOM:
+                posCtrl.y = sizeClient.y - sizeNew.y;
+                break;
+
+            case wxBK_RIGHT:
+                posCtrl.x = sizeClient.x - sizeNew.x;
+                break;
+        }
+
+        if ( m_bookctrl->GetPosition() != posCtrl )
+            m_bookctrl->Move(posCtrl);
+    }
+
+    // resize all pages to fit the new control size
+    const wxRect pageRect = GetPageRect();
+    const unsigned pagesCount = m_pages.Count();
+    for ( unsigned int i = 0; i < pagesCount; ++i )
+    {
+        wxWindow * const page = m_pages[i];
+        if ( !page )
+        {
+            wxASSERT_MSG( AllowNullPage(),
+                _T("Null page in a control that does not allow null pages?") );
+            continue;
+        }
+
+        page->SetSize(pageRect);
+    }
+}
+
+void wxBookCtrlBase::OnSize(wxSizeEvent& event)
+{
+    event.Skip();
+
+    DoSize();
+}
+
+wxSize wxBookCtrlBase::GetControllerSize() const
+{
+    if(!m_bookctrl)
+        return wxSize(0,0);
+
+    const wxSize sizeClient = GetClientSize(),
+                 sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
+                 sizeCtrl = m_bookctrl->GetBestSize() + sizeBorder;
+
+    wxSize size;
+
+    if ( IsVertical() )
+    {
+        size.x = sizeClient.x;
+        size.y = sizeCtrl.y;
+    }
+    else // left/right aligned
+    {
+        size.x = sizeCtrl.x;
+        size.y = sizeClient.y;
+    }
+
+    return size;
+}
+
+// ----------------------------------------------------------------------------
+// miscellaneous stuff
+// ----------------------------------------------------------------------------
+
+#if wxUSE_HELP
+
+void wxBookCtrlBase::OnHelp(wxHelpEvent& event)
+{
+    // determine where does this even originate from to avoid redirecting it
+    // back to the page which generated it (resulting in an infinite loop)
+
+    // notice that we have to check in the hard(er) way instead of just testing
+    // if the event object == this because the book control can have other
+    // subcontrols inside it (e.g. wxSpinButton in case of a notebook in wxUniv)
+    wxWindow *source = wxStaticCast(event.GetEventObject(), wxWindow);
+    while ( source && source != this && source->GetParent() != this )
+    {
+        source = source->GetParent();
+    }
+
+    if ( source && m_pages.Index(source) == wxNOT_FOUND )
+    {
+        // this event is for the book control itself, redirect it to the
+        // corresponding page
+        wxWindow *page = NULL;
+
+        if ( event.GetOrigin() == wxHelpEvent::Origin_HelpButton )
+        {
+            // show help for the page under the mouse
+            const int pagePos = HitTest(ScreenToClient(event.GetPosition()));
+
+            if ( pagePos != wxNOT_FOUND)
+            {
+                page = GetPage((size_t)pagePos);
+            }
+        }
+        else // event from keyboard or unknown source
+        {
+            // otherwise show the current page help
+            page = GetCurrentPage();
+        }
+
+        if ( page )
+        {
+            // change event object to the page to avoid infinite recursion if
+            // we get this event ourselves if the page doesn't handle it
+            event.SetEventObject(page);
+
+            if ( page->GetEventHandler()->ProcessEvent(event) )
+            {
+                // don't call event.Skip()
+                return;
+            }
+        }
+    }
+    //else: event coming from one of our pages already
+
+    event.Skip();
+}
+
+#endif // wxUSE_HELP
+
+// ----------------------------------------------------------------------------
+// pages management
+// ----------------------------------------------------------------------------
+
+bool
+wxBookCtrlBase::InsertPage(size_t nPage,
+                           wxWindow *page,
+                           const wxString& WXUNUSED(text),
+                           bool WXUNUSED(bSelect),
+                           int WXUNUSED(imageId))
+{
+    wxCHECK_MSG( page || AllowNullPage(), false,
+                 _T("NULL page in wxBookCtrlBase::InsertPage()") );
+    wxCHECK_MSG( nPage <= m_pages.size(), false,
+                 _T("invalid page index in wxBookCtrlBase::InsertPage()") );
+
+    m_pages.Insert(page, nPage);
+    if ( page )
+        page->SetSize(GetPageRect());
+
+    DoInvalidateBestSize();
+
+    return true;
+}
+
+bool wxBookCtrlBase::DeletePage(size_t nPage)
+{
+    wxWindow *page = DoRemovePage(nPage);
+    if ( !(page || AllowNullPage()) )
+        return false;
+
+    // delete NULL is harmless
+    delete page;
+
+    return true;
+}
+
+wxWindow *wxBookCtrlBase::DoRemovePage(size_t nPage)
+{
+    wxCHECK_MSG( nPage < m_pages.size(), NULL,
+                 _T("invalid page index in wxBookCtrlBase::DoRemovePage()") );
+
+    wxWindow *pageRemoved = m_pages[nPage];
+    m_pages.RemoveAt(nPage);
+    DoInvalidateBestSize();
+
+    return pageRemoved;
+}
+
+int wxBookCtrlBase::GetNextPage(bool forward) const
+{
+    int nPage;
+
+    int nMax = GetPageCount();
+    if ( nMax-- ) // decrement it to get the last valid index
+    {
+        int nSel = GetSelection();
+
+        // change selection wrapping if it becomes invalid
+        nPage = forward ? nSel == nMax ? 0
+                                       : nSel + 1
+                        : nSel == 0 ? nMax
+                                    : nSel - 1;
+    }
+    else // notebook is empty, no next page
+    {
+        nPage = wxNOT_FOUND;
+    }
+
+    return nPage;
+}
+
+int wxBookCtrlBase::DoSetSelection(size_t n, int flags)
+{
+    wxCHECK_MSG( n < GetPageCount(), wxNOT_FOUND,
+                 wxT("invalid page index in wxBookCtrlBase::DoSetSelection()") );
+
+    const int oldSel = GetSelection();
+
+    if ( n != (size_t)oldSel )
+    {
+        wxBookCtrlBaseEvent *event = CreatePageChangingEvent();
+        bool allowed = false;
+
+        if ( flags & SetSelection_SendEvent )
+        {
+            event->SetSelection(n);
+            event->SetOldSelection(oldSel);
+            event->SetEventObject(this);
+
+            allowed = !GetEventHandler()->ProcessEvent(*event) || event->IsAllowed();
+        }
+
+        if ( !(flags & SetSelection_SendEvent) || allowed)
+        {
+            if ( oldSel != wxNOT_FOUND )
+                m_pages[oldSel]->Hide();
+
+            wxWindow *page = m_pages[n];
+            page->SetSize(GetPageRect());
+            page->Show();
+
+            // change selection now to ignore the selection change event
+            UpdateSelectedPage(n);
+
+            if ( flags & SetSelection_SendEvent )
+            {
+                // program allows the page change
+                MakeChangedEvent(*event);
+                (void)GetEventHandler()->ProcessEvent(*event);
+            }
+        }
+
+        delete event;
+    }
+
+    return oldSel;
+}
+
+
+#endif // wxUSE_BOOKCTRL
diff --git a/Source/3rd Party/wx/src/common/btncmn.cpp b/Source/3rd Party/wx/src/common/btncmn.cpp
deleted file mode 100644
index 281d3e7c8..000000000
--- a/Source/3rd Party/wx/src/common/btncmn.cpp	
+++ /dev/null
@@ -1,122 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/btncmn.cpp
-// Purpose:     implementation of wxButtonBase
-// Author:      Vadim Zeitlin
-// Created:     2007-04-08
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_BUTTON
-
-#ifndef WX_PRECOMP
-    #include "wx/button.h"
-    #include "wx/toplevel.h"
-#endif //WX_PRECOMP
-
-extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[] = "button";
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxButtonStyle )
-wxBEGIN_FLAGS( wxButtonStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxBU_LEFT)
-wxFLAGS_MEMBER(wxBU_RIGHT)
-wxFLAGS_MEMBER(wxBU_TOP)
-wxFLAGS_MEMBER(wxBU_BOTTOM)
-wxFLAGS_MEMBER(wxBU_EXACTFIT)
-wxEND_FLAGS( wxButtonStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl, "wx/button.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxButton)
-wxEVENT_PROPERTY( Click, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent )
-
-wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("The font associated with the button label"), wxT("group"))
-wxPROPERTY( Label, wxString, SetLabel, GetLabel, wxString(), \
-           0 /*flags*/, wxT("The button label"), wxT("group") )
-
-wxPROPERTY_FLAGS( WindowStyle, wxButtonStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/,     \
-                 wxT("The button style"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxButton)
-
-wxCONSTRUCTOR_6( wxButton, wxWindow*, Parent, wxWindowID, Id, wxString, \
-                Label, wxPoint, Position, wxSize, Size, long, WindowStyle )
-
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-wxWindow *wxButtonBase::SetDefault()
-{
-    wxTopLevelWindow * const
-        tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-
-    wxCHECK_MSG( tlw, NULL, wxT("button without top level window?") );
-
-    return tlw->SetDefaultItem(this);
-}
-
-void wxAnyButtonBase::SetBitmapPosition(wxDirection dir)
-{
-    wxASSERT_MSG( !(dir & ~wxDIRECTION_MASK), "non-direction flag used" );
-    wxASSERT_MSG( !!(dir & wxLEFT) +
-                    !!(dir & wxRIGHT) +
-                      !!(dir & wxTOP) +
-                       !!(dir & wxBOTTOM) == 1,
-                   "exactly one direction flag must be set" );
-
-    DoSetBitmapPosition(dir);
-
-}
-#endif // wxUSE_BUTTON
diff --git a/Source/3rd Party/wx/src/common/cairo.cpp b/Source/3rd Party/wx/src/common/cairo.cpp
deleted file mode 100644
index 03eaa7d6c..000000000
--- a/Source/3rd Party/wx/src/common/cairo.cpp	
+++ /dev/null
@@ -1,442 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/cairo.cpp
-// Purpose:     Cairo library
-// Author:      Anthony Betaudeau
-// Created:     2007-08-25
-// RCS-ID:      $Id$
-// Copyright:   (c) Anthony Bretaudeau
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// keep cairo.h from defining dllimport as we're defining the symbols inside
-// the wx dll in order to load them dynamically.
-#define cairo_public 
-
-#include "wx/cairo.h"
-#include "wx/dynlib.h"
-
-#if wxUSE_CAIRO
-
-#ifdef __WXMSW__
-#include "wx/msw/wrapwin.h"
-#endif
-
-#ifdef __WXMAC__
-#include "wx/osx/private.h"
-#include <cairo-quartz.h>
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/module.h"
-    #include "wx/log.h"
-#endif
-
-#define wxCAIRO_METHOD_TYPE(name) \
-    wxCairo##name##_t
-    
-#define wxCAIRO_STATIC_METHOD_DEFINE(rettype, name, args, argnames, defret) \
-   static wxCAIRO_METHOD_TYPE(name) name;
-
-#define wxCAIRO_STATIC_VOIDMETHOD_DEFINE(name, args, argnames) \
-    wxCAIRO_STATIC_METHOD_DEFINE(void, name, args, argnames, NULL)
-
-#define wxFOR_ALL_CAIRO_VOIDMETHODS(m) \
-    m( cairo_append_path, \
-        (cairo_t *cr, const cairo_path_t *path), (cr, path) ) \
-    m( cairo_arc, \
-        (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) ) \
-    m( cairo_arc_negative, \
-        (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) ) \
-    m( cairo_clip, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_close_path, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_curve_to, \
-        (cairo_t *cr, double x1, double y1, double x2, double y2, double x3, double y3), (cr, x1, y1, x2, y2, x3, y3) ) \
-    m( cairo_destroy, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_fill, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_fill_preserve, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_font_extents, \
-        (cairo_t *cr, cairo_font_extents_t *extents), (cr, extents) ) \
-    m( cairo_font_face_destroy, \
-        (cairo_font_face_t *font_face), (font_face) ) \
-    m( cairo_get_current_point, \
-        (cairo_t *cr, double *x, double *y), (cr, x, y) ) \
-    m( cairo_get_matrix, \
-        (cairo_t *cr, cairo_matrix_t *matrix), (cr, matrix) ) \
-    m( cairo_line_to, \
-        (cairo_t *cr, double x, double y), (cr, x, y) ) \
-    m( cairo_matrix_init, \
-        (cairo_matrix_t *matrix, double xx, double yx, double xy, double yy, double x0, double y0), (matrix, xx, yx, xy, yy, x0, y0) ) \
-    m( cairo_matrix_multiply, \
-        (cairo_matrix_t *result, const cairo_matrix_t *a, const cairo_matrix_t *b), (result, a, b) ) \
-    m( cairo_matrix_rotate, \
-        (cairo_matrix_t *matrix, double radians), (matrix, radians) ) \
-    m( cairo_matrix_scale, \
-        (cairo_matrix_t *matrix, double sx, double sy), (matrix, sx, sy) ) \
-    m( cairo_matrix_transform_distance, \
-        (const cairo_matrix_t *matrix, double *dx, double *dy), (matrix, dx, dy) ) \
-    m( cairo_matrix_transform_point, \
-        (const cairo_matrix_t *matrix, double *x, double *y), (matrix, x, y) ) \
-    m( cairo_matrix_translate, \
-        (cairo_matrix_t *matrix, double tx, double ty), (matrix, tx, ty) ) \
-    m( cairo_move_to, \
-        (cairo_t *cr, double x, double y), (cr, x, y) ) \
-    m( cairo_new_path, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_paint, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_paint_with_alpha, \
-        (cairo_t *cr, double alpha), (cr, alpha) ) \
-    m( cairo_path_destroy, \
-        (cairo_path_t *path), (path) ) \
-    m( cairo_pattern_add_color_stop_rgba, \
-        (cairo_pattern_t *pattern, double offset, double red, double green, double blue, double alpha), (pattern, offset, red, green, blue, alpha) ) \
-    m( cairo_pattern_destroy, \
-        (cairo_pattern_t *pattern), (pattern) ) \
-    m( cairo_pattern_set_extend, \
-        (cairo_pattern_t *pattern, cairo_extend_t extend), (pattern, extend) ) \
-    m( cairo_pattern_set_filter, \
-        (cairo_pattern_t *pattern, cairo_filter_t filter), (pattern, filter) ) \
-    m( cairo_pop_group_to_source, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_push_group, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_rectangle, \
-        (cairo_t *cr, double x, double y, double width, double height), (cr, x, y, width, height) ) \
-    m( cairo_reset_clip, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_restore, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_rotate, \
-        (cairo_t *cr, double angle), (cr, angle) ) \
-    m( cairo_save, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_scale, \
-        (cairo_t *cr, double sx, double sy), (cr, sx, sy) ) \
-    m( cairo_select_font_face, \
-        (cairo_t *cr, const char *family, cairo_font_slant_t slant, cairo_font_weight_t weight), (cr, family, slant, weight) ) \
-    m( cairo_set_antialias, \
-        (cairo_t *cr, cairo_antialias_t antialias), (cr, antialias) ) \
-    m( cairo_set_dash, \
-        (cairo_t *cr, const double *dashes, int num_dashes, double offset), (cr, dashes, num_dashes, offset) ) \
-    m( cairo_set_fill_rule, \
-        (cairo_t *cr, cairo_fill_rule_t fill_rule), (cr, fill_rule) ) \
-    m( cairo_set_font_face, \
-        (cairo_t *cr, cairo_font_face_t *font_face), (cr, font_face) ) \
-    m( cairo_set_font_size, \
-        (cairo_t *cr, double size), (cr, size) ) \
-    m( cairo_set_line_cap, \
-        (cairo_t *cr, cairo_line_cap_t line_cap), (cr, line_cap) ) \
-    m( cairo_set_line_join, \
-        (cairo_t *cr, cairo_line_join_t line_join), (cr, line_join) ) \
-    m( cairo_set_line_width, \
-        (cairo_t *cr, double width), (cr, width) ) \
-    m( cairo_set_matrix, \
-        (cairo_t *cr, const cairo_matrix_t *matrix), (cr, matrix) ) \
-    m( cairo_set_operator, \
-        (cairo_t *cr, cairo_operator_t op), (cr, op) ) \
-    m( cairo_set_source, \
-        (cairo_t *cr, cairo_pattern_t *source), (cr, source) ) \
-    m( cairo_set_source_rgba, \
-        (cairo_t *cr, double red, double green, double blue, double alpha), (cr, red, green, blue, alpha) ) \
-    m( cairo_show_text, \
-        (cairo_t *cr, const char *utf8), (cr, utf8) ) \
-    m( cairo_stroke, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_stroke_extents, \
-        (cairo_t *cr, double *x1, double *y1, double *x2, double *y2), (cr, x1, y1, x2, y2) ) \
-    m( cairo_stroke_preserve, \
-        (cairo_t *cr), (cr) ) \
-    m( cairo_surface_destroy, \
-        (cairo_surface_t *surface), (surface) ) \
-    m( cairo_text_extents, \
-        (cairo_t *cr, const char *utf8, cairo_text_extents_t *extents), (cr, utf8, extents) ) \
-    m( cairo_transform, \
-        (cairo_t *cr, const cairo_matrix_t *matrix), (cr, matrix) ) \
-    m( cairo_translate, \
-        (cairo_t *cr, double tx, double ty), (cr, tx, ty) ) \
-
-#ifdef __WXMAC__
-#define wxCAIRO_PLATFORM_METHODS(m) \
-    m( cairo_font_face_t*, cairo_quartz_font_face_create_for_cgfont, \
-        (CGFontRef font), (font), NULL ) \
-    m( cairo_surface_t*, cairo_quartz_surface_create_for_cg_context, \
-        (CGContextRef cgContext, unsigned int width, unsigned int height), (cgContext, width, height), NULL )
-#elif defined(__WXMSW__)
-#define wxCAIRO_PLATFORM_METHODS(m) \
-    m( cairo_surface_t*, cairo_win32_surface_create, \
-        (HDC hdc), (hdc), NULL ) \
-    m( cairo_surface_t*, cairo_win32_printing_surface_create, \
-        (HDC hdc), (hdc), NULL )
-#else
-#define wxCAIRO_PLATFORM_METHODS(m) 
-#endif
-
-#define wxFOR_ALL_CAIRO_METHODS(m) \
-    m( cairo_path_t*, cairo_copy_path, \
-        (cairo_t *cr), (cr), NULL ) \
-    m( cairo_t*, cairo_create, \
-        (cairo_surface_t *target), (target), NULL) \
-    m( cairo_surface_t*, cairo_get_target, \
-        (cairo_t *cr), (cr), NULL) \
-    m( cairo_surface_t*, cairo_image_surface_create, \
-        (cairo_format_t format, int width, int height), (format, width, height), NULL ) \
-    m( cairo_surface_t*, cairo_image_surface_create_for_data, \
-        (unsigned char *data, cairo_format_t format, int width, int height, int stride), (data, format, width, height, stride), NULL) \
-    m( cairo_bool_t, cairo_in_fill, \
-        (cairo_t *cr, double x, double y), (cr, x, y), false ) \
-    m( cairo_status_t, cairo_matrix_invert, \
-        (cairo_matrix_t *matrix), (matrix), NULL) \
-    m( cairo_pattern_t*, cairo_pattern_create_for_surface, \
-        (cairo_surface_t *surface), (surface), NULL) \
-    m( cairo_pattern_t*, cairo_pattern_create_linear, \
-        (double x0, double y0, double x1, double y1), (x0, y0, x1, y1), NULL) \
-    m( cairo_pattern_t*, cairo_pattern_create_radial, \
-        (double cx0, double cy0, double radius0, double cx1, double cy1, double radius1), (cx0, cy0, radius0, cx1, cy1, radius1), NULL) \
-    m( cairo_status_t, cairo_pattern_status, \
-        (cairo_pattern_t *pattern), (pattern), 4) \
-    m( cairo_t*, cairo_reference, \
-        (cairo_t *cr), (cr), NULL ) \
-    m( cairo_surface_t*, cairo_surface_create_similar, \
-        (cairo_surface_t *other, cairo_content_t content, int width, int height), (other, content, width, height), NULL) \
-    m( int, cairo_format_stride_for_width, \
-       (cairo_format_t format, int width), (format, width), 0)  \
-    m( int, cairo_version, \
-       (), (), 0)  \
-    m( int, cairo_image_surface_get_stride, \
-       (cairo_surface_t *surface), (surface), 0) \
-    m( unsigned char *, cairo_image_surface_get_data, \
-       (cairo_surface_t *surface), (surface), NULL) \
-    m( cairo_format_t, cairo_image_surface_get_format, \
-       (cairo_surface_t *surface), (surface), CAIRO_FORMAT_INVALID) \
-    m( cairo_surface_type_t, cairo_surface_get_type, \
-       (cairo_surface_t *surface), (surface), -1) \
-    wxCAIRO_PLATFORM_METHODS(m)
-
-    
-#if wxUSE_PANGO
-#define wxFOR_ALL_PANGO_CAIRO_VOIDMETHODS(m) \
-    m( pango_cairo_update_layout, \
-        (cairo_t *cr, PangoLayout *layout), (cr, layout) ) \
-    m( pango_cairo_show_layout, \
-        (cairo_t *cr, PangoLayout *layout), (cr, layout) )
-#endif
-
-#define wxCAIRO_DECLARE_TYPE(rettype, name, args, argnames, defret) \
-   typedef rettype (*wxCAIRO_METHOD_TYPE(name)) args ; \
-   wxCAIRO_METHOD_TYPE(name) wxDL_METHOD_NAME(name);
-
-#define wxCAIRO_DECLARE_VOIDTYPE(name, args, argnames) \
-   wxCAIRO_DECLARE_TYPE(void, name, args, argnames, NULL)
-   
-wxFOR_ALL_CAIRO_VOIDMETHODS(wxCAIRO_DECLARE_VOIDTYPE)
-wxFOR_ALL_CAIRO_METHODS(wxCAIRO_DECLARE_TYPE)
-
-
-class wxCairo
-{
-public:
-    static bool Initialize();
-
-    // for internal use only
-    static void CleanUp();
-
-private:
-    // the single wxCairo instance or NULL
-    static wxCairo *ms_lib;
-
-    wxCairo();
-    ~wxCairo();
-
-    bool IsOk();
-
-    wxDynamicLibrary m_libCairo;
-    wxDynamicLibrary m_libPangoCairo;
-
-    // true if we successfully loaded the libraries and can use them
-    //
-    // note that this field must have this name as it's used by wxDL_XXX macros
-    bool m_ok;
-
-public:
-
-    wxFOR_ALL_CAIRO_VOIDMETHODS(wxCAIRO_STATIC_VOIDMETHOD_DEFINE)
-    wxFOR_ALL_CAIRO_METHODS(wxCAIRO_STATIC_METHOD_DEFINE)
-#if wxUSE_PANGO // untested, uncomment to test compilation.
-    //wxFOR_ALL_PANGO_METHODS(wxDL_STATIC_METHOD_DEFINE)
-#endif
-
-    wxDECLARE_NO_COPY_CLASS(wxCairo);
-};
-
-#define wxINIT_CAIRO_VOIDFUNC(name, params, args) \
-    wxCAIRO_METHOD_TYPE(name) wxCairo::name = NULL;
-
-#define wxINIT_CAIRO_FUNC(rettype, name, params, args, defret) \
-    wxCAIRO_METHOD_TYPE(name) wxCairo::name = NULL;
-
-wxFOR_ALL_CAIRO_VOIDMETHODS(wxINIT_CAIRO_VOIDFUNC)
-wxFOR_ALL_CAIRO_METHODS(wxINIT_CAIRO_FUNC)
-
-#undef wxINIT_CAIRO_FUNC
-
-wxCairo *wxCairo::ms_lib = NULL;
-
-//----------------------------------------------------------------------------
-// wxCairoLibrary
-//----------------------------------------------------------------------------
-
-wxCairo::wxCairo()
-{
-    wxLogNull log;
-
-#ifdef __WXMSW__
-    wxString cairoDllStr("libcairo-2.dll");
-#else
-    wxString cairoDllStr("libcairo.so.2");
-#endif
-    m_libCairo.Load(cairoDllStr);
-    m_ok = m_libCairo.IsLoaded();
-    if ( !m_ok )
-        return;
-
-#if wxUSE_PANGO
-    m_libPangoCairo.Load("libpangocairo-1.0.so.0");
-    m_ok = m_libPangoCairo.IsLoaded();
-    if ( !m_ok )
-    {
-        m_libCairo.Unload();
-        return;
-    }
-#endif
-
-    
-#define wxDO_LOAD_FUNC(name, nameStr)                                     \
-    name = (wxCAIRO_METHOD_TYPE(name))m_libCairo.RawGetSymbol(nameStr);      \
-    if ( !name )                                                          \
-        return;
-
-#define wxLOAD_CAIRO_VOIDFUNC(name, params, args)                         \
-    wxDO_LOAD_FUNC(name, wxSTRINGIZE_T(name))
-
-#define wxLOAD_CAIRO_FUNC(rettype, name, params, args, defret)            \
-    wxDO_LOAD_FUNC(name, wxSTRINGIZE_T(name))
-
-wxFOR_ALL_CAIRO_VOIDMETHODS(wxLOAD_CAIRO_VOIDFUNC)
-wxFOR_ALL_CAIRO_METHODS(wxLOAD_CAIRO_FUNC)
-
-#undef wxLOAD_CAIRO_FUNC
-
-    m_ok = true;
-}
-
-wxCairo::~wxCairo()
-{
-}
-
-/* static */ bool wxCairo::Initialize()
-{
-    if ( !ms_lib )
-    {
-        ms_lib = new wxCairo();
-        if ( !ms_lib->IsOk() )
-        {
-            delete ms_lib;
-            ms_lib = NULL;
-        }
-    }
-
-    return ms_lib != NULL;
-}
-
-/* static */ void wxCairo::CleanUp()
-{
-    if (ms_lib)
-    {
-        delete ms_lib;
-        ms_lib = NULL;
-    }
-}
-
-bool wxCairo::IsOk()
-{
-    return m_ok;
-}
-
-// ============================================================================
-// implementation of the functions themselves
-// ============================================================================
-
-extern "C"
-{
-
-bool wxCairoInit()
-{
-    return wxCairo::Initialize();
-}
-
-void wxCairoCleanUp()
-{
-    wxCairo::CleanUp();
-}
-
-#define wxIMPL_CAIRO_FUNC(rettype, name, params, args, defret)                \
-    rettype name params                                                               \
-    {                                                                         \
-        wxASSERT_MSG(wxCairo::Initialize(), "Cairo not initialized");  \
-        return wxCairo::name args;                                     \
-    }
-
-#define wxIMPL_CAIRO_VOIDFUNC(name, params, args) \
-    wxIMPL_CAIRO_FUNC(void, name, params, args, NULL)
-
-// we currently link directly to Cairo on GTK since it is usually available there,
-// so don't use our cairo_xyz wrapper functions until the decision is made to
-// always load Cairo dynamically there.
-#ifndef __WXGTK__
-wxFOR_ALL_CAIRO_VOIDMETHODS(wxIMPL_CAIRO_VOIDFUNC)
-wxFOR_ALL_CAIRO_METHODS(wxIMPL_CAIRO_FUNC)
-#endif
-
-} // extern "C"
-
-//----------------------------------------------------------------------------
-// wxCairoModule
-//----------------------------------------------------------------------------
-
-class wxCairoModule : public wxModule
-{
-public:
-    wxCairoModule() { }
-    virtual bool OnInit();
-    virtual void OnExit();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxCairoModule)
-};
-
-bool wxCairoModule::OnInit()
-{
-    return true;
-}
-
-void wxCairoModule::OnExit()
-{
-    wxCairo::CleanUp();
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxCairoModule, wxModule)
-
-#endif // wxUSE_CAIRO
diff --git a/Source/3rd Party/wx/src/common/checkboxcmn.cpp b/Source/3rd Party/wx/src/common/checkboxcmn.cpp
deleted file mode 100644
index 80ca73997..000000000
--- a/Source/3rd Party/wx/src/common/checkboxcmn.cpp	
+++ /dev/null
@@ -1,91 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/checkboxcmn.cpp
-// Purpose:     wxCheckBox common code
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_CHECKBOX
-
-#include "wx/checkbox.h"
-
-extern WXDLLEXPORT_DATA(const char) wxCheckBoxNameStr[] = "check";
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxCheckBoxStyle )
-wxBEGIN_FLAGS( wxCheckBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxNO_BORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxCheckBoxStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl, "wx/checkbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxCheckBox)
-    wxEVENT_PROPERTY( Click, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEvent )
-
-    wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
-                0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), \
-                0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( Value,bool, SetValue, GetValue, wxEMPTY_PARAMETER_VALUE, \
-                0 /*flags*/, wxT("Helpstring"), wxT("group"))
-
-    wxPROPERTY_FLAGS( WindowStyle, wxCheckBoxStyle, long, SetWindowStyleFlag, \
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                      wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxCheckBox)
-
-wxCONSTRUCTOR_6( wxCheckBox, wxWindow*, Parent, wxWindowID, Id, \
-                 wxString, Label, wxPoint, Position, wxSize, Size, long, WindowStyle )
-
-
-#endif // wxUSE_CHECKBOX
diff --git a/Source/3rd Party/wx/src/common/checklstcmn.cpp b/Source/3rd Party/wx/src/common/checklstcmn.cpp
deleted file mode 100644
index d10a013ed..000000000
--- a/Source/3rd Party/wx/src/common/checklstcmn.cpp	
+++ /dev/null
@@ -1,102 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/checklstcmn.cpp
-// Purpose:     wxCheckListBox common code
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     16.11.97
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_CHECKLISTBOX
-
-#include "wx/checklst.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/object.h"
-    #include "wx/colour.h"
-    #include "wx/font.h"
-    #include "wx/bitmap.h"
-    #include "wx/window.h"
-    #include "wx/listbox.h"
-    #include "wx/dcmemory.h"
-    #include "wx/settings.h"
-    #include "wx/log.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxCheckListBoxStyle )
-wxBEGIN_FLAGS( wxCheckListBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLB_SINGLE)
-    wxFLAGS_MEMBER(wxLB_MULTIPLE)
-    wxFLAGS_MEMBER(wxLB_EXTENDED)
-    wxFLAGS_MEMBER(wxLB_HSCROLL)
-    wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
-    wxFLAGS_MEMBER(wxLB_NEEDED_SB)
-    wxFLAGS_MEMBER(wxLB_SORT)
-    wxFLAGS_MEMBER(wxLB_OWNERDRAW)
-
-wxEND_FLAGS( wxCheckListBoxStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox, "wx/checklst.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxCheckListBox)
-    wxEVENT_PROPERTY( Toggle, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEvent )
-    wxPROPERTY_FLAGS( WindowStyle, wxCheckListBoxStyle, long, SetWindowStyleFlag, \
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, wxLB_OWNERDRAW /*flags*/, \
-                      wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxCheckListBox)
-
-wxCONSTRUCTOR_4( wxCheckListBox, wxWindow*, Parent, wxWindowID, Id, \
-                 wxPoint, Position, wxSize, Size )
-
-
-#endif
diff --git a/Source/3rd Party/wx/src/common/choiccmn.cpp b/Source/3rd Party/wx/src/common/choiccmn.cpp
index c33bc857e..7febe79e6 100644
--- a/Source/3rd Party/wx/src/common/choiccmn.cpp	
+++ b/Source/3rd Party/wx/src/common/choiccmn.cpp	
@@ -1,116 +1,55 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/choiccmn.cpp
-// Purpose:     common (to all ports) wxChoice functions
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     26.07.99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_CHOICE
-
-#include "wx/choice.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-const char wxChoiceNameStr[] = "choice";
-
-
-wxDEFINE_FLAGS( wxChoiceStyle )
-wxBEGIN_FLAGS( wxChoiceStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxChoiceStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl, "wx/choice.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxChoice)
-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent )
-
-wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \
-                      GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Selection,int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group"))
-
-/*
- TODO PROPERTIES
- selection (long)
- content (list)
- item
- */
-
-wxPROPERTY_FLAGS( WindowStyle, wxChoiceStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxChoice)
-
-wxCONSTRUCTOR_4( wxChoice, wxWindow*, Parent, wxWindowID, Id, \
-                wxPoint, Position, wxSize, Size )
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-wxChoiceBase::~wxChoiceBase()
-{
-    // this destructor is required for Darwin
-}
-
-// ----------------------------------------------------------------------------
-// misc
-// ----------------------------------------------------------------------------
-
-void wxChoiceBase::Command(wxCommandEvent& event)
-{
-    SetSelection(event.GetInt());
-    (void)GetEventHandler()->ProcessEvent(event);
-}
-
-#endif // wxUSE_CHOICE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/choiccmn.cpp
+// Purpose:     common (to all ports) wxChoice functions
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     26.07.99
+// RCS-ID:      $Id: choiccmn.cpp 39470 2006-05-30 07:34:30Z ABX $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_CHOICE
+
+#include "wx/choice.h"
+
+#ifndef WX_PRECOMP
+#endif
+
+const wxChar wxChoiceNameStr[] = wxT("choice");
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+wxChoiceBase::~wxChoiceBase()
+{
+    // this destructor is required for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
+
+void wxChoiceBase::Command(wxCommandEvent& event)
+{
+    SetSelection(event.GetInt());
+    (void)ProcessEvent(event);
+}
+
+#endif // wxUSE_CHOICE
diff --git a/Source/3rd Party/wx/src/common/clipcmn.cpp b/Source/3rd Party/wx/src/common/clipcmn.cpp
index b32f1b604..2421c48fe 100644
--- a/Source/3rd Party/wx/src/common/clipcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/clipcmn.cpp	
@@ -1,112 +1,63 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/clipcmn.cpp
-// Purpose:     common (to all ports) wxClipboard functions
-// Author:      Robert Roebling
-// Modified by:
-// Created:     28.06.99
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_CLIPBOARD
-
-#include "wx/clipbrd.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dataobj.h"
-    #include "wx/module.h"
-#endif
-
-// ---------------------------------------------------------
-// wxClipboardEvent
-// ---------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)
-
-wxDEFINE_EVENT( wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );
-
-bool wxClipboardEvent::SupportsFormat( const wxDataFormat &format ) const
-{
-#ifdef __WXGTK20__
-    for (wxVector<wxDataFormat>::size_type n = 0; n < m_formats.size(); n++)
-    {
-        if (m_formats[n] == format)
-            return true;
-    }
-
-    return false;
-#else
-    // All other ports just query the clipboard directly
-    // from here
-    wxClipboard* clipboard = (wxClipboard*) GetEventObject();
-    return clipboard->IsSupported( format );
-#endif
-}
-
-void wxClipboardEvent::AddFormat(const wxDataFormat& format)
-{
-    m_formats.push_back( format );
-}
-
-// ---------------------------------------------------------
-// wxClipboardBase
-// ---------------------------------------------------------
-
-static wxClipboard *gs_clipboard = NULL;
-
-/*static*/ wxClipboard *wxClipboardBase::Get()
-{
-    if ( !gs_clipboard )
-    {
-        gs_clipboard = new wxClipboard;
-    }
-    return gs_clipboard;
-}
-
-bool wxClipboardBase::IsSupportedAsync( wxEvtHandler *sink )
-{
-    // We just imitate an asynchronous API on most platforms.
-    // This method is overridden uner GTK.
-    wxClipboardEvent *event = new wxClipboardEvent(wxEVT_CLIPBOARD_CHANGED);
-    event->SetEventObject( this );
-
-    sink->QueueEvent( event );
-
-    return true;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxClipboardModule: module responsible for destroying the global clipboard
-// object
-// ----------------------------------------------------------------------------
-
-class wxClipboardModule : public wxModule
-{
-public:
-    bool OnInit() { return true; }
-    void OnExit() { wxDELETE(gs_clipboard); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
-
-#endif // wxUSE_CLIPBOARD
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/clipcmn.cpp
+// Purpose:     common (to all ports) wxClipboard functions
+// Author:      Robert Roebling
+// Modified by:
+// Created:     28.06.99
+// RCS-ID:      $Id: clipcmn.cpp 40943 2006-08-31 19:31:43Z ABX $
+// Copyright:   (c) Robert Roebling
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_CLIPBOARD
+
+#include "wx/clipbrd.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/module.h"
+#endif
+
+static wxClipboard *gs_clipboard = NULL;
+
+/*static*/ wxClipboard *wxClipboardBase::Get()
+{
+    if ( !gs_clipboard )
+    {
+        gs_clipboard = new wxClipboard;
+    }
+    return gs_clipboard;
+}
+
+// ----------------------------------------------------------------------------
+// wxClipboardModule: module responsible for destroying the global clipboard
+// object
+// ----------------------------------------------------------------------------
+
+class wxClipboardModule : public wxModule
+{
+public:
+    bool OnInit() { return true; }
+    void OnExit() { wxDELETE(gs_clipboard); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule, wxModule)
+
+#endif // wxUSE_CLIPBOARD
diff --git a/Source/3rd Party/wx/src/common/clntdata.cpp b/Source/3rd Party/wx/src/common/clntdata.cpp
index 3467d7fe6..d226f15b3 100644
--- a/Source/3rd Party/wx/src/common/clntdata.cpp	
+++ b/Source/3rd Party/wx/src/common/clntdata.cpp	
@@ -1,83 +1,83 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/clntdata.cpp
-// Purpose:     A mixin class for holding a wxClientData or void pointer
-// Author:      Robin Dunn
-// Modified by:
-// Created:     9-Oct-2001
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/clntdata.h"
-
-
-// ----------------------------------------------------------------------------
-
-
-wxClientDataContainer::wxClientDataContainer()
-{
-    // no client data (yet)
-    m_clientData = NULL;
-    m_clientDataType = wxClientData_None;
-}
-
-wxClientDataContainer::~wxClientDataContainer()
-{
-    // we only delete object data, not untyped
-    if ( m_clientDataType == wxClientData_Object )
-        delete m_clientObject;
-}
-
-void wxClientDataContainer::DoSetClientObject( wxClientData *data )
-{
-    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
-                  wxT("can't have both object and void client data") );
-
-    if ( m_clientObject )
-        delete m_clientObject;
-
-    m_clientObject = data;
-    m_clientDataType = wxClientData_Object;
-}
-
-wxClientData *wxClientDataContainer::DoGetClientObject() const
-{
-    // it's not an error to call GetClientObject() on a window which doesn't
-    // have client data at all - NULL will be returned
-    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
-                  wxT("this window doesn't have object client data") );
-
-    return m_clientObject;
-}
-
-void wxClientDataContainer::DoSetClientData( void *data )
-{
-    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
-                  wxT("can't have both object and void client data") );
-
-    m_clientData = data;
-    m_clientDataType = wxClientData_Void;
-}
-
-void *wxClientDataContainer::DoGetClientData() const
-{
-    // it's not an error to call GetClientData() on a window which doesn't have
-    // client data at all - NULL will be returned
-    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
-                  wxT("this window doesn't have void client data") );
-
-    return m_clientData;
-}
-
-
-// ----------------------------------------------------------------------------
-
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        common/clntdata.cpp
+// Purpose:     A mixin class for holding a wxClientData or void pointer
+// Author:      Robin Dunn
+// Modified by:
+// Created:     9-Oct-2001
+// RCS-ID:      $Id: clntdata.cpp 35650 2005-09-23 12:56:45Z MR $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/clntdata.h"
+
+
+// ----------------------------------------------------------------------------
+
+
+wxClientDataContainer::wxClientDataContainer()
+{
+    // no client data (yet)
+    m_clientData = NULL;
+    m_clientDataType = wxClientData_None;
+}
+
+wxClientDataContainer::~wxClientDataContainer()
+{
+    // we only delete object data, not untyped
+    if ( m_clientDataType == wxClientData_Object )
+        delete m_clientObject;
+}
+
+void wxClientDataContainer::DoSetClientObject( wxClientData *data )
+{
+    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
+                  wxT("can't have both object and void client data") );
+
+    if ( m_clientObject )
+        delete m_clientObject;
+
+    m_clientObject = data;
+    m_clientDataType = wxClientData_Object;
+}
+
+wxClientData *wxClientDataContainer::DoGetClientObject() const
+{
+    // it's not an error to call GetClientObject() on a window which doesn't
+    // have client data at all - NULL will be returned
+    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
+                  wxT("this window doesn't have object client data") );
+
+    return m_clientObject;
+}
+
+void wxClientDataContainer::DoSetClientData( void *data )
+{
+    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
+                  wxT("can't have both object and void client data") );
+
+    m_clientData = data;
+    m_clientDataType = wxClientData_Void;
+}
+
+void *wxClientDataContainer::DoGetClientData() const
+{
+    // it's not an error to call GetClientData() on a window which doesn't have
+    // client data at all - NULL will be returned
+    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
+                  wxT("this window doesn't have void client data") );
+
+    return m_clientData;
+}
+
+
+// ----------------------------------------------------------------------------
+
+
diff --git a/Source/3rd Party/wx/src/common/clrpickercmn.cpp b/Source/3rd Party/wx/src/common/clrpickercmn.cpp
index 1b63161c7..8e21d7f6e 100644
--- a/Source/3rd Party/wx/src/common/clrpickercmn.cpp	
+++ b/Source/3rd Party/wx/src/common/clrpickercmn.cpp	
@@ -1,149 +1,149 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/clrpickercmn.cpp
-// Purpose:     wxColourPickerCtrl class implementation
-// Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
-// Modified by:
-// Created:     15/04/2006
-// RCS-ID:      $Id$
-// Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_COLOURPICKERCTRL
-
-#include "wx/clrpicker.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
-#endif
-
-const char wxColourPickerCtrlNameStr[] = "colourpicker";
-const char wxColourPickerWidgetNameStr[] = "colourpickerwidget";
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-wxDEFINE_EVENT(wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEvent);
-IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent)
-
-// ----------------------------------------------------------------------------
-// wxColourPickerCtrl
-// ----------------------------------------------------------------------------
-
-#define M_PICKER     ((wxColourPickerWidget*)m_picker)
-
-bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id,
-                        const wxColour &col,
-                        const wxPoint &pos, const wxSize &size,
-                        long style, const wxValidator& validator,
-                        const wxString &name )
-{
-    if (!wxPickerBase::CreateBase(parent, id, col.GetAsString(), pos, size,
-                                  style, validator, name))
-        return false;
-
-    // we are not interested to the ID of our picker as we connect
-    // to its "changed" event dynamically...
-    m_picker = new wxColourPickerWidget(this, wxID_ANY, col,
-                                        wxDefaultPosition, wxDefaultSize,
-                                        GetPickerStyle(style));
-
-    // complete sizer creation
-    wxPickerBase::PostCreation();
-
-    m_picker->Connect(wxEVT_COMMAND_COLOURPICKER_CHANGED,
-            wxColourPickerEventHandler(wxColourPickerCtrl::OnColourChange),
-            NULL, this);
-
-    return true;
-}
-
-void wxColourPickerCtrl::SetColour(const wxColour &col)
-{
-    M_PICKER->SetColour(col);
-    UpdateTextCtrlFromPicker();
-}
-
-bool wxColourPickerCtrl::SetColour(const wxString &text)
-{
-    wxColour col(text);     // smart wxString->wxColour conversion
-    if ( !col.IsOk() )
-        return false;
-    M_PICKER->SetColour(col);
-    UpdateTextCtrlFromPicker();
-
-    return true;
-}
-
-void wxColourPickerCtrl::UpdatePickerFromTextCtrl()
-{
-    wxASSERT(m_text);
-
-    if (m_bIgnoreNextTextCtrlUpdate)
-    {
-        // ignore this update
-        m_bIgnoreNextTextCtrlUpdate = false;
-        return;
-    }
-
-    // wxString -> wxColour conversion
-    wxColour col(m_text->GetValue());
-    if ( !col.IsOk() )
-        return;     // invalid user input
-
-    if (M_PICKER->GetColour() != col)
-    {
-        M_PICKER->SetColour(col);
-
-        // fire an event
-        wxColourPickerEvent event(this, GetId(), col);
-        GetEventHandler()->ProcessEvent(event);
-    }
-}
-
-void wxColourPickerCtrl::UpdateTextCtrlFromPicker()
-{
-    if (!m_text)
-        return;     // no textctrl to update
-
-    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
-    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
-    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
-    m_bIgnoreNextTextCtrlUpdate = true;
-    m_text->SetValue(M_PICKER->GetColour().GetAsString());
-}
-
-
-
-// ----------------------------------------------------------------------------
-// wxColourPickerCtrl - event handlers
-// ----------------------------------------------------------------------------
-
-void wxColourPickerCtrl::OnColourChange(wxColourPickerEvent &ev)
-{
-    UpdateTextCtrlFromPicker();
-
-    // the wxColourPickerWidget sent us a colour-change notification.
-    // forward this event to our parent
-    wxColourPickerEvent event(this, GetId(), ev.GetColour());
-    GetEventHandler()->ProcessEvent(event);
-}
-
-#endif  // wxUSE_COLOURPICKERCTRL
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/clrpickercmn.cpp
+// Purpose:     wxColourPickerCtrl class implementation
+// Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
+// Modified by:
+// Created:     15/04/2006
+// RCS-ID:      $Id: clrpickercmn.cpp 42219 2006-10-21 19:53:05Z PC $
+// Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_COLOURPICKERCTRL
+
+#include "wx/clrpicker.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+
+const wxChar wxColourPickerCtrlNameStr[] = wxT("colourpicker");
+const wxChar wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget");
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLOURPICKER_CHANGED)
+IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase)
+IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent)
+
+// ----------------------------------------------------------------------------
+// wxColourPickerCtrl
+// ----------------------------------------------------------------------------
+
+#define M_PICKER     ((wxColourPickerWidget*)m_picker)
+
+bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id,
+                        const wxColour &col,
+                        const wxPoint &pos, const wxSize &size,
+                        long style, const wxValidator& validator,
+                        const wxString &name )
+{
+    if (!wxPickerBase::CreateBase(parent, id, col.GetAsString(), pos, size,
+                                  style, validator, name))
+        return false;
+
+    // we are not interested to the ID of our picker as we connect
+    // to its "changed" event dynamically...
+    m_picker = new wxColourPickerWidget(this, wxID_ANY, col,
+                                        wxDefaultPosition, wxDefaultSize,
+                                        GetPickerStyle(style));
+
+    // complete sizer creation
+    wxPickerBase::PostCreation();
+
+    m_picker->Connect(wxEVT_COMMAND_COLOURPICKER_CHANGED,
+            wxColourPickerEventHandler(wxColourPickerCtrl::OnColourChange),
+            NULL, this);
+
+    return true;
+}
+
+void wxColourPickerCtrl::SetColour(const wxColour &col)
+{
+    M_PICKER->SetColour(col);
+    UpdateTextCtrlFromPicker();
+}
+
+bool wxColourPickerCtrl::SetColour(const wxString &text)
+{
+    wxColour col(text);     // smart wxString->wxColour conversion
+    if ( !col.Ok() )
+        return false;
+    M_PICKER->SetColour(col);
+    UpdateTextCtrlFromPicker();
+
+    return true;
+}
+
+void wxColourPickerCtrl::UpdatePickerFromTextCtrl()
+{
+    wxASSERT(m_text);
+
+    if (m_bIgnoreNextTextCtrlUpdate)
+    {
+        // ignore this update
+        m_bIgnoreNextTextCtrlUpdate = false;
+        return;
+    }
+
+    // wxString -> wxColour conversion
+    wxColour col(m_text->GetValue());
+    if ( !col.Ok() )
+        return;     // invalid user input
+
+    if (M_PICKER->GetColour() != col)
+    {
+        M_PICKER->SetColour(col);
+
+        // fire an event
+        wxColourPickerEvent event(this, GetId(), col);
+        GetEventHandler()->ProcessEvent(event);
+    }
+}
+
+void wxColourPickerCtrl::UpdateTextCtrlFromPicker()
+{
+    if (!m_text)
+        return;     // no textctrl to update
+
+    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
+    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
+    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
+    m_bIgnoreNextTextCtrlUpdate = true;
+    m_text->SetValue(M_PICKER->GetColour().GetAsString());
+}
+
+
+
+// ----------------------------------------------------------------------------
+// wxColourPickerCtrl - event handlers
+// ----------------------------------------------------------------------------
+
+void wxColourPickerCtrl::OnColourChange(wxColourPickerEvent &ev)
+{
+    UpdateTextCtrlFromPicker();
+
+    // the wxColourPickerWidget sent us a colour-change notification.
+    // forward this event to our parent
+    wxColourPickerEvent event(this, GetId(), ev.GetColour());
+    GetEventHandler()->ProcessEvent(event);
+}
+
+#endif  // wxUSE_COLOURPICKERCTRL
diff --git a/Source/3rd Party/wx/src/common/cmdline.cpp b/Source/3rd Party/wx/src/common/cmdline.cpp
index 4356126d6..c7b135d0c 100644
--- a/Source/3rd Party/wx/src/common/cmdline.cpp	
+++ b/Source/3rd Party/wx/src/common/cmdline.cpp	
@@ -1,1484 +1,1246 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/cmdline.cpp
-// Purpose:     wxCmdLineParser implementation
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     05.01.00
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/app.h"
-#endif //WX_PRECOMP
-
-#include "wx/cmdline.h"
-
-#if wxUSE_CMDLINE_PARSER
-
-#include <ctype.h>
-#include <locale.h>             // for LC_ALL
-
-#include "wx/datetime.h"
-#include "wx/msgout.h"
-#include "wx/filename.h"
-#include "wx/apptrait.h"
-#include "wx/scopeguard.h"
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-static wxString GetTypeName(wxCmdLineParamType type);
-
-static wxString GetOptionName(wxString::const_iterator p,
-                              wxString::const_iterator end,
-                              const wxChar *allowedChars);
-
-static wxString GetShortOptionName(wxString::const_iterator p,
-                                   wxString::const_iterator end);
-
-static wxString GetLongOptionName(wxString::const_iterator p,
-                                  wxString::const_iterator end);
-
-// ----------------------------------------------------------------------------
-// private structs
-// ----------------------------------------------------------------------------
-
-// an internal representation of an option
-struct wxCmdLineOption
-{
-    wxCmdLineOption(wxCmdLineEntryType k,
-                    const wxString& shrt,
-                    const wxString& lng,
-                    const wxString& desc,
-                    wxCmdLineParamType typ,
-                    int fl)
-    {
-        // wxCMD_LINE_USAGE_TEXT uses only description, shortName and longName is empty
-        if ( k != wxCMD_LINE_USAGE_TEXT )
-        {
-            wxASSERT_MSG
-            (
-                !shrt.empty() || !lng.empty(),
-                 wxT("option should have at least one name")
-            );
-
-            wxASSERT_MSG
-            (
-                GetShortOptionName(shrt.begin(), shrt.end()).Len() == shrt.Len(),
-                wxT("Short option contains invalid characters")
-            );
-
-            wxASSERT_MSG
-            (
-                GetLongOptionName(lng.begin(), lng.end()).Len() == lng.Len(),
-                wxT("Long option contains invalid characters")
-            );
-        }
-
-        kind = k;
-
-        shortName = shrt;
-        longName = lng;
-        description = desc;
-
-        type = typ;
-        flags = fl;
-
-        Reset();
-    }
-
-    // can't use union easily here, so just store all possible data fields, we
-    // don't waste much (might still use union later if the number of supported
-    // types increases, so always use the accessor functions and don't access
-    // the fields directly!)
-
-    void Check(wxCmdLineParamType WXUNUSED_UNLESS_DEBUG(typ)) const
-    {
-        wxASSERT_MSG( type == typ, wxT("type mismatch in wxCmdLineOption") );
-    }
-
-    double GetDoubleVal() const
-        { Check(wxCMD_LINE_VAL_DOUBLE); return m_doubleVal; }
-    long GetLongVal() const
-        { Check(wxCMD_LINE_VAL_NUMBER); return m_longVal; }
-    const wxString& GetStrVal() const
-        { Check(wxCMD_LINE_VAL_STRING); return m_strVal;  }
-#if wxUSE_DATETIME
-    const wxDateTime& GetDateVal() const
-        { Check(wxCMD_LINE_VAL_DATE);   return m_dateVal; }
-#endif // wxUSE_DATETIME
-
-    void SetDoubleVal(double val)
-        { Check(wxCMD_LINE_VAL_DOUBLE); m_doubleVal = val; m_hasVal = true; }
-    void SetLongVal(long val)
-        { Check(wxCMD_LINE_VAL_NUMBER); m_longVal = val; m_hasVal = true; }
-    void SetStrVal(const wxString& val)
-        { Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = true; }
-#if wxUSE_DATETIME
-    void SetDateVal(const wxDateTime& val)
-        { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; }
-#endif // wxUSE_DATETIME
-
-    void SetHasValue() { m_hasVal = true; }
-    bool HasValue() const { return m_hasVal; }
-
-    void SetNegated() { m_isNegated = true; }
-    bool IsNegated() const { return m_isNegated; }
-
-    // Reset to the initial state, called before parsing another command line.
-    void Reset()
-    {
-        m_hasVal =
-        m_isNegated = false;
-    }
-
-public:
-    wxCmdLineEntryType kind;
-    wxString shortName,
-             longName,
-             description;
-    wxCmdLineParamType type;
-    int flags;
-
-private:
-    bool m_hasVal;
-    bool m_isNegated;
-
-    double m_doubleVal;
-    long m_longVal;
-    wxString m_strVal;
-#if wxUSE_DATETIME
-    wxDateTime m_dateVal;
-#endif // wxUSE_DATETIME
-};
-
-struct wxCmdLineParam
-{
-    wxCmdLineParam(const wxString& desc,
-                   wxCmdLineParamType typ,
-                   int fl)
-        : description(desc)
-    {
-        type = typ;
-        flags = fl;
-    }
-
-    wxString description;
-    wxCmdLineParamType type;
-    int flags;
-};
-
-WX_DECLARE_OBJARRAY(wxCmdLineOption, wxArrayOptions);
-WX_DECLARE_OBJARRAY(wxCmdLineParam, wxArrayParams);
-
-#include "wx/arrimpl.cpp"
-
-WX_DEFINE_OBJARRAY(wxArrayOptions)
-WX_DEFINE_OBJARRAY(wxArrayParams)
-
-// the parser internal state
-struct wxCmdLineParserData
-{
-    // options
-    wxString m_switchChars;     // characters which may start an option
-    bool m_enableLongOptions;   // true if long options are enabled
-    wxString m_logo;            // some extra text to show in Usage()
-
-    // cmd line data
-    wxArrayString m_arguments;  // == argv, argc == m_arguments.GetCount()
-    wxArrayOptions m_options;   // all possible options and switches
-    wxArrayParams m_paramDesc;  // description of all possible params
-    wxArrayString m_parameters; // all params found
-
-    // methods
-    wxCmdLineParserData();
-    void SetArguments(int argc, char **argv);
-#if wxUSE_UNICODE
-    void SetArguments(int argc, wxChar **argv);
-    void SetArguments(int argc, const wxCmdLineArgsArray& argv);
-#endif // wxUSE_UNICODE
-    void SetArguments(const wxString& cmdline);
-
-    int FindOption(const wxString& name);
-    int FindOptionByLongName(const wxString& name);
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxCmdLineParserData
-// ----------------------------------------------------------------------------
-
-wxCmdLineParserData::wxCmdLineParserData()
-{
-    m_enableLongOptions = true;
-#ifdef __UNIX_LIKE__
-    m_switchChars = wxT("-");
-#else // !Unix
-    m_switchChars = wxT("/-");
-#endif
-}
-
-namespace
-{
-
-// Small helper function setting locale for all categories.
-//
-// We define it because wxSetlocale() can't be easily used with wxScopeGuard as
-// it has several overloads -- while this one can.
-inline char *SetAllLocaleFacets(const char *loc)
-{
-    return wxSetlocale(LC_ALL, loc);
-}
-
-} // private namespace
-
-void wxCmdLineParserData::SetArguments(int argc, char **argv)
-{
-    m_arguments.clear();
-
-    // Command-line arguments are supposed to be in the user locale encoding
-    // (what else?) but wxLocale probably wasn't initialized yet as we're
-    // called early during the program startup and so our locale might not have
-    // been set from the environment yet. To work around this problem we
-    // temporarily change the locale here. The only drawback is that changing
-    // the locale is thread-unsafe but precisely because we're called so early
-    // it's hopefully safe to assume that no other threads had been created yet.
-    char * const locOld = SetAllLocaleFacets("");
-    wxON_BLOCK_EXIT1( SetAllLocaleFacets, locOld );
-
-    for ( int n = 0; n < argc; n++ )
-    {
-        // try to interpret the string as being in the current locale
-        wxString arg(argv[n]);
-
-        // but just in case we guessed wrongly and the conversion failed, do
-        // try to salvage at least something
-        if ( arg.empty() && argv[n][0] != '\0' )
-            arg = wxString(argv[n], wxConvISO8859_1);
-
-        m_arguments.push_back(arg);
-    }
-}
-
-#if wxUSE_UNICODE
-
-void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
-{
-    m_arguments.clear();
-
-    for ( int n = 0; n < argc; n++ )
-    {
-        m_arguments.push_back(argv[n]);
-    }
-}
-
-void wxCmdLineParserData::SetArguments(int WXUNUSED(argc),
-                                       const wxCmdLineArgsArray& argv)
-{
-    m_arguments = argv.GetArguments();
-}
-
-#endif // wxUSE_UNICODE
-
-void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
-{
-    m_arguments.clear();
-
-    if(wxTheApp && wxTheApp->argc > 0)
-        m_arguments.push_back(wxTheApp->argv[0]);
-    else
-        m_arguments.push_back(wxEmptyString);
-
-    wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
-
-    WX_APPEND_ARRAY(m_arguments, args);
-}
-
-int wxCmdLineParserData::FindOption(const wxString& name)
-{
-    if ( !name.empty() )
-    {
-        size_t count = m_options.GetCount();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            if ( m_options[n].shortName == name )
-            {
-                // found
-                return n;
-            }
-        }
-    }
-
-    return wxNOT_FOUND;
-}
-
-int wxCmdLineParserData::FindOptionByLongName(const wxString& name)
-{
-    size_t count = m_options.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        if ( m_options[n].longName == name )
-        {
-            // found
-            return n;
-        }
-    }
-
-    return wxNOT_FOUND;
-}
-
-// ----------------------------------------------------------------------------
-// construction and destruction
-// ----------------------------------------------------------------------------
-
-void wxCmdLineParser::Init()
-{
-    m_data = new wxCmdLineParserData;
-}
-
-void wxCmdLineParser::SetCmdLine(int argc, char **argv)
-{
-    m_data->SetArguments(argc, argv);
-}
-
-#if wxUSE_UNICODE
-
-void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
-{
-    m_data->SetArguments(argc, argv);
-}
-
-void wxCmdLineParser::SetCmdLine(int argc, const wxCmdLineArgsArray& argv)
-{
-    m_data->SetArguments(argc, argv);
-}
-
-#endif // wxUSE_UNICODE
-
-void wxCmdLineParser::SetCmdLine(const wxString& cmdline)
-{
-    m_data->SetArguments(cmdline);
-}
-
-wxCmdLineParser::~wxCmdLineParser()
-{
-    delete m_data;
-}
-
-// ----------------------------------------------------------------------------
-// options
-// ----------------------------------------------------------------------------
-
-void wxCmdLineParser::SetSwitchChars(const wxString& switchChars)
-{
-    m_data->m_switchChars = switchChars;
-}
-
-void wxCmdLineParser::EnableLongOptions(bool enable)
-{
-    m_data->m_enableLongOptions = enable;
-}
-
-bool wxCmdLineParser::AreLongOptionsEnabled() const
-{
-    return m_data->m_enableLongOptions;
-}
-
-void wxCmdLineParser::SetLogo(const wxString& logo)
-{
-    m_data->m_logo = logo;
-}
-
-// ----------------------------------------------------------------------------
-// command line construction
-// ----------------------------------------------------------------------------
-
-void wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc *desc)
-{
-    for ( ;; desc++ )
-    {
-        switch ( desc->kind )
-        {
-            case wxCMD_LINE_SWITCH:
-                AddSwitch(desc->shortName, desc->longName,
-                          wxGetTranslation(desc->description),
-                          desc->flags);
-                break;
-
-            case wxCMD_LINE_OPTION:
-                AddOption(desc->shortName, desc->longName,
-                          wxGetTranslation(desc->description),
-                          desc->type, desc->flags);
-                break;
-
-            case wxCMD_LINE_PARAM:
-                AddParam(wxGetTranslation(desc->description),
-                         desc->type, desc->flags);
-                break;
-
-            case wxCMD_LINE_USAGE_TEXT:
-                AddUsageText(wxGetTranslation(desc->description));
-                break;
-
-            default:
-                wxFAIL_MSG( wxT("unknown command line entry type") );
-                // still fall through
-
-            case wxCMD_LINE_NONE:
-                return;
-        }
-    }
-}
-
-void wxCmdLineParser::AddSwitch(const wxString& shortName,
-                                const wxString& longName,
-                                const wxString& desc,
-                                int flags)
-{
-    wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
-                  wxT("duplicate switch") );
-
-    wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_SWITCH,
-                                                  shortName, longName, desc,
-                                                  wxCMD_LINE_VAL_NONE, flags);
-
-    m_data->m_options.Add(option);
-}
-
-void wxCmdLineParser::AddOption(const wxString& shortName,
-                                const wxString& longName,
-                                const wxString& desc,
-                                wxCmdLineParamType type,
-                                int flags)
-{
-    wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
-                  wxT("duplicate option") );
-
-    wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_OPTION,
-                                                  shortName, longName, desc,
-                                                  type, flags);
-
-    m_data->m_options.Add(option);
-}
-
-void wxCmdLineParser::AddParam(const wxString& desc,
-                               wxCmdLineParamType type,
-                               int flags)
-{
-    // do some consistency checks: a required parameter can't follow an
-    // optional one and nothing should follow a parameter with MULTIPLE flag
-#if wxDEBUG_LEVEL
-    if ( !m_data->m_paramDesc.IsEmpty() )
-    {
-        wxCmdLineParam& param = m_data->m_paramDesc.Last();
-
-        wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE),
-                      wxT("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );
-
-        if ( !(flags & wxCMD_LINE_PARAM_OPTIONAL) )
-        {
-            wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL),
-                          wxT("a required parameter can't follow an optional one") );
-        }
-    }
-#endif // wxDEBUG_LEVEL
-
-    wxCmdLineParam *param = new wxCmdLineParam(desc, type, flags);
-
-    m_data->m_paramDesc.Add(param);
-}
-
-void wxCmdLineParser::AddUsageText(const wxString& text)
-{
-    wxASSERT_MSG( !text.empty(), wxT("text can't be empty") );
-
-    wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_USAGE_TEXT,
-                                                  wxEmptyString, wxEmptyString,
-                                                  text, wxCMD_LINE_VAL_NONE, 0);
-
-    m_data->m_options.Add(option);
-}
-
-// ----------------------------------------------------------------------------
-// access to parse command line
-// ----------------------------------------------------------------------------
-
-bool wxCmdLineParser::Found(const wxString& name) const
-{
-    return FoundSwitch(name) != wxCMD_SWITCH_NOT_FOUND;
-}
-
-wxCmdLineSwitchState wxCmdLineParser::FoundSwitch(const wxString& name) const
-{
-    int i = m_data->FindOption(name);
-    if ( i == wxNOT_FOUND )
-        i = m_data->FindOptionByLongName(name);
-
-    wxCHECK_MSG( i != wxNOT_FOUND, wxCMD_SWITCH_NOT_FOUND, wxT("unknown switch") );
-
-    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
-    if ( !opt.HasValue() )
-        return wxCMD_SWITCH_NOT_FOUND;
-
-    return opt.IsNegated() ? wxCMD_SWITCH_OFF : wxCMD_SWITCH_ON;
-}
-
-bool wxCmdLineParser::Found(const wxString& name, wxString *value) const
-{
-    int i = m_data->FindOption(name);
-    if ( i == wxNOT_FOUND )
-        i = m_data->FindOptionByLongName(name);
-
-    wxCHECK_MSG( i != wxNOT_FOUND, false, wxT("unknown option") );
-
-    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
-    if ( !opt.HasValue() )
-        return false;
-
-    wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") );
-
-    *value = opt.GetStrVal();
-
-    return true;
-}
-
-bool wxCmdLineParser::Found(const wxString& name, long *value) const
-{
-    int i = m_data->FindOption(name);
-    if ( i == wxNOT_FOUND )
-        i = m_data->FindOptionByLongName(name);
-
-    wxCHECK_MSG( i != wxNOT_FOUND, false, wxT("unknown option") );
-
-    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
-    if ( !opt.HasValue() )
-        return false;
-
-    wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") );
-
-    *value = opt.GetLongVal();
-
-    return true;
-}
-
-bool wxCmdLineParser::Found(const wxString& name, double *value) const
-{
-    int i = m_data->FindOption(name);
-    if ( i == wxNOT_FOUND )
-        i = m_data->FindOptionByLongName(name);
-
-    wxCHECK_MSG( i != wxNOT_FOUND, false, wxT("unknown option") );
-
-    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
-    if ( !opt.HasValue() )
-        return false;
-
-    wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") );
-
-    *value = opt.GetDoubleVal();
-
-    return true;
-}
-
-#if wxUSE_DATETIME
-bool wxCmdLineParser::Found(const wxString& name, wxDateTime *value) const
-{
-    int i = m_data->FindOption(name);
-    if ( i == wxNOT_FOUND )
-        i = m_data->FindOptionByLongName(name);
-
-    wxCHECK_MSG( i != wxNOT_FOUND, false, wxT("unknown option") );
-
-    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
-    if ( !opt.HasValue() )
-        return false;
-
-    wxCHECK_MSG( value, false, wxT("NULL pointer in wxCmdLineOption::Found") );
-
-    *value = opt.GetDateVal();
-
-    return true;
-}
-#endif // wxUSE_DATETIME
-
-size_t wxCmdLineParser::GetParamCount() const
-{
-    return m_data->m_parameters.size();
-}
-
-wxString wxCmdLineParser::GetParam(size_t n) const
-{
-    wxCHECK_MSG( n < GetParamCount(), wxEmptyString, wxT("invalid param index") );
-
-    return m_data->m_parameters[n];
-}
-
-// Resets switches and options
-void wxCmdLineParser::Reset()
-{
-    for ( size_t i = 0; i < m_data->m_options.GetCount(); i++ )
-    {
-        m_data->m_options[i].Reset();
-    }
-}
-
-
-// ----------------------------------------------------------------------------
-// the real work is done here
-// ----------------------------------------------------------------------------
-
-int wxCmdLineParser::Parse(bool showUsage)
-{
-    bool maybeOption = true;    // can the following arg be an option?
-    bool ok = true;             // true until an error is detected
-    bool helpRequested = false; // true if "-h" was given
-    bool hadRepeatableParam = false; // true if found param with MULTIPLE flag
-
-    size_t currentParam = 0;    // the index in m_paramDesc
-
-    size_t countParam = m_data->m_paramDesc.GetCount();
-    wxString errorMsg;
-
-    Reset();
-
-    // parse everything
-    wxString arg;
-    size_t count = m_data->m_arguments.size();
-    for ( size_t n = 1; ok && (n < count); n++ )    // 0 is program name
-    {
-        arg = m_data->m_arguments[n];
-
-        // special case: "--" should be discarded and all following arguments
-        // should be considered as parameters, even if they start with '-' and
-        // not like options (this is POSIX-like)
-        if ( arg == wxT("--") )
-        {
-            maybeOption = false;
-
-            continue;
-        }
-
-        // empty argument or just '-' is not an option but a parameter
-        if ( maybeOption && arg.length() > 1 &&
-                // FIXME-UTF8: use wc_str() after removing ANSI build
-                wxStrchr(m_data->m_switchChars.c_str(), arg[0u]) )
-        {
-            bool isLong;
-            wxString name;
-            int optInd = wxNOT_FOUND;   // init to suppress warnings
-
-            // an option or a switch: find whether it's a long or a short one
-            if ( arg.length() >= 3 && arg[0u] == wxT('-') && arg[1u] == wxT('-') )
-            {
-                // a long one
-                isLong = true;
-
-                // Skip leading "--"
-                wxString::const_iterator p = arg.begin() + 2;
-
-                bool longOptionsEnabled = AreLongOptionsEnabled();
-
-                name = GetLongOptionName(p, arg.end());
-
-                if (longOptionsEnabled)
-                {
-                    wxString errorOpt;
-
-                    optInd = m_data->FindOptionByLongName(name);
-                    if ( optInd == wxNOT_FOUND )
-                    {
-                        // Check if this could be a negatable long option.
-                        if ( name.Last() == '-' )
-                        {
-                            name.RemoveLast();
-
-                            optInd = m_data->FindOptionByLongName(name);
-                            if ( optInd != wxNOT_FOUND )
-                            {
-                                if ( !(m_data->m_options[optInd].flags &
-                                        wxCMD_LINE_SWITCH_NEGATABLE) )
-                                {
-                                    errorOpt.Printf
-                                             (
-                                              _("Option '%s' can't be negated"),
-                                              name
-                                             );
-                                    optInd = wxNOT_FOUND;
-                                }
-                            }
-                        }
-
-                        if ( optInd == wxNOT_FOUND )
-                        {
-                            if ( errorOpt.empty() )
-                            {
-                                errorOpt.Printf
-                                         (
-                                          _("Unknown long option '%s'"),
-                                          name
-                                         );
-                            }
-
-                            errorMsg << errorOpt << wxT('\n');
-                        }
-                    }
-                }
-                else
-                {
-                    optInd = wxNOT_FOUND; // Sanity check
-
-                    // Print the argument including leading "--"
-                    name.Prepend( wxT("--") );
-                    errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
-                             << wxT('\n');
-                }
-
-            }
-            else // not a long option
-            {
-                isLong = false;
-
-                // a short one: as they can be cumulated, we try to find the
-                // longest substring which is a valid option
-                wxString::const_iterator p = arg.begin() + 1;
-
-                name = GetShortOptionName(p, arg.end());
-
-                size_t len = name.length();
-                do
-                {
-                    if ( len == 0 )
-                    {
-                        // we couldn't find a valid option name in the
-                        // beginning of this string
-                        errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
-                                 << wxT('\n');
-
-                        break;
-                    }
-                    else
-                    {
-                        optInd = m_data->FindOption(name.Left(len));
-
-                        // will try with one character less the next time
-                        len--;
-                    }
-                }
-                while ( optInd == wxNOT_FOUND );
-
-                len++;  // compensates extra len-- above
-                if ( (optInd != wxNOT_FOUND) && (len != name.length()) )
-                {
-                    // first of all, the option name is only part of this
-                    // string
-                    name = name.Left(len);
-
-                    // our option is only part of this argument, there is
-                    // something else in it - it is either the value of this
-                    // option or other switches if it is a switch
-                    if ( m_data->m_options[(size_t)optInd].kind
-                            == wxCMD_LINE_SWITCH )
-                    {
-                        // if the switch is negatable and it is just followed
-                        // by '-' the '-' is considered to be part of this
-                        // switch
-                        if ( (m_data->m_options[(size_t)optInd].flags &
-                                    wxCMD_LINE_SWITCH_NEGATABLE) &&
-                                arg[len] == '-' )
-                            ++len;
-
-                        // pretend that all the rest of the argument is the
-                        // next argument, in fact
-                        wxString arg2 = arg[0u];
-                        arg2 += arg.Mid(len + 1); // +1 for leading '-'
-
-                        m_data->m_arguments.insert
-                            (m_data->m_arguments.begin() + n + 1, arg2);
-                        count++;
-
-                        // only leave the part which wasn't extracted into the
-                        // next argument in this one
-                        arg = arg.Left(len + 1);
-                    }
-                    //else: it's our value, we'll deal with it below
-                }
-            }
-
-            if ( optInd == wxNOT_FOUND )
-            {
-                ok = false;
-
-                continue;   // will break, in fact
-            }
-
-            // look at what follows:
-
-            // +1 for leading '-'
-            wxString::const_iterator p = arg.begin() + 1 + name.length();
-            wxString::const_iterator end = arg.end();
-
-            if ( isLong )
-                ++p;    // for another leading '-'
-
-            wxCmdLineOption& opt = m_data->m_options[(size_t)optInd];
-            if ( opt.kind == wxCMD_LINE_SWITCH )
-            {
-                // we must check that there is no value following the switch
-                bool negated = (opt.flags & wxCMD_LINE_SWITCH_NEGATABLE) &&
-                                    p != arg.end() && *p == '-';
-
-                if ( !negated && p != arg.end() )
-                {
-                    errorMsg << wxString::Format(_("Unexpected characters following option '%s'."), name.c_str())
-                             << wxT('\n');
-                    ok = false;
-                }
-                else // no value, as expected
-                {
-                    // nothing more to do
-                    opt.SetHasValue();
-                    if ( negated )
-                        opt.SetNegated();
-
-                    if ( opt.flags & wxCMD_LINE_OPTION_HELP )
-                    {
-                        helpRequested = true;
-
-                        // it's not an error, but we still stop here
-                        ok = false;
-                    }
-                }
-            }
-            else // it's an option. not a switch
-            {
-                switch ( p == end ? '\0' : (*p).GetValue() )
-                {
-                    case '=':
-                    case ':':
-                        // the value follows
-                        ++p;
-                        break;
-
-                    case '\0':
-                        // the value is in the next argument
-                        if ( ++n == count )
-                        {
-                            // ... but there is none
-                            errorMsg << wxString::Format(_("Option '%s' requires a value."),
-                                                         name.c_str())
-                                     << wxT('\n');
-
-                            ok = false;
-                        }
-                        else
-                        {
-                            // ... take it from there
-                            p = m_data->m_arguments[n].begin();
-                            end = m_data->m_arguments[n].end();
-                        }
-                        break;
-
-                    default:
-                        // the value is right here: this may be legal or
-                        // not depending on the option style
-                        if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
-                        {
-                            errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
-                                                         name.c_str())
-                                    << wxT('\n');
-
-                            ok = false;
-                        }
-                }
-
-                if ( ok )
-                {
-                    wxString value(p, end);
-                    switch ( opt.type )
-                    {
-                        default:
-                            wxFAIL_MSG( wxT("unknown option type") );
-                            // still fall through
-
-                        case wxCMD_LINE_VAL_STRING:
-                            opt.SetStrVal(value);
-                            break;
-
-                        case wxCMD_LINE_VAL_NUMBER:
-                            {
-                                long val;
-                                if ( value.ToLong(&val) )
-                                {
-                                    opt.SetLongVal(val);
-                                }
-                                else
-                                {
-                                    errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
-                                                                 value.c_str(), name.c_str())
-                                             << wxT('\n');
-
-                                    ok = false;
-                                }
-                            }
-                            break;
-
-                        case wxCMD_LINE_VAL_DOUBLE:
-                            {
-                                double val;
-                                if ( value.ToDouble(&val) )
-                                {
-                                    opt.SetDoubleVal(val);
-                                }
-                                else
-                                {
-                                    errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
-                                                                 value.c_str(), name.c_str())
-                                             << wxT('\n');
-
-                                    ok = false;
-                                }
-                            }
-                            break;
-
-#if wxUSE_DATETIME
-                        case wxCMD_LINE_VAL_DATE:
-                            {
-                                wxDateTime dt;
-                                wxString::const_iterator end;
-                                if ( !dt.ParseDate(value, &end) || end != value.end() )
-                                {
-                                    errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
-                                                                 name.c_str(), value.c_str())
-                                             << wxT('\n');
-
-                                    ok = false;
-                                }
-                                else
-                                {
-                                    opt.SetDateVal(dt);
-                                }
-                            }
-                            break;
-#endif // wxUSE_DATETIME
-                    }
-                }
-            }
-        }
-        else // not an option, must be a parameter
-        {
-            if ( currentParam < countParam )
-            {
-                wxCmdLineParam& param = m_data->m_paramDesc[currentParam];
-
-                // TODO check the param type
-
-                m_data->m_parameters.push_back(arg);
-
-                if ( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE) )
-                {
-                    currentParam++;
-                }
-                else
-                {
-                    wxASSERT_MSG( currentParam == countParam - 1,
-                                  wxT("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
-
-                    // remember that we did have this last repeatable parameter
-                    hadRepeatableParam = true;
-                }
-            }
-            else
-            {
-                errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str())
-                         << wxT('\n');
-
-                ok = false;
-            }
-        }
-    }
-
-    // verify that all mandatory options were given
-    if ( ok )
-    {
-        size_t countOpt = m_data->m_options.GetCount();
-        for ( size_t n = 0; ok && (n < countOpt); n++ )
-        {
-            wxCmdLineOption& opt = m_data->m_options[n];
-            if ( (opt.flags & wxCMD_LINE_OPTION_MANDATORY) && !opt.HasValue() )
-            {
-                wxString optName;
-                if ( !opt.longName )
-                {
-                    optName = opt.shortName;
-                }
-                else
-                {
-                    if ( AreLongOptionsEnabled() )
-                    {
-                        optName.Printf( _("%s (or %s)"),
-                                        opt.shortName.c_str(),
-                                        opt.longName.c_str() );
-                    }
-                    else
-                    {
-                        optName.Printf( wxT("%s"),
-                                        opt.shortName.c_str() );
-                    }
-                }
-
-                errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
-                                             optName.c_str())
-                         << wxT('\n');
-
-                ok = false;
-            }
-        }
-
-        for ( ; ok && (currentParam < countParam); currentParam++ )
-        {
-            wxCmdLineParam& param = m_data->m_paramDesc[currentParam];
-            if ( (currentParam == countParam - 1) &&
-                 (param.flags & wxCMD_LINE_PARAM_MULTIPLE) &&
-                 hadRepeatableParam )
-            {
-                // special case: currentParam wasn't incremented, but we did
-                // have it, so don't give error
-                continue;
-            }
-
-            if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) )
-            {
-                errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
-                                             param.description.c_str())
-                         << wxT('\n');
-
-                ok = false;
-            }
-        }
-    }
-
-    // if there was an error during parsing the command line, show this error
-    // and also the usage message if it had been requested
-    if ( !ok && (!errorMsg.empty() || (helpRequested && showUsage)) )
-    {
-        wxMessageOutput* msgOut = wxMessageOutput::Get();
-        if ( msgOut )
-        {
-            wxString usage;
-            if ( showUsage )
-                usage = GetUsageString();
-
-            msgOut->Printf( wxT("%s%s"), usage.c_str(), errorMsg.c_str() );
-        }
-        else
-        {
-            wxFAIL_MSG( wxT("no wxMessageOutput object?") );
-        }
-    }
-
-    return ok ? 0 : helpRequested ? -1 : 1;
-}
-
-// ----------------------------------------------------------------------------
-// give the usage message
-// ----------------------------------------------------------------------------
-
-void wxCmdLineParser::Usage() const
-{
-    wxMessageOutput* msgOut = wxMessageOutput::Get();
-    if ( msgOut )
-    {
-        msgOut->Printf( wxT("%s"), GetUsageString().c_str() );
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("no wxMessageOutput object?") );
-    }
-}
-
-wxString wxCmdLineParser::GetUsageString() const
-{
-    wxString appname;
-    if ( m_data->m_arguments.empty() )
-    {
-        if ( wxTheApp )
-            appname = wxTheApp->GetAppName();
-    }
-    else // use argv[0]
-    {
-        appname = wxFileName(m_data->m_arguments[0]).GetName();
-    }
-
-    // we construct the brief cmd line desc on the fly, but not the detailed
-    // help message below because we want to align the options descriptions
-    // and for this we must first know the longest one of them
-    wxString usage;
-    wxArrayString namesOptions, descOptions;
-
-    if ( !m_data->m_logo.empty() )
-    {
-        usage << m_data->m_logo << wxT('\n');
-    }
-
-    usage << wxString::Format(_("Usage: %s"), appname.c_str());
-
-    // the switch char is usually '-' but this can be changed with
-    // SetSwitchChars() and then the first one of possible chars is used
-    wxChar chSwitch = !m_data->m_switchChars ? wxT('-')
-                                             : m_data->m_switchChars[0u];
-
-    bool areLongOptionsEnabled = AreLongOptionsEnabled();
-    size_t n, count = m_data->m_options.GetCount();
-    for ( n = 0; n < count; n++ )
-    {
-        wxCmdLineOption& opt = m_data->m_options[n];
-        wxString option, negator;
-
-        if ( opt.kind != wxCMD_LINE_USAGE_TEXT )
-        {
-            usage << wxT(' ');
-            if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
-            {
-                usage << wxT('[');
-            }
-
-            if ( opt.flags & wxCMD_LINE_SWITCH_NEGATABLE )
-                negator = wxT("[-]");
-
-            if ( !opt.shortName.empty() )
-            {
-                usage << chSwitch << opt.shortName << negator;
-            }
-            else if ( areLongOptionsEnabled && !opt.longName.empty() )
-            {
-                usage << wxT("--") << opt.longName << negator;
-            }
-            else
-            {
-                if (!opt.longName.empty())
-                {
-                    wxFAIL_MSG( wxT("option with only a long name while long ")
-                                wxT("options are disabled") );
-                }
-                else
-                {
-                    wxFAIL_MSG( wxT("option without neither short nor long name") );
-                }
-            }
-
-            if ( !opt.shortName.empty() )
-            {
-                option << wxT("  ") << chSwitch << opt.shortName;
-            }
-
-            if ( areLongOptionsEnabled && !opt.longName.empty() )
-            {
-                option << (option.empty() ? wxT("  ") : wxT(", "))
-                       << wxT("--") << opt.longName;
-            }
-
-            if ( opt.kind != wxCMD_LINE_SWITCH )
-            {
-                wxString val;
-                val << wxT('<') << GetTypeName(opt.type) << wxT('>');
-                usage << wxT(' ') << val;
-                option << (!opt.longName ? wxT(':') : wxT('=')) << val;
-            }
-
-            if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
-            {
-                usage << wxT(']');
-            }
-        }
-
-        namesOptions.push_back(option);
-        descOptions.push_back(opt.description);
-    }
-
-    count = m_data->m_paramDesc.GetCount();
-    for ( n = 0; n < count; n++ )
-    {
-        wxCmdLineParam& param = m_data->m_paramDesc[n];
-
-        usage << wxT(' ');
-        if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
-        {
-            usage << wxT('[');
-        }
-
-        usage << param.description;
-
-        if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE )
-        {
-            usage << wxT("...");
-        }
-
-        if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
-        {
-            usage << wxT(']');
-        }
-    }
-
-    usage << wxT('\n');
-
-    // set to number of our own options, not counting the standard ones
-    count = namesOptions.size();
-
-    // get option names & descriptions for standard options, if any:
-    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    wxString stdDesc;
-    if ( traits )
-        stdDesc = traits->GetStandardCmdLineOptions(namesOptions, descOptions);
-
-    // now construct the detailed help message
-    size_t len, lenMax = 0;
-    for ( n = 0; n < namesOptions.size(); n++ )
-    {
-        len = namesOptions[n].length();
-        if ( len > lenMax )
-            lenMax = len;
-    }
-
-    for ( n = 0; n < namesOptions.size(); n++ )
-    {
-        if ( n == count )
-            usage << wxT('\n') << stdDesc;
-
-        len = namesOptions[n].length();
-        // desc contains text if name is empty
-        if (len == 0)
-        {
-            usage << descOptions[n] << wxT('\n');
-        }
-        else
-        {
-            usage << namesOptions[n]
-                  << wxString(wxT(' '), lenMax - len) << wxT('\t')
-                  << descOptions[n]
-                  << wxT('\n');
-        }
-    }
-
-    return usage;
-}
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-static wxString GetTypeName(wxCmdLineParamType type)
-{
-    wxString s;
-    switch ( type )
-    {
-        default:
-            wxFAIL_MSG( wxT("unknown option type") );
-            // still fall through
-
-        case wxCMD_LINE_VAL_STRING:
-            s = _("str");
-            break;
-
-        case wxCMD_LINE_VAL_NUMBER:
-            s = _("num");
-            break;
-
-        case wxCMD_LINE_VAL_DOUBLE:
-            s = _("double");
-            break;
-
-        case wxCMD_LINE_VAL_DATE:
-            s = _("date");
-            break;
-    }
-
-    return s;
-}
-
-/*
-Returns a string which is equal to the string pointed to by p, but up to the
-point where p contains an character that's not allowed.
-Allowable characters are letters and numbers, and characters pointed to by
-the parameter allowedChars.
-
-For example, if p points to "abcde-@-_", and allowedChars is "-_",
-this function returns "abcde-".
-*/
-static wxString GetOptionName(wxString::const_iterator p,
-                              wxString::const_iterator end,
-                              const wxChar *allowedChars)
-{
-    wxString argName;
-
-    while ( p != end && (wxIsalnum(*p) || wxStrchr(allowedChars, *p)) )
-    {
-        argName += *p++;
-    }
-
-    return argName;
-}
-
-// Besides alphanumeric characters, short and long options can
-// have other characters.
-
-// A short option additionally can have these
-#define wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("_?")
-
-// A long option can have the same characters as a short option and a '-'.
-#define wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION \
-    wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("-")
-
-static wxString GetShortOptionName(wxString::const_iterator p,
-                                  wxString::const_iterator end)
-{
-    return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION);
-}
-
-static wxString GetLongOptionName(wxString::const_iterator p,
-                                  wxString::const_iterator end)
-{
-    return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION);
-}
-
-#endif // wxUSE_CMDLINE_PARSER
-
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-/*
-   This function is mainly used under Windows (as under Unix we always get the
-   command line arguments as argc/argv anyhow) and so it tries to follow
-   Windows conventions for the command line handling, not Unix ones. For
-   instance, backslash is not special except when it precedes double quote when
-   it does quote it.
- */
-
-/* static */
-wxArrayString
-wxCmdLineParser::ConvertStringToArgs(const wxString& cmdline,
-                                     wxCmdLineSplitType type)
-{
-    wxArrayString args;
-
-    wxString arg;
-    arg.reserve(1024);
-
-    const wxString::const_iterator end = cmdline.end();
-    wxString::const_iterator p = cmdline.begin();
-
-    for ( ;; )
-    {
-        // skip white space
-        while ( p != end && (*p == ' ' || *p == '\t') )
-            ++p;
-
-        // anything left?
-        if ( p == end )
-            break;
-
-        // parse this parameter
-        bool lastBS = false,
-             isInsideQuotes = false;
-        wxChar chDelim = '\0';
-        for ( arg.clear(); p != end; ++p )
-        {
-            const wxChar ch = *p;
-
-            if ( type == wxCMD_LINE_SPLIT_DOS )
-            {
-                if ( ch == '"' )
-                {
-                    if ( !lastBS )
-                    {
-                        isInsideQuotes = !isInsideQuotes;
-
-                        // don't put quote in arg
-                        continue;
-                    }
-                    //else: quote has no special meaning but the backslash
-                    //      still remains -- makes no sense but this is what
-                    //      Windows does
-                }
-                // note that backslash does *not* quote the space, only quotes do
-                else if ( !isInsideQuotes && (ch == ' ' || ch == '\t') )
-                {
-                    ++p;    // skip this space anyhow
-                    break;
-                }
-
-                lastBS = !lastBS && ch == '\\';
-            }
-            else // type == wxCMD_LINE_SPLIT_UNIX
-            {
-                if ( !lastBS )
-                {
-                    if ( isInsideQuotes )
-                    {
-                        if ( ch == chDelim )
-                        {
-                            isInsideQuotes = false;
-
-                            continue;   // don't use the quote itself
-                        }
-                    }
-                    else // not in quotes and not escaped
-                    {
-                        if ( ch == '\'' || ch == '"' )
-                        {
-                            isInsideQuotes = true;
-                            chDelim = ch;
-
-                            continue;   // don't use the quote itself
-                        }
-
-                        if ( ch == ' ' || ch == '\t' )
-                        {
-                            ++p;    // skip this space anyhow
-                            break;
-                        }
-                    }
-
-                    lastBS = ch == '\\';
-                    if ( lastBS )
-                        continue;
-                }
-                else // escaped by backslash, just use as is
-                {
-                    lastBS = false;
-                }
-            }
-
-            arg += ch;
-        }
-
-        args.push_back(arg);
-    }
-
-    return args;
-}
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/cmdline.cpp
+// Purpose:     wxCmdLineParser implementation
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     05.01.00
+// RCS-ID:      $Id: cmdline.cpp 66920 2011-02-16 22:00:30Z JS $
+// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/app.h"
+#endif //WX_PRECOMP
+
+#include "wx/cmdline.h"
+
+#if wxUSE_CMDLINE_PARSER
+
+#include <ctype.h>
+
+#include "wx/datetime.h"
+#include "wx/msgout.h"
+#include "wx/filename.h"
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static wxString GetTypeName(wxCmdLineParamType type);
+
+static wxString GetOptionName(const wxChar *p, const wxChar *allowedChars);
+
+static wxString GetShortOptionName(const wxChar *p);
+
+static wxString GetLongOptionName(const wxChar *p);
+
+// ----------------------------------------------------------------------------
+// private structs
+// ----------------------------------------------------------------------------
+
+// an internal representation of an option
+struct wxCmdLineOption
+{
+    wxCmdLineOption(wxCmdLineEntryType k,
+                    const wxString& shrt,
+                    const wxString& lng,
+                    const wxString& desc,
+                    wxCmdLineParamType typ,
+                    int fl)
+    {
+        wxASSERT_MSG( !shrt.empty() || !lng.empty(),
+                      _T("option should have at least one name") );
+
+        wxASSERT_MSG
+            (
+                GetShortOptionName(shrt).Len() == shrt.Len(),
+                wxT("Short option contains invalid characters")
+            );
+
+        wxASSERT_MSG
+            (
+                GetLongOptionName(lng).Len() == lng.Len(),
+                wxT("Long option contains invalid characters")
+            );
+
+
+        kind = k;
+
+        shortName = shrt;
+        longName = lng;
+        description = desc;
+
+        type = typ;
+        flags = fl;
+
+        m_hasVal = false;
+    }
+
+    // can't use union easily here, so just store all possible data fields, we
+    // don't waste much (might still use union later if the number of supported
+    // types increases, so always use the accessor functions and don't access
+    // the fields directly!)
+
+    void Check(wxCmdLineParamType WXUNUSED_UNLESS_DEBUG(typ)) const
+    {
+        wxASSERT_MSG( type == typ, _T("type mismatch in wxCmdLineOption") );
+    }
+
+    long GetLongVal() const
+        { Check(wxCMD_LINE_VAL_NUMBER); return m_longVal; }
+    const wxString& GetStrVal() const
+        { Check(wxCMD_LINE_VAL_STRING); return m_strVal;  }
+#if wxUSE_DATETIME
+    const wxDateTime& GetDateVal() const
+        { Check(wxCMD_LINE_VAL_DATE);   return m_dateVal; }
+#endif // wxUSE_DATETIME
+
+    void SetLongVal(long val)
+        { Check(wxCMD_LINE_VAL_NUMBER); m_longVal = val; m_hasVal = true; }
+    void SetStrVal(const wxString& val)
+        { Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = true; }
+#if wxUSE_DATETIME
+    void SetDateVal(const wxDateTime& val)
+        { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; }
+#endif // wxUSE_DATETIME
+
+    void SetHasValue(bool hasValue = true) { m_hasVal = hasValue; }
+    bool HasValue() const { return m_hasVal; }
+
+public:
+    wxCmdLineEntryType kind;
+    wxString shortName,
+             longName,
+             description;
+    wxCmdLineParamType type;
+    int flags;
+
+private:
+    bool m_hasVal;
+
+    long m_longVal;
+    wxString m_strVal;
+#if wxUSE_DATETIME
+    wxDateTime m_dateVal;
+#endif // wxUSE_DATETIME
+};
+
+struct wxCmdLineParam
+{
+    wxCmdLineParam(const wxString& desc,
+                   wxCmdLineParamType typ,
+                   int fl)
+        : description(desc)
+    {
+        type = typ;
+        flags = fl;
+    }
+
+    wxString description;
+    wxCmdLineParamType type;
+    int flags;
+};
+
+WX_DECLARE_OBJARRAY(wxCmdLineOption, wxArrayOptions);
+WX_DECLARE_OBJARRAY(wxCmdLineParam, wxArrayParams);
+
+#include "wx/arrimpl.cpp"
+
+WX_DEFINE_OBJARRAY(wxArrayOptions)
+WX_DEFINE_OBJARRAY(wxArrayParams)
+
+// the parser internal state
+struct wxCmdLineParserData
+{
+    // options
+    wxString m_switchChars;     // characters which may start an option
+    bool m_enableLongOptions;   // true if long options are enabled
+    wxString m_logo;            // some extra text to show in Usage()
+
+    // cmd line data
+    wxArrayString m_arguments;  // == argv, argc == m_arguments.GetCount()
+    wxArrayOptions m_options;   // all possible options and switchrs
+    wxArrayParams m_paramDesc;  // description of all possible params
+    wxArrayString m_parameters; // all params found
+
+    // methods
+    wxCmdLineParserData();
+    void SetArguments(int argc, char **argv);
+#if wxUSE_UNICODE
+    void SetArguments(int argc, wxChar **argv);
+#endif // wxUSE_UNICODE
+    void SetArguments(const wxString& cmdline);
+
+    int FindOption(const wxString& name);
+    int FindOptionByLongName(const wxString& name);
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxCmdLineParserData
+// ----------------------------------------------------------------------------
+
+wxCmdLineParserData::wxCmdLineParserData()
+{
+    m_enableLongOptions = true;
+#ifdef __UNIX_LIKE__
+    m_switchChars = _T("-");
+#else // !Unix
+    m_switchChars = _T("/-");
+#endif
+}
+
+void wxCmdLineParserData::SetArguments(int argc, char **argv)
+{
+    m_arguments.clear();
+
+    for ( int n = 0; n < argc; n++ )
+    {
+        m_arguments.push_back(wxString::FromAscii(argv[n]));
+    }
+}
+
+#if wxUSE_UNICODE
+
+void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
+{
+    m_arguments.clear();
+
+    for ( int n = 0; n < argc; n++ )
+    {
+        m_arguments.push_back(argv[n]);
+    }
+}
+
+#endif // wxUSE_UNICODE
+
+void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
+{
+    m_arguments.clear();
+
+    if(wxTheApp && wxTheApp->argc > 0)
+        m_arguments.push_back(wxTheApp->argv[0]);
+    else
+        m_arguments.push_back(wxEmptyString);
+
+    wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
+
+    WX_APPEND_ARRAY(m_arguments, args);
+}
+
+int wxCmdLineParserData::FindOption(const wxString& name)
+{
+    if ( !name.empty() )
+    {
+        size_t count = m_options.GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            if ( m_options[n].shortName == name )
+            {
+                // found
+                return n;
+            }
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+int wxCmdLineParserData::FindOptionByLongName(const wxString& name)
+{
+    size_t count = m_options.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if ( m_options[n].longName == name )
+        {
+            // found
+            return n;
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+// ----------------------------------------------------------------------------
+// construction and destruction
+// ----------------------------------------------------------------------------
+
+void wxCmdLineParser::Init()
+{
+    m_data = new wxCmdLineParserData;
+}
+
+void wxCmdLineParser::SetCmdLine(int argc, char **argv)
+{
+    m_data->SetArguments(argc, argv);
+}
+
+#if wxUSE_UNICODE
+
+void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
+{
+    m_data->SetArguments(argc, argv);
+}
+
+#endif // wxUSE_UNICODE
+
+void wxCmdLineParser::SetCmdLine(const wxString& cmdline)
+{
+    m_data->SetArguments(cmdline);
+}
+
+wxCmdLineParser::~wxCmdLineParser()
+{
+    delete m_data;
+}
+
+// ----------------------------------------------------------------------------
+// options
+// ----------------------------------------------------------------------------
+
+void wxCmdLineParser::SetSwitchChars(const wxString& switchChars)
+{
+    m_data->m_switchChars = switchChars;
+}
+
+void wxCmdLineParser::EnableLongOptions(bool enable)
+{
+    m_data->m_enableLongOptions = enable;
+}
+
+bool wxCmdLineParser::AreLongOptionsEnabled()
+{
+    return m_data->m_enableLongOptions;
+}
+
+void wxCmdLineParser::SetLogo(const wxString& logo)
+{
+    m_data->m_logo = logo;
+}
+
+// ----------------------------------------------------------------------------
+// command line construction
+// ----------------------------------------------------------------------------
+
+void wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc *desc)
+{
+    for ( ;; desc++ )
+    {
+        switch ( desc->kind )
+        {
+            case wxCMD_LINE_SWITCH:
+                AddSwitch(desc->shortName, desc->longName, desc->description,
+                          desc->flags);
+                break;
+
+            case wxCMD_LINE_OPTION:
+                AddOption(desc->shortName, desc->longName, desc->description,
+                          desc->type, desc->flags);
+                break;
+
+            case wxCMD_LINE_PARAM:
+                AddParam(desc->description, desc->type, desc->flags);
+                break;
+
+            default:
+                wxFAIL_MSG( _T("unknown command line entry type") );
+                // still fall through
+
+            case wxCMD_LINE_NONE:
+                return;
+        }
+    }
+}
+
+void wxCmdLineParser::AddSwitch(const wxString& shortName,
+                                const wxString& longName,
+                                const wxString& desc,
+                                int flags)
+{
+    wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
+                  _T("duplicate switch") );
+
+    wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_SWITCH,
+                                                  shortName, longName, desc,
+                                                  wxCMD_LINE_VAL_NONE, flags);
+
+    m_data->m_options.Add(option);
+}
+
+void wxCmdLineParser::AddOption(const wxString& shortName,
+                                const wxString& longName,
+                                const wxString& desc,
+                                wxCmdLineParamType type,
+                                int flags)
+{
+    wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
+                  _T("duplicate option") );
+
+    wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_OPTION,
+                                                  shortName, longName, desc,
+                                                  type, flags);
+
+    m_data->m_options.Add(option);
+}
+
+void wxCmdLineParser::AddParam(const wxString& desc,
+                               wxCmdLineParamType type,
+                               int flags)
+{
+    // do some consistency checks: a required parameter can't follow an
+    // optional one and nothing should follow a parameter with MULTIPLE flag
+#ifdef __WXDEBUG__
+    if ( !m_data->m_paramDesc.IsEmpty() )
+    {
+        wxCmdLineParam& param = m_data->m_paramDesc.Last();
+
+        wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE),
+                      _T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );
+
+        if ( !(flags & wxCMD_LINE_PARAM_OPTIONAL) )
+        {
+            wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL),
+                          _T("a required parameter can't follow an optional one") );
+        }
+    }
+#endif // Debug
+
+    wxCmdLineParam *param = new wxCmdLineParam(desc, type, flags);
+
+    m_data->m_paramDesc.Add(param);
+}
+
+// ----------------------------------------------------------------------------
+// access to parse command line
+// ----------------------------------------------------------------------------
+
+bool wxCmdLineParser::Found(const wxString& name) const
+{
+    int i = m_data->FindOption(name);
+    if ( i == wxNOT_FOUND )
+        i = m_data->FindOptionByLongName(name);
+
+    wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown switch") );
+
+    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
+    if ( !opt.HasValue() )
+        return false;
+
+    return true;
+}
+
+bool wxCmdLineParser::Found(const wxString& name, wxString *value) const
+{
+    int i = m_data->FindOption(name);
+    if ( i == wxNOT_FOUND )
+        i = m_data->FindOptionByLongName(name);
+
+    wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
+
+    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
+    if ( !opt.HasValue() )
+        return false;
+
+    wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );
+
+    *value = opt.GetStrVal();
+
+    return true;
+}
+
+bool wxCmdLineParser::Found(const wxString& name, long *value) const
+{
+    int i = m_data->FindOption(name);
+    if ( i == wxNOT_FOUND )
+        i = m_data->FindOptionByLongName(name);
+
+    wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
+
+    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
+    if ( !opt.HasValue() )
+        return false;
+
+    wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );
+
+    *value = opt.GetLongVal();
+
+    return true;
+}
+
+#if wxUSE_DATETIME
+bool wxCmdLineParser::Found(const wxString& name, wxDateTime *value) const
+{
+    int i = m_data->FindOption(name);
+    if ( i == wxNOT_FOUND )
+        i = m_data->FindOptionByLongName(name);
+
+    wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
+
+    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
+    if ( !opt.HasValue() )
+        return false;
+
+    wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );
+
+    *value = opt.GetDateVal();
+
+    return true;
+}
+#endif // wxUSE_DATETIME
+
+size_t wxCmdLineParser::GetParamCount() const
+{
+    return m_data->m_parameters.size();
+}
+
+wxString wxCmdLineParser::GetParam(size_t n) const
+{
+    wxCHECK_MSG( n < GetParamCount(), wxEmptyString, _T("invalid param index") );
+
+    return m_data->m_parameters[n];
+}
+
+// Resets switches and options
+void wxCmdLineParser::Reset()
+{
+    for ( size_t i = 0; i < m_data->m_options.Count(); i++ )
+    {
+        wxCmdLineOption& opt = m_data->m_options[i];
+        opt.SetHasValue(false);
+    }
+}
+
+
+// ----------------------------------------------------------------------------
+// the real work is done here
+// ----------------------------------------------------------------------------
+
+int wxCmdLineParser::Parse(bool showUsage)
+{
+    bool maybeOption = true;    // can the following arg be an option?
+    bool ok = true;             // true until an error is detected
+    bool helpRequested = false; // true if "-h" was given
+    bool hadRepeatableParam = false; // true if found param with MULTIPLE flag
+
+    size_t currentParam = 0;    // the index in m_paramDesc
+
+    size_t countParam = m_data->m_paramDesc.GetCount();
+    wxString errorMsg;
+
+    Reset();
+
+    // parse everything
+    wxString arg;
+    size_t count = m_data->m_arguments.size();
+    for ( size_t n = 1; ok && (n < count); n++ )    // 0 is program name
+    {
+        arg = m_data->m_arguments[n];
+
+        // special case: "--" should be discarded and all following arguments
+        // should be considered as parameters, even if they start with '-' and
+        // not like options (this is POSIX-like)
+        if ( arg == _T("--") )
+        {
+            maybeOption = false;
+
+            continue;
+        }
+
+        // empty argument or just '-' is not an option but a parameter
+        if ( maybeOption && arg.length() > 1 &&
+                wxStrchr(m_data->m_switchChars, arg[0u]) )
+        {
+            bool isLong;
+            wxString name;
+            int optInd = wxNOT_FOUND;   // init to suppress warnings
+
+            // an option or a switch: find whether it's a long or a short one
+            if ( arg[0u] == _T('-') && arg[1u] == _T('-') )
+            {
+                // a long one
+                isLong = true;
+
+                // Skip leading "--"
+                const wxChar *p = arg.c_str() + 2;
+
+                bool longOptionsEnabled = AreLongOptionsEnabled();
+
+                name = GetLongOptionName(p);
+
+                if (longOptionsEnabled)
+                {
+                    optInd = m_data->FindOptionByLongName(name);
+                    if ( optInd == wxNOT_FOUND )
+                    {
+                        errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str())
+                                 << _T('\n');
+                    }
+                }
+                else
+                {
+                    optInd = wxNOT_FOUND; // Sanity check
+
+                    // Print the argument including leading "--"
+                    name.Prepend( wxT("--") );
+                    errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
+                             << _T('\n');
+                }
+
+            }
+            else // not a long option
+            {
+                isLong = false;
+
+                // a short one: as they can be cumulated, we try to find the
+                // longest substring which is a valid option
+                const wxChar *p = arg.c_str() + 1;
+
+                name = GetShortOptionName(p);
+
+                size_t len = name.length();
+                do
+                {
+                    if ( len == 0 )
+                    {
+                        // we couldn't find a valid option name in the
+                        // beginning of this string
+                        errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
+                                 << _T('\n');
+
+                        break;
+                    }
+                    else
+                    {
+                        optInd = m_data->FindOption(name.Left(len));
+
+                        // will try with one character less the next time
+                        len--;
+                    }
+                }
+                while ( optInd == wxNOT_FOUND );
+
+                len++;  // compensates extra len-- above
+                if ( (optInd != wxNOT_FOUND) && (len != name.length()) )
+                {
+                    // first of all, the option name is only part of this
+                    // string
+                    name = name.Left(len);
+
+                    // our option is only part of this argument, there is
+                    // something else in it - it is either the value of this
+                    // option or other switches if it is a switch
+                    if ( m_data->m_options[(size_t)optInd].kind
+                            == wxCMD_LINE_SWITCH )
+                    {
+                        // pretend that all the rest of the argument is the
+                        // next argument, in fact
+                        wxString arg2 = arg[0u];
+                        arg2 += arg.Mid(len + 1); // +1 for leading '-'
+
+                        m_data->m_arguments.insert
+                            (m_data->m_arguments.begin() + n + 1, arg2);
+                        count++;
+                    }
+                    //else: it's our value, we'll deal with it below
+                }
+            }
+
+            if ( optInd == wxNOT_FOUND )
+            {
+                ok = false;
+
+                continue;   // will break, in fact
+            }
+
+            // look at what follows:
+
+            // +1 for leading '-'
+            const wxChar *p = arg.c_str() + 1 + name.length();
+            if ( isLong )
+                p++;    // for another leading '-'
+
+            wxCmdLineOption& opt = m_data->m_options[(size_t)optInd];
+            if ( opt.kind == wxCMD_LINE_SWITCH )
+            {
+                // we must check that there is no value following the switch
+                if ( *p != _T('\0') )
+                {
+                    errorMsg << wxString::Format(_("Unexpected characters following option '%s'."), name.c_str())
+                             << _T('\n');
+                    ok = false;
+                }
+                else // no value, as expected
+                {
+                    // nothing more to do
+                    opt.SetHasValue();
+
+                    if ( opt.flags & wxCMD_LINE_OPTION_HELP )
+                    {
+                        helpRequested = true;
+
+                        // it's not an error, but we still stop here
+                        ok = false;
+                    }
+                }
+            }
+            else // it's an option. not a switch
+            {
+                // get the value
+                if ( isLong )
+                {
+                    if ( *p++ != _T('=') )
+                    {
+                        errorMsg << wxString::Format(_("Option '%s' requires a value, '=' expected."), name.c_str())
+                                 << _T('\n');
+
+                        ok = false;
+                    }
+                }
+                else // short option
+                {
+                    switch ( *p )
+                    {
+                        case _T('='):
+                        case _T(':'):
+                            // the value follows
+                            p++;
+                            break;
+
+                        case 0:
+                            // the value is in the next argument
+                            if ( ++n == count )
+                            {
+                                // ... but there is none
+                                errorMsg << wxString::Format(_("Option '%s' requires a value."),
+                                                             name.c_str())
+                                         << _T('\n');
+
+                                ok = false;
+                            }
+                            else
+                            {
+                                // ... take it from there
+                                p = m_data->m_arguments[n].c_str();
+                            }
+                            break;
+
+                        default:
+                            // the value is right here: this may be legal or
+                            // not depending on the option style
+                            if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
+                            {
+                                errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
+                                                             name.c_str())
+                                        << _T('\n');
+
+                                ok = false;
+                            }
+                    }
+                }
+
+                if ( ok )
+                {
+                    wxString value = p;
+                    switch ( opt.type )
+                    {
+                        default:
+                            wxFAIL_MSG( _T("unknown option type") );
+                            // still fall through
+
+                        case wxCMD_LINE_VAL_STRING:
+                            opt.SetStrVal(value);
+                            break;
+
+                        case wxCMD_LINE_VAL_NUMBER:
+                            {
+                                long val;
+                                if ( value.ToLong(&val) )
+                                {
+                                    opt.SetLongVal(val);
+                                }
+                                else
+                                {
+                                    errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
+                                                                 value.c_str(), name.c_str())
+                                             << _T('\n');
+
+                                    ok = false;
+                                }
+                            }
+                            break;
+
+#if wxUSE_DATETIME
+                        case wxCMD_LINE_VAL_DATE:
+                            {
+                                wxDateTime dt;
+                                const wxChar *res = dt.ParseDate(value);
+                                if ( !res || *res )
+                                {
+                                    errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
+                                                                 name.c_str(), value.c_str())
+                                             << _T('\n');
+
+                                    ok = false;
+                                }
+                                else
+                                {
+                                    opt.SetDateVal(dt);
+                                }
+                            }
+                            break;
+#endif // wxUSE_DATETIME
+                    }
+                }
+            }
+        }
+        else // not an option, must be a parameter
+        {
+            if ( currentParam < countParam )
+            {
+                wxCmdLineParam& param = m_data->m_paramDesc[currentParam];
+
+                // TODO check the param type
+
+                m_data->m_parameters.push_back(arg);
+
+                if ( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE) )
+                {
+                    currentParam++;
+                }
+                else
+                {
+                    wxASSERT_MSG( currentParam == countParam - 1,
+                                  _T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
+
+                    // remember that we did have this last repeatable parameter
+                    hadRepeatableParam = true;
+                }
+            }
+            else
+            {
+                errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str())
+                         << _T('\n');
+
+                ok = false;
+            }
+        }
+    }
+
+    // verify that all mandatory options were given
+    if ( ok )
+    {
+        size_t countOpt = m_data->m_options.GetCount();
+        for ( size_t n = 0; ok && (n < countOpt); n++ )
+        {
+            wxCmdLineOption& opt = m_data->m_options[n];
+            if ( (opt.flags & wxCMD_LINE_OPTION_MANDATORY) && !opt.HasValue() )
+            {
+                wxString optName;
+                if ( !opt.longName )
+                {
+                    optName = opt.shortName;
+                }
+                else
+                {
+                    if ( AreLongOptionsEnabled() )
+                    {
+                        optName.Printf( _("%s (or %s)"),
+                                        opt.shortName.c_str(),
+                                        opt.longName.c_str() );
+                    }
+                    else
+                    {
+                        optName.Printf( wxT("%s"),
+                                        opt.shortName.c_str() );
+                    }
+                }
+
+                errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
+                                             optName.c_str())
+                         << _T('\n');
+
+                ok = false;
+            }
+        }
+
+        for ( ; ok && (currentParam < countParam); currentParam++ )
+        {
+            wxCmdLineParam& param = m_data->m_paramDesc[currentParam];
+            if ( (currentParam == countParam - 1) &&
+                 (param.flags & wxCMD_LINE_PARAM_MULTIPLE) &&
+                 hadRepeatableParam )
+            {
+                // special case: currentParam wasn't incremented, but we did
+                // have it, so don't give error
+                continue;
+            }
+
+            if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) )
+            {
+                errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
+                                             param.description.c_str())
+                         << _T('\n');
+
+                ok = false;
+            }
+        }
+    }
+
+    // if there was an error during parsing the command line, show this error
+    // and also the usage message if it had been requested
+    if ( !ok && (!errorMsg.empty() || (helpRequested && showUsage)) )
+    {
+        wxMessageOutput* msgOut = wxMessageOutput::Get();
+        if ( msgOut )
+        {
+            wxString usage;
+            if ( showUsage )
+                usage = GetUsageString();
+
+            msgOut->Printf( wxT("%s%s"), usage.c_str(), errorMsg.c_str() );
+        }
+        else
+        {
+            wxFAIL_MSG( _T("no wxMessageOutput object?") );
+        }
+    }
+
+    return ok ? 0 : helpRequested ? -1 : 1;
+}
+
+// ----------------------------------------------------------------------------
+// give the usage message
+// ----------------------------------------------------------------------------
+
+void wxCmdLineParser::Usage()
+{
+    wxMessageOutput* msgOut = wxMessageOutput::Get();
+    if ( msgOut )
+    {
+        msgOut->Printf( wxT("%s"), GetUsageString().c_str() );
+    }
+    else
+    {
+        wxFAIL_MSG( _T("no wxMessageOutput object?") );
+    }
+}
+
+wxString wxCmdLineParser::GetUsageString()
+{
+    wxString appname;
+    if ( wxTheApp )
+    {
+        appname = wxFileName(wxTheApp->argv[0]).GetFullName();
+    }
+    else if (!m_data->m_arguments.empty() )
+    {
+        appname = wxFileName(m_data->m_arguments[0]).GetFullName();
+    }
+
+    // we construct the brief cmd line desc on the fly, but not the detailed
+    // help message below because we want to align the options descriptions
+    // and for this we must first know the longest one of them
+    wxString usage;
+    wxArrayString namesOptions, descOptions;
+
+    if ( !m_data->m_logo.empty() )
+    {
+        usage << m_data->m_logo << _T('\n');
+    }
+
+    usage << wxString::Format(_("Usage: %s"), appname.c_str());
+
+    // the switch char is usually '-' but this can be changed with
+    // SetSwitchChars() and then the first one of possible chars is used
+    wxChar chSwitch = !m_data->m_switchChars ? _T('-')
+                                             : m_data->m_switchChars[0u];
+
+    bool areLongOptionsEnabled = AreLongOptionsEnabled();
+    size_t n, count = m_data->m_options.GetCount();
+    for ( n = 0; n < count; n++ )
+    {
+        wxCmdLineOption& opt = m_data->m_options[n];
+
+        usage << _T(' ');
+        if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
+        {
+            usage << _T('[');
+        }
+
+        if ( !opt.shortName.empty() )
+        {
+            usage << chSwitch << opt.shortName;
+        }
+        else if ( areLongOptionsEnabled && !opt.longName.empty() )
+        {
+            usage << _T("--") << opt.longName;
+        }
+        else
+        {
+            if (!opt.longName.empty())
+            {
+                wxFAIL_MSG( wxT("option with only a long name while long ")
+                            wxT("options are disabled") );
+            }
+            else
+            {
+                wxFAIL_MSG( _T("option without neither short nor long name") );
+            }
+        }
+
+        wxString option;
+
+        if ( !opt.shortName.empty() )
+        {
+            option << _T("  ") << chSwitch << opt.shortName;
+        }
+
+        if ( areLongOptionsEnabled && !opt.longName.empty() )
+        {
+            option << (option.empty() ? _T("  ") : _T(", "))
+                   << _T("--") << opt.longName;
+        }
+
+        if ( opt.kind != wxCMD_LINE_SWITCH )
+        {
+            wxString val;
+            val << _T('<') << GetTypeName(opt.type) << _T('>');
+            usage << _T(' ') << val;
+            option << (!opt.longName ? _T(':') : _T('=')) << val;
+        }
+
+        if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
+        {
+            usage << _T(']');
+        }
+
+        namesOptions.push_back(option);
+        descOptions.push_back(opt.description);
+    }
+
+    count = m_data->m_paramDesc.GetCount();
+    for ( n = 0; n < count; n++ )
+    {
+        wxCmdLineParam& param = m_data->m_paramDesc[n];
+
+        usage << _T(' ');
+        if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
+        {
+            usage << _T('[');
+        }
+
+        usage << param.description;
+
+        if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE )
+        {
+            usage << _T("...");
+        }
+
+        if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
+        {
+            usage << _T(']');
+        }
+    }
+
+    usage << _T('\n');
+
+    // now construct the detailed help message
+    size_t len, lenMax = 0;
+    count = namesOptions.size();
+    for ( n = 0; n < count; n++ )
+    {
+        len = namesOptions[n].length();
+        if ( len > lenMax )
+            lenMax = len;
+    }
+
+    for ( n = 0; n < count; n++ )
+    {
+        len = namesOptions[n].length();
+        usage << namesOptions[n]
+              << wxString(_T(' '), lenMax - len) << _T('\t')
+              << descOptions[n]
+              << _T('\n');
+    }
+
+    return usage;
+}
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+static wxString GetTypeName(wxCmdLineParamType type)
+{
+    wxString s;
+    switch ( type )
+    {
+        default:
+            wxFAIL_MSG( _T("unknown option type") );
+            // still fall through
+
+        case wxCMD_LINE_VAL_STRING:
+            s = _("str");
+            break;
+
+        case wxCMD_LINE_VAL_NUMBER:
+            s = _("num");
+            break;
+
+        case wxCMD_LINE_VAL_DATE:
+            s = _("date");
+            break;
+    }
+
+    return s;
+}
+
+/*
+Returns a string which is equal to the string pointed to by p, but up to the
+point where p contains an character that's not allowed.
+Allowable characters are letters and numbers, and characters pointed to by
+the parameter allowedChars.
+
+For example, if p points to "abcde-@-_", and allowedChars is "-_",
+this function returns "abcde-".
+*/
+static wxString GetOptionName(const wxChar *p,
+    const wxChar *allowedChars)
+{
+    wxString argName;
+
+    while ( *p && (wxIsalnum(*p) || wxStrchr(allowedChars, *p)) )
+    {
+        argName += *p++;
+    }
+
+    return argName;
+}
+
+// Besides alphanumeric characters, short and long options can
+// have other characters.
+
+// A short option additionally can have these
+#define wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("_?")
+
+// A long option can have the same characters as a short option and a '-'.
+#define wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION \
+    wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("-")
+
+static wxString GetShortOptionName(const wxChar *p)
+{
+    return GetOptionName(p, wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION);
+}
+
+static wxString GetLongOptionName(const wxChar *p)
+{
+    return GetOptionName(p, wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION);
+}
+
+#endif // wxUSE_CMDLINE_PARSER
+
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+/*
+   This function is mainly used under Windows (as under Unix we always get the
+   command line arguments as argc/argv anyhow) and so it tries to follow
+   Windows conventions for the command line handling, not Unix ones. For
+   instance, backslash is not special except when it precedes double quote when
+   it does quote it.
+ */
+
+/* static */
+wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
+{
+    wxArrayString args;
+
+    wxString arg;
+    arg.reserve(1024);
+
+    bool isInsideQuotes = false;
+    for ( ;; )
+    {
+        // skip white space
+        while ( *p == _T(' ') || *p == _T('\t') )
+            p++;
+
+        // anything left?
+        if ( *p == _T('\0') )
+            break;
+
+        // parse this parameter
+        bool endParam = false;
+        bool lastBS = false;
+        for ( arg.clear(); !endParam; p++ )
+        {
+            switch ( *p )
+            {
+                case _T('"'):
+                    if ( !lastBS )
+                    {
+                        isInsideQuotes = !isInsideQuotes;
+
+                        // don't put quote in arg
+                        continue;
+                    }
+                    //else: quote has no special meaning but the backslash
+                    //      still remains -- makes no sense but this is what
+                    //      Windows does
+                    break;
+
+                case _T(' '):
+                case _T('\t'):
+                    // backslash does *not* quote the space, only quotes do
+                    if ( isInsideQuotes )
+                    {
+                        // skip assignment below
+                        break;
+                    }
+                    // fall through
+
+                case _T('\0'):
+                    endParam = true;
+
+                    break;
+            }
+
+            if ( endParam )
+            {
+                break;
+            }
+
+            lastBS = !lastBS && *p == _T('\\');
+
+            arg += *p;
+        }
+
+        args.push_back(arg);
+    }
+
+    return args;
+}
diff --git a/Source/3rd Party/wx/src/common/cmdproc.cpp b/Source/3rd Party/wx/src/common/cmdproc.cpp
index 2c869da01..808f7bd95 100644
--- a/Source/3rd Party/wx/src/common/cmdproc.cpp	
+++ b/Source/3rd Party/wx/src/common/cmdproc.cpp	
@@ -1,355 +1,325 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/cmdproc.cpp
-// Purpose:     wxCommand and wxCommandProcessor classes
-// Author:      Julian Smart (extracted from docview.h by VZ)
-// Modified by:
-// Created:     05.11.00
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/string.h"
-    #include "wx/menu.h"
-    #include "wx/accel.h"
-#endif //WX_PRECOMP
-
-#include "wx/cmdproc.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-IMPLEMENT_CLASS(wxCommand, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
-
-// ----------------------------------------------------------------------------
-// wxCommand
-// ----------------------------------------------------------------------------
-
-wxCommand::wxCommand(bool canUndoIt, const wxString& name)
-{
-    m_canUndo = canUndoIt;
-    m_commandName = name;
-}
-
-// ----------------------------------------------------------------------------
-// Command processor
-// ----------------------------------------------------------------------------
-
-wxCommandProcessor::wxCommandProcessor(int maxCommands)
-{
-    m_maxNoCommands = maxCommands;
-#if wxUSE_MENUS
-    m_commandEditMenu = NULL;
-#endif // wxUSE_MENUS
-
-#if wxUSE_ACCEL
-    m_undoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Z').ToString();
-    m_redoAccelerator = '\t' + wxAcceleratorEntry(wxACCEL_CTRL, 'Y').ToString();
-#endif // wxUSE_ACCEL
-
-    m_lastSavedCommand =
-    m_currentCommand = wxList::compatibility_iterator();
-}
-
-wxCommandProcessor::~wxCommandProcessor()
-{
-    ClearCommands();
-}
-
-bool wxCommandProcessor::DoCommand(wxCommand& cmd)
-{
-    return cmd.Do();
-}
-
-bool wxCommandProcessor::UndoCommand(wxCommand& cmd)
-{
-    return cmd.Undo();
-}
-
-// Pass a command to the processor. The processor calls Do();
-// if successful, is appended to the command history unless
-// storeIt is false.
-bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
-{
-    wxCHECK_MSG( command, false, wxT("no command in wxCommandProcessor::Submit") );
-
-    if ( !DoCommand(*command) )
-    {
-        // the user code expects the command to be deleted anyhow
-        delete command;
-
-        return false;
-    }
-
-    if ( storeIt )
-        Store(command);
-    else
-        delete command;
-
-    return true;
-}
-
-void wxCommandProcessor::Store(wxCommand *command)
-{
-    wxCHECK_RET( command, wxT("no command in wxCommandProcessor::Store") );
-
-    // Correct a bug: we must chop off the current 'branch'
-    // so that we're at the end of the command list.
-    if (!m_currentCommand)
-        ClearCommands();
-    else
-    {
-        wxList::compatibility_iterator node = m_currentCommand->GetNext();
-        while (node)
-        {
-            wxList::compatibility_iterator next = node->GetNext();
-
-            // Make sure m_lastSavedCommand won't point to freed memory
-            if ( m_lastSavedCommand && m_lastSavedCommand == node )
-                m_lastSavedCommand = wxList::compatibility_iterator();
-
-            delete (wxCommand *)node->GetData();
-            m_commands.Erase(node);
-
-            node = next;
-        }
-    }
-
-    if ( (int)m_commands.GetCount() == m_maxNoCommands )
-    {
-        wxList::compatibility_iterator firstNode = m_commands.GetFirst();
-
-        // Make sure m_lastSavedCommand won't point to freed memory
-        if ( m_lastSavedCommand && m_lastSavedCommand == firstNode )
-            m_lastSavedCommand = wxList::compatibility_iterator();
-
-        wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
-        delete firstCommand;
-        m_commands.Erase(firstNode);
-    }
-
-    m_commands.Append(command);
-    m_currentCommand = m_commands.GetLast();
-    SetMenuStrings();
-}
-
-bool wxCommandProcessor::Undo()
-{
-    wxCommand *command = GetCurrentCommand();
-    if ( command && command->CanUndo() )
-    {
-        if ( UndoCommand(*command) )
-        {
-            m_currentCommand = m_currentCommand->GetPrevious();
-            SetMenuStrings();
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool wxCommandProcessor::Redo()
-{
-    wxCommand *redoCommand = NULL;
-    wxList::compatibility_iterator redoNode
-#if !wxUSE_STD_CONTAINERS
-        = NULL          // just to avoid warnings
-#endif // !wxUSE_STD_CONTAINERS
-        ;
-
-    if ( m_currentCommand )
-    {
-        // is there anything to redo?
-        if ( m_currentCommand->GetNext() )
-        {
-            redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData();
-            redoNode = m_currentCommand->GetNext();
-        }
-    }
-    else // no current command, redo the first one
-    {
-        if (m_commands.GetCount() > 0)
-        {
-            redoCommand = (wxCommand *)m_commands.GetFirst()->GetData();
-            redoNode = m_commands.GetFirst();
-        }
-    }
-
-    if (redoCommand)
-    {
-        bool success = DoCommand(*redoCommand);
-        if (success)
-        {
-            m_currentCommand = redoNode;
-            SetMenuStrings();
-            return true;
-        }
-    }
-    return false;
-}
-
-bool wxCommandProcessor::CanUndo() const
-{
-    wxCommand *command = GetCurrentCommand();
-
-    return command && command->CanUndo();
-}
-
-bool wxCommandProcessor::CanRedo() const
-{
-    if (m_currentCommand && !m_currentCommand->GetNext())
-        return false;
-
-    if (m_currentCommand && m_currentCommand->GetNext())
-        return true;
-
-    if (!m_currentCommand && (m_commands.GetCount() > 0))
-        return true;
-
-    return false;
-}
-
-void wxCommandProcessor::Initialize()
-{
-    m_currentCommand = m_commands.GetLast();
-    SetMenuStrings();
-}
-
-void wxCommandProcessor::SetMenuStrings()
-{
-#if wxUSE_MENUS
-    if (m_commandEditMenu)
-    {
-        wxString undoLabel = GetUndoMenuLabel();
-        wxString redoLabel = GetRedoMenuLabel();
-
-        m_commandEditMenu->SetLabel(wxID_UNDO, undoLabel);
-        m_commandEditMenu->Enable(wxID_UNDO, CanUndo());
-
-        m_commandEditMenu->SetLabel(wxID_REDO, redoLabel);
-        m_commandEditMenu->Enable(wxID_REDO, CanRedo());
-    }
-#endif // wxUSE_MENUS
-}
-
-// Gets the current Undo menu label.
-wxString wxCommandProcessor::GetUndoMenuLabel() const
-{
-    wxString buf;
-    if (m_currentCommand)
-    {
-        wxCommand *command = (wxCommand *)m_currentCommand->GetData();
-        wxString commandName(command->GetName());
-        if (commandName.empty()) commandName = _("Unnamed command");
-        bool canUndo = command->CanUndo();
-        if (canUndo)
-            buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator;
-        else
-            buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator;
-    }
-    else
-    {
-        buf = _("&Undo") + m_undoAccelerator;
-    }
-
-    return buf;
-}
-
-// Gets the current Undo menu label.
-wxString wxCommandProcessor::GetRedoMenuLabel() const
-{
-    wxString buf;
-    if (m_currentCommand)
-    {
-        // We can redo, if we're not at the end of the history.
-        if (m_currentCommand->GetNext())
-        {
-            wxCommand *redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData();
-            wxString redoCommandName(redoCommand->GetName());
-            if (redoCommandName.empty()) redoCommandName = _("Unnamed command");
-            buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
-        }
-        else
-        {
-            buf = _("&Redo") + m_redoAccelerator;
-        }
-    }
-    else
-    {
-        if (m_commands.GetCount() == 0)
-        {
-            buf = _("&Redo") + m_redoAccelerator;
-        }
-        else
-        {
-            // currentCommand is NULL but there are commands: this means that
-            // we've undone to the start of the list, but can redo the first.
-            wxCommand *redoCommand = (wxCommand *)m_commands.GetFirst()->GetData();
-            wxString redoCommandName(redoCommand->GetName());
-            if (redoCommandName.empty()) redoCommandName = _("Unnamed command");
-            buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
-        }
-    }
-    return buf;
-}
-
-void wxCommandProcessor::ClearCommands()
-{
-    wxList::compatibility_iterator node = m_commands.GetFirst();
-    while (node)
-    {
-        wxCommand *command = (wxCommand *)node->GetData();
-        delete command;
-        m_commands.Erase(node);
-        node = m_commands.GetFirst();
-    }
-
-    m_currentCommand = wxList::compatibility_iterator();
-    m_lastSavedCommand = wxList::compatibility_iterator();
-}
-
-bool wxCommandProcessor::IsDirty() const
-{
-    if ( m_commands.empty() )
-    {
-        // If we have never been modified, we can't be dirty.
-        return false;
-    }
-
-    if ( !m_lastSavedCommand )
-    {
-        // If we have been modified but have never been saved, we're dirty.
-        return true;
-    }
-
-    if ( !m_currentCommand )
-    {
-        // This only happens if all commands were undone after saving the
-        // document: we're dirty then.
-        return true;
-    }
-
-    // Finally if both iterators are valid, we may just compare them.
-    return m_currentCommand != m_lastSavedCommand;
-}
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/cmdproc.cpp
+// Purpose:     wxCommand and wxCommandProcessor classes
+// Author:      Julian Smart (extracted from docview.h by VZ)
+// Modified by:
+// Created:     05.11.00
+// RCS-ID:      $Id: cmdproc.cpp 65725 2010-10-02 13:05:08Z TIK $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/string.h"
+    #include "wx/menu.h"
+#endif //WX_PRECOMP
+
+#include "wx/cmdproc.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+IMPLEMENT_CLASS(wxCommand, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
+
+// ----------------------------------------------------------------------------
+// wxCommand
+// ----------------------------------------------------------------------------
+
+wxCommand::wxCommand(bool canUndoIt, const wxString& name)
+{
+    m_canUndo = canUndoIt;
+    m_commandName = name;
+}
+
+// ----------------------------------------------------------------------------
+// Command processor
+// ----------------------------------------------------------------------------
+
+wxCommandProcessor::wxCommandProcessor(int maxCommands)
+{
+    m_maxNoCommands = maxCommands;
+#if wxUSE_MENUS
+    m_commandEditMenu = (wxMenu *) NULL;
+#endif // wxUSE_MENUS
+    m_undoAccelerator = wxT("\tCtrl+Z");
+    m_redoAccelerator = wxT("\tCtrl+Y");
+
+    m_lastSavedCommand =
+    m_currentCommand = wxList::compatibility_iterator();
+}
+
+wxCommandProcessor::~wxCommandProcessor()
+{
+    ClearCommands();
+}
+
+bool wxCommandProcessor::DoCommand(wxCommand& cmd)
+{
+    return cmd.Do();
+}
+
+bool wxCommandProcessor::UndoCommand(wxCommand& cmd)
+{
+    return cmd.Undo();
+}
+
+// Pass a command to the processor. The processor calls Do();
+// if successful, is appended to the command history unless
+// storeIt is false.
+bool wxCommandProcessor::Submit(wxCommand *command, bool storeIt)
+{
+    wxCHECK_MSG( command, false, _T("no command in wxCommandProcessor::Submit") );
+
+    if ( !DoCommand(*command) )
+    {
+        // the user code expects the command to be deleted anyhow
+        delete command;
+
+        return false;
+    }
+
+    if ( storeIt )
+        Store(command);
+    else
+        delete command;
+
+    return true;
+}
+
+void wxCommandProcessor::Store(wxCommand *command)
+{
+    wxCHECK_RET( command, _T("no command in wxCommandProcessor::Store") );
+
+    // Correct a bug: we must chop off the current 'branch'
+    // so that we're at the end of the command list.
+    if (!m_currentCommand)
+        ClearCommands();
+    else
+    {
+        wxList::compatibility_iterator node = m_currentCommand->GetNext();
+        while (node)
+        {
+            wxList::compatibility_iterator next = node->GetNext();
+            delete (wxCommand *)node->GetData();
+            m_commands.Erase(node);
+
+            // Make sure m_lastSavedCommand won't point to freed memory
+            if ( m_lastSavedCommand == node )
+                m_lastSavedCommand = wxList::compatibility_iterator();
+
+            node = next;
+        }
+    }
+
+    if ( (int)m_commands.GetCount() == m_maxNoCommands )
+    {
+        wxList::compatibility_iterator firstNode = m_commands.GetFirst();
+        wxCommand *firstCommand = (wxCommand *)firstNode->GetData();
+        delete firstCommand;
+        m_commands.Erase(firstNode);
+
+        // Make sure m_lastSavedCommand won't point to freed memory
+        if ( m_lastSavedCommand == firstNode )
+            m_lastSavedCommand = wxList::compatibility_iterator();
+    }
+
+    m_commands.Append(command);
+    m_currentCommand = m_commands.GetLast();
+    SetMenuStrings();
+}
+
+bool wxCommandProcessor::Undo()
+{
+    wxCommand *command = GetCurrentCommand();
+    if ( command && command->CanUndo() )
+    {
+        if ( UndoCommand(*command) )
+        {
+            m_currentCommand = m_currentCommand->GetPrevious();
+            SetMenuStrings();
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool wxCommandProcessor::Redo()
+{
+    wxCommand *redoCommand = (wxCommand *) NULL;
+    wxList::compatibility_iterator redoNode
+#if !wxUSE_STL
+        = NULL          // just to avoid warnings
+#endif // !wxUSE_STL
+        ;
+
+    if ( m_currentCommand )
+    {
+        // is there anything to redo?
+        if ( m_currentCommand->GetNext() )
+        {
+            redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData();
+            redoNode = m_currentCommand->GetNext();
+        }
+    }
+    else // no current command, redo the first one
+    {
+        if (m_commands.GetCount() > 0)
+        {
+            redoCommand = (wxCommand *)m_commands.GetFirst()->GetData();
+            redoNode = m_commands.GetFirst();
+        }
+    }
+
+    if (redoCommand)
+    {
+        bool success = DoCommand(*redoCommand);
+        if (success)
+        {
+            m_currentCommand = redoNode;
+            SetMenuStrings();
+            return true;
+        }
+    }
+    return false;
+}
+
+bool wxCommandProcessor::CanUndo() const
+{
+    wxCommand *command = GetCurrentCommand();
+
+    return command && command->CanUndo();
+}
+
+bool wxCommandProcessor::CanRedo() const
+{
+    if (m_currentCommand && !m_currentCommand->GetNext())
+        return false;
+
+    if (m_currentCommand && m_currentCommand->GetNext())
+        return true;
+
+    if (!m_currentCommand && (m_commands.GetCount() > 0))
+        return true;
+
+    return false;
+}
+
+void wxCommandProcessor::Initialize()
+{
+    m_currentCommand = m_commands.GetLast();
+    SetMenuStrings();
+}
+
+void wxCommandProcessor::SetMenuStrings()
+{
+#if wxUSE_MENUS
+    if (m_commandEditMenu)
+    {
+        wxString undoLabel = GetUndoMenuLabel();
+        wxString redoLabel = GetRedoMenuLabel();
+
+        m_commandEditMenu->SetLabel(wxID_UNDO, undoLabel);
+        m_commandEditMenu->Enable(wxID_UNDO, CanUndo());
+
+        m_commandEditMenu->SetLabel(wxID_REDO, redoLabel);
+        m_commandEditMenu->Enable(wxID_REDO, CanRedo());
+    }
+#endif // wxUSE_MENUS
+}
+
+// Gets the current Undo menu label.
+wxString wxCommandProcessor::GetUndoMenuLabel() const
+{
+    wxString buf;
+    if (m_currentCommand)
+    {
+        wxCommand *command = (wxCommand *)m_currentCommand->GetData();
+        wxString commandName(command->GetName());
+        if (commandName.empty()) commandName = _("Unnamed command");
+        bool canUndo = command->CanUndo();
+        if (canUndo)
+            buf = wxString(_("&Undo ")) + commandName + m_undoAccelerator;
+        else
+            buf = wxString(_("Can't &Undo ")) + commandName + m_undoAccelerator;
+    }
+    else
+    {
+        buf = _("&Undo") + m_undoAccelerator;
+    }
+
+    return buf;
+}
+
+// Gets the current Undo menu label.
+wxString wxCommandProcessor::GetRedoMenuLabel() const
+{
+    wxString buf;
+    if (m_currentCommand)
+    {
+        // We can redo, if we're not at the end of the history.
+        if (m_currentCommand->GetNext())
+        {
+            wxCommand *redoCommand = (wxCommand *)m_currentCommand->GetNext()->GetData();
+            wxString redoCommandName(redoCommand->GetName());
+            if (redoCommandName.empty()) redoCommandName = _("Unnamed command");
+            buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
+        }
+        else
+        {
+            buf = _("&Redo") + m_redoAccelerator;
+        }
+    }
+    else
+    {
+        if (m_commands.GetCount() == 0)
+        {
+            buf = _("&Redo") + m_redoAccelerator;
+        }
+        else
+        {
+            // currentCommand is NULL but there are commands: this means that
+            // we've undone to the start of the list, but can redo the first.
+            wxCommand *redoCommand = (wxCommand *)m_commands.GetFirst()->GetData();
+            wxString redoCommandName(redoCommand->GetName());
+            if (redoCommandName.empty()) redoCommandName = _("Unnamed command");
+            buf = wxString(_("&Redo ")) + redoCommandName + m_redoAccelerator;
+        }
+    }
+    return buf;
+}
+
+void wxCommandProcessor::ClearCommands()
+{
+    wxList::compatibility_iterator node = m_commands.GetFirst();
+    while (node)
+    {
+        wxCommand *command = (wxCommand *)node->GetData();
+        delete command;
+        m_commands.Erase(node);
+        node = m_commands.GetFirst();
+    }
+
+    m_currentCommand = wxList::compatibility_iterator();
+    m_lastSavedCommand = wxList::compatibility_iterator();
+}
+
+
diff --git a/Source/3rd Party/wx/src/common/cmndata.cpp b/Source/3rd Party/wx/src/common/cmndata.cpp
index edf89d275..a6edb97b2 100644
--- a/Source/3rd Party/wx/src/common/cmndata.cpp	
+++ b/Source/3rd Party/wx/src/common/cmndata.cpp	
@@ -1,398 +1,660 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/cmndata.cpp
-// Purpose:     Common GDI data
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-#include "wx/cmndata.h"
-
-#ifndef WX_PRECOMP
-    #if defined(__WXMSW__)
-        #include "wx/msw/wrapcdlg.h"
-    #endif // MSW
-    #include <stdio.h>
-    #include "wx/string.h"
-    #include "wx/utils.h"
-    #include "wx/app.h"
-    #include "wx/log.h"
-    #include "wx/gdicmn.h"
-#endif
-
-#include "wx/prntbase.h"
-#include "wx/printdlg.h"
-#include "wx/paper.h"
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// Print data
-// ----------------------------------------------------------------------------
-
-wxPrintData::wxPrintData()
-{
-    m_bin = wxPRINTBIN_DEFAULT;
-    m_media = wxPRINTMEDIA_DEFAULT;
-    m_printMode = wxPRINT_MODE_PRINTER;
-    m_printOrientation = wxPORTRAIT;
-    m_printOrientationReversed = false;
-    m_printNoCopies = 1;
-    m_printCollate = false;
-
-    // New, 24/3/99
-    m_printerName = wxEmptyString;
-    m_colour = true;
-    m_duplexMode = wxDUPLEX_SIMPLEX;
-    m_printQuality = wxPRINT_QUALITY_HIGH;
-
-    // we intentionally don't initialize paper id and size at all, like this
-    // the default system settings will be used for them
-    m_paperId = wxPAPER_NONE;
-    m_paperSize = wxDefaultSize;
-
-    m_privData = NULL;
-    m_privDataLen = 0;
-
-    m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
-}
-
-wxPrintData::wxPrintData(const wxPrintData& printData)
-    : wxObject()
-{
-    m_nativeData = NULL;
-    m_privData = NULL;
-    (*this) = printData;
-}
-
-void wxPrintData::SetPrivData( char *privData, int len )
-{
-    wxDELETEA(m_privData);
-    m_privDataLen = len;
-    if (m_privDataLen > 0)
-    {
-        m_privData = new char[m_privDataLen];
-        memcpy( m_privData, privData, m_privDataLen );
-    }
-}
-
-wxPrintData::~wxPrintData()
-{
-    m_nativeData->m_ref--;
-    if (m_nativeData->m_ref == 0)
-        delete m_nativeData;
-
-    if (m_privData)
-        delete [] m_privData;
-}
-
-void wxPrintData::ConvertToNative()
-{
-    m_nativeData->TransferFrom( *this ) ;
-}
-
-void wxPrintData::ConvertFromNative()
-{
-    m_nativeData->TransferTo( *this ) ;
-}
-
-wxPrintData& wxPrintData::operator=(const wxPrintData& data)
-{
-    if ( &data == this )
-        return *this;
-
-    m_printNoCopies = data.m_printNoCopies;
-    m_printCollate = data.m_printCollate;
-    m_printOrientation = data.m_printOrientation;
-    m_printOrientationReversed = data.m_printOrientationReversed;
-    m_printerName = data.m_printerName;
-    m_colour = data.m_colour;
-    m_duplexMode = data.m_duplexMode;
-    m_printQuality = data.m_printQuality;
-    m_paperId = data.m_paperId;
-    m_paperSize = data.m_paperSize;
-    m_bin = data.m_bin;
-    m_media = data.m_media;
-    m_printMode = data.m_printMode;
-    m_filename = data.m_filename;
-
-    // UnRef old m_nativeData
-    if (m_nativeData)
-    {
-        m_nativeData->m_ref--;
-        if (m_nativeData->m_ref == 0)
-            delete m_nativeData;
-    }
-    // Set Ref new one
-    m_nativeData = data.GetNativeData();
-    m_nativeData->m_ref++;
-
-    wxDELETEA(m_privData);
-    m_privDataLen = data.GetPrivDataLen();
-    if (m_privDataLen > 0)
-    {
-        m_privData = new char[m_privDataLen];
-        memcpy( m_privData, data.GetPrivData(), m_privDataLen );
-    }
-
-    return *this;
-}
-
-// Is this data OK for showing the print dialog?
-bool wxPrintData::IsOk() const
-{
-    m_nativeData->TransferFrom( *this );
-
-    return m_nativeData->IsOk();
-}
-
-// ----------------------------------------------------------------------------
-// Print dialog data
-// ----------------------------------------------------------------------------
-
-wxPrintDialogData::wxPrintDialogData()
-{
-    m_printFromPage = 0;
-    m_printToPage = 0;
-    m_printMinPage = 0;
-    m_printMaxPage = 0;
-    m_printNoCopies = 1;
-    m_printAllPages = false;
-    m_printCollate = false;
-    m_printToFile = false;
-    m_printSelection = false;
-    m_printEnableSelection = false;
-    m_printEnablePageNumbers = true;
-
-    wxPrintFactory* factory = wxPrintFactory::GetFactory();
-    m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
-
-    m_printEnableHelp = false;
-}
-
-wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
-    : wxObject()
-{
-    (*this) = dialogData;
-}
-
-wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
-{
-    m_printFromPage = 1;
-    m_printToPage = 0;
-    m_printMinPage = 1;
-    m_printMaxPage = 9999;
-    m_printNoCopies = 1;
-    // On Mac the Print dialog always defaults to "All Pages"
-#ifdef __WXMAC__
-    m_printAllPages = true;
-#else
-    m_printAllPages = false;
-#endif
-    m_printCollate = false;
-    m_printToFile = false;
-    m_printSelection = false;
-    m_printEnableSelection = false;
-    m_printEnablePageNumbers = true;
-    m_printEnablePrintToFile = true;
-    m_printEnableHelp = false;
-    m_printData = printData;
-}
-
-wxPrintDialogData::~wxPrintDialogData()
-{
-}
-
-void wxPrintDialogData::operator=(const wxPrintDialogData& data)
-{
-    m_printFromPage = data.m_printFromPage;
-    m_printToPage = data.m_printToPage;
-    m_printMinPage = data.m_printMinPage;
-    m_printMaxPage = data.m_printMaxPage;
-    m_printNoCopies = data.m_printNoCopies;
-    m_printAllPages = data.m_printAllPages;
-    m_printCollate = data.m_printCollate;
-    m_printToFile = data.m_printToFile;
-    m_printSelection = data.m_printSelection;
-    m_printEnableSelection = data.m_printEnableSelection;
-    m_printEnablePageNumbers = data.m_printEnablePageNumbers;
-    m_printEnableHelp = data.m_printEnableHelp;
-    m_printEnablePrintToFile = data.m_printEnablePrintToFile;
-    m_printData = data.m_printData;
-}
-
-void wxPrintDialogData::operator=(const wxPrintData& data)
-{
-    m_printData = data;
-}
-
-// ----------------------------------------------------------------------------
-// wxPageSetupDialogData
-// ----------------------------------------------------------------------------
-
-wxPageSetupDialogData::wxPageSetupDialogData()
-{
-    m_paperSize = wxSize(0,0);
-
-    CalculatePaperSizeFromId();
-
-    m_minMarginTopLeft =
-    m_minMarginBottomRight =
-    m_marginTopLeft =
-    m_marginBottomRight = wxPoint(0,0);
-
-    // Flags
-    m_defaultMinMargins = false;
-    m_enableMargins = true;
-    m_enableOrientation = true;
-    m_enablePaper = true;
-    m_enablePrinter = true;
-    m_enableHelp = false;
-    m_getDefaultInfo = false;
-}
-
-wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
-    : wxObject()
-{
-    (*this) = dialogData;
-}
-
-wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
-{
-    m_paperSize = wxSize(0,0);
-    m_minMarginTopLeft =
-    m_minMarginBottomRight =
-    m_marginTopLeft =
-    m_marginBottomRight = wxPoint(0,0);
-
-    // Flags
-    m_defaultMinMargins = false;
-    m_enableMargins = true;
-    m_enableOrientation = true;
-    m_enablePaper = true;
-    m_enablePrinter = true;
-    m_enableHelp = false;
-    m_getDefaultInfo = false;
-
-    m_printData = printData;
-
-    // The wxPrintData paper size overrides these values, unless the size cannot
-    // be found.
-    CalculatePaperSizeFromId();
-}
-
-wxPageSetupDialogData::~wxPageSetupDialogData()
-{
-}
-
-wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
-{
-    m_paperSize = data.m_paperSize;
-    m_minMarginTopLeft = data.m_minMarginTopLeft;
-    m_minMarginBottomRight = data.m_minMarginBottomRight;
-    m_marginTopLeft = data.m_marginTopLeft;
-    m_marginBottomRight = data.m_marginBottomRight;
-    m_defaultMinMargins = data.m_defaultMinMargins;
-    m_enableMargins = data.m_enableMargins;
-    m_enableOrientation = data.m_enableOrientation;
-    m_enablePaper = data.m_enablePaper;
-    m_enablePrinter = data.m_enablePrinter;
-    m_getDefaultInfo = data.m_getDefaultInfo;
-    m_enableHelp = data.m_enableHelp;
-
-    m_printData = data.m_printData;
-
-    return *this;
-}
-
-wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
-{
-    m_printData = data;
-    CalculatePaperSizeFromId();
-
-    return *this;
-}
-
-// If a corresponding paper type is found in the paper database, will set the m_printData
-// paper size id member as well.
-void wxPageSetupDialogData::SetPaperSize(const wxSize& sz)
-{
-    m_paperSize = sz;
-
-    CalculateIdFromPaperSize();
-}
-
-// Sets the wxPrintData id, plus the paper width/height if found in the paper database.
-void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
-{
-    m_printData.SetPaperId(id);
-
-    CalculatePaperSizeFromId();
-}
-
-void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
-{
-    m_printData = printData;
-    CalculatePaperSizeFromId();
-}
-
-// Use paper size defined in this object to set the wxPrintData
-// paper id
-void wxPageSetupDialogData::CalculateIdFromPaperSize()
-{
-    wxASSERT_MSG( (wxThePrintPaperDatabase != NULL),
-                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
-
-    wxSize sz = GetPaperSize();
-
-    wxPaperSize id = wxThePrintPaperDatabase->GetSize(wxSize(sz.x* 10, sz.y * 10));
-    if (id != wxPAPER_NONE)
-    {
-        m_printData.SetPaperId(id);
-    }
-}
-
-// Use paper id in wxPrintData to set this object's paper size
-void wxPageSetupDialogData::CalculatePaperSizeFromId()
-{
-    wxASSERT_MSG( (wxThePrintPaperDatabase != NULL),
-                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
-
-    wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
-
-    if (sz != wxSize(0, 0))
-    {
-        // sz is in 10ths of a mm, while paper size is in mm
-        m_paperSize.x = sz.x / 10;
-        m_paperSize.y = sz.y / 10;
-    }
-}
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/cmndata.cpp
+// Purpose:     Common GDI data
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: cmndata.cpp 60700 2009-05-20 13:18:11Z JS $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/cmndata.h"
+
+#ifndef WX_PRECOMP
+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW
+    #include <stdio.h>
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/gdicmn.h"
+#endif
+
+#include "wx/prntbase.h"
+#include "wx/printdlg.h"
+
+#if wxUSE_FONTDLG
+    #include "wx/fontdlg.h"
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_PRINTING_ARCHITECTURE
+
+#include "wx/paper.h"
+
+#if defined(__WXMAC__)
+    #include "wx/mac/private/print.h"
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
+IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxColourData
+// ----------------------------------------------------------------------------
+
+wxColourData::wxColourData()
+{
+    m_chooseFull = false;
+    m_dataColour.Set(0,0,0);
+    // m_custColours are wxNullColours initially
+}
+
+wxColourData::wxColourData(const wxColourData& data)
+    : wxObject()
+{
+    (*this) = data;
+}
+
+wxColourData::~wxColourData()
+{
+}
+
+void wxColourData::SetCustomColour(int i, const wxColour& colour)
+{
+    wxCHECK_RET( (i >= 0 && i < 16), _T("custom colour index out of range") );
+
+    m_custColours[i] = colour;
+}
+
+wxColour wxColourData::GetCustomColour(int i)
+{
+    wxCHECK_MSG( (i >= 0 && i < 16), wxColour(0,0,0),
+                 _T("custom colour index out of range") );
+
+    return m_custColours[i];
+}
+
+void wxColourData::operator=(const wxColourData& data)
+{
+    int i;
+    for (i = 0; i < 16; i++)
+        m_custColours[i] = data.m_custColours[i];
+
+    m_dataColour = (wxColour&)data.m_dataColour;
+    m_chooseFull = data.m_chooseFull;
+}
+
+// ----------------------------------------------------------------------------
+// Font data
+// ----------------------------------------------------------------------------
+
+wxFontData::wxFontData()
+{
+    // Intialize colour to black.
+    m_fontColour = wxNullColour;
+
+    m_showHelp = false;
+    m_allowSymbols = true;
+    m_enableEffects = true;
+    m_minSize = 0;
+    m_maxSize = 0;
+
+    m_encoding = wxFONTENCODING_SYSTEM;
+}
+
+wxFontData::~wxFontData()
+{
+}
+
+#if wxUSE_FONTDLG
+
+wxFontDialogBase::~wxFontDialogBase()
+{
+}
+
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_PRINTING_ARCHITECTURE
+// ----------------------------------------------------------------------------
+// Print data
+// ----------------------------------------------------------------------------
+
+wxPrintData::wxPrintData()
+{
+    m_bin = wxPRINTBIN_DEFAULT;
+    m_media = wxPRINTMEDIA_DEFAULT;
+    m_printMode = wxPRINT_MODE_PRINTER;
+    m_printOrientation = wxPORTRAIT;
+    m_printOrientationReversed = false;
+    m_printNoCopies = 1;
+    m_printCollate = false;
+
+    // New, 24/3/99
+    m_printerName = wxEmptyString;
+    m_colour = true;
+    m_duplexMode = wxDUPLEX_SIMPLEX;
+    m_printQuality = wxPRINT_QUALITY_HIGH;
+
+    // we intentionally don't initialize paper id and size at all, like this
+    // the default system settings will be used for them
+    m_paperId = wxPAPER_NONE;
+    m_paperSize = wxDefaultSize;
+
+    m_privData = NULL;
+    m_privDataLen = 0;
+
+    m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
+}
+
+wxPrintData::wxPrintData(const wxPrintData& printData)
+    : wxObject()
+{
+    m_nativeData = NULL;
+    m_privData = NULL;
+    (*this) = printData;
+}
+
+void wxPrintData::SetPrivData( char *privData, int len )
+{
+    if (m_privData)
+    {
+        delete [] m_privData;
+        m_privData = NULL;
+    }
+    m_privDataLen = len;
+    if (m_privDataLen > 0)
+    {
+        m_privData = new char[m_privDataLen];
+        memcpy( m_privData, privData, m_privDataLen );
+    }
+}
+
+wxPrintData::~wxPrintData()
+{
+    m_nativeData->m_ref--;
+    if (m_nativeData->m_ref == 0)
+        delete m_nativeData;
+
+    if (m_privData)
+        delete [] m_privData;
+}
+
+void wxPrintData::ConvertToNative()
+{
+    m_nativeData->TransferFrom( *this ) ;
+}
+
+void wxPrintData::ConvertFromNative()
+{
+    m_nativeData->TransferTo( *this ) ;
+}
+
+void wxPrintData::operator=(const wxPrintData& data)
+{
+    m_printNoCopies = data.m_printNoCopies;
+    m_printCollate = data.m_printCollate;
+    m_printOrientation = data.m_printOrientation;
+    m_printOrientationReversed = data.m_printOrientationReversed;
+    m_printerName = data.m_printerName;
+    m_colour = data.m_colour;
+    m_duplexMode = data.m_duplexMode;
+    m_printQuality = data.m_printQuality;
+    m_paperId = data.m_paperId;
+    m_paperSize = data.m_paperSize;
+    m_bin = data.m_bin;
+    m_media = data.m_media;
+    m_printMode = data.m_printMode;
+    m_filename = data.m_filename;
+
+    // UnRef old m_nativeData
+    if (m_nativeData)
+    {
+        m_nativeData->m_ref--;
+        if (m_nativeData->m_ref == 0)
+            delete m_nativeData;
+    }
+    // Set Ref new one
+    m_nativeData = data.GetNativeData();
+    m_nativeData->m_ref++;
+
+    if (m_privData)
+    {
+        delete [] m_privData;
+        m_privData = NULL;
+    }
+    m_privDataLen = data.GetPrivDataLen();
+    if (m_privDataLen > 0)
+    {
+        m_privData = new char[m_privDataLen];
+        memcpy( m_privData, data.GetPrivData(), m_privDataLen );
+    }
+}
+
+// Is this data OK for showing the print dialog?
+bool wxPrintData::IsOk() const
+{
+    m_nativeData->TransferFrom( *this );
+
+    return m_nativeData->Ok();
+}
+
+// What should happen here?  wxPostScriptPrintNativeData is not
+// defined unless all this is true on MSW.
+#if WXWIN_COMPATIBILITY_2_4 && wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+
+#include "wx/generic/prntdlgg.h"
+
+#if wxUSE_POSTSCRIPT
+    #define WXUNUSED_WITHOUT_PS(name) name
+#else
+    #define WXUNUSED_WITHOUT_PS(name) WXUNUSED(name)
+#endif
+
+wxString wxPrintData::GetPrinterCommand() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterCommand();
+#endif
+    return wxEmptyString;
+}
+
+wxString wxPrintData::GetPrinterOptions() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterOptions();
+#endif
+    return wxEmptyString;
+}
+
+wxString wxPrintData::GetPreviewCommand() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPreviewCommand();
+#endif
+    return wxEmptyString;
+}
+
+wxString wxPrintData::GetFontMetricPath() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetFontMetricPath();
+#endif
+    return wxEmptyString;
+}
+
+double wxPrintData::GetPrinterScaleX() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleX();
+#endif
+    return 1.0;
+}
+
+double wxPrintData::GetPrinterScaleY() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleY();
+#endif
+    return 1.0;
+}
+
+long wxPrintData::GetPrinterTranslateX() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateX();
+#endif
+    return 0;
+}
+
+long wxPrintData::GetPrinterTranslateY() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateY();
+#endif
+    return 0;
+}
+
+void wxPrintData::SetPrinterCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterCommand( command );
+#endif
+}
+
+void wxPrintData::SetPrinterOptions(const wxString& WXUNUSED_WITHOUT_PS(options))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterOptions( options );
+#endif
+}
+
+void wxPrintData::SetPreviewCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPreviewCommand( command );
+#endif
+}
+
+void wxPrintData::SetFontMetricPath(const wxString& WXUNUSED_WITHOUT_PS(path))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetFontMetricPath( path );
+#endif
+}
+
+void wxPrintData::SetPrinterScaleX(double WXUNUSED_WITHOUT_PS(x))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleX( x );
+#endif
+}
+
+void wxPrintData::SetPrinterScaleY(double WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleY( y );
+#endif
+}
+
+void wxPrintData::SetPrinterScaling(double WXUNUSED_WITHOUT_PS(x), double WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaling( x, y );
+#endif
+}
+
+void wxPrintData::SetPrinterTranslateX(long WXUNUSED_WITHOUT_PS(x))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateX( x );
+#endif
+}
+
+void wxPrintData::SetPrinterTranslateY(long WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateY( y );
+#endif
+}
+
+void wxPrintData::SetPrinterTranslation(long WXUNUSED_WITHOUT_PS(x), long WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslation( x, y );
+#endif
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// Print dialog data
+// ----------------------------------------------------------------------------
+
+wxPrintDialogData::wxPrintDialogData()
+{
+    m_printFromPage = 0;
+    m_printToPage = 0;
+    m_printMinPage = 0;
+    m_printMaxPage = 0;
+    m_printNoCopies = 1;
+    m_printAllPages = false;
+    m_printCollate = false;
+    m_printToFile = false;
+    m_printSelection = false;
+    m_printEnableSelection = false;
+    m_printEnablePageNumbers = true;
+
+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+    m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
+
+    m_printEnableHelp = false;
+#if WXWIN_COMPATIBILITY_2_4
+    m_printSetupDialog = false;
+#endif
+}
+
+wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
+    : wxObject()
+{
+    (*this) = dialogData;
+}
+
+wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
+{
+    m_printFromPage = 1;
+    m_printToPage = 0;
+    m_printMinPage = 1;
+    m_printMaxPage = 9999;
+    m_printNoCopies = 1;
+    m_printAllPages = false;
+    m_printCollate = false;
+    m_printToFile = false;
+    m_printSelection = false;
+    m_printEnableSelection = false;
+    m_printEnablePageNumbers = true;
+    m_printEnablePrintToFile = true;
+    m_printEnableHelp = false;
+#if WXWIN_COMPATIBILITY_2_4
+    m_printSetupDialog = false;
+#endif
+    m_printData = printData;
+}
+
+wxPrintDialogData::~wxPrintDialogData()
+{
+}
+
+void wxPrintDialogData::operator=(const wxPrintDialogData& data)
+{
+    m_printFromPage = data.m_printFromPage;
+    m_printToPage = data.m_printToPage;
+    m_printMinPage = data.m_printMinPage;
+    m_printMaxPage = data.m_printMaxPage;
+    m_printNoCopies = data.m_printNoCopies;
+    m_printAllPages = data.m_printAllPages;
+    m_printCollate = data.m_printCollate;
+    m_printToFile = data.m_printToFile;
+    m_printSelection = data.m_printSelection;
+    m_printEnableSelection = data.m_printEnableSelection;
+    m_printEnablePageNumbers = data.m_printEnablePageNumbers;
+    m_printEnableHelp = data.m_printEnableHelp;
+    m_printEnablePrintToFile = data.m_printEnablePrintToFile;
+#if WXWIN_COMPATIBILITY_2_4
+    m_printSetupDialog = data.m_printSetupDialog;
+#endif
+    m_printData = data.m_printData;
+}
+
+void wxPrintDialogData::operator=(const wxPrintData& data)
+{
+    m_printData = data;
+}
+
+// ----------------------------------------------------------------------------
+// wxPageSetupDialogData
+// ----------------------------------------------------------------------------
+
+wxPageSetupDialogData::wxPageSetupDialogData()
+{
+    m_paperSize = wxSize(0,0);
+
+    CalculatePaperSizeFromId();
+
+    m_minMarginTopLeft =
+    m_minMarginBottomRight =
+    m_marginTopLeft =
+    m_marginBottomRight = wxPoint(0,0);
+
+    // Flags
+    m_defaultMinMargins = false;
+    m_enableMargins = true;
+    m_enableOrientation = true;
+    m_enablePaper = true;
+    m_enablePrinter = true;
+    m_enableHelp = false;
+    m_getDefaultInfo = false;
+}
+
+wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
+    : wxObject()
+{
+    (*this) = dialogData;
+}
+
+wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
+{
+    m_paperSize = wxSize(0,0);
+    m_minMarginTopLeft =
+    m_minMarginBottomRight =
+    m_marginTopLeft =
+    m_marginBottomRight = wxPoint(0,0);
+
+    // Flags
+    m_defaultMinMargins = false;
+    m_enableMargins = true;
+    m_enableOrientation = true;
+    m_enablePaper = true;
+    m_enablePrinter = true;
+    m_enableHelp = false;
+    m_getDefaultInfo = false;
+
+    m_printData = printData;
+
+    // The wxPrintData paper size overrides these values, unless the size cannot
+    // be found.
+    CalculatePaperSizeFromId();
+}
+
+wxPageSetupDialogData::~wxPageSetupDialogData()
+{
+}
+
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
+{
+    m_paperSize = data.m_paperSize;
+    m_minMarginTopLeft = data.m_minMarginTopLeft;
+    m_minMarginBottomRight = data.m_minMarginBottomRight;
+    m_marginTopLeft = data.m_marginTopLeft;
+    m_marginBottomRight = data.m_marginBottomRight;
+    m_defaultMinMargins = data.m_defaultMinMargins;
+    m_enableMargins = data.m_enableMargins;
+    m_enableOrientation = data.m_enableOrientation;
+    m_enablePaper = data.m_enablePaper;
+    m_enablePrinter = data.m_enablePrinter;
+    m_getDefaultInfo = data.m_getDefaultInfo;
+    m_enableHelp = data.m_enableHelp;
+
+    m_printData = data.m_printData;
+
+    return *this;
+}
+
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
+{
+    m_printData = data;
+    CalculatePaperSizeFromId();
+
+    return *this;
+}
+
+// If a corresponding paper type is found in the paper database, will set the m_printData
+// paper size id member as well.
+void wxPageSetupDialogData::SetPaperSize(const wxSize& sz)
+{
+    m_paperSize = sz;
+
+    CalculateIdFromPaperSize();
+}
+
+// Sets the wxPrintData id, plus the paper width/height if found in the paper database.
+void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
+{
+    m_printData.SetPaperId(id);
+
+    CalculatePaperSizeFromId();
+}
+
+void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
+{
+    m_printData = printData;
+    CalculatePaperSizeFromId();
+}
+
+// Use paper size defined in this object to set the wxPrintData
+// paper id
+void wxPageSetupDialogData::CalculateIdFromPaperSize()
+{
+    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
+
+    wxSize sz = GetPaperSize();
+
+    wxPaperSize id = wxThePrintPaperDatabase->GetSize(wxSize(sz.x* 10, sz.y * 10));
+    if (id != wxPAPER_NONE)
+    {
+        m_printData.SetPaperId(id);
+    }
+}
+
+// Use paper id in wxPrintData to set this object's paper size
+void wxPageSetupDialogData::CalculatePaperSizeFromId()
+{
+    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
+
+    wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
+
+    if (sz != wxSize(0, 0))
+    {
+        // sz is in 10ths of a mm, while paper size is in mm
+        m_paperSize.x = sz.x / 10;
+        m_paperSize.y = sz.y / 10;
+    }
+}
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/Source/3rd Party/wx/src/common/colourcmn.cpp b/Source/3rd Party/wx/src/common/colourcmn.cpp
index 9a2905398..5851dfcdf 100644
--- a/Source/3rd Party/wx/src/common/colourcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/colourcmn.cpp	
@@ -1,369 +1,126 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/colourcmn.cpp
-// Purpose:     wxColourBase implementation
-// Author:      Francesco Montorsi
-// Modified by:
-// Created:     20/4/2006
-// RCS-ID:      $Id$
-// Copyright:   (c) Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/colour.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/gdicmn.h"
-    #include "wx/wxcrtvararg.h"
-#endif
-
-#if wxUSE_VARIANT
-IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
-#endif
-
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-
-#include <string.h>
-
-template<> void wxStringReadValue(const wxString &s, wxColour &data )
-{
-    if ( !data.Set(s) )
-    {
-        wxLogError(_("String To Colour : Incorrect colour specification : %s"),
-                   s.c_str() );
-        data = wxNullColour;
-    }
-}
-
-template<> void wxStringWriteValue(wxString &s, const wxColour &data )
-{
-    s = data.GetAsString(wxC2S_HTML_SYNTAX);
-}
-
-wxTO_STRING_IMP( wxColour )
-wxFROM_STRING_IMP( wxColour )
-
-wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour, wxObject,  \
-                                                      "wx/colour.h",  &wxTO_STRING( wxColour ), &wxFROM_STRING( wxColour ))
-//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxColour>)
-wxBEGIN_PROPERTIES_TABLE(wxColour)
-wxREADONLY_PROPERTY( Red, unsigned char, Red, wxEMPTY_PARAMETER_VALUE, \
-                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxREADONLY_PROPERTY( Green, unsigned char, Green, wxEMPTY_PARAMETER_VALUE, \
-                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxREADONLY_PROPERTY( Blue, unsigned char, Blue, wxEMPTY_PARAMETER_VALUE, \
-                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, \
-                       unsigned char, Green, unsigned char, Blue )
-
-wxEMPTY_HANDLERS_TABLE(wxColour)
-#else
-
-#if wxCOLOUR_IS_GDIOBJECT
-wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxGDIObject)
-#else
-wxIMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
-
-#endif
-
-// ============================================================================
-// wxString <-> wxColour conversions
-// ============================================================================
-
-bool wxColourBase::FromString(const wxString& str)
-{
-    if ( str.empty() )
-        return false;       // invalid or empty string
-
-    if ( wxStrnicmp(str, wxT("RGB"), 3) == 0 )
-    {
-        // CSS-like RGB specification
-        // according to http://www.w3.org/TR/css3-color/#colorunits
-        // values outside 0-255 range are allowed but should be clipped
-        int red, green, blue,
-            alpha = wxALPHA_OPAQUE;
-        if ( str.length() > 3 && (str[3] == wxT('a') || str[3] == wxT('A')) )
-        {
-            // We can't use sscanf() for the alpha value as sscanf() uses the
-            // current locale while the floating point numbers in CSS always
-            // use point as decimal separator, regardless of locale. So parse
-            // the tail of the string manually by putting it in a buffer and
-            // using wxString::ToCDouble() below. Notice that we can't use "%s"
-            // for this as it stops at white space and we need "%c" to avoid
-            // this and really get all the rest of the string into the buffer.
-
-            const unsigned len = str.length(); // always big enough
-            wxCharBuffer alphaBuf(len);
-            char * const alphaPtr = alphaBuf.data();
-
-            for ( unsigned n = 0; n < len; n++ )
-                alphaPtr[n] = '\0';
-
-            // Construct the format string which ensures that the last argument
-            // receives all the rest of the string.
-            wxString formatStr;
-            formatStr << wxS("( %d , %d , %d , %") << len << 'c';
-
-            // Notice that we use sscanf() here because if the string is not
-            // ASCII it can't represent a valid RGB colour specification anyhow
-            // and like this we can be sure that %c corresponds to "char *"
-            // while with wxSscanf() it depends on the type of the string
-            // passed as first argument: if it is a wide string, then %c
-            // expects "wchar_t *" matching parameter under MSW for example.
-            if ( sscanf(str.c_str() + 4,
-                        formatStr.mb_str(),
-                        &red, &green, &blue, alphaPtr) != 4 )
-                return false;
-
-            // Notice that we must explicitly specify the length to get rid of
-            // trailing NULs.
-            wxString alphaStr(alphaPtr, wxStrlen(alphaPtr));
-            if ( alphaStr.empty() || alphaStr.Last() != ')' )
-                return false;
-
-            alphaStr.RemoveLast();
-            alphaStr.Trim();
-
-            double a;
-            if ( !alphaStr.ToCDouble(&a) )
-                return false;
-
-            alpha = wxRound(a * 255);
-        }
-        else // no 'a' following "rgb"
-        {
-            if ( wxSscanf(str.wx_str() + 3, wxT("( %d , %d , %d )"),
-                                                &red, &green, &blue) != 3 )
-                return false;
-        }
-
-        Set((unsigned char)wxClip(red, 0, 255),
-            (unsigned char)wxClip(green, 0, 255),
-            (unsigned char)wxClip(blue, 0, 255),
-            (unsigned char)wxClip(alpha, 0, 255));
-    }
-    else if ( str[0] == wxT('#') && wxStrlen(str) == 7 )
-    {
-        // hexadecimal prefixed with # (HTML syntax)
-        unsigned long tmp;
-        if (wxSscanf(str.wx_str() + 1, wxT("%lx"), &tmp) != 1)
-            return false;
-
-        Set((unsigned char)(tmp >> 16),
-            (unsigned char)(tmp >> 8),
-            (unsigned char)tmp);
-    }
-    else if (wxTheColourDatabase) // a colour name ?
-    {
-        // we can't do
-        // *this = wxTheColourDatabase->Find(str)
-        // because this place can be called from constructor
-        // and 'this' could not be available yet
-        wxColour clr = wxTheColourDatabase->Find(str);
-        if (clr.IsOk())
-            Set((unsigned char)clr.Red(),
-                (unsigned char)clr.Green(),
-                (unsigned char)clr.Blue());
-    }
-
-    if (IsOk())
-        return true;
-
-    wxLogDebug(wxT("wxColour::Set - couldn't set to colour string '%s'"), str);
-    return false;
-}
-
-wxString wxColourBase::GetAsString(long flags) const
-{
-    wxString colName;
-
-    const bool isOpaque = Alpha() == wxALPHA_OPAQUE;
-
-    // we can't use the name format if the colour is not opaque as the alpha
-    // information would be lost
-    if ( (flags & wxC2S_NAME) && isOpaque )
-    {
-        colName = wxTheColourDatabase->FindName(
-                    static_cast<const wxColour &>(*this)).MakeLower();
-    }
-
-    if ( colName.empty() )
-    {
-        const int red = Red(),
-                  blue = Blue(),
-                  green = Green();
-
-        if ( flags & wxC2S_CSS_SYNTAX )
-        {
-            // no name for this colour; return it in CSS syntax
-            if ( isOpaque )
-            {
-                colName.Printf(wxT("rgb(%d, %d, %d)"), red, green, blue);
-            }
-            else // use rgba() form
-            {
-                colName.Printf(wxT("rgba(%d, %d, %d, %s)"),
-                               red, green, blue,
-                               wxString::FromCDouble(Alpha() / 255., 3));
-            }
-        }
-        else if ( flags & wxC2S_HTML_SYNTAX )
-        {
-            wxASSERT_MSG( isOpaque, "alpha is lost in HTML syntax" );
-
-            // no name for this colour; return it in HTML syntax
-            colName.Printf(wxT("#%02X%02X%02X"), red, green, blue);
-        }
-    }
-
-    // this function should alway returns a non-empty string
-    wxASSERT_MSG(!colName.empty(),
-                 wxT("Invalid wxColour -> wxString conversion flags"));
-
-    return colName;
-}
-
-// static
-void wxColourBase::MakeMono(unsigned char* r, unsigned char* g, unsigned char* b,
-                            bool on)
-{
-    *r = *g = *b = on ? 255 : 0;
-}
-
-// static
-void wxColourBase::MakeGrey(unsigned char* r, unsigned char* g, unsigned char* b
-                            /*, unsigned char brightness */
-                           )
-{
-    *r = *g = *b = (wxByte)(((*b)*117UL + (*g)*601UL + (*r)*306UL) >> 10);
-}
-
-// static
-void wxColourBase::MakeGrey(unsigned char* r, unsigned char* g, unsigned char* b,
-                            double weight_r, double weight_g, double weight_b)
-{
-    double luma = (*r) * weight_r + (*g) * weight_g + (*b) * weight_b;
-    *r = *g = *b = (wxByte)wxRound(luma);
-}
-
-// static
-void wxColourBase::MakeDisabled(unsigned char* r, unsigned char* g, unsigned char* b,
-                                unsigned char brightness)
-{
-    //MakeGrey(r, g, b, brightness); // grey no-blend version
-    *r = AlphaBlend(*r, brightness, 0.4);
-    *g = AlphaBlend(*g, brightness, 0.4);
-    *b = AlphaBlend(*b, brightness, 0.4);
-}
-
-// AlphaBlend is used by ChangeLightness and MakeDisabled
-
-// static
-unsigned char wxColourBase::AlphaBlend(unsigned char fg, unsigned char bg,
-                                       double alpha)
-{
-    double result = bg + (alpha * (fg - bg));
-    result = wxMax(result,   0.0);
-    result = wxMin(result, 255.0);
-    return (unsigned char)result;
-}
-
-// ChangeLightness() is a utility function that simply darkens
-// or lightens a color, based on the specified percentage
-// ialpha of 0 would be completely black, 100 completely white
-// an ialpha of 100 returns the same colour
-
-// static
-void wxColourBase::ChangeLightness(unsigned char* r, unsigned char* g, unsigned char* b,
-                                   int ialpha)
-{
-    if (ialpha == 100) return;
-
-    // ialpha is 0..200 where 0 is completely black
-    // and 200 is completely white and 100 is the same
-    // convert that to normal alpha 0.0 - 1.0
-    ialpha = wxMax(ialpha,   0);
-    ialpha = wxMin(ialpha, 200);
-    double alpha = ((double)(ialpha - 100.0))/100.0;
-
-    unsigned char bg;
-    if (ialpha > 100)
-    {
-        // blend with white
-        bg = 255;
-        alpha = 1.0 - alpha;  // 0 = transparent fg; 1 = opaque fg
-    }
-    else
-    {
-        // blend with black
-        bg = 0;
-        alpha = 1.0 + alpha;  // 0 = transparent fg; 1 = opaque fg
-    }
-
-    *r = AlphaBlend(*r, bg, alpha);
-    *g = AlphaBlend(*g, bg, alpha);
-    *b = AlphaBlend(*b, bg, alpha);
-}
-
-wxColour wxColourBase::ChangeLightness(int ialpha) const
-{
-    wxByte r = Red();
-    wxByte g = Green();
-    wxByte b = Blue();
-    ChangeLightness(&r, &g, &b, ialpha);
-    return wxColour(r,g,b);
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-
-// static
-wxColour wxColourBase::CreateByName(const wxString& name)
-{
-    return wxColour(name);
-}
-
-void wxColourBase::InitFromName(const wxString& col)
-{
-    Set(col);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
-// wxColour <-> wxString utilities, used by wxConfig
-wxString wxToString(const wxColourBase& col)
-{
-    return col.IsOk() ? col.GetAsString(wxC2S_CSS_SYNTAX)
-                      : wxString();
-}
-
-bool wxFromString(const wxString& str, wxColourBase *col)
-{
-    wxCHECK_MSG( col, false, wxT("NULL output parameter") );
-
-    if ( str.empty() )
-    {
-        *col = wxNullColour;
-        return true;
-    }
-
-    return col->Set(str);
-}
-
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/colourcmn.cpp
+// Purpose:     wxColourBase implementation
+// Author:      Francesco Montorsi
+// Modified by:
+// Created:     20/4/2006
+// RCS-ID:      $Id: colourcmn.cpp 41538 2006-09-30 20:45:15Z RR $
+// Copyright:   (c) Francesco Montorsi
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/gdicmn.h"
+#endif
+
+#if wxUSE_VARIANT
+IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
+#endif
+
+// ============================================================================
+// wxString <-> wxColour conversions
+// ============================================================================
+
+bool wxColourBase::FromString(const wxChar *str)
+{
+    if ( str == NULL || str[0] == wxT('\0'))
+        return false;       // invalid or empty string
+
+    if ( wxStrncmp(str, wxT("RGB"), 3) == 0 ||
+         wxStrncmp(str, wxT("rgb"), 3) == 0 )
+    {
+        // CSS-like RGB specification
+        // according to http://www.w3.org/TR/REC-CSS2/syndata.html#color-units
+        // values outside 0-255 range are allowed but should be clipped
+        int red, green, blue;
+        if (wxSscanf(&str[3], wxT("(%d, %d, %d)"), &red, &green, &blue) != 3)
+            return false;
+
+        Set((unsigned char)wxClip(red,0,255),
+            (unsigned char)wxClip(green,0,255),
+            (unsigned char)wxClip(blue,0,255));
+    }
+    else if ( str[0] == wxT('#') && wxStrlen(str) == 7 )
+    {
+        // hexadecimal prefixed with # (HTML syntax)
+        unsigned long tmp;
+        if (wxSscanf(&str[1], wxT("%lx"), &tmp) != 1)
+            return false;
+
+        Set((unsigned char)(tmp >> 16),
+            (unsigned char)(tmp >> 8),
+            (unsigned char)tmp);
+    }
+    else if (wxTheColourDatabase) // a colour name ?
+    {
+        // we can't do
+        // *this = wxTheColourDatabase->Find(str)
+        // because this place can be called from constructor
+        // and 'this' could not be available yet
+        wxColour clr = wxTheColourDatabase->Find(str);
+        if (clr.Ok())
+            Set((unsigned char)clr.Red(),
+                (unsigned char)clr.Green(),
+                (unsigned char)clr.Blue());
+    }
+
+    if (Ok())
+        return true;
+
+    wxLogDebug(wxT("wxColour::Set - couldn't set to colour string '%s'"), str);
+    return false;
+}
+
+wxString wxColourBase::GetAsString(long flags) const
+{
+    wxString colName;
+
+    if (flags & wxC2S_NAME)
+        colName = wxTheColourDatabase->FindName((const wxColour &)(*this)).MakeLower();
+
+    if ( colName.empty() && (flags & wxC2S_CSS_SYNTAX) )
+    {
+        // no name for this colour; return it in CSS syntax
+        colName.Printf(wxT("rgb(%d, %d, %d)"),
+                       Red(), Green(), Blue());
+    }
+    else if ( colName.empty() && (flags & wxC2S_HTML_SYNTAX) )
+    {
+        // no name for this colour; return it in HTML syntax
+        colName.Printf(wxT("#%02X%02X%02X"),
+                       Red(), Green(), Blue());
+    }
+
+    // this function always returns a non-empty string
+    wxASSERT_MSG(!colName.empty(),
+                 wxT("Invalid wxColour -> wxString conversion flags"));
+
+    return colName;
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+
+// static
+wxColour wxColourBase::CreateByName(const wxString& name)
+{
+    return wxColour(name);
+}
+
+void wxColourBase::InitFromName(const wxString& col)
+{
+    Set(col);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
diff --git a/Source/3rd Party/wx/src/common/colourdata.cpp b/Source/3rd Party/wx/src/common/colourdata.cpp
deleted file mode 100644
index bf7039d73..000000000
--- a/Source/3rd Party/wx/src/common/colourdata.cpp	
+++ /dev/null
@@ -1,108 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/colourdata.cpp
-// Author:      Julian Smart
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_COLOURDLG || wxUSE_COLOURPICKERCTRL
-
-#include "wx/colourdata.h"
-#include "wx/tokenzr.h"
-
-// ----------------------------------------------------------------------------
-// wxColourData
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
-
-wxColourData::wxColourData()
-{
-    m_chooseFull = false;
-    m_dataColour.Set(0,0,0);
-    // m_custColours are wxNullColours initially
-}
-
-wxColourData::wxColourData(const wxColourData& data)
-            : wxObject()
-{
-    (*this) = data;
-}
-
-wxColourData::~wxColourData()
-{
-}
-
-void wxColourData::SetCustomColour(int i, const wxColour& colour)
-{
-    wxCHECK_RET( i >= 0 && i < NUM_CUSTOM, wxT("custom colour index out of range") );
-
-    m_custColours[i] = colour;
-}
-
-wxColour wxColourData::GetCustomColour(int i) const
-{
-    wxCHECK_MSG( i >= 0 && i < NUM_CUSTOM, wxColour(0,0,0),
-                 wxT("custom colour index out of range") );
-
-    return m_custColours[i];
-}
-
-wxColourData& wxColourData::operator=(const wxColourData& data)
-{
-    for ( int i = 0; i < NUM_CUSTOM; i++)
-        m_custColours[i] = data.m_custColours[i];
-
-    m_dataColour = data.m_dataColour;
-    m_chooseFull = data.m_chooseFull;
-
-    return *this;
-}
-
-// ----------------------------------------------------------------------------
-// [de]serialization
-// ----------------------------------------------------------------------------
-
-// separator used between different fields
-static const char wxCOL_DATA_SEP = ',';
-
-wxString wxColourData::ToString() const
-{
-    wxString str(m_chooseFull ? '1' : '0');
-
-    for ( int i = 0; i < NUM_CUSTOM; i++ )
-    {
-        str += wxCOL_DATA_SEP;
-
-        const wxColour& clr = m_custColours[i];
-        if ( clr.IsOk() )
-            str += clr.GetAsString(wxC2S_HTML_SYNTAX);
-    }
-
-    return str;
-}
-
-bool wxColourData::FromString(const wxString& str)
-{
-    wxStringTokenizer tokenizer(str, wxCOL_DATA_SEP);
-    wxString token = tokenizer.GetNextToken();
-    m_chooseFull = token == '1';
-    bool success = m_chooseFull || token == '0';
-    for (int i = 0; success && i < NUM_CUSTOM; i++)
-    {
-        token = tokenizer.GetNextToken();
-        if (token.empty())
-            m_custColours[i] = wxColour();
-        else
-            success = m_custColours[i].Set(token);
-    }
-    return success;
-}
-#endif // wxUSE_COLOURDLG || wxUSE_COLOURPICKERCTRL
diff --git a/Source/3rd Party/wx/src/common/combocmn.cpp b/Source/3rd Party/wx/src/common/combocmn.cpp
index cc2931847..f67061a3c 100644
--- a/Source/3rd Party/wx/src/common/combocmn.cpp	
+++ b/Source/3rd Party/wx/src/common/combocmn.cpp	
@@ -1,2916 +1,2340 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/combocmn.cpp
-// Purpose:     wxComboCtrlBase
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     Apr-30-2006
-// RCS-ID:      $Id$
-// Copyright:   (c) 2005 Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_COMBOBOX
-#include "wx/combobox.h"
-extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[] = "comboBox";
-#endif
-
-#if wxUSE_COMBOCTRL
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/log.h"
-    #include "wx/dcclient.h"
-    #include "wx/settings.h"
-    #include "wx/timer.h"
-    #include "wx/textctrl.h"
-#endif
-
-#include "wx/tooltip.h"
-
-#include "wx/combo.h"
-
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxComboBoxStyle )
-wxBEGIN_FLAGS( wxComboBoxStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxCB_SIMPLE)
-wxFLAGS_MEMBER(wxCB_SORT)
-wxFLAGS_MEMBER(wxCB_READONLY)
-wxFLAGS_MEMBER(wxCB_DROPDOWN)
-
-wxEND_FLAGS( wxComboBoxStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxComboBox)
-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )
-wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
-
-// TODO DELEGATES
-wxPROPERTY( Font, wxFont, SetFont, GetFont, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \
-                      GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Value,wxString, SetValue, GetValue, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Selection,int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group"))
-
-wxPROPERTY_FLAGS( WindowStyle, wxComboBoxStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxComboBox)
-
-wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
-                wxString, Value, wxPoint, Position, wxSize, Size )
-
-// constants
-// ----------------------------------------------------------------------------
-
-#define DEFAULT_DROPBUTTON_WIDTH                19
-
-#define BMP_BUTTON_MARGIN                       4
-
-#define DEFAULT_POPUP_HEIGHT                    400
-
-#define DEFAULT_TEXT_INDENT                     3
-
-#define COMBO_MARGIN                            2 // spacing right of wxTextCtrl
-
-
-#if defined(__WXMSW__)
-
-// Let's use wxFrame as a fall-back solution until wxMSW gets wxNonOwnedWindow
-#include "wx/frame.h"
-#define wxCC_GENERIC_TLW_IS_FRAME
-#define wxComboCtrlGenericTLW   wxFrame
-
-#define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
-#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
-                                        // native controls work on it like normal.
-#define POPUPWIN_IS_PERFECT           0 // Same, but for non-transient popup window.
-#define TEXTCTRL_TEXT_CENTERED        0 // 1 if text in textctrl is vertically centered
-#define FOCUS_RING                    0 // No focus ring on wxMSW
-
-//#undef wxUSE_POPUPWIN
-//#define wxUSE_POPUPWIN 0
-
-#elif defined(__WXGTK__)
-
-// NB: It is not recommended to use wxDialog as popup on wxGTK, because of
-//     this bug: If wxDialog is hidden, its position becomes corrupt
-//     between hide and next show, but without internal coordinates being
-//     reflected (or something like that - atleast commenting out ->Hide()
-//     seemed to eliminate the position change).
-
-#include "wx/dialog.h"
-#define wxCC_GENERIC_TLW_IS_DIALOG
-#define wxComboCtrlGenericTLW   wxDialog
-
-#if defined(__WXGTK20__)
-# include "wx/gtk/private.h"
-#else
-# include "wx/gtk1/private.h"
-#endif
-
-// NB: Let's not be afraid to use wxGTK's wxPopupTransientWindow as a
-//     'perfect' popup, as it can successfully host child controls even in
-//     popups that are shown in modal dialogs.
-
-#define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
-#define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common
-                                        // native controls work on it like normal.
-#define POPUPWIN_IS_PERFECT           1 // Same, but for non-transient popup window.
-#define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
-#define FOCUS_RING                    0 // No focus ring on wxGTK
-
-#elif defined(__WXMAC__)
-
-#include "wx/nonownedwnd.h"
-#define wxCC_GENERIC_TLW_IS_NONOWNEDWINDOW
-#define wxComboCtrlGenericTLW   wxNonOwnedWindow
-
-#define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
-#define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common
-                                        // native controls work on it like normal.
-#define POPUPWIN_IS_PERFECT           1 // Same, but for non-transient popup window.
-#define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
-#define FOCUS_RING                    3 // Reserve room for the textctrl's focus ring to display
-
-#undef DEFAULT_DROPBUTTON_WIDTH
-#define DEFAULT_DROPBUTTON_WIDTH      22
-#undef COMBO_MARGIN
-#define COMBO_MARGIN                  FOCUS_RING
-
-#else
-
-#include "wx/dialog.h"
-#define wxCC_GENERIC_TLW_IS_DIALOG
-#define wxComboCtrlGenericTLW   wxDialog
-
-#define USE_TRANSIENT_POPUP           0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
-#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
-                                        // native controls work on it like normal.
-#define POPUPWIN_IS_PERFECT           0 // Same, but for non-transient popup window.
-#define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
-#define FOCUS_RING                    0
-
-#endif
-
-
-// Popupwin is really only supported on wxMSW (not WINCE) and wxGTK, regardless
-// what the wxUSE_POPUPWIN says.
-// FIXME: Why isn't wxUSE_POPUPWIN reliable any longer? (it was in wxW2.6.2)
-#if (!defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMAC__)) || defined(__WXWINCE__)
-#undef wxUSE_POPUPWIN
-#define wxUSE_POPUPWIN 0
-#endif
-
-
-#if wxUSE_POPUPWIN
-    #include "wx/popupwin.h"
-#else
-    #undef USE_TRANSIENT_POPUP
-    #define USE_TRANSIENT_POPUP 0
-#endif
-
-
-// Define different types of popup windows
-enum
-{
-    POPUPWIN_NONE                   = 0,
-    POPUPWIN_WXPOPUPTRANSIENTWINDOW = 1,
-    POPUPWIN_WXPOPUPWINDOW          = 2,
-    POPUPWIN_GENERICTLW             = 3
-};
-
-
-#if USE_TRANSIENT_POPUP
-    // wxPopupTransientWindow is implemented
-
-    #define wxComboPopupWindowBase  wxPopupTransientWindow
-    #define PRIMARY_POPUP_TYPE      POPUPWIN_WXPOPUPTRANSIENTWINDOW
-    #define USES_WXPOPUPTRANSIENTWINDOW 1
-
-    #if TRANSIENT_POPUPWIN_IS_PERFECT
-        //
-    #elif POPUPWIN_IS_PERFECT
-        #define wxComboPopupWindowBase2     wxPopupWindow
-        #define SECONDARY_POPUP_TYPE        POPUPWIN_WXPOPUPWINDOW
-        #define USES_WXPOPUPWINDOW          1
-    #else
-        #define wxComboPopupWindowBase2     wxComboCtrlGenericTLW
-        #define SECONDARY_POPUP_TYPE        POPUPWIN_GENERICTLW
-        #define USES_GENERICTLW             1
-    #endif
-
-#elif wxUSE_POPUPWIN
-    // wxPopupWindow (but not wxPopupTransientWindow) is properly implemented
-
-    #define wxComboPopupWindowBase      wxPopupWindow
-    #define PRIMARY_POPUP_TYPE          POPUPWIN_WXPOPUPWINDOW
-    #define USES_WXPOPUPWINDOW          1
-
-    #if !POPUPWIN_IS_PERFECT
-        #define wxComboPopupWindowBase2     wxComboCtrlGenericTLW
-        #define SECONDARY_POPUP_TYPE        POPUPWIN_GENERICTLW
-        #define USES_GENERICTLW             1
-    #endif
-
-#else
-    // wxPopupWindow is not implemented
-
-    #define wxComboPopupWindowBase      wxComboCtrlGenericTLW
-    #define PRIMARY_POPUP_TYPE          POPUPWIN_GENERICTLW
-    #define USES_GENERICTLW             1
-
-#endif
-
-
-#ifndef USES_WXPOPUPTRANSIENTWINDOW
-    #define USES_WXPOPUPTRANSIENTWINDOW 0
-#endif
-
-#ifndef USES_WXPOPUPWINDOW
-    #define USES_WXPOPUPWINDOW          0
-#endif
-
-#ifndef USES_GENERICTLW
-    #define USES_GENERICTLW             0
-#endif
-
-
-#if USES_WXPOPUPWINDOW
-    #define INSTALL_TOPLEV_HANDLER      1
-#else
-    #define INSTALL_TOPLEV_HANDLER      0
-#endif
-
-
-// Returns true if given popup window type can be classified as perfect
-// on this platform.
-static inline bool IsPopupWinTypePerfect( wxByte popupWinType )
-{
-#if POPUPWIN_IS_PERFECT && TRANSIENT_POPUPWIN_IS_PERFECT
-    wxUnusedVar(popupWinType);
-    return true;
-#else
-    return ( popupWinType == POPUPWIN_GENERICTLW
-        #if POPUPWIN_IS_PERFECT
-             || popupWinType == POPUPWIN_WXPOPUPWINDOW
-        #endif
-        #if TRANSIENT_POPUPWIN_IS_PERFECT
-             || popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW
-        #endif
-            );
-#endif
-}
-
-
-//
-// ** TODO **
-// * wxComboPopupWindow for external use (ie. replace old wxUniv wxPopupComboWindow)
-//
-
-
-// ----------------------------------------------------------------------------
-// wxComboFrameEventHandler takes care of hiding the popup when events happen
-// in its top level parent.
-// ----------------------------------------------------------------------------
-
-#if INSTALL_TOPLEV_HANDLER
-
-//
-// This will no longer be necessary after wxTransientPopupWindow
-// works well on all platforms.
-//
-
-class wxComboFrameEventHandler : public wxEvtHandler
-{
-public:
-    wxComboFrameEventHandler( wxComboCtrlBase* pCb );
-    virtual ~wxComboFrameEventHandler();
-
-    void OnPopup();
-
-    void OnIdle( wxIdleEvent& event );
-    void OnMouseEvent( wxMouseEvent& event );
-    void OnActivate( wxActivateEvent& event );
-    void OnResize( wxSizeEvent& event );
-    void OnMove( wxMoveEvent& event );
-    void OnMenuEvent( wxMenuEvent& event );
-    void OnClose( wxCloseEvent& event );
-
-protected:
-    wxWindow*                       m_focusStart;
-    wxComboCtrlBase*     m_combo;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxComboFrameEventHandler, wxEvtHandler)
-    EVT_IDLE(wxComboFrameEventHandler::OnIdle)
-    EVT_LEFT_DOWN(wxComboFrameEventHandler::OnMouseEvent)
-    EVT_RIGHT_DOWN(wxComboFrameEventHandler::OnMouseEvent)
-    EVT_SIZE(wxComboFrameEventHandler::OnResize)
-    EVT_MOVE(wxComboFrameEventHandler::OnMove)
-    EVT_MENU_HIGHLIGHT(wxID_ANY,wxComboFrameEventHandler::OnMenuEvent)
-    EVT_MENU_OPEN(wxComboFrameEventHandler::OnMenuEvent)
-    EVT_ACTIVATE(wxComboFrameEventHandler::OnActivate)
-    EVT_CLOSE(wxComboFrameEventHandler::OnClose)
-END_EVENT_TABLE()
-
-wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboCtrlBase* combo )
-    : wxEvtHandler()
-{
-    m_combo = combo;
-}
-
-wxComboFrameEventHandler::~wxComboFrameEventHandler()
-{
-}
-
-void wxComboFrameEventHandler::OnPopup()
-{
-    m_focusStart = ::wxWindow::FindFocus();
-}
-
-void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
-{
-    wxWindow* winFocused = ::wxWindow::FindFocus();
-
-    wxWindow* popup = m_combo->GetPopupControl()->GetControl();
-    wxWindow* winpopup = m_combo->GetPopupWindow();
-
-    if (
-         winFocused != m_focusStart &&
-         winFocused != popup &&
-         winFocused->GetParent() != popup &&
-         winFocused != winpopup &&
-         winFocused->GetParent() != winpopup &&
-         winFocused != m_combo &&
-         winFocused != m_combo->GetButton() // GTK (atleast) requires this
-        )
-    {
-        m_combo->HidePopup(true);
-    }
-
-    event.Skip();
-}
-
-void wxComboFrameEventHandler::OnMenuEvent( wxMenuEvent& event )
-{
-    m_combo->HidePopup(true);
-    event.Skip();
-}
-
-void wxComboFrameEventHandler::OnMouseEvent( wxMouseEvent& event )
-{
-    m_combo->HidePopup(true);
-    event.Skip();
-}
-
-void wxComboFrameEventHandler::OnClose( wxCloseEvent& event )
-{
-    m_combo->HidePopup(true);
-    event.Skip();
-}
-
-void wxComboFrameEventHandler::OnActivate( wxActivateEvent& event )
-{
-    m_combo->HidePopup(true);
-    event.Skip();
-}
-
-void wxComboFrameEventHandler::OnResize( wxSizeEvent& event )
-{
-    m_combo->HidePopup(true);
-    event.Skip();
-}
-
-void wxComboFrameEventHandler::OnMove( wxMoveEvent& event )
-{
-    m_combo->HidePopup(true);
-    event.Skip();
-}
-
-#endif // INSTALL_TOPLEV_HANDLER
-
-// ----------------------------------------------------------------------------
-// wxComboPopupWindow is, in essence, wxPopupWindow customized for
-// wxComboCtrl.
-// ----------------------------------------------------------------------------
-
-class wxComboPopupWindow : public wxComboPopupWindowBase
-{
-public:
-
-    wxComboPopupWindow( wxComboCtrlBase *parent,
-                        int style )
-    #if USES_WXPOPUPWINDOW || USES_WXPOPUPTRANSIENTWINDOW
-                       : wxComboPopupWindowBase(parent,style)
-    #else
-                       : wxComboPopupWindowBase(parent,
-                                                wxID_ANY,
-                                                wxEmptyString,
-                                                wxPoint(-21,-21),
-                                                wxSize(20,20),
-                                                style)
-    #endif
-    {
-        m_inShow = 0;
-    }
-
-#if USES_WXPOPUPTRANSIENTWINDOW
-    virtual bool Show( bool show );
-    virtual bool ProcessLeftDown(wxMouseEvent& event);
-protected:
-    virtual void OnDismiss();
-#endif
-
-private:
-    wxByte      m_inShow;
-};
-
-
-#if USES_WXPOPUPTRANSIENTWINDOW
-bool wxComboPopupWindow::Show( bool show )
-{
-    // Guard against recursion
-    if ( m_inShow )
-        return wxComboPopupWindowBase::Show(show);
-
-    m_inShow++;
-
-    wxPopupTransientWindow* const
-        ptw = static_cast<wxPopupTransientWindow*>(this);
-
-    if ( show != ptw->IsShown() )
-    {
-        if ( show )
-            // We used to do wxPopupTransientWindow::Popup here,
-            // but this would hide normal Show, which we are
-            // also going to need.
-            ptw->Show();
-        else
-            ptw->Dismiss();
-    }
-
-    m_inShow--;
-
-    return true;
-}
-
-bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event)
-{
-    return wxPopupTransientWindow::ProcessLeftDown(event);
-}
-
-// First thing that happens when a transient popup closes is that this method gets called.
-void wxComboPopupWindow::OnDismiss()
-{
-    wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
-    wxASSERT_MSG( wxDynamicCast(combo, wxComboCtrlBase),
-                  wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
-
-    combo->OnPopupDismiss(true);
-}
-#endif // USES_WXPOPUPTRANSIENTWINDOW
-
-
-// ----------------------------------------------------------------------------
-// wxComboPopupWindowEvtHandler does bulk of the custom event handling
-// of a popup window. It is separate so we can have different types
-// of popup windows.
-// ----------------------------------------------------------------------------
-
-class wxComboPopupWindowEvtHandler : public wxEvtHandler
-{
-public:
-
-    wxComboPopupWindowEvtHandler( wxComboCtrlBase *parent )
-    {
-        m_combo = parent;
-    }
-
-    void OnSizeEvent( wxSizeEvent& event );
-    void OnKeyEvent(wxKeyEvent& event);
-#if USES_GENERICTLW
-    void OnActivate( wxActivateEvent& event );
-#endif
-
-private:
-    wxComboCtrlBase*    m_combo;
-
-    DECLARE_EVENT_TABLE()
-};
-
-
-BEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
-    EVT_KEY_DOWN(wxComboPopupWindowEvtHandler::OnKeyEvent)
-    EVT_KEY_UP(wxComboPopupWindowEvtHandler::OnKeyEvent)
-    EVT_CHAR(wxComboPopupWindowEvtHandler::OnKeyEvent)
-#if USES_GENERICTLW
-    EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate)
-#endif
-    EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent)
-END_EVENT_TABLE()
-
-
-void wxComboPopupWindowEvtHandler::OnSizeEvent( wxSizeEvent& WXUNUSED(event) )
-{
-    // Block the event so that the popup control does not get auto-resized.
-}
-
-void wxComboPopupWindowEvtHandler::OnKeyEvent( wxKeyEvent& event )
-{
-    // Relay keyboard event to the main child controls
-    wxWindowList children = m_combo->GetPopupWindow()->GetChildren();
-    wxWindowList::iterator node = children.begin();
-    wxWindow* child = (wxWindow*)*node;
-    child->GetEventHandler()->ProcessEvent(event);
-}
-
-#if USES_GENERICTLW
-void wxComboPopupWindowEvtHandler::OnActivate( wxActivateEvent& event )
-{
-    if ( !event.GetActive() )
-    {
-        // Tell combo control that we are dismissed.
-        m_combo->HidePopup(true);
-
-        event.Skip();
-    }
-}
-#endif
-
-
-// ----------------------------------------------------------------------------
-// wxComboPopup
-//
-// ----------------------------------------------------------------------------
-
-wxComboPopup::~wxComboPopup()
-{
-}
-
-void wxComboPopup::OnPopup()
-{
-}
-
-void wxComboPopup::OnDismiss()
-{
-}
-
-wxComboCtrl* wxComboPopup::GetComboCtrl() const
-{
-    return wxStaticCast(m_combo, wxComboCtrl);
-}
-
-wxSize wxComboPopup::GetAdjustedSize( int minWidth,
-                                      int prefHeight,
-                                      int WXUNUSED(maxHeight) )
-{
-    return wxSize(minWidth,prefHeight);
-}
-
-void wxComboPopup::DefaultPaintComboControl( wxComboCtrlBase* combo,
-                                             wxDC& dc, const wxRect& rect )
-{
-    if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl
-    {
-        combo->PrepareBackground(dc,rect,0);
-
-        dc.DrawText( combo->GetValue(),
-                     rect.x + combo->m_marginLeft,
-                     (rect.height-dc.GetCharHeight())/2 + rect.y );
-    }
-}
-
-void wxComboPopup::PaintComboControl( wxDC& dc, const wxRect& rect )
-{
-    DefaultPaintComboControl(m_combo,dc,rect);
-}
-
-void wxComboPopup::OnComboKeyEvent( wxKeyEvent& event )
-{
-    event.Skip();
-}
-
-void wxComboPopup::OnComboCharEvent( wxKeyEvent& event )
-{
-    event.Skip();
-}
-
-void wxComboPopup::OnComboDoubleClick()
-{
-}
-
-void wxComboPopup::SetStringValue( const wxString& WXUNUSED(value) )
-{
-}
-
-bool wxComboPopup::FindItem(const wxString& WXUNUSED(item),
-                            wxString* WXUNUSED(trueItem))
-{
-    return true;
-}
-
-bool wxComboPopup::LazyCreate()
-{
-    return false;
-}
-
-void wxComboPopup::Dismiss()
-{
-    m_combo->HidePopup(true);
-}
-
-void wxComboPopup::DestroyPopup()
-{
-    // Here we make sure that the popup control's Destroy() gets called.
-    // This is necessary for the wxPersistentWindow to work properly.
-    wxWindow* popupCtrl = GetControl();
-    if ( popupCtrl )
-    {
-        // While all wxComboCtrl examples have m_popupInterface and
-        // popupCtrl as the same class (that will be deleted via the
-        // Destroy() call below), it is technically still possible to
-        // have implementations where they are in fact not same
-        // multiple-inherited class. Here we use C++ RTTI to check for
-        // this rare case.
-      #ifndef wxNO_RTTI
-        // It is probably better to delete m_popupInterface first, so
-        // that it retains access to its popup control window.
-        if ( dynamic_cast<void*>(this) !=
-             dynamic_cast<void*>(popupCtrl) )
-            delete this;
-      #endif
-        popupCtrl->Destroy();
-    }
-    else
-    {
-        delete this;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// input handling
-// ----------------------------------------------------------------------------
-
-//
-// This is pushed to the event handler queue of the child textctrl.
-//
-class wxComboBoxExtraInputHandler : public wxEvtHandler
-{
-public:
-
-    wxComboBoxExtraInputHandler( wxComboCtrlBase* combo )
-        : wxEvtHandler()
-    {
-        m_combo = combo;
-    }
-    virtual ~wxComboBoxExtraInputHandler() { }
-    void OnKey(wxKeyEvent& event);
-    void OnFocus(wxFocusEvent& event);
-
-protected:
-    wxComboCtrlBase*   m_combo;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-
-BEGIN_EVENT_TABLE(wxComboBoxExtraInputHandler, wxEvtHandler)
-    EVT_KEY_DOWN(wxComboBoxExtraInputHandler::OnKey)
-    EVT_KEY_UP(wxComboBoxExtraInputHandler::OnKey)
-    EVT_CHAR(wxComboBoxExtraInputHandler::OnKey)
-    EVT_SET_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
-    EVT_KILL_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
-END_EVENT_TABLE()
-
-
-void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
-{
-    // Let the wxComboCtrl event handler have a go first.
-    wxComboCtrlBase* combo = m_combo;
-
-    wxKeyEvent redirectedEvent(event);
-    redirectedEvent.SetId(combo->GetId());
-    redirectedEvent.SetEventObject(combo);
-
-    if ( !combo->GetEventHandler()->ProcessEvent(redirectedEvent) )
-    {
-        // Don't let TAB through to the text ctrl - looks ugly
-        if ( event.GetKeyCode() != WXK_TAB )
-            event.Skip();
-    }
-}
-
-void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
-{
-    // FIXME: This code does run when control is clicked,
-    //        yet on Windows it doesn't select all the text.
-    if ( event.GetEventType() == wxEVT_SET_FOCUS &&
-        !(m_combo->GetInternalFlags() & wxCC_NO_TEXT_AUTO_SELECT) )
-    {
-        if ( m_combo->GetTextCtrl() )
-            m_combo->GetTextCtrl()->SelectAll();
-        else
-            m_combo->SetSelection(-1,-1);
-    }
-
-    // Send focus indication to parent.
-    // NB: This is needed for cases where the textctrl gets focus
-    //     instead of its parent. While this may trigger multiple
-    //     wxEVT_SET_FOCUSes (since m_text->SetFocus is called
-    //     from combo's focus event handler), they should be quite
-    //     harmless.
-    wxFocusEvent evt2(event);
-    evt2.SetId(m_combo->GetId());
-    evt2.SetEventObject(m_combo);
-    m_combo->GetEventHandler()->ProcessEvent(evt2);
-
-    event.Skip();
-}
-
-
-//
-// This is pushed to the event handler queue of the control in popup.
-//
-
-class wxComboPopupEvtHandler : public wxEvtHandler
-{
-public:
-
-    wxComboPopupEvtHandler( wxComboCtrlBase* combo )
-        : wxEvtHandler()
-    {
-        m_combo = combo;
-        m_beenInside = false;
-
-        // Let's make it so that the popup control will not receive mouse
-        // events until mouse left button has been up.
-        m_blockEventsToPopup = true;
-    }
-    virtual ~wxComboPopupEvtHandler() { }
-
-    void OnMouseEvent( wxMouseEvent& event );
-
-    // Called from wxComboCtrlBase::OnPopupDismiss
-    void OnPopupDismiss()
-    {
-        m_beenInside = false;
-        m_blockEventsToPopup = true;
-    }
-
-protected:
-    wxComboCtrlBase*     m_combo;
-
-    bool                m_beenInside;
-    bool                m_blockEventsToPopup;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-
-BEGIN_EVENT_TABLE(wxComboPopupEvtHandler, wxEvtHandler)
-    EVT_MOUSE_EVENTS(wxComboPopupEvtHandler::OnMouseEvent)
-END_EVENT_TABLE()
-
-
-void wxComboPopupEvtHandler::OnMouseEvent( wxMouseEvent& event )
-{
-    wxPoint pt = event.GetPosition();
-    wxSize sz = m_combo->GetPopupControl()->GetControl()->GetClientSize();
-    int evtType = event.GetEventType();
-    bool isInside = pt.x >= 0 && pt.y >= 0 && pt.x < sz.x && pt.y < sz.y;
-    bool relayToButton = false;
-
-    event.Skip();
-
-    if ( !isInside || !m_combo->IsPopupShown() )
-    {
-        // Mouse is outside the popup or popup is not actually shown (yet)
-
-        if ( evtType == wxEVT_MOTION ||
-             evtType == wxEVT_LEFT_DOWN ||
-             evtType == wxEVT_LEFT_UP ||
-             evtType == wxEVT_RIGHT_DOWN )
-        {
-            // Block motion and click events outside the popup
-            event.Skip(false);
-        }
-    }
-    else
-    {
-        // Mouse is inside the popup, which is fully shown
-
-        m_beenInside = true;
-
-        // Do not let the popup control respond to mouse events until
-        // mouse press used to display the popup has been lifted. This
-        // is important for users with slower mouse fingers or mouse
-        // drivers. Note that we have some redundancy here, just in
-        // case the popup is some native control that does not emit all
-        // mouse event types.
-        if ( evtType == wxEVT_MOTION )
-        {
-            if ( m_blockEventsToPopup )
-            {
-                if ( event.LeftIsDown() )
-                    event.Skip(false);
-                else
-                    m_blockEventsToPopup = false;
-            }
-        }
-        else if ( evtType == wxEVT_LEFT_DOWN )
-        {
-            if ( m_blockEventsToPopup )
-                m_blockEventsToPopup = false;
-        }
-        else if ( evtType == wxEVT_LEFT_UP )
-        {
-            if ( m_blockEventsToPopup )
-            {
-                // On first left up, stop blocking mouse events (but still
-                // block this one)
-                m_blockEventsToPopup = false;
-                event.Skip(false);
-
-                // Also, this button press was (probably) used to display
-                // the popup, so relay it back to the drop-down button
-                // (which supposedly originated it). This is necessary to
-                // refresh it properly.
-                relayToButton = true;
-            }
-        }
-        else if ( m_blockEventsToPopup )
-        {
-            event.Skip(false);
-        }
-    }
-
-    //
-    // Some mouse events to popup that happen outside it, before cursor
-    // has been inside the popup, need to be ignored by it but relayed to
-    // the dropbutton.
-    //
-    if ( evtType == wxEVT_LEFT_UP )
-    {
-        if ( !m_combo->IsPopupShown() )
-        {
-            event.Skip(false);
-            relayToButton = true;
-        }
-        else if ( !isInside && !m_beenInside )
-        {
-            // Popup is shown but the cursor is not inside, nor it has been
-            relayToButton = true;
-        }
-    }
-
-    if ( relayToButton )
-    {
-        wxWindow* btn = m_combo->GetButton();
-        if ( btn )
-            btn->GetEventHandler()->ProcessEvent(event);
-        else
-            // Bypass the event handling mechanism. Using it would be
-            // confusing for the platform-specific wxComboCtrl
-            // implementations.
-            m_combo->HandleButtonMouseEvent(event, 0);
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxComboCtrlTextCtrl
-// ----------------------------------------------------------------------------
-
-class wxComboCtrlTextCtrl : public wxTextCtrl
-{
-public:
-    wxComboCtrlTextCtrl() : wxTextCtrl() { }
-    virtual ~wxComboCtrlTextCtrl() { }
-
-    virtual wxWindow *GetMainWindowOfCompositeControl()
-    {
-        wxComboCtrl* combo = (wxComboCtrl*) GetParent();
-
-        // Returning this instead of just 'parent' lets FindFocus work
-        // correctly even when parent control is a child of a composite
-        // generic control (as is case with wxGenericDatePickerCtrl).
-        return combo->GetMainWindowOfCompositeControl();
-    }
-};
-
-// ----------------------------------------------------------------------------
-// wxComboCtrlBase
-// ----------------------------------------------------------------------------
-
-
-BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
-    EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
-    EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
-    EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
-    EVT_IDLE(wxComboCtrlBase::OnIdleEvent)
-    //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
-    EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
-    EVT_CHAR(wxComboCtrlBase::OnCharEvent)
-    EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
-END_EVENT_TABLE()
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxComboCtrlBase, wxControl)
-
-void wxComboCtrlBase::Init()
-{
-    m_winPopup = NULL;
-    m_popup = NULL;
-    m_popupWinState = Hidden;
-    m_btn = NULL;
-    m_text = NULL;
-    m_popupInterface = NULL;
-
-    m_popupEvtHandler = NULL;
-    m_textEvtHandler = NULL;
-
-#if INSTALL_TOPLEV_HANDLER
-    m_toplevEvtHandler = NULL;
-#endif
-
-    m_mainCtrlWnd = this;
-
-    m_heightPopup = -1;
-    m_widthMinPopup = -1;
-    m_anchorSide = 0;
-    m_widthCustomPaint = 0;
-    m_widthCustomBorder = 0;
-
-    m_btnState = 0;
-    m_btnWidDefault = 0;
-    m_blankButtonBg = false;
-    m_ignoreEvtText = 0;
-    m_popupWinType = POPUPWIN_NONE;
-    m_btnWid = m_btnHei = -1;
-    m_btnSide = wxRIGHT;
-    m_btnSpacingX = 0;
-
-    m_extLeft = 0;
-    m_extRight = 0;
-    m_marginLeft = -1;
-    m_iFlags = 0;
-    m_textCtrlStyle = 0;
-    m_timeCanAcceptClick = 0;
-
-    m_resetFocus = false;
-    m_hasTcBgCol = false;
-}
-
-bool wxComboCtrlBase::Create(wxWindow *parent,
-                             wxWindowID id,
-                             const wxString& value,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             long style,
-                             const wxValidator& validator,
-                             const wxString& name)
-{
-    if ( !wxControl::Create(parent,
-                            id,
-                            pos,
-                            size,
-                            style | wxWANTS_CHARS,
-                            validator,
-                            name) )
-        return false;
-
-    m_valueString = value;
-
-    // Get colours
-    OnThemeChange();
-    m_marginLeft = GetNativeTextIndent();
-
-    m_iFlags |= wxCC_IFLAG_CREATED;
-
-    // If x and y indicate valid size, wxSizeEvent won't be
-    // emitted automatically, so we need to add artificial one.
-    if ( size.x > 0 && size.y > 0 )
-    {
-        wxSizeEvent evt(size,GetId());
-        evt.SetEventObject(this);
-        GetEventHandler()->AddPendingEvent(evt);
-    }
-
-    return true;
-}
-
-void wxComboCtrlBase::InstallInputHandlers()
-{
-    if ( m_text )
-    {
-        m_textEvtHandler = new wxComboBoxExtraInputHandler(this);
-        m_text->PushEventHandler(m_textEvtHandler);
-    }
-}
-
-void
-wxComboCtrlBase::CreateTextCtrl(int style)
-{
-    if ( !(m_windowStyle & wxCB_READONLY) )
-    {
-        if ( m_text )
-            m_text->Destroy();
-
-        // wxTE_PROCESS_TAB is needed because on Windows, wxTAB_TRAVERSAL is
-        // not used by the wxPropertyGrid and therefore the tab is processed by
-        // looking at ancestors to see if they have wxTAB_TRAVERSAL. The
-        // navigation event is then sent to the wrong window.
-        style |= wxTE_PROCESS_TAB | m_textCtrlStyle;
-
-        if ( HasFlag(wxTE_PROCESS_ENTER) )
-            style |= wxTE_PROCESS_ENTER;
-
-        // Ignore EVT_TEXT generated by the constructor (but only
-        // if the event redirector already exists)
-        // NB: This must be " = 1" instead of "++";
-        if ( m_textEvtHandler )
-            m_ignoreEvtText = 1;
-        else
-            m_ignoreEvtText = 0;
-
-        m_text = new wxComboCtrlTextCtrl();
-        m_text->Create(this, wxID_ANY, m_valueString,
-                       wxDefaultPosition, wxSize(10,-1),
-                       style);
-
-        // Connecting the events is currently the most reliable way
-        wxWindowID id = m_text->GetId();
-        m_text->Connect(id, wxEVT_COMMAND_TEXT_UPDATED,
-                        wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
-                        NULL, this);
-        m_text->Connect(id, wxEVT_COMMAND_TEXT_ENTER,
-                        wxCommandEventHandler(wxComboCtrlBase::OnTextCtrlEvent),
-                        NULL, this);
-
-        m_text->SetHint(m_hintText);
-    }
-}
-
-void wxComboCtrlBase::OnThemeChange()
-{
-    // Because wxComboCtrl has transparent parts on most platforms, we
-    // don't want to touch the actual background colour. Instead, we just
-    // usually re-obtain m_tcBgCol here.
-
-#if defined(__WXMSW__) || defined(__WXGTK__)
-    wxVisualAttributes vattrs = wxComboBox::GetClassDefaultAttributes();
-#else
-    wxVisualAttributes vattrs;
-    vattrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-    vattrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-#endif
-
-    if ( !m_hasTcBgCol )
-        m_tcBgCol = vattrs.colBg;
-
-#ifndef __WXMAC__
-    // Only change the colours if application has not specified
-    // custom ones.
-    if ( !m_hasFgCol )
-    {
-        SetOwnForegroundColour(vattrs.colFg);
-    }
-    if ( !HasTransparentBackground() )
-    {
-        SetOwnBackgroundColour(GetParent()->GetBackgroundColour());
-    }
-#endif // !__WXMAC__
-}
-
-wxComboCtrlBase::~wxComboCtrlBase()
-{
-    if ( HasCapture() )
-        ReleaseMouse();
-
-#if INSTALL_TOPLEV_HANDLER
-    delete ((wxComboFrameEventHandler*)m_toplevEvtHandler);
-    m_toplevEvtHandler = NULL;
-#endif
-
-    DestroyPopup();
-
-    if ( m_text )
-        m_text->RemoveEventHandler(m_textEvtHandler);
-
-    delete m_textEvtHandler;
-}
-
-
-// ----------------------------------------------------------------------------
-// geometry stuff
-// ----------------------------------------------------------------------------
-
-// Recalculates button and textctrl areas
-void wxComboCtrlBase::CalculateAreas( int btnWidth )
-{
-    wxSize sz = GetClientSize();
-    int customBorder = m_widthCustomBorder;
-    int btnBorder; // border for button only
-
-    // check if button should really be outside the border: we'll do it it if
-    // its platform default or bitmap+pushbutton background is used, but not if
-    // there is vertical size adjustment or horizontal spacing.
-    if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
-                (m_bmpNormal.IsOk() && m_blankButtonBg) ) &&
-         m_btnSpacingX == 0 &&
-         m_btnHei <= 0 )
-    {
-        m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
-        btnBorder = 0;
-    }
-    else if ( (m_iFlags & wxCC_BUTTON_COVERS_BORDER) &&
-              m_btnSpacingX == 0 && !m_bmpNormal.IsOk() )
-    {
-        m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
-        btnBorder = 0;
-    }
-    else
-    {
-        m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
-        btnBorder = customBorder;
-    }
-
-    // Defaul indentation
-    if ( m_marginLeft < 0 )
-        m_marginLeft = GetNativeTextIndent();
-
-    int butWidth = btnWidth;
-
-    if ( butWidth <= 0 )
-        butWidth = m_btnWidDefault;
-    else
-        m_btnWidDefault = butWidth;
-
-    if ( butWidth <= 0 )
-        return;
-
-    int butHeight = sz.y - btnBorder*2;
-
-    // Adjust button width
-    if ( m_btnWid > 0 )
-        butWidth = m_btnWid;
-    else
-    {
-        // Adjust button width to match aspect ratio
-        // (but only if control is smaller than best size).
-        int bestHeight = GetBestSize().y;
-        int height = GetSize().y;
-
-        if ( height < bestHeight )
-        {
-            // Make very small buttons square, as it makes
-            // them accommodate arrow image better and still
-            // looks decent.
-            if ( height > 18 )
-                butWidth = (height*butWidth)/bestHeight;
-            else
-                butWidth = butHeight;
-        }
-    }
-
-    // Adjust button height
-    if ( m_btnHei > 0 )
-        butHeight = m_btnHei;
-
-    // Use size of normal bitmap if...
-    //   It is larger
-    //   OR
-    //   button width is set to default and blank button bg is not drawn
-    if ( m_bmpNormal.IsOk() )
-    {
-        int bmpReqWidth = m_bmpNormal.GetWidth();
-        int bmpReqHeight = m_bmpNormal.GetHeight();
-
-        // If drawing blank button background, we need to add some margin.
-        if ( m_blankButtonBg )
-        {
-            bmpReqWidth += BMP_BUTTON_MARGIN*2;
-            bmpReqHeight += BMP_BUTTON_MARGIN*2;
-        }
-
-        if ( butWidth < bmpReqWidth || ( m_btnWid == 0 && !m_blankButtonBg ) )
-            butWidth = bmpReqWidth;
-        if ( butHeight < bmpReqHeight || ( m_btnHei == 0 && !m_blankButtonBg ) )
-            butHeight = bmpReqHeight;
-
-        // Need to fix height?
-        if ( (sz.y-(customBorder*2)) < butHeight && btnWidth == 0 )
-        {
-            int newY = butHeight+(customBorder*2);
-            SetClientSize(wxDefaultCoord,newY);
-            if ( m_bmpNormal.IsOk() || m_btnArea.width != butWidth || m_btnArea.height != butHeight )
-                m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
-            else
-                m_iFlags &= ~wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
-
-            sz.y = newY;
-        }
-    }
-
-    int butAreaWid = butWidth + (m_btnSpacingX*2);
-
-    m_btnSize.x = butWidth;
-    m_btnSize.y = butHeight;
-
-    m_btnArea.x = ( m_btnSide==wxRIGHT ? sz.x - butAreaWid - btnBorder : btnBorder );
-    m_btnArea.y = btnBorder + FOCUS_RING;
-    m_btnArea.width = butAreaWid;
-    m_btnArea.height = sz.y - ((btnBorder+FOCUS_RING)*2);
-
-    m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder + FOCUS_RING;
-    m_tcArea.y = customBorder + FOCUS_RING;
-    m_tcArea.width = sz.x - butAreaWid - (customBorder*2) - (FOCUS_RING*2);
-    m_tcArea.height = sz.y - ((customBorder+FOCUS_RING)*2);
-
-/*
-    if ( m_text )
-    {
-        ::wxMessageBox(wxString::Format(wxT("ButtonArea (%i,%i,%i,%i)\n"),m_btnArea.x,m_btnArea.y,m_btnArea.width,m_btnArea.height) +
-                       wxString::Format(wxT("TextCtrlArea (%i,%i,%i,%i)"),m_tcArea.x,m_tcArea.y,m_tcArea.width,m_tcArea.height));
-    }
-*/
-}
-
-void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust )
-{
-    if ( !m_text )
-        return;
-
-    wxSize sz = GetClientSize();
-
-    int customBorder = m_widthCustomBorder;
-    if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER )
-    {
-        int x;
-
-        if ( !m_widthCustomPaint )
-        {
-            // No special custom paint area - we can use 0 left margin
-            // with wxTextCtrl.
-            if ( m_text->SetMargins(0) )
-                textCtrlXAdjust = 0;
-            x = m_tcArea.x + m_marginLeft + textCtrlXAdjust;
-        }
-        else
-        {
-            // There is special custom paint area - it is better to
-            // use some margin with the wxTextCtrl.
-            m_text->SetMargins(m_marginLeft);
-            x = m_tcArea.x + m_widthCustomPaint +
-                m_marginLeft + textCtrlXAdjust;
-        }
-
-        // Centre textctrl vertically, if needed
-#if !TEXTCTRL_TEXT_CENTERED
-        int tcSizeY = m_text->GetBestSize().y;
-        int diff0 = sz.y - tcSizeY;
-        int y = textCtrlYAdjust + (diff0/2);
-#else
-        wxUnusedVar(textCtrlYAdjust);
-        int y = 0;
-#endif
-
-        if ( y < customBorder )
-            y = customBorder;
-
-        m_text->SetSize(x,
-                        y,
-                        m_tcArea.width - m_tcArea.x - x,
-                        -1 );
-
-        // Make sure textctrl doesn't exceed the bottom custom border
-        wxSize tsz = m_text->GetSize();
-        int diff1 = (y + tsz.y) - (sz.y - customBorder);
-        if ( diff1 >= 0 )
-        {
-            tsz.y = tsz.y - diff1 - 1;
-            m_text->SetSize(tsz);
-        }
-    }
-    else
-    {
-        // If it has border, have textctrl fill the entire text field.
-        m_text->SetSize( m_tcArea.x + m_widthCustomPaint,
-                         m_tcArea.y,
-                         m_tcArea.width - m_widthCustomPaint,
-                         m_tcArea.height );
-    }
-}
-
-wxSize wxComboCtrlBase::DoGetBestSize() const
-{
-    wxSize sizeText(150,0);
-
-    if ( m_text )
-        sizeText = m_text->GetBestSize();
-
-    // TODO: Better method to calculate close-to-native control height.
-
-    int fhei;
-    if ( m_font.IsOk() )
-        fhei = (m_font.GetPointSize()*2) + 5;
-    else if ( wxNORMAL_FONT->IsOk() )
-        fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5;
-    else
-        fhei = sizeText.y + 4;
-
-    // Need to force height to accommodate bitmap?
-    int btnSizeY = m_btnSize.y;
-    if ( m_bmpNormal.IsOk() && fhei < btnSizeY )
-        fhei = btnSizeY;
-
-    // Control height doesn't depend on border
-/*
-    // Add border
-    int border = m_windowStyle & wxBORDER_MASK;
-    if ( border == wxSIMPLE_BORDER )
-        fhei += 2;
-    else if ( border == wxNO_BORDER )
-        fhei += (m_widthCustomBorder*2);
-    else
-        // Sunken etc.
-        fhei += 4;
-*/
-
-    // Final adjustments
-#ifdef __WXGTK__
-    fhei += 1;
-#endif
-
-#ifdef __WXMAC__
-    // these are the numbers from the HIG:
-    switch ( m_windowVariant )
-    {
-        case wxWINDOW_VARIANT_NORMAL:
-        default :
-            fhei = 22;
-            break;
-        case wxWINDOW_VARIANT_SMALL:
-            fhei = 19;
-            break;
-        case wxWINDOW_VARIANT_MINI:
-            fhei = 15;
-            break;
-    }
-#endif
-
-    fhei += 2 * FOCUS_RING;
-    int width = sizeText.x + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH;
-
-    wxSize ret(width, fhei);
-    CacheBestSize(ret);
-    return ret;
-}
-
-void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )
-{
-    if ( !IsCreated() )
-        return;
-
-    // defined by actual wxComboCtrls
-    OnResize();
-
-    event.Skip();
-}
-
-// ----------------------------------------------------------------------------
-// standard operations
-// ----------------------------------------------------------------------------
-
-bool wxComboCtrlBase::Enable(bool enable)
-{
-    if ( !wxControl::Enable(enable) )
-        return false;
-
-    if ( m_btn )
-        m_btn->Enable(enable);
-    if ( m_text )
-        m_text->Enable(enable);
-
-    Refresh();
-
-    return true;
-}
-
-bool wxComboCtrlBase::Show(bool show)
-{
-    if ( !wxControl::Show(show) )
-        return false;
-
-    if (m_btn)
-        m_btn->Show(show);
-
-    if (m_text)
-        m_text->Show(show);
-
-    return true;
-}
-
-bool wxComboCtrlBase::SetFont ( const wxFont& font )
-{
-    if ( !wxControl::SetFont(font) )
-        return false;
-
-    if ( m_text )
-    {
-        // Without hiding the wxTextCtrl there would be some
-        // visible 'flicker' (at least on Windows XP).
-        m_text->Hide();
-        m_text->SetFont(font);
-        OnResize();
-        m_text->Show();
-    }
-
-    return true;
-}
-
-#if wxUSE_TOOLTIPS
-void wxComboCtrlBase::DoSetToolTip(wxToolTip *tooltip)
-{
-    wxControl::DoSetToolTip(tooltip);
-
-    // Set tool tip for button and text box
-    if ( tooltip )
-    {
-        const wxString &tip = tooltip->GetTip();
-        if ( m_text ) m_text->SetToolTip(tip);
-        if ( m_btn ) m_btn->SetToolTip(tip);
-    }
-    else
-    {
-        if ( m_text ) m_text->SetToolTip( NULL );
-        if ( m_btn ) m_btn->SetToolTip( NULL );
-    }
-}
-#endif // wxUSE_TOOLTIPS
-
-bool wxComboCtrlBase::SetForegroundColour(const wxColour& colour)
-{
-    if ( wxControl::SetForegroundColour(colour) )
-    {
-        if ( m_text )
-            m_text->SetForegroundColour(colour);
-        return true;
-    }
-    return false;
-}
-
-bool wxComboCtrlBase::SetBackgroundColour(const wxColour& colour)
-{
-    if ( m_text )
-        m_text->SetBackgroundColour(colour);
-    m_tcBgCol = colour;
-    m_hasTcBgCol = true;
-    return true;
-}
-
-wxColour wxComboCtrlBase::GetBackgroundColour() const
-{
-    if ( m_text )
-        return m_text->GetBackgroundColour();
-    return m_tcBgCol;
-}
-
-// ----------------------------------------------------------------------------
-// painting
-// ----------------------------------------------------------------------------
-
-#if (!defined(__WXMSW__)) || defined(__WXUNIVERSAL__)
-// prepare combo box background on area in a way typical on platform
-void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
-{
-    wxSize sz = GetClientSize();
-    bool isEnabled;
-    bool doDrawFocusRect; // also selected
-
-    // For smaller size control (and for disabled background) use less spacing
-    int focusSpacingX;
-    int focusSpacingY;
-
-    if ( !(flags & wxCONTROL_ISSUBMENU) )
-    {
-        // Drawing control
-        isEnabled = IsEnabled();
-        doDrawFocusRect = ShouldDrawFocus() && !(m_iFlags & wxCC_FULL_BUTTON);
-
-        // Windows-style: for smaller size control (and for disabled background) use less spacing
-        focusSpacingX = isEnabled ? 2 : 1;
-        focusSpacingY = sz.y > (GetCharHeight()+2) && isEnabled ? 2 : 1;
-    }
-    else
-    {
-        // Drawing a list item
-        isEnabled = true; // they are never disabled
-        doDrawFocusRect = (flags & wxCONTROL_SELECTED) != 0;
-
-        focusSpacingX = 0;
-        focusSpacingY = 0;
-    }
-
-    // Set the background sub-rectangle for selection, disabled etc
-    wxRect selRect(rect);
-    selRect.y += focusSpacingY;
-    selRect.height -= (focusSpacingY*2);
-
-    int wcp = 0;
-
-    if ( !(flags & wxCONTROL_ISSUBMENU) )
-        wcp += m_widthCustomPaint;
-
-    selRect.x += wcp + focusSpacingX;
-    selRect.width -= wcp + (focusSpacingX*2);
-
-    wxColour bgCol;
-    wxColour fgCol;
-
-    bool doDrawSelRect = true;
-
-    // Determine foreground colour
-    if ( isEnabled )
-    {
-        if ( doDrawFocusRect )
-        {
-            fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
-        }
-        else if ( m_hasFgCol )
-        {
-            // Honour the custom foreground colour
-            fgCol = GetForegroundColour();
-        }
-        else
-        {
-            fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-        }
-    }
-    else
-    {
-        fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
-    }
-
-    // Determine background colour
-    if ( isEnabled )
-    {
-        if ( doDrawFocusRect )
-        {
-            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
-        }
-        else if ( m_hasTcBgCol )
-        {
-            // Honour the custom background colour
-            bgCol = m_tcBgCol;
-        }
-        else
-        {
-#ifndef __WXMAC__  // see note in OnThemeChange
-            doDrawSelRect = false;
-            bgCol = GetBackgroundColour();
-#else
-            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-#endif
-        }
-    }
-    else
-    {
-#ifndef __WXMAC__  // see note in OnThemeChange
-        bgCol = GetBackgroundColour();
-#else
-        bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-#endif
-    }
-
-    dc.SetTextForeground( fgCol );
-    dc.SetBrush( bgCol );
-    if ( doDrawSelRect )
-    {
-        dc.SetPen( bgCol );
-        dc.DrawRectangle( selRect );
-    }
-
-    // Don't clip exactly to the selection rectangle so we can draw
-    // to the non-selected area in front of it.
-    wxRect clipRect(rect.x,rect.y,
-                    (selRect.x+selRect.width)-rect.x,rect.height);
-    dc.SetClippingRegion(clipRect);
-}
-#else
-// Save the library size a bit for platforms that re-implement this.
-void wxComboCtrlBase::PrepareBackground( wxDC&, const wxRect&, int ) const
-{
-}
-#endif
-
-void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
-{
-    int drawState = m_btnState;
-
-    if ( (m_iFlags & wxCC_BUTTON_STAYS_DOWN) &&
-         GetPopupWindowState() >= Animating )
-        drawState |= wxCONTROL_PRESSED;
-
-    wxRect drawRect(rect.x+m_btnSpacingX,
-                    rect.y+((rect.height-m_btnSize.y)/2),
-                    m_btnSize.x,
-                    m_btnSize.y);
-
-    // Make sure area is not larger than the control
-    if ( drawRect.y < rect.y )
-        drawRect.y = rect.y;
-    if ( drawRect.height > rect.height )
-        drawRect.height = rect.height;
-
-    bool enabled = IsEnabled();
-
-    if ( !enabled )
-        drawState |= wxCONTROL_DISABLED;
-
-    // Need to clear button background even if m_btn is present
-    // and also when using custom bitmap for the button
-    if ( (flags & Button_PaintBackground) &&
-            (!HasTransparentBackground() ||
-             !(m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE)) )
-    {
-        wxColour bgCol;
-
-        if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
-            bgCol = GetParent()->GetBackgroundColour();
-        else
-            bgCol = GetBackgroundColour();
-
-        dc.SetBrush(bgCol);
-        dc.SetPen(bgCol);
-        dc.DrawRectangle(rect);
-    }
-
-    if ( !m_bmpNormal.IsOk() )
-    {
-        if ( flags & Button_BitmapOnly )
-            return;
-
-        // Draw standard button
-        wxRendererNative::Get().DrawComboBoxDropButton(this,
-                                                       dc,
-                                                       drawRect,
-                                                       drawState);
-    }
-    else
-    {
-        // Draw bitmap
-
-        wxBitmap* pBmp;
-
-        if ( !enabled )
-            pBmp = &m_bmpDisabled;
-        else if ( m_btnState & wxCONTROL_PRESSED )
-            pBmp = &m_bmpPressed;
-        else if ( m_btnState & wxCONTROL_CURRENT )
-            pBmp = &m_bmpHover;
-        else
-            pBmp = &m_bmpNormal;
-
-        if ( m_blankButtonBg )
-        {
-            if ( !(flags & Button_BitmapOnly) )
-            {
-                wxRendererNative::Get().DrawPushButton(this,
-                                                       dc,
-                                                       drawRect,
-                                                       drawState);
-            }
-        }
-
-        // Draw bitmap centered in drawRect
-        dc.DrawBitmap(*pBmp,
-                      drawRect.x + (drawRect.width-pBmp->GetWidth())/2,
-                      drawRect.y + (drawRect.height-pBmp->GetHeight())/2,
-                      true);
-    }
-}
-
-void wxComboCtrlBase::RecalcAndRefresh()
-{
-    if ( IsCreated() )
-    {
-        wxSizeEvent evt(GetSize(),GetId());
-        evt.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(evt);
-        Refresh();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// miscellaneous event handlers
-// ----------------------------------------------------------------------------
-
-void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
-{
-    // Avoid infinite recursion
-    if ( event.GetEventObject() == this )
-    {
-        event.Skip();
-        return;
-    }
-
-    if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
-    {
-        if ( m_ignoreEvtText > 0 )
-        {
-            m_ignoreEvtText--;
-            return;
-        }
-    }
-
-    // For safety, completely re-create a new wxCommandEvent
-    wxCommandEvent evt2(event);
-    evt2.SetId(GetId());
-    evt2.SetEventObject(this);
-    HandleWindowEvent(evt2);
-
-    event.StopPropagation();
-}
-
-// call if cursor is on button area or mouse is captured for the button
-bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
-                                              int flags )
-{
-    int type = event.GetEventType();
-
-    if ( type == wxEVT_MOTION )
-    {
-        if ( (flags & wxCC_MF_ON_BUTTON) &&
-             IsPopupWindowState(Hidden) )
-        {
-            if ( !(m_btnState & wxCONTROL_CURRENT) )
-            {
-                // Mouse hover begins
-                m_btnState |= wxCONTROL_CURRENT;
-                if ( HasCapture() ) // Retain pressed state.
-                    m_btnState |= wxCONTROL_PRESSED;
-                Refresh();
-            }
-        }
-        else if ( (m_btnState & wxCONTROL_CURRENT) )
-        {
-            // Mouse hover ends
-            m_btnState &= ~(wxCONTROL_CURRENT|wxCONTROL_PRESSED);
-            Refresh();
-        }
-    }
-    else if ( type == wxEVT_LEFT_DOWN || type == wxEVT_LEFT_DCLICK )
-    {
-        if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
-        {
-            m_btnState |= wxCONTROL_PRESSED;
-            Refresh();
-
-            if ( !(m_iFlags & wxCC_POPUP_ON_MOUSE_UP) )
-                OnButtonClick();
-            else
-                // If showing popup now, do not capture mouse or there will be interference
-                CaptureMouse();
-        }
-    }
-    else if ( type == wxEVT_LEFT_UP )
-    {
-
-        // Only accept event if mouse was left-press was previously accepted
-        if ( HasCapture() )
-            ReleaseMouse();
-
-        if ( m_btnState & wxCONTROL_PRESSED )
-        {
-            // If mouse was inside, fire the click event.
-            if ( m_iFlags & wxCC_POPUP_ON_MOUSE_UP )
-            {
-                if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
-                    OnButtonClick();
-            }
-
-            m_btnState &= ~(wxCONTROL_PRESSED);
-            Refresh();
-        }
-    }
-    else if ( type == wxEVT_LEAVE_WINDOW )
-    {
-        if ( m_btnState & (wxCONTROL_CURRENT|wxCONTROL_PRESSED) )
-        {
-            m_btnState &= ~(wxCONTROL_CURRENT);
-
-            // Mouse hover ends
-            if ( IsPopupWindowState(Hidden) )
-            {
-                m_btnState &= ~(wxCONTROL_PRESSED);
-                Refresh();
-            }
-        }
-    }
-    else
-        return false;
-
-    // Never have 'hot' state when popup is being shown
-    // (this is mostly needed because of the animation).
-    if ( !IsPopupWindowState(Hidden) )
-        m_btnState &= ~wxCONTROL_CURRENT;
-
-    return true;
-}
-
-// returns true if event was consumed or filtered
-bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,
-                                            int WXUNUSED(flags) )
-{
-    wxLongLong t = ::wxGetLocalTimeMillis();
-    int evtType = event.GetEventType();
-
-#if USES_WXPOPUPWINDOW || USES_GENERICTLW
-    if ( m_popupWinType != POPUPWIN_WXPOPUPTRANSIENTWINDOW )
-    {
-        if ( IsPopupWindowState(Visible) &&
-             ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
-        {
-            HidePopup(true);
-            return true;
-        }
-    }
-#endif
-
-    // Filter out clicks on button immediately after popup dismiss
-    if ( evtType == wxEVT_LEFT_DOWN && t < m_timeCanAcceptClick )
-    {
-        event.SetEventType(0);
-        return true;
-    }
-
-    return false;
-}
-
-void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
-{
-    int evtType = event.GetEventType();
-
-    if ( (evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_LEFT_DCLICK) &&
-         (m_windowStyle & wxCB_READONLY) )
-    {
-        if ( GetPopupWindowState() >= Animating )
-        {
-    #if USES_WXPOPUPWINDOW
-            // Click here always hides the popup.
-            if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
-                HidePopup(true);
-    #endif
-        }
-        else
-        {
-            if ( !(m_windowStyle & wxCC_SPECIAL_DCLICK) )
-            {
-                // In read-only mode, clicking the text is the
-                // same as clicking the button.
-                OnButtonClick();
-            }
-            else if ( /*evtType == wxEVT_LEFT_UP || */evtType == wxEVT_LEFT_DCLICK )
-            {
-                //if ( m_popupInterface->CycleValue() )
-                //    Refresh();
-                if ( m_popupInterface )
-                    m_popupInterface->OnComboDoubleClick();
-            }
-        }
-    }
-    else if ( evtType == wxEVT_MOUSEWHEEL )
-    {
-        if ( IsPopupShown() )
-        {
-            // relay (some) mouse events to the popup
-            m_popup->GetEventHandler()->ProcessEvent(event);
-        }
-        else if ( event.GetWheelAxis() == 0 &&
-                  event.GetWheelRotation() != 0 &&
-                  event.GetModifiers() == 0 )
-        {
-            // Translate mousewheel actions into key up/down. This is
-            // the simplest way of getting native behaviour: scrolling the
-            // wheel moves selection up/down by one item.
-            wxKeyEvent kevent(wxEVT_KEY_DOWN);
-            kevent.m_keyCode = event.GetWheelRotation() > 0
-                               ? WXK_UP
-                               : WXK_DOWN;
-            GetEventHandler()->ProcessEvent(kevent);
-        }
-        else
-        {
-            event.Skip();
-        }
-    }
-    else if ( evtType )
-    {
-        event.Skip();
-    }
-}
-
-void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)
-{
-    if ( IsPopupShown() )
-    {
-        // pass it to the popped up control
-        GetPopupControl()->GetControl()->GetEventHandler()->ProcessEvent(event);
-    }
-    else // no popup
-    {
-        wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
-
-        if ( mainCtrl->GetParent()->HasFlag(wxTAB_TRAVERSAL) )
-        {
-            if ( mainCtrl->HandleAsNavigationKey(event) )
-                return;
-        }
-
-        if ( IsKeyPopupToggle(event) )
-        {
-            OnButtonClick();
-            return;
-        }
-
-        int comboStyle = GetWindowStyle();
-        wxComboPopup* popupInterface = GetPopupControl();
-
-        if ( !popupInterface )
-        {
-            event.Skip();
-            return;
-        }
-
-        int keycode = event.GetKeyCode();
-
-        if ( (comboStyle & wxCB_READONLY) ||
-             (keycode != WXK_RIGHT && keycode != WXK_LEFT) )
-        {
-            popupInterface->OnComboKeyEvent(event);
-        }
-        else
-            event.Skip();
-    }
-}
-
-void wxComboCtrlBase::OnCharEvent(wxKeyEvent& event)
-{
-    if ( IsPopupShown() )
-    {
-        // pass it to the popped up control
-        GetPopupControl()->GetControl()->GetEventHandler()->ProcessEvent(event);
-    }
-    else // no popup
-    {
-        wxComboPopup* popupInterface = GetPopupControl();
-        if ( popupInterface )
-        {
-            popupInterface->OnComboCharEvent(event);
-        }
-        else
-        {
-            event.Skip();
-        }
-    }
-}
-
-void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
-{
-// On Mac, this leads to infinite recursion and eventually a crash 
-#ifndef __WXMAC__
-    if ( event.GetEventType() == wxEVT_SET_FOCUS )
-    {
-        wxWindow* tc = GetTextCtrl();
-        if ( tc && tc != DoFindFocus() )
-        {
-            tc->SetFocus();
-        }
-    }
-
-    Refresh();
-#endif
-}
-
-void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
-{
-    if ( m_resetFocus )
-    {
-        m_resetFocus = false;
-        wxWindow* tc = GetTextCtrl();
-        if ( tc )
-            tc->SetFocus();
-    }
-}
-
-void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
-{
-    OnThemeChange();
-    // left margin may also have changed
-    if ( !(m_iFlags & wxCC_IFLAG_LEFT_MARGIN_SET) )
-        m_marginLeft = GetNativeTextIndent();
-    RecalcAndRefresh();
-}
-
-// ----------------------------------------------------------------------------
-// popup handling
-// ----------------------------------------------------------------------------
-
-// Create popup window and the child control
-void wxComboCtrlBase::CreatePopup()
-{
-    wxComboPopup* popupInterface = m_popupInterface;
-    wxWindow* popup;
-
-    if ( !m_winPopup )
-    {
-#ifdef wxComboPopupWindowBase2
-        if ( m_iFlags & wxCC_IFLAG_USE_ALT_POPUP )
-        {
-        #if !USES_GENERICTLW
-            m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER );
-        #else
-            int tlwFlags = wxNO_BORDER;
-          #ifdef wxCC_GENERIC_TLW_IS_FRAME
-            tlwFlags |= wxFRAME_NO_TASKBAR;
-          #endif
-
-          #ifdef wxCC_GENERIC_TLW_IS_NONOWNEDWINDOW
-            m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY,
-                                                      wxPoint(-21,-21), wxSize(20, 20),
-                                                      tlwFlags );
-          #else
-            m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY, wxEmptyString,
-                                                      wxPoint(-21,-21), wxSize(20, 20),
-                                                      tlwFlags );
-          #endif
-        #endif
-            m_popupWinType = SECONDARY_POPUP_TYPE;
-        }
-        else
-#endif // wxComboPopupWindowBase2
-        {
-            m_winPopup = new wxComboPopupWindow( this, wxNO_BORDER );
-            m_popupWinType = PRIMARY_POPUP_TYPE;
-        }
-        m_popupWinEvtHandler = new wxComboPopupWindowEvtHandler(this);
-        m_winPopup->PushEventHandler(m_popupWinEvtHandler);
-    }
-
-    popupInterface->Create(m_winPopup);
-    m_popup = popup = popupInterface->GetControl();
-
-    m_popupEvtHandler = new wxComboPopupEvtHandler(this);
-    popup->PushEventHandler( m_popupEvtHandler );
-
-    // This may be helpful on some platforms
-    //   (eg. it bypasses a wxGTK popupwindow bug where
-    //    window is not initially hidden when it should be)
-    m_winPopup->Hide();
-
-    popupInterface->m_iFlags |= wxCP_IFLAG_CREATED;
-}
-
-// Destroy popup window and the child control
-void wxComboCtrlBase::DestroyPopup()
-{
-    HidePopup(true);
-
-    if ( m_popup )
-        m_popup->RemoveEventHandler(m_popupEvtHandler);
-
-    wxDELETE(m_popupEvtHandler);
-
-    if ( m_popupInterface )
-    {
-        // NB: DestroyPopup() performs 'delete this'.
-        m_popupInterface->DestroyPopup();
-        m_popupInterface = NULL;
-    }
-
-    if ( m_winPopup )
-    {
-        m_winPopup->RemoveEventHandler(m_popupWinEvtHandler);
-        wxDELETE(m_popupWinEvtHandler);
-        m_winPopup->Destroy();
-        m_winPopup = NULL;
-    }
-
-    m_popup = NULL;
-}
-
-void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface)
-{
-    wxCHECK_RET( iface, wxT("no popup interface set for wxComboCtrl") );
-
-    DestroyPopup();
-
-    iface->InitBase(this);
-    iface->Init();
-
-    m_popupInterface = iface;
-
-    if ( !iface->LazyCreate() )
-    {
-        CreatePopup();
-    }
-    else
-    {
-        m_popup = NULL;
-    }
-
-    // This must be done after creation
-    if ( !m_valueString.empty() )
-    {
-        iface->SetStringValue(m_valueString);
-        //Refresh();
-    }
-}
-
-// Ensures there is atleast the default popup
-void wxComboCtrlBase::EnsurePopupControl()
-{
-    if ( !m_popupInterface )
-        SetPopupControl(NULL);
-}
-
-void wxComboCtrlBase::OnButtonClick()
-{
-    // Derived classes can override this method for totally custom
-    // popup action
-    switch ( GetPopupWindowState() )
-    {
-        case Hidden:
-        {
-            Popup();
-            break;
-        }
-
-        case Animating:
-        case Visible:
-        {
-            HidePopup(true);
-            break;
-        }
-    }
-}
-
-void wxComboCtrlBase::Popup()
-{
-    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
-    event.SetEventObject(this);
-    HandleWindowEvent(event);
-
-    ShowPopup();
-}
-
-void wxComboCtrlBase::ShowPopup()
-{
-    EnsurePopupControl();
-    wxCHECK_RET( !IsPopupWindowState(Visible), wxT("popup window already shown") );
-
-    if ( IsPopupWindowState(Animating) )
-        return;
-
-    SetFocus();
-
-    // Space above and below
-    int screenHeight;
-    wxPoint scrPos;
-    int spaceAbove;
-    int spaceBelow;
-    int maxHeightPopup;
-    wxSize ctrlSz = GetSize();
-
-    screenHeight = wxSystemSettings::GetMetric( wxSYS_SCREEN_Y );
-    scrPos = GetParent()->ClientToScreen(GetPosition());
-
-    spaceAbove = scrPos.y;
-    spaceBelow = screenHeight - spaceAbove - ctrlSz.y;
-
-    maxHeightPopup = spaceBelow;
-    if ( spaceAbove > spaceBelow )
-        maxHeightPopup = spaceAbove;
-
-    // Width
-    int widthPopup = ctrlSz.x + m_extLeft + m_extRight;
-
-    if ( widthPopup < m_widthMinPopup )
-        widthPopup = m_widthMinPopup;
-
-    wxWindow* winPopup = m_winPopup;
-    wxWindow* popup;
-
-    // Need to disable tab traversal of parent
-    //
-    // NB: This is to fix a bug in wxMSW. In theory it could also be fixed
-    //     by, for instance, adding check to window.cpp:wxWindowMSW::MSWProcessMessage
-    //     that if transient popup is open, then tab traversal is to be ignored.
-    //     However, I think this code would still be needed for cases where
-    //     transient popup doesn't work yet (wxWinCE?).
-    wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
-    wxWindow* parent = mainCtrl->GetParent();
-    int parentFlags = parent->GetWindowStyle();
-    if ( parentFlags & wxTAB_TRAVERSAL )
-    {
-        parent->SetWindowStyle( parentFlags & ~(wxTAB_TRAVERSAL) );
-        m_iFlags |= wxCC_IFLAG_PARENT_TAB_TRAVERSAL;
-    }
-
-    if ( !winPopup )
-    {
-        CreatePopup();
-        winPopup = m_winPopup;
-        popup = m_popup;
-    }
-    else
-    {
-        popup = m_popup;
-    }
-
-    winPopup->Enable();
-
-    wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
-
-    wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,
-                                                            m_heightPopup<=0?DEFAULT_POPUP_HEIGHT:m_heightPopup,
-                                                            maxHeightPopup);
-
-    popup->SetSize(adjustedSize);
-    popup->Move(0,0);
-    m_popupInterface->OnPopup();
-
-    //
-    // Reposition and resize popup window
-    //
-
-    wxSize szp = popup->GetSize();
-
-    int popupX;
-    int popupY = scrPos.y + ctrlSz.y;
-
-    // Default anchor is wxLEFT
-    int anchorSide = m_anchorSide;
-    if ( !anchorSide )
-        anchorSide = wxLEFT;
-
-    int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x;
-    int leftX = scrPos.x - m_extLeft;
-
-    if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
-        leftX -= ctrlSz.x;
-
-    int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X );
-
-    // If there is not enough horizontal space, anchor on the other side.
-    // If there is no space even then, place the popup at x 0.
-    if ( anchorSide == wxRIGHT )
-    {
-        if ( rightX < 0 )
-        {
-            if ( (leftX+szp.x) < screenWidth )
-                anchorSide = wxLEFT;
-            else
-                anchorSide = 0;
-        }
-    }
-    else
-    {
-        if ( (leftX+szp.x) >= screenWidth )
-        {
-            if ( rightX >= 0 )
-                anchorSide = wxRIGHT;
-            else
-                anchorSide = 0;
-        }
-    }
-
-    // Select x coordinate according to the anchor side
-    if ( anchorSide == wxRIGHT )
-        popupX = rightX;
-    else if ( anchorSide == wxLEFT )
-        popupX = leftX;
-    else
-        popupX = 0;
-
-    int showFlags = CanDeferShow;
-
-    if ( spaceBelow < szp.y )
-    {
-        popupY = scrPos.y - szp.y;
-        showFlags |= ShowAbove;
-    }
-
-#if INSTALL_TOPLEV_HANDLER
-    // Put top level window event handler into place
-    if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
-    {
-        if ( !m_toplevEvtHandler )
-            m_toplevEvtHandler = new wxComboFrameEventHandler(this);
-
-        wxWindow* toplev = ::wxGetTopLevelParent( this );
-        wxASSERT( toplev );
-        ((wxComboFrameEventHandler*)m_toplevEvtHandler)->OnPopup();
-        toplev->PushEventHandler( m_toplevEvtHandler );
-    }
-#endif
-
-    // Set string selection (must be this way instead of SetStringSelection)
-    if ( m_text )
-    {
-        if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
-            m_text->SelectAll();
-
-        m_popupInterface->SetStringValue( m_text->GetValue() );
-    }
-    else
-    {
-        // This is neede since focus/selection indication may change when popup is shown
-        Refresh();
-    }
-
-    // This must be after SetStringValue
-    m_popupWinState = Animating;
-
-    wxRect popupWinRect( popupX, popupY, szp.x, szp.y );
-
-    m_popup = popup;
-    if ( (m_iFlags & wxCC_IFLAG_DISABLE_POPUP_ANIM) ||
-         AnimateShow( popupWinRect, showFlags ) )
-    {
-        DoShowPopup( popupWinRect, showFlags );
-    }
-}
-
-bool wxComboCtrlBase::AnimateShow( const wxRect& WXUNUSED(rect), int WXUNUSED(flags) )
-{
-    return true;
-}
-
-void wxComboCtrlBase::DoShowPopup( const wxRect& rect, int WXUNUSED(flags) )
-{
-    wxWindow* winPopup = m_winPopup;
-
-    if ( IsPopupWindowState(Animating) )
-    {
-        // Make sure the popup window is shown in the right position.
-        // Should not matter even if animation already did this.
-
-        // Some platforms (GTK) may like SetSize and Move to be separate
-        // (though the bug was probably fixed).
-        winPopup->SetSize( rect );
-
-#if USES_WXPOPUPTRANSIENTWINDOW
-        if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
-            ((wxPopupTransientWindow*)winPopup)->Popup(m_popup);
-        else
-#endif
-            winPopup->Show();
-
-        m_popupWinState = Visible;
-
-        // If popup window was a generic top-level window, or the
-        // wxPopupWindow implemenation on this platform is classified as
-        // perfect, then we should be able to safely set focus to the popup
-        // control.
-        if ( IsPopupWinTypePerfect(m_popupWinType) )
-            m_popup->SetFocus();
-    }
-    else if ( IsPopupWindowState(Hidden) )
-    {
-        // Animation was aborted
-
-        wxASSERT( !winPopup->IsShown() );
-
-        m_popupWinState = Hidden;
-    }
-
-    Refresh();
-}
-
-void wxComboCtrlBase::OnPopupDismiss(bool generateEvent)
-{
-    // Just in case, avoid double dismiss
-    if ( IsPopupWindowState(Hidden) )
-        return;
-
-    // This must be set before focus - otherwise there will be recursive
-    // OnPopupDismisses.
-    m_popupWinState = Hidden;
-
-    //SetFocus();
-    m_winPopup->Disable();
-
-    // Inform popup control itself
-    m_popupInterface->OnDismiss();
-
-    if ( m_popupEvtHandler )
-        ((wxComboPopupEvtHandler*)m_popupEvtHandler)->OnPopupDismiss();
-
-#if INSTALL_TOPLEV_HANDLER
-    // Remove top level window event handler
-    if ( m_toplevEvtHandler )
-    {
-        wxWindow* toplev = ::wxGetTopLevelParent( this );
-        if ( toplev )
-            toplev->RemoveEventHandler( m_toplevEvtHandler );
-    }
-#endif
-
-    m_timeCanAcceptClick = ::wxGetLocalTimeMillis();
-
-    if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
-        m_timeCanAcceptClick += 150;
-
-    // If cursor not on dropdown button, then clear its state
-    // (technically not required by all ports, but do it for all just in case)
-    if ( !m_btnArea.Contains(ScreenToClient(::wxGetMousePosition())) )
-        m_btnState = 0;
-
-    // Return parent's tab traversal flag.
-    // See ShowPopup for notes.
-    if ( m_iFlags & wxCC_IFLAG_PARENT_TAB_TRAVERSAL )
-    {
-        wxWindow* parent = GetParent();
-        parent->SetWindowStyle( parent->GetWindowStyle() | wxTAB_TRAVERSAL );
-        m_iFlags &= ~(wxCC_IFLAG_PARENT_TAB_TRAVERSAL);
-    }
-
-    // refresh control (necessary even if m_text)
-    Refresh();
-
-    SetFocus();
-
-    if ( generateEvent )
-    {
-        wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
-    }
-}
-
-void wxComboCtrlBase::HidePopup(bool generateEvent)
-{
-    // Should be able to call this without popup interface
-    if ( IsPopupWindowState(Hidden) )
-        return;
-
-    // transfer value and show it in textctrl, if any
-    if ( !IsPopupWindowState(Animating) )
-        SetValueByUser( m_popupInterface->GetStringValue() );
-
-    m_winPopup->Hide();
-
-    OnPopupDismiss(generateEvent);
-}
-
-// ----------------------------------------------------------------------------
-// customization methods
-// ----------------------------------------------------------------------------
-
-void wxComboCtrlBase::SetButtonPosition( int width, int height,
-                                         int side, int spacingX )
-{
-    m_btnWid = width;
-    m_btnHei = height;
-    m_btnSide = side;
-    m_btnSpacingX = spacingX;
-
-    if ( width > 0 || height > 0 || spacingX )
-        m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
-
-    RecalcAndRefresh();
-}
-
-wxSize wxComboCtrlBase::GetButtonSize()
-{
-    if ( m_btnSize.x > 0 )
-        return m_btnSize;
-
-    wxSize retSize(m_btnWid,m_btnHei);
-
-    // Need to call CalculateAreas now if button size is
-    // is not explicitly specified.
-    if ( retSize.x <= 0 || retSize.y <= 0)
-    {
-        OnResize();
-
-        retSize = m_btnSize;
-    }
-
-    return retSize;
-}
-
-void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
-                                           bool blankButtonBg,
-                                           const wxBitmap& bmpPressed,
-                                           const wxBitmap& bmpHover,
-                                           const wxBitmap& bmpDisabled )
-{
-    m_bmpNormal = bmpNormal;
-    m_blankButtonBg = blankButtonBg;
-
-    if ( bmpPressed.IsOk() )
-        m_bmpPressed = bmpPressed;
-    else
-        m_bmpPressed = bmpNormal;
-
-    if ( bmpHover.IsOk() )
-        m_bmpHover = bmpHover;
-    else
-        m_bmpHover = bmpNormal;
-
-    if ( bmpDisabled.IsOk() )
-        m_bmpDisabled = bmpDisabled;
-    else
-        m_bmpDisabled = bmpNormal;
-
-    RecalcAndRefresh();
-}
-
-void wxComboCtrlBase::SetCustomPaintWidth( int width )
-{
-    if ( m_text )
-    {
-        // move textctrl accordingly
-        wxRect r = m_text->GetRect();
-        int inc = width - m_widthCustomPaint;
-        r.x += inc;
-        r.width -= inc;
-        m_text->SetSize( r );
-    }
-
-    m_widthCustomPaint = width;
-
-    RecalcAndRefresh();
-}
-
-bool wxComboCtrlBase::DoSetMargins(const wxPoint& margins)
-{
-    // For general sanity's sake, we ignore top margin. Instead
-    // we will always try to center the text vertically.
-    bool res = true;
-
-    if ( margins.x != -1 )
-    {
-        m_marginLeft = margins.x;
-        m_iFlags |= wxCC_IFLAG_LEFT_MARGIN_SET;
-    }
-    else
-    {
-        m_marginLeft = GetNativeTextIndent();
-        m_iFlags &= ~(wxCC_IFLAG_LEFT_MARGIN_SET);
-    }
-
-    if ( margins.y != -1 )
-    {
-        res = false;
-    }
-
-    RecalcAndRefresh();
-
-    return res;
-}
-
-wxPoint wxComboCtrlBase::DoGetMargins() const
-{
-    return wxPoint(m_marginLeft, -1);
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-void wxComboCtrlBase::SetTextIndent( int indent )
-{
-    if ( indent < 0 )
-    {
-        m_marginLeft = GetNativeTextIndent();
-        m_iFlags &= ~(wxCC_IFLAG_LEFT_MARGIN_SET);
-    }
-    else
-    {
-        m_marginLeft = indent;
-        m_iFlags |= wxCC_IFLAG_LEFT_MARGIN_SET;
-    }
-
-    RecalcAndRefresh();
-}
-
-wxCoord wxComboCtrlBase::GetTextIndent() const
-{
-    return m_marginLeft;
-}
-#endif
-
-wxCoord wxComboCtrlBase::GetNativeTextIndent() const
-{
-    return DEFAULT_TEXT_INDENT;
-}
-
-void wxComboCtrlBase::SetTextCtrlStyle( int style )
-{
-    m_textCtrlStyle = style;
-
-    if ( m_text )
-        m_text->SetWindowStyle(style);
-}
-
-// ----------------------------------------------------------------------------
-// wxTextEntry interface
-// ----------------------------------------------------------------------------
-
-wxString wxComboCtrlBase::DoGetValue() const
-{
-    if ( m_text )
-        return m_text->GetValue();
-    return m_valueString;
-}
-
-void wxComboCtrlBase::SetValueWithEvent(const wxString& value,
-                                        bool withEvent)
-{
-    DoSetValue(value, withEvent ? SetValue_SendEvent : 0);
-}
-
-void wxComboCtrlBase::OnSetValue(const wxString& value)
-{
-    // Note: before wxComboCtrl inherited from wxTextEntry,
-    //       this code used to be in SetValueWithEvent().
-
-    // Since wxComboPopup may want to paint the combo as well, we need
-    // to set the string value here (as well as sometimes in ShowPopup).
-    if ( m_valueString != value )
-    {
-        bool found = true;
-        wxString trueValue = value;
-
-        // Conform to wxComboBox behaviour: read-only control can only accept
-        // valid list items and empty string
-        if ( m_popupInterface && HasFlag(wxCB_READONLY) && value.length() )
-        {
-            found = m_popupInterface->FindItem(value,
-                                               &trueValue);
-        }
-
-        if ( found )
-        {
-            m_valueString = trueValue;
-
-            EnsurePopupControl();
-
-            if ( m_popupInterface )
-                m_popupInterface->SetStringValue(trueValue);
-        }
-    }
-
-    Refresh();
-}
-
-void wxComboCtrlBase::SetValueByUser(const wxString& value)
-{
-    // NB: Order of function calls is important here. Otherwise
-    //     the SelectAll() may not work.
-
-    if ( m_text )
-    {
-        m_text->SetValue(value);
-
-        if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
-            m_text->SelectAll();
-    }
-
-    OnSetValue(value);
-}
-
-// In this SetValue variant wxComboPopup::SetStringValue is not called
-void wxComboCtrlBase::SetText(const wxString& value)
-{
-    // Unlike in SetValue(), this must be called here or
-    // the behaviour will no be consistent in readonlys.
-    EnsurePopupControl();
-
-    m_valueString = value;
-
-    if ( m_text )
-    {
-        m_ignoreEvtText++;
-        m_text->SetValue( value );
-    }
-
-    Refresh();
-}
-
-void wxComboCtrlBase::Copy()
-{
-    if ( m_text )
-        m_text->Copy();
-}
-
-void wxComboCtrlBase::Cut()
-{
-    if ( m_text )
-        m_text->Cut();
-}
-
-void wxComboCtrlBase::Paste()
-{
-    if ( m_text )
-        m_text->Paste();
-}
-
-void wxComboCtrlBase::SetInsertionPoint(long pos)
-{
-    if ( m_text )
-        m_text->SetInsertionPoint(pos);
-}
-
-long wxComboCtrlBase::GetInsertionPoint() const
-{
-    if ( m_text )
-        return m_text->GetInsertionPoint();
-
-    return 0;
-}
-
-long wxComboCtrlBase::GetLastPosition() const
-{
-    if ( m_text )
-        return m_text->GetLastPosition();
-
-    return 0;
-}
-
-void wxComboCtrlBase::WriteText(const wxString& text)
-{
-    if ( m_text )
-    {
-        m_text->WriteText(text);
-        OnSetValue(m_text->GetValue());
-    }
-    else
-    {
-        OnSetValue(text);
-    }
-}
-
-void wxComboCtrlBase::DoSetValue(const wxString& value, int flags)
-{
-    if ( m_text )
-    {
-        if ( flags & SetValue_SendEvent )
-            m_text->SetValue(value);
-        else
-            m_text->ChangeValue(value);
-    }
-
-    OnSetValue(value);
-}
-
-void wxComboCtrlBase::Replace(long from, long to, const wxString& value)
-{
-    if ( m_text )
-    {
-        m_text->Replace(from, to, value);
-        OnSetValue(m_text->GetValue());
-    }
-}
-
-void wxComboCtrlBase::Remove(long from, long to)
-{
-    if ( m_text )
-    {
-        m_text->Remove(from, to);
-        OnSetValue(m_text->GetValue());
-    }
-}
-
-void wxComboCtrlBase::SetSelection(long from, long to)
-{
-    if ( m_text )
-        m_text->SetSelection(from, to);
-}
-
-void wxComboCtrlBase::GetSelection(long *from, long *to) const
-{
-    if ( m_text )
-    {
-        m_text->GetSelection(from, to);
-    }
-    else
-    {
-        *from = 0;
-        *to = 0;
-    }
-}
-
-bool wxComboCtrlBase::IsEditable() const
-{
-    if ( m_text )
-        return m_text->IsEditable();
-    return false;
-}
-
-void wxComboCtrlBase::SetEditable(bool editable)
-{
-    if ( m_text )
-        m_text->SetEditable(editable);
-}
-
-void wxComboCtrlBase::Undo()
-{
-    if ( m_text )
-        m_text->Undo();
-}
-
-void wxComboCtrlBase::Redo()
-{
-    if ( m_text )
-        m_text->Redo();
-}
-
-bool wxComboCtrlBase::CanUndo() const
-{
-    if ( m_text )
-        return m_text->CanUndo();
-
-    return false;
-}
-
-bool wxComboCtrlBase::CanRedo() const
-{
-    if ( m_text )
-        return m_text->CanRedo();
-
-    return false;
-}
-
-bool wxComboCtrlBase::SetHint(const wxString& hint)
-{
-    m_hintText = hint;
-    bool res = true;
-    if ( m_text )
-        res = m_text->SetHint(hint);
-    Refresh();
-    return res;
-}
-
-wxString wxComboCtrlBase::GetHint() const
-{
-    return m_hintText;
-}
-
-#endif // wxUSE_COMBOCTRL
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/combocmn.cpp
+// Purpose:     wxComboCtrlBase
+// Author:      Jaakko Salli
+// Modified by:
+// Created:     Apr-30-2006
+// RCS-ID:      $Id: combocmn.cpp 67178 2011-03-13 09:32:19Z JMS $
+// Copyright:   (c) 2005 Jaakko Salli
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_COMBOCTRL
+
+#include "wx/combobox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/dcclient.h"
+    #include "wx/settings.h"
+    #include "wx/dialog.h"
+    #include "wx/timer.h"
+#endif
+
+#include "wx/tooltip.h"
+
+#include "wx/combo.h"
+
+
+
+// constants
+// ----------------------------------------------------------------------------
+
+#define DEFAULT_DROPBUTTON_WIDTH                19
+
+#define BMP_BUTTON_MARGIN                       4
+
+#define DEFAULT_POPUP_HEIGHT                    400
+
+#define DEFAULT_TEXT_INDENT                     3
+
+#define COMBO_MARGIN                            2 // spacing right of wxTextCtrl
+
+
+#if defined(__WXMSW__)
+
+#define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+                                        // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT           0 // Same, but for non-transient popup window.
+#define TEXTCTRL_TEXT_CENTERED        0 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING                    0 // No focus ring on wxMSW
+
+//#undef wxUSE_POPUPWIN
+//#define wxUSE_POPUPWIN 0
+
+#elif defined(__WXGTK__)
+
+// NB: It is not recommended to use wxDialog as popup on wxGTK, because of
+//     this bug: If wxDialog is hidden, its position becomes corrupt
+//     between hide and next show, but without internal coordinates being
+//     reflected (or something like that - atleast commenting out ->Hide()
+//     seemed to eliminate the position change).
+
+#define USE_TRANSIENT_POPUP           1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+                                        // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT           1 // Same, but for non-transient popup window.
+#define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING                    0 // No focus ring on wxGTK
+
+#elif defined(__WXMAC__)
+
+#define USE_TRANSIENT_POPUP           0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+                                        // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT           0 // Same, but for non-transient popup window.
+#define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING                    3 // Reserve room for the textctrl's focus ring to display
+
+#undef DEFAULT_DROPBUTTON_WIDTH
+#define DEFAULT_DROPBUTTON_WIDTH      22
+#undef COMBO_MARGIN
+#define COMBO_MARGIN                  FOCUS_RING
+
+#else
+
+#define USE_TRANSIENT_POPUP           0 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
+#define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
+                                        // native controls work on it like normal.
+#define POPUPWIN_IS_PERFECT           0 // Same, but for non-transient popup window.
+#define TEXTCTRL_TEXT_CENTERED        1 // 1 if text in textctrl is vertically centered
+#define FOCUS_RING                    0
+
+#endif
+
+
+// Popupwin is really only supported on wxMSW (not WINCE) and wxGTK, regardless
+// what the wxUSE_POPUPWIN says.
+// FIXME: Why isn't wxUSE_POPUPWIN reliable any longer? (it was in wxW2.6.2)
+#if (!defined(__WXMSW__) && !defined(__WXGTK__)) || defined(__WXWINCE__)
+#undef wxUSE_POPUPWIN
+#define wxUSE_POPUPWIN 0
+#endif
+
+
+#if wxUSE_POPUPWIN
+    #include "wx/popupwin.h"
+#else
+    #undef USE_TRANSIENT_POPUP
+    #define USE_TRANSIENT_POPUP 0
+#endif
+
+
+// Define different types of popup windows
+enum
+{
+    POPUPWIN_NONE                   = 0,
+    POPUPWIN_WXPOPUPTRANSIENTWINDOW = 1,
+    POPUPWIN_WXPOPUPWINDOW          = 2,
+    POPUPWIN_WXDIALOG               = 3
+};
+
+
+#if USE_TRANSIENT_POPUP
+    // wxPopupTransientWindow is implemented
+
+    #define wxComboPopupWindowBase  wxPopupTransientWindow
+    #define PRIMARY_POPUP_TYPE      POPUPWIN_WXPOPUPTRANSIENTWINDOW
+    #define USES_WXPOPUPTRANSIENTWINDOW 1
+
+    #if TRANSIENT_POPUPWIN_IS_PERFECT
+        //
+    #elif POPUPWIN_IS_PERFECT
+        #define wxComboPopupWindowBase2     wxPopupWindow
+        #define SECONDARY_POPUP_TYPE        POPUPWIN_WXPOPUPWINDOW
+        #define USES_WXPOPUPWINDOW          1
+    #else
+        #define wxComboPopupWindowBase2     wxDialog
+        #define SECONDARY_POPUP_TYPE        POPUPWIN_WXDIALOG
+        #define USES_WXDIALOG               1
+    #endif
+
+#elif wxUSE_POPUPWIN
+    // wxPopupWindow (but not wxPopupTransientWindow) is properly implemented
+
+    #define wxComboPopupWindowBase      wxPopupWindow
+    #define PRIMARY_POPUP_TYPE          POPUPWIN_WXPOPUPWINDOW
+    #define USES_WXPOPUPWINDOW          1
+
+    #if !POPUPWIN_IS_PERFECT
+        #define wxComboPopupWindowBase2     wxDialog
+        #define SECONDARY_POPUP_TYPE        POPUPWIN_WXDIALOG
+        #define USES_WXDIALOG               1
+    #endif
+
+#else
+    // wxPopupWindow is not implemented
+
+    #define wxComboPopupWindowBase      wxDialog
+    #define PRIMARY_POPUP_TYPE          POPUPWIN_WXDIALOG
+    #define USES_WXDIALOG               1
+
+#endif
+
+
+#ifndef USES_WXPOPUPTRANSIENTWINDOW
+    #define USES_WXPOPUPTRANSIENTWINDOW 0
+#endif
+
+#ifndef USES_WXPOPUPWINDOW
+    #define USES_WXPOPUPWINDOW          0
+#endif
+
+#ifndef USES_WXDIALOG
+    #define USES_WXDIALOG               0
+#endif
+
+
+#if USES_WXPOPUPWINDOW
+    #define INSTALL_TOPLEV_HANDLER      1
+#else
+    #define INSTALL_TOPLEV_HANDLER      0
+#endif
+
+
+//
+// ** TODO **
+// * wxComboPopupWindow for external use (ie. replace old wxUniv wxPopupComboWindow)
+//
+
+
+// ----------------------------------------------------------------------------
+// wxComboFrameEventHandler takes care of hiding the popup when events happen
+// in its top level parent.
+// ----------------------------------------------------------------------------
+
+#if INSTALL_TOPLEV_HANDLER
+
+//
+// This will no longer be necessary after wxTransientPopupWindow
+// works well on all platforms.
+//
+
+class wxComboFrameEventHandler : public wxEvtHandler
+{
+public:
+    wxComboFrameEventHandler( wxComboCtrlBase* pCb );
+    virtual ~wxComboFrameEventHandler();
+
+    void OnPopup();
+
+    void OnIdle( wxIdleEvent& event );
+    void OnMouseEvent( wxMouseEvent& event );
+    void OnActivate( wxActivateEvent& event );
+    void OnResize( wxSizeEvent& event );
+    void OnMove( wxMoveEvent& event );
+    void OnMenuEvent( wxMenuEvent& event );
+    void OnClose( wxCloseEvent& event );
+
+protected:
+    wxWindow*                       m_focusStart;
+    wxComboCtrlBase*     m_combo;
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxComboFrameEventHandler, wxEvtHandler)
+    EVT_IDLE(wxComboFrameEventHandler::OnIdle)
+    EVT_LEFT_DOWN(wxComboFrameEventHandler::OnMouseEvent)
+    EVT_RIGHT_DOWN(wxComboFrameEventHandler::OnMouseEvent)
+    EVT_SIZE(wxComboFrameEventHandler::OnResize)
+    EVT_MOVE(wxComboFrameEventHandler::OnMove)
+    EVT_MENU_HIGHLIGHT(wxID_ANY,wxComboFrameEventHandler::OnMenuEvent)
+    EVT_MENU_OPEN(wxComboFrameEventHandler::OnMenuEvent)
+    EVT_ACTIVATE(wxComboFrameEventHandler::OnActivate)
+    EVT_CLOSE(wxComboFrameEventHandler::OnClose)
+END_EVENT_TABLE()
+
+wxComboFrameEventHandler::wxComboFrameEventHandler( wxComboCtrlBase* combo )
+    : wxEvtHandler()
+{
+    m_combo = combo;
+}
+
+wxComboFrameEventHandler::~wxComboFrameEventHandler()
+{
+}
+
+void wxComboFrameEventHandler::OnPopup()
+{
+    m_focusStart = ::wxWindow::FindFocus();
+}
+
+void wxComboFrameEventHandler::OnIdle( wxIdleEvent& event )
+{
+    wxWindow* winFocused = ::wxWindow::FindFocus();
+
+    wxWindow* popup = m_combo->GetPopupControl()->GetControl();
+    wxWindow* winpopup = m_combo->GetPopupWindow();
+
+    if (
+         winFocused != m_focusStart &&
+         winFocused != popup &&
+         winFocused->GetParent() != popup &&
+         winFocused != winpopup &&
+         winFocused->GetParent() != winpopup &&
+         winFocused != m_combo &&
+         winFocused != m_combo->GetButton() // GTK (atleast) requires this
+        )
+    {
+        m_combo->HidePopup();
+    }
+
+    event.Skip();
+}
+
+void wxComboFrameEventHandler::OnMenuEvent( wxMenuEvent& event )
+{
+    m_combo->HidePopup();
+    event.Skip();
+}
+
+void wxComboFrameEventHandler::OnMouseEvent( wxMouseEvent& event )
+{
+    m_combo->HidePopup();
+    event.Skip();
+}
+
+void wxComboFrameEventHandler::OnClose( wxCloseEvent& event )
+{
+    m_combo->HidePopup();
+    event.Skip();
+}
+
+void wxComboFrameEventHandler::OnActivate( wxActivateEvent& event )
+{
+    m_combo->HidePopup();
+    event.Skip();
+}
+
+void wxComboFrameEventHandler::OnResize( wxSizeEvent& event )
+{
+    m_combo->HidePopup();
+    event.Skip();
+}
+
+void wxComboFrameEventHandler::OnMove( wxMoveEvent& event )
+{
+    m_combo->HidePopup();
+    event.Skip();
+}
+
+#endif // INSTALL_TOPLEV_HANDLER
+
+// ----------------------------------------------------------------------------
+// wxComboPopupWindow is, in essence, wxPopupWindow customized for
+// wxComboCtrl.
+// ----------------------------------------------------------------------------
+
+class wxComboPopupWindow : public wxComboPopupWindowBase
+{
+public:
+
+    wxComboPopupWindow( wxComboCtrlBase *parent,
+                        int style )
+    #if USES_WXPOPUPWINDOW || USES_WXPOPUPTRANSIENTWINDOW
+                       : wxComboPopupWindowBase(parent,style)
+    #else
+                       : wxComboPopupWindowBase(parent,
+                                                wxID_ANY,
+                                                wxEmptyString,
+                                                wxPoint(-21,-21),
+                                                wxSize(20,20),
+                                                style)
+    #endif
+    {
+        m_inShow = 0;
+    }
+
+#if USES_WXPOPUPTRANSIENTWINDOW
+    virtual bool Show( bool show );
+    virtual bool ProcessLeftDown(wxMouseEvent& event);
+protected:
+    virtual void OnDismiss();
+#endif
+
+private:
+    wxByte      m_inShow;
+};
+
+
+#if USES_WXPOPUPTRANSIENTWINDOW
+bool wxComboPopupWindow::Show( bool show )
+{
+    // Guard against recursion
+    if ( m_inShow )
+        return wxComboPopupWindowBase::Show(show);
+
+    m_inShow++;
+
+    wxASSERT( IsKindOf(CLASSINFO(wxPopupTransientWindow)) );
+
+    wxPopupTransientWindow* ptw = (wxPopupTransientWindow*) this;
+    wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
+
+    if ( show != ptw->IsShown() )
+    {
+        if ( show )
+            ptw->Popup(combo->GetPopupControl()->GetControl());
+        else
+            ptw->Dismiss();
+    }
+
+    m_inShow--;
+
+    return true;
+}
+
+bool wxComboPopupWindow::ProcessLeftDown(wxMouseEvent& event)
+{
+    return wxPopupTransientWindow::ProcessLeftDown(event);
+}
+
+// First thing that happens when a transient popup closes is that this method gets called.
+void wxComboPopupWindow::OnDismiss()
+{
+    wxComboCtrlBase* combo = (wxComboCtrlBase*) GetParent();
+    wxASSERT_MSG( combo->IsKindOf(CLASSINFO(wxComboCtrlBase)),
+                  wxT("parent might not be wxComboCtrl, but check IMPLEMENT_DYNAMIC_CLASS(2) macro for correctness") );
+
+    combo->OnPopupDismiss();
+}
+#endif // USES_WXPOPUPTRANSIENTWINDOW
+
+
+// ----------------------------------------------------------------------------
+// wxComboPopupWindowEvtHandler does bulk of the custom event handling
+// of a popup window. It is separate so we can have different types
+// of popup windows.
+// ----------------------------------------------------------------------------
+
+class wxComboPopupWindowEvtHandler : public wxEvtHandler
+{
+public:
+
+    wxComboPopupWindowEvtHandler( wxComboCtrlBase *parent )
+    {
+        m_combo = parent;
+    }
+
+    void OnSizeEvent( wxSizeEvent& event );
+    void OnKeyEvent(wxKeyEvent& event);
+#if USES_WXDIALOG
+    void OnActivate( wxActivateEvent& event );
+#endif
+
+private:
+    wxComboCtrlBase*    m_combo;
+
+    DECLARE_EVENT_TABLE()
+};
+
+
+BEGIN_EVENT_TABLE(wxComboPopupWindowEvtHandler, wxEvtHandler)
+    EVT_KEY_DOWN(wxComboPopupWindowEvtHandler::OnKeyEvent)
+    EVT_KEY_UP(wxComboPopupWindowEvtHandler::OnKeyEvent)
+#if USES_WXDIALOG
+    EVT_ACTIVATE(wxComboPopupWindowEvtHandler::OnActivate)
+#endif
+    EVT_SIZE(wxComboPopupWindowEvtHandler::OnSizeEvent)
+END_EVENT_TABLE()
+
+
+void wxComboPopupWindowEvtHandler::OnSizeEvent( wxSizeEvent& WXUNUSED(event) )
+{
+    // Block the event so that the popup control does not get auto-resized.
+}
+
+void wxComboPopupWindowEvtHandler::OnKeyEvent( wxKeyEvent& event )
+{
+    // Relay keyboard event to the main child controls
+    wxWindowList children = m_combo->GetPopupWindow()->GetChildren();
+    wxWindowList::iterator node = children.begin();
+    wxWindow* child = (wxWindow*)*node;
+    child->AddPendingEvent(event);
+}
+
+#if USES_WXDIALOG
+void wxComboPopupWindowEvtHandler::OnActivate( wxActivateEvent& event )
+{
+    if ( !event.GetActive() )
+    {
+        // Tell combo control that we are dismissed.
+        m_combo->HidePopup();
+
+        event.Skip();
+    }
+}
+#endif
+
+
+// ----------------------------------------------------------------------------
+// wxComboPopup
+//
+// ----------------------------------------------------------------------------
+
+wxComboPopup::~wxComboPopup()
+{
+}
+
+void wxComboPopup::OnPopup()
+{
+}
+
+void wxComboPopup::OnDismiss()
+{
+}
+
+wxSize wxComboPopup::GetAdjustedSize( int minWidth,
+                                      int prefHeight,
+                                      int WXUNUSED(maxHeight) )
+{
+    return wxSize(minWidth,prefHeight);
+}
+
+void wxComboPopup::DefaultPaintComboControl( wxComboCtrlBase* combo,
+                                             wxDC& dc, const wxRect& rect )
+{
+    if ( combo->GetWindowStyle() & wxCB_READONLY ) // ie. no textctrl
+    {
+        combo->PrepareBackground(dc,rect,0);
+
+        dc.DrawText( combo->GetValue(),
+                     rect.x + combo->GetTextIndent(),
+                     (rect.height-dc.GetCharHeight())/2 + rect.y );
+    }
+}
+
+void wxComboPopup::PaintComboControl( wxDC& dc, const wxRect& rect )
+{
+    DefaultPaintComboControl(m_combo,dc,rect);
+}
+
+void wxComboPopup::OnComboKeyEvent( wxKeyEvent& event )
+{
+    event.Skip();
+}
+
+void wxComboPopup::OnComboDoubleClick()
+{
+}
+
+void wxComboPopup::SetStringValue( const wxString& WXUNUSED(value) )
+{
+}
+
+bool wxComboPopup::LazyCreate()
+{
+    return false;
+}
+
+void wxComboPopup::Dismiss()
+{
+    m_combo->HidePopup();
+}
+
+// ----------------------------------------------------------------------------
+// input handling
+// ----------------------------------------------------------------------------
+
+//
+// This is pushed to the event handler queue of the child textctrl.
+//
+class wxComboBoxExtraInputHandler : public wxEvtHandler
+{
+public:
+
+    wxComboBoxExtraInputHandler( wxComboCtrlBase* combo )
+        : wxEvtHandler()
+    {
+        m_combo = combo;
+    }
+    virtual ~wxComboBoxExtraInputHandler() { }
+    void OnKey(wxKeyEvent& event);
+    void OnFocus(wxFocusEvent& event);
+
+protected:
+    wxComboCtrlBase*   m_combo;
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+
+BEGIN_EVENT_TABLE(wxComboBoxExtraInputHandler, wxEvtHandler)
+    EVT_KEY_DOWN(wxComboBoxExtraInputHandler::OnKey)
+    EVT_KEY_UP(wxComboBoxExtraInputHandler::OnKey)
+    EVT_CHAR(wxComboBoxExtraInputHandler::OnKey)
+    EVT_SET_FOCUS(wxComboBoxExtraInputHandler::OnFocus)
+END_EVENT_TABLE()
+
+
+void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
+{
+    // Let the wxComboCtrl event handler have a go first.
+    wxComboCtrlBase* combo = m_combo;
+
+    wxKeyEvent redirectedEvent(event);
+    redirectedEvent.SetId(combo->GetId());
+    redirectedEvent.SetEventObject(combo);
+
+    if ( !combo->GetEventHandler()->ProcessEvent(redirectedEvent) )
+    {
+        // Don't let TAB through to the text ctrl - looks ugly
+        if ( event.GetKeyCode() != WXK_TAB )
+            event.Skip();
+    }
+}
+
+void wxComboBoxExtraInputHandler::OnFocus(wxFocusEvent& event)
+{
+    // FIXME: This code does run when control is clicked,
+    //        yet on Windows it doesn't select all the text.
+    if ( !(m_combo->GetInternalFlags() & wxCC_NO_TEXT_AUTO_SELECT) )
+    {
+        if ( m_combo->GetTextCtrl() )
+            m_combo->GetTextCtrl()->SelectAll();
+        else
+            m_combo->SetSelection(-1,-1);
+    }
+
+    // Send focus indication to parent.
+    // NB: This is needed for cases where the textctrl gets focus
+    //     instead of its parent. While this may trigger multiple
+    //     wxEVT_SET_FOCUSes (since m_text->SetFocus is called
+    //     from combo's focus event handler), they should be quite
+    //     harmless.
+    wxFocusEvent evt2(wxEVT_SET_FOCUS,m_combo->GetId());
+    evt2.SetEventObject(m_combo);
+    m_combo->GetEventHandler()->ProcessEvent(evt2);
+
+    event.Skip();
+}
+
+
+//
+// This is pushed to the event handler queue of the control in popup.
+//
+
+class wxComboPopupExtraEventHandler : public wxEvtHandler
+{
+public:
+
+    wxComboPopupExtraEventHandler( wxComboCtrlBase* combo )
+        : wxEvtHandler()
+    {
+        m_combo = combo;
+        m_beenInside = false;
+    }
+    virtual ~wxComboPopupExtraEventHandler() { }
+
+    void OnMouseEvent( wxMouseEvent& event );
+
+    // Called from wxComboCtrlBase::OnPopupDismiss
+    void OnPopupDismiss()
+    {
+        m_beenInside = false;
+    }
+
+protected:
+    wxComboCtrlBase*     m_combo;
+
+    bool                    m_beenInside;
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+
+BEGIN_EVENT_TABLE(wxComboPopupExtraEventHandler, wxEvtHandler)
+    EVT_MOUSE_EVENTS(wxComboPopupExtraEventHandler::OnMouseEvent)
+END_EVENT_TABLE()
+
+
+void wxComboPopupExtraEventHandler::OnMouseEvent( wxMouseEvent& event )
+{
+    wxPoint pt = event.GetPosition();
+    wxSize sz = m_combo->GetPopupControl()->GetControl()->GetClientSize();
+    int evtType = event.GetEventType();
+    bool isInside = pt.x >= 0 && pt.y >= 0 && pt.x < sz.x && pt.y < sz.y;
+
+    if ( evtType == wxEVT_MOTION ||
+         evtType == wxEVT_LEFT_DOWN ||
+         evtType == wxEVT_RIGHT_DOWN )
+    {
+        // Block motion and click events outside the popup
+        if ( !isInside || !m_combo->IsPopupShown() )
+        {
+            event.Skip(false);
+            return;
+        }
+    }
+    else if ( evtType == wxEVT_LEFT_UP )
+    {
+        if ( !m_combo->IsPopupShown() )
+        {
+            event.Skip(false);
+            return;
+        }
+
+        if ( !m_beenInside )
+        {
+            if ( isInside )
+            {
+                m_beenInside = true;
+            }
+            else
+            {
+                //
+                // Some mouse events to popup that happen outside it, before cursor
+                // has been inside the popu, need to be ignored by it but relayed to
+                // the dropbutton.
+                //
+                wxWindow* btn = m_combo->GetButton();
+                if ( btn )
+                    btn->GetEventHandler()->AddPendingEvent(event);
+                else
+                    m_combo->GetEventHandler()->AddPendingEvent(event);
+
+                return;
+            }
+
+            event.Skip();
+        }
+    }
+
+    event.Skip();
+}
+
+// ----------------------------------------------------------------------------
+// wxComboCtrlBase
+// ----------------------------------------------------------------------------
+
+
+BEGIN_EVENT_TABLE(wxComboCtrlBase, wxControl)
+    EVT_TEXT(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
+    EVT_SIZE(wxComboCtrlBase::OnSizeEvent)
+    EVT_SET_FOCUS(wxComboCtrlBase::OnFocusEvent)
+    EVT_KILL_FOCUS(wxComboCtrlBase::OnFocusEvent)
+    EVT_IDLE(wxComboCtrlBase::OnIdleEvent)
+    //EVT_BUTTON(wxID_ANY,wxComboCtrlBase::OnButtonClickEvent)
+    EVT_KEY_DOWN(wxComboCtrlBase::OnKeyEvent)
+    EVT_TEXT_ENTER(wxID_ANY,wxComboCtrlBase::OnTextCtrlEvent)
+    EVT_SYS_COLOUR_CHANGED(wxComboCtrlBase::OnSysColourChanged)
+END_EVENT_TABLE()
+
+
+IMPLEMENT_ABSTRACT_CLASS(wxComboCtrlBase, wxControl)
+
+void wxComboCtrlBase::Init()
+{
+    m_winPopup = (wxWindow *)NULL;
+    m_popup = (wxWindow *)NULL;
+    m_popupWinState = Hidden;
+    m_btn = (wxWindow*) NULL;
+    m_text = (wxTextCtrl*) NULL;
+    m_popupInterface = (wxComboPopup*) NULL;
+
+    m_popupExtraHandler = (wxEvtHandler*) NULL;
+    m_textEvtHandler = (wxEvtHandler*) NULL;
+
+#if INSTALL_TOPLEV_HANDLER
+    m_toplevEvtHandler = (wxEvtHandler*) NULL;
+#endif
+
+    m_mainCtrlWnd = this;
+
+    m_heightPopup = -1;
+    m_widthMinPopup = -1;
+    m_anchorSide = 0;
+    m_widthCustomPaint = 0;
+    m_widthCustomBorder = 0;
+
+    m_btnState = 0;
+    m_btnWidDefault = 0;
+    m_blankButtonBg = false;
+    m_ignoreEvtText = 0;
+    m_popupWinType = POPUPWIN_NONE;
+    m_btnWid = m_btnHei = -1;
+    m_btnSide = wxRIGHT;
+    m_btnSpacingX = 0;
+
+    m_extLeft = 0;
+    m_extRight = 0;
+    m_absIndent = -1;
+    m_iFlags = 0;
+    m_timeCanAcceptClick = 0;
+
+    m_resetFocus = false;
+}
+
+bool wxComboCtrlBase::Create(wxWindow *parent,
+                             wxWindowID id,
+                             const wxString& value,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxValidator& validator,
+                             const wxString& name)
+{
+    if ( !wxControl::Create(parent,
+                            id,
+                            pos,
+                            size,
+                            style | wxWANTS_CHARS,
+                            validator,
+                            name) )
+        return false;
+
+    m_valueString = value;
+
+    // Get colours
+    OnThemeChange();
+    m_absIndent = GetNativeTextIndent();
+
+    m_iFlags |= wxCC_IFLAG_CREATED;
+
+    // If x and y indicate valid size, wxSizeEvent won't be
+    // emitted automatically, so we need to add artifical one.
+    if ( size.x > 0 && size.y > 0 )
+    {
+        wxSizeEvent evt(size,GetId());
+        GetEventHandler()->AddPendingEvent(evt);
+    }
+
+    return true;
+}
+
+void wxComboCtrlBase::InstallInputHandlers()
+{
+    if ( m_text )
+    {
+        m_textEvtHandler = new wxComboBoxExtraInputHandler(this);
+        m_text->PushEventHandler(m_textEvtHandler);
+    }
+}
+
+void
+wxComboCtrlBase::CreateTextCtrl(int style, const wxValidator& validator)
+{
+    if ( !(m_windowStyle & wxCB_READONLY) )
+    {
+        if ( m_text )
+            m_text->Destroy();
+
+        // wxTE_PROCESS_TAB is needed because on Windows, wxTAB_TRAVERSAL is
+        // not used by the wxPropertyGrid and therefore the tab is processed by
+        // looking at ancestors to see if they have wxTAB_TRAVERSAL. The
+        // navigation event is then sent to the wrong window.
+        style |= wxTE_PROCESS_TAB;
+
+        if ( HasFlag(wxTE_PROCESS_ENTER) )
+            style |= wxTE_PROCESS_ENTER;
+
+        // Ignore EVT_TEXT generated by the constructor (but only
+        // if the event redirector already exists)
+        // NB: This must be " = 1" instead of "++";
+        if ( m_textEvtHandler )
+            m_ignoreEvtText = 1;
+        else
+            m_ignoreEvtText = 0;
+
+        m_text = new wxTextCtrl(this, wxID_ANY, m_valueString,
+                                wxDefaultPosition, wxSize(10,-1),
+                                style, validator);
+    }
+}
+
+void wxComboCtrlBase::OnThemeChange()
+{
+    // Leave the default bg on the Mac so the area used by the focus ring will
+    // be the correct colour and themed brush.  Instead we'll use
+    // wxSYS_COLOUR_WINDOW in the EVT_PAINT handler as needed.
+#ifndef __WXMAC__
+    if ( !m_hasBgCol )
+    {
+#ifdef __WXGTK__
+        // Set background to gtk_rc_get_style(m_widget)->bg[GTK_STATE_NORMAL],
+        // which can be different than the background of text entry.
+        wxColour bgCol = GetDefaultAttributes().colBg;
+#else
+        wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#endif
+        SetOwnBackgroundColour(bgCol);
+        m_hasBgCol = false;
+    }
+#endif
+}
+
+wxComboCtrlBase::~wxComboCtrlBase()
+{
+    if ( HasCapture() )
+        ReleaseMouse();
+
+#if INSTALL_TOPLEV_HANDLER
+    delete ((wxComboFrameEventHandler*)m_toplevEvtHandler);
+    m_toplevEvtHandler = (wxEvtHandler*) NULL;
+#endif
+
+    DestroyPopup();
+
+    if ( m_text )
+        m_text->RemoveEventHandler(m_textEvtHandler);
+
+    delete m_textEvtHandler;
+}
+
+
+// ----------------------------------------------------------------------------
+// geometry stuff
+// ----------------------------------------------------------------------------
+
+// Recalculates button and textctrl areas
+void wxComboCtrlBase::CalculateAreas( int btnWidth )
+{
+    wxSize sz = GetClientSize();
+    int customBorder = m_widthCustomBorder;
+    int btnBorder; // border for button only
+
+    // check if button should really be outside the border: we'll do it it if
+    // its platform default or bitmap+pushbutton background is used, but not if
+    // there is vertical size adjustment or horizontal spacing.
+    if ( ( (m_iFlags & wxCC_BUTTON_OUTSIDE_BORDER) ||
+                (m_bmpNormal.Ok() && m_blankButtonBg) ) &&
+         m_btnSpacingX == 0 &&
+         m_btnHei <= 0 )
+    {
+        m_iFlags |= wxCC_IFLAG_BUTTON_OUTSIDE;
+        btnBorder = 0;
+    }
+    else
+    {
+        m_iFlags &= ~(wxCC_IFLAG_BUTTON_OUTSIDE);
+        btnBorder = customBorder;
+    }
+
+    // Defaul indentation
+    if ( m_absIndent < 0 )
+        m_absIndent = GetNativeTextIndent();
+
+    int butWidth = btnWidth;
+
+    if ( butWidth <= 0 )
+        butWidth = m_btnWidDefault;
+    else
+        m_btnWidDefault = butWidth;
+
+    if ( butWidth <= 0 )
+        return;
+
+    int butHeight = sz.y - btnBorder*2;
+
+    // Adjust button width
+    if ( m_btnWid > 0 )
+        butWidth = m_btnWid;
+    else
+    {
+        // Adjust button width to match aspect ratio
+        // (but only if control is smaller than best size).
+        int bestHeight = GetBestSize().y;
+        int height = GetSize().y;
+
+        if ( height < bestHeight )
+        {
+            // Make very small buttons square, as it makes
+            // them accommodate arrow image better and still
+            // looks decent.
+            if ( height > 18 )
+                butWidth = (height*butWidth)/bestHeight;
+            else
+                butWidth = butHeight;
+        }
+    }
+
+    // Adjust button height
+    if ( m_btnHei > 0 )
+        butHeight = m_btnHei;
+
+    // Use size of normal bitmap if...
+    //   It is larger
+    //   OR
+    //   button width is set to default and blank button bg is not drawn
+    if ( m_bmpNormal.Ok() )
+    {
+        int bmpReqWidth = m_bmpNormal.GetWidth();
+        int bmpReqHeight = m_bmpNormal.GetHeight();
+
+        // If drawing blank button background, we need to add some margin.
+        if ( m_blankButtonBg )
+        {
+            bmpReqWidth += BMP_BUTTON_MARGIN*2;
+            bmpReqHeight += BMP_BUTTON_MARGIN*2;
+        }
+
+        if ( butWidth < bmpReqWidth || ( m_btnWid == 0 && !m_blankButtonBg ) )
+            butWidth = bmpReqWidth;
+        if ( butHeight < bmpReqHeight || ( m_btnHei == 0 && !m_blankButtonBg ) )
+            butHeight = bmpReqHeight;
+
+        // Need to fix height?
+        if ( (sz.y-(customBorder*2)) < butHeight && btnWidth == 0 )
+        {
+            int newY = butHeight+(customBorder*2);
+            SetClientSize(wxDefaultCoord,newY);
+            sz.y = newY;
+        }
+    }
+
+    int butAreaWid = butWidth + (m_btnSpacingX*2);
+
+    m_btnSize.x = butWidth;
+    m_btnSize.y = butHeight;
+
+    m_btnArea.x = ( m_btnSide==wxRIGHT ? sz.x - butAreaWid - btnBorder : btnBorder );
+    m_btnArea.y = btnBorder + FOCUS_RING;
+    m_btnArea.width = butAreaWid;
+    m_btnArea.height = sz.y - ((btnBorder+FOCUS_RING)*2);
+
+    m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder + FOCUS_RING;
+    m_tcArea.y = customBorder + FOCUS_RING;
+    m_tcArea.width = sz.x - butAreaWid - (customBorder*2) - (FOCUS_RING*2);
+    m_tcArea.height = sz.y - ((customBorder+FOCUS_RING)*2);
+
+/*
+    if ( m_text )
+    {
+        ::wxMessageBox(wxString::Format(wxT("ButtonArea (%i,%i,%i,%i)\n"),m_btnArea.x,m_btnArea.y,m_btnArea.width,m_btnArea.height) +
+                       wxString::Format(wxT("TextCtrlArea (%i,%i,%i,%i)"),m_tcArea.x,m_tcArea.y,m_tcArea.width,m_tcArea.height));
+    }
+*/
+}
+
+void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust )
+{
+    if ( !m_text )
+        return;
+
+#if !TEXTCTRL_TEXT_CENTERED
+
+    wxSize sz = GetClientSize();
+
+    int customBorder = m_widthCustomBorder;
+    if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER )
+    {
+        // Centre textctrl
+        int tcSizeY = m_text->GetBestSize().y;
+        int diff = sz.y - tcSizeY;
+        int y = textCtrlYAdjust + (diff/2);
+
+        if ( y < customBorder )
+            y = customBorder;
+
+        m_text->SetSize( m_tcArea.x + m_widthCustomPaint + m_absIndent + textCtrlXAdjust,
+                         y,
+                         m_tcArea.width - COMBO_MARGIN -
+                         (textCtrlXAdjust + m_widthCustomPaint + m_absIndent),
+                         -1 );
+
+        // Make sure textctrl doesn't exceed the bottom custom border
+        wxSize tsz = m_text->GetSize();
+        diff = (y + tsz.y) - (sz.y - customBorder);
+        if ( diff >= 0 )
+        {
+            tsz.y = tsz.y - diff - 1;
+            m_text->SetSize(tsz);
+        }
+    }
+    else
+#else // TEXTCTRL_TEXT_CENTERED
+    wxUnusedVar(textCtrlXAdjust);
+    wxUnusedVar(textCtrlYAdjust);
+#endif // !TEXTCTRL_TEXT_CENTERED/TEXTCTRL_TEXT_CENTERED
+    {
+        // If it has border, have textctrl will the entire text field.
+        m_text->SetSize( m_tcArea.x + m_widthCustomPaint,
+                         m_tcArea.y,
+                         m_tcArea.width - m_widthCustomPaint,
+                         m_tcArea.height );
+    }
+}
+
+wxSize wxComboCtrlBase::DoGetBestSize() const
+{
+    wxSize sizeText(150,0);
+
+    if ( m_text )
+        sizeText = m_text->GetBestSize();
+
+    // TODO: Better method to calculate close-to-native control height.
+
+    int fhei;
+    if ( m_font.Ok() )
+        fhei = (m_font.GetPointSize()*2) + 5;
+    else if ( wxNORMAL_FONT->Ok() )
+        fhei = (wxNORMAL_FONT->GetPointSize()*2) + 5;
+    else
+        fhei = sizeText.y + 4;
+
+    // Need to force height to accomodate bitmap?
+    int btnSizeY = m_btnSize.y;
+    if ( m_bmpNormal.Ok() && fhei < btnSizeY )
+        fhei = btnSizeY;
+
+    // Control height doesn't depend on border
+/*
+    // Add border
+    int border = m_windowStyle & wxBORDER_MASK;
+    if ( border == wxSIMPLE_BORDER )
+        fhei += 2;
+    else if ( border == wxNO_BORDER )
+        fhei += (m_widthCustomBorder*2);
+    else
+        // Sunken etc.
+        fhei += 4;
+*/
+
+    // Final adjustments
+#ifdef __WXGTK__
+    fhei += 1;
+#endif
+
+#ifdef __WXMAC__
+    // these are the numbers from the HIG:
+    switch ( m_windowVariant )
+    {
+        case wxWINDOW_VARIANT_NORMAL:
+        default :
+            fhei = 22;
+            break;
+        case wxWINDOW_VARIANT_SMALL:
+            fhei = 19;
+            break;
+        case wxWINDOW_VARIANT_MINI:
+            fhei = 15;
+            break;
+    }
+#endif
+
+    fhei += 2 * FOCUS_RING;
+    int width = sizeText.x + FOCUS_RING + COMBO_MARGIN + DEFAULT_DROPBUTTON_WIDTH;
+
+    wxSize ret(width, fhei);
+    CacheBestSize(ret);
+    return ret;
+}
+
+void wxComboCtrlBase::OnSizeEvent( wxSizeEvent& event )
+{
+    if ( !IsCreated() )
+        return;
+
+    // defined by actual wxComboCtrls
+    OnResize();
+
+    event.Skip();
+}
+
+// ----------------------------------------------------------------------------
+// standard operations
+// ----------------------------------------------------------------------------
+
+bool wxComboCtrlBase::Enable(bool enable)
+{
+    if ( !wxControl::Enable(enable) )
+        return false;
+
+    if ( m_btn )
+        m_btn->Enable(enable);
+    if ( m_text )
+        m_text->Enable(enable);
+        
+    Refresh();
+
+    return true;
+}
+
+bool wxComboCtrlBase::Show(bool show)
+{
+    if ( !wxControl::Show(show) )
+        return false;
+
+    if (m_btn)
+        m_btn->Show(show);
+
+    if (m_text)
+        m_text->Show(show);
+
+    return true;
+}
+
+bool wxComboCtrlBase::SetFont ( const wxFont& font )
+{
+    if ( !wxControl::SetFont(font) )
+        return false;
+
+    if (m_text)
+        m_text->SetFont(font);
+
+    return true;
+}
+
+#if wxUSE_TOOLTIPS
+void wxComboCtrlBase::DoSetToolTip(wxToolTip *tooltip)
+{
+    wxControl::DoSetToolTip(tooltip);
+
+    // Set tool tip for button and text box
+    if ( tooltip )
+    {
+        const wxString &tip = tooltip->GetTip();
+        if ( m_text ) m_text->SetToolTip(tip);
+        if ( m_btn ) m_btn->SetToolTip(tip);
+    }
+    else
+    {
+        if ( m_text ) m_text->SetToolTip( (wxToolTip*) NULL );
+        if ( m_btn ) m_btn->SetToolTip( (wxToolTip*) NULL );
+    }
+}
+#endif // wxUSE_TOOLTIPS
+
+#if wxUSE_VALIDATORS
+void wxComboCtrlBase::SetValidator(const wxValidator& validator)
+{
+    wxTextCtrl* textCtrl = GetTextCtrl();
+
+    if ( textCtrl )
+        textCtrl->SetValidator( validator );
+    else
+        wxControl::SetValidator( validator );
+}
+
+wxValidator* wxComboCtrlBase::GetValidator()
+{
+    wxTextCtrl* textCtrl = GetTextCtrl();
+
+    return textCtrl ? textCtrl->GetValidator() : wxControl::GetValidator();
+}
+#endif // wxUSE_VALIDATORS
+
+// ----------------------------------------------------------------------------
+// painting
+// ----------------------------------------------------------------------------
+
+#if (!defined(__WXMSW__)) || defined(__WXUNIVERSAL__)
+// prepare combo box background on area in a way typical on platform
+void wxComboCtrlBase::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
+{
+    wxSize sz = GetClientSize();
+    bool isEnabled;
+    bool isFocused; // also selected
+
+    // For smaller size control (and for disabled background) use less spacing
+    int focusSpacingX;
+    int focusSpacingY;
+
+    if ( !(flags & wxCONTROL_ISSUBMENU) )
+    {
+        // Drawing control
+        isEnabled = IsEnabled();
+        isFocused = ShouldDrawFocus();
+
+        // Windows-style: for smaller size control (and for disabled background) use less spacing
+        focusSpacingX = isEnabled ? 2 : 1;
+        focusSpacingY = sz.y > (GetCharHeight()+2) && isEnabled ? 2 : 1;
+    }
+    else
+    {
+        // Drawing a list item
+        isEnabled = true; // they are never disabled
+        isFocused = flags & wxCONTROL_SELECTED ? true : false;
+
+        focusSpacingX = 0;
+        focusSpacingY = 0;
+    }
+
+    // Set the background sub-rectangle for selection, disabled etc
+    wxRect selRect(rect);
+    selRect.y += focusSpacingY;
+    selRect.height -= (focusSpacingY*2);
+
+    int wcp = 0;
+
+    if ( !(flags & wxCONTROL_ISSUBMENU) )
+        wcp += m_widthCustomPaint;
+
+    selRect.x += wcp + focusSpacingX;
+    selRect.width -= wcp + (focusSpacingX*2);
+
+    wxColour fgCol;
+    wxColour bgCol;
+
+    if ( isEnabled )
+    {
+        if ( isFocused )
+            fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+        else if ( m_hasFgCol )
+            // Honour the custom foreground colour
+            fgCol = GetForegroundColour();
+        else
+            fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    }
+    else
+    {
+        fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
+    }
+
+    if ( isEnabled )
+    {
+        if ( isFocused )
+            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+        else if ( m_hasBgCol )
+            // Honour the custom background colour
+            bgCol = GetBackgroundColour();
+        else
+#if defined(__WXMAC__) || defined(__WXGTK__)  // see note in OnThemeChange
+            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#else
+            bgCol = GetBackgroundColour();
+#endif
+    }
+    else
+    {
+#if defined(__WXMAC__) || defined(__WXGTK__)  // see note in OnThemeChange
+        bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#else
+        bgCol = GetBackgroundColour();
+#endif
+    }
+
+    dc.SetTextForeground( fgCol );
+    dc.SetBrush( bgCol );
+    dc.SetPen( bgCol );
+    dc.DrawRectangle( selRect );
+
+    // Don't clip exactly to the selection rectangle so we can draw
+    // to the non-selected area in front of it.
+    wxRect clipRect(rect.x,rect.y,
+                    (selRect.x+selRect.width)-rect.x,rect.height);
+    dc.SetClippingRegion(clipRect);
+}
+#else
+// Save the library size a bit for platforms that re-implement this.
+void wxComboCtrlBase::PrepareBackground( wxDC&, const wxRect&, int ) const
+{
+}
+#endif
+
+void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
+{
+    int drawState = m_btnState;
+
+#ifdef __WXGTK__
+    if ( GetPopupWindowState() >= Animating )
+        drawState |= wxCONTROL_PRESSED;
+#endif
+
+    wxRect drawRect(rect.x+m_btnSpacingX,
+                    rect.y+((rect.height-m_btnSize.y)/2),
+                    m_btnSize.x,
+                    m_btnSize.y);
+
+    // Make sure area is not larger than the control
+    if ( drawRect.y < rect.y )
+        drawRect.y = rect.y;
+    if ( drawRect.height > rect.height )
+        drawRect.height = rect.height;
+
+    bool enabled = IsEnabled();
+
+    if ( !enabled )
+        drawState |= wxCONTROL_DISABLED;
+
+    if ( !m_bmpNormal.Ok() )
+    {
+        if ( flags & Draw_BitmapOnly )
+            return;
+
+        // Need to clear button background even if m_btn is present
+        if ( flags & Draw_PaintBg )
+        {
+            wxColour bgCol;
+
+            if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
+                bgCol = GetParent()->GetBackgroundColour();
+            else
+                bgCol = GetBackgroundColour();
+
+            dc.SetBrush(bgCol);
+            dc.SetPen(bgCol);
+            dc.DrawRectangle(rect);
+        }
+
+        // Draw standard button
+        wxRendererNative::Get().DrawComboBoxDropButton(this,
+                                                       dc,
+                                                       drawRect,
+                                                       drawState);
+    }
+    else
+    {
+        // Draw bitmap
+
+        wxBitmap* pBmp;
+
+        if ( !enabled )
+            pBmp = &m_bmpDisabled;
+        else if ( m_btnState & wxCONTROL_PRESSED )
+            pBmp = &m_bmpPressed;
+        else if ( m_btnState & wxCONTROL_CURRENT )
+            pBmp = &m_bmpHover;
+        else
+            pBmp = &m_bmpNormal;
+
+        if ( m_blankButtonBg )
+        {
+            // If using blank button background, we need to clear its background
+            // with button face colour instead of colour for rest of the control.
+            if ( flags & Draw_PaintBg )
+            {
+                wxColour bgCol = GetParent()->GetBackgroundColour(); //wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+                //wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+                dc.SetPen(bgCol);
+                dc.SetBrush(bgCol);
+                dc.DrawRectangle(rect);
+            }
+
+            wxRendererNative::Get().DrawPushButton(this,
+                                                   dc,
+                                                   drawRect,
+                                                   drawState);
+
+        }
+        else
+
+        {
+            // Need to clear button background even if m_btn is present
+            // (assume non-button background was cleared just before this call so brushes are good)
+            if ( flags & Draw_PaintBg )
+                dc.DrawRectangle(rect);
+        }
+
+        // Draw bitmap centered in drawRect
+        dc.DrawBitmap(*pBmp,
+                      drawRect.x + (drawRect.width-pBmp->GetWidth())/2,
+                      drawRect.y + (drawRect.height-pBmp->GetHeight())/2,
+                      true);
+    }
+}
+
+void wxComboCtrlBase::RecalcAndRefresh()
+{
+    if ( IsCreated() )
+    {
+        wxSizeEvent evt(GetSize(),GetId());
+        GetEventHandler()->ProcessEvent(evt);
+        Refresh();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// miscellaneous event handlers
+// ----------------------------------------------------------------------------
+
+void wxComboCtrlBase::OnTextCtrlEvent(wxCommandEvent& event)
+{
+    if ( event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED )
+    {
+        if ( m_ignoreEvtText > 0 )
+        {
+            m_ignoreEvtText--;
+            return;
+        }
+    }
+
+    // Change event id, object and string before relaying it forward
+    event.SetId(GetId());
+    wxString s = event.GetString();
+    event.SetEventObject(this);
+    event.SetString(s);
+    event.Skip();
+}
+
+// call if cursor is on button area or mouse is captured for the button
+bool wxComboCtrlBase::HandleButtonMouseEvent( wxMouseEvent& event,
+                                                 int flags )
+{
+    int type = event.GetEventType();
+
+    if ( type == wxEVT_MOTION )
+    {
+        if ( flags & wxCC_MF_ON_BUTTON )
+        {
+            if ( !(m_btnState & wxCONTROL_CURRENT) )
+            {
+                // Mouse hover begins
+                m_btnState |= wxCONTROL_CURRENT;
+                if ( HasCapture() ) // Retain pressed state.
+                    m_btnState |= wxCONTROL_PRESSED;
+                Refresh();
+            }
+        }
+        else if ( (m_btnState & wxCONTROL_CURRENT) )
+        {
+            // Mouse hover ends
+            m_btnState &= ~(wxCONTROL_CURRENT|wxCONTROL_PRESSED);
+            Refresh();
+        }
+    }
+    else if ( type == wxEVT_LEFT_DOWN || type == wxEVT_LEFT_DCLICK )
+    {
+        if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
+        {
+            m_btnState |= wxCONTROL_PRESSED;
+            Refresh();
+
+            if ( !(m_iFlags & wxCC_POPUP_ON_MOUSE_UP) )
+                OnButtonClick();
+            else
+                // If showing popup now, do not capture mouse or there will be interference
+                CaptureMouse();
+        }
+    }
+    else if ( type == wxEVT_LEFT_UP )
+    {
+
+        // Only accept event if mouse was left-press was previously accepted
+        if ( HasCapture() )
+            ReleaseMouse();
+
+        if ( m_btnState & wxCONTROL_PRESSED )
+        {
+            // If mouse was inside, fire the click event.
+            if ( m_iFlags & wxCC_POPUP_ON_MOUSE_UP )
+            {
+                if ( flags & (wxCC_MF_ON_CLICK_AREA|wxCC_MF_ON_BUTTON) )
+                    OnButtonClick();
+            }
+
+            m_btnState &= ~(wxCONTROL_PRESSED);
+            Refresh();
+        }
+    }
+    else if ( type == wxEVT_LEAVE_WINDOW )
+    {
+        if ( m_btnState & (wxCONTROL_CURRENT|wxCONTROL_PRESSED) )
+        {
+            m_btnState &= ~(wxCONTROL_CURRENT);
+
+            // Mouse hover ends
+            if ( IsPopupWindowState(Hidden) )
+            {
+                m_btnState &= ~(wxCONTROL_PRESSED);
+                Refresh();
+            }
+        }
+    }
+    else
+        return false;
+
+    return true;
+}
+
+// returns true if event was consumed or filtered
+bool wxComboCtrlBase::PreprocessMouseEvent( wxMouseEvent& event,
+                                            int WXUNUSED(flags) )
+{
+    wxLongLong t = ::wxGetLocalTimeMillis();
+    int evtType = event.GetEventType();
+
+#if USES_WXPOPUPWINDOW || USES_WXDIALOG
+    if ( m_popupWinType != POPUPWIN_WXPOPUPTRANSIENTWINDOW )
+    {
+        if ( IsPopupWindowState(Visible) &&
+             ( evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_RIGHT_DOWN ) )
+        {
+            HidePopup();
+            return true;
+        }
+    }
+#endif
+
+    // Filter out clicks on button immediately after popup dismiss (Windows like behaviour)
+    if ( evtType == wxEVT_LEFT_DOWN && t < m_timeCanAcceptClick )
+    {
+        event.SetEventType(0);
+        return true;
+    }
+
+    return false;
+}
+
+void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
+{
+    int evtType = event.GetEventType();
+
+    if ( (evtType == wxEVT_LEFT_DOWN || evtType == wxEVT_LEFT_DCLICK) &&
+         (m_windowStyle & wxCB_READONLY) )
+    {
+        if ( GetPopupWindowState() >= Animating )
+        {
+    #if USES_WXPOPUPWINDOW
+            // Click here always hides the popup.
+            if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
+                HidePopup();
+    #endif
+        }
+        else
+        {
+            if ( !(m_windowStyle & wxCC_SPECIAL_DCLICK) )
+            {
+                // In read-only mode, clicking the text is the
+                // same as clicking the button.
+                OnButtonClick();
+            }
+            else if ( /*evtType == wxEVT_LEFT_UP || */evtType == wxEVT_LEFT_DCLICK )
+            {
+                //if ( m_popupInterface->CycleValue() )
+                //    Refresh();
+                if ( m_popupInterface )
+                    m_popupInterface->OnComboDoubleClick();
+            }
+        }
+    }
+    else
+    if ( IsPopupShown() )
+    {
+        // relay (some) mouse events to the popup
+        if ( evtType == wxEVT_MOUSEWHEEL )
+            m_popup->AddPendingEvent(event);
+    }
+    else if ( evtType )
+        event.Skip();
+}
+
+void wxComboCtrlBase::OnKeyEvent(wxKeyEvent& event)
+{
+    if ( IsPopupShown() )
+    {
+        // pass it to the popped up control
+        GetPopupControl()->GetControl()->AddPendingEvent(event);
+    }
+    else // no popup
+    {
+        int keycode = event.GetKeyCode();
+
+        wxWindow* mainCtrl = GetMainWindowOfCompositeControl();
+
+        if ( mainCtrl->GetParent()->HasFlag(wxTAB_TRAVERSAL) &&
+             keycode == WXK_TAB )
+        {
+            wxNavigationKeyEvent evt;
+
+            evt.SetFlags(wxNavigationKeyEvent::FromTab|
+                         (!event.ShiftDown() ? wxNavigationKeyEvent::IsForward
+                                             : wxNavigationKeyEvent::IsBackward));
+            evt.SetEventObject(mainCtrl);
+            evt.SetCurrentFocus(mainCtrl);
+            mainCtrl->GetParent()->GetEventHandler()->AddPendingEvent(evt);
+            return;
+        }
+
+        if ( IsKeyPopupToggle(event) )
+        {
+            OnButtonClick();
+            return;
+        }
+
+        int comboStyle = GetWindowStyle();
+        wxComboPopup* popupInterface = GetPopupControl();
+
+        if ( !popupInterface )
+        {
+            event.Skip();
+            return;
+        }
+
+        if ( (comboStyle & wxCB_READONLY) ||
+             (keycode != WXK_RIGHT && keycode != WXK_LEFT) )
+        {
+            popupInterface->OnComboKeyEvent(event);
+        }
+        else
+            event.Skip();
+    }
+}
+
+void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
+{
+    if ( event.GetEventType() == wxEVT_SET_FOCUS )
+    {
+        wxWindow* tc = GetTextCtrl();
+        if ( tc && tc != DoFindFocus() )
+#ifdef __WXMAC__
+            m_resetFocus = true;
+#else
+            tc->SetFocus();
+#endif
+    }
+
+    Refresh();
+}
+
+void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )
+{
+    if ( m_resetFocus )
+    {
+        m_resetFocus = false;
+        wxWindow* tc = GetTextCtrl();
+        if ( tc )
+            tc->SetFocus();
+    }
+}
+
+void wxComboCtrlBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+{
+    OnThemeChange();
+    // indentation may also have changed
+    if ( !(m_iFlags & wxCC_IFLAG_INDENT_SET) )
+        m_absIndent = GetNativeTextIndent();
+    RecalcAndRefresh();
+}
+
+// ----------------------------------------------------------------------------
+// popup handling
+// ----------------------------------------------------------------------------
+
+// Create popup window and the child control
+void wxComboCtrlBase::CreatePopup()
+{
+    wxComboPopup* popupInterface = m_popupInterface;
+    wxWindow* popup;
+
+    if ( !m_winPopup )
+    {
+#ifdef wxComboPopupWindowBase2
+        if ( m_iFlags & wxCC_IFLAG_USE_ALT_POPUP )
+        {
+        #if !USES_WXDIALOG
+            m_winPopup = new wxComboPopupWindowBase2( this, wxNO_BORDER );
+        #else
+            m_winPopup = new wxComboPopupWindowBase2( this, wxID_ANY, wxEmptyString,
+                                                      wxPoint(-21,-21), wxSize(20, 20),
+                                                      wxNO_BORDER );
+        #endif
+            m_popupWinType = SECONDARY_POPUP_TYPE;
+        }
+        else
+#endif
+        {
+            m_winPopup = new wxComboPopupWindow( this, wxNO_BORDER );
+            m_popupWinType = PRIMARY_POPUP_TYPE;
+        }
+        m_popupWinEvtHandler = new wxComboPopupWindowEvtHandler(this);
+        m_winPopup->PushEventHandler(m_popupWinEvtHandler);
+    }
+
+    popupInterface->Create(m_winPopup);
+    m_popup = popup = popupInterface->GetControl();
+
+    m_popupExtraHandler = new wxComboPopupExtraEventHandler(this);
+    popup->PushEventHandler( m_popupExtraHandler );
+
+    // This may be helpful on some platforms
+    //   (eg. it bypasses a wxGTK popupwindow bug where
+    //    window is not initially hidden when it should be)
+    m_winPopup->Hide();
+
+    popupInterface->m_iFlags |= wxCP_IFLAG_CREATED;
+}
+
+// Destroy popup window and the child control
+void wxComboCtrlBase::DestroyPopup()
+{
+    HidePopup();
+
+    if ( m_popup )
+        m_popup->RemoveEventHandler(m_popupExtraHandler);
+
+    delete m_popupExtraHandler;
+
+    delete m_popupInterface;
+
+    if ( m_winPopup )
+    {
+        m_winPopup->RemoveEventHandler(m_popupWinEvtHandler);
+        delete m_popupWinEvtHandler;
+        m_popupWinEvtHandler = NULL;
+        m_winPopup->Destroy();
+    }
+
+    m_popupExtraHandler = (wxEvtHandler*) NULL;
+    m_popupInterface = (wxComboPopup*) NULL;
+    m_winPopup = (wxWindow*) NULL;
+    m_popup = (wxWindow*) NULL;
+}
+
+void wxComboCtrlBase::DoSetPopupControl(wxComboPopup* iface)
+{
+    wxCHECK_RET( iface, wxT("no popup interface set for wxComboCtrl") );
+
+    DestroyPopup();
+
+    iface->InitBase(this);
+    iface->Init();
+
+    m_popupInterface = iface;
+
+    if ( !iface->LazyCreate() )
+    {
+        CreatePopup();
+    }
+    else
+    {
+        m_popup = (wxWindow*) NULL;
+    }
+
+    // This must be done after creation
+    if ( m_valueString.length() )
+    {
+        iface->SetStringValue(m_valueString);
+        //Refresh();
+    }
+}
+
+// Ensures there is atleast the default popup
+void wxComboCtrlBase::EnsurePopupControl()
+{
+    if ( !m_popupInterface )
+        SetPopupControl(NULL);
+}
+
+void wxComboCtrlBase::OnButtonClick()
+{
+    // Derived classes can override this method for totally custom
+    // popup action
+    if ( !IsPopupWindowState(Visible) )
+        ShowPopup();
+    else
+        HidePopup();
+}
+
+void wxComboCtrlBase::ShowPopup()
+{
+    EnsurePopupControl();
+    wxCHECK_RET( !IsPopupWindowState(Visible), wxT("popup window already shown") );
+
+    if ( IsPopupWindowState(Animating) )
+        return;
+
+    SetFocus();
+
+    // Space above and below
+    int screenHeight;
+    wxPoint scrPos;
+    int spaceAbove;
+    int spaceBelow;
+    int maxHeightPopup;
+    wxSize ctrlSz = GetSize();
+
+    screenHeight = wxSystemSettings::GetMetric( wxSYS_SCREEN_Y );
+    scrPos = GetParent()->ClientToScreen(GetPosition());
+
+    spaceAbove = scrPos.y;
+    spaceBelow = screenHeight - spaceAbove - ctrlSz.y;
+
+    maxHeightPopup = spaceBelow;
+    if ( spaceAbove > spaceBelow )
+        maxHeightPopup = spaceAbove;
+
+    // Width
+    int widthPopup = ctrlSz.x + m_extLeft + m_extRight;
+
+    if ( widthPopup < m_widthMinPopup )
+        widthPopup = m_widthMinPopup;
+
+    wxWindow* winPopup = m_winPopup;
+    wxWindow* popup;
+
+    // Need to disable tab traversal of parent
+    //
+    // NB: This is to fix a bug in wxMSW. In theory it could also be fixed
+    //     by, for instance, adding check to window.cpp:wxWindowMSW::MSWProcessMessage
+    //     that if transient popup is open, then tab traversal is to be ignored.
+    //     However, I think this code would still be needed for cases where
+    //     transient popup doesn't work yet (wxWinCE?).
+    wxWindow* parent = GetParent();
+    int parentFlags = parent->GetWindowStyle();
+    if ( parentFlags & wxTAB_TRAVERSAL )
+    {
+        parent->SetWindowStyle( parentFlags & ~(wxTAB_TRAVERSAL) );
+        m_iFlags |= wxCC_IFLAG_PARENT_TAB_TRAVERSAL;
+    }
+
+    if ( !winPopup )
+    {
+        CreatePopup();
+        winPopup = m_winPopup;
+        popup = m_popup;
+    }
+    else
+    {
+        popup = m_popup;
+    }
+
+    winPopup->Enable();
+
+    wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
+
+    wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,
+                                                            m_heightPopup<=0?DEFAULT_POPUP_HEIGHT:m_heightPopup,
+                                                            maxHeightPopup);
+
+    popup->SetSize(adjustedSize);
+    popup->Move(0,0);
+    m_popupInterface->OnPopup();
+
+    //
+    // Reposition and resize popup window
+    //
+
+    wxSize szp = popup->GetSize();
+
+    int popupX;
+    int popupY = scrPos.y + ctrlSz.y;
+
+    // Default anchor is wxLEFT
+    int anchorSide = m_anchorSide;
+    if ( !anchorSide )
+        anchorSide = wxLEFT;
+
+    int rightX = scrPos.x + ctrlSz.x + m_extRight - szp.x;
+    int leftX = scrPos.x - m_extLeft;
+
+    if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+        leftX -= ctrlSz.x;
+
+    int screenWidth = wxSystemSettings::GetMetric( wxSYS_SCREEN_X );
+
+    // If there is not enough horizontal space, anchor on the other side.
+    // If there is no space even then, place the popup at x 0.
+    if ( anchorSide == wxRIGHT )
+    {
+        if ( rightX < 0 )
+        {
+            if ( (leftX+szp.x) < screenWidth )
+                anchorSide = wxLEFT;
+            else
+                anchorSide = 0;
+        }
+    }
+    else
+    {
+        if ( (leftX+szp.x) >= screenWidth )
+        {
+            if ( rightX >= 0 )
+                anchorSide = wxRIGHT;
+            else
+                anchorSide = 0;
+        }
+    }
+
+    // Select x coordinate according to the anchor side
+    if ( anchorSide == wxRIGHT )
+        popupX = rightX;
+    else if ( anchorSide == wxLEFT )
+        popupX = leftX;
+    else
+        popupX = 0;
+
+    int showFlags = CanDeferShow;
+
+    if ( spaceBelow < szp.y )
+    {
+        popupY = scrPos.y - szp.y;
+        showFlags |= ShowAbove;
+    }
+
+#if INSTALL_TOPLEV_HANDLER
+    // Put top level window event handler into place
+    if ( m_popupWinType == POPUPWIN_WXPOPUPWINDOW )
+    {
+        if ( !m_toplevEvtHandler )
+            m_toplevEvtHandler = new wxComboFrameEventHandler(this);
+
+        wxWindow* toplev = ::wxGetTopLevelParent( this );
+        wxASSERT( toplev );
+        ((wxComboFrameEventHandler*)m_toplevEvtHandler)->OnPopup();
+        toplev->PushEventHandler( m_toplevEvtHandler );
+    }
+#endif
+
+    // Set string selection (must be this way instead of SetStringSelection)
+    if ( m_text )
+    {
+        if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
+            m_text->SelectAll();
+
+        m_popupInterface->SetStringValue( m_text->GetValue() );
+    }
+    else
+    {
+        // This is neede since focus/selection indication may change when popup is shown
+        Refresh();
+    }
+
+    // This must be after SetStringValue
+    m_popupWinState = Animating;
+
+    wxRect popupWinRect( popupX, popupY, szp.x, szp.y );
+
+    m_popup = popup;
+    if ( (m_iFlags & wxCC_IFLAG_DISABLE_POPUP_ANIM) ||
+         AnimateShow( popupWinRect, showFlags ) )
+    {
+        DoShowPopup( popupWinRect, showFlags );
+    }
+}
+
+bool wxComboCtrlBase::AnimateShow( const wxRect& WXUNUSED(rect), int WXUNUSED(flags) )
+{
+    return true;
+}
+
+void wxComboCtrlBase::DoShowPopup( const wxRect& rect, int WXUNUSED(flags) )
+{
+    wxWindow* winPopup = m_winPopup;
+
+    if ( IsPopupWindowState(Animating) )
+    {
+        // Make sure the popup window is shown in the right position.
+        // Should not matter even if animation already did this.
+
+        // Some platforms (GTK) may like SetSize and Move to be separate
+        // (though the bug was probably fixed).
+        winPopup->SetSize( rect );
+
+        winPopup->Show();
+
+        m_popupWinState = Visible;
+    }
+    else if ( IsPopupWindowState(Hidden) )
+    {
+        // Animation was aborted
+
+        wxASSERT( !winPopup->IsShown() );
+
+        m_popupWinState = Hidden;
+    }
+}
+
+void wxComboCtrlBase::OnPopupDismiss()
+{
+    // Just in case, avoid double dismiss
+    if ( IsPopupWindowState(Hidden) )
+        return;
+
+    // This must be set before focus - otherwise there will be recursive
+    // OnPopupDismisses.
+    m_popupWinState = Hidden;
+
+    //SetFocus();
+    m_winPopup->Disable();
+
+    // Inform popup control itself
+    m_popupInterface->OnDismiss();
+
+    if ( m_popupExtraHandler )
+        ((wxComboPopupExtraEventHandler*)m_popupExtraHandler)->OnPopupDismiss();
+
+#if INSTALL_TOPLEV_HANDLER
+    // Remove top level window event handler
+    if ( m_toplevEvtHandler )
+    {
+        wxWindow* toplev = ::wxGetTopLevelParent( this );
+        if ( toplev )
+            toplev->RemoveEventHandler( m_toplevEvtHandler );
+    }
+#endif
+
+    m_timeCanAcceptClick = ::wxGetLocalTimeMillis();
+
+    if ( m_popupWinType == POPUPWIN_WXPOPUPTRANSIENTWINDOW )
+        m_timeCanAcceptClick += 150;
+
+    // If cursor not on dropdown button, then clear its state
+    // (technically not required by all ports, but do it for all just in case)
+    if ( !m_btnArea.Contains(ScreenToClient(::wxGetMousePosition())) )
+        m_btnState = 0;
+
+    // Return parent's tab traversal flag.
+    // See ShowPopup for notes.
+    if ( m_iFlags & wxCC_IFLAG_PARENT_TAB_TRAVERSAL )
+    {
+        wxWindow* parent = GetParent();
+        parent->SetWindowStyle( parent->GetWindowStyle() | wxTAB_TRAVERSAL );
+        m_iFlags &= ~(wxCC_IFLAG_PARENT_TAB_TRAVERSAL);
+    }
+
+    // refresh control (necessary even if m_text)
+    Refresh();
+
+    SetFocus();
+}
+
+void wxComboCtrlBase::HidePopup()
+{
+    // Should be able to call this without popup interface
+    if ( IsPopupWindowState(Hidden) )
+        return;
+
+    // transfer value and show it in textctrl, if any
+    if ( !IsPopupWindowState(Animating) )
+        SetValue( m_popupInterface->GetStringValue() );
+
+    m_winPopup->Hide();
+
+    OnPopupDismiss();
+}
+
+// ----------------------------------------------------------------------------
+// customization methods
+// ----------------------------------------------------------------------------
+
+void wxComboCtrlBase::SetButtonPosition( int width, int height,
+                                         int side, int spacingX )
+{
+    m_btnWid = width;
+    m_btnHei = height;
+    m_btnSide = side;
+    m_btnSpacingX = spacingX;
+
+    if ( width > 0 || height > 0 || spacingX )
+        m_iFlags |= wxCC_IFLAG_HAS_NONSTANDARD_BUTTON;
+
+    RecalcAndRefresh();
+}
+
+wxSize wxComboCtrlBase::GetButtonSize()
+{
+    if ( m_btnSize.x > 0 )
+        return m_btnSize;
+
+    wxSize retSize(m_btnWid,m_btnHei);
+
+    // Need to call CalculateAreas now if button size is
+    // is not explicitly specified.
+    if ( retSize.x <= 0 || retSize.y <= 0)
+    {
+        OnResize();
+
+        retSize = m_btnSize;
+    }
+
+    return retSize;
+}
+
+void wxComboCtrlBase::SetButtonBitmaps( const wxBitmap& bmpNormal,
+                                           bool blankButtonBg,
+                                           const wxBitmap& bmpPressed,
+                                           const wxBitmap& bmpHover,
+                                           const wxBitmap& bmpDisabled )
+{
+    m_bmpNormal = bmpNormal;
+    m_blankButtonBg = blankButtonBg;
+
+    if ( bmpPressed.Ok() )
+        m_bmpPressed = bmpPressed;
+    else
+        m_bmpPressed = bmpNormal;
+
+    if ( bmpHover.Ok() )
+        m_bmpHover = bmpHover;
+    else
+        m_bmpHover = bmpNormal;
+
+    if ( bmpDisabled.Ok() )
+        m_bmpDisabled = bmpDisabled;
+    else
+        m_bmpDisabled = bmpNormal;
+
+    RecalcAndRefresh();
+}
+
+void wxComboCtrlBase::SetCustomPaintWidth( int width )
+{
+    if ( m_text )
+    {
+        // move textctrl accordingly
+        wxRect r = m_text->GetRect();
+        int inc = width - m_widthCustomPaint;
+        r.x += inc;
+        r.width -= inc;
+        m_text->SetSize( r );
+    }
+
+    m_widthCustomPaint = width;
+
+    RecalcAndRefresh();
+}
+
+void wxComboCtrlBase::SetTextIndent( int indent )
+{
+    if ( indent < 0 )
+    {
+        m_absIndent = GetNativeTextIndent();
+        m_iFlags &= ~(wxCC_IFLAG_INDENT_SET);
+    }
+    else
+    {
+        m_absIndent = indent;
+        m_iFlags |= wxCC_IFLAG_INDENT_SET;
+    }
+
+    RecalcAndRefresh();
+}
+
+wxCoord wxComboCtrlBase::GetNativeTextIndent() const
+{
+    return DEFAULT_TEXT_INDENT;
+}
+
+// ----------------------------------------------------------------------------
+// methods forwarded to wxTextCtrl
+// ----------------------------------------------------------------------------
+
+wxString wxComboCtrlBase::GetValue() const
+{
+    if ( m_text )
+        return m_text->GetValue();
+    return m_valueString;
+}
+
+void wxComboCtrlBase::SetValueWithEvent(const wxString& value, bool withEvent)
+{
+    if ( m_text )
+    {
+        if ( !withEvent )
+            m_ignoreEvtText++;
+
+        m_text->SetValue(value);
+        if ( !(m_iFlags & wxCC_NO_TEXT_AUTO_SELECT) )
+            m_text->SelectAll();
+    }
+
+    // Since wxComboPopup may want to paint the combo as well, we need
+    // to set the string value here (as well as sometimes in ShowPopup).
+    if ( m_valueString != value )
+    {
+        m_valueString = value;
+
+        EnsurePopupControl();
+
+        if (m_popupInterface)
+            m_popupInterface->SetStringValue(value);
+    }
+
+    Refresh();
+}
+
+void wxComboCtrlBase::SetValue(const wxString& value)
+{
+    SetValueWithEvent(value, false);
+}
+
+// In this SetValue variant wxComboPopup::SetStringValue is not called
+void wxComboCtrlBase::SetText(const wxString& value)
+{
+    // Unlike in SetValue(), this must be called here or
+    // the behaviour will no be consistent in readonlys.
+    EnsurePopupControl();
+
+    m_valueString = value;
+
+    if ( m_text )
+    {
+        m_ignoreEvtText++;
+        m_text->SetValue( value );
+    }
+
+    Refresh();
+}
+
+void wxComboCtrlBase::Copy()
+{
+    if ( m_text )
+        m_text->Copy();
+}
+
+void wxComboCtrlBase::Cut()
+{
+    if ( m_text )
+        m_text->Cut();
+}
+
+void wxComboCtrlBase::Paste()
+{
+    if ( m_text )
+        m_text->Paste();
+}
+
+void wxComboCtrlBase::SetInsertionPoint(long pos)
+{
+    if ( m_text )
+        m_text->SetInsertionPoint(pos);
+}
+
+void wxComboCtrlBase::SetInsertionPointEnd()
+{
+    if ( m_text )
+        m_text->SetInsertionPointEnd();
+}
+
+long wxComboCtrlBase::GetInsertionPoint() const
+{
+    if ( m_text )
+        return m_text->GetInsertionPoint();
+
+    return 0;
+}
+
+long wxComboCtrlBase::GetLastPosition() const
+{
+    if ( m_text )
+        return m_text->GetLastPosition();
+
+    return 0;
+}
+
+void wxComboCtrlBase::Replace(long from, long to, const wxString& value)
+{
+    if ( m_text )
+        m_text->Replace(from, to, value);
+}
+
+void wxComboCtrlBase::Remove(long from, long to)
+{
+    if ( m_text )
+        m_text->Remove(from, to);
+}
+
+void wxComboCtrlBase::SetSelection(long from, long to)
+{
+    if ( m_text )
+        m_text->SetSelection(from, to);
+}
+
+void wxComboCtrlBase::Undo()
+{
+    if ( m_text )
+        m_text->Undo();
+}
+
+#endif // wxUSE_COMBOCTRL
diff --git a/Source/3rd Party/wx/src/common/config.cpp b/Source/3rd Party/wx/src/common/config.cpp
index 8a3513d2b..ce169563f 100644
--- a/Source/3rd Party/wx/src/common/config.cpp	
+++ b/Source/3rd Party/wx/src/common/config.cpp	
@@ -1,548 +1,490 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/config.cpp
-// Purpose:     implementation of wxConfigBase class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     07.04.98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1997 Karsten Ballueder  Ballueder@usa.net
-//                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#ifndef wxUSE_CONFIG_NATIVE
-    #define wxUSE_CONFIG_NATIVE 1
-#endif
-
-#include "wx/config.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/app.h"
-    #include "wx/utils.h"
-    #include "wx/arrstr.h"
-    #include "wx/math.h"
-#endif //WX_PRECOMP
-
-#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
-
-#include "wx/apptrait.h"
-#include "wx/file.h"
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <limits.h>     // for INT_MAX
-#include <float.h>      // for FLT_MAX
-
-// ----------------------------------------------------------------------------
-// global and class static variables
-// ----------------------------------------------------------------------------
-
-wxConfigBase *wxConfigBase::ms_pConfig     = NULL;
-bool          wxConfigBase::ms_bAutoCreate = true;
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxAppTraitsBase
-// ----------------------------------------------------------------------------
-
-wxConfigBase *wxAppTraitsBase::CreateConfig()
-{
-    return new
-    #if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE
-        wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
-    #else // either we're under Unix or wish to use files even under Windows
-        wxFileConfig(wxTheApp->GetAppName());
-    #endif
-}
-
-// ----------------------------------------------------------------------------
-// wxConfigBase
-// ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxConfigBase, wxObject)
-
-// Not all args will always be used by derived classes, but including them all
-// in each class ensures compatibility.
-wxConfigBase::wxConfigBase(const wxString& appName,
-                           const wxString& vendorName,
-                           const wxString& WXUNUSED(localFilename),
-                           const wxString& WXUNUSED(globalFilename),
-                           long style)
-            : m_appName(appName), m_vendorName(vendorName), m_style(style)
-{
-    m_bExpandEnvVars = true;
-    m_bRecordDefaults = false;
-}
-
-wxConfigBase::~wxConfigBase()
-{
-    // required here for Darwin
-}
-
-wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
-{
-  wxConfigBase *pOld = ms_pConfig;
-  ms_pConfig = pConfig;
-  return pOld;
-}
-
-wxConfigBase *wxConfigBase::Create()
-{
-  if ( ms_bAutoCreate && ms_pConfig == NULL ) {
-    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    wxCHECK_MSG( traits, NULL, wxT("create wxApp before calling this") );
-
-    ms_pConfig = traits->CreateConfig();
-  }
-
-  return ms_pConfig;
-}
-
-// ----------------------------------------------------------------------------
-// wxConfigBase reading entries
-// ----------------------------------------------------------------------------
-
-// implement both Read() overloads for the given type in terms of DoRead()
-#define IMPLEMENT_READ_FOR_TYPE(name, type, deftype, extra)                 \
-    bool wxConfigBase::Read(const wxString& key, type *val) const           \
-    {                                                                       \
-        wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") );  \
-                                                                            \
-        if ( !DoRead##name(key, val) )                                      \
-            return false;                                                   \
-                                                                            \
-        *val = extra(*val);                                                 \
-                                                                            \
-        return true;                                                        \
-    }                                                                       \
-                                                                            \
-    bool wxConfigBase::Read(const wxString& key,                            \
-                            type *val,                                      \
-                            deftype defVal) const                           \
-    {                                                                       \
-        wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") );  \
-                                                                            \
-        bool read = DoRead##name(key, val);                                 \
-        if ( !read )                                                        \
-        {                                                                   \
-            if ( IsRecordingDefaults() )                                    \
-            {                                                               \
-                ((wxConfigBase *)this)->DoWrite##name(key, defVal);         \
-            }                                                               \
-                                                                            \
-            *val = defVal;                                                  \
-        }                                                                   \
-                                                                            \
-        *val = extra(*val);                                                 \
-                                                                            \
-        return read;                                                        \
-    }
-
-
-IMPLEMENT_READ_FOR_TYPE(String, wxString, const wxString&, ExpandEnvVars)
-IMPLEMENT_READ_FOR_TYPE(Long, long, long, long)
-IMPLEMENT_READ_FOR_TYPE(Double, double, double, double)
-IMPLEMENT_READ_FOR_TYPE(Bool, bool, bool, bool)
-
-#undef IMPLEMENT_READ_FOR_TYPE
-
-// int is stored as long
-bool wxConfigBase::Read(const wxString& key, int *pi) const
-{
-    long l = *pi;
-    bool r = Read(key, &l);
-    wxASSERT_MSG( l < INT_MAX, wxT("int overflow in wxConfig::Read") );
-    *pi = (int)l;
-    return r;
-}
-
-bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
-{
-    long l = *pi;
-    bool r = Read(key, &l, defVal);
-    wxASSERT_MSG( l < INT_MAX, wxT("int overflow in wxConfig::Read") );
-    *pi = (int)l;
-    return r;
-}
-
-// Read floats as doubles then just type cast it down.
-bool wxConfigBase::Read(const wxString& key, float* val) const
-{
-    wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") );
-
-    double temp;
-    if ( !Read(key, &temp) )
-        return false;
-
-    wxCHECK_MSG( fabs(temp) <= FLT_MAX, false,
-                     wxT("float overflow in wxConfig::Read") );
-    wxCHECK_MSG( (temp == 0.0) || (fabs(temp) >= FLT_MIN), false,
-                     wxT("float underflow in wxConfig::Read") );
-
-    *val = static_cast<float>(temp);
-
-    return true;
-}
-
-bool wxConfigBase::Read(const wxString& key, float* val, float defVal) const
-{
-    wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") );
-
-    if ( Read(key, val) )
-        return true;
-
-    *val = defVal;
-    return false;
-}
-
-// the DoReadXXX() for the other types have implementation in the base class
-// but can be overridden in the derived ones
-bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const
-{
-    wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") );
-
-    long l;
-    if ( !DoReadLong(key, &l) )
-        return false;
-
-    if ( l != 0 && l != 1 )
-    {
-        // Don't assert here as this could happen in the result of user editing
-        // the file directly and this not indicate a bug in the program but
-        // still complain that something is wrong.
-        wxLogWarning(_("Invalid value %ld for a boolean key \"%s\" in "
-                       "config file."),
-                     l, key);
-    }
-
-    *val = l != 0;
-
-    return true;
-}
-
-bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const
-{
-    wxString str;
-    if ( Read(key, &str) )
-    {
-        if ( str.ToCDouble(val) )
-            return true;
-
-        // Previous versions of wxFileConfig wrote the numbers out using the
-        // current locale and not the C one as now, so attempt to parse the
-        // string as a number in the current locale too, for compatibility.
-        if ( str.ToDouble(val) )
-            return true;
-    }
-
-    return false;
-}
-
-// string reading helper
-wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
-{
-    wxString tmp; // Required for BC++
-    if (IsExpandingEnvVars())
-        tmp = wxExpandEnvVars(str);
-    else
-        tmp = str;
-    return tmp;
-}
-
-// ----------------------------------------------------------------------------
-// wxConfigBase writing
-// ----------------------------------------------------------------------------
-
-bool wxConfigBase::DoWriteDouble(const wxString& key, double val)
-{
-    // Notice that we always write out the numbers in C locale and not the
-    // current one. This makes the config files portable between machines using
-    // different locales.
-    return DoWriteString(key, wxString::FromCDouble(val));
-}
-
-bool wxConfigBase::DoWriteBool(const wxString& key, bool value)
-{
-    return DoWriteLong(key, value ? 1l : 0l);
-}
-
-// ----------------------------------------------------------------------------
-// wxConfigPathChanger
-// ----------------------------------------------------------------------------
-
-wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
-                                         const wxString& strEntry)
-{
-  m_bChanged = false;
-  m_pContainer = const_cast<wxConfigBase *>(pContainer);
-
-  // the path is everything which precedes the last slash and the name is
-  // everything after it -- and this works correctly if there is no slash too
-  wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR, &m_strName);
-
-  // except in the special case of "/keyname" when there is nothing before "/"
-  if ( strPath.empty() &&
-       ((!strEntry.empty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )
-  {
-    strPath = wxCONFIG_PATH_SEPARATOR;
-  }
-
-  if ( !strPath.empty() )
-  {
-    if ( m_pContainer->GetPath() != strPath )
-    {
-        // we do change the path so restore it later
-        m_bChanged = true;
-
-        /* JACS: work around a memory bug that causes an assert
-           when using wxRegConfig, related to reference-counting.
-           Can be reproduced by removing .wc_str() below and
-           adding the following code to the config sample OnInit under
-           Windows:
-
-           pConfig->SetPath(wxT("MySettings"));
-           pConfig->SetPath(wxT(".."));
-           int value;
-           pConfig->Read(wxT("MainWindowX"), & value);
-        */
-        m_strOldPath = m_pContainer->GetPath().wc_str();
-        if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR )
-          m_strOldPath += wxCONFIG_PATH_SEPARATOR;
-        m_pContainer->SetPath(strPath);
-    }
-  }
-}
-
-void wxConfigPathChanger::UpdateIfDeleted()
-{
-    // we don't have to do anything at all if we didn't change the path
-    if ( !m_bChanged )
-        return;
-
-    // find the deepest still existing parent path of the original path
-    while ( !m_pContainer->HasGroup(m_strOldPath) )
-    {
-        m_strOldPath = m_strOldPath.BeforeLast(wxCONFIG_PATH_SEPARATOR);
-        if ( m_strOldPath.empty() )
-            m_strOldPath = wxCONFIG_PATH_SEPARATOR;
-    }
-}
-
-wxConfigPathChanger::~wxConfigPathChanger()
-{
-  // only restore path if it was changed
-  if ( m_bChanged ) {
-    m_pContainer->SetPath(m_strOldPath);
-  }
-}
-
-// this is a wxConfig method but it's mainly used with wxConfigPathChanger
-/* static */
-wxString wxConfigBase::RemoveTrailingSeparator(const wxString& key)
-{
-    wxString path(key);
-
-    // don't remove the only separator from a root group path!
-    while ( path.length() > 1 )
-    {
-        if ( *path.rbegin() != wxCONFIG_PATH_SEPARATOR )
-            break;
-
-        path.erase(path.end() - 1);
-    }
-
-    return path;
-}
-
-#endif // wxUSE_CONFIG
-
-// ----------------------------------------------------------------------------
-// static & global functions
-// ----------------------------------------------------------------------------
-
-// understands both Unix and Windows (but only under Windows) environment
-// variables expansion: i.e. $var, $(var) and ${var} are always understood
-// and in addition under Windows %var% is also.
-
-// don't change the values the enum elements: they must be equal
-// to the matching [closing] delimiter.
-enum Bracket
-{
-  Bracket_None,
-  Bracket_Normal  = ')',
-  Bracket_Curly   = '}',
-#ifdef  __WINDOWS__
-  Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
-#endif
-  Bracket_Max
-};
-
-wxString wxExpandEnvVars(const wxString& str)
-{
-  wxString strResult;
-  strResult.Alloc(str.length());
-
-  size_t m;
-  for ( size_t n = 0; n < str.length(); n++ ) {
-    switch ( str[n].GetValue() ) {
-#ifdef __WINDOWS__
-      case wxT('%'):
-#endif // __WINDOWS__
-      case wxT('$'):
-        {
-          Bracket bracket;
-          #ifdef __WINDOWS__
-            if ( str[n] == wxT('%') )
-              bracket = Bracket_Windows;
-            else
-          #endif // __WINDOWS__
-          if ( n == str.length() - 1 ) {
-            bracket = Bracket_None;
-          }
-          else {
-            switch ( str[n + 1].GetValue() ) {
-              case wxT('('):
-                bracket = Bracket_Normal;
-                n++;                   // skip the bracket
-                break;
-
-              case wxT('{'):
-                bracket = Bracket_Curly;
-                n++;                   // skip the bracket
-                break;
-
-              default:
-                bracket = Bracket_None;
-            }
-          }
-
-          m = n + 1;
-
-          while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
-            m++;
-
-          wxString strVarName(str.c_str() + n + 1, m - n - 1);
-
-#ifdef __WXWINCE__
-          const bool expanded = false;
-#else
-          // NB: use wxGetEnv instead of wxGetenv as otherwise variables
-          //     set through wxSetEnv may not be read correctly!
-          bool expanded = false;
-          wxString tmp;
-          if (wxGetEnv(strVarName, &tmp))
-          {
-              strResult += tmp;
-              expanded = true;
-          }
-          else
-#endif
-          {
-            // variable doesn't exist => don't change anything
-            #ifdef  __WINDOWS__
-              if ( bracket != Bracket_Windows )
-            #endif
-                if ( bracket != Bracket_None )
-                  strResult << str[n - 1];
-            strResult << str[n] << strVarName;
-          }
-
-          // check the closing bracket
-          if ( bracket != Bracket_None ) {
-            if ( m == str.length() || str[m] != (wxChar)bracket ) {
-              // under MSW it's common to have '%' characters in the registry
-              // and it's annoying to have warnings about them each time, so
-              // ignroe them silently if they are not used for env vars
-              //
-              // under Unix, OTOH, this warning could be useful for the user to
-              // understand why isn't the variable expanded as intended
-              #ifndef __WINDOWS__
-                wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."),
-                             (char)bracket, (unsigned int) (m + 1), str.c_str());
-              #endif // __WINDOWS__
-            }
-            else {
-              // skip closing bracket unless the variables wasn't expanded
-              if ( !expanded )
-                strResult << (wxChar)bracket;
-              m++;
-            }
-          }
-
-          n = m - 1;  // skip variable name
-        }
-        break;
-
-      case wxT('\\'):
-        // backslash can be used to suppress special meaning of % and $
-        if ( n != str.length() - 1 &&
-                (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
-          strResult += str[++n];
-
-          break;
-        }
-        //else: fall through
-
-      default:
-        strResult += str[n];
-    }
-  }
-
-  return strResult;
-}
-
-// this function is used to properly interpret '..' in path
-void wxSplitPath(wxArrayString& aParts, const wxString& path)
-{
-  aParts.clear();
-
-  wxString strCurrent;
-  wxString::const_iterator pc = path.begin();
-  for ( ;; ) {
-    if ( pc == path.end() || *pc == wxCONFIG_PATH_SEPARATOR ) {
-      if ( strCurrent == wxT(".") ) {
-        // ignore
-      }
-      else if ( strCurrent == wxT("..") ) {
-        // go up one level
-        if ( aParts.size() == 0 )
-        {
-          wxLogWarning(_("'%s' has extra '..', ignored."), path);
-        }
-        else
-        {
-          aParts.erase(aParts.end() - 1);
-        }
-
-        strCurrent.Empty();
-      }
-      else if ( !strCurrent.empty() ) {
-        aParts.push_back(strCurrent);
-        strCurrent.Empty();
-      }
-      //else:
-        // could log an error here, but we prefer to ignore extra '/'
-
-      if ( pc == path.end() )
-        break;
-    }
-    else
-      strCurrent += *pc;
-
-    ++pc;
-  }
-}
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/config.cpp
+// Purpose:     implementation of wxConfigBase class
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     07.04.98
+// RCS-ID:      $Id: config.cpp 50711 2007-12-15 02:57:58Z VZ $
+// Copyright:   (c) 1997 Karsten Ballueder   Ballueder@usa.net
+//                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif  //__BORLANDC__
+
+#ifndef wxUSE_CONFIG_NATIVE
+    #define wxUSE_CONFIG_NATIVE 1
+#endif
+
+#include "wx/config.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/arrstr.h"
+    #include "wx/math.h"
+#endif //WX_PRECOMP
+
+#if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE)
+
+#include "wx/file.h"
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <limits.h>     // for INT_MAX
+
+// ----------------------------------------------------------------------------
+// global and class static variables
+// ----------------------------------------------------------------------------
+
+wxConfigBase *wxConfigBase::ms_pConfig     = NULL;
+bool          wxConfigBase::ms_bAutoCreate = true;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxConfigBase
+// ----------------------------------------------------------------------------
+
+// Not all args will always be used by derived classes, but including them all
+// in each class ensures compatibility.
+wxConfigBase::wxConfigBase(const wxString& appName,
+                           const wxString& vendorName,
+                           const wxString& WXUNUSED(localFilename),
+                           const wxString& WXUNUSED(globalFilename),
+                           long style)
+            : m_appName(appName), m_vendorName(vendorName), m_style(style)
+{
+    m_bExpandEnvVars = true;
+    m_bRecordDefaults = false;
+}
+
+wxConfigBase::~wxConfigBase()
+{
+    // required here for Darwin
+}
+
+wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig)
+{
+  wxConfigBase *pOld = ms_pConfig;
+  ms_pConfig = pConfig;
+  return pOld;
+}
+
+wxConfigBase *wxConfigBase::Create()
+{
+  if ( ms_bAutoCreate && ms_pConfig == NULL ) {
+    ms_pConfig =
+    #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
+        new wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName());
+    #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
+        new wxPrefConfig(wxTheApp->GetAppName());
+    #else // either we're under Unix or wish to use files even under Windows
+      new wxFileConfig(wxTheApp->GetAppName());
+    #endif
+  }
+
+  return ms_pConfig;
+}
+
+// ----------------------------------------------------------------------------
+// wxConfigBase reading entries
+// ----------------------------------------------------------------------------
+
+// implement both Read() overloads for the given type in terms of DoRead()
+#define IMPLEMENT_READ_FOR_TYPE(name, type, deftype, extra)                 \
+    bool wxConfigBase::Read(const wxString& key, type *val) const           \
+    {                                                                       \
+        wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") );  \
+                                                                            \
+        if ( !DoRead##name(key, val) )                                      \
+            return false;                                                   \
+                                                                            \
+        *val = extra(*val);                                                 \
+                                                                            \
+        return true;                                                        \
+    }                                                                       \
+                                                                            \
+    bool wxConfigBase::Read(const wxString& key,                            \
+                            type *val,                                      \
+                            deftype defVal) const                           \
+    {                                                                       \
+        wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") );  \
+                                                                            \
+        bool read = DoRead##name(key, val);                                 \
+        if ( !read )                                                        \
+        {                                                                   \
+            if ( IsRecordingDefaults() )                                    \
+            {                                                               \
+                ((wxConfigBase *)this)->DoWrite##name(key, defVal);         \
+            }                                                               \
+                                                                            \
+            *val = defVal;                                                  \
+        }                                                                   \
+                                                                            \
+        *val = extra(*val);                                                 \
+                                                                            \
+        return read;                                                        \
+    }
+
+
+IMPLEMENT_READ_FOR_TYPE(String, wxString, const wxString&, ExpandEnvVars)
+IMPLEMENT_READ_FOR_TYPE(Long, long, long, long)
+IMPLEMENT_READ_FOR_TYPE(Int, int, int, int)
+IMPLEMENT_READ_FOR_TYPE(Double, double, double, double)
+IMPLEMENT_READ_FOR_TYPE(Bool, bool, bool, bool)
+
+#undef IMPLEMENT_READ_FOR_TYPE
+
+// the DoReadXXX() for the other types have implementation in the base class
+// but can be overridden in the derived ones
+bool wxConfigBase::DoReadInt(const wxString& key, int *pi) const
+{
+    wxCHECK_MSG( pi, false, _T("wxConfig::Read(): NULL parameter") );
+
+    long l;
+    if ( !DoReadLong(key, &l) )
+        return false;
+
+    wxASSERT_MSG( l < INT_MAX, _T("overflow in wxConfig::DoReadInt") );
+
+    *pi = (int)l;
+
+    return true;
+}
+
+bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const
+{
+    wxCHECK_MSG( val, false, _T("wxConfig::Read(): NULL parameter") );
+
+    long l;
+    if ( !DoReadLong(key, &l) )
+        return false;
+
+    wxASSERT_MSG( l == 0 || l == 1, _T("bad bool value in wxConfig::DoReadInt") );
+
+    *val = l != 0;
+
+    return true;
+}
+
+bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const
+{
+    wxString str;
+    if ( Read(key, &str) )
+    {
+        return str.ToDouble(val);
+    }
+
+    return false;
+}
+
+// string reading helper
+wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
+{
+    wxString tmp; // Required for BC++
+    if (IsExpandingEnvVars())
+        tmp = wxExpandEnvVars(str);
+    else
+        tmp = str;
+    return tmp;
+}
+
+// ----------------------------------------------------------------------------
+// wxConfigBase writing
+// ----------------------------------------------------------------------------
+
+bool wxConfigBase::DoWriteDouble(const wxString& key, double val)
+{
+    return DoWriteString(key, wxString::Format(_T("%g"), val));
+}
+
+bool wxConfigBase::DoWriteInt(const wxString& key, int value)
+{
+    return DoWriteLong(key, (long)value);
+}
+
+bool wxConfigBase::DoWriteBool(const wxString& key, bool value)
+{
+    return DoWriteLong(key, value ? 1l : 0l);
+}
+
+// ----------------------------------------------------------------------------
+// wxConfigPathChanger
+// ----------------------------------------------------------------------------
+
+wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer,
+                                         const wxString& strEntry)
+{
+  m_bChanged = false;
+  m_pContainer = (wxConfigBase *)pContainer;
+
+  // the path is everything which precedes the last slash
+  wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
+
+  // except in the special case of "/keyname" when there is nothing before "/"
+  if ( strPath.empty() &&
+       ((!strEntry.empty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) )
+  {
+    strPath = wxCONFIG_PATH_SEPARATOR;
+  }
+
+  if ( !strPath.empty() )
+  {
+    if ( m_pContainer->GetPath() != strPath )
+    {
+        // we do change the path so restore it later
+        m_bChanged = true;
+
+        /* JACS: work around a memory bug that causes an assert
+           when using wxRegConfig, related to reference-counting.
+           Can be reproduced by removing (const wxChar*) below and
+           adding the following code to the config sample OnInit under
+           Windows:
+
+           pConfig->SetPath(wxT("MySettings"));
+           pConfig->SetPath(wxT(".."));
+           int value;
+           pConfig->Read(_T("MainWindowX"), & value);
+        */
+        m_strOldPath = (const wxChar*) m_pContainer->GetPath();
+        if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR )
+          m_strOldPath += wxCONFIG_PATH_SEPARATOR;
+        m_pContainer->SetPath(strPath);
+    }
+
+    // in any case, use the just the name, not full path
+    m_strName = strEntry.AfterLast(wxCONFIG_PATH_SEPARATOR);
+  }
+  else {
+    // it's a name only, without path - nothing to do
+    m_strName = strEntry;
+  }
+}
+
+void wxConfigPathChanger::UpdateIfDeleted()
+{
+    // we don't have to do anything at all if we didn't change the path
+    if ( !m_bChanged )
+        return;
+
+    // find the deepest still existing parent path of the original path
+    while ( !m_pContainer->HasGroup(m_strOldPath) )
+    {
+        m_strOldPath = m_strOldPath.BeforeLast(wxCONFIG_PATH_SEPARATOR);
+        if ( m_strOldPath.empty() )
+            m_strOldPath = wxCONFIG_PATH_SEPARATOR;
+    }
+}
+
+wxConfigPathChanger::~wxConfigPathChanger()
+{
+  // only restore path if it was changed
+  if ( m_bChanged ) {
+    m_pContainer->SetPath(m_strOldPath);
+  }
+}
+
+// this is a wxConfig method but it's mainly used with wxConfigPathChanger
+/* static */
+wxString wxConfigBase::RemoveTrailingSeparator(const wxString& key)
+{
+    wxString path(key);
+
+    // don't remove the only separator from a root group path!
+    while ( path.length() > 1 )
+    {
+        if ( *path.rbegin() != wxCONFIG_PATH_SEPARATOR )
+            break;
+
+        path.erase(path.end() - 1);
+    }
+
+    return path;
+}
+
+#endif // wxUSE_CONFIG
+
+// ----------------------------------------------------------------------------
+// static & global functions
+// ----------------------------------------------------------------------------
+
+// understands both Unix and Windows (but only under Windows) environment
+// variables expansion: i.e. $var, $(var) and ${var} are always understood
+// and in addition under Windows %var% is also.
+
+// don't change the values the enum elements: they must be equal
+// to the matching [closing] delimiter.
+enum Bracket
+{
+  Bracket_None,
+  Bracket_Normal  = ')',
+  Bracket_Curly   = '}',
+#ifdef  __WXMSW__
+  Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
+#endif
+  Bracket_Max
+};
+
+wxString wxExpandEnvVars(const wxString& str)
+{
+  wxString strResult;
+  strResult.Alloc(str.length());
+
+  size_t m;
+  for ( size_t n = 0; n < str.length(); n++ ) {
+    switch ( str[n] ) {
+#ifdef  __WXMSW__
+      case wxT('%'):
+#endif  //WINDOWS
+      case wxT('$'):
+        {
+          Bracket bracket;
+          #ifdef  __WXMSW__
+            if ( str[n] == wxT('%') )
+              bracket = Bracket_Windows;
+            else
+          #endif  //WINDOWS
+          if ( n == str.length() - 1 ) {
+            bracket = Bracket_None;
+          }
+          else {
+            switch ( str[n + 1] ) {
+              case wxT('('):
+                bracket = Bracket_Normal;
+                n++;                   // skip the bracket
+                break;
+
+              case wxT('{'):
+                bracket = Bracket_Curly;
+                n++;                   // skip the bracket
+                break;
+
+              default:
+                bracket = Bracket_None;
+            }
+          }
+
+          m = n + 1;
+
+          while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) )
+            m++;
+
+          wxString strVarName(str.c_str() + n + 1, m - n - 1);
+
+#ifdef __WXWINCE__
+          const wxChar *pszValue = NULL;
+#else
+          // NB: use wxGetEnv instead of wxGetenv as otherwise variables
+          //     set through wxSetEnv may not be read correctly!
+          const wxChar *pszValue = NULL;
+          wxString tmp;
+          if (wxGetEnv(strVarName, &tmp))
+              pszValue = tmp;
+#endif
+          if ( pszValue != NULL ) {
+            strResult += pszValue;
+          }
+          else {
+            // variable doesn't exist => don't change anything
+            #ifdef  __WXMSW__
+              if ( bracket != Bracket_Windows )
+            #endif
+                if ( bracket != Bracket_None )
+                  strResult << str[n - 1];
+            strResult << str[n] << strVarName;
+          }
+
+          // check the closing bracket
+          if ( bracket != Bracket_None ) {
+            if ( m == str.length() || str[m] != (wxChar)bracket ) {
+              // under MSW it's common to have '%' characters in the registry
+              // and it's annoying to have warnings about them each time, so
+              // ignroe them silently if they are not used for env vars
+              //
+              // under Unix, OTOH, this warning could be useful for the user to
+              // understand why isn't the variable expanded as intended
+              #ifndef __WXMSW__
+                wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."),
+                             (char)bracket, (unsigned int) (m + 1), str.c_str());
+              #endif // __WXMSW__
+            }
+            else {
+              // skip closing bracket unless the variables wasn't expanded
+              if ( pszValue == NULL )
+                strResult << (wxChar)bracket;
+              m++;
+            }
+          }
+
+          n = m - 1;  // skip variable name
+        }
+        break;
+
+      case '\\':
+        // backslash can be used to suppress special meaning of % and $
+        if ( n != str.length() - 1 &&
+                (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) {
+          strResult += str[++n];
+
+          break;
+        }
+        //else: fall through
+
+      default:
+        strResult += str[n];
+    }
+  }
+
+  return strResult;
+}
+
+// this function is used to properly interpret '..' in path
+void wxSplitPath(wxArrayString& aParts, const wxChar *sz)
+{
+  aParts.clear();
+
+  wxString strCurrent;
+  const wxChar *pc = sz;
+  for ( ;; ) {
+    if ( *pc == wxT('\0') || *pc == wxCONFIG_PATH_SEPARATOR ) {
+      if ( strCurrent == wxT(".") ) {
+        // ignore
+      }
+      else if ( strCurrent == wxT("..") ) {
+        // go up one level
+        if ( aParts.size() == 0 )
+          wxLogWarning(_("'%s' has extra '..', ignored."), sz);
+        else
+          aParts.erase(aParts.end() - 1);
+
+        strCurrent.Empty();
+      }
+      else if ( !strCurrent.empty() ) {
+        aParts.push_back(strCurrent);
+        strCurrent.Empty();
+      }
+      //else:
+        // could log an error here, but we prefer to ignore extra '/'
+
+      if ( *pc == wxT('\0') )
+        break;
+    }
+    else
+      strCurrent += *pc;
+
+    pc++;
+  }
+}
diff --git a/Source/3rd Party/wx/src/common/containr.cpp b/Source/3rd Party/wx/src/common/containr.cpp
index b80d0c7e5..ffa9ce975 100644
--- a/Source/3rd Party/wx/src/common/containr.cpp	
+++ b/Source/3rd Party/wx/src/common/containr.cpp	
@@ -1,719 +1,678 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/containr.cpp
-// Purpose:     implementation of wxControlContainer
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     06.08.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/containr.h"
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/scrolbar.h"
-    #include "wx/radiobut.h"
-#endif //WX_PRECOMP
-
-// trace mask for focus messages
-#define TRACE_FOCUS wxT("focus")
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxControlContainerBase
-// ----------------------------------------------------------------------------
-
-void wxControlContainerBase::SetCanFocus(bool acceptsFocus)
-{
-    if ( acceptsFocus == m_acceptsFocus )
-        return;
-
-    m_acceptsFocus = acceptsFocus;
-
-    m_winParent->SetCanFocus(m_acceptsFocus);
-}
-
-bool wxControlContainerBase::HasAnyFocusableChildren() const
-{
-    const wxWindowList& children = m_winParent->GetChildren();
-    for ( wxWindowList::const_iterator i = children.begin(),
-                                     end = children.end();
-          i != end;
-          ++i )
-    {
-        const wxWindow * const child = *i;
-
-        if ( !m_winParent->IsClientAreaChild(child) )
-            continue;
-
-        if ( child->CanAcceptFocus() )
-            return true;
-    }
-
-    return false;
-}
-
-bool wxControlContainerBase::DoSetFocus()
-{
-    wxLogTrace(TRACE_FOCUS, wxT("SetFocus on wxPanel 0x%p."),
-               m_winParent->GetHandle());
-
-    if (m_inSetFocus)
-        return true;
-
-    // when the panel gets the focus we move the focus to either the last
-    // window that had the focus or the first one that can get it unless the
-    // focus had been already set to some other child
-
-    wxWindow *win = wxWindow::FindFocus();
-    while ( win )
-    {
-        if ( win == m_winParent )
-        {
-            // our child already has focus, don't take it away from it
-            return true;
-        }
-
-        if ( win->IsTopLevel() )
-        {
-            // don't look beyond the first top level parent - useless and
-            // unnecessary
-            break;
-        }
-
-        win = win->GetParent();
-    }
-
-    // protect against infinite recursion:
-    m_inSetFocus = true;
-
-    bool ret = SetFocusToChild();
-
-    m_inSetFocus = false;
-
-    return ret;
-}
-
-bool wxControlContainerBase::SetFocusToChild()
-{
-    return wxSetFocusToChild(m_winParent, &m_winLastFocused);
-}
-
-#ifndef wxHAS_NATIVE_TAB_TRAVERSAL
-
-// ----------------------------------------------------------------------------
-// generic wxControlContainer
-// ----------------------------------------------------------------------------
-
-wxControlContainer::wxControlContainer()
-{
-    m_winLastFocused = NULL;
-}
-
-void wxControlContainer::SetLastFocus(wxWindow *win)
-{
-    // the panel itself should never get the focus at all but if it does happen
-    // temporarily (as it seems to do under wxGTK), at the very least don't
-    // forget our previous m_winLastFocused
-    if ( win != m_winParent )
-    {
-        // if we're setting the focus
-        if ( win )
-        {
-            // find the last _immediate_ child which got focus
-            wxWindow *winParent = win;
-            while ( winParent != m_winParent )
-            {
-                win = winParent;
-                winParent = win->GetParent();
-
-                // Yes, this can happen, though in a totally pathological case.
-                // like when detaching a menubar from a frame with a child
-                // which has pushed itself as an event handler for the menubar.
-                // (under wxGTK)
-
-                wxASSERT_MSG( winParent,
-                              wxT("Setting last focus for a window that is not our child?") );
-            }
-        }
-
-        m_winLastFocused = win;
-
-        if ( win )
-        {
-            wxLogTrace(TRACE_FOCUS, wxT("Set last focus to %s(%s)"),
-                       win->GetClassInfo()->GetClassName(),
-                       win->GetLabel().c_str());
-        }
-        else
-        {
-            wxLogTrace(TRACE_FOCUS, wxT("No more last focus"));
-        }
-    }
-}
-
-// --------------------------------------------------------------------
-// The following four functions are used to find other radio buttons
-// within the same group. Used by wxSetFocusToChild on wxMSW
-// --------------------------------------------------------------------
-
-#if defined(__WXMSW__) && wxUSE_RADIOBTN
-
-wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn)
-{
-    if ( btn->HasFlag(wxRB_GROUP) || btn->HasFlag(wxRB_SINGLE) )
-        return NULL;
-
-    const wxWindowList& siblings = btn->GetParent()->GetChildren();
-    wxWindowList::compatibility_iterator nodeThis = siblings.Find(btn);
-    wxCHECK_MSG( nodeThis, NULL, wxT("radio button not a child of its parent?") );
-
-    // Iterate over all previous siblings until we find the next radio button
-    wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious();
-    wxRadioButton *prevBtn = 0;
-    while (nodeBefore)
-    {
-        prevBtn = wxDynamicCast(nodeBefore->GetData(), wxRadioButton);
-        if (prevBtn)
-            break;
-
-        nodeBefore = nodeBefore->GetPrevious();
-    }
-
-    if (!prevBtn || prevBtn->HasFlag(wxRB_SINGLE))
-    {
-        // no more buttons in group
-        return NULL;
-    }
-
-    return prevBtn;
-}
-
-wxRadioButton* wxGetNextButtonInGroup(wxRadioButton *btn)
-{
-    if (btn->HasFlag(wxRB_SINGLE))
-        return NULL;
-
-    const wxWindowList& siblings = btn->GetParent()->GetChildren();
-    wxWindowList::compatibility_iterator nodeThis = siblings.Find(btn);
-    wxCHECK_MSG( nodeThis, NULL, wxT("radio button not a child of its parent?") );
-
-    // Iterate over all previous siblings until we find the next radio button
-    wxWindowList::compatibility_iterator nodeNext = nodeThis->GetNext();
-    wxRadioButton *nextBtn = 0;
-    while (nodeNext)
-    {
-        nextBtn = wxDynamicCast(nodeNext->GetData(), wxRadioButton);
-        if (nextBtn)
-            break;
-
-        nodeNext = nodeNext->GetNext();
-    }
-
-    if ( !nextBtn || nextBtn->HasFlag(wxRB_GROUP) || nextBtn->HasFlag(wxRB_SINGLE) )
-    {
-        // no more buttons or the first button of the next group
-        return NULL;
-    }
-
-    return nextBtn;
-}
-
-wxRadioButton* wxGetFirstButtonInGroup(wxRadioButton *btn)
-{
-    while (true)
-    {
-        wxRadioButton* prevBtn = wxGetPreviousButtonInGroup(btn);
-        if (!prevBtn)
-            return btn;
-
-        btn = prevBtn;
-    }
-}
-
-wxRadioButton* wxGetLastButtonInGroup(wxRadioButton *btn)
-{
-    while (true)
-    {
-        wxRadioButton* nextBtn = wxGetNextButtonInGroup(btn);
-        if (!nextBtn)
-            return btn;
-
-        btn = nextBtn;
-    }
-}
-
-wxRadioButton* wxGetSelectedButtonInGroup(wxRadioButton *btn)
-{
-    // Find currently selected button
-    if (btn->GetValue())
-        return btn;
-
-    if (btn->HasFlag(wxRB_SINGLE))
-        return NULL;
-
-    wxRadioButton *selBtn;
-
-    // First check all previous buttons
-    for (selBtn = wxGetPreviousButtonInGroup(btn); selBtn; selBtn = wxGetPreviousButtonInGroup(selBtn))
-        if (selBtn->GetValue())
-            return selBtn;
-
-    // Now all following buttons
-    for (selBtn = wxGetNextButtonInGroup(btn); selBtn; selBtn = wxGetNextButtonInGroup(selBtn))
-        if (selBtn->GetValue())
-            return selBtn;
-
-    return NULL;
-}
-
-#endif // __WXMSW__
-
-// ----------------------------------------------------------------------------
-// Keyboard handling - this is the place where the TAB traversal logic is
-// implemented. As this code is common to all ports, this ensures consistent
-// behaviour even if we don't specify how exactly the wxNavigationKeyEvent are
-// generated and this is done in platform specific code which also ensures that
-// we can follow the given platform standards.
-// ----------------------------------------------------------------------------
-
-void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
-{
-    // for a TLW we shouldn't involve the parent window, it has nothing to do
-    // with keyboard navigation inside this TLW
-    wxWindow *parent = m_winParent->IsTopLevel() ? NULL
-                                                 : m_winParent->GetParent();
-
-    // the event is propagated downwards if the event emitter was our parent
-    bool goingDown = event.GetEventObject() == parent;
-
-    const wxWindowList& children = m_winParent->GetChildren();
-
-    // if we have exactly one notebook-like child window (actually it could be
-    // any window that returns true from its HasMultiplePages()), then
-    // [Shift-]Ctrl-Tab and Ctrl-PageUp/Down keys should iterate over its pages
-    // even if the focus is outside of the control because this is how the
-    // standard MSW properties dialogs behave and we do it under other platforms
-    // as well because it seems like a good idea -- but we can always put this
-    // block inside "#ifdef __WXMSW__" if it's not suitable there
-    if ( event.IsWindowChange() && !goingDown )
-    {
-        // check if we have a unique notebook-like child
-        wxWindow *bookctrl = NULL;
-        for ( wxWindowList::const_iterator i = children.begin(),
-                                         end = children.end();
-              i != end;
-              ++i )
-        {
-            wxWindow * const window = *i;
-            if ( window->HasMultiplePages() )
-            {
-                if ( bookctrl )
-                {
-                    // this is the second book-like control already so don't do
-                    // anything as we don't know which one should have its page
-                    // changed
-                    bookctrl = NULL;
-                    break;
-                }
-
-                bookctrl = window;
-            }
-        }
-
-        if ( bookctrl )
-        {
-            // make sure that we don't bubble up the event again from the book
-            // control resulting in infinite recursion
-            wxNavigationKeyEvent eventCopy(event);
-            eventCopy.SetEventObject(m_winParent);
-            if ( bookctrl->GetEventHandler()->ProcessEvent(eventCopy) )
-                return;
-        }
-    }
-
-    // there is not much to do if we don't have children and we're not
-    // interested in "notebook page change" events here
-    if ( !children.GetCount() || event.IsWindowChange() )
-    {
-        // let the parent process it unless it already comes from our parent
-        // of we don't have any
-        if ( goingDown ||
-             !parent || !parent->GetEventHandler()->ProcessEvent(event) )
-        {
-            event.Skip();
-        }
-
-        return;
-    }
-
-    // where are we going?
-    const bool forward = event.GetDirection();
-
-    // the node of the children list from which we should start looking for the
-    // next acceptable child
-    wxWindowList::compatibility_iterator node, start_node;
-
-    // we should start from the first/last control and not from the one which
-    // had focus the last time if we're propagating the event downwards because
-    // for our parent we look like a single control
-    if ( goingDown )
-    {
-        // just to be sure it's not used (normally this is not necessary, but
-        // doesn't hurt neither)
-        m_winLastFocused = NULL;
-
-        // start from first or last depending on where we're going
-        node = forward ? children.GetFirst() : children.GetLast();
-    }
-    else // going up
-    {
-        // try to find the child which has the focus currently
-
-        // the event emitter might have done this for us
-        wxWindow *winFocus = event.GetCurrentFocus();
-
-        // but if not, we might know where the focus was ourselves
-        if (!winFocus)
-            winFocus = m_winLastFocused;
-
-        // if still no luck, do it the hard way
-        if (!winFocus)
-            winFocus = wxWindow::FindFocus();
-
-        if ( winFocus )
-        {
-#if defined(__WXMSW__) && wxUSE_RADIOBTN
-            // If we are in a radio button group, start from the first item in the
-            // group
-            if ( event.IsFromTab() && wxIsKindOf(winFocus, wxRadioButton ) )
-                winFocus = wxGetFirstButtonInGroup((wxRadioButton*)winFocus);
-#endif // __WXMSW__
-            // ok, we found the focus - now is it our child?
-            start_node = children.Find( winFocus );
-        }
-
-        if ( !start_node && m_winLastFocused )
-        {
-            // window which has focus isn't our child, fall back to the one
-            // which had the focus the last time
-            start_node = children.Find( m_winLastFocused );
-        }
-
-        // if we still didn't find anything, we should start with the first one
-        if ( !start_node )
-        {
-            start_node = children.GetFirst();
-        }
-
-        // and the first child which we can try setting focus to is the next or
-        // the previous one
-        node = forward ? start_node->GetNext() : start_node->GetPrevious();
-    }
-
-    // we want to cycle over all elements passing by NULL
-    for ( ;; )
-    {
-        // don't go into infinite loop
-        if ( start_node && node && node == start_node )
-            break;
-
-        // Have we come to the last or first item on the panel?
-        if ( !node )
-        {
-            if ( !start_node )
-            {
-                // exit now as otherwise we'd loop forever
-                break;
-            }
-
-            if ( !goingDown )
-            {
-                // Check if our (maybe grand) parent is another panel: if this
-                // is the case, they will know what to do with this navigation
-                // key and so give them the chance to process it instead of
-                // looping inside this panel (normally, the focus will go to
-                // the next/previous item after this panel in the parent
-                // panel).
-                wxWindow *focusedParent = m_winParent;
-                while ( parent )
-                {
-                    // We don't want to tab into a different dialog or frame or
-                    // even an MDI child frame, so test for this explicitly
-                    // (and in particular don't just use IsTopLevel() which
-                    // would return false in the latter case).
-                    if ( focusedParent->IsTopNavigationDomain() )
-                        break;
-
-                    event.SetCurrentFocus( focusedParent );
-                    if ( parent->GetEventHandler()->ProcessEvent( event ) )
-                        return;
-
-                    focusedParent = parent;
-
-                    parent = parent->GetParent();
-                }
-            }
-            //else: as the focus came from our parent, we definitely don't want
-            //      to send it back to it!
-
-            // no, we are not inside another panel so process this ourself
-            node = forward ? children.GetFirst() : children.GetLast();
-
-            continue;
-        }
-
-        wxWindow *child = node->GetData();
-
-        // don't TAB to another TLW
-        if ( child->IsTopLevel() )
-        {
-            node = forward ? node->GetNext() : node->GetPrevious();
-
-            continue;
-        }
-
-#if defined(__WXMSW__) && wxUSE_RADIOBTN
-        if ( event.IsFromTab() )
-        {
-            if ( wxIsKindOf(child, wxRadioButton) )
-            {
-                // only radio buttons with either wxRB_GROUP or wxRB_SINGLE
-                // can be tabbed to
-                if ( child->HasFlag(wxRB_GROUP) )
-                {
-                    // need to tab into the active button within a group
-                    wxRadioButton *rb = wxGetSelectedButtonInGroup((wxRadioButton*)child);
-                    if ( rb )
-                        child = rb;
-                }
-                else if ( !child->HasFlag(wxRB_SINGLE) )
-                {
-                    node = forward ? node->GetNext() : node->GetPrevious();
-                    continue;
-                }
-            }
-        }
-        else if ( m_winLastFocused &&
-                  wxIsKindOf(m_winLastFocused, wxRadioButton) &&
-                  !m_winLastFocused->HasFlag(wxRB_SINGLE) )
-        {
-            wxRadioButton * const
-                lastBtn = static_cast<wxRadioButton *>(m_winLastFocused);
-
-            // cursor keys don't navigate out of a radio button group so
-            // find the correct radio button to focus
-            if ( forward )
-            {
-                child = wxGetNextButtonInGroup(lastBtn);
-                if ( !child )
-                {
-                    // no next button in group, set it to the first button
-                    child = wxGetFirstButtonInGroup(lastBtn);
-                }
-            }
-            else
-            {
-                child = wxGetPreviousButtonInGroup(lastBtn);
-                if ( !child )
-                {
-                    // no previous button in group, set it to the last button
-                    child = wxGetLastButtonInGroup(lastBtn);
-                }
-            }
-
-            if ( child == m_winLastFocused )
-            {
-                // must be a group consisting of only one button therefore
-                // no need to send a navigation event
-                event.Skip(false);
-                return;
-            }
-        }
-#endif // __WXMSW__
-
-        if ( child->CanAcceptFocusFromKeyboard() )
-        {
-            // if we're setting the focus to a child panel we should prevent it
-            // from giving it to the child which had the focus the last time
-            // and instead give it to the first/last child depending from which
-            // direction we're coming
-            event.SetEventObject(m_winParent);
-
-            // disable propagation for this call as otherwise the event might
-            // bounce back to us.
-            wxPropagationDisabler disableProp(event);
-            if ( !child->GetEventHandler()->ProcessEvent(event) )
-            {
-                // set it first in case SetFocusFromKbd() results in focus
-                // change too
-                m_winLastFocused = child;
-
-                // everything is simple: just give focus to it
-                child->SetFocusFromKbd();
-            }
-            //else: the child manages its focus itself
-
-            event.Skip( false );
-
-            return;
-        }
-
-        node = forward ? node->GetNext() : node->GetPrevious();
-    }
-
-    // we cycled through all of our children and none of them wanted to accept
-    // focus
-    event.Skip();
-}
-
-void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
-{
-    if ( child == m_winLastFocused )
-        m_winLastFocused = NULL;
-}
-
-// ----------------------------------------------------------------------------
-// focus handling
-// ----------------------------------------------------------------------------
-
-void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
-{
-    wxLogTrace(TRACE_FOCUS, wxT("OnFocus on wxPanel 0x%p, name: %s"),
-               m_winParent->GetHandle(),
-               m_winParent->GetName().c_str() );
-
-    DoSetFocus();
-
-    event.Skip();
-}
-
-
-#else
-  // wxHAS_NATIVE_TAB_TRAVERSAL
-
-bool wxControlContainer::SetFocusToChild()
-{
-    return wxSetFocusToChild(m_winParent, NULL);
-}
-
-
-#endif // !wxHAS_NATIVE_TAB_TRAVERSAL
-
-// ----------------------------------------------------------------------------
-// SetFocusToChild(): this function is used by wxPanel but also by wxFrame in
-// wxMSW, this is why it is outside of wxControlContainer class
-// ----------------------------------------------------------------------------
-
-bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
-{
-    wxCHECK_MSG( win, false, wxT("wxSetFocusToChild(): invalid window") );
-    //    wxCHECK_MSG( childLastFocused, false,
-    //             wxT("wxSetFocusToChild(): NULL child poonter") );
-
-    if ( childLastFocused && *childLastFocused )
-    {
-        // It might happen that the window got reparented
-        if ( (*childLastFocused)->GetParent() == win )
-        {
-            // And it also could have become hidden in the meanwhile
-            // We want to focus on the deepest widget visible
-            wxWindow *deepestVisibleWindow = NULL;
-
-            while ( *childLastFocused )
-            {
-                if ( (*childLastFocused)->IsShown() )
-                {
-                    if ( !deepestVisibleWindow )
-                        deepestVisibleWindow = *childLastFocused;
-                }
-                else
-                    deepestVisibleWindow = NULL;
-
-                *childLastFocused = (*childLastFocused)->GetParent();
-            }
-
-            if ( deepestVisibleWindow )
-            {
-                *childLastFocused = deepestVisibleWindow;
-
-                wxLogTrace(TRACE_FOCUS,
-                           wxT("SetFocusToChild() => last child (0x%p)."),
-                           (*childLastFocused)->GetHandle());
-
-                // not SetFocusFromKbd(): we're restoring focus back to the old
-                // window and not setting it as the result of a kbd action
-                (*childLastFocused)->SetFocus();
-                return true;
-            }
-        }
-        else
-        {
-            // it doesn't count as such any more
-            *childLastFocused = NULL;
-        }
-    }
-
-    // set the focus to the first child who wants it
-    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
-    while ( node )
-    {
-        wxWindow *child = node->GetData();
-        node = node->GetNext();
-
-        // skip special windows:
-        if ( !win->IsClientAreaChild(child) )
-            continue;
-
-        if ( child->CanAcceptFocusFromKeyboard() && !child->IsTopLevel() )
-        {
-#if defined(__WXMSW__) && wxUSE_RADIOBTN
-            // If a radiobutton is the first focusable child, search for the
-            // selected radiobutton in the same group
-            wxRadioButton* btn = wxDynamicCast(child, wxRadioButton);
-            if (btn)
-            {
-                wxRadioButton* selected = wxGetSelectedButtonInGroup(btn);
-                if (selected)
-                    child = selected;
-            }
-#endif // __WXMSW__
-
-            wxLogTrace(TRACE_FOCUS,
-                       wxT("SetFocusToChild() => first child (0x%p)."),
-                       child->GetHandle());
-
-            if (childLastFocused)
-                *childLastFocused = child;
-            child->SetFocusFromKbd();
-            return true;
-        }
-    }
-
-    return false;
-}
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/containr.cpp
+// Purpose:     implementation of wxControlContainer
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     06.08.01
+// RCS-ID:      $Id: containr.cpp 44273 2007-01-21 01:21:45Z VZ $
+// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/window.h"
+    #include "wx/scrolbar.h"
+    #include "wx/radiobut.h"
+    #include "wx/containr.h"
+#endif //WX_PRECOMP
+
+// trace mask for focus messages
+#define TRACE_FOCUS _T("focus")
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+wxControlContainer::wxControlContainer(wxWindow *winParent)
+{
+    m_winParent = winParent;
+    m_winLastFocused = NULL;
+    m_inSetFocus = false;
+}
+
+bool wxControlContainer::AcceptsFocus() const
+{
+    // if we're not shown or disabled, we can't accept focus
+    if ( m_winParent->IsShown() && m_winParent->IsEnabled() )
+    {
+        // otherwise we can accept focus either if we have no children at all
+        // (in this case we're probably not used as a container) or only when
+        // at least one child will accept focus
+        wxWindowList::compatibility_iterator node = m_winParent->GetChildren().GetFirst();
+        if ( !node )
+            return true;
+
+#ifdef __WXMAC__
+        // wxMac has eventually the two scrollbars as children, they don't count
+        // as real children in the algorithm mentioned above
+        bool hasRealChildren = false ;
+#endif
+
+        while ( node )
+        {
+            wxWindow *child = node->GetData();
+            node = node->GetNext();
+
+#ifdef __WXMAC__
+            if ( m_winParent->MacIsWindowScrollbar( child ) )
+                continue;
+            hasRealChildren = true ;
+#endif
+            if ( child->AcceptsFocus() )
+            {
+                return true;
+            }
+        }
+
+#ifdef __WXMAC__
+        if ( !hasRealChildren )
+            return true ;
+#endif
+    }
+
+    return false;
+}
+
+void wxControlContainer::SetLastFocus(wxWindow *win)
+{
+    // the panel itself should never get the focus at all but if it does happen
+    // temporarily (as it seems to do under wxGTK), at the very least don't
+    // forget our previous m_winLastFocused
+    if ( win != m_winParent )
+    {
+        // if we're setting the focus
+        if ( win )
+        {
+            // find the last _immediate_ child which got focus
+            wxWindow *winParent = win;
+            while ( winParent != m_winParent )
+            {
+                win = winParent;
+                winParent = win->GetParent();
+
+                // Yes, this can happen, though in a totally pathological case.
+                // like when detaching a menubar from a frame with a child
+                // which has pushed itself as an event handler for the menubar.
+                // (under wxGTK)
+
+                wxASSERT_MSG( winParent,
+                              _T("Setting last focus for a window that is not our child?") );
+            }
+        }
+
+        m_winLastFocused = win;
+
+        if ( win )
+        {
+            wxLogTrace(TRACE_FOCUS, _T("Set last focus to %s(%s)"),
+                       win->GetClassInfo()->GetClassName(),
+                       win->GetLabel().c_str());
+        }
+        else
+        {
+            wxLogTrace(TRACE_FOCUS, _T("No more last focus"));
+        }
+    }
+
+    // propagate the last focus upwards so that our parent can set focus back
+    // to us if it loses it now and regains later
+    wxWindow *parent = m_winParent->GetParent();
+    if ( parent )
+    {
+        wxChildFocusEvent eventFocus(m_winParent);
+        parent->GetEventHandler()->ProcessEvent(eventFocus);
+    }
+}
+
+// --------------------------------------------------------------------
+// The following four functions are used to find other radio buttons
+// within the same group. Used by wxSetFocusToChild on wxMSW
+// --------------------------------------------------------------------
+
+#ifdef __WXMSW__
+
+wxRadioButton* wxGetPreviousButtonInGroup(wxRadioButton *btn)
+{
+    if ( btn->HasFlag(wxRB_GROUP) || btn->HasFlag(wxRB_SINGLE) )
+        return NULL;
+
+    const wxWindowList& siblings = btn->GetParent()->GetChildren();
+    wxWindowList::compatibility_iterator nodeThis = siblings.Find(btn);
+    wxCHECK_MSG( nodeThis, NULL, _T("radio button not a child of its parent?") );
+
+    // Iterate over all previous siblings until we find the next radio button
+    wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious();
+    wxRadioButton *prevBtn = 0;
+    while (nodeBefore)
+    {
+        prevBtn = wxDynamicCast(nodeBefore->GetData(), wxRadioButton);
+        if (prevBtn)
+            break;
+
+        nodeBefore = nodeBefore->GetPrevious();
+    }
+
+    if (!prevBtn || prevBtn->HasFlag(wxRB_SINGLE))
+    {
+        // no more buttons in group
+        return NULL;
+    }
+
+    return prevBtn;
+}
+
+wxRadioButton* wxGetNextButtonInGroup(wxRadioButton *btn)
+{
+    if (btn->HasFlag(wxRB_SINGLE))
+        return NULL;
+
+    const wxWindowList& siblings = btn->GetParent()->GetChildren();
+    wxWindowList::compatibility_iterator nodeThis = siblings.Find(btn);
+    wxCHECK_MSG( nodeThis, NULL, _T("radio button not a child of its parent?") );
+
+    // Iterate over all previous siblings until we find the next radio button
+    wxWindowList::compatibility_iterator nodeNext = nodeThis->GetNext();
+    wxRadioButton *nextBtn = 0;
+    while (nodeNext)
+    {
+        nextBtn = wxDynamicCast(nodeNext->GetData(), wxRadioButton);
+        if (nextBtn)
+            break;
+
+        nodeNext = nodeNext->GetNext();
+    }
+
+    if ( !nextBtn || nextBtn->HasFlag(wxRB_GROUP) || nextBtn->HasFlag(wxRB_SINGLE) )
+    {
+        // no more buttons or the first button of the next group
+        return NULL;
+    }
+
+    return nextBtn;
+}
+
+wxRadioButton* wxGetFirstButtonInGroup(wxRadioButton *btn)
+{
+    while (true)
+    {
+        wxRadioButton* prevBtn = wxGetPreviousButtonInGroup(btn);
+        if (!prevBtn)
+            return btn;
+
+        btn = prevBtn;
+    }
+}
+
+wxRadioButton* wxGetLastButtonInGroup(wxRadioButton *btn)
+{
+    while (true)
+    {
+        wxRadioButton* nextBtn = wxGetNextButtonInGroup(btn);
+        if (!nextBtn)
+            return btn;
+
+        btn = nextBtn;
+    }
+}
+
+wxRadioButton* wxGetSelectedButtonInGroup(wxRadioButton *btn)
+{
+    // Find currently selected button
+    if (btn->GetValue())
+        return btn;
+
+    if (btn->HasFlag(wxRB_SINGLE))
+        return NULL;
+
+    wxRadioButton *selBtn;
+
+    // First check all previous buttons
+    for (selBtn = wxGetPreviousButtonInGroup(btn); selBtn; selBtn = wxGetPreviousButtonInGroup(selBtn))
+        if (selBtn->GetValue())
+            return selBtn;
+
+    // Now all following buttons
+    for (selBtn = wxGetNextButtonInGroup(btn); selBtn; selBtn = wxGetNextButtonInGroup(selBtn))
+        if (selBtn->GetValue())
+            return selBtn;
+
+    return NULL;
+}
+
+#endif // __WXMSW__
+
+// ----------------------------------------------------------------------------
+// Keyboard handling - this is the place where the TAB traversal logic is
+// implemented. As this code is common to all ports, this ensures consistent
+// behaviour even if we don't specify how exactly the wxNavigationKeyEvent are
+// generated and this is done in platform specific code which also ensures that
+// we can follow the given platform standards.
+// ----------------------------------------------------------------------------
+
+void wxControlContainer::HandleOnNavigationKey( wxNavigationKeyEvent& event )
+{
+    wxWindow *parent = m_winParent->GetParent();
+
+    // the event is propagated downwards if the event emitter was our parent
+    bool goingDown = event.GetEventObject() == parent;
+
+    const wxWindowList& children = m_winParent->GetChildren();
+
+    // if we have exactly one notebook-like child window (actually it could be
+    // any window that returns true from its HasMultiplePages()), then
+    // [Shift-]Ctrl-Tab and Ctrl-PageUp/Down keys should iterate over its pages
+    // even if the focus is outside of the control because this is how the
+    // standard MSW properties dialogs behave and we do it under other platforms
+    // as well because it seems like a good idea -- but we can always put this
+    // block inside "#ifdef __WXMSW__" if it's not suitable there
+    if ( event.IsWindowChange() && !goingDown )
+    {
+        // check if we have a unique notebook-like child
+        wxWindow *bookctrl = NULL;
+        for ( wxWindowList::const_iterator i = children.begin(),
+                                         end = children.end();
+              i != end;
+              ++i )
+        {
+            wxWindow * const window = *i;
+            if ( window->HasMultiplePages() )
+            {
+                if ( bookctrl )
+                {
+                    // this is the second book-like control already so don't do
+                    // anything as we don't know which one should have its page
+                    // changed
+                    bookctrl = NULL;
+                    break;
+                }
+
+                bookctrl = window;
+            }
+        }
+
+        if ( bookctrl )
+        {
+            // make sure that we don't bubble up the event again from the book
+            // control resulting in infinite recursion
+            wxNavigationKeyEvent eventCopy(event);
+            eventCopy.SetEventObject(m_winParent);
+            if ( bookctrl->GetEventHandler()->ProcessEvent(eventCopy) )
+                return;
+        }
+    }
+
+    // there is not much to do if we don't have children and we're not
+    // interested in "notebook page change" events here
+    if ( !children.GetCount() || event.IsWindowChange() )
+    {
+        // let the parent process it unless it already comes from our parent
+        // of we don't have any
+        if ( goingDown ||
+             !parent || !parent->GetEventHandler()->ProcessEvent(event) )
+        {
+            event.Skip();
+        }
+
+        return;
+    }
+
+    // where are we going?
+    const bool forward = event.GetDirection();
+
+    // the node of the children list from which we should start looking for the
+    // next acceptable child
+    wxWindowList::compatibility_iterator node, start_node;
+
+    // we should start from the first/last control and not from the one which
+    // had focus the last time if we're propagating the event downwards because
+    // for our parent we look like a single control
+    if ( goingDown )
+    {
+        // just to be sure it's not used (normally this is not necessary, but
+        // doesn't hurt neither)
+        m_winLastFocused = (wxWindow *)NULL;
+
+        // start from first or last depending on where we're going
+        node = forward ? children.GetFirst() : children.GetLast();
+    }
+    else // going up
+    {
+        // try to find the child which has the focus currently
+
+        // the event emitter might have done this for us
+        wxWindow *winFocus = event.GetCurrentFocus();
+
+        // but if not, we might know where the focus was ourselves
+        if (!winFocus)
+            winFocus = m_winLastFocused;
+
+        // if still no luck, do it the hard way
+        if (!winFocus)
+            winFocus = wxWindow::FindFocus();
+
+        if ( winFocus )
+        {
+#ifdef __WXMSW__
+            // If we are in a radio button group, start from the first item in the
+            // group
+            if ( event.IsFromTab() && wxIsKindOf(winFocus, wxRadioButton ) )
+                winFocus = wxGetFirstButtonInGroup((wxRadioButton*)winFocus);
+#endif
+            // ok, we found the focus - now is it our child?
+            start_node = children.Find( winFocus );
+        }
+
+        if ( !start_node && m_winLastFocused )
+        {
+            // window which has focus isn't our child, fall back to the one
+            // which had the focus the last time
+            start_node = children.Find( m_winLastFocused );
+        }
+
+        // if we still didn't find anything, we should start with the first one
+        if ( !start_node )
+        {
+            start_node = children.GetFirst();
+        }
+
+        // and the first child which we can try setting focus to is the next or
+        // the previous one
+        node = forward ? start_node->GetNext() : start_node->GetPrevious();
+    }
+
+    // we want to cycle over all elements passing by NULL
+    for ( ;; )
+    {
+        // don't go into infinite loop
+        if ( start_node && node && node == start_node )
+            break;
+
+        // Have we come to the last or first item on the panel?
+        if ( !node )
+        {
+            if ( !start_node )
+            {
+                // exit now as otherwise we'd loop forever
+                break;
+            }
+
+            if ( !goingDown )
+            {
+                // Check if our (maybe grand) parent is another panel: if this
+                // is the case, they will know what to do with this navigation
+                // key and so give them the chance to process it instead of
+                // looping inside this panel (normally, the focus will go to
+                // the next/previous item after this panel in the parent
+                // panel).
+                wxWindow *focussed_child_of_parent = m_winParent;
+                while ( parent )
+                {
+                    // we don't want to tab into a different dialog or frame
+                    if ( focussed_child_of_parent->IsTopLevel() )
+                        break;
+
+                    event.SetCurrentFocus( focussed_child_of_parent );
+                    if ( parent->GetEventHandler()->ProcessEvent( event ) )
+                        return;
+
+                    focussed_child_of_parent = parent;
+
+                    parent = parent->GetParent();
+                }
+            }
+            //else: as the focus came from our parent, we definitely don't want
+            //      to send it back to it!
+
+            // no, we are not inside another panel so process this ourself
+            node = forward ? children.GetFirst() : children.GetLast();
+
+            continue;
+        }
+
+        wxWindow *child = node->GetData();
+
+#ifdef __WXMSW__
+        if ( event.IsFromTab() )
+        {
+            if ( wxIsKindOf(child, wxRadioButton) )
+            {
+                // only radio buttons with either wxRB_GROUP or wxRB_SINGLE
+                // can be tabbed to
+                if ( child->HasFlag(wxRB_GROUP) )
+                {
+                    // need to tab into the active button within a group
+                    wxRadioButton *rb = wxGetSelectedButtonInGroup((wxRadioButton*)child);
+                    if ( rb )
+                        child = rb;
+                }
+                else if ( !child->HasFlag(wxRB_SINGLE) )
+                {
+                    node = forward ? node->GetNext() : node->GetPrevious();
+                    continue;
+                }
+            }
+        }
+        else if ( m_winLastFocused &&
+                  wxIsKindOf(m_winLastFocused, wxRadioButton) &&
+                  !m_winLastFocused->HasFlag(wxRB_SINGLE) )
+        {
+            // cursor keys don't navigate out of a radio button group so
+            // find the correct radio button to focus
+            if ( forward )
+            {
+                child = wxGetNextButtonInGroup((wxRadioButton*)m_winLastFocused);
+                if ( !child )
+                {
+                    // no next button in group, set it to the first button
+                    child = wxGetFirstButtonInGroup((wxRadioButton*)m_winLastFocused);
+                }
+            }
+            else
+            {
+                child = wxGetPreviousButtonInGroup((wxRadioButton*)m_winLastFocused);
+                if ( !child )
+                {
+                    // no previous button in group, set it to the last button
+                    child = wxGetLastButtonInGroup((wxRadioButton*)m_winLastFocused);
+                }
+            }
+
+            if ( child == m_winLastFocused )
+            {
+                // must be a group consisting of only one button therefore
+                // no need to send a navigation event
+                event.Skip(false);
+                return;
+            }
+        }
+#endif // __WXMSW__
+
+        if ( child->AcceptsFocusFromKeyboard() )
+        {
+            // if we're setting the focus to a child panel we should prevent it
+            // from giving it to the child which had the focus the last time
+            // and instead give it to the first/last child depending from which
+            // direction we're coming
+            event.SetEventObject(m_winParent);
+
+            // disable propagation for this call as otherwise the event might
+            // bounce back to us.
+            wxPropagationDisabler disableProp(event);
+            if ( !child->GetEventHandler()->ProcessEvent(event) )
+            {
+                // set it first in case SetFocusFromKbd() results in focus
+                // change too
+                m_winLastFocused = child;
+
+                // everything is simple: just give focus to it
+                child->SetFocusFromKbd();
+            }
+            //else: the child manages its focus itself
+
+            event.Skip( false );
+
+            return;
+        }
+
+        node = forward ? node->GetNext() : node->GetPrevious();
+    }
+
+    // we cycled through all of our children and none of them wanted to accept
+    // focus
+    event.Skip();
+}
+
+void wxControlContainer::HandleOnWindowDestroy(wxWindowBase *child)
+{
+    if ( child == m_winLastFocused )
+        m_winLastFocused = NULL;
+}
+
+// ----------------------------------------------------------------------------
+// focus handling
+// ----------------------------------------------------------------------------
+
+bool wxControlContainer::DoSetFocus()
+{
+    wxLogTrace(TRACE_FOCUS, _T("SetFocus on wxPanel 0x%p."),
+               m_winParent->GetHandle());
+
+    if (m_inSetFocus)
+        return true;
+
+    // when the panel gets the focus we move the focus to either the last
+    // window that had the focus or the first one that can get it unless the
+    // focus had been already set to some other child
+
+    wxWindow *win = wxWindow::FindFocus();
+    while ( win )
+    {
+        if ( win == m_winParent )
+        {
+            // our child already has focus, don't take it away from it
+            return true;
+        }
+
+        if ( win->IsTopLevel() )
+        {
+            // don't look beyond the first top level parent - useless and
+            // unnecessary
+            break;
+        }
+
+        win = win->GetParent();
+    }
+
+    // protect against infinite recursion:
+    m_inSetFocus = true;
+
+    bool ret = SetFocusToChild();
+
+    m_inSetFocus = false;
+
+    return ret;
+}
+
+void wxControlContainer::HandleOnFocus(wxFocusEvent& event)
+{
+    wxLogTrace(TRACE_FOCUS, _T("OnFocus on wxPanel 0x%p, name: %s"),
+               m_winParent->GetHandle(),
+               m_winParent->GetName().c_str() );
+
+    DoSetFocus();
+
+    event.Skip();
+}
+
+bool wxControlContainer::SetFocusToChild()
+{
+    return wxSetFocusToChild(m_winParent, &m_winLastFocused);
+}
+
+// ----------------------------------------------------------------------------
+// SetFocusToChild(): this function is used by wxPanel but also by wxFrame in
+// wxMSW, this is why it is outside of wxControlContainer class
+// ----------------------------------------------------------------------------
+
+bool wxSetFocusToChild(wxWindow *win, wxWindow **childLastFocused)
+{
+    wxCHECK_MSG( win, false, _T("wxSetFocusToChild(): invalid window") );
+    wxCHECK_MSG( childLastFocused, false,
+                 _T("wxSetFocusToChild(): NULL child poonter") );
+
+    if ( *childLastFocused )
+    {
+        // It might happen that the window got reparented
+        if ( (*childLastFocused)->GetParent() == win )
+        {
+            wxLogTrace(TRACE_FOCUS,
+                       _T("SetFocusToChild() => last child (0x%p)."),
+                       (*childLastFocused)->GetHandle());
+
+            // not SetFocusFromKbd(): we're restoring focus back to the old
+            // window and not setting it as the result of a kbd action
+            (*childLastFocused)->SetFocus();
+            return true;
+        }
+        else
+        {
+            // it doesn't count as such any more
+            *childLastFocused = (wxWindow *)NULL;
+        }
+    }
+
+    // set the focus to the first child who wants it
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+    while ( node )
+    {
+        wxWindow *child = node->GetData();
+        node = node->GetNext();
+
+#ifdef __WXMAC__
+        if ( child->GetParent()->MacIsWindowScrollbar( child ) )
+            continue;
+#endif
+        
+        if ( child->AcceptsFocusFromKeyboard() && !child->IsTopLevel() )
+        {
+#ifdef __WXMSW__
+            // If a radiobutton is the first focusable child, search for the
+            // selected radiobutton in the same group
+            wxRadioButton* btn = wxDynamicCast(child, wxRadioButton);
+            if (btn)
+            {
+                wxRadioButton* selected = wxGetSelectedButtonInGroup(btn);
+                if (selected)
+                    child = selected;
+            }
+#endif
+
+            wxLogTrace(TRACE_FOCUS,
+                       _T("SetFocusToChild() => first child (0x%p)."),
+                       child->GetHandle());
+
+            *childLastFocused = child;
+            child->SetFocusFromKbd();
+            return true;
+        }
+    }
+
+    return false;
+}
diff --git a/Source/3rd Party/wx/src/common/convauto.cpp b/Source/3rd Party/wx/src/common/convauto.cpp
index d043f0a0c..3205b7bea 100644
--- a/Source/3rd Party/wx/src/common/convauto.cpp	
+++ b/Source/3rd Party/wx/src/common/convauto.cpp	
@@ -1,347 +1,214 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/convauto.cpp
-// Purpose:     implementation of wxConvAuto
-// Author:      Vadim Zeitlin
-// Created:     2006-04-04
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/convauto.h"
-
-// we use latin1 by default as it seems the least bad choice: the files we need
-// to detect input of don't always come from the user system (they are often
-// received from other machines) and so using wxFONTENCODING_SYSTEM doesn't
-// seem to be a good idea and there is no other reasonable alternative
-wxFontEncoding wxConvAuto::ms_defaultMBEncoding = wxFONTENCODING_ISO8859_1;
-
-namespace
-{
-
-const char BOM_UTF32BE[] = { '\x00', '\x00', '\xFE', '\xFF' };
-const char BOM_UTF32LE[] = { '\xFF', '\xFE', '\x00', '\x00' };
-const char BOM_UTF16BE[] = { '\xFE', '\xFF'                 };
-const char BOM_UTF16LE[] = { '\xFF', '\xFE'                 };
-const char BOM_UTF8[]    = { '\xEF', '\xBB', '\xBF'         };
-
-} // anonymous namespace
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-/* static */
-void wxConvAuto::SetFallbackEncoding(wxFontEncoding enc)
-{
-    wxASSERT_MSG( enc != wxFONTENCODING_DEFAULT,
-                  wxT("wxFONTENCODING_DEFAULT doesn't make sense here") );
-
-    ms_defaultMBEncoding = enc;
-}
-
-/* static */
-const char* wxConvAuto::GetBOMChars(wxBOM bom, size_t* count)
-{
-    wxCHECK_MSG( count , NULL, wxS("count pointer must be provided") );
-
-    switch ( bom )
-    {
-        case wxBOM_UTF32BE: *count = WXSIZEOF(BOM_UTF32BE); return BOM_UTF32BE;
-        case wxBOM_UTF32LE: *count = WXSIZEOF(BOM_UTF32LE); return BOM_UTF32LE;
-        case wxBOM_UTF16BE: *count = WXSIZEOF(BOM_UTF16BE); return BOM_UTF16BE;
-        case wxBOM_UTF16LE: *count = WXSIZEOF(BOM_UTF16LE); return BOM_UTF16LE;
-        case wxBOM_UTF8   : *count = WXSIZEOF(BOM_UTF8   ); return BOM_UTF8;
-        case wxBOM_Unknown:
-        case wxBOM_None:
-            wxFAIL_MSG( wxS("Invalid BOM type") );
-            return NULL;
-    }
-
-    wxFAIL_MSG( wxS("Unknown BOM type") );
-    return NULL;
-}
-
-/* static */
-wxBOM wxConvAuto::DetectBOM(const char *src, size_t srcLen)
-{
-    // examine the buffer for BOM presence
-    //
-    // quoting from http://www.unicode.org/faq/utf_bom.html#BOM:
-    //
-    //  Bytes           Encoding Form
-    //
-    //  00 00 FE FF     UTF-32, big-endian
-    //  FF FE 00 00     UTF-32, little-endian
-    //  FE FF           UTF-16, big-endian
-    //  FF FE           UTF-16, little-endian
-    //  EF BB BF        UTF-8
-    //
-    // as some BOMs are prefixes of other ones we may need to read more bytes
-    // to disambiguate them
-
-    switch ( srcLen )
-    {
-        case 0:
-            return wxBOM_Unknown;
-
-        case 1:
-            if ( src[0] == '\x00' || src[0] == '\xFF' ||
-                 src[0] == '\xFE' || src[0] == '\xEF')
-            {
-                // this could be a BOM but we don't know yet
-                return wxBOM_Unknown;
-            }
-            break;
-
-        case 2:
-        case 3:
-            if ( src[0] == '\xEF' && src[1] == '\xBB' )
-            {
-                if ( srcLen == 3 )
-                    return src[2] == '\xBF' ? wxBOM_UTF8 : wxBOM_None;
-
-                return wxBOM_Unknown;
-            }
-
-            if ( src[0] == '\xFE' && src[1] == '\xFF' )
-                return wxBOM_UTF16BE;
-
-            if ( src[0] == '\xFF' && src[1] == '\xFE' )
-            {
-                // if the next byte is 0, it could be an UTF-32LE BOM but if it
-                // isn't we can be sure it's UTF-16LE
-                if ( srcLen == 3 && src[2] != '\x00' )
-                    return wxBOM_UTF16LE;
-
-                return wxBOM_Unknown;
-            }
-
-            if ( src[0] == '\x00' && src[1] == '\x00' )
-            {
-                // this could only be UTF-32BE, check that the data we have so
-                // far allows for it
-                if ( srcLen == 3 && src[2] != '\xFE' )
-                    return wxBOM_None;
-
-                return wxBOM_Unknown;
-            }
-            break;
-
-        default:
-            // we have at least 4 characters so we may finally decide whether
-            // we have a BOM or not
-            if ( src[0] == '\xEF' && src[1] == '\xBB' && src[2] == '\xBF' )
-                return wxBOM_UTF8;
-
-            if ( src[0] == '\x00' && src[1] == '\x00' &&
-                 src[2] == '\xFE' && src[3] == '\xFF' )
-                return wxBOM_UTF32BE;
-
-            if ( src[0] == '\xFF' && src[1] == '\xFE' &&
-                 src[2] == '\x00' && src[3] == '\x00' )
-                return wxBOM_UTF32LE;
-
-            if ( src[0] == '\xFE' && src[1] == '\xFF' )
-                return wxBOM_UTF16BE;
-
-            if ( src[0] == '\xFF' && src[1] == '\xFE' )
-                return wxBOM_UTF16LE;
-    }
-
-    return wxBOM_None;
-}
-
-void wxConvAuto::InitFromBOM(wxBOM bomType)
-{
-    m_consumedBOM = false;
-
-    switch ( bomType )
-    {
-        case wxBOM_Unknown:
-            wxFAIL_MSG( "shouldn't be called for this BOM type" );
-            break;
-
-        case wxBOM_None:
-            // use the default
-            break;
-
-        case wxBOM_UTF32BE:
-            m_conv = new wxMBConvUTF32BE;
-            m_ownsConv = true;
-            break;
-
-        case wxBOM_UTF32LE:
-            m_conv = new wxMBConvUTF32LE;
-            m_ownsConv = true;
-            break;
-
-        case wxBOM_UTF16BE:
-            m_conv = new wxMBConvUTF16BE;
-            m_ownsConv = true;
-            break;
-
-        case wxBOM_UTF16LE:
-            m_conv = new wxMBConvUTF16LE;
-            m_ownsConv = true;
-            break;
-
-        case wxBOM_UTF8:
-            InitWithUTF8();
-            break;
-
-        default:
-            wxFAIL_MSG( "unknown BOM type" );
-    }
-
-    if ( !m_conv )
-    {
-        // we end up here if there is no BOM or we didn't recognize it somehow
-        // (this shouldn't happen but still don't crash if it does), so use the
-        // default encoding
-        InitWithUTF8();
-        m_consumedBOM = true; // as there is nothing to consume
-    }
-}
-
-void wxConvAuto::SkipBOM(const char **src, size_t *len) const
-{
-    int ofs;
-    switch ( m_bomType )
-    {
-        case wxBOM_Unknown:
-            wxFAIL_MSG( "shouldn't be called for this BOM type" );
-            return;
-
-        case wxBOM_None:
-            ofs = 0;
-            break;
-
-        case wxBOM_UTF32BE:
-        case wxBOM_UTF32LE:
-            ofs = 4;
-            break;
-
-        case wxBOM_UTF16BE:
-        case wxBOM_UTF16LE:
-            ofs = 2;
-            break;
-
-        case wxBOM_UTF8:
-            ofs = 3;
-            break;
-
-        default:
-            wxFAIL_MSG( "unknown BOM type" );
-            return;
-    }
-
-    *src += ofs;
-    if ( *len != (size_t)-1 )
-        *len -= ofs;
-}
-
-bool wxConvAuto::InitFromInput(const char *src, size_t len)
-{
-    m_bomType = DetectBOM(src, len == wxNO_LEN ? strlen(src) : len);
-    if ( m_bomType == wxBOM_Unknown )
-        return false;
-
-    InitFromBOM(m_bomType);
-
-    return true;
-}
-
-size_t
-wxConvAuto::ToWChar(wchar_t *dst, size_t dstLen,
-                    const char *src, size_t srcLen) const
-{
-    // we check BOM and create the appropriate conversion the first time we're
-    // called but we also need to ensure that the BOM is skipped not only
-    // during this initial call but also during the first call with non-NULL
-    // dst as typically we're first called with NULL dst to calculate the
-    // needed buffer size
-    wxConvAuto *self = const_cast<wxConvAuto *>(this);
-
-
-    if ( !m_conv )
-    {
-        if ( !self->InitFromInput(src, srcLen) )
-        {
-            // there is not enough data to determine whether we have a BOM or
-            // not, so fail for now -- the caller is supposed to call us again
-            // with more data
-            return wxCONV_FAILED;
-        }
-    }
-
-    if ( !m_consumedBOM )
-    {
-        SkipBOM(&src, &srcLen);
-        if ( srcLen == 0 )
-        {
-            // there is nothing left except the BOM so we'd return 0 below but
-            // this is unexpected: decoding a non-empty string must either fail
-            // or return something non-empty, in particular this would break
-            // the code in wxTextInputStream::NextChar()
-            //
-            // so still return an error as we need some more data to be able to
-            // decode it
-            return wxCONV_FAILED;
-        }
-    }
-
-    // try to convert using the auto-detected encoding
-    size_t rc = m_conv->ToWChar(dst, dstLen, src, srcLen);
-    if ( rc == wxCONV_FAILED && m_bomType == wxBOM_None )
-    {
-        // if the conversion failed but we didn't really detect anything and
-        // simply tried UTF-8 by default, retry it using the fall-back
-        if ( m_encDefault != wxFONTENCODING_MAX )
-        {
-            if ( m_ownsConv )
-                delete m_conv;
-
-            self->m_conv = new wxCSConv(m_encDefault == wxFONTENCODING_DEFAULT
-                                            ? GetFallbackEncoding()
-                                            : m_encDefault);
-            self->m_ownsConv = true;
-
-            rc = m_conv->ToWChar(dst, dstLen, src, srcLen);
-        }
-    }
-
-    // don't skip the BOM again the next time if we really consumed it
-    if ( rc != wxCONV_FAILED && dst && !m_consumedBOM )
-        self->m_consumedBOM = true;
-
-    return rc;
-}
-
-size_t
-wxConvAuto::FromWChar(char *dst, size_t dstLen,
-                      const wchar_t *src, size_t srcLen) const
-{
-    if ( !m_conv )
-    {
-        // default to UTF-8 for the multibyte output
-        const_cast<wxConvAuto *>(this)->InitWithUTF8();
-    }
-
-    return m_conv->FromWChar(dst, dstLen, src, srcLen);
-}
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/convauto.cpp
+// Purpose:     implementation of wxConvAuto
+// Author:      Vadim Zeitlin
+// Created:     2006-04-04
+// RCS-ID:      $Id: convauto.cpp 38570 2006-04-05 14:37:47Z VZ $
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_WCHAR_T
+
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
+#include "wx/convauto.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+/* static */
+wxConvAuto::BOMType wxConvAuto::DetectBOM(const char *src, size_t srcLen)
+{
+    if ( srcLen < 2 )
+    {
+        // minimal BOM is 2 bytes so bail out immediately and simplify the code
+        // below which wouldn't need to check for length for UTF-16 cases
+        return BOM_None;
+    }
+
+    // examine the buffer for BOM presence
+    //
+    // see http://www.unicode.org/faq/utf_bom.html#BOM
+    switch ( *src++ )
+    {
+        case '\0':
+            // could only be big endian UTF-32 (00 00 FE FF)
+            if ( srcLen >= 4 &&
+                    src[0] == '\0' &&
+                        src[1] == '\xfe' &&
+                            src[2] == '\xff' )
+            {
+                return BOM_UTF32BE;
+            }
+            break;
+
+        case '\xfe':
+            // could only be big endian UTF-16 (FE FF)
+            if ( *src++ == '\xff' )
+            {
+                return BOM_UTF16BE;
+            }
+            break;
+
+        case '\xff':
+            // could be either little endian UTF-16 or UTF-32, both start
+            // with FF FE
+            if ( *src++ == '\xfe' )
+            {
+                return srcLen >= 4 && src[0] == '\0' && src[1] == '\0'
+                            ? BOM_UTF32LE
+                            : BOM_UTF16LE;
+            }
+            break;
+
+        case '\xef':
+            // is this UTF-8 BOM (EF BB BF)?
+            if ( srcLen >= 3 && src[0] == '\xbb' && src[1] == '\xbf' )
+            {
+                return BOM_UTF8;
+            }
+            break;
+    }
+
+    return BOM_None;
+}
+
+void wxConvAuto::InitFromBOM(BOMType bomType)
+{
+    m_consumedBOM = false;
+
+    switch ( bomType )
+    {
+        case BOM_UTF32BE:
+            m_conv = new wxMBConvUTF32BE;
+            m_ownsConv = true;
+            break;
+
+        case BOM_UTF32LE:
+            m_conv = new wxMBConvUTF32LE;
+            m_ownsConv = true;
+            break;
+
+        case BOM_UTF16BE:
+            m_conv = new wxMBConvUTF16BE;
+            m_ownsConv = true;
+            break;
+
+        case BOM_UTF16LE:
+            m_conv = new wxMBConvUTF16LE;
+            m_ownsConv = true;
+            break;
+
+        case BOM_UTF8:
+            m_conv = &wxConvUTF8;
+            m_ownsConv = false;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unexpected BOM type") );
+            // fall through: still need to create something
+
+        case BOM_None:
+            InitWithDefault();
+            m_consumedBOM = true; // as there is nothing to consume
+    }
+}
+
+void wxConvAuto::SkipBOM(const char **src, size_t *len) const
+{
+    int ofs;
+    switch ( m_bomType )
+    {
+        case BOM_UTF32BE:
+        case BOM_UTF32LE:
+            ofs = 4;
+            break;
+
+        case BOM_UTF16BE:
+        case BOM_UTF16LE:
+            ofs = 2;
+            break;
+
+        case BOM_UTF8:
+            ofs = 3;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unexpected BOM type") );
+            // fall through: still need to create something
+
+        case BOM_None:
+            ofs = 0;
+    }
+
+    *src += ofs;
+    if ( *len != (size_t)-1 )
+        *len -= ofs;
+}
+
+void wxConvAuto::InitFromInput(const char **src, size_t *len)
+{
+    m_bomType = DetectBOM(*src, *len);
+    InitFromBOM(m_bomType);
+    SkipBOM(src, len);
+}
+
+size_t
+wxConvAuto::ToWChar(wchar_t *dst, size_t dstLen,
+                    const char *src, size_t srcLen) const
+{
+    // we check BOM and create the appropriate conversion the first time we're
+    // called but we also need to ensure that the BOM is skipped not only
+    // during this initial call but also during the first call with non-NULL
+    // dst as typically we're first called with NULL dst to calculate the
+    // needed buffer size
+    wxConvAuto *self = wx_const_cast(wxConvAuto *, this);
+    if ( !m_conv )
+    {
+        self->InitFromInput(&src, &srcLen);
+        if ( dst )
+            self->m_consumedBOM = true;
+    }
+
+    if ( !m_consumedBOM && dst )
+    {
+        self->m_consumedBOM = true;
+        SkipBOM(&src, &srcLen);
+    }
+
+    return m_conv->ToWChar(dst, dstLen, src, srcLen);
+}
+
+size_t
+wxConvAuto::FromWChar(char *dst, size_t dstLen,
+                      const wchar_t *src, size_t srcLen) const
+{
+    if ( !m_conv )
+    {
+        // default to UTF-8 for the multibyte output
+        wx_const_cast(wxConvAuto *, this)->InitWithDefault();
+    }
+
+    return m_conv->FromWChar(dst, dstLen, src, srcLen);
+}
+
+#endif // wxUSE_WCHAR_T
+
diff --git a/Source/3rd Party/wx/src/common/cshelp.cpp b/Source/3rd Party/wx/src/common/cshelp.cpp
index 7d7738459..6bd3d5cc0 100644
--- a/Source/3rd Party/wx/src/common/cshelp.cpp	
+++ b/Source/3rd Party/wx/src/common/cshelp.cpp	
@@ -1,512 +1,512 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/cshelp.cpp
-// Purpose:     Context sensitive help class implementation
-// Author:      Julian Smart, Vadim Zeitlin
-// Modified by:
-// Created:     08/09/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_HELP
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/module.h"
-#endif
-
-#include "wx/tipwin.h"
-#include "wx/cshelp.h"
-
-#if wxUSE_MS_HTML_HELP
-    #include "wx/msw/helpchm.h"     // for ShowContextHelpPopup
-    #include "wx/utils.h"           // for wxGetMousePosition()
-#endif
-
-// ----------------------------------------------------------------------------
-// wxContextHelpEvtHandler private class
-// ----------------------------------------------------------------------------
-
-// This class exists in order to eat events until the left mouse button is
-// pressed
-class wxContextHelpEvtHandler: public wxEvtHandler
-{
-public:
-    wxContextHelpEvtHandler(wxContextHelp* contextHelp)
-    {
-        m_contextHelp = contextHelp;
-    }
-
-    virtual bool ProcessEvent(wxEvent& event);
-
-//// Data
-    wxContextHelp* m_contextHelp;
-
-    wxDECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler);
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxContextHelp
-// ----------------------------------------------------------------------------
-
-/*
- * Invokes context-sensitive help
- */
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxContextHelp, wxObject)
-
-wxContextHelp::wxContextHelp(wxWindow* win, bool beginHelp)
-{
-    m_inHelp = false;
-
-    if (beginHelp)
-        BeginContextHelp(win);
-}
-
-wxContextHelp::~wxContextHelp()
-{
-    if (m_inHelp)
-        EndContextHelp();
-}
-
-// Not currently needed, but on some systems capture may not work as
-// expected so we'll leave it here for now.
-#ifdef __WXMOTIF__
-static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push)
-{
-    if (push)
-        win->PushEventHandler(new wxContextHelpEvtHandler(help));
-    else
-        win->PopEventHandler(true);
-
-    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow* child = node->GetData();
-        wxPushOrPopEventHandlers(help, child, push);
-
-        node = node->GetNext();
-    }
-}
-#endif
-
-// Begin 'context help mode'
-bool wxContextHelp::BeginContextHelp(wxWindow* win)
-{
-    if (!win)
-        win = wxTheApp->GetTopWindow();
-    if (!win)
-        return false;
-
-    wxCursor cursor(wxCURSOR_QUESTION_ARROW);
-    wxCursor oldCursor = win->GetCursor();
-    win->SetCursor(cursor);
-
-#ifdef __WXMAC__
-    wxSetCursor(cursor);
-#endif
-
-    m_status = false;
-
-#ifdef __WXMOTIF__
-    wxPushOrPopEventHandlers(this, win, true);
-#else
-    win->PushEventHandler(new wxContextHelpEvtHandler(this));
-#endif
-
-    win->CaptureMouse();
-
-    EventLoop();
-
-    win->ReleaseMouse();
-
-#ifdef __WXMOTIF__
-    wxPushOrPopEventHandlers(this, win, false);
-#else
-    win->PopEventHandler(true);
-#endif
-
-    win->SetCursor(oldCursor);
-
-#ifdef __WXMAC__
-    wxSetCursor(wxNullCursor);
-#endif
-
-    if (m_status)
-    {
-        wxPoint pt;
-        wxWindow* winAtPtr = wxFindWindowAtPointer(pt);
-
-#if 0
-        if (winAtPtr)
-        {
-            printf("Picked %s (%d)\n", winAtPtr->GetName().c_str(),
-                   winAtPtr->GetId());
-        }
-#endif
-
-        if (winAtPtr)
-            DispatchEvent(winAtPtr, pt);
-    }
-
-    return true;
-}
-
-bool wxContextHelp::EndContextHelp()
-{
-    m_inHelp = false;
-
-    return true;
-}
-
-bool wxContextHelp::EventLoop()
-{
-    m_inHelp = true;
-
-    while ( m_inHelp )
-    {
-        if (wxTheApp->Pending())
-        {
-            wxTheApp->Dispatch();
-        }
-        else
-        {
-            wxTheApp->ProcessIdle();
-        }
-    }
-
-    return true;
-}
-
-bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event)
-{
-    if (event.GetEventType() == wxEVT_LEFT_DOWN)
-    {
-        m_contextHelp->SetStatus(true);
-        m_contextHelp->EndContextHelp();
-        return true;
-    }
-
-    if ((event.GetEventType() == wxEVT_CHAR) ||
-        (event.GetEventType() == wxEVT_KEY_DOWN) ||
-        (event.GetEventType() == wxEVT_ACTIVATE) ||
-        (event.GetEventType() == wxEVT_MOUSE_CAPTURE_CHANGED))
-    {
-        // May have already been set to true by a left-click
-        //m_contextHelp->SetStatus(false);
-        m_contextHelp->EndContextHelp();
-        return true;
-    }
-
-    if ((event.GetEventType() == wxEVT_PAINT) ||
-        (event.GetEventType() == wxEVT_ERASE_BACKGROUND))
-    {
-        event.Skip();
-        return false;
-    }
-
-    return true;
-}
-
-// Dispatch the help event to the relevant window
-bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
-{
-    wxCHECK_MSG( win, false, wxT("win parameter can't be NULL") );
-
-    wxHelpEvent helpEvent(wxEVT_HELP, win->GetId(), pt,
-                          wxHelpEvent::Origin_HelpButton);
-    helpEvent.SetEventObject(win);
-
-    return win->GetEventHandler()->ProcessEvent(helpEvent);
-}
-
-// ----------------------------------------------------------------------------
-// wxContextHelpButton
-// ----------------------------------------------------------------------------
-
-/*
- * wxContextHelpButton
- * You can add this to your dialogs (especially on non-Windows platforms)
- * to put the application into context help mode.
- */
-
-#ifndef __WXPM__
-
-static const char * csquery_xpm[] = {
-"12 11 2 1",
-"  c None",
-". c #000000",
-"            ",
-"    ....    ",
-"   ..  ..   ",
-"   ..  ..   ",
-"      ..    ",
-"     ..     ",
-"     ..     ",
-"            ",
-"     ..     ",
-"     ..     ",
-"            "};
-
-#endif
-
-IMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton)
-
-BEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton)
-    EVT_BUTTON(wxID_CONTEXT_HELP, wxContextHelpButton::OnContextHelp)
-END_EVENT_TABLE()
-
-wxContextHelpButton::wxContextHelpButton(wxWindow* parent,
-                                         wxWindowID id,
-                                         const wxPoint& pos,
-                                         const wxSize& size,
-                                         long style)
-#if defined(__WXPM__)
-                   : wxBitmapButton(parent, id, wxBitmap(wxCSQUERY_BITMAP
-                                                         ,wxBITMAP_TYPE_BMP_RESOURCE
-                                                        ),
-                                    pos, size, style)
-#else
-                   : wxBitmapButton(parent, id, wxBitmap(csquery_xpm),
-                                    pos, size, style)
-#endif
-{
-}
-
-void wxContextHelpButton::OnContextHelp(wxCommandEvent& WXUNUSED(event))
-{
-    wxContextHelp contextHelp(GetParent());
-}
-
-// ----------------------------------------------------------------------------
-// wxHelpProvider
-// ----------------------------------------------------------------------------
-
-wxHelpProvider *wxHelpProvider::ms_helpProvider = NULL;
-
-// trivial implementation of some methods which we don't want to make pure
-// virtual for convenience
-
-void wxHelpProvider::AddHelp(wxWindowBase * WXUNUSED(window),
-                             const wxString& WXUNUSED(text))
-{
-}
-
-void wxHelpProvider::AddHelp(wxWindowID WXUNUSED(id),
-                             const wxString& WXUNUSED(text))
-{
-}
-
-// removes the association
-void wxHelpProvider::RemoveHelp(wxWindowBase* WXUNUSED(window))
-{
-}
-
-wxHelpProvider::~wxHelpProvider()
-{
-}
-
-wxString wxHelpProvider::GetHelpTextMaybeAtPoint(wxWindowBase *window)
-{
-    if ( m_helptextAtPoint != wxDefaultPosition ||
-            m_helptextOrigin != wxHelpEvent::Origin_Unknown )
-    {
-        wxCHECK_MSG( window, wxEmptyString, wxT("window must not be NULL") );
-
-        wxPoint pt = m_helptextAtPoint;
-        wxHelpEvent::Origin origin = m_helptextOrigin;
-
-        m_helptextAtPoint = wxDefaultPosition;
-        m_helptextOrigin = wxHelpEvent::Origin_Unknown;
-
-        return window->GetHelpTextAtPoint(pt, origin);
-    }
-
-    return GetHelp(window);
-}
-
-// ----------------------------------------------------------------------------
-// wxSimpleHelpProvider
-// ----------------------------------------------------------------------------
-
-#define WINHASH_KEY(w) wxPtrToUInt(w)
-
-wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window)
-{
-    wxSimpleHelpProviderHashMap::iterator it = m_hashWindows.find(WINHASH_KEY(window));
-
-    if ( it == m_hashWindows.end() )
-    {
-        it = m_hashIds.find(window->GetId());
-        if ( it == m_hashIds.end() )
-            return wxEmptyString;
-    }
-
-    return it->second;
-}
-
-void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text)
-{
-    m_hashWindows.erase(WINHASH_KEY(window));
-    m_hashWindows[WINHASH_KEY(window)] = text;
-}
-
-void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
-{
-    wxSimpleHelpProviderHashMap::key_type key = (wxSimpleHelpProviderHashMap::key_type)id;
-    m_hashIds.erase(key);
-    m_hashIds[key] = text;
-}
-
-// removes the association
-void wxSimpleHelpProvider::RemoveHelp(wxWindowBase* window)
-{
-    m_hashWindows.erase(WINHASH_KEY(window));
-}
-
-bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
-{
-#if wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW
-#if wxUSE_MS_HTML_HELP
-    // m_helptextAtPoint will be reset by GetHelpTextMaybeAtPoint(), stash it
-    const wxPoint posTooltip = m_helptextAtPoint;
-#endif // wxUSE_MS_HTML_HELP
-
-    const wxString text = GetHelpTextMaybeAtPoint(window);
-
-    if ( !text.empty() )
-    {
-        // use the native help popup style if it's available
-#if wxUSE_MS_HTML_HELP
-        if ( !wxCHMHelpController::ShowContextHelpPopup
-                                   (
-                                        text,
-                                        posTooltip,
-                                        (wxWindow *)window
-                                   ) )
-#endif // wxUSE_MS_HTML_HELP
-        {
-#if wxUSE_TIPWINDOW
-            static wxTipWindow* s_tipWindow = NULL;
-
-            if ( s_tipWindow )
-            {
-                // Prevent s_tipWindow being nulled in OnIdle, thereby removing
-                // the chance for the window to be closed by ShowHelp
-                s_tipWindow->SetTipWindowPtr(NULL);
-                s_tipWindow->Close();
-            }
-
-            s_tipWindow = new wxTipWindow((wxWindow *)window, text,
-                                            100, &s_tipWindow);
-#else // !wxUSE_TIPWINDOW
-            // we tried wxCHMHelpController but it failed and we don't have
-            // wxTipWindow to fall back on, so
-            return false;
-#endif // wxUSE_TIPWINDOW
-        }
-
-        return true;
-    }
-#else // !wxUSE_MS_HTML_HELP && !wxUSE_TIPWINDOW
-    wxUnusedVar(window);
-#endif // wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// wxHelpControllerHelpProvider
-// ----------------------------------------------------------------------------
-
-wxHelpControllerHelpProvider::wxHelpControllerHelpProvider(wxHelpControllerBase* hc)
-{
-    m_helpController = hc;
-}
-
-bool wxHelpControllerHelpProvider::ShowHelp(wxWindowBase *window)
-{
-    const wxString text = GetHelpTextMaybeAtPoint(window);
-
-    if ( text.empty() )
-        return false;
-
-    if ( m_helpController )
-    {
-        // if it's a numeric topic, show it
-        long topic;
-        if ( text.ToLong(&topic) )
-            return m_helpController->DisplayContextPopup(topic);
-
-        // otherwise show the text directly
-        if ( m_helpController->DisplayTextPopup(text, wxGetMousePosition()) )
-            return true;
-    }
-
-    // if there is no help controller or it's not capable of showing the help,
-    // fallback to the default method
-    return wxSimpleHelpProvider::ShowHelp(window);
-}
-
-// Convenience function for turning context id into wxString
-wxString wxContextId(int id)
-{
-    return wxString::Format(wxT("%d"), id);
-}
-
-// ----------------------------------------------------------------------------
-// wxHelpProviderModule: module responsible for cleaning up help provider.
-// ----------------------------------------------------------------------------
-
-class wxHelpProviderModule : public wxModule
-{
-public:
-    bool OnInit();
-    void OnExit();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxHelpProviderModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxHelpProviderModule, wxModule)
-
-bool wxHelpProviderModule::OnInit()
-{
-    // Probably we don't want to do anything by default,
-    // since it could pull in extra code
-    // wxHelpProvider::Set(new wxSimpleHelpProvider);
-
-    return true;
-}
-
-void wxHelpProviderModule::OnExit()
-{
-    if (wxHelpProvider::Get())
-    {
-        delete wxHelpProvider::Get();
-        wxHelpProvider::Set(NULL);
-    }
-}
-
-#endif // wxUSE_HELP
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/cshelp.cpp
+// Purpose:     Context sensitive help class implementation
+// Author:      Julian Smart, Vadim Zeitlin
+// Modified by:
+// Created:     08/09/2000
+// RCS-ID:      $Id: cshelp.cpp 52329 2008-03-05 13:20:26Z VZ $
+// Copyright:   (c) 2000 Julian Smart, Vadim Zeitlin
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_HELP
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/tipwin.h"
+#include "wx/cshelp.h"
+
+#if wxUSE_MS_HTML_HELP
+    #include "wx/msw/helpchm.h"     // for ShowContextHelpPopup
+    #include "wx/utils.h"           // for wxGetMousePosition()
+#endif
+
+// ----------------------------------------------------------------------------
+// wxContextHelpEvtHandler private class
+// ----------------------------------------------------------------------------
+
+// This class exists in order to eat events until the left mouse button is
+// pressed
+class wxContextHelpEvtHandler: public wxEvtHandler
+{
+public:
+    wxContextHelpEvtHandler(wxContextHelp* contextHelp)
+    {
+        m_contextHelp = contextHelp;
+    }
+
+    virtual bool ProcessEvent(wxEvent& event);
+
+//// Data
+    wxContextHelp* m_contextHelp;
+
+    DECLARE_NO_COPY_CLASS(wxContextHelpEvtHandler)
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxContextHelp
+// ----------------------------------------------------------------------------
+
+/*
+ * Invokes context-sensitive help
+ */
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxContextHelp, wxObject)
+
+wxContextHelp::wxContextHelp(wxWindow* win, bool beginHelp)
+{
+    m_inHelp = false;
+
+    if (beginHelp)
+        BeginContextHelp(win);
+}
+
+wxContextHelp::~wxContextHelp()
+{
+    if (m_inHelp)
+        EndContextHelp();
+}
+
+// Not currently needed, but on some systems capture may not work as
+// expected so we'll leave it here for now.
+#ifdef __WXMOTIF__
+static void wxPushOrPopEventHandlers(wxContextHelp* help, wxWindow* win, bool push)
+{
+    if (push)
+        win->PushEventHandler(new wxContextHelpEvtHandler(help));
+    else
+        win->PopEventHandler(true);
+
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+    while (node)
+    {
+        wxWindow* child = node->GetData();
+        wxPushOrPopEventHandlers(help, child, push);
+
+        node = node->GetNext();
+    }
+}
+#endif
+
+// Begin 'context help mode'
+bool wxContextHelp::BeginContextHelp(wxWindow* win)
+{
+    if (!win)
+        win = wxTheApp->GetTopWindow();
+    if (!win)
+        return false;
+
+    wxCursor cursor(wxCURSOR_QUESTION_ARROW);
+    wxCursor oldCursor = win->GetCursor();
+    win->SetCursor(cursor);
+
+#ifdef __WXMAC__
+    wxSetCursor(cursor);
+#endif
+
+    m_status = false;
+
+#ifdef __WXMOTIF__
+    wxPushOrPopEventHandlers(this, win, true);
+#else
+    win->PushEventHandler(new wxContextHelpEvtHandler(this));
+#endif
+
+    win->CaptureMouse();
+
+    EventLoop();
+
+    win->ReleaseMouse();
+
+#ifdef __WXMOTIF__
+    wxPushOrPopEventHandlers(this, win, false);
+#else
+    win->PopEventHandler(true);
+#endif
+
+    win->SetCursor(oldCursor);
+
+#ifdef __WXMAC__
+    wxSetCursor(wxNullCursor);
+#endif
+
+    if (m_status)
+    {
+        wxPoint pt;
+        wxWindow* winAtPtr = wxFindWindowAtPointer(pt);
+
+#if 0
+        if (winAtPtr)
+        {
+            printf("Picked %s (%d)\n", winAtPtr->GetName().c_str(),
+                   winAtPtr->GetId());
+        }
+#endif
+
+        if (winAtPtr)
+            DispatchEvent(winAtPtr, pt);
+    }
+
+    return true;
+}
+
+bool wxContextHelp::EndContextHelp()
+{
+    m_inHelp = false;
+
+    return true;
+}
+
+bool wxContextHelp::EventLoop()
+{
+    m_inHelp = true;
+
+    while ( m_inHelp )
+    {
+        if (wxTheApp->Pending())
+        {
+            wxTheApp->Dispatch();
+        }
+        else
+        {
+            wxTheApp->ProcessIdle();
+        }
+    }
+
+    return true;
+}
+
+bool wxContextHelpEvtHandler::ProcessEvent(wxEvent& event)
+{
+    if (event.GetEventType() == wxEVT_LEFT_DOWN)
+    {
+        m_contextHelp->SetStatus(true);
+        m_contextHelp->EndContextHelp();
+        return true;
+    }
+
+    if ((event.GetEventType() == wxEVT_CHAR) ||
+        (event.GetEventType() == wxEVT_KEY_DOWN) ||
+        (event.GetEventType() == wxEVT_ACTIVATE) ||
+        (event.GetEventType() == wxEVT_MOUSE_CAPTURE_CHANGED))
+    {
+        // May have already been set to true by a left-click
+        //m_contextHelp->SetStatus(false);
+        m_contextHelp->EndContextHelp();
+        return true;
+    }
+
+    if ((event.GetEventType() == wxEVT_PAINT) ||
+        (event.GetEventType() == wxEVT_ERASE_BACKGROUND))
+    {
+        event.Skip();
+        return false;
+    }
+
+    return true;
+}
+
+// Dispatch the help event to the relevant window
+bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
+{
+    wxCHECK_MSG( win, false, _T("win parameter can't be NULL") );
+
+    wxHelpEvent helpEvent(wxEVT_HELP, win->GetId(), pt,
+                          wxHelpEvent::Origin_HelpButton);
+    helpEvent.SetEventObject(win);
+
+    return win->GetEventHandler()->ProcessEvent(helpEvent);
+}
+
+// ----------------------------------------------------------------------------
+// wxContextHelpButton
+// ----------------------------------------------------------------------------
+
+/*
+ * wxContextHelpButton
+ * You can add this to your dialogs (especially on non-Windows platforms)
+ * to put the application into context help mode.
+ */
+
+#ifndef __WXPM__
+
+static const char * csquery_xpm[] = {
+"12 11 2 1",
+"  c None",
+". c #000000",
+"            ",
+"    ....    ",
+"   ..  ..   ",
+"   ..  ..   ",
+"      ..    ",
+"     ..     ",
+"     ..     ",
+"            ",
+"     ..     ",
+"     ..     ",
+"            "};
+
+#endif
+
+IMPLEMENT_CLASS(wxContextHelpButton, wxBitmapButton)
+
+BEGIN_EVENT_TABLE(wxContextHelpButton, wxBitmapButton)
+    EVT_BUTTON(wxID_CONTEXT_HELP, wxContextHelpButton::OnContextHelp)
+END_EVENT_TABLE()
+
+wxContextHelpButton::wxContextHelpButton(wxWindow* parent,
+                                         wxWindowID id,
+                                         const wxPoint& pos,
+                                         const wxSize& size,
+                                         long style)
+#if defined(__WXPM__)
+                   : wxBitmapButton(parent, id, wxBitmap(wxCSQUERY_BITMAP
+                                                         ,wxBITMAP_TYPE_RESOURCE
+                                                        ),
+                                    pos, size, style)
+#else
+                   : wxBitmapButton(parent, id, wxBitmap(csquery_xpm),
+                                    pos, size, style)
+#endif
+{
+}
+
+void wxContextHelpButton::OnContextHelp(wxCommandEvent& WXUNUSED(event))
+{
+    wxContextHelp contextHelp(GetParent());
+}
+
+// ----------------------------------------------------------------------------
+// wxHelpProvider
+// ----------------------------------------------------------------------------
+
+wxHelpProvider *wxHelpProvider::ms_helpProvider = (wxHelpProvider *)NULL;
+
+// trivial implementation of some methods which we don't want to make pure
+// virtual for convenience
+
+void wxHelpProvider::AddHelp(wxWindowBase * WXUNUSED(window),
+                             const wxString& WXUNUSED(text))
+{
+}
+
+void wxHelpProvider::AddHelp(wxWindowID WXUNUSED(id),
+                             const wxString& WXUNUSED(text))
+{
+}
+
+// removes the association
+void wxHelpProvider::RemoveHelp(wxWindowBase* WXUNUSED(window))
+{
+}
+
+wxHelpProvider::~wxHelpProvider()
+{
+}
+
+wxString wxHelpProvider::GetHelpTextMaybeAtPoint(wxWindowBase *window)
+{
+    if ( m_helptextAtPoint != wxDefaultPosition ||
+            m_helptextOrigin != wxHelpEvent::Origin_Unknown )
+    {
+        wxCHECK_MSG( window, wxEmptyString, _T("window must not be NULL") );
+
+        wxPoint pt = m_helptextAtPoint;
+        wxHelpEvent::Origin origin = m_helptextOrigin;
+
+        m_helptextAtPoint = wxDefaultPosition;
+        m_helptextOrigin = wxHelpEvent::Origin_Unknown;
+
+        return window->GetHelpTextAtPoint(pt, origin);
+    }
+
+    return GetHelp(window);
+}
+
+// ----------------------------------------------------------------------------
+// wxSimpleHelpProvider
+// ----------------------------------------------------------------------------
+
+#define WINHASH_KEY(w) wxPtrToUInt(w)
+
+wxString wxSimpleHelpProvider::GetHelp(const wxWindowBase *window)
+{
+    wxSimpleHelpProviderHashMap::iterator it = m_hashWindows.find(WINHASH_KEY(window));
+
+    if ( it == m_hashWindows.end() )
+    {
+        it = m_hashIds.find(window->GetId());
+        if ( it == m_hashIds.end() )
+            return wxEmptyString;
+    }
+
+    return it->second;
+}
+
+void wxSimpleHelpProvider::AddHelp(wxWindowBase *window, const wxString& text)
+{
+    m_hashWindows.erase(WINHASH_KEY(window));
+    m_hashWindows[WINHASH_KEY(window)] = text;
+}
+
+void wxSimpleHelpProvider::AddHelp(wxWindowID id, const wxString& text)
+{
+    wxSimpleHelpProviderHashMap::key_type key = (wxSimpleHelpProviderHashMap::key_type)id;
+    m_hashIds.erase(key);
+    m_hashIds[key] = text;
+}
+
+// removes the association
+void wxSimpleHelpProvider::RemoveHelp(wxWindowBase* window)
+{
+    m_hashWindows.erase(WINHASH_KEY(window));
+}
+
+bool wxSimpleHelpProvider::ShowHelp(wxWindowBase *window)
+{
+#if wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW
+#if wxUSE_MS_HTML_HELP
+    // m_helptextAtPoint will be reset by GetHelpTextMaybeAtPoint(), stash it
+    const wxPoint posTooltip = m_helptextAtPoint;
+#endif // wxUSE_MS_HTML_HELP
+
+    const wxString text = GetHelpTextMaybeAtPoint(window);
+
+    if ( !text.empty() )
+    {
+        // use the native help popup style if it's available
+#if wxUSE_MS_HTML_HELP
+        if ( !wxCHMHelpController::ShowContextHelpPopup
+                                   (
+                                        text,
+                                        posTooltip,
+                                        (wxWindow *)window
+                                   ) )
+#endif // wxUSE_MS_HTML_HELP
+        {
+#if wxUSE_TIPWINDOW
+            static wxTipWindow* s_tipWindow = NULL;
+
+            if ( s_tipWindow )
+            {
+                // Prevent s_tipWindow being nulled in OnIdle, thereby removing
+                // the chance for the window to be closed by ShowHelp
+                s_tipWindow->SetTipWindowPtr(NULL);
+                s_tipWindow->Close();
+            }
+
+            s_tipWindow = new wxTipWindow((wxWindow *)window, text,
+                                            100, &s_tipWindow);
+#else // !wxUSE_TIPWINDOW
+            // we tried wxCHMHelpController but it failed and we don't have
+            // wxTipWindow to fall back on, so
+            return false;
+#endif // wxUSE_TIPWINDOW
+        }
+
+        return true;
+    }
+#else // !wxUSE_MS_HTML_HELP && !wxUSE_TIPWINDOW
+    wxUnusedVar(window);
+#endif // wxUSE_MS_HTML_HELP || wxUSE_TIPWINDOW
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// wxHelpControllerHelpProvider
+// ----------------------------------------------------------------------------
+
+wxHelpControllerHelpProvider::wxHelpControllerHelpProvider(wxHelpControllerBase* hc)
+{
+    m_helpController = hc;
+}
+
+bool wxHelpControllerHelpProvider::ShowHelp(wxWindowBase *window)
+{
+    const wxString text = GetHelpTextMaybeAtPoint(window);
+
+    if ( text.empty() )
+        return false;
+
+    if ( m_helpController )
+    {
+        // if it's a numeric topic, show it
+        long topic;
+        if ( text.ToLong(&topic) )
+            return m_helpController->DisplayContextPopup(topic);
+
+        // otherwise show the text directly
+        if ( m_helpController->DisplayTextPopup(text, wxGetMousePosition()) )
+            return true;
+    }
+
+    // if there is no help controller or it's not capable of showing the help,
+    // fallback to the default method
+    return wxSimpleHelpProvider::ShowHelp(window);
+}
+
+// Convenience function for turning context id into wxString
+wxString wxContextId(int id)
+{
+    return wxString::Format(_T("%d"), id);
+}
+
+// ----------------------------------------------------------------------------
+// wxHelpProviderModule: module responsible for cleaning up help provider.
+// ----------------------------------------------------------------------------
+
+class wxHelpProviderModule : public wxModule
+{
+public:
+    bool OnInit();
+    void OnExit();
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxHelpProviderModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxHelpProviderModule, wxModule)
+
+bool wxHelpProviderModule::OnInit()
+{
+    // Probably we don't want to do anything by default,
+    // since it could pull in extra code
+    // wxHelpProvider::Set(new wxSimpleHelpProvider);
+
+    return true;
+}
+
+void wxHelpProviderModule::OnExit()
+{
+    if (wxHelpProvider::Get())
+    {
+        delete wxHelpProvider::Get();
+        wxHelpProvider::Set(NULL);
+    }
+}
+
+#endif // wxUSE_HELP
diff --git a/Source/3rd Party/wx/src/common/ctrlcmn.cpp b/Source/3rd Party/wx/src/common/ctrlcmn.cpp
index e9facb668..9326835e9 100644
--- a/Source/3rd Party/wx/src/common/ctrlcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/ctrlcmn.cpp	
@@ -1,602 +1,188 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/ctrlcmn.cpp
-// Purpose:     wxControl common interface
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     26.07.99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_CONTROLS
-
-#include "wx/control.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dc.h"
-    #include "wx/log.h"
-    #include "wx/radiobut.h"
-    #include "wx/statbmp.h"
-    #include "wx/bitmap.h"
-    #include "wx/utils.h"       // for wxStripMenuCodes()
-    #include "wx/settings.h"
-#endif
-
-#include "wx/private/markupparser.h"
-
-const char wxControlNameStr[] = "control";
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-wxControlBase::~wxControlBase()
-{
-    // this destructor is required for Darwin
-}
-
-bool wxControlBase::Create(wxWindow *parent,
-                           wxWindowID id,
-                           const wxPoint &pos,
-                           const wxSize &size,
-                           long style,
-                           const wxValidator& wxVALIDATOR_PARAM(validator),
-                           const wxString &name)
-{
-    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
-
-#if wxUSE_VALIDATORS
-    if ( ret )
-        SetValidator(validator);
-#endif // wxUSE_VALIDATORS
-
-    return ret;
-}
-
-bool wxControlBase::CreateControl(wxWindowBase *parent,
-                                  wxWindowID id,
-                                  const wxPoint& pos,
-                                  const wxSize& size,
-                                  long style,
-                                  const wxValidator& validator,
-                                  const wxString& name)
-{
-    // even if it's possible to create controls without parents in some port,
-    // it should surely be discouraged because it doesn't work at all under
-    // Windows
-    wxCHECK_MSG( parent, false, wxT("all controls must have parents") );
-
-    if ( !CreateBase(parent, id, pos, size, style, validator, name) )
-        return false;
-
-    parent->AddChild(this);
-
-    return true;
-}
-
-void wxControlBase::Command(wxCommandEvent& event)
-{
-    (void)GetEventHandler()->ProcessEvent(event);
-}
-
-void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
-{
-    event.SetEventObject(const_cast<wxControlBase *>(this));
-
-    // event.SetId(GetId()); -- this is usuall done in the event ctor
-
-    switch ( m_clientDataType )
-    {
-        case wxClientData_Void:
-            event.SetClientData(GetClientData());
-            break;
-
-        case wxClientData_Object:
-            event.SetClientObject(GetClientObject());
-            break;
-
-        case wxClientData_None:
-            // nothing to do
-            ;
-    }
-}
-
-bool wxControlBase::SetFont(const wxFont& font)
-{
-    InvalidateBestSize();
-    return wxWindow::SetFont(font);
-}
-
-// wxControl-specific processing after processing the update event
-void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
-{
-    // call inherited
-    wxWindowBase::DoUpdateWindowUI(event);
-
-    // update label
-    if ( event.GetSetText() )
-    {
-        if ( event.GetText() != GetLabel() )
-            SetLabel(event.GetText());
-    }
-
-    // Unfortunately we don't yet have common base class for
-    // wxRadioButton, so we handle updates of radiobuttons here.
-    // TODO: If once wxRadioButtonBase will exist, move this code there.
-#if wxUSE_RADIOBTN
-    if ( event.GetSetChecked() )
-    {
-        wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton);
-        if ( radiobtn )
-            radiobtn->SetValue(event.GetChecked());
-    }
-#endif // wxUSE_RADIOBTN
-}
-
-/* static */
-wxString wxControlBase::GetLabelText(const wxString& label)
-{
-    // we don't want strip the TABs here, just the mnemonics
-    return wxStripMenuCodes(label, wxStrip_Mnemonics);
-}
-
-/* static */
-wxString wxControlBase::RemoveMnemonics(const wxString& str)
-{
-    // we don't want strip the TABs here, just the mnemonics
-    return wxStripMenuCodes(str, wxStrip_Mnemonics);
-}
-
-/* static */
-wxString wxControlBase::EscapeMnemonics(const wxString& text)
-{
-    wxString label(text);
-    label.Replace("&", "&&");
-    return label;
-}
-
-/* static */
-int wxControlBase::FindAccelIndex(const wxString& label, wxString *labelOnly)
-{
-    // the character following MNEMONIC_PREFIX is the accelerator for this
-    // control unless it is MNEMONIC_PREFIX too - this allows to insert
-    // literal MNEMONIC_PREFIX chars into the label
-    static const wxChar MNEMONIC_PREFIX = wxT('&');
-
-    if ( labelOnly )
-    {
-        labelOnly->Empty();
-        labelOnly->Alloc(label.length());
-    }
-
-    int indexAccel = -1;
-    for ( wxString::const_iterator pc = label.begin(); pc != label.end(); ++pc )
-    {
-        if ( *pc == MNEMONIC_PREFIX )
-        {
-            ++pc; // skip it
-            if ( pc == label.end() )
-                break;
-            else if ( *pc != MNEMONIC_PREFIX )
-            {
-                if ( indexAccel == -1 )
-                {
-                    // remember it (-1 is for MNEMONIC_PREFIX itself
-                    indexAccel = pc - label.begin() - 1;
-                }
-                else
-                {
-                    wxFAIL_MSG(wxT("duplicate accel char in control label"));
-                }
-            }
-        }
-
-        if ( labelOnly )
-        {
-            *labelOnly += *pc;
-        }
-    }
-
-    return indexAccel;
-}
-
-wxBorder wxControlBase::GetDefaultBorder() const
-{
-    return wxBORDER_THEME;
-}
-
-/* static */ wxVisualAttributes
-wxControlBase::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(variant))
-{
-    wxVisualAttributes attrs;
-    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-
-    return attrs;
-}
-
-// ----------------------------------------------------------------------------
-// wxControl markup support
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MARKUP
-
-/* static */
-wxString wxControlBase::RemoveMarkup(const wxString& markup)
-{
-    return wxMarkupParser::Strip(markup);
-}
-
-bool wxControlBase::DoSetLabelMarkup(const wxString& markup)
-{
-    const wxString label = RemoveMarkup(markup);
-    if ( label.empty() && !markup.empty() )
-        return false;
-
-    SetLabel(label);
-
-    return true;
-}
-
-#endif // wxUSE_MARKUP
-
-// ----------------------------------------------------------------------------
-// wxControlBase - ellipsization code
-// ----------------------------------------------------------------------------
-
-#define wxELLIPSE_REPLACEMENT       wxS("...")
-
-namespace
-{
-
-struct EllipsizeCalculator
-{
-    EllipsizeCalculator(const wxString& s, const wxDC& dc,
-                        int maxFinalWidthPx, int replacementWidthPx)
-        : 
-          m_initialCharToRemove(0),
-          m_nCharsToRemove(0),
-          m_outputNeedsUpdate(true),
-          m_str(s),
-          m_dc(dc),
-          m_maxFinalWidthPx(maxFinalWidthPx),
-          m_replacementWidthPx(replacementWidthPx)
-    {
-        m_isOk = dc.GetPartialTextExtents(s, m_charOffsetsPx);
-        wxASSERT( m_charOffsetsPx.GetCount() == s.length() );
-    }
-
-    bool IsOk() const { return m_isOk; }
-
-    bool EllipsizationNotNeeded() const
-    {
-        // NOTE: charOffsetsPx[n] is the width in pixels of the first n characters (with the last one INCLUDED)
-        //       thus charOffsetsPx[len-1] is the total width of the string
-        return m_charOffsetsPx.Last() <= m_maxFinalWidthPx;
-    }
-
-    void Init(size_t initialCharToRemove, size_t nCharsToRemove)
-    {
-        m_initialCharToRemove = initialCharToRemove;
-        m_nCharsToRemove = nCharsToRemove;
-    }
-
-    void RemoveFromEnd()
-    {
-        m_nCharsToRemove++;
-    }
-
-    void RemoveFromStart()
-    {
-        m_initialCharToRemove--;
-        m_nCharsToRemove++;
-    }
-
-    size_t GetFirstRemoved() const { return m_initialCharToRemove; }
-    size_t GetLastRemoved() const { return m_initialCharToRemove + m_nCharsToRemove - 1; }
-
-    const wxString& GetEllipsizedText()
-    {
-        if ( m_outputNeedsUpdate )
-        {
-            wxASSERT(m_initialCharToRemove <= m_str.length() - 1);  // see valid range for initialCharToRemove above
-            wxASSERT(m_nCharsToRemove >= 1 && m_nCharsToRemove <= m_str.length() - m_initialCharToRemove);  // see valid range for nCharsToRemove above
-
-            // erase m_nCharsToRemove characters after m_initialCharToRemove (included);
-            // e.g. if we have the string "foobar" (len = 6)
-            //                               ^
-            //                               \--- m_initialCharToRemove = 2
-            //      and m_nCharsToRemove = 2, then we get "foar"
-            m_output = m_str;
-            m_output.replace(m_initialCharToRemove, m_nCharsToRemove, wxELLIPSE_REPLACEMENT);
-        }
-
-        return m_output;
-    }
-
-    bool IsShortEnough()
-    {
-        if ( m_nCharsToRemove == m_str.length() )
-            return true; // that's the best we could do
-
-        // Width calculation using partial extents is just an inaccurate
-        // estimate: partial extents have sub-pixel precision and are rounded
-        // by GetPartialTextExtents(); replacing part of the string with "..."
-        // may change them too thanks to changes in ligatures, kerning etc.
-        //
-        // The correct algorithm would be to call GetTextExtent() in every step
-        // of ellipsization, but that would be too expensive, especially when
-        // the difference is just a few pixels. So we use partial extents to
-        // estimate string width and only verify it with GetTextExtent() when
-        // it looks good.
-
-        int estimatedWidth = m_replacementWidthPx; // length of "..."
-
-        // length of text before the removed part:
-        if ( m_initialCharToRemove > 0 )
-            estimatedWidth += m_charOffsetsPx[m_initialCharToRemove - 1];
-
-        // length of text after the removed part:
-
-        if ( GetLastRemoved() < m_str.length() )
-           estimatedWidth += m_charOffsetsPx.Last() - m_charOffsetsPx[GetLastRemoved()];
-
-        if ( estimatedWidth > m_maxFinalWidthPx )
-            return false;
-
-        return m_dc.GetTextExtent(GetEllipsizedText()).GetWidth() <= m_maxFinalWidthPx;
-    }
-
-    // calculation state:
-
-    // REMEMBER: indexes inside the string have a valid range of [0;len-1] if not otherwise constrained
-    //           lengths/counts of characters (e.g. nCharsToRemove) have a
-    //           valid range of [0;len] if not otherwise constrained
-    // NOTE: since this point we know we have for sure a non-empty string from which we need
-    //       to remove _at least_ one character (thus nCharsToRemove below is constrained to be >= 1)
-
-    // index of first character to erase, valid range is [0;len-1]:
-    size_t m_initialCharToRemove;
-    // how many chars do we need to erase? valid range is [0;len-m_initialCharToRemove]
-    size_t m_nCharsToRemove;
-
-    wxString m_output;
-    bool m_outputNeedsUpdate;
-
-    // inputs:
-    wxString m_str;
-    const wxDC& m_dc;
-    int m_maxFinalWidthPx;
-    int m_replacementWidthPx;
-    wxArrayInt m_charOffsetsPx;
-
-    bool m_isOk;
-};
-
-} // anonymous namespace
-
-/* static and protected */
-wxString wxControlBase::DoEllipsizeSingleLine(const wxString& curLine, const wxDC& dc,
-                                              wxEllipsizeMode mode, int maxFinalWidthPx,
-                                              int replacementWidthPx)
-{
-    wxASSERT_MSG(replacementWidthPx > 0, "Invalid parameters");
-    wxASSERT_LEVEL_2_MSG(!curLine.Contains('\n'),
-                         "Use Ellipsize() instead!");
-
-    wxASSERT_MSG( mode != wxELLIPSIZE_NONE, "shouldn't be called at all then" );
-
-    // NOTE: this function assumes that any mnemonic/tab character has already
-    //       been handled if it was necessary to handle them (see Ellipsize())
-
-    if (maxFinalWidthPx <= 0)
-        return wxEmptyString;
-
-    size_t len = curLine.length();
-    if (len <= 1 )
-        return curLine;
-
-    EllipsizeCalculator calc(curLine, dc, maxFinalWidthPx, replacementWidthPx);
-
-    if ( !calc.IsOk() )
-        return curLine;
-
-    if ( calc.EllipsizationNotNeeded() )
-        return curLine;
-
-    // let's compute the range of characters to remove depending on the ellipsization mode:
-    switch (mode)
-    {
-        case wxELLIPSIZE_START:
-            {
-                calc.Init(0, 1);
-                while ( !calc.IsShortEnough() )
-                    calc.RemoveFromEnd();
-
-                // always show at least one character of the string:
-                if ( calc.m_nCharsToRemove == len )
-                    return wxString(wxELLIPSE_REPLACEMENT) + curLine[len-1];
-
-                break;
-            }
-
-        case wxELLIPSIZE_MIDDLE:
-            {
-                // NOTE: the following piece of code works also when len == 1
-
-                // start the removal process from the middle of the string
-                // i.e. separe the string in three parts:
-                // - the first one to preserve, valid range [0;initialCharToRemove-1] or the empty range if initialCharToRemove==0
-                // - the second one to remove, valid range [initialCharToRemove;endCharToRemove]
-                // - the third one to preserve, valid range [endCharToRemove+1;len-1] or the empty range if endCharToRemove==len-1
-                // NOTE: empty range != range [0;0] since the range [0;0] contains 1 character (the zero-th one)!
-
-                calc.Init(len/2, 0);
-
-                bool removeFromStart = true;
-
-                while ( !calc.IsShortEnough() )
-                {
-                    const bool canRemoveFromStart = calc.GetFirstRemoved() > 0;
-                    const bool canRemoveFromEnd = calc.GetLastRemoved() < len - 1;
-
-                    if ( !canRemoveFromStart && !canRemoveFromEnd )
-                    {
-                        // we need to remove all the characters of the string!
-                        break;
-                    }
-
-                    // Remove from the beginning in even steps and from the end
-                    // in odd steps, unless we exhausted one side already:
-                    removeFromStart = !removeFromStart;
-                    if ( removeFromStart && !canRemoveFromStart )
-                        removeFromStart = false;
-                    else if ( !removeFromStart && !canRemoveFromEnd )
-                        removeFromStart = true;
-
-                    if ( removeFromStart )
-                        calc.RemoveFromStart();
-                    else
-                        calc.RemoveFromEnd();
-                }
-
-                // Always show at least one character of the string.
-                // Additionally, if there's only one character left, prefer
-                // "a..." to "...a":
-                if ( calc.m_nCharsToRemove == len ||
-                     calc.m_nCharsToRemove == len - 1 )
-                {
-                    return curLine[0] + wxString(wxELLIPSE_REPLACEMENT);
-                }
-            }
-            break;
-
-        case wxELLIPSIZE_END:
-            {
-                calc.Init(len - 1, 1);
-                while ( !calc.IsShortEnough() )
-                    calc.RemoveFromStart();
-
-                // always show at least one character of the string:
-                if ( calc.m_nCharsToRemove == len )
-                    return curLine[0] + wxString(wxELLIPSE_REPLACEMENT);
-
-                break;
-            }
-
-        case wxELLIPSIZE_NONE:
-        default:
-            wxFAIL_MSG("invalid ellipsize mode");
-            return curLine;
-    }
-
-    return calc.GetEllipsizedText();
-}
-
-/* static */
-wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc,
-                                  wxEllipsizeMode mode, int maxFinalWidth,
-                                  int flags)
-{
-    wxString ret;
-
-    // these cannot be cached between different Ellipsize() calls as they can
-    // change because of e.g. a font change; however we calculate them only once
-    // when ellipsizing multiline labels:
-    int replacementWidth = dc.GetTextExtent(wxELLIPSE_REPLACEMENT).GetWidth();
-
-    // NB: we must handle correctly labels with newlines:
-    wxString curLine;
-    for ( wxString::const_iterator pc = label.begin(); ; ++pc )
-    {
-        if ( pc == label.end() || *pc == wxS('\n') )
-        {
-            curLine = DoEllipsizeSingleLine(curLine, dc, mode, maxFinalWidth,
-                                            replacementWidth);
-
-            // add this (ellipsized) row to the rest of the label
-            ret << curLine;
-            if ( pc == label.end() )
-            {
-                // NOTE: this is the return which always exits the function
-                return ret;
-            }
-            else
-            {
-                ret << *pc;
-                curLine.clear();
-            }
-        }
-        // we need to remove mnemonics from the label for correct calculations
-        else if ( *pc == wxS('&') && (flags & wxELLIPSIZE_FLAGS_PROCESS_MNEMONICS) )
-        {
-            // pc+1 is safe: at worst we'll be at end()
-            wxString::const_iterator next = pc + 1;
-            if ( next != label.end() && *next == wxS('&') )
-                curLine += wxS('&');          // && becomes &
-            //else: remove this ampersand
-        }
-        // we need also to expand tabs to properly calc their size
-        else if ( *pc == wxS('\t') && (flags & wxELLIPSIZE_FLAGS_EXPAND_TABS) )
-        {
-            // Windows natively expands the TABs to 6 spaces. Do the same:
-            curLine += wxS("      ");
-        }
-        else
-        {
-            curLine += *pc;
-        }
-    }
-
-    // this return would generate a
-    //  warning C4702: unreachable code
-    // with MSVC since the function always exits from inside the loop
-    //return ret;
-}
-
-
-
-// ----------------------------------------------------------------------------
-// wxStaticBitmap
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STATBMP
-
-wxStaticBitmapBase::~wxStaticBitmapBase()
-{
-    // this destructor is required for Darwin
-}
-
-wxSize wxStaticBitmapBase::DoGetBestSize() const
-{
-    wxSize best;
-    wxBitmap bmp = GetBitmap();
-    if ( bmp.IsOk() )
-        best = wxSize(bmp.GetWidth(), bmp.GetHeight());
-    else
-        // this is completely arbitrary
-        best = wxSize(16, 16);
-    CacheBestSize(best);
-    return best;
-}
-
-#endif // wxUSE_STATBMP
-
-#endif // wxUSE_CONTROLS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/ctrlcmn.cpp
+// Purpose:     wxControl common interface
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     26.07.99
+// RCS-ID:      $Id: ctrlcmn.cpp 40329 2006-07-25 18:40:04Z VZ $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_CONTROLS
+
+#include "wx/control.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/radiobut.h"
+    #include "wx/statbmp.h"
+    #include "wx/bitmap.h"
+    #include "wx/utils.h"       // for wxStripMenuCodes()
+#endif
+
+const wxChar wxControlNameStr[] = wxT("control");
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+wxControlBase::~wxControlBase()
+{
+    // this destructor is required for Darwin
+}
+
+bool wxControlBase::Create(wxWindow *parent,
+                           wxWindowID id,
+                           const wxPoint &pos,
+                           const wxSize &size,
+                           long style,
+                           const wxValidator& wxVALIDATOR_PARAM(validator),
+                           const wxString &name)
+{
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+
+#if wxUSE_VALIDATORS
+    if ( ret )
+        SetValidator(validator);
+#endif // wxUSE_VALIDATORS
+
+    return ret;
+}
+
+bool wxControlBase::CreateControl(wxWindowBase *parent,
+                                  wxWindowID id,
+                                  const wxPoint& pos,
+                                  const wxSize& size,
+                                  long style,
+                                  const wxValidator& validator,
+                                  const wxString& name)
+{
+    // even if it's possible to create controls without parents in some port,
+    // it should surely be discouraged because it doesn't work at all under
+    // Windows
+    wxCHECK_MSG( parent, false, wxT("all controls must have parents") );
+
+    if ( !CreateBase(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    parent->AddChild(this);
+
+    return true;
+}
+
+/* static */
+wxString wxControlBase::GetLabelText(const wxString& label)
+{
+    // we don't want strip the TABs here, just the mnemonics
+    return wxStripMenuCodes(label, wxStrip_Mnemonics);
+}
+
+void wxControlBase::Command(wxCommandEvent& event)
+{
+    (void)GetEventHandler()->ProcessEvent(event);
+}
+
+void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
+{
+    event.SetEventObject((wxControlBase *)this);    // const_cast
+
+    // event.SetId(GetId()); -- this is usuall done in the event ctor
+
+    switch ( m_clientDataType )
+    {
+        case wxClientData_Void:
+            event.SetClientData(GetClientData());
+            break;
+
+        case wxClientData_Object:
+            event.SetClientObject(GetClientObject());
+            break;
+
+        case wxClientData_None:
+            // nothing to do
+            ;
+    }
+}
+
+
+void wxControlBase::SetLabel( const wxString &label )
+{
+    InvalidateBestSize();
+    wxWindow::SetLabel(label);
+}
+
+bool wxControlBase::SetFont(const wxFont& font)
+{
+    InvalidateBestSize();
+    return wxWindow::SetFont(font);
+}
+
+// wxControl-specific processing after processing the update event
+void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
+{
+    // call inherited
+    wxWindowBase::DoUpdateWindowUI(event);
+
+    // update label
+    if ( event.GetSetText() )
+    {
+        if ( event.GetText() != GetLabel() )
+            SetLabel(event.GetText());
+    }
+
+    // Unfortunately we don't yet have common base class for
+    // wxRadioButton, so we handle updates of radiobuttons here.
+    // TODO: If once wxRadioButtonBase will exist, move this code there.
+#if wxUSE_RADIOBTN
+    if ( event.GetSetChecked() )
+    {
+        wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton);
+        if ( radiobtn )
+            radiobtn->SetValue(event.GetChecked());
+    }
+#endif // wxUSE_RADIOBTN
+}
+
+// ----------------------------------------------------------------------------
+// wxStaticBitmap
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STATBMP
+
+wxStaticBitmapBase::~wxStaticBitmapBase()
+{
+    // this destructor is required for Darwin
+}
+
+wxSize wxStaticBitmapBase::DoGetBestSize() const
+{
+    wxSize best;
+    wxBitmap bmp = GetBitmap();
+    if ( bmp.Ok() )
+        best = wxSize(bmp.GetWidth(), bmp.GetHeight());
+    else
+        // this is completely arbitrary
+        best = wxSize(16, 16);
+    CacheBestSize(best);
+    return best;
+}
+
+#endif // wxUSE_STATBMP
+
+#endif // wxUSE_CONTROLS
diff --git a/Source/3rd Party/wx/src/common/ctrlsub.cpp b/Source/3rd Party/wx/src/common/ctrlsub.cpp
index 234787fdd..387b174cc 100644
--- a/Source/3rd Party/wx/src/common/ctrlsub.cpp	
+++ b/Source/3rd Party/wx/src/common/ctrlsub.cpp	
@@ -1,295 +1,197 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/ctrlsub.cpp
-// Purpose:     wxItemContainer implementation
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     22.10.99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_CONTROLS
-
-#ifndef WX_PRECOMP
-    #include "wx/ctrlsub.h"
-    #include "wx/arrstr.h"
-#endif
-
-IMPLEMENT_ABSTRACT_CLASS(wxControlWithItems, wxControl)
-
-// ============================================================================
-// wxItemContainerImmutable implementation
-// ============================================================================
-
-wxItemContainerImmutable::~wxItemContainerImmutable()
-{
-    // this destructor is required for Darwin
-}
-
-// ----------------------------------------------------------------------------
-// selection
-// ----------------------------------------------------------------------------
-
-wxString wxItemContainerImmutable::GetStringSelection() const
-{
-    wxString s;
-
-    int sel = GetSelection();
-    if ( sel != wxNOT_FOUND )
-        s = GetString((unsigned int)sel);
-
-    return s;
-}
-
-bool wxItemContainerImmutable::SetStringSelection(const wxString& s)
-{
-    const int sel = FindString(s);
-    if ( sel == wxNOT_FOUND )
-        return false;
-
-    SetSelection(sel);
-
-    return true;
-}
-
-wxArrayString wxItemContainerImmutable::GetStrings() const
-{
-    wxArrayString result;
-
-    const unsigned int count = GetCount();
-    result.Alloc(count);
-    for ( unsigned int n = 0; n < count; n++ )
-        result.Add(GetString(n));
-
-    return result;
-}
-
-// ============================================================================
-// wxItemContainer implementation
-// ============================================================================
-
-wxItemContainer::~wxItemContainer()
-{
-    // this destructor is required for Darwin
-}
-
-// ----------------------------------------------------------------------------
-// deleting items
-// ----------------------------------------------------------------------------
-
-void wxItemContainer::Clear()
-{
-    if ( HasClientObjectData() )
-    {
-        const unsigned count = GetCount();
-        for ( unsigned i = 0; i < count; ++i )
-            ResetItemClientObject(i);
-    }
-
-    SetClientDataType(wxClientData_None);
-
-    DoClear();
-}
-
-void wxItemContainer::Delete(unsigned int pos)
-{
-    wxCHECK_RET( pos < GetCount(), wxT("invalid index") );
-
-    if ( HasClientObjectData() )
-        ResetItemClientObject(pos);
-
-    DoDeleteOneItem(pos);
-
-    if ( IsEmpty() )
-    {
-        SetClientDataType(wxClientData_None);
-    }
-}
-
-// ----------------------------------------------------------------------------
-//
-// ----------------------------------------------------------------------------
-
-int wxItemContainer::DoInsertItemsInLoop(const wxArrayStringsAdapter& items,
-                                         unsigned int pos,
-                                         void **clientData,
-                                         wxClientDataType type)
-{
-    int n = wxNOT_FOUND;
-
-    const unsigned int count = items.GetCount();
-    for ( unsigned int i = 0; i < count; ++i )
-    {
-        n = DoInsertOneItem(items[i], pos++);
-        if ( n == wxNOT_FOUND )
-            break;
-
-        AssignNewItemClientData(n, clientData, i, type);
-    }
-
-    return n;
-}
-
-int
-wxItemContainer::DoInsertOneItem(const wxString& WXUNUSED(item),
-                                 unsigned int WXUNUSED(pos))
-{
-    wxFAIL_MSG( wxT("Must be overridden if DoInsertItemsInLoop() is used") );
-
-    return wxNOT_FOUND;
-}
-
-
-// ----------------------------------------------------------------------------
-// client data
-// ----------------------------------------------------------------------------
-
-void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data)
-{
-    wxASSERT_MSG( !HasClientUntypedData(),
-                  wxT("can't have both object and void client data") );
-
-    wxCHECK_RET( IsValid(n), "Invalid index passed to SetClientObject()" );
-
-    if ( HasClientObjectData() )
-    {
-        wxClientData * clientDataOld
-            = static_cast<wxClientData *>(DoGetItemClientData(n));
-        if ( clientDataOld )
-            delete clientDataOld;
-    }
-    else // didn't have any client data so far
-    {
-        // now we have object client data
-        DoInitItemClientData();
-
-        SetClientDataType(wxClientData_Object);
-    }
-
-    DoSetItemClientData(n, data);
-}
-
-wxClientData *wxItemContainer::GetClientObject(unsigned int n) const
-{
-    wxCHECK_MSG( HasClientObjectData(), NULL,
-                  wxT("this window doesn't have object client data") );
-
-    wxCHECK_MSG( IsValid(n), NULL,
-                 "Invalid index passed to GetClientObject()" );
-
-    return static_cast<wxClientData *>(DoGetItemClientData(n));
-}
-
-wxClientData *wxItemContainer::DetachClientObject(unsigned int n)
-{
-    wxClientData * const data = GetClientObject(n);
-    if ( data )
-    {
-        // reset the pointer as we don't own it any more
-        DoSetItemClientData(n, NULL);
-    }
-
-    return data;
-}
-
-void wxItemContainer::SetClientData(unsigned int n, void *data)
-{
-    if ( !HasClientData() )
-    {
-        DoInitItemClientData();
-        SetClientDataType(wxClientData_Void);
-    }
-
-    wxASSERT_MSG( HasClientUntypedData(),
-                  wxT("can't have both object and void client data") );
-
-    wxCHECK_RET( IsValid(n), "Invalid index passed to SetClientData()" );
-
-    DoSetItemClientData(n, data);
-}
-
-void *wxItemContainer::GetClientData(unsigned int n) const
-{
-    wxCHECK_MSG( HasClientUntypedData(), NULL,
-                  wxT("this window doesn't have void client data") );
-
-    wxCHECK_MSG( IsValid(n), NULL,
-                 "Invalid index passed to GetClientData()" );
-
-    return DoGetItemClientData(n);
-}
-
-void wxItemContainer::AssignNewItemClientData(unsigned int pos,
-                                              void **clientData,
-                                              unsigned int n,
-                                              wxClientDataType type)
-{
-    switch ( type )
-    {
-        case wxClientData_Object:
-            SetClientObject
-            (
-                pos,
-                (reinterpret_cast<wxClientData **>(clientData))[n]
-            );
-            break;
-
-        case wxClientData_Void:
-            SetClientData(pos, clientData[n]);
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("unknown client data type") );
-            // fall through
-
-        case wxClientData_None:
-            // nothing to do
-            break;
-    }
-}
-
-void wxItemContainer::ResetItemClientObject(unsigned int n)
-{
-    wxClientData * const data = GetClientObject(n);
-    if ( data )
-    {
-        delete data;
-        DoSetItemClientData(n, NULL);
-    }
-}
-
-// ============================================================================
-// wxControlWithItems implementation
-// ============================================================================
-
-void
-wxControlWithItemsBase::InitCommandEventWithItems(wxCommandEvent& event, int n)
-{
-    InitCommandEvent(event);
-
-    if ( n != wxNOT_FOUND )
-    {
-        if ( HasClientObjectData() )
-            event.SetClientObject(GetClientObject(n));
-        else if ( HasClientUntypedData() )
-            event.SetClientData(GetClientData(n));
-    }
-}
-
-#endif // wxUSE_CONTROLS
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/ctrlsub.cpp
+// Purpose:     wxItemContainer implementation
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     22.10.99
+// RCS-ID:      $Id: ctrlsub.cpp 39077 2006-05-06 19:05:50Z VZ $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_CONTROLS
+
+#ifndef WX_PRECOMP
+    #include "wx/ctrlsub.h"
+    #include "wx/arrstr.h"
+#endif
+
+IMPLEMENT_ABSTRACT_CLASS(wxControlWithItems, wxControl)
+
+// ============================================================================
+// wxItemContainerImmutable implementation
+// ============================================================================
+
+wxItemContainerImmutable::~wxItemContainerImmutable()
+{
+    // this destructor is required for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------
+
+wxString wxItemContainerImmutable::GetStringSelection() const
+{
+    wxString s;
+
+    int sel = GetSelection();
+    if ( sel != wxNOT_FOUND )
+        s = GetString((unsigned int)sel);
+
+    return s;
+}
+
+bool wxItemContainerImmutable::SetStringSelection(const wxString& s)
+{
+    const int sel = FindString(s);
+    if ( sel == wxNOT_FOUND )
+        return false;
+
+    SetSelection(sel);
+
+    return true;
+}
+
+wxArrayString wxItemContainerImmutable::GetStrings() const
+{
+    wxArrayString result;
+
+    const unsigned int count = GetCount();
+    result.Alloc(count);
+    for ( unsigned int n = 0; n < count; n++ )
+        result.Add(GetString(n));
+
+    return result;
+}
+
+// ============================================================================
+// wxItemContainer implementation
+// ============================================================================
+
+wxItemContainer::~wxItemContainer()
+{
+    // this destructor is required for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// appending items
+// ----------------------------------------------------------------------------
+
+void wxItemContainer::Append(const wxArrayString& strings)
+{
+    const size_t count = strings.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        Append(strings[n]);
+    }
+}
+
+int wxItemContainer::Insert(const wxString& item, unsigned int pos, void *clientData)
+{
+    int n = DoInsert(item, pos);
+    if ( n != wxNOT_FOUND )
+        SetClientData(n, clientData);
+
+    return n;
+}
+
+int wxItemContainer::Insert(const wxString& item, unsigned int pos, wxClientData *clientData)
+{
+    int n = DoInsert(item, pos);
+    if ( n != wxNOT_FOUND )
+        SetClientObject(n, clientData);
+
+    return n;
+}
+
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+void wxItemContainer::SetClientObject(unsigned int n, wxClientData *data)
+{
+    wxASSERT_MSG( m_clientDataItemsType != wxClientData_Void,
+                  wxT("can't have both object and void client data") );
+
+    // when we call SetClientObject() for the first time, m_clientDataItemsType
+    // is still wxClientData_None and so calling DoGetItemClientObject() would
+    // fail (in addition to being useless) - don't do it
+    if ( m_clientDataItemsType == wxClientData_Object )
+    {
+        wxClientData *clientDataOld = DoGetItemClientObject(n);
+        if ( clientDataOld )
+            delete clientDataOld;
+    }
+    else // m_clientDataItemsType == wxClientData_None
+    {
+        // now we have object client data
+        m_clientDataItemsType = wxClientData_Object;
+    }
+
+    DoSetItemClientObject(n, data);
+}
+
+wxClientData *wxItemContainer::GetClientObject(unsigned int n) const
+{
+    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Object,
+                  wxT("this window doesn't have object client data") );
+
+    return DoGetItemClientObject(n);
+}
+
+void wxItemContainer::SetClientData(unsigned int n, void *data)
+{
+    wxASSERT_MSG( m_clientDataItemsType != wxClientData_Object,
+                  wxT("can't have both object and void client data") );
+
+    DoSetItemClientData(n, data);
+    m_clientDataItemsType = wxClientData_Void;
+}
+
+void *wxItemContainer::GetClientData(unsigned int n) const
+{
+    wxASSERT_MSG( m_clientDataItemsType == wxClientData_Void,
+                  wxT("this window doesn't have void client data") );
+
+    return DoGetItemClientData(n);
+}
+
+// ============================================================================
+// wxControlWithItems implementation
+// ============================================================================
+
+void wxControlWithItems::InitCommandEventWithItems(wxCommandEvent& event, int n)
+{
+    InitCommandEvent(event);
+
+    if ( n != wxNOT_FOUND )
+    {
+        if ( HasClientObjectData() )
+            event.SetClientObject(GetClientObject(n));
+        else if ( HasClientUntypedData() )
+            event.SetClientData(GetClientData(n));
+    }
+}
+
+wxControlWithItems::~wxControlWithItems()
+{
+    // this destructor is required for Darwin
+}
+
+#endif // wxUSE_CONTROLS
diff --git a/Source/3rd Party/wx/src/common/datacmn.cpp b/Source/3rd Party/wx/src/common/datacmn.cpp
new file mode 100644
index 000000000..e82b5ead5
--- /dev/null
+++ b/Source/3rd Party/wx/src/common/datacmn.cpp	
@@ -0,0 +1,83 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        common/datacmn.cpp
+// Purpose:     contains definitions of various global wxWidgets variables
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     10.04.03 (from src/*/data.cpp files)
+// RCS-ID:      $Id: datacmn.cpp 43874 2006-12-09 14:52:59Z VZ $
+// Copyright:   (c) 1997-2002 wxWidgets development team
+// License:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif // WX_PRECOMP
+
+#include "wx/accel.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// 'Null' objects
+#if wxUSE_ACCEL
+wxAcceleratorTable wxNullAcceleratorTable;
+#endif // wxUSE_ACCEL
+
+// Default window names
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[] = wxT("button");
+extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[] = wxT("check");
+extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[] = wxT("comboBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[] = wxT("dialog");
+extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[] = wxT("frame");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBoxNameStr[] = wxT("groupBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[] = wxT("listBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticLineNameStr[] = wxT("staticLine");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticTextNameStr[] = wxT("staticText");
+extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[] = wxT("staticBitmap");
+extern WXDLLEXPORT_DATA(const wxChar) wxNotebookNameStr[] = wxT("notebook");
+extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[] = wxT("panel");
+extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[] = wxT("radioBox");
+extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[] = wxT("radioButton");
+extern WXDLLEXPORT_DATA(const wxChar) wxBitmapRadioButtonNameStr[] = wxT("radioButton");
+extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[] = wxT("scrollBar");
+extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[] = wxT("slider");
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[] = wxT("status_line");
+extern WXDLLEXPORT_DATA(const wxChar) wxTextCtrlNameStr[] = wxT("text");
+extern WXDLLEXPORT_DATA(const wxChar) wxTreeCtrlNameStr[] = wxT("treeCtrl");
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[] = wxT("toolbar");
+
+// Default messages
+extern WXDLLEXPORT_DATA(const wxChar) wxMessageBoxCaptionStr[] = wxT("Message");
+extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorPromptStr[] = wxT("Select a file");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[] = wxT("Select a directory");
+
+// Other default strings
+extern WXDLLEXPORT_DATA(const wxChar) wxFileSelectorDefaultWildcardStr[] =
+#if defined(__WXMSW__) || defined(__OS2__)
+    wxT("*.*")
+#else // Unix/Mac
+    wxT("*")
+#endif
+    ;
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[] = wxT("wxDirCtrl");
+extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[] = wxT("/");
+
+extern WXDLLEXPORT_DATA(const wxChar) wxFileDialogNameStr[] = wxT("filedlg");
+#if defined(__WXMSW__) || defined(__OS2__)
+WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
+#endif
diff --git a/Source/3rd Party/wx/src/common/datetime.cpp b/Source/3rd Party/wx/src/common/datetime.cpp
index 80acdcb03..30db343e8 100644
--- a/Source/3rd Party/wx/src/common/datetime.cpp	
+++ b/Source/3rd Party/wx/src/common/datetime.cpp	
@@ -1,2251 +1,4615 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/datetime.cpp
-// Purpose:     implementation of time/date related classes
-//              (for formatting&parsing see datetimefmt.cpp)
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     11.05.99
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-//              parts of code taken from sndcal library by Scott E. Lee:
-//
-//               Copyright 1993-1995, Scott E. Lee, all rights reserved.
-//               Permission granted to use, copy, modify, distribute and sell
-//               so long as the above copyright and this permission statement
-//               are retained in all copies.
-//
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-/*
- * Implementation notes:
- *
- * 1. the time is stored as a 64bit integer containing the signed number of
- *    milliseconds since Jan 1. 1970 (the Unix Epoch) - so it is always
- *    expressed in GMT.
- *
- * 2. the range is thus something about 580 million years, but due to current
- *    algorithms limitations, only dates from Nov 24, 4714BC are handled
- *
- * 3. standard ANSI C functions are used to do time calculations whenever
- *    possible, i.e. when the date is in the range Jan 1, 1970 to 2038
- *
- * 4. otherwise, the calculations are done by converting the date to/from JDN
- *    first (the range limitation mentioned above comes from here: the
- *    algorithm used by Scott E. Lee's code only works for positive JDNs, more
- *    or less)
- *
- * 5. the object constructed for the given DD-MM-YYYY HH:MM:SS corresponds to
- *    this moment in local time and may be converted to the object
- *    corresponding to the same date/time in another time zone by using
- *    ToTimezone()
- *
- * 6. the conversions to the current (or any other) timezone are done when the
- *    internal time representation is converted to the broken-down one in
- *    wxDateTime::Tm.
- */
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
-
-#ifndef WX_PRECOMP
-    #ifdef __WINDOWS__
-        #include "wx/msw/wrapwin.h"
-    #endif
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
-    #include "wx/module.h"
-    #include "wx/crt.h"
-#endif // WX_PRECOMP
-
-#include "wx/thread.h"
-#include "wx/time.h"
-#include "wx/tokenzr.h"
-
-#include <ctype.h>
-
-#ifdef __WINDOWS__
-    #include <winnls.h>
-    #ifndef __WXWINCE__
-        #include <locale.h>
-    #endif
-#endif
-
-#include "wx/datetime.h"
-
-// ----------------------------------------------------------------------------
-// wxXTI
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-
-template<> void wxStringReadValue(const wxString &s , wxDateTime &data )
-{
-    data.ParseFormat(s,"%Y-%m-%d %H:%M:%S", NULL);
-}
-
-template<> void wxStringWriteValue(wxString &s , const wxDateTime &data )
-{
-    s = data.Format("%Y-%m-%d %H:%M:%S");
-}
-
-wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringConverter<wxDateTime>)
-
-#endif // wxUSE_EXTENDED_RTTI
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// debugging helper: just a convenient replacement of wxCHECK()
-#define wxDATETIME_CHECK(expr, msg) \
-    wxCHECK2_MSG(expr, *this = wxInvalidDateTime; return *this, msg)
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class wxDateTimeHolidaysModule : public wxModule
-{
-public:
-    virtual bool OnInit()
-    {
-        wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
-
-        return true;
-    }
-
-    virtual void OnExit()
-    {
-        wxDateTimeHolidayAuthority::ClearAllAuthorities();
-        wxDateTimeHolidayAuthority::ms_authorities.clear();
-    }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxDateTimeHolidaysModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxDateTimeHolidaysModule, wxModule)
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// some trivial ones
-static const int MONTHS_IN_YEAR = 12;
-
-static const int SEC_PER_MIN = 60;
-
-static const int MIN_PER_HOUR = 60;
-
-static const long SECONDS_PER_DAY = 86400l;
-
-static const int DAYS_PER_WEEK = 7;
-
-static const long MILLISECONDS_PER_DAY = 86400000l;
-
-// this is the integral part of JDN of the midnight of Jan 1, 1970
-// (i.e. JDN(Jan 1, 1970) = 2440587.5)
-static const long EPOCH_JDN = 2440587l;
-
-// these values are only used in asserts so don't define them if asserts are
-// disabled to avoid warnings about unused static variables
-#if wxDEBUG_LEVEL
-// the date of JDN -0.5 (as we don't work with fractional parts, this is the
-// reference date for us) is Nov 24, 4714BC
-static const int JDN_0_YEAR = -4713;
-static const int JDN_0_MONTH = wxDateTime::Nov;
-static const int JDN_0_DAY = 24;
-#endif // wxDEBUG_LEVEL
-
-// the constants used for JDN calculations
-static const long JDN_OFFSET         = 32046l;
-static const long DAYS_PER_5_MONTHS  = 153l;
-static const long DAYS_PER_4_YEARS   = 1461l;
-static const long DAYS_PER_400_YEARS = 146097l;
-
-// this array contains the cumulated number of days in all previous months for
-// normal and leap years
-static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] =
-{
-    { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 },
-    { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }
-};
-
-const long wxDateTime::TIME_T_FACTOR = 1000l;
-
-// ----------------------------------------------------------------------------
-// global data
-// ----------------------------------------------------------------------------
-
-const char wxDefaultDateTimeFormat[] = "%c";
-const char wxDefaultTimeSpanFormat[] = "%H:%M:%S";
-
-// in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to
-// indicate an invalid wxDateTime object
-const wxDateTime wxDefaultDateTime;
-
-wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-// debugger helper: this function can be called from a debugger to show what
-// the date really is
-extern const char *wxDumpDate(const wxDateTime* dt)
-{
-    static char buf[128];
-
-    wxString fmt(dt->Format("%Y-%m-%d (%a) %H:%M:%S"));
-    wxStrlcpy(buf,
-              (fmt + " (" + dt->GetValue().ToString() + " ticks)").ToAscii(),
-              WXSIZEOF(buf));
-
-    return buf;
-}
-
-// get the number of days in the given month of the given year
-static inline
-wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
-{
-    // the number of days in month in Julian/Gregorian calendar: the first line
-    // is for normal years, the second one is for the leap ones
-    static const wxDateTime::wxDateTime_t daysInMonth[2][MONTHS_IN_YEAR] =
-    {
-        { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-        { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-    };
-
-    return daysInMonth[wxDateTime::IsLeapYear(year)][month];
-}
-
-// return the integral part of the JDN for the midnight of the given date (to
-// get the real JDN you need to add 0.5, this is, in fact, JDN of the
-// noon of the previous day)
-static long GetTruncatedJDN(wxDateTime::wxDateTime_t day,
-                            wxDateTime::Month mon,
-                            int year)
-{
-    // CREDIT: code below is by Scott E. Lee (but bugs are mine)
-
-    // check the date validity
-    wxASSERT_MSG(
-      (year > JDN_0_YEAR) ||
-      ((year == JDN_0_YEAR) && (mon > JDN_0_MONTH)) ||
-      ((year == JDN_0_YEAR) && (mon == JDN_0_MONTH) && (day >= JDN_0_DAY)),
-      wxT("date out of range - can't convert to JDN")
-                );
-
-    // make the year positive to avoid problems with negative numbers division
-    year += 4800;
-
-    // months are counted from March here
-    int month;
-    if ( mon >= wxDateTime::Mar )
-    {
-        month = mon - 2;
-    }
-    else
-    {
-        month = mon + 10;
-        year--;
-    }
-
-    // now we can simply add all the contributions together
-    return ((year / 100) * DAYS_PER_400_YEARS) / 4
-            + ((year % 100) * DAYS_PER_4_YEARS) / 4
-            + (month * DAYS_PER_5_MONTHS + 2) / 5
-            + day
-            - JDN_OFFSET;
-}
-
-#ifdef wxHAS_STRFTIME
-
-// this function is a wrapper around strftime(3) adding error checking
-// NOTE: not static because used by datetimefmt.cpp
-wxString CallStrftime(const wxString& format, const tm* tm)
-{
-    wxChar buf[4096];
-    // Create temp wxString here to work around mingw/cygwin bug 1046059
-    // http://sourceforge.net/tracker/?func=detail&atid=102435&aid=1046059&group_id=2435
-    wxString s;
-
-    if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) )
-    {
-        // There is one special case in which strftime() can return 0 without
-        // indicating an error: "%p" may give empty string depending on the
-        // locale, so check for it explicitly. Apparently it's really the only
-        // exception.
-        if ( format != wxS("%p") )
-        {
-            // if the format is valid, buffer must be too small?
-            wxFAIL_MSG(wxT("strftime() failed"));
-        }
-
-        buf[0] = '\0';
-    }
-
-    s = buf;
-    return s;
-}
-
-#endif // wxHAS_STRFTIME
-
-// if year and/or month have invalid values, replace them with the current ones
-static void ReplaceDefaultYearMonthWithCurrent(int *year,
-                                               wxDateTime::Month *month)
-{
-    struct tm *tmNow = NULL;
-    struct tm tmstruct;
-
-    if ( *year == wxDateTime::Inv_Year )
-    {
-        tmNow = wxDateTime::GetTmNow(&tmstruct);
-
-        *year = 1900 + tmNow->tm_year;
-    }
-
-    if ( *month == wxDateTime::Inv_Month )
-    {
-        if ( !tmNow )
-            tmNow = wxDateTime::GetTmNow(&tmstruct);
-
-        *month = (wxDateTime::Month)tmNow->tm_mon;
-    }
-}
-
-// fill the struct tm with default values
-// NOTE: not static because used by datetimefmt.cpp
-void InitTm(struct tm& tm)
-{
-    // struct tm may have etxra fields (undocumented and with unportable
-    // names) which, nevertheless, must be set to 0
-    memset(&tm, 0, sizeof(struct tm));
-
-    tm.tm_mday = 1;   // mday 0 is invalid
-    tm.tm_year = 76;  // any valid year
-    tm.tm_isdst = -1; // auto determine
-}
-
-// ============================================================================
-// implementation of wxDateTime
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// struct Tm
-// ----------------------------------------------------------------------------
-
-wxDateTime::Tm::Tm()
-{
-    year = (wxDateTime_t)wxDateTime::Inv_Year;
-    mon = wxDateTime::Inv_Month;
-    mday =
-    yday = 0;
-    hour =
-    min =
-    sec =
-    msec = 0;
-    wday = wxDateTime::Inv_WeekDay;
-}
-
-wxDateTime::Tm::Tm(const struct tm& tm, const TimeZone& tz)
-              : m_tz(tz)
-{
-    msec = 0;
-    sec = (wxDateTime::wxDateTime_t)tm.tm_sec;
-    min = (wxDateTime::wxDateTime_t)tm.tm_min;
-    hour = (wxDateTime::wxDateTime_t)tm.tm_hour;
-    mday = (wxDateTime::wxDateTime_t)tm.tm_mday;
-    mon = (wxDateTime::Month)tm.tm_mon;
-    year = 1900 + tm.tm_year;
-    wday = (wxDateTime::wxDateTime_t)tm.tm_wday;
-    yday = (wxDateTime::wxDateTime_t)tm.tm_yday;
-}
-
-bool wxDateTime::Tm::IsValid() const
-{
-    if ( mon == wxDateTime::Inv_Month )
-        return false;
-
-    // We need to check this here to avoid crashing in GetNumOfDaysInMonth() if
-    // somebody passed us "(wxDateTime::Month)1000".
-    wxCHECK_MSG( mon >= wxDateTime::Jan && mon < wxDateTime::Inv_Month, false,
-                 wxS("Invalid month value") );
-
-    // we allow for the leap seconds, although we don't use them (yet)
-    return (year != wxDateTime::Inv_Year) && (mon != wxDateTime::Inv_Month) &&
-           (mday > 0 && mday <= GetNumOfDaysInMonth(year, mon)) &&
-           (hour < 24) && (min < 60) && (sec < 62) && (msec < 1000);
-}
-
-void wxDateTime::Tm::ComputeWeekDay()
-{
-    // compute the week day from day/month/year: we use the dumbest algorithm
-    // possible: just compute our JDN and then use the (simple to derive)
-    // formula: weekday = (JDN + 1.5) % 7
-    wday = (wxDateTime::wxDateTime_t)((GetTruncatedJDN(mday, mon, year) + 2) % 7);
-}
-
-void wxDateTime::Tm::AddMonths(int monDiff)
-{
-    // normalize the months field
-    while ( monDiff < -mon )
-    {
-        year--;
-
-        monDiff += MONTHS_IN_YEAR;
-    }
-
-    while ( monDiff + mon >= MONTHS_IN_YEAR )
-    {
-        year++;
-
-        monDiff -= MONTHS_IN_YEAR;
-    }
-
-    mon = (wxDateTime::Month)(mon + monDiff);
-
-    wxASSERT_MSG( mon >= 0 && mon < MONTHS_IN_YEAR, wxT("logic error") );
-
-    // NB: we don't check here that the resulting date is valid, this function
-    //     is private and the caller must check it if needed
-}
-
-void wxDateTime::Tm::AddDays(int dayDiff)
-{
-    // normalize the days field
-    while ( dayDiff + mday < 1 )
-    {
-        AddMonths(-1);
-
-        dayDiff += GetNumOfDaysInMonth(year, mon);
-    }
-
-    mday = (wxDateTime::wxDateTime_t)( mday + dayDiff );
-    while ( mday > GetNumOfDaysInMonth(year, mon) )
-    {
-        mday -= GetNumOfDaysInMonth(year, mon);
-
-        AddMonths(1);
-    }
-
-    wxASSERT_MSG( mday > 0 && mday <= GetNumOfDaysInMonth(year, mon),
-                  wxT("logic error") );
-}
-
-// ----------------------------------------------------------------------------
-// class TimeZone
-// ----------------------------------------------------------------------------
-
-wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
-{
-    switch ( tz )
-    {
-        case wxDateTime::Local:
-            // get the offset from C RTL: it returns the difference GMT-local
-            // while we want to have the offset _from_ GMT, hence the '-'
-            m_offset = -wxGetTimeZone();
-            break;
-
-        case wxDateTime::GMT_12:
-        case wxDateTime::GMT_11:
-        case wxDateTime::GMT_10:
-        case wxDateTime::GMT_9:
-        case wxDateTime::GMT_8:
-        case wxDateTime::GMT_7:
-        case wxDateTime::GMT_6:
-        case wxDateTime::GMT_5:
-        case wxDateTime::GMT_4:
-        case wxDateTime::GMT_3:
-        case wxDateTime::GMT_2:
-        case wxDateTime::GMT_1:
-            m_offset = -3600*(wxDateTime::GMT0 - tz);
-            break;
-
-        case wxDateTime::GMT0:
-        case wxDateTime::GMT1:
-        case wxDateTime::GMT2:
-        case wxDateTime::GMT3:
-        case wxDateTime::GMT4:
-        case wxDateTime::GMT5:
-        case wxDateTime::GMT6:
-        case wxDateTime::GMT7:
-        case wxDateTime::GMT8:
-        case wxDateTime::GMT9:
-        case wxDateTime::GMT10:
-        case wxDateTime::GMT11:
-        case wxDateTime::GMT12:
-        case wxDateTime::GMT13:
-            m_offset = 3600*(tz - wxDateTime::GMT0);
-            break;
-
-        case wxDateTime::A_CST:
-            // Central Standard Time in use in Australia = UTC + 9.5
-            m_offset = 60l*(9*MIN_PER_HOUR + MIN_PER_HOUR/2);
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("unknown time zone") );
-    }
-}
-
-// ----------------------------------------------------------------------------
-// static functions
-// ----------------------------------------------------------------------------
-
-/* static */
-struct tm *wxDateTime::GetTmNow(struct tm *tmstruct)
-{
-    time_t t = GetTimeNow();
-    return wxLocaltime_r(&t, tmstruct);
-}
-
-/* static */
-bool wxDateTime::IsLeapYear(int year, wxDateTime::Calendar cal)
-{
-    if ( year == Inv_Year )
-        year = GetCurrentYear();
-
-    if ( cal == Gregorian )
-    {
-        // in Gregorian calendar leap years are those divisible by 4 except
-        // those divisible by 100 unless they're also divisible by 400
-        // (in some countries, like Russia and Greece, additional corrections
-        // exist, but they won't manifest themselves until 2700)
-        return (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0));
-    }
-    else if ( cal == Julian )
-    {
-        // in Julian calendar the rule is simpler
-        return year % 4 == 0;
-    }
-    else
-    {
-        wxFAIL_MSG(wxT("unknown calendar"));
-
-        return false;
-    }
-}
-
-/* static */
-int wxDateTime::GetCentury(int year)
-{
-    return year > 0 ? year / 100 : year / 100 - 1;
-}
-
-/* static */
-int wxDateTime::ConvertYearToBC(int year)
-{
-    // year 0 is BC 1
-    return year > 0 ? year : year - 1;
-}
-
-/* static */
-int wxDateTime::GetCurrentYear(wxDateTime::Calendar cal)
-{
-    switch ( cal )
-    {
-        case Gregorian:
-            return Now().GetYear();
-
-        case Julian:
-            wxFAIL_MSG(wxT("TODO"));
-            break;
-
-        default:
-            wxFAIL_MSG(wxT("unsupported calendar"));
-            break;
-    }
-
-    return Inv_Year;
-}
-
-/* static */
-wxDateTime::Month wxDateTime::GetCurrentMonth(wxDateTime::Calendar cal)
-{
-    switch ( cal )
-    {
-        case Gregorian:
-            return Now().GetMonth();
-
-        case Julian:
-            wxFAIL_MSG(wxT("TODO"));
-            break;
-
-        default:
-            wxFAIL_MSG(wxT("unsupported calendar"));
-            break;
-    }
-
-    return Inv_Month;
-}
-
-/* static */
-wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(int year, Calendar cal)
-{
-    if ( year == Inv_Year )
-    {
-        // take the current year if none given
-        year = GetCurrentYear();
-    }
-
-    switch ( cal )
-    {
-        case Gregorian:
-        case Julian:
-            return IsLeapYear(year) ? 366 : 365;
-
-        default:
-            wxFAIL_MSG(wxT("unsupported calendar"));
-            break;
-    }
-
-    return 0;
-}
-
-/* static */
-wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(wxDateTime::Month month,
-                                                     int year,
-                                                     wxDateTime::Calendar cal)
-{
-    wxCHECK_MSG( month < MONTHS_IN_YEAR, 0, wxT("invalid month") );
-
-    if ( cal == Gregorian || cal == Julian )
-    {
-        if ( year == Inv_Year )
-        {
-            // take the current year if none given
-            year = GetCurrentYear();
-        }
-
-        return GetNumOfDaysInMonth(year, month);
-    }
-    else
-    {
-        wxFAIL_MSG(wxT("unsupported calendar"));
-
-        return 0;
-    }
-}
-
-namespace
-{
-
-// helper function used by GetEnglish/WeekDayName(): returns 0 if flags is
-// Name_Full and 1 if it is Name_Abbr or -1 if the flags is incorrect (and
-// asserts in this case)
-//
-// the return value of this function is used as an index into 2D array
-// containing full names in its first row and abbreviated ones in the 2nd one
-int NameArrayIndexFromFlag(wxDateTime::NameFlags flags)
-{
-    switch ( flags )
-    {
-        case wxDateTime::Name_Full:
-            return 0;
-
-        case wxDateTime::Name_Abbr:
-            return 1;
-
-        default:
-            wxFAIL_MSG( "unknown wxDateTime::NameFlags value" );
-    }
-
-    return -1;
-}
-
-} // anonymous namespace
-
-/* static */
-wxString wxDateTime::GetEnglishMonthName(Month month, NameFlags flags)
-{
-    wxCHECK_MSG( month != Inv_Month, wxEmptyString, "invalid month" );
-
-    static const char *const monthNames[2][MONTHS_IN_YEAR] =
-    {
-        { "January", "February", "March", "April", "May", "June",
-          "July", "August", "September", "October", "November", "December" },
-        { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-          "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }
-    };
-
-    const int idx = NameArrayIndexFromFlag(flags);
-    if ( idx == -1 )
-        return wxString();
-
-    return monthNames[idx][month];
-}
-
-/* static */
-wxString wxDateTime::GetMonthName(wxDateTime::Month month,
-                                  wxDateTime::NameFlags flags)
-{
-#ifdef wxHAS_STRFTIME
-    wxCHECK_MSG( month != Inv_Month, wxEmptyString, wxT("invalid month") );
-
-    // notice that we must set all the fields to avoid confusing libc (GNU one
-    // gets confused to a crash if we don't do this)
-    tm tm;
-    InitTm(tm);
-    tm.tm_mon = month;
-
-    return CallStrftime(flags == Name_Abbr ? wxT("%b") : wxT("%B"), &tm);
-#else // !wxHAS_STRFTIME
-    return GetEnglishMonthName(month, flags);
-#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
-}
-
-/* static */
-wxString wxDateTime::GetEnglishWeekDayName(WeekDay wday, NameFlags flags)
-{
-    wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, wxT("invalid weekday") );
-
-    static const char *const weekdayNames[2][DAYS_PER_WEEK] =
-    {
-        { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday",
-          "Saturday" },
-        { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" },
-    };
-
-    const int idx = NameArrayIndexFromFlag(flags);
-    if ( idx == -1 )
-        return wxString();
-
-    return weekdayNames[idx][wday];
-}
-
-/* static */
-wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
-                                    wxDateTime::NameFlags flags)
-{
-#ifdef wxHAS_STRFTIME
-    wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, wxT("invalid weekday") );
-
-    // take some arbitrary Sunday (but notice that the day should be such that
-    // after adding wday to it below we still have a valid date, e.g. don't
-    // take 28 here!)
-    tm tm;
-    InitTm(tm);
-    tm.tm_mday = 21;
-    tm.tm_mon = Nov;
-    tm.tm_year = 99;
-
-    // and offset it by the number of days needed to get the correct wday
-    tm.tm_mday += wday;
-
-    // call mktime() to normalize it...
-    (void)mktime(&tm);
-
-    // ... and call strftime()
-    return CallStrftime(flags == Name_Abbr ? wxT("%a") : wxT("%A"), &tm);
-#else // !wxHAS_STRFTIME
-    return GetEnglishWeekDayName(wday, flags);
-#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
-}
-
-/* static */
-void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
-{
-    tm tm;
-    InitTm(tm);
-    wxChar buffer[64];
-    // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code
-    // and causes an assertion failed if the buffer is to small (which is good) - OR -
-    // if strftime does not return anything because the format string is invalid - OR -
-    // if there are no 'am' / 'pm' tokens defined for the current locale (which is not good).
-    // wxDateTime::ParseTime will try several different formats to parse the time.
-    // As a result, GetAmPmStrings might get called, even if the current locale
-    // does not define any 'am' / 'pm' tokens. In this case, wxStrftime would
-    // assert, even though it is a perfectly legal use.
-    if ( am )
-    {
-        if (wxStrftime(buffer, WXSIZEOF(buffer), wxT("%p"), &tm) > 0)
-            *am = wxString(buffer);
-        else
-            *am = wxString();
-    }
-    if ( pm )
-    {
-        tm.tm_hour = 13;
-        if (wxStrftime(buffer, WXSIZEOF(buffer), wxT("%p"), &tm) > 0)
-            *pm = wxString(buffer);
-        else
-            *pm = wxString();
-    }
-}
-
-
-// ----------------------------------------------------------------------------
-// Country stuff: date calculations depend on the country (DST, work days,
-// ...), so we need to know which rules to follow.
-// ----------------------------------------------------------------------------
-
-/* static */
-wxDateTime::Country wxDateTime::GetCountry()
-{
-    // TODO use LOCALE_ICOUNTRY setting under Win32
-#ifndef __WXWINCE__
-    if ( ms_country == Country_Unknown )
-    {
-        // try to guess from the time zone name
-        time_t t = time(NULL);
-        struct tm tmstruct;
-        struct tm *tm = wxLocaltime_r(&t, &tmstruct);
-
-        wxString tz = CallStrftime(wxT("%Z"), tm);
-        if ( tz == wxT("WET") || tz == wxT("WEST") )
-        {
-            ms_country = UK;
-        }
-        else if ( tz == wxT("CET") || tz == wxT("CEST") )
-        {
-            ms_country = Country_EEC;
-        }
-        else if ( tz == wxT("MSK") || tz == wxT("MSD") )
-        {
-            ms_country = Russia;
-        }
-        else if ( tz == wxT("AST") || tz == wxT("ADT") ||
-                  tz == wxT("EST") || tz == wxT("EDT") ||
-                  tz == wxT("CST") || tz == wxT("CDT") ||
-                  tz == wxT("MST") || tz == wxT("MDT") ||
-                  tz == wxT("PST") || tz == wxT("PDT") )
-        {
-            ms_country = USA;
-        }
-        else
-        {
-            // well, choose a default one
-            ms_country = USA;
-        }
-    }
-#else // __WXWINCE__
-     ms_country = USA;
-#endif // !__WXWINCE__/__WXWINCE__
-
-    return ms_country;
-}
-
-/* static */
-void wxDateTime::SetCountry(wxDateTime::Country country)
-{
-    ms_country = country;
-}
-
-/* static */
-bool wxDateTime::IsWestEuropeanCountry(Country country)
-{
-    if ( country == Country_Default )
-    {
-        country = GetCountry();
-    }
-
-    return (Country_WesternEurope_Start <= country) &&
-           (country <= Country_WesternEurope_End);
-}
-
-// ----------------------------------------------------------------------------
-// DST calculations: we use 3 different rules for the West European countries,
-// USA and for the rest of the world. This is undoubtedly false for many
-// countries, but I lack the necessary info (and the time to gather it),
-// please add the other rules here!
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDateTime::IsDSTApplicable(int year, Country country)
-{
-    if ( year == Inv_Year )
-    {
-        // take the current year if none given
-        year = GetCurrentYear();
-    }
-
-    if ( country == Country_Default )
-    {
-        country = GetCountry();
-    }
-
-    switch ( country )
-    {
-        case USA:
-        case UK:
-            // DST was first observed in the US and UK during WWI, reused
-            // during WWII and used again since 1966
-            return year >= 1966 ||
-                   (year >= 1942 && year <= 1945) ||
-                   (year == 1918 || year == 1919);
-
-        default:
-            // assume that it started after WWII
-            return year > 1950;
-    }
-}
-
-/* static */
-wxDateTime wxDateTime::GetBeginDST(int year, Country country)
-{
-    if ( year == Inv_Year )
-    {
-        // take the current year if none given
-        year = GetCurrentYear();
-    }
-
-    if ( country == Country_Default )
-    {
-        country = GetCountry();
-    }
-
-    if ( !IsDSTApplicable(year, country) )
-    {
-        return wxInvalidDateTime;
-    }
-
-    wxDateTime dt;
-
-    if ( IsWestEuropeanCountry(country) || (country == Russia) )
-    {
-        // DST begins at 1 a.m. GMT on the last Sunday of March
-        if ( !dt.SetToLastWeekDay(Sun, Mar, year) )
-        {
-            // weird...
-            wxFAIL_MSG( wxT("no last Sunday in March?") );
-        }
-
-        dt += wxTimeSpan::Hours(1);
-    }
-    else switch ( country )
-    {
-        case USA:
-            switch ( year )
-            {
-                case 1918:
-                case 1919:
-                    // don't know for sure - assume it was in effect all year
-
-                case 1943:
-                case 1944:
-                case 1945:
-                    dt.Set(1, Jan, year);
-                    break;
-
-                case 1942:
-                    // DST was installed Feb 2, 1942 by the Congress
-                    dt.Set(2, Feb, year);
-                    break;
-
-                    // Oil embargo changed the DST period in the US
-                case 1974:
-                    dt.Set(6, Jan, 1974);
-                    break;
-
-                case 1975:
-                    dt.Set(23, Feb, 1975);
-                    break;
-
-                default:
-                    // before 1986, DST begun on the last Sunday of April, but
-                    // in 1986 Reagan changed it to begin at 2 a.m. of the
-                    // first Sunday in April
-                    if ( year < 1986 )
-                    {
-                        if ( !dt.SetToLastWeekDay(Sun, Apr, year) )
-                        {
-                            // weird...
-                            wxFAIL_MSG( wxT("no first Sunday in April?") );
-                        }
-                    }
-                    else if ( year > 2006 )
-                    // Energy Policy Act of 2005, Pub. L. no. 109-58, 119 Stat 594 (2005).
-                    // Starting in 2007, daylight time begins in the United States on the
-                    // second Sunday in March and ends on the first Sunday in November
-                    {
-                        if ( !dt.SetToWeekDay(Sun, 2, Mar, year) )
-                        {
-                            // weird...
-                            wxFAIL_MSG( wxT("no second Sunday in March?") );
-                        }
-                    }
-                    else
-                    {
-                        if ( !dt.SetToWeekDay(Sun, 1, Apr, year) )
-                        {
-                            // weird...
-                            wxFAIL_MSG( wxT("no first Sunday in April?") );
-                        }
-                    }
-
-                    dt += wxTimeSpan::Hours(2);
-
-                    // TODO what about timezone??
-            }
-
-            break;
-
-        default:
-            // assume Mar 30 as the start of the DST for the rest of the world
-            // - totally bogus, of course
-            dt.Set(30, Mar, year);
-    }
-
-    return dt;
-}
-
-/* static */
-wxDateTime wxDateTime::GetEndDST(int year, Country country)
-{
-    if ( year == Inv_Year )
-    {
-        // take the current year if none given
-        year = GetCurrentYear();
-    }
-
-    if ( country == Country_Default )
-    {
-        country = GetCountry();
-    }
-
-    if ( !IsDSTApplicable(year, country) )
-    {
-        return wxInvalidDateTime;
-    }
-
-    wxDateTime dt;
-
-    if ( IsWestEuropeanCountry(country) || (country == Russia) )
-    {
-        // DST ends at 1 a.m. GMT on the last Sunday of October
-        if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
-        {
-            // weirder and weirder...
-            wxFAIL_MSG( wxT("no last Sunday in October?") );
-        }
-
-        dt += wxTimeSpan::Hours(1);
-    }
-    else switch ( country )
-    {
-        case USA:
-            switch ( year )
-            {
-                case 1918:
-                case 1919:
-                    // don't know for sure - assume it was in effect all year
-
-                case 1943:
-                case 1944:
-                    dt.Set(31, Dec, year);
-                    break;
-
-                case 1945:
-                    // the time was reset after the end of the WWII
-                    dt.Set(30, Sep, year);
-                    break;
-
-                default: // default for switch (year)
-                    if ( year > 2006 )
-                      // Energy Policy Act of 2005, Pub. L. no. 109-58, 119 Stat 594 (2005).
-                      // Starting in 2007, daylight time begins in the United States on the
-                      // second Sunday in March and ends on the first Sunday in November
-                    {
-                        if ( !dt.SetToWeekDay(Sun, 1, Nov, year) )
-                        {
-                            // weird...
-                            wxFAIL_MSG( wxT("no first Sunday in November?") );
-                        }
-                    }
-                    else
-                     // pre-2007
-                     // DST ends at 2 a.m. on the last Sunday of October
-                    {
-                        if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
-                        {
-                            // weirder and weirder...
-                            wxFAIL_MSG( wxT("no last Sunday in October?") );
-                        }
-                    }
-
-                    dt += wxTimeSpan::Hours(2);
-
-            // TODO: what about timezone??
-            }
-            break;
-
-        default: // default for switch (country)
-            // assume October 26th as the end of the DST - totally bogus too
-            dt.Set(26, Oct, year);
-    }
-
-    return dt;
-}
-
-// ----------------------------------------------------------------------------
-// constructors and assignment operators
-// ----------------------------------------------------------------------------
-
-// return the current time with ms precision
-/* static */ wxDateTime wxDateTime::UNow()
-{
-    return wxDateTime(wxGetUTCTimeMillis());
-}
-
-// the values in the tm structure contain the local time
-wxDateTime& wxDateTime::Set(const struct tm& tm)
-{
-    struct tm tm2(tm);
-    time_t timet = mktime(&tm2);
-
-    if ( timet == (time_t)-1 )
-    {
-        // mktime() rather unintuitively fails for Jan 1, 1970 if the hour is
-        // less than timezone - try to make it work for this case
-        if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
-        {
-            return Set((time_t)(
-                       wxGetTimeZone() +
-                       tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN +
-                       tm2.tm_min * SEC_PER_MIN +
-                       tm2.tm_sec));
-        }
-
-        wxFAIL_MSG( wxT("mktime() failed") );
-
-        *this = wxInvalidDateTime;
-
-        return *this;
-    }
-    else
-    {
-        return Set(timet);
-    }
-}
-
-wxDateTime& wxDateTime::Set(wxDateTime_t hour,
-                            wxDateTime_t minute,
-                            wxDateTime_t second,
-                            wxDateTime_t millisec)
-{
-    // we allow seconds to be 61 to account for the leap seconds, even if we
-    // don't use them really
-    wxDATETIME_CHECK( hour < 24 &&
-                      second < 62 &&
-                      minute < 60 &&
-                      millisec < 1000,
-                      wxT("Invalid time in wxDateTime::Set()") );
-
-    // get the current date from system
-    struct tm tmstruct;
-    struct tm *tm = GetTmNow(&tmstruct);
-
-    wxDATETIME_CHECK( tm, wxT("wxLocaltime_r() failed") );
-
-    // make a copy so it isn't clobbered by the call to mktime() below
-    struct tm tm1(*tm);
-
-    // adjust the time
-    tm1.tm_hour = hour;
-    tm1.tm_min = minute;
-    tm1.tm_sec = second;
-
-    // and the DST in case it changes on this date
-    struct tm tm2(tm1);
-    mktime(&tm2);
-    if ( tm2.tm_isdst != tm1.tm_isdst )
-        tm1.tm_isdst = tm2.tm_isdst;
-
-    (void)Set(tm1);
-
-    // and finally adjust milliseconds
-    return SetMillisecond(millisec);
-}
-
-wxDateTime& wxDateTime::Set(wxDateTime_t day,
-                            Month        month,
-                            int          year,
-                            wxDateTime_t hour,
-                            wxDateTime_t minute,
-                            wxDateTime_t second,
-                            wxDateTime_t millisec)
-{
-    wxDATETIME_CHECK( hour < 24 &&
-                      second < 62 &&
-                      minute < 60 &&
-                      millisec < 1000,
-                      wxT("Invalid time in wxDateTime::Set()") );
-
-    ReplaceDefaultYearMonthWithCurrent(&year, &month);
-
-    wxDATETIME_CHECK( (0 < day) && (day <= GetNumberOfDays(month, year)),
-                      wxT("Invalid date in wxDateTime::Set()") );
-
-    // the range of time_t type (inclusive)
-    static const int yearMinInRange = 1970;
-    static const int yearMaxInRange = 2037;
-
-    // test only the year instead of testing for the exact end of the Unix
-    // time_t range - it doesn't bring anything to do more precise checks
-    if ( year >= yearMinInRange && year <= yearMaxInRange )
-    {
-        // use the standard library version if the date is in range - this is
-        // probably more efficient than our code
-        struct tm tm;
-        tm.tm_year = year - 1900;
-        tm.tm_mon = month;
-        tm.tm_mday = day;
-        tm.tm_hour = hour;
-        tm.tm_min = minute;
-        tm.tm_sec = second;
-        tm.tm_isdst = -1;       // mktime() will guess it
-
-        (void)Set(tm);
-
-        // and finally adjust milliseconds
-        if (IsValid())
-            SetMillisecond(millisec);
-
-        return *this;
-    }
-    else
-    {
-        // do time calculations ourselves: we want to calculate the number of
-        // milliseconds between the given date and the epoch
-
-        // get the JDN for the midnight of this day
-        m_time = GetTruncatedJDN(day, month, year);
-        m_time -= EPOCH_JDN;
-        m_time *= SECONDS_PER_DAY * TIME_T_FACTOR;
-
-        // JDN corresponds to GMT, we take localtime
-        Add(wxTimeSpan(hour, minute, second + wxGetTimeZone(), millisec));
-    }
-
-    return *this;
-}
-
-wxDateTime& wxDateTime::Set(double jdn)
-{
-    // so that m_time will be 0 for the midnight of Jan 1, 1970 which is jdn
-    // EPOCH_JDN + 0.5
-    jdn -= EPOCH_JDN + 0.5;
-
-    m_time.Assign(jdn*MILLISECONDS_PER_DAY);
-
-    // JDNs always are in UTC, so we don't need any adjustments for time zone
-
-    return *this;
-}
-
-wxDateTime& wxDateTime::ResetTime()
-{
-    Tm tm = GetTm();
-
-    if ( tm.hour || tm.min || tm.sec || tm.msec )
-    {
-        tm.msec =
-        tm.sec =
-        tm.min =
-        tm.hour = 0;
-
-        Set(tm);
-    }
-
-    return *this;
-}
-
-wxDateTime wxDateTime::GetDateOnly() const
-{
-    Tm tm = GetTm();
-    tm.msec =
-    tm.sec =
-    tm.min =
-    tm.hour = 0;
-    return wxDateTime(tm);
-}
-
-// ----------------------------------------------------------------------------
-// DOS Date and Time Format functions
-// ----------------------------------------------------------------------------
-// the dos date and time value is an unsigned 32 bit value in the format:
-// YYYYYYYMMMMDDDDDhhhhhmmmmmmsssss
-//
-// Y = year offset from 1980 (0-127)
-// M = month (1-12)
-// D = day of month (1-31)
-// h = hour (0-23)
-// m = minute (0-59)
-// s = bisecond (0-29) each bisecond indicates two seconds
-// ----------------------------------------------------------------------------
-
-wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
-{
-    struct tm tm;
-    InitTm(tm);
-
-    long year = ddt & 0xFE000000;
-    year >>= 25;
-    year += 80;
-    tm.tm_year = year;
-
-    long month = ddt & 0x1E00000;
-    month >>= 21;
-    month -= 1;
-    tm.tm_mon = month;
-
-    long day = ddt & 0x1F0000;
-    day >>= 16;
-    tm.tm_mday = day;
-
-    long hour = ddt & 0xF800;
-    hour >>= 11;
-    tm.tm_hour = hour;
-
-    long minute = ddt & 0x7E0;
-    minute >>= 5;
-    tm.tm_min = minute;
-
-    long second = ddt & 0x1F;
-    tm.tm_sec = second * 2;
-
-    return Set(mktime(&tm));
-}
-
-unsigned long wxDateTime::GetAsDOS() const
-{
-    unsigned long ddt;
-    time_t ticks = GetTicks();
-    struct tm tmstruct;
-    struct tm *tm = wxLocaltime_r(&ticks, &tmstruct);
-    wxCHECK_MSG( tm, ULONG_MAX, wxT("time can't be represented in DOS format") );
-
-    long year = tm->tm_year;
-    year -= 80;
-    year <<= 25;
-
-    long month = tm->tm_mon;
-    month += 1;
-    month <<= 21;
-
-    long day = tm->tm_mday;
-    day <<= 16;
-
-    long hour = tm->tm_hour;
-    hour <<= 11;
-
-    long minute = tm->tm_min;
-    minute <<= 5;
-
-    long second = tm->tm_sec;
-    second /= 2;
-
-    ddt = year | month | day | hour | minute | second;
-    return ddt;
-}
-
-// ----------------------------------------------------------------------------
-// time_t <-> broken down time conversions
-// ----------------------------------------------------------------------------
-
-wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
-{
-    wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
-
-    time_t time = GetTicks();
-    if ( time != (time_t)-1 )
-    {
-        // use C RTL functions
-        struct tm tmstruct;
-        tm *tm;
-        if ( tz.GetOffset() == -wxGetTimeZone() )
-        {
-            // we are working with local time
-            tm = wxLocaltime_r(&time, &tmstruct);
-
-            // should never happen
-            wxCHECK_MSG( tm, Tm(), wxT("wxLocaltime_r() failed") );
-        }
-        else
-        {
-            time += (time_t)tz.GetOffset();
-#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
-            int time2 = (int) time;
-            if ( time2 >= 0 )
-#else
-            if ( time >= 0 )
-#endif
-            {
-                tm = wxGmtime_r(&time, &tmstruct);
-
-                // should never happen
-                wxCHECK_MSG( tm, Tm(), wxT("wxGmtime_r() failed") );
-            }
-            else
-            {
-                tm = (struct tm *)NULL;
-            }
-        }
-
-        if ( tm )
-        {
-            // adjust the milliseconds
-            Tm tm2(*tm, tz);
-            long timeOnly = (m_time % MILLISECONDS_PER_DAY).ToLong();
-            tm2.msec = (wxDateTime_t)(timeOnly % 1000);
-            return tm2;
-        }
-        //else: use generic code below
-    }
-
-    // remember the time and do the calculations with the date only - this
-    // eliminates rounding errors of the floating point arithmetics
-
-    wxLongLong timeMidnight = m_time + tz.GetOffset() * 1000;
-
-    long timeOnly = (timeMidnight % MILLISECONDS_PER_DAY).ToLong();
-
-    // we want to always have positive time and timeMidnight to be really
-    // the midnight before it
-    if ( timeOnly < 0 )
-    {
-        timeOnly = MILLISECONDS_PER_DAY + timeOnly;
-    }
-
-    timeMidnight -= timeOnly;
-
-    // calculate the Gregorian date from JDN for the midnight of our date:
-    // this will yield day, month (in 1..12 range) and year
-
-    // actually, this is the JDN for the noon of the previous day
-    long jdn = (timeMidnight / MILLISECONDS_PER_DAY).ToLong() + EPOCH_JDN;
-
-    // CREDIT: code below is by Scott E. Lee (but bugs are mine)
-
-    wxASSERT_MSG( jdn > -2, wxT("JDN out of range") );
-
-    // calculate the century
-    long temp = (jdn + JDN_OFFSET) * 4 - 1;
-    long century = temp / DAYS_PER_400_YEARS;
-
-    // then the year and day of year (1 <= dayOfYear <= 366)
-    temp = ((temp % DAYS_PER_400_YEARS) / 4) * 4 + 3;
-    long year = (century * 100) + (temp / DAYS_PER_4_YEARS);
-    long dayOfYear = (temp % DAYS_PER_4_YEARS) / 4 + 1;
-
-    // and finally the month and day of the month
-    temp = dayOfYear * 5 - 3;
-    long month = temp / DAYS_PER_5_MONTHS;
-    long day = (temp % DAYS_PER_5_MONTHS) / 5 + 1;
-
-    // month is counted from March - convert to normal
-    if ( month < 10 )
-    {
-        month += 3;
-    }
-    else
-    {
-        year += 1;
-        month -= 9;
-    }
-
-    // year is offset by 4800
-    year -= 4800;
-
-    // check that the algorithm gave us something reasonable
-    wxASSERT_MSG( (0 < month) && (month <= 12), wxT("invalid month") );
-    wxASSERT_MSG( (1 <= day) && (day < 32), wxT("invalid day") );
-
-    // construct Tm from these values
-    Tm tm;
-    tm.year = (int)year;
-    tm.yday = (wxDateTime_t)(dayOfYear - 1); // use C convention for day number
-    tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0
-    tm.mday = (wxDateTime_t)day;
-    tm.msec = (wxDateTime_t)(timeOnly % 1000);
-    timeOnly -= tm.msec;
-    timeOnly /= 1000;               // now we have time in seconds
-
-    tm.sec = (wxDateTime_t)(timeOnly % SEC_PER_MIN);
-    timeOnly -= tm.sec;
-    timeOnly /= SEC_PER_MIN;        // now we have time in minutes
-
-    tm.min = (wxDateTime_t)(timeOnly % MIN_PER_HOUR);
-    timeOnly -= tm.min;
-
-    tm.hour = (wxDateTime_t)(timeOnly / MIN_PER_HOUR);
-
-    return tm;
-}
-
-wxDateTime& wxDateTime::SetYear(int year)
-{
-    wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
-
-    Tm tm(GetTm());
-    tm.year = year;
-    Set(tm);
-
-    return *this;
-}
-
-wxDateTime& wxDateTime::SetMonth(Month month)
-{
-    wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
-
-    Tm tm(GetTm());
-    tm.mon = month;
-    Set(tm);
-
-    return *this;
-}
-
-wxDateTime& wxDateTime::SetDay(wxDateTime_t mday)
-{
-    wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
-
-    Tm tm(GetTm());
-    tm.mday = mday;
-    Set(tm);
-
-    return *this;
-}
-
-wxDateTime& wxDateTime::SetHour(wxDateTime_t hour)
-{
-    wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
-
-    Tm tm(GetTm());
-    tm.hour = hour;
-    Set(tm);
-
-    return *this;
-}
-
-wxDateTime& wxDateTime::SetMinute(wxDateTime_t min)
-{
-    wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
-
-    Tm tm(GetTm());
-    tm.min = min;
-    Set(tm);
-
-    return *this;
-}
-
-wxDateTime& wxDateTime::SetSecond(wxDateTime_t sec)
-{
-    wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
-
-    Tm tm(GetTm());
-    tm.sec = sec;
-    Set(tm);
-
-    return *this;
-}
-
-wxDateTime& wxDateTime::SetMillisecond(wxDateTime_t millisecond)
-{
-    wxASSERT_MSG( IsValid(), wxT("invalid wxDateTime") );
-
-    // we don't need to use GetTm() for this one
-    m_time -= m_time % 1000l;
-    m_time += millisecond;
-
-    return *this;
-}
-
-// ----------------------------------------------------------------------------
-// wxDateTime arithmetics
-// ----------------------------------------------------------------------------
-
-wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
-{
-    Tm tm(GetTm());
-
-    tm.year += diff.GetYears();
-    tm.AddMonths(diff.GetMonths());
-
-    // check that the resulting date is valid
-    if ( tm.mday > GetNumOfDaysInMonth(tm.year, tm.mon) )
-    {
-        // We suppose that when adding one month to Jan 31 we want to get Feb
-        // 28 (or 29), i.e. adding a month to the last day of the month should
-        // give the last day of the next month which is quite logical.
-        //
-        // Unfortunately, there is no logic way to understand what should
-        // Jan 30 + 1 month be - Feb 28 too or Feb 27 (assuming non leap year)?
-        // We make it Feb 28 (last day too), but it is highly questionable.
-        tm.mday = GetNumOfDaysInMonth(tm.year, tm.mon);
-    }
-
-    tm.AddDays(diff.GetTotalDays());
-
-    Set(tm);
-
-    wxASSERT_MSG( IsSameTime(tm),
-                  wxT("Add(wxDateSpan) shouldn't modify time") );
-
-    return *this;
-}
-
-// ----------------------------------------------------------------------------
-// Weekday and monthday stuff
-// ----------------------------------------------------------------------------
-
-// convert Sun, Mon, ..., Sat into 6, 0, ..., 5
-static inline int ConvertWeekDayToMondayBase(int wd)
-{
-    return wd == wxDateTime::Sun ? 6 : wd - 1;
-}
-
-/* static */
-wxDateTime
-wxDateTime::SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay wd)
-{
-    wxASSERT_MSG( numWeek > 0,
-                  wxT("invalid week number: weeks are counted from 1") );
-
-    // Jan 4 always lies in the 1st week of the year
-    wxDateTime dt(4, Jan, year);
-    dt.SetToWeekDayInSameWeek(wd);
-    dt += wxDateSpan::Weeks(numWeek - 1);
-
-    return dt;
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-// use a separate function to avoid warnings about using deprecated
-// SetToTheWeek in GetWeek below
-static wxDateTime
-SetToTheWeek(int year,
-             wxDateTime::wxDateTime_t numWeek,
-             wxDateTime::WeekDay weekday,
-             wxDateTime::WeekFlags flags)
-{
-    // Jan 4 always lies in the 1st week of the year
-    wxDateTime dt(4, wxDateTime::Jan, year);
-    dt.SetToWeekDayInSameWeek(weekday, flags);
-    dt += wxDateSpan::Weeks(numWeek - 1);
-
-    return dt;
-}
-
-bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
-                              WeekDay weekday,
-                              WeekFlags flags)
-{
-    int year = GetYear();
-    *this = ::SetToTheWeek(year, numWeek, weekday, flags);
-    if ( GetYear() != year )
-    {
-        // oops... numWeek was too big
-        return false;
-    }
-
-    return true;
-}
-
-wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek,
-                               WeekDay weekday,
-                               WeekFlags flags) const
-{
-    return ::SetToTheWeek(GetYear(), numWeek, weekday, flags);
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
-wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
-                                          int year)
-{
-    // take the current month/year if none specified
-    if ( year == Inv_Year )
-        year = GetYear();
-    if ( month == Inv_Month )
-        month = GetMonth();
-
-    return Set(GetNumOfDaysInMonth(year, month), month, year);
-}
-
-wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags)
-{
-    wxDATETIME_CHECK( weekday != Inv_WeekDay, wxT("invalid weekday") );
-
-    int wdayDst = weekday,
-        wdayThis = GetWeekDay();
-    if ( wdayDst == wdayThis )
-    {
-        // nothing to do
-        return *this;
-    }
-
-    if ( flags == Default_First )
-    {
-        flags = GetCountry() == USA ? Sunday_First : Monday_First;
-    }
-
-    // the logic below based on comparing weekday and wdayThis works if Sun (0)
-    // is the first day in the week, but breaks down for Monday_First case so
-    // we adjust the week days in this case
-    if ( flags == Monday_First )
-    {
-        if ( wdayThis == Sun )
-            wdayThis += 7;
-        if ( wdayDst == Sun )
-            wdayDst += 7;
-    }
-    //else: Sunday_First, nothing to do
-
-    // go forward or back in time to the day we want
-    if ( wdayDst < wdayThis )
-    {
-        return Subtract(wxDateSpan::Days(wdayThis - wdayDst));
-    }
-    else // weekday > wdayThis
-    {
-        return Add(wxDateSpan::Days(wdayDst - wdayThis));
-    }
-}
-
-wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday)
-{
-    wxDATETIME_CHECK( weekday != Inv_WeekDay, wxT("invalid weekday") );
-
-    int diff;
-    WeekDay wdayThis = GetWeekDay();
-    if ( weekday == wdayThis )
-    {
-        // nothing to do
-        return *this;
-    }
-    else if ( weekday < wdayThis )
-    {
-        // need to advance a week
-        diff = 7 - (wdayThis - weekday);
-    }
-    else // weekday > wdayThis
-    {
-        diff = weekday - wdayThis;
-    }
-
-    return Add(wxDateSpan::Days(diff));
-}
-
-wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday)
-{
-    wxDATETIME_CHECK( weekday != Inv_WeekDay, wxT("invalid weekday") );
-
-    int diff;
-    WeekDay wdayThis = GetWeekDay();
-    if ( weekday == wdayThis )
-    {
-        // nothing to do
-        return *this;
-    }
-    else if ( weekday > wdayThis )
-    {
-        // need to go to previous week
-        diff = 7 - (weekday - wdayThis);
-    }
-    else // weekday < wdayThis
-    {
-        diff = wdayThis - weekday;
-    }
-
-    return Subtract(wxDateSpan::Days(diff));
-}
-
-bool wxDateTime::SetToWeekDay(WeekDay weekday,
-                              int n,
-                              Month month,
-                              int year)
-{
-    wxCHECK_MSG( weekday != Inv_WeekDay, false, wxT("invalid weekday") );
-
-    // we don't check explicitly that -5 <= n <= 5 because we will return false
-    // anyhow in such case - but may be should still give an assert for it?
-
-    // take the current month/year if none specified
-    ReplaceDefaultYearMonthWithCurrent(&year, &month);
-
-    wxDateTime dt;
-
-    // TODO this probably could be optimised somehow...
-
-    if ( n > 0 )
-    {
-        // get the first day of the month
-        dt.Set(1, month, year);
-
-        // get its wday
-        WeekDay wdayFirst = dt.GetWeekDay();
-
-        // go to the first weekday of the month
-        int diff = weekday - wdayFirst;
-        if ( diff < 0 )
-            diff += 7;
-
-        // add advance n-1 weeks more
-        diff += 7*(n - 1);
-
-        dt += wxDateSpan::Days(diff);
-    }
-    else // count from the end of the month
-    {
-        // get the last day of the month
-        dt.SetToLastMonthDay(month, year);
-
-        // get its wday
-        WeekDay wdayLast = dt.GetWeekDay();
-
-        // go to the last weekday of the month
-        int diff = wdayLast - weekday;
-        if ( diff < 0 )
-            diff += 7;
-
-        // and rewind n-1 weeks from there
-        diff += 7*(-n - 1);
-
-        dt -= wxDateSpan::Days(diff);
-    }
-
-    // check that it is still in the same month
-    if ( dt.GetMonth() == month )
-    {
-        *this = dt;
-
-        return true;
-    }
-    else
-    {
-        // no such day in this month
-        return false;
-    }
-}
-
-static inline
-wxDateTime::wxDateTime_t GetDayOfYearFromTm(const wxDateTime::Tm& tm)
-{
-    return (wxDateTime::wxDateTime_t)(gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday);
-}
-
-wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
-{
-    return GetDayOfYearFromTm(GetTm(tz));
-}
-
-wxDateTime::wxDateTime_t
-wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const
-{
-    if ( flags == Default_First )
-    {
-        flags = GetCountry() == USA ? Sunday_First : Monday_First;
-    }
-
-    Tm tm(GetTm(tz));
-    wxDateTime_t nDayInYear = GetDayOfYearFromTm(tm);
-
-    int wdTarget = GetWeekDay(tz);
-    int wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
-    int week;
-    if ( flags == Sunday_First )
-    {
-        // FIXME: First week is not calculated correctly.
-        week = (nDayInYear - wdTarget + 7) / 7;
-        if ( wdYearStart == Wed || wdYearStart == Thu )
-            week++;
-    }
-    else // week starts with monday
-    {
-        // adjust the weekdays to non-US style.
-        wdYearStart = ConvertWeekDayToMondayBase(wdYearStart);
-        wdTarget = ConvertWeekDayToMondayBase(wdTarget);
-
-        // quoting from http://www.cl.cam.ac.uk/~mgk25/iso-time.html:
-        //
-        //      Week 01 of a year is per definition the first week that has the
-        //      Thursday in this year, which is equivalent to the week that
-        //      contains the fourth day of January. In other words, the first
-        //      week of a new year is the week that has the majority of its
-        //      days in the new year. Week 01 might also contain days from the
-        //      previous year and the week before week 01 of a year is the last
-        //      week (52 or 53) of the previous year even if it contains days
-        //      from the new year. A week starts with Monday (day 1) and ends
-        //      with Sunday (day 7).
-        //
-
-        // if Jan 1 is Thursday or less, it is in the first week of this year
-        if ( wdYearStart < 4 )
-        {
-            // count the number of entire weeks between Jan 1 and this date
-            week = (nDayInYear + wdYearStart + 6 - wdTarget)/7;
-
-            // be careful to check for overflow in the next year
-            if ( week == 53 && tm.mday - wdTarget > 28 )
-                    week = 1;
-        }
-        else // Jan 1 is in the last week of the previous year
-        {
-            // check if we happen to be at the last week of previous year:
-            if ( tm.mon == Jan && tm.mday < 8 - wdYearStart )
-                week = wxDateTime(31, Dec, GetYear()-1).GetWeekOfYear();
-            else
-                week = (nDayInYear + wdYearStart - 1 - wdTarget)/7;
-        }
-    }
-
-    return (wxDateTime::wxDateTime_t)week;
-}
-
-wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
-                                                    const TimeZone& tz) const
-{
-    Tm tm = GetTm(tz);
-    const wxDateTime dateFirst = wxDateTime(1, tm.mon, tm.year);
-    const wxDateTime::WeekDay wdFirst = dateFirst.GetWeekDay();
-
-    if ( flags == Default_First )
-    {
-        flags = GetCountry() == USA ? Sunday_First : Monday_First;
-    }
-
-    // compute offset of dateFirst from the beginning of the week
-    int firstOffset;
-    if ( flags == Sunday_First )
-        firstOffset = wdFirst - Sun;
-    else
-        firstOffset = wdFirst == Sun ? DAYS_PER_WEEK - 1 : wdFirst - Mon;
-
-    return (wxDateTime::wxDateTime_t)((tm.mday - 1 + firstOffset)/7 + 1);
-}
-
-wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
-{
-    int year = GetYear();
-    wxDATETIME_CHECK( (0 < yday) && (yday <= GetNumberOfDays(year)),
-                      wxT("invalid year day") );
-
-    bool isLeap = IsLeapYear(year);
-    for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) )
-    {
-        // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
-        // don't need it neither - because of the CHECK above we know that
-        // yday lies in December then
-        if ( (mon == Dec) || (yday <= gs_cumulatedDays[isLeap][mon + 1]) )
-        {
-            Set((wxDateTime::wxDateTime_t)(yday - gs_cumulatedDays[isLeap][mon]), mon, year);
-
-            break;
-        }
-    }
-
-    return *this;
-}
-
-// ----------------------------------------------------------------------------
-// Julian day number conversion and related stuff
-// ----------------------------------------------------------------------------
-
-double wxDateTime::GetJulianDayNumber() const
-{
-    return m_time.ToDouble() / MILLISECONDS_PER_DAY + EPOCH_JDN + 0.5;
-}
-
-double wxDateTime::GetRataDie() const
-{
-    // March 1 of the year 0 is Rata Die day -306 and JDN 1721119.5
-    return GetJulianDayNumber() - 1721119.5 - 306;
-}
-
-// ----------------------------------------------------------------------------
-// timezone and DST stuff
-// ----------------------------------------------------------------------------
-
-int wxDateTime::IsDST(wxDateTime::Country country) const
-{
-    wxCHECK_MSG( country == Country_Default, -1,
-                 wxT("country support not implemented") );
-
-    // use the C RTL for the dates in the standard range
-    time_t timet = GetTicks();
-    if ( timet != (time_t)-1 )
-    {
-        struct tm tmstruct;
-        tm *tm = wxLocaltime_r(&timet, &tmstruct);
-
-        wxCHECK_MSG( tm, -1, wxT("wxLocaltime_r() failed") );
-
-        return tm->tm_isdst;
-    }
-    else
-    {
-        int year = GetYear();
-
-        if ( !IsDSTApplicable(year, country) )
-        {
-            // no DST time in this year in this country
-            return -1;
-        }
-
-        return IsBetween(GetBeginDST(year, country), GetEndDST(year, country));
-    }
-}
-
-wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
-{
-    long secDiff = wxGetTimeZone() + tz.GetOffset();
-
-    // we need to know whether DST is or not in effect for this date unless
-    // the test disabled by the caller
-    if ( !noDST && (IsDST() == 1) )
-    {
-        // FIXME we assume that the DST is always shifted by 1 hour
-        secDiff -= 3600;
-    }
-
-    return Add(wxTimeSpan::Seconds(secDiff));
-}
-
-wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
-{
-    long secDiff = wxGetTimeZone() + tz.GetOffset();
-
-    // we need to know whether DST is or not in effect for this date unless
-    // the test disabled by the caller
-    if ( !noDST && (IsDST() == 1) )
-    {
-        // FIXME we assume that the DST is always shifted by 1 hour
-        secDiff -= 3600;
-    }
-
-    return Subtract(wxTimeSpan::Seconds(secDiff));
-}
-
-// ============================================================================
-// wxDateTimeHolidayAuthority and related classes
-// ============================================================================
-
-#include "wx/arrimpl.cpp"
-
-WX_DEFINE_OBJARRAY(wxDateTimeArray)
-
-static int wxCMPFUNC_CONV
-wxDateTimeCompareFunc(wxDateTime **first, wxDateTime **second)
-{
-    wxDateTime dt1 = **first,
-               dt2 = **second;
-
-    return dt1 == dt2 ? 0 : dt1 < dt2 ? -1 : +1;
-}
-
-// ----------------------------------------------------------------------------
-// wxDateTimeHolidayAuthority
-// ----------------------------------------------------------------------------
-
-wxHolidayAuthoritiesArray wxDateTimeHolidayAuthority::ms_authorities;
-
-/* static */
-bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt)
-{
-    size_t count = ms_authorities.size();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        if ( ms_authorities[n]->DoIsHoliday(dt) )
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-/* static */
-size_t
-wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart,
-                                               const wxDateTime& dtEnd,
-                                               wxDateTimeArray& holidays)
-{
-    wxDateTimeArray hol;
-
-    holidays.Clear();
-
-    const size_t countAuth = ms_authorities.size();
-    for ( size_t nAuth = 0; nAuth < countAuth; nAuth++ )
-    {
-        ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
-
-        WX_APPEND_ARRAY(holidays, hol);
-    }
-
-    holidays.Sort(wxDateTimeCompareFunc);
-
-    return holidays.size();
-}
-
-/* static */
-void wxDateTimeHolidayAuthority::ClearAllAuthorities()
-{
-    WX_CLEAR_ARRAY(ms_authorities);
-}
-
-/* static */
-void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
-{
-    ms_authorities.push_back(auth);
-}
-
-wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority()
-{
-    // required here for Darwin
-}
-
-// ----------------------------------------------------------------------------
-// wxDateTimeWorkDays
-// ----------------------------------------------------------------------------
-
-bool wxDateTimeWorkDays::DoIsHoliday(const wxDateTime& dt) const
-{
-    wxDateTime::WeekDay wd = dt.GetWeekDay();
-
-    return (wd == wxDateTime::Sun) || (wd == wxDateTime::Sat);
-}
-
-size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart,
-                                                const wxDateTime& dtEnd,
-                                                wxDateTimeArray& holidays) const
-{
-    if ( dtStart > dtEnd )
-    {
-        wxFAIL_MSG( wxT("invalid date range in GetHolidaysInRange") );
-
-        return 0u;
-    }
-
-    holidays.Empty();
-
-    // instead of checking all days, start with the first Sat after dtStart and
-    // end with the last Sun before dtEnd
-    wxDateTime dtSatFirst = dtStart.GetNextWeekDay(wxDateTime::Sat),
-               dtSatLast = dtEnd.GetPrevWeekDay(wxDateTime::Sat),
-               dtSunFirst = dtStart.GetNextWeekDay(wxDateTime::Sun),
-               dtSunLast = dtEnd.GetPrevWeekDay(wxDateTime::Sun),
-               dt;
-
-    for ( dt = dtSatFirst; dt <= dtSatLast; dt += wxDateSpan::Week() )
-    {
-        holidays.Add(dt);
-    }
-
-    for ( dt = dtSunFirst; dt <= dtSunLast; dt += wxDateSpan::Week() )
-    {
-        holidays.Add(dt);
-    }
-
-    return holidays.GetCount();
-}
-
-// ============================================================================
-// other helper functions
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// iteration helpers: can be used to write a for loop over enum variable like
-// this:
-//  for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) )
-// ----------------------------------------------------------------------------
-
-WXDLLIMPEXP_BASE void wxNextMonth(wxDateTime::Month& m)
-{
-    wxASSERT_MSG( m < wxDateTime::Inv_Month, wxT("invalid month") );
-
-    // no wrapping or the for loop above would never end!
-    m = (wxDateTime::Month)(m + 1);
-}
-
-WXDLLIMPEXP_BASE void wxPrevMonth(wxDateTime::Month& m)
-{
-    wxASSERT_MSG( m < wxDateTime::Inv_Month, wxT("invalid month") );
-
-    m = m == wxDateTime::Jan ? wxDateTime::Inv_Month
-                             : (wxDateTime::Month)(m - 1);
-}
-
-WXDLLIMPEXP_BASE void wxNextWDay(wxDateTime::WeekDay& wd)
-{
-    wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, wxT("invalid week day") );
-
-    // no wrapping or the for loop above would never end!
-    wd = (wxDateTime::WeekDay)(wd + 1);
-}
-
-WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd)
-{
-    wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, wxT("invalid week day") );
-
-    wd = wd == wxDateTime::Sun ? wxDateTime::Inv_WeekDay
-                               : (wxDateTime::WeekDay)(wd - 1);
-}
-
-#ifdef __WINDOWS__
-
-wxDateTime& wxDateTime::SetFromMSWSysTime(const SYSTEMTIME& st)
-{
-    return Set(st.wDay,
-            static_cast<wxDateTime::Month>(wxDateTime::Jan + st.wMonth - 1),
-            st.wYear,
-            st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
-}
-
-wxDateTime& wxDateTime::SetFromMSWSysDate(const SYSTEMTIME& st)
-{
-    return Set(st.wDay,
-            static_cast<wxDateTime::Month>(wxDateTime::Jan + st.wMonth - 1),
-            st.wYear,
-            0, 0, 0, 0);
-}
-
-void wxDateTime::GetAsMSWSysTime(SYSTEMTIME* st) const
-{
-    const wxDateTime::Tm tm(GetTm());
-
-    st->wYear = (WXWORD)tm.year;
-    st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
-    st->wDay = tm.mday;
-
-    st->wDayOfWeek = 0;
-    st->wHour = tm.hour;
-    st->wMinute = tm.min;
-    st->wSecond = tm.sec;
-    st->wMilliseconds = tm.msec;
-}
-
-void wxDateTime::GetAsMSWSysDate(SYSTEMTIME* st) const
-{
-    const wxDateTime::Tm tm(GetTm());
-
-    st->wYear = (WXWORD)tm.year;
-    st->wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
-    st->wDay = tm.mday;
-
-    st->wDayOfWeek =
-    st->wHour =
-    st->wMinute =
-    st->wSecond =
-    st->wMilliseconds = 0;
-}
-
-#endif // __WINDOWS__
-
-#endif // wxUSE_DATETIME
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/datetime.cpp
+// Purpose:     implementation of time/date related classes
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     11.05.99
+// RCS-ID:      $Id: datetime.cpp 65730 2010-10-02 16:50:34Z TIK $
+// Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+//              parts of code taken from sndcal library by Scott E. Lee:
+//
+//               Copyright 1993-1995, Scott E. Lee, all rights reserved.
+//               Permission granted to use, copy, modify, distribute and sell
+//               so long as the above copyright and this permission statement
+//               are retained in all copies.
+//
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+ * Implementation notes:
+ *
+ * 1. the time is stored as a 64bit integer containing the signed number of
+ *    milliseconds since Jan 1. 1970 (the Unix Epoch) - so it is always
+ *    expressed in GMT.
+ *
+ * 2. the range is thus something about 580 million years, but due to current
+ *    algorithms limitations, only dates from Nov 24, 4714BC are handled
+ *
+ * 3. standard ANSI C functions are used to do time calculations whenever
+ *    possible, i.e. when the date is in the range Jan 1, 1970 to 2038
+ *
+ * 4. otherwise, the calculations are done by converting the date to/from JDN
+ *    first (the range limitation mentioned above comes from here: the
+ *    algorithm used by Scott E. Lee's code only works for positive JDNs, more
+ *    or less)
+ *
+ * 5. the object constructed for the given DD-MM-YYYY HH:MM:SS corresponds to
+ *    this moment in local time and may be converted to the object
+ *    corresponding to the same date/time in another time zone by using
+ *    ToTimezone()
+ *
+ * 6. the conversions to the current (or any other) timezone are done when the
+ *    internal time representation is converted to the broken-down one in
+ *    wxDateTime::Tm.
+ */
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
+
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
+    #include "wx/module.h"
+#endif // WX_PRECOMP
+
+#include "wx/thread.h"
+#include "wx/tokenzr.h"
+
+#include <ctype.h>
+
+#ifdef __WINDOWS__
+    #include <winnls.h>
+    #ifndef __WXWINCE__
+        #include <locale.h>
+    #endif
+#endif
+
+#include "wx/datetime.h"
+
+const long wxDateTime::TIME_T_FACTOR = 1000l;
+
+#if wxUSE_EXTENDED_RTTI
+
+template<> void wxStringReadValue(const wxString &s , wxDateTime &data )
+{
+    data.ParseFormat(s,wxT("%Y-%m-%d %H:%M:%S")) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxDateTime &data )
+{
+    s = data.Format(wxT("%Y-%m-%d %H:%M:%S")) ;
+}
+
+wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringConverter<wxDateTime>)
+
+#endif
+
+//
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+#if defined(HAVE_STRPTIME) && defined(__GLIBC__) && \
+        ((__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0))
+    // glibc 2.0.7 strptime() is broken - the following snippet causes it to
+    // crash (instead of just failing):
+    //
+    //      strncpy(buf, "Tue Dec 21 20:25:40 1999", 128);
+    //      strptime(buf, "%x", &tm);
+    //
+    // so don't use it
+    #undef HAVE_STRPTIME
+#endif // broken strptime()
+
+#if defined(HAVE_STRPTIME) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS
+    // configure detects strptime as linkable because it's in the OS X
+    // System library but MSL headers don't declare it.
+
+//    char *strptime(const char *, const char *, struct tm *);
+    // However, we DON'T want to just provide it here because we would
+    // crash and/or overwrite data when strptime from OS X tries
+    // to fill in MW's struct tm which is two fields shorter (no TZ stuff)
+    // So for now let's just say we don't have strptime
+    #undef HAVE_STRPTIME
+#endif
+
+#if defined(__MWERKS__) && wxUSE_UNICODE
+    #include <wtime.h>
+#endif
+
+// define a special symbol for VC8 instead of writing tests for 1400 repeatedly
+#ifdef __VISUALC__
+    #if __VISUALC__ >= 1400
+        #define __VISUALC8__
+    #endif
+#endif
+
+#if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
+    #if defined(__WXPALMOS__)
+        #define WX_GMTOFF_IN_TM
+    #elif defined(__WXMSW__)
+        static long wxGetTimeZone()
+        {
+            TIME_ZONE_INFORMATION info;
+            GetTimeZoneInformation(&info);
+            long timeZone = info.Bias * 60;  // convert minutes to seconds
+            return timeZone;
+        }
+        #define WX_TIMEZONE wxGetTimeZone()
+    #elif defined(__VISAGECPP__)
+        #define WX_TIMEZONE _timezone
+    #elif defined(__MWERKS__)
+        long wxmw_timezone = 28800;
+        #define WX_TIMEZONE wxmw_timezone
+    #elif defined(__DARWIN__)
+        #define WX_GMTOFF_IN_TM
+    #else // unknown platform - try timezone
+        #define WX_TIMEZONE timezone
+    #endif
+#endif // !WX_TIMEZONE && !WX_GMTOFF_IN_TM
+
+// everyone has strftime except Win CE unless VC8 is used
+#if !defined(__WXWINCE__) || defined(__VISUALC8__)
+    #define HAVE_STRFTIME
+#endif
+
+// NB: VC8 safe time functions could/should be used for wxMSW as well probably
+#if defined(__WXWINCE__) && defined(__VISUALC8__)
+
+struct tm *wxLocaltime_r(const time_t *t, struct tm* tm)
+{
+    __time64_t t64 = *t;
+    return _localtime64_s(tm, &t64) == 0 ? tm : NULL;
+}
+
+struct tm *wxGmtime_r(const time_t* t, struct tm* tm)
+{
+    __time64_t t64 = *t;
+    return _gmtime64_s(tm, &t64) == 0 ? tm : NULL;
+}
+
+#else // !wxWinCE with VC8
+
+#if (!defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)) && wxUSE_THREADS && !defined(__WINDOWS__)
+static wxMutex timeLock;
+#endif
+
+#ifndef HAVE_LOCALTIME_R
+struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp)
+{
+#if wxUSE_THREADS && !defined(__WINDOWS__)
+  // No need to waste time with a mutex on windows since it's using
+  // thread local storage for localtime anyway.
+  wxMutexLocker locker(timeLock);
+#endif
+
+  // Borland CRT crashes when passed 0 ticks for some reason, see SF bug 1704438
+#ifdef __BORLANDC__
+  if ( !*ticks )
+      return NULL;
+#endif
+
+  const tm * const t = localtime(ticks);
+  if ( !t )
+      return NULL;
+
+  memcpy(temp, t, sizeof(struct tm));
+  return temp;
+}
+#endif // !HAVE_LOCALTIME_R
+
+#ifndef HAVE_GMTIME_R
+struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp)
+{
+#if wxUSE_THREADS && !defined(__WINDOWS__)
+  // No need to waste time with a mutex on windows since it's
+  // using thread local storage for gmtime anyway.
+  wxMutexLocker locker(timeLock);
+#endif
+
+#ifdef __BORLANDC__
+  if ( !*ticks )
+      return NULL;
+#endif
+
+  const tm * const t = gmtime(ticks);
+  if ( !t )
+      return NULL;
+
+  memcpy(temp, gmtime(ticks), sizeof(struct tm));
+  return temp;
+}
+#endif // !HAVE_GMTIME_R
+
+#endif // wxWinCE with VC8/other platforms
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// debugging helper: just a convenient replacement of wxCHECK()
+#define wxDATETIME_CHECK(expr, msg) \
+    wxCHECK2_MSG(expr, *this = wxInvalidDateTime; return *this, msg)
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxDateTimeHolidaysModule : public wxModule
+{
+public:
+    virtual bool OnInit()
+    {
+        wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays);
+
+        return true;
+    }
+
+    virtual void OnExit()
+    {
+        wxDateTimeHolidayAuthority::ClearAllAuthorities();
+        wxDateTimeHolidayAuthority::ms_authorities.clear();
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxDateTimeHolidaysModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxDateTimeHolidaysModule, wxModule)
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// some trivial ones
+static const int MONTHS_IN_YEAR = 12;
+
+static const int SEC_PER_MIN = 60;
+
+static const int MIN_PER_HOUR = 60;
+
+static const int HOURS_PER_DAY = 24;
+
+static const long SECONDS_PER_DAY = 86400l;
+
+static const int DAYS_PER_WEEK = 7;
+
+static const long MILLISECONDS_PER_DAY = 86400000l;
+
+// this is the integral part of JDN of the midnight of Jan 1, 1970
+// (i.e. JDN(Jan 1, 1970) = 2440587.5)
+static const long EPOCH_JDN = 2440587l;
+
+// used only in asserts
+#ifdef __WXDEBUG__
+// the date of JDN -0.5 (as we don't work with fractional parts, this is the
+// reference date for us) is Nov 24, 4714BC
+static const int JDN_0_YEAR = -4713;
+static const int JDN_0_MONTH = wxDateTime::Nov;
+static const int JDN_0_DAY = 24;
+#endif // __WXDEBUG__
+
+// the constants used for JDN calculations
+static const long JDN_OFFSET         = 32046l;
+static const long DAYS_PER_5_MONTHS  = 153l;
+static const long DAYS_PER_4_YEARS   = 1461l;
+static const long DAYS_PER_400_YEARS = 146097l;
+
+// this array contains the cumulated number of days in all previous months for
+// normal and leap years
+static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] =
+{
+    { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 },
+    { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 }
+};
+
+// ----------------------------------------------------------------------------
+// global data
+// ----------------------------------------------------------------------------
+
+const wxChar * wxDefaultDateTimeFormat = wxT("%c");
+const wxChar * wxDefaultTimeSpanFormat = wxT("%H:%M:%S");
+
+// in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to
+// indicate an invalid wxDateTime object
+const wxDateTime wxDefaultDateTime;
+
+wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown;
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// debugger helper: shows what the date really is
+#ifdef __WXDEBUG__
+extern const wxChar *wxDumpDate(const wxDateTime* dt)
+{
+    static wxChar buf[128];
+
+    wxStrcpy(buf, dt->Format(_T("%Y-%m-%d (%a) %H:%M:%S")));
+
+    return buf;
+}
+#endif // Debug
+
+// get the number of days in the given month of the given year
+static inline
+wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month)
+{
+    // the number of days in month in Julian/Gregorian calendar: the first line
+    // is for normal years, the second one is for the leap ones
+    static wxDateTime::wxDateTime_t daysInMonth[2][MONTHS_IN_YEAR] =
+    {
+        { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
+        { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
+    };
+
+    return daysInMonth[wxDateTime::IsLeapYear(year)][month];
+}
+
+// returns the time zone in the C sense, i.e. the difference UTC - local
+// (in seconds)
+static int GetTimeZone()
+{
+#ifdef WX_GMTOFF_IN_TM
+    // set to true when the timezone is set
+    static bool s_timezoneSet = false;
+    static long gmtoffset = LONG_MAX; // invalid timezone
+
+    // ensure that the timezone variable is set by calling wxLocaltime_r
+    if ( !s_timezoneSet )
+    {
+        // just call wxLocaltime_r() instead of figuring out whether this
+        // system supports tzset(), _tzset() or something else
+        time_t t = 0;
+        struct tm tm;
+
+        wxLocaltime_r(&t, &tm);
+        s_timezoneSet = true;
+
+        // note that GMT offset is the opposite of time zone and so to return
+        // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
+        // cases we have to negate it
+        gmtoffset = -tm.tm_gmtoff;
+    }
+    return (int)gmtoffset;
+#else // !WX_GMTOFF_IN_TM
+    return WX_TIMEZONE;
+#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM
+}
+
+// return the integral part of the JDN for the midnight of the given date (to
+// get the real JDN you need to add 0.5, this is, in fact, JDN of the
+// noon of the previous day)
+static long GetTruncatedJDN(wxDateTime::wxDateTime_t day,
+                            wxDateTime::Month mon,
+                            int year)
+{
+    // CREDIT: code below is by Scott E. Lee (but bugs are mine)
+
+    // check the date validity
+    wxASSERT_MSG(
+      (year > JDN_0_YEAR) ||
+      ((year == JDN_0_YEAR) && (mon > JDN_0_MONTH)) ||
+      ((year == JDN_0_YEAR) && (mon == JDN_0_MONTH) && (day >= JDN_0_DAY)),
+      _T("date out of range - can't convert to JDN")
+                );
+
+    // make the year positive to avoid problems with negative numbers division
+    year += 4800;
+
+    // months are counted from March here
+    int month;
+    if ( mon >= wxDateTime::Mar )
+    {
+        month = mon - 2;
+    }
+    else
+    {
+        month = mon + 10;
+        year--;
+    }
+
+    // now we can simply add all the contributions together
+    return ((year / 100) * DAYS_PER_400_YEARS) / 4
+            + ((year % 100) * DAYS_PER_4_YEARS) / 4
+            + (month * DAYS_PER_5_MONTHS + 2) / 5
+            + day
+            - JDN_OFFSET;
+}
+
+#ifdef HAVE_STRFTIME
+
+// this function is a wrapper around strftime(3) adding error checking
+static wxString CallStrftime(const wxChar *format, const tm* tm)
+{
+    wxChar buf[4096];
+    // Create temp wxString here to work around mingw/cygwin bug 1046059
+    // http://sourceforge.net/tracker/?func=detail&atid=102435&aid=1046059&group_id=2435
+    wxString s;
+
+    if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) )
+    {
+        // buffer is too small?
+        wxFAIL_MSG(_T("strftime() failed"));
+    }
+
+    s = buf;
+    return s;
+}
+
+#endif // HAVE_STRFTIME
+
+#ifdef HAVE_STRPTIME
+
+#if wxUSE_UNIX && !defined(HAVE_STRPTIME_DECL)
+    // configure detected that we had strptime() but not its declaration,
+    // provide it ourselves
+    extern "C" char *strptime(const char *, const char *, struct tm *);
+#endif
+
+// Unicode-friendly strptime() wrapper
+static const wxChar *
+CallStrptime(const wxChar *input, const char *fmt, tm *tm)
+{
+    // the problem here is that strptime() returns pointer into the string we
+    // passed to it while we're really interested in the pointer into the
+    // original, Unicode, string so we try to transform the pointer back
+#if wxUSE_UNICODE
+    wxCharBuffer inputMB(wxConvertWX2MB(input));
+#else // ASCII
+    const char * const inputMB = input;
+#endif // Unicode/Ascii
+
+    const char *result = strptime(inputMB, fmt, tm);
+    if ( !result )
+        return NULL;
+
+#if wxUSE_UNICODE
+    // FIXME: this is wrong in presence of surrogates &c
+    return input + (result - inputMB.data());
+#else // ASCII
+    return result;
+#endif // Unicode/Ascii
+}
+
+#endif // HAVE_STRPTIME
+
+// if year and/or month have invalid values, replace them with the current ones
+static void ReplaceDefaultYearMonthWithCurrent(int *year,
+                                               wxDateTime::Month *month)
+{
+    struct tm *tmNow = NULL;
+    struct tm tmstruct;
+
+    if ( *year == wxDateTime::Inv_Year )
+    {
+        tmNow = wxDateTime::GetTmNow(&tmstruct);
+
+        *year = 1900 + tmNow->tm_year;
+    }
+
+    if ( *month == wxDateTime::Inv_Month )
+    {
+        if ( !tmNow )
+            tmNow = wxDateTime::GetTmNow(&tmstruct);
+
+        *month = (wxDateTime::Month)tmNow->tm_mon;
+    }
+}
+
+// fll the struct tm with default values
+static void InitTm(struct tm& tm)
+{
+    // struct tm may have etxra fields (undocumented and with unportable
+    // names) which, nevertheless, must be set to 0
+    memset(&tm, 0, sizeof(struct tm));
+
+    tm.tm_mday = 1;   // mday 0 is invalid
+    tm.tm_year = 76;  // any valid year
+    tm.tm_isdst = -1; // auto determine
+}
+
+// parsing helpers
+// ---------------
+
+// return the month if the string is a month name or Inv_Month otherwise
+static wxDateTime::Month GetMonthFromName(const wxString& name, int flags)
+{
+    wxDateTime::Month mon;
+    for ( mon = wxDateTime::Jan; mon < wxDateTime::Inv_Month; wxNextMonth(mon) )
+    {
+        // case-insensitive comparison either one of or with both abbreviated
+        // and not versions
+        if ( flags & wxDateTime::Name_Full )
+        {
+            if ( name.CmpNoCase(wxDateTime::
+                        GetMonthName(mon, wxDateTime::Name_Full)) == 0 )
+            {
+                break;
+            }
+        }
+
+        if ( flags & wxDateTime::Name_Abbr )
+        {
+            if ( name.CmpNoCase(wxDateTime::
+                        GetMonthName(mon, wxDateTime::Name_Abbr)) == 0 )
+            {
+                break;
+            }
+        }
+    }
+
+    return mon;
+}
+
+// return the weekday if the string is a weekday name or Inv_WeekDay otherwise
+static wxDateTime::WeekDay GetWeekDayFromName(const wxString& name, int flags)
+{
+    wxDateTime::WeekDay wd;
+    for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) )
+    {
+        // case-insensitive comparison either one of or with both abbreviated
+        // and not versions
+        if ( flags & wxDateTime::Name_Full )
+        {
+            if ( name.CmpNoCase(wxDateTime::
+                        GetWeekDayName(wd, wxDateTime::Name_Full)) == 0 )
+            {
+                break;
+            }
+        }
+
+        if ( flags & wxDateTime::Name_Abbr )
+        {
+            if ( name.CmpNoCase(wxDateTime::
+                        GetWeekDayName(wd, wxDateTime::Name_Abbr)) == 0 )
+            {
+                break;
+            }
+        }
+    }
+
+    return wd;
+}
+
+/* static */
+struct tm *wxDateTime::GetTmNow(struct tm *tmstruct)
+{
+    time_t t = GetTimeNow();
+    return wxLocaltime_r(&t, tmstruct);
+}
+
+// scans all digits (but no more than len) and returns the resulting number
+static bool GetNumericToken(size_t len, const wxChar*& p, unsigned long *number)
+{
+    size_t n = 1;
+    wxString s;
+    while ( wxIsdigit(*p) )
+    {
+        s += *p++;
+
+        if ( len && ++n > len )
+            break;
+    }
+
+    return !s.empty() && s.ToULong(number);
+}
+
+// scans all alphabetic characters and returns the resulting string
+static wxString GetAlphaToken(const wxChar*& p)
+{
+    wxString s;
+    while ( wxIsalpha(*p) )
+    {
+        s += *p++;
+    }
+
+    return s;
+}
+
+// ============================================================================
+// implementation of wxDateTime
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// struct Tm
+// ----------------------------------------------------------------------------
+
+wxDateTime::Tm::Tm()
+{
+    year = (wxDateTime_t)wxDateTime::Inv_Year;
+    mon = wxDateTime::Inv_Month;
+    mday = 0;
+    hour = min = sec = msec = 0;
+    wday = wxDateTime::Inv_WeekDay;
+}
+
+wxDateTime::Tm::Tm(const struct tm& tm, const TimeZone& tz)
+              : m_tz(tz)
+{
+    msec = 0;
+    sec = (wxDateTime::wxDateTime_t)tm.tm_sec;
+    min = (wxDateTime::wxDateTime_t)tm.tm_min;
+    hour = (wxDateTime::wxDateTime_t)tm.tm_hour;
+    mday = (wxDateTime::wxDateTime_t)tm.tm_mday;
+    mon = (wxDateTime::Month)tm.tm_mon;
+    year = 1900 + tm.tm_year;
+    wday = (wxDateTime::wxDateTime_t)tm.tm_wday;
+    yday = (wxDateTime::wxDateTime_t)tm.tm_yday;
+}
+
+bool wxDateTime::Tm::IsValid() const
+{
+    // we allow for the leap seconds, although we don't use them (yet)
+    return (year != wxDateTime::Inv_Year) && (mon != wxDateTime::Inv_Month) &&
+           (mday <= GetNumOfDaysInMonth(year, mon)) &&
+           (hour < 24) && (min < 60) && (sec < 62) && (msec < 1000);
+}
+
+void wxDateTime::Tm::ComputeWeekDay()
+{
+    // compute the week day from day/month/year: we use the dumbest algorithm
+    // possible: just compute our JDN and then use the (simple to derive)
+    // formula: weekday = (JDN + 1.5) % 7
+    wday = (wxDateTime::wxDateTime_t)((GetTruncatedJDN(mday, mon, year) + 2) % 7);
+}
+
+void wxDateTime::Tm::AddMonths(int monDiff)
+{
+    // normalize the months field
+    while ( monDiff < -mon )
+    {
+        year--;
+
+        monDiff += MONTHS_IN_YEAR;
+    }
+
+    while ( monDiff + mon >= MONTHS_IN_YEAR )
+    {
+        year++;
+
+        monDiff -= MONTHS_IN_YEAR;
+    }
+
+    mon = (wxDateTime::Month)(mon + monDiff);
+
+    wxASSERT_MSG( mon >= 0 && mon < MONTHS_IN_YEAR, _T("logic error") );
+
+    // NB: we don't check here that the resulting date is valid, this function
+    //     is private and the caller must check it if needed
+}
+
+void wxDateTime::Tm::AddDays(int dayDiff)
+{
+    // normalize the days field
+    while ( dayDiff + mday < 1 )
+    {
+        AddMonths(-1);
+
+        dayDiff += GetNumOfDaysInMonth(year, mon);
+    }
+
+    mday = (wxDateTime::wxDateTime_t)( mday + dayDiff );
+    while ( mday > GetNumOfDaysInMonth(year, mon) )
+    {
+        mday -= GetNumOfDaysInMonth(year, mon);
+
+        AddMonths(1);
+    }
+
+    wxASSERT_MSG( mday > 0 && mday <= GetNumOfDaysInMonth(year, mon),
+                  _T("logic error") );
+}
+
+// ----------------------------------------------------------------------------
+// class TimeZone
+// ----------------------------------------------------------------------------
+
+wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
+{
+    switch ( tz )
+    {
+        case wxDateTime::Local:
+            // get the offset from C RTL: it returns the difference GMT-local
+            // while we want to have the offset _from_ GMT, hence the '-'
+            m_offset = -GetTimeZone();
+            break;
+
+        case wxDateTime::GMT_12:
+        case wxDateTime::GMT_11:
+        case wxDateTime::GMT_10:
+        case wxDateTime::GMT_9:
+        case wxDateTime::GMT_8:
+        case wxDateTime::GMT_7:
+        case wxDateTime::GMT_6:
+        case wxDateTime::GMT_5:
+        case wxDateTime::GMT_4:
+        case wxDateTime::GMT_3:
+        case wxDateTime::GMT_2:
+        case wxDateTime::GMT_1:
+            m_offset = -3600*(wxDateTime::GMT0 - tz);
+            break;
+
+        case wxDateTime::GMT0:
+        case wxDateTime::GMT1:
+        case wxDateTime::GMT2:
+        case wxDateTime::GMT3:
+        case wxDateTime::GMT4:
+        case wxDateTime::GMT5:
+        case wxDateTime::GMT6:
+        case wxDateTime::GMT7:
+        case wxDateTime::GMT8:
+        case wxDateTime::GMT9:
+        case wxDateTime::GMT10:
+        case wxDateTime::GMT11:
+        case wxDateTime::GMT12:
+        case wxDateTime::GMT13:
+            m_offset = 3600*(tz - wxDateTime::GMT0);
+            break;
+
+        case wxDateTime::A_CST:
+            // Central Standard Time in use in Australia = UTC + 9.5
+            m_offset = 60l*(9*MIN_PER_HOUR + MIN_PER_HOUR/2);
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown time zone") );
+    }
+}
+
+// ----------------------------------------------------------------------------
+// static functions
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxDateTime::IsLeapYear(int year, wxDateTime::Calendar cal)
+{
+    if ( year == Inv_Year )
+        year = GetCurrentYear();
+
+    if ( cal == Gregorian )
+    {
+        // in Gregorian calendar leap years are those divisible by 4 except
+        // those divisible by 100 unless they're also divisible by 400
+        // (in some countries, like Russia and Greece, additional corrections
+        // exist, but they won't manifest themselves until 2700)
+        return (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0));
+    }
+    else if ( cal == Julian )
+    {
+        // in Julian calendar the rule is simpler
+        return year % 4 == 0;
+    }
+    else
+    {
+        wxFAIL_MSG(_T("unknown calendar"));
+
+        return false;
+    }
+}
+
+/* static */
+int wxDateTime::GetCentury(int year)
+{
+    return year > 0 ? year / 100 : year / 100 - 1;
+}
+
+/* static */
+int wxDateTime::ConvertYearToBC(int year)
+{
+    // year 0 is BC 1
+    return year > 0 ? year : year - 1;
+}
+
+/* static */
+int wxDateTime::GetCurrentYear(wxDateTime::Calendar cal)
+{
+    switch ( cal )
+    {
+        case Gregorian:
+            return Now().GetYear();
+
+        case Julian:
+            wxFAIL_MSG(_T("TODO"));
+            break;
+
+        default:
+            wxFAIL_MSG(_T("unsupported calendar"));
+            break;
+    }
+
+    return Inv_Year;
+}
+
+/* static */
+wxDateTime::Month wxDateTime::GetCurrentMonth(wxDateTime::Calendar cal)
+{
+    switch ( cal )
+    {
+        case Gregorian:
+            return Now().GetMonth();
+
+        case Julian:
+            wxFAIL_MSG(_T("TODO"));
+            break;
+
+        default:
+            wxFAIL_MSG(_T("unsupported calendar"));
+            break;
+    }
+
+    return Inv_Month;
+}
+
+/* static */
+wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(int year, Calendar cal)
+{
+    if ( year == Inv_Year )
+    {
+        // take the current year if none given
+        year = GetCurrentYear();
+    }
+
+    switch ( cal )
+    {
+        case Gregorian:
+        case Julian:
+            return IsLeapYear(year) ? 366 : 365;
+
+        default:
+            wxFAIL_MSG(_T("unsupported calendar"));
+            break;
+    }
+
+    return 0;
+}
+
+/* static */
+wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(wxDateTime::Month month,
+                                                     int year,
+                                                     wxDateTime::Calendar cal)
+{
+    wxCHECK_MSG( month < MONTHS_IN_YEAR, 0, _T("invalid month") );
+
+    if ( cal == Gregorian || cal == Julian )
+    {
+        if ( year == Inv_Year )
+        {
+            // take the current year if none given
+            year = GetCurrentYear();
+        }
+
+        return GetNumOfDaysInMonth(year, month);
+    }
+    else
+    {
+        wxFAIL_MSG(_T("unsupported calendar"));
+
+        return 0;
+    }
+}
+
+/* static */
+wxString wxDateTime::GetMonthName(wxDateTime::Month month,
+                                  wxDateTime::NameFlags flags)
+{
+    wxCHECK_MSG( month != Inv_Month, wxEmptyString, _T("invalid month") );
+#ifdef HAVE_STRFTIME
+    // notice that we must set all the fields to avoid confusing libc (GNU one
+    // gets confused to a crash if we don't do this)
+    tm tm;
+    InitTm(tm);
+    tm.tm_mon = month;
+
+    return CallStrftime(flags == Name_Abbr ? _T("%b") : _T("%B"), &tm);
+#else // !HAVE_STRFTIME
+    wxString ret;
+    switch(month)
+    {
+        case Jan:
+            ret = (flags == Name_Abbr ? wxT("Jan"): wxT("January"));
+            break;
+        case Feb:
+            ret = (flags == Name_Abbr ? wxT("Feb"): wxT("Febuary"));
+            break;
+        case Mar:
+            ret = (flags == Name_Abbr ? wxT("Mar"): wxT("March"));
+            break;
+        case Apr:
+            ret = (flags == Name_Abbr ? wxT("Apr"): wxT("April"));
+            break;
+        case May:
+            ret = (flags == Name_Abbr ? wxT("May"): wxT("May"));
+            break;
+        case Jun:
+            ret = (flags == Name_Abbr ? wxT("Jun"): wxT("June"));
+            break;
+        case Jul:
+            ret = (flags == Name_Abbr ? wxT("Jul"): wxT("July"));
+            break;
+        case Aug:
+            ret = (flags == Name_Abbr ? wxT("Aug"): wxT("August"));
+            break;
+        case Sep:
+            ret = (flags == Name_Abbr ? wxT("Sep"): wxT("September"));
+            break;
+        case Oct:
+            ret = (flags == Name_Abbr ? wxT("Oct"): wxT("October"));
+            break;
+        case Nov:
+            ret = (flags == Name_Abbr ? wxT("Nov"): wxT("November"));
+            break;
+        case Dec:
+            ret = (flags == Name_Abbr ? wxT("Dec"): wxT("December"));
+            break;
+    }
+    return ret;
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
+}
+
+/* static */
+wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday,
+                                    wxDateTime::NameFlags flags)
+{
+    wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, _T("invalid weekday") );
+#ifdef HAVE_STRFTIME
+    // take some arbitrary Sunday (but notice that the day should be such that
+    // after adding wday to it below we still have a valid date, e.g. don't
+    // take 28 here!)
+    tm tm;
+    InitTm(tm);
+    tm.tm_mday = 21;
+    tm.tm_mon = Nov;
+    tm.tm_year = 99;
+
+    // and offset it by the number of days needed to get the correct wday
+    tm.tm_mday += wday;
+
+    // call mktime() to normalize it...
+    (void)mktime(&tm);
+
+    // ... and call strftime()
+    return CallStrftime(flags == Name_Abbr ? _T("%a") : _T("%A"), &tm);
+#else // !HAVE_STRFTIME
+    wxString ret;
+    switch(wday)
+    {
+        case Sun:
+            ret = (flags == Name_Abbr ? wxT("Sun") : wxT("Sunday"));
+            break;
+        case Mon:
+            ret = (flags == Name_Abbr ? wxT("Mon") : wxT("Monday"));
+            break;
+        case Tue:
+            ret = (flags == Name_Abbr ? wxT("Tue") : wxT("Tuesday"));
+            break;
+        case Wed:
+            ret = (flags == Name_Abbr ? wxT("Wed") : wxT("Wednesday"));
+            break;
+        case Thu:
+            ret = (flags == Name_Abbr ? wxT("Thu") : wxT("Thursday"));
+            break;
+        case Fri:
+            ret = (flags == Name_Abbr ? wxT("Fri") : wxT("Friday"));
+            break;
+        case Sat:
+            ret = (flags == Name_Abbr ? wxT("Sat") : wxT("Saturday"));
+            break;
+    }
+    return ret;
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
+}
+
+/* static */
+void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm)
+{
+    tm tm;
+    InitTm(tm);
+    wxChar buffer[64];
+    // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code
+    // and causes an assertion failed if the buffer is to small (which is good) - OR -
+    // if strftime does not return anything because the format string is invalid - OR -
+    // if there are no 'am' / 'pm' tokens defined for the current locale (which is not good).
+    // wxDateTime::ParseTime will try several different formats to parse the time.
+    // As a result, GetAmPmStrings might get called, even if the current locale
+    // does not define any 'am' / 'pm' tokens. In this case, wxStrftime would
+    // assert, even though it is a perfectly legal use.
+    if ( am )
+    {
+        if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0)
+            *am = wxString(buffer);
+        else
+            *am = wxString();
+    }
+    if ( pm )
+    {
+        tm.tm_hour = 13;
+        if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0)
+            *pm = wxString(buffer);
+        else
+            *pm = wxString();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// Country stuff: date calculations depend on the country (DST, work days,
+// ...), so we need to know which rules to follow.
+// ----------------------------------------------------------------------------
+
+/* static */
+wxDateTime::Country wxDateTime::GetCountry()
+{
+    // TODO use LOCALE_ICOUNTRY setting under Win32
+#ifndef __WXWINCE__
+    if ( ms_country == Country_Unknown )
+    {
+        // try to guess from the time zone name
+        time_t t = time(NULL);
+        struct tm tmstruct;
+        struct tm *tm = wxLocaltime_r(&t, &tmstruct);
+
+        wxString tz = CallStrftime(_T("%Z"), tm);
+        if ( tz == _T("WET") || tz == _T("WEST") )
+        {
+            ms_country = UK;
+        }
+        else if ( tz == _T("CET") || tz == _T("CEST") )
+        {
+            ms_country = Country_EEC;
+        }
+        else if ( tz == _T("MSK") || tz == _T("MSD") )
+        {
+            ms_country = Russia;
+        }
+        else if ( tz == _T("AST") || tz == _T("ADT") ||
+                  tz == _T("EST") || tz == _T("EDT") ||
+                  tz == _T("CST") || tz == _T("CDT") ||
+                  tz == _T("MST") || tz == _T("MDT") ||
+                  tz == _T("PST") || tz == _T("PDT") )
+        {
+            ms_country = USA;
+        }
+        else
+        {
+            // well, choose a default one
+            ms_country = USA;
+        }
+    }
+#else // __WXWINCE__
+     ms_country = USA;
+#endif // !__WXWINCE__/__WXWINCE__
+
+    return ms_country;
+}
+
+/* static */
+void wxDateTime::SetCountry(wxDateTime::Country country)
+{
+    ms_country = country;
+}
+
+/* static */
+bool wxDateTime::IsWestEuropeanCountry(Country country)
+{
+    if ( country == Country_Default )
+    {
+        country = GetCountry();
+    }
+
+    return (Country_WesternEurope_Start <= country) &&
+           (country <= Country_WesternEurope_End);
+}
+
+// ----------------------------------------------------------------------------
+// DST calculations: we use 3 different rules for the West European countries,
+// USA and for the rest of the world. This is undoubtedly false for many
+// countries, but I lack the necessary info (and the time to gather it),
+// please add the other rules here!
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxDateTime::IsDSTApplicable(int year, Country country)
+{
+    if ( year == Inv_Year )
+    {
+        // take the current year if none given
+        year = GetCurrentYear();
+    }
+
+    if ( country == Country_Default )
+    {
+        country = GetCountry();
+    }
+
+    switch ( country )
+    {
+        case USA:
+        case UK:
+            // DST was first observed in the US and UK during WWI, reused
+            // during WWII and used again since 1966
+            return year >= 1966 ||
+                   (year >= 1942 && year <= 1945) ||
+                   (year == 1918 || year == 1919);
+
+        default:
+            // assume that it started after WWII
+            return year > 1950;
+    }
+}
+
+/* static */
+wxDateTime wxDateTime::GetBeginDST(int year, Country country)
+{
+    if ( year == Inv_Year )
+    {
+        // take the current year if none given
+        year = GetCurrentYear();
+    }
+
+    if ( country == Country_Default )
+    {
+        country = GetCountry();
+    }
+
+    if ( !IsDSTApplicable(year, country) )
+    {
+        return wxInvalidDateTime;
+    }
+
+    wxDateTime dt;
+
+    if ( IsWestEuropeanCountry(country) || (country == Russia) )
+    {
+        // DST begins at 1 a.m. GMT on the last Sunday of March
+        if ( !dt.SetToLastWeekDay(Sun, Mar, year) )
+        {
+            // weird...
+            wxFAIL_MSG( _T("no last Sunday in March?") );
+        }
+
+        dt += wxTimeSpan::Hours(1);
+
+        // disable DST tests because it could result in an infinite recursion!
+        dt.MakeGMT(true);
+    }
+    else switch ( country )
+    {
+        case USA:
+            switch ( year )
+            {
+                case 1918:
+                case 1919:
+                    // don't know for sure - assume it was in effect all year
+
+                case 1943:
+                case 1944:
+                case 1945:
+                    dt.Set(1, Jan, year);
+                    break;
+
+                case 1942:
+                    // DST was installed Feb 2, 1942 by the Congress
+                    dt.Set(2, Feb, year);
+                    break;
+
+                    // Oil embargo changed the DST period in the US
+                case 1974:
+                    dt.Set(6, Jan, 1974);
+                    break;
+
+                case 1975:
+                    dt.Set(23, Feb, 1975);
+                    break;
+
+                default:
+                    // before 1986, DST begun on the last Sunday of April, but
+                    // in 1986 Reagan changed it to begin at 2 a.m. of the
+                    // first Sunday in April
+                    if ( year < 1986 )
+                    {
+                        if ( !dt.SetToLastWeekDay(Sun, Apr, year) )
+                        {
+                            // weird...
+                            wxFAIL_MSG( _T("no first Sunday in April?") );
+                        }
+                    }
+                    else if ( year > 2006 )
+                    // Energy Policy Act of 2005, Pub. L. no. 109-58, 119 Stat 594 (2005).
+                    // Starting in 2007, daylight time begins in the United States on the
+                    // second Sunday in March and ends on the first Sunday in November
+                    {
+                        if ( !dt.SetToWeekDay(Sun, 2, Mar, year) )
+                        {
+                            // weird...
+                            wxFAIL_MSG( _T("no second Sunday in March?") );
+                        }
+                    }
+                    else
+                    {
+                        if ( !dt.SetToWeekDay(Sun, 1, Apr, year) )
+                        {
+                            // weird...
+                            wxFAIL_MSG( _T("no first Sunday in April?") );
+                        }
+                    }
+
+                    dt += wxTimeSpan::Hours(2);
+
+                    // TODO what about timezone??
+            }
+
+            break;
+
+        default:
+            // assume Mar 30 as the start of the DST for the rest of the world
+            // - totally bogus, of course
+            dt.Set(30, Mar, year);
+    }
+
+    return dt;
+}
+
+/* static */
+wxDateTime wxDateTime::GetEndDST(int year, Country country)
+{
+    if ( year == Inv_Year )
+    {
+        // take the current year if none given
+        year = GetCurrentYear();
+    }
+
+    if ( country == Country_Default )
+    {
+        country = GetCountry();
+    }
+
+    if ( !IsDSTApplicable(year, country) )
+    {
+        return wxInvalidDateTime;
+    }
+
+    wxDateTime dt;
+
+    if ( IsWestEuropeanCountry(country) || (country == Russia) )
+    {
+        // DST ends at 1 a.m. GMT on the last Sunday of October
+        if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
+        {
+            // weirder and weirder...
+            wxFAIL_MSG( _T("no last Sunday in October?") );
+        }
+
+        dt += wxTimeSpan::Hours(1);
+
+        // disable DST tests because it could result in an infinite recursion!
+        dt.MakeGMT(true);
+    }
+    else switch ( country )
+    {
+        case USA:
+            switch ( year )
+            {
+                case 1918:
+                case 1919:
+                    // don't know for sure - assume it was in effect all year
+
+                case 1943:
+                case 1944:
+                    dt.Set(31, Dec, year);
+                    break;
+
+                case 1945:
+                    // the time was reset after the end of the WWII
+                    dt.Set(30, Sep, year);
+                    break;
+
+                default: // default for switch (year)
+                    if ( year > 2006 )
+                      // Energy Policy Act of 2005, Pub. L. no. 109-58, 119 Stat 594 (2005).
+                      // Starting in 2007, daylight time begins in the United States on the
+                      // second Sunday in March and ends on the first Sunday in November
+                    {
+                        if ( !dt.SetToWeekDay(Sun, 1, Nov, year) )
+                        {
+                            // weird...
+                            wxFAIL_MSG( _T("no first Sunday in November?") );
+                        }
+                    }
+                    else
+                     // pre-2007
+                     // DST ends at 2 a.m. on the last Sunday of October
+                    {
+                        if ( !dt.SetToLastWeekDay(Sun, Oct, year) )
+                        {
+                            // weirder and weirder...
+                            wxFAIL_MSG( _T("no last Sunday in October?") );
+                        }
+                    }
+
+                    dt += wxTimeSpan::Hours(2);
+
+            // TODO: what about timezone??
+            }
+            break;
+
+        default: // default for switch (country)
+            // assume October 26th as the end of the DST - totally bogus too
+            dt.Set(26, Oct, year);
+    }
+
+    return dt;
+}
+
+// ----------------------------------------------------------------------------
+// constructors and assignment operators
+// ----------------------------------------------------------------------------
+
+// return the current time with ms precision
+/* static */ wxDateTime wxDateTime::UNow()
+{
+    return wxDateTime(wxGetLocalTimeMillis());
+}
+
+// the values in the tm structure contain the local time
+wxDateTime& wxDateTime::Set(const struct tm& tm)
+{
+    struct tm tm2(tm);
+    time_t timet = mktime(&tm2);
+
+    if ( timet == (time_t)-1 )
+    {
+        // mktime() rather unintuitively fails for Jan 1, 1970 if the hour is
+        // less than timezone - try to make it work for this case
+        if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 )
+        {
+            return Set((time_t)(
+                       GetTimeZone() +
+                       tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN +
+                       tm2.tm_min * SEC_PER_MIN +
+                       tm2.tm_sec));
+        }
+
+        wxFAIL_MSG( _T("mktime() failed") );
+
+        *this = wxInvalidDateTime;
+
+        return *this;
+    }
+    else
+    {
+        return Set(timet);
+    }
+}
+
+wxDateTime& wxDateTime::Set(wxDateTime_t hour,
+                            wxDateTime_t minute,
+                            wxDateTime_t second,
+                            wxDateTime_t millisec)
+{
+    // we allow seconds to be 61 to account for the leap seconds, even if we
+    // don't use them really
+    wxDATETIME_CHECK( hour < 24 &&
+                      second < 62 &&
+                      minute < 60 &&
+                      millisec < 1000,
+                      _T("Invalid time in wxDateTime::Set()") );
+
+    // get the current date from system
+    struct tm tmstruct;
+    struct tm *tm = GetTmNow(&tmstruct);
+
+    wxDATETIME_CHECK( tm, _T("wxLocaltime_r() failed") );
+
+    // make a copy so it isn't clobbered by the call to mktime() below
+    struct tm tm1(*tm);
+
+    // adjust the time
+    tm1.tm_hour = hour;
+    tm1.tm_min = minute;
+    tm1.tm_sec = second;
+
+    // and the DST in case it changes on this date
+    struct tm tm2(tm1);
+    mktime(&tm2);
+    if ( tm2.tm_isdst != tm1.tm_isdst )
+        tm1.tm_isdst = tm2.tm_isdst;
+
+    (void)Set(tm1);
+
+    // and finally adjust milliseconds
+    return SetMillisecond(millisec);
+}
+
+wxDateTime& wxDateTime::Set(wxDateTime_t day,
+                            Month        month,
+                            int          year,
+                            wxDateTime_t hour,
+                            wxDateTime_t minute,
+                            wxDateTime_t second,
+                            wxDateTime_t millisec)
+{
+    wxDATETIME_CHECK( hour < 24 &&
+                      second < 62 &&
+                      minute < 60 &&
+                      millisec < 1000,
+                      _T("Invalid time in wxDateTime::Set()") );
+
+    ReplaceDefaultYearMonthWithCurrent(&year, &month);
+
+    wxDATETIME_CHECK( (0 < day) && (day <= GetNumberOfDays(month, year)),
+                      _T("Invalid date in wxDateTime::Set()") );
+
+    // the range of time_t type (inclusive)
+    static const int yearMinInRange = 1970;
+    static const int yearMaxInRange = 2037;
+
+    // test only the year instead of testing for the exact end of the Unix
+    // time_t range - it doesn't bring anything to do more precise checks
+    if ( year >= yearMinInRange && year <= yearMaxInRange )
+    {
+        // use the standard library version if the date is in range - this is
+        // probably more efficient than our code
+        struct tm tm;
+        tm.tm_year = year - 1900;
+        tm.tm_mon = month;
+        tm.tm_mday = day;
+        tm.tm_hour = hour;
+        tm.tm_min = minute;
+        tm.tm_sec = second;
+        tm.tm_isdst = -1;       // mktime() will guess it
+
+        (void)Set(tm);
+
+        // and finally adjust milliseconds
+        if (IsValid())
+            SetMillisecond(millisec);
+
+        return *this;
+    }
+    else
+    {
+        // do time calculations ourselves: we want to calculate the number of
+        // milliseconds between the given date and the epoch
+
+        // get the JDN for the midnight of this day
+        m_time = GetTruncatedJDN(day, month, year);
+        m_time -= EPOCH_JDN;
+        m_time *= SECONDS_PER_DAY * TIME_T_FACTOR;
+
+        // JDN corresponds to GMT, we take localtime
+        Add(wxTimeSpan(hour, minute, second + GetTimeZone(), millisec));
+    }
+
+    return *this;
+}
+
+wxDateTime& wxDateTime::Set(double jdn)
+{
+    // so that m_time will be 0 for the midnight of Jan 1, 1970 which is jdn
+    // EPOCH_JDN + 0.5
+    jdn -= EPOCH_JDN + 0.5;
+
+    m_time.Assign(jdn*MILLISECONDS_PER_DAY);
+
+    // JDNs always are in UTC, so we don't need any adjustments for time zone
+
+    return *this;
+}
+
+wxDateTime& wxDateTime::ResetTime()
+{
+    Tm tm = GetTm();
+
+    if ( tm.hour || tm.min || tm.sec || tm.msec )
+    {
+        tm.msec =
+        tm.sec =
+        tm.min =
+        tm.hour = 0;
+
+        Set(tm);
+    }
+
+    return *this;
+}
+
+wxDateTime wxDateTime::GetDateOnly() const
+{
+    Tm tm = GetTm();
+    tm.msec =
+    tm.sec =
+    tm.min =
+    tm.hour = 0;
+    return wxDateTime(tm);
+}
+
+// ----------------------------------------------------------------------------
+// DOS Date and Time Format functions
+// ----------------------------------------------------------------------------
+// the dos date and time value is an unsigned 32 bit value in the format:
+// YYYYYYYMMMMDDDDDhhhhhmmmmmmsssss
+//
+// Y = year offset from 1980 (0-127)
+// M = month (1-12)
+// D = day of month (1-31)
+// h = hour (0-23)
+// m = minute (0-59)
+// s = bisecond (0-29) each bisecond indicates two seconds
+// ----------------------------------------------------------------------------
+
+wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt)
+{
+    struct tm tm;
+    InitTm(tm);
+
+    long year = ddt & 0xFE000000;
+    year >>= 25;
+    year += 80;
+    tm.tm_year = year;
+
+    long month = ddt & 0x1E00000;
+    month >>= 21;
+    month -= 1;
+    tm.tm_mon = month;
+
+    long day = ddt & 0x1F0000;
+    day >>= 16;
+    tm.tm_mday = day;
+
+    long hour = ddt & 0xF800;
+    hour >>= 11;
+    tm.tm_hour = hour;
+
+    long minute = ddt & 0x7E0;
+    minute >>= 5;
+    tm.tm_min = minute;
+
+    long second = ddt & 0x1F;
+    tm.tm_sec = second * 2;
+
+    return Set(mktime(&tm));
+}
+
+unsigned long wxDateTime::GetAsDOS() const
+{
+    unsigned long ddt;
+    time_t ticks = GetTicks();
+    struct tm tmstruct;
+    struct tm *tm = wxLocaltime_r(&ticks, &tmstruct);
+    wxCHECK_MSG( tm, ULONG_MAX, _T("time can't be represented in DOS format") );
+
+    long year = tm->tm_year;
+    year -= 80;
+    year <<= 25;
+
+    long month = tm->tm_mon;
+    month += 1;
+    month <<= 21;
+
+    long day = tm->tm_mday;
+    day <<= 16;
+
+    long hour = tm->tm_hour;
+    hour <<= 11;
+
+    long minute = tm->tm_min;
+    minute <<= 5;
+
+    long second = tm->tm_sec;
+    second /= 2;
+
+    ddt = year | month | day | hour | minute | second;
+    return ddt;
+}
+
+// ----------------------------------------------------------------------------
+// time_t <-> broken down time conversions
+// ----------------------------------------------------------------------------
+
+wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const
+{
+    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+
+    time_t time = GetTicks();
+    if ( time != (time_t)-1 )
+    {
+        // use C RTL functions
+        struct tm tmstruct;
+        tm *tm;
+        if ( tz.GetOffset() == -GetTimeZone() )
+        {
+            // we are working with local time
+            tm = wxLocaltime_r(&time, &tmstruct);
+
+            // should never happen
+            wxCHECK_MSG( tm, Tm(), _T("wxLocaltime_r() failed") );
+        }
+        else
+        {
+            time += (time_t)tz.GetOffset();
+#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
+            int time2 = (int) time;
+            if ( time2 >= 0 )
+#else
+            if ( time >= 0 )
+#endif
+            {
+                tm = wxGmtime_r(&time, &tmstruct);
+
+                // should never happen
+                wxCHECK_MSG( tm, Tm(), _T("wxGmtime_r() failed") );
+            }
+            else
+            {
+                tm = (struct tm *)NULL;
+            }
+        }
+
+        if ( tm )
+        {
+            // adjust the milliseconds
+            Tm tm2(*tm, tz);
+            long timeOnly = (m_time % MILLISECONDS_PER_DAY).ToLong();
+            tm2.msec = (wxDateTime_t)(timeOnly % 1000);
+            return tm2;
+        }
+        //else: use generic code below
+    }
+
+    // remember the time and do the calculations with the date only - this
+    // eliminates rounding errors of the floating point arithmetics
+
+    wxLongLong timeMidnight = m_time + tz.GetOffset() * 1000;
+
+    long timeOnly = (timeMidnight % MILLISECONDS_PER_DAY).ToLong();
+
+    // we want to always have positive time and timeMidnight to be really
+    // the midnight before it
+    if ( timeOnly < 0 )
+    {
+        timeOnly = MILLISECONDS_PER_DAY + timeOnly;
+    }
+
+    timeMidnight -= timeOnly;
+
+    // calculate the Gregorian date from JDN for the midnight of our date:
+    // this will yield day, month (in 1..12 range) and year
+
+    // actually, this is the JDN for the noon of the previous day
+    long jdn = (timeMidnight / MILLISECONDS_PER_DAY).ToLong() + EPOCH_JDN;
+
+    // CREDIT: code below is by Scott E. Lee (but bugs are mine)
+
+    wxASSERT_MSG( jdn > -2, _T("JDN out of range") );
+
+    // calculate the century
+    long temp = (jdn + JDN_OFFSET) * 4 - 1;
+    long century = temp / DAYS_PER_400_YEARS;
+
+    // then the year and day of year (1 <= dayOfYear <= 366)
+    temp = ((temp % DAYS_PER_400_YEARS) / 4) * 4 + 3;
+    long year = (century * 100) + (temp / DAYS_PER_4_YEARS);
+    long dayOfYear = (temp % DAYS_PER_4_YEARS) / 4 + 1;
+
+    // and finally the month and day of the month
+    temp = dayOfYear * 5 - 3;
+    long month = temp / DAYS_PER_5_MONTHS;
+    long day = (temp % DAYS_PER_5_MONTHS) / 5 + 1;
+
+    // month is counted from March - convert to normal
+    if ( month < 10 )
+    {
+        month += 3;
+    }
+    else
+    {
+        year += 1;
+        month -= 9;
+    }
+
+    // year is offset by 4800
+    year -= 4800;
+
+    // check that the algorithm gave us something reasonable
+    wxASSERT_MSG( (0 < month) && (month <= 12), _T("invalid month") );
+    wxASSERT_MSG( (1 <= day) && (day < 32), _T("invalid day") );
+
+    // construct Tm from these values
+    Tm tm;
+    tm.year = (int)year;
+    tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0
+    tm.mday = (wxDateTime_t)day;
+    tm.msec = (wxDateTime_t)(timeOnly % 1000);
+    timeOnly -= tm.msec;
+    timeOnly /= 1000;               // now we have time in seconds
+
+    tm.sec = (wxDateTime_t)(timeOnly % SEC_PER_MIN);
+    timeOnly -= tm.sec;
+    timeOnly /= SEC_PER_MIN;        // now we have time in minutes
+
+    tm.min = (wxDateTime_t)(timeOnly % MIN_PER_HOUR);
+    timeOnly -= tm.min;
+
+    tm.hour = (wxDateTime_t)(timeOnly / MIN_PER_HOUR);
+
+    return tm;
+}
+
+wxDateTime& wxDateTime::SetYear(int year)
+{
+    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+
+    Tm tm(GetTm());
+    tm.year = year;
+    Set(tm);
+
+    return *this;
+}
+
+wxDateTime& wxDateTime::SetMonth(Month month)
+{
+    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+
+    Tm tm(GetTm());
+    tm.mon = month;
+    Set(tm);
+
+    return *this;
+}
+
+wxDateTime& wxDateTime::SetDay(wxDateTime_t mday)
+{
+    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+
+    Tm tm(GetTm());
+    tm.mday = mday;
+    Set(tm);
+
+    return *this;
+}
+
+wxDateTime& wxDateTime::SetHour(wxDateTime_t hour)
+{
+    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+
+    Tm tm(GetTm());
+    tm.hour = hour;
+    Set(tm);
+
+    return *this;
+}
+
+wxDateTime& wxDateTime::SetMinute(wxDateTime_t min)
+{
+    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+
+    Tm tm(GetTm());
+    tm.min = min;
+    Set(tm);
+
+    return *this;
+}
+
+wxDateTime& wxDateTime::SetSecond(wxDateTime_t sec)
+{
+    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+
+    Tm tm(GetTm());
+    tm.sec = sec;
+    Set(tm);
+
+    return *this;
+}
+
+wxDateTime& wxDateTime::SetMillisecond(wxDateTime_t millisecond)
+{
+    wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") );
+
+    // we don't need to use GetTm() for this one
+    m_time -= m_time % 1000l;
+    m_time += millisecond;
+
+    return *this;
+}
+
+// ----------------------------------------------------------------------------
+// wxDateTime arithmetics
+// ----------------------------------------------------------------------------
+
+wxDateTime& wxDateTime::Add(const wxDateSpan& diff)
+{
+    Tm tm(GetTm());
+
+    tm.year += diff.GetYears();
+    tm.AddMonths(diff.GetMonths());
+
+    // check that the resulting date is valid
+    if ( tm.mday > GetNumOfDaysInMonth(tm.year, tm.mon) )
+    {
+        // We suppose that when adding one month to Jan 31 we want to get Feb
+        // 28 (or 29), i.e. adding a month to the last day of the month should
+        // give the last day of the next month which is quite logical.
+        //
+        // Unfortunately, there is no logic way to understand what should
+        // Jan 30 + 1 month be - Feb 28 too or Feb 27 (assuming non leap year)?
+        // We make it Feb 28 (last day too), but it is highly questionable.
+        tm.mday = GetNumOfDaysInMonth(tm.year, tm.mon);
+    }
+
+    tm.AddDays(diff.GetTotalDays());
+
+    Set(tm);
+
+    wxASSERT_MSG( IsSameTime(tm),
+                  _T("Add(wxDateSpan) shouldn't modify time") );
+
+    return *this;
+}
+
+// ----------------------------------------------------------------------------
+// Weekday and monthday stuff
+// ----------------------------------------------------------------------------
+
+// convert Sun, Mon, ..., Sat into 6, 0, ..., 5
+static inline int ConvertWeekDayToMondayBase(int wd)
+{
+    return wd == wxDateTime::Sun ? 6 : wd - 1;
+}
+
+/* static */
+wxDateTime
+wxDateTime::SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay wd)
+{
+    wxASSERT_MSG( numWeek > 0,
+                  _T("invalid week number: weeks are counted from 1") );
+
+    // Jan 4 always lies in the 1st week of the year
+    wxDateTime dt(4, Jan, year);
+    dt.SetToWeekDayInSameWeek(wd);
+    dt += wxDateSpan::Weeks(numWeek - 1);
+
+    return dt;
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+// use a separate function to avoid warnings about using deprecated
+// SetToTheWeek in GetWeek below
+static wxDateTime
+SetToTheWeek(int year,
+             wxDateTime::wxDateTime_t numWeek,
+             wxDateTime::WeekDay weekday,
+             wxDateTime::WeekFlags flags)
+{
+    // Jan 4 always lies in the 1st week of the year
+    wxDateTime dt(4, wxDateTime::Jan, year);
+    dt.SetToWeekDayInSameWeek(weekday, flags);
+    dt += wxDateSpan::Weeks(numWeek - 1);
+
+    return dt;
+}
+
+bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek,
+                              WeekDay weekday,
+                              WeekFlags flags)
+{
+    int year = GetYear();
+    *this = ::SetToTheWeek(year, numWeek, weekday, flags);
+    if ( GetYear() != year )
+    {
+        // oops... numWeek was too big
+        return false;
+    }
+
+    return true;
+}
+
+wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek,
+                               WeekDay weekday,
+                               WeekFlags flags) const
+{
+    return ::SetToTheWeek(GetYear(), numWeek, weekday, flags);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+wxDateTime& wxDateTime::SetToLastMonthDay(Month month,
+                                          int year)
+{
+    // take the current month/year if none specified
+    if ( year == Inv_Year )
+        year = GetYear();
+    if ( month == Inv_Month )
+        month = GetMonth();
+
+    return Set(GetNumOfDaysInMonth(year, month), month, year);
+}
+
+wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags)
+{
+    wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
+
+    int wdayDst = weekday,
+        wdayThis = GetWeekDay();
+    if ( wdayDst == wdayThis )
+    {
+        // nothing to do
+        return *this;
+    }
+
+    if ( flags == Default_First )
+    {
+        flags = GetCountry() == USA ? Sunday_First : Monday_First;
+    }
+
+    // the logic below based on comparing weekday and wdayThis works if Sun (0)
+    // is the first day in the week, but breaks down for Monday_First case so
+    // we adjust the week days in this case
+    if ( flags == Monday_First )
+    {
+        if ( wdayThis == Sun )
+            wdayThis += 7;
+        if ( wdayDst == Sun )
+            wdayDst += 7;
+    }
+    //else: Sunday_First, nothing to do
+
+    // go forward or back in time to the day we want
+    if ( wdayDst < wdayThis )
+    {
+        return Subtract(wxDateSpan::Days(wdayThis - wdayDst));
+    }
+    else // weekday > wdayThis
+    {
+        return Add(wxDateSpan::Days(wdayDst - wdayThis));
+    }
+}
+
+wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday)
+{
+    wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
+
+    int diff;
+    WeekDay wdayThis = GetWeekDay();
+    if ( weekday == wdayThis )
+    {
+        // nothing to do
+        return *this;
+    }
+    else if ( weekday < wdayThis )
+    {
+        // need to advance a week
+        diff = 7 - (wdayThis - weekday);
+    }
+    else // weekday > wdayThis
+    {
+        diff = weekday - wdayThis;
+    }
+
+    return Add(wxDateSpan::Days(diff));
+}
+
+wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday)
+{
+    wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") );
+
+    int diff;
+    WeekDay wdayThis = GetWeekDay();
+    if ( weekday == wdayThis )
+    {
+        // nothing to do
+        return *this;
+    }
+    else if ( weekday > wdayThis )
+    {
+        // need to go to previous week
+        diff = 7 - (weekday - wdayThis);
+    }
+    else // weekday < wdayThis
+    {
+        diff = wdayThis - weekday;
+    }
+
+    return Subtract(wxDateSpan::Days(diff));
+}
+
+bool wxDateTime::SetToWeekDay(WeekDay weekday,
+                              int n,
+                              Month month,
+                              int year)
+{
+    wxCHECK_MSG( weekday != Inv_WeekDay, false, _T("invalid weekday") );
+
+    // we don't check explicitly that -5 <= n <= 5 because we will return false
+    // anyhow in such case - but may be should still give an assert for it?
+
+    // take the current month/year if none specified
+    ReplaceDefaultYearMonthWithCurrent(&year, &month);
+
+    wxDateTime dt;
+
+    // TODO this probably could be optimised somehow...
+
+    if ( n > 0 )
+    {
+        // get the first day of the month
+        dt.Set(1, month, year);
+
+        // get its wday
+        WeekDay wdayFirst = dt.GetWeekDay();
+
+        // go to the first weekday of the month
+        int diff = weekday - wdayFirst;
+        if ( diff < 0 )
+            diff += 7;
+
+        // add advance n-1 weeks more
+        diff += 7*(n - 1);
+
+        dt += wxDateSpan::Days(diff);
+    }
+    else // count from the end of the month
+    {
+        // get the last day of the month
+        dt.SetToLastMonthDay(month, year);
+
+        // get its wday
+        WeekDay wdayLast = dt.GetWeekDay();
+
+        // go to the last weekday of the month
+        int diff = wdayLast - weekday;
+        if ( diff < 0 )
+            diff += 7;
+
+        // and rewind n-1 weeks from there
+        diff += 7*(-n - 1);
+
+        dt -= wxDateSpan::Days(diff);
+    }
+
+    // check that it is still in the same month
+    if ( dt.GetMonth() == month )
+    {
+        *this = dt;
+
+        return true;
+    }
+    else
+    {
+        // no such day in this month
+        return false;
+    }
+}
+
+static inline
+wxDateTime::wxDateTime_t GetDayOfYearFromTm(const wxDateTime::Tm& tm)
+{
+    return (wxDateTime::wxDateTime_t)(gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday);
+}
+
+wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const
+{
+    return GetDayOfYearFromTm(GetTm(tz));
+}
+
+wxDateTime::wxDateTime_t
+wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const
+{
+    if ( flags == Default_First )
+    {
+        flags = GetCountry() == USA ? Sunday_First : Monday_First;
+    }
+
+    Tm tm(GetTm(tz));
+    wxDateTime_t nDayInYear = GetDayOfYearFromTm(tm);
+
+    int wdTarget = GetWeekDay(tz);
+    int wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay();
+    int week;
+    if ( flags == Sunday_First )
+    {
+        // FIXME: First week is not calculated correctly.
+        week = (nDayInYear - wdTarget + 7) / 7;
+        if ( wdYearStart == Wed || wdYearStart == Thu )
+            week++;
+    }
+    else // week starts with monday
+    {
+        // adjust the weekdays to non-US style.
+        wdYearStart = ConvertWeekDayToMondayBase(wdYearStart);
+        wdTarget = ConvertWeekDayToMondayBase(wdTarget);
+
+        // quoting from http://www.cl.cam.ac.uk/~mgk25/iso-time.html:
+        //
+        //      Week 01 of a year is per definition the first week that has the
+        //      Thursday in this year, which is equivalent to the week that
+        //      contains the fourth day of January. In other words, the first
+        //      week of a new year is the week that has the majority of its
+        //      days in the new year. Week 01 might also contain days from the
+        //      previous year and the week before week 01 of a year is the last
+        //      week (52 or 53) of the previous year even if it contains days
+        //      from the new year. A week starts with Monday (day 1) and ends
+        //      with Sunday (day 7).
+        //
+
+        // if Jan 1 is Thursday or less, it is in the first week of this year
+        if ( wdYearStart < 4 )
+        {
+            // count the number of entire weeks between Jan 1 and this date
+            week = (nDayInYear + wdYearStart + 6 - wdTarget)/7;
+
+            // be careful to check for overflow in the next year
+            if ( week == 53 && tm.mday - wdTarget > 28 )
+                    week = 1;
+        }
+        else // Jan 1 is in the last week of the previous year
+        {
+            // check if we happen to be at the last week of previous year:
+            if ( tm.mon == Jan && tm.mday < 8 - wdYearStart )
+                week = wxDateTime(31, Dec, GetYear()-1).GetWeekOfYear();
+            else
+                week = (nDayInYear + wdYearStart - 1 - wdTarget)/7;
+        }
+    }
+
+    return (wxDateTime::wxDateTime_t)week;
+}
+
+wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags,
+                                                    const TimeZone& tz) const
+{
+    Tm tm = GetTm(tz);
+    const wxDateTime dateFirst = wxDateTime(1, tm.mon, tm.year);
+    const wxDateTime::WeekDay wdFirst = dateFirst.GetWeekDay();
+
+    if ( flags == Default_First )
+    {
+        flags = GetCountry() == USA ? Sunday_First : Monday_First;
+    }
+
+    // compute offset of dateFirst from the beginning of the week
+    int firstOffset;
+    if ( flags == Sunday_First )
+        firstOffset = wdFirst - Sun;
+    else
+        firstOffset = wdFirst == Sun ? DAYS_PER_WEEK - 1 : wdFirst - Mon;
+
+    return (wxDateTime::wxDateTime_t)((tm.mday - 1 + firstOffset)/7 + 1);
+}
+
+wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday)
+{
+    int year = GetYear();
+    wxDATETIME_CHECK( (0 < yday) && (yday <= GetNumberOfDays(year)),
+                      _T("invalid year day") );
+
+    bool isLeap = IsLeapYear(year);
+    for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) )
+    {
+        // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we
+        // don't need it neither - because of the CHECK above we know that
+        // yday lies in December then
+        if ( (mon == Dec) || (yday <= gs_cumulatedDays[isLeap][mon + 1]) )
+        {
+            Set((wxDateTime::wxDateTime_t)(yday - gs_cumulatedDays[isLeap][mon]), mon, year);
+
+            break;
+        }
+    }
+
+    return *this;
+}
+
+// ----------------------------------------------------------------------------
+// Julian day number conversion and related stuff
+// ----------------------------------------------------------------------------
+
+double wxDateTime::GetJulianDayNumber() const
+{
+    return m_time.ToDouble() / MILLISECONDS_PER_DAY + EPOCH_JDN + 0.5;
+}
+
+double wxDateTime::GetRataDie() const
+{
+    // March 1 of the year 0 is Rata Die day -306 and JDN 1721119.5
+    return GetJulianDayNumber() - 1721119.5 - 306;
+}
+
+// ----------------------------------------------------------------------------
+// timezone and DST stuff
+// ----------------------------------------------------------------------------
+
+int wxDateTime::IsDST(wxDateTime::Country country) const
+{
+    wxCHECK_MSG( country == Country_Default, -1,
+                 _T("country support not implemented") );
+
+    // use the C RTL for the dates in the standard range
+    time_t timet = GetTicks();
+    if ( timet != (time_t)-1 )
+    {
+        struct tm tmstruct;
+        tm *tm = wxLocaltime_r(&timet, &tmstruct);
+
+        wxCHECK_MSG( tm, -1, _T("wxLocaltime_r() failed") );
+
+        return tm->tm_isdst;
+    }
+    else
+    {
+        int year = GetYear();
+
+        if ( !IsDSTApplicable(year, country) )
+        {
+            // no DST time in this year in this country
+            return -1;
+        }
+
+        return IsBetween(GetBeginDST(year, country), GetEndDST(year, country));
+    }
+}
+
+wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
+{
+    long secDiff = GetTimeZone() + tz.GetOffset();
+
+    // we need to know whether DST is or not in effect for this date unless
+    // the test disabled by the caller
+    if ( !noDST && (IsDST() == 1) )
+    {
+        // FIXME we assume that the DST is always shifted by 1 hour
+        secDiff -= 3600;
+    }
+
+    return Add(wxTimeSpan::Seconds(secDiff));
+}
+
+wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
+{
+    long secDiff = GetTimeZone() + tz.GetOffset();
+
+    // we need to know whether DST is or not in effect for this date unless
+    // the test disabled by the caller
+    if ( !noDST && (IsDST() == 1) )
+    {
+        // FIXME we assume that the DST is always shifted by 1 hour
+        secDiff -= 3600;
+    }
+
+    return Subtract(wxTimeSpan::Seconds(secDiff));
+}
+
+// ----------------------------------------------------------------------------
+// wxDateTime to/from text representations
+// ----------------------------------------------------------------------------
+
+wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const
+{
+    wxCHECK_MSG( format, wxEmptyString, _T("NULL format in wxDateTime::Format") );
+
+    time_t time = GetTicks();
+
+    // we have to use our own implementation if the date is out of range of
+    // strftime() or if we use non standard specificators
+#ifdef HAVE_STRFTIME
+    if ( (time != (time_t)-1) && !wxStrstr(format, _T("%l")) )
+    {
+        // use strftime()
+        struct tm tmstruct;
+        struct tm *tm;
+        if ( tz.GetOffset() == -GetTimeZone() )
+        {
+            // we are working with local time
+            tm = wxLocaltime_r(&time, &tmstruct);
+
+            // should never happen
+            wxCHECK_MSG( tm, wxEmptyString, _T("wxLocaltime_r() failed") );
+        }
+        else
+        {
+            time += (int)tz.GetOffset();
+
+#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
+            int time2 = (int) time;
+            if ( time2 >= 0 )
+#else
+            if ( time >= 0 )
+#endif
+            {
+                tm = wxGmtime_r(&time, &tmstruct);
+
+                // should never happen
+                wxCHECK_MSG( tm, wxEmptyString, _T("wxGmtime_r() failed") );
+            }
+            else
+            {
+                tm = (struct tm *)NULL;
+            }
+        }
+
+        if ( tm )
+        {
+            return CallStrftime(format, tm);
+        }
+    }
+    //else: use generic code below
+#endif // HAVE_STRFTIME
+
+    // we only parse ANSI C format specifications here, no POSIX 2
+    // complications, no GNU extensions but we do add support for a "%l" format
+    // specifier allowing to get the number of milliseconds
+    Tm tm = GetTm(tz);
+
+    // used for calls to strftime() when we only deal with time
+    struct tm tmTimeOnly;
+    memset(&tmTimeOnly, 0, sizeof(tmTimeOnly));
+    tmTimeOnly.tm_hour = tm.hour;
+    tmTimeOnly.tm_min = tm.min;
+    tmTimeOnly.tm_sec = tm.sec;
+    tmTimeOnly.tm_wday = 0;
+    tmTimeOnly.tm_yday = 0;
+    tmTimeOnly.tm_mday = 1;         // any date will do, use 1976-01-01
+    tmTimeOnly.tm_mon = 0;
+    tmTimeOnly.tm_year = 76;
+    tmTimeOnly.tm_isdst = 0;        // no DST, we adjust for tz ourselves
+
+    wxString tmp, res, fmt;
+    for ( const wxChar *p = format; *p; p++ )
+    {
+        if ( *p != _T('%') )
+        {
+            // copy as is
+            res += *p;
+
+            continue;
+        }
+
+        // set the default format
+        switch ( *++p )
+        {
+            case _T('Y'):               // year has 4 digits
+                fmt = _T("%04d");
+                break;
+
+            case _T('j'):               // day of year has 3 digits
+            case _T('l'):               // milliseconds have 3 digits
+                fmt = _T("%03d");
+                break;
+
+            case _T('w'):               // week day as number has only one
+                fmt = _T("%d");
+                break;
+
+            default:
+                // it's either another valid format specifier in which case
+                // the format is "%02d" (for all the rest) or we have the
+                // field width preceding the format in which case it will
+                // override the default format anyhow
+                fmt = _T("%02d");
+        }
+
+        bool restart = true;
+        while ( restart )
+        {
+            restart = false;
+
+            // start of the format specification
+            switch ( *p )
+            {
+                case _T('a'):       // a weekday name
+                case _T('A'):
+                    // second parameter should be true for abbreviated names
+                    res += GetWeekDayName(tm.GetWeekDay(),
+                                          *p == _T('a') ? Name_Abbr : Name_Full);
+                    break;
+
+                case _T('b'):       // a month name
+                case _T('B'):
+                    res += GetMonthName(tm.mon,
+                                        *p == _T('b') ? Name_Abbr : Name_Full);
+                    break;
+
+                case _T('c'):       // locale default date and time  representation
+                case _T('x'):       // locale default date representation
+#ifdef HAVE_STRFTIME
+                    //
+                    // the problem: there is no way to know what do these format
+                    // specifications correspond to for the current locale.
+                    //
+                    // the solution: use a hack and still use strftime(): first
+                    // find the YEAR which is a year in the strftime() range (1970
+                    // - 2038) whose Jan 1 falls on the same week day as the Jan 1
+                    // of the real year. Then make a copy of the format and
+                    // replace all occurrences of YEAR in it with some unique
+                    // string not appearing anywhere else in it, then use
+                    // strftime() to format the date in year YEAR and then replace
+                    // YEAR back by the real year and the unique replacement
+                    // string back with YEAR. Notice that "all occurrences of YEAR"
+                    // means all occurrences of 4 digit as well as 2 digit form!
+                    //
+                    // the bugs: we assume that neither of %c nor %x contains any
+                    // fields which may change between the YEAR and real year. For
+                    // example, the week number (%U, %W) and the day number (%j)
+                    // will change if one of these years is leap and the other one
+                    // is not!
+                    {
+                        // find the YEAR: normally, for any year X, Jan 1 or the
+                        // year X + 28 is the same weekday as Jan 1 of X (because
+                        // the weekday advances by 1 for each normal X and by 2
+                        // for each leap X, hence by 5 every 4 years or by 35
+                        // which is 0 mod 7 every 28 years) but this rule breaks
+                        // down if there are years between X and Y which are
+                        // divisible by 4 but not leap (i.e. divisible by 100 but
+                        // not 400), hence the correction.
+
+                        int yearReal = GetYear(tz);
+                        int mod28 = yearReal % 28;
+
+                        // be careful to not go too far - we risk to leave the
+                        // supported range
+                        int year;
+                        if ( mod28 < 10 )
+                        {
+                            year = 1988 + mod28;      // 1988 == 0 (mod 28)
+                        }
+                        else
+                        {
+                            year = 1970 + mod28 - 10; // 1970 == 10 (mod 28)
+                        }
+
+                        int nCentury = year / 100,
+                            nCenturyReal = yearReal / 100;
+
+                        // need to adjust for the years divisble by 400 which are
+                        // not leap but are counted like leap ones if we just take
+                        // the number of centuries in between for nLostWeekDays
+                        int nLostWeekDays = (nCentury - nCenturyReal) -
+                                            (nCentury / 4 - nCenturyReal / 4);
+
+                        // we have to gain back the "lost" weekdays: note that the
+                        // effect of this loop is to not do anything to
+                        // nLostWeekDays (which we won't use any more), but to
+                        // (indirectly) set the year correctly
+                        while ( (nLostWeekDays % 7) != 0 )
+                        {
+                            nLostWeekDays += year++ % 4 ? 1 : 2;
+                        }
+
+                        // Keep year below 2000 so the 2digit year number
+                        // can never match the month or day of the month
+                        if (year>=2000) year-=28;
+                        // at any rate, we couldn't go further than 1988 + 9 + 28!
+                        wxASSERT_MSG( year < 2030,
+                                      _T("logic error in wxDateTime::Format") );
+
+                        wxString strYear, strYear2;
+                        strYear.Printf(_T("%d"), year);
+                        strYear2.Printf(_T("%d"), year % 100);
+
+                        // find four strings not occurring in format (this is surely
+                        // not the optimal way of doing it... improvements welcome!)
+                        wxString fmt2 = format;
+                        wxString replacement,replacement2,replacement3,replacement4;
+                        for (int rnr=1; rnr<5 ; rnr++)
+                        {
+                            wxString r = (wxChar)-rnr;
+                            while ( fmt2.Find(r) != wxNOT_FOUND )
+                            {
+                                r << (wxChar)-rnr;
+                            }
+
+                            switch (rnr)
+                            {
+                                case 1: replacement=r; break;
+                                case 2: replacement2=r; break;
+                                case 3: replacement3=r; break;
+                                case 4: replacement4=r; break;
+                            }
+                        }
+                        // replace all occurrences of year with it
+                        bool wasReplaced = fmt2.Replace(strYear, replacement) > 0;
+                        // evaluation order ensures we always attempt the replacement.
+                        wasReplaced = (fmt2.Replace(strYear2, replacement2) > 0) || wasReplaced;
+
+                        // use strftime() to format the same date but in supported
+                        // year
+                        //
+                        // NB: we assume that strftime() doesn't check for the
+                        //     date validity and will happily format the date
+                        //     corresponding to Feb 29 of a non leap year (which
+                        //     may happen if yearReal was leap and year is not)
+                        struct tm tmAdjusted;
+                        InitTm(tmAdjusted);
+                        tmAdjusted.tm_hour = tm.hour;
+                        tmAdjusted.tm_min = tm.min;
+                        tmAdjusted.tm_sec = tm.sec;
+                        tmAdjusted.tm_wday = tm.GetWeekDay();
+                        tmAdjusted.tm_yday = GetDayOfYear();
+                        tmAdjusted.tm_mday = tm.mday;
+                        tmAdjusted.tm_mon = tm.mon;
+                        tmAdjusted.tm_year = year - 1900;
+                        tmAdjusted.tm_isdst = 0; // no DST, already adjusted
+                        wxString str = CallStrftime(*p == _T('c') ? _T("%c")
+                                                                  : _T("%x"),
+                                                    &tmAdjusted);
+
+                        // now replace the occurrence of 1999 with the real year
+                        // we do this in two stages to stop the 2 digit year
+                        // matching any substring of the 4 digit year.
+                        // Any day,month hours and minutes components should be safe due
+                        // to ensuring the range of the years.
+                        wxString strYearReal, strYearReal2;
+                        strYearReal.Printf(_T("%04d"), yearReal);
+                        strYearReal2.Printf(_T("%02d"), yearReal % 100);
+                        str.Replace(strYear, replacement3);
+                        str.Replace(strYear2,replacement4);
+                        str.Replace(replacement3, strYearReal);
+                        str.Replace(replacement4, strYearReal2);
+
+                        // and replace back all occurrences of replacement string
+                        if ( wasReplaced )
+                        {
+                            str.Replace(replacement2, strYear2);
+                            str.Replace(replacement, strYear);
+                        }
+
+                        res += str;
+                    }
+#else // !HAVE_STRFTIME
+                    // Use "%m/%d/%y %H:%M:%S" format instead
+                    res += wxString::Format(wxT("%02d/%02d/%04d %02d:%02d:%02d"),
+                            tm.mon+1,tm.mday, tm.year, tm.hour, tm.min, tm.sec);
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
+                    break;
+
+                case _T('d'):       // day of a month (01-31)
+                    res += wxString::Format(fmt, tm.mday);
+                    break;
+
+                case _T('H'):       // hour in 24h format (00-23)
+                    res += wxString::Format(fmt, tm.hour);
+                    break;
+
+                case _T('I'):       // hour in 12h format (01-12)
+                    {
+                        // 24h -> 12h, 0h -> 12h too
+                        int hour12 = tm.hour > 12 ? tm.hour - 12
+                                                  : tm.hour ? tm.hour : 12;
+                        res += wxString::Format(fmt, hour12);
+                    }
+                    break;
+
+                case _T('j'):       // day of the year
+                    res += wxString::Format(fmt, GetDayOfYear(tz));
+                    break;
+
+                case _T('l'):       // milliseconds (NOT STANDARD)
+                    res += wxString::Format(fmt, GetMillisecond(tz));
+                    break;
+
+                case _T('m'):       // month as a number (01-12)
+                    res += wxString::Format(fmt, tm.mon + 1);
+                    break;
+
+                case _T('M'):       // minute as a decimal number (00-59)
+                    res += wxString::Format(fmt, tm.min);
+                    break;
+
+                case _T('p'):       // AM or PM string
+#ifdef HAVE_STRFTIME
+                    res += CallStrftime(_T("%p"), &tmTimeOnly);
+#else // !HAVE_STRFTIME
+                    res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am");
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
+                    break;
+
+                case _T('S'):       // second as a decimal number (00-61)
+                    res += wxString::Format(fmt, tm.sec);
+                    break;
+
+                case _T('U'):       // week number in the year (Sunday 1st week day)
+                    res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz));
+                    break;
+
+                case _T('W'):       // week number in the year (Monday 1st week day)
+                    res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz));
+                    break;
+
+                case _T('w'):       // weekday as a number (0-6), Sunday = 0
+                    res += wxString::Format(fmt, tm.GetWeekDay());
+                    break;
+
+                // case _T('x'): -- handled with "%c"
+
+                case _T('X'):       // locale default time representation
+                    // just use strftime() to format the time for us
+#ifdef HAVE_STRFTIME
+                    res += CallStrftime(_T("%X"), &tmTimeOnly);
+#else // !HAVE_STRFTIME
+                    res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec);
+#endif // HAVE_STRFTIME/!HAVE_STRFTIME
+                    break;
+
+                case _T('y'):       // year without century (00-99)
+                    res += wxString::Format(fmt, tm.year % 100);
+                    break;
+
+                case _T('Y'):       // year with century
+                    res += wxString::Format(fmt, tm.year);
+                    break;
+
+                case _T('Z'):       // timezone name
+#ifdef HAVE_STRFTIME
+                    res += CallStrftime(_T("%Z"), &tmTimeOnly);
+#endif
+                    break;
+
+                default:
+                    // is it the format width?
+                    for( fmt.clear();
+                         *p == _T('-') || *p == _T('+') ||
+                           *p == _T(' ') || wxIsdigit(*p);
+                         ++p )
+                    {
+                        fmt += *p;
+                    }
+
+                    if ( !fmt.empty() )
+                    {
+                        // we've only got the flags and width so far in fmt
+                        fmt.Prepend(_T('%'));
+                        fmt.Append(_T('d'));
+
+                        restart = true;
+
+                        break;
+                    }
+
+                    // no, it wasn't the width
+                    wxFAIL_MSG(_T("unknown format specificator"));
+
+                    // fall through and just copy it nevertheless
+
+                case _T('%'):       // a percent sign
+                    res += *p;
+                    break;
+
+                case 0:             // the end of string
+                    wxFAIL_MSG(_T("missing format at the end of string"));
+
+                    // just put the '%' which was the last char in format
+                    res += _T('%');
+                    break;
+            }
+        }
+    }
+
+    return res;
+}
+
+// this function parses a string in (strict) RFC 822 format: see the section 5
+// of the RFC for the detailed description, but briefly it's something of the
+// form "Sat, 18 Dec 1999 00:48:30 +0100"
+//
+// this function is "strict" by design - it must reject anything except true
+// RFC822 time specs.
+//
+// TODO a great candidate for using reg exps
+const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date)
+{
+    wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
+
+    const wxChar *p = date;
+    const wxChar *comma = wxStrchr(p, _T(','));
+    if ( comma )
+    {
+        // the part before comma is the weekday
+
+        // skip it for now - we don't use but might check that it really
+        // corresponds to the specfied date
+        p = comma + 1;
+
+        if ( *p != _T(' ') )
+        {
+            wxLogDebug(_T("no space after weekday in RFC822 time spec"));
+
+            return (wxChar *)NULL;
+        }
+
+        p++; // skip space
+    }
+
+    // the following 1 or 2 digits are the day number
+    if ( !wxIsdigit(*p) )
+    {
+        wxLogDebug(_T("day number expected in RFC822 time spec, none found"));
+
+        return (wxChar *)NULL;
+    }
+
+    wxDateTime_t day = (wxDateTime_t)(*p++ - _T('0'));
+    if ( wxIsdigit(*p) )
+    {
+        day *= 10;
+        day = (wxDateTime_t)(day + (*p++ - _T('0')));
+    }
+
+    if ( *p++ != _T(' ') )
+    {
+        return (wxChar *)NULL;
+    }
+
+    // the following 3 letters specify the month
+    wxString monName(p, 3);
+    Month mon;
+    if ( monName == _T("Jan") )
+        mon = Jan;
+    else if ( monName == _T("Feb") )
+        mon = Feb;
+    else if ( monName == _T("Mar") )
+        mon = Mar;
+    else if ( monName == _T("Apr") )
+        mon = Apr;
+    else if ( monName == _T("May") )
+        mon = May;
+    else if ( monName == _T("Jun") )
+        mon = Jun;
+    else if ( monName == _T("Jul") )
+        mon = Jul;
+    else if ( monName == _T("Aug") )
+        mon = Aug;
+    else if ( monName == _T("Sep") )
+        mon = Sep;
+    else if ( monName == _T("Oct") )
+        mon = Oct;
+    else if ( monName == _T("Nov") )
+        mon = Nov;
+    else if ( monName == _T("Dec") )
+        mon = Dec;
+    else
+    {
+        wxLogDebug(_T("Invalid RFC 822 month name '%s'"), monName.c_str());
+
+        return (wxChar *)NULL;
+    }
+
+    p += 3;
+
+    if ( *p++ != _T(' ') )
+    {
+        return (wxChar *)NULL;
+    }
+
+    // next is the year
+    if ( !wxIsdigit(*p) )
+    {
+        // no year?
+        return (wxChar *)NULL;
+    }
+
+    int year = *p++ - _T('0');
+
+    if ( !wxIsdigit(*p) )
+    {
+        // should have at least 2 digits in the year
+        return (wxChar *)NULL;
+    }
+
+    year *= 10;
+    year += *p++ - _T('0');
+
+    // is it a 2 digit year (as per original RFC 822) or a 4 digit one?
+    if ( wxIsdigit(*p) )
+    {
+        year *= 10;
+        year += *p++ - _T('0');
+
+        if ( !wxIsdigit(*p) )
+        {
+            // no 3 digit years please
+            return (wxChar *)NULL;
+        }
+
+        year *= 10;
+        year += *p++ - _T('0');
+    }
+
+    if ( *p++ != _T(' ') )
+    {
+        return (wxChar *)NULL;
+    }
+
+    // time is in the format hh:mm:ss and seconds are optional
+    if ( !wxIsdigit(*p) )
+    {
+        return (wxChar *)NULL;
+    }
+
+    wxDateTime_t hour = (wxDateTime_t)(*p++ - _T('0'));
+
+    if ( !wxIsdigit(*p) )
+    {
+        return (wxChar *)NULL;
+    }
+
+    hour *= 10;
+    hour = (wxDateTime_t)(hour + (*p++ - _T('0')));
+
+    if ( *p++ != _T(':') )
+    {
+        return (wxChar *)NULL;
+    }
+
+    if ( !wxIsdigit(*p) )
+    {
+        return (wxChar *)NULL;
+    }
+
+    wxDateTime_t min = (wxDateTime_t)(*p++ - _T('0'));
+
+    if ( !wxIsdigit(*p) )
+    {
+        return (wxChar *)NULL;
+    }
+
+    min *= 10;
+    min = (wxDateTime_t)(min + *p++ - _T('0'));
+
+    wxDateTime_t sec = 0;
+    if ( *p == _T(':') )
+    {
+        p++;
+        if ( !wxIsdigit(*p) )
+        {
+            return (wxChar *)NULL;
+        }
+
+        sec = (wxDateTime_t)(*p++ - _T('0'));
+
+        if ( !wxIsdigit(*p) )
+        {
+            return (wxChar *)NULL;
+        }
+
+        sec *= 10;
+        sec = (wxDateTime_t)(sec + *p++ - _T('0'));
+    }
+
+    if ( *p++ != _T(' ') )
+    {
+        return (wxChar *)NULL;
+    }
+
+    // and now the interesting part: the timezone
+    int offset wxDUMMY_INITIALIZE(0);
+    if ( *p == _T('-') || *p == _T('+') )
+    {
+        // the explicit offset given: it has the form of hhmm
+        bool plus = *p++ == _T('+');
+
+        if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
+        {
+            return (wxChar *)NULL;
+        }
+
+        // hours
+        offset = MIN_PER_HOUR*(10*(*p - _T('0')) + (*(p + 1) - _T('0')));
+
+        p += 2;
+
+        if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
+        {
+            return (wxChar *)NULL;
+        }
+
+        // minutes
+        offset += 10*(*p - _T('0')) + (*(p + 1) - _T('0'));
+
+        if ( !plus )
+        {
+            offset = -offset;
+        }
+
+        p += 2;
+    }
+    else
+    {
+        // the symbolic timezone given: may be either military timezone or one
+        // of standard abbreviations
+        if ( !*(p + 1) )
+        {
+            // military: Z = UTC, J unused, A = -1, ..., Y = +12
+            static const int offsets[26] =
+            {
+                //A  B   C   D   E   F   G   H   I    J    K    L    M
+                -1, -2, -3, -4, -5, -6, -7, -8, -9,   0, -10, -11, -12,
+                //N  O   P   R   Q   S   T   U   V    W    Z    Y    Z
+                +1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, 0
+            };
+
+            if ( *p < _T('A') || *p > _T('Z') || *p == _T('J') )
+            {
+                wxLogDebug(_T("Invalid militaty timezone '%c'"), *p);
+
+                return (wxChar *)NULL;
+            }
+
+            offset = offsets[*p++ - _T('A')];
+        }
+        else
+        {
+            // abbreviation
+            wxString tz = p;
+            if ( tz == _T("UT") || tz == _T("UTC") || tz == _T("GMT") )
+                offset = 0;
+            else if ( tz == _T("AST") )
+                offset = AST - GMT0;
+            else if ( tz == _T("ADT") )
+                offset = ADT - GMT0;
+            else if ( tz == _T("EST") )
+                offset = EST - GMT0;
+            else if ( tz == _T("EDT") )
+                offset = EDT - GMT0;
+            else if ( tz == _T("CST") )
+                offset = CST - GMT0;
+            else if ( tz == _T("CDT") )
+                offset = CDT - GMT0;
+            else if ( tz == _T("MST") )
+                offset = MST - GMT0;
+            else if ( tz == _T("MDT") )
+                offset = MDT - GMT0;
+            else if ( tz == _T("PST") )
+                offset = PST - GMT0;
+            else if ( tz == _T("PDT") )
+                offset = PDT - GMT0;
+            else
+            {
+                wxLogDebug(_T("Unknown RFC 822 timezone '%s'"), p);
+
+                return (wxChar *)NULL;
+            }
+
+            p += tz.length();
+        }
+
+        // make it minutes
+        offset *= MIN_PER_HOUR;
+    }
+
+    // the spec was correct, construct the date from the values we found
+    Set(day, mon, year, hour, min, sec);
+    MakeFromTimezone(TimeZone::Make(offset*SEC_PER_MIN));
+
+    return p;
+}
+
+#ifdef __WINDOWS__
+
+// returns the string containing strftime() format used for short dates in the
+// current locale or an empty string
+static wxString GetLocaleDateFormat()
+{
+    wxString fmtWX;
+
+    // there is no setlocale() under Windows CE, so just always query the
+    // system there
+#ifndef __WXWINCE__
+    if ( strcmp(setlocale(LC_ALL, NULL), "C") != 0 )
+#endif
+    {
+        // The locale was programatically set to non-C. We assume that this was
+        // done using wxLocale, in which case thread's current locale is also
+        // set to correct LCID value and we can use GetLocaleInfo to determine
+        // the correct formatting string:
+#ifdef __WXWINCE__
+        LCID lcid = LOCALE_USER_DEFAULT;
+#else
+        LCID lcid = GetThreadLocale();
+#endif
+        // according to MSDN 80 chars is max allowed for short date format
+        wxChar fmt[81];
+        if ( ::GetLocaleInfo(lcid, LOCALE_SSHORTDATE, fmt, WXSIZEOF(fmt)) )
+        {
+            wxChar chLast = _T('\0');
+            size_t lastCount = 0;
+            for ( const wxChar *p = fmt; /* NUL handled inside */; p++ )
+            {
+                if ( *p == chLast )
+                {
+                    lastCount++;
+                    continue;
+                }
+
+                switch ( *p )
+                {
+                    // these characters come in groups, start counting them
+                    case _T('d'):
+                    case _T('M'):
+                    case _T('y'):
+                    case _T('g'):
+                        chLast = *p;
+                        lastCount = 1;
+                        break;
+
+                    default:
+                        // first deal with any special characters we have had
+                        if ( lastCount )
+                        {
+                            switch ( chLast )
+                            {
+                                case _T('d'):
+                                    switch ( lastCount )
+                                    {
+                                        case 1: // d
+                                        case 2: // dd
+                                            // these two are the same as we
+                                            // don't distinguish between 1 and
+                                            // 2 digits for days
+                                            fmtWX += _T("%d");
+                                            break;
+
+                                        case 3: // ddd
+                                            fmtWX += _T("%a");
+                                            break;
+
+                                        case 4: // dddd
+                                            fmtWX += _T("%A");
+                                            break;
+
+                                        default:
+                                            wxFAIL_MSG( _T("too many 'd's") );
+                                    }
+                                    break;
+
+                                case _T('M'):
+                                    switch ( lastCount )
+                                    {
+                                        case 1: // M
+                                        case 2: // MM
+                                            // as for 'd' and 'dd' above
+                                            fmtWX += _T("%m");
+                                            break;
+
+                                        case 3:
+                                            fmtWX += _T("%b");
+                                            break;
+
+                                        case 4:
+                                            fmtWX += _T("%B");
+                                            break;
+
+                                        default:
+                                            wxFAIL_MSG( _T("too many 'M's") );
+                                    }
+                                    break;
+
+                                case _T('y'):
+                                    switch ( lastCount )
+                                    {
+                                        case 1: // y
+                                        case 2: // yy
+                                            fmtWX += _T("%y");
+                                            break;
+
+                                        case 4: // yyyy
+                                            fmtWX += _T("%Y");
+                                            break;
+
+                                        default:
+                                            wxFAIL_MSG( _T("wrong number of 'y's") );
+                                    }
+                                    break;
+
+                                case _T('g'):
+                                    // strftime() doesn't have era string,
+                                    // ignore this format
+                                    wxASSERT_MSG( lastCount <= 2,
+                                                  _T("too many 'g's") );
+                                    break;
+
+                                default:
+                                    wxFAIL_MSG( _T("unreachable") );
+                            }
+
+                            chLast = _T('\0');
+                            lastCount = 0;
+                        }
+
+                        // not a special character so must be just a separator,
+                        // treat as is
+                        if ( *p != _T('\0') )
+                        {
+                            if ( *p == _T('%') )
+                            {
+                                // this one needs to be escaped
+                                fmtWX += _T('%');
+                            }
+
+                            fmtWX += *p;
+                        }
+                }
+
+                if ( *p == _T('\0') )
+                    break;
+            }
+        }
+        //else: GetLocaleInfo() failed, leave fmtDate value unchanged and
+        //      try our luck with the default formats
+    }
+    //else: default C locale, default formats should work
+
+    return fmtWX;
+}
+
+#endif // __WINDOWS__
+
+const wxChar *wxDateTime::ParseFormat(const wxChar *date,
+                                      const wxChar *format,
+                                      const wxDateTime& dateDef)
+{
+    wxCHECK_MSG( date && format, (wxChar *)NULL,
+                 _T("NULL pointer in wxDateTime::ParseFormat()") );
+
+    wxString str;
+    unsigned long num;
+
+    // what fields have we found?
+    bool haveWDay = false,
+         haveYDay = false,
+         haveDay = false,
+         haveMon = false,
+         haveYear = false,
+         haveHour = false,
+         haveMin = false,
+         haveSec = false;
+
+    bool hourIsIn12hFormat = false, // or in 24h one?
+         isPM = false;              // AM by default
+
+    // and the value of the items we have (init them to get rid of warnings)
+    wxDateTime_t sec = 0,
+                 min = 0,
+                 hour = 0;
+    WeekDay wday = Inv_WeekDay;
+    wxDateTime_t yday = 0,
+                 mday = 0;
+    wxDateTime::Month mon = Inv_Month;
+    int year = 0;
+
+    const wxChar *input = date;
+    for ( const wxChar *fmt = format; *fmt; fmt++ )
+    {
+        if ( *fmt != _T('%') )
+        {
+            if ( wxIsspace(*fmt) )
+            {
+                // a white space in the format string matches 0 or more white
+                // spaces in the input
+                while ( wxIsspace(*input) )
+                {
+                    input++;
+                }
+            }
+            else // !space
+            {
+                // any other character (not whitespace, not '%') must be
+                // matched by itself in the input
+                if ( *input++ != *fmt )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+            }
+
+            // done with this format char
+            continue;
+        }
+
+        // start of a format specification
+
+        // parse the optional width
+        size_t width = 0;
+        while ( wxIsdigit(*++fmt) )
+        {
+            width *= 10;
+            width += *fmt - _T('0');
+        }
+
+        // the default widths for the various fields
+        if ( !width )
+        {
+            switch ( *fmt )
+            {
+                case _T('Y'):               // year has 4 digits
+                    width = 4;
+                    break;
+
+                case _T('j'):               // day of year has 3 digits
+                case _T('l'):               // milliseconds have 3 digits
+                    width = 3;
+                    break;
+
+                case _T('w'):               // week day as number has only one
+                    width = 1;
+                    break;
+
+                default:
+                    // default for all other fields
+                    width = 2;
+            }
+        }
+
+        // then the format itself
+        switch ( *fmt )
+        {
+            case _T('a'):       // a weekday name
+            case _T('A'):
+                {
+                    int flag = *fmt == _T('a') ? Name_Abbr : Name_Full;
+                    wday = GetWeekDayFromName(GetAlphaToken(input), flag);
+                    if ( wday == Inv_WeekDay )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+                }
+                haveWDay = true;
+                break;
+
+            case _T('b'):       // a month name
+            case _T('B'):
+                {
+                    int flag = *fmt == _T('b') ? Name_Abbr : Name_Full;
+                    mon = GetMonthFromName(GetAlphaToken(input), flag);
+                    if ( mon == Inv_Month )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+                }
+                haveMon = true;
+                break;
+
+            case _T('c'):       // locale default date and time  representation
+                {
+                    wxDateTime dt;
+
+                    // this is the format which corresponds to ctime() output
+                    // and strptime("%c") should parse it, so try it first
+                    static const wxChar *fmtCtime = _T("%a %b %d %H:%M:%S %Y");
+
+                    const wxChar *result = dt.ParseFormat(input, fmtCtime);
+                    if ( !result )
+                    {
+                        result = dt.ParseFormat(input, _T("%x %X"));
+                    }
+
+                    if ( !result )
+                    {
+                        result = dt.ParseFormat(input, _T("%X %x"));
+                    }
+
+                    if ( !result )
+                    {
+                        // we've tried everything and still no match
+                        return (wxChar *)NULL;
+                    }
+
+                    Tm tm = dt.GetTm();
+
+                    haveDay = haveMon = haveYear =
+                    haveHour = haveMin = haveSec = true;
+
+                    hour = tm.hour;
+                    min = tm.min;
+                    sec = tm.sec;
+
+                    year = tm.year;
+                    mon = tm.mon;
+                    mday = tm.mday;
+
+                    input = result;
+                }
+                break;
+
+            case _T('d'):       // day of a month (01-31)
+                if ( !GetNumericToken(width, input, &num) ||
+                        (num > 31) || (num < 1) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                // we can't check whether the day range is correct yet, will
+                // do it later - assume ok for now
+                haveDay = true;
+                mday = (wxDateTime_t)num;
+                break;
+
+            case _T('H'):       // hour in 24h format (00-23)
+                if ( !GetNumericToken(width, input, &num) || (num > 23) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveHour = true;
+                hour = (wxDateTime_t)num;
+                break;
+
+            case _T('I'):       // hour in 12h format (01-12)
+                if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveHour = true;
+                hourIsIn12hFormat = true;
+                hour = (wxDateTime_t)(num % 12);        // 12 should be 0
+                break;
+
+            case _T('j'):       // day of the year
+                if ( !GetNumericToken(width, input, &num) || !num || (num > 366) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveYDay = true;
+                yday = (wxDateTime_t)num;
+                break;
+
+            case _T('m'):       // month as a number (01-12)
+                if ( !GetNumericToken(width, input, &num) || !num || (num > 12) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveMon = true;
+                mon = (Month)(num - 1);
+                break;
+
+            case _T('M'):       // minute as a decimal number (00-59)
+                if ( !GetNumericToken(width, input, &num) || (num > 59) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveMin = true;
+                min = (wxDateTime_t)num;
+                break;
+
+            case _T('p'):       // AM or PM string
+                {
+                    wxString am, pm, token = GetAlphaToken(input);
+
+                    GetAmPmStrings(&am, &pm);
+                    if (am.empty() && pm.empty())
+                        return (wxChar *)NULL;  // no am/pm strings defined
+                    if ( token.CmpNoCase(pm) == 0 )
+                    {
+                        isPM = true;
+                    }
+                    else if ( token.CmpNoCase(am) != 0 )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+                }
+                break;
+
+            case _T('r'):       // time as %I:%M:%S %p
+                {
+                    wxDateTime dt;
+                    input = dt.ParseFormat(input, _T("%I:%M:%S %p"));
+                    if ( !input )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = haveSec = true;
+
+                    Tm tm = dt.GetTm();
+                    hour = tm.hour;
+                    min = tm.min;
+                    sec = tm.sec;
+                }
+                break;
+
+            case _T('R'):       // time as %H:%M
+                {
+                    wxDateTime dt;
+                    input = dt.ParseFormat(input, _T("%H:%M"));
+                    if ( !input )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = true;
+
+                    Tm tm = dt.GetTm();
+                    hour = tm.hour;
+                    min = tm.min;
+                }
+                break;
+
+            case _T('S'):       // second as a decimal number (00-61)
+                if ( !GetNumericToken(width, input, &num) || (num > 61) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveSec = true;
+                sec = (wxDateTime_t)num;
+                break;
+
+            case _T('T'):       // time as %H:%M:%S
+                {
+                    wxDateTime dt;
+                    input = dt.ParseFormat(input, _T("%H:%M:%S"));
+                    if ( !input )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = haveSec = true;
+
+                    Tm tm = dt.GetTm();
+                    hour = tm.hour;
+                    min = tm.min;
+                    sec = tm.sec;
+                }
+                break;
+
+            case _T('w'):       // weekday as a number (0-6), Sunday = 0
+                if ( !GetNumericToken(width, input, &num) || (wday > 6) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveWDay = true;
+                wday = (WeekDay)num;
+                break;
+
+            case _T('x'):       // locale default date representation
+#ifdef HAVE_STRPTIME
+                // try using strptime() -- it may fail even if the input is
+                // correct but the date is out of range, so we will fall back
+                // to our generic code anyhow
+                {
+                    struct tm tm;
+
+                    const wxChar *result = CallStrptime(input, "%x", &tm);
+                    if ( result )
+                    {
+                        input = result;
+
+                        haveDay = haveMon = haveYear = true;
+
+                        year = 1900 + tm.tm_year;
+                        mon = (Month)tm.tm_mon;
+                        mday = tm.tm_mday;
+
+                        break;
+                    }
+                }
+#endif // HAVE_STRPTIME
+
+                {
+                    wxDateTime dt;
+                    wxString fmtDate,
+                             fmtDateAlt;
+
+#ifdef __WINDOWS__
+                    // The above doesn't work for all locales, try to query
+                    // Windows for the right way of formatting the date:
+                    fmtDate = GetLocaleDateFormat();
+                    if ( fmtDate.empty() )
+#endif
+                    {
+                        if ( IsWestEuropeanCountry(GetCountry()) ||
+                             GetCountry() == Russia )
+                        {
+                            fmtDate = _T("%d/%m/%y");
+                            fmtDateAlt = _T("%m/%d/%y");
+                        }
+                        else // assume USA
+                        {
+                            fmtDate = _T("%m/%d/%y");
+                            fmtDateAlt = _T("%d/%m/%y");
+                        }
+                    }
+
+                    const wxChar *result = dt.ParseFormat(input, fmtDate);
+
+                    if ( !result && !fmtDateAlt.empty() )
+                    {
+                        // ok, be nice and try another one
+                        result = dt.ParseFormat(input, fmtDateAlt);
+                    }
+
+                    if ( !result )
+                    {
+                        // bad luck
+                        return (wxChar *)NULL;
+                    }
+
+                    Tm tm = dt.GetTm();
+
+                    haveDay = haveMon = haveYear = true;
+
+                    year = tm.year;
+                    mon = tm.mon;
+                    mday = tm.mday;
+
+                    input = result;
+                }
+
+                break;
+
+            case _T('X'):       // locale default time representation
+#ifdef HAVE_STRPTIME
+                {
+                    // use strptime() to do it for us (FIXME !Unicode friendly)
+                    struct tm tm;
+                    input = CallStrptime(input, "%X", &tm);
+                    if ( !input )
+                    {
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = haveSec = true;
+
+                    hour = tm.tm_hour;
+                    min = tm.tm_min;
+                    sec = tm.tm_sec;
+                }
+#else // !HAVE_STRPTIME
+                // TODO under Win32 we can query the LOCALE_ITIME system
+                //      setting which says whether the default time format is
+                //      24 or 12 hour
+                {
+                    // try to parse what follows as "%H:%M:%S" and, if this
+                    // fails, as "%I:%M:%S %p" - this should catch the most
+                    // common cases
+                    wxDateTime dt;
+
+                    const wxChar *result = dt.ParseFormat(input, _T("%T"));
+                    if ( !result )
+                    {
+                        result = dt.ParseFormat(input, _T("%r"));
+                    }
+
+                    if ( !result )
+                    {
+                        // no match
+                        return (wxChar *)NULL;
+                    }
+
+                    haveHour = haveMin = haveSec = true;
+
+                    Tm tm = dt.GetTm();
+                    hour = tm.hour;
+                    min = tm.min;
+                    sec = tm.sec;
+
+                    input = result;
+                }
+#endif // HAVE_STRPTIME/!HAVE_STRPTIME
+                break;
+
+            case _T('y'):       // year without century (00-99)
+                if ( !GetNumericToken(width, input, &num) || (num > 99) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveYear = true;
+
+                // TODO should have an option for roll over date instead of
+                //      hard coding it here
+                year = (num > 30 ? 1900 : 2000) + (wxDateTime_t)num;
+                break;
+
+            case _T('Y'):       // year with century
+                if ( !GetNumericToken(width, input, &num) )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+
+                haveYear = true;
+                year = (wxDateTime_t)num;
+                break;
+
+            case _T('Z'):       // timezone name
+                wxFAIL_MSG(_T("TODO"));
+                break;
+
+            case _T('%'):       // a percent sign
+                if ( *input++ != _T('%') )
+                {
+                    // no match
+                    return (wxChar *)NULL;
+                }
+                break;
+
+            case 0:             // the end of string
+                wxFAIL_MSG(_T("unexpected format end"));
+
+                // fall through
+
+            default:            // not a known format spec
+                return (wxChar *)NULL;
+        }
+    }
+
+    // format matched, try to construct a date from what we have now
+    Tm tmDef;
+    if ( dateDef.IsValid() )
+    {
+        // take this date as default
+        tmDef = dateDef.GetTm();
+    }
+    else if ( IsValid() )
+    {
+        // if this date is valid, don't change it
+        tmDef = GetTm();
+    }
+    else
+    {
+        // no default and this date is invalid - fall back to Today()
+        tmDef = Today().GetTm();
+    }
+
+    Tm tm = tmDef;
+
+    // set the date
+    if ( haveYear )
+    {
+        tm.year = year;
+    }
+
+    // TODO we don't check here that the values are consistent, if both year
+    //      day and month/day were found, we just ignore the year day and we
+    //      also always ignore the week day
+    if ( haveMon && haveDay )
+    {
+        if ( mday > GetNumOfDaysInMonth(tm.year, mon) )
+        {
+            wxLogDebug(_T("bad month day in wxDateTime::ParseFormat"));
+
+            return (wxChar *)NULL;
+        }
+
+        tm.mon = mon;
+        tm.mday = mday;
+    }
+    else if ( haveYDay )
+    {
+        if ( yday > GetNumberOfDays(tm.year) )
+        {
+            wxLogDebug(_T("bad year day in wxDateTime::ParseFormat"));
+
+            return (wxChar *)NULL;
+        }
+
+        Tm tm2 = wxDateTime(1, Jan, tm.year).SetToYearDay(yday).GetTm();
+
+        tm.mon = tm2.mon;
+        tm.mday = tm2.mday;
+    }
+
+    // deal with AM/PM
+    if ( haveHour && hourIsIn12hFormat && isPM )
+    {
+        // translate to 24hour format
+        hour += 12;
+    }
+    //else: either already in 24h format or no translation needed
+
+    // set the time
+    if ( haveHour )
+    {
+        tm.hour = hour;
+    }
+
+    if ( haveMin )
+    {
+        tm.min = min;
+    }
+
+    if ( haveSec )
+    {
+        tm.sec = sec;
+    }
+
+    Set(tm);
+
+    // finally check that the week day is consistent -- if we had it
+    if ( haveWDay && GetWeekDay() != wday )
+    {
+        wxLogDebug(_T("inconsistsnet week day in wxDateTime::ParseFormat()"));
+
+        return NULL;
+    }
+
+    return input;
+}
+
+const wxChar *wxDateTime::ParseDateTime(const wxChar *date)
+{
+    wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
+
+    // Set to current day and hour, so strings like '14:00' becomes today at
+    // 14, not some other random date
+    wxDateTime dtDate = wxDateTime::Today();
+    wxDateTime dtTime = wxDateTime::Today();
+
+    const wxChar* pchTime;
+
+    // Try to parse the beginning of the string as a date
+    const wxChar* pchDate = dtDate.ParseDate(date);
+
+    // We got a date in the beginning, see if there is a time specified after the date
+    if ( pchDate )
+    {
+        // Skip spaces, as the ParseTime() function fails on spaces
+        while ( wxIsspace(*pchDate) )
+            pchDate++;
+
+        pchTime = dtTime.ParseTime(pchDate);
+    }
+    else // no date in the beginning
+    {
+        // check and see if we have a time followed by a date
+        pchTime = dtTime.ParseTime(date);
+        if ( pchTime )
+        {
+            while ( wxIsspace(*pchTime) )
+                pchTime++;
+
+            pchDate = dtDate.ParseDate(pchTime);
+        }
+    }
+
+    // If we have a date specified, set our own data to the same date
+    if ( !pchDate || !pchTime )
+        return NULL;
+
+    Set(dtDate.GetDay(), dtDate.GetMonth(), dtDate.GetYear(),
+        dtTime.GetHour(), dtTime.GetMinute(), dtTime.GetSecond(),
+        dtTime.GetMillisecond());
+
+    // Return endpoint of scan
+    return pchDate > pchTime ? pchDate : pchTime;
+}
+
+const wxChar *wxDateTime::ParseDate(const wxChar *date)
+{
+    // this is a simplified version of ParseDateTime() which understands only
+    // "today" (for wxDate compatibility) and digits only otherwise (and not
+    // all esoteric constructions ParseDateTime() knows about)
+
+    wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
+
+    const wxChar *p = date;
+    while ( wxIsspace(*p) )
+        p++;
+
+    // some special cases
+    static struct
+    {
+        const wxChar *str;
+        int dayDiffFromToday;
+    } literalDates[] =
+    {
+        { wxTRANSLATE("today"),             0 },
+        { wxTRANSLATE("yesterday"),        -1 },
+        { wxTRANSLATE("tomorrow"),          1 },
+    };
+
+    for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ )
+    {
+        const wxString dateStr = wxGetTranslation(literalDates[n].str);
+        size_t len = dateStr.length();
+        if ( wxStrlen(p) >= len )
+        {
+            wxString str(p, len);
+            if ( str.CmpNoCase(dateStr) == 0 )
+            {
+                // nothing can follow this, so stop here
+                p += len;
+
+                int dayDiffFromToday = literalDates[n].dayDiffFromToday;
+                *this = Today();
+                if ( dayDiffFromToday )
+                {
+                    *this += wxDateSpan::Days(dayDiffFromToday);
+                }
+
+                return p;
+            }
+        }
+    }
+
+    // We try to guess what we have here: for each new (numeric) token, we
+    // determine if it can be a month, day or a year. Of course, there is an
+    // ambiguity as some numbers may be days as well as months, so we also
+    // have the ability to back track.
+
+    // what do we have?
+    bool haveDay = false,       // the months day?
+         haveWDay = false,      // the day of week?
+         haveMon = false,       // the month?
+         haveYear = false;      // the year?
+
+    // and the value of the items we have (init them to get rid of warnings)
+    WeekDay wday = Inv_WeekDay;
+    wxDateTime_t day = 0;
+    wxDateTime::Month mon = Inv_Month;
+    int year = 0;
+
+    // tokenize the string
+    size_t nPosCur = 0;
+    static const wxChar *dateDelimiters = _T(".,/-\t\r\n ");
+    wxStringTokenizer tok(p, dateDelimiters);
+    while ( tok.HasMoreTokens() )
+    {
+        wxString token = tok.GetNextToken();
+        if ( !token )
+            continue;
+
+        // is it a number?
+        unsigned long val;
+        if ( token.ToULong(&val) )
+        {
+            // guess what this number is
+
+            bool isDay = false,
+                 isMonth = false,
+                 isYear = false;
+
+            if ( !haveMon && val > 0 && val <= 12 )
+            {
+                // assume it is month
+                isMonth = true;
+            }
+            else // not the month
+            {
+                if ( haveDay )
+                {
+                    // this can only be the year
+                    isYear = true;
+                }
+                else // may be either day or year
+                {
+                    // use a leap year if we don't have the year yet to allow
+                    // dates like 2/29/1976 which would be rejected otherwise
+                    wxDateTime_t max_days = (wxDateTime_t)(
+                        haveMon
+                        ? GetNumOfDaysInMonth(haveYear ? year : 1976, mon)
+                        : 31
+                    );
+
+                    // can it be day?
+                    if ( (val == 0) || (val > (unsigned long)max_days) )
+                    {
+                        // no
+                        isYear = true;
+                    }
+                    else // yes, suppose it's the day
+                    {
+                        isDay = true;
+                    }
+                }
+            }
+
+            if ( isYear )
+            {
+                if ( haveYear )
+                    break;
+
+                haveYear = true;
+
+                year = (wxDateTime_t)val;
+            }
+            else if ( isDay )
+            {
+                if ( haveDay )
+                    break;
+
+                haveDay = true;
+
+                day = (wxDateTime_t)val;
+            }
+            else if ( isMonth )
+            {
+                haveMon = true;
+
+                mon = (Month)(val - 1);
+            }
+        }
+        else // not a number
+        {
+            // be careful not to overwrite the current mon value
+            Month mon2 = GetMonthFromName(token, Name_Full | Name_Abbr);
+            if ( mon2 != Inv_Month )
+            {
+                // it's a month
+                if ( haveMon )
+                {
+                    // but we already have a month - maybe we guessed wrong?
+                    if ( !haveDay )
+                    {
+                        // no need to check in month range as always < 12, but
+                        // the days are counted from 1 unlike the months
+                        day = (wxDateTime_t)(mon + 1);
+                        haveDay = true;
+                    }
+                    else
+                    {
+                        // could possible be the year (doesn't the year come
+                        // before the month in the japanese format?) (FIXME)
+                        break;
+                    }
+                }
+
+                mon = mon2;
+
+                haveMon = true;
+            }
+            else // not a valid month name
+            {
+                WeekDay wday2 = GetWeekDayFromName(token, Name_Full | Name_Abbr);
+                if ( wday2 != Inv_WeekDay )
+                {
+                    // a week day
+                    if ( haveWDay )
+                    {
+                        break;
+                    }
+
+                    wday = wday2;
+
+                    haveWDay = true;
+                }
+                else // not a valid weekday name
+                {
+                    // try the ordinals
+                    static const wxChar *ordinals[] =
+                    {
+                        wxTRANSLATE("first"),
+                        wxTRANSLATE("second"),
+                        wxTRANSLATE("third"),
+                        wxTRANSLATE("fourth"),
+                        wxTRANSLATE("fifth"),
+                        wxTRANSLATE("sixth"),
+                        wxTRANSLATE("seventh"),
+                        wxTRANSLATE("eighth"),
+                        wxTRANSLATE("ninth"),
+                        wxTRANSLATE("tenth"),
+                        wxTRANSLATE("eleventh"),
+                        wxTRANSLATE("twelfth"),
+                        wxTRANSLATE("thirteenth"),
+                        wxTRANSLATE("fourteenth"),
+                        wxTRANSLATE("fifteenth"),
+                        wxTRANSLATE("sixteenth"),
+                        wxTRANSLATE("seventeenth"),
+                        wxTRANSLATE("eighteenth"),
+                        wxTRANSLATE("nineteenth"),
+                        wxTRANSLATE("twentieth"),
+                        // that's enough - otherwise we'd have problems with
+                        // composite (or not) ordinals
+                    };
+
+                    size_t n;
+                    for ( n = 0; n < WXSIZEOF(ordinals); n++ )
+                    {
+                        if ( token.CmpNoCase(ordinals[n]) == 0 )
+                        {
+                            break;
+                        }
+                    }
+
+                    if ( n == WXSIZEOF(ordinals) )
+                    {
+                        // stop here - something unknown
+                        break;
+                    }
+
+                    // it's a day
+                    if ( haveDay )
+                    {
+                        // don't try anything here (as in case of numeric day
+                        // above) - the symbolic day spec should always
+                        // precede the month/year
+                        break;
+                    }
+
+                    haveDay = true;
+
+                    day = (wxDateTime_t)(n + 1);
+                }
+            }
+        }
+
+        nPosCur = tok.GetPosition();
+    }
+
+    // either no more tokens or the scan was stopped by something we couldn't
+    // parse - in any case, see if we can construct a date from what we have
+    if ( !haveDay && !haveWDay )
+    {
+        wxLogDebug(_T("ParseDate: no day, no weekday hence no date."));
+
+        return NULL;
+    }
+
+    if ( haveWDay && (haveMon || haveYear || haveDay) &&
+         !(haveDay && haveMon && haveYear) )
+    {
+        // without adjectives (which we don't support here) the week day only
+        // makes sense completely separately or with the full date
+        // specification (what would "Wed 1999" mean?)
+        return NULL;
+    }
+
+    if ( !haveWDay && haveYear && !(haveDay && haveMon) )
+    {
+        // may be we have month and day instead of day and year?
+        if ( haveDay && !haveMon )
+        {
+            if ( day <= 12  )
+            {
+                // exchange day and month
+                mon = (wxDateTime::Month)(day - 1);
+
+                // we're in the current year then
+                if ( (year > 0) && (year <= (int)GetNumOfDaysInMonth(Inv_Year, mon)) )
+                {
+                    day = (wxDateTime_t)year;
+
+                    haveMon = true;
+                    haveYear = false;
+                }
+                //else: no, can't exchange, leave haveMon == false
+            }
+        }
+
+        if ( !haveMon )
+        {
+            // if we give the year, month and day must be given too
+            wxLogDebug(_T("ParseDate: day and month should be specified if year is."));
+
+            return NULL;
+        }
+    }
+
+    if ( !haveMon )
+    {
+        mon = GetCurrentMonth();
+    }
+
+    if ( !haveYear )
+    {
+        year = GetCurrentYear();
+    }
+
+    if ( haveDay )
+    {
+        // normally we check the day above but the check is optimistic in case
+        // we find the day before its month/year so we have to redo it now
+        if ( day > GetNumOfDaysInMonth(year, mon) )
+            return NULL;
+
+        Set(day, mon, year);
+
+        if ( haveWDay )
+        {
+            // check that it is really the same
+            if ( GetWeekDay() != wday )
+            {
+                // inconsistency detected
+                wxLogDebug(_T("ParseDate: inconsistent day/weekday."));
+
+                return (wxChar *)NULL;
+            }
+        }
+    }
+    else // haveWDay
+    {
+        *this = Today();
+
+        SetToWeekDayInSameWeek(wday);
+    }
+
+    // return the pointer to the first unparsed char
+    p += nPosCur;
+    if ( nPosCur && wxStrchr(dateDelimiters, *(p - 1)) )
+    {
+        // if we couldn't parse the token after the delimiter, put back the
+        // delimiter as well
+        p--;
+    }
+
+    return p;
+}
+
+const wxChar *wxDateTime::ParseTime(const wxChar *time)
+{
+    wxCHECK_MSG( time, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") );
+
+    // first try some extra things
+    static const struct
+    {
+        const wxChar *name;
+        wxDateTime_t  hour;
+    } stdTimes[] =
+    {
+        { wxTRANSLATE("noon"),      12 },
+        { wxTRANSLATE("midnight"),  00 },
+        // anything else?
+    };
+
+    for ( size_t n = 0; n < WXSIZEOF(stdTimes); n++ )
+    {
+        wxString timeString = wxGetTranslation(stdTimes[n].name);
+        size_t len = timeString.length();
+        if ( timeString.CmpNoCase(wxString(time, len)) == 0 )
+        {
+            // casts required by DigitalMars
+            Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0));
+
+            return time + len;
+        }
+    }
+
+    // try all time formats we may think about in the order from longest to
+    // shortest
+
+    // 12hour with AM/PM?
+    const wxChar *result = ParseFormat(time, _T("%I:%M:%S %p"));
+
+    if ( !result )
+    {
+        // normally, it's the same, but why not try it?
+        result = ParseFormat(time, _T("%H:%M:%S"));
+    }
+
+    if ( !result )
+    {
+        // 12hour with AM/PM but without seconds?
+        result = ParseFormat(time, _T("%I:%M %p"));
+    }
+
+    if ( !result )
+    {
+        // without seconds?
+        result = ParseFormat(time, _T("%H:%M"));
+    }
+
+    if ( !result )
+    {
+        // just the hour and AM/PM?
+        result = ParseFormat(time, _T("%I %p"));
+    }
+
+    if ( !result )
+    {
+        // just the hour?
+        result = ParseFormat(time, _T("%H"));
+    }
+
+    if ( !result )
+    {
+        // parse the standard format: normally it is one of the formats above
+        // but it may be set to something completely different by the user
+        result = ParseFormat(time, _T("%X"));
+    }
+
+    // TODO: parse timezones
+
+    return result;
+}
+
+// ----------------------------------------------------------------------------
+// Workdays and holidays support
+// ----------------------------------------------------------------------------
+
+bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const
+{
+    return !wxDateTimeHolidayAuthority::IsHoliday(*this);
+}
+
+// ============================================================================
+// wxDateSpan
+// ============================================================================
+
+wxDateSpan WXDLLIMPEXP_BASE operator*(int n, const wxDateSpan& ds)
+{
+    wxDateSpan ds1(ds);
+    return ds1.Multiply(n);
+}
+
+// ============================================================================
+// wxTimeSpan
+// ============================================================================
+
+wxTimeSpan WXDLLIMPEXP_BASE operator*(int n, const wxTimeSpan& ts)
+{
+    return wxTimeSpan(ts).Multiply(n);
+}
+
+// this enum is only used in wxTimeSpan::Format() below but we can't declare
+// it locally to the method as it provokes an internal compiler error in egcs
+// 2.91.60 when building with -O2
+enum TimeSpanPart
+{
+    Part_Week,
+    Part_Day,
+    Part_Hour,
+    Part_Min,
+    Part_Sec,
+    Part_MSec
+};
+
+// not all strftime(3) format specifiers make sense here because, for example,
+// a time span doesn't have a year nor a timezone
+//
+// Here are the ones which are supported (all of them are supported by strftime
+// as well):
+//  %H          hour in 24 hour format
+//  %M          minute (00 - 59)
+//  %S          second (00 - 59)
+//  %%          percent sign
+//
+// Also, for MFC CTimeSpan compatibility, we support
+//  %D          number of days
+//
+// And, to be better than MFC :-), we also have
+//  %E          number of wEeks
+//  %l          milliseconds (000 - 999)
+wxString wxTimeSpan::Format(const wxChar *format) const
+{
+    // we deal with only positive time spans here and just add the sign in
+    // front for the negative ones
+    if ( IsNegative() )
+    {
+        wxString str(Negate().Format(format));
+        return _T("-") + str;
+    }
+
+    wxCHECK_MSG( format, wxEmptyString,
+                 _T("NULL format in wxTimeSpan::Format") );
+
+    wxString str;
+    str.Alloc(wxStrlen(format));
+
+    // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */)
+    //
+    // Then, of course, ts.Format("%H:%M:%S") must return "01:02:03", but the
+    // question is what should ts.Format("%S") do? The code here returns "3273"
+    // in this case (i.e. the total number of seconds, not just seconds % 60)
+    // because, for me, this call means "give me entire time interval in
+    // seconds" and not "give me the seconds part of the time interval"
+    //
+    // If we agree that it should behave like this, it is clear that the
+    // interpretation of each format specifier depends on the presence of the
+    // other format specs in the string: if there was "%H" before "%M", we
+    // should use GetMinutes() % 60, otherwise just GetMinutes() &c
+
+    // we remember the most important unit found so far
+    TimeSpanPart partBiggest = Part_MSec;
+
+    for ( const wxChar *pch = format; *pch; pch++ )
+    {
+        wxChar ch = *pch;
+
+        if ( ch == _T('%') )
+        {
+            // the start of the format specification of the printf() below
+            wxString fmtPrefix(_T('%'));
+
+            // the number
+            long n;
+
+            // the number of digits for the format string, 0 if unused
+            unsigned digits = 0;
+
+            ch = *++pch;    // get the format spec char
+            switch ( ch )
+            {
+                default:
+                    wxFAIL_MSG( _T("invalid format character") );
+                    // fall through
+
+                case _T('%'):
+                    str += ch;
+
+                    // skip the part below switch
+                    continue;
+
+                case _T('D'):
+                    n = GetDays();
+                    if ( partBiggest < Part_Day )
+                    {
+                        n %= DAYS_PER_WEEK;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Day;
+                    }
+                    break;
+
+                case _T('E'):
+                    partBiggest = Part_Week;
+                    n = GetWeeks();
+                    break;
+
+                case _T('H'):
+                    n = GetHours();
+                    if ( partBiggest < Part_Hour )
+                    {
+                        n %= HOURS_PER_DAY;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Hour;
+                    }
+
+                    digits = 2;
+                    break;
+
+                case _T('l'):
+                    n = GetMilliseconds().ToLong();
+                    if ( partBiggest < Part_MSec )
+                    {
+                        n %= 1000;
+                    }
+                    //else: no need to reset partBiggest to Part_MSec, it is
+                    //      the least significant one anyhow
+
+                    digits = 3;
+                    break;
+
+                case _T('M'):
+                    n = GetMinutes();
+                    if ( partBiggest < Part_Min )
+                    {
+                        n %= MIN_PER_HOUR;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Min;
+                    }
+
+                    digits = 2;
+                    break;
+
+                case _T('S'):
+                    n = GetSeconds().ToLong();
+                    if ( partBiggest < Part_Sec )
+                    {
+                        n %= SEC_PER_MIN;
+                    }
+                    else
+                    {
+                        partBiggest = Part_Sec;
+                    }
+
+                    digits = 2;
+                    break;
+            }
+
+            if ( digits )
+            {
+                fmtPrefix << _T("0") << digits;
+            }
+
+            str += wxString::Format(fmtPrefix + _T("ld"), n);
+        }
+        else
+        {
+            // normal character, just copy
+            str += ch;
+        }
+    }
+
+    return str;
+}
+
+// ============================================================================
+// wxDateTimeHolidayAuthority and related classes
+// ============================================================================
+
+#include "wx/arrimpl.cpp"
+
+WX_DEFINE_OBJARRAY(wxDateTimeArray)
+
+static int wxCMPFUNC_CONV
+wxDateTimeCompareFunc(wxDateTime **first, wxDateTime **second)
+{
+    wxDateTime dt1 = **first,
+               dt2 = **second;
+
+    return dt1 == dt2 ? 0 : dt1 < dt2 ? -1 : +1;
+}
+
+// ----------------------------------------------------------------------------
+// wxDateTimeHolidayAuthority
+// ----------------------------------------------------------------------------
+
+wxHolidayAuthoritiesArray wxDateTimeHolidayAuthority::ms_authorities;
+
+/* static */
+bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt)
+{
+    size_t count = ms_authorities.size();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if ( ms_authorities[n]->DoIsHoliday(dt) )
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/* static */
+size_t
+wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart,
+                                               const wxDateTime& dtEnd,
+                                               wxDateTimeArray& holidays)
+{
+    wxDateTimeArray hol;
+
+    holidays.Clear();
+
+    const size_t countAuth = ms_authorities.size();
+    for ( size_t nAuth = 0; nAuth < countAuth; nAuth++ )
+    {
+        ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol);
+
+        WX_APPEND_ARRAY(holidays, hol);
+    }
+
+    holidays.Sort(wxDateTimeCompareFunc);
+
+    return holidays.size();
+}
+
+/* static */
+void wxDateTimeHolidayAuthority::ClearAllAuthorities()
+{
+    WX_CLEAR_ARRAY(ms_authorities);
+}
+
+/* static */
+void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth)
+{
+    ms_authorities.push_back(auth);
+}
+
+wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority()
+{
+    // required here for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// wxDateTimeWorkDays
+// ----------------------------------------------------------------------------
+
+bool wxDateTimeWorkDays::DoIsHoliday(const wxDateTime& dt) const
+{
+    wxDateTime::WeekDay wd = dt.GetWeekDay();
+
+    return (wd == wxDateTime::Sun) || (wd == wxDateTime::Sat);
+}
+
+size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart,
+                                                const wxDateTime& dtEnd,
+                                                wxDateTimeArray& holidays) const
+{
+    if ( dtStart > dtEnd )
+    {
+        wxFAIL_MSG( _T("invalid date range in GetHolidaysInRange") );
+
+        return 0u;
+    }
+
+    holidays.Empty();
+
+    // instead of checking all days, start with the first Sat after dtStart and
+    // end with the last Sun before dtEnd
+    wxDateTime dtSatFirst = dtStart.GetNextWeekDay(wxDateTime::Sat),
+               dtSatLast = dtEnd.GetPrevWeekDay(wxDateTime::Sat),
+               dtSunFirst = dtStart.GetNextWeekDay(wxDateTime::Sun),
+               dtSunLast = dtEnd.GetPrevWeekDay(wxDateTime::Sun),
+               dt;
+
+    for ( dt = dtSatFirst; dt <= dtSatLast; dt += wxDateSpan::Week() )
+    {
+        holidays.Add(dt);
+    }
+
+    for ( dt = dtSunFirst; dt <= dtSunLast; dt += wxDateSpan::Week() )
+    {
+        holidays.Add(dt);
+    }
+
+    return holidays.GetCount();
+}
+
+// ============================================================================
+// other helper functions
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// iteration helpers: can be used to write a for loop over enum variable like
+// this:
+//  for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) )
+// ----------------------------------------------------------------------------
+
+WXDLLIMPEXP_BASE void wxNextMonth(wxDateTime::Month& m)
+{
+    wxASSERT_MSG( m < wxDateTime::Inv_Month, _T("invalid month") );
+
+    // no wrapping or the for loop above would never end!
+    m = (wxDateTime::Month)(m + 1);
+}
+
+WXDLLIMPEXP_BASE void wxPrevMonth(wxDateTime::Month& m)
+{
+    wxASSERT_MSG( m < wxDateTime::Inv_Month, _T("invalid month") );
+
+    m = m == wxDateTime::Jan ? wxDateTime::Inv_Month
+                             : (wxDateTime::Month)(m - 1);
+}
+
+WXDLLIMPEXP_BASE void wxNextWDay(wxDateTime::WeekDay& wd)
+{
+    wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, _T("invalid week day") );
+
+    // no wrapping or the for loop above would never end!
+    wd = (wxDateTime::WeekDay)(wd + 1);
+}
+
+WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd)
+{
+    wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, _T("invalid week day") );
+
+    wd = wd == wxDateTime::Sun ? wxDateTime::Inv_WeekDay
+                               : (wxDateTime::WeekDay)(wd - 1);
+}
+
+#endif // wxUSE_DATETIME
diff --git a/Source/3rd Party/wx/src/common/datetimefmt.cpp b/Source/3rd Party/wx/src/common/datetimefmt.cpp
deleted file mode 100644
index 9b3f63cb7..000000000
--- a/Source/3rd Party/wx/src/common/datetimefmt.cpp	
+++ /dev/null
@@ -1,2349 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/datetimefmt.cpp
-// Purpose:     wxDateTime formatting & parsing code
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     11.05.99
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-//              parts of code taken from sndcal library by Scott E. Lee:
-//
-//               Copyright 1993-1995, Scott E. Lee, all rights reserved.
-//               Permission granted to use, copy, modify, distribute and sell
-//               so long as the above copyright and this permission statement
-//               are retained in all copies.
-//
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME
-
-#ifndef WX_PRECOMP
-    #ifdef __WINDOWS__
-        #include "wx/msw/wrapwin.h"
-    #endif
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/stopwatch.h"           // for wxGetLocalTimeMillis()
-    #include "wx/module.h"
-    #include "wx/crt.h"
-#endif // WX_PRECOMP
-
-#include "wx/thread.h"
-
-#include <ctype.h>
-
-#ifdef __WINDOWS__
-    #include <winnls.h>
-    #ifndef __WXWINCE__
-        #include <locale.h>
-    #endif
-#endif
-
-#include "wx/datetime.h"
-#include "wx/time.h"
-
-// ============================================================================
-// implementation of wxDateTime
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// helpers shared between datetime.cpp and datetimefmt.cpp
-// ----------------------------------------------------------------------------
-
-extern void InitTm(struct tm& tm);
-
-extern wxString CallStrftime(const wxString& format, const tm* tm);
-
-// ----------------------------------------------------------------------------
-// constants (see also datetime.cpp)
-// ----------------------------------------------------------------------------
-
-static const int DAYS_PER_WEEK = 7;
-
-static const int HOURS_PER_DAY = 24;
-
-static const int SEC_PER_MIN = 60;
-
-static const int MIN_PER_HOUR = 60;
-
-// ----------------------------------------------------------------------------
-// parsing helpers
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// all the functions below taking non-const wxString::const_iterator p advance
-// it until the end of the match
-
-// scans all digits (but no more than len) and returns the resulting number
-bool GetNumericToken(size_t len,
-                     wxString::const_iterator& p,
-                     const wxString::const_iterator& end,
-                     unsigned long *number)
-{
-    size_t n = 1;
-    wxString s;
-    while ( p != end && wxIsdigit(*p) )
-    {
-        s += *p++;
-
-        if ( len && ++n > len )
-            break;
-    }
-
-    return !s.empty() && s.ToULong(number);
-}
-
-// scans all alphabetic characters and returns the resulting string
-wxString
-GetAlphaToken(wxString::const_iterator& p,
-              const wxString::const_iterator& end)
-{
-    wxString s;
-    while ( p != end && wxIsalpha(*p) )
-    {
-        s += *p++;
-    }
-
-    return s;
-}
-
-enum
-{
-    DateLang_English = 1,
-    DateLang_Local   = 2
-};
-
-// return the month if the string is a month name or Inv_Month otherwise
-//
-// flags can contain wxDateTime::Name_Abbr/Name_Full or both of them and lang
-// can be either DateLang_Local (default) to interpret string as a localized
-// month name or DateLang_English to parse it as a standard English name or
-// their combination to interpret it in any way
-wxDateTime::Month
-GetMonthFromName(wxString::const_iterator& p,
-                 const wxString::const_iterator& end,
-                 int flags,
-                 int lang)
-{
-    const wxString::const_iterator pOrig = p;
-    const wxString name = GetAlphaToken(p, end);
-    if ( name.empty() )
-        return wxDateTime::Inv_Month;
-
-    wxDateTime::Month mon;
-    for ( mon = wxDateTime::Jan; mon < wxDateTime::Inv_Month; wxNextMonth(mon) )
-    {
-        // case-insensitive comparison either one of or with both abbreviated
-        // and not versions
-        if ( flags & wxDateTime::Name_Full )
-        {
-            if ( lang & DateLang_English )
-            {
-                if ( name.CmpNoCase(wxDateTime::GetEnglishMonthName(mon,
-                        wxDateTime::Name_Full)) == 0 )
-                    break;
-            }
-
-            if ( lang & DateLang_Local )
-            {
-                if ( name.CmpNoCase(wxDateTime::GetMonthName(mon,
-                        wxDateTime::Name_Full)) == 0 )
-                    break;
-            }
-        }
-
-        if ( flags & wxDateTime::Name_Abbr )
-        {
-            if ( lang & DateLang_English )
-            {
-                if ( name.CmpNoCase(wxDateTime::GetEnglishMonthName(mon,
-                        wxDateTime::Name_Abbr)) == 0 )
-                    break;
-            }
-
-            if ( lang & DateLang_Local )
-            {
-                // some locales (e.g. French one) use periods for the
-                // abbreviated month names but it's never part of name so
-                // compare it specially
-                wxString nameAbbr = wxDateTime::GetMonthName(mon,
-                    wxDateTime::Name_Abbr);
-                const bool hasPeriod = *nameAbbr.rbegin() == '.';
-                if ( hasPeriod )
-                    nameAbbr.erase(nameAbbr.end() - 1);
-
-                if ( name.CmpNoCase(nameAbbr) == 0 )
-                {
-                    if ( hasPeriod )
-                    {
-                        // skip trailing period if it was part of the match
-                        if ( *p == '.' )
-                            ++p;
-                        else // no match as no matching period
-                            continue;
-                    }
-
-                    break;
-                }
-            }
-        }
-    }
-
-    if ( mon == wxDateTime::Inv_Month )
-        p = pOrig;
-
-    return mon;
-}
-
-// return the weekday if the string is a weekday name or Inv_WeekDay otherwise
-//
-// flags and lang parameters have the same meaning as for GetMonthFromName()
-// above
-wxDateTime::WeekDay
-GetWeekDayFromName(wxString::const_iterator& p,
-                   const wxString::const_iterator& end,
-                   int flags, int lang)
-{
-    const wxString::const_iterator pOrig = p;
-    const wxString name = GetAlphaToken(p, end);
-    if ( name.empty() )
-        return wxDateTime::Inv_WeekDay;
-
-    wxDateTime::WeekDay wd;
-    for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) )
-    {
-        if ( flags & wxDateTime::Name_Full )
-        {
-            if ( lang & DateLang_English )
-            {
-                if ( name.CmpNoCase(wxDateTime::GetEnglishWeekDayName(wd,
-                        wxDateTime::Name_Full)) == 0 )
-                    break;
-            }
-
-            if ( lang & DateLang_Local )
-            {
-                if ( name.CmpNoCase(wxDateTime::GetWeekDayName(wd,
-                        wxDateTime::Name_Full)) == 0 )
-                    break;
-            }
-        }
-
-        if ( flags & wxDateTime::Name_Abbr )
-        {
-            if ( lang & DateLang_English )
-            {
-                if ( name.CmpNoCase(wxDateTime::GetEnglishWeekDayName(wd,
-                        wxDateTime::Name_Abbr)) == 0 )
-                    break;
-            }
-
-            if ( lang & DateLang_Local )
-            {
-                if ( name.CmpNoCase(wxDateTime::GetWeekDayName(wd,
-                        wxDateTime::Name_Abbr)) == 0 )
-                    break;
-            }
-        }
-    }
-
-    if ( wd == wxDateTime::Inv_WeekDay )
-        p = pOrig;
-
-    return wd;
-}
-
-// parses string starting at given iterator using the specified format and,
-// optionally, a fall back format (and optionally another one... but it stops
-// there, really)
-//
-// if unsuccessful, returns invalid wxDateTime without changing p; otherwise
-// advance p to the end of the match and returns wxDateTime containing the
-// results of the parsing
-wxDateTime
-ParseFormatAt(wxString::const_iterator& p,
-              const wxString::const_iterator& end,
-              const wxString& fmt,
-              // FIXME-VC6: using wxString() instead of wxEmptyString in the
-              //            line below results in error C2062: type 'class
-              //            wxString (__cdecl *)(void)' unexpected
-              const wxString& fmtAlt = wxEmptyString)
-{
-    const wxString str(p, end);
-    wxString::const_iterator endParse;
-    wxDateTime dt;
-
-    // Use a default date outside of the DST period to avoid problems with
-    // parsing the time differently depending on the today's date (which is used
-    // as the fall back date if none is explicitly specified).
-    static const wxDateTime dtDef(1, wxDateTime::Jan, 2012);
-
-    if ( dt.ParseFormat(str, fmt, dtDef, &endParse) ||
-            (!fmtAlt.empty() && dt.ParseFormat(str, fmtAlt, dtDef, &endParse)) )
-    {
-        p += endParse - str.begin();
-    }
-    //else: all formats failed
-
-    return dt;
-}
-
-} // anonymous namespace
-
-// ----------------------------------------------------------------------------
-// wxDateTime to/from text representations
-// ----------------------------------------------------------------------------
-
-wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
-{
-    wxCHECK_MSG( !formatp.empty(), wxEmptyString,
-                 wxT("NULL format in wxDateTime::Format") );
-
-    wxString format = formatp;
-#ifdef __WXOSX__
-    format.Replace("%c",wxLocale::GetInfo(wxLOCALE_DATE_TIME_FMT));
-    format.Replace("%x",wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT));
-    format.Replace("%X",wxLocale::GetInfo(wxLOCALE_TIME_FMT));
-#endif
-    // we have to use our own implementation if the date is out of range of
-    // strftime() or if we use non standard specifiers (notice that "%z" is
-    // special because it is de facto standard under Unix but is not supported
-    // under Windows)
-#ifdef wxHAS_STRFTIME
-    time_t time = GetTicks();
-
-    if ( (time != (time_t)-1) && !wxStrstr(format, wxT("%l"))
-#ifdef __WINDOWS__
-            && !wxStrstr(format, wxT("%z"))
-#endif
-       )
-    {
-        // use strftime()
-        struct tm tmstruct;
-        struct tm *tm;
-        if ( tz.GetOffset() == -wxGetTimeZone() )
-        {
-            // we are working with local time
-            tm = wxLocaltime_r(&time, &tmstruct);
-
-            // should never happen
-            wxCHECK_MSG( tm, wxEmptyString, wxT("wxLocaltime_r() failed") );
-        }
-        else
-        {
-            time += (int)tz.GetOffset();
-
-#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning
-            int time2 = (int) time;
-            if ( time2 >= 0 )
-#else
-            if ( time >= 0 )
-#endif
-            {
-                tm = wxGmtime_r(&time, &tmstruct);
-
-                // should never happen
-                wxCHECK_MSG( tm, wxEmptyString, wxT("wxGmtime_r() failed") );
-            }
-            else
-            {
-                tm = (struct tm *)NULL;
-            }
-        }
-
-        if ( tm )
-        {
-            return CallStrftime(format, tm);
-        }
-    }
-    //else: use generic code below
-#endif // wxHAS_STRFTIME
-
-    // we only parse ANSI C format specifications here, no POSIX 2
-    // complications, no GNU extensions but we do add support for a "%l" format
-    // specifier allowing to get the number of milliseconds
-    Tm tm = GetTm(tz);
-
-    // used for calls to strftime() when we only deal with time
-    struct tm tmTimeOnly;
-    memset(&tmTimeOnly, 0, sizeof(tmTimeOnly));
-    tmTimeOnly.tm_hour = tm.hour;
-    tmTimeOnly.tm_min = tm.min;
-    tmTimeOnly.tm_sec = tm.sec;
-    tmTimeOnly.tm_mday = 1;         // any date will do, use 1976-01-01
-    tmTimeOnly.tm_mon = 0;
-    tmTimeOnly.tm_year = 76;
-    tmTimeOnly.tm_isdst = 0;        // no DST, we adjust for tz ourselves
-
-    wxString tmp, res, fmt;
-    for ( wxString::const_iterator p = format.begin(); p != format.end(); ++p )
-    {
-        if ( *p != wxT('%') )
-        {
-            // copy as is
-            res += *p;
-
-            continue;
-        }
-
-        // set the default format
-        switch ( (*++p).GetValue() )
-        {
-            case wxT('Y'):               // year has 4 digits
-            case wxT('z'):               // time zone as well
-                fmt = wxT("%04d");
-                break;
-
-            case wxT('j'):               // day of year has 3 digits
-            case wxT('l'):               // milliseconds have 3 digits
-                fmt = wxT("%03d");
-                break;
-
-            case wxT('w'):               // week day as number has only one
-                fmt = wxT("%d");
-                break;
-
-            default:
-                // it's either another valid format specifier in which case
-                // the format is "%02d" (for all the rest) or we have the
-                // field width preceding the format in which case it will
-                // override the default format anyhow
-                fmt = wxT("%02d");
-        }
-
-        bool restart = true;
-        while ( restart )
-        {
-            restart = false;
-
-            // start of the format specification
-            switch ( (*p).GetValue() )
-            {
-                case wxT('a'):       // a weekday name
-                case wxT('A'):
-                    // second parameter should be true for abbreviated names
-                    res += GetWeekDayName(tm.GetWeekDay(),
-                                          *p == wxT('a') ? Name_Abbr : Name_Full);
-                    break;
-
-                case wxT('b'):       // a month name
-                case wxT('B'):
-                    res += GetMonthName(tm.mon,
-                                        *p == wxT('b') ? Name_Abbr : Name_Full);
-                    break;
-
-                case wxT('c'):       // locale default date and time  representation
-                case wxT('x'):       // locale default date representation
-#ifdef wxHAS_STRFTIME
-                    //
-                    // the problem: there is no way to know what do these format
-                    // specifications correspond to for the current locale.
-                    //
-                    // the solution: use a hack and still use strftime(): first
-                    // find the YEAR which is a year in the strftime() range (1970
-                    // - 2038) whose Jan 1 falls on the same week day as the Jan 1
-                    // of the real year. Then make a copy of the format and
-                    // replace all occurrences of YEAR in it with some unique
-                    // string not appearing anywhere else in it, then use
-                    // strftime() to format the date in year YEAR and then replace
-                    // YEAR back by the real year and the unique replacement
-                    // string back with YEAR. Notice that "all occurrences of YEAR"
-                    // means all occurrences of 4 digit as well as 2 digit form!
-                    //
-                    // the bugs: we assume that neither of %c nor %x contains any
-                    // fields which may change between the YEAR and real year. For
-                    // example, the week number (%U, %W) and the day number (%j)
-                    // will change if one of these years is leap and the other one
-                    // is not!
-                    {
-                        // find the YEAR: normally, for any year X, Jan 1 of the
-                        // year X + 28 is the same weekday as Jan 1 of X (because
-                        // the weekday advances by 1 for each normal X and by 2
-                        // for each leap X, hence by 5 every 4 years or by 35
-                        // which is 0 mod 7 every 28 years) but this rule breaks
-                        // down if there are years between X and Y which are
-                        // divisible by 4 but not leap (i.e. divisible by 100 but
-                        // not 400), hence the correction.
-
-                        int yearReal = GetYear(tz);
-                        int mod28 = yearReal % 28;
-
-                        // be careful to not go too far - we risk to leave the
-                        // supported range
-                        int year;
-                        if ( mod28 < 10 )
-                        {
-                            year = 1988 + mod28;      // 1988 == 0 (mod 28)
-                        }
-                        else
-                        {
-                            year = 1970 + mod28 - 10; // 1970 == 10 (mod 28)
-                        }
-
-                        int nCentury = year / 100,
-                            nCenturyReal = yearReal / 100;
-
-                        // need to adjust for the years divisble by 400 which are
-                        // not leap but are counted like leap ones if we just take
-                        // the number of centuries in between for nLostWeekDays
-                        int nLostWeekDays = (nCentury - nCenturyReal) -
-                                            (nCentury / 4 - nCenturyReal / 4);
-
-                        // we have to gain back the "lost" weekdays: note that the
-                        // effect of this loop is to not do anything to
-                        // nLostWeekDays (which we won't use any more), but to
-                        // (indirectly) set the year correctly
-                        while ( (nLostWeekDays % 7) != 0 )
-                        {
-                            nLostWeekDays += year++ % 4 ? 1 : 2;
-                        }
-
-                        // finally move the year below 2000 so that the 2-digit
-                        // year number can never match the month or day of the
-                        // month when we do the replacements below
-                        if ( year >= 2000 )
-                            year -= 28;
-
-                        wxASSERT_MSG( year >= 1970 && year < 2000,
-                                      wxT("logic error in wxDateTime::Format") );
-
-
-                        // use strftime() to format the same date but in supported
-                        // year
-                        //
-                        // NB: we assume that strftime() doesn't check for the
-                        //     date validity and will happily format the date
-                        //     corresponding to Feb 29 of a non leap year (which
-                        //     may happen if yearReal was leap and year is not)
-                        struct tm tmAdjusted;
-                        InitTm(tmAdjusted);
-                        tmAdjusted.tm_hour = tm.hour;
-                        tmAdjusted.tm_min = tm.min;
-                        tmAdjusted.tm_sec = tm.sec;
-                        tmAdjusted.tm_wday = tm.GetWeekDay();
-                        tmAdjusted.tm_yday = GetDayOfYear();
-                        tmAdjusted.tm_mday = tm.mday;
-                        tmAdjusted.tm_mon = tm.mon;
-                        tmAdjusted.tm_year = year - 1900;
-                        tmAdjusted.tm_isdst = 0; // no DST, already adjusted
-                        wxString str = CallStrftime(*p == wxT('c') ? wxT("%c")
-                                                                  : wxT("%x"),
-                                                    &tmAdjusted);
-
-                        // now replace the replacement year with the real year:
-                        // notice that we have to replace the 4 digit year with
-                        // a unique string not appearing in strftime() output
-                        // first to prevent the 2 digit year from matching any
-                        // substring of the 4 digit year (but any day, month,
-                        // hours or minutes components should be safe because
-                        // they are never in 70-99 range)
-                        wxString replacement("|");
-                        while ( str.find(replacement) != wxString::npos )
-                            replacement += '|';
-
-                        str.Replace(wxString::Format("%d", year),
-                                    replacement);
-                        str.Replace(wxString::Format("%d", year % 100),
-                                    wxString::Format("%d", yearReal % 100));
-                        str.Replace(replacement,
-                                    wxString::Format("%d", yearReal));
-
-                        res += str;
-                    }
-#else // !wxHAS_STRFTIME
-                    // Use "%m/%d/%y %H:%M:%S" format instead
-                    res += wxString::Format(wxT("%02d/%02d/%04d %02d:%02d:%02d"),
-                            tm.mon+1,tm.mday, tm.year, tm.hour, tm.min, tm.sec);
-#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
-                    break;
-
-                case wxT('d'):       // day of a month (01-31)
-                    res += wxString::Format(fmt, tm.mday);
-                    break;
-
-                case wxT('H'):       // hour in 24h format (00-23)
-                    res += wxString::Format(fmt, tm.hour);
-                    break;
-
-                case wxT('I'):       // hour in 12h format (01-12)
-                    {
-                        // 24h -> 12h, 0h -> 12h too
-                        int hour12 = tm.hour > 12 ? tm.hour - 12
-                                                  : tm.hour ? tm.hour : 12;
-                        res += wxString::Format(fmt, hour12);
-                    }
-                    break;
-
-                case wxT('j'):       // day of the year
-                    res += wxString::Format(fmt, GetDayOfYear(tz));
-                    break;
-
-                case wxT('l'):       // milliseconds (NOT STANDARD)
-                    res += wxString::Format(fmt, GetMillisecond(tz));
-                    break;
-
-                case wxT('m'):       // month as a number (01-12)
-                    res += wxString::Format(fmt, tm.mon + 1);
-                    break;
-
-                case wxT('M'):       // minute as a decimal number (00-59)
-                    res += wxString::Format(fmt, tm.min);
-                    break;
-
-                case wxT('p'):       // AM or PM string
-#ifdef wxHAS_STRFTIME
-                    res += CallStrftime(wxT("%p"), &tmTimeOnly);
-#else // !wxHAS_STRFTIME
-                    res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am");
-#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
-                    break;
-
-                case wxT('S'):       // second as a decimal number (00-61)
-                    res += wxString::Format(fmt, tm.sec);
-                    break;
-
-                case wxT('U'):       // week number in the year (Sunday 1st week day)
-                    res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz));
-                    break;
-
-                case wxT('W'):       // week number in the year (Monday 1st week day)
-                    res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz));
-                    break;
-
-                case wxT('w'):       // weekday as a number (0-6), Sunday = 0
-                    res += wxString::Format(fmt, tm.GetWeekDay());
-                    break;
-
-                // case wxT('x'): -- handled with "%c"
-
-                case wxT('X'):       // locale default time representation
-                    // just use strftime() to format the time for us
-#ifdef wxHAS_STRFTIME
-                    res += CallStrftime(wxT("%X"), &tmTimeOnly);
-#else // !wxHAS_STRFTIME
-                    res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec);
-#endif // wxHAS_STRFTIME/!wxHAS_STRFTIME
-                    break;
-
-                case wxT('y'):       // year without century (00-99)
-                    res += wxString::Format(fmt, tm.year % 100);
-                    break;
-
-                case wxT('Y'):       // year with century
-                    res += wxString::Format(fmt, tm.year);
-                    break;
-
-                case wxT('z'):       // time zone as [-+]HHMM
-                    {
-                        int ofs = tz.GetOffset();
-                        if ( ofs < 0 )
-                        {
-                            res += '-';
-                            ofs = -ofs;
-                        }
-                        else
-                        {
-                            res += '+';
-                        }
-
-                        // Converts seconds to HHMM representation.
-                        res += wxString::Format(fmt,
-                                                100*(ofs/3600) + (ofs/60)%60);
-                    }
-                    break;
-
-                case wxT('Z'):       // timezone name
-#ifdef wxHAS_STRFTIME
-                    res += CallStrftime(wxT("%Z"), &tmTimeOnly);
-#endif
-                    break;
-
-                default:
-                    // is it the format width?
-                    for ( fmt.clear();
-                          *p == wxT('-') || *p == wxT('+') ||
-                            *p == wxT(' ') || wxIsdigit(*p);
-                          ++p )
-                    {
-                        fmt += *p;
-                    }
-
-                    if ( !fmt.empty() )
-                    {
-                        // we've only got the flags and width so far in fmt
-                        fmt.Prepend(wxT('%'));
-                        fmt.Append(wxT('d'));
-
-                        restart = true;
-
-                        break;
-                    }
-
-                    // no, it wasn't the width
-                    wxFAIL_MSG(wxT("unknown format specifier"));
-
-                    // fall through and just copy it nevertheless
-
-                case wxT('%'):       // a percent sign
-                    res += *p;
-                    break;
-
-                case 0:             // the end of string
-                    wxFAIL_MSG(wxT("missing format at the end of string"));
-
-                    // just put the '%' which was the last char in format
-                    res += wxT('%');
-                    break;
-            }
-        }
-    }
-
-    return res;
-}
-
-// this function parses a string in (strict) RFC 822 format: see the section 5
-// of the RFC for the detailed description, but briefly it's something of the
-// form "Sat, 18 Dec 1999 00:48:30 +0100"
-//
-// this function is "strict" by design - it must reject anything except true
-// RFC822 time specs.
-bool
-wxDateTime::ParseRfc822Date(const wxString& date, wxString::const_iterator *end)
-{
-    const wxString::const_iterator pEnd = date.end();
-    wxString::const_iterator p = date.begin();
-
-    // 1. week day
-    const wxDateTime::WeekDay
-        wd = GetWeekDayFromName(p, pEnd, Name_Abbr, DateLang_English);
-    if ( wd == Inv_WeekDay )
-        return false;
-    //else: ignore week day for now, we could also check that it really
-    //      corresponds to the specified date
-
-    // 2. separating comma
-    if ( *p++ != ',' || *p++ != ' ' )
-        return false;
-
-    // 3. day number
-    if ( !wxIsdigit(*p) )
-        return false;
-
-    wxDateTime_t day = (wxDateTime_t)(*p++ - '0');
-    if ( wxIsdigit(*p) )
-    {
-        day *= 10;
-        day = (wxDateTime_t)(day + (*p++ - '0'));
-    }
-
-    if ( *p++ != ' ' )
-        return false;
-
-    // 4. month name
-    const Month mon = GetMonthFromName(p, pEnd, Name_Abbr, DateLang_English);
-    if ( mon == Inv_Month )
-        return false;
-
-    if ( *p++ != ' ' )
-        return false;
-
-    // 5. year
-    if ( !wxIsdigit(*p) )
-        return false;
-
-    int year = *p++ - '0';
-    if ( !wxIsdigit(*p) ) // should have at least 2 digits in the year
-        return false;
-
-    year *= 10;
-    year += *p++ - '0';
-
-    // is it a 2 digit year (as per original RFC 822) or a 4 digit one?
-    if ( wxIsdigit(*p) )
-    {
-        year *= 10;
-        year += *p++ - '0';
-
-        if ( !wxIsdigit(*p) )
-        {
-            // no 3 digit years please
-            return false;
-        }
-
-        year *= 10;
-        year += *p++ - '0';
-    }
-
-    if ( *p++ != ' ' )
-        return false;
-
-    // 6. time in hh:mm:ss format with seconds being optional
-    if ( !wxIsdigit(*p) )
-        return false;
-
-    wxDateTime_t hour = (wxDateTime_t)(*p++ - '0');
-
-    if ( !wxIsdigit(*p) )
-        return false;
-
-    hour *= 10;
-    hour = (wxDateTime_t)(hour + (*p++ - '0'));
-
-    if ( *p++ != ':' )
-        return false;
-
-    if ( !wxIsdigit(*p) )
-        return false;
-
-    wxDateTime_t min = (wxDateTime_t)(*p++ - '0');
-
-    if ( !wxIsdigit(*p) )
-        return false;
-
-    min *= 10;
-    min += (wxDateTime_t)(*p++ - '0');
-
-    wxDateTime_t sec = 0;
-    if ( *p == ':' )
-    {
-        p++;
-        if ( !wxIsdigit(*p) )
-            return false;
-
-        sec = (wxDateTime_t)(*p++ - '0');
-
-        if ( !wxIsdigit(*p) )
-            return false;
-
-        sec *= 10;
-        sec += (wxDateTime_t)(*p++ - '0');
-    }
-
-    if ( *p++ != ' ' )
-        return false;
-
-    // 7. now the interesting part: the timezone
-    int offset = 0; // just to suppress warnings
-    if ( *p == '-' || *p == '+' )
-    {
-        // the explicit offset given: it has the form of hhmm
-        bool plus = *p++ == '+';
-
-        if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
-            return false;
-
-
-        // hours
-        offset = MIN_PER_HOUR*(10*(*p - '0') + (*(p + 1) - '0'));
-
-        p += 2;
-
-        if ( !wxIsdigit(*p) || !wxIsdigit(*(p + 1)) )
-            return false;
-
-        // minutes
-        offset += 10*(*p - '0') + (*(p + 1) - '0');
-
-        if ( !plus )
-            offset = -offset;
-
-        p += 2;
-    }
-    else // not numeric
-    {
-        // the symbolic timezone given: may be either military timezone or one
-        // of standard abbreviations
-        if ( !*(p + 1) )
-        {
-            // military: Z = UTC, J unused, A = -1, ..., Y = +12
-            static const int offsets[26] =
-            {
-                //A  B   C   D   E   F   G   H   I    J    K    L    M
-                -1, -2, -3, -4, -5, -6, -7, -8, -9,   0, -10, -11, -12,
-                //N  O   P   R   Q   S   T   U   V    W    Z    Y    Z
-                +1, +2, +3, +4, +5, +6, +7, +8, +9, +10, +11, +12, 0
-            };
-
-            if ( *p < wxT('A') || *p > wxT('Z') || *p == wxT('J') )
-                return false;
-
-            offset = offsets[*p++ - 'A'];
-        }
-        else
-        {
-            // abbreviation
-            const wxString tz(p, date.end());
-            if ( tz == wxT("UT") || tz == wxT("UTC") || tz == wxT("GMT") )
-                offset = 0;
-            else if ( tz == wxT("AST") )
-                offset = AST - GMT0;
-            else if ( tz == wxT("ADT") )
-                offset = ADT - GMT0;
-            else if ( tz == wxT("EST") )
-                offset = EST - GMT0;
-            else if ( tz == wxT("EDT") )
-                offset = EDT - GMT0;
-            else if ( tz == wxT("CST") )
-                offset = CST - GMT0;
-            else if ( tz == wxT("CDT") )
-                offset = CDT - GMT0;
-            else if ( tz == wxT("MST") )
-                offset = MST - GMT0;
-            else if ( tz == wxT("MDT") )
-                offset = MDT - GMT0;
-            else if ( tz == wxT("PST") )
-                offset = PST - GMT0;
-            else if ( tz == wxT("PDT") )
-                offset = PDT - GMT0;
-            else
-                return false;
-
-            p += tz.length();
-        }
-
-        // make it minutes
-        offset *= MIN_PER_HOUR;
-    }
-
-
-    // the spec was correct, construct the date from the values we found
-    Set(day, mon, year, hour, min, sec);
-    MakeFromTimezone(TimeZone::Make(offset*SEC_PER_MIN));
-
-    if ( end )
-        *end = p;
-
-    return true;
-}
-
-const char* wxDateTime::ParseRfc822Date(const char* date)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseRfc822Date(dateStr, &end) )
-        return NULL;
-
-    return date + dateStr.IterOffsetInMBStr(end);
-}
-
-const wchar_t* wxDateTime::ParseRfc822Date(const wchar_t* date)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseRfc822Date(dateStr, &end) )
-        return NULL;
-
-    return date + (end - dateStr.begin());
-}
-
-bool
-wxDateTime::ParseFormat(const wxString& date,
-                        const wxString& format,
-                        const wxDateTime& dateDef,
-                        wxString::const_iterator *endParse)
-{
-    wxCHECK_MSG( !format.empty(), false, "format can't be empty" );
-    wxCHECK_MSG( endParse, false, "end iterator pointer must be specified" );
-
-    wxString str;
-    unsigned long num;
-
-    // what fields have we found?
-    bool haveWDay = false,
-         haveYDay = false,
-         haveDay = false,
-         haveMon = false,
-         haveYear = false,
-         haveHour = false,
-         haveMin = false,
-         haveSec = false,
-         haveMsec = false;
-
-    bool hourIsIn12hFormat = false, // or in 24h one?
-         isPM = false;              // AM by default
-
-    bool haveTimeZone = false;
-
-    // and the value of the items we have (init them to get rid of warnings)
-    wxDateTime_t msec = 0,
-                 sec = 0,
-                 min = 0,
-                 hour = 0;
-    WeekDay wday = Inv_WeekDay;
-    wxDateTime_t yday = 0,
-                 mday = 0;
-    wxDateTime::Month mon = Inv_Month;
-    int year = 0;
-    long timeZone = 0;  // time zone in seconds as expected in Tm structure
-
-    wxString::const_iterator input = date.begin();
-    const wxString::const_iterator end = date.end();
-    for ( wxString::const_iterator fmt = format.begin(); fmt != format.end(); ++fmt )
-    {
-        if ( *fmt != wxT('%') )
-        {
-            if ( wxIsspace(*fmt) )
-            {
-                // a white space in the format string matches 0 or more white
-                // spaces in the input
-                while ( input != end && wxIsspace(*input) )
-                {
-                    input++;
-                }
-            }
-            else // !space
-            {
-                // any other character (not whitespace, not '%') must be
-                // matched by itself in the input
-                if ( input == end || *input++ != *fmt )
-                {
-                    // no match
-                    return false;
-                }
-            }
-
-            // done with this format char
-            continue;
-        }
-
-        // start of a format specification
-
-        // parse the optional width
-        size_t width = 0;
-        while ( wxIsdigit(*++fmt) )
-        {
-            width *= 10;
-            width += *fmt - '0';
-        }
-
-        // the default widths for the various fields
-        if ( !width )
-        {
-            switch ( (*fmt).GetValue() )
-            {
-                case wxT('Y'):               // year has 4 digits
-                    width = 4;
-                    break;
-
-                case wxT('j'):               // day of year has 3 digits
-                case wxT('l'):               // milliseconds have 3 digits
-                    width = 3;
-                    break;
-
-                case wxT('w'):               // week day as number has only one
-                    width = 1;
-                    break;
-
-                default:
-                    // default for all other fields
-                    width = 2;
-            }
-        }
-
-        // then the format itself
-        switch ( (*fmt).GetValue() )
-        {
-            case wxT('a'):       // a weekday name
-            case wxT('A'):
-                {
-                    wday = GetWeekDayFromName
-                           (
-                            input, end,
-                            *fmt == 'a' ? Name_Abbr : Name_Full,
-                            DateLang_Local
-                           );
-                    if ( wday == Inv_WeekDay )
-                    {
-                        // no match
-                        return false;
-                    }
-                }
-                haveWDay = true;
-                break;
-
-            case wxT('b'):       // a month name
-            case wxT('B'):
-                {
-                    mon = GetMonthFromName
-                          (
-                            input, end,
-                            *fmt == 'b' ? Name_Abbr : Name_Full,
-                            DateLang_Local
-                          );
-                    if ( mon == Inv_Month )
-                    {
-                        // no match
-                        return false;
-                    }
-                }
-                haveMon = true;
-                break;
-
-            case wxT('c'):       // locale default date and time  representation
-                {
-                    wxDateTime dt;
-
-#if wxUSE_INTL
-                    const wxString
-                        fmtDateTime = wxLocale::GetInfo(wxLOCALE_DATE_TIME_FMT);
-                    if ( !fmtDateTime.empty() )
-                        dt = ParseFormatAt(input, end, fmtDateTime);
-#endif // wxUSE_INTL
-                    if ( !dt.IsValid() )
-                    {
-                        // also try the format which corresponds to ctime()
-                        // output (i.e. the "C" locale default)
-                        dt = ParseFormatAt(input, end, wxS("%a %b %d %H:%M:%S %Y"));
-                    }
-
-                    if ( !dt.IsValid() )
-                    {
-                        // and finally also the two generic date/time formats
-                        dt = ParseFormatAt(input, end, wxS("%x %X"), wxS("%X %x"));
-                    }
-
-                    if ( !dt.IsValid() )
-                        return false;
-
-                    const Tm tm = dt.GetTm();
-
-                    hour = tm.hour;
-                    min = tm.min;
-                    sec = tm.sec;
-
-                    year = tm.year;
-                    mon = tm.mon;
-                    mday = tm.mday;
-
-                    haveDay = haveMon = haveYear =
-                    haveHour = haveMin = haveSec = true;
-                }
-                break;
-
-            case wxT('d'):       // day of a month (01-31)
-            case 'e':           // day of a month (1-31) (GNU extension)
-                if ( !GetNumericToken(width, input, end, &num) ||
-                        (num > 31) || (num < 1) )
-                {
-                    // no match
-                    return false;
-                }
-
-                // we can't check whether the day range is correct yet, will
-                // do it later - assume ok for now
-                haveDay = true;
-                mday = (wxDateTime_t)num;
-                break;
-
-            case wxT('H'):       // hour in 24h format (00-23)
-                if ( !GetNumericToken(width, input, end, &num) || (num > 23) )
-                {
-                    // no match
-                    return false;
-                }
-
-                haveHour = true;
-                hour = (wxDateTime_t)num;
-                break;
-
-            case wxT('I'):       // hour in 12h format (01-12)
-                if ( !GetNumericToken(width, input, end, &num) ||
-                        !num || (num > 12) )
-                {
-                    // no match
-                    return false;
-                }
-
-                haveHour = true;
-                hourIsIn12hFormat = true;
-                hour = (wxDateTime_t)(num % 12);        // 12 should be 0
-                break;
-
-            case wxT('j'):       // day of the year
-                if ( !GetNumericToken(width, input, end, &num) ||
-                        !num || (num > 366) )
-                {
-                    // no match
-                    return false;
-                }
-
-                haveYDay = true;
-                yday = (wxDateTime_t)num;
-                break;
-
-            case wxT('l'):       // milliseconds (0-999)
-                if ( !GetNumericToken(width, input, end, &num) )
-                    return false;
-
-                haveMsec = true;
-                msec = (wxDateTime_t)num;
-                break;
-
-            case wxT('m'):       // month as a number (01-12)
-                if ( !GetNumericToken(width, input, end, &num) ||
-                        !num || (num > 12) )
-                {
-                    // no match
-                    return false;
-                }
-
-                haveMon = true;
-                mon = (Month)(num - 1);
-                break;
-
-            case wxT('M'):       // minute as a decimal number (00-59)
-                if ( !GetNumericToken(width, input, end, &num) ||
-                        (num > 59) )
-                {
-                    // no match
-                    return false;
-                }
-
-                haveMin = true;
-                min = (wxDateTime_t)num;
-                break;
-
-            case wxT('p'):       // AM or PM string
-                {
-                    wxString am, pm;
-                    GetAmPmStrings(&am, &pm);
-
-                    // we can never match %p in locales which don't use AM/PM
-                    if ( am.empty() || pm.empty() )
-                        return false;
-
-                    const size_t pos = input - date.begin();
-                    if ( date.compare(pos, pm.length(), pm) == 0 )
-                    {
-                        isPM = true;
-                        input += pm.length();
-                    }
-                    else if ( date.compare(pos, am.length(), am) == 0 )
-                    {
-                        input += am.length();
-                    }
-                    else // no match
-                    {
-                        return false;
-                    }
-                }
-                break;
-
-            case wxT('r'):       // time as %I:%M:%S %p
-                {
-                    wxDateTime dt;
-                    if ( !dt.ParseFormat(wxString(input, end),
-                                         wxS("%I:%M:%S %p"), &input) )
-                        return false;
-
-                    haveHour = haveMin = haveSec = true;
-
-                    const Tm tm = dt.GetTm();
-                    hour = tm.hour;
-                    min = tm.min;
-                    sec = tm.sec;
-                }
-                break;
-
-            case wxT('R'):       // time as %H:%M
-                {
-                    const wxDateTime
-                        dt = ParseFormatAt(input, end, wxS("%H:%M"));
-                    if ( !dt.IsValid() )
-                        return false;
-
-                    haveHour =
-                    haveMin = true;
-
-                    const Tm tm = dt.GetTm();
-                    hour = tm.hour;
-                    min = tm.min;
-                }
-                break;
-
-            case wxT('S'):       // second as a decimal number (00-61)
-                if ( !GetNumericToken(width, input, end, &num) ||
-                        (num > 61) )
-                {
-                    // no match
-                    return false;
-                }
-
-                haveSec = true;
-                sec = (wxDateTime_t)num;
-                break;
-
-            case wxT('T'):       // time as %H:%M:%S
-                {
-                    const wxDateTime
-                        dt = ParseFormatAt(input, end, wxS("%H:%M:%S"));
-                    if ( !dt.IsValid() )
-                        return false;
-
-                    haveHour =
-                    haveMin =
-                    haveSec = true;
-
-                    const Tm tm = dt.GetTm();
-                    hour = tm.hour;
-                    min = tm.min;
-                    sec = tm.sec;
-                }
-                break;
-
-            case wxT('w'):       // weekday as a number (0-6), Sunday = 0
-                if ( !GetNumericToken(width, input, end, &num) ||
-                        (wday > 6) )
-                {
-                    // no match
-                    return false;
-                }
-
-                haveWDay = true;
-                wday = (WeekDay)num;
-                break;
-
-            case wxT('x'):       // locale default date representation
-                {
-#if wxUSE_INTL
-                    wxString
-                        fmtDate = wxLocale::GetInfo(wxLOCALE_SHORT_DATE_FMT),
-                        fmtDateAlt = wxLocale::GetInfo(wxLOCALE_LONG_DATE_FMT);
-#else // !wxUSE_INTL
-                    wxString fmtDate, fmtDateAlt;
-#endif // wxUSE_INTL/!wxUSE_INTL
-                    if ( fmtDate.empty() )
-                    {
-                        if ( IsWestEuropeanCountry(GetCountry()) ||
-                             GetCountry() == Russia )
-                        {
-                            fmtDate = wxS("%d/%m/%Y");
-                            fmtDateAlt = wxS("%m/%d/%Y");
-                         }
-                        else // assume USA
-                        {
-                            fmtDate = wxS("%m/%d/%Y");
-                            fmtDateAlt = wxS("%d/%m/%Y");
-                        }
-                    }
-
-                    wxDateTime
-                        dt = ParseFormatAt(input, end, fmtDate, fmtDateAlt);
-
-                    if ( !dt.IsValid() )
-                    {
-                        // try with short years too
-                        fmtDate.Replace("%Y","%y");
-                        fmtDateAlt.Replace("%Y","%y");
-                        dt = ParseFormatAt(input, end, fmtDate, fmtDateAlt);
-
-                        if ( !dt.IsValid() )
-                            return false;
-                    }
-
-                    const Tm tm = dt.GetTm();
-
-                    haveDay =
-                    haveMon =
-                    haveYear = true;
-
-                    year = tm.year;
-                    mon = tm.mon;
-                    mday = tm.mday;
-                }
-
-                break;
-
-            case wxT('X'):       // locale default time representation
-                {
-#if wxUSE_INTL
-                    wxString fmtTime = wxLocale::GetInfo(wxLOCALE_TIME_FMT),
-                             fmtTimeAlt;
-#else // !wxUSE_INTL
-                    wxString fmtTime, fmtTimeAlt;
-#endif // wxUSE_INTL/!wxUSE_INTL
-                    if ( fmtTime.empty() )
-                    {
-                        // try to parse what follows as "%H:%M:%S" and, if this
-                        // fails, as "%I:%M:%S %p" - this should catch the most
-                        // common cases
-                        fmtTime = "%T";
-                        fmtTimeAlt = "%r";
-                    }
-
-                    const wxDateTime
-                        dt = ParseFormatAt(input, end, fmtTime, fmtTimeAlt);
-                    if ( !dt.IsValid() )
-                        return false;
-
-                    haveHour =
-                    haveMin =
-                    haveSec = true;
-
-                    const Tm tm = dt.GetTm();
-                    hour = tm.hour;
-                    min = tm.min;
-                    sec = tm.sec;
-                }
-                break;
-
-            case wxT('y'):       // year without century (00-99)
-                if ( !GetNumericToken(width, input, end, &num) ||
-                        (num > 99) )
-                {
-                    // no match
-                    return false;
-                }
-
-                haveYear = true;
-
-                // TODO should have an option for roll over date instead of
-                //      hard coding it here
-                year = (num > 30 ? 1900 : 2000) + (wxDateTime_t)num;
-                break;
-
-            case wxT('Y'):       // year with century
-                if ( !GetNumericToken(width, input, end, &num) )
-                {
-                    // no match
-                    return false;
-                }
-
-                haveYear = true;
-                year = (wxDateTime_t)num;
-                break;
-
-            case wxT('z'):
-                {
-                    // check that we have something here at all
-                    if ( input == end )
-                        return false;
-
-                    // and then check that it's either plus or minus sign
-                    bool minusFound;
-                    if ( *input == wxT('-') )
-                        minusFound = true;
-                    else if ( *input == wxT('+') )
-                        minusFound = false;
-                    else
-                        return false;   // no match
-
-                    // here should follow 4 digits HHMM
-                    ++input;
-                    unsigned long tzHourMin;
-                    if ( !GetNumericToken(4, input, end, &tzHourMin) )
-                        return false;   // no match
-
-                    const unsigned hours = tzHourMin / 100;
-                    const unsigned minutes = tzHourMin % 100;
-
-                    if ( hours > 12 || minutes > 59 )
-                        return false;   // bad format
-
-                    timeZone = 3600*hours + 60*minutes;
-                    if ( minusFound )
-                        timeZone = -timeZone;
-
-                    haveTimeZone = true;
-                }
-                break;
-
-            case wxT('Z'):       // timezone name
-                // FIXME: currently we just ignore everything that looks like a
-                //        time zone here
-                GetAlphaToken(input, end);
-                break;
-
-            case wxT('%'):       // a percent sign
-                if ( input == end || *input++ != wxT('%') )
-                {
-                    // no match
-                    return false;
-                }
-                break;
-
-            case 0:             // the end of string
-                wxFAIL_MSG(wxT("unexpected format end"));
-
-                // fall through
-
-            default:            // not a known format spec
-                return false;
-        }
-    }
-
-    // format matched, try to construct a date from what we have now
-    Tm tmDef;
-    if ( dateDef.IsValid() )
-    {
-        // take this date as default
-        tmDef = dateDef.GetTm();
-    }
-    else if ( IsValid() )
-    {
-        // if this date is valid, don't change it
-        tmDef = GetTm();
-    }
-    else
-    {
-        // no default and this date is invalid - fall back to Today()
-        tmDef = Today().GetTm();
-    }
-
-    Tm tm = tmDef;
-
-    // set the date
-    if ( haveMon )
-    {
-        tm.mon = mon;
-    }
-
-    if ( haveYear )
-    {
-        tm.year = year;
-    }
-
-    // TODO we don't check here that the values are consistent, if both year
-    //      day and month/day were found, we just ignore the year day and we
-    //      also always ignore the week day
-    if ( haveDay )
-    {
-        if ( mday > GetNumberOfDays(tm.mon, tm.year) )
-            return false;
-
-        tm.mday = mday;
-    }
-    else if ( haveYDay )
-    {
-        if ( yday > GetNumberOfDays(tm.year) )
-            return false;
-
-        Tm tm2 = wxDateTime(1, Jan, tm.year).SetToYearDay(yday).GetTm();
-
-        tm.mon = tm2.mon;
-        tm.mday = tm2.mday;
-    }
-
-    // deal with AM/PM
-    if ( haveHour && hourIsIn12hFormat && isPM )
-    {
-        // translate to 24hour format
-        hour += 12;
-    }
-    //else: either already in 24h format or no translation needed
-
-    // set the time
-    if ( haveHour )
-    {
-        tm.hour = hour;
-    }
-
-    if ( haveMin )
-    {
-        tm.min = min;
-    }
-
-    if ( haveSec )
-    {
-        tm.sec = sec;
-    }
-
-    if ( haveMsec )
-        tm.msec = msec;
-
-    Set(tm);
-
-    // If a time zone was specified and it is not the local time zone, we need
-    // to shift the time accordingly.
-    //
-    // Note that avoiding the call to MakeFromTimeZone is necessary to avoid
-    // DST problems.
-    if ( haveTimeZone && timeZone != -wxGetTimeZone() )
-        MakeFromTimezone(timeZone);
-
-    // finally check that the week day is consistent -- if we had it
-    if ( haveWDay && GetWeekDay() != wday )
-        return false;
-
-    *endParse = input;
-
-    return true;
-}
-
-const char*
-wxDateTime::ParseFormat(const char* date,
-                        const wxString& format,
-                        const wxDateTime& dateDef)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseFormat(dateStr, format, dateDef, &end) )
-        return NULL;
-
-    return date + dateStr.IterOffsetInMBStr(end);
-}
-
-const wchar_t*
-wxDateTime::ParseFormat(const wchar_t* date,
-                        const wxString& format,
-                        const wxDateTime& dateDef)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseFormat(dateStr, format, dateDef, &end) )
-        return NULL;
-
-    return date + (end - dateStr.begin());
-}
-
-bool
-wxDateTime::ParseDateTime(const wxString& date, wxString::const_iterator *end)
-{
-    wxCHECK_MSG( end, false, "end iterator pointer must be specified" );
-
-    wxDateTime
-        dtDate,
-        dtTime;
-
-    wxString::const_iterator
-        endTime,
-        endDate,
-        endBoth;
-
-    // If we got a date in the beginning, see if there is a time specified
-    // after the date
-    if ( dtDate.ParseDate(date, &endDate) )
-    {
-        // Skip spaces, as the ParseTime() function fails on spaces
-        while ( endDate != date.end() && wxIsspace(*endDate) )
-            ++endDate;
-
-        const wxString timestr(endDate, date.end());
-        if ( !dtTime.ParseTime(timestr, &endTime) )
-            return false;
-
-        endBoth = endDate + (endTime - timestr.begin());
-    }
-    else // no date in the beginning
-    {
-        // check if we have a time followed by a date
-        if ( !dtTime.ParseTime(date, &endTime) )
-            return false;
-
-        while ( endTime != date.end() && wxIsspace(*endTime) )
-            ++endTime;
-
-        const wxString datestr(endTime, date.end());
-        if ( !dtDate.ParseDate(datestr, &endDate) )
-            return false;
-
-        endBoth = endTime + (endDate - datestr.begin());
-    }
-
-    Set(dtDate.GetDay(), dtDate.GetMonth(), dtDate.GetYear(),
-        dtTime.GetHour(), dtTime.GetMinute(), dtTime.GetSecond(),
-        dtTime.GetMillisecond());
-
-    *end = endBoth;
-
-    return true;
-}
-
-const char* wxDateTime::ParseDateTime(const char* date)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseDateTime(dateStr, &end) )
-        return NULL;
-
-    return date + dateStr.IterOffsetInMBStr(end);
-}
-
-const wchar_t* wxDateTime::ParseDateTime(const wchar_t* date)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseDateTime(dateStr, &end) )
-        return NULL;
-
-    return date + (end - dateStr.begin());
-}
-
-bool
-wxDateTime::ParseDate(const wxString& date, wxString::const_iterator *end)
-{
-    wxCHECK_MSG( end, false, "end iterator pointer must be specified" );
-
-    // this is a simplified version of ParseDateTime() which understands only
-    // "today" (for wxDate compatibility) and digits only otherwise (and not
-    // all esoteric constructions ParseDateTime() knows about)
-
-    const wxString::const_iterator pBegin = date.begin();
-    const wxString::const_iterator pEnd = date.end();
-
-    wxString::const_iterator p = pBegin;
-    while ( p != pEnd && wxIsspace(*p) )
-        p++;
-
-    // some special cases
-    static struct
-    {
-        const char *str;
-        int dayDiffFromToday;
-    } literalDates[] =
-    {
-        { wxTRANSLATE("today"),             0 },
-        { wxTRANSLATE("yesterday"),        -1 },
-        { wxTRANSLATE("tomorrow"),          1 },
-    };
-
-    const size_t lenRest = pEnd - p;
-    for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ )
-    {
-        const wxString dateStr = wxGetTranslation(literalDates[n].str);
-        size_t len = dateStr.length();
-
-        if ( len > lenRest )
-            continue;
-
-        const wxString::const_iterator pEnd = p + len;
-        if ( wxString(p, pEnd).CmpNoCase(dateStr) == 0 )
-        {
-            // nothing can follow this, so stop here
-
-            p = pEnd;
-
-            int dayDiffFromToday = literalDates[n].dayDiffFromToday;
-            *this = Today();
-            if ( dayDiffFromToday )
-            {
-                *this += wxDateSpan::Days(dayDiffFromToday);
-            }
-
-            *end = pEnd;
-
-            return true;
-        }
-    }
-
-    // We try to guess what we have here: for each new (numeric) token, we
-    // determine if it can be a month, day or a year. Of course, there is an
-    // ambiguity as some numbers may be days as well as months, so we also
-    // have the ability to back track.
-
-    // what do we have?
-    bool haveDay = false,       // the months day?
-         haveWDay = false,      // the day of week?
-         haveMon = false,       // the month?
-         haveYear = false;      // the year?
-
-    bool monWasNumeric = false; // was month specified as a number?
-
-    // and the value of the items we have (init them to get rid of warnings)
-    WeekDay wday = Inv_WeekDay;
-    wxDateTime_t day = 0;
-    wxDateTime::Month mon = Inv_Month;
-    int year = 0;
-
-    // tokenize the string
-    while ( p != pEnd )
-    {
-        // skip white space and date delimiters
-        if ( wxStrchr(".,/-\t\r\n ", *p) )
-        {
-            ++p;
-            continue;
-        }
-
-        // modify copy of the iterator as we're not sure if the next token is
-        // still part of the date at all
-        wxString::const_iterator pCopy = p;
-
-        // we can have either alphabetic or numeric token, start by testing if
-        // it's the latter
-        unsigned long val;
-        if ( GetNumericToken(10 /* max length */, pCopy, pEnd, &val) )
-        {
-            // guess what this number is
-
-            bool isDay = false,
-                 isMonth = false,
-                 isYear = false;
-
-            if ( !haveMon && val > 0 && val <= 12 )
-            {
-                // assume it is month
-                isMonth = true;
-            }
-            else // not the month
-            {
-                if ( haveDay )
-                {
-                    // this can only be the year
-                    isYear = true;
-                }
-                else // may be either day or year
-                {
-                    // use a leap year if we don't have the year yet to allow
-                    // dates like 2/29/1976 which would be rejected otherwise
-                    wxDateTime_t max_days = (wxDateTime_t)(
-                        haveMon
-                        ? GetNumberOfDays(mon, haveYear ? year : 1976)
-                        : 31
-                    );
-
-                    // can it be day?
-                    if ( (val == 0) || (val > (unsigned long)max_days) )
-                    {
-                        // no
-                        isYear = true;
-                    }
-                    else // yes, suppose it's the day
-                    {
-                        isDay = true;
-                    }
-                }
-            }
-
-            if ( isYear )
-            {
-                if ( haveYear )
-                    break;
-
-                haveYear = true;
-
-                year = (wxDateTime_t)val;
-            }
-            else if ( isDay )
-            {
-                if ( haveDay )
-                    break;
-
-                haveDay = true;
-
-                day = (wxDateTime_t)val;
-            }
-            else if ( isMonth )
-            {
-                haveMon = true;
-                monWasNumeric = true;
-
-                mon = (Month)(val - 1);
-            }
-        }
-        else // not a number
-        {
-            // be careful not to overwrite the current mon value
-            Month mon2 = GetMonthFromName
-                         (
-                            pCopy, pEnd,
-                            Name_Full | Name_Abbr,
-                            DateLang_Local | DateLang_English
-                         );
-            if ( mon2 != Inv_Month )
-            {
-                // it's a month
-                if ( haveMon )
-                {
-                    // but we already have a month - maybe we guessed wrong
-                    // when we had interpreted that numeric value as a month
-                    // and it was the day number instead?
-                    if ( haveDay || !monWasNumeric )
-                        break;
-
-                    // assume we did and change our mind: reinterpret the month
-                    // value as a day (notice that there is no need to check
-                    // that it is valid as month values are always < 12, but
-                    // the days are counted from 1 unlike the months)
-                    day = (wxDateTime_t)(mon + 1);
-                    haveDay = true;
-                }
-
-                mon = mon2;
-
-                haveMon = true;
-            }
-            else // not a valid month name
-            {
-                WeekDay wday2 = GetWeekDayFromName
-                                (
-                                    pCopy, pEnd,
-                                    Name_Full | Name_Abbr,
-                                    DateLang_Local | DateLang_English
-                                );
-                if ( wday2 != Inv_WeekDay )
-                {
-                    // a week day
-                    if ( haveWDay )
-                        break;
-
-                    wday = wday2;
-
-                    haveWDay = true;
-                }
-                else // not a valid weekday name
-                {
-                    // try the ordinals
-                    static const char *const ordinals[] =
-                    {
-                        wxTRANSLATE("first"),
-                        wxTRANSLATE("second"),
-                        wxTRANSLATE("third"),
-                        wxTRANSLATE("fourth"),
-                        wxTRANSLATE("fifth"),
-                        wxTRANSLATE("sixth"),
-                        wxTRANSLATE("seventh"),
-                        wxTRANSLATE("eighth"),
-                        wxTRANSLATE("ninth"),
-                        wxTRANSLATE("tenth"),
-                        wxTRANSLATE("eleventh"),
-                        wxTRANSLATE("twelfth"),
-                        wxTRANSLATE("thirteenth"),
-                        wxTRANSLATE("fourteenth"),
-                        wxTRANSLATE("fifteenth"),
-                        wxTRANSLATE("sixteenth"),
-                        wxTRANSLATE("seventeenth"),
-                        wxTRANSLATE("eighteenth"),
-                        wxTRANSLATE("nineteenth"),
-                        wxTRANSLATE("twentieth"),
-                        // that's enough - otherwise we'd have problems with
-                        // composite (or not) ordinals
-                    };
-
-                    size_t n;
-                    for ( n = 0; n < WXSIZEOF(ordinals); n++ )
-                    {
-                        const wxString ord = wxGetTranslation(ordinals[n]);
-                        const size_t len = ord.length();
-                        if ( date.compare(p - pBegin, len, ord) == 0 )
-                        {
-                            p += len;
-                            break;
-                        }
-                    }
-
-                    if ( n == WXSIZEOF(ordinals) )
-                    {
-                        // stop here - something unknown
-                        break;
-                    }
-
-                    // it's a day
-                    if ( haveDay )
-                    {
-                        // don't try anything here (as in case of numeric day
-                        // above) - the symbolic day spec should always
-                        // precede the month/year
-                        break;
-                    }
-
-                    haveDay = true;
-
-                    day = (wxDateTime_t)(n + 1);
-                }
-            }
-        }
-
-        // advance iterator past a successfully parsed token
-        p = pCopy;
-    }
-
-    // either no more tokens or the scan was stopped by something we couldn't
-    // parse - in any case, see if we can construct a date from what we have
-    if ( !haveDay && !haveWDay )
-        return false;
-
-    if ( haveWDay && (haveMon || haveYear || haveDay) &&
-         !(haveDay && haveMon && haveYear) )
-    {
-        // without adjectives (which we don't support here) the week day only
-        // makes sense completely separately or with the full date
-        // specification (what would "Wed 1999" mean?)
-        return false;
-    }
-
-    if ( !haveWDay && haveYear && !(haveDay && haveMon) )
-    {
-        // may be we have month and day instead of day and year?
-        if ( haveDay && !haveMon )
-        {
-            if ( day <= 12  )
-            {
-                // exchange day and month
-                mon = (wxDateTime::Month)(day - 1);
-
-                // we're in the current year then
-                if ( (year > 0) && (year <= (int)GetNumberOfDays(mon, Inv_Year)) )
-                {
-                    day = (wxDateTime_t)year;
-
-                    haveMon = true;
-                    haveYear = false;
-                }
-                //else: no, can't exchange, leave haveMon == false
-            }
-        }
-
-        if ( !haveMon )
-            return false;
-    }
-
-    if ( !haveMon )
-    {
-        mon = GetCurrentMonth();
-    }
-
-    if ( !haveYear )
-    {
-        year = GetCurrentYear();
-    }
-
-    if ( haveDay )
-    {
-        // normally we check the day above but the check is optimistic in case
-        // we find the day before its month/year so we have to redo it now
-        if ( day > GetNumberOfDays(mon, year) )
-            return false;
-
-        Set(day, mon, year);
-
-        if ( haveWDay )
-        {
-            // check that it is really the same
-            if ( GetWeekDay() != wday )
-                return false;
-        }
-    }
-    else // haveWDay
-    {
-        *this = Today();
-
-        SetToWeekDayInSameWeek(wday);
-    }
-
-    *end = p;
-
-    return true;
-}
-
-const char* wxDateTime::ParseDate(const char* date)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseDate(dateStr, &end) )
-        return NULL;
-
-    return date + dateStr.IterOffsetInMBStr(end);
-}
-
-const wchar_t* wxDateTime::ParseDate(const wchar_t* date)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseDate(dateStr, &end) )
-        return NULL;
-
-    return date + (end - dateStr.begin());
-}
-
-bool
-wxDateTime::ParseTime(const wxString& time, wxString::const_iterator *end)
-{
-    wxCHECK_MSG( end, false, "end iterator pointer must be specified" );
-
-    // first try some extra things
-    static const struct
-    {
-        const char *name;
-        wxDateTime_t hour;
-    } stdTimes[] =
-    {
-        { wxTRANSLATE("noon"),      12 },
-        { wxTRANSLATE("midnight"),  00 },
-        // anything else?
-    };
-
-    for ( size_t n = 0; n < WXSIZEOF(stdTimes); n++ )
-    {
-        const wxString timeString = wxGetTranslation(stdTimes[n].name);
-        if ( timeString.CmpNoCase(wxString(time, timeString.length())) == 0 )
-        {
-            // casts required by DigitalMars
-            Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0));
-
-            if ( end )
-                *end = time.begin() + timeString.length();
-
-            return true;
-        }
-    }
-
-    // try all time formats we may think about in the order from longest to
-    // shortest
-    static const char *const timeFormats[] =
-    {
-        "%I:%M:%S %p",  // 12hour with AM/PM
-        "%H:%M:%S",     // could be the same or 24 hour one so try it too
-        "%I:%M %p",     // 12hour with AM/PM but without seconds
-        "%H:%M",        // and a possibly 24 hour version without seconds
-        "%X",           // possibly something from above or maybe something
-                        // completely different -- try it last
-
-        // TODO: parse timezones
-    };
-
-    for ( size_t nFmt = 0; nFmt < WXSIZEOF(timeFormats); nFmt++ )
-    {
-        if ( ParseFormat(time, timeFormats[nFmt], end) )
-            return true;
-    }
-
-    return false;
-}
-
-const char* wxDateTime::ParseTime(const char* date)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseTime(dateStr, &end) )
-        return NULL;
-
-    return date + dateStr.IterOffsetInMBStr(end);
-}
-
-const wchar_t* wxDateTime::ParseTime(const wchar_t* date)
-{
-    wxString::const_iterator end;
-    wxString dateStr(date);
-    if ( !ParseTime(dateStr, &end) )
-        return NULL;
-
-    return date + (end - dateStr.begin());
-}
-
-// ----------------------------------------------------------------------------
-// Workdays and holidays support
-// ----------------------------------------------------------------------------
-
-bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const
-{
-    return !wxDateTimeHolidayAuthority::IsHoliday(*this);
-}
-
-// ============================================================================
-// wxDateSpan
-// ============================================================================
-
-wxDateSpan WXDLLIMPEXP_BASE operator*(int n, const wxDateSpan& ds)
-{
-    wxDateSpan ds1(ds);
-    return ds1.Multiply(n);
-}
-
-// ============================================================================
-// wxTimeSpan
-// ============================================================================
-
-wxTimeSpan WXDLLIMPEXP_BASE operator*(int n, const wxTimeSpan& ts)
-{
-    return wxTimeSpan(ts).Multiply(n);
-}
-
-// this enum is only used in wxTimeSpan::Format() below but we can't declare
-// it locally to the method as it provokes an internal compiler error in egcs
-// 2.91.60 when building with -O2
-enum TimeSpanPart
-{
-    Part_Week,
-    Part_Day,
-    Part_Hour,
-    Part_Min,
-    Part_Sec,
-    Part_MSec
-};
-
-// not all strftime(3) format specifiers make sense here because, for example,
-// a time span doesn't have a year nor a timezone
-//
-// Here are the ones which are supported (all of them are supported by strftime
-// as well):
-//  %H          hour in 24 hour format
-//  %M          minute (00 - 59)
-//  %S          second (00 - 59)
-//  %%          percent sign
-//
-// Also, for MFC CTimeSpan compatibility, we support
-//  %D          number of days
-//
-// And, to be better than MFC :-), we also have
-//  %E          number of wEeks
-//  %l          milliseconds (000 - 999)
-wxString wxTimeSpan::Format(const wxString& format) const
-{
-    // we deal with only positive time spans here and just add the sign in
-    // front for the negative ones
-    if ( IsNegative() )
-    {
-        wxString str(Negate().Format(format));
-        return "-" + str;
-    }
-
-    wxCHECK_MSG( !format.empty(), wxEmptyString,
-                 wxT("NULL format in wxTimeSpan::Format") );
-
-    wxString str;
-    str.Alloc(format.length());
-
-    // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */)
-    //
-    // Then, of course, ts.Format("%H:%M:%S") must return "01:02:03", but the
-    // question is what should ts.Format("%S") do? The code here returns "3273"
-    // in this case (i.e. the total number of seconds, not just seconds % 60)
-    // because, for me, this call means "give me entire time interval in
-    // seconds" and not "give me the seconds part of the time interval"
-    //
-    // If we agree that it should behave like this, it is clear that the
-    // interpretation of each format specifier depends on the presence of the
-    // other format specs in the string: if there was "%H" before "%M", we
-    // should use GetMinutes() % 60, otherwise just GetMinutes() &c
-
-    // we remember the most important unit found so far
-    TimeSpanPart partBiggest = Part_MSec;
-
-    for ( wxString::const_iterator pch = format.begin(); pch != format.end(); ++pch )
-    {
-        wxChar ch = *pch;
-
-        if ( ch == wxT('%') )
-        {
-            // the start of the format specification of the printf() below
-            wxString fmtPrefix(wxT('%'));
-
-            // the number
-            long n;
-
-            // the number of digits for the format string, 0 if unused
-            unsigned digits = 0;
-
-            ch = *++pch;    // get the format spec char
-            switch ( ch )
-            {
-                default:
-                    wxFAIL_MSG( wxT("invalid format character") );
-                    // fall through
-
-                case wxT('%'):
-                    str += ch;
-
-                    // skip the part below switch
-                    continue;
-
-                case wxT('D'):
-                    n = GetDays();
-                    if ( partBiggest < Part_Day )
-                    {
-                        n %= DAYS_PER_WEEK;
-                    }
-                    else
-                    {
-                        partBiggest = Part_Day;
-                    }
-                    break;
-
-                case wxT('E'):
-                    partBiggest = Part_Week;
-                    n = GetWeeks();
-                    break;
-
-                case wxT('H'):
-                    n = GetHours();
-                    if ( partBiggest < Part_Hour )
-                    {
-                        n %= HOURS_PER_DAY;
-                    }
-                    else
-                    {
-                        partBiggest = Part_Hour;
-                    }
-
-                    digits = 2;
-                    break;
-
-                case wxT('l'):
-                    n = GetMilliseconds().ToLong();
-                    if ( partBiggest < Part_MSec )
-                    {
-                        n %= 1000;
-                    }
-                    //else: no need to reset partBiggest to Part_MSec, it is
-                    //      the least significant one anyhow
-
-                    digits = 3;
-                    break;
-
-                case wxT('M'):
-                    n = GetMinutes();
-                    if ( partBiggest < Part_Min )
-                    {
-                        n %= MIN_PER_HOUR;
-                    }
-                    else
-                    {
-                        partBiggest = Part_Min;
-                    }
-
-                    digits = 2;
-                    break;
-
-                case wxT('S'):
-                    n = GetSeconds().ToLong();
-                    if ( partBiggest < Part_Sec )
-                    {
-                        n %= SEC_PER_MIN;
-                    }
-                    else
-                    {
-                        partBiggest = Part_Sec;
-                    }
-
-                    digits = 2;
-                    break;
-            }
-
-            if ( digits )
-            {
-                fmtPrefix << wxT("0") << digits;
-            }
-
-            str += wxString::Format(fmtPrefix + wxT("ld"), n);
-        }
-        else
-        {
-            // normal character, just copy
-            str += ch;
-        }
-    }
-
-    return str;
-}
-
-#endif // wxUSE_DATETIME
diff --git a/Source/3rd Party/wx/src/common/datstrm.cpp b/Source/3rd Party/wx/src/common/datstrm.cpp
index 806028f59..fd16e9223 100644
--- a/Source/3rd Party/wx/src/common/datstrm.cpp	
+++ b/Source/3rd Party/wx/src/common/datstrm.cpp	
@@ -1,759 +1,745 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/datstrm.cpp
-// Purpose:     Data stream classes
-// Author:      Guilhem Lavaux
-// Modified by: Mickael Gilabert
-// Created:     28/06/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS
-
-#include "wx/datstrm.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/math.h"
-#endif //WX_PRECOMP
-
-// ---------------------------------------------------------------------------
-// wxDataInputStream
-// ---------------------------------------------------------------------------
-
-#if wxUSE_UNICODE
-wxDataInputStream::wxDataInputStream(wxInputStream& s, const wxMBConv& conv)
-  : m_input(&s), m_be_order(false), m_conv(conv.Clone())
-#else
-wxDataInputStream::wxDataInputStream(wxInputStream& s)
-  : m_input(&s), m_be_order(false)
-#endif
-{
-}
-
-wxDataInputStream::~wxDataInputStream()
-{
-#if wxUSE_UNICODE
-    delete m_conv;
-#endif // wxUSE_UNICODE
-}
-
-#if wxUSE_UNICODE
-void wxDataInputStream::SetConv( const wxMBConv &conv )
-{
-    delete m_conv;
-    m_conv = conv.Clone();
-}
-#endif
-
-#if wxHAS_INT64
-wxUint64 wxDataInputStream::Read64()
-{
-  wxUint64 tmp;
-  Read64(&tmp, 1);
-  return tmp;
-}
-#endif // wxHAS_INT64
-
-wxUint32 wxDataInputStream::Read32()
-{
-  wxUint32 i32;
-
-  m_input->Read(&i32, 4);
-
-  if (m_be_order)
-    return wxUINT32_SWAP_ON_LE(i32);
-  else
-    return wxUINT32_SWAP_ON_BE(i32);
-}
-
-wxUint16 wxDataInputStream::Read16()
-{
-  wxUint16 i16;
-
-  m_input->Read(&i16, 2);
-
-  if (m_be_order)
-    return wxUINT16_SWAP_ON_LE(i16);
-  else
-    return wxUINT16_SWAP_ON_BE(i16);
-}
-
-wxUint8 wxDataInputStream::Read8()
-{
-  wxUint8 buf;
-
-  m_input->Read(&buf, 1);
-  return (wxUint8)buf;
-}
-
-double wxDataInputStream::ReadDouble()
-{
-#if wxUSE_APPLE_IEEE
-  char buf[10];
-
-  m_input->Read(buf, 10);
-  return wxConvertFromIeeeExtended((const wxInt8 *)buf);
-#else
-  return 0.0;
-#endif
-}
-
-wxString wxDataInputStream::ReadString()
-{
-    wxString ret;
-
-    const size_t len = Read32();
-    if ( len > 0 )
-    {
-#if wxUSE_UNICODE
-        wxCharBuffer tmp(len + 1);
-        if ( tmp )
-        {
-            m_input->Read(tmp.data(), len);
-            tmp.data()[len] = '\0';
-            ret = m_conv->cMB2WX(tmp.data());
-        }
-#else
-        wxStringBuffer buf(ret, len);
-        if ( buf )
-            m_input->Read(buf, len);
-#endif
-    }
-
-    return ret;
-}
-
-#if wxUSE_LONGLONG
-
-template <class T>
-static
-void DoReadLL(T *buffer, size_t size, wxInputStream *input, bool be_order)
-{
-    typedef T DataType;
-    unsigned char *pchBuffer = new unsigned char[size * 8];
-    // TODO: Check for overflow when size is of type uint and is > than 512m
-    input->Read(pchBuffer, size * 8);
-    size_t idx_base = 0;
-    if ( be_order )
-    {
-        for ( size_t uiIndex = 0; uiIndex != size; ++uiIndex )
-        {
-            buffer[uiIndex] = 0l;
-            for ( unsigned ui = 0; ui != 8; ++ui )
-            {
-                buffer[uiIndex] = buffer[uiIndex] * 256l +
-                            DataType((unsigned long) pchBuffer[idx_base + ui]);
-            }
-
-            idx_base += 8;
-        }
-    }
-    else // little endian
-    {
-        for ( size_t uiIndex=0; uiIndex!=size; ++uiIndex )
-        {
-            buffer[uiIndex] = 0l;
-            for ( unsigned ui=0; ui!=8; ++ui )
-                buffer[uiIndex] = buffer[uiIndex] * 256l +
-                    DataType((unsigned long) pchBuffer[idx_base + 7 - ui]);
-            idx_base += 8;
-        }
-    }
-    delete[] pchBuffer;
-}
-
-template <class T>
-static void DoWriteLL(const T *buffer, size_t size, wxOutputStream *output, bool be_order)
-{
-    typedef T DataType;
-    unsigned char *pchBuffer = new unsigned char[size * 8];
-    size_t idx_base = 0;
-    if ( be_order )
-    {
-        for ( size_t uiIndex = 0; uiIndex != size; ++uiIndex )
-        {
-            DataType i64 = buffer[uiIndex];
-            for ( unsigned ui = 0; ui != 8; ++ui )
-            {
-                pchBuffer[idx_base + 7 - ui] =
-                    (unsigned char) (i64.GetLo() & 255l);
-                i64 >>= 8l;
-            }
-
-            idx_base += 8;
-        }
-    }
-    else // little endian
-    {
-        for ( size_t uiIndex=0; uiIndex != size; ++uiIndex )
-        {
-            DataType i64 = buffer[uiIndex];
-            for (unsigned ui=0; ui!=8; ++ui)
-            {
-                pchBuffer[idx_base + ui] =
-                    (unsigned char) (i64.GetLo() & 255l);
-                i64 >>= 8l;
-            }
-
-            idx_base += 8;
-        }
-    }
-
-    // TODO: Check for overflow when size is of type uint and is > than 512m
-    output->Write(pchBuffer, size * 8);
-    delete[] pchBuffer;
-}
-
-#endif // wxUSE_LONGLONG
-
-#ifdef wxLongLong_t
-
-template <class T>
-static
-void DoReadI64(T *buffer, size_t size, wxInputStream *input, bool be_order)
-{
-    typedef T DataType;
-    unsigned char *pchBuffer = (unsigned char*) buffer;
-    // TODO: Check for overflow when size is of type uint and is > than 512m
-    input->Read(pchBuffer, size * 8);
-    if ( be_order )
-    {
-        for ( wxUint32 i = 0; i < size; i++ )
-        {
-            DataType v = wxUINT64_SWAP_ON_LE(*buffer);
-            *(buffer++) = v;
-        }
-    }
-    else // little endian
-    {
-        for ( wxUint32 i=0; i<size; i++ )
-        {
-            DataType v = wxUINT64_SWAP_ON_BE(*buffer);
-            *(buffer++) = v;
-        }
-    }
-}
-
-template <class T>
-static
-void DoWriteI64(const T *buffer, size_t size, wxOutputStream *output, bool be_order)
-{
-  typedef T DataType;
-  if ( be_order )
-  {
-    for ( size_t i = 0; i < size; i++ )
-    {
-      DataType i64 = wxUINT64_SWAP_ON_LE(*buffer);
-      buffer++;
-      output->Write(&i64, 8);
-    }
-  }
-  else // little endian
-  {
-    for ( size_t i=0; i < size; i++ )
-    {
-      DataType i64 = wxUINT64_SWAP_ON_BE(*buffer);
-      buffer++;
-      output->Write(&i64, 8);
-    }
-  }
-}
-
-#endif // wxLongLong_t
-
-
-#if wxHAS_INT64
-void wxDataInputStream::Read64(wxUint64 *buffer, size_t size)
-{
-#ifndef wxLongLong_t
-    DoReadLL(buffer, size, m_input, m_be_order);
-#else
-    DoReadI64(buffer, size, m_input, m_be_order);
-#endif
-}
-
-void wxDataInputStream::Read64(wxInt64 *buffer, size_t size)
-{
-#ifndef wxLongLong_t
-    DoReadLL(buffer, size, m_input, m_be_order);
-#else
-    DoReadI64(buffer, size, m_input, m_be_order);
-#endif
-}
-#endif // wxHAS_INT64
-
-#if defined(wxLongLong_t) && wxUSE_LONGLONG
-void wxDataInputStream::Read64(wxULongLong *buffer, size_t size)
-{
-    DoReadLL(buffer, size, m_input, m_be_order);
-}
-
-void wxDataInputStream::Read64(wxLongLong *buffer, size_t size)
-{
-    DoReadLL(buffer, size, m_input, m_be_order);
-}
-#endif // wxLongLong_t
-
-#if wxUSE_LONGLONG
-void wxDataInputStream::ReadLL(wxULongLong *buffer, size_t size)
-{
-    DoReadLL(buffer, size, m_input, m_be_order);
-}
-
-void wxDataInputStream::ReadLL(wxLongLong *buffer, size_t size)
-{
-    DoReadLL(buffer, size, m_input, m_be_order);
-}
-
-wxLongLong wxDataInputStream::ReadLL(void)
-{
-    wxLongLong ll;
-    DoReadLL(&ll, (size_t)1, m_input, m_be_order);
-    return ll;
-}
-#endif // wxUSE_LONGLONG
-
-void wxDataInputStream::Read32(wxUint32 *buffer, size_t size)
-{
-    m_input->Read(buffer, size * 4);
-
-    if (m_be_order)
-    {
-        for (wxUint32 i=0; i<size; i++)
-        {
-            wxUint32 v = wxUINT32_SWAP_ON_LE(*buffer);
-            *(buffer++) = v;
-        }
-    }
-    else
-    {
-        for (wxUint32 i=0; i<size; i++)
-        {
-            wxUint32 v = wxUINT32_SWAP_ON_BE(*buffer);
-            *(buffer++) = v;
-        }
-    }
-}
-
-void wxDataInputStream::Read16(wxUint16 *buffer, size_t size)
-{
-  m_input->Read(buffer, size * 2);
-
-  if (m_be_order)
-  {
-    for (wxUint32 i=0; i<size; i++)
-    {
-      wxUint16 v = wxUINT16_SWAP_ON_LE(*buffer);
-      *(buffer++) = v;
-    }
-  }
-  else
-  {
-    for (wxUint32 i=0; i<size; i++)
-    {
-      wxUint16 v = wxUINT16_SWAP_ON_BE(*buffer);
-      *(buffer++) = v;
-    }
-  }
-}
-
-void wxDataInputStream::Read8(wxUint8 *buffer, size_t size)
-{
-  m_input->Read(buffer, size);
-}
-
-void wxDataInputStream::ReadDouble(double *buffer, size_t size)
-{
-  for (wxUint32 i=0; i<size; i++)
-  {
-    *(buffer++) = ReadDouble();
-  }
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
-{
-  s = ReadString();
-  return *this;
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c)
-{
-  c = (wxInt8)Read8();
-  return *this;
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(wxInt16& i)
-{
-  i = (wxInt16)Read16();
-  return *this;
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(wxInt32& i)
-{
-  i = (wxInt32)Read32();
-  return *this;
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(wxUint8& c)
-{
-  c = Read8();
-  return *this;
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i)
-{
-  i = Read16();
-  return *this;
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
-{
-  i = Read32();
-  return *this;
-}
-
-#if wxHAS_INT64
-wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)
-{
-  i = Read64();
-  return *this;
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(wxInt64& i)
-{
-  i = Read64();
-  return *this;
-}
-#endif // wxHAS_INT64
-
-#if defined(wxLongLong_t) && wxUSE_LONGLONG
-wxDataInputStream& wxDataInputStream::operator>>(wxULongLong& i)
-{
-  i = ReadLL();
-  return *this;
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(wxLongLong& i)
-{
-  i = ReadLL();
-  return *this;
-}
-#endif // wxLongLong_t
-
-wxDataInputStream& wxDataInputStream::operator>>(double& i)
-{
-  i = ReadDouble();
-  return *this;
-}
-
-wxDataInputStream& wxDataInputStream::operator>>(float& f)
-{
-  f = (float)ReadDouble();
-  return *this;
-}
-
-// ---------------------------------------------------------------------------
-// wxDataOutputStream
-// ---------------------------------------------------------------------------
-
-#if wxUSE_UNICODE
-wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv)
-  : m_output(&s), m_be_order(false), m_conv(conv.Clone())
-#else
-wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
-  : m_output(&s), m_be_order(false)
-#endif
-{
-}
-
-wxDataOutputStream::~wxDataOutputStream()
-{
-#if wxUSE_UNICODE
-    delete m_conv;
-#endif // wxUSE_UNICODE
-}
-
-#if wxUSE_UNICODE
-void wxDataOutputStream::SetConv( const wxMBConv &conv )
-{
-    delete m_conv;
-    m_conv = conv.Clone();
-}
-#endif
-
-#if wxHAS_INT64
-void wxDataOutputStream::Write64(wxUint64 i)
-{
-  Write64(&i, 1);
-}
-
-void wxDataOutputStream::Write64(wxInt64 i)
-{
-  Write64(&i, 1);
-}
-#endif // wxHAS_INT64
-
-void wxDataOutputStream::Write32(wxUint32 i)
-{
-  wxUint32 i32;
-
-  if (m_be_order)
-    i32 = wxUINT32_SWAP_ON_LE(i);
-  else
-    i32 = wxUINT32_SWAP_ON_BE(i);
-  m_output->Write(&i32, 4);
-}
-
-void wxDataOutputStream::Write16(wxUint16 i)
-{
-  wxUint16 i16;
-
-  if (m_be_order)
-    i16 = wxUINT16_SWAP_ON_LE(i);
-  else
-    i16 = wxUINT16_SWAP_ON_BE(i);
-
-  m_output->Write(&i16, 2);
-}
-
-void wxDataOutputStream::Write8(wxUint8 i)
-{
-  m_output->Write(&i, 1);
-}
-
-void wxDataOutputStream::WriteString(const wxString& string)
-{
-#if wxUSE_UNICODE
-  const wxWX2MBbuf buf = string.mb_str(*m_conv);
-#else
-  const wxWX2MBbuf buf = string.mb_str();
-#endif
-  size_t len = strlen(buf);
-  Write32(len);
-  if (len > 0)
-      m_output->Write(buf, len);
-}
-
-void wxDataOutputStream::WriteDouble(double d)
-{
-  char buf[10];
-
-#if wxUSE_APPLE_IEEE
-  wxConvertToIeeeExtended(d, (wxInt8 *)buf);
-#else
-  wxUnusedVar(d);
-#if !defined(__VMS__) && !defined(__GNUG__)
-#ifdef _MSC_VER
-# pragma message("wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!")
-#else
-# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
-#endif
-#endif
-   buf[0] = '\0';
-#endif
-  m_output->Write(buf, 10);
-}
-
-#if wxHAS_INT64
-void wxDataOutputStream::Write64(const wxUint64 *buffer, size_t size)
-{
-#ifndef wxLongLong_t
-    DoWriteLL(buffer, size, m_output, m_be_order);
-#else
-    DoWriteI64(buffer, size, m_output, m_be_order);
-#endif
-}
-
-void wxDataOutputStream::Write64(const wxInt64 *buffer, size_t size)
-{
-#ifndef wxLongLong_t
-    DoWriteLL(buffer, size, m_output, m_be_order);
-#else
-    DoWriteI64(buffer, size, m_output, m_be_order);
-#endif
-}
-#endif // wxHAS_INT64
-
-#if defined(wxLongLong_t) && wxUSE_LONGLONG
-void wxDataOutputStream::Write64(const wxULongLong *buffer, size_t size)
-{
-    DoWriteLL(buffer, size, m_output, m_be_order);
-}
-
-void wxDataOutputStream::Write64(const wxLongLong *buffer, size_t size)
-{
-    DoWriteLL(buffer, size, m_output, m_be_order);
-}
-#endif // wxLongLong_t
-
-#if wxUSE_LONGLONG
-void wxDataOutputStream::WriteLL(const wxULongLong *buffer, size_t size)
-{
-    DoWriteLL(buffer, size, m_output, m_be_order);
-}
-
-void wxDataOutputStream::WriteLL(const wxLongLong *buffer, size_t size)
-{
-    DoWriteLL(buffer, size, m_output, m_be_order);
-}
-
-void wxDataOutputStream::WriteLL(const wxLongLong &ll)
-{
-    WriteLL(&ll, 1);
-}
-
-void wxDataOutputStream::WriteLL(const wxULongLong &ll)
-{
-    WriteLL(&ll, 1);
-}
-#endif // wxUSE_LONGLONG
-
-void wxDataOutputStream::Write32(const wxUint32 *buffer, size_t size)
-{
-  if (m_be_order)
-  {
-    for (wxUint32 i=0; i<size ;i++)
-    {
-      wxUint32 i32 = wxUINT32_SWAP_ON_LE(*buffer);
-      buffer++;
-      m_output->Write(&i32, 4);
-    }
-  }
-  else
-  {
-    for (wxUint32 i=0; i<size ;i++)
-    {
-      wxUint32 i32 = wxUINT32_SWAP_ON_BE(*buffer);
-      buffer++;
-      m_output->Write(&i32, 4);
-    }
-  }
-}
-
-void wxDataOutputStream::Write16(const wxUint16 *buffer, size_t size)
-{
-  if (m_be_order)
-  {
-    for (wxUint32 i=0; i<size ;i++)
-    {
-      wxUint16 i16 = wxUINT16_SWAP_ON_LE(*buffer);
-      buffer++;
-      m_output->Write(&i16, 2);
-    }
-  }
-  else
-  {
-    for (wxUint32 i=0; i<size ;i++)
-    {
-      wxUint16 i16 = wxUINT16_SWAP_ON_BE(*buffer);
-      buffer++;
-      m_output->Write(&i16, 2);
-    }
-  }
-}
-
-void wxDataOutputStream::Write8(const wxUint8 *buffer, size_t size)
-{
-  m_output->Write(buffer, size);
-}
-
-void wxDataOutputStream::WriteDouble(const double *buffer, size_t size)
-{
-  for (wxUint32 i=0; i<size; i++)
-  {
-    WriteDouble(*(buffer++));
-  }
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
-{
-  WriteString(string);
-  return *this;
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(wxInt8 c)
-{
-  Write8((wxUint8)c);
-  return *this;
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(wxInt16 i)
-{
-  Write16((wxUint16)i);
-  return *this;
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(wxInt32 i)
-{
-  Write32((wxUint32)i);
-  return *this;
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(wxUint8 c)
-{
-  Write8(c);
-  return *this;
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(wxUint16 i)
-{
-  Write16(i);
-  return *this;
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i)
-{
-  Write32(i);
-  return *this;
-}
-
-#if wxHAS_INT64
-wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i)
-{
-  Write64(i);
-  return *this;
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(wxInt64 i)
-{
-  Write64(i);
-  return *this;
-}
-#endif // wxHAS_INT64
-
-#if defined(wxLongLong_t) && wxUSE_LONGLONG
-wxDataOutputStream& wxDataOutputStream::operator<<(const wxULongLong &i)
-{
-  WriteLL(i);
-  return *this;
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(const wxLongLong &i)
-{
-  WriteLL(i);
-  return *this;
-}
-#endif // wxLongLong_t
-
-wxDataOutputStream& wxDataOutputStream::operator<<(double f)
-{
-  WriteDouble(f);
-  return *this;
-}
-
-wxDataOutputStream& wxDataOutputStream::operator<<(float f)
-{
-  WriteDouble((double)f);
-  return *this;
-}
-
-#endif
-  // wxUSE_STREAMS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/datstrm.cpp
+// Purpose:     Data stream classes
+// Author:      Guilhem Lavaux
+// Modified by: Mickael Gilabert
+// Created:     28/06/98
+// RCS-ID:      $Id: datstrm.cpp 53028 2008-04-05 17:28:32Z VZ $
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS
+
+#include "wx/datstrm.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/math.h"
+#endif //WX_PRECOMP
+
+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+wxDataInputStream::wxDataInputStream(wxInputStream& s, const wxMBConv& conv)
+  : m_input(&s), m_be_order(false), m_conv(conv.Clone())
+#else
+wxDataInputStream::wxDataInputStream(wxInputStream& s)
+  : m_input(&s), m_be_order(false)
+#endif
+{
+}
+
+wxDataInputStream::~wxDataInputStream()
+{
+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE
+}
+
+#if wxHAS_INT64
+wxUint64 wxDataInputStream::Read64()
+{
+  wxUint64 tmp;
+  Read64(&tmp, 1);
+  return tmp;
+}
+#endif // wxHAS_INT64
+
+wxUint32 wxDataInputStream::Read32()
+{
+  wxUint32 i32;
+
+  m_input->Read(&i32, 4);
+
+  if (m_be_order)
+    return wxUINT32_SWAP_ON_LE(i32);
+  else
+    return wxUINT32_SWAP_ON_BE(i32);
+}
+
+wxUint16 wxDataInputStream::Read16()
+{
+  wxUint16 i16;
+
+  m_input->Read(&i16, 2);
+
+  if (m_be_order)
+    return wxUINT16_SWAP_ON_LE(i16);
+  else
+    return wxUINT16_SWAP_ON_BE(i16);
+}
+
+wxUint8 wxDataInputStream::Read8()
+{
+  wxUint8 buf;
+
+  m_input->Read(&buf, 1);
+  return (wxUint8)buf;
+}
+
+double wxDataInputStream::ReadDouble()
+{
+#if wxUSE_APPLE_IEEE
+  char buf[10];
+
+  m_input->Read(buf, 10);
+  return ConvertFromIeeeExtended((const wxInt8 *)buf);
+#else
+  return 0.0;
+#endif
+}
+
+wxString wxDataInputStream::ReadString()
+{
+    wxString ret;
+
+    const size_t len = Read32();
+    if ( len > 0 )
+    {
+#if wxUSE_UNICODE
+        wxCharBuffer tmp(len + 1);
+        if ( tmp )
+        {
+            m_input->Read(tmp.data(), len);
+            tmp.data()[len] = '\0';
+            ret = m_conv->cMB2WX(tmp.data());
+        }
+#else
+        wxStringBuffer buf(ret, len);
+        if ( buf )
+            m_input->Read(buf, len);
+#endif
+    }
+
+    return ret;
+}
+
+#if wxUSE_LONGLONG
+
+template <class T>
+static
+void DoReadLL(T *buffer, size_t size, wxInputStream *input, bool be_order)
+{
+    typedef T DataType;
+    unsigned char *pchBuffer = new unsigned char[size * 8];
+    // TODO: Check for overflow when size is of type uint and is > than 512m
+    input->Read(pchBuffer, size * 8);
+    size_t idx_base = 0;
+    if ( be_order )
+    {
+        for ( size_t uiIndex = 0; uiIndex != size; ++uiIndex )
+        {
+            buffer[uiIndex] = 0l;
+            for ( unsigned ui = 0; ui != 8; ++ui )
+            {
+                buffer[uiIndex] = buffer[uiIndex] * 256l +
+                            DataType((unsigned long) pchBuffer[idx_base + ui]);
+            }
+
+            idx_base += 8;
+        }
+    }
+    else // little endian
+    {
+        for ( size_t uiIndex=0; uiIndex!=size; ++uiIndex )
+        {
+            buffer[uiIndex] = 0l;
+            for ( unsigned ui=0; ui!=8; ++ui )
+                buffer[uiIndex] = buffer[uiIndex] * 256l +
+                    DataType((unsigned long) pchBuffer[idx_base + 7 - ui]);
+            idx_base += 8;
+        }
+    }
+    delete[] pchBuffer;
+}
+
+template <class T>
+static void DoWriteLL(const T *buffer, size_t size, wxOutputStream *output, bool be_order)
+{
+    typedef T DataType;
+    unsigned char *pchBuffer = new unsigned char[size * 8];
+    size_t idx_base = 0;
+    if ( be_order )
+    {
+        for ( size_t uiIndex = 0; uiIndex != size; ++uiIndex )
+        {
+            DataType i64 = buffer[uiIndex];
+            for ( unsigned ui = 0; ui != 8; ++ui )
+            {
+                pchBuffer[idx_base + 7 - ui] =
+                    (unsigned char) (i64.GetLo() & 255l);
+                i64 >>= 8l;
+            }
+
+            idx_base += 8;
+        }
+    }
+    else // little endian
+    {
+        for ( size_t uiIndex=0; uiIndex != size; ++uiIndex )
+        {
+            DataType i64 = buffer[uiIndex];
+            for (unsigned ui=0; ui!=8; ++ui)
+            {
+                pchBuffer[idx_base + ui] =
+                    (unsigned char) (i64.GetLo() & 255l);
+                i64 >>= 8l;
+            }
+
+            idx_base += 8;
+        }
+    }
+
+    // TODO: Check for overflow when size is of type uint and is > than 512m
+    output->Write(pchBuffer, size * 8);
+    delete[] pchBuffer;
+}
+
+#endif // wxUSE_LONGLONG
+
+#ifdef wxLongLong_t
+
+template <class T>
+static
+void DoReadI64(T *buffer, size_t size, wxInputStream *input, bool be_order)
+{
+    typedef T DataType;
+    unsigned char *pchBuffer = (unsigned char*) buffer;
+    // TODO: Check for overflow when size is of type uint and is > than 512m
+    input->Read(pchBuffer, size * 8);
+    if ( be_order )
+    {
+        for ( wxUint32 i = 0; i < size; i++ )
+        {
+            DataType v = wxUINT64_SWAP_ON_LE(*buffer);
+            *(buffer++) = v;
+        }
+    }
+    else // little endian
+    {
+        for ( wxUint32 i=0; i<size; i++ )
+        {
+            DataType v = wxUINT64_SWAP_ON_BE(*buffer);
+            *(buffer++) = v;
+        }
+    }
+}
+
+template <class T>
+static
+void DoWriteI64(const T *buffer, size_t size, wxOutputStream *output, bool be_order)
+{
+  typedef T DataType;
+  if ( be_order )
+  {
+    for ( size_t i = 0; i < size; i++ )
+    {
+      DataType i64 = wxUINT64_SWAP_ON_LE(*buffer);
+      buffer++;
+      output->Write(&i64, 8);
+    }
+  }
+  else // little endian
+  {
+    for ( size_t i=0; i < size; i++ )
+    {
+      DataType i64 = wxUINT64_SWAP_ON_BE(*buffer);
+      buffer++;
+      output->Write(&i64, 8);
+    }
+  }
+}
+
+#endif // wxLongLong_t
+
+
+#if wxHAS_INT64
+void wxDataInputStream::Read64(wxUint64 *buffer, size_t size)
+{
+#ifndef wxLongLong_t
+    DoReadLL(buffer, size, m_input, m_be_order);
+#else
+    DoReadI64(buffer, size, m_input, m_be_order);
+#endif
+}
+
+void wxDataInputStream::Read64(wxInt64 *buffer, size_t size)
+{
+#ifndef wxLongLong_t
+    DoReadLL(buffer, size, m_input, m_be_order);
+#else
+    DoReadI64(buffer, size, m_input, m_be_order);
+#endif
+}
+#endif // wxHAS_INT64
+
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+void wxDataInputStream::Read64(wxULongLong *buffer, size_t size)
+{
+    DoReadLL(buffer, size, m_input, m_be_order);
+}
+
+void wxDataInputStream::Read64(wxLongLong *buffer, size_t size)
+{
+    DoReadLL(buffer, size, m_input, m_be_order);
+}
+#endif // wxLongLong_t
+
+#if wxUSE_LONGLONG
+void wxDataInputStream::ReadLL(wxULongLong *buffer, size_t size)
+{
+    DoReadLL(buffer, size, m_input, m_be_order);
+}
+
+void wxDataInputStream::ReadLL(wxLongLong *buffer, size_t size)
+{
+    DoReadLL(buffer, size, m_input, m_be_order);
+}
+
+wxLongLong wxDataInputStream::ReadLL(void)
+{
+    wxLongLong ll;
+    DoReadLL(&ll, (size_t)1, m_input, m_be_order);
+    return ll;
+}
+#endif // wxUSE_LONGLONG
+
+void wxDataInputStream::Read32(wxUint32 *buffer, size_t size)
+{
+    m_input->Read(buffer, size * 4);
+
+    if (m_be_order)
+    {
+        for (wxUint32 i=0; i<size; i++)
+        {
+            wxUint32 v = wxUINT32_SWAP_ON_LE(*buffer);
+            *(buffer++) = v;
+        }
+    }
+    else
+    {
+        for (wxUint32 i=0; i<size; i++)
+        {
+            wxUint32 v = wxUINT32_SWAP_ON_BE(*buffer);
+            *(buffer++) = v;
+        }
+    }
+}
+
+void wxDataInputStream::Read16(wxUint16 *buffer, size_t size)
+{
+  m_input->Read(buffer, size * 2);
+
+  if (m_be_order)
+  {
+    for (wxUint32 i=0; i<size; i++)
+    {
+      wxUint16 v = wxUINT16_SWAP_ON_LE(*buffer);
+      *(buffer++) = v;
+    }
+  }
+  else
+  {
+    for (wxUint32 i=0; i<size; i++)
+    {
+      wxUint16 v = wxUINT16_SWAP_ON_BE(*buffer);
+      *(buffer++) = v;
+    }
+  }
+}
+
+void wxDataInputStream::Read8(wxUint8 *buffer, size_t size)
+{
+  m_input->Read(buffer, size);
+}
+
+void wxDataInputStream::ReadDouble(double *buffer, size_t size)
+{
+  for (wxUint32 i=0; i<size; i++)
+  {
+    *(buffer++) = ReadDouble();
+  }
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
+{
+  s = ReadString();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxInt8& c)
+{
+  c = (wxInt8)Read8();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxInt16& i)
+{
+  i = (wxInt16)Read16();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxInt32& i)
+{
+  i = (wxInt32)Read32();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint8& c)
+{
+  c = Read8();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint16& i)
+{
+  i = Read16();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i)
+{
+  i = Read32();
+  return *this;
+}
+
+#if wxHAS_INT64
+wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i)
+{
+  i = Read64();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxInt64& i)
+{
+  i = Read64();
+  return *this;
+}
+#endif // wxHAS_INT64
+
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+wxDataInputStream& wxDataInputStream::operator>>(wxULongLong& i)
+{
+  i = ReadLL();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(wxLongLong& i)
+{
+  i = ReadLL();
+  return *this;
+}
+#endif // wxLongLong_t
+
+wxDataInputStream& wxDataInputStream::operator>>(double& i)
+{
+  i = ReadDouble();
+  return *this;
+}
+
+wxDataInputStream& wxDataInputStream::operator>>(float& f)
+{
+  f = (float)ReadDouble();
+  return *this;
+}
+
+// ---------------------------------------------------------------------------
+// wxDataOutputStream
+// ---------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv)
+  : m_output(&s), m_be_order(false), m_conv(conv.Clone())
+#else
+wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
+  : m_output(&s), m_be_order(false)
+#endif
+{
+}
+
+wxDataOutputStream::~wxDataOutputStream()
+{
+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE
+}
+
+#if wxHAS_INT64
+void wxDataOutputStream::Write64(wxUint64 i)
+{
+  Write64(&i, 1);
+}
+
+void wxDataOutputStream::Write64(wxInt64 i)
+{
+  Write64(&i, 1);
+}
+#endif // wxHAS_INT64
+
+void wxDataOutputStream::Write32(wxUint32 i)
+{
+  wxUint32 i32;
+
+  if (m_be_order)
+    i32 = wxUINT32_SWAP_ON_LE(i);
+  else
+    i32 = wxUINT32_SWAP_ON_BE(i);
+  m_output->Write(&i32, 4);
+}
+
+void wxDataOutputStream::Write16(wxUint16 i)
+{
+  wxUint16 i16;
+
+  if (m_be_order)
+    i16 = wxUINT16_SWAP_ON_LE(i);
+  else
+    i16 = wxUINT16_SWAP_ON_BE(i);
+
+  m_output->Write(&i16, 2);
+}
+
+void wxDataOutputStream::Write8(wxUint8 i)
+{
+  m_output->Write(&i, 1);
+}
+
+void wxDataOutputStream::WriteString(const wxString& string)
+{
+#if wxUSE_UNICODE
+  const wxWX2MBbuf buf = string.mb_str(*m_conv);
+#else
+  const wxWX2MBbuf buf = string.mb_str();
+#endif
+  size_t len = strlen(buf);
+  Write32(len);
+  if (len > 0)
+      m_output->Write(buf, len);
+}
+
+void wxDataOutputStream::WriteDouble(double d)
+{
+  char buf[10];
+
+#if wxUSE_APPLE_IEEE
+  ConvertToIeeeExtended(d, (wxInt8 *)buf);
+#else
+#if !defined(__VMS__) && !defined(__GNUG__)
+# pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
+#endif
+   buf[0] = '\0';
+#endif
+  m_output->Write(buf, 10);
+}
+
+#if wxHAS_INT64
+void wxDataOutputStream::Write64(const wxUint64 *buffer, size_t size)
+{
+#ifndef wxLongLong_t
+    DoWriteLL(buffer, size, m_output, m_be_order);
+#else
+    DoWriteI64(buffer, size, m_output, m_be_order);
+#endif
+}
+
+void wxDataOutputStream::Write64(const wxInt64 *buffer, size_t size)
+{
+#ifndef wxLongLong_t
+    DoWriteLL(buffer, size, m_output, m_be_order);
+#else
+    DoWriteI64(buffer, size, m_output, m_be_order);
+#endif
+}
+#endif // wxHAS_INT64
+
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+void wxDataOutputStream::Write64(const wxULongLong *buffer, size_t size)
+{
+    DoWriteLL(buffer, size, m_output, m_be_order);
+}
+
+void wxDataOutputStream::Write64(const wxLongLong *buffer, size_t size)
+{
+    DoWriteLL(buffer, size, m_output, m_be_order);
+}
+#endif // wxLongLong_t
+
+#if wxUSE_LONGLONG
+void wxDataOutputStream::WriteLL(const wxULongLong *buffer, size_t size)
+{
+    DoWriteLL(buffer, size, m_output, m_be_order);
+}
+
+void wxDataOutputStream::WriteLL(const wxLongLong *buffer, size_t size)
+{
+    DoWriteLL(buffer, size, m_output, m_be_order);
+}
+
+void wxDataOutputStream::WriteLL(const wxLongLong &ll)
+{
+    WriteLL(&ll, 1);
+}
+
+void wxDataOutputStream::WriteLL(const wxULongLong &ll)
+{
+    WriteLL(&ll, 1);
+}
+#endif // wxUSE_LONGLONG
+
+void wxDataOutputStream::Write32(const wxUint32 *buffer, size_t size)
+{
+  if (m_be_order)
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint32 i32 = wxUINT32_SWAP_ON_LE(*buffer);
+      buffer++;
+      m_output->Write(&i32, 4);
+    }
+  }
+  else
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint32 i32 = wxUINT32_SWAP_ON_BE(*buffer);
+      buffer++;
+      m_output->Write(&i32, 4);
+    }
+  }
+}
+
+void wxDataOutputStream::Write16(const wxUint16 *buffer, size_t size)
+{
+  if (m_be_order)
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint16 i16 = wxUINT16_SWAP_ON_LE(*buffer);
+      buffer++;
+      m_output->Write(&i16, 2);
+    }
+  }
+  else
+  {
+    for (wxUint32 i=0; i<size ;i++)
+    {
+      wxUint16 i16 = wxUINT16_SWAP_ON_BE(*buffer);
+      buffer++;
+      m_output->Write(&i16, 2);
+    }
+  }
+}
+
+void wxDataOutputStream::Write8(const wxUint8 *buffer, size_t size)
+{
+  m_output->Write(buffer, size);
+}
+
+void wxDataOutputStream::WriteDouble(const double *buffer, size_t size)
+{
+  for (wxUint32 i=0; i<size; i++)
+  {
+    WriteDouble(*(buffer++));
+  }
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
+{
+  Write32(wxStrlen(string));
+  m_output->Write((const char *)string, wxStrlen(string)*sizeof(wxChar));
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
+{
+  WriteString(string);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt8 c)
+{
+  Write8((wxUint8)c);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt16 i)
+{
+  Write16((wxUint16)i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt32 i)
+{
+  Write32((wxUint32)i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint8 c)
+{
+  Write8(c);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint16 i)
+{
+  Write16(i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i)
+{
+  Write32(i);
+  return *this;
+}
+
+#if wxHAS_INT64
+wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i)
+{
+  Write64(i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(wxInt64 i)
+{
+  Write64(i);
+  return *this;
+}
+#endif // wxHAS_INT64
+
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxULongLong &i)
+{
+  WriteLL(i);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(const wxLongLong &i)
+{
+  WriteLL(i);
+  return *this;
+}
+#endif // wxLongLong_t
+
+wxDataOutputStream& wxDataOutputStream::operator<<(double f)
+{
+  WriteDouble(f);
+  return *this;
+}
+
+wxDataOutputStream& wxDataOutputStream::operator<<(float f)
+{
+  WriteDouble((double)f);
+  return *this;
+}
+
+#endif
+  // wxUSE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/dcbase.cpp b/Source/3rd Party/wx/src/common/dcbase.cpp
index a7a1c3231..ecc821d00 100644
--- a/Source/3rd Party/wx/src/common/dcbase.cpp	
+++ b/Source/3rd Party/wx/src/common/dcbase.cpp	
@@ -1,1725 +1,1174 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dcbase.cpp
-// Purpose:     generic methods of the wxDC Class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     05/25/99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
-#include "wx/dcscreen.h"
-#include "wx/dcprint.h"
-#include "wx/prntbase.h"
-#include "wx/scopeguard.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/math.h"
-    #include "wx/module.h"
-    #include "wx/window.h"
-#endif
-
-#ifdef __WXMSW__
-    #include "wx/msw/dcclient.h"
-    #include "wx/msw/dcmemory.h"
-    #include "wx/msw/dcscreen.h"
-#endif
-
-#ifdef __WXGTK3__
-    #include "wx/gtk/dc.h"
-#elif defined __WXGTK20__
-    #include "wx/gtk/dcclient.h"
-    #include "wx/gtk/dcmemory.h"
-    #include "wx/gtk/dcscreen.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk1/dcclient.h"
-    #include "wx/gtk1/dcmemory.h"
-    #include "wx/gtk1/dcscreen.h"
-#endif
-
-#ifdef __WXMAC__
-    #include "wx/osx/dcclient.h"
-    #include "wx/osx/dcmemory.h"
-    #include "wx/osx/dcscreen.h"
-#endif
-
-#ifdef __WXPM__
-    #include "wx/os2/dcclient.h"
-    #include "wx/os2/dcmemory.h"
-    #include "wx/os2/dcscreen.h"
-#endif
-
-#ifdef __WXCOCOA__
-    #include "wx/cocoa/dcclient.h"
-    #include "wx/cocoa/dcmemory.h"
-    #include "wx/cocoa/dcscreen.h"
-#endif
-
-#ifdef __WXMOTIF__
-    #include "wx/motif/dcclient.h"
-    #include "wx/motif/dcmemory.h"
-    #include "wx/motif/dcscreen.h"
-#endif
-
-#ifdef __WXX11__
-    #include "wx/x11/dcclient.h"
-    #include "wx/x11/dcmemory.h"
-    #include "wx/x11/dcscreen.h"
-#endif
-
-#ifdef __WXDFB__
-    #include "wx/dfb/dcclient.h"
-    #include "wx/dfb/dcmemory.h"
-    #include "wx/dfb/dcscreen.h"
-#endif
-
-//----------------------------------------------------------------------------
-// wxDCFactory
-//----------------------------------------------------------------------------
-
-wxDCFactory *wxDCFactory::m_factory = NULL;
-
-void wxDCFactory::Set(wxDCFactory *factory)
-{
-    delete m_factory;
-
-    m_factory = factory;
-}
-
-wxDCFactory *wxDCFactory::Get()
-{
-    if ( !m_factory )
-        m_factory = new wxNativeDCFactory;
-
-    return m_factory;
-}
-
-class wxDCFactoryCleanupModule : public wxModule
-{
-public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDCFactory::Set(NULL); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxDCFactoryCleanupModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxDCFactoryCleanupModule, wxModule)
-
-//-----------------------------------------------------------------------------
-// wxNativeDCFactory
-//-----------------------------------------------------------------------------
-
-wxDCImpl* wxNativeDCFactory::CreateWindowDC( wxWindowDC *owner, wxWindow *window )
-{
-    wxDCImpl * const impl = new wxWindowDCImpl( owner, window );
-    impl->InheritAttributes(window);
-    return impl;
-}
-
-wxDCImpl* wxNativeDCFactory::CreateClientDC( wxClientDC *owner, wxWindow *window )
-{
-    wxDCImpl * const impl = new wxClientDCImpl( owner, window );
-    impl->InheritAttributes(window);
-    return impl;
-}
-
-wxDCImpl* wxNativeDCFactory::CreatePaintDC( wxPaintDC *owner, wxWindow *window )
-{
-    wxDCImpl * const impl = new wxPaintDCImpl( owner, window );
-    impl->InheritAttributes(window);
-    return impl;
-}
-
-wxDCImpl* wxNativeDCFactory::CreateMemoryDC( wxMemoryDC *owner )
-{
-    return new wxMemoryDCImpl( owner );
-}
-
-wxDCImpl* wxNativeDCFactory::CreateMemoryDC(wxMemoryDC *owner, wxBitmap& bitmap)
-{
-    // the bitmap may be modified when it's selected into a memory DC so make
-    // sure changing this bitmap doesn't affect any other shallow copies of it
-    // (see wxMemoryDC::SelectObject())
-    //
-    // notice that we don't provide any ctor equivalent to SelectObjectAsSource
-    // method because this should be rarely needed and easy to work around by
-    // using the default ctor and calling SelectObjectAsSource itself
-    if ( bitmap.IsOk() )
-        bitmap.UnShare();
-
-    return new wxMemoryDCImpl(owner, bitmap);
-}
-
-wxDCImpl* wxNativeDCFactory::CreateMemoryDC( wxMemoryDC *owner, wxDC *dc )
-{
-    return new wxMemoryDCImpl( owner, dc );
-}
-
-wxDCImpl* wxNativeDCFactory::CreateScreenDC( wxScreenDC *owner )
-{
-    return new wxScreenDCImpl( owner );
-}
-
-#if wxUSE_PRINTING_ARCHITECTURE
-wxDCImpl *wxNativeDCFactory::CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data )
-{
-    wxPrintFactory *factory = wxPrintFactory::GetFactory();
-    return factory->CreatePrinterDCImpl( owner, data );
-}
-#endif
-
-//-----------------------------------------------------------------------------
-// wxWindowDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDC, wxDC)
-
-wxWindowDC::wxWindowDC(wxWindow *win)
-          : wxDC(wxDCFactory::Get()->CreateWindowDC(this, win))
-{
-}
-
-//-----------------------------------------------------------------------------
-// wxClientDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxClientDC, wxWindowDC)
-
-wxClientDC::wxClientDC(wxWindow *win)
-          : wxWindowDC(wxDCFactory::Get()->CreateClientDC(this, win))
-{
-}
-
-//-----------------------------------------------------------------------------
-// wxMemoryDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
-
-wxMemoryDC::wxMemoryDC()
-          : wxDC(wxDCFactory::Get()->CreateMemoryDC(this))
-{
-}
-
-wxMemoryDC::wxMemoryDC(wxBitmap& bitmap)
-          : wxDC(wxDCFactory::Get()->CreateMemoryDC(this, bitmap))
-{
-}
-
-wxMemoryDC::wxMemoryDC(wxDC *dc)
-          : wxDC(wxDCFactory::Get()->CreateMemoryDC(this, dc))
-{
-}
-
-void wxMemoryDC::SelectObject(wxBitmap& bmp)
-{
-    if ( bmp.IsSameAs(GetSelectedBitmap()) )
-    {
-        // Nothing to do, this bitmap is already selected.
-        return;
-    }
-
-    // make sure that the given wxBitmap is not sharing its data with other
-    // wxBitmap instances as its contents will be modified by any drawing
-    // operation done on this DC
-    if (bmp.IsOk())
-        bmp.UnShare();
-
-    GetImpl()->DoSelect(bmp);
-}
-
-void wxMemoryDC::SelectObjectAsSource(const wxBitmap& bmp)
-{
-    GetImpl()->DoSelect(bmp);
-}
-
-const wxBitmap& wxMemoryDC::GetSelectedBitmap() const
-{
-    return GetImpl()->GetSelectedBitmap();
-}
-
-wxBitmap& wxMemoryDC::GetSelectedBitmap()
-{
-    return GetImpl()->GetSelectedBitmap();
-}
-
-
-//-----------------------------------------------------------------------------
-// wxPaintDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDC, wxClientDC)
-
-wxPaintDC::wxPaintDC(wxWindow *win)
-         : wxClientDC(wxDCFactory::Get()->CreatePaintDC(this, win))
-{
-}
-
-//-----------------------------------------------------------------------------
-// wxScreenDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
-
-wxScreenDC::wxScreenDC()
-          : wxDC(wxDCFactory::Get()->CreateScreenDC(this))
-{
-}
-
-//-----------------------------------------------------------------------------
-// wxPrinterDC
-//-----------------------------------------------------------------------------
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-IMPLEMENT_DYNAMIC_CLASS(wxPrinterDC, wxDC)
-
-wxPrinterDC::wxPrinterDC()
-           : wxDC(wxDCFactory::Get()->CreatePrinterDC(this, wxPrintData()))
-{
-}
-
-wxPrinterDC::wxPrinterDC(const wxPrintData& data)
-           : wxDC(wxDCFactory::Get()->CreatePrinterDC(this, data))
-{
-}
-
-wxRect wxPrinterDC::GetPaperRect() const
-{
-    return GetImpl()->GetPaperRect();
-}
-
-int wxPrinterDC::GetResolution() const
-{
-    return GetImpl()->GetResolution();
-}
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-//-----------------------------------------------------------------------------
-// wxDCImpl
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDCImpl, wxObject)
-
-wxDCImpl::wxDCImpl( wxDC *owner )
-        : m_window(NULL)
-        , m_colour(wxColourDisplay())
-        , m_ok(true)
-        , m_clipping(false)
-        , m_isInteractive(0)
-        , m_isBBoxValid(false)
-        , m_logicalOriginX(0), m_logicalOriginY(0)
-        , m_deviceOriginX(0), m_deviceOriginY(0)
-        , m_deviceLocalOriginX(0), m_deviceLocalOriginY(0)
-        , m_logicalScaleX(1.0), m_logicalScaleY(1.0)
-        , m_userScaleX(1.0), m_userScaleY(1.0)
-        , m_scaleX(1.0), m_scaleY(1.0)
-        , m_signX(1), m_signY(1)
-        , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
-        , m_clipX1(0), m_clipY1(0), m_clipX2(0), m_clipY2(0)
-        , m_logicalFunction(wxCOPY)
-        , m_backgroundMode(wxBRUSHSTYLE_TRANSPARENT)
-        , m_mappingMode(wxMM_TEXT)
-        , m_pen()
-        , m_brush()
-        , m_backgroundBrush()
-        , m_textForegroundColour(*wxBLACK)
-        , m_textBackgroundColour(*wxWHITE)
-        , m_font()
-#if wxUSE_PALETTE
-        , m_palette()
-        , m_hasCustomPalette(false)
-#endif // wxUSE_PALETTE
-{
-    m_owner = owner;
-
-    m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() /
-                    (double)wxGetDisplaySizeMM().GetWidth();
-    m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() /
-                    (double)wxGetDisplaySizeMM().GetHeight();
-
-    ResetBoundingBox();
-    ResetClipping();
-}
-
-wxDCImpl::~wxDCImpl()
-{
-}
-
-// ----------------------------------------------------------------------------
-// coordinate conversions and transforms
-// ----------------------------------------------------------------------------
-
-wxCoord wxDCImpl::DeviceToLogicalX(wxCoord x) const
-{
-    return wxRound( (double)((x - m_deviceOriginX - m_deviceLocalOriginX) * m_signX) / m_scaleX ) + m_logicalOriginX ;
-}
-
-wxCoord wxDCImpl::DeviceToLogicalY(wxCoord y) const
-{
-    return wxRound( (double)((y - m_deviceOriginY - m_deviceLocalOriginY) * m_signY) / m_scaleY ) + m_logicalOriginY ;
-}
-
-wxCoord wxDCImpl::DeviceToLogicalXRel(wxCoord x) const
-{
-    return wxRound((double)(x) / m_scaleX);
-}
-
-wxCoord wxDCImpl::DeviceToLogicalYRel(wxCoord y) const
-{
-    return wxRound((double)(y) / m_scaleY);
-}
-
-wxCoord wxDCImpl::LogicalToDeviceX(wxCoord x) const
-{
-    return wxRound( (double)((x - m_logicalOriginX) * m_signX) * m_scaleX) + m_deviceOriginX + m_deviceLocalOriginX;
-}
-
-wxCoord wxDCImpl::LogicalToDeviceY(wxCoord y) const
-{
-    return wxRound( (double)((y - m_logicalOriginY) * m_signY) * m_scaleY) + m_deviceOriginY + m_deviceLocalOriginY;
-}
-
-wxCoord wxDCImpl::LogicalToDeviceXRel(wxCoord x) const
-{
-    return wxRound((double)(x) * m_scaleX);
-}
-
-wxCoord wxDCImpl::LogicalToDeviceYRel(wxCoord y) const
-{
-    return wxRound((double)(y) * m_scaleY);
-}
-
-void wxDCImpl::ComputeScaleAndOrigin()
-{
-    m_scaleX = m_logicalScaleX * m_userScaleX;
-    m_scaleY = m_logicalScaleY * m_userScaleY;
-}
-
-void wxDCImpl::SetMapMode( wxMappingMode mode )
-{
-    switch (mode)
-    {
-        case wxMM_TWIPS:
-          SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
-          break;
-        case wxMM_POINTS:
-          SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y );
-          break;
-        case wxMM_METRIC:
-          SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y );
-          break;
-        case wxMM_LOMETRIC:
-          SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 );
-          break;
-        default:
-        case wxMM_TEXT:
-          SetLogicalScale( 1.0, 1.0 );
-          break;
-    }
-    m_mappingMode = mode;
-}
-
-void wxDCImpl::SetUserScale( double x, double y )
-{
-    // allow negative ? -> no
-    m_userScaleX = x;
-    m_userScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxDCImpl::SetLogicalScale( double x, double y )
-{
-    // allow negative ?
-    m_logicalScaleX = x;
-    m_logicalScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxDCImpl::SetLogicalOrigin( wxCoord x, wxCoord y )
-{
-    m_logicalOriginX = x * m_signX;
-    m_logicalOriginY = y * m_signY;
-    ComputeScaleAndOrigin();
-}
-
-void wxDCImpl::SetDeviceOrigin( wxCoord x, wxCoord y )
-{
-    m_deviceOriginX = x;
-    m_deviceOriginY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxDCImpl::SetDeviceLocalOrigin( wxCoord x, wxCoord y )
-{
-    m_deviceLocalOriginX = x;
-    m_deviceLocalOriginY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
-    // only wxPostScripDC has m_signX = -1, we override SetAxisOrientation there
-    // wxWidgets 2.9: no longer override it
-    m_signX = (xLeftRight ?  1 : -1);
-    m_signY = (yBottomUp  ? -1 :  1);
-    ComputeScaleAndOrigin();
-}
-
-
-// Each element of the widths array will be the width of the string up to and
-// including the corresponding character in text.  This is the generic
-// implementation, the port-specific classes should do this with native APIs
-// if available and if faster.  Note: pango_layout_index_to_pos is much slower
-// than calling GetTextExtent!!
-
-#define FWC_SIZE 256
-
-class FontWidthCache
-{
-public:
-    FontWidthCache() : m_scaleX(1), m_widths(NULL) { }
-    ~FontWidthCache() { delete []m_widths; }
-
-    void Reset()
-    {
-        if (!m_widths)
-            m_widths = new int[FWC_SIZE];
-
-        memset(m_widths, 0, sizeof(int)*FWC_SIZE);
-    }
-
-    wxFont m_font;
-    double m_scaleX;
-    int *m_widths;
-};
-
-static FontWidthCache s_fontWidthCache;
-
-bool wxDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
-{
-    int totalWidth = 0;
-
-    const size_t len = text.length();
-    widths.Empty();
-    widths.Add(0, len);
-
-    // reset the cache if font or horizontal scale have changed
-    if ( !s_fontWidthCache.m_widths ||
-         !wxIsSameDouble(s_fontWidthCache.m_scaleX, m_scaleX) ||
-         (s_fontWidthCache.m_font != GetFont()) )
-    {
-        s_fontWidthCache.Reset();
-        s_fontWidthCache.m_font = GetFont();
-        s_fontWidthCache.m_scaleX = m_scaleX;
-    }
-
-    // Calculate the position of each character based on the widths of
-    // the previous characters
-    int w, h;
-    for ( size_t i = 0; i < len; i++ )
-    {
-        const wxChar c = text[i];
-        unsigned int c_int = (unsigned int)c;
-
-        if ((c_int < FWC_SIZE) && (s_fontWidthCache.m_widths[c_int] != 0))
-        {
-            w = s_fontWidthCache.m_widths[c_int];
-        }
-        else
-        {
-            DoGetTextExtent(c, &w, &h);
-            if (c_int < FWC_SIZE)
-                s_fontWidthCache.m_widths[c_int] = w;
-        }
-
-        totalWidth += w;
-        widths[i] = totalWidth;
-    }
-
-    return true;
-}
-
-void wxDCImpl::GetMultiLineTextExtent(const wxString& text,
-                                      wxCoord *x,
-                                      wxCoord *y,
-                                      wxCoord *h,
-                                      const wxFont *font) const
-{
-    wxCoord widthTextMax = 0, widthLine,
-            heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
-
-    wxString curLine;
-    for ( wxString::const_iterator pc = text.begin(); ; ++pc )
-    {
-        if ( pc == text.end() || *pc == wxT('\n') )
-        {
-            if ( curLine.empty() )
-            {
-                // we can't use GetTextExtent - it will return 0 for both width
-                // and height and an empty line should count in height
-                // calculation
-
-                // assume that this line has the same height as the previous
-                // one
-                if ( !heightLineDefault )
-                    heightLineDefault = heightLine;
-
-                if ( !heightLineDefault )
-                {
-                    // but we don't know it yet - choose something reasonable
-                    DoGetTextExtent(wxT("W"), NULL, &heightLineDefault,
-                                  NULL, NULL, font);
-                }
-
-                heightTextTotal += heightLineDefault;
-            }
-            else
-            {
-                DoGetTextExtent(curLine, &widthLine, &heightLine,
-                              NULL, NULL, font);
-                if ( widthLine > widthTextMax )
-                    widthTextMax = widthLine;
-                heightTextTotal += heightLine;
-            }
-
-            if ( pc == text.end() )
-            {
-               break;
-            }
-            else // '\n'
-            {
-               curLine.clear();
-            }
-        }
-        else
-        {
-            curLine += *pc;
-        }
-    }
-
-    if ( x )
-        *x = widthTextMax;
-    if ( y )
-        *y = heightTextTotal;
-    if ( h )
-        *h = heightLine;
-}
-
-void wxDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1,
-                               wxCoord width, wxCoord height)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
-
-    wxCoord x2 = x1 + width,
-            y2 = y1 + height;
-
-    // the pen width is calibrated to give 3 for width == height == 10
-    wxDCPenChanger pen( *m_owner, wxPen(GetTextForeground(), (width + height + 1)/7));
-
-    // we're drawing a scaled version of wx/generic/tick.xpm here
-    wxCoord x3 = x1 + (4*width) / 10,   // x of the tick bottom
-            y3 = y1 + height / 2;       // y of the left tick branch
-    DoDrawLine(x1, y3, x3, y2);
-    DoDrawLine(x3, y2, x2, y1);
-
-    CalcBoundingBox(x1, y1);
-    CalcBoundingBox(x2, y2);
-}
-
-bool
-wxDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
-                        wxCoord dstWidth, wxCoord dstHeight,
-                        wxDC *source,
-                        wxCoord xsrc, wxCoord ysrc,
-                        wxCoord srcWidth, wxCoord srcHeight,
-                        wxRasterOperationMode rop,
-                        bool useMask,
-                        wxCoord xsrcMask,
-                        wxCoord ysrcMask)
-{
-    wxCHECK_MSG( srcWidth && srcHeight && dstWidth && dstHeight, false,
-                 wxT("invalid blit size") );
-
-    // emulate the stretching by modifying the DC scale
-    double xscale = (double)srcWidth/dstWidth,
-           yscale = (double)srcHeight/dstHeight;
-
-    double xscaleOld, yscaleOld;
-    GetUserScale(&xscaleOld, &yscaleOld);
-    SetUserScale(xscaleOld/xscale, yscaleOld/yscale);
-
-    bool rc = DoBlit(wxCoord(xdest*xscale), wxCoord(ydest*yscale),
-                     wxCoord(dstWidth*xscale), wxCoord(dstHeight*yscale),
-                     source,
-                     xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask);
-
-    SetUserScale(xscaleOld, yscaleOld);
-
-    return rc;
-}
-
-void wxDCImpl::DrawLines(const wxPointList *list, wxCoord xoffset, wxCoord yoffset)
-{
-    int n = list->GetCount();
-    wxPoint *points = new wxPoint[n];
-
-    int i = 0;
-    for ( wxPointList::compatibility_iterator node = list->GetFirst(); node; node = node->GetNext(), i++ )
-    {
-        wxPoint *point = node->GetData();
-        points[i].x = point->x;
-        points[i].y = point->y;
-    }
-
-    DoDrawLines(n, points, xoffset, yoffset);
-
-    delete [] points;
-}
-
-void wxDCImpl::DrawPolygon(const wxPointList *list,
-                           wxCoord xoffset, wxCoord yoffset,
-                           wxPolygonFillMode fillStyle)
-{
-    int n = list->GetCount();
-    wxPoint *points = new wxPoint[n];
-
-    int i = 0;
-    for ( wxPointList::compatibility_iterator node = list->GetFirst(); node; node = node->GetNext(), i++ )
-    {
-        wxPoint *point = node->GetData();
-        points[i].x = point->x;
-        points[i].y = point->y;
-    }
-
-    DoDrawPolygon(n, points, xoffset, yoffset, fillStyle);
-
-    delete [] points;
-}
-
-void
-wxDCImpl::DoDrawPolyPolygon(int n,
-                            int count[],
-                            wxPoint points[],
-                            wxCoord xoffset, wxCoord yoffset,
-                            wxPolygonFillMode fillStyle)
-{
-    if ( n == 1 )
-    {
-        DoDrawPolygon(count[0], points, xoffset, yoffset, fillStyle);
-        return;
-    }
-
-    int      i, j, lastOfs;
-    wxPoint* pts;
-
-    for (i = j = lastOfs = 0; i < n; i++)
-    {
-        lastOfs = j;
-        j      += count[i];
-    }
-    pts = new wxPoint[j+n-1];
-    for (i = 0; i < j; i++)
-        pts[i] = points[i];
-    for (i = 2; i <= n; i++)
-    {
-        lastOfs -= count[n-i];
-        pts[j++] = pts[lastOfs];
-    }
-
-    {
-        wxDCPenChanger setTransp(*m_owner, *wxTRANSPARENT_PEN);
-        DoDrawPolygon(j, pts, xoffset, yoffset, fillStyle);
-    }
-
-    for (i = j = 0; i < n; i++)
-    {
-        DoDrawLines(count[i], pts+j, xoffset, yoffset);
-        j += count[i];
-    }
-    delete[] pts;
-}
-
-#if wxUSE_SPLINES
-
-void wxDCImpl::DrawSpline(wxCoord x1, wxCoord y1,
-                          wxCoord x2, wxCoord y2,
-                          wxCoord x3, wxCoord y3)
-{
-    wxPoint points[] = { wxPoint(x1, y1), wxPoint(x2, y2), wxPoint(x3, y3) };
-    DrawSpline(WXSIZEOF(points), points);
-}
-
-void wxDCImpl::DrawSpline(int n, wxPoint points[])
-{
-    wxPointList list;
-    for ( int i = 0; i < n; i++ )
-        list.Append(&points[i]);
-
-    DrawSpline(&list);
-}
-
-// ----------------------------------- spline code ----------------------------------------
-
-void wx_quadratic_spline(double a1, double b1, double a2, double b2,
-                         double a3, double b3, double a4, double b4);
-void wx_clear_stack();
-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3,
-        double *y3, double *x4, double *y4);
-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3,
-          double x4, double y4);
-static bool wx_spline_add_point(double x, double y);
-static void wx_spline_draw_point_array(wxDC *dc);
-
-static wxPointList wx_spline_point_list;
-
-#define                half(z1, z2)        ((z1+z2)/2.0)
-#define                THRESHOLD        5
-
-/* iterative version */
-
-void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
-                 double b4)
-{
-    register double  xmid, ymid;
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
-
-    wx_clear_stack();
-    wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
-
-    while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
-        xmid = (double)half(x2, x3);
-        ymid = (double)half(y2, y3);
-        if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD &&
-            fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) {
-            wx_spline_add_point( x1, y1 );
-            wx_spline_add_point( xmid, ymid );
-        } else {
-            wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3),
-                 (double)half(x3, x4), (double)half(y3, y4), x4, y4);
-            wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2),
-                 (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid);
-        }
-    }
-}
-
-/* utilities used by spline drawing routines */
-
-typedef struct wx_spline_stack_struct {
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
-} Stack;
-
-#define         SPLINE_STACK_DEPTH             20
-static Stack    wx_spline_stack[SPLINE_STACK_DEPTH];
-static Stack   *wx_stack_top;
-static int      wx_stack_count;
-
-void wx_clear_stack()
-{
-    wx_stack_top = wx_spline_stack;
-    wx_stack_count = 0;
-}
-
-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
-{
-    wx_stack_top->x1 = x1;
-    wx_stack_top->y1 = y1;
-    wx_stack_top->x2 = x2;
-    wx_stack_top->y2 = y2;
-    wx_stack_top->x3 = x3;
-    wx_stack_top->y3 = y3;
-    wx_stack_top->x4 = x4;
-    wx_stack_top->y4 = y4;
-    wx_stack_top++;
-    wx_stack_count++;
-}
-
-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2,
-                  double *x3, double *y3, double *x4, double *y4)
-{
-    if (wx_stack_count == 0)
-        return (0);
-    wx_stack_top--;
-    wx_stack_count--;
-    *x1 = wx_stack_top->x1;
-    *y1 = wx_stack_top->y1;
-    *x2 = wx_stack_top->x2;
-    *y2 = wx_stack_top->y2;
-    *x3 = wx_stack_top->x3;
-    *y3 = wx_stack_top->y3;
-    *x4 = wx_stack_top->x4;
-    *y4 = wx_stack_top->y4;
-    return (1);
-}
-
-static bool wx_spline_add_point(double x, double y)
-{
-    wxPoint *point = new wxPoint( wxRound(x), wxRound(y) );
-    wx_spline_point_list.Append(point );
-    return true;
-}
-
-static void wx_spline_draw_point_array(wxDC *dc)
-{
-    dc->DrawLines(&wx_spline_point_list, 0, 0 );
-    wxPointList::compatibility_iterator node = wx_spline_point_list.GetFirst();
-    while (node)
-    {
-        wxPoint *point = node->GetData();
-        delete point;
-        wx_spline_point_list.Erase(node);
-        node = wx_spline_point_list.GetFirst();
-    }
-}
-
-void wxDCImpl::DoDrawSpline( const wxPointList *points )
-{
-    wxCHECK_RET( IsOk(), wxT("invalid window dc") );
-
-    wxPoint *p;
-    double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
-    double           x1, y1, x2, y2;
-
-    wxPointList::compatibility_iterator node = points->GetFirst();
-    if (!node)
-        // empty list
-        return;
-
-    p = (wxPoint *)node->GetData();
-
-    x1 = p->x;
-    y1 = p->y;
-
-    node = node->GetNext();
-    p = node->GetData();
-
-    x2 = p->x;
-    y2 = p->y;
-    cx1 = (double)((x1 + x2) / 2);
-    cy1 = (double)((y1 + y2) / 2);
-    cx2 = (double)((cx1 + x2) / 2);
-    cy2 = (double)((cy1 + y2) / 2);
-
-    wx_spline_add_point(x1, y1);
-
-    while ((node = node->GetNext())
-#if !wxUSE_STD_CONTAINERS
-           != NULL
-#endif // !wxUSE_STD_CONTAINERS
-          )
-    {
-        p = node->GetData();
-        x1 = x2;
-        y1 = y2;
-        x2 = p->x;
-        y2 = p->y;
-        cx4 = (double)(x1 + x2) / 2;
-        cy4 = (double)(y1 + y2) / 2;
-        cx3 = (double)(x1 + cx4) / 2;
-        cy3 = (double)(y1 + cy4) / 2;
-
-        wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
-
-        cx1 = cx4;
-        cy1 = cy4;
-        cx2 = (double)(cx1 + x2) / 2;
-        cy2 = (double)(cy1 + y2) / 2;
-    }
-
-    wx_spline_add_point( cx1, cy1 );
-    wx_spline_add_point( x2, y2 );
-
-    wx_spline_draw_point_array( m_owner );
-}
-
-#endif // wxUSE_SPLINES
-
-
-
-void wxDCImpl::DoGradientFillLinear(const wxRect& rect,
-                                    const wxColour& initialColour,
-                                    const wxColour& destColour,
-                                    wxDirection nDirection)
-{
-    // save old pen
-    wxPen oldPen = m_pen;
-    wxBrush oldBrush = m_brush;
-
-    wxUint8 nR1 = initialColour.Red();
-    wxUint8 nG1 = initialColour.Green();
-    wxUint8 nB1 = initialColour.Blue();
-    wxUint8 nR2 = destColour.Red();
-    wxUint8 nG2 = destColour.Green();
-    wxUint8 nB2 = destColour.Blue();
-    wxUint8 nR, nG, nB;
-
-    if ( nDirection == wxEAST || nDirection == wxWEST )
-    {
-        wxInt32 x = rect.GetWidth();
-        wxInt32 w = x;              // width of area to shade
-        wxInt32 xDelta = w/256;     // height of one shade bend
-        if (xDelta < 1)
-            xDelta = 1;
-
-        while (x >= xDelta)
-        {
-            x -= xDelta;
-            if (nR1 > nR2)
-                nR = nR1 - (nR1-nR2)*(w-x)/w;
-            else
-                nR = nR1 + (nR2-nR1)*(w-x)/w;
-
-            if (nG1 > nG2)
-                nG = nG1 - (nG1-nG2)*(w-x)/w;
-            else
-                nG = nG1 + (nG2-nG1)*(w-x)/w;
-
-            if (nB1 > nB2)
-                nB = nB1 - (nB1-nB2)*(w-x)/w;
-            else
-                nB = nB1 + (nB2-nB1)*(w-x)/w;
-
-            wxColour colour(nR,nG,nB);
-            SetPen(wxPen(colour, 1, wxPENSTYLE_SOLID));
-            SetBrush(wxBrush(colour));
-            if(nDirection == wxEAST)
-                DoDrawRectangle(rect.GetRight()-x-xDelta+1, rect.GetTop(),
-                        xDelta, rect.GetHeight());
-            else //nDirection == wxWEST
-                DoDrawRectangle(rect.GetLeft()+x, rect.GetTop(),
-                        xDelta, rect.GetHeight());
-        }
-    }
-    else  // nDirection == wxNORTH || nDirection == wxSOUTH
-    {
-        wxInt32 y = rect.GetHeight();
-        wxInt32 w = y;              // height of area to shade
-        wxInt32 yDelta = w/255;     // height of one shade bend
-        if (yDelta < 1)
-            yDelta = 1;
-
-        while (y > 0)
-        {
-            y -= yDelta;
-            if (nR1 > nR2)
-                nR = nR1 - (nR1-nR2)*(w-y)/w;
-            else
-                nR = nR1 + (nR2-nR1)*(w-y)/w;
-
-            if (nG1 > nG2)
-                nG = nG1 - (nG1-nG2)*(w-y)/w;
-            else
-                nG = nG1 + (nG2-nG1)*(w-y)/w;
-
-            if (nB1 > nB2)
-                nB = nB1 - (nB1-nB2)*(w-y)/w;
-            else
-                nB = nB1 + (nB2-nB1)*(w-y)/w;
-
-            wxColour colour(nR,nG,nB);
-            SetPen(wxPen(colour, 1, wxPENSTYLE_SOLID));
-            SetBrush(wxBrush(colour));
-            if(nDirection == wxNORTH)
-                DoDrawRectangle(rect.GetLeft(), rect.GetTop()+y,
-                        rect.GetWidth(), yDelta);
-            else //nDirection == wxSOUTH
-                DoDrawRectangle(rect.GetLeft(), rect.GetBottom()-y-yDelta+1,
-                        rect.GetWidth(), yDelta);
-        }
-    }
-
-    SetPen(oldPen);
-    SetBrush(oldBrush);
-}
-
-void wxDCImpl::DoGradientFillConcentric(const wxRect& rect,
-                                      const wxColour& initialColour,
-                                      const wxColour& destColour,
-                                      const wxPoint& circleCenter)
-{
-    // save the old pen and ensure it is restored on exit
-    const wxPen penOrig = m_pen;
-    wxON_BLOCK_EXIT_SET(m_pen, penOrig);
-
-    wxUint8 nR1 = destColour.Red();
-    wxUint8 nG1 = destColour.Green();
-    wxUint8 nB1 = destColour.Blue();
-    wxUint8 nR2 = initialColour.Red();
-    wxUint8 nG2 = initialColour.Green();
-    wxUint8 nB2 = initialColour.Blue();
-    wxUint8 nR, nG, nB;
-
-
-    //Radius
-    double cx = rect.GetWidth() / 2;
-    double cy = rect.GetHeight() / 2;
-    double dRadius;
-    if (cx < cy)
-        dRadius = cx;
-    else
-        dRadius = cy;
-
-    //Offset of circle
-    double ptX, ptY;
-    ptX = circleCenter.x;
-    ptY = circleCenter.y;
-    double nCircleOffX = ptX - cx;
-    double nCircleOffY = ptY - cy;
-
-    double dGradient;
-    double dx, dy;
-
-    for ( wxInt32 x = 0; x < rect.GetWidth(); x++ )
-    {
-        for ( wxInt32 y = 0; y < rect.GetHeight(); y++ )
-        {
-            //get color difference
-            dx = x;
-            dy = y;
-
-            dGradient = ((dRadius - sqrt(  (dx - cx - nCircleOffX) * (dx - cx - nCircleOffX)
-                                          +(dy - cy - nCircleOffY) * (dy - cy - nCircleOffY)
-                                         )
-                         ) * 100
-                        ) / dRadius;
-
-            //normalize Gradient
-            if (dGradient < 0)
-                dGradient = 0.0;
-
-            //get dest colors
-            nR = (wxUint8)(nR1 + ((nR2 - nR1) * dGradient / 100));
-            nG = (wxUint8)(nG1 + ((nG2 - nG1) * dGradient / 100));
-            nB = (wxUint8)(nB1 + ((nB2 - nB1) * dGradient / 100));
-
-            //set the pixel
-            SetPen(wxColour(nR,nG,nB));
-            DoDrawPoint(x + rect.GetLeft(), y + rect.GetTop());
-        }
-    }
-}
-
-void wxDCImpl::InheritAttributes(wxWindow *win)
-{
-    wxCHECK_RET( win, "window can't be NULL" );
-
-    SetFont(win->GetFont());
-    SetTextForeground(win->GetForegroundColour());
-    SetTextBackground(win->GetBackgroundColour());
-    SetBackground(win->GetBackgroundColour());
-    SetLayoutDirection(win->GetLayoutDirection());
-}
-
-void wxDCImpl::DoGetFontMetrics(int *height,
-                                int *ascent,
-                                int *descent,
-                                int *internalLeading,
-                                int *externalLeading,
-                                int *averageWidth) const
-{
-    // Average width is typically the same as width of 'x'.
-    wxCoord h, d;
-    DoGetTextExtent("x", averageWidth, &h, &d, externalLeading);
-
-    if ( height )
-        *height = h;
-    if ( ascent )
-        *ascent = h - d;
-    if ( descent )
-        *descent = d;
-    if ( internalLeading )
-        *internalLeading = 0;
-}
-
-//-----------------------------------------------------------------------------
-// wxDC
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-
-void wxDC::CopyAttributes(const wxDC& dc)
-{
-    SetFont(dc.GetFont());
-    SetTextForeground(dc.GetTextForeground());
-    SetTextBackground(dc.GetTextBackground());
-    SetBackground(dc.GetBackground());
-    SetLayoutDirection(dc.GetLayoutDirection());
-}
-
-void wxDC::DrawLabel(const wxString& text,
-                         const wxBitmap& bitmap,
-                         const wxRect& rect,
-                         int alignment,
-                         int indexAccel,
-                         wxRect *rectBounding)
-{
-    // find the text position
-    wxCoord widthText, heightText, heightLine;
-    GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine);
-
-    wxCoord width, height;
-    if ( bitmap.IsOk() )
-    {
-        width = widthText + bitmap.GetWidth();
-        height = bitmap.GetHeight();
-    }
-    else // no bitmap
-    {
-        width = widthText;
-        height = heightText;
-    }
-
-    wxCoord x, y;
-    if ( alignment & wxALIGN_RIGHT )
-    {
-        x = rect.GetRight() - width;
-    }
-    else if ( alignment & wxALIGN_CENTRE_HORIZONTAL )
-    {
-        x = (rect.GetLeft() + rect.GetRight() + 1 - width) / 2;
-    }
-    else // alignment & wxALIGN_LEFT
-    {
-        x = rect.GetLeft();
-    }
-
-    if ( alignment & wxALIGN_BOTTOM )
-    {
-        y = rect.GetBottom() - height;
-    }
-    else if ( alignment & wxALIGN_CENTRE_VERTICAL )
-    {
-        y = (rect.GetTop() + rect.GetBottom() + 1 - height) / 2;
-    }
-    else // alignment & wxALIGN_TOP
-    {
-        y = rect.GetTop();
-    }
-
-    // draw the bitmap first
-    wxCoord x0 = x,
-            y0 = y,
-            width0 = width;
-    if ( bitmap.IsOk() )
-    {
-        DrawBitmap(bitmap, x, y, true /* use mask */);
-
-        wxCoord offset = bitmap.GetWidth() + 4;
-        x += offset;
-        width -= offset;
-
-        y += (height - heightText) / 2;
-    }
-
-    // we will draw the underscore under the accel char later
-    wxCoord startUnderscore = 0,
-            endUnderscore = 0,
-            yUnderscore = 0;
-
-    // split the string into lines and draw each of them separately
-    //
-    // NB: while wxDC::DrawText() on some platforms supports drawing multi-line
-    //     strings natively, this is not the case for all of them, notably not
-    //     wxMSW which uses this function for multi-line texts, so we may only
-    //     call DrawText() for single-line strings from here to avoid infinite
-    //     recursion.
-    wxString curLine;
-    for ( wxString::const_iterator pc = text.begin(); ; ++pc )
-    {
-        if ( pc == text.end() || *pc == '\n' )
-        {
-            int xRealStart = x; // init it here to avoid compielr warnings
-
-            if ( !curLine.empty() )
-            {
-                // NB: can't test for !(alignment & wxALIGN_LEFT) because
-                //     wxALIGN_LEFT is 0
-                if ( alignment & (wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL) )
-                {
-                    wxCoord widthLine;
-                    GetTextExtent(curLine, &widthLine, NULL);
-
-                    if ( alignment & wxALIGN_RIGHT )
-                    {
-                        xRealStart += width - widthLine;
-                    }
-                    else // if ( alignment & wxALIGN_CENTRE_HORIZONTAL )
-                    {
-                        xRealStart += (width - widthLine) / 2;
-                    }
-                }
-                //else: left aligned, nothing to do
-
-                DrawText(curLine, xRealStart, y);
-            }
-
-            y += heightLine;
-
-            // do we have underscore in this line? we can check yUnderscore
-            // because it is set below to just y + heightLine if we do
-            if ( y == yUnderscore )
-            {
-                // adjust the horz positions to account for the shift
-                startUnderscore += xRealStart;
-                endUnderscore += xRealStart;
-            }
-
-            if ( pc == text.end() )
-                break;
-
-            curLine.clear();
-        }
-        else // not end of line
-        {
-            if ( pc - text.begin() == indexAccel )
-            {
-                // remember to draw underscore here
-                GetTextExtent(curLine, &startUnderscore, NULL);
-                curLine += *pc;
-                GetTextExtent(curLine, &endUnderscore, NULL);
-
-                yUnderscore = y + heightLine;
-            }
-            else
-            {
-                curLine += *pc;
-            }
-        }
-    }
-
-    // draw the underscore if found
-    if ( startUnderscore != endUnderscore )
-    {
-        // it should be of the same colour as text
-        SetPen(wxPen(GetTextForeground(), 0, wxPENSTYLE_SOLID));
-
-        // This adjustment is relatively arbitrary: we need to draw the
-        // underline slightly higher to avoid overflowing the character cell
-        // but whether we should do it 1, 2 or 3 pixels higher is not clear.
-        //
-        // The currently used value seems to be compatible with native MSW
-        // behaviour, i.e. it results in the same appearance of the owner-drawn
-        // and normal labels.
-        yUnderscore -= 2;
-
-        DrawLine(startUnderscore, yUnderscore, endUnderscore, yUnderscore);
-    }
-
-    // return bounding rect if requested
-    if ( rectBounding )
-    {
-        *rectBounding = wxRect(x, y - heightText, widthText, heightText);
-    }
-
-    CalcBoundingBox(x0, y0);
-    CalcBoundingBox(x0 + width0, y0 + height);
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-    // for compatibility with the old code when wxCoord was long everywhere
-void wxDC::GetTextExtent(const wxString& string,
-                       long *x, long *y,
-                       long *descent,
-                       long *externalLeading,
-                       const wxFont *theFont) const
-    {
-        wxCoord x2, y2, descent2, externalLeading2;
-        m_pimpl->DoGetTextExtent(string, &x2, &y2,
-                        &descent2, &externalLeading2,
-                        theFont);
-        if ( x )
-            *x = x2;
-        if ( y )
-            *y = y2;
-        if ( descent )
-            *descent = descent2;
-        if ( externalLeading )
-            *externalLeading = externalLeading2;
-    }
-
-void wxDC::GetLogicalOrigin(long *x, long *y) const
-    {
-        wxCoord x2, y2;
-        m_pimpl->DoGetLogicalOrigin(&x2, &y2);
-        if ( x )
-            *x = x2;
-        if ( y )
-            *y = y2;
-    }
-
-void wxDC::GetDeviceOrigin(long *x, long *y) const
-    {
-        wxCoord x2, y2;
-        m_pimpl->DoGetDeviceOrigin(&x2, &y2);
-        if ( x )
-            *x = x2;
-        if ( y )
-            *y = y2;
-    }
-
-void wxDC::GetClippingBox(long *x, long *y, long *w, long *h) const
-    {
-        wxCoord xx,yy,ww,hh;
-        m_pimpl->DoGetClippingBox(&xx, &yy, &ww, &hh);
-        if (x) *x = xx;
-        if (y) *y = yy;
-        if (w) *w = ww;
-        if (h) *h = hh;
-    }
-
-void wxDC::DrawObject(wxDrawObject* drawobject)
-{
-    drawobject->Draw(*this);
-    CalcBoundingBox(drawobject->MinX(),drawobject->MinY());
-    CalcBoundingBox(drawobject->MaxX(),drawobject->MaxY());
-}
-
-#endif  // WXWIN_COMPATIBILITY_2_8
-
-/*
-Notes for wxWidgets DrawEllipticArcRot(...)
-
-wxDCBase::DrawEllipticArcRot(...) draws a rotated elliptic arc or an ellipse.
-It uses wxDCBase::CalculateEllipticPoints(...) and wxDCBase::Rotate(...),
-which are also new.
-
-All methods are generic, so they can be implemented in wxDCBase.
-DoDrawEllipticArcRot(...) is virtual, so it can be called from deeper
-methods like (WinCE) wxDC::DoDrawArc(...).
-
-CalculateEllipticPoints(...) fills a given list of wxPoints with some points
-of an elliptic arc. The algorithm is pixel-based: In every row (in flat
-parts) or every column (in steep parts) only one pixel is calculated.
-Trigonometric calculation (sin, cos, tan, atan) is only done if the
-starting angle is not equal to the ending angle. The calculation of the
-pixels is done using simple arithmetic only and should perform not too
-bad even on devices without floating point processor. I didn't test this yet.
-
-Rotate(...) rotates a list of point pixel-based, you will see rounding errors.
-For instance: an ellipse rotated 180 degrees is drawn
-slightly different from the original.
-
-The points are then moved to an array and used to draw a polyline and/or polygon
-(with center added, the pie).
-The result looks quite similar to the native ellipse, only e few pixels differ.
-
-The performance on a desktop system (Athlon 1800, WinXP) is about 7 times
-slower as DrawEllipse(...), which calls the native API.
-An rotated ellipse outside the clipping region takes nearly the same time,
-while an native ellipse outside takes nearly no time to draw.
-
-If you draw an arc with this new method, you will see the starting and ending angles
-are calculated properly.
-If you use DrawEllipticArc(...), you will see they are only correct for circles
-and not properly calculated for ellipses.
-
-Peter Lenhard
-p.lenhard@t-online.de
-*/
-
-#ifdef __WXWINCE__
-void wxDCImpl::DoDrawEllipticArcRot( wxCoord x, wxCoord y,
-                                     wxCoord w, wxCoord h,
-                                     double sa, double ea, double angle )
-{
-    wxPointList list;
-
-    CalculateEllipticPoints( &list, x, y, w, h, sa, ea );
-    Rotate( &list, angle, wxPoint( x+w/2, y+h/2 ) );
-
-    // Add center (for polygon/pie)
-    list.Append( new wxPoint( x+w/2, y+h/2 ) );
-
-    // copy list into array and delete list elements
-    int n = list.GetCount();
-    wxPoint *points = new wxPoint[n];
-    int i = 0;
-    wxPointList::compatibility_iterator node;
-    for ( node = list.GetFirst(); node; node = node->GetNext(), i++ )
-    {
-        wxPoint *point = node->GetData();
-        points[i].x = point->x;
-        points[i].y = point->y;
-        delete point;
-    }
-
-    // first draw the pie without pen, if necessary
-    if( GetBrush() != *wxTRANSPARENT_BRUSH )
-    {
-        wxPen tempPen( GetPen() );
-        SetPen( *wxTRANSPARENT_PEN );
-        DoDrawPolygon( n, points, 0, 0 );
-        SetPen( tempPen );
-    }
-
-    // then draw the arc without brush, if necessary
-    if( GetPen() != *wxTRANSPARENT_PEN )
-    {
-        // without center
-        DoDrawLines( n-1, points, 0, 0 );
-    }
-
-    delete [] points;
-
-} // DrawEllipticArcRot
-
-void wxDCImpl::Rotate( wxPointList* points, double angle, wxPoint center )
-{
-    if( angle != 0.0 )
-    {
-        double pi(M_PI);
-        double dSinA = -sin(angle*2.0*pi/360.0);
-        double dCosA = cos(angle*2.0*pi/360.0);
-        wxPointList::compatibility_iterator node;
-        for ( node = points->GetFirst(); node; node = node->GetNext() )
-        {
-            wxPoint* point = node->GetData();
-
-            // transform coordinates, if necessary
-            if( center.x ) point->x -= center.x;
-            if( center.y ) point->y -= center.y;
-
-            // calculate rotation, rounding simply by implicit cast to integer
-            int xTemp = point->x * dCosA - point->y * dSinA;
-            point->y = point->x * dSinA + point->y * dCosA;
-            point->x = xTemp;
-
-            // back transform coordinates, if necessary
-            if( center.x ) point->x += center.x;
-            if( center.y ) point->y += center.y;
-        }
-    }
-}
-
-void wxDCImpl::CalculateEllipticPoints( wxPointList* points,
-                                        wxCoord xStart, wxCoord yStart,
-                                        wxCoord w, wxCoord h,
-                                        double sa, double ea )
-{
-    double pi = M_PI;
-    double sar = 0;
-    double ear = 0;
-    int xsa = 0;
-    int ysa = 0;
-    int xea = 0;
-    int yea = 0;
-    int sq = 0;
-    int eq = 0;
-    bool bUseAngles = false;
-    if( w<0 ) w = -w;
-    if( h<0 ) h = -h;
-    // half-axes
-    wxCoord a = w/2;
-    wxCoord b = h/2;
-    // decrement 1 pixel if ellipse is smaller than 2*a, 2*b
-    int decrX = 0;
-    if( 2*a == w ) decrX = 1;
-    int decrY = 0;
-    if( 2*b == h ) decrY = 1;
-    // center
-    wxCoord xCenter = xStart + a;
-    wxCoord yCenter = yStart + b;
-    // calculate data for start and end, if necessary
-    if( sa != ea )
-    {
-        bUseAngles = true;
-        // normalisation of angles
-        while( sa<0 ) sa += 360;
-        while( ea<0 ) ea += 360;
-        while( sa>=360 ) sa -= 360;
-        while( ea>=360 ) ea -= 360;
-        // calculate quadrant numbers
-        if( sa > 270 ) sq = 3;
-        else if( sa > 180 ) sq = 2;
-        else if( sa > 90 ) sq = 1;
-        if( ea > 270 ) eq = 3;
-        else if( ea > 180 ) eq = 2;
-        else if( ea > 90 ) eq = 1;
-        sar = sa * pi / 180.0;
-        ear = ea * pi / 180.0;
-        // correct angle circle -> ellipse
-        sar = atan( -a/(double)b * tan( sar ) );
-        if ( sq == 1 || sq == 2 ) sar += pi;
-        ear = atan( -a/(double)b * tan( ear ) );
-        if ( eq == 1 || eq == 2 ) ear += pi;
-        // coordinates of points
-        xsa = xCenter + a * cos( sar );
-        if( sq == 0 || sq == 3 ) xsa -= decrX;
-        ysa = yCenter + b * sin( sar );
-        if( sq == 2 || sq == 3 ) ysa -= decrY;
-        xea = xCenter + a * cos( ear );
-        if( eq == 0 || eq == 3 ) xea -= decrX;
-        yea = yCenter + b * sin( ear );
-        if( eq == 2 || eq == 3 ) yea -= decrY;
-    } // if iUseAngles
-    // calculate c1 = b^2, c2 = b^2/a^2 with a = w/2, b = h/2
-    double c1 = b * b;
-    double c2 = 2.0 / w;
-    c2 *= c2;
-    c2 *= c1;
-    wxCoord x = 0;
-    wxCoord y = b;
-    long x2 = 1;
-    long y2 = y*y;
-    long y2_old = 0;
-    long y_old = 0;
-    // Lists for quadrant 1 to 4
-    wxPointList pointsarray[4];
-    // Calculate points for first quadrant and set in all quadrants
-    for( x = 0; x <= a; ++x )
-    {
-        x2 = x2+x+x-1;
-        y2_old = y2;
-        y_old = y;
-        bool bNewPoint = false;
-        while( y2 > c1 - c2 * x2 && y > 0 )
-        {
-            bNewPoint = true;
-            y2 = y2-y-y+1;
-            --y;
-        }
-        // old y now too big: set point with old y, old x
-        if( bNewPoint && x>1)
-        {
-            int x1 = x - 1;
-            // remove points on the same line
-            pointsarray[0].Insert( new wxPoint( xCenter + x1 - decrX, yCenter - y_old ) );
-            pointsarray[1].Append( new wxPoint( xCenter - x1, yCenter - y_old ) );
-            pointsarray[2].Insert( new wxPoint( xCenter - x1, yCenter + y_old - decrY ) );
-            pointsarray[3].Append( new wxPoint( xCenter + x1 - decrX, yCenter + y_old - decrY ) );
-        } // set point
-    } // calculate point
-
-    // Starting and/or ending points for the quadrants, first quadrant gets both.
-    pointsarray[0].Insert( new wxPoint( xCenter + a - decrX, yCenter ) );
-    pointsarray[0].Append( new wxPoint( xCenter, yCenter - b ) );
-    pointsarray[1].Append( new wxPoint( xCenter - a, yCenter ) );
-    pointsarray[2].Append( new wxPoint( xCenter, yCenter + b - decrY ) );
-    pointsarray[3].Append( new wxPoint( xCenter + a - decrX, yCenter ) );
-
-    // copy quadrants in original list
-    if( bUseAngles )
-    {
-        // Copy the right part of the points in the lists
-        // and delete the wxPoints, because they do not leave this method.
-        points->Append( new wxPoint( xsa, ysa ) );
-        int q = sq;
-        bool bStarted = false;
-        bool bReady = false;
-        bool bForceTurn = ( sq == eq && sa > ea );
-        while( !bReady )
-        {
-            wxPointList::compatibility_iterator node;
-            for( node = pointsarray[q].GetFirst(); node; node = node->GetNext() )
-            {
-                // once: go to starting point in start quadrant
-                if( !bStarted &&
-                    (
-                      node->GetData()->x < xsa+1 && q <= 1
-                      ||
-                      node->GetData()->x > xsa-1 && q >= 2
-                    )
-                  )
-                {
-                    bStarted = true;
-                }
-
-                // copy point, if not at ending point
-                if( bStarted )
-                {
-                    if( q != eq || bForceTurn
-                        ||
-                        ( (wxPoint*) node->GetData() )->x > xea+1 && q <= 1
-                        ||
-                        ( (wxPoint*) node->GetData() )->x < xea-1 && q >= 2
-                      )
-                    {
-                        // copy point
-                        wxPoint* pPoint = new wxPoint( *(node->GetData()) );
-                        points->Append( pPoint );
-                    }
-                    else if( q == eq && !bForceTurn || node->GetData()->x == xea)
-                    {
-                        bReady = true;
-                    }
-                }
-            } // for node
-            ++q;
-            if( q > 3 ) q = 0;
-            bForceTurn = false;
-            bStarted = true;
-        } // while not bReady
-        points->Append( new wxPoint( xea, yea ) );
-
-        // delete points
-        for( q = 0; q < 4; ++q )
-        {
-            wxPointList::compatibility_iterator node;
-            for( node = pointsarray[q].GetFirst(); node; node = node->GetNext() )
-            {
-                wxPoint *p = node->GetData();
-                delete p;
-            }
-        }
-    }
-    else
-    {
-        wxPointList::compatibility_iterator node;
-        // copy whole ellipse, wxPoints will be deleted outside
-        for( node = pointsarray[0].GetFirst(); node; node = node->GetNext() )
-        {
-            wxPoint *p = node->GetData();
-            points->Append( p );
-        }
-        for( node = pointsarray[1].GetFirst(); node; node = node->GetNext() )
-        {
-            wxPoint *p = node->GetData();
-            points->Append( p );
-        }
-        for( node = pointsarray[2].GetFirst(); node; node = node->GetNext() )
-        {
-            wxPoint *p = node->GetData();
-            points->Append( p );
-        }
-        for( node = pointsarray[3].GetFirst(); node; node = node->GetNext() )
-        {
-            wxPoint *p = node->GetData();
-            points->Append( p );
-        }
-    } // not iUseAngles
-} // CalculateEllipticPoints
-
-#endif // __WXWINCE__
-
-float wxDCImpl::GetFontPointSizeAdjustment(float dpi)
-{
-    // wxMSW has long-standing bug where wxFont point size is interpreted as
-    // "pixel size corresponding to given point size *on screen*". In other
-    // words, on a typical 600dpi printer and a typical 96dpi screen, fonts
-    // are ~6 times smaller when printing. Unfortunately, this bug is so severe
-    // that *all* printing code has to account for it and consequently, other
-    // ports need to emulate this bug too:
-    const wxSize screenPPI = wxGetDisplayPPI();
-    return float(screenPPI.y) / dpi;
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dcbase.cpp
+// Purpose:     generic methods of the wxDC Class
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     05/25/99
+// RCS-ID:      $Id: dcbase.cpp 56135 2008-10-06 21:04:02Z VZ $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/dc.h"
+#include "wx/dcbuffer.h" // for IMPLEMENT_DYNAMIC_CLASS
+
+#ifndef WX_PRECOMP
+    #include "wx/math.h"
+#endif
+
+// bool wxDCBase::sm_cacheing = false;
+
+IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(wxBufferedDC, wxMemoryDC)
+IMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC, wxBufferedDC)
+
+#if WXWIN_COMPATIBILITY_2_6
+void wxDCBase::BeginDrawing()
+{
+}
+
+void wxDCBase::EndDrawing()
+{
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+// ----------------------------------------------------------------------------
+// special symbols
+// ----------------------------------------------------------------------------
+
+void wxDCBase::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+                               wxCoord width, wxCoord height)
+{
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    wxCoord x2 = x1 + width,
+            y2 = y1 + height;
+
+    // the pen width is calibrated to give 3 for width == height == 10
+    wxDCPenChanger pen((wxDC&)*this,
+                        wxPen(GetTextForeground(), (width + height + 1)/7));
+
+    // we're drawing a scaled version of wx/generic/tick.xpm here
+    wxCoord x3 = x1 + (4*width) / 10,   // x of the tick bottom
+            y3 = y1 + height / 2;       // y of the left tick branch
+    DoDrawLine(x1, y3, x3, y2);
+    DoDrawLine(x3, y2, x2, y1);
+
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);
+}
+
+// ----------------------------------------------------------------------------
+// line/polygons
+// ----------------------------------------------------------------------------
+
+void wxDCBase::DrawLines(const wxList *list, wxCoord xoffset, wxCoord yoffset)
+{
+    int n = list->GetCount();
+    wxPoint *points = new wxPoint[n];
+
+    int i = 0;
+    for ( wxList::compatibility_iterator node = list->GetFirst(); node; node = node->GetNext(), i++ )
+    {
+        wxPoint *point = (wxPoint *)node->GetData();
+        points[i].x = point->x;
+        points[i].y = point->y;
+    }
+
+    DoDrawLines(n, points, xoffset, yoffset);
+
+    delete [] points;
+}
+
+
+void wxDCBase::DrawPolygon(const wxList *list,
+                           wxCoord xoffset, wxCoord yoffset,
+                           int fillStyle)
+{
+    int n = list->GetCount();
+    wxPoint *points = new wxPoint[n];
+
+    int i = 0;
+    for ( wxList::compatibility_iterator node = list->GetFirst(); node; node = node->GetNext(), i++ )
+    {
+        wxPoint *point = (wxPoint *)node->GetData();
+        points[i].x = point->x;
+        points[i].y = point->y;
+    }
+
+    DoDrawPolygon(n, points, xoffset, yoffset, fillStyle);
+
+    delete [] points;
+}
+
+void
+wxDCBase::DoDrawPolyPolygon(int n,
+                            int count[],
+                            wxPoint points[],
+                            wxCoord xoffset, wxCoord yoffset,
+                            int fillStyle)
+{
+    if ( n == 1 )
+    {
+        DoDrawPolygon(count[0], points, xoffset, yoffset, fillStyle);
+        return;
+    }
+
+    int      i, j, lastOfs;
+    wxPoint* pts;
+    wxPen    pen;
+
+    for (i = j = lastOfs = 0; i < n; i++)
+    {
+        lastOfs = j;
+        j      += count[i];
+    }
+    pts = new wxPoint[j+n-1];
+    for (i = 0; i < j; i++)
+        pts[i] = points[i];
+    for (i = 2; i <= n; i++)
+    {
+        lastOfs -= count[n-i];
+        pts[j++] = pts[lastOfs];
+    }
+
+    pen = GetPen();
+    SetPen(wxPen(*wxBLACK, 0, wxTRANSPARENT));
+    DoDrawPolygon(j, pts, xoffset, yoffset, fillStyle);
+    SetPen(pen);
+    for (i = j = 0; i < n; i++)
+    {
+        DoDrawLines(count[i], pts+j, xoffset, yoffset);
+        j += count[i];
+    }
+    delete[] pts;
+}
+
+// ----------------------------------------------------------------------------
+// splines
+// ----------------------------------------------------------------------------
+
+#if wxUSE_SPLINES
+
+// TODO: this API needs fixing (wxPointList, why (!const) "wxList *"?)
+void wxDCBase::DrawSpline(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord x3, wxCoord y3)
+{
+    wxList point_list;
+
+    wxPoint *point1 = new wxPoint;
+    point1->x = x1; point1->y = y1;
+    point_list.Append((wxObject*)point1);
+
+    wxPoint *point2 = new wxPoint;
+    point2->x = x2; point2->y = y2;
+    point_list.Append((wxObject*)point2);
+
+    wxPoint *point3 = new wxPoint;
+    point3->x = x3; point3->y = y3;
+    point_list.Append((wxObject*)point3);
+
+    DrawSpline(&point_list);
+
+    for( wxList::compatibility_iterator node = point_list.GetFirst(); node; node = node->GetNext() )
+    {
+        wxPoint *p = (wxPoint *)node->GetData();
+        delete p;
+    }
+}
+
+void wxDCBase::DrawSpline(int n, wxPoint points[])
+{
+    wxList list;
+    for (int i =0; i < n; i++)
+    {
+        list.Append((wxObject*)&points[i]);
+    }
+
+    DrawSpline(&list);
+}
+
+// ----------------------------------- spline code ----------------------------------------
+
+void wx_quadratic_spline(double a1, double b1, double a2, double b2,
+                         double a3, double b3, double a4, double b4);
+void wx_clear_stack();
+int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3,
+        double *y3, double *x4, double *y4);
+void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3,
+          double x4, double y4);
+static bool wx_spline_add_point(double x, double y);
+static void wx_spline_draw_point_array(wxDCBase *dc);
+
+wxList wx_spline_point_list;
+
+#define                half(z1, z2)        ((z1+z2)/2.0)
+#define                THRESHOLD        5
+
+/* iterative version */
+
+void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
+                 double b4)
+{
+    register double  xmid, ymid;
+    double           x1, y1, x2, y2, x3, y3, x4, y4;
+
+    wx_clear_stack();
+    wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
+
+    while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
+        xmid = (double)half(x2, x3);
+        ymid = (double)half(y2, y3);
+        if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD &&
+            fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) {
+            wx_spline_add_point( x1, y1 );
+            wx_spline_add_point( xmid, ymid );
+        } else {
+            wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3),
+                 (double)half(x3, x4), (double)half(y3, y4), x4, y4);
+            wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2),
+                 (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid);
+        }
+    }
+}
+
+/* utilities used by spline drawing routines */
+
+typedef struct wx_spline_stack_struct {
+    double           x1, y1, x2, y2, x3, y3, x4, y4;
+} Stack;
+
+#define         SPLINE_STACK_DEPTH             20
+static Stack    wx_spline_stack[SPLINE_STACK_DEPTH];
+static Stack   *wx_stack_top;
+static int      wx_stack_count;
+
+void wx_clear_stack()
+{
+    wx_stack_top = wx_spline_stack;
+    wx_stack_count = 0;
+}
+
+void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
+{
+    wx_stack_top->x1 = x1;
+    wx_stack_top->y1 = y1;
+    wx_stack_top->x2 = x2;
+    wx_stack_top->y2 = y2;
+    wx_stack_top->x3 = x3;
+    wx_stack_top->y3 = y3;
+    wx_stack_top->x4 = x4;
+    wx_stack_top->y4 = y4;
+    wx_stack_top++;
+    wx_stack_count++;
+}
+
+int wx_spline_pop(double *x1, double *y1, double *x2, double *y2,
+                  double *x3, double *y3, double *x4, double *y4)
+{
+    if (wx_stack_count == 0)
+        return (0);
+    wx_stack_top--;
+    wx_stack_count--;
+    *x1 = wx_stack_top->x1;
+    *y1 = wx_stack_top->y1;
+    *x2 = wx_stack_top->x2;
+    *y2 = wx_stack_top->y2;
+    *x3 = wx_stack_top->x3;
+    *y3 = wx_stack_top->y3;
+    *x4 = wx_stack_top->x4;
+    *y4 = wx_stack_top->y4;
+    return (1);
+}
+
+static bool wx_spline_add_point(double x, double y)
+{
+  wxPoint *point = new wxPoint ;
+  point->x = (int) x;
+  point->y = (int) y;
+  wx_spline_point_list.Append((wxObject*)point);
+  return true;
+}
+
+static void wx_spline_draw_point_array(wxDCBase *dc)
+{
+  dc->DrawLines(&wx_spline_point_list, 0, 0 );
+  wxList::compatibility_iterator node = wx_spline_point_list.GetFirst();
+  while (node)
+  {
+    wxPoint *point = (wxPoint *)node->GetData();
+    delete point;
+    wx_spline_point_list.Erase(node);
+    node = wx_spline_point_list.GetFirst();
+  }
+}
+
+void wxDCBase::DoDrawSpline( wxList *points )
+{
+    wxCHECK_RET( Ok(), wxT("invalid window dc") );
+
+    wxPoint *p;
+    double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
+    double           x1, y1, x2, y2;
+
+    wxList::compatibility_iterator node = points->GetFirst();
+    if (!node)
+        // empty list
+        return;
+
+    p = (wxPoint *)node->GetData();
+
+    x1 = p->x;
+    y1 = p->y;
+
+    node = node->GetNext();
+    p = (wxPoint *)node->GetData();
+
+    x2 = p->x;
+    y2 = p->y;
+    cx1 = (double)((x1 + x2) / 2);
+    cy1 = (double)((y1 + y2) / 2);
+    cx2 = (double)((cx1 + x2) / 2);
+    cy2 = (double)((cy1 + y2) / 2);
+
+    wx_spline_add_point(x1, y1);
+
+    while ((node = node->GetNext())
+#if !wxUSE_STL
+           != NULL
+#endif // !wxUSE_STL
+          )
+    {
+        p = (wxPoint *)node->GetData();
+        x1 = x2;
+        y1 = y2;
+        x2 = p->x;
+        y2 = p->y;
+        cx4 = (double)(x1 + x2) / 2;
+        cy4 = (double)(y1 + y2) / 2;
+        cx3 = (double)(x1 + cx4) / 2;
+        cy3 = (double)(y1 + cy4) / 2;
+
+        wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
+
+        cx1 = cx4;
+        cy1 = cy4;
+        cx2 = (double)(cx1 + x2) / 2;
+        cy2 = (double)(cy1 + y2) / 2;
+    }
+
+    wx_spline_add_point( cx1, cy1 );
+    wx_spline_add_point( x2, y2 );
+
+    wx_spline_draw_point_array( this );
+}
+
+#endif // wxUSE_SPLINES
+
+// ----------------------------------------------------------------------------
+// Partial Text Extents
+// ----------------------------------------------------------------------------
+
+
+// Each element of the widths array will be the width of the string up to and
+// including the corresponding character in text.  This is the generic
+// implementation, the port-specific classes should do this with native APIs
+// if available and if faster.  Note: pango_layout_index_to_pos is much slower
+// than calling GetTextExtent!!
+
+#define FWC_SIZE 256
+
+class FontWidthCache
+{
+public:
+    FontWidthCache() : m_scaleX(1), m_widths(NULL) { }
+    ~FontWidthCache() { delete []m_widths; }
+
+    void Reset()
+    {
+        if (!m_widths)
+            m_widths = new int[FWC_SIZE];
+
+        memset(m_widths, 0, sizeof(int)*FWC_SIZE);
+    }
+
+    wxFont m_font;
+    double m_scaleX;
+    int *m_widths;
+};
+
+static FontWidthCache s_fontWidthCache;
+
+bool wxDCBase::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+{
+    int totalWidth = 0;
+
+    const size_t len = text.length();
+    widths.Empty();
+    widths.Add(0, len);
+
+    // reset the cache if font or horizontal scale have changed
+    if ( !s_fontWidthCache.m_widths ||
+         !wxIsSameDouble(s_fontWidthCache.m_scaleX, m_scaleX) ||
+         (s_fontWidthCache.m_font != GetFont()) )
+    {
+        s_fontWidthCache.Reset();
+        s_fontWidthCache.m_font = GetFont();
+        s_fontWidthCache.m_scaleX = m_scaleX;
+    }
+
+    // Calculate the position of each character based on the widths of
+    // the previous characters
+    int w, h;
+    for ( size_t i = 0; i < len; i++ )
+    {
+        const wxChar c = text[i];
+        unsigned int c_int = (unsigned int)c;
+
+        if ((c_int < FWC_SIZE) && (s_fontWidthCache.m_widths[c_int] != 0))
+        {
+            w = s_fontWidthCache.m_widths[c_int];
+        }
+        else
+        {
+            GetTextExtent(c, &w, &h);
+            if (c_int < FWC_SIZE)
+                s_fontWidthCache.m_widths[c_int] = w;
+        }
+
+        totalWidth += w;
+        widths[i] = totalWidth;
+    }
+
+    return true;
+}
+
+
+// ----------------------------------------------------------------------------
+// enhanced text drawing
+// ----------------------------------------------------------------------------
+
+void wxDCBase::GetMultiLineTextExtent(const wxString& text,
+                                      wxCoord *x,
+                                      wxCoord *y,
+                                      wxCoord *h,
+                                      wxFont *font) const
+{
+    wxCoord widthTextMax = 0, widthLine,
+            heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
+
+    wxString curLine;
+    for ( const wxChar *pc = text; ; pc++ )
+    {
+        if ( *pc == _T('\n') || *pc == _T('\0') )
+        {
+            if ( curLine.empty() )
+            {
+                // we can't use GetTextExtent - it will return 0 for both width
+                // and height and an empty line should count in height
+                // calculation
+
+                // assume that this line has the same height as the previous
+                // one
+                if ( !heightLineDefault )
+                    heightLineDefault = heightLine;
+
+                if ( !heightLineDefault )
+                {
+                    // but we don't know it yet - choose something reasonable
+                    GetTextExtent(_T("W"), NULL, &heightLineDefault,
+                                  NULL, NULL, font);
+                }
+
+                heightTextTotal += heightLineDefault;
+            }
+            else
+            {
+                GetTextExtent(curLine, &widthLine, &heightLine,
+                              NULL, NULL, font);
+                if ( widthLine > widthTextMax )
+                    widthTextMax = widthLine;
+                heightTextTotal += heightLine;
+            }
+
+            if ( *pc == _T('\n') )
+            {
+               curLine.clear();
+            }
+            else
+            {
+               // the end of string
+               break;
+            }
+        }
+        else
+        {
+            curLine += *pc;
+        }
+    }
+
+    if ( x )
+        *x = widthTextMax;
+    if ( y )
+        *y = heightTextTotal;
+    if ( h )
+        *h = heightLine;
+}
+
+void wxDCBase::DrawLabel(const wxString& text,
+                         const wxBitmap& bitmap,
+                         const wxRect& rect,
+                         int alignment,
+                         int indexAccel,
+                         wxRect *rectBounding)
+{
+    // find the text position
+    wxCoord widthText, heightText, heightLine;
+    GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine);
+
+    wxCoord width, height;
+    if ( bitmap.Ok() )
+    {
+        width = widthText + bitmap.GetWidth();
+        height = bitmap.GetHeight();
+    }
+    else // no bitmap
+    {
+        width = widthText;
+        height = heightText;
+    }
+
+    wxCoord x, y;
+    if ( alignment & wxALIGN_RIGHT )
+    {
+        x = rect.GetRight() - width;
+    }
+    else if ( alignment & wxALIGN_CENTRE_HORIZONTAL )
+    {
+        x = (rect.GetLeft() + rect.GetRight() + 1 - width) / 2;
+    }
+    else // alignment & wxALIGN_LEFT
+    {
+        x = rect.GetLeft();
+    }
+
+    if ( alignment & wxALIGN_BOTTOM )
+    {
+        y = rect.GetBottom() - height;
+    }
+    else if ( alignment & wxALIGN_CENTRE_VERTICAL )
+    {
+        y = (rect.GetTop() + rect.GetBottom() + 1 - height) / 2;
+    }
+    else // alignment & wxALIGN_TOP
+    {
+        y = rect.GetTop();
+    }
+
+    // draw the bitmap first
+    wxCoord x0 = x,
+            y0 = y,
+            width0 = width;
+    if ( bitmap.Ok() )
+    {
+        DrawBitmap(bitmap, x, y, true /* use mask */);
+
+        wxCoord offset = bitmap.GetWidth() + 4;
+        x += offset;
+        width -= offset;
+
+        y += (height - heightText) / 2;
+    }
+
+    // we will draw the underscore under the accel char later
+    wxCoord startUnderscore = 0,
+            endUnderscore = 0,
+            yUnderscore = 0;
+
+    // split the string into lines and draw each of them separately
+    wxString curLine;
+    for ( const wxChar *pc = text; ; pc++ )
+    {
+        if ( *pc == _T('\n') || *pc == _T('\0') )
+        {
+            int xRealStart = x; // init it here to avoid compielr warnings
+
+            if ( !curLine.empty() )
+            {
+                // NB: can't test for !(alignment & wxALIGN_LEFT) because
+                //     wxALIGN_LEFT is 0
+                if ( alignment & (wxALIGN_RIGHT | wxALIGN_CENTRE_HORIZONTAL) )
+                {
+                    wxCoord widthLine;
+                    GetTextExtent(curLine, &widthLine, NULL);
+
+                    if ( alignment & wxALIGN_RIGHT )
+                    {
+                        xRealStart += width - widthLine;
+                    }
+                    else // if ( alignment & wxALIGN_CENTRE_HORIZONTAL )
+                    {
+                        xRealStart += (width - widthLine) / 2;
+                    }
+                }
+                //else: left aligned, nothing to do
+
+                DrawText(curLine, xRealStart, y);
+            }
+
+            y += heightLine;
+
+            // do we have underscore in this line? we can check yUnderscore
+            // because it is set below to just y + heightLine if we do
+            if ( y == yUnderscore )
+            {
+                // adjust the horz positions to account for the shift
+                startUnderscore += xRealStart;
+                endUnderscore += xRealStart;
+            }
+
+            if ( *pc == _T('\0') )
+                break;
+
+            curLine.clear();
+        }
+        else // not end of line
+        {
+            if ( pc - text.c_str() == indexAccel )
+            {
+                // remeber to draw underscore here
+                GetTextExtent(curLine, &startUnderscore, NULL);
+                curLine += *pc;
+                GetTextExtent(curLine, &endUnderscore, NULL);
+
+                yUnderscore = y + heightLine;
+            }
+            else
+            {
+                curLine += *pc;
+            }
+        }
+    }
+
+    // draw the underscore if found
+    if ( startUnderscore != endUnderscore )
+    {
+        // it should be of the same colour as text
+        SetPen(wxPen(GetTextForeground(), 0, wxSOLID));
+
+        yUnderscore--;
+
+        DrawLine(startUnderscore, yUnderscore, endUnderscore, yUnderscore);
+    }
+
+    // return bounding rect if requested
+    if ( rectBounding )
+    {
+        *rectBounding = wxRect(x, y - heightText, widthText, heightText);
+    }
+
+    CalcBoundingBox(x0, y0);
+    CalcBoundingBox(x0 + width0, y0 + height);
+}
+
+
+void wxDCBase::DoGradientFillLinear(const wxRect& rect,
+                                    const wxColour& initialColour,
+                                    const wxColour& destColour,
+                                    wxDirection nDirection)
+{
+    // save old pen
+    wxPen oldPen = m_pen;
+    wxBrush oldBrush = m_brush;
+
+    wxUint8 nR1 = initialColour.Red();
+    wxUint8 nG1 = initialColour.Green();
+    wxUint8 nB1 = initialColour.Blue();
+    wxUint8 nR2 = destColour.Red();
+    wxUint8 nG2 = destColour.Green();
+    wxUint8 nB2 = destColour.Blue();
+    wxUint8 nR, nG, nB;
+
+    if ( nDirection == wxEAST || nDirection == wxWEST )
+    {
+        wxInt32 x = rect.GetWidth();
+        wxInt32 w = x;              // width of area to shade
+        wxInt32 xDelta = w/256;     // height of one shade bend
+        if (xDelta < 1)
+            xDelta = 1;
+
+        while (x >= xDelta)
+        {
+            x -= xDelta;
+            if (nR1 > nR2)
+                nR = nR1 - (nR1-nR2)*(w-x)/w;
+            else
+                nR = nR1 + (nR2-nR1)*(w-x)/w;
+
+            if (nG1 > nG2)
+                nG = nG1 - (nG1-nG2)*(w-x)/w;
+            else
+                nG = nG1 + (nG2-nG1)*(w-x)/w;
+
+            if (nB1 > nB2)
+                nB = nB1 - (nB1-nB2)*(w-x)/w;
+            else
+                nB = nB1 + (nB2-nB1)*(w-x)/w;
+
+            wxColour colour(nR,nG,nB);
+            SetPen(wxPen(colour, 1, wxSOLID));
+            SetBrush(wxBrush(colour));
+            if(nDirection == wxEAST)
+                DrawRectangle(rect.GetRight()-x-xDelta+1, rect.GetTop(),
+                        xDelta, rect.GetHeight());
+            else //nDirection == wxWEST
+                DrawRectangle(rect.GetLeft()+x, rect.GetTop(),
+                        xDelta, rect.GetHeight());
+        }
+    }
+    else  // nDirection == wxNORTH || nDirection == wxSOUTH
+    {
+        wxInt32 y = rect.GetHeight();
+        wxInt32 w = y;              // height of area to shade
+        wxInt32 yDelta = w/255;     // height of one shade bend
+        if (yDelta < 1)
+            yDelta = 1;
+
+        while (y > 0)
+        {
+            y -= yDelta;
+            if (nR1 > nR2)
+                nR = nR1 - (nR1-nR2)*(w-y)/w;
+            else
+                nR = nR1 + (nR2-nR1)*(w-y)/w;
+
+            if (nG1 > nG2)
+                nG = nG1 - (nG1-nG2)*(w-y)/w;
+            else
+                nG = nG1 + (nG2-nG1)*(w-y)/w;
+
+            if (nB1 > nB2)
+                nB = nB1 - (nB1-nB2)*(w-y)/w;
+            else
+                nB = nB1 + (nB2-nB1)*(w-y)/w;
+
+            wxColour colour(nR,nG,nB);
+            SetPen(wxPen(colour, 1, wxSOLID));
+            SetBrush(wxBrush(colour));
+            if(nDirection == wxNORTH)
+                DrawRectangle(rect.GetLeft(), rect.GetTop()+y,
+                        rect.GetWidth(), yDelta);
+            else //nDirection == wxSOUTH
+                DrawRectangle(rect.GetLeft(), rect.GetBottom()-y-yDelta+1,
+                        rect.GetWidth(), yDelta);
+        }
+    }
+
+    SetPen(oldPen);
+    SetBrush(oldBrush);
+}
+
+void wxDCBase::DoGradientFillConcentric(const wxRect& rect,
+                                      const wxColour& initialColour,
+                                      const wxColour& destColour,
+                                      const wxPoint& circleCenter)
+{
+    //save the old pen color
+    wxColour oldPenColour = m_pen.GetColour();
+
+    wxUint8 nR1 = destColour.Red();
+    wxUint8 nG1 = destColour.Green();
+    wxUint8 nB1 = destColour.Blue();
+    wxUint8 nR2 = initialColour.Red();
+    wxUint8 nG2 = initialColour.Green();
+    wxUint8 nB2 = initialColour.Blue();
+    wxUint8 nR, nG, nB;
+
+
+    //Radius
+    wxInt32 cx = rect.GetWidth() / 2;
+    wxInt32 cy = rect.GetHeight() / 2;
+    wxInt32 nRadius;
+    if (cx < cy)
+        nRadius = cx;
+    else
+        nRadius = cy;
+
+    //Offset of circle
+    wxInt32 nCircleOffX = circleCenter.x - (rect.GetWidth() / 2);
+    wxInt32 nCircleOffY = circleCenter.y - (rect.GetHeight() / 2);
+
+    for ( wxInt32 x = 0; x < rect.GetWidth(); x++ )
+    {
+        for ( wxInt32 y = 0; y < rect.GetHeight(); y++ )
+        {
+            //get color difference
+            wxInt32 nGradient = ((nRadius -
+                                  (wxInt32)sqrt(
+                                    pow((double)(x - cx - nCircleOffX), 2) +
+                                    pow((double)(y - cy - nCircleOffY), 2)
+                                  )) * 100) / nRadius;
+
+            //normalize Gradient
+            if (nGradient < 0 )
+                nGradient = 0;
+
+            //get dest colors
+            nR = (wxUint8)(nR1 + ((nR2 - nR1) * nGradient / 100));
+            nG = (wxUint8)(nG1 + ((nG2 - nG1) * nGradient / 100));
+            nB = (wxUint8)(nB1 + ((nB2 - nB1) * nGradient / 100));
+
+            //set the pixel
+            m_pen.SetColour(wxColour(nR,nG,nB));
+            DrawPoint(wxPoint(x + rect.GetLeft(), y + rect.GetTop()));
+        }
+    }
+    //return old pen color
+    m_pen.SetColour(oldPenColour);
+}
+
+/*
+Notes for wxWidgets DrawEllipticArcRot(...)
+
+wxDCBase::DrawEllipticArcRot(...) draws a rotated elliptic arc or an ellipse.
+It uses wxDCBase::CalculateEllipticPoints(...) and wxDCBase::Rotate(...),
+which are also new.
+
+All methods are generic, so they can be implemented in wxDCBase.
+DoDrawEllipticArcRot(...) is virtual, so it can be called from deeper
+methods like (WinCE) wxDC::DoDrawArc(...).
+
+CalculateEllipticPoints(...) fills a given list of wxPoints with some points
+of an elliptic arc. The algorithm is pixel-based: In every row (in flat
+parts) or every column (in steep parts) only one pixel is calculated.
+Trigonometric calculation (sin, cos, tan, atan) is only done if the
+starting angle is not equal to the ending angle. The calculation of the
+pixels is done using simple arithmetic only and should perform not too
+bad even on devices without floating point processor. I didn't test this yet.
+
+Rotate(...) rotates a list of point pixel-based, you will see rounding errors.
+For instance: an ellipse rotated 180 degrees is drawn
+slightly different from the original.
+
+The points are then moved to an array and used to draw a polyline and/or polygon
+(with center added, the pie).
+The result looks quite similar to the native ellipse, only e few pixels differ.
+
+The performance on a desktop system (Athlon 1800, WinXP) is about 7 times
+slower as DrawEllipse(...), which calls the native API.
+An rotated ellipse outside the clipping region takes nearly the same time,
+while an native ellipse outside takes nearly no time to draw.
+
+If you draw an arc with this new method, you will see the starting and ending angles
+are calculated properly.
+If you use DrawEllipticArc(...), you will see they are only correct for circles
+and not properly calculated for ellipses.
+
+Peter Lenhard
+p.lenhard@t-online.de
+*/
+
+#ifdef __WXWINCE__
+void wxDCBase::DoDrawEllipticArcRot( wxCoord x, wxCoord y,
+                                     wxCoord w, wxCoord h,
+                                     double sa, double ea, double angle )
+{
+    wxList list;
+
+    CalculateEllipticPoints( &list, x, y, w, h, sa, ea );
+    Rotate( &list, angle, wxPoint( x+w/2, y+h/2 ) );
+
+    // Add center (for polygon/pie)
+    list.Append( (wxObject*) new wxPoint( x+w/2, y+h/2 ) );
+
+    // copy list into array and delete list elements
+    int n = list.GetCount();
+    wxPoint *points = new wxPoint[n];
+    int i = 0;
+    wxNode* node = 0;
+    for ( node = list.GetFirst(); node; node = node->GetNext(), i++ )
+    {
+        wxPoint *point = (wxPoint *)node->GetData();
+        points[i].x = point->x;
+        points[i].y = point->y;
+        delete point;
+    }
+
+    // first draw the pie without pen, if necessary
+    if( GetBrush() != *wxTRANSPARENT_BRUSH )
+    {
+        wxPen tempPen( GetPen() );
+        SetPen( *wxTRANSPARENT_PEN );
+        DoDrawPolygon( n, points, 0, 0 );
+        SetPen( tempPen );
+    }
+
+    // then draw the arc without brush, if necessary
+    if( GetPen() != *wxTRANSPARENT_PEN )
+    {
+        // without center
+        DoDrawLines( n-1, points, 0, 0 );
+    }
+
+    delete [] points;
+
+} // DrawEllipticArcRot
+
+void wxDCBase::Rotate( wxList* points, double angle, wxPoint center )
+{
+    if( angle != 0.0 )
+    {
+        double pi(M_PI);
+        double dSinA = -sin(angle*2.0*pi/360.0);
+        double dCosA = cos(angle*2.0*pi/360.0);
+        for ( wxNode* node = points->GetFirst(); node; node = node->GetNext() )
+        {
+            wxPoint* point = (wxPoint*)node->GetData();
+
+            // transform coordinates, if necessary
+            if( center.x ) point->x -= center.x;
+            if( center.y ) point->y -= center.y;
+
+            // calculate rotation, rounding simply by implicit cast to integer
+            int xTemp = point->x * dCosA - point->y * dSinA;
+            point->y = point->x * dSinA + point->y * dCosA;
+            point->x = xTemp;
+
+            // back transform coordinates, if necessary
+            if( center.x ) point->x += center.x;
+            if( center.y ) point->y += center.y;
+        }
+    }
+}
+
+void wxDCBase::CalculateEllipticPoints( wxList* points,
+                                        wxCoord xStart, wxCoord yStart,
+                                        wxCoord w, wxCoord h,
+                                        double sa, double ea )
+{
+    double pi = M_PI;
+    double sar = 0;
+    double ear = 0;
+    int xsa = 0;
+    int ysa = 0;
+    int xea = 0;
+    int yea = 0;
+    int sq = 0;
+    int eq = 0;
+    bool bUseAngles = false;
+    if( w<0 ) w = -w;
+    if( h<0 ) h = -h;
+    // half-axes
+    wxCoord a = w/2;
+    wxCoord b = h/2;
+    // decrement 1 pixel if ellipse is smaller than 2*a, 2*b
+    int decrX = 0;
+    if( 2*a == w ) decrX = 1;
+    int decrY = 0;
+    if( 2*b == h ) decrY = 1;
+    // center
+    wxCoord xCenter = xStart + a;
+    wxCoord yCenter = yStart + b;
+    // calculate data for start and end, if necessary
+    if( sa != ea )
+    {
+        bUseAngles = true;
+        // normalisation of angles
+        while( sa<0 ) sa += 360;
+        while( ea<0 ) ea += 360;
+        while( sa>=360 ) sa -= 360;
+        while( ea>=360 ) ea -= 360;
+        // calculate quadrant numbers
+        if( sa > 270 ) sq = 3;
+        else if( sa > 180 ) sq = 2;
+        else if( sa > 90 ) sq = 1;
+        if( ea > 270 ) eq = 3;
+        else if( ea > 180 ) eq = 2;
+        else if( ea > 90 ) eq = 1;
+        sar = sa * pi / 180.0;
+        ear = ea * pi / 180.0;
+        // correct angle circle -> ellipse
+        sar = atan( -a/(double)b * tan( sar ) );
+        if ( sq == 1 || sq == 2 ) sar += pi;
+        ear = atan( -a/(double)b * tan( ear ) );
+        if ( eq == 1 || eq == 2 ) ear += pi;
+        // coordinates of points
+        xsa = xCenter + a * cos( sar );
+        if( sq == 0 || sq == 3 ) xsa -= decrX;
+        ysa = yCenter + b * sin( sar );
+        if( sq == 2 || sq == 3 ) ysa -= decrY;
+        xea = xCenter + a * cos( ear );
+        if( eq == 0 || eq == 3 ) xea -= decrX;
+        yea = yCenter + b * sin( ear );
+        if( eq == 2 || eq == 3 ) yea -= decrY;
+    } // if iUseAngles
+    // calculate c1 = b^2, c2 = b^2/a^2 with a = w/2, b = h/2
+    double c1 = b * b;
+    double c2 = 2.0 / w;
+    c2 *= c2;
+    c2 *= c1;
+    wxCoord x = 0;
+    wxCoord y = b;
+    long x2 = 1;
+    long y2 = y*y;
+    long y2_old = 0;
+    long y_old = 0;
+    // Lists for quadrant 1 to 4
+    wxList pointsarray[4];
+    // Calculate points for first quadrant and set in all quadrants
+    for( x = 0; x <= a; ++x )
+    {
+        x2 = x2+x+x-1;
+        y2_old = y2;
+        y_old = y;
+        bool bNewPoint = false;
+        while( y2 > c1 - c2 * x2 && y > 0 )
+        {
+            bNewPoint = true;
+            y2 = y2-y-y+1;
+            --y;
+        }
+        // old y now to big: set point with old y, old x
+        if( bNewPoint && x>1)
+        {
+            int x1 = x - 1;
+            // remove points on the same line
+            pointsarray[0].Insert( (wxObject*) new wxPoint( xCenter + x1 - decrX, yCenter - y_old ) );
+            pointsarray[1].Append( (wxObject*) new wxPoint( xCenter - x1, yCenter - y_old ) );
+            pointsarray[2].Insert( (wxObject*) new wxPoint( xCenter - x1, yCenter + y_old - decrY ) );
+            pointsarray[3].Append( (wxObject*) new wxPoint( xCenter + x1 - decrX, yCenter + y_old - decrY ) );
+        } // set point
+    } // calculate point
+
+    // Starting and/or ending points for the quadrants, first quadrant gets both.
+    pointsarray[0].Insert( (wxObject*) new wxPoint( xCenter + a - decrX, yCenter ) );
+    pointsarray[0].Append( (wxObject*) new wxPoint( xCenter, yCenter - b ) );
+    pointsarray[1].Append( (wxObject*) new wxPoint( xCenter - a, yCenter ) );
+    pointsarray[2].Append( (wxObject*) new wxPoint( xCenter, yCenter + b - decrY ) );
+    pointsarray[3].Append( (wxObject*) new wxPoint( xCenter + a - decrX, yCenter ) );
+
+    // copy quadrants in original list
+    if( bUseAngles )
+    {
+        // Copy the right part of the points in the lists
+        // and delete the wxPoints, because they do not leave this method.
+        points->Append( (wxObject*) new wxPoint( xsa, ysa ) );
+        int q = sq;
+        bool bStarted = false;
+        bool bReady = false;
+        bool bForceTurn = ( sq == eq && sa > ea );
+        while( !bReady )
+        {
+            for( wxNode *node = pointsarray[q].GetFirst(); node; node = node->GetNext() )
+            {
+                // once: go to starting point in start quadrant
+                if( !bStarted &&
+                    (
+                      ( (wxPoint*) node->GetData() )->x < xsa+1 && q <= 1
+                      ||
+                      ( (wxPoint*) node->GetData() )->x > xsa-1 && q >= 2
+                    )
+                  )
+                {
+                    bStarted = true;
+                }
+
+                // copy point, if not at ending point
+                if( bStarted )
+                {
+                    if( q != eq || bForceTurn
+                        ||
+                        ( (wxPoint*) node->GetData() )->x > xea+1 && q <= 1
+                        ||
+                        ( (wxPoint*) node->GetData() )->x < xea-1 && q >= 2
+                      )
+                    {
+                        // copy point
+                        wxPoint* pPoint = new wxPoint( *((wxPoint*) node->GetData() ) );
+                        points->Append( (wxObject*) pPoint );
+                    }
+                    else if( q == eq && !bForceTurn || ( (wxPoint*) node->GetData() )->x == xea)
+                    {
+                        bReady = true;
+                    }
+                }
+            } // for node
+            ++q;
+            if( q > 3 ) q = 0;
+            bForceTurn = false;
+            bStarted = true;
+        } // while not bReady
+        points->Append( (wxObject*) new wxPoint( xea, yea ) );
+
+        // delete points
+        for( q = 0; q < 4; ++q )
+        {
+            for( wxNode *node = pointsarray[q].GetFirst(); node; node = node->GetNext() )
+            {
+                wxPoint *p = (wxPoint *)node->GetData();
+                delete p;
+            }
+        }
+    }
+    else
+    {
+        wxNode* node;
+        // copy whole ellipse, wxPoints will be deleted outside
+        for( node = pointsarray[0].GetFirst(); node; node = node->GetNext() )
+        {
+            wxObject *p = node->GetData();
+            points->Append( p );
+        }
+        for( node = pointsarray[1].GetFirst(); node; node = node->GetNext() )
+        {
+            wxObject *p = node->GetData();
+            points->Append( p );
+        }
+        for( node = pointsarray[2].GetFirst(); node; node = node->GetNext() )
+        {
+            wxObject *p = node->GetData();
+            points->Append( p );
+        }
+        for( node = pointsarray[3].GetFirst(); node; node = node->GetNext() )
+        {
+            wxObject *p = node->GetData();
+            points->Append( p );
+        }
+    } // not iUseAngles
+} // CalculateEllipticPoints
+
+#endif
+
+
+float wxDCBase::GetFontPointSizeAdjustment(float dpi)
+{
+    // wxMSW has long-standing bug where wxFont point size is interpreted as
+    // "pixel size corresponding to given point size *on screen*". In other
+    // words, on a typical 600dpi printer and a typical 96dpi screen, fonts
+    // are ~6 times smaller when printing. Unfortunately, this bug is so severe
+    // that *all* printing code has to account for it and consequently, other
+    // ports need to emulate this bug too:
+    const wxSize screenPixels = wxGetDisplaySize();
+    const wxSize screenMM = wxGetDisplaySizeMM();
+    const float screenPPI_y = (screenPixels.y * 25.4) / screenMM.y;
+    return screenPPI_y / dpi;
+}
diff --git a/Source/3rd Party/wx/src/common/dcbufcmn.cpp b/Source/3rd Party/wx/src/common/dcbufcmn.cpp
index a43f91f47..3ac28eae9 100644
--- a/Source/3rd Party/wx/src/common/dcbufcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/dcbufcmn.cpp	
@@ -1,166 +1,95 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dcbufcmn.cpp
-// Purpose:     Buffered DC implementation
-// Author:      Ron Lee, Jaakko Salli
-// Modified by:
-// Created:     Sep-20-2006
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/dcbuffer.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/module.h"
-#endif
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-IMPLEMENT_DYNAMIC_CLASS(wxBufferedDC,wxMemoryDC)
-IMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC,wxBufferedDC)
-
-// ----------------------------------------------------------------------------
-// wxSharedDCBufferManager: helper class maintaining backing store bitmap
-// ----------------------------------------------------------------------------
-
-class wxSharedDCBufferManager : public wxModule
-{
-public:
-    wxSharedDCBufferManager() { }
-
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDELETE(ms_buffer); }
-
-    static wxBitmap* GetBuffer(int w, int h)
-    {
-        if ( ms_usingSharedBuffer )
-            return new wxBitmap(w, h);
-
-        if ( !ms_buffer ||
-                w > ms_buffer->GetWidth() ||
-                    h > ms_buffer->GetHeight() )
-        {
-            delete ms_buffer;
-
-            // we must always return a valid bitmap but creating a bitmap of
-            // size 0 would fail, so create a 1*1 bitmap in this case
-            if ( !w )
-                w = 1;
-            if ( !h )
-                h = 1;
-
-            ms_buffer = new wxBitmap(w, h);
-        }
-
-        ms_usingSharedBuffer = true;
-        return ms_buffer;
-    }
-
-    static void ReleaseBuffer(wxBitmap* buffer)
-    {
-        if ( buffer == ms_buffer )
-        {
-            wxASSERT_MSG( ms_usingSharedBuffer, wxT("shared buffer already released") );
-            ms_usingSharedBuffer = false;
-        }
-        else
-        {
-            delete buffer;
-        }
-    }
-
-private:
-    static wxBitmap *ms_buffer;
-    static bool ms_usingSharedBuffer;
-
-    DECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager)
-};
-
-wxBitmap* wxSharedDCBufferManager::ms_buffer = NULL;
-bool wxSharedDCBufferManager::ms_usingSharedBuffer = false;
-
-IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
-
-// ============================================================================
-// wxBufferedDC
-// ============================================================================
-
-void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
-{
-    wxCHECK_RET( w >= -1 && h >= -1, "Invalid buffer size" );
-
-    if ( !m_buffer || !m_buffer->IsOk() )
-    {
-        if ( w == -1 || h == -1 )
-            m_dc->GetSize(&w, &h);
-
-        m_buffer = wxSharedDCBufferManager::GetBuffer(w, h);
-        m_style |= wxBUFFER_USES_SHARED_BUFFER;
-        m_area.Set(w,h);
-    }
-    else
-        m_area = m_buffer->GetSize();
-
-    SelectObject(*m_buffer);
-
-    // now that the DC is valid we can inherit the attributes (fonts, colours,
-    // layout direction, ...) from the original DC
-    if ( m_dc && m_dc->IsOk() )
-        CopyAttributes(*m_dc);
-}
-
-void wxBufferedDC::UnMask()
-{
-    wxCHECK_RET( m_dc, wxT("no underlying wxDC?") );
-    wxASSERT_MSG( m_buffer && m_buffer->IsOk(), wxT("invalid backing store") );
-
-    wxCoord x = 0,
-            y = 0;
-
-    // Ensure the scale matches the device
-    SetUserScale(1.0, 1.0);
-
-    if ( m_style & wxBUFFER_CLIENT_AREA )
-        GetDeviceOrigin(&x, &y);
-
-    // It's possible that the buffer may be bigger than the area that needs to
-    // be drawn (the client size of the window is smaller than the bitmap, or
-    // a shared bitmap has been reused for a smaller area, etc.) so avoid
-    // blitting too much if possible, but only use the real DC size if the
-    // wxBUFFER_VIRTUAL_AREA style is not set.
-    int width = m_area.GetWidth(),
-        height = m_area.GetHeight();
-
-    if (! m_style & wxBUFFER_VIRTUAL_AREA)
-    {
-        int widthDC,
-            heightDC;
-        m_dc->GetSize(&widthDC, &heightDC);
-        width = wxMin(width, widthDC);
-        height = wxMin(height, heightDC);
-    }
-
-    m_dc->Blit(0, 0, width, height, this, -x, -y);
-    m_dc = NULL;
-
-    if ( m_style & wxBUFFER_USES_SHARED_BUFFER )
-        wxSharedDCBufferManager::ReleaseBuffer(m_buffer);
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dcbufcmn.cpp
+// Purpose:     Buffered DC implementation
+// Author:      Ron Lee, Jaakko Salli
+// Modified by:
+// Created:     Sep-20-2006
+// RCS-ID:      $Id: dcbufcmn.cpp 52152 2008-02-27 18:03:12Z VZ $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/dcbuffer.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/module.h"
+#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxSharedDCBufferManager: helper class maintaining backing store bitmap
+// ----------------------------------------------------------------------------
+
+class wxSharedDCBufferManager : public wxModule
+{
+public:
+    wxSharedDCBufferManager() { }
+
+    virtual bool OnInit() { return true; }
+    virtual void OnExit() { wxDELETE(ms_buffer); }
+
+    static wxBitmap* GetBuffer(int w, int h)
+    {
+        if ( !ms_buffer ||
+                w > ms_buffer->GetWidth() ||
+                    h > ms_buffer->GetHeight() )
+        {
+            delete ms_buffer;
+
+            // we must always return a valid bitmap but creating a bitmap of
+            // size 0 would fail, so create a 1*1 bitmap in this case
+            if ( !w )
+                w = 1;
+            if ( !h )
+                h = 1;
+
+            ms_buffer = new wxBitmap(w, h);
+        }
+        return ms_buffer;
+    }
+
+private:
+    static wxBitmap *ms_buffer;
+
+    DECLARE_DYNAMIC_CLASS(wxSharedDCBufferManager)
+};
+
+wxBitmap* wxSharedDCBufferManager::ms_buffer = NULL;
+
+IMPLEMENT_DYNAMIC_CLASS(wxSharedDCBufferManager, wxModule)
+
+// ============================================================================
+// wxBufferedDC
+// ============================================================================
+
+void wxBufferedDC::UseBuffer(wxCoord w, wxCoord h)
+{
+    if ( !m_buffer || !m_buffer->IsOk() )
+    {
+        if ( w == -1 || h == -1 )
+            m_dc->GetSize(&w, &h);
+
+        m_buffer = wxSharedDCBufferManager::GetBuffer(w, h);
+    }
+
+    SelectObject(*m_buffer);
+}
+
diff --git a/Source/3rd Party/wx/src/common/dcgraph.cpp b/Source/3rd Party/wx/src/common/dcgraph.cpp
index f5547d93d..c9d5e11fe 100644
--- a/Source/3rd Party/wx/src/common/dcgraph.cpp	
+++ b/Source/3rd Party/wx/src/common/dcgraph.cpp	
@@ -1,1166 +1,1034 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dcgraph.cpp
-// Purpose:     graphics context methods common to all platforms
-// Author:      Stefan Csomor
-// Modified by:
-// Created:
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#if defined(__BORLANDC__)
-    #pragma hdrstop
-#endif
-
-#if wxUSE_GRAPHICS_CONTEXT
-
-#include "wx/graphics.h"
-#include "wx/dcgraph.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/icon.h"
-    #include "wx/bitmap.h"
-    #include "wx/dcmemory.h"
-    #include "wx/region.h"
-#endif
-
-#include "wx/dcclient.h"
-
-#ifdef __WXOSX_OR_COCOA__
-#ifdef __WXOSX_IPHONE__
-    #include <CoreGraphics/CoreGraphics.h>
-#else
-    #include <ApplicationServices/ApplicationServices.h>
-#endif
-#endif
-
-#include <limits.h>     // for INT_MAX
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-static const double RAD2DEG = 180.0 / M_PI;
-
-//-----------------------------------------------------------------------------
-// Local functions
-//-----------------------------------------------------------------------------
-
-static inline double DegToRad(double deg)
-{
-    return (deg * M_PI) / 180.0;
-}
-
-static wxCompositionMode TranslateRasterOp(wxRasterOperationMode function)
-{
-    switch ( function )
-    {
-        case wxCOPY: // src
-            // since we are supporting alpha, _OVER is closer to the intention than _SOURCE
-            // since the latter would overwrite even when alpha is not set to opaque
-            return wxCOMPOSITION_OVER;
-
-        case wxOR:         // src OR dst
-            return wxCOMPOSITION_ADD;
-
-        case wxNO_OP:      // dst
-            return wxCOMPOSITION_DEST; // ignore the source
-
-        case wxCLEAR:      // 0
-            return wxCOMPOSITION_CLEAR;// clear dst
-
-        case wxXOR:        // src XOR dst
-            return wxCOMPOSITION_XOR;
-
-        case wxAND:        // src AND dst
-        case wxAND_INVERT: // (NOT src) AND dst
-        case wxAND_REVERSE:// src AND (NOT dst)
-        case wxEQUIV:      // (NOT src) XOR dst
-        case wxINVERT:     // NOT dst
-        case wxNAND:       // (NOT src) OR (NOT dst)
-        case wxNOR:        // (NOT src) AND (NOT dst)
-        case wxOR_INVERT:  // (NOT src) OR dst
-        case wxOR_REVERSE: // src OR (NOT dst)
-        case wxSET:        // 1
-        case wxSRC_INVERT: // NOT src
-            break;
-    }
-
-    return wxCOMPOSITION_INVALID;
-}
-
-//-----------------------------------------------------------------------------
-// wxDC bridge class
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxGCDC, wxDC)
-
-wxGCDC::wxGCDC(const wxWindowDC& dc) :
-  wxDC( new wxGCDCImpl( this, dc ) )
-{
-}
-
-wxGCDC::wxGCDC( const wxMemoryDC& dc) :
-  wxDC( new wxGCDCImpl( this, dc ) )
-{
-}
-
-#if wxUSE_PRINTING_ARCHITECTURE
-wxGCDC::wxGCDC( const wxPrinterDC& dc) :
-  wxDC( new wxGCDCImpl( this, dc ) )
-{
-}
-#endif
-
-#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
-wxGCDC::wxGCDC(const wxEnhMetaFileDC& dc)
-   : wxDC(new wxGCDCImpl(this, dc))
-{
-}
-#endif
-
-wxGCDC::wxGCDC(wxGraphicsContext* context) :
-    wxDC( new wxGCDCImpl( this ) )
-{
-    SetGraphicsContext(context);
-}
-
-wxGCDC::wxGCDC() :
-  wxDC( new wxGCDCImpl( this ) )
-{
-}
-
-wxGCDC::~wxGCDC()
-{
-}
-
-wxGraphicsContext* wxGCDC::GetGraphicsContext() const
-{
-    if (!m_pimpl) return NULL;
-    wxGCDCImpl *gc_impl = (wxGCDCImpl*) m_pimpl;
-    return gc_impl->GetGraphicsContext();
-}
-
-void wxGCDC::SetGraphicsContext( wxGraphicsContext* ctx )
-{
-    if (!m_pimpl) return;
-    wxGCDCImpl *gc_impl = (wxGCDCImpl*) m_pimpl;
-    gc_impl->SetGraphicsContext( ctx );
-}
-
-IMPLEMENT_ABSTRACT_CLASS(wxGCDCImpl, wxDCImpl)
-
-wxGCDCImpl::wxGCDCImpl( wxDC *owner ) :
-   wxDCImpl( owner )
-{
-    Init();
-}
-
-void wxGCDCImpl::SetGraphicsContext( wxGraphicsContext* ctx )
-{
-    delete m_graphicContext;
-    m_graphicContext = ctx;
-    if ( m_graphicContext )
-    {
-        m_matrixOriginal = m_graphicContext->GetTransform();
-        m_ok = true;
-        // apply the stored transformations to the passed in context
-        ComputeScaleAndOrigin();
-        m_graphicContext->SetFont( m_font , m_textForegroundColour );
-        m_graphicContext->SetPen( m_pen );
-        m_graphicContext->SetBrush( m_brush);
-    }
-}
-
-wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxWindowDC& dc ) :
-   wxDCImpl( owner )
-{
-    Init();
-    SetGraphicsContext( wxGraphicsContext::Create(dc) );
-    m_window = dc.GetWindow();
-}
-
-wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc ) :
-   wxDCImpl( owner )
-{
-    Init();
-    wxGraphicsContext* context;
-    context = wxGraphicsContext::Create(dc);
-    SetGraphicsContext( context );
-}
-
-#if wxUSE_PRINTING_ARCHITECTURE
-wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
-   wxDCImpl( owner )
-{
-    Init();
-    SetGraphicsContext( wxGraphicsContext::Create(dc) );
-}
-#endif
-
-#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
-wxGCDCImpl::wxGCDCImpl(wxDC *owner, const wxEnhMetaFileDC& dc)
-   : wxDCImpl(owner)
-{
-    Init();
-    SetGraphicsContext(wxGraphicsContext::Create(dc));
-}
-#endif
-
-void wxGCDCImpl::Init()
-{
-    m_ok = false;
-    m_colour = true;
-    m_mm_to_pix_x = mm2pt;
-    m_mm_to_pix_y = mm2pt;
-
-    m_pen = *wxBLACK_PEN;
-    m_font = *wxNORMAL_FONT;
-    m_brush = *wxWHITE_BRUSH;
-
-    m_graphicContext = wxGraphicsContext::Create();
-    m_logicalFunctionSupported = true;
-}
-
-
-wxGCDCImpl::~wxGCDCImpl()
-{
-    delete m_graphicContext;
-}
-
-void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y,
-                               bool useMask )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid DC") );
-    wxCHECK_RET( bmp.IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid bitmap") );
-
-    int w = bmp.GetWidth();
-    int h = bmp.GetHeight();
-    if ( bmp.GetDepth() == 1 )
-    {
-        m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
-        m_graphicContext->SetBrush( wxBrush( m_textBackgroundColour , wxSOLID ) );
-        m_graphicContext->DrawRectangle( x, y, w, h );
-        m_graphicContext->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) );
-        m_graphicContext->DrawBitmap( bmp, x, y, w, h );
-        m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush));
-        m_graphicContext->SetPen( m_graphicContext->CreatePen(m_pen));
-    }
-    else // not a monochrome bitmap, handle it normally
-    {
-        // make a copy in case we need to remove its mask, if we don't modify
-        // it the copy is cheap as bitmaps are reference-counted
-        wxBitmap bmpCopy(bmp);
-        if ( !useMask && bmp.GetMask() )
-            bmpCopy.SetMask(NULL);
-
-        m_graphicContext->DrawBitmap( bmpCopy, x, y, w, h );
-    }
-}
-
-void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawIcon - invalid DC") );
-    wxCHECK_RET( icon.IsOk(), wxT("wxGCDC(cg)::DoDrawIcon - invalid icon") );
-
-    wxCoord w = icon.GetWidth();
-    wxCoord h = icon.GetHeight();
-
-    m_graphicContext->DrawIcon( icon , x, y, w, h );
-}
-
-bool wxGCDCImpl::StartDoc( const wxString& WXUNUSED(message) )
-{
-    return true;
-}
-
-void wxGCDCImpl::EndDoc()
-{
-}
-
-void wxGCDCImpl::StartPage()
-{
-}
-
-void wxGCDCImpl::EndPage()
-{
-}
-
-void wxGCDCImpl::Flush()
-{
-    m_graphicContext->Flush();
-}
-
-void wxGCDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetClippingRegion - invalid DC") );
-
-    m_graphicContext->Clip( x, y, w, h );
-    if ( m_clipping )
-    {
-        m_clipX1 = wxMax( m_clipX1, x );
-        m_clipY1 = wxMax( m_clipY1, y );
-        m_clipX2 = wxMin( m_clipX2, (x + w) );
-        m_clipY2 = wxMin( m_clipY2, (y + h) );
-    }
-    else
-    {
-        m_clipping = true;
-
-        m_clipX1 = x;
-        m_clipY1 = y;
-        m_clipX2 = x + w;
-        m_clipY2 = y + h;
-    }
-}
-
-void wxGCDCImpl::DoSetDeviceClippingRegion( const wxRegion &region )
-{
-    // region is in device coordinates
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetDeviceClippingRegion - invalid DC") );
-
-    if (region.Empty())
-    {
-        //DestroyClippingRegion();
-        return;
-    }
-
-    wxRegion logRegion( region );
-    wxCoord x, y, w, h;
-
-    logRegion.Offset( DeviceToLogicalX(0), DeviceToLogicalY(0) );
-    logRegion.GetBox( x, y, w, h );
-
-    m_graphicContext->Clip( logRegion );
-    if ( m_clipping )
-    {
-        m_clipX1 = wxMax( m_clipX1, x );
-        m_clipY1 = wxMax( m_clipY1, y );
-        m_clipX2 = wxMin( m_clipX2, (x + w) );
-        m_clipY2 = wxMin( m_clipY2, (y + h) );
-    }
-    else
-    {
-        m_clipping = true;
-
-        m_clipX1 = x;
-        m_clipY1 = y;
-        m_clipX2 = x + w;
-        m_clipY2 = y + h;
-    }
-}
-
-void wxGCDCImpl::DestroyClippingRegion()
-{
-    m_graphicContext->ResetClip();
-    // currently the clip eg of a window extends to the area between the scrollbars
-    // so we must explicitly make sure it only covers the area we want it to draw
-    int width, height ;
-    GetOwner()->GetSize( &width , &height ) ;
-    m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
-
-    m_graphicContext->SetPen( m_pen );
-    m_graphicContext->SetBrush( m_brush );
-
-    m_clipping = false;
-}
-
-void wxGCDCImpl::DoGetSizeMM( int* width, int* height ) const
-{
-    int w = 0, h = 0;
-
-    GetOwner()->GetSize( &w, &h );
-    if (width)
-        *width = long( double(w) / (m_scaleX * m_mm_to_pix_x) );
-    if (height)
-        *height = long( double(h) / (m_scaleY * m_mm_to_pix_y) );
-}
-
-void wxGCDCImpl::SetTextForeground( const wxColour &col )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::SetTextForeground - invalid DC") );
-
-    // don't set m_textForegroundColour to an invalid colour as we'd crash
-    // later then (we use m_textForegroundColour.GetColor() without checking
-    // in a few places)
-    if ( col.IsOk() )
-    {
-        m_textForegroundColour = col;
-        m_graphicContext->SetFont( m_font, m_textForegroundColour );
-    }
-}
-
-void wxGCDCImpl::SetTextBackground( const wxColour &col )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::SetTextBackground - invalid DC") );
-
-    m_textBackgroundColour = col;
-}
-
-wxSize wxGCDCImpl::GetPPI() const
-{
-    return wxSize(72, 72);
-}
-
-int wxGCDCImpl::GetDepth() const
-{
-    return 32;
-}
-
-void wxGCDCImpl::ComputeScaleAndOrigin()
-{
-    wxDCImpl::ComputeScaleAndOrigin();
-
-    if ( m_graphicContext )
-    {
-        m_matrixCurrent = m_graphicContext->CreateMatrix();
-
-        // the logical origin sets the origin to have new coordinates
-        m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX,
-                                   m_deviceOriginY-m_logicalOriginY * m_signY * m_scaleY);
-
-        m_matrixCurrent.Scale( m_scaleX * m_signX, m_scaleY * m_signY );
-
-        m_graphicContext->SetTransform( m_matrixOriginal );
-        m_graphicContext->ConcatTransform( m_matrixCurrent );
-    }
-}
-
-void wxGCDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )
-{
-
-}
-
-void wxGCDCImpl::SetBackgroundMode( int mode )
-{
-    m_backgroundMode = mode;
-}
-
-void wxGCDCImpl::SetFont( const wxFont &font )
-{
-    m_font = font;
-    if ( m_graphicContext )
-    {
-        wxFont f = font;
-        if ( f.IsOk() )
-            f.SetPointSize( /*LogicalToDeviceYRel*/(font.GetPointSize()));
-        m_graphicContext->SetFont( f, m_textForegroundColour );
-    }
-}
-
-void wxGCDCImpl::SetPen( const wxPen &pen )
-{
-    m_pen = pen;
-    if ( m_graphicContext )
-    {
-        m_graphicContext->SetPen( m_pen );
-    }
-}
-
-void wxGCDCImpl::SetBrush( const wxBrush &brush )
-{
-    m_brush = brush;
-    if ( m_graphicContext )
-    {
-        m_graphicContext->SetBrush( m_brush );
-    }
-}
-
-void wxGCDCImpl::SetBackground( const wxBrush &brush )
-{
-    m_backgroundBrush = brush;
-    if (!m_backgroundBrush.IsOk())
-        return;
-}
-
-void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function )
-{
-    m_logicalFunction = function;
-
-    wxCompositionMode mode = TranslateRasterOp( function );
-    m_logicalFunctionSupported = mode != wxCOMPOSITION_INVALID;
-    if (m_logicalFunctionSupported)
-        m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode);
-
-    if ( function == wxXOR )
-        m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
-    else
-        m_graphicContext->SetAntialiasMode(wxANTIALIAS_DEFAULT);
-}
-
-bool wxGCDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
-                             const wxColour& WXUNUSED(col),
-                             wxFloodFillStyle WXUNUSED(style))
-{
-    return false;
-}
-
-bool wxGCDCImpl::DoGetPixel( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour *WXUNUSED(col) ) const
-{
-    //  wxCHECK_MSG( 0 , false, wxT("wxGCDC(cg)::DoGetPixel - not implemented") );
-    return false;
-}
-
-void wxGCDCImpl::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawLine - invalid DC") );
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    m_graphicContext->StrokeLine(x1,y1,x2,y2);
-
-    CalcBoundingBox(x1, y1);
-    CalcBoundingBox(x2, y2);
-}
-
-void wxGCDCImpl::DoCrossHair( wxCoord x, wxCoord y )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoCrossHair - invalid DC") );
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    int w = 0, h = 0;
-
-    GetOwner()->GetSize( &w, &h );
-
-    m_graphicContext->StrokeLine(0,y,w,y);
-    m_graphicContext->StrokeLine(x,0,x,h);
-
-    CalcBoundingBox(0, 0);
-    CalcBoundingBox(0+w, 0+h);
-}
-
-void wxGCDCImpl::DoDrawArc( wxCoord x1, wxCoord y1,
-                        wxCoord x2, wxCoord y2,
-                        wxCoord xc, wxCoord yc )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawArc - invalid DC") );
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    double dx = x1 - xc;
-    double dy = y1 - yc;
-    double radius = sqrt((double)(dx * dx + dy * dy));
-    wxCoord rad = (wxCoord)radius;
-    double sa, ea;
-    if (x1 == x2 && y1 == y2)
-    {
-        sa = 0.0;
-        ea = 360.0;
-    }
-    else if (radius == 0.0)
-    {
-        sa = ea = 0.0;
-    }
-    else
-    {
-        sa = (x1 - xc == 0) ?
-     (y1 - yc < 0) ? 90.0 : -90.0 :
-             -atan2(double(y1 - yc), double(x1 - xc)) * RAD2DEG;
-        ea = (x2 - xc == 0) ?
-     (y2 - yc < 0) ? 90.0 : -90.0 :
-             -atan2(double(y2 - yc), double(x2 - xc)) * RAD2DEG;
-    }
-
-    bool fill = m_brush.GetStyle() != wxTRANSPARENT;
-
-    wxGraphicsPath path = m_graphicContext->CreatePath();
-    if ( fill && ((x1!=x2)||(y1!=y2)) )
-        path.MoveToPoint( xc, yc );
-    // since these angles (ea,sa) are measured counter-clockwise, we invert them to
-    // get clockwise angles
-    path.AddArc( xc, yc , rad , DegToRad(-sa) , DegToRad(-ea), false );
-    if ( fill && ((x1!=x2)||(y1!=y2)) )
-        path.AddLineToPoint( xc, yc );
-    m_graphicContext->DrawPath(path);
-}
-
-void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                double sa, double ea )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawEllipticArc - invalid DC") );
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    m_graphicContext->PushState();
-    m_graphicContext->Translate(x+w/2.0,y+h/2.0);
-    wxDouble factor = ((wxDouble) w) / h;
-    m_graphicContext->Scale( factor , 1.0);
-
-    // since these angles (ea,sa) are measured counter-clockwise, we invert them to
-    // get clockwise angles
-    if ( m_brush.GetStyle() != wxTRANSPARENT )
-    {
-        wxGraphicsPath path = m_graphicContext->CreatePath();
-        path.MoveToPoint( 0, 0 );
-        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
-        path.AddLineToPoint( 0, 0 );
-        m_graphicContext->FillPath( path );
-
-        path = m_graphicContext->CreatePath();
-        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
-        m_graphicContext->StrokePath( path );
-    }
-    else
-    {
-        wxGraphicsPath path = m_graphicContext->CreatePath();
-        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
-        m_graphicContext->DrawPath( path );
-    }
-
-    m_graphicContext->PopState();
-}
-
-void wxGCDCImpl::DoDrawPoint( wxCoord x, wxCoord y )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawPoint - invalid DC") );
-
-    DoDrawLine( x , y , x + 1 , y + 1 );
-}
-
-void wxGCDCImpl::DoDrawLines(int n, wxPoint points[],
-                         wxCoord xoffset, wxCoord yoffset)
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawLines - invalid DC") );
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    wxPoint2DDouble* pointsD = new wxPoint2DDouble[n];
-    for( int i = 0; i < n; ++i)
-    {
-        pointsD[i].m_x = points[i].x + xoffset;
-        pointsD[i].m_y = points[i].y + yoffset;
-    }
-
-    m_graphicContext->StrokeLines( n , pointsD);
-    delete[] pointsD;
-}
-
-#if wxUSE_SPLINES
-void wxGCDCImpl::DoDrawSpline(const wxPointList *points)
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawSpline - invalid DC") );
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    wxGraphicsPath path = m_graphicContext->CreatePath();
-
-    wxPointList::compatibility_iterator node = points->GetFirst();
-    if ( !node )
-        // empty list
-        return;
-
-    wxPoint *p = node->GetData();
-
-    wxCoord x1 = p->x;
-    wxCoord y1 = p->y;
-
-    node = node->GetNext();
-    p = node->GetData();
-
-    wxCoord x2 = p->x;
-    wxCoord y2 = p->y;
-    wxCoord cx1 = ( x1 + x2 ) / 2;
-    wxCoord cy1 = ( y1 + y2 ) / 2;
-
-    path.MoveToPoint( x1 , y1 );
-    path.AddLineToPoint( cx1 , cy1 );
-#if !wxUSE_STD_CONTAINERS
-
-    while ((node = node->GetNext()) != NULL)
-#else
-
-    while ((node = node->GetNext()))
-#endif // !wxUSE_STD_CONTAINERS
-
-    {
-        p = node->GetData();
-        x1 = x2;
-        y1 = y2;
-        x2 = p->x;
-        y2 = p->y;
-        wxCoord cx4 = (x1 + x2) / 2;
-        wxCoord cy4 = (y1 + y2) / 2;
-
-        path.AddQuadCurveToPoint(x1 , y1 ,cx4 , cy4 );
-
-        cx1 = cx4;
-        cy1 = cy4;
-    }
-
-    path.AddLineToPoint( x2 , y2 );
-
-    m_graphicContext->StrokePath( path );
-}
-#endif // wxUSE_SPLINES
-
-void wxGCDCImpl::DoDrawPolygon( int n, wxPoint points[],
-                                wxCoord xoffset, wxCoord yoffset,
-                                wxPolygonFillMode fillStyle )
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawPolygon - invalid DC") );
-
-    if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) )
-        return;
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    bool closeIt = false;
-    if (points[n-1] != points[0])
-        closeIt = true;
-
-    wxPoint2DDouble* pointsD = new wxPoint2DDouble[n+(closeIt?1:0)];
-    for( int i = 0; i < n; ++i)
-    {
-        pointsD[i].m_x = points[i].x + xoffset;
-        pointsD[i].m_y = points[i].y + yoffset;
-    }
-    if ( closeIt )
-        pointsD[n] = pointsD[0];
-
-    m_graphicContext->DrawLines( n+(closeIt?1:0) , pointsD, fillStyle);
-    delete[] pointsD;
-}
-
-void wxGCDCImpl::DoDrawPolyPolygon(int n,
-                               int count[],
-                               wxPoint points[],
-                               wxCoord xoffset,
-                               wxCoord yoffset,
-                               wxPolygonFillMode fillStyle)
-{
-    wxASSERT(n > 1);
-    wxGraphicsPath path = m_graphicContext->CreatePath();
-
-    int i = 0;
-    for ( int j = 0; j < n; ++j)
-    {
-        wxPoint start = points[i];
-        path.MoveToPoint( start.x+ xoffset, start.y+ yoffset);
-        ++i;
-        int l = count[j];
-        for ( int k = 1; k < l; ++k)
-        {
-            path.AddLineToPoint( points[i].x+ xoffset, points[i].y+ yoffset);
-            ++i;
-        }
-        // close the polygon
-        if ( start != points[i-1])
-            path.AddLineToPoint( start.x+ xoffset, start.y+ yoffset);
-    }
-    m_graphicContext->DrawPath( path , fillStyle);
-}
-
-void wxGCDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRectangle - invalid DC") );
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    // CMB: draw nothing if transformed w or h is 0
-    if (w == 0 || h == 0)
-        return;
-
-    if ( m_graphicContext->ShouldOffset() )
-    {
-        // if we are offsetting the entire rectangle is moved 0.5, so the
-        // border line gets off by 1
-        w -= 1;
-        h -= 1;
-    }
-    m_graphicContext->DrawRectangle(x,y,w,h);
-}
-
-void wxGCDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-                                    wxCoord w, wxCoord h,
-                                    double radius)
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRoundedRectangle - invalid DC") );
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    if (radius < 0.0)
-        radius = - radius * ((w < h) ? w : h);
-
-    // CMB: draw nothing if transformed w or h is 0
-    if (w == 0 || h == 0)
-        return;
-
-    if ( m_graphicContext->ShouldOffset() )
-    {
-        // if we are offsetting the entire rectangle is moved 0.5, so the
-        // border line gets off by 1
-        w -= 1;
-        h -= 1;
-    }
-    m_graphicContext->DrawRoundedRectangle( x,y,w,h,radius);
-}
-
-void wxGCDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawEllipse - invalid DC") );
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    if ( m_graphicContext->ShouldOffset() )
-    {
-        // if we are offsetting the entire rectangle is moved 0.5, so the
-        // border line gets off by 1
-        w -= 1;
-        h -= 1;
-    }
-    m_graphicContext->DrawEllipse(x,y,w,h);
-}
-
-bool wxGCDCImpl::CanDrawBitmap() const
-{
-    return true;
-}
-
-bool wxGCDCImpl::DoBlit(
-    wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-    wxDC *source, wxCoord xsrc, wxCoord ysrc,
-    wxRasterOperationMode logical_func , bool useMask,
-    wxCoord xsrcMask, wxCoord ysrcMask )
-{
-    return DoStretchBlit( xdest, ydest, width, height,
-        source, xsrc, ysrc, width, height, logical_func, useMask,
-        xsrcMask,ysrcMask );
-}
-
-bool wxGCDCImpl::DoStretchBlit(
-    wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight,
-    wxDC *source, wxCoord xsrc, wxCoord ysrc, wxCoord srcWidth, wxCoord srcHeight,
-    wxRasterOperationMode logical_func , bool useMask,
-    wxCoord xsrcMask, wxCoord ysrcMask )
-{
-    wxCHECK_MSG( IsOk(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid DC") );
-    wxCHECK_MSG( source->IsOk(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid source DC") );
-
-    if ( logical_func == wxNO_OP )
-        return true;
-
-    wxCompositionMode mode = TranslateRasterOp(logical_func);
-    if ( mode == wxCOMPOSITION_INVALID )
-    {
-        wxFAIL_MSG( wxT("Blitting is not supported with this logical operation.") );
-        return false;
-    }
-
-    wxRect subrect(source->LogicalToDeviceX(xsrc),
-                   source->LogicalToDeviceY(ysrc),
-                   source->LogicalToDeviceXRel(srcWidth),
-                   source->LogicalToDeviceYRel(srcHeight));
-    const wxRect subrectOrig = subrect;
-    // clip the subrect down to the size of the source DC
-    wxRect clip;
-    source->GetSize(&clip.width, &clip.height);
-    subrect.Intersect(clip);
-    if (subrect.width == 0)
-        return true;
-
-    bool retval = true;
-
-    wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
-    if (m_graphicContext->SetCompositionMode(mode))
-    {
-        wxAntialiasMode formerAa = m_graphicContext->GetAntialiasMode();
-        if (mode == wxCOMPOSITION_XOR)
-        {
-            m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
-        }
-
-        if (xsrcMask == -1 && ysrcMask == -1)
-        {
-            xsrcMask = xsrc;
-            ysrcMask = ysrc;
-        }
-
-        wxBitmap blit = source->GetAsBitmap( &subrect );
-
-        if ( blit.IsOk() )
-        {
-            if ( !useMask && blit.GetMask() )
-                blit.SetMask(NULL);
-
-            double x = xdest;
-            double y = ydest;
-            double w = dstWidth;
-            double h = dstHeight;
-            // adjust dest rect if source rect is clipped
-            if (subrect.width != subrectOrig.width || subrect.height != subrectOrig.height)
-            {
-                x += (subrect.x - subrectOrig.x) / double(subrectOrig.width) * dstWidth;
-                y += (subrect.y - subrectOrig.y) / double(subrectOrig.height) * dstHeight;
-                w *= double(subrect.width) / subrectOrig.width;
-                h *= double(subrect.height) / subrectOrig.height;
-            }
-            m_graphicContext->DrawBitmap(blit, x, y, w, h);
-        }
-        else
-        {
-            wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") );
-            retval = false;
-        }
-
-        if (mode == wxCOMPOSITION_XOR)
-        {
-            m_graphicContext->SetAntialiasMode(formerAa);
-        }
-    }
-    // reset composition
-    m_graphicContext->SetCompositionMode(formerMode);
-
-    return retval;
-}
-
-void wxGCDCImpl::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
-                               double angle)
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRotatedText - invalid DC") );
-
-    if ( str.empty() )
-        return;
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    if ( m_backgroundMode == wxTRANSPARENT )
-        m_graphicContext->DrawText( str, x ,y , DegToRad(angle ));
-    else
-        m_graphicContext->DrawText( str, x ,y , DegToRad(angle ), m_graphicContext->CreateBrush( wxBrush(m_textBackgroundColour,wxSOLID) ) );
-}
-
-void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y)
-{
-    // For compatibility with other ports (notably wxGTK) and because it's
-    // genuinely useful, we allow passing multiline strings to DrawText().
-    // However there is no native OSX function to draw them directly so we
-    // instead reuse the generic DrawLabel() method to render them. Of course,
-    // DrawLabel() itself will call back to us but with single line strings
-    // only so there won't be any infinite recursion here.
-    if ( str.find('\n') != wxString::npos )
-    {
-        GetOwner()->DrawLabel(str, wxRect(x, y, 0, 0));
-        return;
-    }
-
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawText - invalid DC") );
-
-    if ( str.empty() )
-        return;
-
-    if ( !m_logicalFunctionSupported )
-        return;
-
-    if ( m_backgroundMode == wxTRANSPARENT )
-        m_graphicContext->DrawText( str, x ,y);
-    else
-        m_graphicContext->DrawText( str, x ,y , m_graphicContext->CreateBrush( wxBrush(m_textBackgroundColour,wxSOLID) ) );
-}
-
-bool wxGCDCImpl::CanGetTextExtent() const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("wxGCDC(cg)::CanGetTextExtent - invalid DC") );
-
-    return true;
-}
-
-void wxGCDCImpl::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
-                              wxCoord *descent, wxCoord *externalLeading ,
-                              const wxFont *theFont ) const
-{
-    wxCHECK_RET( m_graphicContext, wxT("wxGCDC(cg)::DoGetTextExtent - invalid DC") );
-
-    if ( theFont )
-    {
-        m_graphicContext->SetFont( *theFont, m_textForegroundColour );
-    }
-
-    wxDouble h , d , e , w;
-
-    m_graphicContext->GetTextExtent( str, &w, &h, &d, &e );
-
-    if ( height )
-        *height = (wxCoord)(h+0.5);
-    if ( descent )
-        *descent = (wxCoord)(d+0.5);
-    if ( externalLeading )
-        *externalLeading = (wxCoord)(e+0.5);
-    if ( width )
-        *width = (wxCoord)(w+0.5);
-
-    if ( theFont )
-    {
-        m_graphicContext->SetFont( m_font, m_textForegroundColour );
-    }
-}
-
-bool wxGCDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
-{
-    wxCHECK_MSG( m_graphicContext, false, wxT("wxGCDC(cg)::DoGetPartialTextExtents - invalid DC") );
-    widths.Clear();
-    widths.Add(0,text.Length());
-    if ( text.IsEmpty() )
-        return true;
-
-    wxArrayDouble widthsD;
-
-    m_graphicContext->GetPartialTextExtents( text, widthsD );
-    for ( size_t i = 0; i < widths.GetCount(); ++i )
-        widths[i] = (wxCoord)(widthsD[i] + 0.5);
-
-    return true;
-}
-
-wxCoord wxGCDCImpl::GetCharWidth(void) const
-{
-    wxCoord width;
-    DoGetTextExtent( wxT("g") , &width , NULL , NULL , NULL , NULL );
-
-    return width;
-}
-
-wxCoord wxGCDCImpl::GetCharHeight(void) const
-{
-    wxCoord height;
-    DoGetTextExtent( wxT("g") , NULL , &height , NULL , NULL , NULL );
-
-    return height;
-}
-
-void wxGCDCImpl::Clear(void)
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::Clear - invalid DC") );
-    // TODO better implementation / incorporate size info into wxGCDC or context
-    m_graphicContext->SetBrush( m_backgroundBrush );
-    wxPen p = *wxTRANSPARENT_PEN;
-    m_graphicContext->SetPen( p );
-    wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
-    m_graphicContext->SetCompositionMode(wxCOMPOSITION_SOURCE);
-    DoDrawRectangle( 0, 0, INT_MAX , INT_MAX );
-    m_graphicContext->SetCompositionMode(formerMode);
-    m_graphicContext->SetPen( m_pen );
-    m_graphicContext->SetBrush( m_brush );
-}
-
-void wxGCDCImpl::DoGetSize(int *width, int *height) const
-{
-    wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoGetSize - invalid DC") );
-    wxDouble w,h;
-    m_graphicContext->GetSize( &w, &h );
-    if ( height )
-        *height = (int) (h+0.5);
-    if ( width )
-        *width = (int) (w+0.5);
-}
-
-void wxGCDCImpl::DoGradientFillLinear(const wxRect& rect,
-                                  const wxColour& initialColour,
-                                  const wxColour& destColour,
-                                  wxDirection nDirection )
-{
-    wxPoint start;
-    wxPoint end;
-    switch( nDirection)
-    {
-    case wxWEST :
-        start = rect.GetRightBottom();
-        start.x++;
-        end = rect.GetLeftBottom();
-        break;
-    case wxEAST :
-        start = rect.GetLeftBottom();
-        end = rect.GetRightBottom();
-        end.x++;
-        break;
-    case wxNORTH :
-        start = rect.GetLeftBottom();
-        start.y++;
-        end = rect.GetLeftTop();
-        break;
-    case wxSOUTH :
-        start = rect.GetLeftTop();
-        end = rect.GetLeftBottom();
-        end.y++;
-        break;
-    default :
-        break;
-    }
-
-    if (rect.width == 0 || rect.height == 0)
-        return;
-
-    m_graphicContext->SetBrush( m_graphicContext->CreateLinearGradientBrush(
-        start.x,start.y,end.x,end.y, initialColour, destColour));
-    m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
-    m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
-    m_graphicContext->SetPen(m_pen);
-    m_graphicContext->SetBrush(m_brush);
-}
-
-void wxGCDCImpl::DoGradientFillConcentric(const wxRect& rect,
-                                      const wxColour& initialColour,
-                                      const wxColour& destColour,
-                                      const wxPoint& circleCenter)
-{
-    //Radius
-    wxInt32 cx = rect.GetWidth() / 2;
-    wxInt32 cy = rect.GetHeight() / 2;
-    wxInt32 nRadius;
-    if (cx < cy)
-        nRadius = cx;
-    else
-        nRadius = cy;
-
-    // make sure the background is filled (todo move into specific platform implementation ?)
-    m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
-    m_graphicContext->SetBrush( wxBrush( destColour) );
-    m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
-
-    m_graphicContext->SetBrush( m_graphicContext->CreateRadialGradientBrush(
-        rect.x+circleCenter.x,rect.y+circleCenter.y,
-        rect.x+circleCenter.x,rect.y+circleCenter.y,
-        nRadius,initialColour,destColour));
-
-    m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
-    m_graphicContext->SetPen(m_pen);
-    m_graphicContext->SetBrush(m_brush);
-}
-
-void wxGCDCImpl::DoDrawCheckMark(wxCoord x, wxCoord y,
-                             wxCoord width, wxCoord height)
-{
-    wxDCImpl::DoDrawCheckMark(x,y,width,height);
-}
-
-#ifdef __WXMSW__
-wxRect wxGCDCImpl::MSWApplyGDIPlusTransform(const wxRect& r) const
-{
-    wxGraphicsContext* const gc = GetGraphicsContext();
-    wxCHECK_MSG( gc, r, wxT("Invalid wxGCDC") );
-
-    double x = 0,
-           y = 0;
-    gc->GetTransform().TransformPoint(&x, &y);
-
-    wxRect rect(r);
-    rect.Offset(x, y);
-
-    return rect;
-}
-#endif // __WXMSW__
-
-#endif // wxUSE_GRAPHICS_CONTEXT
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/graphcmn.cpp
+// Purpose:     graphics context methods common to all platforms
+// Author:      Stefan Csomor
+// Modified by:
+// Created:
+// RCS-ID:      $Id: dcgraph.cpp 60190 2009-04-16 00:57:35Z KO $
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#if wxUSE_GRAPHICS_CONTEXT
+
+#include "wx/graphics.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/icon.h"
+    #include "wx/bitmap.h"
+    #include "wx/dcmemory.h"
+    #include "wx/region.h"
+#endif
+
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#endif
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+static const double RAD2DEG = 180.0 / M_PI;
+
+//-----------------------------------------------------------------------------
+// Local functions
+//-----------------------------------------------------------------------------
+
+static inline double DegToRad(double deg)
+{
+    return (deg * M_PI) / 180.0;
+}
+
+//-----------------------------------------------------------------------------
+// wxDC bridge class
+//-----------------------------------------------------------------------------
+
+#ifdef __WXMAC__
+IMPLEMENT_DYNAMIC_CLASS(wxGCDC, wxDCBase)
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxGCDC, wxDC)
+#endif
+
+wxGCDC::wxGCDC()
+{
+    Init();
+}
+
+void wxGCDC::SetGraphicsContext( wxGraphicsContext* ctx )
+{
+    delete m_graphicContext;
+    m_graphicContext = ctx;
+    if ( m_graphicContext )
+    {
+        m_matrixOriginal = m_graphicContext->GetTransform();
+        m_ok = true;
+        // apply the stored transformations to the passed in context
+        ComputeScaleAndOrigin();
+        m_graphicContext->SetFont( m_font , m_textForegroundColour );
+        m_graphicContext->SetPen( m_pen );
+        m_graphicContext->SetBrush( m_brush);
+    }
+}
+
+wxGCDC::wxGCDC(const wxWindowDC& dc)
+{
+    Init();
+    wxGraphicsContext* context;
+#if wxUSE_CAIRO
+    wxGraphicsRenderer* renderer = wxGraphicsRenderer::GetCairoRenderer();
+    context = renderer->CreateContext(dc);
+#else
+    context = wxGraphicsContext::Create(dc);
+#endif
+
+    SetGraphicsContext( context );
+}
+
+#ifdef __WXMSW__
+wxGCDC::wxGCDC(const wxMemoryDC& dc)
+{
+    Init();
+    SetGraphicsContext( wxGraphicsContext::Create(dc) );
+}
+#endif    
+
+void wxGCDC::Init()
+{
+    m_ok = false;
+    m_colour = true;
+    m_mm_to_pix_x = mm2pt;
+    m_mm_to_pix_y = mm2pt;
+
+    m_pen = *wxBLACK_PEN;
+    m_font = *wxNORMAL_FONT;
+    m_brush = *wxWHITE_BRUSH;
+
+    m_graphicContext = NULL;
+    m_logicalFunctionSupported = true;
+}
+
+
+wxGCDC::~wxGCDC()
+{
+    delete m_graphicContext;
+}
+
+void wxGCDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid DC") );
+    wxCHECK_RET( bmp.Ok(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid bitmap") );
+
+    if ( bmp.GetDepth() == 1 )
+    {
+        m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
+        m_graphicContext->SetBrush( wxBrush( m_textBackgroundColour , wxSOLID ) );
+        m_graphicContext->DrawRectangle( x , y , bmp.GetWidth() , bmp.GetHeight() );        
+        m_graphicContext->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) );
+        m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
+        m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush));
+        m_graphicContext->SetPen( m_graphicContext->CreatePen(m_pen));
+    }
+    else
+        m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
+}
+
+void wxGCDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawIcon - invalid DC") );
+    wxCHECK_RET( icon.Ok(), wxT("wxGCDC(cg)::DoDrawIcon - invalid icon") );
+
+    wxCoord w = icon.GetWidth();
+    wxCoord h = icon.GetHeight();
+
+    m_graphicContext->DrawIcon( icon , x, y, w, h );
+}
+
+bool wxGCDC::StartDoc( const wxString& WXUNUSED(message) ) 
+{
+    return true;
+}
+
+void wxGCDC::EndDoc() 
+{
+}
+
+void wxGCDC::StartPage()
+{
+}
+
+void wxGCDC::EndPage() 
+{
+}
+    
+void wxGCDC::Flush()
+{
+#ifdef __WXMAC__
+    CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() );
+#endif
+}
+
+void wxGCDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoSetClippingRegion - invalid DC") );
+
+    m_graphicContext->Clip( x, y, w, h );
+    if ( m_clipping )
+    {
+        m_clipX1 = wxMax( m_clipX1, x );
+        m_clipY1 = wxMax( m_clipY1, y );
+        m_clipX2 = wxMin( m_clipX2, (x + w) );
+        m_clipY2 = wxMin( m_clipY2, (y + h) );
+    }
+    else
+    {
+        m_clipping = true;
+
+        m_clipX1 = x;
+        m_clipY1 = y;
+        m_clipX2 = x + w;
+        m_clipY2 = y + h;
+    }
+}
+
+void wxGCDC::DoSetClippingRegionAsRegion( const wxRegion &region )
+{
+    // region is in device coordinates
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoSetClippingRegionAsRegion - invalid DC") );
+
+    if (region.Empty())
+    {
+        //DestroyClippingRegion();
+        return;
+    }
+
+    wxRegion logRegion( region );
+    wxCoord x, y, w, h;
+
+    logRegion.Offset( DeviceToLogicalX(0), DeviceToLogicalY(0) );
+    logRegion.GetBox( x, y, w, h );
+
+    m_graphicContext->Clip( logRegion );
+    if ( m_clipping )
+    {
+        m_clipX1 = wxMax( m_clipX1, x );
+        m_clipY1 = wxMax( m_clipY1, y );
+        m_clipX2 = wxMin( m_clipX2, (x + w) );
+        m_clipY2 = wxMin( m_clipY2, (y + h) );
+    }
+    else
+    {
+        m_clipping = true;
+
+        m_clipX1 = x;
+        m_clipY1 = y;
+        m_clipX2 = x + w;
+        m_clipY2 = y + h;
+    }
+}
+
+void wxGCDC::DestroyClippingRegion()
+{
+    m_graphicContext->ResetClip();
+    // currently the clip eg of a window extends to the area between the scrollbars
+    // so we must explicitely make sure it only covers the area we want it to draw
+    int width, height ;
+    GetSize( &width , &height ) ;
+    m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
+    
+    m_graphicContext->SetPen( m_pen );
+    m_graphicContext->SetBrush( m_brush );
+
+    m_clipping = false;
+}
+
+void wxGCDC::DoGetSizeMM( int* width, int* height ) const
+{
+    int w = 0, h = 0;
+
+    GetSize( &w, &h );
+    if (width)
+        *width = long( double(w) / (m_scaleX * m_mm_to_pix_x) );
+    if (height)
+        *height = long( double(h) / (m_scaleY * m_mm_to_pix_y) );
+}
+
+void wxGCDC::SetTextForeground( const wxColour &col )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::SetTextForeground - invalid DC") );
+
+    if ( col != m_textForegroundColour )
+    {
+        m_textForegroundColour = col;
+        m_graphicContext->SetFont( m_font, m_textForegroundColour );
+    }
+}
+
+void wxGCDC::SetTextBackground( const wxColour &col )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::SetTextBackground - invalid DC") );
+
+    m_textBackgroundColour = col;
+}
+
+void wxGCDC::SetMapMode( int mode )
+{
+    switch (mode)
+    {
+    case wxMM_TWIPS:
+        SetLogicalScale( twips2mm * m_mm_to_pix_x, twips2mm * m_mm_to_pix_y );
+        break;
+
+    case wxMM_POINTS:
+        SetLogicalScale( pt2mm * m_mm_to_pix_x, pt2mm * m_mm_to_pix_y );
+        break;
+
+    case wxMM_METRIC:
+        SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y );
+        break;
+
+    case wxMM_LOMETRIC:
+        SetLogicalScale( m_mm_to_pix_x / 10.0, m_mm_to_pix_y / 10.0 );
+        break;
+
+    case wxMM_TEXT:
+    default:
+        SetLogicalScale( 1.0, 1.0 );
+        break;
+    }
+
+    ComputeScaleAndOrigin();
+}
+
+void wxGCDC::SetUserScale( double x, double y )
+{
+    // allow negative ? -> no
+
+    m_userScaleX = x;
+    m_userScaleY = y;
+    ComputeScaleAndOrigin();
+}
+
+void wxGCDC::SetLogicalScale( double x, double y )
+{
+    // allow negative ?
+    m_logicalScaleX = x;
+    m_logicalScaleY = y;
+    ComputeScaleAndOrigin();
+}
+
+void wxGCDC::SetLogicalOrigin( wxCoord x, wxCoord y )
+{
+    m_logicalOriginX = x * m_signX;   // is this still correct ?
+    m_logicalOriginY = y * m_signY;
+    ComputeScaleAndOrigin();
+}
+
+void wxGCDC::SetDeviceOrigin( wxCoord x, wxCoord y )
+{
+    m_deviceOriginX = x;
+    m_deviceOriginY = y;
+    ComputeScaleAndOrigin();
+}
+
+void wxGCDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
+{
+    m_signX = (xLeftRight ?  1 : -1);
+    m_signY = (yBottomUp ? -1 :  1);
+    ComputeScaleAndOrigin();
+}
+
+wxSize wxGCDC::GetPPI() const
+{
+    return wxSize(72, 72);
+}
+
+int wxGCDC::GetDepth() const
+{
+    return 32;
+}
+
+void wxGCDC::ComputeScaleAndOrigin()
+{
+    m_scaleX = m_logicalScaleX * m_userScaleX;
+    m_scaleY = m_logicalScaleY * m_userScaleY;
+
+    if ( m_graphicContext )
+    {
+        m_matrixCurrent = m_graphicContext->CreateMatrix();
+        m_matrixCurrent.Translate( m_deviceOriginX, m_deviceOriginY );
+        m_matrixCurrent.Scale( m_scaleX, m_scaleY );
+        // the logical origin sets the origin to have new coordinates
+        m_matrixCurrent.Translate( -m_logicalOriginX, -m_logicalOriginY );
+
+        m_graphicContext->SetTransform( m_matrixOriginal );
+        m_graphicContext->ConcatTransform( m_matrixCurrent );
+    }
+}
+
+void wxGCDC::SetPalette( const wxPalette& WXUNUSED(palette) )
+{
+
+}
+
+void wxGCDC::SetBackgroundMode( int mode )
+{
+    m_backgroundMode = mode;
+}
+
+void wxGCDC::SetFont( const wxFont &font )
+{
+    m_font = font;
+    if ( m_graphicContext )
+    {
+        wxFont f = font;
+        if ( f.Ok() )
+            f.SetPointSize( /*LogicalToDeviceYRel*/(font.GetPointSize()));
+        m_graphicContext->SetFont( f, m_textForegroundColour );
+    }
+}
+
+void wxGCDC::SetPen( const wxPen &pen )
+{
+    if ( m_pen == pen )
+        return;
+
+    m_pen = pen;
+    if ( m_graphicContext )
+    {
+        m_graphicContext->SetPen( m_pen );
+    }
+}
+
+void wxGCDC::SetBrush( const wxBrush &brush )
+{
+    if (m_brush == brush)
+        return;
+
+    m_brush = brush;
+    if ( m_graphicContext )
+    {
+        m_graphicContext->SetBrush( m_brush );
+    }
+}
+ 
+void wxGCDC::SetBackground( const wxBrush &brush )
+{
+    if (m_backgroundBrush == brush)
+        return;
+
+    m_backgroundBrush = brush;
+    if (!m_backgroundBrush.Ok())
+        return;
+}
+
+void wxGCDC::SetLogicalFunction( int function )
+{
+    if (m_logicalFunction == function)
+        return;
+
+    m_logicalFunction = function;
+    if ( m_graphicContext->SetLogicalFunction( function ) )
+        m_logicalFunctionSupported=true;
+    else
+        m_logicalFunctionSupported=false;
+}
+
+bool wxGCDC::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
+                         const wxColour& WXUNUSED(col), int WXUNUSED(style))
+{
+    return false;
+}
+
+bool wxGCDC::DoGetPixel( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour *WXUNUSED(col) ) const
+{
+    //  wxCHECK_MSG( 0 , false, wxT("wxGCDC(cg)::DoGetPixel - not implemented") );
+    return false;
+}
+
+void wxGCDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawLine - invalid DC") );
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    m_graphicContext->StrokeLine(x1,y1,x2,y2);
+
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);
+}
+
+void wxGCDC::DoCrossHair( wxCoord x, wxCoord y )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoCrossHair - invalid DC") );
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    int w = 0, h = 0;
+
+    GetSize( &w, &h );
+
+    m_graphicContext->StrokeLine(0,y,w,y);
+    m_graphicContext->StrokeLine(x,0,x,h);
+
+    CalcBoundingBox(0, 0);
+    CalcBoundingBox(0+w, 0+h);
+}
+
+void wxGCDC::DoDrawArc( wxCoord x1, wxCoord y1,
+                        wxCoord x2, wxCoord y2,
+                        wxCoord xc, wxCoord yc )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawArc - invalid DC") );
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    double dx = x1 - xc;
+    double dy = y1 - yc;
+    double radius = sqrt((double)(dx * dx + dy * dy));
+    wxCoord rad = (wxCoord)radius;
+    double sa, ea;
+    if (x1 == x2 && y1 == y2)
+    {
+        sa = 0.0;
+        ea = 360.0;
+    }
+    else if (radius == 0.0)
+    {
+        sa = ea = 0.0;
+    }
+    else
+    {
+        sa = (x1 - xc == 0) ?
+     (y1 - yc < 0) ? 90.0 : -90.0 :
+             -atan2(double(y1 - yc), double(x1 - xc)) * RAD2DEG;
+        ea = (x2 - xc == 0) ?
+     (y2 - yc < 0) ? 90.0 : -90.0 :
+             -atan2(double(y2 - yc), double(x2 - xc)) * RAD2DEG;
+    }
+
+    bool fill = m_brush.GetStyle() != wxTRANSPARENT;
+
+    wxGraphicsPath path = m_graphicContext->CreatePath();
+    if ( fill && ((x1!=x2)||(y1!=y2)) )
+        path.MoveToPoint( xc, yc );
+    // since these angles (ea,sa) are measured counter-clockwise, we invert them to
+    // get clockwise angles
+    path.AddArc( xc, yc , rad , DegToRad(-sa) , DegToRad(-ea), false );
+    if ( fill && ((x1!=x2)||(y1!=y2)) )
+        path.AddLineToPoint( xc, yc );
+    m_graphicContext->DrawPath(path);
+}
+
+void wxGCDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                                double sa, double ea )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawEllipticArc - invalid DC") );
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    m_graphicContext->PushState();
+    m_graphicContext->Translate(x+w/2.0,y+h/2.0);
+    wxDouble factor = ((wxDouble) w) / h;
+    m_graphicContext->Scale( factor , 1.0);
+
+    // since these angles (ea,sa) are measured counter-clockwise, we invert them to
+    // get clockwise angles
+    if ( m_brush.GetStyle() != wxTRANSPARENT )
+    {
+        wxGraphicsPath path = m_graphicContext->CreatePath();
+        path.MoveToPoint( 0, 0 );
+        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
+        path.AddLineToPoint( 0, 0 );
+        m_graphicContext->FillPath( path );
+
+        path = m_graphicContext->CreatePath();
+        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
+        m_graphicContext->StrokePath( path );
+    }
+    else
+    {
+        wxGraphicsPath path = m_graphicContext->CreatePath();
+        path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
+        m_graphicContext->DrawPath( path );
+    }
+
+    m_graphicContext->PopState();
+}
+
+void wxGCDC::DoDrawPoint( wxCoord x, wxCoord y )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawPoint - invalid DC") );
+
+    DoDrawLine( x , y , x + 1 , y + 1 );
+}
+
+void wxGCDC::DoDrawLines(int n, wxPoint points[],
+                         wxCoord xoffset, wxCoord yoffset)
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawLines - invalid DC") );
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    wxPoint2DDouble* pointsD = new wxPoint2DDouble[n];
+    for( int i = 0; i < n; ++i)
+    {
+        pointsD[i].m_x = points[i].x + xoffset;
+        pointsD[i].m_y = points[i].y + yoffset;
+    }
+
+    m_graphicContext->StrokeLines( n , pointsD);
+    delete[] pointsD;
+}
+
+#if wxUSE_SPLINES
+void wxGCDC::DoDrawSpline(wxList *points)
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawSpline - invalid DC") );
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    wxGraphicsPath path = m_graphicContext->CreatePath();
+
+    wxList::compatibility_iterator node = points->GetFirst();
+    if (node == wxList::compatibility_iterator())
+        // empty list
+        return;
+
+    wxPoint *p = (wxPoint *)node->GetData();
+
+    wxCoord x1 = p->x;
+    wxCoord y1 = p->y;
+
+    node = node->GetNext();
+    p = (wxPoint *)node->GetData();
+
+    wxCoord x2 = p->x;
+    wxCoord y2 = p->y;
+    wxCoord cx1 = ( x1 + x2 ) / 2;
+    wxCoord cy1 = ( y1 + y2 ) / 2;
+
+    path.MoveToPoint( x1 , y1 );
+    path.AddLineToPoint( cx1 , cy1 );
+#if !wxUSE_STL
+
+    while ((node = node->GetNext()) != NULL)
+#else
+
+    while ((node = node->GetNext()))
+#endif // !wxUSE_STL
+
+    {
+        p = (wxPoint *)node->GetData();
+        x1 = x2;
+        y1 = y2;
+        x2 = p->x;
+        y2 = p->y;
+        wxCoord cx4 = (x1 + x2) / 2;
+        wxCoord cy4 = (y1 + y2) / 2;
+
+        path.AddQuadCurveToPoint(x1 , y1 ,cx4 , cy4 );
+
+        cx1 = cx4;
+        cy1 = cy4;
+    }
+
+    path.AddLineToPoint( x2 , y2 );
+
+    m_graphicContext->StrokePath( path );
+}
+#endif // wxUSE_SPLINES
+
+void wxGCDC::DoDrawPolygon( int n, wxPoint points[],
+                            wxCoord xoffset, wxCoord yoffset,
+                            int fillStyle )
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawPolygon - invalid DC") );
+
+    if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) )
+        return;
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    bool closeIt = false;
+    if (points[n-1] != points[0])
+        closeIt = true;
+
+    wxPoint2DDouble* pointsD = new wxPoint2DDouble[n+(closeIt?1:0)];
+    for( int i = 0; i < n; ++i)
+    {
+        pointsD[i].m_x = points[i].x + xoffset;
+        pointsD[i].m_y = points[i].y + yoffset;
+    }
+    if ( closeIt )
+        pointsD[n] = pointsD[0];
+
+    m_graphicContext->DrawLines( n+(closeIt?1:0) , pointsD, fillStyle);
+    delete[] pointsD;
+}
+
+void wxGCDC::DoDrawPolyPolygon(int n,
+                               int count[],
+                               wxPoint points[],
+                               wxCoord xoffset,
+                               wxCoord yoffset,
+                               int fillStyle)
+{
+    wxASSERT(n > 1);
+    wxGraphicsPath path = m_graphicContext->CreatePath();
+
+    int i = 0;
+    for ( int j = 0; j < n; ++j)
+    {
+        wxPoint start = points[i];
+        path.MoveToPoint( start.x+ xoffset, start.y+ yoffset);
+        ++i;
+        int l = count[j];
+        for ( int k = 1; k < l; ++k)
+        {
+            path.AddLineToPoint( points[i].x+ xoffset, points[i].y+ yoffset);
+            ++i;
+        }
+        // close the polygon
+        if ( start != points[i-1])
+            path.AddLineToPoint( start.x+ xoffset, start.y+ yoffset);
+    }
+    m_graphicContext->DrawPath( path , fillStyle);
+}
+
+void wxGCDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawRectangle - invalid DC") );
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    // CMB: draw nothing if transformed w or h is 0
+    if (w == 0 || h == 0)
+        return;
+
+    if ( m_graphicContext->ShouldOffset() )
+    {
+        // if we are offsetting the entire rectangle is moved 0.5, so the
+        // border line gets off by 1
+        w -= 1;
+        h -= 1;
+    }
+    m_graphicContext->DrawRectangle(x,y,w,h);
+}
+
+void wxGCDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                    wxCoord w, wxCoord h,
+                                    double radius)
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawRoundedRectangle - invalid DC") );
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    if (radius < 0.0)
+        radius = - radius * ((w < h) ? w : h);
+
+    // CMB: draw nothing if transformed w or h is 0
+    if (w == 0 || h == 0)
+        return;
+
+    if ( m_graphicContext->ShouldOffset() )
+    {
+        // if we are offsetting the entire rectangle is moved 0.5, so the
+        // border line gets off by 1
+        w -= 1;
+        h -= 1;
+    }
+    m_graphicContext->DrawRoundedRectangle( x,y,w,h,radius);
+}
+
+void wxGCDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawEllipse - invalid DC") );
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    if ( m_graphicContext->ShouldOffset() )
+    {
+        // if we are offsetting the entire rectangle is moved 0.5, so the
+        // border line gets off by 1
+        w -= 1;
+        h -= 1;
+    }
+    m_graphicContext->DrawEllipse(x,y,w,h);
+}
+
+bool wxGCDC::CanDrawBitmap() const
+{
+    return true;
+}
+
+bool wxGCDC::DoBlit(
+    wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+    wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool WXUNUSED(useMask),
+    wxCoord xsrcMask, wxCoord ysrcMask )
+{
+    wxCHECK_MSG( Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid DC") );
+    wxCHECK_MSG( source->Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid source DC") );
+
+    if ( logical_func == wxNO_OP )
+        return true;
+    else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )
+    
+    {
+        wxFAIL_MSG( wxT("Logical function is not supported by the graphics context.") );
+        return false;
+    }
+
+    if (xsrcMask == -1 && ysrcMask == -1)
+    {
+        xsrcMask = xsrc;
+        ysrcMask = ysrc;
+    }
+
+    wxRect subrect(source->LogicalToDeviceX(xsrc),
+                   source->LogicalToDeviceY(ysrc),
+                   source->LogicalToDeviceXRel(width),
+                   source->LogicalToDeviceYRel(height));
+
+    // if needed clip the subrect down to the size of the source DC
+    wxCoord sw, sh;
+    source->GetSize(&sw, &sh);
+    sw = source->LogicalToDeviceXRel(sw);
+    sh = source->LogicalToDeviceYRel(sh);
+    if (subrect.x + subrect.width > sw)
+        subrect.width = sw - subrect.x;
+    if (subrect.y + subrect.height > sh)
+        subrect.height = sh - subrect.y;
+
+    wxBitmap blit = source->GetAsBitmap( &subrect );
+
+    if ( blit.Ok() )
+    {
+        m_graphicContext->DrawBitmap( blit, xdest, ydest,
+                                      wxMin(width, blit.GetWidth()),
+                                      wxMin(height, blit.GetHeight()));
+    }
+    else
+    {
+        wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") );
+        return false;
+    }
+
+    // reset logical function
+    m_graphicContext->SetLogicalFunction( m_logicalFunction );
+
+    return true;
+}
+
+void wxGCDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
+                               double angle)
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawRotatedText - invalid DC") );
+
+    if ( str.length() == 0 )
+        return;
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    if ( m_backgroundMode == wxTRANSPARENT )
+        m_graphicContext->DrawText( str, x ,y , DegToRad(angle ));
+    else
+        m_graphicContext->DrawText( str, x ,y , DegToRad(angle ), m_graphicContext->CreateBrush( wxBrush(m_textBackgroundColour,wxSOLID) ) );
+}
+
+void wxGCDC::DoDrawText(const wxString& str, wxCoord x, wxCoord y)
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawRotatedText - invalid DC") );
+
+    if ( str.length() == 0 )
+        return;
+
+    if ( !m_logicalFunctionSupported )
+        return;
+
+    if ( m_backgroundMode == wxTRANSPARENT )
+        m_graphicContext->DrawText( str, x ,y);
+    else
+        m_graphicContext->DrawText( str, x ,y , m_graphicContext->CreateBrush( wxBrush(m_textBackgroundColour,wxSOLID) ) );
+}
+
+bool wxGCDC::CanGetTextExtent() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("wxGCDC(cg)::CanGetTextExtent - invalid DC") );
+
+    return true;
+}
+
+void wxGCDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
+                              wxCoord *descent, wxCoord *externalLeading ,
+                              wxFont *theFont ) const
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoGetTextExtent - invalid DC") );
+
+    if ( theFont )
+    {
+        m_graphicContext->SetFont( *theFont, m_textForegroundColour );
+    }
+
+    wxDouble h , d , e , w;
+
+    m_graphicContext->GetTextExtent( str, &w, &h, &d, &e );
+
+    if ( height )
+        *height = (wxCoord)(h+0.5);
+    if ( descent )
+        *descent = (wxCoord)(d+0.5);
+    if ( externalLeading )
+        *externalLeading = (wxCoord)(e+0.5);
+    if ( width )
+        *width = (wxCoord)(w+0.5);
+
+    if ( theFont )
+    {
+        m_graphicContext->SetFont( m_font, m_textForegroundColour );
+    }
+}
+
+bool wxGCDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+{
+    wxCHECK_MSG( Ok(), false, wxT("wxGCDC(cg)::DoGetPartialTextExtents - invalid DC") );
+    widths.Clear();
+    widths.Add(0,text.Length());
+    if ( text.IsEmpty() )
+        return true;
+
+    wxArrayDouble widthsD;
+
+    m_graphicContext->GetPartialTextExtents( text, widthsD );
+    for ( size_t i = 0; i < widths.GetCount(); ++i )
+        widths[i] = (wxCoord)(widthsD[i] + 0.5);
+
+    return true;
+}
+
+wxCoord wxGCDC::GetCharWidth(void) const
+{
+    wxCoord width;
+    DoGetTextExtent( wxT("g") , &width , NULL , NULL , NULL , NULL );
+
+    return width;
+}
+
+wxCoord wxGCDC::GetCharHeight(void) const
+{
+    wxCoord height;
+    DoGetTextExtent( wxT("g") , NULL , &height , NULL , NULL , NULL );
+
+    return height;
+}
+
+void wxGCDC::Clear(void)
+{
+    wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::Clear - invalid DC") );
+    // TODO better implementation / incorporate size info into wxGCDC or context
+    m_graphicContext->SetBrush( m_backgroundBrush );
+    wxPen p = *wxTRANSPARENT_PEN;
+    m_graphicContext->SetPen( p );
+    DoDrawRectangle( 0, 0, 32000 , 32000 );
+    m_graphicContext->SetPen( m_pen );
+    m_graphicContext->SetBrush( m_brush );
+}
+
+void wxGCDC::DoGetSize(int *width, int *height) const
+{
+    *width = 10000;
+    *height = 10000;
+}
+
+void wxGCDC::DoGradientFillLinear(const wxRect& rect,
+                                  const wxColour& initialColour,
+                                  const wxColour& destColour,
+                                  wxDirection nDirection )
+{
+    wxPoint start;
+    wxPoint end;
+    switch( nDirection)
+    {
+    case wxWEST :
+        start = rect.GetRightBottom();
+        start.x++;
+        end = rect.GetLeftBottom();
+        break;
+    case wxEAST :
+        start = rect.GetLeftBottom();
+        end = rect.GetRightBottom();
+        end.x++;
+        break;
+    case wxNORTH :
+        start = rect.GetLeftBottom();
+        start.y++;
+        end = rect.GetLeftTop();
+        break;
+    case wxSOUTH :
+        start = rect.GetLeftTop();
+        end = rect.GetLeftBottom();
+        end.y++;
+        break;
+    default :
+        break;
+    }
+
+    if (rect.width == 0 || rect.height == 0)
+        return;
+
+    m_graphicContext->SetBrush( m_graphicContext->CreateLinearGradientBrush(
+        start.x,start.y,end.x,end.y, initialColour, destColour));
+    m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
+    m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
+    m_graphicContext->SetPen(m_pen);
+}
+
+void wxGCDC::DoGradientFillConcentric(const wxRect& rect,
+                                      const wxColour& initialColour,
+                                      const wxColour& destColour,
+                                      const wxPoint& circleCenter)
+{
+    //Radius
+    wxInt32 cx = rect.GetWidth() / 2;
+    wxInt32 cy = rect.GetHeight() / 2;
+    wxInt32 nRadius;
+    if (cx < cy)
+        nRadius = cx;
+    else
+        nRadius = cy;
+
+    // make sure the background is filled (todo move into specific platform implementation ?)
+    m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
+    m_graphicContext->SetBrush( wxBrush( destColour) );
+    m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
+
+    m_graphicContext->SetBrush( m_graphicContext->CreateRadialGradientBrush(
+        rect.x+circleCenter.x,rect.y+circleCenter.y,
+        rect.x+circleCenter.x,rect.y+circleCenter.y,
+        nRadius,initialColour,destColour));
+
+    m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
+    m_graphicContext->SetPen(m_pen);
+}
+
+void wxGCDC::DoDrawCheckMark(wxCoord x, wxCoord y,
+                             wxCoord width, wxCoord height)
+{
+    wxDCBase::DoDrawCheckMark(x,y,width,height);
+}
+
+#endif // wxUSE_GRAPHICS_CONTEXT
diff --git a/Source/3rd Party/wx/src/common/dcsvg.cpp b/Source/3rd Party/wx/src/common/dcsvg.cpp
deleted file mode 100644
index 5419f85e8..000000000
--- a/Source/3rd Party/wx/src/common/dcsvg.cpp	
+++ /dev/null
@@ -1,671 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/svg.cpp
-// Purpose:     SVG sample
-// Author:      Chris Elliott
-// Modified by:
-// RCS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if wxUSE_SVG
-
-#ifndef WX_PRECOMP
-    #include "wx/dcmemory.h"
-    #include "wx/dcscreen.h"
-    #include "wx/icon.h"
-    #include "wx/image.h"
-#endif
-
-#include "wx/dcsvg.h"
-#include "wx/wfstream.h"
-#include "wx/filename.h"
-
-// ----------------------------------------------------------
-// Global utilities
-// ----------------------------------------------------------
-
-namespace
-{
-
-inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
-
-// This function returns a string representation of a floating point number in
-// C locale (i.e. always using "." for the decimal separator) and with the
-// fixed precision (which is 2 for some unknown reason but this is what it was
-// in this code originally).
-inline wxString NumStr(double f)
-{
-    return wxString::FromCDouble(f, 2);
-}
-
-// Return the colour representation as HTML-like "#rrggbb" string and also
-// returns its alpha as opacity number in 0..1 range.
-wxString Col2SVG(wxColour c, float *opacity)
-{
-    if ( c.Alpha() != wxALPHA_OPAQUE )
-    {
-        *opacity = c.Alpha()/255.;
-
-        // Remove the alpha before using GetAsString(wxC2S_HTML_SYNTAX) as it
-        // doesn't support colours with alpha channel.
-        c = wxColour(c.GetRGB());
-    }
-    else // No alpha.
-    {
-        *opacity = 1.;
-    }
-
-    return c.GetAsString(wxC2S_HTML_SYNTAX);
-}
-
-wxString wxPenString(wxColour c, int style = wxPENSTYLE_SOLID)
-{
-    float opacity;
-    wxString s = wxT("stroke:") + Col2SVG(c, &opacity)  + wxT("; ");
-
-    switch ( style )
-    {
-        case wxPENSTYLE_SOLID:
-            s += wxString::Format(wxT("stroke-opacity:%s; "), NumStr(opacity));
-            break;
-        case wxPENSTYLE_TRANSPARENT:
-            s += wxT("stroke-opacity:0.0; ");
-            break;
-        default :
-            wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Pen Style not available"));
-    }
-
-    return s;
-}
-
-wxString wxBrushString(wxColour c, int style = wxBRUSHSTYLE_SOLID)
-{
-    float opacity;
-    wxString s = wxT("fill:") + Col2SVG(c, &opacity)  + wxT("; ");
-
-    switch ( style )
-    {
-        case wxBRUSHSTYLE_SOLID:
-            s += wxString::Format(wxT("fill-opacity:%s; "), NumStr(opacity));
-            break;
-        case wxBRUSHSTYLE_TRANSPARENT:
-            s += wxT("fill-opacity:0.0; ");
-            break;
-        default :
-            wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Brush Style not available"));
-    }
-
-    return s;
-}
-
-} // anonymous namespace
-
-// ----------------------------------------------------------
-// wxSVGFileDCImpl
-// ----------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxSVGFileDCImpl, wxDC)
-
-wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename,
-                    int width, int height, double dpi ) :
-        wxDCImpl( owner )
-    {
-        Init( filename, width, height, dpi );
-    }
-
-void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, double dpi)
-{
-    m_width = Width;
-    m_height = Height;
-
-    m_dpi = dpi;
-
-    m_OK = true;
-
-    m_mm_to_pix_x = dpi/25.4;
-    m_mm_to_pix_y = dpi/25.4;
-
-    m_backgroundBrush = *wxTRANSPARENT_BRUSH;
-    m_textForegroundColour = *wxBLACK;
-    m_textBackgroundColour = *wxWHITE;
-    m_colour = wxColourDisplay();
-
-    m_pen   = *wxBLACK_PEN;
-    m_font  = *wxNORMAL_FONT;
-    m_brush = *wxWHITE_BRUSH;
-
-    m_graphics_changed = true;
-
-    ////////////////////code here
-
-    m_outfile = new wxFileOutputStream(filename);
-    m_OK = m_outfile->IsOk();
-    if (m_OK)
-    {
-        m_filename = filename;
-        m_sub_images = 0;
-        wxString s;
-        s = wxT("<?xml version=\"1.0\" standalone=\"no\"?>") + wxString(wxT("\n"));
-        write(s);
-        s = wxT("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\" ") + wxString(wxT("\n"));
-        write(s);
-        s = wxT("\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\"> ") + wxString(wxT("\n"));
-        write(s);
-        s = wxT("<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" ") + wxString(wxT("\n"));
-        write(s);
-        s.Printf( wxT("    width=\"%scm\" height=\"%scm\" viewBox=\"0 0 %d %d \"> \n"), NumStr(float(Width)/dpi*2.54), NumStr(float(Height)/dpi*2.54), Width, Height );
-        write(s);
-        s = wxT("<title>SVG Picture created as ") + wxFileName(filename).GetFullName() + wxT(" </title>") + wxT("\n");
-        write(s);
-        s = wxString (wxT("<desc>Picture generated by wxSVG ")) + wxSVGVersion + wxT(" </desc>")+ wxT("\n");
-        write(s);
-        s =  wxT("<g style=\"fill:black; stroke:black; stroke-width:1\">") + wxString(wxT("\n"));
-        write(s);
-    }
-}
-
-wxSVGFileDCImpl::~wxSVGFileDCImpl()
-{
-    wxString s = wxT("</g> \n</svg> \n");
-    write(s);
-    delete m_outfile;
-}
-
-void wxSVGFileDCImpl::DoGetSizeMM( int *width, int *height ) const
-{
-    if (width)
-        *width = wxRound( (double)m_width / m_mm_to_pix_x );
-
-    if (height)
-        *height = wxRound( (double)m_height / m_mm_to_pix_y );
-}
-
-wxSize wxSVGFileDCImpl::GetPPI() const
-{
-    return wxSize( wxRound(m_dpi), wxRound(m_dpi) );
-}
-
-void wxSVGFileDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
-{
-    if (m_graphics_changed) NewGraphics();
-    wxString s;
-    s.Printf ( wxT("<path d=\"M%d %d L%d %d\" /> \n"), x1,y1,x2,y2 );
-    if (m_OK)
-    {
-        write(s);
-    }
-    CalcBoundingBox(x1, y1);
-    CalcBoundingBox(x2, y2);
-}
-
-void wxSVGFileDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset )
-{
-    for ( int i = 1; i < n; i++ )
-    {
-        DoDrawLine ( points [i-1].x + xoffset, points [i-1].y + yoffset,
-            points [ i ].x + xoffset, points [ i ].y + yoffset );
-    }
-}
-
-void wxSVGFileDCImpl::DoDrawPoint (wxCoord x1, wxCoord y1)
-{
-    wxString s;
-    if (m_graphics_changed) NewGraphics();
-    s = wxT("<g style = \"stroke-linecap:round;\" > ") + wxString(wxT("\n"));
-    write(s);
-    DoDrawLine ( x1,y1,x1,y1 );
-    s = wxT("</g>");
-    write(s);
-}
-
-void wxSVGFileDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height)
-{
-    wxDCImpl::DoDrawCheckMark (x1,y1,width,height);
-}
-
-void wxSVGFileDCImpl::DoDrawText(const wxString& text, wxCoord x1, wxCoord y1)
-{
-    DoDrawRotatedText(text, x1,y1,0.0);
-}
-
-void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, double angle)
-{
-    //known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW
-    if (m_graphics_changed) NewGraphics();
-    wxString s, sTmp;
-
-    // calculate bounding box
-    wxCoord w, h, desc;
-    DoGetTextExtent(sText, &w, &h, &desc);
-
-    double rad = DegToRad(angle);
-
-    // wxT("upper left") and wxT("upper right")
-    CalcBoundingBox(x, y);
-    CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad)));
-
-    // wxT("bottom left") and wxT("bottom right")
-    x += (wxCoord)(h*sin(rad));
-    y += (wxCoord)(h*cos(rad));
-    CalcBoundingBox(x, y);
-    CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad)));
-
-    if (m_backgroundMode == wxBRUSHSTYLE_SOLID)
-    {
-        // draw background first
-        // just like DoDrawRectangle except we pass the text color to it and set the border to a 1 pixel wide text background
-
-        sTmp.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" "), x,y+desc-h, w, h );
-        s = sTmp + wxT("style=\"") + wxBrushString(m_textBackgroundColour);
-        s += wxT("stroke-width:1; ") + wxPenString(m_textBackgroundColour);
-        sTmp.Printf ( wxT("\" transform=\"rotate( %s %d %d )  \" />"), NumStr(-angle), x,y );
-        s += sTmp + wxT("\n");
-        write(s);
-    }
-    //now do the text itself
-    s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "),x,y );
-
-    sTmp = m_font.GetFaceName();
-    if (sTmp.Len() > 0)  s += wxT("style=\"font-family:") + sTmp + wxT("; ");
-    else s += wxT("style=\" ");
-
-    wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") };
-    s += wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + wxT("; ");
-
-    wxString fontstyles [5] = { wxT("normal"), wxT("style error"), wxT("style error"), wxT("italic"), wxT("oblique") };
-    s += wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + wxT("; ");
-
-    sTmp.Printf (wxT("font-size:%dpt; "), m_font.GetPointSize() );
-    s += sTmp;
-    //text will be solid, unless alpha value isn't opaque in the foreground colour
-    s += wxBrushString(m_textForegroundColour) + wxPenString(m_textForegroundColour);
-    sTmp.Printf ( wxT("stroke-width:0;\"  transform=\"rotate( %s %d %d )  \" >"),  NumStr(-angle), x,y );
-    s += sTmp + sText + wxT("</text> ") + wxT("\n");
-    if (m_OK)
-    {
-        write(s);
-    }
-}
-
-void wxSVGFileDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-{
-    DoDrawRoundedRectangle(x, y, width, height, 0);
-}
-
-void wxSVGFileDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius )
-
-{
-    if (m_graphics_changed) NewGraphics();
-    wxString s;
-
-    s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%s\" "),
-            x, y, width, height, NumStr(radius) );
-
-    s += wxT(" /> \n");
-    write(s);
-
-    CalcBoundingBox(x, y);
-    CalcBoundingBox(x + width, y + height);
-}
-
-void wxSVGFileDCImpl::DoDrawPolygon(int n, wxPoint points[],
-                                    wxCoord xoffset, wxCoord yoffset,
-                                    wxPolygonFillMode fillStyle)
-{
-    if (m_graphics_changed) NewGraphics();
-    wxString s, sTmp;
-    s = wxT("<polygon style=\"");
-    if ( fillStyle == wxODDEVEN_RULE )
-        s += wxT("fill-rule:evenodd; ");
-    else
-        s += wxT("fill-rule:nonzero; ");
-
-    s += wxT("\" \npoints=\"");
-
-    for (int i = 0; i < n;  i++)
-    {
-        sTmp.Printf ( wxT("%d,%d"), points [i].x+xoffset, points[i].y+yoffset );
-        s += sTmp + wxT("\n");
-        CalcBoundingBox ( points [i].x+xoffset, points[i].y+yoffset);
-    }
-    s += wxT("\" /> \n");
-    write(s);
-}
-
-void wxSVGFileDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-
-{
-    if (m_graphics_changed) NewGraphics();
-
-    int rh = height /2;
-    int rw = width  /2;
-
-    wxString s;
-    s.Printf ( wxT("<ellipse cx=\"%d\" cy=\"%d\" rx=\"%d\" ry=\"%d\" "), x+rw,y+rh, rw, rh );
-    s += wxT(" /> \n");
-
-    write(s);
-
-    CalcBoundingBox(x, y);
-    CalcBoundingBox(x + width, y + height);
-}
-
-void wxSVGFileDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
-{
-    /* Draws an arc of a circle, centred on (xc, yc), with starting point
-    (x1, y1) and ending at (x2, y2). The current pen is used for the outline
-    and the current brush for filling the shape.
-
-    The arc is drawn in an anticlockwise direction from the start point to
-    the end point.
-
-    Might be better described as Pie drawing */
-
-    if (m_graphics_changed) NewGraphics();
-    wxString s;
-
-    // we need the radius of the circle which has two estimates
-    double r1 = sqrt ( double( (x1-xc)*(x1-xc) ) + double( (y1-yc)*(y1-yc) ) );
-    double r2 = sqrt ( double( (x2-xc)*(x2-xc) ) + double( (y2-yc)*(y2-yc) ) );
-
-    wxASSERT_MSG( (fabs ( r2-r1 ) <= 3), wxT("wxSVGFileDC::DoDrawArc Error in getting radii of circle"));
-    if ( fabs ( r2-r1 ) > 3 )    //pixels
-    {
-        s = wxT("<!--- wxSVGFileDC::DoDrawArc Error in getting radii of circle --> \n");
-        write(s);
-    }
-
-    double theta1 = atan2((double)(yc-y1),(double)(x1-xc));
-    if ( theta1 < 0 ) theta1 = theta1 + M_PI * 2;
-    double theta2 = atan2((double)(yc-y2), (double)(x2-xc));
-    if ( theta2 < 0 ) theta2 = theta2 + M_PI * 2;
-    if ( theta2 < theta1 ) theta2 = theta2 + M_PI *2;
-
-    int fArc;                  // flag for large or small arc 0 means less than 180 degrees
-    if ( fabs(theta2 - theta1) > M_PI ) fArc = 1; else fArc = 0;
-
-    int fSweep = 0;             // flag for sweep always 0
-
-    s.Printf ( wxT("<path d=\"M%d %d A%s %s 0.0 %d %d %d %d L%d %d z "),
-        x1,y1, NumStr(r1), NumStr(r2), fArc, fSweep, x2, y2, xc, yc );
-
-    // the z means close the path and fill
-    s += wxT(" \" /> \n");
-
-
-    if (m_OK)
-    {
-        write(s);
-    }
-}
-
-void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
-{
-    /*
-    Draws an arc of an ellipse. The current pen is used for drawing the arc
-    and the current brush is used for drawing the pie. This function is
-    currently only available for X window and PostScript device contexts.
-
-    x and y specify the x and y coordinates of the upper-left corner of the
-    rectangle that contains the ellipse.
-
-    width and height specify the width and height of the rectangle that
-    contains the ellipse.
-
-    start and end specify the start and end of the arc relative to the
-    three-o'clock position from the center of the rectangle. Angles are
-    specified in degrees (360 is a complete circle). Positive values mean
-    counter-clockwise motion. If start is equal to end, a complete ellipse
-    will be drawn. */
-
-    //known bug: SVG draws with the current pen along the radii, but this does not happen in wxMSW
-
-    if (m_graphics_changed) NewGraphics();
-
-    wxString s;
-    //radius
-    double rx = w / 2;
-    double ry = h / 2;
-    // center
-    double xc = x + rx;
-    double yc = y + ry;
-
-    double xs, ys, xe, ye;
-    xs = xc + rx * cos (DegToRad(sa));
-    xe = xc + rx * cos (DegToRad(ea));
-    ys = yc - ry * sin (DegToRad(sa));
-    ye = yc - ry * sin (DegToRad(ea));
-
-    ///now same as circle arc...
-
-    double theta1 = atan2(ys-yc, xs-xc);
-    double theta2 = atan2(ye-yc, xe-xc);
-
-    int fArc;                  // flag for large or small arc 0 means less than 180 degrees
-    if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0;
-
-    int fSweep;
-    if ( fabs(theta2 - theta1) > M_PI) fSweep = 1; else fSweep = 0;
-
-    s.Printf ( wxT("<path d=\"M%d %d A%d %d 0.0 %d %d  %d %d L %d %d z "),
-        int(xs), int(ys), int(rx), int(ry),
-        fArc, fSweep, int(xe), int(ye), int(xc), int(yc)  );
-
-    s += wxT(" \" /> \n");
-
-    if (m_OK)
-    {
-        write(s);
-    }
-}
-
-void wxSVGFileDCImpl::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const
-
-{
-    wxScreenDC sDC;
-
-    sDC.SetFont (m_font);
-    if ( font != NULL ) sDC.SetFont ( *font );
-    sDC.GetTextExtent(string, w,  h, descent, externalLeading );
-}
-
-wxCoord wxSVGFileDCImpl::GetCharHeight() const
-{
-    wxScreenDC sDC;
-    sDC.SetFont (m_font);
-
-    return sDC.GetCharHeight();
-
-}
-
-wxCoord wxSVGFileDCImpl::GetCharWidth() const
-{
-    wxScreenDC sDC;
-    sDC.SetFont (m_font);
-
-    return sDC.GetCharWidth();
-}
-
-
-// ----------------------------------------------------------
-// wxSVGFileDCImpl - set functions
-// ----------------------------------------------------------
-
-void wxSVGFileDCImpl::SetBackground( const wxBrush &brush )
-{
-    m_backgroundBrush = brush;
-}
-
-
-void wxSVGFileDCImpl::SetBackgroundMode( int mode )
-{
-    m_backgroundMode = mode;
-}
-
-
-void wxSVGFileDCImpl::SetBrush(const wxBrush& brush)
-
-{
-    m_brush = brush;
-
-    m_graphics_changed = true;
-}
-
-
-void wxSVGFileDCImpl::SetPen(const wxPen& pen)
-{
-    // width, color, ends, joins : currently implemented
-    // dashes, stipple :  not implemented
-    m_pen = pen;
-
-    m_graphics_changed = true;
-}
-
-void wxSVGFileDCImpl::NewGraphics()
-{
-    wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn;
-
-    sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour(), m_brush.GetStyle() )
-            + wxPenString(m_pen.GetColour(), m_pen.GetStyle());
-
-    switch ( m_pen.GetCap() )
-    {
-        case  wxCAP_PROJECTING :
-            sPenCap = wxT("stroke-linecap:square; ");
-            break;
-        case  wxCAP_BUTT :
-            sPenCap = wxT("stroke-linecap:butt; ");
-            break;
-        case    wxCAP_ROUND :
-        default :
-            sPenCap = wxT("stroke-linecap:round; ");
-    }
-
-    switch ( m_pen.GetJoin() )
-    {
-        case  wxJOIN_BEVEL :
-            sPenJoin = wxT("stroke-linejoin:bevel; ");
-            break;
-        case  wxJOIN_MITER :
-            sPenJoin = wxT("stroke-linejoin:miter; ");
-            break;
-        case    wxJOIN_ROUND :
-        default :
-            sPenJoin = wxT("stroke-linejoin:round; ");
-    }
-
-    sLast.Printf( wxT("stroke-width:%d\" \n   transform=\"translate(%s %s) scale(%s %s)\">"),
-                m_pen.GetWidth(), NumStr(m_logicalOriginX), NumStr(m_logicalOriginY), NumStr(m_scaleX), NumStr(m_scaleY)  );
-
-    s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + wxT("\n") + sWarn;
-    write(s);
-    m_graphics_changed = false;
-}
-
-
-void wxSVGFileDCImpl::SetFont(const wxFont& font)
-
-{
-    m_font = font;
-}
-
-// export a bitmap as a raster image in png
-bool wxSVGFileDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-                        wxDC* source, wxCoord xsrc, wxCoord ysrc,
-                        wxRasterOperationMode logicalFunc /*= wxCOPY*/, bool useMask /*= false*/,
-                        wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)
-{
-    if (logicalFunc != wxCOPY)
-    {
-        wxASSERT_MSG(false, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible"));
-        return false;
-    }
-    if (useMask != false)
-    {
-        wxASSERT_MSG(false, wxT("wxSVGFileDC::DoBlit Call requested false mask; this is not possible"));
-        return false;
-    }
-    wxBitmap myBitmap (width, height);
-    wxMemoryDC memDC;
-    memDC.SelectObject( myBitmap );
-    memDC.Blit(0, 0, width, height, source, xsrc, ysrc);
-    memDC.SelectObject( wxNullBitmap );
-    DoDrawBitmap(myBitmap, xdest, ydest);
-    return false;
-}
-
-void wxSVGFileDCImpl::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y)
-{
-    wxBitmap myBitmap (myIcon.GetWidth(), myIcon.GetHeight() );
-    wxMemoryDC memDC;
-    memDC.SelectObject( myBitmap );
-    memDC.DrawIcon(myIcon,0,0);
-    memDC.SelectObject( wxNullBitmap );
-    DoDrawBitmap(myBitmap, x, y);
-}
-
-void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool  WXUNUSED(bTransparent) /*=0*/ )
-{
-    if (m_graphics_changed) NewGraphics();
-
-    wxString sTmp, s, sPNG;
-    if ( wxImage::FindHandler(wxBITMAP_TYPE_PNG) == NULL )
-        wxImage::AddHandler(new wxPNGHandler);
-
-// create suitable file name
-    sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
-    sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
-    while (wxFile::Exists(sPNG) )
-    {
-        m_sub_images ++;
-        sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
-        sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
-    }
-
-//create copy of bitmap (wxGTK doesn't like saving a constant bitmap)
-    wxBitmap myBitmap = bmp;
-//save it
-    bool bPNG_OK = myBitmap.SaveFile(sPNG,wxBITMAP_TYPE_PNG);
-
-// reference the bitmap from the SVG doc
-// only use filename & ext
-    sPNG = sPNG.AfterLast(wxFileName::GetPathSeparator());
-
-// reference the bitmap from the SVG doc
-    int w = myBitmap.GetWidth();
-    int h = myBitmap.GetHeight();
-    sTmp.Printf ( wxT(" <image x=\"%d\" y=\"%d\" width=\"%dpx\" height=\"%dpx\" "), x,y,w,h );
-    s += sTmp;
-    sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() );
-    s += sTmp + wxT("<title>Image from wxSVG</title>  </image>") + wxT("\n");
-
-    if (m_OK && bPNG_OK)
-    {
-        write(s);
-    }
-    m_OK = m_outfile->IsOk() && bPNG_OK;
-}
-
-void wxSVGFileDCImpl::write(const wxString &s)
-{
-    const wxCharBuffer buf = s.utf8_str();
-    m_outfile->Write(buf, strlen((const char *)buf));
-    m_OK = m_outfile->IsOk();
-}
-
-
-#ifdef __BORLANDC__
-#pragma warn .rch
-#pragma warn .ccc
-#endif
-
-#endif // wxUSE_SVG
-
diff --git a/Source/3rd Party/wx/src/common/dircmn.cpp b/Source/3rd Party/wx/src/common/dircmn.cpp
index 50815f09c..3e79a7a4e 100644
--- a/Source/3rd Party/wx/src/common/dircmn.cpp	
+++ b/Source/3rd Party/wx/src/common/dircmn.cpp	
@@ -1,403 +1,357 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dircmn.cpp
-// Purpose:     wxDir methods common to all implementations
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     19.05.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/filefn.h"
-    #include "wx/arrstr.h"
-#endif //WX_PRECOMP
-
-#include "wx/dir.h"
-#include "wx/filename.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxDirTraverser
-// ----------------------------------------------------------------------------
-
-wxDirTraverseResult
-wxDirTraverser::OnOpenError(const wxString& WXUNUSED(dirname))
-{
-    return wxDIR_IGNORE;
-}
-
-// ----------------------------------------------------------------------------
-// wxDir::HasFiles() and HasSubDirs()
-// ----------------------------------------------------------------------------
-
-// dumb generic implementation
-
-bool wxDir::HasFiles(const wxString& spec) const
-{
-    wxString s;
-    return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN);
-}
-
-// we have a (much) faster version for Unix
-#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__EMX__) || defined(__WINE__)
-
-bool wxDir::HasSubDirs(const wxString& spec) const
-{
-    wxString s;
-    return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN);
-}
-
-#endif // !Unix
-
-// ----------------------------------------------------------------------------
-// wxDir::GetNameWithSep()
-// ----------------------------------------------------------------------------
-
-wxString wxDir::GetNameWithSep() const
-{
-    // Note that for historical reasons (i.e. because GetName() was there
-    // first) we implement this one in terms of GetName() even though it might
-    // actually make more sense to reverse this logic.
-
-    wxString name = GetName();
-    if ( !name.empty() )
-    {
-        // Notice that even though GetName() isn't supposed to return the
-        // separator, it can still be present for the root directory name.
-        if ( name.Last() != wxFILE_SEP_PATH )
-            name += wxFILE_SEP_PATH;
-    }
-
-    return name;
-}
-
-// ----------------------------------------------------------------------------
-// wxDir::Traverse()
-// ----------------------------------------------------------------------------
-
-size_t wxDir::Traverse(wxDirTraverser& sink,
-                       const wxString& filespec,
-                       int flags) const
-{
-    wxCHECK_MSG( IsOpened(), (size_t)-1,
-                 wxT("dir must be opened before traversing it") );
-
-    // the total number of files found
-    size_t nFiles = 0;
-
-    // the name of this dir with path delimiter at the end
-    const wxString prefix = GetNameWithSep();
-
-    // first, recurse into subdirs
-    if ( flags & wxDIR_DIRS )
-    {
-        wxString dirname;
-        for ( bool cont = GetFirst(&dirname, wxEmptyString, wxDIR_DIRS | (flags & wxDIR_HIDDEN) );
-              cont;
-              cont = cont && GetNext(&dirname) )
-        {
-            const wxString fulldirname = prefix + dirname;
-
-            switch ( sink.OnDir(fulldirname) )
-            {
-                default:
-                    wxFAIL_MSG(wxT("unexpected OnDir() return value") );
-                    // fall through
-
-                case wxDIR_STOP:
-                    cont = false;
-                    break;
-
-                case wxDIR_CONTINUE:
-                    {
-                        wxDir subdir;
-
-                        // don't give the error messages for the directories
-                        // which we can't open: there can be all sorts of good
-                        // reason for this (e.g. insufficient privileges) and
-                        // this shouldn't be treated as an error -- instead
-                        // let the user code decide what to do
-                        bool ok;
-                        do
-                        {
-                            wxLogNull noLog;
-                            ok = subdir.Open(fulldirname);
-                            if ( !ok )
-                            {
-                                // ask the user code what to do
-                                bool tryagain;
-                                switch ( sink.OnOpenError(fulldirname) )
-                                {
-                                    default:
-                                        wxFAIL_MSG(wxT("unexpected OnOpenError() return value") );
-                                        // fall through
-
-                                    case wxDIR_STOP:
-                                        cont = false;
-                                        // fall through
-
-                                    case wxDIR_IGNORE:
-                                        tryagain = false;
-                                        break;
-
-                                    case wxDIR_CONTINUE:
-                                        tryagain = true;
-                                }
-
-                                if ( !tryagain )
-                                    break;
-                            }
-                        }
-                        while ( !ok );
-
-                        if ( ok )
-                        {
-                            nFiles += subdir.Traverse(sink, filespec, flags);
-                        }
-                    }
-                    break;
-
-                case wxDIR_IGNORE:
-                    // nothing to do
-                    ;
-            }
-        }
-    }
-
-    // now enum our own files
-    if ( flags & wxDIR_FILES )
-    {
-        flags &= ~wxDIR_DIRS;
-
-        wxString filename;
-        bool cont = GetFirst(&filename, filespec, flags);
-        while ( cont )
-        {
-            wxDirTraverseResult res = sink.OnFile(prefix + filename);
-            if ( res == wxDIR_STOP )
-                break;
-
-            wxASSERT_MSG( res == wxDIR_CONTINUE,
-                          wxT("unexpected OnFile() return value") );
-
-            nFiles++;
-
-            cont = GetNext(&filename);
-        }
-    }
-
-    return nFiles;
-}
-
-// ----------------------------------------------------------------------------
-// wxDir::GetAllFiles()
-// ----------------------------------------------------------------------------
-
-class wxDirTraverserSimple : public wxDirTraverser
-{
-public:
-    wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
-
-    virtual wxDirTraverseResult OnFile(const wxString& filename)
-    {
-        m_files.push_back(filename);
-        return wxDIR_CONTINUE;
-    }
-
-    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
-    {
-        return wxDIR_CONTINUE;
-    }
-
-private:
-    wxArrayString& m_files;
-
-    wxDECLARE_NO_COPY_CLASS(wxDirTraverserSimple);
-};
-
-/* static */
-size_t wxDir::GetAllFiles(const wxString& dirname,
-                          wxArrayString *files,
-                          const wxString& filespec,
-                          int flags)
-{
-    wxCHECK_MSG( files, (size_t)-1, wxT("NULL pointer in wxDir::GetAllFiles") );
-
-    size_t nFiles = 0;
-
-    wxDir dir(dirname);
-    if ( dir.IsOpened() )
-    {
-        wxDirTraverserSimple traverser(*files);
-
-        nFiles += dir.Traverse(traverser, filespec, flags);
-    }
-
-    return nFiles;
-}
-
-// ----------------------------------------------------------------------------
-// wxDir::FindFirst()
-// ----------------------------------------------------------------------------
-
-class wxDirTraverserFindFirst : public wxDirTraverser
-{
-public:
-    wxDirTraverserFindFirst() { }
-
-    virtual wxDirTraverseResult OnFile(const wxString& filename)
-    {
-        m_file = filename;
-        return wxDIR_STOP;
-    }
-
-    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
-    {
-        return wxDIR_CONTINUE;
-    }
-
-    const wxString& GetFile() const
-    {
-        return m_file;
-    }
-
-private:
-    wxString m_file;
-
-    wxDECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst);
-};
-
-/* static */
-wxString wxDir::FindFirst(const wxString& dirname,
-                          const wxString& filespec,
-                          int flags)
-{
-    wxDir dir(dirname);
-    if ( dir.IsOpened() )
-    {
-        wxDirTraverserFindFirst traverser;
-
-        dir.Traverse(traverser, filespec, flags | wxDIR_FILES);
-        return traverser.GetFile();
-    }
-
-    return wxEmptyString;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxDir::GetTotalSize()
-// ----------------------------------------------------------------------------
-
-#if wxUSE_LONGLONG
-
-class wxDirTraverserSumSize : public wxDirTraverser
-{
-public:
-    wxDirTraverserSumSize() { }
-
-    virtual wxDirTraverseResult OnFile(const wxString& filename)
-    {
-        // wxFileName::GetSize won't use this class again as
-        // we're passing it a file and not a directory;
-        // thus we are sure to avoid an endless loop
-        wxULongLong sz = wxFileName::GetSize(filename);
-
-        if (sz == wxInvalidSize)
-        {
-            // if the GetSize() failed (this can happen because e.g. a
-            // file is locked by another process), we can proceed but
-            // we need to at least warn the user that the resulting
-            // final size could be not reliable (if e.g. the locked
-            // file is very big).
-            m_skippedFiles.Add(filename);
-            return wxDIR_CONTINUE;
-        }
-
-        m_sz += sz;
-        return wxDIR_CONTINUE;
-    }
-
-    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
-    {
-        return wxDIR_CONTINUE;
-    }
-
-    wxULongLong GetTotalSize() const
-        { return m_sz; }
-    const wxArrayString& GetSkippedFiles() const
-        { return m_skippedFiles; }
-
-protected:
-    wxULongLong m_sz;
-    wxArrayString m_skippedFiles;
-};
-
-wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSkipped)
-{
-    if (!wxDirExists(dirname))
-        return wxInvalidSize;
-
-    // to get the size of this directory and its contents we need
-    // to recursively walk it...
-    wxDir dir(dirname);
-    if ( !dir.IsOpened() )
-        return wxInvalidSize;
-
-    wxDirTraverserSumSize traverser;
-    if (dir.Traverse(traverser) == (size_t)-1 )
-        return wxInvalidSize;
-
-    if (filesSkipped)
-        *filesSkipped = traverser.GetSkippedFiles();
-
-    return traverser.GetTotalSize();
-}
-
-#endif // wxUSE_LONGLONG
-
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxFileName::DirExists(dir);
-}
-
-/* static */
-bool wxDir::Make(const wxString &dir, int perm, int flags)
-{
-    return wxFileName::Mkdir(dir, perm, flags);
-}
-
-/* static */
-bool wxDir::Remove(const wxString &dir, int flags)
-{
-    return wxFileName::Rmdir(dir, flags);
-}
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dircmn.cpp
+// Purpose:     wxDir methods common to all implementations
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     19.05.01
+// RCS-ID:      $Id: dircmn.cpp 40665 2006-08-19 08:45:31Z JS $
+// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/filefn.h"
+    #include "wx/arrstr.h"
+#endif //WX_PRECOMP
+
+#include "wx/dir.h"
+#include "wx/filename.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxDirTraverser
+// ----------------------------------------------------------------------------
+
+wxDirTraverseResult
+wxDirTraverser::OnOpenError(const wxString& WXUNUSED(dirname))
+{
+    return wxDIR_IGNORE;
+}
+
+// ----------------------------------------------------------------------------
+// wxDir::HasFiles() and HasSubDirs()
+// ----------------------------------------------------------------------------
+
+// dumb generic implementation
+
+bool wxDir::HasFiles(const wxString& spec)
+{
+    wxString s;
+    return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN);
+}
+
+// we have a (much) faster version for Unix
+#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__)
+
+bool wxDir::HasSubDirs(const wxString& spec)
+{
+    wxString s;
+    return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN);
+}
+
+#endif // !Unix
+
+// ----------------------------------------------------------------------------
+// wxDir::Traverse()
+// ----------------------------------------------------------------------------
+
+size_t wxDir::Traverse(wxDirTraverser& sink,
+                       const wxString& filespec,
+                       int flags) const
+{
+    wxCHECK_MSG( IsOpened(), (size_t)-1,
+                 _T("dir must be opened before traversing it") );
+
+    // the total number of files found
+    size_t nFiles = 0;
+
+    // the name of this dir with path delimiter at the end
+    wxString prefix = GetName();
+    prefix += wxFILE_SEP_PATH;
+
+    // first, recurse into subdirs
+    if ( flags & wxDIR_DIRS )
+    {
+        wxString dirname;
+        for ( bool cont = GetFirst(&dirname, wxEmptyString, wxDIR_DIRS | (flags & wxDIR_HIDDEN) );
+              cont;
+              cont = cont && GetNext(&dirname) )
+        {
+            const wxString fulldirname = prefix + dirname;
+
+            switch ( sink.OnDir(fulldirname) )
+            {
+                default:
+                    wxFAIL_MSG(_T("unexpected OnDir() return value") );
+                    // fall through
+
+                case wxDIR_STOP:
+                    cont = false;
+                    break;
+
+                case wxDIR_CONTINUE:
+                    {
+                        wxDir subdir;
+
+                        // don't give the error messages for the directories
+                        // which we can't open: there can be all sorts of good
+                        // reason for this (e.g. insufficient privileges) and
+                        // this shouldn't be treated as an error -- instead
+                        // let the user code decide what to do
+                        bool ok;
+                        do
+                        {
+                            wxLogNull noLog;
+                            ok = subdir.Open(fulldirname);
+                            if ( !ok )
+                            {
+                                // ask the user code what to do
+                                bool tryagain;
+                                switch ( sink.OnOpenError(fulldirname) )
+                                {
+                                    default:
+                                        wxFAIL_MSG(_T("unexpected OnOpenError() return value") );
+                                        // fall through
+
+                                    case wxDIR_STOP:
+                                        cont = false;
+                                        // fall through
+
+                                    case wxDIR_IGNORE:
+                                        tryagain = false;
+                                        break;
+
+                                    case wxDIR_CONTINUE:
+                                        tryagain = true;
+                                }
+
+                                if ( !tryagain )
+                                    break;
+                            }
+                        }
+                        while ( !ok );
+
+                        if ( ok )
+                        {
+                            nFiles += subdir.Traverse(sink, filespec, flags);
+                        }
+                    }
+                    break;
+
+                case wxDIR_IGNORE:
+                    // nothing to do
+                    ;
+            }
+        }
+    }
+
+    // now enum our own files
+    if ( flags & wxDIR_FILES )
+    {
+        flags &= ~wxDIR_DIRS;
+
+        wxString filename;
+        bool cont = GetFirst(&filename, filespec, flags);
+        while ( cont )
+        {
+            wxDirTraverseResult res = sink.OnFile(prefix + filename);
+            if ( res == wxDIR_STOP )
+                break;
+
+            wxASSERT_MSG( res == wxDIR_CONTINUE,
+                          _T("unexpected OnFile() return value") );
+
+            nFiles++;
+
+            cont = GetNext(&filename);
+        }
+    }
+
+    return nFiles;
+}
+
+// ----------------------------------------------------------------------------
+// wxDir::GetAllFiles()
+// ----------------------------------------------------------------------------
+
+class wxDirTraverserSimple : public wxDirTraverser
+{
+public:
+    wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
+
+    virtual wxDirTraverseResult OnFile(const wxString& filename)
+    {
+        m_files.push_back(filename);
+        return wxDIR_CONTINUE;
+    }
+
+    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
+    {
+        return wxDIR_CONTINUE;
+    }
+
+private:
+    wxArrayString& m_files;
+
+    DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)
+};
+
+/* static */
+size_t wxDir::GetAllFiles(const wxString& dirname,
+                          wxArrayString *files,
+                          const wxString& filespec,
+                          int flags)
+{
+    wxCHECK_MSG( files, (size_t)-1, _T("NULL pointer in wxDir::GetAllFiles") );
+
+    size_t nFiles = 0;
+
+    wxDir dir(dirname);
+    if ( dir.IsOpened() )
+    {
+        wxDirTraverserSimple traverser(*files);
+
+        nFiles += dir.Traverse(traverser, filespec, flags);
+    }
+
+    return nFiles;
+}
+
+// ----------------------------------------------------------------------------
+// wxDir::FindFirst()
+// ----------------------------------------------------------------------------
+
+class wxDirTraverserFindFirst : public wxDirTraverser
+{
+public:
+    wxDirTraverserFindFirst() { }
+
+    virtual wxDirTraverseResult OnFile(const wxString& filename)
+    {
+        m_file = filename;
+        return wxDIR_STOP;
+    }
+
+    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
+    {
+        return wxDIR_CONTINUE;
+    }
+
+    const wxString& GetFile() const
+    {
+        return m_file;
+    }
+
+private:
+    wxString m_file;
+
+    DECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst)
+};
+
+/* static */
+wxString wxDir::FindFirst(const wxString& dirname,
+                          const wxString& filespec,
+                          int flags)
+{
+    wxDir dir(dirname);
+    if ( dir.IsOpened() )
+    {
+        wxDirTraverserFindFirst traverser;
+
+        dir.Traverse(traverser, filespec, flags | wxDIR_FILES);
+        return traverser.GetFile();
+    }
+
+    return wxEmptyString;
+}
+
+
+// ----------------------------------------------------------------------------
+// wxDir::GetTotalSize()
+// ----------------------------------------------------------------------------
+
+class wxDirTraverserSumSize : public wxDirTraverser
+{
+public:
+    wxDirTraverserSumSize() { }
+
+    virtual wxDirTraverseResult OnFile(const wxString& filename)
+    {
+        wxULongLong sz = wxFileName::GetSize(filename);
+
+        // wxFileName::GetSize won't use this class again as
+        // we're passing it a file and not a directory;
+        // thus we are sure to avoid an endless loop
+        if (sz == wxInvalidSize)
+        {
+            // if the GetSize() failed (this can happen because e.g. a
+            // file is locked by another process), we can proceed but
+            // we need to at least warn the user that the resulting
+            // final size could be not reliable (if e.g. the locked
+            // file is very big).
+            m_skippedFiles.Add(filename);
+            return wxDIR_CONTINUE;
+        }
+
+        m_sz += sz;
+        return wxDIR_CONTINUE;
+    }
+
+    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
+    {
+        return wxDIR_CONTINUE;
+    }
+
+    wxULongLong GetTotalSize() const
+        { return m_sz; }
+    wxArrayString &FilesSkipped()
+        { return m_skippedFiles; }
+
+protected:
+    wxULongLong m_sz;
+    wxArrayString m_skippedFiles;
+};
+
+wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSkipped)
+{
+    if (!wxDirExists(dirname))
+        return wxInvalidSize;
+
+    // to get the size of this directory and its contents we need
+    // to recursively walk it...
+    wxDir dir(dirname);
+    if ( !dir.IsOpened() )
+        return wxInvalidSize;
+
+    wxDirTraverserSumSize traverser;
+    if (dir.Traverse(traverser) == (size_t)-1 ||
+        traverser.GetTotalSize() == 0)
+        return wxInvalidSize;
+
+    if (filesSkipped)
+        *filesSkipped = traverser.FilesSkipped();
+
+    return traverser.GetTotalSize();
+}
+
diff --git a/Source/3rd Party/wx/src/common/dirctrlcmn.cpp b/Source/3rd Party/wx/src/common/dirctrlcmn.cpp
deleted file mode 100644
index 326044c66..000000000
--- a/Source/3rd Party/wx/src/common/dirctrlcmn.cpp	
+++ /dev/null
@@ -1,89 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dirctrlcmn.cpp
-// Purpose:     wxGenericDirCtrl common code
-// Author:      Harm van der Heijden, Robert Roebling, Julian Smart
-// Modified by:
-// Created:     12/12/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Harm van der Heijden, Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_DIRDLG || wxUSE_FILEDLG
-
-#include "wx/generic/dirctrlg.h"
-
-extern WXDLLEXPORT_DATA(const char) wxDirDialogNameStr[] = "wxDirCtrl";
-extern WXDLLEXPORT_DATA(const char) wxDirDialogDefaultFolderStr[] = "/";
-extern WXDLLEXPORT_DATA(const char) wxDirSelectorPromptStr[] = "Select a directory";
-
-//-----------------------------------------------------------------------------
-// XTI
-//-----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxGenericDirCtrlStyle )
-wxBEGIN_FLAGS( wxGenericDirCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY)
-    wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL)
-    wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST)
-    wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)
-wxEND_FLAGS( wxGenericDirCtrlStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl, "wx/dirctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)
-    wxHIDE_PROPERTY( Children )
-
-    wxPROPERTY( DefaultPath, wxString, SetDefaultPath, GetDefaultPath, \
-                wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( Filter, wxString, SetFilter, GetFilter, wxEMPTY_PARAMETER_VALUE, \
-                0 /*flags*/, wxT("Helpstring"), wxT("group") )
-    wxPROPERTY( DefaultFilter, int, SetFilterIndex, GetFilterIndex, \
-                wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group") )
-
-    wxPROPERTY_FLAGS( WindowStyle, wxGenericDirCtrlStyle, long, SetWindowStyleFlag, \
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0, wxT("Helpstring"), \
-                      wxT("group") )
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxGenericDirCtrl)
-
-wxCONSTRUCTOR_8( wxGenericDirCtrl, wxWindow*, Parent, wxWindowID, Id, \
-                 wxString, DefaultPath, wxPoint, Position, wxSize, Size, \
-                 long, WindowStyle, wxString, Filter, int, DefaultFilter )
-
-#endif // wxUSE_DIRDLG || wxUSE_FILEDLG
diff --git a/Source/3rd Party/wx/src/common/dlgcmn.cpp b/Source/3rd Party/wx/src/common/dlgcmn.cpp
index a5d4a74bc..597b14e2c 100644
--- a/Source/3rd Party/wx/src/common/dlgcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/dlgcmn.cpp	
@@ -1,1006 +1,565 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dlgcmn.cpp
-// Purpose:     common (to all ports) wxDialog functions
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     28.06.99
-// RCS-ID:      $Id$
-// Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/dialog.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/button.h"
-    #include "wx/dcclient.h"
-    #include "wx/intl.h"
-    #include "wx/settings.h"
-    #include "wx/stattext.h"
-    #include "wx/sizer.h"
-    #include "wx/containr.h"
-#endif
-
-#include "wx/statline.h"
-#include "wx/sysopt.h"
-#include "wx/module.h"
-#include "wx/bookctrl.h"
-#include "wx/scrolwin.h"
-#include "wx/textwrapper.h"
-
-#if wxUSE_DISPLAY
-#include "wx/display.h"
-#endif
-
-extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog";
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxDialogStyle )
-wxBEGIN_FLAGS( wxDialogStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxNO_BORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-
-// dialog styles
-wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
-wxFLAGS_MEMBER(wxSTAY_ON_TOP)
-wxFLAGS_MEMBER(wxCAPTION)
-#if WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxTHICK_FRAME)
-#endif // WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxSYSTEM_MENU)
-wxFLAGS_MEMBER(wxRESIZE_BORDER)
-#if WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxRESIZE_BOX)
-#endif // WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxCLOSE_BOX)
-wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
-wxFLAGS_MEMBER(wxMINIMIZE_BOX)
-wxEND_FLAGS( wxDialogStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow, "wx/dialog.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxDialog)
-wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString(), \
-           0 /*flags*/, wxT("Helpstring"), wxT("group"))
-
-wxPROPERTY_FLAGS( WindowStyle, wxDialogStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxDialog)
-
-wxCONSTRUCTOR_6( wxDialog, wxWindow*, Parent, wxWindowID, Id, \
-                wxString, Title, wxPoint, Position, wxSize, Size, long, WindowStyle)
-
-// ----------------------------------------------------------------------------
-// wxDialogBase
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
-    EVT_BUTTON(wxID_ANY, wxDialogBase::OnButton)
-
-    EVT_CLOSE(wxDialogBase::OnCloseWindow)
-
-    EVT_CHAR_HOOK(wxDialogBase::OnCharHook)
-END_EVENT_TABLE()
-
-wxDialogLayoutAdapter* wxDialogBase::sm_layoutAdapter = NULL;
-bool wxDialogBase::sm_layoutAdaptation = false;
-
-void wxDialogBase::Init()
-{
-    m_returnCode = 0;
-    m_affirmativeId = wxID_OK;
-    m_escapeId = wxID_ANY;
-    m_layoutAdaptationLevel = 3;
-    m_layoutAdaptationDone = FALSE;
-    m_layoutAdaptationMode = wxDIALOG_ADAPTATION_MODE_DEFAULT;
-
-    // the dialogs have this flag on by default to prevent the events from the
-    // dialog controls from reaching the parent frame which is usually
-    // undesirable and can lead to unexpected and hard to find bugs
-    SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
-}
-
-wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const
-{
-    if ( !parent )
-        return NULL;
-
-    extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
-    if ( wxPendingDelete.Member(parent) || parent->IsBeingDeleted() )
-    {
-        // this window is being deleted and we shouldn't create any children
-        // under it
-        return NULL;
-    }
-
-    if ( parent->HasExtraStyle(wxWS_EX_TRANSIENT) )
-    {
-        // this window is not being deleted yet but it's going to disappear
-        // soon so still don't parent this window under it
-        return NULL;
-    }
-
-    if ( !parent->IsShownOnScreen() )
-    {
-        // using hidden parent won't work correctly neither
-        return NULL;
-    }
-
-    // FIXME-VC6: this compiler requires an explicit const cast or it fails
-    //            with error C2446
-    if ( const_cast<const wxWindow *>(parent) == this )
-    {
-        // not sure if this can really happen but it doesn't hurt to guard
-        // against this clearly invalid situation
-        return NULL;
-    }
-
-    return parent;
-}
-
-wxWindow *
-wxDialogBase::GetParentForModalDialog(wxWindow *parent, long style) const
-{
-    // creating a parent-less modal dialog will result (under e.g. wxGTK2)
-    // in an unfocused dialog, so try to find a valid parent for it unless we
-    // were explicitly asked not to
-    if ( style & wxDIALOG_NO_PARENT )
-        return NULL;
-
-    // first try the given parent
-    if ( parent )
-        parent = CheckIfCanBeUsedAsParent(wxGetTopLevelParent(parent));
-
-    // then the currently active window
-    if ( !parent )
-        parent = CheckIfCanBeUsedAsParent(
-                    wxGetTopLevelParent(wxGetActiveWindow()));
-
-    // and finally the application main window
-    if ( !parent )
-        parent = CheckIfCanBeUsedAsParent(wxTheApp->GetTopWindow());
-
-    return parent;
-}
-
-#if wxUSE_STATTEXT
-
-wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
-{
-    wxTextSizerWrapper wrapper(this);
-
-    return CreateTextSizer(message, wrapper);
-}
-
-wxSizer *wxDialogBase::CreateTextSizer(const wxString& message,
-                                       wxTextSizerWrapper& wrapper)
-{
-    // I admit that this is complete bogus, but it makes
-    // message boxes work for pda screens temporarily..
-    int widthMax = -1;
-    const bool is_pda = wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA;
-    if (is_pda)
-    {
-        widthMax = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25;
-    }
-
-    return wrapper.CreateSizer(message, widthMax);
-}
-
-#endif // wxUSE_STATTEXT
-
-wxSizer *wxDialogBase::CreateButtonSizer(long flags)
-{
-#ifdef __SMARTPHONE__
-    wxDialog* dialog = (wxDialog*) this;
-    if ( flags & wxOK )
-        dialog->SetLeftMenu(wxID_OK);
-
-    if ( flags & wxCANCEL )
-        dialog->SetRightMenu(wxID_CANCEL);
-
-    if ( flags & wxYES )
-        dialog->SetLeftMenu(wxID_YES);
-
-    if ( flags & wxNO )
-        dialog->SetRightMenu(wxID_NO);
-
-    return NULL;
-#else // !__SMARTPHONE__
-
-#if wxUSE_BUTTON
-
-#ifdef __POCKETPC__
-    // PocketPC guidelines recommend for Ok/Cancel dialogs to use OK button
-    // located inside caption bar and implement Cancel functionality through
-    // Undo outside dialog. As native behaviour this will be default here but
-    // can be replaced with real wxButtons by setting the option below to 1
-    if ( (flags & ~(wxCANCEL|wxNO_DEFAULT)) != wxOK ||
-            wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel")) )
-#endif // __POCKETPC__
-    {
-        return CreateStdDialogButtonSizer(flags);
-    }
-#ifdef __POCKETPC__
-    return NULL;
-#endif // __POCKETPC__
-
-#else // !wxUSE_BUTTON
-    wxUnusedVar(flags);
-
-    return NULL;
-#endif // wxUSE_BUTTON/!wxUSE_BUTTON
-
-#endif // __SMARTPHONE__/!__SMARTPHONE__
-}
-
-wxSizer *wxDialogBase::CreateSeparatedSizer(wxSizer *sizer)
-{
-    // Mac Human Interface Guidelines recommend not to use static lines as
-    // grouping elements
-#if wxUSE_STATLINE && !defined(__WXMAC__)
-    wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
-    topsizer->Add(new wxStaticLine(this),
-                   wxSizerFlags().Expand().DoubleBorder(wxBOTTOM));
-    topsizer->Add(sizer, wxSizerFlags().Expand());
-    sizer = topsizer;
-#endif // wxUSE_STATLINE
-
-    return sizer;
-}
-
-wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags)
-{
-    wxSizer *sizer = CreateButtonSizer(flags);
-    if ( !sizer )
-        return NULL;
-
-    return CreateSeparatedSizer(sizer);
-}
-
-#if wxUSE_BUTTON
-
-wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags )
-{
-    wxStdDialogButtonSizer *sizer = new wxStdDialogButtonSizer();
-
-    wxButton *ok = NULL;
-    wxButton *yes = NULL;
-    wxButton *no = NULL;
-
-    if (flags & wxOK)
-    {
-        ok = new wxButton(this, wxID_OK);
-        sizer->AddButton(ok);
-    }
-
-    if (flags & wxCANCEL)
-    {
-        wxButton *cancel = new wxButton(this, wxID_CANCEL);
-        sizer->AddButton(cancel);
-    }
-
-    if (flags & wxYES)
-    {
-        yes = new wxButton(this, wxID_YES);
-        sizer->AddButton(yes);
-    }
-
-    if (flags & wxNO)
-    {
-        no = new wxButton(this, wxID_NO);
-        sizer->AddButton(no);
-    }
-
-    if (flags & wxAPPLY)
-    {
-        wxButton *apply = new wxButton(this, wxID_APPLY);
-        sizer->AddButton(apply);
-    }
-
-    if (flags & wxCLOSE)
-    {
-        wxButton *close = new wxButton(this, wxID_CLOSE);
-        sizer->AddButton(close);
-    }
-
-    if (flags & wxHELP)
-    {
-        wxButton *help = new wxButton(this, wxID_HELP);
-        sizer->AddButton(help);
-    }
-
-    if (flags & wxNO_DEFAULT)
-    {
-        if (no)
-        {
-            no->SetDefault();
-            no->SetFocus();
-        }
-    }
-    else
-    {
-        if (ok)
-        {
-            ok->SetDefault();
-            ok->SetFocus();
-        }
-        else if (yes)
-        {
-            yes->SetDefault();
-            yes->SetFocus();
-        }
-    }
-
-    if (flags & wxOK)
-        SetAffirmativeId(wxID_OK);
-    else if (flags & wxYES)
-        SetAffirmativeId(wxID_YES);
-
-    sizer->Realize();
-
-    return sizer;
-}
-
-#endif // wxUSE_BUTTON
-
-// ----------------------------------------------------------------------------
-// standard buttons handling
-// ----------------------------------------------------------------------------
-
-void wxDialogBase::EndDialog(int rc)
-{
-    if ( IsModal() )
-        EndModal(rc);
-    else
-        Hide();
-}
-
-void wxDialogBase::AcceptAndClose()
-{
-    if ( Validate() && TransferDataFromWindow() )
-    {
-        EndDialog(m_affirmativeId);
-    }
-}
-
-void wxDialogBase::SetAffirmativeId(int affirmativeId)
-{
-    m_affirmativeId = affirmativeId;
-}
-
-void wxDialogBase::SetEscapeId(int escapeId)
-{
-    m_escapeId = escapeId;
-}
-
-bool wxDialogBase::EmulateButtonClickIfPresent(int id)
-{
-#if wxUSE_BUTTON
-    wxButton *btn = wxDynamicCast(FindWindow(id), wxButton);
-
-    if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
-        return false;
-
-    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, id);
-    event.SetEventObject(btn);
-    btn->GetEventHandler()->ProcessEvent(event);
-
-    return true;
-#else // !wxUSE_BUTTON
-    wxUnusedVar(id);
-    return false;
-#endif // wxUSE_BUTTON/!wxUSE_BUTTON
-}
-
-bool wxDialogBase::SendCloseButtonClickEvent()
-{
-    int idCancel = GetEscapeId();
-    switch ( idCancel )
-    {
-        case wxID_NONE:
-            // The user doesn't want this dialog to close "implicitly".
-            break;
-
-        case wxID_ANY:
-            // this value is special: it means translate Esc to wxID_CANCEL
-            // but if there is no such button, then fall back to wxID_OK
-            if ( EmulateButtonClickIfPresent(wxID_CANCEL) )
-                return true;
-            idCancel = GetAffirmativeId();
-            // fall through
-
-        default:
-            // translate Esc to button press for the button with given id
-            if ( EmulateButtonClickIfPresent(idCancel) )
-                return true;
-    }
-
-    return false;
-}
-
-bool wxDialogBase::IsEscapeKey(const wxKeyEvent& event)
-{
-    // for most platforms, Esc key is used to close the dialogs
-    return event.GetKeyCode() == WXK_ESCAPE &&
-                event.GetModifiers() == wxMOD_NONE;
-}
-
-void wxDialogBase::OnCharHook(wxKeyEvent& event)
-{
-    if ( event.GetKeyCode() == WXK_ESCAPE )
-    {
-        if ( SendCloseButtonClickEvent() )
-        {
-            // Skip the call to event.Skip() below, we did handle this key.
-            return;
-        }
-    }
-
-    event.Skip();
-}
-
-void wxDialogBase::OnButton(wxCommandEvent& event)
-{
-    const int id = event.GetId();
-    if ( id == GetAffirmativeId() )
-    {
-        AcceptAndClose();
-    }
-    else if ( id == wxID_APPLY )
-    {
-        if ( Validate() )
-            TransferDataFromWindow();
-
-        // TODO: disable the Apply button until things change again
-    }
-    else if ( id == GetEscapeId() ||
-                (id == wxID_CANCEL && GetEscapeId() == wxID_ANY) )
-    {
-        EndDialog(wxID_CANCEL);
-    }
-    else // not a standard button
-    {
-        event.Skip();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// compatibility methods for supporting the modality API
-// ----------------------------------------------------------------------------
-
-wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent  );
-
-IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent)
-
-void wxDialogBase::ShowWindowModal ()
-{
-    ShowModal();
-    SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );
-}
-
-void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type )
-{
-    wxWindowModalDialogEvent event ( type, GetId());
-    event.SetEventObject(this);
-
-    if ( !GetEventHandler()->ProcessEvent(event) )
-    {
-        // the event is not propagated upwards to the parent automatically
-        // because the dialog is a top level window, so do it manually as
-        // in 9 cases of 10 the message must be processed by the dialog
-        // owner and not the dialog itself
-        (void)GetParent()->GetEventHandler()->ProcessEvent(event);
-    }
-}
-
-
-wxDialogModality wxDialogBase::GetModality() const
-{
-    return IsModal() ? wxDIALOG_MODALITY_APP_MODAL : wxDIALOG_MODALITY_NONE;
-}
-
-// ----------------------------------------------------------------------------
-// other event handlers
-// ----------------------------------------------------------------------------
-
-void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    // We'll send a Cancel message by default, which may close the dialog.
-
-    // Check for looping if the Cancel event handler calls Close().
-    //
-    // VZ: this is horrible and MT-unsafe. Can't we reuse some of these global
-    //     lists here? don't dare to change it now, but should be done later!
-    static wxList closing;
-
-    if ( closing.Member(this) )
-        return;
-
-    closing.Append(this);
-
-    if ( !SendCloseButtonClickEvent() )
-    {
-        // If the handler didn't close the dialog (e.g. because there is no
-        // button with matching id) we still want to close it when the user
-        // clicks the "x" button in the title bar, otherwise we shouldn't even
-        // have put it there.
-        //
-        // Notice that using wxID_CLOSE might have been a better choice but we
-        // use wxID_CANCEL for compatibility reasons.
-        EndDialog(wxID_CANCEL);
-    }
-
-    closing.DeleteObject(this);
-}
-
-void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-#ifndef __WXGTK__
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-    Refresh();
-#endif
-
-    event.Skip();
-}
-
-/// Do the adaptation
-bool wxDialogBase::DoLayoutAdaptation()
-{
-    if (GetLayoutAdapter())
-    {
-        wxWindow* focusWindow = wxFindFocusDescendant(this); // from event.h
-        if (GetLayoutAdapter()->DoLayoutAdaptation((wxDialog*) this))
-        {
-            if (focusWindow)
-                focusWindow->SetFocus();
-            return true;
-        }
-        else
-            return false;
-    }
-    else
-        return false;
-}
-
-/// Can we do the adaptation?
-bool wxDialogBase::CanDoLayoutAdaptation()
-{
-    // Check if local setting overrides the global setting
-    bool layoutEnabled = (GetLayoutAdaptationMode() == wxDIALOG_ADAPTATION_MODE_ENABLED) || (IsLayoutAdaptationEnabled() && (GetLayoutAdaptationMode() != wxDIALOG_ADAPTATION_MODE_DISABLED));
-
-    return (layoutEnabled && !m_layoutAdaptationDone && GetLayoutAdaptationLevel() != 0 && GetLayoutAdapter() != NULL && GetLayoutAdapter()->CanDoLayoutAdaptation((wxDialog*) this));
-}
-
-/// Set scrolling adapter class, returning old adapter
-wxDialogLayoutAdapter* wxDialogBase::SetLayoutAdapter(wxDialogLayoutAdapter* adapter)
-{
-    wxDialogLayoutAdapter* oldLayoutAdapter = sm_layoutAdapter;
-    sm_layoutAdapter = adapter;
-    return oldLayoutAdapter;
-}
-
-/*!
- * Standard adapter
- */
-
-IMPLEMENT_CLASS(wxDialogLayoutAdapter, wxObject)
-
-IMPLEMENT_CLASS(wxStandardDialogLayoutAdapter, wxDialogLayoutAdapter)
-
-// Allow for caption size on wxWidgets < 2.9
-#if defined(__WXGTK__) && !wxCHECK_VERSION(2,9,0)
-#define wxEXTRA_DIALOG_HEIGHT 30
-#else
-#define wxEXTRA_DIALOG_HEIGHT 0
-#endif
-
-/// Indicate that adaptation should be done
-bool wxStandardDialogLayoutAdapter::CanDoLayoutAdaptation(wxDialog* dialog)
-{
-    if (dialog->GetSizer())
-    {
-        wxSize windowSize, displaySize;
-        return MustScroll(dialog, windowSize, displaySize) != 0;
-    }
-    else
-        return false;
-}
-
-bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog)
-{
-    if (dialog->GetSizer())
-    {
-#if wxUSE_BOOKCTRL
-        wxBookCtrlBase* bookContentWindow = wxDynamicCast(dialog->GetContentWindow(), wxBookCtrlBase);
-
-        if (bookContentWindow)
-        {
-            // If we have a book control, make all the pages (that use sizers) scrollable
-            wxWindowList windows;
-            for (size_t i = 0; i < bookContentWindow->GetPageCount(); i++)
-            {
-                wxWindow* page = bookContentWindow->GetPage(i);
-
-                wxScrolledWindow* scrolledWindow = wxDynamicCast(page, wxScrolledWindow);
-                if (scrolledWindow)
-                    windows.Append(scrolledWindow);
-                else if (!scrolledWindow && page->GetSizer())
-                {
-                    // Create a scrolled window and reparent
-                    scrolledWindow = CreateScrolledWindow(page);
-                    wxSizer* oldSizer = page->GetSizer();
-
-                    wxSizer* newSizer = new wxBoxSizer(wxVERTICAL);
-                    newSizer->Add(scrolledWindow,1, wxEXPAND, 0);
-
-                    page->SetSizer(newSizer, false /* don't delete the old sizer */);
-
-                    scrolledWindow->SetSizer(oldSizer);
-
-                    ReparentControls(page, scrolledWindow);
-
-                    windows.Append(scrolledWindow);
-                }
-            }
-
-            FitWithScrolling(dialog, windows);
-        }
-        else
-#endif // wxUSE_BOOKCTRL
-        {
-#if wxUSE_BUTTON
-            // If we have an arbitrary dialog, create a scrolling area for the main content, and a button sizer
-            // for the main buttons.
-            wxScrolledWindow* scrolledWindow = CreateScrolledWindow(dialog);
-
-            int buttonSizerBorder = 0;
-
-            // First try to find a wxStdDialogButtonSizer
-            wxSizer* buttonSizer = FindButtonSizer(true /* find std button sizer */, dialog, dialog->GetSizer(), buttonSizerBorder);
-
-            // Next try to find a wxBoxSizer containing the controls
-            if (!buttonSizer && dialog->GetLayoutAdaptationLevel() > wxDIALOG_ADAPTATION_STANDARD_SIZER)
-                buttonSizer = FindButtonSizer(false /* find ordinary sizer */, dialog, dialog->GetSizer(), buttonSizerBorder);
-
-            // If we still don't have a button sizer, collect any 'loose' buttons in the layout
-            if (!buttonSizer && dialog->GetLayoutAdaptationLevel() > wxDIALOG_ADAPTATION_ANY_SIZER)
-            {
-                int count = 0;
-                wxStdDialogButtonSizer* stdButtonSizer = new wxStdDialogButtonSizer;
-                buttonSizer = stdButtonSizer;
-
-                FindLooseButtons(dialog, stdButtonSizer, dialog->GetSizer(), count);
-                if (count > 0)
-                    stdButtonSizer->Realize();
-                else
-                {
-                    wxDELETE(buttonSizer);
-                }
-            }
-
-            if (buttonSizerBorder == 0)
-                buttonSizerBorder = 5;
-
-            ReparentControls(dialog, scrolledWindow, buttonSizer);
-
-            wxBoxSizer* newTopSizer = new wxBoxSizer(wxVERTICAL);
-            wxSizer* oldSizer = dialog->GetSizer();
-
-            dialog->SetSizer(newTopSizer, false /* don't delete old sizer */);
-
-            newTopSizer->Add(scrolledWindow, 1, wxEXPAND|wxALL, 0);
-            if (buttonSizer)
-                newTopSizer->Add(buttonSizer, 0, wxEXPAND|wxALL, buttonSizerBorder);
-
-            scrolledWindow->SetSizer(oldSizer);
-
-            FitWithScrolling(dialog, scrolledWindow);
-#endif // wxUSE_BUTTON
-        }
-    }
-
-    dialog->SetLayoutAdaptationDone(true);
-    return true;
-}
-
-// Create the scrolled window
-wxScrolledWindow* wxStandardDialogLayoutAdapter::CreateScrolledWindow(wxWindow* parent)
-{
-    wxScrolledWindow* scrolledWindow = new wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxVSCROLL|wxHSCROLL|wxBORDER_NONE);
-    return scrolledWindow;
-}
-
-#if wxUSE_BUTTON
-
-/// Find and remove the button sizer, if any
-wxSizer* wxStandardDialogLayoutAdapter::FindButtonSizer(bool stdButtonSizer, wxDialog* dialog, wxSizer* sizer, int& retBorder, int accumlatedBorder)
-{
-    for ( wxSizerItemList::compatibility_iterator node = sizer->GetChildren().GetFirst();
-          node; node = node->GetNext() )
-    {
-        wxSizerItem *item = node->GetData();
-        wxSizer *childSizer = item->GetSizer();
-
-        if ( childSizer )
-        {
-            int newBorder = accumlatedBorder;
-            if (item->GetFlag() & wxALL)
-                newBorder += item->GetBorder();
-
-            if (stdButtonSizer) // find wxStdDialogButtonSizer
-            {
-                wxStdDialogButtonSizer* buttonSizer = wxDynamicCast(childSizer, wxStdDialogButtonSizer);
-                if (buttonSizer)
-                {
-                    sizer->Detach(childSizer);
-                    retBorder = newBorder;
-                    return buttonSizer;
-                }
-            }
-            else // find a horizontal box sizer containing standard buttons
-            {
-                wxBoxSizer* buttonSizer = wxDynamicCast(childSizer, wxBoxSizer);
-                if (buttonSizer && IsOrdinaryButtonSizer(dialog, buttonSizer))
-                {
-                    sizer->Detach(childSizer);
-                    retBorder = newBorder;
-                    return buttonSizer;
-                }
-            }
-
-            wxSizer* s = FindButtonSizer(stdButtonSizer, dialog, childSizer, retBorder, newBorder);
-            if (s)
-                return s;
-        }
-    }
-    return NULL;
-}
-
-/// Check if this sizer contains standard buttons, and so can be repositioned in the dialog
-bool wxStandardDialogLayoutAdapter::IsOrdinaryButtonSizer(wxDialog* dialog, wxBoxSizer* sizer)
-{
-    if (sizer->GetOrientation() != wxHORIZONTAL)
-        return false;
-
-    for ( wxSizerItemList::compatibility_iterator node = sizer->GetChildren().GetFirst();
-          node; node = node->GetNext() )
-    {
-        wxSizerItem *item = node->GetData();
-        wxButton *childButton = wxDynamicCast(item->GetWindow(), wxButton);
-
-        if (childButton && IsStandardButton(dialog, childButton))
-            return true;
-    }
-    return false;
-}
-
-/// Check if this is a standard button
-bool wxStandardDialogLayoutAdapter::IsStandardButton(wxDialog* dialog, wxButton* button)
-{
-    wxWindowID id = button->GetId();
-
-    return (id == wxID_OK || id == wxID_CANCEL || id == wxID_YES || id == wxID_NO || id == wxID_SAVE ||
-            id == wxID_APPLY || id == wxID_HELP || id == wxID_CONTEXT_HELP || dialog->IsMainButtonId(id));
-}
-
-/// Find 'loose' main buttons in the existing layout and add them to the standard dialog sizer
-bool wxStandardDialogLayoutAdapter::FindLooseButtons(wxDialog* dialog, wxStdDialogButtonSizer* buttonSizer, wxSizer* sizer, int& count)
-{
-    wxSizerItemList::compatibility_iterator node = sizer->GetChildren().GetFirst();
-    while (node)
-    {
-        wxSizerItemList::compatibility_iterator next = node->GetNext();
-        wxSizerItem *item = node->GetData();
-        wxSizer *childSizer = item->GetSizer();
-        wxButton *childButton = wxDynamicCast(item->GetWindow(), wxButton);
-
-        if (childButton && IsStandardButton(dialog, childButton))
-        {
-            sizer->Detach(childButton);
-            buttonSizer->AddButton(childButton);
-            count ++;
-        }
-
-        if (childSizer)
-            FindLooseButtons(dialog, buttonSizer, childSizer, count);
-
-        node = next;
-    }
-    return true;
-}
-
-#endif // wxUSE_BUTTON
-
-/// Reparent the controls to the scrolled window
-void wxStandardDialogLayoutAdapter::ReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer)
-{
-    DoReparentControls(parent, reparentTo, buttonSizer);
-}
-
-void wxStandardDialogLayoutAdapter::DoReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer)
-{
-    wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindowList::compatibility_iterator next = node->GetNext();
-
-        wxWindow *win = node->GetData();
-
-        // Don't reparent the scrolled window or buttons in the button sizer
-        if (win != reparentTo && (!buttonSizer || !buttonSizer->GetItem(win)))
-        {
-            win->Reparent(reparentTo);
-#ifdef __WXMSW__
-            // Restore correct tab order
-            ::SetWindowPos((HWND) win->GetHWND(), HWND_BOTTOM, -1, -1, -1, -1, SWP_NOMOVE|SWP_NOSIZE);
-#endif
-        }
-
-        node = next;
-    }
-}
-
-/// Find whether scrolling will be necessary for the dialog, returning wxVERTICAL, wxHORIZONTAL or both
-int wxStandardDialogLayoutAdapter::MustScroll(wxDialog* dialog, wxSize& windowSize, wxSize& displaySize)
-{
-    return DoMustScroll(dialog, windowSize, displaySize);
-}
-
-/// Find whether scrolling will be necessary for the dialog, returning wxVERTICAL, wxHORIZONTAL or both
-int wxStandardDialogLayoutAdapter::DoMustScroll(wxDialog* dialog, wxSize& windowSize, wxSize& displaySize)
-{
-    wxSize minWindowSize = dialog->GetSizer()->GetMinSize();
-    windowSize = dialog->GetSize();
-    windowSize = wxSize(wxMax(windowSize.x, minWindowSize.x), wxMax(windowSize.y, minWindowSize.y));
-#if wxUSE_DISPLAY
-    displaySize = wxDisplay(wxDisplay::GetFromWindow(dialog)).GetClientArea().GetSize();
-#else
-    displaySize = wxGetClientDisplayRect().GetSize();
-#endif
-
-    int flags = 0;
-
-    if (windowSize.y >= (displaySize.y - wxEXTRA_DIALOG_HEIGHT))
-        flags |= wxVERTICAL;
-    if (windowSize.x >= displaySize.x)
-        flags |= wxHORIZONTAL;
-
-    return flags;
-}
-
-// A function to fit the dialog around its contents, and then adjust for screen size.
-// If scrolled windows are passed, scrolling is enabled in the required orientation(s).
-bool wxStandardDialogLayoutAdapter::FitWithScrolling(wxDialog* dialog, wxWindowList& windows)
-{
-    return DoFitWithScrolling(dialog, windows);
-}
-
-// A function to fit the dialog around its contents, and then adjust for screen size.
-// If a scrolled window is passed, scrolling is enabled in the required orientation(s).
-bool wxStandardDialogLayoutAdapter::FitWithScrolling(wxDialog* dialog, wxScrolledWindow* scrolledWindow)
-{
-    return DoFitWithScrolling(dialog, scrolledWindow);
-}
-
-// A function to fit the dialog around its contents, and then adjust for screen size.
-// If a scrolled window is passed, scrolling is enabled in the required orientation(s).
-bool wxStandardDialogLayoutAdapter::DoFitWithScrolling(wxDialog* dialog, wxScrolledWindow* scrolledWindow)
-{
-    wxWindowList windows;
-    windows.Append(scrolledWindow);
-    return DoFitWithScrolling(dialog, windows);
-}
-
-bool wxStandardDialogLayoutAdapter::DoFitWithScrolling(wxDialog* dialog, wxWindowList& windows)
-{
-    wxSizer* sizer = dialog->GetSizer();
-    if (!sizer)
-        return false;
-
-    sizer->SetSizeHints(dialog);
-
-    wxSize windowSize, displaySize;
-    int scrollFlags = DoMustScroll(dialog, windowSize, displaySize);
-    int scrollBarSize = 20;
-
-    if (scrollFlags)
-    {
-        int scrollBarExtraX = 0, scrollBarExtraY = 0;
-        bool resizeHorizontally = (scrollFlags & wxHORIZONTAL) != 0;
-        bool resizeVertically = (scrollFlags & wxVERTICAL) != 0;
-
-        if (windows.GetCount() != 0)
-        {
-            // Allow extra for a scrollbar, assuming we resizing in one direction only.
-            if ((resizeVertically && !resizeHorizontally) && (windowSize.x < (displaySize.x - scrollBarSize)))
-                scrollBarExtraX = scrollBarSize;
-            if ((resizeHorizontally && !resizeVertically) && (windowSize.y < (displaySize.y - scrollBarSize)))
-                scrollBarExtraY = scrollBarSize;
-        }
-
-        wxWindowList::compatibility_iterator node = windows.GetFirst();
-        while (node)
-        {
-            wxWindow *win = node->GetData();
-            wxScrolledWindow* scrolledWindow = wxDynamicCast(win, wxScrolledWindow);
-            if (scrolledWindow)
-            {
-                scrolledWindow->SetScrollRate(resizeHorizontally ? 10 : 0, resizeVertically ? 10 : 0);
-
-                if (scrolledWindow->GetSizer())
-                    scrolledWindow->GetSizer()->Fit(scrolledWindow);
-            }
-
-            node = node->GetNext();
-        }
-
-        wxSize limitTo = windowSize + wxSize(scrollBarExtraX, scrollBarExtraY);
-        if (resizeVertically)
-            limitTo.y = displaySize.y - wxEXTRA_DIALOG_HEIGHT;
-        if (resizeHorizontally)
-            limitTo.x = displaySize.x;
-
-        dialog->SetMinSize(limitTo);
-        dialog->SetSize(limitTo);
-
-        dialog->SetSizeHints( limitTo.x, limitTo.y, dialog->GetMaxWidth(), dialog->GetMaxHeight() );
-    }
-
-    return true;
-}
-
-/*!
- * Module to initialise standard adapter
- */
-
-class wxDialogLayoutAdapterModule: public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxDialogLayoutAdapterModule)
-public:
-    wxDialogLayoutAdapterModule() {}
-    virtual void OnExit() { delete wxDialogBase::SetLayoutAdapter(NULL); }
-    virtual bool OnInit() { wxDialogBase::SetLayoutAdapter(new wxStandardDialogLayoutAdapter); return true; }
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxDialogLayoutAdapterModule, wxModule)
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dlgcmn.cpp
+// Purpose:     common (to all ports) wxDialog functions
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     28.06.99
+// RCS-ID:      $Id: dlgcmn.cpp 49747 2007-11-09 15:06:52Z JS $
+// Copyright:   (c) Vadim Zeitlin
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/dialog.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+    #include "wx/dcclient.h"
+    #include "wx/intl.h"
+    #include "wx/settings.h"
+    #include "wx/stattext.h"
+    #include "wx/sizer.h"
+    #include "wx/containr.h"
+#endif
+
+#include "wx/statline.h"
+#include "wx/sysopt.h"
+
+#if wxUSE_STATTEXT
+
+// ----------------------------------------------------------------------------
+// wxTextWrapper
+// ----------------------------------------------------------------------------
+
+// this class is used to wrap the text on word boundary: wrapping is done by
+// calling OnStartLine() and OnOutputLine() functions
+class wxTextWrapper
+{
+public:
+    wxTextWrapper() { m_eol = false; }
+
+    // win is used for getting the font, text is the text to wrap, width is the
+    // max line width or -1 to disable wrapping
+    void Wrap(wxWindow *win, const wxString& text, int widthMax);
+
+    // we don't need it, but just to avoid compiler warnings
+    virtual ~wxTextWrapper() { }
+
+protected:
+    // line may be empty
+    virtual void OnOutputLine(const wxString& line) = 0;
+
+    // called at the start of every new line (except the very first one)
+    virtual void OnNewLine() { }
+
+private:
+    // call OnOutputLine() and set m_eol to true
+    void DoOutputLine(const wxString& line)
+    {
+        OnOutputLine(line);
+
+        m_eol = true;
+    }
+
+    // this function is a destructive inspector: when it returns true it also
+    // resets the flag to false so calling it again woulnd't return true any
+    // more
+    bool IsStartOfNewLine()
+    {
+        if ( !m_eol )
+            return false;
+
+        m_eol = false;
+
+        return true;
+    }
+
+
+    bool m_eol;
+};
+
+#endif // wxUSE_STATTEXT
+
+// ----------------------------------------------------------------------------
+// wxDialogBase
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxDialogBase, wxTopLevelWindow)
+    EVT_BUTTON(wxID_ANY, wxDialogBase::OnButton)
+
+    EVT_CLOSE(wxDialogBase::OnCloseWindow)
+
+    EVT_CHAR_HOOK(wxDialogBase::OnCharHook)
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxDialogBase)
+END_EVENT_TABLE()
+
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase, wxTopLevelWindow)
+
+void wxDialogBase::Init()
+{
+    m_returnCode = 0;
+    m_affirmativeId = wxID_OK;
+    m_escapeId = wxID_ANY;
+
+    // the dialogs have this flag on by default to prevent the events from the
+    // dialog controls from reaching the parent frame which is usually
+    // undesirable and can lead to unexpected and hard to find bugs
+    SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
+
+    m_container.SetContainerWindow(this);
+}
+
+#if wxUSE_STATTEXT
+
+void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax)
+{
+    const wxChar *lastSpace = NULL;
+    wxString line;
+
+    const wxChar *lineStart = text.c_str();
+    for ( const wxChar *p = lineStart; ; p++ )
+    {
+        if ( IsStartOfNewLine() )
+        {
+            OnNewLine();
+
+            lastSpace = NULL;
+            line.clear();
+            lineStart = p;
+        }
+
+        if ( *p == _T('\n') || *p == _T('\0') )
+        {
+            DoOutputLine(line);
+
+            if ( *p == _T('\0') )
+                break;
+        }
+        else // not EOL
+        {
+            if ( *p == _T(' ') )
+                lastSpace = p;
+
+            line += *p;
+
+            if ( widthMax >= 0 && lastSpace )
+            {
+                int width;
+                win->GetTextExtent(line, &width, NULL);
+
+                if ( width > widthMax )
+                {
+                    // remove the last word from this line
+                    line.erase(lastSpace - lineStart, p + 1 - lineStart);
+                    DoOutputLine(line);
+
+                    // go back to the last word of this line which we didn't
+                    // output yet
+                    p = lastSpace;
+                }
+            }
+            //else: no wrapping at all or impossible to wrap
+        }
+    }
+}
+
+class wxTextSizerWrapper : public wxTextWrapper
+{
+public:
+    wxTextSizerWrapper(wxWindow *win)
+    {
+        m_win = win;
+        m_hLine = 0;
+    }
+
+    wxSizer *CreateSizer(const wxString& text, int widthMax)
+    {
+        m_sizer = new wxBoxSizer(wxVERTICAL);
+        Wrap(m_win, text, widthMax);
+        return m_sizer;
+    }
+
+protected:
+    virtual void OnOutputLine(const wxString& line)
+    {
+        if ( !line.empty() )
+        {
+            m_sizer->Add(new wxStaticText(m_win, wxID_ANY, line));
+        }
+        else // empty line, no need to create a control for it
+        {
+            if ( !m_hLine )
+                m_hLine = m_win->GetCharHeight();
+
+            m_sizer->Add(5, m_hLine);
+        }
+    }
+
+private:
+    wxWindow *m_win;
+    wxSizer *m_sizer;
+    int m_hLine;
+};
+
+wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
+{
+    // I admit that this is complete bogus, but it makes
+    // message boxes work for pda screens temporarily..
+    int widthMax = -1;
+    const bool is_pda = wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA;
+    if (is_pda)
+    {
+        widthMax = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25;
+    }
+
+    // '&' is used as accel mnemonic prefix in the wxWidgets controls but in
+    // the static messages created by CreateTextSizer() (used by wxMessageBox,
+    // for example), we don't want this special meaning, so we need to quote it
+    wxString text(message);
+    text.Replace(_T("&"), _T("&&"));
+
+    wxTextSizerWrapper wrapper(this);
+
+    return wrapper.CreateSizer(text, widthMax);
+}
+
+class wxLabelWrapper : public wxTextWrapper
+{
+public:
+    void WrapLabel(wxWindow *text, int widthMax)
+    {
+        m_text.clear();
+        Wrap(text, text->GetLabel(), widthMax);
+        text->SetLabel(m_text);
+    }
+
+protected:
+    virtual void OnOutputLine(const wxString& line)
+    {
+        m_text += line;
+    }
+
+    virtual void OnNewLine()
+    {
+        m_text += _T('\n');
+    }
+
+private:
+    wxString m_text;
+};
+
+// NB: don't "factor out" the scope operator, SGI MIPSpro 7.3 (but not 7.4)
+//     gets confused if it doesn't immediately follow the class name
+void
+#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+wxStaticText::
+#else
+wxStaticTextBase::
+#endif
+Wrap(int width)
+{
+    wxLabelWrapper wrapper;
+    wrapper.WrapLabel(this, width);
+}
+
+#endif // wxUSE_STATTEXT
+
+wxSizer *wxDialogBase::CreateButtonSizer(long flags)
+{
+    wxSizer *sizer = NULL;
+
+#ifdef __SMARTPHONE__
+    wxDialog* dialog = (wxDialog*) this;
+    if ( flags & wxOK )
+        dialog->SetLeftMenu(wxID_OK);
+
+    if ( flags & wxCANCEL )
+        dialog->SetRightMenu(wxID_CANCEL);
+
+    if ( flags & wxYES )
+        dialog->SetLeftMenu(wxID_YES);
+
+    if ( flags & wxNO )
+        dialog->SetRightMenu(wxID_NO);
+#else // !__SMARTPHONE__
+
+#if wxUSE_BUTTON
+
+#ifdef __POCKETPC__
+    // PocketPC guidelines recommend for Ok/Cancel dialogs to use OK button
+    // located inside caption bar and implement Cancel functionality through
+    // Undo outside dialog. As native behaviour this will be default here but
+    // can be replaced with real wxButtons by setting the option below to 1
+    if ( (flags & ~(wxCANCEL|wxNO_DEFAULT)) != wxOK ||
+            wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel")) )
+#endif // __POCKETPC__
+    {
+        sizer = CreateStdDialogButtonSizer(flags);
+    }
+#endif // wxUSE_BUTTON
+
+#endif // __SMARTPHONE__/!__SMARTPHONE__
+
+    return sizer;
+}
+
+wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags)
+{
+    wxSizer *sizer = CreateButtonSizer(flags);
+    if ( !sizer )
+        return NULL;
+
+    // Mac Human Interface Guidelines recommend not to use static lines as
+    // grouping elements
+#if wxUSE_STATLINE && !defined(__WXMAC__)
+    wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
+    topsizer->Add(new wxStaticLine(this),
+                   wxSizerFlags().Expand().DoubleBorder(wxBOTTOM));
+    topsizer->Add(sizer, wxSizerFlags().Expand());
+    sizer = topsizer;
+#endif // wxUSE_STATLINE
+
+    return sizer;
+}
+
+#if wxUSE_BUTTON
+
+wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags )
+{
+    wxStdDialogButtonSizer *sizer = new wxStdDialogButtonSizer();
+
+    wxButton *ok = NULL;
+    wxButton *yes = NULL;
+    wxButton *no = NULL;
+
+    if (flags & wxOK)
+    {
+        ok = new wxButton(this, wxID_OK);
+        sizer->AddButton(ok);
+    }
+
+    if (flags & wxCANCEL)
+    {
+        wxButton *cancel = new wxButton(this, wxID_CANCEL);
+        sizer->AddButton(cancel);
+    }
+
+    if (flags & wxYES)
+    {
+        yes = new wxButton(this, wxID_YES);
+        sizer->AddButton(yes);
+    }
+
+    if (flags & wxNO)
+    {
+        no = new wxButton(this, wxID_NO);
+        sizer->AddButton(no);
+    }
+
+    if (flags & wxHELP)
+    {
+        wxButton *help = new wxButton(this, wxID_HELP);
+        sizer->AddButton(help);
+    }
+
+    if (flags & wxNO_DEFAULT)
+    {
+        if (no)
+        {
+            no->SetDefault();
+            no->SetFocus();
+        }
+    }
+    else
+    {
+        if (ok)
+        {
+            ok->SetDefault();
+            ok->SetFocus();
+        }
+        else if (yes)
+        {
+            yes->SetDefault();
+            yes->SetFocus();
+        }
+    }
+
+    if (flags & wxOK)
+        SetAffirmativeId(wxID_OK);
+    else if (flags & wxYES)
+        SetAffirmativeId(wxID_YES);
+
+    sizer->Realize();
+
+    return sizer;
+}
+
+#endif // wxUSE_BUTTON
+
+// ----------------------------------------------------------------------------
+// standard buttons handling
+// ----------------------------------------------------------------------------
+
+void wxDialogBase::EndDialog(int rc)
+{
+    if ( IsModal() )
+        EndModal(rc);
+    else
+        Hide();
+}
+
+void wxDialogBase::AcceptAndClose()
+{
+    if ( Validate() && TransferDataFromWindow() )
+    {
+        EndDialog(m_affirmativeId);
+    }
+}
+
+void wxDialogBase::SetAffirmativeId(int affirmativeId)
+{
+    m_affirmativeId = affirmativeId;
+}
+
+void wxDialogBase::SetEscapeId(int escapeId)
+{
+    m_escapeId = escapeId;
+}
+
+bool wxDialogBase::EmulateButtonClickIfPresent(int id)
+{
+#if wxUSE_BUTTON
+    wxButton *btn = wxDynamicCast(FindWindow(id), wxButton);
+
+    if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
+        return false;
+
+    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, id);
+    event.SetEventObject(btn);
+    btn->GetEventHandler()->ProcessEvent(event);
+
+    return true;
+#else // !wxUSE_BUTTON
+    wxUnusedVar(id);
+    return false;
+#endif // wxUSE_BUTTON/!wxUSE_BUTTON
+}
+
+bool wxDialogBase::IsEscapeKey(const wxKeyEvent& event)
+{
+    // for most platforms, Esc key is used to close the dialogs
+    return event.GetKeyCode() == WXK_ESCAPE &&
+                event.GetModifiers() == wxMOD_NONE;
+}
+
+void wxDialogBase::OnCharHook(wxKeyEvent& event)
+{
+    if ( event.GetKeyCode() == WXK_ESCAPE )
+    {
+        int idCancel = GetEscapeId();
+        switch ( idCancel )
+        {
+            case wxID_NONE:
+                // don't handle Esc specially at all
+                break;
+
+            case wxID_ANY:
+                // this value is special: it means translate Esc to wxID_CANCEL
+                // but if there is no such button, then fall back to wxID_OK
+                if ( EmulateButtonClickIfPresent(wxID_CANCEL) )
+                    return;
+                idCancel = GetAffirmativeId();
+                // fall through
+
+            default:
+                // translate Esc to button press for the button with given id
+                if ( EmulateButtonClickIfPresent(idCancel) )
+                    return;
+        }
+    }
+
+    event.Skip();
+}
+
+void wxDialogBase::OnButton(wxCommandEvent& event)
+{
+    const int id = event.GetId();
+    if ( id == GetAffirmativeId() )
+    {
+        AcceptAndClose();
+    }
+    else if ( id == wxID_APPLY )
+    {
+        if ( Validate() )
+            TransferDataFromWindow();
+
+        // TODO: disable the Apply button until things change again
+    }
+    else if ( id == GetEscapeId() ||
+                (id == wxID_CANCEL && GetEscapeId() == wxID_ANY) )
+    {
+        EndDialog(wxID_CANCEL);
+    }
+    else // not a standard button
+    {
+        event.Skip();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// other event handlers
+// ----------------------------------------------------------------------------
+
+void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+{
+    // We'll send a Cancel message by default, which may close the dialog.
+    // Check for looping if the Cancel event handler calls Close().
+
+    // Note that if a cancel button and handler aren't present in the dialog,
+    // nothing will happen when you close the dialog via the window manager, or
+    // via Close(). We wouldn't want to destroy the dialog by default, since
+    // the dialog may have been created on the stack. However, this does mean
+    // that calling dialog->Close() won't delete the dialog unless the handler
+    // for wxID_CANCEL does so. So use Destroy() if you want to be sure to
+    // destroy the dialog. The default OnCancel (above) simply ends a modal
+    // dialog, and hides a modeless dialog.
+
+    // VZ: this is horrible and MT-unsafe. Can't we reuse some of these global
+    //     lists here? don't dare to change it now, but should be done later!
+    static wxList closing;
+
+    if ( closing.Member(this) )
+        return;
+
+    closing.Append(this);
+
+    wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+    cancelEvent.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
+
+    closing.DeleteObject(this);
+}
+
+void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+#ifndef __WXGTK__
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+    Refresh();
+#endif
+    event.Skip();
+}
diff --git a/Source/3rd Party/wx/src/common/dndcmn.cpp b/Source/3rd Party/wx/src/common/dndcmn.cpp
index 6ae6f73a7..5daf3da7d 100644
--- a/Source/3rd Party/wx/src/common/dndcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/dndcmn.cpp	
@@ -1,31 +1,31 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dndcmn.cpp
-// Author:      Robert Roebling
-// Modified by:
-// Created:     19.10.99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets Team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/dnd.h"
-
-#if wxUSE_DRAG_AND_DROP
-
-bool wxIsDragResultOk(wxDragResult res)
-{
-    return res == wxDragCopy || res == wxDragMove || res == wxDragLink;
-}
-
-#endif
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        common/dndcmn.cpp
+// Author:      Robert Roebling
+// Modified by:
+// Created:     19.10.99
+// RCS-ID:      $Id: dndcmn.cpp 43664 2006-11-26 21:50:51Z JS $
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/dnd.h"
+
+#if wxUSE_DRAG_AND_DROP
+
+bool wxIsDragResultOk(wxDragResult res)
+{
+    return res == wxDragCopy || res == wxDragMove || res == wxDragLink;
+}
+
+#endif
+
diff --git a/Source/3rd Party/wx/src/common/dobjcmn.cpp b/Source/3rd Party/wx/src/common/dobjcmn.cpp
index dca1e80dc..68b194d3e 100644
--- a/Source/3rd Party/wx/src/common/dobjcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/dobjcmn.cpp	
@@ -1,654 +1,517 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dobjcmn.cpp
-// Purpose:     implementation of data object methods common to all platforms
-// Author:      Vadim Zeitlin, Robert Roebling
-// Modified by:
-// Created:     19.10.99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets Team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_DATAOBJ
-
-#include "wx/dataobj.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// lists
-// ----------------------------------------------------------------------------
-
-#include "wx/listimpl.cpp"
-
-WX_DEFINE_LIST(wxSimpleDataObjectList)
-
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-static wxDataFormat dataFormatInvalid;
-WXDLLEXPORT const wxDataFormat& wxFormatInvalid = dataFormatInvalid;
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxDataObjectBase
-// ----------------------------------------------------------------------------
-
-wxDataObjectBase::~wxDataObjectBase()
-{
-}
-
-bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
-                                   Direction dir) const
-{
-    size_t nFormatCount = GetFormatCount( dir );
-    if ( nFormatCount == 1 )
-    {
-        return format == GetPreferredFormat( dir );
-    }
-    else
-    {
-        wxDataFormat *formats = new wxDataFormat[nFormatCount];
-        GetAllFormats( formats, dir );
-
-        size_t n;
-        for ( n = 0; n < nFormatCount; n++ )
-        {
-            if ( formats[n] == format )
-                break;
-        }
-
-        delete [] formats;
-
-        // found?
-        return n < nFormatCount;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxDataObjectComposite
-// ----------------------------------------------------------------------------
-
-wxDataObjectComposite::wxDataObjectComposite()
-{
-    m_preferred = 0;
-    m_receivedFormat = wxFormatInvalid;
-}
-
-wxDataObjectComposite::~wxDataObjectComposite()
-{
-    WX_CLEAR_LIST( wxSimpleDataObjectList, m_dataObjects );
-}
-
-wxDataObjectSimple *
-wxDataObjectComposite::GetObject(const wxDataFormat& format, wxDataObjectBase::Direction dir) const
-{
-    wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst();
-
-    while ( node )
-    {
-        wxDataObjectSimple *dataObj = node->GetData();
-
-        if (dataObj->IsSupported(format,dir))
-          return dataObj;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
-{
-    if ( preferred )
-        m_preferred = m_dataObjects.GetCount();
-
-    m_dataObjects.Append( dataObject );
-}
-
-wxDataFormat wxDataObjectComposite::GetReceivedFormat() const
-{
-    return m_receivedFormat;
-}
-
-wxDataFormat
-wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
-{
-    wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.Item( m_preferred );
-
-    wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") );
-
-    wxDataObjectSimple* dataObj = node->GetData();
-
-    return dataObj->GetFormat();
-}
-
-#if defined(__WXMSW__)
-
-size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format )
-{
-    wxDataObjectSimple *dataObj = GetObject(format);
-
-    wxCHECK_MSG( dataObj, 0,
-                 wxT("unsupported format in wxDataObjectComposite"));
-
-    return dataObj->GetBufferOffset( format );
-}
-
-
-const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
-                                                      size_t* size,
-                                                      const wxDataFormat& format )
-{
-    wxDataObjectSimple *dataObj = GetObject(format);
-
-    wxCHECK_MSG( dataObj, NULL,
-                 wxT("unsupported format in wxDataObjectComposite"));
-
-    return dataObj->GetSizeFromBuffer( buffer, size, format );
-}
-
-
-void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
-                                              const wxDataFormat& format )
-{
-    wxDataObjectSimple *dataObj = GetObject( format );
-
-    wxCHECK_MSG( dataObj, NULL,
-                 wxT("unsupported format in wxDataObjectComposite"));
-
-    return dataObj->SetSizeInBuffer( buffer, size, format );
-}
-
-#endif
-
-size_t wxDataObjectComposite::GetFormatCount(Direction dir) const
-{
-    size_t n = 0;
-
-    // NOTE: some wxDataObjectSimple objects may return a number greater than 1
-    //       from GetFormatCount(): this is the case of e.g. wxTextDataObject
-    //       under wxMac and wxGTK
-    wxSimpleDataObjectList::compatibility_iterator node;
-    for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
-        n += node->GetData()->GetFormatCount(dir);
-
-    return n;
-}
-
-void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,
-                                          Direction dir) const
-{
-    size_t index(0);
-    wxSimpleDataObjectList::compatibility_iterator node;
-
-    for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
-    {
-        // NOTE: some wxDataObjectSimple objects may return more than 1 format
-        //       from GetAllFormats(): this is the case of e.g. wxTextDataObject
-        //       under wxMac and wxGTK
-        node->GetData()->GetAllFormats(formats+index, dir);
-        index += node->GetData()->GetFormatCount(dir);
-    }
-}
-
-size_t wxDataObjectComposite::GetDataSize(const wxDataFormat& format) const
-{
-    wxDataObjectSimple *dataObj = GetObject(format);
-
-    wxCHECK_MSG( dataObj, 0,
-                 wxT("unsupported format in wxDataObjectComposite"));
-
-    return dataObj->GetDataSize();
-}
-
-bool wxDataObjectComposite::GetDataHere(const wxDataFormat& format,
-                                        void *buf) const
-{
-    wxDataObjectSimple *dataObj = GetObject( format );
-
-    wxCHECK_MSG( dataObj, false,
-                 wxT("unsupported format in wxDataObjectComposite"));
-
-    return dataObj->GetDataHere( buf );
-}
-
-bool wxDataObjectComposite::SetData(const wxDataFormat& format,
-                                    size_t len,
-                                    const void *buf)
-{
-    wxDataObjectSimple *dataObj = GetObject( format );
-
-    wxCHECK_MSG( dataObj, false,
-                 wxT("unsupported format in wxDataObjectComposite"));
-
-    m_receivedFormat = format;
-
-    // Notice that we must pass "format" here as wxTextDataObject, that we can
-    // have as one of our "simple" sub-objects actually is not that simple and
-    // can support multiple formats (ASCII/UTF-8/UTF-16/...) and so needs to
-    // know which one it is given.
-    return dataObj->SetData( format, len, buf );
-}
-
-// ----------------------------------------------------------------------------
-// wxTextDataObject
-// ----------------------------------------------------------------------------
-
-#ifdef wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
-
-// FIXME-UTF8: we should be able to merge wchar_t and UTF-8 versions once we
-//             have a way to get UTF-8 string (and its length) in both builds
-//             without loss of efficiency (i.e. extra buffer copy/strlen call)
-
-#if wxUSE_UNICODE_WCHAR
-
-static inline wxMBConv& GetConv(const wxDataFormat& format)
-{
-    // use UTF8 for wxDF_UNICODETEXT and UCS4 for wxDF_TEXT
-    return format == wxDF_UNICODETEXT ? wxConvUTF8 : wxConvLibc;
-}
-
-size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
-{
-    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
-
-    return buffer ? strlen( buffer ) : 0;
-}
-
-bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
-{
-    if ( !buf )
-        return false;
-
-    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
-    if ( !buffer )
-        return false;
-
-    memcpy( (char*) buf, buffer, GetDataSize(format) );
-    // strcpy( (char*) buf, buffer );
-
-    return true;
-}
-
-bool wxTextDataObject::SetData(const wxDataFormat& format,
-                               size_t WXUNUSED(len), const void *buf)
-{
-    if ( buf == NULL )
-        return false;
-
-    wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
-
-    SetText( buffer );
-
-    return true;
-}
-
-#else // wxUSE_UNICODE_UTF8
-
-size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
-{
-    if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
-    {
-        return m_text.utf8_length();
-    }
-    else // wxDF_TEXT
-    {
-        const wxCharBuffer buf(wxConvLocal.cWC2MB(m_text.wc_str()));
-        return buf ? strlen(buf) : 0;
-    }
-}
-
-bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
-{
-    if ( !buf )
-        return false;
-
-    if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
-    {
-        memcpy(buf, m_text.utf8_str(), m_text.utf8_length());
-    }
-    else // wxDF_TEXT
-    {
-        const wxCharBuffer bufLocal(wxConvLocal.cWC2MB(m_text.wc_str()));
-        if ( !bufLocal )
-            return false;
-
-        memcpy(buf, bufLocal, strlen(bufLocal));
-    }
-
-    return true;
-}
-
-bool wxTextDataObject::SetData(const wxDataFormat& format,
-                               size_t len, const void *buf_)
-{
-    const char * const buf = static_cast<const char *>(buf_);
-
-    if ( buf == NULL )
-        return false;
-
-    if ( format == wxDF_UNICODETEXT || wxLocaleIsUtf8 )
-    {
-        // normally the data is in UTF-8 so we could use FromUTF8Unchecked()
-        // but it's not absolutely clear what GTK+ does if the clipboard data
-        // is not in UTF-8 so do an extra check for tranquility, it shouldn't
-        // matter much if we lose a bit of performance when pasting from
-        // clipboard
-        m_text = wxString::FromUTF8(buf, len);
-    }
-    else // wxDF_TEXT, convert from current (non-UTF8) locale
-    {
-        m_text = wxConvLocal.cMB2WC(buf, len, NULL);
-    }
-
-    return true;
-}
-
-#endif // wxUSE_UNICODE_WCHAR/wxUSE_UNICODE_UTF8
-
-#elif defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
-
-namespace
-{
-
-inline wxMBConv& GetConv(const wxDataFormat& format)
-{
-    static wxMBConvUTF16 s_UTF16Converter;
-
-    return format == wxDF_UNICODETEXT ? static_cast<wxMBConv&>(s_UTF16Converter)
-                                      : static_cast<wxMBConv&>(wxConvLocal);
-}
-
-} // anonymous namespace
-
-size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
-{
-    return GetConv(format).WC2MB(NULL, GetText().wc_str(), 0);
-}
-
-bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
-{
-    if ( buf == NULL )
-        return false;
-
-    wxCharBuffer buffer(GetConv(format).cWX2MB(GetText().c_str()));
-
-    memcpy(buf, buffer.data(), buffer.length());
-
-    return true;
-}
-
-bool wxTextDataObject::SetData(const wxDataFormat& format,
-                               size_t WXUNUSED(len),
-                               const void *buf)
-{
-    if ( buf == NULL )
-        return false;
-
-    SetText(GetConv(format).cMB2WX(static_cast<const char*>(buf)));
-
-    return true;
-}
-
-#else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ
-
-size_t wxTextDataObject::GetDataSize() const
-{
-    return GetTextLength() * sizeof(wxChar);
-}
-
-bool wxTextDataObject::GetDataHere(void *buf) const
-{
-    // NOTE: use wxTmemcpy() instead of wxStrncpy() to allow
-    //       retrieval of strings with embedded NULLs
-    wxTmemcpy( (wxChar*)buf, GetText().c_str(), GetTextLength() );
-
-    return true;
-}
-
-bool wxTextDataObject::SetData(size_t len, const void *buf)
-{
-    SetText( wxString((const wxChar*)buf, len/sizeof(wxChar)) );
-
-    return true;
-}
-
-#endif // different wxTextDataObject implementations
-
-size_t wxHTMLDataObject::GetDataSize() const
-{
-    const wxScopedCharBuffer buffer(GetHTML().utf8_str());
-
-    size_t size = buffer.length();
-
-#ifdef __WXMSW__
-    // On Windows we need to add some stuff to the string to satisfy
-    // its clipboard format requirements.
-    size += 400;
-#endif
-
-    return size;
-}
-
-bool wxHTMLDataObject::GetDataHere(void *buf) const
-{
-    if ( !buf )
-        return false;
-
-    // Windows and Mac always use UTF-8, and docs suggest GTK does as well.
-    const wxScopedCharBuffer html(GetHTML().utf8_str());
-    if ( !html )
-        return false;
-
-    char* const buffer = static_cast<char*>(buf);
-
-#ifdef __WXMSW__
-    // add the extra info that the MSW clipboard format requires.
-
-        // Create a template string for the HTML header...
-    strcpy(buffer,
-        "Version:0.9\r\n"
-        "StartHTML:00000000\r\n"
-        "EndHTML:00000000\r\n"
-        "StartFragment:00000000\r\n"
-        "EndFragment:00000000\r\n"
-        "<html><body>\r\n"
-        "<!--StartFragment -->\r\n");
-
-    // Append the HTML...
-    strcat(buffer, html);
-    strcat(buffer, "\r\n");
-    // Finish up the HTML format...
-    strcat(buffer,
-        "<!--EndFragment-->\r\n"
-        "</body>\r\n"
-        "</html>");
-
-    // Now go back, calculate all the lengths, and write out the
-    // necessary header information. Note, wsprintf() truncates the
-    // string when you overwrite it so you follow up with code to replace
-    // the 0 appended at the end with a '\r'...
-    char *ptr = strstr(buffer, "StartHTML");
-    sprintf(ptr+10, "%08u", (unsigned)(strstr(buffer, "<html>") - buffer));
-    *(ptr+10+8) = '\r';
-
-    ptr = strstr(buffer, "EndHTML");
-    sprintf(ptr+8, "%08u", (unsigned)strlen(buffer));
-    *(ptr+8+8) = '\r';
-
-    ptr = strstr(buffer, "StartFragment");
-    sprintf(ptr+14, "%08u", (unsigned)(strstr(buffer, "<!--StartFrag") - buffer));
-    *(ptr+14+8) = '\r';
-
-    ptr = strstr(buffer, "EndFragment");
-    sprintf(ptr+12, "%08u", (unsigned)(strstr(buffer, "<!--EndFrag") - buffer));
-    *(ptr+12+8) = '\r';
-#else
-    strcpy(buffer, html);
-#endif // __WXMSW__
-
-    return true;
-}
-
-bool wxHTMLDataObject::SetData(size_t WXUNUSED(len), const void *buf)
-{
-    if ( buf == NULL )
-        return false;
-
-    // Windows and Mac always use UTF-8, and docs suggest GTK does as well.
-    wxString html = wxString::FromUTF8(static_cast<const char*>(buf));
-
-#ifdef __WXMSW__
-    // To be consistent with other platforms, we only add the Fragment part
-    // of the Windows HTML clipboard format to the data object.
-    int fragmentStart = html.rfind("StartFragment");
-    int fragmentEnd = html.rfind("EndFragment");
-
-    if (fragmentStart != wxNOT_FOUND && fragmentEnd != wxNOT_FOUND)
-    {
-        int startCommentEnd = html.find("-->", fragmentStart) + 3;
-        int endCommentStart = html.rfind("<!--", fragmentEnd);
-
-        if (startCommentEnd != wxNOT_FOUND && endCommentStart != wxNOT_FOUND)
-            html = html.Mid(startCommentEnd, endCommentStart - startCommentEnd);
-    }
-#endif // __WXMSW__
-
-    SetHTML( html );
-
-    return true;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxCustomDataObject
-// ----------------------------------------------------------------------------
-
-wxCustomDataObject::wxCustomDataObject(const wxDataFormat& format)
-    : wxDataObjectSimple(format)
-{
-    m_data = NULL;
-    m_size = 0;
-}
-
-wxCustomDataObject::~wxCustomDataObject()
-{
-    Free();
-}
-
-void wxCustomDataObject::TakeData(size_t size, void *data)
-{
-    Free();
-
-    m_size = size;
-    m_data = data;
-}
-
-void *wxCustomDataObject::Alloc(size_t size)
-{
-    return (void *)new char[size];
-}
-
-void wxCustomDataObject::Free()
-{
-    delete [] (char*)m_data;
-    m_size = 0;
-    m_data = NULL;
-}
-
-size_t wxCustomDataObject::GetDataSize() const
-{
-    return GetSize();
-}
-
-bool wxCustomDataObject::GetDataHere(void *buf) const
-{
-    if ( buf == NULL )
-        return false;
-
-    void *data = GetData();
-    if ( data == NULL )
-        return false;
-
-    memcpy( buf, data, GetSize() );
-
-    return true;
-}
-
-bool wxCustomDataObject::SetData(size_t size, const void *buf)
-{
-    Free();
-
-    m_data = Alloc(size);
-    if ( m_data == NULL )
-        return false;
-
-    m_size = size;
-    memcpy( m_data, buf, m_size );
-
-    return true;
-}
-
-// ============================================================================
-// some common dnd related code
-// ============================================================================
-
-#if wxUSE_DRAG_AND_DROP
-
-#include "wx/dnd.h"
-
-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
-
-// NB: we can't use "new" in ctor initializer lists because this provokes an
-//     internal compiler error with VC++ 5.0 (hey, even gcc compiles this!),
-//     so use SetDataObject() instead
-
-wxTextDropTarget::wxTextDropTarget()
-{
-    SetDataObject(new wxTextDataObject);
-}
-
-wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
-{
-    if ( !GetData() )
-        return wxDragNone;
-
-    wxTextDataObject *dobj = (wxTextDataObject *)m_dataObject;
-    return OnDropText( x, y, dobj->GetText() ) ? def : wxDragNone;
-}
-
-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
-
-wxFileDropTarget::wxFileDropTarget()
-{
-    SetDataObject(new wxFileDataObject);
-}
-
-wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
-{
-    if ( !GetData() )
-        return wxDragNone;
-
-    wxFileDataObject *dobj = (wxFileDataObject *)m_dataObject;
-    return OnDropFiles( x, y, dobj->GetFilenames() ) ? def : wxDragNone;
-}
-
-#endif // wxUSE_DRAG_AND_DROP
-
-#endif // wxUSE_DATAOBJ
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dobjcmn.cpp
+// Purpose:     implementation of data object methods common to all platforms
+// Author:      Vadim Zeitlin, Robert Roebling
+// Modified by:
+// Created:     19.10.99
+// RCS-ID:      $Id: dobjcmn.cpp 49036 2007-10-04 10:10:06Z SC $
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_DATAOBJ
+
+#include "wx/dataobj.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// lists
+// ----------------------------------------------------------------------------
+
+#include "wx/listimpl.cpp"
+
+WX_DEFINE_LIST(wxSimpleDataObjectList)
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+static wxDataFormat dataFormatInvalid;
+WXDLLEXPORT const wxDataFormat& wxFormatInvalid = dataFormatInvalid;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxDataObjectBase
+// ----------------------------------------------------------------------------
+
+wxDataObjectBase::~wxDataObjectBase()
+{
+}
+
+bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
+                                   Direction dir) const
+{
+    size_t nFormatCount = GetFormatCount( dir );
+    if ( nFormatCount == 1 )
+    {
+        return format == GetPreferredFormat( dir );
+    }
+    else
+    {
+        wxDataFormat *formats = new wxDataFormat[nFormatCount];
+        GetAllFormats( formats, dir );
+
+        size_t n;
+        for ( n = 0; n < nFormatCount; n++ )
+        {
+            if ( formats[n] == format )
+                break;
+        }
+
+        delete [] formats;
+
+        // found?
+        return n < nFormatCount;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxDataObjectComposite
+// ----------------------------------------------------------------------------
+
+wxDataObjectComposite::wxDataObjectComposite()
+{
+    m_preferred = 0;
+    m_receivedFormat = wxFormatInvalid;
+}
+
+wxDataObjectComposite::~wxDataObjectComposite()
+{
+    WX_CLEAR_LIST( wxSimpleDataObjectList, m_dataObjects );
+}
+
+wxDataObjectSimple *
+wxDataObjectComposite::GetObject(const wxDataFormat& format) const
+{
+    wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst();
+    while ( node )
+    {
+        wxDataObjectSimple *dataObj = node->GetData();
+
+        if ( dataObj->GetFormat() == format )
+        {
+            return dataObj;
+        }
+
+        node = node->GetNext();
+    }
+
+    return (wxDataObjectSimple *)NULL;
+}
+
+void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
+{
+    if ( preferred )
+        m_preferred = m_dataObjects.GetCount();
+
+    m_dataObjects.Append( dataObject );
+}
+
+wxDataFormat wxDataObjectComposite::GetReceivedFormat() const
+{
+    return m_receivedFormat;
+}
+
+wxDataFormat
+wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
+{
+    wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.Item( m_preferred );
+
+    wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") );
+
+    wxDataObjectSimple* dataObj = node->GetData();
+
+    return dataObj->GetFormat();
+}
+
+#if defined(__WXMSW__)
+
+size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format )
+{
+    wxDataObjectSimple *dataObj = GetObject(format);
+
+    wxCHECK_MSG( dataObj, 0,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->GetBufferOffset( format );
+}
+
+
+const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
+                                                      size_t* size,
+                                                      const wxDataFormat& format )
+{
+    wxDataObjectSimple *dataObj = GetObject(format);
+
+    wxCHECK_MSG( dataObj, NULL,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->GetSizeFromBuffer( buffer, size, format );
+}
+
+
+void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
+                                              const wxDataFormat& format )
+{
+    wxDataObjectSimple *dataObj = GetObject( format );
+
+    wxCHECK_MSG( dataObj, NULL,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->SetSizeInBuffer( buffer, size, format );
+}
+
+#endif
+
+size_t wxDataObjectComposite::GetFormatCount(Direction WXUNUSED(dir)) const
+{
+    // TODO what about the Get/Set only formats?
+    return m_dataObjects.GetCount();
+}
+
+void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,
+                                          Direction WXUNUSED(dir)) const
+{
+    size_t n = 0;
+    wxSimpleDataObjectList::compatibility_iterator node;
+    for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
+    {
+        // TODO if ( !outputOnlyToo ) && this one counts ...
+        formats[n++] = node->GetData()->GetFormat();
+    }
+}
+
+size_t wxDataObjectComposite::GetDataSize(const wxDataFormat& format) const
+{
+    wxDataObjectSimple *dataObj = GetObject(format);
+
+    wxCHECK_MSG( dataObj, 0,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->GetDataSize();
+}
+
+bool wxDataObjectComposite::GetDataHere(const wxDataFormat& format,
+                                        void *buf) const
+{
+    wxDataObjectSimple *dataObj = GetObject( format );
+
+    wxCHECK_MSG( dataObj, false,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->GetDataHere( buf );
+}
+
+bool wxDataObjectComposite::SetData(const wxDataFormat& format,
+                                    size_t len,
+                                    const void *buf)
+{
+    wxDataObjectSimple *dataObj = GetObject( format );
+
+    wxCHECK_MSG( dataObj, false,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    m_receivedFormat = format;
+    return dataObj->SetData( len, buf );
+}
+
+// ----------------------------------------------------------------------------
+// wxTextDataObject
+// ----------------------------------------------------------------------------
+
+#if defined(__WXGTK20__) && wxUSE_UNICODE
+
+static inline wxMBConv& GetConv(const wxDataFormat& format)
+{
+    // use UTF8 for wxDF_UNICODETEXT and UCS4 for wxDF_TEXT
+    return format == wxDF_UNICODETEXT ? wxConvUTF8 : wxConvLibc;
+}
+
+size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
+{
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+
+    return buffer ? strlen( buffer ) : 0;
+}
+
+bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+{
+    if ( !buf )
+        return false;
+
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+    if ( !buffer )
+        return false;
+
+    memcpy( (char*) buf, buffer, GetDataSize(format) );
+    // strcpy( (char*) buf, buffer );
+
+    return true;
+}
+
+bool wxTextDataObject::SetData(const wxDataFormat& format,
+                               size_t WXUNUSED(len), const void *buf)
+{
+    if ( buf == NULL )
+        return false;
+
+    wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
+
+    SetText( buffer );
+
+    return true;
+}
+
+#elif wxUSE_UNICODE && defined(__WXMAC__)
+
+static wxMBConvUTF16 sUTF16Converter;
+
+static inline wxMBConv& GetConv(const wxDataFormat& format)
+{
+    return
+        format == wxDF_UNICODETEXT
+        ? (wxMBConv&) sUTF16Converter
+        : (wxMBConv&) wxConvLocal;
+}
+
+size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
+{
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+    if ( !buffer )
+        return 0;
+
+    size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
+    return len;
+}
+
+bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+{
+    if ( buf == NULL )
+        return false;
+
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+    if ( !buffer )
+        return false;
+
+    size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
+    memcpy( (char*)buf, (const char*)buffer, len );
+
+    return true;
+}
+
+bool wxTextDataObject::SetData(const wxDataFormat& format,
+                               size_t WXUNUSED(len), const void *buf)
+{
+    if ( buf == NULL )
+        return false;
+
+    wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
+
+    SetText( buffer );
+
+    return true;
+}
+
+#else
+
+size_t wxTextDataObject::GetDataSize() const
+{
+    return GetTextLength() * sizeof(wxChar);
+}
+
+bool wxTextDataObject::GetDataHere(void *buf) const
+{
+    wxStrcpy( (wxChar*)buf, GetText().c_str() );
+
+    return true;
+}
+
+bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
+{
+    SetText( wxString((const wxChar*)buf) );
+
+    return true;
+}
+
+#endif
+
+// ----------------------------------------------------------------------------
+// wxFileDataObjectBase
+// ----------------------------------------------------------------------------
+
+// VZ: I don't need this in MSW finally, so if it is needed in wxGTK, it should
+//     be moved to gtk/dataobj.cpp
+#if 0
+
+wxString wxFileDataObjectBase::GetFilenames() const
+{
+    wxString str;
+    size_t count = m_filenames.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        str << m_filenames[n] << wxT('\0');
+    }
+
+    return str;
+}
+
+void wxFileDataObjectBase::SetFilenames(const wxChar* filenames)
+{
+    m_filenames.Empty();
+
+    wxString current;
+    for ( const wxChar *pc = filenames; ; pc++ )
+    {
+        if ( *pc )
+        {
+            current += *pc;
+        }
+        else
+        {
+            if ( !current )
+            {
+                // 2 consecutive NULs - this is the end of the string
+                break;
+            }
+
+            m_filenames.Add(current);
+            current.Empty();
+        }
+    }
+}
+
+#endif
+
+// ----------------------------------------------------------------------------
+// wxCustomDataObject
+// ----------------------------------------------------------------------------
+
+wxCustomDataObject::wxCustomDataObject(const wxDataFormat& format)
+    : wxDataObjectSimple(format)
+{
+    m_data = NULL;
+    m_size = 0;
+}
+
+wxCustomDataObject::~wxCustomDataObject()
+{
+    Free();
+}
+
+void wxCustomDataObject::TakeData(size_t size, void *data)
+{
+    Free();
+
+    m_size = size;
+    m_data = data;
+}
+
+void *wxCustomDataObject::Alloc(size_t size)
+{
+    return (void *)new char[size];
+}
+
+void wxCustomDataObject::Free()
+{
+    delete [] (char*)m_data;
+    m_size = 0;
+    m_data = (void*)NULL;
+}
+
+size_t wxCustomDataObject::GetDataSize() const
+{
+    return GetSize();
+}
+
+bool wxCustomDataObject::GetDataHere(void *buf) const
+{
+    if ( buf == NULL )
+        return false;
+
+    void *data = GetData();
+    if ( data == NULL )
+        return false;
+
+    memcpy( buf, data, GetSize() );
+
+    return true;
+}
+
+bool wxCustomDataObject::SetData(size_t size, const void *buf)
+{
+    Free();
+
+    m_data = Alloc(size);
+    if ( m_data == NULL )
+        return false;
+
+    m_size = size;
+    memcpy( m_data, buf, m_size );
+
+    return true;
+}
+
+// ============================================================================
+// some common dnd related code
+// ============================================================================
+
+#if wxUSE_DRAG_AND_DROP
+
+#include "wx/dnd.h"
+
+// ----------------------------------------------------------------------------
+// wxTextDropTarget
+// ----------------------------------------------------------------------------
+
+// NB: we can't use "new" in ctor initializer lists because this provokes an
+//     internal compiler error with VC++ 5.0 (hey, even gcc compiles this!),
+//     so use SetDataObject() instead
+
+wxTextDropTarget::wxTextDropTarget()
+{
+    SetDataObject(new wxTextDataObject);
+}
+
+wxDragResult wxTextDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
+{
+    if ( !GetData() )
+        return wxDragNone;
+
+    wxTextDataObject *dobj = (wxTextDataObject *)m_dataObject;
+    return OnDropText( x, y, dobj->GetText() ) ? def : wxDragNone;
+}
+
+// ----------------------------------------------------------------------------
+// wxFileDropTarget
+// ----------------------------------------------------------------------------
+
+wxFileDropTarget::wxFileDropTarget()
+{
+    SetDataObject(new wxFileDataObject);
+}
+
+wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
+{
+    if ( !GetData() )
+        return wxDragNone;
+
+    wxFileDataObject *dobj = (wxFileDataObject *)m_dataObject;
+    return OnDropFiles( x, y, dobj->GetFilenames() ) ? def : wxDragNone;
+}
+
+#endif // wxUSE_DRAG_AND_DROP
+
+#endif // wxUSE_DATAOBJ
diff --git a/Source/3rd Party/wx/src/common/docmdi.cpp b/Source/3rd Party/wx/src/common/docmdi.cpp
index b131c6a4c..d63628f69 100644
--- a/Source/3rd Party/wx/src/common/docmdi.cpp	
+++ b/Source/3rd Party/wx/src/common/docmdi.cpp	
@@ -1,27 +1,206 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/docmdi.cpp
-// Purpose:     Frame classes for MDI document/view applications
-// Author:      Julian Smart, Vadim Zeitlin
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) 1997 Julian Smart
-//              (c) 2010 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_MDI_ARCHITECTURE
-
-#include "wx/docmdi.h"
-
-IMPLEMENT_CLASS(wxDocMDIParentFrame, wxMDIParentFrame)
-IMPLEMENT_CLASS(wxDocMDIChildFrame, wxMDIChildFrame)
-
-#endif // wxUSE_DOC_VIEW_ARCHITECTURE
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        docmdi.cpp
+// Purpose:     Frame classes for MDI document/view applications
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: docmdi.cpp 66911 2011-02-16 21:31:33Z JS $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_MDI_ARCHITECTURE
+
+#include "wx/docmdi.h"
+
+/*
+ * Docview MDI parent frame
+ */
+
+IMPLEMENT_CLASS(wxDocMDIParentFrame, wxMDIParentFrame)
+
+BEGIN_EVENT_TABLE(wxDocMDIParentFrame, wxMDIParentFrame)
+    EVT_MENU(wxID_EXIT, wxDocMDIParentFrame::OnExit)
+    EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocMDIParentFrame::OnMRUFile)
+    EVT_CLOSE(wxDocMDIParentFrame::OnCloseWindow)
+END_EVENT_TABLE()
+
+wxDocMDIParentFrame::wxDocMDIParentFrame()
+{
+    Init();
+}
+
+wxDocMDIParentFrame::wxDocMDIParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
+  const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+{
+    Init();
+    Create(manager, frame, id, title, pos, size, style, name);
+}
+
+bool wxDocMDIParentFrame::Create(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
+  const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+{
+    m_docManager = manager;
+    return wxMDIParentFrame::Create(frame, id, title, pos, size, style, name);
+}
+
+void wxDocMDIParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+    Close();
+}
+
+void wxDocMDIParentFrame::Init()
+{
+    m_docManager = NULL;
+}
+
+void wxDocMDIParentFrame::OnMRUFile(wxCommandEvent& event)
+{
+    wxString f(m_docManager->GetHistoryFile(event.GetId() - wxID_FILE1));
+    if (!f.empty())
+        (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
+}
+
+// Extend event processing to search the view's event table
+bool wxDocMDIParentFrame::ProcessEvent(wxEvent& event)
+{
+    // Try the document manager, then do default processing
+    if (!m_docManager || !m_docManager->ProcessEvent(event))
+        return wxEvtHandler::ProcessEvent(event);
+    else
+        return true;
+}
+
+void wxDocMDIParentFrame::OnCloseWindow(wxCloseEvent& event)
+{
+    if ( m_docManager && !m_docManager->Clear(!event.CanVeto()) )
+    {
+        // The user decided not to close finally, abort.
+        event.Veto();
+    }
+    else
+    {
+        this->Destroy();
+    }
+}
+
+/*
+ * Default document child frame for MDI children
+ */
+
+IMPLEMENT_CLASS(wxDocMDIChildFrame, wxMDIChildFrame)
+
+BEGIN_EVENT_TABLE(wxDocMDIChildFrame, wxMDIChildFrame)
+    EVT_ACTIVATE(wxDocMDIChildFrame::OnActivate)
+    EVT_CLOSE(wxDocMDIChildFrame::OnCloseWindow)
+END_EVENT_TABLE()
+
+void wxDocMDIChildFrame::Init()
+{
+    m_childDocument = (wxDocument*)  NULL;
+    m_childView = (wxView*) NULL;
+}
+
+wxDocMDIChildFrame::wxDocMDIChildFrame()
+{
+    Init();
+}
+
+wxDocMDIChildFrame::wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID  id,
+  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+{
+    Init();
+    Create(doc, view, frame, id, title, pos, size, style, name);
+}
+
+bool wxDocMDIChildFrame::Create(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID  id,
+  const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name)
+{
+    m_childDocument = doc;
+    m_childView = view;
+    if (wxMDIChildFrame::Create(frame, id, title, pos, size, style, name))
+    {
+        if (view)
+            view->SetFrame(this);
+        return true;
+    }
+
+    return false;
+}
+
+wxDocMDIChildFrame::~wxDocMDIChildFrame(void)
+{
+    m_childView = (wxView *) NULL;
+}
+
+// Extend event processing to search the view's event table
+bool wxDocMDIChildFrame::ProcessEvent(wxEvent& event)
+{
+    static wxEvent *ActiveEvent = NULL;
+
+    // Break recursion loops
+    if (ActiveEvent == &event)
+        return false;
+
+    ActiveEvent = &event;
+
+    bool ret;
+    if ( !m_childView || ! m_childView->ProcessEvent(event) )
+    {
+        // Only hand up to the parent if it's a menu command
+        if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
+            ret = wxEvtHandler::ProcessEvent(event);
+        else
+            ret = true;
+    }
+    else
+        ret = true;
+
+    ActiveEvent = NULL;
+    return ret;
+}
+
+void wxDocMDIChildFrame::OnActivate(wxActivateEvent& event)
+{
+  wxMDIChildFrame::OnActivate(event);
+
+  if (event.GetActive() && m_childView)
+    m_childView->Activate(event.GetActive());
+}
+
+void wxDocMDIChildFrame::OnCloseWindow(wxCloseEvent& event)
+{
+  // Close view but don't delete the frame while doing so!
+  // ...since it will be deleted by wxWidgets if we return true.
+  if (m_childView)
+  {
+    bool ans = event.CanVeto()
+                ? m_childView->Close(false) // false means don't delete associated window
+                : true; // Must delete.
+
+    if (ans)
+    {
+      m_childView->Activate(false);
+      delete m_childView;
+      m_childView = (wxView *) NULL;
+      m_childDocument = (wxDocument *) NULL;
+
+      this->Destroy();
+    }
+    else
+        event.Veto();
+  }
+  else
+    event.Veto();
+}
+
+#endif
+    // wxUSE_DOC_VIEW_ARCHITECTURE
+
diff --git a/Source/3rd Party/wx/src/common/docview.cpp b/Source/3rd Party/wx/src/common/docview.cpp
index ad7aded98..be1393f86 100644
--- a/Source/3rd Party/wx/src/common/docview.cpp	
+++ b/Source/3rd Party/wx/src/common/docview.cpp	
@@ -1,2257 +1,2491 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/docview.cpp
-// Purpose:     Document/view classes
-// Author:      Julian Smart
-// Modified by: Vadim Zeitlin
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_DOC_VIEW_ARCHITECTURE
-
-#include "wx/docview.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/list.h"
-    #include "wx/string.h"
-    #include "wx/utils.h"
-    #include "wx/app.h"
-    #include "wx/dc.h"
-    #include "wx/dialog.h"
-    #include "wx/menu.h"
-    #include "wx/filedlg.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/msgdlg.h"
-    #include "wx/mdi.h"
-    #include "wx/choicdlg.h"
-#endif
-
-#if wxUSE_PRINTING_ARCHITECTURE
-    #include "wx/prntbase.h"
-    #include "wx/printdlg.h"
-#endif
-
-#include "wx/confbase.h"
-#include "wx/filename.h"
-#include "wx/file.h"
-#include "wx/ffile.h"
-#include "wx/cmdproc.h"
-#include "wx/tokenzr.h"
-#include "wx/filename.h"
-#include "wx/stdpaths.h"
-#include "wx/vector.h"
-#include "wx/scopedarray.h"
-#include "wx/scopedptr.h"
-#include "wx/scopeguard.h"
-#include "wx/except.h"
-
-#if wxUSE_STD_IOSTREAM
-    #include "wx/ioswrap.h"
-    #include "wx/beforestd.h"
-    #if wxUSE_IOSTREAMH
-        #include <fstream.h>
-    #else
-        #include <fstream>
-    #endif
-    #include "wx/afterstd.h"
-#else
-    #include "wx/wfstream.h"
-#endif
-
-typedef wxVector<wxDocTemplate *> wxDocTemplates;
-
-// ----------------------------------------------------------------------------
-// wxWidgets macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
-IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
-IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
-IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
-IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
-
-#if wxUSE_PRINTING_ARCHITECTURE
-    IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
-#endif
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// private helpers
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-wxString FindExtension(const wxString& path)
-{
-    wxString ext;
-    wxFileName::SplitPath(path, NULL, NULL, &ext);
-
-    // VZ: extensions are considered not case sensitive - is this really a good
-    //     idea?
-    return ext.MakeLower();
-}
-
-} // anonymous namespace
-
-// ----------------------------------------------------------------------------
-// Definition of wxDocument
-// ----------------------------------------------------------------------------
-
-wxDocument::wxDocument(wxDocument *parent)
-{
-    m_documentModified = false;
-    m_documentTemplate = NULL;
-
-    m_documentParent = parent;
-    if ( parent )
-        parent->m_childDocuments.push_back(this);
-
-    m_commandProcessor = NULL;
-    m_savedYet = false;
-}
-
-bool wxDocument::DeleteContents()
-{
-    return true;
-}
-
-wxDocument::~wxDocument()
-{
-    delete m_commandProcessor;
-
-    if (GetDocumentManager())
-        GetDocumentManager()->RemoveDocument(this);
-
-    if ( m_documentParent )
-        m_documentParent->m_childDocuments.remove(this);
-
-    // Not safe to do here, since it'll invoke virtual view functions
-    // expecting to see valid derived objects: and by the time we get here,
-    // we've called destructors higher up.
-    //DeleteAllViews();
-}
-
-bool wxDocument::Close()
-{
-    if ( !OnSaveModified() )
-        return false;
-
-    // When the parent document closes, its children must be closed as well as
-    // they can't exist without the parent.
-
-    // As usual, first check if all children can be closed.
-    DocsList::const_iterator it = m_childDocuments.begin();
-    for ( DocsList::const_iterator end = m_childDocuments.end(); it != end; ++it )
-    {
-        if ( !(*it)->OnSaveModified() )
-        {
-            // Leave the parent document opened if a child can't close.
-            return false;
-        }
-    }
-
-    // Now that they all did, do close them: as m_childDocuments is modified as
-    // we iterate over it, don't use the usual for-style iteration here.
-    while ( !m_childDocuments.empty() )
-    {
-        wxDocument * const childDoc = m_childDocuments.front();
-
-        // This will call OnSaveModified() once again but it shouldn't do
-        // anything as the document was just saved or marked as not needing to
-        // be saved by the call to OnSaveModified() that returned true above.
-        if ( !childDoc->Close() )
-        {
-            wxFAIL_MSG( "Closing the child document unexpectedly failed "
-                        "after its OnSaveModified() returned true" );
-        }
-
-        // Delete the child document by deleting all its views.
-        childDoc->DeleteAllViews();
-    }
-
-
-    return OnCloseDocument();
-}
-
-bool wxDocument::OnCloseDocument()
-{
-    // Tell all views that we're about to close
-    NotifyClosing();
-    DeleteContents();
-    Modify(false);
-    return true;
-}
-
-// Note that this implicitly deletes the document when the last view is
-// deleted.
-bool wxDocument::DeleteAllViews()
-{
-    wxDocManager* manager = GetDocumentManager();
-
-    // first check if all views agree to be closed
-    const wxList::iterator end = m_documentViews.end();
-    for ( wxList::iterator i = m_documentViews.begin(); i != end; ++i )
-    {
-        wxView *view = (wxView *)*i;
-        if ( !view->Close() )
-            return false;
-    }
-
-    // all views agreed to close, now do close them
-    if ( m_documentViews.empty() )
-    {
-        // normally the document would be implicitly deleted when the last view
-        // is, but if don't have any views, do it here instead
-        if ( manager && manager->GetDocuments().Member(this) )
-            delete this;
-    }
-    else // have views
-    {
-        // as we delete elements we iterate over, don't use the usual "from
-        // begin to end" loop
-        for ( ;; )
-        {
-            wxView *view = (wxView *)*m_documentViews.begin();
-
-            bool isLastOne = m_documentViews.size() == 1;
-
-            // this always deletes the node implicitly and if this is the last
-            // view also deletes this object itself (also implicitly, great),
-            // so we can't test for m_documentViews.empty() after calling this!
-            delete view;
-
-            if ( isLastOne )
-                break;
-        }
-    }
-
-    return true;
-}
-
-wxView *wxDocument::GetFirstView() const
-{
-    if ( m_documentViews.empty() )
-        return NULL;
-
-    return static_cast<wxView *>(m_documentViews.GetFirst()->GetData());
-}
-
-void wxDocument::Modify(bool mod)
-{
-    if (mod != m_documentModified)
-    {
-        m_documentModified = mod;
-
-        // Allow views to append asterix to the title
-        wxView* view = GetFirstView();
-        if (view) view->OnChangeFilename();
-    }
-}
-
-wxDocManager *wxDocument::GetDocumentManager() const
-{
-    // For child documents we use the same document manager as the parent, even
-    // though we don't have our own template (as children are not opened/saved
-    // directly).
-    if ( m_documentParent )
-        return m_documentParent->GetDocumentManager();
-
-    return m_documentTemplate ? m_documentTemplate->GetDocumentManager() : NULL;
-}
-
-bool wxDocument::OnNewDocument()
-{
-    // notice that there is no need to neither reset nor even check the
-    // modified flag here as the document itself is a new object (this is only
-    // called from CreateDocument()) and so it shouldn't be saved anyhow even
-    // if it is modified -- this could happen if the user code creates
-    // documents pre-filled with some user-entered (and which hence must not be
-    // lost) information
-
-    SetDocumentSaved(false);
-
-    const wxString name = GetDocumentManager()->MakeNewDocumentName();
-    SetTitle(name);
-    SetFilename(name, true);
-
-    return true;
-}
-
-bool wxDocument::Save()
-{
-    if ( AlreadySaved() )
-        return true;
-
-    if ( m_documentFile.empty() || !m_savedYet )
-        return SaveAs();
-
-    return OnSaveDocument(m_documentFile);
-}
-
-bool wxDocument::SaveAs()
-{
-    wxDocTemplate *docTemplate = GetDocumentTemplate();
-    if (!docTemplate)
-        return false;
-
-#ifdef wxHAS_MULTIPLE_FILEDLG_FILTERS
-    wxString filter = docTemplate->GetDescription() + wxT(" (") +
-        docTemplate->GetFileFilter() + wxT(")|") +
-        docTemplate->GetFileFilter();
-
-    // Now see if there are some other template with identical view and document
-    // classes, whose filters may also be used.
-    if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo())
-    {
-        wxList::compatibility_iterator
-            node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst();
-        while (node)
-        {
-            wxDocTemplate *t = (wxDocTemplate*) node->GetData();
-
-            if (t->IsVisible() && t != docTemplate &&
-                t->GetViewClassInfo() == docTemplate->GetViewClassInfo() &&
-                t->GetDocClassInfo() == docTemplate->GetDocClassInfo())
-            {
-                // add a '|' to separate this filter from the previous one
-                if ( !filter.empty() )
-                    filter << wxT('|');
-
-                filter << t->GetDescription()
-                       << wxT(" (") << t->GetFileFilter() << wxT(") |")
-                       << t->GetFileFilter();
-            }
-
-            node = node->GetNext();
-        }
-    }
-#else
-    wxString filter = docTemplate->GetFileFilter() ;
-#endif
-
-    wxString defaultDir = docTemplate->GetDirectory();
-    if ( defaultDir.empty() )
-    {
-        defaultDir = wxPathOnly(GetFilename());
-        if ( defaultDir.empty() )
-            defaultDir = GetDocumentManager()->GetLastDirectory();
-    }
-
-    wxString fileName = wxFileSelector(_("Save As"),
-            defaultDir,
-            wxFileNameFromPath(GetFilename()),
-            docTemplate->GetDefaultExtension(),
-            filter,
-            wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
-            GetDocumentWindow());
-
-    if (fileName.empty())
-        return false; // cancelled by user
-
-    // Files that were not saved correctly are not added to the FileHistory.
-    if (!OnSaveDocument(fileName))
-        return false;
-
-    SetTitle(wxFileNameFromPath(fileName));
-    SetFilename(fileName, true);    // will call OnChangeFileName automatically
-
-    // A file that doesn't use the default extension of its document template
-    // cannot be opened via the FileHistory, so we do not add it.
-    if (docTemplate->FileMatchesTemplate(fileName))
-    {
-        GetDocumentManager()->AddFileToHistory(fileName);
-    }
-    //else: the user will probably not be able to open the file again, so we
-    //      could warn about the wrong file-extension here
-
-    return true;
-}
-
-bool wxDocument::OnSaveDocument(const wxString& file)
-{
-    if ( !file )
-        return false;
-
-    if ( !DoSaveDocument(file) )
-        return false;
-
-    if ( m_commandProcessor )
-        m_commandProcessor->MarkAsSaved();
-
-    Modify(false);
-    SetFilename(file);
-    SetDocumentSaved(true);
-#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
-    wxFileName fn(file) ;
-    fn.MacSetDefaultTypeAndCreator() ;
-#endif
-    return true;
-}
-
-bool wxDocument::OnOpenDocument(const wxString& file)
-{
-    // notice that there is no need to check the modified flag here for the
-    // reasons explained in OnNewDocument()
-
-    if ( !DoOpenDocument(file) )
-        return false;
-
-    SetFilename(file, true);
-
-    // stretching the logic a little this does make sense because the document
-    // had been saved into the file we just loaded it from, it just could have
-    // happened during a previous program execution, it's just that the name of
-    // this method is a bit unfortunate, it should probably have been called
-    // HasAssociatedFileName()
-    SetDocumentSaved(true);
-
-    UpdateAllViews();
-
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-wxSTD istream& wxDocument::LoadObject(wxSTD istream& stream)
-#else
-wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
-#endif
-{
-    return stream;
-}
-
-#if wxUSE_STD_IOSTREAM
-wxSTD ostream& wxDocument::SaveObject(wxSTD ostream& stream)
-#else
-wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
-#endif
-{
-    return stream;
-}
-
-bool wxDocument::Revert()
-{
-    if ( wxMessageBox
-         (
-            _("Discard changes and reload the last saved version?"),
-            wxTheApp->GetAppDisplayName(),
-            wxYES_NO | wxCANCEL | wxICON_QUESTION,
-            GetDocumentWindow()
-          ) != wxYES )
-        return false;
-
-    if ( !DoOpenDocument(GetFilename()) )
-        return false;
-
-    Modify(false);
-    UpdateAllViews();
-
-    return true;
-}
-
-
-// Get title, or filename if no title, else unnamed
-#if WXWIN_COMPATIBILITY_2_8
-bool wxDocument::GetPrintableName(wxString& buf) const
-{
-    // this function cannot only be overridden by the user code but also
-    // called by it so we need to ensure that we return the same thing as
-    // GetUserReadableName() but we can't call it because this would result in
-    // an infinite recursion, hence we use the helper DoGetUserReadableName()
-    buf = DoGetUserReadableName();
-
-    return true;
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-wxString wxDocument::GetUserReadableName() const
-{
-#if WXWIN_COMPATIBILITY_2_8
-    // we need to call the old virtual function to ensure that the overridden
-    // version of it is still called
-    wxString name;
-    if ( GetPrintableName(name) )
-        return name;
-#endif // WXWIN_COMPATIBILITY_2_8
-
-    return DoGetUserReadableName();
-}
-
-wxString wxDocument::DoGetUserReadableName() const
-{
-    if ( !m_documentTitle.empty() )
-        return m_documentTitle;
-
-    if ( !m_documentFile.empty() )
-        return wxFileNameFromPath(m_documentFile);
-
-    return _("unnamed");
-}
-
-wxWindow *wxDocument::GetDocumentWindow() const
-{
-    wxView * const view = GetFirstView();
-
-    return view ? view->GetFrame() : wxTheApp->GetTopWindow();
-}
-
-wxCommandProcessor *wxDocument::OnCreateCommandProcessor()
-{
-    return new wxCommandProcessor;
-}
-
-// true if safe to close
-bool wxDocument::OnSaveModified()
-{
-    if ( IsModified() )
-    {
-        switch ( wxMessageBox
-                 (
-                    wxString::Format
-                    (
-                     _("Do you want to save changes to %s?"),
-                     GetUserReadableName()
-                    ),
-                    wxTheApp->GetAppDisplayName(),
-                    wxYES_NO | wxCANCEL | wxICON_QUESTION | wxCENTRE
-                 ) )
-        {
-            case wxNO:
-                Modify(false);
-                break;
-
-            case wxYES:
-                return Save();
-
-            case wxCANCEL:
-                return false;
-        }
-    }
-
-    return true;
-}
-
-bool wxDocument::Draw(wxDC& WXUNUSED(context))
-{
-    return true;
-}
-
-bool wxDocument::AddView(wxView *view)
-{
-    if ( !m_documentViews.Member(view) )
-    {
-        m_documentViews.Append(view);
-        OnChangedViewList();
-    }
-    return true;
-}
-
-bool wxDocument::RemoveView(wxView *view)
-{
-    (void)m_documentViews.DeleteObject(view);
-    OnChangedViewList();
-    return true;
-}
-
-bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
-{
-    return GetDocumentTemplate()->CreateView(this, flags) != NULL;
-}
-
-// Called after a view is added or removed.
-// The default implementation deletes the document if
-// there are no more views.
-void wxDocument::OnChangedViewList()
-{
-    if ( m_documentViews.empty() && OnSaveModified() )
-        delete this;
-}
-
-void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
-{
-    wxList::compatibility_iterator node = m_documentViews.GetFirst();
-    while (node)
-    {
-        wxView *view = (wxView *)node->GetData();
-        if (view != sender)
-            view->OnUpdate(sender, hint);
-        node = node->GetNext();
-    }
-}
-
-void wxDocument::NotifyClosing()
-{
-    wxList::compatibility_iterator node = m_documentViews.GetFirst();
-    while (node)
-    {
-        wxView *view = (wxView *)node->GetData();
-        view->OnClosingDocument();
-        node = node->GetNext();
-    }
-}
-
-void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
-{
-    m_documentFile = filename;
-    OnChangeFilename(notifyViews);
-}
-
-void wxDocument::OnChangeFilename(bool notifyViews)
-{
-    if ( notifyViews )
-    {
-        // Notify the views that the filename has changed
-        wxList::compatibility_iterator node = m_documentViews.GetFirst();
-        while (node)
-        {
-            wxView *view = (wxView *)node->GetData();
-            view->OnChangeFilename();
-            node = node->GetNext();
-        }
-    }
-}
-
-bool wxDocument::DoSaveDocument(const wxString& file)
-{
-#if wxUSE_STD_IOSTREAM
-    wxSTD ofstream store(file.mb_str(), wxSTD ios::binary);
-    if ( !store )
-#else
-    wxFileOutputStream store(file);
-    if ( store.GetLastError() != wxSTREAM_NO_ERROR )
-#endif
-    {
-        wxLogError(_("File \"%s\" could not be opened for writing."), file);
-        return false;
-    }
-
-    if (!SaveObject(store))
-    {
-        wxLogError(_("Failed to save document to the file \"%s\"."), file);
-        return false;
-    }
-
-    return true;
-}
-
-bool wxDocument::DoOpenDocument(const wxString& file)
-{
-#if wxUSE_STD_IOSTREAM
-    wxSTD ifstream store(file.mb_str(), wxSTD ios::binary);
-    if ( !store )
-#else
-    wxFileInputStream store(file);
-    if (store.GetLastError() != wxSTREAM_NO_ERROR || !store.IsOk())
-#endif
-    {
-        wxLogError(_("File \"%s\" could not be opened for reading."), file);
-        return false;
-    }
-
-#if wxUSE_STD_IOSTREAM
-    LoadObject(store);
-    if ( !store )
-#else
-    int res = LoadObject(store).GetLastError();
-    if ( res != wxSTREAM_NO_ERROR && res != wxSTREAM_EOF )
-#endif
-    {
-        wxLogError(_("Failed to read document from the file \"%s\"."), file);
-        return false;
-    }
-
-    return true;
-}
-
-
-// ----------------------------------------------------------------------------
-// Document view
-// ----------------------------------------------------------------------------
-
-wxView::wxView()
-{
-    m_viewDocument = NULL;
-
-    m_viewFrame = NULL;
-
-    m_docChildFrame = NULL;
-}
-
-wxView::~wxView()
-{
-    if (m_viewDocument && GetDocumentManager())
-        GetDocumentManager()->ActivateView(this, false);
-
-    // reset our frame view first, before removing it from the document as
-    // SetView(NULL) is a simple call while RemoveView() may result in user
-    // code being executed and this user code can, for example, show a message
-    // box which would result in an activation event for m_docChildFrame and so
-    // could reactivate the view being destroyed -- unless we reset it first
-    if ( m_docChildFrame && m_docChildFrame->GetView() == this )
-    {
-        // prevent it from doing anything with us
-        m_docChildFrame->SetView(NULL);
-
-        // it doesn't make sense to leave the frame alive if its associated
-        // view doesn't exist any more so unconditionally close it as well
-        //
-        // notice that we only get here if m_docChildFrame is non-NULL in the
-        // first place and it will be always NULL if we're deleted because our
-        // frame was closed, so this only catches the case of directly deleting
-        // the view, as it happens if its creation fails in wxDocTemplate::
-        // CreateView() for example
-        m_docChildFrame->GetWindow()->Destroy();
-    }
-
-    if ( m_viewDocument )
-        m_viewDocument->RemoveView(this);
-}
-
-void wxView::SetDocChildFrame(wxDocChildFrameAnyBase *docChildFrame)
-{
-    SetFrame(docChildFrame ? docChildFrame->GetWindow() : NULL);
-    m_docChildFrame = docChildFrame;
-}
-
-bool wxView::TryBefore(wxEvent& event)
-{
-    wxDocument * const doc = GetDocument();
-    return doc && doc->ProcessEventLocally(event);
-}
-
-void wxView::OnActivateView(bool WXUNUSED(activate),
-                            wxView *WXUNUSED(activeView),
-                            wxView *WXUNUSED(deactiveView))
-{
-}
-
-void wxView::OnPrint(wxDC *dc, wxObject *WXUNUSED(info))
-{
-    OnDraw(dc);
-}
-
-void wxView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
-{
-}
-
-void wxView::OnChangeFilename()
-{
-    // GetFrame can return wxWindow rather than wxTopLevelWindow due to
-    // generic MDI implementation so use SetLabel rather than SetTitle.
-    // It should cause SetTitle() for top level windows.
-    wxWindow *win = GetFrame();
-    if (!win) return;
-
-    wxDocument *doc = GetDocument();
-    if (!doc) return;
-
-    wxString label = doc->GetUserReadableName();
-    if (doc->IsModified())
-    {
-       label += "*";
-    }
-    win->SetLabel(label);
-}
-
-void wxView::SetDocument(wxDocument *doc)
-{
-    m_viewDocument = doc;
-    if (doc)
-        doc->AddView(this);
-}
-
-bool wxView::Close(bool deleteWindow)
-{
-    return OnClose(deleteWindow);
-}
-
-void wxView::Activate(bool activate)
-{
-    if (GetDocument() && GetDocumentManager())
-    {
-        OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
-        GetDocumentManager()->ActivateView(this, activate);
-    }
-}
-
-bool wxView::OnClose(bool WXUNUSED(deleteWindow))
-{
-    return GetDocument() ? GetDocument()->Close() : true;
-}
-
-#if wxUSE_PRINTING_ARCHITECTURE
-wxPrintout *wxView::OnCreatePrintout()
-{
-    return new wxDocPrintout(this);
-}
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-// ----------------------------------------------------------------------------
-// wxDocTemplate
-// ----------------------------------------------------------------------------
-
-wxDocTemplate::wxDocTemplate(wxDocManager *manager,
-                             const wxString& descr,
-                             const wxString& filter,
-                             const wxString& dir,
-                             const wxString& ext,
-                             const wxString& docTypeName,
-                             const wxString& viewTypeName,
-                             wxClassInfo *docClassInfo,
-                             wxClassInfo *viewClassInfo,
-                             long flags)
-{
-    m_documentManager = manager;
-    m_description = descr;
-    m_directory = dir;
-    m_defaultExt = ext;
-    m_fileFilter = filter;
-    m_flags = flags;
-    m_docTypeName = docTypeName;
-    m_viewTypeName = viewTypeName;
-    m_documentManager->AssociateTemplate(this);
-
-    m_docClassInfo = docClassInfo;
-    m_viewClassInfo = viewClassInfo;
-}
-
-wxDocTemplate::~wxDocTemplate()
-{
-    m_documentManager->DisassociateTemplate(this);
-}
-
-// Tries to dynamically construct an object of the right class.
-wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
-{
-    // InitDocument() is supposed to delete the document object if its
-    // initialization fails so don't use wxScopedPtr<> here: this is fragile
-    // but unavoidable because the default implementation uses CreateView()
-    // which may -- or not -- create a wxView and if it does create it and its
-    // initialization fails then the view destructor will delete the document
-    // (via RemoveView()) and as we can't distinguish between the two cases we
-    // just have to assume that it always deletes it in case of failure
-    wxDocument * const doc = DoCreateDocument();
-
-    return doc && InitDocument(doc, path, flags) ? doc : NULL;
-}
-
-bool
-wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
-{
-    wxScopeGuard g = wxMakeObjGuard(*doc, &wxDocument::DeleteAllViews);
-
-    doc->SetFilename(path);
-    doc->SetDocumentTemplate(this);
-    GetDocumentManager()->AddDocument(doc);
-    doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
-
-    if ( !doc->OnCreate(path, flags) )
-        return false;
-
-    g.Dismiss(); // no need to call DeleteAllViews() anymore
-
-    return true;
-}
-
-wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
-{
-    wxScopedPtr<wxView> view(DoCreateView());
-    if ( !view )
-        return NULL;
-
-    view->SetDocument(doc);
-    if ( !view->OnCreate(doc, flags) )
-        return NULL;
-
-    return view.release();
-}
-
-// The default (very primitive) format detection: check is the extension is
-// that of the template
-bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
-{
-    wxStringTokenizer parser (GetFileFilter(), wxT(";"));
-    wxString anything = wxT ("*");
-    while (parser.HasMoreTokens())
-    {
-        wxString filter = parser.GetNextToken();
-        wxString filterExt = FindExtension (filter);
-        if ( filter.IsSameAs (anything)    ||
-             filterExt.IsSameAs (anything) ||
-             filterExt.IsSameAs (FindExtension (path)) )
-            return true;
-    }
-    return GetDefaultExtension().IsSameAs(FindExtension(path));
-}
-
-wxDocument *wxDocTemplate::DoCreateDocument()
-{
-    if (!m_docClassInfo)
-        return NULL;
-
-    return static_cast<wxDocument *>(m_docClassInfo->CreateObject());
-}
-
-wxView *wxDocTemplate::DoCreateView()
-{
-    if (!m_viewClassInfo)
-        return NULL;
-
-    return static_cast<wxView *>(m_viewClassInfo->CreateObject());
-}
-
-// ----------------------------------------------------------------------------
-// wxDocManager
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
-    EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen)
-    EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose)
-    EVT_MENU(wxID_CLOSE_ALL, wxDocManager::OnFileCloseAll)
-    EVT_MENU(wxID_REVERT, wxDocManager::OnFileRevert)
-    EVT_MENU(wxID_NEW, wxDocManager::OnFileNew)
-    EVT_MENU(wxID_SAVE, wxDocManager::OnFileSave)
-    EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs)
-    EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
-    EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
-
-    // We don't know in advance how many items can there be in the MRU files
-    // list so set up OnMRUFile() as a handler for all menu events and do the
-    // check for the id of the menu item clicked inside it.
-    EVT_MENU(wxID_ANY, wxDocManager::OnMRUFile)
-
-    EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen)
-    EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateDisableIfNoDoc)
-    EVT_UPDATE_UI(wxID_CLOSE_ALL, wxDocManager::OnUpdateDisableIfNoDoc)
-    EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert)
-    EVT_UPDATE_UI(wxID_NEW, wxDocManager::OnUpdateFileNew)
-    EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave)
-    EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateFileSaveAs)
-    EVT_UPDATE_UI(wxID_UNDO, wxDocManager::OnUpdateUndo)
-    EVT_UPDATE_UI(wxID_REDO, wxDocManager::OnUpdateRedo)
-
-#if wxUSE_PRINTING_ARCHITECTURE
-    EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
-    EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
-    EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPageSetup)
-
-    EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdateDisableIfNoDoc)
-    EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdateDisableIfNoDoc)
-    // NB: we keep "Print setup" menu item always enabled as it can be used
-    //     even without an active document
-#endif // wxUSE_PRINTING_ARCHITECTURE
-END_EVENT_TABLE()
-
-wxDocManager* wxDocManager::sm_docManager = NULL;
-
-wxDocManager::wxDocManager(long WXUNUSED(flags), bool initialize)
-{
-    sm_docManager = this;
-
-    m_defaultDocumentNameCounter = 1;
-    m_currentView = NULL;
-    m_maxDocsOpen = INT_MAX;
-    m_fileHistory = NULL;
-    if ( initialize )
-        Initialize();
-}
-
-wxDocManager::~wxDocManager()
-{
-    Clear();
-    delete m_fileHistory;
-    sm_docManager = NULL;
-}
-
-// closes the specified document
-bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
-{
-    if ( !doc->Close() && !force )
-        return false;
-
-    // Implicitly deletes the document when
-    // the last view is deleted
-    doc->DeleteAllViews();
-
-    // Check we're really deleted
-    if (m_docs.Member(doc))
-        delete doc;
-
-    return true;
-}
-
-bool wxDocManager::CloseDocuments(bool force)
-{
-    wxList::compatibility_iterator node = m_docs.GetFirst();
-    while (node)
-    {
-        wxDocument *doc = (wxDocument *)node->GetData();
-        wxList::compatibility_iterator next = node->GetNext();
-
-        if (!CloseDocument(doc, force))
-            return false;
-
-        // This assumes that documents are not connected in
-        // any way, i.e. deleting one document does NOT
-        // delete another.
-        node = next;
-    }
-    return true;
-}
-
-bool wxDocManager::Clear(bool force)
-{
-    if (!CloseDocuments(force))
-        return false;
-
-    m_currentView = NULL;
-
-    wxList::compatibility_iterator node = m_templates.GetFirst();
-    while (node)
-    {
-        wxDocTemplate *templ = (wxDocTemplate*) node->GetData();
-        wxList::compatibility_iterator next = node->GetNext();
-        delete templ;
-        node = next;
-    }
-    return true;
-}
-
-bool wxDocManager::Initialize()
-{
-    m_fileHistory = OnCreateFileHistory();
-    return true;
-}
-
-wxString wxDocManager::GetLastDirectory() const
-{
-    // if we haven't determined the last used directory yet, do it now
-    if ( m_lastDirectory.empty() )
-    {
-        // we're going to modify m_lastDirectory in this const method, so do it
-        // via non-const self pointer instead of const this one
-        wxDocManager * const self = const_cast<wxDocManager *>(this);
-
-        // first try to reuse the directory of the most recently opened file:
-        // this ensures that if the user opens a file, closes the program and
-        // runs it again the "Open file" dialog will open in the directory of
-        // the last file he used
-        if ( m_fileHistory && m_fileHistory->GetCount() )
-        {
-            const wxString lastOpened = m_fileHistory->GetHistoryFile(0);
-            const wxFileName fn(lastOpened);
-            if ( fn.DirExists() )
-            {
-                self->m_lastDirectory = fn.GetPath();
-            }
-            //else: should we try the next one?
-        }
-        //else: no history yet
-
-        // if we don't have any files in the history (yet?), use the
-        // system-dependent default location for the document files
-        if ( m_lastDirectory.empty() )
-        {
-            self->m_lastDirectory = wxStandardPaths::Get().GetAppDocumentsDir();
-        }
-    }
-
-    return m_lastDirectory;
-}
-
-wxFileHistory *wxDocManager::OnCreateFileHistory()
-{
-    return new wxFileHistory;
-}
-
-void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
-{
-    wxDocument *doc = GetCurrentDocument();
-    if (doc)
-        CloseDocument(doc);
-}
-
-void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
-{
-    CloseDocuments(false);
-}
-
-void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
-{
-    CreateNewDocument();
-}
-
-void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
-{
-    if ( !CreateDocument("") )
-    {
-        OnOpenFileFailure();
-    }
-}
-
-void wxDocManager::OnFileRevert(wxCommandEvent& WXUNUSED(event))
-{
-    wxDocument *doc = GetCurrentDocument();
-    if (!doc)
-        return;
-    doc->Revert();
-}
-
-void wxDocManager::OnFileSave(wxCommandEvent& WXUNUSED(event))
-{
-    wxDocument *doc = GetCurrentDocument();
-    if (!doc)
-        return;
-    doc->Save();
-}
-
-void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
-{
-    wxDocument *doc = GetCurrentDocument();
-    if (!doc)
-        return;
-    doc->SaveAs();
-}
-
-void wxDocManager::OnMRUFile(wxCommandEvent& event)
-{
-    // Check if the id is in the range assigned to MRU list entries.
-    const int id = event.GetId();
-    if ( id >= wxID_FILE1 &&
-            id < wxID_FILE1 + static_cast<int>(m_fileHistory->GetCount()) )
-    {
-        DoOpenMRUFile(id - wxID_FILE1);
-    }
-    else
-    {
-        event.Skip();
-    }
-}
-
-void wxDocManager::DoOpenMRUFile(unsigned n)
-{
-    wxString filename(GetHistoryFile(n));
-    if ( filename.empty() )
-        return;
-
-    wxString errMsg; // must contain exactly one "%s" if non-empty
-    if ( wxFile::Exists(filename) )
-    {
-        // Try to open it but don't give an error if it failed: this could be
-        // normal, e.g. because the user cancelled opening it, and we don't
-        // have any useful information to put in the error message anyhow, so
-        // we assume that in case of an error the appropriate message had been
-        // already logged.
-        (void)CreateDocument(filename, wxDOC_SILENT);
-    }
-    else // file doesn't exist
-    {
-        OnMRUFileNotExist(n, filename);
-    }
-}
-
-void wxDocManager::OnMRUFileNotExist(unsigned n, const wxString& filename)
-{
-    // remove the file which we can't open from the MRU list
-    RemoveFileFromHistory(n);
-
-    // and tell the user about it
-    wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\n"
-                 "It has been removed from the most recently used files list."),
-               filename);
-}
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
-{
-    wxView *view = GetActiveView();
-    if (!view)
-        return;
-
-    wxPrintout *printout = view->OnCreatePrintout();
-    if (printout)
-    {
-        wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData());
-        wxPrinter printer(&printDialogData);
-        printer.Print(view->GetFrame(), printout, true);
-
-        delete printout;
-    }
-}
-
-void wxDocManager::OnPageSetup(wxCommandEvent& WXUNUSED(event))
-{
-    wxPageSetupDialog dlg(wxTheApp->GetTopWindow(), &m_pageSetupDialogData);
-    if ( dlg.ShowModal() == wxID_OK )
-    {
-        m_pageSetupDialogData = dlg.GetPageSetupData();
-    }
-}
-
-wxPreviewFrame* wxDocManager::CreatePreviewFrame(wxPrintPreviewBase* preview,
-                                                 wxWindow *parent,
-                                                 const wxString& title)
-{
-    return new wxPreviewFrame(preview, parent, title);
-}
-
-void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
-{
-    wxBusyCursor busy;
-    wxView *view = GetActiveView();
-    if (!view)
-        return;
-
-    wxPrintout *printout = view->OnCreatePrintout();
-    if (printout)
-    {
-        wxPrintDialogData printDialogData(m_pageSetupDialogData.GetPrintData());
-
-        // Pass two printout objects: for preview, and possible printing.
-        wxPrintPreviewBase *
-            preview = new wxPrintPreview(printout,
-                                         view->OnCreatePrintout(),
-                                         &printDialogData);
-        if ( !preview->IsOk() )
-        {
-            delete preview;
-            wxLogError(_("Print preview creation failed."));
-            return;
-        }
-
-        wxPreviewFrame* frame = CreatePreviewFrame(preview,
-                                                   wxTheApp->GetTopWindow(),
-                                                   _("Print Preview"));
-        wxCHECK_RET( frame, "should create a print preview frame" );
-
-        frame->Centre(wxBOTH);
-        frame->Initialize();
-        frame->Show(true);
-    }
-}
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-void wxDocManager::OnUndo(wxCommandEvent& event)
-{
-    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
-    if ( !cmdproc )
-    {
-        event.Skip();
-        return;
-    }
-
-    cmdproc->Undo();
-}
-
-void wxDocManager::OnRedo(wxCommandEvent& event)
-{
-    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
-    if ( !cmdproc )
-    {
-        event.Skip();
-        return;
-    }
-
-    cmdproc->Redo();
-}
-
-// Handlers for UI update commands
-
-void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
-{
-    // CreateDocument() (which is called from OnFileOpen) may succeed
-    // only when there is at least a template:
-    event.Enable( GetTemplates().GetCount()>0 );
-}
-
-void wxDocManager::OnUpdateDisableIfNoDoc(wxUpdateUIEvent& event)
-{
-    event.Enable( GetCurrentDocument() != NULL );
-}
-
-void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event)
-{
-    wxDocument* doc = GetCurrentDocument();
-    event.Enable(doc && doc->IsModified() && doc->GetDocumentSaved());
-}
-
-void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
-{
-    // CreateDocument() (which is called from OnFileNew) may succeed
-    // only when there is at least a template:
-    event.Enable( GetTemplates().GetCount()>0 );
-}
-
-void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
-{
-    wxDocument * const doc = GetCurrentDocument();
-    event.Enable( doc && !doc->IsChildDocument() && !doc->AlreadySaved() );
-}
-
-void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)
-{
-    wxDocument * const doc = GetCurrentDocument();
-    event.Enable( doc && !doc->IsChildDocument() );
-}
-
-void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
-{
-    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
-    if ( !cmdproc )
-    {
-        // If we don't have any document at all, the menu item should really be
-        // disabled.
-        if ( !GetCurrentDocument() )
-            event.Enable(false);
-        else // But if we do have it, it might handle wxID_UNDO on its own
-            event.Skip();
-        return;
-    }
-    event.Enable(cmdproc->CanUndo());
-    cmdproc->SetMenuStrings();
-}
-
-void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
-{
-    wxCommandProcessor * const cmdproc = GetCurrentCommandProcessor();
-    if ( !cmdproc )
-    {
-        // Use same logic as in OnUpdateUndo() above.
-        if ( !GetCurrentDocument() )
-            event.Enable(false);
-        else
-            event.Skip();
-        return;
-    }
-    event.Enable(cmdproc->CanRedo());
-    cmdproc->SetMenuStrings();
-}
-
-wxView *wxDocManager::GetActiveView() const
-{
-    wxView *view = GetCurrentView();
-
-    if ( !view && !m_docs.empty() )
-    {
-        // if we have exactly one document, consider its view to be the current
-        // one
-        //
-        // VZ: I'm not exactly sure why is this needed but this is how this
-        //     code used to behave before the bug #9518 was fixed and it seems
-        //     safer to preserve the old logic
-        wxList::compatibility_iterator node = m_docs.GetFirst();
-        if ( !node->GetNext() )
-        {
-            wxDocument *doc = static_cast<wxDocument *>(node->GetData());
-            view = doc->GetFirstView();
-        }
-        //else: we have more than one document
-    }
-
-    return view;
-}
-
-bool wxDocManager::TryBefore(wxEvent& event)
-{
-    wxView * const view = GetActiveView();
-    return view && view->ProcessEventLocally(event);
-}
-
-namespace
-{
-
-// helper function: return only the visible templates
-wxDocTemplates GetVisibleTemplates(const wxList& allTemplates)
-{
-    // select only the visible templates
-    const size_t totalNumTemplates = allTemplates.GetCount();
-    wxDocTemplates templates;
-    if ( totalNumTemplates )
-    {
-        templates.reserve(totalNumTemplates);
-
-        for ( wxList::const_iterator i = allTemplates.begin(),
-                                   end = allTemplates.end();
-              i != end;
-              ++i )
-        {
-            wxDocTemplate * const temp = (wxDocTemplate *)*i;
-            if ( temp->IsVisible() )
-                templates.push_back(temp);
-        }
-    }
-
-    return templates;
-}
-
-} // anonymous namespace
-
-void wxDocManager::ActivateDocument(wxDocument *doc)
-{
-    wxView * const view = doc->GetFirstView();
-    if ( !view )
-        return;
-
-    view->Activate(true);
-    if ( wxWindow *win = view->GetFrame() )
-        win->Raise();
-}
-
-wxDocument *wxDocManager::CreateDocument(const wxString& pathOrig, long flags)
-{
-    // this ought to be const but SelectDocumentType/Path() are not
-    // const-correct and can't be changed as, being virtual, this risks
-    // breaking user code overriding them
-    wxDocTemplates templates(GetVisibleTemplates(m_templates));
-    const size_t numTemplates = templates.size();
-    if ( !numTemplates )
-    {
-        // no templates can be used, can't create document
-        return NULL;
-    }
-
-
-    // normally user should select the template to use but wxDOC_SILENT flag we
-    // choose one ourselves
-    wxString path = pathOrig;   // may be modified below
-    wxDocTemplate *temp;
-    if ( flags & wxDOC_SILENT )
-    {
-        wxASSERT_MSG( !path.empty(),
-                      "using empty path with wxDOC_SILENT doesn't make sense" );
-
-        temp = FindTemplateForPath(path);
-        if ( !temp )
-        {
-            wxLogWarning(_("The format of file '%s' couldn't be determined."),
-                         path);
-        }
-    }
-    else // not silent, ask the user
-    {
-        // for the new file we need just the template, for an existing one we
-        // need the template and the path, unless it's already specified
-        if ( (flags & wxDOC_NEW) || !path.empty() )
-            temp = SelectDocumentType(&templates[0], numTemplates);
-        else
-            temp = SelectDocumentPath(&templates[0], numTemplates, path, flags);
-    }
-
-    if ( !temp )
-        return NULL;
-
-    // check whether the document with this path is already opened
-    if ( !path.empty() )
-    {
-        const wxFileName fn(path);
-        for ( wxList::const_iterator i = m_docs.begin(); i != m_docs.end(); ++i )
-        {
-            wxDocument * const doc = (wxDocument*)*i;
-
-            if ( fn == doc->GetFilename() )
-            {
-                // file already open, just activate it and return
-                ActivateDocument(doc);
-                return doc;
-            }
-        }
-    }
-
-
-    // no, we need to create a new document
-
-
-    // if we've reached the max number of docs, close the first one.
-    if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen )
-    {
-        if ( !CloseDocument((wxDocument *)GetDocuments().GetFirst()->GetData()) )
-        {
-            // can't open the new document if closing the old one failed
-            return NULL;
-        }
-    }
-
-
-    // do create and initialize the new document finally
-    wxDocument * const docNew = temp->CreateDocument(path, flags);
-    if ( !docNew )
-        return NULL;
-
-    docNew->SetDocumentName(temp->GetDocumentName());
-    docNew->SetDocumentTemplate(temp);
-
-    wxTRY
-    {
-        // call the appropriate function depending on whether we're creating a
-        // new file or opening an existing one
-        if ( !(flags & wxDOC_NEW ? docNew->OnNewDocument()
-                                 : docNew->OnOpenDocument(path)) )
-        {
-            docNew->DeleteAllViews();
-            return NULL;
-        }
-    }
-    wxCATCH_ALL( docNew->DeleteAllViews(); throw; )
-
-    // add the successfully opened file to MRU, but only if we're going to be
-    // able to reopen it successfully later which requires the template for
-    // this document to be retrievable from the file extension
-    if ( !(flags & wxDOC_NEW) && temp->FileMatchesTemplate(path) )
-        AddFileToHistory(path);
-
-    // at least under Mac (where views are top level windows) it seems to be
-    // necessary to manually activate the new document to bring it to the
-    // forefront -- and it shouldn't hurt doing this under the other platforms
-    ActivateDocument(docNew);
-
-    return docNew;
-}
-
-wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
-{
-    wxDocTemplates templates(GetVisibleTemplates(m_templates));
-    const size_t numTemplates = templates.size();
-
-    if ( numTemplates == 0 )
-        return NULL;
-
-    wxDocTemplate * const
-    temp = numTemplates == 1 ? templates[0]
-                             : SelectViewType(&templates[0], numTemplates);
-
-    if ( !temp )
-        return NULL;
-
-    wxView *view = temp->CreateView(doc, flags);
-    if ( view )
-        view->SetViewName(temp->GetViewName());
-    return view;
-}
-
-// Not yet implemented
-void
-wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags))
-{
-}
-
-// Not yet implemented
-bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
-{
-    return false;
-}
-
-wxDocument *wxDocManager::GetCurrentDocument() const
-{
-    wxView * const view = GetActiveView();
-    return view ? view->GetDocument() : NULL;
-}
-
-wxCommandProcessor *wxDocManager::GetCurrentCommandProcessor() const
-{
-    wxDocument * const doc = GetCurrentDocument();
-    return doc ? doc->GetCommandProcessor() : NULL;
-}
-
-// Make a default name for a new document
-#if WXWIN_COMPATIBILITY_2_8
-bool wxDocManager::MakeDefaultName(wxString& WXUNUSED(name))
-{
-    // we consider that this function can only be overridden by the user code,
-    // not called by it as it only makes sense to call it internally, so we
-    // don't bother to return anything from here
-    return false;
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-wxString wxDocManager::MakeNewDocumentName()
-{
-    wxString name;
-
-#if WXWIN_COMPATIBILITY_2_8
-    if ( !MakeDefaultName(name) )
-#endif // WXWIN_COMPATIBILITY_2_8
-    {
-        name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
-        m_defaultDocumentNameCounter++;
-    }
-
-    return name;
-}
-
-// Make a frame title (override this to do something different)
-// If docName is empty, a document is not currently active.
-wxString wxDocManager::MakeFrameTitle(wxDocument* doc)
-{
-    wxString appName = wxTheApp->GetAppDisplayName();
-    wxString title;
-    if (!doc)
-        title = appName;
-    else
-    {
-        wxString docName = doc->GetUserReadableName();
-        title = docName + wxString(_(" - ")) + appName;
-    }
-    return title;
-}
-
-
-// Not yet implemented
-wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))
-{
-    return NULL;
-}
-
-// File history management
-void wxDocManager::AddFileToHistory(const wxString& file)
-{
-    if (m_fileHistory)
-        m_fileHistory->AddFileToHistory(file);
-}
-
-void wxDocManager::RemoveFileFromHistory(size_t i)
-{
-    if (m_fileHistory)
-        m_fileHistory->RemoveFileFromHistory(i);
-}
-
-wxString wxDocManager::GetHistoryFile(size_t i) const
-{
-    wxString histFile;
-
-    if (m_fileHistory)
-        histFile = m_fileHistory->GetHistoryFile(i);
-
-    return histFile;
-}
-
-void wxDocManager::FileHistoryUseMenu(wxMenu *menu)
-{
-    if (m_fileHistory)
-        m_fileHistory->UseMenu(menu);
-}
-
-void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)
-{
-    if (m_fileHistory)
-        m_fileHistory->RemoveMenu(menu);
-}
-
-#if wxUSE_CONFIG
-void wxDocManager::FileHistoryLoad(const wxConfigBase& config)
-{
-    if (m_fileHistory)
-        m_fileHistory->Load(config);
-}
-
-void wxDocManager::FileHistorySave(wxConfigBase& config)
-{
-    if (m_fileHistory)
-        m_fileHistory->Save(config);
-}
-#endif
-
-void wxDocManager::FileHistoryAddFilesToMenu(wxMenu* menu)
-{
-    if (m_fileHistory)
-        m_fileHistory->AddFilesToMenu(menu);
-}
-
-void wxDocManager::FileHistoryAddFilesToMenu()
-{
-    if (m_fileHistory)
-        m_fileHistory->AddFilesToMenu();
-}
-
-size_t wxDocManager::GetHistoryFilesCount() const
-{
-    return m_fileHistory ? m_fileHistory->GetCount() : 0;
-}
-
-
-// Find out the document template via matching in the document file format
-// against that of the template
-wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
-{
-    wxDocTemplate *theTemplate = NULL;
-
-    // Find the template which this extension corresponds to
-    for (size_t i = 0; i < m_templates.GetCount(); i++)
-    {
-        wxDocTemplate *temp = (wxDocTemplate *)m_templates.Item(i)->GetData();
-        if ( temp->FileMatchesTemplate(path) )
-        {
-            theTemplate = temp;
-            break;
-        }
-    }
-    return theTemplate;
-}
-
-// Prompts user to open a file, using file specs in templates.
-// Must extend the file selector dialog or implement own; OR
-// match the extension to the template extension.
-
-wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
-                                                int noTemplates,
-                                                wxString& path,
-                                                long WXUNUSED(flags),
-                                                bool WXUNUSED(save))
-{
-#ifdef wxHAS_MULTIPLE_FILEDLG_FILTERS
-    wxString descrBuf;
-
-    for (int i = 0; i < noTemplates; i++)
-    {
-        if (templates[i]->IsVisible())
-        {
-            // add a '|' to separate this filter from the previous one
-            if ( !descrBuf.empty() )
-                descrBuf << wxT('|');
-
-            descrBuf << templates[i]->GetDescription()
-                << wxT(" (") << templates[i]->GetFileFilter() << wxT(") |")
-                << templates[i]->GetFileFilter();
-        }
-    }
-#else
-    wxString descrBuf = wxT("*.*");
-    wxUnusedVar(noTemplates);
-#endif
-
-    int FilterIndex = -1;
-
-    wxString pathTmp = wxFileSelectorEx(_("Open File"),
-                                        GetLastDirectory(),
-                                        wxEmptyString,
-                                        &FilterIndex,
-                                        descrBuf,
-                                        wxFD_OPEN | wxFD_FILE_MUST_EXIST);
-
-    wxDocTemplate *theTemplate = NULL;
-    if (!pathTmp.empty())
-    {
-        if (!wxFileExists(pathTmp))
-        {
-            wxString msgTitle;
-            if (!wxTheApp->GetAppDisplayName().empty())
-                msgTitle = wxTheApp->GetAppDisplayName();
-            else
-                msgTitle = wxString(_("File error"));
-
-            wxMessageBox(_("Sorry, could not open this file."),
-                         msgTitle,
-                         wxOK | wxICON_EXCLAMATION | wxCENTRE);
-
-            path = wxEmptyString;
-            return NULL;
-        }
-
-        SetLastDirectory(wxPathOnly(pathTmp));
-
-        path = pathTmp;
-
-        // first choose the template using the extension, if this fails (i.e.
-        // wxFileSelectorEx() didn't fill it), then use the path
-        if ( FilterIndex != -1 )
-            theTemplate = templates[FilterIndex];
-        if ( !theTemplate )
-            theTemplate = FindTemplateForPath(path);
-        if ( !theTemplate )
-        {
-            // Since we do not add files with non-default extensions to the
-            // file history this can only happen if the application changes the
-            // allowed templates in runtime.
-            wxMessageBox(_("Sorry, the format for this file is unknown."),
-                         _("Open File"),
-                         wxOK | wxICON_EXCLAMATION | wxCENTRE);
-        }
-    }
-    else
-    {
-        path.clear();
-    }
-
-    return theTemplate;
-}
-
-wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
-                                                int noTemplates, bool sort)
-{
-    wxArrayString strings;
-    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);
-    int i;
-    int n = 0;
-
-    for (i = 0; i < noTemplates; i++)
-    {
-        if (templates[i]->IsVisible())
-        {
-            int j;
-            bool want = true;
-            for (j = 0; j < n; j++)
-            {
-                //filter out NOT unique documents + view combinations
-                if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
-                     templates[i]->m_viewTypeName == data[j]->m_viewTypeName
-                   )
-                    want = false;
-            }
-
-            if ( want )
-            {
-                strings.Add(templates[i]->m_description);
-
-                data[n] = templates[i];
-                n ++;
-            }
-        }
-    }  // for
-
-    if (sort)
-    {
-        strings.Sort(); // ascending sort
-        // Yes, this will be slow, but template lists
-        // are typically short.
-        int j;
-        n = strings.Count();
-        for (i = 0; i < n; i++)
-        {
-            for (j = 0; j < noTemplates; j++)
-            {
-                if (strings[i] == templates[j]->m_description)
-                    data[i] = templates[j];
-            }
-        }
-    }
-
-    wxDocTemplate *theTemplate;
-
-    switch ( n )
-    {
-        case 0:
-            // no visible templates, hence nothing to choose from
-            theTemplate = NULL;
-            break;
-
-        case 1:
-            // don't propose the user to choose if he has no choice
-            theTemplate = data[0];
-            break;
-
-        default:
-            // propose the user to choose one of several
-            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
-                          (
-                            _("Select a document template"),
-                            _("Templates"),
-                            strings,
-                            (void **)data.get()
-                          );
-    }
-
-    return theTemplate;
-}
-
-wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
-                                            int noTemplates, bool sort)
-{
-    wxArrayString strings;
-    wxScopedArray<wxDocTemplate *> data(new wxDocTemplate *[noTemplates]);
-    int i;
-    int n = 0;
-
-    for (i = 0; i < noTemplates; i++)
-    {
-        wxDocTemplate *templ = templates[i];
-        if ( templ->IsVisible() && !templ->GetViewName().empty() )
-        {
-            int j;
-            bool want = true;
-            for (j = 0; j < n; j++)
-            {
-                //filter out NOT unique views
-                if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
-                    want = false;
-            }
-
-            if ( want )
-            {
-                strings.Add(templ->m_viewTypeName);
-                data[n] = templ;
-                n ++;
-            }
-        }
-    }
-
-    if (sort)
-    {
-        strings.Sort(); // ascending sort
-        // Yes, this will be slow, but template lists
-        // are typically short.
-        int j;
-        n = strings.Count();
-        for (i = 0; i < n; i++)
-        {
-            for (j = 0; j < noTemplates; j++)
-            {
-                if (strings[i] == templates[j]->m_viewTypeName)
-                    data[i] = templates[j];
-            }
-        }
-    }
-
-    wxDocTemplate *theTemplate;
-
-    // the same logic as above
-    switch ( n )
-    {
-        case 0:
-            theTemplate = NULL;
-            break;
-
-        case 1:
-            theTemplate = data[0];
-            break;
-
-        default:
-            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
-                          (
-                            _("Select a document view"),
-                            _("Views"),
-                            strings,
-                            (void **)data.get()
-                          );
-
-    }
-
-    return theTemplate;
-}
-
-void wxDocManager::AssociateTemplate(wxDocTemplate *temp)
-{
-    if (!m_templates.Member(temp))
-        m_templates.Append(temp);
-}
-
-void wxDocManager::DisassociateTemplate(wxDocTemplate *temp)
-{
-    m_templates.DeleteObject(temp);
-}
-
-wxDocTemplate* wxDocManager::FindTemplate(const wxClassInfo* classinfo)
-{
-   for ( wxList::compatibility_iterator node = m_templates.GetFirst();
-         node;
-         node = node->GetNext() )
-   {
-      wxDocTemplate* t = wxStaticCast(node->GetData(), wxDocTemplate);
-      if ( t->GetDocClassInfo() == classinfo )
-         return t;
-   }
-
-   return NULL;
-}
-
-// Add and remove a document from the manager's list
-void wxDocManager::AddDocument(wxDocument *doc)
-{
-    if (!m_docs.Member(doc))
-        m_docs.Append(doc);
-}
-
-void wxDocManager::RemoveDocument(wxDocument *doc)
-{
-    m_docs.DeleteObject(doc);
-}
-
-// Views or windows should inform the document manager
-// when a view is going in or out of focus
-void wxDocManager::ActivateView(wxView *view, bool activate)
-{
-    if ( activate )
-    {
-        m_currentView = view;
-    }
-    else // deactivate
-    {
-        if ( m_currentView == view )
-        {
-            // don't keep stale pointer
-            m_currentView = NULL;
-        }
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxDocChildFrameAnyBase
-// ----------------------------------------------------------------------------
-
-bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event)
-{
-    if ( m_childView )
-    {
-        // notice that we must call wxView::Close() and OnClose() called from
-        // it in any case, even if we know that we are going to close anyhow
-        if ( !m_childView->Close(false) && event.CanVeto() )
-        {
-            event.Veto();
-            return false;
-        }
-
-        m_childView->Activate(false);
-
-        // it is important to reset m_childView frame pointer to NULL before
-        // deleting it because while normally it is the frame which deletes the
-        // view when it's closed, the view also closes the frame if it is
-        // deleted directly not by us as indicated by its doc child frame
-        // pointer still being set
-        m_childView->SetDocChildFrame(NULL);
-        wxDELETE(m_childView);
-    }
-
-    m_childDocument = NULL;
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wxDocParentFrameAnyBase
-// ----------------------------------------------------------------------------
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-namespace
-{
-
-wxString GetAppropriateTitle(const wxView *view, const wxString& titleGiven)
-{
-    wxString title(titleGiven);
-    if ( title.empty() )
-    {
-        if ( view && view->GetDocument() )
-            title = view->GetDocument()->GetUserReadableName();
-        else
-            title = _("Printout");
-    }
-
-    return title;
-}
-
-} // anonymous namespace
-
-wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title)
-             : wxPrintout(GetAppropriateTitle(view, title))
-{
-    m_printoutView = view;
-}
-
-bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
-{
-    wxDC *dc = GetDC();
-
-    // Get the logical pixels per inch of screen and printer
-    int ppiScreenX, ppiScreenY;
-    GetPPIScreen(&ppiScreenX, &ppiScreenY);
-    wxUnusedVar(ppiScreenY);
-    int ppiPrinterX, ppiPrinterY;
-    GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
-    wxUnusedVar(ppiPrinterY);
-
-    // This scales the DC so that the printout roughly represents the
-    // the screen scaling. The text point size _should_ be the right size
-    // but in fact is too small for some reason. This is a detail that will
-    // need to be addressed at some point but can be fudged for the
-    // moment.
-    float scale = (float)((float)ppiPrinterX/(float)ppiScreenX);
-
-    // Now we have to check in case our real page size is reduced
-    // (e.g. because we're drawing to a print preview memory DC)
-    int pageWidth, pageHeight;
-    int w, h;
-    dc->GetSize(&w, &h);
-    GetPageSizePixels(&pageWidth, &pageHeight);
-    wxUnusedVar(pageHeight);
-
-    // If printer pageWidth == current DC width, then this doesn't
-    // change. But w might be the preview bitmap width, so scale down.
-    float overallScale = scale * (float)(w/(float)pageWidth);
-    dc->SetUserScale(overallScale, overallScale);
-
-    if (m_printoutView)
-    {
-        m_printoutView->OnDraw(dc);
-    }
-    return true;
-}
-
-bool wxDocPrintout::HasPage(int pageNum)
-{
-    return (pageNum == 1);
-}
-
-bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
-{
-    if (!wxPrintout::OnBeginDocument(startPage, endPage))
-        return false;
-
-    return true;
-}
-
-void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage,
-                                int *selPageFrom, int *selPageTo)
-{
-    *minPage = 1;
-    *maxPage = 1;
-    *selPageFrom = 1;
-    *selPageTo = 1;
-}
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-// ----------------------------------------------------------------------------
-// Permits compatibility with existing file formats and functions that
-// manipulate files directly
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STD_IOSTREAM
-
-bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
-{
-#if wxUSE_FFILE
-    wxFFile file(filename, wxT("rb"));
-#elif wxUSE_FILE
-    wxFile file(filename, wxFile::read);
-#endif
-    if ( !file.IsOpened() )
-        return false;
-
-    char buf[4096];
-
-    size_t nRead;
-    do
-    {
-        nRead = file.Read(buf, WXSIZEOF(buf));
-        if ( file.Error() )
-            return false;
-
-        stream.write(buf, nRead);
-        if ( !stream )
-            return false;
-    }
-    while ( !file.Eof() );
-
-    return true;
-}
-
-bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
-{
-#if wxUSE_FFILE
-    wxFFile file(filename, wxT("wb"));
-#elif wxUSE_FILE
-    wxFile file(filename, wxFile::write);
-#endif
-    if ( !file.IsOpened() )
-        return false;
-
-    char buf[4096];
-    do
-    {
-        stream.read(buf, WXSIZEOF(buf));
-        if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
-        {
-            if ( !file.Write(buf, stream.gcount()) )
-                return false;
-        }
-    }
-    while ( !stream.eof() );
-
-    return true;
-}
-
-#else // !wxUSE_STD_IOSTREAM
-
-bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
-{
-#if wxUSE_FFILE
-    wxFFile file(filename, wxT("rb"));
-#elif wxUSE_FILE
-    wxFile file(filename, wxFile::read);
-#endif
-    if ( !file.IsOpened() )
-        return false;
-
-    char buf[4096];
-
-    size_t nRead;
-    do
-    {
-        nRead = file.Read(buf, WXSIZEOF(buf));
-        if ( file.Error() )
-            return false;
-
-        stream.Write(buf, nRead);
-        if ( !stream )
-            return false;
-    }
-    while ( !file.Eof() );
-
-    return true;
-}
-
-bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
-{
-#if wxUSE_FFILE
-    wxFFile file(filename, wxT("wb"));
-#elif wxUSE_FILE
-    wxFile file(filename, wxFile::write);
-#endif
-    if ( !file.IsOpened() )
-        return false;
-
-    char buf[4096];
-    for ( ;; )
-    {
-        stream.Read(buf, WXSIZEOF(buf));
-
-        const size_t nRead = stream.LastRead();
-        if ( !nRead )
-        {
-            if ( stream.Eof() )
-                break;
-
-            return false;
-        }
-
-        if ( !file.Write(buf, nRead) )
-            return false;
-    }
-
-    return true;
-}
-
-#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
-
-#endif // wxUSE_DOC_VIEW_ARCHITECTURE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/docview.cpp
+// Purpose:     Document/view classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: docview.cpp 66911 2011-02-16 21:31:33Z JS $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_DOC_VIEW_ARCHITECTURE
+
+#include "wx/docview.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/dc.h"
+    #include "wx/dialog.h"
+    #include "wx/menu.h"
+    #include "wx/filedlg.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/msgdlg.h"
+    #include "wx/mdi.h"
+    #include "wx/choicdlg.h"
+#endif
+
+#include "wx/ffile.h"
+
+#ifdef __WXMAC__
+    #include "wx/filename.h"
+#endif
+
+#if wxUSE_PRINTING_ARCHITECTURE
+    #include "wx/prntbase.h"
+    #include "wx/printdlg.h"
+#endif
+
+#include "wx/confbase.h"
+#include "wx/file.h"
+#include "wx/cmdproc.h"
+#include "wx/tokenzr.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#if wxUSE_STD_IOSTREAM
+    #include "wx/ioswrap.h"
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif
+#else
+    #include "wx/wfstream.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// wxWidgets macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
+IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
+IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
+IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
+IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
+
+#if wxUSE_PRINTING_ARCHITECTURE
+    IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
+
+// ----------------------------------------------------------------------------
+// function prototypes
+// ----------------------------------------------------------------------------
+
+static wxWindow* wxFindSuitableParent(void);
+
+// ----------------------------------------------------------------------------
+// local constants
+// ----------------------------------------------------------------------------
+
+static const wxChar *s_MRUEntryFormat = wxT("&%d %s");
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// local functions
+// ----------------------------------------------------------------------------
+
+static wxString FindExtension(const wxChar *path)
+{
+    wxString ext;
+    wxSplitPath(path, NULL, NULL, &ext);
+
+    // VZ: extensions are considered not case sensitive - is this really a good
+    //     idea?
+    return ext.MakeLower();
+}
+
+// ----------------------------------------------------------------------------
+// Definition of wxDocument
+// ----------------------------------------------------------------------------
+
+wxDocument::wxDocument(wxDocument *parent)
+{
+    m_documentModified = false;
+    m_documentParent = parent;
+    m_documentTemplate = (wxDocTemplate *) NULL;
+    m_commandProcessor = (wxCommandProcessor*) NULL;
+    m_savedYet = false;
+}
+
+bool wxDocument::DeleteContents()
+{
+    return true;
+}
+
+wxDocument::~wxDocument()
+{
+    DeleteContents();
+
+    if (m_commandProcessor)
+        delete m_commandProcessor;
+
+    if (GetDocumentManager())
+        GetDocumentManager()->RemoveDocument(this);
+
+    // Not safe to do here, since it'll invoke virtual view functions
+    // expecting to see valid derived objects: and by the time we get here,
+    // we've called destructors higher up.
+    //DeleteAllViews();
+}
+
+bool wxDocument::Close()
+{
+    if (OnSaveModified())
+        return OnCloseDocument();
+    else
+        return false;
+}
+
+bool wxDocument::OnCloseDocument()
+{
+    // Tell all views that we're about to close
+    NotifyClosing();
+    DeleteContents();
+    Modify(false);
+    return true;
+}
+
+// Note that this implicitly deletes the document when the last view is
+// deleted.
+bool wxDocument::DeleteAllViews()
+{
+    wxDocManager* manager = GetDocumentManager();
+
+    // first check if all views agree to be closed
+    const wxList::iterator end = m_documentViews.end();
+    for ( wxList::iterator i = m_documentViews.begin(); i != end; ++i )
+    {
+        wxView *view = (wxView *)*i;
+        if ( !view->Close() )
+            return false;
+    }
+
+    // all views agreed to close, now do close them
+    if ( m_documentViews.empty() )
+    {
+        // normally the document would be implicitly deleted when the last view
+        // is, but if don't have any views, do it here instead
+        if ( manager && manager->GetDocuments().Member(this) )
+            delete this;
+    }
+    else // have views
+    {
+        // as we delete elements we iterate over, don't use the usual "from
+        // begin to end" loop
+        for ( ;; )
+        {
+            wxView *view = (wxView *)*m_documentViews.begin();
+
+            bool isLastOne = m_documentViews.size() == 1;
+
+            // this always deletes the node implicitly and if this is the last
+            // view also deletes this object itself (also implicitly, great),
+            // so we can't test for m_documentViews.empty() after calling this!
+            delete view;
+
+            if ( isLastOne )
+                break;
+        }
+    }
+
+    return true;
+}
+
+wxView *wxDocument::GetFirstView() const
+{
+    if (m_documentViews.GetCount() == 0)
+        return (wxView *) NULL;
+    return (wxView *)m_documentViews.GetFirst()->GetData();
+}
+
+wxDocManager *wxDocument::GetDocumentManager() const
+{
+    return (m_documentTemplate ? m_documentTemplate->GetDocumentManager() : (wxDocManager*) NULL);
+}
+
+bool wxDocument::OnNewDocument()
+{
+    if (!OnSaveModified())
+        return false;
+
+    if (OnCloseDocument()==false) return false;
+    DeleteContents();
+    Modify(false);
+    SetDocumentSaved(false);
+
+    wxString name;
+    GetDocumentManager()->MakeDefaultName(name);
+    SetTitle(name);
+    SetFilename(name, true);
+
+    return true;
+}
+
+bool wxDocument::Save()
+{
+    if (!IsModified() && m_savedYet)
+        return true;
+
+    if ( m_documentFile.empty() || !m_savedYet )
+        return SaveAs();
+
+    return OnSaveDocument(m_documentFile);
+}
+
+bool wxDocument::SaveAs()
+{
+    wxDocTemplate *docTemplate = GetDocumentTemplate();
+    if (!docTemplate)
+        return false;
+
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
+    wxString filter = docTemplate->GetDescription() + wxT(" (") + docTemplate->GetFileFilter() + wxT(")|") + docTemplate->GetFileFilter();
+
+    // Now see if there are some other template with identical view and document
+    // classes, whose filters may also be used.
+
+    if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo())
+    {
+        wxList::compatibility_iterator node = docTemplate->GetDocumentManager()->GetTemplates().GetFirst();
+        while (node)
+        {
+            wxDocTemplate *t = (wxDocTemplate*) node->GetData();
+
+            if (t->IsVisible() && t != docTemplate &&
+                t->GetViewClassInfo() == docTemplate->GetViewClassInfo() &&
+                t->GetDocClassInfo() == docTemplate->GetDocClassInfo())
+            {
+                // add a '|' to separate this filter from the previous one
+                if ( !filter.empty() )
+                    filter << wxT('|');
+
+                filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |")
+                       << t->GetFileFilter();
+            }
+
+            node = node->GetNext();
+        }
+    }
+#else
+    wxString filter = docTemplate->GetFileFilter() ;
+#endif
+    wxString defaultDir = docTemplate->GetDirectory();
+    if (defaultDir.IsEmpty())
+        defaultDir = wxPathOnly(GetFilename());
+
+    wxString tmp = wxFileSelector(_("Save as"),
+            defaultDir,
+            wxFileNameFromPath(GetFilename()),
+            docTemplate->GetDefaultExtension(),
+            filter,
+            wxFD_SAVE | wxFD_OVERWRITE_PROMPT,
+            GetDocumentWindow());
+
+    if (tmp.empty())
+        return false;
+
+    wxString fileName(tmp);
+    wxString path, name, ext;
+    wxSplitPath(fileName, & path, & name, & ext);
+
+    if (ext.empty())
+    {
+        fileName += wxT(".");
+        fileName += docTemplate->GetDefaultExtension();
+    }
+
+    SetFilename(fileName);
+    SetTitle(wxFileNameFromPath(fileName));
+
+    // Notify the views that the filename has changed
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
+    while (node)
+    {
+        wxView *view = (wxView *)node->GetData();
+        view->OnChangeFilename();
+        node = node->GetNext();
+    }
+
+    // Files that were not saved correctly are not added to the FileHistory.
+    if (!OnSaveDocument(m_documentFile))
+        return false;
+
+   // A file that doesn't use the default extension of its document template cannot be opened
+   // via the FileHistory, so we do not add it.
+   if (docTemplate->FileMatchesTemplate(fileName))
+   {
+       GetDocumentManager()->AddFileToHistory(fileName);
+   }
+   else
+   {
+       // The user will probably not be able to open the file again, so
+       // we could warn about the wrong file-extension here.
+   }
+   return true;
+}
+
+bool wxDocument::OnSaveDocument(const wxString& file)
+{
+    if ( !file )
+        return false;
+
+    if ( !DoSaveDocument(file) )
+        return false;
+
+    Modify(false);
+    SetFilename(file);
+    SetDocumentSaved(true);
+#ifdef __WXMAC__
+    wxFileName fn(file) ;
+    fn.MacSetDefaultTypeAndCreator() ;
+#endif
+    return true;
+}
+
+bool wxDocument::OnOpenDocument(const wxString& file)
+{
+    if (!OnSaveModified())
+        return false;
+
+    if ( !DoOpenDocument(file) )
+        return false;
+
+    SetFilename(file, true);
+    Modify(false);
+    m_savedYet = true;
+
+    UpdateAllViews();
+
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+wxSTD istream& wxDocument::LoadObject(wxSTD istream& stream)
+#else
+wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
+#endif
+{
+    return stream;
+}
+
+#if wxUSE_STD_IOSTREAM
+wxSTD ostream& wxDocument::SaveObject(wxSTD ostream& stream)
+#else
+wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
+#endif
+{
+    return stream;
+}
+
+bool wxDocument::Revert()
+{
+    return false;
+}
+
+
+// Get title, or filename if no title, else unnamed
+bool wxDocument::GetPrintableName(wxString& buf) const
+{
+    if (!m_documentTitle.empty())
+    {
+        buf = m_documentTitle;
+        return true;
+    }
+    else if (!m_documentFile.empty())
+    {
+        buf = wxFileNameFromPath(m_documentFile);
+        return true;
+    }
+    else
+    {
+        buf = _("unnamed");
+        return true;
+    }
+}
+
+wxWindow *wxDocument::GetDocumentWindow() const
+{
+    wxView *view = GetFirstView();
+    if (view)
+        return view->GetFrame();
+    else
+        return wxTheApp->GetTopWindow();
+}
+
+wxCommandProcessor *wxDocument::OnCreateCommandProcessor()
+{
+    return new wxCommandProcessor;
+}
+
+// true if safe to close
+bool wxDocument::OnSaveModified()
+{
+    if (IsModified())
+    {
+        wxString title;
+        GetPrintableName(title);
+
+        wxString msgTitle;
+        if (!wxTheApp->GetAppName().empty())
+            msgTitle = wxTheApp->GetAppName();
+        else
+            msgTitle = wxString(_("Warning"));
+
+        wxString prompt;
+        prompt.Printf(_("Do you want to save changes to document %s?"),
+                (const wxChar *)title);
+        int res = wxMessageBox(prompt, msgTitle,
+                wxYES_NO|wxCANCEL|wxICON_QUESTION,
+                GetDocumentWindow());
+        if (res == wxNO)
+        {
+            Modify(false);
+            return true;
+        }
+        else if (res == wxYES)
+            return Save();
+        else if (res == wxCANCEL)
+            return false;
+    }
+    return true;
+}
+
+bool wxDocument::Draw(wxDC& WXUNUSED(context))
+{
+    return true;
+}
+
+bool wxDocument::AddView(wxView *view)
+{
+    if (!m_documentViews.Member(view))
+    {
+        m_documentViews.Append(view);
+        OnChangedViewList();
+    }
+    return true;
+}
+
+bool wxDocument::RemoveView(wxView *view)
+{
+    (void)m_documentViews.DeleteObject(view);
+    OnChangedViewList();
+    return true;
+}
+
+bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
+{
+    if (GetDocumentTemplate()->CreateView(this, flags))
+        return true;
+    else
+        return false;
+}
+
+// Called after a view is added or removed.
+// The default implementation deletes the document if
+// there are no more views.
+void wxDocument::OnChangedViewList()
+{
+    if (m_documentViews.GetCount() == 0)
+    {
+        if (OnSaveModified())
+        {
+            delete this;
+        }
+    }
+}
+
+void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
+{
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
+    while (node)
+    {
+        wxView *view = (wxView *)node->GetData();
+        if (view != sender)
+            view->OnUpdate(sender, hint);
+        node = node->GetNext();
+    }
+}
+
+void wxDocument::NotifyClosing()
+{
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();
+    while (node)
+    {
+        wxView *view = (wxView *)node->GetData();
+        view->OnClosingDocument();
+        node = node->GetNext();
+    }
+}
+
+void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
+{
+    m_documentFile = filename;
+    if ( notifyViews )
+    {
+        // Notify the views that the filename has changed
+        wxList::compatibility_iterator node = m_documentViews.GetFirst();
+        while (node)
+        {
+            wxView *view = (wxView *)node->GetData();
+            view->OnChangeFilename();
+            node = node->GetNext();
+        }
+    }
+}
+
+bool wxDocument::DoSaveDocument(const wxString& file)
+{
+    wxString msgTitle;
+    if (!wxTheApp->GetAppName().empty())
+        msgTitle = wxTheApp->GetAppName();
+    else
+        msgTitle = wxString(_("File error"));
+
+#if wxUSE_STD_IOSTREAM
+    wxSTD ofstream store(file.mb_str(), wxSTD ios::binary);
+    if (store.fail() || store.bad())
+#else
+    wxFileOutputStream store(file);
+    if (store.GetLastError() != wxSTREAM_NO_ERROR)
+#endif
+    {
+        (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
+                           GetDocumentWindow());
+        // Saving error
+        return false;
+    }
+    if (!SaveObject(store))
+    {
+        (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
+                           GetDocumentWindow());
+        // Saving error
+        return false;
+    }
+
+    return true;
+}
+
+bool wxDocument::DoOpenDocument(const wxString& file)
+{
+#if wxUSE_STD_IOSTREAM
+    wxSTD ifstream store(file.mb_str(), wxSTD ios::binary);
+    if (!store.fail() && !store.bad())
+#else
+    wxFileInputStream store(file);
+    if (store.GetLastError() == wxSTREAM_NO_ERROR)
+#endif
+    {
+#if wxUSE_STD_IOSTREAM
+        LoadObject(store);
+        if ( !!store || store.eof() )
+#else
+        int res = LoadObject(store).GetLastError();
+        if ( res == wxSTREAM_NO_ERROR || res == wxSTREAM_EOF )
+#endif
+            return true;
+    }
+
+    wxLogError(_("Sorry, could not open this file."));
+    return false;
+}
+
+
+// ----------------------------------------------------------------------------
+// Document view
+// ----------------------------------------------------------------------------
+
+wxView::wxView()
+{
+    m_viewDocument = (wxDocument*) NULL;
+
+    m_viewFrame = (wxFrame *) NULL;
+}
+
+wxView::~wxView()
+{
+    if (m_viewDocument && GetDocumentManager())
+        GetDocumentManager()->ActivateView(this, false);
+    if (m_viewDocument)
+        m_viewDocument->RemoveView(this);
+}
+
+// Extend event processing to search the document's event table
+bool wxView::ProcessEvent(wxEvent& event)
+{
+    if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
+        return wxEvtHandler::ProcessEvent(event);
+
+    return true;
+}
+
+void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))
+{
+}
+
+void wxView::OnPrint(wxDC *dc, wxObject *WXUNUSED(info))
+{
+    OnDraw(dc);
+}
+
+void wxView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
+{
+}
+
+void wxView::OnChangeFilename()
+{
+    // GetFrame can return wxWindow rather than wxTopLevelWindow due to
+    // generic MDI implementation so use SetLabel rather than SetTitle.
+    // It should cause SetTitle() for top level windows.
+    wxWindow *win = GetFrame();
+    if (!win) return;
+
+    wxDocument *doc = GetDocument();
+    if (!doc) return;
+
+    wxString name;
+    doc->GetPrintableName(name);
+    win->SetLabel(name);
+}
+
+void wxView::SetDocument(wxDocument *doc)
+{
+    m_viewDocument = doc;
+    if (doc)
+        doc->AddView(this);
+}
+
+bool wxView::Close(bool deleteWindow)
+{
+    if (OnClose(deleteWindow))
+        return true;
+    else
+        return false;
+}
+
+void wxView::Activate(bool activate)
+{
+    if (GetDocument() && GetDocumentManager())
+    {
+        OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
+        GetDocumentManager()->ActivateView(this, activate);
+    }
+}
+
+bool wxView::OnClose(bool WXUNUSED(deleteWindow))
+{
+    return GetDocument() ? GetDocument()->Close() : true;
+}
+
+#if wxUSE_PRINTING_ARCHITECTURE
+wxPrintout *wxView::OnCreatePrintout()
+{
+    return new wxDocPrintout(this);
+}
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
+// ----------------------------------------------------------------------------
+// wxDocTemplate
+// ----------------------------------------------------------------------------
+
+wxDocTemplate::wxDocTemplate(wxDocManager *manager,
+                             const wxString& descr,
+                             const wxString& filter,
+                             const wxString& dir,
+                             const wxString& ext,
+                             const wxString& docTypeName,
+                             const wxString& viewTypeName,
+                             wxClassInfo *docClassInfo,
+                             wxClassInfo *viewClassInfo,
+                             long flags)
+{
+    m_documentManager = manager;
+    m_description = descr;
+    m_directory = dir;
+    m_defaultExt = ext;
+    m_fileFilter = filter;
+    m_flags = flags;
+    m_docTypeName = docTypeName;
+    m_viewTypeName = viewTypeName;
+    m_documentManager->AssociateTemplate(this);
+
+    m_docClassInfo = docClassInfo;
+    m_viewClassInfo = viewClassInfo;
+}
+
+wxDocTemplate::~wxDocTemplate()
+{
+    m_documentManager->DisassociateTemplate(this);
+}
+
+// Tries to dynamically construct an object of the right class.
+wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
+{
+    wxDocument *doc = DoCreateDocument();
+    if ( doc == NULL )
+        return (wxDocument *) NULL;
+
+    if (InitDocument(doc, path, flags))
+    {
+        return doc;
+    }
+    else
+    {
+        return (wxDocument *) NULL;
+    }
+}
+
+bool wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
+{
+    doc->SetFilename(path);
+    doc->SetDocumentTemplate(this);
+    GetDocumentManager()->AddDocument(doc);
+    doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
+
+    if (doc->OnCreate(path, flags))
+        return true;
+    else
+    {
+        if (GetDocumentManager()->GetDocuments().Member(doc))
+            doc->DeleteAllViews();
+        return false;
+    }
+}
+
+wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
+{
+    wxView *view = DoCreateView();
+    if ( view == NULL )
+        return (wxView *) NULL;
+
+    view->SetDocument(doc);
+    if (view->OnCreate(doc, flags))
+    {
+        return view;
+    }
+    else
+    {
+        delete view;
+        return (wxView *) NULL;
+    }
+}
+
+// The default (very primitive) format detection: check is the extension is
+// that of the template
+bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
+{
+    wxStringTokenizer parser (GetFileFilter(), wxT(";"));
+    wxString anything = wxT ("*");
+    while (parser.HasMoreTokens())
+    {
+        wxString filter = parser.GetNextToken();
+        wxString filterExt = FindExtension (filter);
+        if ( filter.IsSameAs (anything)    ||
+             filterExt.IsSameAs (anything) ||
+             filterExt.IsSameAs (FindExtension (path)) )
+            return true;
+    }
+    return GetDefaultExtension().IsSameAs(FindExtension(path));
+}
+
+wxDocument *wxDocTemplate::DoCreateDocument()
+{
+    if (!m_docClassInfo)
+        return (wxDocument *) NULL;
+
+    return (wxDocument *)m_docClassInfo->CreateObject();
+}
+
+wxView *wxDocTemplate::DoCreateView()
+{
+    if (!m_viewClassInfo)
+        return (wxView *) NULL;
+
+    return (wxView *)m_viewClassInfo->CreateObject();
+}
+
+// ----------------------------------------------------------------------------
+// wxDocManager
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
+    EVT_MENU(wxID_OPEN, wxDocManager::OnFileOpen)
+    EVT_MENU(wxID_CLOSE, wxDocManager::OnFileClose)
+    EVT_MENU(wxID_CLOSE_ALL, wxDocManager::OnFileCloseAll)
+    EVT_MENU(wxID_REVERT, wxDocManager::OnFileRevert)
+    EVT_MENU(wxID_NEW, wxDocManager::OnFileNew)
+    EVT_MENU(wxID_SAVE, wxDocManager::OnFileSave)
+    EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs)
+    EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
+    EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
+
+    EVT_UPDATE_UI(wxID_OPEN, wxDocManager::OnUpdateFileOpen)
+    EVT_UPDATE_UI(wxID_CLOSE, wxDocManager::OnUpdateFileClose)
+    EVT_UPDATE_UI(wxID_CLOSE_ALL, wxDocManager::OnUpdateFileClose)
+    EVT_UPDATE_UI(wxID_REVERT, wxDocManager::OnUpdateFileRevert)
+    EVT_UPDATE_UI(wxID_NEW, wxDocManager::OnUpdateFileNew)
+    EVT_UPDATE_UI(wxID_SAVE, wxDocManager::OnUpdateFileSave)
+    EVT_UPDATE_UI(wxID_SAVEAS, wxDocManager::OnUpdateFileSaveAs)
+    EVT_UPDATE_UI(wxID_UNDO, wxDocManager::OnUpdateUndo)
+    EVT_UPDATE_UI(wxID_REDO, wxDocManager::OnUpdateRedo)
+
+#if wxUSE_PRINTING_ARCHITECTURE
+    EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
+    EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
+
+    EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint)
+    EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
+#endif
+END_EVENT_TABLE()
+
+wxDocManager* wxDocManager::sm_docManager = (wxDocManager*) NULL;
+
+wxDocManager::wxDocManager(long flags, bool initialize)
+{
+    m_defaultDocumentNameCounter = 1;
+    m_flags = flags;
+    m_currentView = (wxView *) NULL;
+    m_maxDocsOpen = 10000;
+    m_fileHistory = (wxFileHistory *) NULL;
+    if (initialize)
+        Initialize();
+    sm_docManager = this;
+}
+
+wxDocManager::~wxDocManager()
+{
+    Clear();
+    if (m_fileHistory)
+        delete m_fileHistory;
+    sm_docManager = (wxDocManager*) NULL;
+}
+
+// closes the specified document
+bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
+{
+    if (doc->Close() || force)
+    {
+        // Implicitly deletes the document when
+        // the last view is deleted
+        doc->DeleteAllViews();
+
+        // Check we're really deleted
+        if (m_docs.Member(doc))
+            delete doc;
+
+        return true;
+    }
+    return false;
+}
+
+bool wxDocManager::CloseDocuments(bool force)
+{
+    wxList::compatibility_iterator node = m_docs.GetFirst();
+    while (node)
+    {
+        wxDocument *doc = (wxDocument *)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
+
+        if (!CloseDocument(doc, force))
+            return false;
+
+        // This assumes that documents are not connected in
+        // any way, i.e. deleting one document does NOT
+        // delete another.
+        node = next;
+    }
+    return true;
+}
+
+bool wxDocManager::Clear(bool force)
+{
+    if (!CloseDocuments(force))
+        return false;
+
+    m_currentView = NULL;
+
+    wxList::compatibility_iterator node = m_templates.GetFirst();
+    while (node)
+    {
+        wxDocTemplate *templ = (wxDocTemplate*) node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
+        delete templ;
+        node = next;
+    }
+    return true;
+}
+
+bool wxDocManager::Initialize()
+{
+    m_fileHistory = OnCreateFileHistory();
+    return true;
+}
+
+wxFileHistory *wxDocManager::OnCreateFileHistory()
+{
+    return new wxFileHistory;
+}
+
+void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
+{
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        return;
+    if (doc->Close())
+    {
+        doc->DeleteAllViews();
+        if (m_docs.Member(doc))
+            delete doc;
+    }
+}
+
+void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
+{
+    CloseDocuments(false);
+}
+
+void wxDocManager::OnFileNew(wxCommandEvent& WXUNUSED(event))
+{
+    CreateDocument( wxEmptyString, wxDOC_NEW );
+}
+
+void wxDocManager::OnFileOpen(wxCommandEvent& WXUNUSED(event))
+{
+    if ( !CreateDocument( wxEmptyString, 0) )
+    {
+        OnOpenFileFailure();
+    }
+}
+
+void wxDocManager::OnFileRevert(wxCommandEvent& WXUNUSED(event))
+{
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        return;
+    doc->Revert();
+}
+
+void wxDocManager::OnFileSave(wxCommandEvent& WXUNUSED(event))
+{
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        return;
+    doc->Save();
+}
+
+void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
+{
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        return;
+    doc->SaveAs();
+}
+
+void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_PRINTING_ARCHITECTURE
+    wxView *view = GetCurrentView();
+    if (!view)
+        return;
+
+    wxPrintout *printout = view->OnCreatePrintout();
+    if (printout)
+    {
+        wxPrinter printer;
+        printer.Print(view->GetFrame(), printout, true);
+
+        delete printout;
+    }
+#endif // wxUSE_PRINTING_ARCHITECTURE
+}
+
+void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_PRINTING_ARCHITECTURE
+    wxBusyCursor busy;
+    wxView *view = GetCurrentView();
+    if (!view)
+        return;
+
+    wxPrintout *printout = view->OnCreatePrintout();
+    if (printout)
+    {
+        // Pass two printout objects: for preview, and possible printing.
+        wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+        if ( !preview->Ok() )
+        {
+            delete preview;
+            wxMessageBox( _("Sorry, print preview needs a printer to be installed.") );
+            return;
+        }
+
+        wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
+                wxPoint(100, 100), wxSize(600, 650));
+        frame->Centre(wxBOTH);
+        frame->Initialize();
+        frame->Show(true);
+    }
+#endif // wxUSE_PRINTING_ARCHITECTURE
+}
+
+void wxDocManager::OnUndo(wxCommandEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        return;
+    if (doc->GetCommandProcessor())
+        doc->GetCommandProcessor()->Undo();
+    else
+        event.Skip();
+}
+
+void wxDocManager::OnRedo(wxCommandEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        return;
+    if (doc->GetCommandProcessor())
+        doc->GetCommandProcessor()->Redo();
+    else
+        event.Skip();
+}
+
+// Handlers for UI update commands
+
+void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
+{
+    event.Enable( true );
+}
+
+void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
+{
+    event.Enable( true );
+}
+
+void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    event.Enable( doc && doc->IsModified() );
+}
+
+void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        event.Enable(false);
+    else if (!doc->GetCommandProcessor())
+        event.Skip();
+    else
+    {
+        event.Enable( doc->GetCommandProcessor()->CanUndo() );
+        doc->GetCommandProcessor()->SetMenuStrings();
+    }
+}
+
+void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    if (!doc)
+        event.Enable(false);
+    else if (!doc->GetCommandProcessor())
+        event.Skip();
+    else
+    {
+        event.Enable( doc->GetCommandProcessor()->CanRedo() );
+        doc->GetCommandProcessor()->SetMenuStrings();
+    }
+}
+
+void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
+{
+    wxDocument *doc = GetCurrentDocument();
+    event.Enable( (doc != (wxDocument*) NULL) );
+}
+
+wxView *wxDocManager::GetCurrentView() const
+{
+    if (m_currentView)
+        return m_currentView;
+    if (m_docs.GetCount() == 1)
+    {
+        wxDocument* doc = (wxDocument*) m_docs.GetFirst()->GetData();
+        return doc->GetFirstView();
+    }
+    return (wxView *) NULL;
+}
+
+// Extend event processing to search the view's event table
+bool wxDocManager::ProcessEvent(wxEvent& event)
+{
+    wxView* view = GetCurrentView();
+    if (view)
+    {
+        if (view->ProcessEvent(event))
+            return true;
+    }
+    return wxEvtHandler::ProcessEvent(event);
+}
+
+wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
+{
+    wxDocTemplate   **templates = new wxDocTemplate *[m_templates.GetCount()];
+    int               n = 0;
+
+    for (size_t i = 0; i < m_templates.GetCount(); i++)
+    {
+        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData());
+        if (temp->IsVisible())
+        {
+            templates[n] = temp;
+            n ++;
+        }
+    }
+    if (n == 0)
+    {
+        delete[] templates;
+        return (wxDocument *) NULL;
+    }
+
+    wxDocument* docToClose = NULL;
+
+    // If we've reached the max number of docs, close the
+    // first one.
+    if ( (int)GetDocuments().GetCount() >= m_maxDocsOpen )
+    {
+        wxDocument *doc = (wxDocument *)GetDocuments().GetFirst()->GetData();
+        docToClose = doc;
+    }
+
+    // New document: user chooses a template, unless there's only one.
+    if (flags & wxDOC_NEW)
+    {
+        if (n == 1)
+        {
+            if (docToClose)
+            {
+                if (!CloseDocument(docToClose, false))
+                {
+                    delete[] templates;
+                    return NULL;
+                }
+            }
+
+            wxDocTemplate *temp = templates[0];
+            delete[] templates;
+            wxDocument *newDoc = temp->CreateDocument(path, flags);
+
+            if (newDoc)
+            {
+                newDoc->SetDocumentName(temp->GetDocumentName());
+                newDoc->SetDocumentTemplate(temp);
+                if (!newDoc->OnNewDocument() )
+                {
+                     // Document is implicitly deleted by DeleteAllViews
+                     newDoc->DeleteAllViews();
+                     return NULL;
+                }
+            }
+            return newDoc;
+        }
+
+        wxDocTemplate *temp = SelectDocumentType(templates, n);
+        delete[] templates;
+        if (temp)
+        {
+            if (docToClose)
+            {
+                if (!CloseDocument(docToClose, false))
+                {
+                    return NULL;
+                }
+            }
+
+            wxDocument *newDoc = temp->CreateDocument(path, flags);
+
+            if (newDoc)
+            {
+                newDoc->SetDocumentName(temp->GetDocumentName());
+                newDoc->SetDocumentTemplate(temp);
+                if (!newDoc->OnNewDocument() )
+                {
+                     // Document is implicitly deleted by DeleteAllViews
+                     newDoc->DeleteAllViews();
+                     return NULL;
+                }
+            }
+            return newDoc;
+        }
+        else
+            return (wxDocument *) NULL;
+    }
+
+    // Existing document
+    wxDocTemplate *temp;
+
+    wxString path2 = path;
+
+    if (flags & wxDOC_SILENT)
+    {
+        temp = FindTemplateForPath(path2);
+        if (!temp)
+        {
+            // Since we do not add files with non-default extensions to the FileHistory this
+            // can only happen if the application changes the allowed templates in runtime.
+            (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
+                                _("Open File"),
+                               wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
+        }
+    }
+    else
+        temp = SelectDocumentPath(templates, n, path2, flags);
+
+    delete[] templates;
+
+    if (temp)
+    {
+        if (docToClose)
+        {
+            if (!CloseDocument(docToClose, false))
+            {
+                return NULL;
+            }
+        }
+
+        //see if this file is already open
+        for (size_t i = 0; i < GetDocuments().GetCount(); ++i)
+        {
+            wxDocument* currentDoc = (wxDocument*)(GetDocuments().Item(i)->GetData());
+#ifdef __WXMSW__
+            //file paths are case-insensitive on Windows
+            if (path2.CmpNoCase(currentDoc->GetFilename()) == 0)
+#else
+            if (path2.Cmp(currentDoc->GetFilename()) == 0)
+#endif
+            {
+                //file already open. Just activate it and return
+                if (currentDoc->GetFirstView())
+                {
+                    ActivateView(currentDoc->GetFirstView(), true);
+                    if (currentDoc->GetDocumentWindow())
+                        currentDoc->GetDocumentWindow()->SetFocus();
+                    return currentDoc;
+                }
+            }
+        }
+
+        wxDocument *newDoc = temp->CreateDocument(path2, flags);
+        if (newDoc)
+        {
+            newDoc->SetDocumentName(temp->GetDocumentName());
+            newDoc->SetDocumentTemplate(temp);
+            if (!newDoc->OnOpenDocument(path2))
+            {
+                newDoc->DeleteAllViews();
+                // delete newDoc; // Implicitly deleted by DeleteAllViews
+                return (wxDocument *) NULL;
+            }
+            // A file that doesn't use the default extension of its document
+            // template cannot be opened via the FileHistory, so we do not
+            // add it.
+            if (temp->FileMatchesTemplate(path2))
+                AddFileToHistory(path2);
+        }
+        return newDoc;
+    }
+
+    return (wxDocument *) NULL;
+}
+
+wxView *wxDocManager::CreateView(wxDocument *doc, long flags)
+{
+    wxDocTemplate   **templates = new wxDocTemplate *[m_templates.GetCount()];
+    int               n =0;
+
+    for (size_t i = 0; i < m_templates.GetCount(); i++)
+    {
+        wxDocTemplate *temp = (wxDocTemplate *)(m_templates.Item(i)->GetData());
+        if (temp->IsVisible())
+        {
+            if (temp->GetDocumentName() == doc->GetDocumentName())
+            {
+                templates[n] = temp;
+                n ++;
+            }
+        }
+    }
+    if (n == 0)
+    {
+        delete[] templates;
+        return (wxView *) NULL;
+    }
+    if (n == 1)
+    {
+        wxDocTemplate *temp = templates[0];
+        delete[] templates;
+        wxView *view = temp->CreateView(doc, flags);
+        if (view)
+            view->SetViewName(temp->GetViewName());
+        return view;
+    }
+
+    wxDocTemplate *temp = SelectViewType(templates, n);
+    delete[] templates;
+    if (temp)
+    {
+        wxView *view = temp->CreateView(doc, flags);
+        if (view)
+            view->SetViewName(temp->GetViewName());
+        return view;
+    }
+    else
+        return (wxView *) NULL;
+}
+
+// Not yet implemented
+void wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(flags))
+{
+}
+
+// Not yet implemented
+bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
+{
+    return false;
+}
+
+wxDocument *wxDocManager::GetCurrentDocument() const
+{
+    wxView *view = GetCurrentView();
+    if (view)
+        return view->GetDocument();
+    else
+        return (wxDocument *) NULL;
+}
+
+// Make a default document name
+bool wxDocManager::MakeDefaultName(wxString& name)
+{
+    name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
+    m_defaultDocumentNameCounter++;
+
+    return true;
+}
+
+// Make a frame title (override this to do something different)
+// If docName is empty, a document is not currently active.
+wxString wxDocManager::MakeFrameTitle(wxDocument* doc)
+{
+    wxString appName = wxTheApp->GetAppName();
+    wxString title;
+    if (!doc)
+        title = appName;
+    else
+    {
+        wxString docName;
+        doc->GetPrintableName(docName);
+        title = docName + wxString(_(" - ")) + appName;
+    }
+    return title;
+}
+
+
+// Not yet implemented
+wxDocTemplate *wxDocManager::MatchTemplate(const wxString& WXUNUSED(path))
+{
+    return (wxDocTemplate *) NULL;
+}
+
+// File history management
+void wxDocManager::AddFileToHistory(const wxString& file)
+{
+    if (m_fileHistory)
+        m_fileHistory->AddFileToHistory(file);
+}
+
+void wxDocManager::RemoveFileFromHistory(size_t i)
+{
+    if (m_fileHistory)
+        m_fileHistory->RemoveFileFromHistory(i);
+}
+
+wxString wxDocManager::GetHistoryFile(size_t i) const
+{
+    wxString histFile;
+
+    if (m_fileHistory)
+        histFile = m_fileHistory->GetHistoryFile(i);
+
+    return histFile;
+}
+
+void wxDocManager::FileHistoryUseMenu(wxMenu *menu)
+{
+    if (m_fileHistory)
+        m_fileHistory->UseMenu(menu);
+}
+
+void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)
+{
+    if (m_fileHistory)
+        m_fileHistory->RemoveMenu(menu);
+}
+
+#if wxUSE_CONFIG
+void wxDocManager::FileHistoryLoad(wxConfigBase& config)
+{
+    if (m_fileHistory)
+        m_fileHistory->Load(config);
+}
+
+void wxDocManager::FileHistorySave(wxConfigBase& config)
+{
+    if (m_fileHistory)
+        m_fileHistory->Save(config);
+}
+#endif
+
+void wxDocManager::FileHistoryAddFilesToMenu(wxMenu* menu)
+{
+    if (m_fileHistory)
+        m_fileHistory->AddFilesToMenu(menu);
+}
+
+void wxDocManager::FileHistoryAddFilesToMenu()
+{
+    if (m_fileHistory)
+        m_fileHistory->AddFilesToMenu();
+}
+
+size_t wxDocManager::GetHistoryFilesCount() const
+{
+    return m_fileHistory ? m_fileHistory->GetCount() : 0;
+}
+
+
+// Find out the document template via matching in the document file format
+// against that of the template
+wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
+{
+    wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;
+
+    // Find the template which this extension corresponds to
+    for (size_t i = 0; i < m_templates.GetCount(); i++)
+    {
+        wxDocTemplate *temp = (wxDocTemplate *)m_templates.Item(i)->GetData();
+        if ( temp->FileMatchesTemplate(path) )
+        {
+            theTemplate = temp;
+            break;
+        }
+    }
+    return theTemplate;
+}
+
+// Try to get a more suitable parent frame than the top window,
+// for selection dialogs. Otherwise you may get an unexpected
+// window being activated when a dialog is shown.
+static wxWindow* wxFindSuitableParent()
+{
+    wxWindow* parent = wxTheApp->GetTopWindow();
+
+    wxWindow* focusWindow = wxWindow::FindFocus();
+    if (focusWindow)
+    {
+        while (focusWindow &&
+                !focusWindow->IsKindOf(CLASSINFO(wxDialog)) &&
+                !focusWindow->IsKindOf(CLASSINFO(wxFrame)))
+
+            focusWindow = focusWindow->GetParent();
+
+        if (focusWindow)
+            parent = focusWindow;
+    }
+    return parent;
+}
+
+// Prompts user to open a file, using file specs in templates.
+// Must extend the file selector dialog or implement own; OR
+// match the extension to the template extension.
+
+wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
+                                                int noTemplates,
+#else
+                                                int WXUNUSED(noTemplates),
+#endif
+                                                wxString& path,
+                                                long WXUNUSED(flags),
+                                                bool WXUNUSED(save))
+{
+    // We can only have multiple filters in Windows and GTK
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
+    wxString descrBuf;
+
+    int i;
+    for (i = 0; i < noTemplates; i++)
+    {
+        if (templates[i]->IsVisible())
+        {
+            // add a '|' to separate this filter from the previous one
+            if ( !descrBuf.empty() )
+                descrBuf << wxT('|');
+
+            descrBuf << templates[i]->GetDescription()
+                << wxT(" (") << templates[i]->GetFileFilter() << wxT(") |")
+                << templates[i]->GetFileFilter();
+        }
+    }
+#else
+    wxString descrBuf = wxT("*.*");
+#endif
+
+    int FilterIndex = -1;
+
+    wxWindow* parent = wxFindSuitableParent();
+
+    wxString pathTmp = wxFileSelectorEx(_("Select a file"),
+                                        m_lastDirectory,
+                                        wxEmptyString,
+                                        &FilterIndex,
+                                        descrBuf,
+                                        0,
+                                        parent);
+
+    wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;
+    if (!pathTmp.empty())
+    {
+        if (!wxFileExists(pathTmp))
+        {
+            wxString msgTitle;
+            if (!wxTheApp->GetAppName().empty())
+                msgTitle = wxTheApp->GetAppName();
+            else
+                msgTitle = wxString(_("File error"));
+
+            (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
+                parent);
+
+            path = wxEmptyString;
+            return (wxDocTemplate *) NULL;
+        }
+        m_lastDirectory = wxPathOnly(pathTmp);
+
+        path = pathTmp;
+
+        // first choose the template using the extension, if this fails (i.e.
+        // wxFileSelectorEx() didn't fill it), then use the path
+        if ( FilterIndex != -1 )
+            theTemplate = templates[FilterIndex];
+        if ( !theTemplate )
+            theTemplate = FindTemplateForPath(path);
+        if ( !theTemplate )
+        {
+            // Since we do not add files with non-default extensions to the FileHistory this
+            // can only happen if the application changes the allowed templates in runtime.
+            (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
+                                _("Open File"),
+                                wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
+        }
+    }
+    else
+    {
+        path = wxEmptyString;
+    }
+
+    return theTemplate;
+}
+
+wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
+                                                int noTemplates, bool sort)
+{
+    wxArrayString strings;
+    wxDocTemplate **data = new wxDocTemplate *[noTemplates];
+    int i;
+    int n = 0;
+
+    for (i = 0; i < noTemplates; i++)
+    {
+        if (templates[i]->IsVisible())
+        {
+            int j;
+            bool want = true;
+            for (j = 0; j < n; j++)
+            {
+                //filter out NOT unique documents + view combinations
+                if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
+                     templates[i]->m_viewTypeName == data[j]->m_viewTypeName
+                   )
+                    want = false;
+            }
+
+            if ( want )
+            {
+                strings.Add(templates[i]->m_description);
+
+                data[n] = templates[i];
+                n ++;
+            }
+        }
+    }  // for
+
+    if (sort)
+    {
+        strings.Sort(); // ascending sort
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_description)
+                    data[i] = templates[j];
+            }
+        }
+    }
+
+    wxDocTemplate *theTemplate;
+
+    switch ( n )
+    {
+        case 0:
+            // no visible templates, hence nothing to choose from
+            theTemplate = NULL;
+            break;
+
+        case 1:
+            // don't propose the user to choose if he heas no choice
+            theTemplate = data[0];
+            break;
+
+        default:
+            // propose the user to choose one of several
+            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+                          (
+                            _("Select a document template"),
+                            _("Templates"),
+                            strings,
+                            (void **)data,
+                            wxFindSuitableParent()
+                          );
+    }
+
+    delete[] data;
+
+    return theTemplate;
+}
+
+wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
+                                            int noTemplates, bool sort)
+{
+    wxArrayString strings;
+    wxDocTemplate **data = new wxDocTemplate *[noTemplates];
+    int i;
+    int n = 0;
+
+    for (i = 0; i < noTemplates; i++)
+    {
+        wxDocTemplate *templ = templates[i];
+        if ( templ->IsVisible() && !templ->GetViewName().empty() )
+        {
+            int j;
+            bool want = true;
+            for (j = 0; j < n; j++)
+            {
+                //filter out NOT unique views
+                if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
+                    want = false;
+            }
+
+            if ( want )
+            {
+                strings.Add(templ->m_viewTypeName);
+                data[n] = templ;
+                n ++;
+            }
+        }
+    }
+
+    if (sort)
+    {
+        strings.Sort(); // ascending sort
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_viewTypeName)
+                    data[i] = templates[j];
+            }
+        }
+    }
+
+    wxDocTemplate *theTemplate;
+
+    // the same logic as above
+    switch ( n )
+    {
+        case 0:
+            theTemplate = (wxDocTemplate *)NULL;
+            break;
+
+        case 1:
+            theTemplate = data[0];
+            break;
+
+        default:
+            theTemplate = (wxDocTemplate *)wxGetSingleChoiceData
+                          (
+                            _("Select a document view"),
+                            _("Views"),
+                            strings,
+                            (void **)data,
+                            wxFindSuitableParent()
+                          );
+
+    }
+
+    delete[] data;
+    return theTemplate;
+}
+
+void wxDocManager::AssociateTemplate(wxDocTemplate *temp)
+{
+    if (!m_templates.Member(temp))
+        m_templates.Append(temp);
+}
+
+void wxDocManager::DisassociateTemplate(wxDocTemplate *temp)
+{
+    m_templates.DeleteObject(temp);
+}
+
+// Add and remove a document from the manager's list
+void wxDocManager::AddDocument(wxDocument *doc)
+{
+    if (!m_docs.Member(doc))
+        m_docs.Append(doc);
+}
+
+void wxDocManager::RemoveDocument(wxDocument *doc)
+{
+    m_docs.DeleteObject(doc);
+}
+
+// Views or windows should inform the document manager
+// when a view is going in or out of focus
+void wxDocManager::ActivateView(wxView *view, bool activate)
+{
+    if ( activate )
+    {
+        m_currentView = view;
+    }
+    else // deactivate
+    {
+        if ( m_currentView == view )
+        {
+            // don't keep stale pointer
+            m_currentView = (wxView *) NULL;
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// Default document child frame
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxDocChildFrame, wxFrame)
+    EVT_ACTIVATE(wxDocChildFrame::OnActivate)
+    EVT_CLOSE(wxDocChildFrame::OnCloseWindow)
+END_EVENT_TABLE()
+
+wxDocChildFrame::wxDocChildFrame(wxDocument *doc,
+                                 wxView *view,
+                                 wxFrame *frame,
+                                 wxWindowID id,
+                                 const wxString& title,
+                                 const wxPoint& pos,
+                                 const wxSize& size,
+                                 long style,
+                                 const wxString& name)
+               : wxFrame(frame, id, title, pos, size, style, name)
+{
+    m_childDocument = doc;
+    m_childView = view;
+    if (view)
+        view->SetFrame(this);
+}
+
+// Extend event processing to search the view's event table
+bool wxDocChildFrame::ProcessEvent(wxEvent& event)
+{
+    if (m_childView)
+        m_childView->Activate(true);
+
+    if ( !m_childView || ! m_childView->ProcessEvent(event) )
+    {
+        // Only hand up to the parent if it's a menu command
+        if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
+            return wxEvtHandler::ProcessEvent(event);
+        else
+            return true;
+    }
+    else
+        return true;
+}
+
+void wxDocChildFrame::OnActivate(wxActivateEvent& event)
+{
+    wxFrame::OnActivate(event);
+
+    if (m_childView)
+        m_childView->Activate(event.GetActive());
+}
+
+void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)
+{
+    if (m_childView)
+    {
+        bool ans = event.CanVeto()
+                    ? m_childView->Close(false) // false means don't delete associated window
+                    : true; // Must delete.
+
+        if (ans)
+        {
+            m_childView->Activate(false);
+            delete m_childView;
+            m_childView = (wxView *) NULL;
+            m_childDocument = (wxDocument *) NULL;
+
+            this->Destroy();
+        }
+        else
+            event.Veto();
+    }
+    else
+        event.Veto();
+}
+
+// ----------------------------------------------------------------------------
+// Default parent frame
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
+    EVT_MENU(wxID_EXIT, wxDocParentFrame::OnExit)
+    EVT_MENU_RANGE(wxID_FILE1, wxID_FILE9, wxDocParentFrame::OnMRUFile)
+    EVT_CLOSE(wxDocParentFrame::OnCloseWindow)
+END_EVENT_TABLE()
+
+wxDocParentFrame::wxDocParentFrame()
+{
+    m_docManager = NULL;
+}
+
+wxDocParentFrame::wxDocParentFrame(wxDocManager *manager,
+                                   wxFrame *frame,
+                                   wxWindowID id,
+                                   const wxString& title,
+                                   const wxPoint& pos,
+                                   const wxSize& size,
+                                   long style,
+                                   const wxString& name)
+                : wxFrame(frame, id, title, pos, size, style, name)
+{
+    m_docManager = manager;
+}
+
+bool wxDocParentFrame::Create(wxDocManager *manager,
+                              wxFrame *frame,
+                              wxWindowID id,
+                              const wxString& title,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxString& name)
+{
+    m_docManager = manager;
+    return base_type::Create(frame, id, title, pos, size, style, name);
+}
+
+void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+    Close();
+}
+
+void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
+{
+    int n = event.GetId() - wxID_FILE1;  // the index in MRU list
+    wxString filename(m_docManager->GetHistoryFile(n));
+    if ( !filename.empty() )
+    {
+        // verify that the file exists before doing anything else
+        if ( wxFile::Exists(filename) )
+        {
+            // try to open it
+            if (!m_docManager->CreateDocument(filename, wxDOC_SILENT))
+            {
+                // remove the file from the MRU list. The user should already be notified.
+                m_docManager->RemoveFileFromHistory(n);
+
+                wxLogError(_("The file '%s' couldn't be opened.\nIt has been removed from the most recently used files list."),
+                       filename.c_str());
+            }
+        }
+        else
+        {
+            // remove the bogus filename from the MRU list and notify the user
+            // about it
+            m_docManager->RemoveFileFromHistory(n);
+
+            wxLogError(_("The file '%s' doesn't exist and couldn't be opened.\nIt has been removed from the most recently used files list."),
+                       filename.c_str());
+        }
+    }
+}
+
+// Extend event processing to search the view's event table
+bool wxDocParentFrame::ProcessEvent(wxEvent& event)
+{
+    // Try the document manager, then do default processing
+    if (!m_docManager || !m_docManager->ProcessEvent(event))
+        return wxEvtHandler::ProcessEvent(event);
+    else
+        return true;
+}
+
+// Define the behaviour for the frame closing
+// - must delete all frames except for the main one.
+void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event)
+{
+    if ( m_docManager && !m_docManager->Clear(!event.CanVeto()) )
+    {
+        // The user decided not to close finally, abort.
+        event.Veto();
+    }
+    else
+    {
+        this->Destroy();
+    }
+}
+
+#if wxUSE_PRINTING_ARCHITECTURE
+
+wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title)
+             : wxPrintout(title)
+{
+    m_printoutView = view;
+}
+
+bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
+{
+    wxDC *dc = GetDC();
+
+    // Get the logical pixels per inch of screen and printer
+    int ppiScreenX, ppiScreenY;
+    GetPPIScreen(&ppiScreenX, &ppiScreenY);
+    wxUnusedVar(ppiScreenY);
+    int ppiPrinterX, ppiPrinterY;
+    GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
+    wxUnusedVar(ppiPrinterY);
+
+    // This scales the DC so that the printout roughly represents the
+    // the screen scaling. The text point size _should_ be the right size
+    // but in fact is too small for some reason. This is a detail that will
+    // need to be addressed at some point but can be fudged for the
+    // moment.
+    float scale = (float)((float)ppiPrinterX/(float)ppiScreenX);
+
+    // Now we have to check in case our real page size is reduced
+    // (e.g. because we're drawing to a print preview memory DC)
+    int pageWidth, pageHeight;
+    int w, h;
+    dc->GetSize(&w, &h);
+    GetPageSizePixels(&pageWidth, &pageHeight);
+    wxUnusedVar(pageHeight);
+
+    // If printer pageWidth == current DC width, then this doesn't
+    // change. But w might be the preview bitmap width, so scale down.
+    float overallScale = scale * (float)(w/(float)pageWidth);
+    dc->SetUserScale(overallScale, overallScale);
+
+    if (m_printoutView)
+    {
+        m_printoutView->OnDraw(dc);
+    }
+    return true;
+}
+
+bool wxDocPrintout::HasPage(int pageNum)
+{
+    return (pageNum == 1);
+}
+
+bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
+{
+    if (!wxPrintout::OnBeginDocument(startPage, endPage))
+        return false;
+
+    return true;
+}
+
+void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
+{
+    *minPage = 1;
+    *maxPage = 1;
+    *selPageFrom = 1;
+    *selPageTo = 1;
+}
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
+// ----------------------------------------------------------------------------
+// File history processor
+// ----------------------------------------------------------------------------
+
+static inline wxChar* MYcopystring(const wxString& s)
+{
+    wxChar* copy = new wxChar[s.length() + 1];
+    return wxStrcpy(copy, s.c_str());
+}
+
+static inline wxChar* MYcopystring(const wxChar* s)
+{
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}
+
+wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
+{
+    m_fileMaxFiles = maxFiles;
+    m_idBase = idBase;
+    m_fileHistoryN = 0;
+    m_fileHistory = new wxChar *[m_fileMaxFiles];
+}
+
+wxFileHistory::~wxFileHistory()
+{
+    size_t i;
+    for (i = 0; i < m_fileHistoryN; i++)
+        delete[] m_fileHistory[i];
+    delete[] m_fileHistory;
+}
+
+// File history management
+void wxFileHistory::AddFileToHistory(const wxString& file)
+{
+    size_t i;
+
+    // Check we don't already have this file
+    for (i = 0; i < m_fileHistoryN; i++)
+    {
+#if defined( __WXMSW__ ) // Add any other OSes with case insensitive file names
+        wxString testString;
+        if ( m_fileHistory[i] )
+            testString = m_fileHistory[i];
+        if ( m_fileHistory[i] && ( file.Lower() == testString.Lower() ) )
+#else
+        if ( m_fileHistory[i] && ( file == m_fileHistory[i] ) )
+#endif
+        {
+            // we do have it, move it to the top of the history
+            RemoveFileFromHistory (i);
+            AddFileToHistory (file);
+            return;
+        }
+    }
+
+    // if we already have a full history, delete the one at the end
+    if ( m_fileMaxFiles == m_fileHistoryN )
+    {
+        RemoveFileFromHistory (m_fileHistoryN - 1);
+        AddFileToHistory (file);
+        return;
+    }
+
+    // Add to the project file history:
+    // Move existing files (if any) down so we can insert file at beginning.
+    if (m_fileHistoryN < m_fileMaxFiles)
+    {
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();
+        while (node)
+        {
+            wxMenu* menu = (wxMenu*) node->GetData();
+            if ( m_fileHistoryN == 0 && menu->GetMenuItemCount() )
+            {
+                menu->AppendSeparator();
+            }
+            menu->Append(m_idBase+m_fileHistoryN, _("[EMPTY]"));
+            node = node->GetNext();
+        }
+        m_fileHistoryN ++;
+    }
+    // Shuffle filenames down
+    for (i = (m_fileHistoryN-1); i > 0; i--)
+    {
+        m_fileHistory[i] = m_fileHistory[i-1];
+    }
+    m_fileHistory[0] = MYcopystring(file);
+
+    // this is the directory of the last opened file
+    wxString pathCurrent;
+    wxSplitPath( m_fileHistory[0], &pathCurrent, NULL, NULL );
+    for (i = 0; i < m_fileHistoryN; i++)
+    {
+        if ( m_fileHistory[i] )
+        {
+            // if in same directory just show the filename; otherwise the full
+            // path
+            wxString pathInMenu, path, filename, ext;
+            wxSplitPath( m_fileHistory[i], &path, &filename, &ext );
+            if ( path == pathCurrent )
+            {
+                pathInMenu = filename;
+                if ( !ext.empty() )
+                    pathInMenu = pathInMenu + wxFILE_SEP_EXT + ext;
+            }
+            else
+            {
+                // absolute path; could also set relative path
+                pathInMenu = m_fileHistory[i];
+            }
+
+            // we need to quote '&' characters which are used for mnemonics
+            pathInMenu.Replace(_T("&"), _T("&&"));
+            wxString buf;
+            buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
+            wxList::compatibility_iterator node = m_fileMenus.GetFirst();
+            while (node)
+            {
+                wxMenu* menu = (wxMenu*) node->GetData();
+                menu->SetLabel(m_idBase + i, buf);
+                node = node->GetNext();
+            }
+        }
+    }
+}
+
+void wxFileHistory::RemoveFileFromHistory(size_t i)
+{
+    wxCHECK_RET( i < m_fileHistoryN,
+                 wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
+
+    // delete the element from the array (could use memmove() too...)
+    delete [] m_fileHistory[i];
+
+    size_t j;
+    for ( j = i; j < m_fileHistoryN - 1; j++ )
+    {
+        m_fileHistory[j] = m_fileHistory[j + 1];
+    }
+
+    wxList::compatibility_iterator node = m_fileMenus.GetFirst();
+    while ( node )
+    {
+        wxMenu* menu = (wxMenu*) node->GetData();
+
+        // shuffle filenames up
+        wxString buf;
+        for ( j = i; j < m_fileHistoryN - 1; j++ )
+        {
+            buf.Printf(s_MRUEntryFormat, j + 1, m_fileHistory[j]);
+            menu->SetLabel(m_idBase + j, buf);
+        }
+
+        node = node->GetNext();
+
+        // delete the last menu item which is unused now
+        wxWindowID lastItemId = m_idBase + wx_truncate_cast(wxWindowID, m_fileHistoryN) - 1;
+        if (menu->FindItem(lastItemId))
+        {
+            menu->Delete(lastItemId);
+        }
+
+        // delete the last separator too if no more files are left
+        if ( m_fileHistoryN == 1 )
+        {
+            wxMenuItemList::compatibility_iterator nodeLast = menu->GetMenuItems().GetLast();
+            if ( nodeLast )
+            {
+                wxMenuItem *menuItem = nodeLast->GetData();
+                if ( menuItem->IsSeparator() )
+                {
+                    menu->Delete(menuItem);
+                }
+                //else: should we search backwards for the last separator?
+            }
+            //else: menu is empty somehow
+        }
+    }
+
+    m_fileHistoryN--;
+}
+
+wxString wxFileHistory::GetHistoryFile(size_t i) const
+{
+    wxString s;
+    if ( i < m_fileHistoryN )
+    {
+        s = m_fileHistory[i];
+    }
+    else
+    {
+        wxFAIL_MSG( wxT("bad index in wxFileHistory::GetHistoryFile") );
+    }
+
+    return s;
+}
+
+void wxFileHistory::UseMenu(wxMenu *menu)
+{
+    if (!m_fileMenus.Member(menu))
+        m_fileMenus.Append(menu);
+}
+
+void wxFileHistory::RemoveMenu(wxMenu *menu)
+{
+    m_fileMenus.DeleteObject(menu);
+}
+
+#if wxUSE_CONFIG
+void wxFileHistory::Load(wxConfigBase& config)
+{
+    m_fileHistoryN = 0;
+    wxString buf;
+    buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
+    wxString historyFile;
+    while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (!historyFile.empty()))
+    {
+        m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile);
+        m_fileHistoryN ++;
+        buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
+        historyFile = wxEmptyString;
+    }
+    AddFilesToMenu();
+}
+
+void wxFileHistory::Save(wxConfigBase& config)
+{
+    size_t i;
+    for (i = 0; i < m_fileMaxFiles; i++)
+    {
+        wxString buf;
+        buf.Printf(wxT("file%d"), (int)i+1);
+        if (i < m_fileHistoryN)
+            config.Write(buf, wxString(m_fileHistory[i]));
+        else
+            config.Write(buf, wxEmptyString);
+    }
+}
+#endif // wxUSE_CONFIG
+
+void wxFileHistory::AddFilesToMenu()
+{
+    if (m_fileHistoryN > 0)
+    {
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();
+        while (node)
+        {
+            wxMenu* menu = (wxMenu*) node->GetData();
+            if (menu->GetMenuItemCount())
+            {
+                menu->AppendSeparator();
+            }
+
+            size_t i;
+            for (i = 0; i < m_fileHistoryN; i++)
+            {
+                if (m_fileHistory[i])
+                {
+                    wxString buf;
+                    buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
+                    menu->Append(m_idBase+i, buf);
+                }
+            }
+            node = node->GetNext();
+        }
+    }
+}
+
+void wxFileHistory::AddFilesToMenu(wxMenu* menu)
+{
+    if (m_fileHistoryN > 0)
+    {
+        if (menu->GetMenuItemCount())
+        {
+            menu->AppendSeparator();
+        }
+
+        size_t i;
+        for (i = 0; i < m_fileHistoryN; i++)
+        {
+            if (m_fileHistory[i])
+            {
+                wxString buf;
+                buf.Printf(s_MRUEntryFormat, i+1, m_fileHistory[i]);
+                menu->Append(m_idBase+i, buf);
+            }
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// Permits compatibility with existing file formats and functions that
+// manipulate files directly
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STD_IOSTREAM
+
+bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
+{
+    wxFFile file(filename, _T("rb"));
+    if ( !file.IsOpened() )
+        return false;
+
+    char buf[4096];
+
+    size_t nRead;
+    do
+    {
+        nRead = file.Read(buf, WXSIZEOF(buf));
+        if ( file.Error() )
+            return false;
+
+        stream.write(buf, nRead);
+        if ( !stream )
+            return false;
+    }
+    while ( !file.Eof() );
+
+    return true;
+}
+
+bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
+{
+    wxFFile file(filename, _T("wb"));
+    if ( !file.IsOpened() )
+        return false;
+
+    char buf[4096];
+    do
+    {
+        stream.read(buf, WXSIZEOF(buf));
+        if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
+        {
+            if ( !file.Write(buf, stream.gcount()) )
+                return false;
+        }
+    }
+    while ( !stream.eof() );
+
+    return true;
+}
+
+#else // !wxUSE_STD_IOSTREAM
+
+bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
+{
+    wxFFile file(filename, _T("rb"));
+    if ( !file.IsOpened() )
+        return false;
+
+    char buf[4096];
+
+    size_t nRead;
+    do
+    {
+        nRead = file.Read(buf, WXSIZEOF(buf));
+        if ( file.Error() )
+            return false;
+
+        stream.Write(buf, nRead);
+        if ( !stream )
+            return false;
+    }
+    while ( !file.Eof() );
+
+    return true;
+}
+
+bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
+{
+    wxFFile file(filename, _T("wb"));
+    if ( !file.IsOpened() )
+        return false;
+
+    char buf[4096];
+    for ( ;; )
+    {
+        stream.Read(buf, WXSIZEOF(buf));
+
+        const size_t nRead = stream.LastRead();
+        if ( !nRead )
+        {
+            if ( stream.Eof() )
+                break;
+
+            return false;
+        }
+
+        if ( !file.Write(buf, nRead) )
+            return false;
+    }
+
+    return true;
+}
+
+#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
+
+#endif // wxUSE_DOC_VIEW_ARCHITECTURE
diff --git a/Source/3rd Party/wx/src/common/dpycmn.cpp b/Source/3rd Party/wx/src/common/dpycmn.cpp
index d2309ba04..4cc0e4435 100644
--- a/Source/3rd Party/wx/src/common/dpycmn.cpp	
+++ b/Source/3rd Party/wx/src/common/dpycmn.cpp	
@@ -1,265 +1,269 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dpycmn.cpp
-// Purpose:     wxDisplay and wxDisplayImplSingle implementation
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     01.03.03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003-2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/gdicmn.h"
-    #include "wx/window.h"
-    #include "wx/module.h"
-#endif //WX_PRECOMP
-
-#include "wx/display.h"
-#include "wx/display_impl.h"
-
-#if wxUSE_DISPLAY
-
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxArrayVideoModes)
-
-const wxVideoMode wxDefaultVideoMode;
-
-#endif // wxUSE_DISPLAY
-
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-// the factory object used by wxDisplay
-//
-// created on demand and destroyed by wxDisplayModule
-static wxDisplayFactory *gs_factory = NULL;
-
-// ----------------------------------------------------------------------------
-// wxDisplayImplSingle: trivial implementation working for main display only
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxDisplayImplSingle : public wxDisplayImpl
-{
-public:
-    wxDisplayImplSingle() : wxDisplayImpl(0) { }
-
-    virtual wxRect GetGeometry() const
-    {
-        wxRect r;
-        wxDisplaySize(&r.width, &r.height);
-        return r;
-    }
-
-    virtual wxRect GetClientArea() const { return wxGetClientDisplayRect(); }
-
-    virtual wxString GetName() const { return wxString(); }
-
-#if wxUSE_DISPLAY
-    // no video modes support for us, provide just the stubs
-
-    virtual wxArrayVideoModes GetModes(const wxVideoMode& WXUNUSED(mode)) const
-    {
-        return wxArrayVideoModes();
-    }
-
-    virtual wxVideoMode GetCurrentMode() const { return wxVideoMode(); }
-
-    virtual bool ChangeMode(const wxVideoMode& WXUNUSED(mode)) { return false; }
-#endif // wxUSE_DISPLAY
-
-
-    wxDECLARE_NO_COPY_CLASS(wxDisplayImplSingle);
-};
-
-// ----------------------------------------------------------------------------
-// wxDisplayModule is used to cleanup gs_factory
-// ----------------------------------------------------------------------------
-
-class wxDisplayModule : public wxModule
-{
-public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit()
-    {
-        wxDELETE(gs_factory);
-    }
-
-    DECLARE_DYNAMIC_CLASS(wxDisplayModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxDisplayModule, wxModule)
-
-// ============================================================================
-// wxDisplay implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxDisplay::wxDisplay(unsigned n)
-{
-    wxASSERT_MSG( n < GetCount(),
-                    wxT("An invalid index was passed to wxDisplay") );
-
-    m_impl = Factory().CreateDisplay(n);
-}
-
-wxDisplay::~wxDisplay()
-{
-    delete m_impl;
-}
-
-// ----------------------------------------------------------------------------
-// static functions forwarded to wxDisplayFactory
-// ----------------------------------------------------------------------------
-
-/* static */ unsigned wxDisplay::GetCount()
-{
-    return Factory().GetCount();
-}
-
-/* static */ int wxDisplay::GetFromPoint(const wxPoint& pt)
-{
-    return Factory().GetFromPoint(pt);
-}
-
-/* static */ int wxDisplay::GetFromWindow(const wxWindow *window)
-{
-    wxCHECK_MSG( window, wxNOT_FOUND, wxT("invalid window") );
-
-    return Factory().GetFromWindow(window);
-}
-
-// ----------------------------------------------------------------------------
-// functions forwarded to wxDisplayImpl
-// ----------------------------------------------------------------------------
-
-wxRect wxDisplay::GetGeometry() const
-{
-    wxCHECK_MSG( IsOk(), wxRect(), wxT("invalid wxDisplay object") );
-
-    return m_impl->GetGeometry();
-}
-
-wxRect wxDisplay::GetClientArea() const
-{
-    wxCHECK_MSG( IsOk(), wxRect(), wxT("invalid wxDisplay object") );
-
-    return m_impl->GetClientArea();
-}
-
-wxString wxDisplay::GetName() const
-{
-    wxCHECK_MSG( IsOk(), wxString(), wxT("invalid wxDisplay object") );
-
-    return m_impl->GetName();
-}
-
-bool wxDisplay::IsPrimary() const
-{
-    return m_impl && m_impl->GetIndex() == 0;
-}
-
-#if wxUSE_DISPLAY
-
-wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
-{
-    wxCHECK_MSG( IsOk(), wxArrayVideoModes(), wxT("invalid wxDisplay object") );
-
-    return m_impl->GetModes(mode);
-}
-
-wxVideoMode wxDisplay::GetCurrentMode() const
-{
-    wxCHECK_MSG( IsOk(), wxVideoMode(), wxT("invalid wxDisplay object") );
-
-    return m_impl->GetCurrentMode();
-}
-
-bool wxDisplay::ChangeMode(const wxVideoMode& mode)
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid wxDisplay object") );
-
-    return m_impl->ChangeMode(mode);
-}
-
-#endif // wxUSE_DISPLAY
-
-// ----------------------------------------------------------------------------
-// static functions implementation
-// ----------------------------------------------------------------------------
-
-// if wxUSE_DISPLAY == 1 this is implemented in port-specific code
-#if !wxUSE_DISPLAY
-
-/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
-{
-    return new wxDisplayFactorySingle;
-}
-
-#endif // !wxUSE_DISPLAY
-
-/* static */ wxDisplayFactory& wxDisplay::Factory()
-{
-    if ( !gs_factory )
-    {
-        gs_factory = CreateFactory();
-    }
-
-    return *gs_factory;
-}
-
-// ============================================================================
-// wxDisplayFactory implementation
-// ============================================================================
-
-int wxDisplayFactory::GetFromWindow(const wxWindow *window)
-{
-    // consider that the window belongs to the display containing its centre
-    const wxRect r(window->GetScreenRect());
-    return GetFromPoint(wxPoint(r.x + r.width/2, r.y + r.height/2));
-}
-
-// ============================================================================
-// wxDisplayFactorySingle implementation
-// ============================================================================
-
-/* static */
-wxDisplayImpl *wxDisplayFactorySingle::CreateDisplay(unsigned n)
-{
-    // we recognize the main display only
-    return n != 0 ? NULL : new wxDisplayImplSingle;
-}
-
-int wxDisplayFactorySingle::GetFromPoint(const wxPoint& pt)
-{
-    if ( pt.x >= 0 && pt.y >= 0 )
-    {
-        int w, h;
-        wxDisplaySize(&w, &h);
-
-        if ( pt.x < w && pt.y < h )
-            return 0;
-    }
-
-    // the point is outside of the screen
-    return wxNOT_FOUND;
-}
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dpycmn.cpp
+// Purpose:     wxDisplay and wxDisplayImplSingle implementation
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     01.03.03
+// RCS-ID:      $Id: dpycmn.cpp 41548 2006-10-02 05:38:05Z PC $
+// Copyright:   (c) 2003-2006 Vadim Zeitlin <vadim@wxwindows.org>
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+    #include "wx/window.h"
+    #include "wx/module.h"
+#endif //WX_PRECOMP
+
+#include "wx/display.h"
+#include "wx/display_impl.h"
+
+#if wxUSE_DISPLAY
+
+#include "wx/arrimpl.cpp"
+WX_DEFINE_OBJARRAY(wxArrayVideoModes)
+
+const wxVideoMode wxDefaultVideoMode;
+
+#endif // wxUSE_DISPLAY
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+// the factory object used by wxDisplay
+//
+// created on demand and destroyed by wxDisplayModule
+static wxDisplayFactory *gs_factory = NULL;
+
+// ----------------------------------------------------------------------------
+// wxDisplayImplSingle: trivial implementation working for main display only
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxDisplayImplSingle : public wxDisplayImpl
+{
+public:
+    wxDisplayImplSingle() : wxDisplayImpl(0) { }
+
+    virtual wxRect GetGeometry() const
+    {
+        wxRect r;
+        wxDisplaySize(&r.width, &r.height);
+        return r;
+    }
+
+    virtual wxRect GetClientArea() const { return wxGetClientDisplayRect(); }
+
+    virtual wxString GetName() const { return wxString(); }
+
+#if wxUSE_DISPLAY
+    // no video modes support for us, provide just the stubs
+
+    virtual wxArrayVideoModes GetModes(const wxVideoMode& WXUNUSED(mode)) const
+    {
+        return wxArrayVideoModes();
+    }
+
+    virtual wxVideoMode GetCurrentMode() const { return wxVideoMode(); }
+
+    virtual bool ChangeMode(const wxVideoMode& WXUNUSED(mode)) { return false; }
+#endif // wxUSE_DISPLAY
+
+
+    DECLARE_NO_COPY_CLASS(wxDisplayImplSingle)
+};
+
+// ----------------------------------------------------------------------------
+// wxDisplayModule is used to cleanup gs_factory
+// ----------------------------------------------------------------------------
+
+class wxDisplayModule : public wxModule
+{
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit()
+    {
+        if ( gs_factory )
+        {
+            delete gs_factory;
+            gs_factory = NULL;
+        }
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxDisplayModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxDisplayModule, wxModule)
+
+// ============================================================================
+// wxDisplay implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// ctor/dtor
+// ----------------------------------------------------------------------------
+
+wxDisplay::wxDisplay(unsigned n)
+{
+    wxASSERT_MSG( n < GetCount(),
+                    wxT("An invalid index was passed to wxDisplay") );
+
+    m_impl = Factory().CreateDisplay(n);
+}
+
+wxDisplay::~wxDisplay()
+{
+    delete m_impl;
+}
+
+// ----------------------------------------------------------------------------
+// static functions forwarded to wxDisplayFactory
+// ----------------------------------------------------------------------------
+
+/* static */ unsigned wxDisplay::GetCount()
+{
+    return Factory().GetCount();
+}
+
+/* static */ int wxDisplay::GetFromPoint(const wxPoint& pt)
+{
+    return Factory().GetFromPoint(pt);
+}
+
+/* static */ int wxDisplay::GetFromWindow(wxWindow *window)
+{
+    wxCHECK_MSG( window, wxNOT_FOUND, _T("invalid window") );
+
+    return Factory().GetFromWindow(window);
+}
+
+// ----------------------------------------------------------------------------
+// functions forwarded to wxDisplayImpl
+// ----------------------------------------------------------------------------
+
+wxRect wxDisplay::GetGeometry() const
+{
+    wxCHECK_MSG( IsOk(), wxRect(), _T("invalid wxDisplay object") );
+
+    return m_impl->GetGeometry();
+}
+
+wxRect wxDisplay::GetClientArea() const
+{
+    wxCHECK_MSG( IsOk(), wxRect(), _T("invalid wxDisplay object") );
+
+    return m_impl->GetClientArea();
+}
+
+wxString wxDisplay::GetName() const
+{
+    wxCHECK_MSG( IsOk(), wxString(), _T("invalid wxDisplay object") );
+
+    return m_impl->GetName();
+}
+
+bool wxDisplay::IsPrimary() const
+{
+    return m_impl && m_impl->GetIndex() == 0;
+}
+
+#if wxUSE_DISPLAY
+
+wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
+{
+    wxCHECK_MSG( IsOk(), wxArrayVideoModes(), _T("invalid wxDisplay object") );
+
+    return m_impl->GetModes(mode);
+}
+
+wxVideoMode wxDisplay::GetCurrentMode() const
+{
+    wxCHECK_MSG( IsOk(), wxVideoMode(), _T("invalid wxDisplay object") );
+
+    return m_impl->GetCurrentMode();
+}
+
+bool wxDisplay::ChangeMode(const wxVideoMode& mode)
+{
+    wxCHECK_MSG( IsOk(), false, _T("invalid wxDisplay object") );
+
+    return m_impl->ChangeMode(mode);
+}
+
+#endif // wxUSE_DIRECTDRAW
+
+// ----------------------------------------------------------------------------
+// static functions implementation
+// ----------------------------------------------------------------------------
+
+// if wxUSE_DISPLAY == 1 this is implemented in port-specific code
+#if !wxUSE_DISPLAY
+
+/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
+{
+    return new wxDisplayFactorySingle;
+}
+
+#endif // !wxUSE_DISPLAY
+
+/* static */ wxDisplayFactory& wxDisplay::Factory()
+{
+    if ( !gs_factory )
+    {
+        gs_factory = CreateFactory();
+    }
+
+    return *gs_factory;
+}
+
+// ============================================================================
+// wxDisplayFactory implementation
+// ============================================================================
+
+int wxDisplayFactory::GetFromWindow(wxWindow *window)
+{
+    // consider that the window belongs to the display containing its centre
+    const wxRect r(window->GetRect());
+    return GetFromPoint(wxPoint(r.x + r.width/2, r.y + r.height/2));
+}
+
+// ============================================================================
+// wxDisplayFactorySingle implementation
+// ============================================================================
+
+/* static */
+wxDisplayImpl *wxDisplayFactorySingle::CreateDisplay(unsigned n)
+{
+    // we recognize the main display only
+    return n != 0 ? NULL : new wxDisplayImplSingle;
+}
+
+int wxDisplayFactorySingle::GetFromPoint(const wxPoint& pt)
+{
+    if ( pt.x >= 0 && pt.y >= 0 )
+    {
+        int w, h;
+        wxDisplaySize(&w, &h);
+
+        if ( pt.x < w && pt.y < h )
+            return 0;
+    }
+
+    // the point is outside of the screen
+    return wxNOT_FOUND;
+}
diff --git a/Source/3rd Party/wx/src/common/dseldlg.cpp b/Source/3rd Party/wx/src/common/dseldlg.cpp
index 05bd7f6e3..04944fc65 100644
--- a/Source/3rd Party/wx/src/common/dseldlg.cpp	
+++ b/Source/3rd Party/wx/src/common/dseldlg.cpp	
@@ -1,55 +1,55 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dseldlg.cpp
-// Purpose:     implementation of ::wxDirSelector()
-// Author:      Paul Thiessen
-// Modified by:
-// Created:     20.02.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_DIRDLG
-
-#include "wx/dirdlg.h"
-
-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-wxString wxDirSelector(const wxString& message,
-                       const wxString& defaultPath,
-                       long style,
-                       const wxPoint& pos,
-                       wxWindow *parent)
-{
-    wxString path;
-
-    wxDirDialog dirDialog(parent, message, defaultPath, style, pos);
-    if ( dirDialog.ShowModal() == wxID_OK )
-    {
-        path = dirDialog.GetPath();
-    }
-
-    return path;
-}
-
-#endif // wxUSE_DIRDLG
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dseldlg.cpp
+// Purpose:     implementation of ::wxDirSelector()
+// Author:      Paul Thiessen
+// Modified by:
+// Created:     20.02.01
+// RCS-ID:      $Id: dseldlg.cpp 39613 2006-06-07 11:44:19Z ABX $
+// Copyright:   (c) 2001 wxWidgets team
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_DIRDLG
+
+#include "wx/dirdlg.h"
+
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+wxString wxDirSelector(const wxString& message,
+                       const wxString& defaultPath,
+                       long style,
+                       const wxPoint& pos,
+                       wxWindow *parent)
+{
+    wxString path;
+
+    wxDirDialog dirDialog(parent, message, defaultPath, style, pos);
+    if ( dirDialog.ShowModal() == wxID_OK )
+    {
+        path = dirDialog.GetPath();
+    }
+
+    return path;
+}
+
+#endif // wxUSE_DIRDLG
diff --git a/Source/3rd Party/wx/src/common/dummy.cpp b/Source/3rd Party/wx/src/common/dummy.cpp
index e5f72884f..db74ef7c6 100644
--- a/Source/3rd Party/wx/src/common/dummy.cpp	
+++ b/Source/3rd Party/wx/src/common/dummy.cpp	
@@ -1,32 +1,32 @@
-/*
- * File:        src/common/dummy.cpp
- * Purpose:     See below
- * Author:      Julian Smart
- * Created:     1993
- * Updated:
- * Copyright:   (c) 1993, AIAI, University of Edinburgh
- */
-
-/* A dummy file to include wx.h. If precompiling wx.h,
- * always start by compiling this and producing the PCH file.
- * Then subsequent source files use the PCH file.
- *
- * If precompiling wx.h for wxWidgets and derived apps,
- * link dummy.obj with your program.
- *
- * This will produce a big PCH file.
- */
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifdef __WINDOWS__
-    #include "wx/msw/msvcrt.h"
-#endif
-
-#ifdef __VISAGECPP__
-    char wxDummyChar = 0;
-#endif
+/*
+ * File:        src/common/dummy.cpp
+ * Purpose:     See below
+ * Author:      Julian Smart
+ * Created:     1993
+ * Updated:
+ * Copyright:   (c) 1993, AIAI, University of Edinburgh
+ */
+
+/* A dummy file to include wx.h. If precompiling wx.h,
+ * always start by compiling this and producing the PCH file.
+ * Then subsequent source files use the PCH file.
+ *
+ * If precompiling wx.h for wxWidgets and derived apps,
+ * link dummy.obj with your program.
+ *
+ * This will produce a big PCH file.
+ */
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifdef __WXMSW__
+    #include "wx/msw/msvcrt.h"
+#endif
+
+#ifdef __VISAGECPP__
+    char wxDummyChar = 0;
+#endif
diff --git a/Source/3rd Party/wx/src/common/dynarray.cpp b/Source/3rd Party/wx/src/common/dynarray.cpp
index b8d633e6f..b5f2b4bc7 100644
--- a/Source/3rd Party/wx/src/common/dynarray.cpp	
+++ b/Source/3rd Party/wx/src/common/dynarray.cpp	
@@ -1,497 +1,527 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dynarray.cpp
-// Purpose:     implementation of wxBaseArray class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     12.09.97
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// headers
-// ============================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include  "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/intl.h"
-#endif //WX_PRECOMP
-
-#include <stdlib.h>
-#include <string.h> // for memmove
-
-#if !wxUSE_STD_CONTAINERS
-
-// we cast the value to long from which we cast it to void * in IndexForInsert:
-// this can't work if the pointers are not big enough
-wxCOMPILE_TIME_ASSERT( sizeof(wxUIntPtr) <= sizeof(void *),
-                       wxArraySizeOfPtrLessSizeOfLong ); // < 32 symbols
-
-// ============================================================================
-// constants
-// ============================================================================
-
-// size increment = max(50% of current size, ARRAY_MAXSIZE_INCREMENT)
-#define   ARRAY_MAXSIZE_INCREMENT    4096
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxBaseArray - dynamic array of 'T's
-// ----------------------------------------------------------------------------
-
-#define _WX_DEFINE_BASEARRAY(T, name)                                       \
-/* searches the array for an item (forward or backwards) */                 \
-int name::Index(T lItem, bool bFromEnd) const                               \
-{                                                                           \
-  if ( bFromEnd ) {                                                         \
-    if ( size() > 0 ) {                                                     \
-      size_t n = size();                                                    \
-      do {                                                                  \
-        if ( (*this)[--n] == lItem )                                        \
-          return n;                                                         \
-      }                                                                     \
-      while ( n != 0 );                                                     \
-    }                                                                       \
-  }                                                                         \
-  else {                                                                    \
-    for( size_t n = 0; n < size(); n++ ) {                                  \
-      if( (*this)[n] == lItem )                                             \
-        return n;                                                           \
-    }                                                                       \
-  }                                                                         \
-                                                                            \
-  return wxNOT_FOUND;                                                       \
-}                                                                           \
-                                                                            \
-/* add item assuming the array is sorted with fnCompare function */         \
-size_t name::Add(T lItem, CMPFUNC fnCompare)                                \
-{                                                                           \
-  size_t idx = IndexForInsert(lItem, fnCompare);                            \
-  Insert(lItem, idx);                                                       \
-  return idx;                                                               \
-}                                                                           \
-                                                                            \
-/* ctor */                                                                  \
-name::name()                                                                \
-{                                                                           \
-  m_nSize  =                                                                \
-  m_nCount = 0;                                                             \
-  m_pItems = NULL;                                                     \
-}                                                                           \
-                                                                            \
-/* copy ctor */                                                             \
-name::name(const name& src)                                                 \
-{                                                                           \
-  m_nSize  = /* not src.m_nSize to save memory */                           \
-  m_nCount = src.m_nCount;                                                  \
-                                                                            \
-  if ( m_nSize != 0 ) {                                                     \
-      m_pItems = new T[m_nSize];                                            \
-      /* only copy if allocation succeeded */                               \
-      if ( m_pItems ) {                                                     \
-          memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(T));               \
-      }                                                                     \
-      else {                                                                \
-          m_nSize = 0;                                                      \
-      }                                                                     \
-  }                                                                         \
-  else                                                                      \
-    m_pItems = NULL;                                                  \
-}                                                                           \
-                                                                            \
-/* assignment operator */                                                   \
-name& name::operator=(const name& src)                                      \
-{                                                                           \
-  wxDELETEA(m_pItems);                                                      \
-                                                                            \
-  m_nSize  = /* not src.m_nSize to save memory */                           \
-  m_nCount = src.m_nCount;                                                  \
-                                                                            \
-  if ( m_nSize != 0 ){                                                      \
-      m_pItems = new T[m_nSize];                                            \
-      /* only copy if allocation succeeded */                               \
-      if ( m_pItems ) {                                                     \
-          memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(T));               \
-      }                                                                     \
-      else {                                                                \
-          m_nSize = 0;                                                      \
-      }                                                                     \
-  }                                                                         \
-  else                                                                      \
-    m_pItems = NULL;                                                  \
-                                                                            \
-  return *this;                                                             \
-}                                                                           \
-                                                                            \
-/* allocate new buffer of the given size and move our data to it */         \
-bool name::Realloc(size_t nSize)                                            \
-{                                                                           \
-  T *pNew = new T[nSize];                                                   \
-  /* only grow if allocation succeeded */                                   \
-  if ( !pNew )                                                              \
-      return false;                                                         \
-                                                                            \
-  m_nSize = nSize;                                                          \
-  /* copy data to new location */                                           \
-  memcpy(pNew, m_pItems, m_nCount*sizeof(T));                               \
-  delete [] m_pItems;                                                       \
-  m_pItems = pNew;                                                          \
-                                                                            \
-  return true;                                                              \
-}                                                                           \
-                                                                            \
-/* grow the array */                                                        \
-void name::Grow(size_t nIncrement)                                          \
-{                                                                           \
-  /* only do it if no more place */                                         \
-  if( (m_nCount == m_nSize) || ((m_nSize - m_nCount) < nIncrement) ) {      \
-    if( m_nSize == 0 ) {                                                    \
-      /* was empty, determine initial size */                               \
-      size_t size = WX_ARRAY_DEFAULT_INITIAL_SIZE;                          \
-      if (size < nIncrement) size = nIncrement;                             \
-      /* allocate some memory */                                            \
-      m_pItems = new T[size];                                               \
-      /* only grow if allocation succeeded */                               \
-      if ( m_pItems ) {                                                     \
-          m_nSize = size;                                                   \
-      }                                                                     \
-    }                                                                       \
-    else                                                                    \
-    {                                                                       \
-      /* add at least 50% but not too much */                               \
-      size_t ndefIncrement = m_nSize < WX_ARRAY_DEFAULT_INITIAL_SIZE        \
-                            ? WX_ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1; \
-      if ( ndefIncrement > ARRAY_MAXSIZE_INCREMENT )                        \
-        ndefIncrement = ARRAY_MAXSIZE_INCREMENT;                            \
-      if ( nIncrement < ndefIncrement )                                     \
-        nIncrement = ndefIncrement;                                         \
-      Realloc(m_nSize + nIncrement);                                        \
-    }                                                                       \
-  }                                                                         \
-}                                                                           \
-                                                                            \
-/* make sure that the array has at least count elements */                  \
-void name::SetCount(size_t count, T defval)                                 \
-{                                                                           \
-    if ( m_nSize < count )                                                  \
-    {                                                                       \
-        /* need to realloc memory: don't overallocate it here as if */      \
-        /* SetCount() is called, it probably means that the caller  */      \
-        /* knows in advance how many elements there will be in the  */      \
-        /* array and so it won't be necessary to realloc it later   */      \
-        if ( !Realloc(count) )                                              \
-        {                                                                   \
-            /* out of memory -- what can we do? */                          \
-            return;                                                         \
-        }                                                                   \
-    }                                                                       \
-                                                                            \
-    /* add new elements if we extend the array */                           \
-    while ( m_nCount < count )                                              \
-    {                                                                       \
-        m_pItems[m_nCount++] = defval;                                      \
-    }                                                                       \
-}                                                                           \
-                                                                            \
-/* dtor */                                                                  \
-name::~name()                                                               \
-{                                                                           \
-  wxDELETEA(m_pItems);                                                      \
-}                                                                           \
-                                                                            \
-/* clears the list */                                                       \
-void name::Clear()                                                          \
-{                                                                           \
-  m_nSize  =                                                                \
-  m_nCount = 0;                                                             \
-                                                                            \
-  wxDELETEA(m_pItems);                                                      \
-}                                                                           \
-                                                                            \
-/* minimizes the memory usage by freeing unused memory */                   \
-void name::Shrink()                                                         \
-{                                                                           \
-  /* only do it if we have some memory to free */                           \
-  if( m_nCount < m_nSize ) {                                                \
-    /* allocates exactly as much memory as we need */                       \
-    T *pNew = new T[m_nCount];                                              \
-    /* only shrink if allocation succeeded */                               \
-    if ( pNew ) {                                                           \
-        /* copy data to new location */                                     \
-        memcpy(pNew, m_pItems, m_nCount*sizeof(T));                         \
-        delete [] m_pItems;                                                 \
-        m_pItems = pNew;                                                    \
-                                                                            \
-        /* update the size of the new block */                              \
-        m_nSize = m_nCount;                                                 \
-    }                                                                       \
-    /* else: don't do anything, better keep old memory block! */            \
-  }                                                                         \
-}                                                                           \
-                                                                            \
-/* add item at the end */                                                   \
-void name::Add(T lItem, size_t nInsert)                                     \
-{                                                                           \
-  if (nInsert == 0)                                                         \
-      return;                                                               \
-  Grow(nInsert);                                                            \
-  for (size_t i = 0; i < nInsert; i++)                                      \
-      m_pItems[m_nCount++] = lItem;                                         \
-}                                                                           \
-                                                                            \
-/* add item at the given position */                                        \
-void name::Insert(T lItem, size_t nIndex, size_t nInsert)                   \
-{                                                                           \
-  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::Insert") );   \
-  wxCHECK_RET( m_nCount <= m_nCount + nInsert,                              \
-               wxT("array size overflow in wxArray::Insert") );             \
-                                                                            \
-  if (nInsert == 0)                                                         \
-      return;                                                               \
-  Grow(nInsert);                                                            \
-                                                                            \
-  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],                   \
-          (m_nCount - nIndex)*sizeof(T));                                   \
-  for (size_t i = 0; i < nInsert; i++)                                      \
-      m_pItems[nIndex + i] = lItem;                                         \
-  m_nCount += nInsert;                                                      \
-}                                                                           \
-                                                                            \
-/* search for a place to insert item into sorted array (binary search) */   \
-size_t name::IndexForInsert(T lItem, CMPFUNC fnCompare) const               \
-{                                                                           \
-  size_t i,                                                                 \
-       lo = 0,                                                              \
-       hi = m_nCount;                                                       \
-  int res;                                                                  \
-                                                                            \
-  while ( lo < hi ) {                                                       \
-    i = (lo + hi)/2;                                                        \
-                                                                            \
-    res = (*fnCompare)((const void *)(wxUIntPtr)lItem,                      \
-                       (const void *)(wxUIntPtr)(m_pItems[i]));             \
-    if ( res < 0 )                                                          \
-      hi = i;                                                               \
-    else if ( res > 0 )                                                     \
-      lo = i + 1;                                                           \
-    else {                                                                  \
-      lo = i;                                                               \
-      break;                                                                \
-    }                                                                       \
-  }                                                                         \
-                                                                            \
-  return lo;                                                                \
-}                                                                           \
-                                                                            \
-/* search for an item in a sorted array (binary search) */                  \
-int name::Index(T lItem, CMPFUNC fnCompare) const                           \
-{                                                                           \
-    size_t n = IndexForInsert(lItem, fnCompare);                            \
-                                                                            \
-    return (n >= m_nCount ||                                                \
-           (*fnCompare)((const void *)(wxUIntPtr)lItem,                     \
-                        ((const void *)(wxUIntPtr)m_pItems[n])))            \
-                        ? wxNOT_FOUND                                       \
-                        : (int)n;                                           \
-}                                                                           \
-                                                                            \
-/* removes item from array (by index) */                                    \
-void name::RemoveAt(size_t nIndex, size_t nRemove)                          \
-{                                                                           \
-  wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArray::RemoveAt") );  \
-  wxCHECK_RET( nIndex + nRemove <= m_nCount,                                \
-               wxT("removing too many elements in wxArray::RemoveAt") );    \
-                                                                            \
-  memmove(&m_pItems[nIndex], &m_pItems[nIndex + nRemove],                   \
-          (m_nCount - nIndex - nRemove)*sizeof(T));                         \
-  m_nCount -= nRemove;                                                      \
-}                                                                           \
-                                                                            \
-/* removes item from array (by value) */                                    \
-void name::Remove(T lItem)                                                  \
-{                                                                           \
-  int iIndex = Index(lItem);                                                \
-                                                                            \
-  wxCHECK_RET( iIndex != wxNOT_FOUND,                                       \
-               wxT("removing inexistent item in wxArray::Remove") );        \
-                                                                            \
-  RemoveAt((size_t)iIndex);                                                 \
-}                                                                           \
-                                                                            \
-/* sort array elements using passed comparaison function */                 \
-void name::Sort(CMPFUNC fCmp)                                               \
-{                                                                           \
-  qsort(m_pItems, m_nCount, sizeof(T), fCmp);                               \
-}                                                                           \
-                                                                            \
-void name::assign(const_iterator first, const_iterator last)                \
-{                                                                           \
-  clear();                                                                  \
-  reserve(last - first);                                                    \
-  for(; first != last; ++first)                                             \
-    push_back(*first);                                                      \
-}                                                                           \
-                                                                            \
-void name::assign(size_type n, const_reference v)                           \
-{                                                                           \
-  clear();                                                                  \
-  reserve(n);                                                               \
-  for( size_type i = 0; i < n; ++i )                                        \
-    push_back(v);                                                           \
-}                                                                           \
-                                                                            \
-void name::insert(iterator it, const_iterator first, const_iterator last)   \
-{                                                                           \
-  size_t nInsert = last - first, nIndex = it - begin();                     \
-  if (nInsert == 0)                                                         \
-      return;                                                               \
-  Grow(nInsert);                                                            \
-                                                                            \
-  /* old iterator could have been invalidated by Grow(). */                 \
-  it = begin() + nIndex;                                                    \
-                                                                            \
-  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],                   \
-          (m_nCount - nIndex)*sizeof(T));                                   \
-  for (size_t i = 0; i < nInsert; ++i, ++it, ++first)                       \
-      *it = *first;                                                         \
-  m_nCount += nInsert;                                                      \
-}
-
-#ifdef __INTELC__
-    #pragma warning(push)
-    #pragma warning(disable: 1684)
-    #pragma warning(disable: 1572)
-#endif
-
-_WX_DEFINE_BASEARRAY(const void *, wxBaseArrayPtrVoid)
-_WX_DEFINE_BASEARRAY(char,         wxBaseArrayChar)
-_WX_DEFINE_BASEARRAY(short,        wxBaseArrayShort)
-_WX_DEFINE_BASEARRAY(int,          wxBaseArrayInt)
-_WX_DEFINE_BASEARRAY(long,         wxBaseArrayLong)
-_WX_DEFINE_BASEARRAY(size_t,       wxBaseArraySizeT)
-_WX_DEFINE_BASEARRAY(double,       wxBaseArrayDouble)
-
-#ifdef __INTELC__
-    #pragma warning(pop)
-#endif
-
-#else // wxUSE_STD_CONTAINERS
-
-#include "wx/arrstr.h"
-
-#include "wx/beforestd.h"
-#include <functional>
-#include "wx/afterstd.h"
-
-// some compilers (Sun CC being the only known example) distinguish between
-// extern "C" functions and the functions with C++ linkage and ptr_fun and
-// wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in
-// this case, we need the wrappers below to make this work
-struct wxStringCmp
-{
-    typedef wxString first_argument_type;
-    typedef wxString second_argument_type;
-    typedef int result_type;
-
-    int operator()(const wxString& s1, const wxString& s2) const
-    {
-        return s1.compare(s2);
-    }
-};
-
-struct wxStringCmpNoCase
-{
-    typedef wxString first_argument_type;
-    typedef wxString second_argument_type;
-    typedef int result_type;
-
-    int operator()(const wxString& s1, const wxString& s2) const
-    {
-        return s1.CmpNoCase(s2);
-    }
-};
-
-int wxArrayString::Index(const wxString& str, bool bCase, bool WXUNUSED(bFromEnd)) const
-{
-    wxArrayString::const_iterator it;
-
-    if (bCase)
-    {
-        it = std::find_if(begin(), end(),
-                          std::not1(
-                              std::bind2nd(
-                                  wxStringCmp(), str)));
-    }
-    else // !bCase
-    {
-        it = std::find_if(begin(), end(),
-                          std::not1(
-                              std::bind2nd(
-                                  wxStringCmpNoCase(), str)));
-    }
-
-    return it == end() ? wxNOT_FOUND : it - begin();
-}
-
-template<class F>
-class wxStringCompareLess
-{
-public:
-    wxStringCompareLess(F f) : m_f(f) { }
-    bool operator()(const wxString& s1, const wxString& s2)
-        { return m_f(s1, s2) < 0; }
-private:
-    F m_f;
-};
-
-template<class F>
-wxStringCompareLess<F> wxStringCompare(F f)
-{
-    return wxStringCompareLess<F>(f);
-}
-
-void wxArrayString::Sort(CompareFunction function)
-{
-    std::sort(begin(), end(), wxStringCompare(function));
-}
-
-void wxArrayString::Sort(bool reverseOrder)
-{
-    if (reverseOrder)
-    {
-        std::sort(begin(), end(), std::greater<wxString>());
-    }
-    else
-    {
-        std::sort(begin(), end());
-    }
-}
-
-int wxSortedArrayString::Index(const wxString& str,
-                               bool WXUNUSED_UNLESS_DEBUG(bCase),
-                               bool WXUNUSED_UNLESS_DEBUG(bFromEnd)) const
-{
-    wxASSERT_MSG( bCase && !bFromEnd,
-                  "search parameters ignored for sorted array" );
-
-    wxSortedArrayString::const_iterator
-        it = std::lower_bound(begin(), end(), str, wxStringCompare(wxStringCmp()));
-
-    if ( it == end() || str.Cmp(*it) != 0 )
-        return wxNOT_FOUND;
-
-    return it - begin();
-}
-
-#endif // !wxUSE_STD_CONTAINERS/wxUSE_STD_CONTAINERS
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dynarray.cpp
+// Purpose:     implementation of wxBaseArray class
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     12.09.97
+// RCS-ID:      $Id: dynarray.cpp 43030 2006-11-04 12:51:01Z VZ $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// headers
+// ============================================================================
+
+// For compilers that support precompilation, includes "wx.h".
+#include  "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/intl.h"
+#endif //WX_PRECOMP
+
+#include <stdlib.h>
+#include <string.h> // for memmove
+
+// we cast the value to long from which we cast it to void * in IndexForInsert:
+// this can't work if the pointers are not big enough
+wxCOMPILE_TIME_ASSERT( sizeof(wxUIntPtr) <= sizeof(void *),
+                       wxArraySizeOfPtrLessSizeOfLong ); // < 32 symbols
+
+// ============================================================================
+// constants
+// ============================================================================
+
+// size increment = max(50% of current size, ARRAY_MAXSIZE_INCREMENT)
+#define   ARRAY_MAXSIZE_INCREMENT    4096
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxBaseArray - dynamic array of 'T's
+// ----------------------------------------------------------------------------
+
+#define _WX_DEFINE_BASEARRAY_COMMON(T, name)                                \
+/* searches the array for an item (forward or backwards) */                 \
+int name::Index(T lItem, bool bFromEnd) const                               \
+{                                                                           \
+  if ( bFromEnd ) {                                                         \
+    if ( size() > 0 ) {                                                     \
+      size_t n = size();                                                    \
+      do {                                                                  \
+        if ( (*this)[--n] == lItem )                                        \
+          return n;                                                         \
+      }                                                                     \
+      while ( n != 0 );                                                     \
+    }                                                                       \
+  }                                                                         \
+  else {                                                                    \
+    for( size_t n = 0; n < size(); n++ ) {                                  \
+      if( (*this)[n] == lItem )                                             \
+        return n;                                                           \
+    }                                                                       \
+  }                                                                         \
+                                                                            \
+  return wxNOT_FOUND;                                                       \
+}                                                                           \
+                                                                            \
+/* add item assuming the array is sorted with fnCompare function */         \
+size_t name::Add(T lItem, CMPFUNC fnCompare)                                \
+{                                                                           \
+  size_t idx = IndexForInsert(lItem, fnCompare);                            \
+  Insert(lItem, idx);                                                       \
+  return idx;                                                               \
+}
+
+#if wxUSE_STL
+
+#define _WX_DEFINE_BASEARRAY_NOCOMMON(T, name)                              \
+size_t name::IndexForInsert(T lItem, CMPFUNC fnCompare) const               \
+{                                                                           \
+    Predicate p((SCMPFUNC)fnCompare);                                       \
+    const_iterator it = std::lower_bound(begin(), end(), lItem, p);         \
+    return it - begin();                                                    \
+}                                                                           \
+                                                                            \
+int name::Index(T lItem, CMPFUNC fnCompare) const                           \
+{                                                                           \
+    Predicate p((SCMPFUNC)fnCompare);                                       \
+    const_iterator it = std::lower_bound(begin(), end(), lItem, p);         \
+    return (it != end() && !p(lItem, *it)) ?                                \
+                             (int)(it - begin()) : wxNOT_FOUND;             \
+}                                                                           \
+                                                                            \
+void name::Shrink()                                                         \
+{                                                                           \
+    name tmp(*this);                                                        \
+    swap(tmp);                                                              \
+}
+
+#else // if !wxUSE_STL
+
+#define _WX_DEFINE_BASEARRAY_NOCOMMON(T, name)                              \
+/* ctor */                                                                  \
+name::name()                                                                \
+{                                                                           \
+  m_nSize  =                                                                \
+  m_nCount = 0;                                                             \
+  m_pItems = (T *)NULL;                                                     \
+}                                                                           \
+                                                                            \
+/* copy ctor */                                                             \
+name::name(const name& src)                                                 \
+{                                                                           \
+  m_nSize  = /* not src.m_nSize to save memory */                           \
+  m_nCount = src.m_nCount;                                                  \
+                                                                            \
+  if ( m_nSize != 0 ) {                                                     \
+      m_pItems = new T[m_nSize];                                            \
+      /* only copy if allocation succeeded */                               \
+      if ( m_pItems ) {                                                     \
+          memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(T));               \
+      }                                                                     \
+      else {                                                                \
+          m_nSize = 0;                                                      \
+      }                                                                     \
+  }                                                                         \
+  else                                                                      \
+    m_pItems = (T *) NULL;                                                  \
+}                                                                           \
+                                                                            \
+/* assignment operator */                                                   \
+name& name::operator=(const name& src)                                      \
+{                                                                           \
+  wxDELETEA(m_pItems);                                                      \
+                                                                            \
+  m_nSize  = /* not src.m_nSize to save memory */                           \
+  m_nCount = src.m_nCount;                                                  \
+                                                                            \
+  if ( m_nSize != 0 ){                                                      \
+      m_pItems = new T[m_nSize];                                            \
+      /* only copy if allocation succeeded */                               \
+      if ( m_pItems ) {                                                     \
+          memcpy(m_pItems, src.m_pItems, m_nCount*sizeof(T));               \
+      }                                                                     \
+      else {                                                                \
+          m_nSize = 0;                                                      \
+      }                                                                     \
+  }                                                                         \
+  else                                                                      \
+    m_pItems = (T *) NULL;                                                  \
+                                                                            \
+  return *this;                                                             \
+}                                                                           \
+                                                                            \
+/* allocate new buffer of the given size and move our data to it */         \
+bool name::Realloc(size_t nSize)                                            \
+{                                                                           \
+  T *pNew = new T[nSize];                                                   \
+  /* only grow if allocation succeeded */                                   \
+  if ( !pNew )                                                              \
+      return false;                                                         \
+                                                                            \
+  m_nSize = nSize;                                                          \
+  /* copy data to new location */                                           \
+  memcpy(pNew, m_pItems, m_nCount*sizeof(T));                               \
+  delete [] m_pItems;                                                       \
+  m_pItems = pNew;                                                          \
+                                                                            \
+  return true;                                                              \
+}                                                                           \
+                                                                            \
+/* grow the array */                                                        \
+void name::Grow(size_t nIncrement)                                          \
+{                                                                           \
+  /* only do it if no more place */                                         \
+  if( (m_nCount == m_nSize) || ((m_nSize - m_nCount) < nIncrement) ) {      \
+    if( m_nSize == 0 ) {                                                    \
+      /* was empty, determine initial size */                               \
+      size_t size = WX_ARRAY_DEFAULT_INITIAL_SIZE;                          \
+      if (size < nIncrement) size = nIncrement;                             \
+      /* allocate some memory */                                            \
+      m_pItems = new T[size];                                               \
+      /* only grow if allocation succeeded */                               \
+      if ( m_pItems ) {                                                     \
+          m_nSize = size;                                                   \
+      }                                                                     \
+    }                                                                       \
+    else                                                                    \
+    {                                                                       \
+      /* add at least 50% but not too much */                               \
+      size_t ndefIncrement = m_nSize < WX_ARRAY_DEFAULT_INITIAL_SIZE        \
+                            ? WX_ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1; \
+      if ( ndefIncrement > ARRAY_MAXSIZE_INCREMENT )                        \
+        ndefIncrement = ARRAY_MAXSIZE_INCREMENT;                            \
+      if ( nIncrement < ndefIncrement )                                     \
+        nIncrement = ndefIncrement;                                         \
+      Realloc(m_nSize + nIncrement);                                        \
+    }                                                                       \
+  }                                                                         \
+}                                                                           \
+                                                                            \
+/* make sure that the array has at least count elements */                  \
+void name::SetCount(size_t count, T defval)                                 \
+{                                                                           \
+    if ( m_nSize < count )                                                  \
+    {                                                                       \
+        /* need to realloc memory: don't overallocate it here as if */      \
+        /* SetCount() is called, it probably means that the caller  */      \
+        /* knows in advance how many elements there will be in the  */      \
+        /* array and so it won't be necessary to realloc it later   */      \
+        if ( !Realloc(count) )                                              \
+        {                                                                   \
+            /* out of memory -- what can we do? */                          \
+            return;                                                         \
+        }                                                                   \
+    }                                                                       \
+                                                                            \
+    /* add new elements if we extend the array */                           \
+    while ( m_nCount < count )                                              \
+    {                                                                       \
+        m_pItems[m_nCount++] = defval;                                      \
+    }                                                                       \
+}                                                                           \
+                                                                            \
+/* dtor */                                                                  \
+name::~name()                                                               \
+{                                                                           \
+  wxDELETEA(m_pItems);                                                      \
+}                                                                           \
+                                                                            \
+/* clears the list */                                                       \
+void name::Clear()                                                          \
+{                                                                           \
+  m_nSize  =                                                                \
+  m_nCount = 0;                                                             \
+                                                                            \
+  wxDELETEA(m_pItems);                                                      \
+}                                                                           \
+                                                                            \
+/* minimizes the memory usage by freeing unused memory */                   \
+void name::Shrink()                                                         \
+{                                                                           \
+  /* only do it if we have some memory to free */                           \
+  if( m_nCount < m_nSize ) {                                                \
+    /* allocates exactly as much memory as we need */                       \
+    T *pNew = new T[m_nCount];                                              \
+    /* only shrink if allocation succeeded */                               \
+    if ( pNew ) {                                                           \
+        /* copy data to new location */                                     \
+        memcpy(pNew, m_pItems, m_nCount*sizeof(T));                         \
+        delete [] m_pItems;                                                 \
+        m_pItems = pNew;                                                    \
+                                                                            \
+        /* update the size of the new block */                              \
+        m_nSize = m_nCount;                                                 \
+    }                                                                       \
+    /* else: don't do anything, better keep old memory block! */            \
+  }                                                                         \
+}                                                                           \
+                                                                            \
+/* add item at the end */                                                   \
+void name::Add(T lItem, size_t nInsert)                                     \
+{                                                                           \
+  if (nInsert == 0)                                                         \
+      return;                                                               \
+  Grow(nInsert);                                                            \
+  for (size_t i = 0; i < nInsert; i++)                                      \
+      m_pItems[m_nCount++] = lItem;                                         \
+}                                                                           \
+                                                                            \
+/* add item at the given position */                                        \
+void name::Insert(T lItem, size_t nIndex, size_t nInsert)                   \
+{                                                                           \
+  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::Insert") );   \
+  wxCHECK_RET( m_nCount <= m_nCount + nInsert,                              \
+               wxT("array size overflow in wxArray::Insert") );             \
+                                                                            \
+  if (nInsert == 0)                                                         \
+      return;                                                               \
+  Grow(nInsert);                                                            \
+                                                                            \
+  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],                   \
+          (m_nCount - nIndex)*sizeof(T));                                   \
+  for (size_t i = 0; i < nInsert; i++)                                      \
+      m_pItems[nIndex + i] = lItem;                                         \
+  m_nCount += nInsert;                                                      \
+}                                                                           \
+                                                                            \
+/* search for a place to insert item into sorted array (binary search) */   \
+size_t name::IndexForInsert(T lItem, CMPFUNC fnCompare) const               \
+{                                                                           \
+  size_t i,                                                                 \
+       lo = 0,                                                              \
+       hi = m_nCount;                                                       \
+  int res;                                                                  \
+                                                                            \
+  while ( lo < hi ) {                                                       \
+    i = (lo + hi)/2;                                                        \
+                                                                            \
+    res = (*fnCompare)((const void *)(wxUIntPtr)lItem,                      \
+                       (const void *)(wxUIntPtr)(m_pItems[i]));             \
+    if ( res < 0 )                                                          \
+      hi = i;                                                               \
+    else if ( res > 0 )                                                     \
+      lo = i + 1;                                                           \
+    else {                                                                  \
+      lo = i;                                                               \
+      break;                                                                \
+    }                                                                       \
+  }                                                                         \
+                                                                            \
+  return lo;                                                                \
+}                                                                           \
+                                                                            \
+/* search for an item in a sorted array (binary search) */                  \
+int name::Index(T lItem, CMPFUNC fnCompare) const                           \
+{                                                                           \
+    size_t n = IndexForInsert(lItem, fnCompare);                            \
+                                                                            \
+    return (n >= m_nCount ||                                                \
+           (*fnCompare)((const void *)(wxUIntPtr)lItem,                     \
+                        ((const void *)(wxUIntPtr)m_pItems[n])))            \
+                        ? wxNOT_FOUND                                       \
+                        : (int)n;                                           \
+}                                                                           \
+                                                                            \
+/* removes item from array (by index) */                                    \
+void name::RemoveAt(size_t nIndex, size_t nRemove)                          \
+{                                                                           \
+  wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArray::RemoveAt") );  \
+  wxCHECK_RET( nIndex + nRemove <= m_nCount,                                \
+               wxT("removing too many elements in wxArray::RemoveAt") );    \
+                                                                            \
+  memmove(&m_pItems[nIndex], &m_pItems[nIndex + nRemove],                   \
+          (m_nCount - nIndex - nRemove)*sizeof(T));                         \
+  m_nCount -= nRemove;                                                      \
+}                                                                           \
+                                                                            \
+/* removes item from array (by value) */                                    \
+void name::Remove(T lItem)                                                  \
+{                                                                           \
+  int iIndex = Index(lItem);                                                \
+                                                                            \
+  wxCHECK_RET( iIndex != wxNOT_FOUND,                                       \
+               wxT("removing inexistent item in wxArray::Remove") );        \
+                                                                            \
+  RemoveAt((size_t)iIndex);                                                 \
+}                                                                           \
+                                                                            \
+/* sort array elements using passed comparaison function */                 \
+void name::Sort(CMPFUNC fCmp)                                               \
+{                                                                           \
+  qsort(m_pItems, m_nCount, sizeof(T), fCmp);                               \
+}                                                                           \
+                                                                            \
+void name::assign(const_iterator first, const_iterator last)                \
+{                                                                           \
+  clear();                                                                  \
+  reserve(last - first);                                                    \
+  for(; first != last; ++first)                                             \
+    push_back(*first);                                                      \
+}                                                                           \
+                                                                            \
+void name::assign(size_type n, const_reference v)                           \
+{                                                                           \
+  clear();                                                                  \
+  reserve(n);                                                               \
+  for( size_type i = 0; i < n; ++i )                                        \
+    push_back(v);                                                           \
+}                                                                           \
+                                                                            \
+void name::insert(iterator it, const_iterator first, const_iterator last)   \
+{                                                                           \
+  size_t nInsert = last - first, nIndex = it - begin();                     \
+  if (nInsert == 0)                                                         \
+      return;                                                               \
+  Grow(nInsert);                                                            \
+                                                                            \
+  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],                   \
+          (m_nCount - nIndex)*sizeof(T));                                   \
+  for (size_t i = 0; i < nInsert; ++i, ++it, ++first)                       \
+      *it = *first;                                                         \
+  m_nCount += nInsert;                                                      \
+}
+
+#endif
+
+#define _WX_DEFINE_BASEARRAY(T, name)                                       \
+        _WX_DEFINE_BASEARRAY_COMMON(T, name)                                \
+        _WX_DEFINE_BASEARRAY_NOCOMMON(T, name)
+
+#ifdef __INTELC__
+    #pragma warning(push)
+    #pragma warning(disable: 1684)
+    #pragma warning(disable: 1572)
+#endif
+
+_WX_DEFINE_BASEARRAY(const void *, wxBaseArrayPtrVoid)
+_WX_DEFINE_BASEARRAY(char,         wxBaseArrayChar)
+_WX_DEFINE_BASEARRAY(short,        wxBaseArrayShort)
+_WX_DEFINE_BASEARRAY(int,          wxBaseArrayInt)
+_WX_DEFINE_BASEARRAY(long,         wxBaseArrayLong)
+_WX_DEFINE_BASEARRAY(size_t,       wxBaseArraySizeT)
+_WX_DEFINE_BASEARRAY(double,       wxBaseArrayDouble)
+
+#ifdef __INTELC__
+    #pragma warning(pop)
+#endif
+
+#if wxUSE_STL
+#include "wx/arrstr.h"
+
+#include "wx/beforestd.h"
+#include <functional>
+#include "wx/afterstd.h"
+
+_WX_DEFINE_BASEARRAY(wxString, wxBaseArrayStringBase)
+
+// some compilers (Sun CC being the only known example) distinguish between
+// extern "C" functions and the functions with C++ linkage and ptr_fun and
+// wxStringCompareLess can't take wxStrcmp/wxStricmp directly as arguments in
+// this case, we need the wrappers below to make this work
+inline int wxStrcmpCppWrapper(const wxChar *p, const wxChar *q)
+{
+    return wxStrcmp(p, q);
+}
+
+inline int wxStricmpCppWrapper(const wxChar *p, const wxChar *q)
+{
+    return wxStricmp(p, q);
+}
+
+int wxArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) const
+{
+    wxArrayString::const_iterator it;
+
+    if (bCase)
+    {
+        it = std::find_if(begin(), end(),
+                          std::not1(
+                              std::bind2nd(
+                                  std::ptr_fun(wxStrcmpCppWrapper), sz)));
+    }
+    else // !bCase
+    {
+        it = std::find_if(begin(), end(),
+                          std::not1(
+                              std::bind2nd(
+                                  std::ptr_fun(wxStricmpCppWrapper), sz)));
+    }
+
+    return it == end() ? wxNOT_FOUND : it - begin();
+}
+
+template<class F>
+class wxStringCompareLess
+{
+public:
+    wxStringCompareLess(F f) : m_f(f) { }
+    bool operator()(const wxChar* s1, const wxChar* s2)
+        { return m_f(s1, s2) < 0; }
+    bool operator()(const wxString& s1, const wxString& s2)
+        { return m_f(s1, s2) < 0; }
+private:
+    F m_f;
+};
+
+template<class F>
+wxStringCompareLess<F> wxStringCompare(F f)
+{
+    return wxStringCompareLess<F>(f);
+}
+
+void wxArrayString::Sort(CompareFunction function)
+{
+    std::sort(begin(), end(), wxStringCompare(function));
+}
+
+void wxArrayString::Sort(bool reverseOrder)
+{
+    if (reverseOrder)
+    {
+        std::sort(begin(), end(), std::greater<wxString>());
+    }
+    else
+    {
+        std::sort(begin(), end());
+    }
+}
+
+int wxSortedArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFromEnd)) const
+{
+    wxSortedArrayString::const_iterator it;
+    wxString s(sz);
+
+    if (bCase)
+        it = std::lower_bound(begin(), end(), s,
+                              wxStringCompare(wxStrcmpCppWrapper));
+    else
+        it = std::lower_bound(begin(), end(), s,
+                              wxStringCompare(wxStricmpCppWrapper));
+
+    if (it == end())
+        return wxNOT_FOUND;
+
+    if (bCase)
+    {
+        if (wxStrcmp(it->c_str(), sz) != 0)
+            return wxNOT_FOUND;
+    }
+    else
+    {
+        if (wxStricmp(it->c_str(), sz) != 0)
+            return wxNOT_FOUND;
+    }
+
+    return it - begin();
+}
+
+#endif
diff --git a/Source/3rd Party/wx/src/common/dynlib.cpp b/Source/3rd Party/wx/src/common/dynlib.cpp
index 0745cb2bc..a2db5e3ba 100644
--- a/Source/3rd Party/wx/src/common/dynlib.cpp	
+++ b/Source/3rd Party/wx/src/common/dynlib.cpp	
@@ -1,281 +1,323 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/dynlib.cpp
-// Purpose:     Dynamic library management
-// Author:      Guilhem Lavaux
-// Modified by:
-// Created:     20/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Guilhem Lavaux
-//                  2000-2005 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-//FIXME:  This class isn't really common at all, it should be moved into
-//        platform dependent files (already done for Windows and Unix)
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include  "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_DYNLIB_CLASS
-
-#include "wx/dynlib.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/app.h"
-    #include "wx/utils.h"
-#endif //WX_PRECOMP
-
-#include "wx/filefn.h"
-#include "wx/filename.h"        // for SplitPath()
-#include "wx/platinfo.h"
-
-#include "wx/arrimpl.cpp"
-
-WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ---------------------------------------------------------------------------
-// wxDynamicLibrary
-// ---------------------------------------------------------------------------
-
-#if defined(__WXPM__) || defined(__EMX__)
-    const wxString wxDynamicLibrary::ms_dllext(wxT(".dll"));
-#endif
-
-// for MSW/Unix it is defined in platform-specific file
-#if !(defined(__WINDOWS__) || defined(__UNIX__)) || defined(__EMX__)
-
-wxDllType wxDynamicLibrary::GetProgramHandle()
-{
-   wxFAIL_MSG( wxT("GetProgramHandle() is not implemented under this platform"));
-   return 0;
-}
-
-#endif // __WINDOWS__ || __UNIX__
-
-
-bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
-{
-    wxASSERT_MSG(m_handle == 0, wxT("Library already loaded."));
-
-    // add the proper extension for the DLL ourselves unless told not to
-    wxString libname = libnameOrig;
-    if ( !(flags & wxDL_VERBATIM) )
-    {
-        // and also check that the libname doesn't already have it
-        wxString ext;
-        wxFileName::SplitPath(libname, NULL, NULL, &ext);
-        if ( ext.empty() )
-        {
-            libname += GetDllExt();
-        }
-    }
-
-    // different ways to load a shared library
-    //
-    // FIXME: should go to the platform-specific files!
-#if defined(__WXPM__) || defined(__EMX__)
-    char err[256] = "";
-    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
-#else // this should be the only remaining branch eventually
-    m_handle = RawLoad(libname, flags);
-#endif
-
-    if ( m_handle == 0 && !(flags & wxDL_QUIET) )
-    {
-#ifdef wxHAVE_DYNLIB_ERROR
-        Error();
-#else
-        wxLogSysError(_("Failed to load shared library '%s'"), libname.c_str());
-#endif
-    }
-
-    return IsLoaded();
-}
-
-// for MSW and Unix this is implemented in the platform-specific file
-//
-// TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp!
-#if (!defined(__WINDOWS__) && !defined(__UNIX__)) || defined(__EMX__)
-
-/* static */
-void wxDynamicLibrary::Unload(wxDllType handle)
-{
-#if defined(__OS2__) || defined(__EMX__)
-    DosFreeModule( handle );
-#else
-    #error  "runtime shared lib support not implemented"
-#endif
-}
-
-#endif // !(__WINDOWS__ || __UNIX__)
-
-void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
-{
-    wxCHECK_MSG( IsLoaded(), NULL,
-                 wxT("Can't load symbol from unloaded library") );
-
-    void    *symbol = 0;
-
-    wxUnusedVar(symbol);
-#if defined(__WXPM__) || defined(__EMX__)
-    DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
-#else
-    symbol = RawGetSymbol(m_handle, name);
-#endif
-
-    if ( success )
-        *success = symbol != NULL;
-
-    return symbol;
-}
-
-void *wxDynamicLibrary::GetSymbol(const wxString& name, bool *success) const
-{
-    void *symbol = DoGetSymbol(name, success);
-    if ( !symbol )
-    {
-#ifdef wxHAVE_DYNLIB_ERROR
-        Error();
-#else
-        wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
-                      name.c_str());
-#endif
-    }
-
-    return symbol;
-}
-
-// ----------------------------------------------------------------------------
-// informational methods
-// ----------------------------------------------------------------------------
-
-/*static*/
-wxString
-wxDynamicLibrary::CanonicalizeName(const wxString& name,
-                                   wxDynamicLibraryCategory cat)
-{
-    wxString nameCanonic;
-
-    // under Unix the library names usually start with "lib" prefix, add it
-#if defined(__UNIX__) && !defined(__EMX__)
-    switch ( cat )
-    {
-        default:
-            wxFAIL_MSG( wxT("unknown wxDynamicLibraryCategory value") );
-            // fall through
-
-        case wxDL_MODULE:
-            // don't do anything for modules, their names are arbitrary
-            break;
-
-        case wxDL_LIBRARY:
-            // library names should start with "lib" under Unix
-            nameCanonic = wxT("lib");
-            break;
-    }
-#else // !__UNIX__
-    wxUnusedVar(cat);
-#endif // __UNIX__/!__UNIX__
-
-    nameCanonic << name << GetDllExt();
-    return nameCanonic;
-}
-
-/*static*/
-wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
-                                                  wxPluginCategory cat)
-{
-    wxString suffix;
-    if ( cat == wxDL_PLUGIN_GUI )
-    {
-        suffix = wxPlatformInfo::Get().GetPortIdShortName();
-    }
-#if wxUSE_UNICODE
-    suffix << wxT('u');
-#endif
-#ifdef __WXDEBUG__
-    suffix << wxT('d');
-#endif
-
-    if ( !suffix.empty() )
-        suffix = wxString(wxT("_")) + suffix;
-
-#define WXSTRINGIZE(x)  #x
-#if defined(__UNIX__) && !defined(__EMX__)
-    #if (wxMINOR_VERSION % 2) == 0
-        #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y)
-    #else
-        #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) "." WXSTRINGIZE(z)
-    #endif
-#else
-    #if (wxMINOR_VERSION % 2) == 0
-        #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y)
-    #else
-        #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y) WXSTRINGIZE(z)
-    #endif
-#endif
-
-    suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION,
-                                           wxRELEASE_NUMBER));
-#undef wxDLLVER
-#undef WXSTRINGIZE
-
-#ifdef __WINDOWS__
-    // Add compiler identification:
-    #if defined(__GNUG__)
-        suffix << wxT("_gcc");
-    #elif defined(__VISUALC__)
-        suffix << wxT("_vc");
-    #elif defined(__WATCOMC__)
-        suffix << wxT("_wat");
-    #elif defined(__BORLANDC__)
-        suffix << wxT("_bcc");
-    #endif
-#endif
-
-    return CanonicalizeName(name + suffix, wxDL_MODULE);
-}
-
-/*static*/
-wxString wxDynamicLibrary::GetPluginsDirectory()
-{
-#ifdef __UNIX__
-    wxString format = wxGetInstallPrefix();
-    wxString dir;
-    format << wxFILE_SEP_PATH
-           << wxT("lib") << wxFILE_SEP_PATH
-           << wxT("wx") << wxFILE_SEP_PATH
-#if (wxMINOR_VERSION % 2) == 0
-           << wxT("%i.%i");
-    dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
-#else
-           << wxT("%i.%i.%i");
-    dir.Printf(format.c_str(),
-               wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
-#endif
-    return dir;
-
-#else // ! __UNIX__
-    return wxEmptyString;
-#endif
-}
-
-
-#endif // wxUSE_DYNLIB_CLASS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/dynlib.cpp
+// Purpose:     Dynamic library management
+// Author:      Guilhem Lavaux
+// Modified by:
+// Created:     20/07/98
+// RCS-ID:      $Id: dynlib.cpp 41807 2006-10-09 15:58:56Z VZ $
+// Copyright:   (c) 1998 Guilhem Lavaux
+//                  2000-2005 Vadim Zeitlin
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+//FIXME:  This class isn't really common at all, it should be moved into
+//        platform dependent files (already done for Windows and Unix)
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include  "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_DYNLIB_CLASS
+
+#include "wx/dynlib.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+#endif //WX_PRECOMP
+
+#include "wx/filefn.h"
+#include "wx/filename.h"        // for SplitPath()
+#include "wx/platinfo.h"
+
+#include "wx/arrimpl.cpp"
+
+#if defined(__WXMAC__)
+    #include "wx/mac/private.h"
+#endif
+
+WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ---------------------------------------------------------------------------
+// wxDynamicLibrary
+// ---------------------------------------------------------------------------
+
+#if defined(__WXPM__) || defined(__EMX__)
+    const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    const wxChar *wxDynamicLibrary::ms_dllext = wxEmptyString;
+#endif
+
+// for MSW/Unix it is defined in platform-specific file
+#if !(defined(__WXMSW__) || defined(__UNIX__)) || defined(__EMX__)
+
+wxDllType wxDynamicLibrary::GetProgramHandle()
+{
+   wxFAIL_MSG( wxT("GetProgramHandle() is not implemented under this platform"));
+   return 0;
+}
+
+#endif // __WXMSW__ || __UNIX__
+
+
+bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
+{
+    wxASSERT_MSG(m_handle == 0, _T("Library already loaded."));
+
+    // add the proper extension for the DLL ourselves unless told not to
+    wxString libname = libnameOrig;
+    if ( !(flags & wxDL_VERBATIM) )
+    {
+        // and also check that the libname doesn't already have it
+        wxString ext;
+        wxFileName::SplitPath(libname, NULL, NULL, &ext);
+        if ( ext.empty() )
+        {
+            libname += GetDllExt();
+        }
+    }
+
+    // different ways to load a shared library
+    //
+    // FIXME: should go to the platform-specific files!
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+    FSSpec      myFSSpec;
+    Ptr         myMainAddr;
+    Str255      myErrName;
+
+    wxMacFilename2FSSpec( libname , &myFSSpec );
+
+    if( GetDiskFragment( &myFSSpec,
+                         0,
+                         kCFragGoesToEOF,
+                         "\p",
+                         kPrivateCFragCopy,
+                         &m_handle,
+                         &myMainAddr,
+                         myErrName ) != noErr )
+    {
+        wxLogSysError( _("Failed to load shared library '%s' Error '%s'"),
+                       libname.c_str(),
+                       wxMacMakeStringFromPascal( myErrName ).c_str() );
+        m_handle = 0;
+    }
+
+#elif defined(__WXPM__) || defined(__EMX__)
+    char err[256] = "";
+    DosLoadModule(err, sizeof(err), (PSZ)libname.c_str(), &m_handle);
+#else // this should be the only remaining branch eventually
+    m_handle = RawLoad(libname, flags);
+#endif
+
+    if ( m_handle == 0 )
+    {
+#ifdef wxHAVE_DYNLIB_ERROR
+        Error();
+#else
+        wxLogSysError(_("Failed to load shared library '%s'"), libname.c_str());
+#endif
+    }
+
+    return IsLoaded();
+}
+
+// for MSW and Unix this is implemented in the platform-specific file
+//
+// TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp!
+#if (!defined(__WXMSW__) && !defined(__UNIX__)) || defined(__EMX__)
+
+/* static */
+void wxDynamicLibrary::Unload(wxDllType handle)
+{
+#if defined(__OS2__) || defined(__EMX__)
+    DosFreeModule( handle );
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    CloseConnection( (CFragConnectionID*) &handle );
+#else
+    #error  "runtime shared lib support not implemented"
+#endif
+}
+
+#endif // !(__WXMSW__ || __UNIX__)
+
+void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
+{
+    wxCHECK_MSG( IsLoaded(), NULL,
+                 _T("Can't load symbol from unloaded library") );
+
+    void    *symbol = 0;
+
+    wxUnusedVar(symbol);
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+    Ptr                 symAddress;
+    CFragSymbolClass    symClass;
+    Str255              symName;
+#if TARGET_CARBON
+    c2pstrcpy( (StringPtr) symName, name.fn_str() );
+#else
+    strcpy( (char *)symName, name.fn_str() );
+    c2pstr( (char *)symName );
+#endif
+    if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
+        symbol = (void *)symAddress;
+#elif defined(__WXPM__) || defined(__EMX__)
+    DosQueryProcAddr( m_handle, 1L, (PSZ)name.c_str(), (PFN*)symbol );
+#else
+    symbol = RawGetSymbol(m_handle, name);
+#endif
+
+    if ( success )
+        *success = symbol != NULL;
+
+    return symbol;
+}
+
+void *wxDynamicLibrary::GetSymbol(const wxString& name, bool *success) const
+{
+    void *symbol = DoGetSymbol(name, success);
+    if ( !symbol )
+    {
+#ifdef wxHAVE_DYNLIB_ERROR
+        Error();
+#else
+        wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
+                      name.c_str());
+#endif
+    }
+
+    return symbol;
+}
+
+// ----------------------------------------------------------------------------
+// informational methods
+// ----------------------------------------------------------------------------
+
+/*static*/
+wxString
+wxDynamicLibrary::CanonicalizeName(const wxString& name,
+                                   wxDynamicLibraryCategory cat)
+{
+    wxString nameCanonic;
+
+    // under Unix the library names usually start with "lib" prefix, add it
+#if defined(__UNIX__) && !defined(__EMX__)
+    switch ( cat )
+    {
+        default:
+            wxFAIL_MSG( _T("unknown wxDynamicLibraryCategory value") );
+            // fall through
+
+        case wxDL_MODULE:
+            // don't do anything for modules, their names are arbitrary
+            break;
+
+        case wxDL_LIBRARY:
+            // library names should start with "lib" under Unix
+            nameCanonic = _T("lib");
+            break;
+    }
+#else // !__UNIX__
+    wxUnusedVar(cat);
+#endif // __UNIX__/!__UNIX__
+
+    nameCanonic << name << GetDllExt();
+    return nameCanonic;
+}
+
+/*static*/
+wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
+                                                  wxPluginCategory cat)
+{
+    wxString suffix;
+    if ( cat == wxDL_PLUGIN_GUI )
+    {
+        suffix = wxPlatformInfo::Get().GetPortIdShortName();
+    }
+#if wxUSE_UNICODE
+    suffix << _T('u');
+#endif
+#ifdef __WXDEBUG__
+    suffix << _T('d');
+#endif
+
+    if ( !suffix.empty() )
+        suffix = wxString(_T("_")) + suffix;
+
+#define WXSTRINGIZE(x)  #x
+#if defined(__UNIX__) && !defined(__EMX__)
+    #if (wxMINOR_VERSION % 2) == 0
+        #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y)
+    #else
+        #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) "." WXSTRINGIZE(z)
+    #endif
+#else
+    #if (wxMINOR_VERSION % 2) == 0
+        #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y)
+    #else
+        #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y) WXSTRINGIZE(z)
+    #endif
+#endif
+
+    suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION,
+                                           wxRELEASE_NUMBER));
+#undef wxDLLVER
+#undef WXSTRINGIZE
+
+#ifdef __WINDOWS__
+    // Add compiler identification:
+    #if defined(__GNUG__)
+        suffix << _T("_gcc");
+    #elif defined(__VISUALC__)
+        suffix << _T("_vc");
+    #elif defined(__WATCOMC__)
+        suffix << _T("_wat");
+    #elif defined(__BORLANDC__)
+        suffix << _T("_bcc");
+    #endif
+#endif
+
+    return CanonicalizeName(name + suffix, wxDL_MODULE);
+}
+
+/*static*/
+wxString wxDynamicLibrary::GetPluginsDirectory()
+{
+#ifdef __UNIX__
+    wxString format = wxGetInstallPrefix();
+    wxString dir;
+    format << wxFILE_SEP_PATH
+           << wxT("lib") << wxFILE_SEP_PATH
+           << wxT("wx") << wxFILE_SEP_PATH
+#if (wxMINOR_VERSION % 2) == 0
+           << wxT("%i.%i");
+    dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
+#else
+           << wxT("%i.%i.%i");
+    dir.Printf(format.c_str(),
+               wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
+#endif
+    return dir;
+
+#else // ! __UNIX__
+    return wxEmptyString;
+#endif
+}
+
+
+#endif // wxUSE_DYNLIB_CLASS
diff --git a/Source/3rd Party/wx/src/common/dynload.cpp b/Source/3rd Party/wx/src/common/dynload.cpp
index ca23689e4..a28b9e528 100644
--- a/Source/3rd Party/wx/src/common/dynload.cpp	
+++ b/Source/3rd Party/wx/src/common/dynload.cpp	
@@ -1,402 +1,362 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:         src/common/dynload.cpp
-// Purpose:      Dynamic loading framework
-// Author:       Ron Lee, David Falkinder, Vadim Zeitlin and a cast of 1000's
-//               (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
-// Modified by:
-// Created:      03/12/01
-// RCS-ID:       $Id$
-// Copyright:    (c) 2001 Ron Lee <ron@debian.org>
-// Licence:      wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_DYNAMIC_LOADER
-
-#ifdef __WINDOWS__
-    #include "wx/msw/private.h"
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/hash.h"
-    #include "wx/utils.h"
-    #include "wx/module.h"
-#endif
-
-#include "wx/strconv.h"
-
-#include "wx/dynload.h"
-
-
-// ---------------------------------------------------------------------------
-// wxPluginLibrary
-// ---------------------------------------------------------------------------
-
-
-wxDLImports*  wxPluginLibrary::ms_classes = NULL;
-
-class wxPluginLibraryModule : public wxModule
-{
-public:
-    wxPluginLibraryModule() { }
-
-    // TODO: create ms_classes on demand, why always preallocate it?
-    virtual bool OnInit()
-    {
-        wxPluginLibrary::ms_classes = new wxDLImports;
-        wxPluginManager::CreateManifest();
-        return true;
-    }
-
-    virtual void OnExit()
-    {
-        wxDELETE(wxPluginLibrary::ms_classes);
-        wxPluginManager::ClearManifest();
-    }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPluginLibraryModule )
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxPluginLibraryModule, wxModule)
-
-
-wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
-        : m_linkcount(1)
-        , m_objcount(0)
-{
-    const wxClassInfo* const oldFirst = wxClassInfo::GetFirst();
-    Load( libname, flags );
-
-    // It is simple to know what is the last object we registered, it's just
-    // the new head of the wxClassInfo list:
-    m_ourLast = wxClassInfo::GetFirst();
-
-    // But to find the first wxClassInfo created by this library we need to
-    // iterate until we get to the previous head as we don't have the links in
-    // the backwards direction:
-    if ( m_ourLast != oldFirst )
-    {
-        for ( const wxClassInfo* info = m_ourLast; ; info = info->GetNext() )
-        {
-            if ( info->GetNext() == oldFirst )
-            {
-                m_ourFirst = info;
-                break;
-            }
-        }
-    }
-    else // We didn't register any classes at all.
-    {
-        m_ourFirst =
-        m_ourLast = NULL;
-    }
-
-    if( m_handle != 0 )
-    {
-        UpdateClasses();
-        RegisterModules();
-    }
-    else
-    {
-        // Flag us for deletion
-        --m_linkcount;
-    }
-}
-
-wxPluginLibrary::~wxPluginLibrary()
-{
-    if( m_handle != 0 )
-    {
-        UnregisterModules();
-        RestoreClasses();
-    }
-}
-
-wxPluginLibrary *wxPluginLibrary::RefLib()
-{
-    wxCHECK_MSG( m_linkcount > 0, NULL,
-                 wxT("Library had been already deleted!") );
-
-    ++m_linkcount;
-    return this;
-}
-
-bool wxPluginLibrary::UnrefLib()
-{
-    wxASSERT_MSG( m_objcount == 0,
-                  wxT("Library unloaded before all objects were destroyed") );
-
-    if ( m_linkcount == 0 || --m_linkcount == 0 )
-    {
-        delete this;
-        return true;
-    }
-
-    return false;
-}
-
-// ------------------------
-// Private methods
-// ------------------------
-
-void wxPluginLibrary::UpdateClasses()
-{
-    if ( !m_ourFirst )
-        return;
-
-    for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
-    {
-        if( info->GetClassName() )
-        {
-            // Hash all the class names into a local table too so
-            // we can quickly find the entry they correspond to.
-            (*ms_classes)[info->GetClassName()] = this;
-        }
-
-        if ( info == m_ourLast )
-            break;
-    }
-}
-
-void wxPluginLibrary::RestoreClasses()
-{
-    // Check if there is a need to restore classes.
-    if (!ms_classes)
-        return;
-
-    if ( !m_ourFirst )
-        return;
-
-    for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
-    {
-        ms_classes->erase(ms_classes->find(info->GetClassName()));
-
-        if ( info == m_ourLast )
-            break;
-    }
-}
-
-void wxPluginLibrary::RegisterModules()
-{
-    // Plugin libraries might have wxModules, Register and initialise them if
-    // they do.
-    //
-    // Note that these classes are NOT included in the reference counting since
-    // it's implicit that they will be unloaded if and when the last handle to
-    // the library is.  We do have to keep a copy of the module's pointer
-    // though, as there is currently no way to Unregister it without it.
-
-    wxASSERT_MSG( m_linkcount == 1,
-                  wxT("RegisterModules should only be called for the first load") );
-
-    if ( m_ourFirst )
-    {
-        for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
-        {
-            if( info->IsKindOf(wxCLASSINFO(wxModule)) )
-            {
-                wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
-
-                wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") );
-
-                m_wxmodules.push_back(m);
-                wxModule::RegisterModule(m);
-            }
-
-            if ( info == m_ourLast )
-                break;
-        }
-    }
-
-    // FIXME: Likewise this is (well was) very similar to InitializeModules()
-
-    for ( wxModuleList::iterator it = m_wxmodules.begin();
-          it != m_wxmodules.end();
-          ++it)
-    {
-        if( !(*it)->Init() )
-        {
-            wxLogDebug(wxT("wxModule::Init() failed for wxPluginLibrary"));
-
-            // XXX: Watch this, a different hash implementation might break it,
-            //      a good hash implementation would let us fix it though.
-
-            // The name of the game is to remove any uninitialised modules and
-            // let the dtor Exit the rest on shutdown, (which we'll initiate
-            // shortly).
-
-            wxModuleList::iterator oldNode = m_wxmodules.end();
-            do {
-                ++it;
-                if( oldNode != m_wxmodules.end() )
-                    m_wxmodules.erase(oldNode);
-                wxModule::UnregisterModule( *it );
-                oldNode = it;
-            } while( it != m_wxmodules.end() );
-
-            --m_linkcount;     // Flag us for deletion
-            break;
-        }
-    }
-}
-
-void wxPluginLibrary::UnregisterModules()
-{
-    wxModuleList::iterator it;
-
-    for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it )
-        (*it)->Exit();
-
-    for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it )
-        wxModule::UnregisterModule( *it );
-
-    // NB: content of the list was deleted by UnregisterModule calls above:
-    m_wxmodules.clear();
-}
-
-
-// ---------------------------------------------------------------------------
-// wxPluginManager
-// ---------------------------------------------------------------------------
-
-wxDLManifest*   wxPluginManager::ms_manifest = NULL;
-
-// ------------------------
-// Static accessors
-// ------------------------
-
-wxPluginLibrary *
-wxPluginManager::LoadLibrary(const wxString &libname, int flags)
-{
-    wxString realname(libname);
-
-    if( !(flags & wxDL_VERBATIM) )
-        realname += wxDynamicLibrary::GetDllExt();
-
-    wxPluginLibrary *entry;
-
-    if ( flags & wxDL_NOSHARE )
-    {
-        entry = NULL;
-    }
-    else
-    {
-        entry = FindByName(realname);
-    }
-
-    if ( entry )
-    {
-        wxLogTrace(wxT("dll"),
-                   wxT("LoadLibrary(%s): already loaded."), realname.c_str());
-
-        entry->RefLib();
-    }
-    else
-    {
-        entry = new wxPluginLibrary( libname, flags );
-
-        if ( entry->IsLoaded() )
-        {
-            (*ms_manifest)[realname] = entry;
-
-            wxLogTrace(wxT("dll"),
-                       wxT("LoadLibrary(%s): loaded ok."), realname.c_str());
-
-        }
-        else
-        {
-            wxLogTrace(wxT("dll"),
-                       wxT("LoadLibrary(%s): failed to load."), realname.c_str());
-
-            // we have created entry just above
-            if ( !entry->UnrefLib() )
-            {
-                // ... so UnrefLib() is supposed to delete it
-                wxFAIL_MSG( wxT("Currently linked library is not loaded?") );
-            }
-
-            entry = NULL;
-        }
-    }
-
-    return entry;
-}
-
-bool wxPluginManager::UnloadLibrary(const wxString& libname)
-{
-    wxString realname = libname;
-
-    wxPluginLibrary *entry = FindByName(realname);
-
-    if ( !entry )
-    {
-        realname += wxDynamicLibrary::GetDllExt();
-
-        entry = FindByName(realname);
-    }
-
-    if ( !entry )
-    {
-        wxLogDebug(wxT("Attempt to unload library '%s' which is not loaded."),
-                   libname.c_str());
-
-        return false;
-    }
-
-    wxLogTrace(wxT("dll"), wxT("UnloadLibrary(%s)"), realname.c_str());
-
-    if ( !entry->UnrefLib() )
-    {
-        // not really unloaded yet
-        return false;
-    }
-
-    ms_manifest->erase(ms_manifest->find(realname));
-
-    return true;
-}
-
-// ------------------------
-// Class implementation
-// ------------------------
-
-bool wxPluginManager::Load(const wxString &libname, int flags)
-{
-    m_entry = wxPluginManager::LoadLibrary(libname, flags);
-
-    return IsLoaded();
-}
-
-void wxPluginManager::Unload()
-{
-    wxCHECK_RET( m_entry, wxT("unloading an invalid wxPluginManager?") );
-
-    for ( wxDLManifest::iterator i = ms_manifest->begin();
-          i != ms_manifest->end();
-          ++i )
-    {
-        if ( i->second == m_entry )
-        {
-            ms_manifest->erase(i);
-            break;
-        }
-    }
-
-    m_entry->UnrefLib();
-
-    m_entry = NULL;
-}
-
-#endif  // wxUSE_DYNAMIC_LOADER
+/////////////////////////////////////////////////////////////////////////////
+// Name:         src/common/dynload.cpp
+// Purpose:      Dynamic loading framework
+// Author:       Ron Lee, David Falkinder, Vadim Zeitlin and a cast of 1000's
+//               (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
+// Modified by:
+// Created:      03/12/01
+// RCS-ID:       $Id: dynload.cpp 40943 2006-08-31 19:31:43Z ABX $
+// Copyright:    (c) 2001 Ron Lee <ron@debian.org>
+// Licence:      wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_DYNAMIC_LOADER
+
+#ifdef __WINDOWS__
+    #include "wx/msw/private.h"
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/hash.h"
+    #include "wx/utils.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/strconv.h"
+
+#include "wx/dynload.h"
+
+
+// ---------------------------------------------------------------------------
+// wxPluginLibrary
+// ---------------------------------------------------------------------------
+
+
+wxDLImports*  wxPluginLibrary::ms_classes = NULL;
+
+class wxPluginLibraryModule : public wxModule
+{
+public:
+    wxPluginLibraryModule() { }
+
+    // TODO: create ms_classes on demand, why always preallocate it?
+    virtual bool OnInit()
+    {
+        wxPluginLibrary::ms_classes = new wxDLImports;
+        wxPluginManager::CreateManifest();
+        return true;
+    }
+
+    virtual void OnExit()
+    {
+        delete wxPluginLibrary::ms_classes;
+        wxPluginLibrary::ms_classes = NULL;
+        wxPluginManager::ClearManifest();
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPluginLibraryModule )
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxPluginLibraryModule, wxModule)
+
+
+wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
+        : m_linkcount(1)
+        , m_objcount(0)
+{
+    m_before = wxClassInfo::sm_first;
+    Load( libname, flags );
+    m_after = wxClassInfo::sm_first;
+
+    if( m_handle != 0 )
+    {
+        UpdateClasses();
+        RegisterModules();
+    }
+    else
+    {
+        // Flag us for deletion
+        --m_linkcount;
+    }
+}
+
+wxPluginLibrary::~wxPluginLibrary()
+{
+    if( m_handle != 0 )
+    {
+        UnregisterModules();
+        RestoreClasses();
+    }
+}
+
+wxPluginLibrary *wxPluginLibrary::RefLib()
+{
+    wxCHECK_MSG( m_linkcount > 0, NULL,
+                 _T("Library had been already deleted!") );
+
+    ++m_linkcount;
+    return this;
+}
+
+bool wxPluginLibrary::UnrefLib()
+{
+    wxASSERT_MSG( m_objcount == 0,
+                  _T("Library unloaded before all objects were destroyed") );
+
+    if ( m_linkcount == 0 || --m_linkcount == 0 )
+    {
+        delete this;
+        return true;
+    }
+
+    return false;
+}
+
+// ------------------------
+// Private methods
+// ------------------------
+
+void wxPluginLibrary::UpdateClasses()
+{
+    for (wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+    {
+        if( info->GetClassName() )
+        {
+            // Hash all the class names into a local table too so
+            // we can quickly find the entry they correspond to.
+            (*ms_classes)[info->GetClassName()] = this;
+        }
+    }
+}
+
+void wxPluginLibrary::RestoreClasses()
+{
+    // Check if there is a need to restore classes.
+    if (!ms_classes)
+        return;
+
+    for(wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+    {
+        ms_classes->erase(ms_classes->find(info->GetClassName()));
+    }
+}
+
+void wxPluginLibrary::RegisterModules()
+{
+    // Plugin libraries might have wxModules, Register and initialise them if
+    // they do.
+    //
+    // Note that these classes are NOT included in the reference counting since
+    // it's implicit that they will be unloaded if and when the last handle to
+    // the library is.  We do have to keep a copy of the module's pointer
+    // though, as there is currently no way to Unregister it without it.
+
+    wxASSERT_MSG( m_linkcount == 1,
+                  _T("RegisterModules should only be called for the first load") );
+
+    for ( wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+    {
+        if( info->IsKindOf(CLASSINFO(wxModule)) )
+        {
+            wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
+
+            wxASSERT_MSG( m, _T("wxDynamicCast of wxModule failed") );
+
+            m_wxmodules.push_back(m);
+            wxModule::RegisterModule(m);
+        }
+    }
+
+    // FIXME: Likewise this is (well was) very similar to InitializeModules()
+
+    for ( wxModuleList::iterator it = m_wxmodules.begin();
+          it != m_wxmodules.end();
+          ++it)
+    {
+        if( !(*it)->Init() )
+        {
+            wxLogDebug(_T("wxModule::Init() failed for wxPluginLibrary"));
+
+            // XXX: Watch this, a different hash implementation might break it,
+            //      a good hash implementation would let us fix it though.
+
+            // The name of the game is to remove any uninitialised modules and
+            // let the dtor Exit the rest on shutdown, (which we'll initiate
+            // shortly).
+
+            wxModuleList::iterator oldNode = m_wxmodules.end();
+            do {
+                ++it;
+                if( oldNode != m_wxmodules.end() )
+                    m_wxmodules.erase(oldNode);
+                wxModule::UnregisterModule( *it );
+                oldNode = it;
+            } while( it != m_wxmodules.end() );
+
+            --m_linkcount;     // Flag us for deletion
+            break;
+        }
+    }
+}
+
+void wxPluginLibrary::UnregisterModules()
+{
+    wxModuleList::iterator it;
+
+    for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it )
+        (*it)->Exit();
+
+    for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it )
+        wxModule::UnregisterModule( *it );
+
+    // NB: content of the list was deleted by UnregisterModule calls above:
+    m_wxmodules.clear();
+}
+
+
+// ---------------------------------------------------------------------------
+// wxPluginManager
+// ---------------------------------------------------------------------------
+
+wxDLManifest*   wxPluginManager::ms_manifest = NULL;
+
+// ------------------------
+// Static accessors
+// ------------------------
+
+wxPluginLibrary *
+wxPluginManager::LoadLibrary(const wxString &libname, int flags)
+{
+    wxString realname(libname);
+
+    if( !(flags & wxDL_VERBATIM) )
+        realname += wxDynamicLibrary::GetDllExt();
+
+    wxPluginLibrary *entry;
+
+    if ( flags & wxDL_NOSHARE )
+    {
+        entry = NULL;
+    }
+    else
+    {
+        entry = FindByName(realname);
+    }
+
+    if ( entry )
+    {
+        wxLogTrace(_T("dll"),
+                   _T("LoadLibrary(%s): already loaded."), realname.c_str());
+
+        entry->RefLib();
+    }
+    else
+    {
+        entry = new wxPluginLibrary( libname, flags );
+
+        if ( entry->IsLoaded() )
+        {
+            (*ms_manifest)[realname] = entry;
+
+            wxLogTrace(_T("dll"),
+                       _T("LoadLibrary(%s): loaded ok."), realname.c_str());
+
+        }
+        else
+        {
+            wxLogTrace(_T("dll"),
+                       _T("LoadLibrary(%s): failed to load."), realname.c_str());
+
+            // we have created entry just above
+            if ( !entry->UnrefLib() )
+            {
+                // ... so UnrefLib() is supposed to delete it
+                wxFAIL_MSG( _T("Currently linked library is not loaded?") );
+            }
+
+            entry = NULL;
+        }
+    }
+
+    return entry;
+}
+
+bool wxPluginManager::UnloadLibrary(const wxString& libname)
+{
+    wxString realname = libname;
+
+    wxPluginLibrary *entry = FindByName(realname);
+
+    if ( !entry )
+    {
+        realname += wxDynamicLibrary::GetDllExt();
+
+        entry = FindByName(realname);
+    }
+
+    if ( !entry )
+    {
+        wxLogDebug(_T("Attempt to unload library '%s' which is not loaded."),
+                   libname.c_str());
+
+        return false;
+    }
+
+    wxLogTrace(_T("dll"), _T("UnloadLibrary(%s)"), realname.c_str());
+
+    if ( !entry->UnrefLib() )
+    {
+        // not really unloaded yet
+        return false;
+    }
+
+    ms_manifest->erase(ms_manifest->find(realname));
+
+    return true;
+}
+
+// ------------------------
+// Class implementation
+// ------------------------
+
+bool wxPluginManager::Load(const wxString &libname, int flags)
+{
+    m_entry = wxPluginManager::LoadLibrary(libname, flags);
+
+    return IsLoaded();
+}
+
+void wxPluginManager::Unload()
+{
+    wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") );
+
+    for ( wxDLManifest::iterator i = ms_manifest->begin();
+          i != ms_manifest->end();
+          ++i )
+    {
+        if ( i->second == m_entry )
+        {
+            ms_manifest->erase(i);
+            break;
+        }
+    }
+
+    m_entry->UnrefLib();
+
+    m_entry = NULL;
+}
+
+#endif  // wxUSE_DYNAMIC_LOADER
diff --git a/Source/3rd Party/wx/src/common/effects.cpp b/Source/3rd Party/wx/src/common/effects.cpp
index 069bdc099..dc1ab01e5 100644
--- a/Source/3rd Party/wx/src/common/effects.cpp	
+++ b/Source/3rd Party/wx/src/common/effects.cpp	
@@ -1,129 +1,124 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/effects.cpp
-// Purpose:     wxEffectsImpl implementation
-// Author:      Julian Smart
-// Modified by:
-// Created:     25/4/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/effects.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dcmemory.h"
-    #include "wx/pen.h"
-    #include "wx/settings.h"
-    #include "wx/gdicmn.h"
-#endif //WX_PRECOMP
-
-#if WXWIN_COMPATIBILITY_2_8
-
-/*
- * wxEffectsImpl: various 3D effects
- */
-
-IMPLEMENT_CLASS(wxEffectsImpl, wxObject)
-
-// Assume system colours
-wxEffectsImpl::wxEffectsImpl()
-{
-    m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT) ;
-    m_lightShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT) ;
-    m_faceColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE) ;
-    m_mediumShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ;
-    m_darkShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW) ;
-}
-
-// Going from lightest to darkest
-wxEffectsImpl::wxEffectsImpl(const wxColour& highlightColour, const wxColour& lightShadow,
-                const wxColour& faceColour, const wxColour& mediumShadow, const wxColour& darkShadow)
-{
-    m_highlightColour = highlightColour;
-    m_lightShadow = lightShadow;
-    m_faceColour = faceColour;
-    m_mediumShadow = mediumShadow;
-    m_darkShadow = darkShadow;
-}
-
-// Draw a sunken edge
-void wxEffectsImpl::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(borderSize))
-{
-    wxPen highlightPen(m_highlightColour, 1, wxPENSTYLE_SOLID);
-    wxPen lightShadowPen(m_lightShadow, 1, wxPENSTYLE_SOLID);
-    wxPen facePen(m_faceColour, 1, wxPENSTYLE_SOLID);
-    wxPen mediumShadowPen(m_mediumShadow, 1, wxPENSTYLE_SOLID);
-    wxPen darkShadowPen(m_darkShadow, 1, wxPENSTYLE_SOLID);
-
-    //// LEFT AND TOP
-    // Draw a medium shadow pen on left and top, followed by dark shadow line to
-    // right and below of these lines
-
-    dc.SetPen(mediumShadowPen);
-    dc.DrawLine(rect.x, rect.y, rect.x+rect.width-1, rect.y); // Top
-    dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height-1); // Left
-
-    dc.SetPen(darkShadowPen);
-    dc.DrawLine(rect.x+1, rect.y+1, rect.x+rect.width-2, rect.y+1); // Top
-    dc.DrawLine(rect.x+1, rect.y+1, rect.x+1, rect.y+rect.height-1); // Left
-
-    //// RIGHT AND BOTTOM
-
-    dc.SetPen(highlightPen);
-    dc.DrawLine(rect.x+rect.width-1, rect.y, rect.x+rect.width-1, rect.y+rect.height-1); // Right
-    dc.DrawLine(rect.x, rect.y+rect.height-1, rect.x+rect.width, rect.y+rect.height-1); // Bottom
-
-    dc.SetPen(lightShadowPen);
-    dc.DrawLine(rect.x+rect.width-2, rect.y+1, rect.x+rect.width-2, rect.y+rect.height-2); // Right
-    dc.DrawLine(rect.x+1, rect.y+rect.height-2, rect.x+rect.width-1, rect.y+rect.height-2); // Bottom
-
-    dc.SetPen(wxNullPen);
-}
-
-bool wxEffectsImpl::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap)
-{
-    int w = bitmap.GetWidth();
-    int h = bitmap.GetHeight();
-
-    wxMemoryDC dcMem;
-
-#if wxUSE_PALETTE
-    static bool hiColour = (wxDisplayDepth() >= 16) ;
-    if (bitmap.GetPalette() && !hiColour)
-    {
-        dc.SetPalette(* bitmap.GetPalette());
-        dcMem.SetPalette(* bitmap.GetPalette());
-    }
-#endif // wxUSE_PALETTE
-
-    dcMem.SelectObjectAsSource(bitmap);
-
-    int i, j;
-    for (i = rect.x; i < rect.x + rect.width; i += w)
-    {
-        for (j = rect.y; j < rect.y + rect.height; j+= h)
-            dc.Blit(i, j, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
-    }
-    dcMem.SelectObject(wxNullBitmap);
-
-#if wxUSE_PALETTE
-    if (bitmap.GetPalette() && !hiColour)
-    {
-        dc.SetPalette(wxNullPalette);
-        dcMem.SetPalette(wxNullPalette);
-    }
-#endif // wxUSE_PALETTE
-
-    return true;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/effects.cpp
+// Purpose:     wxEffects implementation
+// Author:      Julian Smart
+// Modified by:
+// Created:     25/4/2000
+// RCS-ID:      $Id: effects.cpp 42755 2006-10-30 19:41:46Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/effects.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+    #include "wx/pen.h"
+    #include "wx/settings.h"
+    #include "wx/gdicmn.h"
+#endif //WX_PRECOMP
+
+/*
+ * wxEffects: various 3D effects
+ */
+
+IMPLEMENT_CLASS(wxEffects, wxObject)
+
+// Assume system colours
+wxEffects::wxEffects()
+{
+    m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT) ;
+    m_lightShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT) ;
+    m_faceColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE) ;
+    m_mediumShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW) ;
+    m_darkShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW) ;
+}
+
+// Going from lightest to darkest
+wxEffects::wxEffects(const wxColour& highlightColour, const wxColour& lightShadow,
+                const wxColour& faceColour, const wxColour& mediumShadow, const wxColour& darkShadow)
+{
+    m_highlightColour = highlightColour;
+    m_lightShadow = lightShadow;
+    m_faceColour = faceColour;
+    m_mediumShadow = mediumShadow;
+    m_darkShadow = darkShadow;
+}
+
+// Draw a sunken edge
+void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(borderSize))
+{
+    wxPen highlightPen(m_highlightColour, 1, wxSOLID);
+    wxPen lightShadowPen(m_lightShadow, 1, wxSOLID);
+    wxPen facePen(m_faceColour, 1, wxSOLID);
+    wxPen mediumShadowPen(m_mediumShadow, 1, wxSOLID);
+    wxPen darkShadowPen(m_darkShadow, 1, wxSOLID);
+
+    //// LEFT AND TOP
+    // Draw a medium shadow pen on left and top, followed by dark shadow line to
+    // right and below of these lines
+
+    dc.SetPen(mediumShadowPen);
+    dc.DrawLine(rect.x, rect.y, rect.x+rect.width-1, rect.y); // Top
+    dc.DrawLine(rect.x, rect.y, rect.x, rect.y+rect.height-1); // Left
+
+    dc.SetPen(darkShadowPen);
+    dc.DrawLine(rect.x+1, rect.y+1, rect.x+rect.width-2, rect.y+1); // Top
+    dc.DrawLine(rect.x+1, rect.y+1, rect.x+1, rect.y+rect.height-1); // Left
+
+    //// RIGHT AND BOTTOM
+
+    dc.SetPen(highlightPen);
+    dc.DrawLine(rect.x+rect.width-1, rect.y, rect.x+rect.width-1, rect.y+rect.height-1); // Right
+    dc.DrawLine(rect.x, rect.y+rect.height-1, rect.x+rect.width, rect.y+rect.height-1); // Bottom
+
+    dc.SetPen(lightShadowPen);
+    dc.DrawLine(rect.x+rect.width-2, rect.y+1, rect.x+rect.width-2, rect.y+rect.height-2); // Right
+    dc.DrawLine(rect.x+1, rect.y+rect.height-2, rect.x+rect.width-1, rect.y+rect.height-2); // Bottom
+
+    dc.SetPen(wxNullPen);
+}
+
+bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap)
+{
+    int w = bitmap.GetWidth();
+    int h = bitmap.GetHeight();
+
+    wxMemoryDC dcMem;
+
+#if wxUSE_PALETTE
+    static bool hiColour = (wxDisplayDepth() >= 16) ;
+    if (bitmap.GetPalette() && !hiColour)
+    {
+        dc.SetPalette(* bitmap.GetPalette());
+        dcMem.SetPalette(* bitmap.GetPalette());
+    }
+#endif // wxUSE_PALETTE
+
+    dcMem.SelectObjectAsSource(bitmap);
+
+    int i, j;
+    for (i = rect.x; i < rect.x + rect.width; i += w)
+    {
+        for (j = rect.y; j < rect.y + rect.height; j+= h)
+            dc.Blit(i, j, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
+    }
+    dcMem.SelectObject(wxNullBitmap);
+
+#if wxUSE_PALETTE
+    if (bitmap.GetPalette() && !hiColour)
+    {
+        dc.SetPalette(wxNullPalette);
+        dcMem.SetPalette(wxNullPalette);
+    }
+#endif // wxUSE_PALETTE
+
+    return true;
+}
diff --git a/Source/3rd Party/wx/src/common/encconv.cpp b/Source/3rd Party/wx/src/common/encconv.cpp
index 7d0606b8d..15509c9cb 100644
--- a/Source/3rd Party/wx/src/common/encconv.cpp	
+++ b/Source/3rd Party/wx/src/common/encconv.cpp	
@@ -1,508 +1,531 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/encconv.cpp
-// Purpose:     wxEncodingConverter class for converting between different
-//              font encodings
-// Author:      Vaclav Slavik
-// Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#include "wx/encconv.h"
-
-#include <stdlib.h>
-
-// conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
-#if defined( __BORLANDC__ ) || defined(__DARWIN__)
-    #include "../common/unictabl.inc"
-#else
-    #include "unictabl.inc"
-#endif
-
-#ifdef __WXMAC__
-    #include "wx/osx/core/cfstring.h"
-    #include <CoreFoundation/CFStringEncodingExt.h>
-
-    wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
-    bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
-#endif
-
-#ifdef __WXWINCE__
-    #include "wx/msw/wince/missing.h"       // for bsearch()
-#endif
-
-static const wxUint16* GetEncTable(wxFontEncoding enc)
-{
-#ifdef __WXMAC__
-    if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
-    {
-        int i = enc-wxFONTENCODING_MACMIN ;
-        if ( gMacEncodingsInited[i] == false )
-        {
-            // create
-            CFStringEncoding cfencoding = wxMacGetSystemEncFromFontEnc( enc ) ;
-            if( !CFStringIsEncodingAvailable( cfencoding ) )
-                return NULL;
-
-            memset( gMacEncodings[i] , 0 , 128 * 2 );
-            char s[2] = { 0 , 0 };
-            CFRange firstchar = CFRangeMake( 0, 1 );
-            for( unsigned char c = 255 ; c >= 128 ; --c )
-            {
-                s[0] = c ;
-                wxCFStringRef cfref( CFStringCreateWithCStringNoCopy( NULL, s, cfencoding , kCFAllocatorNull ) );
-                CFStringGetCharacters( cfref, firstchar, (UniChar*)  &gMacEncodings[i][c-128] );
-            }
-            gMacEncodingsInited[i]=true;
-        }
-        return gMacEncodings[i] ;
-    }
-#endif
-
-    for (int i = 0; encodings_list[i].table != NULL; i++)
-    {
-        if (encodings_list[i].encoding == enc)
-            return encodings_list[i].table;
-    }
-    return NULL;
-}
-
-typedef struct {
-    wxUint16 u;
-    wxUint8  c;
-} CharsetItem;
-
-extern "C"
-{
-static int wxCMPFUNC_CONV
-CompareCharsetItems(const void *i1, const void *i2)
-{
-    return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
-}
-}
-
-static CharsetItem* BuildReverseTable(const wxUint16 *tbl)
-{
-    CharsetItem *rev = new CharsetItem[128];
-
-    for (int i = 0; i < 128; i++)
-        rev[i].c = wxUint8(128 + i), rev[i].u = tbl[i];
-
-    qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems);
-
-    return rev;
-}
-
-
-
-wxEncodingConverter::wxEncodingConverter()
-{
-    m_Table = NULL;
-    m_UnicodeInput = m_UnicodeOutput = false;
-    m_JustCopy = false;
-}
-
-
-
-bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method)
-{
-    unsigned i;
-    const wxUint16 *in_tbl;
-    const wxUint16 *out_tbl = NULL;
-
-    wxDELETEA(m_Table);
-
-    if (input_enc == output_enc) {m_JustCopy = true; return true;}
-
-    m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);
-    m_JustCopy = false;
-
-    if (input_enc == wxFONTENCODING_UNICODE)
-    {
-        if ((out_tbl = GetEncTable(output_enc)) == NULL) return false;
-
-        m_Table = new wchar_t[65536];
-        for (i = 0; i < 128; i++)  m_Table[i] = (wchar_t)i; // 7bit ASCII
-        for (i = 128; i < 65536; i++)  m_Table[i] = (wchar_t)0;
-
-        if (method == wxCONVERT_SUBSTITUTE)
-        {
-            for (i = 0; i < encoding_unicode_fallback_count; i++)
-                m_Table[encoding_unicode_fallback[i].c] = (wchar_t) encoding_unicode_fallback[i].s;
-        }
-
-        for (i = 0; i < 128; i++)
-            m_Table[out_tbl[i]] = (wchar_t)(128 + i);
-
-        m_UnicodeInput = true;
-    }
-    else // input !Unicode
-    {
-        if ((in_tbl = GetEncTable(input_enc)) == NULL) return false;
-        if (output_enc != wxFONTENCODING_UNICODE)
-            if ((out_tbl = GetEncTable(output_enc)) == NULL) return false;
-
-        m_UnicodeInput = false;
-
-        m_Table = new wchar_t[256];
-        for (i = 0; i < 128; i++)  m_Table[i] = (wchar_t)i; // 7bit ASCII
-
-        if (output_enc == wxFONTENCODING_UNICODE)
-        {
-            for (i = 0; i < 128; i++)  m_Table[128 + i] = (wchar_t)in_tbl[i];
-            return true;
-        }
-        else // output !Unicode
-        {
-            CharsetItem *rev = BuildReverseTable(out_tbl);
-            CharsetItem *item;
-            CharsetItem key;
-
-            for (i = 0; i < 128; i++)
-            {
-                key.u = in_tbl[i];
-                item = (CharsetItem*) bsearch(&key, rev, 128, sizeof(CharsetItem), CompareCharsetItems);
-                if (item == NULL && method == wxCONVERT_SUBSTITUTE)
-                    item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
-                                encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems);
-                if (item)
-                    m_Table[128 + i] = (wchar_t)item -> c;
-                else
-                    m_Table[128 + i] = (wchar_t)(128 + i);
-            }
-
-            delete[] rev;
-        }
-    }
-
-    return true;
-}
-
-
-#define REPLACEMENT_CHAR  (L'?')
-
-inline wchar_t GetTableValue(const wchar_t *table, wchar_t value, bool& repl)
-{
-    wchar_t r = table[value];
-    if (r == 0 && value != 0)
-    {
-        r = REPLACEMENT_CHAR;
-        repl = true;
-    }
-    return r;
-}
-
-
-bool wxEncodingConverter::Convert(const char* input, char* output) const
-{
-    wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
-    wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
-
-    const char *i;
-    char *o;
-
-    if (m_JustCopy)
-    {
-        strcpy(output, input);
-        return true;
-    }
-
-    wxCHECK_MSG(m_Table != NULL, false,
-                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
-    bool replaced = false;
-
-    for (i = input, o = output; *i != 0;)
-        *(o++) = (char)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
-    *o = 0;
-
-    return !replaced;
-}
-
-
-bool wxEncodingConverter::Convert(const char* input, wchar_t* output) const
-{
-    wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
-    wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
-
-    const char *i;
-    wchar_t *o;
-
-    if (m_JustCopy)
-    {
-        for (i = input, o = output; *i != 0;)
-            *(o++) = (wchar_t)(*(i++));
-        *o = 0;
-        return true;
-    }
-
-    wxCHECK_MSG(m_Table != NULL, false,
-                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
-    bool replaced = false;
-
-    for (i = input, o = output; *i != 0;)
-        *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
-    *o = 0;
-
-    return !replaced;
-}
-
-
-
-bool wxEncodingConverter::Convert(const wchar_t* input, char* output) const
-{
-    wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
-    wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));
-
-    const wchar_t *i;
-    char *o;
-
-    if (m_JustCopy)
-    {
-        for (i = input, o = output; *i != 0;)
-            *(o++) = (char)(*(i++));
-        *o = 0;
-        return true;
-    }
-
-    wxCHECK_MSG(m_Table != NULL, false,
-                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
-    bool replaced = false;
-
-    for (i = input, o = output; *i != 0;)
-        *(o++) = (char)(GetTableValue(m_Table, (wxUint16)*(i++), replaced));
-    *o = 0;
-
-    return !replaced;
-}
-
-
-
-bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
-{
-    wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
-    wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));
-
-    const wchar_t *i;
-    wchar_t *o;
-
-    if (m_JustCopy)
-    {
-        // wcscpy() is not guaranteed to exist
-        for (i = input, o = output; *i != 0;)
-            *(o++) = (*(i++));
-        *o = 0;
-        return true;
-    }
-
-    wxCHECK_MSG(m_Table != NULL, false,
-                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
-    bool replaced = false;
-
-    for (i = input, o = output; *i != 0;)
-        *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
-    *o = 0;
-
-    return !replaced;
-}
-
-
-wxString wxEncodingConverter::Convert(const wxString& input) const
-{
-    if (m_JustCopy) return input;
-
-    wxString s;
-    const wxChar *i;
-
-    wxCHECK_MSG(m_Table != NULL, s,
-                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
-
-    if (m_UnicodeInput)
-    {
-        for (i = input.c_str(); *i != 0; i++)
-            s << (wxChar)(m_Table[(wxUint16)*i]);
-    }
-    else
-    {
-        for (i = input.c_str(); *i != 0; i++)
-            s << (wxChar)(m_Table[(wxUint8)*i]);
-    }
-
-    return s;
-}
-
-
-
-
-
-
-
-// Following tables describe classes of encoding equivalence.
-//
-
-#define STOP wxFONTENCODING_SYSTEM
-
-#define NUM_OF_PLATFORMS  4 /*must conform to enum wxPLATFORM_XXXX !!!*/
-#define ENC_PER_PLATFORM  3
-           // max no. of encodings for one language used on one platform.
-           // Using maximum of everything at the current moment to not make the
-           // library larger than necessary. Make larger only if necessary - MR
-
-static const wxFontEncoding
-    EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
-
-    // *** Please put more common encodings as first! ***
-
-    // Western European
-    {
-        /* unix    */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
-        /* windows */ {wxFONTENCODING_CP1252, STOP},
-        /* os2     */ {STOP},
-        /* mac     */ {wxFONTENCODING_MACROMAN, STOP}
-    },
-
-    // Central European
-    {
-        /* unix    */ {wxFONTENCODING_ISO8859_2, STOP},
-        /* windows */ {wxFONTENCODING_CP1250, STOP},
-        /* os2     */ {STOP},
-        /* mac     */ {wxFONTENCODING_MACCENTRALEUR, STOP}
-    },
-
-    // Baltic
-    {
-        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP},
-        /* windows */ {wxFONTENCODING_CP1257, STOP},
-        /* os2     */ {STOP},
-        /* mac     */ {STOP}
-    },
-
-    // Hebrew
-    {
-        /* unix    */ {wxFONTENCODING_ISO8859_8, STOP},
-        /* windows */ {wxFONTENCODING_CP1255, STOP},
-        /* os2     */ {STOP},
-        /* mac     */ {wxFONTENCODING_MACHEBREW, STOP}
-    },
-
-    // Greek
-    {
-        /* unix    */ {wxFONTENCODING_ISO8859_7, STOP},
-        /* windows */ {wxFONTENCODING_CP1253, STOP},
-        /* os2     */ {STOP},
-        /* mac     */ {wxFONTENCODING_MACGREEK, STOP}
-    },
-
-    // Arabic
-    {
-        /* unix    */ {wxFONTENCODING_ISO8859_6, STOP},
-        /* windows */ {wxFONTENCODING_CP1256, STOP},
-        /* os2     */ {STOP},
-        /* mac     */ {wxFONTENCODING_MACARABIC, STOP}
-    },
-
-    // Turkish
-    {
-        /* unix    */ {wxFONTENCODING_ISO8859_9, STOP},
-        /* windows */ {wxFONTENCODING_CP1254, STOP},
-        /* os2     */ {STOP},
-        /* mac     */ {wxFONTENCODING_MACTURKISH, STOP}
-    },
-
-    // Cyrillic
-    {
-        /* unix    */ {wxFONTENCODING_KOI8, wxFONTENCODING_KOI8_U, wxFONTENCODING_ISO8859_5, STOP},
-        /* windows */ {wxFONTENCODING_CP1251, STOP},
-        /* os2     */ {STOP},
-        /* mac     */ {wxFONTENCODING_MACCYRILLIC, STOP}
-    },
-
-    {{STOP},{STOP},{STOP},{STOP}} /* Terminator */
-    /* no, _not_ Arnold! */
-};
-
-
-static bool FindEncoding(const wxFontEncodingArray& arr, wxFontEncoding f)
-{
-    for (wxFontEncodingArray::const_iterator it = arr.begin(), en = arr.end();
-         it != en; ++it)
-        if (*it == f)
-            return true;
-    return false;
-}
-
-wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding enc, int platform)
-{
-    if (platform == wxPLATFORM_CURRENT)
-    {
-#if defined(__WINDOWS__)
-        platform = wxPLATFORM_WINDOWS;
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
-        platform = wxPLATFORM_UNIX;
-#elif defined(__WXPM__)
-        platform = wxPLATFORM_OS2;
-#elif defined(__WXMAC__)
-        platform = wxPLATFORM_MAC;
-#endif
-    }
-
-    int i, clas, e ;
-    const wxFontEncoding *f;
-    wxFontEncodingArray arr;
-
-    clas = 0;
-    while (EquivalentEncodings[clas][0][0] != STOP)
-    {
-        for (i = 0; i < NUM_OF_PLATFORMS; i++)
-            for (e = 0; EquivalentEncodings[clas][i][e] != STOP; e++)
-                if (EquivalentEncodings[clas][i][e] == enc)
-                {
-                    for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
-                        if (*f == enc) arr.push_back(enc);
-                    for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
-                        if (!FindEncoding(arr, *f)) arr.push_back(*f);
-                    i = NUM_OF_PLATFORMS/*hack*/; break;
-                }
-        clas++;
-    }
-
-    return arr;
-}
-
-
-
-wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
-{
-    int i, clas, e, j ;
-    const wxFontEncoding *f;
-    wxFontEncodingArray arr;
-
-    arr = GetPlatformEquivalents(enc); // we want them to be first items in array
-
-    clas = 0;
-    while (EquivalentEncodings[clas][0][0] != STOP)
-    {
-        for (i = 0; i < NUM_OF_PLATFORMS; i++)
-            for (e = 0; EquivalentEncodings[clas][i][e] != STOP; e++)
-                if (EquivalentEncodings[clas][i][e] == enc)
-                {
-                    for (j = 0; j < NUM_OF_PLATFORMS; j++)
-                        for (f = EquivalentEncodings[clas][j]; *f != STOP; f++)
-                            if (!FindEncoding(arr, *f)) arr.push_back(*f);
-                    i = NUM_OF_PLATFORMS/*hack*/; break;
-                }
-        clas++;
-    }
-
-    return arr;
-}
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        encconv.cpp
+// Purpose:     wxEncodingConverter class for converting between different
+//              font encodings
+// Author:      Vaclav Slavik
+// Copyright:   (c) 1999 Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#include "wx/encconv.h"
+
+#include <stdlib.h>
+
+// conversion tables, generated by scripts in $(WXWIN)/misc/unictabl:
+#if defined( __BORLANDC__ ) || defined(__DARWIN__)
+    #include "../common/unictabl.inc"
+#else
+    #include "unictabl.inc"
+#endif
+
+#if wxUSE_WCHAR_T
+    typedef wchar_t tchar;
+#else
+    typedef char tchar;
+#endif
+
+#ifdef __WXMAC__
+#ifdef __DARWIN__
+#include <Carbon/Carbon.h>
+#else
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
+#endif
+    #include "wx/fontutil.h"
+    #include "wx/mac/private.h"  // includes mac headers
+
+    wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ;
+    bool gMacEncodingsInited[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1] ;
+#endif
+
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"       // for bsearch()
+#endif
+
+static const wxUint16* GetEncTable(wxFontEncoding enc)
+{
+#ifdef __WXMAC__
+    if( enc >= wxFONTENCODING_MACMIN && enc <= wxFONTENCODING_MACMAX )
+    {
+        int i = enc-wxFONTENCODING_MACMIN ;
+        if ( gMacEncodingsInited[i] == false )
+        {
+            TECObjectRef converter ;
+            TextEncodingBase code = wxMacGetSystemEncFromFontEnc( enc ) ;
+            TextEncodingBase unicode = CreateTextEncoding(kTextEncodingUnicodeDefault,0,kUnicode16BitFormat) ;
+            OSStatus status = TECCreateConverter(&converter,code,unicode);
+            char s[2] ;
+            s[1] = 0 ;
+            ByteCount byteInLen, byteOutLen ;
+            for( unsigned char c = 255 ; c >= 128 ; --c )
+            {
+                s[0] = c ;
+                status = TECConvertText(converter, (ConstTextPtr) &s , 1, &byteInLen,
+                (TextPtr) &gMacEncodings[i][c-128] , 2, &byteOutLen);
+            }
+            status = TECDisposeConverter(converter);
+            gMacEncodingsInited[i]=true;
+        }
+        return gMacEncodings[i] ;
+    }
+#endif
+
+    for (int i = 0; encodings_list[i].table != NULL; i++)
+    {
+        if (encodings_list[i].encoding == enc)
+            return encodings_list[i].table;
+    }
+    return NULL;
+}
+
+typedef struct {
+    wxUint16 u;
+    wxUint8  c;
+} CharsetItem;
+
+extern "C" int wxCMPFUNC_CONV
+CompareCharsetItems(const void *i1, const void *i2)
+{
+    return ( ((CharsetItem*)i1) -> u - ((CharsetItem*)i2) -> u );
+}
+
+
+static CharsetItem* BuildReverseTable(const wxUint16 *tbl)
+{
+    CharsetItem *rev = new CharsetItem[128];
+
+    for (int i = 0; i < 128; i++)
+        rev[i].c = wxUint8(128 + i), rev[i].u = tbl[i];
+
+    qsort(rev, 128, sizeof(CharsetItem), CompareCharsetItems);
+
+    return rev;
+}
+
+
+
+wxEncodingConverter::wxEncodingConverter()
+{
+    m_Table = NULL;
+    m_UnicodeInput = m_UnicodeOutput = false;
+    m_JustCopy = false;
+}
+
+
+
+bool wxEncodingConverter::Init(wxFontEncoding input_enc, wxFontEncoding output_enc, int method)
+{
+    unsigned i;
+    const wxUint16 *in_tbl;
+    const wxUint16 *out_tbl = NULL;
+
+    if (m_Table) {delete[] m_Table; m_Table = NULL;}
+
+#if !wxUSE_WCHAR_T
+    if (input_enc == wxFONTENCODING_UNICODE || output_enc == wxFONTENCODING_UNICODE) return false;
+#endif
+
+    if (input_enc == output_enc) {m_JustCopy = true; return true;}
+
+    m_UnicodeOutput = (output_enc == wxFONTENCODING_UNICODE);
+    m_JustCopy = false;
+
+    if (input_enc == wxFONTENCODING_UNICODE)
+    {
+        if ((out_tbl = GetEncTable(output_enc)) == NULL) return false;
+
+        m_Table = new tchar[65536];
+        for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
+        for (i = 128; i < 65536; i++)  m_Table[i] = (tchar)0;
+
+        if (method == wxCONVERT_SUBSTITUTE)
+        {
+            for (i = 0; i < encoding_unicode_fallback_count; i++)
+                m_Table[encoding_unicode_fallback[i].c] = (tchar) encoding_unicode_fallback[i].s;
+        }
+
+        for (i = 0; i < 128; i++)
+            m_Table[out_tbl[i]] = (tchar)(128 + i);
+
+        m_UnicodeInput = true;
+    }
+    else // input !Unicode
+    {
+        if ((in_tbl = GetEncTable(input_enc)) == NULL) return false;
+        if (output_enc != wxFONTENCODING_UNICODE)
+            if ((out_tbl = GetEncTable(output_enc)) == NULL) return false;
+
+        m_UnicodeInput = false;
+
+        m_Table = new tchar[256];
+        for (i = 0; i < 128; i++)  m_Table[i] = (tchar)i; // 7bit ASCII
+
+        if (output_enc == wxFONTENCODING_UNICODE)
+        {
+            for (i = 0; i < 128; i++)  m_Table[128 + i] = (tchar)in_tbl[i];
+            return true;
+        }
+        else // output !Unicode
+        {
+            CharsetItem *rev = BuildReverseTable(out_tbl);
+            CharsetItem *item;
+            CharsetItem key;
+
+            for (i = 0; i < 128; i++)
+            {
+                key.u = in_tbl[i];
+                item = (CharsetItem*) bsearch(&key, rev, 128, sizeof(CharsetItem), CompareCharsetItems);
+                if (item == NULL && method == wxCONVERT_SUBSTITUTE)
+                    item = (CharsetItem*) bsearch(&key, encoding_unicode_fallback,
+                                encoding_unicode_fallback_count, sizeof(CharsetItem), CompareCharsetItems);
+                if (item)
+                    m_Table[128 + i] = (tchar)item -> c;
+                else
+#if wxUSE_WCHAR_T
+                    m_Table[128 + i] = (wchar_t)(128 + i);
+#else
+                    m_Table[128 + i] = (char)(128 + i);
+#endif
+            }
+
+            delete[] rev;
+        }
+    }
+
+    return true;
+}
+
+
+#define REPLACEMENT_CHAR  ((tchar)'?')
+
+inline tchar GetTableValue(const tchar *table, tchar value, bool& repl)
+{
+    tchar r = table[value];
+    if (r == 0 && value != 0)
+    {
+        r = REPLACEMENT_CHAR;
+        repl = true;
+    }
+    return r;
+}
+
+
+bool wxEncodingConverter::Convert(const char* input, char* output) const
+{
+    wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
+    wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
+
+    const char *i;
+    char *o;
+
+    if (m_JustCopy)
+    {
+        strcpy(output, input);
+        return true;
+    }
+
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;
+
+    for (i = input, o = output; *i != 0;)
+        *(o++) = (char)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
+    *o = 0;
+
+    return !replaced;
+}
+
+
+#if wxUSE_WCHAR_T
+
+bool wxEncodingConverter::Convert(const char* input, wchar_t* output) const
+{
+    wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
+    wxASSERT_MSG(!m_UnicodeInput, wxT("You cannot convert from unicode if input is const char*!"));
+
+    const char *i;
+    wchar_t *o;
+
+    if (m_JustCopy)
+    {
+        for (i = input, o = output; *i != 0;)
+            *(o++) = (wchar_t)(*(i++));
+        *o = 0;
+        return true;
+    }
+
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;
+
+    for (i = input, o = output; *i != 0;)
+        *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
+    *o = 0;
+
+    return !replaced;
+}
+
+
+
+bool wxEncodingConverter::Convert(const wchar_t* input, char* output) const
+{
+    wxASSERT_MSG(!m_UnicodeOutput, wxT("You cannot convert to unicode if output is const char*!"));
+    wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));
+
+    const wchar_t *i;
+    char *o;
+
+    if (m_JustCopy)
+    {
+        for (i = input, o = output; *i != 0;)
+            *(o++) = (char)(*(i++));
+        *o = 0;
+        return true;
+    }
+
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;
+
+    for (i = input, o = output; *i != 0;)
+        *(o++) = (char)(GetTableValue(m_Table, (wxUint16)*(i++), replaced));
+    *o = 0;
+
+    return !replaced;
+}
+
+
+
+bool wxEncodingConverter::Convert(const wchar_t* input, wchar_t* output) const
+{
+    wxASSERT_MSG(m_UnicodeOutput, wxT("You cannot convert to 8-bit if output is const wchar_t*!"));
+    wxASSERT_MSG(m_UnicodeInput, wxT("You cannot convert from 8-bit if input is const wchar_t*!"));
+
+    const wchar_t *i;
+    wchar_t *o;
+
+    if (m_JustCopy)
+    {
+        // wcscpy() is not guaranteed to exist
+        for (i = input, o = output; *i != 0;)
+            *(o++) = (*(i++));
+        *o = 0;
+        return true;
+    }
+
+    wxCHECK_MSG(m_Table != NULL, false,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    bool replaced = false;
+    
+    for (i = input, o = output; *i != 0;)
+        *(o++) = (wchar_t)(GetTableValue(m_Table, (wxUint8)*(i++), replaced));
+    *o = 0;
+
+    return !replaced;
+}
+
+#endif // wxUSE_WCHAR_T
+
+
+wxString wxEncodingConverter::Convert(const wxString& input) const
+{
+    if (m_JustCopy) return input;
+
+    wxString s;
+    const wxChar *i;
+
+    wxCHECK_MSG(m_Table != NULL, s,
+                wxT("You must call wxEncodingConverter::Init() before actually converting!"));
+
+    if (m_UnicodeInput)
+    {
+        for (i = input.c_str(); *i != 0; i++)
+            s << (wxChar)(m_Table[(wxUint16)*i]);
+    }
+    else
+    {
+        for (i = input.c_str(); *i != 0; i++)
+            s << (wxChar)(m_Table[(wxUint8)*i]);
+    }
+
+    return s;
+}
+
+
+
+
+
+
+
+// Following tables describe classes of encoding equivalence.
+//
+
+#define STOP wxFONTENCODING_SYSTEM
+
+#define NUM_OF_PLATFORMS  4 /*must conform to enum wxPLATFORM_XXXX !!!*/
+#define ENC_PER_PLATFORM  3
+           // max no. of encodings for one language used on one platform.
+           // Using maximum of everything at the current moment to not make the
+           // library larger than necessary. Make larger only if necessary - MR
+
+static const wxFontEncoding
+    EquivalentEncodings[][NUM_OF_PLATFORMS][ENC_PER_PLATFORM+1] = {
+
+    // *** Please put more common encodings as first! ***
+
+    // Western European
+    {
+        /* unix    */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
+        /* windows */ {wxFONTENCODING_CP1252, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {wxFONTENCODING_MACROMAN, STOP}
+    },
+
+    // Central European
+    {
+        /* unix    */ {wxFONTENCODING_ISO8859_2, STOP},
+        /* windows */ {wxFONTENCODING_CP1250, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {wxFONTENCODING_MACCENTRALEUR, STOP}
+    },
+
+    // Baltic
+    {
+        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP},
+        /* windows */ {wxFONTENCODING_CP1257, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {STOP}
+    },
+
+    // Hebrew
+    {
+        /* unix    */ {wxFONTENCODING_ISO8859_8, STOP},
+        /* windows */ {wxFONTENCODING_CP1255, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {wxFONTENCODING_MACHEBREW, STOP}
+    },
+
+    // Greek
+    {
+        /* unix    */ {wxFONTENCODING_ISO8859_7, STOP},
+        /* windows */ {wxFONTENCODING_CP1253, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {wxFONTENCODING_MACGREEK, STOP}
+    },
+
+    // Arabic
+    {
+        /* unix    */ {wxFONTENCODING_ISO8859_6, STOP},
+        /* windows */ {wxFONTENCODING_CP1256, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {wxFONTENCODING_MACARABIC, STOP}
+    },
+
+    // Turkish
+    {
+        /* unix    */ {wxFONTENCODING_ISO8859_9, STOP},
+        /* windows */ {wxFONTENCODING_CP1254, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {wxFONTENCODING_MACTURKISH, STOP}
+    },
+
+    // Cyrillic
+    {
+        /* unix    */ {wxFONTENCODING_KOI8, wxFONTENCODING_KOI8_U, wxFONTENCODING_ISO8859_5, STOP},
+        /* windows */ {wxFONTENCODING_CP1251, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {wxFONTENCODING_MACCYRILLIC, STOP}
+    },
+
+    {{STOP},{STOP},{STOP},{STOP}} /* Terminator */
+    /* no, _not_ Arnold! */
+};
+
+
+static bool FindEncoding(const wxFontEncodingArray& arr, wxFontEncoding f)
+{
+    for (wxFontEncodingArray::const_iterator it = arr.begin(), en = arr.end();
+         it != en; ++it)
+        if (*it == f)
+            return true;
+    return false;
+}
+
+wxFontEncodingArray wxEncodingConverter::GetPlatformEquivalents(wxFontEncoding enc, int platform)
+{
+    if (platform == wxPLATFORM_CURRENT)
+    {
+#if defined(__WXMSW__)
+        platform = wxPLATFORM_WINDOWS;
+#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+        platform = wxPLATFORM_UNIX;
+#elif defined(__WXPM__)
+        platform = wxPLATFORM_OS2;
+#elif defined(__WXMAC__)
+        platform = wxPLATFORM_MAC;
+#endif
+    }
+
+    int i, clas, e ;
+    const wxFontEncoding *f;
+    wxFontEncodingArray arr;
+
+    clas = 0;
+    while (EquivalentEncodings[clas][0][0] != STOP)
+    {
+        for (i = 0; i < NUM_OF_PLATFORMS; i++)
+            for (e = 0; EquivalentEncodings[clas][i][e] != STOP; e++)
+                if (EquivalentEncodings[clas][i][e] == enc)
+                {
+                    for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
+                        if (*f == enc) arr.push_back(enc);
+                    for (f = EquivalentEncodings[clas][platform]; *f != STOP; f++)
+                        if (!FindEncoding(arr, *f)) arr.push_back(*f);
+                    i = NUM_OF_PLATFORMS/*hack*/; break;
+                }
+        clas++;
+    }
+
+    return arr;
+}
+
+
+
+wxFontEncodingArray wxEncodingConverter::GetAllEquivalents(wxFontEncoding enc)
+{
+    int i, clas, e, j ;
+    const wxFontEncoding *f;
+    wxFontEncodingArray arr;
+
+    arr = GetPlatformEquivalents(enc); // we want them to be first items in array
+
+    clas = 0;
+    while (EquivalentEncodings[clas][0][0] != STOP)
+    {
+        for (i = 0; i < NUM_OF_PLATFORMS; i++)
+            for (e = 0; EquivalentEncodings[clas][i][e] != STOP; e++)
+                if (EquivalentEncodings[clas][i][e] == enc)
+                {
+                    for (j = 0; j < NUM_OF_PLATFORMS; j++)
+                        for (f = EquivalentEncodings[clas][j]; *f != STOP; f++)
+                            if (!FindEncoding(arr, *f)) arr.push_back(*f);
+                    i = NUM_OF_PLATFORMS/*hack*/; break;
+                }
+        clas++;
+    }
+
+    return arr;
+}
+
diff --git a/Source/3rd Party/wx/src/common/event.cpp b/Source/3rd Party/wx/src/common/event.cpp
index de8d0af94..934456c80 100644
--- a/Source/3rd Party/wx/src/common/event.cpp	
+++ b/Source/3rd Party/wx/src/common/event.cpp	
@@ -1,1825 +1,1499 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/event.cpp
-// Purpose:     Event classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/event.h"
-#include "wx/eventfilter.h"
-#include "wx/evtloop.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/list.h"
-    #include "wx/log.h"
-    #include "wx/app.h"
-    #include "wx/utils.h"
-    #include "wx/stopwatch.h"
-    #include "wx/module.h"
-
-    #if wxUSE_GUI
-        #include "wx/window.h"
-        #include "wx/control.h"
-        #include "wx/dc.h"
-        #include "wx/spinbutt.h"
-        #include "wx/textctrl.h"
-        #include "wx/validate.h"
-    #endif // wxUSE_GUI
-#endif
-
-#include "wx/thread.h"
-
-#if wxUSE_BASE
-    #include "wx/scopedptr.h"
-
-    wxDECLARE_SCOPED_PTR(wxEvent, wxEventPtr)
-    wxDEFINE_SCOPED_PTR(wxEvent, wxEventPtr)
-#endif // wxUSE_BASE
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-#if wxUSE_BASE
-    IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
-    IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxThreadEvent, wxEvent)
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-    IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxNcPaintEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxChildFocusEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxSetCursorEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxDisplayChangedEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureChangedEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureLostEvent, wxEvent)
-    IMPLEMENT_DYNAMIC_CLASS(wxClipboardTextEvent, wxCommandEvent)
-#endif // wxUSE_GUI
-
-#if wxUSE_BASE
-
-const wxEventTable *wxEvtHandler::GetEventTable() const
-    { return &wxEvtHandler::sm_eventTable; }
-
-const wxEventTable wxEvtHandler::sm_eventTable =
-    { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
-
-wxEventHashTable &wxEvtHandler::GetEventHashTable() const
-    { return wxEvtHandler::sm_eventHashTable; }
-
-wxEventHashTable wxEvtHandler::sm_eventHashTable(wxEvtHandler::sm_eventTable);
-
-const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
-    { wxDECLARE_EVENT_TABLE_TERMINATOR() };
-
-
-// wxUSE_MEMORY_TRACING considers memory freed from the static objects dtors
-// leaked, so we need to manually clean up all event tables before checking for
-// the memory leaks when using it, however this breaks re-initializing the
-// library (i.e. repeated calls to wxInitialize/wxUninitialize) because the
-// event tables won't be rebuilt the next time, so disable this by default
-#if wxUSE_MEMORY_TRACING
-
-class wxEventTableEntryModule: public wxModule
-{
-public:
-    wxEventTableEntryModule() { }
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxEventHashTable::ClearAll(); }
-
-    DECLARE_DYNAMIC_CLASS(wxEventTableEntryModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule)
-
-#endif // wxUSE_MEMORY_TRACING
-
-// ----------------------------------------------------------------------------
-// global variables
-// ----------------------------------------------------------------------------
-
-// common event types are defined here, other event types are defined by the
-// components which use them
-
-const wxEventType wxEVT_FIRST = 10000;
-const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
-const wxEventType wxEVT_NULL = wxNewEventType();
-
-wxDEFINE_EVENT( wxEVT_IDLE, wxIdleEvent );
-
-// Thread event
-wxDEFINE_EVENT( wxEVT_THREAD, wxThreadEvent );
-
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
-wxDEFINE_EVENT( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SCROLLBAR_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_VLBOX_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOL_RCLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOL_ENTER, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_COMBOBOX_DROPDOWN, wxCommandEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_COMBOBOX_CLOSEUP, wxCommandEvent);
-
-// Mouse event types
-wxDEFINE_EVENT( wxEVT_LEFT_DOWN, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_LEFT_UP, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_MIDDLE_DOWN, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_MIDDLE_UP, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_RIGHT_DOWN, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_RIGHT_UP, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_MOTION, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_ENTER_WINDOW, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_LEAVE_WINDOW, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_LEFT_DCLICK, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_MIDDLE_DCLICK, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_RIGHT_DCLICK, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_SET_FOCUS, wxFocusEvent );
-wxDEFINE_EVENT( wxEVT_KILL_FOCUS, wxFocusEvent );
-wxDEFINE_EVENT( wxEVT_CHILD_FOCUS, wxChildFocusEvent );
-wxDEFINE_EVENT( wxEVT_MOUSEWHEEL, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_AUX1_DOWN, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_AUX1_UP, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_AUX1_DCLICK, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_AUX2_DOWN, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_AUX2_UP, wxMouseEvent );
-wxDEFINE_EVENT( wxEVT_AUX2_DCLICK, wxMouseEvent );
-
-// Character input event type
-wxDEFINE_EVENT( wxEVT_CHAR, wxKeyEvent );
-wxDEFINE_EVENT( wxEVT_AFTER_CHAR, wxKeyEvent );
-wxDEFINE_EVENT( wxEVT_CHAR_HOOK, wxKeyEvent );
-wxDEFINE_EVENT( wxEVT_NAVIGATION_KEY, wxNavigationKeyEvent );
-wxDEFINE_EVENT( wxEVT_KEY_DOWN, wxKeyEvent );
-wxDEFINE_EVENT( wxEVT_KEY_UP, wxKeyEvent );
-#if wxUSE_HOTKEY
-wxDEFINE_EVENT( wxEVT_HOTKEY, wxKeyEvent );
-#endif
-
-// Set cursor event
-wxDEFINE_EVENT( wxEVT_SET_CURSOR, wxSetCursorEvent );
-
-// wxScrollbar and wxSlider event identifiers
-wxDEFINE_EVENT( wxEVT_SCROLL_TOP, wxScrollEvent );
-wxDEFINE_EVENT( wxEVT_SCROLL_BOTTOM, wxScrollEvent );
-wxDEFINE_EVENT( wxEVT_SCROLL_LINEUP, wxScrollEvent );
-wxDEFINE_EVENT( wxEVT_SCROLL_LINEDOWN, wxScrollEvent );
-wxDEFINE_EVENT( wxEVT_SCROLL_PAGEUP, wxScrollEvent );
-wxDEFINE_EVENT( wxEVT_SCROLL_PAGEDOWN, wxScrollEvent );
-wxDEFINE_EVENT( wxEVT_SCROLL_THUMBTRACK, wxScrollEvent );
-wxDEFINE_EVENT( wxEVT_SCROLL_THUMBRELEASE, wxScrollEvent );
-wxDEFINE_EVENT( wxEVT_SCROLL_CHANGED, wxScrollEvent );
-
-// Due to a bug in older wx versions, wxSpinEvents were being sent with type of
-// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But
-// with the type-safe events in place, these event types are associated with
-// wxScrollEvent. To allow handling of spin events, new event types have been
-// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility
-// the spin event types are being initialized with the scroll event types.
-
-#if wxUSE_SPINBTN
-
-wxDEFINE_EVENT_ALIAS( wxEVT_SPIN_UP,   wxSpinEvent, wxEVT_SCROLL_LINEUP );
-wxDEFINE_EVENT_ALIAS( wxEVT_SPIN_DOWN, wxSpinEvent, wxEVT_SCROLL_LINEDOWN );
-wxDEFINE_EVENT_ALIAS( wxEVT_SPIN,      wxSpinEvent, wxEVT_SCROLL_THUMBTRACK );
-
-#endif // wxUSE_SPINBTN
-
-// Scroll events from wxWindow
-wxDEFINE_EVENT( wxEVT_SCROLLWIN_TOP, wxScrollWinEvent );
-wxDEFINE_EVENT( wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEvent );
-wxDEFINE_EVENT( wxEVT_SCROLLWIN_LINEUP, wxScrollWinEvent );
-wxDEFINE_EVENT( wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEvent );
-wxDEFINE_EVENT( wxEVT_SCROLLWIN_PAGEUP, wxScrollWinEvent );
-wxDEFINE_EVENT( wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEvent );
-wxDEFINE_EVENT( wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEvent );
-wxDEFINE_EVENT( wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEvent );
-
-// System events
-wxDEFINE_EVENT( wxEVT_SIZE, wxSizeEvent );
-wxDEFINE_EVENT( wxEVT_SIZING, wxSizeEvent );
-wxDEFINE_EVENT( wxEVT_MOVE, wxMoveEvent );
-wxDEFINE_EVENT( wxEVT_MOVING, wxMoveEvent );
-wxDEFINE_EVENT( wxEVT_MOVE_START, wxMoveEvent );
-wxDEFINE_EVENT( wxEVT_MOVE_END, wxMoveEvent );
-wxDEFINE_EVENT( wxEVT_CLOSE_WINDOW, wxCloseEvent );
-wxDEFINE_EVENT( wxEVT_END_SESSION, wxCloseEvent );
-wxDEFINE_EVENT( wxEVT_QUERY_END_SESSION, wxCloseEvent );
-wxDEFINE_EVENT( wxEVT_HIBERNATE, wxActivateEvent );
-wxDEFINE_EVENT( wxEVT_ACTIVATE_APP, wxActivateEvent );
-wxDEFINE_EVENT( wxEVT_ACTIVATE, wxActivateEvent );
-wxDEFINE_EVENT( wxEVT_CREATE, wxWindowCreateEvent );
-wxDEFINE_EVENT( wxEVT_DESTROY, wxWindowDestroyEvent );
-wxDEFINE_EVENT( wxEVT_SHOW, wxShowEvent );
-wxDEFINE_EVENT( wxEVT_ICONIZE, wxIconizeEvent );
-wxDEFINE_EVENT( wxEVT_MAXIMIZE, wxMaximizeEvent );
-wxDEFINE_EVENT( wxEVT_MOUSE_CAPTURE_CHANGED, wxMouseCaptureChangedEvent );
-wxDEFINE_EVENT( wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEvent );
-wxDEFINE_EVENT( wxEVT_PAINT, wxPaintEvent );
-wxDEFINE_EVENT( wxEVT_ERASE_BACKGROUND, wxEraseEvent );
-wxDEFINE_EVENT( wxEVT_NC_PAINT, wxNcPaintEvent );
-wxDEFINE_EVENT( wxEVT_MENU_OPEN, wxMenuEvent );
-wxDEFINE_EVENT( wxEVT_MENU_CLOSE, wxMenuEvent );
-wxDEFINE_EVENT( wxEVT_MENU_HIGHLIGHT, wxMenuEvent );
-wxDEFINE_EVENT( wxEVT_CONTEXT_MENU, wxContextMenuEvent );
-wxDEFINE_EVENT( wxEVT_SYS_COLOUR_CHANGED, wxSysColourChangedEvent );
-wxDEFINE_EVENT( wxEVT_DISPLAY_CHANGED, wxDisplayChangedEvent );
-wxDEFINE_EVENT( wxEVT_QUERY_NEW_PALETTE, wxQueryNewPaletteEvent );
-wxDEFINE_EVENT( wxEVT_PALETTE_CHANGED, wxPaletteChangedEvent );
-wxDEFINE_EVENT( wxEVT_JOY_BUTTON_DOWN, wxJoystickEvent );
-wxDEFINE_EVENT( wxEVT_JOY_BUTTON_UP, wxJoystickEvent );
-wxDEFINE_EVENT( wxEVT_JOY_MOVE, wxJoystickEvent );
-wxDEFINE_EVENT( wxEVT_JOY_ZMOVE, wxJoystickEvent );
-wxDEFINE_EVENT( wxEVT_DROP_FILES, wxDropFilesEvent );
-wxDEFINE_EVENT( wxEVT_INIT_DIALOG, wxInitDialogEvent );
-wxDEFINE_EVENT( wxEVT_UPDATE_UI, wxUpdateUIEvent );
-
-// Clipboard events
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_COPY, wxClipboardTextEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_CUT, wxClipboardTextEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_PASTE, wxClipboardTextEvent );
-
-// Generic command events
-// Note: a click is a higher-level event than button down/up
-wxDEFINE_EVENT( wxEVT_COMMAND_LEFT_CLICK, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LEFT_DCLICK, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_RIGHT_CLICK, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_RIGHT_DCLICK, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SET_FOCUS, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_KILL_FOCUS, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_ENTER, wxCommandEvent );
-
-// Help events
-wxDEFINE_EVENT( wxEVT_HELP, wxHelpEvent );
-wxDEFINE_EVENT( wxEVT_DETAILED_HELP, wxHelpEvent );
-
-#endif // wxUSE_GUI
-
-#if wxUSE_BASE
-
-wxIdleMode wxIdleEvent::sm_idleMode = wxIDLE_PROCESS_ALL;
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// event initialization
-// ----------------------------------------------------------------------------
-
-int wxNewEventType()
-{
-    // MT-FIXME
-    static int s_lastUsedEventType = wxEVT_FIRST;
-
-    return s_lastUsedEventType++;
-}
-// ----------------------------------------------------------------------------
-// wxEventFunctor
-// ----------------------------------------------------------------------------
-
-wxEventFunctor::~wxEventFunctor()
-{
-}
-
-// ----------------------------------------------------------------------------
-// wxEvent
-// ----------------------------------------------------------------------------
-
-/*
- * General wxWidgets events, covering all interesting things that might happen
- * (button clicking, resizing, setting text in widgets, etc.).
- *
- * For each completely new event type, derive a new event class.
- *
- */
-
-wxEvent::wxEvent(int theId, wxEventType commandType)
-{
-    m_eventType = commandType;
-    m_eventObject = NULL;
-    m_timeStamp = 0;
-    m_id = theId;
-    m_skipped = false;
-    m_callbackUserData = NULL;
-    m_handlerToProcessOnlyIn = NULL;
-    m_isCommandEvent = false;
-    m_propagationLevel = wxEVENT_PROPAGATE_NONE;
-    m_wasProcessed = false;
-}
-
-wxEvent::wxEvent(const wxEvent& src)
-    : wxObject(src)
-    , m_eventObject(src.m_eventObject)
-    , m_eventType(src.m_eventType)
-    , m_timeStamp(src.m_timeStamp)
-    , m_id(src.m_id)
-    , m_callbackUserData(src.m_callbackUserData)
-    , m_handlerToProcessOnlyIn(NULL)
-    , m_propagationLevel(src.m_propagationLevel)
-    , m_skipped(src.m_skipped)
-    , m_isCommandEvent(src.m_isCommandEvent)
-    , m_wasProcessed(false)
-{
-}
-
-wxEvent& wxEvent::operator=(const wxEvent& src)
-{
-    wxObject::operator=(src);
-
-    m_eventObject = src.m_eventObject;
-    m_eventType = src.m_eventType;
-    m_timeStamp = src.m_timeStamp;
-    m_id = src.m_id;
-    m_callbackUserData = src.m_callbackUserData;
-    m_handlerToProcessOnlyIn = NULL;
-    m_propagationLevel = src.m_propagationLevel;
-    m_skipped = src.m_skipped;
-    m_isCommandEvent = src.m_isCommandEvent;
-
-    // don't change m_wasProcessed
-
-    return *this;
-}
-
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// wxCommandEvent
-// ----------------------------------------------------------------------------
-
-wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
-              : wxEvent(theId, commandType)
-{
-    m_clientData = NULL;
-    m_clientObject = NULL;
-    m_isCommandEvent = true;
-
-    // the command events are propagated upwards by default
-    m_propagationLevel = wxEVENT_PROPAGATE_MAX;
-}
-
-wxString wxCommandEvent::GetString() const
-{
-    if (m_eventType != wxEVT_COMMAND_TEXT_UPDATED || !m_eventObject)
-    {
-        return m_cmdString;
-    }
-    else
-    {
-#if wxUSE_TEXTCTRL
-        wxTextCtrl *txt = wxDynamicCast(m_eventObject, wxTextCtrl);
-        if ( txt )
-            return txt->GetValue();
-        else
-#endif // wxUSE_TEXTCTRL
-            return m_cmdString;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxUpdateUIEvent
-// ----------------------------------------------------------------------------
-
-#if wxUSE_LONGLONG
-wxLongLong wxUpdateUIEvent::sm_lastUpdate = 0;
-#endif
-
-long wxUpdateUIEvent::sm_updateInterval = 0;
-
-wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL;
-
-// Can we update?
-bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win)
-{
-    // Don't update if we've switched global updating off
-    // and this window doesn't support updates.
-    if (win &&
-       (GetMode() == wxUPDATE_UI_PROCESS_SPECIFIED &&
-       ((win->GetExtraStyle() & wxWS_EX_PROCESS_UI_UPDATES) == 0)))
-        return false;
-
-    // Don't update children of the hidden windows: this is useless as any
-    // change to their state won't be seen by the user anyhow. Notice that this
-    // argument doesn't apply to the hidden windows (with visible parent)
-    // themselves as they could be shown by their EVT_UPDATE_UI handler.
-    if ( win->GetParent() && !win->GetParent()->IsShownOnScreen() )
-        return false;
-
-    if (sm_updateInterval == -1)
-        return false;
-
-    if (sm_updateInterval == 0)
-        return true;
-
-#if wxUSE_STOPWATCH && wxUSE_LONGLONG
-    wxLongLong now = wxGetLocalTimeMillis();
-    if (now > (sm_lastUpdate + sm_updateInterval))
-    {
-        return true;
-    }
-
-    return false;
-#else
-    // If we don't have wxStopWatch or wxLongLong, we
-    // should err on the safe side and update now anyway.
-    return true;
-#endif
-}
-
-// Reset the update time to provide a delay until the next
-// time we should update
-void wxUpdateUIEvent::ResetUpdateTime()
-{
-#if wxUSE_STOPWATCH && wxUSE_LONGLONG
-    if (sm_updateInterval > 0)
-    {
-        wxLongLong now = wxGetLocalTimeMillis();
-        if (now > (sm_lastUpdate + sm_updateInterval))
-        {
-            sm_lastUpdate = now;
-        }
-    }
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// wxScrollEvent
-// ----------------------------------------------------------------------------
-
-wxScrollEvent::wxScrollEvent(wxEventType commandType,
-                             int id,
-                             int pos,
-                             int orient)
-    : wxCommandEvent(commandType, id)
-{
-    m_extraLong = orient;
-    m_commandInt = pos;
-}
-
-// ----------------------------------------------------------------------------
-// wxScrollWinEvent
-// ----------------------------------------------------------------------------
-
-wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
-                                   int pos,
-                                   int orient)
-{
-    m_eventType = commandType;
-    m_extraLong = orient;
-    m_commandInt = pos;
-}
-
-// ----------------------------------------------------------------------------
-// wxMouseEvent
-// ----------------------------------------------------------------------------
-
-wxMouseEvent::wxMouseEvent(wxEventType commandType)
-{
-    m_eventType = commandType;
-
-    m_x = 0;
-    m_y = 0;
-
-    m_leftDown = false;
-    m_middleDown = false;
-    m_rightDown = false;
-    m_aux1Down = false;
-    m_aux2Down = false;
-
-    m_clickCount = -1;
-
-    m_wheelAxis = wxMOUSE_WHEEL_VERTICAL;
-    m_wheelRotation = 0;
-    m_wheelDelta = 0;
-    m_linesPerAction = 0;
-}
-
-void wxMouseEvent::Assign(const wxMouseEvent& event)
-{
-    wxEvent::operator=(event);
-
-    // Borland C++ 5.82 doesn't compile an explicit call to an implicitly
-    // defined operator=() so need to do it this way:
-    *static_cast<wxMouseState *>(this) = event;
-
-    m_x = event.m_x;
-    m_y = event.m_y;
-
-    m_leftDown = event.m_leftDown;
-    m_middleDown = event.m_middleDown;
-    m_rightDown = event.m_rightDown;
-    m_aux1Down = event.m_aux1Down;
-    m_aux2Down = event.m_aux2Down;
-
-    m_wheelRotation = event.m_wheelRotation;
-    m_wheelDelta = event.m_wheelDelta;
-    m_linesPerAction = event.m_linesPerAction;
-    m_wheelAxis = event.m_wheelAxis;
-}
-
-// return true if was a button dclick event
-bool wxMouseEvent::ButtonDClick(int but) const
-{
-    switch (but)
-    {
-        default:
-            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick"));
-            // fall through
-
-        case wxMOUSE_BTN_ANY:
-            return (LeftDClick() || MiddleDClick() || RightDClick() ||
-                    Aux1DClick() || Aux2DClick());
-
-        case wxMOUSE_BTN_LEFT:
-            return LeftDClick();
-
-        case wxMOUSE_BTN_MIDDLE:
-            return MiddleDClick();
-
-        case wxMOUSE_BTN_RIGHT:
-            return RightDClick();
-
-        case wxMOUSE_BTN_AUX1:
-            return Aux1DClick();
-
-        case wxMOUSE_BTN_AUX2:
-            return Aux2DClick();
-    }
-}
-
-// return true if was a button down event
-bool wxMouseEvent::ButtonDown(int but) const
-{
-    switch (but)
-    {
-        default:
-            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown"));
-            // fall through
-
-        case wxMOUSE_BTN_ANY:
-            return (LeftDown() || MiddleDown() || RightDown() ||
-                    Aux1Down() || Aux2Down());
-
-        case wxMOUSE_BTN_LEFT:
-            return LeftDown();
-
-        case wxMOUSE_BTN_MIDDLE:
-            return MiddleDown();
-
-        case wxMOUSE_BTN_RIGHT:
-            return RightDown();
-
-        case wxMOUSE_BTN_AUX1:
-            return Aux1Down();
-
-        case wxMOUSE_BTN_AUX2:
-            return Aux2Down();
-    }
-}
-
-// return true if was a button up event
-bool wxMouseEvent::ButtonUp(int but) const
-{
-    switch (but)
-    {
-        default:
-            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp"));
-            // fall through
-
-        case wxMOUSE_BTN_ANY:
-            return (LeftUp() || MiddleUp() || RightUp() ||
-                    Aux1Up() || Aux2Up());
-
-        case wxMOUSE_BTN_LEFT:
-            return LeftUp();
-
-        case wxMOUSE_BTN_MIDDLE:
-            return MiddleUp();
-
-        case wxMOUSE_BTN_RIGHT:
-            return RightUp();
-
-        case wxMOUSE_BTN_AUX1:
-            return Aux1Up();
-
-        case wxMOUSE_BTN_AUX2:
-            return Aux2Up();
-    }
-}
-
-// return true if the given button is currently changing state
-bool wxMouseEvent::Button(int but) const
-{
-    switch (but)
-    {
-        default:
-            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button"));
-            // fall through
-
-        case wxMOUSE_BTN_ANY:
-            return ButtonUp(wxMOUSE_BTN_ANY) ||
-                    ButtonDown(wxMOUSE_BTN_ANY) ||
-                        ButtonDClick(wxMOUSE_BTN_ANY);
-
-        case wxMOUSE_BTN_LEFT:
-            return LeftDown() || LeftUp() || LeftDClick();
-
-        case wxMOUSE_BTN_MIDDLE:
-            return MiddleDown() || MiddleUp() || MiddleDClick();
-
-        case wxMOUSE_BTN_RIGHT:
-            return RightDown() || RightUp() || RightDClick();
-
-        case wxMOUSE_BTN_AUX1:
-           return Aux1Down() || Aux1Up() || Aux1DClick();
-
-        case wxMOUSE_BTN_AUX2:
-           return Aux2Down() || Aux2Up() || Aux2DClick();
-    }
-}
-
-int wxMouseEvent::GetButton() const
-{
-    for ( int i = 1; i < wxMOUSE_BTN_MAX; i++ )
-    {
-        if ( Button(i) )
-        {
-            return i;
-        }
-    }
-
-    return wxMOUSE_BTN_NONE;
-}
-
-// Find the logical position of the event given the DC
-wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const
-{
-    wxPoint pt(dc.DeviceToLogicalX(m_x), dc.DeviceToLogicalY(m_y));
-    return pt;
-}
-
-// ----------------------------------------------------------------------------
-// wxKeyEvent
-// ----------------------------------------------------------------------------
-
-wxKeyEvent::wxKeyEvent(wxEventType type)
-{
-    m_eventType = type;
-    m_keyCode = WXK_NONE;
-#if wxUSE_UNICODE
-    m_uniChar = WXK_NONE;
-#endif
-
-    InitPropagation();
-}
-
-wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt)
-          : wxEvent(evt),
-            wxKeyboardState(evt)
-{
-    DoAssignMembers(evt);
-
-    InitPropagation();
-}
-
-wxKeyEvent::wxKeyEvent(wxEventType eventType, const wxKeyEvent& evt)
-          : wxEvent(evt),
-            wxKeyboardState(evt)
-{
-    DoAssignMembers(evt);
-
-    m_eventType = eventType;
-
-    InitPropagation();
-}
-
-bool wxKeyEvent::IsKeyInCategory(int category) const
-{
-    switch ( GetKeyCode() )
-    {
-        case WXK_LEFT:
-        case WXK_RIGHT:
-        case WXK_UP:
-        case WXK_DOWN:
-        case WXK_NUMPAD_LEFT:
-        case WXK_NUMPAD_RIGHT:
-        case WXK_NUMPAD_UP:
-        case WXK_NUMPAD_DOWN:
-            return (category & WXK_CATEGORY_ARROW) != 0;
-
-        case WXK_PAGEDOWN:
-        case WXK_END:
-        case WXK_NUMPAD_PAGEUP:
-        case WXK_NUMPAD_PAGEDOWN:
-            return (category & WXK_CATEGORY_PAGING) != 0;
-
-        case WXK_HOME:
-        case WXK_PAGEUP:
-        case WXK_NUMPAD_HOME:
-        case WXK_NUMPAD_END:
-            return (category & WXK_CATEGORY_JUMP) != 0;
-
-        case WXK_TAB:
-        case WXK_NUMPAD_TAB:
-            return (category & WXK_CATEGORY_TAB) != 0;
-
-        case WXK_BACK:
-        case WXK_DELETE:
-        case WXK_NUMPAD_DELETE:
-            return (category & WXK_CATEGORY_CUT) != 0;
-
-        default:
-            return false;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxWindowCreateEvent
-// ----------------------------------------------------------------------------
-
-wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
-{
-    SetEventType(wxEVT_CREATE);
-    SetEventObject(win);
-}
-
-// ----------------------------------------------------------------------------
-// wxWindowDestroyEvent
-// ----------------------------------------------------------------------------
-
-wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
-{
-    SetEventType(wxEVT_DESTROY);
-    SetEventObject(win);
-}
-
-// ----------------------------------------------------------------------------
-// wxChildFocusEvent
-// ----------------------------------------------------------------------------
-
-wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
-                 : wxCommandEvent(wxEVT_CHILD_FOCUS)
-{
-    SetEventObject(win);
-}
-
-// ----------------------------------------------------------------------------
-// wxHelpEvent
-// ----------------------------------------------------------------------------
-
-/* static */
-wxHelpEvent::Origin wxHelpEvent::GuessOrigin(Origin origin)
-{
-    if ( origin == Origin_Unknown )
-    {
-        // assume that the event comes from the help button if it's not from
-        // keyboard and that pressing F1 always results in the help event
-        origin = wxGetKeyState(WXK_F1) ? Origin_Keyboard : Origin_HelpButton;
-    }
-
-    return origin;
-}
-
-#endif // wxUSE_GUI
-
-
-#if wxUSE_BASE
-
-// ----------------------------------------------------------------------------
-// wxEventHashTable
-// ----------------------------------------------------------------------------
-
-static const int EVENT_TYPE_TABLE_INIT_SIZE = 31; // Not too big not too small...
-
-wxEventHashTable* wxEventHashTable::sm_first = NULL;
-
-wxEventHashTable::wxEventHashTable(const wxEventTable &table)
-                : m_table(table),
-                  m_rebuildHash(true)
-{
-    AllocEventTypeTable(EVENT_TYPE_TABLE_INIT_SIZE);
-
-    m_next = sm_first;
-    if (m_next)
-        m_next->m_previous = this;
-    sm_first = this;
-}
-
-wxEventHashTable::~wxEventHashTable()
-{
-    if (m_next)
-        m_next->m_previous = m_previous;
-    if (m_previous)
-        m_previous->m_next = m_next;
-    if (sm_first == this)
-        sm_first = m_next;
-
-    Clear();
-}
-
-void wxEventHashTable::Clear()
-{
-    for ( size_t i = 0; i < m_size; i++ )
-    {
-        EventTypeTablePointer  eTTnode = m_eventTypeTable[i];
-        delete eTTnode;
-    }
-
-    wxDELETEA(m_eventTypeTable);
-
-    m_size = 0;
-}
-
-#if wxUSE_MEMORY_TRACING
-
-// Clear all tables
-void wxEventHashTable::ClearAll()
-{
-    wxEventHashTable* table = sm_first;
-    while (table)
-    {
-        table->Clear();
-        table = table->m_next;
-    }
-}
-
-#endif // wxUSE_MEMORY_TRACING
-
-bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self)
-{
-    if (m_rebuildHash)
-    {
-        InitHashTable();
-        m_rebuildHash = false;
-    }
-
-    if (!m_eventTypeTable)
-        return false;
-
-    // Find all entries for the given event type.
-    wxEventType eventType = event.GetEventType();
-    const EventTypeTablePointer eTTnode = m_eventTypeTable[eventType % m_size];
-    if (eTTnode && eTTnode->eventType == eventType)
-    {
-        // Now start the search for an event handler
-        // that can handle an event with the given ID.
-        const wxEventTableEntryPointerArray&
-            eventEntryTable = eTTnode->eventEntryTable;
-
-        const size_t count = eventEntryTable.GetCount();
-        for (size_t n = 0; n < count; n++)
-        {
-            const wxEventTableEntry& entry = *eventEntryTable[n];
-            if ( wxEvtHandler::ProcessEventIfMatchesId(entry, self, event) )
-                return true;
-        }
-    }
-
-    return false;
-}
-
-void wxEventHashTable::InitHashTable()
-{
-    // Loop over the event tables and all its base tables.
-    const wxEventTable *table = &m_table;
-    while (table)
-    {
-        // Retrieve all valid event handler entries
-        const wxEventTableEntry *entry = table->entries;
-        while (entry->m_fn != 0)
-        {
-            // Add the event entry in the Hash.
-            AddEntry(*entry);
-
-            entry++;
-        }
-
-        table = table->baseTable;
-    }
-
-    // Let's free some memory.
-    size_t i;
-    for(i = 0; i < m_size; i++)
-    {
-        EventTypeTablePointer  eTTnode = m_eventTypeTable[i];
-        if (eTTnode)
-        {
-            eTTnode->eventEntryTable.Shrink();
-        }
-    }
-}
-
-void wxEventHashTable::AddEntry(const wxEventTableEntry &entry)
-{
-    // This might happen 'accidentally' as the app is exiting
-    if (!m_eventTypeTable)
-        return;
-
-    EventTypeTablePointer *peTTnode = &m_eventTypeTable[entry.m_eventType % m_size];
-    EventTypeTablePointer  eTTnode = *peTTnode;
-
-    if (eTTnode)
-    {
-        if (eTTnode->eventType != entry.m_eventType)
-        {
-            // Resize the table!
-            GrowEventTypeTable();
-            // Try again to add it.
-            AddEntry(entry);
-            return;
-        }
-    }
-    else
-    {
-        eTTnode = new EventTypeTable;
-        eTTnode->eventType = entry.m_eventType;
-        *peTTnode = eTTnode;
-    }
-
-    // Fill all hash entries between entry.m_id and entry.m_lastId...
-    eTTnode->eventEntryTable.Add(&entry);
-}
-
-void wxEventHashTable::AllocEventTypeTable(size_t size)
-{
-    m_eventTypeTable = new EventTypeTablePointer[size];
-    memset((void *)m_eventTypeTable, 0, sizeof(EventTypeTablePointer)*size);
-    m_size = size;
-}
-
-void wxEventHashTable::GrowEventTypeTable()
-{
-    size_t oldSize = m_size;
-    EventTypeTablePointer *oldEventTypeTable = m_eventTypeTable;
-
-    // TODO: Search the most optimal grow sequence
-    AllocEventTypeTable(/* GetNextPrime(oldSize) */oldSize*2+1);
-
-    for ( size_t i = 0; i < oldSize; /* */ )
-    {
-        EventTypeTablePointer  eTToldNode = oldEventTypeTable[i];
-        if (eTToldNode)
-        {
-            EventTypeTablePointer *peTTnode = &m_eventTypeTable[eTToldNode->eventType % m_size];
-            EventTypeTablePointer  eTTnode = *peTTnode;
-
-            // Check for collision, we don't want any.
-            if (eTTnode)
-            {
-                GrowEventTypeTable();
-                continue; // Don't increment the counter,
-                          // as we still need to add this element.
-            }
-            else
-            {
-                // Get the old value and put it in the new table.
-                *peTTnode = oldEventTypeTable[i];
-            }
-        }
-
-        i++;
-    }
-
-    delete[] oldEventTypeTable;
-}
-
-// ----------------------------------------------------------------------------
-// wxEvtHandler
-// ----------------------------------------------------------------------------
-
-wxEvtHandler::wxEvtHandler()
-{
-    m_nextHandler = NULL;
-    m_previousHandler = NULL;
-    m_enabled = true;
-    m_dynamicEvents = NULL;
-    m_pendingEvents = NULL;
-
-    // no client data (yet)
-    m_clientData = NULL;
-    m_clientDataType = wxClientData_None;
-}
-
-wxEvtHandler::~wxEvtHandler()
-{
-    Unlink();
-
-    if (m_dynamicEvents)
-    {
-        for ( wxList::iterator it = m_dynamicEvents->begin(),
-                               end = m_dynamicEvents->end();
-              it != end;
-              ++it )
-        {
-            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it;
-
-            // Remove ourselves from sink destructor notifications
-            // (this has usually been done, in wxTrackable destructor)
-            wxEvtHandler *eventSink = entry->m_fn->GetEvtHandler();
-            if ( eventSink )
-            {
-                wxEventConnectionRef * const
-                    evtConnRef = FindRefInTrackerList(eventSink);
-                if ( evtConnRef )
-                {
-                    eventSink->RemoveNode(evtConnRef);
-                    delete evtConnRef;
-                }
-            }
-
-            delete entry->m_callbackUserData;
-            delete entry;
-        }
-        delete m_dynamicEvents;
-    }
-
-    // Remove us from the list of the pending events if necessary.
-    if (wxTheApp)
-        wxTheApp->RemovePendingEventHandler(this);
-
-    DeletePendingEvents();
-
-    // we only delete object data, not untyped
-    if ( m_clientDataType == wxClientData_Object )
-        delete m_clientObject;
-}
-
-void wxEvtHandler::Unlink()
-{
-    // this event handler must take itself out of the chain of handlers:
-
-    if (m_previousHandler)
-        m_previousHandler->SetNextHandler(m_nextHandler);
-
-    if (m_nextHandler)
-        m_nextHandler->SetPreviousHandler(m_previousHandler);
-
-    m_nextHandler = NULL;
-    m_previousHandler = NULL;
-}
-
-bool wxEvtHandler::IsUnlinked() const
-{
-    return m_previousHandler == NULL &&
-           m_nextHandler == NULL;
-}
-
-wxEventFilter* wxEvtHandler::ms_filterList = NULL;
-
-/* static */ void wxEvtHandler::AddFilter(wxEventFilter* filter)
-{
-    wxCHECK_RET( filter, "NULL filter" );
-
-    filter->m_next = ms_filterList;
-    ms_filterList = filter;
-}
-
-/* static */ void wxEvtHandler::RemoveFilter(wxEventFilter* filter)
-{
-    wxEventFilter* prev = NULL;
-    for ( wxEventFilter* f = ms_filterList; f; f = f->m_next )
-    {
-        if ( f == filter )
-        {
-            // Set the previous list element or the list head to the next
-            // element.
-            if ( prev )
-                prev->m_next = f->m_next;
-            else
-                ms_filterList = f->m_next;
-
-            // Also reset the next pointer in the filter itself just to avoid
-            // having possibly dangling pointers, even though it's not strictly
-            // necessary.
-            f->m_next = NULL;
-
-            // Skip the assert below.
-            return;
-        }
-
-        prev = f;
-    }
-
-    wxFAIL_MSG( "Filter not found" );
-}
-
-#if wxUSE_THREADS
-
-bool wxEvtHandler::ProcessThreadEvent(const wxEvent& event)
-{
-    // check that we are really in a child thread
-    wxASSERT_MSG( !wxThread::IsMain(),
-                  wxT("use ProcessEvent() in main thread") );
-
-    AddPendingEvent(event);
-
-    return true;
-}
-
-#endif // wxUSE_THREADS
-
-void wxEvtHandler::QueueEvent(wxEvent *event)
-{
-    wxCHECK_RET( event, "NULL event can't be posted" );
-
-    if (!wxTheApp)
-    {
-        // we need an event loop which manages the list of event handlers with
-        // pending events... cannot proceed without it!
-        wxLogDebug("No application object! Cannot queue this event!");
-
-        // anyway delete the given event to avoid memory leaks
-        delete event;
-
-        return;
-    }
-
-    // 1) Add this event to our list of pending events
-    wxENTER_CRIT_SECT( m_pendingEventsLock );
-
-    if ( !m_pendingEvents )
-        m_pendingEvents = new wxList;
-
-    m_pendingEvents->Append(event);
-
-    // 2) Add this event handler to list of event handlers that
-    //    have pending events.
-
-    wxTheApp->AppendPendingEventHandler(this);
-
-    // only release m_pendingEventsLock now because otherwise there is a race
-    // condition as described in the ticket #9093: we could process the event
-    // just added to m_pendingEvents in our ProcessPendingEvents() below before
-    // we had time to append this pointer to wxHandlersWithPendingEvents list; thus
-    // breaking the invariant that a handler should be in the list iff it has
-    // any pending events to process
-    wxLEAVE_CRIT_SECT( m_pendingEventsLock );
-
-    // 3) Inform the system that new pending events are somewhere,
-    //    and that these should be processed in idle time.
-    wxWakeUpIdle();
-}
-
-void wxEvtHandler::DeletePendingEvents()
-{
-    if (m_pendingEvents)
-        m_pendingEvents->DeleteContents(true);
-    wxDELETE(m_pendingEvents);
-}
-
-void wxEvtHandler::ProcessPendingEvents()
-{
-    if (!wxTheApp)
-    {
-        // we need an event loop which manages the list of event handlers with
-        // pending events... cannot proceed without it!
-        wxLogDebug("No application object! Cannot process pending events!");
-        return;
-    }
-
-    // we need to process only a single pending event in this call because
-    // each call to ProcessEvent() could result in the destruction of this
-    // same event handler (see the comment at the end of this function)
-
-    wxENTER_CRIT_SECT( m_pendingEventsLock );
-
-    // this method is only called by wxApp if this handler does have
-    // pending events
-    wxCHECK_RET( m_pendingEvents && !m_pendingEvents->IsEmpty(),
-                 "should have pending events if called" );
-
-    wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
-    wxEvent* pEvent = static_cast<wxEvent *>(node->GetData());
-
-    // find the first event which can be processed now:
-    wxEventLoopBase* evtLoop = wxEventLoopBase::GetActive();
-    if (evtLoop && evtLoop->IsYielding())
-    {
-        while (node && pEvent && !evtLoop->IsEventAllowedInsideYield(pEvent->GetEventCategory()))
-        {
-            node = node->GetNext();
-            pEvent = node ? static_cast<wxEvent *>(node->GetData()) : NULL;
-        }
-
-        if (!node)
-        {
-            // all our events are NOT processable now... signal this:
-            wxTheApp->DelayPendingEventHandler(this);
-
-            // see the comment at the beginning of evtloop.h header for the
-            // logic behind YieldFor() and behind DelayPendingEventHandler()
-
-            wxLEAVE_CRIT_SECT( m_pendingEventsLock );
-
-            return;
-        }
-    }
-
-    wxEventPtr event(pEvent);
-
-    // it's important we remove event from list before processing it, else a
-    // nested event loop, for example from a modal dialog, might process the
-    // same event again.
-    m_pendingEvents->Erase(node);
-
-    if ( m_pendingEvents->IsEmpty() )
-    {
-        // if there are no more pending events left, we don't need to
-        // stay in this list
-        wxTheApp->RemovePendingEventHandler(this);
-    }
-
-    wxLEAVE_CRIT_SECT( m_pendingEventsLock );
-
-    ProcessEvent(*event);
-
-    // careful: this object could have been deleted by the event handler
-    // executed by the above ProcessEvent() call, so we can't access any fields
-    // of this object any more
-}
-
-/* static */
-bool wxEvtHandler::ProcessEventIfMatchesId(const wxEventTableEntryBase& entry,
-                                           wxEvtHandler *handler,
-                                           wxEvent& event)
-{
-    int tableId1 = entry.m_id,
-        tableId2 = entry.m_lastId;
-
-    // match only if the event type is the same and the id is either -1 in
-    // the event table (meaning "any") or the event id matches the id
-    // specified in the event table either exactly or by falling into
-    // range between first and last
-    if ((tableId1 == wxID_ANY) ||
-        (tableId2 == wxID_ANY && tableId1 == event.GetId()) ||
-        (tableId2 != wxID_ANY &&
-         (event.GetId() >= tableId1 && event.GetId() <= tableId2)))
-    {
-        event.Skip(false);
-        event.m_callbackUserData = entry.m_callbackUserData;
-
-#if wxUSE_EXCEPTIONS
-        if ( wxTheApp )
-        {
-            // call the handler via wxApp method which allows the user to catch
-            // any exceptions which may be thrown by any handler in the program
-            // in one place
-            wxTheApp->CallEventHandler(handler, *entry.m_fn, event);
-        }
-        else
-#endif // wxUSE_EXCEPTIONS
-        {
-            (*entry.m_fn)(handler, event);
-        }
-
-        if (!event.GetSkipped())
-            return true;
-    }
-
-    return false;
-}
-
-bool wxEvtHandler::DoTryApp(wxEvent& event)
-{
-    if ( wxTheApp && (this != wxTheApp) )
-    {
-        // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always
-        // swallow it. wxEVT_IDLE is sent explicitly to wxApp so it will be
-        // processed appropriately via SearchEventTable.
-        if ( event.GetEventType() != wxEVT_IDLE )
-        {
-            if ( wxTheApp->ProcessEvent(event) )
-                return true;
-        }
-    }
-
-    return false;
-}
-
-bool wxEvtHandler::TryBefore(wxEvent& event)
-{
-#if WXWIN_COMPATIBILITY_2_8
-    // call the old virtual function to keep the code overriding it working
-    return TryValidator(event);
-#else
-    wxUnusedVar(event);
-    return false;
-#endif
-}
-
-bool wxEvtHandler::TryAfter(wxEvent& event)
-{
-    // We only want to pass the window to the application object once even if
-    // there are several chained handlers. Ensure that this is what happens by
-    // only calling DoTryApp() if there is no next handler (which would do it).
-    //
-    // Notice that, unlike simply calling TryAfter() on the last handler in the
-    // chain only from ProcessEvent(), this also works with wxWindow object in
-    // the middle of the chain: its overridden TryAfter() will still be called
-    // and propagate the event upwards the window hierarchy even if it's not
-    // the last one in the chain (which, admittedly, shouldn't happen often).
-    if ( GetNextHandler() )
-        return GetNextHandler()->TryAfter(event);
-
-#if WXWIN_COMPATIBILITY_2_8
-    // as above, call the old virtual function for compatibility
-    return TryParent(event);
-#else
-    return DoTryApp(event);
-#endif
-}
-
-bool wxEvtHandler::ProcessEvent(wxEvent& event)
-{
-    // The very first thing we do is to allow any registered filters to hook
-    // into event processing in order to globally pre-process all events.
-    //
-    // Note that we should only do it if we're the first event handler called
-    // to avoid calling FilterEvent() multiple times as the event goes through
-    // the event handler chain and possibly upwards the window hierarchy.
-    if ( !event.WasProcessed() )
-    {
-        for ( wxEventFilter* f = ms_filterList; f; f = f->m_next )
-        {
-            int rc = f->FilterEvent(event);
-            if ( rc != wxEventFilter::Event_Skip )
-            {
-                wxASSERT_MSG( rc == wxEventFilter::Event_Ignore ||
-                                rc == wxEventFilter::Event_Processed,
-                              "unexpected FilterEvent() return value" );
-
-                return rc != wxEventFilter::Event_Ignore;
-            }
-            //else: proceed normally
-        }
-    }
-
-    // Short circuit the event processing logic if we're requested to process
-    // this event in this handler only, see DoTryChain() for more details.
-    if ( event.ShouldProcessOnlyIn(this) )
-        return TryBeforeAndHere(event);
-
-
-    // Try to process the event in this handler itself.
-    if ( ProcessEventLocally(event) )
-    {
-        // It is possible that DoTryChain() called from ProcessEventLocally()
-        // returned true but the event was not really processed: this happens
-        // if a custom handler ignores the request to process the event in this
-        // handler only and in this case we should skip the post processing
-        // done in TryAfter() but still return the correct value ourselves to
-        // indicate whether we did or did not find a handler for this event.
-        return !event.GetSkipped();
-    }
-
-    // If we still didn't find a handler, propagate the event upwards the
-    // window chain and/or to the application object.
-    if ( TryAfter(event) )
-        return true;
-
-
-    // No handler found anywhere, bail out.
-    return false;
-}
-
-bool wxEvtHandler::ProcessEventLocally(wxEvent& event)
-{
-    // Try the hooks which should be called before our own handlers and this
-    // handler itself first. Notice that we should not call ProcessEvent() on
-    // this one as we're already called from it, which explains why we do it
-    // here and not in DoTryChain()
-    return TryBeforeAndHere(event) || DoTryChain(event);
-}
-
-bool wxEvtHandler::DoTryChain(wxEvent& event)
-{
-    for ( wxEvtHandler *h = GetNextHandler(); h; h = h->GetNextHandler() )
-    {
-        // We need to process this event at the level of this handler only
-        // right now, the pre-/post-processing was either already done by
-        // ProcessEvent() from which we were called or will be done by it when
-        // we return.
-        //
-        // However we must call ProcessEvent() and not TryHereOnly() because the
-        // existing code (including some in wxWidgets itself) expects the
-        // overridden ProcessEvent() in its custom event handlers pushed on a
-        // window to be called.
-        //
-        // So we must call ProcessEvent() but it must not do what it usually
-        // does. To resolve this paradox we set up a special flag inside the
-        // object itself to let ProcessEvent() know that it shouldn't do any
-        // pre/post-processing for this event if it gets it. Note that this
-        // only applies to this handler, if the event is passed to another one
-        // by explicitly calling its ProcessEvent(), pre/post-processing should
-        // be done as usual.
-        //
-        // Final complication is that if the implementation of ProcessEvent()
-        // called wxEvent::DidntHonourProcessOnlyIn() (as the gross hack that
-        // is wxScrollHelperEvtHandler::ProcessEvent() does) and ignored our
-        // request to process event in this handler only, we have to compensate
-        // for it by not processing the event further because this was already
-        // done by that rogue event handler.
-        wxEventProcessInHandlerOnly processInHandlerOnly(event, h);
-        if ( h->ProcessEvent(event) )
-        {
-            // Make sure "skipped" flag is not set as the event was really
-            // processed in this case. Normally it shouldn't be set anyhow but
-            // make sure just in case the user code does something strange.
-            event.Skip(false);
-
-            return true;
-        }
-
-        if ( !event.ShouldProcessOnlyIn(h) )
-        {
-            // Still return true to indicate that no further processing should
-            // be undertaken but ensure that "skipped" flag is set so that the
-            // caller knows that the event was not really processed.
-            event.Skip();
-
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool wxEvtHandler::TryHereOnly(wxEvent& event)
-{
-    // If the event handler is disabled it doesn't process any events
-    if ( !GetEvtHandlerEnabled() )
-        return false;
-
-    // Handle per-instance dynamic event tables first
-    if ( m_dynamicEvents && SearchDynamicEventTable(event) )
-        return true;
-
-    // Then static per-class event tables
-    if ( GetEventHashTable().HandleEvent(event, this) )
-        return true;
-
-    // We don't have a handler for this event.
-    return false;
-}
-
-bool wxEvtHandler::SafelyProcessEvent(wxEvent& event)
-{
-#if wxUSE_EXCEPTIONS
-    try
-    {
-#endif
-        return ProcessEvent(event);
-#if wxUSE_EXCEPTIONS
-    }
-    catch ( ... )
-    {
-        // notice that we do it in 2 steps to avoid warnings about possibly
-        // uninitialized loop variable from some versions of g++ which are not
-        // smart enough to figure out that GetActive() doesn't throw and so
-        // that loop will always be initialized
-        wxEventLoopBase *loop = NULL;
-        try
-        {
-            loop = wxEventLoopBase::GetActive();
-
-            if ( !wxTheApp || !wxTheApp->OnExceptionInMainLoop() )
-            {
-                if ( loop )
-                    loop->Exit();
-            }
-            //else: continue running current event loop
-
-            return false;
-        }
-        catch ( ... )
-        {
-            // OnExceptionInMainLoop() threw, possibly rethrowing the same
-            // exception again: very good, but we still need Exit() to
-            // be called
-            if ( loop )
-                loop->Exit();
-            throw;
-        }
-    }
-#endif // wxUSE_EXCEPTIONS
-}
-
-bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
-{
-    const wxEventType eventType = event.GetEventType();
-    for ( int i = 0; table.entries[i].m_fn != 0; i++ )
-    {
-        const wxEventTableEntry& entry = table.entries[i];
-        if ( eventType == entry.m_eventType )
-        {
-            if ( ProcessEventIfMatchesId(entry, this, event) )
-                return true;
-        }
-    }
-
-    return false;
-}
-
-void wxEvtHandler::DoBind(int id,
-                          int lastId,
-                          wxEventType eventType,
-                          wxEventFunctor *func,
-                          wxObject *userData)
-{
-    wxDynamicEventTableEntry *entry =
-        new wxDynamicEventTableEntry(eventType, id, lastId, func, userData);
-
-    if (!m_dynamicEvents)
-        m_dynamicEvents = new wxList;
-
-    // Insert at the front of the list so most recent additions are found first
-    m_dynamicEvents->Insert( (wxObject*) entry );
-
-    // Make sure we get to know when a sink is destroyed
-    wxEvtHandler *eventSink = func->GetEvtHandler();
-    if ( eventSink && eventSink != this )
-    {
-        wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink);
-        if ( evtConnRef )
-            evtConnRef->IncRef( );
-        else
-            new wxEventConnectionRef(this, eventSink);
-    }
-}
-
-bool
-wxEvtHandler::DoUnbind(int id,
-                       int lastId,
-                       wxEventType eventType,
-                       const wxEventFunctor& func,
-                       wxObject *userData)
-{
-    if (!m_dynamicEvents)
-        return false;
-
-    // Remove connection from tracker node (wxEventConnectionRef)
-    wxEvtHandler *eventSink = func.GetEvtHandler();
-    if ( eventSink && eventSink != this )
-    {
-        wxEventConnectionRef *evtConnRef = FindRefInTrackerList(eventSink);
-        if ( evtConnRef )
-            evtConnRef->DecRef();
-    }
-
-    wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
-    while (node)
-    {
-        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
-
-        if ((entry->m_id == id) &&
-            ((entry->m_lastId == lastId) || (lastId == wxID_ANY)) &&
-            ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
-            entry->m_fn->IsMatching(func) &&
-            ((entry->m_callbackUserData == userData) || !userData))
-        {
-            delete entry->m_callbackUserData;
-            m_dynamicEvents->Erase( node );
-            delete entry;
-            return true;
-        }
-        node = node->GetNext();
-    }
-    return false;
-}
-
-bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
-{
-    wxCHECK_MSG( m_dynamicEvents, false,
-                 wxT("caller should check that we have dynamic events") );
-
-    wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
-    while (node)
-    {
-        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
-
-        // get next node before (maybe) calling the event handler as it could
-        // call Disconnect() invalidating the current node
-        node = node->GetNext();
-
-        if ( event.GetEventType() == entry->m_eventType )
-        {
-            wxEvtHandler *handler = entry->m_fn->GetEvtHandler();
-            if ( !handler )
-               handler = this;
-            if ( ProcessEventIfMatchesId(*entry, handler, event) )
-                return true;
-        }
-    }
-
-    return false;
-}
-
-void wxEvtHandler::DoSetClientObject( wxClientData *data )
-{
-    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
-                  wxT("can't have both object and void client data") );
-
-    if ( m_clientObject )
-        delete m_clientObject;
-
-    m_clientObject = data;
-    m_clientDataType = wxClientData_Object;
-}
-
-wxClientData *wxEvtHandler::DoGetClientObject() const
-{
-    // it's not an error to call GetClientObject() on a window which doesn't
-    // have client data at all - NULL will be returned
-    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
-                  wxT("this window doesn't have object client data") );
-
-    return m_clientObject;
-}
-
-void wxEvtHandler::DoSetClientData( void *data )
-{
-    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
-                  wxT("can't have both object and void client data") );
-
-    m_clientData = data;
-    m_clientDataType = wxClientData_Void;
-}
-
-void *wxEvtHandler::DoGetClientData() const
-{
-    // it's not an error to call GetClientData() on a window which doesn't have
-    // client data at all - NULL will be returned
-    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
-                  wxT("this window doesn't have void client data") );
-
-    return m_clientData;
-}
-
-// A helper to find an wxEventConnectionRef object
-wxEventConnectionRef *
-wxEvtHandler::FindRefInTrackerList(wxEvtHandler *eventSink)
-{
-    for ( wxTrackerNode *node = eventSink->GetFirst(); node; node = node->m_nxt )
-    {
-        // we only want wxEventConnectionRef nodes here
-        wxEventConnectionRef *evtConnRef = node->ToEventConnection();
-        if ( evtConnRef && evtConnRef->m_src == this )
-        {
-            wxASSERT( evtConnRef->m_sink==eventSink );
-            return evtConnRef;
-        }
-    }
-
-    return NULL;
-}
-
-void wxEvtHandler::OnSinkDestroyed( wxEvtHandler *sink )
-{
-    wxASSERT(m_dynamicEvents);
-
-    // remove all connections with this sink
-    wxList::compatibility_iterator node = m_dynamicEvents->GetFirst(), node_nxt;
-    while (node)
-    {
-        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
-        node_nxt = node->GetNext();
-
-        if ( entry->m_fn->GetEvtHandler() == sink )
-        {
-            delete entry->m_callbackUserData;
-            m_dynamicEvents->Erase( node );
-            delete entry;
-        }
-        node = node_nxt;
-    }
-}
-
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
-// Find a window with the focus, that is also a descendant of the given window.
-// This is used to determine the window to initially send commands to.
-wxWindow* wxFindFocusDescendant(wxWindow* ancestor)
-{
-    // Process events starting with the window with the focus, if any.
-    wxWindow* focusWin = wxWindow::FindFocus();
-    wxWindow* win = focusWin;
-
-    // Check if this is a descendant of this frame.
-    // If not, win will be set to NULL.
-    while (win)
-    {
-        if (win == ancestor)
-            break;
-        else
-            win = win->GetParent();
-    }
-    if (win == NULL)
-        focusWin = NULL;
-
-    return focusWin;
-}
-
-// ----------------------------------------------------------------------------
-// wxEventBlocker
-// ----------------------------------------------------------------------------
-
-wxEventBlocker::wxEventBlocker(wxWindow *win, wxEventType type)
-{
-    wxCHECK_RET(win, wxT("Null window given to wxEventBlocker"));
-
-    m_window = win;
-
-    Block(type);
-    m_window->PushEventHandler(this);
-}
-
-wxEventBlocker::~wxEventBlocker()
-{
-    wxEvtHandler *popped = m_window->PopEventHandler(false);
-    wxCHECK_RET(popped == this,
-        wxT("Don't push other event handlers into a window managed by wxEventBlocker!"));
-}
-
-bool wxEventBlocker::ProcessEvent(wxEvent& event)
-{
-    // should this event be blocked?
-    for ( size_t i = 0; i < m_eventsToBlock.size(); i++ )
-    {
-        wxEventType t = (wxEventType)m_eventsToBlock[i];
-        if ( t == wxEVT_ANY || t == event.GetEventType() )
-            return true;   // yes, it should: mark this event as processed
-    }
-
-    return false;
-}
-
-#endif // wxUSE_GUI
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/event.cpp
+// Purpose:     Event classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: event.cpp 61982 2009-09-20 21:48:50Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/event.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/stopwatch.h"
+    #include "wx/module.h"
+
+    #if wxUSE_GUI
+        #include "wx/window.h"
+        #include "wx/control.h"
+        #include "wx/dc.h"
+        #include "wx/textctrl.h"
+        #include "wx/validate.h"
+    #endif // wxUSE_GUI
+#endif
+
+#if wxUSE_BASE
+    #include "wx/ptr_scpd.h"
+
+    wxDECLARE_SCOPED_PTR(wxEvent, wxEventPtr)
+    wxDEFINE_SCOPED_PTR(wxEvent, wxEventPtr)
+#endif // wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_BASE
+    IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
+    IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+    IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxScrollWinEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxNcPaintEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxChildFocusEvent, wxCommandEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxSetCursorEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxDisplayChangedEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxHelpEvent, wxCommandEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxContextMenuEvent, wxCommandEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureChangedEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxMouseCaptureLostEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxClipboardTextEvent, wxCommandEvent)
+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
+const wxEventTable *wxEvtHandler::GetEventTable() const
+    { return &wxEvtHandler::sm_eventTable; }
+
+const wxEventTable wxEvtHandler::sm_eventTable =
+    { (const wxEventTable *)NULL, &wxEvtHandler::sm_eventTableEntries[0] };
+
+wxEventHashTable &wxEvtHandler::GetEventHashTable() const
+    { return wxEvtHandler::sm_eventHashTable; }
+
+wxEventHashTable wxEvtHandler::sm_eventHashTable(wxEvtHandler::sm_eventTable);
+
+const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] =
+    { DECLARE_EVENT_TABLE_ENTRY(wxEVT_NULL, 0, 0, (wxObjectEventFunction)NULL, NULL) };
+
+
+#ifdef __WXDEBUG__
+// Clear up event hash table contents or we can get problems
+// when C++ is cleaning up the static object
+class wxEventTableEntryModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxEventTableEntryModule)
+public:
+    wxEventTableEntryModule() {}
+    bool OnInit()
+    {
+        wxEventHashTable::ReconstructAll();
+        return true;
+    }
+    void OnExit()
+    {
+        wxEventHashTable::ClearAll();
+    }
+};
+IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule)
+#endif
+
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
+// To put pending event handlers
+wxList *wxPendingEvents = (wxList *)NULL;
+
+#if wxUSE_THREADS
+    // protects wxPendingEvents list
+    wxCriticalSection *wxPendingEventsLocker = (wxCriticalSection *)NULL;
+#endif
+
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+// common event types are defined here, other event types are defined by the
+// components which use them
+
+const wxEventType wxEVT_FIRST = 10000;
+const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
+
+DEFINE_EVENT_TYPE(wxEVT_NULL)
+DEFINE_EVENT_TYPE(wxEVT_IDLE)
+DEFINE_EVENT_TYPE(wxEVT_SOCKET)
+
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_BUTTON_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKBOX_CLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHOICE_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_MENU_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SLIDER_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RADIOBUTTON_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SCROLLBAR_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_VLBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_COMBOBOX_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_RCLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOOL_ENTER)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPINCTRL_UPDATED)
+
+// Sockets and timers send events, too
+DEFINE_EVENT_TYPE(wxEVT_TIMER)
+
+// Mouse event types
+DEFINE_EVENT_TYPE(wxEVT_LEFT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_LEFT_UP)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_UP)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_UP)
+DEFINE_EVENT_TYPE(wxEVT_MOTION)
+DEFINE_EVENT_TYPE(wxEVT_ENTER_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_LEAVE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_MIDDLE_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_SET_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_KILL_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_CHILD_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_MOUSEWHEEL)
+
+// Non-client mouse events
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_UP)
+DEFINE_EVENT_TYPE(wxEVT_NC_MOTION)
+DEFINE_EVENT_TYPE(wxEVT_NC_ENTER_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEAVE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_NC_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_NC_MIDDLE_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_NC_RIGHT_DCLICK)
+
+// Character input event type
+DEFINE_EVENT_TYPE(wxEVT_CHAR)
+DEFINE_EVENT_TYPE(wxEVT_CHAR_HOOK)
+DEFINE_EVENT_TYPE(wxEVT_NAVIGATION_KEY)
+DEFINE_EVENT_TYPE(wxEVT_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_KEY_UP)
+#if wxUSE_HOTKEY
+DEFINE_EVENT_TYPE(wxEVT_HOTKEY)
+#endif
+
+// Set cursor event
+DEFINE_EVENT_TYPE(wxEVT_SET_CURSOR)
+
+// wxScrollbar and wxSlider event identifiers
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_TOP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_BOTTOM)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_LINEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_PAGEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)
+DEFINE_EVENT_TYPE(wxEVT_SCROLL_CHANGED)
+
+// Scroll events from wxWindow
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_LINEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEUP)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_PAGEDOWN)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBTRACK)
+DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_THUMBRELEASE)
+
+// System events
+DEFINE_EVENT_TYPE(wxEVT_SIZE)
+DEFINE_EVENT_TYPE(wxEVT_SIZING)
+DEFINE_EVENT_TYPE(wxEVT_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_MOVING)
+DEFINE_EVENT_TYPE(wxEVT_CLOSE_WINDOW)
+DEFINE_EVENT_TYPE(wxEVT_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_QUERY_END_SESSION)
+DEFINE_EVENT_TYPE(wxEVT_HIBERNATE)
+DEFINE_EVENT_TYPE(wxEVT_ACTIVATE_APP)
+DEFINE_EVENT_TYPE(wxEVT_POWER)
+DEFINE_EVENT_TYPE(wxEVT_ACTIVATE)
+DEFINE_EVENT_TYPE(wxEVT_CREATE)
+DEFINE_EVENT_TYPE(wxEVT_DESTROY)
+DEFINE_EVENT_TYPE(wxEVT_SHOW)
+DEFINE_EVENT_TYPE(wxEVT_ICONIZE)
+DEFINE_EVENT_TYPE(wxEVT_MAXIMIZE)
+DEFINE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_MOUSE_CAPTURE_LOST)
+DEFINE_EVENT_TYPE(wxEVT_PAINT)
+DEFINE_EVENT_TYPE(wxEVT_ERASE_BACKGROUND)
+DEFINE_EVENT_TYPE(wxEVT_NC_PAINT)
+DEFINE_EVENT_TYPE(wxEVT_PAINT_ICON)
+DEFINE_EVENT_TYPE(wxEVT_MENU_OPEN)
+DEFINE_EVENT_TYPE(wxEVT_MENU_CLOSE)
+DEFINE_EVENT_TYPE(wxEVT_MENU_HIGHLIGHT)
+DEFINE_EVENT_TYPE(wxEVT_CONTEXT_MENU)
+DEFINE_EVENT_TYPE(wxEVT_SYS_COLOUR_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_DISPLAY_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_SETTING_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_QUERY_NEW_PALETTE)
+DEFINE_EVENT_TYPE(wxEVT_PALETTE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_JOY_BUTTON_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_JOY_BUTTON_UP)
+DEFINE_EVENT_TYPE(wxEVT_JOY_MOVE)
+DEFINE_EVENT_TYPE(wxEVT_JOY_ZMOVE)
+DEFINE_EVENT_TYPE(wxEVT_DROP_FILES)
+DEFINE_EVENT_TYPE(wxEVT_DRAW_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_MEASURE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMPARE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_INIT_DIALOG)
+DEFINE_EVENT_TYPE(wxEVT_UPDATE_UI)
+
+// Clipboard events
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_COPY)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_CUT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_PASTE)
+
+// Generic command events
+// Note: a click is a higher-level event than button down/up
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LEFT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_RIGHT_DCLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SET_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_KILL_FOCUS)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_ENTER)
+
+// Help events
+DEFINE_EVENT_TYPE(wxEVT_HELP)
+DEFINE_EVENT_TYPE(wxEVT_DETAILED_HELP)
+
+#endif // !WXWIN_COMPATIBILITY_EVENT_TYPES
+
+#endif // wxUSE_GUI
+
+#if wxUSE_BASE
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// event initialization
+// ----------------------------------------------------------------------------
+
+int wxNewEventType()
+{
+    // MT-FIXME
+    static int s_lastUsedEventType = wxEVT_FIRST;
+
+    return s_lastUsedEventType++;
+}
+
+// ----------------------------------------------------------------------------
+// wxEvent
+// ----------------------------------------------------------------------------
+
+/*
+ * General wxWidgets events, covering
+ * all interesting things that might happen (button clicking, resizing,
+ * setting text in widgets, etc.).
+ *
+ * For each completely new event type, derive a new event class.
+ *
+ */
+
+wxEvent::wxEvent(int theId, wxEventType commandType )
+{
+    m_eventType = commandType;
+    m_eventObject = (wxObject *) NULL;
+    m_timeStamp = 0;
+    m_id = theId;
+    m_skipped = false;
+    m_callbackUserData = (wxObject *) NULL;
+    m_isCommandEvent = false;
+    m_propagationLevel = wxEVENT_PROPAGATE_NONE;
+}
+
+wxEvent::wxEvent(const wxEvent &src)
+    : wxObject(src)
+    , m_eventObject(src.m_eventObject)
+    , m_eventType(src.m_eventType)
+    , m_timeStamp(src.m_timeStamp)
+    , m_id(src.m_id)
+    , m_callbackUserData(src.m_callbackUserData)
+    , m_propagationLevel(src.m_propagationLevel)
+    , m_skipped(src.m_skipped)
+    , m_isCommandEvent(src.m_isCommandEvent)
+{
+}
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+/*
+ * Command events
+ *
+ */
+
+#ifdef __VISUALC__
+    // 'this' : used in base member initializer list (for m_commandString)
+    #pragma warning(disable:4355)
+#endif
+
+wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
+              : wxEvent(theId, commandType)
+#if WXWIN_COMPATIBILITY_2_4
+              , m_commandString(this)
+#endif
+{
+    m_clientData = (char *) NULL;
+    m_clientObject = (wxClientData *) NULL;
+    m_extraLong = 0;
+    m_commandInt = 0;
+    m_isCommandEvent = true;
+
+    // the command events are propagated upwards by default
+    m_propagationLevel = wxEVENT_PROPAGATE_MAX;
+}
+
+#ifdef __VISUALC__
+    #pragma warning(default:4355)
+#endif
+
+wxString wxCommandEvent::GetString() const
+{
+    if(m_eventType != wxEVT_COMMAND_TEXT_UPDATED || !m_eventObject)
+        return m_cmdString;
+    else
+    {
+#if wxUSE_TEXTCTRL
+        wxTextCtrl *txt = wxDynamicCast(m_eventObject, wxTextCtrl);
+        if(txt)
+            return txt->GetValue();
+        else
+#endif // wxUSE_TEXTCTRL
+            return m_cmdString;
+    }
+}
+
+/*
+ * UI update events
+ */
+
+#if wxUSE_LONGLONG
+wxLongLong wxUpdateUIEvent::sm_lastUpdate = 0;
+#endif
+
+long wxUpdateUIEvent::sm_updateInterval = 0;
+
+wxUpdateUIMode wxUpdateUIEvent::sm_updateMode = wxUPDATE_UI_PROCESS_ALL;
+
+// Can we update?
+bool wxUpdateUIEvent::CanUpdate(wxWindowBase *win)
+{
+    // Don't update if we've switched global updating off
+    // and this window doesn't support updates.
+    if (win &&
+       (GetMode() == wxUPDATE_UI_PROCESS_SPECIFIED &&
+       ((win->GetExtraStyle() & wxWS_EX_PROCESS_UI_UPDATES) == 0)))
+        return false;
+
+    if (sm_updateInterval == -1)
+        return false;
+
+    if (sm_updateInterval == 0)
+        return true;
+
+#if wxUSE_STOPWATCH && wxUSE_LONGLONG
+    wxLongLong now = wxGetLocalTimeMillis();
+    if (now > (sm_lastUpdate + sm_updateInterval))
+    {
+        return true;
+    }
+
+    return false;
+#else
+    // If we don't have wxStopWatch or wxLongLong, we
+    // should err on the safe side and update now anyway.
+    return true;
+#endif
+}
+
+// Reset the update time to provide a delay until the next
+// time we should update
+void wxUpdateUIEvent::ResetUpdateTime()
+{
+#if wxUSE_STOPWATCH && wxUSE_LONGLONG
+    if (sm_updateInterval > 0)
+    {
+        wxLongLong now = wxGetLocalTimeMillis();
+        if (now > (sm_lastUpdate + sm_updateInterval))
+        {
+            sm_lastUpdate = now;
+        }
+    }
+#endif
+}
+
+/*
+ * Idle events
+ */
+
+wxIdleMode wxIdleEvent::sm_idleMode = wxIDLE_PROCESS_ALL;
+
+// Can we send an idle event?
+bool wxIdleEvent::CanSend(wxWindow* win)
+{
+    // Don't update if we've switched global updating off
+    // and this window doesn't support updates.
+    if (win &&
+       (GetMode() == wxIDLE_PROCESS_SPECIFIED &&
+       ((win->GetExtraStyle() & wxWS_EX_PROCESS_IDLE) == 0)))
+        return false;
+
+    return true;
+}
+
+/*
+ * Scroll events
+ */
+
+wxScrollEvent::wxScrollEvent(wxEventType commandType,
+                             int id,
+                             int pos,
+                             int orient)
+    : wxCommandEvent(commandType, id)
+{
+    m_extraLong = orient;
+    m_commandInt = pos;
+}
+
+/*
+ * ScrollWin events
+ */
+
+wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
+                                   int pos,
+                                   int orient)
+{
+    m_eventType = commandType;
+    m_extraLong = orient;
+    m_commandInt = pos;
+}
+
+/*
+ * Mouse events
+ *
+ */
+
+wxMouseEvent::wxMouseEvent(wxEventType commandType)
+{
+    m_eventType = commandType;
+    m_metaDown = false;
+    m_altDown = false;
+    m_controlDown = false;
+    m_shiftDown = false;
+    m_leftDown = false;
+    m_rightDown = false;
+    m_middleDown = false;
+    m_x = 0;
+    m_y = 0;
+    m_wheelRotation = 0;
+    m_wheelDelta = 0;
+    m_linesPerAction = 0;
+}
+
+void wxMouseEvent::Assign(const wxMouseEvent& event)
+{
+    m_eventType = event.m_eventType;
+
+    m_x = event.m_x;
+    m_y = event.m_y;
+
+    m_leftDown = event.m_leftDown;
+    m_middleDown = event.m_middleDown;
+    m_rightDown = event.m_rightDown;
+
+    m_controlDown = event.m_controlDown;
+    m_shiftDown = event.m_shiftDown;
+    m_altDown = event.m_altDown;
+    m_metaDown = event.m_metaDown;
+
+    m_wheelRotation = event.m_wheelRotation;
+    m_wheelDelta = event.m_wheelDelta;
+    m_linesPerAction = event.m_linesPerAction;
+}
+
+// return true if was a button dclick event
+bool wxMouseEvent::ButtonDClick(int but) const
+{
+    switch (but)
+    {
+        default:
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDClick"));
+            // fall through
+
+        case wxMOUSE_BTN_ANY:
+            return (LeftDClick() || MiddleDClick() || RightDClick());
+
+        case wxMOUSE_BTN_LEFT:
+            return LeftDClick();
+
+        case wxMOUSE_BTN_MIDDLE:
+            return MiddleDClick();
+
+        case wxMOUSE_BTN_RIGHT:
+            return RightDClick();
+    }
+}
+
+// return true if was a button down event
+bool wxMouseEvent::ButtonDown(int but) const
+{
+    switch (but)
+    {
+        default:
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonDown"));
+            // fall through
+
+        case wxMOUSE_BTN_ANY:
+            return (LeftDown() || MiddleDown() || RightDown());
+
+        case wxMOUSE_BTN_LEFT:
+            return LeftDown();
+
+        case wxMOUSE_BTN_MIDDLE:
+            return MiddleDown();
+
+        case wxMOUSE_BTN_RIGHT:
+            return RightDown();
+    }
+}
+
+// return true if was a button up event
+bool wxMouseEvent::ButtonUp(int but) const
+{
+    switch (but)
+    {
+        default:
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonUp"));
+            // fall through
+
+        case wxMOUSE_BTN_ANY:
+            return (LeftUp() || MiddleUp() || RightUp());
+
+        case wxMOUSE_BTN_LEFT:
+            return LeftUp();
+
+        case wxMOUSE_BTN_MIDDLE:
+            return MiddleUp();
+
+        case wxMOUSE_BTN_RIGHT:
+            return RightUp();
+    }
+}
+
+// return true if the given button is currently changing state
+bool wxMouseEvent::Button(int but) const
+{
+    switch (but)
+    {
+        default:
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::Button"));
+            // fall through
+
+        case wxMOUSE_BTN_ANY:
+            return ButtonUp(wxMOUSE_BTN_ANY) ||
+                    ButtonDown(wxMOUSE_BTN_ANY) ||
+                        ButtonDClick(wxMOUSE_BTN_ANY);
+
+        case wxMOUSE_BTN_LEFT:
+            return LeftDown() || LeftUp() || LeftDClick();
+
+        case wxMOUSE_BTN_MIDDLE:
+            return MiddleDown() || MiddleUp() || MiddleDClick();
+
+        case wxMOUSE_BTN_RIGHT:
+            return RightDown() || RightUp() || RightDClick();
+    }
+}
+
+bool wxMouseEvent::ButtonIsDown(int but) const
+{
+    switch (but)
+    {
+        default:
+            wxFAIL_MSG(wxT("invalid parameter in wxMouseEvent::ButtonIsDown"));
+            // fall through
+
+        case wxMOUSE_BTN_ANY:
+            return LeftIsDown() || MiddleIsDown() || RightIsDown();
+
+        case wxMOUSE_BTN_LEFT:
+            return LeftIsDown();
+
+        case wxMOUSE_BTN_MIDDLE:
+            return MiddleIsDown();
+
+        case wxMOUSE_BTN_RIGHT:
+            return RightIsDown();
+    }
+}
+
+int wxMouseEvent::GetButton() const
+{
+    for ( int i = 1; i <= 3; i++ )
+    {
+        if ( Button(i) )
+        {
+            return i;
+        }
+    }
+
+    return wxMOUSE_BTN_NONE;
+}
+
+// Find the logical position of the event given the DC
+wxPoint wxMouseEvent::GetLogicalPosition(const wxDC& dc) const
+{
+    wxPoint pt(dc.DeviceToLogicalX(m_x), dc.DeviceToLogicalY(m_y));
+    return pt;
+}
+
+
+/*
+ * Keyboard event
+ *
+ */
+
+wxKeyEvent::wxKeyEvent(wxEventType type)
+{
+    m_eventType = type;
+    m_shiftDown = false;
+    m_controlDown = false;
+    m_metaDown = false;
+    m_altDown = false;
+    m_keyCode = 0;
+    m_scanCode = 0;
+#if wxUSE_UNICODE
+    m_uniChar = 0;
+#endif
+}
+
+wxKeyEvent::wxKeyEvent(const wxKeyEvent& evt)
+    : wxEvent(evt)
+{
+    m_x = evt.m_x;
+    m_y = evt.m_y;
+
+    m_keyCode = evt.m_keyCode;
+
+    m_controlDown = evt.m_controlDown;
+    m_shiftDown = evt.m_shiftDown;
+    m_altDown = evt.m_altDown;
+    m_metaDown = evt.m_metaDown;
+    m_scanCode = evt.m_scanCode;
+    m_rawCode = evt.m_rawCode;
+    m_rawFlags = evt.m_rawFlags;
+
+#if wxUSE_UNICODE
+    m_uniChar = evt.m_uniChar;
+#endif
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+long wxKeyEvent::KeyCode() const
+{
+    return m_keyCode;
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
+{
+    SetEventType(wxEVT_CREATE);
+    SetEventObject(win);
+}
+
+wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
+{
+    SetEventType(wxEVT_DESTROY);
+    SetEventObject(win);
+}
+
+wxChildFocusEvent::wxChildFocusEvent(wxWindow *win)
+                 : wxCommandEvent(wxEVT_CHILD_FOCUS)
+{
+    SetEventObject(win);
+}
+
+// ----------------------------------------------------------------------------
+// wxHelpEvent
+// ----------------------------------------------------------------------------
+
+/* static */
+wxHelpEvent::Origin wxHelpEvent::GuessOrigin(Origin origin)
+{
+    if ( origin == Origin_Unknown )
+    {
+        // assume that the event comes from the help button if it's not from
+        // keyboard and that pressing F1 always results in the help event
+        origin = wxGetKeyState(WXK_F1) ? Origin_Keyboard : Origin_HelpButton;
+    }
+
+    return origin;
+}
+
+#endif // wxUSE_GUI
+
+
+#if wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxEventHashTable
+// ----------------------------------------------------------------------------
+
+static const int EVENT_TYPE_TABLE_INIT_SIZE = 31; // Not too big not too small...
+
+wxEventHashTable* wxEventHashTable::sm_first = NULL;
+
+wxEventHashTable::wxEventHashTable(const wxEventTable &table)
+                : m_table(table),
+                  m_rebuildHash(true)
+{
+    AllocEventTypeTable(EVENT_TYPE_TABLE_INIT_SIZE);
+
+    m_next = sm_first;
+    if (m_next)
+        m_next->m_previous = this;
+    sm_first = this;
+}
+
+wxEventHashTable::~wxEventHashTable()
+{
+    if (m_next)
+        m_next->m_previous = m_previous;
+    if (m_previous)
+        m_previous->m_next = m_next;
+    if (sm_first == this)
+        sm_first = m_next;
+
+    Clear();
+}
+
+void wxEventHashTable::Clear()
+{
+    size_t i;
+    for(i = 0; i < m_size; i++)
+    {
+        EventTypeTablePointer  eTTnode = m_eventTypeTable[i];
+        if (eTTnode)
+        {
+            delete eTTnode;
+        }
+    }
+
+    // Necessary in order to not invoke the
+    // overloaded delete operator when statics are cleaned up
+    if (m_eventTypeTable)
+        delete[] m_eventTypeTable;
+
+    m_eventTypeTable = NULL;
+    m_size = 0;
+}
+
+// Clear all tables
+void wxEventHashTable::ClearAll()
+{
+    wxEventHashTable* table = sm_first;
+    while (table)
+    {
+        table->Clear();
+        table = table->m_next;
+    }
+}
+
+// Rebuild all tables if they were cleared by ClearAll
+void wxEventHashTable::ReconstructAll()
+{
+    wxEventHashTable* table = sm_first;
+    while (table)
+    {
+        // This will only be true if the event table was cleared.
+        // What we do here is basically what the constructor does.
+        if(table->m_eventTypeTable == NULL)
+        {
+            table->AllocEventTypeTable(EVENT_TYPE_TABLE_INIT_SIZE);
+            table->m_rebuildHash = true;
+        }
+        table = table->m_next;
+    }
+}
+
+bool wxEventHashTable::HandleEvent(wxEvent &event, wxEvtHandler *self)
+{
+    if (m_rebuildHash)
+    {
+        InitHashTable();
+        m_rebuildHash = false;
+    }
+
+    if (!m_eventTypeTable)
+        return false;
+
+    // Find all entries for the given event type.
+    wxEventType eventType = event.GetEventType();
+    const EventTypeTablePointer eTTnode = m_eventTypeTable[eventType % m_size];
+    if (eTTnode && eTTnode->eventType == eventType)
+    {
+        // Now start the search for an event handler
+        // that can handle an event with the given ID.
+        const wxEventTableEntryPointerArray&
+            eventEntryTable = eTTnode->eventEntryTable;
+
+        const size_t count = eventEntryTable.GetCount();
+        for (size_t n = 0; n < count; n++)
+        {
+            if ( wxEvtHandler::
+                    ProcessEventIfMatches(*eventEntryTable[n], self, event) )
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+void wxEventHashTable::InitHashTable()
+{
+    // Loop over the event tables and all its base tables.
+    const wxEventTable *table = &m_table;
+    while (table)
+    {
+        // Retrieve all valid event handler entries
+        const wxEventTableEntry *entry = table->entries;
+        while (entry->m_fn != 0)
+        {
+            // Add the event entry in the Hash.
+            AddEntry(*entry);
+
+            entry++;
+        }
+
+        table = table->baseTable;
+    }
+
+    // Lets free some memory.
+    size_t i;
+    for(i = 0; i < m_size; i++)
+    {
+        EventTypeTablePointer  eTTnode = m_eventTypeTable[i];
+        if (eTTnode)
+        {
+            eTTnode->eventEntryTable.Shrink();
+        }
+    }
+}
+
+void wxEventHashTable::AddEntry(const wxEventTableEntry &entry)
+{
+    // This might happen 'accidentally' as the app is exiting
+    if (!m_eventTypeTable)
+        return;
+
+    EventTypeTablePointer *peTTnode = &m_eventTypeTable[entry.m_eventType % m_size];
+    EventTypeTablePointer  eTTnode = *peTTnode;
+
+    if (eTTnode)
+    {
+        if (eTTnode->eventType != entry.m_eventType)
+        {
+            // Resize the table!
+            GrowEventTypeTable();
+            // Try again to add it.
+            AddEntry(entry);
+            return;
+        }
+    }
+    else
+    {
+        eTTnode = new EventTypeTable;
+        eTTnode->eventType = entry.m_eventType;
+        *peTTnode = eTTnode;
+    }
+
+    // Fill all hash entries between entry.m_id and entry.m_lastId...
+    eTTnode->eventEntryTable.Add(&entry);
+}
+
+void wxEventHashTable::AllocEventTypeTable(size_t size)
+{
+    m_eventTypeTable = new EventTypeTablePointer[size];
+    memset((void *)m_eventTypeTable, 0, sizeof(EventTypeTablePointer)*size);
+    m_size = size;
+}
+
+void wxEventHashTable::GrowEventTypeTable()
+{
+    size_t oldSize = m_size;
+    EventTypeTablePointer *oldEventTypeTable = m_eventTypeTable;
+
+    // TODO: Search the most optimal grow sequence
+    AllocEventTypeTable(/* GetNextPrime(oldSize) */oldSize*2+1);
+
+    for ( size_t i = 0; i < oldSize; /* */ )
+    {
+        EventTypeTablePointer  eTToldNode = oldEventTypeTable[i];
+        if (eTToldNode)
+        {
+            EventTypeTablePointer *peTTnode = &m_eventTypeTable[eTToldNode->eventType % m_size];
+            EventTypeTablePointer  eTTnode = *peTTnode;
+
+            // Check for collision, we don't want any.
+            if (eTTnode)
+            {
+                GrowEventTypeTable();
+                continue; // Don't increment the counter,
+                          // as we still need to add this element.
+            }
+            else
+            {
+                // Get the old value and put it in the new table.
+                *peTTnode = oldEventTypeTable[i];
+            }
+        }
+
+        i++;
+    }
+
+    delete[] oldEventTypeTable;
+}
+
+
+// ----------------------------------------------------------------------------
+// wxEvtHandler
+// ----------------------------------------------------------------------------
+
+/*
+ * Event handler
+ */
+
+wxEvtHandler::wxEvtHandler()
+{
+    m_nextHandler = (wxEvtHandler *) NULL;
+    m_previousHandler = (wxEvtHandler *) NULL;
+    m_enabled = true;
+    m_dynamicEvents = (wxList *) NULL;
+    m_pendingEvents = (wxList *) NULL;
+#if wxUSE_THREADS
+#  if !defined(__VISAGECPP__)
+    m_eventsLocker = new wxCriticalSection;
+#  endif
+#endif
+
+    // no client data (yet)
+    m_clientData = NULL;
+    m_clientDataType = wxClientData_None;
+}
+
+wxEvtHandler::~wxEvtHandler()
+{
+    // Takes itself out of the list of handlers
+    if (m_previousHandler)
+        m_previousHandler->m_nextHandler = m_nextHandler;
+
+    if (m_nextHandler)
+        m_nextHandler->m_previousHandler = m_previousHandler;
+
+    if (m_dynamicEvents)
+    {
+        for ( wxList::iterator it = m_dynamicEvents->begin(),
+                               end = m_dynamicEvents->end();
+              it != end;
+              ++it )
+        {
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+            wxEventTableEntry *entry = (wxEventTableEntry*)*it;
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)*it;
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+            if (entry->m_callbackUserData)
+                delete entry->m_callbackUserData;
+            delete entry;
+        }
+        delete m_dynamicEvents;
+    };
+
+    if (m_pendingEvents)
+        m_pendingEvents->DeleteContents(true);
+    delete m_pendingEvents;
+
+#if wxUSE_THREADS
+#  if !defined(__VISAGECPP__)
+    delete m_eventsLocker;
+#  endif
+
+    // Remove us from wxPendingEvents if necessary.
+    if(wxPendingEventsLocker)
+        wxENTER_CRIT_SECT(*wxPendingEventsLocker);
+#endif // wxUSE_THREADS
+
+    if ( wxPendingEvents )
+    {
+        // Delete all occurences of this from the list of pending events
+        while (wxPendingEvents->DeleteObject(this)) { } // Do nothing
+    }
+
+#if wxUSE_THREADS
+    if(wxPendingEventsLocker)
+        wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+#endif // wxUSE_THREADS
+
+    // we only delete object data, not untyped
+    if ( m_clientDataType == wxClientData_Object )
+        delete m_clientObject;
+}
+
+#if wxUSE_THREADS
+
+bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
+{
+    // check that we are really in a child thread
+    wxASSERT_MSG( !wxThread::IsMain(),
+                  wxT("use ProcessEvent() in main thread") );
+
+    AddPendingEvent(event);
+
+    return true;
+}
+
+void wxEvtHandler::ClearEventLocker()
+{
+#if !defined(__VISAGECPP__)
+    delete m_eventsLocker;
+    m_eventsLocker = NULL;
+#endif
+}
+
+#endif // wxUSE_THREADS
+
+void wxEvtHandler::AddPendingEvent(wxEvent& event)
+{
+    // 1) Add event to list of pending events of this event handler
+
+    wxEvent *eventCopy = event.Clone();
+
+    // we must be able to copy the events here so the event class must
+    // implement Clone() properly instead of just providing a NULL stab for it
+    wxCHECK_RET( eventCopy,
+                 _T("events of this type aren't supposed to be posted") );
+
+    wxENTER_CRIT_SECT( Lock() );
+
+    if ( !m_pendingEvents )
+      m_pendingEvents = new wxList;
+
+    m_pendingEvents->Append(eventCopy);
+
+    // 2) Add this event handler to list of event handlers that
+    //    have pending events.
+
+    wxENTER_CRIT_SECT(*wxPendingEventsLocker);
+
+    if ( !wxPendingEvents )
+        wxPendingEvents = new wxList;
+    wxPendingEvents->Append(this);
+
+    wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+
+    wxLEAVE_CRIT_SECT( Lock() );
+
+    // 3) Inform the system that new pending events are somewhere,
+    //    and that these should be processed in idle time.
+    wxWakeUpIdle();
+}
+
+void wxEvtHandler::ProcessPendingEvents()
+{
+    // this method is only called by wxApp if this handler does have
+    // pending events
+    wxCHECK_RET( m_pendingEvents,
+                 wxT("Please call wxApp::ProcessPendingEvents() instead") );
+
+    wxENTER_CRIT_SECT( Lock() );
+
+    // we leave the loop once we have processed all events that were present at
+    // the start of ProcessPendingEvents because otherwise we could get into
+    // infinite loop if the pending event handler execution resulted in another
+    // event being posted
+    size_t n = m_pendingEvents->size();
+    for ( wxList::compatibility_iterator node = m_pendingEvents->GetFirst();
+          node;
+          node = m_pendingEvents->GetFirst() )
+    {
+        {
+            wxEventPtr event(wx_static_cast(wxEvent *, node->GetData()));
+
+            // It's important we remove event from list before processing it.
+            // Else a nested event loop, for example from a modal dialog, might
+            // process the same event again.
+
+            m_pendingEvents->Erase(node);
+
+            wxLEAVE_CRIT_SECT( Lock() );
+
+            ProcessEvent(*event);
+        } // delete the event at this block exit, before re-locking our
+          // critical section, to avoid deadlocks if the event dtor locks
+          // something else itself (see #10790)
+
+        wxENTER_CRIT_SECT( Lock() );
+
+        if ( --n == 0 )
+            break;
+    }
+
+    wxLEAVE_CRIT_SECT( Lock() );
+}
+
+/*
+ * Event table stuff
+ */
+/* static */ bool
+wxEvtHandler::ProcessEventIfMatches(const wxEventTableEntryBase& entry,
+                                    wxEvtHandler *handler,
+                                    wxEvent& event)
+{
+    int tableId1 = entry.m_id,
+        tableId2 = entry.m_lastId;
+
+    // match only if the event type is the same and the id is either -1 in
+    // the event table (meaning "any") or the event id matches the id
+    // specified in the event table either exactly or by falling into
+    // range between first and last
+    if ((tableId1 == wxID_ANY) ||
+        (tableId2 == wxID_ANY && tableId1 == event.GetId()) ||
+        (tableId2 != wxID_ANY &&
+         (event.GetId() >= tableId1 && event.GetId() <= tableId2)))
+    {
+        event.Skip(false);
+        event.m_callbackUserData = entry.m_callbackUserData;
+
+#if wxUSE_EXCEPTIONS
+        if ( wxTheApp )
+        {
+            // call the handler via wxApp method which allows the user to catch
+            // any exceptions which may be thrown by any handler in the program
+            // in one place
+            wxTheApp->HandleEvent(handler, (wxEventFunction)entry.m_fn, event);
+        }
+        else
+#endif // wxUSE_EXCEPTIONS
+        {
+            // no need for an extra virtual function call
+            (handler->*((wxEventFunction) (entry.m_fn)))(event);
+        }
+
+        if (!event.GetSkipped())
+            return true;
+    }
+
+    return false;
+}
+
+bool wxEvtHandler::TryParent(wxEvent& event)
+{
+    if ( wxTheApp && (this != wxTheApp) )
+    {
+        // Special case: don't pass wxEVT_IDLE to wxApp, since it'll always
+        // swallow it. wxEVT_IDLE is sent explicitly to wxApp so it will be
+        // processed appropriately via SearchEventTable.
+        if ( event.GetEventType() != wxEVT_IDLE )
+        {
+            if ( wxTheApp->ProcessEvent(event) )
+                return true;
+        }
+    }
+
+    return false;
+}
+
+bool wxEvtHandler::ProcessEvent(wxEvent& event)
+{
+    // allow the application to hook into event processing
+    if ( wxTheApp )
+    {
+        int rc = wxTheApp->FilterEvent(event);
+        if ( rc != -1 )
+        {
+            wxASSERT_MSG( rc == 1 || rc == 0,
+                          _T("unexpected wxApp::FilterEvent return value") );
+
+            return rc != 0;
+        }
+        //else: proceed normally
+    }
+
+    // An event handler can be enabled or disabled
+    if ( GetEvtHandlerEnabled() )
+    {
+        // if we have a validator, it has higher priority than our own event
+        // table
+        if ( TryValidator(event) )
+            return true;
+
+        // Handle per-instance dynamic event tables first
+        if ( m_dynamicEvents && SearchDynamicEventTable(event) )
+            return true;
+
+        // Then static per-class event tables
+        if ( GetEventHashTable().HandleEvent(event, this) )
+            return true;
+    }
+
+    // Try going down the event handler chain
+    if ( GetNextHandler() )
+    {
+        if ( GetNextHandler()->ProcessEvent(event) )
+            return true;
+    }
+
+    // Finally propagate the event upwards the window chain and/or to the
+    // application object as necessary
+    return TryParent(event);
+}
+
+
+bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
+{
+    const wxEventType eventType = event.GetEventType();
+    for ( int i = 0; table.entries[i].m_fn != 0; i++ )
+    {
+        const wxEventTableEntry& entry = table.entries[i];
+        if ( eventType == entry.m_eventType )
+        {
+            if ( ProcessEventIfMatches(entry, this, event) )
+                return true;
+        }
+    }
+
+    return false;
+}
+
+void wxEvtHandler::Connect( int id, int lastId,
+                            int eventType,
+                            wxObjectEventFunction func,
+                            wxObject *userData,
+                            wxEvtHandler* eventSink )
+{
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+    wxEventTableEntry *entry = new wxEventTableEntry;
+    entry->m_eventType = eventType;
+    entry->m_id = id;
+    entry->m_lastId = lastId;
+    entry->m_fn = func;
+    entry->m_callbackUserData = userData;
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+    wxDynamicEventTableEntry *entry =
+        new wxDynamicEventTableEntry(eventType, id, lastId, func, userData, eventSink);
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+    if (!m_dynamicEvents)
+        m_dynamicEvents = new wxList;
+
+    // Insert at the front of the list so most recent additions are found first
+    m_dynamicEvents->Insert( (wxObject*) entry );
+}
+
+bool wxEvtHandler::Disconnect( int id, int lastId, wxEventType eventType,
+                  wxObjectEventFunction func,
+                  wxObject *userData,
+                  wxEvtHandler* eventSink )
+{
+    if (!m_dynamicEvents)
+        return false;
+
+    wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
+    while (node)
+    {
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+            wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+        if ((entry->m_id == id) &&
+            ((entry->m_lastId == lastId) || (lastId == wxID_ANY)) &&
+            ((entry->m_eventType == eventType) || (eventType == wxEVT_NULL)) &&
+            ((entry->m_fn == func) || (func == (wxObjectEventFunction)NULL)) &&
+            ((entry->m_eventSink == eventSink) || (eventSink == (wxEvtHandler*)NULL)) &&
+            ((entry->m_callbackUserData == userData) || (userData == (wxObject*)NULL)))
+        {
+            if (entry->m_callbackUserData)
+                delete entry->m_callbackUserData;
+            m_dynamicEvents->Erase( node );
+            delete entry;
+            return true;
+        }
+        node = node->GetNext();
+    }
+    return false;
+}
+
+bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
+{
+    wxCHECK_MSG( m_dynamicEvents, false,
+                 wxT("caller should check that we have dynamic events") );
+
+    wxList::compatibility_iterator node = m_dynamicEvents->GetFirst();
+    while (node)
+    {
+#if WXWIN_COMPATIBILITY_EVENT_TYPES
+        wxEventTableEntry *entry = (wxEventTableEntry*)node->GetData();
+#else // !WXWIN_COMPATIBILITY_EVENT_TYPES
+        wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
+#endif // WXWIN_COMPATIBILITY_EVENT_TYPES/!WXWIN_COMPATIBILITY_EVENT_TYPES
+
+        // get next node before (maybe) calling the event handler as it could
+        // call Disconnect() invalidating the current node
+        node = node->GetNext();
+
+        if ((event.GetEventType() == entry->m_eventType) && (entry->m_fn != 0))
+        {
+            wxEvtHandler *handler =
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+                                    entry->m_eventSink ? entry->m_eventSink
+                                                       :
+#endif
+                                                         this;
+
+            if ( ProcessEventIfMatches(*entry, handler, event) )
+            {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+void wxEvtHandler::DoSetClientObject( wxClientData *data )
+{
+    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
+                  wxT("can't have both object and void client data") );
+
+    if ( m_clientObject )
+        delete m_clientObject;
+
+    m_clientObject = data;
+    m_clientDataType = wxClientData_Object;
+}
+
+wxClientData *wxEvtHandler::DoGetClientObject() const
+{
+    // it's not an error to call GetClientObject() on a window which doesn't
+    // have client data at all - NULL will be returned
+    wxASSERT_MSG( m_clientDataType != wxClientData_Void,
+                  wxT("this window doesn't have object client data") );
+
+    return m_clientObject;
+}
+
+void wxEvtHandler::DoSetClientData( void *data )
+{
+    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
+                  wxT("can't have both object and void client data") );
+
+    m_clientData = data;
+    m_clientDataType = wxClientData_Void;
+}
+
+void *wxEvtHandler::DoGetClientData() const
+{
+    // it's not an error to call GetClientData() on a window which doesn't have
+    // client data at all - NULL will be returned
+    wxASSERT_MSG( m_clientDataType != wxClientData_Object,
+                  wxT("this window doesn't have void client data") );
+
+    return m_clientData;
+}
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+// Find a window with the focus, that is also a descendant of the given window.
+// This is used to determine the window to initially send commands to.
+wxWindow* wxFindFocusDescendant(wxWindow* ancestor)
+{
+    // Process events starting with the window with the focus, if any.
+    wxWindow* focusWin = wxWindow::FindFocus();
+    wxWindow* win = focusWin;
+
+    // Check if this is a descendant of this frame.
+    // If not, win will be set to NULL.
+    while (win)
+    {
+        if (win == ancestor)
+            break;
+        else
+            win = win->GetParent();
+    }
+    if (win == (wxWindow*) NULL)
+        focusWin = (wxWindow*) NULL;
+
+    return focusWin;
+}
+
+#endif // wxUSE_GUI
diff --git a/Source/3rd Party/wx/src/common/evtloopcmn.cpp b/Source/3rd Party/wx/src/common/evtloopcmn.cpp
index e2c66d616..00bc1001b 100644
--- a/Source/3rd Party/wx/src/common/evtloopcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/evtloopcmn.cpp	
@@ -1,244 +1,172 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/evtloopcmn.cpp
-// Purpose:     common wxEventLoop-related stuff
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     2006-01-12
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/evtloop.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-#endif //WX_PRECOMP
-
-// ----------------------------------------------------------------------------
-// wxEventLoopBase
-// ----------------------------------------------------------------------------
-
-wxEventLoopBase *wxEventLoopBase::ms_activeLoop = NULL;
-
-wxEventLoopBase::wxEventLoopBase()
-{
-    m_isInsideYield = false;
-    m_eventsToProcessInsideYield = wxEVT_CATEGORY_ALL;
-}
-
-bool wxEventLoopBase::IsMain() const
-{
-    if (wxTheApp)
-        return wxTheApp->GetMainLoop() == this;
-    return false;
-}
-
-/* static */
-void wxEventLoopBase::SetActive(wxEventLoopBase* loop)
-{
-    ms_activeLoop = loop;
-
-    if (wxTheApp)
-        wxTheApp->OnEventLoopEnter(loop);
-}
-
-void wxEventLoopBase::OnExit()
-{
-    if (wxTheApp)
-        wxTheApp->OnEventLoopExit(this);
-}
-
-void wxEventLoopBase::WakeUpIdle()
-{
-    WakeUp();
-}
-
-bool wxEventLoopBase::ProcessIdle()
-{
-    return wxTheApp && wxTheApp->ProcessIdle();
-}
-
-bool wxEventLoopBase::Yield(bool onlyIfNeeded)
-{
-    if ( m_isInsideYield )
-    {
-        if ( !onlyIfNeeded )
-        {
-            wxFAIL_MSG( wxT("wxYield called recursively" ) );
-        }
-
-        return false;
-    }
-
-    return YieldFor(wxEVT_CATEGORY_ALL);
-}
-
-// wxEventLoopManual is unused in the other ports
-#if defined(__WINDOWS__) || defined(__WXDFB__) || ( ( defined(__UNIX__) && !defined(__WXOSX__) ) && wxUSE_BASE)
-
-// ============================================================================
-// wxEventLoopManual implementation
-// ============================================================================
-
-wxEventLoopManual::wxEventLoopManual()
-{
-    m_exitcode = 0;
-    m_shouldExit = false;
-}
-
-bool wxEventLoopManual::ProcessEvents()
-{
-    // process pending wx events first as they correspond to low-level events
-    // which happened before, i.e. typically pending events were queued by a
-    // previous call to Dispatch() and if we didn't process them now the next
-    // call to it might enqueue them again (as happens with e.g. socket events
-    // which would be generated as long as there is input available on socket
-    // and this input is only removed from it when pending event handlers are
-    // executed)
-    if ( wxTheApp )
-    {
-        wxTheApp->ProcessPendingEvents();
-
-        // One of the pending event handlers could have decided to exit the
-        // loop so check for the flag before trying to dispatch more events
-        // (which could block indefinitely if no more are coming).
-        if ( m_shouldExit )
-            return false;
-    }
-
-    return Dispatch();
-}
-
-int wxEventLoopManual::Run()
-{
-    // event loops are not recursive, you need to create another loop!
-    wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") );
-
-    // ProcessIdle() and ProcessEvents() below may throw so the code here should
-    // be exception-safe, hence we must use local objects for all actions we
-    // should undo
-    wxEventLoopActivator activate(this);
-
-    // we must ensure that OnExit() is called even if an exception is thrown
-    // from inside ProcessEvents() but we must call it from Exit() in normal
-    // situations because it is supposed to be called synchronously,
-    // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
-    // something similar here)
-#if wxUSE_EXCEPTIONS
-    for ( ;; )
-    {
-        try
-        {
-#endif // wxUSE_EXCEPTIONS
-
-            // this is the event loop itself
-            for ( ;; )
-            {
-                // give them the possibility to do whatever they want
-                OnNextIteration();
-
-                // generate and process idle events for as long as we don't
-                // have anything else to do
-                while ( !m_shouldExit && !Pending() && ProcessIdle() )
-                    ;
-
-                if ( m_shouldExit )
-                    break;
-
-                // a message came or no more idle processing to do, dispatch
-                // all the pending events and call Dispatch() to wait for the
-                // next message
-                if ( !ProcessEvents() )
-                {
-                    // we got WM_QUIT
-                    break;
-                }
-            }
-
-            // Process the remaining queued messages, both at the level of the
-            // underlying toolkit level (Pending/Dispatch()) and wx level
-            // (Has/ProcessPendingEvents()).
-            //
-            // We do run the risk of never exiting this loop if pending event
-            // handlers endlessly generate new events but they shouldn't do
-            // this in a well-behaved program and we shouldn't just discard the
-            // events we already have, they might be important.
-            for ( ;; )
-            {
-                bool hasMoreEvents = false;
-                if ( wxTheApp && wxTheApp->HasPendingEvents() )
-                {
-                    wxTheApp->ProcessPendingEvents();
-                    hasMoreEvents = true;
-                }
-
-                if ( Pending() )
-                {
-                    Dispatch();
-                    hasMoreEvents = true;
-                }
-
-                if ( !hasMoreEvents )
-                    break;
-            }
-
-#if wxUSE_EXCEPTIONS
-            // exit the outer loop as well
-            break;
-        }
-        catch ( ... )
-        {
-            try
-            {
-                if ( !wxTheApp || !wxTheApp->OnExceptionInMainLoop() )
-                {
-                    OnExit();
-                    break;
-                }
-                //else: continue running the event loop
-            }
-            catch ( ... )
-            {
-                // OnException() throwed, possibly rethrowing the same
-                // exception again: very good, but we still need OnExit() to
-                // be called
-                OnExit();
-                throw;
-            }
-        }
-    }
-#endif // wxUSE_EXCEPTIONS
-
-    return m_exitcode;
-}
-
-void wxEventLoopManual::Exit(int rc)
-{
-    wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") );
-
-    m_exitcode = rc;
-    m_shouldExit = true;
-
-    OnExit();
-
-    // all we have to do to exit from the loop is to (maybe) wake it up so that
-    // it can notice that Exit() had been called
-    //
-    // in particular, do *not* use here calls such as PostQuitMessage() (under
-    // MSW) which terminate the current event loop here because we're not sure
-    // that it is going to be processed by the correct event loop: it would be
-    // possible that another one is started and terminated by mistake if we do
-    // this
-    WakeUp();
-}
-
-#endif // __WINDOWS__ || __WXMAC__ || __WXDFB__
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/evtloopcmn.cpp
+// Purpose:     common wxEventLoop-related stuff
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     2006-01-12
+// RCS-ID:      $Id: evtloopcmn.cpp 45938 2007-05-10 02:07:41Z VZ $
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/evtloop.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif //WX_PRECOMP
+
+// see the comment near the declaration of wxRunningEventLoopCount in
+// src/msw/thread.cpp for the explanation of this hack
+#if defined(__WXMSW__) && wxUSE_THREADS
+
+extern WXDLLIMPEXP_DATA_BASE(int) wxRunningEventLoopCount;
+struct wxRunningEventLoopCounter
+{
+    wxRunningEventLoopCounter() { wxRunningEventLoopCount++; }
+    ~wxRunningEventLoopCounter() { wxRunningEventLoopCount--; }
+};
+
+#endif // __WXMSW__
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
+
+// wxEventLoopManual is unused in the other ports
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXDFB__)
+
+// ============================================================================
+// wxEventLoopManual implementation
+// ============================================================================
+
+wxEventLoopManual::wxEventLoopManual()
+{
+    m_exitcode = 0;
+    m_shouldExit = false;
+}
+
+int wxEventLoopManual::Run()
+{
+    // event loops are not recursive, you need to create another loop!
+    wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
+
+    // ProcessIdle() and Dispatch() below may throw so the code here should
+    // be exception-safe, hence we must use local objects for all actions we
+    // should undo
+    wxEventLoopActivator activate(wx_static_cast(wxEventLoop *, this));
+
+#if defined(__WXMSW__) && wxUSE_THREADS
+    wxRunningEventLoopCounter evtLoopCounter;
+#endif // __WXMSW__
+
+    // we must ensure that OnExit() is called even if an exception is thrown
+    // from inside Dispatch() but we must call it from Exit() in normal
+    // situations because it is supposed to be called synchronously,
+    // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
+    // something similar here)
+#if wxUSE_EXCEPTIONS
+    for ( ;; )
+    {
+        try
+        {
+#endif // wxUSE_EXCEPTIONS
+
+            // this is the event loop itself
+            for ( ;; )
+            {
+                // give them the possibility to do whatever they want
+                OnNextIteration();
+
+                // generate and process idle events for as long as we don't
+                // have anything else to do
+                while ( !Pending() && (wxTheApp && wxTheApp->ProcessIdle()) )
+                    ;
+
+                // if the "should exit" flag is set, the loop should terminate
+                // but not before processing any remaining messages so while
+                // Pending() returns true, do process them
+                if ( m_shouldExit )
+                {
+                    while ( Pending() )
+                        Dispatch();
+
+                    break;
+                }
+
+                // a message came or no more idle processing to do, sit in
+                // Dispatch() waiting for the next message
+                if ( !Dispatch() )
+                {
+                    // we got WM_QUIT
+                    break;
+                }
+            }
+
+#if wxUSE_EXCEPTIONS
+            // exit the outer loop as well
+            break;
+        }
+        catch ( ... )
+        {
+            try
+            {
+                if ( !wxTheApp || !wxTheApp->OnExceptionInMainLoop() )
+                {
+                    OnExit();
+                    break;
+                }
+                //else: continue running the event loop
+            }
+            catch ( ... )
+            {
+                // OnException() throwed, possibly rethrowing the same
+                // exception again: very good, but we still need OnExit() to
+                // be called
+                OnExit();
+                throw;
+            }
+        }
+    }
+#endif // wxUSE_EXCEPTIONS
+
+    return m_exitcode;
+}
+
+void wxEventLoopManual::Exit(int rc)
+{
+    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
+
+    m_exitcode = rc;
+    m_shouldExit = true;
+
+    OnExit();
+
+    // all we have to do to exit from the loop is to (maybe) wake it up so that
+    // it can notice that Exit() had been called
+    //
+    // in particular, do *not* use here calls such as PostQuitMessage() (under
+    // MSW) which terminate the current event loop here because we're not sure
+    // that it is going to be processed by the correct event loop: it would be
+    // possible that another one is started and terminated by mistake if we do
+    // this
+    WakeUp();
+}
+
+#endif // __WXMSW__ || __WXMAC__ || __WXDFB__
diff --git a/Source/3rd Party/wx/src/common/execcmn.cpp b/Source/3rd Party/wx/src/common/execcmn.cpp
index 0dc08be3b..2b2025270 100644
--- a/Source/3rd Party/wx/src/common/execcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/execcmn.cpp	
@@ -1,126 +1,122 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/execcmn.cpp
-// Purpose:     defines wxStreamTempInputBuffer which is used by Unix and MSW
-//              implementations of wxExecute; this file is only used by the
-//              library and never by the user code
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     20.08.02
-// RCS-ID:      $Id$
-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WXEXEC_CPP_
-#define _WX_WXEXEC_CPP_
-
-// this file should never be compiled directly, just included by other code
-#ifndef _WX_USED_BY_WXEXECUTE_
-    #error "You should never directly build this file!"
-#endif
-
-// ----------------------------------------------------------------------------
-// wxStreamTempInputBuffer
-// ----------------------------------------------------------------------------
-
-/*
-   wxStreamTempInputBuffer is a hack which we need to solve the problem of
-   executing a child process synchronously with IO redirecting: when we do
-   this, the child writes to a pipe we open to it but when the pipe buffer
-   (which has finite capacity, e.g. commonly just 4Kb) becomes full we have to
-   read data from it because the child blocks in its write() until then and if
-   it blocks we are never going to return from wxExecute() so we dead lock.
-
-   So here is the fix: we now read the output as soon as it appears into a temp
-   buffer (wxStreamTempInputBuffer object) and later just stuff it back into
-   the stream when the process terminates. See supporting code in wxExecute()
-   itself as well.
-
-   Note that this is horribly inefficient for large amounts of output (count
-   the number of times we copy the data around) and so a better API is badly
-   needed! However it's not easy to devise a way to do this keeping backwards
-   compatibility with the existing wxExecute(wxEXEC_SYNC)...
-*/
-
-class wxStreamTempInputBuffer
-{
-public:
-    wxStreamTempInputBuffer();
-
-    // call to associate a stream with this buffer, otherwise nothing happens
-    // at all
-    void Init(wxPipeInputStream *stream);
-
-    // check for input on our stream and cache it in our buffer if any
-    //
-    // return true if anything was done
-    bool Update();
-
-    ~wxStreamTempInputBuffer();
-
-private:
-    // the stream we're buffering, if NULL we don't do anything at all
-    wxPipeInputStream *m_stream;
-
-    // the buffer of size m_size (NULL if m_size == 0)
-    void *m_buffer;
-
-    // the size of the buffer
-    size_t m_size;
-
-    wxDECLARE_NO_COPY_CLASS(wxStreamTempInputBuffer);
-};
-
-inline wxStreamTempInputBuffer::wxStreamTempInputBuffer()
-{
-    m_stream = NULL;
-    m_buffer = NULL;
-    m_size = 0;
-}
-
-inline void wxStreamTempInputBuffer::Init(wxPipeInputStream *stream)
-{
-    m_stream = stream;
-}
-
-inline
-bool wxStreamTempInputBuffer::Update()
-{
-    if ( !m_stream || !m_stream->CanRead() )
-        return false;
-
-    // realloc in blocks of 4Kb: this is the default (and minimal) buffer
-    // size of the Unix pipes so it should be the optimal step
-    //
-    // NB: don't use "static int" in this inline function, some compilers
-    //     (e.g. IBM xlC) don't like it
-    enum { incSize = 4096 };
-
-    void *buf = realloc(m_buffer, m_size + incSize);
-    if ( !buf )
-    {
-        // don't read any more, we don't have enough memory to do it
-        m_stream = NULL;
-    }
-    else // got memory for the buffer
-    {
-        m_buffer = buf;
-        m_stream->Read((char *)m_buffer + m_size, incSize);
-        m_size += m_stream->LastRead();
-    }
-
-    return true;
-}
-
-inline
-wxStreamTempInputBuffer::~wxStreamTempInputBuffer()
-{
-    if ( m_buffer )
-    {
-        m_stream->Ungetch(m_buffer, m_size);
-        free(m_buffer);
-    }
-}
-
-#endif // _WX_WXEXEC_CPP_
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        common/wxexec.cpp
+// Purpose:     defines wxStreamTempInputBuffer which is used by Unix and MSW
+//              implementations of wxExecute; this file is only used by the
+//              library and never by the user code
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     20.08.02
+// RCS-ID:      $Id: execcmn.cpp 35289 2005-08-23 23:12:48Z VZ $
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_WXEXEC_CPP_
+#define _WX_WXEXEC_CPP_
+
+// this file should never be compiled directly, just included by other code
+#ifndef _WX_USED_BY_WXEXECUTE_
+    #error "You should never directly build this file!"
+#endif
+
+// ----------------------------------------------------------------------------
+// wxStreamTempInputBuffer
+// ----------------------------------------------------------------------------
+
+/*
+   wxStreamTempInputBuffer is a hack which we need to solve the problem of
+   executing a child process synchronously with IO redirecting: when we do
+   this, the child writes to a pipe we open to it but when the pipe buffer
+   (which has finite capacity, e.g. commonly just 4Kb) becomes full we have to
+   read data from it because the child blocks in its write() until then and if
+   it blocks we are never going to return from wxExecute() so we dead lock.
+
+   So here is the fix: we now read the output as soon as it appears into a temp
+   buffer (wxStreamTempInputBuffer object) and later just stuff it back into
+   the stream when the process terminates. See supporting code in wxExecute()
+   itself as well.
+
+   Note that this is horribly inefficient for large amounts of output (count
+   the number of times we copy the data around) and so a better API is badly
+   needed! However it's not easy to devise a way to do this keeping backwards
+   compatibility with the existing wxExecute(wxEXEC_SYNC)...
+*/
+
+class wxStreamTempInputBuffer
+{
+public:
+    wxStreamTempInputBuffer();
+
+    // call to associate a stream with this buffer, otherwise nothing happens
+    // at all
+    void Init(wxPipeInputStream *stream);
+
+    // check for input on our stream and cache it in our buffer if any
+    void Update();
+
+    ~wxStreamTempInputBuffer();
+
+private:
+    // the stream we're buffering, if NULL we don't do anything at all
+    wxPipeInputStream *m_stream;
+
+    // the buffer of size m_size (NULL if m_size == 0)
+    void *m_buffer;
+
+    // the size of the buffer
+    size_t m_size;
+
+    DECLARE_NO_COPY_CLASS(wxStreamTempInputBuffer)
+};
+
+inline wxStreamTempInputBuffer::wxStreamTempInputBuffer()
+{
+    m_stream = NULL;
+    m_buffer = NULL;
+    m_size = 0;
+}
+
+inline void wxStreamTempInputBuffer::Init(wxPipeInputStream *stream)
+{
+    m_stream = stream;
+}
+
+inline
+void wxStreamTempInputBuffer::Update()
+{
+    if ( m_stream && m_stream->CanRead() )
+    {
+        // realloc in blocks of 4Kb: this is the default (and minimal) buffer
+        // size of the Unix pipes so it should be the optimal step
+        //
+        // NB: don't use "static int" in this inline function, some compilers
+        //     (e.g. IBM xlC) don't like it
+        enum { incSize = 4096 };
+
+        void *buf = realloc(m_buffer, m_size + incSize);
+        if ( !buf )
+        {
+            // don't read any more, we don't have enough memory to do it
+            m_stream = NULL;
+        }
+        else // got memory for the buffer
+        {
+            m_buffer = buf;
+            m_stream->Read((char *)m_buffer + m_size, incSize);
+            m_size += m_stream->LastRead();
+        }
+    }
+}
+
+inline
+wxStreamTempInputBuffer::~wxStreamTempInputBuffer()
+{
+    if ( m_buffer )
+    {
+        m_stream->Ungetch(m_buffer, m_size);
+        free(m_buffer);
+    }
+}
+
+#endif // _WX_WXEXEC_CPP_
+
diff --git a/Source/3rd Party/wx/src/common/extended.c b/Source/3rd Party/wx/src/common/extended.c
index ec00cc53a..2f9df1b30 100644
--- a/Source/3rd Party/wx/src/common/extended.c	
+++ b/Source/3rd Party/wx/src/common/extended.c	
@@ -1,206 +1,196 @@
-/*****************************************************************************
-** Name:        src/common/extended.c
-** Purpose:     IEEE Extended<->Double routines to save floats to file
-** Maintainer:  Ryan Norton
-** Modified by:
-** Created:     11/24/04
-** RCS-ID:      $Id$
-*****************************************************************************/
-
-
-#if defined(_WIN32_WCE)
-    /* eVC cause warnings in its own headers: stdlib.h and winnt.h */
-    #pragma warning (disable:4115)
-    #pragma warning (disable:4214)
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <limits.h>
-#include <string.h>
-#include "wx/defs.h"
-
-#if defined(_WIN32_WCE)
-    #pragma warning (default:4115)
-    #pragma warning (default:4214)
-#endif
-
-#if wxUSE_APPLE_IEEE
-
-#include "wx/math.h"
-
-/* Copyright (C) 1989-1991 Ken Turkowski. <turk@computer.org>
- *
- * All rights reserved.
- *
- * Warranty Information
- *  Even though I have reviewed this software, I make no warranty
- *  or representation, either express or implied, with respect to this
- *  software, its quality, accuracy, merchantability, or fitness for a
- *  particular purpose.  As a result, this software is provided "as is,"
- *  and you, its user, are assuming the entire risk as to its quality
- *  and accuracy.
- *
- * This code may be used and freely distributed as long as it includes
- * this copyright notice and the above warranty information.
- *
- * Machine-independent I/O routines for IEEE floating-point numbers.
- *
- * NaN's and infinities are converted to HUGE_VAL or HUGE, which
- * happens to be infinity on IEEE machines.  Unfortunately, it is
- * impossible to preserve NaN's in a machine-independent way.
- * Infinities are, however, preserved on IEEE machines.
- *
- * These routines have been tested on the following machines:
- *    Apple Macintosh, MPW 3.1 C compiler
- *    Apple Macintosh, THINK C compiler
- *    Silicon Graphics IRIS, MIPS compiler
- *    Cray X/MP and Y/MP
- *    Digital Equipment VAX
- *    Sequent Balance (Multiprocesor 386)
- *    NeXT
- *
- *
- * Implemented by Malcolm Slaney and Ken Turkowski.
- *
- * Malcolm Slaney contributions during 1988-1990 include big- and little-
- * endian file I/O, conversion to and from Motorola's extended 80-bit
- * floating-point format, and conversions to and from IEEE single-
- * precision floating-point format.
- *
- * In 1991, Ken Turkowski implemented the conversions to and from
- * IEEE double-precision format, added more precision to the extended
- * conversions, and accommodated conversions involving +/- infinity,
- * NaN's, and denormalized numbers.
- */
-
-#ifndef HUGE_VAL
-# define HUGE_VAL HUGE
-#endif /*HUGE_VAL*/
-
-
-/****************************************************************
- * The following two routines make up for deficiencies in many
- * compilers to convert properly between unsigned integers and
- * floating-point.  Some compilers which have this bug are the
- * THINK_C compiler for the Macintosh and the C compiler for the
- * Silicon Graphics MIPS-based Iris.
- ****************************************************************/
-
-#ifdef applec    /* The Apple C compiler works */
-# define FloatToUnsigned(f)   ((wxUint32)(f))
-# define UnsignedToFloat(u)   ((wxFloat64)(u))
-#else /*applec*/
-# define FloatToUnsigned(f)   ((wxUint32)(((wxInt32)((f) - 2147483648.0)) + 2147483647L) + 1)
-# define UnsignedToFloat(u)   (((wxFloat64)((wxInt32)((u) - 2147483647L - 1))) + 2147483648.0)
-#endif /*applec*/
-
-
-
-/****************************************************************
- * Extended precision IEEE floating-point conversion routines.
- * Extended is an 80-bit number as defined by Motorola,
- * with a sign bit, 15 bits of exponent (offset 16383?),
- * and a 64-bit mantissa, with no hidden bit.
- ****************************************************************/
-
-WXDLLIMPEXP_BASE wxFloat64 wxConvertFromIeeeExtended(const wxInt8 *bytes)
-{
-    wxFloat64 f;
-    wxInt32 expon;
-    wxUint32 hiMant, loMant;
-
-    expon = ((bytes[0] & 0x7F) << 8) | (bytes[1] & 0xFF);
-    hiMant = ((wxUint32)(bytes[2] & 0xFF) << 24)
-            | ((wxUint32)(bytes[3] & 0xFF) << 16)
-            | ((wxUint32)(bytes[4] & 0xFF) << 8)
-            | ((wxUint32)(bytes[5] & 0xFF));
-    loMant = ((wxUint32)(bytes[6] & 0xFF) << 24)
-            | ((wxUint32)(bytes[7] & 0xFF) << 16)
-            | ((wxUint32)(bytes[8] & 0xFF) << 8)
-            | ((wxUint32)(bytes[9] & 0xFF));
-
-    if (expon == 0 && hiMant == 0 && loMant == 0) {
-        f = 0;
-    }
-    else {
-        if (expon == 0x7FFF) { /* Infinity or NaN */
-            f = HUGE_VAL;
-        }
-        else {
-            expon -= 16383;
-            f  = ldexp(UnsignedToFloat(hiMant), expon-=31);
-            f += ldexp(UnsignedToFloat(loMant), expon-=32);
-        }
-    }
-
-    if (bytes[0] & 0x80)
-        return -f;
-    else
-        return f;
-}
-
-
-/****************************************************************/
-
-
-WXDLLIMPEXP_BASE void wxConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
-{
-    wxInt32 sign;
-    wxInt32 expon;
-    wxFloat64 fMant, fsMant;
-    wxUint32 hiMant, loMant;
-
-    if (num < 0) {
-        sign = 0x8000;
-        num *= -1;
-    } else {
-        sign = 0;
-    }
-
-    if (num == 0) {
-        expon = 0; hiMant = 0; loMant = 0;
-    }
-    else {
-        fMant = frexp(num, &expon);
-        if ((expon > 16384) || !(fMant < 1)) { /* Infinity or NaN */
-            expon = sign|0x7FFF; hiMant = 0; loMant = 0; /* infinity */
-        }
-        else { /* Finite */
-            expon += 16382;
-            if (expon < 0) { /* denormalized */
-                fMant = ldexp(fMant, expon);
-                expon = 0;
-            }
-            expon |= sign;
-            fMant = ldexp(fMant, 32);          fsMant = floor(fMant); hiMant = FloatToUnsigned(fsMant);
-            fMant = ldexp(fMant - fsMant, 32); fsMant = floor(fMant); loMant = FloatToUnsigned(fsMant);
-        }
-    }
-
-    bytes[0] = expon >> 8;
-    bytes[1] = expon;
-    bytes[2] = hiMant >> 24;
-    bytes[3] = hiMant >> 16;
-    bytes[4] = hiMant >> 8;
-    bytes[5] = hiMant;
-    bytes[6] = loMant >> 24;
-    bytes[7] = loMant >> 16;
-    bytes[8] = loMant >> 8;
-    bytes[9] = loMant;
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-WXDLLIMPEXP_BASE wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
-{
-    return wxConvertFromIeeeExtended(bytes);
-}
-
-WXDLLIMPEXP_BASE void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
-{
-    wxConvertToIeeeExtended(num, bytes);
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-#endif /* wxUSE_APPLE_IEEE */
+/*****************************************************************************
+** Name:        extended.c
+** Purpose:     IEEE Extended<->Double routines to save floats to file
+** Maintainer:  Ryan Norton
+** Modified by:
+** Created:     11/24/04
+** RCS-ID:      $Id: extended.c 36952 2006-01-18 10:25:04Z JS $
+*****************************************************************************/
+
+
+#if defined(_WIN32_WCE)
+    /* eVC cause warnings in its own headers: stdlib.h and winnt.h */
+    #pragma warning (disable:4115)
+    #pragma warning (disable:4214)
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <limits.h>
+#include <string.h>
+#include "wx/defs.h"
+
+#if defined(_WIN32_WCE)
+    #pragma warning (default:4115)
+    #pragma warning (default:4214)
+#endif
+
+#if wxUSE_APPLE_IEEE
+
+#include "wx/math.h"
+
+/* Copyright (C) 1989-1991 Ken Turkowski. <turk@computer.org>
+ *
+ * All rights reserved.
+ *
+ * Warranty Information
+ *  Even though I have reviewed this software, I make no warranty
+ *  or representation, either express or implied, with respect to this
+ *  software, its quality, accuracy, merchantability, or fitness for a
+ *  particular purpose.  As a result, this software is provided "as is,"
+ *  and you, its user, are assuming the entire risk as to its quality
+ *  and accuracy.
+ *
+ * This code may be used and freely distributed as long as it includes
+ * this copyright notice and the above warranty information.
+ *
+ * Machine-independent I/O routines for IEEE floating-point numbers.
+ *
+ * NaN's and infinities are converted to HUGE_VAL or HUGE, which
+ * happens to be infinity on IEEE machines.  Unfortunately, it is
+ * impossible to preserve NaN's in a machine-independent way.
+ * Infinities are, however, preserved on IEEE machines.
+ *
+ * These routines have been tested on the following machines:
+ *    Apple Macintosh, MPW 3.1 C compiler
+ *    Apple Macintosh, THINK C compiler
+ *    Silicon Graphics IRIS, MIPS compiler
+ *    Cray X/MP and Y/MP
+ *    Digital Equipment VAX
+ *    Sequent Balance (Multiprocesor 386)
+ *    NeXT
+ *
+ *
+ * Implemented by Malcolm Slaney and Ken Turkowski.
+ *
+ * Malcolm Slaney contributions during 1988-1990 include big- and little-
+ * endian file I/O, conversion to and from Motorola's extended 80-bit
+ * floating-point format, and conversions to and from IEEE single-
+ * precision floating-point format.
+ *
+ * In 1991, Ken Turkowski implemented the conversions to and from
+ * IEEE double-precision format, added more precision to the extended
+ * conversions, and accommodated conversions involving +/- infinity,
+ * NaN's, and denormalized numbers.
+ */
+
+#ifndef HUGE_VAL
+# define HUGE_VAL HUGE
+#endif /*HUGE_VAL*/
+
+
+/****************************************************************
+ * The following two routines make up for deficiencies in many
+ * compilers to convert properly between unsigned integers and
+ * floating-point.  Some compilers which have this bug are the
+ * THINK_C compiler for the Macintosh and the C compiler for the
+ * Silicon Graphics MIPS-based Iris.
+ ****************************************************************/
+
+#ifdef applec    /* The Apple C compiler works */
+# define FloatToUnsigned(f)   ((wxUint32)(f))
+# define UnsignedToFloat(u)   ((wxFloat64)(u))
+#else /*applec*/
+# define FloatToUnsigned(f)   ((wxUint32)(((wxInt32)((f) - 2147483648.0)) + 2147483647L) + 1)
+# define UnsignedToFloat(u)   (((wxFloat64)((wxInt32)((u) - 2147483647L - 1))) + 2147483648.0)
+#endif /*applec*/
+
+
+
+/****************************************************************
+ * Extended precision IEEE floating-point conversion routines.
+ * Extended is an 80-bit number as defined by Motorola,
+ * with a sign bit, 15 bits of exponent (offset 16383?),
+ * and a 64-bit mantissa, with no hidden bit.
+ ****************************************************************/
+
+wxFloat64 ConvertFromIeeeExtended(const wxInt8 *bytes)
+{
+    wxFloat64 f;
+    wxInt32 expon;
+    wxUint32 hiMant, loMant;
+
+    expon = ((bytes[0] & 0x7F) << 8) | (bytes[1] & 0xFF);
+    hiMant = ((wxUint32)(bytes[2] & 0xFF) << 24)
+            | ((wxUint32)(bytes[3] & 0xFF) << 16)
+            | ((wxUint32)(bytes[4] & 0xFF) << 8)
+            | ((wxUint32)(bytes[5] & 0xFF));
+    loMant = ((wxUint32)(bytes[6] & 0xFF) << 24)
+            | ((wxUint32)(bytes[7] & 0xFF) << 16)
+            | ((wxUint32)(bytes[8] & 0xFF) << 8)
+            | ((wxUint32)(bytes[9] & 0xFF));
+
+    if (expon == 0 && hiMant == 0 && loMant == 0) {
+        f = 0;
+    }
+    else {
+        if (expon == 0x7FFF) { /* Infinity or NaN */
+            f = HUGE_VAL;
+        }
+        else {
+            expon -= 16383;
+            f  = ldexp(UnsignedToFloat(hiMant), expon-=31);
+            f += ldexp(UnsignedToFloat(loMant), expon-=32);
+        }
+    }
+
+    if (bytes[0] & 0x80)
+        return -f;
+    else
+        return f;
+}
+
+
+/****************************************************************/
+
+
+void ConvertToIeeeExtended(wxFloat64 num, wxInt8 *bytes)
+{
+    wxInt32 sign;
+    wxInt32 expon;
+    wxFloat64 fMant, fsMant;
+    wxUint32 hiMant, loMant;
+
+    if (num < 0) {
+        sign = 0x8000;
+        num *= -1;
+    } else {
+        sign = 0;
+    }
+
+    if (num == 0) {
+        expon = 0; hiMant = 0; loMant = 0;
+    }
+    else {
+        fMant = frexp(num, &expon);
+        if ((expon > 16384) || !(fMant < 1)) { /* Infinity or NaN */
+            expon = sign|0x7FFF; hiMant = 0; loMant = 0; /* infinity */
+        }
+        else { /* Finite */
+            expon += 16382;
+            if (expon < 0) { /* denormalized */
+                fMant = ldexp(fMant, expon);
+                expon = 0;
+            }
+            expon |= sign;
+            fMant = ldexp(fMant, 32);          fsMant = floor(fMant); hiMant = FloatToUnsigned(fsMant);
+            fMant = ldexp(fMant - fsMant, 32); fsMant = floor(fMant); loMant = FloatToUnsigned(fsMant);
+        }
+    }
+
+    bytes[0] = expon >> 8;
+    bytes[1] = expon;
+    bytes[2] = hiMant >> 24;
+    bytes[3] = hiMant >> 16;
+    bytes[4] = hiMant >> 8;
+    bytes[5] = hiMant;
+    bytes[6] = loMant >> 24;
+    bytes[7] = loMant >> 16;
+    bytes[8] = loMant >> 8;
+    bytes[9] = loMant;
+}
+
+
+
+#endif /* wxUSE_APPLE_IEEE */
diff --git a/Source/3rd Party/wx/src/common/fddlgcmn.cpp b/Source/3rd Party/wx/src/common/fddlgcmn.cpp
index 454e3014d..64d9f91cc 100644
--- a/Source/3rd Party/wx/src/common/fddlgcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/fddlgcmn.cpp	
@@ -1,102 +1,102 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fddlgcmn.cpp
-// Purpose:     common parts of wxFindReplaceDialog implementations
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     01.08.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FINDREPLDLG
-
-#ifndef WX_PRECOMP
-#endif
-
-#include "wx/fdrepdlg.h"
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFindDialogEvent, wxCommandEvent)
-
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND, wxFindDialogEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND_NEXT, wxFindDialogEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND_REPLACE, wxFindDialogEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND_REPLACE_ALL, wxFindDialogEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_FIND_CLOSE, wxFindDialogEvent );
-
-// ============================================================================
-// implementations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxFindReplaceData
-// ----------------------------------------------------------------------------
-
-void wxFindReplaceData::Init()
-{
-    m_Flags = 0;
-}
-
-// ----------------------------------------------------------------------------
-// wxFindReplaceDialogBase
-// ----------------------------------------------------------------------------
-
-wxFindReplaceDialogBase::~wxFindReplaceDialogBase()
-{
-}
-
-void wxFindReplaceDialogBase::Send(wxFindDialogEvent& event)
-{
-    // we copy the data to dialog->GetData() as well
-
-    m_FindReplaceData->m_Flags = event.GetFlags();
-    m_FindReplaceData->m_FindWhat = event.GetFindString();
-    if ( HasFlag(wxFR_REPLACEDIALOG) &&
-         (event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE ||
-          event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE_ALL) )
-    {
-        m_FindReplaceData->m_ReplaceWith = event.GetReplaceString();
-    }
-
-    // translate wxEVT_COMMAND_FIND_NEXT to wxEVT_COMMAND_FIND if needed
-    if ( event.GetEventType() == wxEVT_COMMAND_FIND_NEXT )
-    {
-        if ( m_FindReplaceData->m_FindWhat != m_lastSearch )
-        {
-            event.SetEventType(wxEVT_COMMAND_FIND);
-
-            m_lastSearch = m_FindReplaceData->m_FindWhat;
-        }
-    }
-
-    if ( !GetEventHandler()->ProcessEvent(event) )
-    {
-        // the event is not propagated upwards to the parent automatically
-        // because the dialog is a top level window, so do it manually as
-        // in 9 cases of 10 the message must be processed by the dialog
-        // owner and not the dialog itself
-        (void)GetParent()->GetEventHandler()->ProcessEvent(event);
-    }
-}
-
-#endif // wxUSE_FINDREPLDLG
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fdrepdlg.cpp
+// Purpose:     common parts of wxFindReplaceDialog implementations
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     01.08.01
+// RCS-ID:
+// Copyright:   (c) 2001 Vadim Zeitlin
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FINDREPLDLG
+
+#ifndef WX_PRECOMP
+#endif
+
+#include "wx/fdrepdlg.h"
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxFindDialogEvent, wxCommandEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_NEXT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_REPLACE_ALL)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FIND_CLOSE)
+
+// ============================================================================
+// implementations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFindReplaceData
+// ----------------------------------------------------------------------------
+
+void wxFindReplaceData::Init()
+{
+    m_Flags = 0;
+}
+
+// ----------------------------------------------------------------------------
+// wxFindReplaceDialogBase
+// ----------------------------------------------------------------------------
+
+wxFindReplaceDialogBase::~wxFindReplaceDialogBase()
+{
+}
+
+void wxFindReplaceDialogBase::Send(wxFindDialogEvent& event)
+{
+    // we copy the data to dialog->GetData() as well
+
+    m_FindReplaceData->m_Flags = event.GetFlags();
+    m_FindReplaceData->m_FindWhat = event.GetFindString();
+    if ( HasFlag(wxFR_REPLACEDIALOG) &&
+         (event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE ||
+          event.GetEventType() == wxEVT_COMMAND_FIND_REPLACE_ALL) )
+    {
+        m_FindReplaceData->m_ReplaceWith = event.GetReplaceString();
+    }
+
+    // translate wxEVT_COMMAND_FIND_NEXT to wxEVT_COMMAND_FIND if needed
+    if ( event.GetEventType() == wxEVT_COMMAND_FIND_NEXT )
+    {
+        if ( m_FindReplaceData->m_FindWhat != m_lastSearch )
+        {
+            event.SetEventType(wxEVT_COMMAND_FIND);
+
+            m_lastSearch = m_FindReplaceData->m_FindWhat;
+        }
+    }
+
+    if ( !GetEventHandler()->ProcessEvent(event) )
+    {
+        // the event is not propagated upwards to the parent automatically
+        // because the dialog is a top level window, so do it manually as
+        // in 9 cases of 10 the message must be processed by the dialog
+        // owner and not the dialog itself
+        (void)GetParent()->GetEventHandler()->ProcessEvent(event);
+    }
+}
+
+#endif // wxUSE_FINDREPLDLG
+
diff --git a/Source/3rd Party/wx/src/common/ffile.cpp b/Source/3rd Party/wx/src/common/ffile.cpp
index c05b959de..92bc8ede9 100644
--- a/Source/3rd Party/wx/src/common/ffile.cpp	
+++ b/Source/3rd Party/wx/src/common/ffile.cpp	
@@ -1,265 +1,256 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/ffile.cpp
-// Purpose:     wxFFile encapsulates "FILE *" IO stream
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     14.07.99
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_FFILE
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/crt.h"
-#endif
-
-#ifdef __WINDOWS__
-#include "wx/msw/mslu.h"
-#endif
-
-#include "wx/ffile.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// opening the file
-// ----------------------------------------------------------------------------
-
-wxFFile::wxFFile(const wxString& filename, const wxString& mode)
-{
-    Detach();
-
-    (void)Open(filename, mode);
-}
-
-bool wxFFile::Open(const wxString& filename, const wxString& mode)
-{
-    wxASSERT_MSG( !m_fp, wxT("should close or detach the old file first") );
-
-    m_fp = wxFopen(filename, mode);
-
-    if ( !m_fp )
-    {
-        wxLogSysError(_("can't open file '%s'"), filename);
-
-        return false;
-    }
-
-    m_name = filename;
-
-    return true;
-}
-
-bool wxFFile::Close()
-{
-    if ( IsOpened() )
-    {
-        if ( fclose(m_fp) != 0 )
-        {
-            wxLogSysError(_("can't close file '%s'"), m_name.c_str());
-
-            return false;
-        }
-
-        Detach();
-    }
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// read/write
-// ----------------------------------------------------------------------------
-
-bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)
-{
-    wxCHECK_MSG( str, false, wxT("invalid parameter") );
-    wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") );
-    wxCHECK_MSG( Length() >= 0, false, wxT("invalid length") );
-    size_t length = wx_truncate_cast(size_t, Length());
-    wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
-
-    clearerr(m_fp);
-
-    wxCharBuffer buf(length + 1);
-
-    // note that real length may be less than file length for text files with DOS EOLs
-    // ('\r's get dropped by CRT when reading which means that we have
-    // realLen = fileLen - numOfLinesInTheFile)
-    length = fread(buf.data(), sizeof(char), length, m_fp);
-
-    if ( Error() )
-    {
-        wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
-
-        return false;
-    }
-
-    buf.data()[length] = 0;
-    *str = wxString(buf, conv);
-
-    return true;
-}
-
-size_t wxFFile::Read(void *pBuf, size_t nCount)
-{
-    wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") );
-    wxCHECK_MSG( IsOpened(), 0, wxT("can't read from closed file") );
-
-    size_t nRead = fread(pBuf, 1, nCount, m_fp);
-    if ( (nRead < nCount) && Error() )
-    {
-        wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
-    }
-
-    return nRead;
-}
-
-size_t wxFFile::Write(const void *pBuf, size_t nCount)
-{
-    wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") );
-    wxCHECK_MSG( IsOpened(), 0, wxT("can't write to closed file") );
-
-    size_t nWritten = fwrite(pBuf, 1, nCount, m_fp);
-    if ( nWritten < nCount )
-    {
-        wxLogSysError(_("Write error on file '%s'"), m_name.c_str());
-    }
-
-    return nWritten;
-}
-
-bool wxFFile::Write(const wxString& s, const wxMBConv& conv)
-{
-  const wxWX2MBbuf buf = s.mb_str(conv);
-  if ( !buf )
-      return false;
-
-  const size_t size = strlen(buf); // FIXME: use buf.length() when available
-  return Write(buf, size) == size;
-}
-
-bool wxFFile::Flush()
-{
-    if ( IsOpened() )
-    {
-        if ( fflush(m_fp) != 0 )
-        {
-            wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
-
-            return false;
-        }
-    }
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// seeking
-// ----------------------------------------------------------------------------
-
-bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode)
-{
-    wxCHECK_MSG( IsOpened(), false, wxT("can't seek on closed file") );
-
-    int origin;
-    switch ( mode )
-    {
-        default:
-            wxFAIL_MSG(wxT("unknown seek mode"));
-            // still fall through
-
-        case wxFromStart:
-            origin = SEEK_SET;
-            break;
-
-        case wxFromCurrent:
-            origin = SEEK_CUR;
-            break;
-
-        case wxFromEnd:
-            origin = SEEK_END;
-            break;
-    }
-
-#ifndef wxHAS_LARGE_FFILES
-    if ((long)ofs != ofs)
-    {
-        wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());
-
-        return false;
-    }
-
-    if ( wxFseek(m_fp, (long)ofs, origin) != 0 )
-#else
-    if ( wxFseek(m_fp, ofs, origin) != 0 )
-#endif
-    {
-        wxLogSysError(_("Seek error on file '%s'"), m_name.c_str());
-
-        return false;
-    }
-
-    return true;
-}
-
-wxFileOffset wxFFile::Tell() const
-{
-    wxCHECK_MSG( IsOpened(), wxInvalidOffset,
-                 wxT("wxFFile::Tell(): file is closed!") );
-
-    wxFileOffset rc = wxFtell(m_fp);
-    if ( rc == wxInvalidOffset )
-    {
-        wxLogSysError(_("Can't find current position in file '%s'"),
-                      m_name.c_str());
-    }
-
-    return rc;
-}
-
-wxFileOffset wxFFile::Length() const
-{
-    wxCHECK_MSG( IsOpened(), wxInvalidOffset,
-                 wxT("wxFFile::Length(): file is closed!") );
-
-    wxFFile& self = *const_cast<wxFFile *>(this);
-
-    wxFileOffset posOld = Tell();
-    if ( posOld != wxInvalidOffset )
-    {
-        if ( self.SeekEnd() )
-        {
-            wxFileOffset len = Tell();
-
-            (void)self.Seek(posOld);
-
-            return len;
-        }
-    }
-
-    return wxInvalidOffset;
-}
-
-#endif // wxUSE_FFILE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        ffile.cpp
+// Purpose:     wxFFile encapsulates "FILE *" IO stream
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     14.07.99
+// RCS-ID:      $Id: ffile.cpp 63300 2010-01-28 21:36:09Z MW $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_FFILE
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#ifdef __WINDOWS__
+#include "wx/msw/mslu.h"
+#endif
+
+#include "wx/ffile.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// opening the file
+// ----------------------------------------------------------------------------
+
+wxFFile::wxFFile(const wxChar *filename, const wxChar *mode)
+{
+    Detach();
+
+    (void)Open(filename, mode);
+}
+
+bool wxFFile::Open(const wxChar *filename, const wxChar *mode)
+{
+    wxASSERT_MSG( !m_fp, wxT("should close or detach the old file first") );
+
+    m_fp = wxFopen(filename, mode);
+
+    if ( !m_fp )
+    {
+        wxLogSysError(_("can't open file '%s'"), filename);
+
+        return false;
+    }
+
+    m_name = filename;
+
+    return true;
+}
+
+bool wxFFile::Close()
+{
+    if ( IsOpened() )
+    {
+        if ( fclose(m_fp) != 0 )
+        {
+            wxLogSysError(_("can't close file '%s'"), m_name.c_str());
+
+            return false;
+        }
+
+        Detach();
+    }
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// read/write
+// ----------------------------------------------------------------------------
+
+bool wxFFile::ReadAll(wxString *str, const wxMBConv& conv)
+{
+    wxCHECK_MSG( str, false, wxT("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), false, wxT("can't read from closed file") );
+    wxCHECK_MSG( Length() >= 0, false, wxT("invalid length") );
+    size_t length = wx_truncate_cast(size_t, Length());
+    wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
+
+    clearerr(m_fp);
+
+    wxCharBuffer buf(length + 1);
+
+    // note that real length may be less than file length for text files with DOS EOLs
+    // ('\r's get dropped by CRT when reading which means that we have
+    // realLen = fileLen - numOfLinesInTheFile)
+    length = fread(buf.data(), sizeof(char), length, m_fp);
+
+    if ( Error() ) 
+    {
+        wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
+
+        return false;
+    }
+
+    buf.data()[length] = 0;
+    *str = wxString(buf, conv);
+
+    return true;
+}
+
+size_t wxFFile::Read(void *pBuf, size_t nCount)
+{
+    wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), 0, wxT("can't read from closed file") );
+
+    size_t nRead = fread(pBuf, 1, nCount, m_fp);
+    if ( (nRead < nCount) && Error() )
+    {
+        wxLogSysError(_("Read error on file '%s'"), m_name.c_str());
+    }
+
+    return nRead;
+}
+
+size_t wxFFile::Write(const void *pBuf, size_t nCount)
+{
+    wxCHECK_MSG( pBuf, 0, wxT("invalid parameter") );
+    wxCHECK_MSG( IsOpened(), 0, wxT("can't write to closed file") );
+
+    size_t nWritten = fwrite(pBuf, 1, nCount, m_fp);
+    if ( nWritten < nCount )
+    {
+        wxLogSysError(_("Write error on file '%s'"), m_name.c_str());
+    }
+
+    return nWritten;
+}
+
+bool wxFFile::Flush()
+{
+    if ( IsOpened() )
+    {
+        // fflush returns non-zero on error
+        //
+        if ( fflush(m_fp) )
+        {
+            wxLogSysError(_("failed to flush the file '%s'"), m_name.c_str());
+
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// seeking
+// ----------------------------------------------------------------------------
+
+bool wxFFile::Seek(wxFileOffset ofs, wxSeekMode mode)
+{
+    wxCHECK_MSG( IsOpened(), false, wxT("can't seek on closed file") );
+
+    int origin;
+    switch ( mode )
+    {
+        default:
+            wxFAIL_MSG(wxT("unknown seek mode"));
+            // still fall through
+
+        case wxFromStart:
+            origin = SEEK_SET;
+            break;
+
+        case wxFromCurrent:
+            origin = SEEK_CUR;
+            break;
+
+        case wxFromEnd:
+            origin = SEEK_END;
+            break;
+    }
+
+#ifndef wxHAS_LARGE_FFILES
+    if ((long)ofs != ofs)
+    {
+        wxLogError(_("Seek error on file '%s' (large files not supported by stdio)"), m_name.c_str());
+
+        return false;
+    }
+
+    if ( wxFseek(m_fp, (long)ofs, origin) != 0 )
+#else
+    if ( wxFseek(m_fp, ofs, origin) != 0 )
+#endif
+    {
+        wxLogSysError(_("Seek error on file '%s'"), m_name.c_str());
+
+        return false;
+    }
+
+    return true;
+}
+
+wxFileOffset wxFFile::Tell() const
+{
+    wxCHECK_MSG( IsOpened(), wxInvalidOffset,
+                 _T("wxFFile::Tell(): file is closed!") );
+
+    wxFileOffset rc = wxFtell(m_fp);
+    if ( rc == wxInvalidOffset )
+    {
+        wxLogSysError(_("Can't find current position in file '%s'"),
+                      m_name.c_str());
+    }
+
+    return rc;
+}
+
+wxFileOffset wxFFile::Length() const
+{
+    wxCHECK_MSG( IsOpened(), wxInvalidOffset,
+                 _T("wxFFile::Length(): file is closed!") );
+
+    wxFFile& self = *(wxFFile *)this;   // const_cast
+
+    wxFileOffset posOld = Tell();
+    if ( posOld != wxInvalidOffset )
+    {
+        if ( self.SeekEnd() )
+        {
+            wxFileOffset len = Tell();
+
+            (void)self.Seek(posOld);
+
+            return len;
+        }
+    }
+
+    return wxInvalidOffset;
+}
+
+#endif // wxUSE_FFILE
diff --git a/Source/3rd Party/wx/src/common/file.cpp b/Source/3rd Party/wx/src/common/file.cpp
index d2a8f7f57..26f0ce80d 100644
--- a/Source/3rd Party/wx/src/common/file.cpp	
+++ b/Source/3rd Party/wx/src/common/file.cpp	
@@ -1,593 +1,559 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/file.cpp
-// Purpose:     wxFile - encapsulates low-level "file descriptor"
-//              wxTempFile
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_FILE
-
-// standard
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-
-#define   NOSERVICE
-#define   NOIME
-#define   NOATOM
-#define   NOGDI
-#define   NOGDICAPMASKS
-#define   NOMETAFILE
-#define   NOMINMAX
-#define   NOMSG
-#define   NOOPENFILE
-#define   NORASTEROPS
-#define   NOSCROLL
-#define   NOSOUND
-#define   NOSYSMETRICS
-#define   NOTEXTMETRIC
-#define   NOWH
-#define   NOCOMM
-#define   NOKANJI
-#define   NOCRYPT
-#define   NOMCX
-
-#elif defined(__WINDOWS__) && defined(__WXWINCE__)
-    #include  "wx/msw/missing.h"
-#elif (defined(__OS2__))
-    #include <io.h>
-#elif (defined(__UNIX__) || defined(__GNUWIN32__))
-    #include  <unistd.h>
-    #include  <time.h>
-    #include  <sys/stat.h>
-    #ifdef __GNUWIN32__
-        #include "wx/msw/wrapwin.h"
-    #endif
-#elif defined(__DOS__)
-    #if defined(__WATCOMC__)
-       #include <io.h>
-    #elif defined(__DJGPP__)
-       #include <io.h>
-       #include <unistd.h>
-       #include <stdio.h>
-    #else
-        #error  "Please specify the header with file functions declarations."
-    #endif
-#elif (defined(__WXSTUBS__))
-    // Have to ifdef this for different environments
-    #include <io.h>
-#elif (defined(__WXMAC__))
-#if __MSL__ < 0x6000
-    int access( const char *path, int mode ) { return 0 ; }
-#else
-    int _access( const char *path, int mode ) { return 0 ; }
-#endif
-    char* mktemp( char * path ) { return path ;}
-    #include <stat.h>
-    #include <unistd.h>
-#else
-    #error  "Please specify the header with file functions declarations."
-#endif  //Win/UNIX
-
-#include  <stdio.h>       // SEEK_xxx constants
-
-#ifndef __WXWINCE__
-    #include <errno.h>
-#endif
-
-// Windows compilers don't have these constants
-#ifndef W_OK
-    enum
-    {
-        F_OK = 0,   // test for existence
-        X_OK = 1,   //          execute permission
-        W_OK = 2,   //          write
-        R_OK = 4    //          read
-    };
-#endif // W_OK
-
-// wxWidgets
-#ifndef WX_PRECOMP
-    #include  "wx/string.h"
-    #include  "wx/intl.h"
-    #include  "wx/log.h"
-    #include "wx/crt.h"
-#endif // !WX_PRECOMP
-
-#include  "wx/filename.h"
-#include  "wx/file.h"
-#include  "wx/filefn.h"
-
-// there is no distinction between text and binary files under Unix, so define
-// O_BINARY as 0 if the system headers don't do it already
-#if defined(__UNIX__) && !defined(O_BINARY)
-    #define   O_BINARY    (0)
-#endif  //__UNIX__
-
-#ifdef __WINDOWS__
-    #include "wx/msw/mslu.h"
-#endif
-
-#ifdef __WXWINCE__
-    #include "wx/msw/private.h"
-#endif
-
-#ifndef MAX_PATH
-    #define MAX_PATH 512
-#endif
-
-// ============================================================================
-// implementation of wxFile
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// static functions
-// ----------------------------------------------------------------------------
-
-bool wxFile::Exists(const wxString& name)
-{
-    return wxFileExists(name);
-}
-
-bool wxFile::Access(const wxString& name, OpenMode mode)
-{
-    int how;
-
-    switch ( mode )
-    {
-        default:
-            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
-            // fall through
-
-        case read:
-            how = R_OK;
-            break;
-
-        case write:
-            how = W_OK;
-            break;
-
-        case read_write:
-            how = R_OK | W_OK;
-            break;
-    }
-
-    return wxAccess(name, how) == 0;
-}
-
-// ----------------------------------------------------------------------------
-// opening/closing
-// ----------------------------------------------------------------------------
-
-// ctors
-wxFile::wxFile(const wxString& fileName, OpenMode mode)
-{
-    m_fd = fd_invalid;
-    m_lasterror = 0;
-
-    Open(fileName, mode);
-}
-
-bool wxFile::CheckForError(wxFileOffset rc) const
-{
-    if ( rc != -1 )
-        return false;
-
-    const_cast<wxFile *>(this)->m_lasterror =
-#ifndef __WXWINCE__
-                                                errno
-#else
-                                                ::GetLastError()
-#endif
-                                                ;
-
-    return true;
-}
-
-// create the file, fail if it already exists and bOverwrite
-bool wxFile::Create(const wxString& fileName, bool bOverwrite, int accessMode)
-{
-    // if bOverwrite we create a new file or truncate the existing one,
-    // otherwise we only create the new file and fail if it already exists
-    int fd = wxOpen( fileName,
-                     O_BINARY | O_WRONLY | O_CREAT |
-                     (bOverwrite ? O_TRUNC : O_EXCL),
-                     accessMode );
-    if ( CheckForError(fd) )
-    {
-        wxLogSysError(_("can't create file '%s'"), fileName);
-        return false;
-    }
-
-    Attach(fd);
-    return true;
-}
-
-// open the file
-bool wxFile::Open(const wxString& fileName, OpenMode mode, int accessMode)
-{
-    int flags = O_BINARY;
-
-    switch ( mode )
-    {
-        case read:
-            flags |= O_RDONLY;
-            break;
-
-        case write_append:
-            if ( wxFile::Exists(fileName) )
-            {
-                flags |= O_WRONLY | O_APPEND;
-                break;
-            }
-            //else: fall through as write_append is the same as write if the
-            //      file doesn't exist
-
-        case write:
-            flags |= O_WRONLY | O_CREAT | O_TRUNC;
-            break;
-
-        case write_excl:
-            flags |= O_WRONLY | O_CREAT | O_EXCL;
-            break;
-
-        case read_write:
-            flags |= O_RDWR;
-            break;
-    }
-
-#ifdef __WINDOWS__
-    // only read/write bits for "all" are supported by this function under
-    // Windows, and VC++ 8 returns EINVAL if any other bits are used in
-    // accessMode, so clear them as they have at best no effect anyhow
-    accessMode &= wxS_IRUSR | wxS_IWUSR;
-#endif // __WINDOWS__
-
-    int fd = wxOpen( fileName, flags, accessMode);
-
-    if ( CheckForError(fd) )
-    {
-        wxLogSysError(_("can't open file '%s'"), fileName);
-        return false;
-    }
-
-    Attach(fd);
-    return true;
-}
-
-// close
-bool wxFile::Close()
-{
-    if ( IsOpened() ) {
-        if ( CheckForError(wxClose(m_fd)) )
-        {
-            wxLogSysError(_("can't close file descriptor %d"), m_fd);
-            m_fd = fd_invalid;
-            return false;
-        }
-        else
-            m_fd = fd_invalid;
-    }
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// read/write
-// ----------------------------------------------------------------------------
-
-// read
-ssize_t wxFile::Read(void *pBuf, size_t nCount)
-{
-    wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
-
-    ssize_t iRc = wxRead(m_fd, pBuf, nCount);
-
-    if ( CheckForError(iRc) )
-    {
-        wxLogSysError(_("can't read from file descriptor %d"), m_fd);
-        return wxInvalidOffset;
-    }
-
-    return iRc;
-}
-
-// write
-size_t wxFile::Write(const void *pBuf, size_t nCount)
-{
-    wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
-
-    ssize_t iRc = wxWrite(m_fd, pBuf, nCount);
-
-    if ( CheckForError(iRc) )
-    {
-        wxLogSysError(_("can't write to file descriptor %d"), m_fd);
-        iRc = 0;
-    }
-
-    return iRc;
-}
-
-bool wxFile::Write(const wxString& s, const wxMBConv& conv)
-{
-  const wxWX2MBbuf buf = s.mb_str(conv);
-  if ( !buf )
-      return false;
-
-#if wxUSE_UNICODE
-  const size_t size = buf.length();
-#else
-  const size_t size = s.length();
-#endif
-
-  return Write(buf, size) == size;
-}
-
-// flush
-bool wxFile::Flush()
-{
-#ifdef HAVE_FSYNC
-    // fsync() only works on disk files and returns errors for pipes, don't
-    // call it then
-    if ( IsOpened() && GetKind() == wxFILE_KIND_DISK )
-    {
-        if ( CheckForError(wxFsync(m_fd)) )
-        {
-            wxLogSysError(_("can't flush file descriptor %d"), m_fd);
-            return false;
-        }
-    }
-#endif // HAVE_FSYNC
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// seek
-// ----------------------------------------------------------------------------
-
-// seek
-wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
-{
-    wxASSERT_MSG( IsOpened(), wxT("can't seek on closed file") );
-    wxCHECK_MSG( ofs != wxInvalidOffset || mode != wxFromStart,
-                 wxInvalidOffset,
-                 wxT("invalid absolute file offset") );
-
-    int origin;
-    switch ( mode ) {
-        default:
-            wxFAIL_MSG(wxT("unknown seek origin"));
-
-        case wxFromStart:
-            origin = SEEK_SET;
-            break;
-
-        case wxFromCurrent:
-            origin = SEEK_CUR;
-            break;
-
-        case wxFromEnd:
-            origin = SEEK_END;
-            break;
-    }
-
-    wxFileOffset iRc = wxSeek(m_fd, ofs, origin);
-    if ( CheckForError(iRc) )
-    {
-        wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
-    }
-
-    return iRc;
-}
-
-// get current file offset
-wxFileOffset wxFile::Tell() const
-{
-    wxASSERT( IsOpened() );
-
-    wxFileOffset iRc = wxTell(m_fd);
-    if ( CheckForError(iRc) )
-    {
-        wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
-    }
-
-    return iRc;
-}
-
-// get current file length
-wxFileOffset wxFile::Length() const
-{
-    wxASSERT( IsOpened() );
-
-    // we use a special method for Linux systems where files in sysfs (i.e.
-    // those under /sys typically) return length of 4096 bytes even when
-    // they're much smaller -- this is a problem as it results in errors later
-    // when we try reading 4KB from them
-#ifdef __LINUX__
-    struct stat st;
-    if ( fstat(m_fd, &st) == 0 )
-    {
-        // returning 0 for the special files indicates to the caller that they
-        // are not seekable
-        return st.st_blocks ? st.st_size : 0;
-    }
-    //else: failed to stat, try the normal method
-#endif // __LINUX__
-
-    wxFileOffset iRc = Tell();
-    if ( iRc != wxInvalidOffset ) {
-        wxFileOffset iLen = const_cast<wxFile *>(this)->SeekEnd();
-        if ( iLen != wxInvalidOffset ) {
-            // restore old position
-            if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) {
-                // error
-                iLen = wxInvalidOffset;
-            }
-        }
-
-        iRc = iLen;
-    }
-
-    if ( iRc == wxInvalidOffset )
-    {
-        // last error was already set by Tell()
-        wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
-    }
-
-    return iRc;
-}
-
-// is end of file reached?
-bool wxFile::Eof() const
-{
-    wxASSERT( IsOpened() );
-
-    wxFileOffset iRc;
-
-#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__)
-    // @@ this doesn't work, of course, on unseekable file descriptors
-    wxFileOffset ofsCur = Tell(),
-    ofsMax = Length();
-    if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
-        iRc = wxInvalidOffset;
-    else
-        iRc = ofsCur == ofsMax;
-#else  // Windows and "native" compiler
-    iRc = wxEof(m_fd);
-#endif // Windows/Unix
-
-    if ( iRc == 0 )
-        return false;
-
-    if ( iRc == wxInvalidOffset )
-    {
-        wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
-    }
-    else if ( iRc != 1 )
-    {
-        wxFAIL_MSG(wxT("invalid eof() return value."));
-    }
-
-    return true;
-}
-
-// ============================================================================
-// implementation of wxTempFile
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// construction
-// ----------------------------------------------------------------------------
-
-wxTempFile::wxTempFile(const wxString& strName)
-{
-    Open(strName);
-}
-
-bool wxTempFile::Open(const wxString& strName)
-{
-    // we must have an absolute filename because otherwise CreateTempFileName()
-    // would create the temp file in $TMP (i.e. the system standard location
-    // for the temp files) which might be on another volume/drive/mount and
-    // wxRename()ing it later to m_strName from Commit() would then fail
-    //
-    // with the absolute filename, the temp file is created in the same
-    // directory as this one which ensures that wxRename() may work later
-    wxFileName fn(strName);
-    if ( !fn.IsAbsolute() )
-    {
-        fn.Normalize(wxPATH_NORM_ABSOLUTE);
-    }
-
-    m_strName = fn.GetFullPath();
-
-    m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);
-
-    if ( m_strTemp.empty() )
-    {
-        // CreateTempFileName() failed
-        return false;
-    }
-
-#ifdef __UNIX__
-    // the temp file should have the same permissions as the original one
-    mode_t mode;
-
-    wxStructStat st;
-    if ( stat( (const char*) m_strName.fn_str(), &st) == 0 )
-    {
-        mode = st.st_mode;
-    }
-    else
-    {
-        // file probably didn't exist, just give it the default mode _using_
-        // user's umask (new files creation should respect umask)
-        mode_t mask = umask(0777);
-        mode = 0666 & ~mask;
-        umask(mask);
-    }
-
-    if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
-    {
-#ifndef __OS2__
-        wxLogSysError(_("Failed to set temporary file permissions"));
-#endif
-    }
-#endif // Unix
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// destruction
-// ----------------------------------------------------------------------------
-
-wxTempFile::~wxTempFile()
-{
-    if ( IsOpened() )
-        Discard();
-}
-
-bool wxTempFile::Commit()
-{
-    m_file.Close();
-
-    if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) {
-        wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
-        return false;
-    }
-
-    if ( !wxRenameFile(m_strTemp, m_strName)  ) {
-        wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
-        return false;
-    }
-
-    return true;
-}
-
-void wxTempFile::Discard()
-{
-    m_file.Close();
-    if ( wxRemove(m_strTemp) != 0 )
-    {
-        wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
-    }
-}
-
-#endif // wxUSE_FILE
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        file.cpp
+// Purpose:     wxFile - encapsulates low-level "file descriptor"
+//              wxTempFile
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     29/01/98
+// RCS-ID:      $Id: file.cpp 42876 2006-10-31 23:29:02Z SN $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_FILE
+
+// standard
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+
+#ifndef __SALFORDC__
+    #define   WIN32_LEAN_AND_MEAN
+    #define   NOSERVICE
+    #define   NOIME
+    #define   NOATOM
+    #define   NOGDI
+    #define   NOGDICAPMASKS
+    #define   NOMETAFILE
+    #define   NOMINMAX
+    #define   NOMSG
+    #define   NOOPENFILE
+    #define   NORASTEROPS
+    #define   NOSCROLL
+    #define   NOSOUND
+    #define   NOSYSMETRICS
+    #define   NOTEXTMETRIC
+    #define   NOWH
+    #define   NOCOMM
+    #define   NOKANJI
+    #define   NOCRYPT
+    #define   NOMCX
+#endif
+
+#elif defined(__WXMSW__) && defined(__WXWINCE__)
+    #include  "wx/msw/missing.h"
+#elif (defined(__OS2__))
+    #include <io.h>
+#elif (defined(__UNIX__) || defined(__GNUWIN32__))
+    #include  <unistd.h>
+    #include  <time.h>
+    #include  <sys/stat.h>
+    #ifdef __GNUWIN32__
+        #include "wx/msw/wrapwin.h"
+    #endif
+#elif defined(__DOS__)
+    #if defined(__WATCOMC__)
+       #include <io.h>
+    #elif defined(__DJGPP__)
+       #include <io.h>
+       #include <unistd.h>
+       #include <stdio.h>
+    #else
+        #error  "Please specify the header with file functions declarations."
+    #endif
+#elif (defined(__WXSTUBS__))
+    // Have to ifdef this for different environments
+    #include <io.h>
+#elif (defined(__WXMAC__))
+#if __MSL__ < 0x6000
+    int access( const char *path, int mode ) { return 0 ; }
+#else
+    int _access( const char *path, int mode ) { return 0 ; }
+#endif
+    char* mktemp( char * path ) { return path ;}
+    #include <stat.h>
+    #include <unistd.h>
+#else
+    #error  "Please specify the header with file functions declarations."
+#endif  //Win/UNIX
+
+#include  <stdio.h>       // SEEK_xxx constants
+
+// Windows compilers don't have these constants
+#ifndef W_OK
+    enum
+    {
+        F_OK = 0,   // test for existence
+        X_OK = 1,   //          execute permission
+        W_OK = 2,   //          write
+        R_OK = 4    //          read
+    };
+#endif // W_OK
+
+#ifdef __SALFORDC__
+    #include <unix.h>
+#endif
+
+// some broken compilers don't have 3rd argument in open() and creat()
+#ifdef __SALFORDC__
+    #define ACCESS(access)
+    #define stat    _stat
+#else // normal compiler
+    #define ACCESS(access)  , (access)
+#endif // Salford C
+
+// wxWidgets
+#ifndef WX_PRECOMP
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/log.h"
+#endif // !WX_PRECOMP
+
+#include  "wx/filename.h"
+#include  "wx/file.h"
+#include  "wx/filefn.h"
+
+// there is no distinction between text and binary files under Unix, so define
+// O_BINARY as 0 if the system headers don't do it already
+#if defined(__UNIX__) && !defined(O_BINARY)
+    #define   O_BINARY    (0)
+#endif  //__UNIX__
+
+#ifdef __WXMSW__
+    #include "wx/msw/mslu.h"
+#endif
+
+#ifdef __WXWINCE__
+    #include "wx/msw/private.h"
+#endif
+
+#ifndef MAX_PATH
+    #define MAX_PATH 512
+#endif
+
+// ============================================================================
+// implementation of wxFile
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// static functions
+// ----------------------------------------------------------------------------
+
+bool wxFile::Exists(const wxChar *name)
+{
+    return wxFileExists(name);
+}
+
+bool wxFile::Access(const wxChar *name, OpenMode mode)
+{
+    int how;
+
+    switch ( mode )
+    {
+        default:
+            wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
+            // fall through
+
+        case read:
+            how = R_OK;
+            break;
+
+        case write:
+            how = W_OK;
+            break;
+
+        case read_write:
+            how = R_OK | W_OK;
+            break;
+    }
+
+    return wxAccess(name, how) == 0;
+}
+
+// ----------------------------------------------------------------------------
+// opening/closing
+// ----------------------------------------------------------------------------
+
+// ctors
+wxFile::wxFile(const wxChar *szFileName, OpenMode mode)
+{
+    m_fd = fd_invalid;
+    m_error = false;
+
+    Open(szFileName, mode);
+}
+
+// create the file, fail if it already exists and bOverwrite
+bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
+{
+    // if bOverwrite we create a new file or truncate the existing one,
+    // otherwise we only create the new file and fail if it already exists
+#if defined(__WXMAC__) && !defined(__UNIX__) && !wxUSE_UNICODE
+    // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
+    // int fd = open( szFileName , O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+    int fd = creat( szFileName , accessMode);
+#else
+    int fd = wxOpen( szFileName,
+                     O_BINARY | O_WRONLY | O_CREAT |
+                     (bOverwrite ? O_TRUNC : O_EXCL)
+                     ACCESS(accessMode) );
+#endif
+    if ( fd == -1 )
+    {
+        wxLogSysError(_("can't create file '%s'"), szFileName);
+        return false;
+    }
+
+    Attach(fd);
+    return true;
+}
+
+// open the file
+bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
+{
+    int flags = O_BINARY;
+
+    switch ( mode )
+    {
+        case read:
+            flags |= O_RDONLY;
+            break;
+
+        case write_append:
+            if ( wxFile::Exists(szFileName) )
+            {
+                flags |= O_WRONLY | O_APPEND;
+                break;
+            }
+            //else: fall through as write_append is the same as write if the
+            //      file doesn't exist
+
+        case write:
+            flags |= O_WRONLY | O_CREAT | O_TRUNC;
+            break;
+
+        case write_excl:
+            flags |= O_WRONLY | O_CREAT | O_EXCL;
+            break;
+
+        case read_write:
+            flags |= O_RDWR;
+            break;
+    }
+
+#ifdef __WINDOWS__
+    // only read/write bits for "all" are supported by this function under
+    // Windows, and VC++ 8 returns EINVAL if any other bits are used in
+    // accessMode, so clear them as they have at best no effect anyhow
+    accessMode &= wxS_IRUSR | wxS_IWUSR;
+#endif // __WINDOWS__
+
+    int fd = wxOpen( szFileName, flags ACCESS(accessMode));
+
+    if ( fd == -1 )
+    {
+        wxLogSysError(_("can't open file '%s'"), szFileName);
+        return false;
+    }
+
+    Attach(fd);
+    return true;
+}
+
+// close
+bool wxFile::Close()
+{
+    if ( IsOpened() ) {
+        if (wxClose(m_fd) == -1)
+        {
+            wxLogSysError(_("can't close file descriptor %d"), m_fd);
+            m_fd = fd_invalid;
+            return false;
+        }
+        else
+            m_fd = fd_invalid;
+    }
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// read/write
+// ----------------------------------------------------------------------------
+
+// read
+ssize_t wxFile::Read(void *pBuf, size_t nCount)
+{
+    wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
+
+    ssize_t iRc = wxRead(m_fd, pBuf, nCount);
+
+    if ( iRc == -1 )
+    {
+        wxLogSysError(_("can't read from file descriptor %d"), m_fd);
+        return wxInvalidOffset;
+    }
+
+    return iRc;
+}
+
+// write
+size_t wxFile::Write(const void *pBuf, size_t nCount)
+{
+    wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
+
+    ssize_t iRc = wxWrite(m_fd, pBuf, nCount);
+
+    if ( iRc == -1 )
+    {
+        wxLogSysError(_("can't write to file descriptor %d"), m_fd);
+        m_error = true;
+        iRc = 0;
+    }
+
+    return iRc;
+}
+
+// flush
+bool wxFile::Flush()
+{
+#ifdef HAVE_FSYNC
+    // fsync() only works on disk files and returns errors for pipes, don't
+    // call it then
+    if ( IsOpened() && GetKind() == wxFILE_KIND_DISK )
+    {
+        if ( wxFsync(m_fd) == -1 )
+        {
+            wxLogSysError(_("can't flush file descriptor %d"), m_fd);
+            return false;
+        }
+    }
+#endif // HAVE_FSYNC
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// seek
+// ----------------------------------------------------------------------------
+
+// seek
+wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
+{
+    wxASSERT_MSG( IsOpened(), _T("can't seek on closed file") );
+    wxCHECK_MSG( ofs != wxInvalidOffset || mode != wxFromStart,
+                 wxInvalidOffset,
+                 _T("invalid absolute file offset") );
+
+    int origin;
+    switch ( mode ) {
+        default:
+            wxFAIL_MSG(_("unknown seek origin"));
+
+        case wxFromStart:
+            origin = SEEK_SET;
+            break;
+
+        case wxFromCurrent:
+            origin = SEEK_CUR;
+            break;
+
+        case wxFromEnd:
+            origin = SEEK_END;
+            break;
+    }
+
+    wxFileOffset iRc = wxSeek(m_fd, ofs, origin);
+    if ( iRc == wxInvalidOffset )
+    {
+        wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
+    }
+
+    return iRc;
+}
+
+// get current file offset
+wxFileOffset wxFile::Tell() const
+{
+    wxASSERT( IsOpened() );
+
+    wxFileOffset iRc = wxTell(m_fd);
+    if ( iRc == wxInvalidOffset )
+    {
+        wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
+    }
+
+    return iRc;
+}
+
+// get current file length
+wxFileOffset wxFile::Length() const
+{
+    wxASSERT( IsOpened() );
+
+    wxFileOffset iRc = Tell();
+    if ( iRc != wxInvalidOffset ) {
+        // have to use const_cast :-(
+        wxFileOffset iLen = ((wxFile *)this)->SeekEnd();
+        if ( iLen != wxInvalidOffset ) {
+            // restore old position
+            if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) {
+                // error
+                iLen = wxInvalidOffset;
+            }
+        }
+
+        iRc = iLen;
+    }
+
+    if ( iRc == wxInvalidOffset )
+    {
+        wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
+    }
+
+    return iRc;
+}
+
+// is end of file reached?
+bool wxFile::Eof() const
+{
+    wxASSERT( IsOpened() );
+
+    wxFileOffset iRc;
+
+#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
+    // @@ this doesn't work, of course, on unseekable file descriptors
+    wxFileOffset ofsCur = Tell(),
+    ofsMax = Length();
+    if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
+        iRc = wxInvalidOffset;
+    else
+        iRc = ofsCur == ofsMax;
+#else  // Windows and "native" compiler
+    iRc = wxEof(m_fd);
+#endif // Windows/Unix
+
+    if ( iRc == 1)
+        {}
+    else if ( iRc == 0 )
+        return false;
+    else if ( iRc == wxInvalidOffset )
+        wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
+    else
+        wxFAIL_MSG(_("invalid eof() return value."));
+
+    return true;
+}
+
+// ============================================================================
+// implementation of wxTempFile
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// construction
+// ----------------------------------------------------------------------------
+
+wxTempFile::wxTempFile(const wxString& strName)
+{
+    Open(strName);
+}
+
+bool wxTempFile::Open(const wxString& strName)
+{
+    // we must have an absolute filename because otherwise CreateTempFileName()
+    // would create the temp file in $TMP (i.e. the system standard location
+    // for the temp files) which might be on another volume/drive/mount and
+    // wxRename()ing it later to m_strName from Commit() would then fail
+    //
+    // with the absolute filename, the temp file is created in the same
+    // directory as this one which ensures that wxRename() may work later
+    wxFileName fn(strName);
+    if ( !fn.IsAbsolute() )
+    {
+        fn.Normalize(wxPATH_NORM_ABSOLUTE);
+    }
+
+    m_strName = fn.GetFullPath();
+
+    m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);
+
+    if ( m_strTemp.empty() )
+    {
+        // CreateTempFileName() failed
+        return false;
+    }
+
+#ifdef __UNIX__
+    // the temp file should have the same permissions as the original one
+    mode_t mode;
+
+    wxStructStat st;
+    if ( stat( (const char*) m_strName.fn_str(), &st) == 0 )
+    {
+        mode = st.st_mode;
+    }
+    else
+    {
+        // file probably didn't exist, just give it the default mode _using_
+        // user's umask (new files creation should respect umask)
+        mode_t mask = umask(0777);
+        mode = 0666 & ~mask;
+        umask(mask);
+    }
+
+    if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 )
+    {
+#ifndef __OS2__
+        wxLogSysError(_("Failed to set temporary file permissions"));
+#endif
+    }
+#endif // Unix
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// destruction
+// ----------------------------------------------------------------------------
+
+wxTempFile::~wxTempFile()
+{
+    if ( IsOpened() )
+        Discard();
+}
+
+bool wxTempFile::Commit()
+{
+    m_file.Close();
+
+    if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) {
+        wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
+        return false;
+    }
+
+    if ( !wxRenameFile(m_strTemp, m_strName)  ) {
+        wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
+        return false;
+    }
+
+    return true;
+}
+
+void wxTempFile::Discard()
+{
+    m_file.Close();
+    if ( wxRemove(m_strTemp) != 0 )
+        wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
+}
+
+#endif // wxUSE_FILE
+
diff --git a/Source/3rd Party/wx/src/common/fileback.cpp b/Source/3rd Party/wx/src/common/fileback.cpp
index 899da4233..ccce957bf 100644
--- a/Source/3rd Party/wx/src/common/fileback.cpp	
+++ b/Source/3rd Party/wx/src/common/fileback.cpp	
@@ -1,334 +1,338 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fileback.cpp
-// Purpose:     Back an input stream with memory or a file
-// Author:      Mike Wetherell
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 Mike Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FILESYSTEM
-
-#include "wx/private/fileback.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/utils.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/private/filename.h"
-
-// Prefer wxFFile unless wxFile has large file support but wxFFile does not.
-//
-#if wxUSE_FFILE && (defined wxHAS_LARGE_FFILES || !defined wxHAS_LARGE_FILES)
-typedef wxFFile wxBFFile;
-static const bool wxBadSeek = false;
-#else
-typedef wxFile wxBFFile;
-static const wxFileOffset wxBadSeek = wxInvalidOffset;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// Backing file implementation
-
-class wxBackingFileImpl
-{
-public:
-    wxBackingFileImpl(wxInputStream *stream,
-                      size_t bufsize,
-                      const wxString& prefix);
-    ~wxBackingFileImpl();
-
-    void Release() { if (--m_refcount == 0) delete this; }
-    wxBackingFileImpl *AddRef() { m_refcount++; return this; }
-
-    wxStreamError ReadAt(wxFileOffset pos, void *buffer, size_t *size);
-    wxFileOffset GetLength() const;
-
-private:
-    int m_refcount;
-
-    wxInputStream *m_stream;
-    wxStreamError m_parenterror;
-
-    char *m_buf;
-    size_t m_bufsize;
-    size_t m_buflen;
-
-    wxString m_prefix;
-    wxString m_filename;
-    wxBFFile m_file;
-    wxFileOffset m_filelen;
-};
-
-wxBackingFileImpl::wxBackingFileImpl(wxInputStream *stream,
-                                     size_t bufsize,
-                                     const wxString& prefix)
-  : m_refcount(1),
-    m_stream(stream),
-    m_parenterror(wxSTREAM_NO_ERROR),
-    m_buf(NULL),
-    m_bufsize(bufsize),
-    m_buflen(0),
-    m_prefix(prefix),
-    m_filelen(0)
-{
-    wxFileOffset len = m_stream->GetLength();
-
-    if (len >= 0 && len + size_t(1) < m_bufsize)
-        m_bufsize = size_t(len + 1);
-
-    if (m_bufsize)
-        m_buf = new char[m_bufsize];
-}
-
-wxBackingFileImpl::~wxBackingFileImpl()
-{
-    delete m_stream;
-    delete [] m_buf;
-
-    if (!m_filename.empty())
-        wxRemoveFile(m_filename);
-}
-
-wxStreamError wxBackingFileImpl::ReadAt(wxFileOffset pos,
-                                        void *buffer,
-                                        size_t *size)
-{
-    size_t reqestedSize = *size;
-    *size = 0;
-
-    // size1 is the number of bytes it will read directly from the backing
-    // file. size2 is any remaining bytes not yet backed, these are returned
-    // from the buffer or read from the parent stream.
-    size_t size1, size2;
-
-    if (pos + reqestedSize <= m_filelen + size_t(0)) {
-        size1 = reqestedSize;
-        size2 = 0;
-    } else if (pos < m_filelen) {
-        size1 = size_t(m_filelen - pos);
-        size2 = reqestedSize - size1;
-    } else {
-        size1 = 0;
-        size2 = reqestedSize;
-    }
-
-    if (pos < 0)
-        return wxSTREAM_READ_ERROR;
-
-    // read the backing file
-    if (size1) {
-        if (m_file.Seek(pos) == wxBadSeek)
-            return wxSTREAM_READ_ERROR;
-
-        ssize_t n = m_file.Read(buffer, size1);
-        if (n > 0) {
-            *size = n;
-            pos += n;
-        }
-
-        if (*size < size1)
-            return wxSTREAM_READ_ERROR;
-    }
-
-    // read from the buffer or parent stream
-    if (size2)
-    {
-        while (*size < reqestedSize)
-        {
-            // if pos is further ahead than the parent has been read so far,
-            // then read forward in the parent stream
-            while (pos - m_filelen + size_t(0) >= m_buflen)
-            {
-                // if the parent is small enough, don't use a backing file
-                // just the buffer memory
-                if (!m_stream && m_filelen == 0)
-                    return m_parenterror;
-
-                // before refilling the buffer write out the current buffer
-                // to the backing file if there is anything in it
-                if (m_buflen)
-                {
-                    if (!m_file.IsOpened())
-                        if (!wxCreateTempFile(m_prefix, &m_file, &m_filename))
-                            return wxSTREAM_READ_ERROR;
-
-                    if (m_file.Seek(m_filelen) == wxBadSeek)
-                        return wxSTREAM_READ_ERROR;
-
-                    size_t count = m_file.Write(m_buf, m_buflen);
-                    m_filelen += count;
-
-                    if (count < m_buflen) {
-                        wxDELETE(m_stream);
-                        if (count > 0) {
-                            wxDELETEA(m_buf);
-                            m_buflen = 0;
-                        }
-                        m_parenterror = wxSTREAM_READ_ERROR;
-                        return m_parenterror;
-                    }
-
-                    m_buflen = 0;
-
-                    if (!m_stream) {
-                        wxDELETEA(m_buf);
-                    }
-                }
-
-                if (!m_stream)
-                    return m_parenterror;
-
-                // refill buffer
-                m_buflen = m_stream->Read(m_buf, m_bufsize).LastRead();
-
-                if (m_buflen < m_bufsize) {
-                    m_parenterror = m_stream->GetLastError();
-                    if (m_parenterror == wxSTREAM_NO_ERROR)
-                        m_parenterror = wxSTREAM_EOF;
-                    wxDELETE(m_stream);
-                }
-            }
-
-            // copy to the user's buffer
-            size_t start = size_t(pos - m_filelen);
-            size_t len = wxMin(m_buflen - start, reqestedSize - *size);
-
-            memcpy((char*)buffer + *size, m_buf + start, len);
-            *size += len;
-            pos += len;
-        }
-    }
-
-    return wxSTREAM_NO_ERROR;
-}
-
-wxFileOffset wxBackingFileImpl::GetLength() const
-{
-    if (m_parenterror != wxSTREAM_EOF) {
-        wxLogNull nolog;
-        return m_stream->GetLength();
-    }
-    return m_filelen + m_buflen;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Backing File, the handle part
-
-wxBackingFile::wxBackingFile(wxInputStream *stream,
-                             size_t bufsize,
-                             const wxString& prefix)
-  : m_impl(new wxBackingFileImpl(stream, bufsize, prefix))
-{
-}
-
-wxBackingFile::wxBackingFile(const wxBackingFile& backer)
-  : m_impl(backer.m_impl ? backer.m_impl->AddRef() : NULL)
-{
-}
-
-wxBackingFile& wxBackingFile::operator=(const wxBackingFile& backer)
-{
-    if (backer.m_impl != m_impl) {
-        if (m_impl)
-            m_impl->Release();
-
-        m_impl = backer.m_impl;
-
-        if (m_impl)
-            m_impl->AddRef();
-    }
-
-    return *this;
-}
-
-wxBackingFile::~wxBackingFile()
-{
-    if (m_impl)
-        m_impl->Release();
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Input stream
-
-wxBackedInputStream::wxBackedInputStream(const wxBackingFile& backer)
-  : m_backer(backer),
-    m_pos(0)
-{
-}
-
-wxFileOffset wxBackedInputStream::GetLength() const
-{
-    return m_backer.m_impl->GetLength();
-}
-
-wxFileOffset wxBackedInputStream::FindLength() const
-{
-    wxFileOffset len = GetLength();
-
-    if (len == wxInvalidOffset && IsOk()) {
-        // read a byte at 7ff...ffe
-        wxFileOffset pos = 1;
-        pos <<= sizeof(pos) * 8 - 1;
-        pos = ~pos - 1;
-        char ch;
-        size_t size = 1;
-        m_backer.m_impl->ReadAt(pos, &ch, &size);
-        len = GetLength();
-    }
-
-    return len;
-}
-
-size_t wxBackedInputStream::OnSysRead(void *buffer, size_t size)
-{
-    if (!IsOk())
-        return 0;
-
-    m_lasterror = m_backer.m_impl->ReadAt(m_pos, buffer, &size);
-    m_pos += size;
-    return size;
-}
-
-wxFileOffset wxBackedInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    switch (mode) {
-        case wxFromCurrent:
-        {
-            m_pos += pos;
-            break;
-        }
-        case wxFromEnd:
-        {
-            wxFileOffset len = GetLength();
-            if (len == wxInvalidOffset)
-                return wxInvalidOffset;
-            m_pos = len + pos;
-            break;
-        }
-        default:
-        {
-            m_pos = pos;
-            break;
-        }
-    }
-
-    return m_pos;
-}
-
-wxFileOffset wxBackedInputStream::OnSysTell() const
-{
-    return m_pos;
-}
-
-#endif // wxUSE_FILESYSTEM
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fileback.cpp
+// Purpose:     Back an input stream with memory or a file
+// Author:      Mike Wetherell
+// RCS-ID:      $Id: fileback.cpp 42651 2006-10-29 20:06:45Z MW $
+// Copyright:   (c) 2006 Mike Wetherell
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FILESYSTEM
+
+#include "wx/private/fileback.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/private/filename.h"
+
+// Prefer wxFFile unless wxFile has large file support but wxFFile does not.
+//
+#if wxUSE_FFILE && (defined wxHAS_LARGE_FFILES || !defined wxHAS_LARGE_FILES)
+typedef wxFFile wxBFFile;
+static const bool wxBadSeek = false;
+#else
+typedef wxFile wxBFFile;
+static const wxFileOffset wxBadSeek = wxInvalidOffset;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// Backing file implementation
+
+class wxBackingFileImpl
+{
+public:
+    wxBackingFileImpl(wxInputStream *stream,
+                      size_t bufsize,
+                      const wxString& prefix);
+    ~wxBackingFileImpl();
+
+    void Release() { if (--m_refcount == 0) delete this; }
+    wxBackingFileImpl *AddRef() { m_refcount++; return this; }
+
+    wxStreamError ReadAt(wxFileOffset pos, void *buffer, size_t *size);
+    wxFileOffset GetLength() const;
+
+private:
+    int m_refcount;
+
+    wxInputStream *m_stream;
+    wxStreamError m_parenterror;
+
+    char *m_buf;
+    size_t m_bufsize;
+    size_t m_buflen;
+
+    wxString m_prefix;
+    wxString m_filename;
+    wxBFFile m_file;
+    wxFileOffset m_filelen;
+};
+
+wxBackingFileImpl::wxBackingFileImpl(wxInputStream *stream,
+                                     size_t bufsize,
+                                     const wxString& prefix)
+  : m_refcount(1),
+    m_stream(stream),
+    m_parenterror(wxSTREAM_NO_ERROR),
+    m_buf(NULL),
+    m_bufsize(bufsize),
+    m_buflen(0),
+    m_prefix(prefix),
+    m_filelen(0)
+{
+    wxFileOffset len = m_stream->GetLength();
+
+    if (len >= 0 && len + size_t(1) < m_bufsize)
+        m_bufsize = size_t(len + 1);
+
+    if (m_bufsize)
+        m_buf = new char[m_bufsize];
+}
+
+wxBackingFileImpl::~wxBackingFileImpl()
+{
+    delete m_stream;
+    delete [] m_buf;
+
+    if (!m_filename.empty())
+        wxRemoveFile(m_filename);
+}
+
+wxStreamError wxBackingFileImpl::ReadAt(wxFileOffset pos,
+                                        void *buffer,
+                                        size_t *size)
+{
+    size_t reqestedSize = *size;
+    *size = 0;
+
+    // size1 is the number of bytes it will read directly from the backing
+    // file. size2 is any remaining bytes not yet backed, these are returned
+    // from the buffer or read from the parent stream.
+    size_t size1, size2;
+
+    if (pos + reqestedSize <= m_filelen + size_t(0)) {
+        size1 = reqestedSize;
+        size2 = 0;
+    } else if (pos < m_filelen) {
+        size1 = size_t(m_filelen - pos);
+        size2 = reqestedSize - size1;
+    } else {
+        size1 = 0;
+        size2 = reqestedSize;
+    }
+
+    if (pos < 0)
+        return wxSTREAM_READ_ERROR;
+
+    // read the backing file
+    if (size1) {
+        if (m_file.Seek(pos) == wxBadSeek)
+            return wxSTREAM_READ_ERROR;
+
+        ssize_t n = m_file.Read(buffer, size1);
+        if (n > 0) {
+            *size = n;
+            pos += n;
+        }
+
+        if (*size < size1)
+            return wxSTREAM_READ_ERROR;
+    }
+
+    // read from the buffer or parent stream
+    if (size2)
+    {
+        while (*size < reqestedSize)
+        {
+            // if pos is further ahead than the parent has been read so far,
+            // then read forward in the parent stream
+            while (pos - m_filelen + size_t(0) >= m_buflen)
+            {
+                // if the parent is small enough, don't use a backing file
+                // just the buffer memory
+                if (!m_stream && m_filelen == 0)
+                    return m_parenterror;
+
+                // before refilling the buffer write out the current buffer
+                // to the backing file if there is anything in it
+                if (m_buflen)
+                {
+                    if (!m_file.IsOpened())
+                        if (!wxCreateTempFile(m_prefix, &m_file, &m_filename))
+                            return wxSTREAM_READ_ERROR;
+
+                    if (m_file.Seek(m_filelen) == wxBadSeek)
+                        return wxSTREAM_READ_ERROR;
+
+                    size_t count = m_file.Write(m_buf, m_buflen);
+                    m_filelen += count;
+
+                    if (count < m_buflen) {
+                        delete m_stream;
+                        m_stream = NULL;
+                        if (count > 0) {
+                            delete[] m_buf;
+                            m_buf = NULL;
+                            m_buflen = 0;
+                        }
+                        m_parenterror = wxSTREAM_READ_ERROR;
+                        return m_parenterror;
+                    }
+
+                    m_buflen = 0;
+
+                    if (!m_stream) {
+                        delete[] m_buf;
+                        m_buf = NULL;
+                    }
+                }
+
+                if (!m_stream)
+                    return m_parenterror;
+
+                // refill buffer
+                m_buflen = m_stream->Read(m_buf, m_bufsize).LastRead();
+
+                if (m_buflen < m_bufsize) {
+                    m_parenterror = m_stream->GetLastError();
+                    if (m_parenterror == wxSTREAM_NO_ERROR)
+                        m_parenterror = wxSTREAM_EOF;
+                    delete m_stream;
+                    m_stream = NULL;
+                }
+            }
+
+            // copy to the user's buffer
+            size_t start = size_t(pos - m_filelen);
+            size_t len = wxMin(m_buflen - start, reqestedSize - *size);
+
+            memcpy((char*)buffer + *size, m_buf + start, len);
+            *size += len;
+            pos += len;
+        }
+    }
+
+    return wxSTREAM_NO_ERROR;
+}
+
+wxFileOffset wxBackingFileImpl::GetLength() const
+{
+    if (m_parenterror != wxSTREAM_EOF) {
+        wxLogNull nolog;
+        return m_stream->GetLength();
+    }
+    return m_filelen + m_buflen;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Backing File, the handle part
+
+wxBackingFile::wxBackingFile(wxInputStream *stream,
+                             size_t bufsize,
+                             const wxString& prefix)
+  : m_impl(new wxBackingFileImpl(stream, bufsize, prefix))
+{
+}
+
+wxBackingFile::wxBackingFile(const wxBackingFile& backer)
+  : m_impl(backer.m_impl ? backer.m_impl->AddRef() : NULL)
+{
+}
+
+wxBackingFile& wxBackingFile::operator=(const wxBackingFile& backer)
+{
+    if (backer.m_impl != m_impl) {
+        if (m_impl)
+            m_impl->Release();
+
+        m_impl = backer.m_impl;
+
+        if (m_impl)
+            m_impl->AddRef();
+    }
+
+    return *this;
+}
+
+wxBackingFile::~wxBackingFile()
+{
+    if (m_impl)
+        m_impl->Release();
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Input stream
+
+wxBackedInputStream::wxBackedInputStream(const wxBackingFile& backer)
+  : m_backer(backer),
+    m_pos(0)
+{
+}
+
+wxFileOffset wxBackedInputStream::GetLength() const
+{
+    return m_backer.m_impl->GetLength();
+}
+
+wxFileOffset wxBackedInputStream::FindLength() const
+{
+    wxFileOffset len = GetLength();
+
+    if (len == wxInvalidOffset && IsOk()) {
+        // read a byte at 7ff...ffe
+        wxFileOffset pos = 1;
+        pos <<= sizeof(pos) * 8 - 1;
+        pos = ~pos - 1;
+        char ch;
+        size_t size = 1;
+        m_backer.m_impl->ReadAt(pos, &ch, &size);
+        len = GetLength();
+    }
+
+    return len;
+}
+    
+size_t wxBackedInputStream::OnSysRead(void *buffer, size_t size)
+{
+    if (!IsOk())
+        return 0;
+
+    m_lasterror = m_backer.m_impl->ReadAt(m_pos, buffer, &size);
+    m_pos += size;
+    return size;
+}
+
+wxFileOffset wxBackedInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    switch (mode) {
+        case wxFromCurrent:
+        {
+            m_pos += pos;
+            break;
+        }
+        case wxFromEnd:
+        {
+            wxFileOffset len = GetLength();
+            if (len == wxInvalidOffset)
+                return wxInvalidOffset;
+            m_pos = len + pos;
+            break;
+        }
+        default:
+        {
+            m_pos = pos;
+            break;
+        }
+    }
+
+    return m_pos;
+}
+
+wxFileOffset wxBackedInputStream::OnSysTell() const
+{
+    return m_pos;
+}
+
+#endif // wxUSE_FILESYSTEM
diff --git a/Source/3rd Party/wx/src/common/fileconf.cpp b/Source/3rd Party/wx/src/common/fileconf.cpp
index fd0a1da60..c85ebe894 100644
--- a/Source/3rd Party/wx/src/common/fileconf.cpp	
+++ b/Source/3rd Party/wx/src/common/fileconf.cpp	
@@ -1,2140 +1,2131 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fileconf.cpp
-// Purpose:     implementation of wxFileConfig derivation of wxConfig
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     07.04.98 (adapted from appconf.cpp)
-// RCS-ID:      $Id$
-// Copyright:   (c) 1997 Karsten Ballueder  &  Vadim Zeitlin
-//                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include  "wx/wxprec.h"
-
-#ifdef    __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-
-#ifndef   WX_PRECOMP
-    #include  "wx/dynarray.h"
-    #include  "wx/string.h"
-    #include  "wx/intl.h"
-    #include  "wx/log.h"
-    #include  "wx/app.h"
-    #include  "wx/utils.h"    // for wxGetHomeDir
-    #if wxUSE_STREAMS
-        #include  "wx/stream.h"
-    #endif // wxUSE_STREAMS
-#endif  //WX_PRECOMP
-
-#include  "wx/file.h"
-#include  "wx/textfile.h"
-#include  "wx/memtext.h"
-#include  "wx/config.h"
-#include  "wx/fileconf.h"
-#include  "wx/filefn.h"
-
-#include "wx/base64.h"
-
-#include  "wx/stdpaths.h"
-
-#if defined(__WINDOWS__)
-    #include "wx/msw/private.h"
-#endif  //windows.h
-#if defined(__WXPM__)
-    #define INCL_DOS
-    #include <os2.h>
-#endif
-
-#include  <stdlib.h>
-#include  <ctype.h>
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-#ifndef MAX_PATH
-    #define MAX_PATH 512
-#endif
-
-#define FILECONF_TRACE_MASK wxT("fileconf")
-
-// ----------------------------------------------------------------------------
-// global functions declarations
-// ----------------------------------------------------------------------------
-
-// compare functions for sorting the arrays
-static int LINKAGEMODE CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2);
-static int LINKAGEMODE CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2);
-
-// filter strings
-static wxString FilterInValue(const wxString& str);
-static wxString FilterOutValue(const wxString& str);
-
-static wxString FilterInEntryName(const wxString& str);
-static wxString FilterOutEntryName(const wxString& str);
-
-// get the name to use in wxFileConfig ctor
-static wxString GetAppName(const wxString& appname);
-
-// ============================================================================
-// private classes
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// "template" array types
-// ----------------------------------------------------------------------------
-
-#ifdef WXMAKINGDLL_BASE
-    WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxFileConfigEntry *, ArrayEntries,
-                                         WXDLLIMPEXP_BASE);
-    WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxFileConfigGroup *, ArrayGroups,
-                                         WXDLLIMPEXP_BASE);
-#else
-    WX_DEFINE_SORTED_ARRAY(wxFileConfigEntry *, ArrayEntries);
-    WX_DEFINE_SORTED_ARRAY(wxFileConfigGroup *, ArrayGroups);
-#endif
-
-// ----------------------------------------------------------------------------
-// wxFileConfigLineList
-// ----------------------------------------------------------------------------
-
-// we store all lines of the local config file as a linked list in memory
-class wxFileConfigLineList
-{
-public:
-  void SetNext(wxFileConfigLineList *pNext)  { m_pNext = pNext; }
-  void SetPrev(wxFileConfigLineList *pPrev)  { m_pPrev = pPrev; }
-
-  // ctor
-  wxFileConfigLineList(const wxString& str,
-                       wxFileConfigLineList *pNext = NULL) : m_strLine(str)
-    { SetNext(pNext); SetPrev(NULL); }
-
-  // next/prev nodes in the linked list
-  wxFileConfigLineList *Next() const { return m_pNext;  }
-  wxFileConfigLineList *Prev() const { return m_pPrev;  }
-
-  // get/change lines text
-  void SetText(const wxString& str) { m_strLine = str;  }
-  const wxString& Text() const { return m_strLine; }
-
-private:
-  wxString  m_strLine;                  // line contents
-  wxFileConfigLineList *m_pNext,        // next node
-                       *m_pPrev;        // previous one
-
-    wxDECLARE_NO_COPY_CLASS(wxFileConfigLineList);
-};
-
-// ----------------------------------------------------------------------------
-// wxFileConfigEntry: a name/value pair
-// ----------------------------------------------------------------------------
-
-class wxFileConfigEntry
-{
-private:
-  wxFileConfigGroup *m_pParent; // group that contains us
-
-  wxString      m_strName,      // entry name
-                m_strValue;     //       value
-  bool          m_bImmutable:1, // can be overridden locally?
-                m_bHasValue:1;  // set after first call to SetValue()
-
-  int           m_nLine;        // used if m_pLine == NULL only
-
-  // pointer to our line in the linked list or NULL if it was found in global
-  // file (which we don't modify)
-  wxFileConfigLineList *m_pLine;
-
-public:
-  wxFileConfigEntry(wxFileConfigGroup *pParent,
-                    const wxString& strName, int nLine);
-
-  // simple accessors
-  const wxString& Name()        const { return m_strName;    }
-  const wxString& Value()       const { return m_strValue;   }
-  wxFileConfigGroup *Group()    const { return m_pParent;    }
-  bool            IsImmutable() const { return m_bImmutable; }
-  bool            IsLocal()     const { return m_pLine != 0; }
-  int             Line()        const { return m_nLine;      }
-  wxFileConfigLineList *
-                  GetLine()     const { return m_pLine;      }
-
-  // modify entry attributes
-  void SetValue(const wxString& strValue, bool bUser = true);
-  void SetLine(wxFileConfigLineList *pLine);
-
-    wxDECLARE_NO_COPY_CLASS(wxFileConfigEntry);
-};
-
-// ----------------------------------------------------------------------------
-// wxFileConfigGroup: container of entries and other groups
-// ----------------------------------------------------------------------------
-
-class wxFileConfigGroup
-{
-private:
-  wxFileConfig *m_pConfig;          // config object we belong to
-  wxFileConfigGroup  *m_pParent;    // parent group (NULL for root group)
-  ArrayEntries  m_aEntries;         // entries in this group
-  ArrayGroups   m_aSubgroups;       // subgroups
-  wxString      m_strName;          // group's name
-  wxFileConfigLineList *m_pLine;    // pointer to our line in the linked list
-  wxFileConfigEntry *m_pLastEntry;  // last entry/subgroup of this group in the
-  wxFileConfigGroup *m_pLastGroup;  // local file (we insert new ones after it)
-
-  // DeleteSubgroupByName helper
-  bool DeleteSubgroup(wxFileConfigGroup *pGroup);
-
-  // used by Rename()
-  void UpdateGroupAndSubgroupsLines();
-
-public:
-  // ctor
-  wxFileConfigGroup(wxFileConfigGroup *pParent, const wxString& strName, wxFileConfig *);
-
-  // dtor deletes all entries and subgroups also
-  ~wxFileConfigGroup();
-
-  // simple accessors
-  const wxString& Name()    const { return m_strName; }
-  wxFileConfigGroup    *Parent()  const { return m_pParent; }
-  wxFileConfig   *Config()  const { return m_pConfig; }
-
-  const ArrayEntries& Entries() const { return m_aEntries;   }
-  const ArrayGroups&  Groups()  const { return m_aSubgroups; }
-  bool  IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }
-
-  // find entry/subgroup (NULL if not found)
-  wxFileConfigGroup *FindSubgroup(const wxString& name) const;
-  wxFileConfigEntry *FindEntry   (const wxString& name) const;
-
-  // delete entry/subgroup, return false if doesn't exist
-  bool DeleteSubgroupByName(const wxString& name);
-  bool DeleteEntry(const wxString& name);
-
-  // create new entry/subgroup returning pointer to newly created element
-  wxFileConfigGroup *AddSubgroup(const wxString& strName);
-  wxFileConfigEntry *AddEntry   (const wxString& strName, int nLine = wxNOT_FOUND);
-
-  void SetLine(wxFileConfigLineList *pLine);
-
-  // rename: no checks are done to ensure that the name is unique!
-  void Rename(const wxString& newName);
-
-  //
-  wxString GetFullName() const;
-
-  // get the last line belonging to an entry/subgroup of this group
-  wxFileConfigLineList *GetGroupLine();     // line which contains [group]
-                                            // may be NULL for "/" only
-  wxFileConfigLineList *GetLastEntryLine(); // after which our subgroups start
-  wxFileConfigLineList *GetLastGroupLine(); // after which the next group starts
-
-  // called by entries/subgroups when they're created/deleted
-  void SetLastEntry(wxFileConfigEntry *pEntry);
-  void SetLastGroup(wxFileConfigGroup *pGroup)
-    { m_pLastGroup = pGroup; }
-
-  wxDECLARE_NO_COPY_CLASS(wxFileConfigGroup);
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// static functions
-// ----------------------------------------------------------------------------
-
-// this function modifies in place the given wxFileName object if it doesn't
-// already have an extension
-//
-// note that it's slightly misnamed under Mac as there it doesn't add an
-// extension but modifies the file name instead, so you shouldn't suppose that
-// fn.HasExt() is true after it returns
-static void AddConfFileExtIfNeeded(wxFileName& fn)
-{
-    if ( !fn.HasExt() )
-    {
-#if defined( __WXMAC__ )
-        fn.SetName(fn.GetName() + wxT(" Preferences"));
-#elif defined( __UNIX__ )
-        fn.SetExt(wxT("conf"));
-#else   // Windows
-        fn.SetExt(wxT("ini"));
-#endif  // UNIX/Win
-    }
-}
-
-wxString wxFileConfig::GetGlobalDir()
-{
-    return wxStandardPaths::Get().GetConfigDir();
-}
-
-wxString wxFileConfig::GetLocalDir(int style)
-{
-    wxUnusedVar(style);
-
-    wxStandardPathsBase& stdp = wxStandardPaths::Get();
-
-    // it so happens that user data directory is a subdirectory of user config
-    // directory on all supported platforms, which explains why we use it here
-    return style & wxCONFIG_USE_SUBDIR ? stdp.GetUserDataDir()
-                                       : stdp.GetUserConfigDir();
-}
-
-wxFileName wxFileConfig::GetGlobalFile(const wxString& szFile)
-{
-    wxFileName fn(GetGlobalDir(), szFile);
-
-    AddConfFileExtIfNeeded(fn);
-
-    return fn;
-}
-
-wxFileName wxFileConfig::GetLocalFile(const wxString& szFile, int style)
-{
-    wxFileName fn(GetLocalDir(style), szFile);
-
-#if defined( __UNIX__ ) && !defined( __WXMAC__ )
-    if ( !(style & wxCONFIG_USE_SUBDIR) )
-    {
-        // dot-files under Unix start with, well, a dot (but OTOH they usually
-        // don't have any specific extension)
-        fn.SetName(wxT('.') + fn.GetName());
-    }
-    else // we do append ".conf" extension to config files in subdirectories
-#endif // defined( __UNIX__ ) && !defined( __WXMAC__ )
-    {
-        AddConfFileExtIfNeeded(fn);
-    }
-
-    return fn;
-}
-
-// ----------------------------------------------------------------------------
-// ctor
-// ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxFileConfig, wxConfigBase)
-
-void wxFileConfig::Init()
-{
-    m_pCurrentGroup =
-    m_pRootGroup    = new wxFileConfigGroup(NULL, wxEmptyString, this);
-
-    m_linesHead =
-    m_linesTail = NULL;
-
-    // It's not an error if (one of the) file(s) doesn't exist.
-
-    // parse the global file
-    if ( m_fnGlobalFile.IsOk() && m_fnGlobalFile.FileExists() )
-    {
-        wxTextFile fileGlobal(m_fnGlobalFile.GetFullPath());
-
-        if ( fileGlobal.Open(*m_conv/*ignored in ANSI build*/) )
-        {
-            Parse(fileGlobal, false /* global */);
-            SetRootPath();
-        }
-        else
-        {
-            wxLogWarning(_("can't open global configuration file '%s'."), m_fnGlobalFile.GetFullPath().c_str());
-        }
-    }
-
-    // parse the local file
-    if ( m_fnLocalFile.IsOk() && m_fnLocalFile.FileExists() )
-    {
-        wxTextFile fileLocal(m_fnLocalFile.GetFullPath());
-        if ( fileLocal.Open(*m_conv/*ignored in ANSI build*/) )
-        {
-            Parse(fileLocal, true /* local */);
-            SetRootPath();
-        }
-        else
-        {
-            const wxString path = m_fnLocalFile.GetFullPath();
-            wxLogWarning(_("can't open user configuration file '%s'."),
-                         path.c_str());
-
-            if ( m_fnLocalFile.FileExists() )
-            {
-                wxLogWarning(_("Changes won't be saved to avoid overwriting the existing file \"%s\""),
-                             path.c_str());
-                m_fnLocalFile.Clear();
-            }
-        }
-    }
-
-    m_isDirty = false;
-}
-
-// constructor supports creation of wxFileConfig objects of any type
-wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
-                           const wxString& strLocal, const wxString& strGlobal,
-                           long style,
-                           const wxMBConv& conv)
-            : wxConfigBase(::GetAppName(appName), vendorName,
-                           strLocal, strGlobal,
-                           style),
-              m_fnLocalFile(strLocal),
-              m_fnGlobalFile(strGlobal),
-              m_conv(conv.Clone())
-{
-    // Make up names for files if empty
-    if ( !m_fnLocalFile.IsOk() && (style & wxCONFIG_USE_LOCAL_FILE) )
-        m_fnLocalFile = GetLocalFile(GetAppName(), style);
-
-    if ( !m_fnGlobalFile.IsOk() && (style & wxCONFIG_USE_GLOBAL_FILE) )
-        m_fnGlobalFile = GetGlobalFile(GetAppName());
-
-    // Check if styles are not supplied, but filenames are, in which case
-    // add the correct styles.
-    if ( m_fnLocalFile.IsOk() )
-        SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
-
-    if ( m_fnGlobalFile.IsOk() )
-        SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);
-
-    // if the path is not absolute, prepend the standard directory to it
-    // unless explicitly asked not to
-    if ( !(style & wxCONFIG_USE_RELATIVE_PATH) )
-    {
-        if ( m_fnLocalFile.IsOk() )
-            m_fnLocalFile.MakeAbsolute(GetLocalDir(style));
-
-        if ( m_fnGlobalFile.IsOk() )
-            m_fnGlobalFile.MakeAbsolute(GetGlobalDir());
-    }
-
-    SetUmask(-1);
-
-    Init();
-}
-
-#if wxUSE_STREAMS
-
-wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv)
-            : m_conv(conv.Clone())
-{
-    // always local_file when this constructor is called (?)
-    SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
-
-    m_pCurrentGroup =
-    m_pRootGroup    = new wxFileConfigGroup(NULL, wxEmptyString, this);
-
-    m_linesHead =
-    m_linesTail = NULL;
-
-    // read the entire stream contents in memory
-    wxWxCharBuffer cbuf;
-    static const size_t chunkLen = 1024;
-
-    wxMemoryBuffer buf(chunkLen);
-    do
-    {
-        inStream.Read(buf.GetAppendBuf(chunkLen), chunkLen);
-        buf.UngetAppendBuf(inStream.LastRead());
-
-        const wxStreamError err = inStream.GetLastError();
-
-        if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
-        {
-            wxLogError(_("Error reading config options."));
-            break;
-        }
-    }
-    while ( !inStream.Eof() );
-
-#if wxUSE_UNICODE
-    size_t len;
-    cbuf = conv.cMB2WC((char *)buf.GetData(), buf.GetDataLen() + 1, &len);
-    if ( !len && buf.GetDataLen() )
-    {
-        wxLogError(_("Failed to read config options."));
-    }
-#else // !wxUSE_UNICODE
-    // no need for conversion
-    cbuf = wxCharBuffer::CreateNonOwned((char *)buf.GetData(), buf.GetDataLen());
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
-    // parse the input contents if there is anything to parse
-    if ( cbuf )
-    {
-        // now break it into lines
-        wxMemoryText memText;
-        for ( const wxChar *s = cbuf; ; ++s )
-        {
-            const wxChar *e = s;
-            while ( *e != '\0' && *e != '\n' && *e != '\r' )
-                ++e;
-
-            // notice that we throw away the original EOL kind here, maybe we
-            // should preserve it?
-            if ( e != s )
-                memText.AddLine(wxString(s, e));
-
-            if ( *e == '\0' )
-                break;
-
-            // skip the second EOL byte if it's a DOS one
-            if ( *e == '\r' && e[1] == '\n' )
-                ++e;
-
-            s = e;
-        }
-
-        // Finally we can parse it all.
-        Parse(memText, true /* local */);
-    }
-
-    SetRootPath();
-    ResetDirty();
-}
-
-#endif // wxUSE_STREAMS
-
-void wxFileConfig::CleanUp()
-{
-    delete m_pRootGroup;
-
-    wxFileConfigLineList *pCur = m_linesHead;
-    while ( pCur != NULL ) {
-        wxFileConfigLineList *pNext = pCur->Next();
-        delete pCur;
-        pCur = pNext;
-    }
-}
-
-wxFileConfig::~wxFileConfig()
-{
-    Flush();
-
-    CleanUp();
-
-    delete m_conv;
-}
-
-// ----------------------------------------------------------------------------
-// parse a config file
-// ----------------------------------------------------------------------------
-
-void wxFileConfig::Parse(const wxTextBuffer& buffer, bool bLocal)
-{
-
-  size_t nLineCount = buffer.GetLineCount();
-
-  for ( size_t n = 0; n < nLineCount; n++ )
-  {
-    wxString strLine = buffer[n];
-    // FIXME-UTF8: rewrite using iterators, without this buffer
-    wxWxCharBuffer buf(strLine.c_str());
-    const wxChar *pStart;
-    const wxChar *pEnd;
-
-    // add the line to linked list
-    if ( bLocal )
-      LineListAppend(strLine);
-
-
-    // skip leading spaces
-    for ( pStart = buf; wxIsspace(*pStart); pStart++ )
-      ;
-
-    // skip blank/comment lines
-    if ( *pStart == wxT('\0')|| *pStart == wxT(';') || *pStart == wxT('#') )
-      continue;
-
-    if ( *pStart == wxT('[') ) {          // a new group
-      pEnd = pStart;
-
-      while ( *++pEnd != wxT(']') ) {
-        if ( *pEnd == wxT('\\') ) {
-            // the next char is escaped, so skip it even if it is ']'
-            pEnd++;
-        }
-
-        if ( *pEnd == wxT('\n') || *pEnd == wxT('\0') ) {
-            // we reached the end of line, break out of the loop
-            break;
-        }
-      }
-
-      if ( *pEnd != wxT(']') ) {
-        wxLogError(_("file '%s': unexpected character %c at line %d."),
-                   buffer.GetName(), *pEnd, n + 1);
-        continue; // skip this line
-      }
-
-      // group name here is always considered as abs path
-      wxString strGroup;
-      pStart++;
-      strGroup << wxCONFIG_PATH_SEPARATOR
-               << FilterInEntryName(wxString(pStart, pEnd - pStart));
-
-      // will create it if doesn't yet exist
-      SetPath(strGroup);
-
-      if ( bLocal )
-      {
-        if ( m_pCurrentGroup->Parent() )
-          m_pCurrentGroup->Parent()->SetLastGroup(m_pCurrentGroup);
-        m_pCurrentGroup->SetLine(m_linesTail);
-      }
-
-      // check that there is nothing except comments left on this line
-      bool bCont = true;
-      while ( *++pEnd != wxT('\0') && bCont ) {
-        switch ( *pEnd ) {
-          case wxT('#'):
-          case wxT(';'):
-            bCont = false;
-            break;
-
-          case wxT(' '):
-          case wxT('\t'):
-            // ignore whitespace ('\n' impossible here)
-            break;
-
-          default:
-            wxLogWarning(_("file '%s', line %d: '%s' ignored after group header."),
-                         buffer.GetName(), n + 1, pEnd);
-            bCont = false;
-        }
-      }
-    }
-    else {                        // a key
-      pEnd = pStart;
-      while ( *pEnd && *pEnd != wxT('=') /* && !wxIsspace(*pEnd)*/ ) {
-        if ( *pEnd == wxT('\\') ) {
-          // next character may be space or not - still take it because it's
-          // quoted (unless there is nothing)
-          pEnd++;
-          if ( !*pEnd ) {
-            // the error message will be given below anyhow
-            break;
-          }
-        }
-
-        pEnd++;
-      }
-
-      wxString strKey(FilterInEntryName(wxString(pStart, pEnd).Trim()));
-
-      // skip whitespace
-      while ( wxIsspace(*pEnd) )
-        pEnd++;
-
-      if ( *pEnd++ != wxT('=') ) {
-        wxLogError(_("file '%s', line %d: '=' expected."),
-                   buffer.GetName(), n + 1);
-      }
-      else {
-        wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strKey);
-
-        if ( pEntry == NULL ) {
-          // new entry
-          pEntry = m_pCurrentGroup->AddEntry(strKey, n);
-        }
-        else {
-          if ( bLocal && pEntry->IsImmutable() ) {
-            // immutable keys can't be changed by user
-            wxLogWarning(_("file '%s', line %d: value for immutable key '%s' ignored."),
-                         buffer.GetName(), n + 1, strKey.c_str());
-            continue;
-          }
-          // the condition below catches the cases (a) and (b) but not (c):
-          //  (a) global key found second time in global file
-          //  (b) key found second (or more) time in local file
-          //  (c) key from global file now found in local one
-          // which is exactly what we want.
-          else if ( !bLocal || pEntry->IsLocal() ) {
-            wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),
-                         buffer.GetName(), (int)n + 1, strKey.c_str(), pEntry->Line());
-
-          }
-        }
-
-        if ( bLocal )
-          pEntry->SetLine(m_linesTail);
-
-        // skip whitespace
-        while ( wxIsspace(*pEnd) )
-          pEnd++;
-
-        wxString value = pEnd;
-        if ( !(GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS) )
-            value = FilterInValue(value);
-
-        pEntry->SetValue(value, false);
-      }
-    }
-  }
-}
-
-// ----------------------------------------------------------------------------
-// set/retrieve path
-// ----------------------------------------------------------------------------
-
-void wxFileConfig::SetRootPath()
-{
-    m_strPath.Empty();
-    m_pCurrentGroup = m_pRootGroup;
-}
-
-bool
-wxFileConfig::DoSetPath(const wxString& strPath, bool createMissingComponents)
-{
-    wxArrayString aParts;
-
-    if ( strPath.empty() ) {
-        SetRootPath();
-        return true;
-    }
-
-    if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) {
-        // absolute path
-        wxSplitPath(aParts, strPath);
-    }
-    else {
-        // relative path, combine with current one
-        wxString strFullPath = m_strPath;
-        strFullPath << wxCONFIG_PATH_SEPARATOR << strPath;
-        wxSplitPath(aParts, strFullPath);
-    }
-
-    // change current group
-    size_t n;
-    m_pCurrentGroup = m_pRootGroup;
-    for ( n = 0; n < aParts.GetCount(); n++ ) {
-        wxFileConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
-        if ( pNextGroup == NULL )
-        {
-            if ( !createMissingComponents )
-                return false;
-
-            pNextGroup = m_pCurrentGroup->AddSubgroup(aParts[n]);
-        }
-
-        m_pCurrentGroup = pNextGroup;
-    }
-
-    // recombine path parts in one variable
-    m_strPath.Empty();
-    for ( n = 0; n < aParts.GetCount(); n++ ) {
-        m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
-    }
-
-    return true;
-}
-
-void wxFileConfig::SetPath(const wxString& strPath)
-{
-    DoSetPath(strPath, true /* create missing path components */);
-}
-
-const wxString& wxFileConfig::GetPath() const
-{
-    return m_strPath;
-}
-
-// ----------------------------------------------------------------------------
-// enumeration
-// ----------------------------------------------------------------------------
-
-bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const
-{
-    lIndex = 0;
-    return GetNextGroup(str, lIndex);
-}
-
-bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
-{
-    if ( size_t(lIndex) < m_pCurrentGroup->Groups().GetCount() ) {
-        str = m_pCurrentGroup->Groups()[(size_t)lIndex++]->Name();
-        return true;
-    }
-    else
-        return false;
-}
-
-bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const
-{
-    lIndex = 0;
-    return GetNextEntry(str, lIndex);
-}
-
-bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
-{
-    if ( size_t(lIndex) < m_pCurrentGroup->Entries().GetCount() ) {
-        str = m_pCurrentGroup->Entries()[(size_t)lIndex++]->Name();
-        return true;
-    }
-    else
-        return false;
-}
-
-size_t wxFileConfig::GetNumberOfEntries(bool bRecursive) const
-{
-    size_t n = m_pCurrentGroup->Entries().GetCount();
-    if ( bRecursive ) {
-        wxFileConfig * const self = const_cast<wxFileConfig *>(this);
-
-        wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
-        size_t nSubgroups = m_pCurrentGroup->Groups().GetCount();
-        for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
-            self->m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
-            n += GetNumberOfEntries(true);
-            self->m_pCurrentGroup = pOldCurrentGroup;
-        }
-    }
-
-    return n;
-}
-
-size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const
-{
-    size_t n = m_pCurrentGroup->Groups().GetCount();
-    if ( bRecursive ) {
-        wxFileConfig * const self = const_cast<wxFileConfig *>(this);
-
-        wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
-        size_t nSubgroups = m_pCurrentGroup->Groups().GetCount();
-        for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
-            self->m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
-            n += GetNumberOfGroups(true);
-            self->m_pCurrentGroup = pOldCurrentGroup;
-        }
-    }
-
-    return n;
-}
-
-// ----------------------------------------------------------------------------
-// tests for existence
-// ----------------------------------------------------------------------------
-
-bool wxFileConfig::HasGroup(const wxString& strName) const
-{
-    // special case: DoSetPath("") does work as it's equivalent to DoSetPath("/")
-    // but there is no group with empty name so treat this separately
-    if ( strName.empty() )
-        return false;
-
-    const wxString pathOld = GetPath();
-
-    wxFileConfig *self = const_cast<wxFileConfig *>(this);
-    const bool
-        rc = self->DoSetPath(strName, false /* don't create missing components */);
-
-    self->SetPath(pathOld);
-
-    return rc;
-}
-
-bool wxFileConfig::HasEntry(const wxString& entry) const
-{
-    // path is the part before the last "/"
-    wxString path = entry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
-
-    // except in the special case of "/keyname" when there is nothing before "/"
-    if ( path.empty() && *entry.c_str() == wxCONFIG_PATH_SEPARATOR )
-    {
-        path = wxCONFIG_PATH_SEPARATOR;
-    }
-
-    // change to the path of the entry if necessary and remember the old path
-    // to restore it later
-    wxString pathOld;
-    wxFileConfig * const self = const_cast<wxFileConfig *>(this);
-    if ( !path.empty() )
-    {
-        pathOld = GetPath();
-        if ( pathOld.empty() )
-            pathOld = wxCONFIG_PATH_SEPARATOR;
-
-        if ( !self->DoSetPath(path, false /* don't create if doesn't exist */) )
-        {
-            return false;
-        }
-    }
-
-    // check if the entry exists in this group
-    const bool exists = m_pCurrentGroup->FindEntry(
-                            entry.AfterLast(wxCONFIG_PATH_SEPARATOR)) != NULL;
-
-    // restore the old path if we changed it above
-    if ( !pathOld.empty() )
-    {
-        self->SetPath(pathOld);
-    }
-
-    return exists;
-}
-
-// ----------------------------------------------------------------------------
-// read/write values
-// ----------------------------------------------------------------------------
-
-bool wxFileConfig::DoReadString(const wxString& key, wxString* pStr) const
-{
-    wxConfigPathChanger path(this, key);
-
-    wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
-    if (pEntry == NULL) {
-        return false;
-    }
-
-    *pStr = pEntry->Value();
-
-    return true;
-}
-
-bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const
-{
-    wxString str;
-    if ( !Read(key, &str) )
-        return false;
-
-    // extra spaces shouldn't prevent us from reading numeric values
-    str.Trim();
-
-    return str.ToLong(pl);
-}
-
-#if wxUSE_BASE64
-
-bool wxFileConfig::DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const
-{
-    wxCHECK_MSG( buf, false, wxT("NULL buffer") );
-
-    wxString str;
-    if ( !Read(key, &str) )
-        return false;
-
-    *buf = wxBase64Decode(str);
-    return true;
-}
-
-#endif // wxUSE_BASE64
-
-bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
-{
-    wxConfigPathChanger     path(this, key);
-    wxString                strName = path.Name();
-
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("  Writing String '%s' = '%s' to Group '%s'"),
-                strName.c_str(),
-                szValue.c_str(),
-                GetPath().c_str() );
-
-    if ( strName.empty() )
-    {
-            // setting the value of a group is an error
-
-        wxASSERT_MSG( szValue.empty(), wxT("can't set value of a group!") );
-
-            // ... except if it's empty in which case it's a way to force it's creation
-
-        wxLogTrace( FILECONF_TRACE_MASK,
-                    wxT("  Creating group %s"),
-                    m_pCurrentGroup->Name().c_str() );
-
-        SetDirty();
-
-        // this will add a line for this group if it didn't have it before (or
-        // do nothing for the root but it's ok as it always exists anyhow)
-        (void)m_pCurrentGroup->GetGroupLine();
-    }
-    else
-    {
-        // writing an entry check that the name is reasonable
-        if ( strName[0u] == wxCONFIG_IMMUTABLE_PREFIX )
-        {
-            wxLogError( _("Config entry name cannot start with '%c'."),
-                        wxCONFIG_IMMUTABLE_PREFIX);
-            return false;
-        }
-
-        wxFileConfigEntry   *pEntry = m_pCurrentGroup->FindEntry(strName);
-
-        if ( pEntry == 0 )
-        {
-            wxLogTrace( FILECONF_TRACE_MASK,
-                        wxT("  Adding Entry %s"),
-                        strName.c_str() );
-            pEntry = m_pCurrentGroup->AddEntry(strName);
-        }
-
-        wxLogTrace( FILECONF_TRACE_MASK,
-                    wxT("  Setting value %s"),
-                    szValue.c_str() );
-        pEntry->SetValue(szValue);
-
-        SetDirty();
-    }
-
-    return true;
-}
-
-bool wxFileConfig::DoWriteLong(const wxString& key, long lValue)
-{
-  return Write(key, wxString::Format(wxT("%ld"), lValue));
-}
-
-#if wxUSE_BASE64
-
-bool wxFileConfig::DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf)
-{
-  return Write(key, wxBase64Encode(buf));
-}
-
-#endif // wxUSE_BASE64
-
-bool wxFileConfig::Flush(bool /* bCurrentOnly */)
-{
-  if ( !IsDirty() || !m_fnLocalFile.GetFullPath() )
-    return true;
-
-  // set the umask if needed
-  wxCHANGE_UMASK(m_umask);
-
-  wxTempFile file(m_fnLocalFile.GetFullPath());
-
-  if ( !file.IsOpened() )
-  {
-    wxLogError(_("can't open user configuration file."));
-    return false;
-  }
-
-  // write all strings to file
-  wxString filetext;
-  filetext.reserve(4096);
-  for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
-  {
-    filetext << p->Text() << wxTextFile::GetEOL();
-  }
-
-  if ( !file.Write(filetext, *m_conv) )
-  {
-    wxLogError(_("can't write user configuration file."));
-    return false;
-  }
-
-  if ( !file.Commit() )
-  {
-      wxLogError(_("Failed to update user configuration file."));
-
-      return false;
-  }
-
-  ResetDirty();
-
-#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
-  m_fnLocalFile.MacSetTypeAndCreator('TEXT', 'ttxt');
-#endif // __WXMAC__
-
-  return true;
-}
-
-#if wxUSE_STREAMS
-
-bool wxFileConfig::Save(wxOutputStream& os, const wxMBConv& conv)
-{
-    // save unconditionally, even if not dirty
-    for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
-    {
-        wxString line = p->Text();
-        line += wxTextFile::GetEOL();
-
-        wxCharBuffer buf(line.mb_str(conv));
-        if ( !os.Write(buf, strlen(buf)) )
-        {
-            wxLogError(_("Error saving user configuration data."));
-
-            return false;
-        }
-    }
-
-    ResetDirty();
-
-    return true;
-}
-
-#endif // wxUSE_STREAMS
-
-// ----------------------------------------------------------------------------
-// renaming groups/entries
-// ----------------------------------------------------------------------------
-
-bool wxFileConfig::RenameEntry(const wxString& oldName,
-                               const wxString& newName)
-{
-    wxASSERT_MSG( oldName.find(wxCONFIG_PATH_SEPARATOR) == wxString::npos,
-                   wxT("RenameEntry(): paths are not supported") );
-
-    // check that the entry exists
-    wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
-    if ( !oldEntry )
-        return false;
-
-    // check that the new entry doesn't already exist
-    if ( m_pCurrentGroup->FindEntry(newName) )
-        return false;
-
-    // delete the old entry, create the new one
-    wxString value = oldEntry->Value();
-    if ( !m_pCurrentGroup->DeleteEntry(oldName) )
-        return false;
-
-    SetDirty();
-
-    wxFileConfigEntry *newEntry = m_pCurrentGroup->AddEntry(newName);
-    newEntry->SetValue(value);
-
-    return true;
-}
-
-bool wxFileConfig::RenameGroup(const wxString& oldName,
-                               const wxString& newName)
-{
-    // check that the group exists
-    wxFileConfigGroup *group = m_pCurrentGroup->FindSubgroup(oldName);
-    if ( !group )
-        return false;
-
-    // check that the new group doesn't already exist
-    if ( m_pCurrentGroup->FindSubgroup(newName) )
-        return false;
-
-    group->Rename(newName);
-
-    SetDirty();
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// delete groups/entries
-// ----------------------------------------------------------------------------
-
-bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso)
-{
-  wxConfigPathChanger path(this, key);
-
-  if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
-    return false;
-
-  SetDirty();
-
-  if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) {
-    if ( m_pCurrentGroup != m_pRootGroup ) {
-      wxFileConfigGroup *pGroup = m_pCurrentGroup;
-      SetPath(wxT(".."));  // changes m_pCurrentGroup!
-      m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name());
-    }
-    //else: never delete the root group
-  }
-
-  return true;
-}
-
-bool wxFileConfig::DeleteGroup(const wxString& key)
-{
-  wxConfigPathChanger path(this, RemoveTrailingSeparator(key));
-
-  if ( !m_pCurrentGroup->DeleteSubgroupByName(path.Name()) )
-      return false;
-
-  path.UpdateIfDeleted();
-
-  SetDirty();
-
-  return true;
-}
-
-bool wxFileConfig::DeleteAll()
-{
-  CleanUp();
-
-  if ( m_fnLocalFile.IsOk() )
-  {
-      if ( m_fnLocalFile.FileExists() &&
-           !wxRemoveFile(m_fnLocalFile.GetFullPath()) )
-      {
-          wxLogSysError(_("can't delete user configuration file '%s'"),
-                        m_fnLocalFile.GetFullPath().c_str());
-          return false;
-      }
-  }
-
-  Init();
-
-  return true;
-}
-
-// ----------------------------------------------------------------------------
-// linked list functions
-// ----------------------------------------------------------------------------
-
-    // append a new line to the end of the list
-
-wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
-{
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("    ** Adding Line '%s'"),
-                str.c_str() );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        head: %s"),
-                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
-                               : wxEmptyString) );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        tail: %s"),
-                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
-                               : wxEmptyString) );
-
-    wxFileConfigLineList *pLine = new wxFileConfigLineList(str);
-
-    if ( m_linesTail == NULL )
-    {
-        // list is empty
-        m_linesHead = pLine;
-    }
-    else
-    {
-        // adjust pointers
-        m_linesTail->SetNext(pLine);
-        pLine->SetPrev(m_linesTail);
-    }
-
-    m_linesTail = pLine;
-
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        head: %s"),
-                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
-                               : wxEmptyString) );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        tail: %s"),
-                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
-                               : wxEmptyString) );
-
-    return m_linesTail;
-}
-
-// insert a new line after the given one or in the very beginning if !pLine
-wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
-                                                   wxFileConfigLineList *pLine)
-{
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("    ** Inserting Line '%s' after '%s'"),
-                str.c_str(),
-                ((pLine) ? (const wxChar*)pLine->Text().c_str()
-                         : wxEmptyString) );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        head: %s"),
-                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
-                               : wxEmptyString) );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        tail: %s"),
-                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
-                               : wxEmptyString) );
-
-    if ( pLine == m_linesTail )
-        return LineListAppend(str);
-
-    wxFileConfigLineList *pNewLine = new wxFileConfigLineList(str);
-    if ( pLine == NULL )
-    {
-        // prepend to the list
-        pNewLine->SetNext(m_linesHead);
-        m_linesHead->SetPrev(pNewLine);
-        m_linesHead = pNewLine;
-    }
-    else
-    {
-        // insert before pLine
-        wxFileConfigLineList *pNext = pLine->Next();
-        pNewLine->SetNext(pNext);
-        pNewLine->SetPrev(pLine);
-        pNext->SetPrev(pNewLine);
-        pLine->SetNext(pNewLine);
-    }
-
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        head: %s"),
-                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
-                               : wxEmptyString) );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        tail: %s"),
-                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
-                               : wxEmptyString) );
-
-    return pNewLine;
-}
-
-void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
-{
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("    ** Removing Line '%s'"),
-                pLine->Text().c_str() );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        head: %s"),
-                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
-                               : wxEmptyString) );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        tail: %s"),
-                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
-                               : wxEmptyString) );
-
-    wxFileConfigLineList    *pPrev = pLine->Prev(),
-                            *pNext = pLine->Next();
-
-        // first entry?
-
-    if ( pPrev == NULL )
-        m_linesHead = pNext;
-    else
-        pPrev->SetNext(pNext);
-
-        // last entry?
-
-    if ( pNext == NULL )
-        m_linesTail = pPrev;
-    else
-        pNext->SetPrev(pPrev);
-
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        head: %s"),
-                ((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
-                               : wxEmptyString) );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("        tail: %s"),
-                ((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
-                               : wxEmptyString) );
-
-    delete pLine;
-}
-
-bool wxFileConfig::LineListIsEmpty()
-{
-    return m_linesHead == NULL;
-}
-
-// ============================================================================
-// wxFileConfig::wxFileConfigGroup
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// ctor/dtor
-// ----------------------------------------------------------------------------
-
-// ctor
-wxFileConfigGroup::wxFileConfigGroup(wxFileConfigGroup *pParent,
-                                       const wxString& strName,
-                                       wxFileConfig *pConfig)
-                         : m_aEntries(CompareEntries),
-                           m_aSubgroups(CompareGroups),
-                           m_strName(strName)
-{
-  m_pConfig = pConfig;
-  m_pParent = pParent;
-  m_pLine   = NULL;
-
-  m_pLastEntry = NULL;
-  m_pLastGroup = NULL;
-}
-
-// dtor deletes all children
-wxFileConfigGroup::~wxFileConfigGroup()
-{
-  // entries
-  size_t n, nCount = m_aEntries.GetCount();
-  for ( n = 0; n < nCount; n++ )
-    delete m_aEntries[n];
-
-  // subgroups
-  nCount = m_aSubgroups.GetCount();
-  for ( n = 0; n < nCount; n++ )
-    delete m_aSubgroups[n];
-}
-
-// ----------------------------------------------------------------------------
-// line
-// ----------------------------------------------------------------------------
-
-void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
-{
-    // for a normal (i.e. not root) group this method shouldn't be called twice
-    // unless we are resetting the line
-    wxASSERT_MSG( !m_pParent || !m_pLine || !pLine,
-                   wxT("changing line for a non-root group?") );
-
-    m_pLine = pLine;
-}
-
-/*
-  This is a bit complicated, so let me explain it in details. All lines that
-  were read from the local file (the only one we will ever modify) are stored
-  in a (doubly) linked list. Our problem is to know at which position in this
-  list should we insert the new entries/subgroups. To solve it we keep three
-  variables for each group: m_pLine, m_pLastEntry and m_pLastGroup.
-
-  m_pLine points to the line containing "[group_name]"
-  m_pLastEntry points to the last entry of this group in the local file.
-  m_pLastGroup                   subgroup
-
-  Initially, they're NULL all three. When the group (an entry/subgroup) is read
-  from the local file, the corresponding variable is set. However, if the group
-  was read from the global file and then modified or created by the application
-  these variables are still NULL and we need to create the corresponding lines.
-  See the following functions (and comments preceding them) for the details of
-  how we do it.
-
-  Also, when our last entry/group are deleted we need to find the new last
-  element - the code in DeleteEntry/Subgroup does this by backtracking the list
-  of lines until it either founds an entry/subgroup (and this is the new last
-  element) or the m_pLine of the group, in which case there are no more entries
-  (or subgroups) left and m_pLast<element> becomes NULL.
-
-  NB: This last problem could be avoided for entries if we added new entries
-      immediately after m_pLine, but in this case the entries would appear
-      backwards in the config file (OTOH, it's not that important) and as we
-      would still need to do it for the subgroups the code wouldn't have been
-      significantly less complicated.
-*/
-
-// Return the line which contains "[our name]". If we're still not in the list,
-// add our line to it immediately after the last line of our parent group if we
-// have it or in the very beginning if we're the root group.
-wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
-{
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("  GetGroupLine() for Group '%s'"),
-                Name().c_str() );
-
-    if ( !m_pLine )
-    {
-        wxLogTrace( FILECONF_TRACE_MASK,
-                    wxT("    Getting Line item pointer") );
-
-        wxFileConfigGroup   *pParent = Parent();
-
-        // this group wasn't present in local config file, add it now
-        if ( pParent )
-        {
-            wxLogTrace( FILECONF_TRACE_MASK,
-                        wxT("    checking parent '%s'"),
-                        pParent->Name().c_str() );
-
-            wxString    strFullName;
-
-            // add 1 to the name because we don't want to start with '/'
-            strFullName << wxT("[")
-                        << FilterOutEntryName(GetFullName().c_str() + 1)
-                        << wxT("]");
-            m_pLine = m_pConfig->LineListInsert(strFullName,
-                                                pParent->GetLastGroupLine());
-            pParent->SetLastGroup(this);  // we're surely after all the others
-        }
-        //else: this is the root group and so we return NULL because we don't
-        //      have any group line
-    }
-
-    return m_pLine;
-}
-
-// Return the last line belonging to the subgroups of this group (after which
-// we can add a new subgroup), if we don't have any subgroups or entries our
-// last line is the group line (m_pLine) itself.
-wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine()
-{
-    // if we have any subgroups, our last line is the last line of the last
-    // subgroup
-    if ( m_pLastGroup )
-    {
-        wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();
-
-        wxASSERT_MSG( pLine, wxT("last group must have !NULL associated line") );
-
-        return pLine;
-    }
-
-    // no subgroups, so the last line is the line of thelast entry (if any)
-    return GetLastEntryLine();
-}
-
-// return the last line belonging to the entries of this group (after which
-// we can add a new entry), if we don't have any entries we will add the new
-// one immediately after the group line itself.
-wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine()
-{
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("  GetLastEntryLine() for Group '%s'"),
-                Name().c_str() );
-
-    if ( m_pLastEntry )
-    {
-        wxFileConfigLineList    *pLine = m_pLastEntry->GetLine();
-
-        wxASSERT_MSG( pLine, wxT("last entry must have !NULL associated line") );
-
-        return pLine;
-    }
-
-    // no entries: insert after the group header, if any
-    return GetGroupLine();
-}
-
-void wxFileConfigGroup::SetLastEntry(wxFileConfigEntry *pEntry)
-{
-    m_pLastEntry = pEntry;
-
-    if ( !m_pLine )
-    {
-        // the only situation in which a group without its own line can have
-        // an entry is when the first entry is added to the initially empty
-        // root pseudo-group
-        wxASSERT_MSG( !m_pParent, wxT("unexpected for non root group") );
-
-        // let the group know that it does have a line in the file now
-        m_pLine = pEntry->GetLine();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// group name
-// ----------------------------------------------------------------------------
-
-void wxFileConfigGroup::UpdateGroupAndSubgroupsLines()
-{
-    // update the line of this group
-    wxFileConfigLineList *line = GetGroupLine();
-    wxCHECK_RET( line, wxT("a non root group must have a corresponding line!") );
-
-    // +1: skip the leading '/'
-    line->SetText(wxString::Format(wxT("[%s]"), GetFullName().c_str() + 1));
-
-
-    // also update all subgroups as they have this groups name in their lines
-    const size_t nCount = m_aSubgroups.GetCount();
-    for ( size_t n = 0; n < nCount; n++ )
-    {
-        m_aSubgroups[n]->UpdateGroupAndSubgroupsLines();
-    }
-}
-
-void wxFileConfigGroup::Rename(const wxString& newName)
-{
-    wxCHECK_RET( m_pParent, wxT("the root group can't be renamed") );
-
-    if ( newName == m_strName )
-        return;
-
-    // we need to remove the group from the parent and it back under the new
-    // name to keep the parents array of subgroups alphabetically sorted
-    m_pParent->m_aSubgroups.Remove(this);
-
-    m_strName = newName;
-
-    m_pParent->m_aSubgroups.Add(this);
-
-    // update the group lines recursively
-    UpdateGroupAndSubgroupsLines();
-}
-
-wxString wxFileConfigGroup::GetFullName() const
-{
-    wxString fullname;
-    if ( Parent() )
-        fullname = Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name();
-
-    return fullname;
-}
-
-// ----------------------------------------------------------------------------
-// find an item
-// ----------------------------------------------------------------------------
-
-// use binary search because the array is sorted
-wxFileConfigEntry *
-wxFileConfigGroup::FindEntry(const wxString& name) const
-{
-  size_t i,
-       lo = 0,
-       hi = m_aEntries.GetCount();
-  int res;
-  wxFileConfigEntry *pEntry;
-
-  while ( lo < hi ) {
-    i = (lo + hi)/2;
-    pEntry = m_aEntries[i];
-
-    #if wxCONFIG_CASE_SENSITIVE
-      res = pEntry->Name().compare(name);
-    #else
-      res = pEntry->Name().CmpNoCase(name);
-    #endif
-
-    if ( res > 0 )
-      hi = i;
-    else if ( res < 0 )
-      lo = i + 1;
-    else
-      return pEntry;
-  }
-
-  return NULL;
-}
-
-wxFileConfigGroup *
-wxFileConfigGroup::FindSubgroup(const wxString& name) const
-{
-  size_t i,
-       lo = 0,
-       hi = m_aSubgroups.GetCount();
-  int res;
-  wxFileConfigGroup *pGroup;
-
-  while ( lo < hi ) {
-    i = (lo + hi)/2;
-    pGroup = m_aSubgroups[i];
-
-    #if wxCONFIG_CASE_SENSITIVE
-      res = pGroup->Name().compare(name);
-    #else
-      res = pGroup->Name().CmpNoCase(name);
-    #endif
-
-    if ( res > 0 )
-      hi = i;
-    else if ( res < 0 )
-      lo = i + 1;
-    else
-      return pGroup;
-  }
-
-  return NULL;
-}
-
-// ----------------------------------------------------------------------------
-// create a new item
-// ----------------------------------------------------------------------------
-
-// create a new entry and add it to the current group
-wxFileConfigEntry *wxFileConfigGroup::AddEntry(const wxString& strName, int nLine)
-{
-    wxASSERT( FindEntry(strName) == 0 );
-
-    wxFileConfigEntry   *pEntry = new wxFileConfigEntry(this, strName, nLine);
-
-    m_aEntries.Add(pEntry);
-    return pEntry;
-}
-
-// create a new group and add it to the current group
-wxFileConfigGroup *wxFileConfigGroup::AddSubgroup(const wxString& strName)
-{
-    wxASSERT( FindSubgroup(strName) == 0 );
-
-    wxFileConfigGroup   *pGroup = new wxFileConfigGroup(this, strName, m_pConfig);
-
-    m_aSubgroups.Add(pGroup);
-    return pGroup;
-}
-
-// ----------------------------------------------------------------------------
-// delete an item
-// ----------------------------------------------------------------------------
-
-/*
-  The delete operations are _very_ slow if we delete the last item of this
-  group (see comments before GetXXXLineXXX functions for more details),
-  so it's much better to start with the first entry/group if we want to
-  delete several of them.
- */
-
-bool wxFileConfigGroup::DeleteSubgroupByName(const wxString& name)
-{
-    wxFileConfigGroup * const pGroup = FindSubgroup(name);
-
-    return pGroup ? DeleteSubgroup(pGroup) : false;
-}
-
-// Delete the subgroup and remove all references to it from
-// other data structures.
-bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
-{
-    wxCHECK_MSG( pGroup, false, wxT("deleting non existing group?") );
-
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("Deleting group '%s' from '%s'"),
-                pGroup->Name().c_str(),
-                Name().c_str() );
-
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("  (m_pLine) = prev: %p, this %p, next %p"),
-                m_pLine ? static_cast<void*>(m_pLine->Prev()) : 0,
-                static_cast<void*>(m_pLine),
-                m_pLine ? static_cast<void*>(m_pLine->Next()) : 0 );
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("  text: '%s'"),
-                m_pLine ? (const wxChar*)m_pLine->Text().c_str()
-                        : wxEmptyString );
-
-    // delete all entries...
-    size_t nCount = pGroup->m_aEntries.GetCount();
-
-    wxLogTrace(FILECONF_TRACE_MASK,
-               wxT("Removing %lu entries"), (unsigned long)nCount );
-
-    for ( size_t nEntry = 0; nEntry < nCount; nEntry++ )
-    {
-        wxFileConfigLineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
-
-        if ( pLine )
-        {
-            wxLogTrace( FILECONF_TRACE_MASK,
-                        wxT("    '%s'"),
-                        pLine->Text().c_str() );
-            m_pConfig->LineListRemove(pLine);
-        }
-    }
-
-    // ...and subgroups of this subgroup
-    nCount = pGroup->m_aSubgroups.GetCount();
-
-    wxLogTrace( FILECONF_TRACE_MASK,
-                wxT("Removing %lu subgroups"), (unsigned long)nCount );
-
-    for ( size_t nGroup = 0; nGroup < nCount; nGroup++ )
-    {
-        pGroup->DeleteSubgroup(pGroup->m_aSubgroups[0]);
-    }
-
-    // and then finally the group itself
-    wxFileConfigLineList *pLine = pGroup->m_pLine;
-    if ( pLine )
-    {
-        wxLogTrace( FILECONF_TRACE_MASK,
-                    wxT("  Removing line for group '%s' : '%s'"),
-                    pGroup->Name().c_str(),
-                    pLine->Text().c_str() );
-        wxLogTrace( FILECONF_TRACE_MASK,
-                    wxT("  Removing from group '%s' : '%s'"),
-                    Name().c_str(),
-                    ((m_pLine) ? (const wxChar*)m_pLine->Text().c_str()
-                               : wxEmptyString) );
-
-        // notice that we may do this test inside the previous "if"
-        // because the last entry's line is surely !NULL
-        if ( pGroup == m_pLastGroup )
-        {
-            wxLogTrace( FILECONF_TRACE_MASK,
-                        wxT("  Removing last group") );
-
-            // our last entry is being deleted, so find the last one which
-            // stays by going back until we find a subgroup or reach the
-            // group line
-            const size_t nSubgroups = m_aSubgroups.GetCount();
-
-            m_pLastGroup = NULL;
-            for ( wxFileConfigLineList *pl = pLine->Prev();
-                  pl && !m_pLastGroup;
-                  pl = pl->Prev() )
-            {
-                // does this line belong to our subgroup?
-                for ( size_t n = 0; n < nSubgroups; n++ )
-                {
-                    // do _not_ call GetGroupLine! we don't want to add it to
-                    // the local file if it's not already there
-                    if ( m_aSubgroups[n]->m_pLine == pl )
-                    {
-                        m_pLastGroup = m_aSubgroups[n];
-                        break;
-                    }
-                }
-
-                if ( pl == m_pLine )
-                    break;
-            }
-        }
-
-        m_pConfig->LineListRemove(pLine);
-    }
-    else
-    {
-        wxLogTrace( FILECONF_TRACE_MASK,
-                    wxT("  No line entry for Group '%s'?"),
-                    pGroup->Name().c_str() );
-    }
-
-    m_aSubgroups.Remove(pGroup);
-    delete pGroup;
-
-    return true;
-}
-
-bool wxFileConfigGroup::DeleteEntry(const wxString& name)
-{
-  wxFileConfigEntry *pEntry = FindEntry(name);
-  if ( !pEntry )
-  {
-      // entry doesn't exist, nothing to do
-      return false;
-  }
-
-  wxFileConfigLineList *pLine = pEntry->GetLine();
-  if ( pLine != NULL ) {
-    // notice that we may do this test inside the previous "if" because the
-    // last entry's line is surely !NULL
-    if ( pEntry == m_pLastEntry ) {
-      // our last entry is being deleted - find the last one which stays
-      wxASSERT( m_pLine != NULL );  // if we have an entry with !NULL pLine...
-
-      // find the previous entry (if any)
-      wxFileConfigEntry *pNewLast = NULL;
-      const wxFileConfigLineList * const
-        pNewLastLine = m_pLastEntry->GetLine()->Prev();
-      const size_t nEntries = m_aEntries.GetCount();
-      for ( size_t n = 0; n < nEntries; n++ ) {
-        if ( m_aEntries[n]->GetLine() == pNewLastLine ) {
-          pNewLast = m_aEntries[n];
-          break;
-        }
-      }
-
-      // pNewLast can be NULL here -- it's ok and can happen if we have no
-      // entries left
-      m_pLastEntry = pNewLast;
-
-      // For the root group only, we could be removing the first group line
-      // here, so update m_pLine to avoid keeping a dangling pointer.
-      if ( pLine == m_pLine )
-          SetLine(NULL);
-    }
-
-    m_pConfig->LineListRemove(pLine);
-  }
-
-  m_aEntries.Remove(pEntry);
-  delete pEntry;
-
-  return true;
-}
-
-// ============================================================================
-// wxFileConfig::wxFileConfigEntry
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// ctor
-// ----------------------------------------------------------------------------
-wxFileConfigEntry::wxFileConfigEntry(wxFileConfigGroup *pParent,
-                                       const wxString& strName,
-                                       int nLine)
-                         : m_strName(strName)
-{
-  wxASSERT( !strName.empty() );
-
-  m_pParent = pParent;
-  m_nLine   = nLine;
-  m_pLine   = NULL;
-
-  m_bHasValue = false;
-
-  m_bImmutable = strName[0] == wxCONFIG_IMMUTABLE_PREFIX;
-  if ( m_bImmutable )
-    m_strName.erase(0, 1);  // remove first character
-}
-
-// ----------------------------------------------------------------------------
-// set value
-// ----------------------------------------------------------------------------
-
-void wxFileConfigEntry::SetLine(wxFileConfigLineList *pLine)
-{
-  if ( m_pLine != NULL ) {
-    wxLogWarning(_("entry '%s' appears more than once in group '%s'"),
-                 Name().c_str(), m_pParent->GetFullName().c_str());
-  }
-
-  m_pLine = pLine;
-  Group()->SetLastEntry(this);
-}
-
-// second parameter is false if we read the value from file and prevents the
-// entry from being marked as 'dirty'
-void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
-{
-    if ( bUser && IsImmutable() )
-    {
-        wxLogWarning( _("attempt to change immutable key '%s' ignored."),
-                      Name().c_str());
-        return;
-    }
-
-    // do nothing if it's the same value: but don't test for it if m_bHasValue
-    // hadn't been set yet or we'd never write empty values to the file
-    if ( m_bHasValue && strValue == m_strValue )
-        return;
-
-    m_bHasValue = true;
-    m_strValue = strValue;
-
-    if ( bUser )
-    {
-        wxString strValFiltered;
-
-        if ( Group()->Config()->GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS )
-        {
-            strValFiltered = strValue;
-        }
-        else {
-            strValFiltered = FilterOutValue(strValue);
-        }
-
-        wxString    strLine;
-        strLine << FilterOutEntryName(m_strName) << wxT('=') << strValFiltered;
-
-        if ( m_pLine )
-        {
-            // entry was read from the local config file, just modify the line
-            m_pLine->SetText(strLine);
-        }
-        else // this entry didn't exist in the local file
-        {
-            // add a new line to the file: note that line returned by
-            // GetLastEntryLine() may be NULL if we're in the root group and it
-            // doesn't have any entries yet, but this is ok as passing NULL
-            // line to LineListInsert() means to prepend new line to the list
-            wxFileConfigLineList *line = Group()->GetLastEntryLine();
-            m_pLine = Group()->Config()->LineListInsert(strLine, line);
-
-            Group()->SetLastEntry(this);
-        }
-    }
-}
-
-// ============================================================================
-// global functions
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// compare functions for array sorting
-// ----------------------------------------------------------------------------
-
-int CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2)
-{
-#if wxCONFIG_CASE_SENSITIVE
-    return p1->Name().compare(p2->Name());
-#else
-    return p1->Name().CmpNoCase(p2->Name());
-#endif
-}
-
-int CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2)
-{
-#if wxCONFIG_CASE_SENSITIVE
-    return p1->Name().compare(p2->Name());
-#else
-    return p1->Name().CmpNoCase(p2->Name());
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// filter functions
-// ----------------------------------------------------------------------------
-
-// undo FilterOutValue
-static wxString FilterInValue(const wxString& str)
-{
-    wxString strResult;
-    if ( str.empty() )
-        return strResult;
-
-    strResult.reserve(str.length());
-
-    wxString::const_iterator i = str.begin();
-    const bool bQuoted = *i == '"';
-    if ( bQuoted )
-        ++i;
-
-    for ( const wxString::const_iterator end = str.end(); i != end; ++i )
-    {
-        if ( *i == wxT('\\') )
-        {
-            if ( ++i == end )
-            {
-                wxLogWarning(_("trailing backslash ignored in '%s'"), str.c_str());
-                break;
-            }
-
-            switch ( (*i).GetValue() )
-            {
-                case wxT('n'):
-                    strResult += wxT('\n');
-                    break;
-
-                case wxT('r'):
-                    strResult += wxT('\r');
-                    break;
-
-                case wxT('t'):
-                    strResult += wxT('\t');
-                    break;
-
-                case wxT('\\'):
-                    strResult += wxT('\\');
-                    break;
-
-                case wxT('"'):
-                    strResult += wxT('"');
-                    break;
-            }
-        }
-        else // not a backslash
-        {
-            if ( *i != wxT('"') || !bQuoted )
-            {
-                strResult += *i;
-            }
-            else if ( i != end - 1 )
-            {
-                wxLogWarning(_("unexpected \" at position %d in '%s'."),
-                             i - str.begin(), str.c_str());
-            }
-            //else: it's the last quote of a quoted string, ok
-        }
-    }
-
-    return strResult;
-}
-
-// quote the string before writing it to file
-static wxString FilterOutValue(const wxString& str)
-{
-   if ( !str )
-      return str;
-
-  wxString strResult;
-  strResult.Alloc(str.Len());
-
-  // quoting is necessary to preserve spaces in the beginning of the string
-  bool bQuote = wxIsspace(str[0]) || str[0] == wxT('"');
-
-  if ( bQuote )
-    strResult += wxT('"');
-
-  wxChar c;
-  for ( size_t n = 0; n < str.Len(); n++ ) {
-    switch ( str[n].GetValue() ) {
-      case wxT('\n'):
-        c = wxT('n');
-        break;
-
-      case wxT('\r'):
-        c = wxT('r');
-        break;
-
-      case wxT('\t'):
-        c = wxT('t');
-        break;
-
-      case wxT('\\'):
-        c = wxT('\\');
-        break;
-
-      case wxT('"'):
-        if ( bQuote ) {
-          c = wxT('"');
-          break;
-        }
-        //else: fall through
-
-      default:
-        strResult += str[n];
-        continue;   // nothing special to do
-    }
-
-    // we get here only for special characters
-    strResult << wxT('\\') << c;
-  }
-
-  if ( bQuote )
-    strResult += wxT('"');
-
-  return strResult;
-}
-
-// undo FilterOutEntryName
-static wxString FilterInEntryName(const wxString& str)
-{
-  wxString strResult;
-  strResult.Alloc(str.Len());
-
-  for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) {
-    if ( *pc == wxT('\\') ) {
-      // we need to test it here or we'd skip past the NUL in the loop line
-      if ( *++pc == wxT('\0') )
-        break;
-    }
-
-    strResult += *pc;
-  }
-
-  return strResult;
-}
-
-// sanitize entry or group name: insert '\\' before any special characters
-static wxString FilterOutEntryName(const wxString& str)
-{
-  wxString strResult;
-  strResult.Alloc(str.Len());
-
-  for ( const wxChar *pc = str.c_str(); *pc != wxT('\0'); pc++ ) {
-    const wxChar c = *pc;
-
-    // we explicitly allow some of "safe" chars and 8bit ASCII characters
-    // which will probably never have special meaning and with which we can't
-    // use isalnum() anyhow (in ASCII built, in Unicode it's just fine)
-    //
-    // NB: note that wxCONFIG_IMMUTABLE_PREFIX and wxCONFIG_PATH_SEPARATOR
-    //     should *not* be quoted
-    if (
-#if !wxUSE_UNICODE
-            ((unsigned char)c < 127) &&
-#endif // ANSI
-         !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%()"), c) )
-    {
-      strResult += wxT('\\');
-    }
-
-    strResult += c;
-  }
-
-  return strResult;
-}
-
-// we can't put ?: in the ctor initializer list because it confuses some
-// broken compilers (Borland C++)
-static wxString GetAppName(const wxString& appName)
-{
-    if ( !appName && wxTheApp )
-        return wxTheApp->GetAppName();
-    else
-        return appName;
-}
-
-#endif // wxUSE_CONFIG
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fileconf.cpp
+// Purpose:     implementation of wxFileConfig derivation of wxConfig
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     07.04.98 (adapted from appconf.cpp)
+// RCS-ID:      $Id: fileconf.cpp 50711 2007-12-15 02:57:58Z VZ $
+// Copyright:   (c) 1997 Karsten Ballueder   &  Vadim Zeitlin
+//                       Ballueder@usa.net     <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include  "wx/wxprec.h"
+
+#ifdef    __BORLANDC__
+    #pragma hdrstop
+#endif  //__BORLANDC__
+
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+
+#ifndef   WX_PRECOMP
+    #include  "wx/dynarray.h"
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/log.h"
+    #include  "wx/app.h"
+    #include  "wx/utils.h"    // for wxGetHomeDir
+    #if wxUSE_STREAMS
+        #include  "wx/stream.h"
+    #endif // wxUSE_STREAMS
+#endif  //WX_PRECOMP
+
+#include  "wx/file.h"
+#include  "wx/textfile.h"
+#include  "wx/memtext.h"
+#include  "wx/config.h"
+#include  "wx/fileconf.h"
+#include  "wx/filefn.h"
+
+#if defined(__WXMAC__)
+    #include  "wx/mac/private.h"  // includes mac headers
+    #include  "wx/filename.h"     // for MacSetTypeAndCreator
+#endif
+
+#if defined(__WXMSW__)
+    #include "wx/msw/private.h"
+#endif  //windows.h
+#if defined(__WXPM__)
+    #define INCL_DOS
+    #include <os2.h>
+#endif
+
+#include  <stdlib.h>
+#include  <ctype.h>
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+#define CONST_CAST ((wxFileConfig *)this)->
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#ifndef MAX_PATH
+    #define MAX_PATH 512
+#endif
+
+#define FILECONF_TRACE_MASK _T("fileconf")
+
+// ----------------------------------------------------------------------------
+// global functions declarations
+// ----------------------------------------------------------------------------
+
+// compare functions for sorting the arrays
+static int LINKAGEMODE CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2);
+static int LINKAGEMODE CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2);
+
+// filter strings
+static wxString FilterInValue(const wxString& str);
+static wxString FilterOutValue(const wxString& str);
+
+static wxString FilterInEntryName(const wxString& str);
+static wxString FilterOutEntryName(const wxString& str);
+
+// get the name to use in wxFileConfig ctor
+static wxString GetAppName(const wxString& appname);
+
+// ============================================================================
+// private classes
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// "template" array types
+// ----------------------------------------------------------------------------
+
+#ifdef WXMAKINGDLL_BASE
+    WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxFileConfigEntry *, ArrayEntries,
+                                         WXDLLIMPEXP_BASE);
+    WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxFileConfigGroup *, ArrayGroups,
+                                         WXDLLIMPEXP_BASE);
+#else
+    WX_DEFINE_SORTED_ARRAY(wxFileConfigEntry *, ArrayEntries);
+    WX_DEFINE_SORTED_ARRAY(wxFileConfigGroup *, ArrayGroups);
+#endif
+
+// ----------------------------------------------------------------------------
+// wxFileConfigLineList
+// ----------------------------------------------------------------------------
+
+// we store all lines of the local config file as a linked list in memory
+class wxFileConfigLineList
+{
+public:
+  void SetNext(wxFileConfigLineList *pNext)  { m_pNext = pNext; }
+  void SetPrev(wxFileConfigLineList *pPrev)  { m_pPrev = pPrev; }
+
+  // ctor
+  wxFileConfigLineList(const wxString& str,
+                       wxFileConfigLineList *pNext = NULL) : m_strLine(str)
+    { SetNext(pNext); SetPrev(NULL); }
+
+  // next/prev nodes in the linked list
+  wxFileConfigLineList *Next() const { return m_pNext;  }
+  wxFileConfigLineList *Prev() const { return m_pPrev;  }
+
+  // get/change lines text
+  void SetText(const wxString& str) { m_strLine = str;  }
+  const wxString& Text() const { return m_strLine; }
+
+private:
+  wxString  m_strLine;                  // line contents
+  wxFileConfigLineList *m_pNext,        // next node
+                       *m_pPrev;        // previous one
+
+    DECLARE_NO_COPY_CLASS(wxFileConfigLineList)
+};
+
+// ----------------------------------------------------------------------------
+// wxFileConfigEntry: a name/value pair
+// ----------------------------------------------------------------------------
+
+class wxFileConfigEntry
+{
+private:
+  wxFileConfigGroup *m_pParent; // group that contains us
+
+  wxString      m_strName,      // entry name
+                m_strValue;     //       value
+  bool          m_bImmutable:1, // can be overriden locally?
+                m_bHasValue:1;  // set after first call to SetValue()
+
+  int           m_nLine;        // used if m_pLine == NULL only
+
+  // pointer to our line in the linked list or NULL if it was found in global
+  // file (which we don't modify)
+  wxFileConfigLineList *m_pLine;
+
+public:
+  wxFileConfigEntry(wxFileConfigGroup *pParent,
+                    const wxString& strName, int nLine);
+
+  // simple accessors
+  const wxString& Name()        const { return m_strName;    }
+  const wxString& Value()       const { return m_strValue;   }
+  wxFileConfigGroup *Group()    const { return m_pParent;    }
+  bool            IsImmutable() const { return m_bImmutable; }
+  bool            IsLocal()     const { return m_pLine != 0; }
+  int             Line()        const { return m_nLine;      }
+  wxFileConfigLineList *
+                  GetLine()     const { return m_pLine;      }
+
+  // modify entry attributes
+  void SetValue(const wxString& strValue, bool bUser = true);
+  void SetLine(wxFileConfigLineList *pLine);
+
+    DECLARE_NO_COPY_CLASS(wxFileConfigEntry)
+};
+
+// ----------------------------------------------------------------------------
+// wxFileConfigGroup: container of entries and other groups
+// ----------------------------------------------------------------------------
+
+class wxFileConfigGroup
+{
+private:
+  wxFileConfig *m_pConfig;          // config object we belong to
+  wxFileConfigGroup  *m_pParent;    // parent group (NULL for root group)
+  ArrayEntries  m_aEntries;         // entries in this group
+  ArrayGroups   m_aSubgroups;       // subgroups
+  wxString      m_strName;          // group's name
+  wxFileConfigLineList *m_pLine;    // pointer to our line in the linked list
+  wxFileConfigEntry *m_pLastEntry;  // last entry/subgroup of this group in the
+  wxFileConfigGroup *m_pLastGroup;  // local file (we insert new ones after it)
+
+  // DeleteSubgroupByName helper
+  bool DeleteSubgroup(wxFileConfigGroup *pGroup);
+
+  // used by Rename()
+  void UpdateGroupAndSubgroupsLines();
+
+public:
+  // ctor
+  wxFileConfigGroup(wxFileConfigGroup *pParent, const wxString& strName, wxFileConfig *);
+
+  // dtor deletes all entries and subgroups also
+  ~wxFileConfigGroup();
+
+  // simple accessors
+  const wxString& Name()    const { return m_strName; }
+  wxFileConfigGroup    *Parent()  const { return m_pParent; }
+  wxFileConfig   *Config()  const { return m_pConfig; }
+
+  const ArrayEntries& Entries() const { return m_aEntries;   }
+  const ArrayGroups&  Groups()  const { return m_aSubgroups; }
+  bool  IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }
+
+  // find entry/subgroup (NULL if not found)
+  wxFileConfigGroup *FindSubgroup(const wxChar *szName) const;
+  wxFileConfigEntry *FindEntry   (const wxChar *szName) const;
+
+  // delete entry/subgroup, return false if doesn't exist
+  bool DeleteSubgroupByName(const wxChar *szName);
+  bool DeleteEntry(const wxChar *szName);
+
+  // create new entry/subgroup returning pointer to newly created element
+  wxFileConfigGroup *AddSubgroup(const wxString& strName);
+  wxFileConfigEntry *AddEntry   (const wxString& strName, int nLine = wxNOT_FOUND);
+
+  void SetLine(wxFileConfigLineList *pLine);
+
+  // rename: no checks are done to ensure that the name is unique!
+  void Rename(const wxString& newName);
+
+  //
+  wxString GetFullName() const;
+
+  // get the last line belonging to an entry/subgroup of this group
+  wxFileConfigLineList *GetGroupLine();     // line which contains [group]
+                                            // may be NULL for "/" only
+  wxFileConfigLineList *GetLastEntryLine(); // after which our subgroups start
+  wxFileConfigLineList *GetLastGroupLine(); // after which the next group starts
+
+  // called by entries/subgroups when they're created/deleted
+  void SetLastEntry(wxFileConfigEntry *pEntry);
+  void SetLastGroup(wxFileConfigGroup *pGroup)
+    { m_pLastGroup = pGroup; }
+
+  DECLARE_NO_COPY_CLASS(wxFileConfigGroup)
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// static functions
+// ----------------------------------------------------------------------------
+wxString wxFileConfig::GetGlobalDir()
+{
+  wxString strDir;
+
+#ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
+    strDir = wxT("sys$manager:");
+#elif defined(__WXMAC__)
+    strDir = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
+#elif defined( __UNIX__ )
+    strDir = wxT("/etc/");
+#elif defined(__OS2__)
+    ULONG aulSysInfo[QSV_MAX] = {0};
+    UINT drive;
+    APIRET rc;
+
+    rc = DosQuerySysInfo( 1L, QSV_MAX, (PVOID)aulSysInfo, sizeof(ULONG)*QSV_MAX);
+    if (rc == 0)
+    {
+        drive = aulSysInfo[QSV_BOOT_DRIVE - 1];
+        strDir.Printf(wxT("%c:\\OS2\\"), 'A'+drive-1);
+    }
+#elif defined(__WXSTUBS__)
+    wxFAIL_MSG( wxT("TODO") );
+#elif defined(__DOS__)
+    // There's no such thing as global cfg dir in MS-DOS, let's return
+    // current directory (FIXME_MGL?)
+    strDir = wxT(".\\");
+#elif defined(__WXWINCE__)
+    strDir = wxT("\\Windows\\");
+#else // Windows
+
+    wxChar szWinDir[MAX_PATH];
+    ::GetWindowsDirectory(szWinDir, MAX_PATH);
+
+    strDir = szWinDir;
+    strDir << wxT('\\');
+#endif // Unix/Windows
+
+    return strDir;
+}
+
+wxString wxFileConfig::GetLocalDir()
+{
+    wxString strDir;
+
+#if defined(__WXMAC__) || defined(__DOS__)
+    // no local dir concept on Mac OS 9 or MS-DOS
+    strDir << GetGlobalDir() ;
+#else
+    wxGetHomeDir(&strDir);
+
+    #ifdef  __UNIX__
+        if (
+            (strDir.Last() != wxT('/'))
+        #ifdef __VMS
+            && (strDir.Last() != wxT(']'))
+        #endif
+            )
+            strDir << wxT('/');
+    #else
+        if (strDir.Last() != wxT('\\'))
+            strDir << wxT('\\');
+    #endif
+#endif
+
+    return strDir;
+}
+
+wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
+{
+    wxString str = GetGlobalDir();
+    str << szFile;
+
+    if ( wxStrchr(szFile, wxT('.')) == NULL )
+#if defined( __WXMAC__ )
+        str << wxT(" Preferences") ;
+#elif defined( __UNIX__ )
+        str << wxT(".conf");
+#else   // Windows
+        str << wxT(".ini");
+#endif  // UNIX/Win
+
+    return str;
+}
+
+wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
+{
+#ifdef __VMS__
+    // On VMS I saw the problem that the home directory was appended
+    // twice for the configuration file. Does that also happen for
+    // other platforms?
+    wxString str = wxT( '.' );
+#else
+    wxString str = GetLocalDir();
+#endif
+
+#if defined( __UNIX__ ) && !defined( __VMS ) && !defined( __WXMAC__ )
+    str << wxT('.');
+#endif
+
+    str << szFile;
+
+#if defined(__WINDOWS__) || defined(__DOS__)
+    if ( wxStrchr(szFile, wxT('.')) == NULL )
+        str << wxT(".ini");
+#endif
+
+#ifdef __WXMAC__
+    str << wxT(" Preferences") ;
+#endif
+
+    return str;
+}
+
+// ----------------------------------------------------------------------------
+// ctor
+// ----------------------------------------------------------------------------
+
+void wxFileConfig::Init()
+{
+    m_pCurrentGroup =
+    m_pRootGroup    = new wxFileConfigGroup(NULL, wxEmptyString, this);
+
+    m_linesHead =
+    m_linesTail = NULL;
+
+    // It's not an error if (one of the) file(s) doesn't exist.
+
+    // parse the global file
+    if ( !m_strGlobalFile.empty() && wxFile::Exists(m_strGlobalFile) )
+    {
+        wxTextFile fileGlobal(m_strGlobalFile);
+
+        if ( fileGlobal.Open(*m_conv/*ignored in ANSI build*/) )
+        {
+            Parse(fileGlobal, false /* global */);
+            SetRootPath();
+        }
+        else
+        {
+            wxLogWarning(_("can't open global configuration file '%s'."), m_strGlobalFile.c_str());
+        }
+    }
+
+    // parse the local file
+    if ( !m_strLocalFile.empty() && wxFile::Exists(m_strLocalFile) )
+    {
+        wxTextFile fileLocal(m_strLocalFile);
+        if ( fileLocal.Open(*m_conv/*ignored in ANSI build*/) )
+        {
+            Parse(fileLocal, true /* local */);
+            SetRootPath();
+        }
+        else
+        {
+            wxLogWarning(_("can't open user configuration file '%s'."),  m_strLocalFile.c_str() );
+        }
+    }
+
+    m_isDirty = false;
+}
+
+// constructor supports creation of wxFileConfig objects of any type
+wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
+                           const wxString& strLocal, const wxString& strGlobal,
+                           long style,
+                           const wxMBConv& conv)
+            : wxConfigBase(::GetAppName(appName), vendorName,
+                           strLocal, strGlobal,
+                           style),
+              m_strLocalFile(strLocal), m_strGlobalFile(strGlobal),
+              m_conv(conv.Clone())
+{
+    // Make up names for files if empty
+    if ( m_strLocalFile.empty() && (style & wxCONFIG_USE_LOCAL_FILE) )
+    {
+        m_strLocalFile = GetLocalFileName(GetAppName());
+#if defined(__UNIX__) && !defined(__VMS)
+        if ( style & wxCONFIG_USE_SUBDIR )
+            m_strLocalFile << wxFILE_SEP_PATH << GetAppName() << _T(".conf");
+#endif
+    }
+
+    if ( m_strGlobalFile.empty() && (style & wxCONFIG_USE_GLOBAL_FILE) )
+        m_strGlobalFile = GetGlobalFileName(GetAppName());
+
+    // Check if styles are not supplied, but filenames are, in which case
+    // add the correct styles.
+    if ( !m_strLocalFile.empty() )
+        SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
+
+    if ( !m_strGlobalFile.empty() )
+        SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);
+
+    // if the path is not absolute, prepend the standard directory to it
+    // UNLESS wxCONFIG_USE_RELATIVE_PATH style is set
+    if ( !(style & wxCONFIG_USE_RELATIVE_PATH) )
+    {
+        if ( !m_strLocalFile.empty() && !wxIsAbsolutePath(m_strLocalFile) )
+        {
+            const wxString strLocalOrig = m_strLocalFile;
+            m_strLocalFile = GetLocalDir();
+            m_strLocalFile << strLocalOrig;
+        }
+
+        if ( !m_strGlobalFile.empty() && !wxIsAbsolutePath(m_strGlobalFile) )
+        {
+            const wxString strGlobalOrig = m_strGlobalFile;
+            m_strGlobalFile = GetGlobalDir();
+            m_strGlobalFile << strGlobalOrig;
+        }
+    }
+
+    SetUmask(-1);
+
+    Init();
+}
+
+#if wxUSE_STREAMS
+
+wxFileConfig::wxFileConfig(wxInputStream &inStream, const wxMBConv& conv)
+            : m_conv(conv.Clone())
+{
+    // always local_file when this constructor is called (?)
+    SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);
+
+    m_pCurrentGroup =
+    m_pRootGroup    = new wxFileConfigGroup(NULL, wxEmptyString, this);
+
+    m_linesHead =
+    m_linesTail = NULL;
+
+    // read the entire stream contents in memory
+    wxString str;
+    {
+        static const size_t chunkLen = 1024;
+
+        wxMemoryBuffer buf(chunkLen);
+        do
+        {
+            inStream.Read(buf.GetAppendBuf(chunkLen), chunkLen);
+            buf.UngetAppendBuf(inStream.LastRead());
+
+            const wxStreamError err = inStream.GetLastError();
+
+            if ( err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF )
+            {
+                wxLogError(_("Error reading config options."));
+                break;
+            }
+        }
+        while ( !inStream.Eof() );
+
+#if wxUSE_UNICODE
+        size_t len;
+        str = conv.cMB2WC((char *)buf.GetData(), buf.GetDataLen(), &len);
+        if ( !len && buf.GetDataLen() )
+        {
+            wxLogError(_("Failed to read config options."));
+        }
+#else // !wxUSE_UNICODE
+        // no need for conversion
+        str.assign((char *)buf.GetData(), buf.GetDataLen());
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+    }
+
+
+    // translate everything to the current (platform-dependent) line
+    // termination character
+    str = wxTextBuffer::Translate(str);
+
+    wxMemoryText memText;
+
+    // Now we can add the text to the memory text. To do this we extract line
+    // by line from the translated string, until we've reached the end.
+    //
+    // VZ: all this is horribly inefficient, we should do the translation on
+    //     the fly in one pass saving both memory and time (TODO)
+
+    const wxChar *pEOL = wxTextBuffer::GetEOL(wxTextBuffer::typeDefault);
+    const size_t EOLLen = wxStrlen(pEOL);
+
+    int posLineStart = str.Find(pEOL);
+    while ( posLineStart != -1 )
+    {
+        wxString line(str.Left(posLineStart));
+
+        memText.AddLine(line);
+
+        str = str.Mid(posLineStart + EOLLen);
+
+        posLineStart = str.Find(pEOL);
+    }
+
+    // also add whatever we have left in the translated string.
+    if ( !str.empty() )
+        memText.AddLine(str);
+
+    // Finally we can parse it all.
+    Parse(memText, true /* local */);
+
+    SetRootPath();
+    ResetDirty();
+}
+
+#endif // wxUSE_STREAMS
+
+void wxFileConfig::CleanUp()
+{
+    delete m_pRootGroup;
+
+    wxFileConfigLineList *pCur = m_linesHead;
+    while ( pCur != NULL ) {
+        wxFileConfigLineList *pNext = pCur->Next();
+        delete pCur;
+        pCur = pNext;
+    }
+}
+
+wxFileConfig::~wxFileConfig()
+{
+    Flush();
+
+    CleanUp();
+
+    delete m_conv;
+}
+
+// ----------------------------------------------------------------------------
+// parse a config file
+// ----------------------------------------------------------------------------
+
+void wxFileConfig::Parse(const wxTextBuffer& buffer, bool bLocal)
+{
+  const wxChar *pStart;
+  const wxChar *pEnd;
+  wxString strLine;
+
+  size_t nLineCount = buffer.GetLineCount();
+
+  for ( size_t n = 0; n < nLineCount; n++ )
+  {
+    strLine = buffer[n];
+
+    // add the line to linked list
+    if ( bLocal )
+      LineListAppend(strLine);
+
+
+    // skip leading spaces
+    for ( pStart = strLine; wxIsspace(*pStart); pStart++ )
+      ;
+
+    // skip blank/comment lines
+    if ( *pStart == wxT('\0')|| *pStart == wxT(';') || *pStart == wxT('#') )
+      continue;
+
+    if ( *pStart == wxT('[') ) {          // a new group
+      pEnd = pStart;
+
+      while ( *++pEnd != wxT(']') ) {
+        if ( *pEnd == wxT('\\') ) {
+            // the next char is escaped, so skip it even if it is ']'
+            pEnd++;
+        }
+
+        if ( *pEnd == wxT('\n') || *pEnd == wxT('\0') ) {
+            // we reached the end of line, break out of the loop
+            break;
+        }
+      }
+
+      if ( *pEnd != wxT(']') ) {
+        wxLogError(_("file '%s': unexpected character %c at line %d."),
+                   buffer.GetName(), *pEnd, n + 1);
+        continue; // skip this line
+      }
+
+      // group name here is always considered as abs path
+      wxString strGroup;
+      pStart++;
+      strGroup << wxCONFIG_PATH_SEPARATOR
+               << FilterInEntryName(wxString(pStart, pEnd - pStart));
+
+      // will create it if doesn't yet exist
+      SetPath(strGroup);
+
+      if ( bLocal )
+      {
+        if ( m_pCurrentGroup->Parent() )
+          m_pCurrentGroup->Parent()->SetLastGroup(m_pCurrentGroup);
+        m_pCurrentGroup->SetLine(m_linesTail);
+      }
+
+      // check that there is nothing except comments left on this line
+      bool bCont = true;
+      while ( *++pEnd != wxT('\0') && bCont ) {
+        switch ( *pEnd ) {
+          case wxT('#'):
+          case wxT(';'):
+            bCont = false;
+            break;
+
+          case wxT(' '):
+          case wxT('\t'):
+            // ignore whitespace ('\n' impossible here)
+            break;
+
+          default:
+            wxLogWarning(_("file '%s', line %d: '%s' ignored after group header."),
+                         buffer.GetName(), n + 1, pEnd);
+            bCont = false;
+        }
+      }
+    }
+    else {                        // a key
+      pEnd = pStart;
+      while ( *pEnd && *pEnd != wxT('=') /* && !wxIsspace(*pEnd)*/ ) {
+        if ( *pEnd == wxT('\\') ) {
+          // next character may be space or not - still take it because it's
+          // quoted (unless there is nothing)
+          pEnd++;
+          if ( !*pEnd ) {
+            // the error message will be given below anyhow
+            break;
+          }
+        }
+
+        pEnd++;
+      }
+
+      wxString strKey(FilterInEntryName(wxString(pStart, pEnd).Trim()));
+
+      // skip whitespace
+      while ( wxIsspace(*pEnd) )
+        pEnd++;
+
+      if ( *pEnd++ != wxT('=') ) {
+        wxLogError(_("file '%s', line %d: '=' expected."),
+                   buffer.GetName(), n + 1);
+      }
+      else {
+        wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(strKey);
+
+        if ( pEntry == NULL ) {
+          // new entry
+          pEntry = m_pCurrentGroup->AddEntry(strKey, n);
+        }
+        else {
+          if ( bLocal && pEntry->IsImmutable() ) {
+            // immutable keys can't be changed by user
+            wxLogWarning(_("file '%s', line %d: value for immutable key '%s' ignored."),
+                         buffer.GetName(), n + 1, strKey.c_str());
+            continue;
+          }
+          // the condition below catches the cases (a) and (b) but not (c):
+          //  (a) global key found second time in global file
+          //  (b) key found second (or more) time in local file
+          //  (c) key from global file now found in local one
+          // which is exactly what we want.
+          else if ( !bLocal || pEntry->IsLocal() ) {
+            wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),
+                         buffer.GetName(), n + 1, strKey.c_str(), pEntry->Line());
+
+          }
+        }
+
+        if ( bLocal )
+          pEntry->SetLine(m_linesTail);
+
+        // skip whitespace
+        while ( wxIsspace(*pEnd) )
+          pEnd++;
+
+        wxString value = pEnd;
+        if ( !(GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS) )
+            value = FilterInValue(value);
+
+        pEntry->SetValue(value, false);
+      }
+    }
+  }
+}
+
+// ----------------------------------------------------------------------------
+// set/retrieve path
+// ----------------------------------------------------------------------------
+
+void wxFileConfig::SetRootPath()
+{
+    m_strPath.Empty();
+    m_pCurrentGroup = m_pRootGroup;
+}
+
+bool
+wxFileConfig::DoSetPath(const wxString& strPath, bool createMissingComponents)
+{
+    wxArrayString aParts;
+
+    if ( strPath.empty() ) {
+        SetRootPath();
+        return true;
+    }
+
+    if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) {
+        // absolute path
+        wxSplitPath(aParts, strPath);
+    }
+    else {
+        // relative path, combine with current one
+        wxString strFullPath = m_strPath;
+        strFullPath << wxCONFIG_PATH_SEPARATOR << strPath;
+        wxSplitPath(aParts, strFullPath);
+    }
+
+    // change current group
+    size_t n;
+    m_pCurrentGroup = m_pRootGroup;
+    for ( n = 0; n < aParts.Count(); n++ ) {
+        wxFileConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);
+        if ( pNextGroup == NULL )
+        {
+            if ( !createMissingComponents )
+                return false;
+
+            pNextGroup = m_pCurrentGroup->AddSubgroup(aParts[n]);
+        }
+
+        m_pCurrentGroup = pNextGroup;
+    }
+
+    // recombine path parts in one variable
+    m_strPath.Empty();
+    for ( n = 0; n < aParts.Count(); n++ ) {
+        m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
+    }
+
+    return true;
+}
+
+void wxFileConfig::SetPath(const wxString& strPath)
+{
+    DoSetPath(strPath, true /* create missing path components */);
+}
+
+// ----------------------------------------------------------------------------
+// enumeration
+// ----------------------------------------------------------------------------
+
+bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const
+{
+    lIndex = 0;
+    return GetNextGroup(str, lIndex);
+}
+
+bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
+{
+    if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {
+        str = m_pCurrentGroup->Groups()[(size_t)lIndex++]->Name();
+        return true;
+    }
+    else
+        return false;
+}
+
+bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const
+{
+    lIndex = 0;
+    return GetNextEntry(str, lIndex);
+}
+
+bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
+{
+    if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {
+        str = m_pCurrentGroup->Entries()[(size_t)lIndex++]->Name();
+        return true;
+    }
+    else
+        return false;
+}
+
+size_t wxFileConfig::GetNumberOfEntries(bool bRecursive) const
+{
+    size_t n = m_pCurrentGroup->Entries().Count();
+    if ( bRecursive ) {
+        wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
+        size_t nSubgroups = m_pCurrentGroup->Groups().Count();
+        for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
+            CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
+            n += GetNumberOfEntries(true);
+            CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
+        }
+    }
+
+    return n;
+}
+
+size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const
+{
+    size_t n = m_pCurrentGroup->Groups().Count();
+    if ( bRecursive ) {
+        wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
+        size_t nSubgroups = m_pCurrentGroup->Groups().Count();
+        for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
+            CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
+            n += GetNumberOfGroups(true);
+            CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
+        }
+    }
+
+    return n;
+}
+
+// ----------------------------------------------------------------------------
+// tests for existence
+// ----------------------------------------------------------------------------
+
+bool wxFileConfig::HasGroup(const wxString& strName) const
+{
+    // special case: DoSetPath("") does work as it's equivalent to DoSetPath("/")
+    // but there is no group with empty name so treat this separately
+    if ( strName.empty() )
+        return false;
+
+    const wxString pathOld = GetPath();
+
+    wxFileConfig *self = wx_const_cast(wxFileConfig *, this);
+    const bool
+        rc = self->DoSetPath(strName, false /* don't create missing components */);
+
+    self->SetPath(pathOld);
+
+    return rc;
+}
+
+bool wxFileConfig::HasEntry(const wxString& entry) const
+{
+    // path is the part before the last "/"
+    wxString path = entry.BeforeLast(wxCONFIG_PATH_SEPARATOR);
+
+    // except in the special case of "/keyname" when there is nothing before "/"
+    if ( path.empty() && *entry.c_str() == wxCONFIG_PATH_SEPARATOR )
+    {
+        path = wxCONFIG_PATH_SEPARATOR;
+    }
+
+    // change to the path of the entry if necessary and remember the old path
+    // to restore it later
+    wxString pathOld;
+    wxFileConfig * const self = wx_const_cast(wxFileConfig *, this);
+    if ( !path.empty() )
+    {
+        pathOld = GetPath();
+        if ( pathOld.empty() )
+            pathOld = wxCONFIG_PATH_SEPARATOR;
+
+        if ( !self->DoSetPath(path, false /* don't create if doesn't exist */) )
+        {
+            return false;
+        }
+    }
+
+    // check if the entry exists in this group
+    const bool exists = m_pCurrentGroup->FindEntry(
+                            entry.AfterLast(wxCONFIG_PATH_SEPARATOR)) != NULL;
+
+    // restore the old path if we changed it above
+    if ( !pathOld.empty() )
+    {
+        self->SetPath(pathOld);
+    }
+
+    return exists;
+}
+
+// ----------------------------------------------------------------------------
+// read/write values
+// ----------------------------------------------------------------------------
+
+bool wxFileConfig::DoReadString(const wxString& key, wxString* pStr) const
+{
+    wxConfigPathChanger path(this, key);
+
+    wxFileConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+    if (pEntry == NULL) {
+        return false;
+    }
+
+    *pStr = pEntry->Value();
+
+    return true;
+}
+
+bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const
+{
+    wxString str;
+    if ( !Read(key, &str) )
+        return false;
+
+    // extra spaces shouldn't prevent us from reading numeric values
+    str.Trim();
+
+    return str.ToLong(pl);
+}
+
+bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue)
+{
+    wxConfigPathChanger     path(this, key);
+    wxString                strName = path.Name();
+
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("  Writing String '%s' = '%s' to Group '%s'"),
+                strName.c_str(),
+                szValue.c_str(),
+                GetPath().c_str() );
+
+    if ( strName.empty() )
+    {
+            // setting the value of a group is an error
+
+        wxASSERT_MSG( szValue.empty(), wxT("can't set value of a group!") );
+
+            // ... except if it's empty in which case it's a way to force it's creation
+
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    _T("  Creating group %s"),
+                    m_pCurrentGroup->Name().c_str() );
+
+        SetDirty();
+
+        // this will add a line for this group if it didn't have it before (or
+        // do nothing for the root but it's ok as it always exists anyhow)
+        (void)m_pCurrentGroup->GetGroupLine();
+    }
+    else
+    {
+        // writing an entry check that the name is reasonable
+        if ( strName[0u] == wxCONFIG_IMMUTABLE_PREFIX )
+        {
+            wxLogError( _("Config entry name cannot start with '%c'."),
+                        wxCONFIG_IMMUTABLE_PREFIX);
+            return false;
+        }
+
+        wxFileConfigEntry   *pEntry = m_pCurrentGroup->FindEntry(strName);
+
+        if ( pEntry == 0 )
+        {
+            wxLogTrace( FILECONF_TRACE_MASK,
+                        _T("  Adding Entry %s"),
+                        strName.c_str() );
+            pEntry = m_pCurrentGroup->AddEntry(strName);
+        }
+
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    _T("  Setting value %s"),
+                    szValue.c_str() );
+        pEntry->SetValue(szValue);
+
+        SetDirty();
+    }
+
+    return true;
+}
+
+bool wxFileConfig::DoWriteLong(const wxString& key, long lValue)
+{
+  return Write(key, wxString::Format(_T("%ld"), lValue));
+}
+
+bool wxFileConfig::Flush(bool /* bCurrentOnly */)
+{
+  if ( !IsDirty() || !m_strLocalFile )
+    return true;
+
+  // set the umask if needed
+  wxCHANGE_UMASK(m_umask);
+
+  wxTempFile file(m_strLocalFile);
+
+  if ( !file.IsOpened() )
+  {
+    wxLogError(_("can't open user configuration file."));
+    return false;
+  }
+
+  // write all strings to file
+  wxString filetext;
+  filetext.reserve(4096);
+  for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
+  {
+    filetext << p->Text() << wxTextFile::GetEOL();
+  }
+
+  if ( !file.Write(filetext, *m_conv) )
+  {
+    wxLogError(_("can't write user configuration file."));
+    return false;
+  }
+
+  if ( !file.Commit() )
+  {
+      wxLogError(_("Failed to update user configuration file."));
+
+      return false;
+  }
+
+  ResetDirty();
+
+#if defined(__WXMAC__)
+  wxFileName(m_strLocalFile).MacSetTypeAndCreator('TEXT', 'ttxt');
+#endif // __WXMAC__
+
+  return true;
+}
+
+#if wxUSE_STREAMS
+
+bool wxFileConfig::Save(wxOutputStream& os, const wxMBConv& conv)
+{
+    // save unconditionally, even if not dirty
+    for ( wxFileConfigLineList *p = m_linesHead; p != NULL; p = p->Next() )
+    {
+        wxString line = p->Text();
+        line += wxTextFile::GetEOL();
+
+        wxCharBuffer buf(line.mb_str(conv));
+        if ( !os.Write(buf, strlen(buf)) )
+        {
+            wxLogError(_("Error saving user configuration data."));
+
+            return false;
+        }
+    }
+
+    ResetDirty();
+
+    return true;
+}
+
+#endif // wxUSE_STREAMS
+
+// ----------------------------------------------------------------------------
+// renaming groups/entries
+// ----------------------------------------------------------------------------
+
+bool wxFileConfig::RenameEntry(const wxString& oldName,
+                               const wxString& newName)
+{
+    wxASSERT_MSG( !wxStrchr(oldName, wxCONFIG_PATH_SEPARATOR),
+                   _T("RenameEntry(): paths are not supported") );
+
+    // check that the entry exists
+    wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
+    if ( !oldEntry )
+        return false;
+
+    // check that the new entry doesn't already exist
+    if ( m_pCurrentGroup->FindEntry(newName) )
+        return false;
+
+    // delete the old entry, create the new one
+    wxString value = oldEntry->Value();
+    if ( !m_pCurrentGroup->DeleteEntry(oldName) )
+        return false;
+
+    SetDirty();
+
+    wxFileConfigEntry *newEntry = m_pCurrentGroup->AddEntry(newName);
+    newEntry->SetValue(value);
+
+    return true;
+}
+
+bool wxFileConfig::RenameGroup(const wxString& oldName,
+                               const wxString& newName)
+{
+    // check that the group exists
+    wxFileConfigGroup *group = m_pCurrentGroup->FindSubgroup(oldName);
+    if ( !group )
+        return false;
+
+    // check that the new group doesn't already exist
+    if ( m_pCurrentGroup->FindSubgroup(newName) )
+        return false;
+
+    group->Rename(newName);
+
+    SetDirty();
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// delete groups/entries
+// ----------------------------------------------------------------------------
+
+bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso)
+{
+  wxConfigPathChanger path(this, key);
+
+  if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
+    return false;
+
+  SetDirty();
+
+  if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) {
+    if ( m_pCurrentGroup != m_pRootGroup ) {
+      wxFileConfigGroup *pGroup = m_pCurrentGroup;
+      SetPath(wxT(".."));  // changes m_pCurrentGroup!
+      m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name());
+    }
+    //else: never delete the root group
+  }
+
+  return true;
+}
+
+bool wxFileConfig::DeleteGroup(const wxString& key)
+{
+  wxConfigPathChanger path(this, RemoveTrailingSeparator(key));
+
+  if ( !m_pCurrentGroup->DeleteSubgroupByName(path.Name()) )
+      return false;
+
+  path.UpdateIfDeleted();
+
+  SetDirty();
+
+  return true;
+}
+
+bool wxFileConfig::DeleteAll()
+{
+  CleanUp();
+
+  if ( !m_strLocalFile.empty() )
+  {
+      if ( wxFile::Exists(m_strLocalFile) && wxRemove(m_strLocalFile) == -1 )
+      {
+          wxLogSysError(_("can't delete user configuration file '%s'"),
+                        m_strLocalFile.c_str());
+          return false;
+      }
+  }
+
+  Init();
+
+  return true;
+}
+
+// ----------------------------------------------------------------------------
+// linked list functions
+// ----------------------------------------------------------------------------
+
+    // append a new line to the end of the list
+
+wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
+{
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("    ** Adding Line '%s'"),
+                str.c_str() );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        head: %s"),
+                ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        tail: %s"),
+                ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
+
+    wxFileConfigLineList *pLine = new wxFileConfigLineList(str);
+
+    if ( m_linesTail == NULL )
+    {
+        // list is empty
+        m_linesHead = pLine;
+    }
+    else
+    {
+        // adjust pointers
+        m_linesTail->SetNext(pLine);
+        pLine->SetPrev(m_linesTail);
+    }
+
+    m_linesTail = pLine;
+
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        head: %s"),
+                ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        tail: %s"),
+                ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
+
+    return m_linesTail;
+}
+
+// insert a new line after the given one or in the very beginning if !pLine
+wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str,
+                                                   wxFileConfigLineList *pLine)
+{
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("    ** Inserting Line '%s' after '%s'"),
+                str.c_str(),
+                ((pLine) ? pLine->Text().c_str() : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        head: %s"),
+                ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        tail: %s"),
+                ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
+
+    if ( pLine == m_linesTail )
+        return LineListAppend(str);
+
+    wxFileConfigLineList *pNewLine = new wxFileConfigLineList(str);
+    if ( pLine == NULL )
+    {
+        // prepend to the list
+        pNewLine->SetNext(m_linesHead);
+        m_linesHead->SetPrev(pNewLine);
+        m_linesHead = pNewLine;
+    }
+    else
+    {
+        // insert before pLine
+        wxFileConfigLineList *pNext = pLine->Next();
+        pNewLine->SetNext(pNext);
+        pNewLine->SetPrev(pLine);
+        pNext->SetPrev(pNewLine);
+        pLine->SetNext(pNewLine);
+    }
+
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        head: %s"),
+                ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        tail: %s"),
+                ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
+
+    return pNewLine;
+}
+
+void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
+{
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("    ** Removing Line '%s'"),
+                pLine->Text().c_str() );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        head: %s"),
+                ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        tail: %s"),
+                ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
+
+    wxFileConfigLineList    *pPrev = pLine->Prev(),
+                            *pNext = pLine->Next();
+
+        // first entry?
+
+    if ( pPrev == NULL )
+        m_linesHead = pNext;
+    else
+        pPrev->SetNext(pNext);
+
+        // last entry?
+
+    if ( pNext == NULL )
+        m_linesTail = pPrev;
+    else
+        pNext->SetPrev(pPrev);
+
+    if ( m_pRootGroup->GetGroupLine() == pLine )
+        m_pRootGroup->SetLine(m_linesHead);
+
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        head: %s"),
+                ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("        tail: %s"),
+                ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) );
+
+    delete pLine;
+}
+
+bool wxFileConfig::LineListIsEmpty()
+{
+    return m_linesHead == NULL;
+}
+
+// ============================================================================
+// wxFileConfig::wxFileConfigGroup
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// ctor/dtor
+// ----------------------------------------------------------------------------
+
+// ctor
+wxFileConfigGroup::wxFileConfigGroup(wxFileConfigGroup *pParent,
+                                       const wxString& strName,
+                                       wxFileConfig *pConfig)
+                         : m_aEntries(CompareEntries),
+                           m_aSubgroups(CompareGroups),
+                           m_strName(strName)
+{
+  m_pConfig = pConfig;
+  m_pParent = pParent;
+  m_pLine   = NULL;
+
+  m_pLastEntry = NULL;
+  m_pLastGroup = NULL;
+}
+
+// dtor deletes all children
+wxFileConfigGroup::~wxFileConfigGroup()
+{
+  // entries
+  size_t n, nCount = m_aEntries.Count();
+  for ( n = 0; n < nCount; n++ )
+    delete m_aEntries[n];
+
+  // subgroups
+  nCount = m_aSubgroups.Count();
+  for ( n = 0; n < nCount; n++ )
+    delete m_aSubgroups[n];
+}
+
+// ----------------------------------------------------------------------------
+// line
+// ----------------------------------------------------------------------------
+
+void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine)
+{
+    // for a normal (i.e. not root) group this method shouldn't be called twice
+    // unless we are resetting the line
+    wxASSERT_MSG( !m_pParent || !m_pLine || !pLine,
+                   _T("changing line for a non-root group?") );
+
+    m_pLine = pLine;
+}
+
+/*
+  This is a bit complicated, so let me explain it in details. All lines that
+  were read from the local file (the only one we will ever modify) are stored
+  in a (doubly) linked list. Our problem is to know at which position in this
+  list should we insert the new entries/subgroups. To solve it we keep three
+  variables for each group: m_pLine, m_pLastEntry and m_pLastGroup.
+
+  m_pLine points to the line containing "[group_name]"
+  m_pLastEntry points to the last entry of this group in the local file.
+  m_pLastGroup                   subgroup
+
+  Initially, they're NULL all three. When the group (an entry/subgroup) is read
+  from the local file, the corresponding variable is set. However, if the group
+  was read from the global file and then modified or created by the application
+  these variables are still NULL and we need to create the corresponding lines.
+  See the following functions (and comments preceding them) for the details of
+  how we do it.
+
+  Also, when our last entry/group are deleted we need to find the new last
+  element - the code in DeleteEntry/Subgroup does this by backtracking the list
+  of lines until it either founds an entry/subgroup (and this is the new last
+  element) or the m_pLine of the group, in which case there are no more entries
+  (or subgroups) left and m_pLast<element> becomes NULL.
+
+  NB: This last problem could be avoided for entries if we added new entries
+      immediately after m_pLine, but in this case the entries would appear
+      backwards in the config file (OTOH, it's not that important) and as we
+      would still need to do it for the subgroups the code wouldn't have been
+      significantly less complicated.
+*/
+
+// Return the line which contains "[our name]". If we're still not in the list,
+// add our line to it immediately after the last line of our parent group if we
+// have it or in the very beginning if we're the root group.
+wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
+{
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("  GetGroupLine() for Group '%s'"),
+                Name().c_str() );
+
+    if ( !m_pLine )
+    {
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    _T("    Getting Line item pointer") );
+
+        wxFileConfigGroup   *pParent = Parent();
+
+        // this group wasn't present in local config file, add it now
+        if ( pParent )
+        {
+            wxLogTrace( FILECONF_TRACE_MASK,
+                        _T("    checking parent '%s'"),
+                        pParent->Name().c_str() );
+
+            wxString    strFullName;
+
+            // add 1 to the name because we don't want to start with '/'
+            strFullName << wxT("[")
+                        << FilterOutEntryName(GetFullName().c_str() + 1)
+                        << wxT("]");
+            m_pLine = m_pConfig->LineListInsert(strFullName,
+                                                pParent->GetLastGroupLine());
+            pParent->SetLastGroup(this);  // we're surely after all the others
+        }
+        //else: this is the root group and so we return NULL because we don't
+        //      have any group line
+    }
+
+    return m_pLine;
+}
+
+// Return the last line belonging to the subgroups of this group (after which
+// we can add a new subgroup), if we don't have any subgroups or entries our
+// last line is the group line (m_pLine) itself.
+wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine()
+{
+    // if we have any subgroups, our last line is the last line of the last
+    // subgroup
+    if ( m_pLastGroup )
+    {
+        wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();
+
+        wxASSERT_MSG( pLine, _T("last group must have !NULL associated line") );
+
+        return pLine;
+    }
+
+    // no subgroups, so the last line is the line of thelast entry (if any)
+    return GetLastEntryLine();
+}
+
+// return the last line belonging to the entries of this group (after which
+// we can add a new entry), if we don't have any entries we will add the new
+// one immediately after the group line itself.
+wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine()
+{
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("  GetLastEntryLine() for Group '%s'"),
+                Name().c_str() );
+
+    if ( m_pLastEntry )
+    {
+        wxFileConfigLineList    *pLine = m_pLastEntry->GetLine();
+
+        wxASSERT_MSG( pLine, _T("last entry must have !NULL associated line") );
+
+        return pLine;
+    }
+
+    // no entries: insert after the group header, if any
+    return GetGroupLine();
+}
+
+void wxFileConfigGroup::SetLastEntry(wxFileConfigEntry *pEntry)
+{
+    m_pLastEntry = pEntry;
+
+    if ( !m_pLine )
+    {
+        // the only situation in which a group without its own line can have
+        // an entry is when the first entry is added to the initially empty
+        // root pseudo-group
+        wxASSERT_MSG( !m_pParent, _T("unexpected for non root group") );
+
+        // let the group know that it does have a line in the file now
+        m_pLine = pEntry->GetLine();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// group name
+// ----------------------------------------------------------------------------
+
+void wxFileConfigGroup::UpdateGroupAndSubgroupsLines()
+{
+    // update the line of this group
+    wxFileConfigLineList *line = GetGroupLine();
+    wxCHECK_RET( line, _T("a non root group must have a corresponding line!") );
+
+    // +1: skip the leading '/'
+    line->SetText(wxString::Format(_T("[%s]"), GetFullName().c_str() + 1));
+
+
+    // also update all subgroups as they have this groups name in their lines
+    const size_t nCount = m_aSubgroups.Count();
+    for ( size_t n = 0; n < nCount; n++ )
+    {
+        m_aSubgroups[n]->UpdateGroupAndSubgroupsLines();
+    }
+}
+
+void wxFileConfigGroup::Rename(const wxString& newName)
+{
+    wxCHECK_RET( m_pParent, _T("the root group can't be renamed") );
+
+    if ( newName == m_strName )
+        return;
+
+    // we need to remove the group from the parent and it back under the new
+    // name to keep the parents array of subgroups alphabetically sorted
+    m_pParent->m_aSubgroups.Remove(this);
+
+    m_strName = newName;
+
+    m_pParent->m_aSubgroups.Add(this);
+
+    // update the group lines recursively
+    UpdateGroupAndSubgroupsLines();
+}
+
+wxString wxFileConfigGroup::GetFullName() const
+{
+    wxString fullname;
+    if ( Parent() )
+        fullname = Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name();
+
+    return fullname;
+}
+
+// ----------------------------------------------------------------------------
+// find an item
+// ----------------------------------------------------------------------------
+
+// use binary search because the array is sorted
+wxFileConfigEntry *
+wxFileConfigGroup::FindEntry(const wxChar *szName) const
+{
+  size_t i,
+       lo = 0,
+       hi = m_aEntries.Count();
+  int res;
+  wxFileConfigEntry *pEntry;
+
+  while ( lo < hi ) {
+    i = (lo + hi)/2;
+    pEntry = m_aEntries[i];
+
+    #if wxCONFIG_CASE_SENSITIVE
+      res = wxStrcmp(pEntry->Name(), szName);
+    #else
+      res = wxStricmp(pEntry->Name(), szName);
+    #endif
+
+    if ( res > 0 )
+      hi = i;
+    else if ( res < 0 )
+      lo = i + 1;
+    else
+      return pEntry;
+  }
+
+  return NULL;
+}
+
+wxFileConfigGroup *
+wxFileConfigGroup::FindSubgroup(const wxChar *szName) const
+{
+  size_t i,
+       lo = 0,
+       hi = m_aSubgroups.Count();
+  int res;
+  wxFileConfigGroup *pGroup;
+
+  while ( lo < hi ) {
+    i = (lo + hi)/2;
+    pGroup = m_aSubgroups[i];
+
+    #if wxCONFIG_CASE_SENSITIVE
+      res = wxStrcmp(pGroup->Name(), szName);
+    #else
+      res = wxStricmp(pGroup->Name(), szName);
+    #endif
+
+    if ( res > 0 )
+      hi = i;
+    else if ( res < 0 )
+      lo = i + 1;
+    else
+      return pGroup;
+  }
+
+  return NULL;
+}
+
+// ----------------------------------------------------------------------------
+// create a new item
+// ----------------------------------------------------------------------------
+
+// create a new entry and add it to the current group
+wxFileConfigEntry *wxFileConfigGroup::AddEntry(const wxString& strName, int nLine)
+{
+    wxASSERT( FindEntry(strName) == 0 );
+
+    wxFileConfigEntry   *pEntry = new wxFileConfigEntry(this, strName, nLine);
+
+    m_aEntries.Add(pEntry);
+    return pEntry;
+}
+
+// create a new group and add it to the current group
+wxFileConfigGroup *wxFileConfigGroup::AddSubgroup(const wxString& strName)
+{
+    wxASSERT( FindSubgroup(strName) == 0 );
+
+    wxFileConfigGroup   *pGroup = new wxFileConfigGroup(this, strName, m_pConfig);
+
+    m_aSubgroups.Add(pGroup);
+    return pGroup;
+}
+
+// ----------------------------------------------------------------------------
+// delete an item
+// ----------------------------------------------------------------------------
+
+/*
+  The delete operations are _very_ slow if we delete the last item of this
+  group (see comments before GetXXXLineXXX functions for more details),
+  so it's much better to start with the first entry/group if we want to
+  delete several of them.
+ */
+
+bool wxFileConfigGroup::DeleteSubgroupByName(const wxChar *szName)
+{
+    wxFileConfigGroup * const pGroup = FindSubgroup(szName);
+
+    return pGroup ? DeleteSubgroup(pGroup) : false;
+}
+
+// Delete the subgroup and remove all references to it from
+// other data structures.
+bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
+{
+    wxCHECK_MSG( pGroup, false, _T("deleting non existing group?") );
+
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("Deleting group '%s' from '%s'"),
+                pGroup->Name().c_str(),
+                Name().c_str() );
+
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("  (m_pLine) = prev: %p, this %p, next %p"),
+                m_pLine ? wx_static_cast(void*, m_pLine->Prev()) : 0,
+                wx_static_cast(void*, m_pLine),
+                m_pLine ? wx_static_cast(void*, m_pLine->Next()) : 0 );
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("  text: '%s'"),
+                m_pLine ? m_pLine->Text().c_str() : wxEmptyString );
+
+    // delete all entries...
+    size_t nCount = pGroup->m_aEntries.Count();
+
+    wxLogTrace(FILECONF_TRACE_MASK,
+               _T("Removing %lu entries"), (unsigned long)nCount );
+
+    for ( size_t nEntry = 0; nEntry < nCount; nEntry++ )
+    {
+        wxFileConfigLineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
+
+        if ( pLine )
+        {
+            wxLogTrace( FILECONF_TRACE_MASK,
+                        _T("    '%s'"),
+                        pLine->Text().c_str() );
+            m_pConfig->LineListRemove(pLine);
+        }
+    }
+
+    // ...and subgroups of this subgroup
+    nCount = pGroup->m_aSubgroups.Count();
+
+    wxLogTrace( FILECONF_TRACE_MASK,
+                _T("Removing %lu subgroups"), (unsigned long)nCount );
+
+    for ( size_t nGroup = 0; nGroup < nCount; nGroup++ )
+    {
+        pGroup->DeleteSubgroup(pGroup->m_aSubgroups[0]);
+    }
+
+    // and then finally the group itself
+    wxFileConfigLineList *pLine = pGroup->m_pLine;
+    if ( pLine )
+    {
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    _T("  Removing line for group '%s' : '%s'"),
+                    pGroup->Name().c_str(),
+                    pLine->Text().c_str() );
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    _T("  Removing from group '%s' : '%s'"),
+                    Name().c_str(),
+                    ((m_pLine) ? m_pLine->Text().c_str() : wxEmptyString) );
+
+        // notice that we may do this test inside the previous "if"
+        // because the last entry's line is surely !NULL
+        if ( pGroup == m_pLastGroup )
+        {
+            wxLogTrace( FILECONF_TRACE_MASK,
+                        _T("  Removing last group") );
+
+            // our last entry is being deleted, so find the last one which
+            // stays by going back until we find a subgroup or reach the
+            // group line
+            const size_t nSubgroups = m_aSubgroups.Count();
+
+            m_pLastGroup = NULL;
+            for ( wxFileConfigLineList *pl = pLine->Prev();
+                  pl && !m_pLastGroup;
+                  pl = pl->Prev() )
+            {
+                // does this line belong to our subgroup?
+                for ( size_t n = 0; n < nSubgroups; n++ )
+                {
+                    // do _not_ call GetGroupLine! we don't want to add it to
+                    // the local file if it's not already there
+                    if ( m_aSubgroups[n]->m_pLine == pl )
+                    {
+                        m_pLastGroup = m_aSubgroups[n];
+                        break;
+                    }
+                }
+
+                if ( pl == m_pLine )
+                    break;
+            }
+        }
+
+        m_pConfig->LineListRemove(pLine);
+    }
+    else
+    {
+        wxLogTrace( FILECONF_TRACE_MASK,
+                    _T("  No line entry for Group '%s'?"),
+                    pGroup->Name().c_str() );
+    }
+
+    m_aSubgroups.Remove(pGroup);
+    delete pGroup;
+
+    return true;
+}
+
+bool wxFileConfigGroup::DeleteEntry(const wxChar *szName)
+{
+  wxFileConfigEntry *pEntry = FindEntry(szName);
+  if ( !pEntry )
+  {
+      // entry doesn't exist, nothing to do
+      return false;
+  }
+
+  wxFileConfigLineList *pLine = pEntry->GetLine();
+  if ( pLine != NULL ) {
+    // notice that we may do this test inside the previous "if" because the
+    // last entry's line is surely !NULL
+    if ( pEntry == m_pLastEntry ) {
+      // our last entry is being deleted - find the last one which stays
+      wxASSERT( m_pLine != NULL );  // if we have an entry with !NULL pLine...
+
+      // find the previous entry (if any)
+      wxFileConfigEntry *pNewLast = NULL;
+      const wxFileConfigLineList * const
+        pNewLastLine = m_pLastEntry->GetLine()->Prev();
+      const size_t nEntries = m_aEntries.GetCount();
+      for ( size_t n = 0; n < nEntries; n++ ) {
+        if ( m_aEntries[n]->GetLine() == pNewLastLine ) {
+          pNewLast = m_aEntries[n];
+          break;
+        }
+      }
+
+      // pNewLast can be NULL here -- it's ok and can happen if we have no
+      // entries left
+      m_pLastEntry = pNewLast;
+    }
+
+    m_pConfig->LineListRemove(pLine);
+  }
+
+  m_aEntries.Remove(pEntry);
+  delete pEntry;
+
+  return true;
+}
+
+// ============================================================================
+// wxFileConfig::wxFileConfigEntry
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// ctor
+// ----------------------------------------------------------------------------
+wxFileConfigEntry::wxFileConfigEntry(wxFileConfigGroup *pParent,
+                                       const wxString& strName,
+                                       int nLine)
+                         : m_strName(strName)
+{
+  wxASSERT( !strName.empty() );
+
+  m_pParent = pParent;
+  m_nLine   = nLine;
+  m_pLine   = NULL;
+
+  m_bHasValue = false;
+
+  m_bImmutable = strName[0] == wxCONFIG_IMMUTABLE_PREFIX;
+  if ( m_bImmutable )
+    m_strName.erase(0, 1);  // remove first character
+}
+
+// ----------------------------------------------------------------------------
+// set value
+// ----------------------------------------------------------------------------
+
+void wxFileConfigEntry::SetLine(wxFileConfigLineList *pLine)
+{
+  if ( m_pLine != NULL ) {
+    wxLogWarning(_("entry '%s' appears more than once in group '%s'"),
+                 Name().c_str(), m_pParent->GetFullName().c_str());
+  }
+
+  m_pLine = pLine;
+  Group()->SetLastEntry(this);
+}
+
+// second parameter is false if we read the value from file and prevents the
+// entry from being marked as 'dirty'
+void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser)
+{
+    if ( bUser && IsImmutable() )
+    {
+        wxLogWarning( _("attempt to change immutable key '%s' ignored."),
+                      Name().c_str());
+        return;
+    }
+
+    // do nothing if it's the same value: but don't test for it if m_bHasValue
+    // hadn't been set yet or we'd never write empty values to the file
+    if ( m_bHasValue && strValue == m_strValue )
+        return;
+
+    m_bHasValue = true;
+    m_strValue = strValue;
+
+    if ( bUser )
+    {
+        wxString strValFiltered;
+
+        if ( Group()->Config()->GetStyle() & wxCONFIG_USE_NO_ESCAPE_CHARACTERS )
+        {
+            strValFiltered = strValue;
+        }
+        else {
+            strValFiltered = FilterOutValue(strValue);
+        }
+
+        wxString    strLine;
+        strLine << FilterOutEntryName(m_strName) << wxT('=') << strValFiltered;
+
+        if ( m_pLine )
+        {
+            // entry was read from the local config file, just modify the line
+            m_pLine->SetText(strLine);
+        }
+        else // this entry didn't exist in the local file
+        {
+            // add a new line to the file: note that line returned by
+            // GetLastEntryLine() may be NULL if we're in the root group and it
+            // doesn't have any entries yet, but this is ok as passing NULL
+            // line to LineListInsert() means to prepend new line to the list
+            wxFileConfigLineList *line = Group()->GetLastEntryLine();
+            m_pLine = Group()->Config()->LineListInsert(strLine, line);
+
+            Group()->SetLastEntry(this);
+        }
+    }
+}
+
+// ============================================================================
+// global functions
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// compare functions for array sorting
+// ----------------------------------------------------------------------------
+
+int CompareEntries(wxFileConfigEntry *p1, wxFileConfigEntry *p2)
+{
+#if wxCONFIG_CASE_SENSITIVE
+    return wxStrcmp(p1->Name(), p2->Name());
+#else
+    return wxStricmp(p1->Name(), p2->Name());
+#endif
+}
+
+int CompareGroups(wxFileConfigGroup *p1, wxFileConfigGroup *p2)
+{
+#if wxCONFIG_CASE_SENSITIVE
+    return wxStrcmp(p1->Name(), p2->Name());
+#else
+    return wxStricmp(p1->Name(), p2->Name());
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// filter functions
+// ----------------------------------------------------------------------------
+
+// undo FilterOutValue
+static wxString FilterInValue(const wxString& str)
+{
+  wxString strResult;
+  strResult.Alloc(str.Len());
+
+  bool bQuoted = !str.empty() && str[0] == '"';
+
+  for ( size_t n = bQuoted ? 1 : 0; n < str.Len(); n++ ) {
+    if ( str[n] == wxT('\\') ) {
+      switch ( str[++n] ) {
+        case wxT('n'):
+          strResult += wxT('\n');
+          break;
+
+        case wxT('r'):
+          strResult += wxT('\r');
+          break;
+
+        case wxT('t'):
+          strResult += wxT('\t');
+          break;
+
+        case wxT('\\'):
+          strResult += wxT('\\');
+          break;
+
+        case wxT('"'):
+          strResult += wxT('"');
+          break;
+      }
+    }
+    else {
+      if ( str[n] != wxT('"') || !bQuoted )
+        strResult += str[n];
+      else if ( n != str.Len() - 1 ) {
+        wxLogWarning(_("unexpected \" at position %d in '%s'."),
+                     n, str.c_str());
+      }
+      //else: it's the last quote of a quoted string, ok
+    }
+  }
+
+  return strResult;
+}
+
+// quote the string before writing it to file
+static wxString FilterOutValue(const wxString& str)
+{
+   if ( !str )
+      return str;
+
+  wxString strResult;
+  strResult.Alloc(str.Len());
+
+  // quoting is necessary to preserve spaces in the beginning of the string
+  bool bQuote = wxIsspace(str[0]) || str[0] == wxT('"');
+
+  if ( bQuote )
+    strResult += wxT('"');
+
+  wxChar c;
+  for ( size_t n = 0; n < str.Len(); n++ ) {
+    switch ( str[n] ) {
+      case wxT('\n'):
+        c = wxT('n');
+        break;
+
+      case wxT('\r'):
+        c = wxT('r');
+        break;
+
+      case wxT('\t'):
+        c = wxT('t');
+        break;
+
+      case wxT('\\'):
+        c = wxT('\\');
+        break;
+
+      case wxT('"'):
+        if ( bQuote ) {
+          c = wxT('"');
+          break;
+        }
+        //else: fall through
+
+      default:
+        strResult += str[n];
+        continue;   // nothing special to do
+    }
+
+    // we get here only for special characters
+    strResult << wxT('\\') << c;
+  }
+
+  if ( bQuote )
+    strResult += wxT('"');
+
+  return strResult;
+}
+
+// undo FilterOutEntryName
+static wxString FilterInEntryName(const wxString& str)
+{
+  wxString strResult;
+  strResult.Alloc(str.Len());
+
+  for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) {
+    if ( *pc == wxT('\\') ) {
+      // we need to test it here or we'd skip past the NUL in the loop line
+      if ( *++pc == _T('\0') )
+        break;
+    }
+
+    strResult += *pc;
+  }
+
+  return strResult;
+}
+
+// sanitize entry or group name: insert '\\' before any special characters
+static wxString FilterOutEntryName(const wxString& str)
+{
+  wxString strResult;
+  strResult.Alloc(str.Len());
+
+  for ( const wxChar *pc = str.c_str(); *pc != wxT('\0'); pc++ ) {
+    const wxChar c = *pc;
+
+    // we explicitly allow some of "safe" chars and 8bit ASCII characters
+    // which will probably never have special meaning and with which we can't
+    // use isalnum() anyhow (in ASCII built, in Unicode it's just fine)
+    //
+    // NB: note that wxCONFIG_IMMUTABLE_PREFIX and wxCONFIG_PATH_SEPARATOR
+    //     should *not* be quoted
+    if (
+#if !wxUSE_UNICODE
+            ((unsigned char)c < 127) &&
+#endif // ANSI
+         !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%"), c) )
+    {
+      strResult += wxT('\\');
+    }
+
+    strResult += c;
+  }
+
+  return strResult;
+}
+
+// we can't put ?: in the ctor initializer list because it confuses some
+// broken compilers (Borland C++)
+static wxString GetAppName(const wxString& appName)
+{
+    if ( !appName && wxTheApp )
+        return wxTheApp->GetAppName();
+    else
+        return appName;
+}
+
+#endif // wxUSE_CONFIG
diff --git a/Source/3rd Party/wx/src/common/filectrlcmn.cpp b/Source/3rd Party/wx/src/common/filectrlcmn.cpp
deleted file mode 100644
index 9ad36fa2d..000000000
--- a/Source/3rd Party/wx/src/common/filectrlcmn.cpp	
+++ /dev/null
@@ -1,103 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/filectrlcmn.cpp
-// Purpose:     Implementation for wxFileCtrlBase and other common functions used by
-//              platform-specific wxFileCtrl's
-// Author:      Diaa M. Sami
-// Created:     2007-07-07
-// RCS-ID:      $Id$
-// Copyright:   (c) Diaa M. Sami
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if wxUSE_FILECTRL
-
-#include "wx/filectrl.h"
-
-#ifndef WX_PRECOMP
-#    include "wx/debug.h"
-#endif
-
-const char wxFileCtrlNameStr[] = "wxfilectrl";
-
-wxDEFINE_EVENT( wxEVT_FILECTRL_SELECTIONCHANGED, wxFileCtrlEvent );
-wxDEFINE_EVENT( wxEVT_FILECTRL_FILEACTIVATED, wxFileCtrlEvent );
-wxDEFINE_EVENT( wxEVT_FILECTRL_FOLDERCHANGED, wxFileCtrlEvent );
-wxDEFINE_EVENT( wxEVT_FILECTRL_FILTERCHANGED, wxFileCtrlEvent );
-
-IMPLEMENT_DYNAMIC_CLASS( wxFileCtrlEvent, wxCommandEvent )
-
-// some helper functions
-
-void GenerateFilterChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd )
-{
-    wxFileCtrlEvent event( wxEVT_FILECTRL_FILTERCHANGED, wnd, wnd->GetId() );
-
-    event.SetFilterIndex( fileCtrl->GetFilterIndex() );
-
-    wnd->GetEventHandler()->ProcessEvent( event );
-}
-
-void GenerateFolderChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd )
-{
-    wxFileCtrlEvent event( wxEVT_FILECTRL_FOLDERCHANGED, wnd, wnd->GetId() );
-
-    event.SetDirectory( fileCtrl->GetDirectory() );
-
-    wnd->GetEventHandler()->ProcessEvent( event );
-}
-
-void GenerateSelectionChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd)
-{
-    wxFileCtrlEvent event( wxEVT_FILECTRL_SELECTIONCHANGED, wnd, wnd->GetId() );
-    event.SetDirectory( fileCtrl->GetDirectory() );
-
-    wxArrayString filenames;
-    fileCtrl->GetFilenames( filenames );
-    event.SetFiles( filenames );
-
-    wnd->GetEventHandler()->ProcessEvent( event );
-}
-
-void GenerateFileActivatedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd, const wxString filename )
-{
-    wxFileCtrlEvent event( wxEVT_FILECTRL_FILEACTIVATED, wnd, wnd->GetId() );
-    event.SetDirectory( fileCtrl->GetDirectory() );
-
-    wxArrayString filenames;
-
-    if ( filename.empty() )
-    {
-        fileCtrl->GetFilenames( filenames );
-    }
-    else
-    {
-        filenames.Add( filename );
-    }
-
-    event.SetFiles( filenames );
-
-    wnd->GetEventHandler()->ProcessEvent( event );
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// wxFileCtrlEvent implementation
-///////////////////////////////////////////////////////////////////////////////
-
-wxString wxFileCtrlEvent::GetFile() const
-{
-    wxASSERT_MSG( !wxDynamicCast( GetEventObject(), wxFileCtrl )->HasMultipleFileSelection(),
-                  wxT( "Please use GetFiles() to get all files instead of this function" ) );
-
-    wxString string;
-    if (m_files.Count() != 0)
-        string = m_files[0];
-    return string;
-}
-
-#endif // wxUSE_FILECTRL
diff --git a/Source/3rd Party/wx/src/common/filefn.cpp b/Source/3rd Party/wx/src/common/filefn.cpp
index 93f6d369d..b9700d4c4 100644
--- a/Source/3rd Party/wx/src/common/filefn.cpp	
+++ b/Source/3rd Party/wx/src/common/filefn.cpp	
@@ -1,2052 +1,2123 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/filefn.cpp
-// Purpose:     File- and directory-related functions
-// Author:      Julian Smart
-// Modified by:
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/filefn.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/crt.h"
-#endif
-
-#include "wx/dynarray.h"
-#include "wx/file.h"
-#include "wx/filename.h"
-#include "wx/dir.h"
-
-#include "wx/tokenzr.h"
-
-// there are just too many of those...
-#ifdef __VISUALC__
-    #pragma warning(disable:4706)   // assignment within conditional expression
-#endif // VC++
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if !wxONLY_WATCOM_EARLIER_THAN(1,4)
-    #if !(defined(_MSC_VER) && (_MSC_VER > 800))
-        #include <errno.h>
-    #endif
-#endif
-
-#if defined(__WXMAC__)
-    #include  "wx/osx/private.h"  // includes mac headers
-#endif
-
-#ifdef __WINDOWS__
-    #include "wx/msw/private.h"
-    #include "wx/msw/mslu.h"
-
-    // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
-    // and for cygwin_conv_path()
-    //
-    // note that it must be included after <windows.h>
-    #ifdef __GNUWIN32__
-        #ifdef __CYGWIN__
-            #include <sys/cygwin.h>
-            #include <cygwin/version.h>
-        #endif
-    #endif // __GNUWIN32__
-
-    // io.h is needed for _get_osfhandle()
-    // Already included by filefn.h for many Windows compilers
-    #if defined __CYGWIN__
-        #include <io.h>
-    #endif
-#endif // __WINDOWS__
-
-#if defined(__VMS__)
-    #include <fab.h>
-#endif
-
-// TODO: Borland probably has _wgetcwd as well?
-#ifdef _MSC_VER
-    #define HAVE_WGETCWD
-#endif
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-#ifndef _MAXPATHLEN
-    #define _MAXPATHLEN 1024
-#endif
-
-// ----------------------------------------------------------------------------
-// private globals
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
-#endif
-
-#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-//
-// VisualAge C++ V4.0 cannot have any external linkage const decs
-// in headers included by more than one primary source
-//
-const int wxInvalidOffset = -1;
-#endif
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wrappers around standard POSIX functions
-// ----------------------------------------------------------------------------
-
-#if wxUSE_UNICODE && defined __BORLANDC__ \
-    && __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551
-
-// BCC 5.5 and 5.5.1 have a bug in _wopen where files are created read only
-// regardless of the mode parameter. This hack works around the problem by
-// setting the mode with _wchmod.
-//
-int wxCRT_OpenW(const wchar_t *pathname, int flags, mode_t mode)
-{
-    int moreflags = 0;
-
-    // we only want to fix the mode when the file is actually created, so
-    // when creating first try doing it O_EXCL so we can tell if the file
-    // was already there.
-    if ((flags & O_CREAT) && !(flags & O_EXCL) && (mode & wxS_IWUSR) != 0)
-        moreflags = O_EXCL;
-
-    int fd = _wopen(pathname, flags | moreflags, mode);
-
-    // the file was actually created and needs fixing
-    if (fd != -1 && (flags & O_CREAT) != 0 && (mode & wxS_IWUSR) != 0)
-    {
-        close(fd);
-        _wchmod(pathname, mode);
-        fd = _wopen(pathname, flags & ~(O_EXCL | O_CREAT));
-    }
-    // the open failed, but it may have been because the added O_EXCL stopped
-    // the opening of an existing file, so try again without.
-    else if (fd == -1 && moreflags != 0)
-    {
-        fd = _wopen(pathname, flags & ~O_CREAT);
-    }
-
-    return fd;
-}
-
-#endif
-
-// ----------------------------------------------------------------------------
-// wxPathList
-// ----------------------------------------------------------------------------
-
-bool wxPathList::Add(const wxString& path)
-{
-    // add a path separator to force wxFileName to interpret it always as a directory
-    // (i.e. if we are called with '/home/user' we want to consider it a folder and
-    // not, as wxFileName would consider, a filename).
-    wxFileName fn(path + wxFileName::GetPathSeparator());
-
-    // add only normalized relative/absolute paths
-    // NB: we won't do wxPATH_NORM_DOTS in order to avoid problems when trying to
-    //     normalize paths which starts with ".." (which can be normalized only if
-    //     we use also wxPATH_NORM_ABSOLUTE - which we don't want to use).
-    if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS))
-        return false;
-
-    wxString toadd = fn.GetPath();
-    if (Index(toadd) == wxNOT_FOUND)
-        wxArrayString::Add(toadd);      // do not add duplicates
-
-    return true;
-}
-
-void wxPathList::Add(const wxArrayString &arr)
-{
-    for (size_t j=0; j < arr.GetCount(); j++)
-        Add(arr[j]);
-}
-
-// Add paths e.g. from the PATH environment variable
-void wxPathList::AddEnvList (const wxString& WXUNUSED_IN_WINCE(envVariable))
-{
-    // No environment variables on WinCE
-#ifndef __WXWINCE__
-
-    // The space has been removed from the tokenizers, otherwise a
-    // path such as "C:\Program Files" would be split into 2 paths:
-    // "C:\Program" and "Files"; this is true for both Windows and Unix.
-
-    static const wxChar PATH_TOKS[] =
-#if defined(__WINDOWS__) || defined(__OS2__)
-        wxT(";"); // Don't separate with colon in DOS (used for drive)
-#else
-        wxT(":;");
-#endif
-
-    wxString val;
-    if ( wxGetEnv(envVariable, &val) )
-    {
-        // split into an array of string the value of the env var
-        wxArrayString arr = wxStringTokenize(val, PATH_TOKS);
-        WX_APPEND_ARRAY(*this, arr);
-    }
-#endif // !__WXWINCE__
-}
-
-// Given a full filename (with path), ensure that that file can
-// be accessed again USING FILENAME ONLY by adding the path
-// to the list if not already there.
-bool wxPathList::EnsureFileAccessible (const wxString& path)
-{
-    return Add(wxPathOnly(path));
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-bool wxPathList::Member (const wxString& path) const
-{
-    return Index(path) != wxNOT_FOUND;
-}
-#endif
-
-wxString wxPathList::FindValidPath (const wxString& file) const
-{
-    // normalize the given string as it could be a path + a filename
-    // and not only a filename
-    wxFileName fn(file);
-    wxString strend;
-
-    // NB: normalize without making absolute otherwise calling this function with
-    //     e.g. "b/c.txt" would result in removing the directory 'b' and the for loop
-    //     below would only add to the paths of this list the 'c.txt' part when doing
-    //     the existence checks...
-    // NB: we don't use wxPATH_NORM_DOTS here, too (see wxPathList::Add for more info)
-    if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS))
-        return wxEmptyString;
-
-    wxASSERT_MSG(!fn.IsDir(), wxT("Cannot search for directories; only for files"));
-    if (fn.IsAbsolute())
-        strend = fn.GetFullName();      // search for the file name and ignore the path part
-    else
-        strend = fn.GetFullPath();
-
-    for (size_t i=0; i<GetCount(); i++)
-    {
-        wxString strstart = Item(i);
-        if (!strstart.IsEmpty() && strstart.Last() != wxFileName::GetPathSeparator())
-            strstart += wxFileName::GetPathSeparator();
-
-        if (wxFileExists(strstart + strend))
-            return strstart + strend;        // Found!
-    }
-
-    return wxEmptyString;                    // Not found
-}
-
-wxString wxPathList::FindAbsoluteValidPath (const wxString& file) const
-{
-    wxString f = FindValidPath(file);
-    if ( f.empty() || wxIsAbsolutePath(f) )
-        return f;
-
-    wxString buf = ::wxGetCwd();
-
-    if ( !wxEndsWithPathSeparator(buf) )
-    {
-        buf += wxFILE_SEP_PATH;
-    }
-    buf += f;
-
-    return buf;
-}
-
-// ----------------------------------------------------------------------------
-// miscellaneous global functions
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-static inline wxChar* MYcopystring(const wxString& s)
-{
-    wxChar* copy = new wxChar[s.length() + 1];
-    return wxStrcpy(copy, s.c_str());
-}
-
-template<typename CharType>
-static inline CharType* MYcopystring(const CharType* s)
-{
-    CharType* copy = new CharType[wxStrlen(s) + 1];
-    return wxStrcpy(copy, s);
-}
-#endif
-
-
-bool
-wxFileExists (const wxString& filename)
-{
-    return wxFileName::FileExists(filename);
-}
-
-bool
-wxIsAbsolutePath (const wxString& filename)
-{
-    if (!filename.empty())
-    {
-        // Unix like or Windows
-        if (filename[0] == wxT('/'))
-            return true;
-#ifdef __VMS__
-        if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
-            return true;
-#endif
-#if defined(__WINDOWS__) || defined(__OS2__)
-        // MSDOS like
-        if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
-            return true;
-#endif
-    }
-    return false ;
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-/*
- * Strip off any extension (dot something) from end of file,
- * IF one exists. Inserts zero into buffer.
- *
- */
-
-template<typename T>
-static void wxDoStripExtension(T *buffer)
-{
-    int len = wxStrlen(buffer);
-    int i = len-1;
-    while (i > 0)
-    {
-        if (buffer[i] == wxT('.'))
-        {
-            buffer[i] = 0;
-            break;
-        }
-        i --;
-    }
-}
-
-void wxStripExtension(char *buffer) { wxDoStripExtension(buffer); }
-void wxStripExtension(wchar_t *buffer) { wxDoStripExtension(buffer); }
-
-void wxStripExtension(wxString& buffer)
-{
-   buffer = wxFileName::StripExtension(buffer);
-}
-
-// Destructive removal of /./ and /../ stuff
-template<typename CharType>
-static CharType *wxDoRealPath (CharType *path)
-{
-  static const CharType SEP = wxFILE_SEP_PATH;
-#ifdef __WINDOWS__
-  wxUnix2DosFilename(path);
-#endif
-  if (path[0] && path[1]) {
-    /* MATTHEW: special case "/./x" */
-    CharType *p;
-    if (path[2] == SEP && path[1] == wxT('.'))
-      p = &path[0];
-    else
-      p = &path[2];
-    for (; *p; p++)
-      {
-        if (*p == SEP)
-          {
-            if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
-              {
-                CharType *q;
-                for (q = p - 1; q >= path && *q != SEP; q--)
-                {
-                    // Empty
-                }
-
-                if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
-                    && (q - 1 <= path || q[-1] != SEP))
-                  {
-                    wxStrcpy (q, p + 3);
-                    if (path[0] == wxT('\0'))
-                      {
-                        path[0] = SEP;
-                        path[1] = wxT('\0');
-                      }
-#if defined(__WINDOWS__) || defined(__OS2__)
-                    /* Check that path[2] is NULL! */
-                    else if (path[1] == wxT(':') && !path[2])
-                      {
-                        path[2] = SEP;
-                        path[3] = wxT('\0');
-                      }
-#endif
-                    p = q - 1;
-                  }
-              }
-            else if (p[1] == wxT('.') && (p[2] == SEP || p[2] == wxT('\0')))
-              wxStrcpy (p, p + 2);
-          }
-      }
-  }
-  return path;
-}
-
-char *wxRealPath(char *path)
-{
-    return wxDoRealPath(path);
-}
-
-wchar_t *wxRealPath(wchar_t *path)
-{
-    return wxDoRealPath(path);
-}
-
-wxString wxRealPath(const wxString& path)
-{
-    wxChar *buf1=MYcopystring(path);
-    wxChar *buf2=wxRealPath(buf1);
-    wxString buf(buf2);
-    delete [] buf1;
-    return buf;
-}
-
-
-// Must be destroyed
-wxChar *wxCopyAbsolutePath(const wxString& filename)
-{
-    if (filename.empty())
-        return NULL;
-
-    if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
-    {
-        wxString buf = ::wxGetCwd();
-        wxChar ch = buf.Last();
-#ifdef __WINDOWS__
-        if (ch != wxT('\\') && ch != wxT('/'))
-            buf << wxT("\\");
-#else
-        if (ch != wxT('/'))
-            buf << wxT("/");
-#endif
-        buf << wxFileFunctionsBuffer;
-        buf = wxRealPath( buf );
-        return MYcopystring( buf );
-    }
-    return MYcopystring( wxFileFunctionsBuffer );
-}
-
-/*-
- Handles:
-   ~/ => home dir
-   ~user/ => user's home dir
-   If the environment variable a = "foo" and b = "bar" then:
-   Unix:
-        $a        =>        foo
-        $a$b        =>        foobar
-        $a.c        =>        foo.c
-        xxx$a        =>        xxxfoo
-        ${a}!        =>        foo!
-        $(b)!        =>        bar!
-        \$a        =>        \$a
-   MSDOS:
-        $a        ==>        $a
-        $(a)        ==>        foo
-        $(a)$b        ==>        foo$b
-        $(a)$(b)==>        foobar
-        test.$$        ==>        test.$$
- */
-
-/* input name in name, pathname output to buf. */
-
-template<typename CharType>
-static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
-{
-    register CharType *d, *s, *nm;
-    CharType        lnm[_MAXPATHLEN];
-    int             q;
-
-    // Some compilers don't like this line.
-//    const CharType    trimchars[] = wxT("\n \t");
-
-    CharType      trimchars[4];
-    trimchars[0] = wxT('\n');
-    trimchars[1] = wxT(' ');
-    trimchars[2] = wxT('\t');
-    trimchars[3] = 0;
-
-    static const CharType SEP = wxFILE_SEP_PATH;
-#ifdef __WINDOWS__
-    //wxUnix2DosFilename(path);
-#endif
-
-    buf[0] = wxT('\0');
-    if (name.empty())
-        return buf;
-    nm = ::MYcopystring(static_cast<const CharType*>(name.c_str())); // Make a scratch copy
-    CharType *nm_tmp = nm;
-
-    /* Skip leading whitespace and cr */
-    while (wxStrchr(trimchars, *nm) != NULL)
-        nm++;
-    /* And strip off trailing whitespace and cr */
-    s = nm + (q = wxStrlen(nm)) - 1;
-    while (q-- && wxStrchr(trimchars, *s) != NULL)
-        *s = wxT('\0');
-
-    s = nm;
-    d = lnm;
-#ifdef __WINDOWS__
-    q = FALSE;
-#else
-    q = nm[0] == wxT('\\') && nm[1] == wxT('~');
-#endif
-
-    /* Expand inline environment variables */
-#ifdef __VISAGECPP__
-    while (*d)
-    {
-      *d++ = *s;
-      if(*s == wxT('\\'))
-      {
-        *(d - 1) = *++s;
-        if (*d)
-        {
-          s++;
-          continue;
-        }
-        else
-           break;
-      }
-      else
-#else
-    while ((*d++ = *s) != 0) {
-#  ifndef __WINDOWS__
-        if (*s == wxT('\\')) {
-            if ((*(d - 1) = *++s)!=0) {
-                s++;
-                continue;
-            } else
-                break;
-        } else
-#  endif
-#endif
-            // No env variables on WinCE
-#ifndef __WXWINCE__
-#ifdef __WINDOWS__
-        if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
-#else
-        if (*s++ == wxT('$'))
-#endif
-        {
-            register CharType  *start = d;
-            register int     braces = (*s == wxT('{') || *s == wxT('('));
-            register CharType  *value;
-            while ((*d++ = *s) != 0)
-                if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
-                    break;
-                else
-                    s++;
-            *--d = 0;
-            value = wxGetenv(braces ? start + 1 : start);
-            if (value) {
-                for ((d = start - 1); (*d++ = *value++) != 0;)
-                {
-                    // Empty
-                }
-
-                d--;
-                if (braces && *s)
-                    s++;
-            }
-        }
-#endif
-        // __WXWINCE__
-    }
-
-    /* Expand ~ and ~user */
-    wxString homepath;
-    nm = lnm;
-    if (nm[0] == wxT('~') && !q)
-    {
-        /* prefix ~ */
-        if (nm[1] == SEP || nm[1] == 0)
-        {        /* ~/filename */
-            homepath = wxGetUserHome(wxEmptyString);
-            if (!homepath.empty()) {
-                s = (CharType*)(const CharType*)homepath.c_str();
-                if (*++nm)
-                    nm++;
-            }
-        } else
-        {                /* ~user/filename */
-            register CharType  *nnm;
-            for (s = nm; *s && *s != SEP; s++)
-            {
-                // Empty
-            }
-            int was_sep; /* MATTHEW: Was there a separator, or NULL? */
-            was_sep = (*s == SEP);
-            nnm = *s ? s + 1 : s;
-            *s = 0;
-            homepath = wxGetUserHome(wxString(nm + 1));
-            if (homepath.empty())
-            {
-                if (was_sep) /* replace only if it was there: */
-                    *s = SEP;
-                s = NULL;
-            }
-            else
-            {
-                nm = nnm;
-                s = (CharType*)(const CharType*)homepath.c_str();
-            }
-        }
-    }
-
-    d = buf;
-    if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */
-        /* Copy home dir */
-        while (wxT('\0') != (*d++ = *s++))
-          /* loop */;
-        // Handle root home
-        if (d - 1 > buf && *(d - 2) != SEP)
-          *(d - 1) = SEP;
-    }
-    s = nm;
-    while ((*d++ = *s++) != 0)
-    {
-        // Empty
-    }
-    delete[] nm_tmp; // clean up alloc
-    /* Now clean up the buffer */
-    return wxRealPath(buf);
-}
-
-char *wxExpandPath(char *buf, const wxString& name)
-{
-    return wxDoExpandPath(buf, name);
-}
-
-wchar_t *wxExpandPath(wchar_t *buf, const wxString& name)
-{
-    return wxDoExpandPath(buf, name);
-}
-
-
-/* Contract Paths to be build upon an environment variable
-   component:
-
-   example: "/usr/openwin/lib", OPENWINHOME --> ${OPENWINHOME}/lib
-
-   The call wxExpandPath can convert these back!
- */
-wxChar *
-wxContractPath (const wxString& filename,
-                const wxString& WXUNUSED_IN_WINCE(envname),
-                const wxString& user)
-{
-  static wxChar dest[_MAXPATHLEN];
-
-  if (filename.empty())
-    return NULL;
-
-  wxStrcpy (dest, filename);
-#ifdef __WINDOWS__
-  wxUnix2DosFilename(dest);
-#endif
-
-  // Handle environment
-  wxString val;
-#ifndef __WXWINCE__
-  wxChar *tcp;
-  if (!envname.empty() && !(val = wxGetenv (envname)).empty() &&
-     (tcp = wxStrstr (dest, val)) != NULL)
-    {
-        wxStrcpy (wxFileFunctionsBuffer, tcp + val.length());
-        *tcp++ = wxT('$');
-        *tcp++ = wxT('{');
-        wxStrcpy (tcp, envname);
-        wxStrcat (tcp, wxT("}"));
-        wxStrcat (tcp, wxFileFunctionsBuffer);
-    }
-#endif
-
-  // Handle User's home (ignore root homes!)
-  val = wxGetUserHome (user);
-  if (val.empty())
-    return dest;
-
-  const size_t len = val.length();
-  if (len <= 2)
-    return dest;
-
-  if (wxStrncmp(dest, val, len) == 0)
-  {
-    wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
-    if (!user.empty())
-           wxStrcat(wxFileFunctionsBuffer, user);
-    wxStrcat(wxFileFunctionsBuffer, dest + len);
-    wxStrcpy (dest, wxFileFunctionsBuffer);
-  }
-
-  return dest;
-}
-
-#endif // #if WXWIN_COMPATIBILITY_2_8
-
-// Return just the filename, not the path (basename)
-wxChar *wxFileNameFromPath (wxChar *path)
-{
-    wxString p = path;
-    wxString n = wxFileNameFromPath(p);
-
-    return path + p.length() - n.length();
-}
-
-wxString wxFileNameFromPath (const wxString& path)
-{
-    return wxFileName(path).GetFullName();
-}
-
-// Return just the directory, or NULL if no directory
-wxChar *
-wxPathOnly (wxChar *path)
-{
-    if (path && *path)
-    {
-        static wxChar buf[_MAXPATHLEN];
-
-        // Local copy
-        wxStrcpy (buf, path);
-
-        int l = wxStrlen(path);
-        int i = l - 1;
-
-        // Search backward for a backward or forward slash
-        while (i > -1)
-        {
-            // Unix like or Windows
-            if (path[i] == wxT('/') || path[i] == wxT('\\'))
-            {
-                buf[i] = 0;
-                return buf;
-            }
-#ifdef __VMS__
-            if (path[i] == wxT(']'))
-            {
-                buf[i+1] = 0;
-                return buf;
-            }
-#endif
-            i --;
-        }
-
-#if defined(__WINDOWS__) || defined(__OS2__)
-        // Try Drive specifier
-        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
-        {
-            // A:junk --> A:. (since A:.\junk Not A:\junk)
-            buf[2] = wxT('.');
-            buf[3] = wxT('\0');
-            return buf;
-        }
-#endif
-    }
-    return NULL;
-}
-
-// Return just the directory, or NULL if no directory
-wxString wxPathOnly (const wxString& path)
-{
-    if (!path.empty())
-    {
-        wxChar buf[_MAXPATHLEN];
-
-        // Local copy
-        wxStrcpy(buf, path);
-
-        int l = path.length();
-        int i = l - 1;
-
-        // Search backward for a backward or forward slash
-        while (i > -1)
-        {
-            // Unix like or Windows
-            if (path[i] == wxT('/') || path[i] == wxT('\\'))
-            {
-                // Don't return an empty string
-                if (i == 0)
-                    i ++;
-                buf[i] = 0;
-                return wxString(buf);
-            }
-#ifdef __VMS__
-            if (path[i] == wxT(']'))
-            {
-                buf[i+1] = 0;
-                return wxString(buf);
-            }
-#endif
-            i --;
-        }
-
-#if defined(__WINDOWS__) || defined(__OS2__)
-        // Try Drive specifier
-        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
-        {
-            // A:junk --> A:. (since A:.\junk Not A:\junk)
-            buf[2] = wxT('.');
-            buf[3] = wxT('\0');
-            return wxString(buf);
-        }
-#endif
-    }
-    return wxEmptyString;
-}
-
-// Utility for converting delimiters in DOS filenames to UNIX style
-// and back again - or we get nasty problems with delimiters.
-// Also, convert to lower case, since case is significant in UNIX.
-
-#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__)
-
-#define kDefaultPathStyle kCFURLPOSIXPathStyle
-
-wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
-{
-    CFURLRef fullURLRef;
-    fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
-    if ( fullURLRef == NULL)
-        return wxEmptyString;
-    
-    if ( additionalPathComponent )
-    {
-        CFURLRef parentURLRef = fullURLRef ;
-        fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef,
-            additionalPathComponent,false);
-        CFRelease( parentURLRef ) ;
-    }
-    wxCFStringRef cfString( CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle ));
-    CFRelease( fullURLRef ) ;
-
-    return wxCFStringRef::AsStringWithNormalizationFormC(cfString);
-}
-
-OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
-{
-    OSStatus err = noErr ;
-    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path));
-    CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
-    CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
-    CFRelease( cfMutableString );
-    if ( NULL != url )
-    {
-        if ( CFURLGetFSRef(url, fsRef) == false )
-            err = fnfErr ;
-        CFRelease( url ) ;
-    }
-    else
-    {
-        err = fnfErr ;
-    }
-    return err ;
-}
-
-wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
-{
-    wxCFStringRef cfname( CFStringCreateWithCharacters( kCFAllocatorDefault,
-                                                      uniname->unicode,
-                                                      uniname->length ) );
-    return wxCFStringRef::AsStringWithNormalizationFormC(cfname);
-}
-
-#ifndef __LP64__
-
-wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
-{
-    FSRef fsRef ;
-    if ( FSpMakeFSRef( spec , &fsRef) == noErr )
-    {
-        return wxMacFSRefToPath( &fsRef ) ;
-    }
-    return wxEmptyString ;
-}
-
-void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
-{
-    OSStatus err = noErr;
-    FSRef fsRef;
-    wxMacPathToFSRef( path , &fsRef );
-    err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
-    verify_noerr( err );
-}
-#endif
-
-#endif // __WXMAC__
-
-
-#if WXWIN_COMPATIBILITY_2_8
-
-template<typename T>
-static void wxDoDos2UnixFilename(T *s)
-{
-  if (s)
-    while (*s)
-      {
-        if (*s == wxT('\\'))
-          *s = wxT('/');
-#ifdef __WINDOWS__
-        else
-          *s = wxTolower(*s);        // Case INDEPENDENT
-#endif
-        s++;
-      }
-}
-
-void wxDos2UnixFilename(char *s) { wxDoDos2UnixFilename(s); }
-void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); }
-
-template<typename T>
-static void
-#if defined(__WINDOWS__) || defined(__OS2__)
-wxDoUnix2DosFilename(T *s)
-#else
-wxDoUnix2DosFilename(T *WXUNUSED(s) )
-#endif
-{
-// Yes, I really mean this to happen under DOS only! JACS
-#if defined(__WINDOWS__) || defined(__OS2__)
-  if (s)
-    while (*s)
-      {
-        if (*s == wxT('/'))
-          *s = wxT('\\');
-        s++;
-      }
-#endif
-}
-
-void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
-void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
-
-#endif // #if WXWIN_COMPATIBILITY_2_8
-
-// Concatenate two files to form third
-bool
-wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
-{
-#if wxUSE_FILE
-
-    wxFile in1(file1), in2(file2);
-    wxTempFile out(file3);
-
-    if ( !in1.IsOpened() || !in2.IsOpened() || !out.IsOpened() )
-        return false;
-
-    ssize_t ofs;
-    unsigned char buf[1024];
-
-    for( int i=0; i<2; i++)
-    {
-        wxFile *in = i==0 ? &in1 : &in2;
-        do{
-            if ( (ofs = in->Read(buf,WXSIZEOF(buf))) == wxInvalidOffset ) return false;
-            if ( ofs > 0 )
-                if ( !out.Write(buf,ofs) )
-                    return false;
-        } while ( ofs == (ssize_t)WXSIZEOF(buf) );
-    }
-
-    return out.Commit();
-
-#else
-
-    wxUnusedVar(file1);
-    wxUnusedVar(file2);
-    wxUnusedVar(file3);
-    return false;
-
-#endif
-}
-
-// helper of generic implementation of wxCopyFile()
-#if !(defined(__WIN32__) || defined(__OS2__)) && wxUSE_FILE
-
-static bool
-wxDoCopyFile(wxFile& fileIn,
-             const wxStructStat& fbuf,
-             const wxString& filenameDst,
-             bool overwrite)
-{
-    // reset the umask as we want to create the file with exactly the same
-    // permissions as the original one
-    wxCHANGE_UMASK(0);
-
-    // create file2 with the same permissions than file1 and open it for
-    // writing
-
-    wxFile fileOut;
-    if ( !fileOut.Create(filenameDst, overwrite, fbuf.st_mode & 0777) )
-        return false;
-
-    // copy contents of file1 to file2
-    char buf[4096];
-    for ( ;; )
-    {
-        ssize_t count = fileIn.Read(buf, WXSIZEOF(buf));
-        if ( count == wxInvalidOffset )
-            return false;
-
-        // end of file?
-        if ( !count )
-            break;
-
-        if ( fileOut.Write(buf, count) < (size_t)count )
-            return false;
-    }
-
-    // we can expect fileIn to be closed successfully, but we should ensure
-    // that fileOut was closed as some write errors (disk full) might not be
-    // detected before doing this
-    return fileIn.Close() && fileOut.Close();
-}
-
-#endif // generic implementation of wxCopyFile
-
-// Copy files
-bool
-wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
-{
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    // CopyFile() copies file attributes and modification time too, so use it
-    // instead of our code if available
-    //
-    // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
-    if ( !::CopyFile(file1.t_str(), file2.t_str(), !overwrite) )
-    {
-        wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
-                      file1.c_str(), file2.c_str());
-
-        return false;
-    }
-#elif defined(__OS2__)
-    if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
-        return false;
-#elif wxUSE_FILE // !Win32
-
-    wxStructStat fbuf;
-    // get permissions of file1
-    if ( wxStat( file1, &fbuf) != 0 )
-    {
-        // the file probably doesn't exist or we haven't the rights to read
-        // from it anyhow
-        wxLogSysError(_("Impossible to get permissions for file '%s'"),
-                      file1.c_str());
-        return false;
-    }
-
-    // open file1 for reading
-    wxFile fileIn(file1, wxFile::read);
-    if ( !fileIn.IsOpened() )
-        return false;
-
-    // remove file2, if it exists. This is needed for creating
-    // file2 with the correct permissions in the next step
-    if ( wxFileExists(file2)  && (!overwrite || !wxRemoveFile(file2)))
-    {
-        wxLogSysError(_("Impossible to overwrite the file '%s'"),
-                      file2.c_str());
-        return false;
-    }
-
-    wxDoCopyFile(fileIn, fbuf, file2, overwrite);
-
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
-    // copy the resource fork of the file too if it's present
-    wxString pathRsrcOut;
-    wxFile fileRsrcIn;
-
-    {
-        // suppress error messages from this block as resource forks don't have
-        // to exist
-        wxLogNull noLog;
-
-        // it's not enough to check for file existence: it always does on HFS
-        // but is empty for files without resources
-        if ( fileRsrcIn.Open(file1 + wxT("/..namedfork/rsrc")) &&
-                fileRsrcIn.Length() > 0 )
-        {
-            // we must be using HFS or another filesystem with resource fork
-            // support, suppose that destination file system also is HFS[-like]
-            pathRsrcOut = file2 + wxT("/..namedfork/rsrc");
-        }
-        else // check if we have resource fork in separate file (non-HFS case)
-        {
-            wxFileName fnRsrc(file1);
-            fnRsrc.SetName(wxT("._") + fnRsrc.GetName());
-
-            fileRsrcIn.Close();
-            if ( fileRsrcIn.Open( fnRsrc.GetFullPath() ) )
-            {
-                fnRsrc = file2;
-                fnRsrc.SetName(wxT("._") + fnRsrc.GetName());
-
-                pathRsrcOut = fnRsrc.GetFullPath();
-            }
-        }
-    }
-
-    if ( !pathRsrcOut.empty() )
-    {
-        if ( !wxDoCopyFile(fileRsrcIn, fbuf, pathRsrcOut, overwrite) )
-            return false;
-    }
-#endif // wxMac || wxCocoa
-
-#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
-    // no chmod in VA.  Should be some permission API for HPFS386 partitions
-    // however
-    if ( chmod(file2.fn_str(), fbuf.st_mode) != 0 )
-    {
-        wxLogSysError(_("Impossible to set permissions for the file '%s'"),
-                      file2.c_str());
-        return false;
-    }
-#endif // OS/2 || Mac
-
-#else // !Win32 && ! wxUSE_FILE
-
-    // impossible to simulate with wxWidgets API
-    wxUnusedVar(file1);
-    wxUnusedVar(file2);
-    wxUnusedVar(overwrite);
-    return false;
-
-#endif // __WINDOWS__ && __WIN32__
-
-    return true;
-}
-
-bool
-wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite)
-{
-    if ( !overwrite && wxFileExists(file2) )
-    {
-        wxLogSysError
-        (
-            _("Failed to rename the file '%s' to '%s' because the destination file already exists."),
-            file1.c_str(), file2.c_str()
-        );
-
-        return false;
-    }
-
-#if !defined(__WXWINCE__)
-    // Normal system call
-  if ( wxRename (file1, file2) == 0 )
-    return true;
-#endif
-
-  // Try to copy
-  if (wxCopyFile(file1, file2, overwrite)) {
-    wxRemoveFile(file1);
-    return true;
-  }
-  // Give up
-  wxLogSysError(_("File '%s' couldn't be renamed '%s'"), file1, file2);
-  return false;
-}
-
-bool wxRemoveFile(const wxString& file)
-{
-#if defined(__VISUALC__) \
- || defined(__BORLANDC__) \
- || defined(__WATCOMC__) \
- || defined(__DMC__) \
- || defined(__GNUWIN32__)
-    int res = wxRemove(file);
-#elif defined(__WXMAC__)
-    int res = unlink(file.fn_str());
-#else
-    int res = unlink(file.fn_str());
-#endif
-    if ( res )
-    {
-        wxLogSysError(_("File '%s' couldn't be removed"), file);
-    }
-    return res == 0;
-}
-
-bool wxMkdir(const wxString& dir, int perm)
-{
-#if defined(__WXMAC__) && !defined(__UNIX__)
-    if ( mkdir(dir.fn_str(), 0) != 0 )
-
-    // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
-    // for the GNU compiler
-#elif (!(defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__))) || \
-      (defined(__GNUWIN32__) && !defined(__MINGW32__)) ||                \
-      defined(__WINE__) || defined(__WXMICROWIN__)
-    const wxChar *dirname = dir.c_str();
-  #if defined(MSVCRT)
-    wxUnusedVar(perm);
-    if ( mkdir(wxFNCONV(dirname)) != 0 )
-  #else
-    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
-  #endif
-#elif defined(__OS2__)
-    wxUnusedVar(perm);
-    if (::DosCreateDir(dir.c_str(), NULL) != 0) // enhance for EAB's??
-#elif defined(__DOS__)
-    const wxChar *dirname = dir.c_str();
-  #if defined(__WATCOMC__)
-    (void)perm;
-    if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
-  #elif defined(__DJGPP__)
-    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
-  #else
-    #error "Unsupported DOS compiler!"
-  #endif
-#else  // !MSW, !DOS and !OS/2 VAC++
-    wxUnusedVar(perm);
-  #ifdef __WXWINCE__
-    if ( CreateDirectory(dir.fn_str(), NULL) == 0 )
-  #else
-    if ( wxMkDir(dir.fn_str()) != 0 )
-  #endif
-#endif // !MSW/MSW
-    {
-        wxLogSysError(_("Directory '%s' couldn't be created"), dir);
-        return false;
-    }
-
-    return true;
-}
-
-bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
-{
-#if defined(__VMS__)
-    return false; //to be changed since rmdir exists in VMS7.x
-#else
-  #if defined(__OS2__)
-    if ( ::DosDeleteDir(dir.c_str()) != 0 )
-  #elif defined(__WXWINCE__)
-    if ( RemoveDirectory(dir.fn_str()) == 0 )
-  #else
-    if ( wxRmDir(dir.fn_str()) != 0 )
-  #endif
-    {
-        wxLogSysError(_("Directory '%s' couldn't be deleted"), dir);
-        return false;
-    }
-
-    return true;
-#endif
-}
-
-// does the path exists? (may have or not '/' or '\\' at the end)
-bool wxDirExists(const wxString& pathName)
-{
-    return wxFileName::DirExists(pathName);
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-
-// Get a temporary filename, opening and closing the file.
-wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
-{
-    wxString filename;
-    if ( !wxGetTempFileName(prefix, filename) )
-        return NULL;
-
-    if ( buf )
-        wxStrcpy(buf, filename);
-    else
-        buf = MYcopystring(filename);
-
-    return buf;
-}
-
-bool wxGetTempFileName(const wxString& prefix, wxString& buf)
-{
-#if wxUSE_FILE
-    buf = wxFileName::CreateTempFileName(prefix);
-
-    return !buf.empty();
-#else // !wxUSE_FILE
-    wxUnusedVar(prefix);
-    wxUnusedVar(buf);
-
-    return false;
-#endif // wxUSE_FILE/!wxUSE_FILE
-}
-
-#endif // #if WXWIN_COMPATIBILITY_2_8
-
-// Get first file name matching given wild card.
-
-static wxDir *gs_dir = NULL;
-static wxString gs_dirPath;
-
-wxString wxFindFirstFile(const wxString& spec, int flags)
-{
-    wxFileName::SplitPath(spec, &gs_dirPath, NULL, NULL);
-    if ( gs_dirPath.empty() )
-        gs_dirPath = wxT(".");
-    if ( !wxEndsWithPathSeparator(gs_dirPath ) )
-        gs_dirPath << wxFILE_SEP_PATH;
-
-    delete gs_dir; // can be NULL, this is ok
-    gs_dir = new wxDir(gs_dirPath);
-
-    if ( !gs_dir->IsOpened() )
-    {
-        wxLogSysError(_("Cannot enumerate files '%s'"), spec);
-        return wxEmptyString;
-    }
-
-    int dirFlags;
-    switch (flags)
-    {
-        case wxDIR:  dirFlags = wxDIR_DIRS; break;
-        case wxFILE: dirFlags = wxDIR_FILES; break;
-        default:     dirFlags = wxDIR_DIRS | wxDIR_FILES; break;
-    }
-
-    wxString result;
-    gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);
-    if ( result.empty() )
-    {
-        wxDELETE(gs_dir);
-        return result;
-    }
-
-    return gs_dirPath + result;
-}
-
-wxString wxFindNextFile()
-{
-    wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" );
-
-    wxString result;
-    gs_dir->GetNext(&result);
-
-    if ( result.empty() )
-    {
-        wxDELETE(gs_dir);
-        return result;
-    }
-
-    return gs_dirPath + result;
-}
-
-
-// Get current working directory.
-// If buf is NULL, allocates space using new, else copies into buf.
-// wxGetWorkingDirectory() is obsolete, use wxGetCwd()
-// wxDoGetCwd() is their common core to be moved
-// to wxGetCwd() once wxGetWorkingDirectory() will be removed.
-// Do not expose wxDoGetCwd in headers!
-
-wxChar *wxDoGetCwd(wxChar *buf, int sz)
-{
-#if defined(__WXWINCE__)
-    // TODO
-    if(buf && sz>0) buf[0] = wxT('\0');
-    return buf;
-#else
-    if ( !buf )
-    {
-        buf = new wxChar[sz + 1];
-    }
-
-    bool ok wxDUMMY_INITIALIZE(false);
-
-    // for the compilers which have Unicode version of _getcwd(), call it
-    // directly, for the others call the ANSI version and do the translation
-#if !wxUSE_UNICODE
-    #define cbuf buf
-#else // wxUSE_UNICODE
-    bool needsANSI = true;
-
-    #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
-        char cbuf[_MAXPATHLEN];
-    #endif
-
-    #ifdef HAVE_WGETCWD
-        #if wxUSE_UNICODE_MSLU
-            if ( wxGetOsVersion() != wxOS_WINDOWS_9X )
-        #else
-            char *cbuf = NULL; // never really used because needsANSI will always be false
-        #endif
-            {
-                ok = _wgetcwd(buf, sz) != NULL;
-                needsANSI = false;
-            }
-    #endif
-
-    if ( needsANSI )
-#endif // wxUSE_UNICODE
-    {
-    #if defined(_MSC_VER) || defined(__MINGW32__)
-        ok = _getcwd(cbuf, sz) != NULL;
-    #elif defined(__OS2__)
-        APIRET rc;
-        ULONG ulDriveNum = 0;
-        ULONG ulDriveMap = 0;
-        rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
-        ok = rc == 0;
-        if (ok)
-        {
-            sz -= 3;
-            rc = ::DosQueryCurrentDir( 0 // current drive
-                                      ,(PBYTE)cbuf + 3
-                                      ,(PULONG)&sz
-                                     );
-            cbuf[0] = char('A' + (ulDriveNum - 1));
-            cbuf[1] = ':';
-            cbuf[2] = '\\';
-            ok = rc == 0;
-        }
-    #else // !Win32/VC++ !Mac !OS2
-        ok = getcwd(cbuf, sz) != NULL;
-    #endif // platform
-
-    #if wxUSE_UNICODE
-        // finally convert the result to Unicode if needed
-        wxConvFile.MB2WC(buf, cbuf, sz);
-    #endif // wxUSE_UNICODE
-    }
-
-    if ( !ok )
-    {
-        wxLogSysError(_("Failed to get the working directory"));
-
-        // VZ: the old code used to return "." on error which didn't make any
-        //     sense at all to me - empty string is a better error indicator
-        //     (NULL might be even better but I'm afraid this could lead to
-        //     problems with the old code assuming the return is never NULL)
-        buf[0] = wxT('\0');
-    }
-    else // ok, but we might need to massage the path into the right format
-    {
-#ifdef __DJGPP__
-        // VS: DJGPP is a strange mix of DOS and UNIX API and returns paths
-        //     with / deliminers. We don't like that.
-        for (wxChar *ch = buf; *ch; ch++)
-        {
-            if (*ch == wxT('/'))
-                *ch = wxT('\\');
-        }
-#endif // __DJGPP__
-
-// MBN: we hope that in the case the user is compiling a GTK+/Motif app,
-//      he needs Unix as opposed to Win32 pathnames
-#if defined( __CYGWIN__ ) && defined( __WINDOWS__ )
-        // another example of DOS/Unix mix (Cygwin)
-        wxString pathUnix = buf;
-#if wxUSE_UNICODE
-    #if CYGWIN_VERSION_DLL_MAJOR >= 1007
-        cygwin_conv_path(CCP_POSIX_TO_WIN_W, pathUnix.mb_str(wxConvFile), buf, sz);
-    #else
-        char bufA[_MAXPATHLEN];
-        cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA);
-        wxConvFile.MB2WC(buf, bufA, sz);
-    #endif
-#else
-    #if CYGWIN_VERSION_DLL_MAJOR >= 1007
-        cygwin_conv_path(CCP_POSIX_TO_WIN_A, pathUnix, buf, sz);
-    #else
-        cygwin_conv_to_full_win32_path(pathUnix, buf);
-    #endif
-#endif // wxUSE_UNICODE
-#endif // __CYGWIN__
-    }
-
-    return buf;
-
-#if !wxUSE_UNICODE
-    #undef cbuf
-#endif
-
-#endif
-    // __WXWINCE__
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
-{
-    return wxDoGetCwd(buf,sz);
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
-wxString wxGetCwd()
-{
-    wxString str;
-    wxDoGetCwd(wxStringBuffer(str, _MAXPATHLEN), _MAXPATHLEN);
-    return str;
-}
-
-bool wxSetWorkingDirectory(const wxString& d)
-{
-    bool success = false;
-#if defined(__OS2__)
-    if (d[1] == ':')
-    {
-        ::DosSetDefaultDisk(wxToupper(d[0]) - wxT('A') + 1);
-    // do not call DosSetCurrentDir when just changing drive,
-    // since it requires e.g. "d:." instead of "d:"!
-    if (d.length() == 2)
-        return true;
-    }
-    success = (::DosSetCurrentDir(d.c_str()) == 0);
-#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
-    success = (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
-#elif defined(__WINDOWS__)
-
-#ifdef __WIN32__
-#ifdef __WXWINCE__
-    // No equivalent in WinCE
-    wxUnusedVar(d);
-#else
-    success = (SetCurrentDirectory(d.t_str()) != 0);
-#endif
-#else
-    // Must change drive, too.
-    bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
-    if (isDriveSpec)
-    {
-        wxChar firstChar = d[0];
-
-        // To upper case
-        if (firstChar > 90)
-            firstChar = firstChar - 32;
-
-        // To a drive number
-        unsigned int driveNo = firstChar - 64;
-        if (driveNo > 0)
-        {
-            unsigned int noDrives;
-            _dos_setdrive(driveNo, &noDrives);
-        }
-    }
-    success = (chdir(WXSTRINGCAST d) == 0);
-#endif
-
-#endif
-    if ( !success )
-    {
-       wxLogSysError(_("Could not set current working directory"));
-    }
-    return success;
-}
-
-// Get the OS directory if appropriate (such as the Windows directory).
-// On non-Windows platform, probably just return the empty string.
-wxString wxGetOSDirectory()
-{
-#ifdef __WXWINCE__
-    return wxString(wxT("\\Windows"));
-#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    wxChar buf[256];
-    GetWindowsDirectory(buf, 256);
-    return wxString(buf);
-#elif defined(__WXMAC__) && wxOSX_USE_CARBON
-    return wxMacFindFolderNoSeparator(kOnSystemDisk, 'macs', false);
-#else
-    return wxEmptyString;
-#endif
-}
-
-bool wxEndsWithPathSeparator(const wxString& filename)
-{
-    return !filename.empty() && wxIsPathSeparator(filename.Last());
-}
-
-// find a file in a list of directories, returns false if not found
-bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile)
-{
-    // we assume that it's not empty
-    wxCHECK_MSG( !szFile.empty(), false,
-                 wxT("empty file name in wxFindFileInPath"));
-
-    // skip path separator in the beginning of the file name if present
-    wxString szFile2;
-    if ( wxIsPathSeparator(szFile[0u]) )
-        szFile2 = szFile.Mid(1);
-    else
-        szFile2 = szFile;
-
-    wxStringTokenizer tkn(szPath, wxPATH_SEP);
-
-    while ( tkn.HasMoreTokens() )
-    {
-        wxString strFile = tkn.GetNextToken();
-        if ( !wxEndsWithPathSeparator(strFile) )
-            strFile += wxFILE_SEP_PATH;
-        strFile += szFile2;
-
-        if ( wxFileExists(strFile) )
-        {
-            *pStr = strFile;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
-                             wxString *pstrPath,
-                             wxString *pstrName,
-                             wxString *pstrExt)
-{
-    wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
-}
-#endif  // #if WXWIN_COMPATIBILITY_2_8
-
-#if wxUSE_DATETIME
-
-time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)
-{
-    wxDateTime mtime;
-    if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
-        return (time_t)-1;
-
-    return mtime.GetTicks();
-}
-
-#endif // wxUSE_DATETIME
-
-
-// Parses the filterStr, returning the number of filters.
-// Returns 0 if none or if there's a problem.
-// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
-
-int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
-                                           wxArrayString& descriptions,
-                                           wxArrayString& filters)
-{
-    descriptions.Clear();
-    filters.Clear();
-
-    wxString str(filterStr);
-
-    wxString description, filter;
-    int pos = 0;
-    while( pos != wxNOT_FOUND )
-    {
-        pos = str.Find(wxT('|'));
-        if ( pos == wxNOT_FOUND )
-        {
-            // if there are no '|'s at all in the string just take the entire
-            // string as filter and make description empty for later autocompletion
-            if ( filters.IsEmpty() )
-            {
-                descriptions.Add(wxEmptyString);
-                filters.Add(filterStr);
-            }
-            else
-            {
-                wxFAIL_MSG( wxT("missing '|' in the wildcard string!") );
-            }
-
-            break;
-        }
-
-        description = str.Left(pos);
-        str = str.Mid(pos + 1);
-        pos = str.Find(wxT('|'));
-        if ( pos == wxNOT_FOUND )
-        {
-            filter = str;
-        }
-        else
-        {
-            filter = str.Left(pos);
-            str = str.Mid(pos + 1);
-        }
-
-        descriptions.Add(description);
-        filters.Add(filter);
-    }
-
-#if defined(__WXMOTIF__)
-    // split it so there is one wildcard per entry
-    for( size_t i = 0 ; i < descriptions.GetCount() ; i++ )
-    {
-        pos = filters[i].Find(wxT(';'));
-        if (pos != wxNOT_FOUND)
-        {
-            // first split only filters
-            descriptions.Insert(descriptions[i],i+1);
-            filters.Insert(filters[i].Mid(pos+1),i+1);
-            filters[i]=filters[i].Left(pos);
-
-            // autoreplace new filter in description with pattern:
-            //     C/C++ Files(*.cpp;*.c;*.h)|*.cpp;*.c;*.h
-            // cause split into:
-            //     C/C++ Files(*.cpp)|*.cpp
-            //     C/C++ Files(*.c;*.h)|*.c;*.h
-            // and next iteration cause another split into:
-            //     C/C++ Files(*.cpp)|*.cpp
-            //     C/C++ Files(*.c)|*.c
-            //     C/C++ Files(*.h)|*.h
-            for ( size_t k=i;k<i+2;k++ )
-            {
-                pos = descriptions[k].Find(filters[k]);
-                if (pos != wxNOT_FOUND)
-                {
-                    wxString before = descriptions[k].Left(pos);
-                    wxString after = descriptions[k].Mid(pos+filters[k].Len());
-                    pos = before.Find(wxT('('),true);
-                    if (pos>before.Find(wxT(')'),true))
-                    {
-                        before = before.Left(pos+1);
-                        before << filters[k];
-                        pos = after.Find(wxT(')'));
-                        int pos1 = after.Find(wxT('('));
-                        if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
-                        {
-                            before << after.Mid(pos);
-                            descriptions[k] = before;
-                        }
-                    }
-                }
-            }
-        }
-    }
-#endif
-
-    // autocompletion
-    for( size_t j = 0 ; j < descriptions.GetCount() ; j++ )
-    {
-        if ( descriptions[j].empty() && !filters[j].empty() )
-        {
-            descriptions[j].Printf(_("Files (%s)"), filters[j].c_str());
-        }
-    }
-
-    return filters.GetCount();
-}
-
-#if defined(__WINDOWS__) && !(defined(__UNIX__) || defined(__OS2__))
-static bool wxCheckWin32Permission(const wxString& path, DWORD access)
-{
-    // quoting the MSDN: "To obtain a handle to a directory, call the
-    // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
-    // doesn't work under Win9x/ME but then it's not needed there anyhow
-    const DWORD dwAttr = ::GetFileAttributes(path.t_str());
-    if ( dwAttr == INVALID_FILE_ATTRIBUTES )
-    {
-        // file probably doesn't exist at all
-        return false;
-    }
-
-    if ( wxGetOsVersion() == wxOS_WINDOWS_9X )
-    {
-        // FAT directories always allow all access, even if they have the
-        // readonly flag set, and FAT files can only be read-only
-        return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) ||
-                    (access != GENERIC_WRITE ||
-                        !(dwAttr & FILE_ATTRIBUTE_READONLY));
-    }
-
-    HANDLE h = ::CreateFile
-                 (
-                    path.t_str(),
-                    access,
-                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                    NULL,
-                    OPEN_EXISTING,
-                    dwAttr & FILE_ATTRIBUTE_DIRECTORY
-                        ? FILE_FLAG_BACKUP_SEMANTICS
-                        : 0,
-                    NULL
-                 );
-    if ( h != INVALID_HANDLE_VALUE )
-        CloseHandle(h);
-
-    return h != INVALID_HANDLE_VALUE;
-}
-#endif // __WINDOWS__
-
-bool wxIsWritable(const wxString &path)
-{
-#if defined( __UNIX__ ) || defined(__OS2__)
-    // access() will take in count also symbolic links
-    return wxAccess(path.c_str(), W_OK) == 0;
-#elif defined( __WINDOWS__ )
-    return wxCheckWin32Permission(path, GENERIC_WRITE);
-#else
-    wxUnusedVar(path);
-    // TODO
-    return false;
-#endif
-}
-
-bool wxIsReadable(const wxString &path)
-{
-#if defined( __UNIX__ ) || defined(__OS2__)
-    // access() will take in count also symbolic links
-    return wxAccess(path.c_str(), R_OK) == 0;
-#elif defined( __WINDOWS__ )
-    return wxCheckWin32Permission(path, GENERIC_READ);
-#else
-    wxUnusedVar(path);
-    // TODO
-    return false;
-#endif
-}
-
-bool wxIsExecutable(const wxString &path)
-{
-#if defined( __UNIX__ ) || defined(__OS2__)
-    // access() will take in count also symbolic links
-    return wxAccess(path.c_str(), X_OK) == 0;
-#elif defined( __WINDOWS__ )
-   return wxCheckWin32Permission(path, GENERIC_EXECUTE);
-#else
-    wxUnusedVar(path);
-    // TODO
-    return false;
-#endif
-}
-
-// Return the type of an open file
-//
-// Some file types on some platforms seem seekable but in fact are not.
-// The main use of this function is to allow such cases to be detected
-// (IsSeekable() is implemented as wxGetFileKind() == wxFILE_KIND_DISK).
-//
-// This is important for the archive streams, which benefit greatly from
-// being able to seek on a stream, but which will produce corrupt archives
-// if they unknowingly seek on a non-seekable stream.
-//
-// wxFILE_KIND_DISK is a good catch all return value, since other values
-// disable features of the archive streams. Some other value must be returned
-// for a file type that appears seekable but isn't.
-//
-// Known examples:
-//   *  Pipes on Windows
-//   *  Files on VMS with a record format other than StreamLF
-//
-wxFileKind wxGetFileKind(int fd)
-{
-#if defined __WINDOWS__ && !defined __WXWINCE__ && defined wxGetOSFHandle
-    switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
-    {
-        case FILE_TYPE_CHAR:
-            return wxFILE_KIND_TERMINAL;
-        case FILE_TYPE_DISK:
-            return wxFILE_KIND_DISK;
-        case FILE_TYPE_PIPE:
-            return wxFILE_KIND_PIPE;
-    }
-
-    return wxFILE_KIND_UNKNOWN;
-
-#elif defined(__UNIX__)
-    if (isatty(fd))
-        return wxFILE_KIND_TERMINAL;
-
-    struct stat st;
-    fstat(fd, &st);
-
-    if (S_ISFIFO(st.st_mode))
-        return wxFILE_KIND_PIPE;
-    if (!S_ISREG(st.st_mode))
-        return wxFILE_KIND_UNKNOWN;
-
-    #if defined(__VMS__)
-        if (st.st_fab_rfm != FAB$C_STMLF)
-            return wxFILE_KIND_UNKNOWN;
-    #endif
-
-    return wxFILE_KIND_DISK;
-
-#else
-    #define wxFILEKIND_STUB
-    (void)fd;
-    return wxFILE_KIND_DISK;
-#endif
-}
-
-wxFileKind wxGetFileKind(FILE *fp)
-{
-    // Note: The watcom rtl dll doesn't have fileno (the static lib does).
-    //       Should be fixed in version 1.4.
-#if defined(wxFILEKIND_STUB) || wxONLY_WATCOM_EARLIER_THAN(1,4)
-    (void)fp;
-    return wxFILE_KIND_DISK;
-#elif defined(__WINDOWS__) && !defined(__CYGWIN__) && !defined(__WATCOMC__) && !defined(__WINE__)
-    return fp ? wxGetFileKind(_fileno(fp)) : wxFILE_KIND_UNKNOWN;
-#else
-    return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN;
-#endif
-}
-
-
-//------------------------------------------------------------------------
-// wild character routines
-//------------------------------------------------------------------------
-
-bool wxIsWild( const wxString& pattern )
-{
-    for ( wxString::const_iterator p = pattern.begin(); p != pattern.end(); ++p )
-    {
-        switch ( (*p).GetValue() )
-        {
-            case wxT('?'):
-            case wxT('*'):
-            case wxT('['):
-            case wxT('{'):
-                return true;
-
-            case wxT('\\'):
-                if ( ++p == pattern.end() )
-                    return false;
-        }
-    }
-    return false;
-}
-
-/*
-* Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
-*
-* The match procedure is public domain code (from ircII's reg.c)
-* but modified to suit our tastes (RN: No "%" syntax I guess)
-*/
-
-bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
-{
-    if (text.empty())
-    {
-        /* Match if both are empty. */
-        return pat.empty();
-    }
-
-    const wxChar *m = pat.c_str(),
-    *n = text.c_str(),
-    *ma = NULL,
-    *na = NULL;
-    int just = 0,
-    acount = 0,
-    count = 0;
-
-    if (dot_special && (*n == wxT('.')))
-    {
-        /* Never match so that hidden Unix files
-         * are never found. */
-        return false;
-    }
-
-    for (;;)
-    {
-        if (*m == wxT('*'))
-        {
-            ma = ++m;
-            na = n;
-            just = 1;
-            acount = count;
-        }
-        else if (*m == wxT('?'))
-        {
-            m++;
-            if (!*n++)
-                return false;
-        }
-        else
-        {
-            if (*m == wxT('\\'))
-            {
-                m++;
-                /* Quoting "nothing" is a bad thing */
-                if (!*m)
-                    return false;
-            }
-            if (!*m)
-            {
-                /*
-                * If we are out of both strings or we just
-                * saw a wildcard, then we can say we have a
-                * match
-                */
-                if (!*n)
-                    return true;
-                if (just)
-                    return true;
-                just = 0;
-                goto not_matched;
-            }
-            /*
-            * We could check for *n == NULL at this point, but
-            * since it's more common to have a character there,
-            * check to see if they match first (m and n) and
-            * then if they don't match, THEN we can check for
-            * the NULL of n
-            */
-            just = 0;
-            if (*m == *n)
-            {
-                m++;
-                count++;
-                n++;
-            }
-            else
-            {
-
-                not_matched:
-
-                /*
-                * If there are no more characters in the
-                * string, but we still need to find another
-                * character (*m != NULL), then it will be
-                * impossible to match it
-                */
-                if (!*n)
-                    return false;
-
-                if (ma)
-                {
-                    m = ma;
-                    n = ++na;
-                    count = acount;
-                }
-                else
-                    return false;
-            }
-        }
-    }
-}
-
-#ifdef __VISUALC__
-    #pragma warning(default:4706)   // assignment within conditional expression
-#endif // VC++
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/filefn.cpp
+// Purpose:     File- and directory-related functions
+// Author:      Julian Smart
+// Modified by:
+// Created:     29/01/98
+// RCS-ID:      $Id: filefn.cpp 66990 2011-02-22 12:10:44Z JS $
+// Copyright:   (c) 1998 Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/filefn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+#endif
+
+#include "wx/file.h"
+#include "wx/filename.h"
+#include "wx/dir.h"
+
+#include "wx/tokenzr.h"
+
+// there are just too many of those...
+#ifdef __VISUALC__
+    #pragma warning(disable:4706)   // assignment within conditional expression
+#endif // VC++
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#if !wxONLY_WATCOM_EARLIER_THAN(1,4)
+    #if !(defined(_MSC_VER) && (_MSC_VER > 800))
+        #include <errno.h>
+    #endif
+#endif
+
+#if defined(__WXMAC__)
+    #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
+#ifdef __WINDOWS__
+    #include "wx/msw/private.h"
+    #include "wx/msw/mslu.h"
+
+    // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
+    //
+    // note that it must be included after <windows.h>
+    #ifdef __GNUWIN32__
+        #ifdef __CYGWIN__
+            #include <sys/cygwin.h>
+        #endif
+    #endif // __GNUWIN32__
+
+    // io.h is needed for _get_osfhandle()
+    // Already included by filefn.h for many Windows compilers
+    #if defined __MWERKS__ || defined __CYGWIN__
+        #include <io.h>
+    #endif
+#endif // __WINDOWS__
+
+#if defined(__VMS__)
+    #include <fab.h>
+#endif
+
+// TODO: Borland probably has _wgetcwd as well?
+#ifdef _MSC_VER
+    #define HAVE_WGETCWD
+#endif
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#ifndef _MAXPATHLEN
+    #define _MAXPATHLEN 1024
+#endif
+
+#ifdef __WXMAC__
+#    include "MoreFilesX.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// private globals
+// ----------------------------------------------------------------------------
+
+// MT-FIXME: get rid of this horror and all code using it
+static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
+
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+//
+// VisualAge C++ V4.0 cannot have any external linkage const decs
+// in headers included by more than one primary source
+//
+const int wxInvalidOffset = -1;
+#endif
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// translate the filenames before passing them to OS functions
+#define OS_FILENAME(s) (s.fn_str())
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wrappers around standard POSIX functions
+// ----------------------------------------------------------------------------
+
+#ifdef wxNEED_WX_UNISTD_H
+
+WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
+{
+    return stat( wxConvFile.cWX2MB( file_name ), buf );
+}
+
+WXDLLEXPORT int wxLstat( const wxChar *file_name, wxStructStat *buf )
+{
+    return lstat( wxConvFile.cWX2MB( file_name ), buf );
+}
+
+WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode )
+{
+    return access( wxConvFile.cWX2MB( pathname ), mode );
+}
+
+WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
+{
+    return open( wxConvFile.cWX2MB( pathname ), flags, mode );
+}
+
+#endif // wxNEED_WX_UNISTD_H
+
+#if wxUSE_UNICODE && defined __BORLANDC__ \
+    && __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551
+
+// BCC 5.5 and 5.5.1 have a bug in _wopen where files are created read only
+// regardless of the mode parameter. This hack works around the problem by
+// setting the mode with _wchmod.
+//
+int wxOpen(const wchar_t *pathname, int flags, mode_t mode)
+{
+    int moreflags = 0;
+
+    // we only want to fix the mode when the file is actually created, so
+    // when creating first try doing it O_EXCL so we can tell if the file
+    // was already there.
+    if ((flags & O_CREAT) && !(flags & O_EXCL) && (mode & wxS_IWUSR) != 0)
+        moreflags = O_EXCL;
+
+    int fd = _wopen(pathname, flags | moreflags, mode);
+
+    // the file was actually created and needs fixing
+    if (fd != -1 && (flags & O_CREAT) != 0 && (mode & wxS_IWUSR) != 0)
+    {
+        close(fd);
+        _wchmod(pathname, mode);
+        fd = _wopen(pathname, flags & ~(O_EXCL | O_CREAT));
+    }
+    // the open failed, but it may have been because the added O_EXCL stopped
+    // the opening of an existing file, so try again without.
+    else if (fd == -1 && moreflags != 0)
+    {
+        fd = _wopen(pathname, flags & ~O_CREAT);
+    }
+
+    return fd;
+}
+
+#endif
+
+// ----------------------------------------------------------------------------
+// wxPathList
+// ----------------------------------------------------------------------------
+
+bool wxPathList::Add(const wxString& path)
+{
+    // add a path separator to force wxFileName to interpret it always as a directory
+    // (i.e. if we are called with '/home/user' we want to consider it a folder and
+    // not, as wxFileName would consider, a filename).
+    wxFileName fn(path + wxFileName::GetPathSeparator());
+
+    // add only normalized relative/absolute paths
+    // NB: we won't do wxPATH_NORM_DOTS in order to avoid problems when trying to
+    //     normalize paths which starts with ".." (which can be normalized only if
+    //     we use also wxPATH_NORM_ABSOLUTE - which we don't want to use).
+    if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS))
+        return false;
+
+    wxString toadd = fn.GetPath();
+    if (Index(toadd) == wxNOT_FOUND)
+        wxArrayString::Add(toadd);      // do not add duplicates
+
+    return true;
+}
+
+void wxPathList::Add(const wxArrayString &arr)
+{
+    for (size_t j=0; j < arr.GetCount(); j++)
+        Add(arr[j]);
+}
+
+// Add paths e.g. from the PATH environment variable
+void wxPathList::AddEnvList (const wxString& WXUNUSED_IN_WINCE(envVariable))
+{
+    // No environment variables on WinCE
+#ifndef __WXWINCE__
+
+    // The space has been removed from the tokenizers, otherwise a
+    // path such as "C:\Program Files" would be split into 2 paths:
+    // "C:\Program" and "Files"; this is true for both Windows and Unix.
+
+    static const wxChar PATH_TOKS[] =
+#if defined(__WINDOWS__) || defined(__OS2__)
+        wxT(";"); // Don't separate with colon in DOS (used for drive)
+#else
+        wxT(":;");
+#endif
+
+    wxString val;
+    if ( wxGetEnv(envVariable, &val) )
+    {
+        // split into an array of string the value of the env var
+        wxArrayString arr = wxStringTokenize(val, PATH_TOKS);
+        WX_APPEND_ARRAY(*this, arr);
+    }
+#endif // !__WXWINCE__
+}
+
+// Given a full filename (with path), ensure that that file can
+// be accessed again USING FILENAME ONLY by adding the path
+// to the list if not already there.
+bool wxPathList::EnsureFileAccessible (const wxString& path)
+{
+    return Add(wxPathOnly(path));
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+bool wxPathList::Member (const wxString& path) const
+{
+    return Index(path) != wxNOT_FOUND;
+}
+#endif
+
+wxString wxPathList::FindValidPath (const wxString& file) const
+{
+    // normalize the given string as it could be a path + a filename
+    // and not only a filename
+    wxFileName fn(file);
+    wxString strend;
+
+    // NB: normalize without making absolute otherwise calling this function with
+    //     e.g. "b/c.txt" would result in removing the directory 'b' and the for loop
+    //     below would only add to the paths of this list the 'c.txt' part when doing
+    //     the existence checks...
+    // NB: we don't use wxPATH_NORM_DOTS here, too (see wxPathList::Add for more info)
+    if (!fn.Normalize(wxPATH_NORM_TILDE|wxPATH_NORM_LONG|wxPATH_NORM_ENV_VARS))
+        return wxEmptyString;
+
+    wxASSERT_MSG(!fn.IsDir(), wxT("Cannot search for directories; only for files"));
+    if (fn.IsAbsolute())
+        strend = fn.GetFullName();      // search for the file name and ignore the path part
+    else
+        strend = fn.GetFullPath();
+
+    for (size_t i=0; i<GetCount(); i++)
+    {
+        wxString strstart = Item(i);
+        if (!strstart.IsEmpty() && strstart.Last() != wxFileName::GetPathSeparator())
+            strstart += wxFileName::GetPathSeparator();
+
+        if (wxFileExists(strstart + strend))
+            return strstart + strend;        // Found!
+    }
+
+    return wxEmptyString;                    // Not found
+}
+
+wxString wxPathList::FindAbsoluteValidPath (const wxString& file) const
+{
+    wxString f = FindValidPath(file);
+    if ( f.empty() || wxIsAbsolutePath(f) )
+        return f;
+
+    wxString buf = ::wxGetCwd();
+
+    if ( !wxEndsWithPathSeparator(buf) )
+    {
+        buf += wxFILE_SEP_PATH;
+    }
+    buf += f;
+
+    return buf;
+}
+
+// ----------------------------------------------------------------------------
+// miscellaneous global functions (TOFIX!)
+// ----------------------------------------------------------------------------
+
+static inline wxChar* MYcopystring(const wxString& s)
+{
+    wxChar* copy = new wxChar[s.length() + 1];
+    return wxStrcpy(copy, s.c_str());
+}
+
+static inline wxChar* MYcopystring(const wxChar* s)
+{
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}
+
+
+bool
+wxFileExists (const wxString& filename)
+{
+#if defined(__WXPALMOS__)
+    return false;
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
+    // we must use GetFileAttributes() instead of the ANSI C functions because
+    // it can cope with network (UNC) paths unlike them
+    DWORD ret = ::GetFileAttributes(filename);
+
+    return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
+#else // !__WIN32__
+    #ifndef S_ISREG
+        #define S_ISREG(mode) ((mode) & S_IFREG)
+    #endif
+    wxStructStat st;
+#ifndef wxNEED_WX_UNISTD_H
+    return (wxStat( filename.fn_str() , &st) == 0 && S_ISREG(st.st_mode))
+#ifdef __OS2__
+      || (errno == EACCES) // if access is denied something with that name
+                            // exists and is opened in exclusive mode.
+#endif
+      ;
+#else
+    return wxStat( filename , &st) == 0 && S_ISREG(st.st_mode);
+#endif
+#endif // __WIN32__/!__WIN32__
+}
+
+bool
+wxIsAbsolutePath (const wxString& filename)
+{
+    if (!filename.empty())
+    {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+        // Classic or Carbon CodeWarrior like
+        // Carbon with Apple DevTools is Unix like
+
+        // This seems wrong to me, but there is no fix. since
+        // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
+        // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
+        if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
+            return true ;
+#else
+        // Unix like or Windows
+        if (filename[0] == wxT('/'))
+            return true;
+#endif
+#ifdef __VMS__
+        if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
+            return true;
+#endif
+#if defined(__WINDOWS__) || defined(__OS2__)
+        // MSDOS like
+        if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
+            return true;
+#endif
+    }
+    return false ;
+}
+
+/*
+ * Strip off any extension (dot something) from end of file,
+ * IF one exists. Inserts zero into buffer.
+ *
+ */
+
+void wxStripExtension(wxChar *buffer)
+{
+    int len = wxStrlen(buffer);
+    int i = len-1;
+    while (i > 0)
+    {
+        if (buffer[i] == wxT('.'))
+        {
+            buffer[i] = 0;
+            break;
+        }
+        i --;
+    }
+}
+
+void wxStripExtension(wxString& buffer)
+{
+    //RN:  Be careful about the handling the case where
+    //buffer.length() == 0
+    for(size_t i = buffer.length() - 1; i != wxString::npos; --i)
+    {
+        if (buffer.GetChar(i) == wxT('.'))
+        {
+          buffer = buffer.Left(i);
+          break;
+        }
+    }
+}
+
+// Destructive removal of /./ and /../ stuff
+wxChar *wxRealPath (wxChar *path)
+{
+#ifdef __WXMSW__
+  static const wxChar SEP = wxT('\\');
+  wxUnix2DosFilename(path);
+#else
+  static const wxChar SEP = wxT('/');
+#endif
+  if (path[0] && path[1]) {
+    /* MATTHEW: special case "/./x" */
+    wxChar *p;
+    if (path[2] == SEP && path[1] == wxT('.'))
+      p = &path[0];
+    else
+      p = &path[2];
+    for (; *p; p++)
+      {
+        if (*p == SEP)
+          {
+            if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
+              {
+                wxChar *q;
+                for (q = p - 1; q >= path && *q != SEP; q--)
+                {
+                    // Empty
+                }
+
+                if (q[0] == SEP && (q[1] != wxT('.') || q[2] != wxT('.') || q[3] != SEP)
+                    && (q - 1 <= path || q[-1] != SEP))
+                  {
+                    wxStrcpy (q, p + 3);
+                    if (path[0] == wxT('\0'))
+                      {
+                        path[0] = SEP;
+                        path[1] = wxT('\0');
+                      }
+#if defined(__WXMSW__) || defined(__OS2__)
+                    /* Check that path[2] is NULL! */
+                    else if (path[1] == wxT(':') && !path[2])
+                      {
+                        path[2] = SEP;
+                        path[3] = wxT('\0');
+                      }
+#endif
+                    p = q - 1;
+                  }
+              }
+            else if (p[1] == wxT('.') && (p[2] == SEP || p[2] == wxT('\0')))
+              wxStrcpy (p, p + 2);
+          }
+      }
+  }
+  return path;
+}
+
+wxString wxRealPath(const wxString& path)
+{
+    wxChar *buf1=MYcopystring(path);
+    wxChar *buf2=wxRealPath(buf1);
+    wxString buf(buf2);
+    delete [] buf1;
+    return buf;
+}
+
+
+// Must be destroyed
+wxChar *wxCopyAbsolutePath(const wxString& filename)
+{
+    if (filename.empty())
+        return (wxChar *) NULL;
+
+    if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
+    {
+        wxString buf = ::wxGetCwd();
+        wxChar ch = buf.Last();
+#ifdef __WXMSW__
+        if (ch != wxT('\\') && ch != wxT('/'))
+            buf << wxT("\\");
+#else
+        if (ch != wxT('/'))
+            buf << wxT("/");
+#endif
+        buf << wxFileFunctionsBuffer;
+        buf = wxRealPath( buf );
+        return MYcopystring( buf );
+    }
+    return MYcopystring( wxFileFunctionsBuffer );
+}
+
+/*-
+ Handles:
+   ~/ => home dir
+   ~user/ => user's home dir
+   If the environment variable a = "foo" and b = "bar" then:
+   Unix:
+        $a        =>        foo
+        $a$b        =>        foobar
+        $a.c        =>        foo.c
+        xxx$a        =>        xxxfoo
+        ${a}!        =>        foo!
+        $(b)!        =>        bar!
+        \$a        =>        \$a
+   MSDOS:
+        $a        ==>        $a
+        $(a)        ==>        foo
+        $(a)$b        ==>        foo$b
+        $(a)$(b)==>        foobar
+        test.$$        ==>        test.$$
+ */
+
+/* input name in name, pathname output to buf. */
+
+wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
+{
+    register wxChar *d, *s, *nm;
+    wxChar          lnm[_MAXPATHLEN];
+    int             q;
+
+    // Some compilers don't like this line.
+//    const wxChar    trimchars[] = wxT("\n \t");
+
+    wxChar      trimchars[4];
+    trimchars[0] = wxT('\n');
+    trimchars[1] = wxT(' ');
+    trimchars[2] = wxT('\t');
+    trimchars[3] = 0;
+
+#ifdef __WXMSW__
+    const wxChar     SEP = wxT('\\');
+#else
+    const wxChar     SEP = wxT('/');
+#endif
+    buf[0] = wxT('\0');
+    if (name == NULL || *name == wxT('\0'))
+        return buf;
+    nm = MYcopystring(name); // Make a scratch copy
+    wxChar *nm_tmp = nm;
+
+    /* Skip leading whitespace and cr */
+    while (wxStrchr((wxChar *)trimchars, *nm) != NULL)
+        nm++;
+    /* And strip off trailing whitespace and cr */
+    s = nm + (q = wxStrlen(nm)) - 1;
+    while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL)
+        *s = wxT('\0');
+
+    s = nm;
+    d = lnm;
+#ifdef __WXMSW__
+    q = FALSE;
+#else
+    q = nm[0] == wxT('\\') && nm[1] == wxT('~');
+#endif
+
+    /* Expand inline environment variables */
+#ifdef __VISAGECPP__
+    while (*d)
+    {
+      *d++ = *s;
+      if(*s == wxT('\\'))
+      {
+        *(d - 1) = *++s;
+        if (*d)
+        {
+          s++;
+          continue;
+        }
+        else
+           break;
+      }
+      else
+#else
+    while ((*d++ = *s) != 0) {
+#  ifndef __WXMSW__
+        if (*s == wxT('\\')) {
+            if ((*(d - 1) = *++s)!=0) {
+                s++;
+                continue;
+            } else
+                break;
+        } else
+#  endif
+#endif
+            // No env variables on WinCE
+#ifndef __WXWINCE__
+#ifdef __WXMSW__
+        if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
+#else
+        if (*s++ == wxT('$'))
+#endif
+        {
+            register wxChar  *start = d;
+            register int     braces = (*s == wxT('{') || *s == wxT('('));
+            register wxChar  *value;
+            while ((*d++ = *s) != 0)
+                if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
+                    break;
+                else
+                    s++;
+            *--d = 0;
+            value = wxGetenv(braces ? start + 1 : start);
+            if (value) {
+                for ((d = start - 1); (*d++ = *value++) != 0;)
+                {
+                    // Empty
+                }
+
+                d--;
+                if (braces && *s)
+                    s++;
+            }
+        }
+#endif
+        // __WXWINCE__
+    }
+
+    /* Expand ~ and ~user */
+    nm = lnm;
+    if (nm[0] == wxT('~') && !q)
+    {
+        /* prefix ~ */
+        if (nm[1] == SEP || nm[1] == 0)
+        {        /* ~/filename */
+        // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+            if ((s = WXSTRINGCAST wxGetUserHome(wxEmptyString)) != NULL) {
+                if (*++nm)
+                    nm++;
+            }
+        } else
+        {                /* ~user/filename */
+            register wxChar  *nnm;
+            register wxChar  *home;
+            for (s = nm; *s && *s != SEP; s++)
+            {
+                // Empty
+            }
+            int was_sep; /* MATTHEW: Was there a separator, or NULL? */
+            was_sep = (*s == SEP);
+            nnm = *s ? s + 1 : s;
+            *s = 0;
+        // FIXME: wxGetUserHome could return temporary storage in Unicode mode
+            if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL)
+            {
+                if (was_sep) /* replace only if it was there: */
+                    *s = SEP;
+                s = NULL;
+            }
+            else
+            {
+                nm = nnm;
+                s = home;
+            }
+        }
+    }
+
+    d = buf;
+    if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */
+        /* Copy home dir */
+        while (wxT('\0') != (*d++ = *s++))
+          /* loop */;
+        // Handle root home
+        if (d - 1 > buf && *(d - 2) != SEP)
+          *(d - 1) = SEP;
+    }
+    s = nm;
+    while ((*d++ = *s++) != 0)
+    {
+        // Empty
+    }
+    delete[] nm_tmp; // clean up alloc
+    /* Now clean up the buffer */
+    return wxRealPath(buf);
+}
+
+/* Contract Paths to be build upon an environment variable
+   component:
+
+   example: "/usr/openwin/lib", OPENWINHOME --> ${OPENWINHOME}/lib
+
+   The call wxExpandPath can convert these back!
+ */
+wxChar *
+wxContractPath (const wxString& filename,
+                const wxString& WXUNUSED_IN_WINCE(envname),
+                const wxString& user)
+{
+  static wxChar dest[_MAXPATHLEN];
+
+  if (filename.empty())
+    return (wxChar *) NULL;
+
+  wxStrcpy (dest, WXSTRINGCAST filename);
+#ifdef __WXMSW__
+  wxUnix2DosFilename(dest);
+#endif
+
+  // Handle environment
+  const wxChar *val;
+#ifndef __WXWINCE__
+  wxChar *tcp;
+  if (!envname.empty() && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
+     (tcp = wxStrstr (dest, val)) != NULL)
+    {
+        wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
+        *tcp++ = wxT('$');
+        *tcp++ = wxT('{');
+        wxStrcpy (tcp, WXSTRINGCAST envname);
+        wxStrcat (tcp, wxT("}"));
+        wxStrcat (tcp, wxFileFunctionsBuffer);
+    }
+#endif
+
+  // Handle User's home (ignore root homes!)
+  val = wxGetUserHome (user);
+  if (!val)
+    return dest;
+
+  const size_t len = wxStrlen(val);
+  if (len <= 2)
+    return dest;
+
+  if (wxStrncmp(dest, val, len) == 0)
+  {
+    wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
+    if (!user.empty())
+           wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
+    wxStrcat(wxFileFunctionsBuffer, dest + len);
+    wxStrcpy (dest, wxFileFunctionsBuffer);
+  }
+
+  return dest;
+}
+
+// Return just the filename, not the path (basename)
+wxChar *wxFileNameFromPath (wxChar *path)
+{
+    wxString p = path;
+    wxString n = wxFileNameFromPath(p);
+
+    return path + p.length() - n.length();
+}
+
+wxString wxFileNameFromPath (const wxString& path)
+{
+    wxString name, ext;
+    wxFileName::SplitPath(path, NULL, &name, &ext);
+
+    wxString fullname = name;
+    if ( !ext.empty() )
+    {
+        fullname << wxFILE_SEP_EXT << ext;
+    }
+
+    return fullname;
+}
+
+// Return just the directory, or NULL if no directory
+wxChar *
+wxPathOnly (wxChar *path)
+{
+    if (path && *path)
+    {
+        static wxChar buf[_MAXPATHLEN];
+
+        // Local copy
+        wxStrcpy (buf, path);
+
+        int l = wxStrlen(path);
+        int i = l - 1;
+
+        // Search backward for a backward or forward slash
+        while (i > -1)
+        {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (path[i] == wxT(':') )
+            {
+                buf[i] = 0;
+                return buf;
+            }
+#else
+            // Unix like or Windows
+            if (path[i] == wxT('/') || path[i] == wxT('\\'))
+            {
+                buf[i] = 0;
+                return buf;
+            }
+#endif
+#ifdef __VMS__
+            if (path[i] == wxT(']'))
+            {
+                buf[i+1] = 0;
+                return buf;
+            }
+#endif
+            i --;
+        }
+
+#if defined(__WXMSW__) || defined(__OS2__)
+        // Try Drive specifier
+        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+        {
+            // A:junk --> A:. (since A:.\junk Not A:\junk)
+            buf[2] = wxT('.');
+            buf[3] = wxT('\0');
+            return buf;
+        }
+#endif
+    }
+    return (wxChar *) NULL;
+}
+
+// Return just the directory, or NULL if no directory
+wxString wxPathOnly (const wxString& path)
+{
+    if (!path.empty())
+    {
+        wxChar buf[_MAXPATHLEN];
+
+        // Local copy
+        wxStrcpy (buf, WXSTRINGCAST path);
+
+        int l = path.length();
+        int i = l - 1;
+
+        // Search backward for a backward or forward slash
+        while (i > -1)
+        {
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // Classic or Carbon CodeWarrior like
+            // Carbon with Apple DevTools is Unix like
+            if (path[i] == wxT(':') )
+            {
+                buf[i] = 0;
+                return wxString(buf);
+            }
+#else
+            // Unix like or Windows
+            if (path[i] == wxT('/') || path[i] == wxT('\\'))
+            {
+                // Don't return an empty string
+                if (i == 0)
+                    i ++;
+                buf[i] = 0;
+                return wxString(buf);
+            }
+#endif
+#ifdef __VMS__
+            if (path[i] == wxT(']'))
+            {
+                buf[i+1] = 0;
+                return wxString(buf);
+            }
+#endif
+            i --;
+        }
+
+#if defined(__WXMSW__) || defined(__OS2__)
+        // Try Drive specifier
+        if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
+        {
+            // A:junk --> A:. (since A:.\junk Not A:\junk)
+            buf[2] = wxT('.');
+            buf[3] = wxT('\0');
+            return wxString(buf);
+        }
+#endif
+    }
+    return wxEmptyString;
+}
+
+// Utility for converting delimiters in DOS filenames to UNIX style
+// and back again - or we get nasty problems with delimiters.
+// Also, convert to lower case, since case is significant in UNIX.
+
+#if defined(__WXMAC__)
+
+#if TARGET_API_MAC_OSX
+#define kDefaultPathStyle kCFURLPOSIXPathStyle
+#else
+#define kDefaultPathStyle kCFURLHFSPathStyle
+#endif
+
+wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
+{
+    CFURLRef fullURLRef;
+    fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
+    if ( additionalPathComponent )
+    {
+        CFURLRef parentURLRef = fullURLRef ;
+        fullURLRef = CFURLCreateCopyAppendingPathComponent(NULL, parentURLRef,
+            additionalPathComponent,false);
+        CFRelease( parentURLRef ) ;
+    }
+    CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
+    CFRelease( fullURLRef ) ;
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
+    CFRelease( cfString );
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+    return wxMacCFStringHolder(cfMutableString).AsString();
+}
+
+OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
+{
+    OSStatus err = noErr ;
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxMacCFStringHolder(path));
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
+    CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
+    CFRelease( cfMutableString );
+    if ( NULL != url )
+    {
+        if ( CFURLGetFSRef(url, fsRef) == false )
+            err = fnfErr ;
+        CFRelease( url ) ;
+    }
+    else
+    {
+        err = fnfErr ;
+    }
+    return err ;
+}
+
+wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
+{
+    CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+                                                      uniname->unicode,
+                                                      uniname->length );
+    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
+    CFRelease( cfname );
+    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
+    return wxMacCFStringHolder(cfMutableString).AsString() ;
+}
+
+#ifndef __LP64__
+
+wxString wxMacFSSpec2MacFilename( const FSSpec *spec )
+{
+    FSRef fsRef ;
+    if ( FSpMakeFSRef( spec , &fsRef) == noErr )
+    {
+        return wxMacFSRefToPath( &fsRef ) ;
+    }
+    return wxEmptyString ;
+}
+
+void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
+{
+    OSStatus err = noErr ;
+    FSRef fsRef ;
+    wxMacPathToFSRef( path , &fsRef ) ;
+    err = FSRefMakeFSSpec( &fsRef , spec ) ;
+}
+#endif
+
+#endif // __WXMAC__
+
+void
+wxDos2UnixFilename (wxChar *s)
+{
+  if (s)
+    while (*s)
+      {
+        if (*s == _T('\\'))
+          *s = _T('/');
+#ifdef __WXMSW__
+        else
+          *s = (wxChar)wxTolower (*s);        // Case INDEPENDENT
+#endif
+        s++;
+      }
+}
+
+void
+#if defined(__WXMSW__) || defined(__OS2__)
+wxUnix2DosFilename (wxChar *s)
+#else
+wxUnix2DosFilename (wxChar *WXUNUSED(s) )
+#endif
+{
+// Yes, I really mean this to happen under DOS only! JACS
+#if defined(__WXMSW__) || defined(__OS2__)
+  if (s)
+    while (*s)
+      {
+        if (*s == wxT('/'))
+          *s = wxT('\\');
+        s++;
+      }
+#endif
+}
+
+// Concatenate two files to form third
+bool
+wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
+{
+#if wxUSE_FILE
+
+    wxFile in1(file1), in2(file2);
+    wxTempFile out(file3);
+
+    if ( !in1.IsOpened() || !in2.IsOpened() || !out.IsOpened() )
+        return false;
+
+    ssize_t ofs;
+    unsigned char buf[1024];
+
+    for( int i=0; i<2; i++)
+    {
+        wxFile *in = i==0 ? &in1 : &in2;
+        do{
+            if ( (ofs = in->Read(buf,WXSIZEOF(buf))) == wxInvalidOffset ) return false;
+            if ( ofs > 0 )
+                if ( !out.Write(buf,ofs) )
+                    return false;
+        } while ( ofs == (ssize_t)WXSIZEOF(buf) );
+    }
+
+    return out.Commit();
+
+#else
+
+    wxUnusedVar(file1);
+    wxUnusedVar(file2);
+    wxUnusedVar(file3);
+    return false;
+
+#endif
+}
+
+// Copy files
+bool
+wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
+{
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    // CopyFile() copies file attributes and modification time too, so use it
+    // instead of our code if available
+    //
+    // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
+    if ( !::CopyFile(file1, file2, !overwrite) )
+    {
+        wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
+                      file1.c_str(), file2.c_str());
+
+        return false;
+    }
+#elif defined(__OS2__)
+    if ( ::DosCopy((PSZ)file1.c_str(), (PSZ)file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
+        return false;
+#elif defined(__PALMOS__)
+    // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/
+    return false;
+#elif wxUSE_FILE // !Win32
+
+    wxStructStat fbuf;
+    // get permissions of file1
+    if ( wxStat( file1.c_str(), &fbuf) != 0 )
+    {
+        // the file probably doesn't exist or we haven't the rights to read
+        // from it anyhow
+        wxLogSysError(_("Impossible to get permissions for file '%s'"),
+                      file1.c_str());
+        return false;
+    }
+
+    // open file1 for reading
+    wxFile fileIn(file1, wxFile::read);
+    if ( !fileIn.IsOpened() )
+        return false;
+
+    // remove file2, if it exists. This is needed for creating
+    // file2 with the correct permissions in the next step
+    if ( wxFileExists(file2)  && (!overwrite || !wxRemoveFile(file2)))
+    {
+        wxLogSysError(_("Impossible to overwrite the file '%s'"),
+                      file2.c_str());
+        return false;
+    }
+
+    // reset the umask as we want to create the file with exactly the same
+    // permissions as the original one
+    wxCHANGE_UMASK(0);
+
+    // create file2 with the same permissions than file1 and open it for
+    // writing
+
+    wxFile fileOut;
+    if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
+        return false;
+
+    // copy contents of file1 to file2
+    char buf[4096];
+    size_t count;
+    for ( ;; )
+    {
+        count = fileIn.Read(buf, WXSIZEOF(buf));
+        if ( fileIn.Error() )
+            return false;
+
+        // end of file?
+        if ( !count )
+            break;
+
+        if ( fileOut.Write(buf, count) < count )
+            return false;
+    }
+
+    // we can expect fileIn to be closed successfully, but we should ensure
+    // that fileOut was closed as some write errors (disk full) might not be
+    // detected before doing this
+    if ( !fileIn.Close() || !fileOut.Close() )
+        return false;
+
+#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
+    // no chmod in VA.  Should be some permission API for HPFS386 partitions
+    // however
+    if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 )
+    {
+        wxLogSysError(_("Impossible to set permissions for the file '%s'"),
+                      file2.c_str());
+        return false;
+    }
+#endif // OS/2 || Mac
+
+#else // !Win32 && ! wxUSE_FILE
+
+    // impossible to simulate with wxWidgets API
+    wxUnusedVar(file1);
+    wxUnusedVar(file2);
+    wxUnusedVar(overwrite);
+    return false;
+
+#endif // __WXMSW__ && __WIN32__
+
+    return true;
+}
+
+bool
+wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite)
+{
+    if ( !overwrite && wxFileExists(file2) )
+    {
+        wxLogSysError
+        (
+            _("Failed to rename the file '%s' to '%s' because the destination file already exists."),
+            file1.c_str(), file2.c_str()
+        );
+
+        return false;
+    }
+
+#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
+    // Normal system call
+  if ( wxRename (file1, file2) == 0 )
+    return true;
+#endif
+
+  // Try to copy
+  if (wxCopyFile(file1, file2, overwrite)) {
+    wxRemoveFile(file1);
+    return true;
+  }
+  // Give up
+  return false;
+}
+
+bool wxRemoveFile(const wxString& file)
+{
+#if defined(__VISUALC__) \
+ || defined(__BORLANDC__) \
+ || defined(__WATCOMC__) \
+ || defined(__DMC__) \
+ || defined(__GNUWIN32__) \
+ || (defined(__MWERKS__) && defined(__MSL__))
+    int res = wxRemove(file);
+#elif defined(__WXMAC__)
+    int res = unlink(wxFNCONV(file));
+#elif defined(__WXPALMOS__)
+    int res = 1;
+    // TODO with VFSFileDelete()
+#else
+    int res = unlink(OS_FILENAME(file));
+#endif
+
+    return res == 0;
+}
+
+bool wxMkdir(const wxString& dir, int perm)
+{
+#if defined(__WXPALMOS__)
+    return false;
+#elif defined(__WXMAC__) && !defined(__UNIX__)
+    return (mkdir( wxFNCONV(dir) , 0 ) == 0);
+#else // !Mac
+    const wxChar *dirname = dir.c_str();
+
+    // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
+    // for the GNU compiler
+#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
+  #if defined(MSVCRT)
+    wxUnusedVar(perm);
+    if ( mkdir(wxFNCONV(dirname)) != 0 )
+  #else
+    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
+  #endif
+#elif defined(__OS2__)
+    wxUnusedVar(perm);
+    if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
+#elif defined(__DOS__)
+  #if defined(__WATCOMC__)
+    (void)perm;
+    if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
+  #elif defined(__DJGPP__)
+    if ( mkdir(wxFNCONV(dirname), perm) != 0 )
+  #else
+    #error "Unsupported DOS compiler!"
+  #endif
+#else  // !MSW, !DOS and !OS/2 VAC++
+    wxUnusedVar(perm);
+#ifdef __WXWINCE__
+    if ( !CreateDirectory(dirname, NULL) )
+#else
+    if ( wxMkDir(dir.fn_str()) != 0 )
+#endif
+#endif // !MSW/MSW
+    {
+        wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
+
+        return false;
+    }
+
+    return true;
+#endif // Mac/!Mac
+}
+
+bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
+{
+#if defined(__VMS__)
+    return false; //to be changed since rmdir exists in VMS7.x
+#elif defined(__OS2__)
+    return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
+#elif defined(__WXWINCE__)
+    return (RemoveDirectory(dir) != 0);
+#elif defined(__WXPALMOS__)
+    // TODO with VFSFileRename()
+    return false;
+#else
+    return (wxRmDir(OS_FILENAME(dir)) == 0);
+#endif
+}
+
+// does the path exists? (may have or not '/' or '\\' at the end)
+bool wxDirExists(const wxChar *pszPathName)
+{
+    wxString strPath(pszPathName);
+
+#if defined(__WINDOWS__) || defined(__OS2__)
+    // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
+    // so remove all trailing backslashes from the path - but don't do this for
+    // the paths "d:\" (which are different from "d:") nor for just "\"
+    while ( wxEndsWithPathSeparator(strPath) )
+    {
+        size_t len = strPath.length();
+        if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) )
+            break;
+
+        strPath.Truncate(len - 1);
+    }
+#endif // __WINDOWS__
+
+#ifdef __OS2__
+    // OS/2 can't handle "d:", it wants either "d:\" or "d:."
+    if (strPath.length() == 2 && strPath[1u] == _T(':'))
+        strPath << _T('.');
+#endif
+
+#if defined(__WXPALMOS__)
+    return false;
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
+    // stat() can't cope with network paths
+    DWORD ret = ::GetFileAttributes(strPath);
+
+    return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
+#elif defined(__OS2__)
+    FILESTATUS3 Info = {{0}};
+    APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
+                                   (void*) &Info, sizeof(FILESTATUS3));
+
+    return ((rc == NO_ERROR) && (Info.attrFile & FILE_DIRECTORY)) ||
+      (rc == ERROR_SHARING_VIOLATION);
+    // If we got a sharing violation, there must be something with this name.
+#else // !__WIN32__
+
+    wxStructStat st;
+#ifndef __VISAGECPP__
+    return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);
+#else
+    // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
+    return wxStat(pszPathName, &st) == 0 && (st.st_mode == S_IFDIR);
+#endif
+
+#endif // __WIN32__/!__WIN32__
+}
+
+// Get a temporary filename, opening and closing the file.
+wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
+{
+    wxString filename;
+    if ( !wxGetTempFileName(prefix, filename) )
+        return NULL;
+
+    if ( buf )
+        wxStrcpy(buf, filename);
+    else
+        buf = MYcopystring(filename);
+
+    return buf;
+}
+
+bool wxGetTempFileName(const wxString& prefix, wxString& buf)
+{
+#if wxUSE_FILE
+    buf = wxFileName::CreateTempFileName(prefix);
+
+    return !buf.empty();
+#else // !wxUSE_FILE
+    wxUnusedVar(prefix);
+    wxUnusedVar(buf);
+
+    return false;
+#endif // wxUSE_FILE/!wxUSE_FILE
+}
+
+// Get first file name matching given wild card.
+
+static wxDir *gs_dir = NULL;
+static wxString gs_dirPath;
+
+wxString wxFindFirstFile(const wxChar *spec, int flags)
+{
+    wxSplitPath(spec, &gs_dirPath, NULL, NULL);
+    if ( gs_dirPath.empty() )
+        gs_dirPath = wxT(".");
+    if ( !wxEndsWithPathSeparator(gs_dirPath ) )
+        gs_dirPath << wxFILE_SEP_PATH;
+
+    if (gs_dir)
+        delete gs_dir;
+    gs_dir = new wxDir(gs_dirPath);
+
+    if ( !gs_dir->IsOpened() )
+    {
+        wxLogSysError(_("Can not enumerate files '%s'"), spec);
+        return wxEmptyString;
+    }
+
+    int dirFlags;
+    switch (flags)
+    {
+        case wxDIR:  dirFlags = wxDIR_DIRS; break;
+        case wxFILE: dirFlags = wxDIR_FILES; break;
+        default:     dirFlags = wxDIR_DIRS | wxDIR_FILES; break;
+    }
+
+    wxString result;
+    gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
+    if ( result.empty() )
+    {
+        wxDELETE(gs_dir);
+        return result;
+    }
+
+    return gs_dirPath + result;
+}
+
+wxString wxFindNextFile()
+{
+    wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") );
+
+    wxString result;
+    gs_dir->GetNext(&result);
+
+    if ( result.empty() )
+    {
+        wxDELETE(gs_dir);
+        return result;
+    }
+
+    return gs_dirPath + result;
+}
+
+
+// Get current working directory.
+// If buf is NULL, allocates space using new, else copies into buf.
+// wxGetWorkingDirectory() is obsolete, use wxGetCwd()
+// wxDoGetCwd() is their common core to be moved
+// to wxGetCwd() once wxGetWorkingDirectory() will be removed.
+// Do not expose wxDoGetCwd in headers!
+
+wxChar *wxDoGetCwd(wxChar *buf, int sz)
+{
+#if defined(__WXPALMOS__)
+    // TODO
+    if(buf && sz>0) buf[0] = _T('\0');
+    return buf;
+#elif defined(__WXWINCE__)
+    // TODO
+    if(buf && sz>0) buf[0] = _T('\0');
+    return buf;
+#else
+    if ( !buf )
+    {
+        buf = new wxChar[sz + 1];
+    }
+
+    bool ok wxDUMMY_INITIALIZE(false);
+
+    // for the compilers which have Unicode version of _getcwd(), call it
+    // directly, for the others call the ANSI version and do the translation
+#if !wxUSE_UNICODE
+    #define cbuf buf
+#else // wxUSE_UNICODE
+    bool needsANSI = true;
+
+    #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
+        char cbuf[_MAXPATHLEN];
+    #endif
+
+    #ifdef HAVE_WGETCWD
+        #if wxUSE_UNICODE_MSLU
+            if ( wxGetOsVersion() != wxOS_WINDOWS_9X )
+        #else
+            char *cbuf = NULL; // never really used because needsANSI will always be false
+        #endif
+            {
+                ok = _wgetcwd(buf, sz) != NULL;
+                needsANSI = false;
+            }
+    #endif
+
+    if ( needsANSI )
+#endif // wxUSE_UNICODE
+    {
+    #if defined(_MSC_VER) || defined(__MINGW32__)
+        ok = _getcwd(cbuf, sz) != NULL;
+    #elif defined(__WXMAC__) && !defined(__DARWIN__)
+        char lbuf[1024] ;
+        if ( getcwd( lbuf , sizeof( lbuf ) ) )
+        {
+            wxString res( lbuf , *wxConvCurrent ) ;
+            wxStrcpy( buf , res ) ;
+            ok = true;
+        }
+        else
+            ok = false ;
+    #elif defined(__OS2__)
+        APIRET rc;
+        ULONG ulDriveNum = 0;
+        ULONG ulDriveMap = 0;
+        rc = ::DosQueryCurrentDisk(&ulDriveNum, &ulDriveMap);
+        ok = rc == 0;
+        if (ok)
+        {
+            sz -= 3;
+            rc = ::DosQueryCurrentDir( 0 // current drive
+                                      ,(PBYTE)cbuf + 3
+                                      ,(PULONG)&sz
+                                     );
+            cbuf[0] = char('A' + (ulDriveNum - 1));
+            cbuf[1] = ':';
+            cbuf[2] = '\\';
+            ok = rc == 0;
+        }
+    #else // !Win32/VC++ !Mac !OS2
+        ok = getcwd(cbuf, sz) != NULL;
+    #endif // platform
+
+    #if wxUSE_UNICODE && !(defined(__WXMAC__) && !defined(__DARWIN__))
+        // finally convert the result to Unicode if needed
+        wxConvFile.MB2WC(buf, cbuf, sz);
+    #endif // wxUSE_UNICODE
+    }
+
+    if ( !ok )
+    {
+        wxLogSysError(_("Failed to get the working directory"));
+
+        // VZ: the old code used to return "." on error which didn't make any
+        //     sense at all to me - empty string is a better error indicator
+        //     (NULL might be even better but I'm afraid this could lead to
+        //     problems with the old code assuming the return is never NULL)
+        buf[0] = _T('\0');
+    }
+    else // ok, but we might need to massage the path into the right format
+    {
+#ifdef __DJGPP__
+        // VS: DJGPP is a strange mix of DOS and UNIX API and returns paths
+        //     with / deliminers. We don't like that.
+        for (wxChar *ch = buf; *ch; ch++)
+        {
+            if (*ch == wxT('/'))
+                *ch = wxT('\\');
+        }
+#endif // __DJGPP__
+
+// MBN: we hope that in the case the user is compiling a GTK+/Motif app,
+//      he needs Unix as opposed to Win32 pathnames
+#if defined( __CYGWIN__ ) && defined( __WINDOWS__ )
+        // another example of DOS/Unix mix (Cygwin)
+        wxString pathUnix = buf;
+#if wxUSE_UNICODE
+        char bufA[_MAXPATHLEN];
+        cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA);
+        wxConvFile.MB2WC(buf, bufA, sz);
+#else
+        cygwin_conv_to_full_win32_path(pathUnix, buf);
+#endif // wxUSE_UNICODE
+#endif // __CYGWIN__
+    }
+
+    return buf;
+
+#if !wxUSE_UNICODE
+    #undef cbuf
+#endif
+
+#endif
+    // __WXWINCE__
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
+{
+    return wxDoGetCwd(buf,sz);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+wxString wxGetCwd()
+{
+    wxString str;
+    wxDoGetCwd(wxStringBuffer(str, _MAXPATHLEN), _MAXPATHLEN);
+    return str;
+}
+
+bool wxSetWorkingDirectory(const wxString& d)
+{
+#if defined(__OS2__)
+    if (d[1] == ':')
+    {
+        ::DosSetDefaultDisk(1 + wxToupper(d[0]) - _T('A'));
+    // do not call DosSetCurrentDir when just changing drive,
+    // since it requires e.g. "d:." instead of "d:"!
+    if (d.length() == 2)
+        return true;
+    }
+    return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
+    return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
+#elif defined(__WINDOWS__)
+
+#ifdef __WIN32__
+#ifdef __WXWINCE__
+    // No equivalent in WinCE
+    wxUnusedVar(d);
+    return false;
+#else
+    return (bool)(SetCurrentDirectory(d) != 0);
+#endif
+#else
+    // Must change drive, too.
+    bool isDriveSpec = ((strlen(d) > 1) && (d[1] == ':'));
+    if (isDriveSpec)
+    {
+        wxChar firstChar = d[0];
+
+        // To upper case
+        if (firstChar > 90)
+            firstChar = firstChar - 32;
+
+        // To a drive number
+        unsigned int driveNo = firstChar - 64;
+        if (driveNo > 0)
+        {
+            unsigned int noDrives;
+            _dos_setdrive(driveNo, &noDrives);
+        }
+    }
+    bool success = (chdir(WXSTRINGCAST d) == 0);
+
+    return success;
+#endif
+
+#endif
+}
+
+// Get the OS directory if appropriate (such as the Windows directory).
+// On non-Windows platform, probably just return the empty string.
+wxString wxGetOSDirectory()
+{
+#ifdef __WXWINCE__
+    return wxString(wxT("\\Windows"));
+#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+    wxChar buf[256];
+    GetWindowsDirectory(buf, 256);
+    return wxString(buf);
+#elif defined(__WXMAC__)
+    return wxMacFindFolder(kOnSystemDisk, 'macs', false);
+#else
+    return wxEmptyString;
+#endif
+}
+
+bool wxEndsWithPathSeparator(const wxChar *pszFileName)
+{
+    size_t len = wxStrlen(pszFileName);
+
+    return len && wxIsPathSeparator(pszFileName[len - 1]);
+}
+
+// find a file in a list of directories, returns false if not found
+bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
+{
+    // we assume that it's not empty
+    wxCHECK_MSG( !wxIsEmpty(pszFile), false,
+                 _T("empty file name in wxFindFileInPath"));
+
+    // skip path separator in the beginning of the file name if present
+    if ( wxIsPathSeparator(*pszFile) )
+        pszFile++;
+
+    // copy the path (strtok will modify it)
+    wxChar *szPath = new wxChar[wxStrlen(pszPath) + 1];
+    wxStrcpy(szPath, pszPath);
+
+    wxString strFile;
+    wxChar *pc, *save_ptr;
+    for ( pc = wxStrtok(szPath, wxPATH_SEP, &save_ptr);
+          pc != NULL;
+          pc = wxStrtok((wxChar *) NULL, wxPATH_SEP, &save_ptr) )
+    {
+        // search for the file in this directory
+        strFile = pc;
+        if ( !wxEndsWithPathSeparator(pc) )
+            strFile += wxFILE_SEP_PATH;
+        strFile += pszFile;
+
+        if ( wxFileExists(strFile) ) {
+            *pStr = strFile;
+            break;
+        }
+    }
+
+    // suppress warning about unused variable save_ptr when wxStrtok() is a
+    // macro which throws away its third argument
+    save_ptr = pc;
+
+    delete [] szPath;
+
+    return pc != NULL;  // if true => we breaked from the loop
+}
+
+void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
+                             wxString *pstrPath,
+                             wxString *pstrName,
+                             wxString *pstrExt)
+{
+    // it can be empty, but it shouldn't be NULL
+    wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
+
+    wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+}
+
+#if wxUSE_DATETIME
+
+time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+{
+    wxDateTime mtime;
+    if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
+        return (time_t)-1;
+
+    return mtime.GetTicks();
+}
+
+#endif // wxUSE_DATETIME
+
+
+// Parses the filterStr, returning the number of filters.
+// Returns 0 if none or if there's a problem.
+// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
+
+int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
+                                           wxArrayString& descriptions,
+                                           wxArrayString& filters)
+{
+    descriptions.Clear();
+    filters.Clear();
+
+    wxString str(filterStr);
+
+    wxString description, filter;
+    int pos = 0;
+    while( pos != wxNOT_FOUND )
+    {
+        pos = str.Find(wxT('|'));
+        if ( pos == wxNOT_FOUND )
+        {
+            // if there are no '|'s at all in the string just take the entire
+            // string as filter and make description empty for later autocompletion
+            if ( filters.IsEmpty() )
+            {
+                descriptions.Add(wxEmptyString);
+                filters.Add(filterStr);
+            }
+            else
+            {
+                wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
+            }
+
+            break;
+        }
+
+        description = str.Left(pos);
+        str = str.Mid(pos + 1);
+        pos = str.Find(wxT('|'));
+        if ( pos == wxNOT_FOUND )
+        {
+            filter = str;
+        }
+        else
+        {
+            filter = str.Left(pos);
+            str = str.Mid(pos + 1);
+        }
+
+        descriptions.Add(description);
+        filters.Add(filter);
+    }
+
+#if defined(__WXMOTIF__)
+    // split it so there is one wildcard per entry
+    for( size_t i = 0 ; i < descriptions.GetCount() ; i++ )
+    {
+        pos = filters[i].Find(wxT(';'));
+        if (pos != wxNOT_FOUND)
+        {
+            // first split only filters
+            descriptions.Insert(descriptions[i],i+1);
+            filters.Insert(filters[i].Mid(pos+1),i+1);
+            filters[i]=filters[i].Left(pos);
+
+            // autoreplace new filter in description with pattern:
+            //     C/C++ Files(*.cpp;*.c;*.h)|*.cpp;*.c;*.h
+            // cause split into:
+            //     C/C++ Files(*.cpp)|*.cpp
+            //     C/C++ Files(*.c;*.h)|*.c;*.h
+            // and next iteration cause another split into:
+            //     C/C++ Files(*.cpp)|*.cpp
+            //     C/C++ Files(*.c)|*.c
+            //     C/C++ Files(*.h)|*.h
+            for ( size_t k=i;k<i+2;k++ )
+            {
+                pos = descriptions[k].Find(filters[k]);
+                if (pos != wxNOT_FOUND)
+                {
+                    wxString before = descriptions[k].Left(pos);
+                    wxString after = descriptions[k].Mid(pos+filters[k].Len());
+                    pos = before.Find(_T('('),true);
+                    if (pos>before.Find(_T(')'),true))
+                    {
+                        before = before.Left(pos+1);
+                        before << filters[k];
+                        pos = after.Find(_T(')'));
+                        int pos1 = after.Find(_T('('));
+                        if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
+                        {
+                            before << after.Mid(pos);
+                            descriptions[k] = before;
+                        }
+                    }
+                }
+            }
+        }
+    }
+#endif
+
+    // autocompletion
+    for( size_t j = 0 ; j < descriptions.GetCount() ; j++ )
+    {
+        if ( descriptions[j].empty() && !filters[j].empty() )
+        {
+            descriptions[j].Printf(_("Files (%s)"), filters[j].c_str());
+        }
+    }
+
+    return filters.GetCount();
+}
+
+#if defined(__WINDOWS__) && !(defined(__UNIX__) || defined(__OS2__))
+
+#ifndef INVALID_FILE_ATTRIBUTES
+#define INVALID_FILE_ATTRIBUTES     ((DWORD)-1)
+#endif
+
+static bool wxCheckWin32Permission(const wxString& path, DWORD access)
+{
+    // quoting the MSDN: "To obtain a handle to a directory, call the
+    // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
+    // doesn't work under Win9x/ME but then it's not needed there anyhow
+    const DWORD dwAttr = ::GetFileAttributes(path.fn_str());
+    if ( dwAttr == INVALID_FILE_ATTRIBUTES )
+    {
+        // file probably doesn't exist at all
+        return false;
+    }
+
+    if ( wxGetOsVersion() == wxOS_WINDOWS_9X )
+    {
+        // FAT directories always allow all access, even if they have the
+        // readonly flag set, and FAT files can only be read-only
+        return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) ||
+                    (access != GENERIC_WRITE ||
+                        !(dwAttr & FILE_ATTRIBUTE_READONLY));
+    }
+
+    HANDLE h = ::CreateFile
+                 (
+                    path.c_str(),
+                    access,
+                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                    NULL,
+                    OPEN_EXISTING,
+                    dwAttr & FILE_ATTRIBUTE_DIRECTORY
+                        ? FILE_FLAG_BACKUP_SEMANTICS
+                        : 0,
+                    NULL
+                 );
+    if ( h != INVALID_HANDLE_VALUE )
+        CloseHandle(h);
+
+    return h != INVALID_HANDLE_VALUE;
+}
+#endif // __WINDOWS__
+
+bool wxIsWritable(const wxString &path)
+{
+#if defined( __UNIX__ ) || defined(__OS2__)
+    // access() will take in count also symbolic links
+    return wxAccess(path.c_str(), W_OK) == 0;
+#elif defined( __WINDOWS__ )
+    return wxCheckWin32Permission(path, GENERIC_WRITE);
+#else
+    wxUnusedVar(path);
+    // TODO
+    return false;
+#endif
+}
+
+bool wxIsReadable(const wxString &path)
+{
+#if defined( __UNIX__ ) || defined(__OS2__)
+    // access() will take in count also symbolic links
+    return wxAccess(path.c_str(), R_OK) == 0;
+#elif defined( __WINDOWS__ )
+    return wxCheckWin32Permission(path, GENERIC_READ);
+#else
+    wxUnusedVar(path);
+    // TODO
+    return false;
+#endif
+}
+
+bool wxIsExecutable(const wxString &path)
+{
+#if defined( __UNIX__ ) || defined(__OS2__)
+    // access() will take in count also symbolic links
+    return wxAccess(path.c_str(), X_OK) == 0;
+#elif defined( __WINDOWS__ )
+   return wxCheckWin32Permission(path, GENERIC_EXECUTE);
+#else
+    wxUnusedVar(path);
+    // TODO
+    return false;
+#endif
+}
+
+// Return the type of an open file
+//
+// Some file types on some platforms seem seekable but in fact are not.
+// The main use of this function is to allow such cases to be detected
+// (IsSeekable() is implemented as wxGetFileKind() == wxFILE_KIND_DISK).
+//
+// This is important for the archive streams, which benefit greatly from
+// being able to seek on a stream, but which will produce corrupt archives
+// if they unknowingly seek on a non-seekable stream.
+//
+// wxFILE_KIND_DISK is a good catch all return value, since other values
+// disable features of the archive streams. Some other value must be returned
+// for a file type that appears seekable but isn't.
+//
+// Known examples:
+//   *  Pipes on Windows
+//   *  Files on VMS with a record format other than StreamLF
+//
+wxFileKind wxGetFileKind(int fd)
+{
+#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle
+    switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
+    {
+        case FILE_TYPE_CHAR:
+            return wxFILE_KIND_TERMINAL;
+        case FILE_TYPE_DISK:
+            return wxFILE_KIND_DISK;
+        case FILE_TYPE_PIPE:
+            return wxFILE_KIND_PIPE;
+    }
+
+    return wxFILE_KIND_UNKNOWN;
+
+#elif defined(__UNIX__)
+    if (isatty(fd))
+        return wxFILE_KIND_TERMINAL;
+
+    struct stat st;
+    fstat(fd, &st);
+
+    if (S_ISFIFO(st.st_mode))
+        return wxFILE_KIND_PIPE;
+    if (!S_ISREG(st.st_mode))
+        return wxFILE_KIND_UNKNOWN;
+
+    #if defined(__VMS__)
+        if (st.st_fab_rfm != FAB$C_STMLF)
+            return wxFILE_KIND_UNKNOWN;
+    #endif
+
+    return wxFILE_KIND_DISK;
+
+#else
+    #define wxFILEKIND_STUB
+    (void)fd;
+    return wxFILE_KIND_DISK;
+#endif
+}
+
+wxFileKind wxGetFileKind(FILE *fp)
+{
+    // Note: The watcom rtl dll doesn't have fileno (the static lib does).
+    //       Should be fixed in version 1.4.
+#if defined(wxFILEKIND_STUB) || wxONLY_WATCOM_EARLIER_THAN(1,4)
+    (void)fp;
+    return wxFILE_KIND_DISK;
+#elif defined(__WINDOWS__) && !defined(__CYGWIN__) && !defined(__WATCOMC__) && !defined(__WINE__)
+    return fp ? wxGetFileKind(_fileno(fp)) : wxFILE_KIND_UNKNOWN;
+#else
+    return fp ? wxGetFileKind(fileno(fp)) : wxFILE_KIND_UNKNOWN;
+#endif
+}
+
+
+//------------------------------------------------------------------------
+// wild character routines
+//------------------------------------------------------------------------
+
+bool wxIsWild( const wxString& pattern )
+{
+    wxString tmp = pattern;
+    wxChar *pat = WXSTRINGCAST(tmp);
+    while (*pat)
+    {
+        switch (*pat++)
+        {
+        case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
+            return true;
+        case wxT('\\'):
+            if (!*pat++)
+                return false;
+        }
+    }
+    return false;
+}
+
+/*
+* Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
+*
+* The match procedure is public domain code (from ircII's reg.c)
+* but modified to suit our tastes (RN: No "%" syntax I guess)
+*/
+
+bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
+{
+    if (text.empty())
+    {
+        /* Match if both are empty. */
+        return pat.empty();
+    }
+
+    const wxChar *m = pat.c_str(),
+    *n = text.c_str(),
+    *ma = NULL,
+    *na = NULL;
+    int just = 0,
+    acount = 0,
+    count = 0;
+
+    if (dot_special && (*n == wxT('.')))
+    {
+        /* Never match so that hidden Unix files
+         * are never found. */
+        return false;
+    }
+
+    for (;;)
+    {
+        if (*m == wxT('*'))
+        {
+            ma = ++m;
+            na = n;
+            just = 1;
+            acount = count;
+        }
+        else if (*m == wxT('?'))
+        {
+            m++;
+            if (!*n++)
+                return false;
+        }
+        else
+        {
+            if (*m == wxT('\\'))
+            {
+                m++;
+                /* Quoting "nothing" is a bad thing */
+                if (!*m)
+                    return false;
+            }
+            if (!*m)
+            {
+                /*
+                * If we are out of both strings or we just
+                * saw a wildcard, then we can say we have a
+                * match
+                */
+                if (!*n)
+                    return true;
+                if (just)
+                    return true;
+                just = 0;
+                goto not_matched;
+            }
+            /*
+            * We could check for *n == NULL at this point, but
+            * since it's more common to have a character there,
+            * check to see if they match first (m and n) and
+            * then if they don't match, THEN we can check for
+            * the NULL of n
+            */
+            just = 0;
+            if (*m == *n)
+            {
+                m++;
+                count++;
+                n++;
+            }
+            else
+            {
+
+                not_matched:
+
+                /*
+                * If there are no more characters in the
+                * string, but we still need to find another
+                * character (*m != NULL), then it will be
+                * impossible to match it
+                */
+                if (!*n)
+                    return false;
+
+                if (ma)
+                {
+                    m = ma;
+                    n = ++na;
+                    count = acount;
+                }
+                else
+                    return false;
+            }
+        }
+    }
+}
+
+#ifdef __VISUALC__
+    #pragma warning(default:4706)   // assignment within conditional expression
+#endif // VC++
diff --git a/Source/3rd Party/wx/src/common/filehistorycmn.cpp b/Source/3rd Party/wx/src/common/filehistorycmn.cpp
deleted file mode 100644
index 30150d2e2..000000000
--- a/Source/3rd Party/wx/src/common/filehistorycmn.cpp	
+++ /dev/null
@@ -1,279 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/filehistorycmn.cpp
-// Purpose:     wxFileHistory class
-// Author:      Julian Smart, Vaclav Slavik, Vadim Zeitlin
-// Created:     2010-05-03
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/filehistory.h"
-
-#if wxUSE_FILE_HISTORY
-
-#include "wx/menu.h"
-#include "wx/confbase.h"
-#include "wx/filename.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// private helpers
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// return the string used for the MRU list items in the menu
-//
-// NB: the index n is 0-based, as usual, but the strings start from 1
-wxString GetMRUEntryLabel(int n, const wxString& path)
-{
-    // we need to quote '&' characters which are used for mnemonics
-    wxString pathInMenu(path);
-    pathInMenu.Replace("&", "&&");
-
-    return wxString::Format("&%d %s", n + 1, pathInMenu);
-}
-
-} // anonymous namespace
-
-// ----------------------------------------------------------------------------
-// File history (a.k.a. MRU, most recently used, files list)
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
-
-wxFileHistoryBase::wxFileHistoryBase(size_t maxFiles, wxWindowID idBase)
-{
-    m_fileMaxFiles = maxFiles;
-    m_idBase = idBase;
-}
-
-/* static */
-wxString wxFileHistoryBase::NormalizeFileName(const wxFileName& fn)
-{
-    // We specifically exclude wxPATH_NORM_LONG here as it can take a long time
-    // (several seconds) for network file paths under MSW, resulting in huge
-    // delays when opening a program using wxFileHistory. We also exclude
-    // wxPATH_NORM_ENV_VARS as the file names here are supposed to be "real"
-    // file names and not have any environment variables in them.
-    wxFileName fnNorm(fn);
-    fnNorm.Normalize(wxPATH_NORM_DOTS |
-                     wxPATH_NORM_TILDE |
-                     wxPATH_NORM_CASE |
-                     wxPATH_NORM_ABSOLUTE);
-    return fnNorm.GetFullPath();
-}
-
-void wxFileHistoryBase::AddFileToHistory(const wxString& file)
-{
-    // Check if we don't already have this file. Notice that we avoid
-    // wxFileName::operator==(wxString) here as it converts the string to
-    // wxFileName and then normalizes it using all normalizations which is too
-    // slow (see the comment above), so we use our own quick normalization
-    // functions and a string comparison.
-    const wxFileName fnNew(file);
-    const wxString newFile = NormalizeFileName(fnNew);
-    size_t i,
-           numFiles = m_fileHistory.size();
-    for ( i = 0; i < numFiles; i++ )
-    {
-        if ( newFile == NormalizeFileName(m_fileHistory[i]) )
-        {
-            // we do have it, move it to the top of the history
-            RemoveFileFromHistory(i);
-            numFiles--;
-            break;
-        }
-    }
-
-    // if we already have a full history, delete the one at the end
-    if ( numFiles == m_fileMaxFiles )
-    {
-        RemoveFileFromHistory(--numFiles);
-    }
-
-    // add a new menu item to all file menus (they will be updated below)
-    for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-        node;
-        node = node->GetNext() )
-    {
-        wxMenu * const menu = (wxMenu *)node->GetData();
-
-        if ( !numFiles && menu->GetMenuItemCount() )
-            menu->AppendSeparator();
-
-        // label doesn't matter, it will be set below anyhow, but it can't
-        // be empty (this is supposed to indicate a stock item)
-        menu->Append(m_idBase + numFiles, " ");
-    }
-
-    // insert the new file in the beginning of the file history
-    m_fileHistory.insert(m_fileHistory.begin(), file);
-    numFiles++;
-
-    // update the labels in all menus
-    for ( i = 0; i < numFiles; i++ )
-    {
-        // if in same directory just show the filename; otherwise the full path
-        const wxFileName fnOld(m_fileHistory[i]);
-
-        wxString pathInMenu;
-        if ( fnOld.GetPath() == fnNew.GetPath() )
-        {
-            pathInMenu = fnOld.GetFullName();
-        }
-        else // file in different directory
-        {
-            // absolute path; could also set relative path
-            pathInMenu = m_fileHistory[i];
-        }
-
-        for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxMenu * const menu = (wxMenu *)node->GetData();
-
-            menu->SetLabel(m_idBase + i, GetMRUEntryLabel(i, pathInMenu));
-        }
-    }
-}
-
-void wxFileHistoryBase::RemoveFileFromHistory(size_t i)
-{
-    size_t numFiles = m_fileHistory.size();
-    wxCHECK_RET( i < numFiles,
-                 wxT("invalid index in wxFileHistoryBase::RemoveFileFromHistory") );
-
-    // delete the element from the array
-    m_fileHistory.RemoveAt(i);
-    numFiles--;
-
-    for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxMenu * const menu = (wxMenu *) node->GetData();
-
-        // shift filenames up
-        for ( size_t j = i; j < numFiles; j++ )
-        {
-            menu->SetLabel(m_idBase + j, GetMRUEntryLabel(j, m_fileHistory[j]));
-        }
-
-        // delete the last menu item which is unused now
-        const wxWindowID lastItemId = m_idBase + numFiles;
-        if ( menu->FindItem(lastItemId) )
-            menu->Delete(lastItemId);
-
-        // delete the last separator too if no more files are left
-        if ( m_fileHistory.empty() )
-        {
-            const wxMenuItemList::compatibility_iterator
-                nodeLast = menu->GetMenuItems().GetLast();
-            if ( nodeLast )
-            {
-                wxMenuItem * const lastMenuItem = nodeLast->GetData();
-                if ( lastMenuItem->IsSeparator() )
-                    menu->Delete(lastMenuItem);
-            }
-            //else: menu is empty somehow
-        }
-    }
-}
-
-void wxFileHistoryBase::UseMenu(wxMenu *menu)
-{
-    if ( !m_fileMenus.Member(menu) )
-        m_fileMenus.Append(menu);
-}
-
-void wxFileHistoryBase::RemoveMenu(wxMenu *menu)
-{
-    m_fileMenus.DeleteObject(menu);
-}
-
-#if wxUSE_CONFIG
-void wxFileHistoryBase::Load(const wxConfigBase& config)
-{
-    m_fileHistory.Clear();
-
-    wxString buf;
-    buf.Printf(wxT("file%d"), 1);
-
-    wxString historyFile;
-    while ((m_fileHistory.GetCount() < m_fileMaxFiles) &&
-           config.Read(buf, &historyFile) && !historyFile.empty())
-    {
-        m_fileHistory.Add(historyFile);
-
-        buf.Printf(wxT("file%d"), (int)m_fileHistory.GetCount()+1);
-        historyFile = wxEmptyString;
-    }
-
-    AddFilesToMenu();
-}
-
-void wxFileHistoryBase::Save(wxConfigBase& config)
-{
-    size_t i;
-    for (i = 0; i < m_fileMaxFiles; i++)
-    {
-        wxString buf;
-        buf.Printf(wxT("file%d"), (int)i+1);
-        if (i < m_fileHistory.GetCount())
-            config.Write(buf, wxString(m_fileHistory[i]));
-        else
-            config.Write(buf, wxEmptyString);
-    }
-}
-#endif // wxUSE_CONFIG
-
-void wxFileHistoryBase::AddFilesToMenu()
-{
-    if ( m_fileHistory.empty() )
-        return;
-
-    for ( wxList::compatibility_iterator node = m_fileMenus.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        AddFilesToMenu((wxMenu *) node->GetData());
-    }
-}
-
-void wxFileHistoryBase::AddFilesToMenu(wxMenu* menu)
-{
-    if ( m_fileHistory.empty() )
-        return;
-
-    if ( menu->GetMenuItemCount() )
-        menu->AppendSeparator();
-
-    for ( size_t i = 0; i < m_fileHistory.GetCount(); i++ )
-    {
-        menu->Append(m_idBase + i, GetMRUEntryLabel(i, m_fileHistory[i]));
-    }
-}
-
-#endif // wxUSE_FILE_HISTORY
diff --git a/Source/3rd Party/wx/src/common/filename.cpp b/Source/3rd Party/wx/src/common/filename.cpp
index 38339b963..f50c40927 100644
--- a/Source/3rd Party/wx/src/common/filename.cpp	
+++ b/Source/3rd Party/wx/src/common/filename.cpp	
@@ -1,2915 +1,2558 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/filename.cpp
-// Purpose:     wxFileName - encapsulates a file path
-// Author:      Robert Roebling, Vadim Zeitlin
-// Modified by:
-// Created:     28.12.2000
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-/*
-   Here are brief descriptions of the filename formats supported by this class:
-
-   wxPATH_UNIX: standard Unix format, used under Darwin as well, absolute file
-                names have the form:
-                /dir1/dir2/.../dirN/filename, "." and ".." stand for the
-                current and parent directory respectively, "~" is parsed as the
-                user HOME and "~username" as the HOME of that user
-
-   wxPATH_DOS:  DOS/Windows format, absolute file names have the form:
-                drive:\dir1\dir2\...\dirN\filename.ext where drive is a single
-                letter. "." and ".." as for Unix but no "~".
-
-                There are also UNC names of the form \\share\fullpath and
-                MSW unique volume names of the form \\?\Volume{GUID}\fullpath.
-
-                The latter provide a uniform way to access a volume regardless of
-                its current mount point, i.e. you can change a volume's mount
-                point from D: to E:, or even remove it, and still be able to
-                access it through its unique volume name. More on the subject can
-                be found in MSDN's article "Naming a Volume" that is currently at
-                http://msdn.microsoft.com/en-us/library/aa365248(VS.85).aspx.
-
-
-   wxPATH_MAC:  Mac OS 8/9 only, not used any longer, absolute file
-                names have the form
-                    volume:dir1:...:dirN:filename
-                and the relative file names are either
-                    :dir1:...:dirN:filename
-                or just
-                    filename
-                (although :filename works as well).
-                Since the volume is just part of the file path, it is not
-                treated like a separate entity as it is done under DOS and
-                VMS, it is just treated as another dir.
-
-   wxPATH_VMS:  VMS native format, absolute file names have the form
-                    <device>:[dir1.dir2.dir3]file.txt
-                or
-                    <device>:[000000.dir1.dir2.dir3]file.txt
-
-                the <device> is the physical device (i.e. disk). 000000 is the
-                root directory on the device which can be omitted.
-
-                Note that VMS uses different separators unlike Unix:
-                 : always after the device. If the path does not contain : than
-                   the default (the device of the current directory) is assumed.
-                 [ start of directory specification
-                 . separator between directory and subdirectory
-                 ] between directory and file
- */
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #ifdef __WINDOWS__
-        #include "wx/msw/wrapwin.h" // For GetShort/LongPathName
-    #endif
-    #include "wx/dynarray.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/crt.h"
-#endif
-
-#include "wx/filename.h"
-#include "wx/private/filename.h"
-#include "wx/tokenzr.h"
-#include "wx/config.h"          // for wxExpandEnvVars
-#include "wx/dynlib.h"
-#include "wx/dir.h"
-
-#if defined(__WIN32__) && defined(__MINGW32__)
-    #include "wx/msw/gccpriv.h"
-#endif
-
-#ifdef __WINDOWS__
-#include "wx/msw/private.h"
-#include <ShellAPI.h>
-#endif
-
-#if defined(__WXMAC__)
-  #include  "wx/osx/private.h"  // includes mac headers
-#endif
-
-// utime() is POSIX so should normally be available on all Unices
-#ifdef __UNIX_LIKE__
-#include <sys/types.h>
-#include <utime.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#endif
-
-#ifdef __DJGPP__
-#include <unistd.h>
-#endif
-
-#ifdef __WATCOMC__
-#include <io.h>
-#include <sys/utime.h>
-#include <sys/stat.h>
-#endif
-
-#ifdef __VISAGECPP__
-#ifndef MAX_PATH
-#define MAX_PATH 256
-#endif
-#endif
-
-#ifdef __EMX__
-#include <os2.h>
-#define MAX_PATH _MAX_PATH
-#endif
-
-#ifndef S_ISREG
-    #define S_ISREG(mode) ((mode) & S_IFREG)
-#endif
-#ifndef S_ISDIR
-    #define S_ISDIR(mode) ((mode) & S_IFDIR)
-#endif
-
-#if wxUSE_LONGLONG
-extern const wxULongLong wxInvalidSize = (unsigned)-1;
-#endif // wxUSE_LONGLONG
-
-namespace
-{
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// small helper class which opens and closes the file - we use it just to get
-// a file handle for the given file name to pass it to some Win32 API function
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-
-class wxFileHandle
-{
-public:
-    enum OpenMode
-    {
-        ReadAttr,
-        WriteAttr
-    };
-
-    wxFileHandle(const wxString& filename, OpenMode mode, int flags = 0)
-    {
-        // be careful and use FILE_{READ,WRITE}_ATTRIBUTES here instead of the
-        // usual GENERIC_{READ,WRITE} as we don't want the file access time to
-        // be changed when we open it because this class is used for setting
-        // access time (see #10567)
-        m_hFile = ::CreateFile
-                    (
-                     filename.t_str(),             // name
-                     mode == ReadAttr ? FILE_READ_ATTRIBUTES    // access mask
-                                      : FILE_WRITE_ATTRIBUTES,
-                     FILE_SHARE_READ |              // sharing mode
-                     FILE_SHARE_WRITE,              // (allow everything)
-                     NULL,                          // no secutity attr
-                     OPEN_EXISTING,                 // creation disposition
-                     flags,                         // flags
-                     NULL                           // no template file
-                    );
-
-        if ( m_hFile == INVALID_HANDLE_VALUE )
-        {
-            if ( mode == ReadAttr )
-            {
-                wxLogSysError(_("Failed to open '%s' for reading"),
-                              filename.c_str());
-            }
-            else
-            {
-                wxLogSysError(_("Failed to open '%s' for writing"),
-                              filename.c_str());
-            }
-        }
-    }
-
-    ~wxFileHandle()
-    {
-        if ( m_hFile != INVALID_HANDLE_VALUE )
-        {
-            if ( !::CloseHandle(m_hFile) )
-            {
-                wxLogSysError(_("Failed to close file handle"));
-            }
-        }
-    }
-
-    // return true only if the file could be opened successfully
-    bool IsOk() const { return m_hFile != INVALID_HANDLE_VALUE; }
-
-    // get the handle
-    operator HANDLE() const { return m_hFile; }
-
-private:
-    HANDLE m_hFile;
-};
-
-#endif // __WIN32__
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DATETIME && defined(__WIN32__) && !defined(__WXMICROWIN__)
-
-// convert between wxDateTime and FILETIME which is a 64-bit value representing
-// the number of 100-nanosecond intervals since January 1, 1601.
-
-static void ConvertFileTimeToWx(wxDateTime *dt, const FILETIME &ft)
-{
-    FILETIME ftcopy = ft;
-    FILETIME ftLocal;
-    if ( !::FileTimeToLocalFileTime(&ftcopy, &ftLocal) )
-    {
-        wxLogLastError(wxT("FileTimeToLocalFileTime"));
-    }
-
-    SYSTEMTIME st;
-    if ( !::FileTimeToSystemTime(&ftLocal, &st) )
-    {
-        wxLogLastError(wxT("FileTimeToSystemTime"));
-    }
-
-    dt->Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
-            st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
-}
-
-static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt)
-{
-    SYSTEMTIME st;
-    st.wDay = dt.GetDay();
-    st.wMonth = (WORD)(dt.GetMonth() + 1);
-    st.wYear = (WORD)dt.GetYear();
-    st.wHour = dt.GetHour();
-    st.wMinute = dt.GetMinute();
-    st.wSecond = dt.GetSecond();
-    st.wMilliseconds = dt.GetMillisecond();
-
-    FILETIME ftLocal;
-    if ( !::SystemTimeToFileTime(&st, &ftLocal) )
-    {
-        wxLogLastError(wxT("SystemTimeToFileTime"));
-    }
-
-    if ( !::LocalFileTimeToFileTime(&ftLocal, ft) )
-    {
-        wxLogLastError(wxT("LocalFileTimeToFileTime"));
-    }
-}
-
-#endif // wxUSE_DATETIME && __WIN32__
-
-// return a string with the volume par
-static wxString wxGetVolumeString(const wxString& volume, wxPathFormat format)
-{
-    wxString path;
-
-    if ( !volume.empty() )
-    {
-        format = wxFileName::GetFormat(format);
-
-        // Special Windows UNC paths hack, part 2: undo what we did in
-        // SplitPath() and make an UNC path if we have a drive which is not a
-        // single letter (hopefully the network shares can't be one letter only
-        // although I didn't find any authoritative docs on this)
-        if ( format == wxPATH_DOS && volume.length() > 1 )
-        {
-            // We also have to check for Windows unique volume names here and
-            // return it with '\\?\' prepended to it
-            if ( wxFileName::IsMSWUniqueVolumeNamePath("\\\\?\\" + volume + "\\",
-                                                       format) )
-            {
-                path << "\\\\?\\" << volume;
-            }
-            else
-            {
-                // it must be a UNC path
-                path << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << volume;
-            }
-        }
-        else if  ( format == wxPATH_DOS || format == wxPATH_VMS )
-        {
-            path << volume << wxFileName::GetVolumeSeparator(format);
-        }
-        // else ignore
-    }
-
-    return path;
-}
-
-// return true if the character is a DOS path separator i.e. either a slash or
-// a backslash
-inline bool IsDOSPathSep(wxUniChar ch)
-{
-    return ch == wxFILE_SEP_PATH_DOS || ch == wxFILE_SEP_PATH_UNIX;
-}
-
-// return true if the format used is the DOS/Windows one and the string looks
-// like a UNC path
-static bool IsUNCPath(const wxString& path, wxPathFormat format)
-{
-    return format == wxPATH_DOS &&
-                path.length() >= 4 && // "\\a" can't be a UNC path
-                    IsDOSPathSep(path[0u]) &&
-                        IsDOSPathSep(path[1u]) &&
-                            !IsDOSPathSep(path[2u]);
-}
-
-// ----------------------------------------------------------------------------
-// private constants
-// ----------------------------------------------------------------------------
-
-// length of \\?\Volume{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}\ string
-static const size_t wxMSWUniqueVolumePrefixLength = 49;
-
-} // anonymous namespace
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxFileName construction
-// ----------------------------------------------------------------------------
-
-void wxFileName::Assign( const wxFileName &filepath )
-{
-    m_volume = filepath.GetVolume();
-    m_dirs = filepath.GetDirs();
-    m_name = filepath.GetName();
-    m_ext = filepath.GetExt();
-    m_relative = filepath.m_relative;
-    m_hasExt = filepath.m_hasExt;
-}
-
-void wxFileName::Assign(const wxString& volume,
-                        const wxString& path,
-                        const wxString& name,
-                        const wxString& ext,
-                        bool hasExt,
-                        wxPathFormat format)
-{
-    // we should ignore paths which look like UNC shares because we already
-    // have the volume here and the UNC notation (\\server\path) is only valid
-    // for paths which don't start with a volume, so prevent SetPath() from
-    // recognizing "\\foo\bar" in "c:\\foo\bar" as an UNC path
-    //
-    // note also that this is a rather ugly way to do what we want (passing
-    // some kind of flag telling to ignore UNC paths to SetPath() would be
-    // better) but this is the safest thing to do to avoid breaking backwards
-    // compatibility in 2.8
-    if ( IsUNCPath(path, format) )
-    {
-        // remove one of the 2 leading backslashes to ensure that it's not
-        // recognized as an UNC path by SetPath()
-        wxString pathNonUNC(path, 1, wxString::npos);
-        SetPath(pathNonUNC, format);
-    }
-    else // no UNC complications
-    {
-        SetPath(path, format);
-    }
-
-    m_volume = volume;
-    m_ext = ext;
-    m_name = name;
-
-    m_hasExt = hasExt;
-}
-
-void wxFileName::SetPath( const wxString& pathOrig, wxPathFormat format )
-{
-    m_dirs.Clear();
-
-    if ( pathOrig.empty() )
-    {
-        // no path at all
-        m_relative = true;
-
-        return;
-    }
-
-    format = GetFormat( format );
-
-    // 0) deal with possible volume part first
-    wxString volume,
-             path;
-    SplitVolume(pathOrig, &volume, &path, format);
-    if ( !volume.empty() )
-    {
-        m_relative = false;
-
-        SetVolume(volume);
-    }
-
-    // 1) Determine if the path is relative or absolute.
-
-    if ( path.empty() )
-    {
-        // we had only the volume
-        return;
-    }
-
-    wxChar leadingChar = path[0u];
-
-    switch (format)
-    {
-        case wxPATH_MAC:
-            m_relative = leadingChar == wxT(':');
-
-            // We then remove a leading ":". The reason is in our
-            // storage form for relative paths:
-            // ":dir:file.txt" actually means "./dir/file.txt" in
-            // DOS notation and should get stored as
-            // (relative) (dir) (file.txt)
-            // "::dir:file.txt" actually means "../dir/file.txt"
-            // stored as (relative) (..) (dir) (file.txt)
-            // This is important only for the Mac as an empty dir
-            // actually means <UP>, whereas under DOS, double
-            // slashes can be ignored: "\\\\" is the same as "\\".
-            if (m_relative)
-                path.erase( 0, 1 );
-            break;
-
-        case wxPATH_VMS:
-            // TODO: what is the relative path format here?
-            m_relative = false;
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("Unknown path format") );
-            // !! Fall through !!
-
-        case wxPATH_UNIX:
-            m_relative = leadingChar != wxT('/');
-            break;
-
-        case wxPATH_DOS:
-            m_relative = !IsPathSeparator(leadingChar, format);
-            break;
-
-    }
-
-    // 2) Break up the path into its members. If the original path
-    //    was just "/" or "\\", m_dirs will be empty. We know from
-    //    the m_relative field, if this means "nothing" or "root dir".
-
-    wxStringTokenizer tn( path, GetPathSeparators(format) );
-
-    while ( tn.HasMoreTokens() )
-    {
-        wxString token = tn.GetNextToken();
-
-        // Remove empty token under DOS and Unix, interpret them
-        // as .. under Mac.
-        if (token.empty())
-        {
-            if (format == wxPATH_MAC)
-                m_dirs.Add( wxT("..") );
-            // else ignore
-        }
-        else
-        {
-           m_dirs.Add( token );
-        }
-    }
-}
-
-void wxFileName::Assign(const wxString& fullpath,
-                        wxPathFormat format)
-{
-    wxString volume, path, name, ext;
-    bool hasExt;
-    SplitPath(fullpath, &volume, &path, &name, &ext, &hasExt, format);
-
-    Assign(volume, path, name, ext, hasExt, format);
-}
-
-void wxFileName::Assign(const wxString& fullpathOrig,
-                        const wxString& fullname,
-                        wxPathFormat format)
-{
-    // always recognize fullpath as directory, even if it doesn't end with a
-    // slash
-    wxString fullpath = fullpathOrig;
-    if ( !fullpath.empty() && !wxEndsWithPathSeparator(fullpath) )
-    {
-        fullpath += GetPathSeparator(format);
-    }
-
-    wxString volume, path, name, ext;
-    bool hasExt;
-
-    // do some consistency checks: the name should be really just the filename
-    // and the path should be really just a path
-    wxString volDummy, pathDummy, nameDummy, extDummy;
-
-    SplitPath(fullname, &volDummy, &pathDummy, &name, &ext, &hasExt, format);
-
-    wxASSERT_MSG( volDummy.empty() && pathDummy.empty(),
-                  wxT("the file name shouldn't contain the path") );
-
-    SplitPath(fullpath, &volume, &path, &nameDummy, &extDummy, format);
-
-#ifndef __VMS
-   // This test makes no sense on an OpenVMS system.
-   wxASSERT_MSG( nameDummy.empty() && extDummy.empty(),
-                  wxT("the path shouldn't contain file name nor extension") );
-#endif
-    Assign(volume, path, name, ext, hasExt, format);
-}
-
-void wxFileName::Assign(const wxString& pathOrig,
-                        const wxString& name,
-                        const wxString& ext,
-                        wxPathFormat format)
-{
-    wxString volume,
-             path;
-    SplitVolume(pathOrig, &volume, &path, format);
-
-    Assign(volume, path, name, ext, format);
-}
-
-void wxFileName::AssignDir(const wxString& dir, wxPathFormat format)
-{
-    Assign(dir, wxEmptyString, format);
-}
-
-void wxFileName::Clear()
-{
-    m_dirs.Clear();
-
-    m_volume =
-    m_name =
-    m_ext = wxEmptyString;
-
-    // we don't have any absolute path for now
-    m_relative = true;
-
-    // nor any extension
-    m_hasExt = false;
-}
-
-/* static */
-wxFileName wxFileName::FileName(const wxString& file, wxPathFormat format)
-{
-    return wxFileName(file, format);
-}
-
-/* static */
-wxFileName wxFileName::DirName(const wxString& dir, wxPathFormat format)
-{
-    wxFileName fn;
-    fn.AssignDir(dir, format);
-    return fn;
-}
-
-// ----------------------------------------------------------------------------
-// existence tests
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// Flags for wxFileSystemObjectExists() asking it to check for:
-enum
-{
-    wxFileSystemObject_File  = 1,   // file existence
-    wxFileSystemObject_Dir   = 2,   // directory existence
-    wxFileSystemObject_Other = 4,   // existence of something else, e.g.
-                                    // device, socket, FIFO under Unix
-    wxFileSystemObject_Any   = 7    // existence of anything at all
-};
-
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-
-void RemoveTrailingSeparatorsFromPath(wxString& strPath)
-{
-    // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
-    // so remove all trailing backslashes from the path - but don't do this for
-    // the paths "d:\" (which are different from "d:"), for just "\" or for
-    // windows unique volume names ("\\?\Volume{GUID}\")
-    while ( wxEndsWithPathSeparator( strPath ) )
-    {
-        size_t len = strPath.length();
-        if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) ||
-                (len == wxMSWUniqueVolumePrefixLength &&
-                 wxFileName::IsMSWUniqueVolumeNamePath(strPath)))
-        {
-            break;
-        }
-
-        strPath.Truncate(len - 1);
-    }
-}
-
-#endif // __WINDOWS__ || __OS2__
-
-bool wxFileSystemObjectExists(const wxString& path, int flags)
-{
-    // Should the existence of file/directory with this name be accepted, i.e.
-    // result in the true return value from this function?
-    const bool acceptFile = (flags & wxFileSystemObject_File) != 0;
-    const bool acceptDir  = (flags & wxFileSystemObject_Dir) != 0;
-
-    wxString strPath(path);
-
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    if ( acceptDir )
-    {
-        // Ensure that the path doesn't have any trailing separators when
-        // checking for directories.
-        RemoveTrailingSeparatorsFromPath(strPath);
-    }
-
-    // we must use GetFileAttributes() instead of the ANSI C functions because
-    // it can cope with network (UNC) paths unlike them
-    DWORD ret = ::GetFileAttributes(path.t_str());
-
-    if ( ret == INVALID_FILE_ATTRIBUTES )
-        return false;
-
-    if ( ret & FILE_ATTRIBUTE_DIRECTORY )
-        return acceptDir;
-
-    // Anything else must be a file (perhaps we should check for
-    // FILE_ATTRIBUTE_REPARSE_POINT?)
-    return acceptFile;
-#elif defined(__OS2__)
-    if ( acceptDir )
-    {
-        // OS/2 can't handle "d:", it wants either "d:\" or "d:."
-        if (strPath.length() == 2 && strPath[1u] == wxT(':'))
-            strPath << wxT('.');
-    }
-
-    FILESTATUS3 Info = {{0}};
-    APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
-            (void*) &Info, sizeof(FILESTATUS3));
-
-    if ( rc == NO_ERROR )
-    {
-        if ( Info.attrFile & FILE_DIRECTORY )
-            return acceptDir;
-        else
-            return acceptFile;
-    }
-
-    // We consider that the path must exist if we get a sharing violation for
-    // it but we don't know what is it in this case.
-    if ( rc == ERROR_SHARING_VIOLATION )
-        return flags & wxFileSystemObject_Other;
-
-    // Any other error (usually ERROR_PATH_NOT_FOUND), means there is nothing
-    // there.
-    return false;
-#else // Non-MSW, non-OS/2
-    wxStructStat st;
-    if ( wxStat(strPath, &st) != 0 )
-        return false;
-
-    if ( S_ISREG(st.st_mode) )
-        return acceptFile;
-    if ( S_ISDIR(st.st_mode) )
-        return acceptDir;
-
-    return flags & wxFileSystemObject_Other;
-#endif // Platforms
-}
-
-} // anonymous namespace
-
-bool wxFileName::FileExists() const
-{
-    return wxFileName::FileExists( GetFullPath() );
-}
-
-/* static */
-bool wxFileName::FileExists( const wxString &filePath )
-{
-    return wxFileSystemObjectExists(filePath, wxFileSystemObject_File);
-}
-
-bool wxFileName::DirExists() const
-{
-    return wxFileName::DirExists( GetPath() );
-}
-
-/* static */
-bool wxFileName::DirExists( const wxString &dirPath )
-{
-    return wxFileSystemObjectExists(dirPath, wxFileSystemObject_Dir);
-}
-
-/* static */
-bool wxFileName::Exists(const wxString& path)
-{
-    return wxFileSystemObjectExists(path, wxFileSystemObject_Any);
-}
-
-// ----------------------------------------------------------------------------
-// CWD and HOME stuff
-// ----------------------------------------------------------------------------
-
-void wxFileName::AssignCwd(const wxString& volume)
-{
-    AssignDir(wxFileName::GetCwd(volume));
-}
-
-/* static */
-wxString wxFileName::GetCwd(const wxString& volume)
-{
-    // if we have the volume, we must get the current directory on this drive
-    // and to do this we have to chdir to this volume - at least under Windows,
-    // I don't know how to get the current drive on another volume elsewhere
-    // (TODO)
-    wxString cwdOld;
-    if ( !volume.empty() )
-    {
-        cwdOld = wxGetCwd();
-        SetCwd(volume + GetVolumeSeparator());
-    }
-
-    wxString cwd = ::wxGetCwd();
-
-    if ( !volume.empty() )
-    {
-        SetCwd(cwdOld);
-    }
-
-    return cwd;
-}
-
-bool wxFileName::SetCwd() const
-{
-    return wxFileName::SetCwd( GetPath() );
-}
-
-bool wxFileName::SetCwd( const wxString &cwd )
-{
-    return ::wxSetWorkingDirectory( cwd );
-}
-
-void wxFileName::AssignHomeDir()
-{
-    AssignDir(wxFileName::GetHomeDir());
-}
-
-wxString wxFileName::GetHomeDir()
-{
-    return ::wxGetHomeDir();
-}
-
-
-// ----------------------------------------------------------------------------
-// CreateTempFileName
-// ----------------------------------------------------------------------------
-
-#if wxUSE_FILE || wxUSE_FFILE
-
-
-#if !defined wx_fdopen && defined HAVE_FDOPEN
-    #define wx_fdopen fdopen
-#endif
-
-// NB: GetTempFileName() under Windows creates the file, so using
-//     O_EXCL there would fail
-#ifdef __WINDOWS__
-    #define wxOPEN_EXCL 0
-#else
-    #define wxOPEN_EXCL O_EXCL
-#endif
-
-
-#ifdef wxOpenOSFHandle
-#define WX_HAVE_DELETE_ON_CLOSE
-// On Windows create a file with the FILE_FLAGS_DELETE_ON_CLOSE flags.
-//
-static int wxOpenWithDeleteOnClose(const wxString& filename)
-{
-    DWORD access = GENERIC_READ | GENERIC_WRITE;
-
-    DWORD disposition = OPEN_ALWAYS;
-
-    DWORD attributes = FILE_ATTRIBUTE_TEMPORARY |
-                       FILE_FLAG_DELETE_ON_CLOSE;
-
-    HANDLE h = ::CreateFile(filename.t_str(), access, 0, NULL,
-                            disposition, attributes, NULL);
-
-    return wxOpenOSFHandle(h, wxO_BINARY);
-}
-#endif // wxOpenOSFHandle
-
-
-// Helper to open the file
-//
-static int wxTempOpen(const wxString& path, bool *deleteOnClose)
-{
-#ifdef WX_HAVE_DELETE_ON_CLOSE
-    if (*deleteOnClose)
-        return wxOpenWithDeleteOnClose(path);
-#endif
-
-    *deleteOnClose = false;
-
-    return wxOpen(path, wxO_BINARY | O_RDWR | O_CREAT | wxOPEN_EXCL, 0600);
-}
-
-
-#if wxUSE_FFILE
-// Helper to open the file and attach it to the wxFFile
-//
-static bool wxTempOpen(wxFFile *file, const wxString& path, bool *deleteOnClose)
-{
-#ifndef wx_fdopen
-    *deleteOnClose = false;
-    return file->Open(path, wxT("w+b"));
-#else // wx_fdopen
-    int fd = wxTempOpen(path, deleteOnClose);
-    if (fd == -1)
-        return false;
-    file->Attach(wx_fdopen(fd, "w+b"), path);
-    return file->IsOpened();
-#endif // wx_fdopen
-}
-#endif // wxUSE_FFILE
-
-
-#if !wxUSE_FILE
-    #define WXFILEARGS(x, y) y
-#elif !wxUSE_FFILE
-    #define WXFILEARGS(x, y) x
-#else
-    #define WXFILEARGS(x, y) x, y
-#endif
-
-
-// Implementation of wxFileName::CreateTempFileName().
-//
-static wxString wxCreateTempImpl(
-        const wxString& prefix,
-        WXFILEARGS(wxFile *fileTemp, wxFFile *ffileTemp),
-        bool *deleteOnClose = NULL)
-{
-#if wxUSE_FILE && wxUSE_FFILE
-    wxASSERT(fileTemp == NULL || ffileTemp == NULL);
-#endif
-    wxString path, dir, name;
-    bool wantDeleteOnClose = false;
-
-    if (deleteOnClose)
-    {
-        // set the result to false initially
-        wantDeleteOnClose = *deleteOnClose;
-        *deleteOnClose = false;
-    }
-    else
-    {
-        // easier if it alwasys points to something
-        deleteOnClose = &wantDeleteOnClose;
-    }
-
-    // use the directory specified by the prefix
-    wxFileName::SplitPath(prefix, &dir, &name, NULL /* extension */);
-
-    if (dir.empty())
-    {
-        dir = wxFileName::GetTempDir();
-    }
-
-#if defined(__WXWINCE__)
-    path = dir + wxT("\\") + name;
-    int i = 1;
-    while (wxFileName::FileExists(path))
-    {
-        path = dir + wxT("\\") + name ;
-        path << i;
-        i ++;
-    }
-
-#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    if (!::GetTempFileName(dir.t_str(), name.t_str(), 0,
-                           wxStringBuffer(path, MAX_PATH + 1)))
-    {
-        wxLogLastError(wxT("GetTempFileName"));
-
-        path.clear();
-    }
-
-#else // !Windows
-    path = dir;
-
-    if ( !wxEndsWithPathSeparator(dir) &&
-            (name.empty() || !wxIsPathSeparator(name[0u])) )
-    {
-        path += wxFILE_SEP_PATH;
-    }
-
-    path += name;
-
-#if defined(HAVE_MKSTEMP)
-    // scratch space for mkstemp()
-    path += wxT("XXXXXX");
-
-    // we need to copy the path to the buffer in which mkstemp() can modify it
-    wxCharBuffer buf(path.fn_str());
-
-    // cast is safe because the string length doesn't change
-    int fdTemp = mkstemp( (char*)(const char*) buf );
-    if ( fdTemp == -1 )
-    {
-        // this might be not necessary as mkstemp() on most systems should have
-        // already done it but it doesn't hurt neither...
-        path.clear();
-    }
-    else // mkstemp() succeeded
-    {
-        path = wxConvFile.cMB2WX( (const char*) buf );
-
-    #if wxUSE_FILE
-        // avoid leaking the fd
-        if ( fileTemp )
-        {
-            fileTemp->Attach(fdTemp);
-        }
-        else
-    #endif
-
-    #if wxUSE_FFILE
-        if ( ffileTemp )
-        {
-        #ifdef wx_fdopen
-            ffileTemp->Attach(wx_fdopen(fdTemp, "r+b"), path);
-        #else
-            ffileTemp->Open(path, wxT("r+b"));
-            close(fdTemp);
-        #endif
-        }
-        else
-    #endif
-
-        {
-            close(fdTemp);
-        }
-    }
-#else // !HAVE_MKSTEMP
-
-#ifdef HAVE_MKTEMP
-    // same as above
-    path += wxT("XXXXXX");
-
-    wxCharBuffer buf = wxConvFile.cWX2MB( path );
-    if ( !mktemp( (char*)(const char*) buf ) )
-    {
-        path.clear();
-    }
-    else
-    {
-        path = wxConvFile.cMB2WX( (const char*) buf );
-    }
-#else // !HAVE_MKTEMP (includes __DOS__)
-    // generate the unique file name ourselves
-    #if !defined(__DOS__)
-    path << (unsigned int)getpid();
-    #endif
-
-    wxString pathTry;
-
-    static const size_t numTries = 1000;
-    for ( size_t n = 0; n < numTries; n++ )
-    {
-        // 3 hex digits is enough for numTries == 1000 < 4096
-        pathTry = path + wxString::Format(wxT("%.03x"), (unsigned int) n);
-        if ( !wxFileName::FileExists(pathTry) )
-        {
-            break;
-        }
-
-        pathTry.clear();
-    }
-
-    path = pathTry;
-#endif // HAVE_MKTEMP/!HAVE_MKTEMP
-
-#endif // HAVE_MKSTEMP/!HAVE_MKSTEMP
-
-#endif // Windows/!Windows
-
-    if ( path.empty() )
-    {
-        wxLogSysError(_("Failed to create a temporary file name"));
-    }
-    else
-    {
-        bool ok = true;
-
-        // open the file - of course, there is a race condition here, this is
-        // why we always prefer using mkstemp()...
-    #if wxUSE_FILE
-        if ( fileTemp && !fileTemp->IsOpened() )
-        {
-            *deleteOnClose = wantDeleteOnClose;
-            int fd = wxTempOpen(path, deleteOnClose);
-            if (fd != -1)
-                fileTemp->Attach(fd);
-            else
-                ok = false;
-        }
-    #endif
-
-    #if wxUSE_FFILE
-        if ( ffileTemp && !ffileTemp->IsOpened() )
-        {
-            *deleteOnClose = wantDeleteOnClose;
-            ok = wxTempOpen(ffileTemp, path, deleteOnClose);
-        }
-    #endif
-
-        if ( !ok )
-        {
-            // FIXME: If !ok here should we loop and try again with another
-            //        file name?  That is the standard recourse if open(O_EXCL)
-            //        fails, though of course it should be protected against
-            //        possible infinite looping too.
-
-            wxLogError(_("Failed to open temporary file."));
-
-            path.clear();
-        }
-    }
-
-    return path;
-}
-
-
-static bool wxCreateTempImpl(
-        const wxString& prefix,
-        WXFILEARGS(wxFile *fileTemp, wxFFile *ffileTemp),
-        wxString *name)
-{
-    bool deleteOnClose = true;
-
-    *name = wxCreateTempImpl(prefix,
-                             WXFILEARGS(fileTemp, ffileTemp),
-                             &deleteOnClose);
-
-    bool ok = !name->empty();
-
-    if (deleteOnClose)
-        name->clear();
-#ifdef __UNIX__
-    else if (ok && wxRemoveFile(*name))
-        name->clear();
-#endif
-
-    return ok;
-}
-
-
-static void wxAssignTempImpl(
-        wxFileName *fn,
-        const wxString& prefix,
-        WXFILEARGS(wxFile *fileTemp, wxFFile *ffileTemp))
-{
-    wxString tempname;
-    tempname = wxCreateTempImpl(prefix, WXFILEARGS(fileTemp, ffileTemp));
-
-    if ( tempname.empty() )
-    {
-        // error, failed to get temp file name
-        fn->Clear();
-    }
-    else // ok
-    {
-        fn->Assign(tempname);
-    }
-}
-
-
-void wxFileName::AssignTempFileName(const wxString& prefix)
-{
-    wxAssignTempImpl(this, prefix, WXFILEARGS(NULL, NULL));
-}
-
-/* static */
-wxString wxFileName::CreateTempFileName(const wxString& prefix)
-{
-    return wxCreateTempImpl(prefix, WXFILEARGS(NULL, NULL));
-}
-
-#endif // wxUSE_FILE || wxUSE_FFILE
-
-
-#if wxUSE_FILE
-
-wxString wxCreateTempFileName(const wxString& prefix,
-                              wxFile *fileTemp,
-                              bool *deleteOnClose)
-{
-    return wxCreateTempImpl(prefix, WXFILEARGS(fileTemp, NULL), deleteOnClose);
-}
-
-bool wxCreateTempFile(const wxString& prefix,
-                      wxFile *fileTemp,
-                      wxString *name)
-{
-    return wxCreateTempImpl(prefix, WXFILEARGS(fileTemp, NULL), name);
-}
-
-void wxFileName::AssignTempFileName(const wxString& prefix, wxFile *fileTemp)
-{
-    wxAssignTempImpl(this, prefix, WXFILEARGS(fileTemp, NULL));
-}
-
-/* static */
-wxString
-wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
-{
-    return wxCreateTempFileName(prefix, fileTemp);
-}
-
-#endif // wxUSE_FILE
-
-
-#if wxUSE_FFILE
-
-wxString wxCreateTempFileName(const wxString& prefix,
-                              wxFFile *fileTemp,
-                              bool *deleteOnClose)
-{
-    return wxCreateTempImpl(prefix, WXFILEARGS(NULL, fileTemp), deleteOnClose);
-}
-
-bool wxCreateTempFile(const wxString& prefix,
-                      wxFFile *fileTemp,
-                      wxString *name)
-{
-    return wxCreateTempImpl(prefix, WXFILEARGS(NULL, fileTemp), name);
-
-}
-
-void wxFileName::AssignTempFileName(const wxString& prefix, wxFFile *fileTemp)
-{
-    wxAssignTempImpl(this, prefix, WXFILEARGS(NULL, fileTemp));
-}
-
-/* static */
-wxString
-wxFileName::CreateTempFileName(const wxString& prefix, wxFFile *fileTemp)
-{
-    return wxCreateTempFileName(prefix, fileTemp);
-}
-
-#endif // wxUSE_FFILE
-
-
-// ----------------------------------------------------------------------------
-// directory operations
-// ----------------------------------------------------------------------------
-
-// helper of GetTempDir(): check if the given directory exists and return it if
-// it does or an empty string otherwise
-namespace
-{
-
-wxString CheckIfDirExists(const wxString& dir)
-{
-    return wxFileName::DirExists(dir) ? dir : wxString();
-}
-
-} // anonymous namespace
-
-wxString wxFileName::GetTempDir()
-{
-    // first try getting it from environment: this allows overriding the values
-    // used by default if the user wants to create temporary files in another
-    // directory
-    wxString dir = CheckIfDirExists(wxGetenv("TMPDIR"));
-    if ( dir.empty() )
-    {
-        dir = CheckIfDirExists(wxGetenv("TMP"));
-        if ( dir.empty() )
-            dir = CheckIfDirExists(wxGetenv("TEMP"));
-    }
-
-    // if no environment variables are set, use the system default
-    if ( dir.empty() )
-    {
-#if defined(__WXWINCE__)
-        dir = CheckIfDirExists(wxT("\\temp"));
-#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-        if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) )
-        {
-            wxLogLastError(wxT("GetTempPath"));
-        }
-#elif defined(__WXMAC__) && wxOSX_USE_CARBON
-        dir = wxMacFindFolderNoSeparator(short(kOnSystemDisk), kTemporaryFolderType, kCreateFolder);
-#endif // systems with native way
-    }
-    else // we got directory from an environment variable
-    {
-        // remove any trailing path separators, we don't want to ever return
-        // them from this function for consistency
-        const size_t lastNonSep = dir.find_last_not_of(GetPathSeparators());
-        if ( lastNonSep == wxString::npos )
-        {
-            // the string consists entirely of separators, leave only one
-            dir = GetPathSeparator();
-        }
-        else
-        {
-            dir.erase(lastNonSep + 1);
-        }
-    }
-
-    // fall back to hard coded value
-    if ( dir.empty() )
-    {
-#ifdef __UNIX_LIKE__
-        dir = CheckIfDirExists("/tmp");
-        if ( dir.empty() )
-#endif // __UNIX_LIKE__
-            dir = ".";
-    }
-
-    return dir;
-}
-
-bool wxFileName::Mkdir( int perm, int flags ) const
-{
-    return wxFileName::Mkdir(GetPath(), perm, flags);
-}
-
-bool wxFileName::Mkdir( const wxString& dir, int perm, int flags )
-{
-    if ( flags & wxPATH_MKDIR_FULL )
-    {
-        // split the path in components
-        wxFileName filename;
-        filename.AssignDir(dir);
-
-        wxString currPath;
-        if ( filename.HasVolume())
-        {
-            currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE);
-        }
-
-        wxArrayString dirs = filename.GetDirs();
-        size_t count = dirs.GetCount();
-        for ( size_t i = 0; i < count; i++ )
-        {
-            if ( i > 0 || filename.IsAbsolute() )
-                currPath += wxFILE_SEP_PATH;
-            currPath += dirs[i];
-
-            if (!DirExists(currPath))
-            {
-                if (!wxMkdir(currPath, perm))
-                {
-                    // no need to try creating further directories
-                    return false;
-                }
-            }
-        }
-
-        return true;
-
-    }
-
-    return ::wxMkdir( dir, perm );
-}
-
-bool wxFileName::Rmdir(int flags) const
-{
-    return wxFileName::Rmdir( GetPath(), flags );
-}
-
-bool wxFileName::Rmdir(const wxString& dir, int flags)
-{
-#ifdef __WINDOWS__
-    if ( flags & wxPATH_RMDIR_RECURSIVE )
-    {
-        // SHFileOperation needs double null termination string
-        // but without separator at the end of the path
-        wxString path(dir);
-        if ( path.Last() == wxFILE_SEP_PATH )
-            path.RemoveLast();
-        path += wxT('\0');
-
-        SHFILEOPSTRUCT fileop;
-        wxZeroMemory(fileop);
-        fileop.wFunc = FO_DELETE;
-        fileop.pFrom = path.t_str();
-        fileop.fFlags = FOF_SILENT | FOF_NOCONFIRMATION;
-    #ifndef __WXWINCE__
-        // FOF_NOERRORUI is not defined in WinCE
-        fileop.fFlags |= FOF_NOERRORUI;
-    #endif
-
-        int ret = SHFileOperation(&fileop);
-        if ( ret != 0 )
-        {
-            // SHFileOperation may return non-Win32 error codes, so the error
-            // message can be incorrect
-            wxLogApiError(wxT("SHFileOperation"), ret);
-            return false;
-        }
-
-        return true;
-    }
-    else if ( flags & wxPATH_RMDIR_FULL )
-#else // !__WINDOWS__
-    if ( flags != 0 )   // wxPATH_RMDIR_FULL or wxPATH_RMDIR_RECURSIVE
-#endif // !__WINDOWS__
-    {
-        wxString path(dir);
-        if ( path.Last() != wxFILE_SEP_PATH )
-            path += wxFILE_SEP_PATH;
-
-        wxDir d(path);
-
-        if ( !d.IsOpened() )
-            return false;
-
-        wxString filename;
-
-        // first delete all subdirectories
-        bool cont = d.GetFirst(&filename, "", wxDIR_DIRS | wxDIR_HIDDEN);
-        while ( cont )
-        {
-            wxFileName::Rmdir(path + filename, flags);
-            cont = d.GetNext(&filename);
-        }
-
-#ifndef __WINDOWS__
-        if ( flags & wxPATH_RMDIR_RECURSIVE )
-        {
-            // delete all files too
-            cont = d.GetFirst(&filename, "", wxDIR_FILES | wxDIR_HIDDEN);
-            while ( cont )
-            {
-                ::wxRemoveFile(path + filename);
-                cont = d.GetNext(&filename);
-            }
-        }
-#endif // !__WINDOWS__
-    }
-
-    return ::wxRmdir(dir);
-}
-
-// ----------------------------------------------------------------------------
-// path normalization
-// ----------------------------------------------------------------------------
-
-bool wxFileName::Normalize(int flags,
-                           const wxString& cwd,
-                           wxPathFormat format)
-{
-    // deal with env vars renaming first as this may seriously change the path
-    if ( flags & wxPATH_NORM_ENV_VARS )
-    {
-        wxString pathOrig = GetFullPath(format);
-        wxString path = wxExpandEnvVars(pathOrig);
-        if ( path != pathOrig )
-        {
-            Assign(path);
-        }
-    }
-
-    // the existing path components
-    wxArrayString dirs = GetDirs();
-
-    // the path to prepend in front to make the path absolute
-    wxFileName curDir;
-
-    format = GetFormat(format);
-
-    // set up the directory to use for making the path absolute later
-    if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute(format) )
-    {
-        if ( cwd.empty() )
-        {
-            curDir.AssignCwd(GetVolume());
-        }
-        else // cwd provided
-        {
-            curDir.AssignDir(cwd);
-        }
-    }
-
-    // handle ~ stuff under Unix only
-    if ( (format == wxPATH_UNIX) && (flags & wxPATH_NORM_TILDE) && m_relative )
-    {
-        if ( !dirs.IsEmpty() )
-        {
-            wxString dir = dirs[0u];
-            if ( !dir.empty() && dir[0u] == wxT('~') )
-            {
-                // to make the path absolute use the home directory
-                curDir.AssignDir(wxGetUserHome(dir.c_str() + 1));
-                dirs.RemoveAt(0u);
-            }
-        }
-    }
-
-    // transform relative path into abs one
-    if ( curDir.IsOk() )
-    {
-        // this path may be relative because it doesn't have the volume name
-        // and still have m_relative=true; in this case we shouldn't modify
-        // our directory components but just set the current volume
-        if ( !HasVolume() && curDir.HasVolume() )
-        {
-            SetVolume(curDir.GetVolume());
-
-            if ( !m_relative )
-        {
-                // yes, it was the case - we don't need curDir then
-                curDir.Clear();
-            }
-        }
-
-        // finally, prepend curDir to the dirs array
-        wxArrayString dirsNew = curDir.GetDirs();
-        WX_PREPEND_ARRAY(dirs, dirsNew);
-
-        // if we used e.g. tilde expansion previously and wxGetUserHome didn't
-        // return for some reason an absolute path, then curDir maybe not be absolute!
-        if ( !curDir.m_relative )
-        {
-            // we have prepended an absolute path and thus we are now an absolute
-            // file name too
-            m_relative = false;
-        }
-        // else if (flags & wxPATH_NORM_ABSOLUTE):
-        //   should we warn the user that we didn't manage to make the path absolute?
-    }
-
-    // now deal with ".", ".." and the rest
-    m_dirs.Empty();
-    size_t count = dirs.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        wxString dir = dirs[n];
-
-        if ( flags & wxPATH_NORM_DOTS )
-        {
-            if ( dir == wxT(".") )
-            {
-                // just ignore
-                continue;
-            }
-
-            if ( dir == wxT("..") )
-            {
-                if ( m_dirs.empty() )
-                {
-                    // We have more ".." than directory components so far.
-                    // Don't treat this as an error as the path could have been
-                    // entered by user so try to handle it reasonably: if the
-                    // path is absolute, just ignore the extra ".." because
-                    // "/.." is the same as "/". Otherwise, i.e. for relative
-                    // paths, keep ".." unchanged because removing it would
-                    // modify the file a relative path refers to.
-                    if ( !m_relative )
-                        continue;
-
-                }
-                else // Normal case, go one step up.
-                {
-                    m_dirs.pop_back();
-                    continue;
-                }
-            }
-        }
-
-        m_dirs.Add(dir);
-    }
-
-#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
-    if ( (flags & wxPATH_NORM_SHORTCUT) )
-    {
-        wxString filename;
-        if (GetShortcutTarget(GetFullPath(format), filename))
-        {
-            m_relative = false;
-            Assign(filename);
-        }
-    }
-#endif
-
-#if defined(__WIN32__)
-    if ( (flags & wxPATH_NORM_LONG) && (format == wxPATH_DOS) )
-    {
-        Assign(GetLongPath());
-    }
-#endif // Win32
-
-    // Change case  (this should be kept at the end of the function, to ensure
-    // that the path doesn't change any more after we normalize its case)
-    if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) )
-    {
-        m_volume.MakeLower();
-        m_name.MakeLower();
-        m_ext.MakeLower();
-
-        // directory entries must be made lower case as well
-        count = m_dirs.GetCount();
-        for ( size_t i = 0; i < count; i++ )
-        {
-            m_dirs[i].MakeLower();
-        }
-    }
-
-    return true;
-}
-
-#ifndef __WXWINCE__
-bool wxFileName::ReplaceEnvVariable(const wxString& envname,
-                                    const wxString& replacementFmtString,
-                                    wxPathFormat format)
-{
-    // look into stringForm for the contents of the given environment variable
-    wxString val;
-    if (envname.empty() ||
-        !wxGetEnv(envname, &val))
-        return false;
-    if (val.empty())
-        return false;
-
-    wxString stringForm = GetPath(wxPATH_GET_VOLUME, format);
-        // do not touch the file name and the extension
-
-    wxString replacement = wxString::Format(replacementFmtString, envname);
-    stringForm.Replace(val, replacement);
-
-    // Now assign ourselves the modified path:
-    Assign(stringForm, GetFullName(), format);
-
-    return true;
-}
-#endif
-
-bool wxFileName::ReplaceHomeDir(wxPathFormat format)
-{
-    wxString homedir = wxGetHomeDir();
-    if (homedir.empty())
-        return false;
-
-    wxString stringForm = GetPath(wxPATH_GET_VOLUME, format);
-        // do not touch the file name and the extension
-
-    stringForm.Replace(homedir, "~");
-
-    // Now assign ourselves the modified path:
-    Assign(stringForm, GetFullName(), format);
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// get the shortcut target
-// ----------------------------------------------------------------------------
-
-// WinCE (3) doesn't have CLSID_ShellLink, IID_IShellLink definitions.
-// The .lnk file is a plain text file so it should be easy to
-// make it work. Hint from Google Groups:
-// "If you open up a lnk file, you'll see a
-// number, followed by a pound sign (#), followed by more text. The
-// number is the number of characters that follows the pound sign. The
-// characters after the pound sign are the command line (which _can_
-// include arguments) to be executed. Any path (e.g. \windows\program
-// files\myapp.exe) that includes spaces needs to be enclosed in
-// quotation marks."
-
-#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
-// The following lines are necessary under WinCE
-// #include "wx/msw/private.h"
-// #include <ole2.h>
-#include <shlobj.h>
-#if defined(__WXWINCE__)
-#include <shlguid.h>
-#endif
-
-bool wxFileName::GetShortcutTarget(const wxString& shortcutPath,
-                                   wxString& targetFilename,
-                                   wxString* arguments) const
-{
-    wxString path, file, ext;
-    wxFileName::SplitPath(shortcutPath, & path, & file, & ext);
-
-    HRESULT hres;
-    IShellLink* psl;
-    bool success = false;
-
-    // Assume it's not a shortcut if it doesn't end with lnk
-    if (ext.CmpNoCase(wxT("lnk"))!=0)
-        return false;
-
-    // create a ShellLink object
-    hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
-                            IID_IShellLink, (LPVOID*) &psl);
-
-    if (SUCCEEDED(hres))
-    {
-        IPersistFile* ppf;
-        hres = psl->QueryInterface( IID_IPersistFile, (LPVOID *) &ppf);
-        if (SUCCEEDED(hres))
-        {
-            WCHAR wsz[MAX_PATH];
-
-            MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, shortcutPath.mb_str(), -1, wsz,
-                                MAX_PATH);
-
-            hres = ppf->Load(wsz, 0);
-            ppf->Release();
-
-            if (SUCCEEDED(hres))
-            {
-                wxChar buf[2048];
-                // Wrong prototype in early versions
-#if defined(__MINGW32__) && !wxCHECK_W32API_VERSION(2, 2)
-                psl->GetPath((CHAR*) buf, 2048, NULL, SLGP_UNCPRIORITY);
-#else
-                psl->GetPath(buf, 2048, NULL, SLGP_UNCPRIORITY);
-#endif
-                targetFilename = wxString(buf);
-                success = (shortcutPath != targetFilename);
-
-                psl->GetArguments(buf, 2048);
-                wxString args(buf);
-                if (!args.empty() && arguments)
-                {
-                    *arguments = args;
-                }
-            }
-        }
-
-        psl->Release();
-    }
-    return success;
-}
-
-#endif // __WIN32__ && !__WXWINCE__
-
-
-// ----------------------------------------------------------------------------
-// absolute/relative paths
-// ----------------------------------------------------------------------------
-
-bool wxFileName::IsAbsolute(wxPathFormat format) const
-{
-    // unix paths beginning with ~ are reported as being absolute
-    if ( format == wxPATH_UNIX )
-    {
-        if ( !m_dirs.IsEmpty() )
-        {
-            wxString dir = m_dirs[0u];
-
-            if (!dir.empty() && dir[0u] == wxT('~'))
-                return true;
-        }
-    }
-
-    // if our path doesn't start with a path separator, it's not an absolute
-    // path
-    if ( m_relative )
-        return false;
-
-    if ( !GetVolumeSeparator(format).empty() )
-    {
-        // this format has volumes and an absolute path must have one, it's not
-        // enough to have the full path to be an absolute file under Windows
-        if ( GetVolume().empty() )
-            return false;
-    }
-
-    return true;
-}
-
-bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
-{
-    wxFileName fnBase = wxFileName::DirName(pathBase, format);
-
-    // get cwd only once - small time saving
-    wxString cwd = wxGetCwd();
-    Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
-    fnBase.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
-
-    bool withCase = IsCaseSensitive(format);
-
-    // we can't do anything if the files live on different volumes
-    if ( !GetVolume().IsSameAs(fnBase.GetVolume(), withCase) )
-    {
-        // nothing done
-        return false;
-    }
-
-    // same drive, so we don't need our volume
-    m_volume.clear();
-
-    // remove common directories starting at the top
-    while ( !m_dirs.IsEmpty() && !fnBase.m_dirs.IsEmpty() &&
-                m_dirs[0u].IsSameAs(fnBase.m_dirs[0u], withCase) )
-    {
-        m_dirs.RemoveAt(0);
-        fnBase.m_dirs.RemoveAt(0);
-    }
-
-    // add as many ".." as needed
-    size_t count = fnBase.m_dirs.GetCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        m_dirs.Insert(wxT(".."), 0u);
-    }
-
-    if ( format == wxPATH_UNIX || format == wxPATH_DOS )
-    {
-        // a directory made relative with respect to itself is '.' under Unix
-        // and DOS, by definition (but we don't have to insert "./" for the
-        // files)
-        if ( m_dirs.IsEmpty() && IsDir() )
-        {
-            m_dirs.Add(wxT('.'));
-        }
-    }
-
-    m_relative = true;
-
-    // we were modified
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// filename kind tests
-// ----------------------------------------------------------------------------
-
-bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const
-{
-    wxFileName fn1 = *this,
-               fn2 = filepath;
-
-    // get cwd only once - small time saving
-    wxString cwd = wxGetCwd();
-    fn1.Normalize(wxPATH_NORM_ALL | wxPATH_NORM_CASE, cwd, format);
-    fn2.Normalize(wxPATH_NORM_ALL | wxPATH_NORM_CASE, cwd, format);
-
-    if ( fn1.GetFullPath() == fn2.GetFullPath() )
-        return true;
-
-#if defined(__UNIX__)
-    wxStructStat st1, st2;
-    if ( wxStat(fn1.GetFullPath(), &st1) == 0 &&
-            wxStat(fn2.GetFullPath(), &st2) == 0 )
-    {
-        if ( st1.st_ino == st2.st_ino && st1.st_dev == st2.st_dev )
-            return true;
-    }
-    //else: It's not an error if one or both files don't exist.
-#endif // defined __UNIX__
-
-    return false;
-}
-
-/* static */
-bool wxFileName::IsCaseSensitive( wxPathFormat format )
-{
-    // only Unix filenames are truly case-sensitive
-    return GetFormat(format) == wxPATH_UNIX;
-}
-
-/* static */
-wxString wxFileName::GetForbiddenChars(wxPathFormat format)
-{
-    // Inits to forbidden characters that are common to (almost) all platforms.
-    wxString strForbiddenChars = wxT("*?");
-
-    // If asserts, wxPathFormat has been changed. In case of a new path format
-    // addition, the following code might have to be updated.
-    wxCOMPILE_TIME_ASSERT(wxPATH_MAX == 5, wxPathFormatChanged);
-    switch ( GetFormat(format) )
-    {
-        default :
-            wxFAIL_MSG( wxT("Unknown path format") );
-            // !! Fall through !!
-
-        case wxPATH_UNIX:
-            break;
-
-        case wxPATH_MAC:
-            // On a Mac even names with * and ? are allowed (Tested with OS
-            // 9.2.1 and OS X 10.2.5)
-            strForbiddenChars = wxEmptyString;
-            break;
-
-        case wxPATH_DOS:
-            strForbiddenChars += wxT("\\/:\"<>|");
-            break;
-
-        case wxPATH_VMS:
-            break;
-    }
-
-    return strForbiddenChars;
-}
-
-/* static */
-wxString wxFileName::GetVolumeSeparator(wxPathFormat WXUNUSED_IN_WINCE(format))
-{
-#ifdef __WXWINCE__
-    return wxEmptyString;
-#else
-    wxString sepVol;
-
-    if ( (GetFormat(format) == wxPATH_DOS) ||
-         (GetFormat(format) == wxPATH_VMS) )
-    {
-        sepVol = wxFILE_SEP_DSK;
-    }
-    //else: leave empty
-
-    return sepVol;
-#endif
-}
-
-/* static */
-wxString wxFileName::GetPathSeparators(wxPathFormat format)
-{
-    wxString seps;
-    switch ( GetFormat(format) )
-    {
-        case wxPATH_DOS:
-            // accept both as native APIs do but put the native one first as
-            // this is the one we use in GetFullPath()
-            seps << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_UNIX;
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("Unknown wxPATH_XXX style") );
-            // fall through
-
-        case wxPATH_UNIX:
-            seps = wxFILE_SEP_PATH_UNIX;
-            break;
-
-        case wxPATH_MAC:
-            seps = wxFILE_SEP_PATH_MAC;
-            break;
-
-        case wxPATH_VMS:
-            seps = wxFILE_SEP_PATH_VMS;
-            break;
-    }
-
-    return seps;
-}
-
-/* static */
-wxString wxFileName::GetPathTerminators(wxPathFormat format)
-{
-    format = GetFormat(format);
-
-    // under VMS the end of the path is ']', not the path separator used to
-    // separate the components
-    return format == wxPATH_VMS ? wxString(wxT(']')) : GetPathSeparators(format);
-}
-
-/* static */
-bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format)
-{
-    // wxString::Find() doesn't work as expected with NUL - it will always find
-    // it, so test for it separately
-    return ch != wxT('\0') && GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
-}
-
-/* static */
-bool
-wxFileName::IsMSWUniqueVolumeNamePath(const wxString& path, wxPathFormat format)
-{
-    // return true if the format used is the DOS/Windows one and the string begins
-    // with a Windows unique volume name ("\\?\Volume{guid}\")
-    return format == wxPATH_DOS &&
-            path.length() >= wxMSWUniqueVolumePrefixLength &&
-             path.StartsWith(wxS("\\\\?\\Volume{")) &&
-              path[wxMSWUniqueVolumePrefixLength - 1] == wxFILE_SEP_PATH_DOS;
-}
-
-// ----------------------------------------------------------------------------
-// path components manipulation
-// ----------------------------------------------------------------------------
-
-/* static */ bool wxFileName::IsValidDirComponent(const wxString& dir)
-{
-    if ( dir.empty() )
-    {
-        wxFAIL_MSG( wxT("empty directory passed to wxFileName::InsertDir()") );
-
-        return false;
-    }
-
-    const size_t len = dir.length();
-    for ( size_t n = 0; n < len; n++ )
-    {
-        if ( dir[n] == GetVolumeSeparator() || IsPathSeparator(dir[n]) )
-        {
-            wxFAIL_MSG( wxT("invalid directory component in wxFileName") );
-
-            return false;
-        }
-    }
-
-    return true;
-}
-
-void wxFileName::AppendDir( const wxString& dir )
-{
-    if ( IsValidDirComponent(dir) )
-        m_dirs.Add( dir );
-}
-
-void wxFileName::PrependDir( const wxString& dir )
-{
-    InsertDir(0, dir);
-}
-
-void wxFileName::InsertDir(size_t before, const wxString& dir)
-{
-    if ( IsValidDirComponent(dir) )
-        m_dirs.Insert(dir, before);
-}
-
-void wxFileName::RemoveDir(size_t pos)
-{
-    m_dirs.RemoveAt(pos);
-}
-
-// ----------------------------------------------------------------------------
-// accessors
-// ----------------------------------------------------------------------------
-
-void wxFileName::SetFullName(const wxString& fullname)
-{
-    SplitPath(fullname, NULL /* no volume */, NULL /* no path */,
-                        &m_name, &m_ext, &m_hasExt);
-}
-
-wxString wxFileName::GetFullName() const
-{
-    wxString fullname = m_name;
-    if ( m_hasExt )
-    {
-        fullname << wxFILE_SEP_EXT << m_ext;
-    }
-
-    return fullname;
-}
-
-wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
-{
-    format = GetFormat( format );
-
-    wxString fullpath;
-
-    // return the volume with the path as well if requested
-    if ( flags & wxPATH_GET_VOLUME )
-    {
-        fullpath += wxGetVolumeString(GetVolume(), format);
-    }
-
-    // the leading character
-    switch ( format )
-    {
-        case wxPATH_MAC:
-            if ( m_relative )
-                fullpath += wxFILE_SEP_PATH_MAC;
-            break;
-
-        case wxPATH_DOS:
-            if ( !m_relative )
-                fullpath += wxFILE_SEP_PATH_DOS;
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("Unknown path format") );
-            // fall through
-
-        case wxPATH_UNIX:
-            if ( !m_relative )
-            {
-                fullpath += wxFILE_SEP_PATH_UNIX;
-            }
-            break;
-
-        case wxPATH_VMS:
-            // no leading character here but use this place to unset
-            // wxPATH_GET_SEPARATOR flag: under VMS it doesn't make sense
-            // as, if I understand correctly, there should never be a dot
-            // before the closing bracket
-            flags &= ~wxPATH_GET_SEPARATOR;
-    }
-
-    if ( m_dirs.empty() )
-    {
-        // there is nothing more
-        return fullpath;
-    }
-
-    // then concatenate all the path components using the path separator
-    if ( format == wxPATH_VMS )
-    {
-        fullpath += wxT('[');
-    }
-
-    const size_t dirCount = m_dirs.GetCount();
-    for ( size_t i = 0; i < dirCount; i++ )
-    {
-        switch (format)
-        {
-            case wxPATH_MAC:
-                if ( m_dirs[i] == wxT(".") )
-                {
-                    // skip appending ':', this shouldn't be done in this
-                    // case as "::" is interpreted as ".." under Unix
-                    continue;
-                }
-
-                // convert back from ".." to nothing
-                if ( !m_dirs[i].IsSameAs(wxT("..")) )
-                     fullpath += m_dirs[i];
-                break;
-
-            default:
-                wxFAIL_MSG( wxT("Unexpected path format") );
-                // still fall through
-
-            case wxPATH_DOS:
-            case wxPATH_UNIX:
-                fullpath += m_dirs[i];
-                break;
-
-            case wxPATH_VMS:
-                // TODO: What to do with ".." under VMS
-
-                // convert back from ".." to nothing
-                if ( !m_dirs[i].IsSameAs(wxT("..")) )
-                    fullpath += m_dirs[i];
-                break;
-        }
-
-        if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) )
-            fullpath += GetPathSeparator(format);
-    }
-
-    if ( format == wxPATH_VMS )
-    {
-        fullpath += wxT(']');
-    }
-
-    return fullpath;
-}
-
-wxString wxFileName::GetFullPath( wxPathFormat format ) const
-{
-    // we already have a function to get the path
-    wxString fullpath = GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR,
-                                format);
-
-    // now just add the file name and extension to it
-    fullpath += GetFullName();
-
-    return fullpath;
-}
-
-// Return the short form of the path (returns identity on non-Windows platforms)
-wxString wxFileName::GetShortPath() const
-{
-    wxString path(GetFullPath());
-
-#if defined(__WINDOWS__) && defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-    DWORD sz = ::GetShortPathName(path.t_str(), NULL, 0);
-    if ( sz != 0 )
-    {
-        wxString pathOut;
-        if ( ::GetShortPathName
-               (
-                path.t_str(),
-                wxStringBuffer(pathOut, sz),
-                sz
-               ) != 0 )
-        {
-            return pathOut;
-        }
-    }
-#endif // Windows
-
-    return path;
-}
-
-// Return the long form of the path (returns identity on non-Windows platforms)
-wxString wxFileName::GetLongPath() const
-{
-    wxString pathOut,
-             path = GetFullPath();
-
-#if defined(__WIN32__) && !defined(__WXWINCE__) && !defined(__WXMICROWIN__)
-
-#if wxUSE_DYNLIB_CLASS
-    typedef DWORD (WINAPI *GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
-
-    // this is MT-safe as in the worst case we're going to resolve the function
-    // twice -- but as the result is the same in both threads, it's ok
-    static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
-    if ( !s_pfnGetLongPathName )
-    {
-        static bool s_triedToLoad = false;
-
-        if ( !s_triedToLoad )
-        {
-            s_triedToLoad = true;
-
-            wxDynamicLibrary dllKernel(wxT("kernel32"));
-
-            const wxChar* GetLongPathName = wxT("GetLongPathName")
-#if wxUSE_UNICODE
-                              wxT("W");
-#else // ANSI
-                              wxT("A");
-#endif // Unicode/ANSI
-
-            if ( dllKernel.HasSymbol(GetLongPathName) )
-            {
-                s_pfnGetLongPathName = (GET_LONG_PATH_NAME)
-                    dllKernel.GetSymbol(GetLongPathName);
-            }
-
-            // note that kernel32.dll can be unloaded, it stays in memory
-            // anyhow as all Win32 programs link to it and so it's safe to call
-            // GetLongPathName() even after unloading it
-        }
-    }
-
-    if ( s_pfnGetLongPathName )
-    {
-        DWORD dwSize = (*s_pfnGetLongPathName)(path.t_str(), NULL, 0);
-        if ( dwSize > 0 )
-        {
-            if ( (*s_pfnGetLongPathName)
-                 (
-                  path.t_str(),
-                  wxStringBuffer(pathOut, dwSize),
-                  dwSize
-                 ) != 0 )
-            {
-                return pathOut;
-            }
-        }
-    }
-#endif // wxUSE_DYNLIB_CLASS
-
-    // The OS didn't support GetLongPathName, or some other error.
-    // We need to call FindFirstFile on each component in turn.
-
-    WIN32_FIND_DATA findFileData;
-    HANDLE hFind;
-
-    if ( HasVolume() )
-        pathOut = GetVolume() +
-                  GetVolumeSeparator(wxPATH_DOS) +
-                  GetPathSeparator(wxPATH_DOS);
-    else
-        pathOut = wxEmptyString;
-
-    wxArrayString dirs = GetDirs();
-    dirs.Add(GetFullName());
-
-    wxString tmpPath;
-
-    size_t count = dirs.GetCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        const wxString& dir = dirs[i];
-
-        // We're using pathOut to collect the long-name path, but using a
-        // temporary for appending the last path component which may be
-        // short-name
-        tmpPath = pathOut + dir;
-
-        // We must not process "." or ".." here as they would be (unexpectedly)
-        // replaced by the corresponding directory names so just leave them
-        // alone
-        //
-        // And we can't pass a drive and root dir to FindFirstFile (VZ: why?)
-        if ( tmpPath.empty() || dir == '.' || dir == ".." ||
-                tmpPath.Last() == GetVolumeSeparator(wxPATH_DOS) )
-        {
-            tmpPath += wxFILE_SEP_PATH;
-            pathOut = tmpPath;
-            continue;
-        }
-
-        hFind = ::FindFirstFile(tmpPath.t_str(), &findFileData);
-        if (hFind == INVALID_HANDLE_VALUE)
-        {
-            // Error: most likely reason is that path doesn't exist, so
-            // append any unprocessed parts and return
-            for ( i += 1; i < count; i++ )
-                tmpPath += wxFILE_SEP_PATH + dirs[i];
-
-            return tmpPath;
-        }
-
-        pathOut += findFileData.cFileName;
-        if ( (i < (count-1)) )
-            pathOut += wxFILE_SEP_PATH;
-
-        ::FindClose(hFind);
-    }
-#else // !Win32
-    pathOut = path;
-#endif // Win32/!Win32
-
-    return pathOut;
-}
-
-wxPathFormat wxFileName::GetFormat( wxPathFormat format )
-{
-    if (format == wxPATH_NATIVE)
-    {
-#if defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__)
-        format = wxPATH_DOS;
-#elif defined(__VMS)
-        format = wxPATH_VMS;
-#else
-        format = wxPATH_UNIX;
-#endif
-    }
-    return format;
-}
-
-#ifdef wxHAS_FILESYSTEM_VOLUMES
-
-/* static */
-wxString wxFileName::GetVolumeString(char drive, int flags)
-{
-    wxASSERT_MSG( !(flags & ~wxPATH_GET_SEPARATOR), "invalid flag specified" );
-
-    wxString vol(drive);
-    vol += wxFILE_SEP_DSK;
-    if ( flags & wxPATH_GET_SEPARATOR )
-        vol += wxFILE_SEP_PATH;
-
-    return vol;
-}
-
-#endif // wxHAS_FILESYSTEM_VOLUMES
-
-// ----------------------------------------------------------------------------
-// path splitting function
-// ----------------------------------------------------------------------------
-
-/* static */
-void
-wxFileName::SplitVolume(const wxString& fullpathWithVolume,
-                        wxString *pstrVolume,
-                        wxString *pstrPath,
-                        wxPathFormat format)
-{
-    format = GetFormat(format);
-
-    wxString fullpath = fullpathWithVolume;
-
-    if ( IsMSWUniqueVolumeNamePath(fullpath, format) )
-    {
-        // special Windows unique volume names hack: transform
-        // \\?\Volume{guid}\path into Volume{guid}:path
-        // note: this check must be done before the check for UNC path
-
-        // we know the last backslash from the unique volume name is located
-        // there from IsMSWUniqueVolumeNamePath
-        fullpath[wxMSWUniqueVolumePrefixLength - 1] = wxFILE_SEP_DSK;
-
-        // paths starting with a unique volume name should always be absolute
-        fullpath.insert(wxMSWUniqueVolumePrefixLength, 1, wxFILE_SEP_PATH_DOS);
-
-        // remove the leading "\\?\" part
-        fullpath.erase(0, 4);
-    }
-    else if ( IsUNCPath(fullpath, format) )
-    {
-        // special Windows UNC paths hack: transform \\share\path into share:path
-
-        fullpath.erase(0, 2);
-
-        size_t posFirstSlash =
-            fullpath.find_first_of(GetPathTerminators(format));
-        if ( posFirstSlash != wxString::npos )
-        {
-            fullpath[posFirstSlash] = wxFILE_SEP_DSK;
-
-            // UNC paths are always absolute, right? (FIXME)
-            fullpath.insert(posFirstSlash + 1, 1, wxFILE_SEP_PATH_DOS);
-        }
-    }
-
-    // We separate the volume here
-    if ( format == wxPATH_DOS || format == wxPATH_VMS )
-    {
-        wxString sepVol = GetVolumeSeparator(format);
-
-        // we have to exclude the case of a colon in the very beginning of the
-        // string as it can't be a volume separator (nor can this be a valid
-        // DOS file name at all but we'll leave dealing with this to our caller)
-        size_t posFirstColon = fullpath.find_first_of(sepVol);
-        if ( posFirstColon && posFirstColon != wxString::npos )
-        {
-            if ( pstrVolume )
-            {
-                *pstrVolume = fullpath.Left(posFirstColon);
-            }
-
-            // remove the volume name and the separator from the full path
-            fullpath.erase(0, posFirstColon + sepVol.length());
-        }
-    }
-
-    if ( pstrPath )
-        *pstrPath = fullpath;
-}
-
-/* static */
-void wxFileName::SplitPath(const wxString& fullpathWithVolume,
-                           wxString *pstrVolume,
-                           wxString *pstrPath,
-                           wxString *pstrName,
-                           wxString *pstrExt,
-                           bool *hasExt,
-                           wxPathFormat format)
-{
-    format = GetFormat(format);
-
-    wxString fullpath;
-    SplitVolume(fullpathWithVolume, pstrVolume, &fullpath, format);
-
-    // find the positions of the last dot and last path separator in the path
-    size_t posLastDot = fullpath.find_last_of(wxFILE_SEP_EXT);
-    size_t posLastSlash = fullpath.find_last_of(GetPathTerminators(format));
-
-    // check whether this dot occurs at the very beginning of a path component
-    if ( (posLastDot != wxString::npos) &&
-         (posLastDot == 0 ||
-            IsPathSeparator(fullpath[posLastDot - 1]) ||
-            (format == wxPATH_VMS && fullpath[posLastDot - 1] == wxT(']'))) )
-    {
-        // dot may be (and commonly -- at least under Unix -- is) the first
-        // character of the filename, don't treat the entire filename as
-        // extension in this case
-        posLastDot = wxString::npos;
-    }
-
-    // if we do have a dot and a slash, check that the dot is in the name part
-    if ( (posLastDot != wxString::npos) &&
-         (posLastSlash != wxString::npos) &&
-         (posLastDot < posLastSlash) )
-    {
-        // the dot is part of the path, not the start of the extension
-        posLastDot = wxString::npos;
-    }
-
-    // now fill in the variables provided by user
-    if ( pstrPath )
-    {
-        if ( posLastSlash == wxString::npos )
-        {
-            // no path at all
-            pstrPath->Empty();
-        }
-        else
-        {
-            // take everything up to the path separator but take care to make
-            // the path equal to something like '/', not empty, for the files
-            // immediately under root directory
-            size_t len = posLastSlash;
-
-            // this rule does not apply to mac since we do not start with colons (sep)
-            // except for relative paths
-            if ( !len && format != wxPATH_MAC)
-                len++;
-
-            *pstrPath = fullpath.Left(len);
-
-            // special VMS hack: remove the initial bracket
-            if ( format == wxPATH_VMS )
-            {
-                if ( (*pstrPath)[0u] == wxT('[') )
-                    pstrPath->erase(0, 1);
-            }
-        }
-    }
-
-    if ( pstrName )
-    {
-        // take all characters starting from the one after the last slash and
-        // up to, but excluding, the last dot
-        size_t nStart = posLastSlash == wxString::npos ? 0 : posLastSlash + 1;
-        size_t count;
-        if ( posLastDot == wxString::npos )
-        {
-            // take all until the end
-            count = wxString::npos;
-        }
-        else if ( posLastSlash == wxString::npos )
-        {
-            count = posLastDot;
-        }
-        else // have both dot and slash
-        {
-            count = posLastDot - posLastSlash - 1;
-        }
-
-        *pstrName = fullpath.Mid(nStart, count);
-    }
-
-    // finally deal with the extension here: we have an added complication that
-    // extension may be empty (but present) as in "foo." where trailing dot
-    // indicates the empty extension at the end -- and hence we must remember
-    // that we have it independently of pstrExt
-    if ( posLastDot == wxString::npos )
-    {
-        // no extension
-        if ( pstrExt )
-            pstrExt->clear();
-        if ( hasExt )
-            *hasExt = false;
-    }
-    else
-    {
-        // take everything after the dot
-        if ( pstrExt )
-            *pstrExt = fullpath.Mid(posLastDot + 1);
-        if ( hasExt )
-            *hasExt = true;
-    }
-}
-
-/* static */
-void wxFileName::SplitPath(const wxString& fullpath,
-                           wxString *path,
-                           wxString *name,
-                           wxString *ext,
-                           wxPathFormat format)
-{
-    wxString volume;
-    SplitPath(fullpath, &volume, path, name, ext, format);
-
-    if ( path )
-    {
-        path->Prepend(wxGetVolumeString(volume, format));
-    }
-}
-
-/* static */
-wxString wxFileName::StripExtension(const wxString& fullpath)
-{
-    wxFileName fn(fullpath);
-    fn.SetExt("");
-    return fn.GetFullPath();
-}
-
-// ----------------------------------------------------------------------------
-// time functions
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DATETIME
-
-bool wxFileName::SetTimes(const wxDateTime *dtAccess,
-                          const wxDateTime *dtMod,
-                          const wxDateTime *dtCreate) const
-{
-#if defined(__WIN32__)
-    FILETIME ftAccess, ftCreate, ftWrite;
-
-    if ( dtCreate )
-        ConvertWxToFileTime(&ftCreate, *dtCreate);
-    if ( dtAccess )
-        ConvertWxToFileTime(&ftAccess, *dtAccess);
-    if ( dtMod )
-        ConvertWxToFileTime(&ftWrite, *dtMod);
-
-    wxString path;
-    int flags;
-    if ( IsDir() )
-    {
-        if ( wxGetOsVersion() == wxOS_WINDOWS_9X )
-        {
-            wxLogError(_("Setting directory access times is not supported "
-                         "under this OS version"));
-            return false;
-        }
-
-        path = GetPath();
-        flags = FILE_FLAG_BACKUP_SEMANTICS;
-    }
-    else // file
-    {
-        path = GetFullPath();
-        flags = 0;
-    }
-
-    wxFileHandle fh(path, wxFileHandle::WriteAttr, flags);
-    if ( fh.IsOk() )
-    {
-        if ( ::SetFileTime(fh,
-                           dtCreate ? &ftCreate : NULL,
-                           dtAccess ? &ftAccess : NULL,
-                           dtMod ? &ftWrite : NULL) )
-        {
-            return true;
-        }
-    }
-#elif defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__))
-    wxUnusedVar(dtCreate);
-
-    if ( !dtAccess && !dtMod )
-    {
-        // can't modify the creation time anyhow, don't try
-        return true;
-    }
-
-    // if dtAccess or dtMod is not specified, use the other one (which must be
-    // non NULL because of the test above) for both times
-    utimbuf utm;
-    utm.actime = dtAccess ? dtAccess->GetTicks() : dtMod->GetTicks();
-    utm.modtime = dtMod ? dtMod->GetTicks() : dtAccess->GetTicks();
-    if ( utime(GetFullPath().fn_str(), &utm) == 0 )
-    {
-        return true;
-    }
-#else // other platform
-    wxUnusedVar(dtAccess);
-    wxUnusedVar(dtMod);
-    wxUnusedVar(dtCreate);
-#endif // platforms
-
-    wxLogSysError(_("Failed to modify file times for '%s'"),
-                  GetFullPath().c_str());
-
-    return false;
-}
-
-bool wxFileName::Touch() const
-{
-#if defined(__UNIX_LIKE__)
-    // under Unix touching file is simple: just pass NULL to utime()
-    if ( utime(GetFullPath().fn_str(), NULL) == 0 )
-    {
-        return true;
-    }
-
-    wxLogSysError(_("Failed to touch the file '%s'"), GetFullPath().c_str());
-
-    return false;
-#else // other platform
-    wxDateTime dtNow = wxDateTime::Now();
-
-    return SetTimes(&dtNow, &dtNow, NULL /* don't change create time */);
-#endif // platforms
-}
-
-bool wxFileName::GetTimes(wxDateTime *dtAccess,
-                          wxDateTime *dtMod,
-                          wxDateTime *dtCreate) const
-{
-#if defined(__WIN32__)
-    // we must use different methods for the files and directories under
-    // Windows as CreateFile(GENERIC_READ) doesn't work for the directories and
-    // CreateFile(FILE_FLAG_BACKUP_SEMANTICS) works -- but only under NT and
-    // not 9x
-    bool ok;
-    FILETIME ftAccess, ftCreate, ftWrite;
-    if ( IsDir() )
-    {
-        // implemented in msw/dir.cpp
-        extern bool wxGetDirectoryTimes(const wxString& dirname,
-                                        FILETIME *, FILETIME *, FILETIME *);
-
-        // we should pass the path without the trailing separator to
-        // wxGetDirectoryTimes()
-        ok = wxGetDirectoryTimes(GetPath(wxPATH_GET_VOLUME),
-                                 &ftAccess, &ftCreate, &ftWrite);
-    }
-    else // file
-    {
-        wxFileHandle fh(GetFullPath(), wxFileHandle::ReadAttr);
-        if ( fh.IsOk() )
-        {
-            ok = ::GetFileTime(fh,
-                               dtCreate ? &ftCreate : NULL,
-                               dtAccess ? &ftAccess : NULL,
-                               dtMod ? &ftWrite : NULL) != 0;
-        }
-        else
-        {
-            ok = false;
-        }
-    }
-
-    if ( ok )
-    {
-        if ( dtCreate )
-            ConvertFileTimeToWx(dtCreate, ftCreate);
-        if ( dtAccess )
-            ConvertFileTimeToWx(dtAccess, ftAccess);
-        if ( dtMod )
-            ConvertFileTimeToWx(dtMod, ftWrite);
-
-        return true;
-    }
-#elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__))
-    // no need to test for IsDir() here
-    wxStructStat stBuf;
-    if ( wxStat( GetFullPath(), &stBuf) == 0 )
-    {
-        // Android defines st_*time fields as unsigned long, but time_t as long,
-        // hence the static_casts.
-        if ( dtAccess )
-            dtAccess->Set(static_cast<time_t>(stBuf.st_atime));
-        if ( dtMod )
-            dtMod->Set(static_cast<time_t>(stBuf.st_mtime));
-        if ( dtCreate )
-            dtCreate->Set(static_cast<time_t>(stBuf.st_ctime));
-
-        return true;
-    }
-#else // other platform
-    wxUnusedVar(dtAccess);
-    wxUnusedVar(dtMod);
-    wxUnusedVar(dtCreate);
-#endif // platforms
-
-    wxLogSysError(_("Failed to retrieve file times for '%s'"),
-                  GetFullPath().c_str());
-
-    return false;
-}
-
-#endif // wxUSE_DATETIME
-
-
-// ----------------------------------------------------------------------------
-// file size functions
-// ----------------------------------------------------------------------------
-
-#if wxUSE_LONGLONG
-
-/* static */
-wxULongLong wxFileName::GetSize(const wxString &filename)
-{
-    if (!wxFileExists(filename))
-        return wxInvalidSize;
-
-#if defined(__WIN32__)
-    wxFileHandle f(filename, wxFileHandle::ReadAttr);
-    if (!f.IsOk())
-        return wxInvalidSize;
-
-    DWORD lpFileSizeHigh;
-    DWORD ret = GetFileSize(f, &lpFileSizeHigh);
-    if ( ret == INVALID_FILE_SIZE && ::GetLastError() != NO_ERROR )
-        return wxInvalidSize;
-
-    return wxULongLong(lpFileSizeHigh, ret);
-#else // ! __WIN32__
-    wxStructStat st;
-    if (wxStat( filename, &st) != 0)
-        return wxInvalidSize;
-    return wxULongLong(st.st_size);
-#endif
-}
-
-/* static */
-wxString wxFileName::GetHumanReadableSize(const wxULongLong &bs,
-                                          const wxString &nullsize,
-                                          int precision,
-                                          wxSizeConvention conv)
-{
-    // deal with trivial case first
-    if ( bs == 0 || bs == wxInvalidSize )
-        return nullsize;
-
-    // depending on the convention used the multiplier may be either 1000 or
-    // 1024 and the binary infix may be empty (for "KB") or "i" (for "KiB")
-    double multiplier = 1024.;
-    wxString biInfix;
-
-    switch ( conv )
-    {
-        case wxSIZE_CONV_TRADITIONAL:
-            // nothing to do, this corresponds to the default values of both
-            // the multiplier and infix string
-            break;
-
-        case wxSIZE_CONV_IEC:
-            biInfix = "i";
-            break;
-
-        case wxSIZE_CONV_SI:
-            multiplier = 1000;
-            break;
-    }
-
-    const double kiloByteSize = multiplier;
-    const double megaByteSize = multiplier * kiloByteSize;
-    const double gigaByteSize = multiplier * megaByteSize;
-    const double teraByteSize = multiplier * gigaByteSize;
-
-    const double bytesize = bs.ToDouble();
-
-    wxString result;
-    if ( bytesize < kiloByteSize )
-        result.Printf("%s B", bs.ToString());
-    else if ( bytesize < megaByteSize )
-        result.Printf("%.*f K%sB", precision, bytesize/kiloByteSize, biInfix);
-    else if (bytesize < gigaByteSize)
-        result.Printf("%.*f M%sB", precision, bytesize/megaByteSize, biInfix);
-    else if (bytesize < teraByteSize)
-        result.Printf("%.*f G%sB", precision, bytesize/gigaByteSize, biInfix);
-    else
-        result.Printf("%.*f T%sB", precision, bytesize/teraByteSize, biInfix);
-
-    return result;
-}
-
-wxULongLong wxFileName::GetSize() const
-{
-    return GetSize(GetFullPath());
-}
-
-wxString wxFileName::GetHumanReadableSize(const wxString& failmsg,
-                                          int precision,
-                                          wxSizeConvention conv) const
-{
-    return GetHumanReadableSize(GetSize(), failmsg, precision, conv);
-}
-
-#endif // wxUSE_LONGLONG
-
-// ----------------------------------------------------------------------------
-// Mac-specific functions
-// ----------------------------------------------------------------------------
-
-#if defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
-
-namespace
-{
-
-class MacDefaultExtensionRecord
-{
-public:
-    MacDefaultExtensionRecord()
-    {
-        m_type =
-        m_creator = 0 ;
-    }
-
-    // default copy ctor, assignment operator and dtor are ok
-
-    MacDefaultExtensionRecord(const wxString& ext, OSType type, OSType creator)
-        : m_ext(ext)
-    {
-        m_type = type;
-        m_creator = creator;
-    }
-
-    wxString m_ext;
-    OSType m_type;
-    OSType m_creator;
-};
-
-WX_DECLARE_OBJARRAY(MacDefaultExtensionRecord, MacDefaultExtensionArray);
-
-bool gMacDefaultExtensionsInited = false;
-
-#include "wx/arrimpl.cpp"
-
-WX_DEFINE_EXPORTED_OBJARRAY(MacDefaultExtensionArray);
-
-MacDefaultExtensionArray gMacDefaultExtensions;
-
-// load the default extensions
-const MacDefaultExtensionRecord gDefaults[] =
-{
-    MacDefaultExtensionRecord( "txt", 'TEXT', 'ttxt' ),
-    MacDefaultExtensionRecord( "tif", 'TIFF', '****' ),
-    MacDefaultExtensionRecord( "jpg", 'JPEG', '****' ),
-};
-
-void MacEnsureDefaultExtensionsLoaded()
-{
-    if ( !gMacDefaultExtensionsInited )
-    {
-        // we could load the pc exchange prefs here too
-        for ( size_t i = 0 ; i < WXSIZEOF( gDefaults ) ; ++i )
-        {
-            gMacDefaultExtensions.Add( gDefaults[i] ) ;
-        }
-        gMacDefaultExtensionsInited = true;
-    }
-}
-
-} // anonymous namespace
-
-bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator )
-{
-    FSRef fsRef ;
-    FSCatalogInfo catInfo;
-    FileInfo *finfo ;
-
-    if ( wxMacPathToFSRef( GetFullPath() , &fsRef ) == noErr )
-    {
-        if ( FSGetCatalogInfo (&fsRef, kFSCatInfoFinderInfo, &catInfo, NULL, NULL, NULL) == noErr )
-        {
-            finfo = (FileInfo*)&catInfo.finderInfo;
-            finfo->fileType = type ;
-            finfo->fileCreator = creator ;
-            FSSetCatalogInfo( &fsRef, kFSCatInfoFinderInfo, &catInfo ) ;
-            return true ;
-        }
-    }
-    return false ;
-}
-
-bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator ) const
-{
-    FSRef fsRef ;
-    FSCatalogInfo catInfo;
-    FileInfo *finfo ;
-
-    if ( wxMacPathToFSRef( GetFullPath() , &fsRef ) == noErr )
-    {
-        if ( FSGetCatalogInfo (&fsRef, kFSCatInfoFinderInfo, &catInfo, NULL, NULL, NULL) == noErr )
-        {
-            finfo = (FileInfo*)&catInfo.finderInfo;
-            *type = finfo->fileType ;
-            *creator = finfo->fileCreator ;
-            return true ;
-        }
-    }
-    return false ;
-}
-
-bool wxFileName::MacSetDefaultTypeAndCreator()
-{
-    wxUint32 type , creator ;
-    if ( wxFileName::MacFindDefaultTypeAndCreator(GetExt() , &type ,
-      &creator ) )
-    {
-        return MacSetTypeAndCreator( type , creator ) ;
-    }
-    return false;
-}
-
-bool wxFileName::MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator )
-{
-  MacEnsureDefaultExtensionsLoaded() ;
-  wxString extl = ext.Lower() ;
-  for( int i = gMacDefaultExtensions.Count() - 1 ; i >= 0 ; --i )
-  {
-    if ( gMacDefaultExtensions.Item(i).m_ext == extl )
-    {
-      *type = gMacDefaultExtensions.Item(i).m_type ;
-      *creator = gMacDefaultExtensions.Item(i).m_creator ;
-      return true ;
-    }
-  }
-  return false ;
-}
-
-void wxFileName::MacRegisterDefaultTypeAndCreator( const wxString& ext , wxUint32 type , wxUint32 creator )
-{
-  MacEnsureDefaultExtensionsLoaded();
-  MacDefaultExtensionRecord rec(ext.Lower(), type, creator);
-  gMacDefaultExtensions.Add( rec );
-}
-
-#endif // defined( __WXOSX_MAC__ ) && wxOSX_USE_CARBON
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/filename.cpp
+// Purpose:     wxFileName - encapsulates a file path
+// Author:      Robert Roebling, Vadim Zeitlin
+// Modified by:
+// Created:     28.12.2000
+// RCS-ID:      $Id: filename.cpp 66915 2011-02-16 21:46:49Z JS $
+// Copyright:   (c) 2000 Robert Roebling
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/*
+   Here are brief descriptions of the filename formats supported by this class:
+
+   wxPATH_UNIX: standard Unix format, used under Darwin as well, absolute file
+                names have the form:
+                /dir1/dir2/.../dirN/filename, "." and ".." stand for the
+                current and parent directory respectively, "~" is parsed as the
+                user HOME and "~username" as the HOME of that user
+
+   wxPATH_DOS:  DOS/Windows format, absolute file names have the form:
+                drive:\dir1\dir2\...\dirN\filename.ext where drive is a single
+                letter. "." and ".." as for Unix but no "~".
+
+                There are also UNC names of the form \\share\fullpath
+
+   wxPATH_MAC:  Mac OS 8/9 and Mac OS X under CodeWarrior 7 format, absolute file
+                names have the form
+                    volume:dir1:...:dirN:filename
+                and the relative file names are either
+                    :dir1:...:dirN:filename
+                or just
+                    filename
+                (although :filename works as well).
+                Since the volume is just part of the file path, it is not
+                treated like a separate entity as it is done under DOS and
+                VMS, it is just treated as another dir.
+
+   wxPATH_VMS:  VMS native format, absolute file names have the form
+                    <device>:[dir1.dir2.dir3]file.txt
+                or
+                    <device>:[000000.dir1.dir2.dir3]file.txt
+
+                the <device> is the physical device (i.e. disk). 000000 is the
+                root directory on the device which can be omitted.
+
+                Note that VMS uses different separators unlike Unix:
+                 : always after the device. If the path does not contain : than
+                   the default (the device of the current directory) is assumed.
+                 [ start of directory specification
+                 . separator between directory and subdirectory
+                 ] between directory and file
+ */
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h" // For GetShort/LongPathName
+    #endif
+    #include "wx/dynarray.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+#endif
+
+#include "wx/filename.h"
+#include "wx/private/filename.h"
+#include "wx/tokenzr.h"
+#include "wx/config.h"          // for wxExpandEnvVars
+#include "wx/dynlib.h"
+
+#if defined(__WIN32__) && defined(__MINGW32__)
+    #include "wx/msw/gccpriv.h"
+#endif
+
+#ifdef __WXWINCE__
+#include "wx/msw/private.h"
+#endif
+
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
+// utime() is POSIX so should normally be available on all Unices
+#ifdef __UNIX_LIKE__
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+#ifdef __DJGPP__
+#include <unistd.h>
+#endif
+
+#ifdef __MWERKS__
+#ifdef __MACH__
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#else
+#include <stat.h>
+#include <unistd.h>
+#include <unix.h>
+#endif
+#endif
+
+#ifdef __WATCOMC__
+#include <io.h>
+#include <sys/utime.h>
+#include <sys/stat.h>
+#endif
+
+#ifdef __VISAGECPP__
+#ifndef MAX_PATH
+#define MAX_PATH 256
+#endif
+#endif
+
+#ifdef __EMX__
+#include <os2.h>
+#define MAX_PATH _MAX_PATH
+#endif
+
+
+wxULongLong wxInvalidSize = (unsigned)-1;
+
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// small helper class which opens and closes the file - we use it just to get
+// a file handle for the given file name to pass it to some Win32 API function
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+
+class wxFileHandle
+{
+public:
+    enum OpenMode
+    {
+        Read,
+        Write
+    };
+
+    wxFileHandle(const wxString& filename, OpenMode mode, int flags = 0)
+    {
+        m_hFile = ::CreateFile
+                    (
+                     filename,                      // name
+                     mode == Read ? GENERIC_READ    // access mask
+                                  : GENERIC_WRITE,
+                     FILE_SHARE_READ |              // sharing mode
+                     FILE_SHARE_WRITE,              // (allow everything)
+                     NULL,                          // no secutity attr
+                     OPEN_EXISTING,                 // creation disposition
+                     flags,                         // flags
+                     NULL                           // no template file
+                    );
+
+        if ( m_hFile == INVALID_HANDLE_VALUE )
+        {
+            wxLogSysError(_("Failed to open '%s' for %s"),
+                          filename.c_str(),
+                          mode == Read ? _("reading") : _("writing"));
+        }
+    }
+
+    ~wxFileHandle()
+    {
+        if ( m_hFile != INVALID_HANDLE_VALUE )
+        {
+            if ( !::CloseHandle(m_hFile) )
+            {
+                wxLogSysError(_("Failed to close file handle"));
+            }
+        }
+    }
+
+    // return true only if the file could be opened successfully
+    bool IsOk() const { return m_hFile != INVALID_HANDLE_VALUE; }
+
+    // get the handle
+    operator HANDLE() const { return m_hFile; }
+
+private:
+    HANDLE m_hFile;
+};
+
+#endif // __WIN32__
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DATETIME && defined(__WIN32__) && !defined(__WXMICROWIN__)
+
+// convert between wxDateTime and FILETIME which is a 64-bit value representing
+// the number of 100-nanosecond intervals since January 1, 1601.
+
+static void ConvertFileTimeToWx(wxDateTime *dt, const FILETIME &ft)
+{
+    FILETIME ftcopy = ft;
+    FILETIME ftLocal;
+    if ( !::FileTimeToLocalFileTime(&ftcopy, &ftLocal) )
+    {
+        wxLogLastError(_T("FileTimeToLocalFileTime"));
+    }
+
+    SYSTEMTIME st;
+    if ( !::FileTimeToSystemTime(&ftLocal, &st) )
+    {
+        wxLogLastError(_T("FileTimeToSystemTime"));
+    }
+
+    dt->Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
+            st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+}
+
+static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt)
+{
+    SYSTEMTIME st;
+    st.wDay = dt.GetDay();
+    st.wMonth = (WORD)(dt.GetMonth() + 1);
+    st.wYear = (WORD)dt.GetYear();
+    st.wHour = dt.GetHour();
+    st.wMinute = dt.GetMinute();
+    st.wSecond = dt.GetSecond();
+    st.wMilliseconds = dt.GetMillisecond();
+
+    FILETIME ftLocal;
+    if ( !::SystemTimeToFileTime(&st, &ftLocal) )
+    {
+        wxLogLastError(_T("SystemTimeToFileTime"));
+    }
+
+    if ( !::LocalFileTimeToFileTime(&ftLocal, ft) )
+    {
+        wxLogLastError(_T("LocalFileTimeToFileTime"));
+    }
+}
+
+#endif // wxUSE_DATETIME && __WIN32__
+
+// return a string with the volume par
+static wxString wxGetVolumeString(const wxString& volume, wxPathFormat format)
+{
+    wxString path;
+
+    if ( !volume.empty() )
+    {
+        format = wxFileName::GetFormat(format);
+
+        // Special Windows UNC paths hack, part 2: undo what we did in
+        // SplitPath() and make an UNC path if we have a drive which is not a
+        // single letter (hopefully the network shares can't be one letter only
+        // although I didn't find any authoritative docs on this)
+        if ( format == wxPATH_DOS && volume.length() > 1 )
+        {
+            path << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << volume;
+        }
+        else if  ( format == wxPATH_DOS || format == wxPATH_VMS )
+        {
+            path << volume << wxFileName::GetVolumeSeparator(format);
+        }
+        // else ignore
+    }
+
+    return path;
+}
+
+// return true if the character is a DOS path separator i.e. either a slash or
+// a backslash
+inline bool IsDOSPathSep(wxChar ch)
+{
+    return ch == wxFILE_SEP_PATH_DOS || ch == wxFILE_SEP_PATH_UNIX;
+}
+
+// return true if the format used is the DOS/Windows one and the string looks
+// like a UNC path
+static bool IsUNCPath(const wxString& path, wxPathFormat format)
+{
+    return format == wxPATH_DOS &&
+                path.length() >= 4 && // "\\a" can't be a UNC path
+                    IsDOSPathSep(path[0u]) &&
+                        IsDOSPathSep(path[1u]) &&
+                            !IsDOSPathSep(path[2u]);
+}
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFileName construction
+// ----------------------------------------------------------------------------
+
+void wxFileName::Assign( const wxFileName &filepath )
+{
+    if ( &filepath == this )
+        return;
+
+    m_volume = filepath.GetVolume();
+    m_dirs = filepath.GetDirs();
+    m_name = filepath.GetName();
+    m_ext = filepath.GetExt();
+    m_relative = filepath.m_relative;
+    m_hasExt = filepath.m_hasExt;
+}
+
+void wxFileName::Assign(const wxString& volume,
+                        const wxString& path,
+                        const wxString& name,
+                        const wxString& ext,
+                        bool hasExt,
+                        wxPathFormat format)
+{
+    // we should ignore paths which look like UNC shares because we already
+    // have the volume here and the UNC notation (\\server\path) is only valid
+    // for paths which don't start with a volume, so prevent SetPath() from
+    // recognizing "\\foo\bar" in "c:\\foo\bar" as an UNC path
+    //
+    // note also that this is a rather ugly way to do what we want (passing
+    // some kind of flag telling to ignore UNC paths to SetPath() would be
+    // better) but this is the safest thing to do to avoid breaking backwards
+    // compatibility in 2.8
+    if ( IsUNCPath(path, format) )
+    {
+        // remove one of the 2 leading backslashes to ensure that it's not
+        // recognized as an UNC path by SetPath()
+        wxString pathNonUNC(path, 1, wxString::npos);
+        SetPath(pathNonUNC, format);
+    }
+    else // no UNC complications
+    {
+        SetPath(path, format);
+    }
+
+    m_volume = volume;
+    m_ext = ext;
+    m_name = name;
+
+    m_hasExt = hasExt;
+}
+
+void wxFileName::SetPath( const wxString& pathOrig, wxPathFormat format )
+{
+    m_dirs.Clear();
+
+    if ( pathOrig.empty() )
+    {
+        // no path at all
+        m_relative = true;
+
+        return;
+    }
+
+    format = GetFormat( format );
+
+    // 0) deal with possible volume part first
+    wxString volume,
+             path;
+    SplitVolume(pathOrig, &volume, &path, format);
+    if ( !volume.empty() )
+    {
+        m_relative = false;
+
+        SetVolume(volume);
+    }
+
+    // 1) Determine if the path is relative or absolute.
+    wxChar leadingChar = path[0u];
+
+    switch (format)
+    {
+        case wxPATH_MAC:
+            m_relative = leadingChar == wxT(':');
+
+            // We then remove a leading ":". The reason is in our
+            // storage form for relative paths:
+            // ":dir:file.txt" actually means "./dir/file.txt" in
+            // DOS notation and should get stored as
+            // (relative) (dir) (file.txt)
+            // "::dir:file.txt" actually means "../dir/file.txt"
+            // stored as (relative) (..) (dir) (file.txt)
+            // This is important only for the Mac as an empty dir
+            // actually means <UP>, whereas under DOS, double
+            // slashes can be ignored: "\\\\" is the same as "\\".
+            if (m_relative)
+                path.erase( 0, 1 );
+            break;
+
+        case wxPATH_VMS:
+            // TODO: what is the relative path format here?
+            m_relative = false;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("Unknown path format") );
+            // !! Fall through !!
+
+        case wxPATH_UNIX:
+            // the paths of the form "~" or "~username" are absolute
+            m_relative = leadingChar != wxT('/') && leadingChar != _T('~');
+            break;
+
+        case wxPATH_DOS:
+            m_relative = !IsPathSeparator(leadingChar, format);
+            break;
+
+    }
+
+    // 2) Break up the path into its members. If the original path
+    //    was just "/" or "\\", m_dirs will be empty. We know from
+    //    the m_relative field, if this means "nothing" or "root dir".
+
+    wxStringTokenizer tn( path, GetPathSeparators(format) );
+
+    while ( tn.HasMoreTokens() )
+    {
+        wxString token = tn.GetNextToken();
+
+        // Remove empty token under DOS and Unix, interpret them
+        // as .. under Mac.
+        if (token.empty())
+        {
+            if (format == wxPATH_MAC)
+                m_dirs.Add( wxT("..") );
+            // else ignore
+        }
+        else
+        {
+           m_dirs.Add( token );
+        }
+    }
+}
+
+void wxFileName::Assign(const wxString& fullpath,
+                        wxPathFormat format)
+{
+    wxString volume, path, name, ext;
+    bool hasExt;
+    SplitPath(fullpath, &volume, &path, &name, &ext, &hasExt, format);
+
+    Assign(volume, path, name, ext, hasExt, format);
+}
+
+void wxFileName::Assign(const wxString& fullpathOrig,
+                        const wxString& fullname,
+                        wxPathFormat format)
+{
+    // always recognize fullpath as directory, even if it doesn't end with a
+    // slash
+    wxString fullpath = fullpathOrig;
+    if ( !fullpath.empty() && !wxEndsWithPathSeparator(fullpath) )
+    {
+        fullpath += GetPathSeparator(format);
+    }
+
+    wxString volume, path, name, ext;
+    bool hasExt;
+
+    // do some consistency checks in debug mode: the name should be really just
+    // the filename and the path should be really just a path
+#ifdef __WXDEBUG__
+    wxString volDummy, pathDummy, nameDummy, extDummy;
+
+    SplitPath(fullname, &volDummy, &pathDummy, &name, &ext, &hasExt, format);
+
+    wxASSERT_MSG( volDummy.empty() && pathDummy.empty(),
+                  _T("the file name shouldn't contain the path") );
+
+    SplitPath(fullpath, &volume, &path, &nameDummy, &extDummy, format);
+
+    wxASSERT_MSG( nameDummy.empty() && extDummy.empty(),
+                  _T("the path shouldn't contain file name nor extension") );
+
+#else // !__WXDEBUG__
+    SplitPath(fullname, NULL /* no volume */, NULL /* no path */,
+                        &name, &ext, &hasExt, format);
+    SplitPath(fullpath, &volume, &path, NULL, NULL, format);
+#endif // __WXDEBUG__/!__WXDEBUG__
+
+    Assign(volume, path, name, ext, hasExt, format);
+}
+
+void wxFileName::Assign(const wxString& pathOrig,
+                        const wxString& name,
+                        const wxString& ext,
+                        wxPathFormat format)
+{
+    wxString volume,
+             path;
+    SplitVolume(pathOrig, &volume, &path, format);
+
+    Assign(volume, path, name, ext, format);
+}
+
+void wxFileName::AssignDir(const wxString& dir, wxPathFormat format)
+{
+    Assign(dir, wxEmptyString, format);
+}
+
+void wxFileName::Clear()
+{
+    m_dirs.Clear();
+
+    m_volume =
+    m_name =
+    m_ext = wxEmptyString;
+
+    // we don't have any absolute path for now
+    m_relative = true;
+
+    // nor any extension
+    m_hasExt = false;
+}
+
+/* static */
+wxFileName wxFileName::FileName(const wxString& file, wxPathFormat format)
+{
+    return wxFileName(file, format);
+}
+
+/* static */
+wxFileName wxFileName::DirName(const wxString& dir, wxPathFormat format)
+{
+    wxFileName fn;
+    fn.AssignDir(dir, format);
+    return fn;
+}
+
+// ----------------------------------------------------------------------------
+// existence tests
+// ----------------------------------------------------------------------------
+
+bool wxFileName::FileExists() const
+{
+    return wxFileName::FileExists( GetFullPath() );
+}
+
+bool wxFileName::FileExists( const wxString &file )
+{
+    return ::wxFileExists( file );
+}
+
+bool wxFileName::DirExists() const
+{
+    return wxFileName::DirExists( GetPath() );
+}
+
+bool wxFileName::DirExists( const wxString &dir )
+{
+    return ::wxDirExists( dir );
+}
+
+// ----------------------------------------------------------------------------
+// CWD and HOME stuff
+// ----------------------------------------------------------------------------
+
+void wxFileName::AssignCwd(const wxString& volume)
+{
+    AssignDir(wxFileName::GetCwd(volume));
+}
+
+/* static */
+wxString wxFileName::GetCwd(const wxString& volume)
+{
+    // if we have the volume, we must get the current directory on this drive
+    // and to do this we have to chdir to this volume - at least under Windows,
+    // I don't know how to get the current drive on another volume elsewhere
+    // (TODO)
+    wxString cwdOld;
+    if ( !volume.empty() )
+    {
+        cwdOld = wxGetCwd();
+        SetCwd(volume + GetVolumeSeparator());
+    }
+
+    wxString cwd = ::wxGetCwd();
+
+    if ( !volume.empty() )
+    {
+        SetCwd(cwdOld);
+    }
+
+    return cwd;
+}
+
+bool wxFileName::SetCwd()
+{
+    return wxFileName::SetCwd( GetPath() );
+}
+
+bool wxFileName::SetCwd( const wxString &cwd )
+{
+    return ::wxSetWorkingDirectory( cwd );
+}
+
+void wxFileName::AssignHomeDir()
+{
+    AssignDir(wxFileName::GetHomeDir());
+}
+
+wxString wxFileName::GetHomeDir()
+{
+    return ::wxGetHomeDir();
+}
+
+
+// ----------------------------------------------------------------------------
+// CreateTempFileName
+// ----------------------------------------------------------------------------
+
+#if wxUSE_FILE || wxUSE_FFILE
+
+
+#if !defined wx_fdopen && defined HAVE_FDOPEN
+    #define wx_fdopen fdopen
+#endif
+
+// NB: GetTempFileName() under Windows creates the file, so using
+//     O_EXCL there would fail
+#ifdef __WINDOWS__
+    #define wxOPEN_EXCL 0
+#else
+    #define wxOPEN_EXCL O_EXCL
+#endif
+
+
+#ifdef wxOpenOSFHandle
+#define WX_HAVE_DELETE_ON_CLOSE
+// On Windows create a file with the FILE_FLAGS_DELETE_ON_CLOSE flags.
+//
+static int wxOpenWithDeleteOnClose(const wxString& filename)
+{
+    DWORD access = GENERIC_READ | GENERIC_WRITE;
+
+    DWORD disposition = OPEN_ALWAYS;
+
+    DWORD attributes = FILE_ATTRIBUTE_TEMPORARY |
+                       FILE_FLAG_DELETE_ON_CLOSE;
+
+    HANDLE h = ::CreateFile(filename, access, 0, NULL,
+                            disposition, attributes, NULL);
+
+    return wxOpenOSFHandle(h, wxO_BINARY);
+}
+#endif // wxOpenOSFHandle
+
+
+// Helper to open the file
+//
+static int wxTempOpen(const wxString& path, bool *deleteOnClose)
+{
+#ifdef WX_HAVE_DELETE_ON_CLOSE
+    if (*deleteOnClose)
+        return wxOpenWithDeleteOnClose(path);
+#endif
+
+    *deleteOnClose = false;
+
+    return wxOpen(path, wxO_BINARY | O_RDWR | O_CREAT | wxOPEN_EXCL, 0600);
+}
+
+
+#if wxUSE_FFILE
+// Helper to open the file and attach it to the wxFFile
+//
+static bool wxTempOpen(wxFFile *file, const wxString& path, bool *deleteOnClose)
+{
+#ifndef wx_fdopen
+    *deleteOnClose = false;
+    return file->Open(path, _T("w+b"));
+#else // wx_fdopen
+    int fd = wxTempOpen(path, deleteOnClose);
+    if (fd == -1)
+        return false;
+    file->Attach(wx_fdopen(fd, "w+b"));
+    return file->IsOpened();
+#endif // wx_fdopen
+}
+#endif // wxUSE_FFILE
+
+
+#if !wxUSE_FILE
+    #define WXFILEARGS(x, y) y
+#elif !wxUSE_FFILE
+    #define WXFILEARGS(x, y) x
+#else
+    #define WXFILEARGS(x, y) x, y
+#endif
+
+
+// Implementation of wxFileName::CreateTempFileName().
+//
+static wxString wxCreateTempImpl(
+        const wxString& prefix,
+        WXFILEARGS(wxFile *fileTemp, wxFFile *ffileTemp),
+        bool *deleteOnClose = NULL)
+{
+#if wxUSE_FILE && wxUSE_FFILE
+    wxASSERT(fileTemp == NULL || ffileTemp == NULL);
+#endif
+    wxString path, dir, name;
+    bool wantDeleteOnClose = false;
+
+    if (deleteOnClose)
+    {
+        // set the result to false initially
+        wantDeleteOnClose = *deleteOnClose;
+        *deleteOnClose = false;
+    }
+    else
+    {
+        // easier if it alwasys points to something
+        deleteOnClose = &wantDeleteOnClose;
+    }
+
+    // use the directory specified by the prefix
+    wxFileName::SplitPath(prefix, &dir, &name, NULL /* extension */);
+
+    if (dir.empty())
+    {
+        dir = wxFileName::GetTempDir();
+    }
+
+#if defined(__WXWINCE__)
+    path = dir + wxT("\\") + name;
+    int i = 1;
+    while (wxFileName::FileExists(path))
+    {
+        path = dir + wxT("\\") + name ;
+        path << i;
+        i ++;
+    }
+
+#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+    if ( !::GetTempFileName(dir, name, 0, wxStringBuffer(path, MAX_PATH + 1)) )
+    {
+        wxLogLastError(_T("GetTempFileName"));
+
+        path.clear();
+    }
+
+#else // !Windows
+    path = dir;
+
+    if ( !wxEndsWithPathSeparator(dir) &&
+            (name.empty() || !wxIsPathSeparator(name[0u])) )
+    {
+        path += wxFILE_SEP_PATH;
+    }
+
+    path += name;
+
+#if defined(HAVE_MKSTEMP)
+    // scratch space for mkstemp()
+    path += _T("XXXXXX");
+
+    // we need to copy the path to the buffer in which mkstemp() can modify it
+    wxCharBuffer buf( wxConvFile.cWX2MB( path ) );
+
+    // cast is safe because the string length doesn't change
+    int fdTemp = mkstemp( (char*)(const char*) buf );
+    if ( fdTemp == -1 )
+    {
+        // this might be not necessary as mkstemp() on most systems should have
+        // already done it but it doesn't hurt neither...
+        path.clear();
+    }
+    else // mkstemp() succeeded
+    {
+        path = wxConvFile.cMB2WX( (const char*) buf );
+
+    #if wxUSE_FILE
+        // avoid leaking the fd
+        if ( fileTemp )
+        {
+            fileTemp->Attach(fdTemp);
+        }
+        else
+    #endif
+
+    #if wxUSE_FFILE
+        if ( ffileTemp )
+        {
+        #ifdef wx_fdopen
+            ffileTemp->Attach(wx_fdopen(fdTemp, "r+b"));
+        #else
+            ffileTemp->Open(path, _T("r+b"));
+            close(fdTemp);
+        #endif
+        }
+        else
+    #endif
+
+        {
+            close(fdTemp);
+        }
+    }
+#else // !HAVE_MKSTEMP
+
+#ifdef HAVE_MKTEMP
+    // same as above
+    path += _T("XXXXXX");
+
+    wxCharBuffer buf = wxConvFile.cWX2MB( path );
+    if ( !mktemp( (char*)(const char*) buf ) )
+    {
+        path.clear();
+    }
+    else
+    {
+        path = wxConvFile.cMB2WX( (const char*) buf );
+    }
+#else // !HAVE_MKTEMP (includes __DOS__)
+    // generate the unique file name ourselves
+    #if !defined(__DOS__) && !defined(__PALMOS__) && (!defined(__MWERKS__) || defined(__DARWIN__) )
+    path << (unsigned int)getpid();
+    #endif
+
+    wxString pathTry;
+
+    static const size_t numTries = 1000;
+    for ( size_t n = 0; n < numTries; n++ )
+    {
+        // 3 hex digits is enough for numTries == 1000 < 4096
+        pathTry = path + wxString::Format(_T("%.03x"), (unsigned int) n);
+        if ( !wxFileName::FileExists(pathTry) )
+        {
+            break;
+        }
+
+        pathTry.clear();
+    }
+
+    path = pathTry;
+#endif // HAVE_MKTEMP/!HAVE_MKTEMP
+
+#endif // HAVE_MKSTEMP/!HAVE_MKSTEMP
+
+#endif // Windows/!Windows
+
+    if ( path.empty() )
+    {
+        wxLogSysError(_("Failed to create a temporary file name"));
+    }
+    else
+    {
+        bool ok = true;
+
+        // open the file - of course, there is a race condition here, this is
+        // why we always prefer using mkstemp()...
+    #if wxUSE_FILE
+        if ( fileTemp && !fileTemp->IsOpened() )
+        {
+            *deleteOnClose = wantDeleteOnClose;
+            int fd = wxTempOpen(path, deleteOnClose);
+            if (fd != -1)
+                fileTemp->Attach(fd);
+            else
+                ok = false;
+        }
+    #endif
+
+    #if wxUSE_FFILE
+        if ( ffileTemp && !ffileTemp->IsOpened() )
+        {
+            *deleteOnClose = wantDeleteOnClose;
+            ok = wxTempOpen(ffileTemp, path, deleteOnClose);
+        }
+    #endif
+
+        if ( !ok )
+        {
+            // FIXME: If !ok here should we loop and try again with another
+            //        file name?  That is the standard recourse if open(O_EXCL)
+            //        fails, though of course it should be protected against
+            //        possible infinite looping too.
+
+            wxLogError(_("Failed to open temporary file."));
+
+            path.clear();
+        }
+    }
+
+    return path;
+}
+
+
+static bool wxCreateTempImpl(
+        const wxString& prefix,
+        WXFILEARGS(wxFile *fileTemp, wxFFile *ffileTemp),
+        wxString *name)
+{
+    bool deleteOnClose = true;
+
+    *name = wxCreateTempImpl(prefix,
+                             WXFILEARGS(fileTemp, ffileTemp),
+                             &deleteOnClose);
+
+    bool ok = !name->empty();
+
+    if (deleteOnClose)
+        name->clear();
+#ifdef __UNIX__
+    else if (ok && wxRemoveFile(*name))
+        name->clear();
+#endif
+
+    return ok;
+}
+
+
+static void wxAssignTempImpl(
+        wxFileName *fn,
+        const wxString& prefix,
+        WXFILEARGS(wxFile *fileTemp, wxFFile *ffileTemp))
+{
+    wxString tempname;
+    tempname = wxCreateTempImpl(prefix, WXFILEARGS(fileTemp, ffileTemp));
+
+    if ( tempname.empty() )
+    {
+        // error, failed to get temp file name
+        fn->Clear();
+    }
+    else // ok
+    {
+        fn->Assign(tempname);
+    }
+}
+
+
+void wxFileName::AssignTempFileName(const wxString& prefix)
+{
+    wxAssignTempImpl(this, prefix, WXFILEARGS(NULL, NULL));
+}
+
+/* static */
+wxString wxFileName::CreateTempFileName(const wxString& prefix)
+{
+    return wxCreateTempImpl(prefix, WXFILEARGS(NULL, NULL));
+}
+
+#endif // wxUSE_FILE || wxUSE_FFILE
+
+
+#if wxUSE_FILE
+
+wxString wxCreateTempFileName(const wxString& prefix,
+                              wxFile *fileTemp,
+                              bool *deleteOnClose)
+{
+    return wxCreateTempImpl(prefix, WXFILEARGS(fileTemp, NULL), deleteOnClose);
+}
+
+bool wxCreateTempFile(const wxString& prefix,
+                      wxFile *fileTemp,
+                      wxString *name)
+{
+    return wxCreateTempImpl(prefix, WXFILEARGS(fileTemp, NULL), name);
+}
+
+void wxFileName::AssignTempFileName(const wxString& prefix, wxFile *fileTemp)
+{
+    wxAssignTempImpl(this, prefix, WXFILEARGS(fileTemp, NULL));
+}
+
+/* static */
+wxString
+wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
+{
+    return wxCreateTempFileName(prefix, fileTemp);
+}
+
+#endif // wxUSE_FILE
+
+
+#if wxUSE_FFILE
+
+wxString wxCreateTempFileName(const wxString& prefix,
+                              wxFFile *fileTemp,
+                              bool *deleteOnClose)
+{
+    return wxCreateTempImpl(prefix, WXFILEARGS(NULL, fileTemp), deleteOnClose);
+}
+
+bool wxCreateTempFile(const wxString& prefix,
+                      wxFFile *fileTemp,
+                      wxString *name)
+{
+    return wxCreateTempImpl(prefix, WXFILEARGS(NULL, fileTemp), name);
+
+}
+
+void wxFileName::AssignTempFileName(const wxString& prefix, wxFFile *fileTemp)
+{
+    wxAssignTempImpl(this, prefix, WXFILEARGS(NULL, fileTemp));
+}
+
+/* static */
+wxString
+wxFileName::CreateTempFileName(const wxString& prefix, wxFFile *fileTemp)
+{
+    return wxCreateTempFileName(prefix, fileTemp);
+}
+
+#endif // wxUSE_FFILE
+
+
+// ----------------------------------------------------------------------------
+// directory operations
+// ----------------------------------------------------------------------------
+
+wxString wxFileName::GetTempDir()
+{
+    wxString dir;
+    dir = wxGetenv(_T("TMPDIR"));
+    if (dir.empty())
+    {
+        dir = wxGetenv(_T("TMP"));
+        if (dir.empty())
+        {
+            dir = wxGetenv(_T("TEMP"));
+        }
+    }
+
+#if defined(__WXWINCE__)
+    if (dir.empty())
+    {
+        // FIXME. Create \temp dir?
+        if (DirExists(wxT("\\temp")))
+            dir = wxT("\\temp");
+    }
+#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+
+    if ( dir.empty() )
+    {
+        if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) )
+        {
+            wxLogLastError(_T("GetTempPath"));
+        }
+
+        if ( dir.empty() )
+        {
+            // GetTempFileName() fails if we pass it an empty string
+            dir = _T('.');
+        }
+    }
+#else // !Windows
+
+    if ( dir.empty() )
+    {
+        // default
+#if defined(__DOS__) || defined(__OS2__)
+        dir = _T(".");
+#elif defined(__WXMAC__)
+        dir = wxMacFindFolder(short(kOnSystemDisk), kTemporaryFolderType, kCreateFolder);
+#else
+        dir = _T("/tmp");
+#endif
+    }
+#endif
+
+    return dir;
+}
+
+bool wxFileName::Mkdir( int perm, int flags )
+{
+    return wxFileName::Mkdir(GetPath(), perm, flags);
+}
+
+bool wxFileName::Mkdir( const wxString& dir, int perm, int flags )
+{
+    if ( flags & wxPATH_MKDIR_FULL )
+    {
+        // split the path in components
+        wxFileName filename;
+        filename.AssignDir(dir);
+
+        wxString currPath;
+        if ( filename.HasVolume())
+        {
+            currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE);
+        }
+
+        wxArrayString dirs = filename.GetDirs();
+        size_t count = dirs.GetCount();
+        for ( size_t i = 0; i < count; i++ )
+        {
+            if ( i > 0 ||
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+            // relative pathnames are exactely the other way round under mac...
+                !filename.IsAbsolute()
+#else
+                filename.IsAbsolute()
+#endif
+            )
+                currPath += wxFILE_SEP_PATH;
+            currPath += dirs[i];
+
+            if (!DirExists(currPath))
+            {
+                if (!wxMkdir(currPath, perm))
+                {
+                    // no need to try creating further directories
+                    return false;
+                }
+            }
+        }
+
+        return true;
+
+    }
+
+    return ::wxMkdir( dir, perm );
+}
+
+bool wxFileName::Rmdir()
+{
+    return wxFileName::Rmdir( GetPath() );
+}
+
+bool wxFileName::Rmdir( const wxString &dir )
+{
+    return ::wxRmdir( dir );
+}
+
+// ----------------------------------------------------------------------------
+// path normalization
+// ----------------------------------------------------------------------------
+
+bool wxFileName::Normalize(int flags,
+                           const wxString& cwd,
+                           wxPathFormat format)
+{
+    // deal with env vars renaming first as this may seriously change the path
+    if ( flags & wxPATH_NORM_ENV_VARS )
+    {
+        wxString pathOrig = GetFullPath(format);
+        wxString path = wxExpandEnvVars(pathOrig);
+        if ( path != pathOrig )
+        {
+            Assign(path);
+        }
+    }
+
+
+    // the existing path components
+    wxArrayString dirs = GetDirs();
+
+    // the path to prepend in front to make the path absolute
+    wxFileName curDir;
+
+    format = GetFormat(format);
+
+    // set up the directory to use for making the path absolute later
+    if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute(format) )
+    {
+        if ( cwd.empty() )
+        {
+            curDir.AssignCwd(GetVolume());
+        }
+        else // cwd provided
+        {
+            curDir.AssignDir(cwd);
+        }
+    }
+
+    // handle ~ stuff under Unix only
+    if ( (format == wxPATH_UNIX) && (flags & wxPATH_NORM_TILDE) )
+    {
+        if ( !dirs.IsEmpty() )
+        {
+            wxString dir = dirs[0u];
+            if ( !dir.empty() && dir[0u] == _T('~') )
+            {
+                // to make the path absolute use the home directory
+                curDir.AssignDir(wxGetUserHome(dir.c_str() + 1));
+
+                // if we are expanding the tilde, then this path
+                // *should* be already relative (since we checked for
+                // the tilde only in the first char of the first dir);
+                // if m_relative==false, it's because it was initialized
+                // from a string which started with /~; in that case
+                // we reach this point but then need m_relative=true
+                // for relative->absolute expansion later
+                m_relative = true;
+
+                dirs.RemoveAt(0u);
+            }
+        }
+    }
+
+    // transform relative path into abs one
+    if ( curDir.IsOk() )
+    {
+        // this path may be relative because it doesn't have the volume name
+        // and still have m_relative=true; in this case we shouldn't modify
+        // our directory components but just set the current volume
+        if ( !HasVolume() && curDir.HasVolume() )
+        {
+            SetVolume(curDir.GetVolume());
+
+            if ( !m_relative )
+        {
+                // yes, it was the case - we don't need curDir then
+                curDir.Clear();
+            }
+        }
+
+        // finally, prepend curDir to the dirs array
+        wxArrayString dirsNew = curDir.GetDirs();
+        WX_PREPEND_ARRAY(dirs, dirsNew);
+
+        // if we used e.g. tilde expansion previously and wxGetUserHome didn't
+        // return for some reason an absolute path, then curDir maybe not be absolute!
+        if ( curDir.IsAbsolute(format) )
+        {
+            // we have prepended an absolute path and thus we are now an absolute
+            // file name too
+            m_relative = false;
+        }
+        // else if (flags & wxPATH_NORM_ABSOLUTE):
+        //   should we warn the user that we didn't manage to make the path absolute?
+    }
+
+    // now deal with ".", ".." and the rest
+    m_dirs.Empty();
+    size_t count = dirs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxString dir = dirs[n];
+
+        if ( flags & wxPATH_NORM_DOTS )
+        {
+            if ( dir == wxT(".") )
+            {
+                // just ignore
+                continue;
+            }
+
+            if ( dir == wxT("..") )
+            {
+                if ( m_dirs.IsEmpty() )
+                {
+                    wxLogError(_("The path '%s' contains too many \"..\"!"),
+                               GetFullPath().c_str());
+                    return false;
+                }
+
+                m_dirs.RemoveAt(m_dirs.GetCount() - 1);
+                continue;
+            }
+        }
+
+        m_dirs.Add(dir);
+    }
+
+#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
+    if ( (flags & wxPATH_NORM_SHORTCUT) )
+    {
+        wxString filename;
+        if (GetShortcutTarget(GetFullPath(format), filename))
+        {
+            m_relative = false;
+            Assign(filename);
+        }
+    }
+#endif
+
+#if defined(__WIN32__)
+    if ( (flags & wxPATH_NORM_LONG) && (format == wxPATH_DOS) )
+    {
+        Assign(GetLongPath());
+    }
+#endif // Win32
+
+    // Change case  (this should be kept at the end of the function, to ensure
+    // that the path doesn't change any more after we normalize its case)
+    if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) )
+    {
+        m_volume.MakeLower();
+        m_name.MakeLower();
+        m_ext.MakeLower();
+
+        // directory entries must be made lower case as well
+        count = m_dirs.GetCount();
+        for ( size_t i = 0; i < count; i++ )
+        {
+            m_dirs[i].MakeLower();
+        }
+    }
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// get the shortcut target
+// ----------------------------------------------------------------------------
+
+// WinCE (3) doesn't have CLSID_ShellLink, IID_IShellLink definitions.
+// The .lnk file is a plain text file so it should be easy to
+// make it work. Hint from Google Groups:
+// "If you open up a lnk file, you'll see a
+// number, followed by a pound sign (#), followed by more text. The
+// number is the number of characters that follows the pound sign. The
+// characters after the pound sign are the command line (which _can_
+// include arguments) to be executed. Any path (e.g. \windows\program
+// files\myapp.exe) that includes spaces needs to be enclosed in
+// quotation marks."
+
+#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
+// The following lines are necessary under WinCE
+// #include "wx/msw/private.h"
+// #include <ole2.h>
+#include <shlobj.h>
+#if defined(__WXWINCE__)
+#include <shlguid.h>
+#endif
+
+bool wxFileName::GetShortcutTarget(const wxString& shortcutPath,
+                                   wxString& targetFilename,
+                                   wxString* arguments)
+{
+    wxString path, file, ext;
+    wxSplitPath(shortcutPath, & path, & file, & ext);
+
+    HRESULT hres;
+    IShellLink* psl;
+    bool success = false;
+
+    // Assume it's not a shortcut if it doesn't end with lnk
+    if (ext.CmpNoCase(wxT("lnk"))!=0)
+        return false;
+
+    // create a ShellLink object
+    hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+                            IID_IShellLink, (LPVOID*) &psl);
+
+    if (SUCCEEDED(hres))
+    {
+        IPersistFile* ppf;
+        hres = psl->QueryInterface( IID_IPersistFile, (LPVOID *) &ppf);
+        if (SUCCEEDED(hres))
+        {
+            WCHAR wsz[MAX_PATH];
+
+            MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, shortcutPath.mb_str(), -1, wsz,
+                                MAX_PATH);
+
+            hres = ppf->Load(wsz, 0);
+            ppf->Release();
+
+            if (SUCCEEDED(hres))
+            {
+                wxChar buf[2048];
+                // Wrong prototype in early versions
+#if defined(__MINGW32__) && !wxCHECK_W32API_VERSION(2, 2)
+                psl->GetPath((CHAR*) buf, 2048, NULL, SLGP_UNCPRIORITY);
+#else
+                psl->GetPath(buf, 2048, NULL, SLGP_UNCPRIORITY);
+#endif
+                targetFilename = wxString(buf);
+                success = (shortcutPath != targetFilename);
+
+                psl->GetArguments(buf, 2048);
+                wxString args(buf);
+                if (!args.empty() && arguments)
+                {
+                    *arguments = args;
+                }
+            }
+        }
+
+        psl->Release();
+    }
+    return success;
+}
+
+#endif // __WIN32__ && !__WXWINCE__
+
+
+// ----------------------------------------------------------------------------
+// absolute/relative paths
+// ----------------------------------------------------------------------------
+
+bool wxFileName::IsAbsolute(wxPathFormat format) const
+{
+    // if our path doesn't start with a path separator, it's not an absolute
+    // path
+    if ( m_relative )
+        return false;
+
+    if ( !GetVolumeSeparator(format).empty() )
+    {
+        // this format has volumes and an absolute path must have one, it's not
+        // enough to have the full path to bean absolute file under Windows
+        if ( GetVolume().empty() )
+            return false;
+    }
+
+    return true;
+}
+
+bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
+{
+    wxFileName fnBase = wxFileName::DirName(pathBase, format);
+
+    // get cwd only once - small time saving
+    wxString cwd = wxGetCwd();
+    Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
+    fnBase.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
+
+    bool withCase = IsCaseSensitive(format);
+
+    // we can't do anything if the files live on different volumes
+    if ( !GetVolume().IsSameAs(fnBase.GetVolume(), withCase) )
+    {
+        // nothing done
+        return false;
+    }
+
+    // same drive, so we don't need our volume
+    m_volume.clear();
+
+    // remove common directories starting at the top
+    while ( !m_dirs.IsEmpty() && !fnBase.m_dirs.IsEmpty() &&
+                m_dirs[0u].IsSameAs(fnBase.m_dirs[0u], withCase) )
+    {
+        m_dirs.RemoveAt(0);
+        fnBase.m_dirs.RemoveAt(0);
+    }
+
+    // add as many ".." as needed
+    size_t count = fnBase.m_dirs.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        m_dirs.Insert(wxT(".."), 0u);
+    }
+
+    if ( format == wxPATH_UNIX || format == wxPATH_DOS )
+    {
+        // a directory made relative with respect to itself is '.' under Unix
+        // and DOS, by definition (but we don't have to insert "./" for the
+        // files)
+        if ( m_dirs.IsEmpty() && IsDir() )
+        {
+            m_dirs.Add(_T('.'));
+        }
+    }
+
+    m_relative = true;
+
+    // we were modified
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// filename kind tests
+// ----------------------------------------------------------------------------
+
+bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const
+{
+    wxFileName fn1 = *this,
+               fn2 = filepath;
+
+    // get cwd only once - small time saving
+    wxString cwd = wxGetCwd();
+    fn1.Normalize(wxPATH_NORM_ALL | wxPATH_NORM_CASE, cwd, format);
+    fn2.Normalize(wxPATH_NORM_ALL | wxPATH_NORM_CASE, cwd, format);
+
+    if ( fn1.GetFullPath() == fn2.GetFullPath() )
+        return true;
+
+    // TODO: compare inodes for Unix, this works even when filenames are
+    //       different but files are the same (symlinks) (VZ)
+
+    return false;
+}
+
+/* static */
+bool wxFileName::IsCaseSensitive( wxPathFormat format )
+{
+    // only Unix filenames are truely case-sensitive
+    return GetFormat(format) == wxPATH_UNIX;
+}
+
+/* static */
+wxString wxFileName::GetForbiddenChars(wxPathFormat format)
+{
+    // Inits to forbidden characters that are common to (almost) all platforms.
+    wxString strForbiddenChars = wxT("*?");
+
+    // If asserts, wxPathFormat has been changed. In case of a new path format
+    // addition, the following code might have to be updated.
+    wxCOMPILE_TIME_ASSERT(wxPATH_MAX == 5, wxPathFormatChanged);
+    switch ( GetFormat(format) )
+    {
+        default :
+            wxFAIL_MSG( wxT("Unknown path format") );
+            // !! Fall through !!
+
+        case wxPATH_UNIX:
+            break;
+
+        case wxPATH_MAC:
+            // On a Mac even names with * and ? are allowed (Tested with OS
+            // 9.2.1 and OS X 10.2.5)
+            strForbiddenChars = wxEmptyString;
+            break;
+
+        case wxPATH_DOS:
+            strForbiddenChars += wxT("\\/:\"<>|");
+            break;
+
+        case wxPATH_VMS:
+            break;
+    }
+
+    return strForbiddenChars;
+}
+
+/* static */
+wxString wxFileName::GetVolumeSeparator(wxPathFormat WXUNUSED_IN_WINCE(format))
+{
+#ifdef __WXWINCE__
+    return wxEmptyString;
+#else
+    wxString sepVol;
+
+    if ( (GetFormat(format) == wxPATH_DOS) ||
+         (GetFormat(format) == wxPATH_VMS) )
+    {
+        sepVol = wxFILE_SEP_DSK;
+    }
+    //else: leave empty
+
+    return sepVol;
+#endif
+}
+
+/* static */
+wxString wxFileName::GetPathSeparators(wxPathFormat format)
+{
+    wxString seps;
+    switch ( GetFormat(format) )
+    {
+        case wxPATH_DOS:
+            // accept both as native APIs do but put the native one first as
+            // this is the one we use in GetFullPath()
+            seps << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_UNIX;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("Unknown wxPATH_XXX style") );
+            // fall through
+
+        case wxPATH_UNIX:
+            seps = wxFILE_SEP_PATH_UNIX;
+            break;
+
+        case wxPATH_MAC:
+            seps = wxFILE_SEP_PATH_MAC;
+            break;
+
+        case wxPATH_VMS:
+            seps = wxFILE_SEP_PATH_VMS;
+            break;
+    }
+
+    return seps;
+}
+
+/* static */
+wxString wxFileName::GetPathTerminators(wxPathFormat format)
+{
+    format = GetFormat(format);
+
+    // under VMS the end of the path is ']', not the path separator used to
+    // separate the components
+    return format == wxPATH_VMS ? wxString(_T(']')) : GetPathSeparators(format);
+}
+
+/* static */
+bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format)
+{
+    // wxString::Find() doesn't work as expected with NUL - it will always find
+    // it, so test for it separately
+    return ch != _T('\0') && GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
+}
+
+// ----------------------------------------------------------------------------
+// path components manipulation
+// ----------------------------------------------------------------------------
+
+/* static */ bool wxFileName::IsValidDirComponent(const wxString& dir)
+{
+    if ( dir.empty() )
+    {
+        wxFAIL_MSG( _T("empty directory passed to wxFileName::InsertDir()") );
+
+        return false;
+    }
+
+    const size_t len = dir.length();
+    for ( size_t n = 0; n < len; n++ )
+    {
+        if ( dir[n] == GetVolumeSeparator() || IsPathSeparator(dir[n]) )
+        {
+            wxFAIL_MSG( _T("invalid directory component in wxFileName") );
+
+            return false;
+        }
+    }
+
+    return true;
+}
+
+void wxFileName::AppendDir( const wxString& dir )
+{
+    if ( IsValidDirComponent(dir) )
+        m_dirs.Add( dir );
+}
+
+void wxFileName::PrependDir( const wxString& dir )
+{
+    InsertDir(0, dir);
+}
+
+void wxFileName::InsertDir(size_t before, const wxString& dir)
+{
+    if ( IsValidDirComponent(dir) )
+        m_dirs.Insert(dir, before);
+}
+
+void wxFileName::RemoveDir(size_t pos)
+{
+    m_dirs.RemoveAt(pos);
+}
+
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
+void wxFileName::SetFullName(const wxString& fullname)
+{
+    SplitPath(fullname, NULL /* no volume */, NULL /* no path */,
+                        &m_name, &m_ext, &m_hasExt);
+}
+
+wxString wxFileName::GetFullName() const
+{
+    wxString fullname = m_name;
+    if ( m_hasExt )
+    {
+        fullname << wxFILE_SEP_EXT << m_ext;
+    }
+
+    return fullname;
+}
+
+wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
+{
+    format = GetFormat( format );
+
+    wxString fullpath;
+
+    // return the volume with the path as well if requested
+    if ( flags & wxPATH_GET_VOLUME )
+    {
+        fullpath += wxGetVolumeString(GetVolume(), format);
+    }
+
+    // the leading character
+    switch ( format )
+    {
+        case wxPATH_MAC:
+            if ( m_relative )
+                fullpath += wxFILE_SEP_PATH_MAC;
+            break;
+
+        case wxPATH_DOS:
+            if ( !m_relative )
+                fullpath += wxFILE_SEP_PATH_DOS;
+            break;
+
+        default:
+            wxFAIL_MSG( wxT("Unknown path format") );
+            // fall through
+
+        case wxPATH_UNIX:
+            if ( !m_relative )
+            {
+                // normally the absolute file names start with a slash
+                // with one exception: the ones like "~/foo.bar" don't
+                // have it
+                if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') )
+                {
+                    fullpath += wxFILE_SEP_PATH_UNIX;
+                }
+            }
+            break;
+
+        case wxPATH_VMS:
+            // no leading character here but use this place to unset
+            // wxPATH_GET_SEPARATOR flag: under VMS it doesn't make sense
+            // as, if I understand correctly, there should never be a dot
+            // before the closing bracket
+            flags &= ~wxPATH_GET_SEPARATOR;
+    }
+
+    if ( m_dirs.empty() )
+    {
+        // there is nothing more
+        return fullpath;
+    }
+
+    // then concatenate all the path components using the path separator
+    if ( format == wxPATH_VMS )
+    {
+        fullpath += wxT('[');
+    }
+
+    const size_t dirCount = m_dirs.GetCount();
+    for ( size_t i = 0; i < dirCount; i++ )
+    {
+        switch (format)
+        {
+            case wxPATH_MAC:
+                if ( m_dirs[i] == wxT(".") )
+                {
+                    // skip appending ':', this shouldn't be done in this
+                    // case as "::" is interpreted as ".." under Unix
+                    continue;
+                }
+
+                // convert back from ".." to nothing
+                if ( !m_dirs[i].IsSameAs(wxT("..")) )
+                     fullpath += m_dirs[i];
+                break;
+
+            default:
+                wxFAIL_MSG( wxT("Unexpected path format") );
+                // still fall through
+
+            case wxPATH_DOS:
+            case wxPATH_UNIX:
+                fullpath += m_dirs[i];
+                break;
+
+            case wxPATH_VMS:
+                // TODO: What to do with ".." under VMS
+
+                // convert back from ".." to nothing
+                if ( !m_dirs[i].IsSameAs(wxT("..")) )
+                    fullpath += m_dirs[i];
+                break;
+        }
+
+        if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) )
+            fullpath += GetPathSeparator(format);
+    }
+
+    if ( format == wxPATH_VMS )
+    {
+        fullpath += wxT(']');
+    }
+
+    return fullpath;
+}
+
+wxString wxFileName::GetFullPath( wxPathFormat format ) const
+{
+    // we already have a function to get the path
+    wxString fullpath = GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR,
+                                format);
+
+    // now just add the file name and extension to it
+    fullpath += GetFullName();
+
+    return fullpath;
+}
+
+// Return the short form of the path (returns identity on non-Windows platforms)
+wxString wxFileName::GetShortPath() const
+{
+    wxString path(GetFullPath());
+
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+    DWORD sz = ::GetShortPathName(path, NULL, 0);
+    if ( sz != 0 )
+    {
+        wxString pathOut;
+        if ( ::GetShortPathName
+               (
+                path,
+                wxStringBuffer(pathOut, sz),
+                sz
+               ) != 0 )
+        {
+            return pathOut;
+        }
+    }
+#endif // Windows
+
+    return path;
+}
+
+// Return the long form of the path (returns identity on non-Windows platforms)
+wxString wxFileName::GetLongPath() const
+{
+    wxString pathOut,
+             path = GetFullPath();
+
+#if defined(__WIN32__) && !defined(__WXWINCE__) && !defined(__WXMICROWIN__)
+
+#if wxUSE_DYNLIB_CLASS
+    typedef DWORD (WINAPI *GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
+
+    // this is MT-safe as in the worst case we're going to resolve the function
+    // twice -- but as the result is the same in both threads, it's ok
+    static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
+    if ( !s_pfnGetLongPathName )
+    {
+        static bool s_triedToLoad = false;
+
+        if ( !s_triedToLoad )
+        {
+            s_triedToLoad = true;
+
+            wxDynamicLibrary dllKernel(_T("kernel32"));
+
+            const wxChar* GetLongPathName = _T("GetLongPathName")
+#if wxUSE_UNICODE
+                              _T("W");
+#else // ANSI
+                              _T("A");
+#endif // Unicode/ANSI
+
+            if ( dllKernel.HasSymbol(GetLongPathName) )
+            {
+                s_pfnGetLongPathName = (GET_LONG_PATH_NAME)
+                    dllKernel.GetSymbol(GetLongPathName);
+            }
+
+            // note that kernel32.dll can be unloaded, it stays in memory
+            // anyhow as all Win32 programs link to it and so it's safe to call
+            // GetLongPathName() even after unloading it
+        }
+    }
+
+    if ( s_pfnGetLongPathName )
+    {
+        DWORD dwSize = (*s_pfnGetLongPathName)(path, NULL, 0);
+        if ( dwSize > 0 )
+        {
+            if ( (*s_pfnGetLongPathName)
+                 (
+                  path,
+                  wxStringBuffer(pathOut, dwSize),
+                  dwSize
+                 ) != 0 )
+            {
+                return pathOut;
+            }
+        }
+    }
+#endif // wxUSE_DYNLIB_CLASS
+
+    // The OS didn't support GetLongPathName, or some other error.
+    // We need to call FindFirstFile on each component in turn.
+
+    WIN32_FIND_DATA findFileData;
+    HANDLE hFind;
+
+    if ( HasVolume() )
+        pathOut = GetVolume() +
+                  GetVolumeSeparator(wxPATH_DOS) +
+                  GetPathSeparator(wxPATH_DOS);
+    else
+        pathOut = wxEmptyString;
+
+    wxArrayString dirs = GetDirs();
+    dirs.Add(GetFullName());
+
+    wxString tmpPath;
+
+    size_t count = dirs.GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        // We're using pathOut to collect the long-name path, but using a
+        // temporary for appending the last path component which may be
+        // short-name
+        tmpPath = pathOut + dirs[i];
+
+        if ( tmpPath.empty() )
+            continue;
+
+        // can't see this being necessary? MF
+        if ( tmpPath.Last() == GetVolumeSeparator(wxPATH_DOS) )
+        {
+            // Can't pass a drive and root dir to FindFirstFile,
+            // so continue to next dir
+            tmpPath += wxFILE_SEP_PATH;
+            pathOut = tmpPath;
+            continue;
+        }
+
+        hFind = ::FindFirstFile(tmpPath, &findFileData);
+        if (hFind == INVALID_HANDLE_VALUE)
+        {
+            // Error: most likely reason is that path doesn't exist, so
+            // append any unprocessed parts and return
+            for ( i += 1; i < count; i++ )
+                tmpPath += wxFILE_SEP_PATH + dirs[i];
+
+            return tmpPath;
+        }
+
+        pathOut += findFileData.cFileName;
+        if ( (i < (count-1)) )
+            pathOut += wxFILE_SEP_PATH;
+
+        ::FindClose(hFind);
+    }
+#else // !Win32
+    pathOut = path;
+#endif // Win32/!Win32
+
+    return pathOut;
+}
+
+wxPathFormat wxFileName::GetFormat( wxPathFormat format )
+{
+    if (format == wxPATH_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__)
+        format = wxPATH_DOS;
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+        format = wxPATH_MAC;
+#elif defined(__VMS)
+        format = wxPATH_VMS;
+#else
+        format = wxPATH_UNIX;
+#endif
+    }
+    return format;
+}
+
+// ----------------------------------------------------------------------------
+// path splitting function
+// ----------------------------------------------------------------------------
+
+/* static */
+void
+wxFileName::SplitVolume(const wxString& fullpathWithVolume,
+                        wxString *pstrVolume,
+                        wxString *pstrPath,
+                        wxPathFormat format)
+{
+    format = GetFormat(format);
+
+    wxString fullpath = fullpathWithVolume;
+
+    // special Windows UNC paths hack: transform \\share\path into share:path
+    if ( IsUNCPath(fullpath, format) )
+    {
+        fullpath.erase(0, 2);
+
+        size_t posFirstSlash =
+            fullpath.find_first_of(GetPathTerminators(format));
+        if ( posFirstSlash != wxString::npos )
+        {
+            fullpath[posFirstSlash] = wxFILE_SEP_DSK;
+
+            // UNC paths are always absolute, right? (FIXME)
+            fullpath.insert(posFirstSlash + 1, 1, wxFILE_SEP_PATH_DOS);
+        }
+    }
+
+    // We separate the volume here
+    if ( format == wxPATH_DOS || format == wxPATH_VMS )
+    {
+        wxString sepVol = GetVolumeSeparator(format);
+
+        size_t posFirstColon = fullpath.find_first_of(sepVol);
+        if ( posFirstColon != wxString::npos )
+        {
+            if ( pstrVolume )
+            {
+                *pstrVolume = fullpath.Left(posFirstColon);
+            }
+
+            // remove the volume name and the separator from the full path
+            fullpath.erase(0, posFirstColon + sepVol.length());
+        }
+    }
+
+    if ( pstrPath )
+        *pstrPath = fullpath;
+}
+
+/* static */
+void wxFileName::SplitPath(const wxString& fullpathWithVolume,
+                           wxString *pstrVolume,
+                           wxString *pstrPath,
+                           wxString *pstrName,
+                           wxString *pstrExt,
+                           bool *hasExt,
+                           wxPathFormat format)
+{
+    format = GetFormat(format);
+
+    wxString fullpath;
+    SplitVolume(fullpathWithVolume, pstrVolume, &fullpath, format);
+
+    // find the positions of the last dot and last path separator in the path
+    size_t posLastDot = fullpath.find_last_of(wxFILE_SEP_EXT);
+    size_t posLastSlash = fullpath.find_last_of(GetPathTerminators(format));
+
+    // check whether this dot occurs at the very beginning of a path component
+    if ( (posLastDot != wxString::npos) &&
+         (posLastDot == 0 ||
+            IsPathSeparator(fullpath[posLastDot - 1]) ||
+            (format == wxPATH_VMS && fullpath[posLastDot - 1] == _T(']'))) )
+    {
+        // dot may be (and commonly -- at least under Unix -- is) the first
+        // character of the filename, don't treat the entire filename as
+        // extension in this case
+        posLastDot = wxString::npos;
+    }
+
+    // if we do have a dot and a slash, check that the dot is in the name part
+    if ( (posLastDot != wxString::npos) &&
+         (posLastSlash != wxString::npos) &&
+         (posLastDot < posLastSlash) )
+    {
+        // the dot is part of the path, not the start of the extension
+        posLastDot = wxString::npos;
+    }
+
+    // now fill in the variables provided by user
+    if ( pstrPath )
+    {
+        if ( posLastSlash == wxString::npos )
+        {
+            // no path at all
+            pstrPath->Empty();
+        }
+        else
+        {
+            // take everything up to the path separator but take care to make
+            // the path equal to something like '/', not empty, for the files
+            // immediately under root directory
+            size_t len = posLastSlash;
+
+            // this rule does not apply to mac since we do not start with colons (sep)
+            // except for relative paths
+            if ( !len && format != wxPATH_MAC)
+                len++;
+
+            *pstrPath = fullpath.Left(len);
+
+            // special VMS hack: remove the initial bracket
+            if ( format == wxPATH_VMS )
+            {
+                if ( (*pstrPath)[0u] == _T('[') )
+                    pstrPath->erase(0, 1);
+            }
+        }
+    }
+
+    if ( pstrName )
+    {
+        // take all characters starting from the one after the last slash and
+        // up to, but excluding, the last dot
+        size_t nStart = posLastSlash == wxString::npos ? 0 : posLastSlash + 1;
+        size_t count;
+        if ( posLastDot == wxString::npos )
+        {
+            // take all until the end
+            count = wxString::npos;
+        }
+        else if ( posLastSlash == wxString::npos )
+        {
+            count = posLastDot;
+        }
+        else // have both dot and slash
+        {
+            count = posLastDot - posLastSlash - 1;
+        }
+
+        *pstrName = fullpath.Mid(nStart, count);
+    }
+
+    // finally deal with the extension here: we have an added complication that
+    // extension may be empty (but present) as in "foo." where trailing dot
+    // indicates the empty extension at the end -- and hence we must remember
+    // that we have it independently of pstrExt
+    if ( posLastDot == wxString::npos )
+    {
+        // no extension
+        if ( pstrExt )
+            pstrExt->clear();
+        if ( hasExt )
+            *hasExt = false;
+    }
+    else
+    {
+        // take everything after the dot
+        if ( pstrExt )
+            *pstrExt = fullpath.Mid(posLastDot + 1);
+        if ( hasExt )
+            *hasExt = true;
+    }
+}
+
+/* static */
+void wxFileName::SplitPath(const wxString& fullpath,
+                           wxString *path,
+                           wxString *name,
+                           wxString *ext,
+                           wxPathFormat format)
+{
+    wxString volume;
+    SplitPath(fullpath, &volume, path, name, ext, format);
+
+    if ( path )
+    {
+        path->Prepend(wxGetVolumeString(volume, format));
+    }
+}
+
+/* static */
+wxString wxFileName::StripExtension(const wxString& fullpath)
+{
+    wxFileName fn(fullpath);
+    fn.SetExt(_T(""));
+    return fn.GetFullPath();
+}
+
+// ----------------------------------------------------------------------------
+// time functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DATETIME
+
+bool wxFileName::SetTimes(const wxDateTime *dtAccess,
+                          const wxDateTime *dtMod,
+                          const wxDateTime *dtCreate)
+{
+#if defined(__WIN32__)
+    FILETIME ftAccess, ftCreate, ftWrite;
+
+    if ( dtCreate )
+        ConvertWxToFileTime(&ftCreate, *dtCreate);
+    if ( dtAccess )
+        ConvertWxToFileTime(&ftAccess, *dtAccess);
+    if ( dtMod )
+        ConvertWxToFileTime(&ftWrite, *dtMod);
+
+    wxString path;
+    int flags;
+    if ( IsDir() )
+    {
+        if ( wxGetOsVersion() == wxOS_WINDOWS_9X )
+        {
+            wxLogError(_("Setting directory access times is not supported under this OS version"));
+            return false;
+        }
+
+        path = GetPath();
+        flags = FILE_FLAG_BACKUP_SEMANTICS;
+    }
+    else // file
+    {
+        path = GetFullPath();
+        flags = 0;
+    }
+
+    wxFileHandle fh(path, wxFileHandle::Write, flags);
+    if ( fh.IsOk() )
+    {
+        if ( ::SetFileTime(fh,
+                           dtCreate ? &ftCreate : NULL,
+                           dtAccess ? &ftAccess : NULL,
+                           dtMod ? &ftWrite : NULL) )
+        {
+            return true;
+        }
+    }
+#elif defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__))
+    wxUnusedVar(dtCreate);
+
+    if ( !dtAccess && !dtMod )
+    {
+        // can't modify the creation time anyhow, don't try
+        return true;
+    }
+
+    // if dtAccess or dtMod is not specified, use the other one (which must be
+    // non NULL because of the test above) for both times
+    utimbuf utm;
+    utm.actime = dtAccess ? dtAccess->GetTicks() : dtMod->GetTicks();
+    utm.modtime = dtMod ? dtMod->GetTicks() : dtAccess->GetTicks();
+    if ( utime(GetFullPath().fn_str(), &utm) == 0 )
+    {
+        return true;
+    }
+#else // other platform
+    wxUnusedVar(dtAccess);
+    wxUnusedVar(dtMod);
+    wxUnusedVar(dtCreate);
+#endif // platforms
+
+    wxLogSysError(_("Failed to modify file times for '%s'"),
+                  GetFullPath().c_str());
+
+    return false;
+}
+
+bool wxFileName::Touch()
+{
+#if defined(__UNIX_LIKE__)
+    // under Unix touching file is simple: just pass NULL to utime()
+    if ( utime(GetFullPath().fn_str(), NULL) == 0 )
+    {
+        return true;
+    }
+
+    wxLogSysError(_("Failed to touch the file '%s'"), GetFullPath().c_str());
+
+    return false;
+#else // other platform
+    wxDateTime dtNow = wxDateTime::Now();
+
+    return SetTimes(&dtNow, &dtNow, NULL /* don't change create time */);
+#endif // platforms
+}
+
+#ifdef wxNEED_WX_UNISTD_H
+
+static int wxStat( const char *file_name, wxStructStat *buf )
+{
+    return stat( file_name , buf );
+}
+
+#endif
+
+bool wxFileName::GetTimes(wxDateTime *dtAccess,
+                          wxDateTime *dtMod,
+                          wxDateTime *dtCreate) const
+{
+#if defined(__WIN32__)
+    // we must use different methods for the files and directories under
+    // Windows as CreateFile(GENERIC_READ) doesn't work for the directories and
+    // CreateFile(FILE_FLAG_BACKUP_SEMANTICS) works -- but only under NT and
+    // not 9x
+    bool ok;
+    FILETIME ftAccess, ftCreate, ftWrite;
+    if ( IsDir() )
+    {
+        // implemented in msw/dir.cpp
+        extern bool wxGetDirectoryTimes(const wxString& dirname,
+                                        FILETIME *, FILETIME *, FILETIME *);
+
+        // we should pass the path without the trailing separator to
+        // wxGetDirectoryTimes()
+        ok = wxGetDirectoryTimes(GetPath(wxPATH_GET_VOLUME),
+                                 &ftAccess, &ftCreate, &ftWrite);
+    }
+    else // file
+    {
+        wxFileHandle fh(GetFullPath(), wxFileHandle::Read);
+        if ( fh.IsOk() )
+        {
+            ok = ::GetFileTime(fh,
+                               dtCreate ? &ftCreate : NULL,
+                               dtAccess ? &ftAccess : NULL,
+                               dtMod ? &ftWrite : NULL) != 0;
+        }
+        else
+        {
+            ok = false;
+        }
+    }
+
+    if ( ok )
+    {
+        if ( dtCreate )
+            ConvertFileTimeToWx(dtCreate, ftCreate);
+        if ( dtAccess )
+            ConvertFileTimeToWx(dtAccess, ftAccess);
+        if ( dtMod )
+            ConvertFileTimeToWx(dtMod, ftWrite);
+
+        return true;
+    }
+#elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__))
+    // no need to test for IsDir() here
+    wxStructStat stBuf;
+    if ( wxStat( GetFullPath().fn_str(), &stBuf) == 0 )
+    {
+        if ( dtAccess )
+            dtAccess->Set(stBuf.st_atime);
+        if ( dtMod )
+            dtMod->Set(stBuf.st_mtime);
+        if ( dtCreate )
+            dtCreate->Set(stBuf.st_ctime);
+
+        return true;
+    }
+#else // other platform
+    wxUnusedVar(dtAccess);
+    wxUnusedVar(dtMod);
+    wxUnusedVar(dtCreate);
+#endif // platforms
+
+    wxLogSysError(_("Failed to retrieve file times for '%s'"),
+                  GetFullPath().c_str());
+
+    return false;
+}
+
+#endif // wxUSE_DATETIME
+
+
+// ----------------------------------------------------------------------------
+// file size functions
+// ----------------------------------------------------------------------------
+
+/* static */
+wxULongLong wxFileName::GetSize(const wxString &filename)
+{
+    if (!wxFileExists(filename))
+        return wxInvalidSize;
+
+#if defined(__WXPALMOS__)
+    // TODO
+    return wxInvalidSize;
+#elif defined(__WIN32__)
+    wxFileHandle f(filename, wxFileHandle::Read);
+    if (!f.IsOk())
+        return wxInvalidSize;
+
+    DWORD lpFileSizeHigh;
+    DWORD ret = GetFileSize(f, &lpFileSizeHigh);
+    if ( ret == INVALID_FILE_SIZE && ::GetLastError() != NO_ERROR )
+        return wxInvalidSize;
+
+    return wxULongLong(lpFileSizeHigh, ret);
+#else // ! __WIN32__
+    wxStructStat st;
+#ifndef wxNEED_WX_UNISTD_H
+    if (wxStat( filename.fn_str() , &st) != 0)
+#else
+    if (wxStat( filename, &st) != 0)
+#endif
+        return wxInvalidSize;
+    return wxULongLong(st.st_size);
+#endif
+}
+
+/* static */
+wxString wxFileName::GetHumanReadableSize(const wxULongLong &bs,
+                                          const wxString &nullsize,
+                                          int precision)
+{
+    static const double KILOBYTESIZE = 1024.0;
+    static const double MEGABYTESIZE = 1024.0*KILOBYTESIZE;
+    static const double GIGABYTESIZE = 1024.0*MEGABYTESIZE;
+    static const double TERABYTESIZE = 1024.0*GIGABYTESIZE;
+
+    if (bs == 0 || bs == wxInvalidSize)
+        return nullsize;
+
+    double bytesize = bs.ToDouble();
+    if (bytesize < KILOBYTESIZE)
+        return wxString::Format(_("%s B"), bs.ToString().c_str());
+    if (bytesize < MEGABYTESIZE)
+        return wxString::Format(_("%.*f kB"), precision, bytesize/KILOBYTESIZE);
+    if (bytesize < GIGABYTESIZE)
+        return wxString::Format(_("%.*f MB"), precision, bytesize/MEGABYTESIZE);
+    if (bytesize < TERABYTESIZE)
+        return wxString::Format(_("%.*f GB"), precision, bytesize/GIGABYTESIZE);
+
+    return wxString::Format(_("%.*f TB"), precision, bytesize/TERABYTESIZE);
+}
+
+wxULongLong wxFileName::GetSize() const
+{
+    return GetSize(GetFullPath());
+}
+
+wxString wxFileName::GetHumanReadableSize(const wxString &failmsg, int precision) const
+{
+    return GetHumanReadableSize(GetSize(), failmsg, precision);
+}
+
+
+// ----------------------------------------------------------------------------
+// Mac-specific functions
+// ----------------------------------------------------------------------------
+
+#ifdef __WXMAC__
+
+const short kMacExtensionMaxLength = 16 ;
+class MacDefaultExtensionRecord
+{
+public :
+  MacDefaultExtensionRecord()
+  {
+    m_ext[0] = 0 ;
+    m_type = m_creator = 0 ;
+  }
+  MacDefaultExtensionRecord( const MacDefaultExtensionRecord& from )
+  {
+    wxStrcpy( m_ext , from.m_ext ) ;
+    m_type = from.m_type ;
+    m_creator = from.m_creator ;
+  }
+  MacDefaultExtensionRecord( const wxChar * extension , OSType type , OSType creator )
+  {
+    wxStrncpy( m_ext , extension , kMacExtensionMaxLength ) ;
+    m_ext[kMacExtensionMaxLength] = 0 ;
+    m_type = type ;
+    m_creator = creator ;
+  }
+  wxChar m_ext[kMacExtensionMaxLength] ;
+  OSType m_type ;
+  OSType m_creator ;
+}  ;
+
+WX_DECLARE_OBJARRAY(MacDefaultExtensionRecord, MacDefaultExtensionArray) ;
+
+bool gMacDefaultExtensionsInited = false ;
+
+#include "wx/arrimpl.cpp"
+
+WX_DEFINE_EXPORTED_OBJARRAY(MacDefaultExtensionArray) ;
+
+MacDefaultExtensionArray gMacDefaultExtensions ;
+
+// load the default extensions
+MacDefaultExtensionRecord gDefaults[] =
+{
+    MacDefaultExtensionRecord( wxT("txt") , 'TEXT' , 'ttxt' ) ,
+    MacDefaultExtensionRecord( wxT("tif") , 'TIFF' , '****' ) ,
+    MacDefaultExtensionRecord( wxT("jpg") , 'JPEG' , '****' ) ,
+} ;
+
+static void MacEnsureDefaultExtensionsLoaded()
+{
+    if ( !gMacDefaultExtensionsInited )
+    {
+        // we could load the pc exchange prefs here too
+        for ( size_t i = 0 ; i < WXSIZEOF( gDefaults ) ; ++i )
+        {
+            gMacDefaultExtensions.Add( gDefaults[i] ) ;
+        }
+        gMacDefaultExtensionsInited = true ;
+    }
+}
+
+bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator )
+{
+    FSRef fsRef ;
+    FSCatalogInfo catInfo;
+    FileInfo *finfo ;
+
+    if ( wxMacPathToFSRef( GetFullPath() , &fsRef ) == noErr )
+    {
+        if ( FSGetCatalogInfo (&fsRef, kFSCatInfoFinderInfo, &catInfo, NULL, NULL, NULL) == noErr )
+        {
+            finfo = (FileInfo*)&catInfo.finderInfo;
+            finfo->fileType = type ;
+            finfo->fileCreator = creator ;
+            FSSetCatalogInfo( &fsRef, kFSCatInfoFinderInfo, &catInfo ) ;
+            return true ;
+        }
+    }
+    return false ;
+}
+
+bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator )
+{
+    FSRef fsRef ;
+    FSCatalogInfo catInfo;
+    FileInfo *finfo ;
+
+    if ( wxMacPathToFSRef( GetFullPath() , &fsRef ) == noErr )
+    {
+        if ( FSGetCatalogInfo (&fsRef, kFSCatInfoFinderInfo, &catInfo, NULL, NULL, NULL) == noErr )
+        {
+            finfo = (FileInfo*)&catInfo.finderInfo;
+            *type = finfo->fileType ;
+            *creator = finfo->fileCreator ;
+            return true ;
+        }
+    }
+    return false ;
+}
+
+bool wxFileName::MacSetDefaultTypeAndCreator()
+{
+    wxUint32 type , creator ;
+    if ( wxFileName::MacFindDefaultTypeAndCreator(GetExt() , &type ,
+      &creator ) )
+    {
+        return MacSetTypeAndCreator( type , creator ) ;
+    }
+    return false;
+}
+
+bool wxFileName::MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator )
+{
+  MacEnsureDefaultExtensionsLoaded() ;
+  wxString extl = ext.Lower() ;
+  for( int i = gMacDefaultExtensions.Count() - 1 ; i >= 0 ; --i )
+  {
+    if ( gMacDefaultExtensions.Item(i).m_ext == extl )
+    {
+      *type = gMacDefaultExtensions.Item(i).m_type ;
+      *creator = gMacDefaultExtensions.Item(i).m_creator ;
+      return true ;
+    }
+  }
+  return false ;
+}
+
+void wxFileName::MacRegisterDefaultTypeAndCreator( const wxString& ext , wxUint32 type , wxUint32 creator )
+{
+  MacEnsureDefaultExtensionsLoaded() ;
+  MacDefaultExtensionRecord rec ;
+  rec.m_type = type ;
+  rec.m_creator = creator ;
+  wxStrncpy( rec.m_ext , ext.Lower().c_str() , kMacExtensionMaxLength ) ;
+  gMacDefaultExtensions.Add( rec ) ;
+}
+#endif
diff --git a/Source/3rd Party/wx/src/common/filepickercmn.cpp b/Source/3rd Party/wx/src/common/filepickercmn.cpp
index 7b40bc146..7b805dc8f 100644
--- a/Source/3rd Party/wx/src/common/filepickercmn.cpp	
+++ b/Source/3rd Party/wx/src/common/filepickercmn.cpp	
@@ -1,269 +1,224 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/filepickercmn.cpp
-// Purpose:     wxFilePickerCtrl class implementation
-// Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
-// Modified by:
-// Created:     15/04/2006
-// RCS-ID:      $Id$
-// Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
-
-#include "wx/filepicker.h"
-#include "wx/filename.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
-#endif
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-const char wxFilePickerCtrlNameStr[] = "filepicker";
-const char wxFilePickerWidgetNameStr[] = "filepickerwidget";
-const char wxDirPickerCtrlNameStr[] = "dirpicker";
-const char wxDirPickerWidgetNameStr[] = "dirpickerwidget";
-const char wxFilePickerWidgetLabel[] = wxTRANSLATE("Browse");
-const char wxDirPickerWidgetLabel[] = wxTRANSLATE("Browse");
-
-wxDEFINE_EVENT( wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_DIRPICKER_CHANGED,  wxFileDirPickerEvent );
-IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
-
-// ----------------------------------------------------------------------------
-// wxFileDirPickerCtrlBase
-// ----------------------------------------------------------------------------
-
-bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent,
-                                         wxWindowID id,
-                                         const wxString &path,
-                                         const wxString &message,
-                                         const wxString &wildcard,
-                                         const wxPoint &pos,
-                                         const wxSize &size,
-                                         long style,
-                                         const wxValidator& validator,
-                                         const wxString &name )
-{
-    wxASSERT_MSG(path.empty() || CheckPath(path), wxT("Invalid initial path!"));
-
-    if (!wxPickerBase::CreateBase(parent, id, path, pos, size,
-                                   style, validator, name))
-        return false;
-
-    if (!HasFlag(wxFLP_OPEN) && !HasFlag(wxFLP_SAVE))
-        m_windowStyle |= wxFLP_OPEN;     // wxFD_OPEN is the default
-
-    // check that the styles are not contradictory
-    wxASSERT_MSG( !(HasFlag(wxFLP_SAVE) && HasFlag(wxFLP_OPEN)),
-                  wxT("can't specify both wxFLP_SAVE and wxFLP_OPEN at once") );
-
-    wxASSERT_MSG( !HasFlag(wxFLP_SAVE) || !HasFlag(wxFLP_FILE_MUST_EXIST),
-                   wxT("wxFLP_FILE_MUST_EXIST can't be used with wxFLP_SAVE" ) );
-
-    wxASSERT_MSG( !HasFlag(wxFLP_OPEN) || !HasFlag(wxFLP_OVERWRITE_PROMPT),
-                  wxT("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") );
-
-    // create a wxFilePickerWidget or a wxDirPickerWidget...
-    m_pickerIface = CreatePicker(this, path, message, wildcard);
-    if ( !m_pickerIface )
-        return false;
-    m_picker = m_pickerIface->AsControl();
-
-    // complete sizer creation
-    wxPickerBase::PostCreation();
-
-    DoConnect( m_picker, this );
-
-    // default's wxPickerBase textctrl limit is too small for this control:
-    // make it bigger
-    if (m_text) m_text->SetMaxLength(512);
-
-    return true;
-}
-
-wxString wxFileDirPickerCtrlBase::GetPath() const
-{
-    return m_pickerIface->GetPath();
-}
-
-void wxFileDirPickerCtrlBase::SetPath(const wxString &path)
-{
-    m_pickerIface->SetPath(path);
-    UpdateTextCtrlFromPicker();
-}
-
-void wxFileDirPickerCtrlBase::UpdatePickerFromTextCtrl()
-{
-    wxASSERT(m_text);
-
-    if (m_bIgnoreNextTextCtrlUpdate)
-    {
-        // ignore this update
-        m_bIgnoreNextTextCtrlUpdate = false;
-        return;
-    }
-
-    // remove the eventually present path-separator from the end of the textctrl
-    // string otherwise we would generate a wxFileDirPickerEvent when changing
-    // from e.g. /home/user to /home/user/ and we want to avoid it !
-    wxString newpath(GetTextCtrlValue());
-    if (!CheckPath(newpath))
-        return;       // invalid user input
-
-    if (m_pickerIface->GetPath() != newpath)
-    {
-        m_pickerIface->SetPath(newpath);
-
-        // update current working directory, if necessary
-        // NOTE: the path separator is required because if newpath is "C:"
-        //       then no change would happen
-        if (IsCwdToUpdate())
-            wxSetWorkingDirectory(newpath);
-
-        // fire an event
-        wxFileDirPickerEvent event(GetEventType(), this, GetId(), newpath);
-        GetEventHandler()->ProcessEvent(event);
-    }
-}
-
-void wxFileDirPickerCtrlBase::UpdateTextCtrlFromPicker()
-{
-    if (!m_text)
-        return;     // no textctrl to update
-
-    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
-    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
-    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
-    m_bIgnoreNextTextCtrlUpdate = true;
-    m_text->SetValue(m_pickerIface->GetPath());
-}
-
-
-
-// ----------------------------------------------------------------------------
-// wxFileDirPickerCtrlBase - event handlers
-// ----------------------------------------------------------------------------
-
-void wxFileDirPickerCtrlBase::OnFileDirChange(wxFileDirPickerEvent &ev)
-{
-    UpdateTextCtrlFromPicker();
-
-    // the wxFilePickerWidget sent us a colour-change notification.
-    // forward this event to our parent
-    wxFileDirPickerEvent event(GetEventType(), this, GetId(), ev.GetPath());
-    GetEventHandler()->ProcessEvent(event);
-}
-
-#endif  // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
-
-// ----------------------------------------------------------------------------
-// wxFileDirPickerCtrl
-// ----------------------------------------------------------------------------
-
-#if wxUSE_FILEPICKERCTRL
-
-IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase)
-
-bool wxFilePickerCtrl::Create(wxWindow *parent,
-                              wxWindowID id,
-                              const wxString& path,
-                              const wxString& message,
-                              const wxString& wildcard,
-                              const wxPoint& pos,
-                              const wxSize& size,
-                              long style,
-                              const wxValidator& validator,
-                              const wxString& name)
-{
-    if ( !wxFileDirPickerCtrlBase::CreateBase
-                                   (
-                                        parent, id, path, message, wildcard,
-                                        pos, size, style, validator, name
-                                   ) )
-        return false;
-
-    if ( HasTextCtrl() )
-        GetTextCtrl()->AutoCompleteFileNames();
-
-    return true;
-}
-
-bool wxFilePickerCtrl::CheckPath(const wxString& path) const
-{
-    // if wxFLP_SAVE was given or wxFLP_FILE_MUST_EXIST has NOT been given we
-    // must accept any path
-    return HasFlag(wxFLP_SAVE) ||
-            !HasFlag(wxFLP_FILE_MUST_EXIST) ||
-                wxFileName::FileExists(path);
-}
-
-wxString wxFilePickerCtrl::GetTextCtrlValue() const
-{
-    // filter it through wxFileName to remove any spurious path separator
-    return wxFileName(m_text->GetValue()).GetFullPath();
-}
-
-#endif // wxUSE_FILEPICKERCTRL
-
-// ----------------------------------------------------------------------------
-// wxDirPickerCtrl
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DIRPICKERCTRL
-IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase)
-
-bool wxDirPickerCtrl::Create(wxWindow *parent,
-                             wxWindowID id,
-                             const wxString& path,
-                             const wxString& message,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             long style,
-                             const wxValidator& validator,
-                             const wxString& name)
-{
-    if ( !wxFileDirPickerCtrlBase::CreateBase
-                                   (
-                                        parent, id, path, message, wxString(),
-                                        pos, size, style, validator, name
-                                   ) )
-        return false;
-
-    if ( HasTextCtrl() )
-        GetTextCtrl()->AutoCompleteDirectories();
-
-    return true;
-}
-
-bool wxDirPickerCtrl::CheckPath(const wxString& path) const
-{
-    // if wxDIRP_DIR_MUST_EXIST has NOT been given we must accept any path
-    return !HasFlag(wxDIRP_DIR_MUST_EXIST) || wxFileName::DirExists(path);
-}
-
-wxString wxDirPickerCtrl::GetTextCtrlValue() const
-{
-    // filter it through wxFileName to remove any spurious path separator
-    return wxFileName::DirName(m_text->GetValue()).GetPath();
-}
-
-#endif // wxUSE_DIRPICKERCTRL
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/filepickercmn.cpp
+// Purpose:     wxFilePickerCtrl class implementation
+// Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
+// Modified by:
+// Created:     15/04/2006
+// RCS-ID:      $Id: filepickercmn.cpp 42219 2006-10-21 19:53:05Z PC $
+// Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
+
+#include "wx/filepicker.h"
+#include "wx/filename.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+const wxChar wxFilePickerCtrlNameStr[] = wxT("filepicker");
+const wxChar wxFilePickerWidgetNameStr[] = wxT("filepickerwidget");
+const wxChar wxDirPickerCtrlNameStr[] = wxT("dirpicker");
+const wxChar wxDirPickerWidgetNameStr[] = wxT("dirpickerwidget");
+const wxChar wxFilePickerWidgetLabel[] = wxT("Browse");
+const wxChar wxDirPickerWidgetLabel[] = wxT("Browse");
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FILEPICKER_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DIRPICKER_CHANGED)
+IMPLEMENT_DYNAMIC_CLASS(wxFileDirPickerEvent, wxCommandEvent)
+
+// ----------------------------------------------------------------------------
+// wxFileDirPickerCtrlBase
+// ----------------------------------------------------------------------------
+
+bool wxFileDirPickerCtrlBase::CreateBase(wxWindow *parent,
+                                         wxWindowID id,
+                                         const wxString &path,
+                                         const wxString &message,
+                                         const wxString &wildcard,
+                                         const wxPoint &pos,
+                                         const wxSize &size,
+                                         long style,
+                                         const wxValidator& validator,
+                                         const wxString &name )
+{
+    wxASSERT_MSG(path.empty() || CheckPath(path), wxT("Invalid initial path!"));
+
+    if (!wxPickerBase::CreateBase(parent, id, path, pos, size,
+                                   style, validator, name))
+        return false;
+
+    if (!HasFlag(wxFLP_OPEN) && !HasFlag(wxFLP_SAVE))
+        m_windowStyle |= wxFLP_OPEN;     // wxFD_OPEN is the default
+
+    // check that the styles are not contradictory
+    wxASSERT_MSG( !(HasFlag(wxFLP_SAVE) && HasFlag(wxFLP_OPEN)),
+                  _T("can't specify both wxFLP_SAVE and wxFLP_OPEN at once") );
+
+    wxASSERT_MSG( !HasFlag(wxFLP_SAVE) || !HasFlag(wxFLP_FILE_MUST_EXIST),
+                   _T("wxFLP_FILE_MUST_EXIST can't be used with wxFLP_SAVE" ) );
+
+    wxASSERT_MSG( !HasFlag(wxFLP_OPEN) || !HasFlag(wxFLP_OVERWRITE_PROMPT),
+                  _T("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") );
+
+    // create a wxFilePickerWidget or a wxDirPickerWidget...
+    m_pickerIface = CreatePicker(this, path, message, wildcard);
+    if ( !m_pickerIface )
+        return false;
+    m_picker = m_pickerIface->AsControl();
+
+    // complete sizer creation
+    wxPickerBase::PostCreation();
+
+    m_picker->Connect(GetEventType(),
+            wxFileDirPickerEventHandler(wxFileDirPickerCtrlBase::OnFileDirChange),
+            NULL, this);
+
+    // default's wxPickerBase textctrl limit is too small for this control:
+    // make it bigger
+    if (m_text) m_text->SetMaxLength(512);
+
+    return true;
+}
+
+wxString wxFileDirPickerCtrlBase::GetPath() const
+{
+    return m_pickerIface->GetPath();
+}
+
+void wxFileDirPickerCtrlBase::SetPath(const wxString &path)
+{
+    m_pickerIface->SetPath(path);
+    UpdateTextCtrlFromPicker();
+}
+
+void wxFileDirPickerCtrlBase::UpdatePickerFromTextCtrl()
+{
+    wxASSERT(m_text);
+
+    if (m_bIgnoreNextTextCtrlUpdate)
+    {
+        // ignore this update
+        m_bIgnoreNextTextCtrlUpdate = false;
+        return;
+    }
+
+    // remove the eventually present path-separator from the end of the textctrl
+    // string otherwise we would generate a wxFileDirPickerEvent when changing
+    // from e.g. /home/user to /home/user/ and we want to avoid it !
+    wxString newpath(GetTextCtrlValue());
+    if (!CheckPath(newpath))
+        return;       // invalid user input
+
+    if (m_pickerIface->GetPath() != newpath)
+    {
+        m_pickerIface->SetPath(newpath);
+
+        // update current working directory, if necessary
+        // NOTE: the path separator is required because if newpath is "C:"
+        //       then no change would happen
+        if (IsCwdToUpdate())
+            wxSetWorkingDirectory(newpath);
+
+        // fire an event
+        wxFileDirPickerEvent event(GetEventType(), this, GetId(), newpath);
+        GetEventHandler()->ProcessEvent(event);
+    }
+}
+
+void wxFileDirPickerCtrlBase::UpdateTextCtrlFromPicker()
+{
+    if (!m_text)
+        return;     // no textctrl to update
+
+    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
+    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
+    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
+    m_bIgnoreNextTextCtrlUpdate = true;
+    m_text->SetValue(m_pickerIface->GetPath());
+}
+
+
+
+// ----------------------------------------------------------------------------
+// wxFileDirPickerCtrlBase - event handlers
+// ----------------------------------------------------------------------------
+
+void wxFileDirPickerCtrlBase::OnFileDirChange(wxFileDirPickerEvent &ev)
+{
+    UpdateTextCtrlFromPicker();
+
+    // the wxFilePickerWidget sent us a colour-change notification.
+    // forward this event to our parent
+    wxFileDirPickerEvent event(GetEventType(), this, GetId(), ev.GetPath());
+    GetEventHandler()->ProcessEvent(event);
+}
+
+#endif  // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
+
+// ----------------------------------------------------------------------------
+// wxFileDirPickerCtrl
+// ----------------------------------------------------------------------------
+
+#if wxUSE_FILEPICKERCTRL
+
+IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrl, wxPickerBase)
+
+bool wxFilePickerCtrl::CheckPath(const wxString& path) const
+{
+    // if wxFLP_SAVE was given or wxFLP_FILE_MUST_EXIST has NOT been given we
+    // must accept any path
+    return HasFlag(wxFLP_SAVE) ||
+            !HasFlag(wxFLP_FILE_MUST_EXIST) ||
+                wxFileName::FileExists(path);
+}
+
+wxString wxFilePickerCtrl::GetTextCtrlValue() const
+{
+    // filter it through wxFileName to remove any spurious path separator
+    return wxFileName(m_text->GetValue()).GetFullPath();
+}
+
+#endif // wxUSE_FILEPICKERCTRL
+
+// ----------------------------------------------------------------------------
+// wxDirPickerCtrl
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DIRPICKERCTRL
+IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrl, wxPickerBase)
+
+bool wxDirPickerCtrl::CheckPath(const wxString& path) const
+{
+    // if wxDIRP_DIR_MUST_EXIST has NOT been given we must accept any path
+    return !HasFlag(wxDIRP_DIR_MUST_EXIST) || wxFileName::DirExists(path);
+}
+
+wxString wxDirPickerCtrl::GetTextCtrlValue() const
+{
+    // filter it through wxFileName to remove any spurious path separator
+    return wxFileName::DirName(m_text->GetValue()).GetPath();
+}
+
+#endif // wxUSE_DIRPICKERCTRL
diff --git a/Source/3rd Party/wx/src/common/filesys.cpp b/Source/3rd Party/wx/src/common/filesys.cpp
index 89fc930ac..0f850bcf6 100644
--- a/Source/3rd Party/wx/src/common/filesys.cpp	
+++ b/Source/3rd Party/wx/src/common/filesys.cpp	
@@ -1,784 +1,700 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/filesys.cpp
-// Purpose:     wxFileSystem class - interface for opening files
-// Author:      Vaclav Slavik
-// Copyright:   (c) 1999 Vaclav Slavik
-// CVS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-
-#if wxUSE_FILESYSTEM
-
-#include "wx/filesys.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/module.h"
-#endif
-
-#include "wx/sysopt.h"
-#include "wx/wfstream.h"
-#include "wx/mimetype.h"
-#include "wx/filename.h"
-#include "wx/tokenzr.h"
-#include "wx/uri.h"
-#include "wx/private/fileback.h"
-
-// ----------------------------------------------------------------------------
-// wxFSFile
-// ----------------------------------------------------------------------------
-
-const wxString& wxFSFile::GetMimeType() const
-{
-    if ( m_MimeType.empty() && !m_Location.empty() )
-    {
-        wxConstCast(this, wxFSFile)->m_MimeType =
-            wxFileSystemHandler::GetMimeTypeFromExt(m_Location);
-    }
-
-    return m_MimeType;
-}
-
-// ----------------------------------------------------------------------------
-// wxFileSystemHandler
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
-
-
-/* static */
-wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
-{
-    wxString ext, mime;
-    wxString loc = GetRightLocation(location);
-    wxChar c;
-    int l = loc.length(), l2;
-
-    l2 = l;
-    for (int i = l-1; i >= 0; i--)
-    {
-        c = loc[(unsigned int) i];
-        if ( c == wxT('#') )
-            l2 = i + 1;
-        if ( c == wxT('.') )
-        {
-            ext = loc.Right(l2-i-1);
-            break;
-        }
-        if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) )
-            return wxEmptyString;
-    }
-
-#if wxUSE_MIMETYPE
-    static bool s_MinimalMimeEnsured = false;
-
-    // Don't use mime types manager if the application doesn't need it and it would be
-    // cause an unacceptable delay, especially on startup.
-#if wxUSE_SYSTEM_OPTIONS
-    if ( !wxSystemOptions::GetOptionInt(wxT("filesys.no-mimetypesmanager")) )
-#endif
-    {
-        if (!s_MinimalMimeEnsured)
-        {
-            static const wxFileTypeInfo fallbacks[] =
-            {
-                wxFileTypeInfo(wxT("image/jpeg"),
-                    wxEmptyString,
-                    wxEmptyString,
-                    wxT("JPEG image (from fallback)"),
-                    wxT("jpg"), wxT("jpeg"), wxT("JPG"), wxT("JPEG"), wxNullPtr),
-                wxFileTypeInfo(wxT("image/gif"),
-                    wxEmptyString,
-                    wxEmptyString,
-                    wxT("GIF image (from fallback)"),
-                    wxT("gif"), wxT("GIF"), wxNullPtr),
-                wxFileTypeInfo(wxT("image/png"),
-                    wxEmptyString,
-                    wxEmptyString,
-                    wxT("PNG image (from fallback)"),
-                    wxT("png"), wxT("PNG"), wxNullPtr),
-                wxFileTypeInfo(wxT("image/bmp"),
-                    wxEmptyString,
-                    wxEmptyString,
-                    wxT("windows bitmap image (from fallback)"),
-                    wxT("bmp"), wxT("BMP"), wxNullPtr),
-                wxFileTypeInfo(wxT("text/html"),
-                    wxEmptyString,
-                    wxEmptyString,
-                    wxT("HTML document (from fallback)"),
-                    wxT("htm"), wxT("html"), wxT("HTM"), wxT("HTML"), wxNullPtr),
-                // must terminate the table with this!
-                wxFileTypeInfo()
-            };
-            wxTheMimeTypesManager->AddFallbacks(fallbacks);
-            s_MinimalMimeEnsured = true;
-        }
-
-        wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
-        if ( !ft || !ft -> GetMimeType(&mime) )
-        {
-            mime = wxEmptyString;
-        }
-
-        delete ft;
-
-        return mime;
-    }
-    else
-#endif
-    {
-        if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(wxT("html"), false) )
-            return wxT("text/html");
-        if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(wxT("jpeg"), false) )
-            return wxT("image/jpeg");
-        if ( ext.IsSameAs(wxT("gif"), false) )
-            return wxT("image/gif");
-        if ( ext.IsSameAs(wxT("png"), false) )
-            return wxT("image/png");
-        if ( ext.IsSameAs(wxT("bmp"), false) )
-            return wxT("image/bmp");
-        return wxEmptyString;
-    }
-}
-
-
-
-/* static */
-wxString wxFileSystemHandler::GetProtocol(const wxString& location)
-{
-    wxString s = wxEmptyString;
-    int i, l = location.length();
-    bool fnd = false;
-
-    for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
-        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
-    }
-    if (!fnd) return wxT("file");
-    for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];
-    return s;
-}
-
-
-/* static */
-wxString wxFileSystemHandler::GetLeftLocation(const wxString& location)
-{
-    int i;
-    bool fnd = false;
-
-    for (i = location.length()-1; i >= 0; i--) {
-        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
-        else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
-    }
-    return wxEmptyString;
-}
-
-/* static */
-wxString wxFileSystemHandler::GetRightLocation(const wxString& location)
-{
-    int i, l = location.length();
-    int l2 = l + 1;
-
-    for (i = l-1;
-         (i >= 0) &&
-         ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':')));
-         i--)
-    {
-        if (location[i] == wxT('#')) l2 = i + 1;
-    }
-    if (i == 0) return wxEmptyString;
-    else return location.Mid(i + 1, l2 - i - 2);
-}
-
-/* static */
-wxString wxFileSystemHandler::GetAnchor(const wxString& location)
-{
-    wxChar c;
-    int l = location.length();
-
-    for (int i = l-1; i >= 0; i--) {
-        c = location[i];
-        if (c == wxT('#'))
-            return location.Right(l-i-1);
-        else if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')))
-            return wxEmptyString;
-    }
-    return wxEmptyString;
-}
-
-
-wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec),
-                                        int WXUNUSED(flags))
-{
-    return wxEmptyString;
-}
-
-wxString wxFileSystemHandler::FindNext()
-{
-    return wxEmptyString;
-}
-
-//--------------------------------------------------------------------------------
-// wxLocalFSHandler
-//--------------------------------------------------------------------------------
-
-
-wxString wxLocalFSHandler::ms_root;
-
-bool wxLocalFSHandler::CanOpen(const wxString& location)
-{
-    return GetProtocol(location) == wxT("file");
-}
-
-wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
-{
-    // location has Unix path separators
-    wxString right = GetRightLocation(location);
-    wxFileName fn = wxFileSystem::URLToFileName(right);
-    wxString fullpath = ms_root + fn.GetFullPath();
-
-    if (!wxFileExists(fullpath))
-        return NULL;
-
-    // we need to check whether we can really read from this file, otherwise
-    // wxFSFile is not going to work
-#if wxUSE_FFILE
-    wxFFileInputStream *is = new wxFFileInputStream(fullpath);
-#elif wxUSE_FILE
-    wxFileInputStream *is = new wxFileInputStream(fullpath);
-#else
-#error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work
-#endif
-    if ( !is->IsOk() )
-    {
-        delete is;
-        return NULL;
-    }
-
-    return new wxFSFile(is,
-                        right,
-                        wxEmptyString,
-                        GetAnchor(location)
-#if wxUSE_DATETIME
-                        ,wxDateTime(wxFileModificationTime(fullpath))
-#endif // wxUSE_DATETIME
-                        );
-}
-
-wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
-{
-    wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
-    const wxString found = wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
-    if ( found.empty() )
-        return found;
-    return wxFileSystem::FileNameToURL(found);
-}
-
-wxString wxLocalFSHandler::FindNext()
-{
-    const wxString found = wxFindNextFile();
-    if ( found.empty() )
-        return found;
-    return wxFileSystem::FileNameToURL(found);
-}
-
-
-
-//-----------------------------------------------------------------------------
-// wxFileSystem
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject)
-
-
-wxList wxFileSystem::m_Handlers;
-
-
-wxFileSystem::~wxFileSystem()
-{
-    WX_CLEAR_HASH_MAP(wxFSHandlerHash, m_LocalHandlers)
-}
-
-
-static wxString MakeCorrectPath(const wxString& path)
-{
-    wxString p(path);
-    wxString r;
-    int i, j, cnt;
-
-    cnt = p.length();
-    for (i = 0; i < cnt; i++)
-      if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
-
-    if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; }
-
-    if (cnt < 3) return p;
-
-    r << p.GetChar(0) << p.GetChar(1);
-
-    // skip trailing ../.., if any
-    for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i);
-
-    // remove back references: translate dir1/../dir2 to dir2
-    for (; i < cnt; i++)
-    {
-        r << p.GetChar(i);
-        if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
-        {
-            for (j = r.length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
-            if (j >= 0 && r.GetChar(j) != wxT(':'))
-            {
-                for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
-                r.Remove(j + 1);
-            }
-        }
-    }
-
-    for (; i < cnt; i++) r << p.GetChar(i);
-
-    return r;
-}
-
-
-void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
-{
-    int i, pathpos = -1;
-
-    m_Path = MakeCorrectPath(location);
-
-    if (is_dir)
-    {
-        if (!m_Path.empty() && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
-            m_Path << wxT('/');
-    }
-
-    else
-    {
-        for (i = m_Path.length()-1; i >= 0; i--)
-        {
-            if (m_Path[(unsigned int) i] == wxT('/'))
-            {
-                if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))
-                {
-                    i -= 2;
-                    continue;
-                }
-                else
-                {
-                    pathpos = i;
-                    break;
-                }
-            }
-            else if (m_Path[(unsigned int) i] == wxT(':')) {
-                pathpos = i;
-                break;
-            }
-        }
-        if (pathpos == -1)
-        {
-            for (i = 0; i < (int) m_Path.length(); i++)
-            {
-                if (m_Path[(unsigned int) i] == wxT(':'))
-                {
-                    m_Path.Remove(i+1);
-                    break;
-                }
-            }
-            if (i == (int) m_Path.length())
-                m_Path = wxEmptyString;
-        }
-        else
-        {
-            m_Path.Remove(pathpos+1);
-        }
-    }
-}
-
-
-
-wxFileSystemHandler *wxFileSystem::MakeLocal(wxFileSystemHandler *h)
-{
-    wxClassInfo *classinfo = h->GetClassInfo();
-
-    if (classinfo->IsDynamic())
-    {
-        wxFileSystemHandler*& local = m_LocalHandlers[classinfo];
-        if (!local)
-            local = (wxFileSystemHandler*)classinfo->CreateObject();
-        return local;
-    }
-    else
-    {
-        return h;
-    }
-}
-
-
-
-wxFSFile* wxFileSystem::OpenFile(const wxString& location, int flags)
-{
-    if ((flags & wxFS_READ) == 0)
-        return NULL;
-
-    wxString loc = MakeCorrectPath(location);
-    unsigned i, ln;
-    wxChar meta;
-    wxFSFile *s = NULL;
-    wxList::compatibility_iterator node;
-
-    ln = loc.length();
-    meta = 0;
-    for (i = 0; i < ln; i++)
-    {
-        switch ( loc[i].GetValue() )
-        {
-            case wxT('/') : case wxT(':') : case wxT('#') :
-                meta = loc[i];
-                break;
-        }
-        if (meta != 0) break;
-    }
-    m_LastName = wxEmptyString;
-
-    // try relative paths first :
-    if (meta != wxT(':'))
-    {
-        node = m_Handlers.GetFirst();
-        while (node)
-        {
-            wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
-            if (h->CanOpen(m_Path + loc))
-            {
-                s = MakeLocal(h)->OpenFile(*this, m_Path + loc);
-                if (s) { m_LastName = m_Path + loc; break; }
-            }
-            node = node->GetNext();
-        }
-    }
-
-    // if failed, try absolute paths :
-    if (s == NULL)
-    {
-        node = m_Handlers.GetFirst();
-        while (node)
-        {
-            wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
-            if (h->CanOpen(loc))
-            {
-                s = MakeLocal(h)->OpenFile(*this, loc);
-                if (s) { m_LastName = loc; break; }
-            }
-            node = node->GetNext();
-        }
-    }
-
-    if (s && (flags & wxFS_SEEKABLE) != 0 && !s->GetStream()->IsSeekable())
-    {
-        wxBackedInputStream *stream;
-        stream = new wxBackedInputStream(s->DetachStream());
-        stream->FindLength();
-        s->SetStream(stream);
-    }
-
-    return (s);
-}
-
-
-
-wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
-{
-    wxList::compatibility_iterator node;
-    wxString spec2(spec);
-
-    m_FindFileHandler = NULL;
-
-    for (int i = spec2.length()-1; i >= 0; i--)
-        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
-
-    node = m_Handlers.GetFirst();
-    while (node)
-    {
-        wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
-        if (h -> CanOpen(m_Path + spec2))
-        {
-            m_FindFileHandler = MakeLocal(h);
-            return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
-        }
-        node = node->GetNext();
-    }
-
-    node = m_Handlers.GetFirst();
-    while (node)
-    {
-        wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
-        if (h -> CanOpen(spec2))
-        {
-            m_FindFileHandler = MakeLocal(h);
-            return m_FindFileHandler -> FindFirst(spec2, flags);
-        }
-        node = node->GetNext();
-    }
-
-    return wxEmptyString;
-}
-
-
-
-wxString wxFileSystem::FindNext()
-{
-    if (m_FindFileHandler == NULL) return wxEmptyString;
-    else return m_FindFileHandler -> FindNext();
-}
-
-bool wxFileSystem::FindFileInPath(wxString *pStr,
-                                  const wxString& path,
-                                  const wxString& basename)
-{
-    // we assume that it's not empty
-    wxCHECK_MSG( !basename.empty(), false,
-                wxT("empty file name in wxFileSystem::FindFileInPath"));
-
-    wxString name;
-    // skip path separator in the beginning of the file name if present
-    if ( wxIsPathSeparator(basename[0u]) )
-        name = basename.substr(1);
-    else
-        name = basename;
-
-    wxStringTokenizer tokenizer(path, wxPATH_SEP);
-    while ( tokenizer.HasMoreTokens() )
-    {
-        wxString strFile = tokenizer.GetNextToken();
-        if ( !wxEndsWithPathSeparator(strFile) )
-            strFile += wxFILE_SEP_PATH;
-        strFile += name;
-
-        wxFSFile *file = OpenFile(strFile);
-        if ( file )
-        {
-            delete file;
-            *pStr = strFile;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
-{
-    // prepend the handler to the beginning of the list because handlers added
-    // last should have the highest priority to allow overriding them
-    m_Handlers.Insert((size_t)0, handler);
-}
-
-wxFileSystemHandler* wxFileSystem::RemoveHandler(wxFileSystemHandler *handler)
-{
-    // if handler has already been removed (or deleted)
-    // we return NULL. This is by design in case
-    // CleanUpHandlers() is called before RemoveHandler
-    // is called, as we cannot control the order
-    // which modules are unloaded
-    if (!m_Handlers.DeleteObject(handler))
-        return NULL;
-
-    return handler;
-}
-
-
-bool wxFileSystem::HasHandlerForPath(const wxString &location)
-{
-    for ( wxList::compatibility_iterator node = m_Handlers.GetFirst();
-           node; node = node->GetNext() )
-    {
-        wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
-        if (h->CanOpen(location))
-            return true;
-    }
-
-    return false;
-}
-
-void wxFileSystem::CleanUpHandlers()
-{
-    WX_CLEAR_LIST(wxList, m_Handlers);
-}
-
-static const wxString g_unixPathString(wxT("/"));
-static const wxString g_nativePathString(wxFILE_SEP_PATH);
-
-// Returns the native path for a file URL
-wxFileName wxFileSystem::URLToFileName(const wxString& url)
-{
-    wxString path = url;
-
-    if ( path.Find(wxT("file://")) == 0 )
-    {
-        path = path.Mid(7);
-    }
-    else if ( path.Find(wxT("file:")) == 0 )
-    {
-        path = path.Mid(5);
-    }
-    // Remove preceding double slash on Mac Classic
-#if defined(__WXMAC__) && !defined(__UNIX__)
-    else if ( path.Find(wxT("//")) == 0 )
-        path = path.Mid(2);
-#endif
-
-    path = wxURI::Unescape(path);
-
-#ifdef __WINDOWS__
-    // file urls either start with a forward slash (local harddisk),
-    // otherwise they have a servername/sharename notation,
-    // which only exists on msw and corresponds to a unc
-    if ( path.length() > 1 && (path[0u] == wxT('/') && path [1u] != wxT('/')) )
-    {
-        path = path.Mid(1);
-    }
-    else if ( (url.Find(wxT("file://")) == 0) &&
-              (path.Find(wxT('/')) != wxNOT_FOUND) &&
-              (path.length() > 1) && (path[1u] != wxT(':')) )
-    {
-        path = wxT("//") + path;
-    }
-#endif
-
-    path.Replace(g_unixPathString, g_nativePathString);
-
-    return wxFileName(path, wxPATH_NATIVE);
-}
-
-// Escapes non-ASCII and others characters in file: URL to be valid URLs
-static wxString EscapeFileNameCharsInURL(const char *in)
-{
-    wxString s;
-
-    for ( const unsigned char *p = (const unsigned char*)in; *p; ++p )
-    {
-        const unsigned char c = *p;
-
-        // notice that all colons *must* be encoded in the paths used by
-        // wxFileSystem even though this makes URLs produced by this method
-        // unusable with IE under Windows as it requires "file:///c:/foo.bar"
-        // and doesn't accept "file:///c%3a/foo.bar" -- but then we never made
-        // any guarantees about general suitability of the strings returned by
-        // this method, they must work with wxFileSystem only and not encoding
-        // the colon breaks handling of
-        // "http://wherever/whatever.zip#zip:filename.ext" URLs so we really
-        // can't do this without heavy changes to the parsing code here, in
-        // particular in GetRightLocation()
-
-        if ( c == '/' || c == '-' || c == '.' || c == '_' || c == '~' ||
-             (c >= '0' && c <= '9') ||
-             (c >= 'a' && c <= 'z') ||
-             (c >= 'A' && c <= 'Z') )
-        {
-            s << c;
-        }
-        else
-        {
-            s << wxString::Format("%%%02x", c);
-        }
-    }
-
-    return s;
-}
-
-// Returns the file URL for a native path
-wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
-{
-    wxFileName fn = filename;
-    fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE);
-    wxString url = fn.GetFullPath(wxPATH_NATIVE);
-
-#ifndef __UNIX__
-    // unc notation, wxMSW
-    if ( url.Find(wxT("\\\\")) == 0 )
-    {
-        url = wxT("//") + url.Mid(2);
-    }
-    else
-    {
-        url = wxT("/") + url;
-#ifdef __WXMAC__
-        url = wxT("/") + url;
-#endif
-
-    }
-#endif
-
-    url.Replace(g_nativePathString, g_unixPathString);
-
-    // Do wxURI- and common practice-compatible escaping: encode the string
-    // into UTF-8, then escape anything non-ASCII:
-    return wxT("file:") + EscapeFileNameCharsInURL(url.utf8_str());
-}
-
-
-///// Module:
-
-class wxFileSystemModule : public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxFileSystemModule)
-
-    public:
-        wxFileSystemModule() :
-            wxModule(),
-            m_handler(NULL)
-        {
-        }
-
-        virtual bool OnInit()
-        {
-            m_handler = new wxLocalFSHandler;
-            wxFileSystem::AddHandler(m_handler);
-            return true;
-        }
-        virtual void OnExit()
-        {
-            delete wxFileSystem::RemoveHandler(m_handler);
-
-            wxFileSystem::CleanUpHandlers();
-        }
-
-    private:
-        wxFileSystemHandler* m_handler;
-
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
-
-//// wxFSInputStream
-
-wxFSInputStream::wxFSInputStream(const wxString& filename, int flags)
-{
-    wxFileSystem fs;
-    m_file = fs.OpenFile(filename, flags | wxFS_READ);
-
-    if ( m_file )
-    {
-        wxInputStream* const stream = m_file->GetStream();
-        if ( stream )
-        {
-            // Notice that we pass the stream by reference: it shouldn't be
-            // deleted by us as it's owned by m_file already.
-            InitParentStream(*stream);
-        }
-    }
-}
-
-wxFSInputStream::~wxFSInputStream()
-{
-    delete m_file;
-}
-
-#endif
-  // wxUSE_FILESYSTEM
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/filesys.cpp
+// Purpose:     wxFileSystem class - interface for opening files
+// Author:      Vaclav Slavik
+// Copyright:   (c) 1999 Vaclav Slavik
+// CVS-ID:      $Id: filesys.cpp 55271 2008-08-26 00:03:04Z VZ $
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+
+#if wxUSE_FILESYSTEM
+
+#include "wx/filesys.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/sysopt.h"
+#include "wx/wfstream.h"
+#include "wx/mimetype.h"
+#include "wx/filename.h"
+#include "wx/tokenzr.h"
+#include "wx/uri.h"
+#include "wx/private/fileback.h"
+
+
+//--------------------------------------------------------------------------------
+// wxFileSystemHandler
+//--------------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxFileSystemHandler, wxObject)
+
+
+wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
+{
+    wxString ext, mime;
+    wxString loc = GetRightLocation(location);
+    wxChar c;
+    int l = loc.length(), l2;
+
+    l2 = l;
+    for (int i = l-1; i >= 0; i--)
+    {
+        c = loc[(unsigned int) i];
+        if ( c == wxT('#') )
+            l2 = i + 1;
+        if ( c == wxT('.') )
+        {
+            ext = loc.Right(l2-i-1);
+            break;
+        }
+        if ( (c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')) )
+            return wxEmptyString;
+    }
+
+#if wxUSE_MIMETYPE
+    static bool s_MinimalMimeEnsured = false;
+
+    // Don't use mime types manager if the application doesn't need it and it would be
+    // cause an unacceptable delay, especially on startup.
+    bool useMimeTypesManager = true;
+#if wxUSE_SYSTEM_OPTIONS
+    useMimeTypesManager = (wxSystemOptions::GetOptionInt(wxT("filesys.no-mimetypesmanager")) == 0);
+#endif
+
+    if (useMimeTypesManager)
+    {
+        if (!s_MinimalMimeEnsured)
+        {
+            static const wxFileTypeInfo fallbacks[] =
+            {
+                wxFileTypeInfo(_T("image/jpeg"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    _T("JPEG image (from fallback)"),
+                    _T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL),
+                    wxFileTypeInfo(_T("image/gif"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    _T("GIF image (from fallback)"),
+                    _T("gif"), _T("GIF"), NULL),
+                    wxFileTypeInfo(_T("image/png"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    _T("PNG image (from fallback)"),
+                    _T("png"), _T("PNG"), NULL),
+                    wxFileTypeInfo(_T("image/bmp"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    _T("windows bitmap image (from fallback)"),
+                    _T("bmp"), _T("BMP"), NULL),
+                    wxFileTypeInfo(_T("text/html"),
+                    wxEmptyString,
+                    wxEmptyString,
+                    _T("HTML document (from fallback)"),
+                    _T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL),
+                    // must terminate the table with this!
+                    wxFileTypeInfo()
+            };
+            wxTheMimeTypesManager->AddFallbacks(fallbacks);
+            s_MinimalMimeEnsured = true;
+        }
+        
+        wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+        if ( !ft || !ft -> GetMimeType(&mime) )
+        {
+            mime = wxEmptyString;
+        }
+        
+        delete ft;
+        
+        return mime;
+    }
+    else
+#endif
+    {
+        if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("html"), false) )
+            return wxT("text/html");
+        if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(_T("jpeg"), false) )
+            return wxT("image/jpeg");
+        if ( ext.IsSameAs(wxT("gif"), false) )
+            return wxT("image/gif");
+        if ( ext.IsSameAs(wxT("png"), false) )
+            return wxT("image/png");
+        if ( ext.IsSameAs(wxT("bmp"), false) )
+            return wxT("image/bmp");
+        return wxEmptyString;
+    }
+}
+
+
+
+wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
+{
+    wxString s = wxEmptyString;
+    int i, l = location.length();
+    bool fnd = false;
+
+    for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
+    }
+    if (!fnd) return wxT("file");
+    for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];
+    return s;
+}
+
+
+wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
+{
+    int i;
+    bool fnd = false;
+
+    for (i = location.length()-1; i >= 0; i--) {
+        if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
+        else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
+    }
+    return wxEmptyString;
+}
+
+wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
+{
+    int i, l = location.length();
+    int l2 = l + 1;
+
+    for (i = l-1;
+         (i >= 0) &&
+         ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':')));
+         i--)
+    {
+        if (location[i] == wxT('#')) l2 = i + 1;
+    }
+    if (i == 0) return wxEmptyString;
+    else return location.Mid(i + 1, l2 - i - 2);
+}
+
+wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
+{
+    wxChar c;
+    int l = location.length();
+
+    for (int i = l-1; i >= 0; i--) {
+        c = location[i];
+        if (c == wxT('#'))
+            return location.Right(l-i-1);
+        else if ((c == wxT('/')) || (c == wxT('\\')) || (c == wxT(':')))
+            return wxEmptyString;
+    }
+    return wxEmptyString;
+}
+
+
+wxString wxFileSystemHandler::FindFirst(const wxString& WXUNUSED(spec),
+                                        int WXUNUSED(flags))
+{
+    return wxEmptyString;
+}
+
+wxString wxFileSystemHandler::FindNext()
+{
+    return wxEmptyString;
+}
+
+//--------------------------------------------------------------------------------
+// wxLocalFSHandler
+//--------------------------------------------------------------------------------
+
+
+wxString wxLocalFSHandler::ms_root;
+
+bool wxLocalFSHandler::CanOpen(const wxString& location)
+{
+    return GetProtocol(location) == wxT("file");
+}
+
+wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
+{
+    // location has Unix path separators
+    wxString right = GetRightLocation(location);
+    wxFileName fn = wxFileSystem::URLToFileName(right);
+    wxString fullpath = ms_root + fn.GetFullPath();
+
+    if (!wxFileExists(fullpath))
+        return (wxFSFile*) NULL;
+
+    // we need to check whether we can really read from this file, otherwise
+    // wxFSFile is not going to work
+#if wxUSE_FFILE
+    wxFFileInputStream *is = new wxFFileInputStream(fullpath);
+#elif wxUSE_FILE
+    wxFileInputStream *is = new wxFileInputStream(fullpath);
+#else
+#error One of wxUSE_FILE or wxUSE_FFILE must be set to 1 for wxFSHandler to work
+#endif
+    if ( !is->Ok() )
+    {
+        delete is;
+        return (wxFSFile*) NULL;
+    }
+
+    return new wxFSFile(is,
+                        right,
+                        GetMimeTypeFromExt(location),
+                        GetAnchor(location)
+#if wxUSE_DATETIME
+                        ,wxDateTime(wxFileModificationTime(fullpath))
+#endif // wxUSE_DATETIME
+                        );
+}
+
+wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
+{
+    wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
+    return wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
+}
+
+wxString wxLocalFSHandler::FindNext()
+{
+    return wxFindNextFile();
+}
+
+
+
+//-----------------------------------------------------------------------------
+// wxFileSystem
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxFileSystem, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxFSFile, wxObject)
+
+
+wxList wxFileSystem::m_Handlers;
+
+
+wxFileSystem::~wxFileSystem()
+{
+    WX_CLEAR_HASH_MAP(wxFSHandlerHash, m_LocalHandlers)
+}
+
+
+static wxString MakeCorrectPath(const wxString& path)
+{
+    wxString p(path);
+    wxString r;
+    int i, j, cnt;
+
+    cnt = p.length();
+    for (i = 0; i < cnt; i++)
+      if (p.GetChar(i) == wxT('\\')) p.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
+
+    if (p.Left(2) == wxT("./")) { p = p.Mid(2); cnt -= 2; }
+
+    if (cnt < 3) return p;
+
+    r << p.GetChar(0) << p.GetChar(1);
+
+    // skip trailing ../.., if any
+    for (i = 2; i < cnt && (p.GetChar(i) == wxT('/') || p.GetChar(i) == wxT('.')); i++) r << p.GetChar(i);
+
+    // remove back references: translate dir1/../dir2 to dir2
+    for (; i < cnt; i++)
+    {
+        r << p.GetChar(i);
+        if (p.GetChar(i) == wxT('/') && p.GetChar(i-1) == wxT('.') && p.GetChar(i-2) == wxT('.'))
+        {
+            for (j = r.length() - 2; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+            if (j >= 0 && r.GetChar(j) != wxT(':'))
+            {
+                for (j = j - 1; j >= 0 && r.GetChar(j) != wxT('/') && r.GetChar(j) != wxT(':'); j--) {}
+                r.Remove(j + 1);
+            }
+        }
+    }
+
+    for (; i < cnt; i++) r << p.GetChar(i);
+
+    return r;
+}
+
+
+void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
+{
+    int i, pathpos = -1;
+
+    m_Path = MakeCorrectPath(location);
+
+    if (is_dir)
+    {
+        if (m_Path.length() > 0 && m_Path.Last() != wxT('/') && m_Path.Last() != wxT(':'))
+            m_Path << wxT('/');
+    }
+
+    else
+    {
+        for (i = m_Path.length()-1; i >= 0; i--)
+        {
+            if (m_Path[(unsigned int) i] == wxT('/'))
+            {
+                if ((i > 1) && (m_Path[(unsigned int) (i-1)] == wxT('/')) && (m_Path[(unsigned int) (i-2)] == wxT(':')))
+                {
+                    i -= 2;
+                    continue;
+                }
+                else
+                {
+                    pathpos = i;
+                    break;
+                }
+            }
+            else if (m_Path[(unsigned int) i] == wxT(':')) {
+                pathpos = i;
+                break;
+            }
+        }
+        if (pathpos == -1)
+        {
+            for (i = 0; i < (int) m_Path.length(); i++)
+            {
+                if (m_Path[(unsigned int) i] == wxT(':'))
+                {
+                    m_Path.Remove(i+1);
+                    break;
+                }
+            }
+            if (i == (int) m_Path.length())
+                m_Path = wxEmptyString;
+        }
+        else
+        {
+            m_Path.Remove(pathpos+1);
+        }
+    }
+}
+
+
+
+wxFileSystemHandler *wxFileSystem::MakeLocal(wxFileSystemHandler *h)
+{
+    wxClassInfo *classinfo = h->GetClassInfo();
+
+    if (classinfo->IsDynamic())
+    {
+        wxFileSystemHandler*& local = m_LocalHandlers[classinfo];
+        if (!local)
+            local = (wxFileSystemHandler*)classinfo->CreateObject();
+        return local;
+    }
+    else
+    {
+        return h;
+    }
+}
+
+
+
+wxFSFile* wxFileSystem::OpenFile(const wxString& location, int flags)
+{
+    if ((flags & wxFS_READ) == 0)
+        return NULL;
+
+    wxString loc = MakeCorrectPath(location);
+    unsigned i, ln;
+    wxChar meta;
+    wxFSFile *s = NULL;
+    wxList::compatibility_iterator node;
+
+    ln = loc.length();
+    meta = 0;
+    for (i = 0; i < ln; i++)
+    {
+        switch (loc[i])
+        {
+            case wxT('/') : case wxT(':') : case wxT('#') :
+                meta = loc[i];
+                break;
+        }
+        if (meta != 0) break;
+    }
+    m_LastName = wxEmptyString;
+
+    // try relative paths first :
+    if (meta != wxT(':'))
+    {
+        node = m_Handlers.GetFirst();
+        while (node)
+        {
+            wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
+            if (h->CanOpen(m_Path + loc))
+            {
+                s = MakeLocal(h)->OpenFile(*this, m_Path + loc);
+                if (s) { m_LastName = m_Path + loc; break; }
+            }
+            node = node->GetNext();
+        }
+    }
+
+    // if failed, try absolute paths :
+    if (s == NULL)
+    {
+        node = m_Handlers.GetFirst();
+        while (node)
+        {
+            wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
+            if (h->CanOpen(loc))
+            {
+                s = MakeLocal(h)->OpenFile(*this, loc);
+                if (s) { m_LastName = loc; break; }
+            }
+            node = node->GetNext();
+        }
+    }
+
+    if (s && (flags & wxFS_SEEKABLE) != 0 && !s->GetStream()->IsSeekable())
+    {
+        wxBackedInputStream *stream;
+        stream = new wxBackedInputStream(s->DetachStream());
+        stream->FindLength();
+        s->SetStream(stream);
+    }
+
+    return (s);
+}
+
+
+
+wxString wxFileSystem::FindFirst(const wxString& spec, int flags)
+{
+    wxList::compatibility_iterator node;
+    wxString spec2(spec);
+
+    m_FindFileHandler = NULL;
+
+    for (int i = spec2.length()-1; i >= 0; i--)
+        if (spec2[(unsigned int) i] == wxT('\\')) spec2.GetWritableChar(i) = wxT('/'); // Want to be windows-safe
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
+        if (h -> CanOpen(m_Path + spec2))
+        {
+            m_FindFileHandler = MakeLocal(h);
+            return m_FindFileHandler -> FindFirst(m_Path + spec2, flags);
+        }
+        node = node->GetNext();
+    }
+
+    node = m_Handlers.GetFirst();
+    while (node)
+    {
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node -> GetData();
+        if (h -> CanOpen(spec2))
+        {
+            m_FindFileHandler = MakeLocal(h);
+            return m_FindFileHandler -> FindFirst(spec2, flags);
+        }
+        node = node->GetNext();
+    }
+
+    return wxEmptyString;
+}
+
+
+
+wxString wxFileSystem::FindNext()
+{
+    if (m_FindFileHandler == NULL) return wxEmptyString;
+    else return m_FindFileHandler -> FindNext();
+}
+
+bool wxFileSystem::FindFileInPath(wxString *pStr,
+                                  const wxChar *path,
+                                  const wxChar *basename)
+{
+    // we assume that it's not empty
+    wxCHECK_MSG( !wxIsEmpty(basename), false,
+                _T("empty file name in wxFileSystem::FindFileInPath"));
+
+    // skip path separator in the beginning of the file name if present
+    if ( wxIsPathSeparator(*basename) )
+       basename++;
+
+    wxStringTokenizer tokenizer(path, wxPATH_SEP);
+    while ( tokenizer.HasMoreTokens() )
+    {
+        wxString strFile = tokenizer.GetNextToken();
+        if ( !wxEndsWithPathSeparator(strFile) )
+            strFile += wxFILE_SEP_PATH;
+        strFile += basename;
+
+        wxFSFile *file = OpenFile(strFile);
+        if ( file )
+        {
+            delete file;
+            *pStr = strFile;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void wxFileSystem::AddHandler(wxFileSystemHandler *handler)
+{
+    // prepend the handler to the beginning of the list because handlers added
+    // last should have the highest priority to allow overriding them
+    m_Handlers.Insert((size_t)0, handler);
+}
+
+wxFileSystemHandler* wxFileSystem::RemoveHandler(wxFileSystemHandler *handler)
+{
+    // if handler has already been removed (or deleted)
+    // we return NULL. This is by design in case
+    // CleanUpHandlers() is called before RemoveHandler
+    // is called, as we cannot control the order
+    // which modules are unloaded
+    if (!m_Handlers.DeleteObject(handler))
+        return NULL;
+
+    return handler;
+}
+
+
+bool wxFileSystem::HasHandlerForPath(const wxString &location)
+{
+    for ( wxList::compatibility_iterator node = m_Handlers.GetFirst();
+           node; node = node->GetNext() )
+    {
+        wxFileSystemHandler *h = (wxFileSystemHandler*) node->GetData();
+        if (h->CanOpen(location))
+            return true;
+    }
+
+    return false;
+}
+
+void wxFileSystem::CleanUpHandlers()
+{
+    WX_CLEAR_LIST(wxList, m_Handlers);
+}
+
+static const wxString g_unixPathString(wxT("/"));
+static const wxString g_nativePathString(wxFILE_SEP_PATH);
+
+// Returns the native path for a file URL
+wxFileName wxFileSystem::URLToFileName(const wxString& url)
+{
+    wxString path = url;
+
+    if ( path.Find(wxT("file://")) == 0 )
+    {
+        path = path.Mid(7);
+    }
+    else if ( path.Find(wxT("file:")) == 0 )
+    {
+        path = path.Mid(5);
+    }
+    // Remove preceding double slash on Mac Classic
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    else if ( path.Find(wxT("//")) == 0 )
+        path = path.Mid(2);
+#endif
+
+    path = wxURI::Unescape(path);
+
+#ifdef __WXMSW__
+    // file urls either start with a forward slash (local harddisk),
+    // otherwise they have a servername/sharename notation,
+    // which only exists on msw and corresponds to a unc
+    if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
+    {
+        path = path.Mid(1);
+    }
+    else if ( (url.Find(wxT("file://")) == 0) &&
+              (path.Find(wxT('/')) != wxNOT_FOUND) &&
+              (path.length() > 1) && (path[1u] != wxT(':')) )
+    {
+        path = wxT("//") + path;
+    }
+#endif
+
+    path.Replace(g_unixPathString, g_nativePathString);
+
+    return wxFileName(path, wxPATH_NATIVE);
+}
+
+// Returns the file URL for a native path
+wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
+{
+    wxFileName fn = filename;
+    fn.Normalize(wxPATH_NORM_DOTS | wxPATH_NORM_TILDE | wxPATH_NORM_ABSOLUTE);
+    wxString url = fn.GetFullPath(wxPATH_NATIVE);
+
+#ifndef __UNIX__
+    // unc notation, wxMSW
+    if ( url.Find(wxT("\\\\")) == 0 )
+    {
+        url = wxT("//") + url.Mid(2);
+    }
+    else
+    {
+        url = wxT("/") + url;
+#ifdef __WXMAC__
+        url = wxT("/") + url;
+#endif
+
+    }
+#endif
+
+    url.Replace(g_nativePathString, g_unixPathString);
+    url.Replace(wxT("%"), wxT("%25")); // '%'s must be replaced first!
+    url.Replace(wxT("#"), wxT("%23"));
+    url.Replace(wxT(":"), wxT("%3A"));
+    url = wxT("file:") + url;
+    return url;
+}
+
+
+///// Module:
+
+class wxFileSystemModule : public wxModule
+{
+    DECLARE_DYNAMIC_CLASS(wxFileSystemModule)
+
+    public:
+        wxFileSystemModule() :
+            wxModule(),
+            m_handler(NULL)
+        {
+        }
+
+        virtual bool OnInit()
+        {
+            m_handler = new wxLocalFSHandler;
+            wxFileSystem::AddHandler(m_handler);
+            return true;
+        }
+        virtual void OnExit()
+        {
+            delete wxFileSystem::RemoveHandler(m_handler);
+
+            wxFileSystem::CleanUpHandlers();
+        }
+
+    private:
+        wxFileSystemHandler* m_handler;
+
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxFileSystemModule, wxModule)
+
+#endif
+  // wxUSE_FILESYSTEM
diff --git a/Source/3rd Party/wx/src/common/filtall.cpp b/Source/3rd Party/wx/src/common/filtall.cpp
index dbc9d12bb..952730f82 100644
--- a/Source/3rd Party/wx/src/common/filtall.cpp	
+++ b/Source/3rd Party/wx/src/common/filtall.cpp	
@@ -1,36 +1,36 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/filtall.cpp
-// Purpose:     Link all filter streams
-// Author:      Mike Wetherell
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 Mike Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS
-
-#if wxUSE_ZLIB
-#include "wx/zstream.h"
-#endif
-
-// Reference filter classes to ensure they are linked into a statically
-// linked program that uses Find or GetFirst to look for an filter handler.
-// It is in its own file so that the user can override this behaviour by
-// providing their own implementation.
-
-void wxUseFilterClasses()
-{
-#if wxUSE_ZLIB
-    wxZlibClassFactory();
-    wxGzipClassFactory();
-#endif
-}
-
-#endif // wxUSE_STREAMS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/filtall.cpp
+// Purpose:     Link all filter streams
+// Author:      Mike Wetherell
+// RCS-ID:      $Id: filtall.cpp 42412 2006-10-25 20:41:12Z MW $
+// Copyright:   (c) 2006 Mike Wetherell
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS
+
+#if wxUSE_ZLIB
+#include "wx/zstream.h"
+#endif
+
+// Reference filter classes to ensure they are linked into a statically
+// linked program that uses Find or GetFirst to look for an filter handler.
+// It is in its own file so that the user can override this behaviour by
+// providing their own implementation.
+
+void wxUseFilterClasses()
+{
+#if wxUSE_ZLIB
+    wxZlibClassFactory();
+    wxGzipClassFactory();
+#endif
+}
+
+#endif // wxUSE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/filtfind.cpp b/Source/3rd Party/wx/src/common/filtfind.cpp
index 08f5ebec3..16cb227f3 100644
--- a/Source/3rd Party/wx/src/common/filtfind.cpp	
+++ b/Source/3rd Party/wx/src/common/filtfind.cpp	
@@ -1,43 +1,43 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/filtfind.cpp
-// Purpose:     Streams for filter formats
-// Author:      Mike Wetherell
-// RCS-ID:      $Id$
-// Copyright:   (c) Mike Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS
-
-#include "wx/stream.h"
-
-// These functions are in a separate file so that statically linked apps
-// that do not call them to search for filter handlers will only link in
-// the filter classes they use.
-
-const wxFilterClassFactory *
-wxFilterClassFactory::Find(const wxString& protocol, wxStreamProtocolType type)
-{
-    for (const wxFilterClassFactory *f = GetFirst(); f; f = f->GetNext())
-        if (f->CanHandle(protocol, type))
-            return f;
-
-    return NULL;
-}
-
-// static
-const wxFilterClassFactory *wxFilterClassFactory::GetFirst()
-{
-    if (!sm_first)
-        wxUseFilterClasses();
-    return sm_first;
-}
-
-#endif // wxUSE_STREAMS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/filtfind.cpp
+// Purpose:     Streams for filter formats
+// Author:      Mike Wetherell
+// RCS-ID:      $Id: filtfind.cpp 42412 2006-10-25 20:41:12Z MW $
+// Copyright:   (c) Mike Wetherell
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS
+
+#include "wx/stream.h"
+
+// These functions are in a separate file so that statically linked apps
+// that do not call them to search for filter handlers will only link in
+// the filter classes they use.
+
+const wxFilterClassFactory *
+wxFilterClassFactory::Find(const wxChar *protocol, wxStreamProtocolType type)
+{
+    for (const wxFilterClassFactory *f = GetFirst(); f; f = f->GetNext())
+        if (f->CanHandle(protocol, type))
+            return f;
+
+    return NULL;
+}
+
+// static
+const wxFilterClassFactory *wxFilterClassFactory::GetFirst()
+{
+    if (!sm_first)
+        wxUseFilterClasses();
+    return sm_first;
+}
+
+#endif // wxUSE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/fldlgcmn.cpp b/Source/3rd Party/wx/src/common/fldlgcmn.cpp
index ee9fa1e90..6f59d40eb 100644
--- a/Source/3rd Party/wx/src/common/fldlgcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/fldlgcmn.cpp	
@@ -1,394 +1,348 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fldlgcmn.cpp
-// Purpose:     wxFileDialog common functions
-// Author:      John Labenski
-// Modified by:
-// Created:     14.06.03 (extracted from src/*/filedlg.cpp)
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FILEDLG
-
-#include "wx/filedlg.h"
-#include "wx/dirdlg.h"
-#include "wx/filename.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/window.h"
-#endif // WX_PRECOMP
-
-extern WXDLLEXPORT_DATA(const char) wxFileDialogNameStr[] = "filedlg";
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorPromptStr[] = "Select a file";
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[] =
-#if defined(__WXMSW__) || defined(__OS2__)
-    "*.*"
-#else // Unix/Mac
-    "*"
-#endif
-    ;
-
-//----------------------------------------------------------------------------
-// wxFileDialogBase
-//----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
-
-void wxFileDialogBase::Init()
-{
-    m_filterIndex = 0;
-    m_windowStyle = 0;
-    m_extraControl = NULL;
-    m_extraControlCreator = NULL;
-}
-
-bool wxFileDialogBase::Create(wxWindow *parent,
-                              const wxString& message,
-                              const wxString& defaultDir,
-                              const wxString& defaultFile,
-                              const wxString& wildCard,
-                              long style,
-                              const wxPoint& WXUNUSED(pos),
-                              const wxSize& WXUNUSED(sz),
-                              const wxString& WXUNUSED(name))
-{
-    m_message = message;
-    m_dir = defaultDir;
-    m_fileName = defaultFile;
-    m_wildCard = wildCard;
-
-    m_parent = parent;
-    m_windowStyle = style;
-    m_filterIndex = 0;
-
-    if (!HasFdFlag(wxFD_OPEN) && !HasFdFlag(wxFD_SAVE))
-        m_windowStyle |= wxFD_OPEN;     // wxFD_OPEN is the default
-
-    // check that the styles are not contradictory
-    wxASSERT_MSG( !(HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OPEN)),
-                  wxT("can't specify both wxFD_SAVE and wxFD_OPEN at once") );
-
-    wxASSERT_MSG( !HasFdFlag(wxFD_SAVE) ||
-                    (!HasFdFlag(wxFD_MULTIPLE) && !HasFdFlag(wxFD_FILE_MUST_EXIST)),
-                   wxT("wxFD_MULTIPLE or wxFD_FILE_MUST_EXIST can't be used with wxFD_SAVE" ) );
-
-    wxASSERT_MSG( !HasFdFlag(wxFD_OPEN) || !HasFdFlag(wxFD_OVERWRITE_PROMPT),
-                  wxT("wxFD_OVERWRITE_PROMPT can't be used with wxFD_OPEN") );
-
-    if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
-    {
-        m_wildCard = wxString::Format(_("All files (%s)|%s"),
-                                      wxFileSelectorDefaultWildcardStr,
-                                      wxFileSelectorDefaultWildcardStr);
-    }
-    else // have wild card
-    {
-        // convert m_wildCard from "*.bar" to "bar files (*.bar)|*.bar"
-        if ( m_wildCard.Find(wxT('|')) == wxNOT_FOUND )
-        {
-            wxString::size_type nDot = m_wildCard.find(wxT("*."));
-            if ( nDot != wxString::npos )
-                nDot++;
-            else
-                nDot = 0;
-
-            m_wildCard = wxString::Format
-                         (
-                            _("%s files (%s)|%s"),
-                            wildCard.c_str() + nDot,
-                            wildCard.c_str(),
-                            wildCard.c_str()
-                         );
-        }
-    }
-
-    return true;
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-long wxFileDialogBase::GetStyle() const
-{
-    return GetWindowStyle();
-}
-
-void wxFileDialogBase::SetStyle(long style)
-{
-    SetWindowStyle(style);
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
-wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
-                                           const wxString &extensionList)
-{
-    // strip off path, to avoid problems with "path.bar/foo"
-    wxString fileName = filePath.AfterLast(wxFILE_SEP_PATH);
-
-    // if fileName is of form "foo.bar" it's ok, return it
-    int idx_dot = fileName.Find(wxT('.'), true);
-    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.length() - 1))
-        return filePath;
-
-    // get the first extension from extensionList, or all of it
-    wxString ext = extensionList.BeforeFirst(wxT(';'));
-
-    // if ext == "foo" or "foo." there's no extension
-    int idx_ext_dot = ext.Find(wxT('.'), true);
-    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.length() - 1))
-        return filePath;
-    else
-        ext = ext.AfterLast(wxT('.'));
-
-    // if ext == "*" or "bar*" or "b?r" or " " then its not valid
-    if ((ext.Find(wxT('*')) != wxNOT_FOUND) ||
-        (ext.Find(wxT('?')) != wxNOT_FOUND) ||
-        (ext.Strip(wxString::both).empty()))
-        return filePath;
-
-    // if fileName doesn't have a '.' then add one
-    if (filePath.Last() != wxT('.'))
-        ext = wxT(".") + ext;
-
-    return filePath + ext;
-}
-
-bool wxFileDialogBase::SetExtraControlCreator(ExtraControlCreatorFunction creator)
-{
-    wxCHECK_MSG( !m_extraControlCreator, false,
-                 "wxFileDialog::SetExtraControl() called second time" );
-
-    m_extraControlCreator = creator;
-    return SupportsExtraControl();
-}
-
-bool wxFileDialogBase::CreateExtraControl()
-{
-    if (!m_extraControlCreator || m_extraControl)
-        return false;
-    m_extraControl = (*m_extraControlCreator)(this);
-    return true;
-}
-
-wxSize wxFileDialogBase::GetExtraControlSize()
-{
-    if ( !m_extraControlCreator )
-        return wxDefaultSize;
-
-    // create the extra control in an empty dialog just to find its size: this
-    // is not terribly efficient but we do need to know the size before
-    // creating the native dialog and this seems to be the only way
-    wxDialog dlg(NULL, wxID_ANY, "");
-    return (*m_extraControlCreator)(&dlg)->GetSize();
-}
-
-void wxFileDialogBase::SetPath(const wxString& path)
-{
-    wxString ext;
-    wxFileName::SplitPath(path, &m_dir, &m_fileName, &ext);
-    if ( !ext.empty() )
-        m_fileName << wxT('.') << ext;
-    m_path = path;
-}
-
-void wxFileDialogBase::SetDirectory(const wxString& dir)
-{
-    m_dir = dir;
-    m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-}
-
-void wxFileDialogBase::SetFilename(const wxString& name)
-{
-    m_fileName = name;
-    m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-}
-
-//----------------------------------------------------------------------------
-// wxFileDialog convenience functions
-//----------------------------------------------------------------------------
-
-wxString wxFileSelector(const wxString& title,
-                        const wxString& defaultDir,
-                        const wxString& defaultFileName,
-                        const wxString& defaultExtension,
-                        const wxString& filter,
-                        int flags,
-                        wxWindow *parent,
-                        int x, int y)
-{
-    // The defaultExtension, if non-empty, is
-    // appended to the filename if the user fails to type an extension. The new
-    // implementation (taken from wxFileSelectorEx) appends the extension
-    // automatically, by looking at the filter specification. In fact this
-    // should be better than the native Microsoft implementation because
-    // Windows only allows *one* default extension, whereas here we do the
-    // right thing depending on the filter the user has chosen.
-
-    // If there's a default extension specified but no filter, we create a
-    // suitable filter.
-
-    wxString filter2;
-    if ( !defaultExtension.empty() && filter.empty() )
-        filter2 = wxString(wxT("*.")) + defaultExtension;
-    else if ( !filter.empty() )
-        filter2 = filter;
-
-    wxFileDialog fileDialog(parent, title, defaultDir,
-                            defaultFileName, filter2,
-                            flags, wxPoint(x, y));
-
-    // if filter is of form "All files (*)|*|..." set correct filter index
-    if ( !defaultExtension.empty() && filter2.find(wxT('|')) != wxString::npos )
-    {
-        int filterIndex = 0;
-
-        wxArrayString descriptions, filters;
-        // don't care about errors, handled already by wxFileDialog
-        (void)wxParseCommonDialogsFilter(filter2, descriptions, filters);
-        for (size_t n=0; n<filters.GetCount(); n++)
-        {
-            if (filters[n].Contains(defaultExtension))
-            {
-                filterIndex = n;
-                break;
-            }
-        }
-
-        if (filterIndex > 0)
-            fileDialog.SetFilterIndex(filterIndex);
-    }
-
-    wxString filename;
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        filename = fileDialog.GetPath();
-    }
-
-    return filename;
-}
-
-//----------------------------------------------------------------------------
-// wxFileSelectorEx
-//----------------------------------------------------------------------------
-
-wxString wxFileSelectorEx(const wxString& title,
-                          const wxString& defaultDir,
-                          const wxString& defaultFileName,
-                          int*            defaultFilterIndex,
-                          const wxString& filter,
-                          int             flags,
-                          wxWindow*       parent,
-                          int             x,
-                          int             y)
-
-{
-    wxFileDialog fileDialog(parent,
-                            title,
-                            defaultDir,
-                            defaultFileName,
-                            filter,
-                            flags, wxPoint(x, y));
-
-    wxString filename;
-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        if ( defaultFilterIndex )
-            *defaultFilterIndex = fileDialog.GetFilterIndex();
-
-        filename = fileDialog.GetPath();
-    }
-
-    return filename;
-}
-
-//----------------------------------------------------------------------------
-// wxDefaultFileSelector - Generic load/save dialog (for internal use only)
-//----------------------------------------------------------------------------
-
-static wxString wxDefaultFileSelector(bool load,
-                                      const wxString& what,
-                                      const wxString& extension,
-                                      const wxString& default_name,
-                                      wxWindow *parent)
-{
-    wxString prompt;
-    wxString str;
-    if (load)
-        str = _("Load %s file");
-    else
-        str = _("Save %s file");
-    prompt.Printf(str, what);
-
-    wxString wild;
-    wxString ext;
-    if ( !extension.empty() )
-    {
-        if ( extension[0u] == wxT('.') )
-            ext = extension.substr(1);
-        else
-            ext = extension;
-
-        wild.Printf(wxT("*.%s"), ext);
-    }
-    else // no extension specified
-    {
-        wild = wxFileSelectorDefaultWildcardStr;
-    }
-
-    return wxFileSelector(prompt, wxEmptyString, default_name, ext, wild,
-                          load ? (wxFD_OPEN | wxFD_FILE_MUST_EXIST) : wxFD_SAVE,
-                          parent);
-}
-
-//----------------------------------------------------------------------------
-// wxLoadFileSelector
-//----------------------------------------------------------------------------
-
-WXDLLEXPORT wxString wxLoadFileSelector(const wxString& what,
-                                        const wxString& extension,
-                                        const wxString& default_name,
-                                        wxWindow *parent)
-{
-    return wxDefaultFileSelector(true, what, extension, default_name, parent);
-}
-
-//----------------------------------------------------------------------------
-// wxSaveFileSelector
-//----------------------------------------------------------------------------
-
-WXDLLEXPORT wxString wxSaveFileSelector(const wxString& what,
-                                        const wxString& extension,
-                                        const wxString& default_name,
-                                        wxWindow *parent)
-{
-    return wxDefaultFileSelector(false, what, extension, default_name, parent);
-}
-
-
-//----------------------------------------------------------------------------
-// wxDirDialogBase
-//----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_6
-long wxDirDialogBase::GetStyle() const
-{
-    return GetWindowStyle();
-}
-
-void wxDirDialogBase::SetStyle(long style)
-{
-    SetWindowStyle(style);
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
-#endif // wxUSE_FILEDLG
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fldlgcmn.cpp
+// Purpose:     wxFileDialog common functions
+// Author:      John Labenski
+// Modified by:
+// Created:     14.06.03 (extracted from src/*/filedlg.cpp)
+// RCS-ID:      $Id: fldlgcmn.cpp 66916 2011-02-16 21:48:55Z JS $
+// Copyright:   (c) Robert Roebling
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_FILEDLG
+
+#include "wx/filedlg.h"
+#include "wx/dirdlg.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/window.h"
+#endif // WX_PRECOMP
+
+//----------------------------------------------------------------------------
+// wxFileDialogBase
+//----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
+
+void wxFileDialogBase::Init()
+{
+    m_filterIndex =
+    m_windowStyle = 0;
+}
+
+bool wxFileDialogBase::Create(wxWindow *parent,
+                              const wxString& message,
+                              const wxString& defaultDir,
+                              const wxString& defaultFile,
+                              const wxString& wildCard,
+                              long style,
+                              const wxPoint& WXUNUSED(pos),
+                              const wxSize& WXUNUSED(sz),
+                              const wxString& WXUNUSED(name))
+{
+    m_message = message;
+    m_dir = defaultDir;
+    m_fileName = defaultFile;
+    m_wildCard = wildCard;
+
+    m_parent = parent;
+    m_windowStyle = style;
+    m_filterIndex = 0;
+
+    if (!HasFdFlag(wxFD_OPEN) && !HasFdFlag(wxFD_SAVE))
+        m_windowStyle |= wxFD_OPEN;     // wxFD_OPEN is the default
+
+    // check that the styles are not contradictory
+    wxASSERT_MSG( !(HasFdFlag(wxFD_SAVE) && HasFdFlag(wxFD_OPEN)),
+                  _T("can't specify both wxFD_SAVE and wxFD_OPEN at once") );
+
+    wxASSERT_MSG( !HasFdFlag(wxFD_SAVE) ||
+                    (!HasFdFlag(wxFD_MULTIPLE) && !HasFdFlag(wxFD_FILE_MUST_EXIST)),
+                   _T("wxFD_MULTIPLE or wxFD_FILE_MUST_EXIST can't be used with wxFD_SAVE" ) );
+
+    wxASSERT_MSG( !HasFdFlag(wxFD_OPEN) || !HasFdFlag(wxFD_OVERWRITE_PROMPT),
+                  _T("wxFD_OVERWRITE_PROMPT can't be used with wxFD_OPEN") );
+
+    if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
+    {
+        m_wildCard = wxString::Format(_("All files (%s)|%s"),
+                                      wxFileSelectorDefaultWildcardStr,
+                                      wxFileSelectorDefaultWildcardStr);
+    }
+    else // have wild card
+    {
+        // convert m_wildCard from "*.bar" to "bar files (*.bar)|*.bar"
+        if ( m_wildCard.Find(wxT('|')) == wxNOT_FOUND )
+        {
+            wxString::size_type nDot = m_wildCard.find(_T("*."));
+            if ( nDot != wxString::npos )
+                nDot++;
+            else
+                nDot = 0;
+
+            m_wildCard = wxString::Format
+                         (
+                            _("%s files (%s)|%s"),
+                            wildCard.c_str() + nDot,
+                            wildCard.c_str(),
+                            wildCard.c_str()
+                         );
+        }
+    }
+
+    return true;
+}
+
+#if WXWIN_COMPATIBILITY_2_4
+// Parses the filterStr, returning the number of filters.
+// Returns 0 if none or if there's a problem.
+// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
+int wxFileDialogBase::ParseWildcard(const wxString& filterStr,
+                                    wxArrayString& descriptions,
+                                    wxArrayString& filters)
+{
+    return ::wxParseCommonDialogsFilter(filterStr, descriptions, filters);
+}
+#endif // WXWIN_COMPATIBILITY_2_4
+
+#if WXWIN_COMPATIBILITY_2_6
+long wxFileDialogBase::GetStyle() const
+{
+    return GetWindowStyle();
+}
+
+void wxFileDialogBase::SetStyle(long style)
+{
+    SetWindowStyle(style);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+
+wxString wxFileDialogBase::AppendExtension(const wxString &filePath,
+                                           const wxString &extensionList)
+{
+    // strip off path, to avoid problems with "path.bar/foo"
+    wxString fileName = filePath.AfterLast(wxFILE_SEP_PATH);
+
+    // if fileName is of form "foo.bar" it's ok, return it
+    int idx_dot = fileName.Find(wxT('.'), true);
+    if ((idx_dot != wxNOT_FOUND) && (idx_dot < (int)fileName.length() - 1))
+        return filePath;
+
+    // get the first extension from extensionList, or all of it
+    wxString ext = extensionList.BeforeFirst(wxT(';'));
+
+    // if ext == "foo" or "foo." there's no extension
+    int idx_ext_dot = ext.Find(wxT('.'), true);
+    if ((idx_ext_dot == wxNOT_FOUND) || (idx_ext_dot == (int)ext.length() - 1))
+        return filePath;
+    else
+        ext = ext.AfterLast(wxT('.'));
+
+    // if ext == "*" or "bar*" or "b?r" or " " then its not valid
+    if ((ext.Find(wxT('*')) != wxNOT_FOUND) ||
+        (ext.Find(wxT('?')) != wxNOT_FOUND) ||
+        (ext.Strip(wxString::both).empty()))
+        return filePath;
+
+    // if fileName doesn't have a '.' then add one
+    if (filePath.Last() != wxT('.'))
+        ext = wxT(".") + ext;
+
+    return filePath + ext;
+}
+
+//----------------------------------------------------------------------------
+// wxFileDialog convenience functions
+//----------------------------------------------------------------------------
+
+wxString wxFileSelector(const wxChar *title,
+                               const wxChar *defaultDir,
+                               const wxChar *defaultFileName,
+                               const wxChar *defaultExtension,
+                               const wxChar *filter,
+                               int flags,
+                               wxWindow *parent,
+                               int x, int y)
+{
+    // The defaultExtension, if non-NULL, is
+    // appended to the filename if the user fails to type an extension. The new
+    // implementation (taken from wxFileSelectorEx) appends the extension
+    // automatically, by looking at the filter specification. In fact this
+    // should be better than the native Microsoft implementation because
+    // Windows only allows *one* default extension, whereas here we do the
+    // right thing depending on the filter the user has chosen.
+
+    // If there's a default extension specified but no filter, we create a
+    // suitable filter.
+
+    wxString filter2;
+    if ( !wxIsEmpty(defaultExtension) && wxIsEmpty(filter) )
+        filter2 = wxString(wxT("*.")) + defaultExtension;
+    else if ( !wxIsEmpty(filter) )
+        filter2 = filter;
+
+    wxString defaultDirString;
+    if (!wxIsEmpty(defaultDir))
+        defaultDirString = defaultDir;
+
+    wxString defaultFilenameString;
+    if (!wxIsEmpty(defaultFileName))
+        defaultFilenameString = defaultFileName;
+
+    wxFileDialog fileDialog(parent, title, defaultDirString,
+                            defaultFilenameString, filter2,
+                            flags, wxPoint(x, y));
+
+   // if filter is of form "All files (*)|*|..." set correct filter index
+    if((wxStrlen(defaultExtension) != 0) && (filter2.Find(wxT('|')) != wxNOT_FOUND))
+    {
+        int filterIndex = 0;
+
+        wxArrayString descriptions, filters;
+        // don't care about errors, handled already by wxFileDialog
+        (void)wxParseCommonDialogsFilter(filter2, descriptions, filters);
+        for (size_t n=0; n<filters.GetCount(); n++)
+        {
+            if (filters[n].Contains(defaultExtension))
+            {
+                filterIndex = n;
+                        break;
+            }
+        }
+
+        if (filterIndex > 0)
+            fileDialog.SetFilterIndex(filterIndex);
+    }
+
+    wxString filename;
+    if ( fileDialog.ShowModal() == wxID_OK )
+    {
+        filename = fileDialog.GetPath();
+    }
+
+    return filename;
+}
+
+//----------------------------------------------------------------------------
+// wxFileSelectorEx
+//----------------------------------------------------------------------------
+
+wxString wxFileSelectorEx(const wxChar *title,
+                          const wxChar *defaultDir,
+                          const wxChar *defaultFileName,
+                          int* defaultFilterIndex,
+                          const wxChar *filter,
+                          int       flags,
+                          wxWindow* parent,
+                          int       x,
+                          int       y)
+
+{
+    wxFileDialog fileDialog(parent,
+                            !wxIsEmpty(title) ? title : wxEmptyString,
+                            !wxIsEmpty(defaultDir) ? defaultDir : wxEmptyString,
+                            !wxIsEmpty(defaultFileName) ? defaultFileName : wxEmptyString,
+                            !wxIsEmpty(filter) ? filter : wxEmptyString,
+                            flags, wxPoint(x, y));
+
+    wxString filename;
+    if ( fileDialog.ShowModal() == wxID_OK )
+    {
+        if ( defaultFilterIndex )
+            *defaultFilterIndex = fileDialog.GetFilterIndex();
+
+        filename = fileDialog.GetPath();
+    }
+
+    return filename;
+}
+
+//----------------------------------------------------------------------------
+// wxDefaultFileSelector - Generic load/save dialog (for internal use only)
+//----------------------------------------------------------------------------
+
+static wxString wxDefaultFileSelector(bool load,
+                                      const wxChar *what,
+                                      const wxChar *extension,
+                                      const wxChar *default_name,
+                                      wxWindow *parent)
+{
+    wxString prompt;
+    wxString str;
+    if (load)
+        str = _("Load %s file");
+    else
+        str = _("Save %s file");
+    prompt.Printf(str, what);
+
+    wxString wild;
+    const wxChar *ext = extension;
+    if ( !wxIsEmpty(ext) )
+    {
+        if ( *ext == wxT('.') )
+            ext++;
+
+        wild.Printf(wxT("*.%s"), ext);
+    }
+    else // no extension specified
+    {
+        wild = wxFileSelectorDefaultWildcardStr;
+    }
+
+    return wxFileSelector(prompt, NULL, default_name, ext, wild,
+                          load ? (wxFD_OPEN | wxFD_FILE_MUST_EXIST) : wxFD_SAVE, parent);
+}
+
+//----------------------------------------------------------------------------
+// wxLoadFileSelector
+//----------------------------------------------------------------------------
+
+WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
+                                        const wxChar *extension,
+                                        const wxChar *default_name,
+                                        wxWindow *parent)
+{
+    return wxDefaultFileSelector(true, what, extension, default_name, parent);
+}
+
+//----------------------------------------------------------------------------
+// wxSaveFileSelector
+//----------------------------------------------------------------------------
+
+WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
+                                        const wxChar *extension,
+                                        const wxChar *default_name,
+                                        wxWindow *parent)
+{
+    return wxDefaultFileSelector(false, what, extension, default_name, parent);
+}
+
+
+//----------------------------------------------------------------------------
+// wxDirDialogBase
+//----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_6
+long wxDirDialogBase::GetStyle() const
+{
+    return GetWindowStyle();
+}
+
+void wxDirDialogBase::SetStyle(long style)
+{
+    SetWindowStyle(style);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+
+#endif // wxUSE_FILEDLG
diff --git a/Source/3rd Party/wx/src/common/fmapbase.cpp b/Source/3rd Party/wx/src/common/fmapbase.cpp
index 4aa84338c..d273922c1 100644
--- a/Source/3rd Party/wx/src/common/fmapbase.cpp	
+++ b/Source/3rd Party/wx/src/common/fmapbase.cpp	
@@ -1,873 +1,737 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fmapbase.cpp
-// Purpose:     wxFontMapperBase class implementation
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     21.06.2003 (extracted from common/fontmap.cpp)
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FONTMAP
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/module.h"
-    #include "wx/wxcrtvararg.h"
-#endif //WX_PRECOMP
-
-#if defined(__WINDOWS__)
-    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
-    #include  "wx/msw/winundef.h"
-#endif
-
-#include "wx/fontmap.h"
-#include "wx/fmappriv.h"
-
-#include "wx/apptrait.h"
-
-// wxMemoryConfig uses wxFileConfig
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-    #include "wx/config.h"
-    #include "wx/memconf.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// encodings supported by GetEncodingDescription
-static const wxFontEncoding gs_encodings[] =
-{
-    wxFONTENCODING_ISO8859_1,
-    wxFONTENCODING_ISO8859_2,
-    wxFONTENCODING_ISO8859_3,
-    wxFONTENCODING_ISO8859_4,
-    wxFONTENCODING_ISO8859_5,
-    wxFONTENCODING_ISO8859_6,
-    wxFONTENCODING_ISO8859_7,
-    wxFONTENCODING_ISO8859_8,
-    wxFONTENCODING_ISO8859_9,
-    wxFONTENCODING_ISO8859_10,
-    wxFONTENCODING_ISO8859_11,
-    wxFONTENCODING_ISO8859_12,
-    wxFONTENCODING_ISO8859_13,
-    wxFONTENCODING_ISO8859_14,
-    wxFONTENCODING_ISO8859_15,
-    wxFONTENCODING_KOI8,
-    wxFONTENCODING_KOI8_U,
-    wxFONTENCODING_CP866,
-    wxFONTENCODING_CP874,
-    wxFONTENCODING_CP932,
-    wxFONTENCODING_CP936,
-    wxFONTENCODING_CP949,
-    wxFONTENCODING_CP950,
-    wxFONTENCODING_CP1250,
-    wxFONTENCODING_CP1251,
-    wxFONTENCODING_CP1252,
-    wxFONTENCODING_CP1253,
-    wxFONTENCODING_CP1254,
-    wxFONTENCODING_CP1255,
-    wxFONTENCODING_CP1256,
-    wxFONTENCODING_CP1257,
-    wxFONTENCODING_CP1258,
-    wxFONTENCODING_CP1361,
-    wxFONTENCODING_CP437,
-    wxFONTENCODING_UTF7,
-    wxFONTENCODING_UTF8,
-    wxFONTENCODING_UTF16BE,
-    wxFONTENCODING_UTF16LE,
-    wxFONTENCODING_UTF32BE,
-    wxFONTENCODING_UTF32LE,
-    wxFONTENCODING_EUC_JP,
-    wxFONTENCODING_DEFAULT,
-    wxFONTENCODING_ISO2022_JP,
-
-    wxFONTENCODING_MACROMAN,
-    wxFONTENCODING_MACJAPANESE,
-    wxFONTENCODING_MACCHINESETRAD,
-    wxFONTENCODING_MACKOREAN,
-    wxFONTENCODING_MACARABIC,
-    wxFONTENCODING_MACHEBREW,
-    wxFONTENCODING_MACGREEK,
-    wxFONTENCODING_MACCYRILLIC,
-    wxFONTENCODING_MACDEVANAGARI,
-    wxFONTENCODING_MACGURMUKHI,
-    wxFONTENCODING_MACGUJARATI,
-    wxFONTENCODING_MACORIYA,
-    wxFONTENCODING_MACBENGALI,
-    wxFONTENCODING_MACTAMIL,
-    wxFONTENCODING_MACTELUGU,
-    wxFONTENCODING_MACKANNADA,
-    wxFONTENCODING_MACMALAJALAM,
-    wxFONTENCODING_MACSINHALESE,
-    wxFONTENCODING_MACBURMESE,
-    wxFONTENCODING_MACKHMER,
-    wxFONTENCODING_MACTHAI,
-    wxFONTENCODING_MACLAOTIAN,
-    wxFONTENCODING_MACGEORGIAN,
-    wxFONTENCODING_MACARMENIAN,
-    wxFONTENCODING_MACCHINESESIMP,
-    wxFONTENCODING_MACTIBETAN,
-    wxFONTENCODING_MACMONGOLIAN,
-    wxFONTENCODING_MACETHIOPIC,
-    wxFONTENCODING_MACCENTRALEUR,
-    wxFONTENCODING_MACVIATNAMESE,
-    wxFONTENCODING_MACARABICEXT,
-    wxFONTENCODING_MACSYMBOL,
-    wxFONTENCODING_MACDINGBATS,
-    wxFONTENCODING_MACTURKISH,
-    wxFONTENCODING_MACCROATIAN,
-    wxFONTENCODING_MACICELANDIC,
-    wxFONTENCODING_MACROMANIAN,
-    wxFONTENCODING_MACCELTIC,
-    wxFONTENCODING_MACGAELIC,
-    wxFONTENCODING_MACKEYBOARD
-};
-
-// the descriptions for them
-static const char* const gs_encodingDescs[] =
-{
-    wxTRANSLATE( "Western European (ISO-8859-1)" ),
-    wxTRANSLATE( "Central European (ISO-8859-2)" ),
-    wxTRANSLATE( "Esperanto (ISO-8859-3)" ),
-    wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ),
-    wxTRANSLATE( "Cyrillic (ISO-8859-5)" ),
-    wxTRANSLATE( "Arabic (ISO-8859-6)" ),
-    wxTRANSLATE( "Greek (ISO-8859-7)" ),
-    wxTRANSLATE( "Hebrew (ISO-8859-8)" ),
-    wxTRANSLATE( "Turkish (ISO-8859-9)" ),
-    wxTRANSLATE( "Nordic (ISO-8859-10)" ),
-    wxTRANSLATE( "Thai (ISO-8859-11)" ),
-    wxTRANSLATE( "Indian (ISO-8859-12)" ),
-    wxTRANSLATE( "Baltic (ISO-8859-13)" ),
-    wxTRANSLATE( "Celtic (ISO-8859-14)" ),
-    wxTRANSLATE( "Western European with Euro (ISO-8859-15)" ),
-    wxTRANSLATE( "KOI8-R" ),
-    wxTRANSLATE( "KOI8-U" ),
-    wxTRANSLATE( "Windows/DOS OEM Cyrillic (CP 866)" ),
-    wxTRANSLATE( "Windows Thai (CP 874)" ),
-    wxTRANSLATE( "Windows Japanese (CP 932) or Shift-JIS" ),
-    wxTRANSLATE( "Windows Chinese Simplified (CP 936) or GB-2312" ),
-    wxTRANSLATE( "Windows Korean (CP 949)" ),
-    wxTRANSLATE( "Windows Chinese Traditional (CP 950) or Big-5" ),
-    wxTRANSLATE( "Windows Central European (CP 1250)" ),
-    wxTRANSLATE( "Windows Cyrillic (CP 1251)" ),
-    wxTRANSLATE( "Windows Western European (CP 1252)" ),
-    wxTRANSLATE( "Windows Greek (CP 1253)" ),
-    wxTRANSLATE( "Windows Turkish (CP 1254)" ),
-    wxTRANSLATE( "Windows Hebrew (CP 1255)" ),
-    wxTRANSLATE( "Windows Arabic (CP 1256)" ),
-    wxTRANSLATE( "Windows Baltic (CP 1257)" ),
-    wxTRANSLATE( "Windows Vietnamese (CP 1258)" ),
-    wxTRANSLATE( "Windows Johab (CP 1361)" ),
-    wxTRANSLATE( "Windows/DOS OEM (CP 437)" ),
-    wxTRANSLATE( "Unicode 7 bit (UTF-7)" ),
-    wxTRANSLATE( "Unicode 8 bit (UTF-8)" ),
-#ifdef WORDS_BIGENDIAN
-    wxTRANSLATE( "Unicode 16 bit (UTF-16)" ),
-    wxTRANSLATE( "Unicode 16 bit Little Endian (UTF-16LE)" ),
-    wxTRANSLATE( "Unicode 32 bit (UTF-32)" ),
-    wxTRANSLATE( "Unicode 32 bit Little Endian (UTF-32LE)" ),
-#else // WORDS_BIGENDIAN
-    wxTRANSLATE( "Unicode 16 bit Big Endian (UTF-16BE)" ),
-    wxTRANSLATE( "Unicode 16 bit (UTF-16)" ),
-    wxTRANSLATE( "Unicode 32 bit Big Endian (UTF-32BE)" ),
-    wxTRANSLATE( "Unicode 32 bit (UTF-32)" ),
-#endif // WORDS_BIGENDIAN
-    wxTRANSLATE( "Extended Unix Codepage for Japanese (EUC-JP)" ),
-    wxTRANSLATE( "US-ASCII" ),
-    wxTRANSLATE( "ISO-2022-JP" ),
-
-    wxTRANSLATE( "MacRoman" ),
-    wxTRANSLATE( "MacJapanese" ),
-    wxTRANSLATE( "MacChineseTrad" ),
-    wxTRANSLATE( "MacKorean" ),
-    wxTRANSLATE( "MacArabic" ),
-    wxTRANSLATE( "MacHebrew" ),
-    wxTRANSLATE( "MacGreek" ),
-    wxTRANSLATE( "MacCyrillic" ),
-    wxTRANSLATE( "MacDevanagari" ),
-    wxTRANSLATE( "MacGurmukhi" ),
-    wxTRANSLATE( "MacGujarati" ),
-    wxTRANSLATE( "MacOriya" ),
-    wxTRANSLATE( "MacBengali" ),
-    wxTRANSLATE( "MacTamil" ),
-    wxTRANSLATE( "MacTelugu" ),
-    wxTRANSLATE( "MacKannada" ),
-    wxTRANSLATE( "MacMalayalam" ),
-    wxTRANSLATE( "MacSinhalese" ),
-    wxTRANSLATE( "MacBurmese" ),
-    wxTRANSLATE( "MacKhmer" ),
-    wxTRANSLATE( "MacThai" ),
-    wxTRANSLATE( "MacLaotian" ),
-    wxTRANSLATE( "MacGeorgian" ),
-    wxTRANSLATE( "MacArmenian" ),
-    wxTRANSLATE( "MacChineseSimp" ),
-    wxTRANSLATE( "MacTibetan" ),
-    wxTRANSLATE( "MacMongolian" ),
-    wxTRANSLATE( "MacEthiopic" ),
-    wxTRANSLATE( "MacCentralEurRoman" ),
-    wxTRANSLATE( "MacVietnamese" ),
-    wxTRANSLATE( "MacExtArabic" ),
-    wxTRANSLATE( "MacSymbol" ),
-    wxTRANSLATE( "MacDingbats" ),
-    wxTRANSLATE( "MacTurkish" ),
-    wxTRANSLATE( "MacCroatian" ),
-    wxTRANSLATE( "MacIcelandic" ),
-    wxTRANSLATE( "MacRomanian" ),
-    wxTRANSLATE( "MacCeltic" ),
-    wxTRANSLATE( "MacGaelic" ),
-    wxTRANSLATE( "MacKeyboardGlyphs" )
-};
-
-// and the internal names (these are not translated on purpose!)
-static const wxChar* const gs_encodingNames[][9] =
-{
-    // names from the columns correspond to these OS:
-    //      Linux        Solaris and IRIX       HP-UX             AIX
-    { wxT("ISO-8859-1"),  wxT("ISO8859-1"),  wxT("iso88591"),  wxT("8859-1"), wxT("iso_8859_1"), NULL },
-    { wxT("ISO-8859-2"),  wxT("ISO8859-2"),  wxT("iso88592"),  wxT("8859-2"), NULL },
-    { wxT("ISO-8859-3"),  wxT("ISO8859-3"),  wxT("iso88593"),  wxT("8859-3"), NULL },
-    { wxT("ISO-8859-4"),  wxT("ISO8859-4"),  wxT("iso88594"),  wxT("8859-4"), NULL },
-    { wxT("ISO-8859-5"),  wxT("ISO8859-5"),  wxT("iso88595"),  wxT("8859-5"), NULL },
-    { wxT("ISO-8859-6"),  wxT("ISO8859-6"),  wxT("iso88596"),  wxT("8859-6"), NULL },
-    { wxT("ISO-8859-7"),  wxT("ISO8859-7"),  wxT("iso88597"),  wxT("8859-7"), NULL },
-    { wxT("ISO-8859-8"),  wxT("ISO8859-8"),  wxT("iso88598"),  wxT("8859-8"), NULL },
-    { wxT("ISO-8859-9"),  wxT("ISO8859-9"),  wxT("iso88599"),  wxT("8859-9"), NULL },
-    { wxT("ISO-8859-10"), wxT("ISO8859-10"), wxT("iso885910"), wxT("8859-10"), NULL },
-    { wxT("ISO-8859-11"), wxT("ISO8859-11"), wxT("iso885911"), wxT("8859-11"), NULL },
-    { wxT("ISO-8859-12"), wxT("ISO8859-12"), wxT("iso885912"), wxT("8859-12"), NULL },
-    { wxT("ISO-8859-13"), wxT("ISO8859-13"), wxT("iso885913"), wxT("8859-13"), NULL },
-    { wxT("ISO-8859-14"), wxT("ISO8859-14"), wxT("iso885914"), wxT("8859-14"), NULL },
-    { wxT("ISO-8859-15"), wxT("ISO8859-15"), wxT("iso885915"), wxT("8859-15"), NULL },
-
-    // although koi8-ru is not strictly speaking the same as koi8-r,
-    // they are similar enough to make mapping it to koi8 better than
-    // not recognizing it at all
-    { wxT( "KOI8-R" ), wxT( "KOI8-RU" ), NULL },
-    { wxT( "KOI8-U" ), NULL },
-
-    { wxT( "WINDOWS-866" ), wxT( "CP866" ), NULL },
-
-    { wxT( "WINDOWS-874" ), wxT( "CP874" ), wxT( "MS874" ), wxT( "IBM-874" ), NULL },
-    { wxT( "WINDOWS-932" ), wxT( "CP932" ), wxT( "MS932" ), wxT( "IBM-932" ), wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL },
-    { wxT( "WINDOWS-936" ), wxT( "CP936" ), wxT( "MS936" ), wxT( "IBM-936" ), wxT( "GB2312" ), wxT( "gbk" ),wxT( "GBK" ), NULL },
-    { wxT( "WINDOWS-949" ), wxT( "CP949" ), wxT( "MS949" ), wxT( "IBM-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL },
-    { wxT( "WINDOWS-950" ), wxT( "CP950" ), wxT( "MS950" ), wxT( "IBM-950" ), wxT( "BIG5" ), wxT( "BIG-5" ), wxT( "BIG-FIVE" ), NULL },
-    { wxT( "WINDOWS-1250" ),wxT( "CP1250" ),wxT( "MS1250" ),wxT( "IBM-1250" ),NULL },
-    { wxT( "WINDOWS-1251" ),wxT( "CP1251" ),wxT( "MS1251" ),wxT( "IBM-1251" ),NULL },
-    { wxT( "WINDOWS-1252" ),wxT( "CP1252" ),wxT( "MS1252" ),wxT( "IBM-1252" ),NULL },
-    { wxT( "WINDOWS-1253" ),wxT( "CP1253" ),wxT( "MS1253" ),wxT( "IBM-1253" ),NULL },
-    { wxT( "WINDOWS-1254" ),wxT( "CP1254" ),wxT( "MS1254" ),wxT( "IBM-1254" ),NULL },
-    { wxT( "WINDOWS-1255" ),wxT( "CP1255" ),wxT( "MS1255" ),wxT( "IBM-1255" ),NULL },
-    { wxT( "WINDOWS-1256" ),wxT( "CP1256" ),wxT( "MS1256" ),wxT( "IBM-1256" ),NULL },
-    { wxT( "WINDOWS-1257" ),wxT( "CP1257" ),wxT( "MS1257" ),wxT( "IBM-1257" ),NULL },
-    { wxT( "WINDOWS-1258" ),wxT( "CP1258" ),wxT( "MS1258" ),wxT( "IBM-1258" ),NULL },
-    { wxT( "WINDOWS-1361" ),wxT( "CP1361" ),wxT( "MS1361" ),wxT( "IBM-1361" ), wxT( "JOHAB" ), NULL },
-    { wxT( "WINDOWS-437" ), wxT( "CP437" ), wxT( "MS437" ), wxT( "IBM-437" ), NULL },
-
-    { wxT( "UTF-7" ), wxT("UTF7"), NULL },
-    { wxT( "UTF-8" ), wxT("UTF8"), NULL },
-#ifdef WORDS_BIGENDIAN
-    { wxT( "UTF-16BE" ), wxT("UTF16BE"), wxT("UCS-2BE"), wxT("UCS2BE"), wxT("UTF-16"), wxT("UTF16"), wxT("UCS-2"), wxT("UCS2"), NULL },
-    { wxT( "UTF-16LE" ), wxT("UTF16LE"), wxT("UCS-2LE"), wxT("UCS2LE"), NULL },
-    { wxT( "UTF-32BE" ), wxT("UTF32BE"), wxT("UCS-4BE" ), wxT("UTF-32"), wxT("UTF32"), wxT("UCS-4"), wxT("UCS4"), NULL },
-    { wxT( "UTF-32LE" ), wxT("UTF32LE"), wxT("UCS-4LE"), wxT("UCS4LE"), NULL },
-#else // WORDS_BIGENDIAN
-    { wxT("UTF-16BE"), wxT("UTF16BE"), wxT("UCS-2BE"), wxT("UCS2BE"), NULL },
-    { wxT("UTF-16LE"), wxT("UTF16LE"), wxT("UCS-2LE"), wxT("UTF-16"), wxT("UTF16"), wxT("UCS-2"), wxT("UCS2"), NULL },
-    { wxT("UTF-32BE"), wxT("UTF32BE"), wxT("UCS-4BE"), wxT("UCS4BE"), NULL },
-    { wxT("UTF-32LE"), wxT("UTF32LE"), wxT("UCS-4LE"), wxT("UCS4LE"), wxT("UTF-32"), wxT("UTF32"), wxT("UCS-4"), wxT("UCS4"), NULL },
-#endif // WORDS_BIGENDIAN
-
-    { wxT( "EUC-JP" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL },
-
-    // 646 is for Solaris, roman8 -- for HP-UX
-    { wxT( "US-ASCII" ), wxT( "ASCII" ), wxT("C"), wxT("POSIX"), wxT("ANSI_X3.4-1968"),
-      wxT("646"), wxT("roman8"), wxT( "" ), NULL },
-
-    { wxT( "ISO-2022-JP" ), NULL },
-
-
-    { wxT( "MacRoman" ), NULL },
-    { wxT( "MacJapanese" ), NULL },
-    { wxT( "MacChineseTrad" ), NULL },
-    { wxT( "MacKorean" ), NULL },
-    { wxT( "MacArabic" ), NULL },
-    { wxT( "MacHebrew" ), NULL },
-    { wxT( "MacGreek" ), NULL },
-    { wxT( "MacCyrillic" ), NULL },
-    { wxT( "MacDevanagari" ), NULL },
-    { wxT( "MacGurmukhi" ), NULL },
-    { wxT( "MacGujarati" ), NULL },
-    { wxT( "MacOriya" ), NULL },
-    { wxT( "MacBengali" ), NULL },
-    { wxT( "MacTamil" ), NULL },
-    { wxT( "MacTelugu" ), NULL },
-    { wxT( "MacKannada" ), NULL },
-    { wxT( "MacMalayalam" ), NULL },
-    { wxT( "MacSinhalese" ), NULL },
-    { wxT( "MacBurmese" ), NULL },
-    { wxT( "MacKhmer" ), NULL },
-    { wxT( "MacThai" ), NULL },
-    { wxT( "MacLaotian" ), NULL },
-    { wxT( "MacGeorgian" ), NULL },
-    { wxT( "MacArmenian" ), NULL },
-    { wxT( "MacChineseSimp" ), NULL },
-    { wxT( "MacTibetan" ), NULL },
-    { wxT( "MacMongolian" ), NULL },
-    { wxT( "MacEthiopic" ), NULL },
-    { wxT( "MacCentralEurRoman" ), NULL },
-    { wxT( "MacVietnamese" ), NULL },
-    { wxT( "MacExtArabic" ), NULL },
-    { wxT( "MacSymbol" ), NULL },
-    { wxT( "MacDingbats" ), NULL },
-    { wxT( "MacTurkish" ), NULL },
-    { wxT( "MacCroatian" ), NULL },
-    { wxT( "MacIcelandic" ), NULL },
-    { wxT( "MacRomanian" ), NULL },
-    { wxT( "MacCeltic" ), NULL },
-    { wxT( "MacGaelic" ), NULL },
-    { wxT( "MacKeyboardGlyphs" ), NULL }
-};
-
-wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );
-wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingNames) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// clean up the font mapper object
-class wxFontMapperModule : public wxModule
-{
-public:
-    wxFontMapperModule() : wxModule() { }
-
-    virtual bool OnInit()
-    {
-        // a dummy wxFontMapperBase object could have been created during the
-        // program startup before wxApp was created, we have to delete it to
-        // allow creating the real font mapper next time it is needed now that
-        // we can create it (when the modules are initialized, wxApp object
-        // already exists)
-        wxFontMapperBase *fm = wxFontMapperBase::Get();
-        if ( fm && fm->IsDummy() )
-            wxFontMapperBase::Reset();
-
-        return true;
-    }
-
-    virtual void OnExit()
-    {
-        wxFontMapperBase::Reset();
-    }
-
-    DECLARE_DYNAMIC_CLASS(wxFontMapperModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontMapperModule, wxModule)
-
-
-// ============================================================================
-// wxFontMapperBase implementation
-// ============================================================================
-
-wxFontMapper *wxFontMapperBase::sm_instance = NULL;
-
-// ----------------------------------------------------------------------------
-// ctor and dtor
-// ----------------------------------------------------------------------------
-
-wxFontMapperBase::wxFontMapperBase()
-{
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-    m_configDummy = NULL;
-#endif // wxUSE_CONFIG
-}
-
-wxFontMapperBase::~wxFontMapperBase()
-{
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-    if ( m_configDummy )
-        delete m_configDummy;
-#endif // wxUSE_CONFIG
-}
-
-/* static */
-wxFontMapperBase *wxFontMapperBase::Get()
-{
-    if ( !sm_instance )
-    {
-        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-        if ( traits )
-        {
-            sm_instance = traits->CreateFontMapper();
-
-            wxASSERT_MSG( sm_instance,
-                            wxT("wxAppTraits::CreateFontMapper() failed") );
-        }
-
-        if ( !sm_instance )
-        {
-            // last resort: we must create something because the existing code
-            // relies on always having a valid font mapper object
-            sm_instance = (wxFontMapper *)new wxFontMapperBase;
-        }
-    }
-
-    return (wxFontMapperBase*)sm_instance;
-}
-
-/* static */
-wxFontMapper *wxFontMapperBase::Set(wxFontMapper *mapper)
-{
-    wxFontMapper *old = sm_instance;
-    sm_instance = mapper;
-    return old;
-}
-
-/* static */
-void wxFontMapperBase::Reset()
-{
-    if ( sm_instance )
-    {
-        // we need a cast as wxFontMapper is not fully declared here and so the
-        // compiler can't know that it derives from wxFontMapperBase (but
-        // run-time behaviour will be correct because the dtor is virtual)
-        delete (wxFontMapperBase *)sm_instance;
-        sm_instance = NULL;
-    }
-}
-
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-
-// ----------------------------------------------------------------------------
-// config usage customisation
-// ----------------------------------------------------------------------------
-
-
-static wxString gs_defaultConfigPath(FONTMAPPER_ROOT_PATH);
-
-/* static */
-const wxString& wxFontMapperBase::GetDefaultConfigPath()
-{
-    // NB: we return const wxString& and not wxString for compatibility
-    //     with 2.8 that returned const wxChar*
-    return gs_defaultConfigPath;
-}
-
-void wxFontMapperBase::SetConfigPath(const wxString& prefix)
-{
-    wxCHECK_RET( !prefix.empty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
-                 wxT("an absolute path should be given to wxFontMapper::SetConfigPath()") );
-
-    m_configRootPath = prefix;
-}
-
-// ----------------------------------------------------------------------------
-// get config object and path for it
-// ----------------------------------------------------------------------------
-
-wxConfigBase *wxFontMapperBase::GetConfig()
-{
-    wxConfigBase *config = wxConfig::Get(false);
-
-    // If there is no global configuration, use an internal memory configuration
-    if ( !config )
-    {
-        if ( !m_configDummy )
-            m_configDummy = new wxMemoryConfig;
-        config = m_configDummy;
-
-        // FIXME: ideally, we should add keys from dummy config to a real one later,
-        //        but it is a low-priority task because typical wxWin application
-        //        either doesn't use wxConfig at all or creates wxConfig object in
-        //        wxApp::OnInit(), before any real interaction with the user takes
-        //        place...
-    }
-
-    return config;
-}
-
-const wxString& wxFontMapperBase::GetConfigPath()
-{
-    if ( !m_configRootPath )
-    {
-        // use the default
-        m_configRootPath = GetDefaultConfigPath();
-    }
-
-    return m_configRootPath;
-}
-
-// ----------------------------------------------------------------------------
-// config helpers
-// ----------------------------------------------------------------------------
-
-bool wxFontMapperBase::ChangePath(const wxString& pathNew, wxString *pathOld)
-{
-    wxConfigBase *config = GetConfig();
-    if ( !config )
-        return false;
-
-    *pathOld = config->GetPath();
-
-    wxString path = GetConfigPath();
-    if ( path.empty() || path.Last() != wxCONFIG_PATH_SEPARATOR )
-    {
-        path += wxCONFIG_PATH_SEPARATOR;
-    }
-
-    wxASSERT_MSG( !pathNew || (pathNew[0] != wxCONFIG_PATH_SEPARATOR),
-                  wxT("should be a relative path") );
-
-    path += pathNew;
-
-    config->SetPath(path);
-
-    return true;
-}
-
-void wxFontMapperBase::RestorePath(const wxString& pathOld)
-{
-    GetConfig()->SetPath(pathOld);
-}
-
-#endif
-
-// ----------------------------------------------------------------------------
-// charset/encoding correspondence
-// ----------------------------------------------------------------------------
-
-wxFontEncoding
-wxFontMapperBase::CharsetToEncoding(const wxString& charset,
-                                    bool WXUNUSED(interactive))
-{
-    int enc = NonInteractiveCharsetToEncoding(charset);
-    if ( enc == wxFONTENCODING_UNKNOWN )
-    {
-        // we should return wxFONTENCODING_SYSTEM from here for unknown
-        // encodings
-        enc = wxFONTENCODING_SYSTEM;
-    }
-
-    return (wxFontEncoding)enc;
-}
-
-int
-wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset)
-{
-    wxFontEncoding encoding = wxFONTENCODING_SYSTEM;
-
-    // we're going to modify it, make a copy
-    wxString cs = charset;
-
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-    // first try the user-defined settings
-    wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH);
-    if ( path.IsOk() )
-    {
-        wxConfigBase *config = GetConfig();
-
-        // do we have an encoding for this charset?
-        long value = config->Read(charset, -1l);
-        if ( value != -1 )
-        {
-            if ( value == wxFONTENCODING_UNKNOWN )
-            {
-                // don't try to find it, in particular don't ask the user
-                return value;
-            }
-
-            if ( value >= 0 && value <= wxFONTENCODING_MAX )
-            {
-                encoding = (wxFontEncoding)value;
-            }
-            else
-            {
-                wxLogDebug(wxT("corrupted config data: invalid encoding %ld for charset '%s' ignored"),
-                           value, charset.c_str());
-            }
-        }
-
-        if ( encoding == wxFONTENCODING_SYSTEM )
-        {
-            // may be we have an alias?
-            config->SetPath(FONTMAPPER_CHARSET_ALIAS_PATH);
-
-            wxString alias = config->Read(charset);
-            if ( !alias.empty() )
-            {
-                // yes, we do - use it instead
-                cs = alias;
-            }
-        }
-    }
-#endif // wxUSE_CONFIG
-
-    // if didn't find it there, try to recognize it ourselves
-    if ( encoding == wxFONTENCODING_SYSTEM )
-    {
-        // trim any spaces
-        cs.Trim(true);
-        cs.Trim(false);
-
-        // discard the optional quotes
-        if ( !cs.empty() )
-        {
-            if ( cs[0u] == wxT('"') && cs.Last() == wxT('"') )
-            {
-                cs = wxString(cs.c_str(), cs.length() - 1);
-            }
-        }
-
-        for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); ++i )
-        {
-            for ( const wxChar* const* encName = gs_encodingNames[i]; *encName; ++encName )
-            {
-                if ( cs.CmpNoCase(*encName) == 0 )
-                    return gs_encodings[i];
-            }
-        }
-
-        cs.MakeUpper();
-
-        if ( cs.Left(3) == wxT("ISO") )
-        {
-            // the dash is optional (or, to be exact, it is not, but
-            // several broken programs "forget" it)
-            const wxChar *p = cs.c_str() + 3;
-            if ( *p == wxT('-') )
-                p++;
-
-            unsigned int value;
-            if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
-            {
-                // make it 0 based and check that it is strictly positive in
-                // the process (no such thing as iso8859-0 encoding)
-                if ( (value-- > 0) &&
-                     (value < wxFONTENCODING_ISO8859_MAX -
-                              wxFONTENCODING_ISO8859_1) )
-                {
-                    // it's a valid ISO8859 encoding
-                    value += wxFONTENCODING_ISO8859_1;
-                    encoding = (wxFontEncoding)value;
-                }
-            }
-        }
-        else if ( cs.Left(4) == wxT("8859") )
-        {
-            const wxChar *p = cs.c_str();
-
-            unsigned int value;
-            if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
-            {
-                // make it 0 based and check that it is strictly positive in
-                // the process (no such thing as iso8859-0 encoding)
-                if ( (value-- > 0) &&
-                     (value < wxFONTENCODING_ISO8859_MAX -
-                              wxFONTENCODING_ISO8859_1) )
-                {
-                    // it's a valid ISO8859 encoding
-                    value += wxFONTENCODING_ISO8859_1;
-                    encoding = (wxFontEncoding)value;
-                }
-            }
-        }
-        else // check for Windows charsets
-        {
-            size_t len;
-            if ( cs.Left(7) == wxT("WINDOWS") )
-            {
-                len = 7;
-            }
-            else if ( cs.Left(2) == wxT("CP") )
-            {
-                len = 2;
-            }
-            else // not a Windows encoding
-            {
-                len = 0;
-            }
-
-            if ( len )
-            {
-                const wxChar *p = cs.c_str() + len;
-                if ( *p == wxT('-') )
-                    p++;
-
-                unsigned int value;
-                if ( wxSscanf(p, wxT("%u"), &value) == 1 )
-                {
-                    if ( value >= 1250 )
-                    {
-                        value -= 1250;
-                        if ( value < wxFONTENCODING_CP12_MAX -
-                                     wxFONTENCODING_CP1250 )
-                        {
-                            // a valid Windows code page
-                            value += wxFONTENCODING_CP1250;
-                            encoding = (wxFontEncoding)value;
-                        }
-                    }
-
-                    switch ( value )
-                    {
-                        case 866:
-                            encoding = wxFONTENCODING_CP866;
-                            break;
-
-                        case 874:
-                            encoding = wxFONTENCODING_CP874;
-                            break;
-
-                        case 932:
-                            encoding = wxFONTENCODING_CP932;
-                            break;
-
-                        case 936:
-                            encoding = wxFONTENCODING_CP936;
-                            break;
-
-                        case 949:
-                            encoding = wxFONTENCODING_CP949;
-                            break;
-
-                        case 950:
-                            encoding = wxFONTENCODING_CP950;
-                            break;
-
-                        case 1258:
-                            encoding = wxFONTENCODING_CP1258;
-                            break;
-
-                        case 1361:
-                            encoding = wxFONTENCODING_CP1361;
-                            break;
-                    }
-                }
-            }
-        }
-        //else: unknown
-    }
-
-    return encoding;
-}
-
-/* static */
-size_t wxFontMapperBase::GetSupportedEncodingsCount()
-{
-    return WXSIZEOF(gs_encodings);
-}
-
-/* static */
-wxFontEncoding wxFontMapperBase::GetEncoding(size_t n)
-{
-    wxCHECK_MSG( n < WXSIZEOF(gs_encodings), wxFONTENCODING_SYSTEM,
-                    wxT("wxFontMapper::GetEncoding(): invalid index") );
-
-    return gs_encodings[n];
-}
-
-/* static */
-wxString wxFontMapperBase::GetEncodingDescription(wxFontEncoding encoding)
-{
-    if ( encoding == wxFONTENCODING_DEFAULT )
-    {
-        return _("Default encoding");
-    }
-
-    const size_t count = WXSIZEOF(gs_encodingDescs);
-
-    for ( size_t i = 0; i < count; i++ )
-    {
-        if ( gs_encodings[i] == encoding )
-        {
-            return wxGetTranslation(gs_encodingDescs[i]);
-        }
-    }
-
-    wxString str;
-    str.Printf(_("Unknown encoding (%d)"), encoding);
-
-    return str;
-}
-
-/* static */
-wxString wxFontMapperBase::GetEncodingName(wxFontEncoding encoding)
-{
-    if ( encoding == wxFONTENCODING_DEFAULT )
-    {
-        return _("default");
-    }
-
-    const size_t count = WXSIZEOF(gs_encodingNames);
-
-    for ( size_t i = 0; i < count; i++ )
-    {
-        if ( gs_encodings[i] == encoding )
-        {
-            return gs_encodingNames[i][0];
-        }
-    }
-
-    wxString str;
-    str.Printf(_("unknown-%d"), encoding);
-
-    return str;
-}
-
-/* static */
-const wxChar** wxFontMapperBase::GetAllEncodingNames(wxFontEncoding encoding)
-{
-    static const wxChar* const dummy[] = { NULL };
-
-    for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); i++ )
-    {
-        if ( gs_encodings[i] == encoding )
-        {
-            return const_cast<const wxChar**>(gs_encodingNames[i]);
-        }
-    }
-
-    return const_cast<const wxChar**>(dummy);
-}
-
-/* static */
-wxFontEncoding wxFontMapperBase::GetEncodingFromName(const wxString& name)
-{
-    const size_t count = WXSIZEOF(gs_encodingNames);
-
-    for ( size_t i = 0; i < count; i++ )
-    {
-        for ( const wxChar* const* encName = gs_encodingNames[i]; *encName; ++encName )
-        {
-            if ( name.CmpNoCase(*encName) == 0 )
-                return gs_encodings[i];
-        }
-    }
-
-    return wxFONTENCODING_MAX;
-}
-
-#endif // wxUSE_FONTMAP
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fmapbase.cpp
+// Purpose:     wxFontMapperBase class implementation
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     21.06.2003 (extracted from common/fontmap.cpp)
+// RCS-ID:      $Id: fmapbase.cpp 43063 2006-11-04 20:48:04Z VZ $
+// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
+// License:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FONTMAP
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/module.h"
+#endif //WX_PRECOMP
+
+#if defined(__WXMSW__)
+    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+    #include  "wx/msw/winundef.h"
+#endif
+
+#include "wx/fontmap.h"
+#include "wx/fmappriv.h"
+
+#include "wx/apptrait.h"
+
+// wxMemoryConfig uses wxFileConfig
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+    #include "wx/config.h"
+    #include "wx/memconf.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// encodings supported by GetEncodingDescription
+static wxFontEncoding gs_encodings[] =
+{
+    wxFONTENCODING_ISO8859_1,
+    wxFONTENCODING_ISO8859_2,
+    wxFONTENCODING_ISO8859_3,
+    wxFONTENCODING_ISO8859_4,
+    wxFONTENCODING_ISO8859_5,
+    wxFONTENCODING_ISO8859_6,
+    wxFONTENCODING_ISO8859_7,
+    wxFONTENCODING_ISO8859_8,
+    wxFONTENCODING_ISO8859_9,
+    wxFONTENCODING_ISO8859_10,
+    wxFONTENCODING_ISO8859_11,
+    wxFONTENCODING_ISO8859_12,
+    wxFONTENCODING_ISO8859_13,
+    wxFONTENCODING_ISO8859_14,
+    wxFONTENCODING_ISO8859_15,
+    wxFONTENCODING_KOI8,
+    wxFONTENCODING_KOI8_U,
+    wxFONTENCODING_CP874,
+    wxFONTENCODING_CP932,
+    wxFONTENCODING_CP936,
+    wxFONTENCODING_CP949,
+    wxFONTENCODING_CP950,
+    wxFONTENCODING_CP1250,
+    wxFONTENCODING_CP1251,
+    wxFONTENCODING_CP1252,
+    wxFONTENCODING_CP1253,
+    wxFONTENCODING_CP1254,
+    wxFONTENCODING_CP1255,
+    wxFONTENCODING_CP1256,
+    wxFONTENCODING_CP1257,
+    wxFONTENCODING_CP437,
+    wxFONTENCODING_UTF7,
+    wxFONTENCODING_UTF8,
+    wxFONTENCODING_UTF16BE,
+    wxFONTENCODING_UTF16LE,
+    wxFONTENCODING_UTF32BE,
+    wxFONTENCODING_UTF32LE,
+    wxFONTENCODING_EUC_JP,
+    wxFONTENCODING_DEFAULT,
+    wxFONTENCODING_BIG5,
+    wxFONTENCODING_SHIFT_JIS,
+    wxFONTENCODING_GB2312,
+};
+
+// the descriptions for them
+static const wxChar* gs_encodingDescs[] =
+{
+    wxTRANSLATE( "Western European (ISO-8859-1)" ),
+    wxTRANSLATE( "Central European (ISO-8859-2)" ),
+    wxTRANSLATE( "Esperanto (ISO-8859-3)" ),
+    wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ),
+    wxTRANSLATE( "Cyrillic (ISO-8859-5)" ),
+    wxTRANSLATE( "Arabic (ISO-8859-6)" ),
+    wxTRANSLATE( "Greek (ISO-8859-7)" ),
+    wxTRANSLATE( "Hebrew (ISO-8859-8)" ),
+    wxTRANSLATE( "Turkish (ISO-8859-9)" ),
+    wxTRANSLATE( "Nordic (ISO-8859-10)" ),
+    wxTRANSLATE( "Thai (ISO-8859-11)" ),
+    wxTRANSLATE( "Indian (ISO-8859-12)" ),
+    wxTRANSLATE( "Baltic (ISO-8859-13)" ),
+    wxTRANSLATE( "Celtic (ISO-8859-14)" ),
+    wxTRANSLATE( "Western European with Euro (ISO-8859-15)" ),
+    wxTRANSLATE( "KOI8-R" ),
+    wxTRANSLATE( "KOI8-U" ),
+    wxTRANSLATE( "Windows Thai (CP 874)" ),
+    wxTRANSLATE( "Windows Japanese (CP 932)" ),
+    wxTRANSLATE( "Windows Chinese Simplified (CP 936)" ),
+    wxTRANSLATE( "Windows Korean (CP 949)" ),
+    wxTRANSLATE( "Windows Chinese Traditional (CP 950)" ),
+    wxTRANSLATE( "Windows Central European (CP 1250)" ),
+    wxTRANSLATE( "Windows Cyrillic (CP 1251)" ),
+    wxTRANSLATE( "Windows Western European (CP 1252)" ),
+    wxTRANSLATE( "Windows Greek (CP 1253)" ),
+    wxTRANSLATE( "Windows Turkish (CP 1254)" ),
+    wxTRANSLATE( "Windows Hebrew (CP 1255)" ),
+    wxTRANSLATE( "Windows Arabic (CP 1256)" ),
+    wxTRANSLATE( "Windows Baltic (CP 1257)" ),
+    wxTRANSLATE( "Windows/DOS OEM (CP 437)" ),
+    wxTRANSLATE( "Unicode 7 bit (UTF-7)" ),
+    wxTRANSLATE( "Unicode 8 bit (UTF-8)" ),
+#ifdef WORDS_BIGENDIAN
+    wxTRANSLATE( "Unicode 16 bit (UTF-16)" ),
+    wxTRANSLATE( "Unicode 16 bit Little Endian (UTF-16LE)" ),
+    wxTRANSLATE( "Unicode 32 bit (UTF-32)" ),
+    wxTRANSLATE( "Unicode 32 bit Little Endian (UTF-32LE)" ),
+#else // WORDS_BIGENDIAN
+    wxTRANSLATE( "Unicode 16 bit Big Endian (UTF-16BE)" ),
+    wxTRANSLATE( "Unicode 16 bit (UTF-16)" ),
+    wxTRANSLATE( "Unicode 32 bit Big Endian (UTF-32BE)" ),
+    wxTRANSLATE( "Unicode 32 bit (UTF-32)" ),
+#endif // WORDS_BIGENDIAN
+    wxTRANSLATE( "Extended Unix Codepage for Japanese (EUC-JP)" ),
+    wxTRANSLATE( "US-ASCII" ),
+    wxTRANSLATE( "BIG5" ),
+    wxTRANSLATE( "SHIFT-JIS" ),
+    wxTRANSLATE( "GB-2312" ),
+};
+
+// and the internal names (these are not translated on purpose!)
+static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] =
+{
+    // names from the columns correspond to these OS:
+    //      Linux        Solaris and IRIX       HP-UX             AIX
+    { _T("ISO-8859-1"),  _T("ISO8859-1"),  _T("iso88591"),  _T("8859-1"), wxT("iso_8859_1"), NULL },
+    { _T("ISO-8859-2"),  _T("ISO8859-2"),  _T("iso88592"),  _T("8859-2"), NULL },
+    { _T("ISO-8859-3"),  _T("ISO8859-3"),  _T("iso88593"),  _T("8859-3"), NULL },
+    { _T("ISO-8859-4"),  _T("ISO8859-4"),  _T("iso88594"),  _T("8859-4"), NULL },
+    { _T("ISO-8859-5"),  _T("ISO8859-5"),  _T("iso88595"),  _T("8859-5"), NULL },
+    { _T("ISO-8859-6"),  _T("ISO8859-6"),  _T("iso88596"),  _T("8859-6"), NULL },
+    { _T("ISO-8859-7"),  _T("ISO8859-7"),  _T("iso88597"),  _T("8859-7"), NULL },
+    { _T("ISO-8859-8"),  _T("ISO8859-8"),  _T("iso88598"),  _T("8859-8"), NULL },
+    { _T("ISO-8859-9"),  _T("ISO8859-9"),  _T("iso88599"),  _T("8859-9"), NULL },
+    { _T("ISO-8859-10"), _T("ISO8859-10"), _T("iso885910"), _T("8859-10"), NULL },
+    { _T("ISO-8859-11"), _T("ISO8859-11"), _T("iso885911"), _T("8859-11"), NULL },
+    { _T("ISO-8859-12"), _T("ISO8859-12"), _T("iso885912"), _T("8859-12"), NULL },
+    { _T("ISO-8859-13"), _T("ISO8859-13"), _T("iso885913"), _T("8859-13"), NULL },
+    { _T("ISO-8859-14"), _T("ISO8859-14"), _T("iso885914"), _T("8859-14"), NULL },
+    { _T("ISO-8859-15"), _T("ISO8859-15"), _T("iso885915"), _T("8859-15"), NULL },
+
+    // although koi8-ru is not strictly speaking the same as koi8-r,
+    // they are similar enough to make mapping it to koi8 better than
+    // not recognizing it at all
+    { wxT( "KOI8-R" ), wxT( "KOI8-RU" ), NULL },
+    { wxT( "KOI8-U" ), NULL },
+
+    { wxT( "WINDOWS-874" ), wxT( "CP-874" ), NULL },
+    { wxT( "WINDOWS-932" ), wxT( "CP-932" ), NULL },
+    { wxT( "WINDOWS-936" ), wxT( "CP-936" ), NULL },
+    { wxT( "WINDOWS-949" ), wxT( "CP-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL },
+    { wxT( "WINDOWS-950" ), wxT( "CP-950" ), NULL },
+    { wxT( "WINDOWS-1250" ),wxT( "CP-1250" ), NULL },
+    { wxT( "WINDOWS-1251" ),wxT( "CP-1251" ), NULL },
+    { wxT( "WINDOWS-1252" ),wxT( "CP-1252" ), wxT("IBM-1252"), NULL },
+    { wxT( "WINDOWS-1253" ),wxT( "CP-1253" ), NULL },
+    { wxT( "WINDOWS-1254" ),wxT( "CP-1254" ), NULL },
+    { wxT( "WINDOWS-1255" ),wxT( "CP-1255" ), NULL },
+    { wxT( "WINDOWS-1256" ),wxT( "CP-1256" ), NULL },
+    { wxT( "WINDOWS-1257" ),wxT( "CP-1257" ), NULL },
+    { wxT( "WINDOWS-437" ), wxT( "CP-437" ), NULL },
+
+    { wxT( "UTF-7" ), wxT("utf7"), NULL },
+    { wxT( "UTF-8" ), wxT("utf8"), NULL },
+#ifdef WORDS_BIGENDIAN
+    { wxT( "UTF-16BE" ), wxT("UCS-2BE"), wxT( "UTF-16" ), wxT("UCS-2"), wxT("UCS2"), NULL },
+    { wxT( "UTF-16LE" ), wxT("UCS-2LE"), NULL },
+    { wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), wxT( "UTF-32" ), wxT( "UCS-4" ), wxT("UCS4"), NULL },
+    { wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), NULL },
+#else // WORDS_BIGENDIAN
+    { wxT( "UTF-16BE" ), wxT("UCS-2BE"), NULL },
+    { wxT( "UTF-16LE" ), wxT("UCS-2LE"), wxT( "UTF-16" ), wxT("UCS-2"), wxT("UCS2"), NULL },
+    { wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), NULL },
+    { wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), wxT( "UTF-32" ), wxT( "UCS-4" ), wxT("UCS4"), NULL },
+#endif // WORDS_BIGENDIAN
+
+    { wxT( "EUC-JP" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL },
+
+    // 646 is for Solaris, roman8 -- for HP-UX
+    { wxT( "US-ASCII" ), wxT( "ASCII" ), wxT("C"), wxT("POSIX"), wxT("ANSI_X3.4-1968"),
+      wxT("646"), wxT("roman8"), wxT( "" ), NULL },
+
+    { wxT( "BIG5" ), wxT("big5"), NULL },
+    { wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL },
+    { wxT( "GB2312" ), NULL },
+};
+
+wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );
+wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingNames) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// clean up the font mapper object
+class wxFontMapperModule : public wxModule
+{
+public:
+    wxFontMapperModule() : wxModule() { }
+
+    virtual bool OnInit()
+    {
+        // a dummy wxFontMapperBase object could have been created during the
+        // program startup before wxApp was created, we have to delete it to
+        // allow creating the real font mapper next time it is needed now that
+        // we can create it (when the modules are initialized, wxApp object
+        // already exists)
+        wxFontMapperBase *fm = wxFontMapperBase::Get();
+        if ( fm && fm->IsDummy() )
+            wxFontMapperBase::Reset();
+
+        return true;
+    }
+
+    virtual void OnExit()
+    {
+        wxFontMapperBase::Reset();
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxFontMapperModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxFontMapperModule, wxModule)
+
+
+// ============================================================================
+// wxFontMapperBase implementation
+// ============================================================================
+
+wxFontMapper *wxFontMapperBase::sm_instance = NULL;
+
+// ----------------------------------------------------------------------------
+// ctor and dtor
+// ----------------------------------------------------------------------------
+
+wxFontMapperBase::wxFontMapperBase()
+{
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+    m_configDummy = NULL;
+#endif // wxUSE_CONFIG
+}
+
+wxFontMapperBase::~wxFontMapperBase()
+{
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+    if ( m_configDummy )
+        delete m_configDummy;
+#endif // wxUSE_CONFIG
+}
+
+/* static */
+wxFontMapperBase *wxFontMapperBase::Get()
+{
+    if ( !sm_instance )
+    {
+        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+        if ( traits )
+        {
+            sm_instance = traits->CreateFontMapper();
+
+            wxASSERT_MSG( sm_instance,
+                            _T("wxAppTraits::CreateFontMapper() failed") );
+        }
+
+        if ( !sm_instance )
+        {
+            // last resort: we must create something because the existing code
+            // relies on always having a valid font mapper object
+            sm_instance = (wxFontMapper *)new wxFontMapperBase;
+        }
+    }
+
+    return (wxFontMapperBase*)sm_instance;
+}
+
+/* static */
+wxFontMapper *wxFontMapperBase::Set(wxFontMapper *mapper)
+{
+    wxFontMapper *old = sm_instance;
+    sm_instance = mapper;
+    return old;
+}
+
+/* static */
+void wxFontMapperBase::Reset()
+{
+    if ( sm_instance )
+    {
+        // we need a cast as wxFontMapper is not fully declared here and so the
+        // compiler can't know that it derives from wxFontMapperBase (but
+        // run-time behaviour will be correct because the dtor is virtual)
+        delete (wxFontMapperBase *)sm_instance;
+        sm_instance = NULL;
+    }
+}
+
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+
+// ----------------------------------------------------------------------------
+// config usage customisation
+// ----------------------------------------------------------------------------
+
+/* static */
+const wxChar *wxFontMapperBase::GetDefaultConfigPath()
+{
+    return FONTMAPPER_ROOT_PATH;
+}
+
+void wxFontMapperBase::SetConfigPath(const wxString& prefix)
+{
+    wxCHECK_RET( !prefix.empty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
+                 wxT("an absolute path should be given to wxFontMapper::SetConfigPath()") );
+
+    m_configRootPath = prefix;
+}
+
+// ----------------------------------------------------------------------------
+// get config object and path for it
+// ----------------------------------------------------------------------------
+
+wxConfigBase *wxFontMapperBase::GetConfig()
+{
+    wxConfigBase *config = wxConfig::Get(false);
+
+    // If there is no global configuration, use an internal memory configuration
+    if ( !config )
+    {
+        if ( !m_configDummy )
+            m_configDummy = new wxMemoryConfig;
+        config = m_configDummy;
+
+        // FIXME: ideally, we should add keys from dummy config to a real one later,
+        //        but it is a low-priority task because typical wxWin application
+        //        either doesn't use wxConfig at all or creates wxConfig object in
+        //        wxApp::OnInit(), before any real interaction with the user takes
+        //        place...
+    }
+
+    return config;
+}
+
+const wxString& wxFontMapperBase::GetConfigPath()
+{
+    if ( !m_configRootPath )
+    {
+        // use the default
+        m_configRootPath = GetDefaultConfigPath();
+    }
+
+    return m_configRootPath;
+}
+
+// ----------------------------------------------------------------------------
+// config helpers
+// ----------------------------------------------------------------------------
+
+bool wxFontMapperBase::ChangePath(const wxString& pathNew, wxString *pathOld)
+{
+    wxConfigBase *config = GetConfig();
+    if ( !config )
+        return false;
+
+    *pathOld = config->GetPath();
+
+    wxString path = GetConfigPath();
+    if ( path.empty() || path.Last() != wxCONFIG_PATH_SEPARATOR )
+    {
+        path += wxCONFIG_PATH_SEPARATOR;
+    }
+
+    wxASSERT_MSG( !pathNew || (pathNew[0] != wxCONFIG_PATH_SEPARATOR),
+                  wxT("should be a relative path") );
+
+    path += pathNew;
+
+    config->SetPath(path);
+
+    return true;
+}
+
+void wxFontMapperBase::RestorePath(const wxString& pathOld)
+{
+    GetConfig()->SetPath(pathOld);
+}
+
+#endif
+
+// ----------------------------------------------------------------------------
+// charset/encoding correspondence
+// ----------------------------------------------------------------------------
+
+wxFontEncoding
+wxFontMapperBase::CharsetToEncoding(const wxString& charset,
+                                    bool WXUNUSED(interactive))
+{
+    int enc = NonInteractiveCharsetToEncoding(charset);
+    if ( enc == wxFONTENCODING_UNKNOWN )
+    {
+        // we should return wxFONTENCODING_SYSTEM from here for unknown
+        // encodings
+        enc = wxFONTENCODING_SYSTEM;
+    }
+
+    return (wxFontEncoding)enc;
+}
+
+int
+wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset)
+{
+    wxFontEncoding encoding = wxFONTENCODING_SYSTEM;
+
+    // we're going to modify it, make a copy
+    wxString cs = charset;
+
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+    // first try the user-defined settings
+    wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH);
+    if ( path.IsOk() )
+    {
+        wxConfigBase *config = GetConfig();
+
+        // do we have an encoding for this charset?
+        long value = config->Read(charset, -1l);
+        if ( value != -1 )
+        {
+            if ( value == wxFONTENCODING_UNKNOWN )
+            {
+                // don't try to find it, in particular don't ask the user
+                return value;
+            }
+
+            if ( value >= 0 && value <= wxFONTENCODING_MAX )
+            {
+                encoding = (wxFontEncoding)value;
+            }
+            else
+            {
+                wxLogDebug(wxT("corrupted config data: invalid encoding %ld for charset '%s' ignored"),
+                           value, charset.c_str());
+            }
+        }
+
+        if ( encoding == wxFONTENCODING_SYSTEM )
+        {
+            // may be we have an alias?
+            config->SetPath(FONTMAPPER_CHARSET_ALIAS_PATH);
+
+            wxString alias = config->Read(charset);
+            if ( !alias.empty() )
+            {
+                // yes, we do - use it instead
+                cs = alias;
+            }
+        }
+    }
+#endif // wxUSE_CONFIG
+
+    // if didn't find it there, try to recognize it ourselves
+    if ( encoding == wxFONTENCODING_SYSTEM )
+    {
+        // trim any spaces
+        cs.Trim(true);
+        cs.Trim(false);
+
+        // discard the optional quotes
+        if ( !cs.empty() )
+        {
+            if ( cs[0u] == _T('"') && cs.Last() == _T('"') )
+            {
+                cs = wxString(cs.c_str(), cs.length() - 1);
+            }
+        }
+
+        for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); ++i )
+        {
+            for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
+            {
+                if ( cs.CmpNoCase(*encName) == 0 )
+                    return gs_encodings[i];
+            }
+        }
+
+        cs.MakeUpper();
+
+        if ( cs.Left(3) == wxT("ISO") )
+        {
+            // the dash is optional (or, to be exact, it is not, but
+            // several brokenmails "forget" it)
+            const wxChar *p = cs.c_str() + 3;
+            if ( *p == wxT('-') )
+                p++;
+
+            // printf( "iso %s\n", (const char*) cs.ToAscii() );
+
+            unsigned int value;
+            if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
+            {
+                // printf( "value %d\n", (int)value );
+
+                // make it 0 based and check that it is strictly positive in
+                // the process (no such thing as iso8859-0 encoding)
+                if ( (value-- > 0) &&
+                     (value < wxFONTENCODING_ISO8859_MAX -
+                              wxFONTENCODING_ISO8859_1) )
+                {
+                    // it's a valid ISO8859 encoding
+                    value += wxFONTENCODING_ISO8859_1;
+                    encoding = (wxFontEncoding)value;
+                }
+            }
+        }
+        else if ( cs.Left(4) == wxT("8859") )
+        {
+            const wxChar *p = cs.c_str();
+
+            unsigned int value;
+            if ( wxSscanf(p, wxT("8859-%u"), &value) == 1 )
+            {
+                // printf( "value %d\n", (int)value );
+
+                // make it 0 based and check that it is strictly positive in
+                // the process (no such thing as iso8859-0 encoding)
+                if ( (value-- > 0) &&
+                     (value < wxFONTENCODING_ISO8859_MAX -
+                              wxFONTENCODING_ISO8859_1) )
+                {
+                    // it's a valid ISO8859 encoding
+                    value += wxFONTENCODING_ISO8859_1;
+                    encoding = (wxFontEncoding)value;
+                }
+            }
+        }
+        else // check for Windows charsets
+        {
+            size_t len;
+            if ( cs.Left(7) == wxT("WINDOWS") )
+            {
+                len = 7;
+            }
+            else if ( cs.Left(2) == wxT("CP") )
+            {
+                len = 2;
+            }
+            else // not a Windows encoding
+            {
+                len = 0;
+            }
+
+            if ( len )
+            {
+                const wxChar *p = cs.c_str() + len;
+                if ( *p == wxT('-') )
+                    p++;
+
+                unsigned int value;
+                if ( wxSscanf(p, wxT("%u"), &value) == 1 )
+                {
+                    if ( value >= 1250 )
+                    {
+                        value -= 1250;
+                        if ( value < wxFONTENCODING_CP12_MAX -
+                                     wxFONTENCODING_CP1250 )
+                        {
+                            // a valid Windows code page
+                            value += wxFONTENCODING_CP1250;
+                            encoding = (wxFontEncoding)value;
+                        }
+                    }
+
+                    switch ( value )
+                    {
+                        case 866:
+                            encoding = wxFONTENCODING_CP866;
+                            break;
+
+                        case 874:
+                            encoding = wxFONTENCODING_CP874;
+                            break;
+
+                        case 932:
+                            encoding = wxFONTENCODING_CP932;
+                            break;
+
+                        case 936:
+                            encoding = wxFONTENCODING_CP936;
+                            break;
+
+                        case 949:
+                            encoding = wxFONTENCODING_CP949;
+                            break;
+
+                        case 950:
+                            encoding = wxFONTENCODING_CP950;
+                            break;
+                    }
+                }
+            }
+        }
+        //else: unknown
+    }
+
+    return encoding;
+}
+
+/* static */
+size_t wxFontMapperBase::GetSupportedEncodingsCount()
+{
+    return WXSIZEOF(gs_encodings);
+}
+
+/* static */
+wxFontEncoding wxFontMapperBase::GetEncoding(size_t n)
+{
+    wxCHECK_MSG( n < WXSIZEOF(gs_encodings), wxFONTENCODING_SYSTEM,
+                    _T("wxFontMapper::GetEncoding(): invalid index") );
+
+    return gs_encodings[n];
+}
+
+/* static */
+wxString wxFontMapperBase::GetEncodingDescription(wxFontEncoding encoding)
+{
+    if ( encoding == wxFONTENCODING_DEFAULT )
+    {
+        return _("Default encoding");
+    }
+
+    const size_t count = WXSIZEOF(gs_encodingDescs);
+
+    for ( size_t i = 0; i < count; i++ )
+    {
+        if ( gs_encodings[i] == encoding )
+        {
+            return wxGetTranslation(gs_encodingDescs[i]);
+        }
+    }
+
+    wxString str;
+    str.Printf(_("Unknown encoding (%d)"), encoding);
+
+    return str;
+}
+
+/* static */
+wxString wxFontMapperBase::GetEncodingName(wxFontEncoding encoding)
+{
+    if ( encoding == wxFONTENCODING_DEFAULT )
+    {
+        return _("default");
+    }
+
+    const size_t count = WXSIZEOF(gs_encodingNames);
+
+    for ( size_t i = 0; i < count; i++ )
+    {
+        if ( gs_encodings[i] == encoding )
+        {
+            return gs_encodingNames[i][0];
+        }
+    }
+
+    wxString str;
+    str.Printf(_("unknown-%d"), encoding);
+
+    return str;
+}
+
+/* static */
+const wxChar** wxFontMapperBase::GetAllEncodingNames(wxFontEncoding encoding)
+{
+    static const wxChar* dummy[] = { NULL };
+
+    for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); i++ )
+    {
+        if ( gs_encodings[i] == encoding )
+        {
+            return gs_encodingNames[i];
+        }
+    }
+
+    return dummy;
+}
+
+/* static */
+wxFontEncoding wxFontMapperBase::GetEncodingFromName(const wxString& name)
+{
+    const size_t count = WXSIZEOF(gs_encodingNames);
+
+    for ( size_t i = 0; i < count; i++ )
+    {
+        for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
+        {
+            if ( name.CmpNoCase(*encName) == 0 )
+                return gs_encodings[i];
+        }
+    }
+
+    return wxFONTENCODING_MAX;
+}
+
+#endif // wxUSE_FONTMAP
diff --git a/Source/3rd Party/wx/src/common/fontcmn.cpp b/Source/3rd Party/wx/src/common/fontcmn.cpp
index 930c2aaf5..f88b54dcb 100644
--- a/Source/3rd Party/wx/src/common/fontcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/fontcmn.cpp	
@@ -1,1123 +1,784 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fontcmn.cpp
-// Purpose:     implementation of wxFontBase methods
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     20.09.99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/font.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dc.h"
-    #include "wx/intl.h"
-    #include "wx/math.h"
-    #include "wx/dcscreen.h"
-    #include "wx/log.h"
-    #include "wx/gdicmn.h"
-#endif // WX_PRECOMP
-
-#if defined(__WXMSW__)
-    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
-    #include  "wx/msw/winundef.h"
-#endif
-
-#include "wx/fontutil.h" // for wxNativeFontInfo
-#include "wx/fontmap.h"
-#include "wx/fontenum.h"
-
-#include "wx/tokenzr.h"
-
-// debugger helper: this function can be called from a debugger to show what
-// the date really is
-extern const char *wxDumpFont(const wxFont *font)
-{
-    static char buf[256];
-
-    const wxFontWeight weight = font->GetWeight();
-
-    wxString s;
-    s.Printf(wxS("%s-%s-%s-%d-%d"),
-             font->GetFaceName(),
-             weight == wxFONTWEIGHT_NORMAL
-                ? wxT("normal")
-                : weight == wxFONTWEIGHT_BOLD
-                    ? wxT("bold")
-                    : wxT("light"),
-             font->GetStyle() == wxFONTSTYLE_NORMAL
-                ? wxT("regular")
-                : wxT("italic"),
-             font->GetPointSize(),
-             font->GetEncoding());
-
-    wxStrlcpy(buf, s.mb_str(), WXSIZEOF(buf));
-    return buf;
-}
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxBEGIN_ENUM( wxFontFamily )
-wxENUM_MEMBER( wxFONTFAMILY_DEFAULT )
-wxENUM_MEMBER( wxFONTFAMILY_DECORATIVE )
-wxENUM_MEMBER( wxFONTFAMILY_ROMAN )
-wxENUM_MEMBER( wxFONTFAMILY_SCRIPT )
-wxENUM_MEMBER( wxFONTFAMILY_SWISS )
-wxENUM_MEMBER( wxFONTFAMILY_MODERN )
-wxENUM_MEMBER( wxFONTFAMILY_TELETYPE )
-wxEND_ENUM( wxFontFamily )
-
-wxBEGIN_ENUM( wxFontStyle )
-wxENUM_MEMBER( wxFONTSTYLE_NORMAL )
-wxENUM_MEMBER( wxFONTSTYLE_ITALIC )
-wxENUM_MEMBER( wxFONTSTYLE_SLANT )
-wxEND_ENUM( wxFontStyle )
-
-wxBEGIN_ENUM( wxFontWeight )
-wxENUM_MEMBER( wxFONTWEIGHT_NORMAL )
-wxENUM_MEMBER( wxFONTWEIGHT_LIGHT )
-wxENUM_MEMBER( wxFONTWEIGHT_BOLD )
-wxEND_ENUM( wxFontWeight )
-
-wxIMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject, "wx/font.h")
-
-//WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxFont>)
-
-wxBEGIN_PROPERTIES_TABLE(wxFont)
-wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Family, wxFontFamily , SetFamily, GetFamily, (wxFontFamily)wxDEFAULT, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group")) // wxFontFamily
-wxPROPERTY( Style, wxFontStyle, SetStyle, GetStyle, (wxFontStyle)wxNORMAL, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group")) // wxFontStyle
-wxPROPERTY( Weight, wxFontWeight, SetWeight, GetWeight, (wxFontWeight)wxNORMAL, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group")) // wxFontWeight
-wxPROPERTY( Underlined, bool, SetUnderlined, GetUnderlined, false, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Strikethrough, bool, SetStrikethrough, GetStrikethrough, false, 0, \
-                   wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Face, wxString, SetFaceName, GetFaceName, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Encoding, wxFontEncoding, SetEncoding, GetEncoding, \
-           wxFONTENCODING_DEFAULT, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxCONSTRUCTOR_6( wxFont, int, Size, wxFontFamily, Family, wxFontStyle, Style, wxFontWeight, Weight, \
-                bool, Underlined, wxString, Face )
-
-wxEMPTY_HANDLERS_TABLE(wxFont)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxFontBase
-// ----------------------------------------------------------------------------
-
-wxFontEncoding wxFontBase::ms_encodingDefault = wxFONTENCODING_SYSTEM;
-
-/* static */
-void wxFontBase::SetDefaultEncoding(wxFontEncoding encoding)
-{
-    // GetDefaultEncoding() should return something != wxFONTENCODING_DEFAULT
-    // and, besides, using this value here doesn't make any sense
-    wxCHECK_RET( encoding != wxFONTENCODING_DEFAULT,
-                 wxT("can't set default encoding to wxFONTENCODING_DEFAULT") );
-
-    ms_encodingDefault = encoding;
-}
-
-wxFontBase::~wxFontBase()
-{
-    // this destructor is required for Darwin
-}
-
-/* static */
-wxFont *wxFontBase::New(int size,
-                        wxFontFamily family,
-                        wxFontStyle style,
-                        wxFontWeight weight,
-                        bool underlined,
-                        const wxString& face,
-                        wxFontEncoding encoding)
-{
-    return new wxFont(size, family, style, weight, underlined, face, encoding);
-}
-
-/* static */
-wxFont *wxFontBase::New(const wxSize& pixelSize,
-                        wxFontFamily family,
-                        wxFontStyle style,
-                        wxFontWeight weight,
-                        bool underlined,
-                        const wxString& face,
-                        wxFontEncoding encoding)
-{
-    return new wxFont(pixelSize, family, style, weight, underlined,
-                      face, encoding);
-}
-
-/* static */
-wxFont *wxFontBase::New(int pointSize,
-                        wxFontFamily family,
-                        int flags,
-                        const wxString& face,
-                        wxFontEncoding encoding)
-{
-    return New(pointSize, family,
-               GetStyleFromFlags(flags),
-               GetWeightFromFlags(flags),
-               GetUnderlinedFromFlags(flags),
-               face, encoding);
-}
-
-/* static */
-wxFont *wxFontBase::New(const wxSize& pixelSize,
-                        wxFontFamily family,
-                        int flags,
-                        const wxString& face,
-                        wxFontEncoding encoding)
-{
-    return New(pixelSize, family,
-               GetStyleFromFlags(flags),
-               GetWeightFromFlags(flags),
-               GetUnderlinedFromFlags(flags),
-               face, encoding);
-}
-
-/* static */
-wxFont *wxFontBase::New(const wxNativeFontInfo& info)
-{
-    return new wxFont(info);
-}
-
-/* static */
-wxFont *wxFontBase::New(const wxString& strNativeFontDesc)
-{
-    wxNativeFontInfo fontInfo;
-    if ( !fontInfo.FromString(strNativeFontDesc) )
-        return new wxFont(*wxNORMAL_FONT);
-
-    return New(fontInfo);
-}
-
-bool wxFontBase::IsFixedWidth() const
-{
-    return GetFamily() == wxFONTFAMILY_TELETYPE;
-}
-
-wxSize wxFontBase::GetPixelSize() const
-{
-    wxScreenDC dc;
-    dc.SetFont(*(wxFont *)this);
-    return wxSize(dc.GetCharWidth(), dc.GetCharHeight());
-}
-
-bool wxFontBase::IsUsingSizeInPixels() const
-{
-    return false;
-}
-
-void wxFontBase::SetPixelSize( const wxSize& pixelSize )
-{
-    wxCHECK_RET( pixelSize.GetWidth() >= 0 && pixelSize.GetHeight() > 0,
-                 "Negative values for the pixel size or zero pixel height are not allowed" );
-
-    wxScreenDC dc;
-
-    // NOTE: this algorithm for adjusting the font size is used by all
-    //       implementations of wxFont except under wxMSW and wxGTK where
-    //       native support to font creation using pixel-size is provided.
-
-    int largestGood = 0;
-    int smallestBad = 0;
-
-    bool initialGoodFound = false;
-    bool initialBadFound = false;
-
-    // NB: this assignment was separated from the variable definition
-    // in order to fix a gcc v3.3.3 compiler crash
-    int currentSize = GetPointSize();
-    while (currentSize > 0)
-    {
-        dc.SetFont(*static_cast<wxFont*>(this));
-
-        // if currentSize (in points) results in a font that is smaller
-        // than required by pixelSize it is considered a good size
-        // NOTE: the pixel size width may be zero
-        if (dc.GetCharHeight() <= pixelSize.GetHeight() &&
-                (pixelSize.GetWidth() == 0 ||
-                 dc.GetCharWidth() <= pixelSize.GetWidth()))
-        {
-            largestGood = currentSize;
-            initialGoodFound = true;
-        }
-        else
-        {
-            smallestBad = currentSize;
-            initialBadFound = true;
-        }
-        if (!initialGoodFound)
-        {
-            currentSize /= 2;
-        }
-        else if (!initialBadFound)
-        {
-            currentSize *= 2;
-        }
-        else
-        {
-            int distance = smallestBad - largestGood;
-            if (distance == 1)
-                break;
-
-            currentSize = largestGood + distance / 2;
-        }
-
-        SetPointSize(currentSize);
-    }
-
-    if (currentSize != largestGood)
-        SetPointSize(largestGood);
-}
-
-void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info)
-{
-#ifdef wxNO_NATIVE_FONTINFO
-    SetPointSize(info.pointSize);
-    SetFamily(info.family);
-    SetStyle(info.style);
-    SetWeight(info.weight);
-    SetUnderlined(info.underlined);
-    SetStrikethrough(info.strikethrough);
-    SetFaceName(info.faceName);
-    SetEncoding(info.encoding);
-#else
-    (void)info;
-#endif
-}
-
-wxString wxFontBase::GetNativeFontInfoDesc() const
-{
-    wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
-
-    wxString fontDesc;
-    const wxNativeFontInfo *fontInfo = GetNativeFontInfo();
-    if ( fontInfo )
-    {
-        fontDesc = fontInfo->ToString();
-        wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!"));
-    }
-    else
-    {
-        wxFAIL_MSG(wxT("Derived class should have created the wxNativeFontInfo!"));
-    }
-
-    return fontDesc;
-}
-
-wxString wxFontBase::GetNativeFontInfoUserDesc() const
-{
-    wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
-
-    wxString fontDesc;
-    const wxNativeFontInfo *fontInfo = GetNativeFontInfo();
-    if ( fontInfo )
-    {
-        fontDesc = fontInfo->ToUserString();
-        wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!"));
-    }
-    else
-    {
-        wxFAIL_MSG(wxT("Derived class should have created the wxNativeFontInfo!"));
-    }
-
-    return fontDesc;
-}
-
-bool wxFontBase::SetNativeFontInfo(const wxString& info)
-{
-    wxNativeFontInfo fontInfo;
-    if ( !info.empty() && fontInfo.FromString(info) )
-    {
-        SetNativeFontInfo(fontInfo);
-        return true;
-    }
-
-    return false;
-}
-
-bool wxFontBase::SetNativeFontInfoUserDesc(const wxString& info)
-{
-    wxNativeFontInfo fontInfo;
-    if ( !info.empty() && fontInfo.FromUserString(info) )
-    {
-        SetNativeFontInfo(fontInfo);
-        return true;
-    }
-
-    return false;
-}
-
-bool wxFontBase::operator==(const wxFont& font) const
-{
-    // either it is the same font, i.e. they share the same common data or they
-    // have different ref datas but still describe the same font
-    return IsSameAs(font) ||
-           (
-            IsOk() == font.IsOk() &&
-            GetPointSize() == font.GetPointSize() &&
-            // in wxGTK1 GetPixelSize() calls GetInternalFont() which uses
-            // operator==() resulting in infinite recursion so we can't use it
-            // in that port
-#if !defined(__WXGTK__) || defined(__WXGTK20__)
-            GetPixelSize() == font.GetPixelSize() &&
-#endif
-            GetFamily() == font.GetFamily() &&
-            GetStyle() == font.GetStyle() &&
-            GetWeight() == font.GetWeight() &&
-            GetUnderlined() == font.GetUnderlined() &&
-            GetStrikethrough() == font.GetStrikethrough() &&
-            GetFaceName().IsSameAs(font.GetFaceName(), false) &&
-            GetEncoding() == font.GetEncoding()
-           );
-}
-
-wxFontFamily wxFontBase::GetFamily() const
-{
-    wxCHECK_MSG( IsOk(), wxFONTFAMILY_UNKNOWN, wxS("invalid font") );
-
-    // Don't return wxFONTFAMILY_UNKNOWN from here because it prevents the code
-    // like wxFont(size, wxNORMAL_FONT->GetFamily(), ...) from working (see
-    // #12330). This is really just a hack but it allows to keep compatibility
-    // and doesn't really have any bad drawbacks so do this until someone comes
-    // up with a better idea.
-    const wxFontFamily family = DoGetFamily();
-
-    return family == wxFONTFAMILY_UNKNOWN ? wxFONTFAMILY_DEFAULT : family;
-}
-
-wxString wxFontBase::GetFamilyString() const
-{
-    wxCHECK_MSG( IsOk(), "wxFONTFAMILY_DEFAULT", "invalid font" );
-
-    switch ( GetFamily() )
-    {
-        case wxFONTFAMILY_DECORATIVE:   return "wxFONTFAMILY_DECORATIVE";
-        case wxFONTFAMILY_ROMAN:        return "wxFONTFAMILY_ROMAN";
-        case wxFONTFAMILY_SCRIPT:       return "wxFONTFAMILY_SCRIPT";
-        case wxFONTFAMILY_SWISS:        return "wxFONTFAMILY_SWISS";
-        case wxFONTFAMILY_MODERN:       return "wxFONTFAMILY_MODERN";
-        case wxFONTFAMILY_TELETYPE:     return "wxFONTFAMILY_TELETYPE";
-        case wxFONTFAMILY_UNKNOWN:      return "wxFONTFAMILY_UNKNOWN";
-        default:                        return "wxFONTFAMILY_DEFAULT";
-    }
-}
-
-wxString wxFontBase::GetStyleString() const
-{
-    wxCHECK_MSG( IsOk(), "wxFONTSTYLE_DEFAULT", "invalid font" );
-
-    switch ( GetStyle() )
-    {
-        case wxFONTSTYLE_NORMAL:   return "wxFONTSTYLE_NORMAL";
-        case wxFONTSTYLE_SLANT:    return "wxFONTSTYLE_SLANT";
-        case wxFONTSTYLE_ITALIC:   return "wxFONTSTYLE_ITALIC";
-        default:                   return "wxFONTSTYLE_DEFAULT";
-    }
-}
-
-wxString wxFontBase::GetWeightString() const
-{
-    wxCHECK_MSG( IsOk(), "wxFONTWEIGHT_DEFAULT", "invalid font" );
-
-    switch ( GetWeight() )
-    {
-        case wxFONTWEIGHT_NORMAL:   return "wxFONTWEIGHT_NORMAL";
-        case wxFONTWEIGHT_BOLD:     return "wxFONTWEIGHT_BOLD";
-        case wxFONTWEIGHT_LIGHT:    return "wxFONTWEIGHT_LIGHT";
-        default:                    return "wxFONTWEIGHT_DEFAULT";
-    }
-}
-
-bool wxFontBase::SetFaceName(const wxString& facename)
-{
-#if wxUSE_FONTENUM
-    if (!wxFontEnumerator::IsValidFacename(facename))
-    {
-        UnRef();        // make IsOk() return false
-        return false;
-    }
-#else // !wxUSE_FONTENUM
-    wxUnusedVar(facename);
-#endif // wxUSE_FONTENUM/!wxUSE_FONTENUM
-
-    return true;
-}
-
-void wxFontBase::SetSymbolicSize(wxFontSymbolicSize size)
-{
-    SetSymbolicSizeRelativeTo(size, wxNORMAL_FONT->GetPointSize());
-}
-
-/* static */
-int wxFontBase::AdjustToSymbolicSize(wxFontSymbolicSize size, int base)
-{
-    // Using a fixed factor (1.2, from CSS2) is a bad idea as explained at
-    // http://www.w3.org/TR/CSS21/fonts.html#font-size-props so use the values
-    // from http://style.cleverchimp.com/font_size_intervals/altintervals.html
-    // instead.
-    static const float factors[] = { 0.60f, 0.75f, 0.89f, 1.f, 1.2f, 1.5f, 2.f };
-
-    wxCOMPILE_TIME_ASSERT
-    (
-        WXSIZEOF(factors) == wxFONTSIZE_XX_LARGE - wxFONTSIZE_XX_SMALL + 1,
-        WrongFontSizeFactorsSize
-    );
-
-    return wxRound(factors[size - wxFONTSIZE_XX_SMALL]*base);
-}
-
-wxFont& wxFont::MakeBold()
-{
-    SetWeight(wxFONTWEIGHT_BOLD);
-    return *this;
-}
-
-wxFont wxFont::Bold() const
-{
-    wxFont font(*this);
-    font.MakeBold();
-    return font;
-}
-
-wxFont& wxFont::MakeItalic()
-{
-    SetStyle(wxFONTSTYLE_ITALIC);
-    return *this;
-}
-
-wxFont wxFont::Italic() const
-{
-    wxFont font(*this);
-    font.MakeItalic();
-    return font;
-}
-
-wxFont& wxFont::MakeUnderlined()
-{
-    SetUnderlined(true);
-    return *this;
-}
-
-wxFont wxFont::Underlined() const
-{
-    wxFont font(*this);
-    font.MakeUnderlined();
-    return font;
-}
-
-wxFont wxFont::Strikethrough() const
-{
-    wxFont font(*this);
-    font.MakeStrikethrough();
-    return font;
-}
-
-wxFont& wxFont::MakeStrikethrough()
-{
-    SetStrikethrough(true);
-    return *this;
-}
-
-wxFont& wxFont::Scale(float x)
-{
-    SetPointSize(int(x*GetPointSize() + 0.5));
-    return *this;
-}
-
-wxFont wxFont::Scaled(float x) const
-{
-    wxFont font(*this);
-    font.Scale(x);
-    return font;
-}
-
-// ----------------------------------------------------------------------------
-// wxNativeFontInfo
-// ----------------------------------------------------------------------------
-
-// Up to now, there are no native implementations of this function:
-void wxNativeFontInfo::SetFaceName(const wxArrayString& facenames)
-{
-#if wxUSE_FONTENUM
-    for (size_t i=0; i < facenames.GetCount(); i++)
-    {
-        if (wxFontEnumerator::IsValidFacename(facenames[i]))
-        {
-            SetFaceName(facenames[i]);
-            return;
-        }
-    }
-
-    // set the first valid facename we can find on this system
-    wxString validfacename = wxFontEnumerator::GetFacenames().Item(0);
-    wxLogTrace(wxT("font"), wxT("Falling back to '%s'"), validfacename.c_str());
-    SetFaceName(validfacename);
-#else // !wxUSE_FONTENUM
-    SetFaceName(facenames[0]);
-#endif // wxUSE_FONTENUM/!wxUSE_FONTENUM
-}
-
-
-#ifdef wxNO_NATIVE_FONTINFO
-
-// These are the generic forms of FromString()/ToString.
-//
-// convert to/from the string representation: the general format is
-// "version;the rest..." with currently defined versions being:
-//
-//      0;pointsize;family;style;weight;underlined;facename;encoding
-//      1;pointsize;family;style;weight;underlined;strikethrough;facename;encoding
-
-bool wxNativeFontInfo::FromString(const wxString& s)
-{
-    long l;
-    unsigned long version;
-
-    wxStringTokenizer tokenizer(s, wxT(";"));
-
-    wxString token = tokenizer.GetNextToken();
-    if ( !token.ToULong(&version) || version > 1 )
-        return false;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return false;
-    pointSize = (int)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return false;
-    family = (wxFontFamily)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return false;
-    style = (wxFontStyle)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return false;
-    weight = (wxFontWeight)l;
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return false;
-    underlined = l != 0;
-
-    if ( version == 1 )
-    {
-        token = tokenizer.GetNextToken();
-        if ( !token.ToLong(&l) )
-            return false;
-        strikethrough = l != 0;
-    }
-
-    faceName = tokenizer.GetNextToken();
-
-#ifndef __WXMAC__
-    if( !faceName )
-        return false;
-#endif
-
-    token = tokenizer.GetNextToken();
-    if ( !token.ToLong(&l) )
-        return false;
-    encoding = (wxFontEncoding)l;
-
-    return true;
-}
-
-wxString wxNativeFontInfo::ToString() const
-{
-    wxString s;
-
-    s.Printf(wxT("%d;%d;%d;%d;%d;%d;%d;%s;%d"),
-             1,                                 // version
-             pointSize,
-             family,
-             (int)style,
-             (int)weight,
-             underlined,
-             strikethrough,
-             faceName.GetData(),
-             (int)encoding);
-
-    return s;
-}
-
-void wxNativeFontInfo::Init()
-{
-    pointSize = 0;
-    family = wxFONTFAMILY_DEFAULT;
-    style = wxFONTSTYLE_NORMAL;
-    weight = wxFONTWEIGHT_NORMAL;
-    underlined = false;
-    strikethrough = false;
-    faceName.clear();
-    encoding = wxFONTENCODING_DEFAULT;
-}
-
-int wxNativeFontInfo::GetPointSize() const
-{
-    return pointSize;
-}
-
-wxFontStyle wxNativeFontInfo::GetStyle() const
-{
-    return style;
-}
-
-wxFontWeight wxNativeFontInfo::GetWeight() const
-{
-    return weight;
-}
-
-bool wxNativeFontInfo::GetUnderlined() const
-{
-    return underlined;
-}
-
-bool wxNativeFontInfo::GetStrikethrough() const
-{
-    return strikethrough;
-}
-
-wxString wxNativeFontInfo::GetFaceName() const
-{
-    return faceName;
-}
-
-wxFontFamily wxNativeFontInfo::GetFamily() const
-{
-    return family;
-}
-
-wxFontEncoding wxNativeFontInfo::GetEncoding() const
-{
-    return encoding;
-}
-
-void wxNativeFontInfo::SetPointSize(int pointsize)
-{
-    pointSize = pointsize;
-}
-
-void wxNativeFontInfo::SetStyle(wxFontStyle style_)
-{
-    style = style_;
-}
-
-void wxNativeFontInfo::SetWeight(wxFontWeight weight_)
-{
-    weight = weight_;
-}
-
-void wxNativeFontInfo::SetUnderlined(bool underlined_)
-{
-    underlined = underlined_;
-}
-
-void wxNativeFontInfo::SetStrikethrough(bool strikethrough_)
-{
-    strikethrough = strikethrough_;
-}
-
-bool wxNativeFontInfo::SetFaceName(const wxString& facename_)
-{
-    faceName = facename_;
-    return true;
-}
-
-void wxNativeFontInfo::SetFamily(wxFontFamily family_)
-{
-    family = family_;
-}
-
-void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)
-{
-    encoding = encoding_;
-}
-
-#endif // generic wxNativeFontInfo implementation
-
-// conversion to/from user-readable string: this is used in the generic
-// versions and under MSW as well because there is no standard font description
-// format there anyhow (but there is a well-defined standard for X11 fonts used
-// by wxGTK and wxMotif)
-
-#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) || defined (__WXPM__) || defined(__WXOSX__)
-
-wxString wxNativeFontInfo::ToUserString() const
-{
-    wxString desc;
-
-    // first put the adjectives, if any - this is English-centric, of course,
-    // but what else can we do?
-    if ( GetUnderlined() )
-    {
-        desc << _("underlined");
-    }
-
-    if ( GetStrikethrough() )
-    {
-        desc << _("strikethrough");
-    }
-
-    switch ( GetWeight() )
-    {
-        default:
-            wxFAIL_MSG( wxT("unknown font weight") );
-            // fall through
-
-        case wxFONTWEIGHT_NORMAL:
-            break;
-
-        case wxFONTWEIGHT_LIGHT:
-            desc << _(" light");
-            break;
-
-        case wxFONTWEIGHT_BOLD:
-            desc << _(" bold");
-            break;
-    }
-
-    switch ( GetStyle() )
-    {
-        default:
-            wxFAIL_MSG( wxT("unknown font style") );
-            // fall through
-
-        case wxFONTSTYLE_NORMAL:
-            break;
-
-            // we don't distinguish between the two for now anyhow...
-        case wxFONTSTYLE_ITALIC:
-        case wxFONTSTYLE_SLANT:
-            desc << _(" italic");
-            break;
-    }
-
-    wxString face = GetFaceName();
-    if ( !face.empty() )
-    {
-        if (face.Contains(' ') || face.Contains(';') || face.Contains(','))
-        {
-            face.Replace("'", "");
-                // eventually remove quote characters: most systems do not
-                // allow them in a facename anyway so this usually does nothing
-
-            // make it possible for FromUserString() function to understand
-            // that the different words which compose this facename are
-            // not different adjectives or other data but rather all parts
-            // of the facename
-            desc << wxT(" '") << face << _("'");
-        }
-        else
-            desc << wxT(' ') << face;
-    }
-    else // no face name specified
-    {
-        // use the family
-        wxString familyStr;
-        switch ( GetFamily() )
-        {
-            case wxFONTFAMILY_DECORATIVE:
-                familyStr = "decorative";
-                break;
-
-            case wxFONTFAMILY_ROMAN:
-                familyStr = "roman";
-                break;
-
-            case wxFONTFAMILY_SCRIPT:
-                familyStr = "script";
-                break;
-
-            case wxFONTFAMILY_SWISS:
-                familyStr = "swiss";
-                break;
-
-            case wxFONTFAMILY_MODERN:
-                familyStr = "modern";
-                break;
-
-            case wxFONTFAMILY_TELETYPE:
-                familyStr = "teletype";
-                break;
-
-            case wxFONTFAMILY_DEFAULT:
-            case wxFONTFAMILY_UNKNOWN:
-                break;
-
-            default:
-                wxFAIL_MSG( "unknown font family" );
-        }
-
-        if ( !familyStr.empty() )
-            desc << " '" << familyStr << " family'";
-    }
-
-    int size = GetPointSize();
-    if ( size != wxNORMAL_FONT->GetPointSize() )
-    {
-        desc << wxT(' ') << size;
-    }
-
-#if wxUSE_FONTMAP
-    wxFontEncoding enc = GetEncoding();
-    if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
-    {
-        desc << wxT(' ') << wxFontMapper::GetEncodingName(enc);
-    }
-#endif // wxUSE_FONTMAP
-
-    return desc.Strip(wxString::both).MakeLower();
-}
-
-bool wxNativeFontInfo::FromUserString(const wxString& s)
-{
-    // reset to the default state
-    Init();
-
-    // ToUserString() will quote the facename if it contains spaces, commas
-    // or semicolons: we must be able to understand that quoted text is
-    // a single token:
-    wxString toparse(s);
-
-    // parse a more or less free form string
-    wxStringTokenizer tokenizer(toparse, wxT(";, "), wxTOKEN_STRTOK);
-
-    wxString face;
-    unsigned long size;
-    bool weightfound = false, pointsizefound = false;
-#if wxUSE_FONTMAP
-    bool encodingfound = false;
-#endif
-    bool insideQuotes = false;
-
-    while ( tokenizer.HasMoreTokens() )
-    {
-        wxString token = tokenizer.GetNextToken();
-
-        // normalize it
-        token.Trim(true).Trim(false).MakeLower();
-        if (insideQuotes)
-        {
-            if (token.StartsWith("'") ||
-                token.EndsWith("'"))
-            {
-                insideQuotes = false;
-
-                // add this last token to the facename:
-                face += " " + token;
-
-                // normalize facename:
-                face = face.Trim(true).Trim(false);
-                face.Replace("'", "");
-
-                continue;
-            }
-        }
-        else
-        {
-            if (token.StartsWith("'"))
-                insideQuotes = true;
-        }
-
-        // look for the known tokens
-        if ( insideQuotes )
-        {
-            // only the facename may be quoted:
-            face += " " + token;
-            continue;
-        }
-        if ( token == wxT("underlined") || token == _("underlined") )
-        {
-            SetUnderlined(true);
-        }
-        else if ( token == wxT("strikethrough") || token == _("strikethrough") )
-        {
-            SetStrikethrough(true);
-        }
-        else if ( token == wxT("light") || token == _("light") )
-        {
-            SetWeight(wxFONTWEIGHT_LIGHT);
-            weightfound = true;
-        }
-        else if ( token == wxT("bold") || token == _("bold") )
-        {
-            SetWeight(wxFONTWEIGHT_BOLD);
-            weightfound = true;
-        }
-        else if ( token == wxT("italic") || token == _("italic") )
-        {
-            SetStyle(wxFONTSTYLE_ITALIC);
-        }
-        else if ( token.ToULong(&size) )
-        {
-            SetPointSize(size);
-            pointsizefound = true;
-        }
-        else
-        {
-#if wxUSE_FONTMAP
-            // try to interpret this as an encoding
-            wxFontEncoding encoding = wxFontMapper::Get()->CharsetToEncoding(token, false);
-            if ( encoding != wxFONTENCODING_DEFAULT &&
-                 encoding != wxFONTENCODING_SYSTEM )    // returned when the recognition failed
-        {
-            SetEncoding(encoding);
-                encodingfound = true;
-        }
-            else
-        {
-#endif // wxUSE_FONTMAP
-
-                // assume it is the face name
-            if ( !face.empty() )
-            {
-                face += wxT(' ');
-            }
-
-            face += token;
-
-            // skip the code which resets face below
-            continue;
-
-#if wxUSE_FONTMAP
-        }
-#endif // wxUSE_FONTMAP
-        }
-
-        // if we had had the facename, we shouldn't continue appending tokens
-        // to it (i.e. "foo bold bar" shouldn't result in the facename "foo
-        // bar")
-        if ( !face.empty() )
-        {
-            wxString familyStr;
-            if ( face.EndsWith(" family", &familyStr) )
-            {
-                // it's not a facename but rather a font family
-                wxFontFamily family;
-                if ( familyStr == "decorative" )
-                    family = wxFONTFAMILY_DECORATIVE;
-                else if ( familyStr == "roman" )
-                    family = wxFONTFAMILY_ROMAN;
-                else if ( familyStr == "script" )
-                    family = wxFONTFAMILY_SCRIPT;
-                else if ( familyStr == "swiss" )
-                    family = wxFONTFAMILY_SWISS;
-                else if ( familyStr == "modern" )
-                    family = wxFONTFAMILY_MODERN;
-                else if ( familyStr == "teletype" )
-                    family = wxFONTFAMILY_TELETYPE;
-                else
-                    return false;
-
-                SetFamily(family);
-            }
-            // NB: the check on the facename is implemented in wxFontBase::SetFaceName
-            //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitly
-            //     call here wxFontEnumerator::IsValidFacename
-            else if (
-#if wxUSE_FONTENUM
-                    !wxFontEnumerator::IsValidFacename(face) ||
-#endif // wxUSE_FONTENUM
-                    !SetFaceName(face) )
-            {
-                SetFaceName(wxNORMAL_FONT->GetFaceName());
-            }
-
-            face.clear();
-        }
-    }
-
-    // we might not have flushed it inside the loop
-    if ( !face.empty() )
-    {
-        // NB: the check on the facename is implemented in wxFontBase::SetFaceName
-        //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitly
-        //     call here wxFontEnumerator::IsValidFacename
-        if (
-#if wxUSE_FONTENUM
-                !wxFontEnumerator::IsValidFacename(face) ||
-#endif // wxUSE_FONTENUM
-                !SetFaceName(face) )
-            {
-                SetFaceName(wxNORMAL_FONT->GetFaceName());
-            }
-    }
-
-    // set point size to default value if size was not given
-    if ( !pointsizefound )
-        SetPointSize(wxNORMAL_FONT->GetPointSize());
-
-    // set font weight to default value if weight was not given
-    if ( !weightfound )
-        SetWeight(wxFONTWEIGHT_NORMAL);
-
-#if wxUSE_FONTMAP
-    // set font encoding to default value if encoding was not given
-    if ( !encodingfound )
-        SetEncoding(wxFONTENCODING_SYSTEM);
-#endif // wxUSE_FONTMAP
-
-    return true;
-}
-
-#endif // generic or wxMSW or wxOS2
-
-
-// wxFont <-> wxString utilities, used by wxConfig
-wxString wxToString(const wxFontBase& font)
-{
-    return font.IsOk() ? font.GetNativeFontInfoDesc()
-                       : wxString();
-}
-
-bool wxFromString(const wxString& str, wxFontBase *font)
-{
-    wxCHECK_MSG( font, false, wxT("NULL output parameter") );
-
-    if ( str.empty() )
-    {
-        *font = wxNullFont;
-        return true;
-    }
-
-    return font->SetNativeFontInfo(str);
-}
-
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fontcmn.cpp
+// Purpose:     implementation of wxFontBase methods
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     20.09.99
+// RCS-ID:      $Id: fontcmn.cpp 43661 2006-11-26 20:18:53Z VZ $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/font.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/intl.h"
+    #include "wx/dcscreen.h"
+    #include "wx/log.h"
+    #include "wx/gdicmn.h"
+#endif // WX_PRECOMP
+
+#if defined(__WXMSW__)
+    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+    #include  "wx/msw/winundef.h"
+#endif
+
+#include "wx/fontutil.h" // for wxNativeFontInfo
+#include "wx/fontmap.h"
+#include "wx/fontenum.h"
+
+#include "wx/tokenzr.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+static void AdjustFontSize(wxFont& font, wxDC& dc, const wxSize& pixelSize)
+{
+    int currentSize = 0;
+    int largestGood = 0;
+    int smallestBad = 0;
+
+    bool initialGoodFound = false;
+    bool initialBadFound = false;
+
+    // NB: this assignment was separated from the variable definition
+    // in order to fix a gcc v3.3.3 compiler crash
+    currentSize = font.GetPointSize();
+    while (currentSize > 0)
+    {
+        dc.SetFont(font);
+
+        // if currentSize (in points) results in a font that is smaller
+        // than required by pixelSize it is considered a good size
+        if (dc.GetCharHeight() <= pixelSize.GetHeight() &&
+                (!pixelSize.GetWidth() ||
+                 dc.GetCharWidth() <= pixelSize.GetWidth()))
+        {
+            largestGood = currentSize;
+            initialGoodFound = true;
+        }
+        else
+        {
+            smallestBad = currentSize;
+            initialBadFound = true;
+        }
+        if (!initialGoodFound)
+        {
+            currentSize /= 2;
+        }
+        else if (!initialBadFound)
+        {
+            currentSize *= 2;
+        }
+        else
+        {
+            int distance = smallestBad - largestGood;
+            if (distance == 1)
+                break;
+
+            currentSize = largestGood + distance / 2;
+        }
+
+        font.SetPointSize(currentSize);
+    }
+
+    if (currentSize != largestGood)
+        font.SetPointSize(largestGood);
+}
+
+// ----------------------------------------------------------------------------
+// wxFontBase
+// ----------------------------------------------------------------------------
+
+wxFontEncoding wxFontBase::ms_encodingDefault = wxFONTENCODING_SYSTEM;
+
+/* static */
+void wxFontBase::SetDefaultEncoding(wxFontEncoding encoding)
+{
+    // GetDefaultEncoding() should return something != wxFONTENCODING_DEFAULT
+    // and, besides, using this value here doesn't make any sense
+    wxCHECK_RET( encoding != wxFONTENCODING_DEFAULT,
+                 _T("can't set default encoding to wxFONTENCODING_DEFAULT") );
+
+    ms_encodingDefault = encoding;
+}
+
+wxFontBase::~wxFontBase()
+{
+    // this destructor is required for Darwin
+}
+
+/* static */
+wxFont *wxFontBase::New(int size,
+                        int family,
+                        int style,
+                        int weight,
+                        bool underlined,
+                        const wxString& face,
+                        wxFontEncoding encoding)
+{
+    return new wxFont(size, family, style, weight, underlined, face, encoding);
+}
+
+static inline int flags2Style(int flags)
+{
+    return flags & wxFONTFLAG_ITALIC
+                    ? wxFONTSTYLE_ITALIC
+                    : flags & wxFONTFLAG_SLANT
+                        ? wxFONTSTYLE_SLANT
+                        : wxFONTSTYLE_NORMAL;
+}
+
+static inline int flags2Weight(int flags)
+{
+    return flags & wxFONTFLAG_LIGHT
+                    ? wxFONTWEIGHT_LIGHT
+                    : flags & wxFONTFLAG_BOLD
+                        ? wxFONTWEIGHT_BOLD
+                        : wxFONTWEIGHT_NORMAL;
+}
+
+static inline bool flags2Underlined(int flags)
+{
+    return (flags & wxFONTFLAG_UNDERLINED) != 0;
+}
+
+/* static */
+wxFont *wxFontBase::New(int pointSize,
+                        wxFontFamily family,
+                        int flags,
+                        const wxString& face,
+                        wxFontEncoding encoding)
+{
+    return New(pointSize, family, flags2Style(flags), flags2Weight(flags),
+               flags2Underlined(flags), face, encoding);
+}
+
+/* static */
+wxFont *wxFontBase::New(const wxSize& pixelSize,
+                        int family,
+                        int style,
+                        int weight,
+                        bool underlined,
+                        const wxString& face,
+                        wxFontEncoding encoding)
+{
+#if defined(__WXMSW__)
+    return new wxFont(pixelSize, family, style, weight, underlined,
+                      face, encoding);
+#else
+    wxFont *self = New(10, family, style, weight, underlined, face, encoding);
+    wxScreenDC dc;
+    AdjustFontSize(*(wxFont *)self, dc, pixelSize);
+    return self;
+#endif
+}
+
+/* static */
+wxFont *wxFontBase::New(const wxSize& pixelSize,
+                        wxFontFamily family,
+                        int flags,
+                        const wxString& face,
+                        wxFontEncoding encoding)
+{
+    return New(pixelSize, family, flags2Style(flags), flags2Weight(flags),
+               flags2Underlined(flags), face, encoding);
+}
+
+wxSize wxFontBase::GetPixelSize() const
+{
+    wxScreenDC dc;
+    dc.SetFont(*(wxFont *)this);
+    return wxSize(dc.GetCharWidth(), dc.GetCharHeight());
+}
+
+bool wxFontBase::IsUsingSizeInPixels() const
+{
+    return false;
+}
+
+void wxFontBase::SetPixelSize( const wxSize& pixelSize )
+{
+    wxScreenDC dc;
+    AdjustFontSize(*(wxFont *)this, dc, pixelSize);
+}
+
+/* static */
+wxFont *wxFontBase::New(const wxNativeFontInfo& info)
+{
+    return new wxFont(info);
+}
+
+/* static */
+wxFont *wxFontBase::New(const wxString& strNativeFontDesc)
+{
+    wxNativeFontInfo fontInfo;
+    if ( !fontInfo.FromString(strNativeFontDesc) )
+        return new wxFont(*wxNORMAL_FONT);
+
+    return New(fontInfo);
+}
+
+bool wxFontBase::IsFixedWidth() const
+{
+    return GetFamily() == wxFONTFAMILY_TELETYPE;
+}
+
+void wxFontBase::DoSetNativeFontInfo(const wxNativeFontInfo& info)
+{
+#ifdef wxNO_NATIVE_FONTINFO
+    SetPointSize(info.pointSize);
+    SetFamily(info.family);
+    SetStyle(info.style);
+    SetWeight(info.weight);
+    SetUnderlined(info.underlined);
+    SetFaceName(info.faceName);
+    SetEncoding(info.encoding);
+#else
+    (void)info;
+#endif
+}
+
+wxString wxFontBase::GetNativeFontInfoDesc() const
+{
+    wxString fontDesc;
+    const wxNativeFontInfo *fontInfo = GetNativeFontInfo();
+    if ( fontInfo )
+    {
+        fontDesc = fontInfo->ToString();
+        wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!"));
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("Derived class should have created the wxNativeFontInfo!"));
+    }
+
+    return fontDesc;
+}
+
+wxString wxFontBase::GetNativeFontInfoUserDesc() const
+{
+    wxString fontDesc;
+    const wxNativeFontInfo *fontInfo = GetNativeFontInfo();
+    if ( fontInfo )
+    {
+        fontDesc = fontInfo->ToUserString();
+        wxASSERT_MSG(!fontDesc.empty(), wxT("This should be a non-empty string!"));
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("Derived class should have created the wxNativeFontInfo!"));
+    }
+
+    return fontDesc;
+}
+
+bool wxFontBase::SetNativeFontInfo(const wxString& info)
+{
+    wxNativeFontInfo fontInfo;
+    if ( !info.empty() && fontInfo.FromString(info) )
+    {
+        SetNativeFontInfo(fontInfo);
+        return true;
+    }
+
+    UnRef();
+    return false;
+}
+
+bool wxFontBase::SetNativeFontInfoUserDesc(const wxString& info)
+{
+    wxNativeFontInfo fontInfo;
+    if ( !info.empty() && fontInfo.FromUserString(info) )
+    {
+        SetNativeFontInfo(fontInfo);
+        return true;
+    }
+
+    UnRef();
+    return false;
+}
+
+bool wxFontBase::operator==(const wxFont& font) const
+{
+    // either it is the same font, i.e. they share the same common data or they
+    // have different ref datas but still describe the same font
+    return IsSameAs(font) ||
+           (
+            Ok() == font.Ok() &&
+            GetPointSize() == font.GetPointSize() &&
+            // in wxGTK1 GetPixelSize() calls GetInternalFont() which uses
+            // operator==() resulting in infinite recursion so we can't use it
+            // in that port
+#if !defined(__WXGTK__) || defined(__WXGTK20__)
+            GetPixelSize() == font.GetPixelSize() &&
+#endif
+            GetFamily() == font.GetFamily() &&
+            GetStyle() == font.GetStyle() &&
+            GetWeight() == font.GetWeight() &&
+            GetUnderlined() == font.GetUnderlined() &&
+            GetFaceName().IsSameAs(font.GetFaceName(), false) &&
+            GetEncoding() == font.GetEncoding()
+           );
+}
+
+bool wxFontBase::operator!=(const wxFont& font) const
+{
+    return !(*this == font);
+}
+
+wxString wxFontBase::GetFamilyString() const
+{
+    wxCHECK_MSG( Ok(), wxT("wxDEFAULT"), wxT("invalid font") );
+
+    switch ( GetFamily() )
+    {
+        case wxDECORATIVE:   return wxT("wxDECORATIVE");
+        case wxROMAN:        return wxT("wxROMAN");
+        case wxSCRIPT:       return wxT("wxSCRIPT");
+        case wxSWISS:        return wxT("wxSWISS");
+        case wxMODERN:       return wxT("wxMODERN");
+        case wxTELETYPE:     return wxT("wxTELETYPE");
+        default:             return wxT("wxDEFAULT");
+    }
+}
+
+wxString wxFontBase::GetStyleString() const
+{
+    wxCHECK_MSG( Ok(), wxT("wxDEFAULT"), wxT("invalid font") );
+
+    switch ( GetStyle() )
+    {
+        case wxNORMAL:   return wxT("wxNORMAL");
+        case wxSLANT:    return wxT("wxSLANT");
+        case wxITALIC:   return wxT("wxITALIC");
+        default:         return wxT("wxDEFAULT");
+    }
+}
+
+wxString wxFontBase::GetWeightString() const
+{
+    wxCHECK_MSG( Ok(), wxT("wxDEFAULT"), wxT("invalid font") );
+
+    switch ( GetWeight() )
+    {
+        case wxNORMAL:   return wxT("wxNORMAL");
+        case wxBOLD:     return wxT("wxBOLD");
+        case wxLIGHT:    return wxT("wxLIGHT");
+        default:         return wxT("wxDEFAULT");
+    }
+}
+
+bool wxFontBase::SetFaceName(const wxString &facename)
+{
+    if (!wxFontEnumerator::IsValidFacename(facename))
+    {
+        UnRef();        // make Ok() return false
+        return false;
+    }
+
+    return true;
+}
+
+
+// ----------------------------------------------------------------------------
+// wxNativeFontInfo
+// ----------------------------------------------------------------------------
+
+// Up to now, there are no native implementations of this function:
+void wxNativeFontInfo::SetFaceName(const wxArrayString &facenames)
+{
+    for (size_t i=0; i < facenames.GetCount(); i++)
+    {
+        if (wxFontEnumerator::IsValidFacename(facenames[i]))
+        {
+            SetFaceName(facenames[i]);
+            return;
+        }
+    }
+
+    // set the first valid facename we can find on this system
+    wxString validfacename = wxFontEnumerator::GetFacenames().Item(0);
+    wxLogTrace(wxT("font"), wxT("Falling back to '%s'"), validfacename.c_str());
+    SetFaceName(validfacename);
+}
+
+
+#ifdef wxNO_NATIVE_FONTINFO
+
+// These are the generic forms of FromString()/ToString.
+//
+// convert to/from the string representation: format is
+//      version;pointsize;family;style;weight;underlined;facename;encoding
+
+bool wxNativeFontInfo::FromString(const wxString& s)
+{
+    long l;
+
+    wxStringTokenizer tokenizer(s, _T(";"));
+
+    wxString token = tokenizer.GetNextToken();
+    //
+    //  Ignore the version for now
+    //
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return false;
+    pointSize = (int)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return false;
+    family = (wxFontFamily)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return false;
+    style = (wxFontStyle)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return false;
+    weight = (wxFontWeight)l;
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return false;
+    underlined = l != 0;
+
+    faceName = tokenizer.GetNextToken();
+
+#ifndef __WXMAC__
+    if( !faceName )
+        return false;
+#endif
+
+    token = tokenizer.GetNextToken();
+    if ( !token.ToLong(&l) )
+        return false;
+    encoding = (wxFontEncoding)l;
+
+    return true;
+}
+
+wxString wxNativeFontInfo::ToString() const
+{
+    wxString s;
+
+    s.Printf(_T("%d;%d;%d;%d;%d;%d;%s;%d"),
+             0,                                 // version
+             pointSize,
+             family,
+             (int)style,
+             (int)weight,
+             underlined,
+             faceName.GetData(),
+             (int)encoding);
+
+    return s;
+}
+
+void wxNativeFontInfo::Init()
+{
+    pointSize = 0;
+    family = wxFONTFAMILY_DEFAULT;
+    style = wxFONTSTYLE_NORMAL;
+    weight = wxFONTWEIGHT_NORMAL;
+    underlined = false;
+    faceName.clear();
+    encoding = wxFONTENCODING_DEFAULT;
+}
+
+int wxNativeFontInfo::GetPointSize() const
+{
+    return pointSize;
+}
+
+wxFontStyle wxNativeFontInfo::GetStyle() const
+{
+    return style;
+}
+
+wxFontWeight wxNativeFontInfo::GetWeight() const
+{
+    return weight;
+}
+
+bool wxNativeFontInfo::GetUnderlined() const
+{
+    return underlined;
+}
+
+wxString wxNativeFontInfo::GetFaceName() const
+{
+    return faceName;
+}
+
+wxFontFamily wxNativeFontInfo::GetFamily() const
+{
+    return family;
+}
+
+wxFontEncoding wxNativeFontInfo::GetEncoding() const
+{
+    return encoding;
+}
+
+void wxNativeFontInfo::SetPointSize(int pointsize)
+{
+    pointSize = pointsize;
+}
+
+void wxNativeFontInfo::SetStyle(wxFontStyle style_)
+{
+    style = style_;
+}
+
+void wxNativeFontInfo::SetWeight(wxFontWeight weight_)
+{
+    weight = weight_;
+}
+
+void wxNativeFontInfo::SetUnderlined(bool underlined_)
+{
+    underlined = underlined_;
+}
+
+bool wxNativeFontInfo::SetFaceName(const wxString& facename_)
+{
+    faceName = facename_;
+    return true;
+}
+
+void wxNativeFontInfo::SetFamily(wxFontFamily family_)
+{
+    family = family_;
+}
+
+void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding_)
+{
+    encoding = encoding_;
+}
+
+#endif // generic wxNativeFontInfo implementation
+
+// conversion to/from user-readable string: this is used in the generic
+// versions and under MSW as well because there is no standard font description
+// format there anyhow (but there is a well-defined standard for X11 fonts used
+// by wxGTK and wxMotif)
+
+#if defined(wxNO_NATIVE_FONTINFO) || defined(__WXMSW__) || defined (__WXPM__)
+
+wxString wxNativeFontInfo::ToUserString() const
+{
+    wxString desc;
+
+    // first put the adjectives, if any - this is English-centric, of course,
+    // but what else can we do?
+    if ( GetUnderlined() )
+    {
+        desc << _("underlined");
+    }
+
+    switch ( GetWeight() )
+    {
+        default:
+            wxFAIL_MSG( _T("unknown font weight") );
+            // fall through
+
+        case wxFONTWEIGHT_NORMAL:
+            break;
+
+        case wxFONTWEIGHT_LIGHT:
+            desc << _(" light");
+            break;
+
+        case wxFONTWEIGHT_BOLD:
+            desc << _(" bold");
+            break;
+    }
+
+    switch ( GetStyle() )
+    {
+        default:
+            wxFAIL_MSG( _T("unknown font style") );
+            // fall through
+
+        case wxFONTSTYLE_NORMAL:
+            break;
+
+            // we don't distinguish between the two for now anyhow...
+        case wxFONTSTYLE_ITALIC:
+        case wxFONTSTYLE_SLANT:
+            desc << _(" italic");
+            break;
+    }
+
+    wxString face = GetFaceName();
+    if ( !face.empty() )
+    {
+        desc << _T(' ') << face;
+    }
+
+    int size = GetPointSize();
+    if ( size != wxNORMAL_FONT->GetPointSize() )
+    {
+        desc << _T(' ') << size;
+    }
+
+#if wxUSE_FONTMAP
+    wxFontEncoding enc = GetEncoding();
+    if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
+    {
+        desc << _T(' ') << wxFontMapper::GetEncodingName(enc);
+    }
+#endif // wxUSE_FONTMAP
+
+    return desc.Strip(wxString::both).MakeLower();
+}
+
+bool wxNativeFontInfo::FromUserString(const wxString& s)
+{
+    // reset to the default state
+    Init();
+
+    // parse a more or less free form string
+    //
+    // TODO: we should handle at least the quoted facenames
+    wxStringTokenizer tokenizer(s, _T(";, "), wxTOKEN_STRTOK);
+
+    wxString face;
+    unsigned long size;
+    bool weightfound = false, pointsizefound = false;
+#if wxUSE_FONTMAP
+    bool encodingfound = false;
+#endif
+
+    while ( tokenizer.HasMoreTokens() )
+    {
+        wxString token = tokenizer.GetNextToken();
+
+        // normalize it
+        token.Trim(true).Trim(false).MakeLower();
+
+        // look for the known tokens
+        if ( token == _T("underlined") || token == _("underlined") )
+        {
+            SetUnderlined(true);
+        }
+        else if ( token == _T("light") || token == _("light") )
+        {
+            SetWeight(wxFONTWEIGHT_LIGHT);
+            weightfound = true;
+        }
+        else if ( token == _T("bold") || token == _("bold") )
+        {
+            SetWeight(wxFONTWEIGHT_BOLD);
+            weightfound = true;
+        }
+        else if ( token == _T("italic") || token == _("italic") )
+        {
+            SetStyle(wxFONTSTYLE_ITALIC);
+        }
+        else if ( token.ToULong(&size) )
+        {
+            SetPointSize(size);
+            pointsizefound = true;
+        }
+        else
+        {
+#if wxUSE_FONTMAP
+            // try to interpret this as an encoding
+            wxFontEncoding encoding = wxFontMapper::Get()->CharsetToEncoding(token, false);
+            if ( encoding != wxFONTENCODING_DEFAULT &&
+                 encoding != wxFONTENCODING_SYSTEM )    // returned when the recognition failed
+        {
+            SetEncoding(encoding);
+                encodingfound = true;
+        }
+            else
+        {
+#endif // wxUSE_FONTMAP
+
+                // assume it is the face name
+            if ( !face.empty() )
+            {
+                face += _T(' ');
+            }
+
+            face += token;
+
+            // skip the code which resets face below
+            continue;
+
+#if wxUSE_FONTMAP
+        }
+#endif // wxUSE_FONTMAP
+        }
+
+        // if we had had the facename, we shouldn't continue appending tokens
+        // to it (i.e. "foo bold bar" shouldn't result in the facename "foo
+        // bar")
+        if ( !face.empty() )
+        {
+            // NB: the check on the facename is implemented in wxFontBase::SetFaceName
+            //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitely
+            //     call here wxFontEnumerator::IsValidFacename
+            if (!wxFontEnumerator::IsValidFacename(face) ||
+                !SetFaceName(face))
+                SetFaceName(wxNORMAL_FONT->GetFaceName());
+            face.clear();
+        }
+    }
+
+    // we might not have flushed it inside the loop
+    if ( !face.empty() )
+    {
+        // NB: the check on the facename is implemented in wxFontBase::SetFaceName
+        //     and not in wxNativeFontInfo::SetFaceName thus we need to explicitely
+        //     call here wxFontEnumerator::IsValidFacename
+        if (!wxFontEnumerator::IsValidFacename(face) ||
+            !SetFaceName(face))
+            SetFaceName(wxNORMAL_FONT->GetFaceName());
+    }
+
+    // set point size to default value if size was not given
+    if ( !pointsizefound )
+        SetPointSize(wxNORMAL_FONT->GetPointSize());
+
+    // set font weight to default value if weight was not given
+    if ( !weightfound )
+        SetWeight(wxFONTWEIGHT_NORMAL);
+
+#if wxUSE_FONTMAP
+    // set font encoding to default value if encoding was not given
+    if ( !encodingfound )
+        SetEncoding(wxFONTENCODING_SYSTEM);
+#endif // wxUSE_FONTMAP
+
+    return true;
+}
+
+#endif // generic or wxMSW or wxOS2
diff --git a/Source/3rd Party/wx/src/common/fontdata.cpp b/Source/3rd Party/wx/src/common/fontdata.cpp
deleted file mode 100644
index 3fc39665e..000000000
--- a/Source/3rd Party/wx/src/common/fontdata.cpp	
+++ /dev/null
@@ -1,69 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fontdata.cpp
-// Author:      Julian Smart
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FONTDLG || wxUSE_FONTPICKERCTRL
-
-#include "wx/fontdata.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
-
-wxFontData::wxFontData()
-{
-    m_showHelp = false;
-    m_allowSymbols = true;
-    m_enableEffects = true;
-    m_minSize = 0;
-    m_maxSize = 0;
-
-    m_encoding = wxFONTENCODING_SYSTEM;
-}
-
-wxFontData::~wxFontData()
-{
-}
-
-wxFontData::wxFontData(const wxFontData& data)
-    : wxObject(),
-      m_fontColour(data.m_fontColour),
-      m_showHelp(data.m_showHelp),
-      m_allowSymbols(data.m_allowSymbols),
-      m_enableEffects(data.m_enableEffects),
-      m_initialFont(data.m_initialFont),
-      m_chosenFont(data.m_chosenFont),
-      m_minSize(data.m_minSize),
-      m_maxSize(data.m_maxSize),
-      m_encoding(data.m_encoding),
-      m_encodingInfo(data.m_encodingInfo)
-{
-}
-
-wxFontData& wxFontData::operator=(const wxFontData& data)
-{
-    if (&data != this)
-    {
-        wxObject::operator=(data);
-        m_fontColour     = data.m_fontColour;
-        m_showHelp       = data.m_showHelp;
-        m_allowSymbols   = data.m_allowSymbols;
-        m_enableEffects  = data.m_enableEffects;
-        m_initialFont    = data.m_initialFont;
-        m_chosenFont     = data.m_chosenFont;
-        m_minSize        = data.m_minSize;
-        m_maxSize        = data.m_maxSize;
-        m_encoding       = data.m_encoding;
-        m_encodingInfo   = data.m_encodingInfo;
-    }
-    return *this;
-}
-#endif // wxUSE_FONTDLG || wxUSE_FONTPICKERCTRL
diff --git a/Source/3rd Party/wx/src/common/fontenumcmn.cpp b/Source/3rd Party/wx/src/common/fontenumcmn.cpp
index 4d6f10aa8..6ea8a30cb 100644
--- a/Source/3rd Party/wx/src/common/fontenumcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/fontenumcmn.cpp	
@@ -1,135 +1,131 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fontenumcmn.cpp
-// Purpose:     wxFontEnumerator class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     7/5/2006
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FONTENUM
-
-#include "wx/fontenum.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// A simple wxFontEnumerator which doesn't perform any filtering and
-// just returns all facenames and encodings found in the system
-class WXDLLEXPORT wxSimpleFontEnumerator : public wxFontEnumerator
-{
-public:
-    wxSimpleFontEnumerator() { }
-
-    // called by EnumerateFacenames
-    virtual bool OnFacename(const wxString& facename)
-    {
-        m_arrFacenames.Add(facename);
-        return true;
-    }
-
-    // called by EnumerateEncodings
-    virtual bool OnFontEncoding(const wxString& WXUNUSED(facename),
-                                const wxString& encoding)
-    {
-        m_arrEncodings.Add(encoding);
-        return true;
-    }
-
-public:
-    wxArrayString m_arrFacenames, m_arrEncodings;
-};
-
-
-/* static */
-wxArrayString wxFontEnumerator::GetFacenames(wxFontEncoding encoding, bool fixedWidthOnly)
-{
-    wxSimpleFontEnumerator temp;
-    temp.EnumerateFacenames(encoding, fixedWidthOnly);
-    return temp.m_arrFacenames;
-}
-
-/* static */
-wxArrayString wxFontEnumerator::GetEncodings(const wxString& facename)
-{
-    wxSimpleFontEnumerator temp;
-    temp.EnumerateEncodings(facename);
-    return temp.m_arrEncodings;
-}
-
-/* static */
-bool wxFontEnumerator::IsValidFacename(const wxString &facename)
-{
-    // we cache the result of wxFontEnumerator::GetFacenames supposing that
-    // the array of face names won't change in the session of this program
-    static wxArrayString s_arr = wxFontEnumerator::GetFacenames();
-
-#ifdef __WXMSW__
-    // Quoting the MSDN:
-    //     "MS Shell Dlg is a mapping mechanism that enables
-    //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to
-    //     support locales that have characters that are not contained in code
-    //     page 1252. It is not a font but a face name for a nonexistent font."
-    // Thus we need to consider "Ms Shell Dlg" and "Ms Shell Dlg 2" as valid
-    // font face names even if they are not enumerated by wxFontEnumerator
-    if (facename.IsSameAs(wxT("Ms Shell Dlg"), false) ||
-        facename.IsSameAs(wxT("Ms Shell Dlg 2"), false))
-        return true;
-#endif
-
-    // is given font face name a valid one ?
-    if (s_arr.Index(facename, false) == wxNOT_FOUND)
-        return false;
-
-    return true;
-}
-
-#ifdef wxHAS_UTF8_FONTS
-bool wxFontEnumerator::EnumerateEncodingsUTF8(const wxString& facename)
-{
-    // name of UTF-8 encoding: no need to use wxFontMapper for it as it's
-    // unlikely to change
-    const wxString utf8(wxT("UTF-8"));
-
-    // all fonts are in UTF-8 only if this code is used
-    if ( !facename.empty() )
-    {
-        OnFontEncoding(facename, utf8);
-        return true;
-    }
-
-    // so enumerating all facenames supporting this encoding is the same as
-    // enumerating all facenames
-    const wxArrayString facenames(GetFacenames(wxFONTENCODING_UTF8));
-    const size_t count = facenames.size();
-    if ( !count )
-        return false;
-
-    for ( size_t n = 0; n < count; n++ )
-    {
-        OnFontEncoding(facenames[n], utf8);
-    }
-
-    return true;
-}
-#endif // wxHAS_UTF8_FONTS
-
-#endif // wxUSE_FONTENUM
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fontenumcmn.cpp
+// Purpose:     wxFontEnumerator class
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     7/5/2006
+// RCS-ID:      $Id: fontenumcmn.cpp 43727 2006-12-01 10:14:28Z VS $
+// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/fontenum.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// A simple wxFontEnumerator which doesn't perform any filtering and
+// just returns all facenames and encodings found in the system
+class WXDLLEXPORT wxSimpleFontEnumerator : public wxFontEnumerator
+{
+public:
+    wxSimpleFontEnumerator() { }
+
+    // called by EnumerateFacenames
+    virtual bool OnFacename(const wxString& facename)
+    {
+        m_arrFacenames.Add(facename);
+        return true;
+    }
+
+    // called by EnumerateEncodings
+    virtual bool OnFontEncoding(const wxString& WXUNUSED(facename),
+                                const wxString& encoding)
+    {
+        m_arrEncodings.Add(encoding);
+        return true;
+    }
+
+public:
+    wxArrayString m_arrFacenames, m_arrEncodings;
+};
+
+
+/* static */
+wxArrayString wxFontEnumerator::GetFacenames(wxFontEncoding encoding, bool fixedWidthOnly)
+{
+    wxSimpleFontEnumerator temp;
+    temp.EnumerateFacenames(encoding, fixedWidthOnly);
+    return temp.m_arrFacenames;
+}
+
+/* static */
+wxArrayString wxFontEnumerator::GetEncodings(const wxString& facename)
+{
+    wxSimpleFontEnumerator temp;
+    temp.EnumerateEncodings(facename);
+    return temp.m_arrEncodings;
+}
+
+/* static */
+bool wxFontEnumerator::IsValidFacename(const wxString &facename)
+{
+    // we cache the result of wxFontEnumerator::GetFacenames supposing that
+    // the array of face names won't change in the session of this program
+    static wxArrayString s_arr = wxFontEnumerator::GetFacenames();
+
+#ifdef __WXMSW__
+    // Quoting the MSDN:
+    //     "MS Shell Dlg is a mapping mechanism that enables 
+    //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to 
+    //     support locales that have characters that are not contained in code 
+    //     page 1252. It is not a font but a face name for a nonexistent font."
+    // Thus we need to consider "Ms Shell Dlg" and "Ms Shell Dlg 2" as valid
+    // font face names even if they are enumerated by wxFontEnumerator
+    if (facename.IsSameAs(wxT("Ms Shell Dlg"), false) ||
+        facename.IsSameAs(wxT("Ms Shell Dlg 2"), false))
+        return true;
+#endif
+
+    // is given font face name a valid one ?
+    if (s_arr.Index(facename, false) == wxNOT_FOUND)
+        return false;
+
+    return true;
+}
+
+#ifdef wxHAS_UTF8_FONTS
+bool wxFontEnumerator::EnumerateEncodingsUTF8(const wxString& facename)
+{
+    // name of UTF-8 encoding: no need to use wxFontMapper for it as it's
+    // unlikely to change
+    const wxString utf8(_T("UTF-8"));
+
+    // all fonts are in UTF-8 only if this code is used
+    if ( !facename.empty() )
+    {
+        OnFontEncoding(facename, utf8);
+        return true;
+    }
+
+    // so enumerating all facenames supporting this encoding is the same as
+    // enumerating all facenames
+    const wxArrayString facenames(GetFacenames(wxFONTENCODING_UTF8));
+    const size_t count = facenames.size();
+    if ( !count )
+        return false;
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        OnFontEncoding(facenames[n], utf8);
+    }
+
+    return true;
+}
+#endif // wxHAS_UTF8_FONTS
diff --git a/Source/3rd Party/wx/src/common/fontmap.cpp b/Source/3rd Party/wx/src/common/fontmap.cpp
index e610f918d..3d3800766 100644
--- a/Source/3rd Party/wx/src/common/fontmap.cpp	
+++ b/Source/3rd Party/wx/src/common/fontmap.cpp	
@@ -1,523 +1,519 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fontmap.cpp
-// Purpose:     wxFontMapper class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     04.11.99
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FONTMAP
-
-#include "wx/fontmap.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choicdlg.h"
-#endif // PCH
-
-#if wxUSE_CONFIG
-    #include "wx/config.h"
-#endif // wxUSE_CONFIG
-
-#if defined(__WXMSW__)
-  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
-  #include  "wx/msw/winundef.h"
-#endif
-
-#include "wx/fmappriv.h"
-#include "wx/fontutil.h"
-#include "wx/fontdlg.h"
-#include "wx/encinfo.h"
-
-#include "wx/encconv.h"
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxBEGIN_ENUM( wxFontEncoding )
-wxENUM_MEMBER( wxFONTENCODING_SYSTEM )
-wxENUM_MEMBER( wxFONTENCODING_DEFAULT )
-
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
-wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
-wxENUM_MEMBER( wxFONTENCODING_KOI8 )
-wxENUM_MEMBER( wxFONTENCODING_KOI8_U )
-wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
-wxENUM_MEMBER( wxFONTENCODING_BULGARIAN )
-wxENUM_MEMBER( wxFONTENCODING_CP437 )
-wxENUM_MEMBER( wxFONTENCODING_CP850 )
-wxENUM_MEMBER( wxFONTENCODING_CP852 )
-wxENUM_MEMBER( wxFONTENCODING_CP855 )
-wxENUM_MEMBER( wxFONTENCODING_CP866 )
-
-wxENUM_MEMBER( wxFONTENCODING_CP874 )
-wxENUM_MEMBER( wxFONTENCODING_CP932 )
-wxENUM_MEMBER( wxFONTENCODING_CP936 )
-wxENUM_MEMBER( wxFONTENCODING_CP949 )
-wxENUM_MEMBER( wxFONTENCODING_CP950 )
-wxENUM_MEMBER( wxFONTENCODING_CP1250 )
-wxENUM_MEMBER( wxFONTENCODING_CP1251 )
-wxENUM_MEMBER( wxFONTENCODING_CP1252 )
-wxENUM_MEMBER( wxFONTENCODING_CP1253 )
-wxENUM_MEMBER( wxFONTENCODING_CP1254 )
-wxENUM_MEMBER( wxFONTENCODING_CP1255 )
-wxENUM_MEMBER( wxFONTENCODING_CP1256 )
-wxENUM_MEMBER( wxFONTENCODING_CP1257 )
-wxENUM_MEMBER( wxFONTENCODING_CP1258 )
-wxENUM_MEMBER( wxFONTENCODING_CP1361 )
-wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
-wxENUM_MEMBER( wxFONTENCODING_UTF7 )
-wxENUM_MEMBER( wxFONTENCODING_UTF8 )
-wxENUM_MEMBER( wxFONTENCODING_GB2312 )
-wxENUM_MEMBER( wxFONTENCODING_BIG5 )
-wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
-wxENUM_MEMBER( wxFONTENCODING_EUC_JP )
-wxENUM_MEMBER( wxFONTENCODING_UNICODE )
-wxEND_ENUM( wxFontEncoding )
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// the config paths we use
-#if wxUSE_CONFIG
-
-static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
-static const wxChar* FONTMAPPER_FONT_DONT_ASK = wxT("none");
-
-#endif // wxUSE_CONFIG
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// it may happen that while we're showing a dialog asking the user about
-// something, another request for an encoding mapping arrives: in this case it
-// is best to not do anything because otherwise we risk to enter an infinite
-// loop so we create an object of this class on stack to test for this in all
-// interactive functions
-class ReentrancyBlocker
-{
-public:
-    ReentrancyBlocker(bool& flag) : m_flagOld(flag), m_flag(flag)
-        { m_flag = true; }
-    ~ReentrancyBlocker() { m_flag = m_flagOld; }
-
-private:
-    bool m_flagOld;
-    bool& m_flag;
-
-    wxDECLARE_NO_COPY_CLASS(ReentrancyBlocker);
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// ctor and dtor
-// ----------------------------------------------------------------------------
-
-wxFontMapper::wxFontMapper()
-{
-    m_windowParent = NULL;
-}
-
-wxFontMapper::~wxFontMapper()
-{
-}
-
-/* static */
-wxFontMapper *wxFontMapper::Get()
-{
-    wxFontMapperBase *fontmapper = wxFontMapperBase::Get();
-    wxASSERT_MSG( !fontmapper->IsDummy(),
-                 wxT("GUI code requested a wxFontMapper but we only have a wxFontMapperBase.") );
-
-    // Now return it anyway because there's a chance the GUI code might just
-    // only want to call wxFontMapperBase functions and it's better than
-    // crashing by returning NULL
-    return (wxFontMapper *)fontmapper;
-}
-
-wxFontEncoding
-wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
-{
-    // try the ways not needing the users intervention first
-    int encoding = wxFontMapperBase::NonInteractiveCharsetToEncoding(charset);
-
-    // if we failed to find the encoding, ask the user -- unless disabled
-    if ( encoding == wxFONTENCODING_UNKNOWN )
-    {
-        // this is the special value which disables asking the user (he had
-        // chosen to suppress this the last time)
-        encoding = wxFONTENCODING_SYSTEM;
-    }
-#if wxUSE_CHOICEDLG
-    else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
-    {
-        // prepare the dialog data
-
-        // the dialog title
-        wxString title(m_titleDialog);
-        if ( !title )
-            title << wxTheApp->GetAppDisplayName() << _(": unknown charset");
-
-        // the message
-        wxString msg;
-        msg.Printf(_("The charset '%s' is unknown. You may select\nanother charset to replace it with or choose\n[Cancel] if it cannot be replaced"), charset);
-
-        // the list of choices
-        const size_t count = GetSupportedEncodingsCount();
-
-        wxString *encodingNamesTranslated = new wxString[count];
-
-        for ( size_t i = 0; i < count; i++ )
-        {
-            encodingNamesTranslated[i] = GetEncodingDescription(GetEncoding(i));
-        }
-
-        // the parent window
-        wxWindow *parent = m_windowParent;
-        if ( !parent )
-            parent = wxTheApp->GetTopWindow();
-
-        // do ask the user and get back the index in encodings table
-        int n = wxGetSingleChoiceIndex(msg, title,
-                                       count,
-                                       encodingNamesTranslated,
-                                       parent);
-
-        delete [] encodingNamesTranslated;
-
-        if ( n != -1 )
-        {
-            encoding = GetEncoding(n);
-        }
-
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-        // save the result in the config now
-        wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH);
-        if ( path.IsOk() )
-        {
-            wxConfigBase *config = GetConfig();
-
-            // remember the alt encoding for this charset -- or remember that
-            // we don't know it
-            long value = n == -1 ? (long)wxFONTENCODING_UNKNOWN : (long)encoding;
-            if ( !config->Write(charset, value) )
-            {
-                wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset);
-            }
-        }
-#endif // wxUSE_CONFIG
-    }
-#else
-    wxUnusedVar(interactive);
-#endif // wxUSE_CHOICEDLG
-
-    return (wxFontEncoding)encoding;
-}
-
-// ----------------------------------------------------------------------------
-// support for unknown encodings: we maintain a map between the
-// (platform-specific) strings identifying them and our wxFontEncodings they
-// correspond to which is used by GetFontForEncoding() function
-// ----------------------------------------------------------------------------
-
-bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
-                                   wxFontEncoding encReplacement,
-                                   wxNativeEncodingInfo *info)
-{
-    if ( wxGetNativeFontEncoding(encReplacement, info) &&
-         wxTestFontEncoding(*info) )
-    {
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-        // remember the mapping in the config
-        wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
-
-        if ( path.IsOk() )
-        {
-            GetConfig()->Write(configEntry, info->ToString());
-        }
-#else
-        wxUnusedVar(configEntry);
-#endif // wxUSE_CONFIG
-        return true;
-    }
-
-    return false;
-}
-
-bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
-                                     wxNativeEncodingInfo *info,
-                                     const wxString& facename,
-                                     bool interactive)
-{
-#if wxUSE_GUI
-    // we need a flag to prevent infinite recursion which happens, for
-    // example, when GetAltForEncoding() is called from an OnPaint() handler:
-    // in this case, wxYield() which is called from wxMessageBox() we use here
-    // will lead to another call of OnPaint() and hence to another call of
-    // GetAltForEncoding() -- and it is impossible to catch this from the user
-    // code because we are called from wxFont ctor implicitly.
-
-    // assume we're always called from the main thread, so that it is safe to
-    // use a static var
-    static bool s_inGetAltForEncoding = false;
-
-    if ( interactive && s_inGetAltForEncoding )
-        return false;
-
-    ReentrancyBlocker blocker(s_inGetAltForEncoding);
-#endif // wxUSE_GUI
-
-    wxCHECK_MSG( info, false, wxT("bad pointer in GetAltForEncoding") );
-
-    info->facename = facename;
-
-    if ( encoding == wxFONTENCODING_DEFAULT )
-    {
-        encoding = wxFont::GetDefaultEncoding();
-    }
-
-    // if we failed to load the system default encoding, something is really
-    // wrong and we'd better stop now -- otherwise we will go into endless
-    // recursion trying to create the font in the msg box with the error
-    // message
-    if ( encoding == wxFONTENCODING_SYSTEM )
-    {
-        wxLogFatalError(_("can't load any font, aborting"));
-
-        // wxLogFatalError doesn't return
-    }
-
-    wxString configEntry,
-             encName = GetEncodingName(encoding);
-    if ( !facename.empty() )
-    {
-        configEntry = facename + wxT("_");
-    }
-    configEntry += encName;
-
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-    // do we have a font spec for this encoding?
-    wxString fontinfo;
-    wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
-    if ( path.IsOk() )
-    {
-        fontinfo = GetConfig()->Read(configEntry);
-    }
-
-    // this special value means that we don't know of fonts for this
-    // encoding but, moreover, have already asked the user as well and he
-    // didn't specify any font neither
-    if ( fontinfo == FONTMAPPER_FONT_DONT_ASK )
-    {
-        interactive = false;
-    }
-    else // use the info entered the last time
-    {
-        if ( !fontinfo.empty() && !facename.empty() )
-        {
-            // we tried to find a match with facename -- now try without it
-            fontinfo = GetConfig()->Read(encName);
-        }
-
-        if ( !fontinfo.empty() )
-        {
-            if ( info->FromString(fontinfo) )
-            {
-                if ( wxTestFontEncoding(*info) )
-                {
-                    // ok, got something
-                    return true;
-                }
-                //else: no such fonts, look for something else
-                //      (should we erase the outdated value?)
-            }
-            else
-            {
-                wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"),
-                           fontinfo);
-            }
-        }
-        //else: there is no information in config about this encoding
-    }
-#endif // wxUSE_CONFIG
-
-    // now try to map this encoding to a compatible one which we have on this
-    // system
-    wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding);
-    size_t count = equiv.GetCount();
-    bool foundEquivEncoding = false;
-    wxFontEncoding equivEncoding = wxFONTENCODING_SYSTEM;
-    if ( count )
-    {
-        for ( size_t i = 0; i < count && !foundEquivEncoding; i++ )
-        {
-            // don't test for encoding itself, we already know we don't have it
-            if ( equiv[i] == encoding )
-                continue;
-
-            if ( TestAltEncoding(configEntry, equiv[i], info) )
-            {
-                equivEncoding = equiv[i];
-
-                foundEquivEncoding = true;
-            }
-        }
-    }
-
-    // ask the user
-#if wxUSE_FONTDLG
-    if ( interactive )
-    {
-        wxString title(m_titleDialog);
-        if ( !title )
-            title << wxTheApp->GetAppDisplayName() << _(": unknown encoding");
-
-        // built the message
-        wxString encDesc = GetEncodingDescription(encoding),
-                 msg;
-        if ( foundEquivEncoding )
-        {
-            // ask the user if he wants to override found alternative encoding
-            msg.Printf(_("No font for displaying text in encoding '%s' found,\nbut an alternative encoding '%s' is available.\nDo you want to use this encoding (otherwise you will have to choose another one)?"),
-                       encDesc, GetEncodingDescription(equivEncoding));
-        }
-        else
-        {
-            msg.Printf(_("No font for displaying text in encoding '%s' found.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"),
-                       encDesc);
-        }
-
-        // the question is different in 2 cases so the answer has to be
-        // interpreted differently as well
-        int answer = foundEquivEncoding ? wxNO : wxYES;
-
-        if ( wxMessageBox(msg, title,
-                          wxICON_QUESTION | wxYES_NO,
-                          m_windowParent) == answer )
-        {
-            wxFontData data;
-            data.SetEncoding(encoding);
-            data.EncodingInfo() = *info;
-            wxFontDialog dialog(m_windowParent, data);
-            if ( dialog.ShowModal() == wxID_OK )
-            {
-                wxFontData retData = dialog.GetFontData();
-
-                *info = retData.EncodingInfo();
-                info->encoding = retData.GetEncoding();
-
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-                // remember this in the config
-                wxFontMapperPathChanger path2(this,
-                                              FONTMAPPER_FONT_FROM_ENCODING_PATH);
-                if ( path2.IsOk() )
-                {
-                    GetConfig()->Write(configEntry, info->ToString());
-                }
-#endif // wxUSE_CONFIG
-
-                return true;
-            }
-            //else: the user canceled the font selection dialog
-        }
-        else
-        {
-            // the user doesn't want to select a font for this encoding
-            // or selected to use equivalent encoding
-            //
-            // remember it to avoid asking the same question again later
-#if wxUSE_CONFIG && wxUSE_FILECONFIG
-            wxFontMapperPathChanger path2(this,
-                                          FONTMAPPER_FONT_FROM_ENCODING_PATH);
-            if ( path2.IsOk() )
-            {
-                GetConfig()->Write
-                             (
-                                configEntry,
-                                foundEquivEncoding
-                                    ? (const wxChar*)info->ToString().c_str()
-                                    : FONTMAPPER_FONT_DONT_ASK
-                             );
-            }
-#endif // wxUSE_CONFIG
-        }
-    }
-    //else: we're in non-interactive mode
-#else
-    wxUnusedVar(equivEncoding);
-#endif // wxUSE_FONTDLG
-
-    return foundEquivEncoding;
-}
-
-bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
-                                     wxFontEncoding *encodingAlt,
-                                     const wxString& facename,
-                                     bool interactive)
-{
-    wxCHECK_MSG( encodingAlt, false,
-                    wxT("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
-
-    wxNativeEncodingInfo info;
-    if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
-        return false;
-
-    *encodingAlt = info.encoding;
-
-    return true;
-}
-
-bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,
-                                       const wxString& facename)
-{
-    wxNativeEncodingInfo info;
-
-    if ( !wxGetNativeFontEncoding(encoding, &info) )
-        return false;
-
-    info.facename = facename;
-    return wxTestFontEncoding(info);
-}
-
-#endif // wxUSE_FONTMAP
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fontmap.cpp
+// Purpose:     wxFontMapper class
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     04.11.99
+// RCS-ID:      $Id: fontmap.cpp 39651 2006-06-09 17:50:46Z ABX $
+// Copyright:   (c) 1999-2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FONTMAP
+
+#include "wx/fontmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/msgdlg.h"
+    #include "wx/choicdlg.h"
+#endif // PCH
+
+#if wxUSE_CONFIG
+    #include "wx/config.h"
+#endif // wxUSE_CONFIG
+
+#if defined(__WXMSW__)
+  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+  #include  "wx/msw/winundef.h"
+#endif
+
+#include "wx/fmappriv.h"
+#include "wx/fontutil.h"
+#include "wx/fontdlg.h"
+#include "wx/encinfo.h"
+
+#include "wx/encconv.h"
+
+#if wxUSE_EXTENDED_RTTI
+
+wxBEGIN_ENUM( wxFontEncoding )
+    wxENUM_MEMBER( wxFONTENCODING_SYSTEM )
+    wxENUM_MEMBER( wxFONTENCODING_DEFAULT )
+
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_1 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_2 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_3 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_4 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_5 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_6 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_7 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_8 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_9 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_10 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_11 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_12 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_13 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_14 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_15 )
+    wxENUM_MEMBER( wxFONTENCODING_ISO8859_MAX )
+    wxENUM_MEMBER( wxFONTENCODING_KOI8 )
+    wxENUM_MEMBER( wxFONTENCODING_KOI8_U )
+    wxENUM_MEMBER( wxFONTENCODING_ALTERNATIVE )
+    wxENUM_MEMBER( wxFONTENCODING_BULGARIAN )
+    wxENUM_MEMBER( wxFONTENCODING_CP437 )
+    wxENUM_MEMBER( wxFONTENCODING_CP850 )
+    wxENUM_MEMBER( wxFONTENCODING_CP852 )
+    wxENUM_MEMBER( wxFONTENCODING_CP855 )
+    wxENUM_MEMBER( wxFONTENCODING_CP866 )
+
+    wxENUM_MEMBER( wxFONTENCODING_CP874 )
+    wxENUM_MEMBER( wxFONTENCODING_CP932 )
+    wxENUM_MEMBER( wxFONTENCODING_CP936 )
+    wxENUM_MEMBER( wxFONTENCODING_CP949 )
+    wxENUM_MEMBER( wxFONTENCODING_CP950 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1250 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1251 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1252 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1253 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1254 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1255 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1256 )
+    wxENUM_MEMBER( wxFONTENCODING_CP1257 )
+    wxENUM_MEMBER( wxFONTENCODING_CP12_MAX )
+    wxENUM_MEMBER( wxFONTENCODING_UTF7 )
+    wxENUM_MEMBER( wxFONTENCODING_UTF8 )
+    wxENUM_MEMBER( wxFONTENCODING_GB2312 )
+    wxENUM_MEMBER( wxFONTENCODING_BIG5 )
+    wxENUM_MEMBER( wxFONTENCODING_SHIFT_JIS )
+    wxENUM_MEMBER( wxFONTENCODING_EUC_JP )
+    wxENUM_MEMBER( wxFONTENCODING_UNICODE )
+wxEND_ENUM( wxFontEncoding )
+#endif
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the config paths we use
+#if wxUSE_CONFIG
+
+static const wxChar* FONTMAPPER_FONT_FROM_ENCODING_PATH = wxT("Encodings");
+static const wxChar* FONTMAPPER_FONT_DONT_ASK = wxT("none");
+
+#endif // wxUSE_CONFIG
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// it may happen that while we're showing a dialog asking the user about
+// something, another request for an encoding mapping arrives: in this case it
+// is best to not do anything because otherwise we risk to enter an infinite
+// loop so we create an object of this class on stack to test for this in all
+// interactive functions
+class ReentrancyBlocker
+{
+public:
+    ReentrancyBlocker(bool& flag) : m_flagOld(flag), m_flag(flag)
+        { m_flag = true; }
+    ~ReentrancyBlocker() { m_flag = m_flagOld; }
+
+private:
+    bool m_flagOld;
+    bool& m_flag;
+
+    DECLARE_NO_COPY_CLASS(ReentrancyBlocker)
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// ctor and dtor
+// ----------------------------------------------------------------------------
+
+wxFontMapper::wxFontMapper()
+{
+    m_windowParent = NULL;
+}
+
+wxFontMapper::~wxFontMapper()
+{
+}
+
+/* static */
+wxFontMapper *wxFontMapper::Get()
+{
+    wxFontMapperBase *fontmapper = wxFontMapperBase::Get();
+    wxASSERT_MSG( !fontmapper->IsDummy(),
+                 wxT("GUI code requested a wxFontMapper but we only have a wxFontMapperBase.") );
+
+    // Now return it anyway because there's a chance the GUI code might just
+    // only want to call wxFontMapperBase functions and it's better than
+    // crashing by returning NULL
+    return (wxFontMapper *)fontmapper;
+}
+
+wxFontEncoding
+wxFontMapper::CharsetToEncoding(const wxString& charset, bool interactive)
+{
+    // try the ways not needing the users intervention first
+    int encoding = wxFontMapperBase::NonInteractiveCharsetToEncoding(charset);
+
+    // if we failed to find the encoding, ask the user -- unless disabled
+    if ( encoding == wxFONTENCODING_UNKNOWN )
+    {
+        // this is the special value which disables asking the user (he had
+        // chosen to suppress this the last time)
+        encoding = wxFONTENCODING_SYSTEM;
+    }
+#if wxUSE_CHOICEDLG
+    else if ( (encoding == wxFONTENCODING_SYSTEM) && interactive )
+    {
+        // prepare the dialog data
+
+        // the dialog title
+        wxString title(m_titleDialog);
+        if ( !title )
+            title << wxTheApp->GetAppName() << _(": unknown charset");
+
+        // the message
+        wxString msg;
+        msg.Printf(_("The charset '%s' is unknown. You may select\nanother charset to replace it with or choose\n[Cancel] if it cannot be replaced"), charset.c_str());
+
+        // the list of choices
+        const size_t count = GetSupportedEncodingsCount();
+
+        wxString *encodingNamesTranslated = new wxString[count];
+
+        for ( size_t i = 0; i < count; i++ )
+        {
+            encodingNamesTranslated[i] = GetEncodingDescription(GetEncoding(i));
+        }
+
+        // the parent window
+        wxWindow *parent = m_windowParent;
+        if ( !parent )
+            parent = wxTheApp->GetTopWindow();
+
+        // do ask the user and get back the index in encodings table
+        int n = wxGetSingleChoiceIndex(msg, title,
+                                       count,
+                                       encodingNamesTranslated,
+                                       parent);
+
+        delete [] encodingNamesTranslated;
+
+        if ( n != -1 )
+        {
+            encoding = GetEncoding(n);
+        }
+
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+        // save the result in the config now
+        wxFontMapperPathChanger path(this, FONTMAPPER_CHARSET_PATH);
+        if ( path.IsOk() )
+        {
+            wxConfigBase *config = GetConfig();
+
+            // remember the alt encoding for this charset -- or remember that
+            // we don't know it
+            long value = n == -1 ? (long)wxFONTENCODING_UNKNOWN : (long)encoding;
+            if ( !config->Write(charset, value) )
+            {
+                wxLogError(_("Failed to remember the encoding for the charset '%s'."), charset.c_str());
+            }
+        }
+#endif // wxUSE_CONFIG
+    }
+#else
+    wxUnusedVar(interactive);
+#endif // wxUSE_CHOICEDLG
+
+    return (wxFontEncoding)encoding;
+}
+
+// ----------------------------------------------------------------------------
+// support for unknown encodings: we maintain a map between the
+// (platform-specific) strings identifying them and our wxFontEncodings they
+// correspond to which is used by GetFontForEncoding() function
+// ----------------------------------------------------------------------------
+
+bool wxFontMapper::TestAltEncoding(const wxString& configEntry,
+                                   wxFontEncoding encReplacement,
+                                   wxNativeEncodingInfo *info)
+{
+    if ( wxGetNativeFontEncoding(encReplacement, info) &&
+         wxTestFontEncoding(*info) )
+    {
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+        // remember the mapping in the config
+        wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
+
+        if ( path.IsOk() )
+        {
+            GetConfig()->Write(configEntry, info->ToString());
+        }
+#else
+        wxUnusedVar(configEntry);
+#endif // wxUSE_CONFIG
+        return true;
+    }
+
+    return false;
+}
+
+bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
+                                     wxNativeEncodingInfo *info,
+                                     const wxString& facename,
+                                     bool interactive)
+{
+#if wxUSE_GUI
+    // we need a flag to prevent infinite recursion which happens, for
+    // example, when GetAltForEncoding() is called from an OnPaint() handler:
+    // in this case, wxYield() which is called from wxMessageBox() we use here
+    // will lead to another call of OnPaint() and hence to another call of
+    // GetAltForEncoding() -- and it is impossible to catch this from the user
+    // code because we are called from wxFont ctor implicitly.
+
+    // assume we're always called from the main thread, so that it is safe to
+    // use a static var
+    static bool s_inGetAltForEncoding = false;
+
+    if ( interactive && s_inGetAltForEncoding )
+        return false;
+
+    ReentrancyBlocker blocker(s_inGetAltForEncoding);
+#endif // wxUSE_GUI
+
+    wxCHECK_MSG( info, false, wxT("bad pointer in GetAltForEncoding") );
+
+    info->facename = facename;
+
+    if ( encoding == wxFONTENCODING_DEFAULT )
+    {
+        encoding = wxFont::GetDefaultEncoding();
+    }
+
+    // if we failed to load the system default encoding, something is really
+    // wrong and we'd better stop now -- otherwise we will go into endless
+    // recursion trying to create the font in the msg box with the error
+    // message
+    if ( encoding == wxFONTENCODING_SYSTEM )
+    {
+        wxLogFatalError(_("can't load any font, aborting"));
+
+        // wxLogFatalError doesn't return
+    }
+
+    wxString configEntry,
+             encName = GetEncodingName(encoding);
+    if ( !facename.empty() )
+    {
+        configEntry = facename + _T("_");
+    }
+    configEntry += encName;
+
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+    // do we have a font spec for this encoding?
+    wxString fontinfo;
+    wxFontMapperPathChanger path(this, FONTMAPPER_FONT_FROM_ENCODING_PATH);
+    if ( path.IsOk() )
+    {
+        fontinfo = GetConfig()->Read(configEntry);
+    }
+
+    // this special value means that we don't know of fonts for this
+    // encoding but, moreover, have already asked the user as well and he
+    // didn't specify any font neither
+    if ( fontinfo == FONTMAPPER_FONT_DONT_ASK )
+    {
+        interactive = false;
+    }
+    else // use the info entered the last time
+    {
+        if ( !fontinfo.empty() && !facename.empty() )
+        {
+            // we tried to find a match with facename -- now try without it
+            fontinfo = GetConfig()->Read(encName);
+        }
+
+        if ( !fontinfo.empty() )
+        {
+            if ( info->FromString(fontinfo) )
+            {
+                if ( wxTestFontEncoding(*info) )
+                {
+                    // ok, got something
+                    return true;
+                }
+                //else: no such fonts, look for something else
+                //      (should we erase the outdated value?)
+            }
+            else
+            {
+                wxLogDebug(wxT("corrupted config data: string '%s' is not a valid font encoding info"),
+                           fontinfo.c_str());
+            }
+        }
+        //else: there is no information in config about this encoding
+    }
+#endif // wxUSE_CONFIG
+
+    // now try to map this encoding to a compatible one which we have on this
+    // system
+    wxFontEncodingArray equiv = wxEncodingConverter::GetAllEquivalents(encoding);
+    size_t count = equiv.GetCount();
+    bool foundEquivEncoding = false;
+    wxFontEncoding equivEncoding = wxFONTENCODING_SYSTEM;
+    if ( count )
+    {
+        for ( size_t i = 0; i < count && !foundEquivEncoding; i++ )
+        {
+            // don't test for encoding itself, we already know we don't have it
+            if ( equiv[i] == encoding )
+                continue;
+
+            if ( TestAltEncoding(configEntry, equiv[i], info) )
+            {
+                equivEncoding = equiv[i];
+
+                foundEquivEncoding = true;
+            }
+        }
+    }
+
+    // ask the user
+#if wxUSE_FONTDLG
+    if ( interactive )
+    {
+        wxString title(m_titleDialog);
+        if ( !title )
+            title << wxTheApp->GetAppName() << _(": unknown encoding");
+
+        // built the message
+        wxString encDesc = GetEncodingDescription(encoding),
+                 msg;
+        if ( foundEquivEncoding )
+        {
+            // ask the user if he wants to override found alternative encoding
+            msg.Printf(_("No font for displaying text in encoding '%s' found,\nbut an alternative encoding '%s' is available.\nDo you want to use this encoding (otherwise you will have to choose another one)?"),
+                       encDesc.c_str(), GetEncodingDescription(equivEncoding).c_str());
+        }
+        else
+        {
+            msg.Printf(_("No font for displaying text in encoding '%s' found.\nWould you like to select a font to be used for this encoding\n(otherwise the text in this encoding will not be shown correctly)?"),
+                       encDesc.c_str());
+        }
+
+        // the question is different in 2 cases so the answer has to be
+        // interpreted differently as well
+        int answer = foundEquivEncoding ? wxNO : wxYES;
+
+        if ( wxMessageBox(msg, title,
+                          wxICON_QUESTION | wxYES_NO,
+                          m_windowParent) == answer )
+        {
+            wxFontData data;
+            data.SetEncoding(encoding);
+            data.EncodingInfo() = *info;
+            wxFontDialog dialog(m_windowParent, data);
+            if ( dialog.ShowModal() == wxID_OK )
+            {
+                wxFontData retData = dialog.GetFontData();
+
+                *info = retData.EncodingInfo();
+                info->encoding = retData.GetEncoding();
+
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+                // remember this in the config
+                wxFontMapperPathChanger path2(this,
+                                              FONTMAPPER_FONT_FROM_ENCODING_PATH);
+                if ( path2.IsOk() )
+                {
+                    GetConfig()->Write(configEntry, info->ToString());
+                }
+#endif // wxUSE_CONFIG
+
+                return true;
+            }
+            //else: the user canceled the font selection dialog
+        }
+        else
+        {
+            // the user doesn't want to select a font for this encoding
+            // or selected to use equivalent encoding
+            //
+            // remember it to avoid asking the same question again later
+#if wxUSE_CONFIG && wxUSE_FILECONFIG
+            wxFontMapperPathChanger path2(this,
+                                          FONTMAPPER_FONT_FROM_ENCODING_PATH);
+            if ( path2.IsOk() )
+            {
+                GetConfig()->Write
+                             (
+                                configEntry,
+                                foundEquivEncoding ? info->ToString().c_str()
+                                                   : FONTMAPPER_FONT_DONT_ASK
+                             );
+            }
+#endif // wxUSE_CONFIG
+        }
+    }
+    //else: we're in non-interactive mode
+#else
+    wxUnusedVar(equivEncoding);
+#endif // wxUSE_FONTDLG
+
+    return foundEquivEncoding;
+}
+
+bool wxFontMapper::GetAltForEncoding(wxFontEncoding encoding,
+                                     wxFontEncoding *encodingAlt,
+                                     const wxString& facename,
+                                     bool interactive)
+{
+    wxCHECK_MSG( encodingAlt, false,
+                    _T("wxFontEncoding::GetAltForEncoding(): NULL pointer") );
+
+    wxNativeEncodingInfo info;
+    if ( !GetAltForEncoding(encoding, &info, facename, interactive) )
+        return false;
+
+    *encodingAlt = info.encoding;
+
+    return true;
+}
+
+bool wxFontMapper::IsEncodingAvailable(wxFontEncoding encoding,
+                                       const wxString& facename)
+{
+    wxNativeEncodingInfo info;
+
+    if ( !wxGetNativeFontEncoding(encoding, &info) )
+        return false;
+
+    info.facename = facename;
+    return wxTestFontEncoding(info);
+}
+
+#endif // wxUSE_FONTMAP
diff --git a/Source/3rd Party/wx/src/common/fontpickercmn.cpp b/Source/3rd Party/wx/src/common/fontpickercmn.cpp
index 474a24696..c4af53f25 100644
--- a/Source/3rd Party/wx/src/common/fontpickercmn.cpp	
+++ b/Source/3rd Party/wx/src/common/fontpickercmn.cpp	
@@ -1,181 +1,181 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fontpickercmn.cpp
-// Purpose:     wxFontPickerCtrl class implementation
-// Author:      Francesco Montorsi
-// Modified by:
-// Created:     15/04/2006
-// RCS-ID:      $Id$
-// Copyright:   (c) Francesco Montorsi
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FONTPICKERCTRL
-
-#include "wx/fontpicker.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
-#endif
-
-#include "wx/fontenum.h"
-#include "wx/tokenzr.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-const char wxFontPickerCtrlNameStr[] = "fontpicker";
-const char wxFontPickerWidgetNameStr[] = "fontpickerwidget";
-
-wxDEFINE_EVENT(wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEvent);
-IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent)
-
-// ----------------------------------------------------------------------------
-// wxFontPickerCtrl
-// ----------------------------------------------------------------------------
-
-#define M_PICKER     ((wxFontPickerWidget*)m_picker)
-
-bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id,
-                        const wxFont &initial,
-                        const wxPoint &pos, const wxSize &size,
-                        long style, const wxValidator& validator,
-                        const wxString &name )
-{
-    if (!wxPickerBase::CreateBase(parent, id,
-                                  Font2String(initial.IsOk() ? initial
-                                                             : *wxNORMAL_FONT),
-                                  pos, size, style, validator, name))
-        return false;
-
-    // the picker of a wxFontPickerCtrl is a wxFontPickerWidget
-    m_picker = new wxFontPickerWidget(this, wxID_ANY, initial,
-                                      wxDefaultPosition, wxDefaultSize,
-                                      GetPickerStyle(style));
-    // complete sizer creation
-    wxPickerBase::PostCreation();
-
-    m_picker->Connect(wxEVT_COMMAND_FONTPICKER_CHANGED,
-            wxFontPickerEventHandler(wxFontPickerCtrl::OnFontChange),
-            NULL, this);
-
-    return true;
-}
-
-wxString wxFontPickerCtrl::Font2String(const wxFont &f)
-{
-    wxString ret = f.GetNativeFontInfoUserDesc();
-#ifdef __WXMSW__
-    // on wxMSW the encoding of the font is appended at the end of the string;
-    // since encoding is not very user-friendly we remove it.
-    wxFontEncoding enc = f.GetEncoding();
-    if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
-        ret = ret.BeforeLast(wxT(' '));
-#endif
-    return ret;
-}
-
-wxFont wxFontPickerCtrl::String2Font(const wxString &s)
-{
-    wxString str(s);
-    wxFont ret;
-    double n;
-
-    // put a limit on the maximum point size which the user can enter
-    // NOTE: we suppose the last word of given string is the pointsize
-    wxString size = str.AfterLast(wxT(' '));
-    if (size.ToDouble(&n))
-    {
-        if (n < 1)
-            str = str.Left(str.length() - size.length()) + wxT("1");
-        else if (n >= m_nMaxPointSize)
-            str = str.Left(str.length() - size.length()) +
-                  wxString::Format(wxT("%d"), m_nMaxPointSize);
-    }
-
-    if (!ret.SetNativeFontInfoUserDesc(str))
-        return wxNullFont;
-
-    return ret;
-}
-
-void wxFontPickerCtrl::SetSelectedFont(const wxFont &f)
-{
-    M_PICKER->SetSelectedFont(f);
-    UpdateTextCtrlFromPicker();
-}
-
-void wxFontPickerCtrl::UpdatePickerFromTextCtrl()
-{
-    wxASSERT(m_text);
-
-    if (m_bIgnoreNextTextCtrlUpdate)
-    {
-        // ignore this update
-        m_bIgnoreNextTextCtrlUpdate = false;
-        return;
-    }
-
-    // NB: we don't use the wxFont::wxFont(const wxString &) constructor
-    //     since that constructor expects the native font description
-    //     string returned by wxFont::GetNativeFontInfoDesc() and not
-    //     the user-friendly one returned by wxFont::GetNativeFontInfoUserDesc()
-    wxFont f = String2Font(m_text->GetValue());
-    if (!f.IsOk())
-        return;     // invalid user input
-
-    if (M_PICKER->GetSelectedFont() != f)
-    {
-        M_PICKER->SetSelectedFont(f);
-
-        // fire an event
-        wxFontPickerEvent event(this, GetId(), f);
-        GetEventHandler()->ProcessEvent(event);
-    }
-}
-
-void wxFontPickerCtrl::UpdateTextCtrlFromPicker()
-{
-    if (!m_text)
-        return;     // no textctrl to update
-
-    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
-    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
-    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
-    m_bIgnoreNextTextCtrlUpdate = true;
-    m_text->SetValue(Font2String(M_PICKER->GetSelectedFont()));
-}
-
-
-
-// ----------------------------------------------------------------------------
-// wxFontPickerCtrl - event handlers
-// ----------------------------------------------------------------------------
-
-void wxFontPickerCtrl::OnFontChange(wxFontPickerEvent &ev)
-{
-    UpdateTextCtrlFromPicker();
-
-    // the wxFontPickerWidget sent us a colour-change notification.
-    // forward this event to our parent
-    wxFontPickerEvent event(this, GetId(), ev.GetFont());
-    GetEventHandler()->ProcessEvent(event);
-}
-
-#endif  // wxUSE_FONTPICKERCTRL
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fontpickercmn.cpp
+// Purpose:     wxFontPickerCtrl class implementation
+// Author:      Francesco Montorsi
+// Modified by:
+// Created:     15/04/2006
+// RCS-ID:      $Id: fontpickercmn.cpp 42999 2006-11-03 21:54:13Z VZ $
+// Copyright:   (c) Francesco Montorsi
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FONTPICKERCTRL
+
+#include "wx/fontpicker.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+
+#include "wx/fontenum.h"
+#include "wx/tokenzr.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+const wxChar wxFontPickerCtrlNameStr[] = wxT("fontpicker");
+const wxChar wxFontPickerWidgetNameStr[] = wxT("fontpickerwidget");
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED)
+IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase)
+IMPLEMENT_DYNAMIC_CLASS(wxFontPickerEvent, wxCommandEvent)
+
+// ----------------------------------------------------------------------------
+// wxFontPickerCtrl
+// ----------------------------------------------------------------------------
+
+#define M_PICKER     ((wxFontPickerWidget*)m_picker)
+
+bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id,
+                        const wxFont &initial,
+                        const wxPoint &pos, const wxSize &size,
+                        long style, const wxValidator& validator,
+                        const wxString &name )
+{
+    if (!wxPickerBase::CreateBase(parent, id,
+                                  Font2String(initial.IsOk() ? initial
+                                                             : *wxNORMAL_FONT),
+                                  pos, size, style, validator, name))
+        return false;
+
+    // the picker of a wxFontPickerCtrl is a wxFontPickerWidget
+    m_picker = new wxFontPickerWidget(this, wxID_ANY, initial,
+                                      wxDefaultPosition, wxDefaultSize,
+                                      GetPickerStyle(style));
+    // complete sizer creation
+    wxPickerBase::PostCreation();
+
+    m_picker->Connect(wxEVT_COMMAND_FONTPICKER_CHANGED,
+            wxFontPickerEventHandler(wxFontPickerCtrl::OnFontChange),
+            NULL, this);
+
+    return true;
+}
+
+wxString wxFontPickerCtrl::Font2String(const wxFont &f)
+{
+    wxString ret = f.GetNativeFontInfoUserDesc();
+#ifdef __WXMSW__
+    // on wxMSW the encoding of the font is appended at the end of the string;
+    // since encoding is not very user-friendly we remove it.
+    wxFontEncoding enc = f.GetEncoding();
+    if ( enc != wxFONTENCODING_DEFAULT && enc != wxFONTENCODING_SYSTEM )
+        ret = ret.BeforeLast(wxT(' '));
+#endif
+    return ret;
+}
+
+wxFont wxFontPickerCtrl::String2Font(const wxString &s)
+{
+    wxString str(s);
+    wxFont ret;
+    double n;
+
+    // put a limit on the maximum point size which the user can enter
+    // NOTE: we suppose the last word of given string is the pointsize
+    wxString size = str.AfterLast(wxT(' '));
+    if (size.ToDouble(&n))
+    {
+        if (n < 1)
+            str = str.Left(str.length() - size.length()) + wxT("1");
+        else if (n >= m_nMaxPointSize)
+            str = str.Left(str.length() - size.length()) +
+                  wxString::Format(wxT("%d"), m_nMaxPointSize);
+    }
+
+    if (!ret.SetNativeFontInfoUserDesc(str))
+        return wxNullFont;
+
+    return ret;
+}
+
+void wxFontPickerCtrl::SetSelectedFont(const wxFont &f)
+{
+    M_PICKER->SetSelectedFont(f);
+    UpdateTextCtrlFromPicker();
+}
+
+void wxFontPickerCtrl::UpdatePickerFromTextCtrl()
+{
+    wxASSERT(m_text);
+
+    if (m_bIgnoreNextTextCtrlUpdate)
+    {
+        // ignore this update
+        m_bIgnoreNextTextCtrlUpdate = false;
+        return;
+    }
+
+    // NB: we don't use the wxFont::wxFont(const wxString &) constructor
+    //     since that constructor expects the native font description
+    //     string returned by wxFont::GetNativeFontInfoDesc() and not
+    //     the user-friendly one returned by wxFont::GetNativeFontInfoUserDesc()
+    wxFont f = String2Font(m_text->GetValue());
+    if (!f.Ok())
+        return;     // invalid user input
+
+    if (M_PICKER->GetSelectedFont() != f)
+    {
+        M_PICKER->SetSelectedFont(f);
+
+        // fire an event
+        wxFontPickerEvent event(this, GetId(), f);
+        GetEventHandler()->ProcessEvent(event);
+    }
+}
+
+void wxFontPickerCtrl::UpdateTextCtrlFromPicker()
+{
+    if (!m_text)
+        return;     // no textctrl to update
+
+    // NOTE: this SetValue() will generate an unwanted wxEVT_COMMAND_TEXT_UPDATED
+    //       which will trigger a unneeded UpdateFromTextCtrl(); thus before using
+    //       SetValue() we set the m_bIgnoreNextTextCtrlUpdate flag...
+    m_bIgnoreNextTextCtrlUpdate = true;
+    m_text->SetValue(Font2String(M_PICKER->GetSelectedFont()));
+}
+
+
+
+// ----------------------------------------------------------------------------
+// wxFontPickerCtrl - event handlers
+// ----------------------------------------------------------------------------
+
+void wxFontPickerCtrl::OnFontChange(wxFontPickerEvent &ev)
+{
+    UpdateTextCtrlFromPicker();
+
+    // the wxFontPickerWidget sent us a colour-change notification.
+    // forward this event to our parent
+    wxFontPickerEvent event(this, GetId(), ev.GetFont());
+    GetEventHandler()->ProcessEvent(event);
+}
+
+#endif  // wxUSE_FONTPICKERCTRL
diff --git a/Source/3rd Party/wx/src/common/fontutilcmn.cpp b/Source/3rd Party/wx/src/common/fontutilcmn.cpp
deleted file mode 100644
index 055c5dfd0..000000000
--- a/Source/3rd Party/wx/src/common/fontutilcmn.cpp	
+++ /dev/null
@@ -1,66 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fontutilcmn.cpp
-// Purpose:     Font helper functions common for all ports
-// Author:      Vaclav Slavik
-// Modified by:
-// Created:     2006-12-20
-// RCS-ID:      $Id$
-// Copyright:   (c) Vadim Zeitlin, Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/fontutil.h"
-#include "wx/encinfo.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-#ifdef wxHAS_UTF8_FONTS
-
-// ----------------------------------------------------------------------------
-// wxNativeEncodingInfo
-// ----------------------------------------------------------------------------
-
-bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s))
-{
-    return false;
-}
-
-wxString wxNativeEncodingInfo::ToString() const
-{
-    return wxEmptyString;
-}
-
-bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info))
-{
-    return true;
-}
-
-bool wxGetNativeFontEncoding(wxFontEncoding encoding,
-                             wxNativeEncodingInfo *info)
-{
-    // all encodings are available because we translate text in any encoding to
-    // UTF-8 internally anyhow
-    info->facename.clear();
-    info->encoding = encoding;
-
-    return true;
-}
-
-#endif // wxHAS_UTF8_FONTS
diff --git a/Source/3rd Party/wx/src/common/framecmn.cpp b/Source/3rd Party/wx/src/common/framecmn.cpp
index 26191510b..65c3c48ac 100644
--- a/Source/3rd Party/wx/src/common/framecmn.cpp	
+++ b/Source/3rd Party/wx/src/common/framecmn.cpp	
@@ -1,672 +1,590 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/framecmn.cpp
-// Purpose:     common (for all platforms) wxFrame functions
-// Author:      Julian Smart, Vadim Zeitlin
-// Created:     01/02/97
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/frame.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/menu.h"
-    #include "wx/menuitem.h"
-    #include "wx/dcclient.h"
-    #include "wx/toolbar.h"
-    #include "wx/statusbr.h"
-#endif // WX_PRECOMP
-
-extern WXDLLEXPORT_DATA(const char) wxFrameNameStr[] = "frame";
-extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[] = "status_line";
-
-// ----------------------------------------------------------------------------
-// event table
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS && wxUSE_STATUSBAR
-
-BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
-    EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
-    EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
-
-    EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
-END_EVENT_TABLE()
-
-#endif // wxUSE_MENUS && wxUSE_STATUSBAR
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxFrameStyle )
-wxBEGIN_FLAGS( wxFrameStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-// frame styles
-wxFLAGS_MEMBER(wxSTAY_ON_TOP)
-wxFLAGS_MEMBER(wxCAPTION)
-#if WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxTHICK_FRAME)
-#endif // WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxSYSTEM_MENU)
-wxFLAGS_MEMBER(wxRESIZE_BORDER)
-#if WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxRESIZE_BOX)
-#endif // WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxCLOSE_BOX)
-wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
-wxFLAGS_MEMBER(wxMINIMIZE_BOX)
-
-wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
-wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
-
-wxFLAGS_MEMBER(wxFRAME_SHAPED)
-wxEND_FLAGS( wxFrameStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow, "wx/frame.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxFrame)
-wxEVENT_PROPERTY( Menu, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
-
-wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString(), 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-wxPROPERTY_FLAGS( WindowStyle, wxFrameStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-#if wxUSE_MENUS
-wxPROPERTY( MenuBar, wxMenuBar *, SetMenuBar, GetMenuBar, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group"))
-#endif
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxFrame)
-
-wxCONSTRUCTOR_6( wxFrame, wxWindow*, Parent, wxWindowID, Id, wxString, Title, \
-                wxPoint, Position, wxSize, Size, long, WindowStyle)
-
-// ----------------------------------------------------------------------------
-// construction/destruction
-// ----------------------------------------------------------------------------
-
-wxFrameBase::wxFrameBase()
-{
-#if wxUSE_MENUS
-    m_frameMenuBar = NULL;
-#endif // wxUSE_MENUS
-
-#if wxUSE_TOOLBAR
-    m_frameToolBar = NULL;
-#endif // wxUSE_TOOLBAR
-
-#if wxUSE_STATUSBAR
-    m_frameStatusBar = NULL;
-#endif // wxUSE_STATUSBAR
-
-    m_statusBarPane = 0;
-}
-
-wxFrameBase::~wxFrameBase()
-{
-    // this destructor is required for Darwin
-}
-
-wxFrame *wxFrameBase::New(wxWindow *parent,
-                          wxWindowID id,
-                          const wxString& title,
-                          const wxPoint& pos,
-                          const wxSize& size,
-                          long style,
-                          const wxString& name)
-{
-    return new wxFrame(parent, id, title, pos, size, style, name);
-}
-
-void wxFrameBase::DeleteAllBars()
-{
-#if wxUSE_MENUS
-    wxDELETE(m_frameMenuBar);
-#endif // wxUSE_MENUS
-
-#if wxUSE_STATUSBAR
-    wxDELETE(m_frameStatusBar);
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
-    wxDELETE(m_frameToolBar);
-#endif // wxUSE_TOOLBAR
-}
-
-bool wxFrameBase::IsOneOfBars(const wxWindow *win) const
-{
-#if wxUSE_MENUS
-    if ( win == GetMenuBar() )
-        return true;
-#endif // wxUSE_MENUS
-
-#if wxUSE_STATUSBAR
-    if ( win == GetStatusBar() )
-        return true;
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
-    if ( win == GetToolBar() )
-        return true;
-#endif // wxUSE_TOOLBAR
-
-    wxUnusedVar(win);
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// wxFrame size management: we exclude the areas taken by menu/status/toolbars
-// from the client area, so the client area is what's really available for the
-// frame contents
-// ----------------------------------------------------------------------------
-
-// get the origin of the client area in the client coordinates
-wxPoint wxFrameBase::GetClientAreaOrigin() const
-{
-    wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
-
-#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
-    wxToolBar *toolbar = GetToolBar();
-    if ( toolbar && toolbar->IsShown() )
-    {
-        int w, h;
-        toolbar->GetSize(&w, &h);
-
-        if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
-        {
-            pt.x += w;
-        }
-        else
-        {
-            pt.y += h;
-        }
-    }
-#endif // wxUSE_TOOLBAR
-
-    return pt;
-}
-
-// ----------------------------------------------------------------------------
-// misc
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS
-
-bool wxFrameBase::ProcessCommand(int id)
-{
-    wxMenuItem* const item = FindItemInMenuBar(id);
-    if ( !item )
-        return false;
-
-    return ProcessCommand(item);
-}
-
-bool wxFrameBase::ProcessCommand(wxMenuItem *item)
-{
-    wxCHECK_MSG( item, false, wxS("Menu item can't be NULL") );
-
-    if (!item->IsEnabled())
-        return true;
-
-    if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
-        return true;
-
-    int checked;
-    if (item->IsCheckable())
-    {
-        item->Toggle();
-
-        // use the new value
-        checked = item->IsChecked();
-    }
-    else // Uncheckable item.
-    {
-        checked = -1;
-    }
-
-    wxMenu* const menu = item->GetMenu();
-    wxCHECK_MSG( menu, false, wxS("Menu item should be attached to a menu") );
-
-    return menu->SendEvent(item->GetId(), checked);
-}
-
-#endif // wxUSE_MENUS
-
-// Do the UI update processing for this window. This is
-// provided for the application to call if it wants to
-// force a UI update, particularly for the menus and toolbar.
-void wxFrameBase::UpdateWindowUI(long flags)
-{
-    wxWindowBase::UpdateWindowUI(flags);
-
-#if wxUSE_TOOLBAR
-    if (GetToolBar())
-        GetToolBar()->UpdateWindowUI(flags);
-#endif
-
-#if wxUSE_MENUS
-    if (GetMenuBar())
-    {
-        // If coming from an idle event, we only want to update the menus if
-        // we're in the wxUSE_IDLEMENUUPDATES configuration, otherwise they
-        // will be update when the menu is opened later
-#if !wxUSE_IDLEMENUUPDATES
-        if ( !(flags & wxUPDATE_UI_FROMIDLE) )
-#endif // wxUSE_IDLEMENUUPDATES
-            DoMenuUpdates();
-    }
-#endif // wxUSE_MENUS
-}
-
-// ----------------------------------------------------------------------------
-// event handlers for status bar updates from menus
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS && wxUSE_STATUSBAR
-
-void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
-{
-#if wxUSE_STATUSBAR
-    (void)ShowMenuHelp(event.GetMenuId());
-#endif // wxUSE_STATUSBAR
-}
-
-void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
-{
-#if wxUSE_IDLEMENUUPDATES
-    wxUnusedVar(event);
-#else // !wxUSE_IDLEMENUUPDATES
-    // as we didn't update the menus from idle time, do it now
-    DoMenuUpdates(event.GetMenu());
-#endif // wxUSE_IDLEMENUUPDATES/!wxUSE_IDLEMENUUPDATES
-}
-
-void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
-{
-    DoGiveHelp(wxEmptyString, false);
-}
-
-#endif // wxUSE_MENUS && wxUSE_STATUSBAR
-
-// Implement internal behaviour (menu updating on some platforms)
-void wxFrameBase::OnInternalIdle()
-{
-    wxTopLevelWindow::OnInternalIdle();
-
-#if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
-    if (wxUpdateUIEvent::CanUpdate(this))
-        DoMenuUpdates();
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// status bar stuff
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STATUSBAR
-
-wxStatusBar* wxFrameBase::CreateStatusBar(int number,
-                                          long style,
-                                          wxWindowID id,
-                                          const wxString& name)
-{
-    // the main status bar can only be created once (or else it should be
-    // deleted before calling CreateStatusBar() again)
-    wxCHECK_MSG( !m_frameStatusBar, NULL,
-                 wxT("recreating status bar in wxFrame") );
-
-    SetStatusBar(OnCreateStatusBar(number, style, id, name));
-
-    return m_frameStatusBar;
-}
-
-wxStatusBar *wxFrameBase::OnCreateStatusBar(int number,
-                                            long style,
-                                            wxWindowID id,
-                                            const wxString& name)
-{
-    wxStatusBar *statusBar = new wxStatusBar(this, id, style, name);
-
-    statusBar->SetFieldsCount(number);
-
-    return statusBar;
-}
-
-void wxFrameBase::SetStatusText(const wxString& text, int number)
-{
-    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
-
-    m_frameStatusBar->SetStatusText(text, number);
-}
-
-void wxFrameBase::SetStatusWidths(int n, const int widths_field[] )
-{
-    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") );
-
-    m_frameStatusBar->SetStatusWidths(n, widths_field);
-
-    PositionStatusBar();
-}
-
-void wxFrameBase::PushStatusText(const wxString& text, int number)
-{
-    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
-
-    m_frameStatusBar->PushStatusText(text, number);
-}
-
-void wxFrameBase::PopStatusText(int number)
-{
-    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
-
-    m_frameStatusBar->PopStatusText(number);
-}
-
-bool wxFrameBase::ShowMenuHelp(int menuId)
-{
-#if wxUSE_MENUS
-    // if no help string found, we will clear the status bar text
-    //
-    // NB: wxID_NONE is used for (sub)menus themselves by wxMSW
-    wxString helpString;
-    if ( menuId != wxID_SEPARATOR && menuId != wxID_NONE )
-    {
-        const wxMenuItem * const item = FindItemInMenuBar(menuId);
-        if ( item && !item->IsSeparator() )
-            helpString = item->GetHelp();
-
-        // notice that it's ok if we don't find the item because it might
-        // belong to the popup menu, so don't assert here
-    }
-
-    DoGiveHelp(helpString, true);
-
-    return !helpString.empty();
-#else // !wxUSE_MENUS
-    return false;
-#endif // wxUSE_MENUS/!wxUSE_MENUS
-}
-
-void wxFrameBase::SetStatusBar(wxStatusBar *statBar)
-{
-    bool hadBar = m_frameStatusBar != NULL;
-    m_frameStatusBar = statBar;
-
-    if ( (m_frameStatusBar != NULL) != hadBar )
-    {
-        PositionStatusBar();
-
-        DoLayout();
-    }
-}
-
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_MENUS || wxUSE_TOOLBAR
-void wxFrameBase::DoGiveHelp(const wxString& help, bool show)
-{
-#if wxUSE_STATUSBAR
-    if ( m_statusBarPane < 0 )
-    {
-        // status bar messages disabled
-        return;
-    }
-
-    wxStatusBar *statbar = GetStatusBar();
-    if ( !statbar )
-        return;
-
-    wxString text;
-    if ( show )
-    {
-        // remember the old status bar text if this is the first time we're
-        // called since the menu has been opened as we're going to overwrite it
-        // in our DoGiveHelp() and we want to restore it when the menu is
-        // closed
-        //
-        // note that it would be logical to do this in OnMenuOpen() but under
-        // MSW we get an EVT_MENU_HIGHLIGHT before EVT_MENU_OPEN, strangely
-        // enough, and so this doesn't work and instead we use the ugly trick
-        // with using special m_oldStatusText value as "menu opened" (but it is
-        // arguably better than adding yet another member variable to wxFrame
-        // on all platforms)
-        if ( m_oldStatusText.empty() )
-        {
-            m_oldStatusText = statbar->GetStatusText(m_statusBarPane);
-            if ( m_oldStatusText.empty() )
-            {
-                // use special value to prevent us from doing this the next time
-                m_oldStatusText += wxT('\0');
-            }
-        }
-
-        m_lastHelpShown =
-        text = help;
-    }
-    else // hide help, restore the original text
-    {
-        // clear the last shown help string but remember its value
-        wxString lastHelpShown;
-        lastHelpShown.swap(m_lastHelpShown);
-
-        // also clear the old status text but remember it too to restore it
-        // below
-        text.swap(m_oldStatusText);
-
-        if ( statbar->GetStatusText(m_statusBarPane) != lastHelpShown )
-        {
-            // if the text was changed with an explicit SetStatusText() call
-            // from the user code in the meanwhile, do not overwrite it with
-            // the old status bar contents -- this is almost certainly not what
-            // the user expects and would be very hard to avoid from user code
-            return;
-        }
-    }
-
-    statbar->SetStatusText(text, m_statusBarPane);
-#else
-    wxUnusedVar(help);
-    wxUnusedVar(show);
-#endif // wxUSE_STATUSBAR
-}
-#endif // wxUSE_MENUS || wxUSE_TOOLBAR
-
-
-// ----------------------------------------------------------------------------
-// toolbar stuff
-// ----------------------------------------------------------------------------
-
-#if wxUSE_TOOLBAR
-
-wxToolBar* wxFrameBase::CreateToolBar(long style,
-                                      wxWindowID id,
-                                      const wxString& name)
-{
-    // the main toolbar can't be recreated (unless it was explicitly deleted
-    // before)
-    wxCHECK_MSG( !m_frameToolBar, NULL,
-                 wxT("recreating toolbar in wxFrame") );
-
-    if ( style == -1 )
-    {
-        // use default style
-        //
-        // NB: we don't specify the default value in the method declaration
-        //     because
-        //      a) this allows us to have different defaults for different
-        //         platforms (even if we don't have them right now)
-        //      b) we don't need to include wx/toolbar.h in the header then
-        style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT;
-    }
-
-    SetToolBar(OnCreateToolBar(style, id, name));
-
-    return m_frameToolBar;
-}
-
-wxToolBar* wxFrameBase::OnCreateToolBar(long style,
-                                        wxWindowID id,
-                                        const wxString& name)
-{
-#if defined(__WXWINCE__) && defined(__POCKETPC__)
-    return new wxToolMenuBar(this, id,
-                         wxDefaultPosition, wxDefaultSize,
-                         style, name);
-#else
-    return new wxToolBar(this, id,
-                         wxDefaultPosition, wxDefaultSize,
-                         style, name);
-#endif
-}
-
-void wxFrameBase::SetToolBar(wxToolBar *toolbar)
-{
-    if ( (toolbar != NULL) != (m_frameToolBar != NULL) )
-    {
-        // the toolbar visibility must have changed so we need to both position
-        // the toolbar itself (if it appeared) and to relayout the frame
-        // contents in any case
-
-        if ( toolbar )
-        {
-            // we need to assign it to m_frameToolBar for PositionToolBar() to
-            // do anything
-            m_frameToolBar = toolbar;
-            PositionToolBar();
-        }
-        //else: tricky: do not reset m_frameToolBar yet as otherwise DoLayout()
-        //      wouldn't recognize the (still existing) toolbar as one of our
-        //      bars and wouldn't layout the single child of the frame correctly
-
-
-        // and this is even more tricky: we want DoLayout() to recognize the
-        // old toolbar for the purpose of not counting it among our non-bar
-        // children but we don't want to reserve any more space for it so we
-        // temporarily hide it
-        if ( m_frameToolBar )
-            m_frameToolBar->Hide();
-
-        DoLayout();
-
-        if ( m_frameToolBar )
-            m_frameToolBar->Show();
-    }
-
-    // this might have been already done above but it's simpler to just always
-    // do it unconditionally instead of testing for whether we already did it
-    m_frameToolBar = toolbar;
-}
-
-#endif // wxUSE_TOOLBAR
-
-// ----------------------------------------------------------------------------
-// menus
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS
-
-// update all menus
-void wxFrameBase::DoMenuUpdates(wxMenu* menu)
-{
-    if (menu)
-    {
-        wxEvtHandler* source = GetEventHandler();
-        menu->UpdateUI(source);
-    }
-    else
-    {
-        wxMenuBar* bar = GetMenuBar();
-        if (bar != NULL)
-            bar->UpdateMenus();
-    }
-}
-
-void wxFrameBase::DetachMenuBar()
-{
-    if ( m_frameMenuBar )
-    {
-        m_frameMenuBar->Detach();
-        m_frameMenuBar = NULL;
-    }
-}
-
-void wxFrameBase::AttachMenuBar(wxMenuBar *menubar)
-{
-    if ( menubar )
-    {
-        menubar->Attach((wxFrame *)this);
-        m_frameMenuBar = menubar;
-    }
-}
-
-void wxFrameBase::SetMenuBar(wxMenuBar *menubar)
-{
-    if ( menubar == GetMenuBar() )
-    {
-        // nothing to do
-        return;
-    }
-
-    DetachMenuBar();
-
-    this->AttachMenuBar(menubar);
-}
-
-wxMenuItem *wxFrameBase::FindItemInMenuBar(int menuId) const
-{
-    const wxMenuBar * const menuBar = GetMenuBar();
-
-    return menuBar ? menuBar->FindItem(menuId) : NULL;
-}
-
-#endif // wxUSE_MENUS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/framecmn.cpp
+// Purpose:     common (for all platforms) wxFrame functions
+// Author:      Julian Smart, Vadim Zeitlin
+// Created:     01/02/97
+// Id:          $Id: framecmn.cpp 51463 2008-01-30 21:31:03Z VZ $
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/frame.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/menuitem.h"
+    #include "wx/dcclient.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+#endif // WX_PRECOMP
+
+// ----------------------------------------------------------------------------
+// event table
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS && wxUSE_STATUSBAR
+
+BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
+    EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
+    EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
+
+    EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
+END_EVENT_TABLE()
+
+#endif // wxUSE_MENUS && wxUSE_STATUSBAR
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// construction/destruction
+// ----------------------------------------------------------------------------
+
+wxFrameBase::wxFrameBase()
+{
+#if wxUSE_MENUS
+    m_frameMenuBar = NULL;
+#endif // wxUSE_MENUS
+
+#if wxUSE_TOOLBAR
+    m_frameToolBar = NULL;
+#endif // wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+    m_frameStatusBar = NULL;
+#endif // wxUSE_STATUSBAR
+
+    m_statusBarPane = 0;
+}
+
+wxFrameBase::~wxFrameBase()
+{
+    // this destructor is required for Darwin
+}
+
+wxFrame *wxFrameBase::New(wxWindow *parent,
+                          wxWindowID id,
+                          const wxString& title,
+                          const wxPoint& pos,
+                          const wxSize& size,
+                          long style,
+                          const wxString& name)
+{
+    return new wxFrame(parent, id, title, pos, size, style, name);
+}
+
+void wxFrameBase::DeleteAllBars()
+{
+#if wxUSE_MENUS
+    if ( m_frameMenuBar )
+    {
+        delete m_frameMenuBar;
+        m_frameMenuBar = (wxMenuBar *) NULL;
+    }
+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+    if ( m_frameStatusBar )
+    {
+        delete m_frameStatusBar;
+        m_frameStatusBar = (wxStatusBar *) NULL;
+    }
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    if ( m_frameToolBar )
+    {
+        delete m_frameToolBar;
+        m_frameToolBar = (wxToolBar *) NULL;
+    }
+#endif // wxUSE_TOOLBAR
+}
+
+bool wxFrameBase::IsOneOfBars(const wxWindow *win) const
+{
+#if wxUSE_MENUS
+    if ( win == GetMenuBar() )
+        return true;
+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+    if ( win == GetStatusBar() )
+        return true;
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    if ( win == GetToolBar() )
+        return true;
+#endif // wxUSE_TOOLBAR
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// wxFrame size management: we exclude the areas taken by menu/status/toolbars
+// from the client area, so the client area is what's really available for the
+// frame contents
+// ----------------------------------------------------------------------------
+
+// get the origin of the client area in the client coordinates
+wxPoint wxFrameBase::GetClientAreaOrigin() const
+{
+    wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
+
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
+    wxToolBar *toolbar = GetToolBar();
+    if ( toolbar && toolbar->IsShown() )
+    {
+        int w, h;
+        toolbar->GetSize(&w, &h);
+
+        if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
+        {
+            pt.x += w;
+        }
+        else
+        {
+            pt.y += h;
+        }
+    }
+#endif // wxUSE_TOOLBAR
+
+    return pt;
+}
+
+
+void wxFrameBase::SendSizeEvent()
+{
+    const wxSize size = GetSize();
+    wxSizeEvent event( size, GetId() );
+    event.SetEventObject( this );
+    GetEventHandler()->AddPendingEvent( event );
+
+#ifdef __WXGTK__
+    // SendSizeEvent is typically called when a toolbar is shown
+    // or hidden, but sending the size event alone is not enough
+    // to trigger a full layout.
+    ((wxFrame*)this)->GtkOnSize(
+#ifndef __WXGTK20__
+        0, 0, size.x, size.y
+#endif // __WXGTK20__
+    );
+#endif // __WXGTK__
+}
+
+
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
+
+bool wxFrameBase::ProcessCommand(int id)
+{
+#if wxUSE_MENUS
+    wxMenuBar *bar = GetMenuBar();
+    if ( !bar )
+        return false;
+
+    wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+    commandEvent.SetEventObject(this);
+
+    wxMenuItem *item = bar->FindItem(id);
+    if (item)
+    {
+        if (!item->IsEnabled())
+            return true;
+
+        if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
+            return true;
+
+        if (item->IsCheckable())
+        {
+            item->Toggle();
+
+            // use the new value
+            commandEvent.SetInt(item->IsChecked());
+        }
+    }
+
+    return GetEventHandler()->ProcessEvent(commandEvent);
+#else // !wxUSE_MENUS
+    return false;
+#endif // wxUSE_MENUS/!wxUSE_MENUS
+}
+
+// Do the UI update processing for this window. This is
+// provided for the application to call if it wants to
+// force a UI update, particularly for the menus and toolbar.
+void wxFrameBase::UpdateWindowUI(long flags)
+{
+    wxWindowBase::UpdateWindowUI(flags);
+
+#if wxUSE_TOOLBAR
+    if (GetToolBar())
+        GetToolBar()->UpdateWindowUI(flags);
+#endif
+
+#if wxUSE_MENUS
+    if (GetMenuBar())
+    {
+        if ((flags & wxUPDATE_UI_FROMIDLE) && !wxUSE_IDLEMENUUPDATES)
+        {
+            // If coming from an idle event, we only
+            // want to update the menus if we're
+            // in the wxUSE_IDLEMENUUPDATES configuration:
+            // so if we're not, do nothing
+        }
+        else
+            DoMenuUpdates();
+    }
+#endif // wxUSE_MENUS
+}
+
+// ----------------------------------------------------------------------------
+// event handlers for status bar updates from menus
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS && wxUSE_STATUSBAR
+
+void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
+{
+#if wxUSE_STATUSBAR
+    (void)ShowMenuHelp(GetStatusBar(), event.GetMenuId());
+#endif // wxUSE_STATUSBAR
+}
+
+#if !wxUSE_IDLEMENUUPDATES
+void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
+#else
+void wxFrameBase::OnMenuOpen(wxMenuEvent& WXUNUSED(event))
+#endif
+{
+#if !wxUSE_IDLEMENUUPDATES
+    DoMenuUpdates(event.GetMenu());
+#endif // !wxUSE_IDLEMENUUPDATES
+}
+
+void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
+{
+    // do we have real status text to restore?
+    if ( !m_oldStatusText.empty() )
+    {
+        if ( m_statusBarPane >= 0 )
+        {
+            wxStatusBar *statbar = GetStatusBar();
+            if ( statbar )
+                statbar->SetStatusText(m_oldStatusText, m_statusBarPane);
+        }
+
+        m_oldStatusText.clear();
+    }
+}
+
+#endif // wxUSE_MENUS && wxUSE_STATUSBAR
+
+// Implement internal behaviour (menu updating on some platforms)
+void wxFrameBase::OnInternalIdle()
+{
+    wxTopLevelWindow::OnInternalIdle();
+
+#if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
+    if (wxUpdateUIEvent::CanUpdate(this))
+        DoMenuUpdates();
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// status bar stuff
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STATUSBAR
+
+wxStatusBar* wxFrameBase::CreateStatusBar(int number,
+                                          long style,
+                                          wxWindowID id,
+                                          const wxString& name)
+{
+    // the main status bar can only be created once (or else it should be
+    // deleted before calling CreateStatusBar() again)
+    wxCHECK_MSG( !m_frameStatusBar, (wxStatusBar *)NULL,
+                 wxT("recreating status bar in wxFrame") );
+
+    SetStatusBar(OnCreateStatusBar(number, style, id, name));
+
+    return m_frameStatusBar;
+}
+
+wxStatusBar *wxFrameBase::OnCreateStatusBar(int number,
+                                            long style,
+                                            wxWindowID id,
+                                            const wxString& name)
+{
+    wxStatusBar *statusBar = new wxStatusBar(this, id, style, name);
+
+    statusBar->SetFieldsCount(number);
+
+    return statusBar;
+}
+
+void wxFrameBase::SetStatusText(const wxString& text, int number)
+{
+    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
+
+    m_frameStatusBar->SetStatusText(text, number);
+}
+
+void wxFrameBase::SetStatusWidths(int n, const int widths_field[] )
+{
+    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") );
+
+    m_frameStatusBar->SetStatusWidths(n, widths_field);
+
+    PositionStatusBar();
+}
+
+void wxFrameBase::PushStatusText(const wxString& text, int number)
+{
+    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
+
+    m_frameStatusBar->PushStatusText(text, number);
+}
+
+void wxFrameBase::PopStatusText(int number)
+{
+    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
+
+    m_frameStatusBar->PopStatusText(number);
+}
+
+bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
+{
+#if wxUSE_MENUS
+    // if no help string found, we will clear the status bar text
+    wxString helpString;
+    bool show = menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */;
+
+    if ( show )
+    {
+        wxMenuBar *menuBar = GetMenuBar();
+        if ( menuBar )
+        {
+            // it's ok if we don't find the item because it might belong
+            // to the popup menu
+            wxMenuItem *item = menuBar->FindItem(menuId);
+            if ( item )
+                helpString = item->GetHelp();
+        }
+    }
+
+    DoGiveHelp(helpString, show);
+
+    return !helpString.empty();
+#else // !wxUSE_MENUS
+    return false;
+#endif // wxUSE_MENUS/!wxUSE_MENUS
+}
+
+void wxFrameBase::SetStatusBar(wxStatusBar *statBar)
+{
+    bool hadBar = m_frameStatusBar != NULL;
+    m_frameStatusBar = statBar;
+
+    if ( (m_frameStatusBar != NULL) != hadBar )
+    {
+        PositionStatusBar();
+
+        DoLayout();
+    }
+}
+
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_MENUS || wxUSE_TOOLBAR
+void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
+{
+#if wxUSE_STATUSBAR
+    if ( m_statusBarPane < 0 )
+    {
+        // status bar messages disabled
+        return;
+    }
+
+    wxStatusBar *statbar = GetStatusBar();
+    if ( !statbar )
+        return;
+
+    wxString help;
+    if ( show )
+    {
+        help = text;
+
+        // remember the old status bar text if this is the first time we're
+        // called since the menu has been opened as we're going to overwrite it
+        // in our DoGiveHelp() and we want to restore it when the menu is
+        // closed
+        //
+        // note that it would be logical to do this in OnMenuOpen() but under
+        // MSW we get an EVT_MENU_HIGHLIGHT before EVT_MENU_OPEN, strangely
+        // enough, and so this doesn't work and instead we use the ugly trick
+        // with using special m_oldStatusText value as "menu opened" (but it is
+        // arguably better than adding yet another member variable to wxFrame
+        // on all platforms)
+        if ( m_oldStatusText.empty() )
+        {
+            m_oldStatusText = statbar->GetStatusText(m_statusBarPane);
+            if ( m_oldStatusText.empty() )
+            {
+                // use special value to prevent us from doing this the next time
+                m_oldStatusText += _T('\0');
+            }
+        }
+    }
+    else // hide the status bar text
+    {
+        // i.e. restore the old one
+        help = m_oldStatusText;
+
+        // make sure we get the up to date text when showing it the next time
+        m_oldStatusText.clear();
+    }
+
+    statbar->SetStatusText(help, m_statusBarPane);
+#else
+    wxUnusedVar(text);
+    wxUnusedVar(show);
+#endif // wxUSE_STATUSBAR
+}
+#endif // wxUSE_MENUS || wxUSE_TOOLBAR
+
+
+// ----------------------------------------------------------------------------
+// toolbar stuff
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLBAR
+
+wxToolBar* wxFrameBase::CreateToolBar(long style,
+                                      wxWindowID id,
+                                      const wxString& name)
+{
+    // the main toolbar can't be recreated (unless it was explicitly deleted
+    // before)
+    wxCHECK_MSG( !m_frameToolBar, (wxToolBar *)NULL,
+                 wxT("recreating toolbar in wxFrame") );
+
+    if ( style == -1 )
+    {
+        // use default style
+        //
+        // NB: we don't specify the default value in the method declaration
+        //     because
+        //      a) this allows us to have different defaults for different
+        //         platforms (even if we don't have them right now)
+        //      b) we don't need to include wx/toolbar.h in the header then
+        style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT;
+    }
+
+    SetToolBar(OnCreateToolBar(style, id, name));
+
+    return m_frameToolBar;
+}
+
+wxToolBar* wxFrameBase::OnCreateToolBar(long style,
+                                        wxWindowID id,
+                                        const wxString& name)
+{
+#if defined(__WXWINCE__) && defined(__POCKETPC__)
+    return new wxToolMenuBar(this, id,
+                         wxDefaultPosition, wxDefaultSize,
+                         style, name);
+#else
+    return new wxToolBar(this, id,
+                         wxDefaultPosition, wxDefaultSize,
+                         style, name);
+#endif
+}
+
+void wxFrameBase::SetToolBar(wxToolBar *toolbar)
+{
+    bool hadBar = m_frameToolBar != NULL;
+    m_frameToolBar = toolbar;
+
+    if ( (m_frameToolBar != NULL) != hadBar )
+    {
+        PositionToolBar();
+
+        DoLayout();
+    }
+}
+
+#endif // wxUSE_TOOLBAR
+
+// ----------------------------------------------------------------------------
+// menus
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS
+
+// update all menus
+void wxFrameBase::DoMenuUpdates(wxMenu* menu)
+{
+    if (menu)
+    {
+        wxEvtHandler* source = GetEventHandler();
+        menu->UpdateUI(source);
+    }
+    else
+    {
+        wxMenuBar* bar = GetMenuBar();
+        if (bar != NULL)
+            bar->UpdateMenus();
+    }
+}
+
+void wxFrameBase::DetachMenuBar()
+{
+    if ( m_frameMenuBar )
+    {
+        m_frameMenuBar->Detach();
+        m_frameMenuBar = NULL;
+    }
+}
+
+void wxFrameBase::AttachMenuBar(wxMenuBar *menubar)
+{
+    if ( menubar )
+    {
+        menubar->Attach((wxFrame *)this);
+        m_frameMenuBar = menubar;
+    }
+}
+
+void wxFrameBase::SetMenuBar(wxMenuBar *menubar)
+{
+    if ( menubar == GetMenuBar() )
+    {
+        // nothing to do
+        return;
+    }
+
+    DetachMenuBar();
+
+    this->AttachMenuBar(menubar);
+}
+
+#endif // wxUSE_MENUS
diff --git a/Source/3rd Party/wx/src/common/fs_arc.cpp b/Source/3rd Party/wx/src/common/fs_arc.cpp
index 4941ad98c..ee1220cfc 100644
--- a/Source/3rd Party/wx/src/common/fs_arc.cpp	
+++ b/Source/3rd Party/wx/src/common/fs_arc.cpp	
@@ -1,534 +1,533 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fs_arc.cpp
-// Purpose:     wxArchive file system
-// Author:      Vaclav Slavik, Mike Wetherell
-// Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell
-// CVS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if wxUSE_FS_ARCHIVE
-
-#include "wx/fs_arc.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif
-
-#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM
-    #include "wx/zipstrm.h"
-#else
-    #include "wx/archive.h"
-#endif
-
-#include "wx/private/fileback.h"
-
-//---------------------------------------------------------------------------
-// wxArchiveFSCacheDataImpl
-//
-// Holds the catalog of an archive file, and if it is being read from a
-// non-seekable stream, a copy of its backing file.
-//
-// This class is actually the reference counted implementation for the
-// wxArchiveFSCacheData class below. It was done that way to allow sharing
-// between instances of wxFileSystem, though that's a feature not used in this
-// version.
-//---------------------------------------------------------------------------
-
-WX_DECLARE_STRING_HASH_MAP(wxArchiveEntry*, wxArchiveFSEntryHash);
-
-struct wxArchiveFSEntry
-{
-    wxArchiveEntry *entry;
-    wxArchiveFSEntry *next;
-};
-
-class wxArchiveFSCacheDataImpl
-{
-public:
-    wxArchiveFSCacheDataImpl(const wxArchiveClassFactory& factory,
-                             const wxBackingFile& backer);
-    wxArchiveFSCacheDataImpl(const wxArchiveClassFactory& factory,
-                             wxInputStream *stream);
-
-    ~wxArchiveFSCacheDataImpl();
-
-    void Release() { if (--m_refcount == 0) delete this; }
-    wxArchiveFSCacheDataImpl *AddRef() { m_refcount++; return this; }
-
-    wxArchiveEntry *Get(const wxString& name);
-    wxInputStream *NewStream() const;
-
-    wxArchiveFSEntry *GetNext(wxArchiveFSEntry *fse);
-
-private:
-    wxArchiveFSEntry *AddToCache(wxArchiveEntry *entry);
-    void CloseStreams();
-
-    int m_refcount;
-
-    wxArchiveFSEntryHash m_hash;
-    wxArchiveFSEntry *m_begin;
-    wxArchiveFSEntry **m_endptr;
-
-    wxBackingFile m_backer;
-    wxInputStream *m_stream;
-    wxArchiveInputStream *m_archive;
-};
-
-wxArchiveFSCacheDataImpl::wxArchiveFSCacheDataImpl(
-        const wxArchiveClassFactory& factory,
-        const wxBackingFile& backer)
- :  m_refcount(1),
-    m_begin(NULL),
-    m_endptr(&m_begin),
-    m_backer(backer),
-    m_stream(new wxBackedInputStream(backer)),
-    m_archive(factory.NewStream(*m_stream))
-{
-}
-
-wxArchiveFSCacheDataImpl::wxArchiveFSCacheDataImpl(
-        const wxArchiveClassFactory& factory,
-        wxInputStream *stream)
- :  m_refcount(1),
-    m_begin(NULL),
-    m_endptr(&m_begin),
-    m_stream(stream),
-    m_archive(factory.NewStream(*m_stream))
-{
-}
-
-wxArchiveFSCacheDataImpl::~wxArchiveFSCacheDataImpl()
-{
-    WX_CLEAR_HASH_MAP(wxArchiveFSEntryHash, m_hash);
-
-    wxArchiveFSEntry *entry = m_begin;
-
-    while (entry)
-    {
-        wxArchiveFSEntry *next = entry->next;
-        delete entry;
-        entry = next;
-    }
-
-    CloseStreams();
-}
-
-wxArchiveFSEntry *wxArchiveFSCacheDataImpl::AddToCache(wxArchiveEntry *entry)
-{
-    m_hash[entry->GetName(wxPATH_UNIX)] = entry;
-    wxArchiveFSEntry *fse = new wxArchiveFSEntry;
-    *m_endptr = fse;
-    (*m_endptr)->entry = entry;
-    (*m_endptr)->next = NULL;
-    m_endptr = &(*m_endptr)->next;
-    return fse;
-}
-
-void wxArchiveFSCacheDataImpl::CloseStreams()
-{
-    wxDELETE(m_archive);
-    wxDELETE(m_stream);
-}
-
-wxArchiveEntry *wxArchiveFSCacheDataImpl::Get(const wxString& name)
-{
-    wxArchiveFSEntryHash::iterator it = m_hash.find(name);
-
-    if (it != m_hash.end())
-        return it->second;
-
-    if (!m_archive)
-        return NULL;
-
-    wxArchiveEntry *entry;
-
-    while ((entry = m_archive->GetNextEntry()) != NULL)
-    {
-        AddToCache(entry);
-
-        if (entry->GetName(wxPATH_UNIX) == name)
-            return entry;
-    }
-
-    CloseStreams();
-
-    return NULL;
-}
-
-wxInputStream* wxArchiveFSCacheDataImpl::NewStream() const
-{
-    if (m_backer)
-        return new wxBackedInputStream(m_backer);
-    else
-        return NULL;
-}
-
-wxArchiveFSEntry *wxArchiveFSCacheDataImpl::GetNext(wxArchiveFSEntry *fse)
-{
-    wxArchiveFSEntry *next = fse ? fse->next : m_begin;
-
-    if (!next && m_archive)
-    {
-        wxArchiveEntry *entry = m_archive->GetNextEntry();
-
-        if (entry)
-            next = AddToCache(entry);
-        else
-            CloseStreams();
-    }
-
-    return next;
-}
-
-//---------------------------------------------------------------------------
-// wxArchiveFSCacheData
-//
-// This is the inteface for wxArchiveFSCacheDataImpl above. Holds the catalog
-// of an archive file, and if it is being read from a non-seekable stream, a
-// copy of its backing file.
-//---------------------------------------------------------------------------
-
-class wxArchiveFSCacheData
-{
-public:
-    wxArchiveFSCacheData() : m_impl(NULL) { }
-    wxArchiveFSCacheData(const wxArchiveClassFactory& factory,
-                         const wxBackingFile& backer);
-    wxArchiveFSCacheData(const wxArchiveClassFactory& factory,
-                         wxInputStream *stream);
-
-    wxArchiveFSCacheData(const wxArchiveFSCacheData& data);
-    wxArchiveFSCacheData& operator=(const wxArchiveFSCacheData& data);
-
-    ~wxArchiveFSCacheData() { if (m_impl) m_impl->Release(); }
-
-    wxArchiveEntry *Get(const wxString& name) { return m_impl->Get(name); }
-    wxInputStream *NewStream() const { return m_impl->NewStream(); }
-    wxArchiveFSEntry *GetNext(wxArchiveFSEntry *fse)
-        { return m_impl->GetNext(fse); }
-
-private:
-    wxArchiveFSCacheDataImpl *m_impl;
-};
-
-wxArchiveFSCacheData::wxArchiveFSCacheData(
-        const wxArchiveClassFactory& factory,
-        const wxBackingFile& backer)
-  : m_impl(new wxArchiveFSCacheDataImpl(factory, backer))
-{
-}
-
-wxArchiveFSCacheData::wxArchiveFSCacheData(
-        const wxArchiveClassFactory& factory,
-        wxInputStream *stream)
-  : m_impl(new wxArchiveFSCacheDataImpl(factory, stream))
-{
-}
-
-wxArchiveFSCacheData::wxArchiveFSCacheData(const wxArchiveFSCacheData& data)
-  : m_impl(data.m_impl ? data.m_impl->AddRef() : NULL)
-{
-}
-
-wxArchiveFSCacheData& wxArchiveFSCacheData::operator=(
-        const wxArchiveFSCacheData& data)
-{
-    if (data.m_impl != m_impl)
-    {
-        if (m_impl)
-            m_impl->Release();
-
-        m_impl = data.m_impl;
-
-        if (m_impl)
-            m_impl->AddRef();
-    }
-
-    return *this;
-}
-
-//---------------------------------------------------------------------------
-// wxArchiveFSCache
-//
-// wxArchiveFSCacheData caches a single archive, and this class holds a
-// collection of them to cache all the archives accessed by this instance
-// of wxFileSystem.
-//---------------------------------------------------------------------------
-
-WX_DECLARE_STRING_HASH_MAP(wxArchiveFSCacheData, wxArchiveFSCacheDataHash);
-
-class wxArchiveFSCache
-{
-public:
-    wxArchiveFSCache() { }
-    ~wxArchiveFSCache() { }
-
-    wxArchiveFSCacheData* Add(const wxString& name,
-                              const wxArchiveClassFactory& factory,
-                              wxInputStream *stream);
-
-    wxArchiveFSCacheData *Get(const wxString& name);
-
-private:
-    wxArchiveFSCacheDataHash m_hash;
-};
-
-wxArchiveFSCacheData* wxArchiveFSCache::Add(
-        const wxString& name,
-        const wxArchiveClassFactory& factory,
-        wxInputStream *stream)
-{
-    wxArchiveFSCacheData& data = m_hash[name];
-
-    if (stream->IsSeekable())
-        data = wxArchiveFSCacheData(factory, stream);
-    else
-        data = wxArchiveFSCacheData(factory, wxBackingFile(stream));
-
-    return &data;
-}
-
-wxArchiveFSCacheData *wxArchiveFSCache::Get(const wxString& name)
-{
-    wxArchiveFSCacheDataHash::iterator it;
-
-    if ((it = m_hash.find(name)) != m_hash.end())
-        return &it->second;
-
-    return NULL;
-}
-
-//----------------------------------------------------------------------------
-// wxArchiveFSHandler
-//----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxArchiveFSHandler, wxFileSystemHandler)
-
-wxArchiveFSHandler::wxArchiveFSHandler()
- :  wxFileSystemHandler()
-{
-    m_Archive = NULL;
-    m_FindEntry = NULL;
-    m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;
-    m_AllowDirs = m_AllowFiles = true;
-    m_DirsFound = NULL;
-    m_cache = NULL;
-}
-
-wxArchiveFSHandler::~wxArchiveFSHandler()
-{
-    Cleanup();
-    delete m_cache;
-}
-
-void wxArchiveFSHandler::Cleanup()
-{
-    wxDELETE(m_DirsFound);
-}
-
-bool wxArchiveFSHandler::CanOpen(const wxString& location)
-{
-    wxString p = GetProtocol(location);
-    return wxArchiveClassFactory::Find(p) != NULL;
-}
-
-wxFSFile* wxArchiveFSHandler::OpenFile(
-        wxFileSystem& WXUNUSED(fs),
-        const wxString& location)
-{
-    wxString right = GetRightLocation(location);
-    wxString left = GetLeftLocation(location);
-    wxString protocol = GetProtocol(location);
-    wxString key = left + wxT("#") + protocol + wxT(":");
-
-    if (right.Contains(wxT("./")))
-    {
-        if (right.GetChar(0) != wxT('/')) right = wxT('/') + right;
-        wxFileName rightPart(right, wxPATH_UNIX);
-        rightPart.Normalize(wxPATH_NORM_DOTS, wxT("/"), wxPATH_UNIX);
-        right = rightPart.GetFullPath(wxPATH_UNIX);
-    }
-
-    if (!right.empty() && right.GetChar(0) == wxT('/')) right = right.Mid(1);
-
-    if (!m_cache)
-        m_cache = new wxArchiveFSCache;
-
-    const wxArchiveClassFactory *factory;
-    factory = wxArchiveClassFactory::Find(protocol);
-    if (!factory)
-        return NULL;
-
-    wxArchiveFSCacheData *cached = m_cache->Get(key);
-    if (!cached)
-    {
-        wxFSFile *leftFile = m_fs.OpenFile(left);
-        if (!leftFile)
-            return NULL;
-        cached = m_cache->Add(key, *factory, leftFile->DetachStream());
-        delete leftFile;
-    }
-
-    wxArchiveEntry *entry = cached->Get(right);
-    if (!entry)
-        return NULL;
-
-    wxInputStream *leftStream = cached->NewStream();
-    if (!leftStream)
-    {
-        wxFSFile *leftFile = m_fs.OpenFile(left);
-        if (!leftFile)
-            return NULL;
-        leftStream = leftFile->DetachStream();
-        delete leftFile;
-    }
-
-    wxArchiveInputStream *s = factory->NewStream(leftStream);
-    if ( !s )
-        return NULL;
-
-    s->OpenEntry(*entry);
-
-    if (!s->IsOk())
-    {
-        delete s;
-        return NULL;
-    }
-
-#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM
-    if (wxDynamicCast(factory, wxZipClassFactory))
-        ((wxZipInputStream*)s)->m_allowSeeking = true;
-#endif // WXWIN_COMPATIBILITY_2_6
-
-    return new wxFSFile(s,
-                        key + right,
-                        wxEmptyString,
-                        GetAnchor(location)
-#if wxUSE_DATETIME
-                        , entry->GetDateTime()
-#endif // wxUSE_DATETIME
-                        );
-}
-
-wxString wxArchiveFSHandler::FindFirst(const wxString& spec, int flags)
-{
-    wxString right = GetRightLocation(spec);
-    wxString left = GetLeftLocation(spec);
-    wxString protocol = GetProtocol(spec);
-    wxString key = left + wxT("#") + protocol + wxT(":");
-
-    if (!right.empty() && right.Last() == wxT('/')) right.RemoveLast();
-
-    if (!m_cache)
-        m_cache = new wxArchiveFSCache;
-
-    const wxArchiveClassFactory *factory;
-    factory = wxArchiveClassFactory::Find(protocol);
-    if (!factory)
-        return wxEmptyString;
-
-    m_Archive = m_cache->Get(key);
-    if (!m_Archive)
-    {
-        wxFSFile *leftFile = m_fs.OpenFile(left);
-        if (!leftFile)
-            return wxEmptyString;
-        m_Archive = m_cache->Add(key, *factory, leftFile->DetachStream());
-        delete leftFile;
-    }
-
-    m_FindEntry = NULL;
-
-    switch (flags)
-    {
-        case wxFILE:
-            m_AllowDirs = false, m_AllowFiles = true; break;
-        case wxDIR:
-            m_AllowDirs = true, m_AllowFiles = false; break;
-        default:
-            m_AllowDirs = m_AllowFiles = true; break;
-    }
-
-    m_ZipFile = key;
-
-    m_Pattern = right.AfterLast(wxT('/'));
-    m_BaseDir = right.BeforeLast(wxT('/'));
-    if (m_BaseDir.StartsWith(wxT("/")))
-        m_BaseDir = m_BaseDir.Mid(1);
-
-    if (m_Archive)
-    {
-        if (m_AllowDirs)
-        {
-            delete m_DirsFound;
-            m_DirsFound = new wxArchiveFilenameHashMap();
-            if (right.empty())  // allow "/" to match the archive root
-                return spec;
-        }
-        return DoFind();
-    }
-    return wxEmptyString;
-}
-
-wxString wxArchiveFSHandler::FindNext()
-{
-    if (!m_Archive) return wxEmptyString;
-    return DoFind();
-}
-
-wxString wxArchiveFSHandler::DoFind()
-{
-    wxString namestr, dir, filename;
-    wxString match = wxEmptyString;
-
-    while (match == wxEmptyString)
-    {
-        m_FindEntry = m_Archive->GetNext(m_FindEntry);
-
-        if (!m_FindEntry)
-        {
-            m_Archive = NULL;
-            m_FindEntry = NULL;
-            break;
-        }
-        namestr = m_FindEntry->entry->GetName(wxPATH_UNIX);
-
-        if (m_AllowDirs)
-        {
-            dir = namestr.BeforeLast(wxT('/'));
-            while (!dir.empty())
-            {
-                if( m_DirsFound->find(dir) == m_DirsFound->end() )
-                {
-                    (*m_DirsFound)[dir] = 1;
-                    filename = dir.AfterLast(wxT('/'));
-                    dir = dir.BeforeLast(wxT('/'));
-                    if (!filename.empty() && m_BaseDir == dir &&
-                                wxMatchWild(m_Pattern, filename, false))
-                        match = m_ZipFile + dir + wxT("/") + filename;
-                }
-                else
-                    break; // already tranversed
-            }
-        }
-
-        filename = namestr.AfterLast(wxT('/'));
-        dir = namestr.BeforeLast(wxT('/'));
-        if (m_AllowFiles && !filename.empty() && m_BaseDir == dir &&
-                            wxMatchWild(m_Pattern, filename, false))
-            match = m_ZipFile + namestr;
-    }
-
-    return match;
-}
-
-#endif // wxUSE_FS_ARCHIVE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        fs_arc.cpp
+// Purpose:     wxArchive file system
+// Author:      Vaclav Slavik, Mike Wetherell
+// Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell
+// CVS-ID:      $Id: fs_arc.cpp 51495 2008-02-01 16:44:56Z MW $
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#if wxUSE_FS_ARCHIVE
+
+#include "wx/fs_arc.h"
+
+#ifndef WXPRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM
+    #include "wx/zipstrm.h"
+#else
+    #include "wx/archive.h"
+#endif
+
+#include "wx/private/fileback.h"
+
+//---------------------------------------------------------------------------
+// wxArchiveFSCacheDataImpl
+//
+// Holds the catalog of an archive file, and if it is being read from a
+// non-seekable stream, a copy of its backing file.
+//
+// This class is actually the reference counted implementation for the
+// wxArchiveFSCacheData class below. It was done that way to allow sharing
+// between instances of wxFileSystem, though that's a feature not used in this
+// version.
+//---------------------------------------------------------------------------
+
+WX_DECLARE_STRING_HASH_MAP(wxArchiveEntry*, wxArchiveFSEntryHash);
+
+struct wxArchiveFSEntry
+{
+    wxArchiveEntry *entry;
+    wxArchiveFSEntry *next;
+};
+
+class wxArchiveFSCacheDataImpl
+{
+public:
+    wxArchiveFSCacheDataImpl(const wxArchiveClassFactory& factory,
+                             const wxBackingFile& backer);
+    wxArchiveFSCacheDataImpl(const wxArchiveClassFactory& factory,
+                             wxInputStream *stream);
+
+    ~wxArchiveFSCacheDataImpl();
+
+    void Release() { if (--m_refcount == 0) delete this; }
+    wxArchiveFSCacheDataImpl *AddRef() { m_refcount++; return this; }
+
+    wxArchiveEntry *Get(const wxString& name);
+    wxInputStream *NewStream() const;
+
+    wxArchiveFSEntry *GetNext(wxArchiveFSEntry *fse);
+
+private:
+    wxArchiveFSEntry *AddToCache(wxArchiveEntry *entry);
+    void CloseStreams();
+
+    int m_refcount;
+
+    wxArchiveFSEntryHash m_hash;
+    wxArchiveFSEntry *m_begin;
+    wxArchiveFSEntry **m_endptr;
+
+    wxBackingFile m_backer;
+    wxInputStream *m_stream;
+    wxArchiveInputStream *m_archive;
+};
+
+wxArchiveFSCacheDataImpl::wxArchiveFSCacheDataImpl(
+        const wxArchiveClassFactory& factory,
+        const wxBackingFile& backer)
+ :  m_refcount(1),
+    m_begin(NULL),
+    m_endptr(&m_begin),
+    m_backer(backer),
+    m_stream(new wxBackedInputStream(backer)),
+    m_archive(factory.NewStream(*m_stream))
+{
+}
+
+wxArchiveFSCacheDataImpl::wxArchiveFSCacheDataImpl(
+        const wxArchiveClassFactory& factory,
+        wxInputStream *stream)
+ :  m_refcount(1),
+    m_begin(NULL),
+    m_endptr(&m_begin),
+    m_stream(stream),
+    m_archive(factory.NewStream(*m_stream))
+{
+}
+
+wxArchiveFSCacheDataImpl::~wxArchiveFSCacheDataImpl()
+{
+    WX_CLEAR_HASH_MAP(wxArchiveFSEntryHash, m_hash);
+
+    wxArchiveFSEntry *entry = m_begin;
+
+    while (entry)
+    {
+        wxArchiveFSEntry *next = entry->next;
+        delete entry;
+        entry = next;
+    }
+
+    CloseStreams();
+}
+
+wxArchiveFSEntry *wxArchiveFSCacheDataImpl::AddToCache(wxArchiveEntry *entry)
+{
+    m_hash[entry->GetName(wxPATH_UNIX)] = entry;
+    wxArchiveFSEntry *fse = new wxArchiveFSEntry;
+    *m_endptr = fse;
+    (*m_endptr)->entry = entry;
+    (*m_endptr)->next = NULL;
+    m_endptr = &(*m_endptr)->next;
+    return fse;
+}
+
+void wxArchiveFSCacheDataImpl::CloseStreams()
+{
+    delete m_archive;
+    m_archive = NULL;
+    delete m_stream;
+    m_stream = NULL;
+}
+
+wxArchiveEntry *wxArchiveFSCacheDataImpl::Get(const wxString& name)
+{
+    wxArchiveFSEntryHash::iterator it = m_hash.find(name);
+
+    if (it != m_hash.end())
+        return it->second;
+
+    if (!m_archive)
+        return NULL;
+
+    wxArchiveEntry *entry;
+
+    while ((entry = m_archive->GetNextEntry()) != NULL)
+    {
+        AddToCache(entry);
+
+        if (entry->GetName(wxPATH_UNIX) == name)
+            return entry;
+    }
+
+    CloseStreams();
+
+    return NULL;
+}
+
+wxInputStream* wxArchiveFSCacheDataImpl::NewStream() const
+{
+    if (m_backer)
+        return new wxBackedInputStream(m_backer);
+    else
+        return NULL;
+}
+
+wxArchiveFSEntry *wxArchiveFSCacheDataImpl::GetNext(wxArchiveFSEntry *fse)
+{
+    wxArchiveFSEntry *next = fse ? fse->next : m_begin;
+
+    if (!next && m_archive)
+    {
+        wxArchiveEntry *entry = m_archive->GetNextEntry();
+
+        if (entry)
+            next = AddToCache(entry);
+        else
+            CloseStreams();
+    }
+
+    return next;
+}
+
+//---------------------------------------------------------------------------
+// wxArchiveFSCacheData
+//
+// This is the inteface for wxArchiveFSCacheDataImpl above. Holds the catalog
+// of an archive file, and if it is being read from a non-seekable stream, a
+// copy of its backing file.
+//---------------------------------------------------------------------------
+
+class wxArchiveFSCacheData
+{
+public:
+    wxArchiveFSCacheData() : m_impl(NULL) { }
+    wxArchiveFSCacheData(const wxArchiveClassFactory& factory,
+                         const wxBackingFile& backer);
+    wxArchiveFSCacheData(const wxArchiveClassFactory& factory,
+                         wxInputStream *stream);
+
+    wxArchiveFSCacheData(const wxArchiveFSCacheData& data);
+    wxArchiveFSCacheData& operator=(const wxArchiveFSCacheData& data);
+
+    ~wxArchiveFSCacheData() { if (m_impl) m_impl->Release(); }
+
+    wxArchiveEntry *Get(const wxString& name) { return m_impl->Get(name); }
+    wxInputStream *NewStream() const { return m_impl->NewStream(); }
+    wxArchiveFSEntry *GetNext(wxArchiveFSEntry *fse)
+        { return m_impl->GetNext(fse); }
+
+private:
+    wxArchiveFSCacheDataImpl *m_impl;
+};
+
+wxArchiveFSCacheData::wxArchiveFSCacheData(
+        const wxArchiveClassFactory& factory,
+        const wxBackingFile& backer)
+  : m_impl(new wxArchiveFSCacheDataImpl(factory, backer))
+{
+}
+
+wxArchiveFSCacheData::wxArchiveFSCacheData(
+        const wxArchiveClassFactory& factory,
+        wxInputStream *stream)
+  : m_impl(new wxArchiveFSCacheDataImpl(factory, stream))
+{
+}
+
+wxArchiveFSCacheData::wxArchiveFSCacheData(const wxArchiveFSCacheData& data)
+  : m_impl(data.m_impl ? data.m_impl->AddRef() : NULL)
+{
+}
+
+wxArchiveFSCacheData& wxArchiveFSCacheData::operator=(
+        const wxArchiveFSCacheData& data)
+{
+    if (data.m_impl != m_impl)
+    {
+        if (m_impl)
+            m_impl->Release();
+
+        m_impl = data.m_impl;
+
+        if (m_impl)
+            m_impl->AddRef();
+    }
+
+    return *this;
+}
+
+//---------------------------------------------------------------------------
+// wxArchiveFSCache
+//
+// wxArchiveFSCacheData caches a single archive, and this class holds a
+// collection of them to cache all the archives accessed by this instance
+// of wxFileSystem.
+//---------------------------------------------------------------------------
+
+WX_DECLARE_STRING_HASH_MAP(wxArchiveFSCacheData, wxArchiveFSCacheDataHash);
+
+class wxArchiveFSCache
+{
+public:
+    wxArchiveFSCache() { }
+    ~wxArchiveFSCache() { }
+
+    wxArchiveFSCacheData* Add(const wxString& name,
+                              const wxArchiveClassFactory& factory,
+                              wxInputStream *stream);
+
+    wxArchiveFSCacheData *Get(const wxString& name);
+
+private:
+    wxArchiveFSCacheDataHash m_hash;
+};
+
+wxArchiveFSCacheData* wxArchiveFSCache::Add(
+        const wxString& name,
+        const wxArchiveClassFactory& factory,
+        wxInputStream *stream)
+{
+    wxArchiveFSCacheData& data = m_hash[name];
+
+    if (stream->IsSeekable())
+        data = wxArchiveFSCacheData(factory, stream);
+    else
+        data = wxArchiveFSCacheData(factory, wxBackingFile(stream));
+
+    return &data;
+}
+
+wxArchiveFSCacheData *wxArchiveFSCache::Get(const wxString& name)
+{
+    wxArchiveFSCacheDataHash::iterator it;
+
+    if ((it = m_hash.find(name)) != m_hash.end())
+        return &it->second;
+
+    return NULL;
+}
+
+//----------------------------------------------------------------------------
+// wxArchiveFSHandler
+//----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxArchiveFSHandler, wxFileSystemHandler)
+
+wxArchiveFSHandler::wxArchiveFSHandler()
+ :  wxFileSystemHandler()
+{
+    m_Archive = NULL;
+    m_FindEntry = NULL;
+    m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString;
+    m_AllowDirs = m_AllowFiles = true;
+    m_DirsFound = NULL;
+    m_cache = NULL;
+}
+
+wxArchiveFSHandler::~wxArchiveFSHandler()
+{
+    Cleanup();
+    delete m_cache;
+}
+
+void wxArchiveFSHandler::Cleanup()
+{
+    wxDELETE(m_DirsFound);
+}
+
+bool wxArchiveFSHandler::CanOpen(const wxString& location)
+{
+    wxString p = GetProtocol(location);
+    return wxArchiveClassFactory::Find(p) != NULL;
+}
+
+wxFSFile* wxArchiveFSHandler::OpenFile(
+        wxFileSystem& WXUNUSED(fs),
+        const wxString& location)
+{
+    wxString right = GetRightLocation(location);
+    wxString left = GetLeftLocation(location);
+    wxString protocol = GetProtocol(location);
+    wxString key = left + wxT("#") + protocol + wxT(":");
+
+    if (right.Contains(wxT("./")))
+    {
+        if (right.GetChar(0) != wxT('/')) right = wxT('/') + right;
+        wxFileName rightPart(right, wxPATH_UNIX);
+        rightPart.Normalize(wxPATH_NORM_DOTS, wxT("/"), wxPATH_UNIX);
+        right = rightPart.GetFullPath(wxPATH_UNIX);
+    }
+
+    if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
+
+    if (!m_cache)
+        m_cache = new wxArchiveFSCache;
+
+    const wxArchiveClassFactory *factory;
+    factory = wxArchiveClassFactory::Find(protocol);
+    if (!factory)
+        return NULL;
+
+    wxArchiveFSCacheData *cached = m_cache->Get(key);
+    if (!cached)
+    {
+        wxFSFile *leftFile = m_fs.OpenFile(left);
+        if (!leftFile)
+            return NULL;
+        cached = m_cache->Add(key, *factory, leftFile->DetachStream());
+        delete leftFile;
+    }
+
+    wxArchiveEntry *entry = cached->Get(right);
+    if (!entry)
+        return NULL;
+
+    wxInputStream *leftStream = cached->NewStream();
+    if (!leftStream)
+    {
+        wxFSFile *leftFile = m_fs.OpenFile(left);
+        if (!leftFile)
+            return NULL;
+        leftStream = leftFile->DetachStream();
+        delete leftFile;
+    }
+
+    wxArchiveInputStream *s = factory->NewStream(leftStream);
+    s->OpenEntry(*entry);
+
+    if (s && s->IsOk())
+    {
+#if WXWIN_COMPATIBILITY_2_6 && wxUSE_ZIPSTREAM
+        if (factory->IsKindOf(CLASSINFO(wxZipClassFactory)))
+            ((wxZipInputStream*)s)->m_allowSeeking = true;
+#endif // WXWIN_COMPATIBILITY_2_6
+
+        return new wxFSFile(s,
+                            key + right,
+                            GetMimeTypeFromExt(location),
+                            GetAnchor(location)
+#if wxUSE_DATETIME
+                            , entry->GetDateTime()
+#endif // wxUSE_DATETIME
+                            );
+    }
+
+    delete s;
+    return NULL;
+}
+
+wxString wxArchiveFSHandler::FindFirst(const wxString& spec, int flags)
+{
+    wxString right = GetRightLocation(spec);
+    wxString left = GetLeftLocation(spec);
+    wxString protocol = GetProtocol(spec);
+    wxString key = left + wxT("#") + protocol + wxT(":");
+
+    if (!right.empty() && right.Last() == wxT('/')) right.RemoveLast();
+
+    if (!m_cache)
+        m_cache = new wxArchiveFSCache;
+
+    const wxArchiveClassFactory *factory;
+    factory = wxArchiveClassFactory::Find(protocol);
+    if (!factory)
+        return wxEmptyString;
+
+    m_Archive = m_cache->Get(key);
+    if (!m_Archive)
+    {
+        wxFSFile *leftFile = m_fs.OpenFile(left);
+        if (!leftFile)
+            return wxEmptyString;
+        m_Archive = m_cache->Add(key, *factory, leftFile->DetachStream());
+        delete leftFile;
+    }
+
+    m_FindEntry = NULL;
+
+    switch (flags)
+    {
+        case wxFILE:
+            m_AllowDirs = false, m_AllowFiles = true; break;
+        case wxDIR:
+            m_AllowDirs = true, m_AllowFiles = false; break;
+        default:
+            m_AllowDirs = m_AllowFiles = true; break;
+    }
+
+    m_ZipFile = key;
+
+    m_Pattern = right.AfterLast(wxT('/'));
+    m_BaseDir = right.BeforeLast(wxT('/'));
+    if (m_BaseDir.StartsWith(wxT("/")))
+        m_BaseDir = m_BaseDir.Mid(1);
+
+    if (m_Archive)
+    {
+        if (m_AllowDirs)
+        {
+            delete m_DirsFound;
+            m_DirsFound = new wxArchiveFilenameHashMap();
+            if (right.empty())  // allow "/" to match the archive root
+                return spec;
+        }
+        return DoFind();
+    }
+    return wxEmptyString;
+}
+
+wxString wxArchiveFSHandler::FindNext()
+{
+    if (!m_Archive) return wxEmptyString;
+    return DoFind();
+}
+
+wxString wxArchiveFSHandler::DoFind()
+{
+    wxString namestr, dir, filename;
+    wxString match = wxEmptyString;
+
+    while (match == wxEmptyString)
+    {
+        m_FindEntry = m_Archive->GetNext(m_FindEntry);
+
+        if (!m_FindEntry)
+        {
+            m_Archive = NULL;
+            m_FindEntry = NULL;
+            break;
+        }
+        namestr = m_FindEntry->entry->GetName(wxPATH_UNIX);
+
+        if (m_AllowDirs)
+        {
+            dir = namestr.BeforeLast(wxT('/'));
+            while (!dir.empty())
+            {
+                if( m_DirsFound->find(dir) == m_DirsFound->end() )
+                {
+                    (*m_DirsFound)[dir] = 1;
+                    filename = dir.AfterLast(wxT('/'));
+                    dir = dir.BeforeLast(wxT('/'));
+                    if (!filename.empty() && m_BaseDir == dir &&
+                                wxMatchWild(m_Pattern, filename, false))
+                        match = m_ZipFile + dir + wxT("/") + filename;
+                }
+                else
+                    break; // already tranversed
+            }
+        }
+
+        filename = namestr.AfterLast(wxT('/'));
+        dir = namestr.BeforeLast(wxT('/'));
+        if (m_AllowFiles && !filename.empty() && m_BaseDir == dir &&
+                            wxMatchWild(m_Pattern, filename, false))
+            match = m_ZipFile + namestr;
+    }
+
+    return match;
+}
+
+#endif // wxUSE_FS_ARCHIVE
diff --git a/Source/3rd Party/wx/src/common/fs_filter.cpp b/Source/3rd Party/wx/src/common/fs_filter.cpp
index b9064c661..d0fae32ba 100644
--- a/Source/3rd Party/wx/src/common/fs_filter.cpp	
+++ b/Source/3rd Party/wx/src/common/fs_filter.cpp	
@@ -1,92 +1,92 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fs_filter.cpp
-// Purpose:     wxFilter file system handler
-// Author:      Mike Wetherell
-// Copyright:   (c) 2006 Mike Wetherell
-// CVS-ID:      $Id$
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FILESYSTEM
-
-#include "wx/fs_filter.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-#include "wx/scopedptr.h"
-
-wxDEFINE_SCOPED_PTR_TYPE(wxFSFile)
-wxDEFINE_SCOPED_PTR_TYPE(wxInputStream)
-
-//----------------------------------------------------------------------------
-// wxFilterFSHandler
-//----------------------------------------------------------------------------
-
-bool wxFilterFSHandler::CanOpen(const wxString& location)
-{
-    return wxFilterClassFactory::Find(GetProtocol(location)) != NULL;
-}
-
-wxFSFile* wxFilterFSHandler::OpenFile(
-        wxFileSystem& fs,
-        const wxString& location)
-{
-    wxString right = GetRightLocation(location);
-    if (!right.empty())
-        return NULL;
-
-    wxString protocol = GetProtocol(location);
-    const wxFilterClassFactory *factory = wxFilterClassFactory::Find(protocol);
-    if (!factory)
-        return NULL;
-
-    wxString left = GetLeftLocation(location);
-    wxFSFilePtr leftFile(fs.OpenFile(left));
-    if (!leftFile.get())
-        return NULL;
-
-    wxInputStreamPtr leftStream(leftFile->DetachStream());
-    if (!leftStream.get() || !leftStream->IsOk())
-        return NULL;
-
-    wxInputStreamPtr stream(factory->NewStream(leftStream.release()));
-
-    // The way compressed streams are supposed to be served is e.g.:
-    //  Content-type: application/postscript
-    //  Content-encoding: gzip
-    // So the mime type should be just the mime type of the lhs. However check
-    // whether the mime type is that of this compression format (e.g.
-    // application/gzip). If so pop any extension and try GetMimeTypeFromExt,
-    // e.g. if it were '.ps.gz' pop the '.gz' and try looking up '.ps'
-    wxString mime = leftFile->GetMimeType();
-    if (factory->CanHandle(mime, wxSTREAM_MIMETYPE))
-        mime = GetMimeTypeFromExt(factory->PopExtension(left));
-
-    return new wxFSFile(stream.release(),
-                        left + wxT("#") + protocol + wxT(":") + right,
-                        mime,
-                        GetAnchor(location)
-#if wxUSE_DATETIME
-                        , leftFile->GetModificationTime()
-#endif // wxUSE_DATETIME
-                       );
-}
-
-wxString wxFilterFSHandler::FindFirst(const wxString& WXUNUSED(spec), int WXUNUSED(flags))
-{
-    return wxEmptyString;
-}
-
-wxString wxFilterFSHandler::FindNext()
-{
-    return wxEmptyString;
-}
-
-#endif //wxUSE_FILESYSTEM
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fs_filter.cpp
+// Purpose:     wxFilter file system handler
+// Author:      Mike Wetherell
+// Copyright:   (c) 2006 Mike Wetherell
+// CVS-ID:      $Id: fs_filter.cpp 42514 2006-10-27 10:47:13Z MW $
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FILESYSTEM
+
+#include "wx/fs_filter.h"
+
+#ifndef WXPRECOMP
+#endif
+
+#include "wx/ptr_scpd.h"
+
+wxDEFINE_SCOPED_PTR_TYPE(wxFSFile)
+wxDEFINE_SCOPED_PTR_TYPE(wxInputStream)
+
+//----------------------------------------------------------------------------
+// wxFilterFSHandler
+//----------------------------------------------------------------------------
+
+bool wxFilterFSHandler::CanOpen(const wxString& location)
+{
+    return wxFilterClassFactory::Find(GetProtocol(location)) != NULL;
+}
+
+wxFSFile* wxFilterFSHandler::OpenFile(
+        wxFileSystem& fs,
+        const wxString& location)
+{
+    wxString right = GetRightLocation(location);
+    if (!right.empty())
+        return NULL;
+
+    wxString protocol = GetProtocol(location);
+    const wxFilterClassFactory *factory = wxFilterClassFactory::Find(protocol);
+    if (!factory)
+        return NULL;
+
+    wxString left = GetLeftLocation(location);
+    wxFSFilePtr leftFile(fs.OpenFile(left));
+    if (!leftFile.get())
+        return NULL;
+
+    wxInputStreamPtr leftStream(leftFile->DetachStream());
+    if (!leftStream.get() || !leftStream->IsOk())
+        return NULL;
+
+    wxInputStreamPtr stream(factory->NewStream(leftStream.release()));
+
+    // The way compressed streams are supposed to be served is e.g.:
+    //  Content-type: application/postscript
+    //  Content-encoding: gzip
+    // So the mime type should be just the mime type of the lhs. However check
+    // whether the mime type is that of this compression format (e.g.
+    // application/gzip). If so pop any extension and try GetMimeTypeFromExt,
+    // e.g. if it were '.ps.gz' pop the '.gz' and try looking up '.ps'
+    wxString mime = leftFile->GetMimeType();
+    if (factory->CanHandle(mime, wxSTREAM_MIMETYPE))
+        mime = GetMimeTypeFromExt(factory->PopExtension(left));
+
+    return new wxFSFile(stream.release(),
+                        left + wxT("#") + protocol + wxT(":") + right,
+                        mime,
+                        GetAnchor(location)
+#if wxUSE_DATETIME
+                        , leftFile->GetModificationTime()
+#endif // wxUSE_DATETIME
+                       );
+}
+
+wxString wxFilterFSHandler::FindFirst(const wxString& WXUNUSED(spec), int WXUNUSED(flags))
+{
+    return wxEmptyString;
+}
+
+wxString wxFilterFSHandler::FindNext()
+{
+    return wxEmptyString;
+}
+
+#endif //wxUSE_FILESYSTEM
diff --git a/Source/3rd Party/wx/src/common/fs_mem.cpp b/Source/3rd Party/wx/src/common/fs_mem.cpp
index 22567d3d1..3bf24969e 100644
--- a/Source/3rd Party/wx/src/common/fs_mem.cpp	
+++ b/Source/3rd Party/wx/src/common/fs_mem.cpp	
@@ -1,280 +1,288 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fs_mem.cpp
-// Purpose:     in-memory file system
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FILESYSTEM && wxUSE_STREAMS
-
-#include "wx/fs_mem.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/wxcrtvararg.h"
-    #if wxUSE_GUI
-        #include "wx/image.h"
-    #endif // wxUSE_GUI
-#endif
-
-#include "wx/mstream.h"
-
-// represents a file entry in wxMemoryFS
-class wxMemoryFSFile
-{
-public:
-    wxMemoryFSFile(const void *data, size_t len, const wxString& mime)
-    {
-        m_Data = new char[len];
-        memcpy(m_Data, data, len);
-        m_Len = len;
-        m_MimeType = mime;
-        InitTime();
-    }
-
-    wxMemoryFSFile(const wxMemoryOutputStream& stream, const wxString& mime)
-    {
-        m_Len = stream.GetSize();
-        m_Data = new char[m_Len];
-        stream.CopyTo(m_Data, m_Len);
-        m_MimeType = mime;
-        InitTime();
-    }
-
-    virtual ~wxMemoryFSFile()
-    {
-        delete[] m_Data;
-    }
-
-    char *m_Data;
-    size_t m_Len;
-    wxString m_MimeType;
-#if wxUSE_DATETIME
-    wxDateTime m_Time;
-#endif // wxUSE_DATETIME
-
-private:
-    void InitTime()
-    {
-#if wxUSE_DATETIME
-        m_Time = wxDateTime::Now();
-#endif // wxUSE_DATETIME
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxMemoryFSFile);
-};
-
-#if wxUSE_BASE
-
-
-//--------------------------------------------------------------------------------
-// wxMemoryFSHandler
-//--------------------------------------------------------------------------------
-
-
-wxMemoryFSHash wxMemoryFSHandlerBase::m_Hash;
-
-
-wxMemoryFSHandlerBase::wxMemoryFSHandlerBase() : wxFileSystemHandler()
-{
-}
-
-wxMemoryFSHandlerBase::~wxMemoryFSHandlerBase()
-{
-    // as only one copy of FS handler is supposed to exist, we may silently
-    // delete static data here. (There is no way how to remove FS handler from
-    // wxFileSystem other than releasing _all_ handlers.)
-    WX_CLEAR_HASH_MAP(wxMemoryFSHash, m_Hash);
-}
-
-bool wxMemoryFSHandlerBase::CanOpen(const wxString& location)
-{
-    return GetProtocol(location) == "memory";
-}
-
-wxFSFile * wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs),
-                                           const wxString& location)
-{
-    wxMemoryFSHash::const_iterator i = m_Hash.find(GetRightLocation(location));
-    if ( i == m_Hash.end() )
-        return NULL;
-
-    const wxMemoryFSFile * const obj = i->second;
-
-    return new wxFSFile
-               (
-                    new wxMemoryInputStream(obj->m_Data, obj->m_Len),
-                    location,
-                    obj->m_MimeType,
-                    GetAnchor(location)
-#if wxUSE_DATETIME
-                    , obj->m_Time
-#endif // wxUSE_DATETIME
-               );
-}
-
-wxString wxMemoryFSHandlerBase::FindFirst(const wxString& url, int flags)
-{
-    if ( (flags & wxDIR) && !(flags & wxFILE) )
-    {
-        // we only store files, not directories, so we don't risk finding
-        // anything
-        return wxString();
-    }
-
-    const wxString spec = GetRightLocation(url);
-    if ( spec.find_first_of("?*") == wxString::npos )
-    {
-        // simple case: there are no wildcard characters so we can return
-        // either 0 or 1 results and we can find the potential match quickly
-        return m_Hash.count(spec) ? url : wxString();
-    }
-    //else: deal with wildcards in FindNext()
-
-    m_findArgument = spec;
-    m_findIter = m_Hash.begin();
-
-    return FindNext();
-}
-
-wxString wxMemoryFSHandlerBase::FindNext()
-{
-    // m_findArgument is used to indicate that search is in progress, we reset
-    // it to empty string after iterating over all elements
-    while ( !m_findArgument.empty() )
-    {
-        // test for the match before (possibly) clearing m_findArgument below
-        const bool found = m_findIter->first.Matches(m_findArgument);
-
-        // advance m_findIter first as we need to do it anyhow, whether it
-        // matches or not
-        const wxMemoryFSHash::const_iterator current = m_findIter;
-
-        if ( ++m_findIter == m_Hash.end() )
-            m_findArgument.clear();
-
-        if ( found )
-            return "memory:" + current->first;
-    }
-
-    return wxString();
-}
-
-bool wxMemoryFSHandlerBase::CheckDoesntExist(const wxString& filename)
-{
-    if ( m_Hash.count(filename) )
-    {
-        wxLogError(_("Memory VFS already contains file '%s'!"), filename);
-        return false;
-    }
-
-    return true;
-}
-
-
-/*static*/
-void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
-                                                const wxString& textdata,
-                                                const wxString& mimetype)
-{
-    const wxCharBuffer buf(textdata.To8BitData());
-
-    AddFileWithMimeType(filename, buf.data(), buf.length(), mimetype);
-}
-
-
-/*static*/
-void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
-                                                const void *binarydata, size_t size,
-                                                const wxString& mimetype)
-{
-    if ( !CheckDoesntExist(filename) )
-        return;
-
-    m_Hash[filename] = new wxMemoryFSFile(binarydata, size, mimetype);
-}
-
-/*static*/
-void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
-                                    const wxString& textdata)
-{
-    AddFileWithMimeType(filename, textdata, wxEmptyString);
-}
-
-
-/*static*/
-void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
-                                    const void *binarydata, size_t size)
-{
-    AddFileWithMimeType(filename, binarydata, size, wxEmptyString);
-}
-
-
-
-/*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename)
-{
-    wxMemoryFSHash::iterator i = m_Hash.find(filename);
-    if ( i == m_Hash.end() )
-    {
-        wxLogError(_("Trying to remove file '%s' from memory VFS, "
-                     "but it is not loaded!"),
-                   filename);
-        return;
-    }
-
-    delete i->second;
-    m_Hash.erase(i);
-}
-
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
-#if wxUSE_IMAGE
-/*static*/ void
-wxMemoryFSHandler::AddFile(const wxString& filename,
-                           const wxImage& image,
-                           wxBitmapType type)
-{
-    if ( !CheckDoesntExist(filename) )
-        return;
-
-    wxMemoryOutputStream mems;
-    if ( image.IsOk() && image.SaveFile(mems, type) )
-    {
-        m_Hash[filename] = new wxMemoryFSFile
-                               (
-                                    mems,
-                                    wxImage::FindHandler(type)->GetMimeType()
-                               );
-    }
-    else
-    {
-        wxLogError(_("Failed to store image '%s' to memory VFS!"), filename);
-    }
-}
-
-/*static*/ void
-wxMemoryFSHandler::AddFile(const wxString& filename,
-                           const wxBitmap& bitmap,
-                           wxBitmapType type)
-{
-    wxImage img = bitmap.ConvertToImage();
-    AddFile(filename, img, type);
-}
-
-#endif // wxUSE_IMAGE
-
-#endif // wxUSE_GUI
-
-
-#endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fs_mem.cpp
+// Purpose:     in-memory file system
+// Author:      Vaclav Slavik
+// RCS-ID:      $Id: fs_mem.cpp 46522 2007-06-18 18:37:40Z VS $
+// Copyright:   (c) 2000 Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_FILESYSTEM && wxUSE_STREAMS
+
+#include "wx/fs_mem.h"
+
+#ifndef WXPRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/hash.h"
+    #if wxUSE_GUI
+        #include "wx/bitmap.h"
+        #include "wx/image.h"
+    #endif // wxUSE_GUI
+#endif
+
+#include "wx/mstream.h"
+
+class MemFSHashObj : public wxObject
+{
+    public:
+
+        MemFSHashObj(const void *data, size_t len, const wxString& mime)
+        {
+            m_Data = new char[len];
+            memcpy(m_Data, data, len);
+            m_Len = len;
+            m_MimeType = mime;
+            InitTime();
+        }
+
+        MemFSHashObj(const wxMemoryOutputStream& stream, const wxString& mime)
+        {
+            m_Len = stream.GetSize();
+            m_Data = new char[m_Len];
+            stream.CopyTo(m_Data, m_Len);
+            m_MimeType = mime;
+            InitTime();
+        }
+
+        virtual ~MemFSHashObj()
+        {
+            delete[] m_Data;
+        }
+
+        char *m_Data;
+        size_t m_Len;
+        wxString m_MimeType;
+#if wxUSE_DATETIME
+        wxDateTime m_Time;
+#endif // wxUSE_DATETIME
+
+    DECLARE_NO_COPY_CLASS(MemFSHashObj)
+
+    private:
+        void InitTime()
+        {
+#if wxUSE_DATETIME
+            m_Time = wxDateTime::Now();
+#endif // wxUSE_DATETIME
+        }
+};
+
+#if wxUSE_BASE
+
+
+//--------------------------------------------------------------------------------
+// wxMemoryFSHandler
+//--------------------------------------------------------------------------------
+
+
+wxHashTable *wxMemoryFSHandlerBase::m_Hash = NULL;
+
+
+wxMemoryFSHandlerBase::wxMemoryFSHandlerBase() : wxFileSystemHandler()
+{
+}
+
+
+
+wxMemoryFSHandlerBase::~wxMemoryFSHandlerBase()
+{
+    // as only one copy of FS handler is supposed to exist, we may silently
+    // delete static data here. (There is no way how to remove FS handler from
+    // wxFileSystem other than releasing _all_ handlers.)
+
+    if (m_Hash)
+    {
+        WX_CLEAR_HASH_TABLE(*m_Hash);
+        delete m_Hash;
+        m_Hash = NULL;
+    }
+}
+
+
+
+bool wxMemoryFSHandlerBase::CanOpen(const wxString& location)
+{
+    wxString p = GetProtocol(location);
+    return (p == wxT("memory"));
+}
+
+
+
+
+wxFSFile* wxMemoryFSHandlerBase::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
+{
+    if (m_Hash)
+    {
+        MemFSHashObj *obj = (MemFSHashObj*) m_Hash -> Get(GetRightLocation(location));
+        if (obj == NULL)
+        {
+            return NULL;
+        }
+        else
+        {
+            wxString mime = obj->m_MimeType;
+            if ( mime.empty() )
+                mime = GetMimeTypeFromExt(location);
+            return new wxFSFile
+                       (
+                           new wxMemoryInputStream(obj -> m_Data, obj -> m_Len),
+                           location,
+                           mime,
+                           GetAnchor(location)
+#if wxUSE_DATETIME
+                           , obj -> m_Time
+#endif // wxUSE_DATETIME
+                           );
+        }
+    }
+    else return NULL;
+}
+
+
+
+wxString wxMemoryFSHandlerBase::FindFirst(const wxString& WXUNUSED(spec),
+                                      int WXUNUSED(flags))
+{
+    wxFAIL_MSG(wxT("wxMemoryFSHandlerBase::FindFirst not implemented"));
+
+    return wxEmptyString;
+}
+
+
+
+wxString wxMemoryFSHandlerBase::FindNext()
+{
+    wxFAIL_MSG(wxT("wxMemoryFSHandlerBase::FindNext not implemented"));
+
+    return wxEmptyString;
+}
+
+
+bool wxMemoryFSHandlerBase::CheckHash(const wxString& filename)
+{
+    if (m_Hash == NULL)
+    {
+        m_Hash = new wxHashTable(wxKEY_STRING);
+    }
+
+    if (m_Hash -> Get(filename) != NULL)
+    {
+        wxString s;
+        s.Printf(_("Memory VFS already contains file '%s'!"), filename.c_str());
+        wxLogError(s);
+        return false;
+    }
+    else
+        return true;
+}
+
+
+/*static*/
+void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
+                                                const wxString& textdata,
+                                                const wxString& mimetype)
+{
+    AddFileWithMimeType(filename,
+                        (const void*) textdata.mb_str(), textdata.length(),
+                        mimetype);
+}
+
+
+/*static*/
+void wxMemoryFSHandlerBase::AddFileWithMimeType(const wxString& filename,
+                                                const void *binarydata, size_t size,
+                                                const wxString& mimetype)
+{
+    if (!CheckHash(filename)) return;
+    m_Hash -> Put(filename, new MemFSHashObj(binarydata, size, mimetype));
+}
+
+/*static*/
+void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
+                                    const wxString& textdata)
+{
+    AddFileWithMimeType(filename, textdata, wxEmptyString);
+}
+
+
+/*static*/
+void wxMemoryFSHandlerBase::AddFile(const wxString& filename,
+                                    const void *binarydata, size_t size)
+{
+    AddFileWithMimeType(filename, binarydata, size, wxEmptyString);
+}
+
+
+
+/*static*/ void wxMemoryFSHandlerBase::RemoveFile(const wxString& filename)
+{
+    if (m_Hash == NULL ||
+        m_Hash -> Get(filename) == NULL)
+    {
+        wxString s;
+        s.Printf(_("Trying to remove file '%s' from memory VFS, but it is not loaded!"), filename.c_str());
+        wxLogError(s);
+    }
+
+    else
+        delete m_Hash -> Delete(filename);
+}
+
+#endif // wxUSE_BASE
+
+#if wxUSE_GUI
+
+#if wxUSE_IMAGE
+/*static*/ void
+wxMemoryFSHandler::AddFile(const wxString& filename,
+                           const wxImage& image,
+                           long type)
+{
+    if (!CheckHash(filename)) return;
+
+    wxMemoryOutputStream mems;
+    if (image.Ok() && image.SaveFile(mems, (int)type))
+    {
+        m_Hash->Put
+                (
+                    filename,
+                    new MemFSHashObj
+                        (
+                            mems,
+                            wxImage::FindHandler(type)->GetMimeType()
+                        )
+                );
+    }
+    else
+    {
+        wxString s;
+        s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
+        wxPrintf(wxT("'%s'\n"), s.c_str());
+        wxLogError(s);
+    }
+}
+
+/*static*/ void
+wxMemoryFSHandler::AddFile(const wxString& filename,
+                           const wxBitmap& bitmap,
+                           long type)
+{
+#if !defined(__WXMSW__) || wxUSE_WXDIB
+    wxImage img = bitmap.ConvertToImage();
+    AddFile(filename, img, type);
+#endif
+}
+
+#endif // wxUSE_IMAGE
+
+#endif // wxUSE_GUI
+
+
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP
diff --git a/Source/3rd Party/wx/src/common/fswatchercmn.cpp b/Source/3rd Party/wx/src/common/fswatchercmn.cpp
deleted file mode 100644
index c795b4e43..000000000
--- a/Source/3rd Party/wx/src/common/fswatchercmn.cpp	
+++ /dev/null
@@ -1,252 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/fswatchercmn.cpp
-// Purpose:     wxMswFileSystemWatcher
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FSWATCHER
-
-#include "wx/fswatcher.h"
-#include "wx/private/fswatcher.h"
-
-// ============================================================================
-// helpers
-// ============================================================================
-
-wxDEFINE_EVENT(wxEVT_FSWATCHER, wxFileSystemWatcherEvent);
-
-static wxString GetFSWEventChangeTypeName(int type)
-{
-    switch (type)
-    {
-    case wxFSW_EVENT_CREATE:
-        return "CREATE";
-    case wxFSW_EVENT_DELETE:
-        return "DELETE";
-    case wxFSW_EVENT_RENAME:
-        return "RENAME";
-    case wxFSW_EVENT_MODIFY:
-        return "MODIFY";
-    case wxFSW_EVENT_ACCESS:
-        return "ACCESS";
-    }
-
-    // should never be reached!
-    wxFAIL_MSG("Unknown change type");
-    return "INVALID_TYPE";
-}
-
-
-// ============================================================================
-// wxFileSystemWatcherEvent implementation
-// ============================================================================
-
-wxString wxFileSystemWatcherEvent::ToString() const
-{
-    return wxString::Format("FSW_EVT type=%d (%s) path='%s'", m_changeType,
-            GetFSWEventChangeTypeName(m_changeType), GetPath().GetFullPath());
-}
-
-
-// ============================================================================
-// wxFileSystemWatcherEvent implementation
-// ============================================================================
-
-wxFileSystemWatcherBase::wxFileSystemWatcherBase() :
-    m_service(0), m_owner(this)
-{
-}
-
-wxFileSystemWatcherBase::~wxFileSystemWatcherBase()
-{
-    RemoveAll();
-    if (m_service)
-    {
-        delete m_service;
-    }
-}
-
-bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events)
-{
-    wxFSWPathType type = wxFSWPath_None;
-    if ( path.FileExists() )
-    {
-        type = wxFSWPath_File;
-    }
-    else if ( path.DirExists() )
-    {
-        type = wxFSWPath_Dir;
-    }
-    else
-    {
-        wxLogError(_("Can't monitor non-existent path \"%s\" for changes."),
-                   path.GetFullPath());
-        return false;
-    }
-
-    return DoAdd(path, events, type);
-}
-
-bool
-wxFileSystemWatcherBase::DoAdd(const wxFileName& path,
-                               int events,
-                               wxFSWPathType type)
-{
-    wxString canonical = GetCanonicalPath(path);
-    if (canonical.IsEmpty())
-        return false;
-
-    wxCHECK_MSG(m_watches.find(canonical) == m_watches.end(), false,
-                wxString::Format("Path '%s' is already watched", canonical));
-
-    // adding a path in a platform specific way
-    wxFSWatchInfo watch(canonical, events, type);
-    if ( !m_service->Add(watch) )
-        return false;
-
-    // on success, add path to our 'watch-list'
-    wxFSWatchInfoMap::value_type val(canonical, watch);
-    return m_watches.insert(val).second;
-}
-
-bool wxFileSystemWatcherBase::Remove(const wxFileName& path)
-{
-    // args validation & consistency checks
-    wxString canonical = GetCanonicalPath(path);
-    if (canonical.IsEmpty())
-        return false;
-
-    wxFSWatchInfoMap::iterator it = m_watches.find(canonical);
-    wxCHECK_MSG(it != m_watches.end(), false,
-                wxString::Format("Path '%s' is not watched", canonical));
-
-    // remove from watch-list
-    wxFSWatchInfo watch = it->second;
-    m_watches.erase(it);
-
-    // remove in a platform specific way
-    return m_service->Remove(watch);
-}
-
-bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events,
-                                      const wxString& filter)
-{
-    if (!path.DirExists())
-        return false;
-
-    // OPT could be optimised if we stored information about relationships
-    // between paths
-    class AddTraverser : public wxDirTraverser
-    {
-    public:
-        AddTraverser(wxFileSystemWatcherBase* watcher, int events) :
-            m_watcher(watcher), m_events(events)
-        {
-        }
-
-        // CHECK we choose which files to delegate to Add(), maybe we should pass
-        // all of them to Add() and let it choose? this is useful when adding a
-        // file to a dir that is already watched, then not only should we know
-        // about that, but Add() should also behave well then
-        virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename))
-        {
-            return wxDIR_CONTINUE;
-        }
-
-        virtual wxDirTraverseResult OnDir(const wxString& dirname)
-        {
-            wxLogTrace(wxTRACE_FSWATCHER, "--- AddTree adding '%s' ---",
-                                                                    dirname);
-            // we add as much as possible and ignore errors
-            m_watcher->Add(wxFileName(dirname), m_events);
-            return wxDIR_CONTINUE;
-        }
-
-    private:
-        wxFileSystemWatcherBase* m_watcher;
-        int m_events;
-        wxString m_filter;
-    };
-
-    wxDir dir(path.GetFullPath());
-    AddTraverser traverser(this, events);
-    dir.Traverse(traverser, filter);
-
-    return true;
-}
-
-bool wxFileSystemWatcherBase::RemoveTree(const wxFileName& path)
-{
-    if (!path.DirExists())
-        return false;
-
-    // OPT could be optimised if we stored information about relationships
-    // between paths
-    class RemoveTraverser : public wxDirTraverser
-    {
-    public:
-        RemoveTraverser(wxFileSystemWatcherBase* watcher) :
-            m_watcher(watcher)
-        {
-        }
-
-        virtual wxDirTraverseResult OnFile(const wxString& filename)
-        {
-            m_watcher->Remove(wxFileName(filename));
-            return wxDIR_CONTINUE;
-        }
-
-        virtual wxDirTraverseResult OnDir(const wxString& dirname)
-        {
-            m_watcher->RemoveTree(wxFileName(dirname));
-            return wxDIR_CONTINUE;
-        }
-
-    private:
-        wxFileSystemWatcherBase* m_watcher;
-    };
-
-    wxDir dir(path.GetFullPath());
-    RemoveTraverser traverser(this);
-    dir.Traverse(traverser);
-
-    return true;
-}
-
-bool wxFileSystemWatcherBase::RemoveAll()
-{
-    m_service->RemoveAll();
-    m_watches.clear();
-    return true;
-}
-
-int wxFileSystemWatcherBase::GetWatchedPathsCount() const
-{
-    return m_watches.size();
-}
-
-int wxFileSystemWatcherBase::GetWatchedPaths(wxArrayString* paths) const
-{
-    wxCHECK_MSG( paths != NULL, -1, "Null array passed to retrieve paths");
-
-    wxFSWatchInfoMap::const_iterator it = m_watches.begin();
-    for ( ; it != m_watches.end(); ++it)
-    {
-        paths->push_back(it->first);
-    }
-
-    return m_watches.size();
-}
-
-#endif // wxUSE_FSWATCHER
diff --git a/Source/3rd Party/wx/src/common/gaugecmn.cpp b/Source/3rd Party/wx/src/common/gaugecmn.cpp
index 68c236e92..d8ab642e6 100644
--- a/Source/3rd Party/wx/src/common/gaugecmn.cpp	
+++ b/Source/3rd Party/wx/src/common/gaugecmn.cpp	
@@ -1,219 +1,156 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/gaugecmn.cpp
-// Purpose:     wxGaugeBase: common to all ports methods of wxGauge
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     20.02.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-
-#if wxUSE_GAUGE
-
-#include "wx/gauge.h"
-
-const char wxGaugeNameStr[] = "gauge";
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-wxGaugeBase::~wxGaugeBase()
-{
-    // this destructor is required for Darwin
-}
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxGaugeStyle )
-wxBEGIN_FLAGS( wxGaugeStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxGA_HORIZONTAL)
-wxFLAGS_MEMBER(wxGA_VERTICAL)
-#if WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxGA_PROGRESSBAR)
-#endif // WXWIN_COMPATIBILITY_2_6
-wxFLAGS_MEMBER(wxGA_SMOOTH)
-wxEND_FLAGS( wxGaugeStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl, "wx/gauge.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxGauge)
-wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Range, int, SetRange, GetRange, 0, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-wxPROPERTY( ShadowWidth, int, SetShadowWidth, GetShadowWidth, \
-           0, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxPROPERTY( BezelFace, int, SetBezelFace, GetBezelFace, \
-           0, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-
-wxPROPERTY_FLAGS( WindowStyle, wxGaugeStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxGauge)
-
-wxCONSTRUCTOR_6( wxGauge, wxWindow*, Parent, wxWindowID, Id, int, Range, \
-                wxPoint, Position, wxSize, Size, long, WindowStyle )
-
-// ----------------------------------------------------------------------------
-// wxGauge creation
-// ----------------------------------------------------------------------------
-
-bool wxGaugeBase::Create(wxWindow *parent,
-                         wxWindowID id,
-                         int range,
-                         const wxPoint& pos,
-                         const wxSize& size,
-                         long style,
-                         const wxValidator& validator,
-                         const wxString& name)
-{
-    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
-        return false;
-
-    SetName(name);
-
-#if wxUSE_VALIDATORS
-    SetValidator(validator);
-#endif // wxUSE_VALIDATORS
-
-    SetRange(range);
-    SetValue(0);
-#if wxGAUGE_EMULATE_INDETERMINATE_MODE
-    m_nDirection = wxRIGHT;
-#endif
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wxGauge determinate mode range/position
-// ----------------------------------------------------------------------------
-
-void wxGaugeBase::SetRange(int range)
-{
-    m_rangeMax = range;
-}
-
-int wxGaugeBase::GetRange() const
-{
-    return m_rangeMax;
-}
-
-void wxGaugeBase::SetValue(int pos)
-{
-    m_gaugePos = pos;
-}
-
-int wxGaugeBase::GetValue() const
-{
-    return m_gaugePos;
-}
-
-// ----------------------------------------------------------------------------
-// wxGauge indeterminate mode
-// ----------------------------------------------------------------------------
-
-void wxGaugeBase::Pulse()
-{
-#if wxGAUGE_EMULATE_INDETERMINATE_MODE
-    // simulate indeterminate mode
-    int curr = GetValue(), max = GetRange();
-
-    if (m_nDirection == wxRIGHT)
-    {
-        if (curr < max)
-            SetValue(curr + 1);
-        else
-        {
-            SetValue(max - 1);
-            m_nDirection = wxLEFT;
-        }
-    }
-    else
-    {
-        if (curr > 0)
-            SetValue(curr - 1);
-        else
-        {
-            SetValue(1);
-            m_nDirection = wxRIGHT;
-        }
-    }
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// wxGauge appearance params
-// ----------------------------------------------------------------------------
-
-void wxGaugeBase::SetShadowWidth(int WXUNUSED(w))
-{
-}
-
-int wxGaugeBase::GetShadowWidth() const
-{
-    return 0;
-}
-
-
-void wxGaugeBase::SetBezelFace(int WXUNUSED(w))
-{
-}
-
-int wxGaugeBase::GetBezelFace() const
-{
-    return 0;
-}
-
-#endif // wxUSE_GAUGE
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/gaugecmn.cpp
+// Purpose:     wxGaugeBase: common to all ports methods of wxGauge
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     20.02.01
+// RCS-ID:      $Id: gaugecmn.cpp 41089 2006-09-09 13:36:54Z RR $
+// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
+#if wxUSE_GAUGE
+
+#include "wx/gauge.h"
+
+const wxChar wxGaugeNameStr[] = wxT("gauge");
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+wxGaugeBase::~wxGaugeBase()
+{
+    // this destructor is required for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// wxGauge creation
+// ----------------------------------------------------------------------------
+
+bool wxGaugeBase::Create(wxWindow *parent,
+                         wxWindowID id,
+                         int range,
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         long style,
+                         const wxValidator& validator,
+                         const wxString& name)
+{
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    SetName(name);
+
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif // wxUSE_VALIDATORS
+
+    SetRange(range);
+    SetValue(0);
+#if wxGAUGE_EMULATE_INDETERMINATE_MODE
+    m_nDirection = wxRIGHT;
+#endif
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// wxGauge determinate mode range/position
+// ----------------------------------------------------------------------------
+
+void wxGaugeBase::SetRange(int range)
+{
+    m_rangeMax = range;
+}
+
+int wxGaugeBase::GetRange() const
+{
+    return m_rangeMax;
+}
+
+void wxGaugeBase::SetValue(int pos)
+{
+    m_gaugePos = pos;
+}
+
+int wxGaugeBase::GetValue() const
+{
+    return m_gaugePos;
+}
+
+// ----------------------------------------------------------------------------
+// wxGauge indeterminate mode
+// ----------------------------------------------------------------------------
+
+void wxGaugeBase::Pulse()
+{
+#if wxGAUGE_EMULATE_INDETERMINATE_MODE
+    // simulate indeterminate mode
+    int curr = GetValue(), max = GetRange();
+
+    if (m_nDirection == wxRIGHT)
+    {
+        if (curr < max)
+            SetValue(curr + 1);
+        else
+        {
+            SetValue(max - 1);
+            m_nDirection = wxLEFT;
+        }
+    }
+    else
+    {
+        if (curr > 0)
+            SetValue(curr - 1);
+        else
+        {
+            SetValue(1);
+            m_nDirection = wxRIGHT;
+        }
+    }
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// wxGauge appearance params
+// ----------------------------------------------------------------------------
+
+void wxGaugeBase::SetShadowWidth(int WXUNUSED(w))
+{
+}
+
+int wxGaugeBase::GetShadowWidth() const
+{
+    return 0;
+}
+
+
+void wxGaugeBase::SetBezelFace(int WXUNUSED(w))
+{
+}
+
+int wxGaugeBase::GetBezelFace() const
+{
+    return 0;
+}
+
+#endif // wxUSE_GAUGE
diff --git a/Source/3rd Party/wx/src/common/gbsizer.cpp b/Source/3rd Party/wx/src/common/gbsizer.cpp
index ae5795139..c81e80c2b 100644
--- a/Source/3rd Party/wx/src/common/gbsizer.cpp	
+++ b/Source/3rd Party/wx/src/common/gbsizer.cpp	
@@ -1,797 +1,784 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/gbsizer.cpp
-// Purpose:     wxGridBagSizer:  A sizer that can lay out items in a grid,
-//              with items at specified cells, and with the option of row
-//              and/or column spanning
-//
-// Author:      Robin Dunn
-// Created:     03-Nov-2003
-// RCS-ID:      $Id$
-// Copyright:   (c) Robin Dunn
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/gbsizer.h"
-
-//---------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxGBSizerItem, wxSizerItem)
-IMPLEMENT_CLASS(wxGridBagSizer, wxFlexGridSizer)
-
-const wxGBSpan wxDefaultSpan;
-
-//---------------------------------------------------------------------------
-// wxGBSizerItem
-//---------------------------------------------------------------------------
-
-wxGBSizerItem::wxGBSizerItem( int width,
-                              int height,
-                              const wxGBPosition& pos,
-                              const wxGBSpan& span,
-                              int flag,
-                              int border,
-                              wxObject* userData)
-    : wxSizerItem(width, height, 0, flag, border, userData),
-      m_pos(pos),
-      m_span(span),
-      m_gbsizer(NULL)
-{
-}
-
-
-wxGBSizerItem::wxGBSizerItem( wxWindow *window,
-                              const wxGBPosition& pos,
-                              const wxGBSpan& span,
-                              int flag,
-                              int border,
-                              wxObject* userData )
-    : wxSizerItem(window, 0, flag, border, userData),
-      m_pos(pos),
-      m_span(span),
-      m_gbsizer(NULL)
-{
-}
-
-
-wxGBSizerItem::wxGBSizerItem( wxSizer *sizer,
-                              const wxGBPosition& pos,
-                              const wxGBSpan& span,
-                              int flag,
-                              int border,
-                              wxObject* userData )
-    : wxSizerItem(sizer, 0, flag, border, userData),
-      m_pos(pos),
-      m_span(span),
-      m_gbsizer(NULL)
-{
-}
-
-wxGBSizerItem::wxGBSizerItem()
-    : wxSizerItem(),
-      m_pos(-1,-1),
-      m_gbsizer(NULL)
-{
-}
-
-//---------------------------------------------------------------------------
-
-
-void wxGBSizerItem::GetPos(int& row, int& col) const
-{
-    row = m_pos.GetRow();
-    col = m_pos.GetCol();
-}
-
-void wxGBSizerItem::GetSpan(int& rowspan, int& colspan) const
-{
-    rowspan = m_span.GetRowspan();
-    colspan = m_span.GetColspan();
-}
-
-
-bool wxGBSizerItem::SetPos( const wxGBPosition& pos )
-{
-    if (m_gbsizer)
-    {
-        wxCHECK_MSG( !m_gbsizer->CheckForIntersection(pos, m_span, this), false,
-                 wxT("An item is already at that position") );
-    }
-    m_pos = pos;
-    return true;
-}
-
-bool wxGBSizerItem::SetSpan( const wxGBSpan& span )
-{
-    if (m_gbsizer)
-    {
-        wxCHECK_MSG( !m_gbsizer->CheckForIntersection(m_pos, span, this), false,
-                 wxT("An item is already at that position") );
-    }
-    m_span = span;
-    return true;
-}
-
-
-inline bool InRange(int val, int min, int max)
-{
-    return (val >= min && val <= max);
-}
-
-bool wxGBSizerItem::Intersects(const wxGBSizerItem& other)
-{
-    return Intersects(other.GetPos(), other.GetSpan());
-}
-
-bool wxGBSizerItem::Intersects(const wxGBPosition& pos, const wxGBSpan& span)
-{
-
-    int row, col, endrow, endcol;
-    int otherrow, othercol, otherendrow, otherendcol;
-
-    GetPos(row, col);
-    GetEndPos(endrow, endcol);
-
-    otherrow = pos.GetRow();
-    othercol = pos.GetCol();
-    otherendrow = otherrow + span.GetRowspan() - 1;
-    otherendcol = othercol + span.GetColspan() - 1;
-
-    // is the other item's start or end in the range of this one?
-    if (( InRange(otherrow, row, endrow) && InRange(othercol, col, endcol) ) ||
-        ( InRange(otherendrow, row, endrow) && InRange(otherendcol, col, endcol) ))
-        return true;
-
-    // is this item's start or end in the range of the other one?
-    if (( InRange(row, otherrow, otherendrow) && InRange(col, othercol, otherendcol) ) ||
-        ( InRange(endrow, otherrow, otherendrow) && InRange(endcol, othercol, otherendcol) ))
-        return true;
-
-    return false;
-}
-
-
-void wxGBSizerItem::GetEndPos(int& row, int& col)
-{
-    row = m_pos.GetRow() + m_span.GetRowspan() - 1;
-    col = m_pos.GetCol() + m_span.GetColspan() - 1;
-}
-
-
-//---------------------------------------------------------------------------
-// wxGridBagSizer
-//---------------------------------------------------------------------------
-
-wxGridBagSizer::wxGridBagSizer(int vgap, int hgap )
-    : wxFlexGridSizer(1, vgap, hgap),
-      m_emptyCellSize(10,20)
-
-{
-}
-
-
-wxSizerItem* wxGridBagSizer::Add( wxWindow *window,
-                                  const wxGBPosition& pos, const wxGBSpan& span,
-                                  int flag, int border,  wxObject* userData )
-{
-    wxGBSizerItem* item = new wxGBSizerItem(window, pos, span, flag, border, userData);
-    if ( Add(item) )
-        return item;
-    else
-    {
-        delete item;
-        return NULL;
-    }
-}
-
-wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer,
-                          const wxGBPosition& pos, const wxGBSpan& span,
-                          int flag, int border,  wxObject* userData )
-{
-    wxGBSizerItem* item = new wxGBSizerItem(sizer, pos, span, flag, border, userData);
-    if ( Add(item) )
-        return item;
-    else
-    {
-        delete item;
-        return NULL;
-    }
-}
-
-wxSizerItem* wxGridBagSizer::Add( int width, int height,
-                          const wxGBPosition& pos, const wxGBSpan& span,
-                          int flag, int border,  wxObject* userData )
-{
-    wxGBSizerItem* item = new wxGBSizerItem(width, height, pos, span, flag, border, userData);
-    if ( Add(item) )
-        return item;
-    else
-    {
-        delete item;
-        return NULL;
-    }
-}
-
-wxSizerItem* wxGridBagSizer::Add( wxGBSizerItem *item )
-{
-    wxCHECK_MSG( !CheckForIntersection(item), NULL,
-                 wxT("An item is already at that position") );
-    m_children.Append(item);
-    item->SetGBSizer(this);
-    if ( item->GetWindow() )
-        item->GetWindow()->SetContainingSizer( this );
-
-    // extend the number of rows/columns of the underlying wxFlexGridSizer if
-    // necessary
-    int row, col;
-    item->GetEndPos(row, col);
-    row++;
-    col++;
-
-    if ( row > GetRows() )
-        SetRows(row);
-    if ( col > GetCols() )
-        SetCols(col);
-
-    return item;
-}
-
-
-
-//---------------------------------------------------------------------------
-
-wxSize wxGridBagSizer::GetCellSize(int row, int col) const
-{
-    wxCHECK_MSG( (row < m_rows) && (col < m_cols),
-                 wxDefaultSize,
-                 wxT("Invalid cell."));
-    return wxSize( m_colWidths[col], m_rowHeights[row] );
-}
-
-
-wxGBPosition wxGridBagSizer::GetItemPosition(wxWindow *window)
-{
-    wxGBPosition badpos(-1,-1);
-    wxGBSizerItem* item = FindItem(window);
-    wxCHECK_MSG(item, badpos, wxT("Failed to find item."));
-    return item->GetPos();
-}
-
-
-wxGBPosition wxGridBagSizer::GetItemPosition(wxSizer *sizer)
-{
-    wxGBPosition badpos(-1,-1);
-    wxGBSizerItem* item = FindItem(sizer);
-    wxCHECK_MSG(item, badpos, wxT("Failed to find item."));
-    return item->GetPos();
-}
-
-
-wxGBPosition wxGridBagSizer::GetItemPosition(size_t index)
-{
-    wxGBPosition badpos(-1,-1);
-    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
-    wxCHECK_MSG( node, badpos, wxT("Failed to find item.") );
-    wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-    return item->GetPos();
-}
-
-
-
-bool wxGridBagSizer::SetItemPosition(wxWindow *window, const wxGBPosition& pos)
-{
-    wxGBSizerItem* item = FindItem(window);
-    wxCHECK_MSG(item, false, wxT("Failed to find item."));
-    return item->SetPos(pos);
-}
-
-
-bool wxGridBagSizer::SetItemPosition(wxSizer *sizer, const wxGBPosition& pos)
-{
-    wxGBSizerItem* item = FindItem(sizer);
-    wxCHECK_MSG(item, false, wxT("Failed to find item."));
-    return item->SetPos(pos);
-}
-
-
-bool wxGridBagSizer::SetItemPosition(size_t index, const wxGBPosition& pos)
-{
-    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
-    wxCHECK_MSG( node, false, wxT("Failed to find item.") );
-    wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-    return item->SetPos(pos);
-}
-
-
-
-wxGBSpan wxGridBagSizer::GetItemSpan(wxWindow *window)
-{
-    wxGBSpan badspan(-1,-1);
-    wxGBSizerItem* item = FindItem(window);
-    wxCHECK_MSG( item, badspan, wxT("Failed to find item.") );
-    return item->GetSpan();
-}
-
-
-wxGBSpan wxGridBagSizer::GetItemSpan(wxSizer *sizer)
-{
-    wxGBSpan badspan(-1,-1);
-    wxGBSizerItem* item = FindItem(sizer);
-    wxCHECK_MSG( item, badspan, wxT("Failed to find item.") );
-    return item->GetSpan();
-}
-
-
-wxGBSpan wxGridBagSizer::GetItemSpan(size_t index)
-{
-    wxGBSpan badspan(-1,-1);
-    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
-    wxCHECK_MSG( node, badspan, wxT("Failed to find item.") );
-    wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-    return item->GetSpan();
-}
-
-
-
-bool wxGridBagSizer::SetItemSpan(wxWindow *window, const wxGBSpan& span)
-{
-    wxGBSizerItem* item = FindItem(window);
-    wxCHECK_MSG(item, false, wxT("Failed to find item."));
-    return item->SetSpan(span);
-}
-
-
-bool wxGridBagSizer::SetItemSpan(wxSizer *sizer, const wxGBSpan& span)
-{
-    wxGBSizerItem* item = FindItem(sizer);
-    wxCHECK_MSG(item, false, wxT("Failed to find item."));
-    return item->SetSpan(span);
-}
-
-
-bool wxGridBagSizer::SetItemSpan(size_t index, const wxGBSpan& span)
-{
-    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
-    wxCHECK_MSG( node, false, wxT("Failed to find item.") );
-    wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-    return item->SetSpan(span);
-}
-
-
-
-
-wxGBSizerItem* wxGridBagSizer::FindItem(wxWindow* window)
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-        if ( item->GetWindow() == window )
-            return item;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-
-wxGBSizerItem* wxGridBagSizer::FindItem(wxSizer* sizer)
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-        if ( item->GetSizer() == sizer )
-            return item;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-
-
-
-wxGBSizerItem* wxGridBagSizer::FindItemAtPosition(const wxGBPosition& pos)
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-        if ( item->Intersects(pos, wxDefaultSpan) )
-            return item;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-
-
-
-wxGBSizerItem* wxGridBagSizer::FindItemAtPoint(const wxPoint& pt)
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-        wxRect rect(item->GetPosition(), item->GetSize());
-        rect.Inflate(m_hgap, m_vgap);
-        if ( rect.Contains(pt) )
-            return item;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-
-
-
-wxGBSizerItem* wxGridBagSizer::FindItemWithData(const wxObject* userData)
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-        if ( item->GetUserData() == userData )
-            return item;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-
-
-
-//---------------------------------------------------------------------------
-
-// Figure out what all the min row heights and col widths are, and calculate
-// min size from that.
-wxSize wxGridBagSizer::CalcMin()
-{
-    int idx;
-
-    if (m_children.GetCount() == 0)
-        return m_emptyCellSize;
-
-    m_rowHeights.Empty();
-    m_colWidths.Empty();
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-        if ( item->IsShown() )
-        {
-            int row, col, endrow, endcol;
-
-            item->GetPos(row, col);
-            item->GetEndPos(endrow, endcol);
-
-            // fill heights and widths up to this item if needed
-            while ( (int)m_rowHeights.GetCount() <= endrow )
-                m_rowHeights.Add(m_emptyCellSize.GetHeight());
-            while ( (int)m_colWidths.GetCount() <= endcol )
-                m_colWidths.Add(m_emptyCellSize.GetWidth());
-
-            // See if this item increases the size of its row(s) or col(s)
-            wxSize size(item->CalcMin());
-            for (idx=row; idx <= endrow; idx++)
-                m_rowHeights[idx] = wxMax(m_rowHeights[idx], size.GetHeight() / (endrow-row+1));
-            for (idx=col; idx <= endcol; idx++)
-                m_colWidths[idx] = wxMax(m_colWidths[idx], size.GetWidth() / (endcol-col+1));
-        }
-        node = node->GetNext();
-    }
-
-    AdjustForOverflow();
-    AdjustForFlexDirection();
-
-    // Now traverse the heights and widths arrays calcing the totals, including gaps
-    int width = 0;
-    m_cols = m_colWidths.GetCount();
-    for (idx=0; idx < m_cols; idx++)
-        width += m_colWidths[idx] + ( idx == m_cols-1 ? 0 : m_hgap );
-
-    int height = 0;
-    m_rows = m_rowHeights.GetCount();
-    for (idx=0; idx < m_rows; idx++)
-        height += m_rowHeights[idx] + ( idx == m_rows-1 ? 0 : m_vgap );
-
-    m_calculatedMinSize = wxSize(width, height);
-    return m_calculatedMinSize;
-}
-
-
-
-void wxGridBagSizer::RecalcSizes()
-{
-    if (m_children.GetCount() == 0)
-        return;
-
-    wxPoint pt( GetPosition() );
-    wxSize  sz( GetSize() );
-
-    m_rows = m_rowHeights.GetCount();
-    m_cols = m_colWidths.GetCount();
-    int idx, width, height;
-
-    AdjustForGrowables(sz);
-
-    // Find the start positions on the window of the rows and columns
-    wxArrayInt rowpos;
-    rowpos.Add(0, m_rows);
-    int y = pt.y;
-    for (idx=0; idx < m_rows; idx++)
-    {
-        height = m_rowHeights[idx] + m_vgap;
-        rowpos[idx] = y;
-        y += height;
-    }
-
-    wxArrayInt colpos;
-    colpos.Add(0, m_cols);
-    int x = pt.x;
-    for (idx=0; idx < m_cols; idx++)
-    {
-        width = m_colWidths[idx] + m_hgap;
-        colpos[idx] = x;
-        x += width;
-    }
-
-
-    // Now iterate the children, setting each child's dimensions
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        int row, col, endrow, endcol;
-        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-
-        if ( item->IsShown() )
-        {
-            item->GetPos(row, col);
-            item->GetEndPos(endrow, endcol);
-
-            height = 0;
-            for(idx=row; idx <= endrow; idx++)
-                height += m_rowHeights[idx];
-            height += (endrow - row) * m_vgap; // add a vgap for every row spanned
-
-            width = 0;
-            for (idx=col; idx <= endcol; idx++)
-                width += m_colWidths[idx];
-            width += (endcol - col) * m_hgap; // add a hgap for every col spanned
-
-            SetItemBounds(item, colpos[col], rowpos[row], width, height);
-        }
-
-        node = node->GetNext();
-    }
-}
-
-
-// Sometimes CalcMin can result in some rows or cols having too much space in
-// them because as it traverses the items it makes some assumptions when
-// items span to other cells.  But those assumptions can become invalid later
-// on when other items are fitted into the same rows or columns that the
-// spanning item occupies. This method tries to find those situations and
-// fixes them.
-void wxGridBagSizer::AdjustForOverflow()
-{
-    int row, col;
-
-    for (row=0; row<(int)m_rowHeights.GetCount(); row++)
-    {
-        int rowExtra=INT_MAX;
-        int rowHeight = m_rowHeights[row];
-        for (col=0; col<(int)m_colWidths.GetCount(); col++)
-        {
-            wxGBPosition pos(row,col);
-            wxGBSizerItem* item = FindItemAtPosition(pos);
-            if ( !item || !item->IsShown() )
-                continue;
-
-            int endrow, endcol;
-            item->GetEndPos(endrow, endcol);
-
-            // If the item starts in this position and doesn't span rows, then
-            // just look at the whole item height
-            if ( item->GetPos() == pos && endrow == row )
-            {
-                int itemHeight = item->CalcMin().GetHeight();
-                rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
-                continue;
-            }
-
-            // Otherwise, only look at spanning items if they end on this row
-            if ( endrow == row )
-            {
-                // first deduct the portions of the item that are on prior rows
-                int itemHeight = item->CalcMin().GetHeight();
-                for (int r=item->GetPos().GetRow(); r<row; r++)
-                    itemHeight -= (m_rowHeights[r] + GetHGap());
-
-                if ( itemHeight < 0 )
-                    itemHeight = 0;
-
-                // and check how much is left
-                rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
-            }
-        }
-        if ( rowExtra && rowExtra != INT_MAX )
-            m_rowHeights[row] -= rowExtra;
-    }
-
-    // Now do the same thing for columns
-    for (col=0; col<(int)m_colWidths.GetCount(); col++)
-    {
-        int colExtra=INT_MAX;
-        int colWidth = m_colWidths[col];
-        for (row=0; row<(int)m_rowHeights.GetCount(); row++)
-        {
-            wxGBPosition pos(row,col);
-            wxGBSizerItem* item = FindItemAtPosition(pos);
-            if ( !item || !item->IsShown() )
-                continue;
-
-            int endrow, endcol;
-            item->GetEndPos(endrow, endcol);
-
-            if ( item->GetPos() == pos && endcol == col )
-            {
-                int itemWidth = item->CalcMin().GetWidth();
-                colExtra = wxMin(colExtra, colWidth - itemWidth);
-                continue;
-            }
-
-            if ( endcol == col )
-            {
-                int itemWidth = item->CalcMin().GetWidth();
-                for (int c=item->GetPos().GetCol(); c<col; c++)
-                    itemWidth -= (m_colWidths[c] + GetVGap());
-
-                if ( itemWidth < 0 )
-                    itemWidth = 0;
-
-                colExtra = wxMin(colExtra, colWidth - itemWidth);
-            }
-        }
-        if ( colExtra && colExtra != INT_MAX )
-            m_colWidths[col] -= colExtra;
-    }
-
-
-}
-
-//---------------------------------------------------------------------------
-
-bool wxGridBagSizer::CheckForIntersection(wxGBSizerItem* item, wxGBSizerItem* excludeItem)
-{
-    return CheckForIntersection(item->GetPos(), item->GetSpan(), excludeItem);
-}
-
-bool wxGridBagSizer::CheckForIntersection(const wxGBPosition& pos, const wxGBSpan& span, wxGBSizerItem* excludeItem)
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
-        node = node->GetNext();
-
-        if ( excludeItem && item == excludeItem )
-            continue;
-
-        if ( item->Intersects(pos, span) )
-            return true;
-
-    }
-    return false;
-}
-
-
-// Assumes a 10x10 grid, and returns the first empty cell found.  This is
-// really stupid but it is only used by the Add methods that match the base
-// class virtuals, which should normally not be used anyway...
-wxGBPosition wxGridBagSizer::FindEmptyCell()
-{
-    int row, col;
-
-    for (row=0; row<10; row++)
-        for (col=0; col<10; col++)
-        {
-            wxGBPosition pos(row, col);
-            if ( !CheckForIntersection(pos, wxDefaultSpan) )
-                return pos;
-        }
-    return wxGBPosition(-1, -1);
-}
-
-
-//---------------------------------------------------------------------------
-
-// The Add base class virtuals should not be used with this class, but
-// we'll try to make them automatically select a location for the item
-// anyway.
-
-wxSizerItem* wxGridBagSizer::Add( wxWindow *window, int, int flag, int border, wxObject* userData )
-{
-    return Add(window, FindEmptyCell(), wxDefaultSpan, flag, border, userData);
-}
-
-wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer, int, int flag, int border, wxObject* userData )
-{
-    return Add(sizer, FindEmptyCell(), wxDefaultSpan, flag, border, userData);
-}
-
-wxSizerItem* wxGridBagSizer::Add( int width, int height, int, int flag, int border, wxObject* userData )
-{
-    return Add(width, height, FindEmptyCell(), wxDefaultSpan, flag, border, userData);
-}
-
-
-
-// The Insert nad Prepend base class virtuals that are not appropriate for
-// this class and should not be used.  Their implementation in this class
-// simply fails.
-
-wxSizerItem* wxGridBagSizer::Add( wxSizerItem * )
-{
-    wxFAIL_MSG(wxT("Invalid Add form called."));
-    return NULL;
-}
-
-wxSizerItem* wxGridBagSizer::Prepend( wxWindow *, int, int, int, wxObject*  )
-{
-    wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
-    return NULL;
-}
-
-wxSizerItem* wxGridBagSizer::Prepend( wxSizer *, int, int, int, wxObject*  )
-{
-    wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
-    return NULL;
-}
-
-wxSizerItem* wxGridBagSizer::Prepend( int, int, int, int, int, wxObject*  )
-{
-    wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
-    return NULL;
-}
-
-wxSizerItem* wxGridBagSizer::Prepend( wxSizerItem * )
-{
-    wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
-    return NULL;
-}
-
-
-wxSizerItem* wxGridBagSizer::Insert( size_t, wxWindow *, int, int, int, wxObject*  )
-{
-    wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
-    return NULL;
-}
-
-wxSizerItem* wxGridBagSizer::Insert( size_t, wxSizer *, int, int, int, wxObject*  )
-{
-    wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
-    return NULL;
-}
-
-wxSizerItem* wxGridBagSizer::Insert( size_t, int, int, int, int, int, wxObject*  )
-{
-    wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
-    return NULL;
-}
-
-wxSizerItem* wxGridBagSizer::Insert( size_t, wxSizerItem * )
-{
-    wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
-    return NULL;
-}
-
-
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
+/////////////////////////////////////////////////////////////////////////////
+// Name:        gbsizer.cpp
+// Purpose:     wxGridBagSizer:  A sizer that can lay out items in a grid,
+//              with items at specified cells, and with the option of row
+//              and/or column spanning
+//
+// Author:      Robin Dunn
+// Created:     03-Nov-2003
+// RCS-ID:      $Id: gbsizer.cpp 54568 2008-07-10 01:32:23Z RD $
+// Copyright:   (c) Robin Dunn
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/gbsizer.h"
+
+//---------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGBSizerItem, wxSizerItem)
+IMPLEMENT_CLASS(wxGridBagSizer, wxFlexGridSizer)
+
+const wxGBSpan wxDefaultSpan;
+
+//---------------------------------------------------------------------------
+// wxGBSizerItem
+//---------------------------------------------------------------------------
+
+wxGBSizerItem::wxGBSizerItem( int width,
+                              int height,
+                              const wxGBPosition& pos,
+                              const wxGBSpan& span,
+                              int flag,
+                              int border,
+                              wxObject* userData)
+    : wxSizerItem(width, height, 0, flag, border, userData),
+      m_pos(pos),
+      m_span(span),
+      m_gbsizer(NULL)
+{
+}
+
+
+wxGBSizerItem::wxGBSizerItem( wxWindow *window,
+                              const wxGBPosition& pos,
+                              const wxGBSpan& span,
+                              int flag,
+                              int border,
+                              wxObject* userData )
+    : wxSizerItem(window, 0, flag, border, userData),
+      m_pos(pos),
+      m_span(span),
+      m_gbsizer(NULL)
+{
+}
+
+
+wxGBSizerItem::wxGBSizerItem( wxSizer *sizer,
+                              const wxGBPosition& pos,
+                              const wxGBSpan& span,
+                              int flag,
+                              int border,
+                              wxObject* userData )
+    : wxSizerItem(sizer, 0, flag, border, userData),
+      m_pos(pos),
+      m_span(span),
+      m_gbsizer(NULL)
+{
+}
+
+wxGBSizerItem::wxGBSizerItem()
+    : wxSizerItem(),
+      m_pos(-1,-1),
+      m_span(-1,-1),
+      m_gbsizer(NULL)
+{
+}
+
+//---------------------------------------------------------------------------
+
+
+void wxGBSizerItem::GetPos(int& row, int& col) const
+{
+    row = m_pos.GetRow();
+    col = m_pos.GetCol();
+}
+
+void wxGBSizerItem::GetSpan(int& rowspan, int& colspan) const
+{
+    rowspan = m_span.GetRowspan();
+    colspan = m_span.GetColspan();
+}
+
+
+bool wxGBSizerItem::SetPos( const wxGBPosition& pos )
+{
+    if (m_gbsizer)
+    {
+        wxCHECK_MSG( !m_gbsizer->CheckForIntersection(pos, m_span, this), false,
+                 wxT("An item is already at that position") );
+    }
+    m_pos = pos;
+    return true;
+}
+
+bool wxGBSizerItem::SetSpan( const wxGBSpan& span )
+{
+    if (m_gbsizer)
+    {
+        wxCHECK_MSG( !m_gbsizer->CheckForIntersection(m_pos, span, this), false,
+                 wxT("An item is already at that position") );
+    }
+    m_span = span;
+    return true;
+}
+
+
+inline bool InRange(int val, int min, int max)
+{
+    return (val >= min && val <= max);
+}
+
+bool wxGBSizerItem::Intersects(const wxGBSizerItem& other)
+{
+    return Intersects(other.GetPos(), other.GetSpan());
+}
+
+bool wxGBSizerItem::Intersects(const wxGBPosition& pos, const wxGBSpan& span)
+{
+
+    int row, col, endrow, endcol;
+    int otherrow, othercol, otherendrow, otherendcol;
+
+    GetPos(row, col);
+    GetEndPos(endrow, endcol);
+
+    otherrow = pos.GetRow();
+    othercol = pos.GetCol();
+    otherendrow = otherrow + span.GetRowspan() - 1;
+    otherendcol = othercol + span.GetColspan() - 1;
+
+    // is the other item's start or end in the range of this one?
+    if (( InRange(otherrow, row, endrow) && InRange(othercol, col, endcol) ) ||
+        ( InRange(otherendrow, row, endrow) && InRange(otherendcol, col, endcol) ))
+        return true;
+
+    // is this item's start or end in the range of the other one?
+    if (( InRange(row, otherrow, otherendrow) && InRange(col, othercol, otherendcol) ) ||
+        ( InRange(endrow, otherrow, otherendrow) && InRange(endcol, othercol, otherendcol) ))
+        return true;
+
+    return false;
+}
+
+
+void wxGBSizerItem::GetEndPos(int& row, int& col)
+{
+    row = m_pos.GetRow() + m_span.GetRowspan() - 1;
+    col = m_pos.GetCol() + m_span.GetColspan() - 1;
+}
+
+
+//---------------------------------------------------------------------------
+// wxGridBagSizer
+//---------------------------------------------------------------------------
+
+wxGridBagSizer::wxGridBagSizer(int vgap, int hgap )
+    : wxFlexGridSizer(1, vgap, hgap),
+      m_emptyCellSize(10,20)
+
+{
+}
+
+
+wxSizerItem* wxGridBagSizer::Add( wxWindow *window,
+                                  const wxGBPosition& pos, const wxGBSpan& span,
+                                  int flag, int border,  wxObject* userData )
+{
+    wxGBSizerItem* item = new wxGBSizerItem(window, pos, span, flag, border, userData);
+    if ( Add(item) )
+        return item;
+    else
+    {
+        delete item;
+        return (wxSizerItem*)NULL;
+    }
+}
+
+wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer,
+                          const wxGBPosition& pos, const wxGBSpan& span,
+                          int flag, int border,  wxObject* userData )
+{
+    wxGBSizerItem* item = new wxGBSizerItem(sizer, pos, span, flag, border, userData);
+    if ( Add(item) )
+        return item;
+    else
+    {
+        delete item;
+        return (wxSizerItem*)NULL;
+    }
+}
+
+wxSizerItem* wxGridBagSizer::Add( int width, int height,
+                          const wxGBPosition& pos, const wxGBSpan& span,
+                          int flag, int border,  wxObject* userData )
+{
+    wxGBSizerItem* item = new wxGBSizerItem(width, height, pos, span, flag, border, userData);
+    if ( Add(item) )
+        return item;
+    else
+    {
+        delete item;
+        return (wxSizerItem*)NULL;
+    }
+}
+
+wxSizerItem* wxGridBagSizer::Add( wxGBSizerItem *item )
+{
+    wxCHECK_MSG( !CheckForIntersection(item), NULL,
+                 wxT("An item is already at that position") );
+    m_children.Append(item);
+    item->SetGBSizer(this);
+    if ( item->GetWindow() )
+        item->GetWindow()->SetContainingSizer( this );
+
+    return item;
+}
+
+
+
+//---------------------------------------------------------------------------
+
+wxSize wxGridBagSizer::GetCellSize(int row, int col) const
+{
+    wxCHECK_MSG( (row < m_rows) && (col < m_cols),
+                 wxDefaultSize,
+                 wxT("Invalid cell."));
+    return wxSize( m_colWidths[col], m_rowHeights[row] );
+}
+
+
+wxGBPosition wxGridBagSizer::GetItemPosition(wxWindow *window)
+{
+    wxGBPosition badpos(-1,-1);
+    wxGBSizerItem* item = FindItem(window);
+    wxCHECK_MSG(item, badpos, wxT("Failed to find item."));
+    return item->GetPos();
+}
+
+
+wxGBPosition wxGridBagSizer::GetItemPosition(wxSizer *sizer)
+{
+    wxGBPosition badpos(-1,-1);
+    wxGBSizerItem* item = FindItem(sizer);
+    wxCHECK_MSG(item, badpos, wxT("Failed to find item."));
+    return item->GetPos();
+}
+
+
+wxGBPosition wxGridBagSizer::GetItemPosition(size_t index)
+{
+    wxGBPosition badpos(-1,-1);
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+    wxCHECK_MSG( node, badpos, _T("Failed to find item.") );
+    wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+    return item->GetPos();
+}
+
+
+
+bool wxGridBagSizer::SetItemPosition(wxWindow *window, const wxGBPosition& pos)
+{
+    wxGBSizerItem* item = FindItem(window);
+    wxCHECK_MSG(item, false, wxT("Failed to find item."));
+    return item->SetPos(pos);
+}
+
+
+bool wxGridBagSizer::SetItemPosition(wxSizer *sizer, const wxGBPosition& pos)
+{
+    wxGBSizerItem* item = FindItem(sizer);
+    wxCHECK_MSG(item, false, wxT("Failed to find item."));
+    return item->SetPos(pos);
+}
+
+
+bool wxGridBagSizer::SetItemPosition(size_t index, const wxGBPosition& pos)
+{
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+    wxCHECK_MSG( node, false, _T("Failed to find item.") );
+    wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+    return item->SetPos(pos);
+}
+
+
+
+wxGBSpan wxGridBagSizer::GetItemSpan(wxWindow *window)
+{
+    wxGBSpan badspan(-1,-1);
+    wxGBSizerItem* item = FindItem(window);
+    wxCHECK_MSG( item, badspan, _T("Failed to find item.") );
+    return item->GetSpan();
+}
+
+
+wxGBSpan wxGridBagSizer::GetItemSpan(wxSizer *sizer)
+{
+    wxGBSpan badspan(-1,-1);
+    wxGBSizerItem* item = FindItem(sizer);
+    wxCHECK_MSG( item, badspan, _T("Failed to find item.") );
+    return item->GetSpan();
+}
+
+
+wxGBSpan wxGridBagSizer::GetItemSpan(size_t index)
+{
+    wxGBSpan badspan(-1,-1);
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+    wxCHECK_MSG( node, badspan, _T("Failed to find item.") );
+    wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+    return item->GetSpan();
+}
+
+
+
+bool wxGridBagSizer::SetItemSpan(wxWindow *window, const wxGBSpan& span)
+{
+    wxGBSizerItem* item = FindItem(window);
+    wxCHECK_MSG(item, false, wxT("Failed to find item."));
+    return item->SetSpan(span);
+}
+
+
+bool wxGridBagSizer::SetItemSpan(wxSizer *sizer, const wxGBSpan& span)
+{
+    wxGBSizerItem* item = FindItem(sizer);
+    wxCHECK_MSG(item, false, wxT("Failed to find item."));
+    return item->SetSpan(span);
+}
+
+
+bool wxGridBagSizer::SetItemSpan(size_t index, const wxGBSpan& span)
+{
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+    wxCHECK_MSG( node, false, _T("Failed to find item.") );
+    wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+    return item->SetSpan(span);
+}
+
+
+
+
+wxGBSizerItem* wxGridBagSizer::FindItem(wxWindow* window)
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+        if ( item->GetWindow() == window )
+            return item;
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+
+wxGBSizerItem* wxGridBagSizer::FindItem(wxSizer* sizer)
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+        if ( item->GetSizer() == sizer )
+            return item;
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+
+
+
+wxGBSizerItem* wxGridBagSizer::FindItemAtPosition(const wxGBPosition& pos)
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+        if ( item->Intersects(pos, wxDefaultSpan) )
+            return item;
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+
+
+
+wxGBSizerItem* wxGridBagSizer::FindItemAtPoint(const wxPoint& pt)
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+        wxRect rect(item->GetPosition(), item->GetSize());
+        rect.Inflate(m_hgap, m_vgap);
+        if ( rect.Contains(pt) )
+            return item;
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+
+
+
+wxGBSizerItem* wxGridBagSizer::FindItemWithData(const wxObject* userData)
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+        if ( item->GetUserData() == userData )
+            return item;
+        node = node->GetNext();
+    }
+    return NULL;
+}
+
+
+
+
+//---------------------------------------------------------------------------
+
+// Figure out what all the min row heights and col widths are, and calculate
+// min size from that.
+wxSize wxGridBagSizer::CalcMin()
+{
+    int idx;
+
+    if (m_children.GetCount() == 0)
+        return m_emptyCellSize;
+
+    m_rowHeights.Empty();
+    m_colWidths.Empty();
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+        if ( item->ShouldAccountFor() )
+        {
+            int row, col, endrow, endcol;
+
+            item->GetPos(row, col);
+            item->GetEndPos(endrow, endcol);
+
+            // fill heights and widths upto this item if needed
+            while ( m_rowHeights.GetCount() <= (size_t)endrow )
+                m_rowHeights.Add(m_emptyCellSize.GetHeight());
+            while ( m_colWidths.GetCount() <= (size_t)endcol )
+                m_colWidths.Add(m_emptyCellSize.GetWidth());
+
+            // See if this item increases the size of its row(s) or col(s)
+            wxSize size(item->CalcMin());
+            for (idx=row; idx <= endrow; idx++)
+                m_rowHeights[idx] = wxMax(m_rowHeights[idx], size.GetHeight() / (endrow-row+1));
+            for (idx=col; idx <= endcol; idx++)
+                m_colWidths[idx] = wxMax(m_colWidths[idx], size.GetWidth() / (endcol-col+1));
+        }
+        node = node->GetNext();
+    }
+
+    AdjustForOverflow();
+    AdjustForFlexDirection();
+
+    // Now traverse the heights and widths arrays calcing the totals, including gaps
+    int width = 0;
+    m_cols = m_colWidths.GetCount();
+    for (idx=0; idx < m_cols; idx++)
+        width += m_colWidths[idx] + ( idx == m_cols-1 ? 0 : m_hgap );
+
+    int height = 0;
+    m_rows = m_rowHeights.GetCount();
+    for (idx=0; idx < m_rows; idx++)
+        height += m_rowHeights[idx] + ( idx == m_rows-1 ? 0 : m_vgap );
+
+    m_calculatedMinSize = wxSize(width, height);
+    return m_calculatedMinSize;
+}
+
+
+
+void wxGridBagSizer::RecalcSizes()
+{
+    if (m_children.GetCount() == 0)
+        return;
+
+    wxPoint pt( GetPosition() );
+    wxSize  sz( GetSize() );
+
+    m_rows = m_rowHeights.GetCount();
+    m_cols = m_colWidths.GetCount();
+    int idx, width, height;
+
+    AdjustForGrowables(sz, m_calculatedMinSize, m_rows, m_cols);
+
+    // Find the start positions on the window of the rows and columns
+    wxArrayInt rowpos;
+    rowpos.Add(0, m_rows);
+    int y = pt.y;
+    for (idx=0; idx < m_rows; idx++)
+    {
+        height = m_rowHeights[idx] + m_vgap;
+        rowpos[idx] = y;
+        y += height;
+    }
+
+    wxArrayInt colpos;
+    colpos.Add(0, m_cols);
+    int x = pt.x;
+    for (idx=0; idx < m_cols; idx++)
+    {
+        width = m_colWidths[idx] + m_hgap;
+        colpos[idx] = x;
+        x += width;
+    }
+
+
+    // Now iterate the children, setting each child's dimensions
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        int row, col, endrow, endcol;
+        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+
+        if ( item->ShouldAccountFor() )
+        {
+            item->GetPos(row, col);
+            item->GetEndPos(endrow, endcol);
+
+            height = 0;
+            for(idx=row; idx <= endrow; idx++)
+                height += m_rowHeights[idx];
+            height += (endrow - row) * m_vgap; // add a vgap for every row spanned
+
+            width = 0;
+            for (idx=col; idx <= endcol; idx++)
+                width += m_colWidths[idx];
+            width += (endcol - col) * m_hgap; // add a hgap for every col spanned
+
+            SetItemBounds(item, colpos[col], rowpos[row], width, height);
+        }
+
+        node = node->GetNext();
+    }
+}
+
+
+// Sometimes CalcMin can result in some rows or cols having too much space in
+// them because as it traverses the items it makes some assumptions when
+// items span to other cells.  But those assumptions can become invalid later
+// on when other items are fitted into the same rows or columns that the
+// spanning item occupies. This method tries to find those situations and
+// fixes them.
+void wxGridBagSizer::AdjustForOverflow()
+{
+    int row, col;
+    
+    for (row=0; row<(int)m_rowHeights.GetCount(); row++)
+    {
+        int rowExtra=INT_MAX;
+        int rowHeight = m_rowHeights[row];
+        for (col=0; col<(int)m_colWidths.GetCount(); col++)
+        {
+            wxGBPosition pos(row,col);
+            wxGBSizerItem* item = FindItemAtPosition(pos);
+            if ( !item || !item->ShouldAccountFor() )
+                continue;
+
+            int endrow, endcol;
+            item->GetEndPos(endrow, endcol);
+            
+            // If the item starts in this position and doesn't span rows, then
+            // just look at the whole item height
+            if ( item->GetPos() == pos && endrow == row )
+            {
+                int itemHeight = item->CalcMin().GetHeight();
+                rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
+                continue;
+            }
+
+            // Otherwise, only look at spanning items if they end on this row
+            if ( endrow == row )
+            {
+                // first deduct the portions of the item that are on prior rows
+                int itemHeight = item->CalcMin().GetHeight();
+                for (int r=item->GetPos().GetRow(); r<row; r++)
+                    itemHeight -= (m_rowHeights[r] + GetHGap());
+
+                if ( itemHeight < 0 )
+                    itemHeight = 0;
+                
+                // and check how much is left
+                rowExtra = wxMin(rowExtra, rowHeight - itemHeight);
+            }
+        }
+        if ( rowExtra && rowExtra != INT_MAX )
+            m_rowHeights[row] -= rowExtra;
+    }
+
+    // Now do the same thing for columns
+    for (col=0; col<(int)m_colWidths.GetCount(); col++)
+    {
+        int colExtra=INT_MAX;
+        int colWidth = m_colWidths[col];
+        for (row=0; row<(int)m_rowHeights.GetCount(); row++)
+        {
+            wxGBPosition pos(row,col);
+            wxGBSizerItem* item = FindItemAtPosition(pos);
+            if ( !item || !item->ShouldAccountFor() )
+                continue;
+
+            int endrow, endcol;
+            item->GetEndPos(endrow, endcol);
+            
+            if ( item->GetPos() == pos && endcol == col )
+            {
+                int itemWidth = item->CalcMin().GetWidth();
+                colExtra = wxMin(colExtra, colWidth - itemWidth);
+                continue;
+            }
+
+            if ( endcol == col )
+            {
+                int itemWidth = item->CalcMin().GetWidth();
+                for (int c=item->GetPos().GetCol(); c<col; c++)
+                    itemWidth -= (m_colWidths[c] + GetVGap());
+
+                if ( itemWidth < 0 )
+                    itemWidth = 0;
+                
+                colExtra = wxMin(colExtra, colWidth - itemWidth);
+            }
+        }
+        if ( colExtra && colExtra != INT_MAX )
+            m_colWidths[col] -= colExtra;
+    }
+}
+
+//---------------------------------------------------------------------------
+
+bool wxGridBagSizer::CheckForIntersection(wxGBSizerItem* item, wxGBSizerItem* excludeItem)
+{
+    return CheckForIntersection(item->GetPos(), item->GetSpan(), excludeItem);
+}
+
+bool wxGridBagSizer::CheckForIntersection(const wxGBPosition& pos, const wxGBSpan& span, wxGBSizerItem* excludeItem)
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxGBSizerItem* item = (wxGBSizerItem*)node->GetData();
+        node = node->GetNext();
+
+        if ( excludeItem && item == excludeItem )
+            continue;
+
+        if ( item->Intersects(pos, span) )
+            return true;
+
+    }
+    return false;
+}
+
+
+// Assumes a 10x10 grid, and returns the first empty cell found.  This is
+// really stupid but it is only used by the Add methods that match the base
+// class virtuals, which should normally not be used anyway...
+wxGBPosition wxGridBagSizer::FindEmptyCell()
+{
+    int row, col;
+
+    for (row=0; row<10; row++)
+        for (col=0; col<10; col++)
+        {
+            wxGBPosition pos(row, col);
+            if ( !CheckForIntersection(pos, wxDefaultSpan) )
+                return pos;
+        }
+    return wxGBPosition(-1, -1);
+}
+
+
+//---------------------------------------------------------------------------
+
+// The Add base class virtuals should not be used with this class, but
+// we'll try to make them automatically select a location for the item
+// anyway.
+
+wxSizerItem* wxGridBagSizer::Add( wxWindow *window, int, int flag, int border, wxObject* userData )
+{
+    return Add(window, FindEmptyCell(), wxDefaultSpan, flag, border, userData);
+}
+
+wxSizerItem* wxGridBagSizer::Add( wxSizer *sizer, int, int flag, int border, wxObject* userData )
+{
+    return Add(sizer, FindEmptyCell(), wxDefaultSpan, flag, border, userData);
+}
+
+wxSizerItem* wxGridBagSizer::Add( int width, int height, int, int flag, int border, wxObject* userData )
+{
+    return Add(width, height, FindEmptyCell(), wxDefaultSpan, flag, border, userData);
+}
+
+
+
+// The Insert nad Prepend base class virtuals that are not appropriate for
+// this class and should not be used.  Their implementation in this class
+// simply fails.
+
+wxSizerItem* wxGridBagSizer::Add( wxSizerItem * )
+{
+    wxFAIL_MSG(wxT("Invalid Add form called."));
+    return (wxSizerItem*)NULL;
+}
+
+wxSizerItem* wxGridBagSizer::Prepend( wxWindow *, int, int, int, wxObject*  )
+{
+    wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
+    return (wxSizerItem*)NULL;
+}
+
+wxSizerItem* wxGridBagSizer::Prepend( wxSizer *, int, int, int, wxObject*  )
+{
+    wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
+    return (wxSizerItem*)NULL;
+}
+
+wxSizerItem* wxGridBagSizer::Prepend( int, int, int, int, int, wxObject*  )
+{
+    wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
+    return (wxSizerItem*)NULL;
+}
+
+wxSizerItem* wxGridBagSizer::Prepend( wxSizerItem * )
+{
+    wxFAIL_MSG(wxT("Prepend should not be used with wxGridBagSizer."));
+    return (wxSizerItem*)NULL;
+}
+
+
+wxSizerItem* wxGridBagSizer::Insert( size_t, wxWindow *, int, int, int, wxObject*  )
+{
+    wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
+    return (wxSizerItem*)NULL;
+}
+
+wxSizerItem* wxGridBagSizer::Insert( size_t, wxSizer *, int, int, int, wxObject*  )
+{
+    wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
+    return (wxSizerItem*)NULL;
+}
+
+wxSizerItem* wxGridBagSizer::Insert( size_t, int, int, int, int, int, wxObject*  )
+{
+    wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
+    return (wxSizerItem*)NULL;
+}
+
+wxSizerItem* wxGridBagSizer::Insert( size_t, wxSizerItem * )
+{
+    wxFAIL_MSG(wxT("Insert should not be used with wxGridBagSizer."));
+    return (wxSizerItem*)NULL;
+}
+
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
diff --git a/Source/3rd Party/wx/src/common/gdicmn.cpp b/Source/3rd Party/wx/src/common/gdicmn.cpp
index 975cd1058..232238853 100644
--- a/Source/3rd Party/wx/src/common/gdicmn.cpp	
+++ b/Source/3rd Party/wx/src/common/gdicmn.cpp	
@@ -1,932 +1,871 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/gdicmn.cpp
-// Purpose:     Common GDI classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/palette.h"
-    #include "wx/icon.h"
-    #include "wx/iconbndl.h"
-    #include "wx/cursor.h"
-    #include "wx/settings.h"
-    #include "wx/bitmap.h"
-    #include "wx/colour.h"
-    #include "wx/font.h"
-    #include "wx/math.h"
-#endif
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxGDIObject, wxObject)
-
-
-WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
-WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
-WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
-
-WXDLLIMPEXP_DATA_CORE(wxColourDatabase*) wxTheColourDatabase;
-
-WXDLLIMPEXP_DATA_CORE(wxBitmap)  wxNullBitmap;
-WXDLLIMPEXP_DATA_CORE(wxBrush)   wxNullBrush;
-WXDLLIMPEXP_DATA_CORE(wxColour)  wxNullColour;
-WXDLLIMPEXP_DATA_CORE(wxCursor)  wxNullCursor;
-WXDLLIMPEXP_DATA_CORE(wxFont)    wxNullFont;
-WXDLLIMPEXP_DATA_CORE(wxIcon)    wxNullIcon;
-WXDLLIMPEXP_DATA_CORE(wxPen)     wxNullPen;
-#if wxUSE_PALETTE
-WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;
-#endif
-WXDLLIMPEXP_DATA_CORE(wxIconBundle) wxNullIconBundle;
-
-const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
-const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);
-
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxPointList)
-
-
-#if wxUSE_EXTENDED_RTTI
-
-// wxPoint
-
-template<> void wxStringReadValue(const wxString &s , wxPoint &data )
-{
-    wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
-}
-
-template<> void wxStringWriteValue(wxString &s , const wxPoint &data )
-{
-    s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
-}
-
-wxCUSTOM_TYPE_INFO(wxPoint, wxToStringConverter<wxPoint> , wxFromStringConverter<wxPoint>)
-
-template<> void wxStringReadValue(const wxString &s , wxSize &data )
-{
-    wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
-}
-
-template<> void wxStringWriteValue(wxString &s , const wxSize &data )
-{
-    s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
-}
-
-wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>)
-
-#endif
-
-wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
-{
-    x = point1.x;
-    y = point1.y;
-    width = point2.x - point1.x;
-    height = point2.y - point1.y;
-
-    if (width < 0)
-    {
-        width = -width;
-        x = point2.x;
-    }
-    width++;
-
-    if (height < 0)
-    {
-        height = -height;
-        y = point2.y;
-    }
-    height++;
-}
-
-wxRect& wxRect::Union(const wxRect& rect)
-{
-    // ignore empty rectangles: union with an empty rectangle shouldn't extend
-    // this one to (0, 0)
-    if ( !width || !height )
-    {
-        *this = rect;
-    }
-    else if ( rect.width && rect.height )
-    {
-        int x1 = wxMin(x, rect.x);
-        int y1 = wxMin(y, rect.y);
-        int y2 = wxMax(y + height, rect.height + rect.y);
-        int x2 = wxMax(x + width, rect.width + rect.x);
-
-        x = x1;
-        y = y1;
-        width = x2 - x1;
-        height = y2 - y1;
-    }
-    //else: we're not empty and rect is empty
-
-    return *this;
-}
-
-wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
-{
-     if (-2*dx>width)
-     {
-         // Don't allow deflate to eat more width than we have,
-         // a well-defined rectangle cannot have negative width.
-         x+=width/2;
-         width=0;
-     }
-     else
-     {
-         // The inflate is valid.
-         x-=dx;
-         width+=2*dx;
-     }
-
-     if (-2*dy>height)
-     {
-         // Don't allow deflate to eat more height than we have,
-         // a well-defined rectangle cannot have negative height.
-         y+=height/2;
-         height=0;
-     }
-     else
-     {
-         // The inflate is valid.
-         y-=dy;
-         height+=2*dy;
-     }
-
-    return *this;
-}
-
-bool wxRect::Contains(int cx, int cy) const
-{
-    return ( (cx >= x) && (cy >= y)
-          && ((cy - y) < height)
-          && ((cx - x) < width)
-          );
-}
-
-bool wxRect::Contains(const wxRect& rect) const
-{
-    return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight());
-}
-
-wxRect& wxRect::Intersect(const wxRect& rect)
-{
-    int x2 = GetRight(),
-        y2 = GetBottom();
-
-    if ( x < rect.x )
-        x = rect.x;
-    if ( y < rect.y )
-        y = rect.y;
-    if ( x2 > rect.GetRight() )
-        x2 = rect.GetRight();
-    if ( y2 > rect.GetBottom() )
-        y2 = rect.GetBottom();
-
-    width = x2 - x + 1;
-    height = y2 - y + 1;
-
-    if ( width <= 0 || height <= 0 )
-    {
-        width =
-        height = 0;
-    }
-
-    return *this;
-}
-
-bool wxRect::Intersects(const wxRect& rect) const
-{
-    wxRect r = Intersect(rect);
-
-    // if there is no intersection, both width and height are 0
-    return r.width != 0;
-}
-
-wxRect& wxRect::operator+=(const wxRect& rect)
-{
-    *this = *this + rect;
-    return *this;
-}
-
-
-wxRect& wxRect::operator*=(const wxRect& rect)
-{
-    *this = *this * rect;
-    return *this;
-}
-
-
-wxRect operator+(const wxRect& r1, const wxRect& r2)
-{
-    int x1 = wxMin(r1.x, r2.x);
-    int y1 = wxMin(r1.y, r2.y);
-    int y2 = wxMax(r1.y+r1.height, r2.height+r2.y);
-    int x2 = wxMax(r1.x+r1.width, r2.width+r2.x);
-    return wxRect(x1, y1, x2-x1, y2-y1);
-}
-
-wxRect operator*(const wxRect& r1, const wxRect& r2)
-{
-    int x1 = wxMax(r1.x, r2.x);
-    int y1 = wxMax(r1.y, r2.y);
-    int y2 = wxMin(r1.y+r1.height, r2.height+r2.y);
-    int x2 = wxMin(r1.x+r1.width, r2.width+r2.x);
-    return wxRect(x1, y1, x2-x1, y2-y1);
-}
-
-wxRealPoint::wxRealPoint(const wxPoint& pt)
- : x(pt.x), y(pt.y)
-{
-}
-
-// ============================================================================
-// wxColourDatabase
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxColourDatabase ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxColourDatabase::wxColourDatabase ()
-{
-    // will be created on demand in Initialize()
-    m_map = NULL;
-}
-
-wxColourDatabase::~wxColourDatabase ()
-{
-    if ( m_map )
-    {
-        WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map);
-
-        delete m_map;
-    }
-
-#ifdef __WXPM__
-    delete [] m_palTable;
-#endif
-}
-
-// Colour database stuff
-void wxColourDatabase::Initialize()
-{
-    if ( m_map )
-    {
-        // already initialized
-        return;
-    }
-
-    m_map = new wxStringToColourHashMap;
-
-    static const struct wxColourDesc
-    {
-        const wxChar *name;
-        unsigned char r,g,b;
-    }
-    wxColourTable[] =
-    {
-        {wxT("AQUAMARINE"),112, 219, 147},
-        {wxT("BLACK"),0, 0, 0},
-        {wxT("BLUE"), 0, 0, 255},
-        {wxT("BLUE VIOLET"), 159, 95, 159},
-        {wxT("BROWN"), 165, 42, 42},
-        {wxT("CADET BLUE"), 95, 159, 159},
-        {wxT("CORAL"), 255, 127, 0},
-        {wxT("CORNFLOWER BLUE"), 66, 66, 111},
-        {wxT("CYAN"), 0, 255, 255},
-        {wxT("DARK GREY"), 47, 47, 47},   // ?
-
-        {wxT("DARK GREEN"), 47, 79, 47},
-        {wxT("DARK OLIVE GREEN"), 79, 79, 47},
-        {wxT("DARK ORCHID"), 153, 50, 204},
-        {wxT("DARK SLATE BLUE"), 107, 35, 142},
-        {wxT("DARK SLATE GREY"), 47, 79, 79},
-        {wxT("DARK TURQUOISE"), 112, 147, 219},
-        {wxT("DIM GREY"), 84, 84, 84},
-        {wxT("FIREBRICK"), 142, 35, 35},
-        {wxT("FOREST GREEN"), 35, 142, 35},
-        {wxT("GOLD"), 204, 127, 50},
-        {wxT("GOLDENROD"), 219, 219, 112},
-        {wxT("GREY"), 128, 128, 128},
-        {wxT("GREEN"), 0, 255, 0},
-        {wxT("GREEN YELLOW"), 147, 219, 112},
-        {wxT("INDIAN RED"), 79, 47, 47},
-        {wxT("KHAKI"), 159, 159, 95},
-        {wxT("LIGHT BLUE"), 191, 216, 216},
-        {wxT("LIGHT GREY"), 192, 192, 192},
-        {wxT("LIGHT STEEL BLUE"), 143, 143, 188},
-        {wxT("LIME GREEN"), 50, 204, 50},
-        {wxT("LIGHT MAGENTA"), 255, 0, 255},
-        {wxT("MAGENTA"), 255, 0, 255},
-        {wxT("MAROON"), 142, 35, 107},
-        {wxT("MEDIUM AQUAMARINE"), 50, 204, 153},
-        {wxT("MEDIUM GREY"), 100, 100, 100},
-        {wxT("MEDIUM BLUE"), 50, 50, 204},
-        {wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
-        {wxT("MEDIUM GOLDENROD"), 234, 234, 173},
-        {wxT("MEDIUM ORCHID"), 147, 112, 219},
-        {wxT("MEDIUM SEA GREEN"), 66, 111, 66},
-        {wxT("MEDIUM SLATE BLUE"), 127, 0, 255},
-        {wxT("MEDIUM SPRING GREEN"), 127, 255, 0},
-        {wxT("MEDIUM TURQUOISE"), 112, 219, 219},
-        {wxT("MEDIUM VIOLET RED"), 219, 112, 147},
-        {wxT("MIDNIGHT BLUE"), 47, 47, 79},
-        {wxT("NAVY"), 35, 35, 142},
-        {wxT("ORANGE"), 204, 50, 50},
-        {wxT("ORANGE RED"), 255, 0, 127},
-        {wxT("ORCHID"), 219, 112, 219},
-        {wxT("PALE GREEN"), 143, 188, 143},
-        {wxT("PINK"), 255, 192, 203},
-        {wxT("PLUM"), 234, 173, 234},
-        {wxT("PURPLE"), 176, 0, 255},
-        {wxT("RED"), 255, 0, 0},
-        {wxT("SALMON"), 111, 66, 66},
-        {wxT("SEA GREEN"), 35, 142, 107},
-        {wxT("SIENNA"), 142, 107, 35},
-        {wxT("SKY BLUE"), 50, 153, 204},
-        {wxT("SLATE BLUE"), 0, 127, 255},
-        {wxT("SPRING GREEN"), 0, 255, 127},
-        {wxT("STEEL BLUE"), 35, 107, 142},
-        {wxT("TAN"), 219, 147, 112},
-        {wxT("THISTLE"), 216, 191, 216},
-        {wxT("TURQUOISE"), 173, 234, 234},
-        {wxT("VIOLET"), 79, 47, 79},
-        {wxT("VIOLET RED"), 204, 50, 153},
-        {wxT("WHEAT"), 216, 216, 191},
-        {wxT("WHITE"), 255, 255, 255},
-        {wxT("YELLOW"), 255, 255, 0},
-        {wxT("YELLOW GREEN"), 153, 204, 50}
-    };
-
-    size_t n;
-
-    for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
-    {
-        const wxColourDesc& cc = wxColourTable[n];
-        (*m_map)[cc.name] = new wxColour(cc.r, cc.g, cc.b);
-    }
-
-#ifdef __WXPM__
-    m_palTable = new long[n];
-    for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
-    {
-        const wxColourDesc& cc = wxColourTable[n];
-        m_palTable[n] = OS2RGB(cc.r,cc.g,cc.b);
-    }
-    m_nSize = n;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// wxColourDatabase operations
-// ----------------------------------------------------------------------------
-
-void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour)
-{
-    Initialize();
-
-    // canonicalize the colour names before using them as keys: they should be
-    // in upper case
-    wxString colName = name;
-    colName.MakeUpper();
-
-    // ... and we also allow both grey/gray
-    wxString colNameAlt = colName;
-    if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) )
-    {
-        // but in this case it is not necessary so avoid extra search below
-        colNameAlt.clear();
-    }
-
-    wxStringToColourHashMap::iterator it = m_map->find(colName);
-    if ( it == m_map->end() && !colNameAlt.empty() )
-        it = m_map->find(colNameAlt);
-    if ( it != m_map->end() )
-    {
-        *(it->second) = colour;
-    }
-    else // new colour
-    {
-        (*m_map)[colName] = new wxColour(colour);
-    }
-}
-
-wxColour wxColourDatabase::Find(const wxString& colour) const
-{
-    wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
-    self->Initialize();
-
-    // make the comparaison case insensitive and also match both grey and gray
-    wxString colName = colour;
-    colName.MakeUpper();
-    wxString colNameAlt = colName;
-    if ( !colNameAlt.Replace(wxT("GRAY"), wxT("GREY")) )
-        colNameAlt.clear();
-
-    wxStringToColourHashMap::iterator it = m_map->find(colName);
-    if ( it == m_map->end() && !colNameAlt.empty() )
-        it = m_map->find(colNameAlt);
-    if ( it != m_map->end() )
-        return *(it->second);
-
-    // we did not find any result in existing colours:
-    // we won't use wxString -> wxColour conversion because the
-    // wxColour::Set(const wxString &) function which does that conversion
-    // internally uses this function (wxColourDatabase::Find) and we want
-    // to avoid infinite recursion !
-    return wxNullColour;
-}
-
-wxString wxColourDatabase::FindName(const wxColour& colour) const
-{
-    wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
-    self->Initialize();
-
-    typedef wxStringToColourHashMap::iterator iterator;
-
-    for ( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it )
-    {
-        if ( *(it->second) == colour )
-            return it->first;
-    }
-
-    return wxEmptyString;
-}
-
-// ----------------------------------------------------------------------------
-// deprecated wxColourDatabase methods
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_6
-wxColour *wxColourDatabase::FindColour(const wxString& name)
-{
-    // This function is deprecated, use Find() instead.
-    // Formerly this function sometimes would return a deletable pointer and
-    // sometimes a non-deletable one (when returning a colour from the database).
-    // Trying to delete the latter anyway results in problems, so probably
-    // nobody ever freed the pointers. Currently it always returns a new
-    // instance, which means there will be memory leaks.
-    wxLogDebug(wxT("wxColourDataBase::FindColour():")
-        wxT(" Please use wxColourDataBase::Find() instead"));
-
-    // using a static variable here is not the most elegant solution but unless
-    // we want to make wxStringToColourHashMap public (i.e. move it to the
-    // header) so that we could have a member function returning
-    // wxStringToColourHashMap::iterator, there is really no good way to do it
-    // otherwise
-    //
-    // and knowing that this function is going to disappear in the next release
-    // anyhow I don't want to waste time on this
-
-    static wxColour s_col;
-
-    s_col = Find(name);
-    if ( !s_col.IsOk() )
-        return NULL;
-
-    return new wxColour(s_col);
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
-// ============================================================================
-// stock objects
-// ============================================================================
-
-static wxStockGDI gs_wxStockGDI_instance;
-wxStockGDI* wxStockGDI::ms_instance = &gs_wxStockGDI_instance;
-wxObject* wxStockGDI::ms_stockObject[ITEMCOUNT];
-
-wxStockGDI::wxStockGDI()
-{
-}
-
-wxStockGDI::~wxStockGDI()
-{
-}
-
-void wxStockGDI::DeleteAll()
-{
-    for (unsigned i = 0; i < ITEMCOUNT; i++)
-    {
-        wxDELETE(ms_stockObject[i]);
-    }
-}
-
-const wxBrush* wxStockGDI::GetBrush(Item item)
-{
-    wxBrush* brush = static_cast<wxBrush*>(ms_stockObject[item]);
-    if (brush == NULL)
-    {
-        switch (item)
-        {
-        case BRUSH_BLACK:
-            brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_SOLID);
-            break;
-        case BRUSH_BLUE:
-            brush = new wxBrush(*GetColour(COLOUR_BLUE), wxBRUSHSTYLE_SOLID);
-            break;
-        case BRUSH_CYAN:
-            brush = new wxBrush(*GetColour(COLOUR_CYAN), wxBRUSHSTYLE_SOLID);
-            break;
-        case BRUSH_GREEN:
-            brush = new wxBrush(*GetColour(COLOUR_GREEN), wxBRUSHSTYLE_SOLID);
-            break;
-        case BRUSH_YELLOW:
-            brush = new wxBrush(*GetColour(COLOUR_YELLOW), wxBRUSHSTYLE_SOLID);
-            break;
-        case BRUSH_GREY:
-            brush = new wxBrush(wxColour(wxT("GREY")), wxBRUSHSTYLE_SOLID);
-            break;
-        case BRUSH_LIGHTGREY:
-            brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxBRUSHSTYLE_SOLID);
-            break;
-        case BRUSH_MEDIUMGREY:
-            brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxBRUSHSTYLE_SOLID);
-            break;
-        case BRUSH_RED:
-            brush = new wxBrush(*GetColour(COLOUR_RED), wxBRUSHSTYLE_SOLID);
-            break;
-        case BRUSH_TRANSPARENT:
-            brush = new wxBrush(*GetColour(COLOUR_BLACK), wxBRUSHSTYLE_TRANSPARENT);
-            break;
-        case BRUSH_WHITE:
-            brush = new wxBrush(*GetColour(COLOUR_WHITE), wxBRUSHSTYLE_SOLID);
-            break;
-        default:
-            wxFAIL;
-        }
-        ms_stockObject[item] = brush;
-    }
-    return brush;
-}
-
-const wxColour* wxStockGDI::GetColour(Item item)
-{
-    wxColour* colour = static_cast<wxColour*>(ms_stockObject[item]);
-    if (colour == NULL)
-    {
-        switch (item)
-        {
-        case COLOUR_BLACK:
-            colour = new wxColour(0, 0, 0);
-            break;
-        case COLOUR_BLUE:
-            colour = new wxColour(0, 0, 255);
-            break;
-        case COLOUR_CYAN:
-            colour = new wxColour(wxT("CYAN"));
-            break;
-        case COLOUR_GREEN:
-            colour = new wxColour(0, 255, 0);
-            break;
-        case COLOUR_YELLOW:
-            colour = new wxColour(255, 255, 0);
-            break;
-        case COLOUR_LIGHTGREY:
-            colour = new wxColour(wxT("LIGHT GREY"));
-            break;
-        case COLOUR_RED:
-            colour = new wxColour(255, 0, 0);
-            break;
-        case COLOUR_WHITE:
-            colour = new wxColour(255, 255, 255);
-            break;
-        default:
-            wxFAIL;
-        }
-        ms_stockObject[item] = colour;
-    }
-    return colour;
-}
-
-const wxCursor* wxStockGDI::GetCursor(Item item)
-{
-    wxCursor* cursor = static_cast<wxCursor*>(ms_stockObject[item]);
-    if (cursor == NULL)
-    {
-        switch (item)
-        {
-        case CURSOR_CROSS:
-            cursor = new wxCursor(wxCURSOR_CROSS);
-            break;
-        case CURSOR_HOURGLASS:
-            cursor = new wxCursor(wxCURSOR_WAIT);
-            break;
-        case CURSOR_STANDARD:
-            cursor = new wxCursor(wxCURSOR_ARROW);
-            break;
-        default:
-            wxFAIL;
-        }
-        ms_stockObject[item] = cursor;
-    }
-    return cursor;
-}
-
-const wxFont* wxStockGDI::GetFont(Item item)
-{
-    wxFont* font = static_cast<wxFont*>(ms_stockObject[item]);
-    if (font == NULL)
-    {
-        switch (item)
-        {
-        case FONT_ITALIC:
-            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxROMAN, wxITALIC, wxNORMAL);
-            break;
-        case FONT_NORMAL:
-            font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-            break;
-        case FONT_SMALL:
-            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize()
-                    // Using the font 2 points smaller than the normal one
-                    // results in font so small as to be unreadable under MSW.
-                    // We might want to actually use -1 under the other
-                    // platforms too but for now be conservative and keep -2
-                    // there for compatibility with the old behaviour as the
-                    // small font seems to be readable enough there as it is.
-#ifdef __WXMSW__
-                    - 1,
-#else
-                    - 2,
-#endif
-                    wxSWISS, wxNORMAL, wxNORMAL);
-            break;
-        case FONT_SWISS:
-            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxSWISS, wxNORMAL, wxNORMAL);
-            break;
-        default:
-            wxFAIL;
-        }
-        ms_stockObject[item] = font;
-    }
-    return font;
-}
-
-const wxPen* wxStockGDI::GetPen(Item item)
-{
-    wxPen* pen = static_cast<wxPen*>(ms_stockObject[item]);
-    if (pen == NULL)
-    {
-        switch (item)
-        {
-        case PEN_BLACK:
-            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SOLID);
-            break;
-        case PEN_BLACKDASHED:
-            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_SHORT_DASH);
-            break;
-        case PEN_BLUE:
-            pen = new wxPen(*GetColour(COLOUR_BLUE), 1, wxPENSTYLE_SOLID);
-            break;
-        case PEN_CYAN:
-            pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxPENSTYLE_SOLID);
-            break;
-        case PEN_GREEN:
-            pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxPENSTYLE_SOLID);
-            break;
-        case PEN_YELLOW:
-            pen = new wxPen(*GetColour(COLOUR_YELLOW), 1, wxPENSTYLE_SOLID);
-            break;
-        case PEN_GREY:
-            pen = new wxPen(wxColour(wxT("GREY")), 1, wxPENSTYLE_SOLID);
-            break;
-        case PEN_LIGHTGREY:
-            pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxPENSTYLE_SOLID);
-            break;
-        case PEN_MEDIUMGREY:
-            pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxPENSTYLE_SOLID);
-            break;
-        case PEN_RED:
-            pen = new wxPen(*GetColour(COLOUR_RED), 1, wxPENSTYLE_SOLID);
-            break;
-        case PEN_TRANSPARENT:
-            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxPENSTYLE_TRANSPARENT);
-            break;
-        case PEN_WHITE:
-            pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxPENSTYLE_SOLID);
-            break;
-        default:
-            wxFAIL;
-        }
-        ms_stockObject[item] = pen;
-    }
-    return pen;
-}
-
-void wxInitializeStockLists()
-{
-    wxTheColourDatabase = new wxColourDatabase;
-
-    wxTheBrushList = new wxBrushList;
-    wxThePenList = new wxPenList;
-    wxTheFontList = new wxFontList;
-}
-
-void wxDeleteStockLists()
-{
-    wxDELETE(wxTheBrushList);
-    wxDELETE(wxThePenList);
-    wxDELETE(wxTheFontList);
-
-    // wxTheColourDatabase is cleaned up by wxAppBase::CleanUp()
-}
-
-// ============================================================================
-// wxTheXXXList stuff (semi-obsolete)
-// ============================================================================
-
-wxGDIObjListBase::wxGDIObjListBase()
-{
-}
-
-wxGDIObjListBase::~wxGDIObjListBase()
-{
-    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
-    {
-        delete static_cast<wxObject*>(node->GetData());
-    }
-}
-
-wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, wxPenStyle style)
-{
-    for ( wxList::compatibility_iterator node = list.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxPen * const pen = (wxPen *) node->GetData();
-        if ( pen->GetWidth () == width &&
-                pen->GetStyle () == style &&
-                    pen->GetColour() == colour )
-            return pen;
-    }
-
-    wxPen* pen = NULL;
-    wxPen penTmp(colour, width, style);
-    if (penTmp.IsOk())
-    {
-        pen = new wxPen(penTmp);
-        list.Append(pen);
-    }
-
-    return pen;
-}
-
-wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, wxBrushStyle style)
-{
-    for ( wxList::compatibility_iterator node = list.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxBrush * const brush = (wxBrush *) node->GetData ();
-        if ( brush->GetStyle() == style && brush->GetColour() == colour )
-            return brush;
-    }
-
-    wxBrush* brush = NULL;
-    wxBrush brushTmp(colour, style);
-    if (brushTmp.IsOk())
-    {
-        brush = new wxBrush(brushTmp);
-        list.Append(brush);
-    }
-
-    return brush;
-}
-
-wxFont *wxFontList::FindOrCreateFont(int pointSize,
-                                     wxFontFamily family,
-                                     wxFontStyle style,
-                                     wxFontWeight weight,
-                                     bool underline,
-                                     const wxString& facename,
-                                     wxFontEncoding encoding)
-{
-    wxFont *font;
-    wxList::compatibility_iterator node;
-    for (node = list.GetFirst(); node; node = node->GetNext())
-    {
-        font = (wxFont *)node->GetData();
-        if (
-             font->GetPointSize () == pointSize &&
-             font->GetStyle () == style &&
-             font->GetWeight () == weight &&
-             font->GetUnderlined () == underline )
-        {
-            wxFontFamily fontFamily = (wxFontFamily)font->GetFamily();
-
-#if defined(__WXGTK__)
-            // under GTK the default family is wxSWISS, so looking for a font
-            // with wxDEFAULT family should return a wxSWISS one instead of
-            // creating a new one
-            bool same = (fontFamily == family) ||
-                        (fontFamily == wxFONTFAMILY_SWISS && family == wxFONTFAMILY_DEFAULT);
-#else // !GTK
-            // VZ: but why elsewhere do we require an exact match? mystery...
-            bool same = fontFamily == family;
-#endif // GTK/!GTK
-
-            // empty facename matches anything at all: this is bad because
-            // depending on which fonts are already created, we might get back
-            // a different font if we create it with empty facename, but it is
-            // still better than never matching anything in the cache at all
-            // in this case
-            if ( same && !facename.empty() )
-            {
-                const wxString& fontFace = font->GetFaceName();
-
-                // empty facename matches everything
-                same = !fontFace || fontFace == facename;
-            }
-
-            if ( same && (encoding != wxFONTENCODING_DEFAULT) )
-            {
-                // have to match the encoding too
-                same = font->GetEncoding() == encoding;
-            }
-
-            if ( same )
-            {
-                return font;
-            }
-        }
-    }
-
-    // font not found, create the new one
-    font = NULL;
-    wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding);
-    if (fontTmp.IsOk())
-    {
-        font = new wxFont(fontTmp);
-        list.Append(font);
-    }
-
-    return font;
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-void wxBrushList::AddBrush(wxBrush*) { }
-void wxBrushList::RemoveBrush(wxBrush*) { }
-void wxFontList::AddFont(wxFont*) { }
-void wxFontList::RemoveFont(wxFont*) { }
-void wxPenList::AddPen(wxPen*) { }
-void wxPenList::RemovePen(wxPen*) { }
-#endif
-
-wxSize wxGetDisplaySize()
-{
-    int x, y;
-    wxDisplaySize(& x, & y);
-    return wxSize(x, y);
-}
-
-wxRect wxGetClientDisplayRect()
-{
-    int x, y, width, height;
-    wxClientDisplayRect(&x, &y, &width, &height);  // call plat-specific version
-    return wxRect(x, y, width, height);
-}
-
-wxSize wxGetDisplaySizeMM()
-{
-    int x, y;
-    wxDisplaySizeMM(& x, & y);
-    return wxSize(x, y);
-}
-
-wxSize wxGetDisplayPPI()
-{
-    const wxSize pixels = wxGetDisplaySize();
-    const wxSize mm = wxGetDisplaySizeMM();
-
-    return wxSize((int)((pixels.x * inches2mm) / mm.x),
-                  (int)((pixels.y * inches2mm) / mm.y));
-}
-
-wxResourceCache::~wxResourceCache ()
-{
-    wxList::compatibility_iterator node = GetFirst ();
-    while (node) {
-        wxObject *item = (wxObject *)node->GetData();
-        delete item;
-
-        node = node->GetNext ();
-    }
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/gdicmn.cpp
+// Purpose:     Common GDI classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id: gdicmn.cpp 50022 2007-11-17 14:24:18Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/gdicmn.h"
+#include "wx/gdiobj.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/pen.h"
+    #include "wx/brush.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/cursor.h"
+    #include "wx/settings.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+    #include "wx/font.h"
+#endif
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
+
+
+WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
+WXDLLIMPEXP_DATA_CORE(wxFontList*)  wxTheFontList;
+WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
+
+WXDLLIMPEXP_DATA_CORE(wxColourDatabase*) wxTheColourDatabase;
+
+WXDLLIMPEXP_DATA_CORE(wxBitmap)  wxNullBitmap;
+WXDLLIMPEXP_DATA_CORE(wxBrush)   wxNullBrush;
+WXDLLIMPEXP_DATA_CORE(wxColour)  wxNullColour;
+WXDLLIMPEXP_DATA_CORE(wxCursor)  wxNullCursor;
+WXDLLIMPEXP_DATA_CORE(wxFont)    wxNullFont;
+WXDLLIMPEXP_DATA_CORE(wxIcon)    wxNullIcon;
+WXDLLIMPEXP_DATA_CORE(wxPen)     wxNullPen;
+#if wxUSE_PALETTE
+WXDLLIMPEXP_DATA_CORE(wxPalette) wxNullPalette;
+#endif
+
+const wxSize wxDefaultSize(wxDefaultCoord, wxDefaultCoord);
+const wxPoint wxDefaultPosition(wxDefaultCoord, wxDefaultCoord);
+
+#if wxUSE_EXTENDED_RTTI
+
+// wxPoint
+
+template<> void wxStringReadValue(const wxString &s , wxPoint &data )
+{
+    wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxPoint &data )
+{
+    s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
+}
+
+wxCUSTOM_TYPE_INFO(wxPoint, wxToStringConverter<wxPoint> , wxFromStringConverter<wxPoint>)
+
+template<> void wxStringReadValue(const wxString &s , wxSize &data )
+{
+    wxSscanf(s, wxT("%d,%d"), &data.x , &data.y ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxSize &data )
+{
+    s = wxString::Format(wxT("%d,%d"), data.x , data.y ) ;
+}
+
+wxCUSTOM_TYPE_INFO(wxSize, wxToStringConverter<wxSize> , wxFromStringConverter<wxSize>)
+
+#endif
+
+wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
+{
+    x = point1.x;
+    y = point1.y;
+    width = point2.x - point1.x;
+    height = point2.y - point1.y;
+
+    if (width < 0)
+    {
+        width = -width;
+        x = point2.x;
+    }
+    width++;
+
+    if (height < 0)
+    {
+        height = -height;
+        y = point2.y;
+    }
+    height++;
+}
+
+bool wxRect::operator==(const wxRect& rect) const
+{
+    return ((x == rect.x) &&
+            (y == rect.y) &&
+            (width == rect.width) &&
+            (height == rect.height));
+}
+
+wxRect wxRect::operator+(const wxRect& rect) const
+{
+    int x1 = wxMin(this->x, rect.x);
+    int y1 = wxMin(this->y, rect.y);
+    int y2 = wxMax(y+height, rect.height+rect.y);
+    int x2 = wxMax(x+width, rect.width+rect.x);
+    return wxRect(x1, y1, x2-x1, y2-y1);
+}
+
+wxRect& wxRect::Union(const wxRect& rect)
+{
+    // ignore empty rectangles: union with an empty rectangle shouldn't extend
+    // this one to (0, 0)
+    if ( !width || !height )
+    {
+        *this = rect;
+    }
+    else if ( rect.width && rect.height )
+    {
+        int x1 = wxMin(x, rect.x);
+        int y1 = wxMin(y, rect.y);
+        int y2 = wxMax(y + height, rect.height + rect.y);
+        int x2 = wxMax(x + width, rect.width + rect.x);
+
+        x = x1;
+        y = y1;
+        width = x2 - x1;
+        height = y2 - y1;
+    }
+    //else: we're not empty and rect is empty
+
+    return *this;
+}
+
+wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
+{
+     if (-2*dx>width)
+     {
+         // Don't allow deflate to eat more width than we have,
+         // a well-defined rectangle cannot have negative width.
+         x+=width/2;
+         width=0;
+     }
+     else
+     {
+         // The inflate is valid.
+         x-=dx;
+         width+=2*dx;
+     }
+
+     if (-2*dy>height)
+     {
+         // Don't allow deflate to eat more height than we have,
+         // a well-defined rectangle cannot have negative height.
+         y+=height/2;
+         height=0;
+     }
+     else
+     {
+         // The inflate is valid.
+         y-=dy;
+         height+=2*dy;
+     }
+
+    return *this;
+}
+
+bool wxRect::Contains(int cx, int cy) const
+{
+    return ( (cx >= x) && (cy >= y)
+          && ((cy - y) < height)
+          && ((cx - x) < width)
+          );
+}
+
+bool wxRect::Contains(const wxRect& rect) const
+{
+    return Contains(rect.GetTopLeft()) && Contains(rect.GetBottomRight());
+}
+
+wxRect& wxRect::Intersect(const wxRect& rect)
+{
+    int x2 = GetRight(),
+        y2 = GetBottom();
+
+    if ( x < rect.x )
+        x = rect.x;
+    if ( y < rect.y )
+        y = rect.y;
+    if ( x2 > rect.GetRight() )
+        x2 = rect.GetRight();
+    if ( y2 > rect.GetBottom() )
+        y2 = rect.GetBottom();
+
+    width = x2 - x + 1;
+    height = y2 - y + 1;
+
+    if ( width <= 0 || height <= 0 )
+    {
+        width =
+        height = 0;
+    }
+
+    return *this;
+}
+
+bool wxRect::Intersects(const wxRect& rect) const
+{
+    wxRect r = Intersect(rect);
+
+    // if there is no intersection, both width and height are 0
+    return r.width != 0;
+}
+
+// ============================================================================
+// wxColourDatabase
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxColourDatabase ctor/dtor
+// ----------------------------------------------------------------------------
+
+wxColourDatabase::wxColourDatabase ()
+{
+    // will be created on demand in Initialize()
+    m_map = NULL;
+}
+
+wxColourDatabase::~wxColourDatabase ()
+{
+    if ( m_map )
+    {
+        WX_CLEAR_HASH_MAP(wxStringToColourHashMap, *m_map);
+
+        delete m_map;
+    }
+
+#ifdef __WXPM__
+    delete [] m_palTable;
+#endif
+}
+
+// Colour database stuff
+void wxColourDatabase::Initialize()
+{
+    if ( m_map )
+    {
+        // already initialized
+        return;
+    }
+
+    m_map = new wxStringToColourHashMap;
+
+    static const struct wxColourDesc
+    {
+        const wxChar *name;
+        unsigned char r,g,b;
+    }
+    wxColourTable[] =
+    {
+        {wxT("AQUAMARINE"),112, 219, 147},
+        {wxT("BLACK"),0, 0, 0},
+        {wxT("BLUE"), 0, 0, 255},
+        {wxT("BLUE VIOLET"), 159, 95, 159},
+        {wxT("BROWN"), 165, 42, 42},
+        {wxT("CADET BLUE"), 95, 159, 159},
+        {wxT("CORAL"), 255, 127, 0},
+        {wxT("CORNFLOWER BLUE"), 66, 66, 111},
+        {wxT("CYAN"), 0, 255, 255},
+        {wxT("DARK GREY"), 47, 47, 47},   // ?
+
+        {wxT("DARK GREEN"), 47, 79, 47},
+        {wxT("DARK OLIVE GREEN"), 79, 79, 47},
+        {wxT("DARK ORCHID"), 153, 50, 204},
+        {wxT("DARK SLATE BLUE"), 107, 35, 142},
+        {wxT("DARK SLATE GREY"), 47, 79, 79},
+        {wxT("DARK TURQUOISE"), 112, 147, 219},
+        {wxT("DIM GREY"), 84, 84, 84},
+        {wxT("FIREBRICK"), 142, 35, 35},
+        {wxT("FOREST GREEN"), 35, 142, 35},
+        {wxT("GOLD"), 204, 127, 50},
+        {wxT("GOLDENROD"), 219, 219, 112},
+        {wxT("GREY"), 128, 128, 128},
+        {wxT("GREEN"), 0, 255, 0},
+        {wxT("GREEN YELLOW"), 147, 219, 112},
+        {wxT("INDIAN RED"), 79, 47, 47},
+        {wxT("KHAKI"), 159, 159, 95},
+        {wxT("LIGHT BLUE"), 191, 216, 216},
+        {wxT("LIGHT GREY"), 192, 192, 192},
+        {wxT("LIGHT STEEL BLUE"), 143, 143, 188},
+        {wxT("LIME GREEN"), 50, 204, 50},
+        {wxT("LIGHT MAGENTA"), 255, 0, 255},
+        {wxT("MAGENTA"), 255, 0, 255},
+        {wxT("MAROON"), 142, 35, 107},
+        {wxT("MEDIUM AQUAMARINE"), 50, 204, 153},
+        {wxT("MEDIUM GREY"), 100, 100, 100},
+        {wxT("MEDIUM BLUE"), 50, 50, 204},
+        {wxT("MEDIUM FOREST GREEN"), 107, 142, 35},
+        {wxT("MEDIUM GOLDENROD"), 234, 234, 173},
+        {wxT("MEDIUM ORCHID"), 147, 112, 219},
+        {wxT("MEDIUM SEA GREEN"), 66, 111, 66},
+        {wxT("MEDIUM SLATE BLUE"), 127, 0, 255},
+        {wxT("MEDIUM SPRING GREEN"), 127, 255, 0},
+        {wxT("MEDIUM TURQUOISE"), 112, 219, 219},
+        {wxT("MEDIUM VIOLET RED"), 219, 112, 147},
+        {wxT("MIDNIGHT BLUE"), 47, 47, 79},
+        {wxT("NAVY"), 35, 35, 142},
+        {wxT("ORANGE"), 204, 50, 50},
+        {wxT("ORANGE RED"), 255, 0, 127},
+        {wxT("ORCHID"), 219, 112, 219},
+        {wxT("PALE GREEN"), 143, 188, 143},
+        {wxT("PINK"), 255, 192, 203},
+        {wxT("PLUM"), 234, 173, 234},
+        {wxT("PURPLE"), 176, 0, 255},
+        {wxT("RED"), 255, 0, 0},
+        {wxT("SALMON"), 111, 66, 66},
+        {wxT("SEA GREEN"), 35, 142, 107},
+        {wxT("SIENNA"), 142, 107, 35},
+        {wxT("SKY BLUE"), 50, 153, 204},
+        {wxT("SLATE BLUE"), 0, 127, 255},
+        {wxT("SPRING GREEN"), 0, 255, 127},
+        {wxT("STEEL BLUE"), 35, 107, 142},
+        {wxT("TAN"), 219, 147, 112},
+        {wxT("THISTLE"), 216, 191, 216},
+        {wxT("TURQUOISE"), 173, 234, 234},
+        {wxT("VIOLET"), 79, 47, 79},
+        {wxT("VIOLET RED"), 204, 50, 153},
+        {wxT("WHEAT"), 216, 216, 191},
+        {wxT("WHITE"), 255, 255, 255},
+        {wxT("YELLOW"), 255, 255, 0},
+        {wxT("YELLOW GREEN"), 153, 204, 50}
+    };
+
+    size_t n;
+
+    for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
+    {
+        const wxColourDesc& cc = wxColourTable[n];
+        (*m_map)[cc.name] = new wxColour(cc.r, cc.g, cc.b);
+    }
+
+#ifdef __WXPM__
+    m_palTable = new long[n];
+    for ( n = 0; n < WXSIZEOF(wxColourTable); n++ )
+    {
+        const wxColourDesc& cc = wxColourTable[n];
+        m_palTable[n] = OS2RGB(cc.r,cc.g,cc.b);
+    }
+    m_nSize = n;
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// wxColourDatabase operations
+// ----------------------------------------------------------------------------
+
+void wxColourDatabase::AddColour(const wxString& name, const wxColour& colour)
+{
+    Initialize();
+
+    // canonicalize the colour names before using them as keys: they should be
+    // in upper case
+    wxString colName = name;
+    colName.MakeUpper();
+
+    // ... and we also allow both grey/gray
+    wxString colNameAlt = colName;
+    if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) )
+    {
+        // but in this case it is not necessary so avoid extra search below
+        colNameAlt.clear();
+    }
+
+    wxStringToColourHashMap::iterator it = m_map->find(colName);
+    if ( it == m_map->end() && !colNameAlt.empty() )
+        it = m_map->find(colNameAlt);
+    if ( it != m_map->end() )
+    {
+        *(it->second) = colour;
+    }
+    else // new colour
+    {
+        (*m_map)[colName] = new wxColour(colour);
+    }
+}
+
+wxColour wxColourDatabase::Find(const wxString& colour) const
+{
+    wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
+    self->Initialize();
+
+    // make the comparaison case insensitive and also match both grey and gray
+    wxString colName = colour;
+    colName.MakeUpper();
+    wxString colNameAlt = colName;
+    if ( !colNameAlt.Replace(_T("GRAY"), _T("GREY")) )
+        colNameAlt.clear();
+
+    wxStringToColourHashMap::iterator it = m_map->find(colName);
+    if ( it == m_map->end() && !colNameAlt.empty() )
+        it = m_map->find(colNameAlt);
+    if ( it != m_map->end() )
+        return *(it->second);
+
+    // we did not find any result in existing colours:
+    // we won't use wxString -> wxColour conversion because the
+    // wxColour::Set(const wxString &) function which does that conversion
+    // internally uses this function (wxColourDatabase::Find) and we want
+    // to avoid infinite recursion !
+    return wxNullColour;
+}
+
+wxString wxColourDatabase::FindName(const wxColour& colour) const
+{
+    wxColourDatabase * const self = wxConstCast(this, wxColourDatabase);
+    self->Initialize();
+
+    typedef wxStringToColourHashMap::iterator iterator;
+
+    for ( iterator it = m_map->begin(), en = m_map->end(); it != en; ++it )
+    {
+        if ( *(it->second) == colour )
+            return it->first;
+    }
+
+    return wxEmptyString;
+}
+
+// ----------------------------------------------------------------------------
+// deprecated wxColourDatabase methods
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_6
+wxColour *wxColourDatabase::FindColour(const wxString& name)
+{
+    // This function is deprecated, use Find() instead.
+    // Formerly this function sometimes would return a deletable pointer and
+    // sometimes a non-deletable one (when returning a colour from the database).
+    // Trying to delete the latter anyway results in problems, so probably
+    // nobody ever freed the pointers. Currently it always returns a new
+    // instance, which means there will be memory leaks.
+    wxLogDebug(wxT("wxColourDataBase::FindColour():")
+        wxT(" Please use wxColourDataBase::Find() instead"));
+
+    // using a static variable here is not the most elegant solution but unless
+    // we want to make wxStringToColourHashMap public (i.e. move it to the
+    // header) so that we could have a member function returning
+    // wxStringToColourHashMap::iterator, there is really no good way to do it
+    // otherwise
+    //
+    // and knowing that this function is going to disappear in the next release
+    // anyhow I don't want to waste time on this
+
+    static wxColour s_col;
+
+    s_col = Find(name);
+    if ( !s_col.Ok() )
+        return NULL;
+
+    return new wxColour(s_col);
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+// ============================================================================
+// stock objects
+// ============================================================================
+
+static wxStockGDI gs_wxStockGDI_instance;
+wxStockGDI* wxStockGDI::ms_instance = &gs_wxStockGDI_instance;
+wxObject* wxStockGDI::ms_stockObject[ITEMCOUNT];
+
+wxStockGDI::wxStockGDI()
+{
+}
+
+wxStockGDI::~wxStockGDI()
+{
+}
+
+void wxStockGDI::DeleteAll()
+{
+    for (unsigned i = 0; i < ITEMCOUNT; i++)
+    {
+        delete ms_stockObject[i];
+        ms_stockObject[i] = NULL;
+    }
+}
+
+const wxBrush* wxStockGDI::GetBrush(Item item)
+{
+    wxBrush* brush = wx_static_cast(wxBrush*, ms_stockObject[item]);
+    if (brush == NULL)
+    {
+        switch (item)
+        {
+        case BRUSH_BLACK:
+            brush = new wxBrush(*GetColour(COLOUR_BLACK), wxSOLID);
+            break;
+        case BRUSH_BLUE:
+            brush = new wxBrush(*GetColour(COLOUR_BLUE), wxSOLID);
+            break;
+        case BRUSH_CYAN:
+            brush = new wxBrush(*GetColour(COLOUR_CYAN), wxSOLID);
+            break;
+        case BRUSH_GREEN:
+            brush = new wxBrush(*GetColour(COLOUR_GREEN), wxSOLID);
+            break;
+        case BRUSH_GREY:
+            brush = new wxBrush(wxColour(wxT("GREY")), wxSOLID);
+            break;
+        case BRUSH_LIGHTGREY:
+            brush = new wxBrush(*GetColour(COLOUR_LIGHTGREY), wxSOLID);
+            break;
+        case BRUSH_MEDIUMGREY:
+            brush = new wxBrush(wxColour(wxT("MEDIUM GREY")), wxSOLID);
+            break;
+        case BRUSH_RED:
+            brush = new wxBrush(*GetColour(COLOUR_RED), wxSOLID);
+            break;
+        case BRUSH_TRANSPARENT:
+            brush = new wxBrush(*GetColour(COLOUR_BLACK), wxTRANSPARENT);
+            break;
+        case BRUSH_WHITE:
+            brush = new wxBrush(*GetColour(COLOUR_WHITE), wxSOLID);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = brush;
+    }
+    return brush;
+}
+
+const wxColour* wxStockGDI::GetColour(Item item)
+{
+    wxColour* colour = wx_static_cast(wxColour*, ms_stockObject[item]);
+    if (colour == NULL)
+    {
+        switch (item)
+        {
+        case COLOUR_BLACK:
+            colour = new wxColour(0, 0, 0);
+            break;
+        case COLOUR_BLUE:
+            colour = new wxColour(0, 0, 255);
+            break;
+        case COLOUR_CYAN:
+            colour = new wxColour(wxT("CYAN"));
+            break;
+        case COLOUR_GREEN:
+            colour = new wxColour(0, 255, 0);
+            break;
+        case COLOUR_LIGHTGREY:
+            colour = new wxColour(wxT("LIGHT GREY"));
+            break;
+        case COLOUR_RED:
+            colour = new wxColour(255, 0, 0);
+            break;
+        case COLOUR_WHITE:
+            colour = new wxColour(255, 255, 255);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = colour;
+    }
+    return colour;
+}
+
+const wxCursor* wxStockGDI::GetCursor(Item item)
+{
+    wxCursor* cursor = wx_static_cast(wxCursor*, ms_stockObject[item]);
+    if (cursor == NULL)
+    {
+        switch (item)
+        {
+        case CURSOR_CROSS:
+            cursor = new wxCursor(wxCURSOR_CROSS);
+            break;
+        case CURSOR_HOURGLASS:
+            cursor = new wxCursor(wxCURSOR_WAIT);
+            break;
+        case CURSOR_STANDARD:
+            cursor = new wxCursor(wxCURSOR_ARROW);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = cursor;
+    }
+    return cursor;
+}
+
+const wxFont* wxStockGDI::GetFont(Item item)
+{
+    wxFont* font = wx_static_cast(wxFont*, ms_stockObject[item]);
+    if (font == NULL)
+    {
+        switch (item)
+        {
+        case FONT_ITALIC:
+            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxROMAN, wxITALIC, wxNORMAL);
+            break;
+        case FONT_NORMAL:
+            font = new wxFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+            break;
+        case FONT_SMALL:
+            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize() - 2, wxSWISS, wxNORMAL, wxNORMAL);
+            break;
+        case FONT_SWISS:
+            font = new wxFont(GetFont(FONT_NORMAL)->GetPointSize(), wxSWISS, wxNORMAL, wxNORMAL);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = font;
+    }
+    return font;
+}
+
+const wxPen* wxStockGDI::GetPen(Item item)
+{
+    wxPen* pen = wx_static_cast(wxPen*, ms_stockObject[item]);
+    if (pen == NULL)
+    {
+        switch (item)
+        {
+        case PEN_BLACK:
+            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxSOLID);
+            break;
+        case PEN_BLACKDASHED:
+            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxSHORT_DASH);
+            break;
+        case PEN_CYAN:
+            pen = new wxPen(*GetColour(COLOUR_CYAN), 1, wxSOLID);
+            break;
+        case PEN_GREEN:
+            pen = new wxPen(*GetColour(COLOUR_GREEN), 1, wxSOLID);
+            break;
+        case PEN_GREY:
+            pen = new wxPen(wxColour(wxT("GREY")), 1, wxSOLID);
+            break;
+        case PEN_LIGHTGREY:
+            pen = new wxPen(*GetColour(COLOUR_LIGHTGREY), 1, wxSOLID);
+            break;
+        case PEN_MEDIUMGREY:
+            pen = new wxPen(wxColour(wxT("MEDIUM GREY")), 1, wxSOLID);
+            break;
+        case PEN_RED:
+            pen = new wxPen(*GetColour(COLOUR_RED), 1, wxSOLID);
+            break;
+        case PEN_TRANSPARENT:
+            pen = new wxPen(*GetColour(COLOUR_BLACK), 1, wxTRANSPARENT);
+            break;
+        case PEN_WHITE:
+            pen = new wxPen(*GetColour(COLOUR_WHITE), 1, wxSOLID);
+            break;
+        default:
+            wxFAIL;
+        }
+        ms_stockObject[item] = pen;
+    }
+    return pen;
+}
+
+void wxInitializeStockLists()
+{
+    wxTheColourDatabase = new wxColourDatabase;
+
+    wxTheBrushList = new wxBrushList;
+    wxThePenList = new wxPenList;
+    wxTheFontList = new wxFontList;
+}
+
+void wxDeleteStockLists()
+{
+    wxDELETE(wxTheBrushList);
+    wxDELETE(wxThePenList);
+    wxDELETE(wxTheFontList);
+}
+
+// ============================================================================
+// wxTheXXXList stuff (semi-obsolete)
+// ============================================================================
+
+wxGDIObjListBase::wxGDIObjListBase()
+{
+}
+
+wxGDIObjListBase::~wxGDIObjListBase()
+{
+    for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
+    {
+        delete wx_static_cast(wxObject*, node->GetData());
+    }
+}
+
+wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)
+{
+    for ( wxList::compatibility_iterator node = list.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxPen * const pen = (wxPen *) node->GetData();
+        if ( pen->GetWidth () == width &&
+                pen->GetStyle () == style &&
+                    pen->GetColour() == colour )
+            return pen;
+    }
+
+    wxPen* pen = NULL;
+    wxPen penTmp(colour, width, style);
+    if (penTmp.Ok())
+    {
+        pen = new wxPen(penTmp);
+        list.Append(pen);
+    }
+
+    return pen;
+}
+
+wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)
+{
+    for ( wxList::compatibility_iterator node = list.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxBrush * const brush = (wxBrush *) node->GetData ();
+        if ( brush->GetStyle () == style && brush->GetColour() == colour )
+            return brush;
+    }
+
+    wxBrush* brush = NULL;
+    wxBrush brushTmp(colour, style);
+    if (brushTmp.Ok())
+    {
+        brush = new wxBrush(brushTmp);
+        list.Append(brush);
+    }
+
+    return brush;
+}
+
+wxFont *wxFontList::FindOrCreateFont(int pointSize,
+                                     int family,
+                                     int style,
+                                     int weight,
+                                     bool underline,
+                                     const wxString& facename,
+                                     wxFontEncoding encoding)
+{
+    wxFont *font;
+    wxList::compatibility_iterator node;
+    for (node = list.GetFirst(); node; node = node->GetNext())
+    {
+        font = (wxFont *)node->GetData();
+        if (
+             font->GetPointSize () == pointSize &&
+             font->GetStyle () == style &&
+             font->GetWeight () == weight &&
+             font->GetUnderlined () == underline )
+        {
+            int fontFamily = font->GetFamily();
+
+#if defined(__WXGTK__)
+            // under GTK the default family is wxSWISS, so looking for a font
+            // with wxDEFAULT family should return a wxSWISS one instead of
+            // creating a new one
+            bool same = (fontFamily == family) ||
+                        (fontFamily == wxSWISS && family == wxDEFAULT);
+#else // !GTK
+            // VZ: but why elsewhere do we require an exact match? mystery...
+            bool same = fontFamily == family;
+#endif // GTK/!GTK
+
+            // empty facename matches anything at all: this is bad because
+            // depending on which fonts are already created, we might get back
+            // a different font if we create it with empty facename, but it is
+            // still better than never matching anything in the cache at all
+            // in this case
+            if ( same && !facename.empty() )
+            {
+                const wxString& fontFace = font->GetFaceName();
+
+                // empty facename matches everything
+                same = !fontFace || fontFace == facename;
+            }
+
+            if ( same && (encoding != wxFONTENCODING_DEFAULT) )
+            {
+                // have to match the encoding too
+                same = font->GetEncoding() == encoding;
+            }
+
+            if ( same )
+            {
+                return font;
+            }
+        }
+    }
+
+    // font not found, create the new one
+    font = NULL;
+    wxFont fontTmp(pointSize, family, style, weight, underline, facename, encoding);
+    if (fontTmp.Ok())
+    {
+        font = new wxFont(fontTmp);
+        list.Append(font);
+    }
+
+    return font;
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+void wxBrushList::AddBrush(wxBrush*) { }
+void wxBrushList::RemoveBrush(wxBrush*) { }
+void wxFontList::AddFont(wxFont*) { }
+void wxFontList::RemoveFont(wxFont*) { }
+void wxPenList::AddPen(wxPen*) { }
+void wxPenList::RemovePen(wxPen*) { }
+#endif
+
+wxSize wxGetDisplaySize()
+{
+    int x, y;
+    wxDisplaySize(& x, & y);
+    return wxSize(x, y);
+}
+
+wxRect wxGetClientDisplayRect()
+{
+    int x, y, width, height;
+    wxClientDisplayRect(&x, &y, &width, &height);  // call plat-specific version
+    return wxRect(x, y, width, height);
+}
+
+wxSize wxGetDisplaySizeMM()
+{
+    int x, y;
+    wxDisplaySizeMM(& x, & y);
+    return wxSize(x, y);
+}
+
+wxResourceCache::~wxResourceCache ()
+{
+    wxList::compatibility_iterator node = GetFirst ();
+    while (node) {
+        wxObject *item = (wxObject *)node->GetData();
+        delete item;
+
+        node = node->GetNext ();
+    }
+}
diff --git a/Source/3rd Party/wx/src/common/geometry.cpp b/Source/3rd Party/wx/src/common/geometry.cpp
index f42c0f022..362b1aee5 100644
--- a/Source/3rd Party/wx/src/common/geometry.cpp	
+++ b/Source/3rd Party/wx/src/common/geometry.cpp	
@@ -1,364 +1,364 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/geometry.cpp
-// Purpose:     Common Geometry Classes
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     08/05/99
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_GEOMETRY
-
-#include "wx/geometry.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-#endif
-
-#include <string.h>
-
-#include "wx/datstrm.h"
-
-//
-// wxPoint2D
-//
-
-//
-// wxRect2D
-//
-
-// wxDouble version
-
-// for the following calculations always remember
-// that the right and bottom edges are not part of a rect
-
-bool wxRect2DDouble::Intersects( const wxRect2DDouble &rect ) const
-{
-    wxDouble left,right,bottom,top;
-    left = wxMax ( m_x , rect.m_x );
-    right = wxMin ( m_x+m_width, rect.m_x + rect.m_width );
-    top = wxMax ( m_y , rect.m_y );
-    bottom = wxMin ( m_y+m_height, rect.m_y + rect.m_height );
-
-    if ( left < right && top < bottom )
-    {
-        return true;
-    }
-    return false;
-}
-
-void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )
-{
-    wxDouble left,right,bottom,top;
-    left = wxMax ( src1.m_x , src2.m_x );
-    right = wxMin ( src1.m_x+src1.m_width, src2.m_x + src2.m_width );
-    top = wxMax ( src1.m_y , src2.m_y );
-    bottom = wxMin ( src1.m_y+src1.m_height, src2.m_y + src2.m_height );
-
-    if ( left < right && top < bottom )
-    {
-        dest->m_x = left;
-        dest->m_y = top;
-        dest->m_width = right - left;
-        dest->m_height = bottom - top;
-    }
-    else
-    {
-        dest->m_width = dest->m_height = 0;
-    }
-}
-
-void wxRect2DDouble::Union( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )
-{
-    wxDouble left,right,bottom,top;
-
-    left = wxMin ( src1.m_x , src2.m_x );
-    right = wxMax ( src1.m_x+src1.m_width, src2.m_x + src2.m_width );
-    top = wxMin ( src1.m_y , src2.m_y );
-    bottom = wxMax ( src1.m_y+src1.m_height, src2.m_y + src2.m_height );
-
-    dest->m_x = left;
-    dest->m_y = top;
-    dest->m_width = right - left;
-    dest->m_height = bottom - top;
-}
-
-void wxRect2DDouble::Union( const wxPoint2DDouble &pt )
-{
-    wxDouble x = pt.m_x;
-    wxDouble y = pt.m_y;
-
-    if ( x < m_x )
-    {
-        SetLeft( x );
-    }
-    else if ( x < m_x + m_width )
-    {
-        // contained
-    }
-    else
-    {
-        SetRight( x );
-    }
-
-    if ( y < m_y )
-    {
-        SetTop( y );
-    }
-    else if ( y < m_y + m_height )
-    {
-        // contained
-    }
-    else
-    {
-        SetBottom( y );
-    }
-}
-
-void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect )
-{
-    if ( GetLeft() < rect.GetLeft() )
-        SetLeft( rect.GetLeft() );
-
-    if ( GetRight() > rect.GetRight() )
-        SetRight( rect.GetRight() );
-
-    if ( GetBottom() > rect.GetBottom() )
-        SetBottom( rect.GetBottom() );
-
-    if ( GetTop() < rect.GetTop() )
-        SetTop( rect.GetTop() );
-}
-
-wxRect2DDouble& wxRect2DDouble::operator=( const wxRect2DDouble &r )
-{
-    m_x = r.m_x;
-    m_y = r.m_y;
-    m_width = r.m_width;
-    m_height = r.m_height;
-    return *this;
-}
-
-// integer version
-
-// for the following calculations always remember
-// that the right and bottom edges are not part of a rect
-
-// wxPoint2D
-
-#if wxUSE_STREAMS
-void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const
-{
-    stream.Write32( m_x );
-    stream.Write32( m_y );
-}
-
-void wxPoint2DInt::ReadFrom( wxDataInputStream &stream )
-{
-    m_x = stream.Read32();
-    m_y = stream.Read32();
-}
-#endif // wxUSE_STREAMS
-
-wxDouble wxPoint2DInt::GetVectorAngle() const
-{
-    if ( m_x == 0 )
-    {
-        if ( m_y >= 0 )
-            return 90;
-        else
-            return 270;
-    }
-    if ( m_y == 0 )
-    {
-        if ( m_x >= 0 )
-            return 0;
-        else
-            return 180;
-    }
-
-    // casts needed for MIPSpro compiler under SGI
-    wxDouble deg = atan2( (double)m_y , (double)m_x ) * 180 / M_PI;
-    if ( deg < 0 )
-    {
-        deg += 360;
-    }
-    return deg;
-}
-
-
-void wxPoint2DInt::SetVectorAngle( wxDouble degrees )
-{
-    wxDouble length = GetVectorLength();
-    m_x = (int)(length * cos( degrees / 180 * M_PI ));
-    m_y = (int)(length * sin( degrees / 180 * M_PI ));
-}
-
-wxDouble wxPoint2DDouble::GetVectorAngle() const
-{
-    if ( wxIsNullDouble(m_x) )
-    {
-        if ( m_y >= 0 )
-            return 90;
-        else
-            return 270;
-    }
-    if ( wxIsNullDouble(m_y) )
-    {
-        if ( m_x >= 0 )
-            return 0;
-        else
-            return 180;
-    }
-    wxDouble deg = atan2( m_y , m_x ) * 180 / M_PI;
-    if ( deg < 0 )
-    {
-        deg += 360;
-    }
-    return deg;
-}
-
-void wxPoint2DDouble::SetVectorAngle( wxDouble degrees )
-{
-    wxDouble length = GetVectorLength();
-    m_x = length * cos( degrees / 180 * M_PI );
-    m_y = length * sin( degrees / 180 * M_PI );
-}
-
-// wxRect2D
-
-bool wxRect2DInt::Intersects( const wxRect2DInt &rect ) const
-{
-    wxInt32 left,right,bottom,top;
-    left = wxMax ( m_x , rect.m_x );
-    right = wxMin ( m_x+m_width, rect.m_x + rect.m_width );
-    top = wxMax ( m_y , rect.m_y );
-    bottom = wxMin ( m_y+m_height, rect.m_y + rect.m_height );
-
-    if ( left < right && top < bottom )
-    {
-        return true;
-    }
-    return false;
-}
-
-void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )
-{
-    wxInt32 left,right,bottom,top;
-    left = wxMax ( src1.m_x , src2.m_x );
-    right = wxMin ( src1.m_x+src1.m_width, src2.m_x + src2.m_width );
-    top = wxMax ( src1.m_y , src2.m_y );
-    bottom = wxMin ( src1.m_y+src1.m_height, src2.m_y + src2.m_height );
-
-    if ( left < right && top < bottom )
-    {
-        dest->m_x = left;
-        dest->m_y = top;
-        dest->m_width = right - left;
-        dest->m_height = bottom - top;
-    }
-    else
-    {
-        dest->m_width = dest->m_height = 0;
-    }
-}
-
-void wxRect2DInt::Union( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )
-{
-    wxInt32 left,right,bottom,top;
-
-    left = wxMin ( src1.m_x , src2.m_x );
-    right = wxMax ( src1.m_x+src1.m_width, src2.m_x + src2.m_width );
-    top = wxMin ( src1.m_y , src2.m_y );
-    bottom = wxMax ( src1.m_y+src1.m_height, src2.m_y + src2.m_height );
-
-    dest->m_x = left;
-    dest->m_y = top;
-    dest->m_width = right - left;
-    dest->m_height = bottom - top;
-}
-
-void wxRect2DInt::Union( const wxPoint2DInt &pt )
-{
-    wxInt32 x = pt.m_x;
-    wxInt32 y = pt.m_y;
-
-    if ( x < m_x )
-    {
-        SetLeft( x );
-    }
-    else if ( x < m_x + m_width )
-    {
-        // contained
-    }
-    else
-    {
-        SetRight( x );
-    }
-
-    if ( y < m_y )
-    {
-        SetTop( y );
-    }
-    else if ( y < m_y + m_height )
-    {
-        // contained
-    }
-    else
-    {
-        SetBottom( y );
-    }
-}
-
-void wxRect2DInt::ConstrainTo( const wxRect2DInt &rect )
-{
-    if ( GetLeft() < rect.GetLeft() )
-        SetLeft( rect.GetLeft() );
-
-    if ( GetRight() > rect.GetRight() )
-        SetRight( rect.GetRight() );
-
-    if ( GetBottom() > rect.GetBottom() )
-        SetBottom( rect.GetBottom() );
-
-    if ( GetTop() < rect.GetTop() )
-        SetTop( rect.GetTop() );
-}
-
-wxRect2DInt& wxRect2DInt::operator=( const wxRect2DInt &r )
-{
-    m_x = r.m_x;
-    m_y = r.m_y;
-    m_width = r.m_width;
-    m_height = r.m_height;
-    return *this;
-}
-
-#if wxUSE_STREAMS
-void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const
-{
-    stream.Write32( m_x );
-    stream.Write32( m_y );
-    stream.Write32( m_width );
-    stream.Write32( m_height );
-}
-
-void wxRect2DInt::ReadFrom( wxDataInputStream &stream )
-{
-    m_x = stream.Read32();
-    m_y = stream.Read32();
-    m_width = stream.Read32();
-    m_height = stream.Read32();
-}
-#endif // wxUSE_STREAMS
-
-#endif // wxUSE_GEOMETRY
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/geometry.cpp
+// Purpose:     Common Geometry Classes
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     08/05/99
+// RCS-ID:
+// Copyright:   (c) 1999 Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_GEOMETRY
+
+#include "wx/geometry.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include <string.h>
+
+#include "wx/datstrm.h"
+
+//
+// wxPoint2D
+//
+
+//
+// wxRect2D
+//
+
+// wxDouble version
+
+// for the following calculations always remember
+// that the right and bottom edges are not part of a rect
+
+bool wxRect2DDouble::Intersects( const wxRect2DDouble &rect ) const
+{
+    wxDouble left,right,bottom,top;
+    left = wxMax ( m_x , rect.m_x );
+    right = wxMin ( m_x+m_width, rect.m_x + rect.m_width );
+    top = wxMax ( m_y , rect.m_y );
+    bottom = wxMin ( m_y+m_height, rect.m_y + rect.m_height );
+
+    if ( left < right && top < bottom )
+    {
+        return true;
+    }
+    return false;
+}
+
+void wxRect2DDouble::Intersect( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )
+{
+    wxDouble left,right,bottom,top;
+    left = wxMax ( src1.m_x , src2.m_x );
+    right = wxMin ( src1.m_x+src1.m_width, src2.m_x + src2.m_width );
+    top = wxMax ( src1.m_y , src2.m_y );
+    bottom = wxMin ( src1.m_y+src1.m_height, src2.m_y + src2.m_height );
+
+    if ( left < right && top < bottom )
+    {
+        dest->m_x = left;
+        dest->m_y = top;
+        dest->m_width = right - left;
+        dest->m_height = bottom - top;
+    }
+    else
+    {
+        dest->m_width = dest->m_height = 0;
+    }
+}
+
+void wxRect2DDouble::Union( const wxRect2DDouble &src1 , const wxRect2DDouble &src2 , wxRect2DDouble *dest )
+{
+    wxDouble left,right,bottom,top;
+
+    left = wxMin ( src1.m_x , src2.m_x );
+    right = wxMax ( src1.m_x+src1.m_width, src2.m_x + src2.m_width );
+    top = wxMin ( src1.m_y , src2.m_y );
+    bottom = wxMax ( src1.m_y+src1.m_height, src2.m_y + src2.m_height );
+
+    dest->m_x = left;
+    dest->m_y = top;
+    dest->m_width = right - left;
+    dest->m_height = bottom - top;
+}
+
+void wxRect2DDouble::Union( const wxPoint2DDouble &pt )
+{
+    wxDouble x = pt.m_x;
+    wxDouble y = pt.m_y;
+
+    if ( x < m_x )
+    {
+        SetLeft( x );
+    }
+    else if ( x < m_x + m_width )
+    {
+        // contained
+    }
+    else
+    {
+        SetRight( x );
+    }
+
+    if ( y < m_y )
+    {
+        SetTop( y );
+    }
+    else if ( y < m_y + m_height )
+    {
+        // contained
+    }
+    else
+    {
+        SetBottom( y );
+    }
+}
+
+void wxRect2DDouble::ConstrainTo( const wxRect2DDouble &rect )
+{
+    if ( GetLeft() < rect.GetLeft() )
+        SetLeft( rect.GetLeft() );
+
+    if ( GetRight() > rect.GetRight() )
+        SetRight( rect.GetRight() );
+
+    if ( GetBottom() > rect.GetBottom() )
+        SetBottom( rect.GetBottom() );
+
+    if ( GetTop() < rect.GetTop() )
+        SetTop( rect.GetTop() );
+}
+
+wxRect2DDouble& wxRect2DDouble::operator=( const wxRect2DDouble &r )
+{
+    m_x = r.m_x;
+    m_y = r.m_y;
+    m_width = r.m_width;
+    m_height = r.m_height;
+    return *this;
+}
+
+// integer version
+
+// for the following calculations always remember
+// that the right and bottom edges are not part of a rect
+
+// wxPoint2D
+
+#if wxUSE_STREAMS
+void wxPoint2DInt::WriteTo( wxDataOutputStream &stream ) const
+{
+    stream.Write32( m_x );
+    stream.Write32( m_y );
+}
+
+void wxPoint2DInt::ReadFrom( wxDataInputStream &stream )
+{
+    m_x = stream.Read32();
+    m_y = stream.Read32();
+}
+#endif // wxUSE_STREAMS
+
+wxDouble wxPoint2DInt::GetVectorAngle() const
+{
+    if ( m_x == 0 )
+    {
+        if ( m_y >= 0 )
+            return 90;
+        else
+            return 270;
+    }
+    if ( m_y == 0 )
+    {
+        if ( m_x >= 0 )
+            return 0;
+        else
+            return 180;
+    }
+
+    // casts needed for MIPSpro compiler under SGI
+    wxDouble deg = atan2( (double)m_y , (double)m_x ) * 180 / M_PI;
+    if ( deg < 0 )
+    {
+        deg += 360;
+    }
+    return deg;
+}
+
+
+void wxPoint2DInt::SetVectorAngle( wxDouble degrees )
+{
+    wxDouble length = GetVectorLength();
+    m_x = (int)(length * cos( degrees / 180 * M_PI ));
+    m_y = (int)(length * sin( degrees / 180 * M_PI ));
+}
+
+wxDouble wxPoint2DDouble::GetVectorAngle() const
+{
+    if ( wxIsNullDouble(m_x) )
+    {
+        if ( m_y >= 0 )
+            return 90;
+        else
+            return 270;
+    }
+    if ( wxIsNullDouble(m_y) )
+    {
+        if ( m_x >= 0 )
+            return 0;
+        else
+            return 180;
+    }
+    wxDouble deg = atan2( m_y , m_x ) * 180 / M_PI;
+    if ( deg < 0 )
+    {
+        deg += 360;
+    }
+    return deg;
+}
+
+void wxPoint2DDouble::SetVectorAngle( wxDouble degrees )
+{
+    wxDouble length = GetVectorLength();
+    m_x = length * cos( degrees / 180 * M_PI );
+    m_y = length * sin( degrees / 180 * M_PI );
+}
+
+// wxRect2D
+
+bool wxRect2DInt::Intersects( const wxRect2DInt &rect ) const
+{
+    wxInt32 left,right,bottom,top;
+    left = wxMax ( m_x , rect.m_x );
+    right = wxMin ( m_x+m_width, rect.m_x + rect.m_width );
+    top = wxMax ( m_y , rect.m_y );
+    bottom = wxMin ( m_y+m_height, rect.m_y + rect.m_height );
+
+    if ( left < right && top < bottom )
+    {
+        return true;
+    }
+    return false;
+}
+
+void wxRect2DInt::Intersect( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )
+{
+    wxInt32 left,right,bottom,top;
+    left = wxMax ( src1.m_x , src2.m_x );
+    right = wxMin ( src1.m_x+src1.m_width, src2.m_x + src2.m_width );
+    top = wxMax ( src1.m_y , src2.m_y );
+    bottom = wxMin ( src1.m_y+src1.m_height, src2.m_y + src2.m_height );
+
+    if ( left < right && top < bottom )
+    {
+        dest->m_x = left;
+        dest->m_y = top;
+        dest->m_width = right - left;
+        dest->m_height = bottom - top;
+    }
+    else
+    {
+        dest->m_width = dest->m_height = 0;
+    }
+}
+
+void wxRect2DInt::Union( const wxRect2DInt &src1 , const wxRect2DInt &src2 , wxRect2DInt *dest )
+{
+    wxInt32 left,right,bottom,top;
+
+    left = wxMin ( src1.m_x , src2.m_x );
+    right = wxMax ( src1.m_x+src1.m_width, src2.m_x + src2.m_width );
+    top = wxMin ( src1.m_y , src2.m_y );
+    bottom = wxMax ( src1.m_y+src1.m_height, src2.m_y + src2.m_height );
+
+    dest->m_x = left;
+    dest->m_y = top;
+    dest->m_width = right - left;
+    dest->m_height = bottom - top;
+}
+
+void wxRect2DInt::Union( const wxPoint2DInt &pt )
+{
+    wxInt32 x = pt.m_x;
+    wxInt32 y = pt.m_y;
+
+    if ( x < m_x )
+    {
+        SetLeft( x );
+    }
+    else if ( x < m_x + m_width )
+    {
+        // contained
+    }
+    else
+    {
+        SetRight( x );
+    }
+
+    if ( y < m_y )
+    {
+        SetTop( y );
+    }
+    else if ( y < m_y + m_height )
+    {
+        // contained
+    }
+    else
+    {
+        SetBottom( y );
+    }
+}
+
+void wxRect2DInt::ConstrainTo( const wxRect2DInt &rect )
+{
+    if ( GetLeft() < rect.GetLeft() )
+        SetLeft( rect.GetLeft() );
+
+    if ( GetRight() > rect.GetRight() )
+        SetRight( rect.GetRight() );
+
+    if ( GetBottom() > rect.GetBottom() )
+        SetBottom( rect.GetBottom() );
+
+    if ( GetTop() < rect.GetTop() )
+        SetTop( rect.GetTop() );
+}
+
+wxRect2DInt& wxRect2DInt::operator=( const wxRect2DInt &r )
+{
+    m_x = r.m_x;
+    m_y = r.m_y;
+    m_width = r.m_width;
+    m_height = r.m_height;
+    return *this;
+}
+
+#if wxUSE_STREAMS
+void wxRect2DInt::WriteTo( wxDataOutputStream &stream ) const
+{
+    stream.Write32( m_x );
+    stream.Write32( m_y );
+    stream.Write32( m_width );
+    stream.Write32( m_height );
+}
+
+void wxRect2DInt::ReadFrom( wxDataInputStream &stream )
+{
+    m_x = stream.Read32();
+    m_y = stream.Read32();
+    m_width = stream.Read32();
+    m_height = stream.Read32();
+}
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_GEOMETRY
diff --git a/Source/3rd Party/wx/src/common/gifdecod.cpp b/Source/3rd Party/wx/src/common/gifdecod.cpp
index aa2eca8a2..1f3c869d5 100644
--- a/Source/3rd Party/wx/src/common/gifdecod.cpp	
+++ b/Source/3rd Party/wx/src/common/gifdecod.cpp	
@@ -1,968 +1,933 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/gifdecod.cpp
-// Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
-// Author:      Guillermo Rodriguez Garcia <guille@iies.es>
-// Version:     3.04
-// RCS-ID:      $Id$
-// Copyright:   (c) Guillermo Rodriguez Garcia
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS && wxUSE_GIF
-
-#ifndef WX_PRECOMP
-    #include "wx/palette.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include "wx/gifdecod.h"
-#include "wx/scopedptr.h"
-#include "wx/scopeguard.h"
-
-enum
-{
-    GIF_MARKER_EXT       = '!', // 0x21
-    GIF_MARKER_SEP       = ',', // 0x2C
-    GIF_MARKER_ENDOFDATA = ';', // 0x3B
-
-    GIF_MARKER_EXT_GRAPHICS_CONTROL = 0xF9,
-    GIF_MARKER_EXT_COMMENT          = 0xFE,
-    GIF_MARKER_EXT_APP              = 0xFF
-};
-
-#define GetFrame(n)     ((GIFImage*)m_frames[n])
-
-//---------------------------------------------------------------------------
-// GIFImage
-//---------------------------------------------------------------------------
-
-// internal class for storing GIF image data
-class GIFImage
-{
-public:
-    // def ctor
-    GIFImage();
-
-    unsigned int w;                 // width
-    unsigned int h;                 // height
-    unsigned int left;              // x coord (in logical screen)
-    unsigned int top;               // y coord (in logical screen)
-    int transparent;                // transparent color index (-1 = none)
-    wxAnimationDisposal disposal;   // disposal method
-    long delay;                     // delay in ms (-1 = unused)
-    unsigned char *p;               // bitmap
-    unsigned char *pal;             // palette
-    unsigned int ncolours;          // number of colours
-    wxString comment;
-
-    wxDECLARE_NO_COPY_CLASS(GIFImage);
-};
-
-wxDECLARE_SCOPED_PTR(GIFImage, GIFImagePtr)
-wxDEFINE_SCOPED_PTR(GIFImage, GIFImagePtr)
-
-
-//---------------------------------------------------------------------------
-// GIFImage constructor
-//---------------------------------------------------------------------------
-GIFImage::GIFImage()
-{
-    w = 0;
-    h = 0;
-    left = 0;
-    top = 0;
-    transparent = 0;
-    disposal = wxANIM_DONOTREMOVE;
-    delay = -1;
-    p = (unsigned char *) NULL;
-    pal = (unsigned char *) NULL;
-    ncolours = 0;
-}
-
-//---------------------------------------------------------------------------
-// wxGIFDecoder constructor and destructor
-//---------------------------------------------------------------------------
-
-wxGIFDecoder::wxGIFDecoder()
-{
-}
-
-wxGIFDecoder::~wxGIFDecoder()
-{
-    Destroy();
-}
-
-void wxGIFDecoder::Destroy()
-{
-    wxASSERT(m_nFrames==m_frames.GetCount());
-    for (unsigned int i=0; i<m_nFrames; i++)
-    {
-        GIFImage *f = (GIFImage*)m_frames[i];
-        free(f->p);
-        free(f->pal);
-        delete f;
-    }
-
-    m_frames.Clear();
-    m_nFrames = 0;
-}
-
-
-//---------------------------------------------------------------------------
-// Convert this image to a wxImage object
-//---------------------------------------------------------------------------
-
-// This function was designed by Vaclav Slavik
-
-bool wxGIFDecoder::ConvertToImage(unsigned int frame, wxImage *image) const
-{
-    unsigned char *src, *dst, *pal;
-    unsigned long i;
-    int      transparent;
-
-    // just in case...
-    image->Destroy();
-
-    // create the image
-    wxSize sz = GetFrameSize(frame);
-    image->Create(sz.GetWidth(), sz.GetHeight());
-    image->SetType(wxBITMAP_TYPE_GIF);
-
-    if (!image->IsOk())
-        return false;
-
-    pal = GetPalette(frame);
-    src = GetData(frame);
-    dst = image->GetData();
-    transparent = GetTransparentColourIndex(frame);
-
-    // set transparent colour mask
-    if (transparent != -1)
-    {
-        for (i = 0; i < GetNcolours(frame); i++)
-        {
-            if ((pal[3 * i + 0] == 255) &&
-                (pal[3 * i + 1] == 0) &&
-                (pal[3 * i + 2] == 255))
-            {
-                pal[3 * i + 2] = 254;
-            }
-        }
-
-        pal[3 * transparent + 0] = 255,
-        pal[3 * transparent + 1] = 0,
-        pal[3 * transparent + 2] = 255;
-
-        image->SetMaskColour(255, 0, 255);
-    }
-    else
-        image->SetMask(false);
-
-#if wxUSE_PALETTE
-    unsigned char r[256];
-    unsigned char g[256];
-    unsigned char b[256];
-
-    for (i = 0; i < 256; i++)
-    {
-        r[i] = pal[3*i + 0];
-        g[i] = pal[3*i + 1];
-        b[i] = pal[3*i + 2];
-    }
-
-    image->SetPalette(wxPalette(GetNcolours(frame), r, g, b));
-#endif // wxUSE_PALETTE
-
-    // copy image data
-    unsigned long npixel = sz.GetWidth() * sz.GetHeight();
-    for (i = 0; i < npixel; i++, src++)
-    {
-        *(dst++) = pal[3 * (*src) + 0];
-        *(dst++) = pal[3 * (*src) + 1];
-        *(dst++) = pal[3 * (*src) + 2];
-    }
-
-    wxString comment = GetFrame(frame)->comment;
-    if ( !comment.empty() )
-    {
-        image->SetOption(wxIMAGE_OPTION_GIF_COMMENT, comment);
-    }
-
-    return true;
-}
-
-
-//---------------------------------------------------------------------------
-// Data accessors
-//---------------------------------------------------------------------------
-
-// Get data for current frame
-
-wxSize wxGIFDecoder::GetFrameSize(unsigned int frame) const
-{
-    return wxSize(GetFrame(frame)->w, GetFrame(frame)->h);
-}
-
-wxPoint wxGIFDecoder::GetFramePosition(unsigned int frame) const
-{
-    return wxPoint(GetFrame(frame)->left, GetFrame(frame)->top);
-}
-
-wxAnimationDisposal wxGIFDecoder::GetDisposalMethod(unsigned int frame) const
-{
-    return GetFrame(frame)->disposal;
-}
-
-long wxGIFDecoder::GetDelay(unsigned int frame) const
-{
-    return GetFrame(frame)->delay;
-}
-
-wxColour wxGIFDecoder::GetTransparentColour(unsigned int frame) const
-{
-    unsigned char *pal = GetFrame(frame)->pal;
-    int n = GetFrame(frame)->transparent;
-    if (n == -1)
-        return wxNullColour;
-
-    return wxColour(pal[n*3 + 0],
-                    pal[n*3 + 1],
-                    pal[n*3 + 2]);
-}
-
-unsigned char* wxGIFDecoder::GetData(unsigned int frame) const    { return (GetFrame(frame)->p); }
-unsigned char* wxGIFDecoder::GetPalette(unsigned int frame) const { return (GetFrame(frame)->pal); }
-unsigned int wxGIFDecoder::GetNcolours(unsigned int frame) const  { return (GetFrame(frame)->ncolours); }
-int wxGIFDecoder::GetTransparentColourIndex(unsigned int frame) const  { return (GetFrame(frame)->transparent); }
-
-
-
-//---------------------------------------------------------------------------
-// GIF reading and decoding
-//---------------------------------------------------------------------------
-
-// getcode:
-//  Reads the next code from the file stream, with size 'bits'
-//
-int wxGIFDecoder::getcode(wxInputStream& stream, int bits, int ab_fin)
-{
-    unsigned int mask;          // bit mask
-    unsigned int code;          // code (result)
-
-    // get remaining bits from last byte read
-    mask = (1 << bits) - 1;
-    code = (m_lastbyte >> (8 - m_restbits)) & mask;
-
-    // keep reading new bytes while needed
-    while (bits > m_restbits)
-    {
-        // if no bytes left in this block, read the next block
-        if (m_restbyte == 0)
-        {
-            m_restbyte = stream.GetC();
-
-            /* Some encoders are a bit broken: instead of issuing
-             * an end-of-image symbol (ab_fin) they come up with
-             * a zero-length subblock!! We catch this here so
-             * that the decoder sees an ab_fin code.
-             */
-            if (m_restbyte == 0)
-            {
-                code = ab_fin;
-                break;
-            }
-
-            // prefetch data
-            stream.Read((void *) m_buffer, m_restbyte);
-            if (stream.LastRead() != m_restbyte)
-            {
-                code = ab_fin;
-                return code;
-            }
-            m_bufp = m_buffer;
-        }
-
-        // read next byte and isolate the bits we need
-        m_lastbyte = (unsigned char) (*m_bufp++);
-        mask       = (1 << (bits - m_restbits)) - 1;
-        code       = code + ((m_lastbyte & mask) << m_restbits);
-        m_restbyte--;
-
-        // adjust total number of bits extracted from the buffer
-        m_restbits = m_restbits + 8;
-    }
-
-    // find number of bits remaining for next code
-    m_restbits = (m_restbits - bits);
-
-    return code;
-}
-
-
-// dgif:
-//  GIF decoding function. The initial code size (aka root size)
-//  is 'bits'. Supports interlaced images (interl == 1).
-//  Returns wxGIF_OK (== 0) on success, or an error code if something
-// fails (see header file for details)
-wxGIFErrorCode
-wxGIFDecoder::dgif(wxInputStream& stream, GIFImage *img, int interl, int bits)
-{
-    static const int allocSize = 4096 + 1;
-    int *ab_prefix = new int[allocSize]; // alphabet (prefixes)
-    if (ab_prefix == NULL)
-    {
-        return wxGIF_MEMERR;
-    }
-
-    int *ab_tail = new int[allocSize];   // alphabet (tails)
-    if (ab_tail == NULL)
-    {
-        delete[] ab_prefix;
-        return wxGIF_MEMERR;
-    }
-
-    int *stack = new int[allocSize];     // decompression stack
-    if (stack == NULL)
-    {
-        delete[] ab_prefix;
-        delete[] ab_tail;
-        return wxGIF_MEMERR;
-    }
-
-    int ab_clr;                     // clear code
-    int ab_fin;                     // end of info code
-    int ab_bits;                    // actual symbol width, in bits
-    int ab_free;                    // first free position in alphabet
-    int ab_max;                     // last possible character in alphabet
-    int pass;                       // pass number in interlaced images
-    int pos;                        // index into decompresion stack
-    unsigned int x, y;              // position in image buffer
-
-    int code, readcode, lastcode, abcabca;
-
-    // these won't change
-    ab_clr = (1 << bits);
-    ab_fin = (1 << bits) + 1;
-
-    // these will change through the decompression process
-    ab_bits  = bits + 1;
-    ab_free  = (1 << bits) + 2;
-    ab_max   = (1 << ab_bits) - 1;
-    lastcode = -1;
-    abcabca  = -1;
-    pass     = 1;
-    pos = x = y = 0;
-
-    // reset decoder vars
-    m_restbits = 0;
-    m_restbyte = 0;
-    m_lastbyte = 0;
-
-    do
-    {
-        // get next code
-        readcode = code = getcode(stream, ab_bits, ab_fin);
-
-        // end of image?
-        if (code == ab_fin) break;
-
-        // reset alphabet?
-        if (code == ab_clr)
-        {
-            // reset main variables
-            ab_bits  = bits + 1;
-            ab_free  = (1 << bits) + 2;
-            ab_max   = (1 << ab_bits) - 1;
-            lastcode = -1;
-            abcabca  = -1;
-
-            // skip to next code
-            continue;
-        }
-
-        // unknown code: special case (like in ABCABCA)
-        if (code >= ab_free)
-        {
-            code = lastcode;            // take last string
-            stack[pos++] = abcabca;     // add first character
-        }
-
-        // build the string for this code in the stack
-        while (code > ab_clr)
-        {
-            stack[pos++] = ab_tail[code];
-            code         = ab_prefix[code];
-
-            // Don't overflow. This shouldn't happen with normal
-            // GIF files, the allocSize of 4096+1 is enough. This
-            // will only happen with badly formed GIFs.
-            if (pos >= allocSize)
-            {
-                delete[] ab_prefix;
-                delete[] ab_tail;
-                delete[] stack;
-                return wxGIF_INVFORMAT;
-            }
-        }
-
-        if (pos >= allocSize)
-        {
-            delete[] ab_prefix;
-            delete[] ab_tail;
-            delete[] stack;
-            return wxGIF_INVFORMAT;
-        }
-
-        stack[pos] = code;              // push last code into the stack
-        abcabca    = code;              // save for special case
-
-        // make new entry in alphabet (only if NOT just cleared)
-        if (lastcode != -1)
-        {
-            // Normally, after the alphabet is full and can't grow any
-            // further (ab_free == 4096), encoder should (must?) emit CLEAR
-            // to reset it. This checks whether we really got it, otherwise
-            // the GIF is damaged.
-            if (ab_free > ab_max)
-            {
-                delete[] ab_prefix;
-                delete[] ab_tail;
-                delete[] stack;
-                return wxGIF_INVFORMAT;
-            }
-
-            // This assert seems unnecessary since the condition above
-            // eliminates the only case in which it went false. But I really
-            // don't like being forced to ask "Who in .text could have
-            // written there?!" And I wouldn't have been forced to ask if
-            // this line had already been here.
-            wxASSERT(ab_free < allocSize);
-
-            ab_prefix[ab_free] = lastcode;
-            ab_tail[ab_free]   = code;
-            ab_free++;
-
-            if ((ab_free > ab_max) && (ab_bits < 12))
-            {
-                ab_bits++;
-                ab_max = (1 << ab_bits) - 1;
-            }
-        }
-
-        // dump stack data to the image buffer
-        while (pos >= 0)
-        {
-            (img->p)[x + (y * (img->w))] = (char) stack[pos];
-            pos--;
-
-            if (++x >= (img->w))
-            {
-                x = 0;
-
-                if (interl)
-                {
-                    // support for interlaced images
-                    switch (pass)
-                    {
-                        case 1: y += 8; break;
-                        case 2: y += 8; break;
-                        case 3: y += 4; break;
-                        case 4: y += 2; break;
-                    }
-
-                    /* loop until a valid y coordinate has been
-                    found, Or if the maximum number of passes has
-                    been reached, exit the loop, and stop image
-                    decoding (At this point the image is successfully
-                    decoded).
-                    If we don't loop, but merely set y to some other
-                    value, that new value might still be invalid depending
-                    on the height of the image. This would cause out of
-                    bounds writing.
-                    */
-                    while (y >= (img->h))
-                    {
-                        switch (++pass)
-                        {
-                            case 2: y = 4; break;
-                            case 3: y = 2; break;
-                            case 4: y = 1; break;
-
-                            default:
-                                /*
-                                It's possible we arrive here. For example this
-                                happens when the image is interlaced, and the
-                                height is 1. Looking at the above cases, the
-                                lowest possible y is 1. While the only valid
-                                one would be 0 for an image of height 1. So
-                                'eventually' the loop will arrive here.
-                                This case makes sure this while loop is
-                                exited, as well as the 2 other ones.
-                                */
-
-                                // Set y to a valid coordinate so the local
-                                // while loop will be exited. (y = 0 always
-                                // is >= img->h since if img->h == 0 the
-                                // image is never decoded)
-                                y = 0;
-
-                                // This will exit the other outer while loop
-                                pos = -1;
-
-                                // This will halt image decoding.
-                                code = ab_fin;
-
-                                break;
-                        }
-                    }
-                }
-                else
-                {
-                    // non-interlaced
-                    y++;
-/*
-Normally image decoding is finished when an End of Information code is
-encountered (code == ab_fin) however some broken encoders write wrong
-"block byte counts" (The first byte value after the "code size" byte),
-being one value too high. It might very well be possible other variants
-of this problem occur as well. The only sensible solution seems to
-be to check for clipping.
-Example of wrong encoding:
-(1 * 1 B/W image, raster data stream follows in hex bytes)
-
-02  << B/W images have a code size of 2
-02  << Block byte count
-44  << LZW packed
-00  << Zero byte count (terminates data stream)
-
-Because the block byte count is 2, the zero byte count is used in the
-decoding process, and decoding is continued after this byte. (While it
-should signal an end of image)
-
-It should be:
-02
-02
-44
-01  << When decoded this correctly includes the End of Information code
-00
-
-Or (Worse solution):
-02
-01
-44
-00
-(The 44 doesn't include an End of Information code, but at least the
-decoder correctly skips to 00 now after decoding, and signals this
-as an End of Information itself)
-*/
-                    if (y >= img->h)
-                    {
-                        code = ab_fin;
-                        break;
-                    }
-                }
-            }
-        }
-
-        pos = 0;
-        lastcode = readcode;
-    }
-    while (code != ab_fin);
-
-    delete [] ab_prefix ;
-    delete [] ab_tail ;
-    delete [] stack ;
-
-    return wxGIF_OK;
-}
-
-
-// CanRead:
-//  Returns true if the file looks like a valid GIF, false otherwise.
-//
-bool wxGIFDecoder::DoCanRead(wxInputStream &stream) const
-{
-    unsigned char buf[3];
-
-    if ( !stream.Read(buf, WXSIZEOF(buf)) )
-        return false;
-
-    return memcmp(buf, "GIF", WXSIZEOF(buf)) == 0;
-}
-
-
-// LoadGIF:
-//  Reads and decodes one or more GIF images, depending on whether
-//  animated GIF support is enabled. Can read GIFs with any bit
-//  size (color depth), but the output images are always expanded
-//  to 8 bits per pixel. Also, the image palettes always contain
-//  256 colors, although some of them may be unused. Returns wxGIF_OK
-//  (== 0) on success, or an error code if something fails (see
-//  header file for details)
-//
-wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
-{
-    unsigned int  global_ncolors = 0;
-    int           bits, interl, i;
-    wxAnimationDisposal disposal;
-    long          size;
-    long          delay;
-    unsigned char type = 0;
-    unsigned char pal[768];
-    unsigned char buf[16];
-    bool anim = true;
-
-    // check GIF signature
-    if (!CanRead(stream))
-        return wxGIF_INVFORMAT;
-
-    // check for animated GIF support (ver. >= 89a)
-
-    static const unsigned int headerSize = (3 + 3);
-    stream.Read(buf, headerSize);
-    if (stream.LastRead() != headerSize)
-    {
-        return wxGIF_INVFORMAT;
-    }
-
-    if (memcmp(buf + 3, "89a", 3) < 0)
-    {
-        anim = false;
-    }
-
-    // read logical screen descriptor block (LSDB)
-    static const unsigned int lsdbSize = (2 + 2 + 1 + 1 + 1);
-    stream.Read(buf, lsdbSize);
-    if (stream.LastRead() != lsdbSize)
-    {
-        return wxGIF_INVFORMAT;
-    }
-
-    m_szAnimation.SetWidth( buf[0] + 256 * buf[1] );
-    m_szAnimation.SetHeight( buf[2] + 256 * buf[3] );
-
-    if (anim && ((m_szAnimation.GetWidth() == 0) || (m_szAnimation.GetHeight() == 0)))
-    {
-        return wxGIF_INVFORMAT;
-    }
-
-    // load global color map if available
-    if ((buf[4] & 0x80) == 0x80)
-    {
-        int backgroundColIndex = buf[5];
-
-        global_ncolors = 2 << (buf[4] & 0x07);
-        unsigned int numBytes = 3 * global_ncolors;
-        stream.Read(pal, numBytes);
-        if (stream.LastRead() != numBytes)
-        {
-            return wxGIF_INVFORMAT;
-        }
-
-        m_background.Set(pal[backgroundColIndex*3 + 0],
-                         pal[backgroundColIndex*3 + 1],
-                         pal[backgroundColIndex*3 + 2]);
-    }
-
-    // transparent colour, disposal method and delay default to unused
-    int transparent = -1;
-    disposal = wxANIM_UNSPECIFIED;
-    delay = -1;
-    wxString comment;
-
-    bool done = false;
-    while (!done)
-    {
-        type = stream.GetC();
-
-        /*
-        If the end of file has been reached (or an error) and a ";"
-        (GIF_MARKER_ENDOFDATA) hasn't been encountered yet, exit the loop. (Without this
-        check the while loop would loop endlessly.) Later on, in the next while
-        loop, the file will be treated as being truncated (But still
-        be decoded as far as possible). returning wxGIF_TRUNCATED is not
-        possible here since some init code is done after this loop.
-        */
-        if (stream.Eof())// || !stream.IsOk())
-        {
-            /*
-            type is set to some bogus value, so there's no
-            need to continue evaluating it.
-            */
-            break; // Alternative : "return wxGIF_INVFORMAT;"
-        }
-
-        switch (type)
-        {
-            case GIF_MARKER_ENDOFDATA:
-                done = true;
-                break;
-            case GIF_MARKER_EXT:
-                switch (stream.GetC())
-                {
-                    case GIF_MARKER_EXT_GRAPHICS_CONTROL:
-                    {
-                        // graphics control extension, parse it
-
-                        static const unsigned int gceSize = 6;
-                        stream.Read(buf, gceSize);
-                        if (stream.LastRead() != gceSize)
-                        {
-                            Destroy();
-                            return wxGIF_INVFORMAT;
-                        }
-
-                        // read delay and convert from 1/100 of a second to ms
-                        delay = 10 * (buf[2] + 256 * buf[3]);
-
-                        // read transparent colour index, if used
-                        transparent = buf[1] & 0x01 ? buf[4] : -1;
-
-                        // read disposal method
-                        disposal = (wxAnimationDisposal)(((buf[1] & 0x1C) >> 2) - 1);
-                        break;
-                    }
-                    case GIF_MARKER_EXT_COMMENT:
-                    {
-                        int len = stream.GetC();
-                        while (len)
-                        {
-                            if ( stream.Eof() )
-                            {
-                                done = true;
-                                break;
-                            }
-
-                            wxCharBuffer charbuf(len);
-                            stream.Read(charbuf.data(), len);
-                            if ( (int) stream.LastRead() != len )
-                            {
-                                done = true;
-                                break;
-                            }
-
-                            comment += wxConvertMB2WX(charbuf.data());
-
-                            len = stream.GetC();
-                        }
-
-                        break;
-                    }
-                    default:
-                        // other extension, skip
-                        while ((i = stream.GetC()) != 0)
-                        {
-                            if (stream.Eof() || (stream.LastRead() == 0) ||
-                                stream.SeekI(i, wxFromCurrent) == wxInvalidOffset)
-                            {
-                                done = true;
-                                break;
-                            }
-                        }
-                        break;
-                }
-                break;
-            case GIF_MARKER_SEP:
-            {
-                // allocate memory for IMAGEN struct
-                GIFImagePtr pimg(new GIFImage());
-
-                wxScopeGuard guardDestroy = wxMakeObjGuard(*this, &wxGIFDecoder::Destroy);
-
-                if ( !pimg.get() )
-                    return wxGIF_MEMERR;
-
-                // fill in the data
-                static const unsigned int idbSize = (2 + 2 + 2 + 2 + 1);
-                stream.Read(buf, idbSize);
-                if (stream.LastRead() != idbSize)
-                    return wxGIF_INVFORMAT;
-
-                pimg->comment = comment;
-                comment.clear();
-                pimg->left = buf[0] + 256 * buf[1];
-                pimg->top = buf[2] + 256 * buf[3];
-    /*
-                pimg->left = buf[4] + 256 * buf[5];
-                pimg->top = buf[4] + 256 * buf[5];
-    */
-                pimg->w = buf[4] + 256 * buf[5];
-                pimg->h = buf[6] + 256 * buf[7];
-
-                if ( anim )
-                {
-                    // some GIF images specify incorrect animation size but we can
-                    // still open them if we fix up the animation size, see #9465
-                    if ( m_nFrames == 0 )
-                    {
-                        if ( pimg->w > (unsigned)m_szAnimation.x )
-                            m_szAnimation.x = pimg->w;
-                        if ( pimg->h > (unsigned)m_szAnimation.y )
-                            m_szAnimation.y = pimg->h;
-                    }
-                    else // subsequent frames
-                    {
-                        // check that we have valid size
-                        if ( (!pimg->w || pimg->w > (unsigned)m_szAnimation.x) ||
-                                (!pimg->h || pimg->h > (unsigned)m_szAnimation.y) )
-                        {
-                            wxLogError(_("Incorrect GIF frame size (%u, %d) for "
-                                         "the frame #%u"),
-                                       pimg->w, pimg->h, m_nFrames);
-                            return wxGIF_INVFORMAT;
-                        }
-                    }
-                }
-
-                interl = ((buf[8] & 0x40)? 1 : 0);
-                size = pimg->w * pimg->h;
-
-                pimg->transparent = transparent;
-                pimg->disposal = disposal;
-                pimg->delay = delay;
-
-                // allocate memory for image and palette
-                pimg->p   = (unsigned char *) malloc((unsigned int)size);
-                pimg->pal = (unsigned char *) malloc(768);
-
-                if ((!pimg->p) || (!pimg->pal))
-                    return wxGIF_MEMERR;
-
-                // load local color map if available, else use global map
-                if ((buf[8] & 0x80) == 0x80)
-                {
-                    unsigned int local_ncolors = 2 << (buf[8] & 0x07);
-                    unsigned int numBytes = 3 * local_ncolors;
-                    stream.Read(pimg->pal, numBytes);
-                    pimg->ncolours = local_ncolors;
-                    if (stream.LastRead() != numBytes)
-                        return wxGIF_INVFORMAT;
-                }
-                else
-                {
-                    memcpy(pimg->pal, pal, 768);
-                    pimg->ncolours = global_ncolors;
-                }
-
-                // get initial code size from first byte in raster data
-                bits = stream.GetC();
-                if (bits == 0)
-                    return wxGIF_INVFORMAT;
-
-                // decode image
-                wxGIFErrorCode result = dgif(stream, pimg.get(), interl, bits);
-                if (result != wxGIF_OK)
-                    return result;
-
-                guardDestroy.Dismiss();
-
-                // add the image to our frame array
-                m_frames.Add(pimg.release());
-                m_nFrames++;
-
-                // if this is not an animated GIF, exit after first image
-                if (!anim)
-                    done = true;
-                break;
-            }
-        }
-    }
-
-    if (m_nFrames <= 0)
-    {
-        Destroy();
-        return wxGIF_INVFORMAT;
-    }
-
-    // try to read to the end of the stream
-    while (type != GIF_MARKER_ENDOFDATA)
-    {
-        if (!stream.IsOk())
-            return wxGIF_TRUNCATED;
-
-        type = stream.GetC();
-
-        switch (type)
-        {
-            case GIF_MARKER_EXT:
-                // extension type
-                (void) stream.GetC();
-
-                // skip all data
-                while ((i = stream.GetC()) != 0)
-                {
-                    if (stream.Eof() || (stream.LastRead() == 0) ||
-                        stream.SeekI(i, wxFromCurrent) == wxInvalidOffset)
-                    {
-                        Destroy();
-                        return wxGIF_INVFORMAT;
-                    }
-                }
-                break;
-            case GIF_MARKER_SEP:
-            {
-                // image descriptor block
-                static const unsigned int idbSize = (2 + 2 + 2 + 2 + 1);
-                stream.Read(buf, idbSize);
-                if (stream.LastRead() != idbSize)
-                {
-                    Destroy();
-                    return wxGIF_INVFORMAT;
-                }
-
-                // local color map
-                if ((buf[8] & 0x80) == 0x80)
-                {
-                    unsigned int local_ncolors = 2 << (buf[8] & 0x07);
-                    wxFileOffset numBytes = 3 * local_ncolors;
-                    if (stream.SeekI(numBytes, wxFromCurrent) == wxInvalidOffset)
-                    {
-                        Destroy();
-                        return wxGIF_INVFORMAT;
-                    }
-                }
-
-                // initial code size
-                (void) stream.GetC();
-                if (stream.Eof() || (stream.LastRead() == 0))
-                {
-                    Destroy();
-                    return wxGIF_INVFORMAT;
-                }
-
-                // skip all data
-                while ((i = stream.GetC()) != 0)
-                {
-                    if (stream.Eof() || (stream.LastRead() == 0) ||
-                        stream.SeekI(i, wxFromCurrent) == wxInvalidOffset)
-                    {
-                        Destroy();
-                        return wxGIF_INVFORMAT;
-                    }
-                }
-                break;
-            }
-            default:
-                if ((type != GIF_MARKER_ENDOFDATA) && (type != 00)) // testing
-                {
-                    // images are OK, but couldn't read to the end of the stream
-                    return wxGIF_TRUNCATED;
-                }
-                break;
-        }
-    }
-
-    return wxGIF_OK;
-}
-
-#endif // wxUSE_STREAMS && wxUSE_GIF
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/gifdecod.cpp
+// Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
+// Author:      Guillermo Rodriguez Garcia <guille@iies.es>
+// Version:     3.04
+// RCS-ID:      $Id: gifdecod.cpp 62183 2009-09-28 09:40:20Z JS $
+// Copyright:   (c) Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS && wxUSE_GIF
+
+#ifndef WX_PRECOMP
+    #include "wx/palette.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include "wx/gifdecod.h"
+
+
+
+//---------------------------------------------------------------------------
+// GIFImage
+//---------------------------------------------------------------------------
+
+// internal class for storing GIF image data
+class GIFImage
+{
+public:
+    // def ctor
+    GIFImage();
+
+    unsigned int w;                 // width
+    unsigned int h;                 // height
+    unsigned int left;              // x coord (in logical screen)
+    unsigned int top;               // y coord (in logical screen)
+    int transparent;                // transparent color index (-1 = none)
+    wxAnimationDisposal disposal;   // disposal method
+    long delay;                     // delay in ms (-1 = unused)
+    unsigned char *p;               // bitmap
+    unsigned char *pal;             // palette
+    unsigned int ncolours;          // number of colours
+
+    DECLARE_NO_COPY_CLASS(GIFImage)
+};
+
+
+
+//---------------------------------------------------------------------------
+// GIFImage constructor
+//---------------------------------------------------------------------------
+GIFImage::GIFImage()
+{
+    w = 0;
+    h = 0;
+    left = 0;
+    top = 0;
+    transparent = 0;
+    disposal = wxANIM_DONOTREMOVE;
+    delay = -1;
+    p = (unsigned char *) NULL;
+    pal = (unsigned char *) NULL;
+    ncolours = 0;
+}
+
+//---------------------------------------------------------------------------
+// wxGIFDecoder constructor and destructor
+//---------------------------------------------------------------------------
+
+wxGIFDecoder::wxGIFDecoder()
+{
+}
+
+wxGIFDecoder::~wxGIFDecoder()
+{
+    Destroy();
+}
+
+void wxGIFDecoder::Destroy()
+{
+    wxASSERT(m_nFrames==m_frames.GetCount());
+    for (unsigned int i=0; i<m_nFrames; i++)
+    {
+        GIFImage *f = (GIFImage*)m_frames[i];
+        free(f->p);
+        free(f->pal);
+        delete f;
+    }
+
+    m_frames.Clear();
+    m_nFrames = 0;
+}
+
+
+//---------------------------------------------------------------------------
+// Convert this image to a wxImage object
+//---------------------------------------------------------------------------
+
+// This function was designed by Vaclav Slavik
+
+bool wxGIFDecoder::ConvertToImage(unsigned int frame, wxImage *image) const
+{
+    unsigned char *src, *dst, *pal;
+    unsigned long i;
+    int      transparent;
+
+    // just in case...
+    image->Destroy();
+
+    // create the image
+    wxSize sz = GetFrameSize(frame);
+    image->Create(sz.GetWidth(), sz.GetHeight());
+
+    if (!image->Ok())
+        return false;
+
+    pal = GetPalette(frame);
+    src = GetData(frame);
+    dst = image->GetData();
+    transparent = GetTransparentColourIndex(frame);
+
+    // set transparent colour mask
+    if (transparent != -1)
+    {
+        for (i = 0; i < GetNcolours(frame); i++)
+        {
+            if ((pal[3 * i + 0] == 255) &&
+                (pal[3 * i + 1] == 0) &&
+                (pal[3 * i + 2] == 255))
+            {
+                pal[3 * i + 2] = 254;
+            }
+        }
+
+        pal[3 * transparent + 0] = 255,
+        pal[3 * transparent + 1] = 0,
+        pal[3 * transparent + 2] = 255;
+
+        image->SetMaskColour(255, 0, 255);
+    }
+    else
+        image->SetMask(false);
+
+#if wxUSE_PALETTE
+    unsigned char r[256];
+    unsigned char g[256];
+    unsigned char b[256];
+
+    for (i = 0; i < 256; i++)
+    {
+        r[i] = pal[3*i + 0];
+        g[i] = pal[3*i + 1];
+        b[i] = pal[3*i + 2];
+    }
+
+    image->SetPalette(wxPalette(GetNcolours(frame), r, g, b));
+#endif // wxUSE_PALETTE
+
+    // copy image data
+    unsigned long npixel = sz.GetWidth() * sz.GetHeight();
+    for (i = 0; i < npixel; i++, src++)
+    {
+        *(dst++) = pal[3 * (*src) + 0];
+        *(dst++) = pal[3 * (*src) + 1];
+        *(dst++) = pal[3 * (*src) + 2];
+    }
+
+    return true;
+}
+
+
+//---------------------------------------------------------------------------
+// Data accessors
+//---------------------------------------------------------------------------
+
+#define GetFrame(n)     ((GIFImage*)m_frames[n])
+
+
+// Get data for current frame
+
+wxSize wxGIFDecoder::GetFrameSize(unsigned int frame) const
+{
+    return wxSize(GetFrame(frame)->w, GetFrame(frame)->h);
+}
+
+wxPoint wxGIFDecoder::GetFramePosition(unsigned int frame) const
+{
+    return wxPoint(GetFrame(frame)->left, GetFrame(frame)->top);
+}
+
+wxAnimationDisposal wxGIFDecoder::GetDisposalMethod(unsigned int frame) const
+{
+    return GetFrame(frame)->disposal;
+}
+
+long wxGIFDecoder::GetDelay(unsigned int frame) const
+{
+    return GetFrame(frame)->delay;
+}
+
+wxColour wxGIFDecoder::GetTransparentColour(unsigned int frame) const
+{
+    unsigned char *pal = GetFrame(frame)->pal;
+    int n = GetFrame(frame)->transparent;
+    if (n == -1)
+        return wxNullColour;
+
+    return wxColour(pal[n*3 + 0],
+                    pal[n*3 + 1],
+                    pal[n*3 + 2]);
+}
+
+unsigned char* wxGIFDecoder::GetData(unsigned int frame) const    { return (GetFrame(frame)->p); }
+unsigned char* wxGIFDecoder::GetPalette(unsigned int frame) const { return (GetFrame(frame)->pal); }
+unsigned int wxGIFDecoder::GetNcolours(unsigned int frame) const  { return (GetFrame(frame)->ncolours); }
+int wxGIFDecoder::GetTransparentColourIndex(unsigned int frame) const  { return (GetFrame(frame)->transparent); }
+
+
+
+//---------------------------------------------------------------------------
+// GIF reading and decoding
+//---------------------------------------------------------------------------
+
+// getcode:
+//  Reads the next code from the file stream, with size 'bits'
+//
+int wxGIFDecoder::getcode(wxInputStream& stream, int bits, int ab_fin)
+{
+    unsigned int mask;          // bit mask
+    unsigned int code;          // code (result)
+
+    // get remaining bits from last byte read
+    mask = (1 << bits) - 1;
+    code = (m_lastbyte >> (8 - m_restbits)) & mask;
+
+    // keep reading new bytes while needed
+    while (bits > m_restbits)
+    {
+        // if no bytes left in this block, read the next block
+        if (m_restbyte == 0)
+        {
+            m_restbyte = (unsigned char)stream.GetC();
+
+            /* Some encoders are a bit broken: instead of issuing
+             * an end-of-image symbol (ab_fin) they come up with
+             * a zero-length subblock!! We catch this here so
+             * that the decoder sees an ab_fin code.
+             */
+            if (m_restbyte == 0)
+            {
+                code = ab_fin;
+                break;
+            }
+
+            // prefetch data
+            stream.Read((void *) m_buffer, m_restbyte);
+            if (stream.LastRead() != m_restbyte)
+            {
+                code = ab_fin;
+                return code;
+            }
+            m_bufp = m_buffer;
+        }
+
+        // read next byte and isolate the bits we need
+        m_lastbyte = (unsigned char) (*m_bufp++);
+        mask       = (1 << (bits - m_restbits)) - 1;
+        code       = code + ((m_lastbyte & mask) << m_restbits);
+        m_restbyte--;
+
+        // adjust total number of bits extracted from the buffer
+        m_restbits = m_restbits + 8;
+    }
+
+    // find number of bits remaining for next code
+    m_restbits = (m_restbits - bits);
+
+    return code;
+}
+
+
+// dgif:
+//  GIF decoding function. The initial code size (aka root size)
+//  is 'bits'. Supports interlaced images (interl == 1).
+//  Returns wxGIF_OK (== 0) on success, or an error code if something
+// fails (see header file for details)
+wxGIFErrorCode
+wxGIFDecoder::dgif(wxInputStream& stream, GIFImage *img, int interl, int bits)
+{
+    static const int allocSize = 4096 + 1;
+    int *ab_prefix = new int[allocSize]; // alphabet (prefixes)
+    if (ab_prefix == NULL)
+    {
+        return wxGIF_MEMERR;
+    }
+
+    int *ab_tail = new int[allocSize];   // alphabet (tails)
+    if (ab_tail == NULL)
+    {
+        delete[] ab_prefix;
+        return wxGIF_MEMERR;
+    }
+
+    int *stack = new int[allocSize];     // decompression stack
+    if (stack == NULL)
+    {
+        delete[] ab_prefix;
+        delete[] ab_tail;
+        return wxGIF_MEMERR;
+    }
+
+    int ab_clr;                     // clear code
+    int ab_fin;                     // end of info code
+    int ab_bits;                    // actual symbol width, in bits
+    int ab_free;                    // first free position in alphabet
+    int ab_max;                     // last possible character in alphabet
+    int pass;                       // pass number in interlaced images
+    int pos;                        // index into decompresion stack
+    unsigned int x, y;              // position in image buffer
+
+    int code, readcode, lastcode, abcabca;
+
+    // these won't change
+    ab_clr = (1 << bits);
+    ab_fin = (1 << bits) + 1;
+
+    // these will change through the decompression proccess
+    ab_bits  = bits + 1;
+    ab_free  = (1 << bits) + 2;
+    ab_max   = (1 << ab_bits) - 1;
+    lastcode = -1;
+    abcabca  = -1;
+    pass     = 1;
+    pos = x = y = 0;
+
+    // reset decoder vars
+    m_restbits = 0;
+    m_restbyte = 0;
+    m_lastbyte = 0;
+
+    do
+    {
+        // get next code
+        readcode = code = getcode(stream, ab_bits, ab_fin);
+
+        // end of image?
+        if (code == ab_fin) break;
+
+        // reset alphabet?
+        if (code == ab_clr)
+        {
+            // reset main variables
+            ab_bits  = bits + 1;
+            ab_free  = (1 << bits) + 2;
+            ab_max   = (1 << ab_bits) - 1;
+            lastcode = -1;
+            abcabca  = -1;
+
+            // skip to next code
+            continue;
+        }
+
+        // unknown code: special case (like in ABCABCA)
+        if (code >= ab_free)
+        {
+            code = lastcode;            // take last string
+            stack[pos++] = abcabca;     // add first character
+        }
+
+        // build the string for this code in the stack
+        while (code > ab_clr)
+        {
+            stack[pos++] = ab_tail[code];
+            code         = ab_prefix[code];
+
+            // Don't overflow. This shouldn't happen with normal
+            // GIF files, the allocSize of 4096+1 is enough. This
+            // will only happen with badly formed GIFs.
+            if (pos >= allocSize)
+            {
+                delete[] ab_prefix;
+                delete[] ab_tail;
+                delete[] stack;
+                return wxGIF_INVFORMAT;
+            }
+        }
+
+        if (pos >= allocSize)
+        {
+            delete[] ab_prefix;
+            delete[] ab_tail;
+            delete[] stack;
+            return wxGIF_INVFORMAT;
+        }
+
+        stack[pos] = code;              // push last code into the stack
+        abcabca    = code;              // save for special case
+
+        // make new entry in alphabet (only if NOT just cleared)
+        if (lastcode != -1)
+        {
+            // Normally, after the alphabet is full and can't grow any
+            // further (ab_free == 4096), encoder should (must?) emit CLEAR
+            // to reset it. This checks whether we really got it, otherwise
+            // the GIF is damaged.
+            if (ab_free > ab_max)
+            {
+                delete[] ab_prefix;
+                delete[] ab_tail;
+                delete[] stack;
+                return wxGIF_INVFORMAT;
+            }
+
+            // This assert seems unnecessary since the condition above
+            // eliminates the only case in which it went false. But I really
+            // don't like being forced to ask "Who in .text could have
+            // written there?!" And I wouldn't have been forced to ask if
+            // this line had already been here.
+            wxASSERT(ab_free < allocSize);
+
+            ab_prefix[ab_free] = lastcode;
+            ab_tail[ab_free]   = code;
+            ab_free++;
+
+            if ((ab_free > ab_max) && (ab_bits < 12))
+            {
+                ab_bits++;
+                ab_max = (1 << ab_bits) - 1;
+            }
+        }
+
+        // dump stack data to the image buffer
+        while (pos >= 0)
+        {
+            (img->p)[x + (y * (img->w))] = (char) stack[pos];
+            pos--;
+
+            if (++x >= (img->w))
+            {
+                x = 0;
+
+                if (interl)
+                {
+                    // support for interlaced images
+                    switch (pass)
+                    {
+                        case 1: y += 8; break;
+                        case 2: y += 8; break;
+                        case 3: y += 4; break;
+                        case 4: y += 2; break;
+                    }
+
+                    /* loop until a valid y coordinate has been
+                    found, Or if the maximum number of passes has
+                    been reached, exit the loop, and stop image
+                    decoding (At this point the image is successfully
+                    decoded).
+                    If we don't loop, but merely set y to some other
+                    value, that new value might still be invalid depending
+                    on the height of the image. This would cause out of
+                    bounds writing.
+                    */
+                    while (y >= (img->h))
+                    {
+                        switch (++pass)
+                        {
+                            case 2: y = 4; break;
+                            case 3: y = 2; break;
+                            case 4: y = 1; break;
+
+                            default:
+                                /*
+                                It's possible we arrive here. For example this
+                                happens when the image is interlaced, and the
+                                height is 1. Looking at the above cases, the
+                                lowest possible y is 1. While the only valid
+                                one would be 0 for an image of height 1. So
+                                'eventually' the loop will arrive here.
+                                This case makes sure this while loop is
+                                exited, as well as the 2 other ones.
+                                */
+
+                                // Set y to a valid coordinate so the local
+                                // while loop will be exited. (y = 0 always
+                                // is >= img->h since if img->h == 0 the
+                                // image is never decoded)
+                                y = 0;
+
+                                // This will exit the other outer while loop
+                                pos = -1;
+
+                                // This will halt image decoding.
+                                code = ab_fin;
+
+                                break;
+                        }
+                    }
+                }
+                else
+                {
+                    // non-interlaced
+                    y++;
+/*
+Normally image decoding is finished when an End of Information code is
+encountered (code == ab_fin) however some broken encoders write wrong
+"block byte counts" (The first byte value after the "code size" byte),
+being one value too high. It might very well be possible other variants
+of this problem occur as well. The only sensible solution seems to
+be to check for clipping.
+Example of wrong encoding:
+(1 * 1 B/W image, raster data stream follows in hex bytes)
+
+02  << B/W images have a code size of 2
+02  << Block byte count
+44  << LZW packed
+00  << Zero byte count (terminates data stream)
+
+Because the block byte count is 2, the zero byte count is used in the
+decoding process, and decoding is continued after this byte. (While it
+should signal an end of image)
+
+It should be:
+02
+02
+44
+01  << When decoded this correctly includes the End of Information code
+00
+
+Or (Worse solution):
+02
+01
+44
+00
+(The 44 doesn't include an End of Information code, but at least the
+decoder correctly skips to 00 now after decoding, and signals this
+as an End of Information itself)
+*/
+                    if (y >= img->h)
+                    {
+                        code = ab_fin;
+                        break;
+                    }
+                }
+            }
+        }
+
+        pos = 0;
+        lastcode = readcode;
+    }
+    while (code != ab_fin);
+
+    delete [] ab_prefix ;
+    delete [] ab_tail ;
+    delete [] stack ;
+
+    return wxGIF_OK;
+}
+
+
+// CanRead:
+//  Returns true if the file looks like a valid GIF, false otherwise.
+//
+bool wxGIFDecoder::CanRead(wxInputStream &stream) const
+{
+    unsigned char buf[3];
+
+    if ( !stream.Read(buf, WXSIZEOF(buf)) )
+        return false;
+
+    stream.SeekI(-(wxFileOffset)WXSIZEOF(buf), wxFromCurrent);
+
+    return memcmp(buf, "GIF", WXSIZEOF(buf)) == 0;
+}
+
+
+// LoadGIF:
+//  Reads and decodes one or more GIF images, depending on whether
+//  animated GIF support is enabled. Can read GIFs with any bit
+//  size (color depth), but the output images are always expanded
+//  to 8 bits per pixel. Also, the image palettes always contain
+//  256 colors, although some of them may be unused. Returns wxGIF_OK
+//  (== 0) on success, or an error code if something fails (see
+//  header file for details)
+//
+wxGIFErrorCode wxGIFDecoder::LoadGIF(wxInputStream& stream)
+{
+    unsigned int  global_ncolors = 0;
+    int           bits, interl, i;
+    wxAnimationDisposal disposal;
+    long          size;
+    long          delay;
+    unsigned char type = 0;
+    unsigned char pal[768];
+    unsigned char buf[16];
+    bool anim = true;
+
+    // check GIF signature
+    if (!CanRead(stream))
+        return wxGIF_INVFORMAT;
+
+    // check for animated GIF support (ver. >= 89a)
+
+    static const unsigned int headerSize = (3 + 3);
+    stream.Read(buf, headerSize);
+    if (stream.LastRead() != headerSize)
+    {
+        return wxGIF_INVFORMAT;
+    }
+
+    if (memcmp(buf + 3, "89a", 3) < 0)
+    {
+        anim = false;
+    }
+
+    // read logical screen descriptor block (LSDB)
+    static const unsigned int lsdbSize = (2 + 2 + 1 + 1 + 1);
+    stream.Read(buf, lsdbSize);
+    if (stream.LastRead() != lsdbSize)
+    {
+        return wxGIF_INVFORMAT;
+    }
+
+    m_szAnimation.SetWidth( buf[0] + 256 * buf[1] );
+    m_szAnimation.SetHeight( buf[2] + 256 * buf[3] );
+
+    if (anim && ((m_szAnimation.GetWidth() == 0) || (m_szAnimation.GetHeight() == 0)))
+    {
+        return wxGIF_INVFORMAT;
+    }
+
+    // load global color map if available
+    if ((buf[4] & 0x80) == 0x80)
+    {
+        int backgroundColIndex = buf[5];
+
+        global_ncolors = 2 << (buf[4] & 0x07);
+        unsigned int numBytes = 3 * global_ncolors;
+        stream.Read(pal, numBytes);
+        if (stream.LastRead() != numBytes)
+        {
+            return wxGIF_INVFORMAT;
+        }
+
+        m_background.Set(pal[backgroundColIndex*3 + 0],
+                         pal[backgroundColIndex*3 + 1],
+                         pal[backgroundColIndex*3 + 2]);
+    }
+
+    // transparent colour, disposal method and delay default to unused
+    int transparent = -1;
+    disposal = wxANIM_UNSPECIFIED;
+    delay = -1;
+
+    bool done = false;
+    while (!done)
+    {
+        type = (unsigned char)stream.GetC();
+
+        /*
+        If the end of file has been reached (or an error) and a ";"
+        (0x3B) hasn't been encountered yet, exit the loop. (Without this
+        check the while loop would loop endlessly.) Later on, in the next while
+        loop, the file will be treated as being truncated (But still
+        be decoded as far as possible). returning wxGIF_TRUNCATED is not
+        possible here since some init code is done after this loop.
+        */
+        if (stream.Eof())// || !stream.IsOk())
+        {
+            /*
+            type is set to some bogus value, so there's no
+            need to continue evaluating it.
+            */
+            break; // Alternative : "return wxGIF_INVFORMAT;"
+        }
+
+        // end of data?
+        if (type == 0x3B)
+        {
+            done = true;
+        }
+        else
+        // extension block?
+        if (type == 0x21)
+        {
+            if (((unsigned char)stream.GetC()) == 0xF9)
+            // graphics control extension, parse it
+            {
+                static const unsigned int gceSize = 6;
+                stream.Read(buf, gceSize);
+                if (stream.LastRead() != gceSize)
+                {
+                    Destroy();
+                    return wxGIF_INVFORMAT;
+                }
+
+                // read delay and convert from 1/100 of a second to ms
+                delay = 10 * (buf[2] + 256 * buf[3]);
+
+                // read transparent colour index, if used
+                transparent = buf[1] & 0x01 ? buf[4] : -1;
+
+                // read disposal method
+                disposal = (wxAnimationDisposal)(((buf[1] & 0x1C) >> 2) - 1);
+            }
+            else
+            // other extension, skip
+            {
+                while ((i = (unsigned char)stream.GetC()) != 0)
+                {
+                    if (stream.Eof() || (stream.LastRead() == 0))
+                    {
+                        done = true;
+                        break;
+                    }
+                    stream.SeekI(i, wxFromCurrent);
+                }
+            }
+        }
+        else
+        // image descriptor block?
+        if (type == 0x2C)
+        {
+            // allocate memory for IMAGEN struct
+            GIFImage *pimg = new GIFImage();
+
+            if (pimg == NULL)
+            {
+                Destroy();
+                return wxGIF_MEMERR;
+            }
+
+            // fill in the data
+            static const unsigned int idbSize = (2 + 2 + 2 + 2 + 1);
+            stream.Read(buf, idbSize);
+            if (stream.LastRead() != idbSize)
+            {
+                Destroy();
+                return wxGIF_INVFORMAT;
+            }
+
+            pimg->left = buf[0] + 256 * buf[1];
+            pimg->top = buf[2] + 256 * buf[3];
+/*
+            pimg->left = buf[4] + 256 * buf[5];
+            pimg->top = buf[4] + 256 * buf[5];
+*/
+            pimg->w = buf[4] + 256 * buf[5];
+            pimg->h = buf[6] + 256 * buf[7];
+
+#if 0
+            if (anim && ((pimg->w == 0) || (pimg->w > (unsigned int)m_szAnimation.GetWidth()) ||
+                (pimg->h == 0) || (pimg->h > (unsigned int)m_szAnimation.GetHeight())))
+            {
+                Destroy();
+                return wxGIF_INVFORMAT;
+            }
+#endif
+            if ( anim )
+            {
+                // some GIF images specify incorrect animation size but we can
+                // still open them if we fix up the animation size, see #9465
+                if ( m_nFrames == 0 )
+                {
+                    if ( pimg->w > (unsigned)m_szAnimation.x )
+                        m_szAnimation.x = pimg->w;
+                    if ( pimg->h > (unsigned)m_szAnimation.y )
+                        m_szAnimation.y = pimg->h;
+                }
+                else // subsequent frames
+                {
+                    // check that we have valid size
+                    if ( (!pimg->w || pimg->w > (unsigned)m_szAnimation.x) ||
+                            (!pimg->h || pimg->h > (unsigned)m_szAnimation.y) )
+                    {
+                        wxLogError(_("Incorrect GIF frame size (%u, %d) for the frame #%u"),
+                                   pimg->w, pimg->h, m_nFrames);
+                        Destroy();
+                        return wxGIF_INVFORMAT;
+                    }
+                }
+            }
+
+            interl = ((buf[8] & 0x40)? 1 : 0);
+            size = pimg->w * pimg->h;
+
+            pimg->transparent = transparent;
+            pimg->disposal = disposal;
+            pimg->delay = delay;
+
+            // allocate memory for image and palette
+            pimg->p   = (unsigned char *) malloc((unsigned int)size);
+            pimg->pal = (unsigned char *) malloc(768);
+
+            if ((!pimg->p) || (!pimg->pal))
+            {
+                Destroy();
+                return wxGIF_MEMERR;
+            }
+
+            // load local color map if available, else use global map
+            if ((buf[8] & 0x80) == 0x80)
+            {
+                unsigned int local_ncolors = 2 << (buf[8] & 0x07);
+                unsigned int numBytes = 3 * local_ncolors;
+                stream.Read(pimg->pal, numBytes);
+                pimg->ncolours = local_ncolors;
+                if (stream.LastRead() != numBytes)
+                {
+                    Destroy();
+                    return wxGIF_INVFORMAT;
+                }
+            }
+            else
+            {
+                memcpy(pimg->pal, pal, 768);
+                pimg->ncolours = global_ncolors;
+            }
+
+            // get initial code size from first byte in raster data
+            bits = (unsigned char)stream.GetC();
+            if (bits == 0)
+            {
+                Destroy();
+                return wxGIF_INVFORMAT;
+            }
+
+            // decode image
+            wxGIFErrorCode result = dgif(stream, pimg, interl, bits);
+            if (result != wxGIF_OK)
+            {
+                Destroy();
+                return result;
+            }
+
+            // add the image to our frame array
+            m_frames.Add((void*)pimg);
+            m_nFrames++;
+
+            // if this is not an animated GIF, exit after first image
+            if (!anim)
+                done = true;
+        }
+    }
+
+    if (m_nFrames <= 0)
+    {
+        Destroy();
+        return wxGIF_INVFORMAT;
+    }
+
+    // try to read to the end of the stream
+    while (type != 0x3B)
+    {
+        if (!stream.IsOk())
+            return wxGIF_TRUNCATED;
+
+        type = (unsigned char)stream.GetC();
+
+        if (type == 0x21)
+        {
+            // extension type
+            (void) stream.GetC();
+
+            // skip all data
+            while ((i = (unsigned char)stream.GetC()) != 0)
+            {
+                if (stream.Eof() || (stream.LastRead() == 0))
+                {
+                    Destroy();
+                    return wxGIF_INVFORMAT;
+                }
+                stream.SeekI(i, wxFromCurrent);
+            }
+        }
+        else if (type == 0x2C)
+        {
+            // image descriptor block
+            static const unsigned int idbSize = (2 + 2 + 2 + 2 + 1);
+            stream.Read(buf, idbSize);
+            if (stream.LastRead() != idbSize)
+            {
+                Destroy();
+                return wxGIF_INVFORMAT;
+            }
+
+            // local color map
+            if ((buf[8] & 0x80) == 0x80)
+            {
+                unsigned int local_ncolors = 2 << (buf[8] & 0x07);
+                wxFileOffset numBytes = 3 * local_ncolors;
+                stream.SeekI(numBytes, wxFromCurrent);
+            }
+
+            // initial code size
+            (void) stream.GetC();
+            if (stream.Eof() || (stream.LastRead() == 0))
+            {
+                Destroy();
+                return wxGIF_INVFORMAT;
+            }
+
+            // skip all data
+            while ((i = (unsigned char)stream.GetC()) != 0)
+            {
+                if (stream.Eof() || (stream.LastRead() == 0))
+                {
+                    Destroy();
+                    return wxGIF_INVFORMAT;
+                }
+                stream.SeekI(i, wxFromCurrent);
+            }
+        }
+        else if ((type != 0x3B) && (type != 00)) // testing
+        {
+            // images are OK, but couldn't read to the end of the stream
+            return wxGIF_TRUNCATED;
+        }
+    }
+
+    return wxGIF_OK;
+}
+
+#endif // wxUSE_STREAMS && wxUSE_GIF
diff --git a/Source/3rd Party/wx/src/common/graphcmn.cpp b/Source/3rd Party/wx/src/common/graphcmn.cpp
index a4f6d75a9..70f1a3416 100644
--- a/Source/3rd Party/wx/src/common/graphcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/graphcmn.cpp	
@@ -1,935 +1,776 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/graphcmn.cpp
-// Purpose:     graphics context methods common to all platforms
-// Author:      Stefan Csomor
-// Modified by:
-// Created:
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#if defined(__BORLANDC__)
-    #pragma hdrstop
-#endif
-
-#if wxUSE_GRAPHICS_CONTEXT
-
-#include "wx/graphics.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/icon.h"
-    #include "wx/bitmap.h"
-    #include "wx/dcmemory.h"
-    #include "wx/region.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/private/graphics.h"
-
-//-----------------------------------------------------------------------------
-// Local functions
-//-----------------------------------------------------------------------------
-
-static inline double DegToRad(double deg)
-{
-    return (deg * M_PI) / 180.0;
-}
-
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-// wxGraphicsObject
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsObject, wxObject)
-
-wxGraphicsObjectRefData::wxGraphicsObjectRefData( wxGraphicsRenderer* renderer )
-{
-    m_renderer = renderer;
-}
-wxGraphicsObjectRefData::wxGraphicsObjectRefData( const wxGraphicsObjectRefData* data )
-{
-    m_renderer = data->m_renderer;
-}
-wxGraphicsRenderer* wxGraphicsObjectRefData::GetRenderer() const
-{
-    return m_renderer ;
-}
-
-wxGraphicsObjectRefData* wxGraphicsObjectRefData::Clone() const
-{
-    return new wxGraphicsObjectRefData(this);
-}
-
-wxGraphicsObject::wxGraphicsObject()
-{
-}
-
-wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer )
-{
-    SetRefData( new wxGraphicsObjectRefData(renderer));
-}
-
-wxGraphicsObject::~wxGraphicsObject()
-{
-}
-
-bool wxGraphicsObject::IsNull() const
-{
-    return m_refData == NULL;
-}
-
-wxGraphicsRenderer* wxGraphicsObject::GetRenderer() const
-{
-    return ( IsNull() ? NULL : GetGraphicsData()->GetRenderer() );
-}
-
-wxGraphicsObjectRefData* wxGraphicsObject::GetGraphicsData() const
-{
-    return (wxGraphicsObjectRefData*) m_refData;
-}
-
-wxObjectRefData* wxGraphicsObject::CreateRefData() const
-{
-    wxLogDebug(wxT("A Null Object cannot be changed"));
-    return NULL;
-}
-
-wxObjectRefData* wxGraphicsObject::CloneRefData(const wxObjectRefData* data) const
-{
-    const wxGraphicsObjectRefData* ptr = (const wxGraphicsObjectRefData*) data;
-    return ptr->Clone();
-}
-
-//-----------------------------------------------------------------------------
-// pens etc.
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPen, wxGraphicsObject)
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBrush, wxGraphicsObject)
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsFont, wxGraphicsObject)
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBitmap, wxGraphicsObject)
-
-WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen;
-WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush;
-WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont;
-WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap;
-
-//-----------------------------------------------------------------------------
-// matrix
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsMatrix, wxGraphicsObject)
-WXDLLIMPEXP_DATA_CORE(wxGraphicsMatrix) wxNullGraphicsMatrix;
-
-// concatenates the matrix
-void wxGraphicsMatrix::Concat( const wxGraphicsMatrix *t )
-{
-    AllocExclusive();
-    GetMatrixData()->Concat(t->GetMatrixData());
-}
-
-// sets the matrix to the respective values
-void wxGraphicsMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,
-                           wxDouble tx, wxDouble ty)
-{
-    AllocExclusive();
-    GetMatrixData()->Set(a,b,c,d,tx,ty);
-}
-
-// gets the component valuess of the matrix
-void wxGraphicsMatrix::Get(wxDouble* a, wxDouble* b,  wxDouble* c,
-                           wxDouble* d, wxDouble* tx, wxDouble* ty) const
-{
-    GetMatrixData()->Get(a, b, c, d, tx, ty);
-}
-
-// makes this the inverse matrix
-void wxGraphicsMatrix::Invert()
-{
-    AllocExclusive();
-    GetMatrixData()->Invert();
-}
-
-// returns true if the elements of the transformation matrix are equal ?
-bool wxGraphicsMatrix::IsEqual( const wxGraphicsMatrix* t) const
-{
-    return GetMatrixData()->IsEqual(t->GetMatrixData());
-}
-
-// return true if this is the identity matrix
-bool wxGraphicsMatrix::IsIdentity() const
-{
-    return GetMatrixData()->IsIdentity();
-}
-
-// add the translation to this matrix
-void wxGraphicsMatrix::Translate( wxDouble dx , wxDouble dy )
-{
-    AllocExclusive();
-    GetMatrixData()->Translate(dx,dy);
-}
-
-// add the scale to this matrix
-void wxGraphicsMatrix::Scale( wxDouble xScale , wxDouble yScale )
-{
-    AllocExclusive();
-    GetMatrixData()->Scale(xScale,yScale);
-}
-
-// add the rotation to this matrix (radians)
-void wxGraphicsMatrix::Rotate( wxDouble angle )
-{
-    AllocExclusive();
-    GetMatrixData()->Rotate(angle);
-}
-
-//
-// apply the transforms
-//
-
-// applies that matrix to the point
-void wxGraphicsMatrix::TransformPoint( wxDouble *x, wxDouble *y ) const
-{
-    GetMatrixData()->TransformPoint(x,y);
-}
-
-// applies the matrix except for translations
-void wxGraphicsMatrix::TransformDistance( wxDouble *dx, wxDouble *dy ) const
-{
-    GetMatrixData()->TransformDistance(dx,dy);
-}
-
-// returns the native representation
-void * wxGraphicsMatrix::GetNativeMatrix() const
-{
-    return GetMatrixData()->GetNativeMatrix();
-}
-
-//-----------------------------------------------------------------------------
-// path
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPath, wxGraphicsObject)
-WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath;
-
-// convenience functions, for using wxPoint2DDouble etc
-
-wxPoint2DDouble wxGraphicsPath::GetCurrentPoint() const
-{
-    wxDouble x,y;
-    GetCurrentPoint(&x,&y);
-    return wxPoint2DDouble(x,y);
-}
-
-void wxGraphicsPath::MoveToPoint( const wxPoint2DDouble& p)
-{
-    MoveToPoint( p.m_x , p.m_y);
-}
-
-void wxGraphicsPath::AddLineToPoint( const wxPoint2DDouble& p)
-{
-    AddLineToPoint( p.m_x , p.m_y);
-}
-
-void wxGraphicsPath::AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e)
-{
-    AddCurveToPoint(c1.m_x, c1.m_y, c2.m_x, c2.m_y, e.m_x, e.m_y);
-}
-
-void wxGraphicsPath::AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise)
-{
-    AddArc(c.m_x, c.m_y, r, startAngle, endAngle, clockwise);
-}
-
-wxRect2DDouble wxGraphicsPath::GetBox() const
-{
-    wxDouble x,y,w,h;
-    GetBox(&x,&y,&w,&h);
-    return wxRect2DDouble( x,y,w,h );
-}
-
-bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle ) const
-{
-    return Contains( c.m_x, c.m_y, fillStyle);
-}
-
-// true redirections
-
-// begins a new subpath at (x,y)
-void wxGraphicsPath::MoveToPoint( wxDouble x, wxDouble y )
-{
-    AllocExclusive();
-    GetPathData()->MoveToPoint(x,y);
-}
-
-// adds a straight line from the current point to (x,y)
-void wxGraphicsPath::AddLineToPoint( wxDouble x, wxDouble y )
-{
-    AllocExclusive();
-    GetPathData()->AddLineToPoint(x,y);
-}
-
-// adds a cubic Bezier curve from the current point, using two control points and an end point
-void wxGraphicsPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
-{
-    AllocExclusive();
-    GetPathData()->AddCurveToPoint(cx1,cy1,cx2,cy2,x,y);
-}
-
-// adds another path
-void wxGraphicsPath::AddPath( const wxGraphicsPath& path )
-{
-    AllocExclusive();
-    GetPathData()->AddPath(path.GetPathData());
-}
-
-// closes the current sub-path
-void wxGraphicsPath::CloseSubpath()
-{
-    AllocExclusive();
-    GetPathData()->CloseSubpath();
-}
-
-// gets the last point of the current path, (0,0) if not yet set
-void wxGraphicsPath::GetCurrentPoint( wxDouble* x, wxDouble* y) const
-{
-    GetPathData()->GetCurrentPoint(x,y);
-}
-
-// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
-void wxGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise )
-{
-    AllocExclusive();
-    GetPathData()->AddArc(x,y,r,startAngle,endAngle,clockwise);
-}
-
-//
-// These are convenience functions which - if not available natively will be assembled
-// using the primitives from above
-//
-
-// adds a quadratic Bezier curve from the current point, using a control point and an end point
-void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y )
-{
-    AllocExclusive();
-    GetPathData()->AddQuadCurveToPoint(cx,cy,x,y);
-}
-
-// appends a rectangle as a new closed subpath
-void wxGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
-{
-    AllocExclusive();
-    GetPathData()->AddRectangle(x,y,w,h);
-}
-
-// appends an ellipsis as a new closed subpath fitting the passed rectangle
-void wxGraphicsPath::AddCircle( wxDouble x, wxDouble y, wxDouble r )
-{
-    AllocExclusive();
-    GetPathData()->AddCircle(x,y,r);
-}
-
-// appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
-void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
-{
-    GetPathData()->AddArcToPoint(x1,y1,x2,y2,r);
-}
-
-// appends an ellipse
-void wxGraphicsPath::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
-{
-    AllocExclusive();
-    GetPathData()->AddEllipse(x,y,w,h);
-}
-
-// appends a rounded rectangle
-void wxGraphicsPath::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
-{
-    AllocExclusive();
-    GetPathData()->AddRoundedRectangle(x,y,w,h,radius);
-}
-
-// returns the native path
-void * wxGraphicsPath::GetNativePath() const
-{
-    return GetPathData()->GetNativePath();
-}
-
-// give the native path returned by GetNativePath() back (there might be some deallocations necessary)
-void wxGraphicsPath::UnGetNativePath(void *p)const
-{
-    GetPathData()->UnGetNativePath(p);
-}
-
-// transforms each point of this path by the matrix
-void wxGraphicsPath::Transform( const wxGraphicsMatrix& matrix )
-{
-    AllocExclusive();
-    GetPathData()->Transform(matrix.GetMatrixData());
-}
-
-// gets the bounding box enclosing all points (possibly including control points)
-void wxGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const
-{
-    GetPathData()->GetBox(x,y,w,h);
-}
-
-bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const
-{
-    return GetPathData()->Contains(x,y,fillStyle);
-}
-
-//
-// Emulations, these mus be implemented in the ...Data classes in order to allow for proper overrides
-//
-
-void wxGraphicsPathData::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y )
-{
-    // calculate using degree elevation to a cubic bezier
-    wxPoint2DDouble c1;
-    wxPoint2DDouble c2;
-
-    wxPoint2DDouble start;
-    GetCurrentPoint(&start.m_x,&start.m_y);
-    wxPoint2DDouble end(x,y);
-    wxPoint2DDouble c(cx,cy);
-    c1 = wxDouble(1/3.0) * start + wxDouble(2/3.0) * c;
-    c2 = wxDouble(2/3.0) * c + wxDouble(1/3.0) * end;
-    AddCurveToPoint(c1.m_x,c1.m_y,c2.m_x,c2.m_y,x,y);
-}
-
-void wxGraphicsPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
-{
-    MoveToPoint(x,y);
-    AddLineToPoint(x,y+h);
-    AddLineToPoint(x+w,y+h);
-    AddLineToPoint(x+w,y);
-    CloseSubpath();
-}
-
-void wxGraphicsPathData::AddCircle( wxDouble x, wxDouble y, wxDouble r )
-{
-    MoveToPoint(x+r,y);
-    AddArc( x,y,r,0,2*M_PI,false);
-    CloseSubpath();
-}
-
-void wxGraphicsPathData::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
-{
-    if (w <= 0. || h <= 0.)
-      return;
-
-    wxDouble rw = w/2;
-    wxDouble rh = h/2;
-    wxDouble xc = x + rw;
-    wxDouble yc = y + rh;
-    wxGraphicsMatrix m = GetRenderer()->CreateMatrix();
-    m.Translate(xc,yc);
-    m.Scale(rw/rh,1.0);
-    wxGraphicsPath p = GetRenderer()->CreatePath();
-    p.AddCircle(0,0,rh);
-    p.Transform(m);
-    AddPath(p.GetPathData());
-}
-
-void wxGraphicsPathData::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
-{
-    if ( radius == 0 )
-        AddRectangle(x,y,w,h);
-    else
-    {
-        MoveToPoint( x + w, y + h / 2);
-        AddArcToPoint(x + w, y + h, x + w / 2, y + h, radius);
-        AddArcToPoint(x, y + h, x, y + h / 2, radius);
-        AddArcToPoint(x, y , x + w / 2, y, radius);
-        AddArcToPoint(x + w, y, x + w, y + h / 2, radius);
-        CloseSubpath();
-    }
-}
-
-// draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
-void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
-{
-    wxPoint2DDouble current;
-    GetCurrentPoint(&current.m_x,&current.m_y);
-    wxPoint2DDouble p1(x1,y1);
-    wxPoint2DDouble p2(x2,y2);
-
-    wxPoint2DDouble v1 = current - p1;
-    v1.Normalize();
-    wxPoint2DDouble v2 = p2 - p1;
-    v2.Normalize();
-
-    wxDouble alpha = v1.GetVectorAngle() - v2.GetVectorAngle();
-
-    if ( alpha < 0 )
-        alpha = 360 + alpha;
-    // TODO obtuse angles
-
-    alpha = DegToRad(alpha);
-
-    wxDouble dist = r / sin(alpha/2) * cos(alpha/2);
-    // calculate tangential points
-    wxPoint2DDouble t1 = dist*v1 + p1;
-
-    wxPoint2DDouble nv1 = v1;
-    nv1.SetVectorAngle(v1.GetVectorAngle()-90);
-    wxPoint2DDouble c = t1 + r*nv1;
-
-    wxDouble a1 = v1.GetVectorAngle()+90;
-    wxDouble a2 = v2.GetVectorAngle()-90;
-
-    AddLineToPoint(t1.m_x,t1.m_y);
-    AddArc(c.m_x,c.m_y,r,DegToRad(a1),DegToRad(a2),true);
-    AddLineToPoint(p2.m_x,p2.m_y);
-}
-
-//-----------------------------------------------------------------------------
-// wxGraphicsGradientStops
-//-----------------------------------------------------------------------------
-
-void wxGraphicsGradientStops::Add(const wxGraphicsGradientStop& stop)
-{
-    for ( wxVector<wxGraphicsGradientStop>::iterator it = m_stops.begin();
-          it != m_stops.end();
-          ++it )
-    {
-        if ( stop.GetPosition() < it->GetPosition() )
-        {
-            if ( it != m_stops.begin() )
-            {
-                m_stops.insert(it, stop);
-            }
-            else // we shouldn't be inserting it at the beginning
-            {
-                wxFAIL_MSG( "invalid gradient stop position < 0" );
-            }
-
-            return;
-        }
-    }
-
-    if ( stop.GetPosition() == 1. )
-    {
-        m_stops.insert(m_stops.end() - 1, stop);
-    }
-    else
-    {
-        wxFAIL_MSG( "invalid gradient stop position > 1" );
-    }
-}
-
-void * wxGraphicsBitmap::GetNativeBitmap() const
-{
-    return GetBitmapData()->GetNativeBitmap();
-}
-
-//-----------------------------------------------------------------------------
-// wxGraphicsContext Convenience Methods
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
-
-
-wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) :
-    wxGraphicsObject(renderer),
-      m_antialias(wxANTIALIAS_DEFAULT),
-      m_composition(wxCOMPOSITION_OVER),
-      m_enableOffset(false)
-{
-}
-
-wxGraphicsContext::~wxGraphicsContext()
-{
-}
-
-bool wxGraphicsContext::StartDoc(const wxString& WXUNUSED(message))
-{
-    return true;
-}
-
-void wxGraphicsContext::EndDoc()
-{
-}
-
-void wxGraphicsContext::StartPage(wxDouble WXUNUSED(width),
-                                  wxDouble WXUNUSED(height))
-{
-}
-
-void wxGraphicsContext::EndPage()
-{
-}
-
-void wxGraphicsContext::Flush()
-{
-}
-
-void wxGraphicsContext::EnableOffset(bool enable) 
-{ 
-    m_enableOffset = enable; 
-}
-
-#if 0
-void wxGraphicsContext::SetAlpha( wxDouble WXUNUSED(alpha) )
-{
-}
-
-wxDouble wxGraphicsContext::GetAlpha() const
-{
-    return 1.0;
-}
-#endif
-
-void wxGraphicsContext::GetDPI( wxDouble* dpiX, wxDouble* dpiY)
-{
-    *dpiX = 72.0;
-    *dpiY = 72.0;
-}
-
-// sets the pen
-void wxGraphicsContext::SetPen( const wxGraphicsPen& pen )
-{
-    m_pen = pen;
-}
-
-void wxGraphicsContext::SetPen( const wxPen& pen )
-{
-    if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
-        SetPen( wxNullGraphicsPen );
-    else
-        SetPen( CreatePen( pen ) );
-}
-
-// sets the brush for filling
-void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush )
-{
-    m_brush = brush;
-}
-
-void wxGraphicsContext::SetBrush( const wxBrush& brush )
-{
-    if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT )
-        SetBrush( wxNullGraphicsBrush );
-    else
-        SetBrush( CreateBrush( brush ) );
-}
-
-// sets the brush for filling
-void wxGraphicsContext::SetFont( const wxGraphicsFont& font )
-{
-    m_font = font;
-}
-
-void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
-{
-    if ( font.IsOk() )
-        SetFont( CreateFont( font, colour ) );
-    else
-        SetFont( wxNullGraphicsFont );
-}
-
-void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle )
-{
-    FillPath( path , fillStyle );
-    StrokePath( path );
-}
-
-void
-wxGraphicsContext::DoDrawRotatedText(const wxString &str,
-                                     wxDouble x,
-                                     wxDouble y,
-                                     wxDouble angle)
-{
-    Translate(x,y);
-    Rotate( -angle );
-    DrawText( str , 0, 0 );
-    Rotate( angle );
-    Translate(-x,-y);
-}
-
-void
-wxGraphicsContext::DoDrawFilledText(const wxString &str,
-                                    wxDouble x,
-                                    wxDouble y,
-                                    const wxGraphicsBrush& backgroundBrush)
-{
-    wxGraphicsBrush formerBrush = m_brush;
-    wxGraphicsPen formerPen = m_pen;
-    wxDouble width;
-    wxDouble height;
-    wxDouble descent;
-    wxDouble externalLeading;
-    GetTextExtent( str , &width, &height, &descent, &externalLeading );
-    SetBrush( backgroundBrush );
-    // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
-    SetPen( wxNullGraphicsPen );
-
-    DrawRectangle(x , y, width, height);
-
-    DrawText( str, x ,y);
-    SetBrush( formerBrush );
-    SetPen( formerPen );
-}
-
-void
-wxGraphicsContext::DoDrawRotatedFilledText(const wxString &str,
-                                           wxDouble x, wxDouble y,
-                                           wxDouble angle,
-                                           const wxGraphicsBrush& backgroundBrush)
-{
-    wxGraphicsBrush formerBrush = m_brush;
-    wxGraphicsPen formerPen = m_pen;
-
-    wxDouble width;
-    wxDouble height;
-    wxDouble descent;
-    wxDouble externalLeading;
-    GetTextExtent( str , &width, &height, &descent, &externalLeading );
-    SetBrush( backgroundBrush );
-    // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
-    SetPen( wxNullGraphicsPen );
-
-    wxGraphicsPath path = CreatePath();
-    path.MoveToPoint( x , y );
-    path.AddLineToPoint( (int) (x + sin(angle) * height) , (int) (y + cos(angle) * height) );
-    path.AddLineToPoint(
-        (int) (x + sin(angle) * height + cos(angle) * width) ,
-        (int) (y + cos(angle) * height - sin(angle) * width));
-    path.AddLineToPoint((int) (x + cos(angle) * width) , (int) (y - sin(angle) * width) );
-    FillPath( path );
-    DrawText( str, x ,y, angle);
-    SetBrush( formerBrush );
-    SetPen( formerPen );
-}
-
-void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)
-{
-    wxGraphicsPath path = CreatePath();
-    path.MoveToPoint(x1, y1);
-    path.AddLineToPoint( x2, y2 );
-    StrokePath( path );
-}
-
-void wxGraphicsContext::DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
-{
-    wxGraphicsPath path = CreatePath();
-    path.AddRectangle( x , y , w , h );
-    DrawPath( path );
-}
-
-void wxGraphicsContext::DrawEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
-{
-    wxGraphicsPath path = CreatePath();
-    path.AddEllipse(x,y,w,h);
-    DrawPath(path);
-}
-
-void wxGraphicsContext::DrawRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
-{
-    wxGraphicsPath path = CreatePath();
-    path.AddRoundedRectangle(x,y,w,h,radius);
-    DrawPath(path);
-}
-
-void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
-{
-    wxASSERT(n > 1);
-    wxGraphicsPath path = CreatePath();
-    path.MoveToPoint(points[0].m_x, points[0].m_y);
-    for ( size_t i = 1; i < n; ++i)
-        path.AddLineToPoint( points[i].m_x, points[i].m_y );
-    StrokePath( path );
-}
-
-void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle)
-{
-    wxASSERT(n > 1);
-    wxGraphicsPath path = CreatePath();
-    path.MoveToPoint(points[0].m_x, points[0].m_y);
-    for ( size_t i = 1; i < n; ++i)
-        path.AddLineToPoint( points[i].m_x, points[i].m_y );
-    DrawPath( path , fillStyle);
-}
-
-void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints)
-{
-    wxASSERT(n > 0);
-    wxGraphicsPath path = CreatePath();
-    for ( size_t i = 0; i < n; ++i)
-    {
-        path.MoveToPoint(beginPoints[i].m_x, beginPoints[i].m_y);
-        path.AddLineToPoint( endPoints[i].m_x, endPoints[i].m_y );
-    }
-    StrokePath( path );
-}
-
-// create a 'native' matrix corresponding to these values
-wxGraphicsMatrix wxGraphicsContext::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d,
-    wxDouble tx, wxDouble ty) const
-{
-    return GetRenderer()->CreateMatrix(a,b,c,d,tx,ty);
-}
-
-wxGraphicsPath wxGraphicsContext::CreatePath() const
-{
-    return GetRenderer()->CreatePath();
-}
-
-wxGraphicsPen wxGraphicsContext::CreatePen(const wxPen& pen) const
-{
-    return GetRenderer()->CreatePen(pen);
-}
-
-wxGraphicsBrush wxGraphicsContext::CreateBrush(const wxBrush& brush ) const
-{
-    return GetRenderer()->CreateBrush(brush);
-}
-
-wxGraphicsBrush
-wxGraphicsContext::CreateLinearGradientBrush(
-    wxDouble x1, wxDouble y1,
-    wxDouble x2, wxDouble y2,
-    const wxColour& c1, const wxColour& c2) const
-{
-    return GetRenderer()->CreateLinearGradientBrush
-                          (
-                            x1, y1,
-                            x2, y2,
-                            wxGraphicsGradientStops(c1,c2)
-                          );
-}
-
-wxGraphicsBrush
-wxGraphicsContext::CreateLinearGradientBrush(
-    wxDouble x1, wxDouble y1,
-    wxDouble x2, wxDouble y2,
-    const wxGraphicsGradientStops& gradientStops) const
-{
-    return GetRenderer()->CreateLinearGradientBrush(x1,y1,x2,y2, gradientStops);
-}
-
-wxGraphicsBrush
-wxGraphicsContext::CreateRadialGradientBrush(
-        wxDouble xo, wxDouble yo,
-        wxDouble xc, wxDouble yc, wxDouble radius,
-        const wxColour &oColor, const wxColour &cColor) const
-{
-    return GetRenderer()->CreateRadialGradientBrush
-                          (
-                            xo, yo,
-                            xc, yc, radius,
-                            wxGraphicsGradientStops(oColor, cColor)
-                          );
-}
-
-wxGraphicsBrush
-wxGraphicsContext::CreateRadialGradientBrush(
-        wxDouble xo, wxDouble yo,
-        wxDouble xc, wxDouble yc, wxDouble radius,
-        const wxGraphicsGradientStops& gradientStops) const
-{
-    return GetRenderer()->CreateRadialGradientBrush
-                          (
-                            xo, yo,
-                            xc, yc, radius,
-                            gradientStops
-                          );
-}
-
-wxGraphicsFont wxGraphicsContext::CreateFont( const wxFont &font , const wxColour &col ) const
-{
-    return GetRenderer()->CreateFont(font,col);
-}
-
-wxGraphicsFont
-wxGraphicsContext::CreateFont(double size,
-                              const wxString& facename,
-                              int flags,
-                              const wxColour& col) const
-{
-    return GetRenderer()->CreateFont(size, facename, flags, col);
-}
-
-wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const
-{
-    return GetRenderer()->CreateBitmap(bmp);
-}
-
-#if wxUSE_IMAGE
-wxGraphicsBitmap wxGraphicsContext::CreateBitmapFromImage(const wxImage& image) const
-{
-    return GetRenderer()->CreateBitmapFromImage(image);
-}
-#endif // wxUSE_IMAGE
-
-wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h   ) const
-{
-    return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h);
-}
-
-/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc)
-{
-    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
-}
-
-/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc)
-{
-    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
-}
-
-#if wxUSE_PRINTING_ARCHITECTURE
-/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxPrinterDC& dc)
-{
-    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
-}
-#endif
-
-#ifdef __WXMSW__
-#if wxUSE_ENH_METAFILE
-/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxEnhMetaFileDC& dc)
-{
-    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
-}
-#endif
-#endif
-
-wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
-{
-    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeContext(context);
-}
-
-wxGraphicsContext* wxGraphicsContext::CreateFromNativeWindow( void * window )
-{
-    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeWindow(window);
-}
-
-wxGraphicsContext* wxGraphicsContext::Create( wxWindow* window )
-{
-    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(window);
-}
-
-#if wxUSE_IMAGE
-/* static */ wxGraphicsContext* wxGraphicsContext::Create(wxImage& image)
-{
-    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromImage(image);
-}
-#endif // wxUSE_IMAGE
-
-wxGraphicsContext* wxGraphicsContext::Create()
-{
-    return wxGraphicsRenderer::GetDefaultRenderer()->CreateMeasuringContext();
-}
-
-//-----------------------------------------------------------------------------
-// wxGraphicsRenderer
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxGraphicsRenderer, wxObject)
-
-#endif // wxUSE_GRAPHICS_CONTEXT
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/graphcmn.cpp
+// Purpose:     graphics context methods common to all platforms
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     
+// RCS-ID:      $Id: graphcmn.cpp 56801 2008-11-16 23:25:09Z KO $
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#if wxUSE_GRAPHICS_CONTEXT
+
+#include "wx/graphics.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/icon.h"
+    #include "wx/bitmap.h"
+    #include "wx/dcmemory.h"
+    #include "wx/region.h"
+    #include "wx/log.h"
+#endif
+
+#if !defined(wxMAC_USE_CORE_GRAPHICS_BLEND_MODES)
+#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0
+#endif
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+static const double RAD2DEG = 180.0 / M_PI;
+
+//-----------------------------------------------------------------------------
+// Local functions
+//-----------------------------------------------------------------------------
+
+static inline double DegToRad(double deg)
+{
+    return (deg * M_PI) / 180.0;
+}
+
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// wxGraphicsObject
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsObject, wxObject)
+
+wxGraphicsObjectRefData::wxGraphicsObjectRefData( wxGraphicsRenderer* renderer )
+{
+    m_renderer = renderer;
+}
+wxGraphicsObjectRefData::wxGraphicsObjectRefData( const wxGraphicsObjectRefData* data )
+{
+    m_renderer = data->m_renderer;
+}
+wxGraphicsRenderer* wxGraphicsObjectRefData::GetRenderer() const 
+{ 
+    return m_renderer ; 
+}
+
+wxGraphicsObjectRefData* wxGraphicsObjectRefData::Clone() const 
+{
+    return new wxGraphicsObjectRefData(this);
+}
+
+wxGraphicsObject::wxGraphicsObject() 
+{
+}
+
+wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer ) 
+{
+    SetRefData( new wxGraphicsObjectRefData(renderer));
+}
+
+wxGraphicsObject::~wxGraphicsObject() 
+{
+}
+
+bool wxGraphicsObject::IsNull() const 
+{ 
+    return m_refData == NULL; 
+}
+
+wxGraphicsRenderer* wxGraphicsObject::GetRenderer() const 
+{ 
+    return ( IsNull() ? NULL : GetGraphicsData()->GetRenderer() ); 
+}
+
+wxGraphicsObjectRefData* wxGraphicsObject::GetGraphicsData() const 
+{ 
+    return (wxGraphicsObjectRefData*) m_refData; 
+}
+
+wxObjectRefData* wxGraphicsObject::CreateRefData() const
+{
+    wxLogDebug(wxT("A Null Object cannot be changed"));
+    return NULL;
+}
+
+wxObjectRefData* wxGraphicsObject::CloneRefData(const wxObjectRefData* data) const
+{
+    const wxGraphicsObjectRefData* ptr = (const wxGraphicsObjectRefData*) data;
+    return ptr->Clone();
+}
+
+//-----------------------------------------------------------------------------
+// pens etc.
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPen, wxGraphicsObject)
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBrush, wxGraphicsObject)
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsFont, wxGraphicsObject)
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBitmap, wxGraphicsObject)
+
+WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen;
+WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush;
+WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont;
+WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap;
+
+//-----------------------------------------------------------------------------
+// matrix
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsMatrix, wxGraphicsObject)
+WXDLLIMPEXP_DATA_CORE(wxGraphicsMatrix) wxNullGraphicsMatrix;
+
+// concatenates the matrix
+void wxGraphicsMatrix::Concat( const wxGraphicsMatrix *t )
+{
+    AllocExclusive();
+    GetMatrixData()->Concat(t->GetMatrixData());
+}
+
+// sets the matrix to the respective values
+void wxGraphicsMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+                           wxDouble tx, wxDouble ty)
+{
+    AllocExclusive();
+    GetMatrixData()->Set(a,b,c,d,tx,ty);
+}
+
+// gets the component valuess of the matrix
+void wxGraphicsMatrix::Get(wxDouble* a, wxDouble* b,  wxDouble* c,
+                           wxDouble* d, wxDouble* tx, wxDouble* ty) const
+{
+    GetMatrixData()->Get(a, b, c, d, tx, ty);
+}
+
+// makes this the inverse matrix
+void wxGraphicsMatrix::Invert()
+{
+    AllocExclusive();
+    GetMatrixData()->Invert();
+}
+
+// returns true if the elements of the transformation matrix are equal ?
+bool wxGraphicsMatrix::IsEqual( const wxGraphicsMatrix* t) const
+{
+    return GetMatrixData()->IsEqual(t->GetMatrixData());
+}
+
+// return true if this is the identity matrix
+bool wxGraphicsMatrix::IsIdentity() const
+{
+    return GetMatrixData()->IsIdentity();
+}
+
+// add the translation to this matrix
+void wxGraphicsMatrix::Translate( wxDouble dx , wxDouble dy )
+{
+    AllocExclusive();
+    GetMatrixData()->Translate(dx,dy);
+}
+
+// add the scale to this matrix
+void wxGraphicsMatrix::Scale( wxDouble xScale , wxDouble yScale )
+{
+    AllocExclusive();
+    GetMatrixData()->Scale(xScale,yScale);
+}
+
+// add the rotation to this matrix (radians)
+void wxGraphicsMatrix::Rotate( wxDouble angle )
+{
+    AllocExclusive();
+    GetMatrixData()->Rotate(angle);
+}  
+
+//
+// apply the transforms
+//
+
+// applies that matrix to the point
+void wxGraphicsMatrix::TransformPoint( wxDouble *x, wxDouble *y ) const
+{
+    GetMatrixData()->TransformPoint(x,y);
+}
+
+// applies the matrix except for translations
+void wxGraphicsMatrix::TransformDistance( wxDouble *dx, wxDouble *dy ) const
+{
+    GetMatrixData()->TransformDistance(dx,dy);
+}
+
+// returns the native representation
+void * wxGraphicsMatrix::GetNativeMatrix() const
+{
+    return GetMatrixData()->GetNativeMatrix();
+}
+
+//-----------------------------------------------------------------------------
+// path
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPath, wxGraphicsObject)
+WXDLLIMPEXP_DATA_CORE(wxGraphicsPath) wxNullGraphicsPath;
+
+// convenience functions, for using wxPoint2DDouble etc
+
+wxPoint2DDouble wxGraphicsPath::GetCurrentPoint() const
+{
+    wxDouble x,y;
+    GetCurrentPoint(&x,&y);
+    return wxPoint2DDouble(x,y);
+}
+
+void wxGraphicsPath::MoveToPoint( const wxPoint2DDouble& p)
+{
+    MoveToPoint( p.m_x , p.m_y);
+}
+
+void wxGraphicsPath::AddLineToPoint( const wxPoint2DDouble& p)
+{
+    AddLineToPoint( p.m_x , p.m_y);
+}
+
+void wxGraphicsPath::AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e)
+{
+    AddCurveToPoint(c1.m_x, c1.m_y, c2.m_x, c2.m_y, e.m_x, e.m_y);
+}
+
+void wxGraphicsPath::AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise)
+{
+    AddArc(c.m_x, c.m_y, r, startAngle, endAngle, clockwise);
+}
+
+wxRect2DDouble wxGraphicsPath::GetBox() const
+{
+	wxDouble x,y,w,h;
+	GetBox(&x,&y,&w,&h);
+	return wxRect2DDouble( x,y,w,h );
+}
+
+bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, int fillStyle ) const
+{
+    return Contains( c.m_x, c.m_y, fillStyle);
+}
+
+// true redirections
+
+// begins a new subpath at (x,y)
+void wxGraphicsPath::MoveToPoint( wxDouble x, wxDouble y )
+{
+    AllocExclusive();
+    GetPathData()->MoveToPoint(x,y);
+}
+
+// adds a straight line from the current point to (x,y) 
+void wxGraphicsPath::AddLineToPoint( wxDouble x, wxDouble y )
+{
+    AllocExclusive();
+    GetPathData()->AddLineToPoint(x,y);
+}
+
+// adds a cubic Bezier curve from the current point, using two control points and an end point
+void wxGraphicsPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
+{
+    AllocExclusive();
+    GetPathData()->AddCurveToPoint(cx1,cy1,cx2,cy2,x,y);
+}
+
+// adds another path
+void wxGraphicsPath::AddPath( const wxGraphicsPath& path )
+{
+    AllocExclusive();
+    GetPathData()->AddPath(path.GetPathData());
+}
+
+// closes the current sub-path
+void wxGraphicsPath::CloseSubpath()
+{
+    AllocExclusive();
+    GetPathData()->CloseSubpath();
+}
+
+// gets the last point of the current path, (0,0) if not yet set
+void wxGraphicsPath::GetCurrentPoint( wxDouble* x, wxDouble* y) const
+{
+    GetPathData()->GetCurrentPoint(x,y);
+}
+
+// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
+void wxGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise )
+{
+    AllocExclusive();
+    GetPathData()->AddArc(x,y,r,startAngle,endAngle,clockwise);
+}
+
+//
+// These are convenience functions which - if not available natively will be assembled 
+// using the primitives from above
+//
+
+// adds a quadratic Bezier curve from the current point, using a control point and an end point
+void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y )
+{
+    AllocExclusive();
+    GetPathData()->AddQuadCurveToPoint(cx,cy,x,y);
+}
+
+// appends a rectangle as a new closed subpath 
+void wxGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
+    AllocExclusive();
+    GetPathData()->AddRectangle(x,y,w,h);
+}
+
+// appends an ellipsis as a new closed subpath fitting the passed rectangle
+void wxGraphicsPath::AddCircle( wxDouble x, wxDouble y, wxDouble r )
+{
+    AllocExclusive();
+    GetPathData()->AddCircle(x,y,r);
+}
+
+// appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
+void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) 
+{
+    GetPathData()->AddArcToPoint(x1,y1,x2,y2,r);
+}
+
+// appends an ellipse
+void wxGraphicsPath::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
+{
+    AllocExclusive();
+    GetPathData()->AddEllipse(x,y,w,h);
+}
+
+// appends a rounded rectangle
+void wxGraphicsPath::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
+{
+    AllocExclusive();
+    GetPathData()->AddRoundedRectangle(x,y,w,h,radius);
+}
+
+// returns the native path
+void * wxGraphicsPath::GetNativePath() const
+{
+    return GetPathData()->GetNativePath();
+}
+
+// give the native path returned by GetNativePath() back (there might be some deallocations necessary)
+void wxGraphicsPath::UnGetNativePath(void *p)const
+{
+    GetPathData()->UnGetNativePath(p);
+}
+
+// transforms each point of this path by the matrix
+void wxGraphicsPath::Transform( const wxGraphicsMatrix& matrix )
+{
+    AllocExclusive();
+    GetPathData()->Transform(matrix.GetMatrixData());
+}
+
+// gets the bounding box enclosing all points (possibly including control points)
+void wxGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const
+{
+    GetPathData()->GetBox(x,y,w,h);
+}
+
+bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, int fillStyle ) const
+{
+    return GetPathData()->Contains(x,y,fillStyle);
+}
+
+//
+// Emulations, these mus be implemented in the ...Data classes in order to allow for proper overrides
+//
+
+void wxGraphicsPathData::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y )
+{
+    // calculate using degree elevation to a cubic bezier
+    wxPoint2DDouble c1;
+    wxPoint2DDouble c2;
+
+    wxPoint2DDouble start;
+    GetCurrentPoint(&start.m_x,&start.m_y);
+    wxPoint2DDouble end(x,y);
+    wxPoint2DDouble c(cx,cy);
+    c1 = wxDouble(1/3.0) * start + wxDouble(2/3.0) * c;
+    c2 = wxDouble(2/3.0) * c + wxDouble(1/3.0) * end;
+    AddCurveToPoint(c1.m_x,c1.m_y,c2.m_x,c2.m_y,x,y);
+}
+
+void wxGraphicsPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
+    MoveToPoint(x,y);
+    AddLineToPoint(x,y+h);
+    AddLineToPoint(x+w,y+h);
+    AddLineToPoint(x+w,y);
+    CloseSubpath();
+}
+
+void wxGraphicsPathData::AddCircle( wxDouble x, wxDouble y, wxDouble r )
+{
+    MoveToPoint(x+r,y);
+    AddArc( x,y,r,0,2*M_PI,false);
+    CloseSubpath();
+}
+
+void wxGraphicsPathData::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
+{
+    wxDouble rw = w/2;
+    wxDouble rh = h/2;
+    wxDouble xc = x + rw;
+    wxDouble yc = y + rh;
+    wxGraphicsMatrix m = GetRenderer()->CreateMatrix();
+    m.Translate(xc,yc);
+    m.Scale(rw/rh,1.0);
+    wxGraphicsPath p = GetRenderer()->CreatePath();
+    p.AddCircle(0,0,rh);
+    p.Transform(m);
+    AddPath(p.GetPathData());
+}
+
+void wxGraphicsPathData::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
+{
+    if ( radius == 0 )
+        AddRectangle(x,y,w,h);
+    else
+    {
+        MoveToPoint( x + w, y + h / 2);
+        AddArcToPoint(x + w, y + h, x + w / 2, y + h, radius);
+        AddArcToPoint(x, y + h, x, y + h / 2, radius);
+        AddArcToPoint(x, y , x + w / 2, y, radius);
+        AddArcToPoint(x + w, y, x + w, y + h / 2, radius);
+        CloseSubpath();
+    }
+}
+
+// draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
+void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
+{   
+    wxPoint2DDouble current;
+    GetCurrentPoint(&current.m_x,&current.m_y);
+    wxPoint2DDouble p1(x1,y1);
+    wxPoint2DDouble p2(x2,y2);
+
+    wxPoint2DDouble v1 = current - p1;
+    v1.Normalize();
+    wxPoint2DDouble v2 = p2 - p1;
+    v2.Normalize();
+
+    wxDouble alpha = v1.GetVectorAngle() - v2.GetVectorAngle();
+
+    if ( alpha < 0 )
+        alpha = 360 + alpha;
+    // TODO obtuse angles
+
+    alpha = DegToRad(alpha);
+
+    wxDouble dist = r / sin(alpha/2) * cos(alpha/2);
+    // calculate tangential points
+    wxPoint2DDouble t1 = dist*v1 + p1;
+    wxPoint2DDouble t2 = dist*v2 + p1;
+
+    wxPoint2DDouble nv1 = v1;
+    nv1.SetVectorAngle(v1.GetVectorAngle()-90);
+    wxPoint2DDouble c = t1 + r*nv1;
+
+    wxDouble a1 = v1.GetVectorAngle()+90;
+    wxDouble a2 = v2.GetVectorAngle()-90;
+
+    AddLineToPoint(t1.m_x,t1.m_y);
+    AddArc(c.m_x,c.m_y,r,DegToRad(a1),DegToRad(a2),true);
+    AddLineToPoint(p2.m_x,p2.m_y);
+}
+
+//-----------------------------------------------------------------------------
+// wxGraphicsContext Convenience Methods
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
+
+
+wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) 
+{
+    m_logicalFunction = wxCOPY;
+}
+
+wxGraphicsContext::~wxGraphicsContext() 
+{
+}
+
+// sets the pen
+void wxGraphicsContext::SetPen( const wxGraphicsPen& pen ) 
+{
+    m_pen = pen;
+}
+
+void wxGraphicsContext::SetPen( const wxPen& pen )
+{
+    if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
+        SetPen( wxNullGraphicsPen );
+    else
+        SetPen( CreatePen( pen ) );
+}
+    
+// sets the brush for filling
+void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush ) 
+{
+    m_brush = brush;
+}
+
+void wxGraphicsContext::SetBrush( const wxBrush& brush )
+{
+    if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
+        SetBrush( wxNullGraphicsBrush );
+    else
+        SetBrush( CreateBrush( brush ) );
+}
+
+// sets the brush for filling
+void wxGraphicsContext::SetFont( const wxGraphicsFont& font ) 
+{
+    m_font = font;
+}
+
+bool wxGraphicsContext::SetLogicalFunction( int function )
+{
+    if ( function == wxCOPY )
+    {
+        m_logicalFunction = function;
+        return true;
+    }
+    return false;
+}
+
+void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
+{
+    if ( font.Ok() )
+        SetFont( CreateFont( font, colour ) );
+    else
+        SetFont( wxNullGraphicsFont );
+}
+
+void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, int fillStyle )
+{
+    FillPath( path , fillStyle );
+    StrokePath( path );
+}
+
+void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle )
+{
+    Translate(x,y);
+    Rotate( -angle );
+    DrawText( str , 0, 0 );
+    Rotate( angle );
+    Translate(-x,-y);
+}
+
+void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush ) 
+{
+    wxGraphicsBrush formerBrush = m_brush;
+	wxGraphicsPen formerPen = m_pen;
+    wxDouble width;
+    wxDouble height;
+    wxDouble descent;
+    wxDouble externalLeading;
+    GetTextExtent( str , &width, &height, &descent, &externalLeading );
+    SetBrush( backgroundBrush );
+	// to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
+	SetPen( wxNullGraphicsPen );
+
+    wxGraphicsPath path = CreatePath();
+    path.AddRectangle( x , y, width, height );
+    FillPath( path );
+
+    DrawText( str, x ,y);
+    SetBrush( formerBrush );
+	SetPen( formerPen );
+}
+
+void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush )
+{
+    wxGraphicsBrush formerBrush = m_brush;
+	wxGraphicsPen formerPen = m_pen;
+
+    wxDouble width;
+    wxDouble height;
+    wxDouble descent;
+    wxDouble externalLeading;
+    GetTextExtent( str , &width, &height, &descent, &externalLeading );
+    SetBrush( backgroundBrush );
+	// to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
+	SetPen( wxNullGraphicsPen );
+
+    wxGraphicsPath path = CreatePath();
+    path.MoveToPoint( x , y );
+    path.AddLineToPoint( (int) (x + sin(angle) * height) , (int) (y + cos(angle) * height) );
+    path.AddLineToPoint(
+        (int) (x + sin(angle) * height + cos(angle) * width) ,
+        (int) (y + cos(angle) * height - sin(angle) * width));
+    path.AddLineToPoint((int) (x + cos(angle) * width) , (int) (y - sin(angle) * width) );
+    FillPath( path );
+    DrawText( str, x ,y, angle);
+    SetBrush( formerBrush );
+	SetPen( formerPen );
+}
+
+void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)
+{
+    wxGraphicsPath path = CreatePath();
+    path.MoveToPoint(x1, y1);
+    path.AddLineToPoint( x2, y2 );
+    StrokePath( path );
+}
+
+void wxGraphicsContext::DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
+{
+    wxGraphicsPath path = CreatePath();
+    path.AddRectangle( x , y , w , h );
+    DrawPath( path );
+}
+
+void wxGraphicsContext::DrawEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
+{
+    wxGraphicsPath path = CreatePath();
+    path.AddEllipse(x,y,w,h);
+    DrawPath(path);
+}
+
+void wxGraphicsContext::DrawRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius)
+{
+    wxGraphicsPath path = CreatePath();
+    path.AddRoundedRectangle(x,y,w,h,radius);
+    DrawPath(path);
+}
+
+void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
+{
+    wxASSERT(n > 1);
+    wxGraphicsPath path = CreatePath();
+    path.MoveToPoint(points[0].m_x, points[0].m_y);
+    for ( size_t i = 1; i < n; ++i)
+        path.AddLineToPoint( points[i].m_x, points[i].m_y );
+    StrokePath( path );
+}
+
+void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle)
+{
+    wxASSERT(n > 1);
+    wxGraphicsPath path = CreatePath();
+    path.MoveToPoint(points[0].m_x, points[0].m_y);
+    for ( size_t i = 1; i < n; ++i)
+        path.AddLineToPoint( points[i].m_x, points[i].m_y );
+    DrawPath( path , fillStyle);
+}
+
+void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints)
+{
+    wxASSERT(n > 0);
+    wxGraphicsPath path = CreatePath();
+    for ( size_t i = 0; i < n; ++i)
+    {
+        path.MoveToPoint(beginPoints[i].m_x, beginPoints[i].m_y);
+        path.AddLineToPoint( endPoints[i].m_x, endPoints[i].m_y );
+    }
+    StrokePath( path );
+}
+
+// create a 'native' matrix corresponding to these values
+wxGraphicsMatrix wxGraphicsContext::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+    wxDouble tx, wxDouble ty) const
+{
+    return GetRenderer()->CreateMatrix(a,b,c,d,tx,ty);
+}
+
+wxGraphicsPath wxGraphicsContext::CreatePath() const
+{
+    return GetRenderer()->CreatePath();
+}
+
+wxGraphicsPen wxGraphicsContext::CreatePen(const wxPen& pen) const
+{
+    return GetRenderer()->CreatePen(pen);
+}
+
+wxGraphicsBrush wxGraphicsContext::CreateBrush(const wxBrush& brush ) const
+{
+    return GetRenderer()->CreateBrush(brush);
+}
+
+// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+wxGraphicsBrush wxGraphicsContext::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+                                                   const wxColour&c1, const wxColour&c2) const
+{
+    return GetRenderer()->CreateLinearGradientBrush(x1,y1,x2,y2,c1,c2);
+}
+
+// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) 
+// with radius r and color cColor
+wxGraphicsBrush wxGraphicsContext::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+                                                   const wxColour &oColor, const wxColour &cColor) const
+{
+    return GetRenderer()->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
+}
+
+// sets the font
+wxGraphicsFont wxGraphicsContext::CreateFont( const wxFont &font , const wxColour &col ) const
+{
+    return GetRenderer()->CreateFont(font,col);
+}
+
+wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const
+{
+    return GetRenderer()->CreateBitmap(bmp);
+}
+
+wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc) 
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
+}
+#ifdef __WXMSW__
+wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc) 
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
+}
+#endif
+
+wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeContext(context);
+}
+
+wxGraphicsContext* wxGraphicsContext::CreateFromNativeWindow( void * window )
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeWindow(window);
+}
+
+wxGraphicsContext* wxGraphicsContext::Create( wxWindow* window )
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(window);
+}
+
+wxGraphicsContext* wxGraphicsContext::Create()
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateMeasuringContext();
+}
+
+//-----------------------------------------------------------------------------
+// wxGraphicsRenderer
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxGraphicsRenderer, wxObject)
+
+#endif // wxUSE_GRAPHICS_CONTEXT
diff --git a/Source/3rd Party/wx/src/common/hash.cpp b/Source/3rd Party/wx/src/common/hash.cpp
index 27ce2061f..9969bb188 100644
--- a/Source/3rd Party/wx/src/common/hash.cpp	
+++ b/Source/3rd Party/wx/src/common/hash.cpp	
@@ -1,383 +1,1077 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/hash.cpp
-// Purpose:     wxHashTable implementation
-// Author:      Julian Smart
-// Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/hash.h"
-    #include "wx/object.h"
-#endif
-
-wxHashTableBase_Node::wxHashTableBase_Node( long key, void* value,
-                                            wxHashTableBase* table )
-    : m_value( value ), m_hashPtr( table )
-{
-    m_key.integer = key;
-}
-
-wxHashTableBase_Node::wxHashTableBase_Node( const wxString& key, void* value,
-                                            wxHashTableBase* table )
-    : m_value( value ), m_hashPtr( table )
-{
-    m_key.string = new wxString(key);
-}
-
-wxHashTableBase_Node::~wxHashTableBase_Node()
-{
-    if( m_hashPtr ) m_hashPtr->DoRemoveNode( this );
-}
-
-//
-
-wxHashTableBase::wxHashTableBase()
-    : m_size( 0 ), m_count( 0 ), m_table( NULL ), m_keyType( wxKEY_NONE ),
-      m_deleteContents( false )
-{
-}
-
-void wxHashTableBase::Create( wxKeyType keyType, size_t size )
-{
-    m_keyType = keyType;
-    m_size = size;
-    m_table = new wxHashTableBase_Node*[ m_size ];
-
-    for( size_t i = 0; i < m_size; ++i )
-        m_table[i] = NULL;
-}
-
-void wxHashTableBase::Clear()
-{
-    for( size_t i = 0; i < m_size; ++i )
-    {
-        Node* end = m_table[i];
-
-        if( end == NULL )
-            continue;
-
-        Node *curr, *next = end->GetNext();
-
-        do
-        {
-            curr = next;
-            next = curr->GetNext();
-
-            DoDestroyNode( curr );
-
-            delete curr;
-        }
-        while( curr != end );
-
-        m_table[i] = NULL;
-    }
-
-    m_count = 0;
-}
-
-void wxHashTableBase::DoRemoveNode( wxHashTableBase_Node* node )
-{
-    size_t bucket = ( m_keyType == wxKEY_INTEGER ?
-                      node->m_key.integer        :
-                      MakeKey( *node->m_key.string ) ) % m_size;
-
-    if( node->GetNext() == node )
-    {
-        // single-node chain (common case)
-        m_table[bucket] = NULL;
-    }
-    else
-    {
-        Node *start = m_table[bucket], *curr;
-        Node* prev = start;
-
-        for( curr = prev->GetNext(); curr != node;
-             prev = curr, curr = curr->GetNext() ) ;
-
-        DoUnlinkNode( bucket, node, prev );
-    }
-
-    DoDestroyNode( node );
-}
-
-void wxHashTableBase::DoDestroyNode( wxHashTableBase_Node* node )
-{
-    // if it is called from DoRemoveNode, node has already been
-    // removed, from other places it does not matter
-    node->m_hashPtr = NULL;
-
-    if( m_keyType == wxKEY_STRING )
-        delete node->m_key.string;
-    if( m_deleteContents )
-        DoDeleteContents( node );
-}
-
-void wxHashTableBase::Destroy()
-{
-    Clear();
-
-    wxDELETEA(m_table);
-    m_size = 0;
-}
-
-void wxHashTableBase::DoInsertNode( size_t bucket, wxHashTableBase_Node* node )
-{
-    if( m_table[bucket] == NULL )
-    {
-        m_table[bucket] = node->m_next = node;
-    }
-    else
-    {
-        Node *prev = m_table[bucket];
-        Node *next = prev->m_next;
-
-        prev->m_next = node;
-        node->m_next = next;
-        m_table[bucket] = node;
-    }
-
-    ++m_count;
-}
-
-void wxHashTableBase::DoPut( long key, long hash, void* data )
-{
-    wxASSERT( m_keyType == wxKEY_INTEGER );
-
-    size_t bucket = size_t(hash) % m_size;
-    Node* node = new wxHashTableBase_Node( key, data, this );
-
-    DoInsertNode( bucket, node );
-}
-
-void wxHashTableBase::DoPut( const wxString& key, long hash, void* data )
-{
-    wxASSERT( m_keyType == wxKEY_STRING );
-
-    size_t bucket = size_t(hash) % m_size;
-    Node* node = new wxHashTableBase_Node( key, data, this );
-
-    DoInsertNode( bucket, node );
-}
-
-void* wxHashTableBase::DoGet( long key, long hash ) const
-{
-    wxASSERT( m_keyType == wxKEY_INTEGER );
-
-    size_t bucket = size_t(hash) % m_size;
-
-    if( m_table[bucket] == NULL )
-        return NULL;
-
-    Node *first = m_table[bucket]->GetNext(),
-         *curr = first;
-
-    do
-    {
-        if( curr->m_key.integer == key )
-            return curr->m_value;
-
-        curr = curr->GetNext();
-    }
-    while( curr != first );
-
-    return NULL;
-}
-
-void* wxHashTableBase::DoGet( const wxString& key, long hash ) const
-{
-    wxASSERT( m_keyType == wxKEY_STRING );
-
-    size_t bucket = size_t(hash) % m_size;
-
-    if( m_table[bucket] == NULL )
-        return NULL;
-
-    Node *first = m_table[bucket]->GetNext(),
-         *curr = first;
-
-    do
-    {
-        if( *curr->m_key.string == key )
-            return curr->m_value;
-
-        curr = curr->GetNext();
-    }
-    while( curr != first );
-
-    return NULL;
-}
-
-void wxHashTableBase::DoUnlinkNode( size_t bucket, wxHashTableBase_Node* node,
-                                    wxHashTableBase_Node* prev )
-{
-    if( node == m_table[bucket] )
-        m_table[bucket] = prev;
-
-    if( prev == node && prev == node->GetNext() )
-        m_table[bucket] = NULL;
-    else
-        prev->m_next = node->m_next;
-
-    DoDestroyNode( node );
-    --m_count;
-}
-
-void* wxHashTableBase::DoDelete( long key, long hash )
-{
-    wxASSERT( m_keyType == wxKEY_INTEGER );
-
-    size_t bucket = size_t(hash) % m_size;
-
-    if( m_table[bucket] == NULL )
-        return NULL;
-
-    Node *first = m_table[bucket]->GetNext(),
-         *curr = first,
-         *prev = m_table[bucket];
-
-    do
-    {
-        if( curr->m_key.integer == key )
-        {
-            void* retval = curr->m_value;
-            curr->m_value = NULL;
-
-            DoUnlinkNode( bucket, curr, prev );
-            delete curr;
-
-            return retval;
-        }
-
-        prev = curr;
-        curr = curr->GetNext();
-    }
-    while( curr != first );
-
-    return NULL;
-}
-
-void* wxHashTableBase::DoDelete( const wxString& key, long hash )
-{
-    wxASSERT( m_keyType == wxKEY_STRING );
-
-    size_t bucket = size_t(hash) % m_size;
-
-    if( m_table[bucket] == NULL )
-        return NULL;
-
-    Node *first = m_table[bucket]->GetNext(),
-         *curr = first,
-         *prev = m_table[bucket];
-
-    do
-    {
-        if( *curr->m_key.string == key )
-        {
-            void* retval = curr->m_value;
-            curr->m_value = NULL;
-
-            DoUnlinkNode( bucket, curr, prev );
-            delete curr;
-
-            return retval;
-        }
-
-        prev = curr;
-        curr = curr->GetNext();
-    }
-    while( curr != first );
-
-    return NULL;
-}
-
-long wxHashTableBase::MakeKey( const wxString& str )
-{
-    long int_key = 0;
-
-    const wxStringCharType *p = str.wx_str();
-    while( *p )
-        int_key += *p++;
-
-    return int_key;
-}
-
-// ----------------------------------------------------------------------------
-// wxHashTable
-// ----------------------------------------------------------------------------
-
-wxHashTable::wxHashTable( const wxHashTable& table )
-           : wxHashTableBase()
-{
-    DoCopy( table );
-}
-
-const wxHashTable& wxHashTable::operator=( const wxHashTable& table )
-{
-    Destroy();
-    DoCopy( table );
-
-    return *this;
-}
-
-void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) )
-{
-    Create( m_keyType, m_size );
-
-    wxFAIL;
-}
-
-void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )
-{
-    delete ((wxHashTable_Node*)node)->GetData();
-}
-
-void wxHashTable::GetNextNode( size_t bucketStart )
-{
-    for( size_t i = bucketStart; i < m_size; ++i )
-    {
-        if( m_table[i] != NULL )
-        {
-            m_curr = ((Node*)m_table[i])->GetNext();
-            m_currBucket = i;
-            return;
-        }
-    }
-
-    m_curr = NULL;
-    m_currBucket = 0;
-}
-
-wxHashTable::Node* wxHashTable::Next()
-{
-    if( m_curr == NULL )
-        GetNextNode( 0 );
-    else
-    {
-        m_curr = m_curr->GetNext();
-
-        if( m_curr == ( (Node*)m_table[m_currBucket] )->GetNext() )
-            GetNextNode( m_currBucket + 1 );
-    }
-
-    return m_curr;
-}
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/hash.cpp
+// Purpose:     wxHashTable implementation
+// Author:      Julian Smart
+// Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH()
+// Created:     01/02/97
+// RCS-ID:      $Id: hash.cpp 49529 2007-10-30 00:32:18Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/hash.h"
+#endif
+
+#if wxUSE_OLD_HASH_TABLE
+
+#include <string.h>
+#include <stdarg.h>
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxHashTablleBase for working with "void *" data
+// ----------------------------------------------------------------------------
+
+wxHashTableBase::wxHashTableBase()
+{
+    m_deleteContents = false;
+    m_hashTable = (wxListBase **)NULL;
+    m_hashSize = 0;
+    m_count = 0;
+    m_keyType = wxKEY_NONE;
+}
+
+void wxHashTableBase::Create(wxKeyType keyType, size_t size)
+{
+    Destroy();
+
+    m_hashSize = size;
+    m_keyType = keyType;
+    m_hashTable = new wxListBase *[size];
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        m_hashTable[n] = (wxListBase *) NULL;
+    }
+}
+
+void wxHashTableBase::Destroy()
+{
+    if ( m_hashTable )
+    {
+        for ( size_t n = 0; n < m_hashSize; n++ )
+        {
+            delete m_hashTable[n];
+        }
+
+        delete [] m_hashTable;
+
+        m_hashTable = (wxListBase **)NULL;
+
+        m_count = 0;
+    }
+}
+
+void wxHashTableBase::DeleteContents(bool flag)
+{
+    m_deleteContents = flag;
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        if ( m_hashTable[n] )
+        {
+            m_hashTable[n]->DeleteContents(flag);
+        }
+    }
+}
+
+wxNodeBase *wxHashTableBase::GetNode(long key, long value) const
+{
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
+
+    wxNodeBase *node;
+    if ( m_hashTable[slot] )
+    {
+        node = m_hashTable[slot]->Find(wxListKey(value));
+    }
+    else
+    {
+        node = (wxNodeBase *)NULL;
+    }
+
+    return node;
+}
+
+#if WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// wxHashTableLong
+// ----------------------------------------------------------------------------
+
+wxHashTableLong::~wxHashTableLong()
+{
+    Destroy();
+}
+
+void wxHashTableLong::Init(size_t size)
+{
+    m_hashSize = size;
+    m_values = new wxArrayLong *[size];
+    m_keys = new wxArrayLong *[size];
+
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        m_values[n] =
+        m_keys[n] = (wxArrayLong *)NULL;
+    }
+
+    m_count = 0;
+}
+
+void wxHashTableLong::Create(size_t size)
+{
+    Init(size);
+}
+
+void wxHashTableLong::Destroy()
+{
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        delete m_values[n];
+        delete m_keys[n];
+    }
+
+    delete [] m_values;
+    delete [] m_keys;
+    m_hashSize = 0;
+    m_count = 0;
+}
+
+void wxHashTableLong::Put(long key, long value)
+{
+    wxCHECK_RET( m_hashSize, _T("must call Create() first") );
+
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
+
+    if ( !m_keys[slot] )
+    {
+        m_keys[slot] = new wxArrayLong;
+        m_values[slot] = new wxArrayLong;
+    }
+
+    m_keys[slot]->Add(key);
+    m_values[slot]->Add(value);
+
+    m_count++;
+}
+
+long wxHashTableLong::Get(long key) const
+{
+    wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
+
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
+
+    wxArrayLong *keys = m_keys[slot];
+    if ( keys )
+    {
+        size_t count = keys->GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            if ( keys->Item(n) == key )
+            {
+                return m_values[slot]->Item(n);
+            }
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+long wxHashTableLong::Delete(long key)
+{
+    wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
+
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
+
+    wxArrayLong *keys = m_keys[slot];
+    if ( keys )
+    {
+        size_t count = keys->GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            if ( keys->Item(n) == key )
+            {
+                long val = m_values[slot]->Item(n);
+
+                keys->RemoveAt(n);
+                m_values[slot]->RemoveAt(n);
+
+                m_count--;
+
+                return val;
+            }
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+// ----------------------------------------------------------------------------
+// wxStringHashTable: more efficient than storing strings in a list
+// ----------------------------------------------------------------------------
+
+wxStringHashTable::wxStringHashTable(size_t sizeTable)
+{
+    m_keys = new wxArrayLong *[sizeTable];
+    m_values = new wxArrayString *[sizeTable];
+
+    m_hashSize = sizeTable;
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        m_values[n] = (wxArrayString *)NULL;
+        m_keys[n] = (wxArrayLong *)NULL;
+    }
+}
+
+wxStringHashTable::~wxStringHashTable()
+{
+    Destroy();
+}
+
+void wxStringHashTable::Destroy()
+{
+    for ( size_t n = 0; n < m_hashSize; n++ )
+    {
+        delete m_values[n];
+        delete m_keys[n];
+    }
+
+    delete [] m_values;
+    delete [] m_keys;
+    m_hashSize = 0;
+}
+
+void wxStringHashTable::Put(long key, const wxString& value)
+{
+    wxCHECK_RET( m_hashSize, _T("must call Create() first") );
+
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
+
+    if ( !m_keys[slot] )
+    {
+        m_keys[slot] = new wxArrayLong;
+        m_values[slot] = new wxArrayString;
+    }
+
+    m_keys[slot]->Add(key);
+    m_values[slot]->Add(value);
+}
+
+wxString wxStringHashTable::Get(long key, bool *wasFound) const
+{
+    wxCHECK_MSG( m_hashSize, wxEmptyString, _T("must call Create() first") );
+
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
+
+    wxArrayLong *keys = m_keys[slot];
+    if ( keys )
+    {
+        size_t count = keys->GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            if ( keys->Item(n) == key )
+            {
+                if ( wasFound )
+                    *wasFound = true;
+
+                return m_values[slot]->Item(n);
+            }
+        }
+    }
+
+    if ( wasFound )
+        *wasFound = false;
+
+    return wxEmptyString;
+}
+
+bool wxStringHashTable::Delete(long key) const
+{
+    wxCHECK_MSG( m_hashSize, false, _T("must call Create() first") );
+
+    size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
+
+    wxArrayLong *keys = m_keys[slot];
+    if ( keys )
+    {
+        size_t count = keys->GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            if ( keys->Item(n) == key )
+            {
+                keys->RemoveAt(n);
+                m_values[slot]->RemoveAt(n);
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// old not type safe wxHashTable
+// ----------------------------------------------------------------------------
+
+wxHashTable::wxHashTable (int the_key_type, int size)
+{
+  n = 0;
+  hash_table = (wxList**) NULL;
+  Create(the_key_type, size);
+  m_count = 0;
+  m_deleteContents = false;
+/*
+  n = size;
+  current_position = -1;
+  current_node = (wxNode *) NULL;
+
+  key_type = the_key_type;
+  hash_table = new wxList *[size];
+  int i;
+  for (i = 0; i < size; i++)
+    hash_table[i] = (wxList *) NULL;
+*/
+}
+
+wxHashTable::~wxHashTable ()
+{
+  Destroy();
+}
+
+void wxHashTable::Destroy()
+{
+  if (!hash_table) return;
+  int i;
+  for (i = 0; i < n; i++)
+    if (hash_table[i])
+      delete hash_table[i];
+  delete[] hash_table;
+  hash_table = NULL;
+}
+
+bool wxHashTable::Create(int the_key_type, int size)
+{
+  Destroy();
+
+  n = size;
+  current_position = -1;
+  current_node = (wxNode *) NULL;
+
+  key_type = the_key_type;
+  hash_table = new wxList *[size];
+  int i;
+  for (i = 0; i < size; i++)
+    hash_table[i] = (wxList *) NULL;
+  return true;
+}
+
+
+void wxHashTable::DoCopy(const wxHashTable& table)
+{
+  n = table.n;
+  m_count = table.m_count;
+  current_position = table.current_position;
+  current_node = NULL; // doesn't matter - Next() will reconstruct it
+  key_type = table.key_type;
+
+  hash_table = new wxList *[n];
+  for (int i = 0; i < n; i++) {
+    if (table.hash_table[i] == NULL)
+      hash_table[i] = NULL;
+    else {
+      hash_table[i] = new wxList(key_type);
+      *hash_table[i] = *(table.hash_table[i]);
+    }
+  }
+}
+
+void wxHashTable::Put (long key, long value, wxObject * object)
+{
+  // Should NEVER be
+  long k = (long) key;
+
+  int position = (int) (k % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+  {
+    hash_table[position] = new wxList (wxKEY_INTEGER);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);
+  }
+
+  hash_table[position]->Append (value, object);
+  m_count++;
+}
+
+void wxHashTable::Put (long key, const wxChar *value, wxObject * object)
+{
+  // Should NEVER be
+  long k = (long) key;
+
+  int position = (int) (k % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+  {
+    hash_table[position] = new wxList (wxKEY_STRING);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);
+  }
+
+  hash_table[position]->Append (value, object);
+  m_count++;
+}
+
+void wxHashTable::Put (long key, wxObject * object)
+{
+  // Should NEVER be
+  long k = (long) key;
+
+  int position = (int) (k % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+  {
+    hash_table[position] = new wxList (wxKEY_INTEGER);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);
+  }
+
+  hash_table[position]->Append (k, object);
+  m_count++;
+}
+
+void wxHashTable::Put (const wxChar *key, wxObject * object)
+{
+  int position = (int) (MakeKey (key) % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+  {
+    hash_table[position] = new wxList (wxKEY_STRING);
+    if (m_deleteContents) hash_table[position]->DeleteContents(true);
+  }
+
+  hash_table[position]->Append (key, object);
+  m_count++;
+}
+
+wxObject *wxHashTable::Get (long key, long value) const
+{
+  // Should NEVER be
+  long k = (long) key;
+
+  int position = (int) (k % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+    return (wxObject *) NULL;
+  else
+    {
+      wxNode *node = hash_table[position]->Find (value);
+      if (node)
+        return node->GetData ();
+      else
+        return (wxObject *) NULL;
+    }
+}
+
+wxObject *wxHashTable::Get (long key, const wxChar *value) const
+{
+  // Should NEVER be
+  long k = (long) key;
+
+  int position = (int) (k % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+    return (wxObject *) NULL;
+  else
+    {
+      wxNode *node = hash_table[position]->Find (value);
+      if (node)
+        return node->GetData ();
+      else
+        return (wxObject *) NULL;
+    }
+}
+
+wxObject *wxHashTable::Get (long key) const
+{
+  // Should NEVER be
+  long k = (long) key;
+
+  int position = (int) (k % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+    return (wxObject *) NULL;
+  else
+    {
+      wxNode *node = hash_table[position]->Find (k);
+      return node ? node->GetData () : (wxObject*)NULL;
+    }
+}
+
+wxObject *wxHashTable::Get (const wxChar *key) const
+{
+  int position = (int) (MakeKey (key) % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+    return (wxObject *) NULL;
+  else
+    {
+      wxNode *node = hash_table[position]->Find (key);
+      return node ? node->GetData () : (wxObject*)NULL;
+    }
+}
+
+wxObject *wxHashTable::Delete (long key)
+{
+  // Should NEVER be
+  long k = (long) key;
+
+  int position = (int) (k % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+    return (wxObject *) NULL;
+  else
+    {
+      wxNode *node = hash_table[position]->Find (k);
+      if (node)
+        {
+          wxObject *data = node->GetData ();
+          delete node;
+          m_count--;
+          return data;
+        }
+      else
+        return (wxObject *) NULL;
+    }
+}
+
+wxObject *wxHashTable::Delete (const wxChar *key)
+{
+  int position = (int) (MakeKey (key) % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+    return (wxObject *) NULL;
+  else
+    {
+      wxNode *node = hash_table[position]->Find (key);
+      if (node)
+        {
+          wxObject *data = node->GetData ();
+          delete node;
+          m_count--;
+          return data;
+        }
+      else
+        return (wxObject *) NULL;
+    }
+}
+
+wxObject *wxHashTable::Delete (long key, int value)
+{
+  // Should NEVER be
+  long k = (long) key;
+
+  int position = (int) (k % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+    return (wxObject *) NULL;
+  else
+    {
+      wxNode *node = hash_table[position]->Find (value);
+      if (node)
+        {
+          wxObject *data = node->GetData ();
+          delete node;
+          m_count--;
+          return data;
+        }
+      else
+        return (wxObject *) NULL;
+    }
+}
+
+wxObject *wxHashTable::Delete (long key, const wxChar *value)
+{
+  int position = (int) (key % n);
+  if (position < 0) position = -position;
+
+  if (!hash_table[position])
+    return (wxObject *) NULL;
+  else
+    {
+      wxNode *node = hash_table[position]->Find (value);
+      if (node)
+        {
+          wxObject *data = node->GetData ();
+          delete node;
+          m_count--;
+          return data;
+        }
+      else
+        return (wxObject *) NULL;
+    }
+}
+
+long wxHashTable::MakeKey (const wxChar *string) const
+{
+  long int_key = 0;
+
+  while (*string)
+    int_key += (wxUChar) *string++;
+
+  return int_key;
+}
+
+void wxHashTable::BeginFind ()
+{
+  current_position = -1;
+  current_node = (wxNode *) NULL;
+}
+
+wxHashTable::Node* wxHashTable::Next ()
+{
+  wxNode *found = (wxNode *) NULL;
+  bool end = false;
+  while (!end && !found)
+    {
+      if (!current_node)
+        {
+          current_position++;
+          if (current_position >= n)
+            {
+              current_position = -1;
+              current_node = (wxNode *) NULL;
+              end = true;
+            }
+          else
+            {
+              if (hash_table[current_position])
+                {
+                  current_node = hash_table[current_position]->GetFirst ();
+                  found = current_node;
+                }
+            }
+        }
+      else
+        {
+          current_node = current_node->GetNext ();
+          found = current_node;
+        }
+    }
+  return found;
+}
+
+void wxHashTable::DeleteContents (bool flag)
+{
+  int i;
+  m_deleteContents = flag;
+  for (i = 0; i < n; i++)
+    {
+      if (hash_table[i])
+        hash_table[i]->DeleteContents (flag);
+    }
+}
+
+void wxHashTable::Clear ()
+{
+    int i;
+    if (hash_table)
+    {
+        for (i = 0; i < n; i++)
+        {
+            if (hash_table[i])
+                hash_table[i]->Clear ();
+        }
+    }
+  m_count = 0;
+}
+
+#else // if !wxUSE_OLD_HASH_TABLE
+
+wxHashTableBase_Node::wxHashTableBase_Node( long key, void* value,
+                                            wxHashTableBase* table )
+    : m_value( value ), m_hashPtr( table )
+{
+    m_key.integer = key;
+}
+
+wxHashTableBase_Node::wxHashTableBase_Node( const wxChar* key, void* value,
+                                            wxHashTableBase* table )
+    : m_value( value ), m_hashPtr( table )
+{
+    m_key.string = wxStrcpy( new wxChar[wxStrlen( key ) + 1], key );
+}
+
+wxHashTableBase_Node::~wxHashTableBase_Node()
+{
+    if( m_hashPtr ) m_hashPtr->DoRemoveNode( this );
+}
+
+//
+
+wxHashTableBase::wxHashTableBase()
+    : m_size( 0 ), m_count( 0 ), m_table( NULL ), m_keyType( wxKEY_NONE ),
+      m_deleteContents( false )
+{
+}
+
+void wxHashTableBase::Create( wxKeyType keyType, size_t size )
+{
+    m_keyType = keyType;
+    m_size = size;
+    m_table = new wxHashTableBase_Node*[ m_size ];
+
+    for( size_t i = 0; i < m_size; ++i )
+        m_table[i] = NULL;
+}
+
+void wxHashTableBase::Clear()
+{
+    for( size_t i = 0; i < m_size; ++i )
+    {
+        Node* end = m_table[i];
+
+        if( end == NULL )
+            continue;
+
+        Node *curr, *next = end->GetNext();
+
+        do
+        {
+            curr = next;
+            next = curr->GetNext();
+
+            DoDestroyNode( curr );
+
+            delete curr;
+        }
+        while( curr != end );
+
+        m_table[i] = NULL;
+    }
+
+    m_count = 0;
+}
+
+void wxHashTableBase::DoRemoveNode( wxHashTableBase_Node* node )
+{
+    size_t bucket = ( m_keyType == wxKEY_INTEGER ?
+                      node->m_key.integer        :
+                      MakeKey( node->m_key.string ) ) % m_size;
+
+    if( node->GetNext() == node )
+    {
+        // single-node chain (common case)
+        m_table[bucket] = NULL;
+    }
+    else
+    {
+        Node *start = m_table[bucket], *curr;
+        Node* prev = start;
+
+        for( curr = prev->GetNext(); curr != node;
+             prev = curr, curr = curr->GetNext() ) ;
+
+        DoUnlinkNode( bucket, node, prev );
+    }
+
+    DoDestroyNode( node );
+}
+
+void wxHashTableBase::DoDestroyNode( wxHashTableBase_Node* node )
+{
+    // if it is called from DoRemoveNode, node has already been
+    // removed, from other places it does not matter
+    node->m_hashPtr = NULL;
+
+    if( m_keyType == wxKEY_STRING )
+        delete[] node->m_key.string;
+    if( m_deleteContents )
+        DoDeleteContents( node );
+}
+
+void wxHashTableBase::Destroy()
+{
+    Clear();
+
+    delete[] m_table;
+
+    m_table = NULL;
+    m_size = 0;
+}
+
+void wxHashTableBase::DoInsertNode( size_t bucket, wxHashTableBase_Node* node )
+{
+    if( m_table[bucket] == NULL )
+    {
+        m_table[bucket] = node->m_next = node;
+    }
+    else
+    {
+        Node *prev = m_table[bucket];
+        Node *next = prev->m_next;
+
+        prev->m_next = node;
+        node->m_next = next;
+        m_table[bucket] = node;
+    }
+
+    ++m_count;
+}
+
+void wxHashTableBase::DoPut( long key, long hash, void* data )
+{
+    wxASSERT( m_keyType == wxKEY_INTEGER );
+
+    size_t bucket = size_t(hash) % m_size;
+    Node* node = new wxHashTableBase_Node( key, data, this );
+
+    DoInsertNode( bucket, node );
+}
+
+void wxHashTableBase::DoPut( const wxChar* key, long hash, void* data )
+{
+    wxASSERT( m_keyType == wxKEY_STRING );
+
+    size_t bucket = size_t(hash) % m_size;
+    Node* node = new wxHashTableBase_Node( key, data, this );
+
+    DoInsertNode( bucket, node );
+}
+
+void* wxHashTableBase::DoGet( long key, long hash ) const
+{
+    wxASSERT( m_keyType == wxKEY_INTEGER );
+
+    size_t bucket = size_t(hash) % m_size;
+
+    if( m_table[bucket] == NULL )
+        return NULL;
+
+    Node *first = m_table[bucket]->GetNext(),
+         *curr = first;
+
+    do
+    {
+        if( curr->m_key.integer == key )
+            return curr->m_value;
+
+        curr = curr->GetNext();
+    }
+    while( curr != first );
+
+    return NULL;
+}
+
+void* wxHashTableBase::DoGet( const wxChar* key, long hash ) const
+{
+    wxASSERT( m_keyType == wxKEY_STRING );
+
+    size_t bucket = size_t(hash) % m_size;
+
+    if( m_table[bucket] == NULL )
+        return NULL;
+
+    Node *first = m_table[bucket]->GetNext(),
+         *curr = first;
+
+    do
+    {
+        if( wxStrcmp( curr->m_key.string, key ) == 0 )
+            return curr->m_value;
+
+        curr = curr->GetNext();
+    }
+    while( curr != first );
+
+    return NULL;
+}
+
+void wxHashTableBase::DoUnlinkNode( size_t bucket, wxHashTableBase_Node* node,
+                                    wxHashTableBase_Node* prev )
+{
+    if( node == m_table[bucket] )
+        m_table[bucket] = prev;
+
+    if( prev == node && prev == node->GetNext() )
+        m_table[bucket] = NULL;
+    else
+        prev->m_next = node->m_next;
+
+    DoDestroyNode( node );
+    --m_count;
+}
+
+void* wxHashTableBase::DoDelete( long key, long hash )
+{
+    wxASSERT( m_keyType == wxKEY_INTEGER );
+
+    size_t bucket = size_t(hash) % m_size;
+
+    if( m_table[bucket] == NULL )
+        return NULL;
+
+    Node *first = m_table[bucket]->GetNext(),
+         *curr = first,
+         *prev = m_table[bucket];
+
+    do
+    {
+        if( curr->m_key.integer == key )
+        {
+            void* retval = curr->m_value;
+            curr->m_value = NULL;
+
+            DoUnlinkNode( bucket, curr, prev );
+            delete curr;
+
+            return retval;
+        }
+
+        prev = curr;
+        curr = curr->GetNext();
+    }
+    while( curr != first );
+
+    return NULL;
+}
+
+void* wxHashTableBase::DoDelete( const wxChar* key, long hash )
+{
+    wxASSERT( m_keyType == wxKEY_STRING );
+
+    size_t bucket = size_t(hash) % m_size;
+
+    if( m_table[bucket] == NULL )
+        return NULL;
+
+    Node *first = m_table[bucket]->GetNext(),
+         *curr = first,
+         *prev = m_table[bucket];
+
+    do
+    {
+        if( wxStrcmp( curr->m_key.string, key ) == 0 )
+        {
+            void* retval = curr->m_value;
+            curr->m_value = NULL;
+
+            DoUnlinkNode( bucket, curr, prev );
+            delete curr;
+
+            return retval;
+        }
+
+        prev = curr;
+        curr = curr->GetNext();
+    }
+    while( curr != first );
+
+    return NULL;
+}
+
+long wxHashTableBase::MakeKey( const wxChar *str )
+{
+    long int_key = 0;
+
+    while( *str )
+        int_key += (wxUChar)*str++;
+
+    return int_key;
+}
+
+// ----------------------------------------------------------------------------
+// wxHashTable
+// ----------------------------------------------------------------------------
+
+wxHashTable::wxHashTable( const wxHashTable& table )
+           : wxHashTableBase()
+{
+    DoCopy( table );
+}
+
+const wxHashTable& wxHashTable::operator=( const wxHashTable& table )
+{
+    Destroy();
+    DoCopy( table );
+
+    return *this;
+}
+
+void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) )
+{
+    Create( m_keyType, m_size );
+
+    wxFAIL;
+}
+
+void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )
+{
+    delete ((wxHashTable_Node*)node)->GetData();
+}
+
+void wxHashTable::GetNextNode( size_t bucketStart )
+{
+    for( size_t i = bucketStart; i < m_size; ++i )
+    {
+        if( m_table[i] != NULL )
+        {
+            m_curr = ((Node*)m_table[i])->GetNext();
+            m_currBucket = i;
+            return;
+        }
+    }
+
+    m_curr = NULL;
+    m_currBucket = 0;
+}
+
+wxHashTable::Node* wxHashTable::Next()
+{
+    if( m_curr == NULL )
+        GetNextNode( 0 );
+    else
+    {
+        m_curr = m_curr->GetNext();
+
+        if( m_curr == ( (Node*)m_table[m_currBucket] )->GetNext() )
+            GetNextNode( m_currBucket + 1 );
+    }
+
+    return m_curr;
+}
+
+#endif // !wxUSE_OLD_HASH_TABLE
diff --git a/Source/3rd Party/wx/src/common/hashmap.cpp b/Source/3rd Party/wx/src/common/hashmap.cpp
index 53ba38ff1..215396f8e 100644
--- a/Source/3rd Party/wx/src/common/hashmap.cpp	
+++ b/Source/3rd Party/wx/src/common/hashmap.cpp	
@@ -1,142 +1,152 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/hashmap.cpp
-// Purpose:     wxHashMap implementation
-// Author:      Mattia Barbon
-// Modified by:
-// Created:     29/01/2002
-// RCS-ID:      $Id$
-// Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/hashmap.h"
-
-/* FYI: This is the "One-at-a-Time" algorithm by Bob Jenkins */
-/* from requirements by Colin Plumb. */
-/* (http://burtleburtle.net/bob/hash/doobs.html) */
-/* adapted from Perl sources ( hv.h ) */
-template<typename T>
-static unsigned long DoStringHash(T *k)
-{
-    unsigned long hash = 0;
-
-    while( *k )
-    {
-        hash += *k++;
-        hash += (hash << 10);
-        hash ^= (hash >> 6);
-    }
-    hash += (hash << 3);
-    hash ^= (hash >> 11);
-
-    return hash + (hash << 15);
-}
-
-unsigned long wxStringHash::stringHash( const char* k )
-  { return DoStringHash(k); }
-
-unsigned long wxStringHash::stringHash( const wchar_t* k )
-  { return DoStringHash(k); }
-
-
-#ifdef wxNEEDS_WX_HASH_MAP
-
-/* from SGI STL */
-const unsigned long _wxHashTableBase2::ms_primes[prime_count] =
-{
-    7ul,          13ul,         29ul,
-    53ul,         97ul,         193ul,       389ul,       769ul,
-    1543ul,       3079ul,       6151ul,      12289ul,     24593ul,
-    49157ul,      98317ul,      196613ul,    393241ul,    786433ul,
-    1572869ul,    3145739ul,    6291469ul,   12582917ul,  25165843ul,
-    50331653ul,   100663319ul,  201326611ul, 402653189ul, 805306457ul,
-    1610612741ul, 3221225473ul, 4294967291ul
-};
-
-unsigned long _wxHashTableBase2::GetNextPrime( unsigned long n )
-{
-    const unsigned long* ptr = &ms_primes[0];
-    for( size_t i = 0; i < prime_count; ++i, ++ptr )
-    {
-        if( n < *ptr )
-            return *ptr;
-    }
-
-    /* someone might try to alloc a 2^32-element hash table */
-    wxFAIL_MSG( wxT("hash table too big?") );
-
-    /* quiet warning */
-    return 0;
-}
-
-unsigned long _wxHashTableBase2::GetPreviousPrime( unsigned long n )
-{
-    const unsigned long* ptr = &ms_primes[prime_count - 1];
-
-    for( size_t i = 0; i < prime_count; ++i, --ptr )
-    {
-        if( n > *ptr )
-            return *ptr;
-    }
-
-    /* quiet warning */
-    return 1;
-}
-
-void _wxHashTableBase2::DeleteNodes( size_t buckets,
-                                     _wxHashTable_NodeBase** table,
-                                     NodeDtor dtor )
-{
-    size_t i;
-
-    for( i = 0; i < buckets; ++i )
-    {
-        _wxHashTable_NodeBase* node = table[i];
-        _wxHashTable_NodeBase* tmp;
-
-        while( node )
-        {
-            tmp = node->m_next;
-            dtor( node );
-            node = tmp;
-        }
-    }
-
-    memset( table, 0, buckets * sizeof(void*) );
-}
-
-void _wxHashTableBase2::CopyHashTable( _wxHashTable_NodeBase** srcTable,
-                                       size_t srcBuckets,
-                                       _wxHashTableBase2* dst,
-                                       _wxHashTable_NodeBase** dstTable,
-                                       BucketFromNode func, ProcessNode proc )
-{
-    for( size_t i = 0; i < srcBuckets; ++i )
-    {
-        _wxHashTable_NodeBase* nextnode;
-
-        for( _wxHashTable_NodeBase* node = srcTable[i]; node; node = nextnode )
-        {
-            size_t bucket = func( dst, node );
-
-            nextnode = node->m_next;
-            _wxHashTable_NodeBase* newnode = proc( node );
-            newnode->m_next = dstTable[bucket];
-            dstTable[bucket] = newnode;
-        }
-    }
-}
-
-_wxHashTable_NodeBase* _wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase* node)
-{
-    return node;
-}
-
-#endif // wxNEEDS_WX_HASH_MAP
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/hashmap.cpp
+// Purpose:     wxHashMap implementation
+// Author:      Mattia Barbon
+// Modified by:
+// Created:     29/01/2002
+// RCS-ID:      $Id: hashmap.cpp 39802 2006-06-20 10:24:07Z ABX $
+// Copyright:   (c) Mattia Barbon
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/hashmap.h"
+
+/* FYI: This is the "One-at-a-Time" algorithm by Bob Jenkins */
+/* from requirements by Colin Plumb. */
+/* (http://burtleburtle.net/bob/hash/doobs.html) */
+/* adapted from Perl sources ( hv.h ) */
+unsigned long wxStringHash::wxCharStringHash( const wxChar* k )
+{
+    unsigned long hash = 0;
+
+    while( *k )
+    {
+        hash += *k++;
+        hash += (hash << 10);
+        hash ^= (hash >> 6);
+    }
+    hash += (hash << 3);
+    hash ^= (hash >> 11);
+
+    return hash + (hash << 15);
+}
+
+#if wxUSE_UNICODE
+unsigned long wxStringHash::charStringHash( const char* k )
+{
+    unsigned long hash = 0;
+
+    while( *k )
+    {
+        hash += *k++;
+        hash += (hash << 10);
+        hash ^= (hash >> 6);
+    }
+    hash += (hash << 3);
+    hash ^= (hash >> 11);
+
+    return hash + (hash << 15);
+}
+#endif
+
+#if !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
+
+/* from SGI STL */
+const unsigned long _wxHashTableBase2::ms_primes[prime_count] =
+{
+    7ul,          13ul,         29ul,
+    53ul,         97ul,         193ul,       389ul,       769ul,
+    1543ul,       3079ul,       6151ul,      12289ul,     24593ul,
+    49157ul,      98317ul,      196613ul,    393241ul,    786433ul,
+    1572869ul,    3145739ul,    6291469ul,   12582917ul,  25165843ul,
+    50331653ul,   100663319ul,  201326611ul, 402653189ul, 805306457ul,
+    1610612741ul, 3221225473ul, 4294967291ul
+};
+
+unsigned long _wxHashTableBase2::GetNextPrime( unsigned long n )
+{
+    const unsigned long* ptr = &ms_primes[0];
+    for( size_t i = 0; i < prime_count; ++i, ++ptr )
+    {
+        if( n < *ptr )
+            return *ptr;
+    }
+
+    /* someone might try to alloc a 2^32-element hash table */
+    wxFAIL_MSG( _T("hash table too big?") );
+
+    /* quiet warning */
+    return 0;
+}
+
+unsigned long _wxHashTableBase2::GetPreviousPrime( unsigned long n )
+{
+    const unsigned long* ptr = &ms_primes[prime_count - 1];
+
+    for( size_t i = 0; i < prime_count; ++i, --ptr )
+    {
+        if( n > *ptr )
+            return *ptr;
+    }
+
+    /* quiet warning */
+    return 1;
+}
+
+void _wxHashTableBase2::DeleteNodes( size_t buckets,
+                                     _wxHashTable_NodeBase** table,
+                                     NodeDtor dtor )
+{
+    size_t i;
+
+    for( i = 0; i < buckets; ++i )
+    {
+        _wxHashTable_NodeBase* node = table[i];
+        _wxHashTable_NodeBase* tmp;
+
+        while( node )
+        {
+            tmp = node->m_nxt;
+            dtor( node );
+            node = tmp;
+        }
+    }
+
+    memset( table, 0, buckets * sizeof(void*) );
+}
+
+void _wxHashTableBase2::CopyHashTable( _wxHashTable_NodeBase** srcTable,
+                                       size_t srcBuckets,
+                                       _wxHashTableBase2* dst,
+                                       _wxHashTable_NodeBase** dstTable,
+                                       BucketFromNode func, ProcessNode proc )
+{
+    for( size_t i = 0; i < srcBuckets; ++i )
+    {
+        _wxHashTable_NodeBase* nextnode;
+
+        for( _wxHashTable_NodeBase* node = srcTable[i]; node; node = nextnode )
+        {
+            size_t bucket = func( dst, node );
+
+            nextnode = node->m_nxt;
+            _wxHashTable_NodeBase* newnode = proc( node );
+            newnode->m_nxt = dstTable[bucket];
+            dstTable[bucket] = newnode;
+        }
+    }
+}
+
+_wxHashTable_NodeBase* _wxHashTableBase2::DummyProcessNode(_wxHashTable_NodeBase* node)
+{
+    return node;
+}
+
+#endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
diff --git a/Source/3rd Party/wx/src/common/headercolcmn.cpp b/Source/3rd Party/wx/src/common/headercolcmn.cpp
deleted file mode 100644
index 9f1778945..000000000
--- a/Source/3rd Party/wx/src/common/headercolcmn.cpp	
+++ /dev/null
@@ -1,94 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/headercolcmn.cpp
-// Purpose:     wxHeaderColumn implementation
-// Author:      Vadim Zeitlin
-// Created:     2008-12-02
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_HEADERCTRL
-
-#include "wx/headercol.h"
-
-// ============================================================================
-// wxHeaderColumn implementation
-// ============================================================================
-
-int wxHeaderColumn::GetFromIndividualFlags() const
-{
-    int flags = 0;
-
-    if ( IsResizeable() )
-        flags |= wxCOL_RESIZABLE;
-    if ( IsSortable() )
-        flags |= wxCOL_SORTABLE;
-    if ( IsReorderable() )
-        flags |= wxCOL_REORDERABLE;
-    if ( IsHidden() )
-        flags |= wxCOL_HIDDEN;
-
-    return flags;
-}
-
-// ============================================================================
-// wxSettableHeaderColumn implementation
-// ============================================================================
-
-void wxSettableHeaderColumn::SetIndividualFlags(int flags)
-{
-    SetResizeable((flags & wxCOL_RESIZABLE) != 0);
-    SetSortable((flags & wxCOL_SORTABLE) != 0);
-    SetReorderable((flags & wxCOL_REORDERABLE) != 0);
-    SetHidden((flags & wxCOL_HIDDEN) != 0);
-}
-
-void wxSettableHeaderColumn::ChangeFlag(int flag, bool set)
-{
-    if ( HasFlag(flag) != set )
-        ToggleFlag(flag);
-}
-
-void wxSettableHeaderColumn::SetFlag(int flag)
-{
-    int flags = GetFlags();
-    if ( !(flags & flag) )
-        SetFlags(flags | flag);
-}
-
-void wxSettableHeaderColumn::ClearFlag(int flag)
-{
-    int flags = GetFlags();
-    if ( flags & flag )
-        SetFlags(flags & ~flag);
-}
-
-void wxSettableHeaderColumn::ToggleFlag(int flag)
-{
-    int flags = GetFlags();
-    if ( flags & flag )
-        flags &= ~flag;
-    else
-        flags |= flag;
-
-    SetFlags(flags);
-}
-
-#endif // wxUSE_HEADERCTRL
-
diff --git a/Source/3rd Party/wx/src/common/headerctrlcmn.cpp b/Source/3rd Party/wx/src/common/headerctrlcmn.cpp
deleted file mode 100644
index 0d191177e..000000000
--- a/Source/3rd Party/wx/src/common/headerctrlcmn.cpp	
+++ /dev/null
@@ -1,517 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/headerctrlcmn.cpp
-// Purpose:     implementation of wxHeaderCtrlBase
-// Author:      Vadim Zeitlin
-// Created:     2008-12-02
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_HEADERCTRL
-
-#ifndef WX_PRECOMP
-    #include "wx/menu.h"
-#endif // WX_PRECOMP
-
-#include "wx/headerctrl.h"
-#include "wx/rearrangectrl.h"
-#include "wx/renderer.h"
-
-namespace
-{
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-const unsigned int wxNO_COLUMN = static_cast<unsigned>(-1);
-
-// ----------------------------------------------------------------------------
-// wxHeaderColumnsRearrangeDialog: dialog for customizing our columns
-// ----------------------------------------------------------------------------
-
-#if wxUSE_REARRANGECTRL
-
-class wxHeaderColumnsRearrangeDialog : public wxRearrangeDialog
-{
-public:
-    wxHeaderColumnsRearrangeDialog(wxWindow *parent,
-                                   const wxArrayInt& order,
-                                   const wxArrayString& items)
-        : wxRearrangeDialog
-          (
-            parent,
-            _("Please select the columns to show and define their order:"),
-            _("Customize Columns"),
-            order,
-            items
-          )
-    {
-    }
-};
-
-#endif // wxUSE_REARRANGECTRL
-
-} // anonymous namespace
-
-// ============================================================================
-// wxHeaderCtrlBase implementation
-// ============================================================================
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxHeaderCtrlNameStr[] = "wxHeaderCtrl";
-
-BEGIN_EVENT_TABLE(wxHeaderCtrlBase, wxControl)
-    EVT_HEADER_SEPARATOR_DCLICK(wxID_ANY, wxHeaderCtrlBase::OnSeparatorDClick)
-#if wxUSE_MENUS
-    EVT_HEADER_RIGHT_CLICK(wxID_ANY, wxHeaderCtrlBase::OnRClick)
-#endif // wxUSE_MENUS
-END_EVENT_TABLE()
-
-void wxHeaderCtrlBase::ScrollWindow(int dx,
-                                    int WXUNUSED_UNLESS_DEBUG(dy),
-                                    const wxRect * WXUNUSED_UNLESS_DEBUG(rect))
-
-{
-    // this doesn't make sense at all
-    wxASSERT_MSG( !dy, "header window can't be scrolled vertically" );
-
-    // this would actually be nice to support for "frozen" headers but it isn't
-    // supported currently
-    wxASSERT_MSG( !rect, "header window can't be scrolled partially" );
-
-    DoScrollHorz(dx);
-}
-
-void wxHeaderCtrlBase::SetColumnCount(unsigned int count)
-{
-    if ( count != GetColumnCount() )
-        OnColumnCountChanging(count);
-
-    // still call DoSetCount() even if the count didn't really change in order
-    // to update all the columns
-    DoSetCount(count);
-}
-
-int wxHeaderCtrlBase::GetColumnTitleWidth(const wxHeaderColumn& col)
-{
-    int w = wxWindowBase::GetTextExtent(col.GetTitle()).x;
-
-    // add some margin:
-    w += wxRendererNative::Get().GetHeaderButtonMargin(this);
-
-    // if a bitmap is used, add space for it and 2px border:
-    wxBitmap bmp = col.GetBitmap();
-    if ( bmp.IsOk() )
-        w += bmp.GetWidth() + 2;
-
-    return w;
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrlBase event handling
-// ----------------------------------------------------------------------------
-
-void wxHeaderCtrlBase::OnSeparatorDClick(wxHeaderCtrlEvent& event)
-{
-    const unsigned col = event.GetColumn();
-    const wxHeaderColumn& column = GetColumn(col);
-
-    if ( !column.IsResizeable() )
-    {
-        event.Skip();
-        return;
-    }
-
-    int w = GetColumnTitleWidth(column);
-
-    if ( !UpdateColumnWidthToFit(col, w) )
-        event.Skip();
-    else
-        UpdateColumn(col);
-}
-
-#if wxUSE_MENUS
-
-void wxHeaderCtrlBase::OnRClick(wxHeaderCtrlEvent& event)
-{
-    if ( !HasFlag(wxHD_ALLOW_HIDE) )
-    {
-        event.Skip();
-        return;
-    }
-
-    ShowColumnsMenu(ScreenToClient(wxGetMousePosition()));
-}
-
-#endif // wxUSE_MENUS
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrlBase column reordering
-// ----------------------------------------------------------------------------
-
-void wxHeaderCtrlBase::SetColumnsOrder(const wxArrayInt& order)
-{
-    const unsigned count = GetColumnCount();
-    wxCHECK_RET( order.size() == count, "wrong number of columns" );
-
-    // check the array validity
-    wxArrayInt seen(count, 0);
-    for ( unsigned n = 0; n < count; n++ )
-    {
-        const unsigned idx = order[n];
-        wxCHECK_RET( idx < count, "invalid column index" );
-        wxCHECK_RET( !seen[idx], "duplicate column index" );
-
-        seen[idx] = 1;
-    }
-
-    DoSetColumnsOrder(order);
-
-    // TODO-RTL: do we need to reverse the array?
-}
-
-void wxHeaderCtrlBase::ResetColumnsOrder()
-{
-    const unsigned count = GetColumnCount();
-    wxArrayInt order(count);
-    for ( unsigned n = 0; n < count; n++ )
-        order[n] = n;
-
-    DoSetColumnsOrder(order);
-}
-
-wxArrayInt wxHeaderCtrlBase::GetColumnsOrder() const
-{
-    const wxArrayInt order = DoGetColumnsOrder();
-
-    wxASSERT_MSG( order.size() == GetColumnCount(), "invalid order array" );
-
-    return order;
-}
-
-unsigned int wxHeaderCtrlBase::GetColumnAt(unsigned int pos) const
-{
-    wxCHECK_MSG( pos < GetColumnCount(), wxNO_COLUMN, "invalid position" );
-
-    return GetColumnsOrder()[pos];
-}
-
-unsigned int wxHeaderCtrlBase::GetColumnPos(unsigned int idx) const
-{
-    const unsigned count = GetColumnCount();
-
-    wxCHECK_MSG( idx < count, wxNO_COLUMN, "invalid index" );
-
-    const wxArrayInt order = GetColumnsOrder();
-    for ( unsigned n = 0; n < count; n++ )
-    {
-        if ( (unsigned)order[n] == idx )
-            return n;
-    }
-
-    wxFAIL_MSG( "column unexpectedly not displayed at all" );
-
-    return wxNO_COLUMN;
-}
-
-/* static */
-void wxHeaderCtrlBase::MoveColumnInOrderArray(wxArrayInt& order,
-                                              unsigned int idx,
-                                              unsigned int pos)
-{
-    const unsigned count = order.size();
-
-    wxArrayInt orderNew;
-    orderNew.reserve(count);
-    for ( unsigned n = 0; ; n++ )
-    {
-        // NB: order of checks is important for this to work when the new
-        //     column position is the same as the old one
-
-        // insert the column at its new position
-        if ( orderNew.size() == pos )
-            orderNew.push_back(idx);
-
-        if ( n == count )
-            break;
-
-        // delete the column from its old position
-        const unsigned idxOld = order[n];
-        if ( idxOld == idx )
-            continue;
-
-        orderNew.push_back(idxOld);
-    }
-
-    order.swap(orderNew);
-}
-
-void
-wxHeaderCtrlBase::DoResizeColumnIndices(wxArrayInt& colIndices, unsigned int count)
-{
-    // update the column indices array if necessary
-    const unsigned countOld = colIndices.size();
-    if ( count > countOld )
-    {
-        // all new columns have default positions equal to their indices
-        for ( unsigned n = countOld; n < count; n++ )
-            colIndices.push_back(n);
-    }
-    else if ( count < countOld )
-    {
-        // filter out all the positions which are invalid now while keeping the
-        // order of the remaining ones
-        wxArrayInt colIndicesNew;
-        colIndicesNew.reserve(count);
-        for ( unsigned n = 0; n < countOld; n++ )
-        {
-            const unsigned idx = colIndices[n];
-            if ( idx < count )
-                colIndicesNew.push_back(idx);
-        }
-
-        colIndices.swap(colIndicesNew);
-    }
-    //else: count didn't really change, nothing to do
-
-    wxASSERT_MSG( colIndices.size() == count, "logic error" );
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl extra UI
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS
-
-void wxHeaderCtrlBase::AddColumnsItems(wxMenu& menu, int idColumnsBase)
-{
-    const unsigned count = GetColumnCount();
-    for ( unsigned n = 0; n < count; n++ )
-    {
-        const wxHeaderColumn& col = GetColumn(n);
-        menu.AppendCheckItem(idColumnsBase + n, col.GetTitle());
-        if ( col.IsShown() )
-            menu.Check(n, true);
-    }
-}
-
-bool wxHeaderCtrlBase::ShowColumnsMenu(const wxPoint& pt, const wxString& title)
-{
-    // construct the menu with the entries for all columns
-    wxMenu menu;
-    if ( !title.empty() )
-        menu.SetTitle(title);
-
-    AddColumnsItems(menu);
-
-    // ... and an extra one to show the customization dialog if the user is
-    // allowed to reorder the columns too
-    const unsigned count = GetColumnCount();
-    if ( HasFlag(wxHD_ALLOW_REORDER) )
-    {
-        menu.AppendSeparator();
-        menu.Append(count, _("&Customize..."));
-    }
-
-    // do show the menu and get the user selection
-    const int rc = GetPopupMenuSelectionFromUser(menu, pt);
-    if ( rc == wxID_NONE )
-        return false;
-
-    if ( static_cast<unsigned>(rc) == count )
-    {
-        return ShowCustomizeDialog();
-    }
-    else // a column selected from the menu
-    {
-        UpdateColumnVisibility(rc, !GetColumn(rc).IsShown());
-    }
-
-    return true;
-}
-
-#endif // wxUSE_MENUS
-
-bool wxHeaderCtrlBase::ShowCustomizeDialog()
-{
-#if wxUSE_REARRANGECTRL
-    // prepare the data for showing the dialog
-    wxArrayInt order = GetColumnsOrder();
-
-    const unsigned count = GetColumnCount();
-
-    // notice that titles are always in the index order, they will be shown
-    // rearranged according to the display order in the dialog
-    wxArrayString titles;
-    titles.reserve(count);
-    for ( unsigned n = 0; n < count; n++ )
-        titles.push_back(GetColumn(n).GetTitle());
-
-    // this loop is however over positions and not indices
-    unsigned pos;
-    for ( pos = 0; pos < count; pos++ )
-    {
-        int& idx = order[pos];
-        if ( GetColumn(idx).IsHidden() )
-        {
-            // indicate that this one is hidden
-            idx = ~idx;
-        }
-    }
-
-    // do show it
-    wxHeaderColumnsRearrangeDialog dlg(this, order, titles);
-    if ( dlg.ShowModal() == wxID_OK )
-    {
-        // and apply the changes
-        order = dlg.GetOrder();
-        for ( pos = 0; pos < count; pos++ )
-        {
-            int& idx = order[pos];
-            const bool show = idx >= 0;
-            if ( !show )
-            {
-                // make all indices positive for passing them to SetColumnsOrder()
-                idx = ~idx;
-            }
-
-            if ( show != GetColumn(idx).IsShown() )
-                UpdateColumnVisibility(idx, show);
-        }
-
-        UpdateColumnsOrder(order);
-        SetColumnsOrder(order);
-
-        return true;
-    }
-#endif // wxUSE_REARRANGECTRL
-
-    return false;
-}
-
-// ============================================================================
-// wxHeaderCtrlSimple implementation
-// ============================================================================
-
-void wxHeaderCtrlSimple::Init()
-{
-    m_sortKey = wxNO_COLUMN;
-}
-
-const wxHeaderColumn& wxHeaderCtrlSimple::GetColumn(unsigned int idx) const
-{
-    return m_cols[idx];
-}
-
-void wxHeaderCtrlSimple::DoInsert(const wxHeaderColumnSimple& col, unsigned int idx)
-{
-    m_cols.insert(m_cols.begin() + idx, col);
-
-    UpdateColumnCount();
-}
-
-void wxHeaderCtrlSimple::DoDelete(unsigned int idx)
-{
-    m_cols.erase(m_cols.begin() + idx);
-    if ( idx == m_sortKey )
-        m_sortKey = wxNO_COLUMN;
-
-    UpdateColumnCount();
-}
-
-void wxHeaderCtrlSimple::DeleteAllColumns()
-{
-    m_cols.clear();
-    m_sortKey = wxNO_COLUMN;
-
-    UpdateColumnCount();
-}
-
-
-void wxHeaderCtrlSimple::DoShowColumn(unsigned int idx, bool show)
-{
-    if ( show != m_cols[idx].IsShown() )
-    {
-        m_cols[idx].SetHidden(!show);
-
-        UpdateColumn(idx);
-    }
-}
-
-void wxHeaderCtrlSimple::DoShowSortIndicator(unsigned int idx, bool ascending)
-{
-    RemoveSortIndicator();
-
-    m_cols[idx].SetSortOrder(ascending);
-    m_sortKey = idx;
-
-    UpdateColumn(idx);
-}
-
-void wxHeaderCtrlSimple::RemoveSortIndicator()
-{
-    if ( m_sortKey != wxNO_COLUMN )
-    {
-        const unsigned sortOld = m_sortKey;
-        m_sortKey = wxNO_COLUMN;
-
-        m_cols[sortOld].UnsetAsSortKey();
-
-        UpdateColumn(sortOld);
-    }
-}
-
-bool
-wxHeaderCtrlSimple::UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
-{
-    const int widthContents = GetBestFittingWidth(idx);
-    if ( widthContents == -1 )
-        return false;
-
-    m_cols[idx].SetWidth(wxMax(widthContents, widthTitle));
-
-    return true;
-}
-
-// ============================================================================
-// wxHeaderCtrlEvent implementation
-// ============================================================================
-
-IMPLEMENT_DYNAMIC_CLASS(wxHeaderCtrlEvent, wxNotifyEvent)
-
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_CLICK, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RIGHT_CLICK, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_MIDDLE_CLICK, wxHeaderCtrlEvent);
-
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_DCLICK, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RIGHT_DCLICK, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_MIDDLE_DCLICK, wxHeaderCtrlEvent);
-
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK, wxHeaderCtrlEvent);
-
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_BEGIN_RESIZE, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_RESIZING, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_END_RESIZE, wxHeaderCtrlEvent);
-
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_BEGIN_REORDER, wxHeaderCtrlEvent);
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_END_REORDER, wxHeaderCtrlEvent);
-
-wxDEFINE_EVENT( wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED, wxHeaderCtrlEvent);
-
-#endif // wxUSE_HEADERCTRL
diff --git a/Source/3rd Party/wx/src/common/helpbase.cpp b/Source/3rd Party/wx/src/common/helpbase.cpp
index 02417f71b..83ede72d7 100644
--- a/Source/3rd Party/wx/src/common/helpbase.cpp	
+++ b/Source/3rd Party/wx/src/common/helpbase.cpp	
@@ -1,28 +1,28 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/helpbase.cpp
-// Purpose:     Help system base classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_HELP
-
-#ifndef WX_PRECOMP
-#endif
-
-#include "wx/helpbase.h"
-
-IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
-
-#endif // wxUSE_HELP
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/helpbase.cpp
+// Purpose:     Help system base classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: helpbase.cpp 38787 2006-04-18 07:24:35Z ABX $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_HELP
+
+#ifndef WX_PRECOMP
+#endif
+
+#include "wx/helpbase.h"
+
+IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
+
+#endif // wxUSE_HELP
diff --git a/Source/3rd Party/wx/src/common/iconbndl.cpp b/Source/3rd Party/wx/src/common/iconbndl.cpp
index 7ffff28b7..98805d7e8 100644
--- a/Source/3rd Party/wx/src/common/iconbndl.cpp	
+++ b/Source/3rd Party/wx/src/common/iconbndl.cpp	
@@ -1,328 +1,142 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/iconbndl.cpp
-// Purpose:     wxIconBundle
-// Author:      Mattia Barbon, Vadim Zeitlin
-// Created:     23.03.2002
-// RCS-ID:      $Id$
-// Copyright:   (c) Mattia barbon
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/iconbndl.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/settings.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/bitmap.h"
-    #include "wx/image.h"
-    #include "wx/stream.h"
-#endif
-
-#include "wx/wfstream.h"
-
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxIconArray)
-
-IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject)
-
-#define M_ICONBUNDLEDATA static_cast<wxIconBundleRefData*>(m_refData)
-
-// ----------------------------------------------------------------------------
-// wxIconBundleRefData
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxIconBundleRefData : public wxGDIRefData
-{
-public:
-    wxIconBundleRefData() { }
-
-    // We need the copy ctor for CloneGDIRefData() but notice that we use the
-    // base class default ctor in it and not the copy one which it doesn't have.
-    wxIconBundleRefData(const wxIconBundleRefData& other)
-        : wxGDIRefData(),
-          m_icons(other.m_icons)
-    {
-    }
-
-    // default assignment operator and dtor are ok
-
-    virtual bool IsOk() const { return !m_icons.empty(); }
-
-    wxIconArray m_icons;
-};
-
-// ============================================================================
-// wxIconBundle implementation
-// ============================================================================
-
-wxIconBundle::wxIconBundle()
-{
-}
-
-#if wxUSE_STREAMS && wxUSE_IMAGE
-
-#if wxUSE_FFILE || wxUSE_FILE
-wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
-            : wxGDIObject()
-{
-    AddIcon(file, type);
-}
-#endif // wxUSE_FFILE || wxUSE_FILE
-
-wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)
-            : wxGDIObject()
-{
-    AddIcon(stream, type);
-}
-#endif // wxUSE_STREAMS && wxUSE_IMAGE
-
-wxIconBundle::wxIconBundle(const wxIcon& icon)
-            : wxGDIObject()
-{
-    AddIcon(icon);
-}
-
-wxGDIRefData *wxIconBundle::CreateGDIRefData() const
-{
-    return new wxIconBundleRefData;
-}
-
-wxGDIRefData *wxIconBundle::CloneGDIRefData(const wxGDIRefData *data) const
-{
-    return new wxIconBundleRefData(*static_cast<const wxIconBundleRefData *>(data));
-}
-
-void wxIconBundle::DeleteIcons()
-{
-    UnRef();
-}
-
-#if wxUSE_STREAMS && wxUSE_IMAGE
-
-namespace
-{
-
-// Adds icon from 'input' to the bundle. Shows 'errorMessage' on failure
-// (it must contain "%d", because it is used to report # of image in the file
-// that failed to load):
-void DoAddIcon(wxIconBundle& bundle,
-               wxInputStream& input,
-               wxBitmapType type,
-               const wxString& errorMessage)
-{
-    wxImage image;
-
-    const wxFileOffset posOrig = input.TellI();
-
-    const size_t count = wxImage::GetImageCount(input, type);
-    for ( size_t i = 0; i < count; ++i )
-    {
-        if ( i )
-        {
-            // the call to LoadFile() for the first sub-image updated the
-            // stream position but we need to start reading the subsequent
-            // sub-image at the image beginning too
-            input.SeekI(posOrig);
-        }
-
-        if ( !image.LoadFile(input, type, i) )
-        {
-            wxLogError(errorMessage, i);
-            continue;
-        }
-
-        if ( type == wxBITMAP_TYPE_ANY )
-        {
-            // store the type so that we don't need to try all handlers again
-            // for the subsequent images, they should all be of the same type
-            type = image.GetType();
-        }
-
-        wxIcon tmp;
-        tmp.CopyFromBitmap(wxBitmap(image));
-        bundle.AddIcon(tmp);
-    }
-}
-
-} // anonymous namespace
-
-#if wxUSE_FFILE || wxUSE_FILE
-
-void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
-{
-#ifdef __WXMAC__
-    // Deal with standard icons
-    if ( type == wxBITMAP_TYPE_ICON_RESOURCE )
-    {
-        wxIcon tmp(file, type);
-        if (tmp.IsOk())
-        {
-            AddIcon(tmp);
-            return;
-        }
-    }
-#endif // __WXMAC__
-
-#if wxUSE_FFILE
-    wxFFileInputStream stream(file);
-#elif wxUSE_FILE
-    wxFileInputStream stream(file);
-#endif
-    DoAddIcon
-    (
-        *this,
-        stream, type,
-        wxString::Format(_("Failed to load image %%d from file '%s'."), file)
-    );
-}
-
-#endif // wxUSE_FFILE || wxUSE_FILE
-
-void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
-{
-    DoAddIcon(*this, stream, type, _("Failed to load image %d from stream."));
-}
-
-#endif // wxUSE_STREAMS && wxUSE_IMAGE
-
-wxIcon wxIconBundle::GetIcon(const wxSize& size, int flags) const
-{
-    wxASSERT( size == wxDefaultSize || (size.x >= 0 && size.y > 0) );
-
-    // We need the standard system icon size when using FALLBACK_SYSTEM.
-    wxCoord sysX = 0,
-            sysY = 0;
-    if ( flags & FALLBACK_SYSTEM )
-    {
-        sysX = wxSystemSettings::GetMetric(wxSYS_ICON_X);
-        sysY = wxSystemSettings::GetMetric(wxSYS_ICON_Y);
-    }
-
-    // If size == wxDefaultSize, we use system default icon size by convention.
-    wxCoord sizeX = size.x;
-    wxCoord sizeY = size.y;
-    if ( size == wxDefaultSize )
-    {
-        wxASSERT_MSG( flags == FALLBACK_SYSTEM,
-                      wxS("Must have valid size if not using FALLBACK_SYSTEM") );
-
-        sizeX = sysX;
-        sizeY = sysY;
-    }
-
-    // Iterate over all icons searching for the exact match or the closest icon
-    // for FALLBACK_NEAREST_LARGER.
-    wxIcon iconBest;
-    int bestDiff = 0;
-    bool bestIsLarger = false;
-    bool bestIsSystem = false;
-
-    const size_t count = GetIconCount();
-
-    const wxIconArray& iconArray = M_ICONBUNDLEDATA->m_icons;
-    for ( size_t i = 0; i < count; i++ )
-    {
-        const wxIcon& icon = iconArray[i];
-        if ( !icon.IsOk() )
-            continue;
-        wxCoord sx = icon.GetWidth(),
-                sy = icon.GetHeight();
-
-        // Exact match ends search immediately in any case.
-        if ( sx == sizeX && sy == sizeY )
-        {
-            iconBest = icon;
-            break;
-        }
-
-        if ( flags & FALLBACK_SYSTEM )
-        {
-            if ( sx == sysX && sy == sysY )
-            {
-                iconBest = icon;
-                bestIsSystem = true;
-                continue;
-            }
-        }
-
-        if ( !bestIsSystem && (flags & FALLBACK_NEAREST_LARGER) )
-        {
-            bool iconLarger = (sx >= sizeX) && (sy >= sizeY);
-            int iconDiff = abs(sx - sizeX) + abs(sy - sizeY);
-
-            // Use current icon as candidate for the best icon, if either:
-            // - we have no candidate yet
-            // - we have no candidate larger than desired size and current icon is
-            // - current icon is closer to desired size than candidate
-            if ( !iconBest.IsOk() ||
-                    (!bestIsLarger && iconLarger) ||
-                        (iconLarger && (iconDiff < bestDiff)) )
-            {
-                iconBest = icon;
-                bestIsLarger = iconLarger;
-                bestDiff = iconDiff;
-                continue;
-            }
-        }
-    }
-
-#if defined( __WXMAC__ ) && wxOSX_USE_CARBON
-    if (!iconBest.IsOk())
-        return wxNullIcon;
-
-    return wxIcon(iconBest.GetHICON(), size);
-#else
-    return iconBest;
-#endif
-}
-
-wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const
-{
-    return GetIcon(size, FALLBACK_NONE);
-}
-
-void wxIconBundle::AddIcon(const wxIcon& icon)
-{
-    wxCHECK_RET( icon.IsOk(), wxT("invalid icon") );
-
-    AllocExclusive();
-
-    wxIconArray& iconArray = M_ICONBUNDLEDATA->m_icons;
-
-    // replace existing icon with the same size if we already have it
-    const size_t count = iconArray.size();
-    for ( size_t i = 0; i < count; ++i )
-    {
-        wxIcon& tmp = iconArray[i];
-        if ( tmp.IsOk() &&
-                tmp.GetWidth() == icon.GetWidth() &&
-                tmp.GetHeight() == icon.GetHeight() )
-        {
-            tmp = icon;
-            return;
-        }
-    }
-
-    // if we don't, add an icon with new size
-    iconArray.Add(icon);
-}
-
-size_t wxIconBundle::GetIconCount() const
-{
-    return IsOk() ? M_ICONBUNDLEDATA->m_icons.size() : 0;
-}
-
-wxIcon wxIconBundle::GetIconByIndex(size_t n) const
-{
-    wxCHECK_MSG( n < GetIconCount(), wxNullIcon, wxT("invalid index") );
-
-    return M_ICONBUNDLEDATA->m_icons[n];
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/iconbndl.cpp
+// Purpose:     wxIconBundle
+// Author:      Mattia Barbon
+// Created:     23.03.2002
+// RCS-ID:      $Id: iconbndl.cpp 40654 2006-08-17 16:08:13Z VS $
+// Copyright:   (c) Mattia barbon
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/iconbndl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+    #include "wx/icon.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"
+#endif
+
+#include "wx/arrimpl.cpp"
+
+WX_DEFINE_OBJARRAY(wxIconArray)
+
+const wxIconBundle& wxIconBundle::operator =( const wxIconBundle& ic )
+{
+    if( this == &ic ) return *this;
+
+    size_t i, max = ic.m_icons.GetCount();
+
+    DeleteIcons();
+    for( i = 0; i < max; ++i )
+        m_icons.Add( ic.m_icons[i] );
+
+    return *this;
+}
+
+void wxIconBundle::DeleteIcons()
+{
+    m_icons.Empty();
+}
+
+#if wxUSE_IMAGE
+void wxIconBundle::AddIcon( const wxString& file, long type )
+#else
+void wxIconBundle::AddIcon( const wxString& WXUNUSED(file), long WXUNUSED(type) )
+#endif
+{
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
+    size_t count = wxImage::GetImageCount( file, type );
+    size_t i;
+    wxImage image;
+
+    for( i = 0; i < count; ++i )
+    {
+        if( !image.LoadFile( file, type, i ) )
+        {
+            wxLogError( _("Failed to load image %d from file '%s'."),
+                        i, file.c_str() );
+            continue;
+        }
+
+        wxIcon* tmp = new wxIcon();
+        tmp->CopyFromBitmap( wxBitmap( image ) );
+        AddIcon( *tmp );
+        delete tmp;
+    }
+#endif
+}
+
+const wxIcon& wxIconBundle::GetIcon( const wxSize& size ) const
+{
+    // temp. variable needed to fix Borland C++ 5.5.1 problem
+    // with passing a return value through two functions
+    wxIcon *tmp;
+
+    size_t max = m_icons.GetCount();
+
+    // if we have one or no icon, we can return now without doing more work:
+    if ( max <= 1 )
+    {
+        if ( max == 1 ) // fix for broken BCC
+            tmp = &m_icons[0];
+        else // max == 0
+            tmp = &wxNullIcon;
+        return *tmp;
+    }
+
+    // there are more icons, find the best match:
+    wxCoord sysX = wxSystemSettings::GetMetric( wxSYS_ICON_X ),
+            sysY = wxSystemSettings::GetMetric( wxSYS_ICON_Y );
+
+    wxIcon *sysIcon = 0;
+
+    for( size_t i = 0; i < max; i++ )
+    {
+        if( !m_icons[i].Ok() )
+            continue;
+        wxCoord sx = m_icons[i].GetWidth(), sy = m_icons[i].GetHeight();
+        // requested size
+        if( sx == size.x && sy == size.y )
+        {
+            tmp = &m_icons[i]; // fix for broken BCC
+            return *tmp;
+        }
+        // keep track if there is a system-size icon
+        if( sx == sysX && sy == sysY )
+            sysIcon = &m_icons[i];
+    }
+
+    // return the system-sized icon if we've got one
+    if( sysIcon ) return *sysIcon;
+    // we certainly have at least one icon thanks to the <=1 check above
+    tmp = &m_icons[0];
+    return *tmp;
+}
+
+void wxIconBundle::AddIcon( const wxIcon& icon )
+{
+    size_t i, max = m_icons.GetCount();
+
+    for( i = 0; i < max; ++i )
+    {
+        wxIcon& tmp = m_icons[i];
+        if( tmp.Ok() && tmp.GetWidth() == icon.GetWidth() &&
+            tmp.GetHeight() == icon.GetHeight() )
+        {
+            tmp = icon;
+            return;
+        }
+    }
+
+    m_icons.Add( icon );
+}
diff --git a/Source/3rd Party/wx/src/common/imagall.cpp b/Source/3rd Party/wx/src/common/imagall.cpp
index 5a0965aad..90e66ac95 100644
--- a/Source/3rd Party/wx/src/common/imagall.cpp	
+++ b/Source/3rd Party/wx/src/common/imagall.cpp	
@@ -1,64 +1,64 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagall.cpp
-// Purpose:     wxImage access all handler
-// Author:      Sylvain Bougnoux
-// RCS-ID:      $Id$
-// Copyright:   (c) Sylvain Bougnoux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE
-
-#ifndef WX_PRECOMP
-    #include "wx/image.h"
-#endif
-
-//-----------------------------------------------------------------------------
-// This function allows dynamic access to all image handlers compile within
-// the library. This function should be in a separate file as some compilers
-// link against the whole object file as long as just one of is function is called!
-
-void wxInitAllImageHandlers()
-{
-#if wxUSE_LIBPNG
-  wxImage::AddHandler( new wxPNGHandler );
-#endif
-#if wxUSE_LIBJPEG
-  wxImage::AddHandler( new wxJPEGHandler );
-#endif
-#if wxUSE_LIBTIFF
-  wxImage::AddHandler( new wxTIFFHandler );
-#endif
-#if wxUSE_GIF
-  wxImage::AddHandler( new wxGIFHandler );
-#endif
-#if wxUSE_PNM
-  wxImage::AddHandler( new wxPNMHandler );
-#endif
-#if wxUSE_PCX
-  wxImage::AddHandler( new wxPCXHandler );
-#endif
-#if wxUSE_IFF
-  wxImage::AddHandler( new wxIFFHandler );
-#endif
-#if wxUSE_ICO_CUR
-  wxImage::AddHandler( new wxICOHandler );
-  wxImage::AddHandler( new wxCURHandler );
-  wxImage::AddHandler( new wxANIHandler );
-#endif
-#if wxUSE_TGA
-  wxImage::AddHandler( new wxTGAHandler );
-#endif
-#if wxUSE_XPM
-  wxImage::AddHandler( new wxXPMHandler );
-#endif
-}
-
-#endif // wxUSE_IMAGE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagall.cpp
+// Purpose:     wxImage access all handler
+// Author:      Sylvain Bougnoux
+// RCS-ID:      $Id: imagall.cpp 42644 2006-10-29 18:58:25Z VZ $
+// Copyright:   (c) Sylvain Bougnoux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE
+
+#ifndef WX_PRECOMP
+    #include "wx/image.h"
+#endif
+
+//-----------------------------------------------------------------------------
+// This function allows dynamic access to all image handlers compile within
+// the library. This function should be in a separate file as some compilers
+// link against the whole object file as long as just one of is function is called!
+
+void wxInitAllImageHandlers()
+{
+#if wxUSE_LIBPNG
+  wxImage::AddHandler( new wxPNGHandler );
+#endif
+#if wxUSE_LIBJPEG
+  wxImage::AddHandler( new wxJPEGHandler );
+#endif
+#if wxUSE_LIBTIFF
+  wxImage::AddHandler( new wxTIFFHandler );
+#endif
+#if wxUSE_GIF
+  wxImage::AddHandler( new wxGIFHandler );
+#endif
+#if wxUSE_PNM
+  wxImage::AddHandler( new wxPNMHandler );
+#endif
+#if wxUSE_PCX
+  wxImage::AddHandler( new wxPCXHandler );
+#endif
+#if wxUSE_IFF
+  wxImage::AddHandler( new wxIFFHandler );
+#endif
+#if wxUSE_ICO_CUR
+  wxImage::AddHandler( new wxICOHandler );
+  wxImage::AddHandler( new wxCURHandler );
+  wxImage::AddHandler( new wxANIHandler );
+#endif
+#if wxUSE_TGA
+  wxImage::AddHandler( new wxTGAHandler );
+#endif
+#if wxUSE_XPM
+  wxImage::AddHandler( new wxXPMHandler );
+#endif
+}
+
+#endif // wxUSE_IMAGE
diff --git a/Source/3rd Party/wx/src/common/imagbmp.cpp b/Source/3rd Party/wx/src/common/imagbmp.cpp
index b51d4c1cc..d0930f464 100644
--- a/Source/3rd Party/wx/src/common/imagbmp.cpp	
+++ b/Source/3rd Party/wx/src/common/imagbmp.cpp	
@@ -1,1544 +1,1383 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagbmp.cpp
-// Purpose:     wxImage BMP,ICO and CUR handlers
-// Author:      Robert Roebling, Chris Elliott
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling, Chris Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE
-
-#include "wx/imagbmp.h"
-
-#ifndef WX_PRECOMP
-    #ifdef __WXMSW__
-        #include "wx/msw/wrapwin.h"
-    #endif
-    #include "wx/log.h"
-    #include "wx/app.h"
-    #include "wx/bitmap.h"
-    #include "wx/palette.h"
-    #include "wx/intl.h"
-    #include "wx/math.h"
-#endif
-
-#include "wx/filefn.h"
-#include "wx/wfstream.h"
-#include "wx/quantize.h"
-#include "wx/scopeguard.h"
-#include "wx/anidecod.h"
-
-// For memcpy
-#include <string.h>
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-#if wxUSE_ICO_CUR
-
-static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType);
-
-#endif // wxUSE_ICO_CUR
-
-//-----------------------------------------------------------------------------
-// wxBMPHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
-
-#if wxUSE_STREAMS
-
-#ifndef BI_RGB
-    #define BI_RGB       0
-#endif
-
-#ifndef BI_RLE8
-#define BI_RLE8      1
-#endif
-
-#ifndef BI_RLE4
-#define BI_RLE4      2
-#endif
-
-#ifndef BI_BITFIELDS
-#define BI_BITFIELDS 3
-#endif
-
-#define poffset (line * width * 3 + column * 3)
-
-bool wxBMPHandler::SaveFile(wxImage *image,
-                            wxOutputStream& stream,
-                            bool verbose)
-{
-    return SaveDib(image, stream, verbose, true/*IsBmp*/, false/*IsMask*/);
-}
-
-bool wxBMPHandler::SaveDib(wxImage *image,
-                           wxOutputStream& stream,
-                           bool verbose,
-                           bool IsBmp,
-                           bool IsMask)
-
-{
-    wxCHECK_MSG( image, false, wxT("invalid pointer in wxBMPHandler::SaveFile") );
-
-    if ( !image->IsOk() )
-    {
-        if ( verbose )
-        {
-            wxLogError(_("BMP: Couldn't save invalid image."));
-        }
-        return false;
-    }
-
-    // get the format of the BMP file to save, else use 24bpp
-    unsigned format = wxBMP_24BPP;
-    if ( image->HasOption(wxIMAGE_OPTION_BMP_FORMAT) )
-        format = image->GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT);
-
-    wxUint16 bpp;     // # of bits per pixel
-    int palette_size; // # of color map entries, ie. 2^bpp colors
-
-    // set the bpp and appropriate palette_size, and do additional checks
-    if ( (format == wxBMP_1BPP) || (format == wxBMP_1BPP_BW) )
-    {
-        bpp = 1;
-        palette_size = 2;
-    }
-    else if ( format == wxBMP_4BPP )
-    {
-        bpp = 4;
-        palette_size = 16;
-    }
-    else if ( (format == wxBMP_8BPP) || (format == wxBMP_8BPP_GREY) ||
-              (format == wxBMP_8BPP_RED) || (format == wxBMP_8BPP_PALETTE) )
-    {
-        // need to set a wxPalette to use this, HOW TO CHECK IF VALID, SIZE?
-        if ((format == wxBMP_8BPP_PALETTE)
-#if wxUSE_PALETTE
-                && !image->HasPalette()
-#endif // wxUSE_PALETTE
-            )
-        {
-            if ( verbose )
-            {
-                wxLogError(_("BMP: wxImage doesn't have own wxPalette."));
-            }
-            return false;
-        }
-        bpp = 8;
-        palette_size = 256;
-    }
-    else  // you get 24bpp
-    {
-        format = wxBMP_24BPP;
-        bpp = 24;
-        palette_size = 0;
-    }
-
-    unsigned width = image->GetWidth();
-    unsigned row_padding = (4 - ((width * bpp + 7) / 8) % 4) % 4; // # bytes to pad to dword
-    unsigned row_width = (width * bpp + 7) / 8 + row_padding; // # of bytes per row
-
-    struct
-    {
-        // BitmapHeader:
-        wxUint16  magic;          // format magic, always 'BM'
-        wxUint32  filesize;       // total file size, inc. headers
-        wxUint32  reserved;       // for future use
-        wxUint32  data_offset;    // image data offset in the file
-
-        // BitmapInfoHeader:
-        wxUint32  bih_size;       // 2nd part's size
-        wxUint32  width, height;  // bitmap's dimensions
-        wxUint16  planes;         // num of planes
-        wxUint16  bpp;            // bits per pixel
-        wxUint32  compression;    // compression method
-        wxUint32  size_of_bmp;    // size of the bitmap
-        wxUint32  h_res, v_res;   // image resolution in pixels-per-meter
-        wxUint32  num_clrs;       // number of colors used
-        wxUint32  num_signif_clrs;// number of significant colors
-    } hdr;
-
-    wxUint32 hdr_size = 14/*BitmapHeader*/ + 40/*BitmapInfoHeader*/;
-
-    hdr.magic = wxUINT16_SWAP_ON_BE(0x4D42/*'BM'*/);
-    hdr.filesize = wxUINT32_SWAP_ON_BE( hdr_size + palette_size*4 +
-                                        row_width * image->GetHeight() );
-    hdr.reserved = 0;
-    hdr.data_offset = wxUINT32_SWAP_ON_BE(hdr_size + palette_size*4);
-
-    hdr.bih_size = wxUINT32_SWAP_ON_BE(hdr_size - 14);
-    hdr.width = wxUINT32_SWAP_ON_BE(image->GetWidth());
-    if ( IsBmp )
-    {
-        hdr.height = wxUINT32_SWAP_ON_BE(image->GetHeight());
-    }
-    else
-    {
-        hdr.height = wxUINT32_SWAP_ON_BE(2 * image->GetHeight());
-    }
-    hdr.planes = wxUINT16_SWAP_ON_BE(1); // always 1 plane
-    hdr.bpp = wxUINT16_SWAP_ON_BE(bpp);
-    hdr.compression = 0; // RGB uncompressed
-    hdr.size_of_bmp = wxUINT32_SWAP_ON_BE(row_width * image->GetHeight());
-
-    // get the resolution from the image options  or fall back to 72dpi standard
-    // for the BMP format if not specified
-    int hres, vres;
-    switch ( GetResolutionFromOptions(*image, &hres, &vres) )
-    {
-        default:
-            wxFAIL_MSG( wxT("unexpected image resolution units") );
-            // fall through
-
-        case wxIMAGE_RESOLUTION_NONE:
-            hres =
-            vres = 72;
-            // fall through to convert it to correct units
-
-        case wxIMAGE_RESOLUTION_INCHES:
-            // convert resolution in inches to resolution in centimeters
-            hres = (int)(10*mm2inches*hres);
-            vres = (int)(10*mm2inches*vres);
-            // fall through to convert it to resolution in meters
-
-        case wxIMAGE_RESOLUTION_CM:
-            // convert resolution in centimeters to resolution in meters
-            hres *= 100;
-            vres *= 100;
-            break;
-    }
-
-    hdr.h_res = wxUINT32_SWAP_ON_BE(hres);
-    hdr.v_res = wxUINT32_SWAP_ON_BE(vres);
-    hdr.num_clrs = wxUINT32_SWAP_ON_BE(palette_size); // # colors in colormap
-    hdr.num_signif_clrs = 0;     // all colors are significant
-
-    if ( IsBmp )
-    {
-        if (// VS: looks ugly but compilers tend to do ugly things with structs,
-            //     like aligning hdr.filesize's ofset to dword :(
-            // VZ: we should add padding then...
-            !stream.Write(&hdr.magic, 2) ||
-            !stream.Write(&hdr.filesize, 4) ||
-            !stream.Write(&hdr.reserved, 4) ||
-            !stream.Write(&hdr.data_offset, 4)
-           )
-        {
-            if (verbose)
-            {
-                wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));
-                }
-            return false;
-        }
-    }
-    if ( !IsMask )
-    {
-        if (
-            !stream.Write(&hdr.bih_size, 4) ||
-            !stream.Write(&hdr.width, 4) ||
-            !stream.Write(&hdr.height, 4) ||
-            !stream.Write(&hdr.planes, 2) ||
-            !stream.Write(&hdr.bpp, 2) ||
-            !stream.Write(&hdr.compression, 4) ||
-            !stream.Write(&hdr.size_of_bmp, 4) ||
-            !stream.Write(&hdr.h_res, 4) ||
-            !stream.Write(&hdr.v_res, 4) ||
-            !stream.Write(&hdr.num_clrs, 4) ||
-            !stream.Write(&hdr.num_signif_clrs, 4)
-           )
-        {
-            if (verbose)
-            {
-                wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));
-            }
-            return false;
-        }
-    }
-
-    wxPalette *palette = NULL; // entries for quantized images
-    wxUint8 *rgbquad = NULL;   // for the RGBQUAD bytes for the colormap
-    wxImage *q_image = NULL;   // destination for quantized image
-
-    // if <24bpp use quantization to reduce colors for *some* of the formats
-    if ( (format == wxBMP_1BPP) || (format == wxBMP_4BPP) ||
-         (format == wxBMP_8BPP) || (format == wxBMP_8BPP_PALETTE) )
-    {
-        // make a new palette and quantize the image
-        if (format != wxBMP_8BPP_PALETTE)
-        {
-            q_image = new wxImage();
-
-            // I get a delete error using Quantize when desired colors > 236
-            int quantize = ((palette_size > 236) ? 236 : palette_size);
-            // fill the destination too, it gives much nicer 4bpp images
-            wxQuantize::Quantize( *image, *q_image, &palette, quantize, 0,
-                                  wxQUANTIZE_FILL_DESTINATION_IMAGE );
-        }
-        else
-        {
-#if wxUSE_PALETTE
-            palette = new wxPalette(image->GetPalette());
-#endif // wxUSE_PALETTE
-        }
-
-        int i;
-        unsigned char r, g, b;
-        rgbquad = new wxUint8 [palette_size*4];
-
-        for (i = 0; i < palette_size; i++)
-        {
-#if wxUSE_PALETTE
-            if ( !palette->GetRGB(i, &r, &g, &b) )
-#endif // wxUSE_PALETTE
-                r = g = b = 0;
-
-            rgbquad[i*4] = b;
-            rgbquad[i*4+1] = g;
-            rgbquad[i*4+2] = r;
-            rgbquad[i*4+3] = 0;
-        }
-    }
-    // make a 256 entry greyscale colormap or 2 entry black & white
-    else if ( (format == wxBMP_8BPP_GREY) || (format == wxBMP_8BPP_RED) ||
-              (format == wxBMP_1BPP_BW) )
-    {
-        rgbquad = new wxUint8 [palette_size*4];
-
-        for ( int i = 0; i < palette_size; i++ )
-        {
-            // if 1BPP_BW then the value should be either 0 or 255
-            wxUint8 c = (wxUint8)((i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i);
-
-            rgbquad[i*4] =
-            rgbquad[i*4+1] =
-            rgbquad[i*4+2] = c;
-            rgbquad[i*4+3] = 0;
-        }
-    }
-
-    // if the colormap was made, then it needs to be written
-    if (rgbquad)
-    {
-        if ( !IsMask )
-        {
-            if ( !stream.Write(rgbquad, palette_size*4) )
-            {
-                if (verbose)
-                {
-                    wxLogError(_("BMP: Couldn't write RGB color map."));
-                }
-                delete[] rgbquad;
-#if wxUSE_PALETTE
-                delete palette;
-#endif // wxUSE_PALETTE
-                delete q_image;
-                return false;
-            }
-            }
-        delete []rgbquad;
-    }
-
-    // pointer to the image data, use quantized if available
-    wxUint8 *data = (wxUint8*) image->GetData();
-    if (q_image) if (q_image->IsOk()) data = (wxUint8*) q_image->GetData();
-
-    wxUint8 *buffer = new wxUint8[row_width];
-    memset(buffer, 0, row_width);
-    int y; unsigned x;
-    long int pixel;
-
-    for (y = image->GetHeight() -1; y >= 0; y--)
-    {
-        if ( format == wxBMP_24BPP ) // 3 bytes per pixel red,green,blue
-        {
-            for ( x = 0; x < width; x++ )
-            {
-                pixel = 3*(y*width + x);
-
-                buffer[3*x    ] = data[pixel+2];
-                buffer[3*x + 1] = data[pixel+1];
-                buffer[3*x + 2] = data[pixel];
-            }
-        }
-        else if ((format == wxBMP_8BPP) ||       // 1 byte per pixel in color
-                 (format == wxBMP_8BPP_PALETTE))
-        {
-            for (x = 0; x < width; x++)
-            {
-                pixel = 3*(y*width + x);
-#if wxUSE_PALETTE
-                buffer[x] = (wxUint8)palette->GetPixel( data[pixel],
-                                                        data[pixel+1],
-                                                        data[pixel+2] );
-#else
-                // FIXME: what should this be? use some std palette maybe?
-                buffer[x] = 0;
-#endif // wxUSE_PALETTE
-            }
-        }
-        else if ( format == wxBMP_8BPP_GREY ) // 1 byte per pix, rgb ave to grey
-        {
-            for (x = 0; x < width; x++)
-            {
-                pixel = 3*(y*width + x);
-                buffer[x] = (wxUint8)(.299*data[pixel] +
-                                      .587*data[pixel+1] +
-                                      .114*data[pixel+2]);
-            }
-        }
-        else if ( format == wxBMP_8BPP_RED ) // 1 byte per pixel, red as greys
-        {
-            for (x = 0; x < width; x++)
-            {
-                buffer[x] = (wxUint8)data[3*(y*width + x)];
-            }
-        }
-        else if ( format == wxBMP_4BPP ) // 4 bpp in color
-        {
-            for (x = 0; x < width; x+=2)
-            {
-                pixel = 3*(y*width + x);
-
-                // fill buffer, ignore if > width
-#if wxUSE_PALETTE
-                buffer[x/2] = (wxUint8)(
-                    ((wxUint8)palette->GetPixel(data[pixel],
-                                                data[pixel+1],
-                                                data[pixel+2]) << 4) |
-                    (((x+1) > width)
-                     ? 0
-                     : ((wxUint8)palette->GetPixel(data[pixel+3],
-                                                   data[pixel+4],
-                                                   data[pixel+5]) ))    );
-#else
-                // FIXME: what should this be? use some std palette maybe?
-                buffer[x/2] = 0;
-#endif // wxUSE_PALETTE
-            }
-        }
-        else if ( format == wxBMP_1BPP ) // 1 bpp in "color"
-        {
-            for (x = 0; x < width; x+=8)
-            {
-                pixel = 3*(y*width + x);
-
-#if wxUSE_PALETTE
-                buffer[x/8] = (wxUint8)(
-                                           ((wxUint8)palette->GetPixel(data[pixel], data[pixel+1], data[pixel+2]) << 7) |
-                    (((x+1) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+3], data[pixel+4], data[pixel+5]) << 6)) |
-                    (((x+2) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+6], data[pixel+7], data[pixel+8]) << 5)) |
-                    (((x+3) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+9], data[pixel+10], data[pixel+11]) << 4)) |
-                    (((x+4) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+12], data[pixel+13], data[pixel+14]) << 3)) |
-                    (((x+5) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+15], data[pixel+16], data[pixel+17]) << 2)) |
-                    (((x+6) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+18], data[pixel+19], data[pixel+20]) << 1)) |
-                    (((x+7) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+21], data[pixel+22], data[pixel+23])     ))    );
-#else
-                // FIXME: what should this be? use some std palette maybe?
-                buffer[x/8] = 0;
-#endif // wxUSE_PALETTE
-            }
-        }
-        else if ( format == wxBMP_1BPP_BW ) // 1 bpp B&W colormap from red color ONLY
-        {
-            for (x = 0; x < width; x+=8)
-            {
-                pixel = 3*(y*width + x);
-
-                buffer[x/8] = (wxUint8)(
-                                          (((wxUint8)(data[pixel]   /128.)) << 7) |
-                   (((x+1) > width) ? 0 : (((wxUint8)(data[pixel+3] /128.)) << 6)) |
-                   (((x+2) > width) ? 0 : (((wxUint8)(data[pixel+6] /128.)) << 5)) |
-                   (((x+3) > width) ? 0 : (((wxUint8)(data[pixel+9] /128.)) << 4)) |
-                   (((x+4) > width) ? 0 : (((wxUint8)(data[pixel+12]/128.)) << 3)) |
-                   (((x+5) > width) ? 0 : (((wxUint8)(data[pixel+15]/128.)) << 2)) |
-                   (((x+6) > width) ? 0 : (((wxUint8)(data[pixel+18]/128.)) << 1)) |
-                   (((x+7) > width) ? 0 : (((wxUint8)(data[pixel+21]/128.))     ))    );
-            }
-        }
-
-        if ( !stream.Write(buffer, row_width) )
-        {
-            if (verbose)
-            {
-                wxLogError(_("BMP: Couldn't write data."));
-            }
-            delete[] buffer;
-#if wxUSE_PALETTE
-            delete palette;
-#endif // wxUSE_PALETTE
-            delete q_image;
-            return false;
-        }
-    }
-    delete[] buffer;
-#if wxUSE_PALETTE
-    delete palette;
-#endif // wxUSE_PALETTE
-    delete q_image;
-
-    return true;
-}
-
-
-struct BMPPalette
-{
-    static void Free(BMPPalette* pal) { delete [] pal; }
-
-    unsigned char r, g, b;
-};
-
-bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
-                             int bpp, int ncolors, int comp,
-                             wxFileOffset bmpOffset, wxInputStream& stream,
-                             bool verbose, bool IsBmp, bool hasPalette)
-{
-    wxInt32         aDword, rmask = 0, gmask = 0, bmask = 0, amask = 0;
-    int             rshift = 0, gshift = 0, bshift = 0, ashift = 0;
-    int             rbits = 0, gbits = 0, bbits = 0;
-    wxInt32         dbuf[4];
-    wxInt8          bbuf[4];
-    wxUint8         aByte;
-    wxUint16        aWord;
-
-    // allocate space for palette if needed:
-    BMPPalette *cmap;
-
-    if ( bpp < 16 )
-    {
-        cmap = new BMPPalette[ncolors];
-        if ( !cmap )
-        {
-            if (verbose)
-            {
-                wxLogError(_("BMP: Couldn't allocate memory."));
-            }
-            return false;
-        }
-    }
-    else // no palette
-    {
-        cmap = NULL;
-    }
-
-    wxON_BLOCK_EXIT1(&BMPPalette::Free, cmap);
-
-    bool isUpsideDown = true;
-
-    if (height < 0)
-    {
-        isUpsideDown = false;
-        height = -height;
-    }
-
-    // destroy existing here instead of:
-    image->Destroy();
-    image->Create(width, height);
-
-    unsigned char *ptr = image->GetData();
-
-    if ( !ptr )
-    {
-        if ( verbose )
-        {
-            wxLogError( _("BMP: Couldn't allocate memory.") );
-        }
-        return false;
-    }
-
-    unsigned char *alpha;
-    if ( bpp == 32 )
-    {
-        // tell the image to allocate an alpha buffer
-        image->SetAlpha();
-        alpha = image->GetAlpha();
-        if ( !alpha )
-        {
-            if ( verbose )
-            {
-                wxLogError(_("BMP: Couldn't allocate memory."));
-            }
-            return false;
-        }
-    }
-    else // no alpha
-    {
-        alpha = NULL;
-    }
-
-    // Reading the palette, if it exists:
-    if ( bpp < 16 && ncolors != 0 )
-    {
-        unsigned char* r = new unsigned char[ncolors];
-        unsigned char* g = new unsigned char[ncolors];
-        unsigned char* b = new unsigned char[ncolors];
-        for (int j = 0; j < ncolors; j++)
-        {
-            if (hasPalette)
-            {
-                stream.Read(bbuf, 4);
-                cmap[j].b = bbuf[0];
-                cmap[j].g = bbuf[1];
-                cmap[j].r = bbuf[2];
-
-                r[j] = cmap[j].r;
-                g[j] = cmap[j].g;
-                b[j] = cmap[j].b;
-            }
-            else
-            {
-                //used in reading .ico file mask
-                r[j] = cmap[j].r =
-                g[j] = cmap[j].g =
-                b[j] = cmap[j].b = ( j ? 255 : 0 );
-            }
-        }
-
-#if wxUSE_PALETTE
-        // Set the palette for the wxImage
-        image->SetPalette(wxPalette(ncolors, r, g, b));
-#endif // wxUSE_PALETTE
-
-        delete[] r;
-        delete[] g;
-        delete[] b;
-    }
-    else if ( bpp == 16 || bpp == 32 )
-    {
-        if ( comp == BI_BITFIELDS )
-        {
-            int bit;
-            stream.Read(dbuf, 4 * 3);
-            rmask = wxINT32_SWAP_ON_BE(dbuf[0]);
-            gmask = wxINT32_SWAP_ON_BE(dbuf[1]);
-            bmask = wxINT32_SWAP_ON_BE(dbuf[2]);
-            // find shift amount (Least significant bit of mask)
-            for (bit = bpp-1; bit>=0; bit--)
-            {
-                if (bmask & (1 << bit))
-                    bshift = bit;
-                if (gmask & (1 << bit))
-                    gshift = bit;
-                if (rmask & (1 << bit))
-                    rshift = bit;
-            }
-            // Find number of bits in mask (MSB-LSB+1)
-            for (bit = 0; bit < bpp; bit++)
-            {
-                if (bmask & (1 << bit))
-                    bbits = bit-bshift+1;
-                if (gmask & (1 << bit))
-                    gbits = bit-gshift+1;
-                if (rmask & (1 << bit))
-                    rbits = bit-rshift+1;
-            }
-        }
-        else if ( bpp == 16 )
-        {
-            rmask = 0x7C00;
-            gmask = 0x03E0;
-            bmask = 0x001F;
-            rshift = 10;
-            gshift = 5;
-            bshift = 0;
-            rbits = 5;
-            gbits = 5;
-            bbits = 5;
-        }
-        else if ( bpp == 32 )
-        {
-            rmask = 0x00FF0000;
-            gmask = 0x0000FF00;
-            bmask = 0x000000FF;
-            amask = 0xFF000000;
-
-            ashift = 24;
-            rshift = 16;
-            gshift = 8;
-            bshift = 0;
-            rbits = 8;
-            gbits = 8;
-            bbits = 8;
-        }
-    }
-
-    /*
-     * Reading the image data
-     */
-    if ( IsBmp )
-    {
-        // NOTE: seeking a positive amount in wxFromCurrent mode allows us to
-        //       load even non-seekable streams (see wxInputStream::SeekI docs)!
-        const wxFileOffset pos = stream.TellI();
-        if (pos != wxInvalidOffset && bmpOffset > pos)
-            if (stream.SeekI(bmpOffset - pos, wxFromCurrent) == wxInvalidOffset)
-                return false;
-        //else: icon, just carry on
-    }
-
-    unsigned char *data = ptr;
-
-    /* set the whole image to the background color */
-    if ( bpp < 16 && (comp == BI_RLE4 || comp == BI_RLE8) )
-    {
-        for (int i = 0; i < width * height; i++)
-        {
-            *ptr++ = cmap[0].r;
-            *ptr++ = cmap[0].g;
-            *ptr++ = cmap[0].b;
-        }
-        ptr = data;
-    }
-
-    int linesize = ((width * bpp + 31) / 32) * 4;
-
-    // flag indicating if we have any not fully transparent alpha values: this
-    // is used to account for the bitmaps which use 32bpp format (normally
-    // meaning that they have alpha channel) but have only zeroes in it so that
-    // without this hack they appear fully transparent -- and as this is
-    // unlikely intentional, we consider that they don't have alpha at all in
-    // this case (see #10915)
-    bool hasValidAlpha = false;
-
-    for ( int row = 0; row < height; row++ )
-    {
-        int line = isUpsideDown ? height - 1 - row : row;
-
-        int linepos = 0;
-        for ( int column = 0; column < width ; )
-        {
-            if ( bpp < 16 )
-            {
-                linepos++;
-                aByte = stream.GetC();
-                if ( bpp == 1 )
-                {
-                    for (int bit = 0; bit < 8 && column < width; bit++)
-                    {
-                        int index = ((aByte & (0x80 >> bit)) ? 1 : 0);
-                        ptr[poffset] = cmap[index].r;
-                        ptr[poffset + 1] = cmap[index].g;
-                        ptr[poffset + 2] = cmap[index].b;
-                        column++;
-                    }
-                }
-                else if ( bpp == 4 )
-                {
-                    if ( comp == BI_RLE4 )
-                    {
-                        wxUint8 first;
-                        first = aByte;
-                        aByte = stream.GetC();
-                        if ( first == 0 )
-                        {
-                            if ( aByte == 0 )
-                            {
-                                // end of scanline marker
-                                column = width;
-                                row--;
-                            }
-                            else if ( aByte == 1 )
-                            {
-                                // end of RLE data marker, stop decoding
-                                column = width;
-                                row = height;
-                            }
-                            else if ( aByte == 2 )
-                            {
-                                // delta marker, move in image
-                                aByte = stream.GetC();
-                                column += aByte;
-                                linepos = column * bpp / 4;
-                                aByte = stream.GetC();
-                                row += aByte; // upside down
-                            }
-                            else
-                            {
-                                int absolute = aByte;
-                                wxUint8 nibble[2] ;
-                                int readBytes = 0 ;
-                                for (int k = 0; k < absolute; k++)
-                                {
-                                    if ( !(k % 2 ) )
-                                    {
-                                        ++readBytes ;
-                                        aByte = stream.GetC();
-                                        nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ;
-                                        nibble[1] = (wxUint8)( aByte & 0x0F ) ;
-                                    }
-                                    ptr[poffset    ] = cmap[nibble[k%2]].r;
-                                    ptr[poffset + 1] = cmap[nibble[k%2]].g;
-                                    ptr[poffset + 2] = cmap[nibble[k%2]].b;
-                                    column++;
-                                    if ( k % 2 )
-                                        linepos++;
-                                }
-                                if ( readBytes & 0x01 )
-                                    aByte = stream.GetC();
-                            }
-                        }
-                        else
-                        {
-                            wxUint8 nibble[2] ;
-                            nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ;
-                            nibble[1] = (wxUint8)( aByte & 0x0F ) ;
-
-                            for ( int l = 0; l < first && column < width; l++ )
-                            {
-                                ptr[poffset    ] = cmap[nibble[l%2]].r;
-                                ptr[poffset + 1] = cmap[nibble[l%2]].g;
-                                ptr[poffset + 2] = cmap[nibble[l%2]].b;
-                                column++;
-                                if ( l % 2 )
-                                    linepos++;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        for (int nibble = 0; nibble < 2 && column < width; nibble++)
-                        {
-                            int index = ((aByte & (0xF0 >> (nibble * 4))) >> (!nibble * 4));
-                            if ( index >= 16 )
-                                index = 15;
-                            ptr[poffset] = cmap[index].r;
-                            ptr[poffset + 1] = cmap[index].g;
-                            ptr[poffset + 2] = cmap[index].b;
-                            column++;
-                        }
-                    }
-                }
-                else if ( bpp == 8 )
-                {
-                    if ( comp == BI_RLE8 )
-                    {
-                        unsigned char first;
-                        first = aByte;
-                        aByte = stream.GetC();
-                        if ( first == 0 )
-                        {
-                            if ( aByte == 0 )
-                            {
-                                // end of scanline marker
-                                column = width;
-                                row--;
-                            }
-                            else if ( aByte == 1 )
-                            {
-                                // end of RLE data marker, stop decoding
-                                column = width;
-                                row = height;
-                            }
-                            else if ( aByte == 2 )
-                            {
-                                // delta marker, move in image
-                                aByte = stream.GetC();
-                                column += aByte;
-                                linepos = column * bpp / 8;
-                                aByte = stream.GetC();
-                                row -= aByte;
-                            }
-                            else
-                            {
-                                int absolute = aByte;
-                                for (int k = 0; k < absolute; k++)
-                                {
-                                    linepos++;
-                                    aByte = stream.GetC();
-                                    ptr[poffset    ] = cmap[aByte].r;
-                                    ptr[poffset + 1] = cmap[aByte].g;
-                                    ptr[poffset + 2] = cmap[aByte].b;
-                                    column++;
-                                }
-                                if ( absolute & 0x01 )
-                                    aByte = stream.GetC();
-                            }
-                        }
-                        else
-                        {
-                            for ( int l = 0; l < first && column < width; l++ )
-                            {
-                                ptr[poffset    ] = cmap[aByte].r;
-                                ptr[poffset + 1] = cmap[aByte].g;
-                                ptr[poffset + 2] = cmap[aByte].b;
-                                column++;
-                                linepos++;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        ptr[poffset    ] = cmap[aByte].r;
-                        ptr[poffset + 1] = cmap[aByte].g;
-                        ptr[poffset + 2] = cmap[aByte].b;
-                        column++;
-                        // linepos += size;    seems to be wrong, RR
-                    }
-                }
-            }
-            else if ( bpp == 24 )
-            {
-                stream.Read(bbuf, 3);
-                linepos += 3;
-                ptr[poffset    ] = (unsigned char)bbuf[2];
-                ptr[poffset + 1] = (unsigned char)bbuf[1];
-                ptr[poffset + 2] = (unsigned char)bbuf[0];
-                column++;
-            }
-            else if ( bpp == 16 )
-            {
-                unsigned char temp;
-                stream.Read(&aWord, 2);
-                aWord = wxUINT16_SWAP_ON_BE(aWord);
-                linepos += 2;
-                /* Use the masks and calculated amount of shift
-                   to retrieve the color data out of the word.  Then
-                   shift it left by (8 - number of bits) such that
-                   the image has the proper dynamic range */
-                temp = (unsigned char)(((aWord & rmask) >> rshift) << (8-rbits));
-                ptr[poffset] = temp;
-                temp = (unsigned char)(((aWord & gmask) >> gshift) << (8-gbits));
-                ptr[poffset + 1] = temp;
-                temp = (unsigned char)(((aWord & bmask) >> bshift) << (8-bbits));
-                ptr[poffset + 2] = temp;
-                column++;
-            }
-            else
-            {
-                unsigned char temp;
-                stream.Read(&aDword, 4);
-                aDword = wxINT32_SWAP_ON_BE(aDword);
-                linepos += 4;
-                temp = (unsigned char)((aDword & rmask) >> rshift);
-                ptr[poffset] = temp;
-                temp = (unsigned char)((aDword & gmask) >> gshift);
-                ptr[poffset + 1] = temp;
-                temp = (unsigned char)((aDword & bmask) >> bshift);
-                ptr[poffset + 2] = temp;
-                if ( alpha )
-                {
-                    temp = (unsigned char)((aDword & amask) >> ashift);
-                    alpha[line * width + column] = temp;
-
-                    if ( temp != wxALPHA_TRANSPARENT )
-                        hasValidAlpha = true;
-                }
-                column++;
-            }
-        }
-        while ( (linepos < linesize) && (comp != 1) && (comp != 2) )
-        {
-            stream.Read(&aByte, 1);
-            linepos += 1;
-            if ( !stream )
-                break;
-        }
-    }
-
-    image->SetMask(false);
-
-    // check if we had any valid alpha values in this bitmap
-    if ( alpha && !hasValidAlpha )
-    {
-        // we didn't, so finally discard the alpha channel completely
-        image->ClearAlpha();
-    }
-
-    const wxStreamError err = stream.GetLastError();
-    return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
-}
-
-bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
-                           bool verbose, bool IsBmp)
-{
-    wxUint16        aWord;
-    wxInt32         dbuf[4];
-    wxInt8          bbuf[4];
-
-    if ( IsBmp )
-    {
-        // read the header off the .BMP format file
-        stream.Read(bbuf, 2);
-        stream.Read(dbuf, 16);
-    }
-    else
-    {
-        stream.Read(dbuf, 4);
-    }
-    #if 0 // unused
-        wxInt32 size = wxINT32_SWAP_ON_BE(dbuf[0]);
-    #endif
-    wxFileOffset offset = wxINT32_SWAP_ON_BE(dbuf[2]);
-
-    stream.Read(dbuf, 4 * 2);
-    int width = wxINT32_SWAP_ON_BE((int)dbuf[0]);
-    int height = wxINT32_SWAP_ON_BE((int)dbuf[1]);
-    if ( !IsBmp)height = height  / 2; // for icons divide by 2
-
-    if ( width > 32767 )
-    {
-        if (verbose)
-        {
-            wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );
-        }
-        return false;
-    }
-    if ( height > 32767 )
-    {
-        if (verbose)
-        {
-            wxLogError( _("DIB Header: Image height > 32767 pixels for file.") );
-        }
-        return false;
-    }
-
-    stream.Read(&aWord, 2);
-    /*
-            TODO
-            int planes = (int)wxUINT16_SWAP_ON_BE( aWord );
-        */
-    stream.Read(&aWord, 2);
-    int bpp = wxUINT16_SWAP_ON_BE((int)aWord);
-    if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
-    {
-        if (verbose)
-        {
-            wxLogError( _("DIB Header: Unknown bitdepth in file.") );
-        }
-        return false;
-    }
-
-    stream.Read(dbuf, 4 * 4);
-    int comp = wxINT32_SWAP_ON_BE((int)dbuf[0]);
-    if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&
-         comp != BI_BITFIELDS )
-    {
-        if (verbose)
-        {
-            wxLogError( _("DIB Header: Unknown encoding in file.") );
-        }
-        return false;
-    }
-
-    stream.Read(dbuf, 4 * 2);
-
-    int ncolors = wxINT32_SWAP_ON_BE( (int)dbuf[0] );
-    if (ncolors == 0)
-        ncolors = 1 << bpp;
-    /* some more sanity checks */
-    if (((comp == BI_RLE4) && (bpp != 4)) ||
-        ((comp == BI_RLE8) && (bpp != 8)) ||
-        ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
-    {
-        if (verbose)
-        {
-            wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") );
-        }
-        return false;
-    }
-
-    //read DIB; this is the BMP image or the XOR part of an icon image
-    if ( !DoLoadDib(image, width, height, bpp, ncolors, comp, offset, stream,
-                    verbose, IsBmp, true) )
-    {
-        if (verbose)
-        {
-            wxLogError( _("Error in reading image DIB.") );
-        }
-        return false;
-    }
-
-    if ( !IsBmp )
-    {
-        //read Icon mask which is monochrome
-        //there is no palette, so we will create one
-        wxImage mask;
-        if ( !DoLoadDib(&mask, width, height, 1, 2, BI_RGB, offset, stream,
-                        verbose, IsBmp, false) )
-        {
-            if (verbose)
-            {
-                wxLogError( _("ICO: Error in reading mask DIB.") );
-            }
-            return false;
-        }
-        image->SetMaskFromImage(mask, 255, 255, 255);
-
-    }
-
-    // the resolution in the bitmap header is in meters, convert to centimeters
-    image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, wxIMAGE_RESOLUTION_CM);
-    image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, dbuf[2]/100);
-    image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, dbuf[3]/100);
-
-    return true;
-}
-
-bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream,
-                            bool verbose, int WXUNUSED(index))
-{
-    // Read a single DIB fom the file:
-    return LoadDib(image, stream, verbose, true/*isBmp*/);
-}
-
-bool wxBMPHandler::DoCanRead(wxInputStream& stream)
-{
-    unsigned char hdr[2];
-
-    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here
-        return false;
-
-    // do we have the BMP file signature?
-    return hdr[0] == 'B' && hdr[1] == 'M';
-}
-
-#endif // wxUSE_STREAMS
-
-
-#if wxUSE_ICO_CUR
-//-----------------------------------------------------------------------------
-// wxICOHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler)
-
-#if wxUSE_STREAMS
-
-struct ICONDIRENTRY
-{
-    wxUint8         bWidth;               // Width of the image
-    wxUint8         bHeight;              // Height of the image (times 2)
-    wxUint8         bColorCount;          // Number of colors in image (0 if >=8bpp)
-    wxUint8         bReserved;            // Reserved
-
-    // these two are different in icons and cursors:
-                                          // icon           or  cursor
-    wxUint16        wPlanes;              // Color Planes   or  XHotSpot
-    wxUint16        wBitCount;            // Bits per pixel or  YHotSpot
-
-    wxUint32        dwBytesInRes;         // how many bytes in this resource?
-    wxUint32        dwImageOffset;        // where in the file is this image
-};
-
-struct ICONDIR
-{
-    wxUint16     idReserved;   // Reserved
-    wxUint16     idType;       // resource type (1 for icons, 2 for cursors)
-    wxUint16     idCount;      // how many images?
-};
-
-
-bool wxICOHandler::SaveFile(wxImage *image,
-                            wxOutputStream& stream,
-                            bool verbose)
-
-{
-    //sanity check; icon must be less than 127 pixels high and 255 wide
-    if ( image->GetHeight () > 127 )
-    {
-        if ( verbose )
-        {
-            wxLogError(_("ICO: Image too tall for an icon."));
-        }
-        return false;
-    }
-    if ( image->GetWidth () > 255 )
-    {
-        if ( verbose )
-        {
-            wxLogError(_("ICO: Image too wide for an icon."));
-        }
-        return false;
-    }
-
-    const int images = 1; // only generate one image
-
-    // VS: This is a hack of sort - since ICO and CUR files are almost
-    //     identical, we have all the meat in wxICOHandler and check for
-    //     the actual (handler) type when the code has to distinguish between
-    //     the two formats
-    int type = (this->GetType() == wxBITMAP_TYPE_CUR) ? 2 : 1;
-
-    // write a header, (ICONDIR)
-    // Calculate the header size
-    wxUint32 offset = 3 * sizeof(wxUint16);
-
-    ICONDIR IconDir;
-    IconDir.idReserved = 0;
-    IconDir.idType = wxUINT16_SWAP_ON_BE((wxUint16)type);
-    IconDir.idCount = wxUINT16_SWAP_ON_BE((wxUint16)images);
-    stream.Write(&IconDir.idReserved, sizeof(IconDir.idReserved));
-    stream.Write(&IconDir.idType, sizeof(IconDir.idType));
-    stream.Write(&IconDir.idCount, sizeof(IconDir.idCount));
-    if ( !stream.IsOk() )
-    {
-        if ( verbose )
-        {
-            wxLogError(_("ICO: Error writing the image file!"));
-        }
-        return false;
-    }
-
-    // for each iamage write a description ICONDIRENTRY:
-    ICONDIRENTRY icondirentry;
-    for (int img = 0; img < images; img++)
-    {
-        wxImage mask;
-
-        if ( image->HasMask() )
-        {
-            // make another image with black/white:
-            mask = image->ConvertToMono (image->GetMaskRed(), image->GetMaskGreen(), image->GetMaskBlue() );
-
-            // now we need to change the masked regions to black:
-            unsigned char r = image->GetMaskRed();
-            unsigned char g = image->GetMaskGreen();
-            unsigned char b = image->GetMaskBlue();
-            if ( (r != 0) || (g != 0) || (b != 0) )
-            {
-                // Go round and apply black to the masked bits:
-                int i, j;
-                for (i = 0; i < mask.GetWidth(); i++)
-                {
-                    for (j = 0; j < mask.GetHeight(); j++)
-                    {
-                        if ((r == mask.GetRed(i, j)) &&
-                            (g == mask.GetGreen(i, j))&&
-                            (b == mask.GetBlue(i, j)) )
-                                image->SetRGB(i, j, 0, 0, 0 );
-                    }
-                }
-            }
-        }
-        else
-        {
-            // just make a black mask all over:
-            mask = image->Copy();
-            int i, j;
-            for (i = 0; i < mask.GetWidth(); i++)
-                for (j = 0; j < mask.GetHeight(); j++)
-                    mask.SetRGB(i, j, 0, 0, 0 );
-        }
-        // Set the formats for image and mask
-        // (Windows never saves with more than 8 colors):
-        image->SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_8BPP);
-
-        // monochome bitmap:
-        mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW);
-        bool IsBmp = false;
-        bool IsMask = false;
-
-        //calculate size and offset of image and mask
-        wxCountingOutputStream cStream;
-        bool bResult = SaveDib(image, cStream, verbose, IsBmp, IsMask);
-        if ( !bResult )
-        {
-            if ( verbose )
-            {
-                wxLogError(_("ICO: Error writing the image file!"));
-            }
-            return false;
-        }
-        IsMask = true;
-
-        bResult = SaveDib(&mask, cStream, verbose, IsBmp, IsMask);
-        if ( !bResult )
-        {
-            if ( verbose )
-            {
-                wxLogError(_("ICO: Error writing the image file!"));
-            }
-            return false;
-        }
-        wxUint32 Size = cStream.GetSize();
-
-        // wxCountingOutputStream::IsOk() always returns true for now and this
-        // "if" provokes VC++ warnings in optimized build
-#if 0
-        if ( !cStream.IsOk() )
-        {
-            if ( verbose )
-            {
-                wxLogError(_("ICO: Error writing the image file!"));
-            }
-            return false;
-        }
-#endif // 0
-
-        offset = offset + sizeof(ICONDIRENTRY);
-
-        icondirentry.bWidth = (wxUint8)image->GetWidth();
-        icondirentry.bHeight = (wxUint8)(2 * image->GetHeight());
-        icondirentry.bColorCount = 0;
-        icondirentry.bReserved = 0;
-        icondirentry.wPlanes = wxUINT16_SWAP_ON_BE(1);
-        icondirentry.wBitCount = wxUINT16_SWAP_ON_BE(wxBMP_8BPP);
-        if ( type == 2 /*CUR*/)
-        {
-            int hx = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ?
-                         image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) :
-                         image->GetWidth() / 2;
-            int hy = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ?
-                         image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) :
-                         image->GetHeight() / 2;
-
-            // actually write the values of the hot spot here:
-            icondirentry.wPlanes = wxUINT16_SWAP_ON_BE((wxUint16)hx);
-            icondirentry.wBitCount = wxUINT16_SWAP_ON_BE((wxUint16)hy);
-        }
-        icondirentry.dwBytesInRes = wxUINT32_SWAP_ON_BE(Size);
-        icondirentry.dwImageOffset = wxUINT32_SWAP_ON_BE(offset);
-
-        // increase size to allow for the data written:
-        offset += Size;
-
-        // write to stream:
-        stream.Write(&icondirentry.bWidth, sizeof(icondirentry.bWidth));
-        stream.Write(&icondirentry.bHeight, sizeof(icondirentry.bHeight));
-        stream.Write(&icondirentry.bColorCount, sizeof(icondirentry.bColorCount));
-        stream.Write(&icondirentry.bReserved, sizeof(icondirentry.bReserved));
-        stream.Write(&icondirentry.wPlanes, sizeof(icondirentry.wPlanes));
-        stream.Write(&icondirentry.wBitCount, sizeof(icondirentry.wBitCount));
-        stream.Write(&icondirentry.dwBytesInRes, sizeof(icondirentry.dwBytesInRes));
-        stream.Write(&icondirentry.dwImageOffset, sizeof(icondirentry.dwImageOffset));
-        if ( !stream.IsOk() )
-        {
-            if ( verbose )
-            {
-                wxLogError(_("ICO: Error writing the image file!"));
-            }
-            return false;
-        }
-
-        // actually save it:
-        IsMask = false;
-        bResult = SaveDib(image, stream, verbose, IsBmp, IsMask);
-        if ( !bResult )
-        {
-            if ( verbose )
-            {
-                wxLogError(_("ICO: Error writing the image file!"));
-            }
-            return false;
-        }
-        IsMask = true;
-
-        bResult = SaveDib(&mask, stream, verbose, IsBmp, IsMask);
-        if ( !bResult )
-        {
-            if ( verbose )
-            {
-                wxLogError(_("ICO: Error writing the image file!"));
-            }
-            return false;
-        }
-
-    } // end of for loop
-
-    return true;
-}
-
-bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
-                            bool verbose, int index)
-{
-    if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset )
-    {
-        return false;
-    }
-
-    return DoLoadFile(image, stream, verbose, index);
-}
-
-bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
-                            bool WXUNUSED(verbose), int index)
-{
-    bool bResult wxDUMMY_INITIALIZE(false);
-    bool IsBmp = false;
-
-    ICONDIR IconDir;
-
-    stream.Read(&IconDir, sizeof(IconDir));
-    wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
-
-    // nType is 1 for Icons, 2 for Cursors:
-    wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
-
-    // loop round the icons and choose the best one:
-    ICONDIRENTRY *pIconDirEntry = new ICONDIRENTRY[nIcons];
-    ICONDIRENTRY *pCurrentEntry = pIconDirEntry;
-    int wMax = 0;
-    int colmax = 0;
-    int iSel = wxNOT_FOUND;
-
-    // remember how many bytes we read from the stream:
-    wxFileOffset alreadySeeked = sizeof(IconDir);
-
-    for (unsigned int i = 0; i < nIcons; i++ )
-    {
-        alreadySeeked += stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY)).LastRead();
-
-        // bHeight and bColorCount are wxUint8
-        if ( pCurrentEntry->bWidth >= wMax )
-        {
-            // see if we have more colors, ==0 indicates > 8bpp:
-            if ( pCurrentEntry->bColorCount == 0 )
-                pCurrentEntry->bColorCount = 255;
-            if ( pCurrentEntry->bColorCount >= colmax )
-            {
-                iSel = i;
-                wMax = pCurrentEntry->bWidth;
-                colmax = pCurrentEntry->bColorCount;
-            }
-        }
-
-        pCurrentEntry++;
-    }
-
-    if ( index != -1 )
-    {
-        // VS: Note that we *have* to run the loop above even if index != -1, because
-        //     it reads ICONDIRENTRies.
-        iSel = index;
-    }
-
-    if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons )
-    {
-        wxLogError(_("ICO: Invalid icon index."));
-        bResult = false;
-    }
-    else
-    {
-        // seek to selected icon:
-        pCurrentEntry = pIconDirEntry + iSel;
-
-        // NOTE: seeking a positive amount in wxFromCurrent mode allows us to
-        //       load even non-seekable streams (see wxInputStream::SeekI docs)!
-        wxFileOffset offset = wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset) - alreadySeeked;
-        if (offset != 0 && stream.SeekI(offset, wxFromCurrent) == wxInvalidOffset)
-            return false;
-
-        bResult = LoadDib(image, stream, true, IsBmp);
-        bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
-        if ( bResult && bIsCursorType && nType == 2 )
-        {
-            // it is a cursor, so let's set the hotspot:
-            image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
-            image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
-        }
-    }
-
-    delete [] pIconDirEntry;
-
-    return bResult;
-}
-
-int wxICOHandler::DoGetImageCount(wxInputStream& stream)
-{
-    // It's ok to modify the stream position in this function.
-
-    if ( stream.IsSeekable() && stream.SeekI(0) == wxInvalidOffset )
-    {
-        return 0;
-    }
-
-    ICONDIR IconDir;
-
-    if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir))
-        return 0;
-
-    return (int)wxUINT16_SWAP_ON_BE(IconDir.idCount);
-}
-
-bool wxICOHandler::DoCanRead(wxInputStream& stream)
-{
-    return CanReadICOOrCUR(&stream, 1 /*for identifying an icon*/);
-
-}
-
-#endif // wxUSE_STREAMS
-
-
-//-----------------------------------------------------------------------------
-// wxCURHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
-
-#if wxUSE_STREAMS
-
-bool wxCURHandler::DoCanRead(wxInputStream& stream)
-{
-    return CanReadICOOrCUR(&stream, 2 /*for identifying a cursor*/);
-}
-
-#endif // wxUSE_STREAMS
-
-//-----------------------------------------------------------------------------
-// wxANIHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
-
-#if wxUSE_STREAMS
-
-bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
-                            bool WXUNUSED(verbose), int index)
-{
-    wxANIDecoder decoder;
-    if (!decoder.Load(stream))
-        return false;
-
-    return decoder.ConvertToImage(index != -1 ? (size_t)index : 0, image);
-}
-
-bool wxANIHandler::DoCanRead(wxInputStream& stream)
-{
-    wxANIDecoder decod;
-    return decod.CanRead(stream);
-             // it's ok to modify the stream position here
-}
-
-int wxANIHandler::DoGetImageCount(wxInputStream& stream)
-{
-    wxANIDecoder decoder;
-    if (!decoder.Load(stream))  // it's ok to modify the stream position here
-        return wxNOT_FOUND;
-
-    return decoder.GetFrameCount();
-}
-
-static bool CanReadICOOrCUR(wxInputStream *stream, wxUint16 resourceType)
-{
-    // It's ok to modify the stream position in this function.
-
-    if ( stream->IsSeekable() && stream->SeekI(0) == wxInvalidOffset )
-    {
-        return false;
-    }
-
-    ICONDIR iconDir;
-    if ( !stream->Read(&iconDir, sizeof(iconDir)) )
-    {
-        return false;
-    }
-
-    return !iconDir.idReserved // reserved, must be 0
-        && wxUINT16_SWAP_ON_BE(iconDir.idType) == resourceType // either 1 or 2
-        && iconDir.idCount; // must contain at least one image
-}
-
-#endif // wxUSE_STREAMS
-
-#endif // wxUSE_ICO_CUR
-
-#endif // wxUSE_IMAGE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagbmp.cpp
+// Purpose:     wxImage BMP,ICO and CUR handlers
+// Author:      Robert Roebling, Chris Elliott
+// RCS-ID:      $Id: imagbmp.cpp 54942 2008-08-03 00:23:38Z VZ $
+// Copyright:   (c) Robert Roebling, Chris Elliott
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE
+
+#include "wx/imagbmp.h"
+
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/bitmap.h"
+    #include "wx/palette.h"
+    #include "wx/intl.h"
+#endif
+
+#include "wx/filefn.h"
+#include "wx/wfstream.h"
+#include "wx/quantize.h"
+#include "wx/anidecod.h"
+
+// For memcpy
+#include <string.h>
+
+#ifdef __SALFORDC__
+#ifdef FAR
+#undef FAR
+#endif
+#endif
+
+//-----------------------------------------------------------------------------
+// wxBMPHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+#ifndef BI_RGB
+    #define BI_RGB       0
+#endif
+
+#ifndef BI_RLE8
+#define BI_RLE8      1
+#endif
+
+#ifndef BI_RLE4
+#define BI_RLE4      2
+#endif
+
+#ifndef BI_BITFIELDS
+#define BI_BITFIELDS 3
+#endif
+
+#define poffset (line * width * 3 + column * 3)
+
+bool wxBMPHandler::SaveFile(wxImage *image,
+                            wxOutputStream& stream,
+                            bool verbose)
+{
+    return SaveDib(image, stream, verbose, true/*IsBmp*/, false/*IsMask*/);
+}
+
+bool wxBMPHandler::SaveDib(wxImage *image,
+                           wxOutputStream& stream,
+                           bool verbose,
+                           bool IsBmp,
+                           bool IsMask)
+
+{
+    wxCHECK_MSG( image, false, _T("invalid pointer in wxBMPHandler::SaveFile") );
+
+    if ( !image->Ok() )
+    {
+        if ( verbose )
+            wxLogError(_("BMP: Couldn't save invalid image."));
+        return false;
+    }
+
+    // get the format of the BMP file to save, else use 24bpp
+    unsigned format = wxBMP_24BPP;
+    if ( image->HasOption(wxIMAGE_OPTION_BMP_FORMAT) )
+        format = image->GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT);
+
+    wxUint16 bpp;     // # of bits per pixel
+    int palette_size; // # of color map entries, ie. 2^bpp colors
+
+    // set the bpp and appropriate palette_size, and do additional checks
+    if ( (format == wxBMP_1BPP) || (format == wxBMP_1BPP_BW) )
+    {
+        bpp = 1;
+        palette_size = 2;
+    }
+    else if ( format == wxBMP_4BPP )
+    {
+        bpp = 4;
+        palette_size = 16;
+    }
+    else if ( (format == wxBMP_8BPP) || (format == wxBMP_8BPP_GREY) ||
+              (format == wxBMP_8BPP_RED) || (format == wxBMP_8BPP_PALETTE) )
+    {
+        // need to set a wxPalette to use this, HOW TO CHECK IF VALID, SIZE?
+        if ((format == wxBMP_8BPP_PALETTE)
+#if wxUSE_PALETTE
+                && !image->HasPalette()
+#endif // wxUSE_PALETTE
+            )
+        {
+            if ( verbose )
+                wxLogError(_("BMP: wxImage doesn't have own wxPalette."));
+            return false;
+        }
+        bpp = 8;
+        palette_size = 256;
+    }
+    else  // you get 24bpp
+    {
+        format = wxBMP_24BPP;
+        bpp = 24;
+        palette_size = 0;
+    }
+
+    unsigned width = image->GetWidth();
+    unsigned row_padding = (4 - int(width*bpp/8.0) % 4) % 4; // # bytes to pad to dword
+    unsigned row_width = int(width * bpp/8.0) + row_padding; // # of bytes per row
+
+    struct
+    {
+        // BitmapHeader:
+        wxUint16  magic;          // format magic, always 'BM'
+        wxUint32  filesize;       // total file size, inc. headers
+        wxUint32  reserved;       // for future use
+        wxUint32  data_offset;    // image data offset in the file
+
+        // BitmapInfoHeader:
+        wxUint32  bih_size;       // 2nd part's size
+        wxUint32  width, height;  // bitmap's dimensions
+        wxUint16  planes;         // num of planes
+        wxUint16  bpp;            // bits per pixel
+        wxUint32  compression;    // compression method
+        wxUint32  size_of_bmp;    // size of the bitmap
+        wxUint32  h_res, v_res;   // image resolution in dpi
+        wxUint32  num_clrs;       // number of colors used
+        wxUint32  num_signif_clrs;// number of significant colors
+    } hdr;
+
+    wxUint32 hdr_size = 14/*BitmapHeader*/ + 40/*BitmapInfoHeader*/;
+
+    hdr.magic = wxUINT16_SWAP_ON_BE(0x4D42/*'BM'*/);
+    hdr.filesize = wxUINT32_SWAP_ON_BE( hdr_size + palette_size*4 +
+                                        row_width * image->GetHeight() );
+    hdr.reserved = 0;
+    hdr.data_offset = wxUINT32_SWAP_ON_BE(hdr_size + palette_size*4);
+
+    hdr.bih_size = wxUINT32_SWAP_ON_BE(hdr_size - 14);
+    hdr.width = wxUINT32_SWAP_ON_BE(image->GetWidth());
+    if ( IsBmp )
+    {
+        hdr.height = wxUINT32_SWAP_ON_BE(image->GetHeight());
+    }
+    else
+    {
+        hdr.height = wxUINT32_SWAP_ON_BE(2 * image->GetHeight());
+    }
+    hdr.planes = wxUINT16_SWAP_ON_BE(1); // always 1 plane
+    hdr.bpp = wxUINT16_SWAP_ON_BE(bpp);
+    hdr.compression = 0; // RGB uncompressed
+    hdr.size_of_bmp = wxUINT32_SWAP_ON_BE(row_width * image->GetHeight());
+    hdr.h_res = hdr.v_res = wxUINT32_SWAP_ON_BE(72);  // 72dpi is standard
+    hdr.num_clrs = wxUINT32_SWAP_ON_BE(palette_size); // # colors in colormap
+    hdr.num_signif_clrs = 0;     // all colors are significant
+
+    if ( IsBmp )
+    {
+        if (// VS: looks ugly but compilers tend to do ugly things with structs,
+            //     like aligning hdr.filesize's ofset to dword :(
+            // VZ: we should add padding then...
+            !stream.Write(&hdr.magic, 2) ||
+            !stream.Write(&hdr.filesize, 4) ||
+            !stream.Write(&hdr.reserved, 4) ||
+            !stream.Write(&hdr.data_offset, 4)
+           )
+        {
+            if (verbose)
+                wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));
+            return false;
+        }
+    }
+    if ( !IsMask )
+    {
+        if (
+            !stream.Write(&hdr.bih_size, 4) ||
+            !stream.Write(&hdr.width, 4) ||
+            !stream.Write(&hdr.height, 4) ||
+            !stream.Write(&hdr.planes, 2) ||
+            !stream.Write(&hdr.bpp, 2) ||
+            !stream.Write(&hdr.compression, 4) ||
+            !stream.Write(&hdr.size_of_bmp, 4) ||
+            !stream.Write(&hdr.h_res, 4) ||
+            !stream.Write(&hdr.v_res, 4) ||
+            !stream.Write(&hdr.num_clrs, 4) ||
+            !stream.Write(&hdr.num_signif_clrs, 4)
+           )
+        {
+            if (verbose)
+                wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));
+            return false;
+        }
+    }
+
+    wxPalette *palette = NULL; // entries for quantized images
+    wxUint8 *rgbquad = NULL;   // for the RGBQUAD bytes for the colormap
+    wxImage *q_image = NULL;   // destination for quantized image
+
+    // if <24bpp use quantization to reduce colors for *some* of the formats
+    if ( (format == wxBMP_1BPP) || (format == wxBMP_4BPP) ||
+         (format == wxBMP_8BPP) || (format == wxBMP_8BPP_PALETTE) )
+    {
+        // make a new palette and quantize the image
+        if (format != wxBMP_8BPP_PALETTE)
+        {
+            q_image = new wxImage();
+
+            // I get a delete error using Quantize when desired colors > 236
+            int quantize = ((palette_size > 236) ? 236 : palette_size);
+            // fill the destination too, it gives much nicer 4bpp images
+            wxQuantize::Quantize( *image, *q_image, &palette, quantize, 0,
+                                  wxQUANTIZE_FILL_DESTINATION_IMAGE );
+        }
+        else
+        {
+#if wxUSE_PALETTE
+            palette = new wxPalette(image->GetPalette());
+#endif // wxUSE_PALETTE
+        }
+
+        int i;
+        unsigned char r, g, b;
+        rgbquad = new wxUint8 [palette_size*4];
+
+        for (i = 0; i < palette_size; i++)
+        {
+#if wxUSE_PALETTE
+            if ( !palette->GetRGB(i, &r, &g, &b) )
+#endif // wxUSE_PALETTE
+                r = g = b = 0;
+
+            rgbquad[i*4] = b;
+            rgbquad[i*4+1] = g;
+            rgbquad[i*4+2] = r;
+            rgbquad[i*4+3] = 0;
+        }
+    }
+    // make a 256 entry greyscale colormap or 2 entry black & white
+    else if ( (format == wxBMP_8BPP_GREY) || (format == wxBMP_8BPP_RED) ||
+              (format == wxBMP_1BPP_BW) )
+    {
+        rgbquad = new wxUint8 [palette_size*4];
+
+        for ( int i = 0; i < palette_size; i++ )
+        {
+            // if 1BPP_BW then the value should be either 0 or 255
+            wxUint8 c = (wxUint8)((i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i);
+
+            rgbquad[i*4] =
+            rgbquad[i*4+1] =
+            rgbquad[i*4+2] = c;
+            rgbquad[i*4+3] = 0;
+        }
+    }
+
+    // if the colormap was made, then it needs to be written
+    if (rgbquad)
+    {
+        if ( !IsMask )
+        {
+            if ( !stream.Write(rgbquad, palette_size*4) )
+            {
+                if (verbose)
+                    wxLogError(_("BMP: Couldn't write RGB color map."));
+                delete[] rgbquad;
+#if wxUSE_PALETTE
+                delete palette;
+#endif // wxUSE_PALETTE
+                delete q_image;
+                return false;
+            }
+            }
+        delete []rgbquad;
+    }
+
+    // pointer to the image data, use quantized if available
+    wxUint8 *data = (wxUint8*) image->GetData();
+    if (q_image) if (q_image->Ok()) data = (wxUint8*) q_image->GetData();
+
+    wxUint8 *buffer = new wxUint8[row_width];
+    memset(buffer, 0, row_width);
+    int y; unsigned x;
+    long int pixel;
+
+    for (y = image->GetHeight() -1; y >= 0; y--)
+    {
+        if ( format == wxBMP_24BPP ) // 3 bytes per pixel red,green,blue
+        {
+            for ( x = 0; x < width; x++ )
+            {
+                pixel = 3*(y*width + x);
+
+                buffer[3*x    ] = data[pixel+2];
+                buffer[3*x + 1] = data[pixel+1];
+                buffer[3*x + 2] = data[pixel];
+            }
+        }
+        else if ((format == wxBMP_8BPP) ||       // 1 byte per pixel in color
+                 (format == wxBMP_8BPP_PALETTE))
+        {
+            for (x = 0; x < width; x++)
+            {
+                pixel = 3*(y*width + x);
+#if wxUSE_PALETTE
+                buffer[x] = (wxUint8)palette->GetPixel( data[pixel],
+                                                        data[pixel+1],
+                                                        data[pixel+2] );
+#else
+                // FIXME: what should this be? use some std palette maybe?
+                buffer[x] = 0;
+#endif // wxUSE_PALETTE
+            }
+        }
+        else if ( format == wxBMP_8BPP_GREY ) // 1 byte per pix, rgb ave to grey
+        {
+            for (x = 0; x < width; x++)
+            {
+                pixel = 3*(y*width + x);
+                buffer[x] = (wxUint8)(.299*data[pixel] +
+                                      .587*data[pixel+1] +
+                                      .114*data[pixel+2]);
+            }
+        }
+        else if ( format == wxBMP_8BPP_RED ) // 1 byte per pixel, red as greys
+        {
+            for (x = 0; x < width; x++)
+            {
+                buffer[x] = (wxUint8)data[3*(y*width + x)];
+            }
+        }
+        else if ( format == wxBMP_4BPP ) // 4 bpp in color
+        {
+            for (x = 0; x < width; x+=2)
+            {
+                pixel = 3*(y*width + x);
+
+                // fill buffer, ignore if > width
+#if wxUSE_PALETTE
+                buffer[x/2] = (wxUint8)(
+                    ((wxUint8)palette->GetPixel(data[pixel],
+                                                data[pixel+1],
+                                                data[pixel+2]) << 4) |
+                    (((x+1) > width)
+                     ? 0
+                     : ((wxUint8)palette->GetPixel(data[pixel+3],
+                                                   data[pixel+4],
+                                                   data[pixel+5]) ))    );
+#else
+                // FIXME: what should this be? use some std palette maybe?
+                buffer[x/2] = 0;
+#endif // wxUSE_PALETTE
+            }
+        }
+        else if ( format == wxBMP_1BPP ) // 1 bpp in "color"
+        {
+            for (x = 0; x < width; x+=8)
+            {
+                pixel = 3*(y*width + x);
+
+#if wxUSE_PALETTE
+                buffer[x/8] = (wxUint8)(
+                                           ((wxUint8)palette->GetPixel(data[pixel], data[pixel+1], data[pixel+2]) << 7) |
+                    (((x+1) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+3], data[pixel+4], data[pixel+5]) << 6)) |
+                    (((x+2) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+6], data[pixel+7], data[pixel+8]) << 5)) |
+                    (((x+3) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+9], data[pixel+10], data[pixel+11]) << 4)) |
+                    (((x+4) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+12], data[pixel+13], data[pixel+14]) << 3)) |
+                    (((x+5) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+15], data[pixel+16], data[pixel+17]) << 2)) |
+                    (((x+6) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+18], data[pixel+19], data[pixel+20]) << 1)) |
+                    (((x+7) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+21], data[pixel+22], data[pixel+23])     ))    );
+#else
+                // FIXME: what should this be? use some std palette maybe?
+                buffer[x/8] = 0;
+#endif // wxUSE_PALETTE
+            }
+        }
+        else if ( format == wxBMP_1BPP_BW ) // 1 bpp B&W colormap from red color ONLY
+        {
+            for (x = 0; x < width; x+=8)
+            {
+                pixel = 3*(y*width + x);
+
+                buffer[x/8] = (wxUint8)(
+                                          (((wxUint8)(data[pixel]   /128.)) << 7) |
+                   (((x+1) > width) ? 0 : (((wxUint8)(data[pixel+3] /128.)) << 6)) |
+                   (((x+2) > width) ? 0 : (((wxUint8)(data[pixel+6] /128.)) << 5)) |
+                   (((x+3) > width) ? 0 : (((wxUint8)(data[pixel+9] /128.)) << 4)) |
+                   (((x+4) > width) ? 0 : (((wxUint8)(data[pixel+12]/128.)) << 3)) |
+                   (((x+5) > width) ? 0 : (((wxUint8)(data[pixel+15]/128.)) << 2)) |
+                   (((x+6) > width) ? 0 : (((wxUint8)(data[pixel+18]/128.)) << 1)) |
+                   (((x+7) > width) ? 0 : (((wxUint8)(data[pixel+21]/128.))     ))    );
+            }
+        }
+
+        if ( !stream.Write(buffer, row_width) )
+        {
+            if (verbose)
+                wxLogError(_("BMP: Couldn't write data."));
+            delete[] buffer;
+#if wxUSE_PALETTE
+            delete palette;
+#endif // wxUSE_PALETTE
+            delete q_image;
+            return false;
+        }
+    }
+    delete[] buffer;
+#if wxUSE_PALETTE
+    delete palette;
+#endif // wxUSE_PALETTE
+    delete q_image;
+
+    return true;
+}
+
+
+typedef struct
+{
+    unsigned char r, g, b;
+}  _cmap;
+
+bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
+                             int bpp, int ncolors, int comp,
+                             wxFileOffset bmpOffset, wxInputStream& stream,
+                             bool verbose, bool IsBmp, bool hasPalette)
+{
+    wxInt32         aDword, rmask = 0, gmask = 0, bmask = 0, amask = 0;
+    int             rshift = 0, gshift = 0, bshift = 0, ashift = 0;
+    int             rbits = 0, gbits = 0, bbits = 0, abits = 0;
+    wxInt32         dbuf[4];
+    wxInt8          bbuf[4];
+    wxUint8         aByte;
+    wxUint16        aWord;
+
+    // allocate space for palette if needed:
+    _cmap *cmap;
+
+    if ( bpp < 16 )
+    {
+        cmap = new _cmap[ncolors];
+        if ( !cmap )
+        {
+            if (verbose)
+                wxLogError(_("BMP: Couldn't allocate memory."));
+            return false;
+        }
+    }
+    else
+        cmap = NULL;
+
+    // destroy existing here instead of:
+    image->Destroy();
+    image->Create(width, height);
+
+    unsigned char *ptr = image->GetData();
+
+    if ( !ptr )
+    {
+        if ( verbose )
+            wxLogError( _("BMP: Couldn't allocate memory.") );
+        delete[] cmap;
+        return false;
+    }
+
+    unsigned char *alpha;
+    if ( bpp == 32 )
+    {
+        // tell the image to allocate an alpha buffer
+        image->SetAlpha();
+        alpha = image->GetAlpha();
+        if ( !alpha )
+        {
+            if ( verbose )
+                wxLogError(_("BMP: Couldn't allocate memory."));
+            delete[] cmap;
+            return false;
+        }
+    }
+    else // no alpha
+    {
+        alpha = NULL;
+    }
+
+    // Reading the palette, if it exists:
+    if ( bpp < 16 && ncolors != 0 )
+    {
+        unsigned char* r = new unsigned char[ncolors];
+        unsigned char* g = new unsigned char[ncolors];
+        unsigned char* b = new unsigned char[ncolors];
+        for (int j = 0; j < ncolors; j++)
+        {
+            if (hasPalette)
+            {
+                stream.Read(bbuf, 4);
+                cmap[j].b = bbuf[0];
+                cmap[j].g = bbuf[1];
+                cmap[j].r = bbuf[2];
+
+                r[j] = cmap[j].r;
+                g[j] = cmap[j].g;
+                b[j] = cmap[j].b;
+            }
+            else
+            {
+                //used in reading .ico file mask
+                r[j] = cmap[j].r =
+                g[j] = cmap[j].g =
+                b[j] = cmap[j].b = ( j ? 255 : 0 );
+            }
+        }
+
+#if wxUSE_PALETTE
+        // Set the palette for the wxImage
+        image->SetPalette(wxPalette(ncolors, r, g, b));
+#endif // wxUSE_PALETTE
+
+        delete[] r;
+        delete[] g;
+        delete[] b;
+    }
+    else if ( bpp == 16 || bpp == 32 )
+    {
+        if ( comp == BI_BITFIELDS )
+        {
+            int bit = 0;
+            stream.Read(dbuf, 4 * 3);
+            rmask = wxINT32_SWAP_ON_BE(dbuf[0]);
+            gmask = wxINT32_SWAP_ON_BE(dbuf[1]);
+            bmask = wxINT32_SWAP_ON_BE(dbuf[2]);
+            // find shift amount (Least significant bit of mask)
+            for (bit = bpp-1; bit>=0; bit--)
+            {
+                if (bmask & (1 << bit))
+                    bshift = bit;
+                if (gmask & (1 << bit))
+                    gshift = bit;
+                if (rmask & (1 << bit))
+                    rshift = bit;
+            }
+            // Find number of bits in mask (MSB-LSB+1)
+            for (bit = 0; bit < bpp; bit++)
+            {
+                if (bmask & (1 << bit))
+                    bbits = bit-bshift+1;
+                if (gmask & (1 << bit))
+                    gbits = bit-gshift+1;
+                if (rmask & (1 << bit))
+                    rbits = bit-rshift+1;
+            }
+        }
+        else if ( bpp == 16 )
+        {
+            rmask = 0x7C00;
+            gmask = 0x03E0;
+            bmask = 0x001F;
+            rshift = 10;
+            gshift = 5;
+            bshift = 0;
+            rbits = 5;
+            gbits = 5;
+            bbits = 5;
+        }
+        else if ( bpp == 32 )
+        {
+            rmask = 0x00FF0000;
+            gmask = 0x0000FF00;
+            bmask = 0x000000FF;
+            amask = 0xFF000000;
+
+            ashift = 24;
+            rshift = 16;
+            gshift = 8;
+            bshift = 0;
+            abits = 8;
+            rbits = 8;
+            gbits = 8;
+            bbits = 8;
+        }
+    }
+
+    /*
+     * Reading the image data
+     */
+    if ( IsBmp )
+        stream.SeekI(bmpOffset); // else icon, just carry on
+
+    unsigned char *data = ptr;
+
+    /* set the whole image to the background color */
+    if ( bpp < 16 && (comp == BI_RLE4 || comp == BI_RLE8) )
+    {
+        for (int i = 0; i < width * height; i++)
+        {
+            *ptr++ = cmap[0].r;
+            *ptr++ = cmap[0].g;
+            *ptr++ = cmap[0].b;
+        }
+        ptr = data;
+    }
+
+    int linesize = ((width * bpp + 31) / 32) * 4;
+
+    /* BMPs are stored upside down */
+    for ( int line = (height - 1); line >= 0; line-- )
+    {
+        int linepos = 0;
+        for ( int column = 0; column < width ; )
+        {
+            if ( bpp < 16 )
+            {
+                linepos++;
+                aByte = stream.GetC();
+                if ( bpp == 1 )
+                {
+                    for (int bit = 0; bit < 8 && column < width; bit++)
+                    {
+                        int index = ((aByte & (0x80 >> bit)) ? 1 : 0);
+                        ptr[poffset] = cmap[index].r;
+                        ptr[poffset + 1] = cmap[index].g;
+                        ptr[poffset + 2] = cmap[index].b;
+                        column++;
+                    }
+                }
+                else if ( bpp == 4 )
+                {
+                    if ( comp == BI_RLE4 )
+                    {
+                        wxUint8 first;
+                        first = aByte;
+                        aByte = stream.GetC();
+                        if ( first == 0 )
+                        {
+                            if ( aByte == 0 )
+                            {
+                                if ( column > 0 )
+                                    column = width;
+                            }
+                            else if ( aByte == 1 )
+                            {
+                                column = width;
+                                line = -1;
+                            }
+                            else if ( aByte == 2 )
+                            {
+                                aByte = stream.GetC();
+                                column += aByte;
+                                linepos = column * bpp / 4;
+                                aByte = stream.GetC();
+                                line -= aByte; // upside down
+                            }
+                            else
+                            {
+                                int absolute = aByte;
+                                wxUint8 nibble[2] ;
+                                int readBytes = 0 ;
+                                for (int k = 0; k < absolute; k++)
+                                {
+                                    if ( !(k % 2 ) )
+                                    {
+                                        ++readBytes ;
+                                        aByte = stream.GetC();
+                                        nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ;
+                                        nibble[1] = (wxUint8)( aByte & 0x0F ) ;
+                                    }
+                                    ptr[poffset    ] = cmap[nibble[k%2]].r;
+                                    ptr[poffset + 1] = cmap[nibble[k%2]].g;
+                                    ptr[poffset + 2] = cmap[nibble[k%2]].b;
+                                    column++;
+                                    if ( k % 2 )
+                                        linepos++;
+                                }
+                                if ( readBytes & 0x01 )
+                                    aByte = stream.GetC();
+                            }
+                        }
+                        else
+                        {
+                            wxUint8 nibble[2] ;
+                            nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ;
+                            nibble[1] = (wxUint8)( aByte & 0x0F ) ;
+
+                            for ( int l = 0; l < first && column < width; l++ )
+                            {
+                                ptr[poffset    ] = cmap[nibble[l%2]].r;
+                                ptr[poffset + 1] = cmap[nibble[l%2]].g;
+                                ptr[poffset + 2] = cmap[nibble[l%2]].b;
+                                column++;
+                                if ( l % 2 )
+                                    linepos++;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        for (int nibble = 0; nibble < 2 && column < width; nibble++)
+                        {
+                            int index = ((aByte & (0xF0 >> nibble * 4)) >> (!nibble * 4));
+                            if ( index >= 16 )
+                                index = 15;
+                            ptr[poffset] = cmap[index].r;
+                            ptr[poffset + 1] = cmap[index].g;
+                            ptr[poffset + 2] = cmap[index].b;
+                            column++;
+                        }
+                    }
+                }
+                else if ( bpp == 8 )
+                {
+                    if ( comp == BI_RLE8 )
+                    {
+                        unsigned char first;
+                        first = aByte;
+                        aByte = stream.GetC();
+                        if ( first == 0 )
+                        {
+                            if ( aByte == 0 )
+                            {
+                                /* column = width; */
+                            }
+                            else if ( aByte == 1 )
+                            {
+                                column = width;
+                                line = -1;
+                            }
+                            else if ( aByte == 2 )
+                            {
+                                aByte = stream.GetC();
+                                column += aByte;
+                                linepos = column * bpp / 8;
+                                aByte = stream.GetC();
+                                line += aByte;
+                            }
+                            else
+                            {
+                                int absolute = aByte;
+                                for (int k = 0; k < absolute; k++)
+                                {
+                                    linepos++;
+                                    aByte = stream.GetC();
+                                    ptr[poffset    ] = cmap[aByte].r;
+                                    ptr[poffset + 1] = cmap[aByte].g;
+                                    ptr[poffset + 2] = cmap[aByte].b;
+                                    column++;
+                                }
+                                if ( absolute & 0x01 )
+                                    aByte = stream.GetC();
+                            }
+                        }
+                        else
+                        {
+                            for ( int l = 0; l < first && column < width; l++ )
+                            {
+                                ptr[poffset    ] = cmap[aByte].r;
+                                ptr[poffset + 1] = cmap[aByte].g;
+                                ptr[poffset + 2] = cmap[aByte].b;
+                                column++;
+                                linepos++;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        ptr[poffset    ] = cmap[aByte].r;
+                        ptr[poffset + 1] = cmap[aByte].g;
+                        ptr[poffset + 2] = cmap[aByte].b;
+                        column++;
+                        // linepos += size;    seems to be wrong, RR
+                    }
+                }
+            }
+            else if ( bpp == 24 )
+            {
+                stream.Read(bbuf, 3);
+                linepos += 3;
+                ptr[poffset    ] = (unsigned char)bbuf[2];
+                ptr[poffset + 1] = (unsigned char)bbuf[1];
+                ptr[poffset + 2] = (unsigned char)bbuf[0];
+                column++;
+            }
+            else if ( bpp == 16 )
+            {
+                unsigned char temp;
+                stream.Read(&aWord, 2);
+                aWord = wxUINT16_SWAP_ON_BE(aWord);
+                linepos += 2;
+                /* use the masks and calculated amonut of shift
+                   to retrieve the color data out of the word.  Then
+                   shift it left by (8 - number of bits) such that
+                   the image has the proper dynamic range */
+                temp = (unsigned char)((aWord & rmask) >> rshift << (8-rbits));
+                ptr[poffset] = temp;
+                temp = (unsigned char)((aWord & gmask) >> gshift << (8-gbits));
+                ptr[poffset + 1] = temp;
+                temp = (unsigned char)((aWord & bmask) >> bshift << (8-bbits));
+                ptr[poffset + 2] = temp;
+                column++;
+            }
+            else
+            {
+                unsigned char temp;
+                stream.Read(&aDword, 4);
+                aDword = wxINT32_SWAP_ON_BE(aDword);
+                linepos += 4;
+                temp = (unsigned char)((aDword & rmask) >> rshift);
+                ptr[poffset] = temp;
+                temp = (unsigned char)((aDword & gmask) >> gshift);
+                ptr[poffset + 1] = temp;
+                temp = (unsigned char)((aDword & bmask) >> bshift);
+                ptr[poffset + 2] = temp;
+                if ( alpha )
+                {
+                    temp = (unsigned char)((aDword & amask) >> ashift);
+                    alpha[line * width + column] = temp;
+                }
+                column++;
+            }
+        }
+        while ( (linepos < linesize) && (comp != 1) && (comp != 2) )
+        {
+            stream.Read(&aByte, 1);
+            linepos += 1;
+            if ( !stream )
+                break;
+        }
+    }
+
+    delete[] cmap;
+
+    image->SetMask(false);
+
+    const wxStreamError err = stream.GetLastError();
+    return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
+}
+
+bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
+                           bool verbose, bool IsBmp)
+{
+    wxUint16        aWord;
+    wxInt32         dbuf[4];
+    wxInt8          bbuf[4];
+
+    wxFileOffset offset = 0; // keep gcc quiet
+    if ( IsBmp )
+    {
+        // read the header off the .BMP format file
+
+        offset = stream.TellI();
+        if (offset == wxInvalidOffset)
+            offset = 0;
+
+        stream.Read(bbuf, 2);
+        stream.Read(dbuf, 16);
+    }
+    else
+    {
+        stream.Read(dbuf, 4);
+    }
+    #if 0 // unused
+        wxInt32 size = wxINT32_SWAP_ON_BE(dbuf[0]);
+    #endif
+    offset = offset + wxINT32_SWAP_ON_BE(dbuf[2]);
+
+    stream.Read(dbuf, 4 * 2);
+    int width = wxINT32_SWAP_ON_BE((int)dbuf[0]);
+    int height = wxINT32_SWAP_ON_BE((int)dbuf[1]);
+    if ( !IsBmp)height = height  / 2; // for icons divide by 2
+
+    if ( width > 32767 )
+    {
+        if (verbose)
+            wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );
+        return false;
+    }
+    if ( height > 32767 )
+    {
+        if (verbose)
+            wxLogError( _("DIB Header: Image height > 32767 pixels for file.") );
+        return false;
+    }
+
+    stream.Read(&aWord, 2);
+    /*
+            TODO
+            int planes = (int)wxUINT16_SWAP_ON_BE( aWord );
+        */
+    stream.Read(&aWord, 2);
+    int bpp = wxUINT16_SWAP_ON_BE((int)aWord);
+    if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
+    {
+        if (verbose)
+            wxLogError( _("DIB Header: Unknown bitdepth in file.") );
+        return false;
+    }
+
+    stream.Read(dbuf, 4 * 4);
+    int comp = wxINT32_SWAP_ON_BE((int)dbuf[0]);
+    if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&
+         comp != BI_BITFIELDS )
+    {
+        if (verbose)
+            wxLogError( _("DIB Header: Unknown encoding in file.") );
+        return false;
+    }
+
+    stream.Read(dbuf, 4 * 2);
+    int ncolors = wxINT32_SWAP_ON_BE( (int)dbuf[0] );
+    if (ncolors == 0)
+        ncolors = 1 << bpp;
+    /* some more sanity checks */
+    if (((comp == BI_RLE4) && (bpp != 4)) ||
+        ((comp == BI_RLE8) && (bpp != 8)) ||
+        ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
+    {
+        if (verbose)
+            wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") );
+        return false;
+    }
+
+    //read DIB; this is the BMP image or the XOR part of an icon image
+    if ( !DoLoadDib(image, width, height, bpp, ncolors, comp, offset, stream,
+                    verbose, IsBmp, true) )
+    {
+        if (verbose)
+            wxLogError( _("Error in reading image DIB.") );
+        return false;
+    }
+
+    if ( !IsBmp )
+    {
+        //read Icon mask which is monochrome
+        //there is no palette, so we will create one
+        wxImage mask;
+        if ( !DoLoadDib(&mask, width, height, 1, 2, BI_RGB, offset, stream,
+                        verbose, IsBmp, false) )
+        {
+            if (verbose)
+                wxLogError( _("ICO: Error in reading mask DIB.") );
+            return false;
+        }
+        image->SetMaskFromImage(mask, 255, 255, 255);
+
+    }
+
+    return true;
+}
+
+bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream,
+                            bool verbose, int WXUNUSED(index))
+{
+    // Read a single DIB fom the file:
+    return LoadDib(image, stream, verbose, true/*isBmp*/);
+}
+
+bool wxBMPHandler::DoCanRead(wxInputStream& stream)
+{
+    unsigned char hdr[2];
+
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return false;
+
+    // do we have the BMP file signature?
+    return hdr[0] == 'B' && hdr[1] == 'M';
+}
+
+#endif // wxUSE_STREAMS
+
+
+#if wxUSE_ICO_CUR
+//-----------------------------------------------------------------------------
+// wxICOHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler)
+
+#if wxUSE_STREAMS
+
+struct ICONDIRENTRY
+{
+    wxUint8         bWidth;               // Width of the image
+    wxUint8         bHeight;              // Height of the image (times 2)
+    wxUint8         bColorCount;          // Number of colors in image (0 if >=8bpp)
+    wxUint8         bReserved;            // Reserved
+
+    // these two are different in icons and cursors:
+                                          // icon           or  cursor
+    wxUint16        wPlanes;              // Color Planes   or  XHotSpot
+    wxUint16        wBitCount;            // Bits per pixel or  YHotSpot
+
+    wxUint32        dwBytesInRes;         // how many bytes in this resource?
+    wxUint32        dwImageOffset;        // where in the file is this image
+};
+
+struct ICONDIR
+{
+    wxUint16     idReserved;   // Reserved
+    wxUint16     idType;       // resource type (1 for icons, 2 for cursors)
+    wxUint16     idCount;      // how many images?
+};
+
+
+bool wxICOHandler::SaveFile(wxImage *image,
+                            wxOutputStream& stream,
+                            bool verbose)
+
+{
+    //sanity check; icon must be less than 127 pixels high and 255 wide
+    if ( image->GetHeight () > 127 )
+    {
+        if ( verbose )
+            wxLogError(_("ICO: Image too tall for an icon."));
+        return false;
+    }
+    if ( image->GetWidth () > 255 )
+    {
+        if ( verbose )
+            wxLogError(_("ICO: Image too wide for an icon."));
+        return false;
+    }
+
+    const int images = 1; // only generate one image
+
+    // VS: This is a hack of sort - since ICO and CUR files are almost
+    //     identical, we have all the meat in wxICOHandler and check for
+    //     the actual (handler) type when the code has to distinguish between
+    //     the two formats
+    int type = (this->GetType() == wxBITMAP_TYPE_CUR) ? 2 : 1;
+
+    // write a header, (ICONDIR)
+    // Calculate the header size
+    wxUint32 offset = 3 * sizeof(wxUint16);
+
+    ICONDIR IconDir;
+    IconDir.idReserved = 0;
+    IconDir.idType = wxUINT16_SWAP_ON_BE((wxUint16)type);
+    IconDir.idCount = wxUINT16_SWAP_ON_BE((wxUint16)images);
+    stream.Write(&IconDir.idReserved, sizeof(IconDir.idReserved));
+    stream.Write(&IconDir.idType, sizeof(IconDir.idType));
+    stream.Write(&IconDir.idCount, sizeof(IconDir.idCount));
+    if ( !stream.IsOk() )
+    {
+        if ( verbose )
+            wxLogError(_("ICO: Error writing the image file!"));
+        return false;
+    }
+
+    // for each iamage write a description ICONDIRENTRY:
+    ICONDIRENTRY icondirentry;
+    for (int img = 0; img < images; img++)
+    {
+        wxImage mask;
+
+        if ( image->HasMask() )
+        {
+            // make another image with black/white:
+            mask = image->ConvertToMono (image->GetMaskRed(), image->GetMaskGreen(), image->GetMaskBlue() );
+
+            // now we need to change the masked regions to black:
+            unsigned char r = image->GetMaskRed();
+            unsigned char g = image->GetMaskGreen();
+            unsigned char b = image->GetMaskBlue();
+            if ( (r != 0) || (g != 0) || (b != 0) )
+            {
+                // Go round and apply black to the masked bits:
+                int i, j;
+                for (i = 0; i < mask.GetWidth(); i++)
+                {
+                    for (j = 0; j < mask.GetHeight(); j++)
+                    {
+                        if ((r == mask.GetRed(i, j)) &&
+                            (g == mask.GetGreen(i, j))&&
+                            (b == mask.GetBlue(i, j)) )
+                                image->SetRGB(i, j, 0, 0, 0 );
+                    }
+                }
+            }
+        }
+        else
+        {
+            // just make a black mask all over:
+            mask = image->Copy();
+            int i, j;
+            for (i = 0; i < mask.GetWidth(); i++)
+                for (j = 0; j < mask.GetHeight(); j++)
+                    mask.SetRGB(i, j, 0, 0, 0 );
+        }
+        // Set the formats for image and mask
+        // (Windows never saves with more than 8 colors):
+        image->SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_8BPP);
+
+        // monochome bitmap:
+        mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW);
+        bool IsBmp = false;
+        bool IsMask = false;
+
+        //calculate size and offset of image and mask
+        wxCountingOutputStream cStream;
+        bool bResult = SaveDib(image, cStream, verbose, IsBmp, IsMask);
+        if ( !bResult )
+        {
+            if ( verbose )
+                wxLogError(_("ICO: Error writing the image file!"));
+            return false;
+        }
+        IsMask = true;
+
+        bResult = SaveDib(&mask, cStream, verbose, IsBmp, IsMask);
+        if ( !bResult )
+        {
+            if ( verbose )
+                wxLogError(_("ICO: Error writing the image file!"));
+            return false;
+        }
+        wxUint32 Size = cStream.GetSize();
+
+        // wxCountingOutputStream::IsOk() always returns true for now and this
+        // "if" provokes VC++ warnings in optimized build
+#if 0
+        if ( !cStream.Ok() )
+        {
+            if ( verbose )
+                wxLogError(_("ICO: Error writing the image file!"));
+            return false;
+        }
+#endif // 0
+
+        offset = offset + sizeof(ICONDIRENTRY);
+
+        icondirentry.bWidth = (wxUint8)image->GetWidth();
+        icondirentry.bHeight = (wxUint8)(2 * image->GetHeight());
+        icondirentry.bColorCount = 0;
+        icondirentry.bReserved = 0;
+        icondirentry.wPlanes = wxUINT16_SWAP_ON_BE(1);
+        icondirentry.wBitCount = wxUINT16_SWAP_ON_BE(wxBMP_8BPP);
+        if ( type == 2 /*CUR*/)
+        {
+            int hx = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ?
+                         image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) :
+                         image->GetWidth() / 2;
+            int hy = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ?
+                         image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) :
+                         image->GetHeight() / 2;
+
+            // actually write the values of the hot spot here:
+            icondirentry.wPlanes = wxUINT16_SWAP_ON_BE((wxUint16)hx);
+            icondirentry.wBitCount = wxUINT16_SWAP_ON_BE((wxUint16)hy);
+        }
+        icondirentry.dwBytesInRes = wxUINT32_SWAP_ON_BE(Size);
+        icondirentry.dwImageOffset = wxUINT32_SWAP_ON_BE(offset);
+
+        // increase size to allow for the data written:
+        offset += Size;
+
+        // write to stream:
+        stream.Write(&icondirentry.bWidth, sizeof(icondirentry.bWidth));
+        stream.Write(&icondirentry.bHeight, sizeof(icondirentry.bHeight));
+        stream.Write(&icondirentry.bColorCount, sizeof(icondirentry.bColorCount));
+        stream.Write(&icondirentry.bReserved, sizeof(icondirentry.bReserved));
+        stream.Write(&icondirentry.wPlanes, sizeof(icondirentry.wPlanes));
+        stream.Write(&icondirentry.wBitCount, sizeof(icondirentry.wBitCount));
+        stream.Write(&icondirentry.dwBytesInRes, sizeof(icondirentry.dwBytesInRes));
+        stream.Write(&icondirentry.dwImageOffset, sizeof(icondirentry.dwImageOffset));
+        if ( !stream.IsOk() )
+        {
+            if ( verbose )
+                wxLogError(_("ICO: Error writing the image file!"));
+            return false;
+        }
+
+        // actually save it:
+        IsMask = false;
+        bResult = SaveDib(image, stream, verbose, IsBmp, IsMask);
+        if ( !bResult )
+        {
+            if ( verbose )
+                wxLogError(_("ICO: Error writing the image file!"));
+            return false;
+        }
+        IsMask = true;
+
+        bResult = SaveDib(&mask, stream, verbose, IsBmp, IsMask);
+        if ( !bResult )
+        {
+            if ( verbose )
+                wxLogError(_("ICO: Error writing the image file!"));
+            return false;
+        }
+
+    } // end of for loop
+
+    return true;
+}
+
+bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
+                            bool verbose, int index)
+{
+    stream.SeekI(0);
+    return DoLoadFile(image, stream, verbose, index);
+}
+
+bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
+                            bool WXUNUSED(verbose), int index)
+{
+    bool bResult wxDUMMY_INITIALIZE(false);
+    bool IsBmp = false;
+
+    ICONDIR IconDir;
+
+    wxFileOffset iPos = stream.TellI();
+    stream.Read(&IconDir, sizeof(IconDir));
+    wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
+    // nType is 1 for Icons, 2 for Cursors:
+    wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
+
+    // loop round the icons and choose the best one:
+    ICONDIRENTRY *pIconDirEntry = new ICONDIRENTRY[nIcons];
+    ICONDIRENTRY *pCurrentEntry = pIconDirEntry;
+    int wMax = 0;
+    int colmax = 0;
+    int iSel = wxNOT_FOUND;
+
+    for (int i = 0; i < nIcons; i++ )
+    {
+        stream.Read(pCurrentEntry, sizeof(ICONDIRENTRY));
+        // bHeight and bColorCount are wxUint8
+        if ( pCurrentEntry->bWidth >= wMax )
+        {
+            // see if we have more colors, ==0 indicates > 8bpp:
+            if ( pCurrentEntry->bColorCount == 0 )
+                pCurrentEntry->bColorCount = 255;
+            if ( pCurrentEntry->bColorCount >= colmax )
+            {
+                iSel = i;
+                wMax = pCurrentEntry->bWidth;
+                colmax = pCurrentEntry->bColorCount;
+            }
+        }
+        pCurrentEntry++;
+    }
+
+    if ( index != -1 )
+    {
+        // VS: Note that we *have* to run the loop above even if index != -1, because
+        //     it reads ICONDIRENTRies.
+        iSel = index;
+    }
+
+    if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons )
+    {
+        wxLogError(_("ICO: Invalid icon index."));
+        bResult = false;
+    }
+    else
+    {
+        // seek to selected icon:
+        pCurrentEntry = pIconDirEntry + iSel;
+        stream.SeekI(iPos + wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset), wxFromStart);
+        bResult = LoadDib(image, stream, true, IsBmp);
+        bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
+        if ( bResult && bIsCursorType && nType == 2 )
+        {
+            // it is a cursor, so let's set the hotspot:
+            image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
+            image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
+        }
+    }
+    delete[] pIconDirEntry;
+    return bResult;
+}
+
+int wxICOHandler::GetImageCount(wxInputStream& stream)
+{
+    ICONDIR IconDir;
+    wxFileOffset iPos = stream.TellI();
+    stream.SeekI(0);
+    stream.Read(&IconDir, sizeof(IconDir));
+    wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
+    stream.SeekI(iPos);
+    return (int)nIcons;
+}
+
+bool wxICOHandler::DoCanRead(wxInputStream& stream)
+{
+    stream.SeekI(0);
+    unsigned char hdr[4];
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return false;
+
+    // hdr[2] is one for an icon and two for a cursor
+    return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0';
+}
+
+#endif // wxUSE_STREAMS
+
+
+//-----------------------------------------------------------------------------
+// wxCURHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
+
+#if wxUSE_STREAMS
+
+bool wxCURHandler::DoCanRead(wxInputStream& stream)
+{
+    stream.SeekI(0);
+    unsigned char hdr[4];
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return false;
+
+    // hdr[2] is one for an icon and two for a cursor
+    return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0';
+}
+
+#endif // wxUSE_STREAMS
+
+//-----------------------------------------------------------------------------
+// wxANIHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
+
+#if wxUSE_STREAMS
+
+bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
+                            bool WXUNUSED(verbose), int index)
+{
+    wxANIDecoder decoder;
+    if (!decoder.Load(stream))
+        return false;
+
+    return decoder.ConvertToImage(index != -1 ? (size_t)index : 0, image);
+}
+
+bool wxANIHandler::DoCanRead(wxInputStream& stream)
+{
+    wxANIDecoder decod;
+    return decod.CanRead(stream);
+}
+
+int wxANIHandler::GetImageCount(wxInputStream& stream)
+{
+    wxANIDecoder decoder;
+    if (!decoder.Load(stream))
+        return wxNOT_FOUND;
+
+    return decoder.GetFrameCount();
+}
+
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_ICO_CUR
+
+#endif // wxUSE_IMAGE
diff --git a/Source/3rd Party/wx/src/common/image.cpp b/Source/3rd Party/wx/src/common/image.cpp
index 58340c98f..dfc85eadb 100644
--- a/Source/3rd Party/wx/src/common/image.cpp	
+++ b/Source/3rd Party/wx/src/common/image.cpp	
@@ -1,3556 +1,3132 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/image.cpp
-// Purpose:     wxImage
-// Author:      Robert Roebling
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE
-
-#include "wx/image.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/hash.h"
-    #include "wx/utils.h"
-    #include "wx/math.h"
-    #include "wx/module.h"
-    #include "wx/palette.h"
-    #include "wx/intl.h"
-    #include "wx/colour.h"
-#endif
-
-#include "wx/wfstream.h"
-#include "wx/xpmdecod.h"
-
-// For memcpy
-#include <string.h>
-
-// make the code compile with either wxFile*Stream or wxFFile*Stream:
-#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
-
-#if HAS_FILE_STREAMS
-    #if wxUSE_FFILE
-        typedef wxFFileInputStream wxImageFileInputStream;
-        typedef wxFFileOutputStream wxImageFileOutputStream;
-    #elif wxUSE_FILE
-        typedef wxFileInputStream wxImageFileInputStream;
-        typedef wxFileOutputStream wxImageFileOutputStream;
-    #endif // wxUSE_FILE/wxUSE_FFILE
-#endif // HAS_FILE_STREAMS
-
-#if wxUSE_VARIANT
-IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxImage,WXDLLEXPORT)
-#endif
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-wxList wxImage::sm_handlers;
-wxImage wxNullImage;
-
-//-----------------------------------------------------------------------------
-// wxImageRefData
-//-----------------------------------------------------------------------------
-
-class wxImageRefData: public wxObjectRefData
-{
-public:
-    wxImageRefData();
-    virtual ~wxImageRefData();
-
-    int             m_width;
-    int             m_height;
-    wxBitmapType    m_type;
-    unsigned char  *m_data;
-
-    bool            m_hasMask;
-    unsigned char   m_maskRed,m_maskGreen,m_maskBlue;
-
-    // alpha channel data, may be NULL for the formats without alpha support
-    unsigned char  *m_alpha;
-
-    bool            m_ok;
-
-    // if true, m_data is pointer to static data and shouldn't be freed
-    bool            m_static;
-
-    // same as m_static but for m_alpha
-    bool            m_staticAlpha;
-
-#if wxUSE_PALETTE
-    wxPalette       m_palette;
-#endif // wxUSE_PALETTE
-
-    wxArrayString   m_optionNames;
-    wxArrayString   m_optionValues;
-
-    wxDECLARE_NO_COPY_CLASS(wxImageRefData);
-};
-
-wxImageRefData::wxImageRefData()
-{
-    m_width = 0;
-    m_height = 0;
-    m_type = wxBITMAP_TYPE_INVALID;
-    m_data =
-    m_alpha = (unsigned char *) NULL;
-
-    m_maskRed = 0;
-    m_maskGreen = 0;
-    m_maskBlue = 0;
-    m_hasMask = false;
-
-    m_ok = false;
-    m_static =
-    m_staticAlpha = false;
-}
-
-wxImageRefData::~wxImageRefData()
-{
-    if ( !m_static )
-        free( m_data );
-    if ( !m_staticAlpha )
-        free( m_alpha );
-}
-
-
-//-----------------------------------------------------------------------------
-// wxImage
-//-----------------------------------------------------------------------------
-
-#define M_IMGDATA static_cast<wxImageRefData*>(m_refData)
-
-IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
-
-bool wxImage::Create(const char* const* xpmData)
-{
-#if wxUSE_XPM
-    UnRef();
-
-    wxXPMDecoder decoder;
-    (*this) = decoder.ReadData(xpmData);
-    return IsOk();
-#else
-    wxUnusedVar(xpmData);
-    return false;
-#endif
-}
-
-bool wxImage::Create( int width, int height, bool clear )
-{
-    UnRef();
-
-    m_refData = new wxImageRefData();
-
-    M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
-    if (!M_IMGDATA->m_data)
-    {
-        UnRef();
-        return false;
-    }
-
-    M_IMGDATA->m_width = width;
-    M_IMGDATA->m_height = height;
-    M_IMGDATA->m_ok = true;
-
-    if (clear)
-    {
-        Clear();
-    }
-
-    return true;
-}
-
-bool wxImage::Create( int width, int height, unsigned char* data, bool static_data )
-{
-    UnRef();
-
-    wxCHECK_MSG( data, false, wxT("NULL data in wxImage::Create") );
-
-    m_refData = new wxImageRefData();
-
-    M_IMGDATA->m_data = data;
-    M_IMGDATA->m_width = width;
-    M_IMGDATA->m_height = height;
-    M_IMGDATA->m_ok = true;
-    M_IMGDATA->m_static = static_data;
-
-    return true;
-}
-
-bool wxImage::Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
-{
-    UnRef();
-
-    wxCHECK_MSG( data, false, wxT("NULL data in wxImage::Create") );
-
-    m_refData = new wxImageRefData();
-
-    M_IMGDATA->m_data = data;
-    M_IMGDATA->m_alpha = alpha;
-    M_IMGDATA->m_width = width;
-    M_IMGDATA->m_height = height;
-    M_IMGDATA->m_ok = true;
-    M_IMGDATA->m_static = static_data;
-    M_IMGDATA->m_staticAlpha = static_data;
-
-    return true;
-}
-
-void wxImage::Destroy()
-{
-    UnRef();
-}
-
-void wxImage::Clear(unsigned char value)
-{
-    memset(M_IMGDATA->m_data, value, M_IMGDATA->m_width*M_IMGDATA->m_height*3);
-}
-
-wxObjectRefData* wxImage::CreateRefData() const
-{
-    return new wxImageRefData;
-}
-
-wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const
-{
-    const wxImageRefData* refData = static_cast<const wxImageRefData*>(that);
-    wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") );
-
-    wxImageRefData* refData_new = new wxImageRefData;
-    refData_new->m_width = refData->m_width;
-    refData_new->m_height = refData->m_height;
-    refData_new->m_maskRed = refData->m_maskRed;
-    refData_new->m_maskGreen = refData->m_maskGreen;
-    refData_new->m_maskBlue = refData->m_maskBlue;
-    refData_new->m_hasMask = refData->m_hasMask;
-    refData_new->m_ok = true;
-    unsigned size = unsigned(refData->m_width) * unsigned(refData->m_height);
-    if (refData->m_alpha != NULL)
-    {
-        refData_new->m_alpha = (unsigned char*)malloc(size);
-        memcpy(refData_new->m_alpha, refData->m_alpha, size);
-    }
-    size *= 3;
-    refData_new->m_data = (unsigned char*)malloc(size);
-    memcpy(refData_new->m_data, refData->m_data, size);
-#if wxUSE_PALETTE
-    refData_new->m_palette = refData->m_palette;
-#endif
-    refData_new->m_optionNames = refData->m_optionNames;
-    refData_new->m_optionValues = refData->m_optionValues;
-    return refData_new;
-}
-
-// returns a new image with the same dimensions, alpha, and mask as *this
-// if on_its_side is true, width and height are swapped
-wxImage wxImage::MakeEmptyClone(int flags) const
-{
-    wxImage image;
-
-    wxCHECK_MSG( IsOk(), image, wxS("invalid image") );
-
-    long height = M_IMGDATA->m_height;
-    long width  = M_IMGDATA->m_width;
-
-    if ( flags & Clone_SwapOrientation )
-        wxSwap( width, height );
-
-    if ( !image.Create( width, height, false ) )
-    {
-        wxFAIL_MSG( wxS("unable to create image") );
-        return image;
-    }
-
-    if ( M_IMGDATA->m_alpha )
-    {
-        image.SetAlpha();
-        wxCHECK2_MSG( image.GetAlpha(), return wxImage(),
-                      wxS("unable to create alpha channel") );
-    }
-
-    if ( M_IMGDATA->m_hasMask )
-    {
-        image.SetMaskColour( M_IMGDATA->m_maskRed,
-                             M_IMGDATA->m_maskGreen,
-                             M_IMGDATA->m_maskBlue );
-    }
-
-    return image;
-}
-
-wxImage wxImage::Copy() const
-{
-    wxImage image;
-
-    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
-
-    image.m_refData = CloneRefData(m_refData);
-
-    return image;
-}
-
-wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
-{
-    if( xFactor == 1 && yFactor == 1 )
-        return *this;
-
-    wxImage image;
-
-    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
-
-    // can't scale to/from 0 size
-    wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image,
-                 wxT("invalid new image size") );
-
-    long old_height = M_IMGDATA->m_height,
-         old_width  = M_IMGDATA->m_width;
-
-    wxCHECK_MSG( (old_height > 0) && (old_width > 0), image,
-                 wxT("invalid old image size") );
-
-    long width = old_width / xFactor ;
-    long height = old_height / yFactor ;
-
-    image.Create( width, height, false );
-
-    char unsigned *data = image.GetData();
-
-    wxCHECK_MSG( data, image, wxT("unable to create image") );
-
-    bool hasMask = false ;
-    unsigned char maskRed = 0;
-    unsigned char maskGreen = 0;
-    unsigned char maskBlue = 0 ;
-
-    const unsigned char *source_data = M_IMGDATA->m_data;
-    unsigned char *target_data = data;
-    const unsigned char *source_alpha = 0 ;
-    unsigned char *target_alpha = 0 ;
-    if (M_IMGDATA->m_hasMask)
-    {
-        hasMask = true ;
-        maskRed = M_IMGDATA->m_maskRed;
-        maskGreen = M_IMGDATA->m_maskGreen;
-        maskBlue =M_IMGDATA->m_maskBlue ;
-
-        image.SetMaskColour( M_IMGDATA->m_maskRed,
-                             M_IMGDATA->m_maskGreen,
-                             M_IMGDATA->m_maskBlue );
-    }
-    else
-    {
-        source_alpha = M_IMGDATA->m_alpha ;
-        if ( source_alpha )
-        {
-            image.SetAlpha() ;
-            target_alpha = image.GetAlpha() ;
-        }
-    }
-
-    for (long y = 0; y < height; y++)
-    {
-        for (long x = 0; x < width; x++)
-        {
-            unsigned long avgRed = 0 ;
-            unsigned long avgGreen = 0;
-            unsigned long avgBlue = 0;
-            unsigned long avgAlpha = 0 ;
-            unsigned long counter = 0 ;
-            // determine average
-            for ( int y1 = 0 ; y1 < yFactor ; ++y1 )
-            {
-                long y_offset = (y * yFactor + y1) * old_width;
-                for ( int x1 = 0 ; x1 < xFactor ; ++x1 )
-                {
-                    const unsigned char *pixel = source_data + 3 * ( y_offset + x * xFactor + x1 ) ;
-                    unsigned char red = pixel[0] ;
-                    unsigned char green = pixel[1] ;
-                    unsigned char blue = pixel[2] ;
-                    unsigned char alpha = 255  ;
-                    if ( source_alpha )
-                        alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
-                    if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
-                    {
-                        if ( alpha > 0 )
-                        {
-                            avgRed += red ;
-                            avgGreen += green ;
-                            avgBlue += blue ;
-                        }
-                        avgAlpha += alpha ;
-                        counter++ ;
-                    }
-                }
-            }
-            if ( counter == 0 )
-            {
-                *(target_data++) = M_IMGDATA->m_maskRed ;
-                *(target_data++) = M_IMGDATA->m_maskGreen ;
-                *(target_data++) = M_IMGDATA->m_maskBlue ;
-            }
-            else
-            {
-                if ( source_alpha )
-                    *(target_alpha++) = (unsigned char)(avgAlpha / counter ) ;
-                *(target_data++) = (unsigned char)(avgRed / counter);
-                *(target_data++) = (unsigned char)(avgGreen / counter);
-                *(target_data++) = (unsigned char)(avgBlue / counter);
-            }
-        }
-    }
-
-    // In case this is a cursor, make sure the hotspot is scaled accordingly:
-    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
-                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X))/xFactor);
-    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
-                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y))/yFactor);
-
-    return image;
-}
-
-wxImage
-wxImage::Scale( int width, int height, wxImageResizeQuality quality ) const
-{
-    wxImage image;
-
-    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
-
-    // can't scale to/from 0 size
-    wxCHECK_MSG( (width > 0) && (height > 0), image,
-                 wxT("invalid new image size") );
-
-    long old_height = M_IMGDATA->m_height,
-         old_width  = M_IMGDATA->m_width;
-    wxCHECK_MSG( (old_height > 0) && (old_width > 0), image,
-                 wxT("invalid old image size") );
-
-    // If the image's new width and height are the same as the original, no
-    // need to waste time or CPU cycles
-    if ( old_width == width && old_height == height )
-        return *this;
-
-    if (quality == wxIMAGE_QUALITY_HIGH)
-    {
-        quality = (width < old_width && height < old_height)
-            ? wxIMAGE_QUALITY_BOX_AVERAGE
-            : wxIMAGE_QUALITY_BICUBIC;
-    }
-
-    // Resample the image using the method as specified.
-    switch ( quality )
-    {
-        case wxIMAGE_QUALITY_NEAREST:
-            if ( old_width % width == 0 && old_width >= width &&
-                old_height % height == 0 && old_height >= height )
-            {
-                return ShrinkBy( old_width / width , old_height / height );
-            }
-
-            image = ResampleNearest(width, height);
-            break;
-
-        case wxIMAGE_QUALITY_BILINEAR:
-            image = ResampleBilinear(width, height);
-            break;
-
-        case wxIMAGE_QUALITY_BICUBIC:
-            image = ResampleBicubic(width, height);
-            break;
-
-        case wxIMAGE_QUALITY_BOX_AVERAGE:
-            image = ResampleBox(width, height);
-            break;
-    }
-
-    // If the original image has a mask, apply the mask to the new image
-    if (M_IMGDATA->m_hasMask)
-    {
-        image.SetMaskColour( M_IMGDATA->m_maskRed,
-                            M_IMGDATA->m_maskGreen,
-                            M_IMGDATA->m_maskBlue );
-    }
-
-    // In case this is a cursor, make sure the hotspot is scaled accordingly:
-    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
-                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);
-    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
-                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)*height)/old_height);
-
-    return image;
-}
-
-wxImage wxImage::ResampleNearest(int width, int height) const
-{
-    wxImage image;
-    image.Create( width, height, false );
-
-    unsigned char *data = image.GetData();
-
-    wxCHECK_MSG( data, image, wxT("unable to create image") );
-
-    const unsigned char *source_data = M_IMGDATA->m_data;
-    unsigned char *target_data = data;
-    const unsigned char *source_alpha = 0 ;
-    unsigned char *target_alpha = 0 ;
-
-    if ( !M_IMGDATA->m_hasMask )
-    {
-        source_alpha = M_IMGDATA->m_alpha ;
-        if ( source_alpha )
-        {
-            image.SetAlpha() ;
-            target_alpha = image.GetAlpha() ;
-        }
-    }
-
-    long old_height = M_IMGDATA->m_height,
-         old_width  = M_IMGDATA->m_width;
-    long x_delta = (old_width<<16) / width;
-    long y_delta = (old_height<<16) / height;
-
-    unsigned char* dest_pixel = target_data;
-
-    long y = 0;
-    for ( long j = 0; j < height; j++ )
-    {
-        const unsigned char* src_line = &source_data[(y>>16)*old_width*3];
-        const unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ;
-
-        long x = 0;
-        for ( long i = 0; i < width; i++ )
-        {
-            const unsigned char* src_pixel = &src_line[(x>>16)*3];
-            const unsigned char* src_alpha_pixel = source_alpha ? &src_alpha_line[(x>>16)] : 0 ;
-            dest_pixel[0] = src_pixel[0];
-            dest_pixel[1] = src_pixel[1];
-            dest_pixel[2] = src_pixel[2];
-            dest_pixel += 3;
-            if ( source_alpha )
-                *(target_alpha++) = *src_alpha_pixel ;
-            x += x_delta;
-        }
-
-        y += y_delta;
-    }
-
-    return image;
-}
-
-wxImage wxImage::ResampleBox(int width, int height) const
-{
-    // This function implements a simple pre-blur/box averaging method for
-    // downsampling that gives reasonably smooth results To scale the image
-    // down we will need to gather a grid of pixels of the size of the scale
-    // factor in each direction and then do an averaging of the pixels.
-
-    wxImage ret_image(width, height, false);
-
-    const double scale_factor_x = double(M_IMGDATA->m_width) / width;
-    const double scale_factor_y = double(M_IMGDATA->m_height) / height;
-
-    const int scale_factor_x_2 = (int)(scale_factor_x / 2);
-    const int scale_factor_y_2 = (int)(scale_factor_y / 2);
-
-    const unsigned char* src_data = M_IMGDATA->m_data;
-    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
-    unsigned char* dst_data = ret_image.GetData();
-    unsigned char* dst_alpha = NULL;
-
-    if ( src_alpha )
-    {
-        ret_image.SetAlpha();
-        dst_alpha = ret_image.GetAlpha();
-    }
-
-    int averaged_pixels, src_pixel_index;
-    double sum_r, sum_g, sum_b, sum_a;
-
-    for ( int y = 0; y < height; y++ )         // Destination image - Y direction
-    {
-        // Source pixel in the Y direction
-        int src_y = (int)(y * scale_factor_y);
-
-        for ( int x = 0; x < width; x++ )      // Destination image - X direction
-        {
-            // Source pixel in the X direction
-            int src_x = (int)(x * scale_factor_x);
-
-            // Box of pixels to average
-            averaged_pixels = 0;
-            sum_r = sum_g = sum_b = sum_a = 0.0;
-
-            for ( int j = int(src_y - scale_factor_y/2.0 + 1), k = j;
-                  j <= int(src_y + scale_factor_y_2) || j < k + 2;
-                  j++ )
-            {
-                // We don't care to average pixels that don't exist (edges)
-                if ( j < 0 || j > M_IMGDATA->m_height - 1 )
-                    continue;
-
-                for ( int i = int(src_x - scale_factor_x/2.0 + 1), e = i;
-                      i <= src_x + scale_factor_x_2 || i < e + 2;
-                      i++ )
-                {
-                    // Don't average edge pixels
-                    if ( i < 0 || i > M_IMGDATA->m_width - 1 )
-                        continue;
-
-                    // Calculate the actual index in our source pixels
-                    src_pixel_index = j * M_IMGDATA->m_width + i;
-
-                    sum_r += src_data[src_pixel_index * 3 + 0];
-                    sum_g += src_data[src_pixel_index * 3 + 1];
-                    sum_b += src_data[src_pixel_index * 3 + 2];
-                    if ( src_alpha )
-                        sum_a += src_alpha[src_pixel_index];
-
-                    averaged_pixels++;
-                }
-            }
-
-            // Calculate the average from the sum and number of averaged pixels
-            dst_data[0] = (unsigned char)(sum_r / averaged_pixels);
-            dst_data[1] = (unsigned char)(sum_g / averaged_pixels);
-            dst_data[2] = (unsigned char)(sum_b / averaged_pixels);
-            dst_data += 3;
-            if ( src_alpha )
-                *dst_alpha++ = (unsigned char)(sum_a / averaged_pixels);
-        }
-    }
-
-    return ret_image;
-}
-
-wxImage wxImage::ResampleBilinear(int width, int height) const
-{
-    // This function implements a Bilinear algorithm for resampling.
-    wxImage ret_image(width, height, false);
-    const unsigned char* src_data = M_IMGDATA->m_data;
-    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
-    unsigned char* dst_data = ret_image.GetData();
-    unsigned char* dst_alpha = NULL;
-
-    if ( src_alpha )
-    {
-        ret_image.SetAlpha();
-        dst_alpha = ret_image.GetAlpha();
-    }
-    double HFactor = double(M_IMGDATA->m_height) / height;
-    double WFactor = double(M_IMGDATA->m_width) / width;
-
-    int srcpixymax = M_IMGDATA->m_height - 1;
-    int srcpixxmax = M_IMGDATA->m_width - 1;
-
-    double srcpixy, srcpixy1, srcpixy2, dy, dy1;
-    double srcpixx, srcpixx1, srcpixx2, dx, dx1;
-
-    // initialize alpha values to avoid g++ warnings about possibly
-    // uninitialized variables
-    double r1, g1, b1, a1 = 0;
-    double r2, g2, b2, a2 = 0;
-
-    for ( int dsty = 0; dsty < height; dsty++ )
-    {
-        // We need to calculate the source pixel to interpolate from - Y-axis
-        srcpixy = double(dsty) * HFactor;
-        srcpixy1 = int(srcpixy);
-        srcpixy2 = ( srcpixy1 == srcpixymax ) ? srcpixy1 : srcpixy1 + 1.0;
-        dy = srcpixy - (int)srcpixy;
-        dy1 = 1.0 - dy;
-
-
-        for ( int dstx = 0; dstx < width; dstx++ )
-        {
-            // X-axis of pixel to interpolate from
-            srcpixx = double(dstx) * WFactor;
-            srcpixx1 = int(srcpixx);
-            srcpixx2 = ( srcpixx1 == srcpixxmax ) ? srcpixx1 : srcpixx1 + 1.0;
-            dx = srcpixx - (int)srcpixx;
-            dx1 = 1.0 - dx;
-
-            int x_offset1 = srcpixx1 < 0.0 ? 0 : srcpixx1 > srcpixxmax ? srcpixxmax : (int)srcpixx1;
-            int x_offset2 = srcpixx2 < 0.0 ? 0 : srcpixx2 > srcpixxmax ? srcpixxmax : (int)srcpixx2;
-            int y_offset1 = srcpixy1 < 0.0 ? 0 : srcpixy1 > srcpixymax ? srcpixymax : (int)srcpixy1;
-            int y_offset2 = srcpixy2 < 0.0 ? 0 : srcpixy2 > srcpixymax ? srcpixymax : (int)srcpixy2;
-
-            int src_pixel_index00 = y_offset1 * M_IMGDATA->m_width + x_offset1;
-            int src_pixel_index01 = y_offset1 * M_IMGDATA->m_width + x_offset2;
-            int src_pixel_index10 = y_offset2 * M_IMGDATA->m_width + x_offset1;
-            int src_pixel_index11 = y_offset2 * M_IMGDATA->m_width + x_offset2;
-
-            // first line
-            r1 = src_data[src_pixel_index00 * 3 + 0] * dx1 + src_data[src_pixel_index01 * 3 + 0] * dx;
-            g1 = src_data[src_pixel_index00 * 3 + 1] * dx1 + src_data[src_pixel_index01 * 3 + 1] * dx;
-            b1 = src_data[src_pixel_index00 * 3 + 2] * dx1 + src_data[src_pixel_index01 * 3 + 2] * dx;
-            if ( src_alpha )
-                a1 = src_alpha[src_pixel_index00] * dx1 + src_alpha[src_pixel_index01] * dx;
-
-            // second line
-            r2 = src_data[src_pixel_index10 * 3 + 0] * dx1 + src_data[src_pixel_index11 * 3 + 0] * dx;
-            g2 = src_data[src_pixel_index10 * 3 + 1] * dx1 + src_data[src_pixel_index11 * 3 + 1] * dx;
-            b2 = src_data[src_pixel_index10 * 3 + 2] * dx1 + src_data[src_pixel_index11 * 3 + 2] * dx;
-            if ( src_alpha )
-                a2 = src_alpha[src_pixel_index10] * dx1 + src_alpha[src_pixel_index11] * dx;
-
-            // result lines
-
-            dst_data[0] = static_cast<unsigned char>(r1 * dy1 + r2 * dy);
-            dst_data[1] = static_cast<unsigned char>(g1 * dy1 + g2 * dy);
-            dst_data[2] = static_cast<unsigned char>(b1 * dy1 + b2 * dy);
-            dst_data += 3;
-
-            if ( src_alpha )
-                *dst_alpha++ = static_cast<unsigned char>(a1 * dy1 + a2 * dy);
-        }
-    }
-
-    return ret_image;
-}
-
-// The following two local functions are for the B-spline weighting of the
-// bicubic sampling algorithm
-static inline double spline_cube(double value)
-{
-    return value <= 0.0 ? 0.0 : value * value * value;
-}
-
-static inline double spline_weight(double value)
-{
-    return (spline_cube(value + 2) -
-            4 * spline_cube(value + 1) +
-            6 * spline_cube(value) -
-            4 * spline_cube(value - 1)) / 6;
-}
-
-// This is the bicubic resampling algorithm
-wxImage wxImage::ResampleBicubic(int width, int height) const
-{
-    // This function implements a Bicubic B-Spline algorithm for resampling.
-    // This method is certainly a little slower than wxImage's default pixel
-    // replication method, however for most reasonably sized images not being
-    // upsampled too much on a fairly average CPU this difference is hardly
-    // noticeable and the results are far more pleasing to look at.
-    //
-    // This particular bicubic algorithm does pixel weighting according to a
-    // B-Spline that basically implements a Gaussian bell-like weighting
-    // kernel. Because of this method the results may appear a bit blurry when
-    // upsampling by large factors.  This is basically because a slight
-    // gaussian blur is being performed to get the smooth look of the upsampled
-    // image.
-
-    // Edge pixels: 3-4 possible solutions
-    // - (Wrap/tile) Wrap the image, take the color value from the opposite
-    // side of the image.
-    // - (Mirror)    Duplicate edge pixels, so that pixel at coordinate (2, n),
-    // where n is nonpositive, will have the value of (2, 1).
-    // - (Ignore)    Simply ignore the edge pixels and apply the kernel only to
-    // pixels which do have all neighbours.
-    // - (Clamp)     Choose the nearest pixel along the border. This takes the
-    // border pixels and extends them out to infinity.
-    //
-    // NOTE: below the y_offset and x_offset variables are being set for edge
-    // pixels using the "Mirror" method mentioned above
-
-    wxImage ret_image;
-
-    ret_image.Create(width, height, false);
-
-    const unsigned char* src_data = M_IMGDATA->m_data;
-    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
-    unsigned char* dst_data = ret_image.GetData();
-    unsigned char* dst_alpha = NULL;
-
-    if ( src_alpha )
-    {
-        ret_image.SetAlpha();
-        dst_alpha = ret_image.GetAlpha();
-    }
-
-    for ( int dsty = 0; dsty < height; dsty++ )
-    {
-        // We need to calculate the source pixel to interpolate from - Y-axis
-        double srcpixy = double(dsty * M_IMGDATA->m_height) / height;
-        double dy = srcpixy - (int)srcpixy;
-
-        for ( int dstx = 0; dstx < width; dstx++ )
-        {
-            // X-axis of pixel to interpolate from
-            double srcpixx = double(dstx * M_IMGDATA->m_width) / width;
-            double dx = srcpixx - (int)srcpixx;
-
-            // Sums for each color channel
-            double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0;
-
-            // Here we actually determine the RGBA values for the destination pixel
-            for ( int k = -1; k <= 2; k++ )
-            {
-                // Y offset
-                int y_offset = srcpixy + k < 0.0
-                                ? 0
-                                : srcpixy + k >= M_IMGDATA->m_height
-                                       ? M_IMGDATA->m_height - 1
-                                       : (int)(srcpixy + k);
-
-                // Loop across the X axis
-                for ( int i = -1; i <= 2; i++ )
-                {
-                    // X offset
-                    int x_offset = srcpixx + i < 0.0
-                                    ? 0
-                                    : srcpixx + i >= M_IMGDATA->m_width
-                                            ? M_IMGDATA->m_width - 1
-                                            : (int)(srcpixx + i);
-
-                    // Calculate the exact position where the source data
-                    // should be pulled from based on the x_offset and y_offset
-                    int src_pixel_index = y_offset*M_IMGDATA->m_width + x_offset;
-
-                    // Calculate the weight for the specified pixel according
-                    // to the bicubic b-spline kernel we're using for
-                    // interpolation
-                    double
-                        pixel_weight = spline_weight(i - dx)*spline_weight(k - dy);
-
-                    // Create a sum of all velues for each color channel
-                    // adjusted for the pixel's calculated weight
-                    sum_r += src_data[src_pixel_index * 3 + 0] * pixel_weight;
-                    sum_g += src_data[src_pixel_index * 3 + 1] * pixel_weight;
-                    sum_b += src_data[src_pixel_index * 3 + 2] * pixel_weight;
-                    if ( src_alpha )
-                        sum_a += src_alpha[src_pixel_index] * pixel_weight;
-                }
-            }
-
-            // Put the data into the destination image.  The summed values are
-            // of double data type and are rounded here for accuracy
-            dst_data[0] = (unsigned char)(sum_r + 0.5);
-            dst_data[1] = (unsigned char)(sum_g + 0.5);
-            dst_data[2] = (unsigned char)(sum_b + 0.5);
-            dst_data += 3;
-
-            if ( src_alpha )
-                *dst_alpha++ = (unsigned char)sum_a;
-        }
-    }
-
-    return ret_image;
-}
-
-// Blur in the horizontal direction
-wxImage wxImage::BlurHorizontal(int blurRadius) const
-{
-    wxImage ret_image(MakeEmptyClone());
-
-    wxCHECK( ret_image.IsOk(), ret_image );
-
-    const unsigned char* src_data = M_IMGDATA->m_data;
-    unsigned char* dst_data = ret_image.GetData();
-    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
-    unsigned char* dst_alpha = ret_image.GetAlpha();
-
-    // number of pixels we average over
-    const int blurArea = blurRadius*2 + 1;
-
-    // Horizontal blurring algorithm - average all pixels in the specified blur
-    // radius in the X or horizontal direction
-    for ( int y = 0; y < M_IMGDATA->m_height; y++ )
-    {
-        // Variables used in the blurring algorithm
-        long sum_r = 0,
-             sum_g = 0,
-             sum_b = 0,
-             sum_a = 0;
-
-        long pixel_idx;
-        const unsigned char *src;
-        unsigned char *dst;
-
-        // Calculate the average of all pixels in the blur radius for the first
-        // pixel of the row
-        for ( int kernel_x = -blurRadius; kernel_x <= blurRadius; kernel_x++ )
-        {
-            // To deal with the pixels at the start of a row so it's not
-            // grabbing GOK values from memory at negative indices of the
-            // image's data or grabbing from the previous row
-            if ( kernel_x < 0 )
-                pixel_idx = y * M_IMGDATA->m_width;
-            else
-                pixel_idx = kernel_x + y * M_IMGDATA->m_width;
-
-            src = src_data + pixel_idx*3;
-            sum_r += src[0];
-            sum_g += src[1];
-            sum_b += src[2];
-            if ( src_alpha )
-                sum_a += src_alpha[pixel_idx];
-        }
-
-        dst = dst_data + y * M_IMGDATA->m_width*3;
-        dst[0] = (unsigned char)(sum_r / blurArea);
-        dst[1] = (unsigned char)(sum_g / blurArea);
-        dst[2] = (unsigned char)(sum_b / blurArea);
-        if ( src_alpha )
-            dst_alpha[y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
-
-        // Now average the values of the rest of the pixels by just moving the
-        // blur radius box along the row
-        for ( int x = 1; x < M_IMGDATA->m_width; x++ )
-        {
-            // Take care of edge pixels on the left edge by essentially
-            // duplicating the edge pixel
-            if ( x - blurRadius - 1 < 0 )
-                pixel_idx = y * M_IMGDATA->m_width;
-            else
-                pixel_idx = (x - blurRadius - 1) + y * M_IMGDATA->m_width;
-
-            // Subtract the value of the pixel at the left side of the blur
-            // radius box
-            src = src_data + pixel_idx*3;
-            sum_r -= src[0];
-            sum_g -= src[1];
-            sum_b -= src[2];
-            if ( src_alpha )
-                sum_a -= src_alpha[pixel_idx];
-
-            // Take care of edge pixels on the right edge
-            if ( x + blurRadius > M_IMGDATA->m_width - 1 )
-                pixel_idx = M_IMGDATA->m_width - 1 + y * M_IMGDATA->m_width;
-            else
-                pixel_idx = x + blurRadius + y * M_IMGDATA->m_width;
-
-            // Add the value of the pixel being added to the end of our box
-            src = src_data + pixel_idx*3;
-            sum_r += src[0];
-            sum_g += src[1];
-            sum_b += src[2];
-            if ( src_alpha )
-                sum_a += src_alpha[pixel_idx];
-
-            // Save off the averaged data
-            dst = dst_data + x*3 + y*M_IMGDATA->m_width*3;
-            dst[0] = (unsigned char)(sum_r / blurArea);
-            dst[1] = (unsigned char)(sum_g / blurArea);
-            dst[2] = (unsigned char)(sum_b / blurArea);
-            if ( src_alpha )
-                dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
-        }
-    }
-
-    return ret_image;
-}
-
-// Blur in the vertical direction
-wxImage wxImage::BlurVertical(int blurRadius) const
-{
-    wxImage ret_image(MakeEmptyClone());
-
-    wxCHECK( ret_image.IsOk(), ret_image );
-
-    const unsigned char* src_data = M_IMGDATA->m_data;
-    unsigned char* dst_data = ret_image.GetData();
-    const unsigned char* src_alpha = M_IMGDATA->m_alpha;
-    unsigned char* dst_alpha = ret_image.GetAlpha();
-
-    // number of pixels we average over
-    const int blurArea = blurRadius*2 + 1;
-
-    // Vertical blurring algorithm - same as horizontal but switched the
-    // opposite direction
-    for ( int x = 0; x < M_IMGDATA->m_width; x++ )
-    {
-        // Variables used in the blurring algorithm
-        long sum_r = 0,
-             sum_g = 0,
-             sum_b = 0,
-             sum_a = 0;
-
-        long pixel_idx;
-        const unsigned char *src;
-        unsigned char *dst;
-
-        // Calculate the average of all pixels in our blur radius box for the
-        // first pixel of the column
-        for ( int kernel_y = -blurRadius; kernel_y <= blurRadius; kernel_y++ )
-        {
-            // To deal with the pixels at the start of a column so it's not
-            // grabbing GOK values from memory at negative indices of the
-            // image's data or grabbing from the previous column
-            if ( kernel_y < 0 )
-                pixel_idx = x;
-            else
-                pixel_idx = x + kernel_y * M_IMGDATA->m_width;
-
-            src = src_data + pixel_idx*3;
-            sum_r += src[0];
-            sum_g += src[1];
-            sum_b += src[2];
-            if ( src_alpha )
-                sum_a += src_alpha[pixel_idx];
-        }
-
-        dst = dst_data + x*3;
-        dst[0] = (unsigned char)(sum_r / blurArea);
-        dst[1] = (unsigned char)(sum_g / blurArea);
-        dst[2] = (unsigned char)(sum_b / blurArea);
-        if ( src_alpha )
-            dst_alpha[x] = (unsigned char)(sum_a / blurArea);
-
-        // Now average the values of the rest of the pixels by just moving the
-        // box along the column from top to bottom
-        for ( int y = 1; y < M_IMGDATA->m_height; y++ )
-        {
-            // Take care of pixels that would be beyond the top edge by
-            // duplicating the top edge pixel for the column
-            if ( y - blurRadius - 1 < 0 )
-                pixel_idx = x;
-            else
-                pixel_idx = x + (y - blurRadius - 1) * M_IMGDATA->m_width;
-
-            // Subtract the value of the pixel at the top of our blur radius box
-            src = src_data + pixel_idx*3;
-            sum_r -= src[0];
-            sum_g -= src[1];
-            sum_b -= src[2];
-            if ( src_alpha )
-                sum_a -= src_alpha[pixel_idx];
-
-            // Take care of the pixels that would be beyond the bottom edge of
-            // the image similar to the top edge
-            if ( y + blurRadius > M_IMGDATA->m_height - 1 )
-                pixel_idx = x + (M_IMGDATA->m_height - 1) * M_IMGDATA->m_width;
-            else
-                pixel_idx = x + (blurRadius + y) * M_IMGDATA->m_width;
-
-            // Add the value of the pixel being added to the end of our box
-            src = src_data + pixel_idx*3;
-            sum_r += src[0];
-            sum_g += src[1];
-            sum_b += src[2];
-            if ( src_alpha )
-                sum_a += src_alpha[pixel_idx];
-
-            // Save off the averaged data
-            dst = dst_data + (x + y * M_IMGDATA->m_width) * 3;
-            dst[0] = (unsigned char)(sum_r / blurArea);
-            dst[1] = (unsigned char)(sum_g / blurArea);
-            dst[2] = (unsigned char)(sum_b / blurArea);
-            if ( src_alpha )
-                dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
-        }
-    }
-
-    return ret_image;
-}
-
-// The new blur function
-wxImage wxImage::Blur(int blurRadius) const
-{
-    wxImage ret_image;
-    ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
-
-    // Blur the image in each direction
-    ret_image = BlurHorizontal(blurRadius);
-    ret_image = ret_image.BlurVertical(blurRadius);
-
-    return ret_image;
-}
-
-wxImage wxImage::Rotate90( bool clockwise ) const
-{
-    wxImage image(MakeEmptyClone(Clone_SwapOrientation));
-
-    wxCHECK( image.IsOk(), image );
-
-    long height = M_IMGDATA->m_height;
-    long width  = M_IMGDATA->m_width;
-
-    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
-    {
-        int hot_x = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_X );
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
-                        clockwise ? hot_x : width - 1 - hot_x);
-    }
-
-    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
-    {
-        int hot_y = GetOptionInt( wxIMAGE_OPTION_CUR_HOTSPOT_Y );
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
-                        clockwise ? height - 1 - hot_y : hot_y);
-    }
-
-    unsigned char *data = image.GetData();
-    unsigned char *target_data;
-
-    // we rotate the image in 21-pixel (63-byte) wide strips
-    // to make better use of cpu cache - memory transfers
-    // (note: while much better than single-pixel "strips",
-    //  our vertical strips will still generally straddle 64-byte cachelines)
-    for (long ii = 0; ii < width; )
-    {
-        long next_ii = wxMin(ii + 21, width);
-
-        for (long j = 0; j < height; j++)
-        {
-            const unsigned char *source_data
-                                     = M_IMGDATA->m_data + (j*width + ii)*3;
-
-            for (long i = ii; i < next_ii; i++)
-            {
-                if ( clockwise )
-                {
-                    target_data = data + ((i + 1)*height - j - 1)*3;
-                }
-                else
-                {
-                    target_data = data + (height*(width - 1 - i) + j)*3;
-                }
-                memcpy( target_data, source_data, 3 );
-                source_data += 3;
-            }
-        }
-
-        ii = next_ii;
-    }
-
-    const unsigned char *source_alpha = M_IMGDATA->m_alpha;
-
-    if ( source_alpha )
-    {
-        unsigned char *alpha_data = image.GetAlpha();
-        unsigned char *target_alpha = 0 ;
-
-        for (long ii = 0; ii < width; )
-        {
-            long next_ii = wxMin(ii + 64, width);
-
-            for (long j = 0; j < height; j++)
-            {
-                source_alpha = M_IMGDATA->m_alpha + j*width + ii;
-
-                for (long i = ii; i < next_ii; i++)
-                {
-                    if ( clockwise )
-                    {
-                        target_alpha = alpha_data + (i+1)*height - j - 1;
-                    }
-                    else
-                    {
-                        target_alpha = alpha_data + height*(width - i - 1) + j;
-                    }
-
-                    *target_alpha = *source_alpha++;
-                }
-            }
-
-            ii = next_ii;
-        }
-    }
-
-    return image;
-}
-
-wxImage wxImage::Rotate180() const
-{
-    wxImage image(MakeEmptyClone());
-
-    wxCHECK( image.IsOk(), image );
-
-    long height = M_IMGDATA->m_height;
-    long width  = M_IMGDATA->m_width;
-
-    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
-    {
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
-                        width - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X));
-    }
-
-    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
-    {
-        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
-                        height - 1 - GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y));
-    }
-
-    unsigned char *data = image.GetData();
-    unsigned char *alpha = image.GetAlpha();
-    const unsigned char *source_data = M_IMGDATA->m_data;
-    unsigned char *target_data = data + width * height * 3;
-
-    for (long j = 0; j < height; j++)
-    {
-        for (long i = 0; i < width; i++)
-        {
-            target_data -= 3;
-            memcpy( target_data, source_data, 3 );
-            source_data += 3;
-        }
-    }
-
-    if ( alpha )
-    {
-        const unsigned char *src_alpha = M_IMGDATA->m_alpha;
-        unsigned char *dest_alpha = alpha + width * height;
-
-        for (long j = 0; j < height; ++j)
-        {
-            for (long i = 0; i < width; ++i)
-            {
-                *(--dest_alpha) = *(src_alpha++);
-            }
-        }
-    }
-
-    return image;
-}
-
-wxImage wxImage::Mirror( bool horizontally ) const
-{
-    wxImage image(MakeEmptyClone());
-
-    wxCHECK( image.IsOk(), image );
-
-    long height = M_IMGDATA->m_height;
-    long width  = M_IMGDATA->m_width;
-
-    unsigned char *data = image.GetData();
-    unsigned char *alpha = image.GetAlpha();
-    const unsigned char *source_data = M_IMGDATA->m_data;
-    unsigned char *target_data;
-
-    if (horizontally)
-    {
-        for (long j = 0; j < height; j++)
-        {
-            data += width*3;
-            target_data = data-3;
-            for (long i = 0; i < width; i++)
-            {
-                memcpy( target_data, source_data, 3 );
-                source_data += 3;
-                target_data -= 3;
-            }
-        }
-
-        if (alpha != NULL)
-        {
-            // src_alpha starts at the first pixel and increases by 1 after each step
-            // (a step here is the copy of the alpha value of one pixel)
-            const unsigned char *src_alpha = M_IMGDATA->m_alpha;
-            // dest_alpha starts just beyond the first line, decreases before each step,
-            // and after each line is finished, increases by 2 widths (skipping the line
-            // just copied and the line that will be copied next)
-            unsigned char *dest_alpha = alpha + width;
-
-            for (long jj = 0; jj < height; ++jj)
-            {
-                for (long i = 0; i < width; ++i) {
-                    *(--dest_alpha) = *(src_alpha++); // copy one pixel
-                }
-                dest_alpha += 2 * width; // advance beyond the end of the next line
-            }
-        }
-    }
-    else
-    {
-        for (long i = 0; i < height; i++)
-        {
-            target_data = data + 3*width*(height-1-i);
-            memcpy( target_data, source_data, (size_t)3*width );
-            source_data += 3*width;
-        }
-
-        if ( alpha )
-        {
-            // src_alpha starts at the first pixel and increases by 1 width after each step
-            // (a step here is the copy of the alpha channel of an entire line)
-            const unsigned char *src_alpha = M_IMGDATA->m_alpha;
-            // dest_alpha starts just beyond the last line (beyond the whole image)
-            // and decreases by 1 width before each step
-            unsigned char *dest_alpha = alpha + width * height;
-
-            for (long jj = 0; jj < height; ++jj)
-            {
-                dest_alpha -= width;
-                memcpy( dest_alpha, src_alpha, (size_t)width );
-                src_alpha += width;
-            }
-        }
-    }
-
-    return image;
-}
-
-wxImage wxImage::GetSubImage( const wxRect &rect ) const
-{
-    wxImage image;
-
-    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
-
-    wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) &&
-                 (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
-                 image, wxT("invalid subimage size") );
-
-    const int subwidth = rect.GetWidth();
-    const int subheight = rect.GetHeight();
-
-    image.Create( subwidth, subheight, false );
-
-    const unsigned char *src_data = GetData();
-    const unsigned char *src_alpha = M_IMGDATA->m_alpha;
-    unsigned char *subdata = image.GetData();
-    unsigned char *subalpha = NULL;
-
-    wxCHECK_MSG( subdata, image, wxT("unable to create image") );
-
-    if ( src_alpha ) {
-        image.SetAlpha();
-        subalpha = image.GetAlpha();
-        wxCHECK_MSG( subalpha, image, wxT("unable to create alpha channel"));
-    }
-
-    if (M_IMGDATA->m_hasMask)
-        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
-
-    const int width = GetWidth();
-    const int pixsoff = rect.GetLeft() + width * rect.GetTop();
-
-    src_data += 3 * pixsoff;
-    src_alpha += pixsoff; // won't be used if was NULL, so this is ok
-
-    for (long j = 0; j < subheight; ++j)
-    {
-        memcpy( subdata, src_data, 3 * subwidth );
-        subdata += 3 * subwidth;
-        src_data += 3 * width;
-        if (subalpha != NULL) {
-            memcpy( subalpha, src_alpha, subwidth );
-            subalpha += subwidth;
-            src_alpha += width;
-        }
-    }
-
-    return image;
-}
-
-wxImage wxImage::Size( const wxSize& size, const wxPoint& pos,
-                       int r_, int g_, int b_ ) const
-{
-    wxImage image;
-
-    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
-    wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") );
-
-    int width = GetWidth(), height = GetHeight();
-    image.Create(size.GetWidth(), size.GetHeight(), false);
-
-    unsigned char r = (unsigned char)r_;
-    unsigned char g = (unsigned char)g_;
-    unsigned char b = (unsigned char)b_;
-    if ((r_ == -1) && (g_ == -1) && (b_ == -1))
-    {
-        GetOrFindMaskColour( &r, &g, &b );
-        image.SetMaskColour(r, g, b);
-    }
-
-    image.SetRGB(wxRect(), r, g, b);
-
-    // we have two coordinate systems:
-    // source:     starting at 0,0 of source image
-    // destination starting at 0,0 of destination image
-    // Documentation says:
-    // "The image is pasted into a new image [...] at the position pos relative
-    // to the upper left of the new image." this means the transition rule is:
-    // "dest coord" = "source coord" + pos;
-
-    // calculate the intersection using source coordinates:
-    wxRect srcRect(0, 0, width, height);
-    wxRect dstRect(-pos, size);
-
-    srcRect.Intersect(dstRect);
-
-    if (!srcRect.IsEmpty())
-    {
-        // insertion point is needed in destination coordinates.
-        // NB: it is not always "pos"!
-        wxPoint ptInsert = srcRect.GetTopLeft() + pos;
-
-        if ((srcRect.GetWidth() == width) && (srcRect.GetHeight() == height))
-            image.Paste(*this, ptInsert.x, ptInsert.y);
-        else
-            image.Paste(GetSubImage(srcRect), ptInsert.x, ptInsert.y);
-    }
-
-    return image;
-}
-
-void wxImage::Paste( const wxImage &image, int x, int y )
-{
-    wxCHECK_RET( IsOk(), wxT("invalid image") );
-    wxCHECK_RET( image.IsOk(), wxT("invalid image") );
-
-    AllocExclusive();
-
-    int xx = 0;
-    int yy = 0;
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-
-    if (x < 0)
-    {
-        xx = -x;
-        width += x;
-    }
-    if (y < 0)
-    {
-        yy = -y;
-        height += y;
-    }
-
-    if ((x+xx)+width > M_IMGDATA->m_width)
-        width = M_IMGDATA->m_width - (x+xx);
-    if ((y+yy)+height > M_IMGDATA->m_height)
-        height = M_IMGDATA->m_height - (y+yy);
-
-    if (width < 1) return;
-    if (height < 1) return;
-
-    // If we can, copy the data using memcpy() as this is the fastest way. But
-    // for this  the image being pasted must have "compatible" mask with this
-    // one meaning that either it must not have one at all or it must use the
-    // same masked colour.
-    if ( !image.HasMask() ||
-        ((HasMask() &&
-         (GetMaskRed()==image.GetMaskRed()) &&
-         (GetMaskGreen()==image.GetMaskGreen()) &&
-         (GetMaskBlue()==image.GetMaskBlue()))) )
-    {
-        const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth());
-        int source_step = image.GetWidth()*3;
-
-        unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width);
-        int target_step = M_IMGDATA->m_width*3;
-        for (int j = 0; j < height; j++)
-        {
-            memcpy( target_data, source_data, width*3 );
-            source_data += source_step;
-            target_data += target_step;
-        }
-    }
-
-    // Copy over the alpha channel from the original image
-    if ( image.HasAlpha() )
-    {
-        if ( !HasAlpha() )
-            InitAlpha();
-
-        const unsigned char* source_data = image.GetAlpha() + xx + yy*image.GetWidth();
-        int source_step = image.GetWidth();
-
-        unsigned char* target_data = GetAlpha() + (x+xx) + (y+yy)*M_IMGDATA->m_width;
-        int target_step = M_IMGDATA->m_width;
-
-        for (int j = 0; j < height; j++,
-                                    source_data += source_step,
-                                    target_data += target_step)
-        {
-            memcpy( target_data, source_data, width );
-        }
-    }
-
-    if (!HasMask() && image.HasMask())
-    {
-        unsigned char r = image.GetMaskRed();
-        unsigned char g = image.GetMaskGreen();
-        unsigned char b = image.GetMaskBlue();
-
-        const unsigned char* source_data = image.GetData() + 3*(xx + yy*image.GetWidth());
-        int source_step = image.GetWidth()*3;
-
-        unsigned char* target_data = GetData() + 3*((x+xx) + (y+yy)*M_IMGDATA->m_width);
-        int target_step = M_IMGDATA->m_width*3;
-
-        for (int j = 0; j < height; j++)
-        {
-            for (int i = 0; i < width*3; i+=3)
-            {
-                if ((source_data[i]   != r) ||
-                    (source_data[i+1] != g) ||
-                    (source_data[i+2] != b))
-                {
-                    memcpy( target_data+i, source_data+i, 3 );
-                }
-            }
-            source_data += source_step;
-            target_data += target_step;
-        }
-    }
-}
-
-void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
-                       unsigned char r2, unsigned char g2, unsigned char b2 )
-{
-    wxCHECK_RET( IsOk(), wxT("invalid image") );
-
-    AllocExclusive();
-
-    unsigned char *data = GetData();
-
-    const int w = GetWidth();
-    const int h = GetHeight();
-
-    for (int j = 0; j < h; j++)
-        for (int i = 0; i < w; i++)
-        {
-            if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1))
-            {
-                data[0] = r2;
-                data[1] = g2;
-                data[2] = b2;
-            }
-            data += 3;
-        }
-}
-
-wxImage wxImage::ConvertToGreyscale(void) const
-{
-    return ConvertToGreyscale(0.299, 0.587, 0.114);
-}
-
-wxImage wxImage::ConvertToGreyscale(double weight_r, double weight_g, double weight_b) const
-{
-    wxImage image(MakeEmptyClone());
-
-    wxCHECK( image.IsOk(), image );
-
-    const unsigned char *src = M_IMGDATA->m_data;
-    unsigned char *dest = image.GetData();
-
-    const bool hasMask = M_IMGDATA->m_hasMask;
-    const unsigned char maskRed = M_IMGDATA->m_maskRed;
-    const unsigned char maskGreen = M_IMGDATA->m_maskGreen;
-    const unsigned char maskBlue = M_IMGDATA->m_maskBlue;
-
-    const long size = M_IMGDATA->m_width * M_IMGDATA->m_height;
-    for ( long i = 0; i < size; i++, src += 3, dest += 3 )
-    {
-        memcpy(dest, src, 3);
-        // only modify non-masked pixels
-        if ( !hasMask || src[0] != maskRed || src[1] != maskGreen || src[2] != maskBlue )
-        {
-            wxColour::MakeGrey(dest + 0, dest + 1, dest + 2, weight_r, weight_g, weight_b);
-        }
-    }
-
-    // copy the alpha channel, if any
-    if ( image.HasAlpha() )
-    {
-        memcpy( image.GetAlpha(), GetAlpha(), GetWidth() * GetHeight() );
-    }
-
-    return image;
-}
-
-wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const
-{
-    wxImage image;
-
-    wxCHECK_MSG( IsOk(), image, wxT("invalid image") );
-
-    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
-
-    unsigned char *data = image.GetData();
-
-    wxCHECK_MSG( data, image, wxT("unable to create image") );
-
-    if (M_IMGDATA->m_hasMask)
-    {
-        if (M_IMGDATA->m_maskRed == r && M_IMGDATA->m_maskGreen == g &&
-                                         M_IMGDATA->m_maskBlue == b)
-            image.SetMaskColour( 255, 255, 255 );
-        else
-            image.SetMaskColour( 0, 0, 0 );
-    }
-
-    long size = M_IMGDATA->m_height * M_IMGDATA->m_width;
-
-    unsigned char *srcd = M_IMGDATA->m_data;
-    unsigned char *tard = image.GetData();
-
-    for ( long i = 0; i < size; i++, srcd += 3, tard += 3 )
-    {
-        bool on = (srcd[0] == r) && (srcd[1] == g) && (srcd[2] == b);
-        wxColourBase::MakeMono(tard + 0, tard + 1, tard + 2, on);
-    }
-
-    return image;
-}
-
-wxImage wxImage::ConvertToDisabled(unsigned char brightness) const
-{
-    wxImage image = *this;
-
-    unsigned char mr = image.GetMaskRed();
-    unsigned char mg = image.GetMaskGreen();
-    unsigned char mb = image.GetMaskBlue();
-
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-    bool has_mask = image.HasMask();
-
-    for (int y = height-1; y >= 0; --y)
-    {
-        for (int x = width-1; x >= 0; --x)
-        {
-            unsigned char* data = image.GetData() + (y*(width*3))+(x*3);
-            unsigned char* r = data;
-            unsigned char* g = data+1;
-            unsigned char* b = data+2;
-
-            if (has_mask && (*r == mr) && (*g == mg) && (*b == mb))
-                continue;
-
-            wxColour::MakeDisabled(r, g, b, brightness);
-        }
-    }
-    return image;
-}
-
-int wxImage::GetWidth() const
-{
-    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
-
-    return M_IMGDATA->m_width;
-}
-
-int wxImage::GetHeight() const
-{
-    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
-
-    return M_IMGDATA->m_height;
-}
-
-wxBitmapType wxImage::GetType() const
-{
-    wxCHECK_MSG( IsOk(), wxBITMAP_TYPE_INVALID, wxT("invalid image") );
-
-    return M_IMGDATA->m_type;
-}
-
-void wxImage::SetType(wxBitmapType type)
-{
-    wxCHECK_RET( IsOk(), "must create the image before setting its type");
-
-    // type can be wxBITMAP_TYPE_INVALID to reset the image type to default
-    wxASSERT_MSG( type != wxBITMAP_TYPE_MAX, "invalid bitmap type" );
-
-    M_IMGDATA->m_type = type;
-}
-
-long wxImage::XYToIndex(int x, int y) const
-{
-    if ( IsOk() &&
-            x >= 0 && y >= 0 &&
-                x < M_IMGDATA->m_width && y < M_IMGDATA->m_height )
-    {
-        return y*M_IMGDATA->m_width + x;
-    }
-
-    return -1;
-}
-
-void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
-{
-    long pos = XYToIndex(x, y);
-    wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );
-
-    AllocExclusive();
-
-    pos *= 3;
-
-    M_IMGDATA->m_data[ pos   ] = r;
-    M_IMGDATA->m_data[ pos+1 ] = g;
-    M_IMGDATA->m_data[ pos+2 ] = b;
-}
-
-void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b )
-{
-    wxCHECK_RET( IsOk(), wxT("invalid image") );
-
-    AllocExclusive();
-
-    wxRect rect(rect_);
-    wxRect imageRect(0, 0, GetWidth(), GetHeight());
-    if ( rect == wxRect() )
-    {
-        rect = imageRect;
-    }
-    else
-    {
-        wxCHECK_RET( imageRect.Contains(rect.GetTopLeft()) &&
-                     imageRect.Contains(rect.GetBottomRight()),
-                     wxT("invalid bounding rectangle") );
-    }
-
-    int x1 = rect.GetLeft(),
-        y1 = rect.GetTop(),
-        x2 = rect.GetRight() + 1,
-        y2 = rect.GetBottom() + 1;
-
-    unsigned char *data wxDUMMY_INITIALIZE(NULL);
-    int x, y, width = GetWidth();
-    for (y = y1; y < y2; y++)
-    {
-        data = M_IMGDATA->m_data + (y*width + x1)*3;
-        for (x = x1; x < x2; x++)
-        {
-            *data++ = r;
-            *data++ = g;
-            *data++ = b;
-        }
-    }
-}
-
-unsigned char wxImage::GetRed( int x, int y ) const
-{
-    long pos = XYToIndex(x, y);
-    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
-
-    pos *= 3;
-
-    return M_IMGDATA->m_data[pos];
-}
-
-unsigned char wxImage::GetGreen( int x, int y ) const
-{
-    long pos = XYToIndex(x, y);
-    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
-
-    pos *= 3;
-
-    return M_IMGDATA->m_data[pos+1];
-}
-
-unsigned char wxImage::GetBlue( int x, int y ) const
-{
-    long pos = XYToIndex(x, y);
-    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
-
-    pos *= 3;
-
-    return M_IMGDATA->m_data[pos+2];
-}
-
-bool wxImage::IsOk() const
-{
-    // image of 0 width or height can't be considered ok - at least because it
-    // causes crashes in ConvertToBitmap() if we don't catch it in time
-    wxImageRefData *data = M_IMGDATA;
-    return data && data->m_ok && data->m_width && data->m_height;
-}
-
-unsigned char *wxImage::GetData() const
-{
-    wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") );
-
-    return M_IMGDATA->m_data;
-}
-
-void wxImage::SetData( unsigned char *data, bool static_data  )
-{
-    wxCHECK_RET( IsOk(), wxT("invalid image") );
-
-    wxImageRefData *newRefData = new wxImageRefData();
-
-    newRefData->m_width = M_IMGDATA->m_width;
-    newRefData->m_height = M_IMGDATA->m_height;
-    newRefData->m_data = data;
-    newRefData->m_ok = true;
-    newRefData->m_maskRed = M_IMGDATA->m_maskRed;
-    newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
-    newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
-    newRefData->m_hasMask = M_IMGDATA->m_hasMask;
-    newRefData->m_static = static_data;
-
-    UnRef();
-
-    m_refData = newRefData;
-}
-
-void wxImage::SetData( unsigned char *data, int new_width, int new_height, bool static_data )
-{
-    wxImageRefData *newRefData = new wxImageRefData();
-
-    if (m_refData)
-    {
-        newRefData->m_width = new_width;
-        newRefData->m_height = new_height;
-        newRefData->m_data = data;
-        newRefData->m_ok = true;
-        newRefData->m_maskRed = M_IMGDATA->m_maskRed;
-        newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
-        newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
-        newRefData->m_hasMask = M_IMGDATA->m_hasMask;
-    }
-    else
-    {
-        newRefData->m_width = new_width;
-        newRefData->m_height = new_height;
-        newRefData->m_data = data;
-        newRefData->m_ok = true;
-    }
-    newRefData->m_static = static_data;
-
-    UnRef();
-
-    m_refData = newRefData;
-}
-
-// ----------------------------------------------------------------------------
-// alpha channel support
-// ----------------------------------------------------------------------------
-
-void wxImage::SetAlpha(int x, int y, unsigned char alpha)
-{
-    wxCHECK_RET( HasAlpha(), wxT("no alpha channel") );
-
-    long pos = XYToIndex(x, y);
-    wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );
-
-    AllocExclusive();
-
-    M_IMGDATA->m_alpha[pos] = alpha;
-}
-
-unsigned char wxImage::GetAlpha(int x, int y) const
-{
-    wxCHECK_MSG( HasAlpha(), 0, wxT("no alpha channel") );
-
-    long pos = XYToIndex(x, y);
-    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
-
-    return M_IMGDATA->m_alpha[pos];
-}
-
-bool
-wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b)
-{
-    SetAlpha(NULL);
-
-    const int w = M_IMGDATA->m_width;
-    const int h = M_IMGDATA->m_height;
-
-    unsigned char *alpha = GetAlpha();
-    unsigned char *data = GetData();
-
-    for ( int y = 0; y < h; y++ )
-    {
-        for ( int x = 0; x < w; x++ )
-        {
-            *alpha++ = *data;
-            *data++ = r;
-            *data++ = g;
-            *data++ = b;
-        }
-    }
-
-    return true;
-}
-
-void wxImage::SetAlpha( unsigned char *alpha, bool static_data )
-{
-    wxCHECK_RET( IsOk(), wxT("invalid image") );
-
-    AllocExclusive();
-
-    if ( !alpha )
-    {
-        alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
-    }
-
-    if( !M_IMGDATA->m_staticAlpha )
-        free(M_IMGDATA->m_alpha);
-
-    M_IMGDATA->m_alpha = alpha;
-    M_IMGDATA->m_staticAlpha = static_data;
-}
-
-unsigned char *wxImage::GetAlpha() const
-{
-    wxCHECK_MSG( IsOk(), (unsigned char *)NULL, wxT("invalid image") );
-
-    return M_IMGDATA->m_alpha;
-}
-
-void wxImage::InitAlpha()
-{
-    wxCHECK_RET( !HasAlpha(), wxT("image already has an alpha channel") );
-
-    // initialize memory for alpha channel
-    SetAlpha();
-
-    unsigned char *alpha = M_IMGDATA->m_alpha;
-    const size_t lenAlpha = M_IMGDATA->m_width * M_IMGDATA->m_height;
-
-    if ( HasMask() )
-    {
-        // use the mask to initialize the alpha channel.
-        const unsigned char * const alphaEnd = alpha + lenAlpha;
-
-        const unsigned char mr = M_IMGDATA->m_maskRed;
-        const unsigned char mg = M_IMGDATA->m_maskGreen;
-        const unsigned char mb = M_IMGDATA->m_maskBlue;
-        for ( unsigned char *src = M_IMGDATA->m_data;
-              alpha < alphaEnd;
-              src += 3, alpha++ )
-        {
-            *alpha = (src[0] == mr && src[1] == mg && src[2] == mb)
-                            ? wxIMAGE_ALPHA_TRANSPARENT
-                            : wxIMAGE_ALPHA_OPAQUE;
-        }
-
-        M_IMGDATA->m_hasMask = false;
-    }
-    else // no mask
-    {
-        // make the image fully opaque
-        memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha);
-    }
-}
-
-void wxImage::ClearAlpha()
-{
-    wxCHECK_RET( HasAlpha(), wxT("image already doesn't have an alpha channel") );
-
-    if ( !M_IMGDATA->m_staticAlpha )
-        free( M_IMGDATA->m_alpha );
-
-    M_IMGDATA->m_alpha = NULL;
-}
-
-
-// ----------------------------------------------------------------------------
-// mask support
-// ----------------------------------------------------------------------------
-
-void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
-{
-    wxCHECK_RET( IsOk(), wxT("invalid image") );
-
-    AllocExclusive();
-
-    M_IMGDATA->m_maskRed = r;
-    M_IMGDATA->m_maskGreen = g;
-    M_IMGDATA->m_maskBlue = b;
-    M_IMGDATA->m_hasMask = true;
-}
-
-bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
-
-    if (M_IMGDATA->m_hasMask)
-    {
-        if (r) *r = M_IMGDATA->m_maskRed;
-        if (g) *g = M_IMGDATA->m_maskGreen;
-        if (b) *b = M_IMGDATA->m_maskBlue;
-        return true;
-    }
-    else
-    {
-        FindFirstUnusedColour(r, g, b);
-        return false;
-    }
-}
-
-unsigned char wxImage::GetMaskRed() const
-{
-    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
-
-    return M_IMGDATA->m_maskRed;
-}
-
-unsigned char wxImage::GetMaskGreen() const
-{
-    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
-
-    return M_IMGDATA->m_maskGreen;
-}
-
-unsigned char wxImage::GetMaskBlue() const
-{
-    wxCHECK_MSG( IsOk(), 0, wxT("invalid image") );
-
-    return M_IMGDATA->m_maskBlue;
-}
-
-void wxImage::SetMask( bool mask )
-{
-    wxCHECK_RET( IsOk(), wxT("invalid image") );
-
-    AllocExclusive();
-
-    M_IMGDATA->m_hasMask = mask;
-}
-
-bool wxImage::HasMask() const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
-
-    return M_IMGDATA->m_hasMask;
-}
-
-bool wxImage::IsTransparent(int x, int y, unsigned char threshold) const
-{
-    long pos = XYToIndex(x, y);
-    wxCHECK_MSG( pos != -1, false, wxT("invalid image coordinates") );
-
-    // check mask
-    if ( M_IMGDATA->m_hasMask )
-    {
-        const unsigned char *p = M_IMGDATA->m_data + 3*pos;
-        if ( p[0] == M_IMGDATA->m_maskRed &&
-                p[1] == M_IMGDATA->m_maskGreen &&
-                    p[2] == M_IMGDATA->m_maskBlue )
-        {
-            return true;
-        }
-    }
-
-    // then check alpha
-    if ( M_IMGDATA->m_alpha )
-    {
-        if ( M_IMGDATA->m_alpha[pos] < threshold )
-        {
-            // transparent enough
-            return true;
-        }
-    }
-
-    // not transparent
-    return false;
-}
-
-bool wxImage::SetMaskFromImage(const wxImage& mask,
-                               unsigned char mr, unsigned char mg, unsigned char mb)
-{
-    // check that the images are the same size
-    if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
-    {
-        wxLogError( _("Image and mask have different sizes.") );
-        return false;
-    }
-
-    // find unused colour
-    unsigned char r,g,b ;
-    if (!FindFirstUnusedColour(&r, &g, &b))
-    {
-        wxLogError( _("No unused colour in image being masked.") );
-        return false ;
-    }
-
-    AllocExclusive();
-
-    unsigned char *imgdata = GetData();
-    unsigned char *maskdata = mask.GetData();
-
-    const int w = GetWidth();
-    const int h = GetHeight();
-
-    for (int j = 0; j < h; j++)
-    {
-        for (int i = 0; i < w; i++)
-        {
-            if ((maskdata[0] == mr) && (maskdata[1]  == mg) && (maskdata[2] == mb))
-            {
-                imgdata[0] = r;
-                imgdata[1] = g;
-                imgdata[2] = b;
-            }
-            imgdata  += 3;
-            maskdata += 3;
-        }
-    }
-
-    SetMaskColour(r, g, b);
-    SetMask(true);
-
-    return true;
-}
-
-bool wxImage::ConvertAlphaToMask(unsigned char threshold)
-{
-    if ( !HasAlpha() )
-        return false;
-
-    unsigned char mr, mg, mb;
-    if ( !FindFirstUnusedColour(&mr, &mg, &mb) )
-    {
-        wxLogError( _("No unused colour in image being masked.") );
-        return false;
-    }
-
-    return ConvertAlphaToMask(mr, mg, mb, threshold);
-}
-
-bool wxImage::ConvertAlphaToMask(unsigned char mr,
-                                 unsigned char mg,
-                                 unsigned char mb,
-                                 unsigned char threshold)
-{
-    if ( !HasAlpha() )
-        return false;
-
-    AllocExclusive();
-
-    SetMask(true);
-    SetMaskColour(mr, mg, mb);
-
-    unsigned char *imgdata = GetData();
-    unsigned char *alphadata = GetAlpha();
-
-    int w = GetWidth();
-    int h = GetHeight();
-
-    for (int y = 0; y < h; y++)
-    {
-        for (int x = 0; x < w; x++, imgdata += 3, alphadata++)
-        {
-            if (*alphadata < threshold)
-            {
-                imgdata[0] = mr;
-                imgdata[1] = mg;
-                imgdata[2] = mb;
-            }
-        }
-    }
-
-    if ( !M_IMGDATA->m_staticAlpha )
-        free(M_IMGDATA->m_alpha);
-
-    M_IMGDATA->m_alpha = NULL;
-    M_IMGDATA->m_staticAlpha = false;
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// Palette functions
-// ----------------------------------------------------------------------------
-
-#if wxUSE_PALETTE
-
-bool wxImage::HasPalette() const
-{
-    if (!IsOk())
-        return false;
-
-    return M_IMGDATA->m_palette.IsOk();
-}
-
-const wxPalette& wxImage::GetPalette() const
-{
-    wxCHECK_MSG( IsOk(), wxNullPalette, wxT("invalid image") );
-
-    return M_IMGDATA->m_palette;
-}
-
-void wxImage::SetPalette(const wxPalette& palette)
-{
-    wxCHECK_RET( IsOk(), wxT("invalid image") );
-
-    AllocExclusive();
-
-    M_IMGDATA->m_palette = palette;
-}
-
-#endif // wxUSE_PALETTE
-
-// ----------------------------------------------------------------------------
-// Option functions (arbitrary name/value mapping)
-// ----------------------------------------------------------------------------
-
-void wxImage::SetOption(const wxString& name, const wxString& value)
-{
-    AllocExclusive();
-
-    int idx = M_IMGDATA->m_optionNames.Index(name, false);
-    if ( idx == wxNOT_FOUND )
-    {
-        M_IMGDATA->m_optionNames.Add(name);
-        M_IMGDATA->m_optionValues.Add(value);
-    }
-    else
-    {
-        M_IMGDATA->m_optionNames[idx] = name;
-        M_IMGDATA->m_optionValues[idx] = value;
-    }
-}
-
-void wxImage::SetOption(const wxString& name, int value)
-{
-    wxString valStr;
-    valStr.Printf(wxT("%d"), value);
-    SetOption(name, valStr);
-}
-
-wxString wxImage::GetOption(const wxString& name) const
-{
-    if ( !M_IMGDATA )
-        return wxEmptyString;
-
-    int idx = M_IMGDATA->m_optionNames.Index(name, false);
-    if ( idx == wxNOT_FOUND )
-        return wxEmptyString;
-    else
-        return M_IMGDATA->m_optionValues[idx];
-}
-
-int wxImage::GetOptionInt(const wxString& name) const
-{
-    return wxAtoi(GetOption(name));
-}
-
-bool wxImage::HasOption(const wxString& name) const
-{
-    return M_IMGDATA ? M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND
-                     : false;
-}
-
-// ----------------------------------------------------------------------------
-// image I/O
-// ----------------------------------------------------------------------------
-
-// Under Windows we can load wxImage not only from files but also from
-// resources.
-#if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE
-    #define HAS_LOAD_FROM_RESOURCE
-#endif
-
-#ifdef HAS_LOAD_FROM_RESOURCE
-
-#include "wx/msw/dib.h"
-#include "wx/msw/private.h"
-
-static wxImage LoadImageFromResource(const wxString &name, wxBitmapType type)
-{
-    AutoHBITMAP
-        hBitmap,
-        hMask;
-
-    if ( type == wxBITMAP_TYPE_BMP_RESOURCE )
-    {
-        hBitmap.Init( ::LoadBitmap(wxGetInstance(), name.t_str()) );
-
-        if ( !hBitmap )
-        {
-            wxLogError(_("Failed to load bitmap \"%s\" from resources."), name);
-        }
-    }
-    else if ( type == wxBITMAP_TYPE_ICO_RESOURCE )
-    {
-        const HICON hIcon = ::LoadIcon(wxGetInstance(), name.t_str());
-
-        if ( !hIcon )
-        {
-            wxLogError(_("Failed to load icon \"%s\" from resources."), name);
-        }
-        else
-        {
-            ICONINFO info;
-            if ( !::GetIconInfo(hIcon, &info) )
-            {
-                wxLogLastError(wxT("GetIconInfo"));
-                return wxImage();
-            }
-
-            hBitmap.Init(info.hbmColor);
-            hMask.Init(info.hbmMask);
-        }
-    }
-    else if ( type == wxBITMAP_TYPE_CUR_RESOURCE )
-    {
-        wxLogDebug(wxS("Loading cursors from resources is not implemented."));
-    }
-    else
-    {
-        wxFAIL_MSG(wxS("Invalid bitmap resource type."));
-    }
-
-    if ( !hBitmap )
-        return wxImage();
-
-    wxImage image = wxDIB(hBitmap).ConvertToImage();
-    if ( hMask )
-    {
-        const wxImage mask = wxDIB(hMask).ConvertToImage();
-        image.SetMaskFromImage(mask, 255, 255, 255);
-    }
-    else
-    {
-        // Light gray colour is a default mask
-        image.SetMaskColour(0xc0, 0xc0, 0xc0);
-    }
-
-    image.InitAlpha();
-
-    return image;
-}
-
-#endif // HAS_LOAD_FROM_RESOURCE
-
-bool wxImage::LoadFile( const wxString& filename,
-                        wxBitmapType type,
-                        int WXUNUSED_UNLESS_STREAMS(index) )
-{
-#ifdef HAS_LOAD_FROM_RESOURCE
-    if (   type == wxBITMAP_TYPE_BMP_RESOURCE
-        || type == wxBITMAP_TYPE_ICO_RESOURCE
-        || type == wxBITMAP_TYPE_CUR_RESOURCE)
-    {
-        const wxImage image = ::LoadImageFromResource(filename, type);
-        if ( image.IsOk() )
-        {
-            *this = image;
-            return true;
-        }
-    }
-#endif // HAS_LOAD_FROM_RESOURCE
-
-#if HAS_FILE_STREAMS
-    wxImageFileInputStream stream(filename);
-    if ( stream.IsOk() )
-    {
-        wxBufferedInputStream bstream( stream );
-        if ( LoadFile(bstream, type, index) )
-            return true;
-    }
-
-    wxLogError(_("Failed to load image from file \"%s\"."), filename);
-#endif // HAS_FILE_STREAMS
-
-    return false;
-}
-
-bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
-                        const wxString& WXUNUSED_UNLESS_STREAMS(mimetype),
-                        int WXUNUSED_UNLESS_STREAMS(index) )
-{
-#if HAS_FILE_STREAMS
-    wxImageFileInputStream stream(filename);
-    if ( stream.IsOk() )
-    {
-        wxBufferedInputStream bstream( stream );
-        if ( LoadFile(bstream, mimetype, index) )
-            return true;
-    }
-
-    wxLogError(_("Failed to load image from file \"%s\"."), filename);
-#endif // HAS_FILE_STREAMS
-
-    return false;
-}
-
-
-bool wxImage::SaveFile( const wxString& filename ) const
-{
-    wxString ext = filename.AfterLast('.').Lower();
-
-    wxImageHandler *handler = FindHandler(ext, wxBITMAP_TYPE_ANY);
-    if ( !handler)
-    {
-       wxLogError(_("Can't save image to file '%s': unknown extension."),
-                  filename);
-       return false;
-    }
-
-    return SaveFile(filename, handler->GetType());
-}
-
-bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
-                        wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const
-{
-#if HAS_FILE_STREAMS
-    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
-
-    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
-
-    wxImageFileOutputStream stream(filename);
-
-    if ( stream.IsOk() )
-    {
-        wxBufferedOutputStream bstream( stream );
-        return SaveFile(bstream, type);
-    }
-#endif // HAS_FILE_STREAMS
-
-    return false;
-}
-
-bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
-                        const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const
-{
-#if HAS_FILE_STREAMS
-    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
-
-    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
-
-    wxImageFileOutputStream stream(filename);
-
-    if ( stream.IsOk() )
-    {
-        wxBufferedOutputStream bstream( stream );
-        return SaveFile(bstream, mimetype);
-    }
-#endif // HAS_FILE_STREAMS
-
-    return false;
-}
-
-bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) )
-{
-#if HAS_FILE_STREAMS
-    wxImageFileInputStream stream(name);
-    return CanRead(stream);
-#else
-    return false;
-#endif
-}
-
-int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name),
-                            wxBitmapType WXUNUSED_UNLESS_STREAMS(type) )
-{
-#if HAS_FILE_STREAMS
-    wxImageFileInputStream stream(name);
-    if (stream.IsOk())
-        return GetImageCount(stream, type);
-#endif
-
-  return 0;
-}
-
-#if wxUSE_STREAMS
-
-bool wxImage::CanRead( wxInputStream &stream )
-{
-    const wxList& list = GetHandlers();
-
-    for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
-    {
-        wxImageHandler *handler=(wxImageHandler*)node->GetData();
-        if (handler->CanRead( stream ))
-            return true;
-    }
-
-    return false;
-}
-
-int wxImage::GetImageCount( wxInputStream &stream, wxBitmapType type )
-{
-    wxImageHandler *handler;
-
-    if ( type == wxBITMAP_TYPE_ANY )
-    {
-        const wxList& list = GetHandlers();
-
-        for ( wxList::compatibility_iterator node = list.GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-             handler = (wxImageHandler*)node->GetData();
-             if ( handler->CanRead(stream) )
-             {
-                 const int count = handler->GetImageCount(stream);
-                 if ( count >= 0 )
-                     return count;
-             }
-
-        }
-
-        wxLogWarning(_("No handler found for image type."));
-        return 0;
-    }
-
-    handler = FindHandler(type);
-
-    if ( !handler )
-    {
-        wxLogWarning(_("No image handler for type %d defined."), type);
-        return false;
-    }
-
-    if ( handler->CanRead(stream) )
-    {
-        return handler->GetImageCount(stream);
-    }
-    else
-    {
-        wxLogError(_("Image file is not of type %d."), type);
-        return 0;
-    }
-}
-
-bool wxImage::DoLoad(wxImageHandler& handler, wxInputStream& stream, int index)
-{
-    // save the options values which can be clobbered by the handler (e.g. many
-    // of them call Destroy() before trying to load the file)
-    const unsigned maxWidth = GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH),
-                   maxHeight = GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT);
-
-    // Preserve the original stream position if possible to rewind back to it
-    // if we failed to load the file -- maybe the next handler that we try can
-    // succeed after us then.
-    wxFileOffset posOld = wxInvalidOffset;
-    if ( stream.IsSeekable() )
-        posOld = stream.TellI();
-
-    if ( !handler.LoadFile(this, stream, true/*verbose*/, index) )
-    {
-        if ( posOld != wxInvalidOffset )
-            stream.SeekI(posOld);
-
-        return false;
-    }
-
-    // rescale the image to the specified size if needed
-    if ( maxWidth || maxHeight )
-    {
-        const unsigned widthOrig = GetWidth(),
-                       heightOrig = GetHeight();
-
-        // this uses the same (trivial) algorithm as the JPEG handler
-        unsigned width = widthOrig,
-                 height = heightOrig;
-        while ( (maxWidth && width > maxWidth) ||
-                    (maxHeight && height > maxHeight) )
-        {
-            width /= 2;
-            height /= 2;
-        }
-
-        if ( width != widthOrig || height != heightOrig )
-        {
-            // get the original size if it was set by the image handler
-            // but also in order to restore it after Rescale
-            int widthOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_WIDTH),
-                heightOrigOption = GetOptionInt(wxIMAGE_OPTION_ORIGINAL_HEIGHT);
-
-            Rescale(width, height, wxIMAGE_QUALITY_HIGH);
-
-            SetOption(wxIMAGE_OPTION_ORIGINAL_WIDTH, widthOrigOption ? widthOrigOption : widthOrig);
-            SetOption(wxIMAGE_OPTION_ORIGINAL_HEIGHT, heightOrigOption ? heightOrigOption : heightOrig);
-        }
-    }
-
-    // Set this after Rescale, which currently does not preserve it
-    M_IMGDATA->m_type = handler.GetType();
-
-    return true;
-}
-
-bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
-{
-    AllocExclusive();
-
-    wxImageHandler *handler;
-
-    if ( type == wxBITMAP_TYPE_ANY )
-    {
-        if ( !stream.IsSeekable() )
-        {
-            // The error message about image data format being unknown below
-            // would be misleading in this case as we are not even going to try
-            // any handlers because CanRead() never does anything for not
-            // seekable stream, so try to be more precise here.
-            wxLogError(_("Can't automatically determine the image format "
-                         "for non-seekable input."));
-            return false;
-        }
-
-        const wxList& list = GetHandlers();
-        for ( wxList::compatibility_iterator node = list.GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-             handler = (wxImageHandler*)node->GetData();
-             if ( handler->CanRead(stream) && DoLoad(*handler, stream, index) )
-                 return true;
-        }
-
-        wxLogWarning( _("Unknown image data format.") );
-
-        return false;
-    }
-    //else: have specific type
-
-    handler = FindHandler(type);
-    if ( !handler )
-    {
-        wxLogWarning( _("No image handler for type %d defined."), type );
-        return false;
-    }
-
-    if ( stream.IsSeekable() && !handler->CanRead(stream) )
-    {
-        wxLogError(_("This is not a %s."), handler->GetName());
-        return false;
-    }
-
-    return DoLoad(*handler, stream, index);
-}
-
-bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
-{
-    UnRef();
-
-    m_refData = new wxImageRefData;
-
-    wxImageHandler *handler = FindHandlerMime(mimetype);
-
-    if ( !handler )
-    {
-        wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
-        return false;
-    }
-
-    if ( stream.IsSeekable() && !handler->CanRead(stream) )
-    {
-        wxLogError(_("Image is not of type %s."), mimetype);
-        return false;
-    }
-
-    return DoLoad(*handler, stream, index);
-}
-
-bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const
-{
-    wxImage * const self = const_cast<wxImage *>(this);
-    if ( !handler.SaveFile(self, stream) )
-        return false;
-
-    M_IMGDATA->m_type = handler.GetType();
-    return true;
-}
-
-bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
-
-    wxImageHandler *handler = FindHandler(type);
-    if ( !handler )
-    {
-        wxLogWarning( _("No image handler for type %d defined."), type );
-        return false;
-    }
-
-    return DoSave(*handler, stream);
-}
-
-bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid image") );
-
-    wxImageHandler *handler = FindHandlerMime(mimetype);
-    if ( !handler )
-    {
-        wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
-        return false;
-    }
-
-    return DoSave(*handler, stream);
-}
-
-#endif // wxUSE_STREAMS
-
-// ----------------------------------------------------------------------------
-// image I/O handlers
-// ----------------------------------------------------------------------------
-
-void wxImage::AddHandler( wxImageHandler *handler )
-{
-    // Check for an existing handler of the type being added.
-    if (FindHandler( handler->GetType() ) == 0)
-    {
-        sm_handlers.Append( handler );
-    }
-    else
-    {
-        // This is not documented behaviour, merely the simplest 'fix'
-        // for preventing duplicate additions.  If someone ever has
-        // a good reason to add and remove duplicate handlers (and they
-        // may) we should probably refcount the duplicates.
-        //   also an issue in InsertHandler below.
-
-        wxLogDebug( wxT("Adding duplicate image handler for '%s'"),
-                    handler->GetName().c_str() );
-        delete handler;
-    }
-}
-
-void wxImage::InsertHandler( wxImageHandler *handler )
-{
-    // Check for an existing handler of the type being added.
-    if (FindHandler( handler->GetType() ) == 0)
-    {
-        sm_handlers.Insert( handler );
-    }
-    else
-    {
-        // see AddHandler for additional comments.
-        wxLogDebug( wxT("Inserting duplicate image handler for '%s'"),
-                    handler->GetName().c_str() );
-        delete handler;
-    }
-}
-
-bool wxImage::RemoveHandler( const wxString& name )
-{
-    wxImageHandler *handler = FindHandler(name);
-    if (handler)
-    {
-        sm_handlers.DeleteObject(handler);
-        delete handler;
-        return true;
-    }
-    else
-        return false;
-}
-
-wxImageHandler *wxImage::FindHandler( const wxString& name )
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while (node)
-    {
-        wxImageHandler *handler = (wxImageHandler*)node->GetData();
-        if (handler->GetName().Cmp(name) == 0) return handler;
-
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-wxImageHandler *wxImage::FindHandler( const wxString& extension, wxBitmapType bitmapType )
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while (node)
-    {
-        wxImageHandler *handler = (wxImageHandler*)node->GetData();
-        if ((bitmapType == wxBITMAP_TYPE_ANY) || (handler->GetType() == bitmapType))
-        {
-            if (handler->GetExtension() == extension)
-                return handler;
-            if (handler->GetAltExtensions().Index(extension, false) != wxNOT_FOUND)
-                return handler;
-        }
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-wxImageHandler *wxImage::FindHandler(wxBitmapType bitmapType )
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while (node)
-    {
-        wxImageHandler *handler = (wxImageHandler *)node->GetData();
-        if (handler->GetType() == bitmapType) return handler;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while (node)
-    {
-        wxImageHandler *handler = (wxImageHandler *)node->GetData();
-        if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;
-        node = node->GetNext();
-    }
-    return NULL;
-}
-
-void wxImage::InitStandardHandlers()
-{
-#if wxUSE_STREAMS
-    AddHandler(new wxBMPHandler);
-#endif // wxUSE_STREAMS
-}
-
-void wxImage::CleanUpHandlers()
-{
-    wxList::compatibility_iterator node = sm_handlers.GetFirst();
-    while (node)
-    {
-        wxImageHandler *handler = (wxImageHandler *)node->GetData();
-        wxList::compatibility_iterator next = node->GetNext();
-        delete handler;
-        node = next;
-    }
-
-    sm_handlers.Clear();
-}
-
-wxString wxImage::GetImageExtWildcard()
-{
-    wxString fmts;
-
-    wxList& Handlers = wxImage::GetHandlers();
-    wxList::compatibility_iterator Node = Handlers.GetFirst();
-    while ( Node )
-    {
-        wxImageHandler* Handler = (wxImageHandler*)Node->GetData();
-        fmts += wxT("*.") + Handler->GetExtension();
-        for (size_t i = 0; i < Handler->GetAltExtensions().size(); i++)
-            fmts += wxT(";*.") + Handler->GetAltExtensions()[i];
-        Node = Node->GetNext();
-        if ( Node ) fmts += wxT(";");
-    }
-
-    return wxT("(") + fmts + wxT(")|") + fmts;
-}
-
-wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb)
-{
-    const double red = rgb.red / 255.0,
-                 green = rgb.green / 255.0,
-                 blue = rgb.blue / 255.0;
-
-    // find the min and max intensity (and remember which one was it for the
-    // latter)
-    double minimumRGB = red;
-    if ( green < minimumRGB )
-        minimumRGB = green;
-    if ( blue < minimumRGB )
-        minimumRGB = blue;
-
-    enum { RED, GREEN, BLUE } chMax = RED;
-    double maximumRGB = red;
-    if ( green > maximumRGB )
-    {
-        chMax = GREEN;
-        maximumRGB = green;
-    }
-    if ( blue > maximumRGB )
-    {
-        chMax = BLUE;
-        maximumRGB = blue;
-    }
-
-    const double value = maximumRGB;
-
-    double hue = 0.0, saturation;
-    const double deltaRGB = maximumRGB - minimumRGB;
-    if ( wxIsNullDouble(deltaRGB) )
-    {
-        // Gray has no color
-        hue = 0.0;
-        saturation = 0.0;
-    }
-    else
-    {
-        switch ( chMax )
-        {
-            case RED:
-                hue = (green - blue) / deltaRGB;
-                break;
-
-            case GREEN:
-                hue = 2.0 + (blue - red) / deltaRGB;
-                break;
-
-            case BLUE:
-                hue = 4.0 + (red - green) / deltaRGB;
-                break;
-
-            default:
-                wxFAIL_MSG(wxT("hue not specified"));
-                break;
-        }
-
-        hue /= 6.0;
-
-        if ( hue < 0.0 )
-            hue += 1.0;
-
-        saturation = deltaRGB / maximumRGB;
-    }
-
-    return HSVValue(hue, saturation, value);
-}
-
-wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv)
-{
-    double red, green, blue;
-
-    if ( wxIsNullDouble(hsv.saturation) )
-    {
-        // Grey
-        red = hsv.value;
-        green = hsv.value;
-        blue = hsv.value;
-    }
-    else // not grey
-    {
-        double hue = hsv.hue * 6.0;      // sector 0 to 5
-        int i = (int)floor(hue);
-        double f = hue - i;          // fractional part of h
-        double p = hsv.value * (1.0 - hsv.saturation);
-
-        switch (i)
-        {
-            case 0:
-                red = hsv.value;
-                green = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
-                blue = p;
-                break;
-
-            case 1:
-                red = hsv.value * (1.0 - hsv.saturation * f);
-                green = hsv.value;
-                blue = p;
-                break;
-
-            case 2:
-                red = p;
-                green = hsv.value;
-                blue = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
-                break;
-
-            case 3:
-                red = p;
-                green = hsv.value * (1.0 - hsv.saturation * f);
-                blue = hsv.value;
-                break;
-
-            case 4:
-                red = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
-                green = p;
-                blue = hsv.value;
-                break;
-
-            default:    // case 5:
-                red = hsv.value;
-                green = p;
-                blue = hsv.value * (1.0 - hsv.saturation * f);
-                break;
-        }
-    }
-
-    return RGBValue((unsigned char)(red * 255.0),
-                    (unsigned char)(green * 255.0),
-                    (unsigned char)(blue * 255.0));
-}
-
-/*
- * Rotates the hue of each pixel of the image. angle is a double in the range
- * -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees
- */
-void wxImage::RotateHue(double angle)
-{
-    AllocExclusive();
-
-    unsigned char *srcBytePtr;
-    unsigned char *dstBytePtr;
-    unsigned long count;
-    wxImage::HSVValue hsv;
-    wxImage::RGBValue rgb;
-
-    wxASSERT (angle >= -1.0 && angle <= 1.0);
-    count = M_IMGDATA->m_width * M_IMGDATA->m_height;
-    if ( count > 0 && !wxIsNullDouble(angle) )
-    {
-        srcBytePtr = M_IMGDATA->m_data;
-        dstBytePtr = srcBytePtr;
-        do
-        {
-            rgb.red = *srcBytePtr++;
-            rgb.green = *srcBytePtr++;
-            rgb.blue = *srcBytePtr++;
-            hsv = RGBtoHSV(rgb);
-
-            hsv.hue = hsv.hue + angle;
-            if (hsv.hue > 1.0)
-                hsv.hue = hsv.hue - 1.0;
-            else if (hsv.hue < 0.0)
-                hsv.hue = hsv.hue + 1.0;
-
-            rgb = HSVtoRGB(hsv);
-            *dstBytePtr++ = rgb.red;
-            *dstBytePtr++ = rgb.green;
-            *dstBytePtr++ = rgb.blue;
-        } while (--count != 0);
-    }
-}
-
-//-----------------------------------------------------------------------------
-// wxImageHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
-
-#if wxUSE_STREAMS
-int wxImageHandler::GetImageCount( wxInputStream& stream )
-{
-    // NOTE: this code is the same of wxAnimationDecoder::CanRead and
-    //       wxImageHandler::CallDoCanRead
-
-    if ( !stream.IsSeekable() )
-        return false;        // can't test unseekable stream
-
-    wxFileOffset posOld = stream.TellI();
-    int n = DoGetImageCount(stream);
-
-    // restore the old position to be able to test other formats and so on
-    if ( stream.SeekI(posOld) == wxInvalidOffset )
-    {
-        wxLogDebug(wxT("Failed to rewind the stream in wxImageHandler!"));
-
-        // reading would fail anyhow as we're not at the right position
-        return false;
-    }
-
-    return n;
-}
-
-bool wxImageHandler::CanRead( const wxString& name )
-{
-    wxImageFileInputStream stream(name);
-    if ( !stream.IsOk() )
-    {
-        wxLogError(_("Failed to check format of image file \"%s\"."), name);
-
-        return false;
-    }
-
-    return CanRead(stream);
-}
-
-bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
-{
-    // NOTE: this code is the same of wxAnimationDecoder::CanRead and
-    //       wxImageHandler::GetImageCount
-
-    if ( !stream.IsSeekable() )
-        return false;        // can't test unseekable stream
-
-    wxFileOffset posOld = stream.TellI();
-    bool ok = DoCanRead(stream);
-
-    // restore the old position to be able to test other formats and so on
-    if ( stream.SeekI(posOld) == wxInvalidOffset )
-    {
-        wxLogDebug(wxT("Failed to rewind the stream in wxImageHandler!"));
-
-        // reading would fail anyhow as we're not at the right position
-        return false;
-    }
-
-    return ok;
-}
-
-#endif // wxUSE_STREAMS
-
-/* static */
-wxImageResolution
-wxImageHandler::GetResolutionFromOptions(const wxImage& image, int *x, int *y)
-{
-    wxCHECK_MSG( x && y, wxIMAGE_RESOLUTION_NONE, wxT("NULL pointer") );
-
-    if ( image.HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
-         image.HasOption(wxIMAGE_OPTION_RESOLUTIONY) )
-    {
-        *x = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX);
-        *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY);
-    }
-    else if ( image.HasOption(wxIMAGE_OPTION_RESOLUTION) )
-    {
-        *x =
-        *y = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
-    }
-    else // no resolution options specified
-    {
-        *x =
-        *y = 0;
-
-        return wxIMAGE_RESOLUTION_NONE;
-    }
-
-    // get the resolution unit too
-    int resUnit = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT);
-    if ( !resUnit )
-    {
-        // this is the default
-        resUnit = wxIMAGE_RESOLUTION_INCHES;
-    }
-
-    return (wxImageResolution)resUnit;
-}
-
-// ----------------------------------------------------------------------------
-// image histogram stuff
-// ----------------------------------------------------------------------------
-
-bool
-wxImageHistogram::FindFirstUnusedColour(unsigned char *r,
-                                        unsigned char *g,
-                                        unsigned char *b,
-                                        unsigned char r2,
-                                        unsigned char b2,
-                                        unsigned char g2) const
-{
-    unsigned long key = MakeKey(r2, g2, b2);
-
-    while ( find(key) != end() )
-    {
-        // color already used
-        r2++;
-        if ( r2 >= 255 )
-        {
-            r2 = 0;
-            g2++;
-            if ( g2 >= 255 )
-            {
-                g2 = 0;
-                b2++;
-                if ( b2 >= 255 )
-                {
-                    wxLogError(_("No unused colour in image.") );
-                    return false;
-                }
-            }
-        }
-
-        key = MakeKey(r2, g2, b2);
-    }
-
-    if ( r )
-        *r = r2;
-    if ( g )
-        *g = g2;
-    if ( b )
-        *b = b2;
-
-    return true;
-}
-
-bool
-wxImage::FindFirstUnusedColour(unsigned char *r,
-                               unsigned char *g,
-                               unsigned char *b,
-                               unsigned char r2,
-                               unsigned char b2,
-                               unsigned char g2) const
-{
-    wxImageHistogram histogram;
-
-    ComputeHistogram(histogram);
-
-    return histogram.FindFirstUnusedColour(r, g, b, r2, g2, b2);
-}
-
-
-
-// GRG, Dic/99
-// Counts and returns the number of different colours. Optionally stops
-// when it exceeds 'stopafter' different colours. This is useful, for
-// example, to see if the image can be saved as 8-bit (256 colour or
-// less, in this case it would be invoked as CountColours(256)). Default
-// value for stopafter is -1 (don't care).
-//
-unsigned long wxImage::CountColours( unsigned long stopafter ) const
-{
-    wxHashTable h;
-    wxObject dummy;
-    unsigned char r, g, b;
-    unsigned char *p;
-    unsigned long size, nentries, key;
-
-    p = GetData();
-    size = GetWidth() * GetHeight();
-    nentries = 0;
-
-    for (unsigned long j = 0; (j < size) && (nentries <= stopafter) ; j++)
-    {
-        r = *(p++);
-        g = *(p++);
-        b = *(p++);
-        key = wxImageHistogram::MakeKey(r, g, b);
-
-        if (h.Get(key) == NULL)
-        {
-            h.Put(key, &dummy);
-            nentries++;
-        }
-    }
-
-    return nentries;
-}
-
-
-unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const
-{
-    unsigned char *p = GetData();
-    unsigned long nentries = 0;
-
-    h.clear();
-
-    const unsigned long size = GetWidth() * GetHeight();
-
-    unsigned char r, g, b;
-    for ( unsigned long n = 0; n < size; n++ )
-    {
-        r = *p++;
-        g = *p++;
-        b = *p++;
-
-        wxImageHistogramEntry& entry = h[wxImageHistogram::MakeKey(r, g, b)];
-
-        if ( entry.value++ == 0 )
-            entry.index = nentries++;
-    }
-
-    return nentries;
-}
-
-/*
- * Rotation code by Carlos Moreno
- */
-
-static const double wxROTATE_EPSILON = 1e-10;
-
-// Auxiliary function to rotate a point (x,y) with respect to point p0
-// make it inline and use a straight return to facilitate optimization
-// also, the function receives the sine and cosine of the angle to avoid
-// repeating the time-consuming calls to these functions -- sin/cos can
-// be computed and stored in the calling function.
-
-static inline wxRealPoint
-wxRotatePoint(const wxRealPoint& p, double cos_angle, double sin_angle,
-              const wxRealPoint& p0)
-{
-    return wxRealPoint(p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle,
-                       p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle);
-}
-
-static inline wxRealPoint
-wxRotatePoint(double x, double y, double cos_angle, double sin_angle,
-              const wxRealPoint & p0)
-{
-    return wxRotatePoint (wxRealPoint(x,y), cos_angle, sin_angle, p0);
-}
-
-wxImage wxImage::Rotate(double angle,
-                        const wxPoint& centre_of_rotation,
-                        bool interpolating,
-                        wxPoint *offset_after_rotation) const
-{
-    // screen coordinates are a mirror image of "real" coordinates
-    angle = -angle;
-
-    const bool has_alpha = HasAlpha();
-
-    const int w = GetWidth();
-    const int h = GetHeight();
-
-    int i;
-
-    // Create pointer-based array to accelerate access to wxImage's data
-    unsigned char ** data = new unsigned char * [h];
-    data[0] = GetData();
-    for (i = 1; i < h; i++)
-        data[i] = data[i - 1] + (3 * w);
-
-    // Same for alpha channel
-    unsigned char ** alpha = NULL;
-    if (has_alpha)
-    {
-        alpha = new unsigned char * [h];
-        alpha[0] = GetAlpha();
-        for (i = 1; i < h; i++)
-            alpha[i] = alpha[i - 1] + w;
-    }
-
-    // precompute coefficients for rotation formula
-    const double cos_angle = cos(angle);
-    const double sin_angle = sin(angle);
-
-    // Create new Image to store the result
-    // First, find rectangle that covers the rotated image;  to do that,
-    // rotate the four corners
-
-    const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
-
-    wxRealPoint p1 = wxRotatePoint (0, 0, cos_angle, sin_angle, p0);
-    wxRealPoint p2 = wxRotatePoint (0, h, cos_angle, sin_angle, p0);
-    wxRealPoint p3 = wxRotatePoint (w, 0, cos_angle, sin_angle, p0);
-    wxRealPoint p4 = wxRotatePoint (w, h, cos_angle, sin_angle, p0);
-
-    int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
-    int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
-    int x2a = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
-    int y2a = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
-
-    // Create rotated image
-    wxImage rotated (x2a - x1a + 1, y2a - y1a + 1, false);
-    // With alpha channel
-    if (has_alpha)
-        rotated.SetAlpha();
-
-    if (offset_after_rotation != NULL)
-    {
-        *offset_after_rotation = wxPoint (x1a, y1a);
-    }
-
-    // the rotated (destination) image is always accessed sequentially via this
-    // pointer, there is no need for pointer-based arrays here
-    unsigned char *dst = rotated.GetData();
-
-    unsigned char *alpha_dst = has_alpha ? rotated.GetAlpha() : NULL;
-
-    // if the original image has a mask, use its RGB values as the blank pixel,
-    // else, fall back to default (black).
-    unsigned char blank_r = 0;
-    unsigned char blank_g = 0;
-    unsigned char blank_b = 0;
-
-    if (HasMask())
-    {
-        blank_r = GetMaskRed();
-        blank_g = GetMaskGreen();
-        blank_b = GetMaskBlue();
-        rotated.SetMaskColour( blank_r, blank_g, blank_b );
-    }
-
-    // Now, for each point of the rotated image, find where it came from, by
-    // performing an inverse rotation (a rotation of -angle) and getting the
-    // pixel at those coordinates
-
-    const int rH = rotated.GetHeight();
-    const int rW = rotated.GetWidth();
-
-    // do the (interpolating) test outside of the loops, so that it is done
-    // only once, instead of repeating it for each pixel.
-    if (interpolating)
-    {
-        for (int y = 0; y < rH; y++)
-        {
-            for (int x = 0; x < rW; x++)
-            {
-                wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
-
-                if (-0.25 < src.x && src.x < w - 0.75 &&
-                    -0.25 < src.y && src.y < h - 0.75)
-                {
-                    // interpolate using the 4 enclosing grid-points.  Those
-                    // points can be obtained using floor and ceiling of the
-                    // exact coordinates of the point
-                    int x1, y1, x2, y2;
-
-                    if (0 < src.x && src.x < w - 1)
-                    {
-                        x1 = wxRound(floor(src.x));
-                        x2 = wxRound(ceil(src.x));
-                    }
-                    else    // else means that x is near one of the borders (0 or width-1)
-                    {
-                        x1 = x2 = wxRound (src.x);
-                    }
-
-                    if (0 < src.y && src.y < h - 1)
-                    {
-                        y1 = wxRound(floor(src.y));
-                        y2 = wxRound(ceil(src.y));
-                    }
-                    else
-                    {
-                        y1 = y2 = wxRound (src.y);
-                    }
-
-                    // get four points and the distances (square of the distance,
-                    // for efficiency reasons) for the interpolation formula
-
-                    // GRG: Do not calculate the points until they are
-                    //      really needed -- this way we can calculate
-                    //      just one, instead of four, if d1, d2, d3
-                    //      or d4 are < wxROTATE_EPSILON
-
-                    const double d1 = (src.x - x1) * (src.x - x1) + (src.y - y1) * (src.y - y1);
-                    const double d2 = (src.x - x2) * (src.x - x2) + (src.y - y1) * (src.y - y1);
-                    const double d3 = (src.x - x2) * (src.x - x2) + (src.y - y2) * (src.y - y2);
-                    const double d4 = (src.x - x1) * (src.x - x1) + (src.y - y2) * (src.y - y2);
-
-                    // Now interpolate as a weighted average of the four surrounding
-                    // points, where the weights are the distances to each of those points
-
-                    // If the point is exactly at one point of the grid of the source
-                    // image, then don't interpolate -- just assign the pixel
-
-                    // d1,d2,d3,d4 are positive -- no need for abs()
-                    if (d1 < wxROTATE_EPSILON)
-                    {
-                        unsigned char *p = data[y1] + (3 * x1);
-                        *(dst++) = *(p++);
-                        *(dst++) = *(p++);
-                        *(dst++) = *p;
-
-                        if (has_alpha)
-                            *(alpha_dst++) = *(alpha[y1] + x1);
-                    }
-                    else if (d2 < wxROTATE_EPSILON)
-                    {
-                        unsigned char *p = data[y1] + (3 * x2);
-                        *(dst++) = *(p++);
-                        *(dst++) = *(p++);
-                        *(dst++) = *p;
-
-                        if (has_alpha)
-                            *(alpha_dst++) = *(alpha[y1] + x2);
-                    }
-                    else if (d3 < wxROTATE_EPSILON)
-                    {
-                        unsigned char *p = data[y2] + (3 * x2);
-                        *(dst++) = *(p++);
-                        *(dst++) = *(p++);
-                        *(dst++) = *p;
-
-                        if (has_alpha)
-                            *(alpha_dst++) = *(alpha[y2] + x2);
-                    }
-                    else if (d4 < wxROTATE_EPSILON)
-                    {
-                        unsigned char *p = data[y2] + (3 * x1);
-                        *(dst++) = *(p++);
-                        *(dst++) = *(p++);
-                        *(dst++) = *p;
-
-                        if (has_alpha)
-                            *(alpha_dst++) = *(alpha[y2] + x1);
-                    }
-                    else
-                    {
-                        // weights for the weighted average are proportional to the inverse of the distance
-                        unsigned char *v1 = data[y1] + (3 * x1);
-                        unsigned char *v2 = data[y1] + (3 * x2);
-                        unsigned char *v3 = data[y2] + (3 * x2);
-                        unsigned char *v4 = data[y2] + (3 * x1);
-
-                        const double w1 = 1/d1, w2 = 1/d2, w3 = 1/d3, w4 = 1/d4;
-
-                        // GRG: Unrolled.
-
-                        *(dst++) = (unsigned char)
-                            ( (w1 * *(v1++) + w2 * *(v2++) +
-                               w3 * *(v3++) + w4 * *(v4++)) /
-                              (w1 + w2 + w3 + w4) );
-                        *(dst++) = (unsigned char)
-                            ( (w1 * *(v1++) + w2 * *(v2++) +
-                               w3 * *(v3++) + w4 * *(v4++)) /
-                              (w1 + w2 + w3 + w4) );
-                        *(dst++) = (unsigned char)
-                            ( (w1 * *v1 + w2 * *v2 +
-                               w3 * *v3 + w4 * *v4) /
-                              (w1 + w2 + w3 + w4) );
-
-                        if (has_alpha)
-                        {
-                            v1 = alpha[y1] + (x1);
-                            v2 = alpha[y1] + (x2);
-                            v3 = alpha[y2] + (x2);
-                            v4 = alpha[y2] + (x1);
-
-                            *(alpha_dst++) = (unsigned char)
-                                ( (w1 * *v1 + w2 * *v2 +
-                                   w3 * *v3 + w4 * *v4) /
-                                  (w1 + w2 + w3 + w4) );
-                        }
-                    }
-                }
-                else
-                {
-                    *(dst++) = blank_r;
-                    *(dst++) = blank_g;
-                    *(dst++) = blank_b;
-
-                    if (has_alpha)
-                        *(alpha_dst++) = 0;
-                }
-            }
-        }
-    }
-    else // not interpolating
-    {
-        for (int y = 0; y < rH; y++)
-        {
-            for (int x = 0; x < rW; x++)
-            {
-                wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
-
-                const int xs = wxRound (src.x);      // wxRound rounds to the
-                const int ys = wxRound (src.y);      // closest integer
-
-                if (0 <= xs && xs < w && 0 <= ys && ys < h)
-                {
-                    unsigned char *p = data[ys] + (3 * xs);
-                    *(dst++) = *(p++);
-                    *(dst++) = *(p++);
-                    *(dst++) = *p;
-
-                    if (has_alpha)
-                        *(alpha_dst++) = *(alpha[ys] + (xs));
-                }
-                else
-                {
-                    *(dst++) = blank_r;
-                    *(dst++) = blank_g;
-                    *(dst++) = blank_b;
-
-                    if (has_alpha)
-                        *(alpha_dst++) = 255;
-                }
-            }
-        }
-    }
-
-    delete [] data;
-    delete [] alpha;
-
-    return rotated;
-}
-
-
-
-
-
-// A module to allow wxImage initialization/cleanup
-// without calling these functions from app.cpp or from
-// the user's application.
-
-class wxImageModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxImageModule)
-public:
-    wxImageModule() {}
-    bool OnInit() { wxImage::InitStandardHandlers(); return true; }
-    void OnExit() { wxImage::CleanUpHandlers(); }
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
-
-
-#endif // wxUSE_IMAGE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/image.cpp
+// Purpose:     wxImage
+// Author:      Robert Roebling
+// RCS-ID:      $Id: image.cpp 59197 2009-02-28 15:44:53Z VZ $
+// Copyright:   (c) Robert Roebling
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE
+
+#include "wx/image.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/hash.h"
+    #include "wx/utils.h"
+    #include "wx/math.h"
+    #include "wx/module.h"
+    #include "wx/palette.h"
+    #include "wx/intl.h"
+#endif
+
+#include "wx/filefn.h"
+#include "wx/wfstream.h"
+#include "wx/xpmdecod.h"
+
+// For memcpy
+#include <string.h>
+
+// make the code compile with either wxFile*Stream or wxFFile*Stream:
+#define HAS_FILE_STREAMS (wxUSE_STREAMS && (wxUSE_FILE || wxUSE_FFILE))
+
+#if HAS_FILE_STREAMS
+    #if wxUSE_FFILE
+        typedef wxFFileInputStream wxImageFileInputStream;
+        typedef wxFFileOutputStream wxImageFileOutputStream;
+    #elif wxUSE_FILE
+        typedef wxFileInputStream wxImageFileInputStream;
+        typedef wxFileOutputStream wxImageFileOutputStream;
+    #endif // wxUSE_FILE/wxUSE_FFILE
+#endif // HAS_FILE_STREAMS
+
+#if wxUSE_VARIANT
+IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxImage,WXDLLEXPORT)
+#endif
+
+//-----------------------------------------------------------------------------
+// wxImage
+//-----------------------------------------------------------------------------
+
+class wxImageRefData: public wxObjectRefData
+{
+public:
+    wxImageRefData();
+    virtual ~wxImageRefData();
+
+    int             m_width;
+    int             m_height;
+    unsigned char  *m_data;
+
+    bool            m_hasMask;
+    unsigned char   m_maskRed,m_maskGreen,m_maskBlue;
+
+    // alpha channel data, may be NULL for the formats without alpha support
+    unsigned char  *m_alpha;
+
+    bool            m_ok;
+
+    // if true, m_data is pointer to static data and shouldn't be freed
+    bool            m_static;
+
+    // same as m_static but for m_alpha
+    bool            m_staticAlpha;
+
+#if wxUSE_PALETTE
+    wxPalette       m_palette;
+#endif // wxUSE_PALETTE
+
+    wxArrayString   m_optionNames;
+    wxArrayString   m_optionValues;
+
+    DECLARE_NO_COPY_CLASS(wxImageRefData)
+};
+
+wxImageRefData::wxImageRefData()
+{
+    m_width = 0;
+    m_height = 0;
+    m_data =
+    m_alpha = (unsigned char *) NULL;
+
+    m_maskRed = 0;
+    m_maskGreen = 0;
+    m_maskBlue = 0;
+    m_hasMask = false;
+
+    m_ok = false;
+    m_static =
+    m_staticAlpha = false;
+}
+
+wxImageRefData::~wxImageRefData()
+{
+    if ( !m_static )
+        free( m_data );
+    if ( !m_staticAlpha )
+        free( m_alpha );
+}
+
+wxList wxImage::sm_handlers;
+
+wxImage wxNullImage;
+
+//-----------------------------------------------------------------------------
+
+#define M_IMGDATA wx_static_cast(wxImageRefData*, m_refData)
+
+IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
+
+wxImage::wxImage( int width, int height, bool clear )
+{
+    Create( width, height, clear );
+}
+
+wxImage::wxImage( int width, int height, unsigned char* data, bool static_data )
+{
+    Create( width, height, data, static_data );
+}
+
+wxImage::wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
+{
+    Create( width, height, data, alpha, static_data );
+}
+
+wxImage::wxImage( const wxString& name, long type, int index )
+{
+    LoadFile( name, type, index );
+}
+
+wxImage::wxImage( const wxString& name, const wxString& mimetype, int index )
+{
+    LoadFile( name, mimetype, index );
+}
+
+#if wxUSE_STREAMS
+wxImage::wxImage( wxInputStream& stream, long type, int index )
+{
+    LoadFile( stream, type, index );
+}
+
+wxImage::wxImage( wxInputStream& stream, const wxString& mimetype, int index )
+{
+    LoadFile( stream, mimetype, index );
+}
+#endif // wxUSE_STREAMS
+
+wxImage::wxImage(const char* const* xpmData)
+{
+    Create(xpmData);
+}
+
+bool wxImage::Create(const char* const* 
+#ifdef wxUSE_XPM
+					 xpmData
+#else
+					 /*xpmData*/
+#endif
+					 )
+{
+#if wxUSE_XPM
+    UnRef();
+
+    wxXPMDecoder decoder;
+    (*this) = decoder.ReadData(xpmData);
+    return Ok();
+#else
+    return false;
+#endif
+}
+
+bool wxImage::Create( int width, int height, bool clear )
+{
+    UnRef();
+
+    m_refData = new wxImageRefData();
+
+    M_IMGDATA->m_data = (unsigned char *) malloc( width*height*3 );
+    if (!M_IMGDATA->m_data)
+    {
+        UnRef();
+        return false;
+    }
+
+    if (clear)
+        memset(M_IMGDATA->m_data, 0, width*height*3);
+
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+
+    return true;
+}
+
+bool wxImage::Create( int width, int height, unsigned char* data, bool static_data )
+{
+    UnRef();
+
+    wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+
+    m_refData = new wxImageRefData();
+
+    M_IMGDATA->m_data = data;
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+    M_IMGDATA->m_static = static_data;
+
+    return true;
+}
+
+bool wxImage::Create( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data )
+{
+    UnRef();
+
+    wxCHECK_MSG( data, false, _T("NULL data in wxImage::Create") );
+
+    m_refData = new wxImageRefData();
+
+    M_IMGDATA->m_data = data;
+    M_IMGDATA->m_alpha = alpha;
+    M_IMGDATA->m_width = width;
+    M_IMGDATA->m_height = height;
+    M_IMGDATA->m_ok = true;
+    M_IMGDATA->m_static = static_data;
+    M_IMGDATA->m_staticAlpha = static_data;
+
+    return true;
+}
+
+void wxImage::Destroy()
+{
+    UnRef();
+}
+
+wxObjectRefData* wxImage::CreateRefData() const
+{
+    return new wxImageRefData;
+}
+
+wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const
+{
+    const wxImageRefData* refData = wx_static_cast(const wxImageRefData*, that);
+    wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") );
+
+    wxImageRefData* refData_new = new wxImageRefData;
+    refData_new->m_width = refData->m_width;
+    refData_new->m_height = refData->m_height;
+    refData_new->m_maskRed = refData->m_maskRed;
+    refData_new->m_maskGreen = refData->m_maskGreen;
+    refData_new->m_maskBlue = refData->m_maskBlue;
+    refData_new->m_hasMask = refData->m_hasMask;
+    refData_new->m_ok = true;
+    unsigned size = unsigned(refData->m_width) * unsigned(refData->m_height);
+    if (refData->m_alpha != NULL)
+    {
+        refData_new->m_alpha = (unsigned char*)malloc(size);
+        memcpy(refData_new->m_alpha, refData->m_alpha, size);
+    }
+    size *= 3;
+    refData_new->m_data = (unsigned char*)malloc(size);
+    memcpy(refData_new->m_data, refData->m_data, size);
+#if wxUSE_PALETTE
+    refData_new->m_palette = refData->m_palette;
+#endif
+    refData_new->m_optionNames = refData->m_optionNames;
+    refData_new->m_optionValues = refData->m_optionValues;
+    return refData_new;
+}
+
+wxImage wxImage::Copy() const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.m_refData = CloneRefData(m_refData);
+
+    return image;
+}
+
+wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
+{
+    if( xFactor == 1 && yFactor == 1 )
+        return *this;
+
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    // can't scale to/from 0 size
+    wxCHECK_MSG( (xFactor > 0) && (yFactor > 0), image,
+                 wxT("invalid new image size") );
+
+    long old_height = M_IMGDATA->m_height,
+         old_width  = M_IMGDATA->m_width;
+
+    wxCHECK_MSG( (old_height > 0) && (old_width > 0), image,
+                 wxT("invalid old image size") );
+
+    long width = old_width / xFactor ;
+    long height = old_height / yFactor ;
+
+    image.Create( width, height, false );
+
+    char unsigned *data = image.GetData();
+
+    wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+    bool hasMask = false ;
+    unsigned char maskRed = 0;
+    unsigned char maskGreen = 0;
+    unsigned char maskBlue =0 ;
+
+    unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data = data;
+    unsigned char *source_alpha = 0 ;
+    unsigned char *target_alpha = 0 ;
+    if (M_IMGDATA->m_hasMask)
+    {
+        hasMask = true ;
+        maskRed = M_IMGDATA->m_maskRed;
+        maskGreen = M_IMGDATA->m_maskGreen;
+        maskBlue =M_IMGDATA->m_maskBlue ;
+
+        image.SetMaskColour( M_IMGDATA->m_maskRed,
+                             M_IMGDATA->m_maskGreen,
+                             M_IMGDATA->m_maskBlue );
+    }
+    else
+    {
+        source_alpha = M_IMGDATA->m_alpha ;
+        if ( source_alpha )
+        {
+            image.SetAlpha() ;
+            target_alpha = image.GetAlpha() ;
+        }
+    }
+
+    for (long y = 0; y < height; y++)
+    {
+        for (long x = 0; x < width; x++)
+        {
+            unsigned long avgRed = 0 ;
+            unsigned long avgGreen = 0;
+            unsigned long avgBlue = 0;
+            unsigned long avgAlpha = 0 ;
+            unsigned long counter = 0 ;
+            // determine average
+            for ( int y1 = 0 ; y1 < yFactor ; ++y1 )
+            {
+                long y_offset = (y * yFactor + y1) * old_width;
+                for ( int x1 = 0 ; x1 < xFactor ; ++x1 )
+                {
+                    unsigned char *pixel = source_data + 3 * ( y_offset + x * xFactor + x1 ) ;
+                    unsigned char red = pixel[0] ;
+                    unsigned char green = pixel[1] ;
+                    unsigned char blue = pixel[2] ;
+                    unsigned char alpha = 255  ;
+                    if ( source_alpha )
+                        alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                    if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
+                    {
+                        if ( alpha > 0 )
+                        {
+                            avgRed += red ;
+                            avgGreen += green ;
+                            avgBlue += blue ;
+                        }
+                        avgAlpha += alpha ;
+                        counter++ ;
+                    }
+                }
+            }
+            if ( counter == 0 )
+            {
+                *(target_data++) = M_IMGDATA->m_maskRed ;
+                *(target_data++) = M_IMGDATA->m_maskGreen ;
+                *(target_data++) = M_IMGDATA->m_maskBlue ;
+            }
+            else
+            {
+                if ( source_alpha )
+                    *(target_alpha++) = (unsigned char)(avgAlpha / counter ) ;
+                *(target_data++) = (unsigned char)(avgRed / counter);
+                *(target_data++) = (unsigned char)(avgGreen / counter);
+                *(target_data++) = (unsigned char)(avgBlue / counter);
+            }
+        }
+    }
+
+    // In case this is a cursor, make sure the hotspot is scaled accordingly:
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X))/xFactor);
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y))/yFactor);
+
+    return image;
+}
+
+wxImage wxImage::Scale( int width, int height, int quality ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    // can't scale to/from 0 size
+    wxCHECK_MSG( (width > 0) && (height > 0), image,
+                 wxT("invalid new image size") );
+
+    long old_height = M_IMGDATA->m_height,
+         old_width  = M_IMGDATA->m_width;
+    wxCHECK_MSG( (old_height > 0) && (old_width > 0), image,
+                 wxT("invalid old image size") );
+
+    // If the image's new width and height are the same as the original, no
+    // need to waste time or CPU cycles
+    if ( old_width == width && old_height == height )
+        return *this;
+
+    // Scale the image (...or more appropriately, resample the image) using
+    // either the high-quality or normal method as specified
+    if ( quality == wxIMAGE_QUALITY_HIGH )
+    {
+        // We need to check whether we are downsampling or upsampling the image
+        if ( width < old_width && height < old_height )
+        {
+            // Downsample the image using the box averaging method for best results
+            image = ResampleBox(width, height);
+        }
+        else
+        {
+            // For upsampling or other random/wierd image dimensions we'll use
+            // a bicubic b-spline scaling method
+            image = ResampleBicubic(width, height);
+        }
+    }
+    else    // Default scaling method == simple pixel replication
+    {
+        if ( old_width % width == 0 && old_width >= width &&
+            old_height % height == 0 && old_height >= height )
+        {
+            return ShrinkBy( old_width / width , old_height / height ) ;
+        }
+        image.Create( width, height, false );
+
+        unsigned char *data = image.GetData();
+
+        wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+        unsigned char *source_data = M_IMGDATA->m_data;
+        unsigned char *target_data = data;
+        unsigned char *source_alpha = 0 ;
+        unsigned char *target_alpha = 0 ;
+
+        if ( !M_IMGDATA->m_hasMask )
+        {
+            source_alpha = M_IMGDATA->m_alpha ;
+            if ( source_alpha )
+            {
+                image.SetAlpha() ;
+                target_alpha = image.GetAlpha() ;
+            }
+        }
+
+        long x_delta = (old_width<<16) / width;
+        long y_delta = (old_height<<16) / height;
+
+        unsigned char* dest_pixel = target_data;
+
+        long y = 0;
+        for ( long j = 0; j < height; j++ )
+        {
+            unsigned char* src_line = &source_data[(y>>16)*old_width*3];
+            unsigned char* src_alpha_line = source_alpha ? &source_alpha[(y>>16)*old_width] : 0 ;
+
+            long x = 0;
+            for ( long i = 0; i < width; i++ )
+            {
+                unsigned char* src_pixel = &src_line[(x>>16)*3];
+                unsigned char* src_alpha_pixel = source_alpha ? &src_alpha_line[(x>>16)] : 0 ;
+                dest_pixel[0] = src_pixel[0];
+                dest_pixel[1] = src_pixel[1];
+                dest_pixel[2] = src_pixel[2];
+                dest_pixel += 3;
+                if ( source_alpha )
+                    *(target_alpha++) = *src_alpha_pixel ;
+                x += x_delta;
+            }
+
+            y += y_delta;
+        }
+    }
+
+    // If the original image has a mask, apply the mask to the new image
+    if (M_IMGDATA->m_hasMask)
+    {
+        image.SetMaskColour( M_IMGDATA->m_maskRed,
+                            M_IMGDATA->m_maskGreen,
+                            M_IMGDATA->m_maskBlue );
+    }
+
+    // In case this is a cursor, make sure the hotspot is scaled accordingly:
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X)*width)/old_width);
+    if ( HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) )
+        image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y,
+                (GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y)*height)/old_height);
+
+    return image;
+}
+
+wxImage wxImage::ResampleBox(int width, int height) const
+{
+    // This function implements a simple pre-blur/box averaging method for
+    // downsampling that gives reasonably smooth results To scale the image
+    // down we will need to gather a grid of pixels of the size of the scale
+    // factor in each direction and then do an averaging of the pixels.
+
+    wxImage ret_image(width, height, false);
+
+    const double scale_factor_x = double(M_IMGDATA->m_width) / width;
+    const double scale_factor_y = double(M_IMGDATA->m_height) / height;
+
+    const int scale_factor_x_2 = (int)(scale_factor_x / 2);
+    const int scale_factor_y_2 = (int)(scale_factor_y / 2);
+
+    unsigned char* src_data = M_IMGDATA->m_data;
+    unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_data = ret_image.GetData();
+    unsigned char* dst_alpha = NULL;
+
+    if ( src_alpha )
+    {
+        ret_image.SetAlpha();
+        dst_alpha = ret_image.GetAlpha();
+    }
+
+    int averaged_pixels, src_pixel_index;
+    double sum_r, sum_g, sum_b, sum_a;
+
+    for ( int y = 0; y < height; y++ )         // Destination image - Y direction
+    {
+        // Source pixel in the Y direction
+        int src_y = (int)(y * scale_factor_y);
+
+        for ( int x = 0; x < width; x++ )      // Destination image - X direction
+        {
+            // Source pixel in the X direction
+            int src_x = (int)(x * scale_factor_x);
+
+            // Box of pixels to average
+            averaged_pixels = 0;
+            sum_r = sum_g = sum_b = sum_a = 0.0;
+
+            for ( int j = int(src_y - scale_factor_y/2.0 + 1);
+                  j <= int(src_y + scale_factor_y_2);
+                  j++ )
+            {
+                // We don't care to average pixels that don't exist (edges)
+                if ( j < 0 || j > M_IMGDATA->m_height - 1 )
+                    continue;
+
+                for ( int i = int(src_x - scale_factor_x/2.0 + 1);
+                      i <= src_x + scale_factor_x_2;
+                      i++ )
+                {
+                    // Don't average edge pixels
+                    if ( i < 0 || i > M_IMGDATA->m_width - 1 )
+                        continue;
+
+                    // Calculate the actual index in our source pixels
+                    src_pixel_index = j * M_IMGDATA->m_width + i;
+
+                    sum_r += src_data[src_pixel_index * 3 + 0];
+                    sum_g += src_data[src_pixel_index * 3 + 1];
+                    sum_b += src_data[src_pixel_index * 3 + 2];
+                    if ( src_alpha )
+                        sum_a += src_alpha[src_pixel_index];
+
+                    averaged_pixels++;
+                }
+            }
+
+            // Calculate the average from the sum and number of averaged pixels
+            dst_data[0] = (unsigned char)(sum_r / averaged_pixels);
+            dst_data[1] = (unsigned char)(sum_g / averaged_pixels);
+            dst_data[2] = (unsigned char)(sum_b / averaged_pixels);
+            dst_data += 3;
+            if ( src_alpha )
+                *dst_alpha++ = (unsigned char)(sum_a / averaged_pixels);
+        }
+    }
+
+    return ret_image;
+}
+
+// The following two local functions are for the B-spline weighting of the
+// bicubic sampling algorithm
+static inline double spline_cube(double value)
+{
+    return value <= 0.0 ? 0.0 : value * value * value;
+}
+
+static inline double spline_weight(double value)
+{
+    return (spline_cube(value + 2) -
+            4 * spline_cube(value + 1) +
+            6 * spline_cube(value) -
+            4 * spline_cube(value - 1)) / 6;
+}
+
+// This is the bicubic resampling algorithm
+wxImage wxImage::ResampleBicubic(int width, int height) const
+{
+    // This function implements a Bicubic B-Spline algorithm for resampling.
+    // This method is certainly a little slower than wxImage's default pixel
+    // replication method, however for most reasonably sized images not being
+    // upsampled too much on a fairly average CPU this difference is hardly
+    // noticeable and the results are far more pleasing to look at.
+    //
+    // This particular bicubic algorithm does pixel weighting according to a
+    // B-Spline that basically implements a Gaussian bell-like weighting
+    // kernel. Because of this method the results may appear a bit blurry when
+    // upsampling by large factors.  This is basically because a slight
+    // gaussian blur is being performed to get the smooth look of the upsampled
+    // image.
+
+    // Edge pixels: 3-4 possible solutions
+    // - (Wrap/tile) Wrap the image, take the color value from the opposite
+    // side of the image.
+    // - (Mirror)    Duplicate edge pixels, so that pixel at coordinate (2, n),
+    // where n is nonpositive, will have the value of (2, 1).
+    // - (Ignore)    Simply ignore the edge pixels and apply the kernel only to
+    // pixels which do have all neighbours.
+    // - (Clamp)     Choose the nearest pixel along the border. This takes the
+    // border pixels and extends them out to infinity.
+    //
+    // NOTE: below the y_offset and x_offset variables are being set for edge
+    // pixels using the "Mirror" method mentioned above
+
+    wxImage ret_image;
+
+    ret_image.Create(width, height, false);
+
+    unsigned char* src_data = M_IMGDATA->m_data;
+    unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_data = ret_image.GetData();
+    unsigned char* dst_alpha = NULL;
+
+    if ( src_alpha )
+    {
+        ret_image.SetAlpha();
+        dst_alpha = ret_image.GetAlpha();
+    }
+
+    for ( int dsty = 0; dsty < height; dsty++ )
+    {
+        // We need to calculate the source pixel to interpolate from - Y-axis
+        double srcpixy = double(dsty * M_IMGDATA->m_height) / height;
+        double dy = srcpixy - (int)srcpixy;
+
+        for ( int dstx = 0; dstx < width; dstx++ )
+        {
+            // X-axis of pixel to interpolate from
+            double srcpixx = double(dstx * M_IMGDATA->m_width) / width;
+            double dx = srcpixx - (int)srcpixx;
+
+            // Sums for each color channel
+            double sum_r = 0, sum_g = 0, sum_b = 0, sum_a = 0;
+
+            // Here we actually determine the RGBA values for the destination pixel
+            for ( int k = -1; k <= 2; k++ )
+            {
+                // Y offset
+                int y_offset = srcpixy + k < 0.0
+                                ? 0
+                                : srcpixy + k >= M_IMGDATA->m_height
+                                       ? M_IMGDATA->m_height - 1
+                                       : (int)(srcpixy + k);
+
+                // Loop across the X axis
+                for ( int i = -1; i <= 2; i++ )
+                {
+                    // X offset
+                    int x_offset = srcpixx + i < 0.0
+                                    ? 0
+                                    : srcpixx + i >= M_IMGDATA->m_width
+                                            ? M_IMGDATA->m_width - 1
+                                            : (int)(srcpixx + i);
+
+                    // Calculate the exact position where the source data
+                    // should be pulled from based on the x_offset and y_offset
+                    int src_pixel_index = y_offset*M_IMGDATA->m_width + x_offset;
+
+                    // Calculate the weight for the specified pixel according
+                    // to the bicubic b-spline kernel we're using for
+                    // interpolation
+                    double
+                        pixel_weight = spline_weight(i - dx)*spline_weight(k - dy);
+
+                    // Create a sum of all velues for each color channel
+                    // adjusted for the pixel's calculated weight
+                    sum_r += src_data[src_pixel_index * 3 + 0] * pixel_weight;
+                    sum_g += src_data[src_pixel_index * 3 + 1] * pixel_weight;
+                    sum_b += src_data[src_pixel_index * 3 + 2] * pixel_weight;
+                    if ( src_alpha )
+                        sum_a += src_alpha[src_pixel_index] * pixel_weight;
+                }
+            }
+
+            // Put the data into the destination image.  The summed values are
+            // of double data type and are rounded here for accuracy
+            dst_data[0] = (unsigned char)(sum_r + 0.5);
+            dst_data[1] = (unsigned char)(sum_g + 0.5);
+            dst_data[2] = (unsigned char)(sum_b + 0.5);
+            dst_data += 3;
+
+            if ( src_alpha )
+                *dst_alpha++ = (unsigned char)sum_a;
+        }
+    }
+
+    return ret_image;
+}
+
+// Blur in the horizontal direction
+wxImage wxImage::BlurHorizontal(int blurRadius)
+{
+    wxImage ret_image;
+    ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
+
+    unsigned char* src_data = M_IMGDATA->m_data;
+    unsigned char* dst_data = ret_image.GetData();
+    unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_alpha = NULL;
+
+    // Check for a mask or alpha
+    if ( M_IMGDATA->m_hasMask )
+    {
+        ret_image.SetMaskColour(M_IMGDATA->m_maskRed,
+                                M_IMGDATA->m_maskGreen,
+                                M_IMGDATA->m_maskBlue);
+    }
+    else
+    {
+        if ( src_alpha )
+        {
+            ret_image.SetAlpha();
+            dst_alpha = ret_image.GetAlpha();
+        }
+    }
+
+    // number of pixels we average over
+    const int blurArea = blurRadius*2 + 1;
+
+    // Horizontal blurring algorithm - average all pixels in the specified blur
+    // radius in the X or horizontal direction
+    for ( int y = 0; y < M_IMGDATA->m_height; y++ )
+    {
+        // Variables used in the blurring algorithm
+        long sum_r = 0,
+             sum_g = 0,
+             sum_b = 0,
+             sum_a = 0;
+
+        long pixel_idx;
+        const unsigned char *src;
+        unsigned char *dst;
+
+        // Calculate the average of all pixels in the blur radius for the first
+        // pixel of the row
+        for ( int kernel_x = -blurRadius; kernel_x <= blurRadius; kernel_x++ )
+        {
+            // To deal with the pixels at the start of a row so it's not
+            // grabbing GOK values from memory at negative indices of the
+            // image's data or grabbing from the previous row
+            if ( kernel_x < 0 )
+                pixel_idx = y * M_IMGDATA->m_width;
+            else
+                pixel_idx = kernel_x + y * M_IMGDATA->m_width;
+
+            src = src_data + pixel_idx*3;
+            sum_r += src[0];
+            sum_g += src[1];
+            sum_b += src[2];
+            if ( src_alpha )
+                sum_a += src_alpha[pixel_idx];
+        }
+
+        dst = dst_data + y * M_IMGDATA->m_width*3;
+        dst[0] = (unsigned char)(sum_r / blurArea);
+        dst[1] = (unsigned char)(sum_g / blurArea);
+        dst[2] = (unsigned char)(sum_b / blurArea);
+        if ( src_alpha )
+            dst_alpha[y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
+
+        // Now average the values of the rest of the pixels by just moving the
+        // blur radius box along the row
+        for ( int x = 1; x < M_IMGDATA->m_width; x++ )
+        {
+            // Take care of edge pixels on the left edge by essentially
+            // duplicating the edge pixel
+            if ( x - blurRadius - 1 < 0 )
+                pixel_idx = y * M_IMGDATA->m_width;
+            else
+                pixel_idx = (x - blurRadius - 1) + y * M_IMGDATA->m_width;
+
+            // Subtract the value of the pixel at the left side of the blur
+            // radius box
+            src = src_data + pixel_idx*3;
+            sum_r -= src[0];
+            sum_g -= src[1];
+            sum_b -= src[2];
+            if ( src_alpha )
+                sum_a -= src_alpha[pixel_idx];
+
+            // Take care of edge pixels on the right edge
+            if ( x + blurRadius > M_IMGDATA->m_width - 1 )
+                pixel_idx = M_IMGDATA->m_width - 1 + y * M_IMGDATA->m_width;
+            else
+                pixel_idx = x + blurRadius + y * M_IMGDATA->m_width;
+
+            // Add the value of the pixel being added to the end of our box
+            src = src_data + pixel_idx*3;
+            sum_r += src[0];
+            sum_g += src[1];
+            sum_b += src[2];
+            if ( src_alpha )
+                sum_a += src_alpha[pixel_idx];
+
+            // Save off the averaged data
+            dst = dst_data + x*3 + y*M_IMGDATA->m_width*3;
+            dst[0] = (unsigned char)(sum_r / blurArea);
+            dst[1] = (unsigned char)(sum_g / blurArea);
+            dst[2] = (unsigned char)(sum_b / blurArea);
+            if ( src_alpha )
+                dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
+        }
+    }
+
+    return ret_image;
+}
+
+// Blur in the vertical direction
+wxImage wxImage::BlurVertical(int blurRadius)
+{
+    wxImage ret_image;
+    ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
+
+    unsigned char* src_data = M_IMGDATA->m_data;
+    unsigned char* dst_data = ret_image.GetData();
+    unsigned char* src_alpha = M_IMGDATA->m_alpha;
+    unsigned char* dst_alpha = NULL;
+
+    // Check for a mask or alpha
+    if ( M_IMGDATA->m_hasMask )
+    {
+        ret_image.SetMaskColour(M_IMGDATA->m_maskRed,
+                                M_IMGDATA->m_maskGreen,
+                                M_IMGDATA->m_maskBlue);
+    }
+    else
+    {
+        if ( src_alpha )
+        {
+            ret_image.SetAlpha();
+            dst_alpha = ret_image.GetAlpha();
+        }
+    }
+
+    // number of pixels we average over
+    const int blurArea = blurRadius*2 + 1;
+
+    // Vertical blurring algorithm - same as horizontal but switched the
+    // opposite direction
+    for ( int x = 0; x < M_IMGDATA->m_width; x++ )
+    {
+        // Variables used in the blurring algorithm
+        long sum_r = 0,
+             sum_g = 0,
+             sum_b = 0,
+             sum_a = 0;
+
+        long pixel_idx;
+        const unsigned char *src;
+        unsigned char *dst;
+
+        // Calculate the average of all pixels in our blur radius box for the
+        // first pixel of the column
+        for ( int kernel_y = -blurRadius; kernel_y <= blurRadius; kernel_y++ )
+        {
+            // To deal with the pixels at the start of a column so it's not
+            // grabbing GOK values from memory at negative indices of the
+            // image's data or grabbing from the previous column
+            if ( kernel_y < 0 )
+                pixel_idx = x;
+            else
+                pixel_idx = x + kernel_y * M_IMGDATA->m_width;
+
+            src = src_data + pixel_idx*3;
+            sum_r += src[0];
+            sum_g += src[1];
+            sum_b += src[2];
+            if ( src_alpha )
+                sum_a += src_alpha[pixel_idx];
+        }
+
+        dst = dst_data + x*3;
+        dst[0] = (unsigned char)(sum_r / blurArea);
+        dst[1] = (unsigned char)(sum_g / blurArea);
+        dst[2] = (unsigned char)(sum_b / blurArea);
+        if ( src_alpha )
+            dst_alpha[x] = (unsigned char)(sum_a / blurArea);
+
+        // Now average the values of the rest of the pixels by just moving the
+        // box along the column from top to bottom
+        for ( int y = 1; y < M_IMGDATA->m_height; y++ )
+        {
+            // Take care of pixels that would be beyond the top edge by
+            // duplicating the top edge pixel for the column
+            if ( y - blurRadius - 1 < 0 )
+                pixel_idx = x;
+            else
+                pixel_idx = x + (y - blurRadius - 1) * M_IMGDATA->m_width;
+
+            // Subtract the value of the pixel at the top of our blur radius box
+            src = src_data + pixel_idx*3;
+            sum_r -= src[0];
+            sum_g -= src[1];
+            sum_b -= src[2];
+            if ( src_alpha )
+                sum_a -= src_alpha[pixel_idx];
+
+            // Take care of the pixels that would be beyond the bottom edge of
+            // the image similar to the top edge
+            if ( y + blurRadius > M_IMGDATA->m_height - 1 )
+                pixel_idx = x + (M_IMGDATA->m_height - 1) * M_IMGDATA->m_width;
+            else
+                pixel_idx = x + (blurRadius + y) * M_IMGDATA->m_width;
+
+            // Add the value of the pixel being added to the end of our box
+            src = src_data + pixel_idx*3;
+            sum_r += src[0];
+            sum_g += src[1];
+            sum_b += src[2];
+            if ( src_alpha )
+                sum_a += src_alpha[pixel_idx];
+
+            // Save off the averaged data
+            dst = dst_data + (x + y * M_IMGDATA->m_width) * 3;
+            dst[0] = (unsigned char)(sum_r / blurArea);
+            dst[1] = (unsigned char)(sum_g / blurArea);
+            dst[2] = (unsigned char)(sum_b / blurArea);
+            if ( src_alpha )
+                dst_alpha[x + y * M_IMGDATA->m_width] = (unsigned char)(sum_a / blurArea);
+        }
+    }
+
+    return ret_image;
+}
+
+// The new blur function
+wxImage wxImage::Blur(int blurRadius)
+{
+    wxImage ret_image;
+    ret_image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
+
+    // Blur the image in each direction
+    ret_image = BlurHorizontal(blurRadius);
+    ret_image = ret_image.BlurVertical(blurRadius);
+
+    return ret_image;
+}
+
+wxImage wxImage::Rotate90( bool clockwise ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create( M_IMGDATA->m_height, M_IMGDATA->m_width, false );
+
+    unsigned char *data = image.GetData();
+
+    wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+    unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data;
+    unsigned char *alpha_data = 0 ;
+    unsigned char *source_alpha = 0 ;
+    unsigned char *target_alpha = 0 ;
+
+    if (M_IMGDATA->m_hasMask)
+    {
+        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+    }
+    else
+    {
+        source_alpha = M_IMGDATA->m_alpha ;
+        if ( source_alpha )
+        {
+            image.SetAlpha() ;
+            alpha_data = image.GetAlpha() ;
+        }
+    }
+
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;
+
+    for (long j = 0; j < height; j++)
+    {
+        for (long i = 0; i < width; i++)
+        {
+            if (clockwise)
+            {
+                target_data = data + (((i+1)*height) - j - 1)*3;
+                if(source_alpha)
+                    target_alpha = alpha_data + (((i+1)*height) - j - 1);
+            }
+            else
+            {
+                target_data = data + ((height*(width-1)) + j - (i*height))*3;
+                if(source_alpha)
+                    target_alpha = alpha_data + ((height*(width-1)) + j - (i*height));
+            }
+            memcpy( target_data, source_data, 3 );
+            source_data += 3;
+
+            if(source_alpha)
+            {
+                memcpy( target_alpha, source_alpha, 1 );
+                source_alpha += 1;
+            }
+        }
+    }
+
+    return image;
+}
+
+wxImage wxImage::Mirror( bool horizontally ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
+
+    unsigned char *data = image.GetData();
+    unsigned char *alpha = NULL;
+
+    wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+    if (M_IMGDATA->m_alpha != NULL) {
+        image.SetAlpha();
+        alpha = image.GetAlpha();
+        wxCHECK_MSG( alpha, image, wxT("unable to create alpha channel") );
+    }
+
+    if (M_IMGDATA->m_hasMask)
+        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+
+    long height = M_IMGDATA->m_height;
+    long width  = M_IMGDATA->m_width;
+
+    unsigned char *source_data = M_IMGDATA->m_data;
+    unsigned char *target_data;
+
+    if (horizontally)
+    {
+        for (long j = 0; j < height; j++)
+        {
+            data += width*3;
+            target_data = data-3;
+            for (long i = 0; i < width; i++)
+            {
+                memcpy( target_data, source_data, 3 );
+                source_data += 3;
+                target_data -= 3;
+            }
+        }
+
+        if (alpha != NULL)
+        {
+            // src_alpha starts at the first pixel and increases by 1 after each step
+            // (a step here is the copy of the alpha value of one pixel)
+            const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+            // dest_alpha starts just beyond the first line, decreases before each step,
+            // and after each line is finished, increases by 2 widths (skipping the line
+            // just copied and the line that will be copied next)
+            unsigned char *dest_alpha = alpha + width;
+
+            for (long jj = 0; jj < height; ++jj)
+            {
+                for (long i = 0; i < width; ++i) {
+                    *(--dest_alpha) = *(src_alpha++); // copy one pixel
+                }
+                dest_alpha += 2 * width; // advance beyond the end of the next line
+            }
+        }
+    }
+    else
+    {
+        for (long i = 0; i < height; i++)
+        {
+            target_data = data + 3*width*(height-1-i);
+            memcpy( target_data, source_data, (size_t)3*width );
+            source_data += 3*width;
+        }
+
+        if (alpha != NULL)
+        {
+            // src_alpha starts at the first pixel and increases by 1 width after each step
+            // (a step here is the copy of the alpha channel of an entire line)
+            const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+            // dest_alpha starts just beyond the last line (beyond the whole image)
+            // and decreases by 1 width before each step
+            unsigned char *dest_alpha = alpha + width * height;
+
+            for (long jj = 0; jj < height; ++jj)
+            {
+                dest_alpha -= width;
+                memcpy( dest_alpha, src_alpha, (size_t)width );
+                src_alpha += width;
+            }
+        }
+    }
+
+    return image;
+}
+
+wxImage wxImage::GetSubImage( const wxRect &rect ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    wxCHECK_MSG( (rect.GetLeft()>=0) && (rect.GetTop()>=0) &&
+                 (rect.GetRight()<=GetWidth()) && (rect.GetBottom()<=GetHeight()),
+                 image, wxT("invalid subimage size") );
+
+    const int subwidth = rect.GetWidth();
+    const int subheight = rect.GetHeight();
+
+    image.Create( subwidth, subheight, false );
+
+    const unsigned char *src_data = GetData();
+    const unsigned char *src_alpha = M_IMGDATA->m_alpha;
+    unsigned char *subdata = image.GetData();
+    unsigned char *subalpha = NULL;
+
+    wxCHECK_MSG( subdata, image, wxT("unable to create image") );
+
+    if (src_alpha != NULL) {
+        image.SetAlpha();
+        subalpha = image.GetAlpha();
+        wxCHECK_MSG( subalpha, image, wxT("unable to create alpha channel"));
+    }
+
+    if (M_IMGDATA->m_hasMask)
+        image.SetMaskColour( M_IMGDATA->m_maskRed, M_IMGDATA->m_maskGreen, M_IMGDATA->m_maskBlue );
+
+    const int width = GetWidth();
+    const int pixsoff = rect.GetLeft() + width * rect.GetTop();
+
+    src_data += 3 * pixsoff;
+    src_alpha += pixsoff; // won't be used if was NULL, so this is ok
+
+    for (long j = 0; j < subheight; ++j)
+    {
+        memcpy( subdata, src_data, 3 * subwidth );
+        subdata += 3 * subwidth;
+        src_data += 3 * width;
+        if (subalpha != NULL) {
+            memcpy( subalpha, src_alpha, subwidth );
+            subalpha += subwidth;
+            src_alpha += width;
+        }
+    }
+
+    return image;
+}
+
+wxImage wxImage::Size( const wxSize& size, const wxPoint& pos,
+                       int r_, int g_, int b_ ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+    wxCHECK_MSG( (size.GetWidth() > 0) && (size.GetHeight() > 0), image, wxT("invalid size") );
+
+    int width = GetWidth(), height = GetHeight();
+    image.Create(size.GetWidth(), size.GetHeight(), false);
+
+    unsigned char r = (unsigned char)r_;
+    unsigned char g = (unsigned char)g_;
+    unsigned char b = (unsigned char)b_;
+    if ((r_ == -1) && (g_ == -1) && (b_ == -1))
+    {
+        GetOrFindMaskColour( &r, &g, &b );
+        image.SetMaskColour(r, g, b);
+    }
+
+    image.SetRGB(wxRect(), r, g, b);
+
+    wxRect subRect(pos.x, pos.y, width, height);
+    wxRect finalRect(0, 0, size.GetWidth(), size.GetHeight());
+    if (pos.x < 0)
+        finalRect.width -= pos.x;
+    if (pos.y < 0)
+        finalRect.height -= pos.y;
+
+    subRect.Intersect(finalRect);
+
+    if (!subRect.IsEmpty())
+    {
+        if ((subRect.GetWidth() == width) && (subRect.GetHeight() == height))
+            image.Paste(*this, pos.x, pos.y);
+        else
+            image.Paste(GetSubImage(subRect), pos.x, pos.y);
+    }
+
+    return image;
+}
+
+void wxImage::Paste( const wxImage &image, int x, int y )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+    wxCHECK_RET( image.Ok(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    int xx = 0;
+    int yy = 0;
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+
+    if (x < 0)
+    {
+        xx = -x;
+        width += x;
+    }
+    if (y < 0)
+    {
+        yy = -y;
+        height += y;
+    }
+
+    if ((x+xx)+width > M_IMGDATA->m_width)
+        width = M_IMGDATA->m_width - (x+xx);
+    if ((y+yy)+height > M_IMGDATA->m_height)
+        height = M_IMGDATA->m_height - (y+yy);
+
+    if (width < 1) return;
+    if (height < 1) return;
+
+    if ((!HasMask() && !image.HasMask()) ||
+        (HasMask() && !image.HasMask()) ||
+       ((HasMask() && image.HasMask() &&
+         (GetMaskRed()==image.GetMaskRed()) &&
+         (GetMaskGreen()==image.GetMaskGreen()) &&
+         (GetMaskBlue()==image.GetMaskBlue()))))
+    {
+        unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
+        int source_step = image.GetWidth()*3;
+
+        unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
+        int target_step = M_IMGDATA->m_width*3;
+        for (int j = 0; j < height; j++)
+        {
+            memcpy( target_data, source_data, width*3 );
+            source_data += source_step;
+            target_data += target_step;
+        }
+    }
+
+    // Copy over the alpha channel from the original image
+    if ( image.HasAlpha() )
+    {
+        if ( !HasAlpha() )
+            InitAlpha();
+
+        unsigned char* source_data = image.GetAlpha() + xx + yy*image.GetWidth();
+        int source_step = image.GetWidth();
+
+        unsigned char* target_data = GetAlpha() + (x+xx) + (y+yy)*M_IMGDATA->m_width;
+        int target_step = M_IMGDATA->m_width;
+
+        for (int j = 0; j < height; j++,
+                                    source_data += source_step,
+                                    target_data += target_step)
+        {
+            memcpy( target_data, source_data, width );
+        }
+    }
+
+    if (!HasMask() && image.HasMask())
+    {
+        unsigned char r = image.GetMaskRed();
+        unsigned char g = image.GetMaskGreen();
+        unsigned char b = image.GetMaskBlue();
+
+        unsigned char* source_data = image.GetData() + xx*3 + yy*3*image.GetWidth();
+        int source_step = image.GetWidth()*3;
+
+        unsigned char* target_data = GetData() + (x+xx)*3 + (y+yy)*3*M_IMGDATA->m_width;
+        int target_step = M_IMGDATA->m_width*3;
+
+        for (int j = 0; j < height; j++)
+        {
+            for (int i = 0; i < width*3; i+=3)
+            {
+                if ((source_data[i]   != r) ||
+                    (source_data[i+1] != g) ||
+                    (source_data[i+2] != b))
+                {
+                    memcpy( target_data+i, source_data+i, 3 );
+                }
+            }
+            source_data += source_step;
+            target_data += target_step;
+        }
+    }
+}
+
+void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
+                       unsigned char r2, unsigned char g2, unsigned char b2 )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    unsigned char *data = GetData();
+
+    const int w = GetWidth();
+    const int h = GetHeight();
+
+    for (int j = 0; j < h; j++)
+        for (int i = 0; i < w; i++)
+        {
+            if ((data[0] == r1) && (data[1] == g1) && (data[2] == b1))
+            {
+                data[0] = r2;
+                data[1] = g2;
+                data[2] = b2;
+            }
+            data += 3;
+        }
+}
+
+wxImage wxImage::ConvertToGreyscale( double lr, double lg, double lb ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create(M_IMGDATA->m_width, M_IMGDATA->m_height, false);
+
+    unsigned char *dest = image.GetData();
+
+    wxCHECK_MSG( dest, image, wxT("unable to create image") );
+
+    unsigned char *src = M_IMGDATA->m_data;
+    bool hasMask = M_IMGDATA->m_hasMask;
+    unsigned char maskRed = M_IMGDATA->m_maskRed;
+    unsigned char maskGreen = M_IMGDATA->m_maskGreen;
+    unsigned char maskBlue = M_IMGDATA->m_maskBlue;
+
+    if ( hasMask )
+        image.SetMaskColour(maskRed, maskGreen, maskBlue);
+
+    const long size = M_IMGDATA->m_width * M_IMGDATA->m_height;
+    for ( long i = 0; i < size; i++, src += 3, dest += 3 )
+    {
+        // don't modify the mask
+        if ( hasMask && src[0] == maskRed && src[1] == maskGreen && src[2] == maskBlue )
+        {
+            memcpy(dest, src, 3);
+        }
+        else
+        {
+            // calculate the luma
+            double luma = (src[0] * lr + src[1] * lg + src[2] * lb) + 0.5;
+            dest[0] = dest[1] = dest[2] = wx_static_cast(unsigned char, luma);
+        }
+    }
+
+    // copy the alpha channel, if any
+    if (HasAlpha())
+    {
+        const size_t alphaSize = GetWidth() * GetHeight();
+        unsigned char *alpha = (unsigned char*)malloc(alphaSize);
+        memcpy(alpha, GetAlpha(), alphaSize);
+        image.InitAlpha();
+        image.SetAlpha(alpha);
+    }
+
+    return image;
+}
+
+wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const
+{
+    wxImage image;
+
+    wxCHECK_MSG( Ok(), image, wxT("invalid image") );
+
+    image.Create( M_IMGDATA->m_width, M_IMGDATA->m_height, false );
+
+    unsigned char *data = image.GetData();
+
+    wxCHECK_MSG( data, image, wxT("unable to create image") );
+
+    if (M_IMGDATA->m_hasMask)
+    {
+        if (M_IMGDATA->m_maskRed == r && M_IMGDATA->m_maskGreen == g &&
+                                         M_IMGDATA->m_maskBlue == b)
+            image.SetMaskColour( 255, 255, 255 );
+        else
+            image.SetMaskColour( 0, 0, 0 );
+    }
+
+    long size = M_IMGDATA->m_height * M_IMGDATA->m_width;
+
+    unsigned char *srcd = M_IMGDATA->m_data;
+    unsigned char *tard = image.GetData();
+
+    for ( long i = 0; i < size; i++, srcd += 3, tard += 3 )
+    {
+        if (srcd[0] == r && srcd[1] == g && srcd[2] == b)
+            tard[0] = tard[1] = tard[2] = 255;
+        else
+            tard[0] = tard[1] = tard[2] = 0;
+    }
+
+    return image;
+}
+
+int wxImage::GetWidth() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+    return M_IMGDATA->m_width;
+}
+
+int wxImage::GetHeight() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+    return M_IMGDATA->m_height;
+}
+
+long wxImage::XYToIndex(int x, int y) const
+{
+    if ( Ok() &&
+            x >= 0 && y >= 0 &&
+                x < M_IMGDATA->m_width && y < M_IMGDATA->m_height )
+    {
+        return y*M_IMGDATA->m_width + x;
+    }
+
+    return -1;
+}
+
+void wxImage::SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b )
+{
+    long pos = XYToIndex(x, y);
+    wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );
+
+    AllocExclusive();
+
+    pos *= 3;
+
+    M_IMGDATA->m_data[ pos   ] = r;
+    M_IMGDATA->m_data[ pos+1 ] = g;
+    M_IMGDATA->m_data[ pos+2 ] = b;
+}
+
+void wxImage::SetRGB( const wxRect& rect_, unsigned char r, unsigned char g, unsigned char b )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    wxRect rect(rect_);
+    wxRect imageRect(0, 0, GetWidth(), GetHeight());
+    if ( rect == wxRect() )
+    {
+        rect = imageRect;
+    }
+    else
+    {
+        wxCHECK_RET( imageRect.Contains(rect.GetTopLeft()) &&
+                     imageRect.Contains(rect.GetBottomRight()),
+                     wxT("invalid bounding rectangle") );
+    }
+
+    int x1 = rect.GetLeft(),
+        y1 = rect.GetTop(),
+        x2 = rect.GetRight() + 1,
+        y2 = rect.GetBottom() + 1;
+
+    unsigned char *data wxDUMMY_INITIALIZE(NULL);
+    int x, y, width = GetWidth();
+    for (y = y1; y < y2; y++)
+    {
+        data = M_IMGDATA->m_data + (y*width + x1)*3;
+        for (x = x1; x < x2; x++)
+        {
+            *data++ = r;
+            *data++ = g;
+            *data++ = b;
+        }
+    }
+}
+
+unsigned char wxImage::GetRed( int x, int y ) const
+{
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
+
+    pos *= 3;
+
+    return M_IMGDATA->m_data[pos];
+}
+
+unsigned char wxImage::GetGreen( int x, int y ) const
+{
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
+
+    pos *= 3;
+
+    return M_IMGDATA->m_data[pos+1];
+}
+
+unsigned char wxImage::GetBlue( int x, int y ) const
+{
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
+
+    pos *= 3;
+
+    return M_IMGDATA->m_data[pos+2];
+}
+
+bool wxImage::IsOk() const
+{
+    // image of 0 width or height can't be considered ok - at least because it
+    // causes crashes in ConvertToBitmap() if we don't catch it in time
+    wxImageRefData *data = M_IMGDATA;
+    return data && data->m_ok && data->m_width && data->m_height;
+}
+
+unsigned char *wxImage::GetData() const
+{
+    wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") );
+
+    return M_IMGDATA->m_data;
+}
+
+void wxImage::SetData( unsigned char *data, bool static_data  )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    wxImageRefData *newRefData = new wxImageRefData();
+
+    newRefData->m_width = M_IMGDATA->m_width;
+    newRefData->m_height = M_IMGDATA->m_height;
+    newRefData->m_data = data;
+    newRefData->m_ok = true;
+    newRefData->m_maskRed = M_IMGDATA->m_maskRed;
+    newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
+    newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
+    newRefData->m_hasMask = M_IMGDATA->m_hasMask;
+    newRefData->m_static = static_data;
+
+    UnRef();
+
+    m_refData = newRefData;
+}
+
+void wxImage::SetData( unsigned char *data, int new_width, int new_height, bool static_data )
+{
+    wxImageRefData *newRefData = new wxImageRefData();
+
+    if (m_refData)
+    {
+        newRefData->m_width = new_width;
+        newRefData->m_height = new_height;
+        newRefData->m_data = data;
+        newRefData->m_ok = true;
+        newRefData->m_maskRed = M_IMGDATA->m_maskRed;
+        newRefData->m_maskGreen = M_IMGDATA->m_maskGreen;
+        newRefData->m_maskBlue = M_IMGDATA->m_maskBlue;
+        newRefData->m_hasMask = M_IMGDATA->m_hasMask;
+    }
+    else
+    {
+        newRefData->m_width = new_width;
+        newRefData->m_height = new_height;
+        newRefData->m_data = data;
+        newRefData->m_ok = true;
+    }
+    newRefData->m_static = static_data;
+
+    UnRef();
+
+    m_refData = newRefData;
+}
+
+// ----------------------------------------------------------------------------
+// alpha channel support
+// ----------------------------------------------------------------------------
+
+void wxImage::SetAlpha(int x, int y, unsigned char alpha)
+{
+    wxCHECK_RET( HasAlpha(), wxT("no alpha channel") );
+
+    long pos = XYToIndex(x, y);
+    wxCHECK_RET( pos != -1, wxT("invalid image coordinates") );
+
+    AllocExclusive();
+
+    M_IMGDATA->m_alpha[pos] = alpha;
+}
+
+unsigned char wxImage::GetAlpha(int x, int y) const
+{
+    wxCHECK_MSG( HasAlpha(), 0, wxT("no alpha channel") );
+
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, 0, wxT("invalid image coordinates") );
+
+    return M_IMGDATA->m_alpha[pos];
+}
+
+bool
+wxImage::ConvertColourToAlpha(unsigned char r, unsigned char g, unsigned char b)
+{
+    SetAlpha(NULL);
+
+    const int w = M_IMGDATA->m_width;
+    const int h = M_IMGDATA->m_height;
+
+    unsigned char *alpha = GetAlpha();
+    unsigned char *data = GetData();
+
+    for ( int y = 0; y < h; y++ )
+    {
+        for ( int x = 0; x < w; x++ )
+        {
+            *alpha++ = *data;
+            *data++ = r;
+            *data++ = g;
+            *data++ = b;
+        }
+    }
+
+    return true;
+}
+
+void wxImage::SetAlpha( unsigned char *alpha, bool static_data )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    if ( !alpha )
+    {
+        alpha = (unsigned char *)malloc(M_IMGDATA->m_width*M_IMGDATA->m_height);
+    }
+
+    if( !M_IMGDATA->m_staticAlpha )
+        free(M_IMGDATA->m_alpha);
+
+    M_IMGDATA->m_alpha = alpha;
+    M_IMGDATA->m_staticAlpha = static_data;
+}
+
+unsigned char *wxImage::GetAlpha() const
+{
+    wxCHECK_MSG( Ok(), (unsigned char *)NULL, wxT("invalid image") );
+
+    return M_IMGDATA->m_alpha;
+}
+
+void wxImage::InitAlpha()
+{
+    wxCHECK_RET( !HasAlpha(), wxT("image already has an alpha channel") );
+
+    // initialize memory for alpha channel
+    SetAlpha();
+
+    unsigned char *alpha = M_IMGDATA->m_alpha;
+    const size_t lenAlpha = M_IMGDATA->m_width * M_IMGDATA->m_height;
+
+    if ( HasMask() )
+    {
+        // use the mask to initialize the alpha channel.
+        const unsigned char * const alphaEnd = alpha + lenAlpha;
+
+        const unsigned char mr = M_IMGDATA->m_maskRed;
+        const unsigned char mg = M_IMGDATA->m_maskGreen;
+        const unsigned char mb = M_IMGDATA->m_maskBlue;
+        for ( unsigned char *src = M_IMGDATA->m_data;
+              alpha < alphaEnd;
+              src += 3, alpha++ )
+        {
+            *alpha = (src[0] == mr && src[1] == mg && src[2] == mb)
+                            ? wxIMAGE_ALPHA_TRANSPARENT
+                            : wxIMAGE_ALPHA_OPAQUE;
+        }
+
+        M_IMGDATA->m_hasMask = false;
+    }
+    else // no mask
+    {
+        // make the image fully opaque
+        memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// mask support
+// ----------------------------------------------------------------------------
+
+void wxImage::SetMaskColour( unsigned char r, unsigned char g, unsigned char b )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    M_IMGDATA->m_maskRed = r;
+    M_IMGDATA->m_maskGreen = g;
+    M_IMGDATA->m_maskBlue = b;
+    M_IMGDATA->m_hasMask = true;
+}
+
+bool wxImage::GetOrFindMaskColour( unsigned char *r, unsigned char *g, unsigned char *b ) const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+
+    if (M_IMGDATA->m_hasMask)
+    {
+        if (r) *r = M_IMGDATA->m_maskRed;
+        if (g) *g = M_IMGDATA->m_maskGreen;
+        if (b) *b = M_IMGDATA->m_maskBlue;
+        return true;
+    }
+    else
+    {
+        FindFirstUnusedColour(r, g, b);
+        return false;
+    }
+}
+
+unsigned char wxImage::GetMaskRed() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+    return M_IMGDATA->m_maskRed;
+}
+
+unsigned char wxImage::GetMaskGreen() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+    return M_IMGDATA->m_maskGreen;
+}
+
+unsigned char wxImage::GetMaskBlue() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid image") );
+
+    return M_IMGDATA->m_maskBlue;
+}
+
+void wxImage::SetMask( bool mask )
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    M_IMGDATA->m_hasMask = mask;
+}
+
+bool wxImage::HasMask() const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+
+    return M_IMGDATA->m_hasMask;
+}
+
+bool wxImage::IsTransparent(int x, int y, unsigned char threshold) const
+{
+    long pos = XYToIndex(x, y);
+    wxCHECK_MSG( pos != -1, false, wxT("invalid image coordinates") );
+
+    // check mask
+    if ( M_IMGDATA->m_hasMask )
+    {
+        const unsigned char *p = M_IMGDATA->m_data + 3*pos;
+        if ( p[0] == M_IMGDATA->m_maskRed &&
+                p[1] == M_IMGDATA->m_maskGreen &&
+                    p[2] == M_IMGDATA->m_maskBlue )
+        {
+            return true;
+        }
+    }
+
+    // then check alpha
+    if ( M_IMGDATA->m_alpha )
+    {
+        if ( M_IMGDATA->m_alpha[pos] < threshold )
+        {
+            // transparent enough
+            return true;
+        }
+    }
+
+    // not transparent
+    return false;
+}
+
+bool wxImage::SetMaskFromImage(const wxImage& mask,
+                               unsigned char mr, unsigned char mg, unsigned char mb)
+{
+    // check that the images are the same size
+    if ( (M_IMGDATA->m_height != mask.GetHeight() ) || (M_IMGDATA->m_width != mask.GetWidth () ) )
+    {
+        wxLogError( _("Image and mask have different sizes.") );
+        return false;
+    }
+
+    // find unused colour
+    unsigned char r,g,b ;
+    if (!FindFirstUnusedColour(&r, &g, &b))
+    {
+        wxLogError( _("No unused colour in image being masked.") );
+        return false ;
+    }
+
+    AllocExclusive();
+
+    unsigned char *imgdata = GetData();
+    unsigned char *maskdata = mask.GetData();
+
+    const int w = GetWidth();
+    const int h = GetHeight();
+
+    for (int j = 0; j < h; j++)
+    {
+        for (int i = 0; i < w; i++)
+        {
+            if ((maskdata[0] == mr) && (maskdata[1]  == mg) && (maskdata[2] == mb))
+            {
+                imgdata[0] = r;
+                imgdata[1] = g;
+                imgdata[2] = b;
+            }
+            imgdata  += 3;
+            maskdata += 3;
+        }
+    }
+
+    SetMaskColour(r, g, b);
+    SetMask(true);
+
+    return true;
+}
+
+bool wxImage::ConvertAlphaToMask(unsigned char threshold)
+{
+    if (!HasAlpha())
+        return true;
+
+    unsigned char mr, mg, mb;
+    if (!FindFirstUnusedColour(&mr, &mg, &mb))
+    {
+        wxLogError( _("No unused colour in image being masked.") );
+        return false;
+    }
+
+    AllocExclusive();
+
+    SetMask(true);
+    SetMaskColour(mr, mg, mb);
+
+    unsigned char *imgdata = GetData();
+    unsigned char *alphadata = GetAlpha();
+
+    int w = GetWidth();
+    int h = GetHeight();
+
+    for (int y = 0; y < h; y++)
+    {
+        for (int x = 0; x < w; x++, imgdata += 3, alphadata++)
+        {
+            if (*alphadata < threshold)
+            {
+                imgdata[0] = mr;
+                imgdata[1] = mg;
+                imgdata[2] = mb;
+            }
+        }
+    }
+
+    if( !M_IMGDATA->m_staticAlpha )
+        free(M_IMGDATA->m_alpha);
+
+    M_IMGDATA->m_alpha = NULL;
+    M_IMGDATA->m_staticAlpha = false;
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// Palette functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_PALETTE
+
+bool wxImage::HasPalette() const
+{
+    if (!Ok())
+        return false;
+
+    return M_IMGDATA->m_palette.Ok();
+}
+
+const wxPalette& wxImage::GetPalette() const
+{
+    wxCHECK_MSG( Ok(), wxNullPalette, wxT("invalid image") );
+
+    return M_IMGDATA->m_palette;
+}
+
+void wxImage::SetPalette(const wxPalette& palette)
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    M_IMGDATA->m_palette = palette;
+}
+
+#endif // wxUSE_PALETTE
+
+// ----------------------------------------------------------------------------
+// Option functions (arbitrary name/value mapping)
+// ----------------------------------------------------------------------------
+
+void wxImage::SetOption(const wxString& name, const wxString& value)
+{
+    wxCHECK_RET( Ok(), wxT("invalid image") );
+
+    AllocExclusive();
+
+    int idx = M_IMGDATA->m_optionNames.Index(name, false);
+    if (idx == wxNOT_FOUND)
+    {
+        M_IMGDATA->m_optionNames.Add(name);
+        M_IMGDATA->m_optionValues.Add(value);
+    }
+    else
+    {
+        M_IMGDATA->m_optionNames[idx] = name;
+        M_IMGDATA->m_optionValues[idx] = value;
+    }
+}
+
+void wxImage::SetOption(const wxString& name, int value)
+{
+    wxString valStr;
+    valStr.Printf(wxT("%d"), value);
+    SetOption(name, valStr);
+}
+
+wxString wxImage::GetOption(const wxString& name) const
+{
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid image") );
+
+    int idx = M_IMGDATA->m_optionNames.Index(name, false);
+    if (idx == wxNOT_FOUND)
+        return wxEmptyString;
+    else
+        return M_IMGDATA->m_optionValues[idx];
+}
+
+int wxImage::GetOptionInt(const wxString& name) const
+{
+    return wxAtoi(GetOption(name));
+}
+
+bool wxImage::HasOption(const wxString& name) const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+
+    return (M_IMGDATA->m_optionNames.Index(name, false) != wxNOT_FOUND);
+}
+
+// ----------------------------------------------------------------------------
+// image I/O
+// ----------------------------------------------------------------------------
+
+bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+                        long WXUNUSED_UNLESS_STREAMS(type),
+                        int WXUNUSED_UNLESS_STREAMS(index) )
+{
+#if HAS_FILE_STREAMS
+    if (wxFileExists(filename))
+    {
+        wxImageFileInputStream stream(filename);
+        wxBufferedInputStream bstream( stream );
+        return LoadFile(bstream, type, index);
+    }
+    else
+    {
+        wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
+
+        return false;
+    }
+#else // !HAS_FILE_STREAMS
+    return false;
+#endif // HAS_FILE_STREAMS
+}
+
+bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+                        const wxString& WXUNUSED_UNLESS_STREAMS(mimetype),
+                        int WXUNUSED_UNLESS_STREAMS(index) )
+{
+#if HAS_FILE_STREAMS
+    if (wxFileExists(filename))
+    {
+        wxImageFileInputStream stream(filename);
+        wxBufferedInputStream bstream( stream );
+        return LoadFile(bstream, mimetype, index);
+    }
+    else
+    {
+        wxLogError( _("Can't load image from file '%s': file does not exist."), filename.c_str() );
+
+        return false;
+    }
+#else // !HAS_FILE_STREAMS
+    return false;
+#endif // HAS_FILE_STREAMS
+}
+
+
+
+bool wxImage::SaveFile( const wxString& filename ) const
+{
+    wxString ext = filename.AfterLast('.').Lower();
+
+    wxImageHandler * pHandler = FindHandler(ext, -1);
+    if (pHandler)
+    {
+        return SaveFile(filename, pHandler->GetType());
+    }
+
+    wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
+
+    return false;
+}
+
+bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+                        int WXUNUSED_UNLESS_STREAMS(type) ) const
+{
+#if HAS_FILE_STREAMS
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+
+    wxImageFileOutputStream stream(filename);
+
+    if ( stream.IsOk() )
+    {
+        wxBufferedOutputStream bstream( stream );
+        return SaveFile(bstream, type);
+    }
+#endif // HAS_FILE_STREAMS
+
+    return false;
+}
+
+bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
+                        const wxString& WXUNUSED_UNLESS_STREAMS(mimetype) ) const
+{
+#if HAS_FILE_STREAMS
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+
+    ((wxImage*)this)->SetOption(wxIMAGE_OPTION_FILENAME, filename);
+
+    wxImageFileOutputStream stream(filename);
+
+    if ( stream.IsOk() )
+    {
+        wxBufferedOutputStream bstream( stream );
+        return SaveFile(bstream, mimetype);
+    }
+#endif // HAS_FILE_STREAMS
+
+    return false;
+}
+
+bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) )
+{
+#if HAS_FILE_STREAMS
+    wxImageFileInputStream stream(name);
+    return CanRead(stream);
+#else
+    return false;
+#endif
+}
+
+int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name),
+                            long WXUNUSED_UNLESS_STREAMS(type) )
+{
+#if HAS_FILE_STREAMS
+    wxImageFileInputStream stream(name);
+    if (stream.Ok())
+        return GetImageCount(stream, type);
+#endif
+
+  return 0;
+}
+
+#if wxUSE_STREAMS
+
+bool wxImage::CanRead( wxInputStream &stream )
+{
+    const wxList& list = GetHandlers();
+
+    for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
+    {
+        wxImageHandler *handler=(wxImageHandler*)node->GetData();
+        if (handler->CanRead( stream ))
+            return true;
+    }
+
+    return false;
+}
+
+int wxImage::GetImageCount( wxInputStream &stream, long type )
+{
+    wxImageHandler *handler;
+
+    if ( type == wxBITMAP_TYPE_ANY )
+    {
+        wxList &list=GetHandlers();
+
+        for (wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext())
+        {
+             handler=(wxImageHandler*)node->GetData();
+             if ( handler->CanRead(stream) )
+                 return handler->GetImageCount(stream);
+
+        }
+
+        wxLogWarning(_("No handler found for image type."));
+        return 0;
+    }
+
+    handler = FindHandler(type);
+
+    if ( !handler )
+    {
+        wxLogWarning(_("No image handler for type %ld defined."), type);
+        return false;
+    }
+
+    if ( handler->CanRead(stream) )
+    {
+        return handler->GetImageCount(stream);
+    }
+    else
+    {
+        wxLogError(_("Image file is not of type %ld."), type);
+        return 0;
+    }
+}
+
+bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
+{
+    UnRef();
+
+    m_refData = new wxImageRefData;
+
+    wxImageHandler *handler;
+
+    if ( type == wxBITMAP_TYPE_ANY )
+    {
+        wxList &list=GetHandlers();
+
+        for ( wxList::compatibility_iterator node = list.GetFirst(); node; node = node->GetNext() )
+        {
+             handler=(wxImageHandler*)node->GetData();
+             if ( handler->CanRead(stream) )
+                 return handler->LoadFile(this, stream, true/*verbose*/, index);
+
+        }
+
+        wxLogWarning( _("No handler found for image type.") );
+        return false;
+    }
+
+    handler = FindHandler(type);
+
+    if (handler == 0)
+    {
+        wxLogWarning( _("No image handler for type %ld defined."), type );
+
+        return false;
+    }
+
+    if (stream.IsSeekable() && !handler->CanRead(stream))
+    {
+        wxLogError(_("Image file is not of type %ld."), type);
+        return false;
+    }
+    else
+        return handler->LoadFile(this, stream, true/*verbose*/, index);
+}
+
+bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int index )
+{
+    UnRef();
+
+    m_refData = new wxImageRefData;
+
+    wxImageHandler *handler = FindHandlerMime(mimetype);
+
+    if (handler == 0)
+    {
+        wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
+
+        return false;
+    }
+
+    if (stream.IsSeekable() && !handler->CanRead(stream))
+    {
+        wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype);
+        return false;
+    }
+    else
+        return handler->LoadFile( this, stream, true/*verbose*/, index );
+}
+
+bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+
+    wxImageHandler *handler = FindHandler(type);
+    if ( !handler )
+    {
+        wxLogWarning( _("No image handler for type %d defined."), type );
+
+        return false;
+    }
+
+    return handler->SaveFile( (wxImage*)this, stream );
+}
+
+bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
+{
+    wxCHECK_MSG( Ok(), false, wxT("invalid image") );
+
+    wxImageHandler *handler = FindHandlerMime(mimetype);
+    if ( !handler )
+    {
+        wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
+
+        return false;
+    }
+
+    return handler->SaveFile( (wxImage*)this, stream );
+}
+#endif // wxUSE_STREAMS
+
+// ----------------------------------------------------------------------------
+// image I/O handlers
+// ----------------------------------------------------------------------------
+
+void wxImage::AddHandler( wxImageHandler *handler )
+{
+    // Check for an existing handler of the type being added.
+    if (FindHandler( handler->GetType() ) == 0)
+    {
+        sm_handlers.Append( handler );
+    }
+    else
+    {
+        // This is not documented behaviour, merely the simplest 'fix'
+        // for preventing duplicate additions.  If someone ever has
+        // a good reason to add and remove duplicate handlers (and they
+        // may) we should probably refcount the duplicates.
+        //   also an issue in InsertHandler below.
+
+        wxLogDebug( _T("Adding duplicate image handler for '%s'"),
+                    handler->GetName().c_str() );
+        delete handler;
+    }
+}
+
+void wxImage::InsertHandler( wxImageHandler *handler )
+{
+    // Check for an existing handler of the type being added.
+    if (FindHandler( handler->GetType() ) == 0)
+    {
+        sm_handlers.Insert( handler );
+    }
+    else
+    {
+        // see AddHandler for additional comments.
+        wxLogDebug( _T("Inserting duplicate image handler for '%s'"),
+                    handler->GetName().c_str() );
+        delete handler;
+    }
+}
+
+bool wxImage::RemoveHandler( const wxString& name )
+{
+    wxImageHandler *handler = FindHandler(name);
+    if (handler)
+    {
+        sm_handlers.DeleteObject(handler);
+        delete handler;
+        return true;
+    }
+    else
+        return false;
+}
+
+wxImageHandler *wxImage::FindHandler( const wxString& name )
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler*)node->GetData();
+        if (handler->GetName().Cmp(name) == 0) return handler;
+
+        node = node->GetNext();
+    }
+    return 0;
+}
+
+wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler*)node->GetData();
+        if ( (handler->GetExtension().Cmp(extension) == 0) &&
+            (bitmapType == -1 || handler->GetType() == bitmapType) )
+            return handler;
+        node = node->GetNext();
+    }
+    return 0;
+}
+
+wxImageHandler *wxImage::FindHandler( long bitmapType )
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();
+        if (handler->GetType() == bitmapType) return handler;
+        node = node->GetNext();
+    }
+    return 0;
+}
+
+wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();
+        if (handler->GetMimeType().IsSameAs(mimetype, false)) return handler;
+        node = node->GetNext();
+    }
+    return 0;
+}
+
+void wxImage::InitStandardHandlers()
+{
+#if wxUSE_STREAMS
+    AddHandler(new wxBMPHandler);
+#endif // wxUSE_STREAMS
+}
+
+void wxImage::CleanUpHandlers()
+{
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();
+    while (node)
+    {
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();
+        delete handler;
+        node = next;
+    }
+
+    sm_handlers.Clear();
+}
+
+wxString wxImage::GetImageExtWildcard()
+{
+    wxString fmts;
+
+    wxList& Handlers = wxImage::GetHandlers();
+    wxList::compatibility_iterator Node = Handlers.GetFirst();
+    while ( Node )
+    {
+        wxImageHandler* Handler = (wxImageHandler*)Node->GetData();
+        fmts += wxT("*.") + Handler->GetExtension();
+        Node = Node->GetNext();
+        if ( Node ) fmts += wxT(";");
+    }
+
+    return wxT("(") + fmts + wxT(")|") + fmts;
+}
+
+wxImage::HSVValue wxImage::RGBtoHSV(const RGBValue& rgb)
+{
+    const double red = rgb.red / 255.0,
+                 green = rgb.green / 255.0,
+                 blue = rgb.blue / 255.0;
+
+    // find the min and max intensity (and remember which one was it for the
+    // latter)
+    double minimumRGB = red;
+    if ( green < minimumRGB )
+        minimumRGB = green;
+    if ( blue < minimumRGB )
+        minimumRGB = blue;
+
+    enum { RED, GREEN, BLUE } chMax = RED;
+    double maximumRGB = red;
+    if ( green > maximumRGB )
+    {
+        chMax = GREEN;
+        maximumRGB = green;
+    }
+    if ( blue > maximumRGB )
+    {
+        chMax = BLUE;
+        maximumRGB = blue;
+    }
+
+    const double value = maximumRGB;
+
+    double hue = 0.0, saturation;
+    const double deltaRGB = maximumRGB - minimumRGB;
+    if ( wxIsNullDouble(deltaRGB) )
+    {
+        // Gray has no color
+        hue = 0.0;
+        saturation = 0.0;
+    }
+    else
+    {
+        switch ( chMax )
+        {
+            case RED:
+                hue = (green - blue) / deltaRGB;
+                break;
+
+            case GREEN:
+                hue = 2.0 + (blue - red) / deltaRGB;
+                break;
+
+            case BLUE:
+                hue = 4.0 + (red - green) / deltaRGB;
+                break;
+
+            default:
+                wxFAIL_MSG(wxT("hue not specified"));
+                break;
+        }
+
+        hue /= 6.0;
+
+        if ( hue < 0.0 )
+            hue += 1.0;
+
+        saturation = deltaRGB / maximumRGB;
+    }
+
+    return HSVValue(hue, saturation, value);
+}
+
+wxImage::RGBValue wxImage::HSVtoRGB(const HSVValue& hsv)
+{
+    double red, green, blue;
+
+    if ( wxIsNullDouble(hsv.saturation) )
+    {
+        // Grey
+        red = hsv.value;
+        green = hsv.value;
+        blue = hsv.value;
+    }
+    else // not grey
+    {
+        double hue = hsv.hue * 6.0;      // sector 0 to 5
+        int i = (int)floor(hue);
+        double f = hue - i;          // fractional part of h
+        double p = hsv.value * (1.0 - hsv.saturation);
+
+        switch (i)
+        {
+            case 0:
+                red = hsv.value;
+                green = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
+                blue = p;
+                break;
+
+            case 1:
+                red = hsv.value * (1.0 - hsv.saturation * f);
+                green = hsv.value;
+                blue = p;
+                break;
+
+            case 2:
+                red = p;
+                green = hsv.value;
+                blue = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
+                break;
+
+            case 3:
+                red = p;
+                green = hsv.value * (1.0 - hsv.saturation * f);
+                blue = hsv.value;
+                break;
+
+            case 4:
+                red = hsv.value * (1.0 - hsv.saturation * (1.0 - f));
+                green = p;
+                blue = hsv.value;
+                break;
+
+            default:    // case 5:
+                red = hsv.value;
+                green = p;
+                blue = hsv.value * (1.0 - hsv.saturation * f);
+                break;
+        }
+    }
+
+    return RGBValue((unsigned char)(red * 255.0),
+                    (unsigned char)(green * 255.0),
+                    (unsigned char)(blue * 255.0));
+}
+
+/*
+ * Rotates the hue of each pixel of the image. angle is a double in the range
+ * -1.0..1.0 where -1.0 is -360 degrees and 1.0 is 360 degrees
+ */
+void wxImage::RotateHue(double angle)
+{
+    AllocExclusive();
+
+    unsigned char *srcBytePtr;
+    unsigned char *dstBytePtr;
+    unsigned long count;
+    wxImage::HSVValue hsv;
+    wxImage::RGBValue rgb;
+
+    wxASSERT (angle >= -1.0 && angle <= 1.0);
+    count = M_IMGDATA->m_width * M_IMGDATA->m_height;
+    if ( count > 0 && !wxIsNullDouble(angle) )
+    {
+        srcBytePtr = M_IMGDATA->m_data;
+        dstBytePtr = srcBytePtr;
+        do
+        {
+            rgb.red = *srcBytePtr++;
+            rgb.green = *srcBytePtr++;
+            rgb.blue = *srcBytePtr++;
+            hsv = RGBtoHSV(rgb);
+
+            hsv.hue = hsv.hue + angle;
+            if (hsv.hue > 1.0)
+                hsv.hue = hsv.hue - 1.0;
+            else if (hsv.hue < 0.0)
+                hsv.hue = hsv.hue + 1.0;
+
+            rgb = HSVtoRGB(hsv);
+            *dstBytePtr++ = rgb.red;
+            *dstBytePtr++ = rgb.green;
+            *dstBytePtr++ = rgb.blue;
+        } while (--count != 0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+// wxImageHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxImageHandler,wxObject)
+
+#if wxUSE_STREAMS
+bool wxImageHandler::LoadFile( wxImage *WXUNUSED(image), wxInputStream& WXUNUSED(stream), bool WXUNUSED(verbose), int WXUNUSED(index) )
+{
+    return false;
+}
+
+bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool WXUNUSED(verbose) )
+{
+    return false;
+}
+
+int wxImageHandler::GetImageCount( wxInputStream& WXUNUSED(stream) )
+{
+    return 1;
+}
+
+bool wxImageHandler::CanRead( const wxString& name )
+{
+    if (wxFileExists(name))
+    {
+        wxImageFileInputStream stream(name);
+        return CanRead(stream);
+    }
+
+    wxLogError( _("Can't check image format of file '%s': file does not exist."), name.c_str() );
+
+    return false;
+}
+
+bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
+{
+    wxFileOffset posOld = stream.TellI();
+    if ( posOld == wxInvalidOffset )
+    {
+        // can't test unseekable stream
+        return false;
+    }
+
+    bool ok = DoCanRead(stream);
+
+    // restore the old position to be able to test other formats and so on
+    if ( stream.SeekI(posOld) == wxInvalidOffset )
+    {
+        wxLogDebug(_T("Failed to rewind the stream in wxImageHandler!"));
+
+        // reading would fail anyhow as we're not at the right position
+        return false;
+    }
+
+    return ok;
+}
+
+#endif // wxUSE_STREAMS
+
+// ----------------------------------------------------------------------------
+// image histogram stuff
+// ----------------------------------------------------------------------------
+
+bool
+wxImageHistogram::FindFirstUnusedColour(unsigned char *r,
+                                        unsigned char *g,
+                                        unsigned char *b,
+                                        unsigned char r2,
+                                        unsigned char b2,
+                                        unsigned char g2) const
+{
+    unsigned long key = MakeKey(r2, g2, b2);
+
+    while ( find(key) != end() )
+    {
+        // color already used
+        r2++;
+        if ( r2 >= 255 )
+        {
+            r2 = 0;
+            g2++;
+            if ( g2 >= 255 )
+            {
+                g2 = 0;
+                b2++;
+                if ( b2 >= 255 )
+                {
+                    wxLogError(_("No unused colour in image.") );
+                    return false;
+                }
+            }
+        }
+
+        key = MakeKey(r2, g2, b2);
+    }
+
+    if ( r )
+        *r = r2;
+    if ( g )
+        *g = g2;
+    if ( b )
+        *b = b2;
+
+    return true;
+}
+
+bool
+wxImage::FindFirstUnusedColour(unsigned char *r,
+                               unsigned char *g,
+                               unsigned char *b,
+                               unsigned char r2,
+                               unsigned char b2,
+                               unsigned char g2) const
+{
+    wxImageHistogram histogram;
+
+    ComputeHistogram(histogram);
+
+    return histogram.FindFirstUnusedColour(r, g, b, r2, g2, b2);
+}
+
+
+
+// GRG, Dic/99
+// Counts and returns the number of different colours. Optionally stops
+// when it exceeds 'stopafter' different colours. This is useful, for
+// example, to see if the image can be saved as 8-bit (256 colour or
+// less, in this case it would be invoked as CountColours(256)). Default
+// value for stopafter is -1 (don't care).
+//
+unsigned long wxImage::CountColours( unsigned long stopafter ) const
+{
+    wxHashTable h;
+    wxObject dummy;
+    unsigned char r, g, b;
+    unsigned char *p;
+    unsigned long size, nentries, key;
+
+    p = GetData();
+    size = GetWidth() * GetHeight();
+    nentries = 0;
+
+    for (unsigned long j = 0; (j < size) && (nentries <= stopafter) ; j++)
+    {
+        r = *(p++);
+        g = *(p++);
+        b = *(p++);
+        key = wxImageHistogram::MakeKey(r, g, b);
+
+        if (h.Get(key) == NULL)
+        {
+            h.Put(key, &dummy);
+            nentries++;
+        }
+    }
+
+    return nentries;
+}
+
+
+unsigned long wxImage::ComputeHistogram( wxImageHistogram &h ) const
+{
+    unsigned char *p = GetData();
+    unsigned long nentries = 0;
+
+    h.clear();
+
+    const unsigned long size = GetWidth() * GetHeight();
+
+    unsigned char r, g, b;
+    for ( unsigned long n = 0; n < size; n++ )
+    {
+        r = *p++;
+        g = *p++;
+        b = *p++;
+
+        wxImageHistogramEntry& entry = h[wxImageHistogram::MakeKey(r, g, b)];
+
+        if ( entry.value++ == 0 )
+            entry.index = nentries++;
+    }
+
+    return nentries;
+}
+
+/*
+ * Rotation code by Carlos Moreno
+ */
+
+static const double wxROTATE_EPSILON = 1e-10;
+
+// Auxiliary function to rotate a point (x,y) with respect to point p0
+// make it inline and use a straight return to facilitate optimization
+// also, the function receives the sine and cosine of the angle to avoid
+// repeating the time-consuming calls to these functions -- sin/cos can
+// be computed and stored in the calling function.
+
+static inline wxRealPoint
+wxRotatePoint(const wxRealPoint& p, double cos_angle, double sin_angle,
+              const wxRealPoint& p0)
+{
+    return wxRealPoint(p0.x + (p.x - p0.x) * cos_angle - (p.y - p0.y) * sin_angle,
+                       p0.y + (p.y - p0.y) * cos_angle + (p.x - p0.x) * sin_angle);
+}
+
+static inline wxRealPoint
+wxRotatePoint(double x, double y, double cos_angle, double sin_angle,
+              const wxRealPoint & p0)
+{
+    return wxRotatePoint (wxRealPoint(x,y), cos_angle, sin_angle, p0);
+}
+
+wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool interpolating, wxPoint * offset_after_rotation) const
+{
+    int i;
+    angle = -angle;     // screen coordinates are a mirror image of "real" coordinates
+
+    bool has_alpha = HasAlpha();
+
+    const int w = GetWidth(),
+              h = GetHeight();
+
+    // Create pointer-based array to accelerate access to wxImage's data
+    unsigned char ** data = new unsigned char * [h];
+    data[0] = GetData();
+    for (i = 1; i < h; i++)
+        data[i] = data[i - 1] + (3 * w);
+
+    // Same for alpha channel
+    unsigned char ** alpha = NULL;
+    if (has_alpha)
+    {
+        alpha = new unsigned char * [h];
+        alpha[0] = GetAlpha();
+        for (i = 1; i < h; i++)
+            alpha[i] = alpha[i - 1] + w;
+    }
+
+    // precompute coefficients for rotation formula
+    // (sine and cosine of the angle)
+    const double cos_angle = cos(angle);
+    const double sin_angle = sin(angle);
+
+    // Create new Image to store the result
+    // First, find rectangle that covers the rotated image;  to do that,
+    // rotate the four corners
+
+    const wxRealPoint p0(centre_of_rotation.x, centre_of_rotation.y);
+
+    wxRealPoint p1 = wxRotatePoint (0, 0, cos_angle, sin_angle, p0);
+    wxRealPoint p2 = wxRotatePoint (0, h, cos_angle, sin_angle, p0);
+    wxRealPoint p3 = wxRotatePoint (w, 0, cos_angle, sin_angle, p0);
+    wxRealPoint p4 = wxRotatePoint (w, h, cos_angle, sin_angle, p0);
+
+    int x1a = (int) floor (wxMin (wxMin(p1.x, p2.x), wxMin(p3.x, p4.x)));
+    int y1a = (int) floor (wxMin (wxMin(p1.y, p2.y), wxMin(p3.y, p4.y)));
+    int x2a = (int) ceil (wxMax (wxMax(p1.x, p2.x), wxMax(p3.x, p4.x)));
+    int y2a = (int) ceil (wxMax (wxMax(p1.y, p2.y), wxMax(p3.y, p4.y)));
+
+    // Create rotated image
+    wxImage rotated (x2a - x1a + 1, y2a - y1a + 1, false);
+    // With alpha channel
+    if (has_alpha)
+        rotated.SetAlpha();
+
+    if (offset_after_rotation != NULL)
+    {
+        *offset_after_rotation = wxPoint (x1a, y1a);
+    }
+
+    // GRG: The rotated (destination) image is always accessed
+    //      sequentially, so there is no need for a pointer-based
+    //      array here (and in fact it would be slower).
+    //
+    unsigned char * dst = rotated.GetData();
+
+    unsigned char * alpha_dst = NULL;
+    if (has_alpha)
+        alpha_dst = rotated.GetAlpha();
+
+    // GRG: if the original image has a mask, use its RGB values
+    //      as the blank pixel, else, fall back to default (black).
+    //
+    unsigned char blank_r = 0;
+    unsigned char blank_g = 0;
+    unsigned char blank_b = 0;
+
+    if (HasMask())
+    {
+        blank_r = GetMaskRed();
+        blank_g = GetMaskGreen();
+        blank_b = GetMaskBlue();
+        rotated.SetMaskColour( blank_r, blank_g, blank_b );
+    }
+
+    // Now, for each point of the rotated image, find where it came from, by
+    // performing an inverse rotation (a rotation of -angle) and getting the
+    // pixel at those coordinates
+
+    const int rH = rotated.GetHeight();
+    const int rW = rotated.GetWidth();
+
+    // GRG: I've taken the (interpolating) test out of the loops, so that
+    //      it is done only once, instead of repeating it for each pixel.
+
+    if (interpolating)
+    {
+        for (int y = 0; y < rH; y++)
+        {
+            for (int x = 0; x < rW; x++)
+            {
+                wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
+
+                if (-0.25 < src.x && src.x < w - 0.75 &&
+                    -0.25 < src.y && src.y < h - 0.75)
+                {
+                    // interpolate using the 4 enclosing grid-points.  Those
+                    // points can be obtained using floor and ceiling of the
+                    // exact coordinates of the point
+                    int x1, y1, x2, y2;
+
+                    if (0 < src.x && src.x < w - 1)
+                    {
+                        x1 = wxRound(floor(src.x));
+                        x2 = wxRound(ceil(src.x));
+                    }
+                    else    // else means that x is near one of the borders (0 or width-1)
+                    {
+                        x1 = x2 = wxRound (src.x);
+                    }
+
+                    if (0 < src.y && src.y < h - 1)
+                    {
+                        y1 = wxRound(floor(src.y));
+                        y2 = wxRound(ceil(src.y));
+                    }
+                    else
+                    {
+                        y1 = y2 = wxRound (src.y);
+                    }
+
+                    // get four points and the distances (square of the distance,
+                    // for efficiency reasons) for the interpolation formula
+
+                    // GRG: Do not calculate the points until they are
+                    //      really needed -- this way we can calculate
+                    //      just one, instead of four, if d1, d2, d3
+                    //      or d4 are < wxROTATE_EPSILON
+
+                    const double d1 = (src.x - x1) * (src.x - x1) + (src.y - y1) * (src.y - y1);
+                    const double d2 = (src.x - x2) * (src.x - x2) + (src.y - y1) * (src.y - y1);
+                    const double d3 = (src.x - x2) * (src.x - x2) + (src.y - y2) * (src.y - y2);
+                    const double d4 = (src.x - x1) * (src.x - x1) + (src.y - y2) * (src.y - y2);
+
+                    // Now interpolate as a weighted average of the four surrounding
+                    // points, where the weights are the distances to each of those points
+
+                    // If the point is exactly at one point of the grid of the source
+                    // image, then don't interpolate -- just assign the pixel
+
+                    // d1,d2,d3,d4 are positive -- no need for abs()
+                    if (d1 < wxROTATE_EPSILON)
+                    {
+                        unsigned char *p = data[y1] + (3 * x1);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                            *(alpha_dst++) = *(alpha[y1] + x1);
+                    }
+                    else if (d2 < wxROTATE_EPSILON)
+                    {
+                        unsigned char *p = data[y1] + (3 * x2);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                            *(alpha_dst++) = *(alpha[y1] + x2);
+                    }
+                    else if (d3 < wxROTATE_EPSILON)
+                    {
+                        unsigned char *p = data[y2] + (3 * x2);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                            *(alpha_dst++) = *(alpha[y2] + x2);
+                    }
+                    else if (d4 < wxROTATE_EPSILON)
+                    {
+                        unsigned char *p = data[y2] + (3 * x1);
+                        *(dst++) = *(p++);
+                        *(dst++) = *(p++);
+                        *(dst++) = *p;
+
+                        if (has_alpha)
+                            *(alpha_dst++) = *(alpha[y2] + x1);
+                    }
+                    else
+                    {
+                        // weights for the weighted average are proportional to the inverse of the distance
+                        unsigned char *v1 = data[y1] + (3 * x1);
+                        unsigned char *v2 = data[y1] + (3 * x2);
+                        unsigned char *v3 = data[y2] + (3 * x2);
+                        unsigned char *v4 = data[y2] + (3 * x1);
+
+                        const double w1 = 1/d1, w2 = 1/d2, w3 = 1/d3, w4 = 1/d4;
+
+                        // GRG: Unrolled.
+
+                        *(dst++) = (unsigned char)
+                            ( (w1 * *(v1++) + w2 * *(v2++) +
+                               w3 * *(v3++) + w4 * *(v4++)) /
+                              (w1 + w2 + w3 + w4) );
+                        *(dst++) = (unsigned char)
+                            ( (w1 * *(v1++) + w2 * *(v2++) +
+                               w3 * *(v3++) + w4 * *(v4++)) /
+                              (w1 + w2 + w3 + w4) );
+                        *(dst++) = (unsigned char)
+                            ( (w1 * *v1 + w2 * *v2 +
+                               w3 * *v3 + w4 * *v4) /
+                              (w1 + w2 + w3 + w4) );
+
+                        if (has_alpha)
+                        {
+                            v1 = alpha[y1] + (x1);
+                            v2 = alpha[y1] + (x2);
+                            v3 = alpha[y2] + (x2);
+                            v4 = alpha[y2] + (x1);
+
+                            *(alpha_dst++) = (unsigned char)
+                                ( (w1 * *v1 + w2 * *v2 +
+                                   w3 * *v3 + w4 * *v4) /
+                                  (w1 + w2 + w3 + w4) );
+                        }
+                    }
+                }
+                else
+                {
+                    *(dst++) = blank_r;
+                    *(dst++) = blank_g;
+                    *(dst++) = blank_b;
+
+                    if (has_alpha)
+                        *(alpha_dst++) = 0;
+                }
+            }
+        }
+    }
+    else    // not interpolating
+    {
+        for (int y = 0; y < rH; y++)
+        {
+            for (int x = 0; x < rW; x++)
+            {
+                wxRealPoint src = wxRotatePoint (x + x1a, y + y1a, cos_angle, -sin_angle, p0);
+
+                const int xs = wxRound (src.x);      // wxRound rounds to the
+                const int ys = wxRound (src.y);      // closest integer
+
+                if (0 <= xs && xs < w && 0 <= ys && ys < h)
+                {
+                    unsigned char *p = data[ys] + (3 * xs);
+                    *(dst++) = *(p++);
+                    *(dst++) = *(p++);
+                    *(dst++) = *p;
+
+                    if (has_alpha)
+                        *(alpha_dst++) = *(alpha[ys] + (xs));
+                }
+                else
+                {
+                    *(dst++) = blank_r;
+                    *(dst++) = blank_g;
+                    *(dst++) = blank_b;
+
+                    if (has_alpha)
+                        *(alpha_dst++) = 255;
+                }
+            }
+        }
+    }
+
+    delete [] data;
+
+    if (has_alpha)
+        delete [] alpha;
+
+    return rotated;
+}
+
+
+
+
+
+// A module to allow wxImage initialization/cleanup
+// without calling these functions from app.cpp or from
+// the user's application.
+
+class wxImageModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxImageModule)
+public:
+    wxImageModule() {}
+    bool OnInit() { wxImage::InitStandardHandlers(); return true; }
+    void OnExit() { wxImage::CleanUpHandlers(); }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxImageModule, wxModule)
+
+
+#endif // wxUSE_IMAGE
diff --git a/Source/3rd Party/wx/src/common/imagfill.cpp b/Source/3rd Party/wx/src/common/imagfill.cpp
index ae5eeb1b0..a784b5058 100644
--- a/Source/3rd Party/wx/src/common/imagfill.cpp	
+++ b/Source/3rd Party/wx/src/common/imagfill.cpp	
@@ -1,323 +1,325 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagfill.cpp
-// Purpose:     FloodFill for wxImage
-// Author:      Julian Smart
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && !defined(__WXMSW__)
-// we have no use for this code in wxMSW...
-
-#ifndef WX_PRECOMP
-    #include "wx/brush.h"
-    #include "wx/dc.h"
-    #include "wx/dcmemory.h"
-    #include "wx/image.h"
-#endif
-
-// DoFloodFill
-// Fills with the colour extracted from fillBrush, starting at x,y until either
-// a color different from the start pixel is reached (wxFLOOD_SURFACE)
-// or fill color is reached (wxFLOOD_BORDER)
-
-static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, const wxColour& c)
-{
-    if ((x<0)||(x>=w)||(y<0)||(y>=h)) return false;
-
-    unsigned char r = img->GetRed(x,y);
-    unsigned char g = img->GetGreen(x,y);
-    unsigned char b = img->GetBlue(x,y);
-    return c.Red() == r && c.Green() == g && c.Blue() == b ;
-}
-
-static bool LINKAGEMODE MatchBoundaryPixel(wxImage *img, int x, int y, int w, int h, const wxColour & fill, const wxColour& bound)
-{
-    if ((x<0)||(x>=w)||(y<0)||(y>=h)) return true;
-
-    unsigned char r = img->GetRed(x,y);
-    unsigned char g = img->GetGreen(x,y);
-    unsigned char b = img->GetBlue(x,y);
-    if ( fill.Red() == r && fill.Green() == g && fill.Blue() == b )
-        return true;
-    if ( bound.Red() == r && bound.Green() == g && bound.Blue() == b )
-        return true;
-    return false;
-}
-
-
-static void LINKAGEMODE
-wxImageFloodFill(wxImage *image,
-                 wxCoord x, wxCoord y, const wxBrush & fillBrush,
-                 const wxColour& testColour, int style)
-{
-    /* A diamond flood-fill using a circular queue system.
-    Each pixel surrounding the current pixel is added to
-    the queue if it meets the criteria, then is retrieved in
-    its turn.  Code originally based on http://www.drawit.co.nz/Developers.htm,
-    with explicit permission to use this for wxWidgets granted by Andrew Empson
-    (no copyright claimed)
-     */
-
-    int width = image->GetWidth();
-    int height = image->GetHeight();
-
-    //Draw using a pen made from the current brush colour
-    //Potentially allows us to use patterned flood fills in future code
-    wxColour fillColour = fillBrush.GetColour();
-    unsigned char r = fillColour.Red();
-    unsigned char g = fillColour.Green();
-    unsigned char b = fillColour.Blue();
-
-    //initial test :
-    if (style == wxFLOOD_SURFACE)
-    {
-       //if wxFLOOD_SURFACE, if fill colour is same as required, we don't do anything
-       if (     image->GetRed(x,y)   != r
-             || image->GetGreen(x,y) != g
-             || image->GetBlue (x,y) != b   )
-        {
-        //prepare memory for queue
-        //queue save, start, read
-        size_t *qs, *qst, *qr;
-
-        //queue size (physical)
-        long qSz= height * width * 2;
-        qst = new size_t [qSz];
-
-        //temporary x and y locations
-        int xt, yt;
-
-        for (int i=0; i < qSz; i++)
-            qst[i] = 0;
-
-        // start queue
-        qs=qr=qst;
-        *qs=xt=x;
-        qs++;
-        *qs=yt=y;
-        qs++;
-
-        image->SetRGB(xt,yt,r,g,b);
-
-        //Main queue loop
-        while(qr!=qs)
-        {
-            //Add new members to queue
-            //Above current pixel
-            if(MatchPixel(image,xt,yt-1,width,height,testColour))
-            {
-                *qs=xt;
-                qs++;
-                *qs=yt-1;
-                qs++;
-                image->SetRGB(xt,yt-1,r,g,b);
-
-                //Loop back to beginning of queue
-                if(qs>=(qst+qSz)) qs=qst;
-            }
-
-            //Below current pixel
-            if(MatchPixel(image,xt,yt+1,width,height,testColour))
-            {
-                *qs=xt;
-                qs++;
-                *qs=yt+1;
-                qs++;
-                image->SetRGB(xt,yt+1,r,g,b);
-                if(qs>=(qst+qSz)) qs=qst;
-            }
-
-            //Left of current pixel
-            if(MatchPixel(image,xt-1,yt,width,height,testColour))
-            {
-                *qs=xt-1;
-                qs++;
-                *qs=yt;
-                qs++;
-                image->SetRGB(xt-1,yt,r,g,b);
-                if(qs>=(qst+qSz)) qs=qst;
-            }
-
-            //Right of current pixel
-            if(MatchPixel(image,xt+1,yt,width,height,testColour))
-            {
-                *qs=xt+1;
-                qs++;
-                *qs=yt;
-                qs++;
-                image->SetRGB(xt+1,yt,r,g,b);
-                if(qs>=(qst+qSz)) qs=qst;
-            }
-
-            //Retrieve current queue member
-            qr+=2;
-
-            //Loop back to the beginning
-            if(qr>=(qst+qSz)) qr=qst;
-            xt=*qr;
-            yt=*(qr+1);
-
-        //Go Back to beginning of loop
-        }
-
-        delete[] qst;
-        }
-    }
-    else
-    {
-    //style is wxFLOOD_BORDER
-    // fill up to testColor border - if already testColour don't do anything
-    if (  image->GetRed(x,y)   != testColour.Red()
-          || image->GetGreen(x,y) != testColour.Green()
-          || image->GetBlue(x,y)  != testColour.Blue() )
-    {
-        //prepare memory for queue
-        //queue save, start, read
-        size_t *qs, *qst, *qr;
-
-        //queue size (physical)
-        long qSz= height * width * 2;
-        qst = new size_t [qSz];
-
-        //temporary x and y locations
-        int xt, yt;
-
-        for (int i=0; i < qSz; i++)
-            qst[i] = 0;
-
-        // start queue
-        qs=qr=qst;
-        *qs=xt=x;
-        qs++;
-        *qs=yt=y;
-        qs++;
-
-        image->SetRGB(xt,yt,r,g,b);
-
-        //Main queue loop
-        while (qr!=qs)
-        {
-            //Add new members to queue
-            //Above current pixel
-            if(!MatchBoundaryPixel(image,xt,yt-1,width,height,fillColour,testColour))
-            {
-                *qs=xt;
-                qs++;
-                *qs=yt-1;
-                qs++;
-                image->SetRGB(xt,yt-1,r,g,b);
-
-                //Loop back to beginning of queue
-                if(qs>=(qst+qSz)) qs=qst;
-            }
-
-            //Below current pixel
-            if(!MatchBoundaryPixel(image,xt,yt+1,width,height,fillColour,testColour))
-            {
-                *qs=xt;
-                qs++;
-                *qs=yt+1;
-                qs++;
-                image->SetRGB(xt,yt+1,r,g,b);
-                if(qs>=(qst+qSz)) qs=qst;
-            }
-
-            //Left of current pixel
-            if(!MatchBoundaryPixel(image,xt-1,yt,width,height,fillColour,testColour))
-            {
-                *qs=xt-1;
-                qs++;
-                *qs=yt;
-                qs++;
-                image->SetRGB(xt-1,yt,r,g,b);
-                if(qs>=(qst+qSz)) qs=qst;
-            }
-
-            //Right of current pixel
-            if(!MatchBoundaryPixel(image,xt+1,yt,width,height,fillColour,testColour))
-            {
-                *qs=xt+1;
-                qs++;
-                *qs=yt;
-                qs++;
-                image->SetRGB(xt+1,yt,r,g,b);
-                if(qs>=(qst+qSz)) qs=qst;
-            }
-
-            //Retrieve current queue member
-            qr+=2;
-
-            //Loop back to the beginning
-            if(qr>=(qst+qSz)) qr=qst;
-            xt=*qr;
-            yt=*(qr+1);
-
-        //Go Back to beginning of loop
-        }
-
-        delete[] qst;
-        }
-    }
-    //all done,
-}
-
-
-bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
-                   const wxColour& col, wxFloodFillStyle style)
-{
-    if (dc->GetBrush().IsTransparent())
-        return true;
-
-    int height = 0;
-    int width  = 0;
-    dc->GetSize(&width, &height);
-
-    //it would be nice to fail if we don't get a sensible size...
-    wxCHECK_MSG(width >= 1 && height >= 1, false,
-                wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
-
-    const int x_dev = dc->LogicalToDeviceX(x);
-    const int y_dev = dc->LogicalToDeviceY(y);
-
-    // if start point is outside dc, can't do anything
-    if (!wxRect(0, 0, width, height).Contains(x_dev, y_dev))
-        return false;
-
-    wxBitmap bitmap(width, height);
-    wxMemoryDC memdc(bitmap);
-    // match dc scales
-    double sx, sy;
-    dc->GetUserScale(&sx, &sy);
-    memdc.SetUserScale(sx, sy);
-    dc->GetLogicalScale(&sx, &sy);
-    memdc.SetLogicalScale(sx, sy);
-
-    // get logical size and origin
-    const int w_log = dc->DeviceToLogicalXRel(width);
-    const int h_log = dc->DeviceToLogicalYRel(height);
-    const int x0_log = dc->DeviceToLogicalX(0);
-    const int y0_log = dc->DeviceToLogicalY(0);
-
-    memdc.Blit(0, 0, w_log, h_log, dc, x0_log, y0_log);
-    memdc.SelectObject(wxNullBitmap);
-
-    wxImage image = bitmap.ConvertToImage();
-    wxImageFloodFill(&image, x_dev, y_dev, dc->GetBrush(), col, style);
-    bitmap = wxBitmap(image);
-    memdc.SelectObject(bitmap);
-    dc->Blit(x0_log, y0_log, w_log, h_log, &memdc, 0, 0);
-
-    return true;
-}
-
-#endif // wxUSE_IMAGE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagfill.cpp
+// Purpose:     FloodFill for wxImage
+// Author:      Julian Smart
+// RCS-ID:      $Id: imagfill.cpp 63770 2010-03-28 22:34:12Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && !defined(__WXMSW__)
+// we have no use for this code in wxMSW...
+
+#ifndef WX_PRECOMP
+    #include "wx/brush.h"
+    #include "wx/dc.h"
+    #include "wx/dcmemory.h"
+    #include "wx/image.h"
+#endif
+
+// DoFloodFill
+// Fills with the colour extracted from fillBrush, starting at x,y until either
+// a color different from the start pixel is reached (wxFLOOD_SURFACE)
+// or fill color is reached (wxFLOOD_BORDER)
+
+static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, const wxColour& c)
+{
+    if ((x<0)||(x>=w)||(y<0)||(y>=h)) return false;
+
+    unsigned char r = img->GetRed(x,y);
+    unsigned char g = img->GetGreen(x,y);
+    unsigned char b = img->GetBlue(x,y);
+    return c.Red() == r && c.Green() == g && c.Blue() == b ;
+}
+
+static bool LINKAGEMODE MatchBoundaryPixel(wxImage *img, int x, int y, int w, int h, const wxColour & fill, const wxColour& bound)
+{
+    if ((x<0)||(x>=w)||(y<0)||(y>=h)) return true;
+
+    unsigned char r = img->GetRed(x,y);
+    unsigned char g = img->GetGreen(x,y);
+    unsigned char b = img->GetBlue(x,y);
+    if ( fill.Red() == r && fill.Green() == g && fill.Blue() == b )
+        return true;
+    if ( bound.Red() == r && bound.Green() == g && bound.Blue() == b )
+        return true;
+    return false;
+}
+
+
+static void LINKAGEMODE
+wxImageFloodFill(wxImage *image,
+                 wxCoord x, wxCoord y, const wxBrush & fillBrush,
+                 const wxColour& testColour, int style,
+                 int WXUNUSED(LogicalFunction))
+{
+    /* A diamond flood-fill using a circular queue system.
+    Each pixel surrounding the current pixel is added to
+    the queue if it meets the criteria, then is retrieved in
+    its turn.  Code originally based on http://www.drawit.co.nz/Developers.htm,
+    with explicit permission to use this for wxWidgets granted by Andrew Empson
+    (no copyright claimed)
+     */
+
+    int width = image->GetWidth();
+    int height = image->GetHeight();
+
+    //Draw using a pen made from the current brush colour
+    //Potentially allows us to use patterned flood fills in future code
+    wxColour fillColour = fillBrush.GetColour();
+    unsigned char r = fillColour.Red();
+    unsigned char g = fillColour.Green();
+    unsigned char b = fillColour.Blue();
+
+    //initial test :
+    if (style == wxFLOOD_SURFACE)
+    {
+       //if wxFLOOD_SURFACE, if fill colour is same as required, we don't do anything
+       if (     image->GetRed(x,y)   != r
+             || image->GetGreen(x,y) != g
+             || image->GetBlue (x,y) != b   )
+        {
+        //prepare memory for queue
+        //queue save, start, read
+        size_t *qs, *qst, *qr;
+
+        //queue size (physical)
+        long qSz= height * width * 2;
+        qst = new size_t [qSz];
+
+        //temporary x and y locations
+        int xt, yt;
+
+        for (int i=0; i < qSz; i++)
+            qst[i] = 0;
+
+        // start queue
+        qs=qr=qst;
+        *qs=xt=x;
+        qs++;
+        *qs=yt=y;
+        qs++;
+
+        image->SetRGB(xt,yt,r,g,b);
+
+        //Main queue loop
+        while(qr!=qs)
+        {
+            //Add new members to queue
+            //Above current pixel
+            if(MatchPixel(image,xt,yt-1,width,height,testColour))
+            {
+                *qs=xt;
+                qs++;
+                *qs=yt-1;
+                qs++;
+                image->SetRGB(xt,yt-1,r,g,b);
+
+                //Loop back to beginning of queue
+                if(qs>=(qst+qSz)) qs=qst;
+            }
+
+            //Below current pixel
+            if(MatchPixel(image,xt,yt+1,width,height,testColour))
+            {
+                *qs=xt;
+                qs++;
+                *qs=yt+1;
+                qs++;
+                image->SetRGB(xt,yt+1,r,g,b);
+                if(qs>=(qst+qSz)) qs=qst;
+            }
+
+            //Left of current pixel
+            if(MatchPixel(image,xt-1,yt,width,height,testColour))
+            {
+                *qs=xt-1;
+                qs++;
+                *qs=yt;
+                qs++;
+                image->SetRGB(xt-1,yt,r,g,b);
+                if(qs>=(qst+qSz)) qs=qst;
+            }
+
+            //Right of current pixel
+            if(MatchPixel(image,xt+1,yt,width,height,testColour))
+            {
+                *qs=xt+1;
+                qs++;
+                *qs=yt;
+                qs++;
+                image->SetRGB(xt+1,yt,r,g,b);
+                if(qs>=(qst+qSz)) qs=qst;
+            }
+
+            //Retrieve current queue member
+            qr+=2;
+
+            //Loop back to the beginning
+            if(qr>=(qst+qSz)) qr=qst;
+            xt=*qr;
+            yt=*(qr+1);
+
+        //Go Back to beginning of loop
+        }
+
+        delete[] qst;
+        }
+    }
+    else
+    {
+    //style is wxFLOOD_BORDER
+    // fill up to testColor border - if already testColour don't do anything
+    if (  image->GetRed(x,y)   != testColour.Red()
+          || image->GetGreen(x,y) != testColour.Green()
+          || image->GetBlue(x,y)  != testColour.Blue() )
+    {
+        //prepare memory for queue
+        //queue save, start, read
+        size_t *qs, *qst, *qr;
+
+        //queue size (physical)
+        long qSz= height * width * 2;
+        qst = new size_t [qSz];
+
+        //temporary x and y locations
+        int xt, yt;
+
+        for (int i=0; i < qSz; i++)
+            qst[i] = 0;
+
+        // start queue
+        qs=qr=qst;
+        *qs=xt=x;
+        qs++;
+        *qs=yt=y;
+        qs++;
+
+        image->SetRGB(xt,yt,r,g,b);
+
+        //Main queue loop
+        while (qr!=qs)
+        {
+            //Add new members to queue
+            //Above current pixel
+            if(!MatchBoundaryPixel(image,xt,yt-1,width,height,fillColour,testColour))
+            {
+                *qs=xt;
+                qs++;
+                *qs=yt-1;
+                qs++;
+                image->SetRGB(xt,yt-1,r,g,b);
+
+                //Loop back to beginning of queue
+                if(qs>=(qst+qSz)) qs=qst;
+            }
+
+            //Below current pixel
+            if(!MatchBoundaryPixel(image,xt,yt+1,width,height,fillColour,testColour))
+            {
+                *qs=xt;
+                qs++;
+                *qs=yt+1;
+                qs++;
+                image->SetRGB(xt,yt+1,r,g,b);
+                if(qs>=(qst+qSz)) qs=qst;
+            }
+
+            //Left of current pixel
+            if(!MatchBoundaryPixel(image,xt-1,yt,width,height,fillColour,testColour))
+            {
+                *qs=xt-1;
+                qs++;
+                *qs=yt;
+                qs++;
+                image->SetRGB(xt-1,yt,r,g,b);
+                if(qs>=(qst+qSz)) qs=qst;
+            }
+
+            //Right of current pixel
+            if(!MatchBoundaryPixel(image,xt+1,yt,width,height,fillColour,testColour))
+            {
+                *qs=xt+1;
+                qs++;
+                *qs=yt;
+                qs++;
+                image->SetRGB(xt+1,yt,r,g,b);
+                if(qs>=(qst+qSz)) qs=qst;
+            }
+
+            //Retrieve current queue member
+            qr+=2;
+
+            //Loop back to the beginning
+            if(qr>=(qst+qSz)) qr=qst;
+            xt=*qr;
+            yt=*(qr+1);
+
+        //Go Back to beginning of loop
+        }
+
+        delete[] qst;
+        }
+    }
+    //all done,
+}
+
+
+bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+                   const wxColour& col, int style)
+{
+    if (dc->GetBrush().GetStyle() == wxTRANSPARENT)
+        return true;
+
+    int height = 0;
+    int width  = 0;
+    dc->GetSize(&width, &height);
+
+    //it would be nice to fail if we don't get a sensible size...
+    wxCHECK_MSG(width >= 1 && height >= 1, false,
+                wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
+
+    const int x_dev = dc->LogicalToDeviceX(x);
+    const int y_dev = dc->LogicalToDeviceY(y);
+
+    // if start point is outside dc, can't do anything
+    if (!wxRect(0, 0, width, height).Contains(x_dev, y_dev))
+        return false;
+
+    wxBitmap bitmap(width, height);
+    wxMemoryDC memdc(bitmap);
+    // match dc scales
+    double sx, sy;
+    dc->GetUserScale(&sx, &sy);
+    memdc.SetUserScale(sx, sy);
+    dc->GetLogicalScale(&sx, &sy);
+    memdc.SetLogicalScale(sx, sy);
+
+    // get logical size and origin
+    const int w_log = dc->DeviceToLogicalXRel(width);
+    const int h_log = dc->DeviceToLogicalYRel(height);
+    const int x0_log = dc->DeviceToLogicalX(0);
+    const int y0_log = dc->DeviceToLogicalY(0);
+
+    memdc.Blit(0, 0, w_log, h_log, dc, x0_log, y0_log);
+    memdc.SelectObject(wxNullBitmap);
+
+    wxImage image = bitmap.ConvertToImage();
+    wxImageFloodFill(&image, x_dev, y_dev, dc->GetBrush(), col, style,
+                     dc->GetLogicalFunction());
+    bitmap = wxBitmap(image);
+    memdc.SelectObject(bitmap);
+    dc->Blit(x0_log, y0_log, w_log, h_log, &memdc, 0, 0);
+
+    return true;
+}
+
+#endif // wxUSE_IMAGE
diff --git a/Source/3rd Party/wx/src/common/imaggif.cpp b/Source/3rd Party/wx/src/common/imaggif.cpp
index d6d08fa9c..bb49847cf 100644
--- a/Source/3rd Party/wx/src/common/imaggif.cpp	
+++ b/Source/3rd Party/wx/src/common/imaggif.cpp	
@@ -1,829 +1,105 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imaggif.cpp
-// Purpose:     wxGIFHandler
-// Author:      Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999-2011 Vaclav Slavik, Guillermo Rodriguez Garcia, Gershon Elber, Troels K
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && wxUSE_GIF
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/palette.h"
-    #include "wx/utils.h"
-#endif
-
-#include "wx/imaggif.h"
-#include "wx/gifdecod.h"
-#include "wx/stream.h"
-#include "wx/anidecod.h" // wxImageArray
-
-#define GIF89_HDR     "GIF89a"
-#define NETSCAPE_LOOP "NETSCAPE2.0"
-
-// see members.aol.com/royalef/gifabout.htm
-//     members.aol.com/royalef/gif89a.txt
-
-enum
-{
-    GIF_MARKER_EXT       = '!', // 0x21
-    GIF_MARKER_SEP       = ',', // 0x2C
-    GIF_MARKER_ENDOFDATA = ';', // 0x3B
-
-    GIF_MARKER_EXT_GRAPHICS_CONTROL = 0xF9,
-    GIF_MARKER_EXT_COMMENT          = 0xFE,
-    GIF_MARKER_EXT_APP              = 0xFF
-};
-
-#define LZ_MAX_CODE         4095    // Biggest code possible in 12 bits.
-#define FLUSH_OUTPUT        4096    // Impossible code, to signal flush.
-#define FIRST_CODE          4097    // Impossible code, to signal first.
-
-#define HT_SIZE         8192        // 12bits = 4096 or twice as big!
-#define HT_KEY_MASK     0x1FFF      // 13bits keys
-
-#define HT_GET_KEY(l)   (l >> 12)
-#define HT_GET_CODE(l)  (l & 0x0FFF)
-#define HT_PUT_KEY(l)   (l << 12)
-#define HT_PUT_CODE(l)  (l & 0x0FFF)
-
-struct wxRGB
-{
-    wxUint8 red;
-    wxUint8 green;
-    wxUint8 blue;
-};
-
-struct GifHashTableType
-{
-    wxUint32 HTable[HT_SIZE];
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
-
-//----------------------------------------------------------------------------
-// Forward declarations
-//----------------------------------------------------------------------------
-
-static int wxGIFHandler_KeyItem(unsigned long item);
-
-#if wxUSE_STREAMS
-
-static int wxGIFHandler_BitSize(int n);
-
-#if wxUSE_PALETTE
-static bool wxGIFHandler_GetPalette(const wxImage& image,
-    wxRGB *pal, int *palCount, int *mask_index);
-#endif
-static
-int wxGIFHandler_PaletteFind(const wxRGB& clr, const wxRGB *array, int count);
-
-static bool wxGIFHandler_Write(wxOutputStream *, const void *buf, size_t len);
-static bool wxGIFHandler_WriteByte(wxOutputStream *, wxUint8);
-static bool wxGIFHandler_WriteWord(wxOutputStream *, wxUint16);
-static bool wxGIFHandler_WriteHeader(wxOutputStream *, int width, int height,
-    bool loop, const wxRGB *pal, int palCount);
-static bool wxGIFHandler_WriteRect(wxOutputStream *, int width, int height);
-#if wxUSE_PALETTE
-static bool wxGIFHandler_WriteTerm(wxOutputStream *);
-#endif
-static bool wxGIFHandler_WriteZero(wxOutputStream *);
-static bool wxGIFHandler_WritePalette(wxOutputStream *,
-    const wxRGB *pal, size_t palCount, int bpp);
-static bool wxGIFHandler_WriteControl(wxOutputStream *,
-    int maskIndex, int delayMilliSecs);
-static bool wxGIFHandler_WriteComment(wxOutputStream *, const wxString&);
-static bool wxGIFHandler_WriteLoop(wxOutputStream *);
-
-static bool wxGIFHandler_BufferedOutput(wxOutputStream *, wxUint8 *buf, int c);
-#endif // wxUSE_STREAMS
-
-//-----------------------------------------------------------------------------
-// wxGIFHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_STREAMS
-
-bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
-    bool verbose, int index)
-{
-    wxGIFDecoder *decod;
-    wxGIFErrorCode error;
-    bool ok = true;
-
-//    image->Destroy();
-    decod = new wxGIFDecoder();
-    error = decod->LoadGIF(stream);
-
-    if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))
-    {
-        if (verbose)
-        {
-            switch (error)
-            {
-                case wxGIF_INVFORMAT:
-                    wxLogError(_("GIF: error in GIF image format."));
-                    break;
-                case wxGIF_MEMERR:
-                    wxLogError(_("GIF: not enough memory."));
-                    break;
-                default:
-                    wxLogError(_("GIF: unknown error!!!"));
-                    break;
-            }
-        }
-        delete decod;
-        return false;
-    }
-
-    if ((error == wxGIF_TRUNCATED) && verbose)
-    {
-        wxLogError(_("GIF: data stream seems to be truncated."));
-        // go on; image data is OK
-    }
-
-    if (ok)
-    {
-        ok = decod->ConvertToImage(index != -1 ? (size_t)index : 0, image);
-    }
-    else
-    {
-        wxLogError(_("GIF: Invalid gif index."));
-    }
-
-    delete decod;
-
-    return ok;
-}
-
-bool wxGIFHandler::SaveFile(wxImage *image,
-    wxOutputStream& stream, bool verbose)
-{
-#if wxUSE_PALETTE
-    wxRGB pal[256];
-    int palCount;
-    int maskIndex;
-
-    return wxGIFHandler_GetPalette(*image, pal, &palCount, &maskIndex)
-        && DoSaveFile(*image, &stream, verbose, true /*first?*/, 0,
-            false /*loop?*/, pal, palCount, maskIndex)
-        && wxGIFHandler_WriteTerm(&stream);
-#else
-    wxUnusedVar(image);
-    wxUnusedVar(stream);
-    wxUnusedVar(verbose);
-    return false;
-#endif
-}
-
-bool wxGIFHandler::DoCanRead( wxInputStream& stream )
-{
-    wxGIFDecoder decod;
-    return decod.CanRead(stream);
-         // it's ok to modify the stream position here
-}
-
-int wxGIFHandler::DoGetImageCount( wxInputStream& stream )
-{
-    wxGIFDecoder decod;
-    wxGIFErrorCode error = decod.LoadGIF(stream);
-    if ( (error != wxGIF_OK) && (error != wxGIF_TRUNCATED) )
-        return -1;
-
-    // NOTE: this function modifies the current stream position but it's ok
-    //       (see wxImageHandler::GetImageCount)
-
-    return decod.GetFrameCount();
-}
-
-bool wxGIFHandler::DoSaveFile(const wxImage& image, wxOutputStream *stream,
-    bool WXUNUSED(verbose), bool first, int delayMilliSecs, bool loop,
-    const wxRGB *pal, int palCount, int maskIndex)
-{
-    const unsigned long colorcount = image.CountColours(256+1);
-    bool ok = colorcount && (colorcount <= 256);
-    if (!ok)
-    {
-        return false;
-    }
-
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-    int width_even = width + ((width % 2) ? 1 : 0);
-
-    if (first)
-    {
-        ok = wxGIFHandler_WriteHeader(stream, width, height, loop,
-            pal, palCount);
-    }
-
-    ok = ok
-        && wxGIFHandler_WriteComment(stream,
-            image.GetOption(wxIMAGE_OPTION_GIF_COMMENT))
-        && wxGIFHandler_WriteControl(stream, maskIndex, delayMilliSecs)
-        && wxGIFHandler_WriteByte(stream, GIF_MARKER_SEP)
-        && wxGIFHandler_WriteRect(stream, width, height);
-
-    // local palette
-    if (first)
-    {
-        // we already saved the (global) palette
-        ok = ok && wxGIFHandler_WriteZero(stream);
-    }
-    else
-    {
-        const int bpp = wxGIFHandler_BitSize(palCount);
-        wxUint8 b;
-
-        b = 0x80;
-        b |=(bpp - 1) << 5;
-        b |=(bpp - 1);
-        b &=~0x40; // clear interlaced
-
-        ok = ok && wxGIFHandler_WriteByte(stream, b)
-            && wxGIFHandler_WritePalette(stream, pal, palCount, bpp);
-    }
-
-    if (!ok)
-    {
-        return false;
-    }
-
-    if (!InitHashTable())
-    {
-        wxLogError(_("Couldn't initialize GIF hash table."));
-        return false;
-    }
-
-    const wxUint8 *src = image.GetData();
-    wxUint8 *eightBitData = new wxUint8[width];
-
-    SetupCompress(stream, 8);
-
-    m_pixelCount = height * width_even;
-    for (int y = 0; y < height; y++)
-    {
-        m_pixelCount -= width_even;
-        for (int x = 0; x < width; x++)
-        {
-            wxRGB rgb;
-            rgb.red   = src[0];
-            rgb.green = src[1];
-            rgb.blue  = src[2];
-            int index = wxGIFHandler_PaletteFind(rgb, pal, palCount);
-            wxASSERT(index != wxNOT_FOUND);
-            eightBitData[x] = (wxUint8)index;
-            src+=3;
-        }
-
-        ok = CompressLine(stream, eightBitData, width);
-        if (!ok)
-        {
-            break;
-        }
-    }
-
-    delete [] eightBitData;
-
-    wxDELETE(m_hashTable);
-
-    return ok;
-}
-
-bool wxGIFHandler::SaveAnimation(const wxImageArray& images,
-    wxOutputStream *stream, bool verbose, int delayMilliSecs)
-{
-#if wxUSE_PALETTE
-    bool ok = true;
-    size_t i;
-
-    wxSize size(0,0);
-    for (i = 0; (i < images.GetCount()) && ok; i++)
-    {
-        const wxImage& image = images.Item(i);
-        wxSize temp(image.GetWidth(), image.GetHeight());
-        ok = ok && image.HasPalette();
-        if (i)
-        {
-           ok = ok && (size == temp);
-        }
-        else
-        {
-           size = temp;
-        }
-    }
-
-    for (i = 0; (i < images.GetCount()) && ok; i++)
-    {
-        const wxImage& image = images.Item(i);
-
-        wxRGB pal[256];
-        int palCount;
-        int maskIndex;
-
-        ok = wxGIFHandler_GetPalette(image, pal, &palCount, &maskIndex)
-          && DoSaveFile(image, stream, verbose, i == 0 /*first?*/, delayMilliSecs,
-            true /*loop?*/, pal, palCount, maskIndex);
-    }
-
-    return ok && wxGIFHandler_WriteTerm(stream);
-#else
-    wxUnusedVar(images);
-    wxUnusedVar(stream);
-    wxUnusedVar(verbose);
-    wxUnusedVar(delayMilliSecs);
-
-    return false;
-#endif
-}
-
-bool wxGIFHandler::CompressOutput(wxOutputStream *stream, int code)
-{
-    if (code == FLUSH_OUTPUT)
-    {
-        while (m_crntShiftState > 0)
-        {
-            // Get rid of what is left in DWord, and flush it.
-            if (!wxGIFHandler_BufferedOutput(stream, m_LZBuf,
-                m_crntShiftDWord & 0xff))
-            {
-                return false;
-            }
-            m_crntShiftDWord >>= 8;
-            m_crntShiftState -= 8;
-        }
-        m_crntShiftState = 0;                       // For next time.
-        if (!wxGIFHandler_BufferedOutput(stream, m_LZBuf, FLUSH_OUTPUT))
-        {
-            return false;
-        }
-    }
-    else
-    {
-        m_crntShiftDWord |= ((long) code) << m_crntShiftState;
-        m_crntShiftState += m_runningBits;
-        while (m_crntShiftState >= 8)
-        {
-            // Dump out full bytes:
-            if (!wxGIFHandler_BufferedOutput(stream, m_LZBuf,
-                m_crntShiftDWord & 0xff))
-            {
-                return false;
-            }
-            m_crntShiftDWord >>= 8;
-            m_crntShiftState -= 8;
-        }
-    }
-
-    // If code can't fit into RunningBits bits, must raise its size. Note
-    // however that codes above LZ_MAX_CODE are used for special signaling.
-    if ( (m_runningCode >= m_maxCode1) && (code <= LZ_MAX_CODE))
-    {
-        m_maxCode1 = 1 << ++m_runningBits;
-    }
-    return true;
-}
-
-bool wxGIFHandler::SetupCompress(wxOutputStream *stream, int bpp)
-{
-    m_LZBuf[0] = 0;           // Nothing was output yet.
-    m_clearCode = (1 << bpp);
-    m_EOFCode = m_clearCode + 1;
-    m_runningCode = m_EOFCode + 1;
-    m_runningBits = bpp + 1;     // Number of bits per code.
-    m_maxCode1 = 1 << m_runningBits;       // Max. code + 1.
-    m_crntCode = FIRST_CODE;       // Signal that this is first one!
-    m_crntShiftState = 0;      // No information in CrntShiftDWord.
-    m_crntShiftDWord = 0;
-
-    // Clear hash table and send Clear to make sure the decoder does the same.
-    ClearHashTable();
-
-    return wxGIFHandler_WriteByte(stream, (wxUint8)bpp)
-        && CompressOutput(stream, m_clearCode);
-}
-
-bool wxGIFHandler::CompressLine(wxOutputStream *stream,
-    const wxUint8 *line, int lineLen)
-{
-    int i = 0, crntCode, newCode;
-    unsigned long newKey;
-    wxUint8 pixel;
-    if (m_crntCode == FIRST_CODE)                  // It's first time!
-        crntCode = line[i++];
-    else
-        crntCode = m_crntCode;     // Get last code in compression.
-
-    while (i < lineLen)
-    {
-        // Decode lineLen items.
-        pixel = line[i++];                    // Get next pixel from stream.
-        // Form a new unique key to search hash table for the code combines
-        // crntCode as Prefix string with Pixel as postfix char.
-        newKey = (((unsigned long) crntCode) << 8) + pixel;
-        if ((newCode = ExistsHashTable(newKey)) >= 0)
-        {
-            // This Key is already there, or the string is old one, so
-            // simply take new code as our crntCode:
-            crntCode = newCode;
-        }
-        else
-        {
-            // Put it in hash table, output the prefix code, and make our
-            // crntCode equal to Pixel.
-            if (!CompressOutput(stream, crntCode))
-            {
-                return false;
-            }
-
-            crntCode = pixel;
-
-            // If however the HashTable is full, we send a clear first and
-            // Clear the hash table.
-            if (m_runningCode >= LZ_MAX_CODE)
-            {
-                // Time to do some clearance:
-                if (!CompressOutput(stream, m_clearCode))
-                {
-                    return false;
-                }
-
-                m_runningCode = m_EOFCode + 1;
-                m_runningBits = 8 + 1;
-                m_maxCode1 = 1 << m_runningBits;
-                ClearHashTable();
-            }
-            else
-            {
-                // Put this unique key with its relative Code in hash table:
-                InsertHashTable(newKey, m_runningCode++);
-            }
-        }
-    }
-    // Preserve the current state of the compression algorithm:
-    m_crntCode = crntCode;
-    if (m_pixelCount == 0)
-    {
-        // We are done - output last Code and flush output buffers:
-        if (!CompressOutput(stream, crntCode)
-            || !CompressOutput(stream, m_EOFCode)
-            || !CompressOutput(stream, FLUSH_OUTPUT))
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-#endif  // wxUSE_STREAMS
-
-bool wxGIFHandler::InitHashTable()
-{
-    if (!m_hashTable)
-    {
-        m_hashTable = new GifHashTableType();
-    }
-
-    if (!m_hashTable)
-    {
-        return false;
-    }
-
-    ClearHashTable();
-
-    return true;
-}
-
-void wxGIFHandler::ClearHashTable()
-{
-    int index = HT_SIZE;
-    wxUint32 *HTable = m_hashTable->HTable;
-
-    while (--index>=0)
-    {
-        HTable[index] = 0xfffffffful;
-    }
-}
-
-void wxGIFHandler::InsertHashTable(unsigned long key, int code)
-{
-    int hKey = wxGIFHandler_KeyItem(key);
-    wxUint32 *HTable = m_hashTable->HTable;
-
-    while (HT_GET_KEY(HTable[hKey]) != 0xFFFFFL)
-    {
-        hKey = (hKey + 1) & HT_KEY_MASK;
-    }
-    HTable[hKey] = HT_PUT_KEY(key) | HT_PUT_CODE(code);
-}
-
-
-int wxGIFHandler::ExistsHashTable(unsigned long key)
-{
-    int hKey = wxGIFHandler_KeyItem(key);
-    wxUint32 *HTable = m_hashTable->HTable, HTKey;
-
-    while ((HTKey = HT_GET_KEY(HTable[hKey])) != 0xFFFFFL)
-    {
-        if (key == HTKey)
-        {
-            return HT_GET_CODE(HTable[hKey]);
-        }
-        hKey = (hKey + 1) & HT_KEY_MASK;
-    }
-    return -1;
-}
-
-// ---------------------------------------------------------------------------
-// implementation of global private functions
-// ---------------------------------------------------------------------------
-
-int wxGIFHandler_KeyItem(unsigned long item)
-{
-    return ((item >> 12) ^ item) & HT_KEY_MASK;
-}
-
-#if wxUSE_STREAMS
-
-int wxGIFHandler_BitSize(int n)
-{
-    int i;
-    for (i = 1; i <= 8; i++)
-    {
-        if ((1 << i) >= n)
-        {
-            break;
-        }
-    }
-    return i;
-}
-
-#if wxUSE_PALETTE
-bool wxGIFHandler_GetPalette(const wxImage& image,
-    wxRGB *pal, int *pPalCount, int *pMaskIndex)
-{
-    if (!image.HasPalette())
-    {
-        return false;
-    }
-
-    const wxPalette& palette = image.GetPalette();
-    int palCount = palette.GetColoursCount();
-
-    for (int i = 0; i < palCount; ++i)
-    {
-        if (!palette.GetRGB(i, &pal[i].red, &pal[i].green, &pal[i].blue))
-        {
-            break;
-        }
-    }
-    if (image.HasMask())
-    {
-        wxRGB mask;
-
-        mask.red   = image.GetMaskRed();
-        mask.green = image.GetMaskGreen();
-        mask.blue  = image.GetMaskBlue();
-        *pMaskIndex = wxGIFHandler_PaletteFind(mask, pal, palCount);
-        if ( (*pMaskIndex == wxNOT_FOUND) && (palCount < 256))
-        {
-            *pMaskIndex = palCount;
-            pal[palCount++] = mask;
-        }
-    }
-    else
-    {
-        *pMaskIndex = wxNOT_FOUND;
-    }
-    *pPalCount = palCount;
-
-    return true;
-}
-#endif // wxUSE_PALETTE
-
-int wxGIFHandler_PaletteFind(const wxRGB& clr, const wxRGB *array, int count)
-{
-    for (int i = 0; i < count; i++)
-    {
-        if (   (clr.red   == array[i].red)
-            && (clr.green == array[i].green)
-            && (clr.blue  == array[i].blue))
-        {
-            return i;
-        }
-    }
-
-    return wxNOT_FOUND;
-}
-
-bool wxGIFHandler_Write(wxOutputStream *stream, const void *buf, size_t len)
-{
-    return (len == stream->Write(buf, len).LastWrite());
-}
-
-bool wxGIFHandler_WriteByte(wxOutputStream *stream, wxUint8 byte)
-{
-    return wxGIFHandler_Write(stream, &byte, sizeof(byte));
-}
-
-bool wxGIFHandler_WriteWord(wxOutputStream *stream, wxUint16 word)
-{
-    wxUint8 buf[2];
-
-    buf[0] = word & 0xff;
-    buf[1] = (word >> 8) & 0xff;
-    return wxGIFHandler_Write(stream, &buf, sizeof(buf));
-}
-
-bool wxGIFHandler_WriteHeader(wxOutputStream *stream, int width, int height,
-    bool loop, const wxRGB *pal, int palCount)
-{
-    const int bpp = wxGIFHandler_BitSize(palCount);
-    wxUint8 buf[3];
-
-    bool ok = wxGIFHandler_Write(stream, GIF89_HDR, sizeof(GIF89_HDR)-1)
-        && wxGIFHandler_WriteWord(stream, (wxUint16) width)
-        && wxGIFHandler_WriteWord(stream, (wxUint16) height);
-
-    buf[0] = 0x80;
-    buf[0] |=(bpp - 1) << 5;
-    buf[0] |=(bpp - 1);
-    buf[1] = 0; // background color == entry 0
-    buf[2] = 0; // aspect ratio 1:1
-    ok = ok && wxGIFHandler_Write(stream, buf, sizeof(buf))
-        && wxGIFHandler_WritePalette(stream, pal, palCount, bpp);
-
-    if (loop)
-    {
-       ok = ok && wxGIFHandler_WriteLoop(stream);
-    }
-
-    return ok;
-}
-
-bool wxGIFHandler_WriteRect(wxOutputStream *stream, int width, int height)
-{
-    return wxGIFHandler_WriteWord(stream, 0) // left
-        && wxGIFHandler_WriteWord(stream, 0) // top
-        && wxGIFHandler_WriteWord(stream, (wxUint16) width)
-        && wxGIFHandler_WriteWord(stream, (wxUint16) height);
-}
-
-#if wxUSE_PALETTE
-bool wxGIFHandler_WriteTerm(wxOutputStream *stream)
-{
-    return wxGIFHandler_WriteByte(stream, GIF_MARKER_ENDOFDATA);
-}
-#endif
-
-bool wxGIFHandler_WriteZero(wxOutputStream *stream)
-{
-    return wxGIFHandler_WriteByte(stream, 0);
-}
-
-bool wxGIFHandler_WritePalette(wxOutputStream *stream,
-    const wxRGB *array, size_t count, int bpp)
-{
-    wxUint8 buf[3];
-    for (int i = 0; (i < (1 << bpp)); i++)
-    {
-        if (i < (int)count)
-        {
-            buf[0] = array[i].red;
-            buf[1] = array[i].green;
-            buf[2] = array[i].blue;
-        }
-        else
-        {
-            buf[0] = buf[1] = buf[2] = 0;
-        }
-
-        if ( !wxGIFHandler_Write(stream, buf, sizeof(buf)) )
-        {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-bool wxGIFHandler_WriteControl(wxOutputStream *stream,
-    int maskIndex, int delayMilliSecs)
-{
-    wxUint8 buf[8];
-
-    buf[0] = GIF_MARKER_EXT;    // extension marker
-    buf[1] = GIF_MARKER_EXT_GRAPHICS_CONTROL;
-    buf[2] = 4;     // length of block
-    buf[3] = (maskIndex != wxNOT_FOUND) ? 1 : 0;   // has transparency
-    buf[4] = delayMilliSecs / 10; // delay time
-    buf[5] = 0;
-    buf[6] = (maskIndex != wxNOT_FOUND) ? (wxUint8) maskIndex : 0;
-    buf[7] = 0;
-    return wxGIFHandler_Write(stream, buf, sizeof(buf));
-}
-
-bool wxGIFHandler_WriteComment(wxOutputStream *stream, const wxString& comment)
-{
-    if ( comment.empty() )
-    {
-        return true;
-    }
-
-    // Write comment header.
-    wxUint8 buf[2];
-    buf[0] = GIF_MARKER_EXT;
-    buf[1] = GIF_MARKER_EXT_COMMENT;
-    if ( !wxGIFHandler_Write(stream, buf, sizeof(buf)) )
-    {
-        return false;
-    }
-
-    /*
-    If comment is longer than 255 bytes write it in blocks of maximum 255
-    bytes each.
-    */
-    wxCharBuffer text( comment.mb_str() );
-
-    size_t pos = 0, fullLength = text.length();
-
-    do
-    {
-        size_t blockLength = wxMin(fullLength - pos, 255);
-
-        if ( !wxGIFHandler_WriteByte(stream, (wxUint8) blockLength)
-            || !wxGIFHandler_Write(stream, &text.data()[pos], blockLength) )
-        {
-            return false;
-        }
-
-        pos += blockLength;
-    }while (pos < fullLength);
-
-
-    // Write comment footer.
-    return wxGIFHandler_WriteZero(stream);
-}
-
-bool wxGIFHandler_WriteLoop(wxOutputStream *stream)
-{
-    wxUint8 buf[4];
-    const int loopcount = 0; // infinite
-
-    buf[0] = GIF_MARKER_EXT;
-    buf[1] = GIF_MARKER_EXT_APP;
-    buf[2] = 0x0B;
-    bool ok = wxGIFHandler_Write(stream, buf, 3)
-        && wxGIFHandler_Write(stream, NETSCAPE_LOOP, sizeof(NETSCAPE_LOOP)-1);
-
-    buf[0] = 3;
-    buf[1] = 1;
-    buf[2] = loopcount & 0xFF;
-    buf[3] = loopcount >> 8;
-
-    return ok && wxGIFHandler_Write(stream, buf, 4)
-        && wxGIFHandler_WriteZero(stream);
-}
-
-bool wxGIFHandler_BufferedOutput(wxOutputStream *stream, wxUint8 *buf, int c)
-{
-    bool ok = true;
-
-    if (c == FLUSH_OUTPUT)
-    {
-        // Flush everything out.
-        if (buf[0])
-        {
-            ok = wxGIFHandler_Write(stream, buf, buf[0]+1);
-        }
-        // Mark end of compressed data, by an empty block (see GIF doc):
-        wxGIFHandler_WriteZero(stream);
-    }
-    else
-    {
-        if (buf[0] == 255)
-        {
-            // Dump out this buffer - it is full:
-            ok = wxGIFHandler_Write(stream, buf, buf[0] + 1);
-            buf[0] = 0;
-        }
-        buf[++buf[0]] = c;
-    }
-
-    return ok;
-}
-
-#endif // wxUSE_STREAMS
-
-#endif  // wxUSE_IMAGE && wxUSE_GIF
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imaggif.cpp
+// Purpose:     wxGIFHandler
+// Author:      Vaclav Slavik & Guillermo Rodriguez Garcia
+// RCS-ID:      $Id: imaggif.cpp 41819 2006-10-09 17:51:07Z VZ $
+// Copyright:   (c) 1999 Vaclav Slavik & Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_GIF
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/imaggif.h"
+#include "wx/gifdecod.h"
+#include "wx/wfstream.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
+
+//-----------------------------------------------------------------------------
+// wxGIFHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_STREAMS
+
+bool wxGIFHandler::LoadFile(wxImage *image, wxInputStream& stream,
+                            bool verbose, int index)
+{
+    wxGIFDecoder *decod;
+    wxGIFErrorCode error;
+    bool ok = true;
+
+//    image->Destroy();
+    decod = new wxGIFDecoder();
+    error = decod->LoadGIF(stream);
+
+    if ((error != wxGIF_OK) && (error != wxGIF_TRUNCATED))
+    {
+        if (verbose)
+        {
+            switch (error)
+            {
+                case wxGIF_INVFORMAT:
+                    wxLogError(_("GIF: error in GIF image format."));
+                    break;
+                case wxGIF_MEMERR:
+                    wxLogError(_("GIF: not enough memory."));
+                    break;
+                default:
+                    wxLogError(_("GIF: unknown error!!!"));
+                    break;
+            }
+        }
+        delete decod;
+        return false;
+    }
+
+    if ((error == wxGIF_TRUNCATED) && verbose)
+    {
+        wxLogError(_("GIF: data stream seems to be truncated."));
+        /* go on; image data is OK */
+    }
+
+    if (ok)
+    {
+        ok = decod->ConvertToImage(index != -1 ? (size_t)index : 0, image);
+    }
+    else
+    {
+        wxLogError(_("GIF: Invalid gif index."));
+    }
+
+    delete decod;
+
+    return ok;
+}
+
+bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
+                             wxOutputStream& WXUNUSED(stream), bool verbose )
+{
+    if (verbose)
+        wxLogDebug(wxT("GIF: the handler is read-only!!"));
+
+    return false;
+}
+
+bool wxGIFHandler::DoCanRead( wxInputStream& stream )
+{
+    wxGIFDecoder decod;
+    return decod.CanRead(stream);
+}
+
+#endif  // wxUSE_STREAMS
+
+#endif  // wxUSE_GIF
diff --git a/Source/3rd Party/wx/src/common/imagiff.cpp b/Source/3rd Party/wx/src/common/imagiff.cpp
index bebe4d793..87ef21445 100644
--- a/Source/3rd Party/wx/src/common/imagiff.cpp	
+++ b/Source/3rd Party/wx/src/common/imagiff.cpp	
@@ -1,791 +1,794 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagiff.cpp
-// Purpose:     wxImage handler for Amiga IFF images
-// Author:      Steffen Gutmann, Thomas Meyer
-// RCS-ID:      $Id$
-// Copyright:   (c) Steffen Gutmann, 2002
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// Parts of this source are based on the iff loading algorithm found
-// in xviff.c.  Permission by the original author, Thomas Meyer, and
-// by the author of xv, John Bradley for using the iff loading part
-// in wxWidgets has been gratefully given.
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && wxUSE_IFF
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/intl.h"
-#endif
-
-#include "wx/imagiff.h"
-#include "wx/wfstream.h"
-
-#if wxUSE_PALETTE
-    #include "wx/palette.h"
-#endif // wxUSE_PALETTE
-
-#include <stdlib.h>
-#include <string.h>
-
-
-// --------------------------------------------------------------------------
-// Constants
-// --------------------------------------------------------------------------
-
-// Error codes:
-//  Note that the error code wxIFF_TRUNCATED means that the image itself
-//  is most probably OK, but the decoder didn't reach the end of the data
-//  stream; this means that if it was not reading directly from file,
-//  the stream will not be correctly positioned.
-//
-
-enum
-{
-    wxIFF_OK = 0,                   /* everything was OK */
-    wxIFF_INVFORMAT,                /* error in iff header */
-    wxIFF_MEMERR,                   /* error allocating memory */
-    wxIFF_TRUNCATED                 /* file appears to be truncated */
-};
-
-// --------------------------------------------------------------------------
-// wxIFFDecoder class
-// --------------------------------------------------------------------------
-
-// internal class for storing IFF image data
-class IFFImage
-{
-public:
-    unsigned int w;                 /* width */
-    unsigned int h;                 /* height */
-    int transparent;                /* transparent color (-1 = none) */
-    int colors;                     /* number of colors */
-    unsigned char *p;               /* bitmap */
-    unsigned char *pal;             /* palette */
-
-    IFFImage() : w(0), h(0), colors(0), p(0), pal(0) {}
-    ~IFFImage() { delete [] p; delete [] pal; }
-};
-
-class WXDLLEXPORT wxIFFDecoder
-{
-private:
-    IFFImage *m_image;        // image data
-    wxInputStream *m_f;       // input stream
-    unsigned char *databuf;
-    unsigned char *decomp_mem;
-
-    void Destroy();
-
-public:
-    // get data of current frame
-    unsigned char* GetData() const;
-    unsigned char* GetPalette() const;
-    int GetNumColors() const;
-    unsigned int GetWidth() const;
-    unsigned int GetHeight() const;
-    int GetTransparentColour() const;
-
-    // constructor, destructor, etc.
-    wxIFFDecoder(wxInputStream *s);
-    ~wxIFFDecoder() { Destroy(); }
-
-    // NOTE: this function modifies the current stream position
-    bool CanRead();
-
-    int ReadIFF();
-    bool ConvertToImage(wxImage *image) const;
-};
-
-
-//---------------------------------------------------------------------------
-// wxIFFDecoder constructor and destructor
-//---------------------------------------------------------------------------
-
-wxIFFDecoder::wxIFFDecoder(wxInputStream *s)
-{
-    m_f = s;
-    m_image = 0;
-    databuf = 0;
-    decomp_mem = 0;
-}
-
-void wxIFFDecoder::Destroy()
-{
-    wxDELETE(m_image);
-    wxDELETEA(databuf);
-    wxDELETEA(decomp_mem);
-}
-
-//---------------------------------------------------------------------------
-// Convert this image to a wxImage object
-//---------------------------------------------------------------------------
-
-// This function was designed by Vaclav Slavik
-
-bool wxIFFDecoder::ConvertToImage(wxImage *image) const
-{
-    // just in case...
-    image->Destroy();
-
-    // create the image
-    image->Create(GetWidth(), GetHeight());
-
-    if (!image->IsOk())
-        return false;
-
-    unsigned char *pal = GetPalette();
-    unsigned char *src = GetData();
-    unsigned char *dst = image->GetData();
-    int colors = GetNumColors();
-    int transparent = GetTransparentColour();
-    long i;
-
-    // set transparent colour mask
-    if (transparent != -1)
-    {
-        for (i = 0; i < colors; i++)
-        {
-            if ((pal[3 * i + 0] == 255) &&
-                (pal[3 * i + 1] == 0) &&
-                (pal[3 * i + 2] == 255))
-            {
-                pal[3 * i + 2] = 254;
-            }
-        }
-
-        pal[3 * transparent + 0] = 255,
-        pal[3 * transparent + 1] = 0,
-        pal[3 * transparent + 2] = 255;
-
-        image->SetMaskColour(255, 0, 255);
-    }
-    else
-        image->SetMask(false);
-
-#if wxUSE_PALETTE
-    if (pal && colors > 0)
-    {
-        unsigned char* r = new unsigned char[colors];
-        unsigned char* g = new unsigned char[colors];
-        unsigned char* b = new unsigned char[colors];
-
-        for (i = 0; i < colors; i++)
-        {
-            r[i] = pal[3*i + 0];
-            g[i] = pal[3*i + 1];
-            b[i] = pal[3*i + 2];
-        }
-
-        image->SetPalette(wxPalette(colors, r, g, b));
-
-        delete [] r;
-        delete [] g;
-        delete [] b;
-    }
-#endif // wxUSE_PALETTE
-
-    // copy image data
-    for (i = 0; i < (long)(GetWidth() * GetHeight()); i++, src += 3, dst += 3)
-    {
-    dst[0] = src[0];
-    dst[1] = src[1];
-    dst[2] = src[2];
-    }
-
-    return true;
-}
-
-
-//---------------------------------------------------------------------------
-// Data accessors
-//---------------------------------------------------------------------------
-
-// Get data for current frame
-
-unsigned char* wxIFFDecoder::GetData() const    { return (m_image->p); }
-unsigned char* wxIFFDecoder::GetPalette() const { return (m_image->pal); }
-int wxIFFDecoder::GetNumColors() const          { return m_image->colors; }
-unsigned int wxIFFDecoder::GetWidth() const     { return (m_image->w); }
-unsigned int wxIFFDecoder::GetHeight() const    { return (m_image->h); }
-int wxIFFDecoder::GetTransparentColour() const { return m_image->transparent; }
-
-//---------------------------------------------------------------------------
-// IFF reading and decoding
-//---------------------------------------------------------------------------
-
-//
-// CanRead:
-//  Returns true if the file looks like a valid IFF, false otherwise.
-//
-bool wxIFFDecoder::CanRead()
-{
-    unsigned char buf[12];
-
-    if ( !m_f->Read(buf, WXSIZEOF(buf)) )
-        return false;
-
-    return (memcmp(buf, "FORM", 4) == 0) && (memcmp(buf+8, "ILBM", 4) == 0);
-}
-
-
-// ReadIFF:
-// Based on xv source code by Thomas Meyer
-// Permission for use in wxWidgets has been gratefully given.
-
-typedef unsigned char byte;
-#define IFFDEBUG 0
-
-/*************************************************************************
-void decomprle(source, destination, source length, buffer size)
-
-Decompress run-length encoded data from source to destination. Terminates
-when source is decoded completely or destination buffer is full.
-
-The decruncher is as optimized as I could make it, without risking
-safety in case of corrupt BODY chunks.
-**************************************************************************/
-
-static void decomprle(const byte *sptr, byte *dptr, long slen, long dlen)
-{
-    byte codeByte, dataByte;
-
-    while ((slen > 0) && (dlen > 0)) {
-    // read control byte
-    codeByte = *sptr++;
-
-    if (codeByte < 0x80) {
-        codeByte++;
-        if ((slen > (long) codeByte) && (dlen >= (long) codeByte)) {
-        slen -= codeByte + 1;
-        dlen -= codeByte;
-        while (codeByte > 0) {
-            *dptr++ = *sptr++;
-            codeByte--;
-        }
-        }
-        else slen = 0;
-    }
-
-    else if (codeByte > 0x80) {
-        codeByte = 0x81 - (codeByte & 0x7f);
-        if ((slen > (long) 0) && (dlen >= (long) codeByte)) {
-        dataByte = *sptr++;
-        slen -= 2;
-        dlen -= codeByte;
-        while (codeByte > 0) {
-            *dptr++ = dataByte;
-            codeByte--;
-        }
-        }
-        else slen = 0;
-    }
-    }
-}
-
-/******************************************/
-static unsigned int iff_getword(const byte *ptr)
-{
-    unsigned int v;
-
-    v = *ptr++;
-    v = (v << 8) + *ptr;
-    return v;
-}
-
-/******************************************/
-static unsigned long iff_getlong(const byte *ptr)
-{
-    unsigned long l;
-
-    l = *ptr++;
-    l = (l << 8) + *ptr++;
-    l = (l << 8) + *ptr++;
-    l = (l << 8) + *ptr;
-    return l;
-}
-
-// Define internal ILBM types
-#define ILBM_NORMAL     0
-#define ILBM_EHB        1
-#define ILBM_HAM        2
-#define ILBM_HAM8       3
-#define ILBM_24BIT      4
-
-int wxIFFDecoder::ReadIFF()
-{
-    Destroy();
-
-    m_image = new IFFImage();
-    if (m_image == 0) {
-        Destroy();
-        return wxIFF_MEMERR;
-    }
-
-    // compute file length
-    wxFileOffset currentPos = m_f->TellI();
-    if (m_f->SeekI(0, wxFromEnd) == wxInvalidOffset) {
-        Destroy();
-        return wxIFF_MEMERR;
-    }
-
-    long filesize = m_f->TellI();
-    if (m_f->SeekI(currentPos, wxFromStart) == wxInvalidOffset) {
-        Destroy();
-        return wxIFF_MEMERR;
-    }
-
-    // allocate memory for complete file
-    if ((databuf = new byte[filesize]) == 0) {
-        Destroy();
-        return wxIFF_MEMERR;
-    }
-
-    m_f->Read(databuf, filesize);
-    const byte *dataend = databuf + filesize;
-
-    // initialize work pointer. used to trace the buffer for IFF chunks
-    const byte *dataptr = databuf;
-
-    // check for minmal size
-    if (dataptr + 12 > dataend) {
-        Destroy();
-        return wxIFF_INVFORMAT;
-    }
-
-    // check if we really got an IFF file
-    if (strncmp((char *)dataptr, "FORM", 4) != 0) {
-        Destroy();
-        return wxIFF_INVFORMAT;
-    }
-
-    dataptr = dataptr + 8;                  // skip ID and length of FORM
-
-    // check if the IFF file is an ILBM (picture) file
-    if (strncmp((char *) dataptr, "ILBM", 4) != 0) {
-        Destroy();
-        return wxIFF_INVFORMAT;
-    }
-
-    wxLogTrace(wxT("iff"), wxT("IFF ILBM file recognized"));
-
-    dataptr = dataptr + 4;                                // skip ID
-
-    //
-    // main decoding loop. searches IFF chunks and handles them.
-    // terminates when BODY chunk was found or dataptr ran over end of file
-    //
-    bool BMHDok = false, CAMGok = false;
-    int bmhd_width = 0, bmhd_height = 0, bmhd_bitplanes = 0, bmhd_transcol = -1;
-    byte bmhd_compression = 0;
-    long camg_viewmode = 0;
-    int colors = 0;
-    while (dataptr + 8 <= dataend) {
-    // get chunk length and make even
-    long chunkLen = (iff_getlong(dataptr + 4) + 1) & 0xfffffffe;
-    if (chunkLen < 0) {     // format error?
-        break;
-    }
-    bool truncated = (dataptr + 8 + chunkLen > dataend);
-
-    if (strncmp((char *)dataptr, "BMHD", 4) == 0) { // BMHD chunk?
-        if (chunkLen < 12 + 2 || truncated) {
-        break;
-        }
-        bmhd_width = iff_getword(dataptr + 8);      // width of picture
-        bmhd_height= iff_getword(dataptr + 8 + 2);  // height of picture
-        bmhd_bitplanes = *(dataptr + 8 + 8);        // # of bitplanes
-        // bmhd_masking  = *(dataptr + 8 + 9); -- unused currently
-        bmhd_compression = *(dataptr + 8 + 10);     // get compression
-        bmhd_transcol    = iff_getword(dataptr + 8 + 12);
-        BMHDok = true;                              // got BMHD
-        dataptr += 8 + chunkLen;                    // to next chunk
-    }
-    else if (strncmp((char *)dataptr, "CMAP", 4) == 0) { // CMAP ?
-        if (truncated) {
-        break;
-        }
-        const byte *cmapptr = dataptr + 8;
-        colors = chunkLen / 3;                  // calc no of colors
-
-        wxDELETE(m_image->pal);
-        m_image->colors = colors;
-        if (colors > 0) {
-        m_image->pal = new byte[3*colors];
-        if (!m_image->pal) {
-            Destroy();
-            return wxIFF_MEMERR;
-        }
-
-        // copy colors to color map
-        for (int i=0; i < colors; i++) {
-            m_image->pal[3*i + 0] = *cmapptr++;
-            m_image->pal[3*i + 1] = *cmapptr++;
-            m_image->pal[3*i + 2] = *cmapptr++;
-        }
-        }
-
-        wxLogTrace(wxT("iff"), wxT("Read %d colors from IFF file."),
-            colors);
-
-        dataptr += 8 + chunkLen;                    // to next chunk
-    } else if (strncmp((char *)dataptr, "CAMG", 4) == 0) { // CAMG ?
-        if (chunkLen < 4 || truncated) {
-        break;
-        }
-        camg_viewmode = iff_getlong(dataptr + 8);   // get viewmodes
-        CAMGok = true;                              // got CAMG
-        dataptr += 8 + chunkLen;                    // to next chunk
-    }
-    else if (strncmp((char *)dataptr, "BODY", 4) == 0) { // BODY ?
-        if (!BMHDok) {                              // BMHD found?
-        break;
-        }
-        const byte *bodyptr = dataptr + 8;          // -> BODY data
-
-        if (truncated) {
-        chunkLen = dataend - dataptr;
-        }
-
-        //
-            // if BODY is compressed, allocate buffer for decrunched BODY
-        // and decompress it (run length encoding)
-        //
-        if (bmhd_compression == 1) {
-        // calc size of decrunch buffer - (size of the actual pic.
-        // decompressed in interleaved Amiga bitplane format)
-
-        size_t decomp_bufsize = (((bmhd_width + 15) >> 4) << 1)
-            * bmhd_height * bmhd_bitplanes;
-
-        if ((decomp_mem = new byte[decomp_bufsize]) == 0) {
-            Destroy();
-            return wxIFF_MEMERR;
-        }
-
-        decomprle(bodyptr, decomp_mem, chunkLen, decomp_bufsize);
-        bodyptr = decomp_mem;                 // -> uncompressed BODY
-        chunkLen = decomp_bufsize;
-        wxDELETEA(databuf);
-        }
-
-        // the following determines the type of the ILBM file.
-        // it's either NORMAL, EHB, HAM, HAM8 or 24BIT
-
-        int fmt = ILBM_NORMAL;                 // assume normal ILBM
-        if (bmhd_bitplanes == 24) {
-        fmt = ILBM_24BIT;
-        } else if (bmhd_bitplanes == 8) {
-        if (CAMGok && (camg_viewmode & 0x800)) {
-            fmt = ILBM_HAM8;
-        }
-        } else if ((bmhd_bitplanes > 5) && CAMGok) {
-        if (camg_viewmode & 0x80) {
-            fmt = ILBM_EHB;
-        } else if (camg_viewmode & 0x800) {
-            fmt = ILBM_HAM;
-        }
-        }
-
-        wxLogTrace(wxT("iff"),
-            wxT("LoadIFF: %s %dx%d, planes=%d (%d cols), comp=%d"),
-            (fmt==ILBM_NORMAL) ? "Normal ILBM" :
-            (fmt==ILBM_HAM)    ? "HAM ILBM" :
-            (fmt==ILBM_HAM8)   ? "HAM8 ILBM" :
-            (fmt==ILBM_EHB)    ? "EHB ILBM" :
-            (fmt==ILBM_24BIT)  ? "24BIT ILBM" : "unknown ILBM",
-            bmhd_width, bmhd_height, bmhd_bitplanes,
-            1<<bmhd_bitplanes, bmhd_compression);
-
-        if ((fmt==ILBM_NORMAL) || (fmt==ILBM_EHB) || (fmt==ILBM_HAM)) {
-        wxLogTrace(wxT("iff"),
-            wxT("Converting CMAP from normal ILBM CMAP"));
-
-        switch(fmt) {
-            case ILBM_NORMAL: colors = 1 << bmhd_bitplanes; break;
-            case ILBM_EHB:    colors = 32*2; break;
-            case ILBM_HAM:    colors = 16; break;
-        }
-
-        if (colors > m_image->colors) {
-            byte *pal = new byte[colors*3];
-            if (!pal) {
-            Destroy();
-            return wxIFF_MEMERR;
-            }
-            int i;
-            for (i = 0; i < m_image->colors; i++) {
-            pal[3*i + 0] = m_image->pal[3*i + 0];
-            pal[3*i + 1] = m_image->pal[3*i + 1];
-            pal[3*i + 2] = m_image->pal[3*i + 2];
-            }
-            for (; i < colors; i++) {
-            pal[3*i + 0] = 0;
-            pal[3*i + 1] = 0;
-            pal[3*i + 2] = 0;
-            }
-            delete m_image->pal;
-            m_image->pal = pal;
-            m_image->colors = colors;
-        }
-
-            for (int i=0; i < colors; i++) {
-            m_image->pal[3*i + 0] = (m_image->pal[3*i + 0] >> 4) * 17;
-            m_image->pal[3*i + 1] = (m_image->pal[3*i + 1] >> 4) * 17;
-            m_image->pal[3*i + 2] = (m_image->pal[3*i + 2] >> 4) * 17;
-        }
-        }
-
-        m_image->p = new byte[bmhd_width * bmhd_height * 3];
-        byte *picptr = m_image->p;
-        if (!picptr) {
-        Destroy();
-        return wxIFF_MEMERR;
-        }
-
-        byte *pal = m_image->pal;
-        int lineskip = ((bmhd_width + 15) >> 4) << 1;
-            int height = chunkLen / (lineskip * bmhd_bitplanes);
-
-        if (bmhd_height < height) {
-            height = bmhd_height;
-        }
-
-        if (fmt == ILBM_HAM || fmt == ILBM_HAM8 || fmt == ILBM_24BIT) {
-        byte *pic = picptr;
-        const byte *workptr = bodyptr;
-
-        for (int i=0; i < height; i++) {
-            byte bitmsk = 0x80;
-            const byte *workptr2 = workptr;
-
-            // at start of each line, init RGB values to background
-            byte rval = pal[0];
-            byte gval = pal[1];
-            byte bval = pal[2];
-
-            for (int j=0; j < bmhd_width; j++) {
-            long col = 0;
-            long colbit = 1;
-            const byte *workptr3 = workptr2;
-            for (int k=0; k < bmhd_bitplanes; k++) {
-                if (*workptr3 & bitmsk) {
-                col += colbit;
-                }
-                workptr3 += lineskip;
-                colbit <<= 1;
-            }
-
-            if (fmt==ILBM_HAM) {
-                int c = (col & 0x0f);
-                switch (col & 0x30) {
-                case 0x00: if (c >= 0 && c < colors) {
-                        rval = pal[3*c + 0];
-                        gval = pal[3*c + 1];
-                        bval = pal[3*c + 2];
-                    }
-                    break;
-
-                case 0x10: bval = c * 17;
-                    break;
-
-                case 0x20: rval = c * 17;
-                    break;
-
-                case 0x30: gval = c * 17;
-                    break;
-                }
-            } else if (fmt == ILBM_HAM8) {
-                int c = (col & 0x3f);
-                switch(col & 0xc0) {
-                case 0x00: if (c >= 0 && c < colors) {
-                        rval = pal[3*c + 0];
-                        gval = pal[3*c + 1];
-                        bval = pal[3*c + 2];
-                    }
-                    break;
-
-                case 0x40: bval = (bval & 3) | (c << 2);
-                    break;
-
-                case 0x80: rval = (rval & 3) | (c << 2);
-                    break;
-
-                case 0xc0: gval = (rval & 3) | (c << 2);
-                }
-            } else {
-                rval = col & 0xff;
-                gval = (col >> 8) & 0xff;
-                bval = (col >> 16) & 0xff;
-            }
-
-            *pic++ = rval;
-            *pic++ = gval;
-            *pic++ = bval;
-
-            bitmsk = bitmsk >> 1;
-            if (bitmsk == 0) {
-                bitmsk = 0x80;
-                workptr2++;
-            }
-            }
-            workptr += lineskip * bmhd_bitplanes;
-        }
-        }  else if ((fmt == ILBM_NORMAL) || (fmt == ILBM_EHB)) {
-        if (fmt == ILBM_EHB) {
-            wxLogTrace(wxT("iff"), wxT("Doubling CMAP for EHB mode"));
-
-            for (int i=0; i<32; i++) {
-            pal[3*(i + 32) + 0] = pal[3*i + 0] >> 1;
-            pal[3*(i + 32) + 1] = pal[3*i + 1] >> 1;
-            pal[3*(i + 32) + 2] = pal[3*i + 2] >> 1;
-            }
-        }
-
-        byte *pic = picptr;         // ptr to buffer
-        const byte *workptr = bodyptr;  // ptr to pic, planar format
-
-        if (bmhd_height < height) {
-            height = bmhd_height;
-        }
-
-        for (int i=0; i < height; i++) {
-            byte bitmsk = 0x80;                 // left most bit (mask)
-            const byte *workptr2 = workptr;     // work ptr to source
-            for (int j=0; j < bmhd_width; j++) {
-            long col = 0;
-            long colbit = 1;
-            const byte *workptr3 = workptr2;  // 1st byte in 1st pln
-
-            for (int k=0; k < bmhd_bitplanes; k++) {
-                if (*workptr3 & bitmsk) { // if bit set in this pln
-                col = col + colbit; // add bit to chunky byte
-                }
-                workptr3 += lineskip;   // go to next line
-                colbit <<= 1;           // shift color bit
-            }
-
-            if (col >= 0 && col < colors) {
-                pic[0] = pal[3*col + 0];
-                pic[1] = pal[3*col + 1];
-                pic[2] = pal[3*col + 2];
-            } else {
-                pic[0] = pic[1] = pic[2] = 0;
-            }
-            pic += 3;
-            bitmsk = bitmsk >> 1;   // shift mask to next bit
-            if (bitmsk == 0) {      // if mask is zero
-                bitmsk = 0x80;      // reset mask
-                workptr2++;         // mv ptr to next byte
-            }
-            }
-
-            workptr += lineskip * bmhd_bitplanes;  // to next line
-        }
-        } else {
-        break;      // unknown format
-        }
-
-        m_image->w = bmhd_width;
-        m_image->h = height;
-        m_image->transparent = bmhd_transcol;
-
-        wxLogTrace(wxT("iff"), wxT("Loaded IFF picture %s"),
-            truncated? "truncated" : "completely");
-
-        return (truncated? wxIFF_TRUNCATED : wxIFF_OK);
-    } else {
-        wxLogTrace(wxT("iff"), wxT("Skipping unknown chunk '%c%c%c%c'"),
-                *dataptr, *(dataptr+1), *(dataptr+2), *(dataptr+3));
-
-        dataptr = dataptr + 8 + chunkLen;      // skip unknown chunk
-    }
-    }
-
-    Destroy();
-    return wxIFF_INVFORMAT;
-}
-
-
-
-//-----------------------------------------------------------------------------
-// wxIFFHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxIFFHandler, wxImageHandler)
-
-#if wxUSE_STREAMS
-
-bool wxIFFHandler::LoadFile(wxImage *image, wxInputStream& stream,
-                            bool verbose, int WXUNUSED(index))
-{
-    wxIFFDecoder *decod;
-    int error;
-    bool ok;
-
-    decod = new wxIFFDecoder(&stream);
-    error = decod->ReadIFF();
-
-    if ((error != wxIFF_OK) && (error != wxIFF_TRUNCATED))
-    {
-        if (verbose)
-        {
-            switch (error)
-            {
-                case wxIFF_INVFORMAT:
-                    wxLogError(_("IFF: error in IFF image format."));
-                    break;
-                case wxIFF_MEMERR:
-                    wxLogError(_("IFF: not enough memory."));
-                    break;
-                default:
-                    wxLogError(_("IFF: unknown error!!!"));
-                    break;
-            }
-        }
-        delete decod;
-        return false;
-    }
-
-    if ((error == wxIFF_TRUNCATED) && verbose)
-    {
-        wxLogError(_("IFF: data stream seems to be truncated."));
-        /* go on; image data is OK */
-    }
-
-    ok = decod->ConvertToImage(image);
-    delete decod;
-
-    return ok;
-}
-
-bool wxIFFHandler::SaveFile(wxImage * WXUNUSED(image),
-                            wxOutputStream& WXUNUSED(stream), bool verbose)
-{
-    if (verbose)
-    {
-        wxLogDebug(wxT("IFF: the handler is read-only!!"));
-    }
-
-    return false;
-}
-
-bool wxIFFHandler::DoCanRead(wxInputStream& stream)
-{
-    wxIFFDecoder decod(&stream);
-
-    return decod.CanRead();
-         // it's ok to modify the stream position here
-}
-
-#endif // wxUSE_STREAMS
-
-#endif // wxUSE_IFF
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagiff.h
+// Purpose:     wxImage handler for Amiga IFF images
+// Author:      Steffen Gutmann, Thomas Meyer
+// RCS-ID:      $Id: imagiff.cpp 38787 2006-04-18 07:24:35Z ABX $
+// Copyright:   (c) Steffen Gutmann, 2002
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// Parts of this source are based on the iff loading algorithm found
+// in xviff.c.  Permission by the original author, Thomas Meyer, and
+// by the author of xv, John Bradley for using the iff loading part
+// in wxWidgets has been gratefully given.
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_IFF
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/intl.h"
+#endif
+
+#include "wx/imagiff.h"
+#include "wx/wfstream.h"
+
+#if wxUSE_PALETTE
+    #include "wx/palette.h"
+#endif // wxUSE_PALETTE
+
+#include <stdlib.h>
+#include <string.h>
+
+
+// --------------------------------------------------------------------------
+// Constants
+// --------------------------------------------------------------------------
+
+// Error codes:
+//  Note that the error code wxIFF_TRUNCATED means that the image itself
+//  is most probably OK, but the decoder didn't reach the end of the data
+//  stream; this means that if it was not reading directly from file,
+//  the stream will not be correctly positioned.
+//
+
+enum
+{
+    wxIFF_OK = 0,                   /* everything was OK */
+    wxIFF_INVFORMAT,                /* error in iff header */
+    wxIFF_MEMERR,                   /* error allocating memory */
+    wxIFF_TRUNCATED                 /* file appears to be truncated */
+};
+
+// --------------------------------------------------------------------------
+// wxIFFDecoder class
+// --------------------------------------------------------------------------
+
+// internal class for storing IFF image data
+class IFFImage
+{
+public:
+    unsigned int w;                 /* width */
+    unsigned int h;                 /* height */
+    int transparent;                /* transparent color (-1 = none) */
+    int colors;                     /* number of colors */
+    unsigned char *p;               /* bitmap */
+    unsigned char *pal;             /* palette */
+
+    IFFImage() : w(0), h(0), colors(0), p(0), pal(0) {}
+    ~IFFImage() { delete [] p; delete [] pal; }
+};
+
+class WXDLLEXPORT wxIFFDecoder
+{
+private:
+    IFFImage *m_image;        // image data
+    wxInputStream *m_f;       // input stream
+    unsigned char *databuf;
+    unsigned char *picptr;
+    unsigned char *decomp_mem;
+
+    void Destroy();
+
+public:
+    // get data of current frame
+    unsigned char* GetData() const;
+    unsigned char* GetPalette() const;
+    int GetNumColors() const;
+    unsigned int GetWidth() const;
+    unsigned int GetHeight() const;
+    int GetTransparentColour() const;
+
+    // constructor, destructor, etc.
+    wxIFFDecoder(wxInputStream *s);
+    ~wxIFFDecoder() { Destroy(); }
+    bool CanRead();
+    int ReadIFF();
+    bool ConvertToImage(wxImage *image) const;
+};
+
+
+//---------------------------------------------------------------------------
+// wxIFFDecoder constructor and destructor
+//---------------------------------------------------------------------------
+
+wxIFFDecoder::wxIFFDecoder(wxInputStream *s)
+{
+    m_f = s;
+    m_image = 0;
+    databuf = 0;
+    decomp_mem = 0;
+}
+
+void wxIFFDecoder::Destroy()
+{
+    delete m_image;
+    m_image = 0;
+    delete [] databuf;
+    databuf = 0;
+    delete [] decomp_mem;
+    decomp_mem = 0;
+}
+
+//---------------------------------------------------------------------------
+// Convert this image to a wxImage object
+//---------------------------------------------------------------------------
+
+// This function was designed by Vaclav Slavik
+
+bool wxIFFDecoder::ConvertToImage(wxImage *image) const
+{
+    // just in case...
+    image->Destroy();
+
+    // create the image
+    image->Create(GetWidth(), GetHeight());
+
+    if (!image->Ok())
+        return false;
+
+    unsigned char *pal = GetPalette();
+    unsigned char *src = GetData();
+    unsigned char *dst = image->GetData();
+    int colors = GetNumColors();
+    int transparent = GetTransparentColour();
+    long i;
+
+    // set transparent colour mask
+    if (transparent != -1)
+    {
+        for (i = 0; i < colors; i++)
+        {
+            if ((pal[3 * i + 0] == 255) &&
+                (pal[3 * i + 1] == 0) &&
+                (pal[3 * i + 2] == 255))
+            {
+                pal[3 * i + 2] = 254;
+            }
+        }
+
+        pal[3 * transparent + 0] = 255,
+        pal[3 * transparent + 1] = 0,
+        pal[3 * transparent + 2] = 255;
+
+        image->SetMaskColour(255, 0, 255);
+    }
+    else
+        image->SetMask(false);
+
+#if wxUSE_PALETTE
+    if (pal && colors > 0)
+    {
+        unsigned char* r = new unsigned char[colors];
+        unsigned char* g = new unsigned char[colors];
+        unsigned char* b = new unsigned char[colors];
+
+        for (i = 0; i < colors; i++)
+        {
+            r[i] = pal[3*i + 0];
+            g[i] = pal[3*i + 1];
+            b[i] = pal[3*i + 2];
+        }
+
+        image->SetPalette(wxPalette(colors, r, g, b));
+
+        delete [] r;
+        delete [] g;
+        delete [] b;
+    }
+#endif // wxUSE_PALETTE
+
+    // copy image data
+    for (i = 0; i < (long)(GetWidth() * GetHeight()); i++, src += 3, dst += 3)
+    {
+    dst[0] = src[0];
+    dst[1] = src[1];
+    dst[2] = src[2];
+    }
+
+    return true;
+}
+
+
+//---------------------------------------------------------------------------
+// Data accessors
+//---------------------------------------------------------------------------
+
+// Get data for current frame
+
+unsigned char* wxIFFDecoder::GetData() const    { return (m_image->p); }
+unsigned char* wxIFFDecoder::GetPalette() const { return (m_image->pal); }
+int wxIFFDecoder::GetNumColors() const          { return m_image->colors; }
+unsigned int wxIFFDecoder::GetWidth() const     { return (m_image->w); }
+unsigned int wxIFFDecoder::GetHeight() const    { return (m_image->h); }
+int wxIFFDecoder::GetTransparentColour() const { return m_image->transparent; }
+
+//---------------------------------------------------------------------------
+// IFF reading and decoding
+//---------------------------------------------------------------------------
+
+//
+// CanRead:
+//  Returns true if the file looks like a valid IFF, false otherwise.
+//
+bool wxIFFDecoder::CanRead()
+{
+    unsigned char buf[12];
+
+    if ( !m_f->Read(buf, WXSIZEOF(buf)) )
+        return false;
+
+    m_f->SeekI(-(wxFileOffset)WXSIZEOF(buf), wxFromCurrent);
+
+    return (memcmp(buf, "FORM", 4) == 0) && (memcmp(buf+8, "ILBM", 4) == 0);
+}
+
+
+// ReadIFF:
+// Based on xv source code by Thomas Meyer
+// Permission for use in wxWidgets has been gratefully given.
+
+typedef unsigned char byte;
+#define IFFDEBUG 0
+
+/*************************************************************************
+  void decomprle(source, destination, source length, buffer size)
+
+  Decompress run-length encoded data from source to destination. Terminates
+  when source is decoded completely or destination buffer is full.
+
+  The decruncher is as optimized as I could make it, without risking
+  safety in case of corrupt BODY chunks.
+**************************************************************************/
+
+static void decomprle(const byte *sptr, byte *dptr, long slen, long dlen)
+{
+    byte codeByte, dataByte;
+
+    while ((slen > 0) && (dlen > 0)) {
+    // read control byte
+    codeByte = *sptr++;
+
+    if (codeByte < 0x80) {
+        codeByte++;
+        if ((slen > (long) codeByte) && (dlen >= (long) codeByte)) {
+        slen -= codeByte + 1;
+        dlen -= codeByte;
+        while (codeByte > 0) {
+            *dptr++ = *sptr++;
+            codeByte--;
+        }
+        }
+        else slen = 0;
+    }
+
+    else if (codeByte > 0x80) {
+        codeByte = 0x81 - (codeByte & 0x7f);
+        if ((slen > (long) 0) && (dlen >= (long) codeByte)) {
+        dataByte = *sptr++;
+        slen -= 2;
+        dlen -= codeByte;
+        while (codeByte > 0) {
+            *dptr++ = dataByte;
+            codeByte--;
+        }
+        }
+        else slen = 0;
+    }
+    }
+}
+
+/******************************************/
+static unsigned int iff_getword(const byte *ptr)
+{
+    unsigned int v;
+
+    v = *ptr++;
+    v = (v << 8) + *ptr;
+    return v;
+}
+
+/******************************************/
+static unsigned long iff_getlong(const byte *ptr)
+{
+    unsigned long l;
+
+    l = *ptr++;
+    l = (l << 8) + *ptr++;
+    l = (l << 8) + *ptr++;
+    l = (l << 8) + *ptr;
+    return l;
+}
+
+// Define internal ILBM types
+#define ILBM_NORMAL     0
+#define ILBM_EHB        1
+#define ILBM_HAM        2
+#define ILBM_HAM8       3
+#define ILBM_24BIT      4
+
+int wxIFFDecoder::ReadIFF()
+{
+    Destroy();
+
+    m_image = new IFFImage();
+    if (m_image == 0) {
+    Destroy();
+    return wxIFF_MEMERR;
+    }
+
+    // compute file length
+    wxFileOffset currentPos = m_f->TellI();
+    m_f->SeekI(0, wxFromEnd);
+    long filesize = m_f->TellI();
+    m_f->SeekI(currentPos, wxFromStart);
+
+    // allocate memory for complete file
+    if ((databuf = new byte[filesize]) == 0) {
+    Destroy();
+    return wxIFF_MEMERR;
+    }
+
+    m_f->Read(databuf, filesize);
+    const byte *dataend = databuf + filesize;
+
+    // initialize work pointer. used to trace the buffer for IFF chunks
+    const byte *dataptr = databuf;
+
+    // check for minmal size
+    if (dataptr + 12 > dataend) {
+    Destroy();
+    return wxIFF_INVFORMAT;
+    }
+
+    // check if we really got an IFF file
+    if (strncmp((char *)dataptr, "FORM", 4) != 0) {
+    Destroy();
+    return wxIFF_INVFORMAT;
+    }
+
+    dataptr = dataptr + 8;                  // skip ID and length of FORM
+
+    // check if the IFF file is an ILBM (picture) file
+    if (strncmp((char *) dataptr, "ILBM", 4) != 0) {
+    Destroy();
+    return wxIFF_INVFORMAT;
+    }
+
+    wxLogTrace(_T("iff"), _T("IFF ILBM file recognized"));
+
+    dataptr = dataptr + 4;                                // skip ID
+
+    //
+    // main decoding loop. searches IFF chunks and handles them.
+    // terminates when BODY chunk was found or dataptr ran over end of file
+    //
+    bool BMHDok = false, CMAPok = false, CAMGok = false;
+    int bmhd_width = 0, bmhd_height = 0, bmhd_bitplanes = 0, bmhd_transcol = -1;
+    byte bmhd_masking = 0, bmhd_compression = 0;
+    long camg_viewmode = 0;
+    int colors = 0;
+    while (dataptr + 8 <= dataend) {
+    // get chunk length and make even
+    size_t chunkLen = (iff_getlong(dataptr + 4) + 1) & 0xfffffffe;
+#ifdef __VMS
+       // Silence compiler warning
+       int chunkLen_;
+       chunkLen_ = chunkLen;
+       if (chunkLen_ < 0) {     // format error?
+#else
+       if (chunkLen < 0) {     // format error?
+#endif
+         break;
+    }
+    bool truncated = (dataptr + 8 + chunkLen > dataend);
+
+    if (strncmp((char *)dataptr, "BMHD", 4) == 0) { // BMHD chunk?
+        if (chunkLen < 12 + 2 || truncated) {
+        break;
+        }
+        bmhd_width = iff_getword(dataptr + 8);      // width of picture
+        bmhd_height= iff_getword(dataptr + 8 + 2);  // height of picture
+        bmhd_bitplanes = *(dataptr + 8 + 8);        // # of bitplanes
+        bmhd_masking  = *(dataptr + 8 + 9);
+        bmhd_compression = *(dataptr + 8 + 10);     // get compression
+        bmhd_transcol    = iff_getword(dataptr + 8 + 12);
+        BMHDok = true;                              // got BMHD
+        dataptr += 8 + chunkLen;                    // to next chunk
+    }
+    else if (strncmp((char *)dataptr, "CMAP", 4) == 0) { // CMAP ?
+        if (truncated) {
+        break;
+        }
+        const byte *cmapptr = dataptr + 8;
+        colors = chunkLen / 3;                  // calc no of colors
+
+        delete m_image->pal;
+        m_image->pal = 0;
+        m_image->colors = colors;
+        if (colors > 0) {
+        m_image->pal = new byte[3*colors];
+        if (!m_image->pal) {
+            Destroy();
+            return wxIFF_MEMERR;
+        }
+
+        // copy colors to color map
+        for (int i=0; i < colors; i++) {
+            m_image->pal[3*i + 0] = *cmapptr++;
+            m_image->pal[3*i + 1] = *cmapptr++;
+            m_image->pal[3*i + 2] = *cmapptr++;
+        }
+        }
+
+        wxLogTrace(_T("iff"), _T("Read %d colors from IFF file."),
+            colors);
+
+        CMAPok = true;                              // got CMAP
+        dataptr += 8 + chunkLen;                    // to next chunk
+    } else if (strncmp((char *)dataptr, "CAMG", 4) == 0) { // CAMG ?
+        if (chunkLen < 4 || truncated) {
+        break;
+        }
+        camg_viewmode = iff_getlong(dataptr + 8);   // get viewmodes
+        CAMGok = true;                              // got CAMG
+        dataptr += 8 + chunkLen;                    // to next chunk
+    }
+    else if (strncmp((char *)dataptr, "BODY", 4) == 0) { // BODY ?
+        if (!BMHDok) {                              // BMHD found?
+        break;
+        }
+        const byte *bodyptr = dataptr + 8;          // -> BODY data
+
+        if (truncated) {
+        chunkLen = dataend - dataptr;
+        }
+
+        //
+            // if BODY is compressed, allocate buffer for decrunched BODY
+        // and decompress it (run length encoding)
+        //
+        if (bmhd_compression == 1) {
+        // calc size of decrunch buffer - (size of the actual pic.
+        // decompressed in interleaved Amiga bitplane format)
+
+        size_t decomp_bufsize = (((bmhd_width + 15) >> 4) << 1)
+            * bmhd_height * bmhd_bitplanes;
+
+        if ((decomp_mem = new byte[decomp_bufsize]) == 0) {
+            Destroy();
+            return wxIFF_MEMERR;
+        }
+
+        decomprle(bodyptr, decomp_mem, chunkLen, decomp_bufsize);
+        bodyptr = decomp_mem;                 // -> uncompressed BODY
+        chunkLen = decomp_bufsize;
+        delete [] databuf;
+        databuf = 0;
+        }
+
+        // the following determines the type of the ILBM file.
+        // it's either NORMAL, EHB, HAM, HAM8 or 24BIT
+
+        int fmt = ILBM_NORMAL;                 // assume normal ILBM
+        if (bmhd_bitplanes == 24) {
+        fmt = ILBM_24BIT;
+        } else if (bmhd_bitplanes == 8) {
+        if (CAMGok && (camg_viewmode & 0x800)) {
+            fmt = ILBM_HAM8;
+        }
+        } else if ((bmhd_bitplanes > 5) && CAMGok) {
+        if (camg_viewmode & 0x80) {
+            fmt = ILBM_EHB;
+        } else if (camg_viewmode & 0x800) {
+            fmt = ILBM_HAM;
+        }
+        }
+
+        wxLogTrace(_T("iff"),
+            _T("LoadIFF: %s %dx%d, planes=%d (%d cols), comp=%d"),
+            (fmt==ILBM_NORMAL) ? "Normal ILBM" :
+            (fmt==ILBM_HAM)    ? "HAM ILBM" :
+            (fmt==ILBM_HAM8)   ? "HAM8 ILBM" :
+            (fmt==ILBM_EHB)    ? "EHB ILBM" :
+            (fmt==ILBM_24BIT)  ? "24BIT ILBM" : "unknown ILBM",
+            bmhd_width, bmhd_height, bmhd_bitplanes,
+            1<<bmhd_bitplanes, bmhd_compression);
+
+        if ((fmt==ILBM_NORMAL) || (fmt==ILBM_EHB) || (fmt==ILBM_HAM)) {
+        wxLogTrace(_T("iff"),
+            _T("Converting CMAP from normal ILBM CMAP"));
+
+        switch(fmt) {
+            case ILBM_NORMAL: colors = 1 << bmhd_bitplanes; break;
+            case ILBM_EHB:    colors = 32*2; break;
+            case ILBM_HAM:    colors = 16; break;
+        }
+
+        if (colors > m_image->colors) {
+            byte *pal = new byte[colors*3];
+            if (!pal) {
+            Destroy();
+            return wxIFF_MEMERR;
+            }
+            int i;
+            for (i = 0; i < m_image->colors; i++) {
+            pal[3*i + 0] = m_image->pal[3*i + 0];
+            pal[3*i + 1] = m_image->pal[3*i + 1];
+            pal[3*i + 2] = m_image->pal[3*i + 2];
+            }
+            for (; i < colors; i++) {
+            pal[3*i + 0] = 0;
+            pal[3*i + 1] = 0;
+            pal[3*i + 2] = 0;
+            }
+            delete m_image->pal;
+            m_image->pal = pal;
+            m_image->colors = colors;
+        }
+
+            for (int i=0; i < colors; i++) {
+            m_image->pal[3*i + 0] = (m_image->pal[3*i + 0] >> 4) * 17;
+            m_image->pal[3*i + 1] = (m_image->pal[3*i + 1] >> 4) * 17;
+            m_image->pal[3*i + 2] = (m_image->pal[3*i + 2] >> 4) * 17;
+        }
+        }
+
+        m_image->p = new byte[bmhd_width * bmhd_height * 3];
+            byte *picptr = m_image->p;
+        if (!picptr) {
+        Destroy();
+        return wxIFF_MEMERR;
+        }
+
+        byte *pal = m_image->pal;
+        int lineskip = ((bmhd_width + 15) >> 4) << 1;
+            int height = chunkLen / (lineskip * bmhd_bitplanes);
+
+        if (bmhd_height < height) {
+            height = bmhd_height;
+        }
+
+        if (fmt == ILBM_HAM || fmt == ILBM_HAM8 || fmt == ILBM_24BIT) {
+        byte *pic = picptr;
+        const byte *workptr = bodyptr;
+
+        for (int i=0; i < height; i++) {
+            byte bitmsk = 0x80;
+            const byte *workptr2 = workptr;
+
+            // at start of each line, init RGB values to background
+            byte rval = pal[0];
+            byte gval = pal[1];
+            byte bval = pal[2];
+
+            for (int j=0; j < bmhd_width; j++) {
+            long col = 0;
+            long colbit = 1;
+            const byte *workptr3 = workptr2;
+            for (int k=0; k < bmhd_bitplanes; k++) {
+                if (*workptr3 & bitmsk) {
+                col += colbit;
+                }
+                workptr3 += lineskip;
+                colbit <<= 1;
+            }
+
+            if (fmt==ILBM_HAM) {
+                int c = (col & 0x0f);
+                switch (col & 0x30) {
+                case 0x00: if (c >= 0 && c < colors) {
+                           rval = pal[3*c + 0];
+                           gval = pal[3*c + 1];
+                           bval = pal[3*c + 2];
+                       }
+                       break;
+
+                case 0x10: bval = c * 17;
+                       break;
+
+                case 0x20: rval = c * 17;
+                       break;
+
+                case 0x30: gval = c * 17;
+                       break;
+                }
+            } else if (fmt == ILBM_HAM8) {
+                int c = (col & 0x3f);
+                switch(col & 0xc0) {
+                case 0x00: if (c >= 0 && c < colors) {
+                           rval = pal[3*c + 0];
+                           gval = pal[3*c + 1];
+                           bval = pal[3*c + 2];
+                       }
+                       break;
+
+                case 0x40: bval = (bval & 3) | (c << 2);
+                       break;
+
+                case 0x80: rval = (rval & 3) | (c << 2);
+                       break;
+
+                case 0xc0: gval = (rval & 3) | (c << 2);
+                }
+            } else {
+                rval = col & 0xff;
+                gval = (col >> 8) & 0xff;
+                bval = (col >> 16) & 0xff;
+            }
+
+            *pic++ = rval;
+            *pic++ = gval;
+            *pic++ = bval;
+
+            bitmsk = bitmsk >> 1;
+            if (bitmsk == 0) {
+                bitmsk = 0x80;
+                workptr2++;
+            }
+            }
+            workptr += lineskip * bmhd_bitplanes;
+        }
+        }  else if ((fmt == ILBM_NORMAL) || (fmt == ILBM_EHB)) {
+        if (fmt == ILBM_EHB) {
+            wxLogTrace(_T("iff"), _T("Doubling CMAP for EHB mode"));
+
+            for (int i=0; i<32; i++) {
+            pal[3*(i + 32) + 0] = pal[3*i + 0] >> 1;
+            pal[3*(i + 32) + 1] = pal[3*i + 1] >> 1;
+            pal[3*(i + 32) + 2] = pal[3*i + 2] >> 1;
+            }
+        }
+
+        byte *pic = picptr;         // ptr to buffer
+        const byte *workptr = bodyptr;  // ptr to pic, planar format
+
+        if (bmhd_height < height) {
+            height = bmhd_height;
+        }
+
+        for (int i=0; i < height; i++) {
+            byte bitmsk = 0x80;                 // left most bit (mask)
+            const byte *workptr2 = workptr;     // work ptr to source
+            for (int j=0; j < bmhd_width; j++) {
+            long col = 0;
+            long colbit = 1;
+            const byte *workptr3 = workptr2;  // 1st byte in 1st pln
+
+            for (int k=0; k < bmhd_bitplanes; k++) {
+                if (*workptr3 & bitmsk) { // if bit set in this pln
+                col = col + colbit; // add bit to chunky byte
+                }
+                workptr3 += lineskip;   // go to next line
+                colbit <<= 1;           // shift color bit
+            }
+
+            if (col >= 0 && col < colors) {
+                pic[0] = pal[3*col + 0];
+                pic[1] = pal[3*col + 1];
+                pic[2] = pal[3*col + 2];
+            } else {
+                pic[0] = pic[1] = pic[2] = 0;
+            }
+            pic += 3;
+            bitmsk = bitmsk >> 1;   // shift mask to next bit
+            if (bitmsk == 0) {      // if mask is zero
+                bitmsk = 0x80;      // reset mask
+                workptr2++;         // mv ptr to next byte
+            }
+            }
+
+            workptr += lineskip * bmhd_bitplanes;  // to next line
+        }
+        } else {
+        break;      // unknown format
+        }
+
+        m_image->w = bmhd_width;
+        m_image->h = height;
+        m_image->transparent = bmhd_transcol;
+
+        wxLogTrace(_T("iff"), _T("Loaded IFF picture %s"),
+            truncated? "truncated" : "completely");
+
+        return (truncated? wxIFF_TRUNCATED : wxIFF_OK);
+    } else {
+        wxLogTrace(_T("iff"), _T("Skipping unknown chunk '%c%c%c%c'"),
+                *dataptr, *(dataptr+1), *(dataptr+2), *(dataptr+3));
+
+        dataptr = dataptr + 8 + chunkLen;      // skip unknown chunk
+    }
+    }
+
+    Destroy();
+    return wxIFF_INVFORMAT;
+}
+
+
+
+//-----------------------------------------------------------------------------
+// wxIFFHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxIFFHandler, wxImageHandler)
+
+#if wxUSE_STREAMS
+
+bool wxIFFHandler::LoadFile(wxImage *image, wxInputStream& stream,
+                            bool verbose, int WXUNUSED(index))
+{
+    wxIFFDecoder *decod;
+    int error;
+    bool ok;
+
+    decod = new wxIFFDecoder(&stream);
+    error = decod->ReadIFF();
+
+    if ((error != wxIFF_OK) && (error != wxIFF_TRUNCATED))
+    {
+        if (verbose)
+        {
+            switch (error)
+            {
+                case wxIFF_INVFORMAT:
+                    wxLogError(_("IFF: error in IFF image format."));
+                    break;
+                case wxIFF_MEMERR:
+                    wxLogError(_("IFF: not enough memory."));
+                    break;
+                default:
+                    wxLogError(_("IFF: unknown error!!!"));
+                    break;
+            }
+        }
+        delete decod;
+        return false;
+    }
+
+    if ((error == wxIFF_TRUNCATED) && verbose)
+    {
+        wxLogError(_("IFF: data stream seems to be truncated."));
+        /* go on; image data is OK */
+    }
+
+    ok = decod->ConvertToImage(image);
+    delete decod;
+
+    return ok;
+}
+
+bool wxIFFHandler::SaveFile(wxImage * WXUNUSED(image),
+                            wxOutputStream& WXUNUSED(stream), bool verbose)
+{
+    if (verbose)
+        wxLogDebug(wxT("IFF: the handler is read-only!!"));
+
+    return false;
+}
+
+bool wxIFFHandler::DoCanRead(wxInputStream& stream)
+{
+    wxIFFDecoder decod(&stream);
+
+    return decod.CanRead();
+}
+
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_IFF
diff --git a/Source/3rd Party/wx/src/common/imagjpeg.cpp b/Source/3rd Party/wx/src/common/imagjpeg.cpp
index 1c6a74160..9fb2d4e69 100644
--- a/Source/3rd Party/wx/src/common/imagjpeg.cpp	
+++ b/Source/3rd Party/wx/src/common/imagjpeg.cpp	
@@ -1,507 +1,480 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagjpeg.cpp
-// Purpose:     wxImage JPEG handler
-// Author:      Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && wxUSE_LIBJPEG
-
-#include "wx/imagjpeg.h"
-#include "wx/versioninfo.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/app.h"
-    #include "wx/intl.h"
-    #include "wx/bitmap.h"
-    #include "wx/module.h"
-#endif
-
-// A hack based on one from tif_jpeg.c to overcome the problem on Windows
-// of rpcndr.h defining boolean with a different type to the jpeg headers.
-//
-// This hack is only necessary for an external jpeg library, the builtin one
-// usually used on Windows doesn't use the type boolean, so always works.
-//
-#ifdef wxHACK_BOOLEAN
-    #define HAVE_BOOLEAN
-    #define boolean wxHACK_BOOLEAN
-#endif
-
-extern "C"
-{
-    #if defined(__WXMSW__)
-        #define XMD_H
-    #endif
-    #include "jpeglib.h"
-}
-
-#ifndef HAVE_WXJPEG_BOOLEAN
-typedef boolean wxjpeg_boolean;
-#endif
-
-#include "wx/filefn.h"
-#include "wx/wfstream.h"
-
-// For memcpy
-#include <string.h>
-// For JPEG library error handling
-#include <setjmp.h>
-
-// ----------------------------------------------------------------------------
-// types
-// ----------------------------------------------------------------------------
-
-// the standard definition of METHODDEF(type) from jmorecfg.h is "static type"
-// which means that we can't declare the method functions as extern "C" - the
-// compiler (rightfully) complains about the multiple storage classes in
-// declaration
-//
-// so we only add extern "C" when using our own, modified, jmorecfg.h - and use
-// whatever we have in the system headers if this is what we use hoping that it
-// should be ok (can't do anything else)
-#ifdef JPEG_METHOD_LINKAGE
-    #define CPP_METHODDEF(type) extern "C" METHODDEF(type)
-#else // not using our jmorecfg.h header
-    #define CPP_METHODDEF(type) METHODDEF(type)
-#endif
-
-//-----------------------------------------------------------------------------
-// wxJPEGHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
-
-#if wxUSE_STREAMS
-
-//------------- JPEG Data Source Manager
-
-#define JPEG_IO_BUFFER_SIZE   2048
-
-typedef struct {
-    struct jpeg_source_mgr pub;   /* public fields */
-
-    JOCTET* buffer;               /* start of buffer */
-    wxInputStream *stream;
-} wx_source_mgr;
-
-typedef wx_source_mgr * wx_src_ptr;
-
-extern "C"
-{
-
-CPP_METHODDEF(void) wx_init_source ( j_decompress_ptr WXUNUSED(cinfo) )
-{
-}
-
-CPP_METHODDEF(wxjpeg_boolean) wx_fill_input_buffer ( j_decompress_ptr cinfo )
-{
-    wx_src_ptr src = (wx_src_ptr) cinfo->src;
-
-    src->pub.next_input_byte = src->buffer;
-    src->pub.bytes_in_buffer = src->stream->Read(src->buffer, JPEG_IO_BUFFER_SIZE).LastRead();
-
-    if (src->pub.bytes_in_buffer == 0) // check for end-of-stream
-    {
-        // Insert a fake EOI marker
-        src->buffer[0] = 0xFF;
-        src->buffer[1] = JPEG_EOI;
-        src->pub.bytes_in_buffer = 2;
-    }
-    return TRUE;
-}
-
-CPP_METHODDEF(void) wx_skip_input_data ( j_decompress_ptr cinfo, long num_bytes )
-{
-    if (num_bytes > 0)
-    {
-        wx_src_ptr src = (wx_src_ptr) cinfo->src;
-
-        while (num_bytes > (long)src->pub.bytes_in_buffer)
-        {
-            num_bytes -= (long) src->pub.bytes_in_buffer;
-            src->pub.fill_input_buffer(cinfo);
-        }
-        src->pub.next_input_byte += (size_t) num_bytes;
-        src->pub.bytes_in_buffer -= (size_t) num_bytes;
-    }
-}
-
-CPP_METHODDEF(void) wx_term_source ( j_decompress_ptr cinfo )
-{
-    wx_src_ptr src = (wx_src_ptr) cinfo->src;
-
-    if (src->pub.bytes_in_buffer > 0)
-        src->stream->SeekI(-(long)src->pub.bytes_in_buffer, wxFromCurrent);
-    delete[] src->buffer;
-}
-
-
-// JPEG error manager:
-
-struct wx_error_mgr : public jpeg_error_mgr
-{
-  jmp_buf setjmp_buffer;    /* for return to caller */
-};
-
-/*
- * Here's the routine that will replace the standard error_exit method:
- */
-
-CPP_METHODDEF(void) wx_error_exit (j_common_ptr cinfo)
-{
-  /* cinfo->err really points to a wx_error_mgr struct, so coerce pointer */
-  wx_error_mgr * const jerr = (wx_error_mgr *) cinfo->err;
-
-  /* Always display the message. */
-  /* We could postpone this until after returning, if we chose. */
-  (*cinfo->err->output_message) (cinfo);
-
-  /* Return control to the setjmp point */
-  longjmp(jerr->setjmp_buffer, 1);
-}
-
-/*
- * This will replace the standard output_message method when the user
- * wants us to be silent (verbose==false). We must have such method instead of
- * simply using NULL for cinfo->err->output_message because it's called
- * unconditionally from within libjpeg when there's "garbage input".
- */
-CPP_METHODDEF(void) wx_ignore_message (j_common_ptr WXUNUSED(cinfo))
-{
-}
-
-void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile )
-{
-    wx_src_ptr src;
-
-    if (cinfo->src == NULL) {    /* first time for this JPEG object? */
-        cinfo->src = (struct jpeg_source_mgr *)
-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-            sizeof(wx_source_mgr));
-    }
-    src = (wx_src_ptr) cinfo->src;
-    src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
-    src->buffer = new JOCTET[JPEG_IO_BUFFER_SIZE];
-    src->pub.next_input_byte = NULL; /* until buffer loaded */
-    src->stream = &infile;
-
-    src->pub.init_source = wx_init_source;
-    src->pub.fill_input_buffer = wx_fill_input_buffer;
-    src->pub.skip_input_data = wx_skip_input_data;
-    src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
-    src->pub.term_source = wx_term_source;
-}
-
-} // extern "C"
-
-static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk)
-{
-    register int k = 255 - cmyk[3];
-    register int k2 = cmyk[3];
-    register int c;
-
-    c = k + k2 * (255 - cmyk[0]) / 255;
-    rgb[0] = (unsigned char)((c > 255) ? 0 : (255 - c));
-
-    c = k + k2 * (255 - cmyk[1]) / 255;
-    rgb[1] = (unsigned char)((c > 255) ? 0 : (255 - c));
-
-    c = k + k2 * (255 - cmyk[2]) / 255;
-    rgb[2] = (unsigned char)((c > 255) ? 0 : (255 - c));
-}
-
-// temporarily disable the warning C4611 (interaction between '_setjmp' and
-// C++ object destruction is non-portable) - I don't see any dtors here
-#ifdef __VISUALC__
-    #pragma warning(disable:4611)
-#endif /* VC++ */
-
-bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
-{
-    wxCHECK_MSG( image, false, "NULL image pointer" );
-
-    struct jpeg_decompress_struct cinfo;
-    wx_error_mgr jerr;
-    unsigned char *ptr;
-
-    // save this before calling Destroy()
-    const unsigned maxWidth = image->GetOptionInt(wxIMAGE_OPTION_MAX_WIDTH),
-                   maxHeight = image->GetOptionInt(wxIMAGE_OPTION_MAX_HEIGHT);
-    image->Destroy();
-
-    cinfo.err = jpeg_std_error( &jerr );
-    jerr.error_exit = wx_error_exit;
-
-    if (!verbose)
-        cinfo.err->output_message = wx_ignore_message;
-
-    /* Establish the setjmp return context for wx_error_exit to use. */
-    if (setjmp(jerr.setjmp_buffer)) {
-      /* If we get here, the JPEG code has signaled an error.
-       * We need to clean up the JPEG object, close the input file, and return.
-       */
-      if (verbose)
-      {
-        wxLogError(_("JPEG: Couldn't load - file is probably corrupted."));
-      }
-      (cinfo.src->term_source)(&cinfo);
-      jpeg_destroy_decompress(&cinfo);
-      if (image->IsOk()) image->Destroy();
-      return false;
-    }
-
-    jpeg_create_decompress( &cinfo );
-    wx_jpeg_io_src( &cinfo, stream );
-    jpeg_read_header( &cinfo, TRUE );
-
-    int bytesPerPixel;
-    if ((cinfo.out_color_space == JCS_CMYK) || (cinfo.out_color_space == JCS_YCCK))
-    {
-        cinfo.out_color_space = JCS_CMYK;
-        bytesPerPixel = 4;
-    }
-    else // all the rest is treated as RGB
-    {
-        cinfo.out_color_space = JCS_RGB;
-        bytesPerPixel = 3;
-    }
-
-    // scale the picture to fit in the specified max size if necessary
-    if ( maxWidth > 0 || maxHeight > 0 )
-    {
-        unsigned& scale = cinfo.scale_denom;
-        while ( (maxWidth && (cinfo.image_width / scale > maxWidth)) ||
-                    (maxHeight && (cinfo.image_height / scale > maxHeight)) )
-        {
-            scale *= 2;
-        }
-    }
-
-    jpeg_start_decompress( &cinfo );
-
-    image->Create( cinfo.output_width, cinfo.output_height );
-    if (!image->IsOk()) {
-        jpeg_finish_decompress( &cinfo );
-        jpeg_destroy_decompress( &cinfo );
-        return false;
-    }
-    image->SetMask( false );
-    ptr = image->GetData();
-
-    unsigned stride = cinfo.output_width * bytesPerPixel;
-    JSAMPARRAY tempbuf = (*cinfo.mem->alloc_sarray)
-                            ((j_common_ptr) &cinfo, JPOOL_IMAGE, stride, 1 );
-
-    while ( cinfo.output_scanline < cinfo.output_height )
-    {
-        jpeg_read_scanlines( &cinfo, tempbuf, 1 );
-        if (cinfo.out_color_space == JCS_RGB)
-        {
-            memcpy( ptr, tempbuf[0], stride );
-            ptr += stride;
-        }
-        else // CMYK
-        {
-            const unsigned char* inptr = (const unsigned char*) tempbuf[0];
-            for (size_t i = 0; i < cinfo.output_width; i++)
-            {
-                wx_cmyk_to_rgb(ptr, inptr);
-                ptr += 3;
-                inptr += 4;
-            }
-        }
-    }
-
-    // set up resolution if available: it's part of optional JFIF APP0 chunk
-    if ( cinfo.saw_JFIF_marker )
-    {
-        image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, cinfo.X_density);
-        image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, cinfo.Y_density);
-
-        // we use the same values for this option as libjpeg so we don't need
-        // any conversion here
-        image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, cinfo.density_unit);
-    }
-
-    if ( cinfo.image_width != cinfo.output_width || cinfo.image_height != cinfo.output_height )
-    {
-        // save the original image size
-        image->SetOption(wxIMAGE_OPTION_ORIGINAL_WIDTH, cinfo.image_width);
-        image->SetOption(wxIMAGE_OPTION_ORIGINAL_HEIGHT, cinfo.image_height);
-    }
-
-    jpeg_finish_decompress( &cinfo );
-    jpeg_destroy_decompress( &cinfo );
-    return true;
-}
-
-typedef struct {
-    struct jpeg_destination_mgr pub;
-
-    wxOutputStream *stream;
-    JOCTET * buffer;
-} wx_destination_mgr;
-
-typedef wx_destination_mgr * wx_dest_ptr;
-
-#define OUTPUT_BUF_SIZE  4096    /* choose an efficiently fwrite'able size */
-
-extern "C"
-{
-
-CPP_METHODDEF(void) wx_init_destination (j_compress_ptr cinfo)
-{
-    wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest;
-
-    /* Allocate the output buffer --- it will be released when done with image */
-    dest->buffer = (JOCTET *)
-        (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-        OUTPUT_BUF_SIZE * sizeof(JOCTET));
-    dest->pub.next_output_byte = dest->buffer;
-    dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
-}
-
-CPP_METHODDEF(wxjpeg_boolean) wx_empty_output_buffer (j_compress_ptr cinfo)
-{
-    wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest;
-
-    dest->stream->Write(dest->buffer, OUTPUT_BUF_SIZE);
-    dest->pub.next_output_byte = dest->buffer;
-    dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
-    return TRUE;
-}
-
-CPP_METHODDEF(void) wx_term_destination (j_compress_ptr cinfo)
-{
-    wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest;
-    size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
-    /* Write any data remaining in the buffer */
-    if (datacount > 0)
-        dest->stream->Write(dest->buffer, datacount);
-}
-
-GLOBAL(void) wx_jpeg_io_dest (j_compress_ptr cinfo, wxOutputStream& outfile)
-{
-    wx_dest_ptr dest;
-
-    if (cinfo->dest == NULL) {    /* first time for this JPEG object? */
-        cinfo->dest = (struct jpeg_destination_mgr *)
-            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-            sizeof(wx_destination_mgr));
-    }
-
-    dest = (wx_dest_ptr) cinfo->dest;
-    dest->pub.init_destination = wx_init_destination;
-    dest->pub.empty_output_buffer = wx_empty_output_buffer;
-    dest->pub.term_destination = wx_term_destination;
-    dest->stream = &outfile;
-}
-
-} // extern "C"
-
-bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
-{
-    struct jpeg_compress_struct cinfo;
-    wx_error_mgr jerr;
-    JSAMPROW row_pointer[1];    /* pointer to JSAMPLE row[s] */
-    JSAMPLE *image_buffer;
-    int stride;                /* physical row width in image buffer */
-
-    cinfo.err = jpeg_std_error(&jerr);
-    jerr.error_exit = wx_error_exit;
-
-    if (!verbose)
-        cinfo.err->output_message = wx_ignore_message;
-
-    /* Establish the setjmp return context for wx_error_exit to use. */
-    if (setjmp(jerr.setjmp_buffer))
-    {
-        /* If we get here, the JPEG code has signaled an error.
-         * We need to clean up the JPEG object, close the input file, and return.
-         */
-         if (verbose)
-         {
-            wxLogError(_("JPEG: Couldn't save image."));
-         }
-         jpeg_destroy_compress(&cinfo);
-         return false;
-    }
-
-    jpeg_create_compress(&cinfo);
-    wx_jpeg_io_dest(&cinfo, stream);
-
-    cinfo.image_width = image->GetWidth();
-    cinfo.image_height = image->GetHeight();
-    cinfo.input_components = 3;
-    cinfo.in_color_space = JCS_RGB;
-    jpeg_set_defaults(&cinfo);
-
-    // TODO: 3rd parameter is force_baseline, what value should this be?
-    // Code says: "If force_baseline is TRUE, the computed quantization table entries
-    // are limited to 1..255 for JPEG baseline compatibility."
-    // 'Quality' is a number between 0 (terrible) and 100 (very good).
-    // The default (in jcparam.c, jpeg_set_defaults) is 75,
-    // and force_baseline is TRUE.
-    if (image->HasOption(wxIMAGE_OPTION_QUALITY))
-        jpeg_set_quality(&cinfo, image->GetOptionInt(wxIMAGE_OPTION_QUALITY), TRUE);
-
-    // set the resolution fields in the output file
-    int resX, resY;
-    wxImageResolution res = GetResolutionFromOptions(*image, &resX, &resY);
-    if ( res != wxIMAGE_RESOLUTION_NONE )
-    {
-        cinfo.X_density = resX;
-        cinfo.Y_density = resY;
-
-        // it so happens that wxIMAGE_RESOLUTION_INCHES/CM values are the same
-        // ones as used by libjpeg, so we can assign them directly
-        cinfo.density_unit = res;
-    }
-
-    jpeg_start_compress(&cinfo, TRUE);
-
-    stride = cinfo.image_width * 3;    /* JSAMPLEs per row in image_buffer */
-    image_buffer = image->GetData();
-    while (cinfo.next_scanline < cinfo.image_height) {
-        row_pointer[0] = &image_buffer[cinfo.next_scanline * stride];
-        jpeg_write_scanlines( &cinfo, row_pointer, 1 );
-    }
-    jpeg_finish_compress(&cinfo);
-    jpeg_destroy_compress(&cinfo);
-
-    return true;
-}
-
-#ifdef __VISUALC__
-    #pragma warning(default:4611)
-#endif /* VC++ */
-
-bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
-{
-    unsigned char hdr[2];
-
-    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here
-        return false;
-
-    return hdr[0] == 0xFF && hdr[1] == 0xD8;
-}
-
-#endif   // wxUSE_STREAMS
-
-/*static*/ wxVersionInfo wxJPEGHandler::GetLibraryVersionInfo()
-{
-    return wxVersionInfo("libjpeg", JPEG_LIB_VERSION/10, JPEG_LIB_VERSION%10);
-}
-
-#endif   // wxUSE_LIBJPEG
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagjpeg.cpp
+// Purpose:     wxImage JPEG handler
+// Author:      Vaclav Slavik
+// RCS-ID:      $Id: imagjpeg.cpp 43781 2006-12-03 21:59:47Z MW $
+// Copyright:   (c) Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_LIBJPEG
+
+#include "wx/imagjpeg.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/module.h"
+#endif
+
+// A hack based on one from tif_jpeg.c to overcome the problem on Windows
+// of rpcndr.h defining boolean with a different type to the jpeg headers.
+// 
+// This hack is only necessary for an external jpeg library, the builtin one
+// usually used on Windows doesn't use the type boolean, so always works.
+//
+#ifdef wxHACK_BOOLEAN
+    #define HAVE_BOOLEAN
+    #define boolean wxHACK_BOOLEAN
+#endif
+
+extern "C"
+{
+    #if defined(__WXMSW__)
+        #define XMD_H
+    #endif
+    #include "jpeglib.h"
+}
+
+#ifndef HAVE_WXJPEG_BOOLEAN
+typedef boolean wxjpeg_boolean;
+#endif
+
+#include "wx/filefn.h"
+#include "wx/wfstream.h"
+
+// For memcpy
+#include <string.h>
+// For JPEG library error handling
+#include <setjmp.h>
+
+#ifdef __SALFORDC__
+#undef FAR
+#endif
+
+// ----------------------------------------------------------------------------
+// types
+// ----------------------------------------------------------------------------
+
+// the standard definition of METHODDEF(type) from jmorecfg.h is "static type"
+// which means that we can't declare the method functions as extern "C" - the
+// compiler (rightfully) complains about the multiple storage classes in
+// declaration
+//
+// so we only add extern "C" when using our own, modified, jmorecfg.h - and use
+// whatever we have in the system headers if this is what we use hoping that it
+// should be ok (can't do anything else)
+#ifdef JPEG_METHOD_LINKAGE
+    #define CPP_METHODDEF(type) extern "C" METHODDEF(type)
+#else // not using our jmorecfg.h header
+    #define CPP_METHODDEF(type) METHODDEF(type)
+#endif
+
+//-----------------------------------------------------------------------------
+// wxJPEGHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxJPEGHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+//------------- JPEG Data Source Manager
+
+#define JPEG_IO_BUFFER_SIZE   2048
+
+typedef struct {
+    struct jpeg_source_mgr pub;   /* public fields */
+
+    JOCTET* buffer;               /* start of buffer */
+    wxInputStream *stream;
+} wx_source_mgr;
+
+typedef wx_source_mgr * wx_src_ptr;
+
+CPP_METHODDEF(void) wx_init_source ( j_decompress_ptr WXUNUSED(cinfo) )
+{
+}
+
+CPP_METHODDEF(wxjpeg_boolean) wx_fill_input_buffer ( j_decompress_ptr cinfo )
+{
+    wx_src_ptr src = (wx_src_ptr) cinfo->src;
+
+    src->pub.next_input_byte = src->buffer;
+    src->pub.bytes_in_buffer = src->stream->Read(src->buffer, JPEG_IO_BUFFER_SIZE).LastRead();
+
+    if (src->pub.bytes_in_buffer == 0) // check for end-of-stream
+    {
+        // Insert a fake EOI marker
+        src->buffer[0] = 0xFF;
+        src->buffer[1] = JPEG_EOI;
+        src->pub.bytes_in_buffer = 2;
+    }
+    return TRUE;
+}
+
+CPP_METHODDEF(void) wx_skip_input_data ( j_decompress_ptr cinfo, long num_bytes )
+{
+    if (num_bytes > 0)
+    {
+        wx_src_ptr src = (wx_src_ptr) cinfo->src;
+
+        while (num_bytes > (long)src->pub.bytes_in_buffer)
+        {
+            num_bytes -= (long) src->pub.bytes_in_buffer;
+            src->pub.fill_input_buffer(cinfo);
+        }
+        src->pub.next_input_byte += (size_t) num_bytes;
+        src->pub.bytes_in_buffer -= (size_t) num_bytes;
+    }
+}
+
+CPP_METHODDEF(void) wx_term_source ( j_decompress_ptr cinfo )
+{
+    wx_src_ptr src = (wx_src_ptr) cinfo->src;
+
+    if (src->pub.bytes_in_buffer > 0)
+        src->stream->SeekI(-(long)src->pub.bytes_in_buffer, wxFromCurrent);
+    delete[] src->buffer;
+}
+
+
+// JPEG error manager:
+
+struct wx_error_mgr {
+  struct jpeg_error_mgr pub;    /* "public" fields */
+
+  jmp_buf setjmp_buffer;    /* for return to caller */
+};
+
+typedef struct wx_error_mgr * wx_error_ptr;
+
+/*
+ * Here's the routine that will replace the standard error_exit method:
+ */
+
+CPP_METHODDEF(void) wx_error_exit (j_common_ptr cinfo)
+{
+  /* cinfo->err really points to a wx_error_mgr struct, so coerce pointer */
+  wx_error_ptr myerr = (wx_error_ptr) cinfo->err;
+
+  /* Always display the message. */
+  /* We could postpone this until after returning, if we chose. */
+  (*cinfo->err->output_message) (cinfo);
+
+  /* Return control to the setjmp point */
+  longjmp(myerr->setjmp_buffer, 1);
+}
+
+/*
+ * This will replace the standard output_message method when the user
+ * wants us to be silent (verbose==false). We must have such method instead of
+ * simply using NULL for cinfo->err->output_message because it's called
+ * unconditionally from within libjpeg when there's "garbage input".
+ */
+CPP_METHODDEF(void) wx_ignore_message (j_common_ptr WXUNUSED(cinfo))
+{
+}
+
+void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile )
+{
+    wx_src_ptr src;
+
+    if (cinfo->src == NULL) {    /* first time for this JPEG object? */
+        cinfo->src = (struct jpeg_source_mgr *)
+            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+            sizeof(wx_source_mgr));
+    }
+    src = (wx_src_ptr) cinfo->src;
+    src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
+    src->buffer = new JOCTET[JPEG_IO_BUFFER_SIZE];
+    src->pub.next_input_byte = NULL; /* until buffer loaded */
+    src->stream = &infile;
+
+    src->pub.init_source = wx_init_source;
+    src->pub.fill_input_buffer = wx_fill_input_buffer;
+    src->pub.skip_input_data = wx_skip_input_data;
+    src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+    src->pub.term_source = wx_term_source;
+}
+
+static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk)
+{
+    register int k = 255 - cmyk[3];
+    register int k2 = cmyk[3];
+    register int c;
+
+    c = k + k2 * (255 - cmyk[0]) / 255;
+    rgb[0] = (unsigned char)((c > 255) ? 0 : (255 - c));
+
+    c = k + k2 * (255 - cmyk[1]) / 255;
+    rgb[1] = (unsigned char)((c > 255) ? 0 : (255 - c));
+
+    c = k + k2 * (255 - cmyk[2]) / 255;
+    rgb[2] = (unsigned char)((c > 255) ? 0 : (255 - c));
+}
+
+// temporarily disable the warning C4611 (interaction between '_setjmp' and
+// C++ object destruction is non-portable) - I don't see any dtors here
+#ifdef __VISUALC__
+    #pragma warning(disable:4611)
+#endif /* VC++ */
+
+bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
+{
+    struct jpeg_decompress_struct cinfo;
+    struct wx_error_mgr jerr;
+    unsigned char *ptr;
+
+    image->Destroy();
+    cinfo.err = jpeg_std_error( &jerr.pub );
+    jerr.pub.error_exit = wx_error_exit;
+
+    if (!verbose)
+        cinfo.err->output_message = wx_ignore_message;
+
+    /* Establish the setjmp return context for wx_error_exit to use. */
+    if (setjmp(jerr.setjmp_buffer)) {
+      /* If we get here, the JPEG code has signaled an error.
+       * We need to clean up the JPEG object, close the input file, and return.
+       */
+      if (verbose)
+        wxLogError(_("JPEG: Couldn't load - file is probably corrupted."));
+      (cinfo.src->term_source)(&cinfo);
+      jpeg_destroy_decompress(&cinfo);
+      if (image->Ok()) image->Destroy();
+      return false;
+    }
+
+    jpeg_create_decompress( &cinfo );
+    wx_jpeg_io_src( &cinfo, stream );
+    jpeg_read_header( &cinfo, TRUE );
+
+    int bytesPerPixel;
+    if ((cinfo.out_color_space == JCS_CMYK) || (cinfo.out_color_space == JCS_YCCK))
+    {
+        cinfo.out_color_space = JCS_CMYK;
+        bytesPerPixel = 4;
+    }
+    else // all the rest is treated as RGB
+    {
+        cinfo.out_color_space = JCS_RGB;
+        bytesPerPixel = 3;
+    }
+
+    jpeg_start_decompress( &cinfo );
+
+    image->Create( cinfo.image_width, cinfo.image_height );
+    if (!image->Ok()) {
+        jpeg_finish_decompress( &cinfo );
+        jpeg_destroy_decompress( &cinfo );
+        return false;
+    }
+    image->SetMask( false );
+    ptr = image->GetData();
+
+    unsigned stride = cinfo.output_width * bytesPerPixel;
+    JSAMPARRAY tempbuf = (*cinfo.mem->alloc_sarray)
+                            ((j_common_ptr) &cinfo, JPOOL_IMAGE, stride, 1 );
+
+    while ( cinfo.output_scanline < cinfo.output_height )
+    {
+        jpeg_read_scanlines( &cinfo, tempbuf, 1 );
+        if (cinfo.out_color_space == JCS_RGB)
+        {
+            memcpy( ptr, tempbuf[0], stride );
+            ptr += stride;
+        }
+        else // CMYK
+        {
+            const unsigned char* inptr = (const unsigned char*) tempbuf[0];
+            for (size_t i = 0; i < cinfo.output_width; i++)
+            {
+                wx_cmyk_to_rgb(ptr, inptr);
+                ptr += 3;
+                inptr += 4;
+            }
+        }
+    }
+
+    jpeg_finish_decompress( &cinfo );
+    jpeg_destroy_decompress( &cinfo );
+    return true;
+}
+
+typedef struct {
+    struct jpeg_destination_mgr pub;
+
+    wxOutputStream *stream;
+    JOCTET * buffer;
+} wx_destination_mgr;
+
+typedef wx_destination_mgr * wx_dest_ptr;
+
+#define OUTPUT_BUF_SIZE  4096    /* choose an efficiently fwrite'able size */
+
+CPP_METHODDEF(void) wx_init_destination (j_compress_ptr cinfo)
+{
+    wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest;
+
+    /* Allocate the output buffer --- it will be released when done with image */
+    dest->buffer = (JOCTET *)
+        (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+        OUTPUT_BUF_SIZE * sizeof(JOCTET));
+    dest->pub.next_output_byte = dest->buffer;
+    dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+}
+
+CPP_METHODDEF(wxjpeg_boolean) wx_empty_output_buffer (j_compress_ptr cinfo)
+{
+    wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest;
+
+    dest->stream->Write(dest->buffer, OUTPUT_BUF_SIZE);
+    dest->pub.next_output_byte = dest->buffer;
+    dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+    return TRUE;
+}
+
+CPP_METHODDEF(void) wx_term_destination (j_compress_ptr cinfo)
+{
+    wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest;
+    size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
+    /* Write any data remaining in the buffer */
+    if (datacount > 0)
+        dest->stream->Write(dest->buffer, datacount);
+}
+
+GLOBAL(void) wx_jpeg_io_dest (j_compress_ptr cinfo, wxOutputStream& outfile)
+{
+    wx_dest_ptr dest;
+
+    if (cinfo->dest == NULL) {    /* first time for this JPEG object? */
+        cinfo->dest = (struct jpeg_destination_mgr *)
+            (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+            sizeof(wx_destination_mgr));
+    }
+
+    dest = (wx_dest_ptr) cinfo->dest;
+    dest->pub.init_destination = wx_init_destination;
+    dest->pub.empty_output_buffer = wx_empty_output_buffer;
+    dest->pub.term_destination = wx_term_destination;
+    dest->stream = &outfile;
+}
+
+bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
+{
+    struct jpeg_compress_struct cinfo;
+    struct wx_error_mgr jerr;
+    JSAMPROW row_pointer[1];    /* pointer to JSAMPLE row[s] */
+    JSAMPLE *image_buffer;
+    int stride;                /* physical row width in image buffer */
+
+    cinfo.err = jpeg_std_error(&jerr.pub);
+    jerr.pub.error_exit = wx_error_exit;
+
+    if (!verbose)
+        cinfo.err->output_message = wx_ignore_message;
+
+    /* Establish the setjmp return context for wx_error_exit to use. */
+    if (setjmp(jerr.setjmp_buffer))
+    {
+        /* If we get here, the JPEG code has signaled an error.
+         * We need to clean up the JPEG object, close the input file, and return.
+         */
+         if (verbose)
+            wxLogError(_("JPEG: Couldn't save image."));
+         jpeg_destroy_compress(&cinfo);
+         return false;
+    }
+
+    jpeg_create_compress(&cinfo);
+    wx_jpeg_io_dest(&cinfo, stream);
+
+    cinfo.image_width = image->GetWidth();
+    cinfo.image_height = image->GetHeight();
+    cinfo.input_components = 3;
+    cinfo.in_color_space = JCS_RGB;
+    jpeg_set_defaults(&cinfo);
+
+    // TODO: 3rd parameter is force_baseline, what value should this be?
+    // Code says: "If force_baseline is TRUE, the computed quantization table entries
+    // are limited to 1..255 for JPEG baseline compatibility."
+    // 'Quality' is a number between 0 (terrible) and 100 (very good).
+    // The default (in jcparam.c, jpeg_set_defaults) is 75,
+    // and force_baseline is TRUE.
+    if (image->HasOption(wxIMAGE_OPTION_QUALITY))
+        jpeg_set_quality(&cinfo, image->GetOptionInt(wxIMAGE_OPTION_QUALITY), TRUE);
+
+    // set the resolution fields in the output file
+    UINT16 resX,
+           resY;
+    if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
+         image->HasOption(wxIMAGE_OPTION_RESOLUTIONY) )
+    {
+        resX = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX);
+        resY = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY);
+    }
+    else if ( image->HasOption(wxIMAGE_OPTION_RESOLUTION) )
+    {
+        resX =
+        resY = (UINT16)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTION);
+    }
+    else
+    {
+        resX =
+        resY = 0;
+    }
+
+    if ( resX && resY )
+    {
+        cinfo.X_density = resX;
+        cinfo.Y_density = resY;
+    }
+
+    // sets the resolution unit field in the output file
+    // wxIMAGE_RESOLUTION_INCHES for inches
+    // wxIMAGE_RESOLUTION_CM for centimeters
+    if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONUNIT) )
+    {
+        cinfo.density_unit = (UINT8)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT);
+    }
+
+    jpeg_start_compress(&cinfo, TRUE);
+
+    stride = cinfo.image_width * 3;    /* JSAMPLEs per row in image_buffer */
+    image_buffer = image->GetData();
+    while (cinfo.next_scanline < cinfo.image_height) {
+        row_pointer[0] = &image_buffer[cinfo.next_scanline * stride];
+        jpeg_write_scanlines( &cinfo, row_pointer, 1 );
+    }
+    jpeg_finish_compress(&cinfo);
+    jpeg_destroy_compress(&cinfo);
+
+    return true;
+}
+
+#ifdef __VISUALC__
+    #pragma warning(default:4611)
+#endif /* VC++ */
+
+bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[2];
+
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return false;
+
+    return hdr[0] == 0xFF && hdr[1] == 0xD8;
+}
+
+#endif   // wxUSE_STREAMS
+
+#endif   // wxUSE_LIBJPEG
diff --git a/Source/3rd Party/wx/src/common/imagpcx.cpp b/Source/3rd Party/wx/src/common/imagpcx.cpp
index a892a4bfa..d77be9b83 100644
--- a/Source/3rd Party/wx/src/common/imagpcx.cpp	
+++ b/Source/3rd Party/wx/src/common/imagpcx.cpp	
@@ -1,502 +1,500 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagpcx.cpp
-// Purpose:     wxImage PCX handler
-// Author:      Guillermo Rodriguez Garcia <guille@iies.es>
-// Version:     1.1
-// CVS-ID:      $Id$
-// Copyright:   (c) 1999 Guillermo Rodriguez Garcia
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && wxUSE_PCX
-
-#ifndef WX_PRECOMP
-    #include "wx/object.h"
-    #include "wx/list.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/palette.h"
-    #include "wx/hash.h"
-    #include "wx/module.h"
-#endif
-
-#include "wx/imagpcx.h"
-#include "wx/wfstream.h"
-
-//-----------------------------------------------------------------------------
-// wxPCXHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
-
-#if wxUSE_STREAMS
-
-//-----------------------------------------------------------------------------
-// RLE encoding and decoding
-//-----------------------------------------------------------------------------
-
-void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)
-{
-    unsigned int data, last, cont;
-
-    // Write 'size' bytes. The PCX official specs say there will be
-    // a decoding break at the end of each scanline, so in order to
-    // force this decoding break use this function to write, at most,
-    // _one_ complete scanline at a time.
-
-    last = (unsigned char) *(p++);
-    cont = 1;
-    size--;
-
-    while (size-- > 0)
-    {
-        data = (unsigned char) *(p++);
-
-        // Up to 63 bytes with the same value can be stored using
-        // a single { cont, value } pair.
-        //
-        if ((data == last) && (cont < 63))
-        {
-            cont++;
-        }
-        else
-        {
-            // need to write a 'counter' byte?
-            if ((cont > 1) || ((last & 0xC0) == 0xC0))
-                s.PutC((char) (cont | 0xC0));
-
-            s.PutC((char) last);
-            last = data;
-            cont = 1;
-        }
-    }
-
-    // write the last one and return;
-    if ((cont > 1) || ((last & 0xC0) == 0xC0))
-        s.PutC((char) (cont | 0xC0));
-
-    s.PutC((char) last);
-}
-
-void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
-{
-    // Read 'size' bytes. The PCX official specs say there will be
-    // a decoding break at the end of each scanline (but not at the
-    // end of each plane inside a scanline). Only use this function
-    // to read one or more _complete_ scanlines. Else, more than
-    // 'size' bytes might be read and the buffer might overflow.
-
-    while (size != 0)
-    {
-        unsigned int data = (unsigned char)s.GetC();
-
-        // If ((data & 0xC0) != 0xC0), then the value read is a data
-        // byte. Else, it is a counter (cont = val & 0x3F) and the
-        // next byte is the data byte.
-
-        if ((data & 0xC0) != 0xC0)
-        {
-            *(p++) = (unsigned char)data;
-            size--;
-        }
-        else
-        {
-            unsigned int cont = data & 0x3F;
-            if (cont > size) // can happen only if the file is malformed
-                break;
-            data = (unsigned char)s.GetC();
-            for (unsigned int i = 1; i <= cont; i++)
-                *(p++) = (unsigned char)data;
-            size -= cont;
-        }
-    }
-}
-
-
-//-----------------------------------------------------------------------------
-// PCX reading and saving
-//-----------------------------------------------------------------------------
-
-// PCX header
-#define HDR_MANUFACTURER    0
-#define HDR_VERSION         1
-#define HDR_ENCODING        2
-#define HDR_BITSPERPIXEL    3
-#define HDR_XMIN            4
-#define HDR_YMIN            6
-#define HDR_XMAX            8
-#define HDR_YMAX            10
-#define HDR_NPLANES         65
-#define HDR_BYTESPERLINE    66
-#define HDR_PALETTEINFO     68
-
-// image formats
-enum {
-    wxPCX_8BIT,             // 8 bpp, 1 plane (8 bit)
-    wxPCX_24BIT             // 8 bpp, 3 planes (24 bit)
-};
-
-// error codes
-enum {
-    wxPCX_OK = 0,           // everything was OK
-    wxPCX_INVFORMAT = 1,    // error in pcx file format
-    wxPCX_MEMERR = 2,       // error allocating memory
-    wxPCX_VERERR = 3        // error in pcx version number
-};
-
-
-// ReadPCX:
-//  Loads a PCX file into the wxImage object pointed by image.
-//  Returns wxPCX_OK on success, or an error code otherwise
-//  (see above for error codes)
-//
-int ReadPCX(wxImage *image, wxInputStream& stream)
-{
-    unsigned char hdr[128];         // PCX header
-    unsigned char pal[768];         // palette for 8 bit images
-    unsigned char *p;               // space to store one scanline
-    unsigned char *dst;             // pointer into wxImage data
-    unsigned int width, height;     // size of the image
-    unsigned int bytesperline;      // bytes per line (each plane)
-    int bitsperpixel;               // bits per pixel (each plane)
-    int nplanes;                    // number of planes
-    int encoding;                   // is the image RLE encoded?
-    int format;                     // image format (8 bit, 24 bit)
-    unsigned int i, j;
-
-    // Read PCX header and check the version number (it must
-    // be at least 5 or higher for 8 bit and 24 bit images).
-
-    stream.Read(hdr, 128);
-
-    if (hdr[HDR_VERSION] < 5) return wxPCX_VERERR;
-
-    // Extract all image info from the PCX header.
-
-    encoding     = hdr[HDR_ENCODING];
-    nplanes      = hdr[HDR_NPLANES];
-    bitsperpixel = hdr[HDR_BITSPERPIXEL];
-    bytesperline = hdr[HDR_BYTESPERLINE] + 256 * hdr[HDR_BYTESPERLINE + 1];
-    width        = (hdr[HDR_XMAX] + 256 * hdr[HDR_XMAX + 1]) -
-                   (hdr[HDR_XMIN] + 256 * hdr[HDR_XMIN + 1]) + 1;
-    height       = (hdr[HDR_YMAX] + 256 * hdr[HDR_YMAX + 1]) -
-                   (hdr[HDR_YMIN] + 256 * hdr[HDR_YMIN + 1]) + 1;
-
-    // Check image format. Currently supported formats are
-    // 8 bits (8 bpp, 1 plane) and 24 bits (8 bpp, 3 planes).
-
-    if ((nplanes == 3) && (bitsperpixel == 8))
-        format = wxPCX_24BIT;
-    else if ((nplanes == 1) && (bitsperpixel == 8))
-        format = wxPCX_8BIT;
-    else
-        return wxPCX_INVFORMAT;
-
-    // If the image is of type wxPCX_8BIT, then there is
-    // a palette at the end of the image data. If we were
-    // working with a file, we could seek at the end to the
-    // end (SeekI(-769, wxFromEnd) and read the palette
-    // before proceeding. Unfortunately, this would prevent
-    // loading several PCXs in a single stream, so we can't
-    // do it. Thus, 8-bit images will have to be decoded in
-    // two passes: one to read and decode the image data,
-    // and another to replace 'colour indexes' with RGB
-    // values.
-
-    // Resize the image and allocate memory for a scanline.
-
-    image->Create(width, height);
-
-    if (!image->IsOk())
-        return wxPCX_MEMERR;
-
-    if ((p = (unsigned char *) malloc(bytesperline * nplanes)) == NULL)
-        return wxPCX_MEMERR;
-
-    // Now start reading the file, line by line, and store
-    // the data in the format required by wxImage.
-
-    dst = image->GetData();
-
-    for (j = height; j; j--)
-    {
-        if (encoding)
-            RLEdecode(p, bytesperline * nplanes, stream);
-        else
-            stream.Read(p, bytesperline * nplanes);
-
-        switch (format)
-        {
-            case wxPCX_8BIT:
-            {
-                for (i = 0; i < width; i++)
-                {
-                    // first pass, just store the colour index
-                    *dst = p[i];
-                    dst += 3;
-                }
-                break;
-            }
-            case wxPCX_24BIT:
-            {
-                for (i = 0; i < width; i++)
-                {
-                    *(dst++) = p[i];
-                    *(dst++) = p[i + bytesperline];
-                    *(dst++) = p[i + 2 * bytesperline];
-                }
-                break;
-            }
-        }
-    }
-
-    free(p);
-
-    // For 8 bit images, we read the palette, and then do a second
-    // pass replacing indexes with their RGB values;
-
-    if (format == wxPCX_8BIT)
-    {
-        unsigned char index;
-
-        if (stream.GetC() != 12)
-            return wxPCX_INVFORMAT;
-
-        stream.Read(pal, 768);
-
-        p = image->GetData();
-        for (unsigned long k = height * width; k; k--)
-        {
-            index = *p;
-            *(p++) = pal[3 * index];
-            *(p++) = pal[3 * index + 1];
-            *(p++) = pal[3 * index + 2];
-        }
-
-#if wxUSE_PALETTE
-        unsigned char r[256];
-        unsigned char g[256];
-        unsigned char b[256];
-        for (i = 0; i < 256; i++)
-        {
-            r[i] = pal[3*i + 0];
-            g[i] = pal[3*i + 1];
-            b[i] = pal[3*i + 2];
-        }
-        image->SetPalette(wxPalette(256, r, g, b));
-#endif // wxUSE_PALETTE
-    }
-
-    return wxPCX_OK;
-}
-
-// SavePCX:
-//  Saves a PCX file into the wxImage object pointed by image.
-//  Returns wxPCX_OK on success, or an error code otherwise
-//  (see above for error codes). Will try to save as 8-bit
-//  PCX if possible, and then fall back to 24-bit if there
-//  are more than 256 different colours.
-//
-int SavePCX(wxImage *image, wxOutputStream& stream)
-{
-    unsigned char hdr[128];         // PCX header
-    unsigned char pal[768];         // palette for 8 bit images
-    unsigned char *p;               // space to store one scanline
-    unsigned char *src;             // pointer into wxImage data
-    unsigned int width, height;     // size of the image
-    unsigned int bytesperline;      // bytes per line (each plane)
-    unsigned char nplanes = 3;      // number of planes
-    int format = wxPCX_24BIT;       // image format (8 bit, 24 bit)
-    wxImageHistogram histogram;     // image histogram
-    unsigned long key;              // key in the hashtable
-    unsigned int i;
-
-    // See if we can save as 8 bit.
-
-    if (image->CountColours(256) <= 256)
-    {
-        image->ComputeHistogram(histogram);
-        format = wxPCX_8BIT;
-        nplanes = 1;
-    }
-
-    // Get image dimensions, calculate bytesperline (must be even,
-    // according to PCX specs) and allocate space for one complete
-    // scanline.
-
-    if (!image->IsOk())
-        return wxPCX_INVFORMAT;
-
-    width = image->GetWidth();
-    height = image->GetHeight();
-    bytesperline = width;
-    if (bytesperline % 2)
-        bytesperline++;
-
-    if ((p = (unsigned char *) malloc(bytesperline * nplanes)) == NULL)
-        return wxPCX_MEMERR;
-
-    // Build header data and write it to the stream. Initially,
-    // set all bytes to zero (most values default to zero).
-
-    memset(hdr, 0, sizeof(hdr));
-
-    hdr[HDR_MANUFACTURER]     = 10;
-    hdr[HDR_VERSION]          = 5;
-    hdr[HDR_ENCODING]         = 1;
-    hdr[HDR_NPLANES]          = nplanes;
-    hdr[HDR_BITSPERPIXEL]     = 8;
-    hdr[HDR_BYTESPERLINE]     = (unsigned char)(bytesperline % 256);
-    hdr[HDR_BYTESPERLINE + 1] = (unsigned char)(bytesperline / 256);
-    hdr[HDR_XMAX]             = (unsigned char)((width - 1)  % 256);
-    hdr[HDR_XMAX + 1]         = (unsigned char)((width - 1)  / 256);
-    hdr[HDR_YMAX]             = (unsigned char)((height - 1) % 256);
-    hdr[HDR_YMAX + 1]         = (unsigned char)((height - 1) / 256);
-    hdr[HDR_PALETTEINFO]      = 1;
-
-    stream.Write(hdr, 128);
-
-    // Encode image data line by line and write it to the stream
-
-    src = image->GetData();
-
-    for (; height; height--)
-    {
-        switch (format)
-        {
-            case wxPCX_8BIT:
-            {
-                unsigned char r, g, b;
-
-                for (i = 0; i < width; i++)
-                {
-                    r = *(src++);
-                    g = *(src++);
-                    b = *(src++);
-                    key = (r << 16) | (g << 8) | b;
-
-                    p[i] = (unsigned char)histogram[key].index;
-                }
-                break;
-            }
-            case wxPCX_24BIT:
-            {
-                for (i = 0; i < width; i++)
-                {
-                    p[i] = *(src++);
-                    p[i + bytesperline] = *(src++);
-                    p[i + 2 * bytesperline] = *(src++);
-                }
-                break;
-            }
-        }
-
-        RLEencode(p, bytesperline * nplanes, stream);
-    }
-
-    free(p);
-
-    // For 8 bit images, build the palette and write it to the stream:
-    if (format == wxPCX_8BIT)
-    {
-        // zero unused colours
-        memset(pal, 0, sizeof(pal));
-
-        unsigned long index;
-
-        for (wxImageHistogram::iterator entry = histogram.begin();
-             entry != histogram.end(); ++entry )
-        {
-            key = entry->first;
-            index = entry->second.index;
-            pal[3 * index]     = (unsigned char)(key >> 16);
-            pal[3 * index + 1] = (unsigned char)(key >> 8);
-            pal[3 * index + 2] = (unsigned char)(key);
-        }
-
-        stream.PutC(12);
-        stream.Write(pal, 768);
-    }
-
-    return wxPCX_OK;
-}
-
-//-----------------------------------------------------------------------------
-// wxPCXHandler
-//-----------------------------------------------------------------------------
-
-bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
-{
-    int error;
-
-    if (!CanRead(stream))
-    {
-        if (verbose)
-        {
-            wxLogError(_("PCX: this is not a PCX file."));
-        }
-
-        return false;
-    }
-
-    image->Destroy();
-
-    if ((error = ReadPCX(image, stream)) != wxPCX_OK)
-    {
-        if (verbose)
-        {
-            switch (error)
-            {
-                case wxPCX_INVFORMAT: wxLogError(_("PCX: image format unsupported")); break;
-                case wxPCX_MEMERR:    wxLogError(_("PCX: couldn't allocate memory")); break;
-                case wxPCX_VERERR:    wxLogError(_("PCX: version number too low")); break;
-                default:              wxLogError(_("PCX: unknown error !!!"));
-            }
-        }
-        image->Destroy();
-        return false;
-    }
-
-    return true;
-}
-
-bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
-{
-    int error;
-
-    if ((error = SavePCX(image, stream)) != wxPCX_OK)
-    {
-        if (verbose)
-        {
-            switch (error)
-            {
-                case wxPCX_INVFORMAT: wxLogError(_("PCX: invalid image")); break;
-                case wxPCX_MEMERR:    wxLogError(_("PCX: couldn't allocate memory")); break;
-                default:              wxLogError(_("PCX: unknown error !!!"));
-            }
-        }
-    }
-
-    return (error == wxPCX_OK);
-}
-
-bool wxPCXHandler::DoCanRead( wxInputStream& stream )
-{
-    unsigned char c = stream.GetC();     // it's ok to modify the stream position here
-    if ( !stream )
-        return false;
-
-    // not very safe, but this is all we can get from PCX header :-(
-    return c == 10;
-}
-
-#endif // wxUSE_STREAMS
-
-#endif // wxUSE_IMAGE && wxUSE_PCX
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagpcx.cpp
+// Purpose:     wxImage PCX handler
+// Author:      Guillermo Rodriguez Garcia <guille@iies.es>
+// Version:     1.1
+// CVS-ID:      $Id: imagpcx.cpp 54766 2008-07-22 20:16:03Z VZ $
+// Copyright:   (c) 1999 Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_PCX
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/list.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/palette.h"
+    #include "wx/hash.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/imagpcx.h"
+#include "wx/wfstream.h"
+
+//-----------------------------------------------------------------------------
+// wxPCXHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+//-----------------------------------------------------------------------------
+// RLE encoding and decoding
+//-----------------------------------------------------------------------------
+
+void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)
+{
+    unsigned int data, last, cont;
+
+    // Write 'size' bytes. The PCX official specs say there will be
+    // a decoding break at the end of each scanline, so in order to
+    // force this decoding break use this function to write, at most,
+    // _one_ complete scanline at a time.
+
+    last = (unsigned char) *(p++);
+    cont = 1;
+    size--;
+
+    while (size-- > 0)
+    {
+        data = (unsigned char) *(p++);
+
+        // Up to 63 bytes with the same value can be stored using
+        // a single { cont, value } pair.
+        //
+        if ((data == last) && (cont < 63))
+        {
+            cont++;
+        }
+        else
+        {
+            // need to write a 'counter' byte?
+            if ((cont > 1) || ((last & 0xC0) == 0xC0))
+                s.PutC((char) (cont | 0xC0));
+
+            s.PutC((char) last);
+            last = data;
+            cont = 1;
+        }
+    }
+
+    // write the last one and return;
+    if ((cont > 1) || ((last & 0xC0) == 0xC0))
+        s.PutC((char) (cont | 0xC0));
+
+    s.PutC((char) last);
+}
+
+void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
+{
+    // Read 'size' bytes. The PCX official specs say there will be
+    // a decoding break at the end of each scanline (but not at the
+    // end of each plane inside a scanline). Only use this function
+    // to read one or more _complete_ scanlines. Else, more than
+    // 'size' bytes might be read and the buffer might overflow.
+
+    while (size != 0)
+    {
+        unsigned int data = (unsigned char)s.GetC();
+
+        // If ((data & 0xC0) != 0xC0), then the value read is a data
+        // byte. Else, it is a counter (cont = val & 0x3F) and the
+        // next byte is the data byte.
+
+        if ((data & 0xC0) != 0xC0)
+        {
+            *(p++) = (unsigned char)data;
+            size--;
+        }
+        else
+        {
+            unsigned int cont = data & 0x3F;
+            if (cont > size) // can happen only if the file is malformed
+                break;
+            data = (unsigned char)s.GetC();
+            for (unsigned int i = 1; i <= cont; i++)
+                *(p++) = (unsigned char)data;
+            size -= cont;
+        }
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+// PCX reading and saving
+//-----------------------------------------------------------------------------
+
+// PCX header
+#define HDR_MANUFACTURER    0
+#define HDR_VERSION         1
+#define HDR_ENCODING        2
+#define HDR_BITSPERPIXEL    3
+#define HDR_XMIN            4
+#define HDR_YMIN            6
+#define HDR_XMAX            8
+#define HDR_YMAX            10
+#define HDR_NPLANES         65
+#define HDR_BYTESPERLINE    66
+#define HDR_PALETTEINFO     68
+
+// image formats
+enum {
+    wxPCX_8BIT,             // 8 bpp, 1 plane (8 bit)
+    wxPCX_24BIT             // 8 bpp, 3 planes (24 bit)
+};
+
+// error codes
+enum {
+    wxPCX_OK = 0,           // everything was OK
+    wxPCX_INVFORMAT = 1,    // error in pcx file format
+    wxPCX_MEMERR = 2,       // error allocating memory
+    wxPCX_VERERR = 3        // error in pcx version number
+};
+
+
+// ReadPCX:
+//  Loads a PCX file into the wxImage object pointed by image.
+//  Returns wxPCX_OK on success, or an error code otherwise
+//  (see above for error codes)
+//
+int ReadPCX(wxImage *image, wxInputStream& stream)
+{
+    unsigned char hdr[128];         // PCX header
+    unsigned char pal[768];         // palette for 8 bit images
+    unsigned char *p;               // space to store one scanline
+    unsigned char *dst;             // pointer into wxImage data
+    unsigned int width, height;     // size of the image
+    unsigned int bytesperline;      // bytes per line (each plane)
+    int bitsperpixel;               // bits per pixel (each plane)
+    int nplanes;                    // number of planes
+    int encoding;                   // is the image RLE encoded?
+    int format;                     // image format (8 bit, 24 bit)
+    unsigned int i, j;
+
+    // Read PCX header and check the version number (it must
+    // be at least 5 or higher for 8 bit and 24 bit images).
+
+    stream.Read(hdr, 128);
+
+    if (hdr[HDR_VERSION] < 5) return wxPCX_VERERR;
+
+    // Extract all image info from the PCX header.
+
+    encoding     = hdr[HDR_ENCODING];
+    nplanes      = hdr[HDR_NPLANES];
+    bitsperpixel = hdr[HDR_BITSPERPIXEL];
+    bytesperline = hdr[HDR_BYTESPERLINE] + 256 * hdr[HDR_BYTESPERLINE + 1];
+    width        = (hdr[HDR_XMAX] + 256 * hdr[HDR_XMAX + 1]) -
+                   (hdr[HDR_XMIN] + 256 * hdr[HDR_XMIN + 1]) + 1;
+    height       = (hdr[HDR_YMAX] + 256 * hdr[HDR_YMAX + 1]) -
+                   (hdr[HDR_YMIN] + 256 * hdr[HDR_YMIN + 1]) + 1;
+
+    // Check image format. Currently supported formats are
+    // 8 bits (8 bpp, 1 plane) and 24 bits (8 bpp, 3 planes).
+
+    if ((nplanes == 3) && (bitsperpixel == 8))
+        format = wxPCX_24BIT;
+    else if ((nplanes == 1) && (bitsperpixel == 8))
+        format = wxPCX_8BIT;
+    else
+        return wxPCX_INVFORMAT;
+
+    // If the image is of type wxPCX_8BIT, then there is
+    // a palette at the end of the image data. If we were
+    // working with a file, we could seek at the end to the
+    // end (SeekI(-769, wxFromEnd) and read the palette
+    // before proceeding. Unfortunately, this would prevent
+    // loading several PCXs in a single stream, so we can't
+    // do it. Thus, 8-bit images will have to be decoded in
+    // two passes: one to read and decode the image data,
+    // and another to replace 'colour indexes' with RGB
+    // values.
+
+    // Resize the image and allocate memory for a scanline.
+
+    image->Create(width, height);
+
+    if (!image->Ok())
+        return wxPCX_MEMERR;
+
+    if ((p = (unsigned char *) malloc(bytesperline * nplanes)) == NULL)
+        return wxPCX_MEMERR;
+
+    // Now start reading the file, line by line, and store
+    // the data in the format required by wxImage.
+
+    dst = image->GetData();
+
+    for (j = height; j; j--)
+    {
+        if (encoding)
+            RLEdecode(p, bytesperline * nplanes, stream);
+        else
+            stream.Read(p, bytesperline * nplanes);
+
+        switch (format)
+        {
+            case wxPCX_8BIT:
+            {
+                for (i = 0; i < width; i++)
+                {
+                    // first pass, just store the colour index
+                    *dst = p[i];
+                    dst += 3;
+                }
+                break;
+            }
+            case wxPCX_24BIT:
+            {
+                for (i = 0; i < width; i++)
+                {
+                    *(dst++) = p[i];
+                    *(dst++) = p[i + bytesperline];
+                    *(dst++) = p[i + 2 * bytesperline];
+                }
+                break;
+            }
+        }
+    }
+
+    free(p);
+
+    // For 8 bit images, we read the palette, and then do a second
+    // pass replacing indexes with their RGB values;
+
+    if (format == wxPCX_8BIT)
+    {
+        unsigned char index;
+
+        if (stream.GetC() != 12)
+            return wxPCX_INVFORMAT;
+
+        stream.Read(pal, 768);
+
+        p = image->GetData();
+        for (unsigned long k = height * width; k; k--)
+        {
+            index = *p;
+            *(p++) = pal[3 * index];
+            *(p++) = pal[3 * index + 1];
+            *(p++) = pal[3 * index + 2];
+        }
+
+#if wxUSE_PALETTE
+        unsigned char r[256];
+        unsigned char g[256];
+        unsigned char b[256];
+        for (i = 0; i < 256; i++)
+        {
+            r[i] = pal[3*i + 0];
+            g[i] = pal[3*i + 1];
+            b[i] = pal[3*i + 2];
+        }
+        image->SetPalette(wxPalette(256, r, g, b));
+#endif // wxUSE_PALETTE
+    }
+
+    return wxPCX_OK;
+}
+
+// SavePCX:
+//  Saves a PCX file into the wxImage object pointed by image.
+//  Returns wxPCX_OK on success, or an error code otherwise
+//  (see above for error codes). Will try to save as 8-bit
+//  PCX if possible, and then fall back to 24-bit if there
+//  are more than 256 different colours.
+//
+int SavePCX(wxImage *image, wxOutputStream& stream)
+{
+    unsigned char hdr[128];         // PCX header
+    unsigned char pal[768];         // palette for 8 bit images
+    unsigned char *p;               // space to store one scanline
+    unsigned char *src;             // pointer into wxImage data
+    unsigned int width, height;     // size of the image
+    unsigned int bytesperline;      // bytes per line (each plane)
+    unsigned char nplanes = 3;      // number of planes
+    int format = wxPCX_24BIT;       // image format (8 bit, 24 bit)
+    wxImageHistogram histogram;     // image histogram
+    unsigned long key;              // key in the hashtable
+    unsigned int i;
+
+    // See if we can save as 8 bit.
+
+    if (image->CountColours(256) <= 256)
+    {
+        image->ComputeHistogram(histogram);
+        format = wxPCX_8BIT;
+        nplanes = 1;
+    }
+
+    // Get image dimensions, calculate bytesperline (must be even,
+    // according to PCX specs) and allocate space for one complete
+    // scanline.
+
+    if (!image->Ok())
+        return wxPCX_INVFORMAT;
+
+    width = image->GetWidth();
+    height = image->GetHeight();
+    bytesperline = width;
+    if (bytesperline % 2)
+        bytesperline++;
+
+    if ((p = (unsigned char *) malloc(bytesperline * nplanes)) == NULL)
+        return wxPCX_MEMERR;
+
+    // Build header data and write it to the stream. Initially,
+    // set all bytes to zero (most values default to zero).
+
+    memset(hdr, 0, sizeof(hdr));
+
+    hdr[HDR_MANUFACTURER]     = 10;
+    hdr[HDR_VERSION]          = 5;
+    hdr[HDR_ENCODING]         = 1;
+    hdr[HDR_NPLANES]          = nplanes;
+    hdr[HDR_BITSPERPIXEL]     = 8;
+    hdr[HDR_BYTESPERLINE]     = (unsigned char)(bytesperline % 256);
+    hdr[HDR_BYTESPERLINE + 1] = (unsigned char)(bytesperline / 256);
+    hdr[HDR_XMAX]             = (unsigned char)((width - 1)  % 256);
+    hdr[HDR_XMAX + 1]         = (unsigned char)((width - 1)  / 256);
+    hdr[HDR_YMAX]             = (unsigned char)((height - 1) % 256);
+    hdr[HDR_YMAX + 1]         = (unsigned char)((height - 1) / 256);
+    hdr[HDR_PALETTEINFO]      = 1;
+
+    stream.Write(hdr, 128);
+
+    // Encode image data line by line and write it to the stream
+
+    src = image->GetData();
+
+    for (; height; height--)
+    {
+        switch (format)
+        {
+            case wxPCX_8BIT:
+            {
+                unsigned char r, g, b;
+
+                for (i = 0; i < width; i++)
+                {
+                    r = *(src++);
+                    g = *(src++);
+                    b = *(src++);
+                    key = (r << 16) | (g << 8) | b;
+
+                    p[i] = (unsigned char)histogram[key].index;
+                }
+                break;
+            }
+            case wxPCX_24BIT:
+            {
+                for (i = 0; i < width; i++)
+                {
+                    p[i] = *(src++);
+                    p[i + bytesperline] = *(src++);
+                    p[i + 2 * bytesperline] = *(src++);
+                }
+                break;
+            }
+        }
+
+        RLEencode(p, bytesperline * nplanes, stream);
+    }
+
+    free(p);
+
+    // For 8 bit images, build the palette and write it to the stream:
+    if (format == wxPCX_8BIT)
+    {
+        // zero unused colours
+        memset(pal, 0, sizeof(pal));
+
+        unsigned long index;
+
+        for (wxImageHistogram::iterator entry = histogram.begin();
+             entry != histogram.end(); ++entry )
+        {
+            key = entry->first;
+            index = entry->second.index;
+            pal[3 * index]     = (unsigned char)(key >> 16);
+            pal[3 * index + 1] = (unsigned char)(key >> 8);
+            pal[3 * index + 2] = (unsigned char)(key);
+        }
+
+        stream.PutC(12);
+        stream.Write(pal, 768);
+    }
+
+    return wxPCX_OK;
+}
+
+//-----------------------------------------------------------------------------
+// wxPCXHandler
+//-----------------------------------------------------------------------------
+
+bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
+{
+    int error;
+
+    if (!CanRead(stream))
+    {
+        if (verbose)
+            wxLogError(_("PCX: this is not a PCX file."));
+
+        return false;
+    }
+
+    image->Destroy();
+
+    if ((error = ReadPCX(image, stream)) != wxPCX_OK)
+    {
+        if (verbose)
+        {
+            switch (error)
+            {
+                case wxPCX_INVFORMAT: wxLogError(_("PCX: image format unsupported")); break;
+                case wxPCX_MEMERR:    wxLogError(_("PCX: couldn't allocate memory")); break;
+                case wxPCX_VERERR:    wxLogError(_("PCX: version number too low")); break;
+                default:              wxLogError(_("PCX: unknown error !!!"));
+            }
+        }
+        image->Destroy();
+        return false;
+    }
+
+    return true;
+}
+
+bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
+{
+    int error;
+
+    if ((error = SavePCX(image, stream)) != wxPCX_OK)
+    {
+        if (verbose)
+        {
+            switch (error)
+            {
+                case wxPCX_INVFORMAT: wxLogError(_("PCX: invalid image")); break;
+                case wxPCX_MEMERR:    wxLogError(_("PCX: couldn't allocate memory")); break;
+                default:              wxLogError(_("PCX: unknown error !!!"));
+            }
+        }
+    }
+
+    return (error == wxPCX_OK);
+}
+
+bool wxPCXHandler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char c = stream.GetC();
+    if ( !stream )
+        return false;
+
+    // not very safe, but this is all we can get from PCX header :-(
+    return c == 10;
+}
+
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_IMAGE && wxUSE_PCX
diff --git a/Source/3rd Party/wx/src/common/imagpng.cpp b/Source/3rd Party/wx/src/common/imagpng.cpp
index 76a5f5b37..d1bac6597 100644
--- a/Source/3rd Party/wx/src/common/imagpng.cpp	
+++ b/Source/3rd Party/wx/src/common/imagpng.cpp	
@@ -1,1099 +1,869 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagpng.cpp
-// Purpose:     wxImage PNG handler
-// Author:      Robert Roebling
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && wxUSE_LIBPNG
-
-#include "wx/imagpng.h"
-#include "wx/versioninfo.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/palette.h"
-    #include "wx/stream.h"
-#endif
-
-#include "png.h"
-
-// For memcpy
-#include <string.h>
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// image cannot have any transparent pixels at all, have only 100% opaque
-// and/or 100% transparent pixels in which case a simple mask is enough to
-// store this information in wxImage or have a real alpha channel in which case
-// we need to have it in wxImage as well
-enum Transparency
-{
-    Transparency_None,
-    Transparency_Mask,
-    Transparency_Alpha
-};
-
-// ----------------------------------------------------------------------------
-// local functions
-// ----------------------------------------------------------------------------
-
-// return the kind of transparency needed for this image assuming that it does
-// have transparent pixels, i.e. either Transparency_Alpha or Transparency_Mask
-static Transparency
-CheckTransparency(unsigned char **lines,
-                  png_uint_32 x, png_uint_32 y, png_uint_32 w, png_uint_32 h,
-                  size_t numColBytes);
-
-// init the alpha channel for the image and fill it with 1s up to (x, y)
-static unsigned char *InitAlpha(wxImage *image, png_uint_32 x, png_uint_32 y);
-
-// find a free colour for the mask in the PNG data array
-static void
-FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height,
-               unsigned char& rMask, unsigned char& gMask, unsigned char& bMask);
-
-// is the pixel with this value of alpha a fully opaque one?
-static inline
-bool IsOpaque(unsigned char a)
-{
-    return a == 0xff;
-}
-
-// is the pixel with this value of alpha a fully transparent one?
-static inline
-bool IsTransparent(unsigned char a)
-{
-    return !a;
-}
-
-// ============================================================================
-// wxPNGHandler implementation
-// ============================================================================
-
-IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
-
-#if wxUSE_STREAMS
-
-#ifndef PNGLINKAGEMODE
-    #ifdef PNGAPI
-        #define PNGLINKAGEMODE PNGAPI
-    #elif defined(__WATCOMC__)
-        // we need an explicit cdecl for Watcom, at least according to
-        //
-        // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863
-        //
-        // more testing is needed for this however, please remove this comment
-        // if you can confirm that my fix works with Watcom 11
-        #define PNGLINKAGEMODE cdecl
-    #else
-        #define PNGLINKAGEMODE LINKAGEMODE
-    #endif
-#endif
-
-
-// VS: wxPNGInfoStruct declared below is a hack that needs some explanation.
-//     First, let me describe what's the problem: libpng uses jmp_buf in
-//     its png_struct structure. Unfortunately, this structure is
-//     compiler-specific and may vary in size, so if you use libpng compiled
-//     as DLL with another compiler than the main executable, it may not work.
-//     Luckily, it is still possible to use setjmp() & longjmp() as long as the
-//     structure is not part of png_struct.
-//
-//     Sadly, there's no clean way to attach user-defined data to png_struct.
-//     There is only one customizable place, png_struct.io_ptr, which is meant
-//     only for I/O routines and is set with png_set_read_fn or
-//     png_set_write_fn. The hacky part is that we use io_ptr to store
-//     a pointer to wxPNGInfoStruct that holds I/O structures _and_ jmp_buf.
-
-struct wxPNGInfoStruct
-{
-    jmp_buf jmpbuf;
-    bool verbose;
-
-    union
-    {
-        wxInputStream  *in;
-        wxOutputStream *out;
-    } stream;
-};
-
-#define WX_PNG_INFO(png_ptr) ((wxPNGInfoStruct*)png_get_io_ptr(png_ptr))
-
-// ----------------------------------------------------------------------------
-// helper functions
-// ----------------------------------------------------------------------------
-
-extern "C"
-{
-
-static void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data,
-                                                 png_size_t length )
-{
-    WX_PNG_INFO(png_ptr)->stream.in->Read(data, length);
-}
-
-static void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data,
-                                                 png_size_t length )
-{
-    WX_PNG_INFO(png_ptr)->stream.out->Write(data, length);
-}
-
-static void
-PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
-{
-    wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL;
-    if ( !info || info->verbose )
-    {
-        wxLogWarning( wxString::FromAscii(message) );
-    }
-}
-
-// from pngerror.c
-// so that the libpng doesn't send anything on stderr
-static void
-PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message)
-{
-    wx_png_warning(NULL, message);
-
-    // we're not using libpng built-in jump buffer (see comment before
-    // wxPNGInfoStruct above) so we have to return ourselves, otherwise libpng
-    // would just abort
-    longjmp(WX_PNG_INFO(png_ptr)->jmpbuf, 1);
-}
-
-} // extern "C"
-
-// ----------------------------------------------------------------------------
-// LoadFile() helpers
-// ----------------------------------------------------------------------------
-
-// determine the kind of transparency we need for this image: if the only alpha
-// values it has are 0 (transparent) and 0xff (opaque) then we can simply
-// create a mask for it, we should be ok with a simple mask but otherwise we
-// need a full blown alpha channel in wxImage
-//
-// parameters:
-//      lines           raw PNG data
-//      x, y            starting position
-//      w, h            size of the image
-//      numColBytes     number of colour bytes (1 for grey scale, 3 for RGB)
-//                      (NB: alpha always follows the colour bytes)
-Transparency
-CheckTransparency(unsigned char **lines,
-                  png_uint_32 x, png_uint_32 y, png_uint_32 w, png_uint_32 h,
-                  size_t numColBytes)
-{
-    // suppose that a mask will suffice and check all the remaining alpha
-    // values to see if it does
-    for ( ; y < h; y++ )
-    {
-        // each pixel is numColBytes+1 bytes, offset into the current line by
-        // the current x position
-        unsigned const char *ptr = lines[y] + (x * (numColBytes + 1));
-
-        for ( png_uint_32 x2 = x; x2 < w; x2++ )
-        {
-            // skip the grey or colour byte(s)
-            ptr += numColBytes;
-
-            unsigned char a2 = *ptr++;
-
-            if ( !IsTransparent(a2) && !IsOpaque(a2) )
-            {
-                // not fully opaque nor fully transparent, hence need alpha
-                return Transparency_Alpha;
-            }
-        }
-
-        // during the next loop iteration check all the pixels in the row
-        x = 0;
-    }
-
-    // mask will be enough
-    return Transparency_Mask;
-}
-
-unsigned char *InitAlpha(wxImage *image, png_uint_32 x, png_uint_32 y)
-{
-    // create alpha channel
-    image->SetAlpha();
-
-    unsigned char *alpha = image->GetAlpha();
-
-    // set alpha for the pixels we had so far
-    png_uint_32 end = y * image->GetWidth() + x;
-    for ( png_uint_32 i = 0; i < end; i++ )
-    {
-        // all the previous pixels were opaque
-        *alpha++ = 0xff;
-    }
-
-    return alpha;
-}
-
-void
-FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height,
-               unsigned char& rMask, unsigned char& gMask, unsigned char& bMask)
-{
-    // choosing the colour for the mask is more
-    // difficult: we need to iterate over the entire
-    // image for this in order to choose an unused
-    // colour (this is not very efficient but what else
-    // can we do?)
-    wxImageHistogram h;
-    unsigned nentries = 0;
-    unsigned char r2, g2, b2;
-    for ( png_uint_32 y2 = 0; y2 < height; y2++ )
-    {
-        const unsigned char *p = lines[y2];
-        for ( png_uint_32 x2 = 0; x2 < width; x2++ )
-        {
-            r2 = *p++;
-            g2 = *p++;
-            b2 = *p++;
-            ++p; // jump over alpha
-
-            wxImageHistogramEntry&
-                entry = h[wxImageHistogram:: MakeKey(r2, g2, b2)];
-
-            if ( entry.value++ == 0 )
-                entry.index = nentries++;
-        }
-    }
-
-    if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) )
-    {
-        wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred."));
-
-        // use a fixed mask colour and we'll fudge
-        // the real pixels with this colour (see
-        // below)
-        rMask = 0xfe;
-        gMask = 0;
-        bMask = 0xff;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// reading PNGs
-// ----------------------------------------------------------------------------
-
-bool wxPNGHandler::DoCanRead( wxInputStream& stream )
-{
-    unsigned char hdr[4];
-
-    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )     // it's ok to modify the stream position here
-        return false;
-
-    return memcmp(hdr, "\211PNG", WXSIZEOF(hdr)) == 0;
-}
-
-// convert data from RGB to wxImage format
-static
-void CopyDataFromPNG(wxImage *image,
-                     unsigned char **lines,
-                     png_uint_32 width,
-                     png_uint_32 height,
-                     int color_type)
-{
-    Transparency transparency = Transparency_None;
-
-    // only non NULL if transparency == Transparency_Alpha
-    unsigned char *alpha = NULL;
-
-    // RGB of the mask colour if transparency == Transparency_Mask
-    // (but init them anyhow to avoid compiler warnings)
-    unsigned char rMask = 0,
-                  gMask = 0,
-                  bMask = 0;
-
-    unsigned char *ptrDst = image->GetData();
-    if ( !(color_type & PNG_COLOR_MASK_COLOR) )
-    {
-        // grey image: GAGAGA... where G == grey component and A == alpha
-        for ( png_uint_32 y = 0; y < height; y++ )
-        {
-            const unsigned char *ptrSrc = lines[y];
-            for ( png_uint_32 x = 0; x < width; x++ )
-            {
-                unsigned char g = *ptrSrc++;
-                unsigned char a = *ptrSrc++;
-
-                // the first time we encounter a transparent pixel we must
-                // decide about what to do about them
-                if ( !IsOpaque(a) && transparency == Transparency_None )
-                {
-                    // we'll need at least the mask for this image and
-                    // maybe even full alpha channel info: the former is
-                    // only enough if we have alpha values of 0 and 0xff
-                    // only, otherwisewe need the latter
-                    transparency = CheckTransparency
-                                   (
-                                        lines,
-                                        x, y,
-                                        width, height,
-                                        1
-                                   );
-
-                    if ( transparency == Transparency_Mask )
-                    {
-                        // let's choose this colour for the mask: this is
-                        // not a problem here as all the other pixels are
-                        // grey, i.e. R == G == B which is not the case for
-                        // this one so no confusion is possible
-                        rMask = 0xff;
-                        gMask = 0;
-                        bMask = 0xff;
-                    }
-                    else // transparency == Transparency_Alpha
-                    {
-                        alpha = InitAlpha(image, x, y);
-                    }
-                }
-
-                switch ( transparency )
-                {
-                    case Transparency_Mask:
-                        if ( IsTransparent(a) )
-                        {
-                            *ptrDst++ = rMask;
-                            *ptrDst++ = gMask;
-                            *ptrDst++ = bMask;
-                            break;
-                        }
-                        // else: !transparent
-
-                        // must be opaque then as otherwise we shouldn't be
-                        // using the mask at all
-                        wxASSERT_MSG( IsOpaque(a), wxT("logic error") );
-
-                        // fall through
-
-                    case Transparency_Alpha:
-                        if ( alpha )
-                            *alpha++ = a;
-                        // fall through
-
-                    case Transparency_None:
-                        *ptrDst++ = g;
-                        *ptrDst++ = g;
-                        *ptrDst++ = g;
-                        break;
-                }
-            }
-        }
-    }
-    else // colour image: RGBRGB...
-    {
-        for ( png_uint_32 y = 0; y < height; y++ )
-        {
-            const unsigned char *ptrSrc = lines[y];
-            for ( png_uint_32 x = 0; x < width; x++ )
-            {
-                unsigned char r = *ptrSrc++;
-                unsigned char g = *ptrSrc++;
-                unsigned char b = *ptrSrc++;
-                unsigned char a = *ptrSrc++;
-
-                // the logic here is the same as for the grey case except
-                // where noted
-                if ( !IsOpaque(a) && transparency == Transparency_None )
-                {
-                    transparency = CheckTransparency
-                                   (
-                                        lines,
-                                        x, y,
-                                        width, height,
-                                        3
-                                   );
-
-                    if ( transparency == Transparency_Mask )
-                    {
-                        FindMaskColour(lines, width, height,
-                                       rMask, gMask, bMask);
-                    }
-                    else // transparency == Transparency_Alpha
-                    {
-                        alpha = InitAlpha(image, x, y);
-                    }
-
-                }
-
-                switch ( transparency )
-                {
-                    case Transparency_Mask:
-                        if ( IsTransparent(a) )
-                        {
-                            *ptrDst++ = rMask;
-                            *ptrDst++ = gMask;
-                            *ptrDst++ = bMask;
-                            break;
-                        }
-                        else // !transparent
-                        {
-                            // must be opaque then as otherwise we shouldn't be
-                            // using the mask at all
-                            wxASSERT_MSG( IsOpaque(a), wxT("logic error") );
-
-                            // if we couldn't find a unique colour for the
-                            // mask, we can have real pixels with the same
-                            // value as the mask and it's better to slightly
-                            // change their colour than to make them
-                            // transparent
-                            if ( r == rMask && g == gMask && b == bMask )
-                            {
-                                r++;
-                            }
-                        }
-
-                        // fall through
-
-                    case Transparency_Alpha:
-                        if ( alpha )
-                            *alpha++ = a;
-                        // fall through
-
-                    case Transparency_None:
-                        *ptrDst++ = r;
-                        *ptrDst++ = g;
-                        *ptrDst++ = b;
-                        break;
-                }
-            }
-        }
-    }
-
-    if ( transparency == Transparency_Mask )
-    {
-        image->SetMaskColour(rMask, gMask, bMask);
-    }
-}
-
-// temporarily disable the warning C4611 (interaction between '_setjmp' and
-// C++ object destruction is non-portable) - I don't see any dtors here
-#ifdef __VISUALC__
-    #pragma warning(disable:4611)
-#endif /* VC++ */
-
-bool
-wxPNGHandler::LoadFile(wxImage *image,
-                       wxInputStream& stream,
-                       bool verbose,
-                       int WXUNUSED(index))
-{
-    // VZ: as this function uses setjmp() the only fool-proof error handling
-    //     method is to use goto (setjmp is not really C++ dtors friendly...)
-
-    unsigned char **lines = NULL;
-    png_infop info_ptr = (png_infop) NULL;
-    wxPNGInfoStruct wxinfo;
-
-    png_uint_32 i, width, height = 0;
-    int bit_depth, color_type, interlace_type;
-
-    wxinfo.verbose = verbose;
-    wxinfo.stream.in = &stream;
-
-    image->Destroy();
-
-    png_structp png_ptr = png_create_read_struct
-                          (
-                            PNG_LIBPNG_VER_STRING,
-                            NULL,
-                            wx_png_error,
-                            wx_png_warning
-                          );
-    if (!png_ptr)
-        goto error;
-
-    // NB: please see the comment near wxPNGInfoStruct declaration for
-    //     explanation why this line is mandatory
-    png_set_read_fn( png_ptr, &wxinfo, wx_PNG_stream_reader);
-
-    info_ptr = png_create_info_struct( png_ptr );
-    if (!info_ptr)
-        goto error;
-
-    if (setjmp(wxinfo.jmpbuf))
-        goto error;
-
-    png_read_info( png_ptr, info_ptr );
-    png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL );
-
-    if (color_type == PNG_COLOR_TYPE_PALETTE)
-        png_set_expand( png_ptr );
-
-    // Fix for Bug [ 439207 ] Monochrome PNG images come up black
-    if (bit_depth < 8)
-        png_set_expand( png_ptr );
-
-    png_set_strip_16( png_ptr );
-    png_set_packing( png_ptr );
-    if (png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS))
-        png_set_expand( png_ptr );
-    png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER );
-
-    image->Create((int)width, (int)height, (bool) false /* no need to init pixels */);
-
-    if (!image->IsOk())
-        goto error;
-
-    // initialize all line pointers to NULL to ensure that they can be safely
-    // free()d if an error occurs before all of them could be allocated
-    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
-    if ( !lines )
-        goto error;
-
-    for (i = 0; i < height; i++)
-    {
-        if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
-            goto error;
-    }
-
-    png_read_image( png_ptr, lines );
-    png_read_end( png_ptr, info_ptr );
-
-#if wxUSE_PALETTE
-    if (color_type == PNG_COLOR_TYPE_PALETTE)
-    {
-        png_colorp palette = NULL;
-        int numPalette = 0;
-
-        (void) png_get_PLTE(png_ptr, info_ptr, &palette, &numPalette);
-
-        unsigned char* r = new unsigned char[numPalette];
-        unsigned char* g = new unsigned char[numPalette];
-        unsigned char* b = new unsigned char[numPalette];
-
-        for (int j = 0; j < numPalette; j++)
-        {
-            r[j] = palette[j].red;
-            g[j] = palette[j].green;
-            b[j] = palette[j].blue;
-        }
-
-        image->SetPalette(wxPalette(numPalette, r, g, b));
-        delete[] r;
-        delete[] g;
-        delete[] b;
-    }
-#endif // wxUSE_PALETTE
-
-
-    // set the image resolution if it's available
-    png_uint_32 resX, resY;
-    int unitType;
-    if (png_get_pHYs(png_ptr, info_ptr, &resX, &resY, &unitType)
-        == PNG_INFO_pHYs)
-    {
-        wxImageResolution res = wxIMAGE_RESOLUTION_CM;
-
-        switch (unitType)
-        {
-            default:
-                wxLogWarning(_("Unknown PNG resolution unit %d"), unitType);
-                // fall through
-
-            case PNG_RESOLUTION_UNKNOWN:
-                image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, resX);
-                image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, resY);
-
-                res = wxIMAGE_RESOLUTION_NONE;
-                break;
-
-            case PNG_RESOLUTION_METER:
-                /*
-                Convert meters to centimeters.
-                Use a string to not lose precision (converting to cm and then
-                to inch would result in integer rounding error).
-                If an app wants an int, GetOptionInt will convert and round
-                down for them.
-                */
-                image->SetOption(wxIMAGE_OPTION_RESOLUTIONX,
-                    wxString::FromCDouble((double) resX / 100.0, 2));
-                image->SetOption(wxIMAGE_OPTION_RESOLUTIONY,
-                    wxString::FromCDouble((double) resY / 100.0, 2));
-                break;
-        }
-
-        image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, res);
-    }
-
-
-    png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
-
-    // loaded successfully, now init wxImage with this data
-    CopyDataFromPNG(image, lines, width, height, color_type);
-
-    for ( i = 0; i < height; i++ )
-        free( lines[i] );
-    free( lines );
-
-    return true;
-
-error:
-    if (verbose)
-    {
-       wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));
-    }
-
-    if ( image->IsOk() )
-    {
-        image->Destroy();
-    }
-
-    if ( lines )
-    {
-        for ( unsigned int n = 0; n < height; n++ )
-            free( lines[n] );
-
-        free( lines );
-    }
-
-    if ( png_ptr )
-    {
-        if ( info_ptr )
-        {
-            png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
-            free(info_ptr);
-        }
-        else
-            png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL );
-    }
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// SaveFile() palette helpers
-// ----------------------------------------------------------------------------
-
-typedef wxLongToLongHashMap PaletteMap;
-
-static unsigned long PaletteMakeKey(const png_color_8& clr)
-{
-    return (wxImageHistogram::MakeKey(clr.red, clr.green, clr.blue) << 8) | clr.alpha;
-}
-
-static long PaletteFind(const PaletteMap& palette, const png_color_8& clr)
-{
-    unsigned long value = PaletteMakeKey(clr);
-    PaletteMap::const_iterator it = palette.find(value);
-
-    return (it != palette.end()) ? it->second : wxNOT_FOUND;
-}
-
-static long PaletteAdd(PaletteMap *palette, const png_color_8& clr)
-{
-    unsigned long value = PaletteMakeKey(clr);
-    PaletteMap::const_iterator it = palette->find(value);
-    size_t index;
-
-    if (it == palette->end())
-    {
-        index = palette->size();
-        (*palette)[value] = index;
-    }
-    else
-    {
-        index = it->second;
-    }
-
-    return index;
-}
-
-// ----------------------------------------------------------------------------
-// writing PNGs
-// ----------------------------------------------------------------------------
-
-bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
-{
-    wxPNGInfoStruct wxinfo;
-
-    wxinfo.verbose = verbose;
-    wxinfo.stream.out = &stream;
-
-    png_structp png_ptr = png_create_write_struct
-                          (
-                            PNG_LIBPNG_VER_STRING,
-                            NULL,
-                            wx_png_error,
-                            wx_png_warning
-                          );
-    if (!png_ptr)
-    {
-        if (verbose)
-        {
-           wxLogError(_("Couldn't save PNG image."));
-        }
-        return false;
-    }
-
-    png_infop info_ptr = png_create_info_struct(png_ptr);
-    if (info_ptr == NULL)
-    {
-        png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
-        if (verbose)
-        {
-           wxLogError(_("Couldn't save PNG image."));
-        }
-        return false;
-    }
-
-    if (setjmp(wxinfo.jmpbuf))
-    {
-        png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
-        if (verbose)
-        {
-           wxLogError(_("Couldn't save PNG image."));
-        }
-        return false;
-    }
-
-    // NB: please see the comment near wxPNGInfoStruct declaration for
-    //     explanation why this line is mandatory
-    png_set_write_fn( png_ptr, &wxinfo, wx_PNG_stream_writer, NULL);
-
-    const int iHeight = image->GetHeight();
-    const int iWidth = image->GetWidth();
-
-    const bool bHasPngFormatOption
-        = image->HasOption(wxIMAGE_OPTION_PNG_FORMAT);
-
-    int iColorType = bHasPngFormatOption
-                            ? image->GetOptionInt(wxIMAGE_OPTION_PNG_FORMAT)
-                            : wxPNG_TYPE_COLOUR;
-
-    bool bHasAlpha = image->HasAlpha();
-    bool bHasMask = image->HasMask();
-
-    bool bUsePalette = iColorType == wxPNG_TYPE_PALETTE
-#if wxUSE_PALETTE
-        || (!bHasPngFormatOption && image->HasPalette() )
-#endif
-    ;
-
-    png_color_8 mask = { 0, 0, 0, 0, 0 };
-
-    if (bHasMask)
-    {
-        mask.red   = image->GetMaskRed();
-        mask.green = image->GetMaskGreen();
-        mask.blue  = image->GetMaskBlue();
-    }
-
-    PaletteMap palette;
-
-    if (bUsePalette)
-    {
-        png_color png_rgb  [PNG_MAX_PALETTE_LENGTH];
-        png_byte  png_trans[PNG_MAX_PALETTE_LENGTH];
-
-        const unsigned char *pColors = image->GetData();
-        const unsigned char* pAlpha  = image->GetAlpha();
-
-        if (bHasMask && !pAlpha)
-        {
-            // Mask must be first
-            PaletteAdd(&palette, mask);
-        }
-
-        for (int y = 0; y < iHeight; y++)
-        {
-            for (int x = 0; x < iWidth; x++)
-            {
-                png_color_8 rgba;
-
-                rgba.red   = *pColors++;
-                rgba.green = *pColors++;
-                rgba.blue  = *pColors++;
-                rgba.gray  = 0;
-                rgba.alpha = (pAlpha && !bHasMask) ? *pAlpha++ : 0;
-
-                // save in our palette
-                long index = PaletteAdd(&palette, rgba);
-
-                if (index < PNG_MAX_PALETTE_LENGTH)
-                {
-                    // save in libpng's palette
-                    png_rgb[index].red   = rgba.red;
-                    png_rgb[index].green = rgba.green;
-                    png_rgb[index].blue  = rgba.blue;
-                    png_trans[index]     = rgba.alpha;
-                }
-                else
-                {
-                    bUsePalette = false;
-                    break;
-                }
-            }
-        }
-
-        if (bUsePalette)
-        {
-            png_set_PLTE(png_ptr, info_ptr, png_rgb, palette.size());
-
-            if (bHasMask && !pAlpha)
-            {
-                wxASSERT(PaletteFind(palette, mask) == 0);
-                png_trans[0] = 0;
-                png_set_tRNS(png_ptr, info_ptr, png_trans, 1, NULL);
-            }
-            else if (pAlpha && !bHasMask)
-            {
-                png_set_tRNS(png_ptr, info_ptr, png_trans, palette.size(), NULL);
-            }
-        }
-    }
-
-    /*
-    If saving palettised was requested but it was decided we can't use a
-    palette then reset the colour type to RGB.
-    */
-    if (!bUsePalette && iColorType == wxPNG_TYPE_PALETTE)
-    {
-        iColorType = wxPNG_TYPE_COLOUR;
-    }
-
-    bool bUseAlpha = !bUsePalette && (bHasAlpha || bHasMask);
-
-    int iPngColorType;
-
-    if (bUsePalette)
-    {
-        iPngColorType = PNG_COLOR_TYPE_PALETTE;
-        iColorType = wxPNG_TYPE_PALETTE;
-    }
-    else if ( iColorType==wxPNG_TYPE_COLOUR )
-    {
-        iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_RGB_ALPHA
-                                  : PNG_COLOR_TYPE_RGB;
-    }
-    else
-    {
-        iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_GRAY_ALPHA
-                                  : PNG_COLOR_TYPE_GRAY;
-    }
-
-    if (image->HasOption(wxIMAGE_OPTION_PNG_FILTER))
-        png_set_filter( png_ptr, PNG_FILTER_TYPE_BASE, image->GetOptionInt(wxIMAGE_OPTION_PNG_FILTER) );
-
-    if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL))
-        png_set_compression_level( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL) );
-
-    if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL))
-        png_set_compression_mem_level( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL) );
-
-    if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY))
-        png_set_compression_strategy( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY) );
-
-    if (image->HasOption(wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE))
-        png_set_compression_buffer_size( png_ptr, image->GetOptionInt(wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE) );
-
-    int iBitDepth = !bUsePalette && image->HasOption(wxIMAGE_OPTION_PNG_BITDEPTH)
-                            ? image->GetOptionInt(wxIMAGE_OPTION_PNG_BITDEPTH)
-                            : 8;
-
-    png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(),
-                  iBitDepth, iPngColorType,
-                  PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-                  PNG_FILTER_TYPE_BASE);
-
-    int iElements;
-    png_color_8 sig_bit;
-
-    if ( iPngColorType & PNG_COLOR_MASK_COLOR )
-    {
-        sig_bit.red =
-        sig_bit.green =
-        sig_bit.blue = (png_byte)iBitDepth;
-        iElements = 3;
-    }
-    else // grey
-    {
-        sig_bit.gray = (png_byte)iBitDepth;
-        iElements = 1;
-    }
-
-    if ( bUseAlpha )
-    {
-        sig_bit.alpha = (png_byte)iBitDepth;
-        iElements++;
-    }
-
-    if ( iBitDepth == 16 )
-        iElements *= 2;
-
-    // save the image resolution if we have it
-    int resX, resY;
-    switch ( GetResolutionFromOptions(*image, &resX, &resY) )
-    {
-        case wxIMAGE_RESOLUTION_INCHES:
-            {
-                const double INCHES_IN_METER = 10000.0 / 254;
-                resX = int(resX * INCHES_IN_METER);
-                resY = int(resY * INCHES_IN_METER);
-            }
-            break;
-
-        case wxIMAGE_RESOLUTION_CM:
-            resX *= 100;
-            resY *= 100;
-            break;
-
-        case wxIMAGE_RESOLUTION_NONE:
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("unsupported image resolution units") );
-    }
-
-    if ( resX && resY )
-        png_set_pHYs( png_ptr, info_ptr, resX, resY, PNG_RESOLUTION_METER );
-
-    png_set_sBIT( png_ptr, info_ptr, &sig_bit );
-    png_write_info( png_ptr, info_ptr );
-    png_set_shift( png_ptr, &sig_bit );
-    png_set_packing( png_ptr );
-
-    unsigned char *
-        data = (unsigned char *)malloc( image->GetWidth() * iElements );
-    if ( !data )
-    {
-        png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
-        return false;
-    }
-
-    const unsigned char *
-        pAlpha = (const unsigned char *)(bHasAlpha ? image->GetAlpha() : NULL);
-
-    const unsigned char *pColors = image->GetData();
-
-    for (int y = 0; y != iHeight; ++y)
-    {
-        unsigned char *pData = data;
-        for (int x = 0; x != iWidth; x++)
-        {
-            png_color_8 clr;
-            clr.red   = *pColors++;
-            clr.green = *pColors++;
-            clr.blue  = *pColors++;
-            clr.gray  = 0;
-            clr.alpha = (bUsePalette && pAlpha) ? *pAlpha++ : 0; // use with wxPNG_TYPE_PALETTE only
-
-            switch ( iColorType )
-            {
-                default:
-                    wxFAIL_MSG( wxT("unknown wxPNG_TYPE_XXX") );
-                    // fall through
-
-                case wxPNG_TYPE_COLOUR:
-                    *pData++ = clr.red;
-                    if ( iBitDepth == 16 )
-                        *pData++ = 0;
-                    *pData++ = clr.green;
-                    if ( iBitDepth == 16 )
-                        *pData++ = 0;
-                    *pData++ = clr.blue;
-                    if ( iBitDepth == 16 )
-                        *pData++ = 0;
-                    break;
-
-                case wxPNG_TYPE_GREY:
-                    {
-                        // where do these coefficients come from? maybe we
-                        // should have image options for them as well?
-                        unsigned uiColor =
-                            (unsigned) (76.544*(unsigned)clr.red +
-                                        150.272*(unsigned)clr.green +
-                                        36.864*(unsigned)clr.blue);
-
-                        *pData++ = (unsigned char)((uiColor >> 8) & 0xFF);
-                        if ( iBitDepth == 16 )
-                            *pData++ = (unsigned char)(uiColor & 0xFF);
-                    }
-                    break;
-
-                case wxPNG_TYPE_GREY_RED:
-                    *pData++ = clr.red;
-                    if ( iBitDepth == 16 )
-                        *pData++ = 0;
-                    break;
-
-                case wxPNG_TYPE_PALETTE:
-                    *pData++ = (unsigned char) PaletteFind(palette, clr);
-                    break;
-            }
-
-            if ( bUseAlpha )
-            {
-                unsigned char uchAlpha = 255;
-                if ( bHasAlpha )
-                    uchAlpha = *pAlpha++;
-
-                if ( bHasMask )
-                {
-                    if ( (clr.red == mask.red)
-                            && (clr.green == mask.green)
-                                && (clr.blue == mask.blue) )
-                        uchAlpha = 0;
-                }
-
-                *pData++ = uchAlpha;
-                if ( iBitDepth == 16 )
-                    *pData++ = 0;
-            }
-        }
-
-        png_bytep row_ptr = data;
-        png_write_rows( png_ptr, &row_ptr, 1 );
-    }
-
-    free(data);
-    png_write_end( png_ptr, info_ptr );
-    png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr );
-
-    return true;
-}
-
-#ifdef __VISUALC__
-    #pragma warning(default:4611)
-#endif /* VC++ */
-
-#endif  // wxUSE_STREAMS
-
-/*static*/ wxVersionInfo wxPNGHandler::GetLibraryVersionInfo()
-{
-    // The version string seems to always have a leading space and a trailing
-    // new line, get rid of them both.
-    wxString str = png_get_header_version(NULL) + 1;
-    str.Replace("\n", "");
-
-    return wxVersionInfo("libpng",
-                         PNG_LIBPNG_VER_MAJOR,
-                         PNG_LIBPNG_VER_MINOR,
-                         PNG_LIBPNG_VER_RELEASE,
-                         str);
-}
-
-#endif  // wxUSE_LIBPNG
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagepng.cpp
+// Purpose:     wxImage PNG handler
+// Author:      Robert Roebling
+// RCS-ID:      $Id: imagpng.cpp 67009 2011-02-24 08:42:57Z JS $
+// Copyright:   (c) Robert Roebling
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_LIBPNG
+
+#include "wx/imagpng.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/bitmap.h"
+    #include "wx/module.h"
+#endif
+
+#include "png.h"
+#include "wx/filefn.h"
+#include "wx/wfstream.h"
+#include "wx/intl.h"
+#include "wx/palette.h"
+
+// For memcpy
+#include <string.h>
+
+#ifdef __SALFORDC__
+#ifdef FAR
+#undef FAR
+#endif
+#endif
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// image can not have any transparent pixels at all, have only 100% opaque
+// and/or 100% transparent pixels in which case a simple mask is enough to
+// store this information in wxImage or have a real alpha channel in which case
+// we need to have it in wxImage as well
+enum Transparency
+{
+    Transparency_None,
+    Transparency_Mask,
+    Transparency_Alpha
+};
+
+// ----------------------------------------------------------------------------
+// local functions
+// ----------------------------------------------------------------------------
+
+// return the kind of transparency needed for this image assuming that it does
+// have transparent pixels, i.e. either Transparency_Alpha or Transparency_Mask
+static Transparency
+CheckTransparency(unsigned char **lines,
+                  png_uint_32 x, png_uint_32 y, png_uint_32 w, png_uint_32 h,
+                  size_t numColBytes);
+
+// init the alpha channel for the image and fill it with 1s up to (x, y)
+static unsigned char *InitAlpha(wxImage *image, png_uint_32 x, png_uint_32 y);
+
+// find a free colour for the mask in the PNG data array
+static void
+FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height,
+               unsigned char& rMask, unsigned char& gMask, unsigned char& bMask);
+
+// is the pixel with this value of alpha a fully opaque one?
+static inline
+bool IsOpaque(unsigned char a)
+{
+    return a == 0xff;
+}
+
+// is the pixel with this value of alpha a fully transparent one?
+static inline
+bool IsTransparent(unsigned char a)
+{
+    return !a;
+}
+
+// ============================================================================
+// wxPNGHandler implementation
+// ============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(wxPNGHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+#ifndef PNGLINKAGEMODE
+    #ifdef PNGAPI
+        #define PNGLINKAGEMODE PNGAPI
+    #elif defined(__WATCOMC__)
+        // we need an explicit cdecl for Watcom, at least according to
+        //
+        // http://sf.net/tracker/index.php?func=detail&aid=651492&group_id=9863&atid=109863
+        //
+        // more testing is needed for this however, please remove this comment
+        // if you can confirm that my fix works with Watcom 11
+        #define PNGLINKAGEMODE cdecl
+    #else
+        #define PNGLINKAGEMODE LINKAGEMODE
+    #endif
+#endif
+
+
+// VS: wxPNGInfoStruct declared below is a hack that needs some explanation.
+//     First, let me describe what's the problem: libpng uses jmp_buf in
+//     its png_struct structure. Unfortunately, this structure is
+//     compiler-specific and may vary in size, so if you use libpng compiled
+//     as DLL with another compiler than the main executable, it may not work
+//     (this is for example the case with wxMGL port and SciTech MGL library
+//     that provides custom runtime-loadable libpng implementation with jmpbuf
+//     disabled altogether). Luckily, it is still possible to use setjmp() &
+//     longjmp() as long as the structure is not part of png_struct.
+//
+//     Sadly, there's no clean way to attach user-defined data to png_struct.
+//     There is only one customizable place, png_struct.io_ptr, which is meant
+//     only for I/O routines and is set with png_set_read_fn or
+//     png_set_write_fn. The hacky part is that we use io_ptr to store
+//     a pointer to wxPNGInfoStruct that holds I/O structures _and_ jmp_buf.
+
+struct wxPNGInfoStruct
+{
+    jmp_buf jmpbuf;
+    bool verbose;
+
+    union
+    {
+        wxInputStream  *in;
+        wxOutputStream *out;
+    } stream;
+};
+
+#define WX_PNG_INFO(png_ptr) ((wxPNGInfoStruct*)png_get_io_ptr(png_ptr))
+
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+extern "C"
+{
+
+void PNGLINKAGEMODE wx_PNG_stream_reader( png_structp png_ptr, png_bytep data,
+                                          png_size_t length )
+{
+    WX_PNG_INFO(png_ptr)->stream.in->Read(data, length);
+}
+
+void PNGLINKAGEMODE wx_PNG_stream_writer( png_structp png_ptr, png_bytep data,
+                                          png_size_t length )
+{
+    WX_PNG_INFO(png_ptr)->stream.out->Write(data, length);
+}
+
+void
+PNGLINKAGEMODE wx_png_warning(png_structp png_ptr, png_const_charp message)
+{
+    wxPNGInfoStruct *info = png_ptr ? WX_PNG_INFO(png_ptr) : NULL;
+    if ( !info || info->verbose )
+        wxLogWarning( wxString::FromAscii(message) );
+}
+
+// from pngerror.c
+// so that the libpng doesn't send anything on stderr
+void
+PNGLINKAGEMODE wx_png_error(png_structp png_ptr, png_const_charp message)
+{
+    wx_png_warning(NULL, message);
+
+    // we're not using libpng built-in jump buffer (see comment before
+    // wxPNGInfoStruct above) so we have to return ourselves, otherwise libpng
+    // would just abort
+    longjmp(WX_PNG_INFO(png_ptr)->jmpbuf, 1);
+}
+
+} // extern "C"
+
+// ----------------------------------------------------------------------------
+// LoadFile() helpers
+// ----------------------------------------------------------------------------
+
+// determine the kind of transparency we need for this image: if the only alpha
+// values it has are 0 (transparent) and 0xff (opaque) then we can simply
+// create a mask for it, we should be ok with a simple mask but otherwise we
+// need a full blown alpha channel in wxImage
+//
+// parameters:
+//      lines           raw PNG data
+//      x, y            starting position
+//      w, h            size of the image
+//      numColBytes     number of colour bytes (1 for grey scale, 3 for RGB)
+//                      (NB: alpha always follows the colour bytes)
+Transparency
+CheckTransparency(unsigned char **lines,
+                  png_uint_32 x, png_uint_32 y, png_uint_32 w, png_uint_32 h,
+                  size_t numColBytes)
+{
+    // suppose that a mask will suffice and check all the remaining alpha
+    // values to see if it does
+    for ( ; y < h; y++ )
+    {
+        // each pixel is numColBytes+1 bytes, offset into the current line by
+        // the current x position
+        unsigned const char *ptr = lines[y] + (x * (numColBytes + 1));
+
+        for ( png_uint_32 x2 = x; x2 < w; x2++ )
+        {
+            // skip the grey or colour byte(s)
+            ptr += numColBytes;
+
+            unsigned char a2 = *ptr++;
+
+            if ( !IsTransparent(a2) && !IsOpaque(a2) )
+            {
+                // not fully opaque nor fully transparent, hence need alpha
+                return Transparency_Alpha;
+            }
+        }
+
+        // during the next loop iteration check all the pixels in the row
+        x = 0;
+    }
+
+    // mask will be enough
+    return Transparency_Mask;
+}
+
+unsigned char *InitAlpha(wxImage *image, png_uint_32 x, png_uint_32 y)
+{
+    // create alpha channel
+    image->SetAlpha();
+
+    unsigned char *alpha = image->GetAlpha();
+
+    // set alpha for the pixels we had so far
+    png_uint_32 end = y * image->GetWidth() + x;
+    for ( png_uint_32 i = 0; i < end; i++ )
+    {
+        // all the previous pixels were opaque
+        *alpha++ = 0xff;
+    }
+
+    return alpha;
+}
+
+void
+FindMaskColour(unsigned char **lines, png_uint_32 width, png_uint_32 height,
+               unsigned char& rMask, unsigned char& gMask, unsigned char& bMask)
+{
+    // choosing the colour for the mask is more
+    // difficult: we need to iterate over the entire
+    // image for this in order to choose an unused
+    // colour (this is not very efficient but what else
+    // can we do?)
+    wxImageHistogram h;
+    unsigned nentries = 0;
+    unsigned char r2, g2, b2;
+    for ( png_uint_32 y2 = 0; y2 < height; y2++ )
+    {
+        const unsigned char *p = lines[y2];
+        for ( png_uint_32 x2 = 0; x2 < width; x2++ )
+        {
+            r2 = *p++;
+            g2 = *p++;
+            b2 = *p++;
+            ++p; // jump over alpha
+
+            wxImageHistogramEntry&
+                entry = h[wxImageHistogram:: MakeKey(r2, g2, b2)];
+
+            if ( entry.value++ == 0 )
+                entry.index = nentries++;
+        }
+    }
+
+    if ( !h.FindFirstUnusedColour(&rMask, &gMask, &bMask) )
+    {
+        wxLogWarning(_("Too many colours in PNG, the image may be slightly blurred."));
+
+        // use a fixed mask colour and we'll fudge
+        // the real pixels with this colour (see
+        // below)
+        rMask = 0xfe;
+        gMask = 0;
+        bMask = 0xff;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// reading PNGs
+// ----------------------------------------------------------------------------
+
+bool wxPNGHandler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[4];
+
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return false;
+
+    return memcmp(hdr, "\211PNG", WXSIZEOF(hdr)) == 0;
+}
+
+// convert data from RGB to wxImage format
+static
+void CopyDataFromPNG(wxImage *image,
+                     unsigned char **lines,
+                     png_uint_32 width,
+                     png_uint_32 height,
+                     int color_type)
+{
+    Transparency transparency = Transparency_None;
+
+    // only non NULL if transparency == Transparency_Alpha
+    unsigned char *alpha = NULL;
+
+    // RGB of the mask colour if transparency == Transparency_Mask
+    // (but init them anyhow to avoid compiler warnings)
+    unsigned char rMask = 0,
+                  gMask = 0,
+                  bMask = 0;
+
+    unsigned char *ptrDst = image->GetData();
+    if ( !(color_type & PNG_COLOR_MASK_COLOR) )
+    {
+        // grey image: GAGAGA... where G == grey component and A == alpha
+        for ( png_uint_32 y = 0; y < height; y++ )
+        {
+            const unsigned char *ptrSrc = lines[y];
+            for ( png_uint_32 x = 0; x < width; x++ )
+            {
+                unsigned char g = *ptrSrc++;
+                unsigned char a = *ptrSrc++;
+
+                // the first time we encounter a transparent pixel we must
+                // decide about what to do about them
+                if ( !IsOpaque(a) && transparency == Transparency_None )
+                {
+                    // we'll need at least the mask for this image and
+                    // maybe even full alpha channel info: the former is
+                    // only enough if we have alpha values of 0 and 0xff
+                    // only, otherwisewe need the latter
+                    transparency = CheckTransparency
+                                   (
+                                        lines,
+                                        x, y,
+                                        width, height,
+                                        1
+                                   );
+
+                    if ( transparency == Transparency_Mask )
+                    {
+                        // let's choose this colour for the mask: this is
+                        // not a problem here as all the other pixels are
+                        // grey, i.e. R == G == B which is not the case for
+                        // this one so no confusion is possible
+                        rMask = 0xff;
+                        gMask = 0;
+                        bMask = 0xff;
+                    }
+                    else // transparency == Transparency_Alpha
+                    {
+                        alpha = InitAlpha(image, x, y);
+                    }
+                }
+
+                switch ( transparency )
+                {
+                    case Transparency_Mask:
+                        if ( IsTransparent(a) )
+                        {
+                            *ptrDst++ = rMask;
+                            *ptrDst++ = gMask;
+                            *ptrDst++ = bMask;
+                            break;
+                        }
+                        // else: !transparent
+
+                        // must be opaque then as otherwise we shouldn't be
+                        // using the mask at all
+                        wxASSERT_MSG( IsOpaque(a), _T("logic error") );
+
+                        // fall through
+
+                    case Transparency_Alpha:
+                        if ( alpha )
+                            *alpha++ = a;
+                        // fall through
+
+                    case Transparency_None:
+                        *ptrDst++ = g;
+                        *ptrDst++ = g;
+                        *ptrDst++ = g;
+                        break;
+                }
+            }
+        }
+    }
+    else // colour image: RGBRGB...
+    {
+        for ( png_uint_32 y = 0; y < height; y++ )
+        {
+            const unsigned char *ptrSrc = lines[y];
+            for ( png_uint_32 x = 0; x < width; x++ )
+            {
+                unsigned char r = *ptrSrc++;
+                unsigned char g = *ptrSrc++;
+                unsigned char b = *ptrSrc++;
+                unsigned char a = *ptrSrc++;
+
+                // the logic here is the same as for the grey case except
+                // where noted
+                if ( !IsOpaque(a) && transparency == Transparency_None )
+                {
+                    transparency = CheckTransparency
+                                   (
+                                        lines,
+                                        x, y,
+                                        width, height,
+                                        3
+                                   );
+
+                    if ( transparency == Transparency_Mask )
+                    {
+                        FindMaskColour(lines, width, height,
+                                       rMask, gMask, bMask);
+                    }
+                    else // transparency == Transparency_Alpha
+                    {
+                        alpha = InitAlpha(image, x, y);
+                    }
+
+                }
+
+                switch ( transparency )
+                {
+                    case Transparency_Mask:
+                        if ( IsTransparent(a) )
+                        {
+                            *ptrDst++ = rMask;
+                            *ptrDst++ = gMask;
+                            *ptrDst++ = bMask;
+                            break;
+                        }
+                        else // !transparent
+                        {
+                            // must be opaque then as otherwise we shouldn't be
+                            // using the mask at all
+                            wxASSERT_MSG( IsOpaque(a), _T("logic error") );
+
+                            // if we couldn't find a unique colour for the
+                            // mask, we can have real pixels with the same
+                            // value as the mask and it's better to slightly
+                            // change their colour than to make them
+                            // transparent
+                            if ( r == rMask && g == gMask && b == bMask )
+                            {
+                                r++;
+                            }
+                        }
+
+                        // fall through
+
+                    case Transparency_Alpha:
+                        if ( alpha )
+                            *alpha++ = a;
+                        // fall through
+
+                    case Transparency_None:
+                        *ptrDst++ = r;
+                        *ptrDst++ = g;
+                        *ptrDst++ = b;
+                        break;
+                }
+            }
+        }
+    }
+
+    if ( transparency == Transparency_Mask )
+    {
+        image->SetMaskColour(rMask, gMask, bMask);
+    }
+}
+
+// temporarily disable the warning C4611 (interaction between '_setjmp' and
+// C++ object destruction is non-portable) - I don't see any dtors here
+#ifdef __VISUALC__
+    #pragma warning(disable:4611)
+#endif /* VC++ */
+
+bool
+wxPNGHandler::LoadFile(wxImage *image,
+                       wxInputStream& stream,
+                       bool verbose,
+                       int WXUNUSED(index))
+{
+    // VZ: as this function uses setjmp() the only fool-proof error handling
+    //     method is to use goto (setjmp is not really C++ dtors friendly...)
+
+    unsigned char **lines = NULL;
+    png_infop info_ptr = (png_infop) NULL;
+    wxPNGInfoStruct wxinfo;
+
+    png_uint_32 i, width, height = 0;
+    int bit_depth, color_type, interlace_type;
+
+    wxinfo.verbose = verbose;
+    wxinfo.stream.in = &stream;
+
+    image->Destroy();
+
+    png_structp png_ptr = png_create_read_struct
+                          (
+                            PNG_LIBPNG_VER_STRING,
+                            NULL,
+                            wx_png_error,
+                            wx_png_warning
+                          );
+    if (!png_ptr)
+        goto error;
+
+    // NB: please see the comment near wxPNGInfoStruct declaration for
+    //     explanation why this line is mandatory
+    png_set_read_fn( png_ptr, &wxinfo, wx_PNG_stream_reader);
+
+    info_ptr = png_create_info_struct( png_ptr );
+    if (!info_ptr)
+        goto error;
+
+    if (setjmp(wxinfo.jmpbuf))
+        goto error;
+
+    png_read_info( png_ptr, info_ptr );
+    png_get_IHDR( png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, (int*) NULL, (int*) NULL );
+
+    if (color_type == PNG_COLOR_TYPE_PALETTE)
+        png_set_expand( png_ptr );
+
+    // Fix for Bug [ 439207 ] Monochrome PNG images come up black
+    if (bit_depth < 8)
+        png_set_expand( png_ptr );
+
+    png_set_strip_16( png_ptr );
+    png_set_packing( png_ptr );
+    if (png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS))
+        png_set_expand( png_ptr );
+    png_set_filler( png_ptr, 0xff, PNG_FILLER_AFTER );
+
+    image->Create((int)width, (int)height, (bool) false /* no need to init pixels */);
+
+    if (!image->Ok())
+        goto error;
+
+    // initialize all line pointers to NULL to ensure that they can be safely
+    // free()d if an error occurs before all of them could be allocated
+    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
+    if ( !lines )
+        goto error;
+
+    for (i = 0; i < height; i++)
+    {
+        if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
+            goto error;
+    }
+
+    png_read_image( png_ptr, lines );
+    png_read_end( png_ptr, info_ptr );
+
+#if wxUSE_PALETTE
+    if (color_type == PNG_COLOR_TYPE_PALETTE)
+    {
+        int ncolors = 0;
+        png_colorp palette;
+        png_get_PLTE( png_ptr, info_ptr, &palette, &ncolors);
+        unsigned char* r = new unsigned char[ncolors];
+        unsigned char* g = new unsigned char[ncolors];
+        unsigned char* b = new unsigned char[ncolors];
+        int j;
+
+        for (j = 0; j < ncolors; j++)
+        {
+            r[j] = palette[j].red;
+            g[j] = palette[j].green;
+            b[j] = palette[j].blue;
+        }
+
+        image->SetPalette(wxPalette(ncolors, r, g, b));
+        delete[] r;
+        delete[] g;
+        delete[] b;
+    }
+#endif // wxUSE_PALETTE
+
+    png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
+
+    // loaded successfully, now init wxImage with this data
+    CopyDataFromPNG(image, lines, width, height, color_type);
+
+    for ( i = 0; i < height; i++ )
+        free( lines[i] );
+    free( lines );
+
+    return true;
+
+error:
+    if (verbose)
+       wxLogError(_("Couldn't load a PNG image - file is corrupted or not enough memory."));
+
+    if ( image->Ok() )
+    {
+        image->Destroy();
+    }
+
+    if ( lines )
+    {
+        for ( unsigned int n = 0; n < height; n++ )
+            free( lines[n] );
+
+        free( lines );
+    }
+
+    if ( png_ptr )
+    {
+        if ( info_ptr )
+        {
+            png_destroy_read_struct( &png_ptr, &info_ptr, (png_infopp) NULL );
+            free(info_ptr);
+        }
+        else
+            png_destroy_read_struct( &png_ptr, (png_infopp) NULL, (png_infopp) NULL );
+    }
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// writing PNGs
+// ----------------------------------------------------------------------------
+
+bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
+{
+    wxPNGInfoStruct wxinfo;
+
+    wxinfo.verbose = verbose;
+    wxinfo.stream.out = &stream;
+
+    png_structp png_ptr = png_create_write_struct
+                          (
+                            PNG_LIBPNG_VER_STRING,
+                            NULL,
+                            wx_png_error,
+                            wx_png_warning
+                          );
+    if (!png_ptr)
+    {
+        if (verbose)
+           wxLogError(_("Couldn't save PNG image."));
+        return false;
+    }
+
+    png_infop info_ptr = png_create_info_struct(png_ptr);
+    if (info_ptr == NULL)
+    {
+        png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
+        if (verbose)
+           wxLogError(_("Couldn't save PNG image."));
+        return false;
+    }
+
+    if (setjmp(wxinfo.jmpbuf))
+    {
+        png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
+        if (verbose)
+           wxLogError(_("Couldn't save PNG image."));
+        return false;
+    }
+
+    // NB: please see the comment near wxPNGInfoStruct declaration for
+    //     explanation why this line is mandatory
+    png_set_write_fn( png_ptr, &wxinfo, wx_PNG_stream_writer, NULL);
+
+    const int iColorType = image->HasOption(wxIMAGE_OPTION_PNG_FORMAT)
+                            ? image->GetOptionInt(wxIMAGE_OPTION_PNG_FORMAT)
+                            : wxPNG_TYPE_COLOUR;
+    const int iBitDepth = image->HasOption(wxIMAGE_OPTION_PNG_BITDEPTH)
+                            ? image->GetOptionInt(wxIMAGE_OPTION_PNG_BITDEPTH)
+                            : 8;
+
+    wxASSERT_MSG( iBitDepth == 8 || iBitDepth == 16,
+                    _T("PNG bit depth must be 8 or 16") );
+
+    bool bHasAlpha = image->HasAlpha();
+    bool bHasMask = image->HasMask();
+    bool bUseAlpha = bHasAlpha || bHasMask;
+
+    int iPngColorType;
+    if ( iColorType==wxPNG_TYPE_COLOUR )
+    {
+        iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_RGB_ALPHA
+                                  : PNG_COLOR_TYPE_RGB;
+    }
+    else
+    {
+        iPngColorType = bUseAlpha ? PNG_COLOR_TYPE_GRAY_ALPHA
+                                  : PNG_COLOR_TYPE_GRAY;
+    }
+
+    png_set_IHDR( png_ptr, info_ptr, image->GetWidth(), image->GetHeight(),
+                  iBitDepth, iPngColorType,
+                  PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
+                  PNG_FILTER_TYPE_BASE);
+
+    int iElements;
+    png_color_8 sig_bit;
+
+    if ( iPngColorType & PNG_COLOR_MASK_COLOR )
+    {
+        sig_bit.red =
+        sig_bit.green =
+        sig_bit.blue = (png_byte)iBitDepth;
+        iElements = 3;
+    }
+    else // grey
+    {
+        sig_bit.gray = (png_byte)iBitDepth;
+        iElements = 1;
+    }
+
+    if ( iPngColorType & PNG_COLOR_MASK_ALPHA )
+    {
+        sig_bit.alpha = (png_byte)iBitDepth;
+        iElements++;
+    }
+
+    if ( iBitDepth == 16 )
+        iElements *= 2;
+
+    png_set_sBIT( png_ptr, info_ptr, &sig_bit );
+    png_write_info( png_ptr, info_ptr );
+    png_set_shift( png_ptr, &sig_bit );
+    png_set_packing( png_ptr );
+
+    unsigned char *
+        data = (unsigned char *)malloc( image->GetWidth() * iElements );
+    if ( !data )
+    {
+        png_destroy_write_struct( &png_ptr, (png_infopp)NULL );
+        return false;
+    }
+
+    unsigned char *
+        pAlpha = (unsigned char *)(bHasAlpha ? image->GetAlpha() : NULL);
+    int iHeight = image->GetHeight();
+    int iWidth = image->GetWidth();
+
+    unsigned char uchMaskRed = 0, uchMaskGreen = 0, uchMaskBlue = 0;
+
+    if ( bHasMask )
+    {
+        uchMaskRed = image->GetMaskRed();
+        uchMaskGreen = image->GetMaskGreen();
+        uchMaskBlue = image->GetMaskBlue();
+    }
+
+    unsigned char *pColors = image->GetData();
+
+    for (int y = 0; y != iHeight; ++y)
+    {
+        unsigned char *pData = data;
+        for (int x = 0; x != iWidth; x++)
+        {
+            unsigned char uchRed = *pColors++;
+            unsigned char uchGreen = *pColors++;
+            unsigned char uchBlue = *pColors++;
+
+            switch ( iColorType )
+            {
+                default:
+                    wxFAIL_MSG( _T("unknown wxPNG_TYPE_XXX") );
+                    // fall through
+
+                case wxPNG_TYPE_COLOUR:
+                    *pData++ = uchRed;
+                    if ( iBitDepth == 16 )
+                        *pData++ = 0;
+                    *pData++ = uchGreen;
+                    if ( iBitDepth == 16 )
+                        *pData++ = 0;
+                    *pData++ = uchBlue;
+                    if ( iBitDepth == 16 )
+                        *pData++ = 0;
+                    break;
+
+                case wxPNG_TYPE_GREY:
+                    {
+                        // where do these coefficients come from? maybe we
+                        // should have image options for them as well?
+                        unsigned uiColor =
+                            (unsigned) (76.544*(unsigned)uchRed +
+                                        150.272*(unsigned)uchGreen +
+                                        36.864*(unsigned)uchBlue);
+
+                        *pData++ = (unsigned char)((uiColor >> 8) & 0xFF);
+                        if ( iBitDepth == 16 )
+                            *pData++ = (unsigned char)(uiColor & 0xFF);
+                    }
+                    break;
+
+                case wxPNG_TYPE_GREY_RED:
+                    *pData++ = uchRed;
+                    if ( iBitDepth == 16 )
+                        *pData++ = 0;
+                    break;
+            }
+
+            if ( bUseAlpha )
+            {
+                unsigned char uchAlpha = 255;
+                if ( bHasAlpha )
+                    uchAlpha = *pAlpha++;
+
+                if ( bHasMask )
+                {
+                    if ( (uchRed == uchMaskRed)
+                            && (uchGreen == uchMaskGreen)
+                                && (uchBlue == uchMaskBlue) )
+                        uchAlpha = 0;
+                }
+
+                *pData++ = uchAlpha;
+                if ( iBitDepth == 16 )
+                    *pData++ = 0;
+            }
+        }
+
+        png_bytep row_ptr = data;
+        png_write_rows( png_ptr, &row_ptr, 1 );
+    }
+
+    free(data);
+    png_write_end( png_ptr, info_ptr );
+    png_destroy_write_struct( &png_ptr, (png_infopp)&info_ptr );
+
+    return true;
+}
+
+#ifdef __VISUALC__
+    #pragma warning(default:4611)
+#endif /* VC++ */
+
+#endif  // wxUSE_STREAMS
+
+#endif  // wxUSE_LIBPNG
diff --git a/Source/3rd Party/wx/src/common/imagpnm.cpp b/Source/3rd Party/wx/src/common/imagpnm.cpp
index 48491b389..3fcc95916 100644
--- a/Source/3rd Party/wx/src/common/imagpnm.cpp	
+++ b/Source/3rd Party/wx/src/common/imagpnm.cpp	
@@ -1,216 +1,201 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagpnm.cpp
-// Purpose:     wxImage PNM handler
-// Author:      Sylvain Bougnoux
-// RCS-ID:      $Id$
-// Copyright:   (c) Sylvain Bougnoux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && wxUSE_PNM
-
-#include "wx/imagpnm.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/txtstrm.h"
-
-//-----------------------------------------------------------------------------
-// wxBMPHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
-
-#if wxUSE_STREAMS
-
-void Skip_Comment(wxInputStream &stream)
-{
-    wxTextInputStream text_stream(stream);
-
-    if (stream.Peek()==wxT('#'))
-    {
-        text_stream.ReadLine();
-        Skip_Comment(stream);
-    }
-}
-
-bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
-{
-    wxUint32  width, height;
-    wxUint16  maxval;
-    char      c(0);
-
-    image->Destroy();
-
-    /*
-     * Read the PNM header
-     */
-
-    wxBufferedInputStream buf_stream(stream);
-    wxTextInputStream text_stream(buf_stream);
-
-    Skip_Comment(buf_stream);
-    if (buf_stream.GetC()==wxT('P')) c=buf_stream.GetC();
-
-    switch (c)
-    {
-        case wxT('2'): // ASCII Grey
-        case wxT('3'): // ASCII RGB
-        case wxT('5'): // RAW Grey
-        case wxT('6'): break;
-        default:
-            if (verbose)
-            {
-                wxLogError(_("PNM: File format is not recognized."));
-            }
-            return false;
-    }
-
-    text_stream.ReadLine(); // for the \n
-    Skip_Comment(buf_stream);
-    text_stream >> width >> height ;
-    Skip_Comment(buf_stream);
-    text_stream >> maxval;
-
-    //cout << line << " " << width << " " << height << " " << maxval << endl;
-    image->Create( width, height );
-    unsigned char *ptr = image->GetData();
-    if (!ptr)
-    {
-        if (verbose)
-        {
-           wxLogError( _("PNM: Couldn't allocate memory.") );
-        }
-        return false;
-    }
-
-
-    if (c=='2') // Ascii GREY
-    {
-        wxUint32 value, size=width*height;
-        for (wxUint32 i=0; i<size; ++i)
-        {
-            value=text_stream.Read32();
-            if ( maxval != 255 )
-                value = (255 * value)/maxval;
-            *ptr++=(unsigned char)value; // R
-            *ptr++=(unsigned char)value; // G
-            *ptr++=(unsigned char)value; // B
-            if ( !buf_stream )
-            {
-                if (verbose)
-                {
-                    wxLogError(_("PNM: File seems truncated."));
-                }
-                return false;
-            }
-        }
-    }
-    if (c=='3') // Ascii RBG
-    {
-        wxUint32 value, size=3*width*height;
-        for (wxUint32 i=0; i<size; ++i)
-          {
-            //this is very slow !!!
-            //I wonder how we can make any better ?
-            value=text_stream.Read32();
-            if ( maxval != 255 )
-                value = (255 * value)/maxval;
-            *ptr++=(unsigned char)value;
-
-            if ( !buf_stream )
-              {
-                if (verbose)
-                {
-                    wxLogError(_("PNM: File seems truncated."));
-                }
-                return false;
-              }
-          }
-    }
-    if (c=='5') // Raw GREY
-    {
-        wxUint32 size=width*height;
-        unsigned char value;
-        for (wxUint32 i=0; i<size; ++i)
-        {
-            buf_stream.Read(&value,1);
-            if ( maxval != 255 )
-                value = (255 * value)/maxval;
-            *ptr++=value; // R
-            *ptr++=value; // G
-            *ptr++=value; // B
-            if ( !buf_stream )
-            {
-                if (verbose)
-                {
-                    wxLogError(_("PNM: File seems truncated."));
-                }
-                return false;
-            }
-        }
-    }
-
-    if ( c=='6' ) // Raw RGB
-    {
-        buf_stream.Read(ptr, 3*width*height);
-        if ( maxval != 255 )
-        {
-            for ( unsigned i = 0; i < 3*width*height; i++ )
-                ptr[i] = (255 * ptr[i])/maxval;
-        }
-    }
-
-    image->SetMask( false );
-
-    const wxStreamError err = buf_stream.GetLastError();
-    return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
-}
-
-bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )
-{
-    wxTextOutputStream text_stream(stream);
-
-    //text_stream << "P6" << endl
-    //<< image->GetWidth() << " " << image->GetHeight() << endl
-    //<< "255" << endl;
-    text_stream << wxT("P6\n") << image->GetWidth() << wxT(" ") << image->GetHeight() << wxT("\n255\n");
-    stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight());
-
-    return stream.IsOk();
-}
-
-bool wxPNMHandler::DoCanRead( wxInputStream& stream )
-{
-    Skip_Comment(stream);
-
-    // it's ok to modify the stream position here
-    if ( stream.GetC() == 'P' )
-    {
-        switch ( stream.GetC() )
-        {
-            case '2': // ASCII Grey
-            case '3': // ASCII RGB
-            case '5': // RAW Grey
-            case '6': // RAW RGB
-                return true;
-        }
-    }
-
-    return false;
-}
-
-
-#endif // wxUSE_STREAMS
-
-#endif // wxUSE_IMAGE && wxUSE_PNM
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagpnm.cpp
+// Purpose:     wxImage PNM handler
+// Author:      Sylvain Bougnoux
+// RCS-ID:      $Id: imagpnm.cpp 46311 2007-06-03 22:14:32Z VZ $
+// Copyright:   (c) Sylvain Bougnoux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_PNM
+
+#include "wx/imagpnm.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/txtstrm.h"
+
+//-----------------------------------------------------------------------------
+// wxBMPHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+void Skip_Comment(wxInputStream &stream)
+{
+    wxTextInputStream text_stream(stream);
+
+    if (stream.Peek()==wxT('#'))
+    {
+        text_stream.ReadLine();
+        Skip_Comment(stream);
+    }
+}
+
+bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
+{
+    wxUint32  width, height;
+    wxUint16  maxval;
+    char      c(0);
+
+    image->Destroy();
+
+    /*
+     * Read the PNM header
+     */
+
+    wxBufferedInputStream buf_stream(stream);
+    wxTextInputStream text_stream(buf_stream);
+
+    Skip_Comment(buf_stream);
+    if (buf_stream.GetC()==wxT('P')) c=buf_stream.GetC();
+
+    switch (c)
+    {
+        case wxT('2'): // ASCII Grey
+        case wxT('3'): // ASCII RGB
+        case wxT('5'): // RAW Grey
+        case wxT('6'): break;
+        default:
+            if (verbose) wxLogError(_("PNM: File format is not recognized."));
+            return false;
+    }
+
+    text_stream.ReadLine(); // for the \n
+    Skip_Comment(buf_stream);
+    text_stream >> width >> height ;
+    Skip_Comment(buf_stream);
+    text_stream >> maxval;
+
+    //cout << line << " " << width << " " << height << " " << maxval << endl;
+    image->Create( width, height );
+    unsigned char *ptr = image->GetData();
+    if (!ptr)
+    {
+        if (verbose)
+           wxLogError( _("PNM: Couldn't allocate memory.") );
+        return false;
+    }
+
+
+    if (c=='2') // Ascii GREY
+    {
+        wxUint32 value, size=width*height;
+        for (wxUint32 i=0; i<size; ++i)
+        {
+            value=text_stream.Read32();
+            if ( maxval != 255 )
+                value = (255 * value)/maxval;
+            *ptr++=(unsigned char)value; // R
+            *ptr++=(unsigned char)value; // G
+            *ptr++=(unsigned char)value; // B
+            if ( !buf_stream )
+            {
+                if (verbose) wxLogError(_("PNM: File seems truncated."));
+                return false;
+            }
+        }
+    }
+    if (c=='3') // Ascii RBG
+    {
+        wxUint32 value, size=3*width*height;
+        for (wxUint32 i=0; i<size; ++i)
+          {
+            //this is very slow !!!
+            //I wonder how we can make any better ?
+            value=text_stream.Read32();
+            if ( maxval != 255 )
+                value = (255 * value)/maxval;
+            *ptr++=(unsigned char)value;
+
+            if ( !buf_stream )
+              {
+                if (verbose) wxLogError(_("PNM: File seems truncated."));
+                return false;
+              }
+          }
+    }
+    if (c=='5') // Raw GREY
+    {
+        wxUint32 size=width*height;
+        unsigned char value;
+        for (wxUint32 i=0; i<size; ++i)
+        {
+            buf_stream.Read(&value,1);
+            if ( maxval != 255 )
+                value = (255 * value)/maxval;
+            *ptr++=value; // R
+            *ptr++=value; // G
+            *ptr++=value; // B
+            if ( !buf_stream )
+            {
+                if (verbose) wxLogError(_("PNM: File seems truncated."));
+                return false;
+            }
+        }
+    }
+
+    if ( c=='6' ) // Raw RGB
+    {
+        buf_stream.Read(ptr, 3*width*height);
+        if ( maxval != 255 )
+        {
+            for ( unsigned i = 0; i < 3*width*height; i++ )
+                ptr[i] = (255 * ptr[i])/maxval;
+        }
+    }
+
+    image->SetMask( false );
+
+    const wxStreamError err = buf_stream.GetLastError();
+    return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
+}
+
+bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )
+{
+    wxTextOutputStream text_stream(stream);
+
+    //text_stream << "P6" << endl
+    //<< image->GetWidth() << " " << image->GetHeight() << endl
+    //<< "255" << endl;
+    text_stream << wxT("P6\n") << image->GetWidth() << wxT(" ") << image->GetHeight() << wxT("\n255\n");
+    stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight());
+
+    return stream.IsOk();
+}
+
+bool wxPNMHandler::DoCanRead( wxInputStream& stream )
+{
+    Skip_Comment(stream);
+
+    if ( stream.GetC() == 'P' )
+    {
+        switch ( stream.GetC() )
+        {
+            case '2': // ASCII Grey
+            case '3': // ASCII RGB
+            case '5': // RAW Grey
+            case '6': // RAW RGB
+                return true;
+        }
+    }
+
+    return false;
+}
+
+
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_IMAGE && wxUSE_PNM
diff --git a/Source/3rd Party/wx/src/common/imagtga.cpp b/Source/3rd Party/wx/src/common/imagtga.cpp
index a4a4a7d69..c9b39dce7 100644
--- a/Source/3rd Party/wx/src/common/imagtga.cpp	
+++ b/Source/3rd Party/wx/src/common/imagtga.cpp	
@@ -1,874 +1,750 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagtga.cpp
-// Purpose:     wxImage TGA handler
-// Author:      Seth Jackson
-// CVS-ID:      $Id$
-// Copyright:   (c) 2005 Seth Jackson
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && wxUSE_TGA
-
-#ifndef WX_PRECOMP
-    #include "wx/palette.h"
-#endif
-
-#include "wx/imagtga.h"
-#include "wx/log.h"
-#include "wx/scopeguard.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// TGA error codes.
-enum
-{
-    wxTGA_OK,
-    wxTGA_INVFORMAT,
-    wxTGA_MEMERR,
-    wxTGA_IOERR
-};
-
-// TGA header bytes.
-enum
-{
-    HDR_OFFSET = 0,
-    HDR_COLORTYPE  = 1,
-    HDR_IMAGETYPE = 2,
-    HDR_PALETTESTART = 3,
-    HDR_PALETTELENGTH = 5,
-    HDR_PALETTEBITS = 7,
-    HDR_XORIGIN = 8,
-    HDR_YORIGIN = 10,
-    HDR_WIDTH = 12,
-    HDR_HEIGHT = 14,
-    HDR_BPP = 16,
-    HDR_ORIENTATION = 17,
-    HDR_SIZE
-};
-
-// TGA color types.
-enum
-{
-    wxTGA_UNMAPPED = 0,
-    wxTGA_MAPPED = 1
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-IMPLEMENT_DYNAMIC_CLASS(wxTGAHandler, wxImageHandler)
-
-#if wxUSE_STREAMS
-
-// ----------------------------------------------------------------------------
-// worker functions
-// ----------------------------------------------------------------------------
-
-static
-void FlipTGA(unsigned char* imageData, int width, int height, short pixelSize)
-{
-    int lineLength = width * pixelSize;
-    unsigned char *line1 = imageData;
-    unsigned char *line2 = &imageData[lineLength * (height - 1)];
-
-    unsigned char temp;
-    for ( ; line1 < line2; line2 -= (lineLength * 2))
-    {
-        for (int index = 0; index < lineLength; line1++, line2++, index++)
-        {
-            temp = *line1;
-            *line1 = *line2;
-            *line2 = temp;
-        }
-    }
-}
-
-// return wxTGA_OK or wxTGA_IOERR
-static
-int DecodeRLE(unsigned char* imageData, unsigned long imageSize,
-               short pixelSize, wxInputStream& stream)
-{
-    unsigned long index = 0;
-    unsigned char current;
-    unsigned int length;
-    unsigned char buf[4];
-
-    while (index < imageSize)
-    {
-        int ch = stream.GetC();
-        if ( ch == wxEOF )
-            return wxTGA_IOERR;
-
-        current = ch;
-
-        // RLE packet.
-        if ( current & 0x80 )
-        {
-            // Get the run length of the packet.
-            current &= 0x7f;
-
-            current++;
-
-            length = current;
-
-            index += current * pixelSize;
-
-            if (index >= imageSize)
-            {
-                return wxTGA_IOERR;
-            }
-
-            // Repeat the pixel length times.
-            if ( !stream.Read(buf, pixelSize) )
-                return wxTGA_IOERR;
-
-            for (unsigned int i = 0; i < length; i++)
-            {
-                memcpy(imageData, buf, pixelSize);
-
-                imageData += pixelSize;
-            }
-        }
-        else // Raw packet.
-        {
-            // Get the run length of the packet.
-            current++;
-
-            length = current * pixelSize;
-
-            index += length;
-
-            if (index >= imageSize)
-            {
-                return wxTGA_IOERR;
-            }
-
-            // Write the next length pixels directly to the image data.
-            if ( !stream.Read(imageData, length) )
-                return wxTGA_IOERR;
-
-            imageData += length;
-        }
-    }
-
-    return wxTGA_OK;
-}
-
-/*
-Mimic the behaviour of wxPalette.GetRGB and the way the TGA image handler
-used it. That is: don't check the return value of GetRGB and continue decoding
-using previous RGB values.
-
-It might be better to check for palette index bounds and stop decoding if
-it's out of range (and add something like wxTGA_DATAERR to indicate unexpected
-pixel data).
-*/
-static
-void Palette_GetRGB(const unsigned char *palette, unsigned int paletteCount,
-    unsigned int index,
-    unsigned char *red, unsigned char *green, unsigned char *blue)
-{
-    if (index >= paletteCount)
-    {
-        return;
-    }
-
-    *red   = palette[index];
-    *green = palette[(paletteCount * 1) + index];
-    *blue  = palette[(paletteCount * 2) + index];
-}
-
-static
-void Palette_SetRGB(unsigned char *palette, unsigned int paletteCount,
-    unsigned int index,
-    unsigned char red, unsigned char green, unsigned char blue)
-{
-    palette[index] = red;
-    palette[(paletteCount * 1) + index] = green;
-    palette[(paletteCount * 2) + index] = blue;
-}
-
-static
-int ReadTGA(wxImage* image, wxInputStream& stream)
-{
-    // Read in the TGA header
-    unsigned char hdr[HDR_SIZE];
-    stream.Read(hdr, HDR_SIZE);
-
-    short offset = hdr[HDR_OFFSET] + HDR_SIZE;
-    short colorType = hdr[HDR_COLORTYPE];
-    short imageType = hdr[HDR_IMAGETYPE];
-    unsigned int paletteLength = hdr[HDR_PALETTELENGTH]
-        + 256 * hdr[HDR_PALETTELENGTH + 1];
-    int width = (hdr[HDR_WIDTH] + 256 * hdr[HDR_WIDTH + 1]) -
-                (hdr[HDR_XORIGIN] + 256 * hdr[HDR_XORIGIN + 1]);
-    int height = (hdr[HDR_HEIGHT] + 256 * hdr[HDR_HEIGHT + 1]) -
-                 (hdr[HDR_YORIGIN] + 256 * hdr[HDR_YORIGIN + 1]);
-    short bpp = hdr[HDR_BPP];
-    short orientation = hdr[HDR_ORIENTATION] & 0x20;
-
-    image->Create(width, height);
-
-    if (!image->IsOk())
-    {
-        return wxTGA_MEMERR;
-    }
-
-    const short pixelSize = bpp / 8;
-
-    const unsigned long imageSize = width * height * pixelSize;
-
-    unsigned char *imageData = (unsigned char* )malloc(imageSize);
-
-    if (!imageData)
-    {
-        return wxTGA_MEMERR;
-    }
-
-    wxON_BLOCK_EXIT1(free, imageData);
-
-    unsigned char *dst = image->GetData();
-
-    unsigned char* alpha = NULL;
-    if (bpp == 16 || bpp == 32)
-    {
-        image->SetAlpha();
-
-        alpha = image->GetAlpha();
-    }
-
-    // Seek from the offset we got from the TGA header.
-    if (stream.SeekI(offset, wxFromStart) == wxInvalidOffset)
-        return wxTGA_INVFORMAT;
-
-    unsigned char *palette = NULL;
-    // Load a palette if we have one.
-    if (colorType == wxTGA_MAPPED)
-    {
-        unsigned char buf[3];
-
-        palette = (unsigned char *) malloc(paletteLength * 3);
-
-        for (unsigned int i = 0; i < paletteLength; i++)
-        {
-            stream.Read(buf, 3);
-
-            Palette_SetRGB(palette, paletteLength, i, buf[2], buf[1], buf[0]);
-        }
-
-#if wxUSE_PALETTE
-        // Set the palette of the image.
-        image->SetPalette(wxPalette((int) paletteLength, &palette[0],
-            &palette[paletteLength * 1], &palette[paletteLength * 2]));
-#endif // wxUSE_PALETTE
-
-    }
-
-    wxON_BLOCK_EXIT1(free, palette);
-
-    // Handle the various TGA formats we support.
-
-    switch (imageType)
-    {
-        // Raw indexed.
-
-        case 1:
-        {
-            unsigned char r = 0;
-            unsigned char g = 0;
-            unsigned char b = 0;
-
-            // No compression read the data directly to imageData.
-
-            stream.Read(imageData, imageSize);
-
-            // If orientation == 0, then the image is stored upside down.
-            // We need to store it right side up.
-
-            if (orientation == 0)
-            {
-                FlipTGA(imageData, width, height, pixelSize);
-            }
-
-            // Handle the different pixel depths.
-
-            switch (bpp)
-            {
-                // 8 bpp.
-
-                case 8:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        Palette_GetRGB(palette, paletteLength,
-                            imageData[index], &r, &g, &b);
-
-                        *(dst++) = r;
-                        *(dst++) = g;
-                        *(dst++) = b;
-                    }
-                }
-                break;
-
-                // 16 bpp.
-
-                case 16:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        Palette_GetRGB(palette, paletteLength,
-                            imageData[index], &r, &g, &b);
-
-                        *(dst++) = r;
-                        *(dst++) = g;
-                        *(dst++) = b;
-                        *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255;
-                    }
-                }
-                break;
-
-                default:
-                    return wxTGA_INVFORMAT;
-            }
-        }
-        break;
-
-        // Raw RGB.
-
-        case 2:
-        {
-            // No compression read the data directly to imageData.
-
-            stream.Read(imageData, imageSize);
-
-            // If orientation == 0, then the image is stored upside down.
-            // We need to store it right side up.
-
-            if (orientation == 0)
-            {
-                FlipTGA(imageData, width, height, pixelSize);
-            }
-
-            // Handle the different pixel depths.
-
-            switch (bpp)
-            {
-                //16 bpp.
-
-                case 16:
-                {
-                    unsigned char temp;
-
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        temp = (imageData[index + 1] & 0x7c) << 1;
-                        temp |= temp >> 5;
-                        *(dst++) = temp;
-
-                        temp = ((imageData[index + 1] & 0x03) << 6) | ((imageData[index] & 0xe0) >> 2);
-                        temp |= temp >> 5;
-                        *(dst++) = temp;
-
-                        temp = (imageData[index] & 0x1f) << 3;
-                        temp |= temp >> 5;
-                        *(dst++) = temp;
-
-                        *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255;
-                    }
-                }
-                break;
-
-                // 24 bpp.
-
-                case 24:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        *(dst++) = imageData[index + 2];
-                        *(dst++) = imageData[index + 1];
-                        *(dst++) = imageData[index];
-                    }
-                }
-                break;
-
-                // 32 bpp.
-
-                case 32:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        *(dst++) = imageData[index + 2];
-                        *(dst++) = imageData[index + 1];
-                        *(dst++) = imageData[index];
-                        *(alpha++) = imageData[index + 3];
-                    }
-                }
-                break;
-
-                default:
-                    return wxTGA_INVFORMAT;
-            }
-        }
-        break;
-
-        // Raw grayscale.
-
-        case 3:
-        {
-            // No compression read the data directly to imageData.
-
-            stream.Read(imageData, imageSize);
-
-            // If orientation == 0, then the image is stored upside down.
-            // We need to store it right side up.
-
-            if (orientation == 0)
-            {
-                FlipTGA(imageData, width, height, pixelSize);
-            }
-
-            // Handle the different pixel depths.
-
-            switch (bpp)
-            {
-                // 8 bpp.
-
-                case 8:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        *(dst++) = imageData[index];
-                        *(dst++) = imageData[index];
-                        *(dst++) = imageData[index];
-                    }
-                }
-                break;
-
-                // 16 bpp.
-
-                case 16:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        *(dst++) = imageData[index];
-                        *(dst++) = imageData[index];
-                        *(dst++) = imageData[index];
-                        *(alpha++) = imageData[index + 1];
-                    }
-                }
-                break;
-
-                default:
-                    return wxTGA_INVFORMAT;
-            }
-        }
-        break;
-
-        // RLE indexed.
-
-        case 9:
-        {
-            unsigned char r = 0;
-            unsigned char g = 0;
-            unsigned char b = 0;
-
-            // Decode the RLE data.
-
-            int rc =  DecodeRLE(imageData, imageSize, pixelSize, stream);
-            if ( rc != wxTGA_OK )
-                return rc;
-
-            // If orientation == 0, then the image is stored upside down.
-            // We need to store it right side up.
-
-            if (orientation == 0)
-            {
-                FlipTGA(imageData, width, height, pixelSize);
-            }
-
-            // Handle the different pixel depths.
-
-            switch (bpp)
-            {
-                // 8 bpp.
-
-                case 8:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        Palette_GetRGB(palette, paletteLength,
-                            imageData[index], &r, &g, &b);
-
-                        *(dst++) = r;
-                        *(dst++) = g;
-                        *(dst++) = b;
-                    }
-                }
-                break;
-
-                // 16 bpp.
-
-                case 16:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        Palette_GetRGB(palette, paletteLength,
-                            imageData[index], &r, &g, &b);
-
-                        *(dst++) = r;
-                        *(dst++) = g;
-                        *(dst++) = b;
-                        *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255;
-                    }
-                }
-                break;
-
-                default:
-                    return wxTGA_INVFORMAT;
-            }
-        }
-        break;
-
-        // RLE RGB.
-
-        case 10:
-        {
-            // Decode the RLE data.
-
-            int rc = DecodeRLE(imageData, imageSize, pixelSize, stream);
-            if ( rc != wxTGA_OK )
-                return rc;
-
-            // If orientation == 0, then the image is stored upside down.
-            // We need to store it right side up.
-
-            if (orientation == 0)
-            {
-                FlipTGA(imageData, width, height, pixelSize);
-            }
-
-            // Handle the different pixel depths.
-
-            switch (bpp)
-            {
-                //16 bpp.
-
-                case 16:
-                {
-                    unsigned char temp;
-
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        temp = (imageData[index + 1] & 0x7c) << 1;
-                        temp |= temp >> 5;
-                        *(dst++) = temp;
-
-                        temp = ((imageData[index + 1] & 0x03) << 6) | ((imageData[index] & 0xe0) >> 2);
-                        temp |= temp >> 5;
-                        *(dst++) = temp;
-
-                        temp = (imageData[index] & 0x1f) << 3;
-                        temp |= temp >> 5;
-                        *(dst++) = temp;
-
-                        *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255;
-                    }
-                }
-                break;
-
-                // 24 bpp.
-
-                case 24:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        *(dst++) = imageData[index + 2];
-                        *(dst++) = imageData[index + 1];
-                        *(dst++) = imageData[index];
-                    }
-                }
-                break;
-
-                // 32 bpp.
-
-                case 32:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        *(dst++) = imageData[index + 2];
-                        *(dst++) = imageData[index + 1];
-                        *(dst++) = imageData[index];
-                        *(alpha++) = imageData[index + 3];
-                    }
-                }
-                break;
-
-                default:
-                    return wxTGA_INVFORMAT;
-            }
-        }
-        break;
-
-        // RLE grayscale.
-
-        case 11:
-        {
-            // Decode the RLE data.
-
-            int rc = DecodeRLE(imageData, imageSize, pixelSize, stream);
-            if ( rc != wxTGA_OK )
-                return rc;
-
-            // If orientation == 0, then the image is stored upside down.
-            // We need to store it right side up.
-
-            if (orientation == 0)
-            {
-                FlipTGA(imageData, width, height, pixelSize);
-            }
-
-            // Handle the different pixel depths.
-
-            switch (bpp)
-            {
-                // 8 bpp.
-
-                case 8:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        *(dst++) = imageData[index];
-                        *(dst++) = imageData[index];
-                        *(dst++) = imageData[index];
-                    }
-                }
-                break;
-
-                // 16 bpp.
-
-                case 16:
-                {
-                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
-                    {
-                        *(dst++) = imageData[index];
-                        *(dst++) = imageData[index];
-                        *(dst++) = imageData[index];
-                        *(alpha++) = imageData[index + 1];
-                    }
-                }
-                break;
-
-                default:
-                    return wxTGA_INVFORMAT;
-            }
-        }
-        break;
-
-        default:
-            return wxTGA_INVFORMAT;
-    }
-
-    return wxTGA_OK;
-}
-
-static
-int SaveTGA(const wxImage& image, wxOutputStream *stream)
-{
-    bool hasAlpha = image.HasAlpha();
-    unsigned bytesPerPixel = 3 + (hasAlpha ? 1 : 0);
-    wxSize size = image.GetSize();
-    size_t scanlineSize = size.x * bytesPerPixel;
-    unsigned char *scanlineData = (unsigned char *) malloc(scanlineSize);
-    if (!scanlineData)
-    {
-        return wxTGA_MEMERR;
-    }
-
-    wxON_BLOCK_EXIT1(free, scanlineData);
-
-    // Compose and write the TGA header
-    unsigned char hdr[HDR_SIZE];
-    (void) memset(&hdr, 0, HDR_SIZE);
-
-    hdr[HDR_COLORTYPE] = wxTGA_UNMAPPED;
-    hdr[HDR_IMAGETYPE] = 2 /* Uncompressed truecolour */;
-
-    hdr[HDR_WIDTH] =  size.x & 0xFF;
-    hdr[HDR_WIDTH + 1] =  (size.x >> 8) & 0xFF;
-
-    hdr[HDR_HEIGHT] =  size.y & 0xFF;
-    hdr[HDR_HEIGHT + 1] =  (size.y >> 8) & 0xFF;
-
-    hdr[HDR_BPP] = hasAlpha ? 32 : 24;
-    hdr[HDR_ORIENTATION] = 1 << 5; // set bit to indicate top-down order
-    if (hasAlpha)
-    {
-        hdr[HDR_ORIENTATION] |= 8; // number of alpha bits
-    }
-
-    if ( !stream->Write(hdr, HDR_SIZE) )
-    {
-        return wxTGA_IOERR;
-    }
-
-
-    // Write image data, converting RGB to BGR and adding alpha if applicable
-
-    unsigned char *src = image.GetData();
-    unsigned char *alpha = image.GetAlpha();
-    for (int y = 0; y < size.y; ++y)
-    {
-        unsigned char *dst = scanlineData;
-        for (int x = 0; x < size.x; ++x)
-        {
-            dst[0] = src[2];
-            dst[1] = src[1];
-            dst[2] = src[0];
-            if (alpha)
-            {
-                dst[3] = *(alpha++);
-            }
-            src += 3;
-            dst += bytesPerPixel;
-        }
-        if ( !stream->Write(scanlineData, scanlineSize) )
-        {
-            return wxTGA_IOERR;
-        }
-    }
-
-    return wxTGA_OK;
-}
-
-// ----------------------------------------------------------------------------
-// wxTGAHandler
-// ----------------------------------------------------------------------------
-
-bool wxTGAHandler::LoadFile(wxImage* image,
-                            wxInputStream& stream,
-                            bool verbose,
-                            int WXUNUSED(index))
-{
-    if ( !CanRead(stream) )
-    {
-        if ( verbose )
-        {
-            wxLogError(wxT("TGA: this is not a TGA file."));
-        }
-
-        return false;
-    }
-
-    image->Destroy();
-
-    int error = ReadTGA(image, stream);
-    if ( error != wxTGA_OK )
-    {
-        if ( verbose )
-        {
-            switch ( error )
-            {
-                case wxTGA_INVFORMAT:
-                    wxLogError(wxT("TGA: image format unsupported."));
-                    break;
-
-                case wxTGA_MEMERR:
-                    wxLogError(wxT("TGA: couldn't allocate memory."));
-                    break;
-
-                case wxTGA_IOERR:
-                    wxLogError(wxT("TGA: couldn't read image data."));
-                    break;
-
-                default:
-                    wxLogError(wxT("TGA: unknown error!"));
-            }
-        }
-
-        image->Destroy();
-
-        return false;
-    }
-
-    return true;
-}
-
-bool wxTGAHandler::SaveFile(wxImage* image, wxOutputStream& stream, bool verbose)
-{
-    int error = SaveTGA(*image, &stream);
-
-    if ( error != wxTGA_OK )
-    {
-        if ( verbose )
-        {
-            switch ( error )
-            {
-                case wxTGA_MEMERR:
-                    wxLogError(wxT("TGA: couldn't allocate memory."));
-                    break;
-
-                case wxTGA_IOERR:
-                    wxLogError(wxT("TGA: couldn't write image data."));
-                    break;
-
-                default:
-                    wxLogError(wxT("TGA: unknown error!"));
-            }
-        }
-
-        return false;
-    }
-
-    return true;
-}
-
-bool wxTGAHandler::DoCanRead(wxInputStream& stream)
-{
-    // read the fixed-size TGA headers
-    unsigned char hdr[HDR_SIZE];
-    stream.Read(hdr, HDR_SIZE);     // it's ok to modify the stream position here
-
-    // Check whether we can read the file or not.
-
-    short colorType = hdr[HDR_COLORTYPE];
-    if ( colorType != wxTGA_UNMAPPED && colorType != wxTGA_MAPPED )
-    {
-        return false;
-    }
-
-    short imageType = hdr[HDR_IMAGETYPE];
-    if ( imageType == 0 || imageType == 32 || imageType == 33 )
-    {
-        return false;
-    }
-
-    short bpp = hdr[HDR_BPP];
-    if ( bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
-    {
-        return false;
-    }
-
-    return true;
-}
-
-#endif // wxUSE_STREAMS
-
-#endif // wxUSE_IMAGE && wxUSE_TGA
+/////////////////////////////////////////////////////////////////////////////
+// Name:        imagtga.cpp
+// Purpose:     wxImage TGA handler
+// Author:      Seth Jackson
+// CVS-ID:      $Id: imagtga.cpp 43681 2006-11-27 15:01:58Z VZ $
+// Copyright:   (c) 2005 Seth Jackson
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_TGA
+
+#ifndef WX_PRECOMP
+    #include "wx/palette.h"
+#endif
+
+#include "wx/imagtga.h"
+#include "wx/log.h"
+#include "wx/scopeguard.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// TGA error codes.
+enum
+{
+    wxTGA_OK = 0,
+    wxTGA_INVFORMAT = 1,
+    wxTGA_MEMERR = 2
+};
+
+// TGA header bytes.
+enum
+{
+    HDR_OFFSET = 0,
+    HDR_COLORTYPE  = 1,
+    HDR_IMAGETYPE = 2,
+    HDR_PALETTESTART = 3,
+    HDR_PALETTELENGTH = 5,
+    HDR_PALETTEBITS = 7,
+    HDR_XORIGIN = 8,
+    HDR_YORIGIN = 10,
+    HDR_WIDTH = 12,
+    HDR_HEIGHT = 14,
+    HDR_BPP = 16,
+    HDR_ORIENTATION = 17,
+    HDR_SIZE
+};
+
+// TGA color types.
+enum
+{
+    wxTGA_UNMAPPED = 0,
+    wxTGA_MAPPED = 1
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(wxTGAHandler, wxImageHandler)
+
+#if wxUSE_STREAMS
+
+// ----------------------------------------------------------------------------
+// worker functions
+// ----------------------------------------------------------------------------
+
+static
+void FlipTGA(unsigned char* imageData, int width, int height, short pixelSize)
+{
+    int lineLength = width * pixelSize;
+    unsigned char *line1 = imageData;
+    unsigned char *line2 = &imageData[lineLength * (height - 1)];
+
+    unsigned char temp;
+    for ( ; line1 < line2; line2 -= (lineLength * 2))
+    {
+        for (int index = 0; index < lineLength; line1++, line2++, index++)
+        {
+            temp = *line1;
+            *line1 = *line2;
+            *line2 = temp;
+        }
+    }
+}
+
+static
+void DecodeRLE(unsigned char* imageData, unsigned long imageSize,
+               short pixelSize, wxInputStream& stream)
+{
+    unsigned long index = 0;
+    unsigned char current;
+    unsigned int length;
+    unsigned char buf[4];
+
+    while (index < imageSize)
+    {
+        current = stream.GetC();
+
+        // RLE packet.
+        if ( current & 0x80 )
+        {
+            // Get the run length of the packet.
+            current &= 0x7f;
+
+            current++;
+
+            length = current;
+
+            index += current * pixelSize;
+
+            // Repeat the pixel length times.
+            stream.Read(buf, pixelSize);
+
+            for (unsigned int i = 0; i < length; i++)
+            {
+                memcpy(imageData, buf, pixelSize);
+
+                imageData += pixelSize;
+            }
+        }
+        else // Raw packet.
+        {
+            // Get the run length of the packet.
+            current++;
+
+            length = current * pixelSize;
+
+            index += length;
+
+            // Write the next length pixels directly to the image data.
+            stream.Read(imageData, length);
+
+            imageData += length;
+        }
+    }
+}
+
+static
+int ReadTGA(wxImage* image, wxInputStream& stream)
+{
+    // Read in the TGA header
+    unsigned char hdr[HDR_SIZE];
+    stream.Read(hdr, HDR_SIZE);
+
+    short offset = hdr[HDR_OFFSET] + HDR_SIZE;
+    short colorType = hdr[HDR_COLORTYPE];
+    short imageType = hdr[HDR_IMAGETYPE];
+    int paletteLength = hdr[HDR_PALETTELENGTH] + 256 * hdr[HDR_PALETTELENGTH + 1];
+    int width = (hdr[HDR_WIDTH] + 256 * hdr[HDR_WIDTH + 1]) -
+                (hdr[HDR_XORIGIN] + 256 * hdr[HDR_XORIGIN + 1]);
+    int height = (hdr[HDR_HEIGHT] + 256 * hdr[HDR_HEIGHT + 1]) -
+                 (hdr[HDR_YORIGIN] + 256 * hdr[HDR_YORIGIN + 1]);
+    short bpp = hdr[HDR_BPP];
+    short orientation = hdr[HDR_ORIENTATION] & 0x20;
+
+    image->Create(width, height);
+
+    if (!image->Ok())
+    {
+        return wxTGA_MEMERR;
+    }
+
+    const short pixelSize = bpp / 8;
+
+    const unsigned long imageSize = width * height * pixelSize;
+
+    unsigned char *imageData = (unsigned char* )malloc(imageSize);
+
+    if (!imageData)
+    {
+        return wxTGA_MEMERR;
+    }
+
+    wxON_BLOCK_EXIT1(free, imageData);
+
+    unsigned char *dst = image->GetData();
+
+    unsigned char* alpha = NULL;
+    if (bpp == 16 || bpp == 32)
+    {
+        image->SetAlpha();
+
+        alpha = image->GetAlpha();
+    }
+
+    // Seek from the offset we got from the TGA header.
+    stream.SeekI(offset, wxFromStart);
+
+    // Load a palette if we have one.
+    if (colorType == wxTGA_MAPPED)
+    {
+        unsigned char buf[3];
+
+        unsigned char* r = new unsigned char[paletteLength];
+        unsigned char* g = new unsigned char[paletteLength];
+        unsigned char* b = new unsigned char[paletteLength];
+
+        for (int i = 0; i < paletteLength; i++)
+        {
+            stream.Read(buf, 3);
+
+            r[i] = buf[2];
+            g[i] = buf[1];
+            b[i] = buf[0];
+        }
+
+#if wxUSE_PALETTE
+        // Set the palette of the image.
+        image->SetPalette(wxPalette(paletteLength, r, g, b));
+#endif // wxUSE_PALETTE
+
+        delete[] r;
+        delete[] g;
+        delete[] b;
+    }
+
+    // Handle the various TGA formats we support.
+
+    switch (imageType)
+    {
+#if wxUSE_PALETTE
+        // Raw indexed.
+
+        case 1:
+        {
+            const wxPalette& palette = image->GetPalette();
+            unsigned char r;
+            unsigned char g;
+            unsigned char b;
+
+            // No compression read the data directly to imageData.
+
+            stream.Read(imageData, imageSize);
+
+            // If orientation == 0, then the image is stored upside down.
+            // We need to store it right side up.
+
+            if (orientation == 0)
+            {
+                FlipTGA(imageData, width, height, pixelSize);
+            }
+
+            // Handle the different pixel depths.
+
+            switch (bpp)
+            {
+                // 8 bpp.
+
+                case 8:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        palette.GetRGB(imageData[index], &r, &g, &b);
+
+                        *(dst++) = r;
+                        *(dst++) = g;
+                        *(dst++) = b;
+                    }
+                }
+                break;
+
+                // 16 bpp.
+
+                case 16:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        palette.GetRGB(imageData[index], &r, &g, &b);
+
+                        *(dst++) = r;
+                        *(dst++) = g;
+                        *(dst++) = b;
+                        *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255;
+                    }
+                }
+                break;
+
+                default:
+                    return wxTGA_INVFORMAT;
+            }
+        }
+        break;
+#endif // wxUSE_PALETTE
+
+        // Raw RGB.
+
+        case 2:
+        {
+            // No compression read the data directly to imageData.
+
+            stream.Read(imageData, imageSize);
+
+            // If orientation == 0, then the image is stored upside down.
+            // We need to store it right side up.
+
+            if (orientation == 0)
+            {
+                FlipTGA(imageData, width, height, pixelSize);
+            }
+
+            // Handle the different pixel depths.
+
+            switch (bpp)
+            {
+                //16 bpp.
+
+                case 16:
+                {
+                    unsigned char temp;
+
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        temp = (imageData[index + 1] & 0x7c) << 1;
+                        temp |= temp >> 5;
+                        *(dst++) = temp;
+
+                        temp = ((imageData[index + 1] & 0x03) << 6) | ((imageData[index] & 0xe0) >> 2);
+                        temp |= temp >> 5;
+                        *(dst++) = temp;
+
+                        temp = (imageData[index] & 0x1f) << 3;
+                        temp |= temp >> 5;
+                        *(dst++) = temp;
+
+                        *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255;
+                    }
+                }
+                break;
+
+                // 24 bpp.
+
+                case 24:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        *(dst++) = imageData[index + 2];
+                        *(dst++) = imageData[index + 1];
+                        *(dst++) = imageData[index];
+                    }
+                }
+                break;
+
+                // 32 bpp.
+
+                case 32:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        *(dst++) = imageData[index + 2];
+                        *(dst++) = imageData[index + 1];
+                        *(dst++) = imageData[index];
+                        *(alpha++) = imageData[index + 3];
+                    }
+                }
+                break;
+
+                default:
+                    return wxTGA_INVFORMAT;
+            }
+        }
+        break;
+
+        // Raw grayscale.
+
+        case 3:
+        {
+            // No compression read the data directly to imageData.
+
+            stream.Read(imageData, imageSize);
+
+            // If orientation == 0, then the image is stored upside down.
+            // We need to store it right side up.
+
+            if (orientation == 0)
+            {
+                FlipTGA(imageData, width, height, pixelSize);
+            }
+
+            // Handle the different pixel depths.
+
+            switch (bpp)
+            {
+                // 8 bpp.
+
+                case 8:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        *(dst++) = imageData[index];
+                        *(dst++) = imageData[index];
+                        *(dst++) = imageData[index];
+                    }
+                }
+                break;
+
+                // 16 bpp.
+
+                case 16:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        *(dst++) = imageData[index];
+                        *(dst++) = imageData[index];
+                        *(dst++) = imageData[index];
+                        *(alpha++) = imageData[index + 1];
+                    }
+                }
+                break;
+
+                default:
+                    return wxTGA_INVFORMAT;
+            }
+        }
+        break;
+
+#if wxUSE_PALETTE
+        // RLE indexed.
+
+        case 9:
+        {
+            const wxPalette& palette = image->GetPalette();
+            unsigned char r;
+            unsigned char g;
+            unsigned char b;
+
+            // Decode the RLE data.
+
+            DecodeRLE(imageData, imageSize, pixelSize, stream);
+
+            // If orientation == 0, then the image is stored upside down.
+            // We need to store it right side up.
+
+            if (orientation == 0)
+            {
+                FlipTGA(imageData, width, height, pixelSize);
+            }
+
+            // Handle the different pixel depths.
+
+            switch (bpp)
+            {
+                // 8 bpp.
+
+                case 8:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        palette.GetRGB(imageData[index], &r, &g, &b);
+
+                        *(dst++) = r;
+                        *(dst++) = g;
+                        *(dst++) = b;
+                    }
+                }
+                break;
+
+                // 16 bpp.
+
+                case 16:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        palette.GetRGB(imageData[index], &r, &g, &b);
+
+                        *(dst++) = r;
+                        *(dst++) = g;
+                        *(dst++) = b;
+                        *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255;
+                    }
+                }
+                break;
+
+                default:
+                    return wxTGA_INVFORMAT;
+            }
+        }
+        break;
+#endif // wxUSE_PALETTE
+
+        // RLE RGB.
+
+        case 10:
+        {
+            // Decode the RLE data.
+
+            DecodeRLE(imageData, imageSize, pixelSize, stream);
+
+            // If orientation == 0, then the image is stored upside down.
+            // We need to store it right side up.
+
+            if (orientation == 0)
+            {
+                FlipTGA(imageData, width, height, pixelSize);
+            }
+
+            // Handle the different pixel depths.
+
+            switch (bpp)
+            {
+                //16 bpp.
+
+                case 16:
+                {
+                    unsigned char temp;
+
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        temp = (imageData[index + 1] & 0x7c) << 1;
+                        temp |= temp >> 5;
+                        *(dst++) = temp;
+
+                        temp = ((imageData[index + 1] & 0x03) << 6) | ((imageData[index] & 0xe0) >> 2);
+                        temp |= temp >> 5;
+                        *(dst++) = temp;
+
+                        temp = (imageData[index] & 0x1f) << 3;
+                        temp |= temp >> 5;
+                        *(dst++) = temp;
+
+                        *(alpha++) = (imageData[index + 1] & 0x80) ? 0 : 255;
+                    }
+                }
+                break;
+
+                // 24 bpp.
+
+                case 24:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        *(dst++) = imageData[index + 2];
+                        *(dst++) = imageData[index + 1];
+                        *(dst++) = imageData[index];
+                    }
+                }
+                break;
+
+                // 32 bpp.
+
+                case 32:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        *(dst++) = imageData[index + 2];
+                        *(dst++) = imageData[index + 1];
+                        *(dst++) = imageData[index];
+                        *(alpha++) = imageData[index + 3];
+                    }
+                }
+                break;
+
+                default:
+                    return wxTGA_INVFORMAT;
+            }
+        }
+        break;
+
+        // RLE grayscale.
+
+        case 11:
+        {
+            // Decode the RLE data.
+
+            DecodeRLE(imageData, imageSize, pixelSize, stream);
+
+            // If orientation == 0, then the image is stored upside down.
+            // We need to store it right side up.
+
+            if (orientation == 0)
+            {
+                FlipTGA(imageData, width, height, pixelSize);
+            }
+
+            // Handle the different pixel depths.
+
+            switch (bpp)
+            {
+                // 8 bpp.
+
+                case 8:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        *(dst++) = imageData[index];
+                        *(dst++) = imageData[index];
+                        *(dst++) = imageData[index];
+                    }
+                }
+                break;
+
+                // 16 bpp.
+
+                case 16:
+                {
+                    for (unsigned long index = 0; index < imageSize; index += pixelSize)
+                    {
+                        *(dst++) = imageData[index];
+                        *(dst++) = imageData[index];
+                        *(dst++) = imageData[index];
+                        *(alpha++) = imageData[index + 1];
+                    }
+                }
+                break;
+
+                default:
+                    return wxTGA_INVFORMAT;
+            }
+        }
+        break;
+
+        default:
+            return wxTGA_INVFORMAT;
+    }
+
+    return wxTGA_OK;
+}
+
+static
+int SaveTGA(wxImage* WXUNUSED(image), wxOutputStream& WXUNUSED(stream))
+{
+    wxLogError(wxT("Saving in TGA format is not implemented."));
+
+    return wxTGA_OK;
+}
+
+// ----------------------------------------------------------------------------
+// wxTGAHandler
+// ----------------------------------------------------------------------------
+
+bool wxTGAHandler::LoadFile(wxImage* image,
+                            wxInputStream& stream,
+                            bool verbose,
+                            int WXUNUSED(index))
+{
+    if ( !CanRead(stream) )
+    {
+        if ( verbose )
+            wxLogError(wxT("TGA: this is not a TGA file."));
+
+        return false;
+    }
+
+    image->Destroy();
+
+    int error = ReadTGA(image, stream);
+    if ( error != wxTGA_OK )
+    {
+        if ( verbose )
+        {
+            switch ( error )
+            {
+                case wxTGA_INVFORMAT:
+                    wxLogError(wxT("TGA: image format unsupported."));
+                    break;
+
+                case wxTGA_MEMERR:
+                    wxLogError(wxT("TGA: couldn't allocate memory."));
+                    break;
+
+                default:
+                    wxLogError(wxT("TGA: unknown error!"));
+            }
+        }
+
+        image->Destroy();
+
+        return false;
+    }
+
+    return true;
+}
+
+bool wxTGAHandler::SaveFile(wxImage* image, wxOutputStream& stream, bool verbose)
+{
+    int error = SaveTGA(image, stream);
+
+    if ( error != wxTGA_OK )
+    {
+        if ( verbose )
+        {
+            switch ( error )
+            {
+                case wxTGA_INVFORMAT:
+                    wxLogError(wxT("TGA: invalid image."));
+                    break;
+
+                case wxTGA_MEMERR:
+                    wxLogError(wxT("TGA: couldn't allocate memory."));
+                    break;
+
+                default:
+                    wxLogError(wxT("TGA: unknown error!"));
+            }
+        }
+
+        return false;
+    }
+
+    return true;
+}
+
+bool wxTGAHandler::DoCanRead(wxInputStream& stream)
+{
+    // read the fixed-size TGA headers
+    unsigned char hdr[HDR_SIZE];
+    stream.Read(hdr, HDR_SIZE);
+
+    // Check wether we can read the file or not.
+
+    short colorType = hdr[HDR_COLORTYPE];
+    if ( colorType != wxTGA_UNMAPPED && colorType != wxTGA_MAPPED )
+    {
+        return false;
+    }
+
+    short imageType = hdr[HDR_IMAGETYPE];
+    if ( imageType == 0 || imageType == 32 || imageType == 33 )
+    {
+        return false;
+    }
+
+    short bpp = hdr[HDR_BPP];
+    if ( bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
+    {
+        return false;
+    }
+
+    return true;
+}
+
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_IMAGE && wxUSE_TGA
diff --git a/Source/3rd Party/wx/src/common/imagtiff.cpp b/Source/3rd Party/wx/src/common/imagtiff.cpp
index dba3c1cec..7a48cf51c 100644
--- a/Source/3rd Party/wx/src/common/imagtiff.cpp	
+++ b/Source/3rd Party/wx/src/common/imagtiff.cpp	
@@ -1,907 +1,525 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagtiff.cpp
-// Purpose:     wxImage TIFF handler
-// Author:      Robert Roebling
-// RCS-ID:      $Id$
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && wxUSE_LIBTIFF
-
-#include "wx/imagtiff.h"
-#include "wx/versioninfo.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/app.h"
-    #include "wx/intl.h"
-    #include "wx/bitmap.h"
-    #include "wx/module.h"
-    #include "wx/wxcrtvararg.h"
-#endif
-
-extern "C"
-{
-#ifdef __DMC__
-    #include "tif_config.h"
-#endif
-    #include "tiff.h"
-    #include "tiffio.h"
-}
-#include "wx/filefn.h"
-#include "wx/wfstream.h"
-
-#ifndef TIFFLINKAGEMODE
-    #define TIFFLINKAGEMODE LINKAGEMODE
-#endif
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// TIFF library error/warning handlers
-// ----------------------------------------------------------------------------
-
-static wxString
-FormatTiffMessage(const char *module, const char *fmt, va_list ap)
-{
-    char buf[512];
-    if ( wxCRT_VsnprintfA(buf, WXSIZEOF(buf), fmt, ap) <= 0 )
-    {
-        // this isn't supposed to happen, but if it does, it's better
-        // than nothing
-        strcpy(buf, "Incorrectly formatted TIFF message");
-    }
-    buf[WXSIZEOF(buf)-1] = 0; // make sure it is always NULL-terminated
-
-    wxString msg(buf);
-    if ( module )
-        msg += wxString::Format(_(" (in module \"%s\")"), module);
-
-    return msg;
-}
-
-extern "C"
-{
-
-static void
-TIFFwxWarningHandler(const char* module, const char *fmt, va_list ap)
-{
-    wxLogWarning("%s", FormatTiffMessage(module, fmt, ap));
-}
-
-static void
-TIFFwxErrorHandler(const char* module, const char *fmt, va_list ap)
-{
-    wxLogError("%s", FormatTiffMessage(module, fmt, ap));
-}
-
-} // extern "C"
-
-//-----------------------------------------------------------------------------
-// wxTIFFHandler
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
-
-wxTIFFHandler::wxTIFFHandler()
-{
-    m_name = wxT("TIFF file");
-    m_extension = wxT("tif");
-    m_altExtensions.Add(wxT("tiff"));
-    m_type = wxBITMAP_TYPE_TIFF;
-    m_mime = wxT("image/tiff");
-    TIFFSetWarningHandler((TIFFErrorHandler) TIFFwxWarningHandler);
-    TIFFSetErrorHandler((TIFFErrorHandler) TIFFwxErrorHandler);
-}
-
-#if wxUSE_STREAMS
-
-// helper to translate our, possibly 64 bit, wxFileOffset to TIFF, always 32
-// bit, toff_t
-static toff_t wxFileOffsetToTIFF(wxFileOffset ofs)
-{
-    if ( ofs == wxInvalidOffset )
-        return (toff_t)-1;
-
-    toff_t tofs = wx_truncate_cast(toff_t, ofs);
-    wxCHECK_MSG( (wxFileOffset)tofs == ofs, (toff_t)-1,
-                    wxT("TIFF library doesn't support large files") );
-
-    return tofs;
-}
-
-// another helper to convert standard seek mode to our
-static wxSeekMode wxSeekModeFromTIFF(int whence)
-{
-    switch ( whence )
-    {
-        case SEEK_SET:
-            return wxFromStart;
-
-        case SEEK_CUR:
-            return wxFromCurrent;
-
-        case SEEK_END:
-            return wxFromEnd;
-
-        default:
-            return wxFromCurrent;
-    }
-}
-
-extern "C"
-{
-
-tsize_t TIFFLINKAGEMODE
-wxTIFFNullProc(thandle_t WXUNUSED(handle),
-          tdata_t WXUNUSED(buf),
-          tsize_t WXUNUSED(size))
-{
-    return (tsize_t) -1;
-}
-
-tsize_t TIFFLINKAGEMODE
-wxTIFFReadProc(thandle_t handle, tdata_t buf, tsize_t size)
-{
-    wxInputStream *stream = (wxInputStream*) handle;
-    stream->Read( (void*) buf, (size_t) size );
-    return wx_truncate_cast(tsize_t, stream->LastRead());
-}
-
-tsize_t TIFFLINKAGEMODE
-wxTIFFWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
-{
-    wxOutputStream *stream = (wxOutputStream*) handle;
-    stream->Write( (void*) buf, (size_t) size );
-    return wx_truncate_cast(tsize_t, stream->LastWrite());
-}
-
-toff_t TIFFLINKAGEMODE
-wxTIFFSeekIProc(thandle_t handle, toff_t off, int whence)
-{
-    wxInputStream *stream = (wxInputStream*) handle;
-
-    return wxFileOffsetToTIFF(stream->SeekI((wxFileOffset)off,
-                                            wxSeekModeFromTIFF(whence)));
-}
-
-toff_t TIFFLINKAGEMODE
-wxTIFFSeekOProc(thandle_t handle, toff_t off, int whence)
-{
-    wxOutputStream *stream = (wxOutputStream*) handle;
-
-    toff_t offset = wxFileOffsetToTIFF(
-        stream->SeekO((wxFileOffset)off, wxSeekModeFromTIFF(whence)) );
-
-    if (offset != (toff_t) -1 || whence != SEEK_SET)
-    {
-        return offset;
-    }
-
-
-    /*
-    Try to workaround problems with libtiff seeking past the end of streams.
-
-    This occurs when libtiff is writing tag entries past the end of a
-    stream but hasn't written the directory yet (which will be placed
-    before the tags and contain offsets to the just written tags).
-    The behaviour for seeking past the end of a stream is not consistent
-    and doesn't work with for example wxMemoryOutputStream. When this type
-    of seeking fails (with SEEK_SET), fill in the gap with zeroes and try
-    again.
-    */
-
-    wxFileOffset streamLength = stream->GetLength();
-    if (streamLength != wxInvalidOffset && (wxFileOffset) off > streamLength)
-    {
-       if (stream->SeekO(streamLength, wxFromStart) == wxInvalidOffset)
-       {
-           return (toff_t) -1;
-       }
-
-       for (wxFileOffset i = 0; i < (wxFileOffset) off - streamLength; ++i)
-       {
-           stream->PutC(0);
-       }
-    }
-
-    return wxFileOffsetToTIFF( stream->TellO() );
-}
-
-int TIFFLINKAGEMODE
-wxTIFFCloseIProc(thandle_t WXUNUSED(handle))
-{
-    // there is no need to close the input stream
-    return 0;
-}
-
-int TIFFLINKAGEMODE
-wxTIFFCloseOProc(thandle_t handle)
-{
-    wxOutputStream *stream = (wxOutputStream*) handle;
-
-    return stream->Close() ? 0 : -1;
-}
-
-toff_t TIFFLINKAGEMODE
-wxTIFFSizeProc(thandle_t handle)
-{
-    wxStreamBase *stream = (wxStreamBase*) handle;
-    return (toff_t) stream->GetSize();
-}
-
-int TIFFLINKAGEMODE
-wxTIFFMapProc(thandle_t WXUNUSED(handle),
-             tdata_t* WXUNUSED(pbase),
-             toff_t* WXUNUSED(psize))
-{
-    return 0;
-}
-
-void TIFFLINKAGEMODE
-wxTIFFUnmapProc(thandle_t WXUNUSED(handle),
-               tdata_t WXUNUSED(base),
-               toff_t WXUNUSED(size))
-{
-}
-
-} // extern "C"
-
-TIFF*
-TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
-{
-    TIFF* tif = TIFFClientOpen(name, mode,
-        (thandle_t) &stream,
-        wxTIFFReadProc, wxTIFFNullProc,
-        wxTIFFSeekIProc, wxTIFFCloseIProc, wxTIFFSizeProc,
-        wxTIFFMapProc, wxTIFFUnmapProc);
-
-    return tif;
-}
-
-TIFF*
-TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
-{
-    TIFF* tif = TIFFClientOpen(name, mode,
-        (thandle_t) &stream,
-        wxTIFFNullProc, wxTIFFWriteProc,
-        wxTIFFSeekOProc, wxTIFFCloseOProc, wxTIFFSizeProc,
-        wxTIFFMapProc, wxTIFFUnmapProc);
-
-    return tif;
-}
-
-bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
-{
-    if (index == -1)
-        index = 0;
-
-    image->Destroy();
-
-    TIFF *tif = TIFFwxOpen( stream, "image", "r" );
-
-    if (!tif)
-    {
-        if (verbose)
-        {
-            wxLogError( _("TIFF: Error loading image.") );
-        }
-
-        return false;
-    }
-
-    if (!TIFFSetDirectory( tif, (tdir_t)index ))
-    {
-        if (verbose)
-        {
-            wxLogError( _("Invalid TIFF image index.") );
-        }
-
-        TIFFClose( tif );
-
-        return false;
-    }
-
-    uint32 w, h;
-    uint32 *raster;
-
-    TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
-    TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &h );
-
-    uint16 samplesPerPixel = 0;
-    (void) TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &samplesPerPixel);
-
-    uint16 bitsPerSample = 0;
-    (void) TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bitsPerSample);
-
-    uint16 extraSamples;
-    uint16* samplesInfo;
-    TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
-                          &extraSamples, &samplesInfo);
-
-    uint16 photometric;
-    if (!TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric))
-    {
-        photometric = PHOTOMETRIC_MINISWHITE;
-    }
-    const bool hasAlpha = (extraSamples >= 1
-        && ((samplesInfo[0] == EXTRASAMPLE_UNSPECIFIED)
-            || samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA
-            || samplesInfo[0] == EXTRASAMPLE_UNASSALPHA))
-        || (extraSamples == 0 && samplesPerPixel == 4
-            && photometric == PHOTOMETRIC_RGB);
-
-    // guard against integer overflow during multiplication which could result
-    // in allocating a too small buffer and then overflowing it
-    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
-    if ( bytesNeeded >= wxUINT32_MAX )
-    {
-        if ( verbose )
-        {
-            wxLogError( _("TIFF: Image size is abnormally big.") );
-        }
-
-        TIFFClose(tif);
-
-        return false;
-    }
-
-    raster = (uint32*) _TIFFmalloc( (uint32)bytesNeeded );
-
-    if (!raster)
-    {
-        if (verbose)
-        {
-            wxLogError( _("TIFF: Couldn't allocate memory.") );
-        }
-
-        TIFFClose( tif );
-
-        return false;
-    }
-
-    image->Create( (int)w, (int)h );
-    if (!image->IsOk())
-    {
-        if (verbose)
-        {
-            wxLogError( _("TIFF: Couldn't allocate memory.") );
-        }
-
-        _TIFFfree( raster );
-        TIFFClose( tif );
-
-        return false;
-    }
-
-    if ( hasAlpha )
-        image->SetAlpha();
-
-    uint16 planarConfig = PLANARCONFIG_CONTIG;
-    (void) TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &planarConfig);
-
-    bool ok = true;
-    char msg[1024] = "";
-    if
-    (
-        (planarConfig == PLANARCONFIG_CONTIG && samplesPerPixel == 2
-            && extraSamples == 1)
-        &&
-        (
-            ( !TIFFRGBAImageOK(tif, msg) )
-            || (bitsPerSample == 8)
-        )
-    )
-    {
-        const bool isGreyScale = (bitsPerSample == 8);
-        unsigned char *buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
-        uint32 pos = 0;
-        const bool minIsWhite = (photometric == PHOTOMETRIC_MINISWHITE);
-        const int minValue =  minIsWhite ? 255 : 0;
-        const int maxValue = 255 - minValue;
-
-        /*
-        Decode to ABGR format as that is what the code, that converts to
-        wxImage, later on expects (normally TIFFReadRGBAImageOriented is
-        used to decode which uses an ABGR layout).
-        */
-        for (uint32 y = 0; y < h; ++y)
-        {
-            if (TIFFReadScanline(tif, buf, y, 0) != 1)
-            {
-                ok = false;
-                break;
-            }
-
-            if (isGreyScale)
-            {
-                for (uint32 x = 0; x < w; ++x)
-                {
-                    uint8 val = minIsWhite ? 255 - buf[x*2] : buf[x*2];
-                    uint8 alpha = minIsWhite ? 255 - buf[x*2+1] : buf[x*2+1];
-                    raster[pos] = val + (val << 8) + (val << 16)
-                        + (alpha << 24);
-                    pos++;
-                }
-            }
-            else
-            {
-                for (uint32 x = 0; x < w; ++x)
-                {
-                    int mask = buf[x*2/8] << ((x*2)%8);
-
-                    uint8 val = mask & 128 ? maxValue : minValue;
-                    raster[pos] = val + (val << 8) + (val << 16)
-                        + ((mask & 64 ? maxValue : minValue) << 24);
-                    pos++;
-                }
-            }
-        }
-
-        _TIFFfree(buf);
-    }
-    else
-    {
-        ok = TIFFReadRGBAImageOriented( tif, w, h, raster,
-            ORIENTATION_TOPLEFT, 0 ) != 0;
-    }
-
-
-    if (!ok)
-    {
-        if (verbose)
-        {
-            wxLogError( _("TIFF: Error reading image.") );
-        }
-
-        _TIFFfree( raster );
-        image->Destroy();
-        TIFFClose( tif );
-
-        return false;
-    }
-
-    unsigned char *ptr = image->GetData();
-
-    unsigned char *alpha = image->GetAlpha();
-
-    uint32 pos = 0;
-
-    for (uint32 i = 0; i < h; i++)
-    {
-        for (uint32 j = 0; j < w; j++)
-        {
-            *(ptr++) = (unsigned char)TIFFGetR(raster[pos]);
-            *(ptr++) = (unsigned char)TIFFGetG(raster[pos]);
-            *(ptr++) = (unsigned char)TIFFGetB(raster[pos]);
-            if ( hasAlpha )
-                *(alpha++) = (unsigned char)TIFFGetA(raster[pos]);
-
-            pos++;
-        }
-    }
-
-
-    image->SetOption(wxIMAGE_OPTION_TIFF_PHOTOMETRIC, photometric);
-
-    uint16 compression;
-    /*
-    Copy some baseline TIFF tags which helps when re-saving a TIFF
-    to be similar to the original image.
-    */
-    if (samplesPerPixel)
-    {
-        image->SetOption(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL, samplesPerPixel);
-    }
-
-    if (bitsPerSample)
-    {
-        image->SetOption(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, bitsPerSample);
-    }
-
-    if ( TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compression) )
-    {
-        image->SetOption(wxIMAGE_OPTION_TIFF_COMPRESSION, compression);
-    }
-
-    // Set the resolution unit.
-    wxImageResolution resUnit = wxIMAGE_RESOLUTION_NONE;
-    uint16 tiffRes;
-    if ( TIFFGetFieldDefaulted(tif, TIFFTAG_RESOLUTIONUNIT, &tiffRes) )
-    {
-        switch (tiffRes)
-        {
-            default:
-                wxLogWarning(_("Unknown TIFF resolution unit %d ignored"),
-                    tiffRes);
-                // fall through
-
-            case RESUNIT_NONE:
-                resUnit = wxIMAGE_RESOLUTION_NONE;
-                break;
-
-            case RESUNIT_INCH:
-                resUnit = wxIMAGE_RESOLUTION_INCHES;
-                break;
-
-            case RESUNIT_CENTIMETER:
-                resUnit = wxIMAGE_RESOLUTION_CM;
-                break;
-        }
-    }
-
-    image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, resUnit);
-
-    /*
-    Set the image resolution if it's available. Resolution tag is not
-    dependent on RESOLUTIONUNIT != RESUNIT_NONE (according to TIFF spec).
-    */
-    float resX, resY;
-
-    if ( TIFFGetField(tif, TIFFTAG_XRESOLUTION, &resX) )
-    {
-        /*
-        Use a string value to not lose precision.
-        rounding to int as cm and then converting to inch may
-        result in whole integer rounding error, eg. 201 instead of 200 dpi.
-        If an app wants an int, GetOptionInt will convert and round down.
-        */
-        image->SetOption(wxIMAGE_OPTION_RESOLUTIONX,
-            wxString::FromCDouble((double) resX));
-    }
-
-    if ( TIFFGetField(tif, TIFFTAG_YRESOLUTION, &resY) )
-    {
-        image->SetOption(wxIMAGE_OPTION_RESOLUTIONY,
-            wxString::FromCDouble((double) resY));
-    }
-
-    _TIFFfree( raster );
-
-    TIFFClose( tif );
-
-    return true;
-}
-
-int wxTIFFHandler::DoGetImageCount( wxInputStream& stream )
-{
-    TIFF *tif = TIFFwxOpen( stream, "image", "r" );
-
-    if (!tif)
-        return 0;
-
-    int dircount = 0;  // according to the libtiff docs, dircount should be set to 1 here???
-    do {
-        dircount++;
-    } while (TIFFReadDirectory(tif));
-
-    TIFFClose( tif );
-
-    // NOTE: this function modifies the current stream position but it's ok
-    //       (see wxImageHandler::GetImageCount)
-
-    return dircount;
-}
-
-bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
-{
-    TIFF *tif = TIFFwxOpen( stream, "image", "w" );
-
-    if (!tif)
-    {
-        if (verbose)
-        {
-            wxLogError( _("TIFF: Error saving image.") );
-        }
-
-        return false;
-    }
-
-    const int imageWidth = image->GetWidth();
-    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH,  (uint32) imageWidth);
-    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32)image->GetHeight());
-    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
-    TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-
-    // save the image resolution if we have it
-    int xres, yres;
-    const wxImageResolution res = GetResolutionFromOptions(*image, &xres, &yres);
-    uint16 tiffRes;
-    switch ( res )
-    {
-        default:
-            wxFAIL_MSG( wxT("unknown image resolution units") );
-            // fall through
-
-        case wxIMAGE_RESOLUTION_NONE:
-            tiffRes = RESUNIT_NONE;
-            break;
-
-        case wxIMAGE_RESOLUTION_INCHES:
-            tiffRes = RESUNIT_INCH;
-            break;
-
-        case wxIMAGE_RESOLUTION_CM:
-            tiffRes = RESUNIT_CENTIMETER;
-            break;
-    }
-
-    if ( tiffRes != RESUNIT_NONE )
-    {
-        TIFFSetField(tif, TIFFTAG_RESOLUTIONUNIT, tiffRes);
-        TIFFSetField(tif, TIFFTAG_XRESOLUTION, (float)xres);
-        TIFFSetField(tif, TIFFTAG_YRESOLUTION, (float)yres);
-    }
-
-
-    int spp = image->GetOptionInt(wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL);
-    if ( !spp )
-        spp = 3;
-
-    int bps = image->GetOptionInt(wxIMAGE_OPTION_TIFF_BITSPERSAMPLE);
-    if ( !bps )
-    {
-        bps = 8;
-    }
-    else if (bps == 1)
-    {
-        // One bit per sample combined with 3 samples per pixel is
-        // not allowed and crashes libtiff.
-        spp = 1;
-    }
-
-    int photometric = PHOTOMETRIC_RGB;
-
-    if ( image->HasOption(wxIMAGE_OPTION_TIFF_PHOTOMETRIC) )
-    {
-        photometric = image->GetOptionInt(wxIMAGE_OPTION_TIFF_PHOTOMETRIC);
-        if (photometric == PHOTOMETRIC_MINISWHITE
-            || photometric == PHOTOMETRIC_MINISBLACK)
-        {
-            // either b/w or greyscale
-            spp = 1;
-        }
-    }
-    else if (spp <= 2)
-    {
-        photometric = PHOTOMETRIC_MINISWHITE;
-    }
-
-    const bool hasAlpha = image->HasAlpha();
-
-    int compression = image->GetOptionInt(wxIMAGE_OPTION_TIFF_COMPRESSION);
-    if ( !compression || (compression == COMPRESSION_JPEG && hasAlpha) )
-    {
-        // We can't use COMPRESSION_LZW because current version of libtiff
-        // doesn't implement it ("no longer implemented due to Unisys patent
-        // enforcement") and other compression methods are lossy so we
-        // shouldn't use them by default -- and the only remaining one is none.
-        // Also JPEG compression for alpha images is not a good idea (viewers
-        // not opening the image properly).
-        compression = COMPRESSION_NONE;
-    }
-
-    if
-    (
-        (photometric == PHOTOMETRIC_RGB && spp == 4)
-        || (photometric <= PHOTOMETRIC_MINISBLACK && spp == 2)
-    )
-    {
-        // Compensate for user passing a SamplesPerPixel that includes
-        // the alpha channel.
-        spp--;
-    }
-
-
-    int extraSamples = hasAlpha ? 1 : 0;
-
-    TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp + extraSamples);
-    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bps);
-    TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, photometric);
-    TIFFSetField(tif, TIFFTAG_COMPRESSION, compression);
-
-    if (extraSamples)
-    {
-        uint16 extra[] = { EXTRASAMPLE_UNSPECIFIED };
-        TIFFSetField(tif, TIFFTAG_EXTRASAMPLES, (long) 1, &extra);
-    }
-
-    // scanlinesize is determined by spp+extraSamples and bps
-    const tsize_t linebytes =
-        (tsize_t)((imageWidth * (spp + extraSamples) * bps + 7) / 8);
-
-    unsigned char *buf;
-
-    const bool isColouredImage = (spp > 1)
-        && (photometric != PHOTOMETRIC_MINISWHITE)
-        && (photometric != PHOTOMETRIC_MINISBLACK);
-
-
-    if (TIFFScanlineSize(tif) > linebytes || !isColouredImage || hasAlpha)
-    {
-        buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
-        if (!buf)
-        {
-            if (verbose)
-            {
-                wxLogError( _("TIFF: Couldn't allocate memory.") );
-            }
-
-            TIFFClose( tif );
-
-            return false;
-        }
-    }
-    else
-    {
-        buf = NULL;
-    }
-
-    TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,TIFFDefaultStripSize(tif, (uint32) -1));
-
-    const int bitsPerPixel = (spp + extraSamples) * bps;
-    const int bytesPerPixel = (bitsPerPixel + 7) / 8;
-    const int pixelsPerByte = 8 / bitsPerPixel;
-    int remainingPixelCount = 0;
-
-    if (pixelsPerByte)
-    {
-        // How many pixels to write in the last byte column?
-        remainingPixelCount = imageWidth % pixelsPerByte;
-        if (!remainingPixelCount) remainingPixelCount = pixelsPerByte;
-    }
-
-    const bool minIsWhite = (photometric == PHOTOMETRIC_MINISWHITE);
-    unsigned char *ptr = image->GetData();
-    for ( int row = 0; row < image->GetHeight(); row++ )
-    {
-        if ( buf )
-        {
-            if (isColouredImage)
-            {
-                // colour image
-                if (hasAlpha)
-                {
-                    for ( int column = 0; column < imageWidth; column++ )
-                    {
-                        buf[column*4    ] = ptr[column*3    ];
-                        buf[column*4 + 1] = ptr[column*3 + 1];
-                        buf[column*4 + 2] = ptr[column*3 + 2];
-                        buf[column*4 + 3] = image->GetAlpha(column, row);
-                    }
-                }
-                else
-                {
-                    memcpy(buf, ptr, imageWidth * 3);
-                }
-            }
-            else if (spp * bps == 8) // greyscale image
-            {
-                for ( int column = 0; column < imageWidth; column++ )
-                {
-                    uint8 value = ptr[column*3 + 1];
-                    if (minIsWhite)
-                    {
-                        value = 255 - value;
-                    }
-
-                    buf[column * bytesPerPixel] = value;
-
-                    if (hasAlpha)
-                    {
-                        value = image->GetAlpha(column, row);
-                        buf[column*bytesPerPixel+1]
-                            = minIsWhite ? 255 - value : value;
-                    }
-                }
-            }
-            else // black and white image
-            {
-                for ( int column = 0; column < linebytes; column++ )
-                {
-                    uint8 reverse = 0;
-                    int pixelsPerByteCount = (column + 1 != linebytes)
-                        ? pixelsPerByte
-                        : remainingPixelCount;
-                    for ( int bp = 0; bp < pixelsPerByteCount; bp++ )
-                    {
-                        if ( (ptr[column * 3 * pixelsPerByte + bp*3 + 1] <=127)
-                            == minIsWhite )
-                        {
-                            // check only green as this is sufficient
-                            reverse |= (uint8) (128 >> (bp * bitsPerPixel));
-                        }
-
-                        if (hasAlpha
-                            && (image->GetAlpha(column * pixelsPerByte + bp,
-                                    row) <= 127) == minIsWhite)
-                        {
-                            reverse |= (uint8) (64 >> (bp * bitsPerPixel));
-                        }
-                    }
-
-                    buf[column] = reverse;
-                }
-            }
-        }
-
-        if ( TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0 )
-        {
-            if (verbose)
-            {
-                wxLogError( _("TIFF: Error writing image.") );
-            }
-
-            TIFFClose( tif );
-            if (buf)
-                _TIFFfree(buf);
-
-            return false;
-        }
-
-        ptr += imageWidth * 3;
-    }
-
-    (void) TIFFClose(tif);
-
-    if (buf)
-        _TIFFfree(buf);
-
-    return true;
-}
-
-bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
-{
-    unsigned char hdr[2];
-
-    if ( !stream.Read(&hdr[0], WXSIZEOF(hdr)) )     // it's ok to modify the stream position here
-        return false;
-
-    return (hdr[0] == 'I' && hdr[1] == 'I') ||
-           (hdr[0] == 'M' && hdr[1] == 'M');
-}
-
-#endif  // wxUSE_STREAMS
-
-/*static*/ wxVersionInfo wxTIFFHandler::GetLibraryVersionInfo()
-{
-    int major,
-        minor,
-        micro;
-
-    const wxString ver(::TIFFGetVersion());
-    if ( wxSscanf(ver, "LIBTIFF, Version %d.%d.%d", &major, &minor, &micro) != 3 )
-    {
-        wxLogDebug("Unrecognized libtiff version string \"%s\"", ver);
-
-        major =
-        minor =
-        micro = 0;
-    }
-
-    wxString copyright;
-    const wxString desc = ver.BeforeFirst('\n', &copyright);
-    copyright.Replace("\n", "");
-
-    return wxVersionInfo("libtiff", major, minor, micro, desc, copyright);
-}
-
-#endif  // wxUSE_LIBTIFF
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagtiff.cpp
+// Purpose:     wxImage TIFF handler
+// Author:      Robert Roebling
+// RCS-ID:      $Id: imagtiff.cpp 60897 2009-06-04 22:28:48Z VZ $
+// Copyright:   (c) Robert Roebling
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_LIBTIFF
+
+#include "wx/imagtiff.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/bitmap.h"
+    #include "wx/module.h"
+#endif
+
+extern "C"
+{
+    #include "tiff.h"
+    #include "tiffio.h"
+}
+#include "wx/filefn.h"
+#include "wx/wfstream.h"
+
+#ifndef TIFFLINKAGEMODE
+    #if defined(__WATCOMC__) && defined(__WXMGL__)
+        #define TIFFLINKAGEMODE cdecl
+    #else
+        #define TIFFLINKAGEMODE LINKAGEMODE
+    #endif
+#endif
+
+//-----------------------------------------------------------------------------
+// wxTIFFHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
+// helper to translate our, possibly 64 bit, wxFileOffset to TIFF, always 32
+// bit, toff_t
+static toff_t wxFileOffsetToTIFF(wxFileOffset ofs)
+{
+    if ( ofs == wxInvalidOffset )
+        return (toff_t)-1;
+
+    toff_t tofs = wx_truncate_cast(toff_t, ofs);
+    wxCHECK_MSG( (wxFileOffset)tofs == ofs, (toff_t)-1,
+                    _T("TIFF library doesn't support large files") );
+
+    return tofs;
+}
+
+// another helper to convert standard seek mode to our
+static wxSeekMode wxSeekModeFromTIFF(int whence)
+{
+    switch ( whence )
+    {
+        case SEEK_SET:
+            return wxFromStart;
+
+        case SEEK_CUR:
+            return wxFromCurrent;
+
+        case SEEK_END:
+            return wxFromEnd;
+
+        default:
+            return wxFromCurrent;
+    }
+}
+
+extern "C"
+{
+
+tsize_t TIFFLINKAGEMODE
+wxTIFFNullProc(thandle_t WXUNUSED(handle),
+          tdata_t WXUNUSED(buf),
+          tsize_t WXUNUSED(size))
+{
+    return (tsize_t) -1;
+}
+
+tsize_t TIFFLINKAGEMODE
+wxTIFFReadProc(thandle_t handle, tdata_t buf, tsize_t size)
+{
+    wxInputStream *stream = (wxInputStream*) handle;
+    stream->Read( (void*) buf, (size_t) size );
+    return wx_truncate_cast(tsize_t, stream->LastRead());
+}
+
+tsize_t TIFFLINKAGEMODE
+wxTIFFWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
+{
+    wxOutputStream *stream = (wxOutputStream*) handle;
+    stream->Write( (void*) buf, (size_t) size );
+    return wx_truncate_cast(tsize_t, stream->LastWrite());
+}
+
+toff_t TIFFLINKAGEMODE
+wxTIFFSeekIProc(thandle_t handle, toff_t off, int whence)
+{
+    wxInputStream *stream = (wxInputStream*) handle;
+
+    return wxFileOffsetToTIFF(stream->SeekI((wxFileOffset)off,
+                                            wxSeekModeFromTIFF(whence)));
+}
+
+toff_t TIFFLINKAGEMODE
+wxTIFFSeekOProc(thandle_t handle, toff_t off, int whence)
+{
+    wxOutputStream *stream = (wxOutputStream*) handle;
+
+    return wxFileOffsetToTIFF(stream->SeekO((wxFileOffset)off,
+                                            wxSeekModeFromTIFF(whence)));
+}
+
+int TIFFLINKAGEMODE
+wxTIFFCloseIProc(thandle_t WXUNUSED(handle))
+{
+    // there is no need to close the input stream
+    return 0;
+}
+
+int TIFFLINKAGEMODE
+wxTIFFCloseOProc(thandle_t handle)
+{
+    wxOutputStream *stream = (wxOutputStream*) handle;
+
+    return stream->Close() ? 0 : -1;
+}
+
+toff_t TIFFLINKAGEMODE
+wxTIFFSizeProc(thandle_t handle)
+{
+    wxStreamBase *stream = (wxStreamBase*) handle;
+    return (toff_t) stream->GetSize();
+}
+
+int TIFFLINKAGEMODE
+wxTIFFMapProc(thandle_t WXUNUSED(handle),
+             tdata_t* WXUNUSED(pbase),
+             toff_t* WXUNUSED(psize))
+{
+    return 0;
+}
+
+void TIFFLINKAGEMODE
+wxTIFFUnmapProc(thandle_t WXUNUSED(handle),
+               tdata_t WXUNUSED(base),
+               toff_t WXUNUSED(size))
+{
+}
+
+static void
+TIFFwxWarningHandler(const char* module,
+                     const char* WXUNUSED_IN_UNICODE(fmt),
+                     va_list WXUNUSED_IN_UNICODE(ap))
+{
+    if (module != NULL)
+        wxLogWarning(_("tiff module: %s"), wxString::FromAscii(module).c_str());
+
+    // FIXME: this is not terrible informative but better than crashing!
+#if wxUSE_UNICODE
+    wxLogWarning(_("TIFF library warning."));
+#else
+    wxVLogWarning(fmt, ap);
+#endif
+}
+
+static void
+TIFFwxErrorHandler(const char* module,
+                   const char* WXUNUSED_IN_UNICODE(fmt),
+                   va_list WXUNUSED_IN_UNICODE(ap))
+{
+    if (module != NULL)
+        wxLogError(_("tiff module: %s"), wxString::FromAscii(module).c_str());
+
+    // FIXME: as above
+#if wxUSE_UNICODE
+    wxLogError(_("TIFF library error."));
+#else
+    wxVLogError(fmt, ap);
+#endif
+}
+
+} // extern "C"
+
+TIFF*
+TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
+{
+    TIFF* tif = TIFFClientOpen(name, mode,
+        (thandle_t) &stream,
+        wxTIFFReadProc, wxTIFFNullProc,
+        wxTIFFSeekIProc, wxTIFFCloseIProc, wxTIFFSizeProc,
+        wxTIFFMapProc, wxTIFFUnmapProc);
+
+    return tif;
+}
+
+TIFF*
+TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
+{
+    TIFF* tif = TIFFClientOpen(name, mode,
+        (thandle_t) &stream,
+        wxTIFFNullProc, wxTIFFWriteProc,
+        wxTIFFSeekOProc, wxTIFFCloseOProc, wxTIFFSizeProc,
+        wxTIFFMapProc, wxTIFFUnmapProc);
+
+    return tif;
+}
+
+wxTIFFHandler::wxTIFFHandler()
+{
+    m_name = wxT("TIFF file");
+    m_extension = wxT("tif");
+    m_type = wxBITMAP_TYPE_TIF;
+    m_mime = wxT("image/tiff");
+    TIFFSetWarningHandler((TIFFErrorHandler) TIFFwxWarningHandler);
+    TIFFSetErrorHandler((TIFFErrorHandler) TIFFwxErrorHandler);
+}
+
+bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
+{
+    if (index == -1)
+        index = 0;
+
+    image->Destroy();
+
+    TIFF *tif = TIFFwxOpen( stream, "image", "r" );
+
+    if (!tif)
+    {
+        if (verbose)
+            wxLogError( _("TIFF: Error loading image.") );
+
+        return false;
+    }
+
+    if (!TIFFSetDirectory( tif, (tdir_t)index ))
+    {
+        if (verbose)
+            wxLogError( _("Invalid TIFF image index.") );
+
+        TIFFClose( tif );
+
+        return false;
+    }
+
+    uint32 w, h;
+    uint32 *raster;
+
+    TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
+    TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &h );
+
+    uint16 extraSamples;
+    uint16* samplesInfo;
+    TIFFGetFieldDefaulted(tif, TIFFTAG_EXTRASAMPLES,
+                          &extraSamples, &samplesInfo);
+    const bool hasAlpha = (extraSamples == 1 &&
+                           (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
+                            samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
+
+    // guard against integer overflow during multiplication which could result
+    // in allocating a too small buffer and then overflowing it
+    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
+    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
+    {
+        if ( verbose )
+            wxLogError( _("TIFF: Image size is abnormally big.") );
+
+        TIFFClose(tif);
+
+        return false;
+    }
+
+    raster = (uint32*) _TIFFmalloc( bytesNeeded );
+
+    if (!raster)
+    {
+        if (verbose)
+            wxLogError( _("TIFF: Couldn't allocate memory.") );
+
+        TIFFClose( tif );
+
+        return false;
+    }
+
+    image->Create( (int)w, (int)h );
+    if (!image->Ok())
+    {
+        if (verbose)
+            wxLogError( _("TIFF: Couldn't allocate memory.") );
+
+        _TIFFfree( raster );
+        TIFFClose( tif );
+
+        return false;
+    }
+
+    if ( hasAlpha )
+        image->SetAlpha();
+
+    if (!TIFFReadRGBAImage( tif, w, h, raster, 0 ))
+    {
+        if (verbose)
+            wxLogError( _("TIFF: Error reading image.") );
+
+        _TIFFfree( raster );
+        image->Destroy();
+        TIFFClose( tif );
+
+        return false;
+    }
+
+    unsigned char *ptr = image->GetData();
+    ptr += w*3*(h-1);
+
+    unsigned char *alpha = hasAlpha ? image->GetAlpha() : NULL;
+    if ( hasAlpha )
+        alpha += w*(h-1);
+
+    uint32 pos = 0;
+
+    for (uint32 i = 0; i < h; i++)
+    {
+        for (uint32 j = 0; j < w; j++)
+        {
+            *(ptr++) = (unsigned char)TIFFGetR(raster[pos]);
+            *(ptr++) = (unsigned char)TIFFGetG(raster[pos]);
+            *(ptr++) = (unsigned char)TIFFGetB(raster[pos]);
+            if ( hasAlpha )
+                *(alpha++) = (unsigned char)TIFFGetA(raster[pos]);
+
+            pos++;
+        }
+
+        // subtract line we just added plus one line:
+        ptr -= 2*w*3;
+        if ( hasAlpha )
+            alpha -= 2*w;
+    }
+
+    _TIFFfree( raster );
+
+    TIFFClose( tif );
+
+    return true;
+}
+
+int wxTIFFHandler::GetImageCount( wxInputStream& stream )
+{
+    TIFF *tif = TIFFwxOpen( stream, "image", "r" );
+
+    if (!tif)
+        return 0;
+
+    int dircount = 0;  // according to the libtiff docs, dircount should be set to 1 here???
+    do {
+        dircount++;
+    } while (TIFFReadDirectory(tif));
+
+    TIFFClose( tif );
+
+    return dircount;
+}
+
+bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
+{
+    TIFF *tif = TIFFwxOpen( stream, "image", "w" );
+
+    if (!tif)
+    {
+        if (verbose)
+            wxLogError( _("TIFF: Error saving image.") );
+
+        return false;
+    }
+
+    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+    TIFFSetField(tif, TIFFTAG_IMAGEWIDTH,  (uint32)image->GetWidth());
+    TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (uint32)image->GetHeight());
+    TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);
+    TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+
+    if ( image->HasOption(wxIMAGE_OPTION_RESOLUTIONX) &&
+            image->HasOption(wxIMAGE_OPTION_RESOLUTIONY) )
+    {
+        TIFFSetField(tif, TIFFTAG_XRESOLUTION,
+                        (float)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX));
+        TIFFSetField(tif, TIFFTAG_YRESOLUTION,
+                        (float)image->GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY));
+    }
+
+    int spp = image->GetOptionInt(wxIMAGE_OPTION_SAMPLESPERPIXEL);
+    if ( !spp )
+        spp = 3;
+
+    int bpp = image->GetOptionInt(wxIMAGE_OPTION_BITSPERSAMPLE);
+    if ( !bpp )
+        bpp=8;
+
+    int compression = image->GetOptionInt(wxIMAGE_OPTION_COMPRESSION);
+    if ( !compression )
+    {
+        // we can't use COMPRESSION_LZW because current version of libtiff
+        // doesn't implement it ("no longer implemented due to Unisys patent
+        // enforcement") and other compression methods are lossy so we
+        // shouldn't use them by default -- and the only remaining one is none
+        compression = COMPRESSION_NONE;
+    }
+
+    TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp);
+    TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bpp);
+    TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, spp*bpp == 1 ? PHOTOMETRIC_MINISBLACK
+                                                        : PHOTOMETRIC_RGB);
+    TIFFSetField(tif, TIFFTAG_COMPRESSION, compression);
+
+    // scanlinesize if determined by spp and bpp
+    tsize_t linebytes = (tsize_t)image->GetWidth() * spp * bpp / 8;
+
+    if ( (image->GetWidth() % 8 > 0) && (spp * bpp < 8) )
+        linebytes+=1;
+
+    unsigned char *buf;
+
+    if (TIFFScanlineSize(tif) > linebytes || (spp * bpp < 24))
+    {
+        buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(tif));
+        if (!buf)
+        {
+            if (verbose)
+                wxLogError( _("TIFF: Couldn't allocate memory.") );
+
+            TIFFClose( tif );
+
+            return false;
+        }
+    }
+    else
+    {
+        buf = NULL;
+    }
+
+    TIFFSetField(tif, TIFFTAG_ROWSPERSTRIP,TIFFDefaultStripSize(tif, (uint32) -1));
+
+    unsigned char *ptr = image->GetData();
+    for ( int row = 0; row < image->GetHeight(); row++ )
+    {
+        if ( buf )
+        {
+            if ( spp * bpp > 1 )
+            {
+                // color image
+                memcpy(buf, ptr, image->GetWidth());
+            }
+            else // black and white image
+            {
+                for ( int column = 0; column < linebytes; column++ )
+                {
+                    uint8 reverse = 0;
+                    for ( int bp = 0; bp < 8; bp++ )
+                    {
+                        if ( ptr[column*24 + bp*3] > 0 )
+                        {
+                            // check only red as this is sufficient
+                            reverse = (uint8)(reverse | 128 >> bp);
+                        }
+                    }
+
+                    buf[column] = reverse;
+                }
+            }
+        }
+
+        if ( TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0 )
+        {
+            if (verbose)
+                wxLogError( _("TIFF: Error writing image.") );
+
+            TIFFClose( tif );
+            if (buf)
+                _TIFFfree(buf);
+
+            return false;
+        }
+
+        ptr += image->GetWidth()*3;
+    }
+
+    (void) TIFFClose(tif);
+
+    if (buf)
+        _TIFFfree(buf);
+
+    return true;
+}
+
+bool wxTIFFHandler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[2];
+
+    if ( !stream.Read(&hdr[0], WXSIZEOF(hdr)) )
+        return false;
+
+    return (hdr[0] == 'I' && hdr[1] == 'I') ||
+           (hdr[0] == 'M' && hdr[1] == 'M');
+}
+
+#endif  // wxUSE_STREAMS
+
+#endif  // wxUSE_LIBTIFF
diff --git a/Source/3rd Party/wx/src/common/imagxpm.cpp b/Source/3rd Party/wx/src/common/imagxpm.cpp
index 2f6f732b6..8ef328cf2 100644
--- a/Source/3rd Party/wx/src/common/imagxpm.cpp	
+++ b/Source/3rd Party/wx/src/common/imagxpm.cpp	
@@ -1,226 +1,224 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/imagxpm.cpp
-// Purpose:     wxXPMHandler
-// Author:      Vaclav Slavik, Robert Roebling
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-/*
-
-This file is partially based on source code of ImageMagick by John Cristy. Its
-license is as follows:
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%                            X   X  PPPP   M   M                              %
-%                             X X   P   P  MM MM                              %
-%                              X    PPPP   M M M                              %
-%                             X X   P      M   M                              %
-%                            X   X  P      M   M                              %
-%                                                                             %
-%                                                                             %
-%                    Read/Write ImageMagick Image Format.                     %
-%                                                                             %
-%                                                                             %
-%                              Software Design                                %
-%                                John Cristy                                  %
-%                                 July 1992                                   %
-%                                                                             %
-%                                                                             %
-%  Copyright (C) 2001 ImageMagick Studio, a non-profit organization dedicated %
-%  to making software imaging solutions freely available.                     %
-%                                                                             %
-%  Permission is hereby granted, free of charge, to any person obtaining a    %
-%  copy of this software and associated documentation files ("ImageMagick"),  %
-%  to deal in ImageMagick without restriction, including without limitation   %
-%  the rights to use, copy, modify, merge, publish, distribute, sublicense,   %
-%  and/or sell copies of ImageMagick, and to permit persons to whom the       %
-%  ImageMagick is furnished to do so, subject to the following conditions:    %
-%                                                                             %
-%  The above copyright notice and this permission notice shall be included in %
-%  all copies or substantial portions of ImageMagick.                         %
-%                                                                             %
-%  The software is provided "as is", without warranty of any kind, express or %
-%  implied, including but not limited to the warranties of merchantability,   %
-%  fitness for a particular purpose and noninfringement.  In no event shall   %
-%  ImageMagick Studio be liable for any claim, damages or other liability,    %
-%  whether in an action of contract, tort or otherwise, arising from, out of  %
-%  or in connection with ImageMagick or the use or other dealings in          %
-%  ImageMagick.                                                               %
-%                                                                             %
-%  Except as contained in this notice, the name of the ImageMagick Studio     %
-%  shall not be used in advertising or otherwise to promote the sale, use or  %
-%  other dealings in ImageMagick without prior written authorization from the %
-%  ImageMagick Studio.                                                        %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XPM
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/utils.h"
-#endif
-
-#include "wx/imagxpm.h"
-#include "wx/wfstream.h"
-#include "wx/xpmdecod.h"
-#include "wx/filename.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
-
-//-----------------------------------------------------------------------------
-// wxXPMHandler
-//-----------------------------------------------------------------------------
-
-#if wxUSE_STREAMS
-
-bool wxXPMHandler::LoadFile(wxImage *image,
-                            wxInputStream& stream,
-                            bool WXUNUSED(verbose), int WXUNUSED(index))
-{
-    wxXPMDecoder decoder;
-
-    wxImage img = decoder.ReadFile(stream);
-    if ( !img.IsOk() )
-        return false;
-    *image = img;
-    return true;
-}
-
-bool wxXPMHandler::SaveFile(wxImage * image,
-                            wxOutputStream& stream, bool WXUNUSED(verbose))
-{
-    // 1. count colours:
-    #define MaxCixels  92
-    static const char Cixel[MaxCixels+1] =
-                         " .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjk"
-                         "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|";
-    int i, j, k;
-
-    wxImageHistogram histogram;
-    int cols = int(image->ComputeHistogram(histogram));
-
-    int chars_per_pixel = 1;
-    for ( k = MaxCixels; cols > k; k *= MaxCixels)
-        chars_per_pixel++;
-
-    // 2. write the header:
-    wxString sName;
-    if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
-    {
-        wxFileName::SplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
-                              NULL, &sName, NULL);
-        sName << wxT("_xpm");
-    }
-
-    if ( !sName.empty() )
-        sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName;
-    else
-        sName = wxT("/* XPM */\nstatic const char *xpm_data");
-    stream.Write( (const char*) sName.ToAscii(), sName.Len() );
-
-    char tmpbuf[200];
-    // VS: 200b is safe upper bound for anything produced by sprintf below
-    //     (<101 bytes the string, neither %i can expand into more than 10 chars)
-    sprintf(tmpbuf,
-               "[] = {\n"
-               "/* columns rows colors chars-per-pixel */\n"
-               "\"%i %i %i %i\",\n",
-               image->GetWidth(), image->GetHeight(), cols, chars_per_pixel);
-    stream.Write(tmpbuf, strlen(tmpbuf));
-
-    // 3. create color symbols table:
-    char *symbols_data = new char[cols * (chars_per_pixel+1)];
-    char **symbols = new char*[cols];
-
-    // 2a. find mask colour:
-    unsigned long mask_key = 0x1000000 /*invalid RGB value*/;
-    if (image->HasMask())
-        mask_key = (image->GetMaskRed() << 16) |
-                   (image->GetMaskGreen() << 8) | image->GetMaskBlue();
-
-    // 2b. generate colour table:
-    for (wxImageHistogram::iterator entry = histogram.begin();
-         entry != histogram.end(); ++entry )
-    {
-        unsigned long index = entry->second.index;
-        symbols[index] = symbols_data + index * (chars_per_pixel+1);
-        char *sym = symbols[index];
-
-        for (j = 0; j < chars_per_pixel; j++)
-        {
-            sym[j] = Cixel[index % MaxCixels];
-            index /= MaxCixels;
-        }
-        sym[j] = '\0';
-
-        unsigned long key = entry->first;
-
-        if (key == 0)
-            sprintf( tmpbuf, "\"%s c Black\",\n", sym);
-        else if (key == mask_key)
-            sprintf( tmpbuf, "\"%s c None\",\n", sym);
-        else
-        {
-            wxByte r = wxByte(key >> 16);
-            wxByte g = wxByte(key >> 8);
-            wxByte b = wxByte(key);
-            sprintf(tmpbuf, "\"%s c #%02X%02X%02X\",\n", sym, r, g, b);
-        }
-        stream.Write( tmpbuf, strlen(tmpbuf) );
-    }
-
-    stream.Write("/* pixels */\n", 13);
-
-    unsigned char *data = image->GetData();
-    for (j = 0; j < image->GetHeight(); j++)
-    {
-        char tmp_c;
-        tmp_c = '\"'; stream.Write(&tmp_c, 1);
-        for (i = 0; i < image->GetWidth(); i++, data += 3)
-        {
-            unsigned long key = (data[0] << 16) | (data[1] << 8) | (data[2]);
-            stream.Write(symbols[histogram[key].index], chars_per_pixel);
-        }
-        tmp_c = '\"'; stream.Write(&tmp_c, 1);
-        if ( j + 1 < image->GetHeight() )
-        {
-            tmp_c = ','; stream.Write(&tmp_c, 1);
-        }
-        tmp_c = '\n'; stream.Write(&tmp_c, 1);
-    }
-    stream.Write("};\n", 3 );
-
-    // Clean up:
-    delete[] symbols;
-    delete[] symbols_data;
-
-    return true;
-}
-
-bool wxXPMHandler::DoCanRead(wxInputStream& stream)
-{
-    wxXPMDecoder decoder;
-    return decoder.CanRead(stream);
-         // it's ok to modify the stream position here
-}
-
-#endif  // wxUSE_STREAMS
-
-#endif // wxUSE_XPM
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/imagxpm.cpp
+// Purpose:     wxXPMHandler
+// Author:      Vaclav Slavik, Robert Roebling
+// RCS-ID:      $Id: imagxpm.cpp 53477 2008-05-07 07:28:57Z JS $
+// Copyright:   (c) 2001 Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/*
+
+This file is partially based on source code of ImageMagick by John Cristy. Its
+license is as follows:
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%                            X   X  PPPP   M   M                              %
+%                             X X   P   P  MM MM                              %
+%                              X    PPPP   M M M                              %
+%                             X X   P      M   M                              %
+%                            X   X  P      M   M                              %
+%                                                                             %
+%                                                                             %
+%                    Read/Write ImageMagick Image Format.                     %
+%                                                                             %
+%                                                                             %
+%                              Software Design                                %
+%                                John Cristy                                  %
+%                                 July 1992                                   %
+%                                                                             %
+%                                                                             %
+%  Copyright (C) 2001 ImageMagick Studio, a non-profit organization dedicated %
+%  to making software imaging solutions freely available.                     %
+%                                                                             %
+%  Permission is hereby granted, free of charge, to any person obtaining a    %
+%  copy of this software and associated documentation files ("ImageMagick"),  %
+%  to deal in ImageMagick without restriction, including without limitation   %
+%  the rights to use, copy, modify, merge, publish, distribute, sublicense,   %
+%  and/or sell copies of ImageMagick, and to permit persons to whom the       %
+%  ImageMagick is furnished to do so, subject to the following conditions:    %
+%                                                                             %
+%  The above copyright notice and this permission notice shall be included in %
+%  all copies or substantial portions of ImageMagick.                         %
+%                                                                             %
+%  The software is provided "as is", without warranty of any kind, express or %
+%  implied, including but not limited to the warranties of merchantability,   %
+%  fitness for a particular purpose and noninfringement.  In no event shall   %
+%  ImageMagick Studio be liable for any claim, damages or other liability,    %
+%  whether in an action of contract, tort or otherwise, arising from, out of  %
+%  or in connection with ImageMagick or the use or other dealings in          %
+%  ImageMagick.                                                               %
+%                                                                             %
+%  Except as contained in this notice, the name of the ImageMagick Studio     %
+%  shall not be used in advertising or otherwise to promote the sale, use or  %
+%  other dealings in ImageMagick without prior written authorization from the %
+%  ImageMagick Studio.                                                        %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+*/
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_XPM
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/utils.h"
+#endif
+
+#include "wx/imagxpm.h"
+#include "wx/wfstream.h"
+#include "wx/xpmdecod.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
+
+//-----------------------------------------------------------------------------
+// wxXPMHandler
+//-----------------------------------------------------------------------------
+
+#if wxUSE_STREAMS
+
+bool wxXPMHandler::LoadFile(wxImage *image,
+                            wxInputStream& stream,
+                            bool WXUNUSED(verbose), int WXUNUSED(index))
+{
+    wxXPMDecoder decoder;
+
+    wxImage img = decoder.ReadFile(stream);
+    if ( !img.Ok() )
+        return false;
+    *image = img;
+    return true;
+}
+
+bool wxXPMHandler::SaveFile(wxImage * image,
+                            wxOutputStream& stream, bool WXUNUSED(verbose))
+{
+    // 1. count colours:
+    #define MaxCixels  92
+    static const char Cixel[MaxCixels+1] =
+                         " .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjk"
+                         "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|";
+    int i, j, k;
+
+    wxImageHistogram histogram;
+    int cols = int(image->ComputeHistogram(histogram));
+
+    int chars_per_pixel = 1;
+    for ( k = MaxCixels; cols > k; k *= MaxCixels)
+        chars_per_pixel++;
+
+    // 2. write the header:
+    wxString sName;
+    if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
+    {
+        wxSplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
+                    NULL, &sName, NULL);
+        sName << wxT("_xpm");
+    }
+
+    if ( !sName.empty() )
+        sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName;
+    else
+        sName = wxT("/* XPM */\nstatic const char *xpm_data");
+    stream.Write( (const char*) sName.ToAscii(), sName.Len() );
+
+    char tmpbuf[200];
+    // VS: 200b is safe upper bound for anything produced by sprintf below
+    //     (<101 bytes the string, neither %i can expand into more than 10 chars)
+    sprintf(tmpbuf,
+               "[] = {\n"
+               "/* columns rows colors chars-per-pixel */\n"
+               "\"%i %i %i %i\",\n",
+               image->GetWidth(), image->GetHeight(), cols, chars_per_pixel);
+    stream.Write(tmpbuf, strlen(tmpbuf));
+
+    // 3. create color symbols table:
+    char *symbols_data = new char[cols * (chars_per_pixel+1)];
+    char **symbols = new char*[cols];
+
+    // 2a. find mask colour:
+    unsigned long mask_key = 0x1000000 /*invalid RGB value*/;
+    if (image->HasMask())
+        mask_key = (image->GetMaskRed() << 16) |
+                   (image->GetMaskGreen() << 8) | image->GetMaskBlue();
+
+    // 2b. generate colour table:
+    for (wxImageHistogram::iterator entry = histogram.begin();
+         entry != histogram.end(); ++entry )
+    {
+        unsigned long index = entry->second.index;
+        symbols[index] = symbols_data + index * (chars_per_pixel+1);
+        char *sym = symbols[index];
+
+        for (j = 0; j < chars_per_pixel; j++)
+        {
+            sym[j] = Cixel[index % MaxCixels];
+            index /= MaxCixels;
+        }
+        sym[j] = '\0';
+
+        unsigned long key = entry->first;
+
+        if (key == 0)
+            sprintf( tmpbuf, "\"%s c Black\",\n", sym);
+        else if (key == mask_key)
+            sprintf( tmpbuf, "\"%s c None\",\n", sym);
+        else
+        {
+            wxByte r = wxByte(key >> 16);
+            wxByte g = wxByte(key >> 8);
+            wxByte b = wxByte(key);
+            sprintf(tmpbuf, "\"%s c #%02X%02X%02X\",\n", sym, r, g, b);
+        }
+        stream.Write( tmpbuf, strlen(tmpbuf) );
+    }
+
+    stream.Write("/* pixels */\n", 13);
+
+    unsigned char *data = image->GetData();
+    for (j = 0; j < image->GetHeight(); j++)
+    {
+        char tmp_c;
+        tmp_c = '\"'; stream.Write(&tmp_c, 1);
+        for (i = 0; i < image->GetWidth(); i++, data += 3)
+        {
+            unsigned long key = (data[0] << 16) | (data[1] << 8) | (data[2]);
+            stream.Write(symbols[histogram[key].index], chars_per_pixel);
+        }
+        tmp_c = '\"'; stream.Write(&tmp_c, 1);
+        if ( j + 1 < image->GetHeight() )
+        {
+            tmp_c = ','; stream.Write(&tmp_c, 1);
+        }
+        tmp_c = '\n'; stream.Write(&tmp_c, 1);
+    }
+    stream.Write("};\n", 3 );
+
+    // Clean up:
+    delete[] symbols;
+    delete[] symbols_data;
+
+    return true;
+}
+
+bool wxXPMHandler::DoCanRead(wxInputStream& stream)
+{
+    wxXPMDecoder decoder;
+    return decoder.CanRead(stream);
+}
+
+#endif  // wxUSE_STREAMS
+
+#endif // wxUSE_XPM
diff --git a/Source/3rd Party/wx/src/common/init.cpp b/Source/3rd Party/wx/src/common/init.cpp
index a473355d7..9d68e6abb 100644
--- a/Source/3rd Party/wx/src/common/init.cpp	
+++ b/Source/3rd Party/wx/src/common/init.cpp	
@@ -1,534 +1,505 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/init.cpp
-// Purpose:     initialisation for the library
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     04.10.99
-// RCS-ID:      $Id$
-// Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef    __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/filefn.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/module.h"
-#endif
-
-#include "wx/init.h"
-#include "wx/thread.h"
-
-#include "wx/scopedptr.h"
-#include "wx/except.h"
-
-#if defined(__WINDOWS__)
-    #include "wx/msw/private.h"
-    #include "wx/msw/msvcrt.h"
-
-    #ifdef wxCrtSetDbgFlag
-        static struct EnableMemLeakChecking
-        {
-            EnableMemLeakChecking()
-            {
-                // check for memory leaks on program exit (another useful flag
-                // is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free deallocated
-                // memory which may be used to simulate low-memory condition)
-                wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
-            }
-        } gs_enableLeakChecks;
-    #endif // wxCrtSetDbgFlag
-#endif // __WINDOWS__
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// we need a dummy app object if the user doesn't want to create a real one
-class wxDummyConsoleApp : public wxAppConsole
-{
-public:
-    wxDummyConsoleApp() { }
-
-    virtual int OnRun() { wxFAIL_MSG( wxT("unreachable code") ); return 0; }
-    virtual bool DoYield(bool, long) { return true; }
-
-    wxDECLARE_NO_COPY_CLASS(wxDummyConsoleApp);
-};
-
-// we need a special kind of auto pointer to wxApp which not only deletes the
-// pointer it holds in its dtor but also resets the global application pointer
-wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)
-wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)
-
-class wxAppPtr : public wxAppPtrBase
-{
-public:
-    wxEXPLICIT wxAppPtr(wxAppConsole *ptr = NULL) : wxAppPtrBase(ptr) { }
-    ~wxAppPtr()
-    {
-        if ( get() )
-        {
-            // the pointer is going to be deleted in the base class dtor, don't
-            // leave the dangling pointer!
-            wxApp::SetInstance(NULL);
-        }
-    }
-
-    void Set(wxAppConsole *ptr)
-    {
-        reset(ptr);
-
-        wxApp::SetInstance(ptr);
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxAppPtr);
-};
-
-// class to ensure that wxAppBase::CleanUp() is called if our Initialize()
-// fails
-class wxCallAppCleanup
-{
-public:
-    wxCallAppCleanup(wxAppConsole *app) : m_app(app) { }
-    ~wxCallAppCleanup() { if ( m_app ) m_app->CleanUp(); }
-
-    void Dismiss() { m_app = NULL; }
-
-private:
-    wxAppConsole *m_app;
-};
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-// suppress warnings about unused variables
-static inline void Use(void *) { }
-
-#define WX_SUPPRESS_UNUSED_WARN(x) Use(&x)
-
-// ----------------------------------------------------------------------------
-// initialization data
-// ----------------------------------------------------------------------------
-
-static struct InitData
-{
-    InitData()
-    {
-        nInitCount = 0;
-
-#if wxUSE_UNICODE
-        argc = 0;
-        // argv = NULL; -- not even really needed
-#endif // wxUSE_UNICODE
-    }
-
-    // critical section protecting this struct
-    wxCRIT_SECT_DECLARE_MEMBER(csInit);
-
-    // number of times wxInitialize() was called minus the number of times
-    // wxUninitialize() was
-    size_t nInitCount;
-
-#if wxUSE_UNICODE
-    int argc;
-
-    // if we receive the command line arguments as ASCII and have to convert
-    // them to Unicode ourselves (this is the case under Unix but not Windows,
-    // for example), we remember the converted argv here because we'll have to
-    // free it when doing cleanup to avoid memory leaks
-    wchar_t **argv;
-#endif // wxUSE_UNICODE
-
-    wxDECLARE_NO_COPY_CLASS(InitData);
-} gs_initData;
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// command line arguments ANSI -> Unicode conversion
-// ----------------------------------------------------------------------------
-
-#if wxUSE_UNICODE
-
-static void ConvertArgsToUnicode(int argc, char **argv)
-{
-    gs_initData.argv = new wchar_t *[argc + 1];
-    int wargc = 0;
-    for ( int i = 0; i < argc; i++ )
-    {
-#ifdef __DARWIN__
-        wxWCharBuffer buf(wxConvFileName->cMB2WX(argv[i]));
-#else
-        wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i]));
-#endif
-        if ( !buf )
-        {
-            wxLogWarning(_("Command line argument %d couldn't be converted to Unicode and will be ignored."),
-                         i);
-        }
-        else // converted ok
-        {
-            gs_initData.argv[wargc++] = wxStrdup(buf);
-        }
-    }
-
-    gs_initData.argc = wargc;
-    gs_initData.argv[wargc] = NULL;
-}
-
-static void FreeConvertedArgs()
-{
-    if ( gs_initData.argv )
-    {
-        for ( int i = 0; i < gs_initData.argc; i++ )
-        {
-            free(gs_initData.argv[i]);
-        }
-
-        wxDELETEA(gs_initData.argv);
-        gs_initData.argc = 0;
-    }
-}
-
-#endif // wxUSE_UNICODE
-
-// ----------------------------------------------------------------------------
-// start up
-// ----------------------------------------------------------------------------
-
-// initialization which is always done (not customizable) before wxApp creation
-static bool DoCommonPreInit()
-{
-#if wxUSE_LOG
-    // Reset logging in case we were cleaned up and are being reinitialized.
-    wxLog::DoCreateOnDemand();
-
-    // force wxLog to create a log target now: we do it because wxTheApp
-    // doesn't exist yet so wxLog will create a special log target which is
-    // safe to use even when the GUI is not available while without this call
-    // we could create wxApp in wxEntryStart() below, then log an error about
-    // e.g. failure to establish connection to the X server and wxLog would
-    // send it to wxLogGui (because wxTheApp does exist already) which, of
-    // course, can't be used in this case
-    //
-    // notice also that this does nothing if the user had set up a custom log
-    // target before -- which is fine as we want to give him this possibility
-    // (as it's impossible to override logging by overriding wxAppTraits::
-    // CreateLogTarget() before wxApp is created) and we just assume he knows
-    // what he is doing
-    wxLog::GetActiveTarget();
-#endif // wxUSE_LOG
-
-#ifdef __WINDOWS__
-    // GUI applications obtain HINSTANCE in their WinMain() but we also need to
-    // initialize the global wxhInstance variable for the console programs as
-    // they may need it too, so set it here if it wasn't done yet
-    if ( !wxGetInstance() )
-    {
-        wxSetInstance(::GetModuleHandle(NULL));
-    }
-#endif // __WINDOWS__
-
-    return true;
-}
-
-// non customizable initialization done after wxApp creation and initialization
-static bool DoCommonPostInit()
-{
-    wxModule::RegisterModules();
-
-    if ( !wxModule::InitializeModules() )
-    {
-        wxLogError(_("Initialization failed in post init, aborting."));
-        return false;
-    }
-
-    return true;
-}
-
-bool wxEntryStart(int& argc, wxChar **argv)
-{
-    // do minimal, always necessary, initialization
-    // --------------------------------------------
-
-    // initialize wxRTTI
-    if ( !DoCommonPreInit() )
-        return false;
-
-
-    // first of all, we need an application object
-    // -------------------------------------------
-
-    // the user might have already created it himself somehow
-    wxAppPtr app(wxTheApp);
-    if ( !app.get() )
-    {
-        // if not, he might have used IMPLEMENT_APP() to give us a function to
-        // create it
-        wxAppInitializerFunction fnCreate = wxApp::GetInitializerFunction();
-
-        if ( fnCreate )
-        {
-            // he did, try to create the custom wxApp object
-            app.Set((*fnCreate)());
-        }
-    }
-
-    if ( !app.get() )
-    {
-        // either IMPLEMENT_APP() was not used at all or it failed -- in any
-        // case we still need something
-        app.Set(new wxDummyConsoleApp);
-    }
-
-
-    // wxApp initialization: this can be customized
-    // --------------------------------------------
-
-    if ( !app->Initialize(argc, argv) )
-        return false;
-
-    // remember, possibly modified (e.g. due to removal of toolkit-specific
-    // parameters), command line arguments in member variables
-    app->argc = argc;
-    app->argv = argv;
-
-    wxCallAppCleanup callAppCleanup(app.get());
-
-
-    // common initialization after wxTheApp creation
-    // ---------------------------------------------
-
-    if ( !DoCommonPostInit() )
-        return false;
-
-
-    // prevent the smart pointer from destroying its contents
-    app.release();
-
-    // and the cleanup object from doing cleanup
-    callAppCleanup.Dismiss();
-
-#if wxUSE_LOG
-    // now that we have a valid wxApp (wxLogGui would have crashed if we used
-    // it before now), we can delete the temporary sink we had created for the
-    // initialization messages -- the next time logging function is called, the
-    // sink will be recreated but this time wxAppTraits will be used
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
-
-    return true;
-}
-
-#if wxUSE_UNICODE
-
-// we provide a wxEntryStart() wrapper taking "char *" pointer too
-bool wxEntryStart(int& argc, char **argv)
-{
-    ConvertArgsToUnicode(argc, argv);
-
-    if ( !wxEntryStart(gs_initData.argc, gs_initData.argv) )
-    {
-        FreeConvertedArgs();
-
-        return false;
-    }
-
-    return true;
-}
-
-#endif // wxUSE_UNICODE
-
-// ----------------------------------------------------------------------------
-// clean up
-// ----------------------------------------------------------------------------
-
-// cleanup done before destroying wxTheApp
-static void DoCommonPreCleanup()
-{
-#if wxUSE_LOG
-    // flush the logged messages if any and don't use the current probably
-    // unsafe log target any more: the default one (wxLogGui) can't be used
-    // after the resources are freed which happens when we return and the user
-    // supplied one might be even more unsafe (using any wxWidgets GUI function
-    // is unsafe starting from now)
-    //
-    // notice that wxLog will still recreate a default log target if any
-    // messages are logged but that one will be safe to use until the very end
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
-}
-
-// cleanup done after destroying wxTheApp
-static void DoCommonPostCleanup()
-{
-    wxModule::CleanUpModules();
-
-    // we can't do this in wxApp itself because it doesn't know if argv had
-    // been allocated
-#if wxUSE_UNICODE
-    FreeConvertedArgs();
-#endif // wxUSE_UNICODE
-
-    // use Set(NULL) and not Get() to avoid creating a message output object on
-    // demand when we just want to delete it
-    delete wxMessageOutput::Set(NULL);
-
-#if wxUSE_LOG
-    // and now delete the last logger as well
-    //
-    // we still don't disable log target auto-vivification even if any log
-    // objects created now will result in memory leaks because it seems better
-    // to leak memory which doesn't matter much considering the application is
-    // exiting anyhow than to not show messages which could still be logged
-    // from the user code (e.g. static dtors and such)
-    delete wxLog::SetActiveTarget(NULL);
-#endif // wxUSE_LOG
-}
-
-void wxEntryCleanup()
-{
-    DoCommonPreCleanup();
-
-
-    // delete the application object
-    if ( wxTheApp )
-    {
-        wxTheApp->CleanUp();
-
-        // reset the global pointer to it to NULL before destroying it as in
-        // some circumstances this can result in executing the code using
-        // wxTheApp and using half-destroyed object is no good
-        wxAppConsole * const app = wxApp::GetInstance();
-        wxApp::SetInstance(NULL);
-        delete app;
-    }
-
-
-    DoCommonPostCleanup();
-}
-
-// ----------------------------------------------------------------------------
-// wxEntry
-// ----------------------------------------------------------------------------
-
-// for MSW the real wxEntry is defined in msw/main.cpp
-#ifndef __WINDOWS__
-    #define wxEntryReal wxEntry
-#endif // !__WINDOWS__
-
-int wxEntryReal(int& argc, wxChar **argv)
-{
-    // library initialization
-    wxInitializer initializer(argc, argv);
-
-    if ( !initializer.IsOk() )
-    {
-#if wxUSE_LOG
-        // flush any log messages explaining why we failed
-        delete wxLog::SetActiveTarget(NULL);
-#endif
-        return -1;
-    }
-
-    wxTRY
-    {
-        // app initialization
-        if ( !wxTheApp->CallOnInit() )
-        {
-            // don't call OnExit() if OnInit() failed
-            return -1;
-        }
-
-        // ensure that OnExit() is called if OnInit() had succeeded
-        class CallOnExit
-        {
-        public:
-            ~CallOnExit() { wxTheApp->OnExit(); }
-        } callOnExit;
-
-        WX_SUPPRESS_UNUSED_WARN(callOnExit);
-
-        // app execution
-        return wxTheApp->OnRun();
-    }
-    wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )
-}
-
-#if wxUSE_UNICODE
-
-// as with wxEntryStart, we provide an ANSI wrapper
-int wxEntry(int& argc, char **argv)
-{
-    ConvertArgsToUnicode(argc, argv);
-
-    return wxEntry(gs_initData.argc, gs_initData.argv);
-}
-
-#endif // wxUSE_UNICODE
-
-// ----------------------------------------------------------------------------
-// wxInitialize/wxUninitialize
-// ----------------------------------------------------------------------------
-
-bool wxInitialize()
-{
-    return wxInitialize(0, (wxChar**)NULL);
-}
-
-bool wxInitialize(int argc, wxChar **argv)
-{
-    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
-
-    if ( gs_initData.nInitCount++ )
-    {
-        // already initialized
-        return true;
-    }
-
-    return wxEntryStart(argc, argv);
-}
-
-#if wxUSE_UNICODE
-bool wxInitialize(int argc, char **argv)
-{
-    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
-
-    if ( gs_initData.nInitCount++ )
-    {
-        // already initialized
-        return true;
-    }
-
-    return wxEntryStart(argc, argv);
-}
-#endif // wxUSE_UNICODE
-
-void wxUninitialize()
-{
-    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
-
-    if ( --gs_initData.nInitCount == 0 )
-    {
-        wxEntryCleanup();
-    }
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/init.cpp
+// Purpose:     initialisation for the library
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     04.10.99
+// RCS-ID:      $Id: init.cpp 61555 2009-07-30 07:42:54Z VS $
+// Copyright:   (c) Vadim Zeitlin
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef    __BORLANDC__
+    #pragma hdrstop
+#endif  //__BORLANDC__
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/filefn.h"
+    #include "wx/log.h"
+    #include "wx/thread.h"
+    #include "wx/intl.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/init.h"
+
+#include "wx/ptr_scpd.h"
+#include "wx/except.h"
+
+#if defined(__WXMSW__) && defined(__WXDEBUG__)
+    #include "wx/msw/msvcrt.h"
+
+    static struct EnableMemLeakChecking
+    {
+        EnableMemLeakChecking()
+        {
+            // do check for memory leaks on program exit (another useful flag
+            // is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free deallocated
+            // memory which may be used to simulate low-memory condition)
+            wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+        }
+    } gs_enableLeakChecks;
+#endif // __WXMSW__ && __WXDEBUG__
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// we need a dummy app object if the user doesn't want to create a real one
+class wxDummyConsoleApp : public wxAppConsole
+{
+public:
+    wxDummyConsoleApp() { }
+
+    virtual int OnRun() { wxFAIL_MSG( _T("unreachable code") ); return 0; }
+
+    DECLARE_NO_COPY_CLASS(wxDummyConsoleApp)
+};
+
+// we need a special kind of auto pointer to wxApp which not only deletes the
+// pointer it holds in its dtor but also resets the global application pointer
+wxDECLARE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)
+wxDEFINE_SCOPED_PTR(wxAppConsole, wxAppPtrBase)
+
+class wxAppPtr : public wxAppPtrBase
+{
+public:
+    wxEXPLICIT wxAppPtr(wxAppConsole *ptr = NULL) : wxAppPtrBase(ptr) { }
+    ~wxAppPtr()
+    {
+        if ( get() )
+        {
+            // the pointer is going to be deleted in the base class dtor, don't
+            // leave the dangling pointer!
+            wxApp::SetInstance(NULL);
+        }
+    }
+
+    void Set(wxAppConsole *ptr)
+    {
+        reset(ptr);
+
+        wxApp::SetInstance(ptr);
+    }
+
+    DECLARE_NO_COPY_CLASS(wxAppPtr)
+};
+
+// class to ensure that wxAppBase::CleanUp() is called if our Initialize()
+// fails
+class wxCallAppCleanup
+{
+public:
+    wxCallAppCleanup(wxAppConsole *app) : m_app(app) { }
+    ~wxCallAppCleanup() { if ( m_app ) m_app->CleanUp(); }
+
+    void Dismiss() { m_app = NULL; }
+
+private:
+    wxAppConsole *m_app;
+};
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// suppress warnings about unused variables
+static inline void Use(void *) { }
+
+#define WX_SUPPRESS_UNUSED_WARN(x) Use(&x)
+
+// ----------------------------------------------------------------------------
+// initialization data
+// ----------------------------------------------------------------------------
+
+static struct InitData
+{
+    InitData()
+    {
+        nInitCount = 0;
+
+#if wxUSE_UNICODE
+        argc = 0;
+        // argv = NULL; -- not even really needed
+#endif // wxUSE_UNICODE
+    }
+
+    // critical section protecting this struct
+    wxCRIT_SECT_DECLARE_MEMBER(csInit);
+
+    // number of times wxInitialize() was called minus the number of times
+    // wxUninitialize() was
+    size_t nInitCount;
+
+#if wxUSE_UNICODE
+    int argc;
+
+    // if we receive the command line arguments as ASCII and have to convert
+    // them to Unicode ourselves (this is the case under Unix but not Windows,
+    // for example), we remember the converted argv here because we'll have to
+    // free it when doing cleanup to avoid memory leaks
+    wchar_t **argv;
+#endif // wxUSE_UNICODE
+
+    DECLARE_NO_COPY_CLASS(InitData)
+} gs_initData;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// command line arguments ANSI -> Unicode conversion
+// ----------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+
+static void ConvertArgsToUnicode(int argc, char **argv)
+{
+    gs_initData.argv = new wchar_t *[argc + 1];
+    int wargc = 0;
+    for ( int i = 0; i < argc; i++ )
+    {
+#ifdef __DARWIN__
+        wxWCharBuffer buf(wxConvFileName->cMB2WX(argv[i]));
+#else
+        wxWCharBuffer buf(wxConvLocal.cMB2WX(argv[i]));
+#endif
+        if ( !buf )
+        {
+            wxLogWarning(_("Command line argument %d couldn't be converted to Unicode and will be ignored."),
+                         i);
+        }
+        else // converted ok
+        {
+            gs_initData.argv[wargc++] = wxStrdup(buf);
+        }
+    }
+
+    gs_initData.argc = wargc;
+    gs_initData.argv[wargc] = NULL;
+}
+
+static void FreeConvertedArgs()
+{
+    if ( gs_initData.argv )
+    {
+        for ( int i = 0; i < gs_initData.argc; i++ )
+        {
+            free(gs_initData.argv[i]);
+        }
+
+        delete [] gs_initData.argv;
+        gs_initData.argv = NULL;
+        gs_initData.argc = 0;
+    }
+}
+
+#endif // wxUSE_UNICODE
+
+// ----------------------------------------------------------------------------
+// start up
+// ----------------------------------------------------------------------------
+
+// initialization which is always done (not customizable) before wxApp creation
+static bool DoCommonPreInit()
+{
+#if wxUSE_LOG
+    // Reset logging in case we were cleaned up and are being reinitialized.
+    wxLog::DoCreateOnDemand();
+
+    // install temporary log sink: we can't use wxLogGui before wxApp is
+    // constructed and if we use wxLogStderr, all messages during
+    // initialization simply disappear under Windows
+    //
+    // note that we will delete this log target below
+    delete wxLog::SetActiveTarget(new wxLogBuffer);
+#endif // wxUSE_LOG
+
+    return true;
+}
+
+// non customizable initialization done after wxApp creation and initialization
+static bool DoCommonPostInit()
+{
+    wxModule::RegisterModules();
+
+    if ( !wxModule::InitializeModules() )
+    {
+        wxLogError(_("Initialization failed in post init, aborting."));
+        return false;
+    }
+
+    return true;
+}
+
+bool wxEntryStart(int& argc, wxChar **argv)
+{
+    // do minimal, always necessary, initialization
+    // --------------------------------------------
+
+    // initialize wxRTTI
+    if ( !DoCommonPreInit() )
+    {
+        return false;
+    }
+
+
+    // first of all, we need an application object
+    // -------------------------------------------
+
+    // the user might have already created it himself somehow
+    wxAppPtr app(wxTheApp);
+    if ( !app.get() )
+    {
+        // if not, he might have used IMPLEMENT_APP() to give us a function to
+        // create it
+        wxAppInitializerFunction fnCreate = wxApp::GetInitializerFunction();
+
+        if ( fnCreate )
+        {
+            // he did, try to create the custom wxApp object
+            app.Set((*fnCreate)());
+        }
+    }
+
+    if ( !app.get() )
+    {
+        // either IMPLEMENT_APP() was not used at all or it failed -- in any
+        // case we still need something
+        app.Set(new wxDummyConsoleApp);
+    }
+
+
+    // wxApp initialization: this can be customized
+    // --------------------------------------------
+
+    if ( !app->Initialize(argc, argv) )
+    {
+        return false;
+    }
+
+    wxCallAppCleanup callAppCleanup(app.get());
+
+    // for compatibility call the old initialization function too
+    if ( !app->OnInitGui() )
+        return false;
+
+
+    // common initialization after wxTheApp creation
+    // ---------------------------------------------
+
+    if ( !DoCommonPostInit() )
+        return false;
+
+
+    // prevent the smart pointer from destroying its contents
+    app.release();
+
+    // and the cleanup object from doing cleanup
+    callAppCleanup.Dismiss();
+
+#if wxUSE_LOG
+    // now that we have a valid wxApp (wxLogGui would have crashed if we used
+    // it before now), we can delete the temporary sink we had created for the
+    // initialization messages -- the next time logging function is called, the
+    // sink will be recreated but this time wxAppTraits will be used
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+
+    return true;
+}
+
+#if wxUSE_UNICODE
+
+// we provide a wxEntryStart() wrapper taking "char *" pointer too
+bool wxEntryStart(int& argc, char **argv)
+{
+    ConvertArgsToUnicode(argc, argv);
+
+    if ( !wxEntryStart(gs_initData.argc, gs_initData.argv) )
+    {
+        FreeConvertedArgs();
+
+        return false;
+    }
+
+    return true;
+}
+
+#endif // wxUSE_UNICODE
+
+// ----------------------------------------------------------------------------
+// clean up
+// ----------------------------------------------------------------------------
+
+// cleanup done before destroying wxTheApp
+static void DoCommonPreCleanup()
+{
+#if wxUSE_LOG
+    // flush the logged messages if any and install a 'safer' log target: the
+    // default one (wxLogGui) can't be used after the resources are freed just
+    // below and the user supplied one might be even more unsafe (using any
+    // wxWidgets GUI function is unsafe starting from now)
+    wxLog::DontCreateOnDemand();
+
+    // this will flush the old messages if any
+    delete wxLog::SetActiveTarget(new wxLogStderr);
+#endif // wxUSE_LOG
+}
+
+// cleanup done after destroying wxTheApp
+static void DoCommonPostCleanup()
+{
+    wxModule::CleanUpModules();
+
+    // we can't do this in wxApp itself because it doesn't know if argv had
+    // been allocated
+#if wxUSE_UNICODE
+    FreeConvertedArgs();
+#endif // wxUSE_UNICODE
+
+    // use Set(NULL) and not Get() to avoid creating a message output object on
+    // demand when we just want to delete it
+    delete wxMessageOutput::Set(NULL);
+
+#if wxUSE_LOG
+    // and now delete the last logger as well
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG
+}
+
+void wxEntryCleanup()
+{
+    DoCommonPreCleanup();
+
+
+    // delete the application object
+    if ( wxTheApp )
+    {
+        wxTheApp->CleanUp();
+
+        // reset the global pointer to it to NULL before destroying it as in
+        // some circumstances this can result in executing the code using
+        // wxTheApp and using half-destroyed object is no good
+        wxAppConsole * const app = wxApp::GetInstance();
+        wxApp::SetInstance(NULL);
+        delete app;
+    }
+
+
+    DoCommonPostCleanup();
+}
+
+// ----------------------------------------------------------------------------
+// wxEntry
+// ----------------------------------------------------------------------------
+
+// for MSW the real wxEntry is defined in msw/main.cpp
+#ifndef __WXMSW__
+    #define wxEntryReal wxEntry
+#endif // !__WXMSW__
+
+int wxEntryReal(int& argc, wxChar **argv)
+{
+    // library initialization
+    wxInitializer initializer(argc, argv);
+
+    if ( !initializer.IsOk() )
+    {
+#if wxUSE_LOG
+        // flush any log messages explaining why we failed
+        delete wxLog::SetActiveTarget(NULL);
+#endif
+        return -1;
+    }
+
+    wxTRY
+    {
+
+        // app initialization
+        if ( !wxTheApp->CallOnInit() )
+        {
+            // don't call OnExit() if OnInit() failed
+            return -1;
+        }
+
+        // ensure that OnExit() is called if OnInit() had succeeded
+        class CallOnExit
+        {
+        public:
+            ~CallOnExit() { wxTheApp->OnExit(); }
+        } callOnExit;
+
+        WX_SUPPRESS_UNUSED_WARN(callOnExit);
+
+        // app execution
+        return wxTheApp->OnRun();
+    }
+    wxCATCH_ALL( wxTheApp->OnUnhandledException(); return -1; )
+}
+
+#if wxUSE_UNICODE
+
+// as with wxEntryStart, we provide an ANSI wrapper
+int wxEntry(int& argc, char **argv)
+{
+    ConvertArgsToUnicode(argc, argv);
+
+    return wxEntry(gs_initData.argc, gs_initData.argv);
+}
+
+#endif // wxUSE_UNICODE
+
+// ----------------------------------------------------------------------------
+// wxInitialize/wxUninitialize
+// ----------------------------------------------------------------------------
+
+bool wxInitialize(int argc, wxChar **argv)
+{
+    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
+
+    if ( gs_initData.nInitCount++ )
+    {
+        // already initialized
+        return true;
+    }
+
+    return wxEntryStart(argc, argv);
+}
+
+#if wxUSE_UNICODE
+bool wxInitialize(int argc, char **argv)
+{
+    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
+
+    if ( gs_initData.nInitCount++ )
+    {
+        // already initialized
+        return true;
+    }
+
+    return wxEntryStart(argc, argv);
+}
+#endif // wxUSE_UNICODE
+
+void wxUninitialize()
+{
+    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
+
+    if ( --gs_initData.nInitCount == 0 )
+    {
+        wxEntryCleanup();
+    }
+}
diff --git a/Source/3rd Party/wx/src/common/intl.cpp b/Source/3rd Party/wx/src/common/intl.cpp
index 5bbcc7fac..60083b7f5 100644
--- a/Source/3rd Party/wx/src/common/intl.cpp	
+++ b/Source/3rd Party/wx/src/common/intl.cpp	
@@ -1,1767 +1,3784 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/intl.cpp
-// Purpose:     Internationalization and localisation for wxWidgets
-// Author:      Vadim Zeitlin
-// Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
-//              (2003/09/30 - PluralForms support)
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declaration
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifdef __EMX__
-// The following define is needed by Innotek's libc to
-// make the definition of struct localeconv available.
-#define __INTERNAL_DEFS
-#endif
-
-#if wxUSE_INTL
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/app.h"
-    #include "wx/hashmap.h"
-    #include "wx/module.h"
-#endif // WX_PRECOMP
-
-#ifndef __WXWINCE__
-    #include <locale.h>
-#endif
-
-// standard headers
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef HAVE_LANGINFO_H
-    #include <langinfo.h>
-#endif
-
-#ifdef __WIN32__
-    #include "wx/msw/private.h"
-#endif
-
-#include "wx/file.h"
-#include "wx/filename.h"
-#include "wx/tokenzr.h"
-#include "wx/fontmap.h"
-#include "wx/scopedptr.h"
-#include "wx/apptrait.h"
-#include "wx/stdpaths.h"
-#include "wx/hashset.h"
-
-#if defined(__WXOSX__)
-    #include "wx/osx/core/cfref.h"
-    #include <CoreFoundation/CFLocale.h>
-    #include <CoreFoundation/CFDateFormatter.h>
-    #include "wx/osx/core/cfstring.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-#define TRACE_I18N wxS("i18n")
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-static wxLocale *wxSetLocale(wxLocale *pLocale);
-
-namespace
-{
-
-// get just the language part ("en" in "en_GB")
-inline wxString ExtractLang(const wxString& langFull)
-{
-    return langFull.BeforeFirst('_');
-}
-
-// helper functions of GetSystemLanguage()
-#ifdef __UNIX__
-
-// get everything else (including the leading '_')
-inline wxString ExtractNotLang(const wxString& langFull)
-{
-    size_t pos = langFull.find('_');
-    if ( pos != wxString::npos )
-        return langFull.substr(pos);
-    else
-        return wxString();
-}
-
-#endif // __UNIX__
-
-} // anonymous namespace
-
-// ----------------------------------------------------------------------------
-// wxLanguageInfo
-// ----------------------------------------------------------------------------
-
-#ifdef __WINDOWS__
-
-// helper used by wxLanguageInfo::GetLocaleName() and elsewhere to determine
-// whether the locale is Unicode-only (it is if this function returns empty
-// string)
-static wxString wxGetANSICodePageForLocale(LCID lcid)
-{
-    wxString cp;
-
-    wxChar buffer[16];
-    if ( ::GetLocaleInfo(lcid, LOCALE_IDEFAULTANSICODEPAGE,
-                        buffer, WXSIZEOF(buffer)) > 0 )
-    {
-        if ( buffer[0] != wxT('0') || buffer[1] != wxT('\0') )
-            cp = buffer;
-        //else: this locale doesn't use ANSI code page
-    }
-
-    return cp;
-}
-
-wxUint32 wxLanguageInfo::GetLCID() const
-{
-    return MAKELCID(MAKELANGID(WinLang, WinSublang), SORT_DEFAULT);
-}
-
-wxString wxLanguageInfo::GetLocaleName() const
-{
-    wxString locale;
-
-    const LCID lcid = GetLCID();
-
-    wxChar buffer[256];
-    buffer[0] = wxT('\0');
-    if ( !::GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, WXSIZEOF(buffer)) )
-    {
-        wxLogLastError(wxT("GetLocaleInfo(LOCALE_SENGLANGUAGE)"));
-        return locale;
-    }
-
-    locale << buffer;
-    if ( ::GetLocaleInfo(lcid, LOCALE_SENGCOUNTRY,
-                        buffer, WXSIZEOF(buffer)) > 0 )
-    {
-        locale << wxT('_') << buffer;
-    }
-
-    const wxString cp = wxGetANSICodePageForLocale(lcid);
-    if ( !cp.empty() )
-    {
-        locale << wxT('.') << cp;
-    }
-
-    return locale;
-}
-
-#endif // __WINDOWS__
-
-// ----------------------------------------------------------------------------
-// wxLocale
-// ----------------------------------------------------------------------------
-
-#include "wx/arrimpl.cpp"
-WX_DECLARE_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray);
-WX_DEFINE_OBJARRAY(wxLanguageInfoArray)
-
-wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
-
-/*static*/ void wxLocale::CreateLanguagesDB()
-{
-    if (ms_languagesDB == NULL)
-    {
-        ms_languagesDB = new wxLanguageInfoArray;
-        InitLanguagesDB();
-    }
-}
-
-/*static*/ void wxLocale::DestroyLanguagesDB()
-{
-    wxDELETE(ms_languagesDB);
-}
-
-
-void wxLocale::DoCommonInit()
-{
-    m_pszOldLocale = NULL;
-
-    m_pOldLocale = wxSetLocale(this);
-
-    // Set translations object, but only if the user didn't do so yet.
-    // This is to preserve compatibility with wx-2.8 where wxLocale was
-    // the only API for translations. wxLocale works as a stack, with
-    // latest-created one being the active one:
-    //     wxLocale loc_fr(wxLANGUAGE_FRENCH);
-    //     // _() returns French
-    //     {
-    //         wxLocale loc_cs(wxLANGUAGE_CZECH);
-    //         // _() returns Czech
-    //     }
-    //     // _() returns French again
-    wxTranslations *oldTrans = wxTranslations::Get();
-    if ( !oldTrans ||
-         (m_pOldLocale && oldTrans == &m_pOldLocale->m_translations) )
-    {
-        wxTranslations::SetNonOwned(&m_translations);
-    }
-
-    m_language = wxLANGUAGE_UNKNOWN;
-    m_initialized = false;
-}
-
-// NB: this function has (desired) side effect of changing current locale
-bool wxLocale::Init(const wxString& name,
-                    const wxString& shortName,
-                    const wxString& locale,
-                    bool            bLoadDefault
-#if WXWIN_COMPATIBILITY_2_8
-                   ,bool            WXUNUSED_UNLESS_DEBUG(bConvertEncoding)
-#endif
-                    )
-{
-#if WXWIN_COMPATIBILITY_2_8
-    wxASSERT_MSG( bConvertEncoding,
-                  wxS("wxLocale::Init with bConvertEncoding=false is no longer supported, add charset to your catalogs") );
-#endif
-
-    bool ret = DoInit(name, shortName, locale);
-
-    // NB: don't use 'lang' here, 'language' may be wxLANGUAGE_DEFAULT
-    wxTranslations *t = wxTranslations::Get();
-    if ( t )
-    {
-        t->SetLanguage(shortName);
-
-        if ( bLoadDefault )
-            t->AddStdCatalog();
-    }
-
-    return ret;
-}
-
-bool wxLocale::DoInit(const wxString& name,
-                      const wxString& shortName,
-                      const wxString& locale)
-{
-    wxASSERT_MSG( !m_initialized,
-                    wxS("you can't call wxLocale::Init more than once") );
-
-    m_initialized = true;
-    m_strLocale = name;
-    m_strShort = shortName;
-    m_language = wxLANGUAGE_UNKNOWN;
-
-    // change current locale (default: same as long name)
-    wxString szLocale(locale);
-    if ( szLocale.empty() )
-    {
-        // the argument to setlocale()
-        szLocale = shortName;
-
-        wxCHECK_MSG( !szLocale.empty(), false,
-                    wxS("no locale to set in wxLocale::Init()") );
-    }
-
-    const char *oldLocale = wxSetlocale(LC_ALL, szLocale);
-    if ( oldLocale )
-        m_pszOldLocale = wxStrdup(oldLocale);
-    else
-        m_pszOldLocale = NULL;
-
-    if ( m_pszOldLocale == NULL )
-    {
-        wxLogError(_("locale '%s' cannot be set."), szLocale);
-    }
-
-    // the short name will be used to look for catalog files as well,
-    // so we need something here
-    if ( m_strShort.empty() ) {
-        // FIXME I don't know how these 2 letter abbreviations are formed,
-        //       this wild guess is surely wrong
-        if ( !szLocale.empty() )
-        {
-            m_strShort += (wxChar)wxTolower(szLocale[0]);
-            if ( szLocale.length() > 1 )
-                m_strShort += (wxChar)wxTolower(szLocale[1]);
-        }
-    }
-
-    return true;
-}
-
-
-#if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__)
-static const char *wxSetlocaleTryUTF8(int c, const wxString& lc)
-{
-    const char *l = NULL;
-
-    // NB: We prefer to set UTF-8 locale if it's possible and only fall back to
-    //     non-UTF-8 locale if it fails
-
-    if ( !lc.empty() )
-    {
-        wxString buf(lc);
-        wxString buf2;
-        buf2 = buf + wxS(".UTF-8");
-        l = wxSetlocale(c, buf2);
-        if ( !l )
-        {
-            buf2 = buf + wxS(".utf-8");
-            l = wxSetlocale(c, buf2);
-        }
-        if ( !l )
-        {
-            buf2 = buf + wxS(".UTF8");
-            l = wxSetlocale(c, buf2);
-        }
-        if ( !l )
-        {
-            buf2 = buf + wxS(".utf8");
-            l = wxSetlocale(c, buf2);
-        }
-    }
-
-    // if we can't set UTF-8 locale, try non-UTF-8 one:
-    if ( !l )
-        l = wxSetlocale(c, lc);
-
-    return l;
-}
-#else
-#define wxSetlocaleTryUTF8(c, lc)  wxSetlocale(c, lc)
-#endif
-
-bool wxLocale::Init(int language, int flags)
-{
-#if WXWIN_COMPATIBILITY_2_8
-    wxASSERT_MSG( !(flags & wxLOCALE_CONV_ENCODING),
-                  wxS("wxLOCALE_CONV_ENCODING is no longer supported, add charset to your catalogs") );
-#endif
-
-    bool ret = true;
-
-    int lang = language;
-    if (lang == wxLANGUAGE_DEFAULT)
-    {
-        // auto detect the language
-        lang = GetSystemLanguage();
-    }
-
-    // We failed to detect system language, so we will use English:
-    if (lang == wxLANGUAGE_UNKNOWN)
-    {
-        return false;
-    }
-
-    const wxLanguageInfo *info = GetLanguageInfo(lang);
-
-    // Unknown language:
-    if (info == NULL)
-    {
-        wxLogError(wxS("Unknown language %i."), lang);
-        return false;
-    }
-
-    wxString name = info->Description;
-    wxString canonical = info->CanonicalName;
-    wxString locale;
-
-    // Set the locale:
-#if defined(__OS2__)
-    const char *retloc = wxSetlocale(LC_ALL , wxEmptyString);
-#elif defined(__UNIX__) && !defined(__WXMAC__)
-    if (language != wxLANGUAGE_DEFAULT)
-        locale = info->CanonicalName;
-
-    const char *retloc = wxSetlocaleTryUTF8(LC_ALL, locale);
-
-    const wxString langOnly = ExtractLang(locale);
-    if ( !retloc )
-    {
-        // Some C libraries don't like xx_YY form and require xx only
-        retloc = wxSetlocaleTryUTF8(LC_ALL, langOnly);
-    }
-
-#if wxUSE_FONTMAP
-    // some systems (e.g. FreeBSD and HP-UX) don't have xx_YY aliases but
-    // require the full xx_YY.encoding form, so try using UTF-8 because this is
-    // the only thing we can do generically
-    //
-    // TODO: add encodings applicable to each language to the lang DB and try
-    //       them all in turn here
-    if ( !retloc )
-    {
-        const wxChar **names =
-            wxFontMapperBase::GetAllEncodingNames(wxFONTENCODING_UTF8);
-        while ( *names )
-        {
-            retloc = wxSetlocale(LC_ALL, locale + wxS('.') + *names++);
-            if ( retloc )
-                break;
-        }
-    }
-#endif // wxUSE_FONTMAP
-
-    if ( !retloc )
-    {
-        // Some C libraries (namely glibc) still use old ISO 639,
-        // so will translate the abbrev for them
-        wxString localeAlt;
-        if ( langOnly == wxS("he") )
-            localeAlt = wxS("iw") + ExtractNotLang(locale);
-        else if ( langOnly == wxS("id") )
-            localeAlt = wxS("in") + ExtractNotLang(locale);
-        else if ( langOnly == wxS("yi") )
-            localeAlt = wxS("ji") + ExtractNotLang(locale);
-        else if ( langOnly == wxS("nb") )
-            localeAlt = wxS("no_NO");
-        else if ( langOnly == wxS("nn") )
-            localeAlt = wxS("no_NY");
-
-        if ( !localeAlt.empty() )
-        {
-            retloc = wxSetlocaleTryUTF8(LC_ALL, localeAlt);
-            if ( !retloc )
-                retloc = wxSetlocaleTryUTF8(LC_ALL, ExtractLang(localeAlt));
-        }
-    }
-
-    if ( !retloc )
-        ret = false;
-
-#ifdef __AIX__
-    // at least in AIX 5.2 libc is buggy and the string returned from
-    // setlocale(LC_ALL) can't be passed back to it because it returns 6
-    // strings (one for each locale category), i.e. for C locale we get back
-    // "C C C C C C"
-    //
-    // this contradicts IBM own docs but this is not of much help, so just work
-    // around it in the crudest possible manner
-    char* p = const_cast<char*>(wxStrchr(retloc, ' '));
-    if ( p )
-        *p = '\0';
-#endif // __AIX__
-
-#elif defined(__WIN32__)
-    const char *retloc = "C";
-    if ( language != wxLANGUAGE_DEFAULT )
-    {
-        if ( info->WinLang == 0 )
-        {
-            wxLogWarning(wxS("Locale '%s' not supported by OS."), name.c_str());
-            // retloc already set to "C"
-        }
-        else // language supported by Windows
-        {
-            // Windows CE doesn't have SetThreadLocale() and there doesn't seem
-            // to be any equivalent
-#ifndef __WXWINCE__
-            const wxUint32 lcid = info->GetLCID();
-
-            // change locale used by Windows functions
-            ::SetThreadLocale(lcid);
-#endif
-
-            // and also call setlocale() to change locale used by the CRT
-            locale = info->GetLocaleName();
-            if ( locale.empty() )
-            {
-                ret = false;
-            }
-            else // have a valid locale
-            {
-                retloc = wxSetlocale(LC_ALL, locale);
-            }
-        }
-    }
-    else // language == wxLANGUAGE_DEFAULT
-    {
-        retloc = wxSetlocale(LC_ALL, wxEmptyString);
-    }
-
-#if wxUSE_UNICODE && (defined(__VISUALC__) || defined(__MINGW32__))
-    // VC++ setlocale() (also used by Mingw) can't set locale to languages that
-    // can only be written using Unicode, therefore wxSetlocale() call fails
-    // for such languages but we don't want to report it as an error -- so that
-    // at least message catalogs can be used.
-    if ( !retloc )
-    {
-        if ( wxGetANSICodePageForLocale(LOCALE_USER_DEFAULT).empty() )
-        {
-            // we set the locale to a Unicode-only language, don't treat the
-            // inability of CRT to use it as an error
-            retloc = "C";
-        }
-    }
-#endif // CRT not handling Unicode-only languages
-
-    if ( !retloc )
-        ret = false;
-#elif defined(__WXMAC__)
-    if (lang == wxLANGUAGE_DEFAULT)
-        locale = wxEmptyString;
-    else
-        locale = info->CanonicalName;
-
-    const char *retloc = wxSetlocale(LC_ALL, locale);
-
-    if ( !retloc )
-    {
-        // Some C libraries don't like xx_YY form and require xx only
-        retloc = wxSetlocale(LC_ALL, ExtractLang(locale));
-    }
-#else
-    wxUnusedVar(flags);
-    return false;
-    #define WX_NO_LOCALE_SUPPORT
-#endif
-
-#ifndef WX_NO_LOCALE_SUPPORT
-    if ( !ret )
-    {
-        wxLogWarning(_("Cannot set locale to language \"%s\"."), name.c_str());
-
-        // continue nevertheless and try to load at least the translations for
-        // this language
-    }
-
-    if ( !DoInit(name, canonical, retloc) )
-    {
-        ret = false;
-    }
-
-    if (IsOk()) // setlocale() succeeded
-        m_language = lang;
-
-    // NB: don't use 'lang' here, 'language'
-    wxTranslations *t = wxTranslations::Get();
-    if ( t )
-    {
-        t->SetLanguage(static_cast<wxLanguage>(language));
-
-        if ( flags & wxLOCALE_LOAD_DEFAULT )
-            t->AddStdCatalog();
-    }
-
-    return ret;
-#endif // !WX_NO_LOCALE_SUPPORT
-}
-
-/*static*/ int wxLocale::GetSystemLanguage()
-{
-    CreateLanguagesDB();
-
-    // init i to avoid compiler warning
-    size_t i = 0,
-        count = ms_languagesDB->GetCount();
-
-#if defined(__UNIX__)
-    // first get the string identifying the language from the environment
-    wxString langFull;
-#ifdef __WXMAC__
-    wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());
-
-    // because the locale identifier (kCFLocaleIdentifier) is formatted a little bit differently, eg
-    // az_Cyrl_AZ@calendar=buddhist;currency=JPY we just recreate the base info as expected by wx here
-
-    wxCFStringRef str(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleLanguageCode)));
-    langFull = str.AsString()+"_";
-    str.reset(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleCountryCode)));
-    langFull += str.AsString();
-#else
-    if (!wxGetEnv(wxS("LC_ALL"), &langFull) &&
-        !wxGetEnv(wxS("LC_MESSAGES"), &langFull) &&
-        !wxGetEnv(wxS("LANG"), &langFull))
-    {
-        // no language specified, treat it as English
-        return wxLANGUAGE_ENGLISH_US;
-    }
-
-    if ( langFull == wxS("C") || langFull == wxS("POSIX") )
-    {
-        // default C locale is English too
-        return wxLANGUAGE_ENGLISH_US;
-    }
-#endif
-
-    // the language string has the following form
-    //
-    //      lang[_LANG][.encoding][@modifier]
-    //
-    // (see environ(5) in the Open Unix specification)
-    //
-    // where lang is the primary language, LANG is a sublang/territory,
-    // encoding is the charset to use and modifier "allows the user to select
-    // a specific instance of localization data within a single category"
-    //
-    // for example, the following strings are valid:
-    //      fr
-    //      fr_FR
-    //      de_DE.iso88591
-    //      de_DE@euro
-    //      de_DE.iso88591@euro
-
-    // for now we don't use the encoding, although we probably should (doing
-    // translations of the msg catalogs on the fly as required) (TODO)
-    //
-    // we need the modified for languages like Valencian: ca_ES@valencia
-    // though, remember it
-    wxString modifier;
-    size_t posModifier = langFull.find_first_of(wxS("@"));
-    if ( posModifier != wxString::npos )
-        modifier = langFull.Mid(posModifier);
-
-    size_t posEndLang = langFull.find_first_of(wxS("@."));
-    if ( posEndLang != wxString::npos )
-    {
-        langFull.Truncate(posEndLang);
-    }
-
-    // do we have just the language (or sublang too)?
-    const bool justLang = langFull.find('_') == wxString::npos;
-
-    // 0. Make sure the lang is according to latest ISO 639
-    //    (this is necessary because glibc uses iw and in instead
-    //    of he and id respectively).
-
-    // the language itself (second part is the dialect/sublang)
-    wxString langOrig = ExtractLang(langFull);
-
-    wxString lang;
-    if ( langOrig == wxS("iw"))
-        lang = wxS("he");
-    else if (langOrig == wxS("in"))
-        lang = wxS("id");
-    else if (langOrig == wxS("ji"))
-        lang = wxS("yi");
-    else if (langOrig == wxS("no_NO"))
-        lang = wxS("nb_NO");
-    else if (langOrig == wxS("no_NY"))
-        lang = wxS("nn_NO");
-    else if (langOrig == wxS("no"))
-        lang = wxS("nb_NO");
-    else
-        lang = langOrig;
-
-    // did we change it?
-    if ( lang != langOrig )
-    {
-        langFull = lang + ExtractNotLang(langFull);
-    }
-
-    // 1. Try to find the language either as is:
-    // a) With modifier if set
-    if ( !modifier.empty() )
-    {
-        wxString langFullWithModifier = langFull + modifier;
-        for ( i = 0; i < count; i++ )
-        {
-            if ( ms_languagesDB->Item(i).CanonicalName == langFullWithModifier )
-                break;
-        }
-    }
-
-    // b) Without modifier
-    if ( modifier.empty() || i == count )
-    {
-        for ( i = 0; i < count; i++ )
-        {
-            if ( ms_languagesDB->Item(i).CanonicalName == langFull )
-                break;
-        }
-    }
-
-    // 2. If langFull is of the form xx_YY, try to find xx:
-    if ( i == count && !justLang )
-    {
-        for ( i = 0; i < count; i++ )
-        {
-            if ( ms_languagesDB->Item(i).CanonicalName == lang )
-            {
-                break;
-            }
-        }
-    }
-
-    // 3. If langFull is of the form xx, try to find any xx_YY record:
-    if ( i == count && justLang )
-    {
-        for ( i = 0; i < count; i++ )
-        {
-            if ( ExtractLang(ms_languagesDB->Item(i).CanonicalName)
-                    == langFull )
-            {
-                break;
-            }
-        }
-    }
-
-
-    if ( i == count )
-    {
-        // In addition to the format above, we also can have full language
-        // names in LANG env var - for example, SuSE is known to use
-        // LANG="german" - so check for use of non-standard format and try to
-        // find the name in verbose description.
-        for ( i = 0; i < count; i++ )
-        {
-            if (ms_languagesDB->Item(i).Description.CmpNoCase(langFull) == 0)
-            {
-                break;
-            }
-        }
-    }
-#elif defined(__WIN32__)
-    LCID lcid = GetUserDefaultLCID();
-    if ( lcid != 0 )
-    {
-        wxUint32 lang = PRIMARYLANGID(LANGIDFROMLCID(lcid));
-        wxUint32 sublang = SUBLANGID(LANGIDFROMLCID(lcid));
-
-        for ( i = 0; i < count; i++ )
-        {
-            if (ms_languagesDB->Item(i).WinLang == lang &&
-                ms_languagesDB->Item(i).WinSublang == sublang)
-            {
-                break;
-            }
-        }
-    }
-    //else: leave wxlang == wxLANGUAGE_UNKNOWN
-#endif // Unix/Win32
-
-    if ( i < count )
-    {
-        // we did find a matching entry, use it
-        return ms_languagesDB->Item(i).Language;
-    }
-
-    // no info about this language in the database
-    return wxLANGUAGE_UNKNOWN;
-}
-
-// ----------------------------------------------------------------------------
-// encoding stuff
-// ----------------------------------------------------------------------------
-
-// this is a bit strange as under Windows we get the encoding name using its
-// numeric value and under Unix we do it the other way round, but this just
-// reflects the way different systems provide the encoding info
-
-/* static */
-wxString wxLocale::GetSystemEncodingName()
-{
-    wxString encname;
-
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    // FIXME: what is the error return value for GetACP()?
-    UINT codepage = ::GetACP();
-    encname.Printf(wxS("windows-%u"), codepage);
-#elif defined(__WXMAC__)
-    // default is just empty string, this resolves to the default system
-    // encoding later
-#elif defined(__UNIX_LIKE__)
-
-#if defined(HAVE_LANGINFO_H) && defined(CODESET)
-    // GNU libc provides current character set this way (this conforms
-    // to Unix98)
-    char *oldLocale = strdup(setlocale(LC_CTYPE, NULL));
-    setlocale(LC_CTYPE, "");
-    const char *alang = nl_langinfo(CODESET);
-    setlocale(LC_CTYPE, oldLocale);
-    free(oldLocale);
-
-    if ( alang )
-    {
-        encname = wxString::FromAscii( alang );
-    }
-    else // nl_langinfo() failed
-#endif // HAVE_LANGINFO_H
-    {
-        // if we can't get at the character set directly, try to see if it's in
-        // the environment variables (in most cases this won't work, but I was
-        // out of ideas)
-        char *lang = getenv( "LC_ALL");
-        char *dot = lang ? strchr(lang, '.') : NULL;
-        if (!dot)
-        {
-            lang = getenv( "LC_CTYPE" );
-            if ( lang )
-                dot = strchr(lang, '.' );
-        }
-        if (!dot)
-        {
-            lang = getenv( "LANG");
-            if ( lang )
-                dot = strchr(lang, '.');
-        }
-
-        if ( dot )
-        {
-            encname = wxString::FromAscii( dot+1 );
-        }
-    }
-#endif // Win32/Unix
-
-    return encname;
-}
-
-/* static */
-wxFontEncoding wxLocale::GetSystemEncoding()
-{
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    UINT codepage = ::GetACP();
-
-    // wxWidgets only knows about CP1250-1257, 874, 932, 936, 949, 950
-    if ( codepage >= 1250 && codepage <= 1257 )
-    {
-        return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
-    }
-
-    if ( codepage == 874 )
-    {
-        return wxFONTENCODING_CP874;
-    }
-
-    if ( codepage == 932 )
-    {
-        return wxFONTENCODING_CP932;
-    }
-
-    if ( codepage == 936 )
-    {
-        return wxFONTENCODING_CP936;
-    }
-
-    if ( codepage == 949 )
-    {
-        return wxFONTENCODING_CP949;
-    }
-
-    if ( codepage == 950 )
-    {
-        return wxFONTENCODING_CP950;
-    }
-#elif defined(__WXMAC__)
-    CFStringEncoding encoding = 0 ;
-    encoding = CFStringGetSystemEncoding() ;
-    return wxMacGetFontEncFromSystemEnc( encoding ) ;
-#elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
-    const wxString encname = GetSystemEncodingName();
-    if ( !encname.empty() )
-    {
-        wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encname);
-
-        // on some modern Linux systems (RedHat 8) the default system locale
-        // is UTF8 -- but it isn't supported by wxGTK1 in ANSI build at all so
-        // don't even try to use it in this case
-#if !wxUSE_UNICODE && \
-        ((defined(__WXGTK__) && !defined(__WXGTK20__)) || defined(__WXMOTIF__))
-        if ( enc == wxFONTENCODING_UTF8 )
-        {
-            // the most similar supported encoding...
-            enc = wxFONTENCODING_ISO8859_1;
-        }
-#endif // !wxUSE_UNICODE
-
-        // GetEncodingFromName() returns wxFONTENCODING_DEFAULT for C locale
-        // (a.k.a. US-ASCII) which is arguably a bug but keep it like this for
-        // backwards compatibility and just take care to not return
-        // wxFONTENCODING_DEFAULT from here as this surely doesn't make sense
-        if ( enc == wxFONTENCODING_DEFAULT )
-        {
-            // we don't have wxFONTENCODING_ASCII, so use the closest one
-            return wxFONTENCODING_ISO8859_1;
-        }
-
-        if ( enc != wxFONTENCODING_MAX )
-        {
-            return enc;
-        }
-        //else: return wxFONTENCODING_SYSTEM below
-    }
-#endif // Win32/Unix
-
-    return wxFONTENCODING_SYSTEM;
-}
-
-/* static */
-void wxLocale::AddLanguage(const wxLanguageInfo& info)
-{
-    CreateLanguagesDB();
-    ms_languagesDB->Add(info);
-}
-
-/* static */
-const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang)
-{
-    CreateLanguagesDB();
-
-    // calling GetLanguageInfo(wxLANGUAGE_DEFAULT) is a natural thing to do, so
-    // make it work
-    if ( lang == wxLANGUAGE_DEFAULT )
-        lang = GetSystemLanguage();
-
-    const size_t count = ms_languagesDB->GetCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        if ( ms_languagesDB->Item(i).Language == lang )
-        {
-            // We need to create a temporary here in order to make this work with BCC in final build mode
-            wxLanguageInfo *ptr = &ms_languagesDB->Item(i);
-            return ptr;
-        }
-    }
-
-    return NULL;
-}
-
-/* static */
-wxString wxLocale::GetLanguageName(int lang)
-{
-    if ( lang == wxLANGUAGE_DEFAULT || lang == wxLANGUAGE_UNKNOWN )
-        return wxEmptyString;
-
-    const wxLanguageInfo *info = GetLanguageInfo(lang);
-    if ( !info )
-        return wxEmptyString;
-    else
-        return info->Description;
-}
-
-/* static */
-wxString wxLocale::GetLanguageCanonicalName(int lang)
-{
-    if ( lang == wxLANGUAGE_DEFAULT || lang == wxLANGUAGE_UNKNOWN )
-        return wxEmptyString;
-
-    const wxLanguageInfo *info = GetLanguageInfo(lang);
-    if ( !info )
-        return wxEmptyString;
-    else
-        return info->CanonicalName;
-}
-
-/* static */
-const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale)
-{
-    CreateLanguagesDB();
-
-    const wxLanguageInfo *infoRet = NULL;
-
-    const size_t count = ms_languagesDB->GetCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        const wxLanguageInfo *info = &ms_languagesDB->Item(i);
-
-        if ( wxStricmp(locale, info->CanonicalName) == 0 ||
-                wxStricmp(locale, info->Description) == 0 )
-        {
-            // exact match, stop searching
-            infoRet = info;
-            break;
-        }
-
-        if ( wxStricmp(locale, info->CanonicalName.BeforeFirst(wxS('_'))) == 0 )
-        {
-            // a match -- but maybe we'll find an exact one later, so continue
-            // looking
-            //
-            // OTOH, maybe we had already found a language match and in this
-            // case don't overwrite it because the entry for the default
-            // country always appears first in ms_languagesDB
-            if ( !infoRet )
-                infoRet = info;
-        }
-    }
-
-    return infoRet;
-}
-
-wxString wxLocale::GetSysName() const
-{
-    return wxSetlocale(LC_ALL, NULL);
-}
-
-// clean up
-wxLocale::~wxLocale()
-{
-    // Restore old translations object.
-    // See DoCommonInit() for explanation of why this is needed for backward
-    // compatibility.
-    if ( wxTranslations::Get() == &m_translations )
-    {
-        if ( m_pOldLocale )
-            wxTranslations::SetNonOwned(&m_pOldLocale->m_translations);
-        else
-            wxTranslations::Set(NULL);
-    }
-
-    // restore old locale pointer
-    wxSetLocale(m_pOldLocale);
-
-    wxSetlocale(LC_ALL, m_pszOldLocale);
-    free(const_cast<char *>(m_pszOldLocale));
-}
-
-
-// check if the given locale is provided by OS and C run time
-/* static */
-bool wxLocale::IsAvailable(int lang)
-{
-    const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
-    if ( !info )
-    {
-        // The language is unknown (this normally only happens when we're
-        // passed wxLANGUAGE_DEFAULT), so we can't support it.
-        wxASSERT_MSG( lang == wxLANGUAGE_DEFAULT,
-                      wxS("No info for a valid language?") );
-        return false;
-    }
-
-#if defined(__WIN32__)
-    if ( !info->WinLang )
-        return false;
-
-    if ( !::IsValidLocale(info->GetLCID(), LCID_INSTALLED) )
-        return false;
-
-#elif defined(__UNIX__)
-
-    // Test if setting the locale works, then set it back.
-    char * const oldLocale = wxStrdupA(setlocale(LC_ALL, NULL));
-
-    // Some platforms don't like xx_YY form and require xx only so test for
-    // it too.
-    const bool
-        available = wxSetlocaleTryUTF8(LC_ALL, info->CanonicalName) ||
-                    wxSetlocaleTryUTF8(LC_ALL, ExtractLang(info->CanonicalName));
-
-    // restore the original locale
-    wxSetlocale(LC_ALL, oldLocale);
-
-    free(oldLocale);
-
-    if ( !available )
-        return false;
-#endif
-
-    return true;
-}
-
-
-bool wxLocale::AddCatalog(const wxString& domain)
-{
-    wxTranslations *t = wxTranslations::Get();
-    if ( !t )
-        return false;
-    return t->AddCatalog(domain);
-}
-
-bool wxLocale::AddCatalog(const wxString& domain, wxLanguage msgIdLanguage)
-{
-    wxTranslations *t = wxTranslations::Get();
-    if ( !t )
-        return false;
-    return t->AddCatalog(domain, msgIdLanguage);
-}
-
-// add a catalog to our linked list
-bool wxLocale::AddCatalog(const wxString& szDomain,
-                        wxLanguage      msgIdLanguage,
-                        const wxString& msgIdCharset)
-{
-    wxTranslations *t = wxTranslations::Get();
-    if ( !t )
-        return false;
-#if wxUSE_UNICODE
-    wxUnusedVar(msgIdCharset);
-    return t->AddCatalog(szDomain, msgIdLanguage);
-#else
-    return t->AddCatalog(szDomain, msgIdLanguage, msgIdCharset);
-#endif
-}
-
-bool wxLocale::IsLoaded(const wxString& domain) const
-{
-    wxTranslations *t = wxTranslations::Get();
-    if ( !t )
-        return false;
-    return t->IsLoaded(domain);
-}
-
-wxString wxLocale::GetHeaderValue(const wxString& header,
-                                  const wxString& domain) const
-{
-    wxTranslations *t = wxTranslations::Get();
-    if ( !t )
-        return wxEmptyString;
-    return t->GetHeaderValue(header, domain);
-}
-
-// ----------------------------------------------------------------------------
-// accessors for locale-dependent data
-// ----------------------------------------------------------------------------
-
-#if defined(__WINDOWS__) || defined(__WXOSX__)
-
-namespace
-{
-
-// This function translates from Unicode date formats described at
-//
-//      http://unicode.org/reports/tr35/tr35-6.html#Date_Format_Patterns
-//
-// to strftime()-like syntax. This translation is not lossless but we try to do
-// our best.
-
-static wxString TranslateFromUnicodeFormat(const wxString& fmt)
-{
-    wxString fmtWX;
-    fmtWX.reserve(fmt.length());
-
-    char chLast = '\0';
-    size_t lastCount = 0;
-
-    const char* formatchars =
-        "dghHmMsSy"
-#ifdef __WINDOWS__
-        "t"
-#else
-        "EawD"
-#endif
-        ;
-    for ( wxString::const_iterator p = fmt.begin(); /* end handled inside */; ++p )
-    {
-        if ( p != fmt.end() )
-        {
-            if ( *p == chLast )
-            {
-                lastCount++;
-                continue;
-            }
-
-            const wxUniChar ch = (*p).GetValue();
-            if ( ch.IsAscii() && strchr(formatchars, ch) )
-            {
-                // these characters come in groups, start counting them
-                chLast = ch;
-                lastCount = 1;
-                continue;
-            }
-        }
-
-        // interpret any special characters we collected so far
-        if ( lastCount )
-        {
-            switch ( chLast )
-            {
-                case 'd':
-                    switch ( lastCount )
-                    {
-                        case 1: // d
-                        case 2: // dd
-                            // these two are the same as we don't distinguish
-                            // between 1 and 2 digits for days
-                            fmtWX += "%d";
-                            break;
-#ifdef __WINDOWS__
-                        case 3: // ddd
-                            fmtWX += "%a";
-                            break;
-
-                        case 4: // dddd
-                            fmtWX += "%A";
-                            break;
-#endif
-                        default:
-                            wxFAIL_MSG( "too many 'd's" );
-                    }
-                    break;
-#ifndef __WINDOWS__
-                case 'D':
-                    switch ( lastCount )
-                    {
-                        case 1: // D
-                        case 2: // DD
-                        case 3: // DDD
-                            fmtWX += "%j";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "wrong number of 'D's" );
-                    }
-                    break;
-               case 'w':
-                    switch ( lastCount )
-                    {
-                        case 1: // w
-                        case 2: // ww
-                            fmtWX += "%W";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "wrong number of 'w's" );
-                    }
-                    break;
-                case 'E':
-                   switch ( lastCount )
-                    {
-                        case 1: // E
-                        case 2: // EE
-                        case 3: // EEE
-                            fmtWX += "%a";
-                            break;
-                        case 4: // EEEE
-                            fmtWX += "%A";
-                            break;
-                        case 5: // EEEEE
-                            fmtWX += "%a";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "wrong number of 'E's" );
-                    }
-                    break;
-#endif
-                case 'M':
-                    switch ( lastCount )
-                    {
-                        case 1: // M
-                        case 2: // MM
-                            // as for 'd' and 'dd' above
-                            fmtWX += "%m";
-                            break;
-
-                        case 3:
-                            fmtWX += "%b";
-                            break;
-
-                        case 4:
-                            fmtWX += "%B";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "too many 'M's" );
-                    }
-                    break;
-
-                case 'y':
-                    switch ( lastCount )
-                    {
-                        case 1: // y
-                        case 2: // yy
-                            fmtWX += "%y";
-                            break;
-
-                        case 4: // yyyy
-                            fmtWX += "%Y";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "wrong number of 'y's" );
-                    }
-                    break;
-
-                case 'H':
-                    switch ( lastCount )
-                    {
-                        case 1: // H
-                        case 2: // HH
-                            fmtWX += "%H";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "wrong number of 'H's" );
-                    }
-                    break;
-
-               case 'h':
-                    switch ( lastCount )
-                    {
-                        case 1: // h
-                        case 2: // hh
-                            fmtWX += "%I";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "wrong number of 'h's" );
-                    }
-                    break;
-
-               case 'm':
-                    switch ( lastCount )
-                    {
-                        case 1: // m
-                        case 2: // mm
-                            fmtWX += "%M";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "wrong number of 'm's" );
-                    }
-                    break;
-
-               case 's':
-                    switch ( lastCount )
-                    {
-                        case 1: // s
-                        case 2: // ss
-                            fmtWX += "%S";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "wrong number of 's's" );
-                    }
-                    break;
-
-                case 'g':
-                    // strftime() doesn't have era string,
-                    // ignore this format
-                    wxASSERT_MSG( lastCount <= 2, "too many 'g's" );
-
-                    break;
-#ifndef __WINDOWS__
-                case 'a':
-                    fmtWX += "%p";
-                    break;
-#endif
-#ifdef __WINDOWS__
-                case 't':
-                    switch ( lastCount )
-                    {
-                        case 1: // t
-                        case 2: // tt
-                            fmtWX += "%p";
-                            break;
-
-                        default:
-                            wxFAIL_MSG( "too many 't's" );
-                    }
-                    break;
-#endif
-                default:
-                    wxFAIL_MSG( "unreachable" );
-            }
-
-            chLast = '\0';
-            lastCount = 0;
-        }
-
-        if ( p == fmt.end() )
-            break;
-
-        // not a special character so must be just a separator, treat as is
-        if ( *p == wxT('%') )
-        {
-            // this one needs to be escaped
-            fmtWX += wxT('%');
-        }
-
-        fmtWX += *p;
-    }
-
-    return fmtWX;
-}
-
-} // anonymous namespace
-
-#endif // __WINDOWS__ || __WXOSX__
-
-#if defined(__WINDOWS__)
-
-namespace
-{
-
-LCTYPE GetLCTYPEFormatFromLocalInfo(wxLocaleInfo index)
-{
-    switch ( index )
-    {
-        case wxLOCALE_SHORT_DATE_FMT:
-            return LOCALE_SSHORTDATE;
-
-        case wxLOCALE_LONG_DATE_FMT:
-            return LOCALE_SLONGDATE;
-
-        case wxLOCALE_TIME_FMT:
-            return LOCALE_STIMEFORMAT;
-
-        default:
-            wxFAIL_MSG( "no matching LCTYPE" );
-    }
-
-    return 0;
-}
-
-} // anonymous namespace
-
-/* static */
-wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
-{
-    wxUint32 lcid = LOCALE_USER_DEFAULT;
-    if ( wxGetLocale() )
-    {
-        const wxLanguageInfo * const
-            info = GetLanguageInfo(wxGetLocale()->GetLanguage());
-        if ( info )
-            lcid = info->GetLCID();
-    }
-
-    wxString str;
-
-    wxChar buf[256];
-    buf[0] = wxT('\0');
-
-    switch ( index )
-    {
-        case wxLOCALE_THOUSANDS_SEP:
-            if ( ::GetLocaleInfo(lcid, LOCALE_STHOUSAND, buf, WXSIZEOF(buf)) )
-                str = buf;
-            break;
-
-        case wxLOCALE_DECIMAL_POINT:
-            if ( ::GetLocaleInfo(lcid,
-                                 cat == wxLOCALE_CAT_MONEY
-                                     ? LOCALE_SMONDECIMALSEP
-                                     : LOCALE_SDECIMAL,
-                                 buf,
-                                 WXSIZEOF(buf)) )
-            {
-                str = buf;
-
-                // As we get our decimal point separator from Win32 and not the
-                // CRT there is a possibility of mismatch between them and this
-                // can easily happen if the user code called setlocale()
-                // instead of using wxLocale to change the locale. And this can
-                // result in very strange bugs elsewhere in the code as the
-                // assumptions that formatted strings do use the decimal
-                // separator actually fail, so check for it here.
-                wxASSERT_MSG
-                (
-                    wxString::Format("%.3f", 1.23).find(str) != wxString::npos,
-                    "Decimal separator mismatch -- did you use setlocale()?"
-                    "If so, use wxLocale to change the locale instead."
-                );
-            }
-            break;
-
-        case wxLOCALE_SHORT_DATE_FMT:
-        case wxLOCALE_LONG_DATE_FMT:
-        case wxLOCALE_TIME_FMT:
-            if ( ::GetLocaleInfo(lcid, GetLCTYPEFormatFromLocalInfo(index),
-                                 buf, WXSIZEOF(buf)) )
-            {
-                return TranslateFromUnicodeFormat(buf);
-            }
-            break;
-
-        case wxLOCALE_DATE_TIME_FMT:
-            // there doesn't seem to be any specific setting for this, so just
-            // combine date and time ones
-            //
-            // we use the short date because this is what "%c" uses by default
-            // ("%#c" uses long date but we have no way to specify the
-            // alternate representation here)
-            {
-                const wxString datefmt = GetInfo(wxLOCALE_SHORT_DATE_FMT);
-                if ( datefmt.empty() )
-                    break;
-
-                const wxString timefmt = GetInfo(wxLOCALE_TIME_FMT);
-                if ( timefmt.empty() )
-                    break;
-
-                str << datefmt << ' ' << timefmt;
-            }
-            break;
-
-        default:
-            wxFAIL_MSG( "unknown wxLocaleInfo" );
-    }
-
-    return str;
-}
-
-#elif defined(__WXOSX__)
-
-/* static */
-wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
-{
-    CFLocaleRef userLocaleRefRaw;
-    if ( wxGetLocale() )
-    {
-        userLocaleRefRaw = CFLocaleCreate
-                        (
-                                kCFAllocatorDefault,
-                                wxCFStringRef(wxGetLocale()->GetCanonicalName())
-                        );
-    }
-    else // no current locale, use the default one
-    {
-        userLocaleRefRaw = CFLocaleCopyCurrent();
-    }
-
-    wxCFRef<CFLocaleRef> userLocaleRef(userLocaleRefRaw);
-
-    CFStringRef cfstr = 0;
-    switch ( index )
-    {
-        case wxLOCALE_THOUSANDS_SEP:
-            cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);
-            break;
-
-        case wxLOCALE_DECIMAL_POINT:
-            cfstr = (CFStringRef) CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);
-            break;
-
-        case wxLOCALE_SHORT_DATE_FMT:
-        case wxLOCALE_LONG_DATE_FMT:
-        case wxLOCALE_DATE_TIME_FMT:
-        case wxLOCALE_TIME_FMT:
-            {
-                CFDateFormatterStyle dateStyle = kCFDateFormatterNoStyle;
-                CFDateFormatterStyle timeStyle = kCFDateFormatterNoStyle;
-                switch (index )
-                {
-                    case wxLOCALE_SHORT_DATE_FMT:
-                        dateStyle = kCFDateFormatterShortStyle;
-                        break;
-                    case wxLOCALE_LONG_DATE_FMT:
-                        dateStyle = kCFDateFormatterFullStyle;
-                        break;
-                    case wxLOCALE_DATE_TIME_FMT:
-                        dateStyle = kCFDateFormatterFullStyle;
-                        timeStyle = kCFDateFormatterMediumStyle;
-                        break;
-                    case wxLOCALE_TIME_FMT:
-                        timeStyle = kCFDateFormatterMediumStyle;
-                        break;
-                    default:
-                        wxFAIL_MSG( "unexpected time locale" );
-                        return wxString();
-                }
-                wxCFRef<CFDateFormatterRef> dateFormatter( CFDateFormatterCreate
-                    (NULL, userLocaleRef, dateStyle, timeStyle));
-                wxCFStringRef cfs = wxCFRetain( CFDateFormatterGetFormat(dateFormatter ));
-                wxString format = TranslateFromUnicodeFormat(cfs.AsString());
-                // we always want full years
-                format.Replace("%y","%Y");
-                return format;
-            }
-            break;
-
-        default:
-            wxFAIL_MSG( "Unknown locale info" );
-            return wxString();
-    }
-
-    wxCFStringRef str(wxCFRetain(cfstr));
-    return str.AsString();
-}
-
-#else // !__WINDOWS__ && !__WXOSX__, assume generic POSIX
-
-namespace
-{
-
-wxString GetDateFormatFromLangInfo(wxLocaleInfo index)
-{
-#ifdef HAVE_LANGINFO_H
-    // array containing parameters for nl_langinfo() indexes by offset of index
-    // from wxLOCALE_SHORT_DATE_FMT
-    static const nl_item items[] =
-    {
-        D_FMT, D_T_FMT, D_T_FMT, T_FMT,
-    };
-
-    const int nlidx = index - wxLOCALE_SHORT_DATE_FMT;
-    if ( nlidx < 0 || nlidx >= (int)WXSIZEOF(items) )
-    {
-        wxFAIL_MSG( "logic error in GetInfo() code" );
-        return wxString();
-    }
-
-    const wxString fmt(nl_langinfo(items[nlidx]));
-
-    // just return the format returned by nl_langinfo() except for long date
-    // format which we need to recover from date/time format ourselves (but not
-    // if we failed completely)
-    if ( fmt.empty() || index != wxLOCALE_LONG_DATE_FMT )
-        return fmt;
-
-    // this is not 100% precise but the idea is that a typical date/time format
-    // under POSIX systems is a combination of a long date format with time one
-    // so we should be able to get just the long date format by removing all
-    // time-specific format specifiers
-    static const char *timeFmtSpecs = "HIklMpPrRsSTXzZ";
-    static const char *timeSep = " :./-";
-
-    wxString fmtDateOnly;
-    const wxString::const_iterator end = fmt.end();
-    wxString::const_iterator lastSep = end;
-    for ( wxString::const_iterator p = fmt.begin(); p != end; ++p )
-    {
-        if ( strchr(timeSep, *p) )
-        {
-            if ( lastSep == end )
-                lastSep = p;
-
-            // skip it for now, we'll discard it if it's followed by a time
-            // specifier later or add it to fmtDateOnly if it is not
-            continue;
-        }
-
-        if ( *p == '%' &&
-                (p + 1 != end) && strchr(timeFmtSpecs, p[1]) )
-        {
-            // time specified found: skip it and any preceding separators
-            ++p;
-            lastSep = end;
-            continue;
-        }
-
-        if ( lastSep != end )
-        {
-            fmtDateOnly += wxString(lastSep, p);
-            lastSep = end;
-        }
-
-        fmtDateOnly += *p;
-    }
-
-    return fmtDateOnly;
-#else // !HAVE_LANGINFO_H
-    wxUnusedVar(index);
-
-    // no fallback, let the application deal with unavailability of
-    // nl_langinfo() itself as there is no good way for us to do it (well, we
-    // could try to reverse engineer the format from strftime() output but this
-    // looks like too much trouble considering the relatively small number of
-    // systems without nl_langinfo() still in use)
-    return wxString();
-#endif // HAVE_LANGINFO_H/!HAVE_LANGINFO_H
-}
-
-} // anonymous namespace
-
-/* static */
-wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
-{
-    lconv * const lc = localeconv();
-    if ( !lc )
-        return wxString();
-
-    switch ( index )
-    {
-        case wxLOCALE_THOUSANDS_SEP:
-            if ( cat == wxLOCALE_CAT_NUMBER )
-                return lc->thousands_sep;
-            else if ( cat == wxLOCALE_CAT_MONEY )
-                return lc->mon_thousands_sep;
-
-            wxFAIL_MSG( "invalid wxLocaleCategory" );
-            break;
-
-
-        case wxLOCALE_DECIMAL_POINT:
-            if ( cat == wxLOCALE_CAT_NUMBER )
-                return lc->decimal_point;
-            else if ( cat == wxLOCALE_CAT_MONEY )
-                return lc->mon_decimal_point;
-
-            wxFAIL_MSG( "invalid wxLocaleCategory" );
-            break;
-
-        case wxLOCALE_SHORT_DATE_FMT:
-        case wxLOCALE_LONG_DATE_FMT:
-        case wxLOCALE_DATE_TIME_FMT:
-        case wxLOCALE_TIME_FMT:
-            if ( cat != wxLOCALE_CAT_DATE && cat != wxLOCALE_CAT_DEFAULT )
-            {
-                wxFAIL_MSG( "invalid wxLocaleCategory" );
-                break;
-            }
-
-            return GetDateFormatFromLangInfo(index);
-
-
-        default:
-            wxFAIL_MSG( "unknown wxLocaleInfo value" );
-    }
-
-    return wxString();
-}
-
-#endif // platform
-
-// ----------------------------------------------------------------------------
-// global functions and variables
-// ----------------------------------------------------------------------------
-
-// retrieve/change current locale
-// ------------------------------
-
-// the current locale object
-static wxLocale *g_pLocale = NULL;
-
-wxLocale *wxGetLocale()
-{
-    return g_pLocale;
-}
-
-wxLocale *wxSetLocale(wxLocale *pLocale)
-{
-    wxLocale *pOld = g_pLocale;
-    g_pLocale = pLocale;
-    return pOld;
-}
-
-
-
-// ----------------------------------------------------------------------------
-// wxLocale module (for lazy destruction of languagesDB)
-// ----------------------------------------------------------------------------
-
-class wxLocaleModule: public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxLocaleModule)
-    public:
-        wxLocaleModule() {}
-
-        bool OnInit()
-        {
-            return true;
-        }
-
-        void OnExit()
-        {
-            wxLocale::DestroyLanguagesDB();
-        }
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
-
-#endif // wxUSE_INTL
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/intl.cpp
+// Purpose:     Internationalization and localisation for wxWidgets
+// Author:      Vadim Zeitlin
+// Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
+//              (2003/09/30 - PluralForms support)
+// Created:     29/01/98
+// RCS-ID:      $Id: intl.cpp 61340 2009-07-06 21:19:58Z VZ $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declaration
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifdef __EMX__
+// The following define is needed by Innotek's libc to
+// make the definition of struct localeconv available.
+#define __INTERNAL_DEFS
+#endif
+
+#if wxUSE_INTL
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/hashmap.h"
+    #include "wx/module.h"
+#endif // WX_PRECOMP
+
+#ifndef __WXWINCE__
+    #include <locale.h>
+#endif
+
+// standard headers
+#include <ctype.h>
+#include <stdlib.h>
+#ifdef HAVE_LANGINFO_H
+    #include <langinfo.h>
+#endif
+
+#ifdef __WIN32__
+    #include "wx/msw/private.h"
+#elif defined(__UNIX_LIKE__)
+    #include "wx/fontmap.h"         // for CharsetToEncoding()
+#endif
+
+#include "wx/file.h"
+#include "wx/filename.h"
+#include "wx/tokenzr.h"
+#include "wx/fontmap.h"
+#include "wx/encconv.h"
+#include "wx/ptr_scpd.h"
+#include "wx/apptrait.h"
+#include "wx/stdpaths.h"
+
+#if defined(__WXMAC__)
+    #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
+#if defined(__DARWIN__)
+    #include "wx/mac/corefoundation/cfref.h"
+    #include <CoreFoundation/CFLocale.h>
+    #include "wx/mac/corefoundation/cfstring.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// simple types
+// ----------------------------------------------------------------------------
+
+// this should *not* be wxChar, this type must have exactly 8 bits!
+typedef wxUint8 size_t8;
+typedef wxUint32 size_t32;
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// magic number identifying the .mo format file
+const size_t32 MSGCATALOG_MAGIC    = 0x950412de;
+const size_t32 MSGCATALOG_MAGIC_SW = 0xde120495;
+
+// the constants describing the format of lang_LANG locale string
+static const size_t LEN_LANG = 2;
+static const size_t LEN_SUBLANG = 2;
+static const size_t LEN_FULL = LEN_LANG + 1 + LEN_SUBLANG; // 1 for '_'
+
+#define TRACE_I18N _T("i18n")
+
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+
+// small class to suppress the translation erros until exit from current scope
+class NoTransErr
+{
+public:
+    NoTransErr() { ms_suppressCount++; }
+   ~NoTransErr() { ms_suppressCount--;  }
+
+   static bool Suppress() { return ms_suppressCount > 0; }
+
+private:
+   static size_t ms_suppressCount;
+};
+
+size_t NoTransErr::ms_suppressCount = 0;
+
+#else // !Debug
+
+class NoTransErr
+{
+public:
+    NoTransErr() { }
+   ~NoTransErr() { }
+};
+
+#endif // Debug/!Debug
+
+static wxLocale *wxSetLocale(wxLocale *pLocale);
+
+// helper functions of GetSystemLanguage()
+#ifdef __UNIX__
+
+// get just the language part
+static inline wxString ExtractLang(const wxString& langFull)
+{
+    return langFull.Left(LEN_LANG);
+}
+
+// get everything else (including the leading '_')
+static inline wxString ExtractNotLang(const wxString& langFull)
+{
+    return langFull.Mid(LEN_LANG);
+}
+
+#endif // __UNIX__
+
+
+// ----------------------------------------------------------------------------
+// Plural forms parser
+// ----------------------------------------------------------------------------
+
+/*
+                                Simplified Grammar
+
+Expression:
+    LogicalOrExpression '?' Expression ':' Expression
+    LogicalOrExpression
+
+LogicalOrExpression:
+    LogicalAndExpression "||" LogicalOrExpression   // to (a || b) || c
+    LogicalAndExpression
+
+LogicalAndExpression:
+    EqualityExpression "&&" LogicalAndExpression    // to (a && b) && c
+    EqualityExpression
+
+EqualityExpression:
+    RelationalExpression "==" RelationalExperession
+    RelationalExpression "!=" RelationalExperession
+    RelationalExpression
+
+RelationalExpression:
+    MultiplicativeExpression '>' MultiplicativeExpression
+    MultiplicativeExpression '<' MultiplicativeExpression
+    MultiplicativeExpression ">=" MultiplicativeExpression
+    MultiplicativeExpression "<=" MultiplicativeExpression
+    MultiplicativeExpression
+
+MultiplicativeExpression:
+    PmExpression '%' PmExpression
+    PmExpression
+
+PmExpression:
+    N
+    Number
+    '(' Expression ')'
+*/
+
+class wxPluralFormsToken
+{
+public:
+    enum Type
+    {
+        T_ERROR, T_EOF, T_NUMBER, T_N, T_PLURAL, T_NPLURALS, T_EQUAL, T_ASSIGN,
+        T_GREATER, T_GREATER_OR_EQUAL, T_LESS, T_LESS_OR_EQUAL,
+        T_REMINDER, T_NOT_EQUAL,
+        T_LOGICAL_AND, T_LOGICAL_OR, T_QUESTION, T_COLON, T_SEMICOLON,
+        T_LEFT_BRACKET, T_RIGHT_BRACKET
+    };
+    Type type() const { return m_type; }
+    void setType(Type type) { m_type = type; }
+    // for T_NUMBER only
+    typedef int Number;
+    Number number() const { return m_number; }
+    void setNumber(Number num) { m_number = num; }
+private:
+    Type m_type;
+    Number m_number;
+};
+
+
+class wxPluralFormsScanner
+{
+public:
+    wxPluralFormsScanner(const char* s);
+    const wxPluralFormsToken& token() const { return m_token; }
+    bool nextToken();  // returns false if error
+private:
+    const char* m_s;
+    wxPluralFormsToken m_token;
+};
+
+wxPluralFormsScanner::wxPluralFormsScanner(const char* s) : m_s(s)
+{
+    nextToken();
+}
+
+bool wxPluralFormsScanner::nextToken()
+{
+    wxPluralFormsToken::Type type = wxPluralFormsToken::T_ERROR;
+    while (isspace((unsigned char) *m_s))
+    {
+        ++m_s;
+    }
+    if (*m_s == 0)
+    {
+        type = wxPluralFormsToken::T_EOF;
+    }
+    else if (isdigit((unsigned char) *m_s))
+    {
+        wxPluralFormsToken::Number number = *m_s++ - '0';
+        while (isdigit((unsigned char) *m_s))
+        {
+            number = number * 10 + (*m_s++ - '0');
+        }
+        m_token.setNumber(number);
+        type = wxPluralFormsToken::T_NUMBER;
+    }
+    else if (isalpha((unsigned char) *m_s))
+    {
+        const char* begin = m_s++;
+        while (isalnum((unsigned char) *m_s))
+        {
+            ++m_s;
+        }
+        size_t size = m_s - begin;
+        if (size == 1 && memcmp(begin, "n", size) == 0)
+        {
+            type = wxPluralFormsToken::T_N;
+        }
+        else if (size == 6 && memcmp(begin, "plural", size) == 0)
+        {
+            type = wxPluralFormsToken::T_PLURAL;
+        }
+        else if (size == 8 && memcmp(begin, "nplurals", size) == 0)
+        {
+            type = wxPluralFormsToken::T_NPLURALS;
+        }
+    }
+    else if (*m_s == '=')
+    {
+        ++m_s;
+        if (*m_s == '=')
+        {
+            ++m_s;
+            type = wxPluralFormsToken::T_EQUAL;
+        }
+        else
+        {
+            type = wxPluralFormsToken::T_ASSIGN;
+        }
+    }
+    else if (*m_s == '>')
+    {
+        ++m_s;
+        if (*m_s == '=')
+        {
+            ++m_s;
+            type = wxPluralFormsToken::T_GREATER_OR_EQUAL;
+        }
+        else
+        {
+            type = wxPluralFormsToken::T_GREATER;
+        }
+    }
+    else if (*m_s == '<')
+    {
+        ++m_s;
+        if (*m_s == '=')
+        {
+            ++m_s;
+            type = wxPluralFormsToken::T_LESS_OR_EQUAL;
+        }
+        else
+        {
+            type = wxPluralFormsToken::T_LESS;
+        }
+    }
+    else if (*m_s == '%')
+    {
+        ++m_s;
+        type = wxPluralFormsToken::T_REMINDER;
+    }
+    else if (*m_s == '!' && m_s[1] == '=')
+    {
+        m_s += 2;
+        type = wxPluralFormsToken::T_NOT_EQUAL;
+    }
+    else if (*m_s == '&' && m_s[1] == '&')
+    {
+        m_s += 2;
+        type = wxPluralFormsToken::T_LOGICAL_AND;
+    }
+    else if (*m_s == '|' && m_s[1] == '|')
+    {
+        m_s += 2;
+        type = wxPluralFormsToken::T_LOGICAL_OR;
+    }
+    else if (*m_s == '?')
+    {
+        ++m_s;
+        type = wxPluralFormsToken::T_QUESTION;
+    }
+    else if (*m_s == ':')
+    {
+        ++m_s;
+        type = wxPluralFormsToken::T_COLON;
+    } else if (*m_s == ';') {
+        ++m_s;
+        type = wxPluralFormsToken::T_SEMICOLON;
+    }
+    else if (*m_s == '(')
+    {
+        ++m_s;
+        type = wxPluralFormsToken::T_LEFT_BRACKET;
+    }
+    else if (*m_s == ')')
+    {
+        ++m_s;
+        type = wxPluralFormsToken::T_RIGHT_BRACKET;
+    }
+    m_token.setType(type);
+    return type != wxPluralFormsToken::T_ERROR;
+}
+
+class wxPluralFormsNode;
+
+// NB: Can't use wxDEFINE_SCOPED_PTR_TYPE because wxPluralFormsNode is not
+//     fully defined yet:
+class wxPluralFormsNodePtr
+{
+public:
+    wxPluralFormsNodePtr(wxPluralFormsNode *p = NULL) : m_p(p) {}
+    ~wxPluralFormsNodePtr();
+    wxPluralFormsNode& operator*() const { return *m_p; }
+    wxPluralFormsNode* operator->() const { return m_p; }
+    wxPluralFormsNode* get() const { return m_p; }
+    wxPluralFormsNode* release();
+    void reset(wxPluralFormsNode *p);
+
+private:
+    wxPluralFormsNode *m_p;
+};
+
+class wxPluralFormsNode
+{
+public:
+    wxPluralFormsNode(const wxPluralFormsToken& token) : m_token(token) {}
+    const wxPluralFormsToken& token() const { return m_token; }
+    const wxPluralFormsNode* node(size_t i) const
+        { return m_nodes[i].get(); }
+    void setNode(size_t i, wxPluralFormsNode* n);
+    wxPluralFormsNode* releaseNode(size_t i);
+    wxPluralFormsToken::Number evaluate(wxPluralFormsToken::Number n) const;
+
+private:
+    wxPluralFormsToken m_token;
+    wxPluralFormsNodePtr m_nodes[3];
+};
+
+wxPluralFormsNodePtr::~wxPluralFormsNodePtr()
+{
+    delete m_p;
+}
+wxPluralFormsNode* wxPluralFormsNodePtr::release()
+{
+    wxPluralFormsNode *p = m_p;
+    m_p = NULL;
+    return p;
+}
+void wxPluralFormsNodePtr::reset(wxPluralFormsNode *p)
+{
+    if (p != m_p)
+    {
+        delete m_p;
+        m_p = p;
+    }
+}
+
+
+void wxPluralFormsNode::setNode(size_t i, wxPluralFormsNode* n)
+{
+    m_nodes[i].reset(n);
+}
+
+wxPluralFormsNode*  wxPluralFormsNode::releaseNode(size_t i)
+{
+    return m_nodes[i].release();
+}
+
+wxPluralFormsToken::Number
+wxPluralFormsNode::evaluate(wxPluralFormsToken::Number n) const
+{
+    switch (token().type())
+    {
+        // leaf
+        case wxPluralFormsToken::T_NUMBER:
+            return token().number();
+        case wxPluralFormsToken::T_N:
+            return n;
+        // 2 args
+        case wxPluralFormsToken::T_EQUAL:
+            return node(0)->evaluate(n) == node(1)->evaluate(n);
+        case wxPluralFormsToken::T_NOT_EQUAL:
+            return node(0)->evaluate(n) != node(1)->evaluate(n);
+        case wxPluralFormsToken::T_GREATER:
+            return node(0)->evaluate(n) > node(1)->evaluate(n);
+        case wxPluralFormsToken::T_GREATER_OR_EQUAL:
+            return node(0)->evaluate(n) >= node(1)->evaluate(n);
+        case wxPluralFormsToken::T_LESS:
+            return node(0)->evaluate(n) < node(1)->evaluate(n);
+        case wxPluralFormsToken::T_LESS_OR_EQUAL:
+            return node(0)->evaluate(n) <= node(1)->evaluate(n);
+        case wxPluralFormsToken::T_REMINDER:
+            {
+                wxPluralFormsToken::Number number = node(1)->evaluate(n);
+                if (number != 0)
+                {
+                    return node(0)->evaluate(n) % number;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        case wxPluralFormsToken::T_LOGICAL_AND:
+            return node(0)->evaluate(n) && node(1)->evaluate(n);
+        case wxPluralFormsToken::T_LOGICAL_OR:
+            return node(0)->evaluate(n) || node(1)->evaluate(n);
+        // 3 args
+        case wxPluralFormsToken::T_QUESTION:
+            return node(0)->evaluate(n)
+                ? node(1)->evaluate(n)
+                : node(2)->evaluate(n);
+        default:
+            return 0;
+    }
+}
+
+
+class wxPluralFormsCalculator
+{
+public:
+    wxPluralFormsCalculator() : m_nplurals(0), m_plural(0) {}
+
+    // input: number, returns msgstr index
+    int evaluate(int n) const;
+
+    // input: text after "Plural-Forms:" (e.g. "nplurals=2; plural=(n != 1);"),
+    // if s == 0, creates default handler
+    // returns 0 if error
+    static wxPluralFormsCalculator* make(const char* s = 0);
+
+    ~wxPluralFormsCalculator() {}
+
+    void  init(wxPluralFormsToken::Number nplurals, wxPluralFormsNode* plural);
+
+private:
+    wxPluralFormsToken::Number m_nplurals;
+    wxPluralFormsNodePtr m_plural;
+};
+
+wxDEFINE_SCOPED_PTR_TYPE(wxPluralFormsCalculator)
+
+void wxPluralFormsCalculator::init(wxPluralFormsToken::Number nplurals,
+                                   wxPluralFormsNode* plural)
+{
+    m_nplurals = nplurals;
+    m_plural.reset(plural);
+}
+
+int wxPluralFormsCalculator::evaluate(int n) const
+{
+    if (m_plural.get() == 0)
+    {
+        return 0;
+    }
+    wxPluralFormsToken::Number number = m_plural->evaluate(n);
+    if (number < 0 || number > m_nplurals)
+    {
+        return 0;
+    }
+    return number;
+}
+
+
+class wxPluralFormsParser
+{
+public:
+    wxPluralFormsParser(wxPluralFormsScanner& scanner) : m_scanner(scanner) {}
+    bool parse(wxPluralFormsCalculator& rCalculator);
+
+private:
+    wxPluralFormsNode* parsePlural();
+    // stops at T_SEMICOLON, returns 0 if error
+    wxPluralFormsScanner& m_scanner;
+    const wxPluralFormsToken& token() const;
+    bool nextToken();
+
+    wxPluralFormsNode* expression();
+    wxPluralFormsNode* logicalOrExpression();
+    wxPluralFormsNode* logicalAndExpression();
+    wxPluralFormsNode* equalityExpression();
+    wxPluralFormsNode* multiplicativeExpression();
+    wxPluralFormsNode* relationalExpression();
+    wxPluralFormsNode* pmExpression();
+};
+
+bool wxPluralFormsParser::parse(wxPluralFormsCalculator& rCalculator)
+{
+    if (token().type() != wxPluralFormsToken::T_NPLURALS)
+        return false;
+    if (!nextToken())
+        return false;
+    if (token().type() != wxPluralFormsToken::T_ASSIGN)
+        return false;
+    if (!nextToken())
+        return false;
+    if (token().type() != wxPluralFormsToken::T_NUMBER)
+        return false;
+    wxPluralFormsToken::Number nplurals = token().number();
+    if (!nextToken())
+        return false;
+    if (token().type() != wxPluralFormsToken::T_SEMICOLON)
+        return false;
+    if (!nextToken())
+        return false;
+    if (token().type() != wxPluralFormsToken::T_PLURAL)
+        return false;
+    if (!nextToken())
+        return false;
+    if (token().type() != wxPluralFormsToken::T_ASSIGN)
+        return false;
+    if (!nextToken())
+        return false;
+    wxPluralFormsNode* plural = parsePlural();
+    if (plural == 0)
+        return false;
+    if (token().type() != wxPluralFormsToken::T_SEMICOLON)
+        return false;
+    if (!nextToken())
+        return false;
+    if (token().type() != wxPluralFormsToken::T_EOF)
+        return false;
+    rCalculator.init(nplurals, plural);
+    return true;
+}
+
+wxPluralFormsNode* wxPluralFormsParser::parsePlural()
+{
+    wxPluralFormsNode* p = expression();
+    if (p == NULL)
+    {
+        return NULL;
+    }
+    wxPluralFormsNodePtr n(p);
+    if (token().type() != wxPluralFormsToken::T_SEMICOLON)
+    {
+        return NULL;
+    }
+    return n.release();
+}
+
+const wxPluralFormsToken& wxPluralFormsParser::token() const
+{
+    return m_scanner.token();
+}
+
+bool wxPluralFormsParser::nextToken()
+{
+    if (!m_scanner.nextToken())
+        return false;
+    return true;
+}
+
+wxPluralFormsNode* wxPluralFormsParser::expression()
+{
+    wxPluralFormsNode* p = logicalOrExpression();
+    if (p == NULL)
+        return NULL;
+    wxPluralFormsNodePtr n(p);
+    if (token().type() == wxPluralFormsToken::T_QUESTION)
+    {
+        wxPluralFormsNodePtr qn(new wxPluralFormsNode(token()));
+        if (!nextToken())
+        {
+            return 0;
+        }
+        p = expression();
+        if (p == 0)
+        {
+            return 0;
+        }
+        qn->setNode(1, p);
+        if (token().type() != wxPluralFormsToken::T_COLON)
+        {
+            return 0;
+        }
+        if (!nextToken())
+        {
+            return 0;
+        }
+        p = expression();
+        if (p == 0)
+        {
+            return 0;
+        }
+        qn->setNode(2, p);
+        qn->setNode(0, n.release());
+        return qn.release();
+    }
+    return n.release();
+}
+
+wxPluralFormsNode*wxPluralFormsParser::logicalOrExpression()
+{
+    wxPluralFormsNode* p = logicalAndExpression();
+    if (p == NULL)
+        return NULL;
+    wxPluralFormsNodePtr ln(p);
+    if (token().type() == wxPluralFormsToken::T_LOGICAL_OR)
+    {
+        wxPluralFormsNodePtr un(new wxPluralFormsNode(token()));
+        if (!nextToken())
+        {
+            return 0;
+        }
+        p = logicalOrExpression();
+        if (p == 0)
+        {
+            return 0;
+        }
+        wxPluralFormsNodePtr rn(p);    // right
+        if (rn->token().type() == wxPluralFormsToken::T_LOGICAL_OR)
+        {
+            // see logicalAndExpression comment
+            un->setNode(0, ln.release());
+            un->setNode(1, rn->releaseNode(0));
+            rn->setNode(0, un.release());
+            return rn.release();
+        }
+
+
+        un->setNode(0, ln.release());
+        un->setNode(1, rn.release());
+        return un.release();
+    }
+    return ln.release();
+}
+
+wxPluralFormsNode* wxPluralFormsParser::logicalAndExpression()
+{
+    wxPluralFormsNode* p = equalityExpression();
+    if (p == NULL)
+        return NULL;
+    wxPluralFormsNodePtr ln(p);   // left
+    if (token().type() == wxPluralFormsToken::T_LOGICAL_AND)
+    {
+        wxPluralFormsNodePtr un(new wxPluralFormsNode(token()));  // up
+        if (!nextToken())
+        {
+            return NULL;
+        }
+        p = logicalAndExpression();
+        if (p == 0)
+        {
+            return NULL;
+        }
+        wxPluralFormsNodePtr rn(p);    // right
+        if (rn->token().type() == wxPluralFormsToken::T_LOGICAL_AND)
+        {
+// transform 1 && (2 && 3) -> (1 && 2) && 3
+//     u                  r
+// l       r     ->   u      3
+//       2   3      l   2
+            un->setNode(0, ln.release());
+            un->setNode(1, rn->releaseNode(0));
+            rn->setNode(0, un.release());
+            return rn.release();
+        }
+
+        un->setNode(0, ln.release());
+        un->setNode(1, rn.release());
+        return un.release();
+    }
+    return ln.release();
+}
+
+wxPluralFormsNode* wxPluralFormsParser::equalityExpression()
+{
+    wxPluralFormsNode* p = relationalExpression();
+    if (p == NULL)
+        return NULL;
+    wxPluralFormsNodePtr n(p);
+    if (token().type() == wxPluralFormsToken::T_EQUAL
+        || token().type() == wxPluralFormsToken::T_NOT_EQUAL)
+    {
+        wxPluralFormsNodePtr qn(new wxPluralFormsNode(token()));
+        if (!nextToken())
+        {
+            return NULL;
+        }
+        p = relationalExpression();
+        if (p == NULL)
+        {
+            return NULL;
+        }
+        qn->setNode(1, p);
+        qn->setNode(0, n.release());
+        return qn.release();
+    }
+    return n.release();
+}
+
+wxPluralFormsNode* wxPluralFormsParser::relationalExpression()
+{
+    wxPluralFormsNode* p = multiplicativeExpression();
+    if (p == NULL)
+        return NULL;
+    wxPluralFormsNodePtr n(p);
+    if (token().type() == wxPluralFormsToken::T_GREATER
+            || token().type() == wxPluralFormsToken::T_LESS
+            || token().type() == wxPluralFormsToken::T_GREATER_OR_EQUAL
+            || token().type() == wxPluralFormsToken::T_LESS_OR_EQUAL)
+    {
+        wxPluralFormsNodePtr qn(new wxPluralFormsNode(token()));
+        if (!nextToken())
+        {
+            return NULL;
+        }
+        p = multiplicativeExpression();
+        if (p == NULL)
+        {
+            return NULL;
+        }
+        qn->setNode(1, p);
+        qn->setNode(0, n.release());
+        return qn.release();
+    }
+    return n.release();
+}
+
+wxPluralFormsNode* wxPluralFormsParser::multiplicativeExpression()
+{
+    wxPluralFormsNode* p = pmExpression();
+    if (p == NULL)
+        return NULL;
+    wxPluralFormsNodePtr n(p);
+    if (token().type() == wxPluralFormsToken::T_REMINDER)
+    {
+        wxPluralFormsNodePtr qn(new wxPluralFormsNode(token()));
+        if (!nextToken())
+        {
+            return NULL;
+        }
+        p = pmExpression();
+        if (p == NULL)
+        {
+            return NULL;
+        }
+        qn->setNode(1, p);
+        qn->setNode(0, n.release());
+        return qn.release();
+    }
+    return n.release();
+}
+
+wxPluralFormsNode* wxPluralFormsParser::pmExpression()
+{
+    wxPluralFormsNodePtr n;
+    if (token().type() == wxPluralFormsToken::T_N
+        || token().type() == wxPluralFormsToken::T_NUMBER)
+    {
+        n.reset(new wxPluralFormsNode(token()));
+        if (!nextToken())
+        {
+            return NULL;
+        }
+    }
+    else if (token().type() == wxPluralFormsToken::T_LEFT_BRACKET) {
+        if (!nextToken())
+        {
+            return NULL;
+        }
+        wxPluralFormsNode* p = expression();
+        if (p == NULL)
+        {
+            return NULL;
+        }
+        n.reset(p);
+        if (token().type() != wxPluralFormsToken::T_RIGHT_BRACKET)
+        {
+            return NULL;
+        }
+        if (!nextToken())
+        {
+            return NULL;
+        }
+    }
+    else
+    {
+        return NULL;
+    }
+    return n.release();
+}
+
+wxPluralFormsCalculator* wxPluralFormsCalculator::make(const char* s)
+{
+    wxPluralFormsCalculatorPtr calculator(new wxPluralFormsCalculator);
+    if (s != NULL)
+    {
+        wxPluralFormsScanner scanner(s);
+        wxPluralFormsParser p(scanner);
+        if (!p.parse(*calculator))
+        {
+            return NULL;
+        }
+    }
+    return calculator.release();
+}
+
+
+
+
+// ----------------------------------------------------------------------------
+// wxMsgCatalogFile corresponds to one disk-file message catalog.
+//
+// This is a "low-level" class and is used only by wxMsgCatalog
+// ----------------------------------------------------------------------------
+
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxString, wxMessagesHash);
+
+class wxMsgCatalogFile
+{
+public:
+    // ctor & dtor
+    wxMsgCatalogFile();
+   ~wxMsgCatalogFile();
+
+    // load the catalog from disk (szDirPrefix corresponds to language)
+    bool Load(const wxChar *szDirPrefix, const wxChar *szName,
+              wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
+
+    // fills the hash with string-translation pairs
+    void FillHash(wxMessagesHash& hash,
+                  const wxString& msgIdCharset,
+                  bool convertEncoding) const;
+
+    // return the charset of the strings in this catalog or empty string if
+    // none/unknown
+    wxString GetCharset() const { return m_charset; }
+
+private:
+    // this implementation is binary compatible with GNU gettext() version 0.10
+
+    // an entry in the string table
+    struct wxMsgTableEntry
+    {
+      size_t32   nLen;           // length of the string
+      size_t32   ofsString;      // pointer to the string
+    };
+
+    // header of a .mo file
+    struct wxMsgCatalogHeader
+    {
+      size_t32  magic,          // offset +00:  magic id
+                revision,       //        +04:  revision
+                numStrings;     //        +08:  number of strings in the file
+      size_t32  ofsOrigTable,   //        +0C:  start of original string table
+                ofsTransTable;  //        +10:  start of translated string table
+      size_t32  nHashSize,      //        +14:  hash table size
+                ofsHashTable;   //        +18:  offset of hash table start
+    };
+
+    // all data is stored here, NULL if no data loaded
+    size_t8 *m_pData;
+
+    // amount of memory pointed to by m_pData.
+    size_t32 m_nSize;
+
+    // data description
+    size_t32          m_numStrings;   // number of strings in this domain
+    wxMsgTableEntry  *m_pOrigTable,   // pointer to original   strings
+                     *m_pTransTable;  //            translated
+
+    wxString m_charset;               // from the message catalog header
+
+
+    // swap the 2 halves of 32 bit integer if needed
+    size_t32 Swap(size_t32 ui) const
+    {
+          return m_bSwapped ? (ui << 24) | ((ui & 0xff00) << 8) |
+                              ((ui >> 8) & 0xff00) | (ui >> 24)
+                            : ui;
+    }
+
+    const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 n) const
+    {
+        const wxMsgTableEntry * const ent = pTable + n;
+
+        // this check could fail for a corrupt message catalog
+        size_t32 ofsString = Swap(ent->ofsString);
+        if ( ofsString + Swap(ent->nLen) > m_nSize)
+        {
+            return NULL;
+        }
+
+        return (const char *)(m_pData + ofsString);
+    }
+
+    bool m_bSwapped;   // wrong endianness?
+
+    DECLARE_NO_COPY_CLASS(wxMsgCatalogFile)
+};
+
+
+// ----------------------------------------------------------------------------
+// wxMsgCatalog corresponds to one loaded message catalog.
+//
+// This is a "low-level" class and is used only by wxLocale (that's why
+// it's designed to be stored in a linked list)
+// ----------------------------------------------------------------------------
+
+class wxMsgCatalog
+{
+public:
+#if !wxUSE_UNICODE
+    wxMsgCatalog() { m_conv = NULL; }
+    ~wxMsgCatalog();
+#endif
+
+    // load the catalog from disk (szDirPrefix corresponds to language)
+    bool Load(const wxChar *szDirPrefix, const wxChar *szName,
+              const wxChar *msgIdCharset = NULL, bool bConvertEncoding = false);
+
+    // get name of the catalog
+    wxString GetName() const { return m_name; }
+
+    // get the translated string: returns NULL if not found
+    const wxChar *GetString(const wxChar *sz, size_t n = size_t(-1)) const;
+
+    // public variable pointing to the next element in a linked list (or NULL)
+    wxMsgCatalog *m_pNext;
+
+private:
+    wxMessagesHash  m_messages; // all messages in the catalog
+    wxString        m_name;     // name of the domain
+
+#if !wxUSE_UNICODE
+    // the conversion corresponding to this catalog charset if we installed it
+    // as the global one
+    wxCSConv *m_conv;
+#endif
+
+    wxPluralFormsCalculatorPtr  m_pluralFormsCalculator;
+};
+
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
+// the list of the directories to search for message catalog files
+static wxArrayString gs_searchPrefixes;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxMsgCatalogFile class
+// ----------------------------------------------------------------------------
+
+wxMsgCatalogFile::wxMsgCatalogFile()
+{
+    m_pData = NULL;
+    m_nSize = 0;
+}
+
+wxMsgCatalogFile::~wxMsgCatalogFile()
+{
+    delete [] m_pData;
+}
+
+// return the directories to search for message catalogs under the given
+// prefix, separated by wxPATH_SEP
+static
+wxString GetMsgCatalogSubdirs(const wxChar *prefix, const wxChar *lang)
+{
+    // Search first in Unix-standard prefix/lang/LC_MESSAGES, then in
+    // prefix/lang and finally in just prefix.
+    //
+    // Note that we use LC_MESSAGES on all platforms and not just Unix, because
+    // it doesn't cost much to look into one more directory and doing it this
+    // way has two important benefits:
+    // a) we don't break compatibility with wx-2.6 and older by stopping to
+    //    look in a directory where the catalogs used to be and thus silently
+    //    breaking apps after they are recompiled against the latest wx
+    // b) it makes it possible to package app's support files in the same
+    //    way on all target platforms
+    wxString pathPrefix;
+    pathPrefix << prefix << wxFILE_SEP_PATH << lang;
+
+    wxString searchPath;
+    searchPath.reserve(4*pathPrefix.length());
+    searchPath << pathPrefix << wxFILE_SEP_PATH << wxT("LC_MESSAGES") << wxPATH_SEP
+               << prefix << wxFILE_SEP_PATH << wxPATH_SEP
+               << pathPrefix;
+
+    return searchPath;
+}
+
+// construct the search path for the given language
+static wxString GetFullSearchPath(const wxChar *lang)
+{
+    // first take the entries explicitly added by the program
+    wxArrayString paths;
+    paths.reserve(gs_searchPrefixes.size() + 1);
+    size_t n,
+           count = gs_searchPrefixes.size();
+    for ( n = 0; n < count; n++ )
+    {
+        paths.Add(GetMsgCatalogSubdirs(gs_searchPrefixes[n], lang));
+    }
+
+
+#if wxUSE_STDPATHS
+    // then look in the standard location
+    const wxString stdp = wxStandardPaths::Get().
+        GetLocalizedResourcesDir(lang, wxStandardPaths::ResourceCat_Messages);
+
+    if ( paths.Index(stdp) == wxNOT_FOUND )
+        paths.Add(stdp);
+#endif // wxUSE_STDPATHS
+
+    // last look in default locations
+#ifdef __UNIX__
+    // LC_PATH is a standard env var containing the search path for the .mo
+    // files
+    const wxChar *pszLcPath = wxGetenv(wxT("LC_PATH"));
+    if ( pszLcPath )
+    {
+        const wxString lcp = GetMsgCatalogSubdirs(pszLcPath, lang);
+        if ( paths.Index(lcp) == wxNOT_FOUND )
+            paths.Add(lcp);
+    }
+
+    // also add the one from where wxWin was installed:
+    wxString wxp = wxGetInstallPrefix();
+    if ( !wxp.empty() )
+    {
+        wxp = GetMsgCatalogSubdirs(wxp + _T("/share/locale"), lang);
+        if ( paths.Index(wxp) == wxNOT_FOUND )
+            paths.Add(wxp);
+    }
+#endif // __UNIX__
+
+
+    // finally construct the full search path
+    wxString searchPath;
+    searchPath.reserve(500);
+    count = paths.size();
+    for ( n = 0; n < count; n++ )
+    {
+        searchPath += paths[n];
+        if ( n != count - 1 )
+            searchPath += wxPATH_SEP;
+    }
+
+    return searchPath;
+}
+
+// open disk file and read in it's contents
+bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName,
+                            wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
+{
+  wxString searchPath;
+
+#if wxUSE_FONTMAP
+  // first look for the catalog for this language and the current locale:
+  // notice that we don't use the system name for the locale as this would
+  // force us to install catalogs in different locations depending on the
+  // system but always use the canonical name
+  wxFontEncoding encSys = wxLocale::GetSystemEncoding();
+  if ( encSys != wxFONTENCODING_SYSTEM )
+  {
+    wxString fullname(szDirPrefix);
+    fullname << _T('.') << wxFontMapperBase::GetEncodingName(encSys);
+    searchPath << GetFullSearchPath(fullname) << wxPATH_SEP;
+  }
+#endif // wxUSE_FONTMAP
+
+
+  searchPath += GetFullSearchPath(szDirPrefix);
+  const wxChar *sublocale = wxStrchr(szDirPrefix, wxT('_'));
+  if ( sublocale )
+  {
+      // also add just base locale name: for things like "fr_BE" (belgium
+      // french) we should use "fr" if no belgium specific message catalogs
+      // exist
+      searchPath << wxPATH_SEP
+                 << GetFullSearchPath(wxString(szDirPrefix).
+                                      Left((size_t)(sublocale - szDirPrefix)));
+  }
+
+  // don't give translation errors here because the wxstd catalog might
+  // not yet be loaded (and it's normal)
+  //
+  // (we're using an object because we have several return paths)
+
+  NoTransErr noTransErr;
+  wxLogVerbose(_("looking for catalog '%s' in path '%s'."),
+               szName, searchPath.c_str());
+  wxLogTrace(TRACE_I18N, _T("Looking for \"%s.mo\" in \"%s\""),
+             szName, searchPath.c_str());
+
+  wxFileName fn(szName);
+  fn.SetExt(_T("mo"));
+  wxString strFullName;
+  if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) ) {
+    wxLogVerbose(_("catalog file for domain '%s' not found."), szName);
+    wxLogTrace(TRACE_I18N, _T("Catalog \"%s.mo\" not found"), szName);
+    return false;
+  }
+
+  // open file
+  wxLogVerbose(_("using catalog '%s' from '%s'."), szName, strFullName.c_str());
+  wxLogTrace(TRACE_I18N, _T("Using catalog \"%s\"."), strFullName.c_str());
+
+  wxFile fileMsg(strFullName);
+  if ( !fileMsg.IsOpened() )
+    return false;
+
+  // get the file size (assume it is less than 4Gb...)
+  wxFileOffset lenFile = fileMsg.Length();
+  if ( lenFile == wxInvalidOffset )
+    return false;
+
+  size_t nSize = wx_truncate_cast(size_t, lenFile);
+  wxASSERT_MSG( nSize == lenFile + size_t(0), _T("message catalog bigger than 4GB?") );
+
+  // read the whole file in memory
+  m_pData = new size_t8[nSize];
+  if ( fileMsg.Read(m_pData, nSize) != lenFile ) {
+    wxDELETEA(m_pData);
+    return false;
+  }
+
+  // examine header
+  bool bValid = nSize + (size_t)0 > sizeof(wxMsgCatalogHeader);
+
+  wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)m_pData;
+  if ( bValid ) {
+    // we'll have to swap all the integers if it's true
+    m_bSwapped = pHeader->magic == MSGCATALOG_MAGIC_SW;
+
+    // check the magic number
+    bValid = m_bSwapped || pHeader->magic == MSGCATALOG_MAGIC;
+  }
+
+  if ( !bValid ) {
+    // it's either too short or has incorrect magic number
+    wxLogWarning(_("'%s' is not a valid message catalog."), strFullName.c_str());
+
+    wxDELETEA(m_pData);
+    return false;
+  }
+
+  // initialize
+  m_numStrings  = Swap(pHeader->numStrings);
+  m_pOrigTable  = (wxMsgTableEntry *)(m_pData +
+                   Swap(pHeader->ofsOrigTable));
+  m_pTransTable = (wxMsgTableEntry *)(m_pData +
+                   Swap(pHeader->ofsTransTable));
+  m_nSize = (size_t32)nSize;
+
+  // now parse catalog's header and try to extract catalog charset and
+  // plural forms formula from it:
+
+  const char* headerData = StringAtOfs(m_pOrigTable, 0);
+  if (headerData && headerData[0] == 0)
+  {
+      // Extract the charset:
+      wxString header = wxString::FromAscii(StringAtOfs(m_pTransTable, 0));
+      int begin = header.Find(wxT("Content-Type: text/plain; charset="));
+      if (begin != wxNOT_FOUND)
+      {
+          begin += 34; //strlen("Content-Type: text/plain; charset=")
+          size_t end = header.find('\n', begin);
+          if (end != size_t(-1))
+          {
+              m_charset.assign(header, begin, end - begin);
+              if (m_charset == wxT("CHARSET"))
+              {
+                  // "CHARSET" is not valid charset, but lazy translator
+                  m_charset.Clear();
+              }
+          }
+      }
+      // else: incorrectly filled Content-Type header
+
+      // Extract plural forms:
+      begin = header.Find(wxT("Plural-Forms:"));
+      if (begin != wxNOT_FOUND)
+      {
+          begin += 13;
+          size_t end = header.find('\n', begin);
+          if (end != size_t(-1))
+          {
+              wxString pfs(header, begin, end - begin);
+              wxPluralFormsCalculator* pCalculator = wxPluralFormsCalculator
+                  ::make(pfs.ToAscii());
+              if (pCalculator != 0)
+              {
+                  rPluralFormsCalculator.reset(pCalculator);
+              }
+              else
+              {
+                   wxLogVerbose(_("Cannot parse Plural-Forms:'%s'"), pfs.c_str());
+              }
+          }
+      }
+      if (rPluralFormsCalculator.get() == NULL)
+      {
+          rPluralFormsCalculator.reset(wxPluralFormsCalculator::make());
+      }
+  }
+
+  // everything is fine
+  return true;
+}
+
+void wxMsgCatalogFile::FillHash(wxMessagesHash& hash,
+                                const wxString& msgIdCharset,
+                                bool convertEncoding) const
+{
+#if wxUSE_UNICODE
+    // this parameter doesn't make sense, we always must convert encoding in
+    // Unicode build
+    convertEncoding = true;
+#elif wxUSE_FONTMAP
+    if ( convertEncoding )
+    {
+        // determine if we need any conversion at all
+        wxFontEncoding encCat = wxFontMapperBase::GetEncodingFromName(m_charset);
+        if ( encCat == wxLocale::GetSystemEncoding() )
+        {
+            // no need to convert
+            convertEncoding = false;
+        }
+    }
+#endif // wxUSE_UNICODE/wxUSE_FONTMAP
+
+#if wxUSE_WCHAR_T
+    // conversion to use to convert catalog strings to the GUI encoding
+    wxMBConv *inputConv,
+             *inputConvPtr = NULL; // same as inputConv but safely deleteable
+    if ( convertEncoding && !m_charset.empty() )
+    {
+        inputConvPtr =
+        inputConv = new wxCSConv(m_charset);
+    }
+    else // no need or not possible to convert the encoding
+    {
+#if wxUSE_UNICODE
+        // we must somehow convert the narrow strings in the message catalog to
+        // wide strings, so use the default conversion if we have no charset
+        inputConv = wxConvCurrent;
+#else // !wxUSE_UNICODE
+        inputConv = NULL;
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+    }
+
+    // conversion to apply to msgid strings before looking them up: we only
+    // need it if the msgids are neither in 7 bit ASCII nor in the same
+    // encoding as the catalog
+    wxCSConv *sourceConv = msgIdCharset.empty() || (msgIdCharset == m_charset)
+                            ? NULL
+                            : new wxCSConv(msgIdCharset);
+
+#elif wxUSE_FONTMAP
+    wxASSERT_MSG( msgIdCharset.empty(),
+                  _T("non-ASCII msgid languages only supported if wxUSE_WCHAR_T=1") );
+
+    wxEncodingConverter converter;
+    if ( convertEncoding )
+    {
+        wxFontEncoding targetEnc = wxFONTENCODING_SYSTEM;
+        wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(m_charset, false);
+        if ( enc == wxFONTENCODING_SYSTEM )
+        {
+            convertEncoding = false; // unknown encoding
+        }
+        else
+        {
+            targetEnc = wxLocale::GetSystemEncoding();
+            if (targetEnc == wxFONTENCODING_SYSTEM)
+            {
+                wxFontEncodingArray a = wxEncodingConverter::GetPlatformEquivalents(enc);
+                if (a[0] == enc)
+                    // no conversion needed, locale uses native encoding
+                    convertEncoding = false;
+                if (a.GetCount() == 0)
+                    // we don't know common equiv. under this platform
+                    convertEncoding = false;
+                targetEnc = a[0];
+            }
+        }
+
+        if ( convertEncoding )
+        {
+            converter.Init(enc, targetEnc);
+        }
+    }
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
+    (void)convertEncoding; // get rid of warnings about unused parameter
+
+    for (size_t32 i = 0; i < m_numStrings; i++)
+    {
+        const char *data = StringAtOfs(m_pOrigTable, i);
+
+        wxString msgid;
+#if wxUSE_UNICODE
+        msgid = wxString(data, *inputConv);
+#else // ASCII
+        #if wxUSE_WCHAR_T
+            if ( inputConv && sourceConv )
+                msgid = wxString(inputConv->cMB2WC(data), *sourceConv);
+            else
+        #endif
+                msgid = data;
+#endif // wxUSE_UNICODE
+
+        data = StringAtOfs(m_pTransTable, i);
+        size_t length = Swap(m_pTransTable[i].nLen);
+        size_t offset = 0;
+        size_t index = 0;
+        while (offset < length)
+        {
+            const char * const str = data + offset;
+
+            wxString msgstr;
+#if wxUSE_UNICODE
+            msgstr = wxString(str, *inputConv);
+#elif wxUSE_WCHAR_T
+            if ( inputConv )
+                msgstr = wxString(inputConv->cMB2WC(str), *wxConvUI);
+            else
+                msgstr = str;
+#else // !wxUSE_WCHAR_T
+        #if wxUSE_FONTMAP
+            if ( convertEncoding )
+                msgstr = wxString(converter.Convert(str));
+            else
+        #endif
+                msgstr = str;
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
+
+            if ( !msgstr.empty() )
+            {
+                hash[index == 0 ? msgid : msgid + wxChar(index)] = msgstr;
+            }
+
+            // skip this string
+            offset += strlen(str) + 1;
+            ++index;
+        }
+    }
+
+#if wxUSE_WCHAR_T
+    delete sourceConv;
+    delete inputConvPtr;
+#endif // wxUSE_WCHAR_T
+}
+
+
+// ----------------------------------------------------------------------------
+// wxMsgCatalog class
+// ----------------------------------------------------------------------------
+
+#if !wxUSE_UNICODE
+wxMsgCatalog::~wxMsgCatalog()
+{
+    if ( m_conv )
+    {
+        if ( wxConvUI == m_conv )
+        {
+            // we only change wxConvUI if it points to wxConvLocal so we reset
+            // it back to it too
+            wxConvUI = &wxConvLocal;
+        }
+
+        delete m_conv;
+    }
+}
+#endif // !wxUSE_UNICODE
+
+bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName,
+                        const wxChar *msgIdCharset, bool bConvertEncoding)
+{
+    wxMsgCatalogFile file;
+
+    m_name = szName;
+
+    if ( !file.Load(szDirPrefix, szName, m_pluralFormsCalculator) )
+        return false;
+
+    file.FillHash(m_messages, msgIdCharset, bConvertEncoding);
+
+#if !wxUSE_UNICODE && wxUSE_WCHAR_T
+    // we should use a conversion compatible with the message catalog encoding
+    // in the GUI if we don't convert the strings to the current conversion but
+    // as the encoding is global, only change it once, otherwise we could get
+    // into trouble if we use several message catalogs with different encodings
+    //
+    // this is, of course, a hack but it at least allows the program to use
+    // message catalogs in any encodings without asking the user to change his
+    // locale
+    if ( !bConvertEncoding &&
+            !file.GetCharset().empty() &&
+                wxConvUI == &wxConvLocal )
+    {
+        wxConvUI =
+        m_conv = new wxCSConv(file.GetCharset());
+    }
+#endif // !wxUSE_UNICODE && wxUSE_WCHAR_T
+
+    return true;
+}
+
+const wxChar *wxMsgCatalog::GetString(const wxChar *sz, size_t n) const
+{
+    int index = 0;
+    if (n != size_t(-1))
+    {
+        index = m_pluralFormsCalculator->evaluate(n);
+    }
+    wxMessagesHash::const_iterator i;
+    if (index != 0)
+    {
+        i = m_messages.find(wxString(sz) + wxChar(index));   // plural
+    }
+    else
+    {
+        i = m_messages.find(sz);
+    }
+
+    if ( i != m_messages.end() )
+    {
+        return i->second.c_str();
+    }
+    else
+        return NULL;
+}
+
+// ----------------------------------------------------------------------------
+// wxLocale
+// ----------------------------------------------------------------------------
+
+#include "wx/arrimpl.cpp"
+WX_DECLARE_EXPORTED_OBJARRAY(wxLanguageInfo, wxLanguageInfoArray);
+WX_DEFINE_OBJARRAY(wxLanguageInfoArray)
+
+wxLanguageInfoArray *wxLocale::ms_languagesDB = NULL;
+
+/*static*/ void wxLocale::CreateLanguagesDB()
+{
+    if (ms_languagesDB == NULL)
+    {
+        ms_languagesDB = new wxLanguageInfoArray;
+        InitLanguagesDB();
+    }
+}
+
+/*static*/ void wxLocale::DestroyLanguagesDB()
+{
+    delete ms_languagesDB;
+    ms_languagesDB = NULL;
+}
+
+
+void wxLocale::DoCommonInit()
+{
+  m_pszOldLocale = NULL;
+
+  m_pOldLocale = wxSetLocale(this);
+
+  m_pMsgCat = NULL;
+  m_language = wxLANGUAGE_UNKNOWN;
+  m_initialized = false;
+}
+
+// NB: this function has (desired) side effect of changing current locale
+bool wxLocale::Init(const wxChar *szName,
+                    const wxChar *szShort,
+                    const wxChar *szLocale,
+                    bool        bLoadDefault,
+                    bool        bConvertEncoding)
+{
+  wxASSERT_MSG( !m_initialized,
+                _T("you can't call wxLocale::Init more than once") );
+
+  m_initialized = true;
+  m_strLocale = szName;
+  m_strShort = szShort;
+  m_bConvertEncoding = bConvertEncoding;
+  m_language = wxLANGUAGE_UNKNOWN;
+
+  // change current locale (default: same as long name)
+  if ( szLocale == NULL )
+  {
+    // the argument to setlocale()
+    szLocale = szShort;
+
+    wxCHECK_MSG( szLocale, false, _T("no locale to set in wxLocale::Init()") );
+  }
+
+#ifdef __WXWINCE__
+  // FIXME: I'm guessing here
+  wxChar localeName[256];
+  int ret = GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SLANGUAGE, localeName,
+      256);
+  if (ret != 0)
+  {
+    m_pszOldLocale = wxStrdup(localeName);
+  }
+  else
+    m_pszOldLocale = NULL;
+
+  // TODO: how to find languageId
+  // SetLocaleInfo(languageId, SORT_DEFAULT, localeName);
+#else
+  wxMB2WXbuf oldLocale = wxSetlocale(LC_ALL, szLocale);
+  if ( oldLocale )
+      m_pszOldLocale = wxStrdup(oldLocale);
+  else
+      m_pszOldLocale = NULL;
+#endif
+
+  if ( m_pszOldLocale == NULL )
+    wxLogError(_("locale '%s' can not be set."), szLocale);
+
+  // the short name will be used to look for catalog files as well,
+  // so we need something here
+  if ( m_strShort.empty() ) {
+    // FIXME I don't know how these 2 letter abbreviations are formed,
+    //       this wild guess is surely wrong
+    if ( szLocale && szLocale[0] )
+    {
+        m_strShort += (wxChar)wxTolower(szLocale[0]);
+        if ( szLocale[1] )
+            m_strShort += (wxChar)wxTolower(szLocale[1]);
+    }
+  }
+
+  // load the default catalog with wxWidgets standard messages
+  m_pMsgCat = NULL;
+  bool bOk = true;
+  if ( bLoadDefault )
+  {
+    bOk = AddCatalog(wxT("wxstd"));
+
+    // there may be a catalog with toolkit specific overrides, it is not
+    // an error if this does not exist
+    if ( bOk )
+    {
+      wxString port(wxPlatformInfo::Get().GetPortIdName());
+      if ( !port.empty() )
+      {
+        AddCatalog(port.BeforeFirst(wxT('/')).MakeLower());
+      }
+    }
+  }
+
+  return bOk;
+}
+
+
+#if defined(__UNIX__) && wxUSE_UNICODE && !defined(__WXMAC__)
+static wxWCharBuffer wxSetlocaleTryUTF(int c, const wxChar *lc)
+{
+    wxMB2WXbuf l = wxSetlocale(c, lc);
+    if ( !l && lc && lc[0] != 0 )
+    {
+        wxString buf(lc);
+        wxString buf2;
+        buf2 = buf + wxT(".UTF-8");
+        l = wxSetlocale(c, buf2.c_str());
+        if ( !l )
+        {
+            buf2 = buf + wxT(".utf-8");
+            l = wxSetlocale(c, buf2.c_str());
+        }
+        if ( !l )
+        {
+            buf2 = buf + wxT(".UTF8");
+            l = wxSetlocale(c, buf2.c_str());
+        }
+        if ( !l )
+        {
+            buf2 = buf + wxT(".utf8");
+            l = wxSetlocale(c, buf2.c_str());
+        }
+    }
+    return l;
+}
+#else
+#define wxSetlocaleTryUTF(c, lc)  wxSetlocale(c, lc)
+#endif
+
+bool wxLocale::Init(int language, int flags)
+{
+    int lang = language;
+    if (lang == wxLANGUAGE_DEFAULT)
+    {
+        // auto detect the language
+        lang = GetSystemLanguage();
+    }
+
+    // We failed to detect system language, so we will use English:
+    if (lang == wxLANGUAGE_UNKNOWN)
+    {
+       return false;
+    }
+
+    const wxLanguageInfo *info = GetLanguageInfo(lang);
+
+    // Unknown language:
+    if (info == NULL)
+    {
+        wxLogError(wxT("Unknown language %i."), lang);
+        return false;
+    }
+
+    wxString name = info->Description;
+    wxString canonical = info->CanonicalName;
+    wxString locale;
+
+    // Set the locale:
+#if defined(__OS2__)
+    wxMB2WXbuf retloc = wxSetlocale(LC_ALL , wxEmptyString);
+#elif defined(__UNIX__) && !defined(__WXMAC__)
+    if (language != wxLANGUAGE_DEFAULT)
+        locale = info->CanonicalName;
+
+    wxMB2WXbuf retloc = wxSetlocaleTryUTF(LC_ALL, locale);
+
+    const wxString langOnly = locale.Left(2);
+    if ( !retloc )
+    {
+        // Some C libraries don't like xx_YY form and require xx only
+        retloc = wxSetlocaleTryUTF(LC_ALL, langOnly);
+    }
+
+#if wxUSE_FONTMAP
+    // some systems (e.g. FreeBSD and HP-UX) don't have xx_YY aliases but
+    // require the full xx_YY.encoding form, so try using UTF-8 because this is
+    // the only thing we can do generically
+    //
+    // TODO: add encodings applicable to each language to the lang DB and try
+    //       them all in turn here
+    if ( !retloc )
+    {
+        const wxChar **names =
+            wxFontMapperBase::GetAllEncodingNames(wxFONTENCODING_UTF8);
+        while ( *names )
+        {
+            retloc = wxSetlocale(LC_ALL, locale + _T('.') + *names++);
+            if ( retloc )
+                break;
+        }
+    }
+#endif // wxUSE_FONTMAP
+
+    if ( !retloc )
+    {
+        // Some C libraries (namely glibc) still use old ISO 639,
+        // so will translate the abbrev for them
+        wxString localeAlt;
+        if ( langOnly == wxT("he") )
+            localeAlt = wxT("iw") + locale.Mid(3);
+        else if ( langOnly == wxT("id") )
+            localeAlt = wxT("in") + locale.Mid(3);
+        else if ( langOnly == wxT("yi") )
+            localeAlt = wxT("ji") + locale.Mid(3);
+        else if ( langOnly == wxT("nb") )
+            localeAlt = wxT("no_NO");
+        else if ( langOnly == wxT("nn") )
+            localeAlt = wxT("no_NY");
+
+        if ( !localeAlt.empty() )
+        {
+            retloc = wxSetlocaleTryUTF(LC_ALL, localeAlt);
+            if ( !retloc )
+                retloc = wxSetlocaleTryUTF(LC_ALL, localeAlt.Left(2));
+        }
+    }
+
+    if ( !retloc )
+    {
+        wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
+        return false;
+    }
+
+#ifdef __AIX__
+    // at least in AIX 5.2 libc is buggy and the string returned from setlocale(LC_ALL)
+    // can't be passed back to it because it returns 6 strings (one for each locale
+    // category), i.e. for C locale we get back "C C C C C C"
+    //
+    // this contradicts IBM own docs but this is not of much help, so just work around
+    // it in the crudest possible manner
+    wxChar *p = wxStrchr((wxChar *)retloc, _T(' '));
+    if ( p )
+        *p = _T('\0');
+#endif // __AIX__
+
+#elif defined(__WIN32__)
+
+    #if wxUSE_UNICODE && (defined(__VISUALC__) || defined(__MINGW32__))
+        // NB: setlocale() from msvcrt.dll (used by VC++ and Mingw)
+        //     can't set locale to language that can only be written using
+        //     Unicode.  Therefore wxSetlocale call failed, but we don't want
+        //     to report it as an error -- so that at least message catalogs
+        //     can be used. Watch for code marked with
+        //     #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS bellow.
+        #define SETLOCALE_FAILS_ON_UNICODE_LANGS
+    #endif
+
+#if !wxUSE_UNICODE
+    const
+#endif
+    wxMB2WXbuf retloc = wxT("C");
+    if (language != wxLANGUAGE_DEFAULT)
+    {
+        if (info->WinLang == 0)
+        {
+            wxLogWarning(wxT("Locale '%s' not supported by OS."), name.c_str());
+            // retloc already set to "C"
+        }
+        else
+        {
+            int codepage
+                         #ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
+                         = -1
+                         #endif
+                         ;
+            wxUint32 lcid = MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
+                                     SORT_DEFAULT);
+            // FIXME
+#ifndef __WXWINCE__
+            SetThreadLocale(lcid);
+#endif
+            // NB: we must translate LCID to CRT's setlocale string ourselves,
+            //     because SetThreadLocale does not modify change the
+            //     interpretation of setlocale(LC_ALL, "") call:
+            wxChar buffer[256];
+            buffer[0] = wxT('\0');
+            GetLocaleInfo(lcid, LOCALE_SENGLANGUAGE, buffer, 256);
+            locale << buffer;
+            if (GetLocaleInfo(lcid, LOCALE_SENGCOUNTRY, buffer, 256) > 0)
+                locale << wxT("_") << buffer;
+            if (GetLocaleInfo(lcid, LOCALE_IDEFAULTANSICODEPAGE, buffer, 256) > 0)
+            {
+                codepage = wxAtoi(buffer);
+                if (codepage != 0)
+                    locale << wxT(".") << buffer;
+            }
+            if (locale.empty())
+            {
+                wxLogLastError(wxT("SetThreadLocale"));
+                wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
+                return false;
+            }
+            else
+            {
+            // FIXME
+#ifndef __WXWINCE__
+                retloc = wxSetlocale(LC_ALL, locale);
+#endif
+#ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
+                if (codepage == 0 && (const wxChar*)retloc == NULL)
+                {
+                    retloc = wxT("C");
+                }
+#endif
+            }
+        }
+    }
+    else
+    {
+            // FIXME
+#ifndef __WXWINCE__
+        retloc = wxSetlocale(LC_ALL, wxEmptyString);
+#else
+        retloc = NULL;
+#endif
+#ifdef SETLOCALE_FAILS_ON_UNICODE_LANGS
+        if ((const wxChar*)retloc == NULL)
+        {
+            wxChar buffer[16];
+            if (GetLocaleInfo(LOCALE_USER_DEFAULT,
+                              LOCALE_IDEFAULTANSICODEPAGE, buffer, 16) > 0 &&
+                 wxStrcmp(buffer, wxT("0")) == 0)
+            {
+                retloc = wxT("C");
+            }
+        }
+#endif
+    }
+
+    if ( !retloc )
+    {
+        wxLogError(wxT("Cannot set locale to language %s."), name.c_str());
+        return false;
+    }
+#elif defined(__WXMAC__)
+    if (lang == wxLANGUAGE_DEFAULT)
+        locale = wxEmptyString;
+    else
+        locale = info->CanonicalName;
+
+    wxMB2WXbuf retloc = wxSetlocale(LC_ALL, locale);
+
+    if ( !retloc )
+    {
+        // Some C libraries don't like xx_YY form and require xx only
+        retloc = wxSetlocale(LC_ALL, locale.Mid(0,2));
+    }
+    if ( !retloc )
+    {
+        wxLogError(wxT("Cannot set locale to '%s'."), locale.c_str());
+        return false;
+    }
+#else
+    wxUnusedVar(flags);
+    return false;
+    #define WX_NO_LOCALE_SUPPORT
+#endif
+
+#ifndef WX_NO_LOCALE_SUPPORT
+    wxChar *szLocale = retloc ? wxStrdup(retloc) : NULL;
+    bool ret = Init(name, canonical, szLocale,
+                    (flags & wxLOCALE_LOAD_DEFAULT) != 0,
+                    (flags & wxLOCALE_CONV_ENCODING) != 0);
+    free(szLocale);
+
+    if (IsOk()) // setlocale() succeeded
+        m_language = lang;
+
+    return ret;
+#endif // !WX_NO_LOCALE_SUPPORT
+}
+
+
+
+void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
+{
+    if ( gs_searchPrefixes.Index(prefix) == wxNOT_FOUND )
+    {
+        gs_searchPrefixes.Add(prefix);
+    }
+    //else: already have it
+}
+
+/*static*/ int wxLocale::GetSystemLanguage()
+{
+    CreateLanguagesDB();
+
+    // init i to avoid compiler warning
+    size_t i = 0,
+           count = ms_languagesDB->GetCount();
+
+#if defined(__UNIX__) && !defined(__WXMAC__)
+    // first get the string identifying the language from the environment
+    wxString langFull;
+    if (!wxGetEnv(wxT("LC_ALL"), &langFull) &&
+        !wxGetEnv(wxT("LC_MESSAGES"), &langFull) &&
+        !wxGetEnv(wxT("LANG"), &langFull))
+    {
+        // no language specified, treat it as English
+        return wxLANGUAGE_ENGLISH_US;
+    }
+
+    if ( langFull == _T("C") || langFull == _T("POSIX") )
+    {
+        // default C locale is English too
+        return wxLANGUAGE_ENGLISH_US;
+    }
+
+    // the language string has the following form
+    //
+    //      lang[_LANG][.encoding][@modifier]
+    //
+    // (see environ(5) in the Open Unix specification)
+    //
+    // where lang is the primary language, LANG is a sublang/territory,
+    // encoding is the charset to use and modifier "allows the user to select
+    // a specific instance of localization data within a single category"
+    //
+    // for example, the following strings are valid:
+    //      fr
+    //      fr_FR
+    //      de_DE.iso88591
+    //      de_DE@euro
+    //      de_DE.iso88591@euro
+
+    // for now we don't use the encoding, although we probably should (doing
+    // translations of the msg catalogs on the fly as required) (TODO)
+    //
+    // we need the modified for languages like Valencian: ca_ES@valencia
+    // though, remember it
+    wxString modifier;
+    size_t posModifier = langFull.find_first_of(_T("@"));
+    if ( posModifier != wxString::npos )
+        modifier = langFull.Mid(posModifier);
+
+    size_t posEndLang = langFull.find_first_of(_T("@."));
+    if ( posEndLang != wxString::npos )
+    {
+        langFull.Truncate(posEndLang);
+    }
+
+    // in addition to the format above, we also can have full language names
+    // in LANG env var - for example, SuSE is known to use LANG="german" - so
+    // check for this
+
+    // do we have just the language (or sublang too)?
+    bool justLang = langFull.length() == LEN_LANG;
+    if ( justLang ||
+         (langFull.length() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )
+    {
+        // 0. Make sure the lang is according to latest ISO 639
+        //    (this is necessary because glibc uses iw and in instead
+        //    of he and id respectively).
+
+        // the language itself (second part is the dialect/sublang)
+        wxString langOrig = ExtractLang(langFull);
+
+        wxString lang;
+        if ( langOrig == wxT("iw"))
+            lang = _T("he");
+        else if (langOrig == wxT("in"))
+            lang = wxT("id");
+        else if (langOrig == wxT("ji"))
+            lang = wxT("yi");
+        else if (langOrig == wxT("no_NO"))
+            lang = wxT("nb_NO");
+        else if (langOrig == wxT("no_NY"))
+            lang = wxT("nn_NO");
+        else if (langOrig == wxT("no"))
+            lang = wxT("nb_NO");
+        else
+            lang = langOrig;
+
+        // did we change it?
+        if ( lang != langOrig )
+        {
+            langFull = lang + ExtractNotLang(langFull);
+        }
+
+        // 1. Try to find the language either as is:
+        // a) With modifier if set
+        if ( !modifier.empty() )
+        {
+            wxString langFullWithModifier = langFull + modifier;
+            for ( i = 0; i < count; i++ )
+            {
+                if ( ms_languagesDB->Item(i).CanonicalName == langFullWithModifier )
+                    break;
+            }
+        }
+
+        // b) Without modifier
+        if ( modifier.empty() || i == count )
+        {
+            for ( i = 0; i < count; i++ )
+            {
+                if ( ms_languagesDB->Item(i).CanonicalName == langFull )
+                    break;
+            }
+        }
+
+        // 2. If langFull is of the form xx_YY, try to find xx:
+        if ( i == count && !justLang )
+        {
+            for ( i = 0; i < count; i++ )
+            {
+                if ( ms_languagesDB->Item(i).CanonicalName == lang )
+                {
+                    break;
+                }
+            }
+        }
+
+        // 3. If langFull is of the form xx, try to find any xx_YY record:
+        if ( i == count && justLang )
+        {
+            for ( i = 0; i < count; i++ )
+            {
+                if ( ExtractLang(ms_languagesDB->Item(i).CanonicalName)
+                        == langFull )
+                {
+                    break;
+                }
+            }
+        }
+    }
+    else // not standard format
+    {
+        // try to find the name in verbose description
+        for ( i = 0; i < count; i++ )
+        {
+            if (ms_languagesDB->Item(i).Description.CmpNoCase(langFull) == 0)
+            {
+                break;
+            }
+        }
+    }
+#elif defined(__WXMAC__)
+    const wxChar * lc = NULL ;
+    long lang = GetScriptVariable( smSystemScript, smScriptLang) ;
+    switch( GetScriptManagerVariable( smRegionCode ) ) {
+      case verUS :
+        lc = wxT("en_US") ;
+        break ;
+      case verFrance :
+        lc = wxT("fr_FR") ;
+        break ;
+      case verBritain :
+        lc = wxT("en_GB") ;
+        break ;
+      case verGermany :
+        lc = wxT("de_DE") ;
+        break ;
+      case verItaly :
+        lc = wxT("it_IT") ;
+        break ;
+      case verNetherlands :
+        lc = wxT("nl_NL") ;
+        break ;
+      case verFlemish :
+        lc = wxT("nl_BE") ;
+        break ;
+      case verSweden :
+        lc = wxT("sv_SE" );
+        break ;
+      case verSpain :
+        lc = wxT("es_ES" );
+        break ;
+      case verDenmark :
+        lc = wxT("da_DK") ;
+        break ;
+      case verPortugal :
+        lc = wxT("pt_PT") ;
+        break ;
+      case verFrCanada:
+        lc = wxT("fr_CA") ;
+        break ;
+      case verNorway:
+        lc = wxT("nb_NO") ;
+        break ;
+      case verIsrael:
+        lc = wxT("iw_IL") ;
+        break ;
+      case verJapan:
+        lc = wxT("ja_JP") ;
+        break ;
+      case verAustralia:
+        lc = wxT("en_AU") ;
+        break ;
+      case verArabic:
+        lc = wxT("ar") ;
+        break ;
+      case verFinland:
+        lc = wxT("fi_FI") ;
+        break ;
+      case verFrSwiss:
+        lc = wxT("fr_CH") ;
+        break ;
+      case verGrSwiss:
+        lc = wxT("de_CH") ;
+        break ;
+      case verGreece:
+        lc = wxT("el_GR") ;
+        break ;
+      case verIceland:
+        lc = wxT("is_IS") ;
+        break ;
+      case verMalta:
+        lc = wxT("mt_MT") ;
+        break ;
+      case verCyprus:
+      // _CY is not part of wx, so we have to translate according to the system language
+        if ( lang == langGreek ) {
+          lc = wxT("el_GR") ;
+        }
+        else if ( lang == langTurkish ) {
+          lc = wxT("tr_TR") ;
+        }
+        break ;
+      case verTurkey:
+        lc = wxT("tr_TR") ;
+        break ;
+      case verYugoCroatian:
+        lc = wxT("hr_HR") ;
+        break ;
+      case verIndiaHindi:
+        lc = wxT("hi_IN") ;
+        break ;
+      case verPakistanUrdu:
+        lc = wxT("ur_PK") ;
+        break ;
+      case verTurkishModified:
+        lc = wxT("tr_TR") ;
+        break ;
+      case verItalianSwiss:
+        lc = wxT("it_CH") ;
+        break ;
+      case verInternational:
+        lc = wxT("en") ;
+        break ;
+      case verRomania:
+        lc = wxT("ro_RO") ;
+        break ;
+      case verGreecePoly:
+        lc = wxT("el_GR") ;
+        break ;
+      case verLithuania:
+        lc = wxT("lt_LT") ;
+        break ;
+      case verPoland:
+        lc = wxT("pl_PL") ;
+        break ;
+      case verMagyar :
+      case verHungary:
+        lc = wxT("hu_HU") ;
+        break ;
+      case verEstonia:
+        lc = wxT("et_EE") ;
+        break ;
+      case verLatvia:
+        lc = wxT("lv_LV") ;
+        break ;
+      case verSami:
+        lc = wxT("se_NO") ;
+        break ;
+      case verFaroeIsl:
+        lc = wxT("fo_FO") ;
+        break ;
+      case verIran:
+        lc = wxT("fa_IR") ;
+        break ;
+      case verRussia:
+        lc = wxT("ru_RU") ;
+        break ;
+       case verIreland:
+        lc = wxT("ga_IE") ;
+        break ;
+      case verKorea:
+        lc = wxT("ko_KR") ;
+        break ;
+      case verChina:
+        lc = wxT("zh_CN") ;
+        break ;
+      case verTaiwan:
+        lc = wxT("zh_TW") ;
+        break ;
+      case verThailand:
+        lc = wxT("th_TH") ;
+        break ;
+      case verCzech:
+        lc = wxT("cs_CZ") ;
+        break ;
+      case verSlovak:
+        lc = wxT("sk_SK") ;
+        break ;
+      case verBengali:
+        lc = wxT("bn") ;
+        break ;
+      case verByeloRussian:
+        lc = wxT("be_BY") ;
+        break ;
+      case verUkraine:
+        lc = wxT("uk_UA") ;
+        break ;
+      case verGreeceAlt:
+        lc = wxT("el_GR") ;
+        break ;
+      case verSerbian:
+        lc = wxT("sr_YU") ;
+        break ;
+      case verSlovenian:
+        lc = wxT("sl_SI") ;
+        break ;
+      case verMacedonian:
+        lc = wxT("mk_MK") ;
+        break ;
+      case verCroatia:
+        lc = wxT("hr_HR") ;
+        break ;
+      case verBrazil:
+        lc = wxT("pt_BR ") ;
+        break ;
+      case verBulgaria:
+        lc = wxT("bg_BG") ;
+        break ;
+      case verCatalonia:
+        lc = wxT("ca_ES") ;
+        break ;
+      case verScottishGaelic:
+        lc = wxT("gd") ;
+        break ;
+      case verManxGaelic:
+        lc = wxT("gv") ;
+        break ;
+      case verBreton:
+        lc = wxT("br") ;
+        break ;
+      case verNunavut:
+        lc = wxT("iu_CA") ;
+        break ;
+      case verWelsh:
+        lc = wxT("cy") ;
+        break ;
+      case verIrishGaelicScript:
+        lc = wxT("ga_IE") ;
+        break ;
+      case verEngCanada:
+        lc = wxT("en_CA") ;
+        break ;
+      case verBhutan:
+        lc = wxT("dz_BT") ;
+        break ;
+      case verArmenian:
+        lc = wxT("hy_AM") ;
+        break ;
+      case verGeorgian:
+        lc = wxT("ka_GE") ;
+        break ;
+      case verSpLatinAmerica:
+        lc = wxT("es_AR") ;
+        break ;
+      case verTonga:
+        lc = wxT("to_TO" );
+        break ;
+      case verFrenchUniversal:
+        lc = wxT("fr_FR") ;
+        break ;
+      case verAustria:
+        lc = wxT("de_AT") ;
+        break ;
+      case verGujarati:
+        lc = wxT("gu_IN") ;
+        break ;
+      case verPunjabi:
+        lc = wxT("pa") ;
+        break ;
+      case verIndiaUrdu:
+        lc = wxT("ur_IN") ;
+        break ;
+      case verVietnam:
+        lc = wxT("vi_VN") ;
+        break ;
+      case verFrBelgium:
+        lc = wxT("fr_BE") ;
+        break ;
+      case verUzbek:
+        lc = wxT("uz_UZ") ;
+        break ;
+      case verSingapore:
+        lc = wxT("zh_SG") ;
+        break ;
+      case verNynorsk:
+        lc = wxT("nn_NO") ;
+        break ;
+      case verAfrikaans:
+        lc = wxT("af_ZA") ;
+        break ;
+      case verEsperanto:
+        lc = wxT("eo") ;
+        break ;
+      case verMarathi:
+        lc = wxT("mr_IN") ;
+        break ;
+      case verTibetan:
+        lc = wxT("bo") ;
+        break ;
+      case verNepal:
+        lc = wxT("ne_NP") ;
+        break ;
+      case verGreenland:
+        lc = wxT("kl_GL") ;
+        break ;
+      default :
+        break ;
+    }
+    if ( !lc )
+        return wxLANGUAGE_UNKNOWN;
+    for ( i = 0; i < count; i++ )
+    {
+        if ( ms_languagesDB->Item(i).CanonicalName == lc )
+        {
+            break;
+        }
+    }
+
+#elif defined(__WIN32__)
+    LCID lcid = GetUserDefaultLCID();
+    if ( lcid != 0 )
+    {
+        wxUint32 lang = PRIMARYLANGID(LANGIDFROMLCID(lcid));
+        wxUint32 sublang = SUBLANGID(LANGIDFROMLCID(lcid));
+
+        for ( i = 0; i < count; i++ )
+        {
+            if (ms_languagesDB->Item(i).WinLang == lang &&
+                ms_languagesDB->Item(i).WinSublang == sublang)
+            {
+                break;
+            }
+        }
+    }
+    //else: leave wxlang == wxLANGUAGE_UNKNOWN
+#endif // Unix/Win32
+
+    if ( i < count )
+    {
+        // we did find a matching entry, use it
+        return ms_languagesDB->Item(i).Language;
+    }
+
+    // no info about this language in the database
+    return wxLANGUAGE_UNKNOWN;
+}
+
+// ----------------------------------------------------------------------------
+// encoding stuff
+// ----------------------------------------------------------------------------
+
+// this is a bit strange as under Windows we get the encoding name using its
+// numeric value and under Unix we do it the other way round, but this just
+// reflects the way different systems provide the encoding info
+
+/* static */
+wxString wxLocale::GetSystemEncodingName()
+{
+    wxString encname;
+
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    // FIXME: what is the error return value for GetACP()?
+    UINT codepage = ::GetACP();
+    encname.Printf(_T("windows-%u"), codepage);
+#elif defined(__WXMAC__)
+    // default is just empty string, this resolves to the default system
+    // encoding later
+#elif defined(__UNIX_LIKE__)
+
+#if defined(HAVE_LANGINFO_H) && defined(CODESET)
+    // GNU libc provides current character set this way (this conforms
+    // to Unix98)
+    char *oldLocale = strdup(setlocale(LC_CTYPE, NULL));
+    setlocale(LC_CTYPE, "");
+    const char *alang = nl_langinfo(CODESET);
+    setlocale(LC_CTYPE, oldLocale);
+    free(oldLocale);
+
+    if ( alang )
+    {
+        encname = wxString::FromAscii( alang );
+    }
+    else // nl_langinfo() failed
+#endif // HAVE_LANGINFO_H
+    {
+        // if we can't get at the character set directly, try to see if it's in
+        // the environment variables (in most cases this won't work, but I was
+        // out of ideas)
+        char *lang = getenv( "LC_ALL");
+        char *dot = lang ? strchr(lang, '.') : (char *)NULL;
+        if (!dot)
+        {
+            lang = getenv( "LC_CTYPE" );
+            if ( lang )
+                dot = strchr(lang, '.' );
+        }
+        if (!dot)
+        {
+            lang = getenv( "LANG");
+            if ( lang )
+                dot = strchr(lang, '.');
+        }
+
+        if ( dot )
+        {
+            encname = wxString::FromAscii( dot+1 );
+        }
+    }
+#endif // Win32/Unix
+
+    return encname;
+}
+
+/* static */
+wxFontEncoding wxLocale::GetSystemEncoding()
+{
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    UINT codepage = ::GetACP();
+
+    // wxWidgets only knows about CP1250-1257, 874, 932, 936, 949, 950
+    if ( codepage >= 1250 && codepage <= 1257 )
+    {
+        return (wxFontEncoding)(wxFONTENCODING_CP1250 + codepage - 1250);
+    }
+
+    if ( codepage == 874 )
+    {
+        return wxFONTENCODING_CP874;
+    }
+
+    if ( codepage == 932 )
+    {
+        return wxFONTENCODING_CP932;
+    }
+
+    if ( codepage == 936 )
+    {
+        return wxFONTENCODING_CP936;
+    }
+
+    if ( codepage == 949 )
+    {
+        return wxFONTENCODING_CP949;
+    }
+
+    if ( codepage == 950 )
+    {
+        return wxFONTENCODING_CP950;
+    }
+#elif defined(__WXMAC__)
+    TextEncoding encoding = 0 ;
+#if TARGET_CARBON
+    encoding = CFStringGetSystemEncoding() ;
+#else
+    UpgradeScriptInfoToTextEncoding ( smSystemScript , kTextLanguageDontCare , kTextRegionDontCare , NULL , &encoding ) ;
+#endif
+    return wxMacGetFontEncFromSystemEnc( encoding ) ;
+#elif defined(__UNIX_LIKE__) && wxUSE_FONTMAP
+    const wxString encname = GetSystemEncodingName();
+    if ( !encname.empty() )
+    {
+        wxFontEncoding enc = wxFontMapperBase::GetEncodingFromName(encname);
+
+        // on some modern Linux systems (RedHat 8) the default system locale
+        // is UTF8 -- but it isn't supported by wxGTK1 in ANSI build at all so
+        // don't even try to use it in this case
+#if !wxUSE_UNICODE && \
+        ((defined(__WXGTK__) && !defined(__WXGTK20__)) || defined(__WXMOTIF__))
+        if ( enc == wxFONTENCODING_UTF8 )
+        {
+            // the most similar supported encoding...
+            enc = wxFONTENCODING_ISO8859_1;
+        }
+#endif // !wxUSE_UNICODE
+
+        // GetEncodingFromName() returns wxFONTENCODING_DEFAULT for C locale
+        // (a.k.a. US-ASCII) which is arguably a bug but keep it like this for
+        // backwards compatibility and just take care to not return
+        // wxFONTENCODING_DEFAULT from here as this surely doesn't make sense
+        if ( enc == wxFONTENCODING_DEFAULT )
+        {
+            // we don't have wxFONTENCODING_ASCII, so use the closest one
+            return wxFONTENCODING_ISO8859_1;
+        }
+
+        if ( enc != wxFONTENCODING_MAX )
+        {
+            return enc;
+        }
+        //else: return wxFONTENCODING_SYSTEM below
+    }
+#endif // Win32/Unix
+
+    return wxFONTENCODING_SYSTEM;
+}
+
+/* static */
+void wxLocale::AddLanguage(const wxLanguageInfo& info)
+{
+    CreateLanguagesDB();
+    ms_languagesDB->Add(info);
+}
+
+/* static */
+const wxLanguageInfo *wxLocale::GetLanguageInfo(int lang)
+{
+    CreateLanguagesDB();
+
+    // calling GetLanguageInfo(wxLANGUAGE_DEFAULT) is a natural thing to do, so
+    // make it work
+    if ( lang == wxLANGUAGE_DEFAULT )
+        lang = GetSystemLanguage();
+
+    const size_t count = ms_languagesDB->GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        if ( ms_languagesDB->Item(i).Language == lang )
+        {
+            // We need to create a temporary here in order to make this work with BCC in final build mode
+            wxLanguageInfo *ptr = &ms_languagesDB->Item(i);
+            return ptr;
+        }
+    }
+
+    return NULL;
+}
+
+/* static */
+wxString wxLocale::GetLanguageName(int lang)
+{
+    const wxLanguageInfo *info = GetLanguageInfo(lang);
+    if ( !info )
+        return wxEmptyString;
+    else
+        return info->Description;
+}
+
+/* static */
+const wxLanguageInfo *wxLocale::FindLanguageInfo(const wxString& locale)
+{
+    CreateLanguagesDB();
+
+    const wxLanguageInfo *infoRet = NULL;
+
+    const size_t count = ms_languagesDB->GetCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        const wxLanguageInfo *info = &ms_languagesDB->Item(i);
+
+        if ( wxStricmp(locale, info->CanonicalName) == 0 ||
+                wxStricmp(locale, info->Description) == 0 )
+        {
+            // exact match, stop searching
+            infoRet = info;
+            break;
+        }
+
+        if ( wxStricmp(locale, info->CanonicalName.BeforeFirst(_T('_'))) == 0 )
+        {
+            // a match -- but maybe we'll find an exact one later, so continue
+            // looking
+            //
+            // OTOH, maybe we had already found a language match and in this
+            // case don't overwrite it becauce the entry for the default
+            // country always appears first in ms_languagesDB
+            if ( !infoRet )
+                infoRet = info;
+        }
+    }
+
+    return infoRet;
+}
+
+wxString wxLocale::GetSysName() const
+{
+            // FIXME
+#ifndef __WXWINCE__
+    return wxSetlocale(LC_ALL, NULL);
+#else
+    return wxEmptyString;
+#endif
+}
+
+// clean up
+wxLocale::~wxLocale()
+{
+    // free memory
+    wxMsgCatalog *pTmpCat;
+    while ( m_pMsgCat != NULL ) {
+        pTmpCat = m_pMsgCat;
+        m_pMsgCat = m_pMsgCat->m_pNext;
+        delete pTmpCat;
+    }
+
+    // restore old locale pointer
+    wxSetLocale(m_pOldLocale);
+
+    // FIXME
+#ifndef __WXWINCE__
+    wxSetlocale(LC_ALL, m_pszOldLocale);
+#endif
+    free((wxChar *)m_pszOldLocale);     // const_cast
+}
+
+// get the translation of given string in current locale
+const wxChar *wxLocale::GetString(const wxChar *szOrigString,
+                                  const wxChar *szDomain) const
+{
+    return GetString(szOrigString, szOrigString, size_t(-1), szDomain);
+}
+
+const wxChar *wxLocale::GetString(const wxChar *szOrigString,
+                                  const wxChar *szOrigString2,
+                                  size_t n,
+                                  const wxChar *szDomain) const
+{
+    if ( wxIsEmpty(szOrigString) )
+        return wxEmptyString;
+
+    const wxChar *pszTrans = NULL;
+    wxMsgCatalog *pMsgCat;
+
+    if ( szDomain != NULL && szDomain[0] )
+    {
+        pMsgCat = FindCatalog(szDomain);
+
+        // does the catalog exist?
+        if ( pMsgCat != NULL )
+            pszTrans = pMsgCat->GetString(szOrigString, n);
+    }
+    else
+    {
+        // search in all domains
+        for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
+        {
+            pszTrans = pMsgCat->GetString(szOrigString, n);
+            if ( pszTrans != NULL )   // take the first found
+                break;
+        }
+    }
+
+    if ( pszTrans == NULL )
+    {
+#ifdef __WXDEBUG__
+        if ( !NoTransErr::Suppress() )
+        {
+            NoTransErr noTransErr;
+
+            wxLogTrace(TRACE_I18N,
+                       _T("string \"%s\"[%ld] not found in %slocale '%s'."),
+                       szOrigString, (long)n,
+                       szDomain ? wxString::Format(_T("domain '%s' "), szDomain).c_str()
+                                : _T(""),
+                       m_strLocale.c_str());
+        }
+#endif // __WXDEBUG__
+
+        if (n == size_t(-1))
+            return szOrigString;
+        else
+            return n == 1 ? szOrigString : szOrigString2;
+    }
+
+    return pszTrans;
+}
+
+wxString wxLocale::GetHeaderValue( const wxChar* szHeader,
+                                   const wxChar* szDomain ) const
+{
+    if ( wxIsEmpty(szHeader) )
+        return wxEmptyString;
+
+    wxChar const * pszTrans = NULL;
+    wxMsgCatalog *pMsgCat;
+
+    if ( szDomain != NULL )
+    {
+        pMsgCat = FindCatalog(szDomain);
+
+        // does the catalog exist?
+        if ( pMsgCat == NULL )
+            return wxEmptyString;
+
+        pszTrans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
+    }
+    else
+    {
+        // search in all domains
+        for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
+        {
+            pszTrans = pMsgCat->GetString(wxEmptyString, (size_t)-1);
+            if ( pszTrans != NULL )   // take the first found
+                break;
+        }
+    }
+
+    if ( wxIsEmpty(pszTrans) )
+      return wxEmptyString;
+
+    wxChar const * pszFound = wxStrstr(pszTrans, szHeader);
+    if ( pszFound == NULL )
+      return wxEmptyString;
+
+    pszFound += wxStrlen(szHeader) + 2 /* ': ' */;
+
+    // Every header is separated by \n
+
+    wxChar const * pszEndLine = wxStrchr(pszFound, wxT('\n'));
+    if ( pszEndLine == NULL ) pszEndLine = pszFound + wxStrlen(pszFound);
+
+
+    // wxString( wxChar*, length);
+    wxString retVal( pszFound, pszEndLine - pszFound );
+
+    return retVal;
+}
+
+
+// find catalog by name in a linked list, return NULL if !found
+wxMsgCatalog *wxLocale::FindCatalog(const wxChar *szDomain) const
+{
+    // linear search in the linked list
+    wxMsgCatalog *pMsgCat;
+    for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
+    {
+        if ( wxStricmp(pMsgCat->GetName(), szDomain) == 0 )
+          return pMsgCat;
+    }
+
+    return NULL;
+}
+
+// check if the given locale is provided by OS and C run time
+/* static */
+bool wxLocale::IsAvailable(int lang)
+{
+    const wxLanguageInfo *info = wxLocale::GetLanguageInfo(lang);
+    wxCHECK_MSG( info, false, _T("invalid language") );
+
+#if defined(__WIN32__)
+    if ( !info->WinLang )
+        return false;
+
+    if ( !::IsValidLocale
+            (
+                MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
+                         SORT_DEFAULT),
+                LCID_INSTALLED
+            ) )
+        return false;
+
+#elif defined(__UNIX__)
+
+    // Test if setting the locale works, then set it back.
+    wxMB2WXbuf oldLocale = wxSetlocale(LC_ALL, wxEmptyString);
+    wxMB2WXbuf tmp = wxSetlocaleTryUTF(LC_ALL, info->CanonicalName);
+    if ( !tmp )
+    {
+        // Some C libraries don't like xx_YY form and require xx only
+        tmp = wxSetlocaleTryUTF(LC_ALL, info->CanonicalName.Left(2));
+        if ( !tmp )
+            return false;
+    }
+    // restore the original locale
+    wxSetlocale(LC_ALL, oldLocale);
+#endif
+
+    return true;
+}
+
+// check if the given catalog is loaded
+bool wxLocale::IsLoaded(const wxChar *szDomain) const
+{
+  return FindCatalog(szDomain) != NULL;
+}
+
+// add a catalog to our linked list
+bool wxLocale::AddCatalog(const wxChar *szDomain)
+{
+    return AddCatalog(szDomain, wxLANGUAGE_ENGLISH_US, NULL);
+}
+
+// add a catalog to our linked list
+bool wxLocale::AddCatalog(const wxChar *szDomain,
+                          wxLanguage    msgIdLanguage,
+                          const wxChar *msgIdCharset)
+
+{
+  wxMsgCatalog *pMsgCat = new wxMsgCatalog;
+
+  if ( pMsgCat->Load(m_strShort, szDomain, msgIdCharset, m_bConvertEncoding) ) {
+    // add it to the head of the list so that in GetString it will
+    // be searched before the catalogs added earlier
+    pMsgCat->m_pNext = m_pMsgCat;
+    m_pMsgCat = pMsgCat;
+
+    return true;
+  }
+  else {
+    // don't add it because it couldn't be loaded anyway
+    delete pMsgCat;
+
+    // It is OK to not load catalog if the msgid language and m_language match,
+    // in which case we can directly display the texts embedded in program's
+    // source code:
+    if (m_language == msgIdLanguage)
+        return true;
+
+    // If there's no exact match, we may still get partial match where the
+    // (basic) language is same, but the country differs. For example, it's
+    // permitted to use en_US strings from sources even if m_language is en_GB:
+    const wxLanguageInfo *msgIdLangInfo = GetLanguageInfo(msgIdLanguage);
+    if ( msgIdLangInfo &&
+         msgIdLangInfo->CanonicalName.Mid(0, 2) == m_strShort.Mid(0, 2) )
+    {
+        return true;
+    }
+
+    return false;
+  }
+}
+
+// ----------------------------------------------------------------------------
+// accessors for locale-dependent data
+// ----------------------------------------------------------------------------
+
+#ifdef __WXMSW__
+
+/* static */
+wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
+{
+    wxUint32 lcid = LOCALE_USER_DEFAULT;
+
+    if (wxGetLocale())
+    {
+        const wxLanguageInfo *info = GetLanguageInfo(wxGetLocale()->GetLanguage());
+        if (info)
+        {                         ;
+            lcid = MAKELCID(MAKELANGID(info->WinLang, info->WinSublang),
+                                     SORT_DEFAULT);
+        }
+    }
+
+    wxString str;
+    wxChar buffer[256];
+    size_t count;
+    buffer[0] = wxT('\0');
+    switch (index)
+    {
+        case wxLOCALE_DECIMAL_POINT:
+            count = ::GetLocaleInfo(lcid, LOCALE_SDECIMAL, buffer, 256);
+            if (!count)
+                str << wxT(".");
+            else
+                str << buffer;
+            break;
+#if 0
+        case wxSYS_LIST_SEPARATOR:
+            count = ::GetLocaleInfo(lcid, LOCALE_SLIST, buffer, 256);
+            if (!count)
+                str << wxT(",");
+            else
+                str << buffer;
+            break;
+        case wxSYS_LEADING_ZERO: // 0 means no leading zero, 1 means leading zero
+            count = ::GetLocaleInfo(lcid, LOCALE_ILZERO, buffer, 256);
+            if (!count)
+                str << wxT("0");
+            else
+                str << buffer;
+            break;
+#endif
+        default:
+            wxFAIL_MSG(wxT("Unknown System String !"));
+    }
+    return str;
+}
+
+#elif defined(__DARWIN__)
+
+/* static */
+wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory WXUNUSED(cat))
+{
+    CFLocaleRef userLocaleRefRaw;
+    if ( wxGetLocale() )
+    {
+        userLocaleRefRaw = CFLocaleCreate
+                           (
+                                kCFAllocatorDefault,
+                                wxMacCFStringHolder(wxGetLocale()->GetCanonicalName())
+                           );
+    }
+    else // no current locale, use the default one
+    {
+        userLocaleRefRaw = CFLocaleCopyCurrent();
+    }
+
+    wxCFRef<CFLocaleRef> userLocaleRef(userLocaleRefRaw);
+
+    CFTypeRef cfstr;
+    switch ( index )
+    {
+        case wxLOCALE_THOUSANDS_SEP:
+            cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleGroupingSeparator);
+            break;
+
+        case wxLOCALE_DECIMAL_POINT:
+            cfstr = CFLocaleGetValue(userLocaleRef, kCFLocaleDecimalSeparator);
+            break;
+
+        default:
+            wxFAIL_MSG( _T("Unknown locale info") );
+    }
+
+    wxMacCFStringHolder
+        str(CFStringCreateCopy(NULL, static_cast<CFStringRef>(cfstr)));
+    return str.AsString();
+}
+
+#else // !__WXMSW__ && !__DARWIN__
+
+/* static */
+wxString wxLocale::GetInfo(wxLocaleInfo index, wxLocaleCategory cat)
+{
+    struct lconv *locale_info = localeconv();
+    switch (cat)
+    {
+        case wxLOCALE_CAT_NUMBER:
+            switch (index)
+            {
+                case wxLOCALE_THOUSANDS_SEP:
+                    return wxString(locale_info->thousands_sep,
+                                    *wxConvCurrent);
+                case wxLOCALE_DECIMAL_POINT:
+                    return wxString(locale_info->decimal_point,
+                                    *wxConvCurrent);
+                default:
+                    return wxEmptyString;
+            }
+        case wxLOCALE_CAT_MONEY:
+            switch (index)
+            {
+                case wxLOCALE_THOUSANDS_SEP:
+                    return wxString(locale_info->mon_thousands_sep,
+                                    *wxConvCurrent);
+                case wxLOCALE_DECIMAL_POINT:
+                    return wxString(locale_info->mon_decimal_point,
+                                    *wxConvCurrent);
+                default:
+                    return wxEmptyString;
+            }
+        default:
+            return wxEmptyString;
+    }
+}
+
+#endif // __WXMSW__/!__WXMSW__
+
+// ----------------------------------------------------------------------------
+// global functions and variables
+// ----------------------------------------------------------------------------
+
+// retrieve/change current locale
+// ------------------------------
+
+// the current locale object
+static wxLocale *g_pLocale = NULL;
+
+wxLocale *wxGetLocale()
+{
+  return g_pLocale;
+}
+
+wxLocale *wxSetLocale(wxLocale *pLocale)
+{
+  wxLocale *pOld = g_pLocale;
+  g_pLocale = pLocale;
+  return pOld;
+}
+
+
+
+// ----------------------------------------------------------------------------
+// wxLocale module (for lazy destruction of languagesDB)
+// ----------------------------------------------------------------------------
+
+class wxLocaleModule: public wxModule
+{
+    DECLARE_DYNAMIC_CLASS(wxLocaleModule)
+    public:
+        wxLocaleModule() {}
+        bool OnInit() { return true; }
+        void OnExit() { wxLocale::DestroyLanguagesDB(); }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxLocaleModule, wxModule)
+
+
+
+// ----------------------------------------------------------------------------
+// default languages table & initialization
+// ----------------------------------------------------------------------------
+
+
+
+// --- --- --- generated code begins here --- --- ---
+
+// This table is generated by misc/languages/genlang.py
+// When making changes, please put them into misc/languages/langtabl.txt
+
+#if !defined(__WIN32__) || defined(__WXMICROWIN__)
+
+#define SETWINLANG(info,lang,sublang)
+
+#else
+
+#define SETWINLANG(info,lang,sublang) \
+    info.WinLang = lang, info.WinSublang = sublang;
+
+#ifndef LANG_AFRIKAANS
+#define LANG_AFRIKAANS (0)
+#endif
+#ifndef LANG_ALBANIAN
+#define LANG_ALBANIAN (0)
+#endif
+#ifndef LANG_ARABIC
+#define LANG_ARABIC (0)
+#endif
+#ifndef LANG_ARMENIAN
+#define LANG_ARMENIAN (0)
+#endif
+#ifndef LANG_ASSAMESE
+#define LANG_ASSAMESE (0)
+#endif
+#ifndef LANG_AZERI
+#define LANG_AZERI (0)
+#endif
+#ifndef LANG_BASQUE
+#define LANG_BASQUE (0)
+#endif
+#ifndef LANG_BELARUSIAN
+#define LANG_BELARUSIAN (0)
+#endif
+#ifndef LANG_BENGALI
+#define LANG_BENGALI (0)
+#endif
+#ifndef LANG_BULGARIAN
+#define LANG_BULGARIAN (0)
+#endif
+#ifndef LANG_CATALAN
+#define LANG_CATALAN (0)
+#endif
+#ifndef LANG_CHINESE
+#define LANG_CHINESE (0)
+#endif
+#ifndef LANG_CROATIAN
+#define LANG_CROATIAN (0)
+#endif
+#ifndef LANG_CZECH
+#define LANG_CZECH (0)
+#endif
+#ifndef LANG_DANISH
+#define LANG_DANISH (0)
+#endif
+#ifndef LANG_DUTCH
+#define LANG_DUTCH (0)
+#endif
+#ifndef LANG_ENGLISH
+#define LANG_ENGLISH (0)
+#endif
+#ifndef LANG_ESTONIAN
+#define LANG_ESTONIAN (0)
+#endif
+#ifndef LANG_FAEROESE
+#define LANG_FAEROESE (0)
+#endif
+#ifndef LANG_FARSI
+#define LANG_FARSI (0)
+#endif
+#ifndef LANG_FINNISH
+#define LANG_FINNISH (0)
+#endif
+#ifndef LANG_FRENCH
+#define LANG_FRENCH (0)
+#endif
+#ifndef LANG_GEORGIAN
+#define LANG_GEORGIAN (0)
+#endif
+#ifndef LANG_GERMAN
+#define LANG_GERMAN (0)
+#endif
+#ifndef LANG_GREEK
+#define LANG_GREEK (0)
+#endif
+#ifndef LANG_GUJARATI
+#define LANG_GUJARATI (0)
+#endif
+#ifndef LANG_HEBREW
+#define LANG_HEBREW (0)
+#endif
+#ifndef LANG_HINDI
+#define LANG_HINDI (0)
+#endif
+#ifndef LANG_HUNGARIAN
+#define LANG_HUNGARIAN (0)
+#endif
+#ifndef LANG_ICELANDIC
+#define LANG_ICELANDIC (0)
+#endif
+#ifndef LANG_INDONESIAN
+#define LANG_INDONESIAN (0)
+#endif
+#ifndef LANG_ITALIAN
+#define LANG_ITALIAN (0)
+#endif
+#ifndef LANG_JAPANESE
+#define LANG_JAPANESE (0)
+#endif
+#ifndef LANG_KANNADA
+#define LANG_KANNADA (0)
+#endif
+#ifndef LANG_KASHMIRI
+#define LANG_KASHMIRI (0)
+#endif
+#ifndef LANG_KAZAK
+#define LANG_KAZAK (0)
+#endif
+#ifndef LANG_KONKANI
+#define LANG_KONKANI (0)
+#endif
+#ifndef LANG_KOREAN
+#define LANG_KOREAN (0)
+#endif
+#ifndef LANG_LATVIAN
+#define LANG_LATVIAN (0)
+#endif
+#ifndef LANG_LITHUANIAN
+#define LANG_LITHUANIAN (0)
+#endif
+#ifndef LANG_MACEDONIAN
+#define LANG_MACEDONIAN (0)
+#endif
+#ifndef LANG_MALAY
+#define LANG_MALAY (0)
+#endif
+#ifndef LANG_MALAYALAM
+#define LANG_MALAYALAM (0)
+#endif
+#ifndef LANG_MANIPURI
+#define LANG_MANIPURI (0)
+#endif
+#ifndef LANG_MARATHI
+#define LANG_MARATHI (0)
+#endif
+#ifndef LANG_NEPALI
+#define LANG_NEPALI (0)
+#endif
+#ifndef LANG_NORWEGIAN
+#define LANG_NORWEGIAN (0)
+#endif
+#ifndef LANG_ORIYA
+#define LANG_ORIYA (0)
+#endif
+#ifndef LANG_POLISH
+#define LANG_POLISH (0)
+#endif
+#ifndef LANG_PORTUGUESE
+#define LANG_PORTUGUESE (0)
+#endif
+#ifndef LANG_PUNJABI
+#define LANG_PUNJABI (0)
+#endif
+#ifndef LANG_ROMANIAN
+#define LANG_ROMANIAN (0)
+#endif
+#ifndef LANG_RUSSIAN
+#define LANG_RUSSIAN (0)
+#endif
+#ifndef LANG_SAMI
+#define LANG_SAMI (0)
+#endif
+#ifndef LANG_SANSKRIT
+#define LANG_SANSKRIT (0)
+#endif
+#ifndef LANG_SERBIAN
+#define LANG_SERBIAN (0)
+#endif
+#ifndef LANG_SINDHI
+#define LANG_SINDHI (0)
+#endif
+#ifndef LANG_SLOVAK
+#define LANG_SLOVAK (0)
+#endif
+#ifndef LANG_SLOVENIAN
+#define LANG_SLOVENIAN (0)
+#endif
+#ifndef LANG_SPANISH
+#define LANG_SPANISH (0)
+#endif
+#ifndef LANG_SWAHILI
+#define LANG_SWAHILI (0)
+#endif
+#ifndef LANG_SWEDISH
+#define LANG_SWEDISH (0)
+#endif
+#ifndef LANG_TAMIL
+#define LANG_TAMIL (0)
+#endif
+#ifndef LANG_TATAR
+#define LANG_TATAR (0)
+#endif
+#ifndef LANG_TELUGU
+#define LANG_TELUGU (0)
+#endif
+#ifndef LANG_THAI
+#define LANG_THAI (0)
+#endif
+#ifndef LANG_TURKISH
+#define LANG_TURKISH (0)
+#endif
+#ifndef LANG_UKRAINIAN
+#define LANG_UKRAINIAN (0)
+#endif
+#ifndef LANG_URDU
+#define LANG_URDU (0)
+#endif
+#ifndef LANG_UZBEK
+#define LANG_UZBEK (0)
+#endif
+#ifndef LANG_VALENCIAN
+#define LANG_VALENCIAN (0)
+#endif
+#ifndef LANG_VIETNAMESE
+#define LANG_VIETNAMESE (0)
+#endif
+#ifndef SUBLANG_ARABIC_ALGERIA
+#define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_BAHRAIN
+#define SUBLANG_ARABIC_BAHRAIN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_EGYPT
+#define SUBLANG_ARABIC_EGYPT SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_IRAQ
+#define SUBLANG_ARABIC_IRAQ SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_JORDAN
+#define SUBLANG_ARABIC_JORDAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_KUWAIT
+#define SUBLANG_ARABIC_KUWAIT SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_LEBANON
+#define SUBLANG_ARABIC_LEBANON SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_LIBYA
+#define SUBLANG_ARABIC_LIBYA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_MOROCCO
+#define SUBLANG_ARABIC_MOROCCO SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_OMAN
+#define SUBLANG_ARABIC_OMAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_QATAR
+#define SUBLANG_ARABIC_QATAR SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_SAUDI_ARABIA
+#define SUBLANG_ARABIC_SAUDI_ARABIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_SYRIA
+#define SUBLANG_ARABIC_SYRIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_TUNISIA
+#define SUBLANG_ARABIC_TUNISIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_UAE
+#define SUBLANG_ARABIC_UAE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ARABIC_YEMEN
+#define SUBLANG_ARABIC_YEMEN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_AZERI_CYRILLIC
+#define SUBLANG_AZERI_CYRILLIC SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_AZERI_LATIN
+#define SUBLANG_AZERI_LATIN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_SIMPLIFIED
+#define SUBLANG_CHINESE_SIMPLIFIED SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_TRADITIONAL
+#define SUBLANG_CHINESE_TRADITIONAL SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_HONGKONG
+#define SUBLANG_CHINESE_HONGKONG SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_MACAU
+#define SUBLANG_CHINESE_MACAU SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_CHINESE_SINGAPORE
+#define SUBLANG_CHINESE_SINGAPORE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_DUTCH
+#define SUBLANG_DUTCH SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_DUTCH_BELGIAN
+#define SUBLANG_DUTCH_BELGIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_UK
+#define SUBLANG_ENGLISH_UK SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_US
+#define SUBLANG_ENGLISH_US SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_AUS
+#define SUBLANG_ENGLISH_AUS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_BELIZE
+#define SUBLANG_ENGLISH_BELIZE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_CAN
+#define SUBLANG_ENGLISH_CAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_CARIBBEAN
+#define SUBLANG_ENGLISH_CARIBBEAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_EIRE
+#define SUBLANG_ENGLISH_EIRE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_JAMAICA
+#define SUBLANG_ENGLISH_JAMAICA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_NZ
+#define SUBLANG_ENGLISH_NZ SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_PHILIPPINES
+#define SUBLANG_ENGLISH_PHILIPPINES SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
+#define SUBLANG_ENGLISH_SOUTH_AFRICA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_TRINIDAD
+#define SUBLANG_ENGLISH_TRINIDAD SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ENGLISH_ZIMBABWE
+#define SUBLANG_ENGLISH_ZIMBABWE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH
+#define SUBLANG_FRENCH SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_BELGIAN
+#define SUBLANG_FRENCH_BELGIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_CANADIAN
+#define SUBLANG_FRENCH_CANADIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_LUXEMBOURG
+#define SUBLANG_FRENCH_LUXEMBOURG SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_MONACO
+#define SUBLANG_FRENCH_MONACO SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_FRENCH_SWISS
+#define SUBLANG_FRENCH_SWISS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN
+#define SUBLANG_GERMAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN_AUSTRIAN
+#define SUBLANG_GERMAN_AUSTRIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN_LIECHTENSTEIN
+#define SUBLANG_GERMAN_LIECHTENSTEIN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN_LUXEMBOURG
+#define SUBLANG_GERMAN_LUXEMBOURG SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_GERMAN_SWISS
+#define SUBLANG_GERMAN_SWISS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ITALIAN
+#define SUBLANG_ITALIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_ITALIAN_SWISS
+#define SUBLANG_ITALIAN_SWISS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_KASHMIRI_INDIA
+#define SUBLANG_KASHMIRI_INDIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_KOREAN
+#define SUBLANG_KOREAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_LITHUANIAN
+#define SUBLANG_LITHUANIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
+#define SUBLANG_MALAY_BRUNEI_DARUSSALAM SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_MALAY_MALAYSIA
+#define SUBLANG_MALAY_MALAYSIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_NEPALI_INDIA
+#define SUBLANG_NEPALI_INDIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_NORWEGIAN_BOKMAL
+#define SUBLANG_NORWEGIAN_BOKMAL SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_NORWEGIAN_NYNORSK
+#define SUBLANG_NORWEGIAN_NYNORSK SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_PORTUGUESE
+#define SUBLANG_PORTUGUESE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_PORTUGUESE_BRAZILIAN
+#define SUBLANG_PORTUGUESE_BRAZILIAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SERBIAN_CYRILLIC
+#define SUBLANG_SERBIAN_CYRILLIC SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SERBIAN_LATIN
+#define SUBLANG_SERBIAN_LATIN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH
+#define SUBLANG_SPANISH SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_ARGENTINA
+#define SUBLANG_SPANISH_ARGENTINA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_BOLIVIA
+#define SUBLANG_SPANISH_BOLIVIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_CHILE
+#define SUBLANG_SPANISH_CHILE SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_COLOMBIA
+#define SUBLANG_SPANISH_COLOMBIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_COSTA_RICA
+#define SUBLANG_SPANISH_COSTA_RICA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
+#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_ECUADOR
+#define SUBLANG_SPANISH_ECUADOR SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_EL_SALVADOR
+#define SUBLANG_SPANISH_EL_SALVADOR SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_GUATEMALA
+#define SUBLANG_SPANISH_GUATEMALA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_HONDURAS
+#define SUBLANG_SPANISH_HONDURAS SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_MEXICAN
+#define SUBLANG_SPANISH_MEXICAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_MODERN
+#define SUBLANG_SPANISH_MODERN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_NICARAGUA
+#define SUBLANG_SPANISH_NICARAGUA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_PANAMA
+#define SUBLANG_SPANISH_PANAMA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_PARAGUAY
+#define SUBLANG_SPANISH_PARAGUAY SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_PERU
+#define SUBLANG_SPANISH_PERU SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_PUERTO_RICO
+#define SUBLANG_SPANISH_PUERTO_RICO SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_URUGUAY
+#define SUBLANG_SPANISH_URUGUAY SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SPANISH_VENEZUELA
+#define SUBLANG_SPANISH_VENEZUELA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SWEDISH
+#define SUBLANG_SWEDISH SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_SWEDISH_FINLAND
+#define SUBLANG_SWEDISH_FINLAND SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_URDU_INDIA
+#define SUBLANG_URDU_INDIA SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_URDU_PAKISTAN
+#define SUBLANG_URDU_PAKISTAN SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_UZBEK_CYRILLIC
+#define SUBLANG_UZBEK_CYRILLIC SUBLANG_DEFAULT
+#endif
+#ifndef SUBLANG_UZBEK_LATIN
+#define SUBLANG_UZBEK_LATIN SUBLANG_DEFAULT
+#endif
+
+
+#endif // __WIN32__
+
+#define LNG(wxlang, canonical, winlang, winsublang, layout, desc) \
+    info.Language = wxlang;                               \
+    info.CanonicalName = wxT(canonical);                  \
+    info.LayoutDirection = layout;                        \
+    info.Description = wxT(desc);                         \
+    SETWINLANG(info, winlang, winsublang)                 \
+    AddLanguage(info);
+
+void wxLocale::InitLanguagesDB()
+{
+   wxLanguageInfo info;
+   wxStringTokenizer tkn;
+
+   LNG(wxLANGUAGE_ABKHAZIAN,                  "ab"   , 0              , 0                                 , wxLayout_LeftToRight, "Abkhazian")
+   LNG(wxLANGUAGE_AFAR,                       "aa"   , 0              , 0                                 , wxLayout_LeftToRight, "Afar")
+   LNG(wxLANGUAGE_AFRIKAANS,                  "af_ZA", LANG_AFRIKAANS , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Afrikaans")
+   LNG(wxLANGUAGE_ALBANIAN,                   "sq_AL", LANG_ALBANIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Albanian")
+   LNG(wxLANGUAGE_AMHARIC,                    "am"   , 0              , 0                                 , wxLayout_LeftToRight, "Amharic")
+   LNG(wxLANGUAGE_ARABIC,                     "ar"   , LANG_ARABIC    , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Arabic")
+   LNG(wxLANGUAGE_ARABIC_ALGERIA,             "ar_DZ", LANG_ARABIC    , SUBLANG_ARABIC_ALGERIA            , wxLayout_RightToLeft, "Arabic (Algeria)")
+   LNG(wxLANGUAGE_ARABIC_BAHRAIN,             "ar_BH", LANG_ARABIC    , SUBLANG_ARABIC_BAHRAIN            , wxLayout_RightToLeft, "Arabic (Bahrain)")
+   LNG(wxLANGUAGE_ARABIC_EGYPT,               "ar_EG", LANG_ARABIC    , SUBLANG_ARABIC_EGYPT              , wxLayout_RightToLeft, "Arabic (Egypt)")
+   LNG(wxLANGUAGE_ARABIC_IRAQ,                "ar_IQ", LANG_ARABIC    , SUBLANG_ARABIC_IRAQ               , wxLayout_RightToLeft, "Arabic (Iraq)")
+   LNG(wxLANGUAGE_ARABIC_JORDAN,              "ar_JO", LANG_ARABIC    , SUBLANG_ARABIC_JORDAN             , wxLayout_RightToLeft, "Arabic (Jordan)")
+   LNG(wxLANGUAGE_ARABIC_KUWAIT,              "ar_KW", LANG_ARABIC    , SUBLANG_ARABIC_KUWAIT             , wxLayout_RightToLeft, "Arabic (Kuwait)")
+   LNG(wxLANGUAGE_ARABIC_LEBANON,             "ar_LB", LANG_ARABIC    , SUBLANG_ARABIC_LEBANON            , wxLayout_RightToLeft, "Arabic (Lebanon)")
+   LNG(wxLANGUAGE_ARABIC_LIBYA,               "ar_LY", LANG_ARABIC    , SUBLANG_ARABIC_LIBYA              , wxLayout_RightToLeft, "Arabic (Libya)")
+   LNG(wxLANGUAGE_ARABIC_MOROCCO,             "ar_MA", LANG_ARABIC    , SUBLANG_ARABIC_MOROCCO            , wxLayout_RightToLeft, "Arabic (Morocco)")
+   LNG(wxLANGUAGE_ARABIC_OMAN,                "ar_OM", LANG_ARABIC    , SUBLANG_ARABIC_OMAN               , wxLayout_RightToLeft, "Arabic (Oman)")
+   LNG(wxLANGUAGE_ARABIC_QATAR,               "ar_QA", LANG_ARABIC    , SUBLANG_ARABIC_QATAR              , wxLayout_RightToLeft, "Arabic (Qatar)")
+   LNG(wxLANGUAGE_ARABIC_SAUDI_ARABIA,        "ar_SA", LANG_ARABIC    , SUBLANG_ARABIC_SAUDI_ARABIA       , wxLayout_RightToLeft, "Arabic (Saudi Arabia)")
+   LNG(wxLANGUAGE_ARABIC_SUDAN,               "ar_SD", 0              , 0                                 , wxLayout_RightToLeft, "Arabic (Sudan)")
+   LNG(wxLANGUAGE_ARABIC_SYRIA,               "ar_SY", LANG_ARABIC    , SUBLANG_ARABIC_SYRIA              , wxLayout_RightToLeft, "Arabic (Syria)")
+   LNG(wxLANGUAGE_ARABIC_TUNISIA,             "ar_TN", LANG_ARABIC    , SUBLANG_ARABIC_TUNISIA            , wxLayout_RightToLeft, "Arabic (Tunisia)")
+   LNG(wxLANGUAGE_ARABIC_UAE,                 "ar_AE", LANG_ARABIC    , SUBLANG_ARABIC_UAE                , wxLayout_RightToLeft, "Arabic (Uae)")
+   LNG(wxLANGUAGE_ARABIC_YEMEN,               "ar_YE", LANG_ARABIC    , SUBLANG_ARABIC_YEMEN              , wxLayout_RightToLeft, "Arabic (Yemen)")
+   LNG(wxLANGUAGE_ARMENIAN,                   "hy"   , LANG_ARMENIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Armenian")
+   LNG(wxLANGUAGE_ASSAMESE,                   "as"   , LANG_ASSAMESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Assamese")
+   LNG(wxLANGUAGE_AYMARA,                     "ay"   , 0              , 0                                 , wxLayout_LeftToRight, "Aymara")
+   LNG(wxLANGUAGE_AZERI,                      "az"   , LANG_AZERI     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Azeri")
+   LNG(wxLANGUAGE_AZERI_CYRILLIC,             "az"   , LANG_AZERI     , SUBLANG_AZERI_CYRILLIC            , wxLayout_LeftToRight, "Azeri (Cyrillic)")
+   LNG(wxLANGUAGE_AZERI_LATIN,                "az"   , LANG_AZERI     , SUBLANG_AZERI_LATIN               , wxLayout_LeftToRight, "Azeri (Latin)")
+   LNG(wxLANGUAGE_BASHKIR,                    "ba"   , 0              , 0                                 , wxLayout_LeftToRight, "Bashkir")
+   LNG(wxLANGUAGE_BASQUE,                     "eu_ES", LANG_BASQUE    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Basque")
+   LNG(wxLANGUAGE_BELARUSIAN,                 "be_BY", LANG_BELARUSIAN, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Belarusian")
+   LNG(wxLANGUAGE_BENGALI,                    "bn"   , LANG_BENGALI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Bengali")
+   LNG(wxLANGUAGE_BHUTANI,                    "dz"   , 0              , 0                                 , wxLayout_LeftToRight, "Bhutani")
+   LNG(wxLANGUAGE_BIHARI,                     "bh"   , 0              , 0                                 , wxLayout_LeftToRight, "Bihari")
+   LNG(wxLANGUAGE_BISLAMA,                    "bi"   , 0              , 0                                 , wxLayout_LeftToRight, "Bislama")
+   LNG(wxLANGUAGE_BRETON,                     "br"   , 0              , 0                                 , wxLayout_LeftToRight, "Breton")
+   LNG(wxLANGUAGE_BULGARIAN,                  "bg_BG", LANG_BULGARIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Bulgarian")
+   LNG(wxLANGUAGE_BURMESE,                    "my"   , 0              , 0                                 , wxLayout_LeftToRight, "Burmese")
+   LNG(wxLANGUAGE_CAMBODIAN,                  "km"   , 0              , 0                                 , wxLayout_LeftToRight, "Cambodian")
+   LNG(wxLANGUAGE_CATALAN,                    "ca_ES", LANG_CATALAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Catalan")
+   LNG(wxLANGUAGE_CHINESE,                    "zh_TW", LANG_CHINESE   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Chinese")
+   LNG(wxLANGUAGE_CHINESE_SIMPLIFIED,         "zh_CN", LANG_CHINESE   , SUBLANG_CHINESE_SIMPLIFIED        , wxLayout_LeftToRight, "Chinese (Simplified)")
+   LNG(wxLANGUAGE_CHINESE_TRADITIONAL,        "zh_TW", LANG_CHINESE   , SUBLANG_CHINESE_TRADITIONAL       , wxLayout_LeftToRight, "Chinese (Traditional)")
+   LNG(wxLANGUAGE_CHINESE_HONGKONG,           "zh_HK", LANG_CHINESE   , SUBLANG_CHINESE_HONGKONG          , wxLayout_LeftToRight, "Chinese (Hongkong)")
+   LNG(wxLANGUAGE_CHINESE_MACAU,              "zh_MO", LANG_CHINESE   , SUBLANG_CHINESE_MACAU             , wxLayout_LeftToRight, "Chinese (Macau)")
+   LNG(wxLANGUAGE_CHINESE_SINGAPORE,          "zh_SG", LANG_CHINESE   , SUBLANG_CHINESE_SINGAPORE         , wxLayout_LeftToRight, "Chinese (Singapore)")
+   LNG(wxLANGUAGE_CHINESE_TAIWAN,             "zh_TW", LANG_CHINESE   , SUBLANG_CHINESE_TRADITIONAL       , wxLayout_LeftToRight, "Chinese (Taiwan)")
+   LNG(wxLANGUAGE_CORSICAN,                   "co"   , 0              , 0                                 , wxLayout_LeftToRight, "Corsican")
+   LNG(wxLANGUAGE_CROATIAN,                   "hr_HR", LANG_CROATIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Croatian")
+   LNG(wxLANGUAGE_CZECH,                      "cs_CZ", LANG_CZECH     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Czech")
+   LNG(wxLANGUAGE_DANISH,                     "da_DK", LANG_DANISH    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Danish")
+   LNG(wxLANGUAGE_DUTCH,                      "nl_NL", LANG_DUTCH     , SUBLANG_DUTCH                     , wxLayout_LeftToRight, "Dutch")
+   LNG(wxLANGUAGE_DUTCH_BELGIAN,              "nl_BE", LANG_DUTCH     , SUBLANG_DUTCH_BELGIAN             , wxLayout_LeftToRight, "Dutch (Belgian)")
+   LNG(wxLANGUAGE_ENGLISH,                    "en_GB", LANG_ENGLISH   , SUBLANG_ENGLISH_UK                , wxLayout_LeftToRight, "English")
+   LNG(wxLANGUAGE_ENGLISH_UK,                 "en_GB", LANG_ENGLISH   , SUBLANG_ENGLISH_UK                , wxLayout_LeftToRight, "English (U.K.)")
+   LNG(wxLANGUAGE_ENGLISH_US,                 "en_US", LANG_ENGLISH   , SUBLANG_ENGLISH_US                , wxLayout_LeftToRight, "English (U.S.)")
+   LNG(wxLANGUAGE_ENGLISH_AUSTRALIA,          "en_AU", LANG_ENGLISH   , SUBLANG_ENGLISH_AUS               , wxLayout_LeftToRight, "English (Australia)")
+   LNG(wxLANGUAGE_ENGLISH_BELIZE,             "en_BZ", LANG_ENGLISH   , SUBLANG_ENGLISH_BELIZE            , wxLayout_LeftToRight, "English (Belize)")
+   LNG(wxLANGUAGE_ENGLISH_BOTSWANA,           "en_BW", 0              , 0                                 , wxLayout_LeftToRight, "English (Botswana)")
+   LNG(wxLANGUAGE_ENGLISH_CANADA,             "en_CA", LANG_ENGLISH   , SUBLANG_ENGLISH_CAN               , wxLayout_LeftToRight, "English (Canada)")
+   LNG(wxLANGUAGE_ENGLISH_CARIBBEAN,          "en_CB", LANG_ENGLISH   , SUBLANG_ENGLISH_CARIBBEAN         , wxLayout_LeftToRight, "English (Caribbean)")
+   LNG(wxLANGUAGE_ENGLISH_DENMARK,            "en_DK", 0              , 0                                 , wxLayout_LeftToRight, "English (Denmark)")
+   LNG(wxLANGUAGE_ENGLISH_EIRE,               "en_IE", LANG_ENGLISH   , SUBLANG_ENGLISH_EIRE              , wxLayout_LeftToRight, "English (Eire)")
+   LNG(wxLANGUAGE_ENGLISH_JAMAICA,            "en_JM", LANG_ENGLISH   , SUBLANG_ENGLISH_JAMAICA           , wxLayout_LeftToRight, "English (Jamaica)")
+   LNG(wxLANGUAGE_ENGLISH_NEW_ZEALAND,        "en_NZ", LANG_ENGLISH   , SUBLANG_ENGLISH_NZ                , wxLayout_LeftToRight, "English (New Zealand)")
+   LNG(wxLANGUAGE_ENGLISH_PHILIPPINES,        "en_PH", LANG_ENGLISH   , SUBLANG_ENGLISH_PHILIPPINES       , wxLayout_LeftToRight, "English (Philippines)")
+   LNG(wxLANGUAGE_ENGLISH_SOUTH_AFRICA,       "en_ZA", LANG_ENGLISH   , SUBLANG_ENGLISH_SOUTH_AFRICA      , wxLayout_LeftToRight, "English (South Africa)")
+   LNG(wxLANGUAGE_ENGLISH_TRINIDAD,           "en_TT", LANG_ENGLISH   , SUBLANG_ENGLISH_TRINIDAD          , wxLayout_LeftToRight, "English (Trinidad)")
+   LNG(wxLANGUAGE_ENGLISH_ZIMBABWE,           "en_ZW", LANG_ENGLISH   , SUBLANG_ENGLISH_ZIMBABWE          , wxLayout_LeftToRight, "English (Zimbabwe)")
+   LNG(wxLANGUAGE_ESPERANTO,                  "eo"   , 0              , 0                                 , wxLayout_LeftToRight, "Esperanto")
+   LNG(wxLANGUAGE_ESTONIAN,                   "et_EE", LANG_ESTONIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Estonian")
+   LNG(wxLANGUAGE_FAEROESE,                   "fo_FO", LANG_FAEROESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Faeroese")
+   LNG(wxLANGUAGE_FARSI,                      "fa_IR", LANG_FARSI     , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Farsi")
+   LNG(wxLANGUAGE_FIJI,                       "fj"   , 0              , 0                                 , wxLayout_LeftToRight, "Fiji")
+   LNG(wxLANGUAGE_FINNISH,                    "fi_FI", LANG_FINNISH   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Finnish")
+   LNG(wxLANGUAGE_FRENCH,                     "fr_FR", LANG_FRENCH    , SUBLANG_FRENCH                    , wxLayout_LeftToRight, "French")
+   LNG(wxLANGUAGE_FRENCH_BELGIAN,             "fr_BE", LANG_FRENCH    , SUBLANG_FRENCH_BELGIAN            , wxLayout_LeftToRight, "French (Belgian)")
+   LNG(wxLANGUAGE_FRENCH_CANADIAN,            "fr_CA", LANG_FRENCH    , SUBLANG_FRENCH_CANADIAN           , wxLayout_LeftToRight, "French (Canadian)")
+   LNG(wxLANGUAGE_FRENCH_LUXEMBOURG,          "fr_LU", LANG_FRENCH    , SUBLANG_FRENCH_LUXEMBOURG         , wxLayout_LeftToRight, "French (Luxembourg)")
+   LNG(wxLANGUAGE_FRENCH_MONACO,              "fr_MC", LANG_FRENCH    , SUBLANG_FRENCH_MONACO             , wxLayout_LeftToRight, "French (Monaco)")
+   LNG(wxLANGUAGE_FRENCH_SWISS,               "fr_CH", LANG_FRENCH    , SUBLANG_FRENCH_SWISS              , wxLayout_LeftToRight, "French (Swiss)")
+   LNG(wxLANGUAGE_FRISIAN,                    "fy"   , 0              , 0                                 , wxLayout_LeftToRight, "Frisian")
+   LNG(wxLANGUAGE_GALICIAN,                   "gl_ES", 0              , 0                                 , wxLayout_LeftToRight, "Galician")
+   LNG(wxLANGUAGE_GEORGIAN,                   "ka_GE", LANG_GEORGIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Georgian")
+   LNG(wxLANGUAGE_GERMAN,                     "de_DE", LANG_GERMAN    , SUBLANG_GERMAN                    , wxLayout_LeftToRight, "German")
+   LNG(wxLANGUAGE_GERMAN_AUSTRIAN,            "de_AT", LANG_GERMAN    , SUBLANG_GERMAN_AUSTRIAN           , wxLayout_LeftToRight, "German (Austrian)")
+   LNG(wxLANGUAGE_GERMAN_BELGIUM,             "de_BE", 0              , 0                                 , wxLayout_LeftToRight, "German (Belgium)")
+   LNG(wxLANGUAGE_GERMAN_LIECHTENSTEIN,       "de_LI", LANG_GERMAN    , SUBLANG_GERMAN_LIECHTENSTEIN      , wxLayout_LeftToRight, "German (Liechtenstein)")
+   LNG(wxLANGUAGE_GERMAN_LUXEMBOURG,          "de_LU", LANG_GERMAN    , SUBLANG_GERMAN_LUXEMBOURG         , wxLayout_LeftToRight, "German (Luxembourg)")
+   LNG(wxLANGUAGE_GERMAN_SWISS,               "de_CH", LANG_GERMAN    , SUBLANG_GERMAN_SWISS              , wxLayout_LeftToRight, "German (Swiss)")
+   LNG(wxLANGUAGE_GREEK,                      "el_GR", LANG_GREEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Greek")
+   LNG(wxLANGUAGE_GREENLANDIC,                "kl_GL", 0              , 0                                 , wxLayout_LeftToRight, "Greenlandic")
+   LNG(wxLANGUAGE_GUARANI,                    "gn"   , 0              , 0                                 , wxLayout_LeftToRight, "Guarani")
+   LNG(wxLANGUAGE_GUJARATI,                   "gu"   , LANG_GUJARATI  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Gujarati")
+   LNG(wxLANGUAGE_HAUSA,                      "ha"   , 0              , 0                                 , wxLayout_LeftToRight, "Hausa")
+   LNG(wxLANGUAGE_HEBREW,                     "he_IL", LANG_HEBREW    , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Hebrew")
+   LNG(wxLANGUAGE_HINDI,                      "hi_IN", LANG_HINDI     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Hindi")
+   LNG(wxLANGUAGE_HUNGARIAN,                  "hu_HU", LANG_HUNGARIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Hungarian")
+   LNG(wxLANGUAGE_ICELANDIC,                  "is_IS", LANG_ICELANDIC , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Icelandic")
+   LNG(wxLANGUAGE_INDONESIAN,                 "id_ID", LANG_INDONESIAN, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Indonesian")
+   LNG(wxLANGUAGE_INTERLINGUA,                "ia"   , 0              , 0                                 , wxLayout_LeftToRight, "Interlingua")
+   LNG(wxLANGUAGE_INTERLINGUE,                "ie"   , 0              , 0                                 , wxLayout_LeftToRight, "Interlingue")
+   LNG(wxLANGUAGE_INUKTITUT,                  "iu"   , 0              , 0                                 , wxLayout_LeftToRight, "Inuktitut")
+   LNG(wxLANGUAGE_INUPIAK,                    "ik"   , 0              , 0                                 , wxLayout_LeftToRight, "Inupiak")
+   LNG(wxLANGUAGE_IRISH,                      "ga_IE", 0              , 0                                 , wxLayout_LeftToRight, "Irish")
+   LNG(wxLANGUAGE_ITALIAN,                    "it_IT", LANG_ITALIAN   , SUBLANG_ITALIAN                   , wxLayout_LeftToRight, "Italian")
+   LNG(wxLANGUAGE_ITALIAN_SWISS,              "it_CH", LANG_ITALIAN   , SUBLANG_ITALIAN_SWISS             , wxLayout_LeftToRight, "Italian (Swiss)")
+   LNG(wxLANGUAGE_JAPANESE,                   "ja_JP", LANG_JAPANESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Japanese")
+   LNG(wxLANGUAGE_JAVANESE,                   "jw"   , 0              , 0                                 , wxLayout_LeftToRight, "Javanese")
+   LNG(wxLANGUAGE_KANNADA,                    "kn"   , LANG_KANNADA   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Kannada")
+   LNG(wxLANGUAGE_KASHMIRI,                   "ks"   , LANG_KASHMIRI  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Kashmiri")
+   LNG(wxLANGUAGE_KASHMIRI_INDIA,             "ks_IN", LANG_KASHMIRI  , SUBLANG_KASHMIRI_INDIA            , wxLayout_LeftToRight, "Kashmiri (India)")
+   LNG(wxLANGUAGE_KAZAKH,                     "kk"   , LANG_KAZAK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Kazakh")
+   LNG(wxLANGUAGE_KERNEWEK,                   "kw_GB", 0              , 0                                 , wxLayout_LeftToRight, "Kernewek")
+   LNG(wxLANGUAGE_KINYARWANDA,                "rw"   , 0              , 0                                 , wxLayout_LeftToRight, "Kinyarwanda")
+   LNG(wxLANGUAGE_KIRGHIZ,                    "ky"   , 0              , 0                                 , wxLayout_LeftToRight, "Kirghiz")
+   LNG(wxLANGUAGE_KIRUNDI,                    "rn"   , 0              , 0                                 , wxLayout_LeftToRight, "Kirundi")
+   LNG(wxLANGUAGE_KONKANI,                    ""     , LANG_KONKANI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Konkani")
+   LNG(wxLANGUAGE_KOREAN,                     "ko_KR", LANG_KOREAN    , SUBLANG_KOREAN                    , wxLayout_LeftToRight, "Korean")
+   LNG(wxLANGUAGE_KURDISH,                    "ku_TR", 0              , 0                                 , wxLayout_LeftToRight, "Kurdish")
+   LNG(wxLANGUAGE_LAOTHIAN,                   "lo"   , 0              , 0                                 , wxLayout_LeftToRight, "Laothian")
+   LNG(wxLANGUAGE_LATIN,                      "la"   , 0              , 0                                 , wxLayout_LeftToRight, "Latin")
+   LNG(wxLANGUAGE_LATVIAN,                    "lv_LV", LANG_LATVIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Latvian")
+   LNG(wxLANGUAGE_LINGALA,                    "ln"   , 0              , 0                                 , wxLayout_LeftToRight, "Lingala")
+   LNG(wxLANGUAGE_LITHUANIAN,                 "lt_LT", LANG_LITHUANIAN, SUBLANG_LITHUANIAN                , wxLayout_LeftToRight, "Lithuanian")
+   LNG(wxLANGUAGE_MACEDONIAN,                 "mk_MK", LANG_MACEDONIAN, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Macedonian")
+   LNG(wxLANGUAGE_MALAGASY,                   "mg"   , 0              , 0                                 , wxLayout_LeftToRight, "Malagasy")
+   LNG(wxLANGUAGE_MALAY,                      "ms_MY", LANG_MALAY     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Malay")
+   LNG(wxLANGUAGE_MALAYALAM,                  "ml"   , LANG_MALAYALAM , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Malayalam")
+   LNG(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,    "ms_BN", LANG_MALAY     , SUBLANG_MALAY_BRUNEI_DARUSSALAM   , wxLayout_LeftToRight, "Malay (Brunei Darussalam)")
+   LNG(wxLANGUAGE_MALAY_MALAYSIA,             "ms_MY", LANG_MALAY     , SUBLANG_MALAY_MALAYSIA            , wxLayout_LeftToRight, "Malay (Malaysia)")
+   LNG(wxLANGUAGE_MALTESE,                    "mt_MT", 0              , 0                                 , wxLayout_LeftToRight, "Maltese")
+   LNG(wxLANGUAGE_MANIPURI,                   ""     , LANG_MANIPURI  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Manipuri")
+   LNG(wxLANGUAGE_MAORI,                      "mi"   , 0              , 0                                 , wxLayout_LeftToRight, "Maori")
+   LNG(wxLANGUAGE_MARATHI,                    "mr_IN", LANG_MARATHI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Marathi")
+   LNG(wxLANGUAGE_MOLDAVIAN,                  "mo"   , 0              , 0                                 , wxLayout_LeftToRight, "Moldavian")
+   LNG(wxLANGUAGE_MONGOLIAN,                  "mn"   , 0              , 0                                 , wxLayout_LeftToRight, "Mongolian")
+   LNG(wxLANGUAGE_NAURU,                      "na"   , 0              , 0                                 , wxLayout_LeftToRight, "Nauru")
+   LNG(wxLANGUAGE_NEPALI,                     "ne_NP", LANG_NEPALI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Nepali")
+   LNG(wxLANGUAGE_NEPALI_INDIA,               "ne_IN", LANG_NEPALI    , SUBLANG_NEPALI_INDIA              , wxLayout_LeftToRight, "Nepali (India)")
+   LNG(wxLANGUAGE_NORWEGIAN_BOKMAL,           "nb_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL          , wxLayout_LeftToRight, "Norwegian (Bokmal)")
+   LNG(wxLANGUAGE_NORWEGIAN_NYNORSK,          "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK         , wxLayout_LeftToRight, "Norwegian (Nynorsk)")
+   LNG(wxLANGUAGE_OCCITAN,                    "oc"   , 0              , 0                                 , wxLayout_LeftToRight, "Occitan")
+   LNG(wxLANGUAGE_ORIYA,                      "or"   , LANG_ORIYA     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Oriya")
+   LNG(wxLANGUAGE_OROMO,                      "om"   , 0              , 0                                 , wxLayout_LeftToRight, "(Afan) Oromo")
+   LNG(wxLANGUAGE_PASHTO,                     "ps"   , 0              , 0                                 , wxLayout_LeftToRight, "Pashto, Pushto")
+   LNG(wxLANGUAGE_POLISH,                     "pl_PL", LANG_POLISH    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Polish")
+   LNG(wxLANGUAGE_PORTUGUESE,                 "pt_PT", LANG_PORTUGUESE, SUBLANG_PORTUGUESE                , wxLayout_LeftToRight, "Portuguese")
+   LNG(wxLANGUAGE_PORTUGUESE_BRAZILIAN,       "pt_BR", LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN      , wxLayout_LeftToRight, "Portuguese (Brazilian)")
+   LNG(wxLANGUAGE_PUNJABI,                    "pa"   , LANG_PUNJABI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Punjabi")
+   LNG(wxLANGUAGE_QUECHUA,                    "qu"   , 0              , 0                                 , wxLayout_LeftToRight, "Quechua")
+   LNG(wxLANGUAGE_RHAETO_ROMANCE,             "rm"   , 0              , 0                                 , wxLayout_LeftToRight, "Rhaeto-Romance")
+   LNG(wxLANGUAGE_ROMANIAN,                   "ro_RO", LANG_ROMANIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Romanian")
+   LNG(wxLANGUAGE_RUSSIAN,                    "ru_RU", LANG_RUSSIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Russian")
+   LNG(wxLANGUAGE_RUSSIAN_UKRAINE,            "ru_UA", 0              , 0                                 , wxLayout_LeftToRight, "Russian (Ukraine)")
+   LNG(wxLANGUAGE_SAMI,                       "se_NO", LANG_SAMI      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Northern Sami")
+   LNG(wxLANGUAGE_SAMOAN,                     "sm"   , 0              , 0                                 , wxLayout_LeftToRight, "Samoan")
+   LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , wxLayout_LeftToRight, "Sangho")
+   LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sanskrit")
+   LNG(wxLANGUAGE_SCOTS_GAELIC,               "gd"   , 0              , 0                                 , wxLayout_LeftToRight, "Scots Gaelic")
+   LNG(wxLANGUAGE_SERBIAN,                    "sr_RS", LANG_SERBIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Serbian")
+   LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_RS", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")
+   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_RS@latin", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")
+   LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")
+   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_YU@latin", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")
+   LNG(wxLANGUAGE_SERBO_CROATIAN,             "sh"   , 0              , 0                                 , wxLayout_LeftToRight, "Serbo-Croatian")
+   LNG(wxLANGUAGE_SESOTHO,                    "st"   , 0              , 0                                 , wxLayout_LeftToRight, "Sesotho")
+   LNG(wxLANGUAGE_SETSWANA,                   "tn"   , 0              , 0                                 , wxLayout_LeftToRight, "Setswana")
+   LNG(wxLANGUAGE_SHONA,                      "sn"   , 0              , 0                                 , wxLayout_LeftToRight, "Shona")
+   LNG(wxLANGUAGE_SINDHI,                     "sd"   , LANG_SINDHI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sindhi")
+   LNG(wxLANGUAGE_SINHALESE,                  "si"   , 0              , 0                                 , wxLayout_LeftToRight, "Sinhalese")
+   LNG(wxLANGUAGE_SISWATI,                    "ss"   , 0              , 0                                 , wxLayout_LeftToRight, "Siswati")
+   LNG(wxLANGUAGE_SLOVAK,                     "sk_SK", LANG_SLOVAK    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Slovak")
+   LNG(wxLANGUAGE_SLOVENIAN,                  "sl_SI", LANG_SLOVENIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Slovenian")
+   LNG(wxLANGUAGE_SOMALI,                     "so"   , 0              , 0                                 , wxLayout_LeftToRight, "Somali")
+   LNG(wxLANGUAGE_SPANISH,                    "es_ES", LANG_SPANISH   , SUBLANG_SPANISH                   , wxLayout_LeftToRight, "Spanish")
+   LNG(wxLANGUAGE_SPANISH_ARGENTINA,          "es_AR", LANG_SPANISH   , SUBLANG_SPANISH_ARGENTINA         , wxLayout_LeftToRight, "Spanish (Argentina)")
+   LNG(wxLANGUAGE_SPANISH_BOLIVIA,            "es_BO", LANG_SPANISH   , SUBLANG_SPANISH_BOLIVIA           , wxLayout_LeftToRight, "Spanish (Bolivia)")
+   LNG(wxLANGUAGE_SPANISH_CHILE,              "es_CL", LANG_SPANISH   , SUBLANG_SPANISH_CHILE             , wxLayout_LeftToRight, "Spanish (Chile)")
+   LNG(wxLANGUAGE_SPANISH_COLOMBIA,           "es_CO", LANG_SPANISH   , SUBLANG_SPANISH_COLOMBIA          , wxLayout_LeftToRight, "Spanish (Colombia)")
+   LNG(wxLANGUAGE_SPANISH_COSTA_RICA,         "es_CR", LANG_SPANISH   , SUBLANG_SPANISH_COSTA_RICA        , wxLayout_LeftToRight, "Spanish (Costa Rica)")
+   LNG(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, "es_DO", LANG_SPANISH   , SUBLANG_SPANISH_DOMINICAN_REPUBLIC, wxLayout_LeftToRight, "Spanish (Dominican republic)")
+   LNG(wxLANGUAGE_SPANISH_ECUADOR,            "es_EC", LANG_SPANISH   , SUBLANG_SPANISH_ECUADOR           , wxLayout_LeftToRight, "Spanish (Ecuador)")
+   LNG(wxLANGUAGE_SPANISH_EL_SALVADOR,        "es_SV", LANG_SPANISH   , SUBLANG_SPANISH_EL_SALVADOR       , wxLayout_LeftToRight, "Spanish (El Salvador)")
+   LNG(wxLANGUAGE_SPANISH_GUATEMALA,          "es_GT", LANG_SPANISH   , SUBLANG_SPANISH_GUATEMALA         , wxLayout_LeftToRight, "Spanish (Guatemala)")
+   LNG(wxLANGUAGE_SPANISH_HONDURAS,           "es_HN", LANG_SPANISH   , SUBLANG_SPANISH_HONDURAS          , wxLayout_LeftToRight, "Spanish (Honduras)")
+   LNG(wxLANGUAGE_SPANISH_MEXICAN,            "es_MX", LANG_SPANISH   , SUBLANG_SPANISH_MEXICAN           , wxLayout_LeftToRight, "Spanish (Mexican)")
+   LNG(wxLANGUAGE_SPANISH_MODERN,             "es_ES", LANG_SPANISH   , SUBLANG_SPANISH_MODERN            , wxLayout_LeftToRight, "Spanish (Modern)")
+   LNG(wxLANGUAGE_SPANISH_NICARAGUA,          "es_NI", LANG_SPANISH   , SUBLANG_SPANISH_NICARAGUA         , wxLayout_LeftToRight, "Spanish (Nicaragua)")
+   LNG(wxLANGUAGE_SPANISH_PANAMA,             "es_PA", LANG_SPANISH   , SUBLANG_SPANISH_PANAMA            , wxLayout_LeftToRight, "Spanish (Panama)")
+   LNG(wxLANGUAGE_SPANISH_PARAGUAY,           "es_PY", LANG_SPANISH   , SUBLANG_SPANISH_PARAGUAY          , wxLayout_LeftToRight, "Spanish (Paraguay)")
+   LNG(wxLANGUAGE_SPANISH_PERU,               "es_PE", LANG_SPANISH   , SUBLANG_SPANISH_PERU              , wxLayout_LeftToRight, "Spanish (Peru)")
+   LNG(wxLANGUAGE_SPANISH_PUERTO_RICO,        "es_PR", LANG_SPANISH   , SUBLANG_SPANISH_PUERTO_RICO       , wxLayout_LeftToRight, "Spanish (Puerto Rico)")
+   LNG(wxLANGUAGE_SPANISH_URUGUAY,            "es_UY", LANG_SPANISH   , SUBLANG_SPANISH_URUGUAY           , wxLayout_LeftToRight, "Spanish (Uruguay)")
+   LNG(wxLANGUAGE_SPANISH_US,                 "es_US", 0              , 0                                 , wxLayout_LeftToRight, "Spanish (U.S.)")
+   LNG(wxLANGUAGE_SPANISH_VENEZUELA,          "es_VE", LANG_SPANISH   , SUBLANG_SPANISH_VENEZUELA         , wxLayout_LeftToRight, "Spanish (Venezuela)")
+   LNG(wxLANGUAGE_SUNDANESE,                  "su"   , 0              , 0                                 , wxLayout_LeftToRight, "Sundanese")
+   LNG(wxLANGUAGE_SWAHILI,                    "sw_KE", LANG_SWAHILI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Swahili")
+   LNG(wxLANGUAGE_SWEDISH,                    "sv_SE", LANG_SWEDISH   , SUBLANG_SWEDISH                   , wxLayout_LeftToRight, "Swedish")
+   LNG(wxLANGUAGE_SWEDISH_FINLAND,            "sv_FI", LANG_SWEDISH   , SUBLANG_SWEDISH_FINLAND           , wxLayout_LeftToRight, "Swedish (Finland)")
+   LNG(wxLANGUAGE_TAGALOG,                    "tl_PH", 0              , 0                                 , wxLayout_LeftToRight, "Tagalog")
+   LNG(wxLANGUAGE_TAJIK,                      "tg"   , 0              , 0                                 , wxLayout_LeftToRight, "Tajik")
+   LNG(wxLANGUAGE_TAMIL,                      "ta"   , LANG_TAMIL     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Tamil")
+   LNG(wxLANGUAGE_TATAR,                      "tt"   , LANG_TATAR     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Tatar")
+   LNG(wxLANGUAGE_TELUGU,                     "te"   , LANG_TELUGU    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Telugu")
+   LNG(wxLANGUAGE_THAI,                       "th_TH", LANG_THAI      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Thai")
+   LNG(wxLANGUAGE_TIBETAN,                    "bo"   , 0              , 0                                 , wxLayout_LeftToRight, "Tibetan")
+   LNG(wxLANGUAGE_TIGRINYA,                   "ti"   , 0              , 0                                 , wxLayout_LeftToRight, "Tigrinya")
+   LNG(wxLANGUAGE_TONGA,                      "to"   , 0              , 0                                 , wxLayout_LeftToRight, "Tonga")
+   LNG(wxLANGUAGE_TSONGA,                     "ts"   , 0              , 0                                 , wxLayout_LeftToRight, "Tsonga")
+   LNG(wxLANGUAGE_TURKISH,                    "tr_TR", LANG_TURKISH   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Turkish")
+   LNG(wxLANGUAGE_TURKMEN,                    "tk"   , 0              , 0                                 , wxLayout_LeftToRight, "Turkmen")
+   LNG(wxLANGUAGE_TWI,                        "tw"   , 0              , 0                                 , wxLayout_LeftToRight, "Twi")
+   LNG(wxLANGUAGE_UIGHUR,                     "ug"   , 0              , 0                                 , wxLayout_LeftToRight, "Uighur")
+   LNG(wxLANGUAGE_UKRAINIAN,                  "uk_UA", LANG_UKRAINIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Ukrainian")
+   LNG(wxLANGUAGE_URDU,                       "ur"   , LANG_URDU      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Urdu")
+   LNG(wxLANGUAGE_URDU_INDIA,                 "ur_IN", LANG_URDU      , SUBLANG_URDU_INDIA                , wxLayout_LeftToRight, "Urdu (India)")
+   LNG(wxLANGUAGE_URDU_PAKISTAN,              "ur_PK", LANG_URDU      , SUBLANG_URDU_PAKISTAN             , wxLayout_LeftToRight, "Urdu (Pakistan)")
+   LNG(wxLANGUAGE_UZBEK,                      "uz"   , LANG_UZBEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Uzbek")
+   LNG(wxLANGUAGE_UZBEK_CYRILLIC,             "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_CYRILLIC            , wxLayout_LeftToRight, "Uzbek (Cyrillic)")
+   LNG(wxLANGUAGE_UZBEK_LATIN,                "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_LATIN               , wxLayout_LeftToRight, "Uzbek (Latin)")
+   LNG(wxLANGUAGE_VALENCIAN,                  "ca_ES@valencia", LANG_VALENCIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Valencian")
+   LNG(wxLANGUAGE_VIETNAMESE,                 "vi_VN", LANG_VIETNAMESE, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Vietnamese")
+   LNG(wxLANGUAGE_VOLAPUK,                    "vo"   , 0              , 0                                 , wxLayout_LeftToRight, "Volapuk")
+   LNG(wxLANGUAGE_WELSH,                      "cy"   , 0              , 0                                 , wxLayout_LeftToRight, "Welsh")
+   LNG(wxLANGUAGE_WOLOF,                      "wo"   , 0              , 0                                 , wxLayout_LeftToRight, "Wolof")
+   LNG(wxLANGUAGE_XHOSA,                      "xh"   , 0              , 0                                 , wxLayout_LeftToRight, "Xhosa")
+   LNG(wxLANGUAGE_YIDDISH,                    "yi"   , 0              , 0                                 , wxLayout_LeftToRight, "Yiddish")
+   LNG(wxLANGUAGE_YORUBA,                     "yo"   , 0              , 0                                 , wxLayout_LeftToRight, "Yoruba")
+   LNG(wxLANGUAGE_ZHUANG,                     "za"   , 0              , 0                                 , wxLayout_LeftToRight, "Zhuang")
+   LNG(wxLANGUAGE_ZULU,                       "zu"   , 0              , 0                                 , wxLayout_LeftToRight, "Zulu")
+}
+#undef LNG
+
+// --- --- --- generated code ends here --- --- ---
+
+#endif // wxUSE_INTL
diff --git a/Source/3rd Party/wx/src/common/ipcbase.cpp b/Source/3rd Party/wx/src/common/ipcbase.cpp
index 9bec949b5..80fa9412d 100644
--- a/Source/3rd Party/wx/src/common/ipcbase.cpp	
+++ b/Source/3rd Party/wx/src/common/ipcbase.cpp	
@@ -1,131 +1,87 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/ipcbase.cpp
-// Purpose:     IPC base classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#endif
-
-#include "wx/ipcbase.h"
-
-wxIMPLEMENT_ABSTRACT_CLASS(wxServerBase, wxObject)
-wxIMPLEMENT_ABSTRACT_CLASS(wxClientBase, wxObject)
-wxIMPLEMENT_ABSTRACT_CLASS(wxConnectionBase, wxObject)
-
-wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes)
-    : m_buffer((char *)buffer),
-      m_buffersize(bytes),
-      m_deletebufferwhendone(false),
-      m_connected(true)
-{
-  if ( buffer == NULL )
-  { // behave like next constructor
-    m_buffersize = 0;
-    m_deletebufferwhendone = true;
-  }
-}
-
-wxConnectionBase::wxConnectionBase()
-    : m_buffer(NULL),
-      m_buffersize(0),
-      m_deletebufferwhendone(true),
-      m_connected(true)
-{
-}
-
-wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy)
-    : wxObject(),
-      m_buffer(copy.m_buffer),
-      m_buffersize(copy.m_buffersize),
-      m_deletebufferwhendone(false),
-      m_connected(copy.m_connected)
-
-{
-  // copy constructor would require ref-counted pointer to buffer
-  wxFAIL_MSG( wxT("Copy constructor of wxConnectionBase not implemented") );
-}
-
-
-wxConnectionBase::~wxConnectionBase()
-{
-  if ( m_deletebufferwhendone )
-    delete [] m_buffer;
-}
-
-/* static */
-wxString wxConnectionBase::GetTextFromData(const void* data,
-                                           size_t size,
-                                           wxIPCFormat fmt)
-{
-    wxString s;
-    switch ( fmt )
-    {
-        case wxIPC_TEXT:
-            // normally the string should be NUL-terminated and size should
-            // include the total size of the buffer, including NUL -- but don't
-            // crash (by trying to access (size_t)-1 bytes) if it doesn't
-            if ( size )
-                size--;
-
-            s = wxString(static_cast<const char *>(data), size);
-            break;
-
-#if wxUSE_UNICODE
-        // TODO: we should handle both wxIPC_UTF16TEXT and wxIPC_UTF32TEXT here
-        //       for inter-platform IPC
-        case wxIPC_UNICODETEXT:
-            wxASSERT_MSG( !(size % sizeof(wchar_t)), "invalid buffer size" );
-            if ( size )
-            {
-                size /= sizeof(wchar_t);
-                size--;
-            }
-
-            s = wxString(static_cast<const wchar_t *>(data), size);
-            break;
-
-        case wxIPC_UTF8TEXT:
-            if ( size )
-                size--;
-
-            s = wxString::FromUTF8(static_cast<const char *>(data), size);
-            break;
-#endif // wxUSE_UNICODE
-
-        default:
-            wxFAIL_MSG( "non-string IPC format in GetTextFromData()" );
-    }
-
-    return s;
-}
-
-void *wxConnectionBase::GetBufferAtLeast( size_t bytes )
-{
-  if ( m_buffersize >= bytes )
-    return m_buffer;
-  else
-  {  // need to resize buffer
-    if ( m_deletebufferwhendone )
-    { // we're in charge of buffer, increase it
-      delete [] m_buffer;
-      m_buffer = new char[bytes];
-      m_buffersize = bytes;
-      return m_buffer;
-    } // user-supplied buffer, fail
-    else
-      return NULL;
-  }
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/ipcbase.cpp
+// Purpose:     IPC base classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: ipcbase.cpp 54615 2008-07-14 02:34:29Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif
+
+#include "wx/ipcbase.h"
+
+IMPLEMENT_CLASS(wxServerBase, wxObject)
+IMPLEMENT_CLASS(wxClientBase, wxObject)
+IMPLEMENT_CLASS(wxConnectionBase, wxObject)
+
+wxConnectionBase::wxConnectionBase(wxChar *buffer, int bytes)
+    : m_connected(true),
+      m_buffer(buffer),
+      m_buffersize(bytes),
+      m_deletebufferwhendone(false)
+{
+  if ( buffer == (wxChar *)NULL )
+  { // behave like next constructor
+    m_buffersize = 0;
+    m_deletebufferwhendone = true;
+  }
+}
+
+wxConnectionBase::wxConnectionBase()
+    : m_connected(true),
+      m_buffer(NULL),
+      m_buffersize(0),
+      m_deletebufferwhendone(true)
+{
+}
+
+wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy)
+    : wxObject(),
+      m_connected(copy.m_connected),
+      m_buffer(copy.m_buffer),
+      m_buffersize(copy.m_buffersize),
+      m_deletebufferwhendone(false)
+
+{
+  // copy constructor would require ref-counted pointer to buffer
+  wxFAIL_MSG( _T("Copy constructor of wxConnectionBase not implemented") );
+}
+
+
+wxConnectionBase::~wxConnectionBase(void)
+{
+  if ( m_deletebufferwhendone )
+   delete [] m_buffer;
+}
+
+wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
+{
+  if ( m_buffersize >= bytes )
+    return m_buffer;
+  else
+  {  // need to resize buffer
+    if ( m_deletebufferwhendone )
+    { // we're in charge of buffer, increase it
+      delete [] m_buffer;
+      // the argument specifies **byte size**, but m_buffer is of type
+      // wxChar. Under unicode: sizeof(wxChar) > 1, so the buffer size is
+      // bytes / sizeof(wxChar) rounded upwards.
+      m_buffer = new wxChar[(bytes + sizeof(wxChar) - 1) / sizeof(wxChar)];
+      m_buffersize = bytes;
+      return m_buffer;
+    } // user-supplied buffer, fail
+    else
+      return NULL;
+  }
+}
diff --git a/Source/3rd Party/wx/src/common/languageinfo.cpp b/Source/3rd Party/wx/src/common/languageinfo.cpp
deleted file mode 100644
index bd69710c3..000000000
--- a/Source/3rd Party/wx/src/common/languageinfo.cpp	
+++ /dev/null
@@ -1,795 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/languageinfo.cpp
-// Purpose:     wxLocale::InitLanguagesDB()
-// Author:      Vadim Zeitlin, Vaclav Slavik
-// Created:     2010-04-23
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declaration
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/intl.h"
-
-#if wxUSE_INTL
-
-#ifdef __WIN32__
-    #include "wx/msw/private.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// default languages table & initialization
-// ----------------------------------------------------------------------------
-
-
-// --- --- --- generated code begins here --- --- ---
-
-// This table is generated by misc/languages/genlang.py
-// When making changes, please put them into misc/languages/langtabl.txt
-
-#if !defined(__WIN32__) || defined(__WXMICROWIN__)
-
-#define SETWINLANG(info,lang,sublang)
-
-#else
-
-#define SETWINLANG(info,lang,sublang) \
-    info.WinLang = lang, info.WinSublang = sublang;
-
-#ifndef LANG_AFRIKAANS
-#define LANG_AFRIKAANS (0)
-#endif
-#ifndef LANG_ALBANIAN
-#define LANG_ALBANIAN (0)
-#endif
-#ifndef LANG_ARABIC
-#define LANG_ARABIC (0)
-#endif
-#ifndef LANG_ARMENIAN
-#define LANG_ARMENIAN (0)
-#endif
-#ifndef LANG_ASSAMESE
-#define LANG_ASSAMESE (0)
-#endif
-#ifndef LANG_AZERI
-#define LANG_AZERI (0)
-#endif
-#ifndef LANG_BASQUE
-#define LANG_BASQUE (0)
-#endif
-#ifndef LANG_BELARUSIAN
-#define LANG_BELARUSIAN (0)
-#endif
-#ifndef LANG_BENGALI
-#define LANG_BENGALI (0)
-#endif
-#ifndef LANG_BOSNIAN
-#define LANG_BOSNIAN (0)
-#endif
-#ifndef LANG_BULGARIAN
-#define LANG_BULGARIAN (0)
-#endif
-#ifndef LANG_CATALAN
-#define LANG_CATALAN (0)
-#endif
-#ifndef LANG_CHINESE
-#define LANG_CHINESE (0)
-#endif
-#ifndef LANG_CROATIAN
-#define LANG_CROATIAN (0)
-#endif
-#ifndef LANG_CZECH
-#define LANG_CZECH (0)
-#endif
-#ifndef LANG_DANISH
-#define LANG_DANISH (0)
-#endif
-#ifndef LANG_DUTCH
-#define LANG_DUTCH (0)
-#endif
-#ifndef LANG_ENGLISH
-#define LANG_ENGLISH (0)
-#endif
-#ifndef LANG_ESTONIAN
-#define LANG_ESTONIAN (0)
-#endif
-#ifndef LANG_FAEROESE
-#define LANG_FAEROESE (0)
-#endif
-#ifndef LANG_FARSI
-#define LANG_FARSI (0)
-#endif
-#ifndef LANG_FINNISH
-#define LANG_FINNISH (0)
-#endif
-#ifndef LANG_FRENCH
-#define LANG_FRENCH (0)
-#endif
-#ifndef LANG_GEORGIAN
-#define LANG_GEORGIAN (0)
-#endif
-#ifndef LANG_GERMAN
-#define LANG_GERMAN (0)
-#endif
-#ifndef LANG_GREEK
-#define LANG_GREEK (0)
-#endif
-#ifndef LANG_GUJARATI
-#define LANG_GUJARATI (0)
-#endif
-#ifndef LANG_HEBREW
-#define LANG_HEBREW (0)
-#endif
-#ifndef LANG_HINDI
-#define LANG_HINDI (0)
-#endif
-#ifndef LANG_HUNGARIAN
-#define LANG_HUNGARIAN (0)
-#endif
-#ifndef LANG_ICELANDIC
-#define LANG_ICELANDIC (0)
-#endif
-#ifndef LANG_INDONESIAN
-#define LANG_INDONESIAN (0)
-#endif
-#ifndef LANG_ITALIAN
-#define LANG_ITALIAN (0)
-#endif
-#ifndef LANG_JAPANESE
-#define LANG_JAPANESE (0)
-#endif
-#ifndef LANG_KANNADA
-#define LANG_KANNADA (0)
-#endif
-#ifndef LANG_KASHMIRI
-#define LANG_KASHMIRI (0)
-#endif
-#ifndef LANG_KAZAK
-#define LANG_KAZAK (0)
-#endif
-#ifndef LANG_KONKANI
-#define LANG_KONKANI (0)
-#endif
-#ifndef LANG_KOREAN
-#define LANG_KOREAN (0)
-#endif
-#ifndef LANG_LATVIAN
-#define LANG_LATVIAN (0)
-#endif
-#ifndef LANG_LITHUANIAN
-#define LANG_LITHUANIAN (0)
-#endif
-#ifndef LANG_MACEDONIAN
-#define LANG_MACEDONIAN (0)
-#endif
-#ifndef LANG_MALAY
-#define LANG_MALAY (0)
-#endif
-#ifndef LANG_MALAYALAM
-#define LANG_MALAYALAM (0)
-#endif
-#ifndef LANG_MANIPURI
-#define LANG_MANIPURI (0)
-#endif
-#ifndef LANG_MARATHI
-#define LANG_MARATHI (0)
-#endif
-#ifndef LANG_NEPALI
-#define LANG_NEPALI (0)
-#endif
-#ifndef LANG_NORWEGIAN
-#define LANG_NORWEGIAN (0)
-#endif
-#ifndef LANG_ORIYA
-#define LANG_ORIYA (0)
-#endif
-#ifndef LANG_POLISH
-#define LANG_POLISH (0)
-#endif
-#ifndef LANG_PORTUGUESE
-#define LANG_PORTUGUESE (0)
-#endif
-#ifndef LANG_PUNJABI
-#define LANG_PUNJABI (0)
-#endif
-#ifndef LANG_ROMANIAN
-#define LANG_ROMANIAN (0)
-#endif
-#ifndef LANG_RUSSIAN
-#define LANG_RUSSIAN (0)
-#endif
-#ifndef LANG_SAMI
-#define LANG_SAMI (0)
-#endif
-#ifndef LANG_SANSKRIT
-#define LANG_SANSKRIT (0)
-#endif
-#ifndef LANG_SERBIAN
-#define LANG_SERBIAN (0)
-#endif
-#ifndef LANG_SINDHI
-#define LANG_SINDHI (0)
-#endif
-#ifndef LANG_SLOVAK
-#define LANG_SLOVAK (0)
-#endif
-#ifndef LANG_SLOVENIAN
-#define LANG_SLOVENIAN (0)
-#endif
-#ifndef LANG_SPANISH
-#define LANG_SPANISH (0)
-#endif
-#ifndef LANG_SWAHILI
-#define LANG_SWAHILI (0)
-#endif
-#ifndef LANG_SWEDISH
-#define LANG_SWEDISH (0)
-#endif
-#ifndef LANG_TAMIL
-#define LANG_TAMIL (0)
-#endif
-#ifndef LANG_TATAR
-#define LANG_TATAR (0)
-#endif
-#ifndef LANG_TELUGU
-#define LANG_TELUGU (0)
-#endif
-#ifndef LANG_THAI
-#define LANG_THAI (0)
-#endif
-#ifndef LANG_TURKISH
-#define LANG_TURKISH (0)
-#endif
-#ifndef LANG_UKRAINIAN
-#define LANG_UKRAINIAN (0)
-#endif
-#ifndef LANG_URDU
-#define LANG_URDU (0)
-#endif
-#ifndef LANG_UZBEK
-#define LANG_UZBEK (0)
-#endif
-#ifndef LANG_VIETNAMESE
-#define LANG_VIETNAMESE (0)
-#endif
-#ifndef SUBLANG_ARABIC_ALGERIA
-#define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_BAHRAIN
-#define SUBLANG_ARABIC_BAHRAIN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_EGYPT
-#define SUBLANG_ARABIC_EGYPT SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_IRAQ
-#define SUBLANG_ARABIC_IRAQ SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_JORDAN
-#define SUBLANG_ARABIC_JORDAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_KUWAIT
-#define SUBLANG_ARABIC_KUWAIT SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_LEBANON
-#define SUBLANG_ARABIC_LEBANON SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_LIBYA
-#define SUBLANG_ARABIC_LIBYA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_MOROCCO
-#define SUBLANG_ARABIC_MOROCCO SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_OMAN
-#define SUBLANG_ARABIC_OMAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_QATAR
-#define SUBLANG_ARABIC_QATAR SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_SAUDI_ARABIA
-#define SUBLANG_ARABIC_SAUDI_ARABIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_SYRIA
-#define SUBLANG_ARABIC_SYRIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_TUNISIA
-#define SUBLANG_ARABIC_TUNISIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_UAE
-#define SUBLANG_ARABIC_UAE SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ARABIC_YEMEN
-#define SUBLANG_ARABIC_YEMEN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_AZERI_CYRILLIC
-#define SUBLANG_AZERI_CYRILLIC SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_AZERI_LATIN
-#define SUBLANG_AZERI_LATIN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN
-#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_CHINESE_SIMPLIFIED
-#define SUBLANG_CHINESE_SIMPLIFIED SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_CHINESE_TRADITIONAL
-#define SUBLANG_CHINESE_TRADITIONAL SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_CHINESE_HONGKONG
-#define SUBLANG_CHINESE_HONGKONG SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_CHINESE_MACAU
-#define SUBLANG_CHINESE_MACAU SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_CHINESE_SINGAPORE
-#define SUBLANG_CHINESE_SINGAPORE SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_DUTCH
-#define SUBLANG_DUTCH SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_DUTCH_BELGIAN
-#define SUBLANG_DUTCH_BELGIAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_UK
-#define SUBLANG_ENGLISH_UK SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_US
-#define SUBLANG_ENGLISH_US SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_AUS
-#define SUBLANG_ENGLISH_AUS SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_BELIZE
-#define SUBLANG_ENGLISH_BELIZE SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_CAN
-#define SUBLANG_ENGLISH_CAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_CARIBBEAN
-#define SUBLANG_ENGLISH_CARIBBEAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_EIRE
-#define SUBLANG_ENGLISH_EIRE SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_JAMAICA
-#define SUBLANG_ENGLISH_JAMAICA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_NZ
-#define SUBLANG_ENGLISH_NZ SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_PHILIPPINES
-#define SUBLANG_ENGLISH_PHILIPPINES SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_SOUTH_AFRICA
-#define SUBLANG_ENGLISH_SOUTH_AFRICA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_TRINIDAD
-#define SUBLANG_ENGLISH_TRINIDAD SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ENGLISH_ZIMBABWE
-#define SUBLANG_ENGLISH_ZIMBABWE SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_FRENCH
-#define SUBLANG_FRENCH SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_FRENCH_BELGIAN
-#define SUBLANG_FRENCH_BELGIAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_FRENCH_CANADIAN
-#define SUBLANG_FRENCH_CANADIAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_FRENCH_LUXEMBOURG
-#define SUBLANG_FRENCH_LUXEMBOURG SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_FRENCH_MONACO
-#define SUBLANG_FRENCH_MONACO SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_FRENCH_SWISS
-#define SUBLANG_FRENCH_SWISS SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_GERMAN
-#define SUBLANG_GERMAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_GERMAN_AUSTRIAN
-#define SUBLANG_GERMAN_AUSTRIAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_GERMAN_LIECHTENSTEIN
-#define SUBLANG_GERMAN_LIECHTENSTEIN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_GERMAN_LUXEMBOURG
-#define SUBLANG_GERMAN_LUXEMBOURG SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_GERMAN_SWISS
-#define SUBLANG_GERMAN_SWISS SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ITALIAN
-#define SUBLANG_ITALIAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_ITALIAN_SWISS
-#define SUBLANG_ITALIAN_SWISS SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_KASHMIRI_INDIA
-#define SUBLANG_KASHMIRI_INDIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_KOREAN
-#define SUBLANG_KOREAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_LITHUANIAN
-#define SUBLANG_LITHUANIAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_MALAY_BRUNEI_DARUSSALAM
-#define SUBLANG_MALAY_BRUNEI_DARUSSALAM SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_MALAY_MALAYSIA
-#define SUBLANG_MALAY_MALAYSIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_NEPALI_INDIA
-#define SUBLANG_NEPALI_INDIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_NORWEGIAN_BOKMAL
-#define SUBLANG_NORWEGIAN_BOKMAL SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_NORWEGIAN_NYNORSK
-#define SUBLANG_NORWEGIAN_NYNORSK SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_PORTUGUESE
-#define SUBLANG_PORTUGUESE SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_PORTUGUESE_BRAZILIAN
-#define SUBLANG_PORTUGUESE_BRAZILIAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SERBIAN_CYRILLIC
-#define SUBLANG_SERBIAN_CYRILLIC SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SERBIAN_LATIN
-#define SUBLANG_SERBIAN_LATIN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH
-#define SUBLANG_SPANISH SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_ARGENTINA
-#define SUBLANG_SPANISH_ARGENTINA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_BOLIVIA
-#define SUBLANG_SPANISH_BOLIVIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_CHILE
-#define SUBLANG_SPANISH_CHILE SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_COLOMBIA
-#define SUBLANG_SPANISH_COLOMBIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_COSTA_RICA
-#define SUBLANG_SPANISH_COSTA_RICA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_DOMINICAN_REPUBLIC
-#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_ECUADOR
-#define SUBLANG_SPANISH_ECUADOR SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_EL_SALVADOR
-#define SUBLANG_SPANISH_EL_SALVADOR SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_GUATEMALA
-#define SUBLANG_SPANISH_GUATEMALA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_HONDURAS
-#define SUBLANG_SPANISH_HONDURAS SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_MEXICAN
-#define SUBLANG_SPANISH_MEXICAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_MODERN
-#define SUBLANG_SPANISH_MODERN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_NICARAGUA
-#define SUBLANG_SPANISH_NICARAGUA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_PANAMA
-#define SUBLANG_SPANISH_PANAMA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_PARAGUAY
-#define SUBLANG_SPANISH_PARAGUAY SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_PERU
-#define SUBLANG_SPANISH_PERU SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_PUERTO_RICO
-#define SUBLANG_SPANISH_PUERTO_RICO SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_URUGUAY
-#define SUBLANG_SPANISH_URUGUAY SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SPANISH_VENEZUELA
-#define SUBLANG_SPANISH_VENEZUELA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SWEDISH
-#define SUBLANG_SWEDISH SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_SWEDISH_FINLAND
-#define SUBLANG_SWEDISH_FINLAND SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_URDU_INDIA
-#define SUBLANG_URDU_INDIA SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_URDU_PAKISTAN
-#define SUBLANG_URDU_PAKISTAN SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_UZBEK_CYRILLIC
-#define SUBLANG_UZBEK_CYRILLIC SUBLANG_DEFAULT
-#endif
-#ifndef SUBLANG_UZBEK_LATIN
-#define SUBLANG_UZBEK_LATIN SUBLANG_DEFAULT
-#endif
-
-
-#endif // __WIN32__
-
-#define LNG(wxlang, canonical, winlang, winsublang, layout, desc) \
-    info.Language = wxlang;                               \
-    info.CanonicalName = wxT(canonical);                  \
-    info.LayoutDirection = layout;                        \
-    info.Description = wxT(desc);                         \
-    SETWINLANG(info, winlang, winsublang)                 \
-    AddLanguage(info);
-
-void wxLocale::InitLanguagesDB()
-{
-   wxLanguageInfo info;
-
-   LNG(wxLANGUAGE_ABKHAZIAN,                  "ab"   , 0              , 0                                 , wxLayout_LeftToRight, "Abkhazian")
-   LNG(wxLANGUAGE_AFAR,                       "aa"   , 0              , 0                                 , wxLayout_LeftToRight, "Afar")
-   LNG(wxLANGUAGE_AFRIKAANS,                  "af_ZA", LANG_AFRIKAANS , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Afrikaans")
-   LNG(wxLANGUAGE_ALBANIAN,                   "sq_AL", LANG_ALBANIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Albanian")
-   LNG(wxLANGUAGE_AMHARIC,                    "am"   , 0              , 0                                 , wxLayout_LeftToRight, "Amharic")
-   LNG(wxLANGUAGE_ARABIC,                     "ar"   , LANG_ARABIC    , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Arabic")
-   LNG(wxLANGUAGE_ARABIC_ALGERIA,             "ar_DZ", LANG_ARABIC    , SUBLANG_ARABIC_ALGERIA            , wxLayout_RightToLeft, "Arabic (Algeria)")
-   LNG(wxLANGUAGE_ARABIC_BAHRAIN,             "ar_BH", LANG_ARABIC    , SUBLANG_ARABIC_BAHRAIN            , wxLayout_RightToLeft, "Arabic (Bahrain)")
-   LNG(wxLANGUAGE_ARABIC_EGYPT,               "ar_EG", LANG_ARABIC    , SUBLANG_ARABIC_EGYPT              , wxLayout_RightToLeft, "Arabic (Egypt)")
-   LNG(wxLANGUAGE_ARABIC_IRAQ,                "ar_IQ", LANG_ARABIC    , SUBLANG_ARABIC_IRAQ               , wxLayout_RightToLeft, "Arabic (Iraq)")
-   LNG(wxLANGUAGE_ARABIC_JORDAN,              "ar_JO", LANG_ARABIC    , SUBLANG_ARABIC_JORDAN             , wxLayout_RightToLeft, "Arabic (Jordan)")
-   LNG(wxLANGUAGE_ARABIC_KUWAIT,              "ar_KW", LANG_ARABIC    , SUBLANG_ARABIC_KUWAIT             , wxLayout_RightToLeft, "Arabic (Kuwait)")
-   LNG(wxLANGUAGE_ARABIC_LEBANON,             "ar_LB", LANG_ARABIC    , SUBLANG_ARABIC_LEBANON            , wxLayout_RightToLeft, "Arabic (Lebanon)")
-   LNG(wxLANGUAGE_ARABIC_LIBYA,               "ar_LY", LANG_ARABIC    , SUBLANG_ARABIC_LIBYA              , wxLayout_RightToLeft, "Arabic (Libya)")
-   LNG(wxLANGUAGE_ARABIC_MOROCCO,             "ar_MA", LANG_ARABIC    , SUBLANG_ARABIC_MOROCCO            , wxLayout_RightToLeft, "Arabic (Morocco)")
-   LNG(wxLANGUAGE_ARABIC_OMAN,                "ar_OM", LANG_ARABIC    , SUBLANG_ARABIC_OMAN               , wxLayout_RightToLeft, "Arabic (Oman)")
-   LNG(wxLANGUAGE_ARABIC_QATAR,               "ar_QA", LANG_ARABIC    , SUBLANG_ARABIC_QATAR              , wxLayout_RightToLeft, "Arabic (Qatar)")
-   LNG(wxLANGUAGE_ARABIC_SAUDI_ARABIA,        "ar_SA", LANG_ARABIC    , SUBLANG_ARABIC_SAUDI_ARABIA       , wxLayout_RightToLeft, "Arabic (Saudi Arabia)")
-   LNG(wxLANGUAGE_ARABIC_SUDAN,               "ar_SD", 0              , 0                                 , wxLayout_RightToLeft, "Arabic (Sudan)")
-   LNG(wxLANGUAGE_ARABIC_SYRIA,               "ar_SY", LANG_ARABIC    , SUBLANG_ARABIC_SYRIA              , wxLayout_RightToLeft, "Arabic (Syria)")
-   LNG(wxLANGUAGE_ARABIC_TUNISIA,             "ar_TN", LANG_ARABIC    , SUBLANG_ARABIC_TUNISIA            , wxLayout_RightToLeft, "Arabic (Tunisia)")
-   LNG(wxLANGUAGE_ARABIC_UAE,                 "ar_AE", LANG_ARABIC    , SUBLANG_ARABIC_UAE                , wxLayout_RightToLeft, "Arabic (Uae)")
-   LNG(wxLANGUAGE_ARABIC_YEMEN,               "ar_YE", LANG_ARABIC    , SUBLANG_ARABIC_YEMEN              , wxLayout_RightToLeft, "Arabic (Yemen)")
-   LNG(wxLANGUAGE_ARMENIAN,                   "hy"   , LANG_ARMENIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Armenian")
-   LNG(wxLANGUAGE_ASSAMESE,                   "as"   , LANG_ASSAMESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Assamese")
-   LNG(wxLANGUAGE_ASTURIAN,                   "ast"  , 0              , 0                                 , wxLayout_LeftToRight, "Asturian")
-   LNG(wxLANGUAGE_AYMARA,                     "ay"   , 0              , 0                                 , wxLayout_LeftToRight, "Aymara")
-   LNG(wxLANGUAGE_AZERI,                      "az"   , LANG_AZERI     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Azeri")
-   LNG(wxLANGUAGE_AZERI_CYRILLIC,             "az"   , LANG_AZERI     , SUBLANG_AZERI_CYRILLIC            , wxLayout_LeftToRight, "Azeri (Cyrillic)")
-   LNG(wxLANGUAGE_AZERI_LATIN,                "az"   , LANG_AZERI     , SUBLANG_AZERI_LATIN               , wxLayout_LeftToRight, "Azeri (Latin)")
-   LNG(wxLANGUAGE_BASHKIR,                    "ba"   , 0              , 0                                 , wxLayout_LeftToRight, "Bashkir")
-   LNG(wxLANGUAGE_BASQUE,                     "eu_ES", LANG_BASQUE    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Basque")
-   LNG(wxLANGUAGE_BELARUSIAN,                 "be_BY", LANG_BELARUSIAN, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Belarusian")
-   LNG(wxLANGUAGE_BENGALI,                    "bn"   , LANG_BENGALI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Bengali")
-   LNG(wxLANGUAGE_BHUTANI,                    "dz"   , 0              , 0                                 , wxLayout_LeftToRight, "Bhutani")
-   LNG(wxLANGUAGE_BIHARI,                     "bh"   , 0              , 0                                 , wxLayout_LeftToRight, "Bihari")
-   LNG(wxLANGUAGE_BISLAMA,                    "bi"   , 0              , 0                                 , wxLayout_LeftToRight, "Bislama")
-   LNG(wxLANGUAGE_BOSNIAN,                    "bs"   , LANG_BOSNIAN   , SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN, wxLayout_LeftToRight, "Bosnian")
-   LNG(wxLANGUAGE_BRETON,                     "br"   , 0              , 0                                 , wxLayout_LeftToRight, "Breton")
-   LNG(wxLANGUAGE_BULGARIAN,                  "bg_BG", LANG_BULGARIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Bulgarian")
-   LNG(wxLANGUAGE_BURMESE,                    "my"   , 0              , 0                                 , wxLayout_LeftToRight, "Burmese")
-   LNG(wxLANGUAGE_CAMBODIAN,                  "km"   , 0              , 0                                 , wxLayout_LeftToRight, "Cambodian")
-   LNG(wxLANGUAGE_CATALAN,                    "ca_ES", LANG_CATALAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Catalan")
-   LNG(wxLANGUAGE_CHINESE,                    "zh_TW", LANG_CHINESE   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Chinese")
-   LNG(wxLANGUAGE_CHINESE_SIMPLIFIED,         "zh_CN", LANG_CHINESE   , SUBLANG_CHINESE_SIMPLIFIED        , wxLayout_LeftToRight, "Chinese (Simplified)")
-   LNG(wxLANGUAGE_CHINESE_TRADITIONAL,        "zh_TW", LANG_CHINESE   , SUBLANG_CHINESE_TRADITIONAL       , wxLayout_LeftToRight, "Chinese (Traditional)")
-   LNG(wxLANGUAGE_CHINESE_HONGKONG,           "zh_HK", LANG_CHINESE   , SUBLANG_CHINESE_HONGKONG          , wxLayout_LeftToRight, "Chinese (Hongkong)")
-   LNG(wxLANGUAGE_CHINESE_MACAU,              "zh_MO", LANG_CHINESE   , SUBLANG_CHINESE_MACAU             , wxLayout_LeftToRight, "Chinese (Macau)")
-   LNG(wxLANGUAGE_CHINESE_SINGAPORE,          "zh_SG", LANG_CHINESE   , SUBLANG_CHINESE_SINGAPORE         , wxLayout_LeftToRight, "Chinese (Singapore)")
-   LNG(wxLANGUAGE_CHINESE_TAIWAN,             "zh_TW", LANG_CHINESE   , SUBLANG_CHINESE_TRADITIONAL       , wxLayout_LeftToRight, "Chinese (Taiwan)")
-   LNG(wxLANGUAGE_CORSICAN,                   "co"   , 0              , 0                                 , wxLayout_LeftToRight, "Corsican")
-   LNG(wxLANGUAGE_CROATIAN,                   "hr_HR", LANG_CROATIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Croatian")
-   LNG(wxLANGUAGE_CZECH,                      "cs_CZ", LANG_CZECH     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Czech")
-   LNG(wxLANGUAGE_DANISH,                     "da_DK", LANG_DANISH    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Danish")
-   LNG(wxLANGUAGE_DUTCH,                      "nl_NL", LANG_DUTCH     , SUBLANG_DUTCH                     , wxLayout_LeftToRight, "Dutch")
-   LNG(wxLANGUAGE_DUTCH_BELGIAN,              "nl_BE", LANG_DUTCH     , SUBLANG_DUTCH_BELGIAN             , wxLayout_LeftToRight, "Dutch (Belgian)")
-   LNG(wxLANGUAGE_ENGLISH,                    "en_GB", LANG_ENGLISH   , SUBLANG_ENGLISH_UK                , wxLayout_LeftToRight, "English")
-   LNG(wxLANGUAGE_ENGLISH_UK,                 "en_GB", LANG_ENGLISH   , SUBLANG_ENGLISH_UK                , wxLayout_LeftToRight, "English (U.K.)")
-   LNG(wxLANGUAGE_ENGLISH_US,                 "en_US", LANG_ENGLISH   , SUBLANG_ENGLISH_US                , wxLayout_LeftToRight, "English (U.S.)")
-   LNG(wxLANGUAGE_ENGLISH_AUSTRALIA,          "en_AU", LANG_ENGLISH   , SUBLANG_ENGLISH_AUS               , wxLayout_LeftToRight, "English (Australia)")
-   LNG(wxLANGUAGE_ENGLISH_BELIZE,             "en_BZ", LANG_ENGLISH   , SUBLANG_ENGLISH_BELIZE            , wxLayout_LeftToRight, "English (Belize)")
-   LNG(wxLANGUAGE_ENGLISH_BOTSWANA,           "en_BW", 0              , 0                                 , wxLayout_LeftToRight, "English (Botswana)")
-   LNG(wxLANGUAGE_ENGLISH_CANADA,             "en_CA", LANG_ENGLISH   , SUBLANG_ENGLISH_CAN               , wxLayout_LeftToRight, "English (Canada)")
-   LNG(wxLANGUAGE_ENGLISH_CARIBBEAN,          "en_CB", LANG_ENGLISH   , SUBLANG_ENGLISH_CARIBBEAN         , wxLayout_LeftToRight, "English (Caribbean)")
-   LNG(wxLANGUAGE_ENGLISH_DENMARK,            "en_DK", 0              , 0                                 , wxLayout_LeftToRight, "English (Denmark)")
-   LNG(wxLANGUAGE_ENGLISH_EIRE,               "en_IE", LANG_ENGLISH   , SUBLANG_ENGLISH_EIRE              , wxLayout_LeftToRight, "English (Eire)")
-   LNG(wxLANGUAGE_ENGLISH_JAMAICA,            "en_JM", LANG_ENGLISH   , SUBLANG_ENGLISH_JAMAICA           , wxLayout_LeftToRight, "English (Jamaica)")
-   LNG(wxLANGUAGE_ENGLISH_NEW_ZEALAND,        "en_NZ", LANG_ENGLISH   , SUBLANG_ENGLISH_NZ                , wxLayout_LeftToRight, "English (New Zealand)")
-   LNG(wxLANGUAGE_ENGLISH_PHILIPPINES,        "en_PH", LANG_ENGLISH   , SUBLANG_ENGLISH_PHILIPPINES       , wxLayout_LeftToRight, "English (Philippines)")
-   LNG(wxLANGUAGE_ENGLISH_SOUTH_AFRICA,       "en_ZA", LANG_ENGLISH   , SUBLANG_ENGLISH_SOUTH_AFRICA      , wxLayout_LeftToRight, "English (South Africa)")
-   LNG(wxLANGUAGE_ENGLISH_TRINIDAD,           "en_TT", LANG_ENGLISH   , SUBLANG_ENGLISH_TRINIDAD          , wxLayout_LeftToRight, "English (Trinidad)")
-   LNG(wxLANGUAGE_ENGLISH_ZIMBABWE,           "en_ZW", LANG_ENGLISH   , SUBLANG_ENGLISH_ZIMBABWE          , wxLayout_LeftToRight, "English (Zimbabwe)")
-   LNG(wxLANGUAGE_ESPERANTO,                  "eo"   , 0              , 0                                 , wxLayout_LeftToRight, "Esperanto")
-   LNG(wxLANGUAGE_ESTONIAN,                   "et_EE", LANG_ESTONIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Estonian")
-   LNG(wxLANGUAGE_FAEROESE,                   "fo_FO", LANG_FAEROESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Faeroese")
-   LNG(wxLANGUAGE_FARSI,                      "fa_IR", LANG_FARSI     , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Farsi")
-   LNG(wxLANGUAGE_FIJI,                       "fj"   , 0              , 0                                 , wxLayout_LeftToRight, "Fiji")
-   LNG(wxLANGUAGE_FINNISH,                    "fi_FI", LANG_FINNISH   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Finnish")
-   LNG(wxLANGUAGE_FRENCH,                     "fr_FR", LANG_FRENCH    , SUBLANG_FRENCH                    , wxLayout_LeftToRight, "French")
-   LNG(wxLANGUAGE_FRENCH_BELGIAN,             "fr_BE", LANG_FRENCH    , SUBLANG_FRENCH_BELGIAN            , wxLayout_LeftToRight, "French (Belgian)")
-   LNG(wxLANGUAGE_FRENCH_CANADIAN,            "fr_CA", LANG_FRENCH    , SUBLANG_FRENCH_CANADIAN           , wxLayout_LeftToRight, "French (Canadian)")
-   LNG(wxLANGUAGE_FRENCH_LUXEMBOURG,          "fr_LU", LANG_FRENCH    , SUBLANG_FRENCH_LUXEMBOURG         , wxLayout_LeftToRight, "French (Luxembourg)")
-   LNG(wxLANGUAGE_FRENCH_MONACO,              "fr_MC", LANG_FRENCH    , SUBLANG_FRENCH_MONACO             , wxLayout_LeftToRight, "French (Monaco)")
-   LNG(wxLANGUAGE_FRENCH_SWISS,               "fr_CH", LANG_FRENCH    , SUBLANG_FRENCH_SWISS              , wxLayout_LeftToRight, "French (Swiss)")
-   LNG(wxLANGUAGE_FRISIAN,                    "fy"   , 0              , 0                                 , wxLayout_LeftToRight, "Frisian")
-   LNG(wxLANGUAGE_GALICIAN,                   "gl_ES", 0              , 0                                 , wxLayout_LeftToRight, "Galician")
-   LNG(wxLANGUAGE_GEORGIAN,                   "ka_GE", LANG_GEORGIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Georgian")
-   LNG(wxLANGUAGE_GERMAN,                     "de_DE", LANG_GERMAN    , SUBLANG_GERMAN                    , wxLayout_LeftToRight, "German")
-   LNG(wxLANGUAGE_GERMAN_AUSTRIAN,            "de_AT", LANG_GERMAN    , SUBLANG_GERMAN_AUSTRIAN           , wxLayout_LeftToRight, "German (Austrian)")
-   LNG(wxLANGUAGE_GERMAN_BELGIUM,             "de_BE", 0              , 0                                 , wxLayout_LeftToRight, "German (Belgium)")
-   LNG(wxLANGUAGE_GERMAN_LIECHTENSTEIN,       "de_LI", LANG_GERMAN    , SUBLANG_GERMAN_LIECHTENSTEIN      , wxLayout_LeftToRight, "German (Liechtenstein)")
-   LNG(wxLANGUAGE_GERMAN_LUXEMBOURG,          "de_LU", LANG_GERMAN    , SUBLANG_GERMAN_LUXEMBOURG         , wxLayout_LeftToRight, "German (Luxembourg)")
-   LNG(wxLANGUAGE_GERMAN_SWISS,               "de_CH", LANG_GERMAN    , SUBLANG_GERMAN_SWISS              , wxLayout_LeftToRight, "German (Swiss)")
-   LNG(wxLANGUAGE_GREEK,                      "el_GR", LANG_GREEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Greek")
-   LNG(wxLANGUAGE_GREENLANDIC,                "kl_GL", 0              , 0                                 , wxLayout_LeftToRight, "Greenlandic")
-   LNG(wxLANGUAGE_GUARANI,                    "gn"   , 0              , 0                                 , wxLayout_LeftToRight, "Guarani")
-   LNG(wxLANGUAGE_GUJARATI,                   "gu"   , LANG_GUJARATI  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Gujarati")
-   LNG(wxLANGUAGE_HAUSA,                      "ha"   , 0              , 0                                 , wxLayout_LeftToRight, "Hausa")
-   LNG(wxLANGUAGE_HEBREW,                     "he_IL", LANG_HEBREW    , SUBLANG_DEFAULT                   , wxLayout_RightToLeft, "Hebrew")
-   LNG(wxLANGUAGE_HINDI,                      "hi_IN", LANG_HINDI     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Hindi")
-   LNG(wxLANGUAGE_HUNGARIAN,                  "hu_HU", LANG_HUNGARIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Hungarian")
-   LNG(wxLANGUAGE_ICELANDIC,                  "is_IS", LANG_ICELANDIC , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Icelandic")
-   LNG(wxLANGUAGE_INDONESIAN,                 "id_ID", LANG_INDONESIAN, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Indonesian")
-   LNG(wxLANGUAGE_INTERLINGUA,                "ia"   , 0              , 0                                 , wxLayout_LeftToRight, "Interlingua")
-   LNG(wxLANGUAGE_INTERLINGUE,                "ie"   , 0              , 0                                 , wxLayout_LeftToRight, "Interlingue")
-   LNG(wxLANGUAGE_INUKTITUT,                  "iu"   , 0              , 0                                 , wxLayout_LeftToRight, "Inuktitut")
-   LNG(wxLANGUAGE_INUPIAK,                    "ik"   , 0              , 0                                 , wxLayout_LeftToRight, "Inupiak")
-   LNG(wxLANGUAGE_IRISH,                      "ga_IE", 0              , 0                                 , wxLayout_LeftToRight, "Irish")
-   LNG(wxLANGUAGE_ITALIAN,                    "it_IT", LANG_ITALIAN   , SUBLANG_ITALIAN                   , wxLayout_LeftToRight, "Italian")
-   LNG(wxLANGUAGE_ITALIAN_SWISS,              "it_CH", LANG_ITALIAN   , SUBLANG_ITALIAN_SWISS             , wxLayout_LeftToRight, "Italian (Swiss)")
-   LNG(wxLANGUAGE_JAPANESE,                   "ja_JP", LANG_JAPANESE  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Japanese")
-   LNG(wxLANGUAGE_JAVANESE,                   "jv"   , 0              , 0                                 , wxLayout_LeftToRight, "Javanese")
-   LNG(wxLANGUAGE_KANNADA,                    "kn"   , LANG_KANNADA   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Kannada")
-   LNG(wxLANGUAGE_KASHMIRI,                   "ks"   , LANG_KASHMIRI  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Kashmiri")
-   LNG(wxLANGUAGE_KASHMIRI_INDIA,             "ks_IN", LANG_KASHMIRI  , SUBLANG_KASHMIRI_INDIA            , wxLayout_LeftToRight, "Kashmiri (India)")
-   LNG(wxLANGUAGE_KAZAKH,                     "kk"   , LANG_KAZAK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Kazakh")
-   LNG(wxLANGUAGE_KERNEWEK,                   "kw_GB", 0              , 0                                 , wxLayout_LeftToRight, "Kernewek")
-   LNG(wxLANGUAGE_KINYARWANDA,                "rw"   , 0              , 0                                 , wxLayout_LeftToRight, "Kinyarwanda")
-   LNG(wxLANGUAGE_KIRGHIZ,                    "ky"   , 0              , 0                                 , wxLayout_LeftToRight, "Kirghiz")
-   LNG(wxLANGUAGE_KIRUNDI,                    "rn"   , 0              , 0                                 , wxLayout_LeftToRight, "Kirundi")
-   LNG(wxLANGUAGE_KONKANI,                    ""     , LANG_KONKANI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Konkani")
-   LNG(wxLANGUAGE_KOREAN,                     "ko_KR", LANG_KOREAN    , SUBLANG_KOREAN                    , wxLayout_LeftToRight, "Korean")
-   LNG(wxLANGUAGE_KURDISH,                    "ku_TR", 0              , 0                                 , wxLayout_LeftToRight, "Kurdish")
-   LNG(wxLANGUAGE_LAOTHIAN,                   "lo"   , 0              , 0                                 , wxLayout_LeftToRight, "Laothian")
-   LNG(wxLANGUAGE_LATIN,                      "la"   , 0              , 0                                 , wxLayout_LeftToRight, "Latin")
-   LNG(wxLANGUAGE_LATVIAN,                    "lv_LV", LANG_LATVIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Latvian")
-   LNG(wxLANGUAGE_LINGALA,                    "ln"   , 0              , 0                                 , wxLayout_LeftToRight, "Lingala")
-   LNG(wxLANGUAGE_LITHUANIAN,                 "lt_LT", LANG_LITHUANIAN, SUBLANG_LITHUANIAN                , wxLayout_LeftToRight, "Lithuanian")
-   LNG(wxLANGUAGE_MACEDONIAN,                 "mk_MK", LANG_MACEDONIAN, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Macedonian")
-   LNG(wxLANGUAGE_MALAGASY,                   "mg"   , 0              , 0                                 , wxLayout_LeftToRight, "Malagasy")
-   LNG(wxLANGUAGE_MALAY,                      "ms_MY", LANG_MALAY     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Malay")
-   LNG(wxLANGUAGE_MALAYALAM,                  "ml"   , LANG_MALAYALAM , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Malayalam")
-   LNG(wxLANGUAGE_MALAY_BRUNEI_DARUSSALAM,    "ms_BN", LANG_MALAY     , SUBLANG_MALAY_BRUNEI_DARUSSALAM   , wxLayout_LeftToRight, "Malay (Brunei Darussalam)")
-   LNG(wxLANGUAGE_MALAY_MALAYSIA,             "ms_MY", LANG_MALAY     , SUBLANG_MALAY_MALAYSIA            , wxLayout_LeftToRight, "Malay (Malaysia)")
-   LNG(wxLANGUAGE_MALTESE,                    "mt_MT", 0              , 0                                 , wxLayout_LeftToRight, "Maltese")
-   LNG(wxLANGUAGE_MANIPURI,                   ""     , LANG_MANIPURI  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Manipuri")
-   LNG(wxLANGUAGE_MAORI,                      "mi"   , 0              , 0                                 , wxLayout_LeftToRight, "Maori")
-   LNG(wxLANGUAGE_MARATHI,                    "mr_IN", LANG_MARATHI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Marathi")
-   LNG(wxLANGUAGE_MOLDAVIAN,                  "mo"   , 0              , 0                                 , wxLayout_LeftToRight, "Moldavian")
-   LNG(wxLANGUAGE_MONGOLIAN,                  "mn"   , 0              , 0                                 , wxLayout_LeftToRight, "Mongolian")
-   LNG(wxLANGUAGE_NAURU,                      "na"   , 0              , 0                                 , wxLayout_LeftToRight, "Nauru")
-   LNG(wxLANGUAGE_NEPALI,                     "ne_NP", LANG_NEPALI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Nepali")
-   LNG(wxLANGUAGE_NEPALI_INDIA,               "ne_IN", LANG_NEPALI    , SUBLANG_NEPALI_INDIA              , wxLayout_LeftToRight, "Nepali (India)")
-   LNG(wxLANGUAGE_NORWEGIAN_BOKMAL,           "nb_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_BOKMAL          , wxLayout_LeftToRight, "Norwegian (Bokmal)")
-   LNG(wxLANGUAGE_NORWEGIAN_NYNORSK,          "nn_NO", LANG_NORWEGIAN , SUBLANG_NORWEGIAN_NYNORSK         , wxLayout_LeftToRight, "Norwegian (Nynorsk)")
-   LNG(wxLANGUAGE_OCCITAN,                    "oc"   , 0              , 0                                 , wxLayout_LeftToRight, "Occitan")
-   LNG(wxLANGUAGE_ORIYA,                      "or"   , LANG_ORIYA     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Oriya")
-   LNG(wxLANGUAGE_OROMO,                      "om"   , 0              , 0                                 , wxLayout_LeftToRight, "(Afan) Oromo")
-   LNG(wxLANGUAGE_PASHTO,                     "ps"   , 0              , 0                                 , wxLayout_LeftToRight, "Pashto, Pushto")
-   LNG(wxLANGUAGE_POLISH,                     "pl_PL", LANG_POLISH    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Polish")
-   LNG(wxLANGUAGE_PORTUGUESE,                 "pt_PT", LANG_PORTUGUESE, SUBLANG_PORTUGUESE                , wxLayout_LeftToRight, "Portuguese")
-   LNG(wxLANGUAGE_PORTUGUESE_BRAZILIAN,       "pt_BR", LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN      , wxLayout_LeftToRight, "Portuguese (Brazilian)")
-   LNG(wxLANGUAGE_PUNJABI,                    "pa"   , LANG_PUNJABI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Punjabi")
-   LNG(wxLANGUAGE_QUECHUA,                    "qu"   , 0              , 0                                 , wxLayout_LeftToRight, "Quechua")
-   LNG(wxLANGUAGE_RHAETO_ROMANCE,             "rm"   , 0              , 0                                 , wxLayout_LeftToRight, "Rhaeto-Romance")
-   LNG(wxLANGUAGE_ROMANIAN,                   "ro_RO", LANG_ROMANIAN  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Romanian")
-   LNG(wxLANGUAGE_RUSSIAN,                    "ru_RU", LANG_RUSSIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Russian")
-   LNG(wxLANGUAGE_RUSSIAN_UKRAINE,            "ru_UA", 0              , 0                                 , wxLayout_LeftToRight, "Russian (Ukraine)")
-   LNG(wxLANGUAGE_SAMI,                       "se_NO", LANG_SAMI      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Northern Sami")
-   LNG(wxLANGUAGE_SAMOAN,                     "sm"   , 0              , 0                                 , wxLayout_LeftToRight, "Samoan")
-   LNG(wxLANGUAGE_SANGHO,                     "sg"   , 0              , 0                                 , wxLayout_LeftToRight, "Sangho")
-   LNG(wxLANGUAGE_SANSKRIT,                   "sa"   , LANG_SANSKRIT  , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sanskrit")
-   LNG(wxLANGUAGE_SCOTS_GAELIC,               "gd"   , 0              , 0                                 , wxLayout_LeftToRight, "Scots Gaelic")
-   LNG(wxLANGUAGE_SERBIAN,                    "sr_RS", LANG_SERBIAN   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Serbian")
-   LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_RS", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")
-   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_RS@latin", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")
-   LNG(wxLANGUAGE_SERBIAN_CYRILLIC,           "sr_YU", LANG_SERBIAN   , SUBLANG_SERBIAN_CYRILLIC          , wxLayout_LeftToRight, "Serbian (Cyrillic)")
-   LNG(wxLANGUAGE_SERBIAN_LATIN,              "sr_YU@latin", LANG_SERBIAN   , SUBLANG_SERBIAN_LATIN             , wxLayout_LeftToRight, "Serbian (Latin)")
-   LNG(wxLANGUAGE_SERBO_CROATIAN,             "sh"   , 0              , 0                                 , wxLayout_LeftToRight, "Serbo-Croatian")
-   LNG(wxLANGUAGE_SESOTHO,                    "st"   , 0              , 0                                 , wxLayout_LeftToRight, "Sesotho")
-   LNG(wxLANGUAGE_SETSWANA,                   "tn"   , 0              , 0                                 , wxLayout_LeftToRight, "Setswana")
-   LNG(wxLANGUAGE_SHONA,                      "sn"   , 0              , 0                                 , wxLayout_LeftToRight, "Shona")
-   LNG(wxLANGUAGE_SINDHI,                     "sd"   , LANG_SINDHI    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Sindhi")
-   LNG(wxLANGUAGE_SINHALESE,                  "si"   , 0              , 0                                 , wxLayout_LeftToRight, "Sinhalese")
-   LNG(wxLANGUAGE_SISWATI,                    "ss"   , 0              , 0                                 , wxLayout_LeftToRight, "Siswati")
-   LNG(wxLANGUAGE_SLOVAK,                     "sk_SK", LANG_SLOVAK    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Slovak")
-   LNG(wxLANGUAGE_SLOVENIAN,                  "sl_SI", LANG_SLOVENIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Slovenian")
-   LNG(wxLANGUAGE_SOMALI,                     "so"   , 0              , 0                                 , wxLayout_LeftToRight, "Somali")
-   LNG(wxLANGUAGE_SPANISH,                    "es_ES", LANG_SPANISH   , SUBLANG_SPANISH                   , wxLayout_LeftToRight, "Spanish")
-   LNG(wxLANGUAGE_SPANISH_ARGENTINA,          "es_AR", LANG_SPANISH   , SUBLANG_SPANISH_ARGENTINA         , wxLayout_LeftToRight, "Spanish (Argentina)")
-   LNG(wxLANGUAGE_SPANISH_BOLIVIA,            "es_BO", LANG_SPANISH   , SUBLANG_SPANISH_BOLIVIA           , wxLayout_LeftToRight, "Spanish (Bolivia)")
-   LNG(wxLANGUAGE_SPANISH_CHILE,              "es_CL", LANG_SPANISH   , SUBLANG_SPANISH_CHILE             , wxLayout_LeftToRight, "Spanish (Chile)")
-   LNG(wxLANGUAGE_SPANISH_COLOMBIA,           "es_CO", LANG_SPANISH   , SUBLANG_SPANISH_COLOMBIA          , wxLayout_LeftToRight, "Spanish (Colombia)")
-   LNG(wxLANGUAGE_SPANISH_COSTA_RICA,         "es_CR", LANG_SPANISH   , SUBLANG_SPANISH_COSTA_RICA        , wxLayout_LeftToRight, "Spanish (Costa Rica)")
-   LNG(wxLANGUAGE_SPANISH_DOMINICAN_REPUBLIC, "es_DO", LANG_SPANISH   , SUBLANG_SPANISH_DOMINICAN_REPUBLIC, wxLayout_LeftToRight, "Spanish (Dominican republic)")
-   LNG(wxLANGUAGE_SPANISH_ECUADOR,            "es_EC", LANG_SPANISH   , SUBLANG_SPANISH_ECUADOR           , wxLayout_LeftToRight, "Spanish (Ecuador)")
-   LNG(wxLANGUAGE_SPANISH_EL_SALVADOR,        "es_SV", LANG_SPANISH   , SUBLANG_SPANISH_EL_SALVADOR       , wxLayout_LeftToRight, "Spanish (El Salvador)")
-   LNG(wxLANGUAGE_SPANISH_GUATEMALA,          "es_GT", LANG_SPANISH   , SUBLANG_SPANISH_GUATEMALA         , wxLayout_LeftToRight, "Spanish (Guatemala)")
-   LNG(wxLANGUAGE_SPANISH_HONDURAS,           "es_HN", LANG_SPANISH   , SUBLANG_SPANISH_HONDURAS          , wxLayout_LeftToRight, "Spanish (Honduras)")
-   LNG(wxLANGUAGE_SPANISH_MEXICAN,            "es_MX", LANG_SPANISH   , SUBLANG_SPANISH_MEXICAN           , wxLayout_LeftToRight, "Spanish (Mexican)")
-   LNG(wxLANGUAGE_SPANISH_MODERN,             "es_ES", LANG_SPANISH   , SUBLANG_SPANISH_MODERN            , wxLayout_LeftToRight, "Spanish (Modern)")
-   LNG(wxLANGUAGE_SPANISH_NICARAGUA,          "es_NI", LANG_SPANISH   , SUBLANG_SPANISH_NICARAGUA         , wxLayout_LeftToRight, "Spanish (Nicaragua)")
-   LNG(wxLANGUAGE_SPANISH_PANAMA,             "es_PA", LANG_SPANISH   , SUBLANG_SPANISH_PANAMA            , wxLayout_LeftToRight, "Spanish (Panama)")
-   LNG(wxLANGUAGE_SPANISH_PARAGUAY,           "es_PY", LANG_SPANISH   , SUBLANG_SPANISH_PARAGUAY          , wxLayout_LeftToRight, "Spanish (Paraguay)")
-   LNG(wxLANGUAGE_SPANISH_PERU,               "es_PE", LANG_SPANISH   , SUBLANG_SPANISH_PERU              , wxLayout_LeftToRight, "Spanish (Peru)")
-   LNG(wxLANGUAGE_SPANISH_PUERTO_RICO,        "es_PR", LANG_SPANISH   , SUBLANG_SPANISH_PUERTO_RICO       , wxLayout_LeftToRight, "Spanish (Puerto Rico)")
-   LNG(wxLANGUAGE_SPANISH_URUGUAY,            "es_UY", LANG_SPANISH   , SUBLANG_SPANISH_URUGUAY           , wxLayout_LeftToRight, "Spanish (Uruguay)")
-   LNG(wxLANGUAGE_SPANISH_US,                 "es_US", 0              , 0                                 , wxLayout_LeftToRight, "Spanish (U.S.)")
-   LNG(wxLANGUAGE_SPANISH_VENEZUELA,          "es_VE", LANG_SPANISH   , SUBLANG_SPANISH_VENEZUELA         , wxLayout_LeftToRight, "Spanish (Venezuela)")
-   LNG(wxLANGUAGE_SUNDANESE,                  "su"   , 0              , 0                                 , wxLayout_LeftToRight, "Sundanese")
-   LNG(wxLANGUAGE_SWAHILI,                    "sw_KE", LANG_SWAHILI   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Swahili")
-   LNG(wxLANGUAGE_SWEDISH,                    "sv_SE", LANG_SWEDISH   , SUBLANG_SWEDISH                   , wxLayout_LeftToRight, "Swedish")
-   LNG(wxLANGUAGE_SWEDISH_FINLAND,            "sv_FI", LANG_SWEDISH   , SUBLANG_SWEDISH_FINLAND           , wxLayout_LeftToRight, "Swedish (Finland)")
-   LNG(wxLANGUAGE_TAGALOG,                    "tl_PH", 0              , 0                                 , wxLayout_LeftToRight, "Tagalog")
-   LNG(wxLANGUAGE_TAJIK,                      "tg"   , 0              , 0                                 , wxLayout_LeftToRight, "Tajik")
-   LNG(wxLANGUAGE_TAMIL,                      "ta"   , LANG_TAMIL     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Tamil")
-   LNG(wxLANGUAGE_TATAR,                      "tt"   , LANG_TATAR     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Tatar")
-   LNG(wxLANGUAGE_TELUGU,                     "te"   , LANG_TELUGU    , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Telugu")
-   LNG(wxLANGUAGE_THAI,                       "th_TH", LANG_THAI      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Thai")
-   LNG(wxLANGUAGE_TIBETAN,                    "bo"   , 0              , 0                                 , wxLayout_LeftToRight, "Tibetan")
-   LNG(wxLANGUAGE_TIGRINYA,                   "ti"   , 0              , 0                                 , wxLayout_LeftToRight, "Tigrinya")
-   LNG(wxLANGUAGE_TONGA,                      "to"   , 0              , 0                                 , wxLayout_LeftToRight, "Tonga")
-   LNG(wxLANGUAGE_TSONGA,                     "ts"   , 0              , 0                                 , wxLayout_LeftToRight, "Tsonga")
-   LNG(wxLANGUAGE_TURKISH,                    "tr_TR", LANG_TURKISH   , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Turkish")
-   LNG(wxLANGUAGE_TURKMEN,                    "tk"   , 0              , 0                                 , wxLayout_LeftToRight, "Turkmen")
-   LNG(wxLANGUAGE_TWI,                        "tw"   , 0              , 0                                 , wxLayout_LeftToRight, "Twi")
-   LNG(wxLANGUAGE_UIGHUR,                     "ug"   , 0              , 0                                 , wxLayout_LeftToRight, "Uighur")
-   LNG(wxLANGUAGE_UKRAINIAN,                  "uk_UA", LANG_UKRAINIAN , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Ukrainian")
-   LNG(wxLANGUAGE_URDU,                       "ur"   , LANG_URDU      , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Urdu")
-   LNG(wxLANGUAGE_URDU_INDIA,                 "ur_IN", LANG_URDU      , SUBLANG_URDU_INDIA                , wxLayout_LeftToRight, "Urdu (India)")
-   LNG(wxLANGUAGE_URDU_PAKISTAN,              "ur_PK", LANG_URDU      , SUBLANG_URDU_PAKISTAN             , wxLayout_LeftToRight, "Urdu (Pakistan)")
-   LNG(wxLANGUAGE_UZBEK,                      "uz"   , LANG_UZBEK     , SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Uzbek")
-   LNG(wxLANGUAGE_UZBEK_CYRILLIC,             "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_CYRILLIC            , wxLayout_LeftToRight, "Uzbek (Cyrillic)")
-   LNG(wxLANGUAGE_UZBEK_LATIN,                "uz"   , LANG_UZBEK     , SUBLANG_UZBEK_LATIN               , wxLayout_LeftToRight, "Uzbek (Latin)")
-   LNG(wxLANGUAGE_VALENCIAN,                  "ca_ES@valencia", 0              , 0                                 , wxLayout_LeftToRight, "Valencian (Southern Catalan)")
-   LNG(wxLANGUAGE_VIETNAMESE,                 "vi_VN", LANG_VIETNAMESE, SUBLANG_DEFAULT                   , wxLayout_LeftToRight, "Vietnamese")
-   LNG(wxLANGUAGE_VOLAPUK,                    "vo"   , 0              , 0                                 , wxLayout_LeftToRight, "Volapuk")
-   LNG(wxLANGUAGE_WELSH,                      "cy"   , 0              , 0                                 , wxLayout_LeftToRight, "Welsh")
-   LNG(wxLANGUAGE_WOLOF,                      "wo"   , 0              , 0                                 , wxLayout_LeftToRight, "Wolof")
-   LNG(wxLANGUAGE_XHOSA,                      "xh"   , 0              , 0                                 , wxLayout_LeftToRight, "Xhosa")
-   LNG(wxLANGUAGE_YIDDISH,                    "yi"   , 0              , 0                                 , wxLayout_LeftToRight, "Yiddish")
-   LNG(wxLANGUAGE_YORUBA,                     "yo"   , 0              , 0                                 , wxLayout_LeftToRight, "Yoruba")
-   LNG(wxLANGUAGE_ZHUANG,                     "za"   , 0              , 0                                 , wxLayout_LeftToRight, "Zhuang")
-   LNG(wxLANGUAGE_ZULU,                       "zu"   , 0              , 0                                 , wxLayout_LeftToRight, "Zulu")
-
-}
-#undef LNG
-
-// --- --- --- generated code ends here --- --- ---
-
-#endif // wxUSE_INTL
diff --git a/Source/3rd Party/wx/src/common/layout.cpp b/Source/3rd Party/wx/src/common/layout.cpp
index bf4228dcd..d796eee1f 100644
--- a/Source/3rd Party/wx/src/common/layout.cpp	
+++ b/Source/3rd Party/wx/src/common/layout.cpp	
@@ -1,1026 +1,1026 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/layout.cpp
-// Purpose:     Constraint layout system classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// =============================================================================
-// declarations
-// =============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_CONSTRAINTS
-
-#include "wx/layout.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-    #include "wx/utils.h"
-    #include "wx/dialog.h"
-    #include "wx/msgdlg.h"
-    #include "wx/intl.h"
-#endif
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
-
-
-inline void wxGetAsIs(wxWindowBase* win, int* w, int* h)
-{
-#if 1
-    // The old way.  Works for me.
-    win->GetSize(w, h);
-#endif
-
-#if 0
-    // Vadim's change.  Breaks wxPython's LayoutAnchors
-    win->GetBestSize(w, h);
-#endif
-
-#if 0
-    // Proposed compromise.  Doesn't work.
-    int sw, sh, bw, bh;
-    win->GetSize(&sw, &sh);
-    win->GetBestSize(&bw, &bh);
-    if (w)
-        *w = wxMax(sw, bw);
-    if (h)
-        *h = wxMax(sh, bh);
-#endif
-}
-
-
-wxIndividualLayoutConstraint::wxIndividualLayoutConstraint()
-{
-    myEdge = wxTop;
-    relationship = wxUnconstrained;
-    margin = 0;
-    value = 0;
-    percent = 0;
-    otherEdge = wxTop;
-    done = false;
-    otherWin = NULL;
-}
-
-void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg)
-{
-    if (rel == wxSameAs)
-    {
-        // If Set is called by the user with wxSameAs then call SameAs to do
-        // it since it will actually use wxPercent instead.
-        SameAs(otherW, otherE, marg);
-        return;
-    }
-
-    relationship = rel;
-    otherWin = otherW;
-    otherEdge = otherE;
-
-    if ( rel == wxPercentOf )
-    {
-        percent = val;
-    }
-    else
-    {
-        value = val;
-    }
-
-    margin = marg;
-}
-
-void wxIndividualLayoutConstraint::LeftOf(wxWindowBase *sibling, int marg)
-{
-    Set(wxLeftOf, sibling, wxLeft, 0, marg);
-}
-
-void wxIndividualLayoutConstraint::RightOf(wxWindowBase *sibling, int marg)
-{
-    Set(wxRightOf, sibling, wxRight, 0, marg);
-}
-
-void wxIndividualLayoutConstraint::Above(wxWindowBase *sibling, int marg)
-{
-    Set(wxAbove, sibling, wxTop, 0, marg);
-}
-
-void wxIndividualLayoutConstraint::Below(wxWindowBase *sibling, int marg)
-{
-    Set(wxBelow, sibling, wxBottom, 0, marg);
-}
-
-//
-// 'Same edge' alignment
-//
-void wxIndividualLayoutConstraint::SameAs(wxWindowBase *otherW, wxEdge edge, int marg)
-{
-    Set(wxPercentOf, otherW, edge, 100, marg);
-}
-
-// The edge is a percentage of the other window's edge
-void wxIndividualLayoutConstraint::PercentOf(wxWindowBase *otherW, wxEdge wh, int per)
-{
-    Set(wxPercentOf, otherW, wh, per);
-}
-
-//
-// Edge has absolute value
-//
-void wxIndividualLayoutConstraint::Absolute(int val)
-{
-    value = val;
-    relationship = wxAbsolute;
-}
-
-// Reset constraint if it mentions otherWin
-bool wxIndividualLayoutConstraint::ResetIfWin(wxWindowBase *otherW)
-{
-    if (otherW == otherWin)
-    {
-        myEdge = wxTop;
-        relationship = wxAsIs;
-        margin = 0;
-        value = 0;
-        percent = 0;
-        otherEdge = wxTop;
-        otherWin = NULL;
-        return true;
-    }
-
-    return false;
-}
-
-// Try to satisfy constraint
-bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constraints, wxWindowBase *win)
-{
-    if (relationship == wxAbsolute)
-    {
-        done = true;
-        return true;
-    }
-
-    switch (myEdge)
-    {
-        case wxLeft:
-        {
-            switch (relationship)
-            {
-                case wxLeftOf:
-                {
-                    // We can know this edge if: otherWin is win's
-                    // parent, or otherWin has a satisfied constraint,
-                    // or otherWin has no constraint.
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos - margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxRightOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos + margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxPercentOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = (int)(edgePos*(((float)percent)*0.01) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxUnconstrained:
-                {
-                    // We know the left-hand edge position if we know
-                    // the right-hand edge and we know the width; OR if
-                    // we know the centre and the width.
-                    if (constraints->right.GetDone() && constraints->width.GetDone())
-                    {
-                        value = (constraints->right.GetValue() - constraints->width.GetValue() + margin);
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->centreX.GetDone() && constraints->width.GetDone())
-                    {
-                        value = (int)(constraints->centreX.GetValue() - (constraints->width.GetValue()/2) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxAsIs:
-                {
-                    int y;
-                    win->GetPosition(&value, &y);
-                    done = true;
-                    return true;
-                }
-                default:
-                    break;
-            }
-            break;
-        }
-        case wxRight:
-        {
-            switch (relationship)
-            {
-                case wxLeftOf:
-                {
-                    // We can know this edge if: otherWin is win's
-                    // parent, or otherWin has a satisfied constraint,
-                    // or otherWin has no constraint.
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos - margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxRightOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos + margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxPercentOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = (int)(edgePos*(((float)percent)*0.01) - margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxUnconstrained:
-                {
-                    // We know the right-hand edge position if we know the
-                    // left-hand edge and we know the width, OR if we know the
-                    // centre edge and the width.
-                    if (constraints->left.GetDone() && constraints->width.GetDone())
-                    {
-                        value = (constraints->left.GetValue() + constraints->width.GetValue() - margin);
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->centreX.GetDone() && constraints->width.GetDone())
-                    {
-                        value = (int)(constraints->centreX.GetValue() + (constraints->width.GetValue()/2) - margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxAsIs:
-                {
-                    int x, y;
-                    int w, h;
-                    wxGetAsIs(win, &w, &h);
-                    win->GetPosition(&x, &y);
-                    value = x + w;
-                    done = true;
-                    return true;
-                }
-                default:
-                    break;
-            }
-            break;
-        }
-        case wxTop:
-        {
-            switch (relationship)
-            {
-                case wxAbove:
-                {
-                    // We can know this edge if: otherWin is win's
-                    // parent, or otherWin has a satisfied constraint,
-                    // or otherWin has no constraint.
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos - margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxBelow:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos + margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxPercentOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = (int)(edgePos*(((float)percent)*0.01) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxUnconstrained:
-                {
-                    // We know the top edge position if we know the bottom edge
-                    // and we know the height; OR if we know the centre edge and
-                    // the height.
-                    if (constraints->bottom.GetDone() && constraints->height.GetDone())
-                    {
-                        value = (constraints->bottom.GetValue() - constraints->height.GetValue() + margin);
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->centreY.GetDone() && constraints->height.GetDone())
-                    {
-                        value = (constraints->centreY.GetValue() - (constraints->height.GetValue()/2) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxAsIs:
-                {
-                    int x;
-                    win->GetPosition(&x, &value);
-                    done = true;
-                    return true;
-                }
-                default:
-                    break;
-            }
-            break;
-        }
-        case wxBottom:
-        {
-            switch (relationship)
-            {
-                case wxAbove:
-                {
-                    // We can know this edge if: otherWin is win's parent,
-                    // or otherWin has a satisfied constraint, or
-                    // otherWin has no constraint.
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos + margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxBelow:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos - margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxPercentOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = (int)(edgePos*(((float)percent)*0.01) - margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxUnconstrained:
-                {
-                    // We know the bottom edge position if we know the top edge
-                    // and we know the height; OR if we know the centre edge and
-                    // the height.
-                    if (constraints->top.GetDone() && constraints->height.GetDone())
-                    {
-                        value = (constraints->top.GetValue() + constraints->height.GetValue() - margin);
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->centreY.GetDone() && constraints->height.GetDone())
-                    {
-                        value = (constraints->centreY.GetValue() + (constraints->height.GetValue()/2) - margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxAsIs:
-                {
-                    int x, y;
-                    int w, h;
-                    wxGetAsIs(win, &w, &h);
-                    win->GetPosition(&x, &y);
-                    value = h + y;
-                    done = true;
-                    return true;
-                }
-                default:
-                    break;
-            }
-            break;
-        }
-        case wxCentreX:
-        {
-            switch (relationship)
-            {
-                case wxLeftOf:
-                {
-                    // We can know this edge if: otherWin is win's parent, or
-                    // otherWin has a satisfied constraint, or otherWin has no
-                    // constraint.
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos - margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxRightOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos + margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxPercentOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = (int)(edgePos*(((float)percent)*0.01) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxUnconstrained:
-                {
-                    // We know the centre position if we know
-                    // the left-hand edge and we know the width, OR
-                    // the right-hand edge and the width
-                    if (constraints->left.GetDone() && constraints->width.GetDone())
-                    {
-                        value = (int)(constraints->left.GetValue() + (constraints->width.GetValue()/2) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->right.GetDone() && constraints->width.GetDone())
-                    {
-                        value = (int)(constraints->left.GetValue() - (constraints->width.GetValue()/2) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                default:
-                    break;
-            }
-            break;
-        }
-        case wxCentreY:
-        {
-            switch (relationship)
-            {
-                case wxAbove:
-                {
-                    // We can know this edge if: otherWin is win's parent,
-                    // or otherWin has a satisfied constraint, or otherWin
-                    // has no constraint.
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos - margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxBelow:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = edgePos + margin;
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxPercentOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = (int)(edgePos*(((float)percent)*0.01) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxUnconstrained:
-                {
-                    // We know the centre position if we know
-                    // the top edge and we know the height, OR
-                    // the bottom edge and the height.
-                    if (constraints->bottom.GetDone() && constraints->height.GetDone())
-                    {
-                        value = (int)(constraints->bottom.GetValue() - (constraints->height.GetValue()/2) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->top.GetDone() && constraints->height.GetDone())
-                    {
-                        value = (int)(constraints->top.GetValue() + (constraints->height.GetValue()/2) + margin);
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                default:
-                    break;
-            }
-            break;
-        }
-        case wxWidth:
-        {
-            switch (relationship)
-            {
-                case wxPercentOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = (int)(edgePos*(((float)percent)*0.01));
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxAsIs:
-                {
-                    if (win)
-                    {
-                        int h;
-                        wxGetAsIs(win, &value, &h);
-                        done = true;
-                        return true;
-                    }
-                    else return false;
-                }
-                case wxUnconstrained:
-                {
-                    // We know the width if we know the left edge and the right edge, OR
-                    // if we know the left edge and the centre, OR
-                    // if we know the right edge and the centre
-                    if (constraints->left.GetDone() && constraints->right.GetDone())
-                    {
-                        value = constraints->right.GetValue() - constraints->left.GetValue();
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->centreX.GetDone() && constraints->left.GetDone())
-                    {
-                        value = (int)(2*(constraints->centreX.GetValue() - constraints->left.GetValue()));
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->centreX.GetDone() && constraints->right.GetDone())
-                    {
-                        value = (int)(2*(constraints->right.GetValue() - constraints->centreX.GetValue()));
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                default:
-                    break;
-            }
-            break;
-        }
-        case wxHeight:
-        {
-            switch (relationship)
-            {
-                case wxPercentOf:
-                {
-                    int edgePos = GetEdge(otherEdge, win, otherWin);
-                    if (edgePos != -1)
-                    {
-                        value = (int)(edgePos*(((float)percent)*0.01));
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                case wxAsIs:
-                {
-                    if (win)
-                    {
-                        int w;
-                        wxGetAsIs(win, &w, &value);
-                        done = true;
-                        return true;
-                    }
-                    else return false;
-                }
-                case wxUnconstrained:
-                {
-                    // We know the height if we know the top edge and the bottom edge, OR
-                    // if we know the top edge and the centre, OR
-                    // if we know the bottom edge and the centre
-                    if (constraints->top.GetDone() && constraints->bottom.GetDone())
-                    {
-                        value = constraints->bottom.GetValue() - constraints->top.GetValue();
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->top.GetDone() && constraints->centreY.GetDone())
-                    {
-                        value = (int)(2*(constraints->centreY.GetValue() - constraints->top.GetValue()));
-                        done = true;
-                        return true;
-                    }
-                    else if (constraints->bottom.GetDone() && constraints->centreY.GetDone())
-                    {
-                        value = (int)(2*(constraints->bottom.GetValue() - constraints->centreY.GetValue()));
-                        done = true;
-                        return true;
-                    }
-                    else
-                        return false;
-                }
-                default:
-                    break;
-            }
-            break;
-        }
-        default:
-            break;
-    }
-    return false;
-}
-
-// Get the value of this edge or dimension, or if this is not determinable, -1.
-int wxIndividualLayoutConstraint::GetEdge(wxEdge which,
-                                          wxWindowBase *thisWin,
-                                          wxWindowBase *other) const
-{
-    // If the edge or dimension belongs to the parent, then we know the
-    // dimension is obtainable immediately. E.g. a wxExpandSizer may contain a
-    // button (but the button's true parent is a panel, not the sizer)
-    if (other->GetChildren().Find((wxWindow*)thisWin))
-    {
-        switch (which)
-        {
-            case wxLeft:
-                {
-                    return 0;
-                }
-            case wxTop:
-                {
-                    return 0;
-                }
-            case wxRight:
-                {
-                    int w, h;
-                    other->GetClientSizeConstraint(&w, &h);
-                    return w;
-                }
-            case wxBottom:
-                {
-                    int w, h;
-                    other->GetClientSizeConstraint(&w, &h);
-                    return h;
-                }
-            case wxWidth:
-                {
-                    int w, h;
-                    other->GetClientSizeConstraint(&w, &h);
-                    return w;
-                }
-            case wxHeight:
-                {
-                    int w, h;
-                    other->GetClientSizeConstraint(&w, &h);
-                    return h;
-                }
-            case wxCentreX:
-            case wxCentreY:
-                {
-                    int w, h;
-                    other->GetClientSizeConstraint(&w, &h);
-                    if (which == wxCentreX)
-                        return (int)(w/2);
-                    else
-                        return (int)(h/2);
-                }
-            default:
-                return -1;
-        }
-    }
-    switch (which)
-    {
-        case wxLeft:
-            {
-                wxLayoutConstraints *constr = other->GetConstraints();
-                // If no constraints, it means the window is not dependent
-                // on anything, and therefore we know its value immediately
-                if (constr)
-                {
-                    if (constr->left.GetDone())
-                        return constr->left.GetValue();
-                    else
-                        return -1;
-                }
-                else
-                {
-                    int x, y;
-                    other->GetPosition(&x, &y);
-                    return x;
-                }
-            }
-        case wxTop:
-            {
-                wxLayoutConstraints *constr = other->GetConstraints();
-                // If no constraints, it means the window is not dependent
-                // on anything, and therefore we know its value immediately
-                if (constr)
-                {
-                    if (constr->top.GetDone())
-                        return constr->top.GetValue();
-                    else
-                        return -1;
-                }
-                else
-                {
-                    int x, y;
-                    other->GetPosition(&x, &y);
-                    return y;
-                }
-            }
-        case wxRight:
-            {
-                wxLayoutConstraints *constr = other->GetConstraints();
-                // If no constraints, it means the window is not dependent
-                // on anything, and therefore we know its value immediately
-                if (constr)
-                {
-                    if (constr->right.GetDone())
-                        return constr->right.GetValue();
-                    else
-                        return -1;
-                }
-                else
-                {
-                    int x, y, w, h;
-                    other->GetPosition(&x, &y);
-                    other->GetSize(&w, &h);
-                    return (int)(x + w);
-                }
-            }
-        case wxBottom:
-            {
-                wxLayoutConstraints *constr = other->GetConstraints();
-                // If no constraints, it means the window is not dependent
-                // on anything, and therefore we know its value immediately
-                if (constr)
-                {
-                    if (constr->bottom.GetDone())
-                        return constr->bottom.GetValue();
-                    else
-                        return -1;
-                }
-                else
-                {
-                    int x, y, w, h;
-                    other->GetPosition(&x, &y);
-                    other->GetSize(&w, &h);
-                    return (int)(y + h);
-                }
-            }
-        case wxWidth:
-            {
-                wxLayoutConstraints *constr = other->GetConstraints();
-                // If no constraints, it means the window is not dependent
-                // on anything, and therefore we know its value immediately
-                if (constr)
-                {
-                    if (constr->width.GetDone())
-                        return constr->width.GetValue();
-                    else
-                        return -1;
-                }
-                else
-                {
-                    int w, h;
-                    other->GetSize(&w, &h);
-                    return w;
-                }
-            }
-        case wxHeight:
-            {
-                wxLayoutConstraints *constr = other->GetConstraints();
-                // If no constraints, it means the window is not dependent
-                // on anything, and therefore we know its value immediately
-                if (constr)
-                {
-                    if (constr->height.GetDone())
-                        return constr->height.GetValue();
-                    else
-                        return -1;
-                }
-                else
-                {
-                    int w, h;
-                    other->GetSize(&w, &h);
-                    return h;
-                }
-            }
-        case wxCentreX:
-            {
-                wxLayoutConstraints *constr = other->GetConstraints();
-                // If no constraints, it means the window is not dependent
-                // on anything, and therefore we know its value immediately
-                if (constr)
-                {
-                    if (constr->centreX.GetDone())
-                        return constr->centreX.GetValue();
-                    else
-                        return -1;
-                }
-                else
-                {
-                    int x, y, w, h;
-                    other->GetPosition(&x, &y);
-                    other->GetSize(&w, &h);
-                    return (int)(x + (w/2));
-                }
-            }
-        case wxCentreY:
-            {
-                wxLayoutConstraints *constr = other->GetConstraints();
-                // If no constraints, it means the window is not dependent
-                // on anything, and therefore we know its value immediately
-                if (constr)
-                {
-                    if (constr->centreY.GetDone())
-                        return constr->centreY.GetValue();
-                    else
-                        return -1;
-                }
-                else
-                {
-                    int x, y, w, h;
-                    other->GetPosition(&x, &y);
-                    other->GetSize(&w, &h);
-                    return (int)(y + (h/2));
-                }
-            }
-        default:
-            break;
-    }
-    return -1;
-}
-
-wxLayoutConstraints::wxLayoutConstraints()
-{
-    left.SetEdge(wxLeft);
-    top.SetEdge(wxTop);
-    right.SetEdge(wxRight);
-    bottom.SetEdge(wxBottom);
-    centreX.SetEdge(wxCentreX);
-    centreY.SetEdge(wxCentreY);
-    width.SetEdge(wxWidth);
-    height.SetEdge(wxHeight);
-}
-
-bool wxLayoutConstraints::SatisfyConstraints(wxWindowBase *win, int *nChanges)
-{
-    int noChanges = 0;
-
-    bool done = width.GetDone();
-    bool newDone = (done ? true : width.SatisfyConstraint(this, win));
-    if (newDone != done)
-        noChanges ++;
-
-    done = height.GetDone();
-    newDone = (done ? true : height.SatisfyConstraint(this, win));
-    if (newDone != done)
-        noChanges ++;
-
-    done = left.GetDone();
-    newDone = (done ? true : left.SatisfyConstraint(this, win));
-    if (newDone != done)
-        noChanges ++;
-
-    done = top.GetDone();
-    newDone = (done ? true : top.SatisfyConstraint(this, win));
-    if (newDone != done)
-        noChanges ++;
-
-    done = right.GetDone();
-    newDone = (done ? true : right.SatisfyConstraint(this, win));
-    if (newDone != done)
-        noChanges ++;
-
-    done = bottom.GetDone();
-    newDone = (done ? true : bottom.SatisfyConstraint(this, win));
-    if (newDone != done)
-        noChanges ++;
-
-    done = centreX.GetDone();
-    newDone = (done ? true : centreX.SatisfyConstraint(this, win));
-    if (newDone != done)
-        noChanges ++;
-
-    done = centreY.GetDone();
-    newDone = (done ? true : centreY.SatisfyConstraint(this, win));
-    if (newDone != done)
-        noChanges ++;
-
-    *nChanges = noChanges;
-
-    return AreSatisfied();
-}
-
-#endif // wxUSE_CONSTRAINTS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/layout.cpp
+// Purpose:     Constraint layout system classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: layout.cpp 39627 2006-06-08 06:57:39Z ABX $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// =============================================================================
+// declarations
+// =============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_CONSTRAINTS
+
+#include "wx/layout.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
+    #include "wx/intl.h"
+#endif
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
+
+
+inline void wxGetAsIs(wxWindowBase* win, int* w, int* h)
+{
+#if 1
+    // The old way.  Works for me.
+    win->GetSize(w, h);
+#endif
+
+#if 0
+    // Vadim's change.  Breaks wxPython's LayoutAnchors
+    win->GetBestSize(w, h);
+#endif
+
+#if 0
+    // Proposed compromise.  Doesn't work.
+    int sw, sh, bw, bh;
+    win->GetSize(&sw, &sh);
+    win->GetBestSize(&bw, &bh);
+    if (w)
+        *w = wxMax(sw, bw);
+    if (h)
+        *h = wxMax(sh, bh);
+#endif
+}
+
+
+wxIndividualLayoutConstraint::wxIndividualLayoutConstraint()
+{
+    myEdge = wxTop;
+    relationship = wxUnconstrained;
+    margin = 0;
+    value = 0;
+    percent = 0;
+    otherEdge = wxTop;
+    done = false;
+    otherWin = (wxWindowBase *) NULL;
+}
+
+void wxIndividualLayoutConstraint::Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val, int marg)
+{
+    if (rel == wxSameAs)
+    {
+        // If Set is called by the user with wxSameAs then call SameAs to do
+        // it since it will actually use wxPercent instead.
+        SameAs(otherW, otherE, marg);
+        return;
+    }
+
+    relationship = rel;
+    otherWin = otherW;
+    otherEdge = otherE;
+
+    if ( rel == wxPercentOf )
+    {
+        percent = val;
+    }
+    else
+    {
+        value = val;
+    }
+
+    margin = marg;
+}
+
+void wxIndividualLayoutConstraint::LeftOf(wxWindowBase *sibling, int marg)
+{
+    Set(wxLeftOf, sibling, wxLeft, 0, marg);
+}
+
+void wxIndividualLayoutConstraint::RightOf(wxWindowBase *sibling, int marg)
+{
+    Set(wxRightOf, sibling, wxRight, 0, marg);
+}
+
+void wxIndividualLayoutConstraint::Above(wxWindowBase *sibling, int marg)
+{
+    Set(wxAbove, sibling, wxTop, 0, marg);
+}
+
+void wxIndividualLayoutConstraint::Below(wxWindowBase *sibling, int marg)
+{
+    Set(wxBelow, sibling, wxBottom, 0, marg);
+}
+
+//
+// 'Same edge' alignment
+//
+void wxIndividualLayoutConstraint::SameAs(wxWindowBase *otherW, wxEdge edge, int marg)
+{
+    Set(wxPercentOf, otherW, edge, 100, marg);
+}
+
+// The edge is a percentage of the other window's edge
+void wxIndividualLayoutConstraint::PercentOf(wxWindowBase *otherW, wxEdge wh, int per)
+{
+    Set(wxPercentOf, otherW, wh, per);
+}
+
+//
+// Edge has absolute value
+//
+void wxIndividualLayoutConstraint::Absolute(int val)
+{
+    value = val;
+    relationship = wxAbsolute;
+}
+
+// Reset constraint if it mentions otherWin
+bool wxIndividualLayoutConstraint::ResetIfWin(wxWindowBase *otherW)
+{
+    if (otherW == otherWin)
+    {
+        myEdge = wxTop;
+        relationship = wxAsIs;
+        margin = 0;
+        value = 0;
+        percent = 0;
+        otherEdge = wxTop;
+        otherWin = (wxWindowBase *) NULL;
+        return true;
+    }
+
+    return false;
+}
+
+// Try to satisfy constraint
+bool wxIndividualLayoutConstraint::SatisfyConstraint(wxLayoutConstraints *constraints, wxWindowBase *win)
+{
+    if (relationship == wxAbsolute)
+    {
+        done = true;
+        return true;
+    }
+
+    switch (myEdge)
+    {
+        case wxLeft:
+        {
+            switch (relationship)
+            {
+                case wxLeftOf:
+                {
+                    // We can know this edge if: otherWin is win's
+                    // parent, or otherWin has a satisfied constraint,
+                    // or otherWin has no constraint.
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos - margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxRightOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos + margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxPercentOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = (int)(edgePos*(((float)percent)*0.01) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxUnconstrained:
+                {
+                    // We know the left-hand edge position if we know
+                    // the right-hand edge and we know the width; OR if
+                    // we know the centre and the width.
+                    if (constraints->right.GetDone() && constraints->width.GetDone())
+                    {
+                        value = (constraints->right.GetValue() - constraints->width.GetValue() + margin);
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->centreX.GetDone() && constraints->width.GetDone())
+                    {
+                        value = (int)(constraints->centreX.GetValue() - (constraints->width.GetValue()/2) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxAsIs:
+                {
+                    int y;
+                    win->GetPosition(&value, &y);
+                    done = true;
+                    return true;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case wxRight:
+        {
+            switch (relationship)
+            {
+                case wxLeftOf:
+                {
+                    // We can know this edge if: otherWin is win's
+                    // parent, or otherWin has a satisfied constraint,
+                    // or otherWin has no constraint.
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos - margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxRightOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos + margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxPercentOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = (int)(edgePos*(((float)percent)*0.01) - margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxUnconstrained:
+                {
+                    // We know the right-hand edge position if we know the
+                    // left-hand edge and we know the width, OR if we know the
+                    // centre edge and the width.
+                    if (constraints->left.GetDone() && constraints->width.GetDone())
+                    {
+                        value = (constraints->left.GetValue() + constraints->width.GetValue() - margin);
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->centreX.GetDone() && constraints->width.GetDone())
+                    {
+                        value = (int)(constraints->centreX.GetValue() + (constraints->width.GetValue()/2) - margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxAsIs:
+                {
+                    int x, y;
+                    int w, h;
+                    wxGetAsIs(win, &w, &h);
+                    win->GetPosition(&x, &y);
+                    value = x + w;
+                    done = true;
+                    return true;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case wxTop:
+        {
+            switch (relationship)
+            {
+                case wxAbove:
+                {
+                    // We can know this edge if: otherWin is win's
+                    // parent, or otherWin has a satisfied constraint,
+                    // or otherWin has no constraint.
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos - margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxBelow:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos + margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxPercentOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = (int)(edgePos*(((float)percent)*0.01) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxUnconstrained:
+                {
+                    // We know the top edge position if we know the bottom edge
+                    // and we know the height; OR if we know the centre edge and
+                    // the height.
+                    if (constraints->bottom.GetDone() && constraints->height.GetDone())
+                    {
+                        value = (constraints->bottom.GetValue() - constraints->height.GetValue() + margin);
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->centreY.GetDone() && constraints->height.GetDone())
+                    {
+                        value = (constraints->centreY.GetValue() - (constraints->height.GetValue()/2) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxAsIs:
+                {
+                    int x;
+                    win->GetPosition(&x, &value);
+                    done = true;
+                    return true;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case wxBottom:
+        {
+            switch (relationship)
+            {
+                case wxAbove:
+                {
+                    // We can know this edge if: otherWin is win's parent,
+                    // or otherWin has a satisfied constraint, or
+                    // otherWin has no constraint.
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos + margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxBelow:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos - margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxPercentOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = (int)(edgePos*(((float)percent)*0.01) - margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxUnconstrained:
+                {
+                    // We know the bottom edge position if we know the top edge
+                    // and we know the height; OR if we know the centre edge and
+                    // the height.
+                    if (constraints->top.GetDone() && constraints->height.GetDone())
+                    {
+                        value = (constraints->top.GetValue() + constraints->height.GetValue() - margin);
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->centreY.GetDone() && constraints->height.GetDone())
+                    {
+                        value = (constraints->centreY.GetValue() + (constraints->height.GetValue()/2) - margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxAsIs:
+                {
+                    int x, y;
+                    int w, h;
+                    wxGetAsIs(win, &w, &h);
+                    win->GetPosition(&x, &y);
+                    value = h + y;
+                    done = true;
+                    return true;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case wxCentreX:
+        {
+            switch (relationship)
+            {
+                case wxLeftOf:
+                {
+                    // We can know this edge if: otherWin is win's parent, or
+                    // otherWin has a satisfied constraint, or otherWin has no
+                    // constraint.
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos - margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxRightOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos + margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxPercentOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = (int)(edgePos*(((float)percent)*0.01) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxUnconstrained:
+                {
+                    // We know the centre position if we know
+                    // the left-hand edge and we know the width, OR
+                    // the right-hand edge and the width
+                    if (constraints->left.GetDone() && constraints->width.GetDone())
+                    {
+                        value = (int)(constraints->left.GetValue() + (constraints->width.GetValue()/2) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->right.GetDone() && constraints->width.GetDone())
+                    {
+                        value = (int)(constraints->left.GetValue() - (constraints->width.GetValue()/2) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case wxCentreY:
+        {
+            switch (relationship)
+            {
+                case wxAbove:
+                {
+                    // We can know this edge if: otherWin is win's parent,
+                    // or otherWin has a satisfied constraint, or otherWin
+                    // has no constraint.
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos - margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxBelow:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = edgePos + margin;
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxPercentOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = (int)(edgePos*(((float)percent)*0.01) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxUnconstrained:
+                {
+                    // We know the centre position if we know
+                    // the top edge and we know the height, OR
+                    // the bottom edge and the height.
+                    if (constraints->bottom.GetDone() && constraints->height.GetDone())
+                    {
+                        value = (int)(constraints->bottom.GetValue() - (constraints->height.GetValue()/2) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->top.GetDone() && constraints->height.GetDone())
+                    {
+                        value = (int)(constraints->top.GetValue() + (constraints->height.GetValue()/2) + margin);
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case wxWidth:
+        {
+            switch (relationship)
+            {
+                case wxPercentOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = (int)(edgePos*(((float)percent)*0.01));
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxAsIs:
+                {
+                    if (win)
+                    {
+                        int h;
+                        wxGetAsIs(win, &value, &h);
+                        done = true;
+                        return true;
+                    }
+                    else return false;
+                }
+                case wxUnconstrained:
+                {
+                    // We know the width if we know the left edge and the right edge, OR
+                    // if we know the left edge and the centre, OR
+                    // if we know the right edge and the centre
+                    if (constraints->left.GetDone() && constraints->right.GetDone())
+                    {
+                        value = constraints->right.GetValue() - constraints->left.GetValue();
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->centreX.GetDone() && constraints->left.GetDone())
+                    {
+                        value = (int)(2*(constraints->centreX.GetValue() - constraints->left.GetValue()));
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->centreX.GetDone() && constraints->right.GetDone())
+                    {
+                        value = (int)(2*(constraints->right.GetValue() - constraints->centreX.GetValue()));
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        case wxHeight:
+        {
+            switch (relationship)
+            {
+                case wxPercentOf:
+                {
+                    int edgePos = GetEdge(otherEdge, win, otherWin);
+                    if (edgePos != -1)
+                    {
+                        value = (int)(edgePos*(((float)percent)*0.01));
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                case wxAsIs:
+                {
+                    if (win)
+                    {
+                        int w;
+                        wxGetAsIs(win, &w, &value);
+                        done = true;
+                        return true;
+                    }
+                    else return false;
+                }
+                case wxUnconstrained:
+                {
+                    // We know the height if we know the top edge and the bottom edge, OR
+                    // if we know the top edge and the centre, OR
+                    // if we know the bottom edge and the centre
+                    if (constraints->top.GetDone() && constraints->bottom.GetDone())
+                    {
+                        value = constraints->bottom.GetValue() - constraints->top.GetValue();
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->top.GetDone() && constraints->centreY.GetDone())
+                    {
+                        value = (int)(2*(constraints->centreY.GetValue() - constraints->top.GetValue()));
+                        done = true;
+                        return true;
+                    }
+                    else if (constraints->bottom.GetDone() && constraints->centreY.GetDone())
+                    {
+                        value = (int)(2*(constraints->bottom.GetValue() - constraints->centreY.GetValue()));
+                        done = true;
+                        return true;
+                    }
+                    else
+                        return false;
+                }
+                default:
+                    break;
+            }
+            break;
+        }
+        default:
+            break;
+    }
+    return false;
+}
+
+// Get the value of this edge or dimension, or if this is not determinable, -1.
+int wxIndividualLayoutConstraint::GetEdge(wxEdge which,
+                                          wxWindowBase *thisWin,
+                                          wxWindowBase *other) const
+{
+    // If the edge or dimension belongs to the parent, then we know the
+    // dimension is obtainable immediately. E.g. a wxExpandSizer may contain a
+    // button (but the button's true parent is a panel, not the sizer)
+    if (other->GetChildren().Find((wxWindow*)thisWin))
+    {
+        switch (which)
+        {
+            case wxLeft:
+                {
+                    return 0;
+                }
+            case wxTop:
+                {
+                    return 0;
+                }
+            case wxRight:
+                {
+                    int w, h;
+                    other->GetClientSizeConstraint(&w, &h);
+                    return w;
+                }
+            case wxBottom:
+                {
+                    int w, h;
+                    other->GetClientSizeConstraint(&w, &h);
+                    return h;
+                }
+            case wxWidth:
+                {
+                    int w, h;
+                    other->GetClientSizeConstraint(&w, &h);
+                    return w;
+                }
+            case wxHeight:
+                {
+                    int w, h;
+                    other->GetClientSizeConstraint(&w, &h);
+                    return h;
+                }
+            case wxCentreX:
+            case wxCentreY:
+                {
+                    int w, h;
+                    other->GetClientSizeConstraint(&w, &h);
+                    if (which == wxCentreX)
+                        return (int)(w/2);
+                    else
+                        return (int)(h/2);
+                }
+            default:
+                return -1;
+        }
+    }
+    switch (which)
+    {
+        case wxLeft:
+            {
+                wxLayoutConstraints *constr = other->GetConstraints();
+                // If no constraints, it means the window is not dependent
+                // on anything, and therefore we know its value immediately
+                if (constr)
+                {
+                    if (constr->left.GetDone())
+                        return constr->left.GetValue();
+                    else
+                        return -1;
+                }
+                else
+                {
+                    int x, y;
+                    other->GetPosition(&x, &y);
+                    return x;
+                }
+            }
+        case wxTop:
+            {
+                wxLayoutConstraints *constr = other->GetConstraints();
+                // If no constraints, it means the window is not dependent
+                // on anything, and therefore we know its value immediately
+                if (constr)
+                {
+                    if (constr->top.GetDone())
+                        return constr->top.GetValue();
+                    else
+                        return -1;
+                }
+                else
+                {
+                    int x, y;
+                    other->GetPosition(&x, &y);
+                    return y;
+                }
+            }
+        case wxRight:
+            {
+                wxLayoutConstraints *constr = other->GetConstraints();
+                // If no constraints, it means the window is not dependent
+                // on anything, and therefore we know its value immediately
+                if (constr)
+                {
+                    if (constr->right.GetDone())
+                        return constr->right.GetValue();
+                    else
+                        return -1;
+                }
+                else
+                {
+                    int x, y, w, h;
+                    other->GetPosition(&x, &y);
+                    other->GetSize(&w, &h);
+                    return (int)(x + w);
+                }
+            }
+        case wxBottom:
+            {
+                wxLayoutConstraints *constr = other->GetConstraints();
+                // If no constraints, it means the window is not dependent
+                // on anything, and therefore we know its value immediately
+                if (constr)
+                {
+                    if (constr->bottom.GetDone())
+                        return constr->bottom.GetValue();
+                    else
+                        return -1;
+                }
+                else
+                {
+                    int x, y, w, h;
+                    other->GetPosition(&x, &y);
+                    other->GetSize(&w, &h);
+                    return (int)(y + h);
+                }
+            }
+        case wxWidth:
+            {
+                wxLayoutConstraints *constr = other->GetConstraints();
+                // If no constraints, it means the window is not dependent
+                // on anything, and therefore we know its value immediately
+                if (constr)
+                {
+                    if (constr->width.GetDone())
+                        return constr->width.GetValue();
+                    else
+                        return -1;
+                }
+                else
+                {
+                    int w, h;
+                    other->GetSize(&w, &h);
+                    return w;
+                }
+            }
+        case wxHeight:
+            {
+                wxLayoutConstraints *constr = other->GetConstraints();
+                // If no constraints, it means the window is not dependent
+                // on anything, and therefore we know its value immediately
+                if (constr)
+                {
+                    if (constr->height.GetDone())
+                        return constr->height.GetValue();
+                    else
+                        return -1;
+                }
+                else
+                {
+                    int w, h;
+                    other->GetSize(&w, &h);
+                    return h;
+                }
+            }
+        case wxCentreX:
+            {
+                wxLayoutConstraints *constr = other->GetConstraints();
+                // If no constraints, it means the window is not dependent
+                // on anything, and therefore we know its value immediately
+                if (constr)
+                {
+                    if (constr->centreX.GetDone())
+                        return constr->centreX.GetValue();
+                    else
+                        return -1;
+                }
+                else
+                {
+                    int x, y, w, h;
+                    other->GetPosition(&x, &y);
+                    other->GetSize(&w, &h);
+                    return (int)(x + (w/2));
+                }
+            }
+        case wxCentreY:
+            {
+                wxLayoutConstraints *constr = other->GetConstraints();
+                // If no constraints, it means the window is not dependent
+                // on anything, and therefore we know its value immediately
+                if (constr)
+                {
+                    if (constr->centreY.GetDone())
+                        return constr->centreY.GetValue();
+                    else
+                        return -1;
+                }
+                else
+                {
+                    int x, y, w, h;
+                    other->GetPosition(&x, &y);
+                    other->GetSize(&w, &h);
+                    return (int)(y + (h/2));
+                }
+            }
+        default:
+            break;
+    }
+    return -1;
+}
+
+wxLayoutConstraints::wxLayoutConstraints()
+{
+    left.SetEdge(wxLeft);
+    top.SetEdge(wxTop);
+    right.SetEdge(wxRight);
+    bottom.SetEdge(wxBottom);
+    centreX.SetEdge(wxCentreX);
+    centreY.SetEdge(wxCentreY);
+    width.SetEdge(wxWidth);
+    height.SetEdge(wxHeight);
+}
+
+bool wxLayoutConstraints::SatisfyConstraints(wxWindowBase *win, int *nChanges)
+{
+    int noChanges = 0;
+
+    bool done = width.GetDone();
+    bool newDone = (done ? true : width.SatisfyConstraint(this, win));
+    if (newDone != done)
+        noChanges ++;
+
+    done = height.GetDone();
+    newDone = (done ? true : height.SatisfyConstraint(this, win));
+    if (newDone != done)
+        noChanges ++;
+
+    done = left.GetDone();
+    newDone = (done ? true : left.SatisfyConstraint(this, win));
+    if (newDone != done)
+        noChanges ++;
+
+    done = top.GetDone();
+    newDone = (done ? true : top.SatisfyConstraint(this, win));
+    if (newDone != done)
+        noChanges ++;
+
+    done = right.GetDone();
+    newDone = (done ? true : right.SatisfyConstraint(this, win));
+    if (newDone != done)
+        noChanges ++;
+
+    done = bottom.GetDone();
+    newDone = (done ? true : bottom.SatisfyConstraint(this, win));
+    if (newDone != done)
+        noChanges ++;
+
+    done = centreX.GetDone();
+    newDone = (done ? true : centreX.SatisfyConstraint(this, win));
+    if (newDone != done)
+        noChanges ++;
+
+    done = centreY.GetDone();
+    newDone = (done ? true : centreY.SatisfyConstraint(this, win));
+    if (newDone != done)
+        noChanges ++;
+
+    *nChanges = noChanges;
+
+    return AreSatisfied();
+}
+
+#endif // wxUSE_CONSTRAINTS
diff --git a/Source/3rd Party/wx/src/common/lboxcmn.cpp b/Source/3rd Party/wx/src/common/lboxcmn.cpp
index a9535ed16..883e4858c 100644
--- a/Source/3rd Party/wx/src/common/lboxcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/lboxcmn.cpp	
@@ -1,344 +1,147 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/lboxcmn.cpp
-// Purpose:     wxListBox class methods common to all platforms
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     22.10.99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_LISTBOX
-
-#include "wx/listbox.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/arrstr.h"
-    #include "wx/log.h"
-#endif
-
-extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[] = "listBox";
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-wxListBoxBase::~wxListBoxBase()
-{
-    // this destructor is required for Darwin
-}
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxListBoxStyle )
-wxBEGIN_FLAGS( wxListBoxStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxLB_SINGLE)
-wxFLAGS_MEMBER(wxLB_MULTIPLE)
-wxFLAGS_MEMBER(wxLB_EXTENDED)
-wxFLAGS_MEMBER(wxLB_HSCROLL)
-wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
-wxFLAGS_MEMBER(wxLB_NEEDED_SB)
-wxFLAGS_MEMBER(wxLB_SORT)
-wxEND_FLAGS( wxListBoxStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl, "wx/listbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxListBox)
-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent )
-wxEVENT_PROPERTY( DoubleClick, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent )
-
-wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-wxPROPERTY_COLLECTION( Choices, wxArrayString, wxString, AppendString, \
-                      GetStrings, 0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxPROPERTY( Selection, int, SetSelection, GetSelection, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-
-wxPROPERTY_FLAGS( WindowStyle, wxListBoxStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxListBox)
-
-wxCONSTRUCTOR_4( wxListBox, wxWindow*, Parent, wxWindowID, Id, \
-                wxPoint, Position, wxSize, Size )
-
-/*
- TODO PROPERTIES
- selection
- content
- item
- */
-
-// ----------------------------------------------------------------------------
-// selection
-// ----------------------------------------------------------------------------
-
-bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
-{
-    const int sel = FindString(s);
-    if ( sel == wxNOT_FOUND )
-        return false;
-
-    SetSelection(sel, select);
-
-    return true;
-}
-
-void wxListBoxBase::SetSelection(int n)
-{
-    if ( !HasMultipleSelection() )
-        DoChangeSingleSelection(n);
-
-    DoSetSelection(n, true);
-}
-
-void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
-{
-    if ( HasMultipleSelection() )
-    {
-        wxArrayInt selections;
-        GetSelections(selections);
-
-        size_t count = selections.GetCount();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            int item = selections[n];
-            if ( item != itemToLeaveSelected )
-                Deselect(item);
-        }
-    }
-    else // single selection
-    {
-        int sel = GetSelection();
-        if ( sel != wxNOT_FOUND && sel != itemToLeaveSelected )
-        {
-            Deselect(sel);
-        }
-    }
-}
-
-void wxListBoxBase::UpdateOldSelections()
-{
-    // When the control becomes empty, any previously remembered selections are
-    // invalid anyhow, so just forget them.
-    if ( IsEmpty() )
-    {
-        m_oldSelections.clear();
-        return;
-    }
-
-    // We need to remember the selection even in single-selection case on
-    // Windows, so that we don't send an event when the user clicks on an
-    // already selected item.
-#ifndef __WXMSW__
-    if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
-#endif
-    {
-        GetSelections( m_oldSelections );
-    }
-}
-
-bool wxListBoxBase::SendEvent(wxEventType evtType, int item, bool selected)
-{
-    wxCommandEvent event(evtType, GetId());
-    event.SetEventObject(this);
-
-    event.SetInt(item);
-    event.SetString(GetString(item));
-    event.SetExtraLong(selected);
-
-    if ( HasClientObjectData() )
-        event.SetClientObject(GetClientObject(item));
-    else if ( HasClientUntypedData() )
-        event.SetClientData(GetClientData(item));
-
-    return HandleWindowEvent(event);
-}
-
-bool wxListBoxBase::DoChangeSingleSelection(int item)
-{
-    // As we don't use m_oldSelections in single selection mode, we store the
-    // last item that we notified the user about in it in this case because we
-    // need to remember it to be able to filter out the dummy selection changes
-    // that we get when the user clicks on an already selected item.
-    if ( !m_oldSelections.empty() && *m_oldSelections.begin() == item )
-    {
-        // Same item as the last time.
-        return false;
-    }
-
-    m_oldSelections.clear();
-    m_oldSelections.push_back(item);
-
-    return true;
-}
-
-bool wxListBoxBase::CalcAndSendEvent()
-{
-    wxArrayInt selections;
-    GetSelections(selections);
-    bool selected = true;
-
-    if ( selections.empty() && m_oldSelections.empty() )
-    {
-        // nothing changed, just leave
-        return false;
-    }
-
-    const size_t countSel = selections.size(),
-                 countSelOld = m_oldSelections.size();
-    if ( countSel == countSelOld )
-    {
-        bool changed = false;
-        for ( size_t idx = 0; idx < countSel; idx++ )
-        {
-            if (selections[idx] != m_oldSelections[idx])
-            {
-                changed = true;
-                break;
-            }
-        }
-
-        // nothing changed, just leave
-        if ( !changed )
-           return false;
-    }
-
-    int item = wxNOT_FOUND;
-    if ( selections.empty() )
-    {
-        selected = false;
-        item = m_oldSelections[0];
-    }
-    else // we [still] have some selections
-    {
-        // Now test if any new item is selected
-        bool any_new_selected = false;
-        for ( size_t idx = 0; idx < countSel; idx++ )
-        {
-            item = selections[idx];
-            if ( m_oldSelections.Index(item) == wxNOT_FOUND )
-            {
-                any_new_selected = true;
-                break;
-            }
-        }
-
-        if ( !any_new_selected )
-        {
-            // No new items selected, now test if any new item is deselected
-            bool any_new_deselected = false;
-            for ( size_t idx = 0; idx < countSelOld; idx++ )
-            {
-                item = m_oldSelections[idx];
-                if ( selections.Index(item) == wxNOT_FOUND )
-                {
-                    any_new_deselected = true;
-                    break;
-                }
-            }
-
-            if ( any_new_deselected )
-            {
-                // indicate that this is a selection
-                selected = false;
-            }
-            else
-            {
-                item = wxNOT_FOUND; // this should be impossible
-            }
-        }
-    }
-
-    wxASSERT_MSG( item != wxNOT_FOUND,
-                  "Logic error in wxListBox selection event generation code" );
-
-    m_oldSelections = selections;
-
-    return SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED, item, selected);
-}
-
-// ----------------------------------------------------------------------------
-// misc
-// ----------------------------------------------------------------------------
-
-void wxListBoxBase::Command(wxCommandEvent& event)
-{
-    SetSelection(event.GetInt(), event.GetExtraLong() != 0);
-    (void)GetEventHandler()->ProcessEvent(event);
-}
-
-// ----------------------------------------------------------------------------
-// SetFirstItem() and such
-// ----------------------------------------------------------------------------
-
-void wxListBoxBase::SetFirstItem(const wxString& s)
-{
-    int n = FindString(s);
-
-    wxCHECK_RET( n != wxNOT_FOUND, wxT("invalid string in wxListBox::SetFirstItem") );
-
-    DoSetFirstItem(n);
-}
-
-void wxListBoxBase::AppendAndEnsureVisible(const wxString& s)
-{
-    Append(s);
-    EnsureVisible(GetCount() - 1);
-}
-
-void wxListBoxBase::EnsureVisible(int WXUNUSED(n))
-{
-    // the base class version does nothing (the only alternative would be to
-    // call SetFirstItem() but this is probably even more stupid)
-}
-
-#endif // wxUSE_LISTBOX
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/lboxcmn.cpp
+// Purpose:     wxListBox class methods common to all platforms
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     22.10.99
+// RCS-ID:      $Id: lboxcmn.cpp 39964 2006-07-04 00:31:52Z VZ $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_LISTBOX
+
+#include "wx/listbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/arrstr.h"
+#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+wxListBoxBase::~wxListBoxBase()
+{
+    // this destructor is required for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// adding items
+// ----------------------------------------------------------------------------
+
+void wxListBoxBase::InsertItems(unsigned int nItems, const wxString *items, unsigned int pos)
+{
+    wxArrayString aItems;
+    for ( unsigned int n = 0; n < nItems; n++ )
+    {
+        aItems.Add(items[n]);
+    }
+
+    DoInsertItems(aItems, pos);
+}
+
+
+void wxListBoxBase::Set(int nItems, const wxString* items, void **clientData)
+{
+    wxArrayString aItems;
+    for ( int n = 0; n < nItems; n++ )
+    {
+        aItems.Add(items[n]);
+    }
+
+    DoSetItems(aItems, clientData);
+}
+
+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------
+
+bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
+{
+    const int sel = FindString(s);
+    if ( sel == wxNOT_FOUND )
+        return false;
+
+    SetSelection(sel, select);
+
+    return true;
+}
+
+void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
+{
+    if ( HasMultipleSelection() )
+    {
+        wxArrayInt selections;
+        GetSelections(selections);
+
+        size_t count = selections.GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            int item = selections[n];
+            if ( item != itemToLeaveSelected )
+                Deselect(item);
+        }
+    }
+    else // single selection
+    {
+        int sel = GetSelection();
+        if ( sel != wxNOT_FOUND && sel != itemToLeaveSelected )
+        {
+            Deselect(sel);
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
+
+void wxListBoxBase::Command(wxCommandEvent& event)
+{
+    SetSelection(event.GetInt(), event.GetExtraLong() != 0);
+    (void)ProcessEvent(event);
+}
+
+// ----------------------------------------------------------------------------
+// SetFirstItem() and such
+// ----------------------------------------------------------------------------
+
+void wxListBoxBase::SetFirstItem(const wxString& s)
+{
+    int n = FindString(s);
+
+    wxCHECK_RET( n != wxNOT_FOUND, wxT("invalid string in wxListBox::SetFirstItem") );
+
+    DoSetFirstItem(n);
+}
+
+void wxListBoxBase::AppendAndEnsureVisible(const wxString& s)
+{
+    Append(s);
+    EnsureVisible(GetCount() - 1);
+}
+
+void wxListBoxBase::EnsureVisible(int WXUNUSED(n))
+{
+    // the base class version does nothing (the only alternative would be to
+    // call SetFirstItem() but this is probably even more stupid)
+}
+
+#endif // wxUSE_LISTBOX
diff --git a/Source/3rd Party/wx/src/common/list.cpp b/Source/3rd Party/wx/src/common/list.cpp
index 5b42be2b8..6074a8fdd 100644
--- a/Source/3rd Party/wx/src/common/list.cpp	
+++ b/Source/3rd Party/wx/src/common/list.cpp	
@@ -1,767 +1,768 @@
-////////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/list.cpp
-// Purpose:     wxList implementation
-// Author:      Julian Smart
-// Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-////////////////////////////////////////////////////////////////////////////////
-
-// =============================================================================
-// declarations
-// =============================================================================
-
-// -----------------------------------------------------------------------------
-// headers
-// -----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef WX_PRECOMP
-    #include "wx/list.h"
-    #include "wx/crt.h"
-#endif
-
-#if !wxUSE_STD_CONTAINERS
-
-// =============================================================================
-// implementation
-// =============================================================================
-
-// -----------------------------------------------------------------------------
-// wxListKey
-// -----------------------------------------------------------------------------
-wxListKey wxDefaultListKey;
-
-bool wxListKey::operator==(wxListKeyValue value) const
-{
-    switch ( m_keyType )
-    {
-        default:
-            wxFAIL_MSG(wxT("bad key type."));
-            // let compiler optimize the line above away in release build
-            // by not putting return here...
-
-        case wxKEY_STRING:
-            return *m_key.string == *value.string;
-
-        case wxKEY_INTEGER:
-            return m_key.integer == value.integer;
-    }
-}
-
-// -----------------------------------------------------------------------------
-// wxNodeBase
-// -----------------------------------------------------------------------------
-
-wxNodeBase::wxNodeBase(wxListBase *list,
-                       wxNodeBase *previous, wxNodeBase *next,
-                       void *data, const wxListKey& key)
-{
-    m_list = list;
-    m_data = data;
-    m_previous = previous;
-    m_next = next;
-
-    switch ( key.GetKeyType() )
-    {
-        case wxKEY_NONE:
-            break;
-
-        case wxKEY_INTEGER:
-            m_key.integer = key.GetNumber();
-            break;
-
-        case wxKEY_STRING:
-            // to be free()d later
-            m_key.string = new wxString(key.GetString());
-            break;
-
-        default:
-            wxFAIL_MSG(wxT("invalid key type"));
-    }
-
-    if ( previous )
-        previous->m_next = this;
-
-    if ( next )
-        next->m_previous = this;
-}
-
-wxNodeBase::~wxNodeBase()
-{
-    // handle the case when we're being deleted from the list by the user (i.e.
-    // not by the list itself from DeleteNode) - we must do it for
-    // compatibility with old code
-    if ( m_list != NULL )
-    {
-        if ( m_list->m_keyType == wxKEY_STRING )
-        {
-            delete m_key.string;
-        }
-
-        m_list->DetachNode(this);
-    }
-}
-
-int wxNodeBase::IndexOf() const
-{
-    wxCHECK_MSG( m_list, wxNOT_FOUND, wxT("node doesn't belong to a list in IndexOf"));
-
-    // It would be more efficient to implement IndexOf() completely inside
-    // wxListBase (only traverse the list once), but this is probably a more
-    // reusable way of doing it. Can always be optimized at a later date (since
-    // IndexOf() resides in wxListBase as well) if efficiency is a problem.
-    int i;
-    wxNodeBase *prev = m_previous;
-
-    for( i = 0; prev; i++ )
-    {
-        prev = prev->m_previous;
-    }
-
-    return i;
-}
-
-// -----------------------------------------------------------------------------
-// wxListBase
-// -----------------------------------------------------------------------------
-
-void wxListBase::Init(wxKeyType keyType)
-{
-  m_nodeFirst =
-  m_nodeLast = NULL;
-  m_count = 0;
-  m_destroy = false;
-  m_keyType = keyType;
-}
-
-wxListBase::wxListBase(size_t count, void *elements[])
-{
-  Init();
-
-  for ( size_t n = 0; n < count; n++ )
-  {
-      Append(elements[n]);
-  }
-}
-
-void wxListBase::DoCopy(const wxListBase& list)
-{
-    wxASSERT_MSG( !list.m_destroy,
-                  wxT("copying list which owns it's elements is a bad idea") );
-
-    m_destroy = list.m_destroy;
-    m_keyType = list.m_keyType;
-    m_nodeFirst =
-    m_nodeLast = NULL;
-
-    switch (m_keyType)
-    {
-        case wxKEY_INTEGER:
-            {
-                for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
-                {
-                    Append(node->GetKeyInteger(), node->GetData());
-                }
-                break;
-            }
-
-        case wxKEY_STRING:
-            {
-                for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
-                {
-                    Append(node->GetKeyString(), node->GetData());
-                }
-                break;
-            }
-
-        default:
-            {
-                for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
-                {
-                    Append(node->GetData());
-                }
-                break;
-            }
-    }
-
-    wxASSERT_MSG( m_count == list.m_count, wxT("logic error in wxList::DoCopy") );
-}
-
-wxListBase::~wxListBase()
-{
-  wxNodeBase *each = m_nodeFirst;
-  while ( each != NULL )
-  {
-      wxNodeBase *next = each->GetNext();
-      DoDeleteNode(each);
-      each = next;
-  }
-}
-
-wxNodeBase *wxListBase::AppendCommon(wxNodeBase *node)
-{
-    if ( !m_nodeFirst )
-    {
-        m_nodeFirst = node;
-        m_nodeLast = m_nodeFirst;
-    }
-    else
-    {
-        m_nodeLast->m_next = node;
-        m_nodeLast = node;
-    }
-
-    m_count++;
-
-    return node;
-}
-
-wxNodeBase *wxListBase::Append(void *object)
-{
-    // all objects in a keyed list should have a key
-    wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL,
-                 wxT("need a key for the object to append") );
-
-    // we use wxDefaultListKey even though it is the default parameter value
-    // because gcc under Mac OS X seems to miscompile this call otherwise
-    wxNodeBase *node = CreateNode(m_nodeLast, NULL, object,
-                                  wxDefaultListKey);
-
-    return AppendCommon(node);
-}
-
-wxNodeBase *wxListBase::Append(long key, void *object)
-{
-    wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
-                 (m_keyType == wxKEY_NONE && m_count == 0),
-                 NULL,
-                 wxT("can't append object with numeric key to this list") );
-
-    wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key);
-    return AppendCommon(node);
-}
-
-wxNodeBase *wxListBase::Append (const wxString& key, void *object)
-{
-    wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
-                 (m_keyType == wxKEY_NONE && m_count == 0),
-                 NULL,
-                 wxT("can't append object with string key to this list") );
-
-    wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key);
-    return AppendCommon(node);
-}
-
-wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
-{
-    // all objects in a keyed list should have a key
-    wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL,
-                 wxT("need a key for the object to insert") );
-
-    wxCHECK_MSG( !position || position->m_list == this, NULL,
-                 wxT("can't insert before a node from another list") );
-
-    // previous and next node for the node being inserted
-    wxNodeBase *prev, *next;
-    if ( position )
-    {
-        prev = position->GetPrevious();
-        next = position;
-    }
-    else
-    {
-        // inserting in the beginning of the list
-        prev = NULL;
-        next = m_nodeFirst;
-    }
-
-    // wxDefaultListKey: see comment in Append() above
-    wxNodeBase *node = CreateNode(prev, next, object, wxDefaultListKey);
-    if ( !m_nodeFirst )
-    {
-        m_nodeLast = node;
-    }
-
-    if ( prev == NULL )
-    {
-        m_nodeFirst = node;
-    }
-
-    m_count++;
-
-    return node;
-}
-
-wxNodeBase *wxListBase::Item(size_t n) const
-{
-    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
-    {
-        if ( n-- == 0 )
-        {
-            return current;
-        }
-    }
-
-    wxFAIL_MSG( wxT("invalid index in wxListBase::Item") );
-
-    return NULL;
-}
-
-wxNodeBase *wxListBase::Find(const wxListKey& key) const
-{
-    wxASSERT_MSG( m_keyType == key.GetKeyType(),
-                  wxT("this list is not keyed on the type of this key") );
-
-    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
-    {
-        if ( key == current->m_key )
-        {
-            return current;
-        }
-    }
-
-    // not found
-    return NULL;
-}
-
-wxNodeBase *wxListBase::Find(const void *object) const
-{
-    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
-    {
-        if ( current->GetData() == object )
-            return current;
-    }
-
-    // not found
-    return NULL;
-}
-
-int wxListBase::IndexOf(void *object) const
-{
-    wxNodeBase *node = Find( object );
-
-    return node ? node->IndexOf() : wxNOT_FOUND;
-}
-
-void wxListBase::DoDeleteNode(wxNodeBase *node)
-{
-    // free node's data
-    if ( m_keyType == wxKEY_STRING )
-    {
-        free(node->m_key.string);
-    }
-
-    if ( m_destroy )
-    {
-        node->DeleteData();
-    }
-
-    // so that the node knows that it's being deleted by the list
-    node->m_list = NULL;
-    delete node;
-}
-
-wxNodeBase *wxListBase::DetachNode(wxNodeBase *node)
-{
-    wxCHECK_MSG( node, NULL, wxT("detaching NULL wxNodeBase") );
-    wxCHECK_MSG( node->m_list == this, NULL,
-                 wxT("detaching node which is not from this list") );
-
-    // update the list
-    wxNodeBase **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next
-                                                : &m_nodeFirst;
-    wxNodeBase **nextPrev = node->GetNext() ? &node->GetNext()->m_previous
-                                            : &m_nodeLast;
-
-    *prevNext = node->GetNext();
-    *nextPrev = node->GetPrevious();
-
-    m_count--;
-
-    // mark the node as not belonging to this list any more
-    node->m_list = NULL;
-
-    return node;
-}
-
-bool wxListBase::DeleteNode(wxNodeBase *node)
-{
-    if ( !DetachNode(node) )
-        return false;
-
-    DoDeleteNode(node);
-
-    return true;
-}
-
-bool wxListBase::DeleteObject(void *object)
-{
-    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
-    {
-        if ( current->GetData() == object )
-        {
-            DeleteNode(current);
-            return true;
-        }
-    }
-
-    // not found
-    return false;
-}
-
-void wxListBase::Clear()
-{
-    wxNodeBase *current = m_nodeFirst;
-    while ( current )
-    {
-        wxNodeBase *next = current->GetNext();
-        DoDeleteNode(current);
-        current = next;
-    }
-
-    m_nodeFirst =
-    m_nodeLast = NULL;
-
-    m_count = 0;
-}
-
-void wxListBase::ForEach(wxListIterateFunction F)
-{
-    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
-    {
-        (*F)(current->GetData());
-    }
-}
-
-void *wxListBase::FirstThat(wxListIterateFunction F)
-{
-    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
-    {
-        if ( (*F)(current->GetData()) )
-            return current->GetData();
-    }
-
-    return NULL;
-}
-
-void *wxListBase::LastThat(wxListIterateFunction F)
-{
-    for ( wxNodeBase *current = GetLast(); current; current = current->GetPrevious() )
-    {
-        if ( (*F)(current->GetData()) )
-            return current->GetData();
-    }
-
-    return NULL;
-}
-
-// (stefan.hammes@urz.uni-heidelberg.de)
-//
-// function for sorting lists. the concept is borrowed from 'qsort'.
-// by giving a sort function, arbitrary lists can be sorted.
-// method:
-// - put wxObject pointers into an array
-// - sort the array with qsort
-// - put back the sorted wxObject pointers into the list
-//
-// CAVE: the sort function receives pointers to wxObject pointers (wxObject **),
-//       so dereference right!
-// EXAMPLE:
-//   int listcompare(const void *arg1, const void *arg2)
-//   {
-//      return(compare(**(wxString **)arg1,
-//                     **(wxString **)arg2));
-//   }
-//
-//   void main()
-//   {
-//     wxListBase list;
-//
-//     list.Append(new wxString("DEF"));
-//     list.Append(new wxString("GHI"));
-//     list.Append(new wxString("ABC"));
-//     list.Sort(listcompare);
-//   }
-
-void wxListBase::Sort(const wxSortCompareFunction compfunc)
-{
-    // allocate an array for the wxObject pointers of the list
-    const size_t num = GetCount();
-    void **objArray = new void *[num];
-    void **objPtr = objArray;
-
-    // go through the list and put the pointers into the array
-    wxNodeBase *node;
-    for ( node = GetFirst(); node; node = node->GetNext() )
-    {
-        *objPtr++ = node->GetData();
-    }
-
-    // sort the array
-    qsort((void *)objArray,num,sizeof(wxObject *),
-#ifdef __WXWINCE__
-        (int (__cdecl *)(const void *,const void *))
-#endif
-        compfunc);
-
-    // put the sorted pointers back into the list
-    objPtr = objArray;
-    for ( node = GetFirst(); node; node = node->GetNext() )
-    {
-        node->SetData(*objPtr++);
-    }
-
-    // free the array
-    delete[] objArray;
-}
-
-void wxListBase::Reverse()
-{
-    wxNodeBase* node = m_nodeFirst;
-    wxNodeBase* tmp;
-
-    while (node)
-    {
-        // swap prev and next pointers
-        tmp = node->m_next;
-        node->m_next = node->m_previous;
-        node->m_previous = tmp;
-
-        // this is the node that was next before swapping
-        node = tmp;
-    }
-
-    // swap first and last node
-    tmp = m_nodeFirst; m_nodeFirst = m_nodeLast; m_nodeLast = tmp;
-}
-
-void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last)
-{
-    wxNodeBase* node = first;
-
-    while (node != last)
-    {
-        wxNodeBase* next = node->GetNext();
-        DeleteNode(node);
-        node = next;
-    }
-}
-
-// ============================================================================
-// compatibility section from now on
-// ============================================================================
-
-#ifdef wxLIST_COMPATIBILITY
-
-// -----------------------------------------------------------------------------
-// wxList (a.k.a. wxObjectList)
-// -----------------------------------------------------------------------------
-
-wxList::wxList( int key_type )
-    : wxObjectList( (wxKeyType)key_type )
-{
-}
-
-void wxObjectListNode::DeleteData()
-{
-    delete (wxObject *)GetData();
-}
-
-// ----------------------------------------------------------------------------
-// wxStringList
-// ----------------------------------------------------------------------------
-
-static inline wxChar* MYcopystring(const wxChar* s)
-{
-    wxChar* copy = new wxChar[wxStrlen(s) + 1];
-    return wxStrcpy(copy, s);
-}
-
-// instead of WX_DEFINE_LIST(wxStringListBase) we define this function
-// ourselves
-void wxStringListNode::DeleteData()
-{
-    delete [] (char *)GetData();
-}
-
-bool wxStringList::Delete(const wxChar *s)
-{
-    wxStringListNode *current;
-
-    for ( current = GetFirst(); current; current = current->GetNext() )
-    {
-        if ( wxStrcmp(current->GetData(), s) == 0 )
-        {
-            DeleteNode(current);
-            return true;
-        }
-    }
-
-    // not found
-    return false;
-}
-
-void wxStringList::DoCopy(const wxStringList& other)
-{
-    wxASSERT( GetCount() == 0 );    // this list must be empty before copying!
-
-    size_t count = other.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        Add(other.Item(n)->GetData());
-    }
-}
-
-wxStringList::wxStringList()
-{
-    DeleteContents(true);
-}
-
-// Variable argument list, terminated by a zero
-// Makes new storage for the strings
-wxStringList::wxStringList (const wxChar *first, ...)
-{
-  DeleteContents(true);
-  if ( !first )
-    return;
-
-  va_list ap;
-  va_start(ap, first);
-
-  const wxChar *s = first;
-  for (;;)
-  {
-      Add(s);
-
-      // icc gives this warning in its own va_arg() macro, argh
-#ifdef __INTELC__
-    #pragma warning(push)
-    #pragma warning(disable: 1684)
-#endif
-
-      s = va_arg(ap, const wxChar *);
-
-#ifdef __INTELC__
-    #pragma warning(pop)
-#endif
-
-      if ( !s )
-          break;
-  }
-
-  va_end(ap);
-}
-
-// Only makes new strings if arg is true
-wxChar **wxStringList::ListToArray(bool new_copies) const
-{
-    wxChar **string_array = new wxChar *[GetCount()];
-    wxStringListNode *node = GetFirst();
-    for (size_t i = 0; i < GetCount(); i++)
-    {
-        wxChar *s = node->GetData();
-        if ( new_copies )
-            string_array[i] = MYcopystring(s);
-        else
-            string_array[i] = s;
-        node = node->GetNext();
-    }
-
-    return string_array;
-}
-
-// Checks whether s is a member of the list
-bool wxStringList::Member(const wxChar *s) const
-{
-    for ( wxStringListNode *node = GetFirst(); node; node = node->GetNext() )
-    {
-        const wxChar *s1 = node->GetData();
-        if (s == s1 || wxStrcmp (s, s1) == 0)
-            return true;
-    }
-
-    return false;
-}
-
-#ifdef __WXWINCE__
-extern "C"
-{
-static int __cdecl
-#else
-extern "C"
-{
-static int LINKAGEMODE
-#endif
-
-wx_comparestrings(const void *arg1, const void *arg2)
-{
-  wxChar **s1 = (wxChar **) arg1;
-  wxChar **s2 = (wxChar **) arg2;
-
-  return wxStrcmp (*s1, *s2);
-}
-
-}   // end of extern "C" (required because of GCC Bug c++/33078
-
-// Sort a list of strings - deallocates old nodes, allocates new
-void wxStringList::Sort()
-{
-    size_t N = GetCount();
-    wxChar **array = new wxChar *[N];
-    wxStringListNode *node;
-
-    size_t i = 0;
-    for ( node = GetFirst(); node; node = node->GetNext() )
-    {
-        array[i++] = node->GetData();
-    }
-
-    qsort (array, N, sizeof (wxChar *), wx_comparestrings);
-
-    i = 0;
-    for ( node = GetFirst(); node; node = node->GetNext() )
-        node->SetData( array[i++] );
-
-    delete [] array;
-}
-
-wxNode *wxStringList::Add(const wxChar *s)
-{
-    return (wxNode *)(wxStringListBase::Node *)
-            wxStringListBase::Append(MYcopystring(s));
-}
-
-wxNode *wxStringList::Prepend(const wxChar *s)
-{
-    return (wxNode *)(wxStringListBase::Node *)
-            wxStringListBase::Insert(MYcopystring(s));
-}
-
-#endif // wxLIST_COMPATIBILITY
-
-#else // wxUSE_STD_CONTAINERS = 1
-
-    #include "wx/listimpl.cpp"
-    WX_DEFINE_LIST(wxObjectList)
-
-// with wxUSE_STD_CONTAINERS wxStringList contains wxString objects, not pointers
-void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
-{
-}
-
-wxStringListBase::BaseListType wxStringListBase::EmptyList;
-
-#endif // !wxUSE_STD_CONTAINERS
+////////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/list.cpp
+// Purpose:     wxList implementation
+// Author:      Julian Smart
+// Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
+// Created:     04/01/98
+// RCS-ID:      $Id: list.cpp 43048 2006-11-04 18:14:50Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+////////////////////////////////////////////////////////////////////////////////
+
+// =============================================================================
+// declarations
+// =============================================================================
+
+// -----------------------------------------------------------------------------
+// headers
+// -----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+#endif
+
+#if !wxUSE_STL
+
+// =============================================================================
+// implementation
+// =============================================================================
+
+// -----------------------------------------------------------------------------
+// wxListKey
+// -----------------------------------------------------------------------------
+wxListKey wxDefaultListKey;
+
+bool wxListKey::operator==(wxListKeyValue value) const
+{
+    switch ( m_keyType )
+    {
+        default:
+            wxFAIL_MSG(wxT("bad key type."));
+            // let compiler optimize the line above away in release build
+            // by not putting return here...
+
+        case wxKEY_STRING:
+            return wxStrcmp(m_key.string, value.string) == 0;
+
+        case wxKEY_INTEGER:
+            return m_key.integer == value.integer;
+    }
+}
+
+// -----------------------------------------------------------------------------
+// wxNodeBase
+// -----------------------------------------------------------------------------
+
+wxNodeBase::wxNodeBase(wxListBase *list,
+                       wxNodeBase *previous, wxNodeBase *next,
+                       void *data, const wxListKey& key)
+{
+    m_list = list;
+    m_data = data;
+    m_previous = previous;
+    m_next = next;
+
+    switch ( key.GetKeyType() )
+    {
+        case wxKEY_NONE:
+            break;
+
+        case wxKEY_INTEGER:
+            m_key.integer = key.GetNumber();
+            break;
+
+        case wxKEY_STRING:
+            // to be free()d later
+            m_key.string = wxStrdup(key.GetString());
+            break;
+
+        default:
+            wxFAIL_MSG(wxT("invalid key type"));
+    }
+
+    if ( previous )
+        previous->m_next = this;
+
+    if ( next )
+        next->m_previous = this;
+}
+
+wxNodeBase::~wxNodeBase()
+{
+    // handle the case when we're being deleted from the list by the user (i.e.
+    // not by the list itself from DeleteNode) - we must do it for
+    // compatibility with old code
+    if ( m_list != NULL )
+    {
+        if ( m_list->m_keyType == wxKEY_STRING )
+        {
+            free(m_key.string);
+        }
+
+        m_list->DetachNode(this);
+    }
+}
+
+int wxNodeBase::IndexOf() const
+{
+    wxCHECK_MSG( m_list, wxNOT_FOUND, wxT("node doesn't belong to a list in IndexOf"));
+
+    // It would be more efficient to implement IndexOf() completely inside
+    // wxListBase (only traverse the list once), but this is probably a more
+    // reusable way of doing it. Can always be optimized at a later date (since
+    // IndexOf() resides in wxListBase as well) if efficiency is a problem.
+    int i;
+    wxNodeBase *prev = m_previous;
+
+    for( i = 0; prev; i++ )
+    {
+        prev = prev->m_previous;
+    }
+
+    return i;
+}
+
+// -----------------------------------------------------------------------------
+// wxListBase
+// -----------------------------------------------------------------------------
+
+void wxListBase::Init(wxKeyType keyType)
+{
+  m_nodeFirst =
+  m_nodeLast = (wxNodeBase *) NULL;
+  m_count = 0;
+  m_destroy = false;
+  m_keyType = keyType;
+}
+
+wxListBase::wxListBase(size_t count, void *elements[])
+{
+  Init();
+
+  for ( size_t n = 0; n < count; n++ )
+  {
+      Append(elements[n]);
+  }
+}
+
+void wxListBase::DoCopy(const wxListBase& list)
+{
+    wxASSERT_MSG( !list.m_destroy,
+                  wxT("copying list which owns it's elements is a bad idea") );
+
+    m_destroy = list.m_destroy;
+    m_keyType = list.m_keyType;
+    m_nodeFirst =
+    m_nodeLast = (wxNodeBase *) NULL;
+
+    switch (m_keyType)
+    {
+        case wxKEY_INTEGER:
+            {
+                long key;
+                for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+                {
+                    key = node->GetKeyInteger();
+                    Append(key, node->GetData());
+                }
+                break;
+            }
+
+        case wxKEY_STRING:
+            {
+                const wxChar *key;
+                for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+                {
+                    key = node->GetKeyString();
+                    Append(key, node->GetData());
+                }
+                break;
+            }
+
+        default:
+            {
+                for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
+                {
+                    Append(node->GetData());
+                }
+                break;
+            }
+    }
+
+    wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );
+}
+
+wxListBase::~wxListBase()
+{
+  wxNodeBase *each = m_nodeFirst;
+  while ( each != NULL )
+  {
+      wxNodeBase *next = each->GetNext();
+      DoDeleteNode(each);
+      each = next;
+  }
+}
+
+wxNodeBase *wxListBase::AppendCommon(wxNodeBase *node)
+{
+    if ( !m_nodeFirst )
+    {
+        m_nodeFirst = node;
+        m_nodeLast = m_nodeFirst;
+    }
+    else
+    {
+        m_nodeLast->m_next = node;
+        m_nodeLast = node;
+    }
+
+    m_count++;
+
+    return node;
+}
+
+wxNodeBase *wxListBase::Append(void *object)
+{
+    // all objects in a keyed list should have a key
+    wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
+                 wxT("need a key for the object to append") );
+
+    // we use wxDefaultListKey even though it is the default parameter value
+    // because gcc under Mac OS X seems to miscompile this call otherwise
+    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object,
+                                  wxDefaultListKey);
+
+    return AppendCommon(node);
+}
+
+wxNodeBase *wxListBase::Append(long key, void *object)
+{
+    wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
+                 (m_keyType == wxKEY_NONE && m_count == 0),
+                 (wxNodeBase *)NULL,
+                 wxT("can't append object with numeric key to this list") );
+
+    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
+    return AppendCommon(node);
+}
+
+wxNodeBase *wxListBase::Append (const wxChar *key, void *object)
+{
+    wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
+                 (m_keyType == wxKEY_NONE && m_count == 0),
+                 (wxNodeBase *)NULL,
+                 wxT("can't append object with string key to this list") );
+
+    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
+    return AppendCommon(node);
+}
+
+wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
+{
+    // all objects in a keyed list should have a key
+    wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
+                 wxT("need a key for the object to insert") );
+
+    wxCHECK_MSG( !position || position->m_list == this, (wxNodeBase *)NULL,
+                 wxT("can't insert before a node from another list") );
+
+    // previous and next node for the node being inserted
+    wxNodeBase *prev, *next;
+    if ( position )
+    {
+        prev = position->GetPrevious();
+        next = position;
+    }
+    else
+    {
+        // inserting in the beginning of the list
+        prev = (wxNodeBase *)NULL;
+        next = m_nodeFirst;
+    }
+
+    // wxDefaultListKey: see comment in Append() above
+    wxNodeBase *node = CreateNode(prev, next, object, wxDefaultListKey);
+    if ( !m_nodeFirst )
+    {
+        m_nodeLast = node;
+    }
+
+    if ( prev == NULL )
+    {
+        m_nodeFirst = node;
+    }
+
+    m_count++;
+
+    return node;
+}
+
+wxNodeBase *wxListBase::Item(size_t n) const
+{
+    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
+    {
+        if ( n-- == 0 )
+        {
+            return current;
+        }
+    }
+
+    wxFAIL_MSG( wxT("invalid index in wxListBase::Item") );
+
+    return (wxNodeBase *)NULL;
+}
+
+wxNodeBase *wxListBase::Find(const wxListKey& key) const
+{
+    wxASSERT_MSG( m_keyType == key.GetKeyType(),
+                  wxT("this list is not keyed on the type of this key") );
+
+    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
+    {
+        if ( key == current->m_key )
+        {
+            return current;
+        }
+    }
+
+    // not found
+    return (wxNodeBase *)NULL;
+}
+
+wxNodeBase *wxListBase::Find(const void *object) const
+{
+    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
+    {
+        if ( current->GetData() == object )
+            return current;
+    }
+
+    // not found
+    return (wxNodeBase *)NULL;
+}
+
+int wxListBase::IndexOf(void *object) const
+{
+    wxNodeBase *node = Find( object );
+
+    return node ? node->IndexOf() : wxNOT_FOUND;
+}
+
+void wxListBase::DoDeleteNode(wxNodeBase *node)
+{
+    // free node's data
+    if ( m_keyType == wxKEY_STRING )
+    {
+        free(node->m_key.string);
+    }
+
+    if ( m_destroy )
+    {
+        node->DeleteData();
+    }
+
+    // so that the node knows that it's being deleted by the list
+    node->m_list = NULL;
+    delete node;
+}
+
+wxNodeBase *wxListBase::DetachNode(wxNodeBase *node)
+{
+    wxCHECK_MSG( node, NULL, wxT("detaching NULL wxNodeBase") );
+    wxCHECK_MSG( node->m_list == this, NULL,
+                 wxT("detaching node which is not from this list") );
+
+    // update the list
+    wxNodeBase **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next
+                                                : &m_nodeFirst;
+    wxNodeBase **nextPrev = node->GetNext() ? &node->GetNext()->m_previous
+                                            : &m_nodeLast;
+
+    *prevNext = node->GetNext();
+    *nextPrev = node->GetPrevious();
+
+    m_count--;
+
+    // mark the node as not belonging to this list any more
+    node->m_list = NULL;
+
+    return node;
+}
+
+bool wxListBase::DeleteNode(wxNodeBase *node)
+{
+    if ( !DetachNode(node) )
+        return false;
+
+    DoDeleteNode(node);
+
+    return true;
+}
+
+bool wxListBase::DeleteObject(void *object)
+{
+    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
+    {
+        if ( current->GetData() == object )
+        {
+            DeleteNode(current);
+            return true;
+        }
+    }
+
+    // not found
+    return false;
+}
+
+void wxListBase::Clear()
+{
+    wxNodeBase *current = m_nodeFirst;
+    while ( current )
+    {
+        wxNodeBase *next = current->GetNext();
+        DoDeleteNode(current);
+        current = next;
+    }
+
+    m_nodeFirst =
+    m_nodeLast = (wxNodeBase *)NULL;
+
+    m_count = 0;
+}
+
+void wxListBase::ForEach(wxListIterateFunction F)
+{
+    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
+    {
+        (*F)(current->GetData());
+    }
+}
+
+void *wxListBase::FirstThat(wxListIterateFunction F)
+{
+    for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
+    {
+        if ( (*F)(current->GetData()) )
+            return current->GetData();
+    }
+
+    return (wxNodeBase *)NULL;
+}
+
+void *wxListBase::LastThat(wxListIterateFunction F)
+{
+    for ( wxNodeBase *current = GetLast(); current; current = current->GetPrevious() )
+    {
+        if ( (*F)(current->GetData()) )
+            return current->GetData();
+    }
+
+    return (wxNodeBase *)NULL;
+}
+
+// (stefan.hammes@urz.uni-heidelberg.de)
+//
+// function for sorting lists. the concept is borrowed from 'qsort'.
+// by giving a sort function, arbitrary lists can be sorted.
+// method:
+// - put wxObject pointers into an array
+// - sort the array with qsort
+// - put back the sorted wxObject pointers into the list
+//
+// CAVE: the sort function receives pointers to wxObject pointers (wxObject **),
+//       so dereference right!
+// EXAMPLE:
+//   int listcompare(const void *arg1, const void *arg2)
+//   {
+//      return(compare(**(wxString **)arg1,
+//                     **(wxString **)arg2));
+//   }
+//
+//   void main()
+//   {
+//     wxListBase list;
+//
+//     list.Append(new wxString("DEF"));
+//     list.Append(new wxString("GHI"));
+//     list.Append(new wxString("ABC"));
+//     list.Sort(listcompare);
+//   }
+
+void wxListBase::Sort(const wxSortCompareFunction compfunc)
+{
+    // allocate an array for the wxObject pointers of the list
+    const size_t num = GetCount();
+    void **objArray = new void *[num];
+    void **objPtr = objArray;
+
+    // go through the list and put the pointers into the array
+    wxNodeBase *node;
+    for ( node = GetFirst(); node; node = node->GetNext() )
+    {
+        *objPtr++ = node->GetData();
+    }
+
+    // sort the array
+    qsort((void *)objArray,num,sizeof(wxObject *),
+#ifdef __WXWINCE__
+        (int (__cdecl *)(const void *,const void *))
+#endif
+        compfunc);
+
+    // put the sorted pointers back into the list
+    objPtr = objArray;
+    for ( node = GetFirst(); node; node = node->GetNext() )
+    {
+        node->SetData(*objPtr++);
+    }
+
+    // free the array
+    delete[] objArray;
+}
+
+void wxListBase::Reverse()
+{
+    wxNodeBase* node = m_nodeFirst;
+    wxNodeBase* tmp;
+
+    while (node)
+    {
+        // swap prev and next pointers
+        tmp = node->m_next;
+        node->m_next = node->m_previous;
+        node->m_previous = tmp;
+
+        // this is the node that was next before swapping
+        node = tmp;
+    }
+
+    // swap first and last node
+    tmp = m_nodeFirst; m_nodeFirst = m_nodeLast; m_nodeLast = tmp;
+}
+
+void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last)
+{
+    wxNodeBase* node = first;
+
+    while (node != last)
+    {
+        wxNodeBase* next = node->GetNext();
+        DeleteNode(node);
+        node = next;
+    }
+}
+
+// ============================================================================
+// compatibility section from now on
+// ============================================================================
+
+#ifdef wxLIST_COMPATIBILITY
+
+// -----------------------------------------------------------------------------
+// wxList (a.k.a. wxObjectList)
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
+
+wxList::wxList( int key_type )
+    : wxObjectList( (wxKeyType)key_type )
+{
+}
+
+void wxObjectListNode::DeleteData()
+{
+    delete (wxObject *)GetData();
+}
+
+// ----------------------------------------------------------------------------
+// wxStringList
+// ----------------------------------------------------------------------------
+
+static inline wxChar* MYcopystring(const wxChar* s)
+{
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
+
+// instead of WX_DEFINE_LIST(wxStringListBase) we define this function
+// ourselves
+void wxStringListNode::DeleteData()
+{
+    delete [] (char *)GetData();
+}
+
+bool wxStringList::Delete(const wxChar *s)
+{
+    wxStringListNode *current;
+
+    for ( current = GetFirst(); current; current = current->GetNext() )
+    {
+        if ( wxStrcmp(current->GetData(), s) == 0 )
+        {
+            DeleteNode(current);
+            return true;
+        }
+    }
+
+    // not found
+    return false;
+}
+
+void wxStringList::DoCopy(const wxStringList& other)
+{
+    wxASSERT( GetCount() == 0 );    // this list must be empty before copying!
+
+    size_t count = other.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        Add(other.Item(n)->GetData());
+    }
+}
+
+wxStringList::wxStringList()
+{
+    DeleteContents(true);
+}
+
+// Variable argument list, terminated by a zero
+// Makes new storage for the strings
+wxStringList::wxStringList (const wxChar *first, ...)
+{
+  DeleteContents(true);
+  if ( !first )
+    return;
+
+  va_list ap;
+  va_start(ap, first);
+
+  const wxChar *s = first;
+  for (;;)
+  {
+      Add(s);
+
+      // icc gives this warning in its own va_arg() macro, argh
+#ifdef __INTELC__
+    #pragma warning(push)
+    #pragma warning(disable: 1684)
+#endif
+
+      s = va_arg(ap, const wxChar *);
+
+#ifdef __INTELC__
+    #pragma warning(pop)
+#endif
+
+      if ( !s )
+          break;
+  }
+
+  va_end(ap);
+}
+
+// Only makes new strings if arg is true
+wxChar **wxStringList::ListToArray(bool new_copies) const
+{
+    wxChar **string_array = new wxChar *[GetCount()];
+    wxStringListNode *node = GetFirst();
+    for (size_t i = 0; i < GetCount(); i++)
+    {
+        wxChar *s = node->GetData();
+        if ( new_copies )
+            string_array[i] = MYcopystring(s);
+        else
+            string_array[i] = s;
+        node = node->GetNext();
+    }
+
+    return string_array;
+}
+
+// Checks whether s is a member of the list
+bool wxStringList::Member(const wxChar *s) const
+{
+    for ( wxStringListNode *node = GetFirst(); node; node = node->GetNext() )
+    {
+        const wxChar *s1 = node->GetData();
+        if (s == s1 || wxStrcmp (s, s1) == 0)
+            return true;
+    }
+
+    return false;
+}
+
+#ifdef __WXWINCE__
+extern "C" int __cdecl
+#else
+extern "C" int LINKAGEMODE
+#endif
+
+wx_comparestrings(const void *arg1, const void *arg2)
+{
+  wxChar **s1 = (wxChar **) arg1;
+  wxChar **s2 = (wxChar **) arg2;
+
+  return wxStrcmp (*s1, *s2);
+}
+
+// Sort a list of strings - deallocates old nodes, allocates new
+void wxStringList::Sort()
+{
+    size_t N = GetCount();
+    wxChar **array = new wxChar *[N];
+    wxStringListNode *node;
+
+    size_t i = 0;
+    for ( node = GetFirst(); node; node = node->GetNext() )
+    {
+        array[i++] = node->GetData();
+    }
+
+    qsort (array, N, sizeof (wxChar *), wx_comparestrings);
+
+    i = 0;
+    for ( node = GetFirst(); node; node = node->GetNext() )
+        node->SetData( array[i++] );
+
+    delete [] array;
+}
+
+wxNode *wxStringList::Add(const wxChar *s)
+{
+    return (wxNode *)(wxStringListBase::Node *)
+            wxStringListBase::Append(MYcopystring(s));
+}
+
+wxNode *wxStringList::Prepend(const wxChar *s)
+{
+    return (wxNode *)(wxStringListBase::Node *)
+            wxStringListBase::Insert(MYcopystring(s));
+}
+
+#endif // wxLIST_COMPATIBILITY
+
+#else // wxUSE_STL = 1
+
+    #include "wx/listimpl.cpp"
+    WX_DEFINE_LIST(wxObjectList)
+
+// with wxUSE_STL wxStringList contains wxString objects, not pointers
+void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
+{
+}
+
+wxStringListBase::BaseListType wxStringListBase::EmptyList;
+
+#endif // !wxUSE_STL
diff --git a/Source/3rd Party/wx/src/common/listctrlcmn.cpp b/Source/3rd Party/wx/src/common/listctrlcmn.cpp
index 8edda3976..c5366a1aa 100644
--- a/Source/3rd Party/wx/src/common/listctrlcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/listctrlcmn.cpp	
@@ -1,219 +1,54 @@
-////////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/listctrlcmn.cpp
-// Purpose:     Common defines for wxListCtrl and wxListCtrl-based classes.
-// Author:      Kevin Ollivier
-// Created:     09/15/06
-// RCS-ID:      $Id$
-// Copyright:   (c) Kevin Ollivier
-// Licence:     wxWindows licence
-////////////////////////////////////////////////////////////////////////////////
-
-// =============================================================================
-// declarations
-// =============================================================================
-
-// -----------------------------------------------------------------------------
-// headers
-// -----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_LISTCTRL
-
-#include "wx/listctrl.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
-#endif
-
-const char wxListCtrlNameStr[] = "listCtrl";
-
-// ListCtrl events
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_BEGIN_DRAG, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_BEGIN_RDRAG, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_END_LABEL_EDIT, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_DELETE_ITEM, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_KEY_DOWN, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_INSERT_ITEM, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_CLICK, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_DRAGGING, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_COL_END_DRAG, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_ITEM_FOCUSED, wxListEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LIST_CACHE_HINT, wxListEvent );
-
-// -----------------------------------------------------------------------------
-// XTI
-// -----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxListCtrlStyle )
-wxBEGIN_FLAGS( wxListCtrlStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxLC_LIST)
-wxFLAGS_MEMBER(wxLC_REPORT)
-wxFLAGS_MEMBER(wxLC_ICON)
-wxFLAGS_MEMBER(wxLC_SMALL_ICON)
-wxFLAGS_MEMBER(wxLC_ALIGN_TOP)
-wxFLAGS_MEMBER(wxLC_ALIGN_LEFT)
-wxFLAGS_MEMBER(wxLC_AUTOARRANGE)
-wxFLAGS_MEMBER(wxLC_USER_TEXT)
-wxFLAGS_MEMBER(wxLC_EDIT_LABELS)
-wxFLAGS_MEMBER(wxLC_NO_HEADER)
-wxFLAGS_MEMBER(wxLC_SINGLE_SEL)
-wxFLAGS_MEMBER(wxLC_SORT_ASCENDING)
-wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
-wxFLAGS_MEMBER(wxLC_VIRTUAL)
-wxEND_FLAGS( wxListCtrlStyle )
-
-#if ((!defined(__WXMSW__) && !(defined(__WXMAC__) && wxOSX_USE_CARBON)) || defined(__WXUNIVERSAL__))
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxGenericListCtrl, "wx/listctrl.h")
-#else
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl, "wx/listctrl.h")
-#endif
-
-wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
-wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
-
-wxPROPERTY_FLAGS( WindowStyle, wxListCtrlStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxListCtrl)
-
-wxCONSTRUCTOR_5( wxListCtrl, wxWindow*, Parent, wxWindowID, Id, \
-                wxPoint, Position, wxSize, Size, long, WindowStyle )
-
-/*
- TODO : Expose more information of a list's layout etc. via appropriate objects 
- (see NotebookPageInfo)
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-
-// ----------------------------------------------------------------------------
-// wxListCtrlBase implementation
-// ----------------------------------------------------------------------------
-
-long
-wxListCtrlBase::AppendColumn(const wxString& heading,
-                             int format,
-                             int width)
-{
-    return InsertColumn(GetColumnCount(), heading, format, width);
-}
-
-long
-wxListCtrlBase::InsertColumn(long col,
-                             const wxString& heading,
-                             int format,
-                             int width)
-{
-    wxListItem item;
-    item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
-    item.m_text = heading;
-    if ( width >= 0
-            || width == wxLIST_AUTOSIZE
-                || width == wxLIST_AUTOSIZE_USEHEADER )
-    {
-        item.m_mask |= wxLIST_MASK_WIDTH;
-        item.m_width = width;
-    }
-    item.m_format = format;
-
-    return InsertColumn(col, item);
-}
-
-long wxListCtrlBase::InsertColumn(long col, const wxListItem& info)
-{
-    long rc = DoInsertColumn(col, info);
-    if ( rc != -1 )
-    {
-        // As our best size calculation depends on the column headers,
-        // invalidate the previously cached best size when a column is added.
-        InvalidateBestSize();
-    }
-
-    return rc;
-}
-
-wxSize wxListCtrlBase::DoGetBestClientSize() const
-{
-    // There is no obvious way to determine the best size in icon and list
-    // modes so just don't do it for now.
-    if ( !InReportView() )
-        return wxControl::DoGetBestClientSize();
-
-    int totalWidth;
-    wxClientDC dc(const_cast<wxListCtrlBase*>(this));
-
-    // In report mode, we use only the column headers, not items, to determine
-    // the best width. The reason for this is that it's easier (we can't just
-    // iterate over all items, especially not in a virtual control, so we'd
-    // have to do something relatively complicated such as checking the size of
-    // some items in the beginning and the end only) and also because the
-    // columns are usually static while the list contents is dynamic so it
-    // usually doesn't make much sense to adjust the control size to it anyhow.
-    // And finally, scrollbars can always be used with the items while the
-    // headers are just truncated if there is not enough place for them.
-    const int columns = GetColumnCount();
-    if ( HasFlag(wxLC_NO_HEADER) || !columns )
-    {
-        // Use some arbitrary width.
-        totalWidth = 50*dc.GetCharWidth();
-    }
-    else // We do have columns, use them to determine the best width.
-    {
-        totalWidth = 0;
-        for ( int col = 0; col < columns; col++ )
-        {
-            totalWidth += GetColumnWidth(col);
-        }
-    }
-
-    // Use some arbitrary height, there is no good way to determine it.
-    return wxSize(totalWidth, 10*dc.GetCharHeight());
-}
-
-#endif // wxUSE_LISTCTRL
+////////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/listctrlcmn.cpp
+// Purpose:     Common defines for wxListCtrl and wxListCtrl-based classes.
+// Author:      Kevin Ollivier
+// Created:     09/15/06
+// RCS-ID:      $Id: listctrlcmn.cpp 41568 2006-10-02 17:38:30Z PC $
+// Copyright:   (c) Kevin Ollivier
+// Licence:     wxWindows licence
+////////////////////////////////////////////////////////////////////////////////
+
+// =============================================================================
+// declarations
+// =============================================================================
+
+// -----------------------------------------------------------------------------
+// headers
+// -----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTCTRL
+
+#include "wx/listctrl.h"
+
+const wxChar wxListCtrlNameStr[] = wxT("listCtrl");
+
+// ListCtrl events
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
+#if WXWIN_COMPATIBILITY_2_4
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
+#endif
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
+
+#endif // wxUSE_LISTCTRL
diff --git a/Source/3rd Party/wx/src/common/log.cpp b/Source/3rd Party/wx/src/common/log.cpp
index c18be7c3c..dc23a83e3 100644
--- a/Source/3rd Party/wx/src/common/log.cpp	
+++ b/Source/3rd Party/wx/src/common/log.cpp	
@@ -1,1124 +1,838 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/log.cpp
-// Purpose:     Assorted wxLogXXX functions, and wxLog (sink for logs)
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_LOG
-
-// wxWidgets
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/app.h"
-    #include "wx/arrstr.h"
-    #include "wx/intl.h"
-    #include "wx/string.h"
-    #include "wx/utils.h"
-#endif //WX_PRECOMP
-
-#include "wx/apptrait.h"
-#include "wx/datetime.h"
-#include "wx/file.h"
-#include "wx/msgout.h"
-#include "wx/textfile.h"
-#include "wx/thread.h"
-#include "wx/private/threadinfo.h"
-#include "wx/crt.h"
-#include "wx/vector.h"
-
-// other standard headers
-#ifndef __WXWINCE__
-#include <errno.h>
-#endif
-
-#include <stdlib.h>
-
-#ifndef __WXWINCE__
-#include <time.h>
-#else
-#include "wx/msw/wince/time.h"
-#endif
-
-#if defined(__WINDOWS__)
-    #include "wx/msw/private.h" // includes windows.h
-#endif
-
-#undef wxLOG_COMPONENT
-const char *wxLOG_COMPONENT = "";
-
-// this macro allows to define an object which will be initialized before any
-// other function in this file is called: this is necessary to allow log
-// functions to be used during static initialization (this is not advisable
-// anyhow but we should at least try to not crash) and to also ensure that they
-// are initialized by the time static initialization is done, i.e. before any
-// threads are created hopefully
-//
-// the net effect of all this is that you can use Get##name() function to
-// access the object without worrying about it being not initialized
-//
-// see also WX_DEFINE_GLOBAL_CONV2() in src/common/strconv.cpp
-#define WX_DEFINE_GLOBAL_VAR(type, name)                                      \
-    inline type& Get##name()                                                  \
-    {                                                                         \
-        static type s_##name;                                                 \
-        return s_##name;                                                      \
-    }                                                                         \
-                                                                              \
-    type *gs_##name##Ptr = &Get##name()
-
-#if wxUSE_THREADS
-
-wxTLS_TYPE(wxThreadSpecificInfo) wxThreadInfoVar;
-
-namespace
-{
-
-// contains messages logged by the other threads and waiting to be shown until
-// Flush() is called in the main one
-typedef wxVector<wxLogRecord> wxLogRecords;
-wxLogRecords gs_bufferedLogRecords;
-
-#define WX_DEFINE_LOG_CS(name) WX_DEFINE_GLOBAL_VAR(wxCriticalSection, name##CS)
-
-// this critical section is used for buffering the messages from threads other
-// than main, i.e. it protects all accesses to gs_bufferedLogRecords above
-WX_DEFINE_LOG_CS(BackgroundLog);
-
-// this one is used for protecting TraceMasks() from concurrent access
-WX_DEFINE_LOG_CS(TraceMask);
-
-// and this one is used for GetComponentLevels()
-WX_DEFINE_LOG_CS(Levels);
-
-} // anonymous namespace
-
-#endif // wxUSE_THREADS
-
-// ----------------------------------------------------------------------------
-// non member functions
-// ----------------------------------------------------------------------------
-
-// define this to enable wrapping of log messages
-//#define LOG_PRETTY_WRAP
-
-#ifdef  LOG_PRETTY_WRAP
-  static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
-#endif
-
-// ----------------------------------------------------------------------------
-// module globals
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// this struct is used to store information about the previous log message used
-// by OnLog() to (optionally) avoid logging multiple copies of the same message
-struct PreviousLogInfo
-{
-    PreviousLogInfo()
-    {
-        numRepeated = 0;
-    }
-
-
-    // previous message itself
-    wxString msg;
-
-    // its level
-    wxLogLevel level;
-
-    // other information about it
-    wxLogRecordInfo info;
-
-    // the number of times it was already repeated
-    unsigned numRepeated;
-};
-
-PreviousLogInfo gs_prevLog;
-
-
-// map containing all components for which log level was explicitly set
-//
-// NB: all accesses to it must be protected by GetLevelsCS() critical section
-WX_DEFINE_GLOBAL_VAR(wxStringToNumHashMap, ComponentLevels);
-
-// ----------------------------------------------------------------------------
-// wxLogOutputBest: wxLog wrapper around wxMessageOutputBest
-// ----------------------------------------------------------------------------
-
-class wxLogOutputBest : public wxLog
-{
-public:
-    wxLogOutputBest() { }
-
-protected:
-    virtual void DoLogText(const wxString& msg)
-    {
-        wxMessageOutputBest().Output(msg);
-    }
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxLogOutputBest);
-};
-
-} // anonymous namespace
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// helper global functions
-// ----------------------------------------------------------------------------
-
-void wxSafeShowMessage(const wxString& title, const wxString& text)
-{
-#ifdef __WINDOWS__
-    ::MessageBox(NULL, text.t_str(), title.t_str(), MB_OK | MB_ICONSTOP);
-#else
-    wxFprintf(stderr, wxS("%s: %s\n"), title.c_str(), text.c_str());
-    fflush(stderr);
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// wxLogFormatter class implementation
-// ----------------------------------------------------------------------------
-
-wxString
-wxLogFormatter::Format(wxLogLevel level,
-                       const wxString& msg,
-                       const wxLogRecordInfo& info) const
-{
-    wxString prefix;
-
-    // don't time stamp debug messages under MSW as debug viewers usually
-    // already have an option to do it
-#ifdef __WINDOWS__
-    if ( level != wxLOG_Debug && level != wxLOG_Trace )
-#endif // __WINDOWS__
-        prefix = FormatTime(info.timestamp);
-
-    switch ( level )
-    {
-    case wxLOG_Error:
-        prefix += _("Error: ");
-        break;
-
-    case wxLOG_Warning:
-        prefix += _("Warning: ");
-        break;
-
-        // don't prepend "debug/trace" prefix under MSW as it goes to the debug
-        // window anyhow and so can't be confused with something else
-#ifndef __WINDOWS__
-    case wxLOG_Debug:
-        // this prefix (as well as the one below) is intentionally not
-        // translated as nobody translates debug messages anyhow
-        prefix += "Debug: ";
-        break;
-
-    case wxLOG_Trace:
-        prefix += "Trace: ";
-        break;
-#endif // !__WINDOWS__
-    }
-
-    return prefix + msg;
-}
-
-wxString
-wxLogFormatter::FormatTime(time_t t) const
-{
-    wxString str;
-    wxLog::TimeStamp(&str, t);
-
-    return str;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxLog class implementation
-// ----------------------------------------------------------------------------
-
-unsigned wxLog::LogLastRepeatIfNeeded()
-{
-    const unsigned count = gs_prevLog.numRepeated;
-
-    if ( gs_prevLog.numRepeated )
-    {
-        wxString msg;
-#if wxUSE_INTL
-        if ( gs_prevLog.numRepeated == 1 )
-        {
-            // We use a separate message for this case as "repeated 1 time"
-            // looks somewhat strange.
-            msg = _("The previous message repeated once.");
-        }
-        else
-        {
-            // Notice that we still use wxPLURAL() to ensure that multiple
-            // numbers of times are correctly formatted, even though we never
-            // actually use the singular string.
-            msg.Printf(wxPLURAL("The previous message repeated %lu time.",
-                                "The previous message repeated %lu times.",
-                                gs_prevLog.numRepeated),
-                       gs_prevLog.numRepeated);
-        }
-#else
-        msg.Printf(wxS("The previous message was repeated %lu time(s)."),
-                   gs_prevLog.numRepeated);
-#endif
-        gs_prevLog.numRepeated = 0;
-        gs_prevLog.msg.clear();
-        DoLogRecord(gs_prevLog.level, msg, gs_prevLog.info);
-    }
-
-    return count;
-}
-
-wxLog::~wxLog()
-{
-    // Flush() must be called before destroying the object as otherwise some
-    // messages could be lost
-    if ( gs_prevLog.numRepeated )
-    {
-        wxMessageOutputDebug().Printf
-        (
-#if wxUSE_INTL
-            wxPLURAL
-            (
-                "Last repeated message (\"%s\", %lu time) wasn't output",
-                "Last repeated message (\"%s\", %lu times) wasn't output",
-                gs_prevLog.numRepeated
-            ),
-#else
-            wxS("Last repeated message (\"%s\", %lu time(s)) wasn't output"),
-#endif
-            gs_prevLog.msg,
-            gs_prevLog.numRepeated
-        );
-    }
-
-    delete m_formatter;
-}
-
-// ----------------------------------------------------------------------------
-// wxLog logging functions
-// ----------------------------------------------------------------------------
-
-/* static */
-void
-wxLog::OnLog(wxLogLevel level, const wxString& msg, time_t t)
-{
-    wxLogRecordInfo info;
-    info.timestamp = t;
-#if wxUSE_THREADS
-    info.threadId = wxThread::GetCurrentId();
-#endif // wxUSE_THREADS
-
-    OnLog(level, msg, info);
-}
-
-/* static */
-void
-wxLog::OnLog(wxLogLevel level,
-             const wxString& msg,
-             const wxLogRecordInfo& info)
-{
-    // fatal errors can't be suppressed nor handled by the custom log target
-    // and always terminate the program
-    if ( level == wxLOG_FatalError )
-    {
-        wxSafeShowMessage(wxS("Fatal Error"), msg);
-
-        wxAbort();
-    }
-
-    wxLog *logger;
-
-#if wxUSE_THREADS
-    if ( !wxThread::IsMain() )
-    {
-        logger = wxThreadInfo.logger;
-        if ( !logger )
-        {
-            if ( ms_pLogger )
-            {
-                // buffer the messages until they can be shown from the main
-                // thread
-                wxCriticalSectionLocker lock(GetBackgroundLogCS());
-
-                gs_bufferedLogRecords.push_back(wxLogRecord(level, msg, info));
-
-                // ensure that our Flush() will be called soon
-                wxWakeUpIdle();
-            }
-            //else: we don't have any logger at all, there is no need to log
-            //      anything
-
-            return;
-        }
-        //else: we have a thread-specific logger, we can send messages to it
-        //      directly
-    }
-    else
-#endif // wxUSE_THREADS
-    {
-        logger = GetMainThreadActiveTarget();
-        if ( !logger )
-            return;
-    }
-
-    logger->CallDoLogNow(level, msg, info);
-}
-
-void
-wxLog::CallDoLogNow(wxLogLevel level,
-                    const wxString& msg,
-                    const wxLogRecordInfo& info)
-{
-    if ( GetRepetitionCounting() )
-    {
-        if ( msg == gs_prevLog.msg )
-        {
-            gs_prevLog.numRepeated++;
-
-            // nothing else to do, in particular, don't log the
-            // repeated message
-            return;
-        }
-
-        LogLastRepeatIfNeeded();
-
-        // reset repetition counter for a new message
-        gs_prevLog.msg = msg;
-        gs_prevLog.level = level;
-        gs_prevLog.info = info;
-    }
-
-    // handle extra data which may be passed to us by wxLogXXX()
-    wxString prefix, suffix;
-    wxUIntPtr num = 0;
-    if ( info.GetNumValue(wxLOG_KEY_SYS_ERROR_CODE, &num) )
-    {
-        const long err = static_cast<long>(num);
-
-        suffix.Printf(_(" (error %ld: %s)"), err, wxSysErrorMsg(err));
-    }
-
-#if wxUSE_LOG_TRACE
-    wxString str;
-    if ( level == wxLOG_Trace && info.GetStrValue(wxLOG_KEY_TRACE_MASK, &str) )
-    {
-        prefix = "(" + str + ") ";
-    }
-#endif // wxUSE_LOG_TRACE
-
-    DoLogRecord(level, prefix + msg + suffix, info);
-}
-
-void wxLog::DoLogRecord(wxLogLevel level,
-                             const wxString& msg,
-                             const wxLogRecordInfo& info)
-{
-#if WXWIN_COMPATIBILITY_2_8
-    // call the old DoLog() to ensure that existing custom log classes still
-    // work
-    //
-    // as the user code could have defined it as either taking "const char *"
-    // (in ANSI build) or "const wxChar *" (in ANSI/Unicode), we have no choice
-    // but to call both of them
-    DoLog(level, (const char*)msg.mb_str(), info.timestamp);
-    DoLog(level, (const wchar_t*)msg.wc_str(), info.timestamp);
-#else // !WXWIN_COMPATIBILITY_2_8
-    wxUnusedVar(info);
-#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8
-
-    // Use wxLogFormatter to format the message
-    DoLogTextAtLevel(level, m_formatter->Format (level, msg, info));
-}
-
-void wxLog::DoLogTextAtLevel(wxLogLevel level, const wxString& msg)
-{
-    // we know about debug messages (because using wxMessageOutputDebug is the
-    // right thing to do in 99% of all cases and also for compatibility) but
-    // anything else needs to be handled in the derived class
-    if ( level == wxLOG_Debug || level == wxLOG_Trace )
-    {
-        wxMessageOutputDebug().Output(msg + wxS('\n'));
-    }
-    else
-    {
-        DoLogText(msg);
-    }
-}
-
-void wxLog::DoLogText(const wxString& WXUNUSED(msg))
-{
-    // in 2.8-compatible build the derived class might override DoLog() or
-    // DoLogString() instead so we can't have this assert there
-#if !WXWIN_COMPATIBILITY_2_8
-    wxFAIL_MSG( "must be overridden if it is called" );
-#endif // WXWIN_COMPATIBILITY_2_8
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-
-void wxLog::DoLog(wxLogLevel WXUNUSED(level), const char *szString, time_t t)
-{
-    DoLogString(szString, t);
-}
-
-void wxLog::DoLog(wxLogLevel WXUNUSED(level), const wchar_t *wzString, time_t t)
-{
-    DoLogString(wzString, t);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
-// ----------------------------------------------------------------------------
-// wxLog active target management
-// ----------------------------------------------------------------------------
-
-wxLog *wxLog::GetActiveTarget()
-{
-#if wxUSE_THREADS
-    if ( !wxThread::IsMain() )
-    {
-        // check if we have a thread-specific log target
-        wxLog * const logger = wxThreadInfo.logger;
-
-        // the code below should be only executed for the main thread as
-        // CreateLogTarget() is not meant for auto-creating log targets for
-        // worker threads so skip it in any case
-        return logger ? logger : ms_pLogger;
-    }
-#endif // wxUSE_THREADS
-
-    return GetMainThreadActiveTarget();
-}
-
-/* static */
-wxLog *wxLog::GetMainThreadActiveTarget()
-{
-    if ( ms_bAutoCreate && ms_pLogger == NULL ) {
-        // prevent infinite recursion if someone calls wxLogXXX() from
-        // wxApp::CreateLogTarget()
-        static bool s_bInGetActiveTarget = false;
-        if ( !s_bInGetActiveTarget ) {
-            s_bInGetActiveTarget = true;
-
-            // ask the application to create a log target for us
-            if ( wxTheApp != NULL )
-                ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget();
-            else
-                ms_pLogger = new wxLogOutputBest;
-
-            s_bInGetActiveTarget = false;
-
-            // do nothing if it fails - what can we do?
-        }
-    }
-
-    return ms_pLogger;
-}
-
-wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
-{
-    if ( ms_pLogger != NULL ) {
-        // flush the old messages before changing because otherwise they might
-        // get lost later if this target is not restored
-        ms_pLogger->Flush();
-    }
-
-    wxLog *pOldLogger = ms_pLogger;
-    ms_pLogger = pLogger;
-
-    return pOldLogger;
-}
-
-#if wxUSE_THREADS
-/* static */
-wxLog *wxLog::SetThreadActiveTarget(wxLog *logger)
-{
-    wxASSERT_MSG( !wxThread::IsMain(), "use SetActiveTarget() for main thread" );
-
-    wxLog * const oldLogger = wxThreadInfo.logger;
-    if ( oldLogger )
-        oldLogger->Flush();
-
-    wxThreadInfo.logger = logger;
-
-    return oldLogger;
-}
-#endif // wxUSE_THREADS
-
-void wxLog::DontCreateOnDemand()
-{
-    ms_bAutoCreate = false;
-
-    // this is usually called at the end of the program and we assume that it
-    // is *always* called at the end - so we free memory here to avoid false
-    // memory leak reports from wxWin  memory tracking code
-    ClearTraceMasks();
-}
-
-void wxLog::DoCreateOnDemand()
-{
-    ms_bAutoCreate = true;
-}
-
-// ----------------------------------------------------------------------------
-// wxLog components levels
-// ----------------------------------------------------------------------------
-
-/* static */
-void wxLog::SetComponentLevel(const wxString& component, wxLogLevel level)
-{
-    if ( component.empty() )
-    {
-        SetLogLevel(level);
-    }
-    else
-    {
-        wxCRIT_SECT_LOCKER(lock, GetLevelsCS());
-
-        GetComponentLevels()[component] = level;
-    }
-}
-
-/* static */
-wxLogLevel wxLog::GetComponentLevel(wxString component)
-{
-    wxCRIT_SECT_LOCKER(lock, GetLevelsCS());
-
-    const wxStringToNumHashMap& componentLevels = GetComponentLevels();
-    while ( !component.empty() )
-    {
-        wxStringToNumHashMap::const_iterator
-            it = componentLevels.find(component);
-        if ( it != componentLevels.end() )
-            return static_cast<wxLogLevel>(it->second);
-
-        component = component.BeforeLast('/');
-    }
-
-    return GetLogLevel();
-}
-
-// ----------------------------------------------------------------------------
-// wxLog trace masks
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// because IsAllowedTraceMask() may be called during static initialization
-// (this is not recommended but it may still happen, see #11592) we can't use a
-// simple static variable which might be not initialized itself just yet to
-// store the trace masks, but need this accessor function which will ensure
-// that the variable is always correctly initialized before being accessed
-//
-// notice that this doesn't make accessing it MT-safe, of course, you need to
-// serialize accesses to it using GetTraceMaskCS() for this
-wxArrayString& TraceMasks()
-{
-    static wxArrayString s_traceMasks;
-
-    return s_traceMasks;
-}
-
-} // anonymous namespace
-
-/* static */ const wxArrayString& wxLog::GetTraceMasks()
-{
-    // because of this function signature (it returns a reference, not the
-    // object), it is inherently MT-unsafe so there is no need to acquire the
-    // lock here anyhow
-
-    return TraceMasks();
-}
-
-void wxLog::AddTraceMask(const wxString& str)
-{
-    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());
-
-    TraceMasks().push_back(str);
-}
-
-void wxLog::RemoveTraceMask(const wxString& str)
-{
-    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());
-
-    int index = TraceMasks().Index(str);
-    if ( index != wxNOT_FOUND )
-        TraceMasks().RemoveAt((size_t)index);
-}
-
-void wxLog::ClearTraceMasks()
-{
-    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());
-
-    TraceMasks().Clear();
-}
-
-/*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)
-{
-    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());
-
-    const wxArrayString& masks = GetTraceMasks();
-    for ( wxArrayString::const_iterator it = masks.begin(),
-                                        en = masks.end();
-          it != en;
-          ++it )
-    {
-        if ( *it == mask)
-            return true;
-    }
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// wxLog miscellaneous other methods
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DATETIME
-
-void wxLog::TimeStamp(wxString *str)
-{
-    if ( !ms_timestamp.empty() )
-    {
-        *str = wxDateTime::UNow().Format(ms_timestamp);
-        *str += wxS(": ");
-    }
-}
-
-void wxLog::TimeStamp(wxString *str, time_t t)
-{
-    if ( !ms_timestamp.empty() )
-    {
-        *str = wxDateTime(t).Format(ms_timestamp);
-        *str += wxS(": ");
-    }
-}
-
-#else // !wxUSE_DATETIME
-
-void wxLog::TimeStamp(wxString*)
-{
-}
-
-void wxLog::TimeStamp(wxString*, time_t)
-{
-}
-
-#endif // wxUSE_DATETIME/!wxUSE_DATETIME
-
-#if wxUSE_THREADS
-
-void wxLog::FlushThreadMessages()
-{
-    // check if we have queued messages from other threads
-    wxLogRecords bufferedLogRecords;
-
-    {
-        wxCriticalSectionLocker lock(GetBackgroundLogCS());
-        bufferedLogRecords.swap(gs_bufferedLogRecords);
-
-        // release the lock now to not keep it while we are logging the
-        // messages below, allowing background threads to run
-    }
-
-    if ( !bufferedLogRecords.empty() )
-    {
-        for ( wxLogRecords::const_iterator it = bufferedLogRecords.begin();
-              it != bufferedLogRecords.end();
-              ++it )
-        {
-            CallDoLogNow(it->level, it->msg, it->info);
-        }
-    }
-}
-
-/* static */
-bool wxLog::IsThreadLoggingEnabled()
-{
-    return !wxThreadInfo.loggingDisabled;
-}
-
-/* static */
-bool wxLog::EnableThreadLogging(bool enable)
-{
-    const bool wasEnabled = !wxThreadInfo.loggingDisabled;
-    wxThreadInfo.loggingDisabled = !enable;
-    return wasEnabled;
-}
-
-#endif // wxUSE_THREADS
-
-wxLogFormatter *wxLog::SetFormatter(wxLogFormatter* formatter)
-{
-    wxLogFormatter* formatterOld = m_formatter;
-    m_formatter = formatter ? formatter : new wxLogFormatter;
-
-    return formatterOld;
-}
-
-void wxLog::Flush()
-{
-    LogLastRepeatIfNeeded();
-}
-
-/* static */
-void wxLog::FlushActive()
-{
-    if ( ms_suspendCount )
-        return;
-
-    wxLog * const log = GetActiveTarget();
-    if ( log )
-    {
-#if wxUSE_THREADS
-        if ( wxThread::IsMain() )
-            log->FlushThreadMessages();
-#endif // wxUSE_THREADS
-
-        log->Flush();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxLogBuffer implementation
-// ----------------------------------------------------------------------------
-
-void wxLogBuffer::Flush()
-{
-    wxLog::Flush();
-
-    if ( !m_str.empty() )
-    {
-        wxMessageOutputBest out;
-        out.Printf(wxS("%s"), m_str.c_str());
-        m_str.clear();
-    }
-}
-
-void wxLogBuffer::DoLogTextAtLevel(wxLogLevel level, const wxString& msg)
-{
-    // don't put debug messages in the buffer, we don't want to show
-    // them to the user in a msg box, log them immediately
-    switch ( level )
-    {
-        case wxLOG_Debug:
-        case wxLOG_Trace:
-            wxLog::DoLogTextAtLevel(level, msg);
-            break;
-
-        default:
-            m_str << msg << wxS("\n");
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxLogStderr class implementation
-// ----------------------------------------------------------------------------
-
-wxLogStderr::wxLogStderr(FILE *fp)
-{
-    if ( fp == NULL )
-        m_fp = stderr;
-    else
-        m_fp = fp;
-}
-
-void wxLogStderr::DoLogText(const wxString& msg)
-{
-    wxFputs(msg + '\n', m_fp);
-    fflush(m_fp);
-
-    // under GUI systems such as Windows or Mac, programs usually don't have
-    // stderr at all, so show the messages also somewhere else, typically in
-    // the debugger window so that they go at least somewhere instead of being
-    // simply lost
-    if ( m_fp == stderr )
-    {
-        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-        if ( traits && !traits->HasStderr() )
-        {
-            wxMessageOutputDebug().Output(msg + wxS('\n'));
-        }
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxLogStream implementation
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STD_IOSTREAM
-#include "wx/ioswrap.h"
-wxLogStream::wxLogStream(wxSTD ostream *ostr)
-{
-    if ( ostr == NULL )
-        m_ostr = &wxSTD cerr;
-    else
-        m_ostr = ostr;
-}
-
-void wxLogStream::DoLogText(const wxString& msg)
-{
-    (*m_ostr) << msg << wxSTD endl;
-}
-#endif // wxUSE_STD_IOSTREAM
-
-// ----------------------------------------------------------------------------
-// wxLogChain
-// ----------------------------------------------------------------------------
-
-wxLogChain::wxLogChain(wxLog *logger)
-{
-    m_bPassMessages = true;
-
-    m_logNew = logger;
-    m_logOld = wxLog::SetActiveTarget(this);
-}
-
-wxLogChain::~wxLogChain()
-{
-    wxLog::SetActiveTarget(m_logOld);
-
-    if ( m_logNew != this )
-        delete m_logNew;
-}
-
-void wxLogChain::SetLog(wxLog *logger)
-{
-    if ( m_logNew != this )
-        delete m_logNew;
-
-    m_logNew = logger;
-}
-
-void wxLogChain::Flush()
-{
-    if ( m_logOld )
-        m_logOld->Flush();
-
-    // be careful to avoid infinite recursion
-    if ( m_logNew && m_logNew != this )
-        m_logNew->Flush();
-}
-
-void wxLogChain::DoLogRecord(wxLogLevel level,
-                             const wxString& msg,
-                             const wxLogRecordInfo& info)
-{
-    // let the previous logger show it
-    if ( m_logOld && IsPassingMessages() )
-        m_logOld->LogRecord(level, msg, info);
-
-    // and also send it to the new one
-    if ( m_logNew )
-    {
-        // don't call m_logNew->LogRecord() to avoid infinite recursion when
-        // m_logNew is this object itself
-        if ( m_logNew != this )
-            m_logNew->LogRecord(level, msg, info);
-        else
-            wxLog::DoLogRecord(level, msg, info);
-    }
-}
-
-#ifdef __VISUALC__
-    // "'this' : used in base member initializer list" - so what?
-    #pragma warning(disable:4355)
-#endif // VC++
-
-// ----------------------------------------------------------------------------
-// wxLogInterposer
-// ----------------------------------------------------------------------------
-
-wxLogInterposer::wxLogInterposer()
-                : wxLogChain(this)
-{
-}
-
-// ----------------------------------------------------------------------------
-// wxLogInterposerTemp
-// ----------------------------------------------------------------------------
-
-wxLogInterposerTemp::wxLogInterposerTemp()
-                : wxLogChain(this)
-{
-    DetachOldLog();
-}
-
-#ifdef __VISUALC__
-    #pragma warning(default:4355)
-#endif // VC++
-
-// ============================================================================
-// Global functions/variables
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// static variables
-// ----------------------------------------------------------------------------
-
-bool            wxLog::ms_bRepetCounting = false;
-
-wxLog          *wxLog::ms_pLogger      = NULL;
-bool            wxLog::ms_doLog        = true;
-bool            wxLog::ms_bAutoCreate  = true;
-bool            wxLog::ms_bVerbose     = false;
-
-wxLogLevel      wxLog::ms_logLevel     = wxLOG_Max;  // log everything by default
-
-size_t          wxLog::ms_suspendCount = 0;
-
-wxString        wxLog::ms_timestamp(wxS("%X"));  // time only, no date
-
-#if WXWIN_COMPATIBILITY_2_8
-wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
-#endif // wxDEBUG_LEVEL
-
-// ----------------------------------------------------------------------------
-// stdout error logging helper
-// ----------------------------------------------------------------------------
-
-// helper function: wraps the message and justifies it under given position
-// (looks more pretty on the terminal). Also adds newline at the end.
-//
-// TODO this is now disabled until I find a portable way of determining the
-//      terminal window size (ok, I found it but does anybody really cares?)
-#ifdef LOG_PRETTY_WRAP
-static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
-{
-    size_t nMax = 80; // FIXME
-    size_t nStart = strlen(pszPrefix);
-    fputs(pszPrefix, f);
-
-    size_t n;
-    while ( *psz != '\0' ) {
-        for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ )
-            putc(*psz++, f);
-
-        // wrapped?
-        if ( *psz != '\0' ) {
-            /*putc('\n', f);*/
-            for ( n = 0; n < nStart; n++ )
-                putc(' ', f);
-
-            // as we wrapped, squeeze all white space
-            while ( isspace(*psz) )
-                psz++;
-        }
-    }
-
-    putc('\n', f);
-}
-#endif  //LOG_PRETTY_WRAP
-
-// ----------------------------------------------------------------------------
-// error code/error message retrieval functions
-// ----------------------------------------------------------------------------
-
-// get error code from syste
-unsigned long wxSysErrorCode()
-{
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    return ::GetLastError();
-#else   //Unix
-    return errno;
-#endif  //Win/Unix
-}
-
-// get error message from system
-const wxChar *wxSysErrorMsg(unsigned long nErrCode)
-{
-    if ( nErrCode == 0 )
-        nErrCode = wxSysErrorCode();
-
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    static wxChar s_szBuf[1024];
-
-    // get error message from system
-    LPVOID lpMsgBuf;
-    if ( ::FormatMessage
-         (
-            FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-            NULL,
-            nErrCode,
-            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-            (LPTSTR)&lpMsgBuf,
-            0,
-            NULL
-         ) == 0 )
-    {
-        // if this happens, something is seriously wrong, so don't use _() here
-        // for safety
-        wxSprintf(s_szBuf, wxS("unknown error %lx"), nErrCode);
-        return s_szBuf;
-    }
-
-
-    // copy it to our buffer and free memory
-    // Crashes on SmartPhone (FIXME)
-#if !defined(__SMARTPHONE__) /* of WinCE */
-    if( lpMsgBuf != 0 )
-    {
-        wxStrlcpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf));
-
-        LocalFree(lpMsgBuf);
-
-        // returned string is capitalized and ended with '\r\n' - bad
-        s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
-        size_t len = wxStrlen(s_szBuf);
-        if ( len > 0 ) {
-            // truncate string
-            if ( s_szBuf[len - 2] == wxS('\r') )
-                s_szBuf[len - 2] = wxS('\0');
-        }
-    }
-    else
-#endif // !__SMARTPHONE__
-    {
-        s_szBuf[0] = wxS('\0');
-    }
-
-    return s_szBuf;
-#else // !__WINDOWS__
-    #if wxUSE_UNICODE
-        static wchar_t s_wzBuf[1024];
-        wxConvCurrent->MB2WC(s_wzBuf, strerror((int)nErrCode),
-                             WXSIZEOF(s_wzBuf) - 1);
-        return s_wzBuf;
-    #else
-        return strerror((int)nErrCode);
-    #endif
-#endif  // __WINDOWS__/!__WINDOWS__
-}
-
-#endif // wxUSE_LOG
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/log.cpp
+// Purpose:     Assorted wxLogXXX functions, and wxLog (sink for logs)
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     29/01/98
+// RCS-ID:      $Id: log.cpp 67119 2011-03-03 15:09:44Z JS $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_LOG
+
+// wxWidgets
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/arrstr.h"
+    #include "wx/intl.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+#endif //WX_PRECOMP
+
+#include "wx/apptrait.h"
+#include "wx/datetime.h"
+#include "wx/file.h"
+#include "wx/msgout.h"
+#include "wx/textfile.h"
+#include "wx/thread.h"
+#include "wx/wxchar.h"
+
+// other standard headers
+#ifndef __WXWINCE__
+#include <errno.h>
+#endif
+
+#include <stdlib.h>
+
+#ifndef __WXWINCE__
+#include <time.h>
+#else
+#include "wx/msw/wince/time.h"
+#endif
+
+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h" // includes windows.h
+#endif
+
+// ----------------------------------------------------------------------------
+// non member functions
+// ----------------------------------------------------------------------------
+
+// define this to enable wrapping of log messages
+//#define LOG_PRETTY_WRAP
+
+#ifdef  LOG_PRETTY_WRAP
+  static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
+#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// implementation of Log functions
+//
+// NB: unfortunately we need all these distinct functions, we can't make them
+//     macros and not all compilers inline vararg functions.
+// ----------------------------------------------------------------------------
+
+// generic log function
+void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr)
+{
+    if ( wxLog::IsEnabled() ) {
+        wxLog::OnLog(level, wxString::FormatV(szFormat, argptr), time(NULL));
+    }
+}
+
+void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogGeneric(level, szFormat, argptr);
+    va_end(argptr);
+}
+
+#define IMPLEMENT_LOG_FUNCTION(level)                               \
+  void wxVLog##level(const wxChar *szFormat, va_list argptr)        \
+  {                                                                 \
+    if ( wxLog::IsEnabled() ) {                                     \
+      wxLog::OnLog(wxLOG_##level,                                   \
+                   wxString::FormatV(szFormat, argptr), time(NULL));\
+    }                                                               \
+  }                                                                 \
+                                                                    \
+  void wxLog##level(const wxChar *szFormat, ...)                    \
+  {                                                                 \
+    va_list argptr;                                                 \
+    va_start(argptr, szFormat);                                     \
+    wxVLog##level(szFormat, argptr);                                \
+    va_end(argptr);                                                 \
+  }
+
+IMPLEMENT_LOG_FUNCTION(Error)
+IMPLEMENT_LOG_FUNCTION(Warning)
+IMPLEMENT_LOG_FUNCTION(Message)
+IMPLEMENT_LOG_FUNCTION(Info)
+IMPLEMENT_LOG_FUNCTION(Status)
+
+void wxSafeShowMessage(const wxString& title, const wxString& text)
+{
+#ifdef __WINDOWS__
+    ::MessageBox(NULL, text, title, MB_OK | MB_ICONSTOP);
+#else
+    wxFprintf(stderr, _T("%s: %s\n"), title.c_str(), text.c_str());
+    fflush(stderr);
+#endif
+}
+
+// fatal errors can't be suppressed nor handled by the custom log target and
+// always terminate the program
+void wxVLogFatalError(const wxChar *szFormat, va_list argptr)
+{
+    wxSafeShowMessage(_T("Fatal Error"), wxString::FormatV(szFormat, argptr));
+
+#ifdef __WXWINCE__
+    ExitThread(3);
+#else
+    abort();
+#endif
+}
+
+void wxLogFatalError(const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogFatalError(szFormat, argptr);
+
+    // some compilers warn about unreachable code and it shouldn't matter
+    // for the others anyhow...
+    //va_end(argptr);
+}
+
+// same as info, but only if 'verbose' mode is on
+void wxVLogVerbose(const wxChar *szFormat, va_list argptr)
+{
+    if ( wxLog::IsEnabled() ) {
+        if ( wxLog::GetActiveTarget() != NULL && wxLog::GetVerbose() ) {
+            wxLog::OnLog(wxLOG_Info,
+                         wxString::FormatV(szFormat, argptr), time(NULL));
+        }
+    }
+}
+
+void wxLogVerbose(const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogVerbose(szFormat, argptr);
+    va_end(argptr);
+}
+
+// debug functions
+#ifdef __WXDEBUG__
+#define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                         \
+  void wxVLog##level(const wxChar *szFormat, va_list argptr)        \
+  {                                                                 \
+    if ( wxLog::IsEnabled() ) {                                     \
+      wxLog::OnLog(wxLOG_##level,                                   \
+                   wxString::FormatV(szFormat, argptr), time(NULL));\
+    }                                                               \
+  }                                                                 \
+                                                                    \
+  void wxLog##level(const wxChar *szFormat, ...)                    \
+  {                                                                 \
+    va_list argptr;                                                 \
+    va_start(argptr, szFormat);                                     \
+    wxVLog##level(szFormat, argptr);                                \
+    va_end(argptr);                                                 \
+  }
+
+  void wxVLogTrace(const wxChar *mask, const wxChar *szFormat, va_list argptr)
+  {
+    if ( wxLog::IsEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
+      wxString msg;
+      msg << _T("(") << mask << _T(") ") << wxString::FormatV(szFormat, argptr);
+
+      wxLog::OnLog(wxLOG_Trace, msg, time(NULL));
+    }
+  }
+
+  void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
+  {
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogTrace(mask, szFormat, argptr);
+    va_end(argptr);
+  }
+
+  void wxVLogTrace(wxTraceMask mask, const wxChar *szFormat, va_list argptr)
+  {
+    // we check that all of mask bits are set in the current mask, so
+    // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
+    // if both bits are set.
+    if ( wxLog::IsEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
+      wxLog::OnLog(wxLOG_Trace, wxString::FormatV(szFormat, argptr), time(NULL));
+    }
+  }
+
+  void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
+  {
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogTrace(mask, szFormat, argptr);
+    va_end(argptr);
+  }
+
+#else // release
+  #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)
+#endif
+
+IMPLEMENT_LOG_DEBUG_FUNCTION(Debug)
+IMPLEMENT_LOG_DEBUG_FUNCTION(Trace)
+
+// wxLogSysError: one uses the last error code, for other  you must give it
+// explicitly
+
+// return the system error message description
+static inline wxString wxLogSysErrorHelper(long err)
+{
+    return wxString::Format(_(" (error %ld: %s)"), err, wxSysErrorMsg(err));
+}
+
+void WXDLLEXPORT wxVLogSysError(const wxChar *szFormat, va_list argptr)
+{
+    wxVLogSysError(wxSysErrorCode(), szFormat, argptr);
+}
+
+void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogSysError(szFormat, argptr);
+    va_end(argptr);
+}
+
+void WXDLLEXPORT wxVLogSysError(long err, const wxChar *fmt, va_list argptr)
+{
+    if ( wxLog::IsEnabled() ) {
+        wxLog::OnLog(wxLOG_Error,
+                     wxString::FormatV(fmt, argptr) + wxLogSysErrorHelper(err),
+                     time(NULL));
+    }
+}
+
+void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogSysError(lErrCode, szFormat, argptr);
+    va_end(argptr);
+}
+
+// ----------------------------------------------------------------------------
+// wxLog class implementation
+// ----------------------------------------------------------------------------
+
+// define a critical section gs_prevCS protecting access to wxLog::ms_prevXXX
+wxCRIT_SECT_DECLARE(gs_prevCS);
+
+/* static */
+unsigned wxLog::DoLogNumberOfRepeats()
+{
+    wxLog * const pLogger = GetActiveTarget();
+    return pLogger ? pLogger->LogLastRepeatIfNeeded() : 0u;
+}
+
+unsigned wxLog::LogLastRepeatIfNeeded()
+{
+    wxCRIT_SECT_LOCKER(lock, gs_prevCS);
+
+    return LogLastRepeatIfNeededUnlocked();
+}
+
+unsigned wxLog::LogLastRepeatIfNeededUnlocked()
+{
+    long retval = ms_prevCounter;
+    if ( ms_prevCounter > 0 )
+    {
+        wxString msg;
+#if wxUSE_INTL
+        msg.Printf(wxPLURAL("The previous message repeated once.",
+                            "The previous message repeated %lu times.",
+                            ms_prevCounter),
+                   ms_prevCounter);
+#else
+        msg.Printf(wxT("The previous message was repeated."));
+#endif
+        ms_prevCounter = 0;
+        ms_prevString.clear();
+        DoLog(ms_prevLevel, msg.c_str(), ms_prevTimeStamp);
+    }
+    return retval;
+}
+
+wxLog::~wxLog()
+{
+}
+
+/* static */
+void wxLog::OnLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    if ( IsEnabled() && ms_logLevel >= level )
+    {
+        wxLog *pLogger = GetActiveTarget();
+        if ( pLogger )
+        {
+            if ( GetRepetitionCounting() )
+            {
+                wxCRIT_SECT_LOCKER(lock, gs_prevCS);
+
+                if ( szString == ms_prevString )
+                {
+                    ms_prevCounter++;
+
+                    // nothing else to do, in particular, don't log the
+                    // repeated message
+                    return;
+                }
+
+                pLogger->LogLastRepeatIfNeededUnlocked();
+
+                // reset repetition counter for a new message
+                ms_prevString = szString;
+                ms_prevLevel = level;
+                ms_prevTimeStamp = t;
+            }
+
+            pLogger->DoLog(level, szString, t);
+        }
+    }
+}
+
+// deprecated function
+#if WXWIN_COMPATIBILITY_2_6
+
+wxChar *wxLog::SetLogBuffer(wxChar * WXUNUSED(buf), size_t WXUNUSED(size))
+{
+    return NULL;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+wxLog *wxLog::GetActiveTarget()
+{
+    if ( ms_bAutoCreate && ms_pLogger == NULL ) {
+        // prevent infinite recursion if someone calls wxLogXXX() from
+        // wxApp::CreateLogTarget()
+        static bool s_bInGetActiveTarget = false;
+        if ( !s_bInGetActiveTarget ) {
+            s_bInGetActiveTarget = true;
+
+            // ask the application to create a log target for us
+            if ( wxTheApp != NULL )
+                ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget();
+            else
+                ms_pLogger = new wxLogStderr;
+
+            s_bInGetActiveTarget = false;
+
+            // do nothing if it fails - what can we do?
+        }
+    }
+
+    return ms_pLogger;
+}
+
+wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
+{
+    if ( ms_pLogger != NULL ) {
+        // flush the old messages before changing because otherwise they might
+        // get lost later if this target is not restored
+        ms_pLogger->Flush();
+    }
+
+    wxLog *pOldLogger = ms_pLogger;
+    ms_pLogger = pLogger;
+
+    return pOldLogger;
+}
+
+void wxLog::DontCreateOnDemand()
+{
+    ms_bAutoCreate = false;
+
+    // this is usually called at the end of the program and we assume that it
+    // is *always* called at the end - so we free memory here to avoid false
+    // memory leak reports from wxWin  memory tracking code
+    ClearTraceMasks();
+}
+
+void wxLog::DoCreateOnDemand()
+{
+    ms_bAutoCreate = true;
+}
+
+void wxLog::RemoveTraceMask(const wxString& str)
+{
+    int index = ms_aTraceMasks.Index(str);
+    if ( index != wxNOT_FOUND )
+        ms_aTraceMasks.RemoveAt((size_t)index);
+}
+
+void wxLog::ClearTraceMasks()
+{
+    ms_aTraceMasks.Clear();
+}
+
+void wxLog::TimeStamp(wxString *str)
+{
+#if wxUSE_DATETIME
+    if ( ms_timestamp )
+    {
+        wxChar buf[256];
+        time_t timeNow;
+        (void)time(&timeNow);
+
+        struct tm tm;
+        wxStrftime(buf, WXSIZEOF(buf),
+                    ms_timestamp, wxLocaltime_r(&timeNow, &tm));
+
+        str->Empty();
+        *str << buf << wxT(": ");
+    }
+#endif // wxUSE_DATETIME
+}
+
+void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    switch ( level ) {
+        case wxLOG_FatalError:
+            DoLogString(wxString(_("Fatal error: ")) + szString, t);
+            DoLogString(_("Program aborted."), t);
+            Flush();
+#ifdef __WXWINCE__
+            ExitThread(3);
+#else
+            abort();
+#endif
+            break;
+
+        case wxLOG_Error:
+            DoLogString(wxString(_("Error: ")) + szString, t);
+            break;
+
+        case wxLOG_Warning:
+            DoLogString(wxString(_("Warning: ")) + szString, t);
+            break;
+
+        case wxLOG_Info:
+            if ( GetVerbose() )
+        case wxLOG_Message:
+        case wxLOG_Status:
+        default:    // log unknown log levels too
+                DoLogString(szString, t);
+            break;
+
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+#ifdef __WXDEBUG__
+            {
+                wxString msg = level == wxLOG_Trace ? wxT("Trace: ")
+                                                    : wxT("Debug: ");
+                msg << szString;
+                DoLogString(msg, t);
+            }
+#endif // Debug
+            break;
+    }
+}
+
+void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))
+{
+    wxFAIL_MSG(wxT("DoLogString must be overriden if it's called."));
+}
+
+void wxLog::Flush()
+{
+    LogLastRepeatIfNeeded();
+}
+
+/*static*/ bool wxLog::IsAllowedTraceMask(const wxChar *mask)
+{
+    for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
+                                  en = ms_aTraceMasks.end();
+         it != en; ++it )
+        if ( *it == mask)
+            return true;
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// wxLogBuffer implementation
+// ----------------------------------------------------------------------------
+
+void wxLogBuffer::Flush()
+{
+    if ( !m_str.empty() )
+    {
+        wxMessageOutputBest out;
+        out.Printf(_T("%s"), m_str.c_str());
+        m_str.clear();
+    }
+}
+
+void wxLogBuffer::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    switch ( level )
+    {
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+#ifdef __WXDEBUG__
+            // don't put debug messages in the buffer, we don't want to show
+            // them to the user in a msg box, log them immediately
+            {
+                wxString str;
+                TimeStamp(&str);
+                str += szString;
+
+                wxMessageOutputDebug dbgout;
+                dbgout.Printf(_T("%s\n"), str.c_str());
+            }
+#endif // __WXDEBUG__
+            break;
+
+        default:
+            wxLog::DoLog(level, szString, t);
+    }
+}
+
+void wxLogBuffer::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+{
+    m_str << szString << _T("\n");
+}
+
+// ----------------------------------------------------------------------------
+// wxLogStderr class implementation
+// ----------------------------------------------------------------------------
+
+wxLogStderr::wxLogStderr(FILE *fp)
+{
+    if ( fp == NULL )
+        m_fp = stderr;
+    else
+        m_fp = fp;
+}
+
+void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+{
+    wxString str;
+    TimeStamp(&str);
+    str << szString;
+
+    wxFputs(str, m_fp);
+    wxFputc(_T('\n'), m_fp);
+    fflush(m_fp);
+
+    // under GUI systems such as Windows or Mac, programs usually don't have
+    // stderr at all, so show the messages also somewhere else, typically in
+    // the debugger window so that they go at least somewhere instead of being
+    // simply lost
+    if ( m_fp == stderr )
+    {
+        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+        if ( traits && !traits->HasStderr() )
+        {
+            wxMessageOutputDebug dbgout;
+            dbgout.Printf(_T("%s\n"), str.c_str());
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxLogStream implementation
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STD_IOSTREAM
+#include "wx/ioswrap.h"
+wxLogStream::wxLogStream(wxSTD ostream *ostr)
+{
+    if ( ostr == NULL )
+        m_ostr = &wxSTD cerr;
+    else
+        m_ostr = ostr;
+}
+
+void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+{
+    wxString str;
+    TimeStamp(&str);
+    (*m_ostr) << wxSafeConvertWX2MB(str) << wxSafeConvertWX2MB(szString) << wxSTD endl;
+}
+#endif // wxUSE_STD_IOSTREAM
+
+// ----------------------------------------------------------------------------
+// wxLogChain
+// ----------------------------------------------------------------------------
+
+wxLogChain::wxLogChain(wxLog *logger)
+{
+    m_bPassMessages = true;
+
+    m_logNew = logger;
+    m_logOld = wxLog::SetActiveTarget(this);
+}
+
+wxLogChain::~wxLogChain()
+{
+    wxLog::SetActiveTarget(m_logOld);
+
+    if ( m_logNew != this )
+        delete m_logNew;
+}
+
+void wxLogChain::SetLog(wxLog *logger)
+{
+    if ( m_logNew != this )
+        delete m_logNew;
+
+    m_logNew = logger;
+}
+
+void wxLogChain::Flush()
+{
+    if ( m_logOld )
+        m_logOld->Flush();
+
+    // be careful to avoid infinite recursion
+    if ( m_logNew && m_logNew != this )
+        m_logNew->Flush();
+}
+
+void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    // let the previous logger show it
+    if ( m_logOld && IsPassingMessages() )
+    {
+        // bogus cast just to access protected DoLog
+        ((wxLogChain *)m_logOld)->DoLog(level, szString, t);
+    }
+
+    if ( m_logNew && m_logNew != this )
+    {
+        // as above...
+        ((wxLogChain *)m_logNew)->DoLog(level, szString, t);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxLogPassThrough
+// ----------------------------------------------------------------------------
+
+#ifdef __VISUALC__
+    // "'this' : used in base member initializer list" - so what?
+    #pragma warning(disable:4355)
+#endif // VC++
+
+wxLogPassThrough::wxLogPassThrough()
+                : wxLogChain(this)
+{
+}
+
+#ifdef __VISUALC__
+    #pragma warning(default:4355)
+#endif // VC++
+
+// ============================================================================
+// Global functions/variables
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// static variables
+// ----------------------------------------------------------------------------
+
+bool            wxLog::ms_bRepetCounting = false;
+wxString        wxLog::ms_prevString;
+unsigned int    wxLog::ms_prevCounter = 0;
+time_t          wxLog::ms_prevTimeStamp= 0;
+wxLogLevel      wxLog::ms_prevLevel;
+
+wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
+bool            wxLog::ms_doLog        = true;
+bool            wxLog::ms_bAutoCreate  = true;
+bool            wxLog::ms_bVerbose     = false;
+
+wxLogLevel      wxLog::ms_logLevel     = wxLOG_Max;  // log everything by default
+
+size_t          wxLog::ms_suspendCount = 0;
+
+const wxChar   *wxLog::ms_timestamp    = wxT("%X");  // time only, no date
+
+wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
+wxArrayString   wxLog::ms_aTraceMasks;
+
+// ----------------------------------------------------------------------------
+// stdout error logging helper
+// ----------------------------------------------------------------------------
+
+// helper function: wraps the message and justifies it under given position
+// (looks more pretty on the terminal). Also adds newline at the end.
+//
+// TODO this is now disabled until I find a portable way of determining the
+//      terminal window size (ok, I found it but does anybody really cares?)
+#ifdef LOG_PRETTY_WRAP
+static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
+{
+    size_t nMax = 80; // FIXME
+    size_t nStart = strlen(pszPrefix);
+    fputs(pszPrefix, f);
+
+    size_t n;
+    while ( *psz != '\0' ) {
+        for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ )
+            putc(*psz++, f);
+
+        // wrapped?
+        if ( *psz != '\0' ) {
+            /*putc('\n', f);*/
+            for ( n = 0; n < nStart; n++ )
+                putc(' ', f);
+
+            // as we wrapped, squeeze all white space
+            while ( isspace(*psz) )
+                psz++;
+        }
+    }
+
+    putc('\n', f);
+}
+#endif  //LOG_PRETTY_WRAP
+
+// ----------------------------------------------------------------------------
+// error code/error message retrieval functions
+// ----------------------------------------------------------------------------
+
+// get error code from syste
+unsigned long wxSysErrorCode()
+{
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+    return ::GetLastError();
+#else   //Unix
+    return errno;
+#endif  //Win/Unix
+}
+
+// get error message from system
+const wxChar *wxSysErrorMsg(unsigned long nErrCode)
+{
+    if ( nErrCode == 0 )
+        nErrCode = wxSysErrorCode();
+
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+    static wxChar s_szBuf[1024];
+
+    // get error message from system
+    LPVOID lpMsgBuf;
+    if ( ::FormatMessage
+         (
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+            NULL,
+            nErrCode,
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+            (LPTSTR)&lpMsgBuf,
+            0,
+            NULL
+         ) == 0 )
+    {
+        // if this happens, something is seriously wrong, so don't use _() here
+        // for safety
+        wxSprintf(s_szBuf, _T("unknown error %lx"), nErrCode);
+        return s_szBuf;
+    }
+
+
+    // copy it to our buffer and free memory
+    // Crashes on SmartPhone (FIXME)
+#if !defined(__SMARTPHONE__) /* of WinCE */
+    if( lpMsgBuf != 0 )
+    {
+        wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
+        s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
+
+        LocalFree(lpMsgBuf);
+
+        // returned string is capitalized and ended with '\r\n' - bad
+        s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
+        size_t len = wxStrlen(s_szBuf);
+        if ( len > 0 ) {
+            // truncate string
+            if ( s_szBuf[len - 2] == wxT('\r') )
+                s_szBuf[len - 2] = wxT('\0');
+        }
+    }
+    else
+#endif // !__SMARTPHONE__
+    {
+        s_szBuf[0] = wxT('\0');
+    }
+
+    return s_szBuf;
+#else // !__WXMSW__
+    #if wxUSE_UNICODE
+        static wchar_t s_wzBuf[1024];
+        wxConvCurrent->MB2WC(s_wzBuf, strerror((int)nErrCode),
+                             WXSIZEOF(s_wzBuf) - 1);
+        return s_wzBuf;
+    #else
+        return strerror((int)nErrCode);
+    #endif
+#endif  // __WXMSW__/!__WXMSW__
+}
+
+#endif // wxUSE_LOG
diff --git a/Source/3rd Party/wx/src/common/longlong.cpp b/Source/3rd Party/wx/src/common/longlong.cpp
index f3e31b6f3..78a47ce25 100644
--- a/Source/3rd Party/wx/src/common/longlong.cpp	
+++ b/Source/3rd Party/wx/src/common/longlong.cpp	
@@ -1,1379 +1,1363 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/longlong.cpp
-// Purpose:     implementation of wxLongLongNative
-// Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
-// Remarks:     this class is not public in wxWidgets 2.0! It is intentionally
-//              not documented and is for private use only.
-// Modified by:
-// Created:     10.02.99
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// headers
-// ============================================================================
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_LONGLONG
-
-#include "wx/longlong.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/math.h"       // for fabs()
-#endif
-
-#if wxUSE_STREAMS
-    #include "wx/txtstrm.h"
-#endif
-
-#include <string.h>            // for memset()
-
-#include "wx/ioswrap.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-#if wxUSE_LONGLONG_NATIVE
-
-// ----------------------------------------------------------------------------
-// misc
-// ----------------------------------------------------------------------------
-
-void *wxLongLongNative::asArray() const
-{
-    static unsigned char temp[8];
-
-    temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
-    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
-    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
-    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
-    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
-    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
-    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
-    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));
-
-    return temp;
-}
-
-void *wxULongLongNative::asArray() const
-{
-    static unsigned char temp[8];
-
-    temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
-    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
-    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
-    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
-    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
-    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
-    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
-    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));
-
-    return temp;
-}
-
-#if wxUSE_LONGLONG_WX
-wxLongLongNative::wxLongLongNative(wxLongLongWx ll)
-{
-    // assign first to avoid precision loss!
-    m_ll = ll.GetHi();
-    m_ll <<= 32;
-    m_ll |= ll.GetLo();
-}
-
-wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
-{
-    // assign first to avoid precision loss!
-    m_ll = ll.GetHi();
-    m_ll <<= 32;
-    m_ll |= ll.GetLo();
-    return *this;
-}
-
-wxLongLongNative& wxLongLongNative::operator=(const class wxULongLongWx &ll)
-{
-    // assign first to avoid precision loss!
-    m_ll = ll.GetHi();
-    m_ll <<= 32;
-    m_ll |= ll.GetLo();
-    return *this;
-}
-
-wxULongLongNative::wxULongLongNative(const class wxULongLongWx &ll)
-{
-    // assign first to avoid precision loss!
-    m_ll = ll.GetHi();
-    m_ll <<= 32;
-    m_ll |= ((unsigned long) ll.GetLo());
-}
-
-wxULongLongNative& wxULongLongNative::operator=(wxLongLongWx ll)
-{
-    // assign first to avoid precision loss!
-    m_ll = ll.GetHi();
-    m_ll <<= 32;
-    m_ll |= ((unsigned long) ll.GetLo());
-    return *this;
-}
-
-wxULongLongNative& wxULongLongNative::operator=(const class wxULongLongWx &ll)
-{
-    // assign first to avoid precision loss!
-    m_ll = ll.GetHi();
-    m_ll <<= 32;
-    m_ll |= ((unsigned long) ll.GetLo());
-    return *this;
-}
-#endif
-
-#ifdef __VISUALC6__
-double wxULongLongNative::ToDouble() const
-{
-    // Work around the problem of casting unsigned __int64 to double in VC6
-    // (which for unknown reasons only manifests itself in DLL builds, i.e.
-    // when using /MD).
-    static const __int64 int64_t_max = 9223372036854775807i64;
-    if ( m_ll <= int64_t_max )
-        return wx_truncate_cast(double, (wxLongLong_t)m_ll);
-
-    double d = wx_truncate_cast(double, int64_t_max);
-    d += (__int64)(m_ll - int64_t_max - 1); // The cast is safe because of -1
-    return d + 1;
-}
-#endif // __VISUALC6__
-
-#endif // wxUSE_LONGLONG_NATIVE
-
-// ============================================================================
-// wxLongLongWx: emulation of 'long long' using 2 longs
-// ============================================================================
-
-#if wxUSE_LONGLONG_WX
-
-// Set value from unsigned wxULongLongWx
-wxLongLongWx &wxLongLongWx::operator=(const class wxULongLongWx &ll)
-{
-    m_hi = (unsigned long) ll.GetHi();
-    m_lo = ll.GetLo();
-    return *this;
-}
-
-// assignment
-wxLongLongWx& wxLongLongWx::Assign(double d)
-{
-    bool positive = d >= 0;
-    d = fabs(d);
-    if ( d <= ULONG_MAX )
-    {
-        m_hi = 0;
-        m_lo = (long)d;
-    }
-    else
-    {
-        m_hi = (unsigned long)(d / (1.0 + (double)ULONG_MAX));
-        m_lo = (unsigned long)(d - ((double)m_hi * (1.0 + (double)ULONG_MAX)));
-    }
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll = (wxLongLong_t)d;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    if ( !positive )
-        Negate();
-
-    return *this;
-}
-
-double wxLongLongWx::ToDouble() const
-{
-    double d = m_hi;
-    d *= 1.0 + (double)ULONG_MAX;
-    d += m_lo;
-
-#ifdef wxLONGLONG_TEST_MODE
-    wxASSERT( d == m_ll );
-#endif // wxLONGLONG_TEST_MODE
-
-    return d;
-}
-
-double wxULongLongWx::ToDouble() const
-{
-    unsigned double d = m_hi;
-    d *= 1.0 + (double)ULONG_MAX;
-    d += m_lo;
-
-#ifdef wxLONGLONG_TEST_MODE
-    wxASSERT( d == m_ll );
-#endif // wxLONGLONG_TEST_MODE
-
-    return d;
-}
-
-wxLongLongWx wxLongLongWx::operator<<(int shift) const
-{
-    wxLongLongWx ll(*this);
-    ll <<= shift;
-
-    return ll;
-}
-
-wxULongLongWx wxULongLongWx::operator<<(int shift) const
-{
-    wxULongLongWx ll(*this);
-    ll <<= shift;
-
-    return ll;
-}
-
-wxLongLongWx& wxLongLongWx::operator<<=(int shift)
-{
-    if (shift != 0)
-    {
-        if (shift < 32)
-        {
-            m_hi <<= shift;
-            m_hi |= m_lo >> (32 - shift);
-            m_lo <<= shift;
-        }
-        else
-        {
-            m_hi = m_lo << (shift - 32);
-            m_lo = 0;
-        }
-    }
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll <<= shift;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator<<=(int shift)
-{
-    if (shift != 0)
-    {
-        if (shift < 32)
-        {
-            m_hi <<= shift;
-            m_hi |= m_lo >> (32 - shift);
-            m_lo <<= shift;
-        }
-        else
-        {
-            m_hi = m_lo << (shift - 32);
-            m_lo = 0;
-        }
-    }
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll <<= shift;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxLongLongWx wxLongLongWx::operator>>(int shift) const
-{
-    wxLongLongWx ll(*this);
-    ll >>= shift;
-
-    return ll;
-}
-
-wxULongLongWx wxULongLongWx::operator>>(int shift) const
-{
-    wxULongLongWx ll(*this);
-    ll >>= shift;
-
-    return ll;
-}
-
-wxLongLongWx& wxLongLongWx::operator>>=(int shift)
-{
-    if (shift != 0)
-    {
-        if (shift < 32)
-        {
-            m_lo >>= shift;
-            m_lo |= m_hi << (32 - shift);
-            m_hi >>= shift;
-        }
-        else
-        {
-            m_lo = m_hi >> (shift - 32);
-            m_hi = (m_hi < 0 ? -1L : 0);
-        }
-    }
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll >>= shift;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator>>=(int shift)
-{
-    if (shift != 0)
-    {
-        if (shift < 32)
-        {
-            m_lo >>= shift;
-            m_lo |= m_hi << (32 - shift);
-            m_hi >>= shift;
-        }
-        else
-        {
-            m_lo = m_hi >> (shift - 32);
-            m_hi = 0;
-        }
-    }
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll >>= shift;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxLongLongWx wxLongLongWx::operator+(const wxLongLongWx& ll) const
-{
-    wxLongLongWx res(*this);
-    res += ll;
-
-    return res;
-}
-
-wxULongLongWx wxULongLongWx::operator+(const wxULongLongWx& ll) const
-{
-    wxULongLongWx res(*this);
-    res += ll;
-
-    return res;
-}
-
-wxLongLongWx wxLongLongWx::operator+(long l) const
-{
-    wxLongLongWx res(*this);
-    res += l;
-
-    return res;
-}
-
-wxULongLongWx wxULongLongWx::operator+(unsigned long l) const
-{
-    wxULongLongWx res(*this);
-    res += l;
-
-    return res;
-}
-
-wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll)
-{
-    unsigned long previous = m_lo;
-
-    m_lo += ll.m_lo;
-    m_hi += ll.m_hi;
-
-    if ((m_lo < previous) || (m_lo < ll.m_lo))
-        m_hi++;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll += ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator+=(const wxULongLongWx& ll)
-{
-    unsigned long previous = m_lo;
-
-    m_lo += ll.m_lo;
-    m_hi += ll.m_hi;
-
-    if ((m_lo < previous) || (m_lo < ll.m_lo))
-        m_hi++;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll += ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxLongLongWx& wxLongLongWx::operator+=(long l)
-{
-    unsigned long previous = m_lo;
-
-    m_lo += l;
-    if (l < 0)
-        m_hi += -1l;
-
-    if ((m_lo < previous) || (m_lo < (unsigned long)l))
-        m_hi++;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll += l;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator+=(unsigned long l)
-{
-    unsigned long previous = m_lo;
-
-    m_lo += l;
-
-    if ((m_lo < previous) || (m_lo < l))
-        m_hi++;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll += l;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-// pre increment
-wxLongLongWx& wxLongLongWx::operator++()
-{
-    m_lo++;
-    if (m_lo == 0)
-        m_hi++;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll++;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator++()
-{
-    m_lo++;
-    if (m_lo == 0)
-        m_hi++;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll++;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-// negation
-wxLongLongWx wxLongLongWx::operator-() const
-{
-    wxLongLongWx res(*this);
-    res.Negate();
-
-    return res;
-}
-
-wxLongLongWx& wxLongLongWx::Negate()
-{
-    m_hi = ~m_hi;
-    m_lo = ~m_lo;
-
-    m_lo++;
-    if ( m_lo == 0 )
-        m_hi++;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll = -m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-// subtraction
-
-wxLongLongWx wxLongLongWx::operator-(const wxLongLongWx& ll) const
-{
-    wxLongLongWx res(*this);
-    res -= ll;
-
-    return res;
-}
-
-wxLongLongWx wxULongLongWx::operator-(const wxULongLongWx& ll) const
-{
-    wxASSERT(m_hi <= LONG_MAX );
-    wxASSERT(ll.m_hi <= LONG_MAX );
-
-    wxLongLongWx res( (long)m_hi , m_lo );
-    wxLongLongWx op( (long)ll.m_hi , ll.m_lo );
-    res -= op;
-
-    return res;
-}
-
-wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll)
-{
-    unsigned long previous = m_lo;
-
-    m_lo -= ll.m_lo;
-    m_hi -= ll.m_hi;
-
-    if (previous < ll.m_lo)
-        m_hi--;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll -= ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator-=(const wxULongLongWx& ll)
-{
-    unsigned long previous = m_lo;
-
-    m_lo -= ll.m_lo;
-    m_hi -= ll.m_hi;
-
-    if (previous < ll.m_lo)
-        m_hi--;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll -= ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-// pre decrement
-wxLongLongWx& wxLongLongWx::operator--()
-{
-    m_lo--;
-    if (m_lo == 0xFFFFFFFF)
-        m_hi--;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll--;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator--()
-{
-    m_lo--;
-    if (m_lo == 0xFFFFFFFF)
-        m_hi--;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll--;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-// comparison operators
-
-bool wxLongLongWx::operator<(const wxLongLongWx& ll) const
-{
-    if ( m_hi < ll.m_hi )
-        return true;
-    else if ( m_hi == ll.m_hi )
-        return m_lo < ll.m_lo;
-    else
-        return false;
-}
-
-bool wxULongLongWx::operator<(const wxULongLongWx& ll) const
-{
-    if ( m_hi < ll.m_hi )
-        return true;
-    else if ( m_hi == ll.m_hi )
-        return m_lo < ll.m_lo;
-    else
-        return false;
-}
-
-bool wxLongLongWx::operator>(const wxLongLongWx& ll) const
-{
-    if ( m_hi > ll.m_hi )
-        return true;
-    else if ( m_hi == ll.m_hi )
-        return m_lo > ll.m_lo;
-    else
-        return false;
-}
-
-bool wxULongLongWx::operator>(const wxULongLongWx& ll) const
-{
-    if ( m_hi > ll.m_hi )
-        return true;
-    else if ( m_hi == ll.m_hi )
-        return m_lo > ll.m_lo;
-    else
-        return false;
-}
-
-// bitwise operators
-
-wxLongLongWx wxLongLongWx::operator&(const wxLongLongWx& ll) const
-{
-    return wxLongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo);
-}
-
-wxULongLongWx wxULongLongWx::operator&(const wxULongLongWx& ll) const
-{
-    return wxULongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo);
-}
-
-wxLongLongWx wxLongLongWx::operator|(const wxLongLongWx& ll) const
-{
-    return wxLongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo);
-}
-
-wxULongLongWx wxULongLongWx::operator|(const wxULongLongWx& ll) const
-{
-    return wxULongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo);
-}
-
-wxLongLongWx wxLongLongWx::operator^(const wxLongLongWx& ll) const
-{
-    return wxLongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo);
-}
-
-wxULongLongWx wxULongLongWx::operator^(const wxULongLongWx& ll) const
-{
-    return wxULongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo);
-}
-
-wxLongLongWx& wxLongLongWx::operator&=(const wxLongLongWx& ll)
-{
-    m_lo &= ll.m_lo;
-    m_hi &= ll.m_hi;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll &= ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator&=(const wxULongLongWx& ll)
-{
-    m_lo &= ll.m_lo;
-    m_hi &= ll.m_hi;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll &= ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxLongLongWx& wxLongLongWx::operator|=(const wxLongLongWx& ll)
-{
-    m_lo |= ll.m_lo;
-    m_hi |= ll.m_hi;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll |= ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator|=(const wxULongLongWx& ll)
-{
-    m_lo |= ll.m_lo;
-    m_hi |= ll.m_hi;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll |= ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxLongLongWx& wxLongLongWx::operator^=(const wxLongLongWx& ll)
-{
-    m_lo ^= ll.m_lo;
-    m_hi ^= ll.m_hi;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll ^= ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator^=(const wxULongLongWx& ll)
-{
-    m_lo ^= ll.m_lo;
-    m_hi ^= ll.m_hi;
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll ^= ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxLongLongWx wxLongLongWx::operator~() const
-{
-    return wxLongLongWx(~m_hi, ~m_lo);
-}
-
-wxULongLongWx wxULongLongWx::operator~() const
-{
-    return wxULongLongWx(~m_hi, ~m_lo);
-}
-
-// multiplication
-
-wxLongLongWx wxLongLongWx::operator*(const wxLongLongWx& ll) const
-{
-    wxLongLongWx res(*this);
-    res *= ll;
-
-    return res;
-}
-
-wxULongLongWx wxULongLongWx::operator*(const wxULongLongWx& ll) const
-{
-    wxULongLongWx res(*this);
-    res *= ll;
-
-    return res;
-}
-
-wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll)
-{
-    wxLongLongWx t(m_hi, m_lo);
-    wxLongLongWx q(ll.m_hi, ll.m_lo);
-
-    m_hi = m_lo = 0;
-
-#ifdef wxLONGLONG_TEST_MODE
-    wxLongLong_t llOld = m_ll;
-    m_ll = 0;
-#endif // wxLONGLONG_TEST_MODE
-
-    int counter = 0;
-    do
-    {
-        if ((q.m_lo & 1) != 0)
-            *this += t;
-        q >>= 1;
-        t <<= 1;
-        counter++;
-    }
-    while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0)));
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll = llOld * ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll)
-{
-    wxULongLongWx t(m_hi, m_lo);
-    wxULongLongWx q(ll.m_hi, ll.m_lo);
-
-    m_hi = m_lo = 0;
-
-#ifdef wxLONGLONG_TEST_MODE
-    wxULongLong_t llOld = m_ll;
-    m_ll = 0;
-#endif // wxLONGLONG_TEST_MODE
-
-    int counter = 0;
-    do
-    {
-        if ((q.m_lo & 1) != 0)
-            *this += t;
-        q >>= 1;
-        t <<= 1;
-        counter++;
-    }
-    while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0)));
-
-#ifdef wxLONGLONG_TEST_MODE
-    m_ll = llOld * ll.m_ll;
-
-    Check();
-#endif // wxLONGLONG_TEST_MODE
-
-    return *this;
-}
-
-// division
-
-#define IS_MSB_SET(ll)  ((ll.GetHi()) & (1 << (8*sizeof(long) - 1)))
-
-void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
-                          wxLongLongWx& quotient,
-                          wxLongLongWx& remainderIO) const
-{
-    if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0))
-    {
-        // provoke division by zero error and silence the compilers warnings
-        // about an expression without effect and unused variable
-        long dummy = divisorIn.m_lo/divisorIn.m_hi;
-        dummy += 0;
-    }
-
-    // VZ: I'm writing this in a hurry and it's surely not the fastest way to
-    //     do this - any improvements are more than welcome
-    //
-    //     code inspired by the snippet at
-    //          http://www.bearcave.com/software/divide.htm
-    //
-    //     Copyright notice:
-    //
-    //     Use of this program, for any purpose, is granted the author, Ian
-    //     Kaplan, as long as this copyright notice is included in the source
-    //     code or any source code derived from this program. The user assumes
-    //     all responsibility for using this code.
-
-    // init everything
-    wxULongLongWx dividend, divisor, remainder;
-
-    quotient = 0l;
-    remainder = 0l;
-
-    // always do unsigned division and adjust the signs later: in C integer
-    // division, the sign of the remainder is the same as the sign of the
-    // dividend, while the sign of the quotient is the product of the signs of
-    // the dividend and divisor. Of course, we also always have
-    //
-    //      dividend = quotient*divisor + remainder
-    //
-    // with 0 <= abs(remainder) < abs(divisor)
-    bool negRemainder = GetHi() < 0;
-    bool negQuotient = false;   // assume positive
-    if ( GetHi() < 0 )
-    {
-        negQuotient = !negQuotient;
-        dividend = -*this;
-    } else {
-        dividend = *this;
-    }
-    if ( divisorIn.GetHi() < 0 )
-    {
-        negQuotient = !negQuotient;
-        divisor = -divisorIn;
-    } else {
-        divisor = divisorIn;
-    }
-
-    // check for some particular cases
-    if ( divisor > dividend )
-    {
-        remainder = dividend;
-    }
-    else if ( divisor == dividend )
-    {
-        quotient = 1l;
-    }
-    else
-    {
-        // here: dividend > divisor and both are positive: do unsigned division
-        size_t nBits = 64u;
-        wxLongLongWx d;
-
-        while ( remainder < divisor )
-        {
-            remainder <<= 1;
-            if ( IS_MSB_SET(dividend) )
-            {
-                remainder |= 1;
-            }
-
-            d = dividend;
-            dividend <<= 1;
-
-            nBits--;
-        }
-
-        // undo the last loop iteration
-        dividend = d;
-        remainder >>= 1;
-        nBits++;
-
-        for ( size_t i = 0; i < nBits; i++ )
-        {
-            remainder <<= 1;
-            if ( IS_MSB_SET(dividend) )
-            {
-                remainder |= 1;
-            }
-
-            wxLongLongWx t = remainder - divisor;
-            dividend <<= 1;
-            quotient <<= 1;
-            if ( !IS_MSB_SET(t) )
-            {
-                quotient |= 1;
-
-                remainder = t;
-            }
-        }
-    }
-
-    remainderIO = remainder;
-
-    // adjust signs
-    if ( negRemainder )
-    {
-        remainderIO = -remainderIO;
-    }
-
-    if ( negQuotient )
-    {
-        quotient = -quotient;
-    }
-}
-
-void wxULongLongWx::Divide(const wxULongLongWx& divisorIn,
-                           wxULongLongWx& quotient,
-                           wxULongLongWx& remainder) const
-{
-    if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0))
-    {
-        // provoke division by zero error and silence the compilers warnings
-        // about an expression without effect and unused variable
-        unsigned long dummy = divisorIn.m_lo/divisorIn.m_hi;
-        dummy += 0;
-    }
-
-    // VZ: I'm writing this in a hurry and it's surely not the fastest way to
-    //     do this - any improvements are more than welcome
-    //
-    //     code inspired by the snippet at
-    //          http://www.bearcave.com/software/divide.htm
-    //
-    //     Copyright notice:
-    //
-    //     Use of this program, for any purpose, is granted the author, Ian
-    //     Kaplan, as long as this copyright notice is included in the source
-    //     code or any source code derived from this program. The user assumes
-    //     all responsibility for using this code.
-
-    // init everything
-    wxULongLongWx dividend = *this,
-                  divisor = divisorIn;
-
-    quotient = 0l;
-    remainder = 0l;
-
-    // check for some particular cases
-    if ( divisor > dividend )
-    {
-        remainder = dividend;
-    }
-    else if ( divisor == dividend )
-    {
-        quotient = 1l;
-    }
-    else
-    {
-        // here: dividend > divisor
-        size_t nBits = 64u;
-        wxULongLongWx d;
-
-        while ( remainder < divisor )
-        {
-            remainder <<= 1;
-            if ( IS_MSB_SET(dividend) )
-            {
-                remainder |= 1;
-            }
-
-            d = dividend;
-            dividend <<= 1;
-
-            nBits--;
-        }
-
-        // undo the last loop iteration
-        dividend = d;
-        remainder >>= 1;
-        nBits++;
-
-        for ( size_t i = 0; i < nBits; i++ )
-        {
-            remainder <<= 1;
-            if ( IS_MSB_SET(dividend) )
-            {
-                remainder |= 1;
-            }
-
-            wxULongLongWx t = remainder - divisor;
-            dividend <<= 1;
-            quotient <<= 1;
-            if ( !IS_MSB_SET(t) )
-            {
-                quotient |= 1;
-
-                remainder = t;
-            }
-        }
-    }
-}
-
-wxLongLongWx wxLongLongWx::operator/(const wxLongLongWx& ll) const
-{
-    wxLongLongWx quotient, remainder;
-
-    Divide(ll, quotient, remainder);
-
-    return quotient;
-}
-
-wxULongLongWx wxULongLongWx::operator/(const wxULongLongWx& ll) const
-{
-    wxULongLongWx quotient, remainder;
-
-    Divide(ll, quotient, remainder);
-
-    return quotient;
-}
-
-wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll)
-{
-    wxLongLongWx quotient, remainder;
-
-    Divide(ll, quotient, remainder);
-
-    *this = quotient;
-
-    return *this;
-}
-
-wxULongLongWx& wxULongLongWx::operator/=(const wxULongLongWx& ll)
-{
-    wxULongLongWx quotient, remainder;
-
-    Divide(ll, quotient, remainder);
-
-    *this = quotient;
-
-    return *this;
-}
-
-wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const
-{
-    wxLongLongWx quotient, remainder;
-
-    Divide(ll, quotient, remainder);
-
-    return remainder;
-}
-
-wxULongLongWx wxULongLongWx::operator%(const wxULongLongWx& ll) const
-{
-    wxULongLongWx quotient, remainder;
-
-    Divide(ll, quotient, remainder);
-
-    return remainder;
-}
-
-// ----------------------------------------------------------------------------
-// misc
-// ----------------------------------------------------------------------------
-
-// temporary - just for testing
-void *wxLongLongWx::asArray(void) const
-{
-    static unsigned char temp[8];
-
-    temp[0] = (char)((m_hi >> 24) & 0xFF);
-    temp[1] = (char)((m_hi >> 16) & 0xFF);
-    temp[2] = (char)((m_hi >> 8)  & 0xFF);
-    temp[3] = (char)((m_hi >> 0)  & 0xFF);
-    temp[4] = (char)((m_lo >> 24) & 0xFF);
-    temp[5] = (char)((m_lo >> 16) & 0xFF);
-    temp[6] = (char)((m_lo >> 8)  & 0xFF);
-    temp[7] = (char)((m_lo >> 0)  & 0xFF);
-
-    return temp;
-}
-
-void *wxULongLongWx::asArray(void) const
-{
-    static unsigned char temp[8];
-
-    temp[0] = (char)((m_hi >> 24) & 0xFF);
-    temp[1] = (char)((m_hi >> 16) & 0xFF);
-    temp[2] = (char)((m_hi >> 8)  & 0xFF);
-    temp[3] = (char)((m_hi >> 0)  & 0xFF);
-    temp[4] = (char)((m_lo >> 24) & 0xFF);
-    temp[5] = (char)((m_lo >> 16) & 0xFF);
-    temp[6] = (char)((m_lo >> 8)  & 0xFF);
-    temp[7] = (char)((m_lo >> 0)  & 0xFF);
-
-    return temp;
-}
-
-#endif // wxUSE_LONGLONG_WX
-
-#define LL_TO_STRING(name)                                           \
-    wxString name::ToString() const                                  \
-    {                                                                \
-        /* TODO: this is awfully inefficient, anything better? */    \
-        wxString result;                                             \
-                                                                     \
-        name ll = *this;                                             \
-                                                                     \
-        bool neg = ll < 0;                                           \
-        if ( neg )                                                   \
-        {                                                            \
-            while ( ll != 0 )                                        \
-            {                                                        \
-                long digit = (ll % 10).ToLong();                     \
-                result.Prepend((wxChar)(wxT('0') - digit));          \
-                ll /= 10;                                            \
-            }                                                        \
-        }                                                            \
-        else                                                         \
-        {                                                            \
-            while ( ll != 0 )                                        \
-            {                                                        \
-                long digit = (ll % 10).ToLong();                     \
-                result.Prepend((wxChar)(wxT('0') + digit));          \
-                ll /= 10;                                            \
-            }                                                        \
-        }                                                            \
-                                                                     \
-        if ( result.empty() )                                        \
-            result = wxT('0');                                       \
-        else if ( neg )                                              \
-            result.Prepend(wxT('-'));                                \
-                                                                     \
-        return result;                                               \
-    }
-
-#define ULL_TO_STRING(name)                                          \
-    wxString name::ToString() const                                  \
-    {                                                                \
-        /* TODO: this is awfully inefficient, anything better? */    \
-        wxString result;                                             \
-                                                                     \
-        name ll = *this;                                             \
-                                                                     \
-        while ( ll != 0 )                                            \
-        {                                                            \
-            result.Prepend((wxChar)(wxT('0') + (ll % 10).ToULong())); \
-            ll /= 10;                                                \
-        }                                                            \
-                                                                     \
-        if ( result.empty() )                                        \
-            result = wxT('0');                                       \
-                                                                     \
-        return result;                                               \
-    }
-
-#if wxUSE_LONGLONG_NATIVE
-    LL_TO_STRING(wxLongLongNative)
-    ULL_TO_STRING(wxULongLongNative)
-#endif
-
-#if wxUSE_LONGLONG_WX
-    LL_TO_STRING(wxLongLongWx)
-    ULL_TO_STRING(wxULongLongWx)
-#endif
-
-#if wxUSE_STD_IOSTREAM
-
-// input/output
-WXDLLIMPEXP_BASE
-wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLong& ll)
-{
-    return o << ll.ToString();
-}
-
-WXDLLIMPEXP_BASE
-wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
-{
-    return o << ll.ToString();
-}
-
-#endif // wxUSE_STD_IOSTREAM
-
-WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxLongLong& ll)
-{
-    return s << ll.ToString();
-}
-
-WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxULongLong& ll)
-{
-    return s << ll.ToString();
-}
-
-#if wxUSE_STREAMS
-
-WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxULongLong& ll)
-{
-    return o << ll.ToString();
-}
-
-WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxLongLong& ll)
-{
-    return o << ll.ToString();
-}
-
-#define READ_STRING_CHAR(s, idx, len) ((idx!=len) ? (wxChar)s[idx++] : wxT('\0'))
-
-WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll)
-{
-    wxString s = o.ReadWord();
-
-    ll = wxULongLong(0l, 0l);
-    size_t length = s.length();
-    size_t idx = 0;
-
-    wxChar ch = READ_STRING_CHAR(s, idx, length);
-
-    // Skip WS
-    while (ch==wxT(' ') || ch==wxT('\t'))
-        ch = READ_STRING_CHAR(s, idx, length);
-
-    // Read number
-    wxULongLong multiplier(0l, 10l);
-    while (ch>=wxT('0') && ch<=wxT('9')) {
-        long lValue = (unsigned) (ch - wxT('0'));
-        ll = ll * multiplier + wxULongLong(0l, lValue);
-        ch = READ_STRING_CHAR(s, idx, length);
-    }
-
-    return o;
-}
-
-WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong &ll)
-{
-    wxString s = o.ReadWord();
-
-    ll = wxLongLong(0l, 0l);
-    size_t length = s.length();
-    size_t idx = 0;
-
-    wxChar ch = READ_STRING_CHAR(s, idx, length);
-
-    // Skip WS
-    while (ch==wxT(' ') || ch==wxT('\t'))
-        ch = READ_STRING_CHAR(s, idx, length);
-
-    // Ask for sign
-    int iSign = 1;
-    if (ch==wxT('-') || ch==wxT('+')) {
-        iSign = ((ch==wxT('-')) ? -1 : 1);
-        ch = READ_STRING_CHAR(s, idx, length);
-    }
-
-    // Read number
-    wxLongLong multiplier(0l, 10l);
-    while (ch>=wxT('0') && ch<=wxT('9')) {
-        long lValue = (unsigned) (ch - wxT('0'));
-        ll = ll * multiplier + wxLongLong(0l, lValue);
-        ch = READ_STRING_CHAR(s, idx, length);
-    }
-
-#if wxUSE_LONGLONG_NATIVE
-    ll = ll * wxLongLong((wxLongLong_t) iSign);
-#else
-    ll = ll * wxLongLong((long) iSign);
-#endif
-
-    return o;
-}
-
-#if wxUSE_LONGLONG_NATIVE
-
-WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxULongLong_t value)
-{
-    return o << wxULongLong(value).ToString();
-}
-
-WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxLongLong_t value)
-{
-    return o << wxLongLong(value).ToString();
-}
-
-WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong_t &value)
-{
-    wxULongLong ll;
-    o >> ll;
-    value = ll.GetValue();
-    return o;
-}
-
-WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong_t &value)
-{
-    wxLongLong ll;
-    o >> ll;
-    value = ll.GetValue();
-    return o;
-}
-
-#endif // wxUSE_LONGLONG_NATIVE
-
-#endif // wxUSE_STREAMS
-
-#endif // wxUSE_LONGLONG
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/longlong.cpp
+// Purpose:     implementation of wxLongLongNative
+// Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
+// Remarks:     this class is not public in wxWidgets 2.0! It is intentionally
+//              not documented and is for private use only.
+// Modified by:
+// Created:     10.02.99
+// RCS-ID:      $Id: longlong.cpp 40750 2006-08-22 19:04:45Z MW $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// headers
+// ============================================================================
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_LONGLONG
+
+#include "wx/longlong.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/math.h"       // for fabs()
+#endif
+
+#if wxUSE_STREAMS
+    #include "wx/txtstrm.h"
+#endif
+
+#include <string.h>            // for memset()
+
+#include "wx/ioswrap.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+#if wxUSE_LONGLONG_NATIVE
+
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
+
+void *wxLongLongNative::asArray() const
+{
+    static unsigned char temp[8];
+
+    temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
+    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
+    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
+    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
+    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
+    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
+    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
+    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));
+
+    return temp;
+}
+
+void *wxULongLongNative::asArray() const
+{
+    static unsigned char temp[8];
+
+    temp[0] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
+    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
+    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
+    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
+    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
+    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
+    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
+    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));
+
+    return temp;
+}
+
+#if wxUSE_LONGLONG_WX
+wxLongLongNative::wxLongLongNative(wxLongLongWx ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ll.GetLo();
+}
+
+wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ll.GetLo();
+    return *this;
+}
+
+wxLongLongNative& wxLongLongNative::operator=(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ll.GetLo();
+    return *this;
+}
+
+wxULongLongNative::wxULongLongNative(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+}
+
+wxULongLongNative& wxULongLongNative::operator=(wxLongLongWx ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+    return *this;
+}
+
+wxULongLongNative& wxULongLongNative::operator=(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+    return *this;
+}
+#endif
+
+#endif // wxUSE_LONGLONG_NATIVE
+
+// ============================================================================
+// wxLongLongWx: emulation of 'long long' using 2 longs
+// ============================================================================
+
+#if wxUSE_LONGLONG_WX
+
+// Set value from unsigned wxULongLongWx
+wxLongLongWx &wxLongLongWx::operator=(const class wxULongLongWx &ll)
+{
+    m_hi = (unsigned long) ll.GetHi();
+    m_lo = ll.GetLo();
+    return *this;
+}
+
+// assignment
+wxLongLongWx& wxLongLongWx::Assign(double d)
+{
+    bool positive = d >= 0;
+    d = fabs(d);
+    if ( d <= ULONG_MAX )
+    {
+        m_hi = 0;
+        m_lo = (long)d;
+    }
+    else
+    {
+        m_hi = (unsigned long)(d / (1.0 + (double)ULONG_MAX));
+        m_lo = (unsigned long)(d - ((double)m_hi * (1.0 + (double)ULONG_MAX)));
+    }
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll = (wxLongLong_t)d;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    if ( !positive )
+        Negate();
+
+    return *this;
+}
+
+double wxLongLongWx::ToDouble() const
+{
+    double d = m_hi;
+    d *= 1.0 + (double)ULONG_MAX;
+    d += m_lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxASSERT( d == m_ll );
+#endif // wxLONGLONG_TEST_MODE
+
+    return d;
+}
+
+double wxULongLongWx::ToDouble() const
+{
+    unsigned double d = m_hi;
+    d *= 1.0 + (double)ULONG_MAX;
+    d += m_lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxASSERT( d == m_ll );
+#endif // wxLONGLONG_TEST_MODE
+
+    return d;
+}
+
+wxLongLongWx wxLongLongWx::operator<<(int shift) const
+{
+    wxLongLongWx ll(*this);
+    ll <<= shift;
+
+    return ll;
+}
+
+wxULongLongWx wxULongLongWx::operator<<(int shift) const
+{
+    wxULongLongWx ll(*this);
+    ll <<= shift;
+
+    return ll;
+}
+
+wxLongLongWx& wxLongLongWx::operator<<=(int shift)
+{
+    if (shift != 0)
+    {
+        if (shift < 32)
+        {
+            m_hi <<= shift;
+            m_hi |= m_lo >> (32 - shift);
+            m_lo <<= shift;
+        }
+        else
+        {
+            m_hi = m_lo << (shift - 32);
+            m_lo = 0;
+        }
+    }
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll <<= shift;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator<<=(int shift)
+{
+    if (shift != 0)
+    {
+        if (shift < 32)
+        {
+            m_hi <<= shift;
+            m_hi |= m_lo >> (32 - shift);
+            m_lo <<= shift;
+        }
+        else
+        {
+            m_hi = m_lo << (shift - 32);
+            m_lo = 0;
+        }
+    }
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll <<= shift;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxLongLongWx wxLongLongWx::operator>>(int shift) const
+{
+    wxLongLongWx ll(*this);
+    ll >>= shift;
+
+    return ll;
+}
+
+wxULongLongWx wxULongLongWx::operator>>(int shift) const
+{
+    wxULongLongWx ll(*this);
+    ll >>= shift;
+
+    return ll;
+}
+
+wxLongLongWx& wxLongLongWx::operator>>=(int shift)
+{
+    if (shift != 0)
+    {
+        if (shift < 32)
+        {
+            m_lo >>= shift;
+            m_lo |= m_hi << (32 - shift);
+            m_hi >>= shift;
+        }
+        else
+        {
+            m_lo = m_hi >> (shift - 32);
+            m_hi = (m_hi < 0 ? -1L : 0);
+        }
+    }
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll >>= shift;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator>>=(int shift)
+{
+    if (shift != 0)
+    {
+        if (shift < 32)
+        {
+            m_lo >>= shift;
+            m_lo |= m_hi << (32 - shift);
+            m_hi >>= shift;
+        }
+        else
+        {
+            m_lo = m_hi >> (shift - 32);
+            m_hi = 0;
+        }
+    }
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll >>= shift;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxLongLongWx wxLongLongWx::operator+(const wxLongLongWx& ll) const
+{
+    wxLongLongWx res(*this);
+    res += ll;
+
+    return res;
+}
+
+wxULongLongWx wxULongLongWx::operator+(const wxULongLongWx& ll) const
+{
+    wxULongLongWx res(*this);
+    res += ll;
+
+    return res;
+}
+
+wxLongLongWx wxLongLongWx::operator+(long l) const
+{
+    wxLongLongWx res(*this);
+    res += l;
+
+    return res;
+}
+
+wxULongLongWx wxULongLongWx::operator+(unsigned long l) const
+{
+    wxULongLongWx res(*this);
+    res += l;
+
+    return res;
+}
+
+wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll)
+{
+    unsigned long previous = m_lo;
+
+    m_lo += ll.m_lo;
+    m_hi += ll.m_hi;
+
+    if ((m_lo < previous) || (m_lo < ll.m_lo))
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll += ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator+=(const wxULongLongWx& ll)
+{
+    unsigned long previous = m_lo;
+
+    m_lo += ll.m_lo;
+    m_hi += ll.m_hi;
+
+    if ((m_lo < previous) || (m_lo < ll.m_lo))
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll += ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxLongLongWx& wxLongLongWx::operator+=(long l)
+{
+    unsigned long previous = m_lo;
+
+    m_lo += l;
+    if (l < 0)
+        m_hi += -1l;
+
+    if ((m_lo < previous) || (m_lo < (unsigned long)l))
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll += l;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator+=(unsigned long l)
+{
+    unsigned long previous = m_lo;
+
+    m_lo += l;
+
+    if ((m_lo < previous) || (m_lo < l))
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll += l;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+// pre increment
+wxLongLongWx& wxLongLongWx::operator++()
+{
+    m_lo++;
+    if (m_lo == 0)
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll++;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator++()
+{
+    m_lo++;
+    if (m_lo == 0)
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll++;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+// negation
+wxLongLongWx wxLongLongWx::operator-() const
+{
+    wxLongLongWx res(*this);
+    res.Negate();
+
+    return res;
+}
+
+wxLongLongWx& wxLongLongWx::Negate()
+{
+    m_hi = ~m_hi;
+    m_lo = ~m_lo;
+
+    m_lo++;
+    if ( m_lo == 0 )
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll = -m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+// subtraction
+
+wxLongLongWx wxLongLongWx::operator-(const wxLongLongWx& ll) const
+{
+    wxLongLongWx res(*this);
+    res -= ll;
+
+    return res;
+}
+
+wxLongLongWx wxULongLongWx::operator-(const wxULongLongWx& ll) const
+{
+    wxASSERT(m_hi <= LONG_MAX );
+    wxASSERT(ll.m_hi <= LONG_MAX );
+
+    wxLongLongWx res( (long)m_hi , m_lo );
+    wxLongLongWx op( (long)ll.m_hi , ll.m_lo );
+    res -= op;
+
+    return res;
+}
+
+wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll)
+{
+    unsigned long previous = m_lo;
+
+    m_lo -= ll.m_lo;
+    m_hi -= ll.m_hi;
+
+    if (previous < ll.m_lo)
+        m_hi--;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll -= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator-=(const wxULongLongWx& ll)
+{
+    unsigned long previous = m_lo;
+
+    m_lo -= ll.m_lo;
+    m_hi -= ll.m_hi;
+
+    if (previous < ll.m_lo)
+        m_hi--;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll -= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+// pre decrement
+wxLongLongWx& wxLongLongWx::operator--()
+{
+    m_lo--;
+    if (m_lo == 0xFFFFFFFF)
+        m_hi--;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll--;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator--()
+{
+    m_lo--;
+    if (m_lo == 0xFFFFFFFF)
+        m_hi--;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll--;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+// comparison operators
+
+bool wxLongLongWx::operator<(const wxLongLongWx& ll) const
+{
+    if ( m_hi < ll.m_hi )
+        return true;
+    else if ( m_hi == ll.m_hi )
+        return m_lo < ll.m_lo;
+    else
+        return false;
+}
+
+bool wxULongLongWx::operator<(const wxULongLongWx& ll) const
+{
+    if ( m_hi < ll.m_hi )
+        return true;
+    else if ( m_hi == ll.m_hi )
+        return m_lo < ll.m_lo;
+    else
+        return false;
+}
+
+bool wxLongLongWx::operator>(const wxLongLongWx& ll) const
+{
+    if ( m_hi > ll.m_hi )
+        return true;
+    else if ( m_hi == ll.m_hi )
+        return m_lo > ll.m_lo;
+    else
+        return false;
+}
+
+bool wxULongLongWx::operator>(const wxULongLongWx& ll) const
+{
+    if ( m_hi > ll.m_hi )
+        return true;
+    else if ( m_hi == ll.m_hi )
+        return m_lo > ll.m_lo;
+    else
+        return false;
+}
+
+// bitwise operators
+
+wxLongLongWx wxLongLongWx::operator&(const wxLongLongWx& ll) const
+{
+    return wxLongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo);
+}
+
+wxULongLongWx wxULongLongWx::operator&(const wxULongLongWx& ll) const
+{
+    return wxULongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo);
+}
+
+wxLongLongWx wxLongLongWx::operator|(const wxLongLongWx& ll) const
+{
+    return wxLongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo);
+}
+
+wxULongLongWx wxULongLongWx::operator|(const wxULongLongWx& ll) const
+{
+    return wxULongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo);
+}
+
+wxLongLongWx wxLongLongWx::operator^(const wxLongLongWx& ll) const
+{
+    return wxLongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo);
+}
+
+wxULongLongWx wxULongLongWx::operator^(const wxULongLongWx& ll) const
+{
+    return wxULongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo);
+}
+
+wxLongLongWx& wxLongLongWx::operator&=(const wxLongLongWx& ll)
+{
+    m_lo &= ll.m_lo;
+    m_hi &= ll.m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll &= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator&=(const wxULongLongWx& ll)
+{
+    m_lo &= ll.m_lo;
+    m_hi &= ll.m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll &= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxLongLongWx& wxLongLongWx::operator|=(const wxLongLongWx& ll)
+{
+    m_lo |= ll.m_lo;
+    m_hi |= ll.m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll |= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator|=(const wxULongLongWx& ll)
+{
+    m_lo |= ll.m_lo;
+    m_hi |= ll.m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll |= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxLongLongWx& wxLongLongWx::operator^=(const wxLongLongWx& ll)
+{
+    m_lo ^= ll.m_lo;
+    m_hi ^= ll.m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll ^= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator^=(const wxULongLongWx& ll)
+{
+    m_lo ^= ll.m_lo;
+    m_hi ^= ll.m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll ^= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxLongLongWx wxLongLongWx::operator~() const
+{
+    return wxLongLongWx(~m_hi, ~m_lo);
+}
+
+wxULongLongWx wxULongLongWx::operator~() const
+{
+    return wxULongLongWx(~m_hi, ~m_lo);
+}
+
+// multiplication
+
+wxLongLongWx wxLongLongWx::operator*(const wxLongLongWx& ll) const
+{
+    wxLongLongWx res(*this);
+    res *= ll;
+
+    return res;
+}
+
+wxULongLongWx wxULongLongWx::operator*(const wxULongLongWx& ll) const
+{
+    wxULongLongWx res(*this);
+    res *= ll;
+
+    return res;
+}
+
+wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll)
+{
+    wxLongLongWx t(m_hi, m_lo);
+    wxLongLongWx q(ll.m_hi, ll.m_lo);
+
+    m_hi = m_lo = 0;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxLongLong_t llOld = m_ll;
+    m_ll = 0;
+#endif // wxLONGLONG_TEST_MODE
+
+    int counter = 0;
+    do
+    {
+        if ((q.m_lo & 1) != 0)
+            *this += t;
+        q >>= 1;
+        t <<= 1;
+        counter++;
+    }
+    while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0)));
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll = llOld * ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll)
+{
+    wxULongLongWx t(m_hi, m_lo);
+    wxULongLongWx q(ll.m_hi, ll.m_lo);
+
+    m_hi = m_lo = 0;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxULongLong_t llOld = m_ll;
+    m_ll = 0;
+#endif // wxLONGLONG_TEST_MODE
+
+    int counter = 0;
+    do
+    {
+        if ((q.m_lo & 1) != 0)
+            *this += t;
+        q >>= 1;
+        t <<= 1;
+        counter++;
+    }
+    while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0)));
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll = llOld * ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+// division
+
+#define IS_MSB_SET(ll)  ((ll.GetHi()) & (1 << (8*sizeof(long) - 1)))
+
+void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
+                          wxLongLongWx& quotient,
+                          wxLongLongWx& remainderIO) const
+{
+    if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0))
+    {
+        // provoke division by zero error and silence the compilers warnings
+        // about an expression without effect and unused variable
+        long dummy = divisorIn.m_lo/divisorIn.m_hi;
+        dummy += 0;
+    }
+
+    // VZ: I'm writing this in a hurry and it's surely not the fastest way to
+    //     do this - any improvements are more than welcome
+    //
+    //     code inspired by the snippet at
+    //          http://www.bearcave.com/software/divide.htm
+    //
+    //     Copyright notice:
+    //
+    //     Use of this program, for any purpose, is granted the author, Ian
+    //     Kaplan, as long as this copyright notice is included in the source
+    //     code or any source code derived from this program. The user assumes
+    //     all responsibility for using this code.
+
+    // init everything
+    wxULongLongWx dividend, divisor, remainder;
+
+    quotient = 0l;
+    remainder = 0l;
+
+    // always do unsigned division and adjust the signs later: in C integer
+    // division, the sign of the remainder is the same as the sign of the
+    // dividend, while the sign of the quotient is the product of the signs of
+    // the dividend and divisor. Of course, we also always have
+    //
+    //      dividend = quotient*divisor + remainder
+    //
+    // with 0 <= abs(remainder) < abs(divisor)
+    bool negRemainder = GetHi() < 0;
+    bool negQuotient = false;   // assume positive
+    if ( GetHi() < 0 )
+    {
+        negQuotient = !negQuotient;
+        dividend = -*this;
+    } else {
+        dividend = *this;
+    }
+    if ( divisorIn.GetHi() < 0 )
+    {
+        negQuotient = !negQuotient;
+        divisor = -divisorIn;
+    } else {
+        divisor = divisorIn;
+    }
+
+    // check for some particular cases
+    if ( divisor > dividend )
+    {
+        remainder = dividend;
+    }
+    else if ( divisor == dividend )
+    {
+        quotient = 1l;
+    }
+    else
+    {
+        // here: dividend > divisor and both are positive: do unsigned division
+        size_t nBits = 64u;
+        wxLongLongWx d;
+
+        while ( remainder < divisor )
+        {
+            remainder <<= 1;
+            if ( IS_MSB_SET(dividend) )
+            {
+                remainder |= 1;
+            }
+
+            d = dividend;
+            dividend <<= 1;
+
+            nBits--;
+        }
+
+        // undo the last loop iteration
+        dividend = d;
+        remainder >>= 1;
+        nBits++;
+
+        for ( size_t i = 0; i < nBits; i++ )
+        {
+            remainder <<= 1;
+            if ( IS_MSB_SET(dividend) )
+            {
+                remainder |= 1;
+            }
+
+            wxLongLongWx t = remainder - divisor;
+            dividend <<= 1;
+            quotient <<= 1;
+            if ( !IS_MSB_SET(t) )
+            {
+                quotient |= 1;
+
+                remainder = t;
+            }
+        }
+    }
+
+    remainderIO = remainder;
+
+    // adjust signs
+    if ( negRemainder )
+    {
+        remainderIO = -remainderIO;
+    }
+
+    if ( negQuotient )
+    {
+        quotient = -quotient;
+    }
+}
+
+void wxULongLongWx::Divide(const wxULongLongWx& divisorIn,
+                           wxULongLongWx& quotient,
+                           wxULongLongWx& remainder) const
+{
+    if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0))
+    {
+        // provoke division by zero error and silence the compilers warnings
+        // about an expression without effect and unused variable
+        unsigned long dummy = divisorIn.m_lo/divisorIn.m_hi;
+        dummy += 0;
+    }
+
+    // VZ: I'm writing this in a hurry and it's surely not the fastest way to
+    //     do this - any improvements are more than welcome
+    //
+    //     code inspired by the snippet at
+    //          http://www.bearcave.com/software/divide.htm
+    //
+    //     Copyright notice:
+    //
+    //     Use of this program, for any purpose, is granted the author, Ian
+    //     Kaplan, as long as this copyright notice is included in the source
+    //     code or any source code derived from this program. The user assumes
+    //     all responsibility for using this code.
+
+    // init everything
+    wxULongLongWx dividend = *this,
+                  divisor = divisorIn;
+
+    quotient = 0l;
+    remainder = 0l;
+
+    // check for some particular cases
+    if ( divisor > dividend )
+    {
+        remainder = dividend;
+    }
+    else if ( divisor == dividend )
+    {
+        quotient = 1l;
+    }
+    else
+    {
+        // here: dividend > divisor
+        size_t nBits = 64u;
+        wxULongLongWx d;
+
+        while ( remainder < divisor )
+        {
+            remainder <<= 1;
+            if ( IS_MSB_SET(dividend) )
+            {
+                remainder |= 1;
+            }
+
+            d = dividend;
+            dividend <<= 1;
+
+            nBits--;
+        }
+
+        // undo the last loop iteration
+        dividend = d;
+        remainder >>= 1;
+        nBits++;
+
+        for ( size_t i = 0; i < nBits; i++ )
+        {
+            remainder <<= 1;
+            if ( IS_MSB_SET(dividend) )
+            {
+                remainder |= 1;
+            }
+
+            wxULongLongWx t = remainder - divisor;
+            dividend <<= 1;
+            quotient <<= 1;
+            if ( !IS_MSB_SET(t) )
+            {
+                quotient |= 1;
+
+                remainder = t;
+            }
+        }
+    }
+}
+
+wxLongLongWx wxLongLongWx::operator/(const wxLongLongWx& ll) const
+{
+    wxLongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    return quotient;
+}
+
+wxULongLongWx wxULongLongWx::operator/(const wxULongLongWx& ll) const
+{
+    wxULongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    return quotient;
+}
+
+wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll)
+{
+    wxLongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    *this = quotient;
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator/=(const wxULongLongWx& ll)
+{
+    wxULongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    *this = quotient;
+
+    return *this;
+}
+
+wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const
+{
+    wxLongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    return remainder;
+}
+
+wxULongLongWx wxULongLongWx::operator%(const wxULongLongWx& ll) const
+{
+    wxULongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    return remainder;
+}
+
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
+
+// temporary - just for testing
+void *wxLongLongWx::asArray(void) const
+{
+    static unsigned char temp[8];
+
+    temp[0] = (char)((m_hi >> 24) & 0xFF);
+    temp[1] = (char)((m_hi >> 16) & 0xFF);
+    temp[2] = (char)((m_hi >> 8)  & 0xFF);
+    temp[3] = (char)((m_hi >> 0)  & 0xFF);
+    temp[4] = (char)((m_lo >> 24) & 0xFF);
+    temp[5] = (char)((m_lo >> 16) & 0xFF);
+    temp[6] = (char)((m_lo >> 8)  & 0xFF);
+    temp[7] = (char)((m_lo >> 0)  & 0xFF);
+
+    return temp;
+}
+
+void *wxULongLongWx::asArray(void) const
+{
+    static unsigned char temp[8];
+
+    temp[0] = (char)((m_hi >> 24) & 0xFF);
+    temp[1] = (char)((m_hi >> 16) & 0xFF);
+    temp[2] = (char)((m_hi >> 8)  & 0xFF);
+    temp[3] = (char)((m_hi >> 0)  & 0xFF);
+    temp[4] = (char)((m_lo >> 24) & 0xFF);
+    temp[5] = (char)((m_lo >> 16) & 0xFF);
+    temp[6] = (char)((m_lo >> 8)  & 0xFF);
+    temp[7] = (char)((m_lo >> 0)  & 0xFF);
+
+    return temp;
+}
+
+#endif // wxUSE_LONGLONG_WX
+
+#define LL_TO_STRING(name)                                           \
+    wxString name::ToString() const                                  \
+    {                                                                \
+        /* TODO: this is awfully inefficient, anything better? */    \
+        wxString result;                                             \
+                                                                     \
+        name ll = *this;                                             \
+                                                                     \
+        bool neg = ll < 0;                                           \
+        if ( neg )                                                   \
+        {                                                            \
+            while ( ll != 0 )                                        \
+            {                                                        \
+                long digit = (ll % 10).ToLong();                     \
+                result.Prepend((wxChar)(_T('0') - digit));           \
+                ll /= 10;                                            \
+            }                                                        \
+        }                                                            \
+        else                                                         \
+        {                                                            \
+            while ( ll != 0 )                                        \
+            {                                                        \
+                long digit = (ll % 10).ToLong();                     \
+                result.Prepend((wxChar)(_T('0') + digit));           \
+                ll /= 10;                                            \
+            }                                                        \
+        }                                                            \
+                                                                     \
+        if ( result.empty() )                                        \
+            result = _T('0');                                        \
+        else if ( neg )                                              \
+            result.Prepend(_T('-'));                                 \
+                                                                     \
+        return result;                                               \
+    }
+
+#define ULL_TO_STRING(name)                                          \
+    wxString name::ToString() const                                  \
+    {                                                                \
+        /* TODO: this is awfully inefficient, anything better? */    \
+        wxString result;                                             \
+                                                                     \
+        name ll = *this;                                             \
+                                                                     \
+        while ( ll != 0 )                                            \
+        {                                                            \
+            result.Prepend((wxChar)(_T('0') + (ll % 10).ToULong())); \
+            ll /= 10;                                                \
+        }                                                            \
+                                                                     \
+        if ( result.empty() )                                        \
+            result = _T('0');                                        \
+                                                                     \
+        return result;                                               \
+    }
+
+#if wxUSE_LONGLONG_NATIVE
+    LL_TO_STRING(wxLongLongNative)
+    ULL_TO_STRING(wxULongLongNative)
+#endif
+
+#if wxUSE_LONGLONG_WX
+    LL_TO_STRING(wxLongLongWx)
+    ULL_TO_STRING(wxULongLongWx)
+#endif
+
+#if wxUSE_STD_IOSTREAM
+
+// input/output
+WXDLLIMPEXP_BASE
+wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+WXDLLIMPEXP_BASE
+wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+#endif // wxUSE_STD_IOSTREAM
+
+WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxLongLong& ll)
+{
+    return s << ll.ToString();
+}
+
+WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxULongLong& ll)
+{
+    return s << ll.ToString();
+}
+
+#if wxUSE_STREAMS
+
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxULongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxLongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+#define READ_STRING_CHAR(s, idx, len) ((wxChar) ((idx!=len) ? s[idx++] : 0))
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll)
+{
+    wxString s = o.ReadWord();
+
+    ll = wxULongLong(0l, 0l);
+    size_t length = s.length();
+    size_t idx = 0;
+
+    wxChar ch = READ_STRING_CHAR(s, idx, length);
+
+    // Skip WS
+    while (ch==wxT(' ') || ch==wxT('\t'))
+        ch = READ_STRING_CHAR(s, idx, length);
+
+    // Read number
+    wxULongLong multiplier(0l, 10l);
+    while (ch>=wxT('0') && ch<=wxT('9')) {
+        long lValue = (unsigned) (ch - wxT('0'));
+        ll = ll * multiplier + wxULongLong(0l, lValue);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+    return o;
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong &ll)
+{
+    wxString s = o.ReadWord();
+
+    ll = wxLongLong(0l, 0l);
+    size_t length = s.length();
+    size_t idx = 0;
+
+    wxChar ch = READ_STRING_CHAR(s, idx, length);
+
+    // Skip WS
+    while (ch==wxT(' ') || ch==wxT('\t'))
+        ch = READ_STRING_CHAR(s, idx, length);
+
+    // Ask for sign
+    int iSign = 1;
+    if (ch==wxT('-') || ch==wxT('+')) {
+        iSign = ((ch==wxT('-')) ? -1 : 1);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+    // Read number
+    wxLongLong multiplier(0l, 10l);
+    while (ch>=wxT('0') && ch<=wxT('9')) {
+        long lValue = (unsigned) (ch - wxT('0'));
+        ll = ll * multiplier + wxLongLong(0l, lValue);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+#if wxUSE_LONGLONG_NATIVE
+    ll = ll * wxLongLong((wxLongLong_t) iSign);
+#else
+    ll = ll * wxLongLong((long) iSign);
+#endif
+
+    return o;
+}
+
+#if wxUSE_LONGLONG_NATIVE
+
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxULongLong_t value)
+{
+    return o << wxULongLong(value).ToString();
+}
+
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxLongLong_t value)
+{
+    return o << wxLongLong(value).ToString();
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong_t &value)
+{
+    wxULongLong ll;
+    o >> ll;
+    value = ll.GetValue();
+    return o;
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong_t &value)
+{
+    wxLongLong ll;
+    o >> ll;
+    value = ll.GetValue();
+    return o;
+}
+
+#endif // wxUSE_LONGLONG_NATIVE
+
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_LONGLONG
diff --git a/Source/3rd Party/wx/src/common/markupparser.cpp b/Source/3rd Party/wx/src/common/markupparser.cpp
deleted file mode 100644
index d334fe928..000000000
--- a/Source/3rd Party/wx/src/common/markupparser.cpp	
+++ /dev/null
@@ -1,485 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/markupparser.cpp
-// Purpose:     Implementation of wxMarkupParser.
-// Author:      Vadim Zeitlin
-// Created:     2011-02-16
-// RCS-ID:      $Id$
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_MARKUP
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-#endif
-
-#include "wx/private/markupparser.h"
-
-#include "wx/stack.h"
-
-namespace
-{
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// Array containing the predefined XML 1.0 entities.
-const struct XMLEntity
-{
-    const char *name;
-    int len;            // == strlen(name)
-    char value;
-} xmlEntities[] =
-{
-    { "lt",     2,  '<' },
-    { "gt",     2,  '>' },
-    { "amp",    3,  '&' },
-    { "apos",   4,  '\''},
-    { "quot",   4,  '"' },
-};
-
-// ----------------------------------------------------------------------------
-// helper functions
-// ----------------------------------------------------------------------------
-
-wxString
-ExtractUntil(char ch, wxString::const_iterator& it, wxString::const_iterator end)
-{
-    wxString str;
-    for ( ; it != end; ++it )
-    {
-        if ( *it == ch )
-            return str;
-
-        str += *it;
-    }
-
-    // Return empty string to indicate that we didn't find ch at all.
-    return wxString();
-}
-
-} // anonymous namespace
-
-// ============================================================================
-// wxMarkupParser implementation
-// ============================================================================
-
-wxString
-wxMarkupParser::ParseAttrs(wxString attrs, TagAndAttrs& tagAndAttrs)
-{
-    if ( tagAndAttrs.name.CmpNoCase("span") != 0 && !attrs.empty() )
-    {
-        return wxString::Format("tag \"%s\" can't have attributes",
-                                tagAndAttrs.name);
-    }
-
-    // TODO: Parse more attributes described at
-    //       http://library.gnome.org/devel/pango/stable/PangoMarkupFormat.html
-    //       and at least ignore them gracefully instead of giving errors (but
-    //       quite a few of them could be supported as well, notable font_desc).
-
-    wxMarkupSpanAttributes& spanAttrs = tagAndAttrs.attrs;
-
-    while ( !attrs.empty() )
-    {
-        wxString rest;
-        const wxString attr = attrs.BeforeFirst(' ', &rest);
-        attrs = rest;
-
-        // The "original" versions are used for error messages only.
-        wxString valueOrig;
-        const wxString nameOrig = attr.BeforeFirst('=', &valueOrig);
-
-        const wxString name = nameOrig.Lower();
-        wxString value = valueOrig.Lower();
-
-        // All attributes values must be quoted.
-        if ( value.length() < 2 ||
-                (value[0] != value.Last()) ||
-                    (value[0] != '"' && value[0] != '\'') )
-        {
-            return wxString::Format("bad quoting for value of \"%s\"",
-                                    nameOrig);
-        }
-
-        value.assign(value, 1, value.length() - 2);
-
-        if ( name == "foreground" || name == "fgcolor" || name == "color" )
-        {
-            spanAttrs.m_fgCol = value;
-        }
-        else if ( name == "background" || name == "bgcolor" )
-        {
-            spanAttrs.m_bgCol = value;
-        }
-        else if ( name == "font_family" || name == "face" )
-        {
-            spanAttrs.m_fontFace = value;
-        }
-        else if ( name == "font_weight" || name == "weight" )
-        {
-            unsigned long weight;
-
-            if ( value == "ultralight" || value == "light" || value == "normal" )
-                spanAttrs.m_isBold = wxMarkupSpanAttributes::No;
-            else if ( value == "bold" || value == "ultrabold" || value == "heavy" )
-                spanAttrs.m_isBold = wxMarkupSpanAttributes::Yes;
-            else if ( value.ToULong(&weight) )
-                spanAttrs.m_isBold = weight >= 600 ? wxMarkupSpanAttributes::Yes
-                                                   : wxMarkupSpanAttributes::No;
-            else
-                return wxString::Format("invalid font weight \"%s\"", valueOrig);
-        }
-        else if ( name == "font_style" || name == "style" )
-        {
-            if ( value == "normal" )
-                spanAttrs.m_isItalic = wxMarkupSpanAttributes::No;
-            else if ( value == "oblique" || value == "italic" )
-                spanAttrs.m_isItalic = wxMarkupSpanAttributes::Yes;
-            else
-                return wxString::Format("invalid font style \"%s\"", valueOrig);
-        }
-        else if ( name == "size" )
-        {
-            unsigned long size;
-            if ( value.ToULong(&size) )
-            {
-                spanAttrs.m_sizeKind = wxMarkupSpanAttributes::Size_PointParts;
-                spanAttrs.m_fontSize = size;
-            }
-            else if ( value == "smaller" || value == "larger" )
-            {
-                spanAttrs.m_sizeKind = wxMarkupSpanAttributes::Size_Relative;
-                spanAttrs.m_fontSize = value == "smaller" ? -1 : +1;
-            }
-            else // Must be a CSS-like size specification
-            {
-                int cssSize = 1;
-                wxString rest;
-                if ( value.StartsWith("xx-", &rest) )
-                    cssSize = 3;
-                else if ( value.StartsWith("x-", &rest) )
-                    cssSize = 2;
-                else if ( value == "medium" )
-                    cssSize = 0;
-                else
-                    rest = value;
-
-                if ( cssSize != 0 )
-                {
-                    if ( rest == "small" )
-                        cssSize = -cssSize;
-                    else if ( rest != "large" )
-                        return wxString::Format("invalid font size \"%s\"",
-                                                valueOrig);
-                }
-
-                spanAttrs.m_sizeKind = wxMarkupSpanAttributes::Size_Symbolic;
-                spanAttrs.m_fontSize = cssSize;
-            }
-        }
-    }
-
-    return wxString();
-}
-
-bool wxMarkupParser::OutputTag(const TagAndAttrs& tagAndAttrs, bool start)
-{
-    if ( tagAndAttrs.name.CmpNoCase("span") == 0 )
-    {
-        if ( start )
-            m_output.OnSpanStart(tagAndAttrs.attrs);
-        else
-            m_output.OnSpanEnd(tagAndAttrs.attrs);
-
-        return true;
-    }
-    else // non-span tag
-    {
-        static const struct TagHandler
-        {
-            const char *name;
-            void (wxMarkupParserOutput::*startFunc)();
-            void (wxMarkupParserOutput::*endFunc)();
-        } tagHandlers[] =
-        {
-            { "b", &wxMarkupParserOutput::OnBoldStart,
-                   &wxMarkupParserOutput::OnBoldEnd },
-            { "i", &wxMarkupParserOutput::OnItalicStart,
-                   &wxMarkupParserOutput::OnItalicEnd },
-            { "u", &wxMarkupParserOutput::OnUnderlinedStart,
-                   &wxMarkupParserOutput::OnUnderlinedEnd },
-            { "s", &wxMarkupParserOutput::OnStrikethroughStart,
-                   &wxMarkupParserOutput::OnStrikethroughEnd },
-            { "big", &wxMarkupParserOutput::OnBigStart,
-                     &wxMarkupParserOutput::OnBigEnd },
-            { "small", &wxMarkupParserOutput::OnSmallStart,
-                       &wxMarkupParserOutput::OnSmallEnd },
-            { "tt", &wxMarkupParserOutput::OnTeletypeStart,
-                    &wxMarkupParserOutput::OnTeletypeEnd },
-        };
-
-        for ( unsigned n = 0; n < WXSIZEOF(tagHandlers); n++ )
-        {
-            const TagHandler& h = tagHandlers[n];
-
-            if ( tagAndAttrs.name.CmpNoCase(h.name) == 0 )
-            {
-                if ( start )
-                    (m_output.*(h.startFunc))();
-                else
-                    (m_output.*(h.endFunc))();
-
-                return true;
-            }
-        }
-    }
-
-    // Unknown tag name.
-    return false;
-}
-
-bool wxMarkupParser::Parse(const wxString& text)
-{
-    // The stack containing the names and corresponding attributes (which are
-    // actually only used for <span> tags) of all of the currently opened tag
-    // or none if we're not inside any tag.
-    wxStack<TagAndAttrs> tags;
-
-    // Current run of text.
-    wxString current;
-
-    const wxString::const_iterator end = text.end();
-    for ( wxString::const_iterator it = text.begin(); it != end; ++it )
-    {
-        switch ( (*it).GetValue() )
-        {
-            case '<':
-                {
-                    // Flush the text preceding the tag, if any.
-                    if ( !current.empty() )
-                    {
-                        m_output.OnText(current);
-                        current.clear();
-                    }
-
-                    // This variable is used only in the debugging messages
-                    // and doesn't need to be defined if they're not compiled
-                    // at all (it actually would result in unused variable
-                    // messages in this case).
-#if wxUSE_LOG_DEBUG || !defined(HAVE_VARIADIC_MACROS)
-                    // Remember the tag starting position for the error
-                    // messages.
-                    const size_t pos = it - text.begin();
-#endif
-                    bool start = true;
-                    if ( ++it != end && *it == '/' )
-                    {
-                        start = false;
-                        ++it;
-                    }
-
-                    const wxString tag = ExtractUntil('>', it, end);
-                    if ( tag.empty() )
-                    {
-                        wxLogDebug("%s at %lu.",
-                                   it == end ? "Unclosed tag starting"
-                                             : "Empty tag",
-                                   pos);
-                        return false;
-                    }
-
-                    if ( start )
-                    {
-                        wxString attrs;
-                        const wxString name = tag.BeforeFirst(' ', &attrs);
-
-                        TagAndAttrs tagAndAttrs(name);
-                        const wxString err = ParseAttrs(attrs, tagAndAttrs);
-                        if ( !err.empty() )
-                        {
-                            wxLogDebug("Bad attributes for \"%s\" "
-                                       "at %lu: %s.",
-                                       name, pos, err);
-                            return false;
-                        }
-
-                        tags.push(tagAndAttrs);
-                    }
-                    else // end tag
-                    {
-                        if ( tags.empty() || tags.top().name != tag )
-                        {
-                            wxLogDebug("Unmatched closing tag \"%s\" at %lu.",
-                                       tag, pos);
-                            return false;
-                        }
-                    }
-
-                    if ( !OutputTag(tags.top(), start) )
-                    {
-                        wxLogDebug("Unknown tag at %lu.", pos);
-                        return false;
-                    }
-
-                    if ( !start )
-                        tags.pop();
-                }
-                break;
-
-            case '>':
-                wxLogDebug("'>' should be escaped as \"&gt\"; at %lu.",
-                           it - text.begin());
-                break;
-
-            case '&':
-                // Processing is somewhat complicated: we need to recognize at
-                // least the "&lt;" entity to allow escaping left square
-                // brackets in the markup and, in fact, we recognize all of the
-                // standard XML entities for consistency with Pango markup
-                // parsing.
-                //
-                // However we also allow '&' to appear unescaped, i.e. directly
-                // and not as "&amp;" when it is used to introduce the mnemonic
-                // for the label. In this case we simply leave it alone.
-                //
-                // Notice that this logic makes it impossible to have a label
-                // with "lt;" inside it and using "l" as mnemonic but hopefully
-                // this shouldn't be a problem in practice.
-                {
-                    const size_t pos = it - text.begin() + 1;
-
-                    unsigned n;
-                    for ( n = 0; n < WXSIZEOF(xmlEntities); n++ )
-                    {
-                        const XMLEntity& xmlEnt = xmlEntities[n];
-                        if ( text.compare(pos, xmlEnt.len, xmlEnt.name) == 0
-                                && text[pos + xmlEnt.len] == ';' )
-                        {
-                            // Escape the ampersands if needed to protect them
-                            // from being interpreted as mnemonics indicators.
-                            if ( xmlEnt.value == '&' )
-                                current += "&&";
-                            else
-                                current += xmlEnt.value;
-
-                            it += xmlEnt.len + 1; // +1 for '&' itself
-
-                            break;
-                        }
-                    }
-
-                    if ( n < WXSIZEOF(xmlEntities) )
-                        break;
-                    //else: fall through, '&' is not special
-                }
-
-            default:
-                current += *it;
-        }
-    }
-
-    if ( !tags.empty() )
-    {
-        wxLogDebug("Missing closing tag for \"%s\"", tags.top().name);
-        return false;
-    }
-
-    if ( !current.empty() )
-        m_output.OnText(current);
-
-    return true;
-}
-
-/* static */
-wxString wxMarkupParser::Quote(const wxString& text)
-{
-    wxString quoted;
-    quoted.reserve(text.length());
-
-    for ( wxString::const_iterator it = text.begin(); it != text.end(); ++it )
-    {
-        unsigned n;
-        for ( n = 0; n < WXSIZEOF(xmlEntities); n++ )
-        {
-            const XMLEntity& xmlEnt = xmlEntities[n];
-            if ( *it == xmlEnt.value )
-            {
-                quoted << '&' << xmlEnt.name << ';';
-                break;
-            }
-        }
-
-        if ( n == WXSIZEOF(xmlEntities) )
-            quoted += *it;
-    }
-
-    return quoted;
-}
-
-/* static */
-wxString wxMarkupParser::Strip(const wxString& text)
-{
-    class StripOutput : public wxMarkupParserOutput
-    {
-    public:
-        StripOutput() { }
-
-        const wxString& GetText() const { return m_text; }
-
-        virtual void OnText(const wxString& text) { m_text += text; }
-
-        virtual void OnBoldStart() { }
-        virtual void OnBoldEnd() { }
-
-        virtual void OnItalicStart() { }
-        virtual void OnItalicEnd() { }
-
-        virtual void OnUnderlinedStart() { }
-        virtual void OnUnderlinedEnd() { }
-
-        virtual void OnStrikethroughStart() { }
-        virtual void OnStrikethroughEnd() { }
-
-        virtual void OnBigStart() { }
-        virtual void OnBigEnd() { }
-
-        virtual void OnSmallStart() { }
-        virtual void OnSmallEnd() { }
-
-        virtual void OnTeletypeStart() { }
-        virtual void OnTeletypeEnd() { }
-
-        virtual void OnSpanStart(const wxMarkupSpanAttributes& WXUNUSED(a)) { }
-        virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(a)) { }
-
-    private:
-        wxString m_text;
-    };
-
-    StripOutput output;
-    wxMarkupParser parser(output);
-    if ( !parser.Parse(text) )
-        return wxString();
-
-    return output.GetText();
-}
-
-#endif // wxUSE_MARKUP
diff --git a/Source/3rd Party/wx/src/common/matrix.cpp b/Source/3rd Party/wx/src/common/matrix.cpp
index 73b396c52..4903aca39 100644
--- a/Source/3rd Party/wx/src/common/matrix.cpp	
+++ b/Source/3rd Party/wx/src/common/matrix.cpp	
@@ -1,601 +1,601 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/matrix.cpp
-// Purpose:     wxTransformMatrix class
-// Author:      Chris Breeze, Julian Smart
-// Modified by: Klaas Holwerda
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// Note: this is intended to be used in wxDC at some point to replace
-// the current system of scaling/translation. It is not yet used.
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/matrix.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/math.h"
-#endif
-
-static const double pi = M_PI;
-
-wxTransformMatrix::wxTransformMatrix(void)
-{
-    m_isIdentity = false;
-
-    Identity();
-}
-
-wxTransformMatrix::wxTransformMatrix(const wxTransformMatrix& mat)
-    : wxObject()
-{
-    (*this) = mat;
-}
-
-double wxTransformMatrix::GetValue(int col, int row) const
-{
-    if (row < 0 || row > 2 || col < 0 || col > 2)
-        return 0.0;
-
-    return m_matrix[col][row];
-}
-
-void wxTransformMatrix::SetValue(int col, int row, double value)
-{
-    if (row < 0 || row > 2 || col < 0 || col > 2)
-        return;
-
-    m_matrix[col][row] = value;
-    m_isIdentity = IsIdentity1();
-}
-
-void wxTransformMatrix::operator = (const wxTransformMatrix& mat)
-{
-    int i, j;
-    for (i = 0; i < 3; i++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            m_matrix[i][j] = mat.m_matrix[i][j];
-        }
-    }
-    m_isIdentity = mat.m_isIdentity;
-}
-
-bool wxTransformMatrix::operator == (const wxTransformMatrix& mat) const
-{
-    if (m_isIdentity && mat.m_isIdentity)
-        return true;
-
-    int i, j;
-    for (i = 0; i < 3; i++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            if ( !wxIsSameDouble(m_matrix[i][j], mat.m_matrix[i][j]) )
-                return false;
-        }
-    }
-    return true;
-}
-
-bool wxTransformMatrix::operator != (const wxTransformMatrix& mat) const
-{
-    return (! ((*this) == mat));
-}
-
-double& wxTransformMatrix::operator()(int col, int row)
-{
-    if (row < 0 || row > 2 || col < 0 || col > 2)
-        return m_matrix[0][0];
-
-    return m_matrix[col][row];
-}
-
-double wxTransformMatrix::operator()(int col, int row) const
-{
-    if (row < 0 || row > 2 || col < 0 || col > 2)
-        return 0.0;
-
-    return m_matrix[col][row];
-}
-
-// Invert matrix
-bool wxTransformMatrix::Invert(void)
-{
-    double inverseMatrix[3][3];
-
-    // calculate the adjoint
-    inverseMatrix[0][0] =  wxCalculateDet(m_matrix[1][1],m_matrix[2][1],m_matrix[1][2],m_matrix[2][2]);
-    inverseMatrix[0][1] = -wxCalculateDet(m_matrix[0][1],m_matrix[2][1],m_matrix[0][2],m_matrix[2][2]);
-    inverseMatrix[0][2] =  wxCalculateDet(m_matrix[0][1],m_matrix[1][1],m_matrix[0][2],m_matrix[1][2]);
-
-    inverseMatrix[1][0] = -wxCalculateDet(m_matrix[1][0],m_matrix[2][0],m_matrix[1][2],m_matrix[2][2]);
-    inverseMatrix[1][1] =  wxCalculateDet(m_matrix[0][0],m_matrix[2][0],m_matrix[0][2],m_matrix[2][2]);
-    inverseMatrix[1][2] = -wxCalculateDet(m_matrix[0][0],m_matrix[1][0],m_matrix[0][2],m_matrix[1][2]);
-
-    inverseMatrix[2][0] =  wxCalculateDet(m_matrix[1][0],m_matrix[2][0],m_matrix[1][1],m_matrix[2][1]);
-    inverseMatrix[2][1] = -wxCalculateDet(m_matrix[0][0],m_matrix[2][0],m_matrix[0][1],m_matrix[2][1]);
-    inverseMatrix[2][2] =  wxCalculateDet(m_matrix[0][0],m_matrix[1][0],m_matrix[0][1],m_matrix[1][1]);
-
-    // now divide by the determinant
-    double det = m_matrix[0][0] * inverseMatrix[0][0] + m_matrix[0][1] * inverseMatrix[1][0] + m_matrix[0][2] * inverseMatrix[2][0];
-    if ( wxIsNullDouble(det) )
-        return false;
-
-    inverseMatrix[0][0] /= det; inverseMatrix[1][0] /= det; inverseMatrix[2][0] /= det;
-    inverseMatrix[0][1] /= det; inverseMatrix[1][1] /= det; inverseMatrix[2][1] /= det;
-    inverseMatrix[0][2] /= det; inverseMatrix[1][2] /= det; inverseMatrix[2][2] /= det;
-
-    for (int i = 0; i < 3; i++)
-    {
-        for (int j = 0; j < 3; j++)
-        {
-            m_matrix[i][j] = inverseMatrix[i][j];
-        }
-    }
-    m_isIdentity = IsIdentity1();
-    return true;
-}
-
-// Make into identity matrix
-bool wxTransformMatrix::Identity(void)
-{
-    m_matrix[0][0] = m_matrix[1][1] = m_matrix[2][2] = 1.0;
-    m_matrix[1][0] = m_matrix[2][0] = m_matrix[0][1] = m_matrix[2][1] = m_matrix[0][2] = m_matrix[1][2] = 0.0;
-    m_isIdentity = true;
-
-    return true;
-}
-
-// Scale by scale (isotropic scaling i.e. the same in x and y):
-//           | scale  0      0      |
-// matrix' = |  0     scale  0      | x matrix
-//           |  0     0      scale  |
-//
-bool wxTransformMatrix::Scale(double scale)
-{
-    int i, j;
-    for (i = 0; i < 3; i++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            m_matrix[i][j] *= scale;
-        }
-    }
-    m_isIdentity = IsIdentity1();
-
-    return true;
-}
-
-
-// scale a matrix in 2D
-//
-//     xs    0      xc(1-xs)
-//     0    ys      yc(1-ys)
-//     0     0      1
-//
-wxTransformMatrix&  wxTransformMatrix::Scale(const double &xs, const double &ys,const double &xc, const double &yc)
-{
-    double r00,r10,r20,r01,r11,r21;
-
-    if (m_isIdentity)
-    {
-        double tx = xc*(1-xs);
-        double ty = yc*(1-ys);
-        r00 = xs;
-        r10 = 0;
-        r20 = tx;
-        r01 = 0;
-        r11 = ys;
-        r21 = ty;
-    }
-    else if ( !wxIsNullDouble(xc) || !wxIsNullDouble(yc) )
-    {
-        double tx = xc*(1-xs);
-        double ty = yc*(1-ys);
-        r00 = xs * m_matrix[0][0];
-        r10 = xs * m_matrix[1][0];
-        r20 = xs * m_matrix[2][0] + tx;
-        r01 = ys * m_matrix[0][1];
-        r11 = ys * m_matrix[1][1];
-        r21 = ys * m_matrix[2][1] + ty;
-    }
-    else
-    {
-        r00 = xs * m_matrix[0][0];
-        r10 = xs * m_matrix[1][0];
-        r20 = xs * m_matrix[2][0];
-        r01 = ys * m_matrix[0][1];
-        r11 = ys * m_matrix[1][1];
-        r21 = ys * m_matrix[2][1];
-    }
-
-    m_matrix[0][0] = r00;
-    m_matrix[1][0] = r10;
-    m_matrix[2][0] = r20;
-    m_matrix[0][1] = r01;
-    m_matrix[1][1] = r11;
-    m_matrix[2][1] = r21;
-
-/* or like this
-    // first translate to origin O
-    (*this).Translate(-x_cen, -y_cen);
-
-    // now do the scaling
-    wxTransformMatrix scale;
-    scale.m_matrix[0][0] = x_fac;
-    scale.m_matrix[1][1] = y_fac;
-   scale.m_isIdentity = IsIdentity1();
-
-    *this = scale * (*this);
-
-    // translate back from origin to x_cen, y_cen
-    (*this).Translate(x_cen, y_cen);
-*/
-
-    m_isIdentity = IsIdentity1();
-
-    return *this;
-}
-
-
-// mirror a matrix in x, y
-//
-//     -1      0      0     Y-mirror
-//      0     -1      0     X-mirror
-//      0      0     -1     Z-mirror
-wxTransformMatrix&  wxTransformMatrix::Mirror(bool x, bool y)
-{
-    wxTransformMatrix temp;
-    if (x)
-    {
-        temp.m_matrix[1][1] = -1;
-        temp.m_isIdentity=false;
-    }
-    if (y)
-    {
-        temp.m_matrix[0][0] = -1;
-        temp.m_isIdentity=false;
-    }
-
-    *this = temp * (*this);
-    m_isIdentity = IsIdentity1();
-    return *this;
-}
-
-// Translate by dx, dy:
-//           | 1  0 dx |
-// matrix' = | 0  1 dy | x matrix
-//           | 0  0  1 |
-//
-bool wxTransformMatrix::Translate(double dx, double dy)
-{
-    int i;
-    for (i = 0; i < 3; i++)
-        m_matrix[i][0] += dx * m_matrix[i][2];
-    for (i = 0; i < 3; i++)
-        m_matrix[i][1] += dy * m_matrix[i][2];
-
-    m_isIdentity = IsIdentity1();
-
-    return true;
-}
-
-// Rotate clockwise by the given number of degrees:
-//           |  cos sin 0 |
-// matrix' = | -sin cos 0 | x matrix
-//           |   0   0  1 |
-bool wxTransformMatrix::Rotate(double degrees)
-{
-    Rotate(-degrees,0,0);
-    return true;
-}
-
-// counter clockwise rotate around a point
-//
-//  cos(r) -sin(r)    x(1-cos(r))+y(sin(r)
-//  sin(r)  cos(r)    y(1-cos(r))-x(sin(r)
-//    0      0        1
-wxTransformMatrix&  wxTransformMatrix::Rotate(const double &degrees, const double &x, const double &y)
-{
-    double angle = degrees * pi / 180.0;
-    double c = cos(angle);
-    double s = sin(angle);
-    double r00,r10,r20,r01,r11,r21;
-
-    if (m_isIdentity)
-    {
-        double tx = x*(1-c)+y*s;
-        double ty = y*(1-c)-x*s;
-        r00 = c ;
-        r10 = -s;
-        r20 = tx;
-        r01 = s;
-        r11 = c;
-        r21 = ty;
-    }
-    else if ( !wxIsNullDouble(x) || !wxIsNullDouble(y) )
-    {
-        double tx = x*(1-c)+y*s;
-        double ty = y*(1-c)-x*s;
-        r00 = c * m_matrix[0][0] - s * m_matrix[0][1] + tx * m_matrix[0][2];
-        r10 = c * m_matrix[1][0] - s * m_matrix[1][1] + tx * m_matrix[1][2];
-        r20 = c * m_matrix[2][0] - s * m_matrix[2][1] + tx;// * m_matrix[2][2];
-        r01 = c * m_matrix[0][1] + s * m_matrix[0][0] + ty * m_matrix[0][2];
-        r11 = c * m_matrix[1][1] + s * m_matrix[1][0] + ty * m_matrix[1][2];
-        r21 = c * m_matrix[2][1] + s * m_matrix[2][0] + ty;// * m_matrix[2][2];
-    }
-    else
-    {
-        r00 = c * m_matrix[0][0] - s * m_matrix[0][1];
-        r10 = c * m_matrix[1][0] - s * m_matrix[1][1];
-        r20 = c * m_matrix[2][0] - s * m_matrix[2][1];
-        r01 = c * m_matrix[0][1] + s * m_matrix[0][0];
-        r11 = c * m_matrix[1][1] + s * m_matrix[1][0];
-        r21 = c * m_matrix[2][1] + s * m_matrix[2][0];
-    }
-
-    m_matrix[0][0] = r00;
-    m_matrix[1][0] = r10;
-    m_matrix[2][0] = r20;
-    m_matrix[0][1] = r01;
-    m_matrix[1][1] = r11;
-    m_matrix[2][1] = r21;
-
-/* or like this
-    wxTransformMatrix rotate;
-    rotate.m_matrix[2][0] = tx;
-    rotate.m_matrix[2][1] = ty;
-
-    rotate.m_matrix[0][0] = c;
-    rotate.m_matrix[0][1] = s;
-
-    rotate.m_matrix[1][0] = -s;
-    rotate.m_matrix[1][1] = c;
-
-   rotate.m_isIdentity=false;
-   *this = rotate * (*this);
-*/
-    m_isIdentity = IsIdentity1();
-
-    return *this;
-}
-
-// Transform a point from logical to device coordinates
-bool wxTransformMatrix::TransformPoint(double x, double y, double& tx, double& ty) const
-{
-    if (IsIdentity())
-    {
-        tx = x; ty = y; return true;
-    }
-
-    tx = x * m_matrix[0][0] + y * m_matrix[1][0] + m_matrix[2][0];
-    ty = x * m_matrix[0][1] + y * m_matrix[1][1] + m_matrix[2][1];
-
-    return true;
-}
-
-// Transform a point from device to logical coordinates.
-
-// Example of use:
-//   wxTransformMatrix mat = dc.GetTransformation();
-//   mat.Invert();
-//   mat.InverseTransformPoint(x, y, x1, y1);
-// OR (shorthand:)
-//   dc.LogicalToDevice(x, y, x1, y1);
-// The latter is slightly less efficient if we're doing several
-// conversions, since the matrix is inverted several times.
-bool wxTransformMatrix::InverseTransformPoint(double x, double y, double& tx, double& ty) const
-{
-    if (IsIdentity())
-    {
-        tx = x;
-        ty = y;
-        return true;
-    }
-
-    const double z = (1.0 - m_matrix[0][2] * x - m_matrix[1][2] * y) / m_matrix[2][2];
-    if ( wxIsNullDouble(z) )
-        return false;
-
-    tx = x * m_matrix[0][0] + y * m_matrix[1][0] + z * m_matrix[2][0];
-    ty = x * m_matrix[0][1] + y * m_matrix[1][1] + z * m_matrix[2][1];
-    return true;
-}
-
-wxTransformMatrix& wxTransformMatrix::operator*=(const double& t)
-{
-    for (int i = 0; i < 3; i++)
-        for (int j = 0; j < 3; j++)
-            m_matrix[i][j]*= t;
-    m_isIdentity = IsIdentity1();
-    return *this;
-}
-
-wxTransformMatrix& wxTransformMatrix::operator/=(const double& t)
-{
-    for (int i = 0; i < 3; i++)
-        for (int j = 0; j < 3; j++)
-            m_matrix[i][j]/= t;
-    m_isIdentity = IsIdentity1();
-    return *this;
-}
-
-wxTransformMatrix& wxTransformMatrix::operator+=(const wxTransformMatrix& mat)
-{
-    for (int i = 0; i < 3; i++)
-        for (int j = 0; j < 3; j++)
-            m_matrix[i][j] += mat.m_matrix[i][j];
-    m_isIdentity = IsIdentity1();
-    return *this;
-}
-
-wxTransformMatrix& wxTransformMatrix::operator-=(const wxTransformMatrix& mat)
-{
-    for (int i = 0; i < 3; i++)
-        for (int j = 0; j < 3; j++)
-            m_matrix[i][j] -= mat.m_matrix[i][j];
-    m_isIdentity = IsIdentity1();
-    return *this;
-}
-
-wxTransformMatrix& wxTransformMatrix::operator*=(const wxTransformMatrix& mat)
-{
-
-    if (mat.m_isIdentity)
-        return *this;
-    if (m_isIdentity)
-    {
-        *this = mat;
-        return *this;
-    }
-    else
-    {
-        wxTransformMatrix  result;
-        for (int i = 0; i < 3; i++)
-        {
-           for (int j = 0; j < 3; j++)
-           {
-               double sum = 0;
-               for (int k = 0; k < 3; k++)
-                   sum += m_matrix[k][i] * mat.m_matrix[j][k];
-               result.m_matrix[j][i] = sum;
-           }
-        }
-        *this = result;
-    }
-
-    m_isIdentity = IsIdentity1();
-    return *this;
-}
-
-
-// constant operators
-wxTransformMatrix  wxTransformMatrix::operator*(const double& t) const
-{
-    wxTransformMatrix result = *this;
-    result *= t;
-    result.m_isIdentity = result.IsIdentity1();
-    return result;
-}
-
-wxTransformMatrix  wxTransformMatrix::operator/(const double& t) const
-{
-    wxTransformMatrix result = *this;
-//    wxASSERT(t!=0);
-    result /= t;
-    result.m_isIdentity = result.IsIdentity1();
-    return result;
-}
-
-wxTransformMatrix  wxTransformMatrix::operator+(const wxTransformMatrix& m) const
-{
-    wxTransformMatrix result = *this;
-    result += m;
-    result.m_isIdentity = result.IsIdentity1();
-    return result;
-}
-
-wxTransformMatrix  wxTransformMatrix::operator-(const wxTransformMatrix& m) const
-{
-    wxTransformMatrix result = *this;
-    result -= m;
-    result.m_isIdentity = result.IsIdentity1();
-    return result;
-}
-
-
-wxTransformMatrix  wxTransformMatrix::operator*(const wxTransformMatrix& m) const
-{
-    wxTransformMatrix result = *this;
-    result *= m;
-    result.m_isIdentity = result.IsIdentity1();
-    return result;
-}
-
-
-wxTransformMatrix  wxTransformMatrix::operator-() const
-{
-    wxTransformMatrix result = *this;
-    for (int i = 0; i < 3; i++)
-        for (int j = 0; j < 3; j++)
-            result.m_matrix[i][j] = -(this->m_matrix[i][j]);
-    result.m_isIdentity = result.IsIdentity1();
-    return result;
-}
-
-static double CheckInt(double getal)
-{
-    // check if the number is very close to an integer
-    if ( (ceil(getal) - getal) < 0.0001)
-        return ceil(getal);
-
-    else if ( (getal - floor(getal)) < 0.0001)
-        return floor(getal);
-
-    return getal;
-
-}
-
-double wxTransformMatrix::Get_scaleX()
-{
-    double scale_factor;
-    double rot_angle = CheckInt(atan2(m_matrix[1][0],m_matrix[0][0])*180/pi);
-    if ( !wxIsSameDouble(rot_angle, 90) && !wxIsSameDouble(rot_angle, -90) )
-        scale_factor = m_matrix[0][0]/cos((rot_angle/180)*pi);
-    else
-        scale_factor = m_matrix[0][0]/sin((rot_angle/180)*pi);  // er kan nl. niet door 0 gedeeld worden !
-
-    scale_factor = CheckInt(scale_factor);
-    if (scale_factor < 0)
-        scale_factor = -scale_factor;
-
-    return scale_factor;
-}
-
-double wxTransformMatrix::Get_scaleY()
-{
-    double scale_factor;
-    double rot_angle = CheckInt(atan2(m_matrix[1][0],m_matrix[0][0])*180/pi);
-    if ( !wxIsSameDouble(rot_angle, 90) && !wxIsSameDouble(rot_angle, -90) )
-       scale_factor = m_matrix[1][1]/cos((rot_angle/180)*pi);
-    else
-       scale_factor = m_matrix[1][1]/sin((rot_angle/180)*pi);   // er kan nl. niet door 0 gedeeld worden !
-
-    scale_factor = CheckInt(scale_factor);
-    if (scale_factor < 0)
-
-        scale_factor = -scale_factor;
-
-    return scale_factor;
-
-}
-
-double wxTransformMatrix::GetRotation()
-{
-    double temp1 = GetValue(0,0);   // for angle calculation
-    double temp2 = GetValue(0,1);   //
-
-    // Rotation
-    double rot_angle = atan2(temp2,temp1)*180/pi;
-
-    rot_angle = CheckInt(rot_angle);
-    return rot_angle;
-}
-
-void wxTransformMatrix::SetRotation(double rotation)
-{
-    double x=GetValue(2,0);
-    double y=GetValue(2,1);
-    Rotate(-GetRotation(), x, y);
-    Rotate(rotation, x, y);
-}
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/matrix.cpp
+// Purpose:     wxTransformMatrix class
+// Author:      Chris Breeze, Julian Smart
+// Modified by: Klaas Holwerda
+// Created:     01/02/97
+// RCS-ID:      $Id: matrix.cpp 39745 2006-06-15 17:58:49Z ABX $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// Note: this is intended to be used in wxDC at some point to replace
+// the current system of scaling/translation. It is not yet used.
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/matrix.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/math.h"
+#endif
+
+static const double pi = M_PI;
+
+wxTransformMatrix::wxTransformMatrix(void)
+{
+    m_isIdentity = false;
+
+    Identity();
+}
+
+wxTransformMatrix::wxTransformMatrix(const wxTransformMatrix& mat)
+    : wxObject()
+{
+    (*this) = mat;
+}
+
+double wxTransformMatrix::GetValue(int col, int row) const
+{
+    if (row < 0 || row > 2 || col < 0 || col > 2)
+        return 0.0;
+
+    return m_matrix[col][row];
+}
+
+void wxTransformMatrix::SetValue(int col, int row, double value)
+{
+    if (row < 0 || row > 2 || col < 0 || col > 2)
+        return;
+
+    m_matrix[col][row] = value;
+    m_isIdentity = IsIdentity1();
+}
+
+void wxTransformMatrix::operator = (const wxTransformMatrix& mat)
+{
+    int i, j;
+    for (i = 0; i < 3; i++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            m_matrix[i][j] = mat.m_matrix[i][j];
+        }
+    }
+    m_isIdentity = mat.m_isIdentity;
+}
+
+bool wxTransformMatrix::operator == (const wxTransformMatrix& mat) const
+{
+    if (m_isIdentity && mat.m_isIdentity)
+        return true;
+
+    int i, j;
+    for (i = 0; i < 3; i++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            if ( !wxIsSameDouble(m_matrix[i][j], mat.m_matrix[i][j]) )
+                return false;
+        }
+    }
+    return true;
+}
+
+bool wxTransformMatrix::operator != (const wxTransformMatrix& mat) const
+{
+    return (! ((*this) == mat));
+}
+
+double& wxTransformMatrix::operator()(int col, int row)
+{
+    if (row < 0 || row > 2 || col < 0 || col > 2)
+        return m_matrix[0][0];
+
+    return m_matrix[col][row];
+}
+
+double wxTransformMatrix::operator()(int col, int row) const
+{
+    if (row < 0 || row > 2 || col < 0 || col > 2)
+        return 0.0;
+
+    return m_matrix[col][row];
+}
+
+// Invert matrix
+bool wxTransformMatrix::Invert(void)
+{
+    double inverseMatrix[3][3];
+
+    // calculate the adjoint
+    inverseMatrix[0][0] =  wxCalculateDet(m_matrix[1][1],m_matrix[2][1],m_matrix[1][2],m_matrix[2][2]);
+    inverseMatrix[0][1] = -wxCalculateDet(m_matrix[0][1],m_matrix[2][1],m_matrix[0][2],m_matrix[2][2]);
+    inverseMatrix[0][2] =  wxCalculateDet(m_matrix[0][1],m_matrix[1][1],m_matrix[0][2],m_matrix[1][2]);
+
+    inverseMatrix[1][0] = -wxCalculateDet(m_matrix[1][0],m_matrix[2][0],m_matrix[1][2],m_matrix[2][2]);
+    inverseMatrix[1][1] =  wxCalculateDet(m_matrix[0][0],m_matrix[2][0],m_matrix[0][2],m_matrix[2][2]);
+    inverseMatrix[1][2] = -wxCalculateDet(m_matrix[0][0],m_matrix[1][0],m_matrix[0][2],m_matrix[1][2]);
+
+    inverseMatrix[2][0] =  wxCalculateDet(m_matrix[1][0],m_matrix[2][0],m_matrix[1][1],m_matrix[2][1]);
+    inverseMatrix[2][1] = -wxCalculateDet(m_matrix[0][0],m_matrix[2][0],m_matrix[0][1],m_matrix[2][1]);
+    inverseMatrix[2][2] =  wxCalculateDet(m_matrix[0][0],m_matrix[1][0],m_matrix[0][1],m_matrix[1][1]);
+
+    // now divide by the determinant
+    double det = m_matrix[0][0] * inverseMatrix[0][0] + m_matrix[0][1] * inverseMatrix[1][0] + m_matrix[0][2] * inverseMatrix[2][0];
+    if ( wxIsNullDouble(det) )
+        return false;
+
+    inverseMatrix[0][0] /= det; inverseMatrix[1][0] /= det; inverseMatrix[2][0] /= det;
+    inverseMatrix[0][1] /= det; inverseMatrix[1][1] /= det; inverseMatrix[2][1] /= det;
+    inverseMatrix[0][2] /= det; inverseMatrix[1][2] /= det; inverseMatrix[2][2] /= det;
+
+    for (int i = 0; i < 3; i++)
+    {
+        for (int j = 0; j < 3; j++)
+        {
+            m_matrix[i][j] = inverseMatrix[i][j];
+        }
+    }
+    m_isIdentity = IsIdentity1();
+    return true;
+}
+
+// Make into identity matrix
+bool wxTransformMatrix::Identity(void)
+{
+    m_matrix[0][0] = m_matrix[1][1] = m_matrix[2][2] = 1.0;
+    m_matrix[1][0] = m_matrix[2][0] = m_matrix[0][1] = m_matrix[2][1] = m_matrix[0][2] = m_matrix[1][2] = 0.0;
+    m_isIdentity = true;
+
+    return true;
+}
+
+// Scale by scale (isotropic scaling i.e. the same in x and y):
+//           | scale  0      0      |
+// matrix' = |  0     scale  0      | x matrix
+//           |  0     0      scale  |
+//
+bool wxTransformMatrix::Scale(double scale)
+{
+    int i, j;
+    for (i = 0; i < 3; i++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            m_matrix[i][j] *= scale;
+        }
+    }
+    m_isIdentity = IsIdentity1();
+
+    return true;
+}
+
+
+// scale a matrix in 2D
+//
+//     xs    0      xc(1-xs)
+//     0    ys      yc(1-ys)
+//     0     0      1
+//
+wxTransformMatrix&  wxTransformMatrix::Scale(const double &xs, const double &ys,const double &xc, const double &yc)
+{
+    double r00,r10,r20,r01,r11,r21;
+
+    if (m_isIdentity)
+    {
+        double tx = xc*(1-xs);
+        double ty = yc*(1-ys);
+        r00 = xs;
+        r10 = 0;
+        r20 = tx;
+        r01 = 0;
+        r11 = ys;
+        r21 = ty;
+    }
+    else if ( !wxIsNullDouble(xc) || !wxIsNullDouble(yc) )
+    {
+        double tx = xc*(1-xs);
+        double ty = yc*(1-ys);
+        r00 = xs * m_matrix[0][0];
+        r10 = xs * m_matrix[1][0];
+        r20 = xs * m_matrix[2][0] + tx;
+        r01 = ys * m_matrix[0][1];
+        r11 = ys * m_matrix[1][1];
+        r21 = ys * m_matrix[2][1] + ty;
+    }
+    else
+    {
+        r00 = xs * m_matrix[0][0];
+        r10 = xs * m_matrix[1][0];
+        r20 = xs * m_matrix[2][0];
+        r01 = ys * m_matrix[0][1];
+        r11 = ys * m_matrix[1][1];
+        r21 = ys * m_matrix[2][1];
+    }
+
+    m_matrix[0][0] = r00;
+    m_matrix[1][0] = r10;
+    m_matrix[2][0] = r20;
+    m_matrix[0][1] = r01;
+    m_matrix[1][1] = r11;
+    m_matrix[2][1] = r21;
+
+/* or like this
+    // first translate to origin O
+    (*this).Translate(-x_cen, -y_cen);
+
+    // now do the scaling
+    wxTransformMatrix scale;
+    scale.m_matrix[0][0] = x_fac;
+    scale.m_matrix[1][1] = y_fac;
+   scale.m_isIdentity = IsIdentity1();
+
+    *this = scale * (*this);
+
+    // translate back from origin to x_cen, y_cen
+    (*this).Translate(x_cen, y_cen);
+*/
+
+    m_isIdentity = IsIdentity1();
+
+    return *this;
+}
+
+
+// mirror a matrix in x, y
+//
+//     -1      0      0     Y-mirror
+//      0     -1      0     X-mirror
+//      0      0     -1     Z-mirror
+wxTransformMatrix&  wxTransformMatrix::Mirror(bool x, bool y)
+{
+    wxTransformMatrix temp;
+    if (x)
+    {
+        temp.m_matrix[1][1] = -1;
+        temp.m_isIdentity=false;
+    }
+    if (y)
+    {
+        temp.m_matrix[0][0] = -1;
+        temp.m_isIdentity=false;
+    }
+
+    *this = temp * (*this);
+    m_isIdentity = IsIdentity1();
+    return *this;
+}
+
+// Translate by dx, dy:
+//           | 1  0 dx |
+// matrix' = | 0  1 dy | x matrix
+//           | 0  0  1 |
+//
+bool wxTransformMatrix::Translate(double dx, double dy)
+{
+    int i;
+    for (i = 0; i < 3; i++)
+        m_matrix[i][0] += dx * m_matrix[i][2];
+    for (i = 0; i < 3; i++)
+        m_matrix[i][1] += dy * m_matrix[i][2];
+
+    m_isIdentity = IsIdentity1();
+
+    return true;
+}
+
+// Rotate clockwise by the given number of degrees:
+//           |  cos sin 0 |
+// matrix' = | -sin cos 0 | x matrix
+//           |   0   0  1 |
+bool wxTransformMatrix::Rotate(double degrees)
+{
+    Rotate(-degrees,0,0);
+    return true;
+}
+
+// counter clockwise rotate around a point
+//
+//  cos(r) -sin(r)    x(1-cos(r))+y(sin(r)
+//  sin(r)  cos(r)    y(1-cos(r))-x(sin(r)
+//    0      0        1
+wxTransformMatrix&  wxTransformMatrix::Rotate(const double &degrees, const double &x, const double &y)
+{
+    double angle = degrees * pi / 180.0;
+    double c = cos(angle);
+    double s = sin(angle);
+    double r00,r10,r20,r01,r11,r21;
+
+    if (m_isIdentity)
+    {
+        double tx = x*(1-c)+y*s;
+        double ty = y*(1-c)-x*s;
+        r00 = c ;
+        r10 = -s;
+        r20 = tx;
+        r01 = s;
+        r11 = c;
+        r21 = ty;
+    }
+    else if ( !wxIsNullDouble(x) || !wxIsNullDouble(y) )
+    {
+        double tx = x*(1-c)+y*s;
+        double ty = y*(1-c)-x*s;
+        r00 = c * m_matrix[0][0] - s * m_matrix[0][1] + tx * m_matrix[0][2];
+        r10 = c * m_matrix[1][0] - s * m_matrix[1][1] + tx * m_matrix[1][2];
+        r20 = c * m_matrix[2][0] - s * m_matrix[2][1] + tx;// * m_matrix[2][2];
+        r01 = c * m_matrix[0][1] + s * m_matrix[0][0] + ty * m_matrix[0][2];
+        r11 = c * m_matrix[1][1] + s * m_matrix[1][0] + ty * m_matrix[1][2];
+        r21 = c * m_matrix[2][1] + s * m_matrix[2][0] + ty;// * m_matrix[2][2];
+    }
+    else
+    {
+        r00 = c * m_matrix[0][0] - s * m_matrix[0][1];
+        r10 = c * m_matrix[1][0] - s * m_matrix[1][1];
+        r20 = c * m_matrix[2][0] - s * m_matrix[2][1];
+        r01 = c * m_matrix[0][1] + s * m_matrix[0][0];
+        r11 = c * m_matrix[1][1] + s * m_matrix[1][0];
+        r21 = c * m_matrix[2][1] + s * m_matrix[2][0];
+    }
+
+    m_matrix[0][0] = r00;
+    m_matrix[1][0] = r10;
+    m_matrix[2][0] = r20;
+    m_matrix[0][1] = r01;
+    m_matrix[1][1] = r11;
+    m_matrix[2][1] = r21;
+
+/* or like this
+    wxTransformMatrix rotate;
+    rotate.m_matrix[2][0] = tx;
+    rotate.m_matrix[2][1] = ty;
+
+    rotate.m_matrix[0][0] = c;
+    rotate.m_matrix[0][1] = s;
+
+    rotate.m_matrix[1][0] = -s;
+    rotate.m_matrix[1][1] = c;
+
+   rotate.m_isIdentity=false;
+   *this = rotate * (*this);
+*/
+    m_isIdentity = IsIdentity1();
+
+    return *this;
+}
+
+// Transform a point from logical to device coordinates
+bool wxTransformMatrix::TransformPoint(double x, double y, double& tx, double& ty) const
+{
+    if (IsIdentity())
+    {
+        tx = x; ty = y; return true;
+    }
+
+    tx = x * m_matrix[0][0] + y * m_matrix[1][0] + m_matrix[2][0];
+    ty = x * m_matrix[0][1] + y * m_matrix[1][1] + m_matrix[2][1];
+
+    return true;
+}
+
+// Transform a point from device to logical coordinates.
+
+// Example of use:
+//   wxTransformMatrix mat = dc.GetTransformation();
+//   mat.Invert();
+//   mat.InverseTransformPoint(x, y, x1, y1);
+// OR (shorthand:)
+//   dc.LogicalToDevice(x, y, x1, y1);
+// The latter is slightly less efficient if we're doing several
+// conversions, since the matrix is inverted several times.
+bool wxTransformMatrix::InverseTransformPoint(double x, double y, double& tx, double& ty) const
+{
+    if (IsIdentity())
+    {
+        tx = x;
+        ty = y;
+        return true;
+    }
+
+    const double z = (1.0 - m_matrix[0][2] * x - m_matrix[1][2] * y) / m_matrix[2][2];
+    if ( wxIsNullDouble(z) )
+        return false;
+
+    tx = x * m_matrix[0][0] + y * m_matrix[1][0] + z * m_matrix[2][0];
+    ty = x * m_matrix[0][1] + y * m_matrix[1][1] + z * m_matrix[2][1];
+    return true;
+}
+
+wxTransformMatrix& wxTransformMatrix::operator*=(const double& t)
+{
+    for (int i = 0; i < 3; i++)
+        for (int j = 0; j < 3; j++)
+            m_matrix[i][j]*= t;
+    m_isIdentity = IsIdentity1();
+    return *this;
+}
+
+wxTransformMatrix& wxTransformMatrix::operator/=(const double& t)
+{
+    for (int i = 0; i < 3; i++)
+        for (int j = 0; j < 3; j++)
+            m_matrix[i][j]/= t;
+    m_isIdentity = IsIdentity1();
+    return *this;
+}
+
+wxTransformMatrix& wxTransformMatrix::operator+=(const wxTransformMatrix& mat)
+{
+    for (int i = 0; i < 3; i++)
+        for (int j = 0; j < 3; j++)
+            m_matrix[i][j] += mat.m_matrix[i][j];
+    m_isIdentity = IsIdentity1();
+    return *this;
+}
+
+wxTransformMatrix& wxTransformMatrix::operator-=(const wxTransformMatrix& mat)
+{
+    for (int i = 0; i < 3; i++)
+        for (int j = 0; j < 3; j++)
+            m_matrix[i][j] -= mat.m_matrix[i][j];
+    m_isIdentity = IsIdentity1();
+    return *this;
+}
+
+wxTransformMatrix& wxTransformMatrix::operator*=(const wxTransformMatrix& mat)
+{
+
+    if (mat.m_isIdentity)
+        return *this;
+    if (m_isIdentity)
+    {
+        *this = mat;
+        return *this;
+    }
+    else
+    {
+        wxTransformMatrix  result;
+        for (int i = 0; i < 3; i++)
+        {
+           for (int j = 0; j < 3; j++)
+           {
+               double sum = 0;
+               for (int k = 0; k < 3; k++)
+                   sum += m_matrix[k][i] * mat.m_matrix[j][k];
+               result.m_matrix[j][i] = sum;
+           }
+        }
+        *this = result;
+    }
+
+    m_isIdentity = IsIdentity1();
+    return *this;
+}
+
+
+// constant operators
+wxTransformMatrix  wxTransformMatrix::operator*(const double& t) const
+{
+    wxTransformMatrix result = *this;
+    result *= t;
+    result.m_isIdentity = result.IsIdentity1();
+    return result;
+}
+
+wxTransformMatrix  wxTransformMatrix::operator/(const double& t) const
+{
+    wxTransformMatrix result = *this;
+//    wxASSERT(t!=0);
+    result /= t;
+    result.m_isIdentity = result.IsIdentity1();
+    return result;
+}
+
+wxTransformMatrix  wxTransformMatrix::operator+(const wxTransformMatrix& m) const
+{
+    wxTransformMatrix result = *this;
+    result += m;
+    result.m_isIdentity = result.IsIdentity1();
+    return result;
+}
+
+wxTransformMatrix  wxTransformMatrix::operator-(const wxTransformMatrix& m) const
+{
+    wxTransformMatrix result = *this;
+    result -= m;
+    result.m_isIdentity = result.IsIdentity1();
+    return result;
+}
+
+
+wxTransformMatrix  wxTransformMatrix::operator*(const wxTransformMatrix& m) const
+{
+    wxTransformMatrix result = *this;
+    result *= m;
+    result.m_isIdentity = result.IsIdentity1();
+    return result;
+}
+
+
+wxTransformMatrix  wxTransformMatrix::operator-() const
+{
+    wxTransformMatrix result = *this;
+    for (int i = 0; i < 3; i++)
+        for (int j = 0; j < 3; j++)
+            result.m_matrix[i][j] = -(this->m_matrix[i][j]);
+    result.m_isIdentity = result.IsIdentity1();
+    return result;
+}
+
+static double CheckInt(double getal)
+{
+    // check if the number is very close to an integer
+    if ( (ceil(getal) - getal) < 0.0001)
+        return ceil(getal);
+
+    else if ( (getal - floor(getal)) < 0.0001)
+        return floor(getal);
+
+    return getal;
+
+}
+
+double wxTransformMatrix::Get_scaleX()
+{
+    double scale_factor;
+    double rot_angle = CheckInt(atan2(m_matrix[1][0],m_matrix[0][0])*180/pi);
+    if ( !wxIsSameDouble(rot_angle, 90) && !wxIsSameDouble(rot_angle, -90) )
+        scale_factor = m_matrix[0][0]/cos((rot_angle/180)*pi);
+    else
+        scale_factor = m_matrix[0][0]/sin((rot_angle/180)*pi);  // er kan nl. niet door 0 gedeeld worden !
+
+    scale_factor = CheckInt(scale_factor);
+    if (scale_factor < 0)
+        scale_factor = -scale_factor;
+
+    return scale_factor;
+}
+
+double wxTransformMatrix::Get_scaleY()
+{
+    double scale_factor;
+    double rot_angle = CheckInt(atan2(m_matrix[1][0],m_matrix[0][0])*180/pi);
+    if ( !wxIsSameDouble(rot_angle, 90) && !wxIsSameDouble(rot_angle, -90) )
+       scale_factor = m_matrix[1][1]/cos((rot_angle/180)*pi);
+    else
+       scale_factor = m_matrix[1][1]/sin((rot_angle/180)*pi);   // er kan nl. niet door 0 gedeeld worden !
+
+    scale_factor = CheckInt(scale_factor);
+    if (scale_factor < 0)
+
+        scale_factor = -scale_factor;
+
+    return scale_factor;
+
+}
+
+double wxTransformMatrix::GetRotation()
+{
+    double temp1 = GetValue(0,0);   // for angle calculation
+    double temp2 = GetValue(0,1);   //
+
+    // Rotation
+    double rot_angle = atan2(temp2,temp1)*180/pi;
+
+    rot_angle = CheckInt(rot_angle);
+    return rot_angle;
+}
+
+void wxTransformMatrix::SetRotation(double rotation)
+{
+    double x=GetValue(2,0);
+    double y=GetValue(2,1);
+    Rotate(-GetRotation(), x, y);
+    Rotate(rotation, x, y);
+}
diff --git a/Source/3rd Party/wx/src/common/memory.cpp b/Source/3rd Party/wx/src/common/memory.cpp
index b140fb9bf..e3a1d7866 100644
--- a/Source/3rd Party/wx/src/common/memory.cpp	
+++ b/Source/3rd Party/wx/src/common/memory.cpp	
@@ -1,1152 +1,1148 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/memory.cpp
-// Purpose:     Memory checking implementation
-// Author:      Arthur Seaton, Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT
-
-#include "wx/memory.h"
-
-#ifndef WX_PRECOMP
-    #ifdef __WINDOWS__
-        #include "wx/msw/wrapwin.h"
-    #endif
-    #include "wx/utils.h"
-    #include "wx/app.h"
-    #include "wx/hash.h"
-    #include "wx/log.h"
-#endif
-
-#if wxUSE_THREADS
-    #include "wx/thread.h"
-#endif
-
-#include <stdlib.h>
-
-#include "wx/ioswrap.h"
-
-#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )
-#include <memory.h>
-#endif
-
-#include <stdarg.h>
-#include <string.h>
-
-#if wxUSE_THREADS
-#define USE_THREADSAFE_MEMORY_ALLOCATION 1
-#else
-#define USE_THREADSAFE_MEMORY_ALLOCATION 0
-#endif
-
-
-#ifdef new
-#undef new
-#endif
-
-// wxDebugContext wxTheDebugContext;
-/*
-  Redefine new and delete so that we can pick up situations where:
-        - we overwrite or underwrite areas of malloc'd memory.
-        - we use uninitialise variables
-  Only do this in debug mode.
-
-  We change new to get enough memory to allocate a struct, followed
-  by the caller's requested memory, followed by a tag. The struct
-  is used to create a doubly linked list of these areas and also
-  contains another tag. The tags are used to determine when the area
-  has been over/under written.
-*/
-
-
-/*
-  Values which are used to set the markers which will be tested for
-  under/over write. There are 3 of these, one in the struct, one
-  immediately after the struct but before the caller requested memory and
-  one immediately after the requested memory.
-*/
-#define MemStartCheck  0x23A8
-#define MemMidCheck  0xA328
-#define MemEndCheck 0x8A32
-#define MemFillChar 0xAF
-#define MemStructId  0x666D
-
-/*
-  External interface for the wxMemStruct class. Others are
-  defined inline within the class def. Here we only need to be able
-  to add and delete nodes from the list and handle errors in some way.
-*/
-
-/*
-  Used for internal "this shouldn't happen" type of errors.
-*/
-void wxMemStruct::ErrorMsg (const char * mesg)
-{
-  wxLogMessage(wxT("wxWidgets memory checking error: %s"), mesg);
-  PrintNode ();
-}
-
-/*
-  Used when we find an overwrite or an underwrite error.
-*/
-void wxMemStruct::ErrorMsg ()
-{
-  wxLogMessage(wxT("wxWidgets over/underwrite memory error:"));
-  PrintNode ();
-}
-
-
-/*
-  We want to find out if pointers have been overwritten as soon as is
-  possible, so test everything before we dereference it. Of course it's still
-  quite possible that, if things have been overwritten, this function will
-  fall over, but the only way of dealing with that would cost too much in terms
-  of time.
-*/
-int wxMemStruct::AssertList ()
-{
-    if ((wxDebugContext::GetHead() && !wxDebugContext::GetHead()->AssertIt()) ||
-        (wxDebugContext::GetTail() && !wxDebugContext::GetTail()->AssertIt()))
-    {
-        ErrorMsg ("Head or tail pointers trashed");
-        return 0;
-    }
-    return 1;
-}
-
-
-/*
-  Check that the thing we're pointing to has the correct id for a wxMemStruct
-  object and also that it's previous and next pointers are pointing at objects
-  which have valid ids.
-  This is definitely not perfect since we could fall over just trying to access
-  any of the slots which we use here, but I think it's about the best that I
-  can do without doing something like taking all new wxMemStruct pointers and
-  comparing them against all known pointer within the list and then only
-  doing this sort of check _after_ you've found the pointer in the list. That
-  would be safer, but also much more time consuming.
-*/
-int wxMemStruct::AssertIt ()
-{
-    return (m_id == MemStructId &&
-            (m_prev == 0 || m_prev->m_id == MemStructId) &&
-            (m_next == 0 || m_next->m_id == MemStructId));
-}
-
-
-/*
-  Additions are always at the tail of the list.
-  Returns 0 on error, non-zero on success.
-*/
-int wxMemStruct::Append ()
-{
-    if (! AssertList ())
-        return 0;
-
-    if (wxDebugContext::GetHead () == 0) {
-        if (wxDebugContext::GetTail () != 0) {
-            ErrorMsg ("Null list should have a null tail pointer");
-            return 0;
-        }
-        (void) wxDebugContext::SetHead (this);
-        (void) wxDebugContext::SetTail (this);
-    } else {
-        wxDebugContext::GetTail ()->m_next = this;
-        this->m_prev = wxDebugContext::GetTail ();
-        (void) wxDebugContext::SetTail (this);
-    }
-    return 1;
-}
-
-
-/*
-  Don't actually free up anything here as the space which is used
-  by the node will be free'd up when the whole block is free'd.
-  Returns 0 on error, non-zero on success.
-*/
-int wxMemStruct::Unlink ()
-{
-    if (! AssertList ())
-        return 0;
-
-    if (wxDebugContext::GetHead () == 0 || wxDebugContext::GetTail () == 0) {
-        ErrorMsg ("Trying to remove node from empty list");
-        return 0;
-    }
-
-    // Handle the part of the list before this node.
-    if (m_prev == 0) {
-        if (this != wxDebugContext::GetHead ()) {
-            ErrorMsg ("No previous node for non-head node");
-            return 0;
-        }
-        (void) wxDebugContext::SetHead (m_next);
-    } else {
-        if (! m_prev->AssertIt ()) {
-            ErrorMsg ("Trashed previous pointer");
-            return 0;
-        }
-
-        if (m_prev->m_next != this) {
-            ErrorMsg ("List is inconsistent");
-            return 0;
-        }
-        m_prev->m_next = m_next;
-    }
-
-    // Handle the part of the list after this node.
-    if (m_next == 0) {
-        if (this != wxDebugContext::GetTail ()) {
-            ErrorMsg ("No next node for non-tail node");
-            return 0;
-        }
-        (void) wxDebugContext::SetTail (m_prev);
-    } else {
-        if (! m_next->AssertIt ()) {
-            ErrorMsg ("Trashed next pointer");
-            return 0;
-        }
-
-        if (m_next->m_prev != this) {
-            ErrorMsg ("List is inconsistent");
-            return 0;
-        }
-        m_next->m_prev = m_prev;
-    }
-
-    return 1;
-}
-
-
-
-/*
-  Checks a node and block of memory to see that the markers are still
-  intact.
-*/
-int wxMemStruct::CheckBlock ()
-{
-    int nFailures = 0;
-
-    if (m_firstMarker != MemStartCheck) {
-        nFailures++;
-        ErrorMsg ();
-    }
-
-    char * pointer = wxDebugContext::MidMarkerPos ((char *) this);
-    if (* (wxMarkerType *) pointer != MemMidCheck) {
-        nFailures++;
-        ErrorMsg ();
-    }
-
-    pointer = wxDebugContext::EndMarkerPos ((char *) this, RequestSize ());
-    if (* (wxMarkerType *) pointer != MemEndCheck) {
-        nFailures++;
-        ErrorMsg ();
-    }
-
-    return nFailures;
-}
-
-
-/*
-  Check the list of nodes to see if they are all ok.
-*/
-int wxMemStruct::CheckAllPrevious ()
-{
-    int nFailures = 0;
-
-    for (wxMemStruct * st = this->m_prev; st != 0; st = st->m_prev) {
-        if (st->AssertIt ())
-            nFailures += st->CheckBlock ();
-        else
-            return -1;
-    }
-
-    return nFailures;
-}
-
-
-/*
-  When we delete a node we set the id slot to a specific value and then test
-  against this to see if a nodes have been deleted previously. I don't
-  just set the entire memory to the fillChar because then I'd be overwriting
-  useful stuff like the vtbl which may be needed to output the error message
-  including the file name and line numbers. Without this info the whole point
-  of this class is lost!
-*/
-void wxMemStruct::SetDeleted ()
-{
-    m_id = MemFillChar;
-}
-
-int wxMemStruct::IsDeleted ()
-{
-    return (m_id == MemFillChar);
-}
-
-
-/*
-  Print out a single node. There are many far better ways of doing this
-  but this will suffice for now.
-*/
-void wxMemStruct::PrintNode ()
-{
-  if (m_isObject)
-  {
-    wxObject *obj = (wxObject *)m_actualData;
-    wxClassInfo *info = obj->GetClassInfo();
-
-    // Let's put this in standard form so IDEs can load the file at the appropriate
-    // line
-    wxString msg;
-
-    if (m_fileName)
-      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
-
-    if (info && info->GetClassName())
-      msg += info->GetClassName();
-    else
-      msg += wxT("object");
-
-    wxString msg2;
-    msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
-    msg += msg2;
-
-    wxLogMessage(msg);
-  }
-  else
-  {
-    wxString msg;
-
-    if (m_fileName)
-      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
-    msg += wxT("non-object data");
-    wxString msg2;
-    msg2.Printf(wxT(" at 0x%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
-    msg += msg2;
-
-    wxLogMessage(msg);
-  }
-}
-
-void wxMemStruct::Dump ()
-{
-  if (!ValidateNode()) return;
-
-  if (m_isObject)
-  {
-    wxObject *obj = (wxObject *)m_actualData;
-
-    wxString msg;
-    if (m_fileName)
-      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
-
-
-    /* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it.
-     * Instead, do what wxObject::Dump does.
-     * What should we do long-term, eliminate Dumping? Or specify
-     * that MyClass::Dump should use wxLogDebug? Ugh.
-    obj->Dump(wxDebugContext::GetStream());
-     */
-
-    if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
-      msg += obj->GetClassInfo()->GetClassName();
-    else
-      msg += wxT("unknown object class");
-
-    wxString msg2;
-    msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
-    msg += msg2;
-
-    wxDebugContext::OutputDumpLine(msg.c_str());
-  }
-  else
-  {
-    wxString msg;
-    if (m_fileName)
-      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
-
-    wxString msg2;
-    msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
-    msg += msg2;
-    wxDebugContext::OutputDumpLine(msg.c_str());
-  }
-}
-
-
-/*
-  Validate a node. Check to see that the node is "clean" in the sense
-  that nothing has over/underwritten it etc.
-*/
-int wxMemStruct::ValidateNode ()
-{
-    char * startPointer = (char *) this;
-    if (!AssertIt ()) {
-        if (IsDeleted ())
-            ErrorMsg ("Object already deleted");
-        else {
-            // Can't use the error routines as we have no recognisable object.
-#ifndef __WXGTK__
-             wxLogMessage(wxT("Can't verify memory struct - all bets are off!"));
-#endif
-        }
-        return 0;
-    }
-
-/*
-    int i;
-    for (i = 0; i < wxDebugContext::TotSize (requestSize ()); i++)
-      cout << startPointer [i];
-    cout << endl;
-*/
-    if (Marker () != MemStartCheck)
-      ErrorMsg ();
-    if (* (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer) != MemMidCheck)
-      ErrorMsg ();
-    if (* (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
-                                              RequestSize ()) !=
-        MemEndCheck)
-      ErrorMsg ();
-
-    // Back to before the extra buffer and check that
-    // we can still read what we originally wrote.
-    if (Marker () != MemStartCheck ||
-        * (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer)
-                         != MemMidCheck ||
-        * (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
-                                              RequestSize ()) != MemEndCheck)
-    {
-        ErrorMsg ();
-        return 0;
-    }
-
-    return 1;
-}
-
-/*
-  The wxDebugContext class.
-*/
-
-wxMemStruct *wxDebugContext::m_head = NULL;
-wxMemStruct *wxDebugContext::m_tail = NULL;
-
-bool wxDebugContext::m_checkPrevious = false;
-int wxDebugContext::debugLevel = 1;
-bool wxDebugContext::debugOn = true;
-wxMemStruct *wxDebugContext::checkPoint = NULL;
-
-// For faster alignment calculation
-static wxMarkerType markerCalc[2];
-int wxDebugContext::m_balign = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]);
-int wxDebugContext::m_balignmask = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]) - 1;
-
-// Pointer to global function to call at shutdown
-wxShutdownNotifyFunction wxDebugContext::sm_shutdownFn;
-
-wxDebugContext::wxDebugContext(void)
-{
-}
-
-wxDebugContext::~wxDebugContext(void)
-{
-}
-
-/*
-  Work out the positions of the markers by creating an array of 2 markers
-  and comparing the addresses of the 2 elements. Use this number as the
-  alignment for markers.
-*/
-size_t wxDebugContext::CalcAlignment ()
-{
-    wxMarkerType ar[2];
-    return (char *) &ar[1] - (char *) &ar[0];
-}
-
-
-char * wxDebugContext::StructPos (const char * buf)
-{
-    return (char *) buf;
-}
-
-char * wxDebugContext::MidMarkerPos (const char * buf)
-{
-    return StructPos (buf) + PaddedSize (sizeof (wxMemStruct));
-}
-
-char * wxDebugContext::CallerMemPos (const char * buf)
-{
-    return MidMarkerPos (buf) + PaddedSize (sizeof(wxMarkerType));
-}
-
-
-char * wxDebugContext::EndMarkerPos (const char * buf, const size_t size)
-{
-    return CallerMemPos (buf) + PaddedSize (size);
-}
-
-
-/*
-  Slightly different as this takes a pointer to the start of the caller
-  requested region and returns a pointer to the start of the buffer.
-  */
-char * wxDebugContext::StartPos (const char * caller)
-{
-    return ((char *) (caller - wxDebugContext::PaddedSize (sizeof(wxMarkerType)) -
-            wxDebugContext::PaddedSize (sizeof (wxMemStruct))));
-}
-
-/*
-  We may need padding between various parts of the allocated memory.
-  Given a size of memory, this returns the amount of memory which should
-  be allocated in order to allow for alignment of the following object.
-
-  I don't know how portable this stuff is, but it seems to work for me at
-  the moment. It would be real nice if I knew more about this!
-
-  // Note: this function is now obsolete (along with CalcAlignment)
-  // because the calculations are done statically, for greater speed.
-*/
-size_t wxDebugContext::GetPadding (const size_t size)
-{
-    size_t pad = size % CalcAlignment ();
-    return (pad) ? sizeof(wxMarkerType) - pad : 0;
-}
-
-size_t wxDebugContext::PaddedSize (const size_t size)
-{
-    // Added by Terry Farnham <TJRT@pacbell.net> to replace
-    // slow GetPadding call.
-    int padb;
-
-    padb = size & m_balignmask;
-    if(padb)
-        return(size + m_balign - padb);
-    else
-        return(size);
-}
-
-/*
-  Returns the total amount of memory which we need to get from the system
-  in order to satisfy a caller request. This includes space for the struct
-  plus markers and the caller's memory as well.
-*/
-size_t wxDebugContext::TotSize (const size_t reqSize)
-{
-    return (PaddedSize (sizeof (wxMemStruct)) + PaddedSize (reqSize) +
-            2 * sizeof(wxMarkerType));
-}
-
-
-/*
-  Traverse the list of nodes executing the given function on each node.
-*/
-void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
-{
-  if (!from)
-    from = wxDebugContext::GetHead ();
-
-  wxMemStruct * st = NULL;
-  for (st = from; st != 0; st = st->m_next)
-  {
-      void* data = st->GetActualData();
-//      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
-      if (data != (void*) wxLog::GetActiveTarget())
-      {
-        (st->*func) ();
-      }
-  }
-}
-
-
-/*
-  Print out the list.
-  */
-bool wxDebugContext::PrintList (void)
-{
-  TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : NULL));
-
-  return true;
-}
-
-bool wxDebugContext::Dump(void)
-{
-  {
-    const wxChar* appName = wxT("application");
-    wxString appNameStr;
-    if (wxTheApp)
-    {
-        appNameStr = wxTheApp->GetAppName();
-        appName = appNameStr.c_str();
-        OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, static_cast<const wxChar *>(wxNow().c_str()));
-    }
-    else
-    {
-      OutputDumpLine( wxT("----- Memory dump -----") );
-    }
-  }
-
-  TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : NULL));
-
-  OutputDumpLine(wxEmptyString);
-  OutputDumpLine(wxEmptyString);
-
-  return true;
-}
-
-struct wxDebugStatsStruct
-{
-  long instanceCount;
-  long totalSize;
-  wxChar *instanceClass;
-  wxDebugStatsStruct *next;
-};
-
-static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, wxChar *name)
-{
-  while (st)
-  {
-    if (wxStrcmp(st->instanceClass, name) == 0)
-      return st;
-    st = st->next;
-  }
-  return NULL;
-}
-
-static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugStatsStruct *st)
-{
-  st->next = head;
-  return st;
-}
-
-bool wxDebugContext::PrintStatistics(bool detailed)
-{
-  {
-    const wxChar* appName = wxT("application");
-    wxString appNameStr;
-    if (wxTheApp)
-    {
-        appNameStr = wxTheApp->GetAppName();
-        appName = appNameStr.c_str();
-        OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, static_cast<const wxChar *>(wxNow().c_str()));
-    }
-    else
-    {
-      OutputDumpLine( wxT("----- Memory statistics -----") );
-    }
-  }
-
-  bool currentMode = GetDebugMode();
-  SetDebugMode(false);
-
-  long noNonObjectNodes = 0;
-  long noObjectNodes = 0;
-  long totalSize = 0;
-
-  wxDebugStatsStruct *list = NULL;
-
-  wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL );
-  if (!from)
-    from = wxDebugContext::GetHead ();
-
-  wxMemStruct *st;
-  for (st = from; st != 0; st = st->m_next)
-  {
-    void* data = st->GetActualData();
-    if (detailed && (data != (void*) wxLog::GetActiveTarget()))
-    {
-      wxChar *className = (wxChar*) wxT("nonobject");
-      if (st->m_isObject && st->GetActualData())
-      {
-        wxObject *obj = (wxObject *)st->GetActualData();
-        if (obj->GetClassInfo()->GetClassName())
-          className = (wxChar*)obj->GetClassInfo()->GetClassName();
-      }
-      wxDebugStatsStruct *stats = FindStatsStruct(list, className);
-      if (!stats)
-      {
-        stats = (wxDebugStatsStruct *)malloc(sizeof(wxDebugStatsStruct));
-        stats->instanceClass = className;
-        stats->instanceCount = 0;
-        stats->totalSize = 0;
-        list = InsertStatsStruct(list, stats);
-      }
-      stats->instanceCount ++;
-      stats->totalSize += st->RequestSize();
-    }
-
-    if (data != (void*) wxLog::GetActiveTarget())
-    {
-        totalSize += st->RequestSize();
-        if (st->m_isObject)
-            noObjectNodes ++;
-        else
-            noNonObjectNodes ++;
-    }
-  }
-
-  if (detailed)
-  {
-    while (list)
-    {
-      OutputDumpLine(wxT("%ld objects of class %s, total size %ld"),
-          list->instanceCount, list->instanceClass, list->totalSize);
-      wxDebugStatsStruct *old = list;
-      list = old->next;
-      free((char *)old);
-    }
-    OutputDumpLine(wxEmptyString);
-  }
-
-  SetDebugMode(currentMode);
-
-  OutputDumpLine(wxT("Number of object items: %ld"), noObjectNodes);
-  OutputDumpLine(wxT("Number of non-object items: %ld"), noNonObjectNodes);
-  OutputDumpLine(wxT("Total allocated size: %ld"), totalSize);
-  OutputDumpLine(wxEmptyString);
-  OutputDumpLine(wxEmptyString);
-
-  return true;
-}
-
-bool wxDebugContext::PrintClasses(void)
-{
-  {
-    const wxChar* appName = wxT("application");
-    wxString appNameStr;
-    if (wxTheApp)
-    {
-        appNameStr = wxTheApp->GetAppName();
-        appName = appNameStr.c_str();
-        wxLogMessage(wxT("----- Classes in %s -----"), appName);
-    }
-  }
-
-  int n = 0;
-  const wxClassInfo *info;
-
-  for (wxClassInfo::const_iterator node = wxClassInfo::begin_classinfo(),
-                                    end = wxClassInfo::end_classinfo();
-       node != end; ++node)
-  {
-    info = *node;
-    if (info->GetClassName())
-    {
-        wxString msg(info->GetClassName());
-        msg += wxT(" ");
-
-        if (info->GetBaseClassName1() && !info->GetBaseClassName2())
-        {
-            msg += wxT("is a ");
-            msg += info->GetBaseClassName1();
-        }
-        else if (info->GetBaseClassName1() && info->GetBaseClassName2())
-        {
-            msg += wxT("is a ");
-            msg += info->GetBaseClassName1() ;
-            msg += wxT(", ");
-            msg += info->GetBaseClassName2() ;
-        }
-        if (info->GetConstructor())
-            msg += wxT(": dynamic");
-
-        wxLogMessage(msg);
-    }
-    n ++;
-  }
-  wxLogMessage(wxEmptyString);
-  wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
-  wxLogMessage(wxEmptyString);
-  wxLogMessage(wxEmptyString);
-  return true;
-}
-
-void wxDebugContext::SetCheckpoint(bool all)
-{
-  if (all)
-    checkPoint = NULL;
-  else
-    checkPoint = m_tail;
-}
-
-// Checks all nodes since checkpoint, or since start.
-int wxDebugContext::Check(bool checkAll)
-{
-  int nFailures = 0;
-
-  wxMemStruct *from = (checkPoint ? checkPoint->m_next : NULL );
-  if (!from || checkAll)
-    from = wxDebugContext::GetHead ();
-
-  for (wxMemStruct * st = from; st != 0; st = st->m_next)
-  {
-    if (st->AssertIt ())
-      nFailures += st->CheckBlock ();
-    else
-      return -1;
-  }
-
-  return nFailures;
-}
-
-// Count the number of non-wxDebugContext-related objects
-// that are outstanding
-int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
-{
-  int n = 0;
-
-  wxMemStruct *from = NULL;
-  if (sinceCheckpoint && checkPoint)
-    from = checkPoint->m_next;
-  else
-    from = wxDebugContext::GetHead () ;
-
-  for (wxMemStruct * st = from; st != 0; st = st->m_next)
-  {
-      void* data = st->GetActualData();
-      if (data != (void*) wxLog::GetActiveTarget())
-          n ++;
-  }
-
-  return n ;
-}
-
-// This function is used to output the dump
-void wxDebugContext::OutputDumpLine(const wxChar *szFormat, ...)
-{
-    // a buffer of 2048 bytes should be long enough for a file name
-    // and a class name
-    wxChar buf[2048];
-    int count;
-    va_list argptr;
-    va_start(argptr, szFormat);
-    buf[WXSIZEOF(buf)-1] = wxT('\0');
-
-    // keep 3 bytes for a \r\n\0
-    count = wxVsnprintf(buf, WXSIZEOF(buf)-3, szFormat, argptr);
-
-    if ( count < 0 )
-        count = WXSIZEOF(buf)-3;
-    buf[count]=wxT('\r');
-    buf[count+1]=wxT('\n');
-    buf[count+2]=wxT('\0');
-
-    wxMessageOutputDebug dbgout;
-    dbgout.Printf(buf);
-}
-
-void wxDebugContext::SetShutdownNotifyFunction(wxShutdownNotifyFunction shutdownFn)
-{
-    sm_shutdownFn = shutdownFn;
-}
-
-
-#if USE_THREADSAFE_MEMORY_ALLOCATION
-static bool memSectionOk = false;
-
-class MemoryCriticalSection : public wxCriticalSection
-{
-public:
-    MemoryCriticalSection() {
-        memSectionOk = true;
-    }
-    ~MemoryCriticalSection() {
-        memSectionOk = false;
-    }
-};
-
-class MemoryCriticalSectionLocker
-{
-public:
-    inline MemoryCriticalSectionLocker(wxCriticalSection& critsect)
-    : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); }
-    inline ~MemoryCriticalSectionLocker() { if(m_locked) m_critsect.Leave(); }
-
-private:
-    // no assignment operator nor copy ctor
-    MemoryCriticalSectionLocker(const MemoryCriticalSectionLocker&);
-    MemoryCriticalSectionLocker& operator=(const MemoryCriticalSectionLocker&);
-
-    wxCriticalSection& m_critsect;
-    bool m_locked;
-};
-
-static MemoryCriticalSection memLocker;
-
-#endif // USE_THREADSAFE_MEMORY_ALLOCATION
-
-
-#if !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
-#if wxUSE_GLOBAL_MEMORY_OPERATORS
-void * operator new (size_t size, wxChar * fileName, int lineNum)
-{
-    return wxDebugAlloc(size, fileName, lineNum, false, false);
-}
-
-void * operator new (size_t size)
-{
-    return wxDebugAlloc(size, NULL, 0, false);
-}
-
-void operator delete (void * buf)
-{
-    wxDebugFree(buf, false);
-}
-
-#if wxUSE_ARRAY_MEMORY_OPERATORS
-void * operator new[] (size_t size)
-{
-    return wxDebugAlloc(size, NULL, 0, false, true);
-}
-
-void * operator new[] (size_t size, wxChar * fileName, int lineNum)
-{
-    return wxDebugAlloc(size, fileName, lineNum, false, true);
-}
-
-void operator delete[] (void * buf)
-{
-  wxDebugFree(buf, true);
-}
-#endif // wxUSE_ARRAY_MEMORY_OPERATORS
-#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
-#endif // !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
-
-// TODO: store whether this is a vector or not.
-void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
-{
-#if USE_THREADSAFE_MEMORY_ALLOCATION
-  MemoryCriticalSectionLocker lock(memLocker);
-#endif
-
-  // If not in debugging allocation mode, do the normal thing
-  // so we don't leave any trace of ourselves in the node list.
-
-#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
-// VA 3.0 still has trouble in here
-  return (void *)malloc(size);
-#endif
-  if (!wxDebugContext::GetDebugMode())
-  {
-    return (void *)malloc(size);
-  }
-
-    int totSize = wxDebugContext::TotSize (size);
-    char * buf = (char *) malloc(totSize);
-    if (!buf) {
-        wxLogMessage(wxT("Call to malloc (%ld) failed."), (long)size);
-        return 0;
-    }
-    wxMemStruct * st = (wxMemStruct *)buf;
-    st->m_firstMarker = MemStartCheck;
-    st->m_reqSize = size;
-    st->m_fileName = fileName;
-    st->m_lineNum = lineNum;
-    st->m_id = MemStructId;
-    st->m_prev = 0;
-    st->m_next = 0;
-    st->m_isObject = isObject;
-
-    // Errors from Append() shouldn't really happen - but just in case!
-    if (st->Append () == 0) {
-        st->ErrorMsg ("Trying to append new node");
-    }
-
-    if (wxDebugContext::GetCheckPrevious ()) {
-        if (st->CheckAllPrevious () < 0) {
-            st->ErrorMsg ("Checking previous nodes");
-        }
-    }
-
-    // Set up the extra markers at the middle and end.
-    char * ptr = wxDebugContext::MidMarkerPos (buf);
-    * (wxMarkerType *) ptr = MemMidCheck;
-    ptr = wxDebugContext::EndMarkerPos (buf, size);
-    * (wxMarkerType *) ptr = MemEndCheck;
-
-    // pointer returned points to the start of the caller's
-    // usable area.
-    void *m_actualData = (void *) wxDebugContext::CallerMemPos (buf);
-    st->m_actualData = m_actualData;
-
-    return m_actualData;
-}
-
-// TODO: check whether was allocated as a vector
-void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
-{
-#if USE_THREADSAFE_MEMORY_ALLOCATION
-  MemoryCriticalSectionLocker lock(memLocker);
-#endif
-
-  if (!buf)
-    return;
-
-#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
-// VA 3.0 still has trouble in here
-  free((char *)buf);
-#endif
-  // If not in debugging allocation mode, do the normal thing
-  // so we don't leave any trace of ourselves in the node list.
-  if (!wxDebugContext::GetDebugMode())
-  {
-    free((char *)buf);
-    return;
-  }
-
-    // Points to the start of the entire allocated area.
-    char * startPointer = wxDebugContext::StartPos ((char *) buf);
-    // Find the struct and make sure that it's identifiable.
-    wxMemStruct * st = (wxMemStruct *) wxDebugContext::StructPos (startPointer);
-
-    if (! st->ValidateNode ())
-        return;
-
-    // If this is the current checkpoint, we need to
-    // move the checkpoint back so it points to a valid
-    // node.
-    if (st == wxDebugContext::checkPoint)
-      wxDebugContext::checkPoint = wxDebugContext::checkPoint->m_prev;
-
-    if (! st->Unlink ())
-    {
-      st->ErrorMsg ("Unlinking deleted node");
-    }
-
-    // Now put in the fill char into the id slot and the caller requested
-    // memory locations.
-    st->SetDeleted ();
-    (void) memset (wxDebugContext::CallerMemPos (startPointer), MemFillChar,
-                   st->RequestSize ());
-
-    free((char *)st);
-}
-
-// Trace: send output to the current debugging stream
-void wxTrace(const wxChar * ...)
-{
-#if 1
-    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
-#else
-    va_list ap;
-  static wxChar buffer[512];
-
-  va_start(ap, fmt);
-
-#ifdef __WINDOWS__
-  wvsprintf(buffer,fmt,ap) ;
-#else
-  vsprintf(buffer,fmt,ap) ;
-#endif
-
-  va_end(ap);
-
-  if (wxDebugContext::HasStream())
-  {
-    wxDebugContext::GetStream() << buffer;
-    wxDebugContext::GetStream().flush();
-  }
-  else
-#ifdef __WINDOWS__
-#ifdef __WIN32__
-    OutputDebugString((LPCTSTR)buffer) ;
-#else
-    OutputDebugString((const char*) buffer) ;
-#endif
-#else
-    fprintf(stderr, buffer);
-#endif
-#endif
-}
-
-// Trace with level
-void wxTraceLevel(int, const wxChar * ...)
-{
-#if 1
-    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
-#else
-  if (wxDebugContext::GetLevel() < level)
-    return;
-
-  va_list ap;
-  static wxChar buffer[512];
-
-  va_start(ap, fmt);
-
-#ifdef __WINDOWS__
-  wxWvsprintf(buffer,fmt,ap) ;
-#else
-  vsprintf(buffer,fmt,ap) ;
-#endif
-
-  va_end(ap);
-
-  if (wxDebugContext::HasStream())
-  {
-    wxDebugContext::GetStream() << buffer;
-    wxDebugContext::GetStream().flush();
-  }
-  else
-#ifdef __WINDOWS__
-#ifdef __WIN32__
-    OutputDebugString((LPCTSTR)buffer) ;
-#else
-    OutputDebugString((const char*) buffer) ;
-#endif
-#else
-    fprintf(stderr, buffer);
-#endif
-#endif
-}
-
-//----------------------------------------------------------------------------
-// Final cleanup after all global objects in all files have been destroyed
-//----------------------------------------------------------------------------
-
-// Don't set it to 0 by dynamic initialization
-// Some compilers will really do the assignment later
-// All global variables are initialized to 0 at the very beginning, and this is just fine.
-int wxDebugContextDumpDelayCounter::sm_count;
-
-wxDebugContextDumpDelayCounter::wxDebugContextDumpDelayCounter()
-{
-    sm_count++;
-}
-
-wxDebugContextDumpDelayCounter::~wxDebugContextDumpDelayCounter()
-{
-    if ( !--sm_count )
-    {
-        // Notify app if we've been asked to do that
-        if( wxDebugContext::sm_shutdownFn )
-            wxDebugContext::sm_shutdownFn();
-        DoDump();
-    }
-}
-
-void wxDebugContextDumpDelayCounter::DoDump()
-{
-    if (wxDebugContext::CountObjectsLeft(true) > 0)
-    {
-        wxDebugContext::OutputDumpLine(wxT("There were memory leaks.\n"));
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-}
-
-// Even if there is nothing else, make sure that there is at
-// least one cleanup counter object
-static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
-
-#endif // wxUSE_MEMORY_TRACING || wxUSE_DEBUG_CONTEXT
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/memory.cpp
+// Purpose:     Memory checking implementation
+// Author:      Arthur Seaton, Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: memory.cpp 41054 2006-09-07 19:01:45Z ABX $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+
+#include "wx/memory.h"
+
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/hash.h"
+    #include "wx/log.h"
+#endif
+
+#if wxUSE_THREADS
+    #include "wx/thread.h"
+#endif
+
+#include <stdlib.h>
+
+#include "wx/ioswrap.h"
+
+#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
+     && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
+#include <memory.h>
+#endif
+
+#include <stdarg.h>
+#include <string.h>
+
+#if wxUSE_THREADS && defined(__WXDEBUG__)
+#define USE_THREADSAFE_MEMORY_ALLOCATION 1
+#else
+#define USE_THREADSAFE_MEMORY_ALLOCATION 0
+#endif
+
+
+#ifdef new
+#undef new
+#endif
+
+// wxDebugContext wxTheDebugContext;
+/*
+  Redefine new and delete so that we can pick up situations where:
+        - we overwrite or underwrite areas of malloc'd memory.
+        - we use uninitialise variables
+  Only do this in debug mode.
+
+  We change new to get enough memory to allocate a struct, followed
+  by the caller's requested memory, followed by a tag. The struct
+  is used to create a doubly linked list of these areas and also
+  contains another tag. The tags are used to determine when the area
+  has been over/under written.
+*/
+
+
+/*
+  Values which are used to set the markers which will be tested for
+  under/over write. There are 3 of these, one in the struct, one
+  immediately after the struct but before the caller requested memory and
+  one immediately after the requested memory.
+*/
+#define MemStartCheck  0x23A8
+#define MemMidCheck  0xA328
+#define MemEndCheck 0x8A32
+#define MemFillChar 0xAF
+#define MemStructId  0x666D
+
+/*
+  External interface for the wxMemStruct class. Others are
+  defined inline within the class def. Here we only need to be able
+  to add and delete nodes from the list and handle errors in some way.
+*/
+
+/*
+  Used for internal "this shouldn't happen" type of errors.
+*/
+void wxMemStruct::ErrorMsg (const char * mesg)
+{
+  wxLogMessage(wxT("wxWidgets memory checking error: %s"), mesg);
+  PrintNode ();
+}
+
+/*
+  Used when we find an overwrite or an underwrite error.
+*/
+void wxMemStruct::ErrorMsg ()
+{
+  wxLogMessage(wxT("wxWidgets over/underwrite memory error:"));
+  PrintNode ();
+}
+
+
+/*
+  We want to find out if pointers have been overwritten as soon as is
+  possible, so test everything before we dereference it. Of course it's still
+  quite possible that, if things have been overwritten, this function will
+  fall over, but the only way of dealing with that would cost too much in terms
+  of time.
+*/
+int wxMemStruct::AssertList ()
+{
+    if (wxDebugContext::GetHead () != 0 && ! (wxDebugContext::GetHead ())->AssertIt () ||
+        wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
+        ErrorMsg ("Head or tail pointers trashed");
+        return 0;
+    }
+    return 1;
+}
+
+
+/*
+  Check that the thing we're pointing to has the correct id for a wxMemStruct
+  object and also that it's previous and next pointers are pointing at objects
+  which have valid ids.
+  This is definitely not perfect since we could fall over just trying to access
+  any of the slots which we use here, but I think it's about the best that I
+  can do without doing something like taking all new wxMemStruct pointers and
+  comparing them against all known pointer within the list and then only
+  doing this sort of check _after_ you've found the pointer in the list. That
+  would be safer, but also much more time consuming.
+*/
+int wxMemStruct::AssertIt ()
+{
+    return (m_id == MemStructId &&
+            (m_prev == 0 || m_prev->m_id == MemStructId) &&
+            (m_next == 0 || m_next->m_id == MemStructId));
+}
+
+
+/*
+  Additions are always at the tail of the list.
+  Returns 0 on error, non-zero on success.
+*/
+int wxMemStruct::Append ()
+{
+    if (! AssertList ())
+        return 0;
+
+    if (wxDebugContext::GetHead () == 0) {
+        if (wxDebugContext::GetTail () != 0) {
+            ErrorMsg ("Null list should have a null tail pointer");
+            return 0;
+        }
+        (void) wxDebugContext::SetHead (this);
+        (void) wxDebugContext::SetTail (this);
+    } else {
+        wxDebugContext::GetTail ()->m_next = this;
+        this->m_prev = wxDebugContext::GetTail ();
+        (void) wxDebugContext::SetTail (this);
+    }
+    return 1;
+}
+
+
+/*
+  Don't actually free up anything here as the space which is used
+  by the node will be free'd up when the whole block is free'd.
+  Returns 0 on error, non-zero on success.
+*/
+int wxMemStruct::Unlink ()
+{
+    if (! AssertList ())
+        return 0;
+
+    if (wxDebugContext::GetHead () == 0 || wxDebugContext::GetTail () == 0) {
+        ErrorMsg ("Trying to remove node from empty list");
+        return 0;
+    }
+
+    // Handle the part of the list before this node.
+    if (m_prev == 0) {
+        if (this != wxDebugContext::GetHead ()) {
+            ErrorMsg ("No previous node for non-head node");
+            return 0;
+        }
+        (void) wxDebugContext::SetHead (m_next);
+    } else {
+        if (! m_prev->AssertIt ()) {
+            ErrorMsg ("Trashed previous pointer");
+            return 0;
+        }
+
+        if (m_prev->m_next != this) {
+            ErrorMsg ("List is inconsistent");
+            return 0;
+        }
+        m_prev->m_next = m_next;
+    }
+
+    // Handle the part of the list after this node.
+    if (m_next == 0) {
+        if (this != wxDebugContext::GetTail ()) {
+            ErrorMsg ("No next node for non-tail node");
+            return 0;
+        }
+        (void) wxDebugContext::SetTail (m_prev);
+    } else {
+        if (! m_next->AssertIt ()) {
+            ErrorMsg ("Trashed next pointer");
+            return 0;
+        }
+
+        if (m_next->m_prev != this) {
+            ErrorMsg ("List is inconsistent");
+            return 0;
+        }
+        m_next->m_prev = m_prev;
+    }
+
+    return 1;
+}
+
+
+
+/*
+  Checks a node and block of memory to see that the markers are still
+  intact.
+*/
+int wxMemStruct::CheckBlock ()
+{
+    int nFailures = 0;
+
+    if (m_firstMarker != MemStartCheck) {
+        nFailures++;
+        ErrorMsg ();
+    }
+
+    char * pointer = wxDebugContext::MidMarkerPos ((char *) this);
+    if (* (wxMarkerType *) pointer != MemMidCheck) {
+        nFailures++;
+        ErrorMsg ();
+    }
+
+    pointer = wxDebugContext::EndMarkerPos ((char *) this, RequestSize ());
+    if (* (wxMarkerType *) pointer != MemEndCheck) {
+        nFailures++;
+        ErrorMsg ();
+    }
+
+    return nFailures;
+}
+
+
+/*
+  Check the list of nodes to see if they are all ok.
+*/
+int wxMemStruct::CheckAllPrevious ()
+{
+    int nFailures = 0;
+
+    for (wxMemStruct * st = this->m_prev; st != 0; st = st->m_prev) {
+        if (st->AssertIt ())
+            nFailures += st->CheckBlock ();
+        else
+            return -1;
+    }
+
+    return nFailures;
+}
+
+
+/*
+  When we delete a node we set the id slot to a specific value and then test
+  against this to see if a nodes have been deleted previously. I don't
+  just set the entire memory to the fillChar because then I'd be overwriting
+  useful stuff like the vtbl which may be needed to output the error message
+  including the file name and line numbers. Without this info the whole point
+  of this class is lost!
+*/
+void wxMemStruct::SetDeleted ()
+{
+    m_id = MemFillChar;
+}
+
+int wxMemStruct::IsDeleted ()
+{
+    return (m_id == MemFillChar);
+}
+
+
+/*
+  Print out a single node. There are many far better ways of doing this
+  but this will suffice for now.
+*/
+void wxMemStruct::PrintNode ()
+{
+  if (m_isObject)
+  {
+    wxObject *obj = (wxObject *)m_actualData;
+    wxClassInfo *info = obj->GetClassInfo();
+
+    // Let's put this in standard form so IDEs can load the file at the appropriate
+    // line
+    wxString msg;
+
+    if (m_fileName)
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+
+    if (info && info->GetClassName())
+      msg += info->GetClassName();
+    else
+      msg += wxT("object");
+
+    wxString msg2;
+    msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+    msg += msg2;
+
+    wxLogMessage(msg);
+  }
+  else
+  {
+    wxString msg;
+
+    if (m_fileName)
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+    msg += wxT("non-object data");
+    wxString msg2;
+    msg2.Printf(wxT(" at 0x%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
+    msg += msg2;
+
+    wxLogMessage(msg);
+  }
+}
+
+void wxMemStruct::Dump ()
+{
+  if (!ValidateNode()) return;
+
+  if (m_isObject)
+  {
+    wxObject *obj = (wxObject *)m_actualData;
+
+    wxString msg;
+    if (m_fileName)
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+
+
+    /* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it.
+     * Instead, do what wxObject::Dump does.
+     * What should we do long-term, eliminate Dumping? Or specify
+     * that MyClass::Dump should use wxLogDebug? Ugh.
+    obj->Dump(wxDebugContext::GetStream());
+     */
+
+    if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
+      msg += obj->GetClassInfo()->GetClassName();
+    else
+      msg += wxT("unknown object class");
+
+    wxString msg2;
+    msg2.Printf(wxT(" at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize());
+    msg += msg2;
+
+    wxDebugContext::OutputDumpLine(msg);
+  }
+  else
+  {
+    wxString msg;
+    if (m_fileName)
+      msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+
+    wxString msg2;
+    msg2.Printf(wxT("non-object data at 0x%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
+    msg += msg2;
+    wxDebugContext::OutputDumpLine(msg);
+  }
+}
+
+
+/*
+  Validate a node. Check to see that the node is "clean" in the sense
+  that nothing has over/underwritten it etc.
+*/
+int wxMemStruct::ValidateNode ()
+{
+    char * startPointer = (char *) this;
+    if (!AssertIt ()) {
+        if (IsDeleted ())
+            ErrorMsg ("Object already deleted");
+        else {
+            // Can't use the error routines as we have no recognisable object.
+#ifndef __WXGTK__
+             wxLogMessage(wxT("Can't verify memory struct - all bets are off!"));
+#endif
+        }
+        return 0;
+    }
+
+/*
+    int i;
+    for (i = 0; i < wxDebugContext::TotSize (requestSize ()); i++)
+      cout << startPointer [i];
+    cout << endl;
+*/
+    if (Marker () != MemStartCheck)
+      ErrorMsg ();
+    if (* (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer) != MemMidCheck)
+      ErrorMsg ();
+    if (* (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
+                                              RequestSize ()) !=
+        MemEndCheck)
+      ErrorMsg ();
+
+    // Back to before the extra buffer and check that
+    // we can still read what we originally wrote.
+    if (Marker () != MemStartCheck ||
+        * (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer)
+                         != MemMidCheck ||
+        * (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
+                                              RequestSize ()) != MemEndCheck)
+    {
+        ErrorMsg ();
+        return 0;
+    }
+
+    return 1;
+}
+
+/*
+  The wxDebugContext class.
+*/
+
+wxMemStruct *wxDebugContext::m_head = NULL;
+wxMemStruct *wxDebugContext::m_tail = NULL;
+
+bool wxDebugContext::m_checkPrevious = false;
+int wxDebugContext::debugLevel = 1;
+bool wxDebugContext::debugOn = true;
+wxMemStruct *wxDebugContext::checkPoint = NULL;
+
+// For faster alignment calculation
+static wxMarkerType markerCalc[2];
+int wxDebugContext::m_balign = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]);
+int wxDebugContext::m_balignmask = (int)((char *)&markerCalc[1] - (char*)&markerCalc[0]) - 1;
+
+wxDebugContext::wxDebugContext(void)
+{
+}
+
+wxDebugContext::~wxDebugContext(void)
+{
+}
+
+/*
+  Work out the positions of the markers by creating an array of 2 markers
+  and comparing the addresses of the 2 elements. Use this number as the
+  alignment for markers.
+*/
+size_t wxDebugContext::CalcAlignment ()
+{
+    wxMarkerType ar[2];
+    return (char *) &ar[1] - (char *) &ar[0];
+}
+
+
+char * wxDebugContext::StructPos (const char * buf)
+{
+    return (char *) buf;
+}
+
+char * wxDebugContext::MidMarkerPos (const char * buf)
+{
+    return StructPos (buf) + PaddedSize (sizeof (wxMemStruct));
+}
+
+char * wxDebugContext::CallerMemPos (const char * buf)
+{
+    return MidMarkerPos (buf) + PaddedSize (sizeof(wxMarkerType));
+}
+
+
+char * wxDebugContext::EndMarkerPos (const char * buf, const size_t size)
+{
+    return CallerMemPos (buf) + PaddedSize (size);
+}
+
+
+/*
+  Slightly different as this takes a pointer to the start of the caller
+  requested region and returns a pointer to the start of the buffer.
+  */
+char * wxDebugContext::StartPos (const char * caller)
+{
+    return ((char *) (caller - wxDebugContext::PaddedSize (sizeof(wxMarkerType)) -
+            wxDebugContext::PaddedSize (sizeof (wxMemStruct))));
+}
+
+/*
+  We may need padding between various parts of the allocated memory.
+  Given a size of memory, this returns the amount of memory which should
+  be allocated in order to allow for alignment of the following object.
+
+  I don't know how portable this stuff is, but it seems to work for me at
+  the moment. It would be real nice if I knew more about this!
+
+  // Note: this function is now obsolete (along with CalcAlignment)
+  // because the calculations are done statically, for greater speed.
+*/
+size_t wxDebugContext::GetPadding (const size_t size)
+{
+    size_t pad = size % CalcAlignment ();
+    return (pad) ? sizeof(wxMarkerType) - pad : 0;
+}
+
+size_t wxDebugContext::PaddedSize (const size_t size)
+{
+    // Added by Terry Farnham <TJRT@pacbell.net> to replace
+    // slow GetPadding call.
+    int padb;
+
+    padb = size & m_balignmask;
+    if(padb)
+        return(size + m_balign - padb);
+    else
+        return(size);
+}
+
+/*
+  Returns the total amount of memory which we need to get from the system
+  in order to satisfy a caller request. This includes space for the struct
+  plus markers and the caller's memory as well.
+*/
+size_t wxDebugContext::TotSize (const size_t reqSize)
+{
+    return (PaddedSize (sizeof (wxMemStruct)) + PaddedSize (reqSize) +
+            2 * sizeof(wxMarkerType));
+}
+
+
+/*
+  Traverse the list of nodes executing the given function on each node.
+*/
+void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
+{
+  if (!from)
+    from = wxDebugContext::GetHead ();
+
+  wxMemStruct * st = NULL;
+  for (st = from; st != 0; st = st->m_next)
+  {
+      void* data = st->GetActualData();
+//      if ((data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
+      if (data != (void*) wxLog::GetActiveTarget())
+      {
+        (st->*func) ();
+      }
+  }
+}
+
+
+/*
+  Print out the list.
+  */
+bool wxDebugContext::PrintList (void)
+{
+#ifdef __WXDEBUG__
+  TraverseList ((PmSFV)&wxMemStruct::PrintNode, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
+
+  return true;
+#else
+  return false;
+#endif
+}
+
+bool wxDebugContext::Dump(void)
+{
+#ifdef __WXDEBUG__
+  {
+    wxChar* appName = (wxChar*) wxT("application");
+    wxString appNameStr;
+    if (wxTheApp)
+    {
+        appNameStr = wxTheApp->GetAppName();
+        appName = WXSTRINGCAST appNameStr;
+        OutputDumpLine(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+    }
+    else
+    {
+      OutputDumpLine( wxT("----- Memory dump -----") );
+    }
+  }
+
+  TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
+
+  OutputDumpLine(wxEmptyString);
+  OutputDumpLine(wxEmptyString);
+
+  return true;
+#else
+  return false;
+#endif
+}
+
+#ifdef __WXDEBUG__
+struct wxDebugStatsStruct
+{
+  long instanceCount;
+  long totalSize;
+  wxChar *instanceClass;
+  wxDebugStatsStruct *next;
+};
+
+static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, wxChar *name)
+{
+  while (st)
+  {
+    if (wxStrcmp(st->instanceClass, name) == 0)
+      return st;
+    st = st->next;
+  }
+  return NULL;
+}
+
+static wxDebugStatsStruct *InsertStatsStruct(wxDebugStatsStruct *head, wxDebugStatsStruct *st)
+{
+  st->next = head;
+  return st;
+}
+#endif
+
+bool wxDebugContext::PrintStatistics(bool detailed)
+{
+#ifdef __WXDEBUG__
+  {
+    wxChar* appName = (wxChar*) wxT("application");
+    wxString appNameStr;
+    if (wxTheApp)
+    {
+        appNameStr = wxTheApp->GetAppName();
+        appName = WXSTRINGCAST appNameStr;
+        OutputDumpLine(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
+    }
+    else
+    {
+      OutputDumpLine( wxT("----- Memory statistics -----") );
+    }
+  }
+
+  bool currentMode = GetDebugMode();
+  SetDebugMode(false);
+
+  long noNonObjectNodes = 0;
+  long noObjectNodes = 0;
+  long totalSize = 0;
+
+  wxDebugStatsStruct *list = NULL;
+
+  wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
+  if (!from)
+    from = wxDebugContext::GetHead ();
+
+  wxMemStruct *st;
+  for (st = from; st != 0; st = st->m_next)
+  {
+    void* data = st->GetActualData();
+    if (detailed && (data != (void*) wxLog::GetActiveTarget()))
+    {
+      wxChar *className = (wxChar*) wxT("nonobject");
+      if (st->m_isObject && st->GetActualData())
+      {
+        wxObject *obj = (wxObject *)st->GetActualData();
+        if (obj->GetClassInfo()->GetClassName())
+          className = (wxChar*)obj->GetClassInfo()->GetClassName();
+      }
+      wxDebugStatsStruct *stats = FindStatsStruct(list, className);
+      if (!stats)
+      {
+        stats = (wxDebugStatsStruct *)malloc(sizeof(wxDebugStatsStruct));
+        stats->instanceClass = className;
+        stats->instanceCount = 0;
+        stats->totalSize = 0;
+        list = InsertStatsStruct(list, stats);
+      }
+      stats->instanceCount ++;
+      stats->totalSize += st->RequestSize();
+    }
+
+    if (data != (void*) wxLog::GetActiveTarget())
+    {
+        totalSize += st->RequestSize();
+        if (st->m_isObject)
+            noObjectNodes ++;
+        else
+            noNonObjectNodes ++;
+    }
+  }
+
+  if (detailed)
+  {
+    while (list)
+    {
+      OutputDumpLine(wxT("%ld objects of class %s, total size %ld"),
+          list->instanceCount, list->instanceClass, list->totalSize);
+      wxDebugStatsStruct *old = list;
+      list = old->next;
+      free((char *)old);
+    }
+    OutputDumpLine(wxEmptyString);
+  }
+
+  SetDebugMode(currentMode);
+
+  OutputDumpLine(wxT("Number of object items: %ld"), noObjectNodes);
+  OutputDumpLine(wxT("Number of non-object items: %ld"), noNonObjectNodes);
+  OutputDumpLine(wxT("Total allocated size: %ld"), totalSize);
+  OutputDumpLine(wxEmptyString);
+  OutputDumpLine(wxEmptyString);
+
+  return true;
+#else
+  (void)detailed;
+  return false;
+#endif
+}
+
+bool wxDebugContext::PrintClasses(void)
+{
+  {
+    wxChar* appName = (wxChar*) wxT("application");
+    wxString appNameStr;
+    if (wxTheApp)
+    {
+        appNameStr = wxTheApp->GetAppName();
+        appName = WXSTRINGCAST appNameStr;
+        wxLogMessage(wxT("----- Classes in %s -----"), appName);
+    }
+  }
+
+  int n = 0;
+  wxHashTable::compatibility_iterator node;
+  wxClassInfo *info;
+
+  wxClassInfo::sm_classTable->BeginFind();
+  node = wxClassInfo::sm_classTable->Next();
+  while (node)
+  {
+    info = (wxClassInfo *)node->GetData();
+    if (info->GetClassName())
+    {
+        wxString msg(info->GetClassName());
+        msg += wxT(" ");
+
+        if (info->GetBaseClassName1() && !info->GetBaseClassName2())
+        {
+            msg += wxT("is a ");
+            msg += info->GetBaseClassName1();
+        }
+        else if (info->GetBaseClassName1() && info->GetBaseClassName2())
+        {
+            msg += wxT("is a ");
+            msg += info->GetBaseClassName1() ;
+            msg += wxT(", ");
+            msg += info->GetBaseClassName2() ;
+        }
+        if (info->GetConstructor())
+            msg += wxT(": dynamic");
+
+        wxLogMessage(msg);
+    }
+    node = wxClassInfo::sm_classTable->Next();
+    n ++;
+  }
+  wxLogMessage(wxEmptyString);
+  wxLogMessage(wxT("There are %d classes derived from wxObject."), n);
+  wxLogMessage(wxEmptyString);
+  wxLogMessage(wxEmptyString);
+  return true;
+}
+
+void wxDebugContext::SetCheckpoint(bool all)
+{
+  if (all)
+    checkPoint = NULL;
+  else
+    checkPoint = m_tail;
+}
+
+// Checks all nodes since checkpoint, or since start.
+int wxDebugContext::Check(bool checkAll)
+{
+  int nFailures = 0;
+
+  wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
+  if (!from || checkAll)
+    from = wxDebugContext::GetHead ();
+
+  for (wxMemStruct * st = from; st != 0; st = st->m_next)
+  {
+    if (st->AssertIt ())
+      nFailures += st->CheckBlock ();
+    else
+      return -1;
+  }
+
+  return nFailures;
+}
+
+// Count the number of non-wxDebugContext-related objects
+// that are outstanding
+int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
+{
+  int n = 0;
+
+  wxMemStruct *from = NULL;
+  if (sinceCheckpoint && checkPoint)
+    from = checkPoint->m_next;
+  else
+    from = wxDebugContext::GetHead () ;
+
+  for (wxMemStruct * st = from; st != 0; st = st->m_next)
+  {
+      void* data = st->GetActualData();
+      if (data != (void*) wxLog::GetActiveTarget())
+          n ++;
+  }
+
+  return n ;
+}
+
+// This function is used to output the dump
+void wxDebugContext::OutputDumpLine(const wxChar *szFormat, ...)
+{
+    // a buffer of 2048 bytes should be long enough for a file name
+    // and a class name
+    wxChar buf[2048];
+    int count;
+    va_list argptr;
+    va_start(argptr, szFormat);
+    buf[sizeof(buf)/sizeof(wxChar)-1] = _T('\0');
+
+    // keep 3 bytes for a \r\n\0
+    count = wxVsnprintf(buf, sizeof(buf)/sizeof(wxChar)-3, szFormat, argptr);
+
+    if ( count < 0 )
+        count = sizeof(buf)/sizeof(wxChar)-3;
+    buf[count]=_T('\r');
+    buf[count+1]=_T('\n');
+    buf[count+2]=_T('\0');
+
+    wxMessageOutputDebug dbgout;
+    dbgout.Printf(buf);
+}
+
+
+#if USE_THREADSAFE_MEMORY_ALLOCATION
+static bool memSectionOk = false;
+
+class MemoryCriticalSection : public wxCriticalSection
+{
+public:
+    MemoryCriticalSection() {
+        memSectionOk = true;
+    }
+    ~MemoryCriticalSection() {
+        memSectionOk = false;
+    }
+};
+
+class MemoryCriticalSectionLocker
+{
+public:
+    inline MemoryCriticalSectionLocker(wxCriticalSection& critsect)
+    : m_critsect(critsect), m_locked(memSectionOk) { if(m_locked) m_critsect.Enter(); }
+    inline ~MemoryCriticalSectionLocker() { if(m_locked) m_critsect.Leave(); }
+
+private:
+    // no assignment operator nor copy ctor
+    MemoryCriticalSectionLocker(const MemoryCriticalSectionLocker&);
+    MemoryCriticalSectionLocker& operator=(const MemoryCriticalSectionLocker&);
+
+    wxCriticalSection& m_critsect;
+    bool m_locked;
+};
+
+static MemoryCriticalSection memLocker;
+
+#endif // USE_THREADSAFE_MEMORY_ALLOCATION
+
+
+#ifdef __WXDEBUG__
+#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#if wxUSE_GLOBAL_MEMORY_OPERATORS
+void * operator new (size_t size, wxChar * fileName, int lineNum)
+{
+    return wxDebugAlloc(size, fileName, lineNum, false, false);
+}
+
+void * operator new (size_t size)
+{
+    return wxDebugAlloc(size, NULL, 0, false);
+}
+
+void operator delete (void * buf)
+{
+    wxDebugFree(buf, false);
+}
+
+#if wxUSE_ARRAY_MEMORY_OPERATORS
+void * operator new[] (size_t size)
+{
+    return wxDebugAlloc(size, NULL, 0, false, true);
+}
+
+void * operator new[] (size_t size, wxChar * fileName, int lineNum)
+{
+    return wxDebugAlloc(size, fileName, lineNum, false, true);
+}
+
+void operator delete[] (void * buf)
+{
+  wxDebugFree(buf, true);
+}
+#endif // wxUSE_ARRAY_MEMORY_OPERATORS
+#endif // wxUSE_GLOBAL_MEMORY_OPERATORS
+#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+
+// TODO: store whether this is a vector or not.
+void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
+{
+#if USE_THREADSAFE_MEMORY_ALLOCATION
+  MemoryCriticalSectionLocker lock(memLocker);
+#endif
+
+  // If not in debugging allocation mode, do the normal thing
+  // so we don't leave any trace of ourselves in the node list.
+
+#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
+// VA 3.0 still has trouble in here
+  return (void *)malloc(size);
+#endif
+  if (!wxDebugContext::GetDebugMode())
+  {
+    return (void *)malloc(size);
+  }
+
+    int totSize = wxDebugContext::TotSize (size);
+    char * buf = (char *) malloc(totSize);
+    if (!buf) {
+        wxLogMessage(wxT("Call to malloc (%ld) failed."), (long)size);
+        return 0;
+    }
+    wxMemStruct * st = (wxMemStruct *)buf;
+    st->m_firstMarker = MemStartCheck;
+    st->m_reqSize = size;
+    st->m_fileName = fileName;
+    st->m_lineNum = lineNum;
+    st->m_id = MemStructId;
+    st->m_prev = 0;
+    st->m_next = 0;
+    st->m_isObject = isObject;
+
+    // Errors from Append() shouldn't really happen - but just in case!
+    if (st->Append () == 0) {
+        st->ErrorMsg ("Trying to append new node");
+    }
+
+    if (wxDebugContext::GetCheckPrevious ()) {
+        if (st->CheckAllPrevious () < 0) {
+            st->ErrorMsg ("Checking previous nodes");
+        }
+    }
+
+    // Set up the extra markers at the middle and end.
+    char * ptr = wxDebugContext::MidMarkerPos (buf);
+    * (wxMarkerType *) ptr = MemMidCheck;
+    ptr = wxDebugContext::EndMarkerPos (buf, size);
+    * (wxMarkerType *) ptr = MemEndCheck;
+
+    // pointer returned points to the start of the caller's
+    // usable area.
+    void *m_actualData = (void *) wxDebugContext::CallerMemPos (buf);
+    st->m_actualData = m_actualData;
+
+    return m_actualData;
+}
+
+// TODO: check whether was allocated as a vector
+void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
+{
+#if USE_THREADSAFE_MEMORY_ALLOCATION
+  MemoryCriticalSectionLocker lock(memLocker);
+#endif
+
+  if (!buf)
+    return;
+
+#if defined(__VISAGECPP__) && (__IBMCPP__ < 400 || __IBMC__ < 400 )
+// VA 3.0 still has trouble in here
+  free((char *)buf);
+#endif
+  // If not in debugging allocation mode, do the normal thing
+  // so we don't leave any trace of ourselves in the node list.
+  if (!wxDebugContext::GetDebugMode())
+  {
+    free((char *)buf);
+    return;
+  }
+
+    // Points to the start of the entire allocated area.
+    char * startPointer = wxDebugContext::StartPos ((char *) buf);
+    // Find the struct and make sure that it's identifiable.
+    wxMemStruct * st = (wxMemStruct *) wxDebugContext::StructPos (startPointer);
+
+    if (! st->ValidateNode ())
+        return;
+
+    // If this is the current checkpoint, we need to
+    // move the checkpoint back so it points to a valid
+    // node.
+    if (st == wxDebugContext::checkPoint)
+      wxDebugContext::checkPoint = wxDebugContext::checkPoint->m_prev;
+
+    if (! st->Unlink ())
+    {
+      st->ErrorMsg ("Unlinking deleted node");
+    }
+
+    // Now put in the fill char into the id slot and the caller requested
+    // memory locations.
+    st->SetDeleted ();
+    (void) memset (wxDebugContext::CallerMemPos (startPointer), MemFillChar,
+                   st->RequestSize ());
+
+    free((char *)st);
+}
+
+#endif // __WXDEBUG__
+
+// Trace: send output to the current debugging stream
+void wxTrace(const wxChar * ...)
+{
+#if 1
+    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
+#else
+    va_list ap;
+  static wxChar buffer[512];
+
+  va_start(ap, fmt);
+
+#ifdef __WXMSW__
+  wvsprintf(buffer,fmt,ap) ;
+#else
+  vsprintf(buffer,fmt,ap) ;
+#endif
+
+  va_end(ap);
+
+  if (wxDebugContext::HasStream())
+  {
+    wxDebugContext::GetStream() << buffer;
+    wxDebugContext::GetStream().flush();
+  }
+  else
+#ifdef __WXMSW__
+#ifdef __WIN32__
+    OutputDebugString((LPCTSTR)buffer) ;
+#else
+    OutputDebugString((const char*) buffer) ;
+#endif
+#else
+    fprintf(stderr, buffer);
+#endif
+#endif
+}
+
+// Trace with level
+void wxTraceLevel(int, const wxChar * ...)
+{
+#if 1
+    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
+#else
+  if (wxDebugContext::GetLevel() < level)
+    return;
+
+  va_list ap;
+  static wxChar buffer[512];
+
+  va_start(ap, fmt);
+
+#ifdef __WXMSW__
+  wxWvsprintf(buffer,fmt,ap) ;
+#else
+  vsprintf(buffer,fmt,ap) ;
+#endif
+
+  va_end(ap);
+
+  if (wxDebugContext::HasStream())
+  {
+    wxDebugContext::GetStream() << buffer;
+    wxDebugContext::GetStream().flush();
+  }
+  else
+#ifdef __WXMSW__
+#ifdef __WIN32__
+    OutputDebugString((LPCTSTR)buffer) ;
+#else
+    OutputDebugString((const char*) buffer) ;
+#endif
+#else
+    fprintf(stderr, buffer);
+#endif
+#endif
+}
+
+//----------------------------------------------------------------------------
+// Final cleanup after all global objects in all files have been destroyed
+//----------------------------------------------------------------------------
+
+// Don't set it to 0 by dynamic initialization
+// Some compilers will really do the assignment later
+// All global variables are initialized to 0 at the very beginning, and this is just fine.
+int wxDebugContextDumpDelayCounter::sm_count;
+
+void wxDebugContextDumpDelayCounter::DoDump()
+{
+    if (wxDebugContext::CountObjectsLeft(true) > 0)
+    {
+        wxDebugContext::OutputDumpLine(wxT("There were memory leaks.\n"));
+        wxDebugContext::Dump();
+        wxDebugContext::PrintStatistics();
+    }
+}
+
+// Even if there is nothing else, make sure that there is at
+// least one cleanup counter object
+static wxDebugContextDumpDelayCounter wxDebugContextDumpDelayCounter_One;
+
+#endif // (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
diff --git a/Source/3rd Party/wx/src/common/menucmn.cpp b/Source/3rd Party/wx/src/common/menucmn.cpp
index c195b1783..145fe9b01 100644
--- a/Source/3rd Party/wx/src/common/menucmn.cpp	
+++ b/Source/3rd Party/wx/src/common/menucmn.cpp	
@@ -1,1064 +1,1173 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/menucmn.cpp
-// Purpose:     wxMenu and wxMenuBar methods common to all ports
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     26.10.99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_MENUS
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/menu.h"
-    #include "wx/frame.h"
-#endif
-
-#include "wx/stockitem.h"
-
-// ----------------------------------------------------------------------------
-// template lists
-// ----------------------------------------------------------------------------
-
-#include "wx/listimpl.cpp"
-
-WX_DEFINE_LIST(wxMenuList)
-WX_DEFINE_LIST(wxMenuItemList)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// XTI for wxMenu(Bar)
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxMenuStyle )
-wxBEGIN_FLAGS( wxMenuStyle )
-wxFLAGS_MEMBER(wxMENU_TEAROFF)
-wxEND_FLAGS( wxMenuStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler, "wx/menu.h")
-wxCOLLECTION_TYPE_INFO( wxMenuItem *, wxMenuItemList ) ;
-
-#if wxUSE_EXTENDED_RTTI    
-template<> void wxCollectionToVariantArray( wxMenuItemList const &theList,
-                                           wxAnyList &value)
-{
-    wxListCollectionToAnyList<wxMenuItemList::compatibility_iterator>( theList, value ) ;
-}
-#endif
-
-wxBEGIN_PROPERTIES_TABLE(wxMenu)
-wxEVENT_PROPERTY( Select, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
-
-wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString(), \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-
-wxREADONLY_PROPERTY_FLAGS( MenuStyle, wxMenuStyle, long, GetStyle, \
-                          wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \
-                          wxT("group")) // style
-
-wxPROPERTY_COLLECTION( MenuItems, wxMenuItemList, wxMenuItem*, Append, \
-                      GetMenuItems, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxMenu)
-
-wxDIRECT_CONSTRUCTOR_2( wxMenu, wxString, Title, long, MenuStyle  )
-
-wxDEFINE_FLAGS( wxMenuBarStyle )
-
-wxBEGIN_FLAGS( wxMenuBarStyle )
-wxFLAGS_MEMBER(wxMB_DOCKABLE)
-wxEND_FLAGS( wxMenuBarStyle )
-
-#if wxUSE_EXTENDED_RTTI    
-// the negative id would lead the window (its superclass !) to
-// vetoe streaming out otherwise
-bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWriter *,
-                                wxObjectWriterCallback *, const wxStringToAnyHashMap & )
-{
-    return true;
-}
-#endif
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \
-                                       wxMenuBarStreamingCallback)
-
-
-#if wxUSE_EXTENDED_RTTI    
-WX_DEFINE_LIST( wxMenuInfoHelperList )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfoHelper, wxObject, "wx/menu.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxMenuInfoHelper)
-wxREADONLY_PROPERTY( Menu, wxMenu*, GetMenu, wxEMPTY_PARAMETER_VALUE, \
-                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
-
-wxREADONLY_PROPERTY( Title, wxString, GetTitle, wxString(), \
-                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxMenuInfoHelper)
-
-wxCONSTRUCTOR_2( wxMenuInfoHelper, wxMenu*, Menu, wxString, Title )
-
-wxCOLLECTION_TYPE_INFO( wxMenuInfoHelper *, wxMenuInfoHelperList ) ;
-
-template<> void wxCollectionToVariantArray( wxMenuInfoHelperList const &theList, 
-                                           wxAnyList &value)
-{
-    wxListCollectionToAnyList<wxMenuInfoHelperList::compatibility_iterator>( theList, value ) ;
-}
-
-#endif
-
-wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
-wxPROPERTY_COLLECTION( MenuInfos, wxMenuInfoHelperList, wxMenuInfoHelper*, AppendMenuInfo, \
-                      GetMenuInfos, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxMenuBar)
-
-wxCONSTRUCTOR_DUMMY( wxMenuBar )
-
-#if wxUSE_EXTENDED_RTTI    
-
-const wxMenuInfoHelperList& wxMenuBarBase::GetMenuInfos() const
-{
-    wxMenuInfoHelperList* list = const_cast< wxMenuInfoHelperList* > (& m_menuInfos);
-    WX_CLEAR_LIST( wxMenuInfoHelperList, *list);
-    for (size_t i = 0 ; i < GetMenuCount(); ++i)
-    {
-        wxMenuInfoHelper* info = new wxMenuInfoHelper();
-        info->Create( GetMenu(i), GetMenuLabel(i));
-        list->Append(info);
-    }
-    return m_menuInfos;
-}
-
-#endif
-
-// ----------------------------------------------------------------------------
-// XTI for wxMenuItem
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-
-bool wxMenuItemStreamingCallback( const wxObject *object, wxObjectWriter *,
-                                 wxObjectWriterCallback *, const wxStringToAnyHashMap & )
-{
-    const wxMenuItem * mitem = wx_dynamic_cast(const wxMenuItem*, object);
-    if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().empty() )
-    {
-        // we don't stream out the first two items for menus with a title,
-        // they will be reconstructed
-        if ( mitem->GetMenu()->FindItemByPosition(0) == mitem ||
-            mitem->GetMenu()->FindItemByPosition(1) == mitem )
-            return false;
-    }
-    return true;
-}
-
-#endif
-
-wxBEGIN_ENUM( wxItemKind )
-wxENUM_MEMBER( wxITEM_SEPARATOR )
-wxENUM_MEMBER( wxITEM_NORMAL )
-wxENUM_MEMBER( wxITEM_CHECK )
-wxENUM_MEMBER( wxITEM_RADIO )
-wxEND_ENUM( wxItemKind )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuItem, wxObject, "wx/menuitem.h", \
-                                       wxMenuItemStreamingCallback)
-
-wxBEGIN_PROPERTIES_TABLE(wxMenuItem)
-wxPROPERTY( Parent, wxMenu*, SetMenu, GetMenu, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxPROPERTY( Id, int, SetId, GetId, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxPROPERTY( ItemLabel, wxString, SetItemLabel, GetItemLabel, wxString(), \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxPROPERTY( Help, wxString, SetHelp, GetHelp, wxString(), \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxREADONLY_PROPERTY( Kind, wxItemKind, GetKind, wxEMPTY_PARAMETER_VALUE, \
-                    0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxPROPERTY( SubMenu, wxMenu*, SetSubMenu, GetSubMenu, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxAny((bool)true), \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxPROPERTY( Checked, bool, Check, IsChecked, wxAny((bool)false), \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxPROPERTY( Checkable, bool, SetCheckable, IsCheckable, wxAny((bool)false), \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxMenuItem)
-
-wxDIRECT_CONSTRUCTOR_6( wxMenuItem, wxMenu*, Parent, int, Id, wxString, \
-                       Text, wxString, Help, wxItemKind, Kind, wxMenu*, SubMenu )
-
-// ----------------------------------------------------------------------------
-// wxMenuItemBase
-// ----------------------------------------------------------------------------
-
-wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
-                               int itemid,
-                               const wxString& text,
-                               const wxString& help,
-                               wxItemKind kind,
-                               wxMenu *subMenu)
-{
-    switch ( itemid )
-    {
-        case wxID_ANY:
-            m_id = wxWindow::NewControlId();
-            break;
-
-        case wxID_SEPARATOR:
-            m_id = wxID_SEPARATOR;
-
-            // there is a lot of existing code just doing Append(wxID_SEPARATOR)
-            // and it makes sense to omit the following optional parameters,
-            // including the kind one which doesn't default to wxITEM_SEPARATOR,
-            // of course, so override it here
-            kind = wxITEM_SEPARATOR;
-            break;
-
-        case wxID_NONE:
-            // (popup) menu titles in wxMSW use this ID to indicate that
-            // it's not a real menu item, so we don't want the check below to
-            // apply to it
-            m_id = itemid;
-            break;
-
-        default:
-            // ids are limited to 16 bits under MSW so portable code shouldn't
-            // use ids outside of this range (negative ids generated by wx are
-            // fine though)
-            wxASSERT_MSG( (itemid >= 0 && itemid < SHRT_MAX) ||
-                            (itemid >= wxID_AUTO_LOWEST && itemid <= wxID_AUTO_HIGHEST),
-                          wxS("invalid itemid value") );
-            m_id = itemid;
-    }
-
-    // notice that parentMenu can be NULL: the item can be attached to the menu
-    // later with SetMenu()
-
-    m_parentMenu  = parentMenu;
-    m_subMenu     = subMenu;
-    m_isEnabled   = true;
-    m_isChecked   = false;
-    m_kind        = kind;
-
-    SetItemLabel(text);
-    SetHelp(help);
-}
-
-wxMenuItemBase::~wxMenuItemBase()
-{
-    delete m_subMenu;
-}
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItemBase::GetAccel() const
-{
-    return wxAcceleratorEntry::Create(GetItemLabel());
-}
-
-void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
-{
-    wxString text = m_text.BeforeFirst(wxT('\t'));
-    if ( accel )
-    {
-        text += wxT('\t');
-        text += accel->ToString();
-    }
-
-    SetItemLabel(text);
-}
-
-#endif // wxUSE_ACCEL
-
-void wxMenuItemBase::SetItemLabel(const wxString& str)
-{
-    m_text = str;
-
-    if ( m_text.empty() && !IsSeparator() )
-    {
-        wxASSERT_MSG( wxIsStockID(GetId()),
-                      wxT("A non-stock menu item with an empty label?") );
-        m_text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR |
-                                          wxSTOCK_WITH_MNEMONIC);
-    }
-}
-
-void wxMenuItemBase::SetHelp(const wxString& str)
-{
-    m_help = str;
-
-    if ( m_help.empty() && !IsSeparator() && wxIsStockID(GetId()) )
-    {
-        // get a stock help string
-        m_help = wxGetStockHelpString(GetId());
-    }
-}
-
-#ifndef __WXPM__
-wxString wxMenuItemBase::GetLabelText(const wxString& text)
-{
-    return wxStripMenuCodes(text);
-}
-#endif
-
-#if WXWIN_COMPATIBILITY_2_8
-wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
-{
-    return GetLabelText(text);
-}
-#endif
-
-bool wxMenuBase::ms_locked = true;
-
-// ----------------------------------------------------------------------------
-// wxMenu ctor and dtor
-// ----------------------------------------------------------------------------
-
-void wxMenuBase::Init(long style)
-{
-    m_menuBar = NULL;
-    m_menuParent = NULL;
-
-    m_invokingWindow = NULL;
-    m_style = style;
-    m_clientData = NULL;
-    m_eventHandler = this;
-}
-
-wxMenuBase::~wxMenuBase()
-{
-    WX_CLEAR_LIST(wxMenuItemList, m_items);
-}
-
-// ----------------------------------------------------------------------------
-// wxMenu item adding/removing
-// ----------------------------------------------------------------------------
-
-void wxMenuBase::AddSubMenu(wxMenu *submenu)
-{
-    wxCHECK_RET( submenu, wxT("can't add a NULL submenu") );
-
-    submenu->SetParent((wxMenu *)this);
-}
-
-wxMenuItem* wxMenuBase::DoAppend(wxMenuItem *item)
-{
-    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Append()") );
-
-    m_items.Append(item);
-    item->SetMenu((wxMenu*)this);
-    if ( item->IsSubMenu() )
-    {
-        AddSubMenu(item->GetSubMenu());
-    }
-
-    return item;
-}
-
-wxMenuItem* wxMenuBase::Insert(size_t pos, wxMenuItem *item)
-{
-    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Insert") );
-
-    if ( pos == GetMenuItemCount() )
-    {
-        return DoAppend(item);
-    }
-    else
-    {
-        wxCHECK_MSG( pos < GetMenuItemCount(), NULL,
-                     wxT("invalid index in wxMenu::Insert") );
-
-        return DoInsert(pos, item);
-    }
-}
-
-wxMenuItem* wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)
-{
-    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Insert()") );
-
-    wxMenuItemList::compatibility_iterator node = m_items.Item(pos);
-    wxCHECK_MSG( node, NULL, wxT("invalid index in wxMenu::Insert()") );
-
-    m_items.Insert(node, item);
-    item->SetMenu((wxMenu*)this);
-    if ( item->IsSubMenu() )
-    {
-        AddSubMenu(item->GetSubMenu());
-    }
-
-    return item;
-}
-
-wxMenuItem *wxMenuBase::Remove(wxMenuItem *item)
-{
-    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Remove") );
-
-    return DoRemove(item);
-}
-
-wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
-{
-    wxMenuItemList::compatibility_iterator node = m_items.Find(item);
-
-    // if we get here, the item is valid or one of Remove() functions is broken
-    wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
-
-    // we detach the item, but we do delete the list node (i.e. don't call
-    // DetachNode() here!)
-    m_items.Erase(node);
-
-    // item isn't attached to anything any more
-    item->SetMenu(NULL);
-    wxMenu *submenu = item->GetSubMenu();
-    if ( submenu )
-    {
-        submenu->SetParent(NULL);
-        if ( submenu->IsAttached() )
-            submenu->Detach();
-    }
-
-    return item;
-}
-
-bool wxMenuBase::Delete(wxMenuItem *item)
-{
-    wxCHECK_MSG( item, false, wxT("invalid item in wxMenu::Delete") );
-
-    return DoDelete(item);
-}
-
-bool wxMenuBase::DoDelete(wxMenuItem *item)
-{
-    wxMenuItem *item2 = DoRemove(item);
-    wxCHECK_MSG( item2, false, wxT("failed to delete menu item") );
-
-    // don't delete the submenu
-    item2->SetSubMenu(NULL);
-
-    delete item2;
-
-    return true;
-}
-
-bool wxMenuBase::Destroy(wxMenuItem *item)
-{
-    wxCHECK_MSG( item, false, wxT("invalid item in wxMenu::Destroy") );
-
-    return DoDestroy(item);
-}
-
-bool wxMenuBase::DoDestroy(wxMenuItem *item)
-{
-    wxMenuItem *item2 = DoRemove(item);
-    wxCHECK_MSG( item2, false, wxT("failed to delete menu item") );
-
-    delete item2;
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wxMenu searching for items
-// ----------------------------------------------------------------------------
-
-// Finds the item id matching the given string, wxNOT_FOUND if not found.
-int wxMenuBase::FindItem(const wxString& text) const
-{
-    wxString label = wxMenuItem::GetLabelText(text);
-    for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxMenuItem *item = node->GetData();
-        if ( item->IsSubMenu() )
-        {
-            int rc = item->GetSubMenu()->FindItem(label);
-            if ( rc != wxNOT_FOUND )
-                return rc;
-        }
-
-        // we execute this code for submenus as well to alllow finding them by
-        // name just like the ordinary items
-        if ( !item->IsSeparator() )
-        {
-            if ( item->GetItemLabelText() == label )
-                return item->GetId();
-        }
-    }
-
-    return wxNOT_FOUND;
-}
-
-// recursive search for item by id
-wxMenuItem *wxMenuBase::FindItem(int itemId, wxMenu **itemMenu) const
-{
-    if ( itemMenu )
-        *itemMenu = NULL;
-
-    wxMenuItem *item = NULL;
-    for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
-          node && !item;
-          node = node->GetNext() )
-    {
-        item = node->GetData();
-
-        if ( item->GetId() == itemId )
-        {
-            if ( itemMenu )
-                *itemMenu = (wxMenu *)this;
-        }
-        else if ( item->IsSubMenu() )
-        {
-            item = item->GetSubMenu()->FindItem(itemId, itemMenu);
-        }
-        else
-        {
-            // don't exit the loop
-            item = NULL;
-        }
-    }
-
-    return item;
-}
-
-// non recursive search
-wxMenuItem *wxMenuBase::FindChildItem(int itemid, size_t *ppos) const
-{
-    wxMenuItem *item = NULL;
-    wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
-
-    size_t pos;
-    for ( pos = 0; node; pos++ )
-    {
-        if ( node->GetData()->GetId() == itemid )
-        {
-            item = node->GetData();
-
-            break;
-        }
-
-        node = node->GetNext();
-    }
-
-    if ( ppos )
-    {
-        *ppos = item ? pos : (size_t)wxNOT_FOUND;
-    }
-
-    return item;
-}
-
-// find by position
-wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const
-{
-    wxCHECK_MSG( position < m_items.GetCount(), NULL,
-                 wxT("wxMenu::FindItemByPosition(): invalid menu index") );
-
-    return m_items.Item( position )->GetData();
-}
-
-// ----------------------------------------------------------------------------
-// wxMenu helpers used by derived classes
-// ----------------------------------------------------------------------------
-
-// Update a menu and all submenus recursively. source is the object that has
-// the update event handlers defined for it. If NULL, the menu or associated
-// window will be used.
-void wxMenuBase::UpdateUI(wxEvtHandler* source)
-{
-    wxWindow * const win = GetWindow();
-
-    if ( !source && win )
-        source = win->GetEventHandler();
-    if ( !source )
-        source = GetEventHandler();
-    if ( !source )
-        source = this;
-
-    wxMenuItemList::compatibility_iterator  node = GetMenuItems().GetFirst();
-    while ( node )
-    {
-        wxMenuItem* item = node->GetData();
-        if ( !item->IsSeparator() )
-        {
-            wxWindowID itemid = item->GetId();
-            wxUpdateUIEvent event(itemid);
-            event.SetEventObject( this );
-
-            if ( source->ProcessEvent(event) )
-            {
-                // if anything changed, update the changed attribute
-                if (event.GetSetText())
-                    SetLabel(itemid, event.GetText());
-                if (event.GetSetChecked())
-                    Check(itemid, event.GetChecked());
-                if (event.GetSetEnabled())
-                    Enable(itemid, event.GetEnabled());
-            }
-
-            // recurse to the submenus
-            if ( item->GetSubMenu() )
-                item->GetSubMenu()->UpdateUI(source);
-        }
-        //else: item is a separator (which doesn't process update UI events)
-
-        node = node->GetNext();
-    }
-}
-
-bool wxMenuBase::SendEvent(int itemid, int checked)
-{
-    wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, itemid);
-    event.SetEventObject(this);
-    event.SetInt(checked);
-
-    bool processed = false;
-
-    // Try the menu's event handler first
-    wxEvtHandler *handler = GetEventHandler();
-    if ( handler )
-        processed = handler->SafelyProcessEvent(event);
-
-    // Try the window the menu was popped up from or its menu bar belongs to
-    if ( !processed )
-    {
-        wxWindow * const win = GetWindow();
-        if ( win )
-            processed = win->HandleWindowEvent(event);
-    }
-
-    return processed;
-}
-
-// ----------------------------------------------------------------------------
-// wxMenu attaching/detaching to/from menu bar
-// ----------------------------------------------------------------------------
-
-wxMenuBar* wxMenuBase::GetMenuBar() const
-{
-    if(GetParent())
-        return GetParent()->GetMenuBar();
-    return m_menuBar;
-}
-
-void wxMenuBase::Attach(wxMenuBarBase *menubar)
-{
-    // use Detach() instead!
-    wxASSERT_MSG( menubar, wxT("menu can't be attached to NULL menubar") );
-
-    // use IsAttached() to prevent this from happening
-    wxASSERT_MSG( !m_menuBar, wxT("attaching menu twice?") );
-
-    m_menuBar = (wxMenuBar *)menubar;
-}
-
-void wxMenuBase::Detach()
-{
-    // use IsAttached() to prevent this from happening
-    wxASSERT_MSG( m_menuBar, wxT("detaching unattached menu?") );
-
-    m_menuBar = NULL;
-}
-
-// ----------------------------------------------------------------------------
-// wxMenu invoking window handling
-// ----------------------------------------------------------------------------
-
-void wxMenuBase::SetInvokingWindow(wxWindow *win)
-{
-    wxASSERT_MSG( !GetParent(),
-                    "should only be called for top level popup menus" );
-    wxASSERT_MSG( !IsAttached(),
-                    "menus attached to menu bar can't have invoking window" );
-
-    m_invokingWindow = win;
-}
-
-wxWindow *wxMenuBase::GetWindow() const
-{
-    // only the top level menus have non-NULL invoking window or a pointer to
-    // the menu bar so recurse upwards until we find it
-    const wxMenuBase *menu = this;
-    while ( menu->GetParent() )
-    {
-        menu = menu->GetParent();
-    }
-
-    return menu->GetMenuBar() ? menu->GetMenuBar()->GetFrame()
-                              : menu->GetInvokingWindow();
-}
-
-// ----------------------------------------------------------------------------
-// wxMenu functions forwarded to wxMenuItem
-// ----------------------------------------------------------------------------
-
-void wxMenuBase::Enable( int itemid, bool enable )
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") );
-
-    item->Enable(enable);
-}
-
-bool wxMenuBase::IsEnabled( int itemid ) const
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_MSG( item, false, wxT("wxMenu::IsEnabled: no such item") );
-
-    return item->IsEnabled();
-}
-
-void wxMenuBase::Check( int itemid, bool enable )
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_RET( item, wxT("wxMenu::Check: no such item") );
-
-    item->Check(enable);
-}
-
-bool wxMenuBase::IsChecked( int itemid ) const
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_MSG( item, false, wxT("wxMenu::IsChecked: no such item") );
-
-    return item->IsChecked();
-}
-
-void wxMenuBase::SetLabel( int itemid, const wxString &label )
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") );
-
-    item->SetItemLabel(label);
-}
-
-wxString wxMenuBase::GetLabel( int itemid ) const
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetLabel: no such item") );
-
-    return item->GetItemLabel();
-}
-
-void wxMenuBase::SetHelpString( int itemid, const wxString& helpString )
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") );
-
-    item->SetHelp( helpString );
-}
-
-wxString wxMenuBase::GetHelpString( int itemid ) const
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetHelpString: no such item") );
-
-    return item->GetHelp();
-}
-
-// ----------------------------------------------------------------------------
-// wxMenuBarBase ctor and dtor
-// ----------------------------------------------------------------------------
-
-wxMenuBarBase::wxMenuBarBase()
-{
-    // not attached yet
-    m_menuBarFrame = NULL;
-}
-
-wxMenuBarBase::~wxMenuBarBase()
-{
-    WX_CLEAR_LIST(wxMenuList, m_menus);
-}
-
-// ----------------------------------------------------------------------------
-// wxMenuBar item access: the base class versions manage m_menus list, the
-// derived class should reflect the changes in the real menubar
-// ----------------------------------------------------------------------------
-
-wxMenu *wxMenuBarBase::GetMenu(size_t pos) const
-{
-    wxMenuList::compatibility_iterator node = m_menus.Item(pos);
-    wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::GetMenu()") );
-
-    return node->GetData();
-}
-
-bool wxMenuBarBase::Append(wxMenu *menu, const wxString& title)
-{
-    wxCHECK_MSG( menu, false, wxT("can't append NULL menu") );
-    wxCHECK_MSG( !title.empty(), false, wxT("can't append menu with empty title") );
-
-    m_menus.Append(menu);
-    menu->Attach(this);
-
-    return true;
-}
-
-bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
-                           const wxString& title)
-{
-    if ( pos == m_menus.GetCount() )
-    {
-        return wxMenuBarBase::Append(menu, title);
-    }
-    else // not at the end
-    {
-        wxCHECK_MSG( menu, false, wxT("can't insert NULL menu") );
-
-        wxMenuList::compatibility_iterator node = m_menus.Item(pos);
-        wxCHECK_MSG( node, false, wxT("bad index in wxMenuBar::Insert()") );
-
-        m_menus.Insert(node, menu);
-        menu->Attach(this);
-
-        return true;
-    }
-}
-
-wxMenu *wxMenuBarBase::Replace(size_t pos, wxMenu *menu,
-                               const wxString& WXUNUSED(title))
-{
-    wxCHECK_MSG( menu, NULL, wxT("can't insert NULL menu") );
-
-    wxMenuList::compatibility_iterator node = m_menus.Item(pos);
-    wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Replace()") );
-
-    wxMenu *menuOld = node->GetData();
-    node->SetData(menu);
-
-    menu->Attach(this);
-    menuOld->Detach();
-
-    return menuOld;
-}
-
-wxMenu *wxMenuBarBase::Remove(size_t pos)
-{
-    wxMenuList::compatibility_iterator node = m_menus.Item(pos);
-    wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Remove()") );
-
-    wxMenu *menu = node->GetData();
-    m_menus.Erase(node);
-    menu->Detach();
-
-    return menu;
-}
-
-int wxMenuBarBase::FindMenu(const wxString& title) const
-{
-    wxString label = wxMenuItem::GetLabelText(title);
-
-    size_t count = GetMenuCount();
-    for ( size_t i = 0; i < count; i++ )
-    {
-        wxString title2 = GetMenuLabel(i);
-        if ( (title2 == title) ||
-             (wxMenuItem::GetLabelText(title2) == label) )
-        {
-            // found
-            return (int)i;
-        }
-    }
-
-    return wxNOT_FOUND;
-
-}
-
-// ----------------------------------------------------------------------------
-// wxMenuBar attaching/detaching to/from the frame
-// ----------------------------------------------------------------------------
-
-void wxMenuBarBase::Attach(wxFrame *frame)
-{
-    wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
-
-    m_menuBarFrame = frame;
-}
-
-void wxMenuBarBase::Detach()
-{
-    wxASSERT_MSG( IsAttached(), wxT("detaching unattached menubar") );
-
-    m_menuBarFrame = NULL;
-}
-
-// ----------------------------------------------------------------------------
-// wxMenuBar searching for items
-// ----------------------------------------------------------------------------
-
-wxMenuItem *wxMenuBarBase::FindItem(int itemid, wxMenu **menu) const
-{
-    if ( menu )
-        *menu = NULL;
-
-    wxMenuItem *item = NULL;
-    size_t count = GetMenuCount(), i;
-    wxMenuList::const_iterator it;
-    for ( i = 0, it = m_menus.begin(); !item && (i < count); i++, it++ )
-    {
-        item = (*it)->FindItem(itemid, menu);
-    }
-
-    return item;
-}
-
-int wxMenuBarBase::FindMenuItem(const wxString& menu, const wxString& item) const
-{
-    wxString label = wxMenuItem::GetLabelText(menu);
-
-    int i = 0;
-    wxMenuList::compatibility_iterator node;
-    for ( node = m_menus.GetFirst(); node; node = node->GetNext(), i++ )
-    {
-        if ( label == wxMenuItem::GetLabelText(GetMenuLabel(i)) )
-            return node->GetData()->FindItem(item);
-    }
-
-    return wxNOT_FOUND;
-}
-
-// ---------------------------------------------------------------------------
-// wxMenuBar functions forwarded to wxMenuItem
-// ---------------------------------------------------------------------------
-
-void wxMenuBarBase::Enable(int itemid, bool enable)
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_RET( item, wxT("attempt to enable an item which doesn't exist") );
-
-    item->Enable(enable);
-}
-
-void wxMenuBarBase::Check(int itemid, bool check)
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_RET( item, wxT("attempt to check an item which doesn't exist") );
-    wxCHECK_RET( item->IsCheckable(), wxT("attempt to check an uncheckable item") );
-
-    item->Check(check);
-}
-
-bool wxMenuBarBase::IsChecked(int itemid) const
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_MSG( item, false, wxT("wxMenuBar::IsChecked(): no such item") );
-
-    return item->IsChecked();
-}
-
-bool wxMenuBarBase::IsEnabled(int itemid) const
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_MSG( item, false, wxT("wxMenuBar::IsEnabled(): no such item") );
-
-    return item->IsEnabled();
-}
-
-void wxMenuBarBase::SetLabel(int itemid, const wxString& label)
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_RET( item, wxT("wxMenuBar::SetLabel(): no such item") );
-
-    item->SetItemLabel(label);
-}
-
-wxString wxMenuBarBase::GetLabel(int itemid) const
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_MSG( item, wxEmptyString,
-                 wxT("wxMenuBar::GetLabel(): no such item") );
-
-    return item->GetItemLabel();
-}
-
-void wxMenuBarBase::SetHelpString(int itemid, const wxString& helpString)
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString(): no such item") );
-
-    item->SetHelp(helpString);
-}
-
-wxString wxMenuBarBase::GetHelpString(int itemid) const
-{
-    wxMenuItem *item = FindItem(itemid);
-
-    wxCHECK_MSG( item, wxEmptyString,
-                 wxT("wxMenuBar::GetHelpString(): no such item") );
-
-    return item->GetHelp();
-}
-
-void wxMenuBarBase::UpdateMenus()
-{
-    wxMenu* menu;
-    int nCount = GetMenuCount();
-    for (int n = 0; n < nCount; n++)
-    {
-        menu = GetMenu( n );
-        if (menu != NULL)
-            menu->UpdateUI( NULL );
-    }
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-// get or change the label of the menu at given position
-void wxMenuBarBase::SetLabelTop(size_t pos, const wxString& label)
-{
-    SetMenuLabel(pos, label);
-}
-
-wxString wxMenuBarBase::GetLabelTop(size_t pos) const
-{
-    return GetMenuLabelText(pos);
-}
-#endif
-
-#endif // wxUSE_MENUS
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/menucmn.cpp
+// Purpose:     wxMenu and wxMenuBar methods common to all ports
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     26.10.99
+// RCS-ID:      $Id: menucmn.cpp 57852 2009-01-06 09:40:34Z SC $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_MENUS
+
+#include <ctype.h>
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/menu.h"
+#endif
+
+#include "wx/stockitem.h"
+
+// ----------------------------------------------------------------------------
+// template lists
+// ----------------------------------------------------------------------------
+
+#include "wx/listimpl.cpp"
+
+WX_DEFINE_LIST(wxMenuList)
+WX_DEFINE_LIST(wxMenuItemList)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxAcceleratorEntry
+// ----------------------------------------------------------------------------
+
+
+#if wxUSE_ACCEL
+
+static const struct wxKeyName
+{
+    wxKeyCode code;
+    const wxChar *name;
+} wxKeyNames[] =
+{
+    { WXK_DELETE, wxTRANSLATE("DEL") },
+    { WXK_DELETE, wxTRANSLATE("DELETE") },
+    { WXK_BACK, wxTRANSLATE("BACK") },
+    { WXK_INSERT, wxTRANSLATE("INS") },
+    { WXK_INSERT, wxTRANSLATE("INSERT") },
+    { WXK_RETURN, wxTRANSLATE("ENTER") },
+    { WXK_RETURN, wxTRANSLATE("RETURN") },
+    { WXK_PAGEUP, wxTRANSLATE("PGUP") },
+    { WXK_PAGEDOWN, wxTRANSLATE("PGDN") },
+    { WXK_LEFT, wxTRANSLATE("LEFT") },
+    { WXK_RIGHT, wxTRANSLATE("RIGHT") },
+    { WXK_UP, wxTRANSLATE("UP") },
+    { WXK_DOWN, wxTRANSLATE("DOWN") },
+    { WXK_HOME, wxTRANSLATE("HOME") },
+    { WXK_END, wxTRANSLATE("END") },
+    { WXK_SPACE, wxTRANSLATE("SPACE") },
+    { WXK_TAB, wxTRANSLATE("TAB") },
+    { WXK_ESCAPE, wxTRANSLATE("ESC") },
+    { WXK_ESCAPE, wxTRANSLATE("ESCAPE") },
+    { WXK_CANCEL, wxTRANSLATE("CANCEL") },
+    { WXK_CLEAR, wxTRANSLATE("CLEAR") },
+    { WXK_MENU, wxTRANSLATE("MENU") },
+    { WXK_PAUSE, wxTRANSLATE("PAUSE") },
+    { WXK_CAPITAL, wxTRANSLATE("CAPITAL") },
+    { WXK_SELECT, wxTRANSLATE("SELECT") },
+    { WXK_PRINT, wxTRANSLATE("PRINT") },
+    { WXK_EXECUTE, wxTRANSLATE("EXECUTE") },
+    { WXK_SNAPSHOT, wxTRANSLATE("SNAPSHOT") },
+    { WXK_HELP, wxTRANSLATE("HELP") },
+    { WXK_ADD, wxTRANSLATE("ADD") },
+    { WXK_SEPARATOR, wxTRANSLATE("SEPARATOR") },
+    { WXK_SUBTRACT, wxTRANSLATE("SUBTRACT") },
+    { WXK_DECIMAL, wxTRANSLATE("DECIMAL") },
+    { WXK_DIVIDE, wxTRANSLATE("DIVIDE") },
+    { WXK_NUMLOCK, wxTRANSLATE("NUM_LOCK") },
+    { WXK_SCROLL, wxTRANSLATE("SCROLL_LOCK") },
+    { WXK_PAGEUP, wxTRANSLATE("PAGEUP") },
+    { WXK_PAGEDOWN, wxTRANSLATE("PAGEDOWN") },
+    { WXK_NUMPAD_SPACE, wxTRANSLATE("KP_SPACE") },
+    { WXK_NUMPAD_TAB, wxTRANSLATE("KP_TAB") },
+    { WXK_NUMPAD_ENTER, wxTRANSLATE("KP_ENTER") },
+    { WXK_NUMPAD_HOME, wxTRANSLATE("KP_HOME") },
+    { WXK_NUMPAD_LEFT, wxTRANSLATE("KP_LEFT") },
+    { WXK_NUMPAD_UP, wxTRANSLATE("KP_UP") },
+    { WXK_NUMPAD_RIGHT, wxTRANSLATE("KP_RIGHT") },
+    { WXK_NUMPAD_DOWN, wxTRANSLATE("KP_DOWN") },
+    { WXK_NUMPAD_PAGEUP, wxTRANSLATE("KP_PRIOR") },
+    { WXK_NUMPAD_PAGEUP, wxTRANSLATE("KP_PAGEUP") },
+    { WXK_NUMPAD_PAGEDOWN, wxTRANSLATE("KP_NEXT") },
+    { WXK_NUMPAD_PAGEDOWN, wxTRANSLATE("KP_PAGEDOWN") },
+    { WXK_NUMPAD_END, wxTRANSLATE("KP_END") },
+    { WXK_NUMPAD_BEGIN, wxTRANSLATE("KP_BEGIN") },
+    { WXK_NUMPAD_INSERT, wxTRANSLATE("KP_INSERT") },
+    { WXK_NUMPAD_DELETE, wxTRANSLATE("KP_DELETE") },
+    { WXK_NUMPAD_EQUAL, wxTRANSLATE("KP_EQUAL") },
+    { WXK_NUMPAD_MULTIPLY, wxTRANSLATE("KP_MULTIPLY") },
+    { WXK_NUMPAD_ADD, wxTRANSLATE("KP_ADD") },
+    { WXK_NUMPAD_SEPARATOR, wxTRANSLATE("KP_SEPARATOR") },
+    { WXK_NUMPAD_SUBTRACT, wxTRANSLATE("KP_SUBTRACT") },
+    { WXK_NUMPAD_DECIMAL, wxTRANSLATE("KP_DECIMAL") },
+    { WXK_NUMPAD_DIVIDE, wxTRANSLATE("KP_DIVIDE") },
+    { WXK_WINDOWS_LEFT, wxTRANSLATE("WINDOWS_LEFT") },
+    { WXK_WINDOWS_RIGHT, wxTRANSLATE("WINDOWS_RIGHT") },
+    { WXK_WINDOWS_MENU, wxTRANSLATE("WINDOWS_MENU") },
+    { WXK_COMMAND, wxTRANSLATE("COMMAND") },
+};
+
+// return true if the 2 strings refer to the same accel
+//
+// as accels can be either translated or not, check for both possibilities and
+// also compare case-insensitively as the key names case doesn't count
+static inline bool CompareAccelString(const wxString& str, const wxChar *accel)
+{
+    return str.CmpNoCase(accel) == 0
+#if wxUSE_INTL
+            || str.CmpNoCase(wxGetTranslation(accel)) == 0
+#endif
+            ;
+}
+
+// return prefixCode+number if the string is of the form "<prefix><number>" and
+// 0 if it isn't
+//
+// first and last parameter specify the valid domain for "number" part
+static int
+        IsNumberedAccelKey(const wxString& str,
+                           const wxChar *prefix,
+                           wxKeyCode prefixCode,
+                           unsigned first,
+                           unsigned last)
+{
+    const size_t lenPrefix = wxStrlen(prefix);
+    if ( !CompareAccelString(str.Left(lenPrefix), prefix) )
+        return 0;
+
+    unsigned long num;
+    if ( !str.Mid(lenPrefix).ToULong(&num) )
+        return 0;
+
+    if ( num < first || num > last )
+    {
+        // this must be a mistake, chances that this is a valid name of another
+        // key are vanishingly small
+        wxLogDebug(_T("Invalid key string \"%s\""), str.c_str());
+        return 0;
+    }
+
+    return prefixCode + num - first;
+}
+
+/* static */
+bool
+wxAcceleratorEntry::ParseAccel(const wxString& text, int *flagsOut, int *keyOut)
+{
+    // the parser won't like trailing spaces
+    wxString label = text;
+    label.Trim(true);  // the initial \t must be preserved so don't strip leading whitespaces
+
+    // check for accelerators: they are given after '\t'
+    int posTab = label.Find(wxT('\t'));
+    if ( posTab == wxNOT_FOUND )
+    {
+        return false;
+    }
+
+    // parse the accelerator string
+    int accelFlags = wxACCEL_NORMAL;
+    wxString current;
+    for ( size_t n = (size_t)posTab + 1; n < label.length(); n++ )
+    {
+        if ( (label[n] == '+') || (label[n] == '-') )
+        {
+            // differentiate between a ctrl that will be translated to cmd on mac
+            // and an explicit xctrl that will not be translated and remains a ctrl
+            if ( CompareAccelString(current, wxTRANSLATE("ctrl")) )
+                accelFlags |= wxACCEL_CMD;
+            else if ( CompareAccelString(current, wxTRANSLATE("xctrl")) )
+                accelFlags |= wxACCEL_CTRL;
+            else if ( CompareAccelString(current, wxTRANSLATE("alt")) )
+                accelFlags |= wxACCEL_ALT;
+            else if ( CompareAccelString(current, wxTRANSLATE("shift")) )
+                accelFlags |= wxACCEL_SHIFT;
+            else // not a recognized modifier name
+            {
+                // we may have "Ctrl-+", for example, but we still want to
+                // catch typos like "Crtl-A" so only give the warning if we
+                // have something before the current '+' or '-', else take
+                // it as a literal symbol
+                if ( current.empty() )
+                {
+                    current += label[n];
+
+                    // skip clearing it below
+                    continue;
+                }
+                else
+                {
+                    wxLogDebug(wxT("Unknown accel modifier: '%s'"),
+                               current.c_str());
+                }
+            }
+
+            current.clear();
+        }
+        else // not special character
+        {
+            current += (wxChar) wxTolower(label[n]);
+        }
+    }
+
+    int keyCode;
+    const size_t len = current.length();
+    switch ( len )
+    {
+        case 0:
+            wxLogDebug(wxT("No accel key found, accel string ignored."));
+            return false;
+
+        case 1:
+            // it's just a letter
+            keyCode = current[0U];
+
+            // if the key is used with any modifiers, make it an uppercase one
+            // because Ctrl-A and Ctrl-a are the same; but keep it as is if it's
+            // used alone as 'a' and 'A' are different
+            if ( accelFlags != wxACCEL_NORMAL )
+                keyCode = wxToupper(keyCode);
+            break;
+
+        default:
+            keyCode = IsNumberedAccelKey(current, wxTRANSLATE("F"),
+                                         WXK_F1, 1, 12);
+            if ( !keyCode )
+            {
+                for ( size_t n = 0; n < WXSIZEOF(wxKeyNames); n++ )
+                {
+                    const wxKeyName& kn = wxKeyNames[n];
+                    if ( CompareAccelString(current, kn.name) )
+                    {
+                        keyCode = kn.code;
+                        break;
+                    }
+                }
+            }
+
+            if ( !keyCode )
+                keyCode = IsNumberedAccelKey(current, wxTRANSLATE("KP_"),
+                                             WXK_NUMPAD0, 0, 9);
+            if ( !keyCode )
+                keyCode = IsNumberedAccelKey(current, wxTRANSLATE("SPECIAL"),
+                                             WXK_SPECIAL1, 1, 20);
+
+            if ( !keyCode )
+            {
+                wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
+                           current.c_str());
+                return false;
+            }
+    }
+
+
+    wxASSERT_MSG( keyCode, _T("logic error: should have key code here") );
+
+    if ( flagsOut )
+        *flagsOut = accelFlags;
+    if ( keyOut )
+        *keyOut = keyCode;
+
+    return true;
+}
+
+/* static */
+wxAcceleratorEntry *wxAcceleratorEntry::Create(const wxString& str)
+{
+    int flags,
+        keyCode;
+    if ( !ParseAccel(str, &flags, &keyCode) )
+        return NULL;
+
+    return new wxAcceleratorEntry(flags, keyCode);
+}
+
+bool wxAcceleratorEntry::FromString(const wxString& str)
+{
+    return ParseAccel(str, &m_flags, &m_keyCode);
+}
+
+wxString wxAcceleratorEntry::ToString() const
+{
+    wxString text;
+
+    int flags = GetFlags();
+    if ( flags & wxACCEL_ALT )
+        text += _("Alt-");
+    if ( flags & wxACCEL_CMD )
+        text += _("Ctrl-");
+#ifdef __WXMAC__
+    if ( flags & wxACCEL_CTRL )
+        text += _("XCtrl-");
+#endif
+    if ( flags & wxACCEL_SHIFT )
+        text += _("Shift-");
+
+    const int code = GetKeyCode();
+
+    if ( code >= WXK_F1 && code <= WXK_F12 )
+        text << _("F") << code - WXK_F1 + 1;
+    else if ( code >= WXK_NUMPAD0 && code <= WXK_NUMPAD9 )
+        text << _("KP_") << code - WXK_NUMPAD0;
+    else if ( code >= WXK_SPECIAL1 && code <= WXK_SPECIAL20 )
+        text << _("SPECIAL") << code - WXK_SPECIAL1 + 1;
+    else // check the named keys
+    {
+        size_t n;
+        for ( n = 0; n < WXSIZEOF(wxKeyNames); n++ )
+        {
+            const wxKeyName& kn = wxKeyNames[n];
+            if ( code == kn.code )
+            {
+                text << wxGetTranslation(kn.name);
+                break;
+            }
+        }
+
+        if ( n == WXSIZEOF(wxKeyNames) )
+        {
+            // must be a simple key
+            if (
+#if !wxUSE_UNICODE
+                 isascii(code) &&
+#endif // ANSI
+                    wxIsalnum(code) )
+            {
+                text << (wxChar)code;
+            }
+            else
+            {
+                wxFAIL_MSG( wxT("unknown keyboard accelerator code") );
+            }
+        }
+    }
+
+    return text;
+}
+
+wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
+{
+    return wxAcceleratorEntry::Create(label);
+}
+
+#endif // wxUSE_ACCEL
+
+
+// ----------------------------------------------------------------------------
+// wxMenuItem
+// ----------------------------------------------------------------------------
+
+wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
+                               int id,
+                               const wxString& text,
+                               const wxString& help,
+                               wxItemKind kind,
+                               wxMenu *subMenu)
+{
+    wxASSERT_MSG( parentMenu != NULL, wxT("menuitem should have a menu") );
+
+    m_parentMenu  = parentMenu;
+    m_subMenu     = subMenu;
+    m_isEnabled   = true;
+    m_isChecked   = false;
+    m_id          = id;
+    m_kind        = kind;
+    if (m_id == wxID_ANY)
+        m_id = wxNewId();
+    if (m_id == wxID_SEPARATOR)
+        m_kind = wxITEM_SEPARATOR;
+
+    SetText(text);
+    SetHelp(help);
+}
+
+wxMenuItemBase::~wxMenuItemBase()
+{
+    delete m_subMenu;
+}
+
+#if wxUSE_ACCEL
+
+wxAcceleratorEntry *wxMenuItemBase::GetAccel() const
+{
+    return wxAcceleratorEntry::Create(GetText());
+}
+
+void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
+{
+    wxString text = m_text.BeforeFirst(wxT('\t'));
+    if ( accel )
+    {
+        text += wxT('\t');
+        text += accel->ToString();
+    }
+
+    SetText(text);
+}
+
+#endif // wxUSE_ACCEL
+
+void wxMenuItemBase::SetText(const wxString& str)
+{
+    m_text = str;
+
+    if ( m_text.empty() && !IsSeparator() )
+    {
+        wxASSERT_MSG( wxIsStockID(GetId()),
+                      wxT("A non-stock menu item with an empty label?") );
+        m_text = wxGetStockLabel(GetId(), wxSTOCK_WITH_ACCELERATOR |
+                                          wxSTOCK_WITH_MNEMONIC);
+    }
+}
+
+void wxMenuItemBase::SetHelp(const wxString& str)
+{
+    m_help = str;
+
+    if ( m_help.empty() && !IsSeparator() && wxIsStockID(GetId()) )
+    {
+        // get a stock help string
+        m_help = wxGetStockHelpString(GetId());
+    }
+}
+
+wxString wxMenuItemBase::GetLabelText(const wxString& label)
+{
+    return GetLabelFromText(label);
+}
+
+bool wxMenuBase::ms_locked = true;
+
+// ----------------------------------------------------------------------------
+// wxMenu ctor and dtor
+// ----------------------------------------------------------------------------
+
+void wxMenuBase::Init(long style)
+{
+    m_menuBar = (wxMenuBar *)NULL;
+    m_menuParent = (wxMenu *)NULL;
+
+    m_invokingWindow = (wxWindow *)NULL;
+    m_style = style;
+    m_clientData = (void *)NULL;
+    m_eventHandler = this;
+}
+
+wxMenuBase::~wxMenuBase()
+{
+    WX_CLEAR_LIST(wxMenuItemList, m_items);
+}
+
+// ----------------------------------------------------------------------------
+// wxMenu item adding/removing
+// ----------------------------------------------------------------------------
+
+void wxMenuBase::AddSubMenu(wxMenu *submenu)
+{
+    wxCHECK_RET( submenu, _T("can't add a NULL submenu") );
+
+    submenu->SetParent((wxMenu *)this);
+}
+
+wxMenuItem* wxMenuBase::DoAppend(wxMenuItem *item)
+{
+    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Append()") );
+
+    m_items.Append(item);
+    item->SetMenu((wxMenu*)this);
+    if ( item->IsSubMenu() )
+    {
+        AddSubMenu(item->GetSubMenu());
+    }
+
+    return item;
+}
+
+wxMenuItem* wxMenuBase::Insert(size_t pos, wxMenuItem *item)
+{
+    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Insert") );
+
+    if ( pos == GetMenuItemCount() )
+    {
+        return DoAppend(item);
+    }
+    else
+    {
+        wxCHECK_MSG( pos < GetMenuItemCount(), NULL,
+                     wxT("invalid index in wxMenu::Insert") );
+
+        return DoInsert(pos, item);
+    }
+}
+
+wxMenuItem* wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)
+{
+    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Insert()") );
+
+    wxMenuItemList::compatibility_iterator node = m_items.Item(pos);
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxMenu::Insert()") );
+
+    m_items.Insert(node, item);
+    item->SetMenu((wxMenu*)this);
+    if ( item->IsSubMenu() )
+    {
+        AddSubMenu(item->GetSubMenu());
+    }
+
+    return item;
+}
+
+wxMenuItem *wxMenuBase::Remove(wxMenuItem *item)
+{
+    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Remove") );
+
+    return DoRemove(item);
+}
+
+wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
+{
+    wxMenuItemList::compatibility_iterator node = m_items.Find(item);
+
+    // if we get here, the item is valid or one of Remove() functions is broken
+    wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
+
+    // we detach the item, but we do delete the list node (i.e. don't call
+    // DetachNode() here!)
+    m_items.Erase(node);
+
+    // item isn't attached to anything any more
+    item->SetMenu((wxMenu *)NULL);
+    wxMenu *submenu = item->GetSubMenu();
+    if ( submenu )
+    {
+        submenu->SetParent((wxMenu *)NULL);
+        if ( submenu->IsAttached() )
+            submenu->Detach();
+    }
+
+    return item;
+}
+
+bool wxMenuBase::Delete(wxMenuItem *item)
+{
+    wxCHECK_MSG( item, false, wxT("invalid item in wxMenu::Delete") );
+
+    return DoDelete(item);
+}
+
+bool wxMenuBase::DoDelete(wxMenuItem *item)
+{
+    wxMenuItem *item2 = DoRemove(item);
+    wxCHECK_MSG( item2, false, wxT("failed to delete menu item") );
+
+    // don't delete the submenu
+    item2->SetSubMenu((wxMenu *)NULL);
+
+    delete item2;
+
+    return true;
+}
+
+bool wxMenuBase::Destroy(wxMenuItem *item)
+{
+    wxCHECK_MSG( item, false, wxT("invalid item in wxMenu::Destroy") );
+
+    return DoDestroy(item);
+}
+
+bool wxMenuBase::DoDestroy(wxMenuItem *item)
+{
+    wxMenuItem *item2 = DoRemove(item);
+    wxCHECK_MSG( item2, false, wxT("failed to delete menu item") );
+
+    delete item2;
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// wxMenu searching for items
+// ----------------------------------------------------------------------------
+
+// Finds the item id matching the given string, wxNOT_FOUND if not found.
+int wxMenuBase::FindItem(const wxString& text) const
+{
+    wxString label = wxMenuItem::GetLabelFromText(text);
+    for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxMenuItem *item = node->GetData();
+        if ( item->IsSubMenu() )
+        {
+            int rc = item->GetSubMenu()->FindItem(label);
+            if ( rc != wxNOT_FOUND )
+                return rc;
+        }
+
+        // we execute this code for submenus as well to alllow finding them by
+        // name just like the ordinary items
+        if ( !item->IsSeparator() )
+        {
+            if ( item->GetLabel() == label )
+                return item->GetId();
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+// recursive search for item by id
+wxMenuItem *wxMenuBase::FindItem(int itemId, wxMenu **itemMenu) const
+{
+    if ( itemMenu )
+        *itemMenu = NULL;
+
+    wxMenuItem *item = NULL;
+    for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst();
+          node && !item;
+          node = node->GetNext() )
+    {
+        item = node->GetData();
+
+        if ( item->GetId() == itemId )
+        {
+            if ( itemMenu )
+                *itemMenu = (wxMenu *)this;
+        }
+        else if ( item->IsSubMenu() )
+        {
+            item = item->GetSubMenu()->FindItem(itemId, itemMenu);
+        }
+        else
+        {
+            // don't exit the loop
+            item = NULL;
+        }
+    }
+
+    return item;
+}
+
+// non recursive search
+wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
+{
+    wxMenuItem *item = (wxMenuItem *)NULL;
+    wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+
+    size_t pos;
+    for ( pos = 0; node; pos++ )
+    {
+        if ( node->GetData()->GetId() == id )
+        {
+            item = node->GetData();
+
+            break;
+        }
+
+        node = node->GetNext();
+    }
+
+    if ( ppos )
+    {
+        *ppos = item ? pos : (size_t)wxNOT_FOUND;
+    }
+
+    return item;
+}
+
+// find by position
+wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const
+{
+    wxCHECK_MSG( position < m_items.GetCount(), NULL,
+                 _T("wxMenu::FindItemByPosition(): invalid menu index") );
+
+    return m_items.Item( position )->GetData();
+}
+
+// ----------------------------------------------------------------------------
+// wxMenu helpers used by derived classes
+// ----------------------------------------------------------------------------
+
+// Update a menu and all submenus recursively. source is the object that has
+// the update event handlers defined for it. If NULL, the menu or associated
+// window will be used.
+void wxMenuBase::UpdateUI(wxEvtHandler* source)
+{
+    if (GetInvokingWindow())
+    {
+        // Don't update menus if the parent
+        // frame is about to get deleted
+        wxWindow *tlw = wxGetTopLevelParent( GetInvokingWindow() );
+        if (tlw && wxPendingDelete.Member(tlw))
+            return;
+    }
+
+    if ( !source && GetInvokingWindow() )
+        source = GetInvokingWindow()->GetEventHandler();
+    if ( !source )
+        source = GetEventHandler();
+    if ( !source )
+        source = this;
+
+    wxMenuItemList::compatibility_iterator  node = GetMenuItems().GetFirst();
+    while ( node )
+    {
+        wxMenuItem* item = node->GetData();
+        if ( !item->IsSeparator() )
+        {
+            wxWindowID id = item->GetId();
+            wxUpdateUIEvent event(id);
+            event.SetEventObject( source );
+
+            if ( source->ProcessEvent(event) )
+            {
+                // if anything changed, update the changed attribute
+                if (event.GetSetText())
+                    SetLabel(id, event.GetText());
+                if (event.GetSetChecked())
+                    Check(id, event.GetChecked());
+                if (event.GetSetEnabled())
+                    Enable(id, event.GetEnabled());
+            }
+
+            // recurse to the submenus
+            if ( item->GetSubMenu() )
+                item->GetSubMenu()->UpdateUI(source);
+        }
+        //else: item is a separator (which doesn't process update UI events)
+
+        node = node->GetNext();
+    }
+}
+
+bool wxMenuBase::SendEvent(int id, int checked)
+{
+    wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, id);
+    event.SetEventObject(this);
+    event.SetInt(checked);
+
+    bool processed = false;
+
+    // Try the menu's event handler
+    // if ( !processed )
+    {
+        wxEvtHandler *handler = GetEventHandler();
+        if ( handler )
+            processed = handler->ProcessEvent(event);
+    }
+
+    // Try the window the menu was popped up from (and up through the
+    // hierarchy)
+    if ( !processed )
+    {
+        const wxMenuBase *menu = this;
+        while ( menu )
+        {
+            wxWindow *win = menu->GetInvokingWindow();
+            if ( win )
+            {
+                processed = win->GetEventHandler()->ProcessEvent(event);
+                break;
+            }
+
+            menu = menu->GetParent();
+        }
+    }
+
+    return processed;
+}
+
+// ----------------------------------------------------------------------------
+// wxMenu attaching/detaching to/from menu bar
+// ----------------------------------------------------------------------------
+
+wxMenuBar* wxMenuBase::GetMenuBar() const
+{
+    if(GetParent())
+        return GetParent()->GetMenuBar();
+    return m_menuBar;
+}
+
+void wxMenuBase::Attach(wxMenuBarBase *menubar)
+{
+    // use Detach() instead!
+    wxASSERT_MSG( menubar, _T("menu can't be attached to NULL menubar") );
+
+    // use IsAttached() to prevent this from happening
+    wxASSERT_MSG( !m_menuBar, _T("attaching menu twice?") );
+
+    m_menuBar = (wxMenuBar *)menubar;
+}
+
+void wxMenuBase::Detach()
+{
+    // use IsAttached() to prevent this from happening
+    wxASSERT_MSG( m_menuBar, _T("detaching unattached menu?") );
+
+    m_menuBar = NULL;
+}
+
+// ----------------------------------------------------------------------------
+// wxMenu functions forwarded to wxMenuItem
+// ----------------------------------------------------------------------------
+
+void wxMenuBase::Enable( int id, bool enable )
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenu::Enable: no such item") );
+
+    item->Enable(enable);
+}
+
+bool wxMenuBase::IsEnabled( int id ) const
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, false, wxT("wxMenu::IsEnabled: no such item") );
+
+    return item->IsEnabled();
+}
+
+void wxMenuBase::Check( int id, bool enable )
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenu::Check: no such item") );
+
+    item->Check(enable);
+}
+
+bool wxMenuBase::IsChecked( int id ) const
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, false, wxT("wxMenu::IsChecked: no such item") );
+
+    return item->IsChecked();
+}
+
+void wxMenuBase::SetLabel( int id, const wxString &label )
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenu::SetLabel: no such item") );
+
+    item->SetText(label);
+}
+
+wxString wxMenuBase::GetLabel( int id ) const
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetLabel: no such item") );
+
+    return item->GetText();
+}
+
+void wxMenuBase::SetHelpString( int id, const wxString& helpString )
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenu::SetHelpString: no such item") );
+
+    item->SetHelp( helpString );
+}
+
+wxString wxMenuBase::GetHelpString( int id ) const
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetHelpString: no such item") );
+
+    return item->GetHelp();
+}
+
+// ----------------------------------------------------------------------------
+// wxMenuBarBase ctor and dtor
+// ----------------------------------------------------------------------------
+
+wxMenuBarBase::wxMenuBarBase()
+{
+    // not attached yet
+    m_menuBarFrame = NULL;
+}
+
+wxMenuBarBase::~wxMenuBarBase()
+{
+    WX_CLEAR_LIST(wxMenuList, m_menus);
+}
+
+// ----------------------------------------------------------------------------
+// wxMenuBar item access: the base class versions manage m_menus list, the
+// derived class should reflect the changes in the real menubar
+// ----------------------------------------------------------------------------
+
+wxMenu *wxMenuBarBase::GetMenu(size_t pos) const
+{
+    wxMenuList::compatibility_iterator node = m_menus.Item(pos);
+    wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::GetMenu()") );
+
+    return node->GetData();
+}
+
+bool wxMenuBarBase::Append(wxMenu *menu, const wxString& WXUNUSED(title))
+{
+    wxCHECK_MSG( menu, false, wxT("can't append NULL menu") );
+
+    m_menus.Append(menu);
+    menu->Attach(this);
+
+    return true;
+}
+
+bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
+                           const wxString& title)
+{
+    if ( pos == m_menus.GetCount() )
+    {
+        return wxMenuBarBase::Append(menu, title);
+    }
+    else // not at the end
+    {
+        wxCHECK_MSG( menu, false, wxT("can't insert NULL menu") );
+
+        wxMenuList::compatibility_iterator node = m_menus.Item(pos);
+        wxCHECK_MSG( node, false, wxT("bad index in wxMenuBar::Insert()") );
+
+        m_menus.Insert(node, menu);
+        menu->Attach(this);
+
+        return true;
+    }
+}
+
+wxMenu *wxMenuBarBase::Replace(size_t pos, wxMenu *menu,
+                               const wxString& WXUNUSED(title))
+{
+    wxCHECK_MSG( menu, NULL, wxT("can't insert NULL menu") );
+
+    wxMenuList::compatibility_iterator node = m_menus.Item(pos);
+    wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Replace()") );
+
+    wxMenu *menuOld = node->GetData();
+    node->SetData(menu);
+
+    menu->Attach(this);
+    menuOld->Detach();
+
+    return menuOld;
+}
+
+wxMenu *wxMenuBarBase::Remove(size_t pos)
+{
+    wxMenuList::compatibility_iterator node = m_menus.Item(pos);
+    wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Remove()") );
+
+    wxMenu *menu = node->GetData();
+    m_menus.Erase(node);
+    menu->Detach();
+
+    return menu;
+}
+
+int wxMenuBarBase::FindMenu(const wxString& title) const
+{
+    wxString label = wxMenuItem::GetLabelFromText(title);
+
+    size_t count = GetMenuCount();
+    for ( size_t i = 0; i < count; i++ )
+    {
+        wxString title2 = GetLabelTop(i);
+        if ( (title2 == title) ||
+             (wxMenuItem::GetLabelFromText(title2) == label) )
+        {
+            // found
+            return (int)i;
+        }
+    }
+
+    return wxNOT_FOUND;
+
+}
+
+// ----------------------------------------------------------------------------
+// wxMenuBar attaching/detaching to/from the frame
+// ----------------------------------------------------------------------------
+
+void wxMenuBarBase::Attach(wxFrame *frame)
+{
+    wxASSERT_MSG( !IsAttached(), wxT("menubar already attached!") );
+
+    m_menuBarFrame = frame;
+}
+
+void wxMenuBarBase::Detach()
+{
+    wxASSERT_MSG( IsAttached(), wxT("detaching unattached menubar") );
+
+    m_menuBarFrame = NULL;
+}
+
+// ----------------------------------------------------------------------------
+// wxMenuBar searching for items
+// ----------------------------------------------------------------------------
+
+wxMenuItem *wxMenuBarBase::FindItem(int id, wxMenu **menu) const
+{
+    if ( menu )
+        *menu = NULL;
+
+    wxMenuItem *item = NULL;
+    size_t count = GetMenuCount(), i;
+    wxMenuList::const_iterator it;
+    for ( i = 0, it = m_menus.begin(); !item && (i < count); i++, it++ )
+    {
+        item = (*it)->FindItem(id, menu);
+    }
+
+    return item;
+}
+
+int wxMenuBarBase::FindMenuItem(const wxString& menu, const wxString& item) const
+{
+    wxString label = wxMenuItem::GetLabelFromText(menu);
+
+    int i = 0;
+    wxMenuList::compatibility_iterator node;
+    for ( node = m_menus.GetFirst(); node; node = node->GetNext(), i++ )
+    {
+        if ( label == wxMenuItem::GetLabelFromText(GetLabelTop(i)) )
+            return node->GetData()->FindItem(item);
+    }
+
+    return wxNOT_FOUND;
+}
+
+// ---------------------------------------------------------------------------
+// wxMenuBar functions forwarded to wxMenuItem
+// ---------------------------------------------------------------------------
+
+void wxMenuBarBase::Enable(int id, bool enable)
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("attempt to enable an item which doesn't exist") );
+
+    item->Enable(enable);
+}
+
+void wxMenuBarBase::Check(int id, bool check)
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("attempt to check an item which doesn't exist") );
+    wxCHECK_RET( item->IsCheckable(), wxT("attempt to check an uncheckable item") );
+
+    item->Check(check);
+}
+
+bool wxMenuBarBase::IsChecked(int id) const
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, false, wxT("wxMenuBar::IsChecked(): no such item") );
+
+    return item->IsChecked();
+}
+
+bool wxMenuBarBase::IsEnabled(int id) const
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, false, wxT("wxMenuBar::IsEnabled(): no such item") );
+
+    return item->IsEnabled();
+}
+
+void wxMenuBarBase::SetLabel(int id, const wxString& label)
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenuBar::SetLabel(): no such item") );
+
+    item->SetText(label);
+}
+
+wxString wxMenuBarBase::GetLabel(int id) const
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, wxEmptyString,
+                 wxT("wxMenuBar::GetLabel(): no such item") );
+
+    return item->GetText();
+}
+
+void wxMenuBarBase::SetHelpString(int id, const wxString& helpString)
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_RET( item, wxT("wxMenuBar::SetHelpString(): no such item") );
+
+    item->SetHelp(helpString);
+}
+
+wxString wxMenuBarBase::GetHelpString(int id) const
+{
+    wxMenuItem *item = FindItem(id);
+
+    wxCHECK_MSG( item, wxEmptyString,
+                 wxT("wxMenuBar::GetHelpString(): no such item") );
+
+    return item->GetHelp();
+}
+
+void wxMenuBarBase::UpdateMenus( void )
+{
+    wxEvtHandler* source;
+    wxMenu* menu;
+    int nCount = GetMenuCount();
+    for (int n = 0; n < nCount; n++)
+    {
+        menu = GetMenu( n );
+        if (menu != NULL)
+        {
+            source = menu->GetEventHandler();
+            if (source != NULL)
+                menu->UpdateUI( source );
+        }
+    }
+}
+
+// Get the text only, from the label
+wxString wxMenuBarBase::GetMenuLabelText(size_t pos) const
+{
+    return wxMenuItem::GetLabelText(((wxMenuBar*)this)->GetMenuLabel(pos));
+}
+
+
+#endif // wxUSE_MENUS
diff --git a/Source/3rd Party/wx/src/common/mimecmn.cpp b/Source/3rd Party/wx/src/common/mimecmn.cpp
index c77f2beca..8f914e347 100644
--- a/Source/3rd Party/wx/src/common/mimecmn.cpp	
+++ b/Source/3rd Party/wx/src/common/mimecmn.cpp	
@@ -1,762 +1,752 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/mimecmn.cpp
-// Purpose:     classes and functions to manage MIME types
-// Author:      Vadim Zeitlin
-// Modified by:
-//  Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32
-// Created:     23.09.98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_MIMETYPE
-
-#include "wx/mimetype.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/module.h"
-    #include "wx/crt.h"
-#endif //WX_PRECOMP
-
-#include "wx/file.h"
-#include "wx/iconloc.h"
-#include "wx/confbase.h"
-
-// other standard headers
-#include <ctype.h>
-
-// implementation classes:
-#if defined(__WINDOWS__)
-    #include "wx/msw/mimetype.h"
-#elif ( defined(__WXMAC__) )
-    #include "wx/osx/mimetype.h"
-#elif defined(__WXPM__) || defined (__EMX__)
-    #include "wx/os2/mimetype.h"
-    #undef __UNIX__
-#elif defined(__DOS__)
-    #include "wx/msdos/mimetype.h"
-#else // Unix
-    #include "wx/unix/mimetype.h"
-#endif
-
-// ============================================================================
-// common classes
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxMimeTypeCommands
-// ----------------------------------------------------------------------------
-
-void
-wxMimeTypeCommands::AddOrReplaceVerb(const wxString& verb, const wxString& cmd)
-{
-    int n = m_verbs.Index(verb, false /* ignore case */);
-    if ( n == wxNOT_FOUND )
-    {
-        m_verbs.Add(verb);
-        m_commands.Add(cmd);
-    }
-    else
-    {
-        m_commands[n] = cmd;
-    }
-}
-
-wxString
-wxMimeTypeCommands::GetCommandForVerb(const wxString& verb, size_t *idx) const
-{
-    wxString s;
-
-    int n = m_verbs.Index(verb);
-    if ( n != wxNOT_FOUND )
-    {
-        s = m_commands[(size_t)n];
-        if ( idx )
-            *idx = n;
-    }
-    else if ( idx )
-    {
-        // different from any valid index
-        *idx = (size_t)-1;
-    }
-
-    return s;
-}
-
-wxString wxMimeTypeCommands::GetVerbCmd(size_t n) const
-{
-    return m_verbs[n] + wxT('=') + m_commands[n];
-}
-
-// ----------------------------------------------------------------------------
-// wxFileTypeInfo
-// ----------------------------------------------------------------------------
-
-void wxFileTypeInfo::DoVarArgInit(const wxString& mimeType,
-                                  const wxString& openCmd,
-                                  const wxString& printCmd,
-                                  const wxString& desc,
-                                  va_list argptr)
-{
-    m_mimeType = mimeType;
-    m_openCmd = openCmd;
-    m_printCmd = printCmd;
-    m_desc = desc;
-
-    for ( ;; )
-    {
-        // icc gives this warning in its own va_arg() macro, argh
-#ifdef __INTELC__
-    #pragma warning(push)
-    #pragma warning(disable: 1684)
-#endif
-
-        wxArgNormalizedString ext(WX_VA_ARG_STRING(argptr));
-
-#ifdef __INTELC__
-    #pragma warning(pop)
-#endif
-        if ( !ext )
-        {
-            // NULL terminates the list
-            break;
-        }
-
-        m_exts.Add(ext.GetString());
-    }
-}
-
-void wxFileTypeInfo::VarArgInit(const wxString *mimeType,
-                                const wxString *openCmd,
-                                const wxString *printCmd,
-                                const wxString *desc,
-                                ...)
-{
-    va_list argptr;
-    va_start(argptr, desc);
-
-    DoVarArgInit(*mimeType, *openCmd, *printCmd, *desc, argptr);
-
-    va_end(argptr);
-}
-
-
-wxFileTypeInfo::wxFileTypeInfo(const wxArrayString& sArray)
-{
-    m_mimeType = sArray [0u];
-    m_openCmd  = sArray [1u];
-    m_printCmd = sArray [2u];
-    m_desc     = sArray [3u];
-
-    size_t count = sArray.GetCount();
-    for ( size_t i = 4; i < count; i++ )
-    {
-        m_exts.Add(sArray[i]);
-    }
-}
-
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo)
-
-// ============================================================================
-// implementation of the wrapper classes
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxFileType
-// ----------------------------------------------------------------------------
-
-/* static */
-wxString wxFileType::ExpandCommand(const wxString& command,
-                                   const wxFileType::MessageParameters& params)
-{
-    bool hasFilename = false;
-
-    // We consider that only the file names with spaces in them need to be
-    // handled specially. This is not perfect, but this can be done easily
-    // under all platforms while handling the file names with quotes in them,
-    // for example, needs to be done differently.
-    const bool needToQuoteFilename = params.GetFileName().find_first_of(" \t")
-                                        != wxString::npos;
-
-    wxString str;
-    for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) {
-        if ( *pc == wxT('%') ) {
-            switch ( *++pc ) {
-                case wxT('s'):
-                    // don't quote the file name if it's already quoted: notice
-                    // that we check for a quote following it and not preceding
-                    // it as at least under Windows we can have commands
-                    // containing "file://%s" (with quotes) in them so the
-                    // argument may be quoted even if there is no quote
-                    // directly before "%s" itself
-                    if ( needToQuoteFilename && pc[1] != '"' )
-                        str << wxT('"') << params.GetFileName() << wxT('"');
-                    else
-                        str << params.GetFileName();
-                    hasFilename = true;
-                    break;
-
-                case wxT('t'):
-                    // '%t' expands into MIME type (quote it too just to be
-                    // consistent)
-                    str << wxT('\'') << params.GetMimeType() << wxT('\'');
-                    break;
-
-                case wxT('{'):
-                    {
-                        const wxChar *pEnd = wxStrchr(pc, wxT('}'));
-                        if ( pEnd == NULL ) {
-                            wxString mimetype;
-                            wxLogWarning(_("Unmatched '{' in an entry for mime type %s."),
-                                         params.GetMimeType().c_str());
-                            str << wxT("%{");
-                        }
-                        else {
-                            wxString param(pc + 1, pEnd - pc - 1);
-                            str << wxT('\'') << params.GetParamValue(param) << wxT('\'');
-                            pc = pEnd;
-                        }
-                    }
-                    break;
-
-                case wxT('n'):
-                case wxT('F'):
-                    // TODO %n is the number of parts, %F is an array containing
-                    //      the names of temp files these parts were written to
-                    //      and their mime types.
-                    break;
-
-                default:
-                    wxLogDebug(wxT("Unknown field %%%c in command '%s'."),
-                               *pc, command.c_str());
-                    str << *pc;
-            }
-        }
-        else {
-            str << *pc;
-        }
-    }
-
-    // metamail(1) man page states that if the mailcap entry doesn't have '%s'
-    // the program will accept the data on stdin so normally we should append
-    // "< %s" to the end of the command in such case, but not all commands
-    // behave like this, in particular a common test is 'test -n "$DISPLAY"'
-    // and appending "< %s" to this command makes the test fail... I don't
-    // know of the correct solution, try to guess what we have to do.
-
-    // test now carried out on reading file so test should never get here
-    if ( !hasFilename && !str.empty()
-#ifdef __UNIX__
-                      && !str.StartsWith(wxT("test "))
-#endif // Unix
-       )
-    {
-        str << wxT(" < ");
-        if ( needToQuoteFilename )
-            str << '"';
-        str << params.GetFileName();
-        if ( needToQuoteFilename )
-            str << '"';
-    }
-
-    return str;
-}
-
-wxFileType::wxFileType(const wxFileTypeInfo& info)
-{
-    m_info = &info;
-    m_impl = NULL;
-}
-
-wxFileType::wxFileType()
-{
-    m_info = NULL;
-    m_impl = new wxFileTypeImpl;
-}
-
-wxFileType::~wxFileType()
-{
-    if ( m_impl )
-        delete m_impl;
-}
-
-bool wxFileType::GetExtensions(wxArrayString& extensions)
-{
-    if ( m_info )
-    {
-        extensions = m_info->GetExtensions();
-        return true;
-    }
-
-    return m_impl->GetExtensions(extensions);
-}
-
-bool wxFileType::GetMimeType(wxString *mimeType) const
-{
-    wxCHECK_MSG( mimeType, false, wxT("invalid parameter in GetMimeType") );
-
-    if ( m_info )
-    {
-        *mimeType = m_info->GetMimeType();
-
-        return true;
-    }
-
-    return m_impl->GetMimeType(mimeType);
-}
-
-bool wxFileType::GetMimeTypes(wxArrayString& mimeTypes) const
-{
-    if ( m_info )
-    {
-        mimeTypes.Clear();
-        mimeTypes.Add(m_info->GetMimeType());
-
-        return true;
-    }
-
-    return m_impl->GetMimeTypes(mimeTypes);
-}
-
-bool wxFileType::GetIcon(wxIconLocation *iconLoc) const
-{
-    if ( m_info )
-    {
-        if ( iconLoc )
-        {
-            iconLoc->SetFileName(m_info->GetIconFile());
-#ifdef __WINDOWS__
-            iconLoc->SetIndex(m_info->GetIconIndex());
-#endif // __WINDOWS__
-        }
-
-        return true;
-    }
-
-    return m_impl->GetIcon(iconLoc);
-}
-
-bool
-wxFileType::GetIcon(wxIconLocation *iconloc,
-                    const MessageParameters& params) const
-{
-    if ( !GetIcon(iconloc) )
-    {
-        return false;
-    }
-
-    // we may have "%s" in the icon location string, at least under Windows, so
-    // expand this
-    if ( iconloc )
-    {
-        iconloc->SetFileName(ExpandCommand(iconloc->GetFileName(), params));
-    }
-
-    return true;
-}
-
-bool wxFileType::GetDescription(wxString *desc) const
-{
-    wxCHECK_MSG( desc, false, wxT("invalid parameter in GetDescription") );
-
-    if ( m_info )
-    {
-        *desc = m_info->GetDescription();
-
-        return true;
-    }
-
-    return m_impl->GetDescription(desc);
-}
-
-bool
-wxFileType::GetOpenCommand(wxString *openCmd,
-                           const wxFileType::MessageParameters& params) const
-{
-    wxCHECK_MSG( openCmd, false, wxT("invalid parameter in GetOpenCommand") );
-
-    if ( m_info )
-    {
-        *openCmd = ExpandCommand(m_info->GetOpenCommand(), params);
-
-        return true;
-    }
-
-    return m_impl->GetOpenCommand(openCmd, params);
-}
-
-wxString wxFileType::GetOpenCommand(const wxString& filename) const
-{
-    wxString cmd;
-    if ( !GetOpenCommand(&cmd, filename) )
-    {
-        // return empty string to indicate an error
-        cmd.clear();
-    }
-
-    return cmd;
-}
-
-bool
-wxFileType::GetPrintCommand(wxString *printCmd,
-                            const wxFileType::MessageParameters& params) const
-{
-    wxCHECK_MSG( printCmd, false, wxT("invalid parameter in GetPrintCommand") );
-
-    if ( m_info )
-    {
-        *printCmd = ExpandCommand(m_info->GetPrintCommand(), params);
-
-        return true;
-    }
-
-    return m_impl->GetPrintCommand(printCmd, params);
-}
-
-
-size_t wxFileType::GetAllCommands(wxArrayString *verbs,
-                                  wxArrayString *commands,
-                                  const wxFileType::MessageParameters& params) const
-{
-    if ( verbs )
-        verbs->Clear();
-    if ( commands )
-        commands->Clear();
-
-#if defined (__WINDOWS__)  || defined(__UNIX__)
-    return m_impl->GetAllCommands(verbs, commands, params);
-#else // !__WINDOWS__ || __UNIX__
-    // we don't know how to retrieve all commands, so just try the 2 we know
-    // about
-    size_t count = 0;
-    wxString cmd;
-    if ( GetOpenCommand(&cmd, params) )
-    {
-        if ( verbs )
-            verbs->Add(wxT("Open"));
-        if ( commands )
-            commands->Add(cmd);
-        count++;
-    }
-
-    if ( GetPrintCommand(&cmd, params) )
-    {
-        if ( verbs )
-            verbs->Add(wxT("Print"));
-        if ( commands )
-            commands->Add(cmd);
-
-        count++;
-    }
-
-    return count;
-#endif // __WINDOWS__/| __UNIX__
-}
-
-bool wxFileType::Unassociate()
-{
-#if defined(__WINDOWS__)
-    return m_impl->Unassociate();
-#elif defined(__UNIX__)
-    return m_impl->Unassociate(this);
-#else
-    wxFAIL_MSG( wxT("not implemented") ); // TODO
-    return false;
-#endif
-}
-
-bool wxFileType::SetCommand(const wxString& cmd,
-                            const wxString& verb,
-                            bool overwriteprompt)
-{
-#if defined (__WINDOWS__)  || defined(__UNIX__)
-    return m_impl->SetCommand(cmd, verb, overwriteprompt);
-#else
-    wxUnusedVar(cmd);
-    wxUnusedVar(verb);
-    wxUnusedVar(overwriteprompt);
-    wxFAIL_MSG(wxT("not implemented"));
-    return false;
-#endif
-}
-
-bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
-{
-    wxString sTmp = cmd;
-#ifdef __WINDOWS__
-    // VZ: should we do this?
-    // chris elliott : only makes sense in MS windows
-    if ( sTmp.empty() )
-        GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));
-#endif
-    wxCHECK_MSG( !sTmp.empty(), false, wxT("need the icon file") );
-
-#if defined (__WINDOWS__) || defined(__UNIX__)
-    return m_impl->SetDefaultIcon (cmd, index);
-#else
-    wxUnusedVar(index);
-    wxFAIL_MSG(wxT("not implemented"));
-    return false;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// wxMimeTypesManagerFactory
-// ----------------------------------------------------------------------------
-
-wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL;
-
-/* static */
-void wxMimeTypesManagerFactory::Set(wxMimeTypesManagerFactory *factory)
-{
-    delete m_factory;
-
-    m_factory = factory;
-}
-
-/* static */
-wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::Get()
-{
-    if ( !m_factory )
-        m_factory = new wxMimeTypesManagerFactory;
-
-    return m_factory;
-}
-
-wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()
-{
-    return new wxMimeTypesManagerImpl;
-}
-
-// ----------------------------------------------------------------------------
-// wxMimeTypesManager
-// ----------------------------------------------------------------------------
-
-void wxMimeTypesManager::EnsureImpl()
-{
-    if ( !m_impl )
-        m_impl = wxMimeTypesManagerFactory::Get()->CreateMimeTypesManagerImpl();
-}
-
-bool wxMimeTypesManager::IsOfType(const wxString& mimeType,
-                                  const wxString& wildcard)
-{
-    wxASSERT_MSG( mimeType.Find(wxT('*')) == wxNOT_FOUND,
-                  wxT("first MIME type can't contain wildcards") );
-
-    // all comparaisons are case insensitive (2nd arg of IsSameAs() is false)
-    if ( wildcard.BeforeFirst(wxT('/')).
-            IsSameAs(mimeType.BeforeFirst(wxT('/')), false) )
-    {
-        wxString strSubtype = wildcard.AfterFirst(wxT('/'));
-
-        if ( strSubtype == wxT("*") ||
-             strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), false) )
-        {
-            // matches (either exactly or it's a wildcard)
-            return true;
-        }
-    }
-
-    return false;
-}
-
-wxMimeTypesManager::wxMimeTypesManager()
-{
-    m_impl = NULL;
-}
-
-wxMimeTypesManager::~wxMimeTypesManager()
-{
-    if ( m_impl )
-        delete m_impl;
-}
-
-bool wxMimeTypesManager::Unassociate(wxFileType *ft)
-{
-    EnsureImpl();
-
-#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
-    return m_impl->Unassociate(ft);
-#else
-    return ft->Unassociate();
-#endif
-}
-
-
-wxFileType *
-wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
-{
-    EnsureImpl();
-
-#if defined(__WINDOWS__) || defined(__UNIX__)
-    return m_impl->Associate(ftInfo);
-#else // other platforms
-    wxUnusedVar(ftInfo);
-    wxFAIL_MSG( wxT("not implemented") ); // TODO
-    return NULL;
-#endif // platforms
-}
-
-wxFileType *
-wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext)
-{
-    EnsureImpl();
-
-    wxString::const_iterator i = ext.begin();
-    const wxString::const_iterator end = ext.end();
-    wxString extWithoutDot;
-    if ( i != end && *i == '.' )
-        extWithoutDot.assign(++i, ext.end());
-    else
-        extWithoutDot = ext;
-
-    wxCHECK_MSG( !ext.empty(), NULL, wxT("extension can't be empty") );
-
-    wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot);
-
-    if ( !ft ) {
-        // check the fallbacks
-        //
-        // TODO linear search is potentially slow, perhaps we should use a
-        //       sorted array?
-        size_t count = m_fallbacks.GetCount();
-        for ( size_t n = 0; n < count; n++ ) {
-            if ( m_fallbacks[n].GetExtensions().Index(ext) != wxNOT_FOUND ) {
-                ft = new wxFileType(m_fallbacks[n]);
-
-                break;
-            }
-        }
-    }
-
-    return ft;
-}
-
-wxFileType *
-wxMimeTypesManager::GetFileTypeFromMimeType(const wxString& mimeType)
-{
-    EnsureImpl();
-    wxFileType *ft = m_impl->GetFileTypeFromMimeType(mimeType);
-
-    if ( !ft ) {
-        // check the fallbacks
-        //
-        // TODO linear search is potentially slow, perhaps we should use a
-        //      sorted array?
-        size_t count = m_fallbacks.GetCount();
-        for ( size_t n = 0; n < count; n++ ) {
-            if ( wxMimeTypesManager::IsOfType(mimeType,
-                                              m_fallbacks[n].GetMimeType()) ) {
-                ft = new wxFileType(m_fallbacks[n]);
-
-                break;
-            }
-        }
-    }
-
-    return ft;
-}
-
-void wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo *filetypes)
-{
-    EnsureImpl();
-    for ( const wxFileTypeInfo *ft = filetypes; ft && ft->IsValid(); ft++ ) {
-        AddFallback(*ft);
-    }
-}
-
-size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
-{
-    EnsureImpl();
-    size_t countAll = m_impl->EnumAllFileTypes(mimetypes);
-
-    // add the fallback filetypes
-    size_t count = m_fallbacks.GetCount();
-    for ( size_t n = 0; n < count; n++ ) {
-        if ( mimetypes.Index(m_fallbacks[n].GetMimeType()) == wxNOT_FOUND ) {
-            mimetypes.Add(m_fallbacks[n].GetMimeType());
-            countAll++;
-        }
-    }
-
-    return countAll;
-}
-
-void wxMimeTypesManager::Initialize(int mcapStyle,
-                                    const wxString& sExtraDir)
-{
-#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
-    EnsureImpl();
-
-    m_impl->Initialize(mcapStyle, sExtraDir);
-#else
-    (void)mcapStyle;
-    (void)sExtraDir;
-#endif // Unix
-}
-
-// and this function clears all the data from the manager
-void wxMimeTypesManager::ClearData()
-{
-#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
-    EnsureImpl();
-
-    m_impl->ClearData();
-#endif // Unix
-}
-
-// ----------------------------------------------------------------------------
-// global data and wxMimeTypeCmnModule
-// ----------------------------------------------------------------------------
-
-// private object
-static wxMimeTypesManager gs_mimeTypesManager;
-
-// and public pointer
-wxMimeTypesManager *wxTheMimeTypesManager = &gs_mimeTypesManager;
-
-class wxMimeTypeCmnModule: public wxModule
-{
-public:
-    wxMimeTypeCmnModule() : wxModule() { }
-
-    virtual bool OnInit() { return true; }
-    virtual void OnExit()
-    {
-        wxMimeTypesManagerFactory::Set(NULL);
-
-        if ( gs_mimeTypesManager.m_impl != NULL )
-        {
-            wxDELETE(gs_mimeTypesManager.m_impl);
-            gs_mimeTypesManager.m_fallbacks.Clear();
-        }
-    }
-
-    DECLARE_DYNAMIC_CLASS(wxMimeTypeCmnModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxMimeTypeCmnModule, wxModule)
-
-#endif // wxUSE_MIMETYPE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/mimecmn.cpp
+// Purpose:     classes and functions to manage MIME types
+// Author:      Vadim Zeitlin
+// Modified by:
+//  Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32
+// Created:     23.09.98
+// RCS-ID:      $Id: mimecmn.cpp 47027 2007-06-29 18:23:39Z VZ $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence (part of wxExtra library)
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_MIMETYPE
+
+#include "wx/mimetype.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/module.h"
+#endif //WX_PRECOMP
+
+#include "wx/file.h"
+#include "wx/iconloc.h"
+#include "wx/confbase.h"
+
+// other standard headers
+#include <ctype.h>
+
+// implementation classes:
+#if defined(__WXMSW__)
+    #include "wx/msw/mimetype.h"
+#elif defined(__WXMAC__)
+    #include "wx/mac/mimetype.h"
+#elif defined(__WXPM__) || defined (__EMX__)
+    #include "wx/os2/mimetype.h"
+    #undef __UNIX__
+#elif defined(__DOS__)
+    #include "wx/msdos/mimetype.h"
+#else // Unix
+    #include "wx/unix/mimetype.h"
+#endif
+
+// ============================================================================
+// common classes
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxMimeTypeCommands
+// ----------------------------------------------------------------------------
+
+void
+wxMimeTypeCommands::AddOrReplaceVerb(const wxString& verb, const wxString& cmd)
+{
+    int n = m_verbs.Index(verb, false /* ignore case */);
+    if ( n == wxNOT_FOUND )
+    {
+        m_verbs.Add(verb);
+        m_commands.Add(cmd);
+    }
+    else
+    {
+        m_commands[n] = cmd;
+    }
+}
+
+wxString
+wxMimeTypeCommands::GetCommandForVerb(const wxString& verb, size_t *idx) const
+{
+    wxString s;
+
+    int n = m_verbs.Index(verb);
+    if ( n != wxNOT_FOUND )
+    {
+        s = m_commands[(size_t)n];
+        if ( idx )
+            *idx = n;
+    }
+    else if ( idx )
+    {
+        // different from any valid index
+        *idx = (size_t)-1;
+    }
+
+    return s;
+}
+
+wxString wxMimeTypeCommands::GetVerbCmd(size_t n) const
+{
+    return m_verbs[n] + wxT('=') + m_commands[n];
+}
+
+// ----------------------------------------------------------------------------
+// wxFileTypeInfo
+// ----------------------------------------------------------------------------
+
+wxFileTypeInfo::wxFileTypeInfo(const wxChar *mimeType,
+                               const wxChar *openCmd,
+                               const wxChar *printCmd,
+                               const wxChar *desc,
+                               ...)
+              : m_mimeType(mimeType),
+                m_openCmd(openCmd),
+                m_printCmd(printCmd),
+                m_desc(desc)
+{
+    va_list argptr;
+    va_start(argptr, desc);
+
+    for ( ;; )
+    {
+        // icc gives this warning in its own va_arg() macro, argh
+#ifdef __INTELC__
+    #pragma warning(push)
+    #pragma warning(disable: 1684)
+#endif
+
+        const wxChar *ext = va_arg(argptr, const wxChar *);
+
+#ifdef __INTELC__
+    #pragma warning(pop)
+#endif
+        if ( !ext )
+        {
+            // NULL terminates the list
+            break;
+        }
+
+        m_exts.Add(ext);
+    }
+
+    va_end(argptr);
+}
+
+
+wxFileTypeInfo::wxFileTypeInfo(const wxArrayString& sArray)
+{
+    m_mimeType = sArray [0u];
+    m_openCmd  = sArray [1u];
+    m_printCmd = sArray [2u];
+    m_desc     = sArray [3u];
+
+    size_t count = sArray.GetCount();
+    for ( size_t i = 4; i < count; i++ )
+    {
+        m_exts.Add(sArray[i]);
+    }
+}
+
+#include "wx/arrimpl.cpp"
+WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo)
+
+// ============================================================================
+// implementation of the wrapper classes
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFileType
+// ----------------------------------------------------------------------------
+
+/* static */
+wxString wxFileType::ExpandCommand(const wxString& command,
+                                   const wxFileType::MessageParameters& params)
+{
+    bool hasFilename = false;
+
+    wxString str;
+    for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) {
+        if ( *pc == wxT('%') ) {
+            switch ( *++pc ) {
+                case wxT('s'):
+                    // '%s' expands into file name (quoted because it might
+                    // contain spaces) - except if there are already quotes
+                    // there because otherwise some programs may get confused
+                    // by double double quotes
+#if 0
+                    if ( *(pc - 2) == wxT('"') )
+                        str << params.GetFileName();
+                    else
+                        str << wxT('"') << params.GetFileName() << wxT('"');
+#endif
+                    str << params.GetFileName();
+                    hasFilename = true;
+                    break;
+
+                case wxT('t'):
+                    // '%t' expands into MIME type (quote it too just to be
+                    // consistent)
+                    str << wxT('\'') << params.GetMimeType() << wxT('\'');
+                    break;
+
+                case wxT('{'):
+                    {
+                        const wxChar *pEnd = wxStrchr(pc, wxT('}'));
+                        if ( pEnd == NULL ) {
+                            wxString mimetype;
+                            wxLogWarning(_("Unmatched '{' in an entry for mime type %s."),
+                                         params.GetMimeType().c_str());
+                            str << wxT("%{");
+                        }
+                        else {
+                            wxString param(pc + 1, pEnd - pc - 1);
+                            str << wxT('\'') << params.GetParamValue(param) << wxT('\'');
+                            pc = pEnd;
+                        }
+                    }
+                    break;
+
+                case wxT('n'):
+                case wxT('F'):
+                    // TODO %n is the number of parts, %F is an array containing
+                    //      the names of temp files these parts were written to
+                    //      and their mime types.
+                    break;
+
+                default:
+                    wxLogDebug(wxT("Unknown field %%%c in command '%s'."),
+                               *pc, command.c_str());
+                    str << *pc;
+            }
+        }
+        else {
+            str << *pc;
+        }
+    }
+
+    // metamail(1) man page states that if the mailcap entry doesn't have '%s'
+    // the program will accept the data on stdin so normally we should append
+    // "< %s" to the end of the command in such case, but not all commands
+    // behave like this, in particular a common test is 'test -n "$DISPLAY"'
+    // and appending "< %s" to this command makes the test fail... I don't
+    // know of the correct solution, try to guess what we have to do.
+
+    // test now carried out on reading file so test should never get here
+    if ( !hasFilename && !str.empty()
+#ifdef __UNIX__
+                      && !str.StartsWith(_T("test "))
+#endif // Unix
+       ) {
+        str << wxT(" < '") << params.GetFileName() << wxT('\'');
+    }
+
+    return str;
+}
+
+wxFileType::wxFileType(const wxFileTypeInfo& info)
+{
+    m_info = &info;
+    m_impl = NULL;
+}
+
+wxFileType::wxFileType()
+{
+    m_info = NULL;
+    m_impl = new wxFileTypeImpl;
+}
+
+wxFileType::~wxFileType()
+{
+    if ( m_impl )
+        delete m_impl;
+}
+
+bool wxFileType::GetExtensions(wxArrayString& extensions)
+{
+    if ( m_info )
+    {
+        extensions = m_info->GetExtensions();
+        return true;
+    }
+
+    return m_impl->GetExtensions(extensions);
+}
+
+bool wxFileType::GetMimeType(wxString *mimeType) const
+{
+    wxCHECK_MSG( mimeType, false, _T("invalid parameter in GetMimeType") );
+
+    if ( m_info )
+    {
+        *mimeType = m_info->GetMimeType();
+
+        return true;
+    }
+
+    return m_impl->GetMimeType(mimeType);
+}
+
+bool wxFileType::GetMimeTypes(wxArrayString& mimeTypes) const
+{
+    if ( m_info )
+    {
+        mimeTypes.Clear();
+        mimeTypes.Add(m_info->GetMimeType());
+
+        return true;
+    }
+
+    return m_impl->GetMimeTypes(mimeTypes);
+}
+
+bool wxFileType::GetIcon(wxIconLocation *iconLoc) const
+{
+    if ( m_info )
+    {
+        if ( iconLoc )
+        {
+            iconLoc->SetFileName(m_info->GetIconFile());
+#ifdef __WXMSW__
+            iconLoc->SetIndex(m_info->GetIconIndex());
+#endif // __WXMSW__
+        }
+
+        return true;
+    }
+
+    return m_impl->GetIcon(iconLoc);
+}
+
+bool
+wxFileType::GetIcon(wxIconLocation *iconloc,
+                    const MessageParameters& params) const
+{
+    if ( !GetIcon(iconloc) )
+    {
+        return false;
+    }
+
+    // we may have "%s" in the icon location string, at least under Windows, so
+    // expand this
+    if ( iconloc )
+    {
+        iconloc->SetFileName(ExpandCommand(iconloc->GetFileName(), params));
+    }
+
+    return true;
+}
+
+bool wxFileType::GetDescription(wxString *desc) const
+{
+    wxCHECK_MSG( desc, false, _T("invalid parameter in GetDescription") );
+
+    if ( m_info )
+    {
+        *desc = m_info->GetDescription();
+
+        return true;
+    }
+
+    return m_impl->GetDescription(desc);
+}
+
+bool
+wxFileType::GetOpenCommand(wxString *openCmd,
+                           const wxFileType::MessageParameters& params) const
+{
+    wxCHECK_MSG( openCmd, false, _T("invalid parameter in GetOpenCommand") );
+
+    if ( m_info )
+    {
+        *openCmd = ExpandCommand(m_info->GetOpenCommand(), params);
+
+        return true;
+    }
+
+    return m_impl->GetOpenCommand(openCmd, params);
+}
+
+wxString wxFileType::GetOpenCommand(const wxString& filename) const
+{
+    wxString cmd;
+    if ( !GetOpenCommand(&cmd, filename) )
+    {
+        // return empty string to indicate an error
+        cmd.clear();
+    }
+
+    return cmd;
+}
+
+bool
+wxFileType::GetPrintCommand(wxString *printCmd,
+                            const wxFileType::MessageParameters& params) const
+{
+    wxCHECK_MSG( printCmd, false, _T("invalid parameter in GetPrintCommand") );
+
+    if ( m_info )
+    {
+        *printCmd = ExpandCommand(m_info->GetPrintCommand(), params);
+
+        return true;
+    }
+
+    return m_impl->GetPrintCommand(printCmd, params);
+}
+
+
+size_t wxFileType::GetAllCommands(wxArrayString *verbs,
+                                  wxArrayString *commands,
+                                  const wxFileType::MessageParameters& params) const
+{
+    if ( verbs )
+        verbs->Clear();
+    if ( commands )
+        commands->Clear();
+
+#if defined (__WXMSW__)  || defined(__UNIX__)
+    return m_impl->GetAllCommands(verbs, commands, params);
+#else // !__WXMSW__ || Unix
+    // we don't know how to retrieve all commands, so just try the 2 we know
+    // about
+    size_t count = 0;
+    wxString cmd;
+    if ( GetOpenCommand(&cmd, params) )
+    {
+        if ( verbs )
+            verbs->Add(_T("Open"));
+        if ( commands )
+            commands->Add(cmd);
+        count++;
+    }
+
+    if ( GetPrintCommand(&cmd, params) )
+    {
+        if ( verbs )
+            verbs->Add(_T("Print"));
+        if ( commands )
+            commands->Add(cmd);
+
+        count++;
+    }
+
+    return count;
+#endif // __WXMSW__/| __UNIX__
+}
+
+bool wxFileType::Unassociate()
+{
+#if defined(__WXMSW__)
+    return m_impl->Unassociate();
+#elif defined(__UNIX__)
+    return m_impl->Unassociate(this);
+#else
+    wxFAIL_MSG( _T("not implemented") ); // TODO
+    return false;
+#endif
+}
+
+bool wxFileType::SetCommand(const wxString& cmd,
+                            const wxString& verb,
+                            bool overwriteprompt)
+{
+#if defined (__WXMSW__)  || defined(__UNIX__)
+    return m_impl->SetCommand(cmd, verb, overwriteprompt);
+#else
+    wxUnusedVar(cmd);
+    wxUnusedVar(verb);
+    wxUnusedVar(overwriteprompt);
+    wxFAIL_MSG(_T("not implemented"));
+    return false;
+#endif
+}
+
+bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
+{
+    wxString sTmp = cmd;
+#ifdef __WXMSW__
+    // VZ: should we do this?
+    // chris elliott : only makes sense in MS windows
+    if ( sTmp.empty() )
+        GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));
+#endif
+    wxCHECK_MSG( !sTmp.empty(), false, _T("need the icon file") );
+
+#if defined (__WXMSW__) || defined(__UNIX__)
+    return m_impl->SetDefaultIcon (cmd, index);
+#else
+    wxUnusedVar(index);
+    wxFAIL_MSG(_T("not implemented"));
+    return false;
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// wxMimeTypesManagerFactory
+// ----------------------------------------------------------------------------
+
+wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::m_factory = NULL;
+
+/* static */
+void wxMimeTypesManagerFactory::Set(wxMimeTypesManagerFactory *factory)
+{
+    delete m_factory;
+
+    m_factory = factory;
+}
+
+/* static */
+wxMimeTypesManagerFactory *wxMimeTypesManagerFactory::Get()
+{
+    if ( !m_factory )
+        m_factory = new wxMimeTypesManagerFactory;
+
+    return m_factory;
+}
+
+wxMimeTypesManagerImpl *wxMimeTypesManagerFactory::CreateMimeTypesManagerImpl()
+{
+    return new wxMimeTypesManagerImpl;
+}
+
+// ----------------------------------------------------------------------------
+// wxMimeTypesManager
+// ----------------------------------------------------------------------------
+
+void wxMimeTypesManager::EnsureImpl()
+{
+    if ( !m_impl )
+        m_impl = wxMimeTypesManagerFactory::Get()->CreateMimeTypesManagerImpl();
+}
+
+bool wxMimeTypesManager::IsOfType(const wxString& mimeType,
+                                  const wxString& wildcard)
+{
+    wxASSERT_MSG( mimeType.Find(wxT('*')) == wxNOT_FOUND,
+                  wxT("first MIME type can't contain wildcards") );
+
+    // all comparaisons are case insensitive (2nd arg of IsSameAs() is false)
+    if ( wildcard.BeforeFirst(wxT('/')).
+            IsSameAs(mimeType.BeforeFirst(wxT('/')), false) )
+    {
+        wxString strSubtype = wildcard.AfterFirst(wxT('/'));
+
+        if ( strSubtype == wxT("*") ||
+             strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), false) )
+        {
+            // matches (either exactly or it's a wildcard)
+            return true;
+        }
+    }
+
+    return false;
+}
+
+wxMimeTypesManager::wxMimeTypesManager()
+{
+    m_impl = NULL;
+}
+
+wxMimeTypesManager::~wxMimeTypesManager()
+{
+    if ( m_impl )
+        delete m_impl;
+}
+
+bool wxMimeTypesManager::Unassociate(wxFileType *ft)
+{
+    EnsureImpl();
+
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
+    return m_impl->Unassociate(ft);
+#else
+    return ft->Unassociate();
+#endif
+}
+
+
+wxFileType *
+wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
+{
+    EnsureImpl();
+
+#if defined(__WXMSW__) || defined(__UNIX__)
+    return m_impl->Associate(ftInfo);
+#else // other platforms
+    wxUnusedVar(ftInfo);
+    wxFAIL_MSG( _T("not implemented") ); // TODO
+    return NULL;
+#endif // platforms
+}
+
+wxFileType *
+wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext)
+{
+    EnsureImpl();
+
+    wxString::const_iterator i = ext.begin();
+    const wxString::const_iterator end = ext.end();
+    wxString extWithoutDot;
+    if ( i != end && *i == '.' )
+        extWithoutDot.assign(++i, ext.end());
+    else
+        extWithoutDot = ext;
+
+    wxCHECK_MSG( !ext.empty(), NULL, _T("extension can't be empty") );
+
+    wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot);
+
+    if ( !ft ) {
+        // check the fallbacks
+        //
+        // TODO linear search is potentially slow, perhaps we should use a
+        //       sorted array?
+        size_t count = m_fallbacks.GetCount();
+        for ( size_t n = 0; n < count; n++ ) {
+            if ( m_fallbacks[n].GetExtensions().Index(ext) != wxNOT_FOUND ) {
+                ft = new wxFileType(m_fallbacks[n]);
+
+                break;
+            }
+        }
+    }
+
+    return ft;
+}
+
+wxFileType *
+wxMimeTypesManager::GetFileTypeFromMimeType(const wxString& mimeType)
+{
+    EnsureImpl();
+    wxFileType *ft = m_impl->GetFileTypeFromMimeType(mimeType);
+
+    if ( !ft ) {
+        // check the fallbacks
+        //
+        // TODO linear search is potentially slow, perhaps we should use a
+        //      sorted array?
+        size_t count = m_fallbacks.GetCount();
+        for ( size_t n = 0; n < count; n++ ) {
+            if ( wxMimeTypesManager::IsOfType(mimeType,
+                                              m_fallbacks[n].GetMimeType()) ) {
+                ft = new wxFileType(m_fallbacks[n]);
+
+                break;
+            }
+        }
+    }
+
+    return ft;
+}
+
+bool wxMimeTypesManager::ReadMailcap(const wxString& filename, bool fallback)
+{
+    EnsureImpl();
+    return m_impl->ReadMailcap(filename, fallback);
+}
+
+bool wxMimeTypesManager::ReadMimeTypes(const wxString& filename)
+{
+    EnsureImpl();
+    return m_impl->ReadMimeTypes(filename);
+}
+
+void wxMimeTypesManager::AddFallbacks(const wxFileTypeInfo *filetypes)
+{
+    EnsureImpl();
+    for ( const wxFileTypeInfo *ft = filetypes; ft && ft->IsValid(); ft++ ) {
+        AddFallback(*ft);
+    }
+}
+
+size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
+{
+    EnsureImpl();
+    size_t countAll = m_impl->EnumAllFileTypes(mimetypes);
+
+    // add the fallback filetypes
+    size_t count = m_fallbacks.GetCount();
+    for ( size_t n = 0; n < count; n++ ) {
+        if ( mimetypes.Index(m_fallbacks[n].GetMimeType()) == wxNOT_FOUND ) {
+            mimetypes.Add(m_fallbacks[n].GetMimeType());
+            countAll++;
+        }
+    }
+
+    return countAll;
+}
+
+void wxMimeTypesManager::Initialize(int mcapStyle,
+                                    const wxString& sExtraDir)
+{
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
+    EnsureImpl();
+
+    m_impl->Initialize(mcapStyle, sExtraDir);
+#else
+    (void)mcapStyle;
+    (void)sExtraDir;
+#endif // Unix
+}
+
+// and this function clears all the data from the manager
+void wxMimeTypesManager::ClearData()
+{
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
+    EnsureImpl();
+
+    m_impl->ClearData();
+#endif // Unix
+}
+
+// ----------------------------------------------------------------------------
+// global data and wxMimeTypeCmnModule
+// ----------------------------------------------------------------------------
+
+// private object
+static wxMimeTypesManager gs_mimeTypesManager;
+
+// and public pointer
+wxMimeTypesManager *wxTheMimeTypesManager = &gs_mimeTypesManager;
+
+class wxMimeTypeCmnModule: public wxModule
+{
+public:
+    wxMimeTypeCmnModule() : wxModule() { }
+
+    virtual bool OnInit() { return true; }
+    virtual void OnExit()
+    {
+        wxMimeTypesManagerFactory::Set(NULL);
+
+        if ( gs_mimeTypesManager.m_impl != NULL )
+        {
+            delete gs_mimeTypesManager.m_impl;
+            gs_mimeTypesManager.m_impl = NULL;
+            gs_mimeTypesManager.m_fallbacks.Clear();
+        }
+    }
+
+    DECLARE_DYNAMIC_CLASS(wxMimeTypeCmnModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxMimeTypeCmnModule, wxModule)
+
+#endif // wxUSE_MIMETYPE
diff --git a/Source/3rd Party/wx/src/common/module.cpp b/Source/3rd Party/wx/src/common/module.cpp
index 9ee1ba6b6..d4d963b63 100644
--- a/Source/3rd Party/wx/src/common/module.cpp	
+++ b/Source/3rd Party/wx/src/common/module.cpp	
@@ -1,225 +1,202 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/module.cpp
-// Purpose:     Modules initialization/destruction
-// Author:      Wolfram Gloger/adapted by Guilhem Lavaux
-// Modified by:
-// Created:     04/11/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Wolfram Gloger and Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/module.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/hash.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/listimpl.cpp"
-
-#define TRACE_MODULE wxT("module")
-
-WX_DEFINE_LIST(wxModuleList)
-
-wxIMPLEMENT_ABSTRACT_CLASS(wxModule, wxObject)
-
-wxModuleList wxModule::m_modules;
-
-void wxModule::RegisterModule(wxModule* module)
-{
-    module->m_state = State_Registered;
-    m_modules.Append(module);
-}
-
-void wxModule::UnregisterModule(wxModule* module)
-{
-    m_modules.DeleteObject(module);
-    delete module;
-}
-
-// Collect up all module-derived classes, create an instance of each,
-// and register them.
-void wxModule::RegisterModules()
-{
-    for (wxClassInfo::const_iterator it  = wxClassInfo::begin_classinfo(),
-                                     end = wxClassInfo::end_classinfo();
-         it != end; ++it)
-    {
-        const wxClassInfo* classInfo = *it;
-
-        if ( classInfo->IsKindOf(wxCLASSINFO(wxModule)) &&
-             (classInfo != (& (wxModule::ms_classInfo))) )
-        {
-            wxLogTrace(TRACE_MODULE, wxT("Registering module %s"),
-                       classInfo->GetClassName());
-            wxModule* module = (wxModule *)classInfo->CreateObject();
-            wxModule::RegisterModule(module);
-        }
-    }
-}
-
-bool wxModule::DoInitializeModule(wxModule *module,
-                                  wxModuleList &initializedModules)
-{
-    if ( module->m_state == State_Initializing )
-    {
-        wxLogError(_("Circular dependency involving module \"%s\" detected."),
-                   module->GetClassInfo()->GetClassName());
-        return false;
-    }
-
-    module->m_state = State_Initializing;
-
-    // translate named dependencies to the normal ones first
-    if ( !module->ResolveNamedDependencies() )
-      return false;
-
-    const wxArrayClassInfo& dependencies = module->m_dependencies;
-
-    // satisfy module dependencies by loading them before the current module
-    for ( unsigned int i = 0; i < dependencies.size(); ++i )
-    {
-        wxClassInfo * cinfo = dependencies[i];
-
-        // Check if the module is already initialized
-        wxModuleList::compatibility_iterator node;
-        for ( node = initializedModules.GetFirst(); node; node = node->GetNext() )
-        {
-            if ( node->GetData()->GetClassInfo() == cinfo )
-                break;
-        }
-
-        if ( node )
-        {
-            // this dependency is already initialized, nothing to do
-            continue;
-        }
-
-        // find the module in the registered modules list
-        for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
-        {
-            wxModule *moduleDep = node->GetData();
-            if ( moduleDep->GetClassInfo() == cinfo )
-            {
-                if ( !DoInitializeModule(moduleDep, initializedModules ) )
-                {
-                    // failed to initialize a dependency, so fail this one too
-                    return false;
-                }
-
-                break;
-            }
-        }
-
-        if ( !node )
-        {
-            wxLogError(_("Dependency \"%s\" of module \"%s\" doesn't exist."),
-                       cinfo->GetClassName(),
-                       module->GetClassInfo()->GetClassName());
-            return false;
-        }
-    }
-
-    if ( !module->Init() )
-    {
-        wxLogError(_("Module \"%s\" initialization failed"),
-                   module->GetClassInfo()->GetClassName());
-        return false;
-    }
-
-    wxLogTrace(TRACE_MODULE, wxT("Module \"%s\" initialized"),
-               module->GetClassInfo()->GetClassName());
-
-    module->m_state = State_Initialized;
-    initializedModules.Append(module);
-
-    return true;
-}
-
-// Initialize user-defined modules
-bool wxModule::InitializeModules()
-{
-    wxModuleList initializedModules;
-
-    for ( wxModuleList::compatibility_iterator node = m_modules.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxModule *module = node->GetData();
-
-        // the module could have been already initialized as dependency of
-        // another one
-        if ( module->m_state == State_Registered )
-        {
-            if ( !DoInitializeModule( module, initializedModules ) )
-            {
-                // failed to initialize all modules, so clean up the already
-                // initialized ones
-                DoCleanUpModules(initializedModules);
-
-                return false;
-            }
-        }
-    }
-
-    // remember the real initialisation order
-    m_modules = initializedModules;
-
-    return true;
-}
-
-// Clean up all currently initialized modules
-void wxModule::DoCleanUpModules(const wxModuleList& modules)
-{
-    // cleanup user-defined modules in the reverse order compared to their
-    // initialization -- this ensures that dependencies are respected
-    for ( wxModuleList::compatibility_iterator node = modules.GetLast();
-          node;
-          node = node->GetPrevious() )
-    {
-        wxLogTrace(TRACE_MODULE, wxT("Cleanup module %s"),
-                   node->GetData()->GetClassInfo()->GetClassName());
-
-        wxModule * module = node->GetData();
-
-        wxASSERT_MSG( module->m_state == State_Initialized,
-                        wxT("not initialized module being cleaned up") );
-
-        module->Exit();
-        module->m_state = State_Registered;
-    }
-
-    // clear all modules, even the non-initialized ones
-    WX_CLEAR_LIST(wxModuleList, m_modules);
-}
-
-bool wxModule::ResolveNamedDependencies()
-{
-    // first resolve required dependencies
-    for ( size_t i = 0; i < m_namedDependencies.size(); ++i )
-    {
-        wxClassInfo *info = wxClassInfo::FindClass(m_namedDependencies[i]);
-
-        if ( !info )
-        {
-            // required dependency not found
-            return false;
-        }
-
-        // add it even if it is not derived from wxModule because
-        // DoInitializeModule() will make sure a module with the same class
-        // info exists and fail if it doesn't
-        m_dependencies.Add(info);
-    }
-
-    return true;
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/module.cpp
+// Purpose:     Modules initialization/destruction
+// Author:      Wolfram Gloger/adapted by Guilhem Lavaux
+// Modified by:
+// Created:     04/11/98
+// RCS-ID:      $Id: module.cpp 39677 2006-06-11 22:19:12Z VZ $
+// Copyright:   (c) Wolfram Gloger and Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/module.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/listimpl.cpp"
+
+#define TRACE_MODULE _T("module")
+
+WX_DEFINE_LIST(wxModuleList)
+
+IMPLEMENT_CLASS(wxModule, wxObject)
+
+wxModuleList wxModule::m_modules;
+
+void wxModule::RegisterModule(wxModule* module)
+{
+    module->m_state = State_Registered;
+    m_modules.Append(module);
+}
+
+void wxModule::UnregisterModule(wxModule* module)
+{
+    m_modules.DeleteObject(module);
+    delete module;
+}
+
+// Collect up all module-derived classes, create an instance of each,
+// and register them.
+void wxModule::RegisterModules()
+{
+    wxHashTable::compatibility_iterator node;
+    wxClassInfo* classInfo;
+
+    wxClassInfo::sm_classTable->BeginFind();
+    node = wxClassInfo::sm_classTable->Next();
+    while (node)
+    {
+        classInfo = (wxClassInfo *)node->GetData();
+        if ( classInfo->IsKindOf(CLASSINFO(wxModule)) &&
+            (classInfo != (& (wxModule::ms_classInfo))) )
+        {
+            wxLogTrace(TRACE_MODULE, wxT("Registering module %s"),
+                       classInfo->GetClassName());
+            wxModule* module = (wxModule *)classInfo->CreateObject();
+            RegisterModule(module);
+        }
+        node = wxClassInfo::sm_classTable->Next();
+    }
+}
+
+bool wxModule::DoInitializeModule(wxModule *module,
+                                  wxModuleList &initializedModules)
+{
+    if ( module->m_state == State_Initializing )
+    {
+        wxLogError(_("Circular dependency involving module \"%s\" detected."),
+                   module->GetClassInfo()->GetClassName());
+        return false;
+    }
+
+    module->m_state = State_Initializing;
+
+    const wxArrayClassInfo& dependencies = module->m_dependencies;
+
+    // satisfy module dependencies by loading them before the current module
+    for ( unsigned int i = 0; i < dependencies.size(); ++i )
+    {
+        wxClassInfo * cinfo = dependencies[i];
+
+        // Check if the module is already initialized
+        wxModuleList::compatibility_iterator node;
+        for ( node = initializedModules.GetFirst(); node; node = node->GetNext() )
+        {
+            if ( node->GetData()->GetClassInfo() == cinfo )
+                break;
+        }
+
+        if ( node )
+        {
+            // this dependency is already initialized, nothing to do
+            continue;
+        }
+
+        // find the module in the registered modules list
+        for ( node = m_modules.GetFirst(); node; node = node->GetNext() )
+        {
+            wxModule *moduleDep = node->GetData();
+            if ( moduleDep->GetClassInfo() == cinfo )
+            {
+                if ( !DoInitializeModule(moduleDep, initializedModules ) )
+                {
+                    // failed to initialize a dependency, so fail this one too
+                    return false;
+                }
+
+                break;
+            }
+        }
+
+        if ( !node )
+        {
+            wxLogError(_("Dependency \"%s\" of module \"%s\" doesn't exist."),
+                       cinfo->GetClassName(),
+                       module->GetClassInfo()->GetClassName());
+            return false;
+        }
+    }
+
+    if ( !module->Init() )
+    {
+        wxLogError(_("Module \"%s\" initialization failed"),
+                   module->GetClassInfo()->GetClassName());
+        return false;
+    }
+
+    wxLogTrace(TRACE_MODULE, wxT("Module \"%s\" initialized"),
+               module->GetClassInfo()->GetClassName());
+
+    module->m_state = State_Initialized;
+    initializedModules.Append(module);
+
+    return true;
+}
+
+// Initialize user-defined modules
+bool wxModule::InitializeModules()
+{
+    wxModuleList initializedModules;
+
+    for ( wxModuleList::compatibility_iterator node = m_modules.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxModule *module = node->GetData();
+
+        // the module could have been already initialized as dependency of
+        // another one
+        if ( module->m_state == State_Registered )
+        {
+            if ( !DoInitializeModule( module, initializedModules ) )
+            {
+                // failed to initialize all modules, so clean up the already
+                // initialized ones
+                DoCleanUpModules(initializedModules);
+
+                return false;
+            }
+        }
+    }
+
+    // remember the real initialisation order
+    m_modules = initializedModules;
+
+    return true;
+}
+
+// Clean up all currently initialized modules
+void wxModule::DoCleanUpModules(const wxModuleList& modules)
+{
+    // cleanup user-defined modules in the reverse order compared to their
+    // initialization -- this ensures that dependencies are respected
+    for ( wxModuleList::compatibility_iterator node = modules.GetLast();
+          node;
+          node = node->GetPrevious() )
+    {
+        wxLogTrace(TRACE_MODULE, wxT("Cleanup module %s"),
+                   node->GetData()->GetClassInfo()->GetClassName());
+
+        wxModule * module = node->GetData();
+
+        wxASSERT_MSG( module->m_state == State_Initialized,
+                        _T("not initialized module being cleaned up") );
+
+        module->Exit();
+        module->m_state = State_Registered;
+    }
+
+    // clear all modules, even the non-initialized ones
+    WX_CLEAR_LIST(wxModuleList, m_modules);
+}
diff --git a/Source/3rd Party/wx/src/common/mousemanager.cpp b/Source/3rd Party/wx/src/common/mousemanager.cpp
deleted file mode 100644
index ca76547af..000000000
--- a/Source/3rd Party/wx/src/common/mousemanager.cpp	
+++ /dev/null
@@ -1,188 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/mousemanager.cpp
-// Purpose:     implementation of wxMouseEventsManager class
-// Author:      Vadim Zeitlin
-// Created:     2009-04-21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/settings.h"
-    #include "wx/window.h"
-#endif // WX_PRECOMP
-
-#include "wx/mousemanager.h"
-
-// ----------------------------------------------------------------------------
-// event tables
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxMouseEventsManager, wxEvtHandler)
-    EVT_MOUSE_CAPTURE_LOST(wxMouseEventsManager::OnCaptureLost)
-    EVT_LEFT_DOWN(wxMouseEventsManager::OnLeftDown)
-    EVT_LEFT_UP(wxMouseEventsManager::OnLeftUp)
-    EVT_MOTION(wxMouseEventsManager::OnMove)
-END_EVENT_TABLE()
-
-// ============================================================================
-// wxMouseEventsManager implementation
-// ============================================================================
-
-void wxMouseEventsManager::Init()
-{
-    m_win = NULL;
-    m_state = State_Normal;
-    m_item = wxNOT_FOUND;
-}
-
-bool wxMouseEventsManager::Create(wxWindow *win)
-{
-    wxASSERT_MSG( !m_win, "Create() must not be called twice" );
-
-    m_win = win;
-    win->PushEventHandler(this);
-
-    return true;
-}
-
-wxMouseEventsManager::~wxMouseEventsManager()
-{
-    if ( m_win )
-        m_win->RemoveEventHandler(this);
-}
-
-void wxMouseEventsManager::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
-{
-    switch ( m_state )
-    {
-        case State_Normal:
-            wxFAIL_MSG( "mouse shouldn't be captured in normal state" );
-            break;
-
-        case State_Pressed:
-            MouseClickCancelled(m_item);
-            break;
-
-        case State_Dragging:
-            MouseDragCancelled(m_item);
-            break;
-    }
-
-    m_state = State_Normal;
-    m_item = wxNOT_FOUND;
-}
-
-void wxMouseEventsManager::OnLeftDown(wxMouseEvent& event)
-{
-    wxASSERT_MSG( m_state == State_Normal,
-                  "state hasn't been reset to normal somehow" );
-
-    m_posLast = event.GetPosition();
-    m_item = MouseHitTest(m_posLast);
-    if ( m_item == wxNOT_FOUND )
-    {
-        event.Skip();
-        return;
-    }
-
-    m_state = State_Pressed;
-    m_win->SetFocus();
-    m_win->CaptureMouse();
-    MouseClickBegin(m_item);
-}
-
-void wxMouseEventsManager::OnLeftUp(wxMouseEvent& event)
-{
-    switch ( m_state )
-    {
-        case State_Normal:
-            // ignore it, the mouse hasn't been pressed over any item initially
-            // so releasing it shouldn't do anything
-            event.Skip();
-
-            // skip releasing the capture below
-            return;
-
-        case State_Pressed:
-            if ( MouseHitTest(event.GetPosition()) == m_item )
-            {
-                // mouse released over the same item, so it was a click
-                MouseClicked(m_item);
-            }
-            break;
-
-        case State_Dragging:
-            MouseDragEnd(m_item, event.GetPosition());
-            break;
-    }
-
-    m_state = State_Normal;
-    m_item = wxNOT_FOUND;
-    m_win->ReleaseMouse();
-}
-
-void wxMouseEventsManager::OnMove(wxMouseEvent& event)
-{
-    switch ( m_state )
-    {
-        case State_Normal:
-            event.Skip();
-            break;
-
-        case State_Pressed:
-            wxASSERT_MSG( event.LeftIsDown(),
-                          "should have detected mouse being released" );
-
-            {
-                // it's probably a bad idea to query the system for these
-                // values every time the mouse is moved so cache them on the
-                // assumption that they don't change -- which is wrong, of
-                // course, the user can change them but it doesn't happen often
-                static const int
-                    dragMinX = wxSystemSettings::GetMetric(wxSYS_DRAG_X);
-                static const int
-                    dragMinY = wxSystemSettings::GetMetric(wxSYS_DRAG_Y);
-
-                const wxPoint& pos = event.GetPosition();
-                const wxPoint ofs = pos - m_posLast;
-                if ( abs(ofs.x) > dragMinX || abs(ofs.y) > dragMinY )
-                {
-                    // the mouse left the rectangle inside which its movements
-                    // are considered to be too small to constitute a start of
-                    // drag operation, do [attempt to] start it now
-                    if ( MouseDragBegin(m_item, pos) )
-                    {
-                        m_state = State_Dragging;
-                    }
-                }
-                else // still didn't move far enough away
-                {
-                    event.Skip();
-                }
-            }
-            break;
-
-        case State_Dragging:
-            m_posLast = event.GetPosition();
-            MouseDragging(m_item, m_posLast);
-            break;
-    }
-}
-
diff --git a/Source/3rd Party/wx/src/common/msgout.cpp b/Source/3rd Party/wx/src/common/msgout.cpp
index 76b242397..ebeed13be 100644
--- a/Source/3rd Party/wx/src/common/msgout.cpp	
+++ b/Source/3rd Party/wx/src/common/msgout.cpp	
@@ -1,215 +1,222 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/msgout.cpp
-// Purpose:     wxMessageOutput implementation
-// Author:      Mattia Barbon
-// Modified by:
-// Created:     17.07.02
-// RCS-ID:      $Id$
-// Copyright:   (c) the wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#if defined(__BORLANDC__)
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/ffile.h"
-    #include "wx/app.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #if wxUSE_GUI
-        #include "wx/msgdlg.h"
-    #endif // wxUSE_GUI
-#endif
-
-#include "wx/msgout.h"
-#include "wx/apptrait.h"
-#include <stdarg.h>
-#include <stdio.h>
-
-#if defined(__WINDOWS__)
-    #include "wx/msw/private.h"
-#endif
-
-// ===========================================================================
-// implementation
-// ===========================================================================
-
-#if wxUSE_BASE
-
-// ----------------------------------------------------------------------------
-// wxMessageOutput
-// ----------------------------------------------------------------------------
-
-wxMessageOutput* wxMessageOutput::ms_msgOut = 0;
-
-wxMessageOutput* wxMessageOutput::Get()
-{
-    if ( !ms_msgOut && wxTheApp )
-    {
-        ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
-    }
-
-    return ms_msgOut;
-}
-
-wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
-{
-    wxMessageOutput* old = ms_msgOut;
-    ms_msgOut = msgout;
-    return old;
-}
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-void wxMessageOutput::DoPrintfWchar(const wxChar *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    wxString out;
-
-    out.PrintfV(format, args);
-    va_end(args);
-
-    Output(out);
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-void wxMessageOutput::DoPrintfUtf8(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    wxString out;
-
-    out.PrintfV(format, args);
-    va_end(args);
-
-    Output(out);
-}
-#endif // wxUSE_UNICODE_UTF8
-
-// ----------------------------------------------------------------------------
-// wxMessageOutputBest
-// ----------------------------------------------------------------------------
-
-void wxMessageOutputBest::Output(const wxString& str)
-{
-#ifdef __WINDOWS__
-    // decide whether to use console output or not
-    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    const bool hasStderr = traits ? traits->CanUseStderr() : false;
-
-    if ( !(m_flags & wxMSGOUT_PREFER_MSGBOX) )
-    {
-        if ( hasStderr && traits->WriteToStderr(AppendLineFeedIfNeeded(str)) )
-            return;
-    }
-
-    wxString title;
-    if ( wxTheApp )
-        title = wxTheApp->GetAppDisplayName();
-    else // Use some title to avoid default "Error"
-        title = _("Message");
-
-    ::MessageBox(NULL, str.t_str(), title.t_str(), MB_ICONINFORMATION | MB_OK);
-#else // !__WINDOWS__
-    // TODO: use the native message box for the other ports too
-    wxMessageOutputStderr::Output(str);
-#endif // __WINDOWS__/!__WINDOWS__
-}
-
-// ----------------------------------------------------------------------------
-// wxMessageOutputStderr
-// ----------------------------------------------------------------------------
-
-wxString wxMessageOutputStderr::AppendLineFeedIfNeeded(const wxString& str)
-{
-    wxString strLF(str);
-    if ( strLF.empty() || *strLF.rbegin() != '\n' )
-        strLF += '\n';
-
-    return strLF;
-}
-
-void wxMessageOutputStderr::Output(const wxString& str)
-{
-    const wxString strWithLF = AppendLineFeedIfNeeded(str);
-    const wxWX2MBbuf buf = strWithLF.mb_str();
-
-    if ( buf )
-        fprintf(m_fp, "%s", (const char*) buf);
-    else // print at least something
-        fprintf(m_fp, "%s", (const char*) strWithLF.ToAscii());
-
-    fflush(m_fp);
-}
-
-// ----------------------------------------------------------------------------
-// wxMessageOutputDebug
-// ----------------------------------------------------------------------------
-
-void wxMessageOutputDebug::Output(const wxString& str)
-{
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    wxString out(AppendLineFeedIfNeeded(str));
-    out.Replace(wxT("\t"), wxT("        "));
-    out.Replace(wxT("\n"), wxT("\r\n"));
-    ::OutputDebugString(out.t_str());
-#else
-    // TODO: use native debug output function for the other ports too
-    wxMessageOutputStderr::Output(str);
-#endif // platform
-}
-
-// ----------------------------------------------------------------------------
-// wxMessageOutputLog
-// ----------------------------------------------------------------------------
-
-void wxMessageOutputLog::Output(const wxString& str)
-{
-    wxString out(str);
-
-    out.Replace(wxT("\t"), wxT("        "));
-
-    wxLogMessage(wxT("%s"), out.c_str());
-}
-
-#endif // wxUSE_BASE
-
-// ----------------------------------------------------------------------------
-// wxMessageOutputMessageBox
-// ----------------------------------------------------------------------------
-
-#if wxUSE_GUI && wxUSE_MSGDLG
-
-extern WXDLLEXPORT_DATA(const char) wxMessageBoxCaptionStr[] = "Message";
-
-void wxMessageOutputMessageBox::Output(const wxString& str)
-{
-    wxString out(str);
-
-    // the native MSW msg box understands the TABs, others don't
-#ifndef __WINDOWS__
-    out.Replace(wxT("\t"), wxT("        "));
-#endif
-
-    wxString title = wxT("wxWidgets") ;
-    if (wxTheApp) title = wxTheApp->GetAppDisplayName();
-
-    ::wxMessageBox(out, title);
-}
-
-#endif // wxUSE_GUI
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/msgout.cpp
+// Purpose:     wxMessageOutput implementation
+// Author:      Mattia Barbon
+// Modified by:
+// Created:     17.07.02
+// RCS-ID:      $Id: msgout.cpp 38920 2006-04-26 08:21:31Z ABX $
+// Copyright:   (c) the wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/ffile.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #if wxUSE_GUI
+        #include "wx/msgdlg.h"
+    #endif // wxUSE_GUI
+#endif
+
+#include "wx/msgout.h"
+#include "wx/apptrait.h"
+#include <stdarg.h>
+#include <stdio.h>
+
+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h"
+#endif
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+#if wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxMessageOutput
+// ----------------------------------------------------------------------------
+
+wxMessageOutput* wxMessageOutput::ms_msgOut = 0;
+
+wxMessageOutput* wxMessageOutput::Get()
+{
+    if ( !ms_msgOut && wxTheApp )
+    {
+        ms_msgOut = wxTheApp->GetTraits()->CreateMessageOutput();
+    }
+
+    return ms_msgOut;
+}
+
+wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
+{
+    wxMessageOutput* old = ms_msgOut;
+    ms_msgOut = msgout;
+    return old;
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputBest
+// ----------------------------------------------------------------------------
+
+#ifdef __WINDOWS__
+
+// check if we're running in a console under Windows
+static inline bool IsInConsole()
+{
+#ifdef __WXWINCE__
+    return false;
+#else // !__WXWINCE__
+    HANDLE hStdErr = ::GetStdHandle(STD_ERROR_HANDLE);
+    return hStdErr && hStdErr != INVALID_HANDLE_VALUE;
+#endif // __WXWINCE__/!__WXWINCE__
+}
+
+#endif // __WINDOWS__
+
+void wxMessageOutputBest::Printf(const wxChar* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    wxString out;
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+#ifdef __WINDOWS__
+    if ( !IsInConsole() )
+    {
+        ::MessageBox(NULL, out, _T("wxWidgets"), MB_ICONINFORMATION | MB_OK);
+    }
+    else
+#endif // __WINDOWS__/!__WINDOWS__
+    {
+        fprintf(stderr, "%s", (const char*) out.mb_str());
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputStderr
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputStderr::Printf(const wxChar* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    wxString out;
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+    fprintf(stderr, "%s", (const char*) out.mb_str());
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputDebug
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputDebug::Printf(const wxChar* format, ...)
+{
+    wxString out;
+
+    va_list args;
+    va_start(args, format);
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+    out.Replace(wxT("\t"), wxT("        "));
+    out.Replace(wxT("\n"), wxT("\r\n"));
+    ::OutputDebugString(out);
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    if ( wxIsDebuggerRunning() )
+    {
+        Str255 pstr;
+        wxString output = out + wxT(";g") ;
+        wxMacStringToPascal(output.c_str(), pstr);
+
+        #ifdef __powerc
+            DebugStr(pstr);
+        #else
+            SysBreakStr(pstr);
+        #endif
+    }
+#else
+    wxFputs( out , stderr ) ;
+    if ( out.Right(1) != wxT("\n") )
+        wxFputs( wxT("\n") , stderr ) ;
+    fflush( stderr ) ;
+#endif // platform
+}
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputLog
+// ----------------------------------------------------------------------------
+
+void wxMessageOutputLog::Printf(const wxChar* format, ...)
+{
+    wxString out;
+
+    va_list args;
+    va_start(args, format);
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+    out.Replace(wxT("\t"), wxT("        "));
+
+    ::wxLogMessage(wxT("%s"), out.c_str());
+}
+
+#endif // wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// wxMessageOutputMessageBox
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI
+
+void wxMessageOutputMessageBox::Printf(const wxChar* format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    wxString out;
+
+    out.PrintfV(format, args);
+    va_end(args);
+
+    // the native MSW msg box understands the TABs, others don't
+#ifndef __WXMSW__
+    out.Replace(wxT("\t"), wxT("        "));
+#endif
+
+    wxString title;
+    if ( wxTheApp )
+        title.Printf(_("%s message"), wxTheApp->GetAppName().c_str());
+
+    ::wxMessageBox(out, title);
+}
+
+#endif // wxUSE_GUI
diff --git a/Source/3rd Party/wx/src/common/mstream.cpp b/Source/3rd Party/wx/src/common/mstream.cpp
index 647773a76..cbefd2a7c 100644
--- a/Source/3rd Party/wx/src/common/mstream.cpp	
+++ b/Source/3rd Party/wx/src/common/mstream.cpp	
@@ -1,207 +1,174 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/mstream.cpp
-// Purpose:     "Memory stream" classes
-// Author:      Guilhem Lavaux
-// Modified by: VZ (23.11.00): general code review
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS
-
-#include "wx/mstream.h"
-
-#ifndef   WX_PRECOMP
-    #include  "wx/stream.h"
-#endif  //WX_PRECOMP
-
-#include <stdlib.h>
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxMemoryInputStream
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryInputStream, wxInputStream)
-
-wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)
-{
-    m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
-    m_i_streambuf->SetBufferIO(const_cast<void *>(data), len);
-    m_i_streambuf->SetIntPosition(0); // seek to start pos
-    m_i_streambuf->Fixed(true);
-
-    m_length = len;
-}
-
-wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream)
-{
-    const wxFileOffset lenFile = stream.GetLength();
-    if ( lenFile == wxInvalidOffset )
-    {
-        m_i_streambuf = NULL;
-        m_lasterror = wxSTREAM_EOF;
-        return;
-    }
-
-    const size_t len = wx_truncate_cast(size_t, lenFile);
-    wxASSERT_MSG( len == lenFile + size_t(0), wxT("huge files not supported") );
-
-    m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
-    m_i_streambuf->SetBufferIO(len); // create buffer
-    stream.CopyTo(m_i_streambuf->GetBufferStart(), len);
-    m_i_streambuf->SetIntPosition(0); // seek to start pos
-    m_i_streambuf->Fixed(true);
-    m_length = len;
-}
-
-void
-wxMemoryInputStream::InitFromStream(wxInputStream& stream, wxFileOffset lenFile)
-{
-    if ( lenFile == wxInvalidOffset )
-        lenFile = stream.GetLength();
-
-    if ( lenFile == wxInvalidOffset )
-    {
-        m_i_streambuf = NULL;
-        m_lasterror = wxSTREAM_EOF;
-        return;
-    }
-
-    const size_t len = wx_truncate_cast(size_t, lenFile);
-    wxASSERT_MSG( (wxFileOffset)len == lenFile, wxT("huge files not supported") );
-
-    m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
-    m_i_streambuf->SetBufferIO(len); // create buffer
-    stream.Read(m_i_streambuf->GetBufferStart(), len);
-    m_i_streambuf->SetIntPosition(0); // seek to start pos
-    m_i_streambuf->Fixed(true);
-    m_length = stream.LastRead();
-}
-
-bool wxMemoryInputStream::CanRead() const
-{
-    return m_i_streambuf->GetIntPosition() != m_length;
-}
-
-wxMemoryInputStream::~wxMemoryInputStream()
-{
-    delete m_i_streambuf;
-}
-
-char wxMemoryInputStream::Peek()
-{
-    char *buf = (char *)m_i_streambuf->GetBufferStart();
-    size_t pos = m_i_streambuf->GetIntPosition();
-    if ( pos == m_length )
-    {
-        m_lasterror = wxSTREAM_READ_ERROR;
-
-        return 0;
-    }
-
-    return buf[pos];
-}
-
-size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
-{
-    size_t pos = m_i_streambuf->GetIntPosition();
-    if ( pos == m_length )
-    {
-        m_lasterror = wxSTREAM_EOF;
-
-        return 0;
-    }
-
-    m_i_streambuf->Read(buffer, nbytes);
-    m_lasterror = wxSTREAM_NO_ERROR;
-
-    return m_i_streambuf->GetIntPosition() - pos;
-}
-
-wxFileOffset wxMemoryInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    return m_i_streambuf->Seek(pos, mode);
-}
-
-wxFileOffset wxMemoryInputStream::OnSysTell() const
-{
-    return m_i_streambuf->Tell();
-}
-
-// ----------------------------------------------------------------------------
-// wxMemoryOutputStream
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxOutputStream)
-
-wxMemoryOutputStream::wxMemoryOutputStream(void *data, size_t len)
-{
-    m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
-    if ( data )
-        m_o_streambuf->SetBufferIO(data, len);
-    m_o_streambuf->Fixed(false);
-    m_o_streambuf->Flushable(false);
-}
-
-wxMemoryOutputStream::~wxMemoryOutputStream()
-{
-    delete m_o_streambuf;
-}
-
-size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
-{
-    size_t oldpos = m_o_streambuf->GetIntPosition();
-    m_o_streambuf->Write(buffer, nbytes);
-    size_t newpos = m_o_streambuf->GetIntPosition();
-
-    // FIXME can someone please explain what this does? (VZ)
-    if ( !newpos )
-        newpos = m_o_streambuf->GetBufferSize();
-
-    return newpos - oldpos;
-}
-
-wxFileOffset wxMemoryOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    return m_o_streambuf->Seek(pos, mode);
-}
-
-wxFileOffset wxMemoryOutputStream::OnSysTell() const
-{
-    return m_o_streambuf->Tell();
-}
-
-size_t wxMemoryOutputStream::CopyTo(void *buffer, size_t len) const
-{
-    wxCHECK_MSG( buffer, 0, wxT("must have buffer to CopyTo") );
-
-    if ( len > GetSize() )
-        len = GetSize();
-
-    memcpy(buffer, m_o_streambuf->GetBufferStart(), len);
-
-    return len;
-}
-
-#endif // wxUSE_STREAMS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/mstream.cpp
+// Purpose:     "Memory stream" classes
+// Author:      Guilhem Lavaux
+// Modified by: VZ (23.11.00): general code review
+// Created:     04/01/98
+// RCS-ID:      $Id: mstream.cpp 39001 2006-05-03 21:50:35Z ABX $
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS
+
+#include "wx/mstream.h"
+
+#ifndef   WX_PRECOMP
+    #include  "wx/stream.h"
+#endif  //WX_PRECOMP
+
+#include <stdlib.h>
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxMemoryInputStream
+// ----------------------------------------------------------------------------
+
+wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)
+{
+    m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
+    m_i_streambuf->SetBufferIO((void *)data, len); // const_cast
+    m_i_streambuf->SetIntPosition(0); // seek to start pos
+    m_i_streambuf->Fixed(true);
+
+    m_length = len;
+}
+
+wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream)
+{
+    const wxFileOffset lenFile = stream.GetLength();
+    if ( lenFile == wxInvalidOffset )
+    {
+        m_i_streambuf = NULL;
+        m_lasterror = wxSTREAM_EOF;
+        return;
+    }
+
+    const size_t len = wx_truncate_cast(size_t, lenFile);
+    wxASSERT_MSG( len == lenFile + size_t(0), _T("huge files not supported") );
+
+    m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
+    m_i_streambuf->SetBufferIO(len); // create buffer
+    stream.CopyTo(m_i_streambuf->GetBufferStart(), len);
+    m_i_streambuf->SetIntPosition(0); // seek to start pos
+    m_i_streambuf->Fixed(true);
+    m_length = len;
+}
+
+wxMemoryInputStream::~wxMemoryInputStream()
+{
+    delete m_i_streambuf;
+}
+
+char wxMemoryInputStream::Peek()
+{
+    char *buf = (char *)m_i_streambuf->GetBufferStart();
+    size_t pos = m_i_streambuf->GetIntPosition();
+    if ( pos == m_length )
+    {
+        m_lasterror = wxSTREAM_READ_ERROR;
+
+        return 0;
+    }
+
+    return buf[pos];
+}
+
+size_t wxMemoryInputStream::OnSysRead(void *buffer, size_t nbytes)
+{
+    size_t pos = m_i_streambuf->GetIntPosition();
+    if ( pos == m_length )
+    {
+        m_lasterror = wxSTREAM_EOF;
+
+        return 0;
+    }
+
+    m_i_streambuf->Read(buffer, nbytes);
+    m_lasterror = wxSTREAM_NO_ERROR;
+
+    return m_i_streambuf->GetIntPosition() - pos;
+}
+
+wxFileOffset wxMemoryInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_i_streambuf->Seek(pos, mode);
+}
+
+wxFileOffset wxMemoryInputStream::OnSysTell() const
+{
+    return m_i_streambuf->Tell();
+}
+
+// ----------------------------------------------------------------------------
+// wxMemoryOutputStream
+// ----------------------------------------------------------------------------
+
+wxMemoryOutputStream::wxMemoryOutputStream(void *data, size_t len)
+{
+    m_o_streambuf = new wxStreamBuffer(wxStreamBuffer::write);
+    if ( data )
+        m_o_streambuf->SetBufferIO(data, len);
+    m_o_streambuf->Fixed(false);
+    m_o_streambuf->Flushable(false);
+}
+
+wxMemoryOutputStream::~wxMemoryOutputStream()
+{
+    delete m_o_streambuf;
+}
+
+size_t wxMemoryOutputStream::OnSysWrite(const void *buffer, size_t nbytes)
+{
+    size_t oldpos = m_o_streambuf->GetIntPosition();
+    m_o_streambuf->Write(buffer, nbytes);
+    size_t newpos = m_o_streambuf->GetIntPosition();
+
+    // FIXME can someone please explain what this does? (VZ)
+    if ( !newpos )
+        newpos = m_o_streambuf->GetBufferSize();
+
+    return newpos - oldpos;
+}
+
+wxFileOffset wxMemoryOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_o_streambuf->Seek(pos, mode);
+}
+
+wxFileOffset wxMemoryOutputStream::OnSysTell() const
+{
+    return m_o_streambuf->Tell();
+}
+
+size_t wxMemoryOutputStream::CopyTo(void *buffer, size_t len) const
+{
+    wxCHECK_MSG( buffer, 0, _T("must have buffer to CopyTo") );
+
+    if ( len > GetSize() )
+        len = GetSize();
+
+    memcpy(buffer, m_o_streambuf->GetBufferStart(), len);
+
+    return len;
+}
+
+#endif // wxUSE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/nbkbase.cpp b/Source/3rd Party/wx/src/common/nbkbase.cpp
index 8f4098ade..011f53e16 100644
--- a/Source/3rd Party/wx/src/common/nbkbase.cpp	
+++ b/Source/3rd Party/wx/src/common/nbkbase.cpp	
@@ -1,205 +1,84 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/nbkbase.cpp
-// Purpose:     common wxNotebook methods
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     02.07.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_NOTEBOOK
-
-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-
-#include "wx/notebook.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-extern WXDLLEXPORT_DATA(const char) wxNotebookNameStr[] = "notebook";
-
-wxDEFINE_EVENT( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-#include "wx/listimpl.cpp"
-wxDEFINE_FLAGS( wxNotebookStyle )
-wxBEGIN_FLAGS( wxNotebookStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxNB_FIXEDWIDTH)
-wxFLAGS_MEMBER(wxBK_DEFAULT)
-wxFLAGS_MEMBER(wxBK_TOP)
-wxFLAGS_MEMBER(wxBK_LEFT)
-wxFLAGS_MEMBER(wxBK_RIGHT)
-wxFLAGS_MEMBER(wxBK_BOTTOM)
-wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
-wxFLAGS_MEMBER(wxNB_FLAT)
-wxEND_FLAGS( wxNotebookStyle )
-
-#if wxUSE_EXTENDED_RTTI
-
-WX_DEFINE_LIST( wxNotebookPageInfoList )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject, "wx/notebook.h" )
-
-wxCOLLECTION_TYPE_INFO( wxNotebookPageInfo *, wxNotebookPageInfoList );
-
-template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList,
-                                           wxAnyList &value)
-{
-    wxListCollectionToAnyList<wxNotebookPageInfoList::compatibility_iterator>( theList, value );
-}
-
-wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo)
-wxREADONLY_PROPERTY( Page, wxNotebookPage*, GetPage, wxEMPTY_PARAMETER_VALUE, \
-                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxREADONLY_PROPERTY( Text, wxString, GetText, wxString(), 0 /*flags*/, \
-                    wxT("Helpstring"), wxT("group"))
-wxREADONLY_PROPERTY( Selected, bool, GetSelected, false, 0 /*flags*/, \
-                    wxT("Helpstring"), wxT("group") )
-wxREADONLY_PROPERTY( ImageId, int, GetImageId, -1, 0 /*flags*/, \
-                    wxT("Helpstring"), wxT("group"))
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxNotebookPageInfo)
-
-wxCONSTRUCTOR_4( wxNotebookPageInfo, wxNotebookPage*, Page, \
-                wxString, Text, bool, Selected, int, ImageId )
-
-// WX_IMPLEMENT_ANY_VALUE_TYPE(wxAnyValueTypeImpl<wxNotebookPageInfo**>)
-// XTI accessors:
-
-void wxNotebookBase::AddPageInfo( wxNotebookPageInfo* info )
-{
-    AddPage( info->GetPage(), info->GetText(), info->GetSelected(), info->GetImageId() );
-}
-
-const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const
-{
-    wxNotebookPageInfoList* list = const_cast< wxNotebookPageInfoList* >( &m_pageInfos );
-    WX_CLEAR_LIST( wxNotebookPageInfoList, *list );
-    for( size_t i = 0; i < GetPageCount(); ++i )
-    {
-        wxNotebookPageInfo *info = new wxNotebookPageInfo();
-        info->Create( const_cast<wxNotebookBase*>(this)->GetPage(i), GetPageText(i),
-                     GetSelection() == int(i), GetPageImage(i) );
-        list->Append( info );
-    }
-    return m_pageInfos;
-}
-
-#endif
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase, "wx/notebook.h")
-wxBEGIN_PROPERTIES_TABLE(wxNotebook)
-wxEVENT_PROPERTY( PageChanging, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent )
-wxEVENT_PROPERTY( PageChanged, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent )
-
-wxPROPERTY_COLLECTION( PageInfos, wxNotebookPageInfoList, wxNotebookPageInfo*, \
-                      AddPageInfo, GetPageInfos, 0 /*flags*/, wxT("Helpstring"), \
-                      wxT("group"))
-wxPROPERTY_FLAGS( WindowStyle, wxNotebookStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxNotebook)
-
-wxCONSTRUCTOR_5( wxNotebook, wxWindow*, Parent, wxWindowID, Id, \
-                wxPoint, Position, wxSize, Size, long, WindowStyle)
-
-// ----------------------------------------------------------------------------
-// geometry
-// ----------------------------------------------------------------------------
-
-wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) const
-{
-    // this is, of course, totally bogus -- but we must do something by
-    // default because not all ports implement this
-    wxSize sizeTotal = sizePage;
-
-    if ( HasFlag(wxBK_LEFT) || HasFlag(wxBK_RIGHT) )
-    {
-        sizeTotal.x += 90;
-        sizeTotal.y += 10;
-    }
-    else // tabs on top/bottom side
-    {
-        sizeTotal.x += 10;
-        sizeTotal.y += 40;
-    }
-
-    return sizeTotal;
-}
-
-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-bool wxNotebookBase::SendPageChangingEvent(int nPage)
-{
-    wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId());
-    event.SetSelection(nPage);
-    event.SetOldSelection(GetSelection());
-    event.SetEventObject(this);
-    return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();
-}
-
-void wxNotebookBase::SendPageChangedEvent(int nPageOld, int nPageNew)
-{
-    wxBookCtrlEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, GetId());
-    event.SetSelection(nPageNew == -1 ? GetSelection() : nPageNew);
-    event.SetOldSelection(nPageOld);
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
-}
-
-#endif // wxUSE_NOTEBOOK
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/nbkbase.cpp
+// Purpose:     common wxNotebook methods
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     02.07.01
+// RCS-ID:      $Id: nbkbase.cpp 41764 2006-10-08 23:41:52Z VZ $
+// Copyright:   (c) 2001 Vadim Zeitlin
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_NOTEBOOK
+
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
+#include "wx/notebook.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// geometry
+// ----------------------------------------------------------------------------
+
+wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    // this is, of course, totally bogus -- but we must do something by
+    // default because not all ports implement this
+    wxSize sizeTotal = sizePage;
+
+    if ( HasFlag(wxBK_LEFT) || HasFlag(wxBK_RIGHT) )
+    {
+        sizeTotal.x += 90;
+        sizeTotal.y += 10;
+    }
+    else // tabs on top/bottom side
+    {
+        sizeTotal.x += 10;
+        sizeTotal.y += 40;
+    }
+
+    return sizeTotal;
+}
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+bool wxNotebookBase::SendPageChangingEvent(int nPage)
+{
+    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, GetId());
+    event.SetSelection(nPage);
+    event.SetOldSelection(GetSelection());
+    event.SetEventObject(this);
+    return !GetEventHandler()->ProcessEvent(event) || event.IsAllowed();
+}
+
+void wxNotebookBase::SendPageChangedEvent(int nPageOld, int nPageNew)
+{
+    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, GetId());
+    event.SetSelection(nPageNew == -1 ? GetSelection() : nPageNew);
+    event.SetOldSelection(nPageOld);
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+#endif // wxUSE_NOTEBOOK
diff --git a/Source/3rd Party/wx/src/common/numformatter.cpp b/Source/3rd Party/wx/src/common/numformatter.cpp
deleted file mode 100644
index 101e11e8b..000000000
--- a/Source/3rd Party/wx/src/common/numformatter.cpp	
+++ /dev/null
@@ -1,302 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/numformatter.cpp
-// Purpose:     wxNumberFormatter
-// Author:      Fulvio Senore, Vadim Zeitlin
-// Created:     2010-11-06
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/numformatter.h"
-#include "wx/intl.h"
-
-#include <locale.h> // for setlocale and LC_ALL
-
-// ----------------------------------------------------------------------------
-// local helpers
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// Contains information about the locale which was used to initialize our
-// cached values of the decimal and thousands separators. Notice that it isn't
-// enough to store just wxLocale because the user code may call setlocale()
-// directly and storing just C locale string is not enough because we can use
-// the OS API directly instead of the CRT ones on some platforms. So just store
-// both.
-class LocaleId
-{
-public:
-    LocaleId()
-    {
-#if wxUSE_INTL
-        m_wxloc = NULL;
-#endif // wxUSE_INTL
-        m_cloc = NULL;
-    }
-
-    ~LocaleId()
-    {
-        Free();
-    }
-
-#if wxUSE_INTL
-    // Return true if this is the first time this function is called for this
-    // object or if the program locale has changed since the last time it was
-    // called. Otherwise just return false indicating that updating locale-
-    // dependent information is not necessary.
-    bool NotInitializedOrHasChanged()
-    {
-        wxLocale * const wxloc = wxGetLocale();
-        const char * const cloc = setlocale(LC_ALL, NULL);
-        if ( m_wxloc || m_cloc )
-        {
-            if ( m_wxloc == wxloc && strcmp(m_cloc, cloc) == 0 )
-                return false;
-
-            Free();
-        }
-        //else: Not initialized yet.
-
-        m_wxloc = wxloc;
-        m_cloc = wxCRT_StrdupA(cloc);
-
-        return true;
-    }
-#endif // wxUSE_INTL
-
-private:
-    void Free()
-    {
-#if wxUSE_INTL
-        free(m_cloc);
-#endif // wxUSE_INTL
-    }
-
-#if wxUSE_INTL
-    // Non-owned pointer to wxLocale which was used.
-    wxLocale *m_wxloc;
-#endif // wxUSE_INTL
-
-    // Owned pointer to the C locale string.
-    char *m_cloc;
-
-    wxDECLARE_NO_COPY_CLASS(LocaleId);
-};
-
-} // anonymous namespace
-
-// ============================================================================
-// wxNumberFormatter implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// Locale information accessors
-// ----------------------------------------------------------------------------
-
-wxChar wxNumberFormatter::GetDecimalSeparator()
-{
-#if wxUSE_INTL
-    // Notice that while using static variable here is not MT-safe, the worst
-    // that can happen is that we redo the initialization if we're called
-    // concurrently from more than one thread so it's not a real problem.
-    static wxChar s_decimalSeparator = 0;
-
-    // Remember the locale which was current when we initialized, we must redo
-    // the initialization if the locale changed.
-    static LocaleId s_localeUsedForInit;
-
-    if ( s_localeUsedForInit.NotInitializedOrHasChanged() )
-    {
-        const wxString
-            s = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER);
-        if ( s.empty() )
-        {
-            // We really must have something for decimal separator, so fall
-            // back to the C locale default.
-            s_decimalSeparator = '.';
-        }
-        else
-        {
-            // To the best of my knowledge there are no locales like this.
-            wxASSERT_MSG( s.length() == 1,
-                          "Multi-character decimal separator?" );
-
-            s_decimalSeparator = s[0];
-        }
-    }
-
-    return s_decimalSeparator;
-#else // !wxUSE_INTL
-    return wxT('.');
-#endif // wxUSE_INTL/!wxUSE_INTL
-}
-
-bool wxNumberFormatter::GetThousandsSeparatorIfUsed(wxChar *sep)
-{
-#if wxUSE_INTL
-    static wxChar s_thousandsSeparator = 0;
-    static LocaleId s_localeUsedForInit;
-
-    if ( s_localeUsedForInit.NotInitializedOrHasChanged() )
-    {
-        const wxString
-            s = wxLocale::GetInfo(wxLOCALE_THOUSANDS_SEP, wxLOCALE_CAT_NUMBER);
-        if ( !s.empty() )
-        {
-            wxASSERT_MSG( s.length() == 1,
-                          "Multi-character thousands separator?" );
-
-            s_thousandsSeparator = s[0];
-        }
-        //else: Unlike above it's perfectly fine for the thousands separator to
-        //      be empty if grouping is not used, so just leave it as 0.
-    }
-
-    if ( !s_thousandsSeparator )
-        return false;
-
-    if ( sep )
-        *sep = s_thousandsSeparator;
-
-    return true;
-#else // !wxUSE_INTL
-    wxUnusedVar(sep);
-    return false;
-#endif // wxUSE_INTL/!wxUSE_INTL
-}
-
-// ----------------------------------------------------------------------------
-// Conversion to string and helpers
-// ----------------------------------------------------------------------------
-
-wxString wxNumberFormatter::PostProcessIntString(wxString s, int style)
-{
-    if ( style & Style_WithThousandsSep )
-        AddThousandsSeparators(s);
-
-    wxASSERT_MSG( !(style & Style_NoTrailingZeroes),
-                  "Style_NoTrailingZeroes can't be used with integer values" );
-
-    return s;
-}
-
-wxString wxNumberFormatter::ToString(long val, int style)
-{
-    return PostProcessIntString(wxString::Format("%ld", val), style);
-}
-
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-
-wxString wxNumberFormatter::ToString(wxLongLong_t val, int style)
-{
-    return PostProcessIntString(wxString::Format("%" wxLongLongFmtSpec "d", val),
-                                style);
-}
-
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-
-wxString wxNumberFormatter::ToString(double val, int precision, int style)
-{
-    const wxString fmt = wxString::Format("%%.%df", precision);
-    wxString s = wxString::Format(fmt, val);
-
-    if ( style & Style_WithThousandsSep )
-        AddThousandsSeparators(s);
-
-    if ( style & Style_NoTrailingZeroes )
-        RemoveTrailingZeroes(s);
-
-    return s;
-}
-
-void wxNumberFormatter::AddThousandsSeparators(wxString& s)
-{
-    wxChar thousandsSep;
-    if ( !GetThousandsSeparatorIfUsed(&thousandsSep) )
-        return;
-
-    size_t pos = s.find(GetDecimalSeparator());
-    if ( pos == wxString::npos )
-    {
-        // Start grouping at the end of an integer number.
-        pos = s.length();
-    }
-
-    // We currently group digits by 3 independently of the locale. This is not
-    // the right thing to do and we should use lconv::grouping (under POSIX)
-    // and GetLocaleInfo(LOCALE_SGROUPING) (under MSW) to get information about
-    // the correct grouping to use. This is something that needs to be done at
-    // wxLocale level first and then used here in the future (TODO).
-    const size_t GROUP_LEN = 3;
-
-    while ( pos > GROUP_LEN )
-    {
-        pos -= GROUP_LEN;
-        s.insert(pos, thousandsSep);
-    }
-}
-
-void wxNumberFormatter::RemoveTrailingZeroes(wxString& s)
-{
-    const size_t posDecSep = s.find(GetDecimalSeparator());
-    wxCHECK_RET( posDecSep != wxString::npos,
-                 wxString::Format("No decimal separator in \"%s\"", s) );
-    wxCHECK_RET( posDecSep, "Can't start with decimal separator" );
-
-    // Find the last character to keep.
-    size_t posLastNonZero = s.find_last_not_of("0");
-
-    // If it's the decimal separator itself, don't keep it neither.
-    if ( posLastNonZero == posDecSep )
-        posLastNonZero--;
-
-    s.erase(posLastNonZero + 1);
-}
-
-// ----------------------------------------------------------------------------
-// Conversion from strings
-// ----------------------------------------------------------------------------
-
-void wxNumberFormatter::RemoveThousandsSeparators(wxString& s)
-{
-    wxChar thousandsSep;
-    if ( !GetThousandsSeparatorIfUsed(&thousandsSep) )
-        return;
-
-    s.Replace(wxString(thousandsSep), wxString());
-}
-
-bool wxNumberFormatter::FromString(wxString s, long *val)
-{
-    RemoveThousandsSeparators(s);
-    return s.ToLong(val);
-}
-
-#ifdef wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-
-bool wxNumberFormatter::FromString(wxString s, wxLongLong_t *val)
-{
-    RemoveThousandsSeparators(s);
-    return s.ToLongLong(val);
-}
-
-#endif // wxHAS_LONG_LONG_T_DIFFERENT_FROM_LONG
-
-bool wxNumberFormatter::FromString(wxString s, double *val)
-{
-    RemoveThousandsSeparators(s);
-    return s.ToDouble(val);
-}
diff --git a/Source/3rd Party/wx/src/common/object.cpp b/Source/3rd Party/wx/src/common/object.cpp
index 6f5f52bab..24eddcde7 100644
--- a/Source/3rd Party/wx/src/common/object.cpp	
+++ b/Source/3rd Party/wx/src/common/object.cpp	
@@ -1,430 +1,390 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/object.cpp
-// Purpose:     wxObject implementation
-// Author:      Julian Smart
-// Modified by: Ron Lee
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Julian Smart
-//              (c) 2001 Ron Lee <ron@debian.org>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/memory.h"
-    #include "wx/crt.h"
-#endif
-
-#include <string.h>
-
-#if wxUSE_DEBUG_CONTEXT
-    #if defined(__VISAGECPP__)
-        #define DEBUG_PRINTF(NAME) { static int raz=0; \
-            printf( #NAME " %i\n",raz); fflush(stdout); raz++; }
-    #else
-        #define DEBUG_PRINTF(NAME)
-    #endif
-#endif // wxUSE_DEBUG_CONTEXT
-
-// we must disable optimizations for VC.NET because otherwise its too eager
-// linker discards wxClassInfo objects in release build thus breaking many,
-// many things
-#if defined __VISUALC__ && __VISUALC__ >= 1300
-    #pragma optimize("", off)
-#endif
-
-#if wxUSE_EXTENDED_RTTI
-const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
-wxObject* wxVariantOfPtrToObjectConverterwxObject ( const wxAny &data )
-{ return wxANY_AS(data, wxObject*); }
- wxAny wxObjectToVariantConverterwxObject ( wxObject *data )
- { return wxAny( dynamic_cast<wxObject*> (data)  ) ; }
-
- wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"),
-            (int) sizeof(wxObject),                              \
-            (wxObjectConstructorFn) 0   ,
-            NULL,NULL,0 , 0 ,
-            0 , wxVariantOfPtrToObjectConverterwxObject , 0 , wxObjectToVariantConverterwxObject);
-
- template<> void wxStringWriteValue(wxString & , wxObject* const & ){ wxFAIL_MSG("unreachable"); }
- template<> void wxStringWriteValue(wxString & , wxObject const & ){ wxFAIL_MSG("unreachable"); }
-
- wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ;
- wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ;
-#else
-wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0,
-                                        (int) sizeof(wxObject),
-                                        (wxObjectConstructorFn) 0 );
-#endif
-
-// restore optimizations
-#if defined __VISUALC__ && __VISUALC__ >= 1300
-    #pragma optimize("", on)
-#endif
-
-wxClassInfo* wxClassInfo::sm_first = NULL;
-wxHashTable* wxClassInfo::sm_classTable = NULL;
-
-// when using XTI, this method is already implemented inline inside
-// DECLARE_DYNAMIC_CLASS but otherwise we intentionally make this function
-// non-inline because this allows us to have a non-inline virtual function in
-// all wx classes and this solves linking problems for HP-UX native toolchain
-// and possibly others (we could make dtor non-inline as well but it's more
-// useful to keep it inline than this function)
-#if !wxUSE_EXTENDED_RTTI
-
-wxClassInfo *wxObject::GetClassInfo() const
-{
-    return &wxObject::ms_classInfo;
-}
-
-#endif // wxUSE_EXTENDED_RTTI
-
-// this variable exists only so that we can avoid 'always true/false' warnings
-const bool wxFalse = false;
-
-// Is this object a kind of (a subclass of) 'info'?
-// E.g. is wxWindow a kind of wxObject?
-// Go from this class to superclass, taking into account
-// two possible base classes.
-bool wxObject::IsKindOf(const wxClassInfo *info) const
-{
-    const wxClassInfo *thisInfo = GetClassInfo();
-    return (thisInfo) ? thisInfo->IsKindOf(info) : false ;
-}
-
-#if wxUSE_MEMORY_TRACING && defined( new )
-    #undef new
-#endif
-
-
-#ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT
-void *wxObject::operator new ( size_t size, const wxChar *fileName, int lineNum )
-{
-    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true);
-}
-#endif
-
-#ifdef _WX_WANT_DELETE_VOID
-void wxObject::operator delete ( void *buf )
-{
-    wxDebugFree(buf);
-}
-#endif
-
-#ifdef _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
-void wxObject::operator delete ( void *buf, const char *_fname, size_t _line )
-{
-    wxDebugFree(buf);
-}
-#endif
-
-#ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT
-void wxObject::operator delete ( void *buf, const wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum) )
-{
-     wxDebugFree(buf);
-}
-#endif
-
-#ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT
-void *wxObject::operator new[] ( size_t size, const wxChar* fileName, int lineNum )
-{
-    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true, true);
-}
-#endif
-
-#ifdef _WX_WANT_ARRAY_DELETE_VOID
-void wxObject::operator delete[] ( void *buf )
-{
-    wxDebugFree(buf, true);
-}
-#endif
-
-#ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
-void wxObject::operator delete[] (void * buf, const wxChar*  WXUNUSED(fileName), int WXUNUSED(lineNum) )
-{
-    wxDebugFree(buf, true);
-}
-#endif
-
-
-// ----------------------------------------------------------------------------
-// wxClassInfo
-// ----------------------------------------------------------------------------
-
-wxClassInfo::~wxClassInfo()
-{
-    // remove this object from the linked list of all class infos: if we don't
-    // do it, loading/unloading a DLL containing static wxClassInfo objects is
-    // not going to work
-    if ( this == sm_first )
-    {
-        sm_first = m_next;
-    }
-    else
-    {
-        wxClassInfo *info = sm_first;
-        while (info)
-        {
-            if ( info->m_next == this )
-            {
-                info->m_next = m_next;
-                break;
-            }
-
-            info = info->m_next;
-        }
-    }
-    Unregister();
-}
-
-wxClassInfo *wxClassInfo::FindClass(const wxString& className)
-{
-    if ( sm_classTable )
-    {
-        return (wxClassInfo *)wxClassInfo::sm_classTable->Get(className);
-    }
-    else
-    {
-        for ( wxClassInfo *info = sm_first; info ; info = info->m_next )
-        {
-            if ( className == info->GetClassName() )
-                return info;
-        }
-
-        return NULL;
-    }
-}
-
-// Reentrance can occur on some platforms (Solaris for one), as the use of hash
-// and string objects can cause other modules to load and register classes
-// before the original call returns. This is handled by keeping the hash table
-// local when it is first created and only assigning it to the global variable
-// when the function is ready to return.
-//
-// That does make the assumption that after the function has completed the
-// first time the problem will no longer happen; all the modules it depends on
-// will have been loaded. The assumption is checked using the 'entry' variable
-// as a reentrance guard, it checks that once the hash table is global it is
-// not accessed multiple times simulateously.
-
-void wxClassInfo::Register()
-{
-#if wxDEBUG_LEVEL
-    // reentrance guard - see note above
-    static int entry = 0;
-#endif // wxDEBUG_LEVEL
-
-    wxHashTable *classTable;
-
-    if ( !sm_classTable )
-    {
-        // keep the hash local initially, reentrance is possible
-        classTable = new wxHashTable(wxKEY_STRING);
-    }
-    else
-    {
-        // guard againt reentrance once the global has been created
-        wxASSERT_MSG(++entry == 1, wxT("wxClassInfo::Register() reentrance"));
-        classTable = sm_classTable;
-    }
-
-    // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
-    // link any object module twice mistakenly, or link twice against wx shared
-    // library) will break this function because it will enter an infinite loop
-    // and eventually die with "out of memory" - as this is quite hard to
-    // detect if you're unaware of this, try to do some checks here.
-    wxASSERT_MSG( classTable->Get(m_className) == NULL,
-        wxString::Format
-        (
-            wxT("Class \"%s\" already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() multiple times or linked some object file twice)?"),
-            m_className
-        )
-    );
-
-    classTable->Put(m_className, (wxObject *)this);
-
-    // if we're using a local hash we need to try to make it global
-    if ( sm_classTable != classTable )
-    {
-        if ( !sm_classTable )
-        {
-            // make the hash global
-            sm_classTable = classTable;
-        }
-        else
-        {
-            // the gobal hash has already been created by a reentrant call,
-            // so delete the local hash and try again
-            delete classTable;
-            Register();
-        }
-    }
-
-#if wxDEBUG_LEVEL
-    entry = 0;
-#endif // wxDEBUG_LEVEL
-}
-
-void wxClassInfo::Unregister()
-{
-    if ( sm_classTable )
-    {
-        sm_classTable->Delete(m_className);
-        if ( sm_classTable->GetCount() == 0 )
-        {
-            wxDELETE(sm_classTable);
-        }
-    }
-}
-
-wxObject *wxCreateDynamicObject(const wxString& name)
-{
-#if wxUSE_DEBUG_CONTEXT
-    DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
-#endif
-
-    if ( wxClassInfo::sm_classTable )
-    {
-        wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);
-        return info ? info->CreateObject() : NULL;
-    }
-    else // no sm_classTable yet
-    {
-        for ( wxClassInfo *info = wxClassInfo::sm_first;
-              info;
-              info = info->m_next )
-        {
-            if (info->m_className && wxStrcmp(info->m_className, name) == 0)
-                return info->CreateObject();
-        }
-
-        return NULL;
-    }
-}
-
-// iterator interface
-wxClassInfo::const_iterator::value_type
-wxClassInfo::const_iterator::operator*() const
-{
-    return (wxClassInfo*)m_node->GetData();
-}
-
-wxClassInfo::const_iterator& wxClassInfo::const_iterator::operator++()
-{
-    m_node = m_table->Next();
-    return *this;
-}
-
-const wxClassInfo::const_iterator wxClassInfo::const_iterator::operator++(int)
-{
-    wxClassInfo::const_iterator tmp = *this;
-    m_node = m_table->Next();
-    return tmp;
-}
-
-wxClassInfo::const_iterator wxClassInfo::begin_classinfo()
-{
-    sm_classTable->BeginFind();
-
-    return const_iterator(sm_classTable->Next(), sm_classTable);
-}
-
-wxClassInfo::const_iterator wxClassInfo::end_classinfo()
-{
-    return const_iterator(NULL, NULL);
-}
-
-// ----------------------------------------------------------------------------
-// wxObjectRefData
-// ----------------------------------------------------------------------------
-
-void wxRefCounter::DecRef()
-{
-    wxASSERT_MSG( m_count > 0, "invalid ref data count" );
-
-    if ( --m_count == 0 )
-        delete this;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxObject
-// ----------------------------------------------------------------------------
-
-void wxObject::Ref(const wxObject& clone)
-{
-#if wxUSE_DEBUG_CONTEXT
-    DEBUG_PRINTF(wxObject::Ref)
-#endif
-
-    // nothing to be done
-    if (m_refData == clone.m_refData)
-        return;
-
-    // delete reference to old data
-    UnRef();
-
-    // reference new data
-    if ( clone.m_refData )
-    {
-        m_refData = clone.m_refData;
-        m_refData->IncRef();
-    }
-}
-
-void wxObject::UnRef()
-{
-    if ( m_refData )
-    {
-        m_refData->DecRef();
-        m_refData = NULL;
-    }
-}
-
-void wxObject::AllocExclusive()
-{
-    if ( !m_refData )
-    {
-        m_refData = CreateRefData();
-    }
-    else if ( m_refData->GetRefCount() > 1 )
-    {
-        // note that ref is not going to be destroyed in this case
-        const wxObjectRefData* ref = m_refData;
-        UnRef();
-
-        // ... so we can still access it
-        m_refData = CloneRefData(ref);
-    }
-    //else: ref count is 1, we are exclusive owners of m_refData anyhow
-
-    wxASSERT_MSG( m_refData && m_refData->GetRefCount() == 1,
-                  wxT("wxObject::AllocExclusive() failed.") );
-}
-
-wxObjectRefData *wxObject::CreateRefData() const
-{
-    // if you use AllocExclusive() you must override this method
-    wxFAIL_MSG( wxT("CreateRefData() must be overridden if called!") );
-
-    return NULL;
-}
-
-wxObjectRefData *
-wxObject::CloneRefData(const wxObjectRefData * WXUNUSED(data)) const
-{
-    // if you use AllocExclusive() you must override this method
-    wxFAIL_MSG( wxT("CloneRefData() must be overridden if called!") );
-
-    return NULL;
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/object.cpp
+// Purpose:     wxObject implementation
+// Author:      Julian Smart
+// Modified by: Ron Lee
+// Created:     04/01/98
+// RCS-ID:      $Id: object.cpp 56500 2008-10-23 14:48:31Z MW $
+// Copyright:   (c) 1998 Julian Smart
+//              (c) 2001 Ron Lee <ron@debian.org>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/hash.h"
+    #include "wx/memory.h"
+#endif
+
+#include <string.h>
+
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+    #if defined(__VISAGECPP__)
+        #define DEBUG_PRINTF(NAME) { static int raz=0; \
+            printf( #NAME " %i\n",raz); fflush(stdout); raz++; }
+    #else
+        #define DEBUG_PRINTF(NAME)
+    #endif
+#endif // __WXDEBUG__ || wxUSE_DEBUG_CONTEXT
+
+// we must disable optimizations for VC.NET because otherwise its too eager
+// linker discards wxClassInfo objects in release build thus breaking many,
+// many things
+#if defined __VISUALC__ && __VISUALC__ >= 1300
+    #pragma optimize("", off)
+#endif
+
+#if wxUSE_EXTENDED_RTTI
+const wxClassInfo* wxObject::ms_classParents[] = { NULL } ;
+ wxObject* wxVariantToObjectConverterwxObject ( wxxVariant &data )
+{ return data.wxTEMPLATED_MEMBER_CALL(Get , wxObject*) ; }
+ wxObject* wxVariantOfPtrToObjectConverterwxObject ( wxxVariant &data )
+{ return &data.wxTEMPLATED_MEMBER_CALL(Get , wxObject) ; }
+ wxxVariant wxObjectToVariantConverterwxObject ( wxObject *data )
+ { return wxxVariant( dynamic_cast<wxObject*> (data)  ) ; }
+ wxClassInfo wxObject::ms_classInfo(ms_classParents , wxEmptyString , wxT("wxObject"),
+            (int) sizeof(wxObject),                              \
+            (wxObjectConstructorFn) 0   ,
+            (wxPropertyInfo*) NULL,(wxHandlerInfo*) NULL,0 , 0 ,
+            0 , wxVariantOfPtrToObjectConverterwxObject , wxVariantToObjectConverterwxObject , wxObjectToVariantConverterwxObject);
+ template<> void wxStringReadValue(const wxString & , wxObject * & ){assert(0) ;}
+ template<> void wxStringWriteValue(wxString & , wxObject* const & ){assert(0) ;}
+ template<> void wxStringReadValue(const wxString & , wxObject & ){assert(0) ;}
+ template<> void wxStringWriteValue(wxString & , wxObject const & ){assert(0) ;}
+ wxClassTypeInfo s_typeInfo(wxT_OBJECT_PTR , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject*).name() ) ;
+ wxClassTypeInfo s_typeInfowxObject(wxT_OBJECT , &wxObject::ms_classInfo , NULL , NULL , typeid(wxObject).name() ) ;
+#else
+wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0,
+                                        (int) sizeof(wxObject),
+                                        (wxObjectConstructorFn) 0 );
+#endif
+
+// restore optimizations
+#if defined __VISUALC__ && __VISUALC__ >= 1300
+    #pragma optimize("", on)
+#endif
+
+wxClassInfo* wxClassInfo::sm_first = NULL;
+wxHashTable* wxClassInfo::sm_classTable = NULL;
+
+// when using XTI, this method is already implemented inline inside
+// DECLARE_DYNAMIC_CLASS but otherwise we intentionally make this function
+// non-inline because this allows us to have a non-inline virtual function in
+// all wx classes and this solves linking problems for HP-UX native toolchain
+// and possibly others (we could make dtor non-inline as well but it's more
+// useful to keep it inline than this function)
+#if !wxUSE_EXTENDED_RTTI
+
+wxClassInfo *wxObject::GetClassInfo() const
+{
+    return &wxObject::ms_classInfo;
+}
+
+#endif // wxUSE_EXTENDED_RTTI
+
+// this variable exists only so that we can avoid 'always true/false' warnings
+const bool wxFalse = false;
+
+// Is this object a kind of (a subclass of) 'info'?
+// E.g. is wxWindow a kind of wxObject?
+// Go from this class to superclass, taking into account
+// two possible base classes.
+bool wxObject::IsKindOf(wxClassInfo *info) const
+{
+    wxClassInfo *thisInfo = GetClassInfo();
+    return (thisInfo) ? thisInfo->IsKindOf(info) : false ;
+}
+
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new )
+    #undef new
+#endif
+
+
+#ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT
+void *wxObject::operator new ( size_t size, const wxChar *fileName, int lineNum )
+{
+    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true);
+}
+#endif
+
+#ifdef _WX_WANT_DELETE_VOID
+void wxObject::operator delete ( void *buf )
+{
+    wxDebugFree(buf);
+}
+#endif
+
+#ifdef _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
+void wxObject::operator delete ( void *buf, const char *_fname, size_t _line )
+{
+    wxDebugFree(buf);
+}
+#endif
+
+#ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT
+void wxObject::operator delete ( void *buf, const wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum) )
+{
+     wxDebugFree(buf);
+}
+#endif
+
+#ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT
+void *wxObject::operator new[] ( size_t size, const wxChar* fileName, int lineNum )
+{
+    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, true, true);
+}
+#endif
+
+#ifdef _WX_WANT_ARRAY_DELETE_VOID
+void wxObject::operator delete[] ( void *buf )
+{
+    wxDebugFree(buf, true);
+}
+#endif
+
+#ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
+void wxObject::operator delete[] (void * buf, const wxChar*  WXUNUSED(fileName), int WXUNUSED(lineNum) )
+{
+    wxDebugFree(buf, true);
+}
+#endif
+
+
+// ----------------------------------------------------------------------------
+// wxClassInfo
+// ----------------------------------------------------------------------------
+
+wxClassInfo::~wxClassInfo()
+{
+    // remove this object from the linked list of all class infos: if we don't
+    // do it, loading/unloading a DLL containing static wxClassInfo objects is
+    // not going to work
+    if ( this == sm_first )
+    {
+        sm_first = m_next;
+    }
+    else
+    {
+        wxClassInfo *info = sm_first;
+        while (info)
+        {
+            if ( info->m_next == this )
+            {
+                info->m_next = m_next;
+                break;
+            }
+
+            info = info->m_next;
+        }
+    }
+    Unregister();
+}
+
+wxClassInfo *wxClassInfo::FindClass(const wxChar *className)
+{
+    if ( sm_classTable )
+    {
+        return (wxClassInfo *)wxClassInfo::sm_classTable->Get(className);
+    }
+    else
+    {
+        for ( wxClassInfo *info = sm_first; info ; info = info->m_next )
+        {
+            if ( wxStrcmp(info->GetClassName(), className) == 0 )
+                return info;
+        }
+
+        return NULL;
+    }
+}
+
+// Reentrance can occur on some platforms (Solaris for one), as the use of hash
+// and string objects can cause other modules to load and register classes
+// before the original call returns. This is handled by keeping the hash table
+// local when it is first created and only assigning it to the global variable
+// when the function is ready to return.
+//
+// That does make the assumption that after the function has completed the
+// first time the problem will no longer happen; all the modules it depends on
+// will have been loaded. The assumption is checked using the 'entry' variable
+// as a reentrance guard, it checks that once the hash table is global it is
+// not accessed multiple times simulateously.
+
+void wxClassInfo::Register()
+{
+#ifdef __WXDEBUG__
+    // reentrance guard - see note above
+    static int entry = 0;
+#endif
+
+    wxHashTable *classTable;
+
+    if ( !sm_classTable )
+    {
+        // keep the hash local initially, reentrance is possible
+        classTable = new wxHashTable(wxKEY_STRING);
+    }
+    else
+    {
+        // guard againt reentrance once the global has been created
+        wxASSERT_MSG(++entry == 1, _T("wxClassInfo::Register() reentrance"));
+        classTable = sm_classTable;
+    }
+
+    // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
+    // link any object module twice mistakenly, or link twice against wx shared
+    // library) will break this function because it will enter an infinite loop
+    // and eventually die with "out of memory" - as this is quite hard to
+    // detect if you're unaware of this, try to do some checks here.
+    wxASSERT_MSG( classTable->Get(m_className) == NULL,
+        wxString::Format
+        (
+            _T("Class \"%s\" already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() multiple times or linked some object file twice)?"),
+            m_className
+        )
+    );
+
+    classTable->Put(m_className, (wxObject *)this);
+
+    // if we're using a local hash we need to try to make it global
+    if ( sm_classTable != classTable )
+    {
+        if ( !sm_classTable )
+        {
+            // make the hash global
+            sm_classTable = classTable;
+        }
+        else
+        {
+            // the gobal hash has already been created by a reentrant call,
+            // so delete the local hash and try again
+            delete classTable;
+            Register();
+        }
+    }
+
+#ifdef __WXDEBUG__
+    entry = 0;
+#endif
+}
+
+void wxClassInfo::Unregister()
+{
+    if ( sm_classTable )
+    {
+        sm_classTable->Delete(m_className);
+        if ( sm_classTable->GetCount() == 0 )
+        {
+            delete sm_classTable;
+            sm_classTable = NULL;
+        }
+    }
+}
+
+wxObject *wxCreateDynamicObject(const wxChar *name)
+{
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+    DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
+#endif
+
+    if ( wxClassInfo::sm_classTable )
+    {
+        wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);
+        return info ? info->CreateObject() : NULL;
+    }
+    else // no sm_classTable yet
+    {
+        for ( wxClassInfo *info = wxClassInfo::sm_first;
+              info;
+              info = info->m_next )
+        {
+            if (info->m_className && wxStrcmp(info->m_className, name) == 0)
+                return info->CreateObject();
+        }
+
+        return NULL;
+    }
+}
+
+
+// ----------------------------------------------------------------------------
+// wxObject
+// ----------------------------------------------------------------------------
+
+void wxObject::Ref(const wxObject& clone)
+{
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+    DEBUG_PRINTF(wxObject::Ref)
+#endif
+
+    // nothing to be done
+    if (m_refData == clone.m_refData)
+        return;
+
+    // delete reference to old data
+    UnRef();
+
+    // reference new data
+    if ( clone.m_refData )
+    {
+        m_refData = clone.m_refData;
+        ++(m_refData->m_count);
+    }
+}
+
+void wxObject::UnRef()
+{
+    if ( m_refData )
+    {
+        wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
+
+        if ( --m_refData->m_count == 0 )
+            delete m_refData;
+        m_refData = NULL;
+    }
+}
+
+void wxObject::AllocExclusive()
+{
+    if ( !m_refData )
+    {
+        m_refData = CreateRefData();
+    }
+    else if ( m_refData->GetRefCount() > 1 )
+    {
+        // note that ref is not going to be destroyed in this case
+        const wxObjectRefData* ref = m_refData;
+        UnRef();
+
+        // ... so we can still access it
+        m_refData = CloneRefData(ref);
+    }
+    //else: ref count is 1, we are exclusive owners of m_refData anyhow
+
+    wxASSERT_MSG( m_refData && m_refData->GetRefCount() == 1,
+                  _T("wxObject::AllocExclusive() failed.") );
+}
+
+wxObjectRefData *wxObject::CreateRefData() const
+{
+    // if you use AllocExclusive() you must override this method
+    wxFAIL_MSG( _T("CreateRefData() must be overridden if called!") );
+
+    return NULL;
+}
+
+wxObjectRefData *
+wxObject::CloneRefData(const wxObjectRefData * WXUNUSED(data)) const
+{
+    // if you use AllocExclusive() you must override this method
+    wxFAIL_MSG( _T("CloneRefData() must be overridden if called!") );
+
+    return NULL;
+}
diff --git a/Source/3rd Party/wx/src/common/overlaycmn.cpp b/Source/3rd Party/wx/src/common/overlaycmn.cpp
index 239b9a949..7867edb0e 100644
--- a/Source/3rd Party/wx/src/common/overlaycmn.cpp	
+++ b/Source/3rd Party/wx/src/common/overlaycmn.cpp	
@@ -1,183 +1,197 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/overlaycmn.cpp
-// Purpose:     common wxOverlay code
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     2006-10-20
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/overlay.h"
-#include "wx/private/overlay.h"
-#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxOverlay
-// ----------------------------------------------------------------------------
-
-wxOverlay::wxOverlay()
-{
-    m_impl = new wxOverlayImpl();
-    m_inDrawing = false;
-}
-
-wxOverlay::~wxOverlay()
-{
-    delete m_impl;
-}
-
-bool wxOverlay::IsOk()
-{
-    return m_impl->IsOk();
-}
-
-void wxOverlay::Init( wxDC* dc, int x , int y , int width , int height )
-{
-    m_impl->Init(dc, x, y, width, height);
-}
-
-void wxOverlay::BeginDrawing( wxDC* dc)
-{
-    m_impl->BeginDrawing(dc);
-    m_inDrawing = true ;
-}
-
-void wxOverlay::EndDrawing( wxDC* dc)
-{
-    m_impl->EndDrawing(dc);
-    m_inDrawing = false ;
-}
-
-void wxOverlay::Clear( wxDC* dc)
-{
-    m_impl->Clear(dc);
-}
-
-void wxOverlay::Reset()
-{
-    wxASSERT_MSG(m_inDrawing==false,wxT("cannot reset overlay during drawing"));
-    m_impl->Reset();
-}
-
-
-// ----------------------------------------------------------------------------
-// wxDCOverlay
-// ----------------------------------------------------------------------------
-
-wxDCOverlay::wxDCOverlay(wxOverlay &overlay, wxDC *dc, int x , int y , int width , int height) :
-    m_overlay(overlay)
-{
-    Init(dc, x, y, width, height);
-}
-
-wxDCOverlay::wxDCOverlay(wxOverlay &overlay, wxDC *dc) :
-    m_overlay(overlay)
-{
-    int width;
-    int height;
-    dc->GetSize(&width,&height);
-    Init(dc, 0, 0, width, height);
-}
-
-wxDCOverlay::~wxDCOverlay()
-{
-    m_overlay.EndDrawing(m_dc);
-}
-
-void wxDCOverlay::Init(wxDC *dc, int x , int y , int width , int height )
-{
-    m_dc = dc ;
-    if ( !m_overlay.IsOk() )
-    {
-        m_overlay.Init(dc,x,y,width,height);
-    }
-    m_overlay.BeginDrawing(dc);
-}
-
-void wxDCOverlay::Clear()
-{
-    m_overlay.Clear(m_dc);
-}
-
-// ----------------------------------------------------------------------------
-// generic implementation of wxOverlayImpl
-// ----------------------------------------------------------------------------
-
-#ifndef wxHAS_NATIVE_OVERLAY
-
-wxOverlayImpl::wxOverlayImpl()
-{
-     m_window = NULL ;
-     m_x = m_y = m_width = m_height = 0 ;
-}
-
-wxOverlayImpl::~wxOverlayImpl()
-{
-}
-
-bool wxOverlayImpl::IsOk()
-{
-    return m_bmpSaved.IsOk() ;
-}
-
-void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
-{
-    m_window = dc->GetWindow();
-    wxMemoryDC dcMem ;
-    m_bmpSaved.Create( width, height );
-    dcMem.SelectObject( m_bmpSaved );
-    m_x = x ;
-    m_y = y ;
-    m_width = width ;
-    m_height = height ;
-    dcMem.Blit(0, 0, m_width, m_height,
-        dc, x, y);
-    dcMem.SelectObject( wxNullBitmap );
-}
-
-void wxOverlayImpl::Clear(wxDC* dc)
-{
-    wxMemoryDC dcMem ;
-    dcMem.SelectObject( m_bmpSaved );
-    dc->Blit( m_x, m_y, m_width, m_height , &dcMem , 0 , 0 );
-    dcMem.SelectObject( wxNullBitmap );
-}
-
-void wxOverlayImpl::Reset()
-{
-    m_bmpSaved = wxBitmap();
-}
-
-void wxOverlayImpl::BeginDrawing(wxDC*  WXUNUSED(dc))
-{
-}
-
-void wxOverlayImpl::EndDrawing(wxDC* WXUNUSED(dc))
-{
-}
-
-#endif // !wxHAS_NATIVE_OVERLAY
-
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/overlaycmn.cpp
+// Purpose:     common wxOverlay code
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     2006-10-20
+// RCS-ID:      $Id: overlaycmn.cpp 42397 2006-10-25 12:12:56Z VS $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/overlay.h"
+#include "wx/private/overlay.h"
+#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxOverlay
+// ----------------------------------------------------------------------------
+
+wxOverlay::wxOverlay()
+{
+    m_impl = new wxOverlayImpl();
+    m_inDrawing = false;
+}
+
+wxOverlay::~wxOverlay()
+{
+    delete m_impl;
+}
+
+bool wxOverlay::IsOk()
+{
+    return m_impl->IsOk();
+}
+
+void wxOverlay::Init( wxWindowDC* dc, int x , int y , int width , int height )
+{
+    m_impl->Init(dc, x, y, width, height);
+}
+
+void wxOverlay::BeginDrawing( wxWindowDC* dc)
+{
+    m_impl->BeginDrawing(dc);
+    m_inDrawing = true ;
+}
+
+void wxOverlay::EndDrawing( wxWindowDC* dc)
+{
+    m_impl->EndDrawing(dc);
+    m_inDrawing = false ;
+}
+
+void wxOverlay::Clear( wxWindowDC* dc)
+{
+    m_impl->Clear(dc);
+}
+
+void wxOverlay::Reset()
+{
+    wxASSERT_MSG(m_inDrawing==false,wxT("cannot reset overlay during drawing"));
+    m_impl->Reset();
+}
+
+
+// ----------------------------------------------------------------------------
+// wxDCOverlay
+// ----------------------------------------------------------------------------
+
+wxDCOverlay::wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc, int x , int y , int width , int height) :
+    m_overlay(overlay)
+{
+    Init(dc, x, y, width, height);
+}
+
+wxDCOverlay::wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc) :
+    m_overlay(overlay)
+{
+    int width;
+    int height;
+    dc->GetSize(&width,&height);
+    Init(dc, 0, 0, width, height);
+}
+
+wxDCOverlay::~wxDCOverlay()
+{
+    m_overlay.EndDrawing(m_dc);
+}
+
+void wxDCOverlay::Init(wxWindowDC *dc, int x , int y , int width , int height )
+{
+    m_dc = dc ;
+    if ( !m_overlay.IsOk() )
+    {
+        m_overlay.Init(dc,x,y,width,height);
+    }
+    m_overlay.BeginDrawing(dc);
+}
+
+void wxDCOverlay::Clear() 
+{
+    m_overlay.Clear(m_dc);
+}
+
+// ----------------------------------------------------------------------------
+// generic implementation of wxOverlayImpl
+// ----------------------------------------------------------------------------
+
+#ifndef wxHAS_NATIVE_OVERLAY
+
+wxOverlayImpl::wxOverlayImpl()
+{
+#if defined(__WXGTK__) || defined(__WXMSW__)
+     m_window = NULL ;
+#endif   
+     m_x = m_y = m_width = m_height = 0 ;
+}
+
+wxOverlayImpl::~wxOverlayImpl()
+{
+}
+
+bool wxOverlayImpl::IsOk() 
+{
+    return m_bmpSaved.Ok() ;
+}
+
+void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height )
+{
+#if defined(__WXGTK__)
+    m_window = dc->m_owner;
+#else
+    #if defined (__WXMSW__) 
+    m_window = dc->GetWindow();
+    #endif  // __WXMSW__
+   
+#endif
+    wxMemoryDC dcMem ;
+    m_bmpSaved.Create( width, height );
+    dcMem.SelectObject( m_bmpSaved );
+    m_x = x ;
+    m_y = y ;
+    m_width = width ;
+    m_height = height ;
+#if defined(__WXGTK__) && !defined(__WX_DC_BLIT_FIXED__)
+    wxPoint pt = dc->GetDeviceOrigin();
+    x += pt.x;
+    y += pt.y;
+#endif // broken wxGTK wxDC::Blit
+    dcMem.Blit(0, 0, m_width, m_height,
+        dc, x, y);
+    dcMem.SelectObject( wxNullBitmap );
+}
+
+void wxOverlayImpl::Clear(wxWindowDC* dc) 
+{
+    wxMemoryDC dcMem ;
+    dcMem.SelectObject( m_bmpSaved );
+    dc->Blit( m_x, m_y, m_width, m_height , &dcMem , 0 , 0 );
+    dcMem.SelectObject( wxNullBitmap );
+}
+
+void wxOverlayImpl::Reset()
+{
+    m_bmpSaved = wxBitmap();
+}
+
+void wxOverlayImpl::BeginDrawing(wxWindowDC*  WXUNUSED(dc))
+{
+}
+
+void wxOverlayImpl::EndDrawing(wxWindowDC* WXUNUSED(dc))
+{
+}
+
+#endif // !wxHAS_NATIVE_OVERLAY
+
+
diff --git a/Source/3rd Party/wx/src/common/ownerdrwcmn.cpp b/Source/3rd Party/wx/src/common/ownerdrwcmn.cpp
deleted file mode 100644
index bafee6922..000000000
--- a/Source/3rd Party/wx/src/common/ownerdrwcmn.cpp	
+++ /dev/null
@@ -1,105 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/ownerdrwcmn.cpp
-// Purpose:     wxOwnerDrawn class methods common to all platforms
-// Author:      Marcin Malich
-// Modified by:
-// Created:     2009-09-22
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Marcin Malich <me@malcom.pl>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_OWNER_DRAWN
-
-#include "wx/ownerdrw.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-    #include "wx/font.h"
-    #include "wx/colour.h"
-    #include "wx/dcmemory.h"
-    #include "wx/settings.h"
-    #include "wx/utils.h"
-#endif
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-bool wxOwnerDrawnBase::OnMeasureItem(size_t *width, size_t *height)
-{
-    if ( IsOwnerDrawn() )
-    {
-        wxMemoryDC dc;
-        wxFont font;
-        GetFontToUse(font);
-        dc.SetFont(font);
-
-        // item name/text without mnemonics
-        wxString name = wxStripMenuCodes(GetName(), wxStrip_Mnemonics);
-
-        wxCoord w, h;
-        dc.GetTextExtent(name, &w, &h);
-
-        *width = w + m_margin;
-        *height = h;
-    }
-    else
-    {
-        *width = 0;
-        *height = 0;
-    }
-
-    return true;
-}
-
-void wxOwnerDrawnBase::GetFontToUse(wxFont& font) const
-{
-    font = m_font.IsOk() ? m_font : *wxNORMAL_FONT;
-}
-
-void wxOwnerDrawnBase::GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const
-{
-    if ( stat & wxODSelected )
-    {
-        colText = wxSystemSettings::GetColour(
-                !(stat & wxODDisabled) ? wxSYS_COLOUR_HIGHLIGHTTEXT
-                                       : wxSYS_COLOUR_GRAYTEXT);
-
-        colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
-    }
-    else
-    {
-        // fall back to default colors if none explicitly specified
-
-        if ( stat & wxODDisabled )
-        {
-            colText = wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT);
-        }
-        else
-        {
-            colText = m_colText.IsOk() ? m_colText
-                                     : wxSystemSettings::GetColour(wxSYS_COLOUR_MENUTEXT);
-        }
-
-        colBack = m_colBack.IsOk() ? m_colBack
-                                 : wxSystemSettings::GetColour(wxSYS_COLOUR_MENU);
-    }
-}
-
-#endif // wxUSE_OWNER_DRAWN
diff --git a/Source/3rd Party/wx/src/common/paper.cpp b/Source/3rd Party/wx/src/common/paper.cpp
index 3fed12c75..714eee286 100644
--- a/Source/3rd Party/wx/src/common/paper.cpp	
+++ b/Source/3rd Party/wx/src/common/paper.cpp	
@@ -1,380 +1,376 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/paper.cpp
-// Purpose:     Paper size classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-#ifndef WX_PRECOMP
-    #if defined(__WXMSW__)
-        #include "wx/msw/wrapcdlg.h"
-    #endif // MSW
-    #include "wx/utils.h"
-    #include "wx/settings.h"
-    #include "wx/intl.h"
-    #include "wx/module.h"
-#endif
-
-#include "wx/paper.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef __WXMSW__
-    #ifndef __WIN32__
-        #include <print.h>
-    #endif
-#endif
- // End __WXMSW__
-
-IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
-// IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
-
-/*
- * Paper size database for all platforms
- */
-
-wxPrintPaperType::wxPrintPaperType()
-{
-    m_paperId = wxPAPER_NONE;
-    m_platformId = 0;
-    m_paperName = wxEmptyString;
-    m_width = 0;
-    m_height = 0;
-}
-
-wxPrintPaperType::wxPrintPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h)
-{
-    m_paperId = paperId;
-    m_platformId = platformId;
-    m_paperName = name;
-    m_width = w;
-    m_height = h;
-}
-
-// Get width and height in points (1/72th of an inch)
-wxSize wxPrintPaperType::GetSizeDeviceUnits() const
-{
-    return wxSize( (int) ((m_width / 10.0) / (25.4 / 72.0)), (int) ((m_height / 10.0) / (25.4 / 72.0)) );
-}
-
-/*
- * Print paper database for PostScript
- */
-
-WX_DECLARE_LIST(wxPrintPaperType, wxPrintPaperTypeList);
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxPrintPaperTypeList)
-
-wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
-
-wxPrintPaperDatabase::wxPrintPaperDatabase()
-{
-    m_map = new wxStringToPrintPaperTypeHashMap;
-    m_list = new wxPrintPaperTypeList;
-}
-
-wxPrintPaperDatabase::~wxPrintPaperDatabase()
-{
-    ClearDatabase();
-}
-
-void wxPrintPaperDatabase::CreateDatabase()
-{
-    WXADDPAPER(wxPAPER_LETTER,             DMPAPER_LETTER,             wxTRANSLATE("Letter, 8 1/2 x 11 in"), 2159, 2794);
-    WXADDPAPER(wxPAPER_LEGAL,              DMPAPER_LEGAL,              wxTRANSLATE("Legal, 8 1/2 x 14 in"), 2159, 3556);
-    WXADDPAPER(wxPAPER_A4,                 DMPAPER_A4,                 wxTRANSLATE("A4 sheet, 210 x 297 mm"), 2100, 2970);
-    WXADDPAPER(wxPAPER_CSHEET,             DMPAPER_CSHEET,             wxTRANSLATE("C sheet, 17 x 22 in"), 4318, 5588);
-    WXADDPAPER(wxPAPER_DSHEET,             DMPAPER_DSHEET,             wxTRANSLATE("D sheet, 22 x 34 in"), 5588, 8636);
-    WXADDPAPER(wxPAPER_ESHEET,             DMPAPER_ESHEET,             wxTRANSLATE("E sheet, 34 x 44 in"), 8636, 11176);
-    WXADDPAPER(wxPAPER_LETTERSMALL,        DMPAPER_LETTERSMALL,        wxTRANSLATE("Letter Small, 8 1/2 x 11 in"), 2159, 2794);
-    WXADDPAPER(wxPAPER_TABLOID,            DMPAPER_TABLOID,            wxTRANSLATE("Tabloid, 11 x 17 in"), 2794, 4318);
-    WXADDPAPER(wxPAPER_LEDGER,             DMPAPER_LEDGER,             wxTRANSLATE("Ledger, 17 x 11 in"), 4318, 2794);
-    WXADDPAPER(wxPAPER_STATEMENT,          DMPAPER_STATEMENT,          wxTRANSLATE("Statement, 5 1/2 x 8 1/2 in"), 1397, 2159);
-    WXADDPAPER(wxPAPER_EXECUTIVE,          DMPAPER_EXECUTIVE,          wxTRANSLATE("Executive, 7 1/4 x 10 1/2 in"), 1842, 2667);
-    WXADDPAPER(wxPAPER_A3,                 DMPAPER_A3,                 wxTRANSLATE("A3 sheet, 297 x 420 mm"), 2970, 4200);
-    WXADDPAPER(wxPAPER_A4SMALL,            DMPAPER_A4SMALL,            wxTRANSLATE("A4 small sheet, 210 x 297 mm"), 2100, 2970);
-    WXADDPAPER(wxPAPER_A5,                 DMPAPER_A5,                 wxTRANSLATE("A5 sheet, 148 x 210 mm"), 1480, 2100);
-    WXADDPAPER(wxPAPER_B4,                 DMPAPER_B4,                 wxTRANSLATE("B4 sheet, 250 x 354 mm"), 2500, 3540);
-    WXADDPAPER(wxPAPER_B5,                 DMPAPER_B5,                 wxTRANSLATE("B5 sheet, 182 x 257 millimeter"), 1820, 2570);
-    WXADDPAPER(wxPAPER_FOLIO,              DMPAPER_FOLIO,              wxTRANSLATE("Folio, 8 1/2 x 13 in"), 2159, 3302);
-    WXADDPAPER(wxPAPER_QUARTO,             DMPAPER_QUARTO,             wxTRANSLATE("Quarto, 215 x 275 mm"), 2150, 2750);
-    WXADDPAPER(wxPAPER_10X14,              DMPAPER_10X14,              wxTRANSLATE("10 x 14 in"), 2540, 3556);
-    WXADDPAPER(wxPAPER_11X17,              DMPAPER_11X17,              wxTRANSLATE("11 x 17 in"), 2794, 4318);
-    WXADDPAPER(wxPAPER_NOTE,               DMPAPER_NOTE,               wxTRANSLATE("Note, 8 1/2 x 11 in"), 2159, 2794);
-    WXADDPAPER(wxPAPER_ENV_9,              DMPAPER_ENV_9,              wxTRANSLATE("#9 Envelope, 3 7/8 x 8 7/8 in"), 984, 2254);
-    WXADDPAPER(wxPAPER_ENV_10,             DMPAPER_ENV_10,             wxTRANSLATE("#10 Envelope, 4 1/8 x 9 1/2 in"), 1048, 2413);
-    WXADDPAPER(wxPAPER_ENV_11,             DMPAPER_ENV_11,             wxTRANSLATE("#11 Envelope, 4 1/2 x 10 3/8 in"), 1143, 2635);
-    WXADDPAPER(wxPAPER_ENV_12,             DMPAPER_ENV_12,             wxTRANSLATE("#12 Envelope, 4 3/4 x 11 in"), 1206, 2794);
-    WXADDPAPER(wxPAPER_ENV_14,             DMPAPER_ENV_14,             wxTRANSLATE("#14 Envelope, 5 x 11 1/2 in"), 1270, 2921);
-    WXADDPAPER(wxPAPER_ENV_DL,             DMPAPER_ENV_DL,             wxTRANSLATE("DL Envelope, 110 x 220 mm"), 1100, 2200);
-    WXADDPAPER(wxPAPER_ENV_C5,             DMPAPER_ENV_C5,             wxTRANSLATE("C5 Envelope, 162 x 229 mm"), 1620, 2290);
-    WXADDPAPER(wxPAPER_ENV_C3,             DMPAPER_ENV_C3,             wxTRANSLATE("C3 Envelope, 324 x 458 mm"), 3240, 4580);
-    WXADDPAPER(wxPAPER_ENV_C4,             DMPAPER_ENV_C4,             wxTRANSLATE("C4 Envelope, 229 x 324 mm"), 2290, 3240);
-    WXADDPAPER(wxPAPER_ENV_C6,             DMPAPER_ENV_C6,             wxTRANSLATE("C6 Envelope, 114 x 162 mm"), 1140, 1620);
-    WXADDPAPER(wxPAPER_ENV_C65,            DMPAPER_ENV_C65,            wxTRANSLATE("C65 Envelope, 114 x 229 mm"), 1140, 2290);
-    WXADDPAPER(wxPAPER_ENV_B4,             DMPAPER_ENV_B4,             wxTRANSLATE("B4 Envelope, 250 x 353 mm"), 2500, 3530);
-    WXADDPAPER(wxPAPER_ENV_B5,             DMPAPER_ENV_B5,             wxTRANSLATE("B5 Envelope, 176 x 250 mm"), 1760, 2500);
-    WXADDPAPER(wxPAPER_ENV_B6,             DMPAPER_ENV_B6,             wxTRANSLATE("B6 Envelope, 176 x 125 mm"), 1760, 1250);
-    WXADDPAPER(wxPAPER_ENV_ITALY,          DMPAPER_ENV_ITALY,          wxTRANSLATE("Italy Envelope, 110 x 230 mm"), 1100, 2300);
-    WXADDPAPER(wxPAPER_ENV_MONARCH,        DMPAPER_ENV_MONARCH,        wxTRANSLATE("Monarch Envelope, 3 7/8 x 7 1/2 in"), 984, 1905);
-    WXADDPAPER(wxPAPER_ENV_PERSONAL,       DMPAPER_ENV_PERSONAL,       wxTRANSLATE("6 3/4 Envelope, 3 5/8 x 6 1/2 in"), 921, 1651);
-    WXADDPAPER(wxPAPER_FANFOLD_US,         DMPAPER_FANFOLD_US,         wxTRANSLATE("US Std Fanfold, 14 7/8 x 11 in"), 3778, 2794);
-    WXADDPAPER(wxPAPER_FANFOLD_STD_GERMAN, DMPAPER_FANFOLD_STD_GERMAN, wxTRANSLATE("German Std Fanfold, 8 1/2 x 12 in"), 2159, 3048);
-    WXADDPAPER(wxPAPER_FANFOLD_LGL_GERMAN, DMPAPER_FANFOLD_LGL_GERMAN, wxTRANSLATE("German Legal Fanfold, 8 1/2 x 13 in"), 2159, 3302);
-
-    WXADDPAPER(wxPAPER_ISO_B4,             DMPAPER_ISO_B4,             wxTRANSLATE("B4 (ISO) 250 x 353 mm"), 2500, 2530);
-    WXADDPAPER(wxPAPER_JAPANESE_POSTCARD,  DMPAPER_JAPANESE_POSTCARD,  wxTRANSLATE("Japanese Postcard 100 x 148 mm"), 1000, 1480);
-    WXADDPAPER(wxPAPER_9X11,               DMPAPER_9X11,               wxTRANSLATE("9 x 11 in"), 2286, 2794);
-    WXADDPAPER(wxPAPER_10X11,              DMPAPER_10X11,              wxTRANSLATE("10 x 11 in"), 2540, 2794);
-    WXADDPAPER(wxPAPER_15X11,              DMPAPER_15X11,              wxTRANSLATE("15 x 11 in"), 3810, 2794);
-    WXADDPAPER(wxPAPER_ENV_INVITE,         DMPAPER_ENV_INVITE,         wxTRANSLATE("Envelope Invite 220 x 220 mm"), 2200, 2200);
-    WXADDPAPER(wxPAPER_LETTER_EXTRA,       DMPAPER_LETTER_EXTRA,       wxTRANSLATE("Letter Extra 9 1/2 x 12 in"), 2413, 3048);
-    WXADDPAPER(wxPAPER_LEGAL_EXTRA,        DMPAPER_LEGAL_EXTRA,        wxTRANSLATE("Legal Extra 9 1/2 x 15 in"), 2413, 3810);
-    WXADDPAPER(wxPAPER_TABLOID_EXTRA,      DMPAPER_TABLOID_EXTRA,      wxTRANSLATE("Tabloid Extra 11.69 x 18 in"), 2969, 4572);
-    WXADDPAPER(wxPAPER_A4_EXTRA,           DMPAPER_A4_EXTRA,           wxTRANSLATE("A4 Extra 9.27 x 12.69 in"), 2355, 3223);
-    WXADDPAPER(wxPAPER_LETTER_TRANSVERSE,  DMPAPER_LETTER_TRANSVERSE,  wxTRANSLATE("Letter Transverse 8 1/2 x 11 in"), 2159, 2794);
-    WXADDPAPER(wxPAPER_A4_TRANSVERSE,      DMPAPER_A4_TRANSVERSE,      wxTRANSLATE("A4 Transverse 210 x 297 mm"), 2100, 2970);
-    WXADDPAPER(wxPAPER_LETTER_EXTRA_TRANSVERSE, DMPAPER_LETTER_EXTRA_TRANSVERSE, wxTRANSLATE("Letter Extra Transverse 9.275 x 12 in"), 2355, 3048);
-    WXADDPAPER(wxPAPER_A_PLUS,             DMPAPER_A_PLUS,             wxTRANSLATE("SuperA/SuperA/A4 227 x 356 mm"), 2270, 3560);
-    WXADDPAPER(wxPAPER_B_PLUS,             DMPAPER_B_PLUS,             wxTRANSLATE("SuperB/SuperB/A3 305 x 487 mm"), 3050, 4870);
-    WXADDPAPER(wxPAPER_LETTER_PLUS,        DMPAPER_LETTER_PLUS,        wxTRANSLATE("Letter Plus 8 1/2 x 12.69 in"), 2159, 3223);
-    WXADDPAPER(wxPAPER_A4_PLUS,            DMPAPER_A4_PLUS,            wxTRANSLATE("A4 Plus 210 x 330 mm"), 2100, 3300);
-    WXADDPAPER(wxPAPER_A5_TRANSVERSE,      DMPAPER_A5_TRANSVERSE,      wxTRANSLATE("A5 Transverse 148 x 210 mm"), 1480, 2100);
-    WXADDPAPER(wxPAPER_B5_TRANSVERSE,      DMPAPER_B5_TRANSVERSE,      wxTRANSLATE("B5 (JIS) Transverse 182 x 257 mm"), 1820, 2570);
-    WXADDPAPER(wxPAPER_A3_EXTRA,           DMPAPER_A3_EXTRA,           wxTRANSLATE("A3 Extra 322 x 445 mm"), 3220, 4450);
-    WXADDPAPER(wxPAPER_A5_EXTRA,           DMPAPER_A5_EXTRA,           wxTRANSLATE("A5 Extra 174 x 235 mm"), 1740, 2350);
-    WXADDPAPER(wxPAPER_B5_EXTRA,           DMPAPER_B5_EXTRA,           wxTRANSLATE("B5 (ISO) Extra 201 x 276 mm"), 2010, 2760);
-    WXADDPAPER(wxPAPER_A2,                 DMPAPER_A2,                 wxTRANSLATE("A2 420 x 594 mm"), 4200, 5940);
-    WXADDPAPER(wxPAPER_A3_TRANSVERSE,      DMPAPER_A3_TRANSVERSE,      wxTRANSLATE("A3 Transverse 297 x 420 mm"), 2970, 4200);
-    WXADDPAPER(wxPAPER_A3_EXTRA_TRANSVERSE,DMPAPER_A3_EXTRA_TRANSVERSE,wxTRANSLATE("A3 Extra Transverse 322 x 445 mm"), 3220, 4450);
-
-    WXADDPAPER(wxPAPER_DBL_JAPANESE_POSTCARD, 69,                       wxTRANSLATE("Japanese Double Postcard 200 x 148 mm"), 2000, 1480);
-    WXADDPAPER(wxPAPER_A6,                  70,                         wxTRANSLATE("A6 105 x 148 mm"), 1050, 1480);
-    WXADDPAPER(wxPAPER_JENV_KAKU2,          71,                         wxTRANSLATE("Japanese Envelope Kaku #2"), 2400, 3320);
-    WXADDPAPER(wxPAPER_JENV_KAKU3,          72,                         wxTRANSLATE("Japanese Envelope Kaku #3"), 2160, 2770);
-    WXADDPAPER(wxPAPER_JENV_CHOU3,          73,                         wxTRANSLATE("Japanese Envelope Chou #3"), 1200, 2350);
-    WXADDPAPER(wxPAPER_JENV_CHOU4,          74,                         wxTRANSLATE("Japanese Envelope Chou #4"), 900, 2050);
-    WXADDPAPER(wxPAPER_LETTER_ROTATED,      75,                         wxTRANSLATE("Letter Rotated 11 x 8 1/2 in"), 2794, 2159);
-    WXADDPAPER(wxPAPER_A3_ROTATED,          76,                         wxTRANSLATE("A3 Rotated 420 x 297 mm"), 4200, 2970);
-    WXADDPAPER(wxPAPER_A4_ROTATED,          77,                         wxTRANSLATE("A4 Rotated 297 x 210 mm"), 2970, 2100);
-    WXADDPAPER(wxPAPER_A5_ROTATED,          78,                         wxTRANSLATE("A5 Rotated 210 x 148 mm"), 2100, 1480);
-    WXADDPAPER(wxPAPER_B4_JIS_ROTATED,      79,                         wxTRANSLATE("B4 (JIS) Rotated 364 x 257 mm"), 3640, 2570);
-    WXADDPAPER(wxPAPER_B5_JIS_ROTATED,      80,                         wxTRANSLATE("B5 (JIS) Rotated 257 x 182 mm"), 2570, 1820);
-    WXADDPAPER(wxPAPER_JAPANESE_POSTCARD_ROTATED, 81,                   wxTRANSLATE("Japanese Postcard Rotated 148 x 100 mm"), 1480, 1000);
-    WXADDPAPER(wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED, 82,               wxTRANSLATE("Double Japanese Postcard Rotated 148 x 200 mm"), 1480, 2000);
-    WXADDPAPER(wxPAPER_A6_ROTATED,          83,                         wxTRANSLATE("A6 Rotated 148 x 105 mm"), 1480, 1050);
-    WXADDPAPER(wxPAPER_JENV_KAKU2_ROTATED,  84,                         wxTRANSLATE("Japanese Envelope Kaku #2 Rotated"), 3320, 2400);
-    WXADDPAPER(wxPAPER_JENV_KAKU3_ROTATED,  85,                         wxTRANSLATE("Japanese Envelope Kaku #3 Rotated"), 2770, 2160);
-    WXADDPAPER(wxPAPER_JENV_CHOU3_ROTATED,  86,                         wxTRANSLATE("Japanese Envelope Chou #3 Rotated"), 2350, 1200);
-    WXADDPAPER(wxPAPER_JENV_CHOU4_ROTATED,  87,                         wxTRANSLATE("Japanese Envelope Chou #4 Rotated"), 2050, 900);
-    WXADDPAPER(wxPAPER_B6_JIS,              88,                         wxTRANSLATE("B6 (JIS) 128 x 182 mm"), 1280, 1820);
-    WXADDPAPER(wxPAPER_B6_JIS_ROTATED,      89,                         wxTRANSLATE("B6 (JIS) Rotated 182 x 128 mm"), 1920, 1280);
-    WXADDPAPER(wxPAPER_12X11,               90,                         wxTRANSLATE("12 x 11 in"), 3048, 2794);
-    WXADDPAPER(wxPAPER_JENV_YOU4,           91,                         wxTRANSLATE("Japanese Envelope You #4"), 2350, 1050);
-    WXADDPAPER(wxPAPER_JENV_YOU4_ROTATED,   92,                         wxTRANSLATE("Japanese Envelope You #4 Rotated"), 1050, 2350);
-    WXADDPAPER(wxPAPER_P16K,                93,                         wxTRANSLATE("PRC 16K 146 x 215 mm"), 1460, 2150);
-    WXADDPAPER(wxPAPER_P32K,                94,                         wxTRANSLATE("PRC 32K 97 x 151 mm"), 970, 1510);
-    WXADDPAPER(wxPAPER_P32KBIG,             95,                         wxTRANSLATE("PRC 32K(Big) 97 x 151 mm"), 970, 1510);
-    WXADDPAPER(wxPAPER_PENV_1,              96,                         wxTRANSLATE("PRC Envelope #1 102 x 165 mm"), 1020, 1650);
-    WXADDPAPER(wxPAPER_PENV_2,              97,                         wxTRANSLATE("PRC Envelope #2 102 x 176 mm"), 1020, 1760);
-    WXADDPAPER(wxPAPER_PENV_3,              98,                         wxTRANSLATE("PRC Envelope #3 125 x 176 mm"), 1250, 1760);
-    WXADDPAPER(wxPAPER_PENV_4,              99,                         wxTRANSLATE("PRC Envelope #4 110 x 208 mm"), 1100, 2080);
-    WXADDPAPER(wxPAPER_PENV_5,              100,                        wxTRANSLATE("PRC Envelope #5 110 x 220 mm"), 1100, 2200);
-    WXADDPAPER(wxPAPER_PENV_6,              101,                        wxTRANSLATE("PRC Envelope #6 120 x 230 mm"), 1200, 2300);
-    WXADDPAPER(wxPAPER_PENV_7,              102,                        wxTRANSLATE("PRC Envelope #7 160 x 230 mm"), 1600, 2300);
-    WXADDPAPER(wxPAPER_PENV_8,              103,                        wxTRANSLATE("PRC Envelope #8 120 x 309 mm"), 1200, 3090);
-    WXADDPAPER(wxPAPER_PENV_9,              104,                        wxTRANSLATE("PRC Envelope #9 229 x 324 mm"), 2290, 3240);
-    WXADDPAPER(wxPAPER_PENV_10,             105,                        wxTRANSLATE("PRC Envelope #10 324 x 458 mm"), 3240, 4580);
-    WXADDPAPER(wxPAPER_P16K_ROTATED,        106,                        wxTRANSLATE("PRC 16K Rotated"), 2150, 1460);
-    WXADDPAPER(wxPAPER_P32K_ROTATED,        107,                        wxTRANSLATE("PRC 32K Rotated"), 1510, 970);
-    WXADDPAPER(wxPAPER_P32KBIG_ROTATED,     108,                        wxTRANSLATE("PRC 32K(Big) Rotated"), 1510, 970);
-    WXADDPAPER(wxPAPER_PENV_1_ROTATED,      109,                        wxTRANSLATE("PRC Envelope #1 Rotated 165 x 102 mm"), 1650, 1020);
-    WXADDPAPER(wxPAPER_PENV_2_ROTATED,      110,                        wxTRANSLATE("PRC Envelope #2 Rotated 176 x 102 mm"), 1760, 1020);
-    WXADDPAPER(wxPAPER_PENV_3_ROTATED,      111,                        wxTRANSLATE("PRC Envelope #3 Rotated 176 x 125 mm"), 1760, 1250);
-    WXADDPAPER(wxPAPER_PENV_4_ROTATED,      112,                        wxTRANSLATE("PRC Envelope #4 Rotated 208 x 110 mm"), 2080, 1100);
-    WXADDPAPER(wxPAPER_PENV_5_ROTATED,      113,                        wxTRANSLATE("PRC Envelope #5 Rotated 220 x 110 mm"), 2200, 1100);
-    WXADDPAPER(wxPAPER_PENV_6_ROTATED,      114,                        wxTRANSLATE("PRC Envelope #6 Rotated 230 x 120 mm"), 2300, 1200);
-    WXADDPAPER(wxPAPER_PENV_7_ROTATED,      115,                        wxTRANSLATE("PRC Envelope #7 Rotated 230 x 160 mm"), 2300, 1600);
-    WXADDPAPER(wxPAPER_PENV_8_ROTATED,      116,                        wxTRANSLATE("PRC Envelope #8 Rotated 309 x 120 mm"), 3090, 1200);
-    WXADDPAPER(wxPAPER_PENV_9_ROTATED,      117,                        wxTRANSLATE("PRC Envelope #9 Rotated 324 x 229 mm"), 3240, 2290);
-    WXADDPAPER(wxPAPER_PENV_10_ROTATED,     118,                        wxTRANSLATE("PRC Envelope #10 Rotated 458 x 324 mm"), 4580, 3240);
-
-    // notice that the values 135 and 136 for Windows paper size ids of A0 and
-    // A1 formats are not documented anywhere but seem to work for at least
-    // some printers so we use them until we find a better way (see #11083)
-    WXADDPAPER(wxPAPER_A0,                  136,                        wxTRANSLATE("A0 sheet, 841 x 1189 mm"), 8410, 11888);
-    WXADDPAPER(wxPAPER_A1,                  135,                        wxTRANSLATE("A1 sheet, 594 x 841 mm"), 5940, 8410);
-}
-
-void wxPrintPaperDatabase::ClearDatabase()
-{
-    delete m_list;
-    WX_CLEAR_HASH_MAP(wxStringToPrintPaperTypeHashMap, *m_map);
-    delete m_map;
-}
-
-void wxPrintPaperDatabase::AddPaperType(wxPaperSize paperId, const wxString& name, int w, int h)
-{
-    wxPrintPaperType* tmp = new wxPrintPaperType(paperId, 0, name, w, h);
-    (*m_map)[name] = tmp;
-    m_list->push_back(tmp);
-}
-
-void wxPrintPaperDatabase::AddPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h)
-{
-    wxPrintPaperType* tmp = new wxPrintPaperType(paperId, platformId, name, w, h);
-    (*m_map)[name] = tmp;
-    m_list->push_back(tmp);
-}
-
-wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const wxString& name)
-{
-    wxStringToPrintPaperTypeHashMap::iterator it = m_map->find(name);
-    if (it != m_map->end())
-        return it->second;
-    else
-        return NULL;
-}
-
-wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(wxPaperSize id)
-{
-    typedef wxStringToPrintPaperTypeHashMap::iterator iterator;
-
-    for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it)
-    {
-        wxPrintPaperType* paperType = it->second;
-        if (paperType->GetId() == id)
-            return paperType;
-    }
-
-    return NULL;
-}
-
-wxPrintPaperType *wxPrintPaperDatabase::FindPaperTypeByPlatformId(int id)
-{
-    typedef wxStringToPrintPaperTypeHashMap::iterator iterator;
-
-    for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it)
-    {
-        wxPrintPaperType* paperType = it->second;
-        if (paperType->GetPlatformId() == id)
-            return paperType;
-    }
-
-    return NULL;
-}
-
-wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const wxSize& sz)
-{
-    // Take the item ordering into account so that the more common types
-    // are likely to be taken into account first. This fixes problems with,
-    // for example, Letter reverting to A4 in the page setup dialog because
-    // it was wrongly translated to Note.
-    for ( size_t i = 0; i < GetCount(); i++ )
-    {
-        wxPrintPaperType* const paperType = Item(i);
-        const wxSize paperSize = paperType->GetSize() ;
-        if ( abs(paperSize.x - sz.x) < 10 && abs(paperSize.y - sz.y) < 10 )
-            return paperType;
-    }
-
-    return NULL;
-}
-
-// Convert name to size id
-wxPaperSize wxPrintPaperDatabase::ConvertNameToId(const wxString& name)
-{
-    wxPrintPaperType* type = FindPaperType(name);
-    if (type)
-        return type->GetId();
-    else
-        return wxPAPER_NONE;
-}
-
-// Convert size id to name
-wxString wxPrintPaperDatabase::ConvertIdToName(wxPaperSize paperId)
-{
-    wxPrintPaperType* type = FindPaperType(paperId);
-    if (type)
-        return type->GetName();
-    else
-        return wxEmptyString;
-}
-
-// Get the paper size
-wxSize wxPrintPaperDatabase::GetSize(wxPaperSize paperId)
-{
-    wxPrintPaperType* type = FindPaperType(paperId);
-    if (type)
-        return type->GetSize();
-    else
-        return wxSize(0,0);
-}
-
-// Get the paper size
-wxPaperSize wxPrintPaperDatabase::GetSize(const wxSize& size)
-{
-    wxPrintPaperType* type = FindPaperType(size);
-    if (type)
-        return type->GetId();
-    else
-        return wxPAPER_NONE;
-}
-
-// QUICK and DIRTY
-size_t wxPrintPaperDatabase::GetCount() const
-{
-    return m_list->GetCount();
-}
-
-wxPrintPaperType* wxPrintPaperDatabase::Item(size_t index) const
-{
-    return m_list->Item(index)->GetData();
-}
-
-// A module to allow initialization/cleanup of print paper
-// things without calling these functions from app.cpp.
-
-class WXDLLEXPORT wxPrintPaperModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxPrintPaperModule)
-public:
-    wxPrintPaperModule() {}
-    bool OnInit();
-    void OnExit();
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperModule, wxModule)
-
-/*
- * Initialization/cleanup module
- */
-
-bool wxPrintPaperModule::OnInit()
-{
-    wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-    wxThePrintPaperDatabase->CreateDatabase();
-
-    return true;
-}
-
-void wxPrintPaperModule::OnExit()
-{
-    wxDELETE(wxThePrintPaperDatabase);
-}
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/paper.cpp
+// Purpose:     Paper size classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: paper.cpp 60706 2009-05-21 10:17:44Z JS $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_PRINTING_ARCHITECTURE
+
+#ifndef WX_PRECOMP
+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/intl.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/paper.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __WXMSW__
+    #ifndef __WIN32__
+        #include <print.h>
+    #endif
+#endif
+ // End __WXMSW__
+
+IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
+// IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
+
+/*
+ * Paper size database for all platforms
+ */
+
+wxPrintPaperType::wxPrintPaperType()
+{
+    m_paperId = wxPAPER_NONE;
+    m_platformId = 0;
+    m_paperName = wxEmptyString;
+    m_width = 0;
+    m_height = 0;
+}
+
+wxPrintPaperType::wxPrintPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h)
+{
+    m_paperId = paperId;
+    m_platformId = platformId;
+    m_paperName = name;
+    m_width = w;
+    m_height = h;
+}
+
+// Get width and height in points (1/72th of an inch)
+wxSize wxPrintPaperType::GetSizeDeviceUnits() const
+{
+    return wxSize( (int) ((m_width / 10.0) / (25.4 / 72.0)), (int) ((m_height / 10.0) / (25.4 / 72.0)) );
+}
+
+/*
+ * Print paper database for PostScript
+ */
+
+WX_DECLARE_LIST(wxPrintPaperType, wxPrintPaperTypeList);
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxPrintPaperTypeList)
+
+wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase*) NULL;
+
+wxPrintPaperDatabase::wxPrintPaperDatabase()
+{
+    m_map = new wxStringToPrintPaperTypeHashMap;
+    m_list = new wxPrintPaperTypeList;
+}
+
+wxPrintPaperDatabase::~wxPrintPaperDatabase()
+{
+    ClearDatabase();
+}
+
+void wxPrintPaperDatabase::CreateDatabase()
+{
+    WXADDPAPER(wxPAPER_LETTER,             DMPAPER_LETTER,             wxTRANSLATE("Letter, 8 1/2 x 11 in"), 2159, 2794);
+    WXADDPAPER(wxPAPER_LEGAL,              DMPAPER_LEGAL,              wxTRANSLATE("Legal, 8 1/2 x 14 in"), 2159, 3556);
+    WXADDPAPER(wxPAPER_A4,                 DMPAPER_A4,                 wxTRANSLATE("A4 sheet, 210 x 297 mm"), 2100, 2970);
+    WXADDPAPER(wxPAPER_CSHEET,             DMPAPER_CSHEET,             wxTRANSLATE("C sheet, 17 x 22 in"), 4318, 5588);
+    WXADDPAPER(wxPAPER_DSHEET,             DMPAPER_DSHEET,             wxTRANSLATE("D sheet, 22 x 34 in"), 5588, 8636);
+    WXADDPAPER(wxPAPER_ESHEET,             DMPAPER_ESHEET,             wxTRANSLATE("E sheet, 34 x 44 in"), 8636, 11176);
+    WXADDPAPER(wxPAPER_LETTERSMALL,        DMPAPER_LETTERSMALL,        wxTRANSLATE("Letter Small, 8 1/2 x 11 in"), 2159, 2794);
+    WXADDPAPER(wxPAPER_TABLOID,            DMPAPER_TABLOID,            wxTRANSLATE("Tabloid, 11 x 17 in"), 2794, 4318);
+    WXADDPAPER(wxPAPER_LEDGER,             DMPAPER_LEDGER,             wxTRANSLATE("Ledger, 17 x 11 in"), 4318, 2794);
+    WXADDPAPER(wxPAPER_STATEMENT,          DMPAPER_STATEMENT,          wxTRANSLATE("Statement, 5 1/2 x 8 1/2 in"), 1397, 2159);
+    WXADDPAPER(wxPAPER_EXECUTIVE,          DMPAPER_EXECUTIVE,          wxTRANSLATE("Executive, 7 1/4 x 10 1/2 in"), 1842, 2667);
+    WXADDPAPER(wxPAPER_A3,                 DMPAPER_A3,                 wxTRANSLATE("A3 sheet, 297 x 420 mm"), 2970, 4200);
+    WXADDPAPER(wxPAPER_A4SMALL,            DMPAPER_A4SMALL,            wxTRANSLATE("A4 small sheet, 210 x 297 mm"), 2100, 2970);
+    WXADDPAPER(wxPAPER_A5,                 DMPAPER_A5,                 wxTRANSLATE("A5 sheet, 148 x 210 mm"), 1480, 2100);
+    WXADDPAPER(wxPAPER_B4,                 DMPAPER_B4,                 wxTRANSLATE("B4 sheet, 250 x 354 mm"), 2500, 3540);
+    WXADDPAPER(wxPAPER_B5,                 DMPAPER_B5,                 wxTRANSLATE("B5 sheet, 182 x 257 millimeter"), 1820, 2570);
+    WXADDPAPER(wxPAPER_FOLIO,              DMPAPER_FOLIO,              wxTRANSLATE("Folio, 8 1/2 x 13 in"), 2159, 3302);
+    WXADDPAPER(wxPAPER_QUARTO,             DMPAPER_QUARTO,             wxTRANSLATE("Quarto, 215 x 275 mm"), 2150, 2750);
+    WXADDPAPER(wxPAPER_10X14,              DMPAPER_10X14,              wxTRANSLATE("10 x 14 in"), 2540, 3556);
+    WXADDPAPER(wxPAPER_11X17,              DMPAPER_11X17,              wxTRANSLATE("11 x 17 in"), 2794, 4318);
+    WXADDPAPER(wxPAPER_NOTE,               DMPAPER_NOTE,               wxTRANSLATE("Note, 8 1/2 x 11 in"), 2159, 2794);
+    WXADDPAPER(wxPAPER_ENV_9,              DMPAPER_ENV_9,              wxTRANSLATE("#9 Envelope, 3 7/8 x 8 7/8 in"), 984, 2254);
+    WXADDPAPER(wxPAPER_ENV_10,             DMPAPER_ENV_10,             wxTRANSLATE("#10 Envelope, 4 1/8 x 9 1/2 in"), 1048, 2413);
+    WXADDPAPER(wxPAPER_ENV_11,             DMPAPER_ENV_11,             wxTRANSLATE("#11 Envelope, 4 1/2 x 10 3/8 in"), 1143, 2635);
+    WXADDPAPER(wxPAPER_ENV_12,             DMPAPER_ENV_12,             wxTRANSLATE("#12 Envelope, 4 3/4 x 11 in"), 1206, 2794);
+    WXADDPAPER(wxPAPER_ENV_14,             DMPAPER_ENV_14,             wxTRANSLATE("#14 Envelope, 5 x 11 1/2 in"), 1270, 2921);
+    WXADDPAPER(wxPAPER_ENV_DL,             DMPAPER_ENV_DL,             wxTRANSLATE("DL Envelope, 110 x 220 mm"), 1100, 2200);
+    WXADDPAPER(wxPAPER_ENV_C5,             DMPAPER_ENV_C5,             wxTRANSLATE("C5 Envelope, 162 x 229 mm"), 1620, 2290);
+    WXADDPAPER(wxPAPER_ENV_C3,             DMPAPER_ENV_C3,             wxTRANSLATE("C3 Envelope, 324 x 458 mm"), 3240, 4580);
+    WXADDPAPER(wxPAPER_ENV_C4,             DMPAPER_ENV_C4,             wxTRANSLATE("C4 Envelope, 229 x 324 mm"), 2290, 3240);
+    WXADDPAPER(wxPAPER_ENV_C6,             DMPAPER_ENV_C6,             wxTRANSLATE("C6 Envelope, 114 x 162 mm"), 1140, 1620);
+    WXADDPAPER(wxPAPER_ENV_C65,            DMPAPER_ENV_C65,            wxTRANSLATE("C65 Envelope, 114 x 229 mm"), 1140, 2290);
+    WXADDPAPER(wxPAPER_ENV_B4,             DMPAPER_ENV_B4,             wxTRANSLATE("B4 Envelope, 250 x 353 mm"), 2500, 3530);
+    WXADDPAPER(wxPAPER_ENV_B5,             DMPAPER_ENV_B5,             wxTRANSLATE("B5 Envelope, 176 x 250 mm"), 1760, 2500);
+    WXADDPAPER(wxPAPER_ENV_B6,             DMPAPER_ENV_B6,             wxTRANSLATE("B6 Envelope, 176 x 125 mm"), 1760, 1250);
+    WXADDPAPER(wxPAPER_ENV_ITALY,          DMPAPER_ENV_ITALY,          wxTRANSLATE("Italy Envelope, 110 x 230 mm"), 1100, 2300);
+    WXADDPAPER(wxPAPER_ENV_MONARCH,        DMPAPER_ENV_MONARCH,        wxTRANSLATE("Monarch Envelope, 3 7/8 x 7 1/2 in"), 984, 1905);
+    WXADDPAPER(wxPAPER_ENV_PERSONAL,       DMPAPER_ENV_PERSONAL,       wxTRANSLATE("6 3/4 Envelope, 3 5/8 x 6 1/2 in"), 921, 1651);
+    WXADDPAPER(wxPAPER_FANFOLD_US,         DMPAPER_FANFOLD_US,         wxTRANSLATE("US Std Fanfold, 14 7/8 x 11 in"), 3778, 2794);
+    WXADDPAPER(wxPAPER_FANFOLD_STD_GERMAN, DMPAPER_FANFOLD_STD_GERMAN, wxTRANSLATE("German Std Fanfold, 8 1/2 x 12 in"), 2159, 3048);
+    WXADDPAPER(wxPAPER_FANFOLD_LGL_GERMAN, DMPAPER_FANFOLD_LGL_GERMAN, wxTRANSLATE("German Legal Fanfold, 8 1/2 x 13 in"), 2159, 3302);
+
+    WXADDPAPER(wxPAPER_ISO_B4,             DMPAPER_ISO_B4,             wxTRANSLATE("B4 (ISO) 250 x 353 mm"), 2500, 2530);
+    WXADDPAPER(wxPAPER_JAPANESE_POSTCARD,  DMPAPER_JAPANESE_POSTCARD,  wxTRANSLATE("Japanese Postcard 100 x 148 mm"), 1000, 1480);
+    WXADDPAPER(wxPAPER_9X11,               DMPAPER_9X11,               wxTRANSLATE("9 x 11 in"), 2286, 2794);
+    WXADDPAPER(wxPAPER_10X11,              DMPAPER_10X11,              wxTRANSLATE("10 x 11 in"), 2540, 2794);
+    WXADDPAPER(wxPAPER_15X11,              DMPAPER_15X11,              wxTRANSLATE("15 x 11 in"), 3810, 2794);
+    WXADDPAPER(wxPAPER_ENV_INVITE,         DMPAPER_ENV_INVITE,         wxTRANSLATE("Envelope Invite 220 x 220 mm"), 2200, 2200);
+    WXADDPAPER(wxPAPER_LETTER_EXTRA,       DMPAPER_LETTER_EXTRA,       wxTRANSLATE("Letter Extra 9 1/2 x 12 in"), 2413, 3048);
+    WXADDPAPER(wxPAPER_LEGAL_EXTRA,        DMPAPER_LEGAL_EXTRA,        wxTRANSLATE("Legal Extra 9 1/2 x 15 in"), 2413, 3810);
+    WXADDPAPER(wxPAPER_TABLOID_EXTRA,      DMPAPER_TABLOID_EXTRA,      wxTRANSLATE("Tabloid Extra 11.69 x 18 in"), 2969, 4572);
+    WXADDPAPER(wxPAPER_A4_EXTRA,           DMPAPER_A4_EXTRA,           wxTRANSLATE("A4 Extra 9.27 x 12.69 in"), 2355, 3223);
+    WXADDPAPER(wxPAPER_LETTER_TRANSVERSE,  DMPAPER_LETTER_TRANSVERSE,  wxTRANSLATE("Letter Transverse 8 1/2 x 11 in"), 2159, 2794);
+    WXADDPAPER(wxPAPER_A4_TRANSVERSE,      DMPAPER_A4_TRANSVERSE,      wxTRANSLATE("A4 Transverse 210 x 297 mm"), 2100, 2970);
+    WXADDPAPER(wxPAPER_LETTER_EXTRA_TRANSVERSE, DMPAPER_LETTER_EXTRA_TRANSVERSE, wxTRANSLATE("Letter Extra Transverse 9.275 x 12 in"), 2355, 3048);
+    WXADDPAPER(wxPAPER_A_PLUS,             DMPAPER_A_PLUS,             wxTRANSLATE("SuperA/SuperA/A4 227 x 356 mm"), 2270, 3560);
+    WXADDPAPER(wxPAPER_B_PLUS,             DMPAPER_B_PLUS,             wxTRANSLATE("SuperB/SuperB/A3 305 x 487 mm"), 3050, 4870);
+    WXADDPAPER(wxPAPER_LETTER_PLUS,        DMPAPER_LETTER_PLUS,        wxTRANSLATE("Letter Plus 8 1/2 x 12.69 in"), 2159, 3223);
+    WXADDPAPER(wxPAPER_A4_PLUS,            DMPAPER_A4_PLUS,            wxTRANSLATE("A4 Plus 210 x 330 mm"), 2100, 3300);
+    WXADDPAPER(wxPAPER_A5_TRANSVERSE,      DMPAPER_A5_TRANSVERSE,      wxTRANSLATE("A5 Transverse 148 x 210 mm"), 1480, 2100);
+    WXADDPAPER(wxPAPER_B5_TRANSVERSE,      DMPAPER_B5_TRANSVERSE,      wxTRANSLATE("B5 (JIS) Transverse 182 x 257 mm"), 1820, 2570);
+    WXADDPAPER(wxPAPER_A3_EXTRA,           DMPAPER_A3_EXTRA,           wxTRANSLATE("A3 Extra 322 x 445 mm"), 3220, 4450);
+    WXADDPAPER(wxPAPER_A5_EXTRA,           DMPAPER_A5_EXTRA,           wxTRANSLATE("A5 Extra 174 x 235 mm"), 1740, 2350);
+    WXADDPAPER(wxPAPER_B5_EXTRA,           DMPAPER_B5_EXTRA,           wxTRANSLATE("B5 (ISO) Extra 201 x 276 mm"), 2010, 2760);
+    WXADDPAPER(wxPAPER_A2,                 DMPAPER_A2,                 wxTRANSLATE("A2 420 x 594 mm"), 4200, 5940);
+    WXADDPAPER(wxPAPER_A3_TRANSVERSE,      DMPAPER_A3_TRANSVERSE,      wxTRANSLATE("A3 Transverse 297 x 420 mm"), 2970, 4200);
+    WXADDPAPER(wxPAPER_A3_EXTRA_TRANSVERSE,DMPAPER_A3_EXTRA_TRANSVERSE,wxTRANSLATE("A3 Extra Transverse 322 x 445 mm"), 3220, 4450);
+
+    WXADDPAPER(wxPAPER_DBL_JAPANESE_POSTCARD, 69,                       wxTRANSLATE("Japanese Double Postcard 200 x 148 mm"), 2000, 1480);
+    WXADDPAPER(wxPAPER_A6,                  70,                         wxTRANSLATE("A6 105 x 148 mm"), 1050, 1480);
+    WXADDPAPER(wxPAPER_JENV_KAKU2,          71,                         wxTRANSLATE("Japanese Envelope Kaku #2"), 2400, 3320);
+    WXADDPAPER(wxPAPER_JENV_KAKU3,          72,                         wxTRANSLATE("Japanese Envelope Kaku #3"), 2160, 2770);
+    WXADDPAPER(wxPAPER_JENV_CHOU3,          73,                         wxTRANSLATE("Japanese Envelope Chou #3"), 1200, 2350);
+    WXADDPAPER(wxPAPER_JENV_CHOU4,          74,                         wxTRANSLATE("Japanese Envelope Chou #4"), 900, 2050);
+    WXADDPAPER(wxPAPER_LETTER_ROTATED,      75,                         wxTRANSLATE("Letter Rotated 11 x 8 1/2 in"), 2794, 2159);
+    WXADDPAPER(wxPAPER_A3_ROTATED,          76,                         wxTRANSLATE("A3 Rotated 420 x 297 mm"), 4200, 2970);
+    WXADDPAPER(wxPAPER_A4_ROTATED,          77,                         wxTRANSLATE("A4 Rotated 297 x 210 mm"), 2970, 2100);
+    WXADDPAPER(wxPAPER_A5_ROTATED,          78,                         wxTRANSLATE("A5 Rotated 210 x 148 mm"), 2100, 1480);
+    WXADDPAPER(wxPAPER_B4_JIS_ROTATED,      79,                         wxTRANSLATE("B4 (JIS) Rotated 364 x 257 mm"), 3640, 2570);
+    WXADDPAPER(wxPAPER_B5_JIS_ROTATED,      80,                         wxTRANSLATE("B5 (JIS) Rotated 257 x 182 mm"), 2570, 1820);
+    WXADDPAPER(wxPAPER_JAPANESE_POSTCARD_ROTATED, 81,                   wxTRANSLATE("Japanese Postcard Rotated 148 x 100 mm"), 1480, 1000);
+    WXADDPAPER(wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED, 82,               wxTRANSLATE("Double Japanese Postcard Rotated 148 x 200 mm"), 1480, 2000);
+    WXADDPAPER(wxPAPER_A6_ROTATED,          83,                         wxTRANSLATE("A6 Rotated 148 x 105 mm"), 1480, 1050);
+    WXADDPAPER(wxPAPER_JENV_KAKU2_ROTATED,  84,                         wxTRANSLATE("Japanese Envelope Kaku #2 Rotated"), 3320, 2400);
+    WXADDPAPER(wxPAPER_JENV_KAKU3_ROTATED,  85,                         wxTRANSLATE("Japanese Envelope Kaku #3 Rotated"), 2770, 2160);
+    WXADDPAPER(wxPAPER_JENV_CHOU3_ROTATED,  86,                         wxTRANSLATE("Japanese Envelope Chou #3 Rotated"), 2350, 1200);
+    WXADDPAPER(wxPAPER_JENV_CHOU4_ROTATED,  87,                         wxTRANSLATE("Japanese Envelope Chou #4 Rotated"), 2050, 900);
+    WXADDPAPER(wxPAPER_B6_JIS,              88,                         wxTRANSLATE("B6 (JIS) 128 x 182 mm"), 1280, 1820);
+    WXADDPAPER(wxPAPER_B6_JIS_ROTATED,      89,                         wxTRANSLATE("B6 (JIS) Rotated 182 x 128 mm"), 1920, 1280);
+    WXADDPAPER(wxPAPER_12X11,               90,                         wxTRANSLATE("12 x 11 in"), 3048, 2794);
+    WXADDPAPER(wxPAPER_JENV_YOU4,           91,                         wxTRANSLATE("Japanese Envelope You #4"), 2350, 1050);
+    WXADDPAPER(wxPAPER_JENV_YOU4_ROTATED,   92,                         wxTRANSLATE("Japanese Envelope You #4 Rotated"), 1050, 2350);
+    WXADDPAPER(wxPAPER_P16K,                93,                         wxTRANSLATE("PRC 16K 146 x 215 mm"), 1460, 2150);
+    WXADDPAPER(wxPAPER_P32K,                94,                         wxTRANSLATE("PRC 32K 97 x 151 mm"), 970, 1510);
+    WXADDPAPER(wxPAPER_P32KBIG,             95,                         wxTRANSLATE("PRC 32K(Big) 97 x 151 mm"), 970, 1510);
+    WXADDPAPER(wxPAPER_PENV_1,              96,                         wxTRANSLATE("PRC Envelope #1 102 x 165 mm"), 1020, 1650);
+    WXADDPAPER(wxPAPER_PENV_2,              97,                         wxTRANSLATE("PRC Envelope #2 102 x 176 mm"), 1020, 1760);
+    WXADDPAPER(wxPAPER_PENV_3,              98,                         wxTRANSLATE("PRC Envelope #3 125 x 176 mm"), 1250, 1760);
+    WXADDPAPER(wxPAPER_PENV_4,              99,                         wxTRANSLATE("PRC Envelope #4 110 x 208 mm"), 1100, 2080);
+    WXADDPAPER(wxPAPER_PENV_5,              100,                        wxTRANSLATE("PRC Envelope #5 110 x 220 mm"), 1100, 2200);
+    WXADDPAPER(wxPAPER_PENV_6,              101,                        wxTRANSLATE("PRC Envelope #6 120 x 230 mm"), 1200, 2300);
+    WXADDPAPER(wxPAPER_PENV_7,              102,                        wxTRANSLATE("PRC Envelope #7 160 x 230 mm"), 1600, 2300);
+    WXADDPAPER(wxPAPER_PENV_8,              103,                        wxTRANSLATE("PRC Envelope #8 120 x 309 mm"), 1200, 3090);
+    WXADDPAPER(wxPAPER_PENV_9,              104,                        wxTRANSLATE("PRC Envelope #9 229 x 324 mm"), 2290, 3240);
+    WXADDPAPER(wxPAPER_PENV_10,             105,                        wxTRANSLATE("PRC Envelope #10 324 x 458 mm"), 3240, 4580);
+    WXADDPAPER(wxPAPER_P16K_ROTATED,        106,                        wxTRANSLATE("PRC 16K Rotated"), 2150, 1460);
+    WXADDPAPER(wxPAPER_P32K_ROTATED,        107,                        wxTRANSLATE("PRC 32K Rotated"), 1510, 970);
+    WXADDPAPER(wxPAPER_P32KBIG_ROTATED,     108,                        wxTRANSLATE("PRC 32K(Big) Rotated"), 1510, 970);
+    WXADDPAPER(wxPAPER_PENV_1_ROTATED,      109,                        wxTRANSLATE("PRC Envelope #1 Rotated 165 x 102 mm"), 1650, 1020);
+    WXADDPAPER(wxPAPER_PENV_2_ROTATED,      110,                        wxTRANSLATE("PRC Envelope #2 Rotated 176 x 102 mm"), 1760, 1020);
+    WXADDPAPER(wxPAPER_PENV_3_ROTATED,      111,                        wxTRANSLATE("PRC Envelope #3 Rotated 176 x 125 mm"), 1760, 1250);
+    WXADDPAPER(wxPAPER_PENV_4_ROTATED,      112,                        wxTRANSLATE("PRC Envelope #4 Rotated 208 x 110 mm"), 2080, 1100);
+    WXADDPAPER(wxPAPER_PENV_5_ROTATED,      113,                        wxTRANSLATE("PRC Envelope #5 Rotated 220 x 110 mm"), 2200, 1100);
+    WXADDPAPER(wxPAPER_PENV_6_ROTATED,      114,                        wxTRANSLATE("PRC Envelope #6 Rotated 230 x 120 mm"), 2300, 1200);
+    WXADDPAPER(wxPAPER_PENV_7_ROTATED,      115,                        wxTRANSLATE("PRC Envelope #7 Rotated 230 x 160 mm"), 2300, 1600);
+    WXADDPAPER(wxPAPER_PENV_8_ROTATED,      116,                        wxTRANSLATE("PRC Envelope #8 Rotated 309 x 120 mm"), 3090, 1200);
+    WXADDPAPER(wxPAPER_PENV_9_ROTATED,      117,                        wxTRANSLATE("PRC Envelope #9 Rotated 324 x 229 mm"), 3240, 2290);
+    WXADDPAPER(wxPAPER_PENV_10_ROTATED,     118,                        wxTRANSLATE("PRC Envelope #10 Rotated 458 x 324 mm"), 4580, 3240);
+}
+
+void wxPrintPaperDatabase::ClearDatabase()
+{
+    delete m_list;
+    WX_CLEAR_HASH_MAP(wxStringToPrintPaperTypeHashMap, *m_map);
+    delete m_map;
+}
+
+void wxPrintPaperDatabase::AddPaperType(wxPaperSize paperId, const wxString& name, int w, int h)
+{
+    wxPrintPaperType* tmp = new wxPrintPaperType(paperId, 0, name, w, h);
+    (*m_map)[name] = tmp;
+    m_list->push_back(tmp);
+}
+
+void wxPrintPaperDatabase::AddPaperType(wxPaperSize paperId, int platformId, const wxString& name, int w, int h)
+{
+    wxPrintPaperType* tmp = new wxPrintPaperType(paperId, platformId, name, w, h);
+    (*m_map)[name] = tmp;
+    m_list->push_back(tmp);
+}
+
+wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const wxString& name)
+{
+    wxStringToPrintPaperTypeHashMap::iterator it = m_map->find(name);
+    if (it != m_map->end())
+        return it->second;
+    else
+        return NULL;
+}
+
+wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(wxPaperSize id)
+{
+    typedef wxStringToPrintPaperTypeHashMap::iterator iterator;
+
+    for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it)
+    {
+        wxPrintPaperType* paperType = it->second;
+        if (paperType->GetId() == id)
+            return paperType;
+    }
+
+    return NULL;
+}
+
+wxPrintPaperType *wxPrintPaperDatabase::FindPaperTypeByPlatformId(int id)
+{
+    typedef wxStringToPrintPaperTypeHashMap::iterator iterator;
+
+    for (iterator it = m_map->begin(), en = m_map->end(); it != en; ++it)
+    {
+        wxPrintPaperType* paperType = it->second;
+        if (paperType->GetPlatformId() == id)
+            return paperType;
+    }
+
+    return NULL;
+}
+
+wxPrintPaperType *wxPrintPaperDatabase::FindPaperType(const wxSize& sz)
+{
+    // Take the item ordering into account so that the more common types
+    // are likely to be taken into account first. This fixes problems with,
+    // for example, Letter reverting to A4 in the page setup dialog because
+    // it was wrongly translated to Note.
+    size_t i;
+    for (i = 0; i < GetCount(); i++)
+    {
+        wxPrintPaperType* paperType = Item(i);
+        wxSize paperSize = paperType->GetSize() ;
+        if ( abs( paperSize.x - sz.x ) < 10 && abs( paperSize.y - sz.y ) < 10 )
+            return paperType;
+    }
+
+    return NULL;
+}
+
+// Convert name to size id
+wxPaperSize wxPrintPaperDatabase::ConvertNameToId(const wxString& name)
+{
+    wxPrintPaperType* type = FindPaperType(name);
+    if (type)
+        return type->GetId();
+    else
+        return wxPAPER_NONE;
+}
+
+// Convert size id to name
+wxString wxPrintPaperDatabase::ConvertIdToName(wxPaperSize paperId)
+{
+    wxPrintPaperType* type = FindPaperType(paperId);
+    if (type)
+        return type->GetName();
+    else
+        return wxEmptyString;
+}
+
+// Get the paper size
+wxSize wxPrintPaperDatabase::GetSize(wxPaperSize paperId)
+{
+    wxPrintPaperType* type = FindPaperType(paperId);
+    if (type)
+        return type->GetSize();
+    else
+        return wxSize(0,0);
+}
+
+// Get the paper size
+wxPaperSize wxPrintPaperDatabase::GetSize(const wxSize& size)
+{
+    wxPrintPaperType* type = FindPaperType(size);
+    if (type)
+        return type->GetId();
+    else
+        return wxPAPER_NONE;
+}
+
+// QUICK and DIRTY
+size_t wxPrintPaperDatabase::GetCount() const
+{
+    return m_list->GetCount();
+}
+
+wxPrintPaperType* wxPrintPaperDatabase::Item(size_t index) const
+{
+    return m_list->Item(index)->GetData();
+}
+
+// A module to allow initialization/cleanup of print paper
+// things without calling these functions from app.cpp.
+
+class WXDLLEXPORT wxPrintPaperModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxPrintPaperModule)
+public:
+    wxPrintPaperModule() {}
+    bool OnInit();
+    void OnExit();
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperModule, wxModule)
+
+/*
+ * Initialization/cleanup module
+ */
+
+bool wxPrintPaperModule::OnInit()
+{
+    wxThePrintPaperDatabase = new wxPrintPaperDatabase;
+    wxThePrintPaperDatabase->CreateDatabase();
+
+    return true;
+}
+
+void wxPrintPaperModule::OnExit()
+{
+    delete wxThePrintPaperDatabase;
+    wxThePrintPaperDatabase = NULL;
+}
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/Source/3rd Party/wx/src/common/persist.cpp b/Source/3rd Party/wx/src/common/persist.cpp
deleted file mode 100644
index 6a60ea23d..000000000
--- a/Source/3rd Party/wx/src/common/persist.cpp	
+++ /dev/null
@@ -1,175 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/persist.cpp
-// Purpose:     common persistence support classes
-// Author:      Vadim Zeitlin
-// Created:     2009-01-20
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_CONFIG
-
-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
-#include "wx/persist.h"
-
-namespace
-{
-
-wxPersistenceManager* gs_manager = NULL;
-
-} // anonymous namespace
-
-// ============================================================================
-// wxPersistenceManager implementation
-// ============================================================================
-
-/* static */
-void wxPersistenceManager::Set(wxPersistenceManager& manager)
-{
-    gs_manager = &manager;
-}
-
-/* static */
-wxPersistenceManager& wxPersistenceManager::Get()
-{
-    if ( !gs_manager )
-    {
-        static wxPersistenceManager s_manager;
-
-        gs_manager = &s_manager;
-    }
-
-    return *gs_manager;
-}
-
-wxPersistenceManager::~wxPersistenceManager()
-{
-}
-
-wxString
-wxPersistenceManager::GetKey(const wxPersistentObject& who,
-                             const wxString& name) const
-{
-    wxString key("Persistent_Options"); // TODO: make this configurable
-    key << wxCONFIG_PATH_SEPARATOR << who.GetKind()
-        << wxCONFIG_PATH_SEPARATOR << who.GetName()
-        << wxCONFIG_PATH_SEPARATOR << name;
-
-    return key;
-}
-
-wxPersistentObject *wxPersistenceManager::Find(void *obj) const
-{
-    const wxPersistentObjectsMap::const_iterator
-        it = m_persistentObjects.find(obj);
-    return it == m_persistentObjects.end() ? NULL : it->second;
-}
-
-wxPersistentObject *
-wxPersistenceManager::Register(void *obj, wxPersistentObject *po)
-{
-    if ( wxPersistentObject *old = Find(obj) )
-    {
-        wxFAIL_MSG( "object is already registered" );
-
-        delete po; // still avoid the memory leaks
-        return old;
-    }
-
-    m_persistentObjects[obj] = po;
-
-    return po;
-}
-
-void wxPersistenceManager::Unregister(void *obj)
-{
-    wxPersistentObjectsMap::iterator it = m_persistentObjects.find(obj);
-    wxCHECK_RET( it != m_persistentObjects.end(), "not registered" );
-
-    wxPersistentObject * const po = it->second;
-    m_persistentObjects.erase(it);
-    delete po;
-}
-
-void wxPersistenceManager::Save(void *obj)
-{
-    if ( !m_doSave )
-        return;
-
-    wxPersistentObjectsMap::iterator it = m_persistentObjects.find(obj);
-    wxCHECK_RET( it != m_persistentObjects.end(), "not registered" );
-
-    it->second->Save();
-}
-
-bool wxPersistenceManager::Restore(void *obj)
-{
-    if ( !m_doRestore )
-        return false;
-
-    wxPersistentObjectsMap::iterator it = m_persistentObjects.find(obj);
-    wxCHECK_MSG( it != m_persistentObjects.end(), false, "not registered" );
-
-    return it->second->Restore();
-}
-
-namespace
-{
-
-template <typename T>
-inline bool
-DoSaveValue(wxConfigBase *conf, const wxString& key, T value)
-{
-    return conf && conf->Write(key, value);
-}
-
-template <typename T>
-bool
-DoRestoreValue(wxConfigBase *conf, const wxString& key, T *value)
-{
-    return conf && conf->Read(key, value);
-}
-
-} // anonymous namespace
-
-#define wxPERSIST_DEFINE_SAVE_RESTORE_FOR(Type)                               \
-    bool wxPersistenceManager::SaveValue(const wxPersistentObject& who,       \
-                                         const wxString& name,                \
-                                         Type value)                          \
-    {                                                                         \
-        return DoSaveValue(GetConfig(), GetKey(who, name), value);            \
-    }                                                                         \
-                                                                              \
-    bool wxPersistenceManager::RestoreValue(const wxPersistentObject& who,    \
-                                            const wxString& name,             \
-                                            Type *value)                      \
-    {                                                                         \
-        return DoRestoreValue(GetConfig(), GetKey(who, name), value);         \
-    }
-
-wxPERSIST_DEFINE_SAVE_RESTORE_FOR(bool)
-wxPERSIST_DEFINE_SAVE_RESTORE_FOR(int)
-wxPERSIST_DEFINE_SAVE_RESTORE_FOR(long)
-wxPERSIST_DEFINE_SAVE_RESTORE_FOR(wxString)
-
-#undef wxPERSIST_DEFINE_SAVE_RESTORE_FOR
-
-#endif // wxUSE_CONFIG
diff --git a/Source/3rd Party/wx/src/common/pickerbase.cpp b/Source/3rd Party/wx/src/common/pickerbase.cpp
index d53851abf..87c99066c 100644
--- a/Source/3rd Party/wx/src/common/pickerbase.cpp	
+++ b/Source/3rd Party/wx/src/common/pickerbase.cpp	
@@ -1,180 +1,175 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/pickerbase.cpp
-// Purpose:     wxPickerBase class implementation
-// Author:      Francesco Montorsi
-// Modified by:
-// Created:     15/04/2006
-// RCS-ID:      $Id$
-// Copyright:   (c) Francesco Montorsi
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_COLOURPICKERCTRL || \
-    wxUSE_DIRPICKERCTRL    || \
-    wxUSE_FILEPICKERCTRL   || \
-    wxUSE_FONTPICKERCTRL
-
-#include "wx/pickerbase.h"
-#include "wx/tooltip.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
-#endif
-
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl)
-
-// ----------------------------------------------------------------------------
-// wxPickerBase
-// ----------------------------------------------------------------------------
-
-bool wxPickerBase::CreateBase(wxWindow *parent,
-                         wxWindowID id,
-                         const wxString &text,
-                         const wxPoint& pos,
-                         const wxSize& size,
-                         long style,
-                         const wxValidator& validator,
-                         const wxString& name)
-{
-    // remove any border style from our style as wxPickerBase's window must be
-    // invisible (user styles must be set on the textctrl or the platform-dependent picker)
-    style &= ~wxBORDER_MASK;
-
-    if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
-                           validator, name))
-        return false;
-
-    SetMinSize( size );
-
-    m_sizer = new wxBoxSizer(wxHORIZONTAL);
-
-    if (HasFlag(wxPB_USE_TEXTCTRL))
-    {
-        // NOTE: the style of this class (wxPickerBase) and the style of the
-        //       attached text control are different: GetTextCtrlStyle() extracts
-        //       the styles related to the textctrl from the styles passed here
-        m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
-                                wxDefaultPosition, wxDefaultSize,
-                                GetTextCtrlStyle(style));
-        if (!m_text)
-        {
-            wxFAIL_MSG( wxT("wxPickerBase's textctrl creation failed") );
-            return false;
-        }
-
-        // set the maximum length allowed for this textctrl.
-        // This is very important since any change to it will trigger an update in
-        // the m_picker; for very long strings, this real-time synchronization could
-        // become a CPU-blocker and thus should be avoided.
-        // 32 characters will be more than enough for all common uses.
-        m_text->SetMaxLength(32);
-
-        // set the initial contents of the textctrl
-        m_text->SetValue(text);
-
-        m_text->Connect(m_text->GetId(), wxEVT_COMMAND_TEXT_UPDATED,
-                wxCommandEventHandler(wxPickerBase::OnTextCtrlUpdate),
-                NULL, this);
-        m_text->Connect(m_text->GetId(), wxEVT_KILL_FOCUS,
-                wxFocusEventHandler(wxPickerBase::OnTextCtrlKillFocus),
-                NULL, this);
-
-        m_text->Connect(m_text->GetId(), wxEVT_DESTROY,
-                wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
-                NULL, this);
-
-        // the text control's proportion values defaults to 2
-        m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
-    }
-
-    return true;
-}
-
-void wxPickerBase::PostCreation()
-{
-    // the picker's proportion value defaults to 1 when there's no text control
-    // associated with it - in that case it defaults to 0
-    m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
-
-    // For aesthetic reasons, make sure the picker is at least as high as the
-    // associated text control and is always at least square, unless we are
-    // explicitly using wxPB_SMALL style to force it to take as little space as
-    // possible.
-    if ( !HasFlag(wxPB_SMALL) )
-    {
-        const wxSize pickerBestSize(m_picker->GetBestSize());
-        const wxSize textBestSize( HasTextCtrl() ? m_text->GetBestSize() : wxSize());
-        wxSize pickerMinSize;
-        pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y);
-        pickerMinSize.x = wxMax(pickerBestSize.x, pickerMinSize.y);
-        if ( pickerMinSize != pickerBestSize )
-            m_picker->SetMinSize(pickerMinSize);
-    }
-
-    SetSizer(m_sizer);
-
-    SetInitialSize( GetMinSize() );
-}
-
-#if wxUSE_TOOLTIPS
-
-void wxPickerBase::DoSetToolTip(wxToolTip *tip)
-{
-    // don't set the tooltip on us but rather on our two child windows
-    // as otherwise it would appear only when the cursor is placed on the
-    // small area around the child windows which belong to wxPickerBase
-    m_picker->SetToolTip(tip);
-
-    // do a copy as wxWindow will own the pointer we pass
-    if ( m_text )
-        m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
-}
-
-#endif // wxUSE_TOOLTIPS
-
-// ----------------------------------------------------------------------------
-// wxPickerBase - event handlers
-// ----------------------------------------------------------------------------
-
-void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent& event)
-{
-    event.Skip();
-
-    // don't leave the textctrl empty
-    if (m_text && m_text->GetValue().empty())
-        UpdateTextCtrlFromPicker();
-}
-
-void wxPickerBase::OnTextCtrlDelete(wxWindowDestroyEvent &)
-{
-    // the textctrl has been deleted; our pointer is invalid!
-    m_text = NULL;
-}
-
-void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &)
-{
-    // for each text-change, update the picker
-    UpdatePickerFromTextCtrl();
-}
-
-#endif // Any picker in use
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/pickerbase.cpp
+// Purpose:     wxPickerBase class implementation
+// Author:      Francesco Montorsi
+// Modified by:
+// Created:     15/04/2006
+// RCS-ID:      $Id: pickerbase.cpp 58463 2009-01-27 17:39:50Z BP $
+// Copyright:   (c) Francesco Montorsi
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_COLOURPICKERCTRL || \
+    wxUSE_DIRPICKERCTRL    || \
+    wxUSE_FILEPICKERCTRL   || \
+    wxUSE_FONTPICKERCTRL
+
+#include "wx/pickerbase.h"
+#include "wx/tooltip.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+IMPLEMENT_ABSTRACT_CLASS(wxPickerBase, wxControl)
+
+BEGIN_EVENT_TABLE(wxPickerBase, wxControl)
+    EVT_SIZE(wxPickerBase::OnSize)
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxPickerBase)
+END_EVENT_TABLE()
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPickerBase, wxControl)
+
+
+// ----------------------------------------------------------------------------
+// wxPickerBase
+// ----------------------------------------------------------------------------
+
+bool wxPickerBase::CreateBase(wxWindow *parent,
+                         wxWindowID id,
+                         const wxString &text,
+                         const wxPoint& pos,
+                         const wxSize& size,
+                         long style,
+                         const wxValidator& validator,
+                         const wxString& name)
+{
+    // remove any border style from our style as wxPickerBase's window must be
+    // invisible (user styles must be set on the textctrl or the platform-dependent picker)
+    style &= ~wxBORDER_MASK;
+    if (!wxControl::Create(parent, id, pos, size, style | wxNO_BORDER | wxTAB_TRAVERSAL,
+                           validator, name))
+        return false;
+
+    m_sizer = new wxBoxSizer(wxHORIZONTAL);
+
+    if (HasFlag(wxPB_USE_TEXTCTRL))
+    {
+        // NOTE: the style of this class (wxPickerBase) and the style of the
+        //       attached text control are different: GetTextCtrlStyle() extracts
+        //       the styles related to the textctrl from the styles passed here
+        m_text = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
+                                wxDefaultPosition, wxDefaultSize,
+                                GetTextCtrlStyle(style));
+        if (!m_text)
+        {
+            wxFAIL_MSG( wxT("wxPickerBase's textctrl creation failed") );
+            return false;
+        }
+
+        // set the maximum lenght allowed for this textctrl.
+        // This is very important since any change to it will trigger an update in
+        // the m_picker; for very long strings, this real-time synchronization could
+        // become a CPU-blocker and thus should be avoided.
+        // 32 characters will be more than enough for all common uses.
+        m_text->SetMaxLength(32);
+
+        // set the initial contents of the textctrl
+        m_text->SetValue(text);
+
+        m_text->Connect(m_text->GetId(), wxEVT_COMMAND_TEXT_UPDATED,
+                wxCommandEventHandler(wxPickerBase::OnTextCtrlUpdate),
+                NULL, this);
+        m_text->Connect(m_text->GetId(), wxEVT_KILL_FOCUS,
+                wxFocusEventHandler(wxPickerBase::OnTextCtrlKillFocus),
+                NULL, this);
+
+        m_text->Connect(m_text->GetId(), wxEVT_DESTROY,
+                wxWindowDestroyEventHandler(wxPickerBase::OnTextCtrlDelete),
+                NULL, this);
+
+        // the text control's proportion values defaults to 2
+        m_sizer->Add(m_text, 2, GetDefaultTextCtrlFlag(), 5);
+    }
+
+    return true;
+}
+
+void wxPickerBase::PostCreation()
+{
+    // the picker's proportion value defaults to 1 when there's no text control
+    // associated with it - in that case it defaults to 0
+    m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
+
+    SetSizer(m_sizer);
+    SetMinSize( m_sizer->GetMinSize() );
+}
+
+#if wxUSE_TOOLTIPS
+
+void wxPickerBase::DoSetToolTip(wxToolTip *tip)
+{
+    // don't set the tooltip on us but rather on our two child windows
+    // as otherwise it would appear only when the cursor is placed on the
+    // small area around the child windows which belong to wxPickerBase
+    m_picker->SetToolTip(tip);
+
+    // do a copy as wxWindow will own the pointer we pass
+    if ( m_text )
+        m_text->SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
+}
+
+#endif // wxUSE_TOOLTIPS
+
+// ----------------------------------------------------------------------------
+// wxPickerBase - event handlers
+// ----------------------------------------------------------------------------
+
+void wxPickerBase::OnTextCtrlKillFocus(wxFocusEvent& event)
+{
+    event.Skip();
+
+    // don't leave the textctrl empty
+    if (m_text && m_text->GetValue().empty())
+        UpdateTextCtrlFromPicker();
+}
+
+void wxPickerBase::OnTextCtrlDelete(wxWindowDestroyEvent &)
+{
+    // the textctrl has been deleted; our pointer is invalid!
+    m_text = NULL;
+}
+
+void wxPickerBase::OnTextCtrlUpdate(wxCommandEvent &)
+{
+    // for each text-change, update the picker
+    UpdatePickerFromTextCtrl();
+}
+
+void wxPickerBase::OnSize(wxSizeEvent &event)
+{
+    if (GetAutoLayout())
+        Layout();
+    event.Skip();
+}
+
+#endif // Any picker in use
diff --git a/Source/3rd Party/wx/src/common/platinfo.cpp b/Source/3rd Party/wx/src/common/platinfo.cpp
index f1ec73d43..bf33db2e6 100644
--- a/Source/3rd Party/wx/src/common/platinfo.cpp	
+++ b/Source/3rd Party/wx/src/common/platinfo.cpp	
@@ -1,350 +1,336 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/platinfo.cpp
-// Purpose:     implements wxPlatformInfo class
-// Author:      Francesco Montorsi
-// Modified by:
-// Created:     07.07.2006 (based on wxToolkitInfo)
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/platinfo.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/utils.h"
-#endif //WX_PRECOMP
-
-#include "wx/apptrait.h"
-
-// global object
-// VERY IMPORTANT: do not use the default constructor since it would
-//                 try to init the wxPlatformInfo instance using
-//                 gs_platInfo itself!
-static wxPlatformInfo gs_platInfo(wxPORT_UNKNOWN);
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-static const wxChar* const wxOperatingSystemIdNames[] =
-{
-    wxT("Apple Mac OS"),
-    wxT("Apple Mac OS X"),
-
-    wxT("Microsoft Windows 9X"),
-    wxT("Microsoft Windows NT"),
-    wxT("Microsoft Windows Micro"),
-    wxT("Microsoft Windows CE"),
-
-    wxT("Linux"),
-    wxT("FreeBSD"),
-    wxT("OpenBSD"),
-    wxT("NetBSD"),
-
-    wxT("SunOS"),
-    wxT("AIX"),
-    wxT("HPUX"),
-
-    wxT("Other Unix"),
-    wxT("Other Unix"),
-
-    wxT("DOS"),
-    wxT("OS/2"),
-};
-
-static const wxChar* const wxPortIdNames[] =
-{
-    wxT("wxBase"),
-    wxT("wxMSW"),
-    wxT("wxMotif"),
-    wxT("wxGTK"),
-    wxT("wxDFB"),
-    wxT("wxX11"),
-    wxT("wxOS2"),
-    wxT("wxMac"),
-    wxT("wxCocoa"),
-    wxT("wxWinCE"),
-};
-
-static const wxChar* const wxArchitectureNames[] =
-{
-    wxT("32 bit"),
-    wxT("64 bit")
-};
-
-static const wxChar* const wxEndiannessNames[] =
-{
-    wxT("Big endian"),
-    wxT("Little endian"),
-    wxT("PDP endian")
-};
-
-// ----------------------------------------------------------------------------
-// local functions
-// ----------------------------------------------------------------------------
-
-// returns the logarithm in base 2 of 'value'; this maps the enum values to the
-// corresponding indexes of the string arrays above
-static unsigned wxGetIndexFromEnumValue(int value)
-{
-    wxCHECK_MSG( value, (unsigned)-1, wxT("invalid enum value") );
-
-    int n = 0;
-    while ( !(value & 1) )
-    {
-        value >>= 1;
-        n++;
-    }
-
-    wxASSERT_MSG( value == 1, wxT("more than one bit set in enum value") );
-
-    return n;
-}
-
-// ----------------------------------------------------------------------------
-// wxPlatformInfo
-// ----------------------------------------------------------------------------
-
-wxPlatformInfo::wxPlatformInfo()
-{
-    // just copy platform info for currently running platform
-    *this = Get();
-}
-
-wxPlatformInfo::wxPlatformInfo(wxPortId pid, int tkMajor, int tkMinor,
-                               wxOperatingSystemId id, int osMajor, int osMinor,
-                               wxArchitecture arch,
-                               wxEndianness endian,
-                               bool usingUniversal)
-{
-    m_tkVersionMajor = tkMajor;
-    m_tkVersionMinor = tkMinor;
-    m_port = pid;
-    m_usingUniversal = usingUniversal;
-
-    m_os = id;
-    m_osVersionMajor = osMajor;
-    m_osVersionMinor = osMinor;
-
-    m_endian = endian;
-    m_arch = arch;
-}
-
-bool wxPlatformInfo::operator==(const wxPlatformInfo &t) const
-{
-    return m_tkVersionMajor == t.m_tkVersionMajor &&
-           m_tkVersionMinor == t.m_tkVersionMinor &&
-           m_osVersionMajor == t.m_osVersionMajor &&
-           m_osVersionMinor == t.m_osVersionMinor &&
-           m_os == t.m_os &&
-           m_osDesc == t.m_osDesc &&
-           m_ldi == t.m_ldi &&
-           m_desktopEnv == t.m_desktopEnv &&
-           m_port == t.m_port &&
-           m_usingUniversal == t.m_usingUniversal &&
-           m_arch == t.m_arch &&
-           m_endian == t.m_endian;
-}
-
-void wxPlatformInfo::InitForCurrentPlatform()
-{
-    // autodetect all informations
-    const wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    if ( !traits )
-    {
-        wxFAIL_MSG( wxT("failed to initialize wxPlatformInfo") );
-
-        m_port = wxPORT_UNKNOWN;
-        m_usingUniversal = false;
-        m_tkVersionMajor =
-                m_tkVersionMinor = 0;
-    }
-    else
-    {
-        m_port = traits->GetToolkitVersion(&m_tkVersionMajor, &m_tkVersionMinor);
-        m_usingUniversal = traits->IsUsingUniversalWidgets();
-        m_desktopEnv = traits->GetDesktopEnvironment();
-    }
-
-    m_os = wxGetOsVersion(&m_osVersionMajor, &m_osVersionMinor);
-    m_osDesc = wxGetOsDescription();
-    m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG;
-    m_arch = wxIsPlatform64Bit() ? wxARCH_64 : wxARCH_32;
-
-#ifdef __LINUX__
-    m_ldi = wxGetLinuxDistributionInfo();
-#endif
-    // else: leave m_ldi empty
-}
-
-/* static */
-const wxPlatformInfo& wxPlatformInfo::Get()
-{
-    static bool initialized = false;
-    if ( !initialized )
-    {
-        gs_platInfo.InitForCurrentPlatform();
-        initialized = true;
-    }
-
-    return gs_platInfo;
-}
-
-/* static */
-wxString wxPlatformInfo::GetOperatingSystemDirectory()
-{
-    return wxGetOSDirectory();
-}
-
-
-
-// ----------------------------------------------------------------------------
-// wxPlatformInfo - enum -> string conversions
-// ----------------------------------------------------------------------------
-
-wxString wxPlatformInfo::GetOperatingSystemFamilyName(wxOperatingSystemId os)
-{
-    const wxChar* string = wxT("Unknown");
-    if ( os & wxOS_MAC )
-        string = wxT("Macintosh");
-    else if ( os & wxOS_WINDOWS )
-        string = wxT("Windows");
-    else if ( os & wxOS_UNIX )
-        string = wxT("Unix");
-    else if ( os == wxOS_DOS )
-        string = wxT("DOS");
-    else if ( os == wxOS_OS2 )
-        string = wxT("OS/2");
-
-    return string;
-}
-
-wxString wxPlatformInfo::GetOperatingSystemIdName(wxOperatingSystemId os)
-{
-    const unsigned idx = wxGetIndexFromEnumValue(os);
-
-    wxCHECK_MSG( idx < WXSIZEOF(wxOperatingSystemIdNames), wxEmptyString,
-                 wxT("invalid OS id") );
-
-    return wxOperatingSystemIdNames[idx];
-}
-
-wxString wxPlatformInfo::GetPortIdName(wxPortId port, bool usingUniversal)
-{
-    const unsigned idx = wxGetIndexFromEnumValue(port);
-
-    wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,
-                 wxT("invalid port id") );
-
-    wxString ret = wxPortIdNames[idx];
-
-    if ( usingUniversal )
-        ret += wxT("/wxUniversal");
-
-    return ret;
-}
-
-wxString wxPlatformInfo::GetPortIdShortName(wxPortId port, bool usingUniversal)
-{
-    const unsigned idx = wxGetIndexFromEnumValue(port);
-
-    wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,
-                 wxT("invalid port id") );
-
-    wxString ret = wxPortIdNames[idx];
-    ret = ret.Mid(2).Lower();       // remove 'wx' prefix
-
-    if ( usingUniversal )
-        ret += wxT("univ");
-
-    return ret;
-}
-
-wxString wxPlatformInfo::GetArchName(wxArchitecture arch)
-{
-    wxCOMPILE_TIME_ASSERT( WXSIZEOF(wxArchitectureNames) == wxARCH_MAX,
-                           wxArchitectureNamesMismatch );
-
-    return wxArchitectureNames[arch];
-}
-
-wxString wxPlatformInfo::GetEndiannessName(wxEndianness end)
-{
-    wxCOMPILE_TIME_ASSERT( WXSIZEOF(wxEndiannessNames) == wxENDIAN_MAX,
-                           wxEndiannessNamesMismatch );
-
-    return wxEndiannessNames[end];
-}
-
-
-// ----------------------------------------------------------------------------
-// wxPlatformInfo - string -> enum conversions
-// ----------------------------------------------------------------------------
-
-wxOperatingSystemId wxPlatformInfo::GetOperatingSystemId(const wxString &str)
-{
-    for ( size_t i = 0; i < WXSIZEOF(wxOperatingSystemIdNames); i++ )
-    {
-        if ( wxString(wxOperatingSystemIdNames[i]).CmpNoCase(str) == 0 )
-            return (wxOperatingSystemId)(1 << i);
-    }
-
-    return wxOS_UNKNOWN;
-}
-
-wxPortId wxPlatformInfo::GetPortId(const wxString &str)
-{
-    // recognize both short and long port names
-    for ( size_t i = 0; i < WXSIZEOF(wxPortIdNames); i++ )
-    {
-        wxPortId current = (wxPortId)(1 << i);
-
-        if ( wxString(wxPortIdNames[i]).CmpNoCase(str) == 0 ||
-             GetPortIdShortName(current, true).CmpNoCase(str) == 0 ||
-             GetPortIdShortName(current, false).CmpNoCase(str) == 0 )
-            return current;
-    }
-
-    return wxPORT_UNKNOWN;
-}
-
-wxArchitecture wxPlatformInfo::GetArch(const wxString &arch)
-{
-    if ( arch.Contains(wxT("32")) )
-        return wxARCH_32;
-
-    if ( arch.Contains(wxT("64")) )
-        return wxARCH_64;
-
-    return wxARCH_INVALID;
-}
-
-wxEndianness wxPlatformInfo::GetEndianness(const wxString& end)
-{
-    const wxString endl(end.Lower());
-    if ( endl.StartsWith(wxT("little")) )
-        return wxENDIAN_LITTLE;
-
-    if ( endl.StartsWith(wxT("big")) )
-        return wxENDIAN_BIG;
-
-    return wxENDIAN_INVALID;
-}
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/platinfo.cpp
+// Purpose:     implements wxPlatformInfo class
+// Author:      Francesco Montorsi
+// Modified by:
+// Created:     07.07.2006 (based on wxToolkitInfo)
+// RCS-ID:      $Id: platinfo.cpp 44078 2006-12-30 21:46:22Z SN $
+// Copyright:   (c) 2006 Francesco Montorsi
+// License:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/platinfo.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+#endif //WX_PRECOMP
+
+#include "wx/apptrait.h"
+
+// global object
+// VERY IMPORTANT: do not use the default constructor since it would
+//                 try to init the wxPlatformInfo instance using
+//                 gs_platInfo itself!
+static wxPlatformInfo gs_platInfo(wxPORT_UNKNOWN);
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+static const wxChar* const wxOperatingSystemIdNames[] =
+{
+    _T("Apple Mac OS"),
+    _T("Apple Mac OS X"),
+
+    _T("Microsoft Windows 9X"),
+    _T("Microsoft Windows NT"),
+    _T("Microsoft Windows Micro"),
+    _T("Microsoft Windows CE"),
+
+    _T("Linux"),
+    _T("FreeBSD"),
+    _T("OpenBSD"),
+    _T("NetBSD"),
+
+    _T("SunOS"),
+    _T("AIX"),
+    _T("HPUX"),
+
+    _T("Other Unix"),
+    _T("Other Unix"),
+
+    _T("DOS"),
+    _T("OS/2")
+};
+
+static const wxChar* const wxPortIdNames[] =
+{
+    _T("wxBase"),
+    _T("wxMSW"),
+    _T("wxMotif"),
+    _T("wxGTK"),
+    _T("wxMGL"),
+    _T("wxX11"),
+    _T("wxOS2"),
+    _T("wxMac"),
+    _T("wxCocoa"),
+    _T("wxWinCE"),
+    _T("wxPalmOS"),
+    _T("wxDFB")
+};
+
+static const wxChar* const wxArchitectureNames[] =
+{
+    _T("32 bit"),
+    _T("64 bit")
+};
+
+static const wxChar* const wxEndiannessNames[] =
+{
+    _T("Big endian"),
+    _T("Little endian"),
+    _T("PDP endian")
+};
+
+// ----------------------------------------------------------------------------
+// local functions
+// ----------------------------------------------------------------------------
+
+// returns log in base 2 of the value, this maps the enum values to the
+// corresponding indices
+static unsigned wxGetIndexFromEnumValue(int value)
+{
+    wxCHECK_MSG( value, (unsigned)-1, _T("invalid enum value") );
+
+    int n = 0;
+    while ( !(value & 1) )
+    {
+        value >>= 1;
+        n++;
+    }
+
+    wxASSERT_MSG( value == 1, _T("more than one bit set in enum value") );
+
+    return n;
+}
+
+// ----------------------------------------------------------------------------
+// wxPlatformInfo
+// ----------------------------------------------------------------------------
+
+wxPlatformInfo::wxPlatformInfo()
+{
+    // just copy platform info for currently running platform
+    *this = Get();
+}
+
+wxPlatformInfo::wxPlatformInfo(wxPortId pid, int tkMajor, int tkMinor,
+                               wxOperatingSystemId id, int osMajor, int osMinor,
+                               wxArchitecture arch,
+                               wxEndianness endian,
+                               bool usingUniversal)
+{
+    m_tkVersionMajor = tkMajor;
+    m_tkVersionMinor = tkMinor;
+    m_port = pid;
+    m_usingUniversal = usingUniversal;
+
+    m_os = id;
+    m_osVersionMajor = osMajor;
+    m_osVersionMinor = osMinor;
+
+    m_endian = endian;
+    m_arch = arch;
+}
+
+bool wxPlatformInfo::operator==(const wxPlatformInfo &t) const
+{
+    return m_tkVersionMajor == t.m_tkVersionMajor &&
+           m_tkVersionMinor == t.m_tkVersionMinor &&
+           m_osVersionMajor == t.m_osVersionMajor &&
+           m_osVersionMinor == t.m_osVersionMinor &&
+           m_os == t.m_os &&
+           m_port == t.m_port &&
+           m_usingUniversal == t.m_usingUniversal &&
+           m_arch == t.m_arch &&
+           m_endian == t.m_endian;
+}
+
+void wxPlatformInfo::InitForCurrentPlatform()
+{
+    // autodetect all informations
+    const wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    if ( !traits )
+    {
+        wxFAIL_MSG( _T("failed to initialize wxPlatformInfo") );
+
+        m_port = wxPORT_UNKNOWN;
+        m_usingUniversal = false;
+        m_tkVersionMajor =
+                m_tkVersionMinor = 0;
+    }
+    else
+    {
+        m_port = traits->GetToolkitVersion(&m_tkVersionMajor, &m_tkVersionMinor);
+        m_usingUniversal = traits->IsUsingUniversalWidgets();
+    }
+
+    m_os = wxGetOsVersion(&m_osVersionMajor, &m_osVersionMinor);
+    m_endian = wxIsPlatformLittleEndian() ? wxENDIAN_LITTLE : wxENDIAN_BIG;
+    m_arch = wxIsPlatform64Bit() ? wxARCH_64 : wxARCH_32;
+}
+
+/* static */
+const wxPlatformInfo& wxPlatformInfo::Get()
+{
+    static bool initialized = false;
+    if ( !initialized )
+    {
+        gs_platInfo.InitForCurrentPlatform();
+        initialized = true;
+    }
+
+    return gs_platInfo;
+}
+
+
+
+// ----------------------------------------------------------------------------
+// wxPlatformInfo - enum -> string conversions
+// ----------------------------------------------------------------------------
+
+wxString wxPlatformInfo::GetOperatingSystemFamilyName(wxOperatingSystemId os)
+{
+    const wxChar* string = _T("Unknown");
+    if ( os & wxOS_MAC )
+        string = _T("Macintosh");
+    else if ( os & wxOS_WINDOWS )
+        string = _T("Windows");
+    else if ( os & wxOS_UNIX )
+        string = _T("Unix");
+    else if ( os == wxOS_DOS )
+        string = _T("DOS");
+    else if ( os == wxOS_OS2 )
+        string = _T("OS/2");
+
+    return string;
+}
+
+wxString wxPlatformInfo::GetOperatingSystemIdName(wxOperatingSystemId os)
+{
+    const unsigned idx = wxGetIndexFromEnumValue(os);
+
+    wxCHECK_MSG( idx < WXSIZEOF(wxOperatingSystemIdNames), wxEmptyString,
+                 _T("invalid OS id") );
+
+    return wxOperatingSystemIdNames[idx];
+}
+
+wxString wxPlatformInfo::GetPortIdName(wxPortId port, bool usingUniversal)
+{
+    const unsigned idx = wxGetIndexFromEnumValue(port);
+
+    wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,
+                 _T("invalid port id") );
+
+    wxString ret = wxPortIdNames[idx];
+
+    if ( usingUniversal )
+        ret += wxT("/wxUniversal");
+
+    return ret;
+}
+
+wxString wxPlatformInfo::GetPortIdShortName(wxPortId port, bool usingUniversal)
+{
+    const unsigned idx = wxGetIndexFromEnumValue(port);
+
+    wxCHECK_MSG( idx < WXSIZEOF(wxPortIdNames), wxEmptyString,
+                 _T("invalid port id") );
+
+    wxString ret = wxPortIdNames[idx];
+    ret = ret.Mid(2).Lower();       // remove 'wx' prefix
+
+    if ( usingUniversal )
+        ret += wxT("univ");
+
+    return ret;
+}
+
+wxString wxPlatformInfo::GetArchName(wxArchitecture arch)
+{
+    wxCOMPILE_TIME_ASSERT( WXSIZEOF(wxArchitectureNames) == wxARCH_MAX,
+                           wxArchitectureNamesMismatch );
+
+    return wxArchitectureNames[arch];
+}
+
+wxString wxPlatformInfo::GetEndiannessName(wxEndianness end)
+{
+    wxCOMPILE_TIME_ASSERT( WXSIZEOF(wxEndiannessNames) == wxENDIAN_MAX,
+                           wxEndiannessNamesMismatch );
+
+    return wxEndiannessNames[end];
+}
+
+
+// ----------------------------------------------------------------------------
+// wxPlatformInfo - string -> enum conversions
+// ----------------------------------------------------------------------------
+
+wxOperatingSystemId wxPlatformInfo::GetOperatingSystemId(const wxString &str)
+{
+    for ( size_t i = 0; i < WXSIZEOF(wxOperatingSystemIdNames); i++ )
+    {
+        if ( wxString(wxOperatingSystemIdNames[i]).CmpNoCase(str) == 0 )
+            return (wxOperatingSystemId)(1 << i);
+    }
+
+    return wxOS_UNKNOWN;
+}
+
+wxPortId wxPlatformInfo::GetPortId(const wxString &str)
+{
+    // recognize both short and long port names
+    for ( size_t i = 0; i < WXSIZEOF(wxPortIdNames); i++ )
+    {
+        wxPortId current = (wxPortId)(1 << i);
+
+        if ( wxString(wxPortIdNames[i]).CmpNoCase(str) == 0 ||
+             GetPortIdShortName(current, true).CmpNoCase(str) == 0 ||
+             GetPortIdShortName(current, false).CmpNoCase(str) == 0 )
+            return current;
+    }
+
+    return wxPORT_UNKNOWN;
+}
+
+wxArchitecture wxPlatformInfo::GetArch(const wxString &arch)
+{
+    if ( arch.Contains(wxT("32")) )
+        return wxARCH_32;
+
+    if ( arch.Contains(wxT("64")) )
+        return wxARCH_64;
+
+    return wxARCH_INVALID;
+}
+
+wxEndianness wxPlatformInfo::GetEndianness(const wxString& end)
+{
+    wxString endl(end.Lower());
+    if ( end.StartsWith(wxT("little")) )
+        return wxENDIAN_LITTLE;
+
+    if ( end.StartsWith(wxT("big")) )
+        return wxENDIAN_BIG;
+
+    return wxENDIAN_INVALID;
+}
+
diff --git a/Source/3rd Party/wx/src/common/popupcmn.cpp b/Source/3rd Party/wx/src/common/popupcmn.cpp
index d25cad0e9..7582c313e 100644
--- a/Source/3rd Party/wx/src/common/popupcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/popupcmn.cpp	
@@ -1,653 +1,623 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/popupcmn.cpp
-// Purpose:     implementation of wxPopupTransientWindow
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     06.01.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_POPUPWIN
-
-#include "wx/popupwin.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/combobox.h"        // wxComboCtrl
-    #include "wx/app.h"             // wxPostEvent
-    #include "wx/log.h"
-#endif //WX_PRECOMP
-
-#include "wx/display.h"
-#include "wx/recguard.h"
-
-#ifdef __WXUNIVERSAL__
-    #include "wx/univ/renderer.h"
-    #include "wx/scrolbar.h"
-#endif // __WXUNIVERSAL__
-
-#ifdef __WXGTK__
-    #include <gtk/gtk.h>
-    #if GTK_CHECK_VERSION(2,0,0)
-        #include "wx/gtk/private/gtk2-compat.h"
-    #else
-        #define gtk_widget_get_window(x) x->window
-    #endif
-#elif defined(__WXMSW__)
-    #include "wx/msw/private.h"
-#elif defined(__WXX11__)
-    #include "wx/x11/private.h"
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow)
-
-#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
-    IMPLEMENT_DYNAMIC_CLASS(wxPopupComboWindow, wxPopupTransientWindow)
-#endif
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// event handlers which we use to intercept events which cause the popup to
-// disappear
-class wxPopupWindowHandler : public wxEvtHandler
-{
-public:
-    wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
-
-protected:
-    // event handlers
-    void OnLeftDown(wxMouseEvent& event);
-    void OnCaptureLost(wxMouseCaptureLostEvent& event);
-
-private:
-    wxPopupTransientWindow *m_popup;
-
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxPopupWindowHandler);
-};
-
-class wxPopupFocusHandler : public wxEvtHandler
-{
-public:
-    wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
-
-protected:
-    void OnKillFocus(wxFocusEvent& event);
-    void OnChar(wxKeyEvent& event);
-
-private:
-    wxPopupTransientWindow *m_popup;
-
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxPopupFocusHandler);
-};
-
-// ----------------------------------------------------------------------------
-// event tables
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxPopupWindowHandler, wxEvtHandler)
-    EVT_LEFT_DOWN(wxPopupWindowHandler::OnLeftDown)
-    EVT_MOUSE_CAPTURE_LOST(wxPopupWindowHandler::OnCaptureLost)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
-    EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus)
-    EVT_CHAR(wxPopupFocusHandler::OnChar)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
-#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
-    EVT_IDLE(wxPopupTransientWindow::OnIdle)
-#endif
-END_EVENT_TABLE()
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxPopupWindowBase
-// ----------------------------------------------------------------------------
-
-wxPopupWindowBase::~wxPopupWindowBase()
-{
-    // this destructor is required for Darwin
-}
-
-bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags))
-{
-    return true;
-}
-
-void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
-                                 const wxSize& size)
-{
-    // determine the position and size of the screen we clamp the popup to
-    wxPoint posScreen;
-    wxSize sizeScreen;
-
-    const int displayNum = wxDisplay::GetFromPoint(ptOrigin);
-    if ( displayNum != wxNOT_FOUND )
-    {
-        const wxRect rectScreen = wxDisplay(displayNum).GetGeometry();
-        posScreen = rectScreen.GetPosition();
-        sizeScreen = rectScreen.GetSize();
-    }
-    else // outside of any display?
-    {
-        // just use the primary one then
-        posScreen = wxPoint(0, 0);
-        sizeScreen = wxGetDisplaySize();
-    }
-
-
-    const wxSize sizeSelf = GetSize();
-
-    // is there enough space to put the popup below the window (where we put it
-    // by default)?
-    wxCoord y = ptOrigin.y + size.y;
-    if ( y + sizeSelf.y > posScreen.y + sizeScreen.y )
-    {
-        // check if there is enough space above
-        if ( ptOrigin.y > sizeSelf.y )
-        {
-            // do position the control above the window
-            y -= size.y + sizeSelf.y;
-        }
-        //else: not enough space below nor above, leave below
-    }
-
-    // now check left/right too
-    wxCoord x = ptOrigin.x;
-
-    if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
-    {
-        // shift the window to the left instead of the right.
-        x -= size.x;
-        x -= sizeSelf.x;        // also shift it by window width.
-    }
-    else
-        x += size.x;
-
-
-    if ( x + sizeSelf.x > posScreen.x + sizeScreen.x )
-    {
-        // check if there is enough space to the left
-        if ( ptOrigin.x > sizeSelf.x )
-        {
-            // do position the control to the left
-            x -= size.x + sizeSelf.x;
-        }
-        //else: not enough space there neither, leave in default position
-    }
-
-    Move(x, y, wxSIZE_NO_ADJUSTMENTS);
-}
-
-// ----------------------------------------------------------------------------
-// wxPopupTransientWindow
-// ----------------------------------------------------------------------------
-
-void wxPopupTransientWindow::Init()
-{
-    m_child =
-    m_focus = NULL;
-
-    m_handlerFocus = NULL;
-    m_handlerPopup = NULL;
-}
-
-wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style)
-{
-    Init();
-
-    (void)Create(parent, style);
-}
-
-wxPopupTransientWindow::~wxPopupTransientWindow()
-{
-    if (m_handlerPopup && m_handlerPopup->GetNextHandler())
-        PopHandlers();
-
-    wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
-    wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
-
-    delete m_handlerFocus;
-    delete m_handlerPopup;
-}
-
-void wxPopupTransientWindow::PopHandlers()
-{
-    if ( m_child )
-    {
-        if ( !m_child->RemoveEventHandler(m_handlerPopup) )
-        {
-            // something is very wrong and someone else probably deleted our
-            // handler - so don't risk deleting it second time
-            m_handlerPopup = NULL;
-        }
-        if (m_child->HasCapture())
-        {
-            m_child->ReleaseMouse();
-        }
-        m_child = NULL;
-    }
-
-    if ( m_focus )
-    {
-        if ( !m_focus->RemoveEventHandler(m_handlerFocus) )
-        {
-            // see above
-            m_handlerFocus = NULL;
-        }
-    }
-    m_focus = NULL;
-}
-
-void wxPopupTransientWindow::Popup(wxWindow *winFocus)
-{
-    const wxWindowList& children = GetChildren();
-    if ( children.GetCount() )
-    {
-        m_child = children.GetFirst()->GetData();
-    }
-    else
-    {
-        m_child = this;
-    }
-
-    Show();
-
-    // There is a problem if these are still in use
-    wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
-    wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
-
-    if (!m_handlerPopup)
-        m_handlerPopup = new wxPopupWindowHandler(this);
-
-    m_child->PushEventHandler(m_handlerPopup);
-
-#if defined(__WXMSW__)
-    // Focusing on child of popup window does not work on MSW unless WS_POPUP
-    // style is set. We do not even want to try to set the focus, as it may
-    // provoke errors on some Windows versions (Vista and later).
-    if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & WS_POPUP )
-#endif
-    {
-        m_focus = winFocus ? winFocus : this;
-        m_focus->SetFocus();
-    }
-
-#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_CARBON)
-    // MSW doesn't allow to set focus to the popup window, but we need to
-    // subclass the window which has the focus, and not winFocus passed in or
-    // otherwise everything else breaks down
-    m_focus = FindFocus();
-#elif defined(__WXGTK__)
-    // GTK+ catches the activate events from the popup
-    // window, not the focus events from the child window
-    m_focus = this;
-#endif
-
-    if ( m_focus )
-    {
-        if (!m_handlerFocus)
-            m_handlerFocus = new wxPopupFocusHandler(this);
-
-        m_focus->PushEventHandler(m_handlerFocus);
-    }
-}
-
-bool wxPopupTransientWindow::Show( bool show )
-{
-#ifdef __WXGTK__
-    if (!show)
-    {
-        gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );
-
-        gtk_grab_remove( m_widget );
-    }
-#endif
-
-#ifdef __WXX11__
-    if (!show)
-    {
-        XUngrabPointer( wxGlobalDisplay(), CurrentTime );
-    }
-#endif
-
-#if defined( __WXMSW__ ) || defined( __WXMAC__)
-    if (!show && m_child && m_child->HasCapture())
-    {
-        m_child->ReleaseMouse();
-    }
-#endif
-
-    bool ret = wxPopupWindow::Show( show );
-
-#ifdef __WXGTK__
-    if (show)
-    {
-        gtk_grab_add( m_widget );
-
-        gdk_pointer_grab( gtk_widget_get_window(m_widget), true,
-                          (GdkEventMask)
-                            (GDK_BUTTON_PRESS_MASK |
-                             GDK_BUTTON_RELEASE_MASK |
-                             GDK_POINTER_MOTION_HINT_MASK |
-                             GDK_POINTER_MOTION_MASK),
-                          NULL,
-                          NULL,
-                          (guint32)GDK_CURRENT_TIME );
-    }
-#endif
-
-#ifdef __WXX11__
-    if (show)
-    {
-        Window xwindow = (Window) m_clientWindow;
-
-        /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow,
-            True,
-            ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
-            GrabModeAsync,
-            GrabModeAsync,
-            None,
-            None,
-            CurrentTime );
-    }
-#endif
-
-#if defined( __WXMSW__ ) || defined( __WXMAC__)
-    if (show && m_child)
-    {
-        // Assume that the mouse is outside the popup to begin with
-        m_child->CaptureMouse();
-    }
-#endif
-
-    return ret;
-}
-
-bool wxPopupTransientWindow::Destroy()
-{
-    // The popup window can be deleted at any moment, even while some events
-    // are still being processed for it, so delay its real destruction until
-    // the next idle time when we're sure that it's safe to really destroy it.
-
-    wxCHECK_MSG( !wxPendingDelete.Member(this), false,
-                 wxS("Shouldn't destroy the popup twice.") );
-
-    wxPendingDelete.Append(this);
-
-    return true;
-}
-
-void wxPopupTransientWindow::Dismiss()
-{
-    Hide();
-    PopHandlers();
-}
-
-void wxPopupTransientWindow::DismissAndNotify()
-{
-    Dismiss();
-    OnDismiss();
-}
-
-void wxPopupTransientWindow::OnDismiss()
-{
-    // nothing to do here - but it may be interesting for derived class
-}
-
-bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
-{
-    // no special processing here
-    return false;
-}
-
-#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON)
-void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
-{
-    event.Skip();
-
-    if (IsShown() && m_child)
-    {
-        wxPoint pos = ScreenToClient(wxGetMousePosition());
-        wxRect rect(GetSize());
-
-        if ( rect.Contains(pos) )
-        {
-            if ( m_child->HasCapture() )
-            {
-                m_child->ReleaseMouse();
-            }
-        }
-        else
-        {
-            if ( !m_child->HasCapture() )
-            {
-                m_child->CaptureMouse();
-            }
-        }
-    }
-}
-#endif // wxOSX/Carbon
-
-
-#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
-
-// ----------------------------------------------------------------------------
-// wxPopupComboWindow
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
-    EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
-END_EVENT_TABLE()
-
-wxPopupComboWindow::wxPopupComboWindow(wxComboCtrl *parent)
-                  : wxPopupTransientWindow(parent)
-{
-    m_combo = parent;
-}
-
-bool wxPopupComboWindow::Create(wxComboCtrl *parent)
-{
-    m_combo = parent;
-
-    return wxPopupWindow::Create(parent);
-}
-
-void wxPopupComboWindow::PositionNearCombo()
-{
-    // the origin point must be in screen coords
-    wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0));
-
-#if 0 //def __WXUNIVERSAL__
-    // account for the fact that (0, 0) is not the top left corner of the
-    // window: there is also the border
-    wxRect rectBorders = m_combo->GetRenderer()->
-                            GetBorderDimensions(m_combo->GetBorder());
-    ptOrigin.x -= rectBorders.x;
-    ptOrigin.y -= rectBorders.y;
-#endif // __WXUNIVERSAL__
-
-    // position below or above the combobox: the width is 0 to put it exactly
-    // below us, not to the left or to the right
-    Position(ptOrigin, wxSize(0, m_combo->GetSize().y));
-}
-
-void wxPopupComboWindow::OnDismiss()
-{
-    m_combo->OnPopupDismiss(true);
-}
-
-void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
-{
-    m_combo->ProcessWindowEvent(event);
-}
-
-#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
-
-// ----------------------------------------------------------------------------
-// wxPopupWindowHandler
-// ----------------------------------------------------------------------------
-
-void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
-{
-    // let the window have it first (we're the first event handler in the chain
-    // of handlers for this window)
-    if ( m_popup->ProcessLeftDown(event) )
-    {
-        return;
-    }
-
-    wxPoint pos = event.GetPosition();
-
-    // in non-Univ ports the system manages scrollbars for us
-#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
-    // scrollbar on which the click occurred
-    wxWindow *sbar = NULL;
-#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
-
-    wxWindow *win = (wxWindow *)event.GetEventObject();
-
-    switch ( win->HitTest(pos.x, pos.y) )
-    {
-        case wxHT_WINDOW_OUTSIDE:
-            {
-                // do the coords translation now as after DismissAndNotify()
-                // m_popup may be destroyed
-                wxMouseEvent event2(event);
-
-                m_popup->ClientToScreen(&event2.m_x, &event2.m_y);
-
-                // clicking outside a popup dismisses it
-                m_popup->DismissAndNotify();
-
-                // dismissing a tooltip shouldn't waste a click, i.e. you
-                // should be able to dismiss it and press the button with the
-                // same click, so repost this event to the window beneath us
-                wxWindow *winUnder = wxFindWindowAtPoint(event2.GetPosition());
-                if ( winUnder )
-                {
-                    // translate the event coords to the ones of the window
-                    // which is going to get the event
-                    winUnder->ScreenToClient(&event2.m_x, &event2.m_y);
-
-                    event2.SetEventObject(winUnder);
-                    wxPostEvent(winUnder->GetEventHandler(), event2);
-                }
-            }
-            break;
-
-#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
-        case wxHT_WINDOW_HORZ_SCROLLBAR:
-            sbar = win->GetScrollbar(wxHORIZONTAL);
-            break;
-
-        case wxHT_WINDOW_VERT_SCROLLBAR:
-            sbar = win->GetScrollbar(wxVERTICAL);
-            break;
-#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
-
-        default:
-            // forgot to update the switch after adding a new hit test code?
-            wxFAIL_MSG( wxT("unexpected HitTest() return value") );
-            // fall through
-
-        case wxHT_WINDOW_CORNER:
-            // don't actually know if this one is good for anything, but let it
-            // pass just in case
-
-        case wxHT_WINDOW_INSIDE:
-            // let the normal processing take place
-            event.Skip();
-            break;
-    }
-
-#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
-    if ( sbar )
-    {
-        // translate the event coordinates to the scrollbar ones
-        pos = sbar->ScreenToClient(win->ClientToScreen(pos));
-
-        // and give the event to it
-        wxMouseEvent event2 = event;
-        event2.m_x = pos.x;
-        event2.m_y = pos.y;
-
-        (void)sbar->GetEventHandler()->ProcessEvent(event2);
-    }
-#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
-}
-
-void
-wxPopupWindowHandler::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
-{
-    m_popup->DismissAndNotify();
-
-    // There is no need to skip the event here, normally we've already dealt
-    // with the focus loss.
-}
-
-// ----------------------------------------------------------------------------
-// wxPopupFocusHandler
-// ----------------------------------------------------------------------------
-
-void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
-{
-    // when we lose focus we always disappear - unless it goes to the popup (in
-    // which case we don't really lose it)
-    wxWindow *win = event.GetWindow();
-    while ( win )
-    {
-        if ( win == m_popup )
-            return;
-        win = win->GetParent();
-    }
-
-    m_popup->DismissAndNotify();
-}
-
-void wxPopupFocusHandler::OnChar(wxKeyEvent& event)
-{
-    // we can be associated with the popup itself in which case we should avoid
-    // infinite recursion
-    static int s_inside;
-    wxRecursionGuard guard(s_inside);
-    if ( guard.IsInside() )
-    {
-        event.Skip();
-        return;
-    }
-
-    // let the window have it first, it might process the keys
-    if ( !m_popup->GetEventHandler()->ProcessEvent(event) )
-    {
-        // by default, dismiss the popup
-        m_popup->DismissAndNotify();
-    }
-}
-
-#endif // wxUSE_POPUPWIN
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/popupcmn.cpp
+// Purpose:     implementation of wxPopupTransientWindow
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     06.01.01
+// RCS-ID:      $Id: popupcmn.cpp 61466 2009-07-19 16:45:08Z VZ $
+// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_POPUPWIN
+
+#include "wx/popupwin.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/combobox.h"        // wxComboCtrl
+    #include "wx/app.h"             // wxPostEvent
+    #include "wx/log.h"
+#endif //WX_PRECOMP
+
+#include "wx/display.h"
+#include "wx/recguard.h"
+
+#ifdef __WXUNIVERSAL__
+    #include "wx/univ/renderer.h"
+    #include "wx/scrolbar.h"
+#endif // __WXUNIVERSAL__
+
+#ifdef __WXGTK__
+    #include <gtk/gtk.h>
+#elif defined(__WXMSW__)
+    #include "wx/msw/private.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/private.h"
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow)
+
+#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
+    IMPLEMENT_DYNAMIC_CLASS(wxPopupComboWindow, wxPopupTransientWindow)
+#endif
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// event handlers which we use to intercept events which cause the popup to
+// disappear
+class wxPopupWindowHandler : public wxEvtHandler
+{
+public:
+    wxPopupWindowHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
+
+protected:
+    // event handlers
+    void OnLeftDown(wxMouseEvent& event);
+
+private:
+    wxPopupTransientWindow *m_popup;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxPopupWindowHandler)
+};
+
+class wxPopupFocusHandler : public wxEvtHandler
+{
+public:
+    wxPopupFocusHandler(wxPopupTransientWindow *popup) : m_popup(popup) {}
+
+protected:
+    void OnKillFocus(wxFocusEvent& event);
+    void OnKeyDown(wxKeyEvent& event);
+
+private:
+    wxPopupTransientWindow *m_popup;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxPopupFocusHandler)
+};
+
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxPopupWindowHandler, wxEvtHandler)
+    EVT_LEFT_DOWN(wxPopupWindowHandler::OnLeftDown)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
+    EVT_KILL_FOCUS(wxPopupFocusHandler::OnKillFocus)
+    EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
+#if defined( __WXMSW__ ) || defined( __WXMAC__ )
+    EVT_IDLE(wxPopupTransientWindow::OnIdle)
+#endif
+END_EVENT_TABLE()
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxPopupWindowBase
+// ----------------------------------------------------------------------------
+
+wxPopupWindowBase::~wxPopupWindowBase()
+{
+    // this destructor is required for Darwin
+}
+
+bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags))
+{
+    return true;
+}
+
+void wxPopupWindowBase::Position(const wxPoint& ptOrigin,
+                                 const wxSize& size)
+{
+    // determine the position and size of the screen we clamp the popup to
+    wxPoint posScreen;
+    wxSize sizeScreen;
+
+    const int displayNum = wxDisplay::GetFromPoint(ptOrigin);
+    if ( displayNum != wxNOT_FOUND )
+    {
+        const wxRect rectScreen = wxDisplay(displayNum).GetGeometry();
+        posScreen = rectScreen.GetPosition();
+        sizeScreen = rectScreen.GetSize();
+    }
+    else // outside of any display?
+    {
+        // just use the primary one then
+        posScreen = wxPoint(0, 0);
+        sizeScreen = wxGetDisplaySize();
+    }
+
+
+    const wxSize sizeSelf = GetSize();
+
+    // is there enough space to put the popup below the window (where we put it
+    // by default)?
+    wxCoord y = ptOrigin.y + size.y;
+    if ( y + sizeSelf.y > posScreen.y + sizeScreen.y )
+    {
+        // check if there is enough space above
+        if ( ptOrigin.y > sizeSelf.y )
+        {
+            // do position the control above the window
+            y -= size.y + sizeSelf.y;
+        }
+        //else: not enough space below nor above, leave below
+    }
+
+    // now check left/right too
+    wxCoord x = ptOrigin.x;
+
+    if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+    {
+        // shift the window to the left instead of the right.
+        x -= size.x;
+        x -= sizeSelf.x;        // also shift it by window width.
+    }
+    else
+        x += size.x;
+
+
+    if ( x + sizeSelf.x > posScreen.x + sizeScreen.x )
+    {
+        // check if there is enough space to the left
+        if ( ptOrigin.x > sizeSelf.x )
+        {
+            // do position the control to the left
+            x -= size.x + sizeSelf.x;
+        }
+        //else: not enough space there neither, leave in default position
+    }
+
+    Move(x, y, wxSIZE_NO_ADJUSTMENTS);
+}
+
+// ----------------------------------------------------------------------------
+// wxPopupTransientWindow
+// ----------------------------------------------------------------------------
+
+void wxPopupTransientWindow::Init()
+{
+    m_child =
+    m_focus = (wxWindow *)NULL;
+
+    m_handlerFocus = NULL;
+    m_handlerPopup = NULL;
+}
+
+wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style)
+{
+    Init();
+
+    (void)Create(parent, style);
+}
+
+wxPopupTransientWindow::~wxPopupTransientWindow()
+{
+    if (m_handlerPopup && m_handlerPopup->GetNextHandler())
+        PopHandlers();
+
+    wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
+    wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
+
+    delete m_handlerFocus;
+    delete m_handlerPopup;
+}
+
+void wxPopupTransientWindow::PopHandlers()
+{
+    if ( m_child )
+    {
+        if ( !m_child->RemoveEventHandler(m_handlerPopup) )
+        {
+            // something is very wrong and someone else probably deleted our
+            // handler - so don't risk deleting it second time
+            m_handlerPopup = NULL;
+        }
+        if (m_child->HasCapture())
+        {
+            m_child->ReleaseMouse();
+        }
+        m_child = NULL;
+    }
+
+    if ( m_focus )
+    {
+        if ( !m_focus->RemoveEventHandler(m_handlerFocus) )
+        {
+            // see above
+            m_handlerFocus = NULL;
+        }
+    }
+    m_focus = NULL;
+}
+
+void wxPopupTransientWindow::Popup(wxWindow *winFocus)
+{
+    const wxWindowList& children = GetChildren();
+    if ( children.GetCount() )
+    {
+        m_child = children.GetFirst()->GetData();
+    }
+    else
+    {
+        m_child = this;
+    }
+
+    Show();
+
+    // There is is a problem if these are still in use
+    wxASSERT(!m_handlerFocus || !m_handlerFocus->GetNextHandler());
+    wxASSERT(!m_handlerPopup || !m_handlerPopup->GetNextHandler());
+
+    if (!m_handlerPopup)
+        m_handlerPopup = new wxPopupWindowHandler(this);
+
+    m_child->PushEventHandler(m_handlerPopup);
+
+#if defined(__WXMSW__)
+    // Focusing on child of popup window does not work on MSW unless WS_POPUP
+    // style is set. We do not even want to try to set the focus, as it may
+    // provoke errors on some Windows versions (Vista and later).
+    if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & WS_POPUP )
+#endif
+    {
+        m_focus = winFocus ? winFocus : this;
+        m_focus->SetFocus();
+    }
+
+#if defined( __WXMSW__ ) || defined( __WXMAC__ )
+    // MSW doesn't allow to set focus to the popup window, but we need to
+    // subclass the window which has the focus, and not winFocus passed in or
+    // otherwise everything else breaks down
+    m_focus = FindFocus();
+#elif defined(__WXGTK__)
+    // GTK+ catches the activate events from the popup
+    // window, not the focus events from the child window
+    m_focus = this;
+#endif
+
+    if ( m_focus )
+    {
+        if (!m_handlerFocus)
+            m_handlerFocus = new wxPopupFocusHandler(this);
+
+        m_focus->PushEventHandler(m_handlerFocus);
+    }
+}
+
+bool wxPopupTransientWindow::Show( bool show )
+{
+#ifdef __WXGTK__
+    if (!show)
+    {
+        gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );
+
+        gtk_grab_remove( m_widget );
+    }
+#endif
+
+#ifdef __WXX11__
+    if (!show)
+    {
+        XUngrabPointer( wxGlobalDisplay(), CurrentTime );
+    }
+#endif
+
+#if defined( __WXMSW__ ) || defined( __WMAC__ )
+    if (!show && m_child && m_child->HasCapture())
+    {
+        m_child->ReleaseMouse();
+    }
+#endif
+
+    bool ret = wxPopupWindow::Show( show );
+
+#ifdef __WXGTK__
+    if (show)
+    {
+        gtk_grab_add( m_widget );
+
+        gdk_pointer_grab( m_widget->window, TRUE,
+                          (GdkEventMask)
+                            (GDK_BUTTON_PRESS_MASK |
+                             GDK_BUTTON_RELEASE_MASK |
+                             GDK_POINTER_MOTION_HINT_MASK |
+                             GDK_POINTER_MOTION_MASK),
+                          (GdkWindow *) NULL,
+                          (GdkCursor *) NULL,
+                          (guint32)GDK_CURRENT_TIME );
+    }
+#endif
+
+#ifdef __WXX11__
+    if (show)
+    {
+        Window xwindow = (Window) m_clientWindow;
+
+        /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow,
+            True,
+            ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
+            GrabModeAsync,
+            GrabModeAsync,
+            None,
+            None,
+            CurrentTime );
+    }
+#endif
+
+#if defined( __WXMSW__ ) || defined( __WMAC__ )
+    if (show && m_child)
+    {
+        // Assume that the mouse is outside the popup to begin with
+        m_child->CaptureMouse();
+    }
+#endif
+
+    return ret;
+}
+
+void wxPopupTransientWindow::Dismiss()
+{
+    Hide();
+    PopHandlers();
+}
+
+void wxPopupTransientWindow::DismissAndNotify()
+{
+    Dismiss();
+    OnDismiss();
+}
+
+void wxPopupTransientWindow::OnDismiss()
+{
+    // nothing to do here - but it may be interesting for derived class
+}
+
+bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
+{
+    // no special processing here
+    return false;
+}
+
+#if defined( __WXMSW__ ) || defined( __WXMAC__ )
+void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
+{
+    event.Skip();
+
+    if (IsShown() && m_child)
+    {
+        wxPoint pos = ScreenToClient(wxGetMousePosition());
+        wxRect rect(GetSize());
+
+        if ( rect.Contains(pos) )
+        {
+            if ( m_child->HasCapture() )
+            {
+                m_child->ReleaseMouse();
+            }
+        }
+        else
+        {
+            if ( !m_child->HasCapture() )
+            {
+                m_child->CaptureMouse();
+            }
+        }
+    }
+}
+#endif // __WXMSW__
+
+
+#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
+
+// ----------------------------------------------------------------------------
+// wxPopupComboWindow
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxPopupComboWindow, wxPopupTransientWindow)
+    EVT_KEY_DOWN(wxPopupComboWindow::OnKeyDown)
+END_EVENT_TABLE()
+
+wxPopupComboWindow::wxPopupComboWindow(wxComboCtrl *parent)
+                  : wxPopupTransientWindow(parent)
+{
+    m_combo = parent;
+}
+
+bool wxPopupComboWindow::Create(wxComboCtrl *parent)
+{
+    m_combo = parent;
+
+    return wxPopupWindow::Create(parent);
+}
+
+void wxPopupComboWindow::PositionNearCombo()
+{
+    // the origin point must be in screen coords
+    wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0));
+
+#if 0 //def __WXUNIVERSAL__
+    // account for the fact that (0, 0) is not the top left corner of the
+    // window: there is also the border
+    wxRect rectBorders = m_combo->GetRenderer()->
+                            GetBorderDimensions(m_combo->GetBorder());
+    ptOrigin.x -= rectBorders.x;
+    ptOrigin.y -= rectBorders.y;
+#endif // __WXUNIVERSAL__
+
+    // position below or above the combobox: the width is 0 to put it exactly
+    // below us, not to the left or to the right
+    Position(ptOrigin, wxSize(0, m_combo->GetSize().y));
+}
+
+void wxPopupComboWindow::OnDismiss()
+{
+    m_combo->OnPopupDismiss();
+}
+
+void wxPopupComboWindow::OnKeyDown(wxKeyEvent& event)
+{
+    m_combo->ProcessEvent(event);
+}
+
+#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
+
+// ----------------------------------------------------------------------------
+// wxPopupWindowHandler
+// ----------------------------------------------------------------------------
+
+void wxPopupWindowHandler::OnLeftDown(wxMouseEvent& event)
+{
+    // let the window have it first (we're the first event handler in the chain
+    // of handlers for this window)
+    if ( m_popup->ProcessLeftDown(event) )
+    {
+        return;
+    }
+
+    wxPoint pos = event.GetPosition();
+
+    // in non-Univ ports the system manages scrollbars for us
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
+    // scrollbar on which the click occurred
+    wxWindow *sbar = NULL;
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
+
+    wxWindow *win = (wxWindow *)event.GetEventObject();
+
+    switch ( win->HitTest(pos.x, pos.y) )
+    {
+        case wxHT_WINDOW_OUTSIDE:
+            {
+                // do the coords translation now as after DismissAndNotify()
+                // m_popup may be destroyed
+                wxMouseEvent event2(event);
+
+                m_popup->ClientToScreen(&event2.m_x, &event2.m_y);
+
+                // clicking outside a popup dismisses it
+                m_popup->DismissAndNotify();
+
+                // dismissing a tooltip shouldn't waste a click, i.e. you
+                // should be able to dismiss it and press the button with the
+                // same click, so repost this event to the window beneath us
+                wxWindow *winUnder = wxFindWindowAtPoint(event2.GetPosition());
+                if ( winUnder )
+                {
+                    // translate the event coords to the ones of the window
+                    // which is going to get the event
+                    winUnder->ScreenToClient(&event2.m_x, &event2.m_y);
+
+                    event2.SetEventObject(winUnder);
+                    wxPostEvent(winUnder, event2);
+                }
+            }
+            break;
+
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
+        case wxHT_WINDOW_HORZ_SCROLLBAR:
+            sbar = win->GetScrollbar(wxHORIZONTAL);
+            break;
+
+        case wxHT_WINDOW_VERT_SCROLLBAR:
+            sbar = win->GetScrollbar(wxVERTICAL);
+            break;
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
+
+        default:
+            // forgot to update the switch after adding a new hit test code?
+            wxFAIL_MSG( _T("unexpected HitTest() return value") );
+            // fall through
+
+        case wxHT_WINDOW_CORNER:
+            // don't actually know if this one is good for anything, but let it
+            // pass just in case
+
+        case wxHT_WINDOW_INSIDE:
+            // let the normal processing take place
+            event.Skip();
+            break;
+    }
+
+#if defined(__WXUNIVERSAL__) && wxUSE_SCROLLBAR
+    if ( sbar )
+    {
+        // translate the event coordinates to the scrollbar ones
+        pos = sbar->ScreenToClient(win->ClientToScreen(pos));
+
+        // and give the event to it
+        wxMouseEvent event2 = event;
+        event2.m_x = pos.x;
+        event2.m_y = pos.y;
+
+        (void)sbar->GetEventHandler()->ProcessEvent(event2);
+    }
+#endif // __WXUNIVERSAL__ && wxUSE_SCROLLBAR
+}
+
+// ----------------------------------------------------------------------------
+// wxPopupFocusHandler
+// ----------------------------------------------------------------------------
+
+void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
+{
+    // when we lose focus we always disappear - unless it goes to the popup (in
+    // which case we don't really lose it)
+    wxWindow *win = event.GetWindow();
+    while ( win )
+    {
+        if ( win == m_popup )
+            return;
+        win = win->GetParent();
+    }
+
+    m_popup->DismissAndNotify();
+}
+
+void wxPopupFocusHandler::OnKeyDown(wxKeyEvent& event)
+{
+    // we can be associated with the popup itself in which case we should avoid
+    // infinite recursion
+    static int s_inside;
+    wxRecursionGuard guard(s_inside);
+    if ( guard.IsInside() )
+    {
+        event.Skip();
+        return;
+    }
+
+    // let the window have it first, it might process the keys
+    if ( !m_popup->GetEventHandler()->ProcessEvent(event) )
+    {
+        // by default, dismiss the popup
+        m_popup->DismissAndNotify();
+    }
+}
+
+#endif // wxUSE_POPUPWIN
diff --git a/Source/3rd Party/wx/src/common/powercmn.cpp b/Source/3rd Party/wx/src/common/powercmn.cpp
index e25d4e6be..cf2086ff8 100644
--- a/Source/3rd Party/wx/src/common/powercmn.cpp	
+++ b/Source/3rd Party/wx/src/common/powercmn.cpp	
@@ -1,59 +1,59 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/powercmn.cpp
-// Purpose:     power event types and stubs for power functions
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     2006-05-27
-// RCS-ID:      $Id$
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-
-#include "wx/power.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-#ifdef wxHAS_POWER_EVENTS
-    wxDEFINE_EVENT( wxEVT_POWER_SUSPENDING, wxPowerEvent );
-    wxDEFINE_EVENT( wxEVT_POWER_SUSPENDED, wxPowerEvent );
-    wxDEFINE_EVENT( wxEVT_POWER_SUSPEND_CANCEL, wxPowerEvent );
-    wxDEFINE_EVENT( wxEVT_POWER_RESUME, wxPowerEvent );
-
-    IMPLEMENT_DYNAMIC_CLASS(wxPowerEvent, wxEvent)
-#endif
-
-// provide stubs for the systems not implementing these functions
-#if !defined(__WINDOWS__)
-
-wxPowerType wxGetPowerType()
-{
-    return wxPOWER_UNKNOWN;
-}
-
-wxBatteryState wxGetBatteryState()
-{
-    return wxBATTERY_UNKNOWN_STATE;
-}
-
-#endif // systems without power management functions
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/powercmn.cpp
+// Purpose:     power event types and stubs for power functions
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     2006-05-27
+// RCS-ID:      $Id: powercmn.cpp 48811 2007-09-19 23:11:28Z RD $
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP
+
+#include "wx/power.h"
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+#ifdef wxHAS_POWER_EVENTS
+    DEFINE_EVENT_TYPE(wxEVT_POWER_SUSPENDING)
+    DEFINE_EVENT_TYPE(wxEVT_POWER_SUSPENDED)
+    DEFINE_EVENT_TYPE(wxEVT_POWER_SUSPEND_CANCEL)
+    DEFINE_EVENT_TYPE(wxEVT_POWER_RESUME)
+
+    IMPLEMENT_ABSTRACT_CLASS(wxPowerEvent, wxEvent)
+#endif
+    
+// provide stubs for the systems not implementing these functions
+#if !defined(__WXPALMOS__) && !defined(__WXMSW__)
+
+wxPowerType wxGetPowerType()
+{
+    return wxPOWER_UNKNOWN;
+}
+
+wxBatteryState wxGetBatteryState()
+{
+    return wxBATTERY_UNKNOWN_STATE;
+}
+
+#endif // systems without power management functions
+
diff --git a/Source/3rd Party/wx/src/common/prntbase.cpp b/Source/3rd Party/wx/src/common/prntbase.cpp
index 69c6f8ea5..b45b319b8 100644
--- a/Source/3rd Party/wx/src/common/prntbase.cpp	
+++ b/Source/3rd Party/wx/src/common/prntbase.cpp	
@@ -1,2231 +1,1869 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/prntbase.cpp
-// Purpose:     Printing framework base class implementation
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-#include "wx/dcprint.h"
-
-#ifndef WX_PRECOMP
-    #if defined(__WXMSW__)
-        #include "wx/msw/wrapcdlg.h"
-    #endif // MSW
-    #include "wx/utils.h"
-    #include "wx/dc.h"
-    #include "wx/app.h"
-    #include "wx/math.h"
-    #include "wx/msgdlg.h"
-    #include "wx/layout.h"
-    #include "wx/choice.h"
-    #include "wx/button.h"
-    #include "wx/bmpbuttn.h"
-    #include "wx/settings.h"
-    #include "wx/dcmemory.h"
-    #include "wx/dcclient.h"
-    #include "wx/stattext.h"
-    #include "wx/intl.h"
-    #include "wx/textdlg.h"
-    #include "wx/sizer.h"
-    #include "wx/module.h"
-#endif // !WX_PRECOMP
-
-#include "wx/prntbase.h"
-#include "wx/printdlg.h"
-#include "wx/print.h"
-#include "wx/dcprint.h"
-#include "wx/artprov.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-#include "wx/msw/printdlg.h"
-#include "wx/msw/dcprint.h"
-#elif defined(__WXMAC__)
-#include "wx/osx/printdlg.h"
-#include "wx/osx/private/print.h"
-#include "wx/osx/dcprint.h"
-#elif defined(__WXPM__)
-#include "wx/os2/dcprint.h"
-#include "wx/generic/prntdlgg.h"
-#else
-#include "wx/generic/prntdlgg.h"
-#include "wx/dcps.h"
-#endif
-
-#ifdef __WXMSW__
-    #ifndef __WIN32__
-        #include <print.h>
-    #endif
-#endif // __WXMSW__
-
-//----------------------------------------------------------------------------
-// wxPrintFactory
-//----------------------------------------------------------------------------
-
-wxPrintFactory *wxPrintFactory::m_factory = NULL;
-
-void wxPrintFactory::SetPrintFactory( wxPrintFactory *factory )
-{
-    if (wxPrintFactory::m_factory)
-        delete wxPrintFactory::m_factory;
-
-    wxPrintFactory::m_factory = factory;
-}
-
-wxPrintFactory *wxPrintFactory::GetFactory()
-{
-    if (!wxPrintFactory::m_factory)
-        wxPrintFactory::m_factory = new wxNativePrintFactory;
-
-    return wxPrintFactory::m_factory;
-}
-
-//----------------------------------------------------------------------------
-// wxNativePrintFactory
-//----------------------------------------------------------------------------
-
-wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return new wxWindowsPrinter( data );
-#elif defined(__WXMAC__)
-    return new wxMacPrinter( data );
-#elif defined(__WXPM__)
-    return new wxOS2Printer( data );
-#else
-    return new wxPostScriptPrinter( data );
-#endif
-}
-
-wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
-    wxPrintout *printout, wxPrintDialogData *data )
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return new wxWindowsPrintPreview( preview, printout, data );
-#elif defined(__WXMAC__)
-    return new wxMacPrintPreview( preview, printout, data );
-#elif defined(__WXPM__)
-    return new wxOS2PrintPreview( preview, printout, data );
-#else
-    return new wxPostScriptPrintPreview( preview, printout, data );
-#endif
-}
-
-wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
-    wxPrintout *printout, wxPrintData *data )
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return new wxWindowsPrintPreview( preview, printout, data );
-#elif defined(__WXMAC__)
-    return new wxMacPrintPreview( preview, printout, data );
-#elif defined(__WXPM__)
-    return new wxOS2PrintPreview( preview, printout, data );
-#else
-    return new wxPostScriptPrintPreview( preview, printout, data );
-#endif
-}
-
-wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
-                                                  wxPrintDialogData *data )
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return new wxWindowsPrintDialog( parent, data );
-#elif defined(__WXMAC__)
-    return new wxMacPrintDialog( parent, data );
-#else
-    return new wxGenericPrintDialog( parent, data );
-#endif
-}
-
-wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
-                                                  wxPrintData *data )
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return new wxWindowsPrintDialog( parent, data );
-#elif defined(__WXMAC__)
-    return new wxMacPrintDialog( parent, data );
-#else
-    return new wxGenericPrintDialog( parent, data );
-#endif
-}
-
-wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *parent,
-                                                  wxPageSetupDialogData *data )
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return new wxWindowsPageSetupDialog( parent, data );
-#elif defined(__WXMAC__)
-    return new wxMacPageSetupDialog( parent, data );
-#else
-    return new wxGenericPageSetupDialog( parent, data );
-#endif
-}
-
-bool wxNativePrintFactory::HasPrintSetupDialog()
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return false;
-#elif defined(__WXMAC__)
-    return false;
-#else
-    // Only here do we need to provide the print setup
-    // dialog ourselves, the other platforms either have
-    // none, don't make it accessible or let you configure
-    // the printer from the wxPrintDialog anyway.
-    return true;
-#endif
-
-}
-
-wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent,
-                                                        wxPrintData *data )
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    wxUnusedVar(parent);
-    wxUnusedVar(data);
-    return NULL;
-#elif defined(__WXMAC__)
-    wxUnusedVar(parent);
-    wxUnusedVar(data);
-    return NULL;
-#else
-    // Only here do we need to provide the print setup
-    // dialog ourselves, the other platforms either have
-    // none, don't make it accessible or let you configure
-    // the printer from the wxPrintDialog anyway.
-    return new wxGenericPrintSetupDialog( parent, data );
-#endif
-}
-
-wxDCImpl* wxNativePrintFactory::CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data )
-{
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || ( defined(__WXUNIVERSAL__) && !defined(__WXMAC__) )
-    return new wxPostScriptDCImpl( owner, data );
-#else
-    return new wxPrinterDCImpl( owner, data );
-#endif
-}
-
-bool wxNativePrintFactory::HasOwnPrintToFile()
-{
-    // Only relevant for PostScript and here the
-    // setup dialog provides no "print to file"
-    // option. In the GNOME setup dialog, the
-    // setup dialog has its own print to file.
-    return false;
-}
-
-bool wxNativePrintFactory::HasPrinterLine()
-{
-    // Only relevant for PostScript for now
-    return true;
-}
-
-wxString wxNativePrintFactory::CreatePrinterLine()
-{
-    // Only relevant for PostScript for now
-
-    // We should query "lpstat -d" here
-    return _("Generic PostScript");
-}
-
-bool wxNativePrintFactory::HasStatusLine()
-{
-    // Only relevant for PostScript for now
-    return true;
-}
-
-wxString wxNativePrintFactory::CreateStatusLine()
-{
-    // Only relevant for PostScript for now
-
-    // We should query "lpstat -r" or "lpstat -p" here
-    return _("Ready");
-}
-
-wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData()
-{
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-    return new wxWindowsPrintNativeData;
-#elif defined(__WXMAC__)
-    return wxOSXCreatePrintData();
-#else
-    return new wxPostScriptPrintNativeData;
-#endif
-}
-
-//----------------------------------------------------------------------------
-// wxPrintNativeDataBase
-//----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject)
-
-wxPrintNativeDataBase::wxPrintNativeDataBase()
-{
-    m_ref = 1;
-}
-
-//----------------------------------------------------------------------------
-// wxPrintFactoryModule
-//----------------------------------------------------------------------------
-
-class wxPrintFactoryModule: public wxModule
-{
-public:
-    wxPrintFactoryModule() {}
-    bool OnInit() { return true; }
-    void OnExit() { wxPrintFactory::SetPrintFactory( NULL ); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPrintFactoryModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxPrintFactoryModule, wxModule)
-
-//----------------------------------------------------------------------------
-// wxPrinterBase
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxPrinterBase, wxObject)
-
-wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
-{
-    m_currentPrintout = NULL;
-    sm_abortWindow = NULL;
-    sm_abortIt = false;
-    if (data)
-        m_printDialogData = (*data);
-    sm_lastError = wxPRINTER_NO_ERROR;
-}
-
-wxWindow *wxPrinterBase::sm_abortWindow = NULL;
-bool wxPrinterBase::sm_abortIt = false;
-wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR;
-
-wxPrinterBase::~wxPrinterBase()
-{
-}
-
-wxWindow *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout * printout)
-{
-    wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing ") , wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
-
-    wxBoxSizer *button_sizer = new wxBoxSizer( wxVERTICAL );
-    button_sizer->Add( new wxStaticText(dialog, wxID_ANY, _("Please wait while printing\n") + printout->GetTitle() ), 0, wxALL, 10 );
-    button_sizer->Add( new wxButton( dialog, wxID_CANCEL, wxT("Cancel") ), 0, wxALL | wxALIGN_CENTER, 10 );
-
-    dialog->SetAutoLayout( true );
-    dialog->SetSizer( button_sizer );
-
-    button_sizer->Fit(dialog);
-    button_sizer->SetSizeHints (dialog) ;
-
-    return dialog;
-}
-
-void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), const wxString& message)
-{
-    wxMessageBox(message, _("Printing Error"), wxOK, parent);
-}
-
-wxPrintDialogData& wxPrinterBase::GetPrintDialogData() const
-{
-    return (wxPrintDialogData&) m_printDialogData;
-}
-
-//----------------------------------------------------------------------------
-// wxPrinter
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxPrinter, wxPrinterBase)
-
-wxPrinter::wxPrinter(wxPrintDialogData *data)
-{
-    m_pimpl = wxPrintFactory::GetFactory()->CreatePrinter( data );
-}
-
-wxPrinter::~wxPrinter()
-{
-    delete m_pimpl;
-}
-
-wxWindow *wxPrinter::CreateAbortWindow(wxWindow *parent, wxPrintout *printout)
-{
-    return m_pimpl->CreateAbortWindow( parent, printout );
-}
-
-void wxPrinter::ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message)
-{
-    m_pimpl->ReportError( parent, printout, message );
-}
-
-bool wxPrinter::Setup(wxWindow *parent)
-{
-    return m_pimpl->Setup( parent );
-}
-
-bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
-{
-    if ( !prompt && m_printDialogData.GetToPage() == 0 )
-    {
-        // If the dialog is not shown, set the pages range to print everything
-        // by default (as otherwise we wouldn't print anything at all which is
-        // certainly not a reasonable default behaviour).
-        int minPage, maxPage, selFrom, selTo;
-        printout->GetPageInfo(&minPage, &maxPage, &selFrom, &selTo);
-
-        wxPrintDialogData& pdd = m_pimpl->GetPrintDialogData();
-        pdd.SetFromPage(minPage);
-        pdd.SetToPage(maxPage);
-    }
-
-    return m_pimpl->Print( parent, printout, prompt );
-}
-
-wxDC* wxPrinter::PrintDialog(wxWindow *parent)
-{
-    return m_pimpl->PrintDialog( parent );
-}
-
-wxPrintDialogData& wxPrinter::GetPrintDialogData() const
-{
-    return m_pimpl->GetPrintDialogData();
-}
-
-// ---------------------------------------------------------------------------
-// wxPrintDialogBase: the dialog for printing.
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog)
-
-wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
-                                     wxWindowID id,
-                                     const wxString &title,
-                                     const wxPoint &pos,
-                                     const wxSize &size,
-                                     long style)
-    : wxDialog( parent, id, title.empty() ? wxString(_("Print")) : title,
-                pos, size, style )
-{
-}
-
-// ---------------------------------------------------------------------------
-// wxPrintDialog: the dialog for printing
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxPrintDialog, wxObject)
-
-wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintDialogData* data)
-{
-    m_pimpl = wxPrintFactory::GetFactory()->CreatePrintDialog( parent, data );
-}
-
-wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintData* data)
-{
-    m_pimpl = wxPrintFactory::GetFactory()->CreatePrintDialog( parent, data );
-}
-
-wxPrintDialog::~wxPrintDialog()
-{
-    delete m_pimpl;
-}
-
-int wxPrintDialog::ShowModal()
-{
-    return m_pimpl->ShowModal();
-}
-
-wxPrintDialogData& wxPrintDialog::GetPrintDialogData()
-{
-    return m_pimpl->GetPrintDialogData();
-}
-
-wxPrintData& wxPrintDialog::GetPrintData()
-{
-    return m_pimpl->GetPrintData();
-}
-
-wxDC *wxPrintDialog::GetPrintDC()
-{
-    return m_pimpl->GetPrintDC();
-}
-
-// ---------------------------------------------------------------------------
-// wxPageSetupDialogBase: the page setup dialog
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog)
-
-wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent,
-                                     wxWindowID id,
-                                     const wxString &title,
-                                     const wxPoint &pos,
-                                     const wxSize &size,
-                                     long style)
-    : wxDialog( parent, id, title.empty() ? wxString(_("Page setup")) : title,
-                pos, size, style )
-{
-}
-
-// ---------------------------------------------------------------------------
-// wxPageSetupDialog: the page setup dialog
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxPageSetupDialog, wxObject)
-
-wxPageSetupDialog::wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data )
-{
-    m_pimpl = wxPrintFactory::GetFactory()->CreatePageSetupDialog( parent, data );
-}
-
-wxPageSetupDialog::~wxPageSetupDialog()
-{
-    delete m_pimpl;
-}
-
-int wxPageSetupDialog::ShowModal()
-{
-    return m_pimpl->ShowModal();
-}
-
-wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupDialogData()
-{
-    return m_pimpl->GetPageSetupDialogData();
-}
-
-// old name
-wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupData()
-{
-    return m_pimpl->GetPageSetupDialogData();
-}
-
-//----------------------------------------------------------------------------
-// wxPrintAbortDialog
-//----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
-    EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
-END_EVENT_TABLE()
-
-void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-    wxPrinterBase::sm_abortIt = true;
-    wxPrinterBase::sm_abortWindow->Show(false);
-    wxPrinterBase::sm_abortWindow->Close(true);
-    wxPrinterBase::sm_abortWindow->Destroy();
-    wxPrinterBase::sm_abortWindow = NULL;
-}
-
-//----------------------------------------------------------------------------
-// wxPrintout
-//----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
-
-wxPrintout::wxPrintout(const wxString& title)
-{
-    m_printoutTitle = title ;
-    m_printoutDC = NULL;
-    m_pageWidthMM = 0;
-    m_pageHeightMM = 0;
-    m_pageWidthPixels = 0;
-    m_pageHeightPixels = 0;
-    m_PPIScreenX = 0;
-    m_PPIScreenY = 0;
-    m_PPIPrinterX = 0;
-    m_PPIPrinterY = 0;
-    m_preview = NULL;
-}
-
-wxPrintout::~wxPrintout()
-{
-}
-
-bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage))
-{
-    return GetDC()->StartDoc(_("Printing ") + m_printoutTitle);
-}
-
-void wxPrintout::OnEndDocument()
-{
-    GetDC()->EndDoc();
-}
-
-void wxPrintout::OnBeginPrinting()
-{
-}
-
-void wxPrintout::OnEndPrinting()
-{
-}
-
-bool wxPrintout::HasPage(int page)
-{
-    return (page == 1);
-}
-
-void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toPage)
-{
-    *minPage = 1;
-    *maxPage = 32000;
-    *fromPage = 1;
-    *toPage = 1;
-}
-
-void wxPrintout::FitThisSizeToPaper(const wxSize& imageSize)
-{
-    // Set the DC scale and origin so that the given image size fits within the
-    // entire page and the origin is at the top left corner of the page. Note
-    // that with most printers, portions of the page will be non-printable. Use
-    // this if you're managing your own page margins.
-    if (!m_printoutDC) return;
-    wxRect paperRect = GetPaperRectPixels();
-    wxCoord pw, ph;
-    GetPageSizePixels(&pw, &ph);
-    wxCoord w, h;
-    m_printoutDC->GetSize(&w, &h);
-    float scaleX = ((float(paperRect.width) * w) / (float(pw) * imageSize.x));
-    float scaleY = ((float(paperRect.height) * h) / (float(ph) * imageSize.y));
-    float actualScale = wxMin(scaleX, scaleY);
-    m_printoutDC->SetUserScale(actualScale, actualScale);
-    m_printoutDC->SetDeviceOrigin(0, 0);
-    wxRect logicalPaperRect = GetLogicalPaperRect();
-    SetLogicalOrigin(logicalPaperRect.x, logicalPaperRect.y);
-}
-
-void wxPrintout::FitThisSizeToPage(const wxSize& imageSize)
-{
-    // Set the DC scale and origin so that the given image size fits within the
-    // printable area of the page and the origin is at the top left corner of
-    // the printable area.
-    if (!m_printoutDC) return;
-    int w, h;
-    m_printoutDC->GetSize(&w, &h);
-    float scaleX = float(w) / imageSize.x;
-    float scaleY = float(h) / imageSize.y;
-    float actualScale = wxMin(scaleX, scaleY);
-    m_printoutDC->SetUserScale(actualScale, actualScale);
-    m_printoutDC->SetDeviceOrigin(0, 0);
-}
-
-void wxPrintout::FitThisSizeToPageMargins(const wxSize& imageSize, const wxPageSetupDialogData& pageSetupData)
-{
-    // Set the DC scale and origin so that the given image size fits within the
-    // page margins defined in the given wxPageSetupDialogData object and the
-    // origin is at the top left corner of the page margins.
-    if (!m_printoutDC) return;
-    wxRect paperRect = GetPaperRectPixels();
-    wxCoord pw, ph;
-    GetPageSizePixels(&pw, &ph);
-    wxPoint topLeft = pageSetupData.GetMarginTopLeft();
-    wxPoint bottomRight = pageSetupData.GetMarginBottomRight();
-    wxCoord mw, mh;
-    GetPageSizeMM(&mw, &mh);
-    float mmToDeviceX = float(pw) / mw;
-    float mmToDeviceY = float(ph) / mh;
-    wxRect pageMarginsRect(paperRect.x + wxRound(mmToDeviceX * topLeft.x),
-        paperRect.y + wxRound(mmToDeviceY * topLeft.y),
-        paperRect.width - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)),
-        paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y)));
-    wxCoord w, h;
-    m_printoutDC->GetSize(&w, &h);
-    float scaleX = (float(pageMarginsRect.width) * w) / (float(pw) * imageSize.x);
-    float scaleY = (float(pageMarginsRect.height) * h) / (float(ph) * imageSize.y);
-    float actualScale = wxMin(scaleX, scaleY);
-    m_printoutDC->SetUserScale(actualScale, actualScale);
-    m_printoutDC->SetDeviceOrigin(0, 0);
-    wxRect logicalPageMarginsRect = GetLogicalPageMarginsRect(pageSetupData);
-    SetLogicalOrigin(logicalPageMarginsRect.x, logicalPageMarginsRect.y);
-}
-
-void wxPrintout::MapScreenSizeToPaper()
-{
-    // Set the DC scale so that an image on the screen is the same size on the
-    // paper and the origin is at the top left of the paper. Note that with most
-    // printers, portions of the page will be cut off. Use this if you're
-    // managing your own page margins.
-    if (!m_printoutDC) return;
-    MapScreenSizeToPage();
-    wxRect logicalPaperRect = GetLogicalPaperRect();
-    SetLogicalOrigin(logicalPaperRect.x, logicalPaperRect.y);
-}
-
-void wxPrintout::MapScreenSizeToPage()
-{
-    // Set the DC scale and origin so that an image on the screen is the same
-    // size on the paper and the origin is at the top left of the printable area.
-    if (!m_printoutDC) return;
-    int ppiScreenX, ppiScreenY;
-    GetPPIScreen(&ppiScreenX, &ppiScreenY);
-    int ppiPrinterX, ppiPrinterY;
-    GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
-    int w, h;
-    m_printoutDC->GetSize(&w, &h);
-    int pageSizePixelsX, pageSizePixelsY;
-    GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY);
-    float userScaleX = (float(ppiPrinterX) * w) / (float(ppiScreenX) * pageSizePixelsX);
-    float userScaleY = (float(ppiPrinterY) * h) / (float(ppiScreenY) * pageSizePixelsY);
-    m_printoutDC->SetUserScale(userScaleX, userScaleY);
-    m_printoutDC->SetDeviceOrigin(0, 0);
-}
-
-void wxPrintout::MapScreenSizeToPageMargins(const wxPageSetupDialogData& pageSetupData)
-{
-    // Set the DC scale so that an image on the screen is the same size on the
-    // paper and the origin is at the top left of the page margins defined by
-    // the given wxPageSetupDialogData object.
-    if (!m_printoutDC) return;
-    MapScreenSizeToPage();
-    wxRect logicalPageMarginsRect = GetLogicalPageMarginsRect(pageSetupData);
-    SetLogicalOrigin(logicalPageMarginsRect.x, logicalPageMarginsRect.y);
-}
-
-void wxPrintout::MapScreenSizeToDevice()
-{
-    // Set the DC scale so that a screen pixel is the same size as a device
-    // pixel and the origin is at the top left of the printable area.
-    if (!m_printoutDC) return;
-    int w, h;
-    m_printoutDC->GetSize(&w, &h);
-    int pageSizePixelsX, pageSizePixelsY;
-    GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY);
-    float userScaleX = float(w) / pageSizePixelsX;
-    float userScaleY = float(h) / pageSizePixelsY;
-    m_printoutDC->SetUserScale(userScaleX, userScaleY);
-    m_printoutDC->SetDeviceOrigin(0, 0);
-}
-
-wxRect wxPrintout::GetLogicalPaperRect() const
-{
-    // Return the rectangle in logical units that corresponds to the paper
-    // rectangle.
-    wxRect paperRect = GetPaperRectPixels();
-    wxCoord pw, ph;
-    GetPageSizePixels(&pw, &ph);
-    wxCoord w, h;
-    m_printoutDC->GetSize(&w, &h);
-    if (w == pw && h == ph) {
-        // this DC matches the printed page, so no scaling
-        return wxRect(m_printoutDC->DeviceToLogicalX(paperRect.x),
-            m_printoutDC->DeviceToLogicalY(paperRect.y),
-            m_printoutDC->DeviceToLogicalXRel(paperRect.width),
-            m_printoutDC->DeviceToLogicalYRel(paperRect.height));
-    }
-    // This DC doesn't match the printed page, so we have to scale.
-    float scaleX = float(w) / pw;
-    float scaleY = float(h) / ph;
-    return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(paperRect.x * scaleX)),
-        m_printoutDC->DeviceToLogicalY(wxRound(paperRect.y * scaleY)),
-        m_printoutDC->DeviceToLogicalXRel(wxRound(paperRect.width * scaleX)),
-        m_printoutDC->DeviceToLogicalYRel(wxRound(paperRect.height * scaleY)));
-}
-
-wxRect wxPrintout::GetLogicalPageRect() const
-{
-    // Return the rectangle in logical units that corresponds to the printable
-    // area.
-    int w, h;
-    m_printoutDC->GetSize(&w, &h);
-    return wxRect(m_printoutDC->DeviceToLogicalX(0),
-        m_printoutDC->DeviceToLogicalY(0),
-        m_printoutDC->DeviceToLogicalXRel(w),
-        m_printoutDC->DeviceToLogicalYRel(h));
-}
-
-wxRect wxPrintout::GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSetupData) const
-{
-    // Return the rectangle in logical units that corresponds to the region
-    // within the page margins as specified by the given wxPageSetupDialogData
-    // object.
-
-    // We get the paper size in device units and the margins in mm,
-    // so we need to calculate the conversion with this trick
-    wxCoord pw, ph;
-    GetPageSizePixels(&pw, &ph);
-    wxCoord mw, mh;
-    GetPageSizeMM(&mw, &mh);
-    float mmToDeviceX = float(pw) / mw;
-    float mmToDeviceY = float(ph) / mh;
-
-    // paper size in device units
-    wxRect paperRect = GetPaperRectPixels();
-
-    // margins in mm
-    wxPoint topLeft = pageSetupData.GetMarginTopLeft();
-    wxPoint bottomRight = pageSetupData.GetMarginBottomRight();
-
-    // calculate margins in device units
-    wxRect pageMarginsRect(
-        paperRect.x      + wxRound(mmToDeviceX * topLeft.x),
-        paperRect.y      + wxRound(mmToDeviceY * topLeft.y),
-        paperRect.width  - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)),
-        paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y)));
-
-    wxCoord w, h;
-    m_printoutDC->GetSize(&w, &h);
-    if (w == pw && h == ph)
-    {
-        // this DC matches the printed page, so no scaling
-        return wxRect(
-            m_printoutDC->DeviceToLogicalX(pageMarginsRect.x),
-            m_printoutDC->DeviceToLogicalY(pageMarginsRect.y),
-            m_printoutDC->DeviceToLogicalXRel(pageMarginsRect.width),
-            m_printoutDC->DeviceToLogicalYRel(pageMarginsRect.height));
-    }
-
-    // This DC doesn't match the printed page, so we have to scale.
-    float scaleX = float(w) / pw;
-    float scaleY = float(h) / ph;
-    return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(pageMarginsRect.x * scaleX)),
-        m_printoutDC->DeviceToLogicalY(wxRound(pageMarginsRect.y * scaleY)),
-        m_printoutDC->DeviceToLogicalXRel(wxRound(pageMarginsRect.width * scaleX)),
-        m_printoutDC->DeviceToLogicalYRel(wxRound(pageMarginsRect.height * scaleY)));
-}
-
-void wxPrintout::SetLogicalOrigin(wxCoord x, wxCoord y)
-{
-    // Set the device origin by specifying a point in logical coordinates.
-    m_printoutDC->SetDeviceOrigin(
-        m_printoutDC->LogicalToDeviceX(x),
-        m_printoutDC->LogicalToDeviceY(y) );
-}
-
-void wxPrintout::OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff)
-{
-    // Offset the device origin by a specified distance in device coordinates.
-    wxPoint dev_org = m_printoutDC->GetDeviceOrigin();
-    m_printoutDC->SetDeviceOrigin(
-        dev_org.x + m_printoutDC->LogicalToDeviceXRel(xoff),
-        dev_org.y + m_printoutDC->LogicalToDeviceYRel(yoff) );
-}
-
-
-//----------------------------------------------------------------------------
-// wxPreviewCanvas
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
-
-BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
-    EVT_PAINT(wxPreviewCanvas::OnPaint)
-    EVT_CHAR(wxPreviewCanvas::OnChar)
-    EVT_IDLE(wxPreviewCanvas::OnIdle)
-    EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
-#if wxUSE_MOUSEWHEEL
-    EVT_MOUSEWHEEL(wxPreviewCanvas::OnMouseWheel)
-#endif
-END_EVENT_TABLE()
-
-// VZ: the current code doesn't refresh properly without
-//     wxFULL_REPAINT_ON_RESIZE, this must be fixed as otherwise we have
-//     really horrible flicker when resizing the preview frame, but without
-//     this style it simply doesn't work correctly at all...
-wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
-                                 const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-wxScrolledWindow(parent, wxID_ANY, pos, size, style | wxFULL_REPAINT_ON_RESIZE, name)
-{
-    m_printPreview = preview;
-#ifdef __WXMAC__
-    // The app workspace colour is always white, but we should have
-    // a contrast with the page.
-    wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
-#elif defined(__WXGTK__)
-    wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE;
-#else
-    wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
-#endif
-    SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
-
-    SetScrollbars(10, 10, 100, 100);
-}
-
-wxPreviewCanvas::~wxPreviewCanvas()
-{
-}
-
-void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-    PrepareDC( dc );
-
-/*
-#ifdef __WXGTK__
-    if (!GetUpdateRegion().IsEmpty())
-        dc.SetClippingRegion( GetUpdateRegion() );
-#endif
-*/
-
-    if (m_printPreview)
-    {
-        m_printPreview->PaintPage(this, dc);
-    }
-}
-
-void wxPreviewCanvas::OnIdle(wxIdleEvent& event)
-{
-    event.Skip();
-
-    // prevent UpdatePageRendering() from being called recursively:
-    static bool s_inIdle = false;
-    if ( s_inIdle )
-        return;
-    s_inIdle = true;
-
-    if ( m_printPreview )
-    {
-        if ( m_printPreview->UpdatePageRendering() )
-            Refresh();
-    }
-
-    s_inIdle = false;
-}
-
-// Responds to colour changes, and passes event on to children.
-void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-#ifdef __WXMAC__
-    // The app workspace colour is always white, but we should have
-    // a contrast with the page.
-    wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
-#elif defined(__WXGTK__)
-    wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE;
-#else
-    wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
-#endif
-    SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
-    Refresh();
-
-    // Propagate the event to the non-top-level children
-    wxWindow::OnSysColourChanged(event);
-}
-
-void wxPreviewCanvas::OnChar(wxKeyEvent &event)
-{
-    wxPreviewControlBar* controlBar = ((wxPreviewFrame*) GetParent())->GetControlBar();
-    switch (event.GetKeyCode())
-    {
-        case WXK_RETURN:
-            controlBar->OnPrint();
-            return;
-        case (int)'+':
-        case WXK_NUMPAD_ADD:
-        case WXK_ADD:
-            controlBar->DoZoomIn();
-            return;
-        case (int)'-':
-        case WXK_NUMPAD_SUBTRACT:
-        case WXK_SUBTRACT:
-            controlBar->DoZoomOut();
-            return;
-    }
-
-    if (!event.ControlDown())
-    {
-        event.Skip();
-        return;
-    }
-
-    switch(event.GetKeyCode())
-    {
-        case WXK_PAGEDOWN:
-            controlBar->OnNext(); break;
-        case WXK_PAGEUP:
-            controlBar->OnPrevious(); break;
-        case WXK_HOME:
-            controlBar->OnFirst(); break;
-        case WXK_END:
-            controlBar->OnLast(); break;
-        default:
-            event.Skip();
-    }
-}
-
-#if wxUSE_MOUSEWHEEL
-
-void wxPreviewCanvas::OnMouseWheel(wxMouseEvent& event)
-{
-    wxPreviewControlBar *
-        controlBar = wxStaticCast(GetParent(), wxPreviewFrame)->GetControlBar();
-
-    if ( controlBar )
-    {
-        if ( event.ControlDown() && event.GetWheelRotation() != 0 )
-        {
-            int currentZoom = controlBar->GetZoomControl();
-
-            int delta;
-            if ( currentZoom < 100 )
-                delta = 5;
-            else if ( currentZoom <= 120 )
-                delta = 10;
-            else
-                delta = 50;
-
-            if ( event.GetWheelRotation() > 0 )
-                delta = -delta;
-
-            int newZoom = currentZoom + delta;
-            if ( newZoom < 10 )
-                newZoom = 10;
-            if ( newZoom > 200 )
-                newZoom = 200;
-            if ( newZoom != currentZoom )
-            {
-                controlBar->SetZoomControl(newZoom);
-                m_printPreview->SetZoom(newZoom);
-                Refresh();
-            }
-            return;
-        }
-    }
-
-    event.Skip();
-}
-
-#endif // wxUSE_MOUSEWHEEL
-
-namespace
-{
-
-// This is by the controls in the print preview as the maximal (and hence
-// longest) page number we may have to display.
-enum { MAX_PAGE_NUMBER = 99999 };
-
-} // anonymous namespace
-
-// ----------------------------------------------------------------------------
-// wxPrintPageMaxCtrl
-// ----------------------------------------------------------------------------
-
-// A simple static control showing the maximal number of pages.
-class wxPrintPageMaxCtrl : public wxStaticText
-{
-public:
-    wxPrintPageMaxCtrl(wxWindow *parent)
-        : wxStaticText(
-                        parent,
-                        wxID_ANY,
-                        wxString(),
-                        wxDefaultPosition,
-                        wxSize
-                        (
-                         parent->GetTextExtent(MaxAsString(MAX_PAGE_NUMBER)).x,
-                         wxDefaultCoord
-                        ),
-                        wxST_NO_AUTORESIZE | wxALIGN_CENTRE
-                      )
-    {
-    }
-
-    // Set the maximal page to display once we really know what it is.
-    void SetMaxPage(int maxPage)
-    {
-        SetLabel(MaxAsString(maxPage));
-    }
-
-private:
-    static wxString MaxAsString(int maxPage)
-    {
-        return wxString::Format("/ %d", maxPage);
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxPrintPageMaxCtrl);
-};
-
-// ----------------------------------------------------------------------------
-// wxPrintPageTextCtrl
-// ----------------------------------------------------------------------------
-
-// This text control contains the page number in the specified interval.
-//
-// Invalid pages are not accepted and the control contents is validated when it
-// loses focus. Conversely, if the user changes the page to another valid one
-// or presses Enter, OnGotoPage() method of the preview object will be called.
-class wxPrintPageTextCtrl : public wxTextCtrl
-{
-public:
-    wxPrintPageTextCtrl(wxPreviewControlBar *preview)
-        : wxTextCtrl(preview,
-                     wxID_PREVIEW_GOTO,
-                     wxString(),
-                     wxDefaultPosition,
-                     // We use hardcoded maximal page number for the width
-                     // instead of fitting it to the values we can show because
-                     // the control looks uncomfortably narrow if the real page
-                     // number is just one or two digits.
-                     wxSize
-                     (
-                      preview->GetTextExtent(PageAsString(MAX_PAGE_NUMBER)).x,
-                      wxDefaultCoord
-                     ),
-                     wxTE_PROCESS_ENTER
-#if wxUSE_VALIDATORS
-                     , wxTextValidator(wxFILTER_DIGITS)
-#endif // wxUSE_VALIDATORS
-                    ),
-          m_preview(preview)
-    {
-        m_minPage =
-        m_maxPage =
-        m_page = 1;
-
-        Connect(wxEVT_KILL_FOCUS,
-                wxFocusEventHandler(wxPrintPageTextCtrl::OnKillFocus));
-        Connect(wxEVT_COMMAND_TEXT_ENTER,
-                wxCommandEventHandler(wxPrintPageTextCtrl::OnTextEnter));
-    }
-
-    // Update the pages range, must be called after OnPreparePrinting() as
-    // these values are not known before.
-    void SetPageInfo(int minPage, int maxPage)
-    {
-        m_minPage = minPage;
-        m_maxPage = maxPage;
-
-        // Show the first page by default.
-        SetPageNumber(minPage);
-    }
-
-    // Helpers to conveniently set or get the current page number. Return value
-    // is 0 if the current controls contents is invalid.
-    void SetPageNumber(int page)
-    {
-        wxASSERT( IsValidPage(page) );
-
-        SetValue(PageAsString(page));
-    }
-
-    int GetPageNumber() const
-    {
-        long value;
-        if ( !GetValue().ToLong(&value) || !IsValidPage(value) )
-            return 0;
-
-        // Cast is safe because the value is less than (int) m_maxPage.
-        return static_cast<int>(value);
-    }
-
-private:
-    static wxString PageAsString(int page)
-    {
-        return wxString::Format("%d", page);
-    }
-
-    bool IsValidPage(int page) const
-    {
-        return page >= m_minPage && page <= m_maxPage;
-    }
-
-    bool DoChangePage()
-    {
-        const int page = GetPageNumber();
-
-        if ( !page )
-            return false;
-
-        if ( page != m_page )
-        {
-            // We have a valid page, remember it.
-            m_page = page;
-
-            // And notify the owner about the change.
-            m_preview->OnGotoPage();
-        }
-        //else: Nothing really changed.
-
-        return true;
-    }
-
-    void OnKillFocus(wxFocusEvent& event)
-    {
-        if ( !DoChangePage() )
-        {
-            // The current contents is invalid so reset it back to the last
-            // known good page index.
-            SetPageNumber(m_page);
-        }
-
-        event.Skip();
-    }
-
-    void OnTextEnter(wxCommandEvent& WXUNUSED(event))
-    {
-        DoChangePage();
-    }
-
-
-    wxPreviewControlBar * const m_preview;
-
-    int m_minPage,
-        m_maxPage;
-
-    // This is the last valid page value that we had, we revert to it if an
-    // invalid page is entered.
-    int m_page;
-
-    wxDECLARE_NO_COPY_CLASS(wxPrintPageTextCtrl);
-};
-
-//----------------------------------------------------------------------------
-// wxPreviewControlBar
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxPreviewControlBar, wxWindow)
-
-BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
-    EVT_BUTTON(wxID_PREVIEW_CLOSE,    wxPreviewControlBar::OnWindowClose)
-    EVT_BUTTON(wxID_PREVIEW_PRINT,    wxPreviewControlBar::OnPrintButton)
-    EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPreviousButton)
-    EVT_BUTTON(wxID_PREVIEW_NEXT,     wxPreviewControlBar::OnNextButton)
-    EVT_BUTTON(wxID_PREVIEW_FIRST,    wxPreviewControlBar::OnFirstButton)
-    EVT_BUTTON(wxID_PREVIEW_LAST,     wxPreviewControlBar::OnLastButton)
-    EVT_BUTTON(wxID_PREVIEW_ZOOM_IN,  wxPreviewControlBar::OnZoomInButton)
-    EVT_BUTTON(wxID_PREVIEW_ZOOM_OUT, wxPreviewControlBar::OnZoomOutButton)
-
-    EVT_UPDATE_UI(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnUpdatePreviousButton)
-    EVT_UPDATE_UI(wxID_PREVIEW_NEXT,     wxPreviewControlBar::OnUpdateNextButton)
-    EVT_UPDATE_UI(wxID_PREVIEW_FIRST,    wxPreviewControlBar::OnUpdateFirstButton)
-    EVT_UPDATE_UI(wxID_PREVIEW_LAST,     wxPreviewControlBar::OnUpdateLastButton)
-    EVT_UPDATE_UI(wxID_PREVIEW_ZOOM_IN,  wxPreviewControlBar::OnUpdateZoomInButton)
-    EVT_UPDATE_UI(wxID_PREVIEW_ZOOM_OUT, wxPreviewControlBar::OnUpdateZoomOutButton)
-
-    EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoomChoice)
-    EVT_PAINT(wxPreviewControlBar::OnPaint)
-
-END_EVENT_TABLE()
-
-wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
-                                         wxWindow *parent, const wxPoint& pos, const wxSize& size,
-                                         long style, const wxString& name):
-wxPanel(parent, wxID_ANY, pos, size, style, name)
-{
-    m_printPreview = preview;
-    m_closeButton = NULL;
-    m_zoomControl = NULL;
-    m_currentPageText = NULL;
-    m_maxPageText = NULL;
-    m_buttonFlags = buttons;
-}
-
-wxPreviewControlBar::~wxPreviewControlBar()
-{
-}
-
-void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-
-    int w, h;
-    GetSize(&w, &h);
-    dc.SetPen(*wxBLACK_PEN);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.DrawLine( 0, h-1, w, h-1 );
-}
-
-void wxPreviewControlBar::OnWindowClose(wxCommandEvent& WXUNUSED(event))
-{
-    wxPreviewFrame *frame = (wxPreviewFrame *)GetParent();
-    frame->Close(true);
-}
-
-void wxPreviewControlBar::OnPrint(void)
-{
-    wxPrintPreviewBase *preview = GetPrintPreview();
-    preview->Print(true);
-}
-
-void wxPreviewControlBar::OnNext()
-{
-    if ( IsNextEnabled() )
-        DoGotoPage(GetPrintPreview()->GetCurrentPage() + 1);
-}
-
-void wxPreviewControlBar::OnPrevious()
-{
-    if ( IsPreviousEnabled() )
-        DoGotoPage(GetPrintPreview()->GetCurrentPage() - 1);
-}
-
-void wxPreviewControlBar::OnFirst()
-{
-    if ( IsFirstEnabled() )
-        DoGotoPage(GetPrintPreview()->GetMinPage());
-}
-
-void wxPreviewControlBar::OnLast()
-{
-    if ( IsLastEnabled() )
-        DoGotoPage(GetPrintPreview()->GetMaxPage());
-}
-
-bool wxPreviewControlBar::IsNextEnabled() const
-{
-    wxPrintPreviewBase *preview = GetPrintPreview();
-    if ( !preview )
-        return false;
-
-    const int currentPage = preview->GetCurrentPage();
-    return currentPage < preview->GetMaxPage() &&
-                preview->GetPrintout()->HasPage(currentPage + 1);
-}
-
-bool wxPreviewControlBar::IsPreviousEnabled() const
-{
-    wxPrintPreviewBase *preview = GetPrintPreview();
-    if ( !preview )
-        return false;
-
-    const int currentPage = preview->GetCurrentPage();
-    return currentPage > preview->GetMinPage() &&
-                preview->GetPrintout()->HasPage(currentPage - 1);
-}
-
-bool wxPreviewControlBar::IsFirstEnabled() const
-{
-    wxPrintPreviewBase *preview = GetPrintPreview();
-    if (!preview)
-        return false;
-
-    return preview->GetPrintout()->HasPage(preview->GetMinPage());
-}
-
-bool wxPreviewControlBar::IsLastEnabled() const
-{
-    wxPrintPreviewBase *preview = GetPrintPreview();
-    if (!preview)
-        return false;
-
-    return preview->GetPrintout()->HasPage(preview->GetMaxPage());
-}
-
-void wxPreviewControlBar::DoGotoPage(int page)
-{
-    wxPrintPreviewBase *preview = GetPrintPreview();
-    wxCHECK_RET( preview, "Shouldn't be called if there is no preview." );
-
-    preview->SetCurrentPage(page);
-
-    if ( m_currentPageText )
-        m_currentPageText->SetPageNumber(page);
-}
-
-void wxPreviewControlBar::OnGotoPage()
-{
-    wxPrintPreviewBase *preview = GetPrintPreview();
-    if (preview)
-    {
-        if (preview->GetMinPage() > 0)
-        {
-            long currentPage = m_currentPageText->GetPageNumber();
-            if ( currentPage )
-            {
-                if (preview->GetPrintout()->HasPage(currentPage))
-                {
-                    preview->SetCurrentPage(currentPage);
-                }
-            }
-        }
-    }
-}
-
-void wxPreviewControlBar::DoZoom()
-{
-    int zoom = GetZoomControl();
-    if (GetPrintPreview())
-        GetPrintPreview()->SetZoom(zoom);
-}
-
-bool wxPreviewControlBar::IsZoomInEnabled() const
-{
-    if ( !m_zoomControl )
-        return false;
-
-    const unsigned sel = m_zoomControl->GetSelection();
-    return sel < m_zoomControl->GetCount() - 1;
-}
-
-bool wxPreviewControlBar::IsZoomOutEnabled() const
-{
-    return m_zoomControl && m_zoomControl->GetSelection() > 0;
-}
-
-void wxPreviewControlBar::DoZoomIn()
-{
-    if (IsZoomInEnabled())
-    {
-        m_zoomControl->SetSelection(m_zoomControl->GetSelection() + 1);
-        DoZoom();
-    }
-}
-
-void wxPreviewControlBar::DoZoomOut()
-{
-    if (IsZoomOutEnabled())
-    {
-        m_zoomControl->SetSelection(m_zoomControl->GetSelection() - 1);
-        DoZoom();
-    }
-}
-
-namespace
-{
-
-// Helper class used by wxPreviewControlBar::CreateButtons() to add buttons
-// sequentially to it in the simplest way possible.
-class SizerWithButtons
-{
-public:
-    // Constructor creates the sizer that will hold the buttons and stores the
-    // parent that will be used for their creation.
-    SizerWithButtons(wxWindow *parent)
-        : m_sizer(new wxBoxSizer(wxHORIZONTAL)),
-          m_parent(parent)
-    {
-        m_hasContents =
-        m_needsSeparator = false;
-    }
-
-    // Destructor associates the sizer with the parent window.
-    ~SizerWithButtons()
-    {
-        m_parent->SetSizer(m_sizer);
-        m_sizer->Fit(m_parent);
-    }
-
-
-    // Add an arbitrary window to the sizer.
-    void Add(wxWindow *win)
-    {
-        if ( m_needsSeparator )
-        {
-            m_needsSeparator = false;
-
-            m_sizer->AddSpacer(2*wxSizerFlags::GetDefaultBorder());
-        }
-
-        m_hasContents = true;
-
-        m_sizer->Add(win,
-                     wxSizerFlags().Border(wxLEFT | wxTOP | wxBOTTOM).Center());
-    }
-
-    // Add a button with the specified id, bitmap and tooltip.
-    void AddButton(wxWindowID btnId,
-                   const wxArtID& artId,
-                   const wxString& tooltip)
-    {
-        // We don't use (smaller) images inside a button with a text label but
-        // rather toolbar-like bitmap buttons hence use wxART_TOOLBAR and not
-        // wxART_BUTTON here.
-        wxBitmap bmp = wxArtProvider::GetBitmap(artId, wxART_TOOLBAR);
-        wxBitmapButton * const btn = new wxBitmapButton(m_parent, btnId, bmp);
-        btn->SetToolTip(tooltip);
-
-        Add(btn);
-    }
-
-    // Add a control at the right end of the window. This should be called last
-    // as everything else added after it will be added on the right side too.
-    void AddAtEnd(wxWindow *win)
-    {
-        m_sizer->AddStretchSpacer();
-        m_sizer->Add(win,
-                     wxSizerFlags().Border(wxTOP | wxBOTTOM | wxRIGHT).Center());
-    }
-
-    // Indicates the end of a group of buttons, a separator will be added after
-    // it.
-    void EndOfGroup()
-    {
-        if ( m_hasContents )
-        {
-            m_needsSeparator = true;
-            m_hasContents = false;
-        }
-    }
-
-private:
-    wxSizer * const m_sizer;
-    wxWindow * const m_parent;
-
-    // If true, we have some controls since the last group beginning. This is
-    // used to avoid inserting two consecutive separators if EndOfGroup() is
-    // called twice.
-    bool m_hasContents;
-
-    // If true, a separator should be inserted before adding the next button.
-    bool m_needsSeparator;
-
-    wxDECLARE_NO_COPY_CLASS(SizerWithButtons);
-};
-
-} // anonymous namespace
-
-void wxPreviewControlBar::CreateButtons()
-{
-    SizerWithButtons sizer(this);
-
-    // Print button group (a single button).
-    if (m_buttonFlags & wxPREVIEW_PRINT)
-    {
-        sizer.AddButton(wxID_PREVIEW_PRINT, wxART_PRINT, _("Print"));
-        sizer.EndOfGroup();
-    }
-
-    // Page selection buttons group.
-    if (m_buttonFlags & wxPREVIEW_FIRST)
-    {
-        sizer.AddButton(wxID_PREVIEW_FIRST, wxART_GOTO_FIRST, _("First page"));
-    }
-
-    if (m_buttonFlags & wxPREVIEW_PREVIOUS)
-    {
-        sizer.AddButton(wxID_PREVIEW_PREVIOUS, wxART_GO_BACK, _("Previous page"));
-    }
-
-    if (m_buttonFlags & wxPREVIEW_GOTO)
-    {
-        m_currentPageText = new wxPrintPageTextCtrl(this);
-        sizer.Add(m_currentPageText);
-
-        m_maxPageText = new wxPrintPageMaxCtrl(this);
-        sizer.Add(m_maxPageText);
-    }
-
-    if (m_buttonFlags & wxPREVIEW_NEXT)
-    {
-        sizer.AddButton(wxID_PREVIEW_NEXT, wxART_GO_FORWARD, _("Next page"));
-    }
-
-    if (m_buttonFlags & wxPREVIEW_LAST)
-    {
-        sizer.AddButton(wxID_PREVIEW_LAST, wxART_GOTO_LAST, _("Last page"));
-    }
-
-    sizer.EndOfGroup();
-
-    // Zoom controls group.
-    if (m_buttonFlags & wxPREVIEW_ZOOM)
-    {
-        sizer.AddButton(wxID_PREVIEW_ZOOM_OUT, wxART_MINUS, _("Zoom Out"));
-
-        wxString choices[] =
-        {
-            wxT("10%"), wxT("15%"), wxT("20%"), wxT("25%"), wxT("30%"), wxT("35%"), wxT("40%"), wxT("45%"), wxT("50%"), wxT("55%"),
-                wxT("60%"), wxT("65%"), wxT("70%"), wxT("75%"), wxT("80%"), wxT("85%"), wxT("90%"), wxT("95%"), wxT("100%"), wxT("110%"),
-                wxT("120%"), wxT("150%"), wxT("200%")
-        };
-        int n = WXSIZEOF(choices);
-
-        m_zoomControl = new wxChoice( this, wxID_PREVIEW_ZOOM, wxDefaultPosition, wxSize(70,wxDefaultCoord), n, choices, 0 );
-        sizer.Add(m_zoomControl);
-        SetZoomControl(m_printPreview->GetZoom());
-
-        sizer.AddButton(wxID_PREVIEW_ZOOM_IN, wxART_PLUS, _("Zoom In"));
-
-        sizer.EndOfGroup();
-    }
-
-    // Close button group (single button again).
-    m_closeButton = new wxButton(this, wxID_PREVIEW_CLOSE, _("&Close"));
-    sizer.AddAtEnd(m_closeButton);
-}
-
-void wxPreviewControlBar::SetPageInfo(int minPage, int maxPage)
-{
-    if ( m_currentPageText )
-        m_currentPageText->SetPageInfo(minPage, maxPage);
-
-    if ( m_maxPageText )
-        m_maxPageText->SetMaxPage(maxPage);
-}
-
-void wxPreviewControlBar::SetZoomControl(int zoom)
-{
-    if (m_zoomControl)
-    {
-        int n, count = m_zoomControl->GetCount();
-        long val;
-        for (n=0; n<count; n++)
-        {
-            if (m_zoomControl->GetString(n).BeforeFirst(wxT('%')).ToLong(&val) &&
-                (val >= long(zoom)))
-            {
-                m_zoomControl->SetSelection(n);
-                return;
-            }
-        }
-
-        m_zoomControl->SetSelection(count-1);
-    }
-}
-
-int wxPreviewControlBar::GetZoomControl()
-{
-    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxEmptyString))
-    {
-        long val;
-        if (m_zoomControl->GetStringSelection().BeforeFirst(wxT('%')).ToLong(&val))
-            return int(val);
-    }
-
-    return 0;
-}
-
-
-/*
-* Preview frame
-*/
-
-IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
-
-BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
-    EVT_CHAR_HOOK(wxPreviewFrame::OnChar)
-    EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-void wxPreviewFrame::OnChar(wxKeyEvent &event)
-{
-    if ( event.GetKeyCode() == WXK_ESCAPE )
-    {
-        Close(true);
-    }
-    else
-    {
-        event.Skip();
-    }
-}
-
-wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxWindow *parent, const wxString& title,
-                               const wxPoint& pos, const wxSize& size, long style, const wxString& name):
-wxFrame(parent, wxID_ANY, title, pos, size, style, name)
-{
-    m_printPreview = preview;
-    m_controlBar = NULL;
-    m_previewCanvas = NULL;
-    m_windowDisabler = NULL;
-    m_modalityKind = wxPreviewFrame_NonModal;
-
-    // Give the application icon
-#ifdef __WXMSW__
-    wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
-    if (topFrame)
-        SetIcons(topFrame->GetIcons());
-#endif
-}
-
-wxPreviewFrame::~wxPreviewFrame()
-{
-    wxPrintout *printout = m_printPreview->GetPrintout();
-    if (printout)
-    {
-        delete printout;
-        m_printPreview->SetPrintout(NULL);
-        m_printPreview->SetCanvas(NULL);
-        m_printPreview->SetFrame(NULL);
-    }
-
-    m_previewCanvas->SetPreview(NULL);
-    delete m_printPreview;
-}
-
-void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    // Reenable any windows we disabled by undoing whatever we did in our
-    // Initialize().
-    switch ( m_modalityKind )
-    {
-        case wxPreviewFrame_AppModal:
-            delete m_windowDisabler;
-            m_windowDisabler = NULL;
-            break;
-
-        case wxPreviewFrame_WindowModal:
-            if ( GetParent() )
-                GetParent()->Enable();
-            break;
-
-        case wxPreviewFrame_NonModal:
-            break;
-    }
-
-    Destroy();
-}
-
-void wxPreviewFrame::InitializeWithModality(wxPreviewFrameModalityKind kind)
-{
-#if wxUSE_STATUSBAR
-    CreateStatusBar();
-#endif
-    CreateCanvas();
-    CreateControlBar();
-
-    m_printPreview->SetCanvas(m_previewCanvas);
-    m_printPreview->SetFrame(this);
-
-    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
-
-    item0->Add( m_controlBar, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
-    item0->Add( m_previewCanvas, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
-
-    SetAutoLayout( true );
-    SetSizer( item0 );
-
-    m_modalityKind = kind;
-    switch ( m_modalityKind )
-    {
-        case wxPreviewFrame_AppModal:
-            // Disable everything.
-            m_windowDisabler = new wxWindowDisabler( this );
-            break;
-
-        case wxPreviewFrame_WindowModal:
-            // Disable our parent if we have one.
-            if ( GetParent() )
-                GetParent()->Disable();
-            break;
-
-        case wxPreviewFrame_NonModal:
-            // Nothing to do, we don't need to disable any windows.
-            break;
-    }
-
-
-    Layout();
-
-    m_printPreview->AdjustScrollbars(m_previewCanvas);
-    m_previewCanvas->SetFocus();
-    m_controlBar->SetFocus();
-}
-
-void wxPreviewFrame::CreateCanvas()
-{
-    m_previewCanvas = new wxPreviewCanvas(m_printPreview, this);
-}
-
-void wxPreviewFrame::CreateControlBar()
-{
-    long buttons = wxPREVIEW_DEFAULT;
-    if (m_printPreview->GetPrintoutForPrinting())
-        buttons |= wxPREVIEW_PRINT;
-
-    m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this);
-    m_controlBar->CreateButtons();
-}
-
-/*
-* Print preview
-*/
-
-IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
-
-wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
-                                       wxPrintout *printoutForPrinting,
-                                       wxPrintData *data)
-{
-    if (data)
-        m_printDialogData = (*data);
-
-    Init(printout, printoutForPrinting);
-}
-
-wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
-                                       wxPrintout *printoutForPrinting,
-                                       wxPrintDialogData *data)
-{
-    if (data)
-        m_printDialogData = (*data);
-
-    Init(printout, printoutForPrinting);
-}
-
-void wxPrintPreviewBase::Init(wxPrintout *printout,
-                              wxPrintout *printoutForPrinting)
-{
-    m_isOk = true;
-    m_previewPrintout = printout;
-    if (m_previewPrintout)
-        m_previewPrintout->SetPreview(static_cast<wxPrintPreview *>(this));
-
-    m_printPrintout = printoutForPrinting;
-
-    m_previewCanvas = NULL;
-    m_previewFrame = NULL;
-    m_previewBitmap = NULL;
-    m_previewFailed = false;
-    m_currentPage = 1;
-    m_currentZoom = 70;
-    m_topMargin =
-    m_leftMargin = 2*wxSizerFlags::GetDefaultBorder();
-    m_pageWidth = 0;
-    m_pageHeight = 0;
-    m_printingPrepared = false;
-    m_minPage = 1;
-    m_maxPage = 1;
-}
-
-wxPrintPreviewBase::~wxPrintPreviewBase()
-{
-    if (m_previewPrintout)
-        delete m_previewPrintout;
-    if (m_previewBitmap)
-        delete m_previewBitmap;
-    if (m_printPrintout)
-        delete m_printPrintout;
-}
-
-bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
-{
-    if (m_currentPage == pageNum)
-        return true;
-
-    m_currentPage = pageNum;
-
-    InvalidatePreviewBitmap();
-
-    if (m_previewCanvas)
-    {
-        AdjustScrollbars(m_previewCanvas);
-
-        m_previewCanvas->Refresh();
-        m_previewCanvas->SetFocus();
-    }
-    return true;
-}
-
-int wxPrintPreviewBase::GetCurrentPage() const
-    { return m_currentPage; }
-void wxPrintPreviewBase::SetPrintout(wxPrintout *printout)
-    { m_previewPrintout = printout; }
-wxPrintout *wxPrintPreviewBase::GetPrintout() const
-    { return m_previewPrintout; }
-wxPrintout *wxPrintPreviewBase::GetPrintoutForPrinting() const
-    { return m_printPrintout; }
-void wxPrintPreviewBase::SetFrame(wxFrame *frame)
-    { m_previewFrame = frame; }
-void wxPrintPreviewBase::SetCanvas(wxPreviewCanvas *canvas)
-    { m_previewCanvas = canvas; }
-wxFrame *wxPrintPreviewBase::GetFrame() const
-    { return m_previewFrame; }
-wxPreviewCanvas *wxPrintPreviewBase::GetCanvas() const
-    { return m_previewCanvas; }
-
-void wxPrintPreviewBase::CalcRects(wxPreviewCanvas *canvas, wxRect& pageRect, wxRect& paperRect)
-{
-    // Calculate the rectangles for the printable area of the page and the
-    // entire paper as they appear on the canvas on-screen.
-    int canvasWidth, canvasHeight;
-    canvas->GetSize(&canvasWidth, &canvasHeight);
-
-    float zoomScale = float(m_currentZoom) / 100;
-    float screenPrintableWidth = zoomScale * m_pageWidth * m_previewScaleX;
-    float screenPrintableHeight = zoomScale * m_pageHeight * m_previewScaleY;
-
-    wxRect devicePaperRect = m_previewPrintout->GetPaperRectPixels();
-    wxCoord devicePrintableWidth, devicePrintableHeight;
-    m_previewPrintout->GetPageSizePixels(&devicePrintableWidth, &devicePrintableHeight);
-    float scaleX = screenPrintableWidth / devicePrintableWidth;
-    float scaleY = screenPrintableHeight / devicePrintableHeight;
-    paperRect.width = wxCoord(scaleX * devicePaperRect.width);
-    paperRect.height = wxCoord(scaleY * devicePaperRect.height);
-
-    paperRect.x = wxCoord((canvasWidth - paperRect.width)/ 2.0);
-    if (paperRect.x < m_leftMargin)
-        paperRect.x = m_leftMargin;
-    paperRect.y = wxCoord((canvasHeight - paperRect.height)/ 2.0);
-    if (paperRect.y < m_topMargin)
-        paperRect.y = m_topMargin;
-
-    pageRect.x = paperRect.x - wxCoord(scaleX * devicePaperRect.x);
-    pageRect.y = paperRect.y - wxCoord(scaleY * devicePaperRect.y);
-    pageRect.width = wxCoord(screenPrintableWidth);
-    pageRect.height = wxCoord(screenPrintableHeight);
-}
-
-
-void wxPrintPreviewBase::InvalidatePreviewBitmap()
-{
-    wxDELETE(m_previewBitmap);
-    // if there was a problem with rendering the preview, try again now
-    // that it changed in some way (less memory may be needed, for example):
-    m_previewFailed = false;
-}
-
-bool wxPrintPreviewBase::UpdatePageRendering()
-{
-    if ( m_previewBitmap )
-        return false;
-
-    if ( m_previewFailed )
-        return false;
-
-    if ( !RenderPage(m_currentPage) )
-    {
-        m_previewFailed = true; // don't waste time failing again
-        return false;
-    }
-
-    return true;
-}
-
-bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
-{
-    DrawBlankPage(canvas, dc);
-
-    if (!m_previewBitmap)
-        return false;
-    if (!canvas)
-        return false;
-
-    wxRect pageRect, paperRect;
-    CalcRects(canvas, pageRect, paperRect);
-    wxMemoryDC temp_dc;
-    temp_dc.SelectObject(*m_previewBitmap);
-
-    dc.Blit(pageRect.x, pageRect.y,
-        m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
-
-    temp_dc.SelectObject(wxNullBitmap);
-    return true;
-}
-
-// Adjusts the scrollbars for the current scale
-void wxPrintPreviewBase::AdjustScrollbars(wxPreviewCanvas *canvas)
-{
-    if (!canvas)
-        return ;
-
-    wxRect pageRect, paperRect;
-    CalcRects(canvas, pageRect, paperRect);
-     int totalWidth = paperRect.width + 2 * m_leftMargin;
-    int totalHeight = paperRect.height + 2 * m_topMargin;
-    int scrollUnitsX = totalWidth / 10;
-    int scrollUnitsY = totalHeight / 10;
-    wxSize virtualSize = canvas->GetVirtualSize();
-    if (virtualSize.GetWidth() != totalWidth || virtualSize.GetHeight() != totalHeight)
-        canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, true);
-}
-
-bool wxPrintPreviewBase::RenderPageIntoDC(wxDC& dc, int pageNum)
-{
-    m_previewPrintout->SetDC(&dc);
-    m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
-
-    // Need to delay OnPreparePrinting() until here, so we have enough
-    // information and a wxDC.
-    if (!m_printingPrepared)
-    {
-        m_printingPrepared = true;
-
-        m_previewPrintout->OnPreparePrinting();
-        int selFrom, selTo;
-        m_previewPrintout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);
-
-        // Update the wxPreviewControlBar page range display.
-        if ( m_previewFrame )
-        {
-            wxPreviewControlBar * const
-                controlBar = ((wxPreviewFrame*)m_previewFrame)->GetControlBar();
-            if ( controlBar )
-                controlBar->SetPageInfo(m_minPage, m_maxPage);
-        }
-    }
-
-    m_previewPrintout->OnBeginPrinting();
-
-    if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
-    {
-        wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
-        return false;
-    }
-
-    m_previewPrintout->OnPrintPage(pageNum);
-    m_previewPrintout->OnEndDocument();
-    m_previewPrintout->OnEndPrinting();
-
-    m_previewPrintout->SetDC(NULL);
-
-    return true;
-}
-
-bool wxPrintPreviewBase::RenderPageIntoBitmap(wxBitmap& bmp, int pageNum)
-{
-    wxMemoryDC memoryDC;
-    memoryDC.SelectObject(bmp);
-    memoryDC.Clear();
-
-    return RenderPageIntoDC(memoryDC, pageNum);
-}
-
-bool wxPrintPreviewBase::RenderPage(int pageNum)
-{
-    wxBusyCursor busy;
-
-    if (!m_previewCanvas)
-    {
-        wxFAIL_MSG(wxT("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"));
-        return false;
-    }
-
-    wxRect pageRect, paperRect;
-    CalcRects(m_previewCanvas, pageRect, paperRect);
-
-    if (!m_previewBitmap)
-    {
-        m_previewBitmap = new wxBitmap(pageRect.width, pageRect.height);
-
-        if (!m_previewBitmap || !m_previewBitmap->IsOk())
-        {
-            InvalidatePreviewBitmap();
-            wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
-            return false;
-        }
-    }
-
-    if ( !RenderPageIntoBitmap(*m_previewBitmap, pageNum) )
-    {
-        InvalidatePreviewBitmap();
-        wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
-        return false;
-    }
-
-#if wxUSE_STATUSBAR
-    wxString status;
-    if (m_maxPage != 0)
-        status = wxString::Format(_("Page %d of %d"), pageNum, m_maxPage);
-    else
-        status = wxString::Format(_("Page %d"), pageNum);
-
-    if (m_previewFrame)
-        m_previewFrame->SetStatusText(status);
-#endif
-
-    return true;
-}
-
-bool wxPrintPreviewBase::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
-{
-    wxRect pageRect, paperRect;
-
-    CalcRects(canvas, pageRect, paperRect);
-
-    // Draw shadow, allowing for 1-pixel border AROUND the actual paper
-    wxCoord shadowOffset = 4;
-
-    dc.SetPen(*wxBLACK_PEN);
-    dc.SetBrush(*wxBLACK_BRUSH);
-    dc.DrawRectangle(paperRect.x + shadowOffset, paperRect.y + paperRect.height + 1,
-        paperRect.width, shadowOffset);
-
-    dc.DrawRectangle(paperRect.x + paperRect.width, paperRect.y + shadowOffset,
-        shadowOffset, paperRect.height);
-
-    // Draw blank page allowing for 1-pixel border AROUND the actual paper
-    dc.SetPen(*wxBLACK_PEN);
-    dc.SetBrush(*wxWHITE_BRUSH);
-    dc.DrawRectangle(paperRect.x - 2, paperRect.y - 1,
-        paperRect.width + 3, paperRect.height + 2);
-
-    return true;
-}
-
-void wxPrintPreviewBase::SetZoom(int percent)
-{
-    if (m_currentZoom == percent)
-        return;
-
-    m_currentZoom = percent;
-
-    InvalidatePreviewBitmap();
-
-    if (m_previewCanvas)
-    {
-        AdjustScrollbars(m_previewCanvas);
-        ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
-        m_previewCanvas->ClearBackground();
-        m_previewCanvas->Refresh();
-        m_previewCanvas->SetFocus();
-    }
-}
-
-wxPrintDialogData& wxPrintPreviewBase::GetPrintDialogData()
-{
-    return m_printDialogData;
-}
-
-int wxPrintPreviewBase::GetZoom() const
-{ return m_currentZoom; }
-int wxPrintPreviewBase::GetMaxPage() const
-{ return m_maxPage; }
-int wxPrintPreviewBase::GetMinPage() const
-{ return m_minPage; }
-bool wxPrintPreviewBase::IsOk() const
-{ return m_isOk; }
-void wxPrintPreviewBase::SetOk(bool ok)
-{ m_isOk = ok; }
-
-//----------------------------------------------------------------------------
-// wxPrintPreview
-//----------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
-
-wxPrintPreview::wxPrintPreview(wxPrintout *printout,
-                   wxPrintout *printoutForPrinting,
-                   wxPrintDialogData *data) :
-    wxPrintPreviewBase( printout, printoutForPrinting, data )
-{
-    m_pimpl = wxPrintFactory::GetFactory()->
-        CreatePrintPreview( printout, printoutForPrinting, data );
-}
-
-wxPrintPreview::wxPrintPreview(wxPrintout *printout,
-                   wxPrintout *printoutForPrinting,
-                   wxPrintData *data ) :
-    wxPrintPreviewBase( printout, printoutForPrinting, data )
-{
-    m_pimpl = wxPrintFactory::GetFactory()->
-        CreatePrintPreview( printout, printoutForPrinting, data );
-}
-
-wxPrintPreview::~wxPrintPreview()
-{
-    delete m_pimpl;
-
-    // don't delete twice
-    m_printPrintout = NULL;
-    m_previewPrintout = NULL;
-    m_previewBitmap = NULL;
-}
-
-bool wxPrintPreview::SetCurrentPage(int pageNum)
-{
-    return m_pimpl->SetCurrentPage( pageNum );
-}
-
-int wxPrintPreview::GetCurrentPage() const
-{
-    return m_pimpl->GetCurrentPage();
-}
-
-void wxPrintPreview::SetPrintout(wxPrintout *printout)
-{
-    m_pimpl->SetPrintout( printout );
-}
-
-wxPrintout *wxPrintPreview::GetPrintout() const
-{
-    return m_pimpl->GetPrintout();
-}
-
-wxPrintout *wxPrintPreview::GetPrintoutForPrinting() const
-{
-    return m_pimpl->GetPrintoutForPrinting();
-}
-
-void wxPrintPreview::SetFrame(wxFrame *frame)
-{
-    m_pimpl->SetFrame( frame );
-}
-
-void wxPrintPreview::SetCanvas(wxPreviewCanvas *canvas)
-{
-    m_pimpl->SetCanvas( canvas );
-}
-
-wxFrame *wxPrintPreview::GetFrame() const
-{
-    return m_pimpl->GetFrame();
-}
-
-wxPreviewCanvas *wxPrintPreview::GetCanvas() const
-{
-    return m_pimpl->GetCanvas();
-}
-
-bool wxPrintPreview::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
-{
-    return m_pimpl->PaintPage( canvas, dc );
-}
-
-bool wxPrintPreview::UpdatePageRendering()
-{
-    return m_pimpl->UpdatePageRendering();
-}
-
-bool wxPrintPreview::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
-{
-    return m_pimpl->DrawBlankPage( canvas, dc );
-}
-
-void wxPrintPreview::AdjustScrollbars(wxPreviewCanvas *canvas)
-{
-    m_pimpl->AdjustScrollbars( canvas );
-}
-
-bool wxPrintPreview::RenderPage(int pageNum)
-{
-    return m_pimpl->RenderPage( pageNum );
-}
-
-void wxPrintPreview::SetZoom(int percent)
-{
-    m_pimpl->SetZoom( percent );
-}
-
-int wxPrintPreview::GetZoom() const
-{
-    return m_pimpl->GetZoom();
-}
-
-wxPrintDialogData& wxPrintPreview::GetPrintDialogData()
-{
-    return m_pimpl->GetPrintDialogData();
-}
-
-int wxPrintPreview::GetMaxPage() const
-{
-    return m_pimpl->GetMaxPage();
-}
-
-int wxPrintPreview::GetMinPage() const
-{
-    return m_pimpl->GetMinPage();
-}
-
-bool wxPrintPreview::IsOk() const
-{
-    return m_pimpl->IsOk();
-}
-
-void wxPrintPreview::SetOk(bool ok)
-{
-    m_pimpl->SetOk( ok );
-}
-
-bool wxPrintPreview::Print(bool interactive)
-{
-    return m_pimpl->Print( interactive );
-}
-
-void wxPrintPreview::DetermineScaling()
-{
-    m_pimpl->DetermineScaling();
-}
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/prntbase.cpp
+// Purpose:     Printing framework base class implementation
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: prntbase.cpp 60850 2009-06-01 10:16:13Z JS $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_PRINTING_ARCHITECTURE
+
+// change this to 1 to use experimental high-quality printing on Windows
+// (NB: this can't be in msw/printwin.cpp because of binary compatibility)
+#define wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW 0
+
+#if wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW
+    #if !defined(__WXMSW__) || !wxUSE_IMAGE || !wxUSE_WXDIB
+        #undef wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW
+        #define wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW 0
+    #endif
+#endif
+
+#if wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW
+#include "wx/msw/enhmeta.h"
+#endif
+
+#if wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW && !wxUSE_ENH_METAFILE_FROM_DC
+#error Please set wxUSE_ENH_METAFILE_FROM_DC to 1 in include/wx/msw/enhmeta.h.
+#endif
+
+#include "wx/dcprint.h"
+
+#ifndef WX_PRECOMP
+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/app.h"
+    #include "wx/math.h"
+    #include "wx/msgdlg.h"
+    #include "wx/layout.h"
+    #include "wx/choice.h"
+    #include "wx/button.h"
+    #include "wx/settings.h"
+    #include "wx/dcmemory.h"
+    #include "wx/stattext.h"
+    #include "wx/intl.h"
+    #include "wx/textdlg.h"
+    #include "wx/sizer.h"
+    #include "wx/module.h"
+#endif // !WX_PRECOMP
+
+#include "wx/prntbase.h"
+#include "wx/printdlg.h"
+#include "wx/print.h"
+#include "wx/dcprint.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#include "wx/msw/printdlg.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/printdlg.h"
+#include "wx/mac/private/print.h"
+#else
+#include "wx/generic/prntdlgg.h"
+#include "wx/dcps.h"
+#endif
+
+#ifdef __WXMSW__
+    #ifndef __WIN32__
+        #include <print.h>
+    #endif
+#endif // __WXMSW__
+
+#if wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW
+
+#include "wx/msw/dib.h"
+#include "wx/image.h"
+
+typedef bool (wxPrintPreviewBase::*RenderPageIntoDCFunc)(wxDC&, int);
+static bool RenderPageIntoBitmapHQ(wxPrintPreviewBase *preview,
+                                   RenderPageIntoDCFunc RenderPageIntoDC,
+                                   wxBitmap& bmp, int pageNum);
+#endif // wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW
+
+//----------------------------------------------------------------------------
+// wxPrintFactory
+//----------------------------------------------------------------------------
+
+wxPrintFactory *wxPrintFactory::m_factory = NULL;
+
+void wxPrintFactory::SetPrintFactory( wxPrintFactory *factory )
+{
+    if (wxPrintFactory::m_factory)
+        delete wxPrintFactory::m_factory;
+
+    wxPrintFactory::m_factory = factory;
+}
+
+wxPrintFactory *wxPrintFactory::GetFactory()
+{
+    if (!wxPrintFactory::m_factory)
+        wxPrintFactory::m_factory = new wxNativePrintFactory;
+
+    return wxPrintFactory::m_factory;
+}
+
+//----------------------------------------------------------------------------
+// wxNativePrintFactory
+//----------------------------------------------------------------------------
+
+wxPrinterBase *wxNativePrintFactory::CreatePrinter( wxPrintDialogData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrinter( data );
+#elif defined(__WXMAC__)
+    return new wxMacPrinter( data );
+#elif defined(__WXPM__)
+    return new wxOS2Printer( data );
+#else
+    return new wxPostScriptPrinter( data );
+#endif
+}
+
+wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
+    wxPrintout *printout, wxPrintDialogData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintPreview( preview, printout, data );
+#elif defined(__WXMAC__)
+    return new wxMacPrintPreview( preview, printout, data );
+#elif defined(__WXPM__)
+    return new wxOS2PrintPreview( preview, printout, data );
+#else
+    return new wxPostScriptPrintPreview( preview, printout, data );
+#endif
+}
+
+wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *preview,
+    wxPrintout *printout, wxPrintData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintPreview( preview, printout, data );
+#elif defined(__WXMAC__)
+    return new wxMacPrintPreview( preview, printout, data );
+#elif defined(__WXPM__)
+    return new wxOS2PrintPreview( preview, printout, data );
+#else
+    return new wxPostScriptPrintPreview( preview, printout, data );
+#endif
+}
+
+wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
+                                                  wxPrintDialogData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintDialog( parent, data );
+#elif defined(__WXMAC__)
+    return new wxMacPrintDialog( parent, data );
+#else
+    return new wxGenericPrintDialog( parent, data );
+#endif
+}
+
+wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
+                                                  wxPrintData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintDialog( parent, data );
+#elif defined(__WXMAC__)
+    return new wxMacPrintDialog( parent, data );
+#else
+    return new wxGenericPrintDialog( parent, data );
+#endif
+}
+
+wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *parent,
+                                                  wxPageSetupDialogData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPageSetupDialog( parent, data );
+#elif defined(__WXMAC__)
+    return new wxMacPageSetupDialog( parent, data );
+#else
+    return new wxGenericPageSetupDialog( parent, data );
+#endif
+}
+
+bool wxNativePrintFactory::HasPrintSetupDialog()
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return false;
+#elif defined(__WXMAC__)
+    return false;
+#else
+    // Only here do we need to provide the print setup
+    // dialog ourselves, the other platforms either have
+    // none, don't make it accessible or let you configure
+    // the printer from the wxPrintDialog anyway.
+    return true;
+#endif
+
+}
+
+wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent,
+                                                        wxPrintData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    wxUnusedVar(parent);
+    wxUnusedVar(data);
+    return NULL;
+#elif defined(__WXMAC__)
+    wxUnusedVar(parent);
+    wxUnusedVar(data);
+    return NULL;
+#else
+    // Only here do we need to provide the print setup
+    // dialog ourselves, the other platforms either have
+    // none, don't make it accessible or let you configure
+    // the printer from the wxPrintDialog anyway.
+    return new wxGenericPrintSetupDialog( parent, data );
+#endif
+}
+
+wxDC* wxNativePrintFactory::CreatePrinterDC( const wxPrintData& data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxPrinterDC(data);
+#elif defined(__WXMAC__)
+    return new wxPrinterDC(data);
+#else
+    return new wxPostScriptDC(data);
+#endif
+}
+
+bool wxNativePrintFactory::HasOwnPrintToFile()
+{
+    // Only relevant for PostScript and here the
+    // setup dialog provides no "print to file"
+    // option. In the GNOME setup dialog, the
+    // setup dialog has its own print to file.
+    return false;
+}
+
+bool wxNativePrintFactory::HasPrinterLine()
+{
+    // Only relevant for PostScript for now
+    return true;
+}
+
+wxString wxNativePrintFactory::CreatePrinterLine()
+{
+    // Only relevant for PostScript for now
+
+    // We should query "lpstat -d" here
+    return _("Generic PostScript");
+}
+
+bool wxNativePrintFactory::HasStatusLine()
+{
+    // Only relevant for PostScript for now
+    return true;
+}
+
+wxString wxNativePrintFactory::CreateStatusLine()
+{
+    // Only relevant for PostScript for now
+
+    // We should query "lpstat -r" or "lpstat -p" here
+    return _("Ready");
+}
+
+wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData()
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPrintNativeData;
+#elif defined(__WXMAC__)
+    return new wxMacCarbonPrintData;
+#else
+    return new wxPostScriptPrintNativeData;
+#endif
+}
+
+//----------------------------------------------------------------------------
+// wxPrintNativeDataBase
+//----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject)
+
+wxPrintNativeDataBase::wxPrintNativeDataBase()
+{
+    m_ref = 1;
+}
+
+//----------------------------------------------------------------------------
+// wxPrintFactoryModule
+//----------------------------------------------------------------------------
+
+class wxPrintFactoryModule: public wxModule
+{
+public:
+    wxPrintFactoryModule() {}
+    bool OnInit() { return true; }
+    void OnExit() { wxPrintFactory::SetPrintFactory( NULL ); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPrintFactoryModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxPrintFactoryModule, wxModule)
+
+//----------------------------------------------------------------------------
+// wxPrinterBase
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPrinterBase, wxObject)
+
+wxPrinterBase::wxPrinterBase(wxPrintDialogData *data)
+{
+    m_currentPrintout = (wxPrintout *) NULL;
+    sm_abortWindow = (wxWindow *) NULL;
+    sm_abortIt = false;
+    if (data)
+        m_printDialogData = (*data);
+    sm_lastError = wxPRINTER_NO_ERROR;
+}
+
+wxWindow *wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
+bool wxPrinterBase::sm_abortIt = false;
+wxPrinterError wxPrinterBase::sm_lastError = wxPRINTER_NO_ERROR;
+
+wxPrinterBase::~wxPrinterBase()
+{
+}
+
+wxWindow *wxPrinterBase::CreateAbortWindow(wxWindow *parent, wxPrintout * printout)
+{
+    wxPrintAbortDialog *dialog = new wxPrintAbortDialog(parent, _("Printing ") , wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
+
+    wxBoxSizer *button_sizer = new wxBoxSizer( wxVERTICAL );
+    button_sizer->Add( new wxStaticText(dialog, wxID_ANY, _("Please wait while printing\n") + printout->GetTitle() ), 0, wxALL, 10 );
+    button_sizer->Add( new wxButton( dialog, wxID_CANCEL, wxT("Cancel") ), 0, wxALL | wxALIGN_CENTER, 10 );
+
+    dialog->SetAutoLayout( true );
+    dialog->SetSizer( button_sizer );
+
+    button_sizer->Fit(dialog);
+    button_sizer->SetSizeHints (dialog) ;
+
+    return dialog;
+}
+
+void wxPrinterBase::ReportError(wxWindow *parent, wxPrintout *WXUNUSED(printout), const wxString& message)
+{
+    wxMessageBox(message, _("Printing Error"), wxOK, parent);
+}
+
+wxPrintDialogData& wxPrinterBase::GetPrintDialogData() const
+{
+    return (wxPrintDialogData&) m_printDialogData;
+}
+
+//----------------------------------------------------------------------------
+// wxPrinter
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPrinter, wxPrinterBase)
+
+wxPrinter::wxPrinter(wxPrintDialogData *data)
+{
+    m_pimpl = wxPrintFactory::GetFactory()->CreatePrinter( data );
+}
+
+wxPrinter::~wxPrinter()
+{
+    delete m_pimpl;
+}
+
+wxWindow *wxPrinter::CreateAbortWindow(wxWindow *parent, wxPrintout *printout)
+{
+    return m_pimpl->CreateAbortWindow( parent, printout );
+}
+
+void wxPrinter::ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message)
+{
+    m_pimpl->ReportError( parent, printout, message );
+}
+
+bool wxPrinter::Setup(wxWindow *parent)
+{
+    return m_pimpl->Setup( parent );
+}
+
+bool wxPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
+{
+    return m_pimpl->Print( parent, printout, prompt );
+}
+
+wxDC* wxPrinter::PrintDialog(wxWindow *parent)
+{
+    return m_pimpl->PrintDialog( parent );
+}
+
+wxPrintDialogData& wxPrinter::GetPrintDialogData() const
+{
+    return m_pimpl->GetPrintDialogData();
+}
+
+// ---------------------------------------------------------------------------
+// wxPrintDialogBase: the dialog for printing.
+// ---------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog)
+
+wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
+                                     wxWindowID id,
+                                     const wxString &title,
+                                     const wxPoint &pos,
+                                     const wxSize &size,
+                                     long style)
+    : wxDialog( parent, id, title.empty() ? wxString(_("Print")) : title,
+                pos, size, style )
+{
+}
+
+// ---------------------------------------------------------------------------
+// wxPrintDialog: the dialog for printing
+// ---------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPrintDialog, wxObject)
+
+wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintDialogData* data)
+{
+    m_pimpl = wxPrintFactory::GetFactory()->CreatePrintDialog( parent, data );
+}
+
+wxPrintDialog::wxPrintDialog(wxWindow *parent, wxPrintData* data)
+{
+    m_pimpl = wxPrintFactory::GetFactory()->CreatePrintDialog( parent, data );
+}
+
+wxPrintDialog::~wxPrintDialog()
+{
+    delete m_pimpl;
+}
+
+int wxPrintDialog::ShowModal()
+{
+    return m_pimpl->ShowModal();
+}
+
+wxPrintDialogData& wxPrintDialog::GetPrintDialogData()
+{
+    return m_pimpl->GetPrintDialogData();
+}
+
+wxPrintData& wxPrintDialog::GetPrintData()
+{
+    return m_pimpl->GetPrintData();
+}
+
+wxDC *wxPrintDialog::GetPrintDC()
+{
+    return m_pimpl->GetPrintDC();
+}
+
+// ---------------------------------------------------------------------------
+// wxPageSetupDialogBase: the page setup dialog
+// ---------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog)
+
+wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent,
+                                     wxWindowID id,
+                                     const wxString &title,
+                                     const wxPoint &pos,
+                                     const wxSize &size,
+                                     long style)
+    : wxDialog( parent, id, title.empty() ? wxString(_("Page setup")) : title,
+                pos, size, style )
+{
+}
+
+// ---------------------------------------------------------------------------
+// wxPageSetupDialog: the page setup dialog
+// ---------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPageSetupDialog, wxObject)
+
+wxPageSetupDialog::wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data )
+{
+    m_pimpl = wxPrintFactory::GetFactory()->CreatePageSetupDialog( parent, data );
+}
+
+wxPageSetupDialog::~wxPageSetupDialog()
+{
+    delete m_pimpl;
+}
+
+int wxPageSetupDialog::ShowModal()
+{
+    return m_pimpl->ShowModal();
+}
+
+wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupDialogData()
+{
+    return m_pimpl->GetPageSetupDialogData();
+}
+
+// old name
+wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupData()
+{
+    return m_pimpl->GetPageSetupDialogData();
+}
+
+//----------------------------------------------------------------------------
+// wxPrintAbortDialog
+//----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
+    EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
+END_EVENT_TABLE()
+
+void wxPrintAbortDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
+{
+    wxPrinterBase::sm_abortIt = true;
+    wxPrinterBase::sm_abortWindow->Show(false);
+    wxPrinterBase::sm_abortWindow->Close(true);
+    wxPrinterBase::sm_abortWindow->Destroy();
+    wxPrinterBase::sm_abortWindow = (wxWindow *) NULL;
+}
+
+//----------------------------------------------------------------------------
+// wxPrintout
+//----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
+
+wxPrintout::wxPrintout(const wxString& title)
+{
+    m_printoutTitle = title ;
+    m_printoutDC = (wxDC *) NULL;
+    m_pageWidthMM = 0;
+    m_pageHeightMM = 0;
+    m_pageWidthPixels = 0;
+    m_pageHeightPixels = 0;
+    m_PPIScreenX = 0;
+    m_PPIScreenY = 0;
+    m_PPIPrinterX = 0;
+    m_PPIPrinterY = 0;
+    m_isPreview = false;
+}
+
+wxPrintout::~wxPrintout()
+{
+}
+
+bool wxPrintout::OnBeginDocument(int WXUNUSED(startPage), int WXUNUSED(endPage))
+{
+    return GetDC()->StartDoc(_("Printing ") + m_printoutTitle);
+}
+
+void wxPrintout::OnEndDocument()
+{
+    GetDC()->EndDoc();
+}
+
+void wxPrintout::OnBeginPrinting()
+{
+}
+
+void wxPrintout::OnEndPrinting()
+{
+}
+
+bool wxPrintout::HasPage(int page)
+{
+    return (page == 1);
+}
+
+void wxPrintout::GetPageInfo(int *minPage, int *maxPage, int *fromPage, int *toPage)
+{
+    *minPage = 1;
+    *maxPage = 32000;
+    *fromPage = 1;
+    *toPage = 1;
+}
+
+void wxPrintout::FitThisSizeToPaper(const wxSize& imageSize)
+{
+    // Set the DC scale and origin so that the given image size fits within the
+    // entire page and the origin is at the top left corner of the page. Note
+    // that with most printers, portions of the page will be non-printable. Use
+    // this if you're managing your own page margins.
+    if (!m_printoutDC) return;
+    wxRect paperRect = GetPaperRectPixels();
+    wxCoord pw, ph;
+    GetPageSizePixels(&pw, &ph);
+    wxCoord w, h;
+    m_printoutDC->GetSize(&w, &h);
+    float scaleX = ((float(paperRect.width) * w) / (float(pw) * imageSize.x));
+    float scaleY = ((float(paperRect.height) * h) / (float(ph) * imageSize.y));
+    float actualScale = wxMin(scaleX, scaleY);
+    m_printoutDC->SetUserScale(actualScale, actualScale); 
+    m_printoutDC->SetDeviceOrigin(0, 0);
+    wxRect logicalPaperRect = GetLogicalPaperRect();
+    SetLogicalOrigin(logicalPaperRect.x, logicalPaperRect.y);
+}
+
+void wxPrintout::FitThisSizeToPage(const wxSize& imageSize)
+{
+    // Set the DC scale and origin so that the given image size fits within the
+    // printable area of the page and the origin is at the top left corner of
+    // the printable area.
+    if (!m_printoutDC) return;
+    int w, h;
+    m_printoutDC->GetSize(&w, &h);
+    float scaleX = float(w) / imageSize.x;
+    float scaleY = float(h) / imageSize.y;
+    float actualScale = wxMin(scaleX, scaleY);
+    m_printoutDC->SetUserScale(actualScale, actualScale); 
+    m_printoutDC->SetDeviceOrigin(0, 0);
+}
+
+void wxPrintout::FitThisSizeToPageMargins(const wxSize& imageSize, const wxPageSetupDialogData& pageSetupData)
+{
+    // Set the DC scale and origin so that the given image size fits within the
+    // page margins defined in the given wxPageSetupDialogData object and the
+    // origin is at the top left corner of the page margins.
+    if (!m_printoutDC) return;
+    wxRect paperRect = GetPaperRectPixels();
+    wxCoord pw, ph;
+    GetPageSizePixels(&pw, &ph);
+    wxPoint topLeft = pageSetupData.GetMarginTopLeft();
+    wxPoint bottomRight = pageSetupData.GetMarginBottomRight();
+    wxCoord mw, mh;
+    GetPageSizeMM(&mw, &mh);
+    float mmToDeviceX = float(pw) / mw;
+    float mmToDeviceY = float(ph) / mh;
+    wxRect pageMarginsRect(paperRect.x + wxRound(mmToDeviceX * topLeft.x),
+        paperRect.y + wxRound(mmToDeviceY * topLeft.y),
+        paperRect.width - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)),
+        paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y)));
+    wxCoord w, h;
+    m_printoutDC->GetSize(&w, &h);
+    float scaleX = (float(pageMarginsRect.width) * w) / (float(pw) * imageSize.x);
+    float scaleY = (float(pageMarginsRect.height) * h) / (float(ph) * imageSize.y);
+    float actualScale = wxMin(scaleX, scaleY);
+    m_printoutDC->SetUserScale(actualScale, actualScale); 
+    m_printoutDC->SetDeviceOrigin(0, 0);
+    wxRect logicalPageMarginsRect = GetLogicalPageMarginsRect(pageSetupData);
+    SetLogicalOrigin(logicalPageMarginsRect.x, logicalPageMarginsRect.y);
+}
+
+void wxPrintout::MapScreenSizeToPaper()
+{
+    // Set the DC scale so that an image on the screen is the same size on the
+    // paper and the origin is at the top left of the paper. Note that with most
+    // printers, portions of the page will be cut off. Use this if you're
+    // managing your own page margins.
+    if (!m_printoutDC) return;
+    MapScreenSizeToPage();
+    wxRect logicalPaperRect = GetLogicalPaperRect();
+    SetLogicalOrigin(logicalPaperRect.x, logicalPaperRect.y);
+}
+
+void wxPrintout::MapScreenSizeToPage()
+{
+    // Set the DC scale and origin so that an image on the screen is the same
+    // size on the paper and the origin is at the top left of the printable area.
+    if (!m_printoutDC) return;
+    int ppiScreenX, ppiScreenY; 
+    GetPPIScreen(&ppiScreenX, &ppiScreenY); 
+    int ppiPrinterX, ppiPrinterY; 
+    GetPPIPrinter(&ppiPrinterX, &ppiPrinterY); 
+    int w, h; 
+    m_printoutDC->GetSize(&w, &h); 
+    int pageSizePixelsX, pageSizePixelsY; 
+    GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); 
+    float userScaleX = (float(ppiPrinterX) * w) / (float(ppiScreenX) * pageSizePixelsX); 
+    float userScaleY = (float(ppiPrinterY) * h) / (float(ppiScreenY) * pageSizePixelsY); 
+    m_printoutDC->SetUserScale(userScaleX, userScaleY);
+    m_printoutDC->SetDeviceOrigin(0, 0);
+}
+
+void wxPrintout::MapScreenSizeToPageMargins(const wxPageSetupDialogData& pageSetupData)
+{
+    // Set the DC scale so that an image on the screen is the same size on the
+    // paper and the origin is at the top left of the page margins defined by
+    // the given wxPageSetupDialogData object.
+    if (!m_printoutDC) return;
+    MapScreenSizeToPage();
+    wxRect logicalPageMarginsRect = GetLogicalPageMarginsRect(pageSetupData);
+    SetLogicalOrigin(logicalPageMarginsRect.x, logicalPageMarginsRect.y);
+}
+
+void wxPrintout::MapScreenSizeToDevice()
+{
+    // Set the DC scale so that a screen pixel is the same size as a device
+    // pixel and the origin is at the top left of the printable area.
+    if (!m_printoutDC) return;
+    int w, h; 
+    m_printoutDC->GetSize(&w, &h); 
+    int pageSizePixelsX, pageSizePixelsY; 
+    GetPageSizePixels(&pageSizePixelsX, &pageSizePixelsY); 
+    float userScaleX = float(w) / pageSizePixelsX; 
+    float userScaleY = float(h) / pageSizePixelsY; 
+    m_printoutDC->SetUserScale(userScaleX, userScaleY);
+    m_printoutDC->SetDeviceOrigin(0, 0);
+}
+
+wxRect wxPrintout::GetLogicalPaperRect() const
+{
+    // Return the rectangle in logical units that corresponds to the paper
+    // rectangle.
+    wxRect paperRect = GetPaperRectPixels();
+    wxCoord pw, ph;
+    GetPageSizePixels(&pw, &ph);
+    wxCoord w, h;
+    m_printoutDC->GetSize(&w, &h);
+    if (w == pw && h == ph) {
+        // this DC matches the printed page, so no scaling
+        return wxRect(m_printoutDC->DeviceToLogicalX(paperRect.x), 
+            m_printoutDC->DeviceToLogicalY(paperRect.y), 
+            m_printoutDC->DeviceToLogicalXRel(paperRect.width), 
+            m_printoutDC->DeviceToLogicalYRel(paperRect.height));
+    }
+    // This DC doesn't match the printed page, so we have to scale.
+    float scaleX = float(w) / pw;
+    float scaleY = float(h) / ph;
+    return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(paperRect.x * scaleX)), 
+        m_printoutDC->DeviceToLogicalY(wxRound(paperRect.y * scaleY)), 
+        m_printoutDC->DeviceToLogicalXRel(wxRound(paperRect.width * scaleX)), 
+        m_printoutDC->DeviceToLogicalYRel(wxRound(paperRect.height * scaleY)));
+}
+
+wxRect wxPrintout::GetLogicalPageRect() const
+{
+    // Return the rectangle in logical units that corresponds to the printable
+    // area.
+    int w, h;
+    m_printoutDC->GetSize(&w, &h);
+    return wxRect(m_printoutDC->DeviceToLogicalX(0), 
+        m_printoutDC->DeviceToLogicalY(0), 
+        m_printoutDC->DeviceToLogicalXRel(w), 
+        m_printoutDC->DeviceToLogicalYRel(h));
+}
+
+wxRect wxPrintout::GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSetupData) const
+{
+    // Return the rectangle in logical units that corresponds to the region
+    // within the page margins as specified by the given wxPageSetupDialogData
+    // object.
+    wxRect paperRect = GetPaperRectPixels();
+    wxCoord pw, ph;
+    GetPageSizePixels(&pw, &ph);
+    wxPoint topLeft = pageSetupData.GetMarginTopLeft();
+    wxPoint bottomRight = pageSetupData.GetMarginBottomRight();
+    wxCoord mw, mh;
+    GetPageSizeMM(&mw, &mh);
+    float mmToDeviceX = float(pw) / mw;
+    float mmToDeviceY = float(ph) / mh;
+    wxRect pageMarginsRect(paperRect.x + wxRound(mmToDeviceX * topLeft.x),
+        paperRect.y + wxRound(mmToDeviceY * topLeft.y),
+        paperRect.width - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)),
+        paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y)));
+    wxCoord w, h;
+    m_printoutDC->GetSize(&w, &h);
+    if (w == pw && h == ph) {
+        // this DC matches the printed page, so no scaling
+        return wxRect(m_printoutDC->DeviceToLogicalX(pageMarginsRect.x), 
+            m_printoutDC->DeviceToLogicalY(pageMarginsRect.y), 
+            m_printoutDC->DeviceToLogicalXRel(pageMarginsRect.width), 
+            m_printoutDC->DeviceToLogicalYRel(pageMarginsRect.height));
+    }
+    // This DC doesn't match the printed page, so we have to scale.
+    float scaleX = float(w) / pw;
+    float scaleY = float(h) / ph;
+    return wxRect(m_printoutDC->DeviceToLogicalX(wxRound(pageMarginsRect.x * scaleX)), 
+        m_printoutDC->DeviceToLogicalY(wxRound(pageMarginsRect.y * scaleY)), 
+        m_printoutDC->DeviceToLogicalXRel(wxRound(pageMarginsRect.width * scaleX)), 
+        m_printoutDC->DeviceToLogicalYRel(wxRound(pageMarginsRect.height * scaleY)));
+}
+
+void wxPrintout::SetLogicalOrigin(wxCoord x, wxCoord y)
+{
+    // Set the device origin by specifying a point in logical coordinates.
+    m_printoutDC->SetDeviceOrigin(m_printoutDC->LogicalToDeviceX(x), 
+        m_printoutDC->LogicalToDeviceY(y));
+}
+    
+void wxPrintout::OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff)
+{
+    // Offset the device origin by a specified distance in device coordinates.
+    wxCoord x = m_printoutDC->LogicalToDeviceX(0);
+    wxCoord y = m_printoutDC->LogicalToDeviceY(0);
+    m_printoutDC->SetDeviceOrigin(x + m_printoutDC->LogicalToDeviceXRel(xoff), 
+        y + m_printoutDC->LogicalToDeviceYRel(yoff));
+}
+    
+
+//----------------------------------------------------------------------------
+// wxPreviewCanvas
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
+
+BEGIN_EVENT_TABLE(wxPreviewCanvas, wxScrolledWindow)
+    EVT_PAINT(wxPreviewCanvas::OnPaint)
+    EVT_CHAR(wxPreviewCanvas::OnChar)
+    EVT_SYS_COLOUR_CHANGED(wxPreviewCanvas::OnSysColourChanged)
+#if wxUSE_MOUSEWHEEL
+    EVT_MOUSEWHEEL(wxPreviewCanvas::OnMouseWheel)
+#endif
+END_EVENT_TABLE()
+
+// VZ: the current code doesn't refresh properly without
+//     wxFULL_REPAINT_ON_RESIZE, this must be fixed as otherwise we have
+//     really horrible flicker when resizing the preview frame, but without
+//     this style it simply doesn't work correctly at all...
+wxPreviewCanvas::wxPreviewCanvas(wxPrintPreviewBase *preview, wxWindow *parent,
+                                 const wxPoint& pos, const wxSize& size, long style, const wxString& name):
+wxScrolledWindow(parent, wxID_ANY, pos, size, style | wxFULL_REPAINT_ON_RESIZE, name)
+{
+    m_printPreview = preview;
+#ifdef __WXMAC__
+    // The app workspace colour is always white, but we should have
+    // a contrast with the page.
+    wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
+#elif defined(__WXGTK__)
+    wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE;
+#else
+    wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
+#endif
+    SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
+
+    SetScrollbars(10, 10, 100, 100);
+}
+
+wxPreviewCanvas::~wxPreviewCanvas()
+{
+}
+
+void wxPreviewCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    wxPaintDC dc(this);
+    PrepareDC( dc );
+
+/*
+#ifdef __WXGTK__
+    if (!GetUpdateRegion().IsEmpty())
+        dc.SetClippingRegion( GetUpdateRegion() );
+#endif
+*/
+
+    if (m_printPreview)
+    {
+        m_printPreview->PaintPage(this, dc);
+    }
+}
+
+// Responds to colour changes, and passes event on to children.
+void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+#ifdef __WXMAC__
+    // The app workspace colour is always white, but we should have
+    // a contrast with the page.
+    wxSystemColour colourIndex = wxSYS_COLOUR_3DDKSHADOW;
+#elif defined(__WXGTK__)
+    wxSystemColour colourIndex = wxSYS_COLOUR_BTNFACE;
+#else
+    wxSystemColour colourIndex = wxSYS_COLOUR_APPWORKSPACE;
+#endif
+    SetBackgroundColour(wxSystemSettings::GetColour(colourIndex));
+    Refresh();
+
+    // Propagate the event to the non-top-level children
+    wxWindow::OnSysColourChanged(event);
+}
+
+void wxPreviewCanvas::OnChar(wxKeyEvent &event)
+{
+    wxPreviewControlBar* controlBar = ((wxPreviewFrame*) GetParent())->GetControlBar();
+    if (event.GetKeyCode() == WXK_ESCAPE)
+    {
+        ((wxPreviewFrame*) GetParent())->Close(true);
+        return;
+    }
+    else if (event.GetKeyCode() == WXK_TAB)
+    {
+        controlBar->OnGoto();
+        return;
+    }
+    else if (event.GetKeyCode() == WXK_RETURN)
+    {
+        controlBar->OnPrint();
+        return;
+    }
+
+    if (!event.ControlDown())
+    {
+        event.Skip();
+        return;
+    }
+
+    switch(event.GetKeyCode())
+    {
+        case WXK_PAGEDOWN:
+            controlBar->OnNext(); break;
+        case WXK_PAGEUP:
+            controlBar->OnPrevious(); break;
+        case WXK_HOME:
+            controlBar->OnFirst(); break;
+        case WXK_END:
+            controlBar->OnLast(); break;
+        default:
+            event.Skip();
+    }
+}
+
+#if wxUSE_MOUSEWHEEL
+
+void wxPreviewCanvas::OnMouseWheel(wxMouseEvent& event)
+{
+    wxPreviewControlBar *
+        controlBar = wxStaticCast(GetParent(), wxPreviewFrame)->GetControlBar();
+
+    if ( controlBar )
+    {
+        if ( event.ControlDown() && event.GetWheelRotation() != 0 )
+        {
+            int currentZoom = controlBar->GetZoomControl();
+
+            int delta;
+            if ( currentZoom < 100 )
+                delta = 5;
+            else if ( currentZoom <= 120 )
+                delta = 10;
+            else
+                delta = 50;
+
+            if ( event.GetWheelRotation() > 0 )
+                delta = -delta;
+
+            int newZoom = currentZoom + delta;
+            if ( newZoom < 10 )
+                newZoom = 10;
+            if ( newZoom > 200 )
+                newZoom = 200;
+            if ( newZoom != currentZoom )
+            {
+                controlBar->SetZoomControl(newZoom);
+                m_printPreview->SetZoom(newZoom);
+                Refresh();
+            }
+            return;
+        }
+    }
+
+    event.Skip();
+}
+
+#endif // wxUSE_MOUSEWHEEL
+
+//----------------------------------------------------------------------------
+// wxPreviewControlBar
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPreviewControlBar, wxWindow)
+
+BEGIN_EVENT_TABLE(wxPreviewControlBar, wxPanel)
+    EVT_BUTTON(wxID_PREVIEW_CLOSE,    wxPreviewControlBar::OnWindowClose)
+    EVT_BUTTON(wxID_PREVIEW_PRINT,    wxPreviewControlBar::OnPrintButton)
+    EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPreviousButton)
+    EVT_BUTTON(wxID_PREVIEW_NEXT,     wxPreviewControlBar::OnNextButton)
+    EVT_BUTTON(wxID_PREVIEW_FIRST,    wxPreviewControlBar::OnFirstButton)
+    EVT_BUTTON(wxID_PREVIEW_LAST,     wxPreviewControlBar::OnLastButton)
+    EVT_BUTTON(wxID_PREVIEW_GOTO,     wxPreviewControlBar::OnGotoButton)
+    EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoom)
+    EVT_PAINT(wxPreviewControlBar::OnPaint)
+END_EVENT_TABLE()
+
+wxPreviewControlBar::wxPreviewControlBar(wxPrintPreviewBase *preview, long buttons,
+                                         wxWindow *parent, const wxPoint& pos, const wxSize& size,
+                                         long style, const wxString& name):
+wxPanel(parent, wxID_ANY, pos, size, style, name)
+{
+    m_printPreview = preview;
+    m_closeButton = (wxButton *) NULL;
+    m_nextPageButton = (wxButton *) NULL;
+    m_previousPageButton = (wxButton *) NULL;
+    m_printButton = (wxButton *) NULL;
+    m_zoomControl = (wxChoice *) NULL;
+    m_buttonFlags = buttons;
+}
+
+wxPreviewControlBar::~wxPreviewControlBar()
+{
+}
+
+void wxPreviewControlBar::OnPaint(wxPaintEvent& WXUNUSED(event))
+{
+    wxPaintDC dc(this);
+
+    int w, h;
+    GetSize(&w, &h);
+    dc.SetPen(*wxBLACK_PEN);
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+    dc.DrawLine( 0, h-1, w, h-1 );
+}
+
+void wxPreviewControlBar::OnWindowClose(wxCommandEvent& WXUNUSED(event))
+{
+    wxPreviewFrame *frame = (wxPreviewFrame *)GetParent();
+    frame->Close(true);
+}
+
+void wxPreviewControlBar::OnPrint(void)
+{
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    preview->Print(true);
+}
+
+void wxPreviewControlBar::OnNext(void)
+{
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
+    {
+        int currentPage = preview->GetCurrentPage();
+        if ((preview->GetMaxPage() > 0) &&
+            (currentPage < preview->GetMaxPage()) &&
+            preview->GetPrintout()->HasPage(currentPage + 1))
+        {
+            preview->SetCurrentPage(currentPage + 1);
+        }
+    }
+}
+
+void wxPreviewControlBar::OnPrevious(void)
+{
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
+    {
+        int currentPage = preview->GetCurrentPage();
+        if ((preview->GetMinPage() > 0) &&
+            (currentPage > preview->GetMinPage()) &&
+            preview->GetPrintout()->HasPage(currentPage - 1))
+        {
+            preview->SetCurrentPage(currentPage - 1);
+        }
+    }
+}
+
+void wxPreviewControlBar::OnFirst(void)
+{
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
+    {
+        int currentPage = preview->GetMinPage();
+        if (preview->GetPrintout()->HasPage(currentPage))
+        {
+            preview->SetCurrentPage(currentPage);
+        }
+    }
+}
+
+void wxPreviewControlBar::OnLast(void)
+{
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
+    {
+        int currentPage = preview->GetMaxPage();
+        if (preview->GetPrintout()->HasPage(currentPage))
+        {
+            preview->SetCurrentPage(currentPage);
+        }
+    }
+}
+
+void wxPreviewControlBar::OnGoto(void)
+{
+    wxPrintPreviewBase *preview = GetPrintPreview();
+    if (preview)
+    {
+        long currentPage;
+
+        if (preview->GetMinPage() > 0)
+        {
+            wxString strPrompt;
+            wxString strPage;
+
+            strPrompt.Printf( _("Enter a page number between %d and %d:"),
+                preview->GetMinPage(), preview->GetMaxPage());
+            strPage.Printf( wxT("%d"), preview->GetCurrentPage() );
+
+            strPage =
+                wxGetTextFromUser( strPrompt, _("Goto Page"), strPage, GetParent());
+
+            if ( strPage.ToLong( &currentPage ) )
+                if (preview->GetPrintout()->HasPage(currentPage))
+                {
+                    preview->SetCurrentPage(currentPage);
+                }
+        }
+    }
+}
+
+void wxPreviewControlBar::OnZoom(wxCommandEvent& WXUNUSED(event))
+{
+    int zoom = GetZoomControl();
+    if (GetPrintPreview())
+        GetPrintPreview()->SetZoom(zoom);
+}
+
+void wxPreviewControlBar::CreateButtons()
+{
+    SetSize(0, 0, 400, 40);
+
+    wxBoxSizer *item0 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_closeButton = new wxButton( this, wxID_PREVIEW_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( m_closeButton, 0, wxALIGN_CENTRE|wxALL, 5 );
+
+    if (m_buttonFlags & wxPREVIEW_PRINT)
+    {
+        m_printButton = new wxButton( this, wxID_PREVIEW_PRINT, _("&Print..."), wxDefaultPosition, wxDefaultSize, 0 );
+        item0->Add( m_printButton, 0, wxALIGN_CENTRE|wxALL, 5 );
+    }
+
+    // Exact-fit buttons are too tiny on wxUniversal
+    int navButtonStyle;
+    wxSize navButtonSize;
+#ifdef __WXUNIVERSAL__
+    navButtonStyle = 0;
+    navButtonSize = wxSize(40, m_closeButton->GetSize().y);
+#else
+    navButtonStyle = wxBU_EXACTFIT;
+    navButtonSize = wxDefaultSize;
+#endif
+
+    if (m_buttonFlags & wxPREVIEW_FIRST)
+    {
+        m_firstPageButton = new wxButton( this, wxID_PREVIEW_FIRST, _("|<<"), wxDefaultPosition, navButtonSize, navButtonStyle );
+        item0->Add( m_firstPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
+    }
+
+    if (m_buttonFlags & wxPREVIEW_PREVIOUS)
+    {
+        m_previousPageButton = new wxButton( this, wxID_PREVIEW_PREVIOUS, _("<<"), wxDefaultPosition, navButtonSize, navButtonStyle );
+        item0->Add( m_previousPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
+    }
+
+    if (m_buttonFlags & wxPREVIEW_NEXT)
+    {
+        m_nextPageButton = new wxButton( this, wxID_PREVIEW_NEXT, _(">>"), wxDefaultPosition, navButtonSize, navButtonStyle );
+        item0->Add( m_nextPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
+    }
+
+    if (m_buttonFlags & wxPREVIEW_LAST)
+    {
+        m_lastPageButton = new wxButton( this, wxID_PREVIEW_LAST, _(">>|"), wxDefaultPosition, navButtonSize, navButtonStyle );
+        item0->Add( m_lastPageButton, 0, wxALIGN_CENTRE|wxRIGHT|wxTOP|wxBOTTOM, 5 );
+    }
+
+    if (m_buttonFlags & wxPREVIEW_GOTO)
+    {
+        m_gotoPageButton = new wxButton( this, wxID_PREVIEW_GOTO, _("&Goto..."), wxDefaultPosition, wxDefaultSize, 0 );
+        item0->Add( m_gotoPageButton, 0, wxALIGN_CENTRE|wxALL, 5 );
+    }
+
+    if (m_buttonFlags & wxPREVIEW_ZOOM)
+    {
+        wxString choices[] =
+        {
+            wxT("10%"), wxT("15%"), wxT("20%"), wxT("25%"), wxT("30%"), wxT("35%"), wxT("40%"), wxT("45%"), wxT("50%"), wxT("55%"),
+                wxT("60%"), wxT("65%"), wxT("70%"), wxT("75%"), wxT("80%"), wxT("85%"), wxT("90%"), wxT("95%"), wxT("100%"), wxT("110%"),
+                wxT("120%"), wxT("150%"), wxT("200%")
+        };
+        int n = WXSIZEOF(choices);
+
+        m_zoomControl = new wxChoice( this, wxID_PREVIEW_ZOOM, wxDefaultPosition, wxSize(70,wxDefaultCoord), n, choices, 0 );
+        item0->Add( m_zoomControl, 0, wxALIGN_CENTRE|wxALL, 5 );
+        SetZoomControl(m_printPreview->GetZoom());
+    }
+
+    SetSizer(item0);
+    item0->Fit(this);
+}
+
+void wxPreviewControlBar::SetZoomControl(int zoom)
+{
+    if (m_zoomControl)
+    {
+        int n, count = m_zoomControl->GetCount();
+        long val;
+        for (n=0; n<count; n++)
+        {
+            if (m_zoomControl->GetString(n).BeforeFirst(wxT('%')).ToLong(&val) &&
+                (val >= long(zoom)))
+            {
+                m_zoomControl->SetSelection(n);
+                return;
+            }
+        }
+
+        m_zoomControl->SetSelection(count-1);
+    }
+}
+
+int wxPreviewControlBar::GetZoomControl()
+{
+    if (m_zoomControl && (m_zoomControl->GetStringSelection() != wxEmptyString))
+    {
+        long val;
+        if (m_zoomControl->GetStringSelection().BeforeFirst(wxT('%')).ToLong(&val))
+            return int(val);
+    }
+
+    return 0;
+}
+
+
+/*
+* Preview frame
+*/
+
+IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
+
+BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
+    EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
+END_EVENT_TABLE()
+
+wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxWindow *parent, const wxString& title,
+                               const wxPoint& pos, const wxSize& size, long style, const wxString& name):
+wxFrame(parent, wxID_ANY, title, pos, size, style, name)
+{
+    m_printPreview = preview;
+    m_controlBar = NULL;
+    m_previewCanvas = NULL;
+    m_windowDisabler = NULL;
+
+    // Give the application icon
+#ifdef __WXMSW__
+    wxFrame* topFrame = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
+    if (topFrame)
+        SetIcon(topFrame->GetIcon());
+#endif
+}
+
+wxPreviewFrame::~wxPreviewFrame()
+{
+}
+
+void wxPreviewFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+{
+    if (m_windowDisabler)
+        delete m_windowDisabler;
+
+    // Need to delete the printout and the print preview
+    wxPrintout *printout = m_printPreview->GetPrintout();
+    if (printout)
+    {
+        delete printout;
+        m_printPreview->SetPrintout(NULL);
+        m_printPreview->SetCanvas(NULL);
+        m_printPreview->SetFrame(NULL);
+    }
+    delete m_printPreview;
+
+    Destroy();
+}
+
+void wxPreviewFrame::Initialize()
+{
+#if wxUSE_STATUSBAR
+    CreateStatusBar();
+#endif
+    CreateCanvas();
+    CreateControlBar();
+
+    m_printPreview->SetCanvas(m_previewCanvas);
+    m_printPreview->SetFrame(this);
+
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+    item0->Add( m_controlBar, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( m_previewCanvas, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+
+    SetAutoLayout( true );
+    SetSizer( item0 );
+
+    m_windowDisabler = new wxWindowDisabler(this);
+
+    Layout();
+
+    m_printPreview->AdjustScrollbars(m_previewCanvas);
+    m_previewCanvas->SetFocus();
+    m_controlBar->SetFocus();
+}
+
+void wxPreviewFrame::CreateCanvas()
+{
+    m_previewCanvas = new wxPreviewCanvas(m_printPreview, this);
+}
+
+void wxPreviewFrame::CreateControlBar()
+{
+    long buttons = wxPREVIEW_DEFAULT;
+    if (m_printPreview->GetPrintoutForPrinting())
+        buttons |= wxPREVIEW_PRINT;
+
+    m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0,0), wxSize(400, 40));
+    m_controlBar->CreateButtons();
+}
+
+/*
+* Print preview
+*/
+
+IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
+
+wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
+                                       wxPrintout *printoutForPrinting,
+                                       wxPrintData *data)
+{
+    if (data)
+        m_printDialogData = (*data);
+
+    Init(printout, printoutForPrinting);
+}
+
+wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
+                                       wxPrintout *printoutForPrinting,
+                                       wxPrintDialogData *data)
+{
+    if (data)
+        m_printDialogData = (*data);
+
+    Init(printout, printoutForPrinting);
+}
+
+void wxPrintPreviewBase::Init(wxPrintout *printout,
+                              wxPrintout *printoutForPrinting)
+{
+    m_isOk = true;
+    m_previewPrintout = printout;
+    if (m_previewPrintout)
+        m_previewPrintout->SetIsPreview(true);
+
+    m_printPrintout = printoutForPrinting;
+
+    m_previewCanvas = NULL;
+    m_previewFrame = NULL;
+    m_previewBitmap = NULL;
+    m_currentPage = 1;
+    m_currentZoom = 70;
+    m_topMargin = 40;
+    m_leftMargin = 40;
+    m_pageWidth = 0;
+    m_pageHeight = 0;
+    m_printingPrepared = false;
+    m_minPage = 1;
+    m_maxPage = 1;
+}
+
+wxPrintPreviewBase::~wxPrintPreviewBase()
+{
+    if (m_previewPrintout)
+        delete m_previewPrintout;
+    if (m_previewBitmap)
+        delete m_previewBitmap;
+    if (m_printPrintout)
+        delete m_printPrintout;
+}
+
+bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
+{
+    if (m_currentPage == pageNum)
+        return true;
+
+    m_currentPage = pageNum;
+    if (m_previewBitmap)
+    {
+        delete m_previewBitmap;
+        m_previewBitmap = NULL;
+    }
+
+    if (m_previewCanvas)
+    {
+        AdjustScrollbars(m_previewCanvas);
+
+        if (!RenderPage(pageNum))
+            return false;
+        m_previewCanvas->Refresh();
+        m_previewCanvas->SetFocus();
+    }
+    return true;
+}
+
+int wxPrintPreviewBase::GetCurrentPage() const
+    { return m_currentPage; }
+void wxPrintPreviewBase::SetPrintout(wxPrintout *printout)
+    { m_previewPrintout = printout; }
+wxPrintout *wxPrintPreviewBase::GetPrintout() const
+    { return m_previewPrintout; }
+wxPrintout *wxPrintPreviewBase::GetPrintoutForPrinting() const
+    { return m_printPrintout; }
+void wxPrintPreviewBase::SetFrame(wxFrame *frame)
+    { m_previewFrame = frame; }
+void wxPrintPreviewBase::SetCanvas(wxPreviewCanvas *canvas)
+    { m_previewCanvas = canvas; }
+wxFrame *wxPrintPreviewBase::GetFrame() const
+    { return m_previewFrame; }
+wxPreviewCanvas *wxPrintPreviewBase::GetCanvas() const
+    { return m_previewCanvas; }
+
+void wxPrintPreviewBase::CalcRects(wxPreviewCanvas *canvas, wxRect& pageRect, wxRect& paperRect)
+{
+    // Calculate the rectangles for the printable area of the page and the
+    // entire paper as they appear on the canvas on-screen.
+    int canvasWidth, canvasHeight;
+    canvas->GetSize(&canvasWidth, &canvasHeight);
+
+    float zoomScale = float(m_currentZoom) / 100;
+    float screenPrintableWidth = zoomScale * m_pageWidth * m_previewScaleX;
+    float screenPrintableHeight = zoomScale * m_pageHeight * m_previewScaleY;
+
+    wxRect devicePaperRect = m_previewPrintout->GetPaperRectPixels();
+    wxCoord devicePrintableWidth, devicePrintableHeight;
+    m_previewPrintout->GetPageSizePixels(&devicePrintableWidth, &devicePrintableHeight);
+    float scaleX = screenPrintableWidth / devicePrintableWidth;
+    float scaleY = screenPrintableHeight / devicePrintableHeight;
+    paperRect.width = wxCoord(scaleX * devicePaperRect.width);
+    paperRect.height = wxCoord(scaleY * devicePaperRect.height);
+
+    paperRect.x = wxCoord((canvasWidth - paperRect.width)/ 2.0);
+    if (paperRect.x < m_leftMargin)
+        paperRect.x = m_leftMargin;
+    paperRect.y = wxCoord((canvasHeight - paperRect.height)/ 2.0);
+    if (paperRect.y < m_topMargin)
+        paperRect.y = m_topMargin;
+
+    pageRect.x = paperRect.x - wxCoord(scaleX * devicePaperRect.x);
+    pageRect.y = paperRect.y - wxCoord(scaleY * devicePaperRect.y);
+    pageRect.width = wxCoord(screenPrintableWidth);
+    pageRect.height = wxCoord(screenPrintableHeight);
+}
+
+
+bool wxPrintPreviewBase::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
+{
+    DrawBlankPage(canvas, dc);
+
+    if (!m_previewBitmap)
+        if (!RenderPage(m_currentPage))
+            return false;
+    if (!m_previewBitmap)
+        return false;
+    if (!canvas)
+        return false;
+
+    wxRect pageRect, paperRect;
+    CalcRects(canvas, pageRect, paperRect);
+    wxMemoryDC temp_dc;
+    temp_dc.SelectObject(*m_previewBitmap);
+
+    dc.Blit(pageRect.x, pageRect.y, 
+        m_previewBitmap->GetWidth(), m_previewBitmap->GetHeight(), &temp_dc, 0, 0);
+
+    temp_dc.SelectObject(wxNullBitmap);
+    return true;
+}
+
+// Adjusts the scrollbars for the current scale
+void wxPrintPreviewBase::AdjustScrollbars(wxPreviewCanvas *canvas)
+{
+    if (!canvas)
+        return ;
+
+    wxRect pageRect, paperRect;
+    CalcRects(canvas, pageRect, paperRect);
+     int totalWidth = paperRect.width + 2 * m_leftMargin;
+    int totalHeight = paperRect.height + 2 * m_topMargin;
+    int scrollUnitsX = totalWidth / 10;
+    int scrollUnitsY = totalHeight / 10;
+    wxSize virtualSize = canvas->GetVirtualSize();
+    if (virtualSize.GetWidth() != totalWidth || virtualSize.GetHeight() != totalHeight)
+        canvas->SetScrollbars(10, 10, scrollUnitsX, scrollUnitsY, 0, 0, true);
+}
+
+bool wxPrintPreviewBase::RenderPageIntoDC(wxDC& dc, int pageNum)
+{
+    m_previewPrintout->SetDC(&dc);
+    m_previewPrintout->SetPageSizePixels(m_pageWidth, m_pageHeight);
+
+    // Need to delay OnPreparePrinting() until here, so we have enough
+    // information.
+    if (!m_printingPrepared)
+    {
+        m_previewPrintout->OnPreparePrinting();
+        int selFrom, selTo;
+        m_previewPrintout->GetPageInfo(&m_minPage, &m_maxPage, &selFrom, &selTo);
+        m_printingPrepared = true;
+    }
+
+    m_previewPrintout->OnBeginPrinting();
+
+    if (!m_previewPrintout->OnBeginDocument(m_printDialogData.GetFromPage(), m_printDialogData.GetToPage()))
+    {
+        wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
+        return false;
+    }
+
+    m_previewPrintout->OnPrintPage(pageNum);
+    m_previewPrintout->OnEndDocument();
+    m_previewPrintout->OnEndPrinting();
+
+    m_previewPrintout->SetDC(NULL);
+
+    return true;
+}
+
+bool wxPrintPreviewBase::RenderPageIntoBitmap(wxBitmap& bmp, int pageNum)
+{
+#if wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW
+    {
+        if ( RenderPageIntoBitmapHQ(this,
+                                    &wxPrintPreviewBase::RenderPageIntoDC,
+                                    bmp, pageNum) )
+        {
+            return true;
+        }
+    }
+#endif // wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW
+
+    wxMemoryDC memoryDC;
+    memoryDC.SelectObject(bmp);
+    memoryDC.Clear();
+
+    return RenderPageIntoDC(memoryDC, pageNum);
+}
+
+bool wxPrintPreviewBase::RenderPage(int pageNum)
+{
+    wxBusyCursor busy;
+
+    if (!m_previewCanvas)
+    {
+        wxFAIL_MSG(_T("wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to let me know about the canvas!"));
+        return false;
+    }
+
+    wxRect pageRect, paperRect;
+    CalcRects(m_previewCanvas, pageRect, paperRect);
+
+    if (!m_previewBitmap)
+    {
+        m_previewBitmap = new wxBitmap(pageRect.width, pageRect.height);
+
+        if (!m_previewBitmap || !m_previewBitmap->Ok())
+        {
+            if (m_previewBitmap) {
+                delete m_previewBitmap;
+                m_previewBitmap = NULL;
+            }
+            wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
+            return false;
+        }
+    }
+
+    if ( !RenderPageIntoBitmap(*m_previewBitmap, pageNum) )
+    {
+        wxMessageBox(_("Could not start document preview."), _("Print Preview Failure"), wxOK);
+
+        delete m_previewBitmap;
+        m_previewBitmap = NULL;
+        return false;
+    }
+
+#if wxUSE_STATUSBAR
+    wxString status;
+    if (m_maxPage != 0)
+        status = wxString::Format(_("Page %d of %d"), pageNum, m_maxPage);
+    else
+        status = wxString::Format(_("Page %d"), pageNum);
+
+    if (m_previewFrame)
+        m_previewFrame->SetStatusText(status);
+#endif
+
+    return true;
+}
+
+bool wxPrintPreviewBase::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
+{
+    wxRect pageRect, paperRect;
+
+    CalcRects(canvas, pageRect, paperRect);
+
+    // Draw shadow, allowing for 1-pixel border AROUND the actual paper
+    wxCoord shadowOffset = 4;
+
+    dc.SetPen(*wxBLACK_PEN);
+    dc.SetBrush(*wxBLACK_BRUSH);
+    dc.DrawRectangle(paperRect.x + shadowOffset, paperRect.y + paperRect.height + 1,
+        paperRect.width, shadowOffset);
+
+    dc.DrawRectangle(paperRect.x + paperRect.width, paperRect.y + shadowOffset,
+        shadowOffset, paperRect.height);
+
+    // Draw blank page allowing for 1-pixel border AROUND the actual paper
+    dc.SetPen(*wxBLACK_PEN);
+    dc.SetBrush(*wxWHITE_BRUSH);
+    dc.DrawRectangle(paperRect.x - 2, paperRect.y - 1, 
+        paperRect.width + 3, paperRect.height + 2);
+
+    return true;
+}
+
+void wxPrintPreviewBase::SetZoom(int percent)
+{
+    if (m_currentZoom == percent)
+        return;
+
+    m_currentZoom = percent;
+    if (m_previewBitmap)
+    {
+        delete m_previewBitmap;
+        m_previewBitmap = NULL;
+    }
+
+    if (m_previewCanvas)
+    {
+        AdjustScrollbars(m_previewCanvas);
+        RenderPage(m_currentPage);
+        ((wxScrolledWindow *) m_previewCanvas)->Scroll(0, 0);
+        m_previewCanvas->ClearBackground();
+        m_previewCanvas->Refresh();
+        m_previewCanvas->SetFocus();
+    }
+}
+
+wxPrintDialogData& wxPrintPreviewBase::GetPrintDialogData()
+{
+    return m_printDialogData;
+}
+
+int wxPrintPreviewBase::GetZoom() const
+{ return m_currentZoom; }
+int wxPrintPreviewBase::GetMaxPage() const
+{ return m_maxPage; }
+int wxPrintPreviewBase::GetMinPage() const
+{ return m_minPage; }
+bool wxPrintPreviewBase::IsOk() const
+{ return m_isOk; }
+void wxPrintPreviewBase::SetOk(bool ok)
+{ m_isOk = ok; }
+
+//----------------------------------------------------------------------------
+// wxPrintPreview
+//----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)
+
+wxPrintPreview::wxPrintPreview(wxPrintout *printout,
+                   wxPrintout *printoutForPrinting,
+                   wxPrintDialogData *data) :
+    wxPrintPreviewBase( printout, printoutForPrinting, data )
+{
+    m_pimpl = wxPrintFactory::GetFactory()->
+        CreatePrintPreview( printout, printoutForPrinting, data );
+}
+
+wxPrintPreview::wxPrintPreview(wxPrintout *printout,
+                   wxPrintout *printoutForPrinting,
+                   wxPrintData *data ) :
+    wxPrintPreviewBase( printout, printoutForPrinting, data )
+{
+    m_pimpl = wxPrintFactory::GetFactory()->
+        CreatePrintPreview( printout, printoutForPrinting, data );
+}
+
+wxPrintPreview::~wxPrintPreview()
+{
+    delete m_pimpl;
+
+    // don't delete twice
+    m_printPrintout = NULL;
+    m_previewPrintout = NULL;
+    m_previewBitmap = NULL;
+}
+
+bool wxPrintPreview::SetCurrentPage(int pageNum)
+{
+    return m_pimpl->SetCurrentPage( pageNum );
+}
+
+int wxPrintPreview::GetCurrentPage() const
+{
+    return m_pimpl->GetCurrentPage();
+}
+
+void wxPrintPreview::SetPrintout(wxPrintout *printout)
+{
+    m_pimpl->SetPrintout( printout );
+}
+
+wxPrintout *wxPrintPreview::GetPrintout() const
+{
+    return m_pimpl->GetPrintout();
+}
+
+wxPrintout *wxPrintPreview::GetPrintoutForPrinting() const
+{
+    return m_pimpl->GetPrintoutForPrinting();
+}
+
+void wxPrintPreview::SetFrame(wxFrame *frame)
+{
+    m_pimpl->SetFrame( frame );
+}
+
+void wxPrintPreview::SetCanvas(wxPreviewCanvas *canvas)
+{
+    m_pimpl->SetCanvas( canvas );
+}
+
+wxFrame *wxPrintPreview::GetFrame() const
+{
+    return m_pimpl->GetFrame();
+}
+
+wxPreviewCanvas *wxPrintPreview::GetCanvas() const
+{
+    return m_pimpl->GetCanvas();
+}
+
+bool wxPrintPreview::PaintPage(wxPreviewCanvas *canvas, wxDC& dc)
+{
+    return m_pimpl->PaintPage( canvas, dc );
+}
+
+bool wxPrintPreview::DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc)
+{
+    return m_pimpl->DrawBlankPage( canvas, dc );
+}
+
+void wxPrintPreview::AdjustScrollbars(wxPreviewCanvas *canvas)
+{
+    m_pimpl->AdjustScrollbars( canvas );
+}
+
+bool wxPrintPreview::RenderPage(int pageNum)
+{
+    return m_pimpl->RenderPage( pageNum );
+}
+
+void wxPrintPreview::SetZoom(int percent)
+{
+    m_pimpl->SetZoom( percent );
+}
+
+int wxPrintPreview::GetZoom() const
+{
+    return m_pimpl->GetZoom();
+}
+
+wxPrintDialogData& wxPrintPreview::GetPrintDialogData()
+{
+    return m_pimpl->GetPrintDialogData();
+}
+
+int wxPrintPreview::GetMaxPage() const
+{
+    return m_pimpl->GetMaxPage();
+}
+
+int wxPrintPreview::GetMinPage() const
+{
+    return m_pimpl->GetMinPage();
+}
+
+bool wxPrintPreview::IsOk() const
+{
+    return m_pimpl->Ok();
+}
+
+void wxPrintPreview::SetOk(bool ok)
+{
+    m_pimpl->SetOk( ok );
+}
+
+bool wxPrintPreview::Print(bool interactive)
+{
+    return m_pimpl->Print( interactive );
+}
+
+void wxPrintPreview::DetermineScaling()
+{
+    m_pimpl->DetermineScaling();
+}
+
+//----------------------------------------------------------------------------
+// experimental backport of high-quality preview on Windows
+//----------------------------------------------------------------------------
+
+#if wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW
+static bool RenderPageIntoBitmapHQ(wxPrintPreviewBase *preview,
+                                   RenderPageIntoDCFunc RenderPageIntoDC,
+                                   wxBitmap& bmp, int pageNum)
+{
+    // The preview, as implemented in wxPrintPreviewBase (and as used prior to
+    // wx3) is inexact: it uses screen DC, which has much lower resolution and
+    // has other properties different from printer DC, so the preview is not
+    // quite right.
+    //
+    // To make matters worse, if the application depends heavily on
+    // GetTextExtent() or does text layout itself, the output in preview and on
+    // paper can be very different. In particular, wxHtmlEasyPrinting is
+    // affected and the preview can be easily off by several pages.
+    //
+    // To fix this, we render the preview into high-resolution enhanced
+    // metafile with properties identical to the printer DC. This guarantees
+    // metrics correctness while still being fast.
+
+
+    // print the preview into a metafile:
+    wxPrinterDC printerDC(preview->GetPrintDialogData().GetPrintData());
+    wxEnhMetaFileDC metaDC(printerDC,
+                           wxEmptyString,
+                           printerDC.GetSize().x, printerDC.GetSize().y);
+
+    if ( !(preview->*RenderPageIntoDC)(metaDC, pageNum) )
+        return false;
+
+    wxEnhMetaFile *metafile = metaDC.Close();
+    if ( !metafile )
+        return false;
+
+    // now render the metafile:
+    wxMemoryDC bmpDC;
+    bmpDC.SelectObject(bmp);
+    bmpDC.Clear();
+
+    wxRect outRect(0, 0, bmp.GetWidth(), bmp.GetHeight());
+    metafile->Play(&bmpDC, &outRect);
+
+
+    delete metafile;
+
+    // TODO: we should keep the metafile and reuse it when changing zoom level
+
+    return true;
+}
+#endif // wxUSE_HIGH_QUALITY_PREVIEW_IN_WXMSW
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
diff --git a/Source/3rd Party/wx/src/common/process.cpp b/Source/3rd Party/wx/src/common/process.cpp
index 0c4c7a7f6..9e8681ad2 100644
--- a/Source/3rd Party/wx/src/common/process.cpp	
+++ b/Source/3rd Party/wx/src/common/process.cpp	
@@ -1,178 +1,172 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/process.cpp
-// Purpose:     Process termination classes
-// Author:      Guilhem Lavaux
-// Modified by: Vadim Zeitlin to check error codes, added Detach() method
-// Created:     24/06/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/process.h"
-
-// ----------------------------------------------------------------------------
-// event tables and such
-// ----------------------------------------------------------------------------
-
-wxDEFINE_EVENT( wxEVT_END_PROCESS, wxProcessEvent );
-
-IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
-
-// ============================================================================
-// wxProcess implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxProcess creation
-// ----------------------------------------------------------------------------
-
-void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
-{
-    if ( parent )
-        SetNextHandler(parent);
-
-    m_id         = id;
-    m_pid        = 0;
-    m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;
-
-#if wxUSE_STREAMS
-    m_inputStream  = NULL;
-    m_errorStream  = NULL;
-    m_outputStream = NULL;
-#endif // wxUSE_STREAMS
-}
-
-/* static */
-wxProcess *wxProcess::Open(const wxString& cmd, int flags)
-{
-    wxASSERT_MSG( !(flags & wxEXEC_SYNC), wxT("wxEXEC_SYNC should not be used." ));
-    wxProcess *process = new wxProcess(wxPROCESS_REDIRECT);
-    long pid = wxExecute(cmd, flags, process);
-    if( !pid )
-    {
-        // couldn't launch the process
-        delete process;
-        return NULL;
-    }
-
-    process->SetPid(pid);
-
-    return process;
-}
-
-// ----------------------------------------------------------------------------
-// wxProcess termination
-// ----------------------------------------------------------------------------
-
-wxProcess::~wxProcess()
-{
-#if wxUSE_STREAMS
-    delete m_inputStream;
-    delete m_errorStream;
-    delete m_outputStream;
-#endif // wxUSE_STREAMS
-}
-
-void wxProcess::OnTerminate(int pid, int status)
-{
-    wxProcessEvent event(m_id, pid, status);
-
-    if ( !ProcessEvent(event) )
-        delete this;
-    //else: the object which processed the event is responsible for deleting
-    //      us!
-}
-
-void wxProcess::Detach()
-{
-    // we just detach from the next handler of the chain (i.e. our "parent" -- see ctor)
-    // not also from the previous handler like wxEvtHandler::Unlink() would do:
-
-    if (m_nextHandler)
-        m_nextHandler->SetPreviousHandler(m_previousHandler);
-
-    m_nextHandler = NULL;
-}
-
-// ----------------------------------------------------------------------------
-// process IO redirection
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STREAMS
-
-void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
-                               wxOutputStream *outputStream,
-                               wxInputStream *errorStream)
-{
-    m_inputStream  = inputSstream;
-    m_errorStream  = errorStream;
-    m_outputStream = outputStream;
-}
-
-bool wxProcess::IsInputOpened() const
-{
-    return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF;
-}
-
-bool wxProcess::IsInputAvailable() const
-{
-    return m_inputStream && m_inputStream->CanRead();
-}
-
-bool wxProcess::IsErrorAvailable() const
-{
-    return m_errorStream && m_errorStream->CanRead();
-}
-
-#endif // wxUSE_STREAMS
-
-// ----------------------------------------------------------------------------
-// process killing
-// ----------------------------------------------------------------------------
-
-/* static */
-wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags)
-{
-    wxKillError rc;
-    (void)wxKill(pid, sig, &rc, flags);
-
-    return rc;
-}
-
-/* static */
-bool wxProcess::Exists(int pid)
-{
-    switch ( Kill(pid, wxSIGNONE) )
-    {
-        case wxKILL_OK:
-        case wxKILL_ACCESS_DENIED:
-            return true;
-
-        default:
-        case wxKILL_ERROR:
-        case wxKILL_BAD_SIGNAL:
-            wxFAIL_MSG( wxT("unexpected wxProcess::Kill() return code") );
-            // fall through
-
-        case wxKILL_NO_PROCESS:
-            return false;
-    }
-}
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        process.cpp
+// Purpose:     Process termination classes
+// Author:      Guilhem Lavaux
+// Modified by: Vadim Zeitlin to check error codes, added Detach() method
+// Created:     24/06/98
+// RCS-ID:      $Id: process.cpp 42702 2006-10-30 09:03:18Z JS $
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/process.h"
+
+// ----------------------------------------------------------------------------
+// event tables and such
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_END_PROCESS)
+
+IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
+
+// ============================================================================
+// wxProcess implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxProcess creation
+// ----------------------------------------------------------------------------
+
+void wxProcess::Init(wxEvtHandler *parent, int id, int flags)
+{
+    if ( parent )
+        SetNextHandler(parent);
+
+    m_id         = id;
+    m_pid        = 0;
+    m_redirect   = (flags & wxPROCESS_REDIRECT) != 0;
+
+#if wxUSE_STREAMS
+    m_inputStream  = NULL;
+    m_errorStream  = NULL;
+    m_outputStream = NULL;
+#endif // wxUSE_STREAMS
+}
+
+/* static */
+wxProcess *wxProcess::Open(const wxString& cmd, int flags)
+{
+    wxASSERT_MSG( !(flags & wxEXEC_SYNC), wxT("wxEXEC_SYNC should not be used." ));
+    wxProcess *process = new wxProcess(wxPROCESS_REDIRECT);
+    long pid = wxExecute(cmd, flags, process);
+    if( !pid )
+    {
+        // couldn't launch the process
+        delete process;
+        return NULL;
+    }
+
+    process->SetPid(pid);
+
+    return process;
+}
+
+// ----------------------------------------------------------------------------
+// wxProcess termination
+// ----------------------------------------------------------------------------
+
+wxProcess::~wxProcess()
+{
+#if wxUSE_STREAMS
+    delete m_inputStream;
+    delete m_errorStream;
+    delete m_outputStream;
+#endif // wxUSE_STREAMS
+}
+
+void wxProcess::OnTerminate(int pid, int status)
+{
+    wxProcessEvent event(m_id, pid, status);
+
+    if ( !ProcessEvent(event) )
+        delete this;
+    //else: the object which processed the event is responsible for deleting
+    //      us!
+}
+
+void wxProcess::Detach()
+{
+    SetNextHandler(NULL);
+}
+
+// ----------------------------------------------------------------------------
+// process IO redirection
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STREAMS
+
+void wxProcess::SetPipeStreams(wxInputStream *inputSstream,
+                               wxOutputStream *outputStream,
+                               wxInputStream *errorStream)
+{
+    m_inputStream  = inputSstream;
+    m_errorStream  = errorStream;
+    m_outputStream = outputStream;
+}
+
+bool wxProcess::IsInputOpened() const
+{
+    return m_inputStream && m_inputStream->GetLastError() != wxSTREAM_EOF;
+}
+
+bool wxProcess::IsInputAvailable() const
+{
+    return m_inputStream && m_inputStream->CanRead();
+}
+
+bool wxProcess::IsErrorAvailable() const
+{
+    return m_errorStream && m_errorStream->CanRead();
+}
+
+#endif // wxUSE_STREAMS
+
+// ----------------------------------------------------------------------------
+// process killing
+// ----------------------------------------------------------------------------
+
+/* static */
+wxKillError wxProcess::Kill(int pid, wxSignal sig, int flags)
+{
+    wxKillError rc;
+    (void)wxKill(pid, sig, &rc, flags);
+
+    return rc;
+}
+
+/* static */
+bool wxProcess::Exists(int pid)
+{
+    switch ( Kill(pid, wxSIGNONE) )
+    {
+        case wxKILL_OK:
+        case wxKILL_ACCESS_DENIED:
+            return true;
+
+        default:
+        case wxKILL_ERROR:
+        case wxKILL_BAD_SIGNAL:
+            wxFAIL_MSG( _T("unexpected wxProcess::Kill() return code") );
+            // fall through
+
+        case wxKILL_NO_PROCESS:
+            return false;
+    }
+}
+
diff --git a/Source/3rd Party/wx/src/common/quantize.cpp b/Source/3rd Party/wx/src/common/quantize.cpp
index adcf40e8c..7ffa7b19a 100644
--- a/Source/3rd Party/wx/src/common/quantize.cpp	
+++ b/Source/3rd Party/wx/src/common/quantize.cpp	
@@ -1,1656 +1,1654 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/quantize.cpp
-// Purpose:     wxQuantize implementation
-// Author:      Julian Smart
-// Modified by:
-// Created:     22/6/2000
-// RCS-ID:      $Id$
-// Copyright:   (c) Thomas G. Lane, Vaclav Slavik, Julian Smart
-// Licence:     wxWindows licence + JPEG library licence
-/////////////////////////////////////////////////////////////////////////////
-
-/*
- * jquant2.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains 2-pass color quantization (color mapping) routines.
- * These routines provide selection of a custom color map for an image,
- * followed by mapping of the image to that color map, with optional
- * Floyd-Steinberg dithering.
- * It is also possible to use just the second pass to map to an arbitrary
- * externally-given color map.
- *
- * Note: ordered dithering is not supported, since there isn't any fast
- * way to compute intercolor distances; it's unclear that ordered dither's
- * fundamental assumptions even hold with an irregularly spaced color map.
- */
-
-/* modified by Vaclav Slavik for use as jpeglib-independent module */
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE
-
-#include "wx/quantize.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/palette.h"
-    #include "wx/image.h"
-#endif
-
-#ifdef __WXMSW__
-    #include "wx/msw/private.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(__OS2__)
-#define RGB_RED_OS2   0
-#define RGB_GREEN_OS2 1
-#define RGB_BLUE_OS2  2
-#else
-#define RGB_RED       0
-#define RGB_GREEN     1
-#define RGB_BLUE      2
-#endif
-#define RGB_PIXELSIZE 3
-
-#define MAXJSAMPLE        255
-#define CENTERJSAMPLE     128
-#define BITS_IN_JSAMPLE   8
-#define GETJSAMPLE(value) ((int) (value))
-
-#define RIGHT_SHIFT(x,shft) ((x) >> (shft))
-
-typedef unsigned short UINT16;
-typedef signed short INT16;
-#if !(defined(__WATCOMC__) && (defined(__WXMSW__) || defined(__WXMOTIF__)))
-typedef signed int INT32;
-#endif
-
-typedef unsigned char JSAMPLE;
-typedef JSAMPLE *JSAMPROW;
-typedef JSAMPROW *JSAMPARRAY;
-typedef unsigned int JDIMENSION;
-
-typedef struct {
-        void *cquantize;
-        JDIMENSION output_width;
-        JSAMPARRAY colormap;
-        int actual_number_of_colors;
-        int desired_number_of_colors;
-        JSAMPLE *sample_range_limit, *srl_orig;
-} j_decompress;
-
-#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
-    #define JMETHOD(type,methodname,arglist)  type (__cdecl methodname) arglist
-#else
-    #define JMETHOD(type,methodname,arglist)  type (methodname) arglist
-#endif
-
-typedef j_decompress *j_decompress_ptr;
-struct jpeg_color_quantizer {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, bool is_pre_scan));
-  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
-                 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
-                 int num_rows));
-  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
-};
-
-
-
-
-/*
- * This module implements the well-known Heckbert paradigm for color
- * quantization.  Most of the ideas used here can be traced back to
- * Heckbert's seminal paper
- *   Heckbert, Paul.  "Color Image Quantization for Frame Buffer Display",
- *   Proc. SIGGRAPH '82, Computer Graphics v.16 #3 (July 1982), pp 297-304.
- *
- * In the first pass over the image, we accumulate a histogram showing the
- * usage count of each possible color.  To keep the histogram to a reasonable
- * size, we reduce the precision of the input; typical practice is to retain
- * 5 or 6 bits per color, so that 8 or 4 different input values are counted
- * in the same histogram cell.
- *
- * Next, the color-selection step begins with a box representing the whole
- * color space, and repeatedly splits the "largest" remaining box until we
- * have as many boxes as desired colors.  Then the mean color in each
- * remaining box becomes one of the possible output colors.
- *
- * The second pass over the image maps each input pixel to the closest output
- * color (optionally after applying a Floyd-Steinberg dithering correction).
- * This mapping is logically trivial, but making it go fast enough requires
- * considerable care.
- *
- * Heckbert-style quantizers vary a good deal in their policies for choosing
- * the "largest" box and deciding where to cut it.  The particular policies
- * used here have proved out well in experimental comparisons, but better ones
- * may yet be found.
- *
- * In earlier versions of the IJG code, this module quantized in YCbCr color
- * space, processing the raw upsampled data without a color conversion step.
- * This allowed the color conversion math to be done only once per colormap
- * entry, not once per pixel.  However, that optimization precluded other
- * useful optimizations (such as merging color conversion with upsampling)
- * and it also interfered with desired capabilities such as quantizing to an
- * externally-supplied colormap.  We have therefore abandoned that approach.
- * The present code works in the post-conversion color space, typically RGB.
- *
- * To improve the visual quality of the results, we actually work in scaled
- * RGB space, giving G distances more weight than R, and R in turn more than
- * B.  To do everything in integer math, we must use integer scale factors.
- * The 2/3/1 scale factors used here correspond loosely to the relative
- * weights of the colors in the NTSC grayscale equation.
- * If you want to use this code to quantize a non-RGB color space, you'll
- * probably need to change these scale factors.
- */
-
-#define R_SCALE 2       /* scale R distances by this much */
-#define G_SCALE 3       /* scale G distances by this much */
-#define B_SCALE 1       /* and B by this much */
-
-/* Relabel R/G/B as components 0/1/2, respecting the RGB ordering defined
- * in jmorecfg.h.  As the code stands, it will do the right thing for R,G,B
- * and B,G,R orders.  If you define some other weird order in jmorecfg.h,
- * you'll get compile errors until you extend this logic.  In that case
- * you'll probably want to tweak the histogram sizes too.
- */
-
-#if defined(__OS2__)
-
-#if RGB_RED_OS2 == 0
-#define C0_SCALE R_SCALE
-#endif
-#if RGB_BLUE_OS2 == 0
-#define C0_SCALE B_SCALE
-#endif
-#if RGB_GREEN_OS2 == 1
-#define C1_SCALE G_SCALE
-#endif
-#if RGB_RED_OS2 == 2
-#define C2_SCALE R_SCALE
-#endif
-#if RGB_BLUE_OS2 == 2
-#define C2_SCALE B_SCALE
-#endif
-
-#else
-
-#if RGB_RED == 0
-#define C0_SCALE R_SCALE
-#endif
-#if RGB_BLUE == 0
-#define C0_SCALE B_SCALE
-#endif
-#if RGB_GREEN == 1
-#define C1_SCALE G_SCALE
-#endif
-#if RGB_RED == 2
-#define C2_SCALE R_SCALE
-#endif
-#if RGB_BLUE == 2
-#define C2_SCALE B_SCALE
-#endif
-
-#endif
-
-/*
- * First we have the histogram data structure and routines for creating it.
- *
- * The number of bits of precision can be adjusted by changing these symbols.
- * We recommend keeping 6 bits for G and 5 each for R and B.
- * If you have plenty of memory and cycles, 6 bits all around gives marginally
- * better results; if you are short of memory, 5 bits all around will save
- * some space but degrade the results.
- * To maintain a fully accurate histogram, we'd need to allocate a "long"
- * (preferably unsigned long) for each cell.  In practice this is overkill;
- * we can get by with 16 bits per cell.  Few of the cell counts will overflow,
- * and clamping those that do overflow to the maximum value will give close-
- * enough results.  This reduces the recommended histogram size from 256Kb
- * to 128Kb, which is a useful savings on PC-class machines.
- * (In the second pass the histogram space is re-used for pixel mapping data;
- * in that capacity, each cell must be able to store zero to the number of
- * desired colors.  16 bits/cell is plenty for that too.)
- * Since the JPEG code is intended to run in small memory model on 80x86
- * machines, we can't just allocate the histogram in one chunk.  Instead
- * of a true 3-D array, we use a row of pointers to 2-D arrays.  Each
- * pointer corresponds to a C0 value (typically 2^5 = 32 pointers) and
- * each 2-D array has 2^6*2^5 = 2048 or 2^6*2^6 = 4096 entries.  Note that
- * on 80x86 machines, the pointer row is in near memory but the actual
- * arrays are in far memory (same arrangement as we use for image arrays).
- */
-
-#define MAXNUMCOLORS  (MAXJSAMPLE+1) /* maximum size of colormap */
-
-/* These will do the right thing for either R,G,B or B,G,R color order,
- * but you may not like the results for other color orders.
- */
-#define HIST_C0_BITS  5     /* bits of precision in R/B histogram */
-#define HIST_C1_BITS  6     /* bits of precision in G histogram */
-#define HIST_C2_BITS  5     /* bits of precision in B/R histogram */
-
-/* Number of elements along histogram axes. */
-#define HIST_C0_ELEMS  (1<<HIST_C0_BITS)
-#define HIST_C1_ELEMS  (1<<HIST_C1_BITS)
-#define HIST_C2_ELEMS  (1<<HIST_C2_BITS)
-
-/* These are the amounts to shift an input value to get a histogram index. */
-#define C0_SHIFT  (BITS_IN_JSAMPLE-HIST_C0_BITS)
-#define C1_SHIFT  (BITS_IN_JSAMPLE-HIST_C1_BITS)
-#define C2_SHIFT  (BITS_IN_JSAMPLE-HIST_C2_BITS)
-
-
-typedef UINT16 histcell;    /* histogram cell; prefer an unsigned type */
-
-typedef histcell  * histptr;    /* for pointers to histogram cells */
-
-typedef histcell hist1d[HIST_C2_ELEMS]; /* typedefs for the array */
-typedef hist1d  * hist2d;   /* type for the 2nd-level pointers */
-typedef hist2d * hist3d;    /* type for top-level pointer */
-
-
-/* Declarations for Floyd-Steinberg dithering.
- *
- * Errors are accumulated into the array fserrors[], at a resolution of
- * 1/16th of a pixel count.  The error at a given pixel is propagated
- * to its not-yet-processed neighbors using the standard F-S fractions,
- *      ... (here)  7/16
- *      3/16    5/16    1/16
- * We work left-to-right on even rows, right-to-left on odd rows.
- *
- * We can get away with a single array (holding one row's worth of errors)
- * by using it to store the current row's errors at pixel columns not yet
- * processed, but the next row's errors at columns already processed.  We
- * need only a few extra variables to hold the errors immediately around the
- * current column.  (If we are lucky, those variables are in registers, but
- * even if not, they're probably cheaper to access than array elements are.)
- *
- * The fserrors[] array has (#columns + 2) entries; the extra entry at
- * each end saves us from special-casing the first and last pixels.
- * Each entry is three values long, one value for each color component.
- *
- * Note: on a wide image, we might not have enough room in a PC's near data
- * segment to hold the error array; so it is allocated with alloc_large.
- */
-
-#if BITS_IN_JSAMPLE == 8
-typedef INT16 FSERROR;      /* 16 bits should be enough */
-typedef int LOCFSERROR;     /* use 'int' for calculation temps */
-#else
-typedef INT32 FSERROR;      /* may need more than 16 bits */
-typedef INT32 LOCFSERROR;   /* be sure calculation temps are big enough */
-#endif
-
-typedef FSERROR  *FSERRPTR; /* pointer to error array (in  storage!) */
-
-
-/* Private subobject */
-
-typedef struct {
-
-   struct {
-       void (*finish_pass)(j_decompress_ptr);
-       void (*color_quantize)(j_decompress_ptr, JSAMPARRAY, JSAMPARRAY, int);
-       void (*start_pass)(j_decompress_ptr, bool);
-       void (*new_color_map)(j_decompress_ptr);
-   } pub;
-
-  /* Space for the eventually created colormap is stashed here */
-  JSAMPARRAY sv_colormap;   /* colormap allocated at init time */
-  int desired;          /* desired # of colors = size of colormap */
-
-  /* Variables for accumulating image statistics */
-  hist3d histogram;     /* pointer to the histogram */
-
-  bool needs_zeroed;        /* true if next pass must zero histogram */
-
-  /* Variables for Floyd-Steinberg dithering */
-  FSERRPTR fserrors;        /* accumulated errors */
-  bool on_odd_row;      /* flag to remember which row we are on */
-  int * error_limiter;      /* table for clamping the applied error */
-} my_cquantizer;
-
-typedef my_cquantizer * my_cquantize_ptr;
-
-
-/*
- * Prescan some rows of pixels.
- * In this module the prescan simply updates the histogram, which has been
- * initialized to zeroes by start_pass.
- * An output_buf parameter is required by the method signature, but no data
- * is actually output (in fact the buffer controller is probably passing a
- * NULL pointer).
- */
-
-void
-prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-          JSAMPARRAY WXUNUSED(output_buf), int num_rows)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register JSAMPROW ptr;
-  register histptr histp;
-  register hist3d histogram = cquantize->histogram;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    ptr = input_buf[row];
-    for (col = width; col > 0; col--) {
-
-      {
-
-          /* get pixel value and index into the histogram */
-          histp = & histogram[GETJSAMPLE(ptr[0]) >> C0_SHIFT]
-                 [GETJSAMPLE(ptr[1]) >> C1_SHIFT]
-                 [GETJSAMPLE(ptr[2]) >> C2_SHIFT];
-          /* increment, check for overflow and undo increment if so. */
-          if (++(*histp) <= 0)
-            (*histp)--;
-      }
-      ptr += 3;
-    }
-  }
-}
-
-
-/*
- * Next we have the really interesting routines: selection of a colormap
- * given the completed histogram.
- * These routines work with a list of "boxes", each representing a rectangular
- * subset of the input color space (to histogram precision).
- */
-
-typedef struct {
-  /* The bounds of the box (inclusive); expressed as histogram indexes */
-  int c0min, c0max;
-  int c1min, c1max;
-  int c2min, c2max;
-  /* The volume (actually 2-norm) of the box */
-  INT32 volume;
-  /* The number of nonzero histogram cells within this box */
-  long colorcount;
-} box;
-
-typedef box * boxptr;
-
-
-boxptr
-find_biggest_color_pop (boxptr boxlist, int numboxes)
-/* Find the splittable box with the largest color population */
-/* Returns NULL if no splittable boxes remain */
-{
-  register boxptr boxp;
-  register int i;
-  register long maxc = 0;
-  boxptr which = NULL;
-
-  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
-    if (boxp->colorcount > maxc && boxp->volume > 0) {
-      which = boxp;
-      maxc = boxp->colorcount;
-    }
-  }
-  return which;
-}
-
-
-boxptr
-find_biggest_volume (boxptr boxlist, int numboxes)
-/* Find the splittable box with the largest (scaled) volume */
-/* Returns NULL if no splittable boxes remain */
-{
-  register boxptr boxp;
-  register int i;
-  register INT32 maxv = 0;
-  boxptr which = NULL;
-
-  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
-    if (boxp->volume > maxv) {
-      which = boxp;
-      maxv = boxp->volume;
-    }
-  }
-  return which;
-}
-
-
-void
-update_box (j_decompress_ptr cinfo, boxptr boxp)
-/* Shrink the min/max bounds of a box to enclose only nonzero elements, */
-/* and recompute its volume and population */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  histptr histp;
-  int c0,c1,c2;
-  int c0min,c0max,c1min,c1max,c2min,c2max;
-  INT32 dist0,dist1,dist2;
-  long ccount;
-
-  c0min = boxp->c0min;  c0max = boxp->c0max;
-  c1min = boxp->c1min;  c1max = boxp->c1max;
-  c2min = boxp->c2min;  c2max = boxp->c2max;
-
-  if (c0max > c0min)
-    for (c0 = c0min; c0 <= c0max; c0++)
-      for (c1 = c1min; c1 <= c1max; c1++) {
-    histp = & histogram[c0][c1][c2min];
-    for (c2 = c2min; c2 <= c2max; c2++)
-      if (*histp++ != 0) {
-        boxp->c0min = c0min = c0;
-        goto have_c0min;
-      }
-      }
- have_c0min:
-  if (c0max > c0min)
-    for (c0 = c0max; c0 >= c0min; c0--)
-      for (c1 = c1min; c1 <= c1max; c1++) {
-    histp = & histogram[c0][c1][c2min];
-    for (c2 = c2min; c2 <= c2max; c2++)
-      if (*histp++ != 0) {
-        boxp->c0max = c0max = c0;
-        goto have_c0max;
-      }
-      }
- have_c0max:
-  if (c1max > c1min)
-    for (c1 = c1min; c1 <= c1max; c1++)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-    histp = & histogram[c0][c1][c2min];
-    for (c2 = c2min; c2 <= c2max; c2++)
-      if (*histp++ != 0) {
-        boxp->c1min = c1min = c1;
-        goto have_c1min;
-      }
-      }
- have_c1min:
-  if (c1max > c1min)
-    for (c1 = c1max; c1 >= c1min; c1--)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-    histp = & histogram[c0][c1][c2min];
-    for (c2 = c2min; c2 <= c2max; c2++)
-      if (*histp++ != 0) {
-        boxp->c1max = c1max = c1;
-        goto have_c1max;
-      }
-      }
- have_c1max:
-  if (c2max > c2min)
-    for (c2 = c2min; c2 <= c2max; c2++)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-    histp = & histogram[c0][c1min][c2];
-    for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
-      if (*histp != 0) {
-        boxp->c2min = c2min = c2;
-        goto have_c2min;
-      }
-      }
- have_c2min:
-  if (c2max > c2min)
-    for (c2 = c2max; c2 >= c2min; c2--)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-    histp = & histogram[c0][c1min][c2];
-    for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
-      if (*histp != 0) {
-        boxp->c2max = c2max = c2;
-        goto have_c2max;
-      }
-      }
- have_c2max:
-
-  /* Update box volume.
-   * We use 2-norm rather than real volume here; this biases the method
-   * against making long narrow boxes, and it has the side benefit that
-   * a box is splittable iff norm > 0.
-   * Since the differences are expressed in histogram-cell units,
-   * we have to shift back to JSAMPLE units to get consistent distances;
-   * after which, we scale according to the selected distance scale factors.
-   */
-  dist0 = ((c0max - c0min) << C0_SHIFT) * C0_SCALE;
-  dist1 = ((c1max - c1min) << C1_SHIFT) * C1_SCALE;
-  dist2 = ((c2max - c2min) << C2_SHIFT) * C2_SCALE;
-  boxp->volume = dist0*dist0 + dist1*dist1 + dist2*dist2;
-
-  /* Now scan remaining volume of box and compute population */
-  ccount = 0;
-  for (c0 = c0min; c0 <= c0max; c0++)
-    for (c1 = c1min; c1 <= c1max; c1++) {
-      histp = & histogram[c0][c1][c2min];
-      for (c2 = c2min; c2 <= c2max; c2++, histp++)
-    if (*histp != 0) {
-      ccount++;
-    }
-    }
-  boxp->colorcount = ccount;
-}
-
-
-int
-median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,
-        int desired_colors)
-/* Repeatedly select and split the largest box until we have enough boxes */
-{
-  int n,lb;
-  int c0,c1,c2,cmax;
-  register boxptr b1,b2;
-
-  while (numboxes < desired_colors) {
-    /* Select box to split.
-     * Current algorithm: by population for first half, then by volume.
-     */
-    if ((numboxes*2) <= desired_colors) {
-      b1 = find_biggest_color_pop(boxlist, numboxes);
-    } else {
-      b1 = find_biggest_volume(boxlist, numboxes);
-    }
-    if (b1 == NULL)     /* no splittable boxes left! */
-      break;
-    b2 = &boxlist[numboxes];    /* where new box will go */
-    /* Copy the color bounds to the new box. */
-    b2->c0max = b1->c0max; b2->c1max = b1->c1max; b2->c2max = b1->c2max;
-    b2->c0min = b1->c0min; b2->c1min = b1->c1min; b2->c2min = b1->c2min;
-    /* Choose which axis to split the box on.
-     * Current algorithm: longest scaled axis.
-     * See notes in update_box about scaling distances.
-     */
-    c0 = ((b1->c0max - b1->c0min) << C0_SHIFT) * C0_SCALE;
-    c1 = ((b1->c1max - b1->c1min) << C1_SHIFT) * C1_SCALE;
-    c2 = ((b1->c2max - b1->c2min) << C2_SHIFT) * C2_SCALE;
-    /* We want to break any ties in favor of green, then red, blue last.
-     * This code does the right thing for R,G,B or B,G,R color orders only.
-     */
-#if defined(__VISAGECPP__)
-
-#if RGB_RED_OS2 == 0
-    cmax = c1; n = 1;
-    if (c0 > cmax) { cmax = c0; n = 0; }
-    if (c2 > cmax) { n = 2; }
-#else
-    cmax = c1; n = 1;
-    if (c2 > cmax) { cmax = c2; n = 2; }
-    if (c0 > cmax) { n = 0; }
-#endif
-
-#else
-
-#if RGB_RED == 0
-    cmax = c1; n = 1;
-    if (c0 > cmax) { cmax = c0; n = 0; }
-    if (c2 > cmax) { n = 2; }
-#else
-    cmax = c1; n = 1;
-    if (c2 > cmax) { cmax = c2; n = 2; }
-    if (c0 > cmax) { n = 0; }
-#endif
-
-#endif
-    /* Choose split point along selected axis, and update box bounds.
-     * Current algorithm: split at halfway point.
-     * (Since the box has been shrunk to minimum volume,
-     * any split will produce two nonempty subboxes.)
-     * Note that lb value is max for lower box, so must be < old max.
-     */
-    switch (n) {
-    case 0:
-      lb = (b1->c0max + b1->c0min) / 2;
-      b1->c0max = lb;
-      b2->c0min = lb+1;
-      break;
-    case 1:
-      lb = (b1->c1max + b1->c1min) / 2;
-      b1->c1max = lb;
-      b2->c1min = lb+1;
-      break;
-    case 2:
-      lb = (b1->c2max + b1->c2min) / 2;
-      b1->c2max = lb;
-      b2->c2min = lb+1;
-      break;
-    }
-    /* Update stats for boxes */
-    update_box(cinfo, b1);
-    update_box(cinfo, b2);
-    numboxes++;
-  }
-  return numboxes;
-}
-
-
-void
-compute_color (j_decompress_ptr cinfo, boxptr boxp, int icolor)
-/* Compute representative color for a box, put it in colormap[icolor] */
-{
-  /* Current algorithm: mean weighted by pixels (not colors) */
-  /* Note it is important to get the rounding correct! */
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  histptr histp;
-  int c0,c1,c2;
-  int c0min,c0max,c1min,c1max,c2min,c2max;
-  long count;
-  long total = 0;
-  long c0total = 0;
-  long c1total = 0;
-  long c2total = 0;
-
-  c0min = boxp->c0min;  c0max = boxp->c0max;
-  c1min = boxp->c1min;  c1max = boxp->c1max;
-  c2min = boxp->c2min;  c2max = boxp->c2max;
-
-  for (c0 = c0min; c0 <= c0max; c0++)
-    for (c1 = c1min; c1 <= c1max; c1++) {
-      histp = & histogram[c0][c1][c2min];
-      for (c2 = c2min; c2 <= c2max; c2++) {
-    if ((count = *histp++) != 0) {
-      total += count;
-      c0total += ((c0 << C0_SHIFT) + ((1<<C0_SHIFT)>>1)) * count;
-      c1total += ((c1 << C1_SHIFT) + ((1<<C1_SHIFT)>>1)) * count;
-      c2total += ((c2 << C2_SHIFT) + ((1<<C2_SHIFT)>>1)) * count;
-    }
-      }
-    }
-
-  cinfo->colormap[0][icolor] = (JSAMPLE) ((c0total + (total>>1)) / total);
-  cinfo->colormap[1][icolor] = (JSAMPLE) ((c1total + (total>>1)) / total);
-  cinfo->colormap[2][icolor] = (JSAMPLE) ((c2total + (total>>1)) / total);
-}
-
-
-static void
-select_colors (j_decompress_ptr cinfo, int desired_colors)
-/* Master routine for color selection */
-{
-  boxptr boxlist;
-  int numboxes;
-  int i;
-
-  /* Allocate workspace for box list */
-  boxlist = (boxptr) malloc(desired_colors * sizeof(box));
-  /* Initialize one box containing whole space */
-  numboxes = 1;
-  boxlist[0].c0min = 0;
-  boxlist[0].c0max = MAXJSAMPLE >> C0_SHIFT;
-  boxlist[0].c1min = 0;
-  boxlist[0].c1max = MAXJSAMPLE >> C1_SHIFT;
-  boxlist[0].c2min = 0;
-  boxlist[0].c2max = MAXJSAMPLE >> C2_SHIFT;
-  /* Shrink it to actually-used volume and set its statistics */
-  update_box(cinfo, & boxlist[0]);
-  /* Perform median-cut to produce final box list */
-  numboxes = median_cut(cinfo, boxlist, numboxes, desired_colors);
-  /* Compute the representative color for each box, fill colormap */
-  for (i = 0; i < numboxes; i++)
-    compute_color(cinfo, & boxlist[i], i);
-  cinfo->actual_number_of_colors = numboxes;
-
-  free(boxlist); //FIXME?? I don't know if this is correct - VS
-}
-
-
-/*
- * These routines are concerned with the time-critical task of mapping input
- * colors to the nearest color in the selected colormap.
- *
- * We re-use the histogram space as an "inverse color map", essentially a
- * cache for the results of nearest-color searches.  All colors within a
- * histogram cell will be mapped to the same colormap entry, namely the one
- * closest to the cell's center.  This may not be quite the closest entry to
- * the actual input color, but it's almost as good.  A zero in the cache
- * indicates we haven't found the nearest color for that cell yet; the array
- * is cleared to zeroes before starting the mapping pass.  When we find the
- * nearest color for a cell, its colormap index plus one is recorded in the
- * cache for future use.  The pass2 scanning routines call fill_inverse_cmap
- * when they need to use an unfilled entry in the cache.
- *
- * Our method of efficiently finding nearest colors is based on the "locally
- * sorted search" idea described by Heckbert and on the incremental distance
- * calculation described by Spencer W. Thomas in chapter III.1 of Graphics
- * Gems II (James Arvo, ed.  Academic Press, 1991).  Thomas points out that
- * the distances from a given colormap entry to each cell of the histogram can
- * be computed quickly using an incremental method: the differences between
- * distances to adjacent cells themselves differ by a constant.  This allows a
- * fairly fast implementation of the "brute force" approach of computing the
- * distance from every colormap entry to every histogram cell.  Unfortunately,
- * it needs a work array to hold the best-distance-so-far for each histogram
- * cell (because the inner loop has to be over cells, not colormap entries).
- * The work array elements have to be INT32s, so the work array would need
- * 256Kb at our recommended precision.  This is not feasible in DOS machines.
- *
- * To get around these problems, we apply Thomas' method to compute the
- * nearest colors for only the cells within a small subbox of the histogram.
- * The work array need be only as big as the subbox, so the memory usage
- * problem is solved.  Furthermore, we need not fill subboxes that are never
- * referenced in pass2; many images use only part of the color gamut, so a
- * fair amount of work is saved.  An additional advantage of this
- * approach is that we can apply Heckbert's locality criterion to quickly
- * eliminate colormap entries that are far away from the subbox; typically
- * three-fourths of the colormap entries are rejected by Heckbert's criterion,
- * and we need not compute their distances to individual cells in the subbox.
- * The speed of this approach is heavily influenced by the subbox size: too
- * small means too much overhead, too big loses because Heckbert's criterion
- * can't eliminate as many colormap entries.  Empirically the best subbox
- * size seems to be about 1/512th of the histogram (1/8th in each direction).
- *
- * Thomas' article also describes a refined method which is asymptotically
- * faster than the brute-force method, but it is also far more complex and
- * cannot efficiently be applied to small subboxes.  It is therefore not
- * useful for programs intended to be portable to DOS machines.  On machines
- * with plenty of memory, filling the whole histogram in one shot with Thomas'
- * refined method might be faster than the present code --- but then again,
- * it might not be any faster, and it's certainly more complicated.
- */
-
-
-/* log2(histogram cells in update box) for each axis; this can be adjusted */
-#define BOX_C0_LOG  (HIST_C0_BITS-3)
-#define BOX_C1_LOG  (HIST_C1_BITS-3)
-#define BOX_C2_LOG  (HIST_C2_BITS-3)
-
-#define BOX_C0_ELEMS  (1<<BOX_C0_LOG) /* # of hist cells in update box */
-#define BOX_C1_ELEMS  (1<<BOX_C1_LOG)
-#define BOX_C2_ELEMS  (1<<BOX_C2_LOG)
-
-#define BOX_C0_SHIFT  (C0_SHIFT + BOX_C0_LOG)
-#define BOX_C1_SHIFT  (C1_SHIFT + BOX_C1_LOG)
-#define BOX_C2_SHIFT  (C2_SHIFT + BOX_C2_LOG)
-
-
-/*
- * The next three routines implement inverse colormap filling.  They could
- * all be folded into one big routine, but splitting them up this way saves
- * some stack space (the mindist[] and bestdist[] arrays need not coexist)
- * and may allow some compilers to produce better code by registerizing more
- * inner-loop variables.
- */
-
-static int
-find_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
-            JSAMPLE colorlist[])
-/* Locate the colormap entries close enough to an update box to be candidates
- * for the nearest entry to some cell(s) in the update box.  The update box
- * is specified by the center coordinates of its first cell.  The number of
- * candidate colormap entries is returned, and their colormap indexes are
- * placed in colorlist[].
- * This routine uses Heckbert's "locally sorted search" criterion to select
- * the colors that need further consideration.
- */
-{
-  int numcolors = cinfo->actual_number_of_colors;
-  int maxc0, maxc1, maxc2;
-  int centerc0, centerc1, centerc2;
-  int i, x, ncolors;
-  INT32 minmaxdist, min_dist, max_dist, tdist;
-  INT32 mindist[MAXNUMCOLORS];  /* min distance to colormap entry i */
-
-  /* Compute true coordinates of update box's upper corner and center.
-   * Actually we compute the coordinates of the center of the upper-corner
-   * histogram cell, which are the upper bounds of the volume we care about.
-   * Note that since ">>" rounds down, the "center" values may be closer to
-   * min than to max; hence comparisons to them must be "<=", not "<".
-   */
-  maxc0 = minc0 + ((1 << BOX_C0_SHIFT) - (1 << C0_SHIFT));
-  centerc0 = (minc0 + maxc0) >> 1;
-  maxc1 = minc1 + ((1 << BOX_C1_SHIFT) - (1 << C1_SHIFT));
-  centerc1 = (minc1 + maxc1) >> 1;
-  maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT));
-  centerc2 = (minc2 + maxc2) >> 1;
-
-  /* For each color in colormap, find:
-   *  1. its minimum squared-distance to any point in the update box
-   *     (zero if color is within update box);
-   *  2. its maximum squared-distance to any point in the update box.
-   * Both of these can be found by considering only the corners of the box.
-   * We save the minimum distance for each color in mindist[];
-   * only the smallest maximum distance is of interest.
-   */
-  minmaxdist = 0x7FFFFFFFL;
-
-  for (i = 0; i < numcolors; i++) {
-    /* We compute the squared-c0-distance term, then add in the other two. */
-    x = GETJSAMPLE(cinfo->colormap[0][i]);
-    if (x < minc0) {
-      tdist = (x - minc0) * C0_SCALE;
-      min_dist = tdist*tdist;
-      tdist = (x - maxc0) * C0_SCALE;
-      max_dist = tdist*tdist;
-    } else if (x > maxc0) {
-      tdist = (x - maxc0) * C0_SCALE;
-      min_dist = tdist*tdist;
-      tdist = (x - minc0) * C0_SCALE;
-      max_dist = tdist*tdist;
-    } else {
-      /* within cell range so no contribution to min_dist */
-      min_dist = 0;
-      if (x <= centerc0) {
-    tdist = (x - maxc0) * C0_SCALE;
-    max_dist = tdist*tdist;
-      } else {
-    tdist = (x - minc0) * C0_SCALE;
-    max_dist = tdist*tdist;
-      }
-    }
-
-    x = GETJSAMPLE(cinfo->colormap[1][i]);
-    if (x < minc1) {
-      tdist = (x - minc1) * C1_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - maxc1) * C1_SCALE;
-      max_dist += tdist*tdist;
-    } else if (x > maxc1) {
-      tdist = (x - maxc1) * C1_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - minc1) * C1_SCALE;
-      max_dist += tdist*tdist;
-    } else {
-      /* within cell range so no contribution to min_dist */
-      if (x <= centerc1) {
-    tdist = (x - maxc1) * C1_SCALE;
-    max_dist += tdist*tdist;
-      } else {
-    tdist = (x - minc1) * C1_SCALE;
-    max_dist += tdist*tdist;
-      }
-    }
-
-    x = GETJSAMPLE(cinfo->colormap[2][i]);
-    if (x < minc2) {
-      tdist = (x - minc2) * C2_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - maxc2) * C2_SCALE;
-      max_dist += tdist*tdist;
-    } else if (x > maxc2) {
-      tdist = (x - maxc2) * C2_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - minc2) * C2_SCALE;
-      max_dist += tdist*tdist;
-    } else {
-      /* within cell range so no contribution to min_dist */
-      if (x <= centerc2) {
-    tdist = (x - maxc2) * C2_SCALE;
-    max_dist += tdist*tdist;
-      } else {
-    tdist = (x - minc2) * C2_SCALE;
-    max_dist += tdist*tdist;
-      }
-    }
-
-    mindist[i] = min_dist;  /* save away the results */
-    if (max_dist < minmaxdist)
-      minmaxdist = max_dist;
-  }
-
-  /* Now we know that no cell in the update box is more than minmaxdist
-   * away from some colormap entry.  Therefore, only colors that are
-   * within minmaxdist of some part of the box need be considered.
-   */
-  ncolors = 0;
-  for (i = 0; i < numcolors; i++) {
-    if (mindist[i] <= minmaxdist)
-      colorlist[ncolors++] = (JSAMPLE) i;
-  }
-  return ncolors;
-}
-
-
-static void
-find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
-          int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[])
-/* Find the closest colormap entry for each cell in the update box,
- * given the list of candidate colors prepared by find_nearby_colors.
- * Return the indexes of the closest entries in the bestcolor[] array.
- * This routine uses Thomas' incremental distance calculation method to
- * find the distance from a colormap entry to successive cells in the box.
- */
-{
-  int ic0, ic1, ic2;
-  int i, icolor;
-  register INT32 * bptr;    /* pointer into bestdist[] array */
-  JSAMPLE * cptr;       /* pointer into bestcolor[] array */
-  INT32 dist0, dist1;       /* initial distance values */
-  register INT32 dist2;     /* current distance in inner loop */
-  INT32 xx0, xx1;       /* distance increments */
-  register INT32 xx2;
-  INT32 inc0, inc1, inc2;   /* initial values for increments */
-  /* This array holds the distance to the nearest-so-far color for each cell */
-  INT32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
-
-  /* Initialize best-distance for each cell of the update box */
-  bptr = bestdist;
-  for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--)
-    *bptr++ = 0x7FFFFFFFL;
-
-  /* For each color selected by find_nearby_colors,
-   * compute its distance to the center of each cell in the box.
-   * If that's less than best-so-far, update best distance and color number.
-   */
-
-  /* Nominal steps between cell centers ("x" in Thomas article) */
-#define STEP_C0  ((1 << C0_SHIFT) * C0_SCALE)
-#define STEP_C1  ((1 << C1_SHIFT) * C1_SCALE)
-#define STEP_C2  ((1 << C2_SHIFT) * C2_SCALE)
-
-  for (i = 0; i < numcolors; i++) {
-    icolor = GETJSAMPLE(colorlist[i]);
-    /* Compute (square of) distance from minc0/c1/c2 to this color */
-    inc0 = (minc0 - GETJSAMPLE(cinfo->colormap[0][icolor])) * C0_SCALE;
-    dist0 = inc0*inc0;
-    inc1 = (minc1 - GETJSAMPLE(cinfo->colormap[1][icolor])) * C1_SCALE;
-    dist0 += inc1*inc1;
-    inc2 = (minc2 - GETJSAMPLE(cinfo->colormap[2][icolor])) * C2_SCALE;
-    dist0 += inc2*inc2;
-    /* Form the initial difference increments */
-    inc0 = inc0 * (2 * STEP_C0) + STEP_C0 * STEP_C0;
-    inc1 = inc1 * (2 * STEP_C1) + STEP_C1 * STEP_C1;
-    inc2 = inc2 * (2 * STEP_C2) + STEP_C2 * STEP_C2;
-    /* Now loop over all cells in box, updating distance per Thomas method */
-    bptr = bestdist;
-    cptr = bestcolor;
-    xx0 = inc0;
-    for (ic0 = BOX_C0_ELEMS-1; ic0 >= 0; ic0--) {
-      dist1 = dist0;
-      xx1 = inc1;
-      for (ic1 = BOX_C1_ELEMS-1; ic1 >= 0; ic1--) {
-    dist2 = dist1;
-    xx2 = inc2;
-    for (ic2 = BOX_C2_ELEMS-1; ic2 >= 0; ic2--) {
-      if (dist2 < *bptr) {
-        *bptr = dist2;
-        *cptr = (JSAMPLE) icolor;
-      }
-      dist2 += xx2;
-      xx2 += 2 * STEP_C2 * STEP_C2;
-      bptr++;
-      cptr++;
-    }
-    dist1 += xx1;
-    xx1 += 2 * STEP_C1 * STEP_C1;
-      }
-      dist0 += xx0;
-      xx0 += 2 * STEP_C0 * STEP_C0;
-    }
-  }
-}
-
-
-static void
-fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2)
-/* Fill the inverse-colormap entries in the update box that contains */
-/* histogram cell c0/c1/c2.  (Only that one cell MUST be filled, but */
-/* we can fill as many others as we wish.) */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  int minc0, minc1, minc2;  /* lower left corner of update box */
-  int ic0, ic1, ic2;
-  register JSAMPLE * cptr;  /* pointer into bestcolor[] array */
-  register histptr cachep;  /* pointer into main cache array */
-  /* This array lists the candidate colormap indexes. */
-  JSAMPLE colorlist[MAXNUMCOLORS];
-  int numcolors;        /* number of candidate colors */
-  /* This array holds the actually closest colormap index for each cell. */
-  JSAMPLE bestcolor[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
-
-  /* Convert cell coordinates to update box ID */
-  c0 >>= BOX_C0_LOG;
-  c1 >>= BOX_C1_LOG;
-  c2 >>= BOX_C2_LOG;
-
-  /* Compute true coordinates of update box's origin corner.
-   * Actually we compute the coordinates of the center of the corner
-   * histogram cell, which are the lower bounds of the volume we care about.
-   */
-  minc0 = (c0 << BOX_C0_SHIFT) + ((1 << C0_SHIFT) >> 1);
-  minc1 = (c1 << BOX_C1_SHIFT) + ((1 << C1_SHIFT) >> 1);
-  minc2 = (c2 << BOX_C2_SHIFT) + ((1 << C2_SHIFT) >> 1);
-
-  /* Determine which colormap entries are close enough to be candidates
-   * for the nearest entry to some cell in the update box.
-   */
-  numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist);
-
-  /* Determine the actually nearest colors. */
-  find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist,
-           bestcolor);
-
-  /* Save the best color numbers (plus 1) in the main cache array */
-  c0 <<= BOX_C0_LOG;        /* convert ID back to base cell indexes */
-  c1 <<= BOX_C1_LOG;
-  c2 <<= BOX_C2_LOG;
-  cptr = bestcolor;
-  for (ic0 = 0; ic0 < BOX_C0_ELEMS; ic0++) {
-    for (ic1 = 0; ic1 < BOX_C1_ELEMS; ic1++) {
-      cachep = & histogram[c0+ic0][c1+ic1][c2];
-      for (ic2 = 0; ic2 < BOX_C2_ELEMS; ic2++) {
-    *cachep++ = (histcell) (GETJSAMPLE(*cptr++) + 1);
-      }
-    }
-  }
-}
-
-
-/*
- * Map some rows of pixels to the output colormapped representation.
- */
-
-void
-pass2_no_dither (j_decompress_ptr cinfo,
-         JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
-/* This version performs no dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  register JSAMPROW inptr, outptr;
-  register histptr cachep;
-  register int c0, c1, c2;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    inptr = input_buf[row];
-    outptr = output_buf[row];
-    for (col = width; col > 0; col--) {
-      /* get pixel value and index into the cache */
-      c0 = GETJSAMPLE(*inptr++) >> C0_SHIFT;
-      c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT;
-      c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT;
-      cachep = & histogram[c0][c1][c2];
-      /* If we have not seen this color before, find nearest colormap entry */
-      /* and update the cache */
-      if (*cachep == 0)
-    fill_inverse_cmap(cinfo, c0,c1,c2);
-      /* Now emit the colormap index for this cell */
-      *outptr++ = (JSAMPLE) (*cachep - 1);
-    }
-  }
-}
-
-
-void
-pass2_fs_dither (j_decompress_ptr cinfo,
-         JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
-/* This version performs Floyd-Steinberg dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  register LOCFSERROR cur0, cur1, cur2; /* current error or pixel value */
-  LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */
-  LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */
-  register FSERRPTR errorptr;   /* => fserrors[] at column before current */
-  JSAMPROW inptr;       /* => current input pixel */
-  JSAMPROW outptr;      /* => current output pixel */
-  histptr cachep;
-  int dir;          /* +1 or -1 depending on direction */
-  int dir3;         /* 3*dir, for advancing inptr & errorptr */
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-  JSAMPLE *range_limit = cinfo->sample_range_limit;
-  int *error_limit = cquantize->error_limiter;
-  JSAMPROW colormap0 = cinfo->colormap[0];
-  JSAMPROW colormap1 = cinfo->colormap[1];
-  JSAMPROW colormap2 = cinfo->colormap[2];
-
-
-  for (row = 0; row < num_rows; row++) {
-    inptr = input_buf[row];
-    outptr = output_buf[row];
-    if (cquantize->on_odd_row) {
-      /* work right to left in this row */
-      inptr += (width-1) * 3;   /* so point to rightmost pixel */
-      outptr += width-1;
-      dir = -1;
-      dir3 = -3;
-      errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */
-      cquantize->on_odd_row = false; /* flip for next time */
-    } else {
-      /* work left to right in this row */
-      dir = 1;
-      dir3 = 3;
-      errorptr = cquantize->fserrors; /* => entry before first real column */
-      cquantize->on_odd_row = true; /* flip for next time */
-    }
-    /* Preset error values: no error propagated to first pixel from left */
-    cur0 = cur1 = cur2 = 0;
-    /* and no error propagated to row below yet */
-    belowerr0 = belowerr1 = belowerr2 = 0;
-    bpreverr0 = bpreverr1 = bpreverr2 = 0;
-
-    for (col = width; col > 0; col--) {
-      /* curN holds the error propagated from the previous pixel on the
-       * current line.  Add the error propagated from the previous line
-       * to form the complete error correction term for this pixel, and
-       * round the error term (which is expressed * 16) to an integer.
-       * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
-       * for either sign of the error value.
-       * Note: errorptr points to *previous* column's array entry.
-       */
-      cur0 = RIGHT_SHIFT(cur0 + errorptr[dir3+0] + 8, 4);
-      cur1 = RIGHT_SHIFT(cur1 + errorptr[dir3+1] + 8, 4);
-      cur2 = RIGHT_SHIFT(cur2 + errorptr[dir3+2] + 8, 4);
-      /* Limit the error using transfer function set by init_error_limit.
-       * See comments with init_error_limit for rationale.
-       */
-      cur0 = error_limit[cur0];
-      cur1 = error_limit[cur1];
-      cur2 = error_limit[cur2];
-      /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
-       * The maximum error is +- MAXJSAMPLE (or less with error limiting);
-       * this sets the required size of the range_limit array.
-       */
-      cur0 += GETJSAMPLE(inptr[0]);
-      cur1 += GETJSAMPLE(inptr[1]);
-      cur2 += GETJSAMPLE(inptr[2]);
-      cur0 = GETJSAMPLE(range_limit[cur0]);
-      cur1 = GETJSAMPLE(range_limit[cur1]);
-      cur2 = GETJSAMPLE(range_limit[cur2]);
-      /* Index into the cache with adjusted pixel value */
-      cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT];
-      /* If we have not seen this color before, find nearest colormap */
-      /* entry and update the cache */
-      if (*cachep == 0)
-    fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT);
-      /* Now emit the colormap index for this cell */
-      { register int pixcode = *cachep - 1;
-    *outptr = (JSAMPLE) pixcode;
-    /* Compute representation error for this pixel */
-    cur0 -= GETJSAMPLE(colormap0[pixcode]);
-    cur1 -= GETJSAMPLE(colormap1[pixcode]);
-    cur2 -= GETJSAMPLE(colormap2[pixcode]);
-      }
-      /* Compute error fractions to be propagated to adjacent pixels.
-       * Add these into the running sums, and simultaneously shift the
-       * next-line error sums left by 1 column.
-       */
-      { register LOCFSERROR bnexterr, delta;
-
-    bnexterr = cur0;    /* Process component 0 */
-    delta = cur0 * 2;
-    cur0 += delta;      /* form error * 3 */
-    errorptr[0] = (FSERROR) (bpreverr0 + cur0);
-    cur0 += delta;      /* form error * 5 */
-    bpreverr0 = belowerr0 + cur0;
-    belowerr0 = bnexterr;
-    cur0 += delta;      /* form error * 7 */
-    bnexterr = cur1;    /* Process component 1 */
-    delta = cur1 * 2;
-    cur1 += delta;      /* form error * 3 */
-    errorptr[1] = (FSERROR) (bpreverr1 + cur1);
-    cur1 += delta;      /* form error * 5 */
-    bpreverr1 = belowerr1 + cur1;
-    belowerr1 = bnexterr;
-    cur1 += delta;      /* form error * 7 */
-    bnexterr = cur2;    /* Process component 2 */
-    delta = cur2 * 2;
-    cur2 += delta;      /* form error * 3 */
-    errorptr[2] = (FSERROR) (bpreverr2 + cur2);
-    cur2 += delta;      /* form error * 5 */
-    bpreverr2 = belowerr2 + cur2;
-    belowerr2 = bnexterr;
-    cur2 += delta;      /* form error * 7 */
-      }
-      /* At this point curN contains the 7/16 error value to be propagated
-       * to the next pixel on the current line, and all the errors for the
-       * next line have been shifted over.  We are therefore ready to move on.
-       */
-      inptr += dir3;        /* Advance pixel pointers to next column */
-      outptr += dir;
-      errorptr += dir3;     /* advance errorptr to current column */
-    }
-    /* Post-loop cleanup: we must unload the final error values into the
-     * final fserrors[] entry.  Note we need not unload belowerrN because
-     * it is for the dummy column before or after the actual array.
-     */
-    errorptr[0] = (FSERROR) bpreverr0; /* unload prev errs into array */
-    errorptr[1] = (FSERROR) bpreverr1;
-    errorptr[2] = (FSERROR) bpreverr2;
-  }
-}
-
-
-/*
- * Initialize the error-limiting transfer function (lookup table).
- * The raw F-S error computation can potentially compute error values of up to
- * +- MAXJSAMPLE.  But we want the maximum correction applied to a pixel to be
- * much less, otherwise obviously wrong pixels will be created.  (Typical
- * effects include weird fringes at color-area boundaries, isolated bright
- * pixels in a dark area, etc.)  The standard advice for avoiding this problem
- * is to ensure that the "corners" of the color cube are allocated as output
- * colors; then repeated errors in the same direction cannot cause cascading
- * error buildup.  However, that only prevents the error from getting
- * completely out of hand; Aaron Giles reports that error limiting improves
- * the results even with corner colors allocated.
- * A simple clamping of the error values to about +- MAXJSAMPLE/8 works pretty
- * well, but the smoother transfer function used below is even better.  Thanks
- * to Aaron Giles for this idea.
- */
-
-static void
-init_error_limit (j_decompress_ptr cinfo)
-/* Allocate and fill in the error_limiter table */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  int * table;
-  int in, out;
-
-  table = (int *) malloc((MAXJSAMPLE*2+1) * sizeof(int));
-  table += MAXJSAMPLE;      /* so can index -MAXJSAMPLE .. +MAXJSAMPLE */
-  cquantize->error_limiter = table;
-
-#define STEPSIZE ((MAXJSAMPLE+1)/16)
-  /* Map errors 1:1 up to +- MAXJSAMPLE/16 */
-  out = 0;
-  for (in = 0; in < STEPSIZE; in++, out++) {
-    table[in] = out; table[-in] = -out;
-  }
-  /* Map errors 1:2 up to +- 3*MAXJSAMPLE/16 */
-  for (; in < STEPSIZE*3; in++, out += (in&1) ? 0 : 1) {
-    table[in] = out; table[-in] = -out;
-  }
-  /* Clamp the rest to final out value (which is (MAXJSAMPLE+1)/8) */
-  for (; in <= MAXJSAMPLE; in++) {
-    table[in] = out; table[-in] = -out;
-  }
-#undef STEPSIZE
-}
-
-
-/*
- * Finish up at the end of each pass.
- */
-
-void
-finish_pass1 (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-
-  /* Select the representative colors and fill in cinfo->colormap */
-  cinfo->colormap = cquantize->sv_colormap;
-  select_colors(cinfo, cquantize->desired);
-  /* Force next pass to zero the color index table */
-  cquantize->needs_zeroed = true;
-}
-
-
-void
-finish_pass2 (j_decompress_ptr WXUNUSED(cinfo))
-{
-  /* no work */
-}
-
-
-/*
- * Initialize for each processing pass.
- */
-
-void
-start_pass_2_quant (j_decompress_ptr cinfo, bool is_pre_scan)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-
-  if (is_pre_scan) {
-    /* Set up method pointers */
-    cquantize->pub.color_quantize = prescan_quantize;
-    cquantize->pub.finish_pass = finish_pass1;
-    cquantize->needs_zeroed = true; /* Always zero histogram */
-  } else {
-    /* Set up method pointers */
-    cquantize->pub.color_quantize = pass2_fs_dither;
-    cquantize->pub.finish_pass = finish_pass2;
-
-    {
-      size_t arraysize = (size_t) ((cinfo->output_width + 2) *
-                   (3 * sizeof(FSERROR)));
-      /* Allocate Floyd-Steinberg workspace if we didn't already. */
-      if (cquantize->fserrors == NULL)
-    cquantize->fserrors = (INT16*) malloc(arraysize);
-      /* Initialize the propagated errors to zero. */
-      memset((void  *) cquantize->fserrors, 0, arraysize);
-      /* Make the error-limit table if we didn't already. */
-      if (cquantize->error_limiter == NULL)
-    init_error_limit(cinfo);
-      cquantize->on_odd_row = false;
-    }
-
-  }
-  /* Zero the histogram or inverse color map, if necessary */
-  if (cquantize->needs_zeroed) {
-    for (int i = 0; i < HIST_C0_ELEMS; i++) {
-      memset((void  *) histogram[i], 0,
-        HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
-    }
-    cquantize->needs_zeroed = false;
-  }
-}
-
-
-/*
- * Switch to a new external colormap between output passes.
- */
-
-void
-new_color_map_2_quant (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-
-  /* Reset the inverse color map */
-  cquantize->needs_zeroed = true;
-}
-
-
-/*
- * Module initialization routine for 2-pass color quantization.
- */
-
-void
-jinit_2pass_quantizer (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize;
-  int i;
-
-  cquantize = (my_cquantize_ptr) malloc(sizeof(my_cquantizer));
-  cinfo->cquantize = (jpeg_color_quantizer *) cquantize;
-  cquantize->pub.start_pass = start_pass_2_quant;
-  cquantize->pub.new_color_map = new_color_map_2_quant;
-  cquantize->fserrors = NULL;   /* flag optional arrays not allocated */
-  cquantize->error_limiter = NULL;
-
-
-  /* Allocate the histogram/inverse colormap storage */
-  cquantize->histogram = (hist3d) malloc(HIST_C0_ELEMS * sizeof(hist2d));
-  for (i = 0; i < HIST_C0_ELEMS; i++) {
-    cquantize->histogram[i] = (hist2d) malloc(HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
-  }
-  cquantize->needs_zeroed = true; /* histogram is garbage now */
-
-  /* Allocate storage for the completed colormap, if required.
-   * We do this now since it is  storage and may affect
-   * the memory manager's space calculations.
-   */
-  {
-    /* Make sure color count is acceptable */
-    int desired = cinfo->desired_number_of_colors;
-
-    cquantize->sv_colormap = (JSAMPARRAY) malloc(sizeof(JSAMPROW) * 3);
-    cquantize->sv_colormap[0] = (JSAMPROW) malloc(sizeof(JSAMPLE) * desired);
-    cquantize->sv_colormap[1] = (JSAMPROW) malloc(sizeof(JSAMPLE) * desired);
-    cquantize->sv_colormap[2] = (JSAMPROW) malloc(sizeof(JSAMPLE) * desired);
-
-    cquantize->desired = desired;
-  }
-
-  /* Allocate Floyd-Steinberg workspace if necessary.
-   * This isn't really needed until pass 2, but again it is  storage.
-   * Although we will cope with a later change in dither_mode,
-   * we do not promise to honor max_memory_to_use if dither_mode changes.
-   */
-  {
-    cquantize->fserrors = (FSERRPTR) malloc(
-       (size_t) ((cinfo->output_width + 2) * (3 * sizeof(FSERROR))));
-    /* Might as well create the error-limiting table too. */
-    init_error_limit(cinfo);
-  }
-}
-
-
-
-
-
-
-
-
-
-
-void
-prepare_range_limit_table (j_decompress_ptr cinfo)
-/* Allocate and fill in the sample_range_limit table */
-{
-  JSAMPLE * table;
-  int i;
-
-  table = (JSAMPLE *) malloc((5 * (MAXJSAMPLE+1) + CENTERJSAMPLE) * sizeof(JSAMPLE));
-  cinfo->srl_orig = table;
-  table += (MAXJSAMPLE+1);  /* allow negative subscripts of simple table */
-  cinfo->sample_range_limit = table;
-  /* First segment of "simple" table: limit[x] = 0 for x < 0 */
-  memset(table - (MAXJSAMPLE+1), 0, (MAXJSAMPLE+1) * sizeof(JSAMPLE));
-  /* Main part of "simple" table: limit[x] = x */
-  for (i = 0; i <= MAXJSAMPLE; i++)
-    table[i] = (JSAMPLE) i;
-  table += CENTERJSAMPLE;   /* Point to where post-IDCT table starts */
-  /* End of simple table, rest of first half of post-IDCT table */
-  for (i = CENTERJSAMPLE; i < 2*(MAXJSAMPLE+1); i++)
-    table[i] = MAXJSAMPLE;
-  /* Second half of post-IDCT table */
-  memset(table + (2 * (MAXJSAMPLE+1)), 0,
-      (2 * (MAXJSAMPLE+1) - CENTERJSAMPLE) * sizeof(JSAMPLE));
-  memcpy(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
-      cinfo->sample_range_limit, CENTERJSAMPLE * sizeof(JSAMPLE));
-}
-
-
-
-
-/*
- * wxQuantize
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxQuantize, wxObject)
-
-void wxQuantize::DoQuantize(unsigned w, unsigned h, unsigned char **in_rows, unsigned char **out_rows,
-    unsigned char *palette, int desiredNoColours)
-{
-    j_decompress dec;
-    my_cquantize_ptr cquantize;
-
-    dec.output_width = w;
-    dec.desired_number_of_colors = desiredNoColours;
-    prepare_range_limit_table(&dec);
-    jinit_2pass_quantizer(&dec);
-    cquantize = (my_cquantize_ptr) dec.cquantize;
-
-
-    cquantize->pub.start_pass(&dec, true);
-    cquantize->pub.color_quantize(&dec, in_rows, out_rows, h);
-    cquantize->pub.finish_pass(&dec);
-
-    cquantize->pub.start_pass(&dec, false);
-    cquantize->pub.color_quantize(&dec, in_rows, out_rows, h);
-    cquantize->pub.finish_pass(&dec);
-
-
-    for (int i = 0; i < dec.desired_number_of_colors; i++) {
-        palette[3 * i + 0] = dec.colormap[0][i];
-        palette[3 * i + 1] = dec.colormap[1][i];
-        palette[3 * i + 2] = dec.colormap[2][i];
-    }
-
-    for (int ii = 0; ii < HIST_C0_ELEMS; ii++) free(cquantize->histogram[ii]);
-    free(cquantize->histogram);
-    free(dec.colormap[0]);
-    free(dec.colormap[1]);
-    free(dec.colormap[2]);
-    free(dec.colormap);
-    free(dec.srl_orig);
-
-    //free(cquantize->error_limiter);
-    free((void*)(cquantize->error_limiter - MAXJSAMPLE)); // To reverse what was done to it
-
-    free(cquantize->fserrors);
-    free(cquantize);
-}
-
-// TODO: somehow make use of the Windows system colours, rather than ignoring them for the
-// purposes of quantization.
-
-bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
-                          wxPalette** pPalette,
-                          int desiredNoColours,
-                          unsigned char** eightBitData,
-                          int flags)
-
-{
-    int i;
-
-    int windowsSystemColourCount = 20;
-
-    int paletteShift = 0;
-
-    // Shift the palette up by the number of Windows system colours,
-    // if necessary
-    if (flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS)
-        paletteShift = windowsSystemColourCount;
-
-    // Make room for the Windows system colours
-#ifdef __WXMSW__
-    if ((flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS) && (desiredNoColours > (256 - windowsSystemColourCount)))
-        desiredNoColours = 256 - windowsSystemColourCount;
-#endif
-
-    // create rows info:
-    int h = src.GetHeight();
-    int w = src.GetWidth();
-    unsigned char **rows = new unsigned char *[h];
-    unsigned char *imgdt = src.GetData();
-    for (i = 0; i < h; i++)
-        rows[i] = imgdt + 3/*RGB*/ * w * i;
-
-    unsigned char palette[3*256];
-
-    // This is the image as represented by palette indexes.
-    unsigned char *data8bit = new unsigned char[w * h];
-    unsigned char **outrows = new unsigned char *[h];
-    for (i = 0; i < h; i++)
-        outrows[i] = data8bit + w * i;
-
-    //RGB->palette
-    DoQuantize(w, h, rows, outrows, palette, desiredNoColours);
-
-    delete[] rows;
-    delete[] outrows;
-
-    // palette->RGB(max.256)
-
-    if (flags & wxQUANTIZE_FILL_DESTINATION_IMAGE)
-    {
-        if (!dest.IsOk())
-            dest.Create(w, h);
-
-        imgdt = dest.GetData();
-        for (i = 0; i < w * h; i++)
-        {
-            unsigned char c = data8bit[i];
-            imgdt[3 * i + 0/*R*/] = palette[3 * c + 0];
-            imgdt[3 * i + 1/*G*/] = palette[3 * c + 1];
-            imgdt[3 * i + 2/*B*/] = palette[3 * c + 2];
-        }
-    }
-
-    if (eightBitData && (flags & wxQUANTIZE_RETURN_8BIT_DATA))
-    {
-#ifdef __WXMSW__
-        if (flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS)
-        {
-            // We need to shift the palette entries up
-            // to make room for the Windows system colours.
-            for (i = 0; i < w * h; i++)
-                data8bit[i] = (unsigned char)(data8bit[i] + paletteShift);
-        }
-#endif
-        *eightBitData = data8bit;
-    }
-    else
-        delete[] data8bit;
-
-#if wxUSE_PALETTE
-    // Make a wxWidgets palette
-    if (pPalette)
-    {
-        unsigned char* r = new unsigned char[256];
-        unsigned char* g = new unsigned char[256];
-        unsigned char* b = new unsigned char[256];
-
-#ifdef __WXMSW__
-        // Fill the first 20 entries with Windows system colours
-        if (flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS)
-        {
-            HDC hDC = ::GetDC(NULL);
-            PALETTEENTRY* entries = new PALETTEENTRY[windowsSystemColourCount];
-            ::GetSystemPaletteEntries(hDC, 0, windowsSystemColourCount, entries);
-            ::ReleaseDC(NULL, hDC);
-
-            for (i = 0; i < windowsSystemColourCount; i++)
-            {
-                r[i] = entries[i].peRed;
-                g[i] = entries[i].peGreen;
-                b[i] = entries[i].peBlue;
-            }
-            delete[] entries;
-        }
-#endif
-
-        for (i = 0; i < desiredNoColours; i++)
-        {
-            r[i+paletteShift] = palette[i*3 + 0];
-            g[i+paletteShift] = palette[i*3 + 1];
-            b[i+paletteShift] = palette[i*3 + 2];
-        }
-
-        // Blank out any remaining palette entries
-        for (i = desiredNoColours+paletteShift; i < 256; i++)
-        {
-            r[i] = 0;
-            g[i] = 0;
-            b[i] = 0;
-        }
-        *pPalette = new wxPalette(256, r, g, b);
-        delete[] r;
-        delete[] g;
-        delete[] b;
-    }
-#else // !wxUSE_PALETTE
-    wxUnusedVar(pPalette);
-#endif // wxUSE_PALETTE/!wxUSE_PALETTE
-
-    return true;
-}
-
-// This version sets a palette in the destination image so you don't
-// have to manage it yourself.
-
-bool wxQuantize::Quantize(const wxImage& src,
-                          wxImage& dest,
-                          int desiredNoColours,
-                          unsigned char** eightBitData,
-                          int flags)
-{
-    wxPalette* palette = NULL;
-    if ( !Quantize(src, dest, & palette, desiredNoColours, eightBitData, flags) )
-        return false;
-
-#if wxUSE_PALETTE
-    if (palette)
-    {
-        dest.SetPalette(* palette);
-        delete palette;
-    }
-#endif // wxUSE_PALETTE
-
-    return true;
-}
-
-#endif
-    // wxUSE_IMAGE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/quantize.cpp
+// Purpose:     wxQuantize implementation
+// Author:      Julian Smart
+// Modified by:
+// Created:     22/6/2000
+// RCS-ID:      $Id: quantize.cpp 39957 2006-07-03 19:02:54Z ABX $
+// Copyright:   (c) Thomas G. Lane, Vaclav Slavik, Julian Smart
+// Licence:     wxWindows licence + JPEG library licence
+/////////////////////////////////////////////////////////////////////////////
+
+/*
+ * jquant2.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains 2-pass color quantization (color mapping) routines.
+ * These routines provide selection of a custom color map for an image,
+ * followed by mapping of the image to that color map, with optional
+ * Floyd-Steinberg dithering.
+ * It is also possible to use just the second pass to map to an arbitrary
+ * externally-given color map.
+ *
+ * Note: ordered dithering is not supported, since there isn't any fast
+ * way to compute intercolor distances; it's unclear that ordered dither's
+ * fundamental assumptions even hold with an irregularly spaced color map.
+ */
+
+/* modified by Vaclav Slavik for use as jpeglib-independent module */
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE
+
+#include "wx/quantize.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/palette.h"
+    #include "wx/image.h"
+#endif
+
+#ifdef __WXMSW__
+    #include "wx/msw/private.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(__OS2__)
+#define RGB_RED_OS2   0
+#define RGB_GREEN_OS2 1
+#define RGB_BLUE_OS2  2
+#else
+#define RGB_RED       0
+#define RGB_GREEN     1
+#define RGB_BLUE      2
+#endif
+#define RGB_PIXELSIZE 3
+
+#define MAXJSAMPLE        255
+#define CENTERJSAMPLE     128
+#define BITS_IN_JSAMPLE   8
+#define GETJSAMPLE(value) ((int) (value))
+
+#define RIGHT_SHIFT(x,shft) ((x) >> (shft))
+
+typedef unsigned short UINT16;
+typedef signed short INT16;
+#if !(defined(__WATCOMC__) && (defined(__WXMSW__) || defined(__WXMOTIF__)))
+typedef signed int INT32;
+#endif
+
+typedef unsigned char JSAMPLE;
+typedef JSAMPLE *JSAMPROW;
+typedef JSAMPROW *JSAMPARRAY;
+typedef unsigned int JDIMENSION;
+
+typedef struct {
+        void *cquantize;
+        JDIMENSION output_width;
+        JSAMPARRAY colormap;
+        int actual_number_of_colors;
+        int desired_number_of_colors;
+        JSAMPLE *sample_range_limit, *srl_orig;
+} j_decompress;
+
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+    #define JMETHOD(type,methodname,arglist)  type (__cdecl methodname) arglist
+#else
+    #define JMETHOD(type,methodname,arglist)  type (methodname) arglist
+#endif
+
+typedef j_decompress *j_decompress_ptr;
+struct jpeg_color_quantizer {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, bool is_pre_scan));
+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
+                 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
+                 int num_rows));
+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
+};
+
+
+
+
+/*
+ * This module implements the well-known Heckbert paradigm for color
+ * quantization.  Most of the ideas used here can be traced back to
+ * Heckbert's seminal paper
+ *   Heckbert, Paul.  "Color Image Quantization for Frame Buffer Display",
+ *   Proc. SIGGRAPH '82, Computer Graphics v.16 #3 (July 1982), pp 297-304.
+ *
+ * In the first pass over the image, we accumulate a histogram showing the
+ * usage count of each possible color.  To keep the histogram to a reasonable
+ * size, we reduce the precision of the input; typical practice is to retain
+ * 5 or 6 bits per color, so that 8 or 4 different input values are counted
+ * in the same histogram cell.
+ *
+ * Next, the color-selection step begins with a box representing the whole
+ * color space, and repeatedly splits the "largest" remaining box until we
+ * have as many boxes as desired colors.  Then the mean color in each
+ * remaining box becomes one of the possible output colors.
+ *
+ * The second pass over the image maps each input pixel to the closest output
+ * color (optionally after applying a Floyd-Steinberg dithering correction).
+ * This mapping is logically trivial, but making it go fast enough requires
+ * considerable care.
+ *
+ * Heckbert-style quantizers vary a good deal in their policies for choosing
+ * the "largest" box and deciding where to cut it.  The particular policies
+ * used here have proved out well in experimental comparisons, but better ones
+ * may yet be found.
+ *
+ * In earlier versions of the IJG code, this module quantized in YCbCr color
+ * space, processing the raw upsampled data without a color conversion step.
+ * This allowed the color conversion math to be done only once per colormap
+ * entry, not once per pixel.  However, that optimization precluded other
+ * useful optimizations (such as merging color conversion with upsampling)
+ * and it also interfered with desired capabilities such as quantizing to an
+ * externally-supplied colormap.  We have therefore abandoned that approach.
+ * The present code works in the post-conversion color space, typically RGB.
+ *
+ * To improve the visual quality of the results, we actually work in scaled
+ * RGB space, giving G distances more weight than R, and R in turn more than
+ * B.  To do everything in integer math, we must use integer scale factors.
+ * The 2/3/1 scale factors used here correspond loosely to the relative
+ * weights of the colors in the NTSC grayscale equation.
+ * If you want to use this code to quantize a non-RGB color space, you'll
+ * probably need to change these scale factors.
+ */
+
+#define R_SCALE 2       /* scale R distances by this much */
+#define G_SCALE 3       /* scale G distances by this much */
+#define B_SCALE 1       /* and B by this much */
+
+/* Relabel R/G/B as components 0/1/2, respecting the RGB ordering defined
+ * in jmorecfg.h.  As the code stands, it will do the right thing for R,G,B
+ * and B,G,R orders.  If you define some other weird order in jmorecfg.h,
+ * you'll get compile errors until you extend this logic.  In that case
+ * you'll probably want to tweak the histogram sizes too.
+ */
+
+#if defined(__OS2__)
+
+#if RGB_RED_OS2 == 0
+#define C0_SCALE R_SCALE
+#endif
+#if RGB_BLUE_OS2 == 0
+#define C0_SCALE B_SCALE
+#endif
+#if RGB_GREEN_OS2 == 1
+#define C1_SCALE G_SCALE
+#endif
+#if RGB_RED_OS2 == 2
+#define C2_SCALE R_SCALE
+#endif
+#if RGB_BLUE_OS2 == 2
+#define C2_SCALE B_SCALE
+#endif
+
+#else
+
+#if RGB_RED == 0
+#define C0_SCALE R_SCALE
+#endif
+#if RGB_BLUE == 0
+#define C0_SCALE B_SCALE
+#endif
+#if RGB_GREEN == 1
+#define C1_SCALE G_SCALE
+#endif
+#if RGB_RED == 2
+#define C2_SCALE R_SCALE
+#endif
+#if RGB_BLUE == 2
+#define C2_SCALE B_SCALE
+#endif
+
+#endif
+
+/*
+ * First we have the histogram data structure and routines for creating it.
+ *
+ * The number of bits of precision can be adjusted by changing these symbols.
+ * We recommend keeping 6 bits for G and 5 each for R and B.
+ * If you have plenty of memory and cycles, 6 bits all around gives marginally
+ * better results; if you are short of memory, 5 bits all around will save
+ * some space but degrade the results.
+ * To maintain a fully accurate histogram, we'd need to allocate a "long"
+ * (preferably unsigned long) for each cell.  In practice this is overkill;
+ * we can get by with 16 bits per cell.  Few of the cell counts will overflow,
+ * and clamping those that do overflow to the maximum value will give close-
+ * enough results.  This reduces the recommended histogram size from 256Kb
+ * to 128Kb, which is a useful savings on PC-class machines.
+ * (In the second pass the histogram space is re-used for pixel mapping data;
+ * in that capacity, each cell must be able to store zero to the number of
+ * desired colors.  16 bits/cell is plenty for that too.)
+ * Since the JPEG code is intended to run in small memory model on 80x86
+ * machines, we can't just allocate the histogram in one chunk.  Instead
+ * of a true 3-D array, we use a row of pointers to 2-D arrays.  Each
+ * pointer corresponds to a C0 value (typically 2^5 = 32 pointers) and
+ * each 2-D array has 2^6*2^5 = 2048 or 2^6*2^6 = 4096 entries.  Note that
+ * on 80x86 machines, the pointer row is in near memory but the actual
+ * arrays are in far memory (same arrangement as we use for image arrays).
+ */
+
+#define MAXNUMCOLORS  (MAXJSAMPLE+1) /* maximum size of colormap */
+
+/* These will do the right thing for either R,G,B or B,G,R color order,
+ * but you may not like the results for other color orders.
+ */
+#define HIST_C0_BITS  5     /* bits of precision in R/B histogram */
+#define HIST_C1_BITS  6     /* bits of precision in G histogram */
+#define HIST_C2_BITS  5     /* bits of precision in B/R histogram */
+
+/* Number of elements along histogram axes. */
+#define HIST_C0_ELEMS  (1<<HIST_C0_BITS)
+#define HIST_C1_ELEMS  (1<<HIST_C1_BITS)
+#define HIST_C2_ELEMS  (1<<HIST_C2_BITS)
+
+/* These are the amounts to shift an input value to get a histogram index. */
+#define C0_SHIFT  (BITS_IN_JSAMPLE-HIST_C0_BITS)
+#define C1_SHIFT  (BITS_IN_JSAMPLE-HIST_C1_BITS)
+#define C2_SHIFT  (BITS_IN_JSAMPLE-HIST_C2_BITS)
+
+
+typedef UINT16 histcell;    /* histogram cell; prefer an unsigned type */
+
+typedef histcell  * histptr;    /* for pointers to histogram cells */
+
+typedef histcell hist1d[HIST_C2_ELEMS]; /* typedefs for the array */
+typedef hist1d  * hist2d;   /* type for the 2nd-level pointers */
+typedef hist2d * hist3d;    /* type for top-level pointer */
+
+
+/* Declarations for Floyd-Steinberg dithering.
+ *
+ * Errors are accumulated into the array fserrors[], at a resolution of
+ * 1/16th of a pixel count.  The error at a given pixel is propagated
+ * to its not-yet-processed neighbors using the standard F-S fractions,
+ *      ... (here)  7/16
+ *      3/16    5/16    1/16
+ * We work left-to-right on even rows, right-to-left on odd rows.
+ *
+ * We can get away with a single array (holding one row's worth of errors)
+ * by using it to store the current row's errors at pixel columns not yet
+ * processed, but the next row's errors at columns already processed.  We
+ * need only a few extra variables to hold the errors immediately around the
+ * current column.  (If we are lucky, those variables are in registers, but
+ * even if not, they're probably cheaper to access than array elements are.)
+ *
+ * The fserrors[] array has (#columns + 2) entries; the extra entry at
+ * each end saves us from special-casing the first and last pixels.
+ * Each entry is three values long, one value for each color component.
+ *
+ * Note: on a wide image, we might not have enough room in a PC's near data
+ * segment to hold the error array; so it is allocated with alloc_large.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+typedef INT16 FSERROR;      /* 16 bits should be enough */
+typedef int LOCFSERROR;     /* use 'int' for calculation temps */
+#else
+typedef INT32 FSERROR;      /* may need more than 16 bits */
+typedef INT32 LOCFSERROR;   /* be sure calculation temps are big enough */
+#endif
+
+typedef FSERROR  *FSERRPTR; /* pointer to error array (in  storage!) */
+
+
+/* Private subobject */
+
+typedef struct {
+
+   struct {
+       void (*finish_pass)(j_decompress_ptr);
+       void (*color_quantize)(j_decompress_ptr, JSAMPARRAY, JSAMPARRAY, int);
+       void (*start_pass)(j_decompress_ptr, bool);
+       void (*new_color_map)(j_decompress_ptr);
+   } pub;
+
+  /* Space for the eventually created colormap is stashed here */
+  JSAMPARRAY sv_colormap;   /* colormap allocated at init time */
+  int desired;          /* desired # of colors = size of colormap */
+
+  /* Variables for accumulating image statistics */
+  hist3d histogram;     /* pointer to the histogram */
+
+  bool needs_zeroed;        /* true if next pass must zero histogram */
+
+  /* Variables for Floyd-Steinberg dithering */
+  FSERRPTR fserrors;        /* accumulated errors */
+  bool on_odd_row;      /* flag to remember which row we are on */
+  int * error_limiter;      /* table for clamping the applied error */
+} my_cquantizer;
+
+typedef my_cquantizer * my_cquantize_ptr;
+
+
+/*
+ * Prescan some rows of pixels.
+ * In this module the prescan simply updates the histogram, which has been
+ * initialized to zeroes by start_pass.
+ * An output_buf parameter is required by the method signature, but no data
+ * is actually output (in fact the buffer controller is probably passing a
+ * NULL pointer).
+ */
+
+void
+prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+          JSAMPARRAY WXUNUSED(output_buf), int num_rows)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register JSAMPROW ptr;
+  register histptr histp;
+  register hist3d histogram = cquantize->histogram;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    ptr = input_buf[row];
+    for (col = width; col > 0; col--) {
+
+      {
+
+          /* get pixel value and index into the histogram */
+          histp = & histogram[GETJSAMPLE(ptr[0]) >> C0_SHIFT]
+                 [GETJSAMPLE(ptr[1]) >> C1_SHIFT]
+                 [GETJSAMPLE(ptr[2]) >> C2_SHIFT];
+          /* increment, check for overflow and undo increment if so. */
+          if (++(*histp) <= 0)
+            (*histp)--;
+      }
+      ptr += 3;
+    }
+  }
+}
+
+
+/*
+ * Next we have the really interesting routines: selection of a colormap
+ * given the completed histogram.
+ * These routines work with a list of "boxes", each representing a rectangular
+ * subset of the input color space (to histogram precision).
+ */
+
+typedef struct {
+  /* The bounds of the box (inclusive); expressed as histogram indexes */
+  int c0min, c0max;
+  int c1min, c1max;
+  int c2min, c2max;
+  /* The volume (actually 2-norm) of the box */
+  INT32 volume;
+  /* The number of nonzero histogram cells within this box */
+  long colorcount;
+} box;
+
+typedef box * boxptr;
+
+
+boxptr
+find_biggest_color_pop (boxptr boxlist, int numboxes)
+/* Find the splittable box with the largest color population */
+/* Returns NULL if no splittable boxes remain */
+{
+  register boxptr boxp;
+  register int i;
+  register long maxc = 0;
+  boxptr which = NULL;
+
+  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+    if (boxp->colorcount > maxc && boxp->volume > 0) {
+      which = boxp;
+      maxc = boxp->colorcount;
+    }
+  }
+  return which;
+}
+
+
+boxptr
+find_biggest_volume (boxptr boxlist, int numboxes)
+/* Find the splittable box with the largest (scaled) volume */
+/* Returns NULL if no splittable boxes remain */
+{
+  register boxptr boxp;
+  register int i;
+  register INT32 maxv = 0;
+  boxptr which = NULL;
+
+  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+    if (boxp->volume > maxv) {
+      which = boxp;
+      maxv = boxp->volume;
+    }
+  }
+  return which;
+}
+
+
+void
+update_box (j_decompress_ptr cinfo, boxptr boxp)
+/* Shrink the min/max bounds of a box to enclose only nonzero elements, */
+/* and recompute its volume and population */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  histptr histp;
+  int c0,c1,c2;
+  int c0min,c0max,c1min,c1max,c2min,c2max;
+  INT32 dist0,dist1,dist2;
+  long ccount;
+
+  c0min = boxp->c0min;  c0max = boxp->c0max;
+  c1min = boxp->c1min;  c1max = boxp->c1max;
+  c2min = boxp->c2min;  c2max = boxp->c2max;
+
+  if (c0max > c0min)
+    for (c0 = c0min; c0 <= c0max; c0++)
+      for (c1 = c1min; c1 <= c1max; c1++) {
+    histp = & histogram[c0][c1][c2min];
+    for (c2 = c2min; c2 <= c2max; c2++)
+      if (*histp++ != 0) {
+        boxp->c0min = c0min = c0;
+        goto have_c0min;
+      }
+      }
+ have_c0min:
+  if (c0max > c0min)
+    for (c0 = c0max; c0 >= c0min; c0--)
+      for (c1 = c1min; c1 <= c1max; c1++) {
+    histp = & histogram[c0][c1][c2min];
+    for (c2 = c2min; c2 <= c2max; c2++)
+      if (*histp++ != 0) {
+        boxp->c0max = c0max = c0;
+        goto have_c0max;
+      }
+      }
+ have_c0max:
+  if (c1max > c1min)
+    for (c1 = c1min; c1 <= c1max; c1++)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+    histp = & histogram[c0][c1][c2min];
+    for (c2 = c2min; c2 <= c2max; c2++)
+      if (*histp++ != 0) {
+        boxp->c1min = c1min = c1;
+        goto have_c1min;
+      }
+      }
+ have_c1min:
+  if (c1max > c1min)
+    for (c1 = c1max; c1 >= c1min; c1--)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+    histp = & histogram[c0][c1][c2min];
+    for (c2 = c2min; c2 <= c2max; c2++)
+      if (*histp++ != 0) {
+        boxp->c1max = c1max = c1;
+        goto have_c1max;
+      }
+      }
+ have_c1max:
+  if (c2max > c2min)
+    for (c2 = c2min; c2 <= c2max; c2++)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+    histp = & histogram[c0][c1min][c2];
+    for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
+      if (*histp != 0) {
+        boxp->c2min = c2min = c2;
+        goto have_c2min;
+      }
+      }
+ have_c2min:
+  if (c2max > c2min)
+    for (c2 = c2max; c2 >= c2min; c2--)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+    histp = & histogram[c0][c1min][c2];
+    for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
+      if (*histp != 0) {
+        boxp->c2max = c2max = c2;
+        goto have_c2max;
+      }
+      }
+ have_c2max:
+
+  /* Update box volume.
+   * We use 2-norm rather than real volume here; this biases the method
+   * against making long narrow boxes, and it has the side benefit that
+   * a box is splittable iff norm > 0.
+   * Since the differences are expressed in histogram-cell units,
+   * we have to shift back to JSAMPLE units to get consistent distances;
+   * after which, we scale according to the selected distance scale factors.
+   */
+  dist0 = ((c0max - c0min) << C0_SHIFT) * C0_SCALE;
+  dist1 = ((c1max - c1min) << C1_SHIFT) * C1_SCALE;
+  dist2 = ((c2max - c2min) << C2_SHIFT) * C2_SCALE;
+  boxp->volume = dist0*dist0 + dist1*dist1 + dist2*dist2;
+
+  /* Now scan remaining volume of box and compute population */
+  ccount = 0;
+  for (c0 = c0min; c0 <= c0max; c0++)
+    for (c1 = c1min; c1 <= c1max; c1++) {
+      histp = & histogram[c0][c1][c2min];
+      for (c2 = c2min; c2 <= c2max; c2++, histp++)
+    if (*histp != 0) {
+      ccount++;
+    }
+    }
+  boxp->colorcount = ccount;
+}
+
+
+int
+median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,
+        int desired_colors)
+/* Repeatedly select and split the largest box until we have enough boxes */
+{
+  int n,lb;
+  int c0,c1,c2,cmax;
+  register boxptr b1,b2;
+
+  while (numboxes < desired_colors) {
+    /* Select box to split.
+     * Current algorithm: by population for first half, then by volume.
+     */
+    if ((numboxes*2) <= desired_colors) {
+      b1 = find_biggest_color_pop(boxlist, numboxes);
+    } else {
+      b1 = find_biggest_volume(boxlist, numboxes);
+    }
+    if (b1 == NULL)     /* no splittable boxes left! */
+      break;
+    b2 = &boxlist[numboxes];    /* where new box will go */
+    /* Copy the color bounds to the new box. */
+    b2->c0max = b1->c0max; b2->c1max = b1->c1max; b2->c2max = b1->c2max;
+    b2->c0min = b1->c0min; b2->c1min = b1->c1min; b2->c2min = b1->c2min;
+    /* Choose which axis to split the box on.
+     * Current algorithm: longest scaled axis.
+     * See notes in update_box about scaling distances.
+     */
+    c0 = ((b1->c0max - b1->c0min) << C0_SHIFT) * C0_SCALE;
+    c1 = ((b1->c1max - b1->c1min) << C1_SHIFT) * C1_SCALE;
+    c2 = ((b1->c2max - b1->c2min) << C2_SHIFT) * C2_SCALE;
+    /* We want to break any ties in favor of green, then red, blue last.
+     * This code does the right thing for R,G,B or B,G,R color orders only.
+     */
+#if defined(__VISAGECPP__)
+
+#if RGB_RED_OS2 == 0
+    cmax = c1; n = 1;
+    if (c0 > cmax) { cmax = c0; n = 0; }
+    if (c2 > cmax) { n = 2; }
+#else
+    cmax = c1; n = 1;
+    if (c2 > cmax) { cmax = c2; n = 2; }
+    if (c0 > cmax) { n = 0; }
+#endif
+
+#else
+
+#if RGB_RED == 0
+    cmax = c1; n = 1;
+    if (c0 > cmax) { cmax = c0; n = 0; }
+    if (c2 > cmax) { n = 2; }
+#else
+    cmax = c1; n = 1;
+    if (c2 > cmax) { cmax = c2; n = 2; }
+    if (c0 > cmax) { n = 0; }
+#endif
+
+#endif
+    /* Choose split point along selected axis, and update box bounds.
+     * Current algorithm: split at halfway point.
+     * (Since the box has been shrunk to minimum volume,
+     * any split will produce two nonempty subboxes.)
+     * Note that lb value is max for lower box, so must be < old max.
+     */
+    switch (n) {
+    case 0:
+      lb = (b1->c0max + b1->c0min) / 2;
+      b1->c0max = lb;
+      b2->c0min = lb+1;
+      break;
+    case 1:
+      lb = (b1->c1max + b1->c1min) / 2;
+      b1->c1max = lb;
+      b2->c1min = lb+1;
+      break;
+    case 2:
+      lb = (b1->c2max + b1->c2min) / 2;
+      b1->c2max = lb;
+      b2->c2min = lb+1;
+      break;
+    }
+    /* Update stats for boxes */
+    update_box(cinfo, b1);
+    update_box(cinfo, b2);
+    numboxes++;
+  }
+  return numboxes;
+}
+
+
+void
+compute_color (j_decompress_ptr cinfo, boxptr boxp, int icolor)
+/* Compute representative color for a box, put it in colormap[icolor] */
+{
+  /* Current algorithm: mean weighted by pixels (not colors) */
+  /* Note it is important to get the rounding correct! */
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  histptr histp;
+  int c0,c1,c2;
+  int c0min,c0max,c1min,c1max,c2min,c2max;
+  long count;
+  long total = 0;
+  long c0total = 0;
+  long c1total = 0;
+  long c2total = 0;
+
+  c0min = boxp->c0min;  c0max = boxp->c0max;
+  c1min = boxp->c1min;  c1max = boxp->c1max;
+  c2min = boxp->c2min;  c2max = boxp->c2max;
+
+  for (c0 = c0min; c0 <= c0max; c0++)
+    for (c1 = c1min; c1 <= c1max; c1++) {
+      histp = & histogram[c0][c1][c2min];
+      for (c2 = c2min; c2 <= c2max; c2++) {
+    if ((count = *histp++) != 0) {
+      total += count;
+      c0total += ((c0 << C0_SHIFT) + ((1<<C0_SHIFT)>>1)) * count;
+      c1total += ((c1 << C1_SHIFT) + ((1<<C1_SHIFT)>>1)) * count;
+      c2total += ((c2 << C2_SHIFT) + ((1<<C2_SHIFT)>>1)) * count;
+    }
+      }
+    }
+
+  cinfo->colormap[0][icolor] = (JSAMPLE) ((c0total + (total>>1)) / total);
+  cinfo->colormap[1][icolor] = (JSAMPLE) ((c1total + (total>>1)) / total);
+  cinfo->colormap[2][icolor] = (JSAMPLE) ((c2total + (total>>1)) / total);
+}
+
+
+static void
+select_colors (j_decompress_ptr cinfo, int desired_colors)
+/* Master routine for color selection */
+{
+  boxptr boxlist;
+  int numboxes;
+  int i;
+
+  /* Allocate workspace for box list */
+  boxlist = (boxptr) malloc(desired_colors * sizeof(box));
+  /* Initialize one box containing whole space */
+  numboxes = 1;
+  boxlist[0].c0min = 0;
+  boxlist[0].c0max = MAXJSAMPLE >> C0_SHIFT;
+  boxlist[0].c1min = 0;
+  boxlist[0].c1max = MAXJSAMPLE >> C1_SHIFT;
+  boxlist[0].c2min = 0;
+  boxlist[0].c2max = MAXJSAMPLE >> C2_SHIFT;
+  /* Shrink it to actually-used volume and set its statistics */
+  update_box(cinfo, & boxlist[0]);
+  /* Perform median-cut to produce final box list */
+  numboxes = median_cut(cinfo, boxlist, numboxes, desired_colors);
+  /* Compute the representative color for each box, fill colormap */
+  for (i = 0; i < numboxes; i++)
+    compute_color(cinfo, & boxlist[i], i);
+  cinfo->actual_number_of_colors = numboxes;
+
+  free(boxlist); //FIXME?? I don't know if this is correct - VS
+}
+
+
+/*
+ * These routines are concerned with the time-critical task of mapping input
+ * colors to the nearest color in the selected colormap.
+ *
+ * We re-use the histogram space as an "inverse color map", essentially a
+ * cache for the results of nearest-color searches.  All colors within a
+ * histogram cell will be mapped to the same colormap entry, namely the one
+ * closest to the cell's center.  This may not be quite the closest entry to
+ * the actual input color, but it's almost as good.  A zero in the cache
+ * indicates we haven't found the nearest color for that cell yet; the array
+ * is cleared to zeroes before starting the mapping pass.  When we find the
+ * nearest color for a cell, its colormap index plus one is recorded in the
+ * cache for future use.  The pass2 scanning routines call fill_inverse_cmap
+ * when they need to use an unfilled entry in the cache.
+ *
+ * Our method of efficiently finding nearest colors is based on the "locally
+ * sorted search" idea described by Heckbert and on the incremental distance
+ * calculation described by Spencer W. Thomas in chapter III.1 of Graphics
+ * Gems II (James Arvo, ed.  Academic Press, 1991).  Thomas points out that
+ * the distances from a given colormap entry to each cell of the histogram can
+ * be computed quickly using an incremental method: the differences between
+ * distances to adjacent cells themselves differ by a constant.  This allows a
+ * fairly fast implementation of the "brute force" approach of computing the
+ * distance from every colormap entry to every histogram cell.  Unfortunately,
+ * it needs a work array to hold the best-distance-so-far for each histogram
+ * cell (because the inner loop has to be over cells, not colormap entries).
+ * The work array elements have to be INT32s, so the work array would need
+ * 256Kb at our recommended precision.  This is not feasible in DOS machines.
+ *
+ * To get around these problems, we apply Thomas' method to compute the
+ * nearest colors for only the cells within a small subbox of the histogram.
+ * The work array need be only as big as the subbox, so the memory usage
+ * problem is solved.  Furthermore, we need not fill subboxes that are never
+ * referenced in pass2; many images use only part of the color gamut, so a
+ * fair amount of work is saved.  An additional advantage of this
+ * approach is that we can apply Heckbert's locality criterion to quickly
+ * eliminate colormap entries that are far away from the subbox; typically
+ * three-fourths of the colormap entries are rejected by Heckbert's criterion,
+ * and we need not compute their distances to individual cells in the subbox.
+ * The speed of this approach is heavily influenced by the subbox size: too
+ * small means too much overhead, too big loses because Heckbert's criterion
+ * can't eliminate as many colormap entries.  Empirically the best subbox
+ * size seems to be about 1/512th of the histogram (1/8th in each direction).
+ *
+ * Thomas' article also describes a refined method which is asymptotically
+ * faster than the brute-force method, but it is also far more complex and
+ * cannot efficiently be applied to small subboxes.  It is therefore not
+ * useful for programs intended to be portable to DOS machines.  On machines
+ * with plenty of memory, filling the whole histogram in one shot with Thomas'
+ * refined method might be faster than the present code --- but then again,
+ * it might not be any faster, and it's certainly more complicated.
+ */
+
+
+/* log2(histogram cells in update box) for each axis; this can be adjusted */
+#define BOX_C0_LOG  (HIST_C0_BITS-3)
+#define BOX_C1_LOG  (HIST_C1_BITS-3)
+#define BOX_C2_LOG  (HIST_C2_BITS-3)
+
+#define BOX_C0_ELEMS  (1<<BOX_C0_LOG) /* # of hist cells in update box */
+#define BOX_C1_ELEMS  (1<<BOX_C1_LOG)
+#define BOX_C2_ELEMS  (1<<BOX_C2_LOG)
+
+#define BOX_C0_SHIFT  (C0_SHIFT + BOX_C0_LOG)
+#define BOX_C1_SHIFT  (C1_SHIFT + BOX_C1_LOG)
+#define BOX_C2_SHIFT  (C2_SHIFT + BOX_C2_LOG)
+
+
+/*
+ * The next three routines implement inverse colormap filling.  They could
+ * all be folded into one big routine, but splitting them up this way saves
+ * some stack space (the mindist[] and bestdist[] arrays need not coexist)
+ * and may allow some compilers to produce better code by registerizing more
+ * inner-loop variables.
+ */
+
+static int
+find_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
+            JSAMPLE colorlist[])
+/* Locate the colormap entries close enough to an update box to be candidates
+ * for the nearest entry to some cell(s) in the update box.  The update box
+ * is specified by the center coordinates of its first cell.  The number of
+ * candidate colormap entries is returned, and their colormap indexes are
+ * placed in colorlist[].
+ * This routine uses Heckbert's "locally sorted search" criterion to select
+ * the colors that need further consideration.
+ */
+{
+  int numcolors = cinfo->actual_number_of_colors;
+  int maxc0, maxc1, maxc2;
+  int centerc0, centerc1, centerc2;
+  int i, x, ncolors;
+  INT32 minmaxdist, min_dist, max_dist, tdist;
+  INT32 mindist[MAXNUMCOLORS];  /* min distance to colormap entry i */
+
+  /* Compute true coordinates of update box's upper corner and center.
+   * Actually we compute the coordinates of the center of the upper-corner
+   * histogram cell, which are the upper bounds of the volume we care about.
+   * Note that since ">>" rounds down, the "center" values may be closer to
+   * min than to max; hence comparisons to them must be "<=", not "<".
+   */
+  maxc0 = minc0 + ((1 << BOX_C0_SHIFT) - (1 << C0_SHIFT));
+  centerc0 = (minc0 + maxc0) >> 1;
+  maxc1 = minc1 + ((1 << BOX_C1_SHIFT) - (1 << C1_SHIFT));
+  centerc1 = (minc1 + maxc1) >> 1;
+  maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT));
+  centerc2 = (minc2 + maxc2) >> 1;
+
+  /* For each color in colormap, find:
+   *  1. its minimum squared-distance to any point in the update box
+   *     (zero if color is within update box);
+   *  2. its maximum squared-distance to any point in the update box.
+   * Both of these can be found by considering only the corners of the box.
+   * We save the minimum distance for each color in mindist[];
+   * only the smallest maximum distance is of interest.
+   */
+  minmaxdist = 0x7FFFFFFFL;
+
+  for (i = 0; i < numcolors; i++) {
+    /* We compute the squared-c0-distance term, then add in the other two. */
+    x = GETJSAMPLE(cinfo->colormap[0][i]);
+    if (x < minc0) {
+      tdist = (x - minc0) * C0_SCALE;
+      min_dist = tdist*tdist;
+      tdist = (x - maxc0) * C0_SCALE;
+      max_dist = tdist*tdist;
+    } else if (x > maxc0) {
+      tdist = (x - maxc0) * C0_SCALE;
+      min_dist = tdist*tdist;
+      tdist = (x - minc0) * C0_SCALE;
+      max_dist = tdist*tdist;
+    } else {
+      /* within cell range so no contribution to min_dist */
+      min_dist = 0;
+      if (x <= centerc0) {
+    tdist = (x - maxc0) * C0_SCALE;
+    max_dist = tdist*tdist;
+      } else {
+    tdist = (x - minc0) * C0_SCALE;
+    max_dist = tdist*tdist;
+      }
+    }
+
+    x = GETJSAMPLE(cinfo->colormap[1][i]);
+    if (x < minc1) {
+      tdist = (x - minc1) * C1_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - maxc1) * C1_SCALE;
+      max_dist += tdist*tdist;
+    } else if (x > maxc1) {
+      tdist = (x - maxc1) * C1_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - minc1) * C1_SCALE;
+      max_dist += tdist*tdist;
+    } else {
+      /* within cell range so no contribution to min_dist */
+      if (x <= centerc1) {
+    tdist = (x - maxc1) * C1_SCALE;
+    max_dist += tdist*tdist;
+      } else {
+    tdist = (x - minc1) * C1_SCALE;
+    max_dist += tdist*tdist;
+      }
+    }
+
+    x = GETJSAMPLE(cinfo->colormap[2][i]);
+    if (x < minc2) {
+      tdist = (x - minc2) * C2_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - maxc2) * C2_SCALE;
+      max_dist += tdist*tdist;
+    } else if (x > maxc2) {
+      tdist = (x - maxc2) * C2_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - minc2) * C2_SCALE;
+      max_dist += tdist*tdist;
+    } else {
+      /* within cell range so no contribution to min_dist */
+      if (x <= centerc2) {
+    tdist = (x - maxc2) * C2_SCALE;
+    max_dist += tdist*tdist;
+      } else {
+    tdist = (x - minc2) * C2_SCALE;
+    max_dist += tdist*tdist;
+      }
+    }
+
+    mindist[i] = min_dist;  /* save away the results */
+    if (max_dist < minmaxdist)
+      minmaxdist = max_dist;
+  }
+
+  /* Now we know that no cell in the update box is more than minmaxdist
+   * away from some colormap entry.  Therefore, only colors that are
+   * within minmaxdist of some part of the box need be considered.
+   */
+  ncolors = 0;
+  for (i = 0; i < numcolors; i++) {
+    if (mindist[i] <= minmaxdist)
+      colorlist[ncolors++] = (JSAMPLE) i;
+  }
+  return ncolors;
+}
+
+
+static void
+find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
+          int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[])
+/* Find the closest colormap entry for each cell in the update box,
+ * given the list of candidate colors prepared by find_nearby_colors.
+ * Return the indexes of the closest entries in the bestcolor[] array.
+ * This routine uses Thomas' incremental distance calculation method to
+ * find the distance from a colormap entry to successive cells in the box.
+ */
+{
+  int ic0, ic1, ic2;
+  int i, icolor;
+  register INT32 * bptr;    /* pointer into bestdist[] array */
+  JSAMPLE * cptr;       /* pointer into bestcolor[] array */
+  INT32 dist0, dist1;       /* initial distance values */
+  register INT32 dist2;     /* current distance in inner loop */
+  INT32 xx0, xx1;       /* distance increments */
+  register INT32 xx2;
+  INT32 inc0, inc1, inc2;   /* initial values for increments */
+  /* This array holds the distance to the nearest-so-far color for each cell */
+  INT32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
+
+  /* Initialize best-distance for each cell of the update box */
+  bptr = bestdist;
+  for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--)
+    *bptr++ = 0x7FFFFFFFL;
+
+  /* For each color selected by find_nearby_colors,
+   * compute its distance to the center of each cell in the box.
+   * If that's less than best-so-far, update best distance and color number.
+   */
+
+  /* Nominal steps between cell centers ("x" in Thomas article) */
+#define STEP_C0  ((1 << C0_SHIFT) * C0_SCALE)
+#define STEP_C1  ((1 << C1_SHIFT) * C1_SCALE)
+#define STEP_C2  ((1 << C2_SHIFT) * C2_SCALE)
+
+  for (i = 0; i < numcolors; i++) {
+    icolor = GETJSAMPLE(colorlist[i]);
+    /* Compute (square of) distance from minc0/c1/c2 to this color */
+    inc0 = (minc0 - GETJSAMPLE(cinfo->colormap[0][icolor])) * C0_SCALE;
+    dist0 = inc0*inc0;
+    inc1 = (minc1 - GETJSAMPLE(cinfo->colormap[1][icolor])) * C1_SCALE;
+    dist0 += inc1*inc1;
+    inc2 = (minc2 - GETJSAMPLE(cinfo->colormap[2][icolor])) * C2_SCALE;
+    dist0 += inc2*inc2;
+    /* Form the initial difference increments */
+    inc0 = inc0 * (2 * STEP_C0) + STEP_C0 * STEP_C0;
+    inc1 = inc1 * (2 * STEP_C1) + STEP_C1 * STEP_C1;
+    inc2 = inc2 * (2 * STEP_C2) + STEP_C2 * STEP_C2;
+    /* Now loop over all cells in box, updating distance per Thomas method */
+    bptr = bestdist;
+    cptr = bestcolor;
+    xx0 = inc0;
+    for (ic0 = BOX_C0_ELEMS-1; ic0 >= 0; ic0--) {
+      dist1 = dist0;
+      xx1 = inc1;
+      for (ic1 = BOX_C1_ELEMS-1; ic1 >= 0; ic1--) {
+    dist2 = dist1;
+    xx2 = inc2;
+    for (ic2 = BOX_C2_ELEMS-1; ic2 >= 0; ic2--) {
+      if (dist2 < *bptr) {
+        *bptr = dist2;
+        *cptr = (JSAMPLE) icolor;
+      }
+      dist2 += xx2;
+      xx2 += 2 * STEP_C2 * STEP_C2;
+      bptr++;
+      cptr++;
+    }
+    dist1 += xx1;
+    xx1 += 2 * STEP_C1 * STEP_C1;
+      }
+      dist0 += xx0;
+      xx0 += 2 * STEP_C0 * STEP_C0;
+    }
+  }
+}
+
+
+static void
+fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2)
+/* Fill the inverse-colormap entries in the update box that contains */
+/* histogram cell c0/c1/c2.  (Only that one cell MUST be filled, but */
+/* we can fill as many others as we wish.) */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  int minc0, minc1, minc2;  /* lower left corner of update box */
+  int ic0, ic1, ic2;
+  register JSAMPLE * cptr;  /* pointer into bestcolor[] array */
+  register histptr cachep;  /* pointer into main cache array */
+  /* This array lists the candidate colormap indexes. */
+  JSAMPLE colorlist[MAXNUMCOLORS];
+  int numcolors;        /* number of candidate colors */
+  /* This array holds the actually closest colormap index for each cell. */
+  JSAMPLE bestcolor[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
+
+  /* Convert cell coordinates to update box ID */
+  c0 >>= BOX_C0_LOG;
+  c1 >>= BOX_C1_LOG;
+  c2 >>= BOX_C2_LOG;
+
+  /* Compute true coordinates of update box's origin corner.
+   * Actually we compute the coordinates of the center of the corner
+   * histogram cell, which are the lower bounds of the volume we care about.
+   */
+  minc0 = (c0 << BOX_C0_SHIFT) + ((1 << C0_SHIFT) >> 1);
+  minc1 = (c1 << BOX_C1_SHIFT) + ((1 << C1_SHIFT) >> 1);
+  minc2 = (c2 << BOX_C2_SHIFT) + ((1 << C2_SHIFT) >> 1);
+
+  /* Determine which colormap entries are close enough to be candidates
+   * for the nearest entry to some cell in the update box.
+   */
+  numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist);
+
+  /* Determine the actually nearest colors. */
+  find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist,
+           bestcolor);
+
+  /* Save the best color numbers (plus 1) in the main cache array */
+  c0 <<= BOX_C0_LOG;        /* convert ID back to base cell indexes */
+  c1 <<= BOX_C1_LOG;
+  c2 <<= BOX_C2_LOG;
+  cptr = bestcolor;
+  for (ic0 = 0; ic0 < BOX_C0_ELEMS; ic0++) {
+    for (ic1 = 0; ic1 < BOX_C1_ELEMS; ic1++) {
+      cachep = & histogram[c0+ic0][c1+ic1][c2];
+      for (ic2 = 0; ic2 < BOX_C2_ELEMS; ic2++) {
+    *cachep++ = (histcell) (GETJSAMPLE(*cptr++) + 1);
+      }
+    }
+  }
+}
+
+
+/*
+ * Map some rows of pixels to the output colormapped representation.
+ */
+
+void
+pass2_no_dither (j_decompress_ptr cinfo,
+         JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
+/* This version performs no dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  register JSAMPROW inptr, outptr;
+  register histptr cachep;
+  register int c0, c1, c2;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    inptr = input_buf[row];
+    outptr = output_buf[row];
+    for (col = width; col > 0; col--) {
+      /* get pixel value and index into the cache */
+      c0 = GETJSAMPLE(*inptr++) >> C0_SHIFT;
+      c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT;
+      c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT;
+      cachep = & histogram[c0][c1][c2];
+      /* If we have not seen this color before, find nearest colormap entry */
+      /* and update the cache */
+      if (*cachep == 0)
+    fill_inverse_cmap(cinfo, c0,c1,c2);
+      /* Now emit the colormap index for this cell */
+      *outptr++ = (JSAMPLE) (*cachep - 1);
+    }
+  }
+}
+
+
+void
+pass2_fs_dither (j_decompress_ptr cinfo,
+         JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
+/* This version performs Floyd-Steinberg dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  register LOCFSERROR cur0, cur1, cur2; /* current error or pixel value */
+  LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */
+  LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */
+  register FSERRPTR errorptr;   /* => fserrors[] at column before current */
+  JSAMPROW inptr;       /* => current input pixel */
+  JSAMPROW outptr;      /* => current output pixel */
+  histptr cachep;
+  int dir;          /* +1 or -1 depending on direction */
+  int dir3;         /* 3*dir, for advancing inptr & errorptr */
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+  JSAMPLE *range_limit = cinfo->sample_range_limit;
+  int *error_limit = cquantize->error_limiter;
+  JSAMPROW colormap0 = cinfo->colormap[0];
+  JSAMPROW colormap1 = cinfo->colormap[1];
+  JSAMPROW colormap2 = cinfo->colormap[2];
+
+
+  for (row = 0; row < num_rows; row++) {
+    inptr = input_buf[row];
+    outptr = output_buf[row];
+    if (cquantize->on_odd_row) {
+      /* work right to left in this row */
+      inptr += (width-1) * 3;   /* so point to rightmost pixel */
+      outptr += width-1;
+      dir = -1;
+      dir3 = -3;
+      errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */
+      cquantize->on_odd_row = false; /* flip for next time */
+    } else {
+      /* work left to right in this row */
+      dir = 1;
+      dir3 = 3;
+      errorptr = cquantize->fserrors; /* => entry before first real column */
+      cquantize->on_odd_row = true; /* flip for next time */
+    }
+    /* Preset error values: no error propagated to first pixel from left */
+    cur0 = cur1 = cur2 = 0;
+    /* and no error propagated to row below yet */
+    belowerr0 = belowerr1 = belowerr2 = 0;
+    bpreverr0 = bpreverr1 = bpreverr2 = 0;
+
+    for (col = width; col > 0; col--) {
+      /* curN holds the error propagated from the previous pixel on the
+       * current line.  Add the error propagated from the previous line
+       * to form the complete error correction term for this pixel, and
+       * round the error term (which is expressed * 16) to an integer.
+       * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
+       * for either sign of the error value.
+       * Note: errorptr points to *previous* column's array entry.
+       */
+      cur0 = RIGHT_SHIFT(cur0 + errorptr[dir3+0] + 8, 4);
+      cur1 = RIGHT_SHIFT(cur1 + errorptr[dir3+1] + 8, 4);
+      cur2 = RIGHT_SHIFT(cur2 + errorptr[dir3+2] + 8, 4);
+      /* Limit the error using transfer function set by init_error_limit.
+       * See comments with init_error_limit for rationale.
+       */
+      cur0 = error_limit[cur0];
+      cur1 = error_limit[cur1];
+      cur2 = error_limit[cur2];
+      /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
+       * The maximum error is +- MAXJSAMPLE (or less with error limiting);
+       * this sets the required size of the range_limit array.
+       */
+      cur0 += GETJSAMPLE(inptr[0]);
+      cur1 += GETJSAMPLE(inptr[1]);
+      cur2 += GETJSAMPLE(inptr[2]);
+      cur0 = GETJSAMPLE(range_limit[cur0]);
+      cur1 = GETJSAMPLE(range_limit[cur1]);
+      cur2 = GETJSAMPLE(range_limit[cur2]);
+      /* Index into the cache with adjusted pixel value */
+      cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT];
+      /* If we have not seen this color before, find nearest colormap */
+      /* entry and update the cache */
+      if (*cachep == 0)
+    fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT);
+      /* Now emit the colormap index for this cell */
+      { register int pixcode = *cachep - 1;
+    *outptr = (JSAMPLE) pixcode;
+    /* Compute representation error for this pixel */
+    cur0 -= GETJSAMPLE(colormap0[pixcode]);
+    cur1 -= GETJSAMPLE(colormap1[pixcode]);
+    cur2 -= GETJSAMPLE(colormap2[pixcode]);
+      }
+      /* Compute error fractions to be propagated to adjacent pixels.
+       * Add these into the running sums, and simultaneously shift the
+       * next-line error sums left by 1 column.
+       */
+      { register LOCFSERROR bnexterr, delta;
+
+    bnexterr = cur0;    /* Process component 0 */
+    delta = cur0 * 2;
+    cur0 += delta;      /* form error * 3 */
+    errorptr[0] = (FSERROR) (bpreverr0 + cur0);
+    cur0 += delta;      /* form error * 5 */
+    bpreverr0 = belowerr0 + cur0;
+    belowerr0 = bnexterr;
+    cur0 += delta;      /* form error * 7 */
+    bnexterr = cur1;    /* Process component 1 */
+    delta = cur1 * 2;
+    cur1 += delta;      /* form error * 3 */
+    errorptr[1] = (FSERROR) (bpreverr1 + cur1);
+    cur1 += delta;      /* form error * 5 */
+    bpreverr1 = belowerr1 + cur1;
+    belowerr1 = bnexterr;
+    cur1 += delta;      /* form error * 7 */
+    bnexterr = cur2;    /* Process component 2 */
+    delta = cur2 * 2;
+    cur2 += delta;      /* form error * 3 */
+    errorptr[2] = (FSERROR) (bpreverr2 + cur2);
+    cur2 += delta;      /* form error * 5 */
+    bpreverr2 = belowerr2 + cur2;
+    belowerr2 = bnexterr;
+    cur2 += delta;      /* form error * 7 */
+      }
+      /* At this point curN contains the 7/16 error value to be propagated
+       * to the next pixel on the current line, and all the errors for the
+       * next line have been shifted over.  We are therefore ready to move on.
+       */
+      inptr += dir3;        /* Advance pixel pointers to next column */
+      outptr += dir;
+      errorptr += dir3;     /* advance errorptr to current column */
+    }
+    /* Post-loop cleanup: we must unload the final error values into the
+     * final fserrors[] entry.  Note we need not unload belowerrN because
+     * it is for the dummy column before or after the actual array.
+     */
+    errorptr[0] = (FSERROR) bpreverr0; /* unload prev errs into array */
+    errorptr[1] = (FSERROR) bpreverr1;
+    errorptr[2] = (FSERROR) bpreverr2;
+  }
+}
+
+
+/*
+ * Initialize the error-limiting transfer function (lookup table).
+ * The raw F-S error computation can potentially compute error values of up to
+ * +- MAXJSAMPLE.  But we want the maximum correction applied to a pixel to be
+ * much less, otherwise obviously wrong pixels will be created.  (Typical
+ * effects include weird fringes at color-area boundaries, isolated bright
+ * pixels in a dark area, etc.)  The standard advice for avoiding this problem
+ * is to ensure that the "corners" of the color cube are allocated as output
+ * colors; then repeated errors in the same direction cannot cause cascading
+ * error buildup.  However, that only prevents the error from getting
+ * completely out of hand; Aaron Giles reports that error limiting improves
+ * the results even with corner colors allocated.
+ * A simple clamping of the error values to about +- MAXJSAMPLE/8 works pretty
+ * well, but the smoother transfer function used below is even better.  Thanks
+ * to Aaron Giles for this idea.
+ */
+
+static void
+init_error_limit (j_decompress_ptr cinfo)
+/* Allocate and fill in the error_limiter table */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  int * table;
+  int in, out;
+
+  table = (int *) malloc((MAXJSAMPLE*2+1) * sizeof(int));
+  table += MAXJSAMPLE;      /* so can index -MAXJSAMPLE .. +MAXJSAMPLE */
+  cquantize->error_limiter = table;
+
+#define STEPSIZE ((MAXJSAMPLE+1)/16)
+  /* Map errors 1:1 up to +- MAXJSAMPLE/16 */
+  out = 0;
+  for (in = 0; in < STEPSIZE; in++, out++) {
+    table[in] = out; table[-in] = -out;
+  }
+  /* Map errors 1:2 up to +- 3*MAXJSAMPLE/16 */
+  for (; in < STEPSIZE*3; in++, out += (in&1) ? 0 : 1) {
+    table[in] = out; table[-in] = -out;
+  }
+  /* Clamp the rest to final out value (which is (MAXJSAMPLE+1)/8) */
+  for (; in <= MAXJSAMPLE; in++) {
+    table[in] = out; table[-in] = -out;
+  }
+#undef STEPSIZE
+}
+
+
+/*
+ * Finish up at the end of each pass.
+ */
+
+void
+finish_pass1 (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+
+  /* Select the representative colors and fill in cinfo->colormap */
+  cinfo->colormap = cquantize->sv_colormap;
+  select_colors(cinfo, cquantize->desired);
+  /* Force next pass to zero the color index table */
+  cquantize->needs_zeroed = true;
+}
+
+
+void
+finish_pass2 (j_decompress_ptr WXUNUSED(cinfo))
+{
+  /* no work */
+}
+
+
+/*
+ * Initialize for each processing pass.
+ */
+
+void
+start_pass_2_quant (j_decompress_ptr cinfo, bool is_pre_scan)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+
+  if (is_pre_scan) {
+    /* Set up method pointers */
+    cquantize->pub.color_quantize = prescan_quantize;
+    cquantize->pub.finish_pass = finish_pass1;
+    cquantize->needs_zeroed = true; /* Always zero histogram */
+  } else {
+    /* Set up method pointers */
+    cquantize->pub.color_quantize = pass2_fs_dither;
+    cquantize->pub.finish_pass = finish_pass2;
+
+    {
+      size_t arraysize = (size_t) ((cinfo->output_width + 2) *
+                   (3 * sizeof(FSERROR)));
+      /* Allocate Floyd-Steinberg workspace if we didn't already. */
+      if (cquantize->fserrors == NULL)
+    cquantize->fserrors = (INT16*) malloc(arraysize);
+      /* Initialize the propagated errors to zero. */
+      memset((void  *) cquantize->fserrors, 0, arraysize);
+      /* Make the error-limit table if we didn't already. */
+      if (cquantize->error_limiter == NULL)
+    init_error_limit(cinfo);
+      cquantize->on_odd_row = false;
+    }
+
+  }
+  /* Zero the histogram or inverse color map, if necessary */
+  if (cquantize->needs_zeroed) {
+    for (int i = 0; i < HIST_C0_ELEMS; i++) {
+      memset((void  *) histogram[i], 0,
+        HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
+    }
+    cquantize->needs_zeroed = false;
+  }
+}
+
+
+/*
+ * Switch to a new external colormap between output passes.
+ */
+
+void
+new_color_map_2_quant (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+
+  /* Reset the inverse color map */
+  cquantize->needs_zeroed = true;
+}
+
+
+/*
+ * Module initialization routine for 2-pass color quantization.
+ */
+
+void
+jinit_2pass_quantizer (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize;
+  int i;
+
+  cquantize = (my_cquantize_ptr) malloc(sizeof(my_cquantizer));
+  cinfo->cquantize = (jpeg_color_quantizer *) cquantize;
+  cquantize->pub.start_pass = start_pass_2_quant;
+  cquantize->pub.new_color_map = new_color_map_2_quant;
+  cquantize->fserrors = NULL;   /* flag optional arrays not allocated */
+  cquantize->error_limiter = NULL;
+
+
+  /* Allocate the histogram/inverse colormap storage */
+  cquantize->histogram = (hist3d) malloc(HIST_C0_ELEMS * sizeof(hist2d));
+  for (i = 0; i < HIST_C0_ELEMS; i++) {
+    cquantize->histogram[i] = (hist2d) malloc(HIST_C1_ELEMS*HIST_C2_ELEMS * sizeof(histcell));
+  }
+  cquantize->needs_zeroed = true; /* histogram is garbage now */
+
+  /* Allocate storage for the completed colormap, if required.
+   * We do this now since it is  storage and may affect
+   * the memory manager's space calculations.
+   */
+  {
+    /* Make sure color count is acceptable */
+    int desired = cinfo->desired_number_of_colors;
+
+    cquantize->sv_colormap = (JSAMPARRAY) malloc(sizeof(JSAMPROW) * 3);
+    cquantize->sv_colormap[0] = (JSAMPROW) malloc(sizeof(JSAMPLE) * desired);
+    cquantize->sv_colormap[1] = (JSAMPROW) malloc(sizeof(JSAMPLE) * desired);
+    cquantize->sv_colormap[2] = (JSAMPROW) malloc(sizeof(JSAMPLE) * desired);
+
+    cquantize->desired = desired;
+  }
+
+  /* Allocate Floyd-Steinberg workspace if necessary.
+   * This isn't really needed until pass 2, but again it is  storage.
+   * Although we will cope with a later change in dither_mode,
+   * we do not promise to honor max_memory_to_use if dither_mode changes.
+   */
+  {
+    cquantize->fserrors = (FSERRPTR) malloc(
+       (size_t) ((cinfo->output_width + 2) * (3 * sizeof(FSERROR))));
+    /* Might as well create the error-limiting table too. */
+    init_error_limit(cinfo);
+  }
+}
+
+
+
+
+
+
+
+
+
+
+void
+prepare_range_limit_table (j_decompress_ptr cinfo)
+/* Allocate and fill in the sample_range_limit table */
+{
+  JSAMPLE * table;
+  int i;
+
+  table = (JSAMPLE *) malloc((5 * (MAXJSAMPLE+1) + CENTERJSAMPLE) * sizeof(JSAMPLE));
+  cinfo->srl_orig = table;
+  table += (MAXJSAMPLE+1);  /* allow negative subscripts of simple table */
+  cinfo->sample_range_limit = table;
+  /* First segment of "simple" table: limit[x] = 0 for x < 0 */
+  memset(table - (MAXJSAMPLE+1), 0, (MAXJSAMPLE+1) * sizeof(JSAMPLE));
+  /* Main part of "simple" table: limit[x] = x */
+  for (i = 0; i <= MAXJSAMPLE; i++)
+    table[i] = (JSAMPLE) i;
+  table += CENTERJSAMPLE;   /* Point to where post-IDCT table starts */
+  /* End of simple table, rest of first half of post-IDCT table */
+  for (i = CENTERJSAMPLE; i < 2*(MAXJSAMPLE+1); i++)
+    table[i] = MAXJSAMPLE;
+  /* Second half of post-IDCT table */
+  memset(table + (2 * (MAXJSAMPLE+1)), 0,
+      (2 * (MAXJSAMPLE+1) - CENTERJSAMPLE) * sizeof(JSAMPLE));
+  memcpy(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
+      cinfo->sample_range_limit, CENTERJSAMPLE * sizeof(JSAMPLE));
+}
+
+
+
+
+/*
+ * wxQuantize
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxQuantize, wxObject)
+
+void wxQuantize::DoQuantize(unsigned w, unsigned h, unsigned char **in_rows, unsigned char **out_rows,
+    unsigned char *palette, int desiredNoColours)
+{
+    j_decompress dec;
+    my_cquantize_ptr cquantize;
+
+    dec.output_width = w;
+    dec.desired_number_of_colors = desiredNoColours;
+    prepare_range_limit_table(&dec);
+    jinit_2pass_quantizer(&dec);
+    cquantize = (my_cquantize_ptr) dec.cquantize;
+
+
+    cquantize->pub.start_pass(&dec, true);
+    cquantize->pub.color_quantize(&dec, in_rows, out_rows, h);
+    cquantize->pub.finish_pass(&dec);
+
+    cquantize->pub.start_pass(&dec, false);
+    cquantize->pub.color_quantize(&dec, in_rows, out_rows, h);
+    cquantize->pub.finish_pass(&dec);
+
+
+    for (int i = 0; i < dec.desired_number_of_colors; i++) {
+        palette[3 * i + 0] = dec.colormap[0][i];
+        palette[3 * i + 1] = dec.colormap[1][i];
+        palette[3 * i + 2] = dec.colormap[2][i];
+    }
+
+    for (int ii = 0; ii < HIST_C0_ELEMS; ii++) free(cquantize->histogram[ii]);
+    free(cquantize->histogram);
+    free(dec.colormap[0]);
+    free(dec.colormap[1]);
+    free(dec.colormap[2]);
+    free(dec.colormap);
+    free(dec.srl_orig);
+
+    //free(cquantize->error_limiter);
+    free((void*)(cquantize->error_limiter - MAXJSAMPLE)); // To reverse what was done to it
+
+    free(cquantize->fserrors);
+    free(cquantize);
+}
+
+// TODO: somehow make use of the Windows system colours, rather than ignoring them for the
+// purposes of quantization.
+
+bool wxQuantize::Quantize(const wxImage& src, wxImage& dest,
+                          wxPalette** pPalette,
+                          int desiredNoColours,
+                          unsigned char** eightBitData,
+                          int flags)
+
+{
+    int i;
+
+    int windowsSystemColourCount = 20;
+
+    int paletteShift = 0;
+
+    // Shift the palette up by the number of Windows system colours,
+    // if necessary
+    if (flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS)
+        paletteShift = windowsSystemColourCount;
+
+    // Make room for the Windows system colours
+#ifdef __WXMSW__
+    if ((flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS) && (desiredNoColours > (256 - windowsSystemColourCount)))
+        desiredNoColours = 256 - windowsSystemColourCount;
+#endif
+
+    // create rows info:
+    int h = src.GetHeight();
+    int w = src.GetWidth();
+    unsigned char **rows = new unsigned char *[h];
+    unsigned char *imgdt = src.GetData();
+    for (i = 0; i < h; i++)
+        rows[i] = imgdt + 3/*RGB*/ * w * i;
+
+    unsigned char palette[3*256];
+
+    // This is the image as represented by palette indexes.
+    unsigned char *data8bit = new unsigned char[w * h];
+    unsigned char **outrows = new unsigned char *[h];
+    for (i = 0; i < h; i++)
+        outrows[i] = data8bit + w * i;
+
+    //RGB->palette
+    DoQuantize(w, h, rows, outrows, palette, desiredNoColours);
+
+    delete[] rows;
+    delete[] outrows;
+
+    // palette->RGB(max.256)
+
+    if (flags & wxQUANTIZE_FILL_DESTINATION_IMAGE)
+    {
+        if (!dest.Ok())
+            dest.Create(w, h);
+
+        imgdt = dest.GetData();
+        for (i = 0; i < w * h; i++)
+        {
+            unsigned char c = data8bit[i];
+            imgdt[3 * i + 0/*R*/] = palette[3 * c + 0];
+            imgdt[3 * i + 1/*G*/] = palette[3 * c + 1];
+            imgdt[3 * i + 2/*B*/] = palette[3 * c + 2];
+        }
+    }
+
+    if (eightBitData && (flags & wxQUANTIZE_RETURN_8BIT_DATA))
+    {
+#ifdef __WXMSW__
+        if (flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS)
+        {
+            // We need to shift the palette entries up
+            // to make room for the Windows system colours.
+            for (i = 0; i < w * h; i++)
+                data8bit[i] = (unsigned char)(data8bit[i] + paletteShift);
+        }
+#endif
+        *eightBitData = data8bit;
+    }
+    else
+        delete[] data8bit;
+
+#if wxUSE_PALETTE
+    // Make a wxWidgets palette
+    if (pPalette)
+    {
+        unsigned char* r = new unsigned char[256];
+        unsigned char* g = new unsigned char[256];
+        unsigned char* b = new unsigned char[256];
+
+#ifdef __WXMSW__
+        // Fill the first 20 entries with Windows system colours
+        if (flags & wxQUANTIZE_INCLUDE_WINDOWS_COLOURS)
+        {
+            HDC hDC = ::GetDC(NULL);
+            PALETTEENTRY* entries = new PALETTEENTRY[windowsSystemColourCount];
+            ::GetSystemPaletteEntries(hDC, 0, windowsSystemColourCount, entries);
+            ::ReleaseDC(NULL, hDC);
+
+            for (i = 0; i < windowsSystemColourCount; i++)
+            {
+                r[i] = entries[i].peRed;
+                g[i] = entries[i].peGreen;
+                b[i] = entries[i].peBlue;
+            }
+            delete[] entries;
+        }
+#endif
+
+        for (i = 0; i < desiredNoColours; i++)
+        {
+            r[i+paletteShift] = palette[i*3 + 0];
+            g[i+paletteShift] = palette[i*3 + 1];
+            b[i+paletteShift] = palette[i*3 + 2];
+        }
+
+        // Blank out any remaining palette entries
+        for (i = desiredNoColours+paletteShift; i < 256; i++)
+        {
+            r[i] = 0;
+            g[i] = 0;
+            b[i] = 0;
+        }
+        *pPalette = new wxPalette(256, r, g, b);
+        delete[] r;
+        delete[] g;
+        delete[] b;
+    }
+#endif // wxUSE_PALETTE
+
+    return true;
+}
+
+// This version sets a palette in the destination image so you don't
+// have to manage it yourself.
+
+bool wxQuantize::Quantize(const wxImage& src,
+                          wxImage& dest,
+                          int desiredNoColours,
+                          unsigned char** eightBitData,
+                          int flags)
+{
+    wxPalette* palette = NULL;
+    if ( !Quantize(src, dest, & palette, desiredNoColours, eightBitData, flags) )
+        return false;
+
+#if wxUSE_PALETTE
+    if (palette)
+    {
+        dest.SetPalette(* palette);
+        delete palette;
+    }
+#endif // wxUSE_PALETTE
+
+    return true;
+}
+
+#endif
+    // wxUSE_IMAGE
diff --git a/Source/3rd Party/wx/src/common/radiobtncmn.cpp b/Source/3rd Party/wx/src/common/radiobtncmn.cpp
deleted file mode 100644
index f9f8daa24..000000000
--- a/Source/3rd Party/wx/src/common/radiobtncmn.cpp	
+++ /dev/null
@@ -1,96 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/radiobtncmn.cpp
-// Purpose:     wxRadioButton common code
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RADIOBTN
-
-#include "wx/radiobut.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/settings.h"
-    #include "wx/dcscreen.h"
-#endif
-
-extern WXDLLEXPORT_DATA(const char) wxRadioButtonNameStr[] = "radioButton";
-extern WXDLLEXPORT_DATA(const char) wxBitmapRadioButtonNameStr[] = "radioButton";
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxRadioButtonStyle )
-wxBEGIN_FLAGS( wxRadioButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxRB_GROUP)
-wxEND_FLAGS( wxRadioButtonStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl, "wx/radiobut.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxRadioButton)
-    wxEVENT_PROPERTY( Click, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEvent )
-    wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group") )
-    wxPROPERTY( Value,bool, SetValue, GetValue, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group") )
-    wxPROPERTY_FLAGS( WindowStyle, wxRadioButtonStyle, long, SetWindowStyleFlag, \
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                      wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxRadioButton)
-
-wxCONSTRUCTOR_6( wxRadioButton, wxWindow*, Parent, wxWindowID, Id, \
-                 wxString, Label, wxPoint, Position, wxSize, Size, long, WindowStyle )
-
-
-#endif // wxUSE_RADIOBTN
diff --git a/Source/3rd Party/wx/src/common/radiocmn.cpp b/Source/3rd Party/wx/src/common/radiocmn.cpp
index 100d682fe..418d4f04f 100644
--- a/Source/3rd Party/wx/src/common/radiocmn.cpp	
+++ b/Source/3rd Party/wx/src/common/radiocmn.cpp	
@@ -1,373 +1,304 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/radiocmn.cpp
-// Purpose:     wxRadioBox methods common to all ports
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     03.06.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RADIOBOX
-
-#ifndef WX_PRECOMP
-    #include "wx/radiobox.h"
-#endif //WX_PRECOMP
-
-#if wxUSE_TOOLTIPS
-    #include "wx/tooltip.h"
-#endif // wxUSE_TOOLTIPS
-
-#if wxUSE_HELP
-    #include "wx/cshelp.h"
-#endif
-
-extern WXDLLEXPORT_DATA(const char) wxRadioBoxNameStr[] = "radioBox";
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-// TODO: wxCONSTRUCTOR
-#if 0 // wxUSE_EXTENDED_RTTI
-wxDEFINE_FLAGS( wxRadioBoxStyle )
-
-wxBEGIN_FLAGS( wxRadioBoxStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxRA_SPECIFY_COLS)
-wxFLAGS_MEMBER(wxRA_HORIZONTAL)
-wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS)
-wxFLAGS_MEMBER(wxRA_VERTICAL)
-
-wxEND_FLAGS( wxRadioBoxStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxRadioBox)
-wxEVENT_PROPERTY( Select , wxEVT_COMMAND_RADIOBOX_SELECTED , wxCommandEvent )
-wxPROPERTY_FLAGS( WindowStyle , wxRadioBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-/*
- selection
- content
- label
- dimension
- item
- */
-
-#endif
-
-
-// ----------------------------------------------------------------------------
-// wxRadioBoxBase
-// ----------------------------------------------------------------------------
-
-void wxRadioBoxBase::SetMajorDim(unsigned int majorDim, long style)
-{
-    wxCHECK_RET( majorDim != 0, wxT("major radiobox dimension can't be 0") );
-
-    m_majorDim = majorDim;
-
-    int minorDim = (GetCount() + m_majorDim - 1) / m_majorDim;
-
-    if ( style & wxRA_SPECIFY_COLS )
-    {
-        m_numCols = majorDim;
-        m_numRows = minorDim;
-    }
-    else // wxRA_SPECIFY_ROWS
-    {
-        m_numCols = minorDim;
-        m_numRows = majorDim;
-    }
-}
-
-int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
-{
-    const int itemStart = item;
-
-    int count = GetCount(),
-        numCols = GetColumnCount(),
-        numRows = GetRowCount();
-
-    bool horz = (style & wxRA_SPECIFY_COLS) != 0;
-
-    do
-    {
-        switch ( dir )
-        {
-            case wxUP:
-                if ( horz )
-                {
-                    item -= numCols;
-                }
-                else // vertical layout
-                {
-                    if ( !item-- )
-                        item = count - 1;
-                }
-                break;
-
-            case wxLEFT:
-                if ( horz )
-                {
-                    if ( !item-- )
-                        item = count - 1;
-                }
-                else // vertical layout
-                {
-                    item -= numRows;
-                }
-                break;
-
-            case wxDOWN:
-                if ( horz )
-                {
-                    item += numCols;
-                }
-                else // vertical layout
-                {
-                    if ( ++item == count )
-                        item = 0;
-                }
-                break;
-
-            case wxRIGHT:
-                if ( horz )
-                {
-                    if ( ++item == count )
-                        item = 0;
-                }
-                else // vertical layout
-                {
-                    item += numRows;
-                }
-                break;
-
-            default:
-                wxFAIL_MSG( wxT("unexpected wxDirection value") );
-                return wxNOT_FOUND;
-        }
-
-        // ensure that the item is in range [0..count)
-        if ( item < 0 )
-        {
-            // first map the item to the one in the same column but in the last
-            // row
-            item += count;
-
-            // now there are 2 cases: either it is the first item of the last
-            // row in which case we need to wrap again and get to the last item
-            // or we can just go to the previous item
-            if ( item % (horz ? numCols : numRows) )
-                item--;
-            else
-                item = count - 1;
-        }
-        else if ( item >= count )
-        {
-            // same logic as above
-            item -= count;
-
-            // ... except that we need to check if this is not the last item,
-            // not the first one
-            if ( (item + 1) % (horz ? numCols : numRows) )
-                item++;
-            else
-                item = 0;
-        }
-
-        wxASSERT_MSG( item < count && item >= 0,
-                      wxT("logic error in wxRadioBox::GetNextItem()") );
-    }
-    // we shouldn't select the non-active items, continue looking for a
-    // visible and shown one unless we came back to the item we started from in
-    // which case bail out to avoid infinite loop
-    while ( !(IsItemShown(item) && IsItemEnabled(item)) && item != itemStart );
-
-    return item;
-}
-
-#if wxUSE_TOOLTIPS
-
-void wxRadioBoxBase::SetItemToolTip(unsigned int item, const wxString& text)
-{
-    wxASSERT_MSG( item < GetCount(), wxT("Invalid item index") );
-
-    // extend the array to have entries for all our items on first use
-    if ( !m_itemsTooltips )
-    {
-        m_itemsTooltips = new wxToolTipArray;
-        m_itemsTooltips->resize(GetCount());
-    }
-
-    wxToolTip *tooltip = (*m_itemsTooltips)[item];
-
-    bool changed = true;
-    if ( text.empty() )
-    {
-        if ( tooltip )
-        {
-            // delete the tooltip
-            wxDELETE(tooltip);
-        }
-        else // nothing to do
-        {
-            changed = false;
-        }
-    }
-    else // non empty tooltip text
-    {
-        if ( tooltip )
-        {
-            // just change the existing tooltip text, don't change the tooltip
-            tooltip->SetTip(text);
-            changed = false;
-        }
-        else // no tooltip yet
-        {
-            // create the new one
-            tooltip = new wxToolTip(text);
-        }
-    }
-
-    if ( changed )
-    {
-        (*m_itemsTooltips)[item] = tooltip;
-        DoSetItemToolTip(item, tooltip);
-    }
-}
-
-void
-wxRadioBoxBase::DoSetItemToolTip(unsigned int WXUNUSED(item),
-                                 wxToolTip * WXUNUSED(tooltip))
-{
-    // per-item tooltips not implemented by default
-}
-
-#endif // wxUSE_TOOLTIPS
-
-wxRadioBoxBase::~wxRadioBoxBase()
-{
-#if wxUSE_TOOLTIPS
-    if ( m_itemsTooltips )
-    {
-        const size_t n = m_itemsTooltips->size();
-        for ( size_t i = 0; i < n; i++ )
-            delete (*m_itemsTooltips)[i];
-
-        delete m_itemsTooltips;
-    }
-#endif // wxUSE_TOOLTIPS
-}
-
-#if wxUSE_HELP
-
-// set helptext for a particular item
-void wxRadioBoxBase::SetItemHelpText(unsigned int n, const wxString& helpText)
-{
-    wxCHECK_RET( n < GetCount(), wxT("Invalid item index") );
-
-    if ( m_itemsHelpTexts.empty() )
-    {
-        // once-only initialization of the array: reserve space for all items
-        m_itemsHelpTexts.Add(wxEmptyString, GetCount());
-    }
-
-    m_itemsHelpTexts[n] = helpText;
-}
-
-// retrieve helptext for a particular item
-wxString wxRadioBoxBase::GetItemHelpText( unsigned int n ) const
-{
-    wxCHECK_MSG( n < GetCount(), wxEmptyString, wxT("Invalid item index") );
-
-    return m_itemsHelpTexts.empty() ? wxString() : m_itemsHelpTexts[n];
-}
-
-// return help text for the item for which wxEVT_HELP was generated.
-wxString wxRadioBoxBase::DoGetHelpTextAtPoint(const wxWindow *derived,
-                                              const wxPoint& pt,
-                                              wxHelpEvent::Origin origin) const
-{
-    int item;
-    switch ( origin )
-    {
-        case wxHelpEvent::Origin_HelpButton:
-            item = GetItemFromPoint(pt);
-            break;
-
-        case wxHelpEvent::Origin_Keyboard:
-            item = GetSelection();
-            break;
-
-        default:
-            wxFAIL_MSG( "unknown help even origin" );
-            // fall through
-
-        case wxHelpEvent::Origin_Unknown:
-            // this value is used when we're called from GetHelpText() for the
-            // radio box itself, so don't return item-specific text in this case
-            item = wxNOT_FOUND;
-    }
-
-    if ( item != wxNOT_FOUND )
-    {
-        wxString text = GetItemHelpText(static_cast<unsigned int>(item));
-        if( !text.empty() )
-            return text;
-    }
-
-    return derived->wxWindowBase::GetHelpTextAtPoint(pt, origin);
-}
-
-#endif // wxUSE_HELP
-
-#endif // wxUSE_RADIOBOX
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/radiocmn.cpp
+// Purpose:     wxRadioBox methods common to all ports
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     03.06.01
+// RCS-ID:      $Id: radiocmn.cpp 54930 2008-08-02 19:45:23Z VZ $
+// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_RADIOBOX
+
+#ifndef WX_PRECOMP
+    #include "wx/radiobox.h"
+#endif //WX_PRECOMP
+
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+
+#if wxUSE_HELP
+    #include "wx/cshelp.h"
+#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+void wxRadioBoxBase::SetMajorDim(unsigned int majorDim, long style)
+{
+    wxCHECK_RET( majorDim != 0, _T("major radiobox dimension can't be 0") );
+
+    m_majorDim = majorDim;
+
+    int minorDim = (GetCount() + m_majorDim - 1) / m_majorDim;
+
+    if ( style & wxRA_SPECIFY_COLS )
+    {
+        m_numCols = majorDim;
+        m_numRows = minorDim;
+    }
+    else // wxRA_SPECIFY_ROWS
+    {
+        m_numCols = minorDim;
+        m_numRows = majorDim;
+    }
+}
+
+int wxRadioBoxBase::GetNextItem(int item, wxDirection dir, long style) const
+{
+    const int itemStart = item;
+
+    int count = GetCount(),
+        numCols = GetColumnCount(),
+        numRows = GetRowCount();
+
+    bool horz = (style & wxRA_SPECIFY_COLS) != 0;
+
+    do
+    {
+        switch ( dir )
+        {
+            case wxUP:
+                if ( horz )
+                {
+                    item -= numCols;
+                }
+                else // vertical layout
+                {
+                    if ( !item-- )
+                        item = count - 1;
+                }
+                break;
+
+            case wxLEFT:
+                if ( horz )
+                {
+                    if ( !item-- )
+                        item = count - 1;
+                }
+                else // vertical layout
+                {
+                    item -= numRows;
+                }
+                break;
+
+            case wxDOWN:
+                if ( horz )
+                {
+                    item += numCols;
+                }
+                else // vertical layout
+                {
+                    if ( ++item == count )
+                        item = 0;
+                }
+                break;
+
+            case wxRIGHT:
+                if ( horz )
+                {
+                    if ( ++item == count )
+                        item = 0;
+                }
+                else // vertical layout
+                {
+                    item += numRows;
+                }
+                break;
+
+            default:
+                wxFAIL_MSG( _T("unexpected wxDirection value") );
+                return wxNOT_FOUND;
+        }
+
+        // ensure that the item is in range [0..count)
+        if ( item < 0 )
+        {
+            // first map the item to the one in the same column but in the last
+            // row
+            item += count;
+
+            // now there are 2 cases: either it is the first item of the last
+            // row in which case we need to wrap again and get to the last item
+            // or we can just go to the previous item
+            if ( item % (horz ? numCols : numRows) )
+                item--;
+            else
+                item = count - 1;
+        }
+        else if ( item >= count )
+        {
+            // same logic as above
+            item -= count;
+
+            // ... except that we need to check if this is not the last item,
+            // not the first one
+            if ( (item + 1) % (horz ? numCols : numRows) )
+                item++;
+            else
+                item = 0;
+        }
+
+        wxASSERT_MSG( item < count && item >= 0,
+                      _T("logic error in wxRadioBox::GetNextItem()") );
+    }
+    // we shouldn't select the non-active items, continue looking for a
+    // visible and shown one unless we came back to the item we started from in
+    // which case bail out to avoid infinite loop
+    while ( !(IsItemShown(item) && IsItemEnabled(item)) && item != itemStart );
+
+    return item;
+}
+
+#if wxUSE_TOOLTIPS
+
+void wxRadioBoxBase::SetItemToolTip(unsigned int item, const wxString& text)
+{
+    wxASSERT_MSG( item < GetCount(), _T("Invalid item index") );
+
+    // extend the array to have entries for all our items on first use
+    if ( !m_itemsTooltips )
+    {
+        m_itemsTooltips = new wxToolTipArray;
+        m_itemsTooltips->resize(GetCount());
+    }
+
+    wxToolTip *tooltip = (*m_itemsTooltips)[item];
+
+    bool changed = true;
+    if ( text.empty() )
+    {
+        if ( tooltip )
+        {
+            // delete the tooltip
+            delete tooltip;
+            tooltip = NULL;
+        }
+        else // nothing to do
+        {
+            changed = false;
+        }
+    }
+    else // non empty tooltip text
+    {
+        if ( tooltip )
+        {
+            // just change the existing tooltip text, don't change the tooltip
+            tooltip->SetTip(text);
+            changed = false;
+        }
+        else // no tooltip yet
+        {
+            // create the new one
+            tooltip = new wxToolTip(text);
+        }
+    }
+
+    if ( changed )
+    {
+        (*m_itemsTooltips)[item] = tooltip;
+        DoSetItemToolTip(item, tooltip);
+    }
+}
+
+void
+wxRadioBoxBase::DoSetItemToolTip(unsigned int WXUNUSED(item),
+                                 wxToolTip * WXUNUSED(tooltip))
+{
+    // per-item tooltips not implemented by default
+}
+
+#endif // wxUSE_TOOLTIPS
+
+wxRadioBoxBase::~wxRadioBoxBase()
+{
+#if wxUSE_TOOLTIPS
+    if ( m_itemsTooltips )
+    {
+        const size_t n = m_itemsTooltips->size();
+        for ( size_t i = 0; i < n; i++ )
+            delete (*m_itemsTooltips)[i];
+
+        delete m_itemsTooltips;
+    }
+#endif // wxUSE_TOOLTIPS
+}
+
+#if wxUSE_HELP
+
+// set helptext for a particular item
+void wxRadioBoxBase::SetItemHelpText(unsigned int n, const wxString& helpText)
+{
+    wxCHECK_RET( n < GetCount(), _T("Invalid item index") );
+
+    if ( m_itemsHelpTexts.empty() )
+    {
+        // once-only initialization of the array: reserve space for all items
+        m_itemsHelpTexts.Add(wxEmptyString, GetCount());
+    }
+
+    m_itemsHelpTexts[n] = helpText;
+}
+
+// retrieve helptext for a particular item
+wxString wxRadioBoxBase::GetItemHelpText( unsigned int n ) const
+{
+    wxCHECK_MSG( n < GetCount(), wxEmptyString, _T("Invalid item index") );
+
+    return m_itemsHelpTexts.empty() ? wxString() : m_itemsHelpTexts[n];
+}
+
+// return help text for the item for which wxEVT_HELP was generated.
+wxString wxRadioBoxBase::DoGetHelpTextAtPoint(const wxWindow *derived,
+                                              const wxPoint& pt,
+                                              wxHelpEvent::Origin origin) const
+{
+    const int item = origin == wxHelpEvent::Origin_HelpButton
+                        ? GetItemFromPoint(pt)
+                        : GetSelection();
+
+    if ( item != wxNOT_FOUND )
+    {
+        wxString text = GetItemHelpText(wx_static_cast(unsigned int, item));
+        if( !text.empty() )
+            return text;
+    }
+
+    return derived->wxWindowBase::GetHelpTextAtPoint(pt, origin);
+}
+
+#endif // wxUSE_HELP
+
+#if WXWIN_COMPATIBILITY_2_4
+
+// these functions are deprecated and don't do anything
+int wxRadioBoxBase::GetNumberOfRowsOrCols() const
+{
+    return 1;
+}
+
+void wxRadioBoxBase::SetNumberOfRowsOrCols(int WXUNUSED(n))
+{
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
+#endif // wxUSE_RADIOBOX
diff --git a/Source/3rd Party/wx/src/common/rearrangectrl.cpp b/Source/3rd Party/wx/src/common/rearrangectrl.cpp
deleted file mode 100644
index 9795110b9..000000000
--- a/Source/3rd Party/wx/src/common/rearrangectrl.cpp	
+++ /dev/null
@@ -1,340 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/rearrangectrl.cpp
-// Purpose:     implementation of classes in wx/rearrangectrl.h
-// Author:      Vadim Zeitlin
-// Created:     2008-12-15
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_REARRANGECTRL
-
-#ifndef WX_PRECOMP
-    #include "wx/button.h"
-    #include "wx/stattext.h"
-    #include "wx/sizer.h"
-#endif // WX_PRECOMP
-
-#include "wx/rearrangectrl.h"
-
-// ============================================================================
-// wxRearrangeList implementation
-// ============================================================================
-
-extern
-WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeListNameStr[] = "wxRearrangeList";
-
-BEGIN_EVENT_TABLE(wxRearrangeList, wxCheckListBox)
-    EVT_CHECKLISTBOX(wxID_ANY, wxRearrangeList::OnCheck)
-END_EVENT_TABLE()
-
-bool wxRearrangeList::Create(wxWindow *parent,
-                             wxWindowID id,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             const wxArrayInt& order,
-                             const wxArrayString& items,
-                             long style,
-                             const wxValidator& validator,
-                             const wxString& name)
-{
-    // construct the array of items in the order in which they should appear in
-    // the control
-    const size_t count = items.size();
-    wxCHECK_MSG( order.size() == count, false, "arrays not in sync" );
-
-    wxArrayString itemsInOrder;
-    itemsInOrder.reserve(count);
-    size_t n;
-    for ( n = 0; n < count; n++ )
-    {
-        int idx = order[n];
-        if ( idx < 0 )
-            idx = -idx - 1;
-        itemsInOrder.push_back(items[idx]);
-    }
-
-    // do create the real control
-    if ( !wxCheckListBox::Create(parent, id, pos, size, itemsInOrder,
-                                 style, validator, name) )
-        return false;
-
-    // and now check all the items which should be initially checked
-    for ( n = 0; n < count; n++ )
-    {
-        if ( order[n] >= 0 )
-            Check(n);
-    }
-
-    m_order = order;
-
-    return true;
-}
-
-bool wxRearrangeList::CanMoveCurrentUp() const
-{
-    const int sel = GetSelection();
-    return sel != wxNOT_FOUND && sel != 0;
-}
-
-bool wxRearrangeList::CanMoveCurrentDown() const
-{
-    const int sel = GetSelection();
-    return sel != wxNOT_FOUND && static_cast<unsigned>(sel) != GetCount() - 1;
-}
-
-bool wxRearrangeList::MoveCurrentUp()
-{
-    const int sel = GetSelection();
-    if ( sel == wxNOT_FOUND || sel == 0 )
-        return false;
-
-    Swap(sel, sel - 1);
-    SetSelection(sel - 1);
-
-    return true;
-}
-
-bool wxRearrangeList::MoveCurrentDown()
-{
-    const int sel = GetSelection();
-    if ( sel == wxNOT_FOUND || static_cast<unsigned>(sel) == GetCount() - 1 )
-        return false;
-
-    Swap(sel, sel + 1);
-    SetSelection(sel + 1);
-
-    return true;
-}
-
-void wxRearrangeList::Swap(int pos1, int pos2)
-{
-    // update the internally stored order
-    wxSwap(m_order[pos1], m_order[pos2]);
-
-
-    // and now also swap all the attributes of the items
-
-    // first the label
-    const wxString stringTmp = GetString(pos1);
-    SetString(pos1, GetString(pos2));
-    SetString(pos2, stringTmp);
-
-    // then the checked state
-    const bool checkedTmp = IsChecked(pos1);
-    Check(pos1, IsChecked(pos2));
-    Check(pos2, checkedTmp);
-
-    // and finally the client data, if necessary
-    switch ( GetClientDataType() )
-    {
-        case wxClientData_None:
-            // nothing to do
-            break;
-
-        case wxClientData_Object:
-            {
-                wxClientData * const dataTmp = DetachClientObject(pos1);
-                SetClientObject(pos1, DetachClientObject(pos2));
-                SetClientObject(pos2, dataTmp);
-            }
-            break;
-
-        case wxClientData_Void:
-            {
-                void * const dataTmp = GetClientData(pos1);
-                SetClientData(pos1, GetClientData(pos2));
-                SetClientData(pos2, dataTmp);
-            }
-            break;
-    }
-}
-
-void wxRearrangeList::OnCheck(wxCommandEvent& event)
-{
-    // update the internal state to match the new item state
-    const int n = event.GetInt();
-
-    m_order[n] = ~m_order[n];
-
-    wxASSERT_MSG( (m_order[n] >= 0) == IsChecked(n),
-                  "discrepancy between internal state and GUI" );
-}
-
-// ============================================================================
-// wxRearrangeCtrl implementation
-// ============================================================================
-
-BEGIN_EVENT_TABLE(wxRearrangeCtrl, wxPanel)
-    EVT_UPDATE_UI(wxID_UP, wxRearrangeCtrl::OnUpdateButtonUI)
-    EVT_UPDATE_UI(wxID_DOWN, wxRearrangeCtrl::OnUpdateButtonUI)
-
-    EVT_BUTTON(wxID_UP, wxRearrangeCtrl::OnButton)
-    EVT_BUTTON(wxID_DOWN, wxRearrangeCtrl::OnButton)
-END_EVENT_TABLE()
-
-void wxRearrangeCtrl::Init()
-{
-    m_list = NULL;
-}
-
-bool
-wxRearrangeCtrl::Create(wxWindow *parent,
-                        wxWindowID id,
-                        const wxPoint& pos,
-                        const wxSize& size,
-                        const wxArrayInt& order,
-                        const wxArrayString& items,
-                        long style,
-                        const wxValidator& validator,
-                        const wxString& name)
-{
-    // create all the windows
-    if ( !wxPanel::Create(parent, id, pos, size, wxTAB_TRAVERSAL, name) )
-        return false;
-
-    m_list = new wxRearrangeList(this, wxID_ANY,
-                                 wxDefaultPosition, wxDefaultSize,
-                                 order, items,
-                                 style, validator);
-    wxButton * const btnUp = new wxButton(this, wxID_UP);
-    wxButton * const btnDown = new wxButton(this, wxID_DOWN);
-
-    // arrange them in a sizer
-    wxSizer * const sizerBtns = new wxBoxSizer(wxVERTICAL);
-    sizerBtns->Add(btnUp, wxSizerFlags().Centre().Border(wxBOTTOM));
-    sizerBtns->Add(btnDown, wxSizerFlags().Centre().Border(wxTOP));
-
-    wxSizer * const sizerTop = new wxBoxSizer(wxHORIZONTAL);
-    sizerTop->Add(m_list, wxSizerFlags(1).Expand().Border(wxRIGHT));
-    sizerTop->Add(sizerBtns, wxSizerFlags(0).Centre().Border(wxLEFT));
-    SetSizer(sizerTop);
-
-    m_list->SetFocus();
-
-    return true;
-}
-
-void wxRearrangeCtrl::OnUpdateButtonUI(wxUpdateUIEvent& event)
-{
-    event.Enable( event.GetId() == wxID_UP ? m_list->CanMoveCurrentUp()
-                                           : m_list->CanMoveCurrentDown() );
-}
-
-void wxRearrangeCtrl::OnButton(wxCommandEvent& event)
-{
-    if ( event.GetId() == wxID_UP )
-        m_list->MoveCurrentUp();
-    else
-        m_list->MoveCurrentDown();
-}
-
-// ============================================================================
-// wxRearrangeDialog implementation
-// ============================================================================
-
-extern
-WXDLLIMPEXP_DATA_CORE(const char) wxRearrangeDialogNameStr[] = "wxRearrangeDlg";
-
-namespace
-{
-
-enum wxRearrangeDialogSizerPositions
-{
-    Pos_Label,
-    Pos_Ctrl,
-    Pos_Buttons,
-    Pos_Max
-};
-
-} // anonymous namespace
-
-bool wxRearrangeDialog::Create(wxWindow *parent,
-                               const wxString& message,
-                               const wxString& title,
-                               const wxArrayInt& order,
-                               const wxArrayString& items,
-                               const wxPoint& pos,
-                               const wxString& name)
-{
-    if ( !wxDialog::Create(parent, wxID_ANY, title,
-                           pos, wxDefaultSize,
-                           wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER,
-                           name) )
-        return false;
-
-    m_ctrl = new wxRearrangeCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                                 order, items);
-
-    // notice that the items in this sizer should be inserted accordingly to
-    // wxRearrangeDialogSizerPositions order
-    wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
-
-    if ( !message.empty() )
-    {
-        sizerTop->Add(new wxStaticText(this, wxID_ANY, message),
-                      wxSizerFlags().Border());
-    }
-    else
-    {
-        // for convenience of other wxRearrangeDialog code that depends on
-        // positions of sizer items, insert a dummy zero-sized item
-        sizerTop->AddSpacer(0);
-    }
-
-    sizerTop->Add(m_ctrl,
-                  wxSizerFlags(1).Expand().Border());
-    sizerTop->Add(CreateSeparatedButtonSizer(wxOK | wxCANCEL),
-                  wxSizerFlags().Expand().Border());
-    SetSizerAndFit(sizerTop);
-
-    return true;
-}
-
-void wxRearrangeDialog::AddExtraControls(wxWindow *win)
-{
-    wxSizer * const sizer = GetSizer();
-    wxCHECK_RET( sizer, "the dialog must be created first" );
-
-    wxASSERT_MSG( sizer->GetChildren().GetCount() == Pos_Max,
-                  "calling AddExtraControls() twice?" );
-
-    sizer->Insert(Pos_Buttons, win, wxSizerFlags().Expand().Border());
-
-    win->MoveAfterInTabOrder(m_ctrl);
-
-    // we need to update the initial/minimal window size
-    sizer->SetSizeHints(this);
-}
-
-wxRearrangeList *wxRearrangeDialog::GetList() const
-{
-    wxCHECK_MSG( m_ctrl, NULL, "the dialog must be created first" );
-
-    return m_ctrl->GetList();
-}
-
-wxArrayInt wxRearrangeDialog::GetOrder() const
-{
-    wxCHECK_MSG( m_ctrl, wxArrayInt(), "the dialog must be created first" );
-
-    return m_ctrl->GetList()->GetCurrentOrder();
-}
-
-#endif // wxUSE_REARRANGECTRL
diff --git a/Source/3rd Party/wx/src/common/regex.cpp b/Source/3rd Party/wx/src/common/regex.cpp
index ec865f2b9..bd77aafe2 100644
--- a/Source/3rd Party/wx/src/common/regex.cpp	
+++ b/Source/3rd Party/wx/src/common/regex.cpp	
@@ -1,697 +1,689 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/regex.cpp
-// Purpose:     regular expression matching
-// Author:      Karsten Ballueder and Vadim Zeitlin
-// Modified by:
-// Created:     13.07.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Karsten Ballueder <ballueder@gmx.net>
-//                  2001 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_REGEX
-
-#include "wx/regex.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/object.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/crt.h"
-#endif //WX_PRECOMP
-
-// FreeBSD, Watcom and DMars require this, CW doesn't have nor need it.
-// Others also don't seem to need it. If you have an error related to
-// (not) including <sys/types.h> please report details to
-// wx-dev@lists.wxwindows.org
-#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
-#   include <sys/types.h>
-#endif
-
-#include <regex.h>
-
-// WXREGEX_USING_BUILTIN    defined when using the built-in regex lib
-// WXREGEX_USING_RE_SEARCH  defined when using re_search in the GNU regex lib
-// WXREGEX_IF_NEED_LEN()    wrap the len parameter only used with the built-in
-//                          or GNU regex
-// WXREGEX_CONVERT_TO_MB    defined when the regex lib is using chars and
-//                          wxChar is wide, so conversion must be done
-// WXREGEX_CHAR(x)          Convert wxChar to wxRegChar
-//
-#ifdef __REG_NOFRONT
-#   define WXREGEX_USING_BUILTIN
-#   define WXREGEX_IF_NEED_LEN(x) ,x
-#   if wxUSE_UNICODE
-#       define WXREGEX_CHAR(x) (x).wc_str()
-#   else
-#       define WXREGEX_CHAR(x) (x).mb_str()
-#   endif
-#else
-#   ifdef HAVE_RE_SEARCH
-#       define WXREGEX_IF_NEED_LEN(x) ,x
-#       define WXREGEX_USING_RE_SEARCH
-#   else
-#       define WXREGEX_IF_NEED_LEN(x)
-#   endif
-#   if wxUSE_UNICODE
-#       define WXREGEX_CONVERT_TO_MB
-#   endif
-#   define WXREGEX_CHAR(x) (x).mb_str()
-#   define wx_regfree regfree
-#   define wx_regerror regerror
-#endif
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-#ifndef WXREGEX_USING_RE_SEARCH
-
-// the array of offsets for the matches, the usual POSIX regmatch_t array.
-class wxRegExMatches
-{
-public:
-    typedef regmatch_t *match_type;
-
-    wxRegExMatches(size_t n)        { m_matches = new regmatch_t[n]; }
-    ~wxRegExMatches()               { delete [] m_matches; }
-
-    // we just use casts here because the fields of regmatch_t struct may be 64
-    // bit but we're limited to size_t in our public API and are not going to
-    // change it because operating on strings longer than 4GB using it is
-    // absolutely impractical anyhow
-    size_t Start(size_t n) const
-    {
-        return wx_truncate_cast(size_t, m_matches[n].rm_so);
-    }
-
-    size_t End(size_t n) const
-    {
-        return wx_truncate_cast(size_t, m_matches[n].rm_eo);
-    }
-
-    regmatch_t *get() const         { return m_matches; }
-
-private:
-    regmatch_t *m_matches;
-};
-
-#else // WXREGEX_USING_RE_SEARCH
-
-// the array of offsets for the matches, the struct used by the GNU lib
-class wxRegExMatches
-{
-public:
-    typedef re_registers *match_type;
-
-    wxRegExMatches(size_t n)
-    {
-        m_matches.num_regs = n;
-        m_matches.start = new regoff_t[n];
-        m_matches.end = new regoff_t[n];
-    }
-
-    ~wxRegExMatches()
-    {
-        delete [] m_matches.start;
-        delete [] m_matches.end;
-    }
-
-    size_t Start(size_t n) const    { return m_matches.start[n]; }
-    size_t End(size_t n) const      { return m_matches.end[n]; }
-
-    re_registers *get()             { return &m_matches; }
-
-private:
-    re_registers m_matches;
-};
-
-#endif // WXREGEX_USING_RE_SEARCH
-
-// the character type used by the regular expression engine
-#ifndef WXREGEX_CONVERT_TO_MB
-typedef wxChar wxRegChar;
-#else
-typedef char wxRegChar;
-#endif
-
-// the real implementation of wxRegEx
-class wxRegExImpl
-{
-public:
-    // ctor and dtor
-    wxRegExImpl();
-    ~wxRegExImpl();
-
-    // return true if Compile() had been called successfully
-    bool IsValid() const { return m_isCompiled; }
-
-    // RE operations
-    bool Compile(const wxString& expr, int flags = 0);
-    bool Matches(const wxRegChar *str, int flags
-                 WXREGEX_IF_NEED_LEN(size_t len)) const;
-    bool GetMatch(size_t *start, size_t *len, size_t index = 0) const;
-    size_t GetMatchCount() const;
-    int Replace(wxString *pattern, const wxString& replacement,
-                size_t maxMatches = 0) const;
-
-private:
-    // return the string containing the error message for the given err code
-    wxString GetErrorMsg(int errorcode, bool badconv) const;
-
-    // init the members
-    void Init()
-    {
-        m_isCompiled = false;
-        m_Matches = NULL;
-        m_nMatches = 0;
-    }
-
-    // free the RE if compiled
-    void Free()
-    {
-        if ( IsValid() )
-        {
-            wx_regfree(&m_RegEx);
-        }
-
-        delete m_Matches;
-    }
-
-    // free the RE if any and reinit the members
-    void Reinit()
-    {
-        Free();
-        Init();
-    }
-
-    // compiled RE
-    regex_t         m_RegEx;
-
-    // the subexpressions data
-    wxRegExMatches *m_Matches;
-    size_t          m_nMatches;
-
-    // true if m_RegEx is valid
-    bool            m_isCompiled;
-};
-
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxRegExImpl
-// ----------------------------------------------------------------------------
-
-wxRegExImpl::wxRegExImpl()
-{
-    Init();
-}
-
-wxRegExImpl::~wxRegExImpl()
-{
-    Free();
-}
-
-wxString wxRegExImpl::GetErrorMsg(int errorcode, bool badconv) const
-{
-#ifdef WXREGEX_CONVERT_TO_MB
-    // currently only needed when using system library in Unicode mode
-    if ( badconv )
-    {
-        return _("conversion to 8-bit encoding failed");
-    }
-#else
-    // 'use' badconv to avoid a compiler warning
-    (void)badconv;
-#endif
-
-    wxString szError;
-
-    // first get the string length needed
-    int len = wx_regerror(errorcode, &m_RegEx, NULL, 0);
-    if ( len > 0 )
-    {
-        char* szcmbError = new char[++len];
-
-        (void)wx_regerror(errorcode, &m_RegEx, szcmbError, len);
-
-        szError = wxConvLibc.cMB2WX(szcmbError);
-        delete [] szcmbError;
-    }
-    else // regerror() returned 0
-    {
-        szError = _("unknown error");
-    }
-
-    return szError;
-}
-
-bool wxRegExImpl::Compile(const wxString& expr, int flags)
-{
-    Reinit();
-
-#ifdef WX_NO_REGEX_ADVANCED
-#   define FLAVORS wxRE_BASIC
-#else
-#   define FLAVORS (wxRE_ADVANCED | wxRE_BASIC)
-    wxASSERT_MSG( (flags & FLAVORS) != FLAVORS,
-                  wxT("incompatible flags in wxRegEx::Compile") );
-#endif
-    wxASSERT_MSG( !(flags & ~(FLAVORS | wxRE_ICASE | wxRE_NOSUB | wxRE_NEWLINE)),
-                  wxT("unrecognized flags in wxRegEx::Compile") );
-
-    // translate our flags to regcomp() ones
-    int flagsRE = 0;
-    if ( !(flags & wxRE_BASIC) )
-    {
-#ifndef WX_NO_REGEX_ADVANCED
-        if (flags & wxRE_ADVANCED)
-            flagsRE |= REG_ADVANCED;
-        else
-#endif
-            flagsRE |= REG_EXTENDED;
-    }
-    if ( flags & wxRE_ICASE )
-        flagsRE |= REG_ICASE;
-    if ( flags & wxRE_NOSUB )
-        flagsRE |= REG_NOSUB;
-    if ( flags & wxRE_NEWLINE )
-        flagsRE |= REG_NEWLINE;
-
-    // compile it
-#ifdef WXREGEX_USING_BUILTIN
-    bool conv = true;
-    // FIXME-UTF8: use wc_str() after removing ANSI build
-    int errorcode = wx_re_comp(&m_RegEx, expr.c_str(), expr.length(), flagsRE);
-#else
-    // FIXME-UTF8: this is potentially broken, we shouldn't even try it
-    //             and should always use builtin regex library (or PCRE?)
-    const wxWX2MBbuf conv = expr.mbc_str();
-    int errorcode = conv ? regcomp(&m_RegEx, conv, flagsRE) : REG_BADPAT;
-#endif
-
-    if ( errorcode )
-    {
-        wxLogError(_("Invalid regular expression '%s': %s"),
-                   expr.c_str(), GetErrorMsg(errorcode, !conv).c_str());
-
-        m_isCompiled = false;
-    }
-    else // ok
-    {
-        // don't allocate the matches array now, but do it later if necessary
-        if ( flags & wxRE_NOSUB )
-        {
-            // we don't need it at all
-            m_nMatches = 0;
-        }
-        else
-        {
-            // we will alloc the array later (only if really needed) but count
-            // the number of sub-expressions in the regex right now
-
-            // there is always one for the whole expression
-            m_nMatches = 1;
-
-            // and some more for bracketed subexperessions
-            for ( const wxChar *cptr = expr.c_str(); *cptr; cptr++ )
-            {
-                if ( *cptr == wxT('\\') )
-                {
-                    // in basic RE syntax groups are inside \(...\)
-                    if ( *++cptr == wxT('(') && (flags & wxRE_BASIC) )
-                    {
-                        m_nMatches++;
-                    }
-                }
-                else if ( *cptr == wxT('(') && !(flags & wxRE_BASIC) )
-                {
-                    // we know that the previous character is not an unquoted
-                    // backslash because it would have been eaten above, so we
-                    // have a bare '(' and this indicates a group start for the
-                    // extended syntax. '(?' is used for extensions by perl-
-                    // like REs (e.g. advanced), and is not valid for POSIX
-                    // extended, so ignore them always.
-                    if ( cptr[1] != wxT('?') )
-                        m_nMatches++;
-                }
-            }
-        }
-
-        m_isCompiled = true;
-    }
-
-    return IsValid();
-}
-
-#ifdef WXREGEX_USING_RE_SEARCH
-
-// On GNU, regexec is implemented as a wrapper around re_search. re_search
-// requires a length parameter which the POSIX regexec does not have,
-// therefore regexec must do a strlen on the search text each time it is
-// called. This can drastically affect performance when matching is done in
-// a loop along a string, such as during a search and replace. Therefore if
-// re_search is detected by configure, it is used directly.
-//
-static int ReSearch(const regex_t *preg,
-                    const char *text,
-                    size_t len,
-                    re_registers *matches,
-                    int eflags)
-{
-    regex_t *pattern = const_cast<regex_t*>(preg);
-
-    pattern->not_bol = (eflags & REG_NOTBOL) != 0;
-    pattern->not_eol = (eflags & REG_NOTEOL) != 0;
-    pattern->regs_allocated = REGS_FIXED;
-
-    int ret = re_search(pattern, text, len, 0, len, matches);
-    return ret >= 0 ? 0 : REG_NOMATCH;
-}
-
-#endif // WXREGEX_USING_RE_SEARCH
-
-bool wxRegExImpl::Matches(const wxRegChar *str,
-                          int flags
-                          WXREGEX_IF_NEED_LEN(size_t len)) const
-{
-    wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") );
-
-    // translate our flags to regexec() ones
-    wxASSERT_MSG( !(flags & ~(wxRE_NOTBOL | wxRE_NOTEOL)),
-                  wxT("unrecognized flags in wxRegEx::Matches") );
-
-    int flagsRE = 0;
-    if ( flags & wxRE_NOTBOL )
-        flagsRE |= REG_NOTBOL;
-    if ( flags & wxRE_NOTEOL )
-        flagsRE |= REG_NOTEOL;
-
-    // allocate matches array if needed
-    wxRegExImpl *self = wxConstCast(this, wxRegExImpl);
-    if ( !m_Matches && m_nMatches )
-    {
-        self->m_Matches = new wxRegExMatches(m_nMatches);
-    }
-
-    wxRegExMatches::match_type matches = m_Matches ? m_Matches->get() : NULL;
-
-    // do match it
-#if defined WXREGEX_USING_BUILTIN
-    int rc = wx_re_exec(&self->m_RegEx, str, len, NULL, m_nMatches, matches, flagsRE);
-#elif defined WXREGEX_USING_RE_SEARCH
-    int rc = str ? ReSearch(&self->m_RegEx, str, len, matches, flagsRE) : REG_BADPAT;
-#else
-    int rc = str ? regexec(&self->m_RegEx, str, m_nMatches, matches, flagsRE) : REG_BADPAT;
-#endif
-
-    switch ( rc )
-    {
-        case 0:
-            // matched successfully
-            return true;
-
-        default:
-            // an error occurred
-            wxLogError(_("Failed to find match for regular expression: %s"),
-                       GetErrorMsg(rc, !str).c_str());
-            // fall through
-
-        case REG_NOMATCH:
-            // no match
-            return false;
-    }
-}
-
-bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const
-{
-    wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") );
-    wxCHECK_MSG( m_nMatches, false, wxT("can't use with wxRE_NOSUB") );
-    wxCHECK_MSG( m_Matches, false, wxT("must call Matches() first") );
-    wxCHECK_MSG( index < m_nMatches, false, wxT("invalid match index") );
-
-    if ( start )
-        *start = m_Matches->Start(index);
-    if ( len )
-        *len = m_Matches->End(index) - m_Matches->Start(index);
-
-    return true;
-}
-
-size_t wxRegExImpl::GetMatchCount() const
-{
-    wxCHECK_MSG( IsValid(), 0, wxT("must successfully Compile() first") );
-    wxCHECK_MSG( m_nMatches, 0, wxT("can't use with wxRE_NOSUB") );
-
-    return m_nMatches;
-}
-
-int wxRegExImpl::Replace(wxString *text,
-                         const wxString& replacement,
-                         size_t maxMatches) const
-{
-    wxCHECK_MSG( text, wxNOT_FOUND, wxT("NULL text in wxRegEx::Replace") );
-    wxCHECK_MSG( IsValid(), wxNOT_FOUND, wxT("must successfully Compile() first") );
-
-    // the input string
-#ifndef WXREGEX_CONVERT_TO_MB
-    const wxChar *textstr = text->c_str();
-    size_t textlen = text->length();
-#else
-    const wxWX2MBbuf textstr = WXREGEX_CHAR(*text);
-    if (!textstr)
-    {
-        wxLogError(_("Failed to find match for regular expression: %s"),
-                   GetErrorMsg(0, true).c_str());
-        return 0;
-    }
-    size_t textlen = strlen(textstr);
-    text->clear();
-#endif
-
-    // the replacement text
-    wxString textNew;
-
-    // the result, allow 25% extra
-    wxString result;
-    result.reserve(5 * textlen / 4);
-
-    // attempt at optimization: don't iterate over the string if it doesn't
-    // contain back references at all
-    bool mayHaveBackrefs =
-        replacement.find_first_of(wxT("\\&")) != wxString::npos;
-
-    if ( !mayHaveBackrefs )
-    {
-        textNew = replacement;
-    }
-
-    // the position where we start looking for the match
-    size_t matchStart = 0;
-
-    // number of replacement made: we won't make more than maxMatches of them
-    // (unless maxMatches is 0 which doesn't limit the number of replacements)
-    size_t countRepl = 0;
-
-    // note that "^" shouldn't match after the first call to Matches() so we
-    // use wxRE_NOTBOL to prevent it from happening
-    while ( (!maxMatches || countRepl < maxMatches) &&
-             Matches(
-#ifndef WXREGEX_CONVERT_TO_MB
-                    textstr + matchStart,
-#else
-                    textstr.data() + matchStart,
-#endif
-                    countRepl ? wxRE_NOTBOL : 0
-                    WXREGEX_IF_NEED_LEN(textlen - matchStart)) )
-    {
-        // the string possibly contains back references: we need to calculate
-        // the replacement text anew after each match
-        if ( mayHaveBackrefs )
-        {
-            mayHaveBackrefs = false;
-            textNew.clear();
-            textNew.reserve(replacement.length());
-
-            for ( const wxChar *p = replacement.c_str(); *p; p++ )
-            {
-                size_t index = (size_t)-1;
-
-                if ( *p == wxT('\\') )
-                {
-                    if ( wxIsdigit(*++p) )
-                    {
-                        // back reference
-                        wxChar *end;
-                        index = (size_t)wxStrtoul(p, &end, 10);
-                        p = end - 1; // -1 to compensate for p++ in the loop
-                    }
-                    //else: backslash used as escape character
-                }
-                else if ( *p == wxT('&') )
-                {
-                    // treat this as "\0" for compatbility with ed and such
-                    index = 0;
-                }
-
-                // do we have a back reference?
-                if ( index != (size_t)-1 )
-                {
-                    // yes, get its text
-                    size_t start, len;
-                    if ( !GetMatch(&start, &len, index) )
-                    {
-                        wxFAIL_MSG( wxT("invalid back reference") );
-
-                        // just eat it...
-                    }
-                    else
-                    {
-                        textNew += wxString(
-#ifndef WXREGEX_CONVERT_TO_MB
-                                textstr
-#else
-                                textstr.data()
-#endif
-                                + matchStart + start,
-                                *wxConvCurrent, len);
-
-                        mayHaveBackrefs = true;
-                    }
-                }
-                else // ordinary character
-                {
-                    textNew += *p;
-                }
-            }
-        }
-
-        size_t start, len;
-        if ( !GetMatch(&start, &len) )
-        {
-            // we did have match as Matches() returned true above!
-            wxFAIL_MSG( wxT("internal logic error in wxRegEx::Replace") );
-
-            return wxNOT_FOUND;
-        }
-
-        // an insurance against implementations that don't grow exponentially
-        // to ensure building the result takes linear time
-        if (result.capacity() < result.length() + start + textNew.length())
-            result.reserve(2 * result.length());
-
-#ifndef WXREGEX_CONVERT_TO_MB
-        result.append(*text, matchStart, start);
-#else
-        result.append(wxString(textstr.data() + matchStart, *wxConvCurrent, start));
-#endif
-        matchStart += start;
-        result.append(textNew);
-
-        countRepl++;
-
-        matchStart += len;
-    }
-
-#ifndef WXREGEX_CONVERT_TO_MB
-    result.append(*text, matchStart, wxString::npos);
-#else
-    result.append(wxString(textstr.data() + matchStart, *wxConvCurrent));
-#endif
-    *text = result;
-
-    return countRepl;
-}
-
-// ----------------------------------------------------------------------------
-// wxRegEx: all methods are mostly forwarded to wxRegExImpl
-// ----------------------------------------------------------------------------
-
-void wxRegEx::Init()
-{
-    m_impl = NULL;
-}
-
-wxRegEx::~wxRegEx()
-{
-    delete m_impl;
-}
-
-bool wxRegEx::Compile(const wxString& expr, int flags)
-{
-    if ( !m_impl )
-    {
-        m_impl = new wxRegExImpl;
-    }
-
-    if ( !m_impl->Compile(expr, flags) )
-    {
-        // error message already given in wxRegExImpl::Compile
-        wxDELETE(m_impl);
-
-        return false;
-    }
-
-    return true;
-}
-
-bool wxRegEx::Matches(const wxString& str, int flags) const
-{
-    wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") );
-
-    return m_impl->Matches(WXREGEX_CHAR(str), flags
-                            WXREGEX_IF_NEED_LEN(str.length()));
-}
-
-bool wxRegEx::GetMatch(size_t *start, size_t *len, size_t index) const
-{
-    wxCHECK_MSG( IsValid(), false, wxT("must successfully Compile() first") );
-
-    return m_impl->GetMatch(start, len, index);
-}
-
-wxString wxRegEx::GetMatch(const wxString& text, size_t index) const
-{
-    size_t start, len;
-    if ( !GetMatch(&start, &len, index) )
-        return wxEmptyString;
-
-    return text.Mid(start, len);
-}
-
-size_t wxRegEx::GetMatchCount() const
-{
-    wxCHECK_MSG( IsValid(), 0, wxT("must successfully Compile() first") );
-
-    return m_impl->GetMatchCount();
-}
-
-int wxRegEx::Replace(wxString *pattern,
-                     const wxString& replacement,
-                     size_t maxMatches) const
-{
-    wxCHECK_MSG( IsValid(), wxNOT_FOUND, wxT("must successfully Compile() first") );
-
-    return m_impl->Replace(pattern, replacement, maxMatches);
-}
-
-#endif // wxUSE_REGEX
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/regex.cpp
+// Purpose:     regular expression matching
+// Author:      Karsten Ballueder and Vadim Zeitlin
+// Modified by:
+// Created:     13.07.01
+// RCS-ID:      $Id: regex.cpp 57779 2009-01-02 17:35:16Z PC $
+// Copyright:   (c) 2000 Karsten Ballueder <ballueder@gmx.net>
+//                  2001 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_REGEX
+
+#include "wx/regex.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+#endif //WX_PRECOMP
+
+// FreeBSD, Watcom and DMars require this, CW doesn't have nor need it.
+// Others also don't seem to need it. If you have an error related to
+// (not) including <sys/types.h> please report details to
+// wx-dev@lists.wxwindows.org
+#if defined(__UNIX__) || defined(__WATCOMC__) || defined(__DIGITALMARS__)
+#   include <sys/types.h>
+#endif
+
+#include <regex.h>
+
+// WXREGEX_USING_BUILTIN    defined when using the built-in regex lib
+// WXREGEX_USING_RE_SEARCH  defined when using re_search in the GNU regex lib
+// WXREGEX_IF_NEED_LEN()    wrap the len parameter only used with the built-in
+//                          or GNU regex
+// WXREGEX_CONVERT_TO_MB    defined when the regex lib is using chars and
+//                          wxChar is wide, so conversion must be done
+// WXREGEX_CHAR(x)          Convert wxChar to wxRegChar
+//
+#ifdef __REG_NOFRONT
+#   define WXREGEX_USING_BUILTIN
+#   define WXREGEX_IF_NEED_LEN(x) ,x
+#   define WXREGEX_CHAR(x) x
+#else
+#   ifdef HAVE_RE_SEARCH
+#       define WXREGEX_IF_NEED_LEN(x) ,x
+#       define WXREGEX_USING_RE_SEARCH
+#   else
+#       define WXREGEX_IF_NEED_LEN(x)
+#   endif
+#   if wxUSE_UNICODE
+#       define WXREGEX_CONVERT_TO_MB
+#   endif
+#   define WXREGEX_CHAR(x) wxConvertWX2MB(x)
+#   define wx_regfree regfree
+#   define wx_regerror regerror
+#endif
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+#ifndef WXREGEX_USING_RE_SEARCH
+
+// the array of offsets for the matches, the usual POSIX regmatch_t array.
+class wxRegExMatches
+{
+public:
+    typedef regmatch_t *match_type;
+
+    wxRegExMatches(size_t n)        { m_matches = new regmatch_t[n]; }
+    ~wxRegExMatches()               { delete [] m_matches; }
+
+    // we just use casts here because the fields of regmatch_t struct may be 64
+    // bit but we're limited to size_t in our public API and are not going to
+    // change it because operating on strings longer than 4GB using it is
+    // absolutely impractical anyhow
+    size_t Start(size_t n) const
+    {
+        return wx_truncate_cast(size_t, m_matches[n].rm_so);
+    }
+
+    size_t End(size_t n) const
+    {
+        return wx_truncate_cast(size_t, m_matches[n].rm_eo);
+    }
+
+    regmatch_t *get() const         { return m_matches; }
+
+private:
+    regmatch_t *m_matches;
+};
+
+#else // WXREGEX_USING_RE_SEARCH
+
+// the array of offsets for the matches, the struct used by the GNU lib
+class wxRegExMatches
+{
+public:
+    typedef re_registers *match_type;
+
+    wxRegExMatches(size_t n)
+    {
+        m_matches.num_regs = n;
+        m_matches.start = new regoff_t[n];
+        m_matches.end = new regoff_t[n];
+    }
+
+    ~wxRegExMatches()
+    {
+        delete [] m_matches.start;
+        delete [] m_matches.end;
+    }
+
+    size_t Start(size_t n) const    { return m_matches.start[n]; }
+    size_t End(size_t n) const      { return m_matches.end[n]; }
+
+    re_registers *get()             { return &m_matches; }
+
+private:
+    re_registers m_matches;
+};
+
+#endif // WXREGEX_USING_RE_SEARCH
+
+// the character type used by the regular expression engine
+#ifndef WXREGEX_CONVERT_TO_MB
+typedef wxChar wxRegChar;
+#else
+typedef char wxRegChar;
+#endif
+
+// the real implementation of wxRegEx
+class wxRegExImpl
+{
+public:
+    // ctor and dtor
+    wxRegExImpl();
+    ~wxRegExImpl();
+
+    // return true if Compile() had been called successfully
+    bool IsValid() const { return m_isCompiled; }
+
+    // RE operations
+    bool Compile(const wxString& expr, int flags = 0);
+    bool Matches(const wxRegChar *str, int flags
+                 WXREGEX_IF_NEED_LEN(size_t len)) const;
+    bool GetMatch(size_t *start, size_t *len, size_t index = 0) const;
+    size_t GetMatchCount() const;
+    int Replace(wxString *pattern, const wxString& replacement,
+                size_t maxMatches = 0) const;
+
+private:
+    // return the string containing the error message for the given err code
+    wxString GetErrorMsg(int errorcode, bool badconv) const;
+
+    // init the members
+    void Init()
+    {
+        m_isCompiled = false;
+        m_Matches = NULL;
+        m_nMatches = 0;
+    }
+
+    // free the RE if compiled
+    void Free()
+    {
+        if ( IsValid() )
+        {
+            wx_regfree(&m_RegEx);
+        }
+
+        delete m_Matches;
+    }
+
+    // free the RE if any and reinit the members
+    void Reinit()
+    {
+        Free();
+        Init();
+    }
+
+    // compiled RE
+    regex_t         m_RegEx;
+
+    // the subexpressions data
+    wxRegExMatches *m_Matches;
+    size_t          m_nMatches;
+
+    // true if m_RegEx is valid
+    bool            m_isCompiled;
+};
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxRegExImpl
+// ----------------------------------------------------------------------------
+
+wxRegExImpl::wxRegExImpl()
+{
+    Init();
+}
+
+wxRegExImpl::~wxRegExImpl()
+{
+    Free();
+}
+
+wxString wxRegExImpl::GetErrorMsg(int errorcode, bool badconv) const
+{
+#ifdef WXREGEX_CONVERT_TO_MB
+    // currently only needed when using system library in Unicode mode
+    if ( badconv )
+    {
+        return _("conversion to 8-bit encoding failed");
+    }
+#else
+    // 'use' badconv to avoid a compiler warning
+    (void)badconv;
+#endif
+
+    wxString szError;
+
+    // first get the string length needed
+    int len = wx_regerror(errorcode, &m_RegEx, NULL, 0);
+    if ( len > 0 )
+    {
+        char* szcmbError = new char[++len];
+
+        (void)wx_regerror(errorcode, &m_RegEx, szcmbError, len);
+
+        szError = wxConvertMB2WX(szcmbError);
+        delete [] szcmbError;
+    }
+    else // regerror() returned 0
+    {
+        szError = _("unknown error");
+    }
+
+    return szError;
+}
+
+bool wxRegExImpl::Compile(const wxString& expr, int flags)
+{
+    Reinit();
+
+#ifdef WX_NO_REGEX_ADVANCED
+#   define FLAVORS wxRE_BASIC
+#else
+#   define FLAVORS (wxRE_ADVANCED | wxRE_BASIC)
+    wxASSERT_MSG( (flags & FLAVORS) != FLAVORS,
+                  _T("incompatible flags in wxRegEx::Compile") );
+#endif
+    wxASSERT_MSG( !(flags & ~(FLAVORS | wxRE_ICASE | wxRE_NOSUB | wxRE_NEWLINE)),
+                  _T("unrecognized flags in wxRegEx::Compile") );
+
+    // translate our flags to regcomp() ones
+    int flagsRE = 0;
+    if ( !(flags & wxRE_BASIC) )
+    {
+#ifndef WX_NO_REGEX_ADVANCED
+        if (flags & wxRE_ADVANCED)
+            flagsRE |= REG_ADVANCED;
+        else
+#endif
+            flagsRE |= REG_EXTENDED;
+    }
+
+    if ( flags & wxRE_ICASE )
+        flagsRE |= REG_ICASE;
+    if ( flags & wxRE_NOSUB )
+        flagsRE |= REG_NOSUB;
+    if ( flags & wxRE_NEWLINE )
+        flagsRE |= REG_NEWLINE;
+
+    // compile it
+#ifdef WXREGEX_USING_BUILTIN
+    bool conv = true;
+    int errorcode = wx_re_comp(&m_RegEx, expr, expr.length(), flagsRE);
+#else
+    const wxWX2MBbuf conv = expr.mbc_str();
+    int errorcode = conv ? regcomp(&m_RegEx, conv, flagsRE) : REG_BADPAT;
+#endif
+
+    if ( errorcode )
+    {
+        wxLogError(_("Invalid regular expression '%s': %s"),
+                   expr.c_str(), GetErrorMsg(errorcode, !conv).c_str());
+
+        m_isCompiled = false;
+    }
+    else // ok
+    {
+        // don't allocate the matches array now, but do it later if necessary
+        if ( flags & wxRE_NOSUB )
+        {
+            // we don't need it at all
+            m_nMatches = 0;
+        }
+        else
+        {
+            // we will alloc the array later (only if really needed) but count
+            // the number of sub-expressions in the regex right now
+
+            // there is always one for the whole expression
+            m_nMatches = 1;
+
+            // and some more for bracketed subexperessions
+            for ( const wxChar *cptr = expr.c_str(); *cptr; cptr++ )
+            {
+                if ( *cptr == _T('\\') )
+                {
+                    // in basic RE syntax groups are inside \(...\)
+                    if ( *++cptr == _T('(') && (flags & wxRE_BASIC) )
+                    {
+                        m_nMatches++;
+                    }
+                }
+                else if ( *cptr == _T('(') && !(flags & wxRE_BASIC) )
+                {
+                    // we know that the previous character is not an unquoted
+                    // backslash because it would have been eaten above, so we
+                    // have a bare '(' and this indicates a group start for the
+                    // extended syntax. '(?' is used for extensions by perl-
+                    // like REs (e.g. advanced), and is not valid for POSIX
+                    // extended, so ignore them always.
+                    if ( cptr[1] != _T('?') )
+                        m_nMatches++;
+                }
+            }
+        }
+
+        m_isCompiled = true;
+    }
+
+    return IsValid();
+}
+
+#ifdef WXREGEX_USING_RE_SEARCH
+
+// On GNU, regexec is implemented as a wrapper around re_search. re_search
+// requires a length parameter which the POSIX regexec does not have,
+// therefore regexec must do a strlen on the search text each time it is
+// called. This can drastically affect performance when matching is done in
+// a loop along a string, such as during a search and replace. Therefore if
+// re_search is detected by configure, it is used directly.
+//
+static int ReSearch(const regex_t *preg,
+                    const char *text,
+                    size_t len,
+                    re_registers *matches,
+                    int eflags)
+{
+    regex_t *pattern = wx_const_cast(regex_t*, preg);
+
+    pattern->not_bol = (eflags & REG_NOTBOL) != 0;
+    pattern->not_eol = (eflags & REG_NOTEOL) != 0;
+    pattern->regs_allocated = REGS_FIXED;
+
+    int ret = re_search(pattern, text, len, 0, len, matches);
+    return ret >= 0 ? 0 : REG_NOMATCH;
+}
+
+#endif // WXREGEX_USING_RE_SEARCH
+
+bool wxRegExImpl::Matches(const wxRegChar *str,
+                          int flags
+                          WXREGEX_IF_NEED_LEN(size_t len)) const
+{
+    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
+
+    // translate our flags to regexec() ones
+    wxASSERT_MSG( !(flags & ~(wxRE_NOTBOL | wxRE_NOTEOL)),
+                  _T("unrecognized flags in wxRegEx::Matches") );
+
+    int flagsRE = 0;
+    if ( flags & wxRE_NOTBOL )
+        flagsRE |= REG_NOTBOL;
+    if ( flags & wxRE_NOTEOL )
+        flagsRE |= REG_NOTEOL;
+
+    // allocate matches array if needed
+    wxRegExImpl *self = wxConstCast(this, wxRegExImpl);
+    if ( !m_Matches && m_nMatches )
+    {
+        self->m_Matches = new wxRegExMatches(m_nMatches);
+    }
+
+    wxRegExMatches::match_type matches = m_Matches ? m_Matches->get() : NULL;
+
+    // do match it
+#if defined WXREGEX_USING_BUILTIN
+    int rc = wx_re_exec(&self->m_RegEx, str, len, NULL, m_nMatches, matches, flagsRE);
+#elif defined WXREGEX_USING_RE_SEARCH
+    int rc = str ? ReSearch(&self->m_RegEx, str, len, matches, flagsRE) : REG_BADPAT;
+#else
+    int rc = str ? regexec(&self->m_RegEx, str, m_nMatches, matches, flagsRE) : REG_BADPAT;
+#endif
+
+    switch ( rc )
+    {
+        case 0:
+            // matched successfully
+            return true;
+
+        default:
+            // an error occurred
+            wxLogError(_("Failed to find match for regular expression: %s"),
+                       GetErrorMsg(rc, !str).c_str());
+            // fall through
+
+        case REG_NOMATCH:
+            // no match
+            return false;
+    }
+}
+
+bool wxRegExImpl::GetMatch(size_t *start, size_t *len, size_t index) const
+{
+    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
+    wxCHECK_MSG( m_nMatches, false, _T("can't use with wxRE_NOSUB") );
+    wxCHECK_MSG( m_Matches, false, _T("must call Matches() first") );
+    wxCHECK_MSG( index < m_nMatches, false, _T("invalid match index") );
+
+    if ( start )
+        *start = m_Matches->Start(index);
+    if ( len )
+        *len = m_Matches->End(index) - m_Matches->Start(index);
+
+    return true;
+}
+
+size_t wxRegExImpl::GetMatchCount() const
+{
+    wxCHECK_MSG( IsValid(), 0, _T("must successfully Compile() first") );
+    wxCHECK_MSG( m_nMatches, 0, _T("can't use with wxRE_NOSUB") );
+
+    return m_nMatches;
+}
+
+int wxRegExImpl::Replace(wxString *text,
+                         const wxString& replacement,
+                         size_t maxMatches) const
+{
+    wxCHECK_MSG( text, wxNOT_FOUND, _T("NULL text in wxRegEx::Replace") );
+    wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") );
+
+    // the input string
+#ifndef WXREGEX_CONVERT_TO_MB
+    const wxChar *textstr = text->c_str();
+    size_t textlen = text->length();
+#else
+    const wxWX2MBbuf textstr = WXREGEX_CHAR(*text);
+    if (!textstr)
+    {
+        wxLogError(_("Failed to find match for regular expression: %s"),
+                   GetErrorMsg(0, true).c_str());
+        return 0;
+    }
+    size_t textlen = strlen(textstr);
+    text->clear();
+#endif
+
+    // the replacement text
+    wxString textNew;
+
+    // the result, allow 25% extra
+    wxString result;
+    result.reserve(5 * textlen / 4);
+
+    // attempt at optimization: don't iterate over the string if it doesn't
+    // contain back references at all
+    bool mayHaveBackrefs =
+        replacement.find_first_of(_T("\\&")) != wxString::npos;
+
+    if ( !mayHaveBackrefs )
+    {
+        textNew = replacement;
+    }
+
+    // the position where we start looking for the match
+    size_t matchStart = 0;
+
+    // number of replacement made: we won't make more than maxMatches of them
+    // (unless maxMatches is 0 which doesn't limit the number of replacements)
+    size_t countRepl = 0;
+
+    // note that "^" shouldn't match after the first call to Matches() so we
+    // use wxRE_NOTBOL to prevent it from happening
+    while ( (!maxMatches || countRepl < maxMatches) &&
+            Matches(textstr + matchStart,
+                    countRepl ? wxRE_NOTBOL : 0
+                    WXREGEX_IF_NEED_LEN(textlen - matchStart)) )
+    {
+        // the string possibly contains back references: we need to calculate
+        // the replacement text anew after each match
+        if ( mayHaveBackrefs )
+        {
+            mayHaveBackrefs = false;
+            textNew.clear();
+            textNew.reserve(replacement.length());
+
+            for ( const wxChar *p = replacement.c_str(); *p; p++ )
+            {
+                size_t index = (size_t)-1;
+
+                if ( *p == _T('\\') )
+                {
+                    if ( wxIsdigit(*++p) )
+                    {
+                        // back reference
+                        wxChar *end;
+                        index = (size_t)wxStrtoul(p, &end, 10);
+                        p = end - 1; // -1 to compensate for p++ in the loop
+                    }
+                    //else: backslash used as escape character
+                }
+                else if ( *p == _T('&') )
+                {
+                    // treat this as "\0" for compatbility with ed and such
+                    index = 0;
+                }
+
+                // do we have a back reference?
+                if ( index != (size_t)-1 )
+                {
+                    // yes, get its text
+                    size_t start, len;
+                    if ( !GetMatch(&start, &len, index) )
+                    {
+                        wxFAIL_MSG( _T("invalid back reference") );
+
+                        // just eat it...
+                    }
+                    else
+                    {
+                        textNew += wxString(textstr + matchStart + start,
+                                            *wxConvCurrent, len);
+
+                        mayHaveBackrefs = true;
+                    }
+                }
+                else // ordinary character
+                {
+                    textNew += *p;
+                }
+            }
+        }
+
+        size_t start, len;
+        if ( !GetMatch(&start, &len) )
+        {
+            // we did have match as Matches() returned true above!
+            wxFAIL_MSG( _T("internal logic error in wxRegEx::Replace") );
+
+            return wxNOT_FOUND;
+        }
+
+        // an insurance against implementations that don't grow exponentially
+        // to ensure building the result takes linear time
+        if (result.capacity() < result.length() + start + textNew.length())
+            result.reserve(2 * result.length());
+
+#ifndef WXREGEX_CONVERT_TO_MB
+        result.append(*text, matchStart, start);
+#else
+        result.append(wxString(textstr + matchStart, *wxConvCurrent, start));
+#endif
+        matchStart += start;
+        result.append(textNew);
+
+        countRepl++;
+
+        matchStart += len;
+    }
+
+#ifndef WXREGEX_CONVERT_TO_MB
+    result.append(*text, matchStart, wxString::npos);
+#else
+    result.append(wxString(textstr + matchStart, *wxConvCurrent));
+#endif
+    *text = result;
+
+    return countRepl;
+}
+
+// ----------------------------------------------------------------------------
+// wxRegEx: all methods are mostly forwarded to wxRegExImpl
+// ----------------------------------------------------------------------------
+
+void wxRegEx::Init()
+{
+    m_impl = NULL;
+}
+
+wxRegEx::~wxRegEx()
+{
+    delete m_impl;
+}
+
+bool wxRegEx::Compile(const wxString& expr, int flags)
+{
+    if ( !m_impl )
+    {
+        m_impl = new wxRegExImpl;
+    }
+
+    if ( !m_impl->Compile(expr, flags) )
+    {
+        // error message already given in wxRegExImpl::Compile
+        delete m_impl;
+        m_impl = NULL;
+
+        return false;
+    }
+
+    return true;
+}
+
+bool wxRegEx::Matches(const wxChar *str, int flags, size_t len) const
+{
+    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
+    (void)len;
+
+    return m_impl->Matches(WXREGEX_CHAR(str), flags WXREGEX_IF_NEED_LEN(len));
+}
+
+bool wxRegEx::Matches(const wxChar *str, int flags) const
+{
+    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
+
+    return m_impl->Matches(WXREGEX_CHAR(str),
+                           flags
+                           WXREGEX_IF_NEED_LEN(wxStrlen(str)));
+}
+
+bool wxRegEx::GetMatch(size_t *start, size_t *len, size_t index) const
+{
+    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
+
+    return m_impl->GetMatch(start, len, index);
+}
+
+wxString wxRegEx::GetMatch(const wxString& text, size_t index) const
+{
+    size_t start, len;
+    if ( !GetMatch(&start, &len, index) )
+        return wxEmptyString;
+
+    return text.Mid(start, len);
+}
+
+size_t wxRegEx::GetMatchCount() const
+{
+    wxCHECK_MSG( IsValid(), 0, _T("must successfully Compile() first") );
+
+    return m_impl->GetMatchCount();
+}
+
+int wxRegEx::Replace(wxString *pattern,
+                     const wxString& replacement,
+                     size_t maxMatches) const
+{
+    wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") );
+
+    return m_impl->Replace(pattern, replacement, maxMatches);
+}
+
+#endif // wxUSE_REGEX
diff --git a/Source/3rd Party/wx/src/common/rendcmn.cpp b/Source/3rd Party/wx/src/common/rendcmn.cpp
index e2b84185b..702ffb4fa 100644
--- a/Source/3rd Party/wx/src/common/rendcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/rendcmn.cpp	
@@ -1,207 +1,208 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/rendcmn.cpp
-// Purpose:     wxRendererNative common functions
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     28.07.03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-#endif //WX_PRECOMP
-
-#include "wx/apptrait.h"
-#include "wx/renderer.h"
-
-#include "wx/scopedptr.h"
-
-#if wxUSE_DYNLIB_CLASS
-    #include "wx/dynlib.h"
-#endif // wxUSE_DYNLIB_CLASS
-
-// ----------------------------------------------------------------------------
-// wxRendererPtr: auto pointer holding the global renderer
-// ----------------------------------------------------------------------------
-
-typedef wxScopedPtr<wxRendererNative> wxRendererPtrBase;
-
-class wxRendererPtr : public wxRendererPtrBase
-{
-public:
-    // return true if we have a renderer, false otherwise
-    bool IsOk()
-    {
-        if ( !m_initialized )
-        {
-            // only try to create the renderer once
-            m_initialized = true;
-
-            DoInit();
-        }
-
-        return get() != NULL;
-    }
-
-    // return the global and unique wxRendererPtr
-    static wxRendererPtr& Get();
-
-private:
-    wxRendererPtr() : wxRendererPtrBase(NULL) { m_initialized = false; }
-
-    void DoInit()
-    {
-        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-        if ( traits )
-        {
-            // ask the traits object to create a renderer for us
-            reset(traits->CreateRenderer());
-        }
-    }
-
-    bool m_initialized;
-
-    // just to suppress a gcc warning
-    friend class wxRendererPtrDummyFriend;
-
-    wxDECLARE_NO_COPY_CLASS(wxRendererPtr);
-};
-
-// return the global and unique wxRendererPtr
-/*static*/ wxRendererPtr& wxRendererPtr::Get()
-{
-    static wxRendererPtr s_renderer;
-
-    return s_renderer;
-}
-
-#if wxUSE_DYNLIB_CLASS
-
-// ----------------------------------------------------------------------------
-// wxRendererFromDynLib: represents a renderer dynamically loaded from a DLL
-// ----------------------------------------------------------------------------
-
-class wxRendererFromDynLib : public wxDelegateRendererNative
-{
-public:
-    // create the object wrapping the given renderer created from this DLL
-    //
-    // we take ownership of the pointer and will delete it (and also unload the
-    // DLL) when we're deleted
-    wxRendererFromDynLib(wxDynamicLibrary& dll, wxRendererNative *renderer)
-        : wxDelegateRendererNative(*renderer),
-          m_renderer(renderer),
-          m_dllHandle(dll.Detach())
-        {
-        }
-
-    virtual ~wxRendererFromDynLib()
-    {
-        delete m_renderer;
-        wxDynamicLibrary::Unload(m_dllHandle);
-    }
-
-private:
-    wxRendererNative *m_renderer;
-    wxDllType m_dllHandle;
-};
-
-#endif // wxUSE_DYNLIB_CLASS
-
-// ============================================================================
-// wxRendererNative implementation
-// ============================================================================
-
-wxRendererNative::~wxRendererNative()
-{
-    // empty but necessary
-}
-
-// ----------------------------------------------------------------------------
-// Managing the global renderer
-// ----------------------------------------------------------------------------
-
-/* static */
-wxRendererNative& wxRendererNative::Get()
-{
-    wxRendererPtr& renderer = wxRendererPtr::Get();
-
-    return renderer.IsOk() ? *renderer.get() : GetDefault();
-}
-
-/* static */
-wxRendererNative *wxRendererNative::Set(wxRendererNative *rendererNew)
-{
-    wxRendererPtr& renderer = wxRendererPtr::Get();
-
-    wxRendererNative *rendererOld = renderer.release();
-
-    renderer.reset(rendererNew);
-
-    return rendererOld;
-}
-
-
-// ----------------------------------------------------------------------------
-// Dynamic renderers loading
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DYNLIB_CLASS
-
-/* static */
-wxRendererNative *wxRendererNative::Load(const wxString& name)
-{
-    wxString fullname = wxDynamicLibrary::CanonicalizePluginName(name);
-
-    wxDynamicLibrary dll(fullname);
-    if ( !dll.IsLoaded() )
-        return NULL;
-
-    // each theme DLL must export a wxCreateRenderer() function with this
-    // signature
-    typedef wxRendererNative *(*wxCreateRenderer_t)();
-
-    wxDYNLIB_FUNCTION(wxCreateRenderer_t, wxCreateRenderer, dll);
-    if ( !pfnwxCreateRenderer )
-        return NULL;
-
-    // create a renderer object
-    wxRendererNative *renderer = (*pfnwxCreateRenderer)();
-    if ( !renderer )
-        return NULL;
-
-    // check that its version is compatible with ours
-    wxRendererVersion ver = renderer->GetVersion();
-    if ( !wxRendererVersion::IsCompatible(ver) )
-    {
-        wxLogError(_("Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."),
-                   name.c_str(), ver.version, ver.age);
-        delete renderer;
-
-        return NULL;
-    }
-
-    // finally wrap the renderer in an object which will delete it and unload
-    // the library when it is deleted and return it to the caller
-    return new wxRendererFromDynLib(dll, renderer);
-}
-
-#endif // wxUSE_DYNLIB_CLASS
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/rendcmn.cpp
+// Purpose:     wxRendererNative common functions
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     28.07.03
+// RCS-ID:      $Id: rendcmn.cpp 41216 2006-09-14 16:04:18Z ABX $
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// License:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+#endif //WX_PRECOMP
+
+#include "wx/apptrait.h"
+#include "wx/renderer.h"
+
+#include "wx/ptr_scpd.h"
+
+#if wxUSE_DYNLIB_CLASS
+    #include "wx/dynlib.h"
+#endif // wxUSE_DYNLIB_CLASS
+
+// ----------------------------------------------------------------------------
+// wxRendererPtr: auto pointer holding the global renderer
+// ----------------------------------------------------------------------------
+
+wxDECLARE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase)
+wxDEFINE_SCOPED_PTR(wxRendererNative, wxRendererPtrBase)
+
+class wxRendererPtr : public wxRendererPtrBase
+{
+public:
+    // return true if we have a renderer, false otherwise
+    bool IsOk()
+    {
+        if ( !m_initialized )
+        {
+            // only try to create the renderer once
+            m_initialized = true;
+
+            DoInit();
+        }
+
+        return get() != NULL;
+    }
+
+    // return the global and unique wxRendererPtr
+    static wxRendererPtr& Get();
+
+private:
+    wxRendererPtr() : wxRendererPtrBase(NULL) { m_initialized = false; }
+
+    void DoInit()
+    {
+        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+        if ( traits )
+        {
+            // ask the traits object to create a renderer for us
+            reset(traits->CreateRenderer());
+        }
+    }
+
+    bool m_initialized;
+
+    // just to suppress a gcc warning
+    friend class wxRendererPtrDummyFriend;
+
+    DECLARE_NO_COPY_CLASS(wxRendererPtr)
+};
+
+// return the global and unique wxRendererPtr
+/*static*/ wxRendererPtr& wxRendererPtr::Get()
+{
+    static wxRendererPtr s_renderer;
+
+    return s_renderer;
+}
+
+#if wxUSE_DYNLIB_CLASS
+
+// ----------------------------------------------------------------------------
+// wxRendererFromDynLib: represents a renderer dynamically loaded from a DLL
+// ----------------------------------------------------------------------------
+
+class wxRendererFromDynLib : public wxDelegateRendererNative
+{
+public:
+    // create the object wrapping the given renderer created from this DLL
+    //
+    // we take ownership of the pointer and will delete it (and also unload the
+    // DLL) when we're deleted
+    wxRendererFromDynLib(wxDynamicLibrary& dll, wxRendererNative *renderer)
+        : wxDelegateRendererNative(*renderer),
+          m_renderer(renderer),
+          m_dllHandle(dll.Detach())
+        {
+        }
+
+    virtual ~wxRendererFromDynLib()
+    {
+        delete m_renderer;
+        wxDynamicLibrary::Unload(m_dllHandle);
+    }
+
+private:
+    wxRendererNative *m_renderer;
+    wxDllType m_dllHandle;
+};
+
+#endif // wxUSE_DYNLIB_CLASS
+
+// ============================================================================
+// wxRendererNative implementation
+// ============================================================================
+
+wxRendererNative::~wxRendererNative()
+{
+    // empty but necessary
+}
+
+// ----------------------------------------------------------------------------
+// Managing the global renderer
+// ----------------------------------------------------------------------------
+
+/* static */
+wxRendererNative& wxRendererNative::Get()
+{
+    wxRendererPtr& renderer = wxRendererPtr::Get();
+
+    return renderer.IsOk() ? *renderer.get() : GetDefault();
+}
+
+/* static */
+wxRendererNative *wxRendererNative::Set(wxRendererNative *rendererNew)
+{
+    wxRendererPtr& renderer = wxRendererPtr::Get();
+
+    wxRendererNative *rendererOld = renderer.release();
+
+    renderer.reset(rendererNew);
+
+    return rendererOld;
+}
+
+
+// ----------------------------------------------------------------------------
+// Dynamic renderers loading
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DYNLIB_CLASS
+
+/* static */
+wxRendererNative *wxRendererNative::Load(const wxString& name)
+{
+    wxString fullname = wxDynamicLibrary::CanonicalizePluginName(name);
+
+    wxDynamicLibrary dll(fullname);
+    if ( !dll.IsLoaded() )
+        return NULL;
+
+    // each theme DLL must export a wxCreateRenderer() function with this
+    // signature
+    typedef wxRendererNative *(*wxCreateRenderer_t)();
+
+    wxDYNLIB_FUNCTION(wxCreateRenderer_t, wxCreateRenderer, dll);
+    if ( !pfnwxCreateRenderer )
+        return NULL;
+
+    // create a renderer object
+    wxRendererNative *renderer = (*pfnwxCreateRenderer)();
+    if ( !renderer )
+        return NULL;
+
+    // check that its version is compatible with ours
+    wxRendererVersion ver = renderer->GetVersion();
+    if ( !wxRendererVersion::IsCompatible(ver) )
+    {
+        wxLogError(_("Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."),
+                   name.c_str(), ver.version, ver.age);
+        delete renderer;
+
+        return NULL;
+    }
+
+    // finally wrap the renderer in an object which will delete it and unload
+    // the library when it is deleted and return it to the caller
+    return new wxRendererFromDynLib(dll, renderer);
+}
+
+#endif // wxUSE_DYNLIB_CLASS
diff --git a/Source/3rd Party/wx/src/common/rgncmn.cpp b/Source/3rd Party/wx/src/common/rgncmn.cpp
index e09891613..0f9c8b216 100644
--- a/Source/3rd Party/wx/src/common/rgncmn.cpp	
+++ b/Source/3rd Party/wx/src/common/rgncmn.cpp	
@@ -1,192 +1,192 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/rgncmn.cpp
-// Purpose:     Methods of wxRegion that have a generic implementation
-// Author:      Robin Dunn
-// Modified by:
-// Created:     27-Mar-2003
-// RCS-ID:      $Id$
-// Copyright:   (c) Robin Dunn
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/region.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dcmemory.h"
-    #include "wx/bitmap.h"
-    #include "wx/image.h"
-#endif //WX_PRECOMP
-
-// ============================================================================
-// wxRegionBase implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// region comparison
-// ----------------------------------------------------------------------------
-
-bool wxRegionBase::IsEqual(const wxRegion& region) const
-{
-    if ( m_refData == region.GetRefData() )
-    {
-        // regions are identical, hence equal
-        return true;
-    }
-
-    if ( !m_refData || !region.GetRefData() )
-    {
-        // one, but not both, of the regions is invalid
-        return false;
-    }
-
-    return DoIsEqual(region);
-}
-
-// ----------------------------------------------------------------------------
-// region to/from bitmap conversions
-// ----------------------------------------------------------------------------
-
-wxBitmap wxRegionBase::ConvertToBitmap() const
-{
-    wxRect box = GetBox();
-    wxBitmap bmp(box.GetRight() + 1, box.GetBottom() + 1);
-    wxMemoryDC dc;
-    dc.SelectObject(bmp);
-    dc.SetBackground(*wxBLACK_BRUSH);
-    dc.Clear();
-    dc.SetDeviceClippingRegion(*static_cast<const wxRegion *>(this));
-    dc.SetBackground(*wxWHITE_BRUSH);
-    dc.Clear();
-    dc.SelectObject(wxNullBitmap);
-    return bmp;
-}
-
-#if wxUSE_IMAGE
-
-static bool DoRegionUnion(wxRegionBase& region,
-                          const wxImage& image,
-                          unsigned char loR,
-                          unsigned char loG,
-                          unsigned char loB,
-                          int tolerance)
-{
-    unsigned char hiR, hiG, hiB;
-
-    hiR = (unsigned char)wxMin(0xFF, loR + tolerance);
-    hiG = (unsigned char)wxMin(0xFF, loG + tolerance);
-    hiB = (unsigned char)wxMin(0xFF, loB + tolerance);
-
-    // Loop through the image row by row, pixel by pixel, building up
-    // rectangles to add to the region.
-    int width = image.GetWidth();
-    int height = image.GetHeight();
-    for (int y=0; y < height; y++)
-    {
-        wxRect rect;
-        rect.y = y;
-        rect.height = 1;
-
-        for (int x=0; x < width; x++)
-        {
-            // search for a continuous range of non-transparent pixels
-            int x0 = x;
-            while ( x < width)
-            {
-                unsigned char R = image.GetRed(x,y);
-                unsigned char G = image.GetGreen(x,y);
-                unsigned char B = image.GetBlue(x,y);
-                if (( R >= loR && R <= hiR) &&
-                    ( G >= loG && G <= hiG) &&
-                    ( B >= loB && B <= hiB))  // It's transparent
-                    break;
-                x++;
-            }
-
-            // Add the run of non-transparent pixels (if any) to the region
-            if (x > x0) {
-                rect.x = x0;
-                rect.width = x - x0;
-                region.Union(rect);
-            }
-        }
-    }
-
-    return true;
-}
-
-
-bool wxRegionBase::Union(const wxBitmap& bmp)
-{
-    if (bmp.GetMask())
-    {
-        wxImage image = bmp.ConvertToImage();
-        wxASSERT_MSG( image.HasMask(), wxT("wxBitmap::ConvertToImage doesn't preserve mask?") );
-        return DoRegionUnion(*this, image,
-                             image.GetMaskRed(),
-                             image.GetMaskGreen(),
-                             image.GetMaskBlue(),
-                             0);
-    }
-    else
-    {
-        return Union(0, 0, bmp.GetWidth(), bmp.GetHeight());
-    }
-}
-
-bool wxRegionBase::Union(const wxBitmap& bmp,
-                         const wxColour& transColour,
-                         int   tolerance)
-{
-    wxImage image = bmp.ConvertToImage();
-    return DoRegionUnion(*this, image,
-                         transColour.Red(),
-                         transColour.Green(),
-                         transColour.Blue(),
-                         tolerance);
-}
-
-#endif // wxUSE_IMAGE
-
-#ifdef wxHAS_REGION_COMBINE
-// ============================================================================
-// wxRegionWithCombine
-// ============================================================================
-
-// implement some wxRegionBase pure virtuals in terms of Combine()
-bool wxRegionWithCombine::DoUnionWithRect(const wxRect& rect)
-{
-    return Combine(rect, wxRGN_OR);
-}
-
-bool wxRegionWithCombine::DoUnionWithRegion(const wxRegion& region)
-{
-    return DoCombine(region, wxRGN_OR);
-}
-
-bool wxRegionWithCombine::DoIntersect(const wxRegion& region)
-{
-    return DoCombine(region, wxRGN_AND);
-}
-
-bool wxRegionWithCombine::DoSubtract(const wxRegion& region)
-{
-    return DoCombine(region, wxRGN_DIFF);
-}
-
-bool wxRegionWithCombine::DoXor(const wxRegion& region)
-{
-    return DoCombine(region, wxRGN_XOR);
-}
-
-#endif // wxHAS_REGION_COMBINE
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/rgncmn.cpp
+// Purpose:     Methods of wxRegion that have a generic implementation
+// Author:      Robin Dunn
+// Modified by:
+// Created:     27-Mar-2003
+// RCS-ID:      $Id: rgncmn.cpp 41901 2006-10-10 17:33:49Z PC $
+// Copyright:   (c) Robin Dunn
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/region.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dcmemory.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"
+#endif //WX_PRECOMP
+
+// ============================================================================
+// wxRegionBase implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// region comparision
+// ----------------------------------------------------------------------------
+
+bool wxRegionBase::IsEqual(const wxRegion& region) const
+{
+    if ( m_refData == region.GetRefData() )
+    {
+        // regions are identical, hence equal
+        return true;
+    }
+
+    if ( !m_refData || !region.GetRefData() )
+    {
+        // one, but not both, of the regions is invalid
+        return false;
+    }
+
+    return DoIsEqual(region);
+}
+
+// ----------------------------------------------------------------------------
+// region to/from bitmap conversions
+// ----------------------------------------------------------------------------
+
+wxBitmap wxRegionBase::ConvertToBitmap() const
+{
+    wxRect box = GetBox();
+    wxBitmap bmp(box.GetRight(), box.GetBottom());
+    wxMemoryDC dc;
+    dc.SelectObject(bmp);
+    dc.SetBackground(*wxBLACK_BRUSH);
+    dc.Clear();
+    dc.SetClippingRegion(*wx_static_cast(const wxRegion *, this));
+    dc.SetBackground(*wxWHITE_BRUSH);
+    dc.Clear();
+    dc.SelectObject(wxNullBitmap);
+    return bmp;
+}
+
+#if wxUSE_IMAGE
+
+static bool DoRegionUnion(wxRegionBase& region,
+                          const wxImage& image,
+                          unsigned char loR,
+                          unsigned char loG,
+                          unsigned char loB,
+                          int tolerance)
+{
+    unsigned char hiR, hiG, hiB;
+
+    hiR = (unsigned char)wxMin(0xFF, loR + tolerance);
+    hiG = (unsigned char)wxMin(0xFF, loG + tolerance);
+    hiB = (unsigned char)wxMin(0xFF, loB + tolerance);
+
+    // Loop through the image row by row, pixel by pixel, building up
+    // rectangles to add to the region.
+    int width = image.GetWidth();
+    int height = image.GetHeight();
+    for (int y=0; y < height; y++)
+    {
+        wxRect rect;
+        rect.y = y;
+        rect.height = 1;
+
+        for (int x=0; x < width; x++)
+        {
+            // search for a continuous range of non-transparent pixels
+            int x0 = x;
+            while ( x < width)
+            {
+                unsigned char R = image.GetRed(x,y);
+                unsigned char G = image.GetGreen(x,y);
+                unsigned char B = image.GetBlue(x,y);
+                if (( R >= loR && R <= hiR) &&
+                    ( G >= loG && G <= hiG) &&
+                    ( B >= loB && B <= hiB))  // It's transparent
+                    break;
+                x++;
+            }
+
+            // Add the run of non-transparent pixels (if any) to the region
+            if (x > x0) {
+                rect.x = x0;
+                rect.width = x - x0;
+                region.Union(rect);
+            }
+        }
+    }
+
+    return true;
+}
+
+
+bool wxRegionBase::Union(const wxBitmap& bmp)
+{
+    if (bmp.GetMask())
+    {
+        wxImage image = bmp.ConvertToImage();
+        wxASSERT_MSG( image.HasMask(), _T("wxBitmap::ConvertToImage doesn't preserve mask?") );
+        return DoRegionUnion(*this, image,
+                             image.GetMaskRed(),
+                             image.GetMaskGreen(),
+                             image.GetMaskBlue(),
+                             0);
+    }
+    else
+    {
+        return Union(0, 0, bmp.GetWidth(), bmp.GetHeight());
+    }
+}
+
+bool wxRegionBase::Union(const wxBitmap& bmp,
+                         const wxColour& transColour,
+                         int   tolerance)
+{
+    wxImage image = bmp.ConvertToImage();
+    return DoRegionUnion(*this, image,
+                         transColour.Red(),
+                         transColour.Green(),
+                         transColour.Blue(),
+                         tolerance);
+}
+
+#endif // wxUSE_IMAGE
+
+#ifdef wxHAS_REGION_COMBINE
+// ============================================================================
+// wxRegionWithCombine
+// ============================================================================
+
+// implement some wxRegionBase pure virtuals in terms of Combine()
+bool wxRegionWithCombine::DoUnionWithRect(const wxRect& rect)
+{
+    return Combine(rect, wxRGN_OR);
+}
+
+bool wxRegionWithCombine::DoUnionWithRegion(const wxRegion& region)
+{
+    return DoCombine(region, wxRGN_OR);
+}
+
+bool wxRegionWithCombine::DoIntersect(const wxRegion& region)
+{
+    return DoCombine(region, wxRGN_AND);
+}
+
+bool wxRegionWithCombine::DoSubtract(const wxRegion& region)
+{
+    return DoCombine(region, wxRGN_DIFF);
+}
+
+bool wxRegionWithCombine::DoXor(const wxRegion& region)
+{
+    return DoCombine(region, wxRGN_XOR);
+}
+
+#endif // wxHAS_REGION_COMBINE
diff --git a/Source/3rd Party/wx/src/common/scrolbarcmn.cpp b/Source/3rd Party/wx/src/common/scrolbarcmn.cpp
deleted file mode 100644
index 3f94a712e..000000000
--- a/Source/3rd Party/wx/src/common/scrolbarcmn.cpp	
+++ /dev/null
@@ -1,92 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/scrolbarcmn.cpp
-// Purpose:     wxScrollBar common code
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_SCROLLBAR
-
-#include "wx/scrolbar.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/utils.h"
-    #include "wx/settings.h"
-#endif
-
-extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[] = "scrollBar";
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxScrollBarStyle )
-wxBEGIN_FLAGS( wxScrollBarStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSB_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSB_VERTICAL)
-wxEND_FLAGS( wxScrollBarStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl, "wx/scrolbar.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxScrollBar)
-    wxEVENT_RANGE_PROPERTY( Scroll, wxEVT_SCROLL_TOP, \
-                            wxEVT_SCROLL_CHANGED, wxScrollEvent )
-
-    wxPROPERTY( ThumbPosition, int, SetThumbPosition, GetThumbPosition, 0, \
-                0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( Range, int, SetRange, GetRange, 0, \
-                0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( ThumbSize, int, SetThumbSize, GetThumbSize, 0, \
-                0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( PageSize, int, SetPageSize, GetPageSize, 0, \
-                0 /*flags*/, wxT("Helpstring"), wxT("group"))
-
-    wxPROPERTY_FLAGS( WindowStyle, wxScrollBarStyle, long, SetWindowStyleFlag, \
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                      wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxScrollBar)
-
-wxCONSTRUCTOR_5( wxScrollBar, wxWindow*, Parent, wxWindowID, Id, \
-                 wxPoint, Position, wxSize, Size, long, WindowStyle )
-
-#endif // wxUSE_SCROLLBAR
diff --git a/Source/3rd Party/wx/src/common/settcmn.cpp b/Source/3rd Party/wx/src/common/settcmn.cpp
index 77efa7974..334a8f8b8 100644
--- a/Source/3rd Party/wx/src/common/settcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/settcmn.cpp	
@@ -1,69 +1,88 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/settcmn.cpp
-// Purpose:     common (to all ports) wxWindow functions
-// Author:      Robert Roebling
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/settings.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/utils.h"
-#endif //WX_PRECOMP
-
-// ----------------------------------------------------------------------------
-// static data
-// ----------------------------------------------------------------------------
-
-wxSystemScreenType wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE;
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-wxSystemScreenType wxSystemSettings::GetScreenType()
-{
-    if (ms_screen == wxSYS_SCREEN_NONE)
-    {
-        // wxUniv will be used on small devices, too.
-        int x = GetMetric( wxSYS_SCREEN_X );
-
-        ms_screen = wxSYS_SCREEN_DESKTOP;
-
-        if (x < 800)
-            ms_screen = wxSYS_SCREEN_SMALL;
-
-        if (x < 640)
-            ms_screen = wxSYS_SCREEN_PDA;
-
-        if (x < 200)
-            ms_screen = wxSYS_SCREEN_TINY;
-
-        // This is probably a bug, but VNC seems to report 0
-        if (x < 10)
-            ms_screen = wxSYS_SCREEN_DESKTOP;
-    }
-
-    return ms_screen;
-}
-
-void wxSystemSettings::SetScreenType( wxSystemScreenType screen )
-{
-    ms_screen = screen;
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/settcmn.cpp
+// Purpose:     common (to all ports) wxWindow functions
+// Author:      Robert Roebling
+// RCS-ID:      $Id: settcmn.cpp 39310 2006-05-24 07:16:32Z ABX $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif //WX_PRECOMP
+
+// ----------------------------------------------------------------------------
+// static data
+// ----------------------------------------------------------------------------
+
+wxSystemScreenType wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE;
+
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+
+wxSystemScreenType wxSystemSettings::GetScreenType()
+{
+    if (ms_screen == wxSYS_SCREEN_NONE)
+    {
+        // wxUniv will be used on small devices, too.
+        int x = GetMetric( wxSYS_SCREEN_X );
+
+        ms_screen = wxSYS_SCREEN_DESKTOP;
+
+        if (x < 800)
+            ms_screen = wxSYS_SCREEN_SMALL;
+
+        if (x < 640)
+            ms_screen = wxSYS_SCREEN_PDA;
+
+        if (x < 200)
+            ms_screen = wxSYS_SCREEN_TINY;
+
+        // This is probably a bug, but VNC seems to report 0
+        if (x < 10)
+            ms_screen = wxSYS_SCREEN_DESKTOP;
+    }
+
+    return ms_screen;
+}
+
+void wxSystemSettings::SetScreenType( wxSystemScreenType screen )
+{
+    ms_screen = screen;
+}
+
+#if WXWIN_COMPATIBILITY_2_4
+
+wxColour wxSystemSettings::GetSystemColour(int index)
+{
+    return GetColour((wxSystemColour)index);
+}
+
+wxFont wxSystemSettings::GetSystemFont(int index)
+{
+    return GetFont((wxSystemFont)index);
+}
+
+int wxSystemSettings::GetSystemMetric(int index)
+{
+    return GetMetric((wxSystemMetric)index);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
diff --git a/Source/3rd Party/wx/src/common/sizer.cpp b/Source/3rd Party/wx/src/common/sizer.cpp
index 38acc6362..34a649aaa 100644
--- a/Source/3rd Party/wx/src/common/sizer.cpp	
+++ b/Source/3rd Party/wx/src/common/sizer.cpp	
@@ -1,2671 +1,2265 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/sizer.cpp
-// Purpose:     provide new wxSizer class for layout
-// Author:      Robert Roebling and Robin Dunn, contributions by
-//              Dirk Holtwick, Ron Lee
-// Modified by: Ron Lee
-// Created:
-// RCS-ID:      $Id$
-// Copyright:   (c) Robin Dunn, Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/sizer.h"
-#include "wx/private/flagscheck.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/math.h"
-    #include "wx/utils.h"
-    #include "wx/settings.h"
-    #include "wx/button.h"
-    #include "wx/statbox.h"
-    #include "wx/toplevel.h"
-#endif // WX_PRECOMP
-
-#include "wx/display.h"
-#include "wx/vector.h"
-#include "wx/listimpl.cpp"
-
-
-//---------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxSizerItem, wxObject)
-IMPLEMENT_CLASS(wxSizer, wxObject)
-IMPLEMENT_CLASS(wxGridSizer, wxSizer)
-IMPLEMENT_CLASS(wxFlexGridSizer, wxGridSizer)
-IMPLEMENT_CLASS(wxBoxSizer, wxSizer)
-#if wxUSE_STATBOX
-IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
-#endif
-#if wxUSE_BUTTON
-IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
-#endif
-
-WX_DEFINE_EXPORTED_LIST( wxSizerItemList )
-
-/*
-    TODO PROPERTIES
-      sizeritem
-        object
-        object_ref
-          minsize
-          option
-          flag
-          border
-     spacer
-        option
-        flag
-        borfder
-    boxsizer
-       orient
-    staticboxsizer
-       orient
-       label
-    gridsizer
-       rows
-       cols
-       vgap
-       hgap
-    flexgridsizer
-       rows
-       cols
-       vgap
-       hgap
-       growablerows
-       growablecols
-    minsize
-*/
-
-// ----------------------------------------------------------------------------
-// wxSizerItem
-// ----------------------------------------------------------------------------
-
-// check for flags conflicts
-static const int SIZER_FLAGS_MASK =
-    wxADD_FLAG(wxCENTRE,
-    wxADD_FLAG(wxHORIZONTAL,
-    wxADD_FLAG(wxVERTICAL,
-    wxADD_FLAG(wxLEFT,
-    wxADD_FLAG(wxRIGHT,
-    wxADD_FLAG(wxUP,
-    wxADD_FLAG(wxDOWN,
-    wxADD_FLAG(wxALIGN_NOT,
-    wxADD_FLAG(wxALIGN_CENTER_HORIZONTAL,
-    wxADD_FLAG(wxALIGN_RIGHT,
-    wxADD_FLAG(wxALIGN_BOTTOM,
-    wxADD_FLAG(wxALIGN_CENTER_VERTICAL,
-    wxADD_FLAG(wxFIXED_MINSIZE,
-    wxADD_FLAG(wxRESERVE_SPACE_EVEN_IF_HIDDEN,
-    wxADD_FLAG(wxSTRETCH_NOT,
-    wxADD_FLAG(wxSHRINK,
-    wxADD_FLAG(wxGROW,
-    wxADD_FLAG(wxSHAPED,
-    0))))))))))))))))));
-
-#define ASSERT_VALID_SIZER_FLAGS(f)  wxASSERT_VALID_FLAGS(f, SIZER_FLAGS_MASK)
-
-
-void wxSizerItem::Init(const wxSizerFlags& flags)
-{
-    Init();
-
-    m_proportion = flags.GetProportion();
-    m_flag = flags.GetFlags();
-    m_border = flags.GetBorderInPixels();
-
-    ASSERT_VALID_SIZER_FLAGS( m_flag );
-}
-
-wxSizerItem::wxSizerItem()
-{
-    Init();
-
-    m_proportion = 0;
-    m_border = 0;
-    m_flag = 0;
-    m_id = wxID_NONE;
-}
-
-// window item
-void wxSizerItem::DoSetWindow(wxWindow *window)
-{
-    wxCHECK_RET( window, wxT("NULL window in wxSizerItem::SetWindow()") );
-
-    m_kind = Item_Window;
-    m_window = window;
-
-    // window doesn't become smaller than its initial size, whatever happens
-    m_minSize = window->GetSize();
-
-    if ( m_flag & wxFIXED_MINSIZE )
-        window->SetMinSize(m_minSize);
-
-    // aspect ratio calculated from initial size
-    SetRatio(m_minSize);
-}
-
-wxSizerItem::wxSizerItem(wxWindow *window,
-                         int proportion,
-                         int flag,
-                         int border,
-                         wxObject* userData)
-           : m_kind(Item_None),
-             m_proportion(proportion),
-             m_border(border),
-             m_flag(flag),
-             m_id(wxID_NONE),
-             m_userData(userData)
-{
-    ASSERT_VALID_SIZER_FLAGS( m_flag );
-
-    DoSetWindow(window);
-}
-
-// sizer item
-void wxSizerItem::DoSetSizer(wxSizer *sizer)
-{
-    m_kind = Item_Sizer;
-    m_sizer = sizer;
-}
-
-wxSizerItem::wxSizerItem(wxSizer *sizer,
-                         int proportion,
-                         int flag,
-                         int border,
-                         wxObject* userData)
-           : m_kind(Item_None),
-             m_sizer(NULL),
-             m_proportion(proportion),
-             m_border(border),
-             m_flag(flag),
-             m_id(wxID_NONE),
-             m_ratio(0.0),
-             m_userData(userData)
-{
-    ASSERT_VALID_SIZER_FLAGS( m_flag );
-
-    DoSetSizer(sizer);
-
-    // m_minSize is set later
-}
-
-// spacer item
-void wxSizerItem::DoSetSpacer(const wxSize& size)
-{
-    m_kind = Item_Spacer;
-    m_spacer = new wxSizerSpacer(size);
-    m_minSize = size;
-    SetRatio(size);
-}
-
-wxSizerItem::wxSizerItem(int width,
-                         int height,
-                         int proportion,
-                         int flag,
-                         int border,
-                         wxObject* userData)
-           : m_kind(Item_None),
-             m_sizer(NULL),
-             m_minSize(width, height), // minimal size is the initial size
-             m_proportion(proportion),
-             m_border(border),
-             m_flag(flag),
-             m_id(wxID_NONE),
-             m_userData(userData)
-{
-    ASSERT_VALID_SIZER_FLAGS( m_flag );
-
-    DoSetSpacer(wxSize(width, height));
-}
-
-wxSizerItem::~wxSizerItem()
-{
-    delete m_userData;
-    Free();
-}
-
-void wxSizerItem::Free()
-{
-    switch ( m_kind )
-    {
-        case Item_None:
-            break;
-
-        case Item_Window:
-            m_window->SetContainingSizer(NULL);
-            break;
-
-        case Item_Sizer:
-            delete m_sizer;
-            break;
-
-        case Item_Spacer:
-            delete m_spacer;
-            break;
-
-        case Item_Max:
-        default:
-            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );
-    }
-
-    m_kind = Item_None;
-}
-
-wxSize wxSizerItem::GetSpacer() const
-{
-    wxSize size;
-    if ( m_kind == Item_Spacer )
-        size = m_spacer->GetSize();
-
-    return size;
-}
-
-
-wxSize wxSizerItem::GetSize() const
-{
-    wxSize ret;
-    switch ( m_kind )
-    {
-        case Item_None:
-            break;
-
-        case Item_Window:
-            ret = m_window->GetSize();
-            break;
-
-        case Item_Sizer:
-            ret = m_sizer->GetSize();
-            break;
-
-        case Item_Spacer:
-            ret = m_spacer->GetSize();
-            break;
-
-        case Item_Max:
-        default:
-            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );
-    }
-
-    if (m_flag & wxWEST)
-        ret.x += m_border;
-    if (m_flag & wxEAST)
-        ret.x += m_border;
-    if (m_flag & wxNORTH)
-        ret.y += m_border;
-    if (m_flag & wxSOUTH)
-        ret.y += m_border;
-
-    return ret;
-}
-
-bool wxSizerItem::InformFirstDirection(int direction, int size, int availableOtherDir)
-{
-    // The size that come here will be including borders. Child items should get it
-    // without borders.
-    if( size>0 )
-    {
-        if( direction==wxHORIZONTAL )
-        {
-            if (m_flag & wxWEST)
-                size -= m_border;
-            if (m_flag & wxEAST)
-                size -= m_border;
-        }
-        else if( direction==wxVERTICAL )
-        {
-            if (m_flag & wxNORTH)
-                size -= m_border;
-            if (m_flag & wxSOUTH)
-                size -= m_border;
-        }
-    }
-
-    bool didUse = false;
-    // Pass the information along to the held object
-    if (IsSizer())
-    {
-        didUse = GetSizer()->InformFirstDirection(direction,size,availableOtherDir);
-        if (didUse)
-            m_minSize = GetSizer()->CalcMin();
-    }
-    else if (IsWindow())
-    {
-        didUse =  GetWindow()->InformFirstDirection(direction,size,availableOtherDir);
-        if (didUse)
-            m_minSize = m_window->GetEffectiveMinSize();
-
-        // This information is useful for items with wxSHAPED flag, since
-        // we can request an optimal min size for such an item. Even if
-        // we overwrite the m_minSize member here, we can read it back from
-        // the owned window (happens automatically).
-        if( (m_flag & wxSHAPED) && (m_flag & wxEXPAND) && direction )
-        {
-            if( !wxIsNullDouble(m_ratio) )
-            {
-                wxCHECK_MSG( (m_proportion==0), false, wxT("Shaped item, non-zero proportion in wxSizerItem::InformFirstDirection()") );
-                if( direction==wxHORIZONTAL && !wxIsNullDouble(m_ratio) )
-                {
-                    // Clip size so that we don't take too much
-                    if( availableOtherDir>=0 && int(size/m_ratio)-m_minSize.y>availableOtherDir )
-                        size = int((availableOtherDir+m_minSize.y)*m_ratio);
-                    m_minSize = wxSize(size,int(size/m_ratio));
-                }
-                else if( direction==wxVERTICAL )
-                {
-                    // Clip size so that we don't take too much
-                    if( availableOtherDir>=0 && int(size*m_ratio)-m_minSize.x>availableOtherDir )
-                        size = int((availableOtherDir+m_minSize.x)/m_ratio);
-                    m_minSize = wxSize(int(size*m_ratio),size);
-                }
-                didUse = true;
-            }
-        }
-    }
-
-    return didUse;
-}
-
-wxSize wxSizerItem::CalcMin()
-{
-    if (IsSizer())
-    {
-        m_minSize = m_sizer->GetMinSize();
-
-        // if we have to preserve aspect ratio _AND_ this is
-        // the first-time calculation, consider ret to be initial size
-        if ( (m_flag & wxSHAPED) && wxIsNullDouble(m_ratio) )
-            SetRatio(m_minSize);
-    }
-    else if ( IsWindow() )
-    {
-        // Since the size of the window may change during runtime, we
-        // should use the current minimal/best size.
-        m_minSize = m_window->GetEffectiveMinSize();
-    }
-
-    return GetMinSizeWithBorder();
-}
-
-wxSize wxSizerItem::GetMinSizeWithBorder() const
-{
-    wxSize ret = m_minSize;
-
-    if (m_flag & wxWEST)
-        ret.x += m_border;
-    if (m_flag & wxEAST)
-        ret.x += m_border;
-    if (m_flag & wxNORTH)
-        ret.y += m_border;
-    if (m_flag & wxSOUTH)
-        ret.y += m_border;
-
-    return ret;
-}
-
-
-void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ )
-{
-    wxPoint pos = pos_;
-    wxSize size = size_;
-    if (m_flag & wxSHAPED)
-    {
-        // adjust aspect ratio
-        int rwidth = (int) (size.y * m_ratio);
-        if (rwidth > size.x)
-        {
-            // fit horizontally
-            int rheight = (int) (size.x / m_ratio);
-            // add vertical space
-            if (m_flag & wxALIGN_CENTER_VERTICAL)
-                pos.y += (size.y - rheight) / 2;
-            else if (m_flag & wxALIGN_BOTTOM)
-                pos.y += (size.y - rheight);
-            // use reduced dimensions
-            size.y =rheight;
-        }
-        else if (rwidth < size.x)
-        {
-            // add horizontal space
-            if (m_flag & wxALIGN_CENTER_HORIZONTAL)
-                pos.x += (size.x - rwidth) / 2;
-            else if (m_flag & wxALIGN_RIGHT)
-                pos.x += (size.x - rwidth);
-            size.x = rwidth;
-        }
-    }
-
-    // This is what GetPosition() returns. Since we calculate
-    // borders afterwards, GetPosition() will be the left/top
-    // corner of the surrounding border.
-    m_pos = pos;
-
-    if (m_flag & wxWEST)
-    {
-        pos.x += m_border;
-        size.x -= m_border;
-    }
-    if (m_flag & wxEAST)
-    {
-        size.x -= m_border;
-    }
-    if (m_flag & wxNORTH)
-    {
-        pos.y += m_border;
-        size.y -= m_border;
-    }
-    if (m_flag & wxSOUTH)
-    {
-        size.y -= m_border;
-    }
-
-    if (size.x < 0)
-        size.x = 0;
-    if (size.y < 0)
-        size.y = 0;
-
-    m_rect = wxRect(pos, size);
-
-    switch ( m_kind )
-    {
-        case Item_None:
-            wxFAIL_MSG( wxT("can't set size of uninitialized sizer item") );
-            break;
-
-        case Item_Window:
-        {
-            // Use wxSIZE_FORCE_EVENT here since a sizer item might
-            // have changed alignment or some other property which would
-            // not change the size of the window. In such a case, no
-            // wxSizeEvent would normally be generated and thus the
-            // control wouldn't get laid out correctly here.
-#if 1
-            m_window->SetSize(pos.x, pos.y, size.x, size.y,
-                              wxSIZE_ALLOW_MINUS_ONE|wxSIZE_FORCE_EVENT );
-#else
-            m_window->SetSize(pos.x, pos.y, size.x, size.y,
-                              wxSIZE_ALLOW_MINUS_ONE );
-#endif
-            break;
-        }
-        case Item_Sizer:
-            m_sizer->SetDimension(pos, size);
-            break;
-
-        case Item_Spacer:
-            m_spacer->SetSize(size);
-            break;
-
-        case Item_Max:
-        default:
-            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );
-    }
-}
-
-void wxSizerItem::DeleteWindows()
-{
-    switch ( m_kind )
-    {
-        case Item_None:
-        case Item_Spacer:
-            break;
-
-        case Item_Window:
-            //We are deleting the window from this sizer - normally
-            //the window destroys the sizer associated with it,
-            //which might destroy this, which we don't want
-            m_window->SetContainingSizer(NULL);
-            m_window->Destroy();
-            //Putting this after the switch will result in a spacer
-            //not being deleted properly on destruction
-            m_kind = Item_None;
-            break;
-
-        case Item_Sizer:
-            m_sizer->DeleteWindows();
-            break;
-
-        case Item_Max:
-        default:
-            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );
-    }
-
-}
-
-void wxSizerItem::Show( bool show )
-{
-    switch ( m_kind )
-    {
-        case Item_None:
-            wxFAIL_MSG( wxT("can't show uninitialized sizer item") );
-            break;
-
-        case Item_Window:
-            m_window->Show(show);
-            break;
-
-        case Item_Sizer:
-            m_sizer->Show(show);
-            break;
-
-        case Item_Spacer:
-            m_spacer->Show(show);
-            break;
-
-        case Item_Max:
-        default:
-            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );
-    }
-}
-
-bool wxSizerItem::IsShown() const
-{
-    if ( m_flag & wxRESERVE_SPACE_EVEN_IF_HIDDEN )
-        return true;
-
-    switch ( m_kind )
-    {
-        case Item_None:
-            // we may be called from CalcMin(), just return false so that we're
-            // not used
-            break;
-
-        case Item_Window:
-            return m_window->IsShown();
-
-        case Item_Sizer:
-        {
-            // arbitrarily decide that if at least one of our elements is
-            // shown, so are we (this arbitrariness is the reason for
-            // deprecating this function)
-            for ( wxSizerItemList::compatibility_iterator
-                    node = m_sizer->GetChildren().GetFirst();
-                  node;
-                  node = node->GetNext() )
-            {
-                if ( node->GetData()->IsShown() )
-                    return true;
-            }
-            return false;
-        }
-
-        case Item_Spacer:
-            return m_spacer->IsShown();
-
-        case Item_Max:
-        default:
-            wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );
-    }
-
-    return false;
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-void wxSizerItem::SetOption( int option )
-{
-    SetProportion( option );
-}
-
-int wxSizerItem::GetOption() const
-{
-    return GetProportion();
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
-//---------------------------------------------------------------------------
-// wxSizer
-//---------------------------------------------------------------------------
-
-wxSizer::~wxSizer()
-{
-    WX_CLEAR_LIST(wxSizerItemList, m_children);
-}
-
-wxSizerItem* wxSizer::DoInsert( size_t index, wxSizerItem *item )
-{
-    m_children.Insert( index, item );
-
-    if ( item->GetWindow() )
-        item->GetWindow()->SetContainingSizer( this );
-
-    if ( item->GetSizer() )
-        item->GetSizer()->SetContainingWindow( m_containingWindow );
-
-    return item;
-}
-
-void wxSizer::SetContainingWindow(wxWindow *win)
-{
-    if ( win == m_containingWindow )
-        return;
-
-    m_containingWindow = win;
-
-    // set the same window for all nested sizers as well, they also are in the
-    // same window
-    for ( wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxSizerItem *const item = node->GetData();
-        wxSizer *const sizer = item->GetSizer();
-
-        if ( sizer )
-        {
-            sizer->SetContainingWindow(win);
-        }
-    }
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-bool wxSizer::Remove( wxWindow *window )
-{
-    return Detach( window );
-}
-#endif // WXWIN_COMPATIBILITY_2_6
-
-bool wxSizer::Remove( wxSizer *sizer )
-{
-    wxASSERT_MSG( sizer, wxT("Removing NULL sizer") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetSizer() == sizer)
-        {
-            delete item;
-            m_children.Erase( node );
-            return true;
-        }
-
-        node = node->GetNext();
-    }
-
-    return false;
-}
-
-bool wxSizer::Remove( int index )
-{
-    wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
-                 false,
-                 wxT("Remove index is out of range") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
-
-    wxCHECK_MSG( node, false, wxT("Failed to find child node") );
-
-    delete node->GetData();
-    m_children.Erase( node );
-
-    return true;
-}
-
-bool wxSizer::Detach( wxSizer *sizer )
-{
-    wxASSERT_MSG( sizer, wxT("Detaching NULL sizer") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetSizer() == sizer)
-        {
-            item->DetachSizer();
-            delete item;
-            m_children.Erase( node );
-            return true;
-        }
-        node = node->GetNext();
-    }
-
-    return false;
-}
-
-bool wxSizer::Detach( wxWindow *window )
-{
-    wxASSERT_MSG( window, wxT("Detaching NULL window") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetWindow() == window)
-        {
-            delete item;
-            m_children.Erase( node );
-            return true;
-        }
-        node = node->GetNext();
-    }
-
-    return false;
-}
-
-bool wxSizer::Detach( int index )
-{
-    wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
-                 false,
-                 wxT("Detach index is out of range") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
-
-    wxCHECK_MSG( node, false, wxT("Failed to find child node") );
-
-    wxSizerItem *item = node->GetData();
-
-    if ( item->IsSizer() )
-        item->DetachSizer();
-
-    delete item;
-    m_children.Erase( node );
-    return true;
-}
-
-bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive )
-{
-    wxASSERT_MSG( oldwin, wxT("Replacing NULL window") );
-    wxASSERT_MSG( newwin, wxT("Replacing with NULL window") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetWindow() == oldwin)
-        {
-            item->AssignWindow(newwin);
-            newwin->SetContainingSizer( this );
-            return true;
-        }
-        else if (recursive && item->IsSizer())
-        {
-            if (item->GetSizer()->Replace( oldwin, newwin, true ))
-                return true;
-        }
-
-        node = node->GetNext();
-    }
-
-    return false;
-}
-
-bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive )
-{
-    wxASSERT_MSG( oldsz, wxT("Replacing NULL sizer") );
-    wxASSERT_MSG( newsz, wxT("Replacing with NULL sizer") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetSizer() == oldsz)
-        {
-            item->AssignSizer(newsz);
-            return true;
-        }
-        else if (recursive && item->IsSizer())
-        {
-            if (item->GetSizer()->Replace( oldsz, newsz, true ))
-                return true;
-        }
-
-        node = node->GetNext();
-    }
-
-    return false;
-}
-
-bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
-{
-    wxCHECK_MSG( old < m_children.GetCount(), false, wxT("Replace index is out of range") );
-    wxASSERT_MSG( newitem, wxT("Replacing with NULL item") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.Item( old );
-
-    wxCHECK_MSG( node, false, wxT("Failed to find child node") );
-
-    wxSizerItem *item = node->GetData();
-    node->SetData(newitem);
-
-    if (item->IsWindow() && item->GetWindow())
-        item->GetWindow()->SetContainingSizer(NULL);
-
-    delete item;
-
-    return true;
-}
-
-void wxSizer::Clear( bool delete_windows )
-{
-    // First clear the ContainingSizer pointers
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->IsWindow())
-            item->GetWindow()->SetContainingSizer( NULL );
-        node = node->GetNext();
-    }
-
-    // Destroy the windows if needed
-    if (delete_windows)
-        DeleteWindows();
-
-    // Now empty the list
-    WX_CLEAR_LIST(wxSizerItemList, m_children);
-}
-
-void wxSizer::DeleteWindows()
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        item->DeleteWindows();
-        node = node->GetNext();
-    }
-}
-
-wxSize wxSizer::ComputeFittingClientSize(wxWindow *window)
-{
-    wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" );
-
-    // take the min size by default and limit it by max size
-    wxSize size = GetMinClientSize(window);
-    wxSize sizeMax;
-
-    wxTopLevelWindow *tlw = wxDynamicCast(window, wxTopLevelWindow);
-    if ( tlw )
-    {
-        // hack for small screen devices where TLWs are always full screen
-        if ( tlw->IsAlwaysMaximized() )
-        {
-            return tlw->GetClientSize();
-        }
-
-        // limit the window to the size of the display it is on
-        int disp = wxDisplay::GetFromWindow(window);
-        if ( disp == wxNOT_FOUND )
-        {
-            // or, if we don't know which one it is, of the main one
-            disp = 0;
-        }
-
-        sizeMax = wxDisplay(disp).GetClientArea().GetSize();
-
-        // If determining the display size failed, skip the max size checks as
-        // we really don't want to create windows of (0, 0) size.
-        if ( !sizeMax.x || !sizeMax.y )
-            return size;
-
-        // space for decorations and toolbars etc.
-        sizeMax = tlw->WindowToClientSize(sizeMax);
-    }
-    else
-    {
-        sizeMax = GetMaxClientSize(window);
-    }
-
-    if ( sizeMax.x != wxDefaultCoord && size.x > sizeMax.x )
-            size.x = sizeMax.x;
-    if ( sizeMax.y != wxDefaultCoord && size.y > sizeMax.y )
-            size.y = sizeMax.y;
-
-    return size;
-}
-
-wxSize wxSizer::ComputeFittingWindowSize(wxWindow *window)
-{
-    wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" );
-
-    return window->ClientToWindowSize(ComputeFittingClientSize(window));
-}
-
-wxSize wxSizer::Fit( wxWindow *window )
-{
-    wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" );
-
-    // set client size
-    window->SetClientSize(ComputeFittingClientSize(window));
-
-    // return entire size
-    return window->GetSize();
-}
-
-void wxSizer::FitInside( wxWindow *window )
-{
-    wxSize size;
-    if (window->IsTopLevel())
-        size = VirtualFitSize( window );
-    else
-        size = GetMinClientSize( window );
-
-    window->SetVirtualSize( size );
-}
-
-void wxSizer::Layout()
-{
-    // (re)calculates minimums needed for each item and other preparations
-    // for layout
-    CalcMin();
-
-    // Applies the layout and repositions/resizes the items
-    RecalcSizes();
-}
-
-void wxSizer::SetSizeHints( wxWindow *window )
-{
-    // Preserve the window's max size hints, but set the
-    // lower bound according to the sizer calculations.
-
-    // This is equivalent to calling Fit(), except that we need to set
-    // the size hints _in between_ the two steps performed by Fit
-    // (1. ComputeFittingClientSize, 2. SetClientSize). That's because
-    // otherwise SetClientSize() could have no effect if there already are
-    // size hints in effect that forbid requested client size.
-
-    const wxSize clientSize = ComputeFittingClientSize(window);
-
-    window->SetMinClientSize(clientSize);
-    window->SetClientSize(clientSize);
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-void wxSizer::SetVirtualSizeHints( wxWindow *window )
-{
-    FitInside( window );
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-// TODO on mac we need a function that determines how much free space this
-// min size contains, in order to make sure that we have 20 pixels of free
-// space around the controls
-wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const
-{
-    return window->WindowToClientSize(window->GetMaxSize());
-}
-
-wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) )
-{
-    return GetMinSize();  // Already returns client size.
-}
-
-wxSize wxSizer::VirtualFitSize( wxWindow *window )
-{
-    wxSize size     = GetMinClientSize( window );
-    wxSize sizeMax  = GetMaxClientSize( window );
-
-    // Limit the size if sizeMax != wxDefaultSize
-
-    if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )
-        size.x = sizeMax.x;
-    if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )
-        size.y = sizeMax.y;
-
-    return size;
-}
-
-wxSize wxSizer::GetMinSize()
-{
-    wxSize ret( CalcMin() );
-    if (ret.x < m_minSize.x) ret.x = m_minSize.x;
-    if (ret.y < m_minSize.y) ret.y = m_minSize.y;
-    return ret;
-}
-
-void wxSizer::DoSetMinSize( int width, int height )
-{
-    m_minSize.x = width;
-    m_minSize.y = height;
-}
-
-bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
-{
-    wxASSERT_MSG( window, wxT("SetMinSize for NULL window") );
-
-    // Is it our immediate child?
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetWindow() == window)
-        {
-            item->SetMinSize( width, height );
-            return true;
-        }
-        node = node->GetNext();
-    }
-
-    // No?  Search any subsizers we own then
-
-    node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if ( item->GetSizer() &&
-             item->GetSizer()->DoSetItemMinSize( window, width, height ) )
-        {
-            // A child sizer found the requested windw, exit.
-            return true;
-        }
-        node = node->GetNext();
-    }
-
-    return false;
-}
-
-bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
-{
-    wxASSERT_MSG( sizer, wxT("SetMinSize for NULL sizer") );
-
-    // Is it our immediate child?
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetSizer() == sizer)
-        {
-            item->GetSizer()->DoSetMinSize( width, height );
-            return true;
-        }
-        node = node->GetNext();
-    }
-
-    // No?  Search any subsizers we own then
-
-    node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if ( item->GetSizer() &&
-             item->GetSizer()->DoSetItemMinSize( sizer, width, height ) )
-        {
-            // A child found the requested sizer, exit.
-            return true;
-        }
-        node = node->GetNext();
-    }
-
-    return false;
-}
-
-bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
-{
-    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
-
-    wxCHECK_MSG( node, false, wxT("Failed to find child node") );
-
-    wxSizerItem     *item = node->GetData();
-
-    if (item->GetSizer())
-    {
-        // Sizers contains the minimal size in them, if not calculated ...
-        item->GetSizer()->DoSetMinSize( width, height );
-    }
-    else
-    {
-        // ... but the minimal size of spacers and windows is stored via the item
-        item->SetMinSize( width, height );
-    }
-
-    return true;
-}
-
-wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )
-{
-    wxASSERT_MSG( window, wxT("GetItem for NULL window") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetWindow() == window)
-        {
-            return item;
-        }
-        else if (recursive && item->IsSizer())
-        {
-            wxSizerItem *subitem = item->GetSizer()->GetItem( window, true );
-            if (subitem)
-                return subitem;
-        }
-
-        node = node->GetNext();
-    }
-
-    return NULL;
-}
-
-wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )
-{
-    wxASSERT_MSG( sizer, wxT("GetItem for NULL sizer") );
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem *item = node->GetData();
-
-        if (item->GetSizer() == sizer)
-        {
-            return item;
-        }
-        else if (recursive && item->IsSizer())
-        {
-            wxSizerItem *subitem = item->GetSizer()->GetItem( sizer, true );
-            if (subitem)
-                return subitem;
-        }
-
-        node = node->GetNext();
-    }
-
-    return NULL;
-}
-
-wxSizerItem* wxSizer::GetItem( size_t index )
-{
-    wxCHECK_MSG( index < m_children.GetCount(),
-                 NULL,
-                 wxT("GetItem index is out of range") );
-
-    return m_children.Item( index )->GetData();
-}
-
-wxSizerItem* wxSizer::GetItemById( int id, bool recursive )
-{
-    // This gets a sizer item by the id of the sizer item
-    // and NOT the id of a window if the item is a window.
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetId() == id)
-        {
-            return item;
-        }
-        else if (recursive && item->IsSizer())
-        {
-            wxSizerItem *subitem = item->GetSizer()->GetItemById( id, true );
-            if (subitem)
-                return subitem;
-        }
-
-        node = node->GetNext();
-    }
-
-    return NULL;
-}
-
-bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
-{
-    wxSizerItem *item = GetItem( window, recursive );
-
-    if ( item )
-    {
-         item->Show( show );
-         return true;
-    }
-
-    return false;
-}
-
-bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
-{
-    wxSizerItem *item = GetItem( sizer, recursive );
-
-    if ( item )
-    {
-         item->Show( show );
-         return true;
-    }
-
-    return false;
-}
-
-bool wxSizer::Show( size_t index, bool show)
-{
-    wxSizerItem *item = GetItem( index );
-
-    if ( item )
-    {
-         item->Show( show );
-         return true;
-    }
-
-    return false;
-}
-
-void wxSizer::ShowItems( bool show )
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        node->GetData()->Show( show );
-        node = node->GetNext();
-    }
-}
-
-bool wxSizer::IsShown( wxWindow *window ) const
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetWindow() == window)
-        {
-            return item->IsShown();
-        }
-        node = node->GetNext();
-    }
-
-    wxFAIL_MSG( wxT("IsShown failed to find sizer item") );
-
-    return false;
-}
-
-bool wxSizer::IsShown( wxSizer *sizer ) const
-{
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-
-        if (item->GetSizer() == sizer)
-        {
-            return item->IsShown();
-        }
-        node = node->GetNext();
-    }
-
-    wxFAIL_MSG( wxT("IsShown failed to find sizer item") );
-
-    return false;
-}
-
-bool wxSizer::IsShown( size_t index ) const
-{
-    wxCHECK_MSG( index < m_children.GetCount(),
-                 false,
-                 wxT("IsShown index is out of range") );
-
-    return m_children.Item( index )->GetData()->IsShown();
-}
-
-
-//---------------------------------------------------------------------------
-// wxGridSizer
-//---------------------------------------------------------------------------
-
-wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
-    : m_rows( cols == 0 ? 1 : 0 ),
-      m_cols( cols ),
-      m_vgap( vgap ),
-      m_hgap( hgap )
-{
-    wxASSERT(cols >= 0);
-}
-
-wxGridSizer::wxGridSizer( int cols, const wxSize& gap )
-    : m_rows( cols == 0 ? 1 : 0 ),
-      m_cols( cols ),
-      m_vgap( gap.GetHeight() ),
-      m_hgap( gap.GetWidth() )
-{
-    wxASSERT(cols >= 0);
-}
-
-wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
-    : m_rows( rows || cols ? rows : 1 ),
-      m_cols( cols ),
-      m_vgap( vgap ),
-      m_hgap( hgap )
-{
-    wxASSERT(rows >= 0 && cols >= 0);
-}
-
-wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
-    : m_rows( rows || cols ? rows : 1 ),
-      m_cols( cols ),
-      m_vgap( gap.GetHeight() ),
-      m_hgap( gap.GetWidth() )
-{
-    wxASSERT(rows >= 0 && cols >= 0);
-}
-
-wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item)
-{
-    // if only the number of columns or the number of rows is specified for a
-    // sizer, arbitrarily many items can be added to it but if both of them are
-    // fixed, then the sizer can't have more than that many items -- check for
-    // this here to ensure that we detect errors as soon as possible
-    if ( m_cols && m_rows )
-    {
-        const int nitems = m_children.GetCount();
-        if ( nitems == m_cols*m_rows )
-        {
-            wxFAIL_MSG(
-                wxString::Format(
-                    "too many items (%d > %d*%d) in grid sizer (maybe you "
-                    "should omit the number of either rows or columns?)",
-                nitems + 1, m_cols, m_rows)
-            );
-
-            // additionally, continuing to use the specified number of columns
-            // and rows is not a good idea as callers of CalcRowsCols() expect
-            // that all sizer items can fit into m_cols-/m_rows-sized arrays
-            // which is not the case if there are too many items and results in
-            // crashes, so let it compute the number of rows automatically by
-            // forgetting the (wrong) number of rows specified (this also has a
-            // nice side effect of giving only one assert even if there are
-            // many more items than allowed in this sizer)
-            m_rows = 0;
-        }
-    }
-
-    return wxSizer::DoInsert(index, item);
-}
-
-int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
-{
-    const int nitems = m_children.GetCount();
-
-    ncols = GetEffectiveColsCount();
-    nrows = GetEffectiveRowsCount();
-
-    // Since Insert() checks for overpopulation, the following
-    // should only assert if the grid was shrunk via SetRows() / SetCols()
-    wxASSERT_MSG( nitems <= ncols*nrows, "logic error in wxGridSizer" );
-
-    return nitems;
-}
-
-void wxGridSizer::RecalcSizes()
-{
-    int nitems, nrows, ncols;
-    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
-        return;
-
-    wxSize sz( GetSize() );
-    wxPoint pt( GetPosition() );
-
-    int w = (sz.x - (ncols - 1) * m_hgap) / ncols;
-    int h = (sz.y - (nrows - 1) * m_vgap) / nrows;
-
-    int x = pt.x;
-    for (int c = 0; c < ncols; c++)
-    {
-        int y = pt.y;
-        for (int r = 0; r < nrows; r++)
-        {
-            int i = r * ncols + c;
-            if (i < nitems)
-            {
-                wxSizerItemList::compatibility_iterator node = m_children.Item( i );
-
-                wxASSERT_MSG( node, wxT("Failed to find SizerItemList node") );
-
-                SetItemBounds( node->GetData(), x, y, w, h);
-            }
-            y = y + h + m_vgap;
-        }
-        x = x + w + m_hgap;
-    }
-}
-
-wxSize wxGridSizer::CalcMin()
-{
-    int nrows, ncols;
-    if ( CalcRowsCols(nrows, ncols) == 0 )
-        return wxSize();
-
-    // Find the max width and height for any component
-    int w = 0;
-    int h = 0;
-
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-        wxSize           sz( item->CalcMin() );
-
-        w = wxMax( w, sz.x );
-        h = wxMax( h, sz.y );
-
-        node = node->GetNext();
-    }
-
-    // In case we have a nested sizer with a two step algo , give it
-    // a chance to adjust to that (we give it width component)
-    node = m_children.GetFirst();
-    bool didChangeMinSize = false;
-    while (node)
-    {
-        wxSizerItem     *item = node->GetData();
-        didChangeMinSize |= item->InformFirstDirection( wxHORIZONTAL, w, -1 );
-
-        node = node->GetNext();
-    }
-
-    // And redo iteration in case min size changed
-    if( didChangeMinSize )
-    {
-        node = m_children.GetFirst();
-        w = h = 0;
-        while (node)
-        {
-            wxSizerItem     *item = node->GetData();
-            wxSize           sz( item->GetMinSizeWithBorder() );
-
-            w = wxMax( w, sz.x );
-            h = wxMax( h, sz.y );
-
-            node = node->GetNext();
-        }
-    }
-
-    return wxSize( ncols * w + (ncols-1) * m_hgap,
-                   nrows * h + (nrows-1) * m_vgap );
-}
-
-void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
-{
-    wxPoint pt( x,y );
-    wxSize sz( item->GetMinSizeWithBorder() );
-    int flag = item->GetFlag();
-
-    if ((flag & wxEXPAND) || (flag & wxSHAPED))
-    {
-       sz = wxSize(w, h);
-    }
-    else
-    {
-        if (flag & wxALIGN_CENTER_HORIZONTAL)
-        {
-            pt.x = x + (w - sz.x) / 2;
-        }
-        else if (flag & wxALIGN_RIGHT)
-        {
-            pt.x = x + (w - sz.x);
-        }
-
-        if (flag & wxALIGN_CENTER_VERTICAL)
-        {
-            pt.y = y + (h - sz.y) / 2;
-        }
-        else if (flag & wxALIGN_BOTTOM)
-        {
-            pt.y = y + (h - sz.y);
-        }
-    }
-
-    item->SetDimension(pt, sz);
-}
-
-//---------------------------------------------------------------------------
-// wxFlexGridSizer
-//---------------------------------------------------------------------------
-
-wxFlexGridSizer::wxFlexGridSizer( int cols, int vgap, int hgap )
-               : wxGridSizer( cols, vgap, hgap ),
-                 m_flexDirection(wxBOTH),
-                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)
-{
-}
-
-wxFlexGridSizer::wxFlexGridSizer( int cols, const wxSize& gap )
-               : wxGridSizer( cols, gap ),
-                 m_flexDirection(wxBOTH),
-                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)
-{
-}
-
-wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )
-               : wxGridSizer( rows, cols, vgap, hgap ),
-                 m_flexDirection(wxBOTH),
-                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)
-{
-}
-
-wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, const wxSize& gap )
-               : wxGridSizer( rows, cols, gap ),
-                 m_flexDirection(wxBOTH),
-                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)
-{
-}
-
-wxFlexGridSizer::~wxFlexGridSizer()
-{
-}
-
-void wxFlexGridSizer::RecalcSizes()
-{
-    int nrows, ncols;
-    if ( !CalcRowsCols(nrows, ncols) )
-        return;
-
-    const wxPoint pt(GetPosition());
-    const wxSize sz(GetSize());
-
-    AdjustForGrowables(sz);
-
-    wxSizerItemList::const_iterator i = m_children.begin();
-    const wxSizerItemList::const_iterator end = m_children.end();
-
-    int y = 0;
-    for ( int r = 0; r < nrows; r++ )
-    {
-        if ( m_rowHeights[r] == -1 )
-        {
-            // this row is entirely hidden, skip it
-            for ( int c = 0; c < ncols; c++ )
-            {
-                if ( i == end )
-                    return;
-
-                ++i;
-            }
-
-            continue;
-        }
-
-        const int hrow = m_rowHeights[r];
-        int h = sz.y - y; // max remaining height, don't overflow it
-        if ( hrow < h )
-            h = hrow;
-
-        int x = 0;
-        for ( int c = 0; c < ncols && i != end; c++, ++i )
-        {
-            const int wcol = m_colWidths[c];
-
-            if ( wcol == -1 )
-                continue;
-
-            int w = sz.x - x; // max possible value, ensure we don't overflow
-            if ( wcol < w )
-                w = wcol;
-
-            SetItemBounds(*i, pt.x + x, pt.y + y, w, h);
-
-            x += wcol + m_hgap;
-        }
-
-        if ( i == end )
-            return;
-
-        y += hrow + m_vgap;
-    }
-}
-
-// helper function used in CalcMin() to sum up the sizes of non-hidden items
-static int SumArraySizes(const wxArrayInt& sizes, int gap)
-{
-    // Sum total minimum size, including gaps between rows/columns.
-    // -1 is used as a magic number meaning empty row/column.
-    int total = 0;
-
-    const size_t count = sizes.size();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        if ( sizes[n] != -1 )
-        {
-            if ( total )
-                total += gap; // separate from the previous column
-
-            total += sizes[n];
-        }
-    }
-
-    return total;
-}
-
-void wxFlexGridSizer::FindWidthsAndHeights(int nrows, int ncols)
-{
-    // We have to recalculate the sizes in case the item minimum size has
-    // changed since the previous layout, or the item has been hidden using
-    // wxSizer::Show(). If all the items in a row/column are hidden, the final
-    // dimension of the row/column will be -1, indicating that the column
-    // itself is hidden.
-    m_rowHeights.assign(nrows, -1);
-    m_colWidths.assign(ncols, -1);
-
-    // n is the index of the item in left-to-right top-to-bottom order
-    size_t n = 0;
-    for ( wxSizerItemList::iterator i = m_children.begin();
-          i != m_children.end();
-          ++i, ++n )
-    {
-        wxSizerItem * const item = *i;
-        if ( item->IsShown() )
-        {
-            // NOTE: Not doing the calculation here, this is just
-            // for finding max values.
-            const wxSize sz(item->GetMinSizeWithBorder());
-
-            const int row = n / ncols;
-            const int col = n % ncols;
-
-            if ( sz.y > m_rowHeights[row] )
-                m_rowHeights[row] = sz.y;
-            if ( sz.x > m_colWidths[col] )
-                m_colWidths[col] = sz.x;
-        }
-    }
-
-    AdjustForFlexDirection();
-
-    m_calculatedMinSize = wxSize(SumArraySizes(m_colWidths, m_hgap),
-                                 SumArraySizes(m_rowHeights, m_vgap));
-}
-
-wxSize wxFlexGridSizer::CalcMin()
-{
-    int nrows,
-        ncols;
-
-    // Number of rows/columns can change as items are added or removed.
-    if ( !CalcRowsCols(nrows, ncols) )
-        return wxSize();
-
-
-    // We have to recalculate the sizes in case the item minimum size has
-    // changed since the previous layout, or the item has been hidden using
-    // wxSizer::Show(). If all the items in a row/column are hidden, the final
-    // dimension of the row/column will be -1, indicating that the column
-    // itself is hidden.
-    m_rowHeights.assign(nrows, -1);
-    m_colWidths.assign(ncols, -1);
-
-    for ( wxSizerItemList::iterator i = m_children.begin();
-          i != m_children.end();
-          ++i)
-    {
-        wxSizerItem * const item = *i;
-        if ( item->IsShown() )
-        {
-            item->CalcMin();
-        }
-    }
-
-    // The stage of looking for max values in each row/column has been
-    // made a separate function, since it's reused in AdjustForGrowables.
-    FindWidthsAndHeights(nrows,ncols);
-
-    return m_calculatedMinSize;
-}
-
-void wxFlexGridSizer::AdjustForFlexDirection()
-{
-    // the logic in CalcMin works when we resize flexibly in both directions
-    // but maybe this is not the case
-    if ( m_flexDirection != wxBOTH )
-    {
-        // select the array corresponding to the direction in which we do *not*
-        // resize flexibly
-        wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths
-                                                          : m_rowHeights;
-
-        const size_t count = array.GetCount();
-
-        // find the largest value in this array
-        size_t n;
-        int largest = 0;
-
-        for ( n = 0; n < count; ++n )
-        {
-            if ( array[n] > largest )
-                largest = array[n];
-        }
-
-        // and now fill it with the largest value
-        for ( n = 0; n < count; ++n )
-        {
-            // don't touch hidden rows
-            if ( array[n] != -1 )
-                array[n] = largest;
-        }
-    }
-}
-
-// helper of AdjustForGrowables() which is called for rows/columns separately
-//
-// parameters:
-//      delta: the extra space, we do nothing unless it's positive
-//      growable: indices or growable rows/cols in sizes array
-//      sizes: the height/widths of rows/cols to adjust
-//      proportions: proportions of the growable rows/cols or NULL if they all
-//                   should be assumed to have proportion of 1
-static void
-DoAdjustForGrowables(int delta,
-                     const wxArrayInt& growable,
-                     wxArrayInt& sizes,
-                     const wxArrayInt *proportions)
-{
-    if ( delta <= 0 )
-        return;
-
-    // total sum of proportions of all non-hidden rows
-    int sum_proportions = 0;
-
-    // number of currently shown growable rows
-    int num = 0;
-
-    const int max_idx = sizes.size();
-
-    const size_t count = growable.size();
-    size_t idx;
-    for ( idx = 0; idx < count; idx++ )
-    {
-        // Since the number of rows/columns can change as items are
-        // inserted/deleted, we need to verify at runtime that the
-        // requested growable rows/columns are still valid.
-        if ( growable[idx] >= max_idx )
-            continue;
-
-        // If all items in a row/column are hidden, that row/column will
-        // have a dimension of -1.  This causes the row/column to be
-        // hidden completely.
-        if ( sizes[growable[idx]] == -1 )
-            continue;
-
-        if ( proportions )
-            sum_proportions += (*proportions)[idx];
-
-        num++;
-    }
-
-    if ( !num )
-        return;
-
-    // the remaining extra free space, adjusted during each iteration
-    for ( idx = 0; idx < count; idx++ )
-    {
-        if ( growable[idx] >= max_idx )
-            continue;
-
-        if ( sizes[ growable[idx] ] == -1 )
-            continue;
-
-        int cur_delta;
-        if ( sum_proportions == 0 )
-        {
-            // no growable rows -- divide extra space evenly among all
-            cur_delta = delta/num;
-            num--;
-        }
-        else // allocate extra space proportionally
-        {
-            const int cur_prop = (*proportions)[idx];
-            cur_delta = (delta*cur_prop)/sum_proportions;
-            sum_proportions -= cur_prop;
-        }
-
-        sizes[growable[idx]] += cur_delta;
-        delta -= cur_delta;
-    }
-}
-
-void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
-{
-#if wxDEBUG_LEVEL
-    // by the time this function is called, the sizer should be already fully
-    // initialized and hence the number of its columns and rows is known and we
-    // can check that all indices in m_growableCols/Rows are valid (see also
-    // comments in AddGrowableCol/Row())
-    if ( !m_rows || !m_cols )
-    {
-        if ( !m_rows )
-        {
-            int nrows = CalcRows();
-
-            for ( size_t n = 0; n < m_growableRows.size(); n++ )
-            {
-                wxASSERT_MSG( m_growableRows[n] < nrows,
-                              "invalid growable row index" );
-            }
-        }
-
-        if ( !m_cols )
-        {
-            int ncols = CalcCols();
-
-            for ( size_t n = 0; n < m_growableCols.size(); n++ )
-            {
-                wxASSERT_MSG( m_growableCols[n] < ncols,
-                              "invalid growable column index" );
-            }
-        }
-    }
-#endif // wxDEBUG_LEVEL
-
-
-    if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )
-    {
-        DoAdjustForGrowables
-        (
-            sz.x - m_calculatedMinSize.x,
-            m_growableCols,
-            m_colWidths,
-            m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions
-                                                    : NULL
-        );
-
-        // This gives nested objects that benefit from knowing one size
-        // component in advance the chance to use that.
-        bool didAdjustMinSize = false;
-
-        // Iterate over all items and inform about column width
-        const int ncols = GetEffectiveColsCount();
-        int col = 0;
-        for ( wxSizerItemList::iterator i = m_children.begin();
-              i != m_children.end();
-              ++i )
-        {
-            didAdjustMinSize |= (*i)->InformFirstDirection(wxHORIZONTAL, m_colWidths[col], sz.y - m_calculatedMinSize.y);
-            if ( ++col == ncols )
-                col = 0;
-        }
-
-        // Only redo if info was actually used
-        if( didAdjustMinSize )
-        {
-            DoAdjustForGrowables
-            (
-                sz.x - m_calculatedMinSize.x,
-                m_growableCols,
-                m_colWidths,
-                m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions
-                                                        : NULL
-            );
-        }
-    }
-
-    if ( (m_flexDirection & wxVERTICAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )
-    {
-        // pass NULL instead of proportions if the grow mode is ALL as we
-        // should treat all rows as having proportion of 1 then
-        DoAdjustForGrowables
-        (
-            sz.y - m_calculatedMinSize.y,
-            m_growableRows,
-            m_rowHeights,
-            m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableRowsProportions
-                                                    : NULL
-        );
-    }
-}
-
-bool wxFlexGridSizer::IsRowGrowable( size_t idx )
-{
-    return m_growableRows.Index( idx ) != wxNOT_FOUND;
-}
-
-bool wxFlexGridSizer::IsColGrowable( size_t idx )
-{
-    return m_growableCols.Index( idx ) != wxNOT_FOUND;
-}
-
-void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
-{
-    wxASSERT_MSG( !IsRowGrowable( idx ),
-                  "AddGrowableRow() called for growable row" );
-
-    // notice that we intentionally don't check the index validity here in (the
-    // common) case when the number of rows was not specified in the ctor -- in
-    // this case it will be computed only later, when all items are added to
-    // the sizer, and the check will be done in AdjustForGrowables()
-    wxCHECK_RET( !m_rows || idx < (size_t)m_rows, "invalid row index" );
-
-    m_growableRows.Add( idx );
-    m_growableRowsProportions.Add( proportion );
-}
-
-void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )
-{
-    wxASSERT_MSG( !IsColGrowable( idx ),
-                  "AddGrowableCol() called for growable column" );
-
-    // see comment in AddGrowableRow(): although it's less common to omit the
-    // specification of the number of columns, it still can also happen
-    wxCHECK_RET( !m_cols || idx < (size_t)m_cols, "invalid column index" );
-
-    m_growableCols.Add( idx );
-    m_growableColsProportions.Add( proportion );
-}
-
-// helper function for RemoveGrowableCol/Row()
-static void
-DoRemoveFromArrays(size_t idx, wxArrayInt& items, wxArrayInt& proportions)
-{
-    const size_t count = items.size();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        if ( (size_t)items[n] == idx )
-        {
-            items.RemoveAt(n);
-            proportions.RemoveAt(n);
-            return;
-        }
-    }
-
-    wxFAIL_MSG( wxT("column/row is already not growable") );
-}
-
-void wxFlexGridSizer::RemoveGrowableCol( size_t idx )
-{
-    DoRemoveFromArrays(idx, m_growableCols, m_growableColsProportions);
-}
-
-void wxFlexGridSizer::RemoveGrowableRow( size_t idx )
-{
-    DoRemoveFromArrays(idx, m_growableRows, m_growableRowsProportions);
-}
-
-//---------------------------------------------------------------------------
-// wxBoxSizer
-//---------------------------------------------------------------------------
-
-wxSizerItem *wxBoxSizer::AddSpacer(int size)
-{
-    return IsVertical() ? Add(0, size) : Add(size, 0);
-}
-
-namespace
-{
-
-/*
-    Helper of RecalcSizes(): checks if there is enough remaining space for the
-    min size of the given item and returns its min size or the entire remaining
-    space depending on which one is greater.
-
-    This function updates the remaining space parameter to account for the size
-    effectively allocated to the item.
- */
-int
-GetMinOrRemainingSize(int orient, const wxSizerItem *item, int *remainingSpace_)
-{
-    int& remainingSpace = *remainingSpace_;
-
-    wxCoord size;
-    if ( remainingSpace > 0 )
-    {
-        const wxSize sizeMin = item->GetMinSizeWithBorder();
-        size = orient == wxHORIZONTAL ? sizeMin.x : sizeMin.y;
-
-        if ( size >= remainingSpace )
-        {
-            // truncate the item to fit in the remaining space, this is better
-            // than showing it only partially in general, even if both choices
-            // are bad -- but there is nothing else we can do
-            size = remainingSpace;
-        }
-
-        remainingSpace -= size;
-    }
-    else // no remaining space
-    {
-        // no space at all left, no need to even query the item for its min
-        // size as we can't give it to it anyhow
-        size = 0;
-    }
-
-    return size;
-}
-
-} // anonymous namespace
-
-void wxBoxSizer::RecalcSizes()
-{
-    if ( m_children.empty() )
-        return;
-
-    const wxCoord totalMinorSize = GetSizeInMinorDir(m_size);
-    const wxCoord totalMajorSize = GetSizeInMajorDir(m_size);
-
-    // the amount of free space which we should redistribute among the
-    // stretchable items (i.e. those with non zero proportion)
-    int delta = totalMajorSize - GetSizeInMajorDir(m_minSize);
-
-    // declare loop variables used below:
-    wxSizerItemList::const_iterator i;  // iterator in m_children list
-    unsigned n = 0;                     // item index in majorSizes array
-
-
-    // First, inform item about the available size in minor direction as this
-    // can change their size in the major direction. Also compute the number of
-    // visible items and sum of their min sizes in major direction.
-
-    int minMajorSize = 0;
-    for ( i = m_children.begin(); i != m_children.end(); ++i )
-    {
-        wxSizerItem * const item = *i;
-
-        if ( !item->IsShown() )
-            continue;
-
-        wxSize szMinPrev = item->GetMinSizeWithBorder();
-        item->InformFirstDirection(m_orient^wxBOTH,totalMinorSize,delta);
-        wxSize szMin = item->GetMinSizeWithBorder();
-        int deltaChange = GetSizeInMajorDir(szMin-szMinPrev);
-        if( deltaChange )
-        {
-            // Since we passed available space along to the item, it should not
-            // take too much, so delta should not become negative.
-            delta -= deltaChange;
-        }
-        minMajorSize += GetSizeInMajorDir(item->GetMinSizeWithBorder());
-    }
-
-    // update our min size and delta which may have changed
-    SizeInMajorDir(m_minSize) = minMajorSize;
-    delta = totalMajorSize - minMajorSize;
-
-
-    // space and sum of proportions for the remaining items, both may change
-    // below
-    wxCoord remaining = totalMajorSize;
-    int totalProportion = m_totalProportion;
-
-    // size of the (visible) items in major direction, -1 means "not fixed yet"
-    wxVector<int> majorSizes(GetItemCount(), wxDefaultCoord);
-
-
-    // Check for the degenerated case when we don't have enough space for even
-    // the min sizes of all the items: in this case we really can't do much
-    // more than to allocate the min size to as many of fixed size items as
-    // possible (on the assumption that variable size items such as text zones
-    // or list boxes may use scrollbars to show their content even if their
-    // size is less than min size but that fixed size items such as buttons
-    // will suffer even more if we don't give them their min size)
-    if ( totalMajorSize < minMajorSize )
-    {
-        // Second degenerated case pass: allocate min size to all fixed size
-        // items.
-        for ( i = m_children.begin(), n = 0; i != m_children.end(); ++i, ++n )
-        {
-            wxSizerItem * const item = *i;
-
-            if ( !item->IsShown() )
-                continue;
-
-            // deal with fixed size items only during this pass
-            if ( item->GetProportion() )
-                continue;
-
-            majorSizes[n] = GetMinOrRemainingSize(m_orient, item, &remaining);
-        }
-
-
-        // Third degenerated case pass: allocate min size to all the remaining,
-        // i.e. non-fixed size, items.
-        for ( i = m_children.begin(), n = 0; i != m_children.end(); ++i, ++n )
-        {
-            wxSizerItem * const item = *i;
-
-            if ( !item->IsShown() )
-                continue;
-
-            // we've already dealt with fixed size items above
-            if ( !item->GetProportion() )
-                continue;
-
-            majorSizes[n] = GetMinOrRemainingSize(m_orient, item, &remaining);
-        }
-    }
-    else // we do have enough space to give at least min sizes to all items
-    {
-        // Second and maybe more passes in the non-degenerated case: deal with
-        // fixed size items and items whose min size is greater than what we
-        // would allocate to them taking their proportion into account. For
-        // both of them, we will just use their min size, but for the latter we
-        // also need to reexamine all the items as the items which fitted
-        // before we adjusted their size upwards might not fit any more. This
-        // does make for a quadratic algorithm but it's not obvious how to
-        // avoid it and hopefully it's not a huge problem in practice as the
-        // sizers don't have many items usually (and, of course, the algorithm
-        // still reduces into a linear one if there is enough space for all the
-        // min sizes).
-        bool nonFixedSpaceChanged = false;
-        for ( i = m_children.begin(), n = 0; ; ++i, ++n )
-        {
-            if ( nonFixedSpaceChanged )
-            {
-                i = m_children.begin();
-                n = 0;
-                nonFixedSpaceChanged = false;
-            }
-
-            // check for the end of the loop only after the check above as
-            // otherwise we wouldn't do another pass if the last child resulted
-            // in non fixed space reduction
-            if ( i == m_children.end() )
-                break;
-
-            wxSizerItem * const item = *i;
-
-            if ( !item->IsShown() )
-                continue;
-
-            // don't check the item which we had already dealt with during a
-            // previous pass (this is more than an optimization, the code
-            // wouldn't work correctly if we kept adjusting for the same item
-            // over and over again)
-            if ( majorSizes[n] != wxDefaultCoord )
-                continue;
-
-            wxCoord minMajor = GetSizeInMajorDir(item->GetMinSizeWithBorder());
-
-            // it doesn't make sense for min size to be negative but right now
-            // it's possible to create e.g. a spacer with (-1, 10) as size and
-            // people do it in their code apparently (see #11842) so ensure
-            // that we don't use this -1 as real min size as it conflicts with
-            // the meaning we use for it here and negative min sizes just don't
-            // make sense anyhow (which is why it might be a better idea to
-            // deal with them at wxSizerItem level in the future but for now
-            // this is the minimal fix for the bug)
-            if ( minMajor < 0 )
-                minMajor = 0;
-
-            const int propItem = item->GetProportion();
-            if ( propItem )
-            {
-                // is the desired size of this item big enough?
-                if ( (remaining*propItem)/totalProportion >= minMajor )
-                {
-                    // yes, it is, we'll determine the real size of this
-                    // item later, for now just leave it as wxDefaultCoord
-                    continue;
-                }
-
-                // the proportion of this item won't count, it has
-                // effectively become fixed
-                totalProportion -= propItem;
-            }
-
-            // we can already allocate space for this item
-            majorSizes[n] = minMajor;
-
-            // change the amount of the space remaining to the other items,
-            // as this can result in not being able to satisfy their
-            // proportions any more we will need to redo another loop
-            // iteration
-            remaining -= minMajor;
-
-            nonFixedSpaceChanged = true;
-        }
-
-
-        // Last by one pass: distribute the remaining space among the non-fixed
-        // items whose size weren't fixed yet according to their proportions.
-        for ( i = m_children.begin(), n = 0; i != m_children.end(); ++i, ++n )
-        {
-            wxSizerItem * const item = *i;
-
-            if ( !item->IsShown() )
-                continue;
-
-            if ( majorSizes[n] == wxDefaultCoord )
-            {
-                const int propItem = item->GetProportion();
-                majorSizes[n] = (remaining*propItem)/totalProportion;
-
-                remaining -= majorSizes[n];
-                totalProportion -= propItem;
-            }
-        }
-    }
-
-
-    // the position at which we put the next child
-    wxPoint pt(m_position);
-
-
-    // Final pass: finally do position the items correctly using their sizes as
-    // determined above.
-    for ( i = m_children.begin(), n = 0; i != m_children.end(); ++i, ++n )
-    {
-        wxSizerItem * const item = *i;
-
-        if ( !item->IsShown() )
-            continue;
-
-        const int majorSize = majorSizes[n];
-
-        const wxSize sizeThis(item->GetMinSizeWithBorder());
-
-        // apply the alignment in the minor direction
-        wxPoint posChild(pt);
-
-        wxCoord minorSize = GetSizeInMinorDir(sizeThis);
-        const int flag = item->GetFlag();
-        if ( (flag & (wxEXPAND | wxSHAPED)) || (minorSize > totalMinorSize) )
-        {
-            // occupy all the available space if wxEXPAND was given and also if
-            // the item is too big to fit -- in this case we truncate it below
-            // its minimal size which is bad but better than not showing parts
-            // of the window at all
-            minorSize = totalMinorSize;
-        }
-        else if ( flag & (IsVertical() ? wxALIGN_RIGHT : wxALIGN_BOTTOM) )
-        {
-            PosInMinorDir(posChild) += totalMinorSize - minorSize;
-        }
-        // NB: wxCENTRE is used here only for backwards compatibility,
-        //     wxALIGN_CENTRE should be used in new code
-        else if ( flag & (wxCENTER | (IsVertical() ? wxALIGN_CENTRE_HORIZONTAL
-                                                   : wxALIGN_CENTRE_VERTICAL)) )
-        {
-            PosInMinorDir(posChild) += (totalMinorSize - minorSize) / 2;
-        }
-
-
-        // apply RTL adjustment for horizontal sizers:
-        if ( !IsVertical() && m_containingWindow )
-        {
-            posChild.x = m_containingWindow->AdjustForLayoutDirection
-                                             (
-                                                posChild.x,
-                                                majorSize,
-                                                m_size.x
-                                             );
-        }
-
-        // finally set size of this child and advance to the next one
-        item->SetDimension(posChild, SizeFromMajorMinor(majorSize, minorSize));
-
-        PosInMajorDir(pt) += majorSize;
-    }
-}
-
-wxSize wxBoxSizer::CalcMin()
-{
-    m_totalProportion = 0;
-    m_minSize = wxSize(0, 0);
-
-    // The minimal size for the sizer should be big enough to allocate its
-    // element at least its minimal size but also, and this is the non trivial
-    // part, to respect the children proportion. To satisfy the latter
-    // condition we must find the greatest min-size-to-proportion ratio for all
-    // elements with non-zero proportion.
-    float maxMinSizeToProp = 0.;
-    for ( wxSizerItemList::const_iterator i = m_children.begin();
-          i != m_children.end();
-          ++i )
-    {
-        wxSizerItem * const item = *i;
-
-        if ( !item->IsShown() )
-            continue;
-
-        const wxSize sizeMinThis = item->CalcMin();
-        if ( const int propThis = item->GetProportion() )
-        {
-            float minSizeToProp = GetSizeInMajorDir(sizeMinThis);
-            minSizeToProp /= propThis;
-
-            if ( minSizeToProp > maxMinSizeToProp )
-                maxMinSizeToProp = minSizeToProp;
-
-            m_totalProportion += item->GetProportion();
-        }
-        else // fixed size item
-        {
-            // Just account for its size directly
-            SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis);
-        }
-
-        // In the transversal direction we just need to find the maximum.
-        if ( GetSizeInMinorDir(sizeMinThis) > GetSizeInMinorDir(m_minSize) )
-            SizeInMinorDir(m_minSize) = GetSizeInMinorDir(sizeMinThis);
-    }
-
-    // Using the max ratio ensures that the min size is big enough for all
-    // items to have their min size and satisfy the proportions among them.
-    SizeInMajorDir(m_minSize) += (int)(maxMinSizeToProp*m_totalProportion);
-
-    return m_minSize;
-}
-
-//---------------------------------------------------------------------------
-// wxStaticBoxSizer
-//---------------------------------------------------------------------------
-
-#if wxUSE_STATBOX
-
-wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
-    : wxBoxSizer( orient ),
-      m_staticBox( box )
-{
-    wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") );
-
-    // do this so that our Detach() is called if the static box is destroyed
-    // before we are
-    m_staticBox->SetContainingSizer(this);
-}
-
-wxStaticBoxSizer::wxStaticBoxSizer(int orient, wxWindow *win, const wxString& s)
-                : wxBoxSizer(orient),
-                  m_staticBox(new wxStaticBox(win, wxID_ANY, s))
-{
-    // same as above
-    m_staticBox->SetContainingSizer(this);
-}
-
-wxStaticBoxSizer::~wxStaticBoxSizer()
-{
-    delete m_staticBox;
-}
-
-void wxStaticBoxSizer::RecalcSizes()
-{
-    int top_border, other_border;
-    m_staticBox->GetBordersForSizer(&top_border, &other_border);
-
-    m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
-
-    wxSize old_size( m_size );
-    m_size.x -= 2*other_border;
-    m_size.y -= top_border + other_border;
-
-    wxPoint old_pos( m_position );
-    if (m_staticBox->GetChildren().GetCount() > 0)
-    {
-#if defined( __WXGTK20__ )
-        // if the wxStaticBox has created a wxPizza to contain its children
-        // (see wxStaticBox::AddChild) then we need to place the items it contains
-        // in the wxBoxSizer::RecalcSizes() call below using coordinates relative
-        // to the top-left corner of the staticbox:
-        m_position.x = m_position.y = 0;
-#elif defined(__WXOSX__) && wxOSX_USE_COCOA
-        // the distance from the 'inner' content view to the embedded controls
-        // this is independent of the title, therefore top_border is not relevant
-        m_position.x = m_position.y = 10;
-#else
-        // if the wxStaticBox has children, then these windows must be placed
-        // by the wxBoxSizer::RecalcSizes() call below using coordinates relative
-        // to the top-left corner of the staticbox (but unlike wxGTK, we need
-        // to keep in count the static borders here!):
-        m_position.x = other_border;
-        m_position.y = top_border;
-#endif
-    }
-    else
-    {
-        // the windows contained in the staticbox have been created as siblings of the
-        // staticbox (this is the "old" way of staticbox contents creation); in this
-        // case we need to position them with coordinates relative to our common parent
-        m_position.x += other_border;
-        m_position.y += top_border;
-    }
-
-    wxBoxSizer::RecalcSizes();
-
-    m_position = old_pos;
-    m_size = old_size;
-}
-
-wxSize wxStaticBoxSizer::CalcMin()
-{
-    int top_border, other_border;
-    m_staticBox->GetBordersForSizer(&top_border, &other_border);
-
-    wxSize ret( wxBoxSizer::CalcMin() );
-    ret.x += 2*other_border;
-
-    // ensure that we're wide enough to show the static box label (there is no
-    // need to check for the static box best size in vertical direction though)
-    const int boxWidth = m_staticBox->GetBestSize().x;
-    if ( ret.x < boxWidth )
-        ret.x = boxWidth;
-
-    ret.y += other_border + top_border;
-
-    return ret;
-}
-
-void wxStaticBoxSizer::ShowItems( bool show )
-{
-    m_staticBox->Show( show );
-    wxBoxSizer::ShowItems( show );
-}
-
-bool wxStaticBoxSizer::Detach( wxWindow *window )
-{
-    // avoid deleting m_staticBox in our dtor if it's being detached from the
-    // sizer (which can happen because it's being already destroyed for
-    // example)
-    if ( window == m_staticBox )
-    {
-        m_staticBox = NULL;
-        return true;
-    }
-
-    return wxSizer::Detach( window );
-}
-
-#endif // wxUSE_STATBOX
-
-//---------------------------------------------------------------------------
-// wxStdDialogButtonSizer
-//---------------------------------------------------------------------------
-
-#if wxUSE_BUTTON
-
-wxStdDialogButtonSizer::wxStdDialogButtonSizer()
-    : wxBoxSizer(wxHORIZONTAL)
-{
-    // Vertical buttons with lots of space on either side
-    // looks rubbish on WinCE, so let's not do this for now.
-    // If we are going to use vertical buttons, we should
-    // put the sizer to the right of other controls in the dialog,
-    // and that's beyond the scope of this sizer.
-#ifndef __WXWINCE__
-    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
-    // If we have a PDA screen, put yes/no button over
-    // all other buttons, otherwise on the left side.
-    if (is_pda)
-        m_orient = wxVERTICAL;
-#endif
-
-    m_buttonAffirmative = NULL;
-    m_buttonApply = NULL;
-    m_buttonNegative = NULL;
-    m_buttonCancel = NULL;
-    m_buttonHelp = NULL;
-}
-
-void wxStdDialogButtonSizer::AddButton(wxButton *mybutton)
-{
-    switch (mybutton->GetId())
-    {
-        case wxID_OK:
-        case wxID_YES:
-        case wxID_SAVE:
-            m_buttonAffirmative = mybutton;
-            break;
-        case wxID_APPLY:
-            m_buttonApply = mybutton;
-            break;
-        case wxID_NO:
-            m_buttonNegative = mybutton;
-            break;
-        case wxID_CANCEL:
-        case wxID_CLOSE:
-            m_buttonCancel = mybutton;
-            break;
-        case wxID_HELP:
-        case wxID_CONTEXT_HELP:
-            m_buttonHelp = mybutton;
-            break;
-        default:
-            break;
-    }
-}
-
-void wxStdDialogButtonSizer::SetAffirmativeButton( wxButton *button )
-{
-    m_buttonAffirmative = button;
-}
-
-void wxStdDialogButtonSizer::SetNegativeButton( wxButton *button )
-{
-    m_buttonNegative = button;
-}
-
-void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
-{
-    m_buttonCancel = button;
-}
-
-void wxStdDialogButtonSizer::Realize()
-{
-#ifdef __WXMAC__
-        Add(0, 0, 0, wxLEFT, 6);
-        if (m_buttonHelp)
-            Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
-
-        if (m_buttonNegative){
-            // HIG POLICE BULLETIN - destructive buttons need extra padding
-            // 24 pixels on either side
-            Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 12);
-        }
-
-        // extra whitespace between help/negative and cancel/ok buttons
-        Add(0, 0, 1, wxEXPAND, 0);
-
-        if (m_buttonCancel){
-            Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
-            // Cancel or help should be default
-            // m_buttonCancel->SetDefaultButton();
-        }
-
-        // Ugh, Mac doesn't really have apply dialogs, so I'll just
-        // figure the best place is between Cancel and OK
-        if (m_buttonApply)
-            Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
-
-        if (m_buttonAffirmative){
-            Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
-
-            if (m_buttonAffirmative->GetId() == wxID_SAVE){
-                // these buttons have set labels under Mac so we should use them
-                m_buttonAffirmative->SetLabel(_("Save"));
-                if (m_buttonNegative)
-                    m_buttonNegative->SetLabel(_("Don't Save"));
-            }
-        }
-
-        // Extra space around and at the right
-        Add(12, 40);
-#elif defined(__WXGTK20__)
-        // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en
-        // says that the correct button order is
-        //
-        //      [Help]                  [Alternative] [Cancel] [Affirmative]
-
-        // Flags ensuring that margins between the buttons are 6 pixels.
-        const wxSizerFlags
-            flagsBtn = wxSizerFlags().Centre().Border(wxLEFT | wxRIGHT, 3);
-
-        // Margin around the entire sizer button should be 12.
-        AddSpacer(9);
-
-        if (m_buttonHelp)
-            Add(m_buttonHelp, flagsBtn);
-
-        // Align the rest of the buttons to the right.
-        AddStretchSpacer();
-
-        if (m_buttonNegative)
-            Add(m_buttonNegative, flagsBtn);
-
-        if (m_buttonApply)
-            Add(m_buttonApply, flagsBtn);
-
-        if (m_buttonCancel)
-            Add(m_buttonCancel, flagsBtn);
-
-        if (m_buttonAffirmative)
-            Add(m_buttonAffirmative, flagsBtn);
-
-        // Ensure that the right margin is 12 as well.
-        AddSpacer(9);
-#elif defined(__WXMSW__)
-        // Windows
-
-        // right-justify buttons
-        Add(0, 0, 1, wxEXPAND, 0);
-
-        if (m_buttonAffirmative){
-            Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(2, 0)).x);
-        }
-
-        if (m_buttonNegative){
-            Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(2, 0)).x);
-        }
-
-        if (m_buttonCancel){
-            Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(2, 0)).x);
-        }
-        if (m_buttonApply)
-            Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(2, 0)).x);
-
-        if (m_buttonHelp)
-            Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(2, 0)).x);
-#else
-        // GTK+1 and any other platform
-
-        // Add(0, 0, 0, wxLEFT, 5); // Not sure what this was for but it unbalances the dialog
-        if (m_buttonHelp)
-            Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x);
-
-        // extra whitespace between help and cancel/ok buttons
-        Add(0, 0, 1, wxEXPAND, 0);
-
-        if (m_buttonApply)
-            Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(4, 0)).x);
-
-        if (m_buttonAffirmative){
-            Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(4, 0)).x);
-        }
-
-        if (m_buttonNegative){
-            Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(4, 0)).x);
-        }
-
-        if (m_buttonCancel){
-            Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x);
-            // Cancel or help should be default
-            // m_buttonCancel->SetDefaultButton();
-        }
-
-#endif
-}
-
-#endif // wxUSE_BUTTON
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/sizer.cpp
+// Purpose:     provide new wxSizer class for layout
+// Author:      Robert Roebling and Robin Dunn, contributions by
+//              Dirk Holtwick, Ron Lee
+// Modified by: Ron Lee
+// Created:
+// RCS-ID:      $Id: sizer.cpp 66936 2011-02-17 09:52:57Z JS $
+// Copyright:   (c) Robin Dunn, Robert Roebling
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/display.h"
+#include "wx/sizer.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/math.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/button.h"
+    #include "wx/statbox.h"
+    #include "wx/toplevel.h"
+#endif // WX_PRECOMP
+
+#include "wx/listimpl.cpp"
+
+#if WXWIN_COMPATIBILITY_2_4
+    #include "wx/notebook.h"
+#endif
+
+//---------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxSizerItem, wxObject)
+IMPLEMENT_CLASS(wxSizer, wxObject)
+IMPLEMENT_CLASS(wxGridSizer, wxSizer)
+IMPLEMENT_CLASS(wxFlexGridSizer, wxGridSizer)
+IMPLEMENT_CLASS(wxBoxSizer, wxSizer)
+#if wxUSE_STATBOX
+IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
+#endif
+#if wxUSE_BUTTON
+IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
+#endif
+
+WX_DEFINE_EXPORTED_LIST( wxSizerItemList )
+
+/*
+    TODO PROPERTIES
+      sizeritem
+        object
+        object_ref
+          minsize
+          option
+          flag
+          border
+     spacer
+        option
+        flag
+        borfder
+    boxsizer
+       orient
+    staticboxsizer
+       orient
+       label
+    gridsizer
+       rows
+       cols
+       vgap
+       hgap
+    flexgridsizer
+       rows
+       cols
+       vgap
+       hgap
+       growablerows
+       growablecols
+    minsize
+*/
+
+
+// ----------------------------------------------------------------------------
+// wxSizerFlags
+// ----------------------------------------------------------------------------
+
+wxSizerFlags& wxSizerFlags::ReserveSpaceEvenIfHidden()
+{
+    m_flags |= wxRESERVE_SPACE_EVEN_IF_HIDDEN;
+    return *this;
+}
+
+// ----------------------------------------------------------------------------
+// wxSizerItem
+// ----------------------------------------------------------------------------
+
+void wxSizerItem::Init(const wxSizerFlags& flags)
+{
+    Init();
+
+    m_proportion = flags.GetProportion();
+    m_flag = flags.GetFlags();
+    m_border = flags.GetBorderInPixels();
+}
+
+wxSizerItem::wxSizerItem()
+{
+    Init();
+
+    m_proportion = 0;
+    m_border = 0;
+    m_flag = 0;
+
+    m_kind = Item_None;
+}
+
+// window item
+void wxSizerItem::SetWindow(wxWindow *window)
+{
+    wxCHECK_RET( window, _T("NULL window in wxSizerItem::SetWindow()") );
+
+    m_kind = Item_Window;
+    m_window = window;
+
+    // window doesn't become smaller than its initial size, whatever happens
+    m_minSize = window->GetSize();
+
+    if ( m_flag & wxFIXED_MINSIZE )
+        window->SetMinSize(m_minSize);
+
+    // aspect ratio calculated from initial size
+    SetRatio(m_minSize);
+}
+
+wxSizerItem::wxSizerItem(wxWindow *window,
+                         int proportion,
+                         int flag,
+                         int border,
+                         wxObject* userData)
+           : m_proportion(proportion),
+             m_border(border),
+             m_flag(flag),
+             m_userData(userData)
+{
+    SetWindow(window);
+}
+
+// sizer item
+void wxSizerItem::SetSizer(wxSizer *sizer)
+{
+    m_kind = Item_Sizer;
+    m_sizer = sizer;
+}
+
+wxSizerItem::wxSizerItem(wxSizer *sizer,
+                         int proportion,
+                         int flag,
+                         int border,
+                         wxObject* userData)
+           : m_proportion(proportion),
+             m_border(border),
+             m_flag(flag),
+             m_ratio(0.0),
+             m_userData(userData)
+{
+    SetSizer(sizer);
+
+    // m_minSize is set later
+}
+
+// spacer item
+void wxSizerItem::SetSpacer(const wxSize& size)
+{
+    m_kind = Item_Spacer;
+    m_spacer = new wxSizerSpacer(size);
+    m_minSize = size;
+    SetRatio(size);
+}
+
+wxSizerItem::wxSizerItem(int width,
+                         int height,
+                         int proportion,
+                         int flag,
+                         int border,
+                         wxObject* userData)
+           : m_minSize(width, height), // minimal size is the initial size
+             m_proportion(proportion),
+             m_border(border),
+             m_flag(flag),
+             m_userData(userData)
+{
+    SetSpacer(width, height);
+}
+
+wxSizerItem::~wxSizerItem()
+{
+    delete m_userData;
+
+    switch ( m_kind )
+    {
+        case Item_None:
+            break;
+
+        case Item_Window:
+            m_window->SetContainingSizer(NULL);
+            break;
+
+        case Item_Sizer:
+            delete m_sizer;
+            break;
+
+        case Item_Spacer:
+            delete m_spacer;
+            break;
+
+        case Item_Max:
+        default:
+            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+    }
+}
+
+wxSize wxSizerItem::GetSpacer() const
+{
+    wxSize size;
+    if ( m_kind == Item_Spacer )
+        size = m_spacer->GetSize();
+
+    return size;
+}
+
+
+wxSize wxSizerItem::GetSize() const
+{
+    wxSize ret;
+    switch ( m_kind )
+    {
+        case Item_None:
+            break;
+
+        case Item_Window:
+            ret = m_window->GetSize();
+            break;
+
+        case Item_Sizer:
+            ret = m_sizer->GetSize();
+            break;
+
+        case Item_Spacer:
+            ret = m_spacer->GetSize();
+            break;
+
+        case Item_Max:
+        default:
+            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+    }
+
+    if (m_flag & wxWEST)
+        ret.x += m_border;
+    if (m_flag & wxEAST)
+        ret.x += m_border;
+    if (m_flag & wxNORTH)
+        ret.y += m_border;
+    if (m_flag & wxSOUTH)
+        ret.y += m_border;
+
+    return ret;
+}
+
+wxSize wxSizerItem::CalcMin()
+{
+    if (IsSizer())
+    {
+        m_minSize = m_sizer->GetMinSize();
+
+        // if we have to preserve aspect ratio _AND_ this is
+        // the first-time calculation, consider ret to be initial size
+        if ( (m_flag & wxSHAPED) && wxIsNullDouble(m_ratio) )
+            SetRatio(m_minSize);
+    }
+    else if ( IsWindow() )
+    {
+        // Since the size of the window may change during runtime, we
+        // should use the current minimal/best size.
+        m_minSize = m_window->GetEffectiveMinSize();
+    }
+
+    return GetMinSizeWithBorder();
+}
+
+wxSize wxSizerItem::GetMinSizeWithBorder() const
+{
+    wxSize ret = m_minSize;
+
+    if (m_flag & wxWEST)
+        ret.x += m_border;
+    if (m_flag & wxEAST)
+        ret.x += m_border;
+    if (m_flag & wxNORTH)
+        ret.y += m_border;
+    if (m_flag & wxSOUTH)
+        ret.y += m_border;
+
+    return ret;
+}
+
+
+void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ )
+{
+    wxPoint pos = pos_;
+    wxSize size = size_;
+    if (m_flag & wxSHAPED)
+    {
+        // adjust aspect ratio
+        int rwidth = (int) (size.y * m_ratio);
+        if (rwidth > size.x)
+        {
+            // fit horizontally
+            int rheight = (int) (size.x / m_ratio);
+            // add vertical space
+            if (m_flag & wxALIGN_CENTER_VERTICAL)
+                pos.y += (size.y - rheight) / 2;
+            else if (m_flag & wxALIGN_BOTTOM)
+                pos.y += (size.y - rheight);
+            // use reduced dimensions
+            size.y =rheight;
+        }
+        else if (rwidth < size.x)
+        {
+            // add horizontal space
+            if (m_flag & wxALIGN_CENTER_HORIZONTAL)
+                pos.x += (size.x - rwidth) / 2;
+            else if (m_flag & wxALIGN_RIGHT)
+                pos.x += (size.x - rwidth);
+            size.x = rwidth;
+        }
+    }
+
+    // This is what GetPosition() returns. Since we calculate
+    // borders afterwards, GetPosition() will be the left/top
+    // corner of the surrounding border.
+    m_pos = pos;
+
+    if (m_flag & wxWEST)
+    {
+        pos.x += m_border;
+        size.x -= m_border;
+    }
+    if (m_flag & wxEAST)
+    {
+        size.x -= m_border;
+    }
+    if (m_flag & wxNORTH)
+    {
+        pos.y += m_border;
+        size.y -= m_border;
+    }
+    if (m_flag & wxSOUTH)
+    {
+        size.y -= m_border;
+    }
+
+    if (size.x < 0)
+        size.x = 0;
+    if (size.y < 0)
+        size.y = 0;
+
+    m_rect = wxRect(pos, size);
+
+    switch ( m_kind )
+    {
+        case Item_None:
+            wxFAIL_MSG( _T("can't set size of uninitialized sizer item") );
+            break;
+
+        case Item_Window:
+            m_window->SetSize(pos.x, pos.y, size.x, size.y,
+                              wxSIZE_ALLOW_MINUS_ONE);
+            break;
+
+        case Item_Sizer:
+            m_sizer->SetDimension(pos.x, pos.y, size.x, size.y);
+            break;
+
+        case Item_Spacer:
+            m_spacer->SetSize(size);
+            break;
+
+        case Item_Max:
+        default:
+            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+    }
+}
+
+void wxSizerItem::DeleteWindows()
+{
+    switch ( m_kind )
+    {
+        case Item_None:
+        case Item_Spacer:
+            break;
+
+        case Item_Window:
+            //We are deleting the window from this sizer - normally
+            //the window destroys the sizer associated with it,
+            //which might destroy this, which we don't want
+            m_window->SetContainingSizer(NULL);
+            m_window->Destroy();
+            //Putting this after the switch will result in a spacer
+            //not being deleted properly on destruction
+            m_kind = Item_None;
+            break;
+
+        case Item_Sizer:
+            m_sizer->DeleteWindows();
+            break;
+
+        case Item_Max:
+        default:
+            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+    }
+
+}
+
+void wxSizerItem::Show( bool show )
+{
+    switch ( m_kind )
+    {
+        case Item_None:
+            wxFAIL_MSG( _T("can't show uninitialized sizer item") );
+            break;
+
+        case Item_Window:
+            m_window->Show(show);
+            break;
+
+        case Item_Sizer:
+            m_sizer->Show(show);
+            break;
+
+        case Item_Spacer:
+            m_spacer->Show(show);
+            break;
+
+        case Item_Max:
+        default:
+            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+    }
+}
+
+bool wxSizerItem::IsShown() const
+{
+    switch ( m_kind )
+    {
+        case Item_None:
+            // we may be called from CalcMin(), just return false so that we're
+            // not used
+            break;
+
+        case Item_Window:
+            return m_window->IsShown();
+
+        case Item_Sizer:
+            // arbitrarily decide that if at least one of our elements is
+            // shown, so are we (this arbitrariness is the reason for
+            // deprecating this function)
+            {
+                // Some apps (such as dialog editors) depend on an empty sizer still
+                // being laid out correctly and reporting the correct size and position.
+                if (m_sizer->GetChildren().GetCount() == 0)
+                    return true;
+
+                for ( wxSizerItemList::compatibility_iterator
+                        node = m_sizer->GetChildren().GetFirst();
+                      node;
+                      node = node->GetNext() )
+                {
+                    if ( node->GetData()->IsShown() )
+                        return true;
+                }
+            }
+            return false;
+
+        case Item_Spacer:
+            return m_spacer->IsShown();
+
+        case Item_Max:
+        default:
+            wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+    }
+
+    return false;
+}
+
+// This is a helper to support wxRESERVE_SPACE_EVEN_IF_HIDDEN. In wx 2.9+,
+// this flag is respected by IsShown(), but not in wx 2.8.
+bool wxSizerItem::ShouldAccountFor() const
+{
+    if ( m_flag & wxRESERVE_SPACE_EVEN_IF_HIDDEN )
+        return true;
+
+    if ( IsSizer() )
+    {
+        // this mirrors wxSizerItem::IsShown() code above
+        const wxSizerItemList& children = m_sizer->GetChildren();
+        if ( children.GetCount() == 0 )
+            return true;
+
+        for ( wxSizerItemList::compatibility_iterator
+              node = children.GetFirst();
+              node;
+              node = node->GetNext() )
+        {
+            if ( node->GetData()->ShouldAccountFor() )
+                return true;
+        }
+        return false;
+    }
+    else
+    {
+        return IsShown();
+    }
+}
+
+
+#if WXWIN_COMPATIBILITY_2_6
+void wxSizerItem::SetOption( int option )
+{
+    SetProportion( option );
+}
+
+int wxSizerItem::GetOption() const
+{
+    return GetProportion();
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+
+//---------------------------------------------------------------------------
+// wxSizer
+//---------------------------------------------------------------------------
+
+wxSizer::~wxSizer()
+{
+    WX_CLEAR_LIST(wxSizerItemList, m_children);
+}
+
+wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item )
+{
+    m_children.Insert( index, item );
+
+    if ( item->GetWindow() )
+        item->GetWindow()->SetContainingSizer( this );
+
+    if ( item->GetSizer() )
+        item->GetSizer()->SetContainingWindow( m_containingWindow );
+
+    return item;
+}
+
+void wxSizer::SetContainingWindow(wxWindow *win)
+{
+    if ( win == m_containingWindow )
+        return;
+
+    m_containingWindow = win;
+
+    // set the same window for all nested sizers as well, they also are in the
+    // same window
+    for ( wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxSizerItem *const item = node->GetData();
+        wxSizer *const sizer = item->GetSizer();
+
+        if ( sizer )
+        {
+            sizer->SetContainingWindow(win);
+        }
+    }
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+bool wxSizer::Remove( wxWindow *window )
+{
+    return Detach( window );
+}
+#endif // WXWIN_COMPATIBILITY_2_6
+
+bool wxSizer::Remove( wxSizer *sizer )
+{
+    wxASSERT_MSG( sizer, _T("Removing NULL sizer") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetSizer() == sizer)
+        {
+            delete item;
+            m_children.Erase( node );
+            return true;
+        }
+
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
+bool wxSizer::Remove( int index )
+{
+    wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
+                 false,
+                 _T("Remove index is out of range") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+
+    wxSizerItem *item = node->GetData();
+
+    if ( item->IsWindow() )
+        item->GetWindow()->SetContainingSizer( NULL );
+
+    delete item;
+    m_children.Erase( node );
+    return true;
+}
+
+bool wxSizer::Detach( wxSizer *sizer )
+{
+    wxASSERT_MSG( sizer, _T("Detaching NULL sizer") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetSizer() == sizer)
+        {
+            item->DetachSizer();
+            delete item;
+            m_children.Erase( node );
+            return true;
+        }
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
+bool wxSizer::Detach( wxWindow *window )
+{
+    wxASSERT_MSG( window, _T("Detaching NULL window") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetWindow() == window)
+        {
+            item->GetWindow()->SetContainingSizer( NULL );
+            delete item;
+            m_children.Erase( node );
+            return true;
+        }
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
+bool wxSizer::Detach( int index )
+{
+    wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
+                 false,
+                 _T("Detach index is out of range") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+
+    wxSizerItem *item = node->GetData();
+
+    if ( item->IsSizer() )
+        item->DetachSizer();
+    else if ( item->IsWindow() )
+        item->GetWindow()->SetContainingSizer( NULL );
+
+    delete item;
+    m_children.Erase( node );
+    return true;
+}
+
+bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive )
+{
+    wxASSERT_MSG( oldwin, _T("Replacing NULL window") );
+    wxASSERT_MSG( newwin, _T("Replacing with NULL window") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetWindow() == oldwin)
+        {
+            item->GetWindow()->SetContainingSizer( NULL );
+            item->SetWindow(newwin);
+            newwin->SetContainingSizer( this );
+            return true;
+        }
+        else if (recursive && item->IsSizer())
+        {
+            if (item->GetSizer()->Replace( oldwin, newwin, true ))
+                return true;
+        }
+
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
+bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive )
+{
+    wxASSERT_MSG( oldsz, _T("Replacing NULL sizer") );
+    wxASSERT_MSG( newsz, _T("Replacing with NULL sizer") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetSizer() == oldsz)
+        {
+            wxSizer *old = item->GetSizer();
+            item->SetSizer(newsz);
+            delete old;
+            return true;
+        }
+        else if (recursive && item->IsSizer())
+        {
+            if (item->GetSizer()->Replace( oldsz, newsz, true ))
+                return true;
+        }
+
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
+bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
+{
+    wxCHECK_MSG( old < m_children.GetCount(), false, _T("Replace index is out of range") );
+    wxASSERT_MSG( newitem, _T("Replacing with NULL item") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.Item( old );
+
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+
+    wxSizerItem *item = node->GetData();
+    node->SetData(newitem);
+
+    if (item->IsWindow() && item->GetWindow())
+        item->GetWindow()->SetContainingSizer(NULL);
+
+    delete item;
+
+    return true;
+}
+
+void wxSizer::Clear( bool delete_windows )
+{
+    // First clear the ContainingSizer pointers
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->IsWindow())
+            item->GetWindow()->SetContainingSizer( NULL );
+        node = node->GetNext();
+    }
+
+    // Destroy the windows if needed
+    if (delete_windows)
+        DeleteWindows();
+
+    // Now empty the list
+    WX_CLEAR_LIST(wxSizerItemList, m_children);
+}
+
+void wxSizer::DeleteWindows()
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        item->DeleteWindows();
+        node = node->GetNext();
+    }
+}
+
+wxSize wxSizer::ComputeFittingWindowSize(wxWindow *window)
+{
+    // take the min size by default and limit it by max size
+    wxSize size = GetMinWindowSize(window);
+    wxSize sizeMax = GetMaxWindowSize(window);
+
+    wxTopLevelWindow *tlw = wxDynamicCast(window, wxTopLevelWindow);
+    if ( tlw )
+    {
+        // hack for small screen devices where TLWs are always full screen
+        if ( tlw->IsAlwaysMaximized() )
+        {
+            size = tlw->GetSize();
+        }
+        else // normal situation
+        {
+            // limit the window to the size of the display it is on
+            int disp = wxDisplay::GetFromWindow(window);
+            if ( disp == wxNOT_FOUND )
+            {
+                // or, if we don't know which one it is, of the main one
+                disp = 0;
+            }
+
+            sizeMax = wxDisplay(disp).GetClientArea().GetSize();
+        }
+    }
+
+    if ( sizeMax.x != wxDefaultCoord && size.x > sizeMax.x )
+        size.x = sizeMax.x;
+    if ( sizeMax.y != wxDefaultCoord && size.y > sizeMax.y )
+        size.y = sizeMax.y;
+
+    return size;
+}
+
+wxSize wxSizer::ComputeFittingClientSize(wxWindow *window)
+{
+    wxCHECK_MSG( window, wxDefaultSize, _T("window can't be NULL") );
+
+    return window->WindowToClientSize(ComputeFittingWindowSize(window));
+}
+
+wxSize wxSizer::Fit( wxWindow *window )
+{
+    wxSize size = ComputeFittingWindowSize(window);
+    window->SetSize(size);
+    return size;
+}
+
+void wxSizer::FitInside( wxWindow *window )
+{
+    wxSize size;
+    if (window->IsTopLevel())
+        size = VirtualFitSize( window );
+    else
+        size = GetMinClientSize( window );
+
+    window->SetVirtualSize( size );
+}
+
+void wxSizer::Layout()
+{
+    // (re)calculates minimums needed for each item and other preparations
+    // for layout
+    CalcMin();
+
+    // Applies the layout and repositions/resizes the items
+    RecalcSizes();
+}
+
+void wxSizer::SetSizeHints( wxWindow *window )
+{
+    // Preserve the window's max size hints, but set the
+    // lower bound according to the sizer calculations.
+
+    // This is equivalent to calling Fit(), except that we need to set
+    // the size hints _in between_ the two steps performed by Fit
+    // (1. ComputeFittingWindowSize, 2. SetSize). That's because
+    // otherwise SetSize() could have no effect if there already are
+    // size hints in effect that forbid requested size.
+    const wxSize size = ComputeFittingWindowSize(window);
+
+    window->SetSizeHints( size.x,
+                          size.y,
+                          window->GetMaxWidth(),
+                          window->GetMaxHeight() );
+
+    window->SetSize(size);
+}
+
+void wxSizer::SetVirtualSizeHints( wxWindow *window )
+{
+    // Preserve the window's max size hints, but set the
+    // lower bound according to the sizer calculations.
+
+    FitInside( window );
+    wxSize size( window->GetVirtualSize() );
+    window->SetVirtualSizeHints( size.x,
+                                 size.y,
+                                 window->GetMaxWidth(),
+                                 window->GetMaxHeight() );
+}
+
+wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) const
+{
+    return window->GetMaxSize();
+}
+
+wxSize wxSizer::GetMinWindowSize( wxWindow *window )
+{
+    wxSize      minSize( GetMinSize() );
+    wxSize      size( window->GetSize() );
+    wxSize      client_size( window->GetClientSize() );
+
+    return wxSize( minSize.x+size.x-client_size.x,
+                   minSize.y+size.y-client_size.y );
+}
+
+// TODO on mac we need a function that determines how much free space this
+// min size contains, in order to make sure that we have 20 pixels of free
+// space around the controls
+wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const
+{
+    wxSize maxSize( window->GetMaxSize() );
+
+    if ( maxSize != wxDefaultSize )
+    {
+        wxSize size( window->GetSize() );
+        wxSize client_size( window->GetClientSize() );
+
+        return wxSize( maxSize.x + client_size.x - size.x,
+                       maxSize.y + client_size.y - size.y );
+    }
+    else
+        return wxDefaultSize;
+}
+
+wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) )
+{
+    return GetMinSize();  // Already returns client size.
+}
+
+wxSize wxSizer::VirtualFitSize( wxWindow *window )
+{
+    wxSize size     = GetMinClientSize( window );
+    wxSize sizeMax  = GetMaxClientSize( window );
+
+    // Limit the size if sizeMax != wxDefaultSize
+
+    if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )
+        size.x = sizeMax.x;
+    if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )
+        size.y = sizeMax.y;
+
+    return size;
+}
+
+void wxSizer::SetDimension( int x, int y, int width, int height )
+{
+    m_position.x = x;
+    m_position.y = y;
+    m_size.x = width;
+    m_size.y = height;
+    Layout();
+}
+
+wxSize wxSizer::GetMinSize()
+{
+    wxSize ret( CalcMin() );
+    if (ret.x < m_minSize.x) ret.x = m_minSize.x;
+    if (ret.y < m_minSize.y) ret.y = m_minSize.y;
+    return ret;
+}
+
+void wxSizer::DoSetMinSize( int width, int height )
+{
+    m_minSize.x = width;
+    m_minSize.y = height;
+}
+
+bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
+{
+    wxASSERT_MSG( window, _T("SetMinSize for NULL window") );
+
+    // Is it our immediate child?
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetWindow() == window)
+        {
+            item->SetMinSize( width, height );
+            return true;
+        }
+        node = node->GetNext();
+    }
+
+    // No?  Search any subsizers we own then
+
+    node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if ( item->GetSizer() &&
+             item->GetSizer()->DoSetItemMinSize( window, width, height ) )
+        {
+            // A child sizer found the requested windw, exit.
+            return true;
+        }
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
+bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
+{
+    wxASSERT_MSG( sizer, _T("SetMinSize for NULL sizer") );
+
+    // Is it our immediate child?
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetSizer() == sizer)
+        {
+            item->GetSizer()->DoSetMinSize( width, height );
+            return true;
+        }
+        node = node->GetNext();
+    }
+
+    // No?  Search any subsizers we own then
+
+    node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if ( item->GetSizer() &&
+             item->GetSizer()->DoSetItemMinSize( sizer, width, height ) )
+        {
+            // A child found the requested sizer, exit.
+            return true;
+        }
+        node = node->GetNext();
+    }
+
+    return false;
+}
+
+bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
+{
+    wxSizerItemList::compatibility_iterator node = m_children.Item( index );
+
+    wxCHECK_MSG( node, false, _T("Failed to find child node") );
+
+    wxSizerItem     *item = node->GetData();
+
+    if (item->GetSizer())
+    {
+        // Sizers contains the minimal size in them, if not calculated ...
+        item->GetSizer()->DoSetMinSize( width, height );
+    }
+    else
+    {
+        // ... but the minimal size of spacers and windows is stored via the item
+        item->SetMinSize( width, height );
+    }
+
+    return true;
+}
+
+wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )
+{
+    wxASSERT_MSG( window, _T("GetItem for NULL window") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetWindow() == window)
+        {
+            return item;
+        }
+        else if (recursive && item->IsSizer())
+        {
+            wxSizerItem *subitem = item->GetSizer()->GetItem( window, true );
+            if (subitem)
+                return subitem;
+        }
+
+        node = node->GetNext();
+    }
+
+    return NULL;
+}
+
+wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )
+{
+    wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") );
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem *item = node->GetData();
+
+        if (item->GetSizer() == sizer)
+        {
+            return item;
+        }
+        else if (recursive && item->IsSizer())
+        {
+            wxSizerItem *subitem = item->GetSizer()->GetItem( sizer, true );
+            if (subitem)
+                return subitem;
+        }
+
+        node = node->GetNext();
+    }
+
+    return NULL;
+}
+
+wxSizerItem* wxSizer::GetItem( size_t index )
+{
+    wxCHECK_MSG( index < m_children.GetCount(),
+                 NULL,
+                 _T("GetItem index is out of range") );
+
+    return m_children.Item( index )->GetData();
+}
+
+bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
+{
+    wxSizerItem *item = GetItem( window, recursive );
+
+    if ( item )
+    {
+         item->Show( show );
+         return true;
+    }
+
+    return false;
+}
+
+bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
+{
+    wxSizerItem *item = GetItem( sizer, recursive );
+
+    if ( item )
+    {
+         item->Show( show );
+         return true;
+    }
+
+    return false;
+}
+
+bool wxSizer::Show( size_t index, bool show)
+{
+    wxSizerItem *item = GetItem( index );
+
+    if ( item )
+    {
+         item->Show( show );
+         return true;
+    }
+
+    return false;
+}
+
+void wxSizer::ShowItems( bool show )
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        node->GetData()->Show( show );
+        node = node->GetNext();
+    }
+}
+
+bool wxSizer::IsShown( wxWindow *window ) const
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetWindow() == window)
+        {
+            return item->IsShown();
+        }
+        node = node->GetNext();
+    }
+
+    wxFAIL_MSG( _T("IsShown failed to find sizer item") );
+
+    return false;
+}
+
+bool wxSizer::IsShown( wxSizer *sizer ) const
+{
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->GetSizer() == sizer)
+        {
+            return item->IsShown();
+        }
+        node = node->GetNext();
+    }
+
+    wxFAIL_MSG( _T("IsShown failed to find sizer item") );
+
+    return false;
+}
+
+bool wxSizer::IsShown( size_t index ) const
+{
+    wxCHECK_MSG( index < m_children.GetCount(),
+                 false,
+                 _T("IsShown index is out of range") );
+
+    return m_children.Item( index )->GetData()->IsShown();
+}
+
+
+//---------------------------------------------------------------------------
+// wxGridSizer
+//---------------------------------------------------------------------------
+
+wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
+    : m_rows( ( cols == 0 && rows == 0 ) ? 1 : rows )
+    , m_cols( cols )
+    , m_vgap( vgap )
+    , m_hgap( hgap )
+{
+}
+
+wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
+    : m_rows( cols == 0 ? 1 : 0 )
+    , m_cols( cols )
+    , m_vgap( vgap )
+    , m_hgap( hgap )
+{
+}
+
+int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
+{
+    int nitems = m_children.GetCount();
+    if ( nitems)
+    {
+        if ( m_cols )
+        {
+            ncols = m_cols;
+            nrows = (nitems + m_cols - 1) / m_cols;
+        }
+        else if ( m_rows )
+        {
+            ncols = (nitems + m_rows - 1) / m_rows;
+            nrows = m_rows;
+        }
+        else // 0 columns, 0 rows?
+        {
+            wxFAIL_MSG( _T("grid sizer must have either rows or columns fixed") );
+
+            nrows = ncols = 0;
+        }
+    }
+
+    return nitems;
+}
+
+void wxGridSizer::RecalcSizes()
+{
+    int nitems, nrows, ncols;
+    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+        return;
+
+    wxSize sz( GetSize() );
+    wxPoint pt( GetPosition() );
+
+    int w = (sz.x - (ncols - 1) * m_hgap) / ncols;
+    int h = (sz.y - (nrows - 1) * m_vgap) / nrows;
+
+    int x = pt.x;
+    for (int c = 0; c < ncols; c++)
+    {
+        int y = pt.y;
+        for (int r = 0; r < nrows; r++)
+        {
+            int i = r * ncols + c;
+            if (i < nitems)
+            {
+                wxSizerItemList::compatibility_iterator node = m_children.Item( i );
+
+                wxASSERT_MSG( node, _T("Failed to find SizerItemList node") );
+
+                SetItemBounds( node->GetData(), x, y, w, h);
+            }
+            y = y + h + m_vgap;
+        }
+        x = x + w + m_hgap;
+    }
+}
+
+wxSize wxGridSizer::CalcMin()
+{
+    int nrows, ncols;
+    if ( CalcRowsCols(nrows, ncols) == 0 )
+        return wxSize();
+
+    // Find the max width and height for any component
+    int w = 0;
+    int h = 0;
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+        wxSize           sz( item->CalcMin() );
+
+        w = wxMax( w, sz.x );
+        h = wxMax( h, sz.y );
+
+        node = node->GetNext();
+    }
+
+    return wxSize( ncols * w + (ncols-1) * m_hgap,
+                   nrows * h + (nrows-1) * m_vgap );
+}
+
+void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
+{
+    wxPoint pt( x,y );
+    wxSize sz( item->GetMinSizeWithBorder() );
+    int flag = item->GetFlag();
+
+    if ((flag & wxEXPAND) || (flag & wxSHAPED))
+    {
+       sz = wxSize(w, h);
+    }
+    else
+    {
+        if (flag & wxALIGN_CENTER_HORIZONTAL)
+        {
+            pt.x = x + (w - sz.x) / 2;
+        }
+        else if (flag & wxALIGN_RIGHT)
+        {
+            pt.x = x + (w - sz.x);
+        }
+
+        if (flag & wxALIGN_CENTER_VERTICAL)
+        {
+            pt.y = y + (h - sz.y) / 2;
+        }
+        else if (flag & wxALIGN_BOTTOM)
+        {
+            pt.y = y + (h - sz.y);
+        }
+    }
+
+    item->SetDimension(pt, sz);
+}
+
+//---------------------------------------------------------------------------
+// wxFlexGridSizer
+//---------------------------------------------------------------------------
+
+wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )
+               : wxGridSizer( rows, cols, vgap, hgap ),
+                 m_flexDirection(wxBOTH),
+                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)
+{
+}
+
+wxFlexGridSizer::wxFlexGridSizer( int cols, int vgap, int hgap )
+               : wxGridSizer( cols, vgap, hgap ),
+                 m_flexDirection(wxBOTH),
+                 m_growMode(wxFLEX_GROWMODE_SPECIFIED)
+{
+}
+
+wxFlexGridSizer::~wxFlexGridSizer()
+{
+}
+
+void wxFlexGridSizer::RecalcSizes()
+{
+    int nitems, nrows, ncols;
+    if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+        return;
+
+    wxPoint pt( GetPosition() );
+    wxSize sz( GetSize() );
+
+    AdjustForGrowables(sz, m_calculatedMinSize, nrows, ncols);
+
+    sz = wxSize( pt.x + sz.x, pt.y + sz.y );
+
+    int x = pt.x;
+    for (int c = 0; c < ncols; c++)
+    {
+        int y = pt.y;
+        for (int r = 0; r < nrows; r++)
+        {
+            int i = r * ncols + c;
+            if (i < nitems)
+            {
+                wxSizerItemList::compatibility_iterator node = m_children.Item( i );
+
+                wxASSERT_MSG( node, _T("Failed to find node") );
+
+                int w = wxMax( 0, wxMin( m_colWidths[c], sz.x - x ) );
+                int h = wxMax( 0, wxMin( m_rowHeights[r], sz.y - y ) );
+
+                SetItemBounds( node->GetData(), x, y, w, h);
+            }
+            if (m_rowHeights[r] != -1)
+                y = y + m_rowHeights[r] + m_vgap;
+        }
+        if (m_colWidths[c] != -1)
+            x = x + m_colWidths[c] + m_hgap;
+    }
+}
+
+wxSize wxFlexGridSizer::CalcMin()
+{
+    int     nrows,
+            ncols;
+    size_t  i, s;
+
+    // Number of rows/columns can change as items are added or removed.
+    if ( !CalcRowsCols(nrows, ncols) )
+        return wxSize();
+
+    m_rowHeights.SetCount(nrows);
+    m_colWidths.SetCount(ncols);
+
+    // We have to recalcuate the sizes in case the item minimum size has
+    // changed since the previous layout, or the item has been hidden using
+    // wxSizer::Show(). If all the items in a row/column are hidden, the final
+    // dimension of the row/column will be -1, indicating that the column
+    // itself is hidden.
+    for( s = m_rowHeights.GetCount(), i = 0; i < s; ++i )
+        m_rowHeights[ i ] = -1;
+    for( s = m_colWidths.GetCount(), i = 0; i < s; ++i )
+        m_colWidths[ i ] = -1;
+
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+
+    i = 0;
+    while (node)
+    {
+        wxSizerItem    *item = node->GetData();
+        if ( item->ShouldAccountFor() )
+        {
+            wxSize sz( item->CalcMin() );
+            int row = i / ncols;
+            int col = i % ncols;
+
+            m_rowHeights[ row ] = wxMax( wxMax( 0, sz.y ), m_rowHeights[ row ] );
+            m_colWidths[ col ] = wxMax( wxMax( 0, sz.x ), m_colWidths[ col ] );
+        }
+
+        node = node->GetNext();
+        i++;
+    }
+
+    AdjustForFlexDirection();
+
+    // Sum total minimum size, including gaps between rows/columns.
+    // -1 is used as a magic number meaning empty column.
+    int width = 0;
+    for (int col = 0; col < ncols; col++)
+        if ( m_colWidths[ col ] != -1 )
+            width += m_colWidths[ col ] + m_hgap;
+    if (width > 0)
+        width -= m_hgap;
+
+    int height = 0;
+    for (int row = 0; row < nrows; row++)
+        if ( m_rowHeights[ row ] != -1 )
+            height += m_rowHeights[ row ] + m_vgap;
+    if (height > 0)
+        height -= m_vgap;
+
+    m_calculatedMinSize = wxSize( width, height );
+    return m_calculatedMinSize;
+}
+
+void wxFlexGridSizer::AdjustForFlexDirection()
+{
+    // the logic in CalcMin works when we resize flexibly in both directions
+    // but maybe this is not the case
+    if ( m_flexDirection != wxBOTH )
+    {
+        // select the array corresponding to the direction in which we do *not*
+        // resize flexibly
+        wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths
+                                                          : m_rowHeights;
+
+        const size_t count = array.GetCount();
+
+        // find the largest value in this array
+        size_t n;
+        int largest = 0;
+
+        for ( n = 0; n < count; ++n )
+        {
+            if ( array[n] > largest )
+                largest = array[n];
+        }
+
+        // and now fill it with the largest value
+        for ( n = 0; n < count; ++n )
+        {
+            // don't touch hidden rows
+            if ( array[n] != -1 )
+                array[n] = largest;
+        }
+    }
+}
+
+
+void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
+                                         int nrows, int ncols)
+{
+    // what to do with the rows? by default, resize them proportionally
+    if ( sz.y > minsz.y && ( (m_flexDirection & wxVERTICAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
+    {
+        int sum_proportions = 0;
+        int growable_space = 0;
+        int num = 0;
+        size_t idx;
+        for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+        {
+            // Since the number of rows/columns can change as items are
+            // inserted/deleted, we need to verify at runtime that the
+            // requested growable rows/columns are still valid.
+            if (m_growableRows[idx] >= nrows)
+                continue;
+
+            // If all items in a row/column are hidden, that row/column will
+            // have a dimension of -1.  This causes the row/column to be
+            // hidden completely.
+            if (m_rowHeights[ m_growableRows[idx] ] == -1)
+                continue;
+            sum_proportions += m_growableRowsProportions[idx];
+            growable_space += m_rowHeights[ m_growableRows[idx] ];
+            num++;
+        }
+
+        if (num > 0)
+        {
+            for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+            {
+                if (m_growableRows[idx] >= nrows )
+                    continue;
+                if (m_rowHeights[ m_growableRows[idx] ] != -1)
+                {
+                    int delta = (sz.y - minsz.y);
+                    if (sum_proportions == 0)
+                        delta = (delta/num) + m_rowHeights[ m_growableRows[idx] ];
+                    else
+                        delta = ((delta+growable_space)*m_growableRowsProportions[idx]) / sum_proportions;
+                    m_rowHeights[ m_growableRows[idx] ] = delta;
+                }
+            }
+        }
+    }
+    else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.y > minsz.y) )
+    {
+        // rounding problem?
+        for ( int row = 0; row < nrows; ++row )
+            m_rowHeights[ row ] = sz.y / nrows;
+    }
+
+    // the same logic as above but for the columns
+    if ( sz.x > minsz.x && ( (m_flexDirection & wxHORIZONTAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
+    {
+        int sum_proportions = 0;
+        int growable_space = 0;
+        int num = 0;
+        size_t idx;
+        for (idx = 0; idx < m_growableCols.GetCount(); idx++)
+        {
+            // Since the number of rows/columns can change as items are
+            // inserted/deleted, we need to verify at runtime that the
+            // requested growable rows/columns are still valid.
+            if (m_growableCols[idx] >= ncols)
+                continue;
+
+            // If all items in a row/column are hidden, that row/column will
+            // have a dimension of -1.  This causes the column to be hidden
+            // completely.
+            if (m_colWidths[ m_growableCols[idx] ] == -1)
+                continue;
+            sum_proportions += m_growableColsProportions[idx];
+            growable_space += m_colWidths[ m_growableCols[idx] ];
+            num++;
+        }
+
+        if (num > 0)
+        {
+            for (idx = 0; idx < m_growableCols.GetCount(); idx++)
+            {
+                if (m_growableCols[idx] >= ncols )
+                    continue;
+                if (m_colWidths[ m_growableCols[idx] ] != -1)
+                {
+                    int delta = (sz.x - minsz.x);
+                    if (sum_proportions == 0)
+                        delta = (delta/num) + m_colWidths[ m_growableCols[idx] ];
+                    else
+                        delta = ((delta+growable_space)*m_growableColsProportions[idx])/sum_proportions;
+                    m_colWidths[ m_growableCols[idx] ] = delta;
+                }
+            }
+        }
+    }
+    else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.x > minsz.x) )
+    {
+        for ( int col=0; col < ncols; ++col )
+            m_colWidths[ col ] = sz.x / ncols;
+    }
+}
+
+
+void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
+{
+    m_growableRows.Add( idx );
+    m_growableRowsProportions.Add( proportion );
+}
+
+void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )
+{
+    m_growableCols.Add( idx );
+    m_growableColsProportions.Add( proportion );
+}
+
+// helper function for RemoveGrowableCol/Row()
+static void
+DoRemoveFromArrays(size_t idx, wxArrayInt& items, wxArrayInt& proportions)
+{
+    const size_t count = items.size();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if ( (size_t)items[n] == idx )
+        {
+            items.RemoveAt(n);
+            proportions.RemoveAt(n);
+            return;
+        }
+    }
+
+    wxFAIL_MSG( _T("column/row is already not growable") );
+}
+
+void wxFlexGridSizer::RemoveGrowableCol( size_t idx )
+{
+    DoRemoveFromArrays(idx, m_growableCols, m_growableColsProportions);
+}
+
+void wxFlexGridSizer::RemoveGrowableRow( size_t idx )
+{
+    DoRemoveFromArrays(idx, m_growableRows, m_growableRowsProportions);
+}
+
+//---------------------------------------------------------------------------
+// wxBoxSizer
+//---------------------------------------------------------------------------
+
+wxBoxSizer::wxBoxSizer( int orient )
+    : m_orient( orient )
+{
+}
+
+void wxBoxSizer::RecalcSizes()
+{
+    if (m_children.GetCount() == 0)
+        return;
+
+    int delta = 0;
+    if (m_stretchable)
+    {
+        if (m_orient == wxHORIZONTAL)
+            delta = m_size.x - m_fixedWidth;
+        else
+            delta = m_size.y - m_fixedHeight;
+    }
+
+    wxPoint pt( m_position );
+
+    int stretchable = m_stretchable;
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem     *item = node->GetData();
+
+        if (item->ShouldAccountFor())
+        {
+            wxSize size( item->GetMinSizeWithBorder() );
+
+            if (m_orient == wxVERTICAL)
+            {
+                wxCoord height = size.y;
+                if (item->GetProportion())
+                {
+                    // Because of at least one visible item has non-zero
+                    // proportion then m_stretchable is not zero
+                    height = (delta * item->GetProportion()) / stretchable;
+                    delta -= height;
+                    stretchable -= item->GetProportion();
+                }
+
+                wxPoint child_pos( pt );
+                wxSize  child_size( size.x, height );
+
+                if (item->GetFlag() & (wxEXPAND | wxSHAPED))
+                    child_size.x = m_size.x;
+                else if (item->GetFlag() & wxALIGN_RIGHT)
+                    child_pos.x += m_size.x - size.x;
+                else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL))
+                // XXX wxCENTER is added for backward compatibility;
+                //     wxALIGN_CENTER should be used in new code
+                    child_pos.x += (m_size.x - size.x) / 2;
+
+                item->SetDimension( child_pos, child_size );
+
+                pt.y += height;
+            }
+            else
+            {
+                wxCoord width = size.x;
+                if (item->GetProportion())
+                {
+                    // Because of at least one visible item has non-zero
+                    // proportion then m_stretchable is not zero
+                    width = (delta * item->GetProportion()) / stretchable;
+                    delta -= width;
+                    stretchable -= item->GetProportion();
+                }
+
+                wxPoint child_pos( pt );
+                wxSize  child_size( width, size.y );
+
+                if (item->GetFlag() & (wxEXPAND | wxSHAPED))
+                    child_size.y = m_size.y;
+                else if (item->GetFlag() & wxALIGN_BOTTOM)
+                    child_pos.y += m_size.y - size.y;
+                else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL))
+                // XXX wxCENTER is added for backward compatibility;
+                //     wxALIGN_CENTER should be used in new code
+                    child_pos.y += (m_size.y - size.y) / 2;
+
+                if ( m_containingWindow )
+                {
+                    child_pos.x = m_containingWindow->AdjustForLayoutDirection
+                                                      (
+                                                        child_pos.x,
+                                                        width,
+                                                        m_size.x
+                                                      );
+                }
+
+                item->SetDimension( child_pos, child_size );
+
+                pt.x += width;
+            }
+        }
+
+        node = node->GetNext();
+    }
+}
+
+wxSize wxBoxSizer::CalcMin()
+{
+    if (m_children.GetCount() == 0)
+        return wxSize();
+
+    m_stretchable = 0;
+    m_minWidth = 0;
+    m_minHeight = 0;
+    m_fixedWidth = 0;
+    m_fixedHeight = 0;
+
+    // precalc item minsizes and count proportions
+    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem *item = node->GetData();
+
+        if ( item->ShouldAccountFor() )
+        {
+            item->CalcMin();  // result is stored in the item
+
+            m_stretchable += item->GetProportion();
+        }
+
+        node = node->GetNext();
+    }
+
+    // Total minimum size (width or height) of sizer
+    int maxMinSize = 0;
+
+    node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem *item = node->GetData();
+
+        if (item->ShouldAccountFor() && item->GetProportion() != 0)
+        {
+            int stretch = item->GetProportion();
+            wxSize size( item->GetMinSizeWithBorder() );
+            int minSize;
+
+            // Integer division rounded up is (a + b - 1) / b
+            // Round up needed in order to guarantee that all
+            // all items will have size not less then their min size
+            if (m_orient == wxHORIZONTAL)
+                minSize = ( size.x*m_stretchable + stretch - 1)/stretch;
+            else
+                minSize = ( size.y*m_stretchable + stretch - 1)/stretch;
+
+            if (minSize > maxMinSize)
+                maxMinSize = minSize;
+        }
+        node = node->GetNext();
+    }
+
+    // Calculate overall minimum size
+    node = m_children.GetFirst();
+    while (node)
+    {
+        wxSizerItem *item = node->GetData();
+
+        if (item->ShouldAccountFor())
+        {
+            wxSize size( item->GetMinSizeWithBorder() );
+            if (item->GetProportion() != 0)
+            {
+                if (m_orient == wxHORIZONTAL)
+                    size.x = (maxMinSize*item->GetProportion())/m_stretchable;
+                else
+                    size.y = (maxMinSize*item->GetProportion())/m_stretchable;
+            }
+            else
+            {
+                if (m_orient == wxVERTICAL)
+                {
+                    m_fixedHeight += size.y;
+                    m_fixedWidth = wxMax( m_fixedWidth, size.x );
+                }
+                else
+                {
+                    m_fixedWidth += size.x;
+                    m_fixedHeight = wxMax( m_fixedHeight, size.y );
+                }
+            }
+
+            if (m_orient == wxHORIZONTAL)
+            {
+                m_minWidth += size.x;
+                m_minHeight = wxMax( m_minHeight, size.y );
+            }
+            else
+            {
+                m_minHeight += size.y;
+                m_minWidth = wxMax( m_minWidth, size.x );
+            }
+        }
+        node = node->GetNext();
+    }
+
+    return wxSize( m_minWidth, m_minHeight );
+}
+
+//---------------------------------------------------------------------------
+// wxStaticBoxSizer
+//---------------------------------------------------------------------------
+
+#if wxUSE_STATBOX
+
+wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
+    : wxBoxSizer( orient ),
+      m_staticBox( box )
+{
+    wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") );
+
+    // do this so that our Detach() is called if the static box is destroyed
+    // before we are
+    m_staticBox->SetContainingSizer(this);
+}
+
+wxStaticBoxSizer::wxStaticBoxSizer(int orient, wxWindow *win, const wxString& s)
+                : wxBoxSizer(orient),
+                  m_staticBox(new wxStaticBox(win, wxID_ANY, s))
+{
+    // same as above
+    m_staticBox->SetContainingSizer(this);
+}
+
+wxStaticBoxSizer::~wxStaticBoxSizer()
+{
+    delete m_staticBox;
+}
+
+static void GetStaticBoxBorders( wxStaticBox *box,
+                                 int *borderTop,
+                                 int *borderOther)
+{
+    // this has to be done platform by platform as there is no way to
+    // guess the thickness of a wxStaticBox border
+    box->GetBordersForSizer(borderTop, borderOther);
+}
+
+void wxStaticBoxSizer::RecalcSizes()
+{
+    int top_border, other_border;
+    GetStaticBoxBorders(m_staticBox, &top_border, &other_border);
+
+    m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
+
+    wxPoint old_pos( m_position );
+    m_position.x += other_border;
+    m_position.y += top_border;
+    wxSize old_size( m_size );
+    m_size.x -= 2*other_border;
+    m_size.y -= top_border + other_border;
+
+    wxBoxSizer::RecalcSizes();
+
+    m_position = old_pos;
+    m_size = old_size;
+}
+
+wxSize wxStaticBoxSizer::CalcMin()
+{
+    int top_border, other_border;
+    GetStaticBoxBorders(m_staticBox, &top_border, &other_border);
+
+    wxSize ret( wxBoxSizer::CalcMin() );
+    ret.x += 2*other_border;
+    ret.y += other_border + top_border;
+
+    return ret;
+}
+
+void wxStaticBoxSizer::ShowItems( bool show )
+{
+    m_staticBox->Show( show );
+    wxBoxSizer::ShowItems( show );
+}
+
+bool wxStaticBoxSizer::Detach( wxWindow *window )
+{
+    // avoid deleting m_staticBox in our dtor if it's being detached from the
+    // sizer (which can happen because it's being already destroyed for
+    // example)
+    if ( window == m_staticBox )
+    {
+        m_staticBox = NULL;
+        return true;
+    }
+
+    return wxSizer::Detach( window );
+}
+
+#endif // wxUSE_STATBOX
+
+#if wxUSE_BUTTON
+
+wxStdDialogButtonSizer::wxStdDialogButtonSizer()
+    : wxBoxSizer(wxHORIZONTAL)
+{
+    // Vertical buttons with lots of space on either side
+    // looks rubbish on WinCE, so let's not do this for now.
+    // If we are going to use vertical buttons, we should
+    // put the sizer to the right of other controls in the dialog,
+    // and that's beyond the scope of this sizer.
+#ifndef __WXWINCE__
+    bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+    // If we have a PDA screen, put yes/no button over
+    // all other buttons, otherwise on the left side.
+    if (is_pda)
+        m_orient = wxVERTICAL;
+#endif
+
+    m_buttonAffirmative = NULL;
+    m_buttonApply = NULL;
+    m_buttonNegative = NULL;
+    m_buttonCancel = NULL;
+    m_buttonHelp = NULL;
+}
+
+void wxStdDialogButtonSizer::AddButton(wxButton *mybutton)
+{
+    switch (mybutton->GetId())
+    {
+        case wxID_OK:
+        case wxID_YES:
+        case wxID_SAVE:
+            m_buttonAffirmative = mybutton;
+            break;
+        case wxID_APPLY:
+            m_buttonApply = mybutton;
+            break;
+        case wxID_NO:
+            m_buttonNegative = mybutton;
+            break;
+        case wxID_CANCEL:
+            m_buttonCancel = mybutton;
+            break;
+        case wxID_HELP:
+        case wxID_CONTEXT_HELP:
+            m_buttonHelp = mybutton;
+            break;
+        default:
+            break;
+    }
+}
+
+void wxStdDialogButtonSizer::SetAffirmativeButton( wxButton *button )
+{
+    m_buttonAffirmative = button;
+}
+
+void wxStdDialogButtonSizer::SetNegativeButton( wxButton *button )
+{
+    m_buttonNegative = button;
+}
+
+void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
+{
+    m_buttonCancel = button;
+}
+
+void wxStdDialogButtonSizer::Realize()
+{
+#ifdef __WXMAC__
+        Add(0, 0, 0, wxLEFT, 6);
+        if (m_buttonHelp)
+            Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
+
+        if (m_buttonNegative){
+            // HIG POLICE BULLETIN - destructive buttons need extra padding
+            // 24 pixels on either side
+            Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 12);
+        }
+
+        // extra whitespace between help/negative and cancel/ok buttons
+        Add(0, 0, 1, wxEXPAND, 0);
+
+        if (m_buttonCancel){
+            Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
+            // Cancel or help should be default
+            // m_buttonCancel->SetDefaultButton();
+        }
+
+        // Ugh, Mac doesn't really have apply dialogs, so I'll just
+        // figure the best place is between Cancel and OK
+        if (m_buttonApply)
+            Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
+
+        if (m_buttonAffirmative){
+            Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
+
+            if (m_buttonAffirmative->GetId() == wxID_SAVE){
+                // these buttons have set labels under Mac so we should use them
+                m_buttonAffirmative->SetLabel(_("Save"));
+                if (m_buttonNegative)
+                    m_buttonNegative->SetLabel(_("Don't Save"));
+            }
+        }
+
+        // Extra space around and at the right
+        Add(12, 24);
+#elif defined(__WXGTK20__)
+        Add(0, 0, 0, wxLEFT, 9);
+        if (m_buttonHelp)
+            Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+
+        // extra whitespace between help and cancel/ok buttons
+        Add(0, 0, 1, wxEXPAND, 0);
+
+        if (m_buttonNegative){
+            Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+        }
+
+        if (m_buttonCancel){
+            Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+            // Cancel or help should be default
+            // m_buttonCancel->SetDefaultButton();
+        }
+
+        if (m_buttonApply)
+            Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+
+        if (m_buttonAffirmative)
+            Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
+#elif defined(__WXMSW__)
+        // Windows
+
+        // right-justify buttons
+        Add(0, 0, 1, wxEXPAND, 0);
+
+        if (m_buttonAffirmative){
+            Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(2, 0)).x);
+        }
+
+        if (m_buttonNegative){
+            Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(2, 0)).x);
+        }
+
+        if (m_buttonCancel){
+            Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(2, 0)).x);
+        }
+        if (m_buttonApply)
+            Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(2, 0)).x);
+
+        if (m_buttonHelp)
+            Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(2, 0)).x);
+#else
+        // GTK+1 and any other platform
+
+        // Add(0, 0, 0, wxLEFT, 5); // Not sure what this was for but it unbalances the dialog
+        if (m_buttonHelp)
+            Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x);
+
+        // extra whitespace between help and cancel/ok buttons
+        Add(0, 0, 1, wxEXPAND, 0);
+
+        if (m_buttonApply)
+            Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(4, 0)).x);
+
+        if (m_buttonAffirmative){
+            Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(4, 0)).x);
+        }
+
+        if (m_buttonNegative){
+            Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(4, 0)).x);
+        }
+
+        if (m_buttonCancel){
+            Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x);
+            // Cancel or help should be default
+            // m_buttonCancel->SetDefaultButton();
+        }
+
+#endif
+}
+
+#endif // wxUSE_BUTTON
+
+#if WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// wxNotebookSizer
+// ----------------------------------------------------------------------------
+
+#if wxUSE_BOOKCTRL
+IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
+#if wxUSE_NOTEBOOK
+IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
+#endif // wxUSE_NOTEBOOK
+#endif // wxUSE_BOOKCTRL
+
+#if wxUSE_BOOKCTRL
+
+#if WXWIN_COMPATIBILITY_2_6
+
+wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrlBase *bookctrl)
+               : m_bookctrl(bookctrl)
+{
+    wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") );
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+void wxBookCtrlSizer::RecalcSizes()
+{
+    m_bookctrl->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
+}
+
+wxSize wxBookCtrlSizer::CalcMin()
+{
+    wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0,0));
+
+    sizeBorder.x += 5;
+    sizeBorder.y += 5;
+
+    if ( m_bookctrl->GetPageCount() == 0 )
+    {
+        return wxSize(sizeBorder.x + 10, sizeBorder.y + 10);
+    }
+
+    int maxX = 0;
+    int maxY = 0;
+
+    wxWindowList::compatibility_iterator
+        node = m_bookctrl->GetChildren().GetFirst();
+    while (node)
+    {
+        wxWindow *item = node->GetData();
+        wxSizer *itemsizer = item->GetSizer();
+
+        if (itemsizer)
+        {
+            wxSize subsize( itemsizer->CalcMin() );
+
+            if (subsize.x > maxX)
+                maxX = subsize.x;
+            if (subsize.y > maxY)
+                maxY = subsize.y;
+        }
+
+        node = node->GetNext();
+    }
+
+    return wxSize( maxX, maxY ) + sizeBorder;
+}
+
+#if wxUSE_NOTEBOOK
+
+#if WXWIN_COMPATIBILITY_2_6
+
+wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
+{
+    wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
+    m_bookctrl = nb;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+#endif // wxUSE_NOTEBOOOK
+#endif // wxUSE_BOOKCTRL
+
+#endif // WXWIN_COMPATIBILITY_2_4
diff --git a/Source/3rd Party/wx/src/common/slidercmn.cpp b/Source/3rd Party/wx/src/common/slidercmn.cpp
deleted file mode 100644
index 93fdbe49f..000000000
--- a/Source/3rd Party/wx/src/common/slidercmn.cpp	
+++ /dev/null
@@ -1,110 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/slidercmn.cpp
-// Purpose:     wxSlider common code
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart 1998
-//                  Vadim Zeitlin 2004
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_SLIDER
-
-#include "wx/slider.h"
-
-extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[] = "slider";
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxSliderStyle )
-wxBEGIN_FLAGS( wxSliderStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSL_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSL_VERTICAL)
-    wxFLAGS_MEMBER(wxSL_AUTOTICKS)
-    wxFLAGS_MEMBER(wxSL_LABELS)
-    wxFLAGS_MEMBER(wxSL_LEFT)
-    wxFLAGS_MEMBER(wxSL_TOP)
-    wxFLAGS_MEMBER(wxSL_RIGHT)
-    wxFLAGS_MEMBER(wxSL_BOTTOM)
-    wxFLAGS_MEMBER(wxSL_BOTH)
-    wxFLAGS_MEMBER(wxSL_SELRANGE)
-    wxFLAGS_MEMBER(wxSL_INVERSE)
-wxEND_FLAGS( wxSliderStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl, "wx/slider.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSlider)
-    wxEVENT_RANGE_PROPERTY( Scroll, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxScrollEvent )
-    wxEVENT_PROPERTY( Updated, wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEvent )
-
-    wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( Minimum, int, SetMin, GetMin, 0, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( Maximum, int, SetMax, GetMax, 0, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( PageSize, int, SetPageSize, GetLineSize, 1, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( LineSize, int, SetLineSize, GetLineSize, 1, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( ThumbLength, int, SetThumbLength, GetThumbLength, 1, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-
-    wxPROPERTY_FLAGS( WindowStyle, wxSliderStyle, long, SetWindowStyleFlag, \
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                      wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxSlider)
-
-wxCONSTRUCTOR_8( wxSlider, wxWindow*, Parent, wxWindowID, Id, int, Value, \
-                 int, Minimum, int, Maximum, wxPoint, Position, wxSize, Size, \
-                 long, WindowStyle )
-
-#endif // wxUSE_SLIDER
diff --git a/Source/3rd Party/wx/src/common/spinbtncmn.cpp b/Source/3rd Party/wx/src/common/spinbtncmn.cpp
deleted file mode 100644
index 51fade24c..000000000
--- a/Source/3rd Party/wx/src/common/spinbtncmn.cpp	
+++ /dev/null
@@ -1,99 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/spinbtncmn.cpp
-// Purpose:     wxSpinButton common code
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-#endif
-
-#if wxUSE_SPINBTN
-
-#include "wx/spinbutt.h"
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxSpinButtonStyle )
-wxBEGIN_FLAGS( wxSpinButtonStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxSP_HORIZONTAL)
-    wxFLAGS_MEMBER(wxSP_VERTICAL)
-    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
-    wxFLAGS_MEMBER(wxSP_WRAP)
-wxEND_FLAGS( wxSpinButtonStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl, "wx/spinbutt.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSpinButton)
-    wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent )
-
-    wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( Min, int, SetMin, GetMin, 0, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-    wxPROPERTY( Max, int, SetMax, GetMax, 0, 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-
-    wxPROPERTY_FLAGS( WindowStyle, wxSpinButtonStyle, long, SetWindowStyleFlag, \
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                      wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxSpinButton)
-
-wxCONSTRUCTOR_5( wxSpinButton, wxWindow*, Parent, wxWindowID, Id, \
-                 wxPoint, Position, wxSize, Size, long, WindowStyle )
-
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
-
-#endif // wxUSE_SPINBTN
diff --git a/Source/3rd Party/wx/src/common/spinctrlcmn.cpp b/Source/3rd Party/wx/src/common/spinctrlcmn.cpp
deleted file mode 100644
index 22e10ab53..000000000
--- a/Source/3rd Party/wx/src/common/spinctrlcmn.cpp	
+++ /dev/null
@@ -1,106 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/spinctrlcmn.cpp
-// Purpose:     define wxSpinCtrl event types
-// Author:      Peter Most
-// Created:     01.11.08
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008-2009 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/spinbutt.h"
-#include "wx/spinctrl.h"
-
-#if wxUSE_SPINCTRL
-
-wxDEFINE_EVENT(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, wxSpinDoubleEvent);
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxSpinCtrlStyle )
-wxBEGIN_FLAGS( wxSpinCtrlStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxSP_HORIZONTAL)
-wxFLAGS_MEMBER(wxSP_VERTICAL)
-wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
-wxFLAGS_MEMBER(wxSP_WRAP)
-wxEND_FLAGS( wxSpinCtrlStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl, "wx/spinctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
-wxEVENT_RANGE_PROPERTY( Spin, wxEVT_SCROLL_TOP, wxEVT_SCROLL_CHANGED, wxSpinEvent )
-
-wxEVENT_PROPERTY( Updated, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEvent )
-wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
-wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
-
-wxPROPERTY( ValueString, wxString, SetValue, GetValue, \
-           wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) ;
-wxPROPERTY( Value, int, SetValue, GetValue, 0, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-#if 0
- wxPROPERTY( Min, int, SetMin, GetMin, 0, 0 /*flags*/, wxT("Helpstring"), wxT("group") )
- wxPROPERTY( Max, int, SetMax, GetMax, 0, 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-#endif
-wxPROPERTY_FLAGS( WindowStyle, wxSpinCtrlStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-/*
- TODO PROPERTIES
- style wxSP_ARROW_KEYS
- */
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxSpinCtrl)
-
-wxCONSTRUCTOR_6( wxSpinCtrl, wxWindow*, Parent, wxWindowID, Id, \
-                wxString, ValueString, wxPoint, Position, \
-                wxSize, Size, long, WindowStyle )
-
-
-#endif // wxUSE_SPINCTRL
diff --git a/Source/3rd Party/wx/src/common/srchcmn.cpp b/Source/3rd Party/wx/src/common/srchcmn.cpp
index c5b6e6e86..093577f5c 100644
--- a/Source/3rd Party/wx/src/common/srchcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/srchcmn.cpp	
@@ -1,42 +1,42 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/srchcmn.cpp
-// Purpose:     common (to all ports) bits of wxSearchCtrl
-// Author:      Robin Dunn
-// Modified by:
-// Created:     19-Dec-2006
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_SEARCHCTRL
-
-#include "wx/srchctrl.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-// ----------------------------------------------------------------------------
-
-const char wxSearchCtrlNameStr[] = "searchCtrl";
-
-wxDEFINE_EVENT(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, wxCommandEvent);
-wxDEFINE_EVENT(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, wxCommandEvent);
-
-
-#endif // wxUSE_SEARCHCTRL
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/srchcmn.cpp
+// Purpose:     common (to all ports) bits of wxSearchCtrl
+// Author:      Robin Dunn
+// Modified by:
+// Created:     19-Dec-2006
+// RCS-ID:      $Id: srchcmn.cpp 43939 2006-12-11 20:32:16Z KO $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_SEARCHCTRL
+
+#include "wx/srchctrl.h"
+
+#ifndef WX_PRECOMP
+#endif
+
+// ----------------------------------------------------------------------------
+
+const wxChar wxSearchCtrlNameStr[] = wxT("searchCtrl");
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN)
+
+
+#endif // wxUSE_SEARCHCTRL
diff --git a/Source/3rd Party/wx/src/common/sstream.cpp b/Source/3rd Party/wx/src/common/sstream.cpp
index 1ddbffb1a..3d792b174 100644
--- a/Source/3rd Party/wx/src/common/sstream.cpp	
+++ b/Source/3rd Party/wx/src/common/sstream.cpp	
@@ -1,204 +1,235 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/sstream.cpp
-// Purpose:     string-based streams implementation
-// Author:      Vadim Zeitlin
-// Modified by: Ryan Norton (UTF8 UNICODE)
-// Created:     2004-09-19
-// RCS-ID:      $Id$
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS
-
-#include "wx/sstream.h"
-
-// ============================================================================
-// wxStringInputStream implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// construction/destruction
-// ----------------------------------------------------------------------------
-
-// TODO:  Do we want to include the null char in the stream?  If so then
-// just add +1 to m_len in the ctor
-wxStringInputStream::wxStringInputStream(const wxString& s)
-#if wxUSE_UNICODE
-    // FIXME-UTF8: use wxCharBufferWithLength if we have it
-    : m_str(s), m_buf(s.utf8_str()), m_len(strlen(m_buf))
-#else
-    : m_str(s), m_buf(s.mb_str()), m_len(s.length())
-#endif
-{
-#if wxUSE_UNICODE
-    wxASSERT_MSG(m_buf.data() != NULL, wxT("Could not convert string to UTF8!"));
-#endif
-    m_pos = 0;
-}
-
-// ----------------------------------------------------------------------------
-// getlength
-// ----------------------------------------------------------------------------
-
-wxFileOffset wxStringInputStream::GetLength() const
-{
-    return m_len;
-}
-
-// ----------------------------------------------------------------------------
-// seek/tell
-// ----------------------------------------------------------------------------
-
-wxFileOffset wxStringInputStream::OnSysSeek(wxFileOffset ofs, wxSeekMode mode)
-{
-    switch ( mode )
-    {
-        case wxFromStart:
-            // nothing to do, ofs already ok
-            break;
-
-        case wxFromEnd:
-            ofs += m_len;
-            break;
-
-        case wxFromCurrent:
-            ofs += m_pos;
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("invalid seek mode") );
-            return wxInvalidOffset;
-    }
-
-    if ( ofs < 0 || ofs > static_cast<wxFileOffset>(m_len) )
-        return wxInvalidOffset;
-
-    // FIXME: this can't be right
-    m_pos = wx_truncate_cast(size_t, ofs);
-
-    return ofs;
-}
-
-wxFileOffset wxStringInputStream::OnSysTell() const
-{
-    return static_cast<wxFileOffset>(m_pos);
-}
-
-// ----------------------------------------------------------------------------
-// actual IO
-// ----------------------------------------------------------------------------
-
-size_t wxStringInputStream::OnSysRead(void *buffer, size_t size)
-{
-    const size_t sizeMax = m_len - m_pos;
-
-    if ( size >= sizeMax )
-    {
-        if ( sizeMax == 0 )
-        {
-            m_lasterror = wxSTREAM_EOF;
-            return 0;
-        }
-
-        size = sizeMax;
-    }
-
-    memcpy(buffer, m_buf.data() + m_pos, size);
-    m_pos += size;
-
-    return size;
-}
-
-// ============================================================================
-// wxStringOutputStream implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// seek/tell
-// ----------------------------------------------------------------------------
-
-wxFileOffset wxStringOutputStream::OnSysTell() const
-{
-    return static_cast<wxFileOffset>(m_pos);
-}
-
-// ----------------------------------------------------------------------------
-// actual IO
-// ----------------------------------------------------------------------------
-
-size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size)
-{
-    const char *p = static_cast<const char *>(buffer);
-
-#if wxUSE_UNICODE
-    // the part of the string we have here may be incomplete, i.e. it can stop
-    // in the middle of an UTF-8 character and so converting it would fail; if
-    // this is the case, accumulate the part which we failed to convert until
-    // we get the rest (and also take into account the part which we might have
-    // left unconverted before)
-    const char *src;
-    size_t srcLen;
-    if ( m_unconv.GetDataLen() )
-    {
-        // append the new data to the data remaining since the last time
-        m_unconv.AppendData(p, size);
-        src = m_unconv;
-        srcLen = m_unconv.GetDataLen();
-    }
-    else // no unconverted data left, avoid extra copy
-    {
-        src = p;
-        srcLen = size;
-    }
-
-    size_t wlen;
-    wxWCharBuffer wbuf(m_conv.cMB2WC(src, srcLen, &wlen));
-    if ( wbuf )
-    {
-        // conversion succeeded, clear the unconverted buffer
-        m_unconv = wxMemoryBuffer(0);
-
-        m_str->append(wbuf, wlen);
-    }
-    else // conversion failed
-    {
-        // remember unconverted data if there had been none before (otherwise
-        // we've already got it in the buffer)
-        if ( src == p )
-            m_unconv.AppendData(src, srcLen);
-
-        // pretend that we wrote the data anyhow, otherwise the caller would
-        // believe there was an error and this might not be the case, but do
-        // not update m_pos as m_str hasn't changed
-        return size;
-    }
-#else // !wxUSE_UNICODE
-    // no recoding necessary
-    m_str->append(p, size);
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
-    // update position
-    m_pos += size;
-
-    // return number of bytes actually written
-    return size;
-}
-
-#endif // wxUSE_STREAMS
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        common/sstream.cpp
+// Purpose:     string-based streams implementation
+// Author:      Vadim Zeitlin
+// Modified by: Ryan Norton (UTF8 UNICODE)
+// Created:     2004-09-19
+// RCS-ID:      $Id: sstream.cpp 45772 2007-05-03 02:19:16Z VZ $
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS
+
+#include "wx/sstream.h"
+
+#if wxUSE_UNICODE
+    #include "wx/hashmap.h"
+#endif
+
+// ============================================================================
+// wxStringInputStream implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// construction/destruction
+// ----------------------------------------------------------------------------
+
+// TODO:  Do we want to include the null char in the stream?  If so then
+// just add +1 to m_len in the ctor
+wxStringInputStream::wxStringInputStream(const wxString& s)
+#if wxUSE_UNICODE
+    : m_str(s), m_buf(wxMBConvUTF8().cWX2MB(s).release()), m_len(strlen(m_buf))
+#else
+    : m_str(s), m_buf((char*)s.c_str()), m_len(s.length())
+#endif
+{
+#if wxUSE_UNICODE
+    wxASSERT_MSG(m_buf != NULL, _T("Could not convert string to UTF8!"));
+#endif
+    m_pos = 0;
+}
+
+wxStringInputStream::~wxStringInputStream()
+{
+#if wxUSE_UNICODE
+    // Note: wx[W]CharBuffer uses malloc()/free()
+    free(m_buf);
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// getlength
+// ----------------------------------------------------------------------------
+
+wxFileOffset wxStringInputStream::GetLength() const
+{
+    return m_len;
+}
+
+// ----------------------------------------------------------------------------
+// seek/tell
+// ----------------------------------------------------------------------------
+
+wxFileOffset wxStringInputStream::OnSysSeek(wxFileOffset ofs, wxSeekMode mode)
+{
+    switch ( mode )
+    {
+        case wxFromStart:
+            // nothing to do, ofs already ok
+            break;
+
+        case wxFromEnd:
+            ofs += m_len;
+            break;
+
+        case wxFromCurrent:
+            ofs += m_pos;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("invalid seek mode") );
+            return wxInvalidOffset;
+    }
+
+    if ( ofs < 0 || ofs > wx_static_cast(wxFileOffset, m_len) )
+        return wxInvalidOffset;
+
+    // FIXME: this can't be right
+    m_pos = wx_truncate_cast(size_t, ofs);
+
+    return ofs;
+}
+
+wxFileOffset wxStringInputStream::OnSysTell() const
+{
+    return wx_static_cast(wxFileOffset, m_pos);
+}
+
+// ----------------------------------------------------------------------------
+// actual IO
+// ----------------------------------------------------------------------------
+
+size_t wxStringInputStream::OnSysRead(void *buffer, size_t size)
+{
+    const size_t sizeMax = m_len - m_pos;
+
+    if ( size >= sizeMax )
+    {
+        if ( sizeMax == 0 )
+        {
+            m_lasterror = wxSTREAM_EOF;
+            return 0;
+        }
+
+        size = sizeMax;
+    }
+
+    memcpy(buffer, m_buf + m_pos, size);
+    m_pos += size;
+
+    return size;
+}
+
+// ============================================================================
+// wxStringOutputStream implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// seek/tell
+// ----------------------------------------------------------------------------
+
+wxFileOffset wxStringOutputStream::OnSysTell() const
+{
+    return wx_static_cast(wxFileOffset, m_pos);
+}
+
+// ----------------------------------------------------------------------------
+// actual IO
+// ----------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+
+// we can't add a member to wxStringOutputStream in 2.8 branch without breaking
+// backwards binary compatibility, so we emulate it by using a hash indexed by
+// wxStringOutputStream pointers
+
+// can't use wxCharBuffer as it has incorrect copying semantics and doesn't
+// store the length which we need here
+WX_DECLARE_VOIDPTR_HASH_MAP(wxMemoryBuffer, wxStringStreamUnconvBuffers);
+
+static wxStringStreamUnconvBuffers gs_unconverted;
+
+wxStringOutputStream::~wxStringOutputStream()
+{
+    // TODO: check that nothing remains (i.e. the unconverted buffer is empty)?
+    gs_unconverted.erase(this);
+}
+
+#endif // wxUSE_UNICODE
+
+size_t wxStringOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    const char *p = wx_static_cast(const char *, buffer);
+
+#if wxUSE_UNICODE
+    // the part of the string we have here may be incomplete, i.e. it can stop
+    // in the middle of an UTF-8 character and so converting it would fail; if
+    // this is the case, accumulate the part which we failed to convert until
+    // we get the rest (and also take into account the part which we might have
+    // left unconverted before)
+    const char *src;
+    size_t srcLen;
+    wxMemoryBuffer& unconv = gs_unconverted[this];
+    if ( unconv.GetDataLen() )
+    {
+        // append the new data to the data remaining since the last time
+        unconv.AppendData(p, size);
+        src = unconv;
+        srcLen = unconv.GetDataLen();
+    }
+    else // no unconverted data left, avoid extra copy
+    {
+        src = p;
+        srcLen = size;
+    }
+
+    wxWCharBuffer wbuf(m_conv.cMB2WC(src, srcLen, NULL /* out len */));
+    if ( wbuf )
+    {
+        // conversion succeeded, clear the unconverted buffer
+        unconv = wxMemoryBuffer(0);
+
+        *m_str += wbuf;
+    }
+    else // conversion failed
+    {
+        // remember unconverted data if there had been none before (otherwise
+        // we've already got it in the buffer)
+        if ( src == p )
+            unconv.AppendData(src, srcLen);
+
+        // pretend that we wrote the data anyhow, otherwise the caller would
+        // believe there was an error and this might not be the case, but do
+        // not update m_pos as m_str hasn't changed
+        return size;
+    }
+#else // !wxUSE_UNICODE
+    // append directly, no conversion necessary
+    m_str->Append(wxString(p, size));
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+
+    // update position
+    m_pos += size;
+
+    // return number of bytes actually written
+    return size;
+}
+
+#endif // wxUSE_STREAMS
+
diff --git a/Source/3rd Party/wx/src/common/statbar.cpp b/Source/3rd Party/wx/src/common/statbar.cpp
index 4749f7a4b..82de44f33 100644
--- a/Source/3rd Party/wx/src/common/statbar.cpp	
+++ b/Source/3rd Party/wx/src/common/statbar.cpp	
@@ -1,307 +1,368 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/statbar.cpp
-// Purpose:     wxStatusBarBase implementation
-// Author:      Vadim Zeitlin
-// Modified by: Francesco Montorsi
-// Created:     14.10.01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STATUSBAR
-
-#include "wx/statusbr.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/frame.h"
-#endif //WX_PRECOMP
-
-const char wxStatusBarNameStr[] = "statusBar";
-
-// ============================================================================
-// wxStatusBarPane implementation
-// ============================================================================
-
-bool wxStatusBarPane::SetText(const wxString& text)
-{
-    if ( text == m_text )
-        return false;
-
-    /*
-        If we have a message to restore on the stack, we update it to
-        correspond to the current one so that a sequence of calls such as
-
-        1. SetStatusText("foo")
-        2. PushStatusText("bar")
-        3. SetStatusText("new foo")
-        4. PopStatusText()
-
-        doesn't overwrite the "new foo" which should be shown at the end with
-        the old value "foo". This would be unexpected and hard to avoid,
-        especially when PushStatusText() is used internally by wxWidgets
-        without knowledge of the user program, as it is for showing the menu
-        and toolbar help strings.
-
-        By updating the top of the stack we ensure that the next call to
-        PopStatusText() basically becomes a NOP without breaking the balance
-        between the calls to push and pop as we would have done if we really
-        called PopStatusText() here.
-     */
-    if ( !m_arrStack.empty() )
-    {
-        m_arrStack.back() = text;
-    }
-
-    m_text = text;
-
-    return true;
-}
-
-bool wxStatusBarPane::PushText(const wxString& text)
-{
-    // save the currently shown text
-    m_arrStack.push_back(m_text);
-
-    // and update the new one if necessary
-    if ( text == m_text )
-        return false;
-
-    m_text = text;
-
-    return true;
-}
-
-bool wxStatusBarPane::PopText()
-{
-    wxCHECK_MSG( !m_arrStack.empty(), false, "no status message to pop" );
-
-    const wxString text = m_arrStack.back();
-
-    m_arrStack.pop_back();
-
-    if ( text == m_text )
-        return false;
-
-    m_text = text;
-
-    return true;
-}
-
-// ============================================================================
-// wxStatusBarBase implementation
-// ============================================================================
-
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
-
-#include "wx/arrimpl.cpp" // This is a magic incantation which must be done!
-WX_DEFINE_EXPORTED_OBJARRAY(wxStatusBarPaneArray)
-
-
-// ----------------------------------------------------------------------------
-// ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxStatusBarBase::wxStatusBarBase()
-{
-    m_bSameWidthForAllPanes = true;
-}
-
-wxStatusBarBase::~wxStatusBarBase()
-{
-    // notify the frame that it doesn't have a status bar any longer to avoid
-    // dangling pointers
-    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
-    if ( frame && frame->GetStatusBar() == this )
-        frame->SetStatusBar(NULL);
-}
-
-// ----------------------------------------------------------------------------
-// field widths
-// ----------------------------------------------------------------------------
-
-void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
-{
-    wxCHECK_RET( number > 0, wxT("invalid field number in SetFieldsCount") );
-
-    if ( (size_t)number > m_panes.GetCount() )
-    {
-        wxStatusBarPane newPane;
-
-        // add more entries with the default style and zero width
-        // (this will be set later)
-        for (size_t i = m_panes.GetCount(); i < (size_t)number; ++i)
-            m_panes.Add(newPane);
-    }
-    else if ( (size_t)number < m_panes.GetCount() )
-    {
-        // remove entries in excess
-        m_panes.RemoveAt(number, m_panes.GetCount()-number);
-    }
-
-    // SetStatusWidths will automatically refresh
-    SetStatusWidths(number, widths);
-}
-
-void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
-                                    const int widths[])
-{
-    wxASSERT_MSG( (size_t)n == m_panes.GetCount(), wxT("field number mismatch") );
-
-    if (widths == NULL)
-    {
-        // special value meaning: override explicit pane widths and make them all
-        // of the same size
-        m_bSameWidthForAllPanes = true;
-    }
-    else
-    {
-        for ( size_t i = 0; i < m_panes.GetCount(); i++ )
-            m_panes[i].SetWidth(widths[i]);
-
-        m_bSameWidthForAllPanes = false;
-    }
-
-    // update the display after the widths changed
-    Refresh();
-}
-
-void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
-                                    const int styles[])
-{
-    wxCHECK_RET( styles, wxT("NULL pointer in SetStatusStyles") );
-
-    wxASSERT_MSG( (size_t)n == m_panes.GetCount(), wxT("field number mismatch") );
-
-    for ( size_t i = 0; i < m_panes.GetCount(); i++ )
-        m_panes[i].SetStyle(styles[i]);
-
-    // update the display after the widths changed
-    Refresh();
-}
-
-wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
-{
-    wxArrayInt widths;
-
-    if ( m_bSameWidthForAllPanes )
-    {
-        // Default: all fields have the same width. This is not always
-        // possible to do exactly (if widthTotal is not divisible by
-        // m_panes.GetCount()) - if that happens, we distribute the extra
-        // pixels among all fields:
-        int widthToUse = widthTotal;
-
-        for ( size_t i = m_panes.GetCount(); i > 0; i-- )
-        {
-            // divide the unassigned width evently between the
-            // not yet processed fields:
-            int w = widthToUse / i;
-            widths.Add(w);
-            widthToUse -= w;
-        }
-    }
-    else // do not override explicit pane widths
-    {
-        // calculate the total width of all the fixed width fields and the
-        // total number of var field widths counting with multiplicity
-        size_t nTotalWidth = 0,
-            nVarCount = 0,
-            i;
-
-        for ( i = 0; i < m_panes.GetCount(); i++ )
-        {
-            if ( m_panes[i].GetWidth() >= 0 )
-                nTotalWidth += m_panes[i].GetWidth();
-            else
-                nVarCount += -m_panes[i].GetWidth();
-        }
-
-        // the amount of extra width we have per each var width field
-        int widthExtra = widthTotal - nTotalWidth;
-
-        // do fill the array
-        for ( i = 0; i < m_panes.GetCount(); i++ )
-        {
-            if ( m_panes[i].GetWidth() >= 0 )
-                widths.Add(m_panes[i].GetWidth());
-            else
-            {
-                int nVarWidth = widthExtra > 0 ? (widthExtra * (-m_panes[i].GetWidth())) / nVarCount : 0;
-                nVarCount += m_panes[i].GetWidth();
-                widthExtra -= nVarWidth;
-                widths.Add(nVarWidth);
-            }
-        }
-    }
-
-    return widths;
-}
-
-// ----------------------------------------------------------------------------
-// setting/getting status text
-// ----------------------------------------------------------------------------
-
-void wxStatusBarBase::SetStatusText(const wxString& text, int number)
-{
-    wxCHECK_RET( (unsigned)number < m_panes.size(),
-                    "invalid status bar field index" );
-
-    if ( m_panes[number].SetText(text) )
-        DoUpdateStatusText(number);
-}
-
-wxString wxStatusBarBase::GetStatusText(int number) const
-{
-    wxCHECK_MSG( (unsigned)number < m_panes.size(), wxString(),
-                    "invalid status bar field index" );
-
-    return m_panes[number].GetText();
-}
-
-void wxStatusBarBase::SetEllipsizedFlag(int number, bool isEllipsized)
-{
-    wxCHECK_RET( (unsigned)number < m_panes.size(),
-                    "invalid status bar field index" );
-
-    m_panes[number].SetIsEllipsized(isEllipsized);
-}
-
-// ----------------------------------------------------------------------------
-// pushing/popping status text
-// ----------------------------------------------------------------------------
-
-void wxStatusBarBase::PushStatusText(const wxString& text, int number)
-{
-    wxCHECK_RET( (unsigned)number < m_panes.size(),
-                    "invalid status bar field index" );
-
-    if ( m_panes[number].PushText(text) )
-        DoUpdateStatusText(number);
-}
-
-void wxStatusBarBase::PopStatusText(int number)
-{
-    wxCHECK_RET( (unsigned)number < m_panes.size(),
-                    "invalid status bar field index" );
-
-    if ( m_panes[number].PopText() )
-        DoUpdateStatusText(number);
-}
-
-#endif // wxUSE_STATUSBAR
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/statbar.cpp
+// Purpose:     wxStatusBarBase implementation
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     14.10.01
+// RCS-ID:      $Id: statbar.cpp 42171 2006-10-20 14:54:14Z VS $
+// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STATUSBAR
+
+#include "wx/statusbr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+#endif //WX_PRECOMP
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxListString)
+
+const wxChar wxStatusBarNameStr[] = wxT("statusBar");
+
+// ============================================================================
+// wxStatusBarBase implementation
+// ============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
+
+// ----------------------------------------------------------------------------
+// ctor/dtor
+// ----------------------------------------------------------------------------
+
+wxStatusBarBase::wxStatusBarBase()
+{
+    m_nFields = 0;
+
+    InitWidths();
+    InitStacks();
+    InitStyles();
+}
+
+wxStatusBarBase::~wxStatusBarBase()
+{
+    FreeWidths();
+    FreeStacks();
+    FreeStyles();
+
+    // notify the frame that it doesn't have a status bar any longer to avoid
+    // dangling pointers
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && frame->GetStatusBar() == this )
+    {
+        frame->SetStatusBar(NULL);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// widths array handling
+// ----------------------------------------------------------------------------
+
+void wxStatusBarBase::InitWidths()
+{
+    m_statusWidths = NULL;
+}
+
+void wxStatusBarBase::FreeWidths()
+{
+    delete [] m_statusWidths;
+}
+
+// ----------------------------------------------------------------------------
+// styles array handling
+// ----------------------------------------------------------------------------
+
+void wxStatusBarBase::InitStyles()
+{
+    m_statusStyles = NULL;
+}
+
+void wxStatusBarBase::FreeStyles()
+{
+    delete [] m_statusStyles;
+}
+
+// ----------------------------------------------------------------------------
+// field widths
+// ----------------------------------------------------------------------------
+
+void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
+{
+    wxCHECK_RET( number > 0, _T("invalid field number in SetFieldsCount") );
+
+    bool refresh = false;
+
+    if ( number != m_nFields )
+    {
+        // copy stacks if present
+        if(m_statusTextStacks)
+        {
+            wxListString **newStacks = new wxListString*[number];
+            size_t i, j, max = wxMin(number, m_nFields);
+
+            // copy old stacks
+            for(i = 0; i < max; ++i)
+                newStacks[i] = m_statusTextStacks[i];
+            // free old stacks in excess
+            for(j = i; j < (size_t)m_nFields; ++j)
+            {
+                if(m_statusTextStacks[j])
+                {
+                    m_statusTextStacks[j]->Clear();
+                    delete m_statusTextStacks[j];
+                }
+            }
+            // initialize new stacks to NULL
+            for(j = i; j < (size_t)number; ++j)
+                newStacks[j] = 0;
+
+            m_statusTextStacks = newStacks;
+        }
+
+        // Resize styles array
+        if (m_statusStyles)
+        {
+            int *oldStyles = m_statusStyles;
+            m_statusStyles = new int[number];
+            int i, max = wxMin(number, m_nFields);
+
+            // copy old styles
+            for (i = 0; i < max; ++i)
+                m_statusStyles[i] = oldStyles[i];
+
+            // initialize new styles to wxSB_NORMAL
+            for (i = max; i < number; ++i)
+                m_statusStyles[i] = wxSB_NORMAL;
+
+            // free old styles
+            delete [] oldStyles;
+        }
+
+
+        m_nFields = number;
+
+        ReinitWidths();
+
+        refresh = true;
+    }
+    //else: keep the old m_statusWidths if we had them
+
+    if ( widths )
+    {
+        SetStatusWidths(number, widths);
+
+        // already done from SetStatusWidths()
+        refresh = false;
+    }
+
+    if ( refresh )
+        Refresh();
+}
+
+void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
+                                      const int widths[])
+{
+    wxCHECK_RET( widths, _T("NULL pointer in SetStatusWidths") );
+
+    wxASSERT_MSG( n == m_nFields, _T("field number mismatch") );
+
+    if ( !m_statusWidths )
+        m_statusWidths = new int[m_nFields];
+
+    for ( int i = 0; i < m_nFields; i++ )
+    {
+        m_statusWidths[i] = widths[i];
+    }
+
+    // update the display after the widths changed
+    Refresh();
+}
+
+void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
+                                      const int styles[])
+{
+    wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") );
+
+    wxASSERT_MSG( n == m_nFields, _T("field number mismatch") );
+
+    if ( !m_statusStyles )
+        m_statusStyles = new int[m_nFields];
+
+    for ( int i = 0; i < m_nFields; i++ )
+    {
+        m_statusStyles[i] = styles[i];
+    }
+
+    // update the display after the widths changed
+    Refresh();
+}
+
+wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
+{
+    wxArrayInt widths;
+
+    if ( m_statusWidths == NULL )
+    {
+        if ( m_nFields )
+        {
+            // Default: all fields have the same width. This is not always
+            // possible to do exactly (if widthTotal is not divisible by
+            // m_nFields) - if that happens, we distribute the extra pixels
+            // among all fields:
+            int widthToUse = widthTotal;
+
+            for ( int i = m_nFields; i > 0; i-- )
+            {
+                // divide the unassigned width evently between the
+                // not yet processed fields:
+                int w = widthToUse / i;
+                widths.Add(w);
+                widthToUse -= w;
+            }
+
+        }
+        //else: we're empty anyhow
+    }
+    else // have explicit status widths
+    {
+        // calculate the total width of all the fixed width fields and the
+        // total number of var field widths counting with multiplicity
+        int nTotalWidth = 0,
+            nVarCount = 0,
+            i;
+        for ( i = 0; i < m_nFields; i++ )
+        {
+            if ( m_statusWidths[i] >= 0 )
+            {
+                nTotalWidth += m_statusWidths[i];
+            }
+            else
+            {
+                nVarCount += -m_statusWidths[i];
+            }
+        }
+
+        // the amount of extra width we have per each var width field
+        int widthExtra = widthTotal - nTotalWidth;
+
+        // do fill the array
+        for ( i = 0; i < m_nFields; i++ )
+        {
+            if ( m_statusWidths[i] >= 0 )
+            {
+                widths.Add(m_statusWidths[i]);
+            }
+            else
+            {
+                int nVarWidth = widthExtra > 0 ? (widthExtra * -m_statusWidths[i]) / nVarCount : 0;
+                nVarCount += m_statusWidths[i];
+                widthExtra -= nVarWidth;
+                widths.Add(nVarWidth);
+            }
+        }
+    }
+
+    return widths;
+}
+
+// ----------------------------------------------------------------------------
+// text stacks handling
+// ----------------------------------------------------------------------------
+
+void wxStatusBarBase::InitStacks()
+{
+    m_statusTextStacks = NULL;
+}
+
+void wxStatusBarBase::FreeStacks()
+{
+    if ( !m_statusTextStacks )
+        return;
+
+    for ( size_t i = 0; i < (size_t)m_nFields; ++i )
+    {
+        if ( m_statusTextStacks[i] )
+        {
+            wxListString& t = *m_statusTextStacks[i];
+            WX_CLEAR_LIST(wxListString, t);
+            delete m_statusTextStacks[i];
+        }
+    }
+
+    delete[] m_statusTextStacks;
+}
+
+// ----------------------------------------------------------------------------
+// text stacks
+// ----------------------------------------------------------------------------
+
+void wxStatusBarBase::PushStatusText(const wxString& text, int number)
+{
+    wxListString* st = GetOrCreateStatusStack(number);
+    // This long-winded way around avoids an internal compiler error
+    // in VC++ 6 with RTTI enabled
+    wxString tmp1(GetStatusText(number));
+    wxString* tmp = new wxString(tmp1);
+    st->Insert(tmp);
+    SetStatusText(text, number);
+}
+
+void wxStatusBarBase::PopStatusText(int number)
+{
+    wxListString *st = GetStatusStack(number);
+    wxCHECK_RET( st, _T("Unbalanced PushStatusText/PopStatusText") );
+    wxListString::compatibility_iterator top = st->GetFirst();
+
+    SetStatusText(*top->GetData(), number);
+    delete top->GetData();
+    st->Erase(top);
+    if(st->GetCount() == 0)
+    {
+        delete st;
+        m_statusTextStacks[number] = 0;
+    }
+}
+
+wxListString *wxStatusBarBase::GetStatusStack(int i) const
+{
+    if(!m_statusTextStacks)
+        return 0;
+    return m_statusTextStacks[i];
+}
+
+wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
+{
+    if(!m_statusTextStacks)
+    {
+        m_statusTextStacks = new wxListString*[m_nFields];
+
+        size_t j;
+        for(j = 0; j < (size_t)m_nFields; ++j) m_statusTextStacks[j] = 0;
+    }
+
+    if(!m_statusTextStacks[i])
+    {
+        m_statusTextStacks[i] = new wxListString();
+    }
+
+    return m_statusTextStacks[i];
+}
+
+#endif // wxUSE_STATUSBAR
diff --git a/Source/3rd Party/wx/src/common/statbmpcmn.cpp b/Source/3rd Party/wx/src/common/statbmpcmn.cpp
deleted file mode 100644
index deac7fd03..000000000
--- a/Source/3rd Party/wx/src/common/statbmpcmn.cpp	
+++ /dev/null
@@ -1,87 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/statbmpcmn.cpp
-// Purpose:     wxStaticBitmap common code
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// declarations
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STATBMP
-
-#include "wx/statbmp.h"
-
-extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[] = "staticBitmap";
-
-// ---------------------------------------------------------------------------
-// XTI
-// ---------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxStaticBitmapStyle )
-wxBEGIN_FLAGS( wxStaticBitmapStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxStaticBitmapStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl, "wx/statbmp.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)
-    wxPROPERTY_FLAGS( WindowStyle, wxStaticBitmapStyle, long, \
-                      SetWindowStyleFlag, GetWindowStyleFlag, \
-                      wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \
-                      wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxStaticBitmap)
-
-wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow*, Parent, wxWindowID, Id, \
-                 wxBitmap, Bitmap, wxPoint, Position, wxSize, Size )
-
-/*
-    TODO PROPERTIES :
-        bitmap
-*/
-
-#endif // wxUSE_STATBMP
diff --git a/Source/3rd Party/wx/src/common/statboxcmn.cpp b/Source/3rd Party/wx/src/common/statboxcmn.cpp
deleted file mode 100644
index a6365f325..000000000
--- a/Source/3rd Party/wx/src/common/statboxcmn.cpp	
+++ /dev/null
@@ -1,83 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/statboxcmn.cpp
-// Purpose:     wxStaticBox common code
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STATBOX
-
-#include "wx/statbox.h"
-
-extern WXDLLEXPORT_DATA(const char) wxStaticBoxNameStr[] = "groupBox";
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxStaticBoxStyle )
-wxBEGIN_FLAGS( wxStaticBoxStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-wxEND_FLAGS( wxStaticBoxStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl, "wx/statbox.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticBox)
-    wxPROPERTY( Label, wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \
-                wxT("Helpstring"), wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle, wxStaticBoxStyle, long, SetWindowStyleFlag, \
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                      wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxStaticBox)
-
-wxCONSTRUCTOR_6( wxStaticBox, wxWindow*, Parent, wxWindowID, Id, \
-                 wxString, Label, wxPoint, Position, wxSize, Size, \
-                 long, WindowStyle )
-
-#endif // wxUSE_STATBOX
diff --git a/Source/3rd Party/wx/src/common/statlinecmn.cpp b/Source/3rd Party/wx/src/common/statlinecmn.cpp
deleted file mode 100644
index 97adb5e89..000000000
--- a/Source/3rd Party/wx/src/common/statlinecmn.cpp	
+++ /dev/null
@@ -1,82 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/statlinecmn.cpp
-// Purpose:     wxStaticLine common code
-// Author:      Vadim Zeitlin
-// Created:     28.06.99
-// Version:     $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/statline.h"
-
-#if wxUSE_STATLINE
-
-extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[] = "staticLine";
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxStaticLineStyle )
-wxBEGIN_FLAGS( wxStaticLineStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxLI_HORIZONTAL)
-    wxFLAGS_MEMBER(wxLI_VERTICAL)
-wxEND_FLAGS( wxStaticLineStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl, "wx/statline.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticLine)
-    wxPROPERTY_FLAGS( WindowStyle, wxStaticLineStyle, long, SetWindowStyleFlag, \
-                      GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                      wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxStaticLine)
-
-wxCONSTRUCTOR_5( wxStaticLine, wxWindow*, Parent, wxWindowID, Id, \
-                 wxPoint, Position, wxSize, Size, long, WindowStyle)
-
-#endif // wxUSE_STATLINE
diff --git a/Source/3rd Party/wx/src/common/stattextcmn.cpp b/Source/3rd Party/wx/src/common/stattextcmn.cpp
deleted file mode 100644
index d5f930f65..000000000
--- a/Source/3rd Party/wx/src/common/stattextcmn.cpp	
+++ /dev/null
@@ -1,263 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/stattextcmn.cpp
-// Purpose:     common (to all ports) wxStaticText functions
-// Author:      Vadim Zeitlin, Francesco Montorsi
-// Created:     2007-01-07 (extracted from dlgcmn.cpp)
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999-2006 Vadim Zeitlin
-//              (c) 2007 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STATTEXT
-
-#ifndef WX_PRECOMP
-    #include "wx/stattext.h"
-    #include "wx/button.h"
-    #include "wx/dcclient.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/settings.h"
-    #include "wx/sizer.h"
-    #include "wx/containr.h"
-#endif
-
-#include "wx/textwrapper.h"
-
-#include "wx/private/markupparser.h"
-
-extern WXDLLEXPORT_DATA(const char) wxStaticTextNameStr[] = "staticText";
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxStaticTextStyle )
-wxBEGIN_FLAGS( wxStaticTextStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxST_NO_AUTORESIZE)
-wxFLAGS_MEMBER(wxALIGN_LEFT)
-wxFLAGS_MEMBER(wxALIGN_RIGHT)
-wxFLAGS_MEMBER(wxALIGN_CENTRE)
-wxEND_FLAGS( wxStaticTextStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl, "wx/stattext.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxStaticText)
-wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-wxPROPERTY_FLAGS( WindowStyle, wxStaticTextStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxStaticText)
-
-wxCONSTRUCTOR_6( wxStaticText, wxWindow*, Parent, wxWindowID, Id, \
-                wxString, Label, wxPoint, Position, wxSize, Size, long, WindowStyle )
-
-
-// ----------------------------------------------------------------------------
-// wxTextWrapper
-// ----------------------------------------------------------------------------
-
-void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax)
-{
-    wxString line;
-
-    wxString::const_iterator lastSpace = text.end();
-    wxString::const_iterator lineStart = text.begin();
-    for ( wxString::const_iterator p = lineStart; ; ++p )
-    {
-        if ( IsStartOfNewLine() )
-        {
-            OnNewLine();
-
-            lastSpace = text.end();
-            line.clear();
-            lineStart = p;
-        }
-
-        if ( p == text.end() || *p == wxT('\n') )
-        {
-            DoOutputLine(line);
-
-            if ( p == text.end() )
-                break;
-        }
-        else // not EOL
-        {
-            if ( *p == wxT(' ') )
-                lastSpace = p;
-
-            line += *p;
-
-            if ( widthMax >= 0 && lastSpace != text.end() )
-            {
-                int width;
-                win->GetTextExtent(line, &width, NULL);
-
-                if ( width > widthMax )
-                {
-                    // remove the last word from this line
-                    line.erase(lastSpace - lineStart, p + 1 - lineStart);
-                    DoOutputLine(line);
-
-                    // go back to the last word of this line which we didn't
-                    // output yet
-                    p = lastSpace;
-                }
-            }
-            //else: no wrapping at all or impossible to wrap
-        }
-    }
-}
-
-
-// ----------------------------------------------------------------------------
-// wxLabelWrapper: helper class for wxStaticTextBase::Wrap()
-// ----------------------------------------------------------------------------
-
-class wxLabelWrapper : public wxTextWrapper
-{
-public:
-    void WrapLabel(wxWindow *text, int widthMax)
-    {
-        m_text.clear();
-        Wrap(text, text->GetLabel(), widthMax);
-        text->SetLabel(m_text);
-    }
-
-protected:
-    virtual void OnOutputLine(const wxString& line)
-    {
-        m_text += line;
-    }
-
-    virtual void OnNewLine()
-    {
-        m_text += wxT('\n');
-    }
-
-private:
-    wxString m_text;
-};
-
-
-// ----------------------------------------------------------------------------
-// wxStaticTextBase
-// ----------------------------------------------------------------------------
-
-void wxStaticTextBase::Wrap(int width)
-{
-    wxLabelWrapper wrapper;
-    wrapper.WrapLabel(this, width);
-}
-
-// ----------------------------------------------------------------------------
-// wxStaticTextBase - generic implementation for wxST_ELLIPSIZE_* support
-// ----------------------------------------------------------------------------
-
-void wxStaticTextBase::UpdateLabel()
-{
-    if (!IsEllipsized())
-        return;
-
-    wxString newlabel = GetEllipsizedLabel();
-
-    // we need to touch the "real" label (i.e. the text set inside the control,
-    // using port-specific functions) instead of the string returned by GetLabel().
-    //
-    // In fact, we must be careful not to touch the original label passed to
-    // SetLabel() otherwise GetLabel() will behave in a strange way to the user
-    // (e.g. returning a "Ver...ing" instead of "Very long string") !
-    if (newlabel == DoGetLabel())
-        return;
-    DoSetLabel(newlabel);
-}
-
-wxString wxStaticTextBase::GetEllipsizedLabel() const
-{
-    // this function should be used only by ports which do not support
-    // ellipsis in static texts: we first remove markup (which cannot
-    // be handled safely by Ellipsize()) and then ellipsize the result.
-
-    wxString ret(m_labelOrig);
-
-    if (IsEllipsized())
-        ret = Ellipsize(ret);
-
-    return ret;
-}
-
-wxString wxStaticTextBase::Ellipsize(const wxString& label) const
-{
-    wxSize sz(GetSize());
-    if (sz.GetWidth() < 2 || sz.GetHeight() < 2)
-    {
-        // the size of this window is not valid (yet)
-        return label;
-    }
-
-    wxClientDC dc(const_cast<wxStaticTextBase*>(this));
-    dc.SetFont(GetFont());
-
-    wxEllipsizeMode mode;
-    if ( HasFlag(wxST_ELLIPSIZE_START) )
-        mode = wxELLIPSIZE_START;
-    else if ( HasFlag(wxST_ELLIPSIZE_MIDDLE) )
-        mode = wxELLIPSIZE_MIDDLE;
-    else if ( HasFlag(wxST_ELLIPSIZE_END) )
-        mode = wxELLIPSIZE_END;
-    else
-    {
-        wxFAIL_MSG( "should only be called if have one of wxST_ELLIPSIZE_XXX" );
-
-        return label;
-    }
-
-    return wxControl::Ellipsize(label, dc, mode, sz.GetWidth());
-}
-
-#endif // wxUSE_STATTEXT
diff --git a/Source/3rd Party/wx/src/common/stdpbase.cpp b/Source/3rd Party/wx/src/common/stdpbase.cpp
index 8b5733f55..f2d4ff6b0 100644
--- a/Source/3rd Party/wx/src/common/stdpbase.cpp	
+++ b/Source/3rd Party/wx/src/common/stdpbase.cpp	
@@ -1,163 +1,172 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/stdpbase.cpp
-// Purpose:     wxStandardPathsBase methods common to all ports
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     2004-10-19
-// RCS-ID:      $Id$
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-#endif //WX_PRECOMP
-#include "wx/apptrait.h"
-
-#include "wx/filename.h"
-#include "wx/stdpaths.h"
-
-// ----------------------------------------------------------------------------
-// module globals
-// ----------------------------------------------------------------------------
-
-static wxStandardPaths gs_stdPaths;
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-/* static */
-wxStandardPaths& wxStandardPathsBase::Get()
-{
-    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    wxCHECK_MSG( traits, gs_stdPaths, wxT("create wxApp before calling this") );
-
-    return traits->GetStandardPaths();
-}
-
-wxString wxStandardPathsBase::GetExecutablePath() const
-{
-    if ( !wxTheApp || !wxTheApp->argv )
-        return wxEmptyString;
-
-    wxString argv0 = wxTheApp->argv[0];
-    if (wxIsAbsolutePath(argv0))
-        return argv0;
-
-    // Search PATH.environment variable...
-    wxPathList pathlist;
-    pathlist.AddEnvList(wxT("PATH"));
-    wxString path = pathlist.FindAbsoluteValidPath(argv0);
-    if ( path.empty() )
-        return argv0;       // better than nothing
-
-    wxFileName filename(path);
-    filename.Normalize();
-    return filename.GetFullPath();
-}
-
-wxStandardPaths& wxAppTraitsBase::GetStandardPaths()
-{
-    return gs_stdPaths;
-}
-
-wxStandardPathsBase::wxStandardPathsBase()
-{
-    // Set the default information that is used when
-    // forming some paths (by AppendAppInfo).
-    // Derived classes can call this in their constructors
-    // to set the platform-specific settings
-    UseAppInfo(AppInfo_AppName);
-}
-
-wxStandardPathsBase::~wxStandardPathsBase()
-{
-    // nothing to do here
-}
-
-wxString wxStandardPathsBase::GetLocalDataDir() const
-{
-    return GetDataDir();
-}
-
-wxString wxStandardPathsBase::GetUserLocalDataDir() const
-{
-    return GetUserDataDir();
-}
-
-wxString wxStandardPathsBase::GetDocumentsDir() const
-{
-    return wxFileName::GetHomeDir();
-}
-
-wxString wxStandardPathsBase::GetAppDocumentsDir() const
-{
-    const wxString docsDir = GetDocumentsDir();
-    wxString appDocsDir = AppendAppInfo(docsDir);
-
-    return wxDirExists(appDocsDir) ? appDocsDir : docsDir;
-}
-
-// return the temporary directory for the current user
-wxString wxStandardPathsBase::GetTempDir() const
-{
-    return wxFileName::GetTempDir();
-}
-
-/* static */
-wxString
-wxStandardPathsBase::AppendPathComponent(const wxString& dir,
-                                         const wxString& component)
-{
-    wxString subdir(dir);
-
-    // empty string indicates that an error has occurred, don't touch it then
-    if ( !subdir.empty() )
-    {
-        if ( !component.empty() )
-        {
-            const wxChar ch = *(subdir.end() - 1);
-            if ( !wxFileName::IsPathSeparator(ch) && ch != wxT('.') )
-                subdir += wxFileName::GetPathSeparator();
-
-            subdir += component;
-        }
-    }
-
-    return subdir;
-}
-
-
-wxString wxStandardPathsBase::AppendAppInfo(const wxString& dir) const
-{
-    wxString subdir(dir);
-
-    if ( UsesAppInfo(AppInfo_VendorName) )
-    {
-        subdir = AppendPathComponent(subdir, wxTheApp->GetVendorName());
-    }
-
-    if ( UsesAppInfo(AppInfo_AppName) )
-    {
-        subdir = AppendPathComponent(subdir, wxTheApp->GetAppName());
-    }
-
-    return subdir;
-}
-
+///////////////////////////////////////////////////////////////////////////////
+// Name:        common/stdpbase.cpp
+// Purpose:     wxStandardPathsBase methods common to all ports
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     2004-10-19
+// RCS-ID:      $Id: stdpbase.cpp 53093 2008-04-08 13:51:17Z JS $
+// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
+// License:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STDPATHS
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif //WX_PRECOMP
+#include "wx/apptrait.h"
+
+#include "wx/filename.h"
+#include "wx/stdpaths.h"
+
+#if defined(__UNIX__) && !defined(__WXMAC__)
+#include "wx/log.h"
+#include "wx/textfile.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// module globals
+// ----------------------------------------------------------------------------
+
+static wxStandardPaths gs_stdPaths;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+/* static */
+wxStandardPathsBase& wxStandardPathsBase::Get()
+{
+    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    wxCHECK_MSG( traits, gs_stdPaths, _T("create wxApp before calling this") );
+
+    return traits->GetStandardPaths();
+}
+
+wxString wxStandardPathsBase::GetExecutablePath() const
+{
+    if ( !wxTheApp || !wxTheApp->argv )
+        return wxEmptyString;
+
+    wxString argv0 = wxTheApp->argv[0];
+    if (wxIsAbsolutePath(argv0))
+        return argv0;
+
+    // Search PATH.environment variable...
+    wxPathList pathlist;
+    pathlist.AddEnvList(wxT("PATH"));
+    wxString path = pathlist.FindAbsoluteValidPath(argv0);
+    if ( path.empty() )
+        return argv0;       // better than nothing
+
+    wxFileName filename(path);
+    filename.Normalize();
+    return filename.GetFullPath();
+}
+
+wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
+{
+    return gs_stdPaths;
+}
+
+wxStandardPathsBase::~wxStandardPathsBase()
+{
+    // nothing to do here
+}
+
+wxString wxStandardPathsBase::GetLocalDataDir() const
+{
+    return GetDataDir();
+}
+
+wxString wxStandardPathsBase::GetUserLocalDataDir() const
+{
+    return GetUserDataDir();
+}
+
+wxString wxStandardPathsBase::GetDocumentsDir() const
+{
+#if defined(__UNIX__) && !defined(__WXMAC__)
+    {
+        wxLogNull logNull;
+        wxString homeDir = wxFileName::GetHomeDir();
+        wxString configPath;
+        if (wxGetenv(wxT("XDG_CONFIG_HOME")))
+            configPath = wxGetenv(wxT("XDG_CONFIG_HOME"));
+        else
+            configPath = homeDir + wxT("/.config");
+        wxString dirsFile = configPath + wxT("/user-dirs.dirs");
+        if (wxFileExists(dirsFile))
+        {
+            wxTextFile textFile;
+            if (textFile.Open(dirsFile))
+            {
+                size_t i;
+                for (i = 0; i < textFile.GetLineCount(); i++)
+                {
+                    wxString line(textFile[i]);
+                    int pos = line.Find(wxT("XDG_DOCUMENTS_DIR"));
+                    if (pos != wxNOT_FOUND)
+                    {
+                        wxString value = line.AfterFirst(wxT('='));
+                        value.Replace(wxT("$HOME"), homeDir);
+                        value.Trim(true);
+                        value.Trim(false);
+                        if (!value.IsEmpty() && wxDirExists(value))
+                            return value;
+                        else
+                            break;
+                    }
+                }
+            }
+        }
+    }
+#endif
+
+    return wxFileName::GetHomeDir();
+}
+
+// return the temporary directory for the current user
+wxString wxStandardPathsBase::GetTempDir() const
+{
+    return wxFileName::GetTempDir();
+}
+
+/* static */
+wxString wxStandardPathsBase::AppendAppName(const wxString& dir)
+{
+    wxString subdir(dir);
+
+    // empty string indicates that an error has occurred, don't touch it then
+    if ( !subdir.empty() )
+    {
+        const wxString appname = wxTheApp->GetAppName();
+        if ( !appname.empty() )
+        {
+            const wxChar ch = *(subdir.end() - 1);
+            if ( !wxFileName::IsPathSeparator(ch) && ch != _T('.') )
+                subdir += wxFileName::GetPathSeparator();
+
+            subdir += appname;
+        }
+    }
+
+    return subdir;
+}
+
+#endif // wxUSE_STDPATHS
diff --git a/Source/3rd Party/wx/src/common/stdstream.cpp b/Source/3rd Party/wx/src/common/stdstream.cpp
deleted file mode 100644
index 98eff486c..000000000
--- a/Source/3rd Party/wx/src/common/stdstream.cpp	
+++ /dev/null
@@ -1,293 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/stdstream.cpp
-// Purpose:     Implementation of std::istream and std::ostream derived
-//              wrappers for wxInputStream and wxOutputStream
-// Author:      Jonathan Liu <net147@gmail.com>
-// Created:     2009-05-02
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Jonathan Liu
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ==========================================================================
-// Declarations
-// ==========================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS && wxUSE_STD_IOSTREAM
-
-#ifndef WX_PRECOMP
-#endif
-
-#include "wx/stdstream.h"
-
-#include <ios>
-#include <istream>
-#include <ostream>
-#include <streambuf>
-
-// ==========================================================================
-// Helpers
-// ==========================================================================
-
-namespace
-{
-
-bool
-IosSeekDirToWxSeekMode(std::ios_base::seekdir way,
-                       wxSeekMode& seekMode)
-{
-    switch ( way )
-    {
-        case std::ios_base::beg:
-            seekMode = wxFromStart;
-            break;
-        case std::ios_base::cur:
-            seekMode = wxFromCurrent;
-            break;
-        case std::ios_base::end:
-            seekMode = wxFromEnd;
-            break;
-        default:
-            return false;
-    }
-
-    return true;
-}
-
-} // anonymous namespace
-
-// ==========================================================================
-// wxStdInputStreamBuffer
-// ==========================================================================
-
-wxStdInputStreamBuffer::wxStdInputStreamBuffer(wxInputStream& stream) :
-    m_stream(stream), m_lastChar(EOF)
-{
-}
-
-std::streambuf *
-wxStdInputStreamBuffer::setbuf(char *WXUNUSED(s),
-                               std::streamsize WXUNUSED(n))
-{
-    return NULL;
-}
-
-std::streampos
-wxStdInputStreamBuffer::seekoff(std::streamoff off,
-                                std::ios_base::seekdir way,
-                                std::ios_base::openmode which)
-{
-    wxSeekMode seekMode;
-
-    if ( !IosSeekDirToWxSeekMode(way, seekMode) )
-        return -1;
-    if ( !(which & std::ios_base::in) )
-        return -1;
-
-    off_t newPos = m_stream.SeekI((off_t) off, seekMode);
-
-    if ( newPos != wxInvalidOffset )
-        return (std::streampos) newPos;
-    else
-        return -1;
-}
-
-std::streampos
-wxStdInputStreamBuffer::seekpos(std::streampos sp,
-                                std::ios_base::openmode which)
-{
-    if ( !(which & std::ios_base::in) )
-        return -1;
-
-    off_t newPos = m_stream.SeekI((off_t) sp);
-
-    if ( newPos != wxInvalidOffset )
-        return (std::streampos) newPos;
-    else
-        return -1;
-}
-
-std::streamsize
-wxStdInputStreamBuffer::showmanyc()
-{
-    if ( m_stream.CanRead() && (off_t) m_stream.GetSize() > m_stream.TellI() )
-        return m_stream.GetSize() - m_stream.TellI();
-    else
-        return 0;
-}
-
-std::streamsize
-wxStdInputStreamBuffer::xsgetn(char *s, std::streamsize n)
-{
-    m_stream.Read((void *) s, (size_t) n);
-
-    std::streamsize read = m_stream.LastRead();
-
-    if ( read > 0 )
-        m_lastChar = (unsigned char) s[read - 1];
-
-    return read;
-}
-
-int
-wxStdInputStreamBuffer::underflow()
-{
-    int ch = m_stream.GetC();
-
-    if ( m_stream.LastRead() == 1 )
-    {
-        m_stream.Ungetch((char) ch);
-        return ch;
-    }
-    else
-    {
-        return EOF;
-    }
-}
-
-int
-wxStdInputStreamBuffer::uflow()
-{
-    int ch = m_stream.GetC();
-
-    if ( m_stream.LastRead() == 1 )
-    {
-        m_lastChar = ch;
-        return ch;
-    }
-    else
-    {
-        return EOF;
-    }
-}
-
-int
-wxStdInputStreamBuffer::pbackfail(int c)
-{
-    if ( c == EOF )
-    {
-        if ( m_lastChar == EOF )
-            return EOF;
-
-        c = m_lastChar;
-        m_lastChar = EOF;
-    }
-
-    return m_stream.Ungetch((char) c) ? c : EOF;
-}
-
-// ==========================================================================
-// wxStdOutputStreamBuffer
-// ==========================================================================
-
-wxStdOutputStreamBuffer::wxStdOutputStreamBuffer(wxOutputStream& stream) :
-    m_stream(stream)
-{
-}
-
-std::streambuf *
-wxStdOutputStreamBuffer::setbuf(char *WXUNUSED(s),
-                                std::streamsize WXUNUSED(n))
-{
-    return NULL;
-}
-
-std::streampos
-wxStdOutputStreamBuffer::seekoff(std::streamoff off,
-                                 std::ios_base::seekdir way,
-                                 std::ios_base::openmode which)
-{
-    wxSeekMode seekMode;
-
-    if ( !IosSeekDirToWxSeekMode(way, seekMode) )
-        return -1;
-    if ( !(which & std::ios_base::out) )
-        return -1;
-
-    off_t newPos = m_stream.SeekO((off_t) off, seekMode);
-
-    if ( newPos != wxInvalidOffset )
-        return (std::streampos) newPos;
-    else
-        return -1;
-}
-
-std::streampos
-wxStdOutputStreamBuffer::seekpos(std::streampos sp,
-                                 std::ios_base::openmode which)
-{
-    if ( !(which & std::ios_base::out) )
-        return -1;
-
-    off_t newPos = m_stream.SeekO((off_t) sp);
-
-    if ( newPos != wxInvalidOffset )
-        return (std::streampos) newPos;
-    else
-        return -1;
-}
-
-std::streamsize
-wxStdOutputStreamBuffer::xsputn(const char *s,
-                                std::streamsize n)
-{
-    m_stream.Write((const void *) s, (size_t) n);
-    return (std::streamsize) m_stream.LastWrite();
-}
-
-int
-wxStdOutputStreamBuffer::overflow(int c)
-{
-    m_stream.PutC(c);
-    return m_stream.IsOk() ? c : EOF;
-}
-
-// ==========================================================================
-// wxStdInputStream and wxStdOutputStream
-// ==========================================================================
-
-// FIXME-VC6: it is impossible to call basic_ios<char>::init() with this
-//            compiler, it complains about invalid call to non-static member
-//            function so use a suspicious (as it uses a pointer to not yet
-//            constructed streambuf) but working workaround
-//
-//            It also doesn't like using istream in the ctor initializer list
-//            and we must spell it out as basic_istream<char>.
-#ifdef __VISUALC6__
-
-wxStdInputStream::wxStdInputStream(wxInputStream& stream)
-    : std::basic_istream<char, std::char_traits<char> >(&m_streamBuffer),
-      m_streamBuffer(stream)
-{
-}
-
-wxStdOutputStream::wxStdOutputStream(wxOutputStream& stream)
-    : std::basic_ostream<char, std::char_traits<char> >(&m_streamBuffer),
-      m_streamBuffer(stream)
-{
-}
-
-#else // !VC6
-
-wxStdInputStream::wxStdInputStream(wxInputStream& stream) :
-    std::istream(NULL), m_streamBuffer(stream)
-{
-    std::ios::init(&m_streamBuffer);
-}
-
-wxStdOutputStream::wxStdOutputStream(wxOutputStream& stream) :
-    std::ostream(NULL), m_streamBuffer(stream)
-{
-    std::ios::init(&m_streamBuffer);
-}
-
-#endif // VC6/!VC6
-
-#endif // wxUSE_STREAMS && wxUSE_STD_IOSTREAM
diff --git a/Source/3rd Party/wx/src/common/stockitem.cpp b/Source/3rd Party/wx/src/common/stockitem.cpp
index ef86cd3e5..8c1cd480b 100644
--- a/Source/3rd Party/wx/src/common/stockitem.cpp	
+++ b/Source/3rd Party/wx/src/common/stockitem.cpp	
@@ -1,340 +1,278 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/stockitem.cpp
-// Purpose:     Stock buttons, menu and toolbar items labels
-// Author:      Vaclav Slavik
-// Modified by:
-// Created:     2004-08-15
-// RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik, 2004
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/stockitem.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/utils.h" // for wxStripMenuCodes()
-#endif
-
-bool wxIsStockID(wxWindowID id)
-{
-    switch (id)
-    {
-        case wxID_ABOUT:
-        case wxID_ADD:
-        case wxID_APPLY:
-        case wxID_BACKWARD:
-        case wxID_BOLD:
-        case wxID_BOTTOM:
-        case wxID_CANCEL:
-        case wxID_CDROM:
-        case wxID_CLEAR:
-        case wxID_CLOSE:
-        case wxID_CONVERT:
-        case wxID_COPY:
-        case wxID_CUT:
-        case wxID_DELETE:
-        case wxID_DOWN:
-        case wxID_EDIT:
-        case wxID_EXECUTE:
-        case wxID_EXIT:
-        case wxID_FILE:
-        case wxID_FIND:
-        case wxID_FIRST:
-        case wxID_FLOPPY:
-        case wxID_FORWARD:
-        case wxID_HARDDISK:
-        case wxID_HELP:
-        case wxID_HOME:
-        case wxID_INDENT:
-        case wxID_INDEX:
-        case wxID_INFO:
-        case wxID_ITALIC:
-        case wxID_JUMP_TO:
-        case wxID_JUSTIFY_CENTER:
-        case wxID_JUSTIFY_FILL:
-        case wxID_JUSTIFY_LEFT:
-        case wxID_JUSTIFY_RIGHT:
-        case wxID_LAST:
-        case wxID_NETWORK:
-        case wxID_NEW:
-        case wxID_NO:
-        case wxID_OK:
-        case wxID_OPEN:
-        case wxID_PASTE:
-        case wxID_PREFERENCES:
-        case wxID_PREVIEW:
-        case wxID_PRINT:
-        case wxID_PROPERTIES:
-        case wxID_REDO:
-        case wxID_REFRESH:
-        case wxID_REMOVE:
-        case wxID_REPLACE:
-        case wxID_REVERT_TO_SAVED:
-        case wxID_SAVE:
-        case wxID_SAVEAS:
-        case wxID_SELECTALL:
-        case wxID_SELECT_COLOR:
-        case wxID_SELECT_FONT:
-        case wxID_SORT_ASCENDING:
-        case wxID_SORT_DESCENDING:
-        case wxID_SPELL_CHECK:
-        case wxID_STOP:
-        case wxID_STRIKETHROUGH:
-        case wxID_TOP:
-        case wxID_UNDELETE:
-        case wxID_UNDERLINE:
-        case wxID_UNDO:
-        case wxID_UNINDENT:
-        case wxID_UP:
-        case wxID_YES:
-        case wxID_ZOOM_100:
-        case wxID_ZOOM_FIT:
-        case wxID_ZOOM_IN:
-        case wxID_ZOOM_OUT:
-            return true;
-
-        default:
-            return false;
-    }
-}
-
-wxString wxGetStockLabel(wxWindowID id, long flags)
-{
-    wxString stockLabel;
-
-#ifdef __WXMSW__
-    // special case: the "Cancel" button shouldn't have a mnemonic under MSW
-    // for consistency with the native dialogs (which don't use any mnemonic
-    // for it because it is already bound to Esc implicitly)
-    if ( id == wxID_CANCEL )
-        flags &= ~wxSTOCK_WITH_MNEMONIC;
-#endif // __WXMSW__
-
-
-    #define STOCKITEM(stockid, labelWithMnemonic, labelPlain)                 \
-        case stockid:                                                         \
-            if(flags & wxSTOCK_WITH_MNEMONIC)                                 \
-                stockLabel = labelWithMnemonic;                               \
-            else                                                              \
-                stockLabel = labelPlain;                                      \
-            break
-
-    switch (id)
-    {
-        STOCKITEM(wxID_ABOUT,               _("&About"),           _("About"));
-        STOCKITEM(wxID_ADD,                 _("Add"),                 _("Add"));
-        STOCKITEM(wxID_APPLY,               _("&Apply"),              _("Apply"));
-        STOCKITEM(wxID_BACKWARD,            _("&Back"),               _("Back"));
-        STOCKITEM(wxID_BOLD,                _("&Bold"),               _("Bold"));
-        STOCKITEM(wxID_BOTTOM,              _("&Bottom"),             _("Bottom"));
-        STOCKITEM(wxID_CANCEL,              _("&Cancel"),             _("Cancel"));
-        STOCKITEM(wxID_CDROM,               _("&CD-Rom"),             _("CD-Rom"));
-        STOCKITEM(wxID_CLEAR,               _("&Clear"),              _("Clear"));
-        STOCKITEM(wxID_CLOSE,               _("&Close"),              _("Close"));
-        STOCKITEM(wxID_CONVERT,             _("&Convert"),            _("Convert"));
-        STOCKITEM(wxID_COPY,                _("&Copy"),               _("Copy"));
-        STOCKITEM(wxID_CUT,                 _("Cu&t"),                _("Cut"));
-        STOCKITEM(wxID_DELETE,              _("&Delete"),             _("Delete"));
-        STOCKITEM(wxID_DOWN,                _("&Down"),               _("Down"));
-        STOCKITEM(wxID_EDIT,                _("&Edit"),               _("Edit"));
-        STOCKITEM(wxID_EXECUTE,             _("&Execute"),            _("Execute"));
-        STOCKITEM(wxID_EXIT,                _("&Quit"),               _("Quit"));
-        STOCKITEM(wxID_FILE,                _("&File"),               _("File"));
-        STOCKITEM(wxID_FIND,                _("&Find"),               _("Find"));
-        STOCKITEM(wxID_FIRST,               _("&First"),              _("First"));
-        STOCKITEM(wxID_FLOPPY,              _("&Floppy"),             _("Floppy"));
-        STOCKITEM(wxID_FORWARD,             _("&Forward"),            _("Forward"));
-        STOCKITEM(wxID_HARDDISK,            _("&Harddisk"),           _("Harddisk"));
-        STOCKITEM(wxID_HELP,                _("&Help"),               _("Help"));
-        STOCKITEM(wxID_HOME,                _("&Home"),               _("Home"));
-        STOCKITEM(wxID_INDENT,              _("Indent"),              _("Indent"));
-        STOCKITEM(wxID_INDEX,               _("&Index"),              _("Index"));
-        STOCKITEM(wxID_INFO,                _("&Info"),               _("Info"));
-        STOCKITEM(wxID_ITALIC,              _("&Italic"),             _("Italic"));
-        STOCKITEM(wxID_JUMP_TO,             _("&Jump to"),            _("Jump to"));
-        STOCKITEM(wxID_JUSTIFY_CENTER,      _("Centered"),            _("Centered"));
-        STOCKITEM(wxID_JUSTIFY_FILL,        _("Justified"),           _("Justified"));
-        STOCKITEM(wxID_JUSTIFY_LEFT,        _("Align Left"),          _("Align Left"));
-        STOCKITEM(wxID_JUSTIFY_RIGHT,       _("Align Right"),         _("Align Right"));
-        STOCKITEM(wxID_LAST,                _("&Last"),               _("Last"));
-        STOCKITEM(wxID_NETWORK,             _("&Network"),            _("Network"));
-        STOCKITEM(wxID_NEW,                 _("&New"),                _("New"));
-        STOCKITEM(wxID_NO,                  _("&No"),                 _("No"));
-        STOCKITEM(wxID_OK,                  _("&OK"),                 _("OK"));
-        STOCKITEM(wxID_OPEN,                _("&Open..."),            _("Open..."));
-        STOCKITEM(wxID_PASTE,               _("&Paste"),              _("Paste"));
-        STOCKITEM(wxID_PREFERENCES,         _("&Preferences"),        _("Preferences"));
-        STOCKITEM(wxID_PREVIEW,             _("Print previe&w..."),   _("Print preview..."));
-        STOCKITEM(wxID_PRINT,               _("&Print..."),           _("Print..."));
-        STOCKITEM(wxID_PROPERTIES,          _("&Properties"),         _("Properties"));
-        STOCKITEM(wxID_REDO,                _("&Redo"),               _("Redo"));
-        STOCKITEM(wxID_REFRESH,             _("Refresh"),             _("Refresh"));
-        STOCKITEM(wxID_REMOVE,              _("Remove"),              _("Remove"));
-        STOCKITEM(wxID_REPLACE,             _("Rep&lace"),            _("Replace"));
-        STOCKITEM(wxID_REVERT_TO_SAVED,     _("Revert to Saved"),     _("Revert to Saved"));
-        STOCKITEM(wxID_SAVE,                _("&Save"),               _("Save"));
-        STOCKITEM(wxID_SAVEAS,              _("&Save as"),            _("Save as"));
-        STOCKITEM(wxID_SELECTALL,           _("Select &All"),         _("Select All"));
-        STOCKITEM(wxID_SELECT_COLOR,        _("&Color"),              _("Color"));
-        STOCKITEM(wxID_SELECT_FONT,         _("&Font"),               _("Font"));
-        STOCKITEM(wxID_SORT_ASCENDING,      _("&Ascending"),          _("Ascending"));
-        STOCKITEM(wxID_SORT_DESCENDING,     _("&Descending"),         _("Descending"));
-        STOCKITEM(wxID_SPELL_CHECK,         _("&Spell Check"),        _("Spell Check"));
-        STOCKITEM(wxID_STOP,                _("&Stop"),               _("Stop"));
-        STOCKITEM(wxID_STRIKETHROUGH,       _("&Strikethrough"),      _("Strikethrough"));
-        STOCKITEM(wxID_TOP,                 _("&Top"),                _("Top"));
-        STOCKITEM(wxID_UNDELETE,            _("Undelete"),            _("Undelete"));
-        STOCKITEM(wxID_UNDERLINE,           _("&Underline"),          _("Underline"));
-        STOCKITEM(wxID_UNDO,                _("&Undo"),               _("Undo"));
-        STOCKITEM(wxID_UNINDENT,            _("&Unindent"),           _("Unindent"));
-        STOCKITEM(wxID_UP,                  _("&Up"),                 _("Up"));
-        STOCKITEM(wxID_YES,                 _("&Yes"),                _("Yes"));
-        STOCKITEM(wxID_ZOOM_100,            _("&Actual Size"),        _("Actual Size"));
-        STOCKITEM(wxID_ZOOM_FIT,            _("Zoom to &Fit"),        _("Zoom to Fit"));
-        STOCKITEM(wxID_ZOOM_IN,             _("Zoom &In"),            _("Zoom In"));
-        STOCKITEM(wxID_ZOOM_OUT,            _("Zoom &Out"),           _("Zoom Out"));
-
-        default:
-            wxFAIL_MSG( wxT("invalid stock item ID") );
-            break;
-    };
-
-    #undef STOCKITEM
-
-    if ( flags & wxSTOCK_WITHOUT_ELLIPSIS )
-    {
-        wxString baseLabel;
-        if ( stockLabel.EndsWith("...", &baseLabel) )
-            stockLabel = baseLabel;
-
-        // accelerators only make sense for the menu items which should have
-        // ellipsis too while wxSTOCK_WITHOUT_ELLIPSIS is mostly useful for
-        // buttons which shouldn't have accelerators in their labels
-        wxASSERT_MSG( !(flags & wxSTOCK_WITH_ACCELERATOR),
-                        "labels without ellipsis shouldn't use accelerators" );
-    }
-
-#if wxUSE_ACCEL
-    if ( !stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR) )
-    {
-        wxAcceleratorEntry accel = wxGetStockAccelerator(id);
-        if (accel.IsOk())
-            stockLabel << wxT('\t') << accel.ToString();
-    }
-#endif // wxUSE_ACCEL
-
-    return stockLabel;
-}
-
-wxString wxGetStockHelpString(wxWindowID id, wxStockHelpStringClient client)
-{
-    wxString stockHelp;
-
-    #define STOCKITEM(stockid, ctx, helpstr)             \
-        case stockid:                                    \
-            if (client==ctx) stockHelp = helpstr;        \
-            break;
-
-    switch (id)
-    {
-        // NB: these help string should be not too specific as they could be used
-        //     in completely different programs!
-        STOCKITEM(wxID_ABOUT,    wxSTOCK_MENU, _("Show about dialog"))
-        STOCKITEM(wxID_COPY,     wxSTOCK_MENU, _("Copy selection"))
-        STOCKITEM(wxID_CUT,      wxSTOCK_MENU, _("Cut selection"))
-        STOCKITEM(wxID_DELETE,   wxSTOCK_MENU, _("Delete selection"))
-        STOCKITEM(wxID_REPLACE,  wxSTOCK_MENU, _("Replace selection"))
-        STOCKITEM(wxID_PASTE,    wxSTOCK_MENU, _("Paste selection"))
-        STOCKITEM(wxID_EXIT,     wxSTOCK_MENU, _("Quit this program"))
-        STOCKITEM(wxID_REDO,     wxSTOCK_MENU, _("Redo last action"))
-        STOCKITEM(wxID_UNDO,     wxSTOCK_MENU, _("Undo last action"))
-        STOCKITEM(wxID_CLOSE,    wxSTOCK_MENU, _("Close current document"))
-        STOCKITEM(wxID_SAVE,     wxSTOCK_MENU, _("Save current document"))
-        STOCKITEM(wxID_SAVEAS,   wxSTOCK_MENU, _("Save current document with a different filename"))
-
-        default:
-            // there's no stock help string for this ID / client
-            return wxEmptyString;
-    }
-
-    #undef STOCKITEM
-
-    return stockHelp;
-}
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
-{
-    wxAcceleratorEntry ret;
-
-    #define STOCKITEM(stockid, flags, keycode)      \
-        case stockid:                               \
-            ret.Set(flags, keycode, stockid);       \
-            break;
-
-    switch (id)
-    {
-        STOCKITEM(wxID_COPY,                wxACCEL_CTRL,'C')
-        STOCKITEM(wxID_CUT,                 wxACCEL_CTRL,'X')
-        STOCKITEM(wxID_FIND,                wxACCEL_CTRL,'F')
-        STOCKITEM(wxID_HELP,                wxACCEL_CTRL,'H')
-        STOCKITEM(wxID_NEW,                 wxACCEL_CTRL,'N')
-        STOCKITEM(wxID_OPEN,                wxACCEL_CTRL,'O')
-        STOCKITEM(wxID_PASTE,               wxACCEL_CTRL,'V')
-        STOCKITEM(wxID_PRINT,               wxACCEL_CTRL,'P')
-        STOCKITEM(wxID_REDO,                wxACCEL_CTRL | wxACCEL_SHIFT,'Z')
-        STOCKITEM(wxID_REPLACE,             wxACCEL_CTRL,'R')
-        STOCKITEM(wxID_SAVE,                wxACCEL_CTRL,'S')
-        STOCKITEM(wxID_UNDO,                wxACCEL_CTRL,'Z')
-#ifdef __WXOSX__
-        STOCKITEM(wxID_PREFERENCES,         wxACCEL_CTRL,',')
-#endif
-
-        default:
-            // set the wxAcceleratorEntry to return into an invalid state:
-            // there's no stock accelerator for that.
-            ret.Set(0, 0, id);
-            break;
-    };
-
-    #undef STOCKITEM
-
-    // always use wxAcceleratorEntry::IsOk on returned value !
-    return ret;
-}
-
-#endif // wxUSE_ACCEL
-
-bool wxIsStockLabel(wxWindowID id, const wxString& label)
-{
-    if (label.empty())
-        return true;
-
-    wxString stock = wxGetStockLabel(id);
-
-    if (label == stock)
-        return true;
-
-    stock.Replace(wxT("&"), wxEmptyString);
-    if (label == stock)
-        return true;
-
-    return false;
-}
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/stockitem.cpp
+// Purpose:     Stock buttons, menu and toolbar items labels
+// Author:      Vaclav Slavik
+// Modified by:
+// Created:     2004-08-15
+// RCS-ID:      $Id: stockitem.cpp 58617 2009-02-02 05:12:43Z SC $
+// Copyright:   (c) Vaclav Slavik, 2004
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/stockitem.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/utils.h" // for wxStripMenuCodes()
+#endif
+
+bool wxIsStockID(wxWindowID id)
+{
+    switch (id)
+    {
+        case wxID_ABOUT:
+        case wxID_ADD:
+        case wxID_APPLY:
+        case wxID_BOLD:
+        case wxID_CANCEL:
+        case wxID_CLEAR:
+        case wxID_CLOSE:
+        case wxID_COPY:
+        case wxID_CUT:
+        case wxID_DELETE:
+        case wxID_EDIT:
+        case wxID_FIND:
+        case wxID_FILE:
+        case wxID_REPLACE:
+        case wxID_BACKWARD:
+        case wxID_DOWN:
+        case wxID_FORWARD:
+        case wxID_UP:
+        case wxID_HELP:
+        case wxID_HOME:
+        case wxID_INDENT:
+        case wxID_INDEX:
+        case wxID_ITALIC:
+        case wxID_JUSTIFY_CENTER:
+        case wxID_JUSTIFY_FILL:
+        case wxID_JUSTIFY_LEFT:
+        case wxID_JUSTIFY_RIGHT:
+        case wxID_NEW:
+        case wxID_NO:
+        case wxID_OK:
+        case wxID_OPEN:
+        case wxID_PASTE:
+        case wxID_PREFERENCES:
+        case wxID_PRINT:
+        case wxID_PREVIEW:
+        case wxID_PROPERTIES:
+        case wxID_EXIT:
+        case wxID_REDO:
+        case wxID_REFRESH:
+        case wxID_REMOVE:
+        case wxID_REVERT_TO_SAVED:
+        case wxID_SAVE:
+        case wxID_SAVEAS:
+        case wxID_SELECTALL:
+        case wxID_STOP:
+        case wxID_UNDELETE:
+        case wxID_UNDERLINE:
+        case wxID_UNDO:
+        case wxID_UNINDENT:
+        case wxID_YES:
+        case wxID_ZOOM_100:
+        case wxID_ZOOM_FIT:
+        case wxID_ZOOM_IN:
+        case wxID_ZOOM_OUT:
+            return true;
+
+        default:
+            return false;
+    }
+}
+
+wxString wxGetStockLabel(wxWindowID id, long flags)
+{
+    wxString stockLabel;
+
+    #define STOCKITEM(stockid, label) \
+        case stockid:                 \
+            stockLabel = label;       \
+            break;
+
+    switch (id)
+    {
+        STOCKITEM(wxID_ABOUT,               _("&About"))
+        STOCKITEM(wxID_ADD,                 _("Add"))
+        STOCKITEM(wxID_APPLY,               _("&Apply"))
+        STOCKITEM(wxID_BOLD,                _("&Bold"))
+        STOCKITEM(wxID_CANCEL,              _("&Cancel"))
+        STOCKITEM(wxID_CLEAR,               _("&Clear"))
+        STOCKITEM(wxID_CLOSE,               _("&Close"))
+        STOCKITEM(wxID_COPY,                _("&Copy"))
+        STOCKITEM(wxID_CUT,                 _("Cu&t"))
+        STOCKITEM(wxID_DELETE,              _("&Delete"))
+        STOCKITEM(wxID_EDIT,                _("&Edit"))
+        STOCKITEM(wxID_FIND,                _("&Find"))
+        STOCKITEM(wxID_FILE,                _("&File"))
+        STOCKITEM(wxID_REPLACE,             _("Rep&lace"))
+        STOCKITEM(wxID_BACKWARD,            _("&Back"))
+        STOCKITEM(wxID_DOWN,                _("&Down"))
+        STOCKITEM(wxID_FORWARD,             _("&Forward"))
+        STOCKITEM(wxID_UP,                  _("&Up"))
+        STOCKITEM(wxID_HELP,                _("&Help"))
+        STOCKITEM(wxID_HOME,                _("&Home"))
+        STOCKITEM(wxID_INDENT,              _("Indent"))
+        STOCKITEM(wxID_INDEX,               _("&Index"))
+        STOCKITEM(wxID_ITALIC,              _("&Italic"))
+        STOCKITEM(wxID_JUSTIFY_CENTER,      _("Centered"))
+        STOCKITEM(wxID_JUSTIFY_FILL,        _("Justified"))
+        STOCKITEM(wxID_JUSTIFY_LEFT,        _("Align Left"))
+        STOCKITEM(wxID_JUSTIFY_RIGHT,       _("Align Right"))
+        STOCKITEM(wxID_NEW,                 _("&New"))
+        STOCKITEM(wxID_NO,                  _("&No"))
+        STOCKITEM(wxID_OK,                  _("&OK"))
+        STOCKITEM(wxID_OPEN,                _("&Open"))
+        STOCKITEM(wxID_PASTE,               _("&Paste"))
+        STOCKITEM(wxID_PREFERENCES,         _("&Preferences"))
+        STOCKITEM(wxID_PRINT,               _("&Print"))
+        STOCKITEM(wxID_PREVIEW,             _("Print previe&w"))
+        STOCKITEM(wxID_PROPERTIES,          _("&Properties"))
+        STOCKITEM(wxID_EXIT,                _("&Quit"))
+        STOCKITEM(wxID_REDO,                _("&Redo"))
+        STOCKITEM(wxID_REFRESH,             _("Refresh"))
+        STOCKITEM(wxID_REMOVE,              _("Remove"))
+        STOCKITEM(wxID_REVERT_TO_SAVED,     _("Revert to Saved"))
+        STOCKITEM(wxID_SAVE,                _("&Save"))
+        STOCKITEM(wxID_SAVEAS,              _("Save &As..."))
+        STOCKITEM(wxID_SELECTALL,           _("Select all"))
+        STOCKITEM(wxID_STOP,                _("&Stop"))
+        STOCKITEM(wxID_UNDELETE,            _("Undelete"))
+        STOCKITEM(wxID_UNDERLINE,           _("&Underline"))
+        STOCKITEM(wxID_UNDO,                _("&Undo"))
+        STOCKITEM(wxID_UNINDENT,            _("&Unindent"))
+        STOCKITEM(wxID_YES,                 _("&Yes"))
+        STOCKITEM(wxID_ZOOM_100,            _("&Actual Size"))
+        STOCKITEM(wxID_ZOOM_FIT,            _("Zoom to &Fit"))
+        STOCKITEM(wxID_ZOOM_IN,             _("Zoom &In"))
+        STOCKITEM(wxID_ZOOM_OUT,            _("Zoom &Out"))
+
+        default:
+            wxFAIL_MSG( _T("invalid stock item ID") );
+            break;
+    };
+
+    #undef STOCKITEM
+
+    if ( !(flags & wxSTOCK_WITH_MNEMONIC) )
+    {
+        stockLabel = wxStripMenuCodes(stockLabel);
+    }
+
+#if wxUSE_ACCEL
+    if ( !stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR) )
+    {
+        wxAcceleratorEntry accel = wxGetStockAccelerator(id);
+        if (accel.IsOk())
+            stockLabel << _T('\t') << accel.ToString();
+    }
+#endif // wxUSE_ACCEL
+
+    return stockLabel;
+}
+
+wxString wxGetStockHelpString(wxWindowID id, wxStockHelpStringClient client)
+{
+    wxString stockHelp;
+
+    #define STOCKITEM(stockid, ctx, helpstr)             \
+        case stockid:                                    \
+            if (client==ctx) stockHelp = helpstr;        \
+            break;
+
+    switch (id)
+    {
+        // NB: these help string should be not too specific as they could be used
+        //     in completely different programs!
+        STOCKITEM(wxID_ABOUT,    wxSTOCK_MENU, _("Show about dialog"))
+        STOCKITEM(wxID_COPY,     wxSTOCK_MENU, _("Copy selection"))
+        STOCKITEM(wxID_CUT,      wxSTOCK_MENU, _("Cut selection"))
+        STOCKITEM(wxID_DELETE,   wxSTOCK_MENU, _("Delete selection"))
+        STOCKITEM(wxID_REPLACE,  wxSTOCK_MENU, _("Replace selection"))
+        STOCKITEM(wxID_PASTE,    wxSTOCK_MENU, _("Paste selection"))
+        STOCKITEM(wxID_EXIT,     wxSTOCK_MENU, _("Quit this program"))
+        STOCKITEM(wxID_REDO,     wxSTOCK_MENU, _("Redo last action"))
+        STOCKITEM(wxID_UNDO,     wxSTOCK_MENU, _("Undo last action"))
+        STOCKITEM(wxID_CLOSE,    wxSTOCK_MENU, _("Close current document"))
+        STOCKITEM(wxID_SAVE,     wxSTOCK_MENU, _("Save current document"))
+        STOCKITEM(wxID_SAVEAS,   wxSTOCK_MENU, _("Save current document with a different filename"))
+
+        default:
+            // there's no stock help string for this ID / client
+            return wxEmptyString;
+    }
+
+    #undef STOCKITEM
+
+    return stockHelp;
+}
+
+#if wxUSE_ACCEL
+
+wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
+{
+    wxAcceleratorEntry ret;
+
+    #define STOCKITEM(stockid, flags, keycode)      \
+        case stockid:                               \
+            ret.Set(flags, keycode, stockid);       \
+            break;
+
+    switch (id)
+    {
+        STOCKITEM(wxID_COPY,                wxACCEL_CMD,'C')
+        STOCKITEM(wxID_CUT,                 wxACCEL_CMD,'X')
+        STOCKITEM(wxID_FIND,                wxACCEL_CMD,'F')
+        STOCKITEM(wxID_REPLACE,             wxACCEL_CMD,'R')
+        STOCKITEM(wxID_HELP,                wxACCEL_CMD,'H')
+        STOCKITEM(wxID_NEW,                 wxACCEL_CMD,'N')
+        STOCKITEM(wxID_OPEN,                wxACCEL_CMD,'O')
+        STOCKITEM(wxID_PASTE,               wxACCEL_CMD,'V')
+        STOCKITEM(wxID_SAVE,                wxACCEL_CMD,'S')
+
+        default:
+            // set the wxAcceleratorEntry to return into an invalid state:
+            // there's no stock accelerator for that.
+            ret.Set(0, 0, id);
+            break;
+    };
+
+    #undef STOCKITEM
+
+    // always use wxAcceleratorEntry::IsOk on returned value !
+    return ret;
+}
+
+#endif // wxUSE_ACCEL
+
+bool wxIsStockLabel(wxWindowID id, const wxString& label)
+{
+    if (label.empty())
+        return true;
+
+    wxString stock = wxGetStockLabel(id);
+
+    if (label == stock)
+        return true;
+
+    stock.Replace(_T("&"), wxEmptyString);
+    if (label == stock)
+        return true;
+
+    return false;
+}
diff --git a/Source/3rd Party/wx/src/common/stopwatch.cpp b/Source/3rd Party/wx/src/common/stopwatch.cpp
index 7a83051b2..eefbae7e9 100644
--- a/Source/3rd Party/wx/src/common/stopwatch.cpp	
+++ b/Source/3rd Party/wx/src/common/stopwatch.cpp	
@@ -1,192 +1,372 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/stopwatch.cpp
-// Purpose:     wxStopWatch and other non-GUI stuff from wx/timer.h
-// Author:
-//    Original version by Julian Smart
-//    Vadim Zeitlin got rid of all ifdefs (11.12.99)
-//    Sylvain Bougnoux added wxStopWatch class
-//    Guillermo Rodriguez <guille@iies.es> rewrote from scratch (Dic/99)
-// Modified by:
-// Created:     20.06.2003 (extracted from common/timercmn.cpp)
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998-2003 wxWidgets Team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/stopwatch.h"
-
-#if wxUSE_STOPWATCH
-
-#ifndef WX_PRECOMP
-    #ifdef __WINDOWS__
-        #include "wx/msw/wrapwin.h"
-    #endif
-    #include "wx/log.h"
-    #include "wx/thread.h"
-#endif //WX_PRECOMP
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxStopWatch
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-#ifdef __WINDOWS__
-
-struct PerfCounter
-{
-    PerfCounter()
-    {
-        init = false;
-    }
-
-    bool CanBeUsed() const
-    {
-        return freq.QuadPart != 0;
-    }
-
-    wxCRIT_SECT_DECLARE_MEMBER(cs);
-    LARGE_INTEGER freq;
-    bool init;
-} gs_perfCounter;
-
-#endif // __WINDOWS__
-
-const int MILLISECONDS_PER_SECOND = 1000;
-const int MICROSECONDS_PER_MILLISECOND = 1000;
-const int MICROSECONDS_PER_SECOND = 1000*1000;
-
-} // anonymous namespace
-
-void wxStopWatch::DoStart()
-{
-#ifdef __WINDOWS__
-    if ( !gs_perfCounter.init )
-    {
-        wxCRIT_SECT_LOCKER(lock, gs_perfCounter.cs);
-        ::QueryPerformanceFrequency(&gs_perfCounter.freq);
-
-        // Just a sanity check: it's not supposed to happen but verify that
-        // ::QueryPerformanceCounter() succeeds so that we can really use it.
-        LARGE_INTEGER counter;
-        if ( !::QueryPerformanceCounter(&counter) )
-        {
-            wxLogDebug("QueryPerformanceCounter() unexpected failed (%s), "
-                       "will not use it.", wxSysErrorMsg());
-
-            gs_perfCounter.freq.QuadPart = 0;
-        }
-
-        gs_perfCounter.init = true;
-    }
-#endif // __WINDOWS__
-
-    m_t0 = GetCurrentClockValue();
-}
-
-wxLongLong wxStopWatch::GetClockFreq() const
-{
-#ifdef __WINDOWS__
-    // Under MSW we use the high resolution performance counter timer which has
-    // its own frequency (usually related to the CPU clock speed).
-    if ( gs_perfCounter.CanBeUsed() )
-        return gs_perfCounter.freq.QuadPart;
-#endif // __WINDOWS__
-
-#ifdef HAVE_GETTIMEOFDAY
-    // With gettimeofday() we can have nominally microsecond precision and
-    // while this is not the case in practice, it's still better than
-    // millisecond.
-    return MICROSECONDS_PER_SECOND;
-#else // !HAVE_GETTIMEOFDAY
-    // Currently milliseconds are used everywhere else.
-    return MILLISECONDS_PER_SECOND;
-#endif // HAVE_GETTIMEOFDAY/!HAVE_GETTIMEOFDAY
-}
-
-void wxStopWatch::Start(long t0)
-{
-    // Calling Start() makes the stop watch run however many times it was
-    // paused before.
-    m_pauseCount = 0;
-
-    DoStart();
-
-    m_t0 -= (wxLongLong(t0)*GetClockFreq())/MILLISECONDS_PER_SECOND;
-}
-
-wxLongLong wxStopWatch::GetCurrentClockValue() const
-{
-#ifdef __WINDOWS__
-    if ( gs_perfCounter.CanBeUsed() )
-    {
-        LARGE_INTEGER counter;
-        ::QueryPerformanceCounter(&counter);
-        return counter.QuadPart;
-    }
-#endif // __WINDOWS__
-
-#ifdef HAVE_GETTIMEOFDAY
-    return wxGetUTCTimeUSec();
-#else // !HAVE_GETTIMEOFDAY
-    return wxGetUTCTimeMillis();
-#endif // HAVE_GETTIMEOFDAY/!HAVE_GETTIMEOFDAY
-}
-
-wxLongLong wxStopWatch::TimeInMicro() const
-{
-    const wxLongLong elapsed(m_pauseCount ? m_elapsedBeforePause
-                                          : GetCurrentClockValue() - m_t0);
-
-    return (elapsed*MICROSECONDS_PER_SECOND)/GetClockFreq();
-}
-
-#endif // wxUSE_STOPWATCH
-
-// ----------------------------------------------------------------------------
-// old timer functions superceded by wxStopWatch
-// ----------------------------------------------------------------------------
-
-#if wxUSE_LONGLONG
-
-static wxLongLong wxStartTime = 0l;
-
-// starts the global timer
-void wxStartTimer()
-{
-    wxStartTime = wxGetUTCTimeMillis();
-}
-
-// Returns elapsed time in milliseconds
-long wxGetElapsedTime(bool resetTimer)
-{
-    wxLongLong oldTime = wxStartTime;
-    wxLongLong newTime = wxGetUTCTimeMillis();
-
-    if ( resetTimer )
-        wxStartTime = newTime;
-
-    return (newTime - oldTime).GetLo();
-}
-
-#endif // wxUSE_LONGLONG
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/stopwatch.cpp
+// Purpose:     wxStopWatch and other non-GUI stuff from wx/timer.h
+// Author:
+//    Original version by Julian Smart
+//    Vadim Zeitlin got rid of all ifdefs (11.12.99)
+//    Sylvain Bougnoux added wxStopWatch class
+//    Guillermo Rodriguez <guille@iies.es> rewrote from scratch (Dic/99)
+// Modified by:
+// Created:     20.06.2003 (extracted from common/timercmn.cpp)
+// RCS-ID:      $Id: stopwatch.cpp 41054 2006-09-07 19:01:45Z ABX $
+// Copyright:   (c) 1998-2003 wxWidgets Team
+// License:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/stopwatch.h"
+
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif //WX_PRECOMP
+
+// ----------------------------------------------------------------------------
+// System headers
+// ----------------------------------------------------------------------------
+
+#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
+    #define HAVE_FTIME
+#endif
+
+#if defined(__VISAGECPP__) && !defined(HAVE_FTIME)
+    #define HAVE_FTIME
+#  if __IBMCPP__ >= 400
+    #  define ftime(x) _ftime(x)
+#  endif
+#endif
+
+#if defined(__MWERKS__) && defined(__WXMSW__)
+#   undef HAVE_FTIME
+#   undef HAVE_GETTIMEOFDAY
+#endif
+
+#ifndef __WXWINCE__
+#include <time.h>
+#else
+#include "wx/msw/private.h"
+#include "wx/msw/wince/time.h"
+#endif
+
+#if !defined(__WXMAC__) && !defined(__WXWINCE__)
+    #include <sys/types.h>      // for time_t
+#endif
+
+#if defined(HAVE_GETTIMEOFDAY)
+    #include <sys/time.h>
+    #include <unistd.h>
+#elif defined(HAVE_FTIME)
+    #include <sys/timeb.h>
+#endif
+
+#ifdef __WXMAC__
+#ifndef __DARWIN__
+    #include <Timer.h>
+    #include <DriverServices.h>
+#else
+    #include <Carbon/Carbon.h>
+#endif
+#endif
+
+#ifdef __WXPALMOS__
+    #include <DateTime.h>
+    #include <TimeMgr.h>
+    #include <SystemMgr.h>
+#endif
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// on some really old systems gettimeofday() doesn't have the second argument,
+// define wxGetTimeOfDay() to hide this difference
+#ifdef HAVE_GETTIMEOFDAY
+    #ifdef WX_GETTIMEOFDAY_NO_TZ
+        struct timezone;
+        #define wxGetTimeOfDay(tv, tz)      gettimeofday(tv)
+    #else
+        #define wxGetTimeOfDay(tv, tz)      gettimeofday((tv), (tz))
+    #endif
+#endif // HAVE_GETTIMEOFDAY
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxStopWatch
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STOPWATCH
+
+void wxStopWatch::Start(long t)
+{
+#if 0
+// __WXMSW__
+    LARGE_INTEGER frequency_li;
+    ::QueryPerformanceFrequency( &frequency_li );
+    m_frequency = frequency_li.QuadPart;
+    if (m_frequency == 0)
+    {
+        m_t0 = wxGetLocalTimeMillis() - t;
+    }
+    else
+    {
+        LARGE_INTEGER counter_li;
+        ::QueryPerformanceCounter( &counter_li );
+        wxLongLong counter = counter_li.QuadPart;
+        m_t0 = (counter * 10000 / m_frequency) - t*10;
+    }
+#else
+    m_t0 = wxGetLocalTimeMillis() - t;
+#endif
+    m_pause = 0;
+    m_pauseCount = 0;
+}
+
+long wxStopWatch::GetElapsedTime() const
+{
+#if 0
+//__WXMSW__
+    if (m_frequency == 0)
+    {
+        return (wxGetLocalTimeMillis() - m_t0).GetLo();
+    }
+    else
+    {
+        LARGE_INTEGER counter_li;
+        ::QueryPerformanceCounter( &counter_li );
+        wxLongLong counter = counter_li.QuadPart;
+        wxLongLong res = (counter * 10000 / m_frequency) - m_t0;
+        return res.GetLo() / 10;
+    }
+#else
+    return (wxGetLocalTimeMillis() - m_t0).GetLo();
+#endif
+}
+
+long wxStopWatch::Time() const
+{
+    return m_pauseCount ? m_pause : GetElapsedTime();
+}
+
+#endif // wxUSE_STOPWATCH
+
+// ----------------------------------------------------------------------------
+// old timer functions superceded by wxStopWatch
+// ----------------------------------------------------------------------------
+
+#if wxUSE_LONGLONG
+
+static wxLongLong wxStartTime = 0l;
+
+// starts the global timer
+void wxStartTimer()
+{
+    wxStartTime = wxGetLocalTimeMillis();
+}
+
+// Returns elapsed time in milliseconds
+long wxGetElapsedTime(bool resetTimer)
+{
+    wxLongLong oldTime = wxStartTime;
+    wxLongLong newTime = wxGetLocalTimeMillis();
+
+    if ( resetTimer )
+        wxStartTime = newTime;
+
+    return (newTime - oldTime).GetLo();
+}
+
+#endif // wxUSE_LONGLONG
+
+// ----------------------------------------------------------------------------
+// the functions to get the current time and timezone info
+// ----------------------------------------------------------------------------
+
+// Get local time as seconds since 00:00:00, Jan 1st 1970
+long wxGetLocalTime()
+{
+    struct tm tm;
+    time_t t0, t1;
+
+    // This cannot be made static because mktime can overwrite it.
+    //
+    memset(&tm, 0, sizeof(tm));
+    tm.tm_year  = 70;
+    tm.tm_mon   = 0;
+    tm.tm_mday  = 5;        // not Jan 1st 1970 due to mktime 'feature'
+    tm.tm_hour  = 0;
+    tm.tm_min   = 0;
+    tm.tm_sec   = 0;
+    tm.tm_isdst = -1;       // let mktime guess
+
+    // Note that mktime assumes that the struct tm contains local time.
+    //
+    t1 = time(&t1);         // now
+    t0 = mktime(&tm);       // origin
+
+    // Return the difference in seconds.
+    //
+    if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
+        return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
+
+    wxLogSysError(_("Failed to get the local system time"));
+    return -1;
+}
+
+// Get UTC time as seconds since 00:00:00, Jan 1st 1970
+long wxGetUTCTime()
+{
+    return (long)time(NULL);
+}
+
+#if wxUSE_LONGLONG
+
+// Get local time as milliseconds since 00:00:00, Jan 1st 1970
+wxLongLong wxGetLocalTimeMillis()
+{
+    wxLongLong val = 1000l;
+
+    // If possible, use a function which avoids conversions from
+    // broken-up time structures to milliseconds
+
+#if defined(__WXPALMOS__)
+    DateTimeType thenst;
+    thenst.second  = 0;
+    thenst.minute  = 0;
+    thenst.hour    = 0;
+    thenst.day     = 1;
+    thenst.month   = 1;
+    thenst.year    = 1970;
+    thenst.weekDay = 5;
+    uint32_t now = TimGetSeconds();
+    uint32_t then = TimDateTimeToSeconds (&thenst);
+    return SysTimeToMilliSecs(SysTimeInSecs(now - then));
+#elif defined(__WXMSW__) && (defined(__WINE__) || defined(__MWERKS__))
+    // This should probably be the way all WXMSW compilers should do it
+    // Go direct to the OS for time
+
+    SYSTEMTIME thenst = { 1970, 1, 4, 1, 0, 0, 0, 0 };  // 00:00:00 Jan 1st 1970
+    FILETIME thenft;
+    SystemTimeToFileTime( &thenst, &thenft );
+    wxLongLong then( thenft.dwHighDateTime, thenft.dwLowDateTime );   // time in 100 nanoseconds
+
+    SYSTEMTIME nowst;
+    GetLocalTime( &nowst );
+    FILETIME nowft;
+    SystemTimeToFileTime( &nowst, &nowft );
+    wxLongLong now( nowft.dwHighDateTime, nowft.dwLowDateTime );   // time in 100 nanoseconds
+
+    return ( now - then ) / 10000.0;  // time from 00:00:00 Jan 1st 1970 to now in milliseconds
+
+#elif defined(HAVE_GETTIMEOFDAY)
+    struct timeval tp;
+    if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
+    {
+        val *= tp.tv_sec;
+        return (val + (tp.tv_usec / 1000));
+    }
+    else
+    {
+        wxLogError(_("wxGetTimeOfDay failed."));
+        return 0;
+    }
+#elif defined(HAVE_FTIME)
+    struct timeb tp;
+
+    // ftime() is void and not int in some mingw32 headers, so don't
+    // test the return code (well, it shouldn't fail anyhow...)
+    (void)::ftime(&tp);
+    val *= tp.time;
+    return (val + tp.millitm);
+#elif defined(__WXMAC__)
+
+    static UInt64 gMilliAtStart = 0;
+
+    Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() );
+
+    if ( gMilliAtStart == 0 )
+    {
+        time_t start = time(NULL);
+        gMilliAtStart = ((UInt64) start) * 1000000L;
+        gMilliAtStart -= upTime.lo / 1000 ;
+        gMilliAtStart -= ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000);
+    }
+
+    UInt64 millival = gMilliAtStart;
+    millival += upTime.lo / (1000 * 1000);
+    millival += ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000);
+    val = millival;
+
+    return val;
+#else // no gettimeofday() nor ftime()
+    // We use wxGetLocalTime() to get the seconds since
+    // 00:00:00 Jan 1st 1970 and then whatever is available
+    // to get millisecond resolution.
+    //
+    // NOTE that this might lead to a problem if the clocks
+    // use different sources, so this approach should be
+    // avoided where possible.
+
+    val *= wxGetLocalTime();
+
+// GRG: This will go soon as all WIN32 seem to have ftime
+// JACS: unfortunately not. WinCE doesn't have it.
+#if defined (__WIN32__)
+    // If your platform/compiler needs to use two different functions
+    // to get ms resolution, please do NOT just shut off these warnings,
+    // drop me a line instead at <guille@iies.es>
+
+    // FIXME
+#ifndef __WXWINCE__
+    #warning "Possible clock skew bug in wxGetLocalTimeMillis()!"
+#endif
+
+    SYSTEMTIME st;
+    ::GetLocalTime(&st);
+    val += st.wMilliseconds;
+#else // !Win32
+    // If your platform/compiler does not support ms resolution please
+    // do NOT just shut off these warnings, drop me a line instead at
+    // <guille@iies.es>
+
+    #if defined(__VISUALC__) || defined (__WATCOMC__)
+        #pragma message("wxStopWatch will be up to second resolution!")
+    #elif defined(__BORLANDC__)
+        #pragma message "wxStopWatch will be up to second resolution!"
+    #else
+        #warning "wxStopWatch will be up to second resolution!"
+    #endif // compiler
+#endif
+
+    return val;
+
+#endif // time functions
+}
+
+#else // !wxUSE_LONGLONG
+
+double wxGetLocalTimeMillis(void)
+{
+    return (double(clock()) / double(CLOCKS_PER_SEC)) * 1000.0;
+}
+
+#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG
diff --git a/Source/3rd Party/wx/src/common/strconv.cpp b/Source/3rd Party/wx/src/common/strconv.cpp
index 872f323ea..102462916 100644
--- a/Source/3rd Party/wx/src/common/strconv.cpp	
+++ b/Source/3rd Party/wx/src/common/strconv.cpp	
@@ -1,3470 +1,3742 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/strconv.cpp
-// Purpose:     Unicode conversion classes
-// Author:      Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik,
-//              Ryan Norton, Fredrik Roubert (UTF7)
-// Modified by:
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
-//              (c) 2000-2003 Vadim Zeitlin
-//              (c) 2004 Ryan Norton, Fredrik Roubert
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/hashmap.h"
-#endif
-
-#include "wx/strconv.h"
-
-#ifndef __WXWINCE__
-#include <errno.h>
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
-    #include "wx/msw/private.h"
-    #include "wx/msw/missing.h"
-    #define wxHAVE_WIN32_MB2WC
-#endif
-
-#ifdef HAVE_ICONV
-    #include <iconv.h>
-    #include "wx/thread.h"
-#endif
-
-#include "wx/encconv.h"
-#include "wx/fontmap.h"
-
-#ifdef __DARWIN__
-#include "wx/osx/core/private/strconv_cf.h"
-#endif //def __DARWIN__
-
-
-#define TRACE_STRCONV wxT("strconv")
-
-// WC_UTF16 is defined only if sizeof(wchar_t) == 2, otherwise it's supposed to
-// be 4 bytes
-#if SIZEOF_WCHAR_T == 2
-    #define WC_UTF16
-#endif
-
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// helper function of cMB2WC(): check if n bytes at this location are all NUL
-static bool NotAllNULs(const char *p, size_t n)
-{
-    while ( n && *p++ == '\0' )
-        n--;
-
-    return n != 0;
-}
-
-// ----------------------------------------------------------------------------
-// UTF-16 en/decoding to/from UCS-4 with surrogates handling
-// ----------------------------------------------------------------------------
-
-static size_t encode_utf16(wxUint32 input, wxUint16 *output)
-{
-    if (input <= 0xffff)
-    {
-        if (output)
-            *output = (wxUint16) input;
-
-        return 1;
-    }
-    else if (input >= 0x110000)
-    {
-        return wxCONV_FAILED;
-    }
-    else
-    {
-        if (output)
-        {
-            *output++ = (wxUint16) ((input >> 10) + 0xd7c0);
-            *output = (wxUint16) ((input & 0x3ff) + 0xdc00);
-        }
-
-        return 2;
-    }
-}
-
-static size_t decode_utf16(const wxUint16* input, wxUint32& output)
-{
-    if ((*input < 0xd800) || (*input > 0xdfff))
-    {
-        output = *input;
-        return 1;
-    }
-    else if ((input[1] < 0xdc00) || (input[1] > 0xdfff))
-    {
-        output = *input;
-        return wxCONV_FAILED;
-    }
-    else
-    {
-        output = ((input[0] - 0xd7c0) << 10) + (input[1] - 0xdc00);
-        return 2;
-    }
-}
-
-#ifdef WC_UTF16
-    typedef wchar_t wxDecodeSurrogate_t;
-#else // !WC_UTF16
-    typedef wxUint16 wxDecodeSurrogate_t;
-#endif // WC_UTF16/!WC_UTF16
-
-// returns the next UTF-32 character from the wchar_t buffer and advances the
-// pointer to the character after this one
-//
-// if an invalid character is found, *pSrc is set to NULL, the caller must
-// check for this
-static wxUint32 wxDecodeSurrogate(const wxDecodeSurrogate_t **pSrc)
-{
-    wxUint32 out;
-    const size_t
-        n = decode_utf16(reinterpret_cast<const wxUint16 *>(*pSrc), out);
-    if ( n == wxCONV_FAILED )
-        *pSrc = NULL;
-    else
-        *pSrc += n;
-
-    return out;
-}
-
-// ----------------------------------------------------------------------------
-// wxMBConv
-// ----------------------------------------------------------------------------
-
-size_t
-wxMBConv::ToWChar(wchar_t *dst, size_t dstLen,
-                  const char *src, size_t srcLen) const
-{
-    // although new conversion classes are supposed to implement this function
-    // directly, the existing ones only implement the old MB2WC() and so, to
-    // avoid to have to rewrite all conversion classes at once, we provide a
-    // default (but not efficient) implementation of this one in terms of the
-    // old function by copying the input to ensure that it's NUL-terminated and
-    // then using MB2WC() to convert it
-    //
-    // moreover, some conversion classes simply can't implement ToWChar()
-    // directly, the primary example is wxConvLibc: mbstowcs() only handles
-    // NUL-terminated strings
-
-    // the number of chars [which would be] written to dst [if it were not NULL]
-    size_t dstWritten = 0;
-
-    // the number of NULs terminating this string
-    size_t nulLen = 0;  // not really needed, but just to avoid warnings
-
-    // if we were not given the input size we just have to assume that the
-    // string is properly terminated as we have no way of knowing how long it
-    // is anyhow, but if we do have the size check whether there are enough
-    // NULs at the end
-    wxCharBuffer bufTmp;
-    const char *srcEnd;
-    if ( srcLen != wxNO_LEN )
-    {
-        // we need to know how to find the end of this string
-        nulLen = GetMBNulLen();
-        if ( nulLen == wxCONV_FAILED )
-            return wxCONV_FAILED;
-
-        // if there are enough NULs we can avoid the copy
-        if ( srcLen < nulLen || NotAllNULs(src + srcLen - nulLen, nulLen) )
-        {
-            // make a copy in order to properly NUL-terminate the string
-            bufTmp = wxCharBuffer(srcLen + nulLen - 1 /* 1 will be added */);
-            char * const p = bufTmp.data();
-            memcpy(p, src, srcLen);
-            for ( char *s = p + srcLen; s < p + srcLen + nulLen; s++ )
-                *s = '\0';
-
-            src = bufTmp;
-        }
-
-        srcEnd = src + srcLen;
-    }
-    else // quit after the first loop iteration
-    {
-        srcEnd = NULL;
-    }
-
-    // the idea of this code is straightforward: it converts a NUL-terminated
-    // chunk of the string during each iteration and updates the output buffer
-    // with the result
-    //
-    // all the complication come from the fact that this function, for
-    // historical reasons, must behave in 2 subtly different ways when it's
-    // called with a fixed number of characters and when it's called for the
-    // entire NUL-terminated string: in the former case (srcEnd != NULL) we
-    // must count all characters we convert, NUL or not; but in the latter we
-    // do not count the trailing NUL -- but still count all the NULs inside the
-    // string
-    //
-    // so for the (simple) former case we just always count the trailing NUL,
-    // but for the latter we need to wait until we see if there is going to be
-    // another loop iteration and only count it then
-    for ( ;; )
-    {
-        // try to convert the current chunk
-        size_t lenChunk = MB2WC(NULL, src, 0);
-        if ( lenChunk == wxCONV_FAILED )
-            return wxCONV_FAILED;
-
-        dstWritten += lenChunk;
-        if ( !srcEnd )
-            dstWritten++;
-
-        if ( !lenChunk )
-        {
-            // nothing left in the input string, conversion succeeded
-            break;
-        }
-
-        if ( dst )
-        {
-            if ( dstWritten > dstLen )
-                return wxCONV_FAILED;
-
-            // +1 is for trailing NUL
-            if ( MB2WC(dst, src, lenChunk + 1) == wxCONV_FAILED )
-                return wxCONV_FAILED;
-
-            dst += lenChunk;
-            if ( !srcEnd )
-                dst++;
-        }
-
-        if ( !srcEnd )
-        {
-            // we convert just one chunk in this case as this is the entire
-            // string anyhow (and we don't count the trailing NUL in this case)
-            break;
-        }
-
-        // advance the input pointer past the end of this chunk: notice that we
-        // will always stop before srcEnd because we know that the chunk is
-        // always properly NUL-terminated
-        while ( NotAllNULs(src, nulLen) )
-        {
-            // notice that we must skip over multiple bytes here as we suppose
-            // that if NUL takes 2 or 4 bytes, then all the other characters do
-            // too and so if advanced by a single byte we might erroneously
-            // detect sequences of NUL bytes in the middle of the input
-            src += nulLen;
-        }
-
-        // if the buffer ends before this NUL, we shouldn't count it in our
-        // output so skip the code below
-        if ( src == srcEnd )
-            break;
-
-        // do count this terminator as it's inside the buffer we convert
-        dstWritten++;
-        if ( dst )
-            dst++;
-
-        src += nulLen; // skip the terminator itself
-
-        if ( src >= srcEnd )
-            break;
-    }
-
-    return dstWritten;
-}
-
-size_t
-wxMBConv::FromWChar(char *dst, size_t dstLen,
-                    const wchar_t *src, size_t srcLen) const
-{
-    // the number of chars [which would be] written to dst [if it were not NULL]
-    size_t dstWritten = 0;
-
-    // if we don't know its length we have no choice but to assume that it is
-    // NUL-terminated (notice that it can still be NUL-terminated even if
-    // explicit length is given but it doesn't change our return value)
-    const bool isNulTerminated = srcLen == wxNO_LEN;
-
-    // make a copy of the input string unless it is already properly
-    // NUL-terminated
-    wxWCharBuffer bufTmp;
-    if ( isNulTerminated )
-    {
-        srcLen = wxWcslen(src) + 1;
-    }
-    else if ( srcLen != 0 && src[srcLen - 1] != L'\0' )
-    {
-        // make a copy in order to properly NUL-terminate the string
-        bufTmp = wxWCharBuffer(srcLen);
-        memcpy(bufTmp.data(), src, srcLen * sizeof(wchar_t));
-        src = bufTmp;
-    }
-
-    const size_t lenNul = GetMBNulLen();
-    for ( const wchar_t * const srcEnd = src + srcLen;
-          src < srcEnd;
-          src++ /* skip L'\0' too */ )
-    {
-        // try to convert the current chunk
-        size_t lenChunk = WC2MB(NULL, src, 0);
-        if ( lenChunk == wxCONV_FAILED )
-            return wxCONV_FAILED;
-
-        dstWritten += lenChunk;
-
-        const wchar_t * const
-            chunkEnd = isNulTerminated ? srcEnd - 1 : src + wxWcslen(src);
-
-        // our return value accounts for the trailing NUL(s), unlike that of
-        // WC2MB(), however don't do it for the last NUL we artificially added
-        // ourselves above
-        if ( chunkEnd < srcEnd )
-            dstWritten += lenNul;
-
-        if ( dst )
-        {
-            if ( dstWritten > dstLen )
-                return wxCONV_FAILED;
-
-            // if we know that there is enough space in the destination buffer
-            // (because we accounted for lenNul in dstWritten above), we can
-            // convert directly in place -- but otherwise we need another
-            // temporary buffer to ensure that we don't overwrite the output
-            wxCharBuffer dstBuf;
-            char *dstTmp;
-            if ( chunkEnd == srcEnd )
-            {
-                dstBuf = wxCharBuffer(lenChunk + lenNul - 1);
-                dstTmp = dstBuf.data();
-            }
-            else
-            {
-                dstTmp = dst;
-            }
-
-            if ( WC2MB(dstTmp, src, lenChunk + lenNul) == wxCONV_FAILED )
-                return wxCONV_FAILED;
-
-            if ( dstTmp != dst )
-            {
-                // copy everything up to but excluding the terminating NUL(s)
-                // into the real output buffer
-                memcpy(dst, dstTmp, lenChunk);
-
-                // micro-optimization: if dstTmp != dst it means that chunkEnd
-                // == srcEnd and so we're done, no need to update anything below
-                break;
-            }
-
-            dst += lenChunk;
-            if ( chunkEnd < srcEnd )
-                dst += lenNul;
-        }
-
-        src = chunkEnd;
-    }
-
-    return dstWritten;
-}
-
-size_t wxMBConv::MB2WC(wchar_t *outBuff, const char *inBuff, size_t outLen) const
-{
-    size_t rc = ToWChar(outBuff, outLen, inBuff);
-    if ( rc != wxCONV_FAILED )
-    {
-        // ToWChar() returns the buffer length, i.e. including the trailing
-        // NUL, while this method doesn't take it into account
-        rc--;
-    }
-
-    return rc;
-}
-
-size_t wxMBConv::WC2MB(char *outBuff, const wchar_t *inBuff, size_t outLen) const
-{
-    size_t rc = FromWChar(outBuff, outLen, inBuff);
-    if ( rc != wxCONV_FAILED )
-    {
-        rc -= GetMBNulLen();
-    }
-
-    return rc;
-}
-
-wxMBConv::~wxMBConv()
-{
-    // nothing to do here (necessary for Darwin linking probably)
-}
-
-const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
-{
-    if ( psz )
-    {
-        // calculate the length of the buffer needed first
-        const size_t nLen = ToWChar(NULL, 0, psz);
-        if ( nLen != wxCONV_FAILED )
-        {
-            // now do the actual conversion
-            wxWCharBuffer buf(nLen - 1 /* +1 added implicitly */);
-
-            // +1 for the trailing NULL
-            if ( ToWChar(buf.data(), nLen, psz) != wxCONV_FAILED )
-                return buf;
-        }
-    }
-
-    return wxWCharBuffer();
-}
-
-const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
-{
-    if ( pwz )
-    {
-        const size_t nLen = FromWChar(NULL, 0, pwz);
-        if ( nLen != wxCONV_FAILED )
-        {
-            wxCharBuffer buf(nLen - 1);
-            if ( FromWChar(buf.data(), nLen, pwz) != wxCONV_FAILED )
-                return buf;
-        }
-    }
-
-    return wxCharBuffer();
-}
-
-const wxWCharBuffer
-wxMBConv::cMB2WC(const char *inBuff, size_t inLen, size_t *outLen) const
-{
-    const size_t dstLen = ToWChar(NULL, 0, inBuff, inLen);
-    if ( dstLen != wxCONV_FAILED )
-    {
-        // notice that we allocate space for dstLen+1 wide characters here
-        // because we want the buffer to always be NUL-terminated, even if the
-        // input isn't (as otherwise the caller has no way to know its length)
-        wxWCharBuffer wbuf(dstLen);
-        wbuf.data()[dstLen] = L'\0';
-        if ( ToWChar(wbuf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
-        {
-            if ( outLen )
-            {
-                *outLen = dstLen;
-
-                // we also need to handle NUL-terminated input strings
-                // specially: for them the output is the length of the string
-                // excluding the trailing NUL, however if we're asked to
-                // convert a specific number of characters we return the length
-                // of the resulting output even if it's NUL-terminated
-                if ( inLen == wxNO_LEN )
-                    (*outLen)--;
-            }
-
-            return wbuf;
-        }
-    }
-
-    if ( outLen )
-        *outLen = 0;
-
-    return wxWCharBuffer();
-}
-
-const wxCharBuffer
-wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
-{
-    size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
-    if ( dstLen != wxCONV_FAILED )
-    {
-        const size_t nulLen = GetMBNulLen();
-
-        // as above, ensure that the buffer is always NUL-terminated, even if
-        // the input is not
-        wxCharBuffer buf(dstLen + nulLen - 1);
-        memset(buf.data() + dstLen, 0, nulLen);
-        if ( FromWChar(buf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
-        {
-            if ( outLen )
-            {
-                *outLen = dstLen;
-
-                if ( inLen == wxNO_LEN )
-                {
-                    // in this case both input and output are NUL-terminated
-                    // and we're not supposed to count NUL
-                    *outLen -= nulLen;
-                }
-            }
-
-            return buf;
-        }
-    }
-
-    if ( outLen )
-        *outLen = 0;
-
-    return wxCharBuffer();
-}
-
-const wxWCharBuffer wxMBConv::cMB2WC(const wxScopedCharBuffer& buf) const
-{
-    const size_t srcLen = buf.length();
-    if ( srcLen )
-    {
-        const size_t dstLen = ToWChar(NULL, 0, buf, srcLen);
-        if ( dstLen != wxCONV_FAILED )
-        {
-            wxWCharBuffer wbuf(dstLen);
-            wbuf.data()[dstLen] = L'\0';
-            if ( ToWChar(wbuf.data(), dstLen, buf, srcLen) != wxCONV_FAILED )
-                return wbuf;
-        }
-    }
-
-    return wxScopedWCharBuffer::CreateNonOwned(L"", 0);
-}
-
-const wxCharBuffer wxMBConv::cWC2MB(const wxScopedWCharBuffer& wbuf) const
-{
-    const size_t srcLen = wbuf.length();
-    if ( srcLen )
-    {
-        const size_t dstLen = FromWChar(NULL, 0, wbuf, srcLen);
-        if ( dstLen != wxCONV_FAILED )
-        {
-            wxCharBuffer buf(dstLen);
-            buf.data()[dstLen] = '\0';
-            if ( FromWChar(buf.data(), dstLen, wbuf, srcLen) != wxCONV_FAILED )
-                return buf;
-        }
-    }
-
-    return wxScopedCharBuffer::CreateNonOwned("", 0);
-}
-
-// ----------------------------------------------------------------------------
-// wxMBConvLibc
-// ----------------------------------------------------------------------------
-
-size_t wxMBConvLibc::MB2WC(wchar_t *buf, const char *psz, size_t n) const
-{
-    return wxMB2WC(buf, psz, n);
-}
-
-size_t wxMBConvLibc::WC2MB(char *buf, const wchar_t *psz, size_t n) const
-{
-    return wxWC2MB(buf, psz, n);
-}
-
-// ----------------------------------------------------------------------------
-// wxConvBrokenFileNames
-// ----------------------------------------------------------------------------
-
-#ifdef __UNIX__
-
-wxConvBrokenFileNames::wxConvBrokenFileNames(const wxString& charset)
-{
-    if ( wxStricmp(charset, wxT("UTF-8")) == 0 ||
-         wxStricmp(charset, wxT("UTF8")) == 0  )
-        m_conv = new wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_PUA);
-    else
-        m_conv = new wxCSConv(charset);
-}
-
-#endif // __UNIX__
-
-// ----------------------------------------------------------------------------
-// UTF-7
-// ----------------------------------------------------------------------------
-
-// Implementation (C) 2004 Fredrik Roubert
-//
-// Changes to work in streaming mode (C) 2008 Vadim Zeitlin
-
-//
-// BASE64 decoding table
-//
-static const unsigned char utf7unb64[] =
-{
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f,
-    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
-    0x3c, 0x3d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
-    0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
-    0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
-    0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
-    0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-    0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-    0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-};
-
-size_t wxMBConvUTF7::ToWChar(wchar_t *dst, size_t dstLen,
-                             const char *src, size_t srcLen) const
-{
-    DecoderState stateOrig,
-                *statePtr;
-    if ( srcLen == wxNO_LEN )
-    {
-        // convert the entire string, up to and including the trailing NUL
-        srcLen = strlen(src) + 1;
-
-        // when working on the entire strings we don't update nor use the shift
-        // state from the previous call
-        statePtr = &stateOrig;
-    }
-    else // when working with partial strings we do use the shift state
-    {
-        statePtr = const_cast<DecoderState *>(&m_stateDecoder);
-
-        // also save the old state to be able to rollback to it on error
-        stateOrig = m_stateDecoder;
-    }
-
-    // but to simplify the code below we use this variable in both cases
-    DecoderState& state = *statePtr;
-
-
-    // number of characters [which would have been] written to dst [if it were
-    // not NULL]
-    size_t len = 0;
-
-    const char * const srcEnd = src + srcLen;
-
-    while ( (src < srcEnd) && (!dst || (len < dstLen)) )
-    {
-        const unsigned char cc = *src++;
-
-        if ( state.IsShifted() )
-        {
-            const unsigned char dc = utf7unb64[cc];
-            if ( dc == 0xff )
-            {
-                // end of encoded part, check that nothing was left: there can
-                // be up to 4 bits of 0 padding but nothing else (we also need
-                // to check isLSB as we count bits modulo 8 while a valid UTF-7
-                // encoded sequence must contain an integral number of UTF-16
-                // characters)
-                if ( state.isLSB || state.bit > 4 ||
-                        (state.accum & ((1 << state.bit) - 1)) )
-                {
-                    if ( !len )
-                        state = stateOrig;
-
-                    return wxCONV_FAILED;
-                }
-
-                state.ToDirect();
-
-                // re-parse this character normally below unless it's '-' which
-                // is consumed by the decoder
-                if ( cc == '-' )
-                    continue;
-            }
-            else // valid encoded character
-            {
-                // mini base64 decoder: each character is 6 bits
-                state.bit += 6;
-                state.accum <<= 6;
-                state.accum += dc;
-
-                if ( state.bit >= 8 )
-                {
-                    // got the full byte, consume it
-                    state.bit -= 8;
-                    unsigned char b = (state.accum >> state.bit) & 0x00ff;
-
-                    if ( state.isLSB )
-                    {
-                        // we've got the full word, output it
-                        if ( dst )
-                            *dst++ = (state.msb << 8) | b;
-                        len++;
-                        state.isLSB = false;
-                    }
-                    else // MSB
-                    {
-                        // just store it while we wait for LSB
-                        state.msb = b;
-                        state.isLSB = true;
-                    }
-                }
-            }
-        }
-
-        if ( state.IsDirect() )
-        {
-            // start of an encoded segment?
-            if ( cc == '+' )
-            {
-                if ( *src == '-' )
-                {
-                    // just the encoded plus sign, don't switch to shifted mode
-                    if ( dst )
-                        *dst++ = '+';
-                    len++;
-                    src++;
-                }
-                else if ( utf7unb64[(unsigned)*src] == 0xff )
-                {
-                    // empty encoded chunks are not allowed
-                    if ( !len )
-                        state = stateOrig;
-
-                    return wxCONV_FAILED;
-                }
-                else // base-64 encoded chunk follows
-                {
-                    state.ToShifted();
-                }
-            }
-            else // not '+'
-            {
-                // only printable 7 bit ASCII characters (with the exception of
-                // NUL, TAB, CR and LF) can be used directly
-                if ( cc >= 0x7f || (cc < ' ' &&
-                      !(cc == '\0' || cc == '\t' || cc == '\r' || cc == '\n')) )
-                    return wxCONV_FAILED;
-
-                if ( dst )
-                    *dst++ = cc;
-                len++;
-            }
-        }
-    }
-
-    if ( !len )
-    {
-        // as we didn't read any characters we should be called with the same
-        // data (followed by some more new data) again later so don't save our
-        // state
-        state = stateOrig;
-
-        return wxCONV_FAILED;
-    }
-
-    return len;
-}
-
-//
-// BASE64 encoding table
-//
-static const unsigned char utf7enb64[] =
-{
-    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-    'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-    'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-    'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-    'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-    'w', 'x', 'y', 'z', '0', '1', '2', '3',
-    '4', '5', '6', '7', '8', '9', '+', '/'
-};
-
-//
-// UTF-7 encoding table
-//
-// 0 - Set D (directly encoded characters)
-// 1 - Set O (optional direct characters)
-// 2 - whitespace characters (optional)
-// 3 - special characters
-//
-static const unsigned char utf7encode[128] =
-{
-    0, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 3, 3,
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 3, 0, 0, 0, 3,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0,
-    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 1, 1,
-    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 3
-};
-
-static inline bool wxIsUTF7Direct(wchar_t wc)
-{
-    return wc < 0x80 && utf7encode[wc] < 1;
-}
-
-size_t wxMBConvUTF7::FromWChar(char *dst, size_t dstLen,
-                               const wchar_t *src, size_t srcLen) const
-{
-    EncoderState stateOrig,
-                *statePtr;
-    if ( srcLen == wxNO_LEN )
-    {
-        // we don't apply the stored state when operating on entire strings at
-        // once
-        statePtr = &stateOrig;
-
-        srcLen = wxWcslen(src) + 1;
-    }
-    else // do use the mode we left the output in previously
-    {
-        stateOrig = m_stateEncoder;
-        statePtr = const_cast<EncoderState *>(&m_stateEncoder);
-    }
-
-    EncoderState& state = *statePtr;
-
-
-    size_t len = 0;
-
-    const wchar_t * const srcEnd = src + srcLen;
-    while ( src < srcEnd && (!dst || len < dstLen) )
-    {
-        wchar_t cc = *src++;
-        if ( wxIsUTF7Direct(cc) )
-        {
-            if ( state.IsShifted() )
-            {
-                // pad with zeros the last encoded block if necessary
-                if ( state.bit )
-                {
-                    if ( dst )
-                        *dst++ = utf7enb64[((state.accum % 16) << (6 - state.bit)) % 64];
-                    len++;
-                }
-
-                state.ToDirect();
-
-                if ( dst )
-                    *dst++ = '-';
-                len++;
-            }
-
-            if ( dst )
-                *dst++ = (char)cc;
-            len++;
-        }
-        else if ( cc == '+' && state.IsDirect() )
-        {
-            if ( dst )
-            {
-                *dst++ = '+';
-                *dst++ = '-';
-            }
-
-            len += 2;
-        }
-#ifndef WC_UTF16
-        else if (((wxUint32)cc) > 0xffff)
-        {
-            // no surrogate pair generation (yet?)
-            return wxCONV_FAILED;
-        }
-#endif
-        else
-        {
-            if ( state.IsDirect() )
-            {
-                state.ToShifted();
-
-                if ( dst )
-                    *dst++ = '+';
-                len++;
-            }
-
-            // BASE64 encode string
-            for ( ;; )
-            {
-                for ( unsigned lsb = 0; lsb < 2; lsb++ )
-                {
-                    state.accum <<= 8;
-                    state.accum += lsb ? cc & 0xff : (cc & 0xff00) >> 8;
-
-                    for (state.bit += 8; state.bit >= 6; )
-                    {
-                        state.bit -= 6;
-                        if ( dst )
-                            *dst++ = utf7enb64[(state.accum >> state.bit) % 64];
-                        len++;
-                    }
-                }
-
-                if ( src == srcEnd || wxIsUTF7Direct(cc = *src) )
-                    break;
-
-                src++;
-            }
-        }
-    }
-
-    // we need to restore the original encoder state if we were called just to
-    // calculate the amount of space needed as we will presumably be called
-    // again to really convert the data now
-    if ( !dst )
-        state = stateOrig;
-
-    return len;
-}
-
-// ----------------------------------------------------------------------------
-// UTF-8
-// ----------------------------------------------------------------------------
-
-static const wxUint32 utf8_max[]=
-    { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
-
-// boundaries of the private use area we use to (temporarily) remap invalid
-// characters invalid in a UTF-8 encoded string
-const wxUint32 wxUnicodePUA = 0x100000;
-const wxUint32 wxUnicodePUAEnd = wxUnicodePUA + 256;
-
-// this table gives the length of the UTF-8 encoding from its first character:
-const unsigned char tableUtf8Lengths[256] = {
-    // single-byte sequences (ASCII):
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 00..0F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 10..1F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 20..2F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 30..3F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 40..4F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 50..5F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 60..6F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 70..7F
-
-    // these are invalid:
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // 80..8F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // 90..9F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // A0..AF
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // B0..BF
-    0, 0,                                            // C0,C1
-
-    // two-byte sequences:
-          2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,  // C2..CF
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,  // D0..DF
-
-    // three-byte sequences:
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,  // E0..EF
-
-    // four-byte sequences:
-    4, 4, 4, 4, 4,                                   // F0..F4
-
-    // these are invalid again (5- or 6-byte
-    // sequences and sequences for code points
-    // above U+10FFFF, as restricted by RFC 3629):
-                   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0   // F5..FF
-};
-
-size_t
-wxMBConvStrictUTF8::ToWChar(wchar_t *dst, size_t dstLen,
-                            const char *src, size_t srcLen) const
-{
-    wchar_t *out = dstLen ? dst : NULL;
-    size_t written = 0;
-
-    if ( srcLen == wxNO_LEN )
-        srcLen = strlen(src) + 1;
-
-    for ( const char *p = src; ; p++ )
-    {
-        if ( (srcLen == wxNO_LEN ? !*p : !srcLen) )
-        {
-            // all done successfully, just add the trailing NULL if we are not
-            // using explicit length
-            if ( srcLen == wxNO_LEN )
-            {
-                if ( out )
-                {
-                    if ( !dstLen )
-                        break;
-
-                    *out = L'\0';
-                }
-
-                written++;
-            }
-
-            return written;
-        }
-
-        if ( out && !dstLen-- )
-            break;
-
-        wxUint32 code;
-        unsigned char c = *p;
-
-        if ( c < 0x80 )
-        {
-            if ( srcLen == 0 ) // the test works for wxNO_LEN too
-                break;
-
-            if ( srcLen != wxNO_LEN )
-                srcLen--;
-
-            code = c;
-        }
-        else
-        {
-            unsigned len = tableUtf8Lengths[c];
-            if ( !len )
-                break;
-
-            if ( srcLen < len ) // the test works for wxNO_LEN too
-                break;
-
-            if ( srcLen != wxNO_LEN )
-                srcLen -= len;
-
-            //   Char. number range   |        UTF-8 octet sequence
-            //      (hexadecimal)     |              (binary)
-            //  ----------------------+----------------------------------------
-            //  0000 0000 - 0000 007F | 0xxxxxxx
-            //  0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx
-            //  0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-            //  0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-            //
-            //  Code point value is stored in bits marked with 'x',
-            //  lowest-order bit of the value on the right side in the diagram
-            //  above.                                         (from RFC 3629)
-
-            // mask to extract lead byte's value ('x' bits above), by sequence
-            // length:
-            static const unsigned char leadValueMask[] = { 0x7F, 0x1F, 0x0F, 0x07 };
-
-            // mask and value of lead byte's most significant bits, by length:
-            static const unsigned char leadMarkerMask[] = { 0x80, 0xE0, 0xF0, 0xF8 };
-            static const unsigned char leadMarkerVal[] = { 0x00, 0xC0, 0xE0, 0xF0 };
-
-            len--; // it's more convenient to work with 0-based length here
-
-            // extract the lead byte's value bits:
-            if ( (c & leadMarkerMask[len]) != leadMarkerVal[len] )
-                break;
-
-            code = c & leadValueMask[len];
-
-            // all remaining bytes, if any, are handled in the same way
-            // regardless of sequence's length:
-            for ( ; len; --len )
-            {
-                c = *++p;
-                if ( (c & 0xC0) != 0x80 )
-                    return wxCONV_FAILED;
-
-                code <<= 6;
-                code |= c & 0x3F;
-            }
-        }
-
-#ifdef WC_UTF16
-        // cast is ok because wchar_t == wxUint16 if WC_UTF16
-        if ( encode_utf16(code, (wxUint16 *)out) == 2 )
-        {
-            if ( out )
-                out++;
-            written++;
-        }
-#else // !WC_UTF16
-        if ( out )
-            *out = code;
-#endif // WC_UTF16/!WC_UTF16
-
-        if ( out )
-            out++;
-
-        written++;
-    }
-
-    return wxCONV_FAILED;
-}
-
-size_t
-wxMBConvStrictUTF8::FromWChar(char *dst, size_t dstLen,
-                              const wchar_t *src, size_t srcLen) const
-{
-    char *out = dstLen ? dst : NULL;
-    size_t written = 0;
-
-    for ( const wchar_t *wp = src; ; wp++ )
-    {
-        if ( (srcLen == wxNO_LEN ? !*wp : !srcLen) )
-        {
-            // all done successfully, just add the trailing NULL if we are not
-            // using explicit length
-            if ( srcLen == wxNO_LEN )
-            {
-                if ( out )
-                {
-                    if ( !dstLen )
-                        break;
-
-                    *out = '\0';
-                }
-
-                written++;
-            }
-
-            return written;
-        }
-
-        if ( srcLen != wxNO_LEN )
-            srcLen--;
-
-        wxUint32 code;
-#ifdef WC_UTF16
-        // cast is ok for WC_UTF16
-        if ( decode_utf16((const wxUint16 *)wp, code) == 2 )
-        {
-            // skip the next char too as we decoded a surrogate
-            wp++;
-            if ( srcLen != wxNO_LEN )
-                srcLen--;
-        }
-#else // wchar_t is UTF-32
-        code = *wp & 0x7fffffff;
-#endif
-
-        unsigned len;
-        if ( code <= 0x7F )
-        {
-            len = 1;
-            if ( out )
-            {
-                if ( dstLen < len )
-                    break;
-
-                out[0] = (char)code;
-            }
-        }
-        else if ( code <= 0x07FF )
-        {
-            len = 2;
-            if ( out )
-            {
-                if ( dstLen < len )
-                    break;
-
-                // NB: this line takes 6 least significant bits, encodes them as
-                // 10xxxxxx and discards them so that the next byte can be encoded:
-                out[1] = 0x80 | (code & 0x3F);  code >>= 6;
-                out[0] = 0xC0 | code;
-            }
-        }
-        else if ( code < 0xFFFF )
-        {
-            len = 3;
-            if ( out )
-            {
-                if ( dstLen < len )
-                    break;
-
-                out[2] = 0x80 | (code & 0x3F);  code >>= 6;
-                out[1] = 0x80 | (code & 0x3F);  code >>= 6;
-                out[0] = 0xE0 | code;
-            }
-        }
-        else if ( code <= 0x10FFFF )
-        {
-            len = 4;
-            if ( out )
-            {
-                if ( dstLen < len )
-                    break;
-
-                out[3] = 0x80 | (code & 0x3F);  code >>= 6;
-                out[2] = 0x80 | (code & 0x3F);  code >>= 6;
-                out[1] = 0x80 | (code & 0x3F);  code >>= 6;
-                out[0] = 0xF0 | code;
-            }
-        }
-        else
-        {
-            wxFAIL_MSG( wxT("trying to encode undefined Unicode character") );
-            break;
-        }
-
-        if ( out )
-        {
-            out += len;
-            dstLen -= len;
-        }
-
-        written += len;
-    }
-
-    // we only get here if an error occurs during decoding
-    return wxCONV_FAILED;
-}
-
-size_t wxMBConvUTF8::ToWChar(wchar_t *buf, size_t n,
-                             const char *psz, size_t srcLen) const
-{
-    if ( m_options == MAP_INVALID_UTF8_NOT )
-        return wxMBConvStrictUTF8::ToWChar(buf, n, psz, srcLen);
-
-    size_t len = 0;
-
-    // The length can be either given explicitly or computed implicitly for the
-    // NUL-terminated strings.
-    const bool isNulTerminated = srcLen == wxNO_LEN;
-    while ((isNulTerminated ? *psz : srcLen--) && ((!buf) || (len < n)))
-    {
-        const char *opsz = psz;
-        bool invalid = false;
-        unsigned char cc = *psz++, fc = cc;
-        unsigned cnt;
-        for (cnt = 0; fc & 0x80; cnt++)
-            fc <<= 1;
-
-        if (!cnt)
-        {
-            // plain ASCII char
-            if (buf)
-                *buf++ = cc;
-            len++;
-
-            // escape the escape character for octal escapes
-            if ((m_options & MAP_INVALID_UTF8_TO_OCTAL)
-                    && cc == '\\' && (!buf || len < n))
-            {
-                if (buf)
-                    *buf++ = cc;
-                len++;
-            }
-        }
-        else
-        {
-            cnt--;
-            if (!cnt)
-            {
-                // invalid UTF-8 sequence
-                invalid = true;
-            }
-            else
-            {
-                unsigned ocnt = cnt - 1;
-                wxUint32 res = cc & (0x3f >> cnt);
-                while (cnt--)
-                {
-                    cc = *psz;
-                    if ((cc & 0xC0) != 0x80)
-                    {
-                        // invalid UTF-8 sequence
-                        invalid = true;
-                        break;
-                    }
-
-                    psz++;
-                    res = (res << 6) | (cc & 0x3f);
-                }
-
-                if (invalid || res <= utf8_max[ocnt])
-                {
-                    // illegal UTF-8 encoding
-                    invalid = true;
-                }
-                else if ((m_options & MAP_INVALID_UTF8_TO_PUA) &&
-                        res >= wxUnicodePUA && res < wxUnicodePUAEnd)
-                {
-                    // if one of our PUA characters turns up externally
-                    // it must also be treated as an illegal sequence
-                    // (a bit like you have to escape an escape character)
-                    invalid = true;
-                }
-                else
-                {
-#ifdef WC_UTF16
-                    // cast is ok because wchar_t == wxUint16 if WC_UTF16
-                    size_t pa = encode_utf16(res, (wxUint16 *)buf);
-                    if (pa == wxCONV_FAILED)
-                    {
-                        invalid = true;
-                    }
-                    else
-                    {
-                        if (buf)
-                            buf += pa;
-                        len += pa;
-                    }
-#else // !WC_UTF16
-                    if (buf)
-                        *buf++ = (wchar_t)res;
-                    len++;
-#endif // WC_UTF16/!WC_UTF16
-                }
-            }
-
-            if (invalid)
-            {
-                if (m_options & MAP_INVALID_UTF8_TO_PUA)
-                {
-                    while (opsz < psz && (!buf || len < n))
-                    {
-#ifdef WC_UTF16
-                        // cast is ok because wchar_t == wxUuint16 if WC_UTF16
-                        size_t pa = encode_utf16((unsigned char)*opsz + wxUnicodePUA, (wxUint16 *)buf);
-                        wxASSERT(pa != wxCONV_FAILED);
-                        if (buf)
-                            buf += pa;
-                        opsz++;
-                        len += pa;
-#else
-                        if (buf)
-                            *buf++ = (wchar_t)(wxUnicodePUA + (unsigned char)*opsz);
-                        opsz++;
-                        len++;
-#endif
-                    }
-                }
-                else if (m_options & MAP_INVALID_UTF8_TO_OCTAL)
-                {
-                    while (opsz < psz && (!buf || len < n))
-                    {
-                        if ( buf && len + 3 < n )
-                        {
-                            unsigned char on = *opsz;
-                            *buf++ = L'\\';
-                            *buf++ = (wchar_t)( L'0' + on / 0100 );
-                            *buf++ = (wchar_t)( L'0' + (on % 0100) / 010 );
-                            *buf++ = (wchar_t)( L'0' + on % 010 );
-                        }
-
-                        opsz++;
-                        len += 4;
-                    }
-                }
-                else // MAP_INVALID_UTF8_NOT
-                {
-                    return wxCONV_FAILED;
-                }
-            }
-        }
-    }
-
-    if ( isNulTerminated )
-    {
-        // Add the trailing NUL in this case if we have a large enough buffer.
-        if ( buf && (len < n) )
-            *buf = 0;
-
-        // And count it in any case.
-        len++;
-    }
-
-    return len;
-}
-
-static inline bool isoctal(wchar_t wch)
-{
-    return L'0' <= wch && wch <= L'7';
-}
-
-size_t wxMBConvUTF8::FromWChar(char *buf, size_t n,
-                               const wchar_t *psz, size_t srcLen) const
-{
-    if ( m_options == MAP_INVALID_UTF8_NOT )
-        return wxMBConvStrictUTF8::FromWChar(buf, n, psz, srcLen);
-
-    size_t len = 0;
-
-    // The length can be either given explicitly or computed implicitly for the
-    // NUL-terminated strings.
-    const bool isNulTerminated = srcLen == wxNO_LEN;
-    while ((isNulTerminated ? *psz : srcLen--) && ((!buf) || (len < n)))
-    {
-        wxUint32 cc;
-
-#ifdef WC_UTF16
-        // cast is ok for WC_UTF16
-        size_t pa = decode_utf16((const wxUint16 *)psz, cc);
-        psz += (pa == wxCONV_FAILED) ? 1 : pa;
-#else
-        cc = (*psz++) & 0x7fffffff;
-#endif
-
-        if ( (m_options & MAP_INVALID_UTF8_TO_PUA)
-                && cc >= wxUnicodePUA && cc < wxUnicodePUAEnd )
-        {
-            if (buf)
-                *buf++ = (char)(cc - wxUnicodePUA);
-            len++;
-        }
-        else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL)
-                    && cc == L'\\' && psz[0] == L'\\' )
-        {
-            if (buf)
-                *buf++ = (char)cc;
-            psz++;
-            len++;
-        }
-        else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) &&
-                    cc == L'\\' &&
-                        isoctal(psz[0]) && isoctal(psz[1]) && isoctal(psz[2]) )
-        {
-            if (buf)
-            {
-                *buf++ = (char) ((psz[0] - L'0') * 0100 +
-                                 (psz[1] - L'0') * 010 +
-                                 (psz[2] - L'0'));
-            }
-
-            psz += 3;
-            len++;
-        }
-        else
-        {
-            unsigned cnt;
-            for (cnt = 0; cc > utf8_max[cnt]; cnt++)
-            {
-            }
-
-            if (!cnt)
-            {
-                // plain ASCII char
-                if (buf)
-                    *buf++ = (char) cc;
-                len++;
-            }
-            else
-            {
-                len += cnt + 1;
-                if (buf)
-                {
-                    *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)));
-                    while (cnt--)
-                        *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f));
-                }
-            }
-        }
-    }
-
-    if ( isNulTerminated )
-    {
-        // Add the trailing NUL in this case if we have a large enough buffer.
-        if ( buf && (len < n) )
-            *buf = 0;
-
-        // And count it in any case.
-        len++;
-    }
-
-    return len;
-}
-
-// ============================================================================
-// UTF-16
-// ============================================================================
-
-#ifdef WORDS_BIGENDIAN
-    #define wxMBConvUTF16straight wxMBConvUTF16BE
-    #define wxMBConvUTF16swap     wxMBConvUTF16LE
-#else
-    #define wxMBConvUTF16swap     wxMBConvUTF16BE
-    #define wxMBConvUTF16straight wxMBConvUTF16LE
-#endif
-
-/* static */
-size_t wxMBConvUTF16Base::GetLength(const char *src, size_t srcLen)
-{
-    if ( srcLen == wxNO_LEN )
-    {
-        // count the number of bytes in input, including the trailing NULs
-        const wxUint16 *inBuff = reinterpret_cast<const wxUint16 *>(src);
-        for ( srcLen = 1; *inBuff++; srcLen++ )
-            ;
-
-        srcLen *= BYTES_PER_CHAR;
-    }
-    else // we already have the length
-    {
-        // we can only convert an entire number of UTF-16 characters
-        if ( srcLen % BYTES_PER_CHAR )
-            return wxCONV_FAILED;
-    }
-
-    return srcLen;
-}
-
-// case when in-memory representation is UTF-16 too
-#ifdef WC_UTF16
-
-// ----------------------------------------------------------------------------
-// conversions without endianness change
-// ----------------------------------------------------------------------------
-
-size_t
-wxMBConvUTF16straight::ToWChar(wchar_t *dst, size_t dstLen,
-                               const char *src, size_t srcLen) const
-{
-    // set up the scene for using memcpy() (which is presumably more efficient
-    // than copying the bytes one by one)
-    srcLen = GetLength(src, srcLen);
-    if ( srcLen == wxNO_LEN )
-        return wxCONV_FAILED;
-
-    const size_t inLen = srcLen / BYTES_PER_CHAR;
-    if ( dst )
-    {
-        if ( dstLen < inLen )
-            return wxCONV_FAILED;
-
-        memcpy(dst, src, srcLen);
-    }
-
-    return inLen;
-}
-
-size_t
-wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen,
-                                 const wchar_t *src, size_t srcLen) const
-{
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    srcLen *= BYTES_PER_CHAR;
-
-    if ( dst )
-    {
-        if ( dstLen < srcLen )
-            return wxCONV_FAILED;
-
-        memcpy(dst, src, srcLen);
-    }
-
-    return srcLen;
-}
-
-// ----------------------------------------------------------------------------
-// endian-reversing conversions
-// ----------------------------------------------------------------------------
-
-size_t
-wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen,
-                           const char *src, size_t srcLen) const
-{
-    srcLen = GetLength(src, srcLen);
-    if ( srcLen == wxNO_LEN )
-        return wxCONV_FAILED;
-
-    srcLen /= BYTES_PER_CHAR;
-
-    if ( dst )
-    {
-        if ( dstLen < srcLen )
-            return wxCONV_FAILED;
-
-        const wxUint16 *inBuff = reinterpret_cast<const wxUint16 *>(src);
-        for ( size_t n = 0; n < srcLen; n++, inBuff++ )
-        {
-            *dst++ = wxUINT16_SWAP_ALWAYS(*inBuff);
-        }
-    }
-
-    return srcLen;
-}
-
-size_t
-wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen) const
-{
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    srcLen *= BYTES_PER_CHAR;
-
-    if ( dst )
-    {
-        if ( dstLen < srcLen )
-            return wxCONV_FAILED;
-
-        wxUint16 *outBuff = reinterpret_cast<wxUint16 *>(dst);
-        for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ )
-        {
-            *outBuff++ = wxUINT16_SWAP_ALWAYS(*src);
-        }
-    }
-
-    return srcLen;
-}
-
-#else // !WC_UTF16: wchar_t is UTF-32
-
-// ----------------------------------------------------------------------------
-// conversions without endianness change
-// ----------------------------------------------------------------------------
-
-size_t
-wxMBConvUTF16straight::ToWChar(wchar_t *dst, size_t dstLen,
-                               const char *src, size_t srcLen) const
-{
-    srcLen = GetLength(src, srcLen);
-    if ( srcLen == wxNO_LEN )
-        return wxCONV_FAILED;
-
-    const size_t inLen = srcLen / BYTES_PER_CHAR;
-    if ( !dst )
-    {
-        // optimization: return maximal space which could be needed for this
-        // string even if the real size could be smaller if the buffer contains
-        // any surrogates
-        return inLen;
-    }
-
-    size_t outLen = 0;
-    const wxUint16 *inBuff = reinterpret_cast<const wxUint16 *>(src);
-    for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; )
-    {
-        const wxUint32 ch = wxDecodeSurrogate(&inBuff);
-        if ( !inBuff )
-            return wxCONV_FAILED;
-
-        if ( ++outLen > dstLen )
-            return wxCONV_FAILED;
-
-        *dst++ = ch;
-    }
-
-
-    return outLen;
-}
-
-size_t
-wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen,
-                                 const wchar_t *src, size_t srcLen) const
-{
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    size_t outLen = 0;
-    wxUint16 *outBuff = reinterpret_cast<wxUint16 *>(dst);
-    for ( size_t n = 0; n < srcLen; n++ )
-    {
-        wxUint16 cc[2] = { 0 };
-        const size_t numChars = encode_utf16(*src++, cc);
-        if ( numChars == wxCONV_FAILED )
-            return wxCONV_FAILED;
-
-        outLen += numChars * BYTES_PER_CHAR;
-        if ( outBuff )
-        {
-            if ( outLen > dstLen )
-                return wxCONV_FAILED;
-
-            *outBuff++ = cc[0];
-            if ( numChars == 2 )
-            {
-                // second character of a surrogate
-                *outBuff++ = cc[1];
-            }
-        }
-    }
-
-    return outLen;
-}
-
-// ----------------------------------------------------------------------------
-// endian-reversing conversions
-// ----------------------------------------------------------------------------
-
-size_t
-wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen,
-                           const char *src, size_t srcLen) const
-{
-    srcLen = GetLength(src, srcLen);
-    if ( srcLen == wxNO_LEN )
-        return wxCONV_FAILED;
-
-    const size_t inLen = srcLen / BYTES_PER_CHAR;
-    if ( !dst )
-    {
-        // optimization: return maximal space which could be needed for this
-        // string even if the real size could be smaller if the buffer contains
-        // any surrogates
-        return inLen;
-    }
-
-    size_t outLen = 0;
-    const wxUint16 *inBuff = reinterpret_cast<const wxUint16 *>(src);
-    for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; )
-    {
-        wxUint32 ch;
-        wxUint16 tmp[2];
-
-        tmp[0] = wxUINT16_SWAP_ALWAYS(*inBuff);
-        inBuff++;
-        tmp[1] = wxUINT16_SWAP_ALWAYS(*inBuff);
-
-        const size_t numChars = decode_utf16(tmp, ch);
-        if ( numChars == wxCONV_FAILED )
-            return wxCONV_FAILED;
-
-        if ( numChars == 2 )
-            inBuff++;
-
-        if ( ++outLen > dstLen )
-            return wxCONV_FAILED;
-
-        *dst++ = ch;
-    }
-
-
-    return outLen;
-}
-
-size_t
-wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen) const
-{
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    size_t outLen = 0;
-    wxUint16 *outBuff = reinterpret_cast<wxUint16 *>(dst);
-    for ( const wchar_t *srcEnd = src + srcLen; src < srcEnd; src++ )
-    {
-        wxUint16 cc[2] = { 0 };
-        const size_t numChars = encode_utf16(*src, cc);
-        if ( numChars == wxCONV_FAILED )
-            return wxCONV_FAILED;
-
-        outLen += numChars * BYTES_PER_CHAR;
-        if ( outBuff )
-        {
-            if ( outLen > dstLen )
-                return wxCONV_FAILED;
-
-            *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[0]);
-            if ( numChars == 2 )
-            {
-                // second character of a surrogate
-                *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[1]);
-            }
-        }
-    }
-
-    return outLen;
-}
-
-#endif // WC_UTF16/!WC_UTF16
-
-
-// ============================================================================
-// UTF-32
-// ============================================================================
-
-#ifdef WORDS_BIGENDIAN
-    #define wxMBConvUTF32straight  wxMBConvUTF32BE
-    #define wxMBConvUTF32swap      wxMBConvUTF32LE
-#else
-    #define wxMBConvUTF32swap      wxMBConvUTF32BE
-    #define wxMBConvUTF32straight  wxMBConvUTF32LE
-#endif
-
-
-WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32LE) wxConvUTF32LE;
-WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32BE) wxConvUTF32BE;
-
-/* static */
-size_t wxMBConvUTF32Base::GetLength(const char *src, size_t srcLen)
-{
-    if ( srcLen == wxNO_LEN )
-    {
-        // count the number of bytes in input, including the trailing NULs
-        const wxUint32 *inBuff = reinterpret_cast<const wxUint32 *>(src);
-        for ( srcLen = 1; *inBuff++; srcLen++ )
-            ;
-
-        srcLen *= BYTES_PER_CHAR;
-    }
-    else // we already have the length
-    {
-        // we can only convert an entire number of UTF-32 characters
-        if ( srcLen % BYTES_PER_CHAR )
-            return wxCONV_FAILED;
-    }
-
-    return srcLen;
-}
-
-// case when in-memory representation is UTF-16
-#ifdef WC_UTF16
-
-// ----------------------------------------------------------------------------
-// conversions without endianness change
-// ----------------------------------------------------------------------------
-
-size_t
-wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen,
-                               const char *src, size_t srcLen) const
-{
-    srcLen = GetLength(src, srcLen);
-    if ( srcLen == wxNO_LEN )
-        return wxCONV_FAILED;
-
-    const wxUint32 *inBuff = reinterpret_cast<const wxUint32 *>(src);
-    const size_t inLen = srcLen / BYTES_PER_CHAR;
-    size_t outLen = 0;
-    for ( size_t n = 0; n < inLen; n++ )
-    {
-        wxUint16 cc[2] = { 0 };
-        const size_t numChars = encode_utf16(*inBuff++, cc);
-        if ( numChars == wxCONV_FAILED )
-            return wxCONV_FAILED;
-
-        outLen += numChars;
-        if ( dst )
-        {
-            if ( outLen > dstLen )
-                return wxCONV_FAILED;
-
-            *dst++ = cc[0];
-            if ( numChars == 2 )
-            {
-                // second character of a surrogate
-                *dst++ = cc[1];
-            }
-        }
-    }
-
-    return outLen;
-}
-
-size_t
-wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
-                                 const wchar_t *src, size_t srcLen) const
-{
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    if ( !dst )
-    {
-        // optimization: return maximal space which could be needed for this
-        // string instead of the exact amount which could be less if there are
-        // any surrogates in the input
-        //
-        // we consider that surrogates are rare enough to make it worthwhile to
-        // avoid running the loop below at the cost of slightly extra memory
-        // consumption
-        return srcLen * BYTES_PER_CHAR;
-    }
-
-    wxUint32 *outBuff = reinterpret_cast<wxUint32 *>(dst);
-    size_t outLen = 0;
-    for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
-    {
-        const wxUint32 ch = wxDecodeSurrogate(&src);
-        if ( !src )
-            return wxCONV_FAILED;
-
-        outLen += BYTES_PER_CHAR;
-
-        if ( outLen > dstLen )
-            return wxCONV_FAILED;
-
-        *outBuff++ = ch;
-    }
-
-    return outLen;
-}
-
-// ----------------------------------------------------------------------------
-// endian-reversing conversions
-// ----------------------------------------------------------------------------
-
-size_t
-wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen,
-                           const char *src, size_t srcLen) const
-{
-    srcLen = GetLength(src, srcLen);
-    if ( srcLen == wxNO_LEN )
-        return wxCONV_FAILED;
-
-    const wxUint32 *inBuff = reinterpret_cast<const wxUint32 *>(src);
-    const size_t inLen = srcLen / BYTES_PER_CHAR;
-    size_t outLen = 0;
-    for ( size_t n = 0; n < inLen; n++, inBuff++ )
-    {
-        wxUint16 cc[2] = { 0 };
-        const size_t numChars = encode_utf16(wxUINT32_SWAP_ALWAYS(*inBuff), cc);
-        if ( numChars == wxCONV_FAILED )
-            return wxCONV_FAILED;
-
-        outLen += numChars;
-        if ( dst )
-        {
-            if ( outLen > dstLen )
-                return wxCONV_FAILED;
-
-            *dst++ = cc[0];
-            if ( numChars == 2 )
-            {
-                // second character of a surrogate
-                *dst++ = cc[1];
-            }
-        }
-    }
-
-    return outLen;
-}
-
-size_t
-wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen) const
-{
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    if ( !dst )
-    {
-        // optimization: return maximal space which could be needed for this
-        // string instead of the exact amount which could be less if there are
-        // any surrogates in the input
-        //
-        // we consider that surrogates are rare enough to make it worthwhile to
-        // avoid running the loop below at the cost of slightly extra memory
-        // consumption
-        return srcLen*BYTES_PER_CHAR;
-    }
-
-    wxUint32 *outBuff = reinterpret_cast<wxUint32 *>(dst);
-    size_t outLen = 0;
-    for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
-    {
-        const wxUint32 ch = wxDecodeSurrogate(&src);
-        if ( !src )
-            return wxCONV_FAILED;
-
-        outLen += BYTES_PER_CHAR;
-
-        if ( outLen > dstLen )
-            return wxCONV_FAILED;
-
-        *outBuff++ = wxUINT32_SWAP_ALWAYS(ch);
-    }
-
-    return outLen;
-}
-
-#else // !WC_UTF16: wchar_t is UTF-32
-
-// ----------------------------------------------------------------------------
-// conversions without endianness change
-// ----------------------------------------------------------------------------
-
-size_t
-wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen,
-                               const char *src, size_t srcLen) const
-{
-    // use memcpy() as it should be much faster than hand-written loop
-    srcLen = GetLength(src, srcLen);
-    if ( srcLen == wxNO_LEN )
-        return wxCONV_FAILED;
-
-    const size_t inLen = srcLen/BYTES_PER_CHAR;
-    if ( dst )
-    {
-        if ( dstLen < inLen )
-            return wxCONV_FAILED;
-
-        memcpy(dst, src, srcLen);
-    }
-
-    return inLen;
-}
-
-size_t
-wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
-                                 const wchar_t *src, size_t srcLen) const
-{
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    srcLen *= BYTES_PER_CHAR;
-
-    if ( dst )
-    {
-        if ( dstLen < srcLen )
-            return wxCONV_FAILED;
-
-        memcpy(dst, src, srcLen);
-    }
-
-    return srcLen;
-}
-
-// ----------------------------------------------------------------------------
-// endian-reversing conversions
-// ----------------------------------------------------------------------------
-
-size_t
-wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen,
-                           const char *src, size_t srcLen) const
-{
-    srcLen = GetLength(src, srcLen);
-    if ( srcLen == wxNO_LEN )
-        return wxCONV_FAILED;
-
-    srcLen /= BYTES_PER_CHAR;
-
-    if ( dst )
-    {
-        if ( dstLen < srcLen )
-            return wxCONV_FAILED;
-
-        const wxUint32 *inBuff = reinterpret_cast<const wxUint32 *>(src);
-        for ( size_t n = 0; n < srcLen; n++, inBuff++ )
-        {
-            *dst++ = wxUINT32_SWAP_ALWAYS(*inBuff);
-        }
-    }
-
-    return srcLen;
-}
-
-size_t
-wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen) const
-{
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    srcLen *= BYTES_PER_CHAR;
-
-    if ( dst )
-    {
-        if ( dstLen < srcLen )
-            return wxCONV_FAILED;
-
-        wxUint32 *outBuff = reinterpret_cast<wxUint32 *>(dst);
-        for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ )
-        {
-            *outBuff++ = wxUINT32_SWAP_ALWAYS(*src);
-        }
-    }
-
-    return srcLen;
-}
-
-#endif // WC_UTF16/!WC_UTF16
-
-
-// ============================================================================
-// The classes doing conversion using the iconv_xxx() functions
-// ============================================================================
-
-#ifdef HAVE_ICONV
-
-// VS: glibc 2.1.3 is broken in that iconv() conversion to/from UCS4 fails with
-//     E2BIG if output buffer is _exactly_ as big as needed. Such case is
-//     (unless there's yet another bug in glibc) the only case when iconv()
-//     returns with (size_t)-1 (which means error) and says there are 0 bytes
-//     left in the input buffer -- when _real_ error occurs,
-//     bytes-left-in-input buffer is non-zero. Hence, this alternative test for
-//     iconv() failure.
-//     [This bug does not appear in glibc 2.2.]
-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 1
-#define ICONV_FAILED(cres, bufLeft) ((cres == (size_t)-1) && \
-                                     (errno != E2BIG || bufLeft != 0))
-#else
-#define ICONV_FAILED(cres, bufLeft)  (cres == (size_t)-1)
-#endif
-
-#define ICONV_CHAR_CAST(x)  ((ICONV_CONST char **)(x))
-
-#define ICONV_T_INVALID ((iconv_t)-1)
-
-#if SIZEOF_WCHAR_T == 4
-    #define WC_BSWAP    wxUINT32_SWAP_ALWAYS
-    #define WC_ENC      wxFONTENCODING_UTF32
-#elif SIZEOF_WCHAR_T == 2
-    #define WC_BSWAP    wxUINT16_SWAP_ALWAYS
-    #define WC_ENC      wxFONTENCODING_UTF16
-#else // sizeof(wchar_t) != 2 nor 4
-    // does this ever happen?
-    #error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"
-#endif
-
-// ----------------------------------------------------------------------------
-// wxMBConv_iconv: encapsulates an iconv character set
-// ----------------------------------------------------------------------------
-
-class wxMBConv_iconv : public wxMBConv
-{
-public:
-    wxMBConv_iconv(const char *name);
-    virtual ~wxMBConv_iconv();
-
-    // implement base class virtual methods
-    virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
-                           const char *src, size_t srcLen = wxNO_LEN) const;
-    virtual size_t FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen = wxNO_LEN) const;
-    virtual size_t GetMBNulLen() const;
-
-#if wxUSE_UNICODE_UTF8
-    virtual bool IsUTF8() const;
-#endif
-
-    virtual wxMBConv *Clone() const
-    {
-        wxMBConv_iconv *p = new wxMBConv_iconv(m_name);
-        p->m_minMBCharWidth = m_minMBCharWidth;
-        return p;
-    }
-
-    bool IsOk() const
-        { return (m2w != ICONV_T_INVALID) && (w2m != ICONV_T_INVALID); }
-
-protected:
-    // the iconv handlers used to translate from multibyte
-    // to wide char and in the other direction
-    iconv_t m2w,
-            w2m;
-
-#if wxUSE_THREADS
-    // guards access to m2w and w2m objects
-    wxMutex m_iconvMutex;
-#endif
-
-private:
-    // the name (for iconv_open()) of a wide char charset -- if none is
-    // available on this machine, it will remain NULL
-    static wxString ms_wcCharsetName;
-
-    // true if the wide char encoding we use (i.e. ms_wcCharsetName) has
-    // different endian-ness than the native one
-    static bool ms_wcNeedsSwap;
-
-
-    // name of the encoding handled by this conversion
-    const char *m_name;
-
-    // cached result of GetMBNulLen(); set to 0 meaning "unknown"
-    // initially
-    size_t m_minMBCharWidth;
-};
-
-// make the constructor available for unit testing
-WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const char* name )
-{
-    wxMBConv_iconv* result = new wxMBConv_iconv( name );
-    if ( !result->IsOk() )
-    {
-        delete result;
-        return 0;
-    }
-
-    return result;
-}
-
-wxString wxMBConv_iconv::ms_wcCharsetName;
-bool wxMBConv_iconv::ms_wcNeedsSwap = false;
-
-wxMBConv_iconv::wxMBConv_iconv(const char *name)
-              : m_name(wxStrdup(name))
-{
-    m_minMBCharWidth = 0;
-
-    // check for charset that represents wchar_t:
-    if ( ms_wcCharsetName.empty() )
-    {
-        wxLogTrace(TRACE_STRCONV, wxT("Looking for wide char codeset:"));
-
-#if wxUSE_FONTMAP
-        const wxChar *const *names = wxFontMapperBase::GetAllEncodingNames(WC_ENC);
-#else // !wxUSE_FONTMAP
-        static const wxChar *const names_static[] =
-        {
-#if SIZEOF_WCHAR_T == 4
-            wxT("UCS-4"),
-#elif SIZEOF_WCHAR_T == 2
-            wxT("UCS-2"),
-#endif
-            NULL
-        };
-        const wxChar *const *names = names_static;
-#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
-
-        for ( ; *names && ms_wcCharsetName.empty(); ++names )
-        {
-            const wxString nameCS(*names);
-
-            // first try charset with explicit bytesex info (e.g. "UCS-4LE"):
-            wxString nameXE(nameCS);
-
-#ifdef WORDS_BIGENDIAN
-                nameXE += wxT("BE");
-#else // little endian
-                nameXE += wxT("LE");
-#endif
-
-            wxLogTrace(TRACE_STRCONV, wxT("  trying charset \"%s\""),
-                       nameXE.c_str());
-
-            m2w = iconv_open(nameXE.ToAscii(), name);
-            if ( m2w == ICONV_T_INVALID )
-            {
-                // try charset w/o bytesex info (e.g. "UCS4")
-                wxLogTrace(TRACE_STRCONV, wxT("  trying charset \"%s\""),
-                           nameCS.c_str());
-                m2w = iconv_open(nameCS.ToAscii(), name);
-
-                // and check for bytesex ourselves:
-                if ( m2w != ICONV_T_INVALID )
-                {
-                    char    buf[2], *bufPtr;
-                    wchar_t wbuf[2];
-                    size_t  insz, outsz;
-                    size_t  res;
-
-                    buf[0] = 'A';
-                    buf[1] = 0;
-                    wbuf[0] = 0;
-                    insz = 2;
-                    outsz = SIZEOF_WCHAR_T * 2;
-                    char* wbufPtr = (char*)wbuf;
-                    bufPtr = buf;
-
-                    res = iconv(
-                        m2w, ICONV_CHAR_CAST(&bufPtr), &insz,
-                        &wbufPtr, &outsz);
-
-                    if (ICONV_FAILED(res, insz))
-                    {
-                        wxLogLastError(wxT("iconv"));
-                        wxLogError(_("Conversion to charset '%s' doesn't work."),
-                                   nameCS.c_str());
-                    }
-                    else // ok, can convert to this encoding, remember it
-                    {
-                        ms_wcCharsetName = nameCS;
-                        ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0];
-                    }
-                }
-            }
-            else // use charset not requiring byte swapping
-            {
-                ms_wcCharsetName = nameXE;
-            }
-        }
-
-        wxLogTrace(TRACE_STRCONV,
-                   wxT("iconv wchar_t charset is \"%s\"%s"),
-                   ms_wcCharsetName.empty() ? wxString("<none>")
-                                            : ms_wcCharsetName,
-                   ms_wcNeedsSwap ? wxT(" (needs swap)")
-                                  : wxT(""));
-    }
-    else // we already have ms_wcCharsetName
-    {
-        m2w = iconv_open(ms_wcCharsetName.ToAscii(), name);
-    }
-
-    if ( ms_wcCharsetName.empty() )
-    {
-        w2m = ICONV_T_INVALID;
-    }
-    else
-    {
-        w2m = iconv_open(name, ms_wcCharsetName.ToAscii());
-        if ( w2m == ICONV_T_INVALID )
-        {
-            wxLogTrace(TRACE_STRCONV,
-                       wxT("\"%s\" -> \"%s\" works but not the converse!?"),
-                       ms_wcCharsetName.c_str(), name);
-        }
-    }
-}
-
-wxMBConv_iconv::~wxMBConv_iconv()
-{
-    free(const_cast<char *>(m_name));
-
-    if ( m2w != ICONV_T_INVALID )
-        iconv_close(m2w);
-    if ( w2m != ICONV_T_INVALID )
-        iconv_close(w2m);
-}
-
-size_t
-wxMBConv_iconv::ToWChar(wchar_t *dst, size_t dstLen,
-                        const char *src, size_t srcLen) const
-{
-    if ( srcLen == wxNO_LEN )
-    {
-        // find the string length: notice that must be done differently for
-        // NUL-terminated strings and UTF-16/32 which are terminated with 2/4
-        // consecutive NULs
-        const size_t nulLen = GetMBNulLen();
-        switch ( nulLen )
-        {
-            default:
-                return wxCONV_FAILED;
-
-            case 1:
-                srcLen = strlen(src); // arguably more optimized than our version
-                break;
-
-            case 2:
-            case 4:
-                // for UTF-16/32 not only we need to have 2/4 consecutive NULs
-                // but they also have to start at character boundary and not
-                // span two adjacent characters
-                const char *p;
-                for ( p = src; NotAllNULs(p, nulLen); p += nulLen )
-                    ;
-                srcLen = p - src;
-                break;
-        }
-
-        // when we're determining the length of the string ourselves we count
-        // the terminating NUL(s) as part of it and always NUL-terminate the
-        // output
-        srcLen += nulLen;
-    }
-
-    // we express length in the number of (wide) characters but iconv always
-    // counts buffer sizes it in bytes
-    dstLen *= SIZEOF_WCHAR_T;
-
-#if wxUSE_THREADS
-    // NB: iconv() is MT-safe, but each thread must use its own iconv_t handle.
-    //     Unfortunately there are a couple of global wxCSConv objects such as
-    //     wxConvLocal that are used all over wx code, so we have to make sure
-    //     the handle is used by at most one thread at the time. Otherwise
-    //     only a few wx classes would be safe to use from non-main threads
-    //     as MB<->WC conversion would fail "randomly".
-    wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
-#endif // wxUSE_THREADS
-
-    size_t res, cres;
-    const char *pszPtr = src;
-
-    if ( dst )
-    {
-        char* bufPtr = (char*)dst;
-
-        // have destination buffer, convert there
-        size_t dstLenOrig = dstLen;
-        cres = iconv(m2w,
-                     ICONV_CHAR_CAST(&pszPtr), &srcLen,
-                     &bufPtr, &dstLen);
-
-        // convert the number of bytes converted as returned by iconv to the
-        // number of (wide) characters converted that we need
-        res = (dstLenOrig - dstLen) / SIZEOF_WCHAR_T;
-
-        if (ms_wcNeedsSwap)
-        {
-            // convert to native endianness
-            for ( unsigned i = 0; i < res; i++ )
-                dst[i] = WC_BSWAP(dst[i]);
-        }
-    }
-    else // no destination buffer
-    {
-        // convert using temp buffer to calculate the size of the buffer needed
-        wchar_t tbuf[256];
-        res = 0;
-
-        do
-        {
-            char* bufPtr = (char*)tbuf;
-            dstLen = 8 * SIZEOF_WCHAR_T;
-
-            cres = iconv(m2w,
-                         ICONV_CHAR_CAST(&pszPtr), &srcLen,
-                         &bufPtr, &dstLen );
-
-            res += 8 - (dstLen / SIZEOF_WCHAR_T);
-        }
-        while ((cres == (size_t)-1) && (errno == E2BIG));
-    }
-
-    if (ICONV_FAILED(cres, srcLen))
-    {
-        //VS: it is ok if iconv fails, hence trace only
-        wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
-        return wxCONV_FAILED;
-    }
-
-    return res;
-}
-
-size_t wxMBConv_iconv::FromWChar(char *dst, size_t dstLen,
-                                 const wchar_t *src, size_t srcLen) const
-{
-#if wxUSE_THREADS
-    // NB: explained in MB2WC
-    wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
-#endif
-
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    size_t inbuflen = srcLen * SIZEOF_WCHAR_T;
-    size_t outbuflen = dstLen;
-    size_t res, cres;
-
-    wchar_t *tmpbuf = 0;
-
-    if (ms_wcNeedsSwap)
-    {
-        // need to copy to temp buffer to switch endianness
-        // (doing WC_BSWAP twice on the original buffer won't work, as it
-        //  could be in read-only memory, or be accessed in some other thread)
-        tmpbuf = (wchar_t *)malloc(inbuflen);
-        for ( size_t i = 0; i < srcLen; i++ )
-            tmpbuf[i] = WC_BSWAP(src[i]);
-
-        src = tmpbuf;
-    }
-
-    char* inbuf = (char*)src;
-    if ( dst )
-    {
-        // have destination buffer, convert there
-        cres = iconv(w2m, ICONV_CHAR_CAST(&inbuf), &inbuflen, &dst, &outbuflen);
-
-        res = dstLen - outbuflen;
-    }
-    else // no destination buffer
-    {
-        // convert using temp buffer to calculate the size of the buffer needed
-        char tbuf[256];
-        res = 0;
-        do
-        {
-            dst = tbuf;
-            outbuflen = WXSIZEOF(tbuf);
-
-            cres = iconv(w2m, ICONV_CHAR_CAST(&inbuf), &inbuflen, &dst, &outbuflen);
-
-            res += WXSIZEOF(tbuf) - outbuflen;
-        }
-        while ((cres == (size_t)-1) && (errno == E2BIG));
-    }
-
-    if (ms_wcNeedsSwap)
-    {
-        free(tmpbuf);
-    }
-
-    if (ICONV_FAILED(cres, inbuflen))
-    {
-        wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
-        return wxCONV_FAILED;
-    }
-
-    return res;
-}
-
-size_t wxMBConv_iconv::GetMBNulLen() const
-{
-    if ( m_minMBCharWidth == 0 )
-    {
-        wxMBConv_iconv * const self = wxConstCast(this, wxMBConv_iconv);
-
-#if wxUSE_THREADS
-        // NB: explained in MB2WC
-        wxMutexLocker lock(self->m_iconvMutex);
-#endif
-
-        const wchar_t *wnul = L"";
-        char buf[8]; // should be enough for NUL in any encoding
-        size_t inLen = sizeof(wchar_t),
-               outLen = WXSIZEOF(buf);
-        char *inBuff = (char *)wnul;
-        char *outBuff = buf;
-        if ( iconv(w2m, ICONV_CHAR_CAST(&inBuff), &inLen, &outBuff, &outLen) == (size_t)-1 )
-        {
-            self->m_minMBCharWidth = (size_t)-1;
-        }
-        else // ok
-        {
-            self->m_minMBCharWidth = outBuff - buf;
-        }
-    }
-
-    return m_minMBCharWidth;
-}
-
-#if wxUSE_UNICODE_UTF8
-bool wxMBConv_iconv::IsUTF8() const
-{
-    return wxStricmp(m_name, "UTF-8") == 0 ||
-           wxStricmp(m_name, "UTF8") == 0;
-}
-#endif
-
-#endif // HAVE_ICONV
-
-
-// ============================================================================
-// Win32 conversion classes
-// ============================================================================
-
-#ifdef wxHAVE_WIN32_MB2WC
-
-// from utils.cpp
-#if wxUSE_FONTMAP
-extern WXDLLIMPEXP_BASE long wxCharsetToCodepage(const char *charset);
-extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding);
-#endif
-
-class wxMBConv_win32 : public wxMBConv
-{
-public:
-    wxMBConv_win32()
-    {
-        m_CodePage = CP_ACP;
-        m_minMBCharWidth = 0;
-    }
-
-    wxMBConv_win32(const wxMBConv_win32& conv)
-        : wxMBConv()
-    {
-        m_CodePage = conv.m_CodePage;
-        m_minMBCharWidth = conv.m_minMBCharWidth;
-    }
-
-#if wxUSE_FONTMAP
-    wxMBConv_win32(const char* name)
-    {
-        m_CodePage = wxCharsetToCodepage(name);
-        m_minMBCharWidth = 0;
-    }
-
-    wxMBConv_win32(wxFontEncoding encoding)
-    {
-        m_CodePage = wxEncodingToCodepage(encoding);
-        m_minMBCharWidth = 0;
-    }
-#endif // wxUSE_FONTMAP
-
-    virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
-    {
-        // note that we have to use MB_ERR_INVALID_CHARS flag as it without it
-        // the behaviour is not compatible with the Unix version (using iconv)
-        // and break the library itself, e.g. wxTextInputStream::NextChar()
-        // wouldn't work if reading an incomplete MB char didn't result in an
-        // error
-        //
-        // Moreover, MB_ERR_INVALID_CHARS is only supported on Win 2K SP4 or
-        // Win XP or newer and it is not supported for UTF-[78] so we always
-        // use our own conversions in this case. See
-        //     http://blogs.msdn.com/michkap/archive/2005/04/19/409566.aspx
-        //     http://msdn.microsoft.com/library/en-us/intl/unicode_17si.asp
-        if ( m_CodePage == CP_UTF8 )
-        {
-            return wxMBConvUTF8().MB2WC(buf, psz, n);
-        }
-
-        if ( m_CodePage == CP_UTF7 )
-        {
-            return wxMBConvUTF7().MB2WC(buf, psz, n);
-        }
-
-        int flags = 0;
-        if ( (m_CodePage < 50000 && m_CodePage != CP_SYMBOL) &&
-                IsAtLeastWin2kSP4() )
-        {
-            flags = MB_ERR_INVALID_CHARS;
-        }
-
-        const size_t len = ::MultiByteToWideChar
-                             (
-                                m_CodePage,     // code page
-                                flags,          // flags: fall on error
-                                psz,            // input string
-                                -1,             // its length (NUL-terminated)
-                                buf,            // output string
-                                buf ? n : 0     // size of output buffer
-                             );
-        if ( !len )
-        {
-            // function totally failed
-            return wxCONV_FAILED;
-        }
-
-        // if we were really converting and didn't use MB_ERR_INVALID_CHARS,
-        // check if we succeeded, by doing a double trip:
-        if ( !flags && buf )
-        {
-            const size_t mbLen = strlen(psz);
-            wxCharBuffer mbBuf(mbLen);
-            if ( ::WideCharToMultiByte
-                   (
-                      m_CodePage,
-                      0,
-                      buf,
-                      -1,
-                      mbBuf.data(),
-                      mbLen + 1,        // size in bytes, not length
-                      NULL,
-                      NULL
-                   ) == 0 ||
-                  strcmp(mbBuf, psz) != 0 )
-            {
-                // we didn't obtain the same thing we started from, hence
-                // the conversion was lossy and we consider that it failed
-                return wxCONV_FAILED;
-            }
-        }
-
-        // note that it returns count of written chars for buf != NULL and size
-        // of the needed buffer for buf == NULL so in either case the length of
-        // the string (which never includes the terminating NUL) is one less
-        return len - 1;
-    }
-
-    virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const
-    {
-        /*
-            we have a problem here: by default, WideCharToMultiByte() may
-            replace characters unrepresentable in the target code page with bad
-            quality approximations such as turning "1/2" symbol (U+00BD) into
-            "1" for the code pages which don't have it and we, obviously, want
-            to avoid this at any price
-
-            the trouble is that this function does it _silently_, i.e. it won't
-            even tell us whether it did or not... Win98/2000 and higher provide
-            WC_NO_BEST_FIT_CHARS but it doesn't work for the older systems and
-            we have to resort to a round trip, i.e. check that converting back
-            results in the same string -- this is, of course, expensive but
-            otherwise we simply can't be sure to not garble the data.
-         */
-
-        // determine if we can rely on WC_NO_BEST_FIT_CHARS: according to MSDN
-        // it doesn't work with CJK encodings (which we test for rather roughly
-        // here...) nor with UTF-7/8 nor, of course, with Windows versions not
-        // supporting it
-        BOOL usedDef wxDUMMY_INITIALIZE(false);
-        BOOL *pUsedDef;
-        int flags;
-        if ( CanUseNoBestFit() && m_CodePage < 50000 )
-        {
-            // it's our lucky day
-            flags = WC_NO_BEST_FIT_CHARS;
-            pUsedDef = &usedDef;
-        }
-        else // old system or unsupported encoding
-        {
-            flags = 0;
-            pUsedDef = NULL;
-        }
-
-        const size_t len = ::WideCharToMultiByte
-                             (
-                                m_CodePage,     // code page
-                                flags,          // either none or no best fit
-                                pwz,            // input string
-                                -1,             // it is (wide) NUL-terminated
-                                buf,            // output buffer
-                                buf ? n : 0,    // and its size
-                                NULL,           // default "replacement" char
-                                pUsedDef        // [out] was it used?
-                             );
-
-        if ( !len )
-        {
-            // function totally failed
-            return wxCONV_FAILED;
-        }
-
-        // we did something, check if we really succeeded
-        if ( flags )
-        {
-            // check if the conversion failed, i.e. if any replacements
-            // were done
-            if ( usedDef )
-                return wxCONV_FAILED;
-        }
-        else // we must resort to double tripping...
-        {
-            // first we need to ensure that we really have the MB data: this is
-            // not the case if we're called with NULL buffer, in which case we
-            // need to do the conversion yet again
-            wxCharBuffer bufDef;
-            if ( !buf )
-            {
-                bufDef = wxCharBuffer(len);
-                buf = bufDef.data();
-                if ( !::WideCharToMultiByte(m_CodePage, flags, pwz, -1,
-                                            buf, len, NULL, NULL) )
-                    return wxCONV_FAILED;
-            }
-
-            if ( !n )
-                n = wcslen(pwz);
-            wxWCharBuffer wcBuf(n);
-            if ( MB2WC(wcBuf.data(), buf, n + 1) == wxCONV_FAILED ||
-                    wcscmp(wcBuf, pwz) != 0 )
-            {
-                // we didn't obtain the same thing we started from, hence
-                // the conversion was lossy and we consider that it failed
-                return wxCONV_FAILED;
-            }
-        }
-
-        // see the comment above for the reason of "len - 1"
-        return len - 1;
-    }
-
-    virtual size_t GetMBNulLen() const
-    {
-        if ( m_minMBCharWidth == 0 )
-        {
-            int len = ::WideCharToMultiByte
-                        (
-                            m_CodePage,     // code page
-                            0,              // no flags
-                            L"",            // input string
-                            1,              // translate just the NUL
-                            NULL,           // output buffer
-                            0,              // and its size
-                            NULL,           // no replacement char
-                            NULL            // [out] don't care if it was used
-                        );
-
-            wxMBConv_win32 * const self = wxConstCast(this, wxMBConv_win32);
-            switch ( len )
-            {
-                default:
-                    wxLogDebug(wxT("Unexpected NUL length %d"), len);
-                    self->m_minMBCharWidth = (size_t)-1;
-                    break;
-
-                case 0:
-                    self->m_minMBCharWidth = (size_t)-1;
-                    break;
-
-                case 1:
-                case 2:
-                case 4:
-                    self->m_minMBCharWidth = len;
-                    break;
-            }
-        }
-
-        return m_minMBCharWidth;
-    }
-
-    virtual wxMBConv *Clone() const { return new wxMBConv_win32(*this); }
-
-    bool IsOk() const { return m_CodePage != -1; }
-
-private:
-    static bool CanUseNoBestFit()
-    {
-        static int s_isWin98Or2k = -1;
-
-        if ( s_isWin98Or2k == -1 )
-        {
-            int verMaj, verMin;
-            switch ( wxGetOsVersion(&verMaj, &verMin) )
-            {
-                case wxOS_WINDOWS_9X:
-                    s_isWin98Or2k = verMaj >= 4 && verMin >= 10;
-                    break;
-
-                case wxOS_WINDOWS_NT:
-                    s_isWin98Or2k = verMaj >= 5;
-                    break;
-
-                default:
-                    // unknown: be conservative by default
-                    s_isWin98Or2k = 0;
-                    break;
-            }
-
-            wxASSERT_MSG( s_isWin98Or2k != -1, wxT("should be set above") );
-        }
-
-        return s_isWin98Or2k == 1;
-    }
-
-    static bool IsAtLeastWin2kSP4()
-    {
-#ifdef __WXWINCE__
-        return false;
-#else
-        static int s_isAtLeastWin2kSP4 = -1;
-
-        if ( s_isAtLeastWin2kSP4 == -1 )
-        {
-            OSVERSIONINFOEX ver;
-
-            memset(&ver, 0, sizeof(ver));
-            ver.dwOSVersionInfoSize = sizeof(ver);
-            GetVersionEx((OSVERSIONINFO*)&ver);
-
-            s_isAtLeastWin2kSP4 =
-              ((ver.dwMajorVersion > 5) || // Vista+
-               (ver.dwMajorVersion == 5 && ver.dwMinorVersion > 0) || // XP/2003
-               (ver.dwMajorVersion == 5 && ver.dwMinorVersion == 0 &&
-               ver.wServicePackMajor >= 4)) // 2000 SP4+
-              ? 1 : 0;
-        }
-
-        return s_isAtLeastWin2kSP4 == 1;
-#endif
-    }
-
-
-    // the code page we're working with
-    long m_CodePage;
-
-    // cached result of GetMBNulLen(), set to 0 initially meaning
-    // "unknown"
-    size_t m_minMBCharWidth;
-};
-
-#endif // wxHAVE_WIN32_MB2WC
-
-
-// ============================================================================
-// wxEncodingConverter based conversion classes
-// ============================================================================
-
-#if wxUSE_FONTMAP
-
-class wxMBConv_wxwin : public wxMBConv
-{
-private:
-    void Init()
-    {
-        // Refuse to use broken wxEncodingConverter code for Mac-specific encodings.
-        // The wxMBConv_cf class does a better job.
-        m_ok = (m_enc < wxFONTENCODING_MACMIN || m_enc > wxFONTENCODING_MACMAX) &&
-               m2w.Init(m_enc, wxFONTENCODING_UNICODE) &&
-               w2m.Init(wxFONTENCODING_UNICODE, m_enc);
-    }
-
-public:
-    // temporarily just use wxEncodingConverter stuff,
-    // so that it works while a better implementation is built
-    wxMBConv_wxwin(const char* name)
-    {
-        if (name)
-            m_enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false);
-        else
-            m_enc = wxFONTENCODING_SYSTEM;
-
-        Init();
-    }
-
-    wxMBConv_wxwin(wxFontEncoding enc)
-    {
-        m_enc = enc;
-
-        Init();
-    }
-
-    size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const
-    {
-        size_t inbuf = strlen(psz);
-        if (buf)
-        {
-            if (!m2w.Convert(psz, buf))
-                return wxCONV_FAILED;
-        }
-        return inbuf;
-    }
-
-    size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const
-    {
-        const size_t inbuf = wxWcslen(psz);
-        if (buf)
-        {
-            if (!w2m.Convert(psz, buf))
-                return wxCONV_FAILED;
-        }
-
-        return inbuf;
-    }
-
-    virtual size_t GetMBNulLen() const
-    {
-        switch ( m_enc )
-        {
-            case wxFONTENCODING_UTF16BE:
-            case wxFONTENCODING_UTF16LE:
-                return 2;
-
-            case wxFONTENCODING_UTF32BE:
-            case wxFONTENCODING_UTF32LE:
-                return 4;
-
-            default:
-                return 1;
-        }
-    }
-
-    virtual wxMBConv *Clone() const { return new wxMBConv_wxwin(m_enc); }
-
-    bool IsOk() const { return m_ok; }
-
-public:
-    wxFontEncoding m_enc;
-    wxEncodingConverter m2w, w2m;
-
-private:
-    // were we initialized successfully?
-    bool m_ok;
-
-    wxDECLARE_NO_COPY_CLASS(wxMBConv_wxwin);
-};
-
-// make the constructors available for unit testing
-WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const char* name )
-{
-    wxMBConv_wxwin* result = new wxMBConv_wxwin( name );
-    if ( !result->IsOk() )
-    {
-        delete result;
-        return 0;
-    }
-
-    return result;
-}
-
-#endif // wxUSE_FONTMAP
-
-// ============================================================================
-// wxCSConv implementation
-// ============================================================================
-
-void wxCSConv::Init()
-{
-    m_name = NULL;
-    m_convReal =  NULL;
-}
-
-void wxCSConv::SetEncoding(wxFontEncoding encoding)
-{
-    switch ( encoding )
-    {
-        case wxFONTENCODING_MAX:
-        case wxFONTENCODING_SYSTEM:
-            if ( m_name )
-            {
-                // It's ok to not have encoding value if we have a name for it.
-                m_encoding = wxFONTENCODING_SYSTEM;
-            }
-            else // No name neither.
-            {
-                // Fall back to the system default encoding in this case (not
-                // sure how much sense does this make but this is how the old
-                // code used to behave).
-#if wxUSE_INTL
-                m_encoding = wxLocale::GetSystemEncoding();
-                if ( m_encoding == wxFONTENCODING_SYSTEM )
-#endif // wxUSE_INTL
-                    m_encoding = wxFONTENCODING_ISO8859_1;
-            }
-            break;
-
-        case wxFONTENCODING_DEFAULT:
-            // wxFONTENCODING_DEFAULT is same as US-ASCII in this context
-            m_encoding = wxFONTENCODING_ISO8859_1;
-            break;
-
-        default:
-            // Just use the provided encoding.
-            m_encoding = encoding;
-    }
-}
-
-wxCSConv::wxCSConv(const wxString& charset)
-{
-    Init();
-
-    if ( !charset.empty() )
-    {
-        SetName(charset.ToAscii());
-    }
-
-#if wxUSE_FONTMAP
-    SetEncoding(wxFontMapperBase::GetEncodingFromName(charset));
-#else
-    SetEncoding(wxFONTENCODING_SYSTEM);
-#endif
-
-    m_convReal = DoCreate();
-}
-
-wxCSConv::wxCSConv(wxFontEncoding encoding)
-{
-    if ( encoding == wxFONTENCODING_MAX || encoding == wxFONTENCODING_DEFAULT )
-    {
-        wxFAIL_MSG( wxT("invalid encoding value in wxCSConv ctor") );
-
-        encoding = wxFONTENCODING_SYSTEM;
-    }
-
-    Init();
-
-    SetEncoding(encoding);
-
-    m_convReal = DoCreate();
-}
-
-wxCSConv::~wxCSConv()
-{
-    Clear();
-}
-
-wxCSConv::wxCSConv(const wxCSConv& conv)
-        : wxMBConv()
-{
-    Init();
-
-    SetName(conv.m_name);
-    SetEncoding(conv.m_encoding);
-
-    m_convReal = DoCreate();
-}
-
-wxCSConv& wxCSConv::operator=(const wxCSConv& conv)
-{
-    Clear();
-
-    SetName(conv.m_name);
-    SetEncoding(conv.m_encoding);
-
-    m_convReal = DoCreate();
-
-    return *this;
-}
-
-void wxCSConv::Clear()
-{
-    free(m_name);
-    m_name = NULL;
-
-    wxDELETE(m_convReal);
-}
-
-void wxCSConv::SetName(const char *charset)
-{
-    if ( charset )
-        m_name = wxStrdup(charset);
-}
-
-#if wxUSE_FONTMAP
-
-WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual,
-                     wxEncodingNameCache );
-
-static wxEncodingNameCache gs_nameCache;
-#endif
-
-wxMBConv *wxCSConv::DoCreate() const
-{
-#if wxUSE_FONTMAP
-    wxLogTrace(TRACE_STRCONV,
-               wxT("creating conversion for %s"),
-               (m_name ? m_name
-                       : (const char*)wxFontMapperBase::GetEncodingName(m_encoding).mb_str()));
-#endif // wxUSE_FONTMAP
-
-    // check for the special case of ASCII or ISO8859-1 charset: as we have
-    // special knowledge of it anyhow, we don't need to create a special
-    // conversion object
-    if ( m_encoding == wxFONTENCODING_ISO8859_1 )
-    {
-        // don't convert at all
-        return NULL;
-    }
-
-    // we trust OS to do conversion better than we can so try external
-    // conversion methods first
-    //
-    // the full order is:
-    //      1. OS conversion (iconv() under Unix or Win32 API)
-    //      2. hard coded conversions for UTF
-    //      3. wxEncodingConverter as fall back
-
-    // step (1)
-#ifdef HAVE_ICONV
-#if !wxUSE_FONTMAP
-    if ( m_name )
-#endif // !wxUSE_FONTMAP
-    {
-#if wxUSE_FONTMAP
-        wxFontEncoding encoding(m_encoding);
-#endif
-
-        if ( m_name )
-        {
-            wxMBConv_iconv *conv = new wxMBConv_iconv(m_name);
-            if ( conv->IsOk() )
-                return conv;
-
-            delete conv;
-
-#if wxUSE_FONTMAP
-            encoding =
-                wxFontMapperBase::Get()->CharsetToEncoding(m_name, false);
-#endif // wxUSE_FONTMAP
-        }
-#if wxUSE_FONTMAP
-        {
-            const wxEncodingNameCache::iterator it = gs_nameCache.find(encoding);
-            if ( it != gs_nameCache.end() )
-            {
-                if ( it->second.empty() )
-                    return NULL;
-
-                wxMBConv_iconv *conv = new wxMBConv_iconv(it->second.ToAscii());
-                if ( conv->IsOk() )
-                    return conv;
-
-                delete conv;
-            }
-
-            const wxChar* const* names = wxFontMapperBase::GetAllEncodingNames(encoding);
-            // CS : in case this does not return valid names (eg for MacRoman)
-            // encoding got a 'failure' entry in the cache all the same,
-            // although it just has to be created using a different method, so
-            // only store failed iconv creation attempts (or perhaps we
-            // shoulnd't do this at all ?)
-            if ( names[0] != NULL )
-            {
-                for ( ; *names; ++names )
-                {
-                    // FIXME-UTF8: wxFontMapperBase::GetAllEncodingNames()
-                    //             will need changes that will obsolete this
-                    wxString name(*names);
-                    wxMBConv_iconv *conv = new wxMBConv_iconv(name.ToAscii());
-                    if ( conv->IsOk() )
-                    {
-                        gs_nameCache[encoding] = *names;
-                        return conv;
-                    }
-
-                    delete conv;
-                }
-
-                gs_nameCache[encoding] = wxT(""); // cache the failure
-            }
-        }
-#endif // wxUSE_FONTMAP
-    }
-#endif // HAVE_ICONV
-
-#ifdef wxHAVE_WIN32_MB2WC
-    {
-#if wxUSE_FONTMAP
-        wxMBConv_win32 *conv = m_name ? new wxMBConv_win32(m_name)
-                                      : new wxMBConv_win32(m_encoding);
-        if ( conv->IsOk() )
-            return conv;
-
-        delete conv;
-#else
-        return NULL;
-#endif
-    }
-#endif // wxHAVE_WIN32_MB2WC
-
-#ifdef __DARWIN__
-    {
-        // leave UTF16 and UTF32 to the built-ins of wx
-        if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
-            ( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )
-        {
-#if wxUSE_FONTMAP
-            wxMBConv_cf *conv = m_name ? new wxMBConv_cf(m_name)
-                                          : new wxMBConv_cf(m_encoding);
-#else
-            wxMBConv_cf *conv = new wxMBConv_cf(m_encoding);
-#endif
-
-            if ( conv->IsOk() )
-                 return conv;
-
-            delete conv;
-        }
-    }
-#endif // __DARWIN__
-
-    // step (2)
-    wxFontEncoding enc = m_encoding;
-#if wxUSE_FONTMAP
-    if ( enc == wxFONTENCODING_SYSTEM && m_name )
-    {
-        // use "false" to suppress interactive dialogs -- we can be called from
-        // anywhere and popping up a dialog from here is the last thing we want to
-        // do
-        enc = wxFontMapperBase::Get()->CharsetToEncoding(m_name, false);
-    }
-#endif // wxUSE_FONTMAP
-
-    switch ( enc )
-    {
-        case wxFONTENCODING_UTF7:
-             return new wxMBConvUTF7;
-
-        case wxFONTENCODING_UTF8:
-             return new wxMBConvUTF8;
-
-        case wxFONTENCODING_UTF16BE:
-             return new wxMBConvUTF16BE;
-
-        case wxFONTENCODING_UTF16LE:
-             return new wxMBConvUTF16LE;
-
-        case wxFONTENCODING_UTF32BE:
-             return new wxMBConvUTF32BE;
-
-        case wxFONTENCODING_UTF32LE:
-             return new wxMBConvUTF32LE;
-
-        default:
-             // nothing to do but put here to suppress gcc warnings
-             break;
-    }
-
-    // step (3)
-#if wxUSE_FONTMAP
-    {
-        wxMBConv_wxwin *conv = m_name ? new wxMBConv_wxwin(m_name)
-                                      : new wxMBConv_wxwin(m_encoding);
-        if ( conv->IsOk() )
-            return conv;
-
-        delete conv;
-    }
-
-    wxLogTrace(TRACE_STRCONV,
-               wxT("encoding \"%s\" is not supported by this system"),
-               (m_name ? wxString(m_name)
-                       : wxFontMapperBase::GetEncodingName(m_encoding)));
-#endif // wxUSE_FONTMAP
-
-    return NULL;
-}
-
-bool wxCSConv::IsOk() const
-{
-    // special case: no convReal created for wxFONTENCODING_ISO8859_1
-    if ( m_encoding == wxFONTENCODING_ISO8859_1 )
-        return true; // always ok as we do it ourselves
-
-    // m_convReal->IsOk() is called at its own creation, so we know it must
-    // be ok if m_convReal is non-NULL
-    return m_convReal != NULL;
-}
-
-size_t wxCSConv::ToWChar(wchar_t *dst, size_t dstLen,
-                         const char *src, size_t srcLen) const
-{
-    if (m_convReal)
-        return m_convReal->ToWChar(dst, dstLen, src, srcLen);
-
-    // latin-1 (direct)
-    if ( srcLen == wxNO_LEN )
-        srcLen = strlen(src) + 1; // take trailing NUL too
-
-    if ( dst )
-    {
-        if ( dstLen < srcLen )
-            return wxCONV_FAILED;
-
-        for ( size_t n = 0; n < srcLen; n++ )
-            dst[n] = (unsigned char)(src[n]);
-    }
-
-    return srcLen;
-}
-
-size_t wxCSConv::FromWChar(char *dst, size_t dstLen,
-                           const wchar_t *src, size_t srcLen) const
-{
-    if (m_convReal)
-        return m_convReal->FromWChar(dst, dstLen, src, srcLen);
-
-    // latin-1 (direct)
-    if ( srcLen == wxNO_LEN )
-        srcLen = wxWcslen(src) + 1;
-
-    if ( dst )
-    {
-        if ( dstLen < srcLen )
-            return wxCONV_FAILED;
-
-        for ( size_t n = 0; n < srcLen; n++ )
-        {
-            if ( src[n] > 0xFF )
-                return wxCONV_FAILED;
-
-            dst[n] = (char)src[n];
-        }
-
-    }
-    else // still need to check the input validity
-    {
-        for ( size_t n = 0; n < srcLen; n++ )
-        {
-            if ( src[n] > 0xFF )
-                return wxCONV_FAILED;
-        }
-    }
-
-    return srcLen;
-}
-
-size_t wxCSConv::GetMBNulLen() const
-{
-    if ( m_convReal )
-        return m_convReal->GetMBNulLen();
-
-    // otherwise, we are ISO-8859-1
-    return 1;
-}
-
-#if wxUSE_UNICODE_UTF8
-bool wxCSConv::IsUTF8() const
-{
-    if ( m_convReal )
-        return m_convReal->IsUTF8();
-
-    // otherwise, we are ISO-8859-1
-    return false;
-}
-#endif
-
-
-#if wxUSE_UNICODE
-
-wxWCharBuffer wxSafeConvertMB2WX(const char *s)
-{
-    if ( !s )
-        return wxWCharBuffer();
-
-    wxWCharBuffer wbuf(wxConvLibc.cMB2WX(s));
-    if ( !wbuf )
-        wbuf = wxMBConvUTF8().cMB2WX(s);
-    if ( !wbuf )
-        wbuf = wxConvISO8859_1.cMB2WX(s);
-
-    return wbuf;
-}
-
-wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws)
-{
-    if ( !ws )
-        return wxCharBuffer();
-
-    wxCharBuffer buf(wxConvLibc.cWX2MB(ws));
-    if ( !buf )
-        buf = wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL).cWX2MB(ws);
-
-    return buf;
-}
-
-#endif // wxUSE_UNICODE
-
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-// NB: The reason why we create converted objects in this convoluted way,
-//     using a factory function instead of global variable, is that they
-//     may be used at static initialization time (some of them are used by
-//     wxString ctors and there may be a global wxString object). In other
-//     words, possibly _before_ the converter global object would be
-//     initialized.
-
-#undef wxConvLibc
-#undef wxConvUTF8
-#undef wxConvUTF7
-#undef wxConvLocal
-#undef wxConvISO8859_1
-
-#define WX_DEFINE_GLOBAL_CONV2(klass, impl_klass, name, ctor_args)      \
-    WXDLLIMPEXP_DATA_BASE(klass*) name##Ptr = NULL;                     \
-    WXDLLIMPEXP_BASE klass* wxGet_##name##Ptr()                         \
-    {                                                                   \
-        static impl_klass name##Obj ctor_args;                          \
-        return &name##Obj;                                              \
-    }                                                                   \
-    /* this ensures that all global converter objects are created */    \
-    /* by the time static initialization is done, i.e. before any */    \
-    /* thread is launched: */                                           \
-    static klass* gs_##name##instance = wxGet_##name##Ptr()
-
-#define WX_DEFINE_GLOBAL_CONV(klass, name, ctor_args) \
-    WX_DEFINE_GLOBAL_CONV2(klass, klass, name, ctor_args)
-
-#ifdef __INTELC__
-    // disable warning "variable 'xxx' was declared but never referenced"
-    #pragma warning(disable: 177)
-#endif // Intel C++
-
-#ifdef __WINDOWS__
-    WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConv_win32, wxConvLibc, wxEMPTY_PARAMETER_VALUE);
-#elif 0 // defined(__WXOSX__)
-    WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConv_cf, wxConvLibc,  (wxFONTENCODING_UTF8));
-#else
-    WX_DEFINE_GLOBAL_CONV2(wxMBConv, wxMBConvLibc, wxConvLibc, wxEMPTY_PARAMETER_VALUE);
-#endif
-
-// NB: we can't use wxEMPTY_PARAMETER_VALUE as final argument here because it's
-//     passed to WX_DEFINE_GLOBAL_CONV2 after a macro expansion and so still
-//     provokes an error message about "not enough macro parameters"; and we
-//     can't use "()" here as the name##Obj declaration would be parsed as a
-//     function declaration then, so use a semicolon and live with an extra
-//     empty statement (and hope that no compilers warns about this)
-WX_DEFINE_GLOBAL_CONV(wxMBConvStrictUTF8, wxConvUTF8, ;);
-WX_DEFINE_GLOBAL_CONV(wxMBConvUTF7, wxConvUTF7, ;);
-
-WX_DEFINE_GLOBAL_CONV(wxCSConv, wxConvLocal, (wxFONTENCODING_SYSTEM));
-WX_DEFINE_GLOBAL_CONV(wxCSConv, wxConvISO8859_1, (wxFONTENCODING_ISO8859_1));
-
-WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = wxGet_wxConvLibcPtr();
-WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI = wxGet_wxConvLocalPtr();
-
-#ifdef __DARWIN__
-// It is important to use this conversion object under Darwin as it ensures
-// that Unicode strings are (re)composed correctly even though xnu kernel uses
-// decomposed form internally (at least for the file names).
-static wxMBConv_cf wxConvMacUTF8DObj(wxFONTENCODING_UTF8);
-#endif
-
-WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName =
-#ifdef __DARWIN__
-                                    &wxConvMacUTF8DObj;
-#else // !__DARWIN__
-                                    wxGet_wxConvLibcPtr();
-#endif // __DARWIN__/!__DARWIN__
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/strconv.cpp
+// Purpose:     Unicode conversion classes
+// Author:      Ove Kaaven, Robert Roebling, Vadim Zeitlin, Vaclav Slavik,
+//              Ryan Norton, Fredrik Roubert (UTF7)
+// Modified by:
+// Created:     29/01/98
+// RCS-ID:      $Id: strconv.cpp 64156 2010-04-27 08:52:30Z VZ $
+// Copyright:   (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
+//              (c) 2000-2003 Vadim Zeitlin
+//              (c) 2004 Ryan Norton, Fredrik Roubert
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/missing.h"
+    #endif
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/hashmap.h"
+#endif
+
+#include "wx/strconv.h"
+
+#if wxUSE_WCHAR_T
+
+#ifdef __WINDOWS__
+    #include "wx/msw/private.h"
+#endif
+
+#ifndef __WXWINCE__
+#include <errno.h>
+#endif
+
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+    #define wxHAVE_WIN32_MB2WC
+#endif
+
+#ifdef __SALFORDC__
+    #include <clib.h>
+#endif
+
+#ifdef HAVE_ICONV
+    #include <iconv.h>
+    #include "wx/thread.h"
+#endif
+
+#include "wx/encconv.h"
+#include "wx/fontmap.h"
+
+#ifdef __WXMAC__
+#ifndef __DARWIN__
+#include <ATSUnicode.h>
+#include <TextCommon.h>
+#include <TextEncodingConverter.h>
+#endif
+
+// includes Mac headers
+#include "wx/mac/private.h"
+#include "wx/thread.h"
+
+#endif
+
+
+#define TRACE_STRCONV _T("strconv")
+
+// WC_UTF16 is defined only if sizeof(wchar_t) == 2, otherwise it's supposed to
+// be 4 bytes
+#if SIZEOF_WCHAR_T == 2
+    #define WC_UTF16
+#endif
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// helper function of cMB2WC(): check if n bytes at this location are all NUL
+static bool NotAllNULs(const char *p, size_t n)
+{
+    while ( n && *p++ == '\0' )
+        n--;
+
+    return n != 0;
+}
+
+// ----------------------------------------------------------------------------
+// UTF-16 en/decoding to/from UCS-4 with surrogates handling
+// ----------------------------------------------------------------------------
+
+static size_t encode_utf16(wxUint32 input, wxUint16 *output)
+{
+    if (input <= 0xffff)
+    {
+        if (output)
+            *output = (wxUint16) input;
+
+        return 1;
+    }
+    else if (input >= 0x110000)
+    {
+        return wxCONV_FAILED;
+    }
+    else
+    {
+        if (output)
+        {
+            *output++ = (wxUint16) ((input >> 10) + 0xd7c0);
+            *output = (wxUint16) ((input & 0x3ff) + 0xdc00);
+        }
+
+        return 2;
+    }
+}
+
+static size_t decode_utf16(const wxUint16* input, wxUint32& output)
+{
+    if ((*input < 0xd800) || (*input > 0xdfff))
+    {
+        output = *input;
+        return 1;
+    }
+    else if ((input[1] < 0xdc00) || (input[1] > 0xdfff))
+    {
+        output = *input;
+        return wxCONV_FAILED;
+    }
+    else
+    {
+        output = ((input[0] - 0xd7c0) << 10) + (input[1] - 0xdc00);
+        return 2;
+    }
+}
+
+#ifdef WC_UTF16
+    typedef wchar_t wxDecodeSurrogate_t;
+#else // !WC_UTF16
+    typedef wxUint16 wxDecodeSurrogate_t;
+#endif // WC_UTF16/!WC_UTF16
+
+// returns the next UTF-32 character from the wchar_t buffer and advances the
+// pointer to the character after this one
+//
+// if an invalid character is found, *pSrc is set to NULL, the caller must
+// check for this
+static wxUint32 wxDecodeSurrogate(const wxDecodeSurrogate_t **pSrc)
+{
+    wxUint32 out;
+    const size_t
+        n = decode_utf16(wx_reinterpret_cast(const wxUint16 *, *pSrc), out);
+    if ( n == wxCONV_FAILED )
+        *pSrc = NULL;
+    else
+        *pSrc += n;
+
+    return out;
+}
+
+// ----------------------------------------------------------------------------
+// wxMBConv
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConv::ToWChar(wchar_t *dst, size_t dstLen,
+                  const char *src, size_t srcLen) const
+{
+    // although new conversion classes are supposed to implement this function
+    // directly, the existins ones only implement the old MB2WC() and so, to
+    // avoid to have to rewrite all conversion classes at once, we provide a
+    // default (but not efficient) implementation of this one in terms of the
+    // old function by copying the input to ensure that it's NUL-terminated and
+    // then using MB2WC() to convert it
+
+    // the number of chars [which would be] written to dst [if it were not NULL]
+    size_t dstWritten = 0;
+
+    // the number of NULs terminating this string
+    size_t nulLen = 0;  // not really needed, but just to avoid warnings
+
+    // if we were not given the input size we just have to assume that the
+    // string is properly terminated as we have no way of knowing how long it
+    // is anyhow, but if we do have the size check whether there are enough
+    // NULs at the end
+    wxCharBuffer bufTmp;
+    const char *srcEnd;
+    if ( srcLen != wxNO_LEN )
+    {
+        // we need to know how to find the end of this string
+        nulLen = GetMBNulLen();
+        if ( nulLen == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        // if there are enough NULs we can avoid the copy
+        if ( srcLen < nulLen || NotAllNULs(src + srcLen - nulLen, nulLen) )
+        {
+            // make a copy in order to properly NUL-terminate the string
+            bufTmp = wxCharBuffer(srcLen + nulLen - 1 /* 1 will be added */);
+            char * const p = bufTmp.data();
+            memcpy(p, src, srcLen);
+            for ( char *s = p + srcLen; s < p + srcLen + nulLen; s++ )
+                *s = '\0';
+
+            src = bufTmp;
+        }
+
+        srcEnd = src + srcLen;
+    }
+    else // quit after the first loop iteration
+    {
+        srcEnd = NULL;
+    }
+
+    for ( ;; )
+    {
+        // try to convert the current chunk
+        size_t lenChunk = MB2WC(NULL, src, 0);
+        if ( lenChunk == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        lenChunk++; // for the L'\0' at the end of this chunk
+
+        dstWritten += lenChunk;
+
+        if ( lenChunk == 1 )
+        {
+            // nothing left in the input string, conversion succeeded
+            break;
+        }
+
+        if ( dst )
+        {
+            if ( dstWritten > dstLen )
+                return wxCONV_FAILED;
+
+            if ( MB2WC(dst, src, lenChunk) == wxCONV_FAILED )
+                return wxCONV_FAILED;
+
+            dst += lenChunk;
+        }
+
+        if ( !srcEnd )
+        {
+            // we convert just one chunk in this case as this is the entire
+            // string anyhow
+            break;
+        }
+
+        // advance the input pointer past the end of this chunk
+        while ( NotAllNULs(src, nulLen) )
+        {
+            // notice that we must skip over multiple bytes here as we suppose
+            // that if NUL takes 2 or 4 bytes, then all the other characters do
+            // too and so if advanced by a single byte we might erroneously
+            // detect sequences of NUL bytes in the middle of the input
+            src += nulLen;
+        }
+
+        src += nulLen; // skipping over its terminator as well
+
+        // note that ">=" (and not just "==") is needed here as the terminator
+        // we skipped just above could be inside or just after the buffer
+        // delimited by inEnd
+        if ( src >= srcEnd )
+            break;
+    }
+
+    return dstWritten;
+}
+
+size_t
+wxMBConv::FromWChar(char *dst, size_t dstLen,
+                    const wchar_t *src, size_t srcLen) const
+{
+    // the number of chars [which would be] written to dst [if it were not NULL]
+    size_t dstWritten = 0;
+
+    // make a copy of the input string unless it is already properly
+    // NUL-terminated
+    //
+    // if we don't know its length we have no choice but to assume that it is,
+    // indeed, properly terminated
+    wxWCharBuffer bufTmp;
+    if ( srcLen == wxNO_LEN )
+    {
+        srcLen = wxWcslen(src) + 1;
+    }
+    else if ( srcLen != 0 && src[srcLen - 1] != L'\0' )
+    {
+        // make a copy in order to properly NUL-terminate the string
+        bufTmp = wxWCharBuffer(srcLen);
+        memcpy(bufTmp.data(), src, srcLen * sizeof(wchar_t));
+        src = bufTmp;
+    }
+
+    const size_t lenNul = GetMBNulLen();
+    for ( const wchar_t * const srcEnd = src + srcLen;
+          src < srcEnd;
+          src += wxWcslen(src) + 1 /* skip L'\0' too */ )
+    {
+        // try to convert the current chunk
+        size_t lenChunk = WC2MB(NULL, src, 0);
+
+        if ( lenChunk == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        lenChunk += lenNul;
+        dstWritten += lenChunk;
+
+        if ( dst )
+        {
+            if ( dstWritten > dstLen )
+                return wxCONV_FAILED;
+
+            if ( WC2MB(dst, src, lenChunk) == wxCONV_FAILED )
+                return wxCONV_FAILED;
+
+            dst += lenChunk;
+        }
+    }
+
+    return dstWritten;
+}
+
+size_t wxMBConv::MB2WC(wchar_t *outBuff, const char *inBuff, size_t outLen) const
+{
+    size_t rc = ToWChar(outBuff, outLen, inBuff);
+    if ( rc != wxCONV_FAILED )
+    {
+        // ToWChar() returns the buffer length, i.e. including the trailing
+        // NUL, while this method doesn't take it into account
+        rc--;
+    }
+
+    return rc;
+}
+
+size_t wxMBConv::WC2MB(char *outBuff, const wchar_t *inBuff, size_t outLen) const
+{
+    size_t rc = FromWChar(outBuff, outLen, inBuff);
+    if ( rc != wxCONV_FAILED )
+    {
+        rc -= GetMBNulLen();
+    }
+
+    return rc;
+}
+
+wxMBConv::~wxMBConv()
+{
+    // nothing to do here (necessary for Darwin linking probably)
+}
+
+const wxWCharBuffer wxMBConv::cMB2WC(const char *psz) const
+{
+    if ( psz )
+    {
+        // calculate the length of the buffer needed first
+        const size_t nLen = MB2WC(NULL, psz, 0);
+        if ( nLen != wxCONV_FAILED )
+        {
+            // now do the actual conversion
+            wxWCharBuffer buf(nLen /* +1 added implicitly */);
+
+            // +1 for the trailing NULL
+            if ( MB2WC(buf.data(), psz, nLen + 1) != wxCONV_FAILED )
+                return buf;
+        }
+    }
+
+    return wxWCharBuffer();
+}
+
+const wxCharBuffer wxMBConv::cWC2MB(const wchar_t *pwz) const
+{
+    if ( pwz )
+    {
+        const size_t nLen = WC2MB(NULL, pwz, 0);
+        if ( nLen != wxCONV_FAILED )
+        {
+            // extra space for trailing NUL(s)
+            static const size_t extraLen = GetMaxMBNulLen();
+
+            wxCharBuffer buf(nLen + extraLen - 1);
+            if ( WC2MB(buf.data(), pwz, nLen + extraLen) != wxCONV_FAILED )
+                return buf;
+        }
+    }
+
+    return wxCharBuffer();
+}
+
+const wxWCharBuffer
+wxMBConv::cMB2WC(const char *inBuff, size_t inLen, size_t *outLen) const
+{
+    const size_t dstLen = ToWChar(NULL, 0, inBuff, inLen);
+    if ( dstLen != wxCONV_FAILED )
+    {
+        wxWCharBuffer wbuf(dstLen - 1);
+        if ( ToWChar(wbuf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
+        {
+            if ( outLen )
+            {
+                *outLen = dstLen;
+                if ( wbuf[dstLen - 1] == L'\0' )
+                    (*outLen)--;
+            }
+
+            return wbuf;
+        }
+    }
+
+    if ( outLen )
+        *outLen = 0;
+
+    return wxWCharBuffer();
+}
+
+const wxCharBuffer
+wxMBConv::cWC2MB(const wchar_t *inBuff, size_t inLen, size_t *outLen) const
+{
+    size_t dstLen = FromWChar(NULL, 0, inBuff, inLen);
+    if ( dstLen != wxCONV_FAILED )
+    {
+        // special case of empty input: can't allocate 0 size buffer below as
+        // wxCharBuffer insists on NUL-terminating it
+        wxCharBuffer buf(dstLen ? dstLen - 1 : 1);
+        if ( FromWChar(buf.data(), dstLen, inBuff, inLen) != wxCONV_FAILED )
+        {
+            if ( outLen )
+            {
+                *outLen = dstLen;
+
+                const size_t nulLen = GetMBNulLen();
+                if ( dstLen >= nulLen &&
+                        !NotAllNULs(buf.data() + dstLen - nulLen, nulLen) )
+                {
+                    // in this case the output is NUL-terminated and we're not
+                    // supposed to count NUL
+                    *outLen -= nulLen;
+                }
+            }
+
+            return buf;
+        }
+    }
+
+    if ( outLen )
+        *outLen = 0;
+
+    return wxCharBuffer();
+}
+
+// ----------------------------------------------------------------------------
+// wxMBConvLibc
+// ----------------------------------------------------------------------------
+
+size_t wxMBConvLibc::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    return wxMB2WC(buf, psz, n);
+}
+
+size_t wxMBConvLibc::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    return wxWC2MB(buf, psz, n);
+}
+
+// ----------------------------------------------------------------------------
+// wxConvBrokenFileNames
+// ----------------------------------------------------------------------------
+
+#ifdef __UNIX__
+
+wxConvBrokenFileNames::wxConvBrokenFileNames(const wxChar *charset)
+{
+    if ( !charset || wxStricmp(charset, _T("UTF-8")) == 0
+                  || wxStricmp(charset, _T("UTF8")) == 0  )
+        m_conv = new wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_PUA);
+    else
+        m_conv = new wxCSConv(charset);
+}
+
+#endif // __UNIX__
+
+// ----------------------------------------------------------------------------
+// UTF-7
+// ----------------------------------------------------------------------------
+
+// Implementation (C) 2004 Fredrik Roubert
+
+//
+// BASE64 decoding table
+//
+static const unsigned char utf7unb64[] =
+{
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0x3e, 0xff, 0xff, 0xff, 0x3f,
+    0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b,
+    0x3c, 0x3d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
+    0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
+    0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
+    0x17, 0x18, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
+    0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
+    0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
+    0x31, 0x32, 0x33, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+
+size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    size_t len = 0;
+
+    while ( *psz && (!buf || (len < n)) )
+    {
+        unsigned char cc = *psz++;
+        if (cc != '+')
+        {
+            // plain ASCII char
+            if (buf)
+                *buf++ = cc;
+            len++;
+        }
+        else if (*psz == '-')
+        {
+            // encoded plus sign
+            if (buf)
+                *buf++ = cc;
+            len++;
+            psz++;
+        }
+        else // start of BASE64 encoded string
+        {
+            bool lsb, ok;
+            unsigned int d, l;
+            for ( ok = lsb = false, d = 0, l = 0;
+                  (cc = utf7unb64[(unsigned char)*psz]) != 0xff;
+                  psz++ )
+            {
+                d <<= 6;
+                d += cc;
+                for (l += 6; l >= 8; lsb = !lsb)
+                {
+                    unsigned char c = (unsigned char)((d >> (l -= 8)) % 256);
+                    if (lsb)
+                    {
+                        if (buf)
+                            *buf++ |= c;
+                        len ++;
+                    }
+                    else
+                    {
+                        if (buf)
+                            *buf = (wchar_t)(c << 8);
+                    }
+
+                    ok = true;
+                }
+            }
+
+            if ( !ok )
+            {
+                // in valid UTF7 we should have valid characters after '+'
+                return wxCONV_FAILED;
+            }
+
+            if (*psz == '-')
+                psz++;
+        }
+    }
+
+    if ( buf && (len < n) )
+        *buf = '\0';
+
+    return len;
+}
+
+//
+// BASE64 encoding table
+//
+static const unsigned char utf7enb64[] =
+{
+    'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+    'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+    'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+    'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+    'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+    'w', 'x', 'y', 'z', '0', '1', '2', '3',
+    '4', '5', '6', '7', '8', '9', '+', '/'
+};
+
+//
+// UTF-7 encoding table
+//
+// 0 - Set D (directly encoded characters)
+// 1 - Set O (optional direct characters)
+// 2 - whitespace characters (optional)
+// 3 - special characters
+//
+static const unsigned char utf7encode[128] =
+{
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 3, 3,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 3, 0, 0, 0, 3,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0,
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 1, 1, 1,
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 3
+};
+
+size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t len = 0;
+
+    while (*psz && ((!buf) || (len < n)))
+    {
+        wchar_t cc = *psz++;
+        if (cc < 0x80 && utf7encode[cc] < 1)
+        {
+            // plain ASCII char
+            if (buf)
+                *buf++ = (char)cc;
+
+            len++;
+        }
+#ifndef WC_UTF16
+        else if (((wxUint32)cc) > 0xffff)
+        {
+            // no surrogate pair generation (yet?)
+            return wxCONV_FAILED;
+        }
+#endif
+        else
+        {
+            if (buf)
+                *buf++ = '+';
+
+            len++;
+            if (cc != '+')
+            {
+                // BASE64 encode string
+                unsigned int lsb, d, l;
+                for (d = 0, l = 0; /*nothing*/; psz++)
+                {
+                    for (lsb = 0; lsb < 2; lsb ++)
+                    {
+                        d <<= 8;
+                        d += lsb ? cc & 0xff : (cc & 0xff00) >> 8;
+
+                        for (l += 8; l >= 6; )
+                        {
+                            l -= 6;
+                            if (buf)
+                                *buf++ = utf7enb64[(d >> l) % 64];
+                            len++;
+                        }
+                    }
+
+                    cc = *psz;
+                    if (!(cc) || (cc < 0x80 && utf7encode[cc] < 1))
+                        break;
+                }
+
+                if (l != 0)
+                {
+                    if (buf)
+                        *buf++ = utf7enb64[((d % 16) << (6 - l)) % 64];
+
+                    len++;
+                }
+            }
+
+            if (buf)
+                *buf++ = '-';
+            len++;
+        }
+    }
+
+    if (buf && (len < n))
+        *buf = 0;
+
+    return len;
+}
+
+// ----------------------------------------------------------------------------
+// UTF-8
+// ----------------------------------------------------------------------------
+
+static wxUint32 utf8_max[]=
+    { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
+
+// boundaries of the private use area we use to (temporarily) remap invalid
+// characters invalid in a UTF-8 encoded string
+const wxUint32 wxUnicodePUA = 0x100000;
+const wxUint32 wxUnicodePUAEnd = wxUnicodePUA + 256;
+
+size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    size_t len = 0;
+
+    while (*psz && ((!buf) || (len < n)))
+    {
+        const char *opsz = psz;
+        bool invalid = false;
+        unsigned char cc = *psz++, fc = cc;
+        unsigned cnt;
+        for (cnt = 0; fc & 0x80; cnt++)
+            fc <<= 1;
+
+        if (!cnt)
+        {
+            // plain ASCII char
+            if (buf)
+                *buf++ = cc;
+            len++;
+
+            // escape the escape character for octal escapes
+            if ((m_options & MAP_INVALID_UTF8_TO_OCTAL)
+                    && cc == '\\' && (!buf || len < n))
+            {
+                if (buf)
+                    *buf++ = cc;
+                len++;
+            }
+        }
+        else
+        {
+            cnt--;
+            if (!cnt)
+            {
+                // invalid UTF-8 sequence
+                invalid = true;
+            }
+            else
+            {
+                unsigned ocnt = cnt - 1;
+                wxUint32 res = cc & (0x3f >> cnt);
+                while (cnt--)
+                {
+                    cc = *psz;
+                    if ((cc & 0xC0) != 0x80)
+                    {
+                        // invalid UTF-8 sequence
+                        invalid = true;
+                        break;
+                    }
+
+                    psz++;
+                    res = (res << 6) | (cc & 0x3f);
+                }
+
+                if (invalid || res <= utf8_max[ocnt])
+                {
+                    // illegal UTF-8 encoding
+                    invalid = true;
+                }
+                else if ((m_options & MAP_INVALID_UTF8_TO_PUA) &&
+                        res >= wxUnicodePUA && res < wxUnicodePUAEnd)
+                {
+                    // if one of our PUA characters turns up externally
+                    // it must also be treated as an illegal sequence
+                    // (a bit like you have to escape an escape character)
+                    invalid = true;
+                }
+                else
+                {
+#ifdef WC_UTF16
+                    // cast is ok because wchar_t == wxUuint16 if WC_UTF16
+                    size_t pa = encode_utf16(res, (wxUint16 *)buf);
+                    if (pa == wxCONV_FAILED)
+                    {
+                        invalid = true;
+                    }
+                    else
+                    {
+                        if (buf)
+                            buf += pa;
+                        len += pa;
+                    }
+#else // !WC_UTF16
+                    if (buf)
+                        *buf++ = (wchar_t)res;
+                    len++;
+#endif // WC_UTF16/!WC_UTF16
+                }
+            }
+
+            if (invalid)
+            {
+                if (m_options & MAP_INVALID_UTF8_TO_PUA)
+                {
+                    while (opsz < psz && (!buf || len < n))
+                    {
+#ifdef WC_UTF16
+                        // cast is ok because wchar_t == wxUuint16 if WC_UTF16
+                        size_t pa = encode_utf16((unsigned char)*opsz + wxUnicodePUA, (wxUint16 *)buf);
+                        wxASSERT(pa != wxCONV_FAILED);
+                        if (buf)
+                            buf += pa;
+                        opsz++;
+                        len += pa;
+#else
+                        if (buf)
+                            *buf++ = (wchar_t)(wxUnicodePUA + (unsigned char)*opsz);
+                        opsz++;
+                        len++;
+#endif
+                    }
+                }
+                else if (m_options & MAP_INVALID_UTF8_TO_OCTAL)
+                {
+                    while (opsz < psz && (!buf || len < n))
+                    {
+                        if ( buf && len + 3 < n )
+                        {
+                            unsigned char on = *opsz;
+                            *buf++ = L'\\';
+                            *buf++ = (wchar_t)( L'0' + on / 0100 );
+                            *buf++ = (wchar_t)( L'0' + (on % 0100) / 010 );
+                            *buf++ = (wchar_t)( L'0' + on % 010 );
+                        }
+
+                        opsz++;
+                        len += 4;
+                    }
+                }
+                else // MAP_INVALID_UTF8_NOT
+                {
+                    return wxCONV_FAILED;
+                }
+            }
+        }
+    }
+
+    if (buf && (len < n))
+        *buf = 0;
+
+    return len;
+}
+
+static inline bool isoctal(wchar_t wch)
+{
+    return L'0' <= wch && wch <= L'7';
+}
+
+size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    size_t len = 0;
+
+    while (*psz && ((!buf) || (len < n)))
+    {
+        wxUint32 cc;
+
+#ifdef WC_UTF16
+        // cast is ok for WC_UTF16
+        size_t pa = decode_utf16((const wxUint16 *)psz, cc);
+        psz += (pa == wxCONV_FAILED) ? 1 : pa;
+#else
+        cc = (*psz++) & 0x7fffffff;
+#endif
+
+        if ( (m_options & MAP_INVALID_UTF8_TO_PUA)
+                && cc >= wxUnicodePUA && cc < wxUnicodePUAEnd )
+        {
+            if (buf)
+                *buf++ = (char)(cc - wxUnicodePUA);
+            len++;
+        }
+        else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL)
+                    && cc == L'\\' && psz[0] == L'\\' )
+        {
+            if (buf)
+                *buf++ = (char)cc;
+            psz++;
+            len++;
+        }
+        else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) &&
+                    cc == L'\\' &&
+                        isoctal(psz[0]) && isoctal(psz[1]) && isoctal(psz[2]) )
+        {
+            if (buf)
+            {
+                *buf++ = (char) ((psz[0] - L'0') * 0100 +
+                                 (psz[1] - L'0') * 010 +
+                                 (psz[2] - L'0'));
+            }
+
+            psz += 3;
+            len++;
+        }
+        else
+        {
+            unsigned cnt;
+            for (cnt = 0; cc > utf8_max[cnt]; cnt++)
+            {
+            }
+
+            if (!cnt)
+            {
+                // plain ASCII char
+                if (buf)
+                    *buf++ = (char) cc;
+                len++;
+            }
+            else
+            {
+                len += cnt + 1;
+                if (buf)
+                {
+                    *buf++ = (char) ((-128 >> cnt) | ((cc >> (cnt * 6)) & (0x3f >> cnt)));
+                    while (cnt--)
+                        *buf++ = (char) (0x80 | ((cc >> (cnt * 6)) & 0x3f));
+                }
+            }
+        }
+    }
+
+    if (buf && (len < n))
+        *buf = 0;
+
+    return len;
+}
+
+// ============================================================================
+// UTF-16
+// ============================================================================
+
+#ifdef WORDS_BIGENDIAN
+    #define wxMBConvUTF16straight wxMBConvUTF16BE
+    #define wxMBConvUTF16swap     wxMBConvUTF16LE
+#else
+    #define wxMBConvUTF16swap     wxMBConvUTF16BE
+    #define wxMBConvUTF16straight wxMBConvUTF16LE
+#endif
+
+/* static */
+size_t wxMBConvUTF16Base::GetLength(const char *src, size_t srcLen)
+{
+    if ( srcLen == wxNO_LEN )
+    {
+        // count the number of bytes in input, including the trailing NULs
+        const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
+        for ( srcLen = 1; *inBuff++; srcLen++ )
+            ;
+
+        srcLen *= BYTES_PER_CHAR;
+    }
+    else // we already have the length
+    {
+        // we can only convert an entire number of UTF-16 characters
+        if ( srcLen % BYTES_PER_CHAR )
+            return wxCONV_FAILED;
+    }
+
+    return srcLen;
+}
+
+// case when in-memory representation is UTF-16 too
+#ifdef WC_UTF16
+
+// ----------------------------------------------------------------------------
+// conversions without endianness change
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF16straight::ToWChar(wchar_t *dst, size_t dstLen,
+                               const char *src, size_t srcLen) const
+{
+    // set up the scene for using memcpy() (which is presumably more efficient
+    // than copying the bytes one by one)
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;
+
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    if ( dst )
+    {
+        if ( dstLen < inLen )
+            return wxCONV_FAILED;
+
+        memcpy(dst, src, srcLen);
+    }
+
+    return inLen;
+}
+
+size_t
+wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen,
+                                 const wchar_t *src, size_t srcLen) const
+{
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    srcLen *= BYTES_PER_CHAR;
+
+    if ( dst )
+    {
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        memcpy(dst, src, srcLen);
+    }
+
+    return srcLen;
+}
+
+// ----------------------------------------------------------------------------
+// endian-reversing conversions
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen,
+                           const char *src, size_t srcLen) const
+{
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;
+
+    srcLen /= BYTES_PER_CHAR;
+
+    if ( dst )
+    {
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
+        for ( size_t n = 0; n < srcLen; n++, inBuff++ )
+        {
+            *dst++ = wxUINT16_SWAP_ALWAYS(*inBuff);
+        }
+    }
+
+    return srcLen;
+}
+
+size_t
+wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen,
+                             const wchar_t *src, size_t srcLen) const
+{
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    srcLen *= BYTES_PER_CHAR;
+
+    if ( dst )
+    {
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        wxUint16 *outBuff = wx_reinterpret_cast(wxUint16 *, dst);
+        for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ )
+        {
+            *outBuff++ = wxUINT16_SWAP_ALWAYS(*src);
+        }
+    }
+
+    return srcLen;
+}
+
+#else // !WC_UTF16: wchar_t is UTF-32
+
+// ----------------------------------------------------------------------------
+// conversions without endianness change
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF16straight::ToWChar(wchar_t *dst, size_t dstLen,
+                               const char *src, size_t srcLen) const
+{
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;
+
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    if ( !dst )
+    {
+        // optimization: return maximal space which could be needed for this
+        // string even if the real size could be smaller if the buffer contains
+        // any surrogates
+        return inLen;
+    }
+
+    size_t outLen = 0;
+    const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
+    for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; )
+    {
+        const wxUint32 ch = wxDecodeSurrogate(&inBuff);
+        if ( !inBuff )
+            return wxCONV_FAILED;
+
+        if ( ++outLen > dstLen )
+            return wxCONV_FAILED;
+
+        *dst++ = ch;
+    }
+
+
+    return outLen;
+}
+
+size_t
+wxMBConvUTF16straight::FromWChar(char *dst, size_t dstLen,
+                                 const wchar_t *src, size_t srcLen) const
+{
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    size_t outLen = 0;
+    wxUint16 *outBuff = wx_reinterpret_cast(wxUint16 *, dst);
+    for ( size_t n = 0; n < srcLen; n++ )
+    {
+        wxUint16 cc[2];
+        const size_t numChars = encode_utf16(*src++, cc);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        outLen += numChars * BYTES_PER_CHAR;
+        if ( outBuff )
+        {
+            if ( outLen > dstLen )
+                return wxCONV_FAILED;
+
+            *outBuff++ = cc[0];
+            if ( numChars == 2 )
+            {
+                // second character of a surrogate
+                *outBuff++ = cc[1];
+            }
+        }
+    }
+
+    return outLen;
+}
+
+// ----------------------------------------------------------------------------
+// endian-reversing conversions
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF16swap::ToWChar(wchar_t *dst, size_t dstLen,
+                           const char *src, size_t srcLen) const
+{
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;
+
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    if ( !dst )
+    {
+        // optimization: return maximal space which could be needed for this
+        // string even if the real size could be smaller if the buffer contains
+        // any surrogates
+        return inLen;
+    }
+
+    size_t outLen = 0;
+    const wxUint16 *inBuff = wx_reinterpret_cast(const wxUint16 *, src);
+    for ( const wxUint16 * const inEnd = inBuff + inLen; inBuff < inEnd; )
+    {
+        wxUint32 ch;
+        wxUint16 tmp[2];
+
+        tmp[0] = wxUINT16_SWAP_ALWAYS(*inBuff);
+        inBuff++;
+        tmp[1] = wxUINT16_SWAP_ALWAYS(*inBuff);
+
+        const size_t numChars = decode_utf16(tmp, ch);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        if ( numChars == 2 )
+            inBuff++;
+
+        if ( ++outLen > dstLen )
+            return wxCONV_FAILED;
+
+        *dst++ = ch;
+    }
+
+
+    return outLen;
+}
+
+size_t
+wxMBConvUTF16swap::FromWChar(char *dst, size_t dstLen,
+                             const wchar_t *src, size_t srcLen) const
+{
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    size_t outLen = 0;
+    wxUint16 *outBuff = wx_reinterpret_cast(wxUint16 *, dst);
+    for ( const wchar_t *srcEnd = src + srcLen; src < srcEnd; src++ )
+    {
+        wxUint16 cc[2];
+        const size_t numChars = encode_utf16(*src, cc);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        outLen += numChars * BYTES_PER_CHAR;
+        if ( outBuff )
+        {
+            if ( outLen > dstLen )
+                return wxCONV_FAILED;
+
+            *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[0]);
+            if ( numChars == 2 )
+            {
+                // second character of a surrogate
+                *outBuff++ = wxUINT16_SWAP_ALWAYS(cc[1]);
+            }
+        }
+    }
+
+    return outLen;
+}
+
+#endif // WC_UTF16/!WC_UTF16
+
+
+// ============================================================================
+// UTF-32
+// ============================================================================
+
+#ifdef WORDS_BIGENDIAN
+    #define wxMBConvUTF32straight  wxMBConvUTF32BE
+    #define wxMBConvUTF32swap      wxMBConvUTF32LE
+#else
+    #define wxMBConvUTF32swap      wxMBConvUTF32BE
+    #define wxMBConvUTF32straight  wxMBConvUTF32LE
+#endif
+
+
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32LE) wxConvUTF32LE;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF32BE) wxConvUTF32BE;
+
+/* static */
+size_t wxMBConvUTF32Base::GetLength(const char *src, size_t srcLen)
+{
+    if ( srcLen == wxNO_LEN )
+    {
+        // count the number of bytes in input, including the trailing NULs
+        const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
+        for ( srcLen = 1; *inBuff++; srcLen++ )
+            ;
+
+        srcLen *= BYTES_PER_CHAR;
+    }
+    else // we already have the length
+    {
+        // we can only convert an entire number of UTF-32 characters
+        if ( srcLen % BYTES_PER_CHAR )
+            return wxCONV_FAILED;
+    }
+
+    return srcLen;
+}
+
+// case when in-memory representation is UTF-16
+#ifdef WC_UTF16
+
+// ----------------------------------------------------------------------------
+// conversions without endianness change
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen,
+                               const char *src, size_t srcLen) const
+{
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;
+
+    const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    size_t outLen = 0;
+    for ( size_t n = 0; n < inLen; n++ )
+    {
+        wxUint16 cc[2];
+        const size_t numChars = encode_utf16(*inBuff++, cc);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        outLen += numChars;
+        if ( dst )
+        {
+            if ( outLen > dstLen )
+                return wxCONV_FAILED;
+
+            *dst++ = cc[0];
+            if ( numChars == 2 )
+            {
+                // second character of a surrogate
+                *dst++ = cc[1];
+            }
+        }
+    }
+
+    return outLen;
+}
+
+size_t
+wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
+                                 const wchar_t *src, size_t srcLen) const
+{
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    if ( !dst )
+    {
+        // optimization: return maximal space which could be needed for this
+        // string instead of the exact amount which could be less if there are
+        // any surrogates in the input
+        //
+        // we consider that surrogates are rare enough to make it worthwhile to
+        // avoid running the loop below at the cost of slightly extra memory
+        // consumption
+        return srcLen * BYTES_PER_CHAR;
+    }
+
+    wxUint32 *outBuff = wx_reinterpret_cast(wxUint32 *, dst);
+    size_t outLen = 0;
+    for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
+    {
+        const wxUint32 ch = wxDecodeSurrogate(&src);
+        if ( !src )
+            return wxCONV_FAILED;
+
+        outLen += BYTES_PER_CHAR;
+
+        if ( outLen > dstLen )
+            return wxCONV_FAILED;
+
+        *outBuff++ = ch;
+    }
+
+    return outLen;
+}
+
+// ----------------------------------------------------------------------------
+// endian-reversing conversions
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen,
+                           const char *src, size_t srcLen) const
+{
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;
+
+    const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
+    const size_t inLen = srcLen / BYTES_PER_CHAR;
+    size_t outLen = 0;
+    for ( size_t n = 0; n < inLen; n++, inBuff++ )
+    {
+        wxUint16 cc[2];
+        const size_t numChars = encode_utf16(wxUINT32_SWAP_ALWAYS(*inBuff), cc);
+        if ( numChars == wxCONV_FAILED )
+            return wxCONV_FAILED;
+
+        outLen += numChars;
+        if ( dst )
+        {
+            if ( outLen > dstLen )
+                return wxCONV_FAILED;
+
+            *dst++ = cc[0];
+            if ( numChars == 2 )
+            {
+                // second character of a surrogate
+                *dst++ = cc[1];
+            }
+        }
+    }
+
+    return outLen;
+}
+
+size_t
+wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
+                             const wchar_t *src, size_t srcLen) const
+{
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    if ( !dst )
+    {
+        // optimization: return maximal space which could be needed for this
+        // string instead of the exact amount which could be less if there are
+        // any surrogates in the input
+        //
+        // we consider that surrogates are rare enough to make it worthwhile to
+        // avoid running the loop below at the cost of slightly extra memory
+        // consumption
+        return srcLen*BYTES_PER_CHAR;
+    }
+
+    wxUint32 *outBuff = wx_reinterpret_cast(wxUint32 *, dst);
+    size_t outLen = 0;
+    for ( const wchar_t * const srcEnd = src + srcLen; src < srcEnd; )
+    {
+        const wxUint32 ch = wxDecodeSurrogate(&src);
+        if ( !src )
+            return wxCONV_FAILED;
+
+        outLen += BYTES_PER_CHAR;
+
+        if ( outLen > dstLen )
+            return wxCONV_FAILED;
+
+        *outBuff++ = wxUINT32_SWAP_ALWAYS(ch);
+    }
+
+    return outLen;
+}
+
+#else // !WC_UTF16: wchar_t is UTF-32
+
+// ----------------------------------------------------------------------------
+// conversions without endianness change
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF32straight::ToWChar(wchar_t *dst, size_t dstLen,
+                               const char *src, size_t srcLen) const
+{
+    // use memcpy() as it should be much faster than hand-written loop
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;
+
+    const size_t inLen = srcLen/BYTES_PER_CHAR;
+    if ( dst )
+    {
+        if ( dstLen < inLen )
+            return wxCONV_FAILED;
+
+        memcpy(dst, src, srcLen);
+    }
+
+    return inLen;
+}
+
+size_t
+wxMBConvUTF32straight::FromWChar(char *dst, size_t dstLen,
+                                 const wchar_t *src, size_t srcLen) const
+{
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    srcLen *= BYTES_PER_CHAR;
+
+    if ( dst )
+    {
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        memcpy(dst, src, srcLen);
+    }
+
+    return srcLen;
+}
+
+// ----------------------------------------------------------------------------
+// endian-reversing conversions
+// ----------------------------------------------------------------------------
+
+size_t
+wxMBConvUTF32swap::ToWChar(wchar_t *dst, size_t dstLen,
+                           const char *src, size_t srcLen) const
+{
+    srcLen = GetLength(src, srcLen);
+    if ( srcLen == wxNO_LEN )
+        return wxCONV_FAILED;
+
+    srcLen /= BYTES_PER_CHAR;
+
+    if ( dst )
+    {
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        const wxUint32 *inBuff = wx_reinterpret_cast(const wxUint32 *, src);
+        for ( size_t n = 0; n < srcLen; n++, inBuff++ )
+        {
+            *dst++ = wxUINT32_SWAP_ALWAYS(*inBuff);
+        }
+    }
+
+    return srcLen;
+}
+
+size_t
+wxMBConvUTF32swap::FromWChar(char *dst, size_t dstLen,
+                             const wchar_t *src, size_t srcLen) const
+{
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    srcLen *= BYTES_PER_CHAR;
+
+    if ( dst )
+    {
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        wxUint32 *outBuff = wx_reinterpret_cast(wxUint32 *, dst);
+        for ( size_t n = 0; n < srcLen; n += BYTES_PER_CHAR, src++ )
+        {
+            *outBuff++ = wxUINT32_SWAP_ALWAYS(*src);
+        }
+    }
+
+    return srcLen;
+}
+
+#endif // WC_UTF16/!WC_UTF16
+
+
+// ============================================================================
+// The classes doing conversion using the iconv_xxx() functions
+// ============================================================================
+
+#ifdef HAVE_ICONV
+
+// VS: glibc 2.1.3 is broken in that iconv() conversion to/from UCS4 fails with
+//     E2BIG if output buffer is _exactly_ as big as needed. Such case is
+//     (unless there's yet another bug in glibc) the only case when iconv()
+//     returns with (size_t)-1 (which means error) and says there are 0 bytes
+//     left in the input buffer -- when _real_ error occurs,
+//     bytes-left-in-input buffer is non-zero. Hence, this alternative test for
+//     iconv() failure.
+//     [This bug does not appear in glibc 2.2.]
+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 1
+#define ICONV_FAILED(cres, bufLeft) ((cres == (size_t)-1) && \
+                                     (errno != E2BIG || bufLeft != 0))
+#else
+#define ICONV_FAILED(cres, bufLeft)  (cres == (size_t)-1)
+#endif
+
+#define ICONV_CHAR_CAST(x)  ((ICONV_CONST char **)(x))
+
+#define ICONV_T_INVALID ((iconv_t)-1)
+
+#if SIZEOF_WCHAR_T == 4
+    #define WC_BSWAP    wxUINT32_SWAP_ALWAYS
+    #define WC_ENC      wxFONTENCODING_UTF32
+#elif SIZEOF_WCHAR_T == 2
+    #define WC_BSWAP    wxUINT16_SWAP_ALWAYS
+    #define WC_ENC      wxFONTENCODING_UTF16
+#else // sizeof(wchar_t) != 2 nor 4
+    // does this ever happen?
+    #error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"
+#endif
+
+// ----------------------------------------------------------------------------
+// wxMBConv_iconv: encapsulates an iconv character set
+// ----------------------------------------------------------------------------
+
+class wxMBConv_iconv : public wxMBConv
+{
+public:
+    wxMBConv_iconv(const wxChar *name);
+    virtual ~wxMBConv_iconv();
+
+    virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
+    virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
+
+    // classify this encoding as explained in wxMBConv::GetMBNulLen() comment
+    virtual size_t GetMBNulLen() const;
+
+    virtual wxMBConv *Clone() const
+    {
+        wxMBConv_iconv *p = new wxMBConv_iconv(m_name);
+        p->m_minMBCharWidth = m_minMBCharWidth;
+        return p;
+    }
+
+    bool IsOk() const
+        { return (m2w != ICONV_T_INVALID) && (w2m != ICONV_T_INVALID); }
+
+protected:
+    // the iconv handlers used to translate from multibyte
+    // to wide char and in the other direction
+    iconv_t m2w,
+            w2m;
+
+#if wxUSE_THREADS
+    // guards access to m2w and w2m objects
+    wxMutex m_iconvMutex;
+#endif
+
+private:
+    // the name (for iconv_open()) of a wide char charset -- if none is
+    // available on this machine, it will remain NULL
+    static wxString ms_wcCharsetName;
+
+    // true if the wide char encoding we use (i.e. ms_wcCharsetName) has
+    // different endian-ness than the native one
+    static bool ms_wcNeedsSwap;
+
+
+    // name of the encoding handled by this conversion
+    wxString m_name;
+
+    // cached result of GetMBNulLen(); set to 0 meaning "unknown"
+    // initially
+    size_t m_minMBCharWidth;
+};
+
+// make the constructor available for unit testing
+WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name )
+{
+    wxMBConv_iconv* result = new wxMBConv_iconv( name );
+    if ( !result->IsOk() )
+    {
+        delete result;
+        return 0;
+    }
+
+    return result;
+}
+
+wxString wxMBConv_iconv::ms_wcCharsetName;
+bool wxMBConv_iconv::ms_wcNeedsSwap = false;
+
+wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
+              : m_name(name)
+{
+    m_minMBCharWidth = 0;
+
+    // iconv operates with chars, not wxChars, but luckily it uses only ASCII
+    // names for the charsets
+    const wxCharBuffer cname(wxString(name).ToAscii());
+
+    // check for charset that represents wchar_t:
+    if ( ms_wcCharsetName.empty() )
+    {
+        wxLogTrace(TRACE_STRCONV, _T("Looking for wide char codeset:"));
+
+#if wxUSE_FONTMAP
+        const wxChar **names = wxFontMapperBase::GetAllEncodingNames(WC_ENC);
+#else // !wxUSE_FONTMAP
+        static const wxChar *names_static[] =
+        {
+#if SIZEOF_WCHAR_T == 4
+            _T("UCS-4"),
+#elif SIZEOF_WCHAR_T == 2
+            _T("UCS-2"),
+#endif
+            NULL
+        };
+        const wxChar **names = names_static;
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
+
+        for ( ; *names && ms_wcCharsetName.empty(); ++names )
+        {
+            const wxString nameCS(*names);
+
+            // first try charset with explicit bytesex info (e.g. "UCS-4LE"):
+            wxString nameXE(nameCS);
+
+#ifdef WORDS_BIGENDIAN
+                nameXE += _T("BE");
+#else // little endian
+                nameXE += _T("LE");
+#endif
+
+            wxLogTrace(TRACE_STRCONV, _T("  trying charset \"%s\""),
+                       nameXE.c_str());
+
+            m2w = iconv_open(nameXE.ToAscii(), cname);
+            if ( m2w == ICONV_T_INVALID )
+            {
+                // try charset w/o bytesex info (e.g. "UCS4")
+                wxLogTrace(TRACE_STRCONV, _T("  trying charset \"%s\""),
+                           nameCS.c_str());
+                m2w = iconv_open(nameCS.ToAscii(), cname);
+
+                // and check for bytesex ourselves:
+                if ( m2w != ICONV_T_INVALID )
+                {
+                    char    buf[2], *bufPtr;
+                    wchar_t wbuf[2], *wbufPtr;
+                    size_t  insz, outsz;
+                    size_t  res;
+
+                    buf[0] = 'A';
+                    buf[1] = 0;
+                    wbuf[0] = 0;
+                    insz = 2;
+                    outsz = SIZEOF_WCHAR_T * 2;
+                    wbufPtr = wbuf;
+                    bufPtr = buf;
+
+                    res = iconv(
+                        m2w, ICONV_CHAR_CAST(&bufPtr), &insz,
+                        (char**)&wbufPtr, &outsz);
+
+                    if (ICONV_FAILED(res, insz))
+                    {
+                        wxLogLastError(wxT("iconv"));
+                        wxLogError(_("Conversion to charset '%s' doesn't work."),
+                                   nameCS.c_str());
+                    }
+                    else // ok, can convert to this encoding, remember it
+                    {
+                        ms_wcCharsetName = nameCS;
+                        ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0];
+                    }
+                }
+            }
+            else // use charset not requiring byte swapping
+            {
+                ms_wcCharsetName = nameXE;
+            }
+        }
+
+        wxLogTrace(TRACE_STRCONV,
+                   wxT("iconv wchar_t charset is \"%s\"%s"),
+                   ms_wcCharsetName.empty() ? _T("<none>")
+                                            : ms_wcCharsetName.c_str(),
+                   ms_wcNeedsSwap ? _T(" (needs swap)")
+                                  : _T(""));
+    }
+    else // we already have ms_wcCharsetName
+    {
+        m2w = iconv_open(ms_wcCharsetName.ToAscii(), cname);
+    }
+
+    if ( ms_wcCharsetName.empty() )
+    {
+        w2m = ICONV_T_INVALID;
+    }
+    else
+    {
+        w2m = iconv_open(cname, ms_wcCharsetName.ToAscii());
+        if ( w2m == ICONV_T_INVALID )
+        {
+            wxLogTrace(TRACE_STRCONV,
+                       wxT("\"%s\" -> \"%s\" works but not the converse!?"),
+                       ms_wcCharsetName.c_str(), cname.data());
+        }
+    }
+}
+
+wxMBConv_iconv::~wxMBConv_iconv()
+{
+    if ( m2w != ICONV_T_INVALID )
+        iconv_close(m2w);
+    if ( w2m != ICONV_T_INVALID )
+        iconv_close(w2m);
+}
+
+size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    // find the string length: notice that must be done differently for
+    // NUL-terminated strings and UTF-16/32 which are terminated with 2/4 NULs
+    size_t inbuf;
+    const size_t nulLen = GetMBNulLen();
+    switch ( nulLen )
+    {
+        default:
+            return wxCONV_FAILED;
+
+        case 1:
+            inbuf = strlen(psz); // arguably more optimized than our version
+            break;
+
+        case 2:
+        case 4:
+            // for UTF-16/32 not only we need to have 2/4 consecutive NULs but
+            // they also have to start at character boundary and not span two
+            // adjacent characters
+            const char *p;
+            for ( p = psz; NotAllNULs(p, nulLen); p += nulLen )
+                ;
+            inbuf = p - psz;
+            break;
+    }
+
+#if wxUSE_THREADS
+    // NB: iconv() is MT-safe, but each thread must use its own iconv_t handle.
+    //     Unfortunately there are a couple of global wxCSConv objects such as
+    //     wxConvLocal that are used all over wx code, so we have to make sure
+    //     the handle is used by at most one thread at the time. Otherwise
+    //     only a few wx classes would be safe to use from non-main threads
+    //     as MB<->WC conversion would fail "randomly".
+    wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
+#endif // wxUSE_THREADS
+
+    size_t outbuf = n * SIZEOF_WCHAR_T;
+    size_t res, cres;
+    // VS: Use these instead of psz, buf because iconv() modifies its arguments:
+    wchar_t *bufPtr = buf;
+    const char *pszPtr = psz;
+
+    if (buf)
+    {
+        // have destination buffer, convert there
+        cres = iconv(m2w,
+                     ICONV_CHAR_CAST(&pszPtr), &inbuf,
+                     (char**)&bufPtr, &outbuf);
+        res = n - (outbuf / SIZEOF_WCHAR_T);
+
+        if (ms_wcNeedsSwap)
+        {
+            // convert to native endianness
+            for ( unsigned i = 0; i < res; i++ )
+                buf[n] = WC_BSWAP(buf[i]);
+        }
+
+        // NUL-terminate the string if there is any space left
+        if (res < n)
+            buf[res] = 0;
+    }
+    else
+    {
+        // no destination buffer... convert using temp buffer
+        // to calculate destination buffer requirement
+        wchar_t tbuf[8];
+        res = 0;
+
+        do
+        {
+            bufPtr = tbuf;
+            outbuf = 8 * SIZEOF_WCHAR_T;
+
+            cres = iconv(m2w,
+                         ICONV_CHAR_CAST(&pszPtr), &inbuf,
+                         (char**)&bufPtr, &outbuf );
+
+            res += 8 - (outbuf / SIZEOF_WCHAR_T);
+        }
+        while ((cres == (size_t)-1) && (errno == E2BIG));
+    }
+
+    if (ICONV_FAILED(cres, inbuf))
+    {
+        //VS: it is ok if iconv fails, hence trace only
+        wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
+        return wxCONV_FAILED;
+    }
+
+    return res;
+}
+
+size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+#if wxUSE_THREADS
+    // NB: explained in MB2WC
+    wxMutexLocker lock(wxConstCast(this, wxMBConv_iconv)->m_iconvMutex);
+#endif
+
+    size_t inlen = wxWcslen(psz);
+    size_t inbuf = inlen * SIZEOF_WCHAR_T;
+    size_t outbuf = n;
+    size_t res, cres;
+
+    wchar_t *tmpbuf = 0;
+
+    if (ms_wcNeedsSwap)
+    {
+        // need to copy to temp buffer to switch endianness
+        // (doing WC_BSWAP twice on the original buffer won't help, as it
+        //  could be in read-only memory, or be accessed in some other thread)
+        tmpbuf = (wchar_t *)malloc(inbuf + SIZEOF_WCHAR_T);
+        for ( size_t i = 0; i < inlen; i++ )
+            tmpbuf[n] = WC_BSWAP(psz[i]);
+
+        tmpbuf[inlen] = L'\0';
+        psz = tmpbuf;
+    }
+
+    if (buf)
+    {
+        // have destination buffer, convert there
+        cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
+
+        res = n - outbuf;
+
+        // NB: iconv was given only wcslen(psz) characters on input, and so
+        //     it couldn't convert the trailing zero. Let's do it ourselves
+        //     if there's some room left for it in the output buffer.
+        if (res < n)
+            buf[0] = 0;
+    }
+    else
+    {
+        // no destination buffer: convert using temp buffer
+        // to calculate destination buffer requirement
+        char tbuf[16];
+        res = 0;
+        do
+        {
+            buf = tbuf;
+            outbuf = 16;
+
+            cres = iconv( w2m, ICONV_CHAR_CAST(&psz), &inbuf, &buf, &outbuf );
+
+            res += 16 - outbuf;
+        }
+        while ((cres == (size_t)-1) && (errno == E2BIG));
+    }
+
+    if (ms_wcNeedsSwap)
+    {
+        free(tmpbuf);
+    }
+
+    if (ICONV_FAILED(cres, inbuf))
+    {
+        wxLogTrace(TRACE_STRCONV, wxT("iconv failed: %s"), wxSysErrorMsg(wxSysErrorCode()));
+        return wxCONV_FAILED;
+    }
+
+    return res;
+}
+
+size_t wxMBConv_iconv::GetMBNulLen() const
+{
+    if ( m_minMBCharWidth == 0 )
+    {
+        wxMBConv_iconv * const self = wxConstCast(this, wxMBConv_iconv);
+
+#if wxUSE_THREADS
+        // NB: explained in MB2WC
+        wxMutexLocker lock(self->m_iconvMutex);
+#endif
+
+        const wchar_t *wnul = L"";
+        char buf[8]; // should be enough for NUL in any encoding
+        size_t inLen = sizeof(wchar_t),
+               outLen = WXSIZEOF(buf);
+        char *inBuff = (char *)wnul;
+        char *outBuff = buf;
+        if ( iconv(w2m, ICONV_CHAR_CAST(&inBuff), &inLen, &outBuff, &outLen) == (size_t)-1 )
+        {
+            self->m_minMBCharWidth = (size_t)-1;
+        }
+        else // ok
+        {
+            self->m_minMBCharWidth = outBuff - buf;
+        }
+    }
+
+    return m_minMBCharWidth;
+}
+
+#endif // HAVE_ICONV
+
+
+// ============================================================================
+// Win32 conversion classes
+// ============================================================================
+
+#ifdef wxHAVE_WIN32_MB2WC
+
+// from utils.cpp
+#if wxUSE_FONTMAP
+extern WXDLLIMPEXP_BASE long wxCharsetToCodepage(const wxChar *charset);
+extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding);
+#endif
+
+class wxMBConv_win32 : public wxMBConv
+{
+public:
+    wxMBConv_win32()
+    {
+        m_CodePage = CP_ACP;
+        m_minMBCharWidth = 0;
+    }
+
+    wxMBConv_win32(const wxMBConv_win32& conv)
+        : wxMBConv()
+    {
+        m_CodePage = conv.m_CodePage;
+        m_minMBCharWidth = conv.m_minMBCharWidth;
+    }
+
+#if wxUSE_FONTMAP
+    wxMBConv_win32(const wxChar* name)
+    {
+        m_CodePage = wxCharsetToCodepage(name);
+        m_minMBCharWidth = 0;
+    }
+
+    wxMBConv_win32(wxFontEncoding encoding)
+    {
+        m_CodePage = wxEncodingToCodepage(encoding);
+        m_minMBCharWidth = 0;
+    }
+#endif // wxUSE_FONTMAP
+
+    virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
+    {
+        // note that we have to use MB_ERR_INVALID_CHARS flag as it without it
+        // the behaviour is not compatible with the Unix version (using iconv)
+        // and break the library itself, e.g. wxTextInputStream::NextChar()
+        // wouldn't work if reading an incomplete MB char didn't result in an
+        // error
+        //
+        // Moreover, MB_ERR_INVALID_CHARS is only supported on Win 2K SP4 or
+        // Win XP or newer and it is not supported for UTF-[78] so we always
+        // use our own conversions in this case. See
+        //     http://blogs.msdn.com/michkap/archive/2005/04/19/409566.aspx
+        //     http://msdn.microsoft.com/library/en-us/intl/unicode_17si.asp
+        if ( m_CodePage == CP_UTF8 )
+        {
+            return wxConvUTF8.MB2WC(buf, psz, n);
+        }
+
+        if ( m_CodePage == CP_UTF7 )
+        {
+            return wxConvUTF7.MB2WC(buf, psz, n);
+        }
+
+        int flags = 0;
+        if ( (m_CodePage < 50000 && m_CodePage != CP_SYMBOL) &&
+                IsAtLeastWin2kSP4() )
+        {
+            flags = MB_ERR_INVALID_CHARS;
+        }
+
+        const size_t len = ::MultiByteToWideChar
+                             (
+                                m_CodePage,     // code page
+                                flags,          // flags: fall on error
+                                psz,            // input string
+                                -1,             // its length (NUL-terminated)
+                                buf,            // output string
+                                buf ? n : 0     // size of output buffer
+                             );
+        if ( !len )
+        {
+            // function totally failed
+            return wxCONV_FAILED;
+        }
+
+        // if we were really converting and didn't use MB_ERR_INVALID_CHARS,
+        // check if we succeeded, by doing a double trip:
+        if ( !flags && buf )
+        {
+            const size_t mbLen = strlen(psz);
+            wxCharBuffer mbBuf(mbLen);
+            if ( ::WideCharToMultiByte
+                   (
+                      m_CodePage,
+                      0,
+                      buf,
+                      -1,
+                      mbBuf.data(),
+                      mbLen + 1,        // size in bytes, not length
+                      NULL,
+                      NULL
+                   ) == 0 ||
+                  strcmp(mbBuf, psz) != 0 )
+            {
+                // we didn't obtain the same thing we started from, hence
+                // the conversion was lossy and we consider that it failed
+                return wxCONV_FAILED;
+            }
+        }
+
+        // note that it returns count of written chars for buf != NULL and size
+        // of the needed buffer for buf == NULL so in either case the length of
+        // the string (which never includes the terminating NUL) is one less
+        return len - 1;
+    }
+
+    virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const
+    {
+        /*
+            we have a problem here: by default, WideCharToMultiByte() may
+            replace characters unrepresentable in the target code page with bad
+            quality approximations such as turning "1/2" symbol (U+00BD) into
+            "1" for the code pages which don't have it and we, obviously, want
+            to avoid this at any price
+
+            the trouble is that this function does it _silently_, i.e. it won't
+            even tell us whether it did or not... Win98/2000 and higher provide
+            WC_NO_BEST_FIT_CHARS but it doesn't work for the older systems and
+            we have to resort to a round trip, i.e. check that converting back
+            results in the same string -- this is, of course, expensive but
+            otherwise we simply can't be sure to not garble the data.
+         */
+
+        // determine if we can rely on WC_NO_BEST_FIT_CHARS: according to MSDN
+        // it doesn't work with CJK encodings (which we test for rather roughly
+        // here...) nor with UTF-7/8 nor, of course, with Windows versions not
+        // supporting it
+        BOOL usedDef wxDUMMY_INITIALIZE(false);
+        BOOL *pUsedDef;
+        int flags;
+        if ( CanUseNoBestFit() && m_CodePage < 50000 )
+        {
+            // it's our lucky day
+            flags = WC_NO_BEST_FIT_CHARS;
+            pUsedDef = &usedDef;
+        }
+        else // old system or unsupported encoding
+        {
+            flags = 0;
+            pUsedDef = NULL;
+        }
+
+        const size_t len = ::WideCharToMultiByte
+                             (
+                                m_CodePage,     // code page
+                                flags,          // either none or no best fit
+                                pwz,            // input string
+                                -1,             // it is (wide) NUL-terminated
+                                buf,            // output buffer
+                                buf ? n : 0,    // and its size
+                                NULL,           // default "replacement" char
+                                pUsedDef        // [out] was it used?
+                             );
+
+        if ( !len )
+        {
+            // function totally failed
+            return wxCONV_FAILED;
+        }
+
+        // if we were really converting, check if we succeeded
+        if ( buf )
+        {
+            if ( flags )
+            {
+                // check if the conversion failed, i.e. if any replacements
+                // were done
+                if ( usedDef )
+                    return wxCONV_FAILED;
+            }
+            else // we must resort to double tripping...
+            {
+                wxWCharBuffer wcBuf(n);
+                if ( MB2WC(wcBuf.data(), buf, n) == wxCONV_FAILED ||
+                        wcscmp(wcBuf, pwz) != 0 )
+                {
+                    // we didn't obtain the same thing we started from, hence
+                    // the conversion was lossy and we consider that it failed
+                    return wxCONV_FAILED;
+                }
+            }
+        }
+
+        // see the comment above for the reason of "len - 1"
+        return len - 1;
+    }
+
+    virtual size_t GetMBNulLen() const
+    {
+        if ( m_minMBCharWidth == 0 )
+        {
+            int len = ::WideCharToMultiByte
+                        (
+                            m_CodePage,     // code page
+                            0,              // no flags
+                            L"",            // input string
+                            1,              // translate just the NUL
+                            NULL,           // output buffer
+                            0,              // and its size
+                            NULL,           // no replacement char
+                            NULL            // [out] don't care if it was used
+                        );
+
+            wxMBConv_win32 * const self = wxConstCast(this, wxMBConv_win32);
+            switch ( len )
+            {
+                default:
+                    wxLogDebug(_T("Unexpected NUL length %d"), len);
+                    self->m_minMBCharWidth = (size_t)-1;
+                    break;
+
+                case 0:
+                    self->m_minMBCharWidth = (size_t)-1;
+                    break;
+
+                case 1:
+                case 2:
+                case 4:
+                    self->m_minMBCharWidth = len;
+                    break;
+            }
+        }
+
+        return m_minMBCharWidth;
+    }
+
+    virtual wxMBConv *Clone() const { return new wxMBConv_win32(*this); }
+
+    bool IsOk() const { return m_CodePage != -1; }
+
+private:
+    static bool CanUseNoBestFit()
+    {
+        static int s_isWin98Or2k = -1;
+
+        if ( s_isWin98Or2k == -1 )
+        {
+            int verMaj, verMin;
+            switch ( wxGetOsVersion(&verMaj, &verMin) )
+            {
+                case wxOS_WINDOWS_9X:
+                    s_isWin98Or2k = verMaj >= 4 && verMin >= 10;
+                    break;
+
+                case wxOS_WINDOWS_NT:
+                    s_isWin98Or2k = verMaj >= 5;
+                    break;
+
+                default:
+                    // unknown: be conservative by default
+                    s_isWin98Or2k = 0;
+                    break;
+            }
+
+            wxASSERT_MSG( s_isWin98Or2k != -1, _T("should be set above") );
+        }
+
+        return s_isWin98Or2k == 1;
+    }
+
+    static bool IsAtLeastWin2kSP4()
+    {
+#ifdef __WXWINCE__
+        return false;
+#else
+        static int s_isAtLeastWin2kSP4 = -1;
+
+        if ( s_isAtLeastWin2kSP4 == -1 )
+        {
+            OSVERSIONINFOEX ver;
+
+            memset(&ver, 0, sizeof(ver));
+            ver.dwOSVersionInfoSize = sizeof(ver);
+            GetVersionEx((OSVERSIONINFO*)&ver);
+
+            s_isAtLeastWin2kSP4 =
+              ((ver.dwMajorVersion > 5) || // Vista+
+               (ver.dwMajorVersion == 5 && ver.dwMinorVersion > 0) || // XP/2003
+               (ver.dwMajorVersion == 5 && ver.dwMinorVersion == 0 &&
+               ver.wServicePackMajor >= 4)) // 2000 SP4+
+              ? 1 : 0;
+        }
+
+        return s_isAtLeastWin2kSP4 == 1;
+#endif
+    }
+
+
+    // the code page we're working with
+    long m_CodePage;
+
+    // cached result of GetMBNulLen(), set to 0 initially meaning
+    // "unknown"
+    size_t m_minMBCharWidth;
+};
+
+#endif // wxHAVE_WIN32_MB2WC
+
+// ============================================================================
+// Cocoa conversion classes
+// ============================================================================
+
+#if defined(__WXCOCOA__)
+
+// RN: There is no UTF-32 support in either Core Foundation or Cocoa.
+// Strangely enough, internally Core Foundation uses
+// UTF-32 internally quite a bit - its just not public (yet).
+
+#include <CoreFoundation/CFString.h>
+#include <CoreFoundation/CFStringEncodingExt.h>
+
+CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
+{
+    CFStringEncoding enc = kCFStringEncodingInvalidId ;
+
+    switch (encoding)
+    {
+        case wxFONTENCODING_DEFAULT :
+            enc = CFStringGetSystemEncoding();
+            break ;
+
+        case wxFONTENCODING_ISO8859_1 :
+            enc = kCFStringEncodingISOLatin1 ;
+            break ;
+        case wxFONTENCODING_ISO8859_2 :
+            enc = kCFStringEncodingISOLatin2;
+            break ;
+        case wxFONTENCODING_ISO8859_3 :
+            enc = kCFStringEncodingISOLatin3 ;
+            break ;
+        case wxFONTENCODING_ISO8859_4 :
+            enc = kCFStringEncodingISOLatin4;
+            break ;
+        case wxFONTENCODING_ISO8859_5 :
+            enc = kCFStringEncodingISOLatinCyrillic;
+            break ;
+        case wxFONTENCODING_ISO8859_6 :
+            enc = kCFStringEncodingISOLatinArabic;
+            break ;
+        case wxFONTENCODING_ISO8859_7 :
+            enc = kCFStringEncodingISOLatinGreek;
+            break ;
+        case wxFONTENCODING_ISO8859_8 :
+            enc = kCFStringEncodingISOLatinHebrew;
+            break ;
+        case wxFONTENCODING_ISO8859_9 :
+            enc = kCFStringEncodingISOLatin5;
+            break ;
+        case wxFONTENCODING_ISO8859_10 :
+            enc = kCFStringEncodingISOLatin6;
+            break ;
+        case wxFONTENCODING_ISO8859_11 :
+            enc = kCFStringEncodingISOLatinThai;
+            break ;
+        case wxFONTENCODING_ISO8859_13 :
+            enc = kCFStringEncodingISOLatin7;
+            break ;
+        case wxFONTENCODING_ISO8859_14 :
+            enc = kCFStringEncodingISOLatin8;
+            break ;
+        case wxFONTENCODING_ISO8859_15 :
+            enc = kCFStringEncodingISOLatin9;
+            break ;
+
+        case wxFONTENCODING_KOI8 :
+            enc = kCFStringEncodingKOI8_R;
+            break ;
+        case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
+            enc = kCFStringEncodingDOSRussian;
+            break ;
+
+//      case wxFONTENCODING_BULGARIAN :
+//          enc = ;
+//          break ;
+
+        case wxFONTENCODING_CP437 :
+            enc = kCFStringEncodingDOSLatinUS ;
+            break ;
+        case wxFONTENCODING_CP850 :
+            enc = kCFStringEncodingDOSLatin1;
+            break ;
+        case wxFONTENCODING_CP852 :
+            enc = kCFStringEncodingDOSLatin2;
+            break ;
+        case wxFONTENCODING_CP855 :
+            enc = kCFStringEncodingDOSCyrillic;
+            break ;
+        case wxFONTENCODING_CP866 :
+            enc = kCFStringEncodingDOSRussian ;
+            break ;
+        case wxFONTENCODING_CP874 :
+            enc = kCFStringEncodingDOSThai;
+            break ;
+        case wxFONTENCODING_CP932 :
+            enc = kCFStringEncodingDOSJapanese;
+            break ;
+        case wxFONTENCODING_CP936 :
+            enc = kCFStringEncodingDOSChineseSimplif ;
+            break ;
+        case wxFONTENCODING_CP949 :
+            enc = kCFStringEncodingDOSKorean;
+            break ;
+        case wxFONTENCODING_CP950 :
+            enc = kCFStringEncodingDOSChineseTrad;
+            break ;
+        case wxFONTENCODING_CP1250 :
+            enc = kCFStringEncodingWindowsLatin2;
+            break ;
+        case wxFONTENCODING_CP1251 :
+            enc = kCFStringEncodingWindowsCyrillic ;
+            break ;
+        case wxFONTENCODING_CP1252 :
+            enc = kCFStringEncodingWindowsLatin1 ;
+            break ;
+        case wxFONTENCODING_CP1253 :
+            enc = kCFStringEncodingWindowsGreek;
+            break ;
+        case wxFONTENCODING_CP1254 :
+            enc = kCFStringEncodingWindowsLatin5;
+            break ;
+        case wxFONTENCODING_CP1255 :
+            enc = kCFStringEncodingWindowsHebrew ;
+            break ;
+        case wxFONTENCODING_CP1256 :
+            enc = kCFStringEncodingWindowsArabic ;
+            break ;
+        case wxFONTENCODING_CP1257 :
+            enc = kCFStringEncodingWindowsBalticRim;
+            break ;
+//   This only really encodes to UTF7 (if that) evidently
+//        case wxFONTENCODING_UTF7 :
+//            enc = kCFStringEncodingNonLossyASCII ;
+//            break ;
+        case wxFONTENCODING_UTF8 :
+            enc = kCFStringEncodingUTF8 ;
+            break ;
+        case wxFONTENCODING_EUC_JP :
+            enc = kCFStringEncodingEUC_JP;
+            break ;
+        case wxFONTENCODING_UTF16 :
+            enc = kCFStringEncodingUnicode ;
+            break ;
+        case wxFONTENCODING_MACROMAN :
+            enc = kCFStringEncodingMacRoman ;
+            break ;
+        case wxFONTENCODING_MACJAPANESE :
+            enc = kCFStringEncodingMacJapanese ;
+            break ;
+        case wxFONTENCODING_MACCHINESETRAD :
+            enc = kCFStringEncodingMacChineseTrad ;
+            break ;
+        case wxFONTENCODING_MACKOREAN :
+            enc = kCFStringEncodingMacKorean ;
+            break ;
+        case wxFONTENCODING_MACARABIC :
+            enc = kCFStringEncodingMacArabic ;
+            break ;
+        case wxFONTENCODING_MACHEBREW :
+            enc = kCFStringEncodingMacHebrew ;
+            break ;
+        case wxFONTENCODING_MACGREEK :
+            enc = kCFStringEncodingMacGreek ;
+            break ;
+        case wxFONTENCODING_MACCYRILLIC :
+            enc = kCFStringEncodingMacCyrillic ;
+            break ;
+        case wxFONTENCODING_MACDEVANAGARI :
+            enc = kCFStringEncodingMacDevanagari ;
+            break ;
+        case wxFONTENCODING_MACGURMUKHI :
+            enc = kCFStringEncodingMacGurmukhi ;
+            break ;
+        case wxFONTENCODING_MACGUJARATI :
+            enc = kCFStringEncodingMacGujarati ;
+            break ;
+        case wxFONTENCODING_MACORIYA :
+            enc = kCFStringEncodingMacOriya ;
+            break ;
+        case wxFONTENCODING_MACBENGALI :
+            enc = kCFStringEncodingMacBengali ;
+            break ;
+        case wxFONTENCODING_MACTAMIL :
+            enc = kCFStringEncodingMacTamil ;
+            break ;
+        case wxFONTENCODING_MACTELUGU :
+            enc = kCFStringEncodingMacTelugu ;
+            break ;
+        case wxFONTENCODING_MACKANNADA :
+            enc = kCFStringEncodingMacKannada ;
+            break ;
+        case wxFONTENCODING_MACMALAJALAM :
+            enc = kCFStringEncodingMacMalayalam ;
+            break ;
+        case wxFONTENCODING_MACSINHALESE :
+            enc = kCFStringEncodingMacSinhalese ;
+            break ;
+        case wxFONTENCODING_MACBURMESE :
+            enc = kCFStringEncodingMacBurmese ;
+            break ;
+        case wxFONTENCODING_MACKHMER :
+            enc = kCFStringEncodingMacKhmer ;
+            break ;
+        case wxFONTENCODING_MACTHAI :
+            enc = kCFStringEncodingMacThai ;
+            break ;
+        case wxFONTENCODING_MACLAOTIAN :
+            enc = kCFStringEncodingMacLaotian ;
+            break ;
+        case wxFONTENCODING_MACGEORGIAN :
+            enc = kCFStringEncodingMacGeorgian ;
+            break ;
+        case wxFONTENCODING_MACARMENIAN :
+            enc = kCFStringEncodingMacArmenian ;
+            break ;
+        case wxFONTENCODING_MACCHINESESIMP :
+            enc = kCFStringEncodingMacChineseSimp ;
+            break ;
+        case wxFONTENCODING_MACTIBETAN :
+            enc = kCFStringEncodingMacTibetan ;
+            break ;
+        case wxFONTENCODING_MACMONGOLIAN :
+            enc = kCFStringEncodingMacMongolian ;
+            break ;
+        case wxFONTENCODING_MACETHIOPIC :
+            enc = kCFStringEncodingMacEthiopic ;
+            break ;
+        case wxFONTENCODING_MACCENTRALEUR :
+            enc = kCFStringEncodingMacCentralEurRoman ;
+            break ;
+        case wxFONTENCODING_MACVIATNAMESE :
+            enc = kCFStringEncodingMacVietnamese ;
+            break ;
+        case wxFONTENCODING_MACARABICEXT :
+            enc = kCFStringEncodingMacExtArabic ;
+            break ;
+        case wxFONTENCODING_MACSYMBOL :
+            enc = kCFStringEncodingMacSymbol ;
+            break ;
+        case wxFONTENCODING_MACDINGBATS :
+            enc = kCFStringEncodingMacDingbats ;
+            break ;
+        case wxFONTENCODING_MACTURKISH :
+            enc = kCFStringEncodingMacTurkish ;
+            break ;
+        case wxFONTENCODING_MACCROATIAN :
+            enc = kCFStringEncodingMacCroatian ;
+            break ;
+        case wxFONTENCODING_MACICELANDIC :
+            enc = kCFStringEncodingMacIcelandic ;
+            break ;
+        case wxFONTENCODING_MACROMANIAN :
+            enc = kCFStringEncodingMacRomanian ;
+            break ;
+        case wxFONTENCODING_MACCELTIC :
+            enc = kCFStringEncodingMacCeltic ;
+            break ;
+        case wxFONTENCODING_MACGAELIC :
+            enc = kCFStringEncodingMacGaelic ;
+            break ;
+//      case wxFONTENCODING_MACKEYBOARD :
+//          enc = kCFStringEncodingMacKeyboardGlyphs ;
+//          break ;
+
+        default :
+            // because gcc is picky
+            break ;
+    }
+
+    return enc ;
+}
+
+class wxMBConv_cocoa : public wxMBConv
+{
+public:
+    wxMBConv_cocoa()
+    {
+        Init(CFStringGetSystemEncoding()) ;
+    }
+
+    wxMBConv_cocoa(const wxMBConv_cocoa& conv)
+    {
+        m_encoding = conv.m_encoding;
+    }
+
+#if wxUSE_FONTMAP
+    wxMBConv_cocoa(const wxChar* name)
+    {
+        Init( wxCFStringEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
+    }
+#endif
+
+    wxMBConv_cocoa(wxFontEncoding encoding)
+    {
+        Init( wxCFStringEncFromFontEnc(encoding) );
+    }
+
+    virtual ~wxMBConv_cocoa()
+    {
+    }
+
+    void Init( CFStringEncoding encoding)
+    {
+        m_encoding = encoding ;
+    }
+
+    size_t MB2WC(wchar_t * szOut, const char * szUnConv, size_t nOutSize) const
+    {
+        wxASSERT(szUnConv);
+
+        CFStringRef theString = CFStringCreateWithBytes (
+                                                NULL, //the allocator
+                                                (const UInt8*)szUnConv,
+                                                strlen(szUnConv),
+                                                m_encoding,
+                                                false //no BOM/external representation
+                                                );
+
+        wxASSERT(theString);
+
+        size_t nOutLength = CFStringGetLength(theString);
+
+        if (szOut == NULL)
+        {
+            CFRelease(theString);
+            return nOutLength;
+        }
+
+        CFRange theRange = { 0, nOutSize };
+
+#if SIZEOF_WCHAR_T == 4
+        UniChar* szUniCharBuffer = new UniChar[nOutSize];
+#endif
+
+        CFStringGetCharacters(theString, theRange, szUniCharBuffer);
+
+        CFRelease(theString);
+
+        szUniCharBuffer[nOutLength] = '\0';
+
+#if SIZEOF_WCHAR_T == 4
+        wxMBConvUTF16 converter;
+        converter.MB2WC( szOut, (const char*)szUniCharBuffer, nOutSize );
+        delete [] szUniCharBuffer;
+#endif
+
+        return nOutLength;
+    }
+
+    size_t WC2MB(char *szOut, const wchar_t *szUnConv, size_t nOutSize) const
+    {
+        wxASSERT(szUnConv);
+
+        size_t nRealOutSize;
+        size_t nBufSize = wxWcslen(szUnConv);
+        UniChar* szUniBuffer = (UniChar*) szUnConv;
+
+#if SIZEOF_WCHAR_T == 4
+        wxMBConvUTF16 converter ;
+        nBufSize = converter.WC2MB( NULL, szUnConv, 0 );
+        szUniBuffer = new UniChar[ (nBufSize / sizeof(UniChar)) + 1];
+        converter.WC2MB( (char*) szUniBuffer, szUnConv, nBufSize + sizeof(UniChar));
+        nBufSize /= sizeof(UniChar);
+#endif
+
+        CFStringRef theString = CFStringCreateWithCharactersNoCopy(
+                                NULL, //allocator
+                                szUniBuffer,
+                                nBufSize,
+                                kCFAllocatorNull //deallocator - we want to deallocate it ourselves
+                            );
+
+        wxASSERT(theString);
+
+        //Note that CER puts a BOM when converting to unicode
+        //so we  check and use getchars instead in that case
+        if (m_encoding == kCFStringEncodingUnicode)
+        {
+            if (szOut != NULL)
+                CFStringGetCharacters(theString, CFRangeMake(0, nOutSize - 1), (UniChar*) szOut);
+
+            nRealOutSize = CFStringGetLength(theString) + 1;
+        }
+        else
+        {
+            CFStringGetBytes(
+                theString,
+                CFRangeMake(0, CFStringGetLength(theString)),
+                m_encoding,
+                0, //what to put in characters that can't be converted -
+                    //0 tells CFString to return NULL if it meets such a character
+                false, //not an external representation
+                (UInt8*) szOut,
+                nOutSize,
+                (CFIndex*) &nRealOutSize
+                        );
+        }
+
+        CFRelease(theString);
+
+#if SIZEOF_WCHAR_T == 4
+        delete[] szUniBuffer;
+#endif
+
+        return  nRealOutSize - 1;
+    }
+
+    virtual wxMBConv *Clone() const { return new wxMBConv_cocoa(*this); }
+
+    bool IsOk() const
+    {
+        return m_encoding != kCFStringEncodingInvalidId &&
+              CFStringIsEncodingAvailable(m_encoding);
+    }
+
+private:
+    CFStringEncoding m_encoding ;
+};
+
+#endif // defined(__WXCOCOA__)
+
+// ============================================================================
+// Mac conversion classes
+// ============================================================================
+
+#if defined(__WXMAC__) && defined(TARGET_CARBON)
+
+class wxMBConv_mac : public wxMBConv
+{
+public:
+    wxMBConv_mac()
+    {
+        Init(CFStringGetSystemEncoding()) ;
+    }
+
+    wxMBConv_mac(const wxMBConv_mac& conv)
+    {
+        Init(conv.m_char_encoding);
+    }
+
+#if wxUSE_FONTMAP
+    wxMBConv_mac(const wxChar* name)
+    {
+        wxFontEncoding enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false);
+        Init( (enc != wxFONTENCODING_SYSTEM) ? wxMacGetSystemEncFromFontEnc( enc ) : kTextEncodingUnknown);
+    }
+#endif
+
+    wxMBConv_mac(wxFontEncoding encoding)
+    {
+        Init( wxMacGetSystemEncFromFontEnc(encoding) );
+    }
+
+    virtual ~wxMBConv_mac()
+    {
+        OSStatus status = noErr ;
+        if (m_MB2WC_converter)
+            status = TECDisposeConverter(m_MB2WC_converter);
+        if (m_WC2MB_converter)
+            status = TECDisposeConverter(m_WC2MB_converter);
+    }
+
+    void Init( TextEncodingBase encoding,TextEncodingVariant encodingVariant = kTextEncodingDefaultVariant ,
+            TextEncodingFormat encodingFormat = kTextEncodingDefaultFormat)
+    {
+        m_MB2WC_converter = NULL ;
+        m_WC2MB_converter = NULL ;
+        if ( encoding != kTextEncodingUnknown )
+        {
+            m_char_encoding = CreateTextEncoding(encoding, encodingVariant, encodingFormat) ;
+            m_unicode_encoding = CreateTextEncoding(kTextEncodingUnicodeDefault, 0, kUnicode16BitFormat) ;
+        }
+        else
+        {
+            m_char_encoding = kTextEncodingUnknown;
+            m_unicode_encoding = kTextEncodingUnknown;
+        }
+    }
+
+    virtual void CreateIfNeeded() const
+    {
+        if ( m_MB2WC_converter == NULL && m_WC2MB_converter == NULL && 
+            m_char_encoding != kTextEncodingUnknown && m_unicode_encoding != kTextEncodingUnknown )
+        {
+            OSStatus status = noErr ;
+            status = TECCreateConverter(&m_MB2WC_converter,
+                                    m_char_encoding,
+                                    m_unicode_encoding);
+            wxASSERT_MSG( status == noErr , _("Unable to create TextEncodingConverter")) ;
+            status = TECCreateConverter(&m_WC2MB_converter,
+                                    m_unicode_encoding,
+                                    m_char_encoding);
+            wxASSERT_MSG( status == noErr , _("Unable to create TextEncodingConverter")) ;
+        }
+    }
+
+    size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
+    {
+        CreateIfNeeded() ;
+        OSStatus status = noErr ;
+        ByteCount byteOutLen ;
+        ByteCount byteInLen = strlen(psz) + 1;
+        wchar_t *tbuf = NULL ;
+        UniChar* ubuf = NULL ;
+        size_t res = 0 ;
+
+        if (buf == NULL)
+        {
+            // Apple specs say at least 32
+            n = wxMax( 32, byteInLen ) ;
+            tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T ) ;
+        }
+
+        ByteCount byteBufferLen = n * sizeof( UniChar ) ;
+
+#if SIZEOF_WCHAR_T == 4
+        ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ;
+#else
+        ubuf = (UniChar*) (buf ? buf : tbuf) ;
+#endif
+        {
+#if wxUSE_THREADS
+            wxMutexLocker lock( m_MB2WC_guard );
+#endif
+            status = TECConvertText(
+            m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen,
+            (TextPtr) ubuf, byteBufferLen, &byteOutLen);
+        }
+
+#if SIZEOF_WCHAR_T == 4
+        // we have to terminate here, because n might be larger for the trailing zero, and if UniChar
+        // is not properly terminated we get random characters at the end
+        ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;
+        wxMBConvUTF16 converter ;
+        res = converter.MB2WC( (buf ? buf : tbuf), (const char*)ubuf, n ) ;
+        free( ubuf ) ;
+#else
+        res = byteOutLen / sizeof( UniChar ) ;
+#endif
+
+        if ( buf == NULL )
+             free(tbuf) ;
+
+        if ( buf  && res < n)
+            buf[res] = 0;
+
+        return res ;
+    }
+
+    size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const
+    {
+        CreateIfNeeded() ;
+        OSStatus status = noErr ;
+        ByteCount byteOutLen ;
+        ByteCount byteInLen = wxWcslen(psz) * SIZEOF_WCHAR_T ;
+
+        char *tbuf = NULL ;
+
+        if (buf == NULL)
+        {
+            // Apple specs say at least 32
+            n = wxMax( 32, ((byteInLen / SIZEOF_WCHAR_T) * 8) + SIZEOF_WCHAR_T );
+            tbuf = (char*) malloc( n ) ;
+        }
+
+        ByteCount byteBufferLen = n ;
+        UniChar* ubuf = NULL ;
+
+#if SIZEOF_WCHAR_T == 4
+        wxMBConvUTF16 converter ;
+        size_t unicharlen = converter.WC2MB( NULL, psz, 0 ) ;
+        byteInLen = unicharlen ;
+        ubuf = (UniChar*) malloc( byteInLen + 2 ) ;
+        converter.WC2MB( (char*) ubuf, psz, unicharlen + 2 ) ;
+#else
+        ubuf = (UniChar*) psz ;
+#endif
+
+        {
+#if wxUSE_THREADS
+            wxMutexLocker lock( m_WC2MB_guard );
+#endif
+            status = TECConvertText(
+            m_WC2MB_converter, (ConstTextPtr) ubuf, byteInLen, &byteInLen,
+            (TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen);
+        }
+        
+#if SIZEOF_WCHAR_T == 4
+        free( ubuf ) ;
+#endif
+
+        if ( buf == NULL )
+            free(tbuf) ;
+
+        size_t res = byteOutLen ;
+        if ( buf  && res < n)
+        {
+            buf[res] = 0;
+
+            //we need to double-trip to verify it didn't insert any ? in place
+            //of bogus characters
+            wxWCharBuffer wcBuf(n);
+            size_t pszlen = wxWcslen(psz);
+            if ( MB2WC(wcBuf.data(), buf, n) == wxCONV_FAILED ||
+                        wxWcslen(wcBuf) != pszlen ||
+                        memcmp(wcBuf, psz, pszlen * sizeof(wchar_t)) != 0 )
+            {
+                // we didn't obtain the same thing we started from, hence
+                // the conversion was lossy and we consider that it failed
+                return wxCONV_FAILED;
+            }
+        }
+
+        return res ;
+    }
+
+    virtual wxMBConv *Clone() const { return new wxMBConv_mac(*this); }
+
+    bool IsOk() const
+    {
+        CreateIfNeeded() ;
+        return m_MB2WC_converter != NULL && m_WC2MB_converter != NULL;
+    }
+
+protected :
+    mutable TECObjectRef m_MB2WC_converter;
+    mutable TECObjectRef m_WC2MB_converter;
+#if wxUSE_THREADS
+    mutable wxMutex m_MB2WC_guard;
+    mutable wxMutex m_WC2MB_guard;
+#endif
+
+    TextEncodingBase m_char_encoding;
+    TextEncodingBase m_unicode_encoding;
+};
+
+// MB is decomposed (D) normalized UTF8
+
+class wxMBConv_macUTF8D : public wxMBConv_mac
+{
+public :
+    wxMBConv_macUTF8D()
+    {
+        Init( kTextEncodingUnicodeDefault , kUnicodeNoSubset , kUnicodeUTF8Format ) ;
+        m_uni = NULL;
+        m_uniBack = NULL ;
+    }
+
+    virtual ~wxMBConv_macUTF8D()
+    {
+        if (m_uni!=NULL)
+            DisposeUnicodeToTextInfo(&m_uni);
+        if (m_uniBack!=NULL)
+            DisposeUnicodeToTextInfo(&m_uniBack);
+    }
+
+    size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const
+    {
+        CreateIfNeeded() ;
+        OSStatus status = noErr ;
+        ByteCount byteOutLen ;
+        ByteCount byteInLen = wxWcslen(psz) * SIZEOF_WCHAR_T ;
+
+        char *tbuf = NULL ;
+
+        if (buf == NULL)
+        {
+            // Apple specs say at least 32
+            n = wxMax( 32, ((byteInLen / SIZEOF_WCHAR_T) * 8) + SIZEOF_WCHAR_T );
+            tbuf = (char*) malloc( n ) ;
+        }
+
+        ByteCount byteBufferLen = n ;
+        UniChar* ubuf = NULL ;
+
+#if SIZEOF_WCHAR_T == 4
+        wxMBConvUTF16 converter ;
+        size_t unicharlen = converter.WC2MB( NULL, psz, 0 ) ;
+        byteInLen = unicharlen ;
+        ubuf = (UniChar*) malloc( byteInLen + 2 ) ;
+        converter.WC2MB( (char*) ubuf, psz, unicharlen + 2 ) ;
+#else
+        ubuf = (UniChar*) psz ;
+#endif
+
+        // ubuf is a non-decomposed UniChar buffer
+
+        ByteCount dcubuflen = byteInLen * 2 + 2 ;
+        ByteCount dcubufread , dcubufwritten ;
+        UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ;
+
+        {
+#if wxUSE_THREADS
+            wxMutexLocker lock( m_WC2MB_guard );
+#endif
+            ConvertFromUnicodeToText( m_uni , byteInLen , ubuf ,
+                kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen  , &dcubufread , &dcubufwritten , dcubuf ) ;
+
+            // we now convert that decomposed buffer into UTF8
+
+            status = TECConvertText(
+            m_WC2MB_converter, (ConstTextPtr) dcubuf, dcubufwritten, &dcubufread,
+            (TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen);
+        }
+        
+        free( dcubuf );
+
+#if SIZEOF_WCHAR_T == 4
+        free( ubuf ) ;
+#endif
+
+        if ( buf == NULL )
+            free(tbuf) ;
+
+        size_t res = byteOutLen ;
+        if ( buf  && res < n)
+        {
+            buf[res] = 0;
+            // don't test for round-trip fidelity yet, we cannot guarantee it yet
+        }
+
+        return res ;
+    }
+
+    size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const
+    {
+        CreateIfNeeded() ;
+        OSStatus status = noErr ;
+        ByteCount byteOutLen ;
+        ByteCount byteInLen = strlen(psz) + 1;
+        wchar_t *tbuf = NULL ;
+        UniChar* ubuf = NULL ;
+        size_t res = 0 ;
+
+        if (buf == NULL)
+        {
+            // Apple specs say at least 32
+            n = wxMax( 32, byteInLen ) ;
+            tbuf = (wchar_t*) malloc( n * SIZEOF_WCHAR_T ) ;
+        }
+
+        ByteCount byteBufferLen = n * sizeof( UniChar ) ;
+
+#if SIZEOF_WCHAR_T == 4
+        ubuf = (UniChar*) malloc( byteBufferLen + 2 ) ;
+#else
+        ubuf = (UniChar*) (buf ? buf : tbuf) ;
+#endif
+
+        ByteCount dcubuflen = byteBufferLen * 2 + 2 ;
+        ByteCount dcubufread , dcubufwritten ;
+        UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ;
+
+        {
+#if wxUSE_THREADS
+            wxMutexLocker lock( m_MB2WC_guard );
+#endif
+            status = TECConvertText(
+                                m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen,
+                                (TextPtr) dcubuf, dcubuflen, &byteOutLen);
+            // we have to terminate here, because n might be larger for the trailing zero, and if UniChar
+            // is not properly terminated we get random characters at the end
+            dcubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;
+
+            // now from the decomposed UniChar to properly composed uniChar
+            ConvertFromUnicodeToText( m_uniBack , byteOutLen , dcubuf ,
+                                  kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen  , &dcubufread , &dcubufwritten , ubuf ) ;
+        }
+
+        free( dcubuf );
+        byteOutLen = dcubufwritten ;
+        ubuf[byteOutLen / sizeof( UniChar ) ] = 0 ;
+
+
+#if SIZEOF_WCHAR_T == 4
+        wxMBConvUTF16 converter ;
+        res = converter.MB2WC( (buf ? buf : tbuf), (const char*)ubuf, n ) ;
+        free( ubuf ) ;
+#else
+        res = byteOutLen / sizeof( UniChar ) ;
+#endif
+
+        if ( buf == NULL )
+            free(tbuf) ;
+
+        if ( buf  && res < n)
+            buf[res] = 0;
+
+        return res ;
+    }
+
+    virtual void CreateIfNeeded() const
+    {
+        wxMBConv_mac::CreateIfNeeded() ;
+        if ( m_uni == NULL )
+        {
+            m_map.unicodeEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
+                kUnicodeNoSubset, kTextEncodingDefaultFormat);
+            m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
+                kUnicodeCanonicalDecompVariant, kTextEncodingDefaultFormat);
+            m_map.mappingVersion = kUnicodeUseLatestMapping;
+
+            OSStatus err = CreateUnicodeToTextInfo(&m_map, &m_uni);
+            wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ;
+
+            m_map.unicodeEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
+                                                       kUnicodeNoSubset, kTextEncodingDefaultFormat);
+            m_map.otherEncoding = CreateTextEncoding(kTextEncodingUnicodeDefault,
+                                                     kUnicodeCanonicalCompVariant, kTextEncodingDefaultFormat);
+            m_map.mappingVersion = kUnicodeUseLatestMapping;
+            err = CreateUnicodeToTextInfo(&m_map, &m_uniBack);
+            wxASSERT_MSG( err == noErr , _(" Couldn't create the UnicodeConverter")) ;
+        }
+    }
+protected :
+    mutable UnicodeToTextInfo   m_uni;
+    mutable UnicodeToTextInfo   m_uniBack;
+    mutable UnicodeMapping      m_map;
+};
+#endif // defined(__WXMAC__) && defined(TARGET_CARBON)
+
+// ============================================================================
+// wxEncodingConverter based conversion classes
+// ============================================================================
+
+#if wxUSE_FONTMAP
+
+class wxMBConv_wxwin : public wxMBConv
+{
+private:
+    void Init()
+    {
+        m_ok = m2w.Init(m_enc, wxFONTENCODING_UNICODE) &&
+               w2m.Init(wxFONTENCODING_UNICODE, m_enc);
+    }
+
+public:
+    // temporarily just use wxEncodingConverter stuff,
+    // so that it works while a better implementation is built
+    wxMBConv_wxwin(const wxChar* name)
+    {
+        if (name)
+            m_enc = wxFontMapperBase::Get()->CharsetToEncoding(name, false);
+        else
+            m_enc = wxFONTENCODING_SYSTEM;
+
+        Init();
+    }
+
+    wxMBConv_wxwin(wxFontEncoding enc)
+    {
+        m_enc = enc;
+
+        Init();
+    }
+
+    size_t MB2WC(wchar_t *buf, const char *psz, size_t WXUNUSED(n)) const
+    {
+        size_t inbuf = strlen(psz);
+        if (buf)
+        {
+            if (!m2w.Convert(psz, buf))
+                return wxCONV_FAILED;
+        }
+        return inbuf;
+    }
+
+    size_t WC2MB(char *buf, const wchar_t *psz, size_t WXUNUSED(n)) const
+    {
+        const size_t inbuf = wxWcslen(psz);
+        if (buf)
+        {
+            if (!w2m.Convert(psz, buf))
+                return wxCONV_FAILED;
+        }
+
+        return inbuf;
+    }
+
+    virtual size_t GetMBNulLen() const
+    {
+        switch ( m_enc )
+        {
+            case wxFONTENCODING_UTF16BE:
+            case wxFONTENCODING_UTF16LE:
+                return 2;
+
+            case wxFONTENCODING_UTF32BE:
+            case wxFONTENCODING_UTF32LE:
+                return 4;
+
+            default:
+                return 1;
+        }
+    }
+
+    virtual wxMBConv *Clone() const { return new wxMBConv_wxwin(m_enc); }
+
+    bool IsOk() const { return m_ok; }
+
+public:
+    wxFontEncoding m_enc;
+    wxEncodingConverter m2w, w2m;
+
+private:
+    // were we initialized successfully?
+    bool m_ok;
+
+    DECLARE_NO_COPY_CLASS(wxMBConv_wxwin)
+};
+
+// make the constructors available for unit testing
+WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_wxwin( const wxChar* name )
+{
+    wxMBConv_wxwin* result = new wxMBConv_wxwin( name );
+    if ( !result->IsOk() )
+    {
+        delete result;
+        return 0;
+    }
+
+    return result;
+}
+
+#endif // wxUSE_FONTMAP
+
+// ============================================================================
+// wxCSConv implementation
+// ============================================================================
+
+void wxCSConv::Init()
+{
+    m_name = NULL;
+    m_convReal =  NULL;
+    m_deferred = true;
+}
+
+wxCSConv::wxCSConv(const wxChar *charset)
+{
+    Init();
+
+    if ( charset )
+    {
+        SetName(charset);
+    }
+
+#if wxUSE_FONTMAP
+    m_encoding = wxFontMapperBase::GetEncodingFromName(charset);
+    if ( m_encoding == wxFONTENCODING_MAX )
+    {
+        // set to unknown/invalid value
+        m_encoding = wxFONTENCODING_SYSTEM;
+    }
+    else if ( m_encoding == wxFONTENCODING_DEFAULT )
+    {
+        // wxFONTENCODING_DEFAULT is same as US-ASCII in this context
+        m_encoding = wxFONTENCODING_ISO8859_1;
+    }
+#else
+    m_encoding = wxFONTENCODING_SYSTEM;
+#endif
+}
+
+wxCSConv::wxCSConv(wxFontEncoding encoding)
+{
+    if ( encoding == wxFONTENCODING_MAX || encoding == wxFONTENCODING_DEFAULT )
+    {
+        wxFAIL_MSG( _T("invalid encoding value in wxCSConv ctor") );
+
+        encoding = wxFONTENCODING_SYSTEM;
+    }
+
+    Init();
+
+    m_encoding = encoding;
+}
+
+wxCSConv::~wxCSConv()
+{
+    Clear();
+}
+
+wxCSConv::wxCSConv(const wxCSConv& conv)
+        : wxMBConv()
+{
+    Init();
+
+    SetName(conv.m_name);
+    m_encoding = conv.m_encoding;
+}
+
+wxCSConv& wxCSConv::operator=(const wxCSConv& conv)
+{
+    Clear();
+
+    SetName(conv.m_name);
+    m_encoding = conv.m_encoding;
+
+    return *this;
+}
+
+void wxCSConv::Clear()
+{
+    free(m_name);
+    delete m_convReal;
+
+    m_name = NULL;
+    m_convReal = NULL;
+}
+
+void wxCSConv::SetName(const wxChar *charset)
+{
+    if (charset)
+    {
+        m_name = wxStrdup(charset);
+        m_deferred = true;
+    }
+}
+
+#if wxUSE_FONTMAP
+
+WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual,
+                     wxEncodingNameCache );
+
+static wxEncodingNameCache gs_nameCache;
+#endif
+
+wxMBConv *wxCSConv::DoCreate() const
+{
+#if wxUSE_FONTMAP
+    wxLogTrace(TRACE_STRCONV,
+               wxT("creating conversion for %s"),
+               (m_name ? m_name
+                       : wxFontMapperBase::GetEncodingName(m_encoding).c_str()));
+#endif // wxUSE_FONTMAP
+
+    // check for the special case of ASCII or ISO8859-1 charset: as we have
+    // special knowledge of it anyhow, we don't need to create a special
+    // conversion object
+    if ( m_encoding == wxFONTENCODING_ISO8859_1 ||
+            m_encoding == wxFONTENCODING_DEFAULT )
+    {
+        // don't convert at all
+        return NULL;
+    }
+
+    // we trust OS to do conversion better than we can so try external
+    // conversion methods first
+    //
+    // the full order is:
+    //      1. OS conversion (iconv() under Unix or Win32 API)
+    //      2. hard coded conversions for UTF
+    //      3. wxEncodingConverter as fall back
+
+    // step (1)
+#ifdef HAVE_ICONV
+#if !wxUSE_FONTMAP
+    if ( m_name )
+#endif // !wxUSE_FONTMAP
+    {
+        wxString name(m_name);
+#if wxUSE_FONTMAP
+        wxFontEncoding encoding(m_encoding);
+#endif
+
+        if ( !name.empty() )
+        {
+            wxMBConv_iconv *conv = new wxMBConv_iconv(name);
+            if ( conv->IsOk() )
+                return conv;
+
+            delete conv;
+
+#if wxUSE_FONTMAP
+            encoding =
+                wxFontMapperBase::Get()->CharsetToEncoding(name, false);
+#endif // wxUSE_FONTMAP
+        }
+#if wxUSE_FONTMAP
+        {
+            const wxEncodingNameCache::iterator it = gs_nameCache.find(encoding);
+            if ( it != gs_nameCache.end() )
+            {
+                if ( it->second.empty() )
+                    return NULL;
+
+                wxMBConv_iconv *conv = new wxMBConv_iconv(it->second);
+                if ( conv->IsOk() )
+                    return conv;
+
+                delete conv;
+            }
+
+            const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding);
+            // CS : in case this does not return valid names (eg for MacRoman) encoding
+            // got a 'failure' entry in the cache all the same, although it just has to
+            // be created using a different method, so only store failed iconv creation
+            // attempts (or perhaps we shoulnd't do this at all ?)
+            if ( names[0] != NULL )
+            {
+                for ( ; *names; ++names )
+                {
+                    wxMBConv_iconv *conv = new wxMBConv_iconv(*names);
+                    if ( conv->IsOk() )
+                    {
+                        gs_nameCache[encoding] = *names;
+                        return conv;
+                    }
+
+                    delete conv;
+                }
+
+                gs_nameCache[encoding] = _T(""); // cache the failure
+            }
+        }
+#endif // wxUSE_FONTMAP
+    }
+#endif // HAVE_ICONV
+
+#ifdef wxHAVE_WIN32_MB2WC
+    {
+#if wxUSE_FONTMAP
+        wxMBConv_win32 *conv = m_name ? new wxMBConv_win32(m_name)
+                                      : new wxMBConv_win32(m_encoding);
+        if ( conv->IsOk() )
+            return conv;
+
+        delete conv;
+#else
+        return NULL;
+#endif
+    }
+#endif // wxHAVE_WIN32_MB2WC
+
+#if defined(__WXMAC__)
+    {
+        // leave UTF16 and UTF32 to the built-ins of wx
+        if ( m_name || ( m_encoding < wxFONTENCODING_UTF16BE ||
+            ( m_encoding >= wxFONTENCODING_MACMIN && m_encoding <= wxFONTENCODING_MACMAX ) ) )
+        {
+#if wxUSE_FONTMAP
+            wxMBConv_mac *conv = m_name ? new wxMBConv_mac(m_name)
+                                        : new wxMBConv_mac(m_encoding);
+#else
+            wxMBConv_mac *conv = new wxMBConv_mac(m_encoding);
+#endif
+            if ( conv->IsOk() )
+                 return conv;
+
+            delete conv;
+        }
+    }
+#endif
+
+#if defined(__WXCOCOA__)
+    {
+        if ( m_name || ( m_encoding <= wxFONTENCODING_UTF16 ) )
+        {
+#if wxUSE_FONTMAP
+            wxMBConv_cocoa *conv = m_name ? new wxMBConv_cocoa(m_name)
+                                          : new wxMBConv_cocoa(m_encoding);
+#else
+            wxMBConv_cocoa *conv = new wxMBConv_cocoa(m_encoding);
+#endif
+
+            if ( conv->IsOk() )
+                 return conv;
+
+            delete conv;
+        }
+    }
+#endif
+    // step (2)
+    wxFontEncoding enc = m_encoding;
+#if wxUSE_FONTMAP
+    if ( enc == wxFONTENCODING_SYSTEM && m_name )
+    {
+        // use "false" to suppress interactive dialogs -- we can be called from
+        // anywhere and popping up a dialog from here is the last thing we want to
+        // do
+        enc = wxFontMapperBase::Get()->CharsetToEncoding(m_name, false);
+    }
+#endif // wxUSE_FONTMAP
+
+    switch ( enc )
+    {
+        case wxFONTENCODING_UTF7:
+             return new wxMBConvUTF7;
+
+        case wxFONTENCODING_UTF8:
+             return new wxMBConvUTF8;
+
+        case wxFONTENCODING_UTF16BE:
+             return new wxMBConvUTF16BE;
+
+        case wxFONTENCODING_UTF16LE:
+             return new wxMBConvUTF16LE;
+
+        case wxFONTENCODING_UTF32BE:
+             return new wxMBConvUTF32BE;
+
+        case wxFONTENCODING_UTF32LE:
+             return new wxMBConvUTF32LE;
+
+        default:
+             // nothing to do but put here to suppress gcc warnings
+             break;
+    }
+
+    // step (3)
+#if wxUSE_FONTMAP
+    {
+        wxMBConv_wxwin *conv = m_name ? new wxMBConv_wxwin(m_name)
+                                      : new wxMBConv_wxwin(m_encoding);
+        if ( conv->IsOk() )
+            return conv;
+
+        delete conv;
+    }
+#endif // wxUSE_FONTMAP
+
+    // NB: This is a hack to prevent deadlock. What could otherwise happen
+    //     in Unicode build: wxConvLocal creation ends up being here
+    //     because of some failure and logs the error. But wxLog will try to
+    //     attach a timestamp, for which it will need wxConvLocal (to convert
+    //     time to char* and then wchar_t*), but that fails, tries to log the
+    //     error, but wxLog has an (already locked) critical section that
+    //     guards the static buffer.
+    static bool alreadyLoggingError = false;
+    if (!alreadyLoggingError)
+    {
+        alreadyLoggingError = true;
+        wxLogError(_("Cannot convert from the charset '%s'!"),
+                   m_name ? m_name
+                      :
+#if wxUSE_FONTMAP
+                         wxFontMapperBase::GetEncodingDescription(m_encoding).c_str()
+#else // !wxUSE_FONTMAP
+                         wxString::Format(_("encoding %i"), m_encoding).c_str()
+#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
+              );
+
+        alreadyLoggingError = false;
+    }
+
+    return NULL;
+}
+
+void wxCSConv::CreateConvIfNeeded() const
+{
+    if ( m_deferred )
+    {
+        wxCSConv *self = (wxCSConv *)this; // const_cast
+
+        // if we don't have neither the name nor the encoding, use the default
+        // encoding for this system
+        if ( !m_name && m_encoding == wxFONTENCODING_SYSTEM )
+        {
+#if wxUSE_INTL
+            self->m_encoding = wxLocale::GetSystemEncoding();
+#else
+            // fallback to some reasonable default:
+            self->m_encoding = wxFONTENCODING_ISO8859_1;
+#endif // wxUSE_INTL
+        }
+
+        self->m_convReal = DoCreate();
+        self->m_deferred = false;
+    }
+}
+
+bool wxCSConv::IsOk() const
+{
+    CreateConvIfNeeded();
+
+    // special case: no convReal created for wxFONTENCODING_ISO8859_1
+    if ( m_encoding == wxFONTENCODING_ISO8859_1 )
+        return true; // always ok as we do it ourselves
+
+    // m_convReal->IsOk() is called at its own creation, so we know it must
+    // be ok if m_convReal is non-NULL
+    return m_convReal != NULL;
+}
+
+size_t wxCSConv::ToWChar(wchar_t *dst, size_t dstLen,
+                         const char *src, size_t srcLen) const
+{
+    CreateConvIfNeeded();
+
+    if (m_convReal)
+        return m_convReal->ToWChar(dst, dstLen, src, srcLen);
+
+    // latin-1 (direct)
+    if ( srcLen == wxNO_LEN )
+        srcLen = strlen(src) + 1; // take trailing NUL too
+
+    if ( dst )
+    {
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        for ( size_t n = 0; n < srcLen; n++ )
+            dst[n] = (unsigned char)(src[n]);
+    }
+
+    return srcLen;
+}
+
+size_t wxCSConv::FromWChar(char *dst, size_t dstLen,
+                           const wchar_t *src, size_t srcLen) const
+{
+    CreateConvIfNeeded();
+
+    if (m_convReal)
+        return m_convReal->FromWChar(dst, dstLen, src, srcLen);
+
+    // latin-1 (direct)
+    if ( srcLen == wxNO_LEN )
+        srcLen = wxWcslen(src) + 1;
+
+    if ( dst )
+    {
+        if ( dstLen < srcLen )
+            return wxCONV_FAILED;
+
+        for ( size_t n = 0; n < srcLen; n++ )
+        {
+            if ( src[n] > 0xFF )
+                return wxCONV_FAILED;
+
+            dst[n] = (char)src[n];
+        }
+
+    }
+    else // still need to check the input validity
+    {
+        for ( size_t n = 0; n < srcLen; n++ )
+        {
+            if ( src[n] > 0xFF )
+                return wxCONV_FAILED;
+        }
+    }
+
+    return srcLen;
+}
+
+size_t wxCSConv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+{
+    // this function exists only for ABI-compatibility in 2.8 branch
+    return wxMBConv::MB2WC(buf, psz, n);
+}
+
+size_t wxCSConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+{
+    // this function exists only for ABI-compatibility in 2.8 branch
+    return wxMBConv::WC2MB(buf, psz, n);
+}
+
+size_t wxCSConv::GetMBNulLen() const
+{
+    CreateConvIfNeeded();
+
+    if ( m_convReal )
+    {
+        return m_convReal->GetMBNulLen();
+    }
+
+    return 1;
+}
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+#ifdef __WINDOWS__
+    static wxMBConv_win32 wxConvLibcObj;
+#elif defined(__WXMAC__) && !defined(__MACH__)
+    static wxMBConv_mac wxConvLibcObj ;
+#else
+    static wxMBConvLibc wxConvLibcObj;
+#endif
+
+static wxCSConv wxConvLocalObj(wxFONTENCODING_SYSTEM);
+static wxCSConv wxConvISO8859_1Obj(wxFONTENCODING_ISO8859_1);
+static wxMBConvUTF7 wxConvUTF7Obj;
+static wxMBConvUTF8 wxConvUTF8Obj;
+#if defined(__WXMAC__) && defined(TARGET_CARBON)
+static wxMBConv_macUTF8D wxConvMacUTF8DObj;
+#endif
+WXDLLIMPEXP_DATA_BASE(wxMBConv&) wxConvLibc = wxConvLibcObj;
+WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvLocal = wxConvLocalObj;
+WXDLLIMPEXP_DATA_BASE(wxCSConv&) wxConvISO8859_1 = wxConvISO8859_1Obj;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF7&) wxConvUTF7 = wxConvUTF7Obj;
+WXDLLIMPEXP_DATA_BASE(wxMBConvUTF8&) wxConvUTF8 = wxConvUTF8Obj;
+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = &wxConvLibcObj;
+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI = &wxConvLocal;
+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvFileName = &
+#ifdef __WXOSX__
+#if defined(__WXMAC__) && defined(TARGET_CARBON)
+                                    wxConvMacUTF8DObj;
+#else
+                                    wxConvUTF8Obj;
+#endif
+#else // !__WXOSX__
+                                    wxConvLibcObj;
+#endif // __WXOSX__/!__WXOSX__
+
+#if wxUSE_UNICODE
+
+wxWCharBuffer wxSafeConvertMB2WX(const char *s)
+{
+    if ( !s )
+        return wxWCharBuffer();
+
+    wxWCharBuffer wbuf(wxConvLibc.cMB2WX(s));
+    if ( !wbuf )
+        wbuf = wxConvUTF8.cMB2WX(s);
+    if ( !wbuf )
+        wbuf = wxConvISO8859_1.cMB2WX(s);
+
+    return wbuf;
+}
+
+wxCharBuffer wxSafeConvertWX2MB(const wchar_t *ws)
+{
+    if ( !ws )
+        return wxCharBuffer();
+
+    wxCharBuffer buf(wxConvLibc.cWX2MB(ws));
+    if ( !buf )
+        buf = wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL).cWX2MB(ws);
+
+    return buf;
+}
+
+#endif // wxUSE_UNICODE
+
+#else // !wxUSE_WCHAR_T
+
+// stand-ins in absence of wchar_t
+WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc,
+                                wxConvISO8859_1,
+                                wxConvLocal,
+                                wxConvUTF8;
+
+WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent = NULL;
+
+#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
diff --git a/Source/3rd Party/wx/src/common/stream.cpp b/Source/3rd Party/wx/src/common/stream.cpp
index 82a689120..27a9a7cc8 100644
--- a/Source/3rd Party/wx/src/common/stream.cpp	
+++ b/Source/3rd Party/wx/src/common/stream.cpp	
@@ -1,1548 +1,1388 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/stream.cpp
-// Purpose:     wxStream base classes
-// Author:      Guilhem Lavaux
-// Modified by: VZ (23.11.00) to fix realloc()ing new[]ed memory,
-//                            general code review
-// Created:     11/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS
-
-#include "wx/stream.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-#endif
-
-#include <ctype.h>
-#include "wx/datstrm.h"
-#include "wx/textfile.h"
-#include "wx/scopeguard.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// the temporary buffer size used when copying from stream to stream
-#define BUF_TEMP_SIZE 4096
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxStreamBuffer
-// ----------------------------------------------------------------------------
-
-void wxStreamBuffer::SetError(wxStreamError err)
-{
-   if ( m_stream && m_stream->m_lasterror == wxSTREAM_NO_ERROR )
-       m_stream->m_lasterror = err;
-}
-
-void wxStreamBuffer::InitBuffer()
-{
-    m_buffer_start =
-    m_buffer_end =
-    m_buffer_pos = NULL;
-
-    // if we are going to allocate the buffer, we should free it later as well
-    m_destroybuf = true;
-}
-
-void wxStreamBuffer::Init()
-{
-    InitBuffer();
-
-    m_fixed = true;
-}
-
-void wxStreamBuffer::InitWithStream(wxStreamBase& stream, BufMode mode)
-{
-    Init();
-
-    m_stream = &stream;
-    m_mode = mode;
-
-    m_flushable = true;
-}
-
-wxStreamBuffer::wxStreamBuffer(BufMode mode)
-{
-    Init();
-
-    m_stream = NULL;
-    m_mode = mode;
-
-    m_flushable = false;
-}
-
-wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
-{
-    // doing this has big chances to lead to a crash when the source buffer is
-    // destroyed (otherwise assume the caller knows what he does)
-    wxASSERT_MSG( !buffer.m_destroybuf,
-                  wxT("it's a bad idea to copy this buffer") );
-
-    m_buffer_start = buffer.m_buffer_start;
-    m_buffer_end = buffer.m_buffer_end;
-    m_buffer_pos = buffer.m_buffer_pos;
-    m_fixed = buffer.m_fixed;
-    m_flushable = buffer.m_flushable;
-    m_stream = buffer.m_stream;
-    m_mode = buffer.m_mode;
-    m_destroybuf = false;
-}
-
-void wxStreamBuffer::FreeBuffer()
-{
-    if ( m_destroybuf )
-    {
-        free(m_buffer_start);
-        m_buffer_start = NULL;
-    }
-}
-
-wxStreamBuffer::~wxStreamBuffer()
-{
-    FreeBuffer();
-}
-
-wxInputStream *wxStreamBuffer::GetInputStream() const
-{
-    return m_mode == write ? NULL : (wxInputStream *)m_stream;
-}
-
-wxOutputStream *wxStreamBuffer::GetOutputStream() const
-{
-    return m_mode == read ? NULL : (wxOutputStream *)m_stream;
-}
-
-void wxStreamBuffer::SetBufferIO(void *buffer_start,
-                                 void *buffer_end,
-                                 bool takeOwnership)
-{
-    SetBufferIO(buffer_start, (char *)buffer_end - (char *)buffer_start,
-                takeOwnership);
-}
-
-void wxStreamBuffer::SetBufferIO(void *start,
-                                 size_t len,
-                                 bool takeOwnership)
-{
-    // start by freeing the old buffer
-    FreeBuffer();
-
-    m_buffer_start = (char *)start;
-    m_buffer_end   = m_buffer_start + len;
-
-    // if we own it, we free it
-    m_destroybuf = takeOwnership;
-
-    ResetBuffer();
-}
-
-void wxStreamBuffer::SetBufferIO(size_t bufsize)
-{
-    if ( bufsize )
-    {
-        // this will free the old buffer and allocate the new one
-        SetBufferIO(malloc(bufsize), bufsize, true /* take ownership */);
-    }
-    else // no buffer size => no buffer
-    {
-        // still free the old one
-        FreeBuffer();
-        InitBuffer();
-    }
-}
-
-void wxStreamBuffer::ResetBuffer()
-{
-    if ( m_stream )
-    {
-        m_stream->Reset();
-        m_stream->m_lastcount = 0;
-    }
-
-    m_buffer_pos = m_mode == read && m_flushable
-                        ? m_buffer_end
-                        : m_buffer_start;
-}
-
-void wxStreamBuffer::Truncate()
-{
-    size_t new_size = m_buffer_pos - m_buffer_start;
-    if ( m_buffer_pos == m_buffer_end )
-        return;
-
-    if ( !new_size )
-    {
-        FreeBuffer();
-        InitBuffer();
-        return;
-    }
-
-    char *new_start = (char *)realloc(m_buffer_start, new_size);
-    wxCHECK_RET( new_size, wxT("shrinking buffer shouldn't fail") );
-
-    m_buffer_start = new_start;
-    m_buffer_end = m_buffer_start + new_size;
-    m_buffer_pos = m_buffer_end;
-}
-
-// fill the buffer with as much data as possible (only for read buffers)
-bool wxStreamBuffer::FillBuffer()
-{
-    wxInputStream *inStream = GetInputStream();
-
-    // It's legal to have no stream, so we don't complain about it just return false
-    if ( !inStream )
-        return false;
-
-    size_t count = inStream->OnSysRead(GetBufferStart(), GetBufferSize());
-    if ( !count )
-        return false;
-
-    m_buffer_end = m_buffer_start + count;
-    m_buffer_pos = m_buffer_start;
-
-    return true;
-}
-
-// write the buffer contents to the stream (only for write buffers)
-bool wxStreamBuffer::FlushBuffer()
-{
-    wxCHECK_MSG( m_flushable, false, wxT("can't flush this buffer") );
-
-    // FIXME: what is this check for? (VZ)
-    if ( m_buffer_pos == m_buffer_start )
-        return false;
-
-    wxOutputStream *outStream = GetOutputStream();
-
-    wxCHECK_MSG( outStream, false, wxT("should have a stream in wxStreamBuffer") );
-
-    size_t current = m_buffer_pos - m_buffer_start;
-    size_t count = outStream->OnSysWrite(m_buffer_start, current);
-    if ( count != current )
-        return false;
-
-    m_buffer_pos = m_buffer_start;
-
-    return true;
-}
-
-size_t wxStreamBuffer::GetDataLeft()
-{
-    /* Why is this done? RR. */
-    if ( m_buffer_pos == m_buffer_end && m_flushable)
-        FillBuffer();
-
-    return GetBytesLeft();
-}
-
-// copy up to size bytes from our buffer into the provided one
-void wxStreamBuffer::GetFromBuffer(void *buffer, size_t size)
-{
-    // don't get more bytes than left in the buffer
-    size_t left = GetBytesLeft();
-
-    if ( size > left )
-        size = left;
-
-    memcpy(buffer, m_buffer_pos, size);
-    m_buffer_pos += size;
-}
-
-// copy the contents of the provided buffer into this one
-void wxStreamBuffer::PutToBuffer(const void *buffer, size_t size)
-{
-    size_t left = GetBytesLeft();
-
-    if ( size > left )
-    {
-        if ( m_fixed )
-        {
-            // we can't realloc the buffer, so just copy what we can
-            size = left;
-        }
-        else // !m_fixed
-        {
-            // realloc the buffer to have enough space for the data
-            if ( m_buffer_pos + size > m_buffer_end )
-            {
-                size_t delta = m_buffer_pos - m_buffer_start;
-                size_t new_size = delta + size;
-
-                char *startOld = m_buffer_start;
-                m_buffer_start = (char *)realloc(m_buffer_start, new_size);
-                if ( !m_buffer_start )
-                {
-                    // don't leak memory if realloc() failed
-                    m_buffer_start = startOld;
-
-                    // what else can we do?
-                    return;
-                }
-
-                // adjust the pointers invalidated by realloc()
-                m_buffer_pos = m_buffer_start + delta;
-                m_buffer_end = m_buffer_start + new_size;
-            } // else: the buffer is big enough
-        }
-    }
-
-    memcpy(m_buffer_pos, buffer, size);
-    m_buffer_pos += size;
-}
-
-void wxStreamBuffer::PutChar(char c)
-{
-    wxOutputStream *outStream = GetOutputStream();
-
-    wxCHECK_RET( outStream, wxT("should have a stream in wxStreamBuffer") );
-
-    // if we don't have buffer at all, just forward this call to the stream,
-    if ( !HasBuffer() )
-    {
-        outStream->OnSysWrite(&c, sizeof(c));
-    }
-    else
-    {
-        // otherwise check we have enough space left
-        if ( !GetDataLeft() && !FlushBuffer() )
-        {
-            // we don't
-            SetError(wxSTREAM_WRITE_ERROR);
-        }
-        else
-        {
-            PutToBuffer(&c, sizeof(c));
-            m_stream->m_lastcount = 1;
-        }
-    }
-}
-
-char wxStreamBuffer::Peek()
-{
-    wxCHECK_MSG( m_stream && HasBuffer(), 0,
-                 wxT("should have the stream and the buffer in wxStreamBuffer") );
-
-    if ( !GetDataLeft() )
-    {
-        SetError(wxSTREAM_READ_ERROR);
-        return 0;
-    }
-
-    char c;
-    GetFromBuffer(&c, sizeof(c));
-    m_buffer_pos--;
-
-    return c;
-}
-
-char wxStreamBuffer::GetChar()
-{
-    wxInputStream *inStream = GetInputStream();
-
-    wxCHECK_MSG( inStream, 0, wxT("should have a stream in wxStreamBuffer") );
-
-    char c;
-    if ( !HasBuffer() )
-    {
-        inStream->OnSysRead(&c, sizeof(c));
-    }
-    else
-    {
-        if ( !GetDataLeft() )
-        {
-            SetError(wxSTREAM_READ_ERROR);
-            c = 0;
-        }
-        else
-        {
-            GetFromBuffer(&c, sizeof(c));
-            m_stream->m_lastcount = 1;
-        }
-    }
-
-    return c;
-}
-
-size_t wxStreamBuffer::Read(void *buffer, size_t size)
-{
-    wxASSERT_MSG( buffer, wxT("Warning: Null pointer is about to be used") );
-
-    /* Clear buffer first */
-    memset(buffer, 0x00, size);
-
-    // lasterror is reset before all new IO calls
-    if ( m_stream )
-        m_stream->Reset();
-
-    size_t readBytes;
-    if ( !HasBuffer() )
-    {
-        wxInputStream *inStream = GetInputStream();
-
-        wxCHECK_MSG( inStream, 0, wxT("should have a stream in wxStreamBuffer") );
-
-        readBytes = inStream->OnSysRead(buffer, size);
-    }
-    else // we have a buffer, use it
-    {
-        size_t orig_size = size;
-
-        while ( size > 0 )
-        {
-            size_t left = GetDataLeft();
-
-            // if the requested number of bytes if greater than the buffer
-            // size, read data in chunks
-            if ( size > left )
-            {
-                GetFromBuffer(buffer, left);
-                size -= left;
-                buffer = (char *)buffer + left;
-
-                if ( !FillBuffer() )
-                {
-                    SetError(wxSTREAM_EOF);
-                    break;
-                }
-            }
-            else // otherwise just do it in one gulp
-            {
-                GetFromBuffer(buffer, size);
-                size = 0;
-            }
-        }
-
-        readBytes = orig_size - size;
-    }
-
-    if ( m_stream )
-        m_stream->m_lastcount = readBytes;
-
-    return readBytes;
-}
-
-// this should really be called "Copy()"
-size_t wxStreamBuffer::Read(wxStreamBuffer *dbuf)
-{
-    wxCHECK_MSG( m_mode != write, 0, wxT("can't read from this buffer") );
-
-    char buf[BUF_TEMP_SIZE];
-    size_t nRead,
-           total = 0;
-
-    do
-    {
-        nRead = Read(buf, WXSIZEOF(buf));
-        if ( nRead )
-        {
-            nRead = dbuf->Write(buf, nRead);
-            total += nRead;
-        }
-    }
-    while ( nRead );
-
-    return total;
-}
-
-size_t wxStreamBuffer::Write(const void *buffer, size_t size)
-{
-    wxASSERT_MSG( buffer, wxT("Warning: Null pointer is about to be send") );
-
-    if (m_stream)
-    {
-        // lasterror is reset before all new IO calls
-        m_stream->Reset();
-    }
-
-    size_t ret;
-
-    if ( !HasBuffer() && m_fixed )
-    {
-        wxOutputStream *outStream = GetOutputStream();
-
-        wxCHECK_MSG( outStream, 0, wxT("should have a stream in wxStreamBuffer") );
-
-        // no buffer, just forward the call to the stream
-        ret = outStream->OnSysWrite(buffer, size);
-    }
-    else // we [may] have a buffer, use it
-    {
-        size_t orig_size = size;
-
-        while ( size > 0 )
-        {
-            size_t left = GetBytesLeft();
-
-            // if the buffer is too large to fit in the stream buffer, split
-            // it in smaller parts
-            //
-            // NB: If stream buffer isn't fixed (as for wxMemoryOutputStream),
-            //     we always go to the second case.
-            //
-            // FIXME: fine, but if it fails we should (re)try writing it by
-            //        chunks as this will (hopefully) always work (VZ)
-
-            if ( size > left && m_fixed )
-            {
-                PutToBuffer(buffer, left);
-                size -= left;
-                buffer = (char *)buffer + left;
-
-                if ( !FlushBuffer() )
-                {
-                    SetError(wxSTREAM_WRITE_ERROR);
-
-                    break;
-                }
-
-                m_buffer_pos = m_buffer_start;
-            }
-            else // we can do it in one gulp
-            {
-                PutToBuffer(buffer, size);
-                size = 0;
-            }
-        }
-
-        ret = orig_size - size;
-    }
-
-    if (m_stream)
-    {
-        // i am not entirely sure what we do this for
-        m_stream->m_lastcount = ret;
-    }
-
-    return ret;
-}
-
-size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
-{
-    wxCHECK_MSG( m_mode != read, 0, wxT("can't write to this buffer") );
-    wxCHECK_MSG( sbuf->m_mode != write, 0, wxT("can't read from that buffer") );
-
-    char buf[BUF_TEMP_SIZE];
-    size_t nWrite,
-           total = 0;
-
-    do
-    {
-        size_t nRead = sbuf->Read(buf, WXSIZEOF(buf));
-        if ( nRead )
-        {
-            nWrite = Write(buf, nRead);
-            if ( nWrite < nRead )
-            {
-                // put back data we couldn't copy
-                wxInputStream *in_stream = (wxInputStream *)sbuf->GetStream();
-
-                in_stream->Ungetch(buf + nWrite, nRead - nWrite);
-            }
-
-            total += nWrite;
-        }
-        else
-        {
-            nWrite = 0;
-        }
-    }
-    while ( nWrite == WXSIZEOF(buf) );
-
-    return total;
-}
-
-wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
-{
-    wxFileOffset ret_off, diff;
-
-    wxFileOffset last_access = GetLastAccess();
-
-    if ( !m_flushable )
-    {
-        switch (mode)
-        {
-            case wxFromStart:
-                diff = pos;
-                break;
-
-            case wxFromCurrent:
-                diff = pos + GetIntPosition();
-                break;
-
-            case wxFromEnd:
-                diff = pos + last_access;
-                break;
-
-            default:
-                wxFAIL_MSG( wxT("invalid seek mode") );
-
-                return wxInvalidOffset;
-        }
-        if (diff < 0 || diff > last_access)
-            return wxInvalidOffset;
-        size_t int_diff = wx_truncate_cast(size_t, diff);
-        wxCHECK_MSG( (wxFileOffset)int_diff == diff, wxInvalidOffset, wxT("huge file not supported") );
-        SetIntPosition(int_diff);
-        return diff;
-    }
-
-    switch ( mode )
-    {
-        case wxFromStart:
-            // We'll try to compute an internal position later ...
-            ret_off = m_stream->OnSysSeek(pos, wxFromStart);
-            ResetBuffer();
-            return ret_off;
-
-        case wxFromCurrent:
-            diff = pos + GetIntPosition();
-
-            if ( (diff > last_access) || (diff < 0) )
-            {
-                // We must take into account the fact that we have read
-                // something previously.
-                ret_off = m_stream->OnSysSeek(diff-last_access, wxFromCurrent);
-                ResetBuffer();
-                return ret_off;
-            }
-            else
-            {
-                size_t int_diff = wx_truncate_cast(size_t, diff);
-                wxCHECK_MSG( (wxFileOffset)int_diff == diff, wxInvalidOffset, wxT("huge file not supported") );
-                SetIntPosition(int_diff);
-                return diff;
-            }
-
-        case wxFromEnd:
-            // Hard to compute: always seek to the requested position.
-            ret_off = m_stream->OnSysSeek(pos, wxFromEnd);
-            ResetBuffer();
-            return ret_off;
-    }
-
-    return wxInvalidOffset;
-}
-
-wxFileOffset wxStreamBuffer::Tell() const
-{
-    wxFileOffset pos;
-
-    // ask the stream for position if we have a real one
-    if ( m_stream )
-    {
-        pos = m_stream->OnSysTell();
-        if ( pos == wxInvalidOffset )
-            return wxInvalidOffset;
-    }
-    else // no associated stream
-    {
-        pos = 0;
-    }
-
-    pos += GetIntPosition();
-
-    if ( m_mode == read && m_flushable )
-        pos -= GetLastAccess();
-
-    return pos;
-}
-
-// ----------------------------------------------------------------------------
-// wxStreamBase
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxStreamBase, wxObject)
-
-wxStreamBase::wxStreamBase()
-{
-    m_lasterror = wxSTREAM_NO_ERROR;
-    m_lastcount = 0;
-}
-
-wxStreamBase::~wxStreamBase()
-{
-}
-
-size_t wxStreamBase::GetSize() const
-{
-    wxFileOffset length = GetLength();
-    if ( length == (wxFileOffset)wxInvalidOffset )
-        return 0;
-
-    const size_t len = wx_truncate_cast(size_t, length);
-    wxASSERT_MSG( len == length + size_t(0), wxT("large files not supported") );
-
-    return len;
-}
-
-wxFileOffset wxStreamBase::OnSysSeek(wxFileOffset WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
-{
-    return wxInvalidOffset;
-}
-
-wxFileOffset wxStreamBase::OnSysTell() const
-{
-    return wxInvalidOffset;
-}
-
-// ----------------------------------------------------------------------------
-// wxInputStream
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxInputStream, wxStreamBase)
-
-wxInputStream::wxInputStream()
-{
-    m_wback = NULL;
-    m_wbacksize =
-    m_wbackcur = 0;
-}
-
-wxInputStream::~wxInputStream()
-{
-    free(m_wback);
-}
-
-bool wxInputStream::CanRead() const
-{
-    // we don't know if there is anything to read or not and by default we
-    // prefer to be optimistic and try to read data unless we know for sure
-    // there is no more of it
-    return m_lasterror != wxSTREAM_EOF;
-}
-
-bool wxInputStream::Eof() const
-{
-    // the only way the base class can know we're at EOF is when we'd already
-    // tried to read beyond it in which case last error is set accordingly
-    return GetLastError() == wxSTREAM_EOF;
-}
-
-char *wxInputStream::AllocSpaceWBack(size_t needed_size)
-{
-    // get number of bytes left from previous wback buffer
-    size_t toget = m_wbacksize - m_wbackcur;
-
-    // allocate a buffer large enough to hold prev + new data
-    char *temp_b = (char *)malloc(needed_size + toget);
-
-    if (!temp_b)
-        return NULL;
-
-    // copy previous data (and free old buffer) if needed
-    if (m_wback)
-    {
-        memmove(temp_b + needed_size, m_wback + m_wbackcur, toget);
-        free(m_wback);
-    }
-
-    // done
-    m_wback = temp_b;
-    m_wbackcur = 0;
-    m_wbacksize = needed_size + toget;
-
-    return m_wback;
-}
-
-size_t wxInputStream::GetWBack(void *buf, size_t size)
-{
-    wxASSERT_MSG( buf, wxT("Warning: Null pointer is about to be used") );
-
-    /* Clear buffer first */
-    memset(buf, 0x00, size);
-
-    if (!m_wback)
-        return 0;
-
-    // how many bytes do we have in the buffer?
-    size_t toget = m_wbacksize - m_wbackcur;
-
-    if ( size < toget )
-    {
-        // we won't read everything
-        toget = size;
-    }
-
-    // copy the data from the cache
-    memcpy(buf, m_wback + m_wbackcur, toget);
-
-    m_wbackcur += toget;
-    if ( m_wbackcur == m_wbacksize )
-    {
-        // TODO: should we really free it here all the time? maybe keep it?
-        free(m_wback);
-        m_wback = NULL;
-        m_wbacksize = 0;
-        m_wbackcur = 0;
-    }
-
-    // return the number of bytes copied
-    return toget;
-}
-
-size_t wxInputStream::Ungetch(const void *buf, size_t bufsize)
-{
-    wxASSERT_MSG( buf, wxT("Warning: Null pointer is about to be used in Ungetch()") );
-
-    if ( m_lasterror != wxSTREAM_NO_ERROR && m_lasterror != wxSTREAM_EOF )
-    {
-        // can't operate on this stream until the error is cleared
-        return 0;
-    }
-
-    char *ptrback = AllocSpaceWBack(bufsize);
-    if (!ptrback)
-        return 0;
-
-    // Eof() shouldn't return true any longer
-    if ( m_lasterror == wxSTREAM_EOF )
-        m_lasterror = wxSTREAM_NO_ERROR;
-
-    memcpy(ptrback, buf, bufsize);
-    return bufsize;
-}
-
-bool wxInputStream::Ungetch(char c)
-{
-    return Ungetch(&c, sizeof(c)) != 0;
-}
-
-int wxInputStream::GetC()
-{
-    unsigned char c;
-    Read(&c, sizeof(c));
-    return LastRead() ? c : wxEOF;
-}
-
-wxInputStream& wxInputStream::Read(void *buf, size_t size)
-{
-    wxASSERT_MSG( buf, wxT("Warning: Null pointer is about to be read") );
-
-    char *p = (char *)buf;
-    m_lastcount = 0;
-
-    size_t read = GetWBack(buf, size);
-    for ( ;; )
-    {
-        size -= read;
-        m_lastcount += read;
-        p += read;
-
-        if ( !size )
-        {
-            // we read the requested amount of data
-            break;
-        }
-
-        if ( p != buf && !CanRead() )
-        {
-            // we have already read something and we would block in OnSysRead()
-            // now: don't do it but return immediately
-            break;
-        }
-
-        read = OnSysRead(p, size);
-        if ( !read )
-        {
-            // no more data available
-            break;
-        }
-    }
-
-    return *this;
-}
-
-char wxInputStream::Peek()
-{
-    char c;
-    Read(&c, sizeof(c));
-    if (m_lasterror == wxSTREAM_NO_ERROR)
-    {
-        Ungetch(c);
-        return c;
-    }
-
-    return 0;
-}
-
-wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
-{
-    size_t lastcount = 0;
-    char buf[BUF_TEMP_SIZE];
-
-    for ( ;; )
-    {
-        size_t bytes_read = Read(buf, WXSIZEOF(buf)).LastRead();
-        if ( !bytes_read )
-            break;
-
-        if ( stream_out.Write(buf, bytes_read).LastWrite() != bytes_read )
-            break;
-
-        lastcount += bytes_read;
-    }
-
-    m_lastcount = lastcount;
-
-    return *this;
-}
-
-wxFileOffset wxInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
-{
-    // RR: This code is duplicated in wxBufferedInputStream. This is
-    // not really a good design, but buffered stream are different
-    // from all others in that they handle two stream-related objects:
-    // the stream buffer and parent stream.
-
-    // I don't know whether it should be put as well in wxFileInputStream::OnSysSeek
-    if (m_lasterror==wxSTREAM_EOF)
-        m_lasterror=wxSTREAM_NO_ERROR;
-
-    // avoid unnecessary seek operations (optimization)
-    wxFileOffset currentPos = TellI(), size = GetLength();
-    if ((mode == wxFromStart && currentPos == pos) ||
-        (mode == wxFromCurrent && pos == 0) ||
-        (mode == wxFromEnd && size != wxInvalidOffset && currentPos == size-pos))
-        return currentPos;
-
-    if (!IsSeekable() && mode == wxFromCurrent && pos > 0)
-    {
-        // rather than seeking, we can just read data and discard it;
-        // this allows to forward-seek also non-seekable streams!
-        char buf[BUF_TEMP_SIZE];
-        size_t bytes_read;
-
-        // read chunks of BUF_TEMP_SIZE bytes until we reach the new position
-        for ( ; pos >= BUF_TEMP_SIZE; pos -= bytes_read)
-        {
-            bytes_read = Read(buf, WXSIZEOF(buf)).LastRead();
-            if ( m_lasterror != wxSTREAM_NO_ERROR )
-                return wxInvalidOffset;
-
-            wxASSERT(bytes_read == WXSIZEOF(buf));
-        }
-
-        // read the last 'pos' bytes
-        bytes_read = Read(buf, (size_t)pos).LastRead();
-        if ( m_lasterror != wxSTREAM_NO_ERROR )
-            return wxInvalidOffset;
-
-        wxASSERT(bytes_read == (size_t)pos);
-
-        // we should now have sought to the right position...
-        return TellI();
-    }
-
-    /* RR: A call to SeekI() will automatically invalidate any previous
-       call to Ungetch(), otherwise it would be possible to SeekI() to
-       one position, unread some bytes there, SeekI() to another position
-       and the data would be corrupted.
-
-       GRG: Could add code here to try to navigate within the wback
-       buffer if possible, but is it really needed? It would only work
-       when seeking in wxFromCurrent mode, else it would invalidate
-       anyway... */
-
-    if (m_wback)
-    {
-        wxLogDebug( wxT("Seeking in stream which has data written back to it.") );
-
-        free(m_wback);
-        m_wback = NULL;
-        m_wbacksize = 0;
-        m_wbackcur = 0;
-    }
-
-    return OnSysSeek(pos, mode);
-}
-
-wxFileOffset wxInputStream::TellI() const
-{
-    wxFileOffset pos = OnSysTell();
-
-    if (pos != wxInvalidOffset)
-        pos -= (m_wbacksize - m_wbackcur);
-
-    return pos;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxOutputStream
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxOutputStream, wxStreamBase)
-
-wxOutputStream::wxOutputStream()
-{
-}
-
-wxOutputStream::~wxOutputStream()
-{
-}
-
-size_t wxOutputStream::OnSysWrite(const void * WXUNUSED(buffer),
-                                  size_t WXUNUSED(bufsize))
-{
-    return 0;
-}
-
-void wxOutputStream::PutC(char c)
-{
-    Write(&c, sizeof(c));
-}
-
-wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size)
-{
-    m_lastcount = OnSysWrite(buffer, size);
-    return *this;
-}
-
-wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
-{
-    stream_in.Read(*this);
-    return *this;
-}
-
-wxFileOffset wxOutputStream::TellO() const
-{
-    return OnSysTell();
-}
-
-wxFileOffset wxOutputStream::SeekO(wxFileOffset pos, wxSeekMode mode)
-{
-    return OnSysSeek(pos, mode);
-}
-
-void wxOutputStream::Sync()
-{
-}
-
-
-// ----------------------------------------------------------------------------
-// wxCountingOutputStream
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxCountingOutputStream, wxOutputStream)
-
-wxCountingOutputStream::wxCountingOutputStream ()
-{
-     m_currentPos = 0;
-}
-
-wxFileOffset wxCountingOutputStream::GetLength() const
-{
-    return m_lastcount;
-}
-
-size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer),
-                                          size_t size)
-{
-    m_currentPos += size;
-    if (m_currentPos > m_lastcount)
-        m_lastcount = m_currentPos;
-
-    return m_currentPos;
-}
-
-wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    ssize_t new_pos = wx_truncate_cast(ssize_t, pos);
-
-    switch ( mode )
-    {
-        case wxFromStart:
-            wxCHECK_MSG( (wxFileOffset)new_pos == pos, wxInvalidOffset, wxT("huge position not supported") );
-            break;
-
-        case wxFromEnd:
-            new_pos = m_lastcount + new_pos;
-            wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_lastcount + pos), wxInvalidOffset, wxT("huge position not supported") );
-            break;
-
-        case wxFromCurrent:
-            new_pos = m_currentPos + new_pos;
-            wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_currentPos + pos), wxInvalidOffset, wxT("huge position not supported") );
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("invalid seek mode") );
-            return wxInvalidOffset;
-    }
-
-    m_currentPos = new_pos;
-
-    if (m_currentPos > m_lastcount)
-        m_lastcount = m_currentPos;
-
-    return m_currentPos;
-}
-
-wxFileOffset wxCountingOutputStream::OnSysTell() const
-{
-    return m_currentPos;
-}
-
-// ----------------------------------------------------------------------------
-// wxFilterInputStream
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxFilterInputStream, wxInputStream)
-
-wxFilterInputStream::wxFilterInputStream()
- :  m_parent_i_stream(NULL),
-    m_owns(false)
-{
-}
-
-wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
- :  m_parent_i_stream(&stream),
-    m_owns(false)
-{
-}
-
-wxFilterInputStream::wxFilterInputStream(wxInputStream *stream)
- :  m_parent_i_stream(stream),
-    m_owns(true)
-{
-}
-
-wxFilterInputStream::~wxFilterInputStream()
-{
-    if (m_owns)
-        delete m_parent_i_stream;
-}
-
-// ----------------------------------------------------------------------------
-// wxFilterOutputStream
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxFilterOutputStream, wxOutputStream)
-
-wxFilterOutputStream::wxFilterOutputStream()
- :  m_parent_o_stream(NULL),
-    m_owns(false)
-{
-}
-
-wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
- :  m_parent_o_stream(&stream),
-    m_owns(false)
-{
-}
-
-wxFilterOutputStream::wxFilterOutputStream(wxOutputStream *stream)
- :  m_parent_o_stream(stream),
-    m_owns(true)
-{
-}
-
-bool wxFilterOutputStream::Close()
-{
-    if (m_parent_o_stream && m_owns)
-        return m_parent_o_stream->Close();
-    else
-        return true;
-}
-
-wxFilterOutputStream::~wxFilterOutputStream()
-{
-    if (m_owns)
-        delete m_parent_o_stream;
-}
-
-// ----------------------------------------------------------------------------
-// wxFilterClassFactoryBase
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactoryBase, wxObject)
-
-wxString wxFilterClassFactoryBase::PopExtension(const wxString& location) const
-{
-    return location.substr(0, FindExtension(location));
-}
-
-wxString::size_type wxFilterClassFactoryBase::FindExtension(
-        const wxString& location) const
-{
-    for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXT); *p; p++)
-    {
-        if ( location.EndsWith(*p) )
-            return location.length() - wxStrlen(*p);
-    }
-
-    return wxString::npos;
-}
-
-bool wxFilterClassFactoryBase::CanHandle(const wxString& protocol,
-                                         wxStreamProtocolType type) const
-{
-    if (type == wxSTREAM_FILEEXT)
-        return FindExtension(protocol) != wxString::npos;
-    else
-        for (const wxChar *const *p = GetProtocols(type); *p; p++)
-            if (protocol == *p)
-                return true;
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// wxFilterClassFactory
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactory, wxFilterClassFactoryBase)
-
-wxFilterClassFactory *wxFilterClassFactory::sm_first = NULL;
-
-void wxFilterClassFactory::Remove()
-{
-    if (m_next != this)
-    {
-        wxFilterClassFactory **pp = &sm_first;
-
-        while (*pp != this)
-            pp = &(*pp)->m_next;
-
-        *pp = m_next;
-
-        m_next = this;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxBufferedInputStream
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// helper function used for initializing the buffer used by
-// wxBufferedInput/OutputStream: it simply returns the provided buffer if it's
-// not NULL or creates a buffer of the given size otherwise
-template <typename T>
-wxStreamBuffer *
-CreateBufferIfNeeded(T& stream, wxStreamBuffer *buffer, size_t bufsize = 1024)
-{
-    return buffer ? buffer : new wxStreamBuffer(bufsize, stream);
-}
-
-} // anonymous namespace
-
-wxBufferedInputStream::wxBufferedInputStream(wxInputStream& stream,
-                                             wxStreamBuffer *buffer)
-                     : wxFilterInputStream(stream)
-{
-    m_i_streambuf = CreateBufferIfNeeded(*this, buffer);
-}
-
-wxBufferedInputStream::wxBufferedInputStream(wxInputStream& stream,
-                                             size_t bufsize)
-                     : wxFilterInputStream(stream)
-{
-    m_i_streambuf = CreateBufferIfNeeded(*this, NULL, bufsize);
-}
-
-wxBufferedInputStream::~wxBufferedInputStream()
-{
-    m_parent_i_stream->SeekI(-(wxFileOffset)m_i_streambuf->GetBytesLeft(),
-                             wxFromCurrent);
-
-    delete m_i_streambuf;
-}
-
-char wxBufferedInputStream::Peek()
-{
-    return m_i_streambuf->Peek();
-}
-
-wxInputStream& wxBufferedInputStream::Read(void *buf, size_t size)
-{
-    // reset the error flag
-    Reset();
-
-    // first read from the already cached data
-    m_lastcount = GetWBack(buf, size);
-
-    // do we have to read anything more?
-    if ( m_lastcount < size )
-    {
-        size -= m_lastcount;
-        buf = (char *)buf + m_lastcount;
-
-        // the call to wxStreamBuffer::Read() below may reset our m_lastcount
-        // (but it also may not do it if the buffer is associated to another
-        // existing stream and wasn't created by us), so save it
-        size_t countOld = m_lastcount;
-
-        // the new count of the bytes read is the count of bytes read this time
-        m_lastcount = m_i_streambuf->Read(buf, size);
-
-        // plus those we had read before
-        m_lastcount += countOld;
-    }
-
-    return *this;
-}
-
-wxFileOffset wxBufferedInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
-{
-    // RR: Look at wxInputStream for comments.
-
-    if (m_lasterror==wxSTREAM_EOF)
-        Reset();
-
-    if (m_wback)
-    {
-        wxLogDebug( wxT("Seeking in stream which has data written back to it.") );
-
-        free(m_wback);
-        m_wback = NULL;
-        m_wbacksize = 0;
-        m_wbackcur = 0;
-    }
-
-    return m_i_streambuf->Seek(pos, mode);
-}
-
-wxFileOffset wxBufferedInputStream::TellI() const
-{
-    wxFileOffset pos = m_i_streambuf->Tell();
-
-    if (pos != wxInvalidOffset)
-        pos -= (m_wbacksize - m_wbackcur);
-
-    return pos;
-}
-
-size_t wxBufferedInputStream::OnSysRead(void *buffer, size_t bufsize)
-{
-    return m_parent_i_stream->Read(buffer, bufsize).LastRead();
-}
-
-wxFileOffset wxBufferedInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
-{
-    return m_parent_i_stream->SeekI(seek, mode);
-}
-
-wxFileOffset wxBufferedInputStream::OnSysTell() const
-{
-    return m_parent_i_stream->TellI();
-}
-
-void wxBufferedInputStream::SetInputStreamBuffer(wxStreamBuffer *buffer)
-{
-    wxCHECK_RET( buffer, wxT("wxBufferedInputStream needs buffer") );
-
-    delete m_i_streambuf;
-    m_i_streambuf = buffer;
-}
-
-// ----------------------------------------------------------------------------
-// wxBufferedOutputStream
-// ----------------------------------------------------------------------------
-
-wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& stream,
-                                               wxStreamBuffer *buffer)
-                      : wxFilterOutputStream(stream)
-{
-    m_o_streambuf = CreateBufferIfNeeded(*this, buffer);
-}
-
-wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& stream,
-                                               size_t bufsize)
-                      : wxFilterOutputStream(stream)
-{
-    m_o_streambuf = CreateBufferIfNeeded(*this, NULL, bufsize);
-}
-
-wxBufferedOutputStream::~wxBufferedOutputStream()
-{
-    Sync();
-    delete m_o_streambuf;
-}
-
-bool wxBufferedOutputStream::Close()
-{
-    Sync();
-    return IsOk();
-}
-
-
-wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)
-{
-    m_lastcount = 0;
-    m_o_streambuf->Write(buffer, size);
-    return *this;
-}
-
-wxFileOffset wxBufferedOutputStream::SeekO(wxFileOffset pos, wxSeekMode mode)
-{
-    Sync();
-    return m_o_streambuf->Seek(pos, mode);
-}
-
-wxFileOffset wxBufferedOutputStream::TellO() const
-{
-    return m_o_streambuf->Tell();
-}
-
-void wxBufferedOutputStream::Sync()
-{
-    m_o_streambuf->FlushBuffer();
-    m_parent_o_stream->Sync();
-}
-
-size_t wxBufferedOutputStream::OnSysWrite(const void *buffer, size_t bufsize)
-{
-    return m_parent_o_stream->Write(buffer, bufsize).LastWrite();
-}
-
-wxFileOffset wxBufferedOutputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
-{
-    return m_parent_o_stream->SeekO(seek, mode);
-}
-
-wxFileOffset wxBufferedOutputStream::OnSysTell() const
-{
-    return m_parent_o_stream->TellO();
-}
-
-wxFileOffset wxBufferedOutputStream::GetLength() const
-{
-   return m_parent_o_stream->GetLength() + m_o_streambuf->GetIntPosition();
-}
-
-void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)
-{
-    wxCHECK_RET( buffer, wxT("wxBufferedOutputStream needs buffer") );
-
-    delete m_o_streambuf;
-    m_o_streambuf = buffer;
-}
-
-// ---------------------------------------------------------------------------
-// wxWrapperInputStream implementation
-// ---------------------------------------------------------------------------
-
-wxWrapperInputStream::wxWrapperInputStream()
-{
-    m_lasterror = wxSTREAM_READ_ERROR;
-}
-
-wxWrapperInputStream::wxWrapperInputStream(wxInputStream& stream)
-    : wxFilterInputStream(stream)
-{
-    SynchronizeLastError();
-}
-
-wxWrapperInputStream::wxWrapperInputStream(wxInputStream *stream)
-    : wxFilterInputStream(stream)
-{
-    if ( m_parent_i_stream )
-        SynchronizeLastError();
-    else
-        m_lasterror = wxSTREAM_READ_ERROR;
-}
-
-void wxWrapperInputStream::InitParentStream(wxInputStream& stream)
-{
-    wxCHECK_RET( !m_parent_i_stream, "Can't init parent stream twice" );
-
-    m_parent_i_stream = &stream;
-
-    SynchronizeLastError();
-}
-
-void wxWrapperInputStream::InitParentStream(wxInputStream* stream)
-{
-    wxCHECK_RET( !m_parent_i_stream, "Can't init parent stream twice" );
-
-    m_parent_i_stream = stream;
-
-    if ( m_parent_i_stream )
-    {
-        m_owns = true;
-
-        SynchronizeLastError();
-    }
-}
-
-wxFileOffset wxWrapperInputStream::GetLength() const
-{
-    wxCHECK_MSG(m_parent_i_stream, wxInvalidOffset, "Stream not valid");
-
-    wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError);
-    return m_parent_i_stream->GetLength();
-}
-
-bool wxWrapperInputStream::IsSeekable() const
-{
-    wxCHECK_MSG(m_parent_i_stream, false, "Stream not valid");
-    return m_parent_i_stream->IsSeekable();
-}
-
-size_t wxWrapperInputStream::OnSysRead(void *buffer, size_t size)
-{
-    wxCHECK_MSG(m_parent_i_stream, false, "Stream not valid");
-
-    wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError);
-
-    m_parent_i_stream->Read(buffer, size);
-    return m_parent_i_stream->LastRead();
-}
-
-wxFileOffset wxWrapperInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    wxCHECK_MSG(IsSeekable(), false, "Stream not seekable");
-
-    wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError);
-    return m_parent_i_stream->SeekI (pos, mode);
-}
-
-wxFileOffset wxWrapperInputStream::OnSysTell() const
-{
-    wxCHECK_MSG(m_parent_i_stream, false, "Stream not valid");
-
-    wxON_BLOCK_EXIT_THIS0(wxWrapperInputStream::SynchronizeLastError);
-    return m_parent_i_stream->TellI();
-}
-
-// ----------------------------------------------------------------------------
-// Some IOManip function
-// ----------------------------------------------------------------------------
-
-wxOutputStream& wxEndL(wxOutputStream& stream)
-{
-    static const wxChar *eol = wxTextFile::GetEOL();
-
-    return stream.Write(eol, wxStrlen(eol));
-}
-
-#endif // wxUSE_STREAMS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/stream.cpp
+// Purpose:     wxStream base classes
+// Author:      Guilhem Lavaux
+// Modified by: VZ (23.11.00) to fix realloc()ing new[]ed memory,
+//                            general code review
+// Created:     11/07/98
+// RCS-ID:      $Id: stream.cpp 51662 2008-02-11 20:23:29Z VZ $
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS
+
+#include "wx/stream.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include <ctype.h>
+#include "wx/datstrm.h"
+#include "wx/textfile.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the temporary buffer size used when copying from stream to stream
+#define BUF_TEMP_SIZE 4096
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxStreamBuffer
+// ----------------------------------------------------------------------------
+
+void wxStreamBuffer::SetError(wxStreamError err)
+{
+   if ( m_stream && m_stream->m_lasterror == wxSTREAM_NO_ERROR )
+       m_stream->m_lasterror = err;
+}
+
+void wxStreamBuffer::InitBuffer()
+{
+    m_buffer_start =
+    m_buffer_end =
+    m_buffer_pos = NULL;
+    m_buffer_size = 0;
+
+    // if we are going to allocate the buffer, we should free it later as well
+    m_destroybuf = true;
+}
+
+void wxStreamBuffer::Init()
+{
+    InitBuffer();
+
+    m_fixed = true;
+}
+
+wxStreamBuffer::wxStreamBuffer(BufMode mode)
+{
+    Init();
+
+    m_stream = NULL;
+    m_mode = mode;
+
+    m_flushable = false;
+}
+
+wxStreamBuffer::wxStreamBuffer(wxStreamBase& stream, BufMode mode)
+{
+    Init();
+
+    m_stream = &stream;
+    m_mode = mode;
+
+    m_flushable = true;
+}
+
+wxStreamBuffer::wxStreamBuffer(const wxStreamBuffer& buffer)
+{
+    // doing this has big chances to lead to a crash when the source buffer is
+    // destroyed (otherwise assume the caller knows what he does)
+    wxASSERT_MSG( !buffer.m_destroybuf,
+                  _T("it's a bad idea to copy this buffer") );
+
+    m_buffer_start = buffer.m_buffer_start;
+    m_buffer_end = buffer.m_buffer_end;
+    m_buffer_pos = buffer.m_buffer_pos;
+    m_buffer_size = buffer.m_buffer_size;
+    m_fixed = buffer.m_fixed;
+    m_flushable = buffer.m_flushable;
+    m_stream = buffer.m_stream;
+    m_mode = buffer.m_mode;
+    m_destroybuf = false;
+}
+
+void wxStreamBuffer::FreeBuffer()
+{
+    if ( m_destroybuf )
+    {
+        free(m_buffer_start);
+        m_buffer_start = NULL;
+    }
+}
+
+wxStreamBuffer::~wxStreamBuffer()
+{
+    FreeBuffer();
+}
+
+wxInputStream *wxStreamBuffer::GetInputStream() const
+{
+    return m_mode == write ? NULL : (wxInputStream *)m_stream;
+}
+
+wxOutputStream *wxStreamBuffer::GetOutputStream() const
+{
+    return m_mode == read ? NULL : (wxOutputStream *)m_stream;
+}
+
+void wxStreamBuffer::SetBufferIO(void *buffer_start,
+                                 void *buffer_end,
+                                 bool takeOwnership)
+{
+    SetBufferIO(buffer_start, (char *)buffer_end - (char *)buffer_start,
+                takeOwnership);
+}
+
+void wxStreamBuffer::SetBufferIO(void *start,
+                                 size_t len,
+                                 bool takeOwnership)
+{
+    // start by freeing the old buffer
+    FreeBuffer();
+
+    m_buffer_start = (char *)start;
+    m_buffer_end   = m_buffer_start + len;
+
+    m_buffer_size = len;
+
+    // if we own it, we free it
+    m_destroybuf = takeOwnership;
+
+    ResetBuffer();
+}
+
+void wxStreamBuffer::SetBufferIO(size_t bufsize)
+{
+    if ( bufsize )
+    {
+        // this will free the old buffer and allocate the new one
+        SetBufferIO(malloc(bufsize), bufsize, true /* take ownership */);
+    }
+    else // no buffer size => no buffer
+    {
+        // still free the old one
+        FreeBuffer();
+        InitBuffer();
+    }
+}
+
+void wxStreamBuffer::ResetBuffer()
+{
+    if ( m_stream )
+    {
+        m_stream->Reset();
+        m_stream->m_lastcount = 0;
+    }
+
+    m_buffer_pos = m_mode == read && m_flushable
+                        ? m_buffer_end
+                        : m_buffer_start;
+}
+
+// fill the buffer with as much data as possible (only for read buffers)
+bool wxStreamBuffer::FillBuffer()
+{
+    wxInputStream *inStream = GetInputStream();
+
+    // It's legal to have no stream, so we don't complain about it just return false
+    if ( !inStream )
+        return false;
+
+    size_t count = inStream->OnSysRead(m_buffer_start, m_buffer_size);
+    if ( !count )
+        return false;
+
+    m_buffer_end = m_buffer_start + count;
+    m_buffer_pos = m_buffer_start;
+
+    return true;
+}
+
+// write the buffer contents to the stream (only for write buffers)
+bool wxStreamBuffer::FlushBuffer()
+{
+    wxCHECK_MSG( m_flushable, false, _T("can't flush this buffer") );
+
+    // FIXME: what is this check for? (VZ)
+    if ( m_buffer_pos == m_buffer_start )
+        return false;
+
+    wxOutputStream *outStream = GetOutputStream();
+
+    wxCHECK_MSG( outStream, false, _T("should have a stream in wxStreamBuffer") );
+
+    size_t current = m_buffer_pos - m_buffer_start;
+    size_t count = outStream->OnSysWrite(m_buffer_start, current);
+    if ( count != current )
+        return false;
+
+    m_buffer_pos = m_buffer_start;
+
+    return true;
+}
+
+size_t wxStreamBuffer::GetDataLeft()
+{
+    /* Why is this done? RR. */
+    if ( m_buffer_pos == m_buffer_end && m_flushable)
+        FillBuffer();
+
+    return GetBytesLeft();
+}
+
+// copy up to size bytes from our buffer into the provided one
+void wxStreamBuffer::GetFromBuffer(void *buffer, size_t size)
+{
+    // don't get more bytes than left in the buffer
+    size_t left = GetBytesLeft();
+
+    if ( size > left )
+        size = left;
+
+    memcpy(buffer, m_buffer_pos, size);
+    m_buffer_pos += size;
+}
+
+// copy the contents of the provided buffer into this one
+void wxStreamBuffer::PutToBuffer(const void *buffer, size_t size)
+{
+    size_t left = GetBytesLeft();
+
+    if ( size > left )
+    {
+        if ( m_fixed )
+        {
+            // we can't realloc the buffer, so just copy what we can
+            size = left;
+        }
+        else // !m_fixed
+        {
+            // realloc the buffer to have enough space for the data
+            size_t delta = m_buffer_pos - m_buffer_start;
+
+            char *startOld = m_buffer_start;
+            m_buffer_size += size;
+            m_buffer_start = (char *)realloc(m_buffer_start, m_buffer_size);
+            if ( !m_buffer_start )
+            {
+                // don't leak memory if realloc() failed
+                m_buffer_start = startOld;
+                m_buffer_size -= size;
+
+                // what else can we do?
+                return;
+            }
+
+            // adjust the pointers invalidated by realloc()
+            m_buffer_pos = m_buffer_start + delta;
+            m_buffer_end = m_buffer_start + m_buffer_size;
+        }
+    }
+
+    memcpy(m_buffer_pos, buffer, size);
+    m_buffer_pos += size;
+}
+
+void wxStreamBuffer::PutChar(char c)
+{
+    wxOutputStream *outStream = GetOutputStream();
+
+    wxCHECK_RET( outStream, _T("should have a stream in wxStreamBuffer") );
+
+    // if we don't have buffer at all, just forward this call to the stream,
+    if ( !HasBuffer() )
+    {
+        outStream->OnSysWrite(&c, sizeof(c));
+    }
+    else
+    {
+        // otherwise check we have enough space left
+        if ( !GetDataLeft() && !FlushBuffer() )
+        {
+            // we don't
+            SetError(wxSTREAM_WRITE_ERROR);
+        }
+        else
+        {
+            PutToBuffer(&c, sizeof(c));
+            m_stream->m_lastcount = 1;
+        }
+    }
+}
+
+char wxStreamBuffer::Peek()
+{
+    wxCHECK_MSG( m_stream && HasBuffer(), 0,
+                 _T("should have the stream and the buffer in wxStreamBuffer") );
+
+    if ( !GetDataLeft() )
+    {
+        SetError(wxSTREAM_READ_ERROR);
+        return 0;
+    }
+
+    char c;
+    GetFromBuffer(&c, sizeof(c));
+    m_buffer_pos--;
+
+    return c;
+}
+
+char wxStreamBuffer::GetChar()
+{
+    wxInputStream *inStream = GetInputStream();
+
+    wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );
+
+    char c;
+    if ( !HasBuffer() )
+    {
+        inStream->OnSysRead(&c, sizeof(c));
+    }
+    else
+    {
+        if ( !GetDataLeft() )
+        {
+            SetError(wxSTREAM_READ_ERROR);
+            c = 0;
+        }
+        else
+        {
+            GetFromBuffer(&c, sizeof(c));
+            m_stream->m_lastcount = 1;
+        }
+    }
+
+    return c;
+}
+
+size_t wxStreamBuffer::Read(void *buffer, size_t size)
+{
+    wxASSERT_MSG( buffer, _T("Warning: Null pointer is about to be used") );
+
+    /* Clear buffer first */
+    memset(buffer, 0x00, size);
+
+    // lasterror is reset before all new IO calls
+    if ( m_stream )
+        m_stream->Reset();
+
+    size_t readBytes;
+    if ( !HasBuffer() )
+    {
+        wxInputStream *inStream = GetInputStream();
+
+        wxCHECK_MSG( inStream, 0, _T("should have a stream in wxStreamBuffer") );
+
+        readBytes = inStream->OnSysRead(buffer, size);
+    }
+    else // we have a buffer, use it
+    {
+        size_t orig_size = size;
+
+        while ( size > 0 )
+        {
+            size_t left = GetDataLeft();
+
+            // if the requested number of bytes if greater than the buffer
+            // size, read data in chunks
+            if ( size > left )
+            {
+                GetFromBuffer(buffer, left);
+                size -= left;
+                buffer = (char *)buffer + left;
+
+                if ( !FillBuffer() )
+                {
+                    SetError(wxSTREAM_EOF);
+                    break;
+                }
+            }
+            else // otherwise just do it in one gulp
+            {
+                GetFromBuffer(buffer, size);
+                size = 0;
+            }
+        }
+
+        readBytes = orig_size - size;
+    }
+
+    if ( m_stream )
+        m_stream->m_lastcount = readBytes;
+
+    return readBytes;
+}
+
+// this should really be called "Copy()"
+size_t wxStreamBuffer::Read(wxStreamBuffer *dbuf)
+{
+    wxCHECK_MSG( m_mode != write, 0, _T("can't read from this buffer") );
+
+    char buf[BUF_TEMP_SIZE];
+    size_t nRead,
+           total = 0;
+
+    do
+    {
+        nRead = Read(buf, WXSIZEOF(buf));
+        if ( nRead )
+        {
+            nRead = dbuf->Write(buf, nRead);
+            total += nRead;
+        }
+    }
+    while ( nRead );
+
+    return total;
+}
+
+size_t wxStreamBuffer::Write(const void *buffer, size_t size)
+{
+    wxASSERT_MSG( buffer, _T("Warning: Null pointer is about to be send") );
+
+    if (m_stream)
+    {
+        // lasterror is reset before all new IO calls
+        m_stream->Reset();
+    }
+
+    size_t ret;
+
+    if ( !HasBuffer() && m_fixed )
+    {
+        wxOutputStream *outStream = GetOutputStream();
+
+        wxCHECK_MSG( outStream, 0, _T("should have a stream in wxStreamBuffer") );
+
+        // no buffer, just forward the call to the stream
+        ret = outStream->OnSysWrite(buffer, size);
+    }
+    else // we [may] have a buffer, use it
+    {
+        size_t orig_size = size;
+
+        while ( size > 0 )
+        {
+            size_t left = GetBytesLeft();
+
+            // if the buffer is too large to fit in the stream buffer, split
+            // it in smaller parts
+            //
+            // NB: If stream buffer isn't fixed (as for wxMemoryOutputStream),
+            //     we always go to the second case.
+            //
+            // FIXME: fine, but if it fails we should (re)try writing it by
+            //        chunks as this will (hopefully) always work (VZ)
+
+            if ( size > left && m_fixed )
+            {
+                PutToBuffer(buffer, left);
+                size -= left;
+                buffer = (char *)buffer + left;
+
+                if ( !FlushBuffer() )
+                {
+                    SetError(wxSTREAM_WRITE_ERROR);
+
+                    break;
+                }
+
+                m_buffer_pos = m_buffer_start;
+            }
+            else // we can do it in one gulp
+            {
+                PutToBuffer(buffer, size);
+                size = 0;
+            }
+        }
+
+        ret = orig_size - size;
+    }
+
+    if (m_stream)
+    {
+        // i am not entirely sure what we do this for
+        m_stream->m_lastcount = ret;
+    }
+
+    return ret;
+}
+
+size_t wxStreamBuffer::Write(wxStreamBuffer *sbuf)
+{
+    wxCHECK_MSG( m_mode != read, 0, _T("can't write to this buffer") );
+    wxCHECK_MSG( sbuf->m_mode != write, 0, _T("can't read from that buffer") );
+
+    char buf[BUF_TEMP_SIZE];
+    size_t nWrite,
+           total = 0;
+
+    do
+    {
+        size_t nRead = sbuf->Read(buf, WXSIZEOF(buf));
+        if ( nRead )
+        {
+            nWrite = Write(buf, nRead);
+            if ( nWrite < nRead )
+            {
+                // put back data we couldn't copy
+                wxInputStream *in_stream = (wxInputStream *)sbuf->GetStream();
+
+                in_stream->Ungetch(buf + nWrite, nRead - nWrite);
+            }
+
+            total += nWrite;
+        }
+        else
+        {
+            nWrite = 0;
+        }
+    }
+    while ( nWrite == WXSIZEOF(buf) );
+
+    return total;
+}
+
+wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
+{
+    wxFileOffset ret_off, diff;
+
+    wxFileOffset last_access = GetLastAccess();
+
+    if ( !m_flushable )
+    {
+        switch (mode)
+        {
+            case wxFromStart:
+                diff = pos;
+                break;
+
+            case wxFromCurrent:
+                diff = pos + GetIntPosition();
+                break;
+
+            case wxFromEnd:
+                diff = pos + last_access;
+                break;
+
+            default:
+                wxFAIL_MSG( _T("invalid seek mode") );
+
+                return wxInvalidOffset;
+        }
+        if (diff < 0 || diff > last_access)
+            return wxInvalidOffset;
+        size_t int_diff = wx_truncate_cast(size_t, diff);
+        wxCHECK_MSG( (wxFileOffset)int_diff == diff, wxInvalidOffset, wxT("huge file not supported") );
+        SetIntPosition(int_diff);
+        return diff;
+    }
+
+    switch ( mode )
+    {
+        case wxFromStart:
+            // We'll try to compute an internal position later ...
+            ret_off = m_stream->OnSysSeek(pos, wxFromStart);
+            ResetBuffer();
+            return ret_off;
+
+        case wxFromCurrent:
+            diff = pos + GetIntPosition();
+
+            if ( (diff > last_access) || (diff < 0) )
+            {
+                // We must take into account the fact that we have read
+                // something previously.
+                ret_off = m_stream->OnSysSeek(diff-last_access, wxFromCurrent);
+                ResetBuffer();
+                return ret_off;
+            }
+            else
+            {
+                size_t int_diff = wx_truncate_cast(size_t, diff);
+                wxCHECK_MSG( (wxFileOffset)int_diff == diff, wxInvalidOffset, wxT("huge file not supported") );
+                SetIntPosition(int_diff);
+                return pos;
+            }
+
+        case wxFromEnd:
+            // Hard to compute: always seek to the requested position.
+            ret_off = m_stream->OnSysSeek(pos, wxFromEnd);
+            ResetBuffer();
+            return ret_off;
+    }
+
+    return wxInvalidOffset;
+}
+
+wxFileOffset wxStreamBuffer::Tell() const
+{
+    wxFileOffset pos;
+
+    // ask the stream for position if we have a real one
+    if ( m_stream )
+    {
+        pos = m_stream->OnSysTell();
+        if ( pos == wxInvalidOffset )
+            return wxInvalidOffset;
+    }
+    else // no associated stream
+    {
+        pos = 0;
+    }
+
+    pos += GetIntPosition();
+
+    if ( m_mode == read && m_flushable )
+        pos -= GetLastAccess();
+
+    return pos;
+}
+
+// ----------------------------------------------------------------------------
+// wxStreamBase
+// ----------------------------------------------------------------------------
+
+wxStreamBase::wxStreamBase()
+{
+    m_lasterror = wxSTREAM_NO_ERROR;
+    m_lastcount = 0;
+}
+
+wxStreamBase::~wxStreamBase()
+{
+}
+
+size_t wxStreamBase::GetSize() const
+{
+    wxFileOffset length = GetLength();
+    if ( length == (wxFileOffset)wxInvalidOffset )
+        return 0;
+
+    const size_t len = wx_truncate_cast(size_t, length);
+    wxASSERT_MSG( len == length + size_t(0), _T("large files not supported") );
+
+    return len;
+}
+
+wxFileOffset wxStreamBase::OnSysSeek(wxFileOffset WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
+{
+    return wxInvalidOffset;
+}
+
+wxFileOffset wxStreamBase::OnSysTell() const
+{
+    return wxInvalidOffset;
+}
+
+// ----------------------------------------------------------------------------
+// wxInputStream
+// ----------------------------------------------------------------------------
+
+wxInputStream::wxInputStream()
+{
+    m_wback = NULL;
+    m_wbacksize =
+    m_wbackcur = 0;
+}
+
+wxInputStream::~wxInputStream()
+{
+    free(m_wback);
+}
+
+bool wxInputStream::CanRead() const
+{
+    // we don't know if there is anything to read or not and by default we
+    // prefer to be optimistic and try to read data unless we know for sure
+    // there is no more of it
+    return m_lasterror != wxSTREAM_EOF;
+}
+
+bool wxInputStream::Eof() const
+{
+    // the only way the base class can know we're at EOF is when we'd already
+    // tried to read beyond it in which case last error is set accordingly
+    return GetLastError() == wxSTREAM_EOF;
+}
+
+char *wxInputStream::AllocSpaceWBack(size_t needed_size)
+{
+    // get number of bytes left from previous wback buffer
+    size_t toget = m_wbacksize - m_wbackcur;
+
+    // allocate a buffer large enough to hold prev + new data
+    char *temp_b = (char *)malloc(needed_size + toget);
+
+    if (!temp_b)
+        return NULL;
+
+    // copy previous data (and free old buffer) if needed
+    if (m_wback)
+    {
+        memmove(temp_b + needed_size, m_wback + m_wbackcur, toget);
+        free(m_wback);
+    }
+
+    // done
+    m_wback = temp_b;
+    m_wbackcur = 0;
+    m_wbacksize = needed_size + toget;
+
+    return m_wback;
+}
+
+size_t wxInputStream::GetWBack(void *buf, size_t size)
+{
+    wxASSERT_MSG( buf, _T("Warning: Null pointer is about to be used") );
+
+    /* Clear buffer first */
+    memset(buf, 0x00, size);
+
+    if (!m_wback)
+        return 0;
+
+    // how many bytes do we have in the buffer?
+    size_t toget = m_wbacksize - m_wbackcur;
+
+    if ( size < toget )
+    {
+        // we won't read everything
+        toget = size;
+    }
+
+    // copy the data from the cache
+    memcpy(buf, m_wback + m_wbackcur, toget);
+
+    m_wbackcur += toget;
+    if ( m_wbackcur == m_wbacksize )
+    {
+        // TODO: should we really free it here all the time? maybe keep it?
+        free(m_wback);
+        m_wback = NULL;
+        m_wbacksize = 0;
+        m_wbackcur = 0;
+    }
+
+    // return the number of bytes copied
+    return toget;
+}
+
+size_t wxInputStream::Ungetch(const void *buf, size_t bufsize)
+{
+    wxASSERT_MSG( buf, _T("Warning: Null pointer is about to be used in Ungetch()") );
+
+    if ( m_lasterror != wxSTREAM_NO_ERROR && m_lasterror != wxSTREAM_EOF )
+    {
+        // can't operate on this stream until the error is cleared
+        return 0;
+    }
+
+    char *ptrback = AllocSpaceWBack(bufsize);
+    if (!ptrback)
+        return 0;
+
+    // Eof() shouldn't return true any longer
+    if ( m_lasterror == wxSTREAM_EOF )
+        m_lasterror = wxSTREAM_NO_ERROR;
+
+    memcpy(ptrback, buf, bufsize);
+    return bufsize;
+}
+
+bool wxInputStream::Ungetch(char c)
+{
+    return Ungetch(&c, sizeof(c)) != 0;
+}
+
+int wxInputStream::GetC()
+{
+    unsigned char c;
+    Read(&c, sizeof(c));
+    return LastRead() ? c : wxEOF;
+}
+
+wxInputStream& wxInputStream::Read(void *buf, size_t size)
+{
+    wxASSERT_MSG( buf, _T("Warning: Null pointer is about to be read") );
+
+    char *p = (char *)buf;
+    m_lastcount = 0;
+
+    size_t read = GetWBack(buf, size);
+    for ( ;; )
+    {
+        size -= read;
+        m_lastcount += read;
+        p += read;
+
+        if ( !size )
+        {
+            // we read the requested amount of data
+            break;
+        }
+
+        if ( p != buf && !CanRead() )
+        {
+            // we have already read something and we would block in OnSysRead()
+            // now: don't do it but return immediately
+            break;
+        }
+
+        read = OnSysRead(p, size);
+        if ( !read )
+        {
+            // no more data available
+            break;
+        }
+    }
+
+    return *this;
+}
+
+char wxInputStream::Peek()
+{
+    char c;
+    Read(&c, sizeof(c));
+    if (m_lasterror == wxSTREAM_NO_ERROR)
+    {
+        Ungetch(c);
+        return c;
+    }
+
+    return 0;
+}
+
+wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
+{
+    size_t lastcount = 0;
+    char buf[BUF_TEMP_SIZE];
+
+    for ( ;; )
+    {
+        size_t bytes_read = Read(buf, WXSIZEOF(buf)).LastRead();
+        if ( !bytes_read )
+            break;
+
+        if ( stream_out.Write(buf, bytes_read).LastWrite() != bytes_read )
+            break;
+
+        lastcount += bytes_read;
+    }
+
+    m_lastcount = lastcount;
+
+    return *this;
+}
+
+wxFileOffset wxInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
+{
+    // RR: This code is duplicated in wxBufferedInputStream. This is
+    // not really a good design, but buffered stream are different
+    // from all other in that they handle two stream-related objects,
+    // the stream buffer and parent stream.
+
+    // I don't know whether it should be put as well in wxFileInputStream::OnSysSeek
+    if (m_lasterror==wxSTREAM_EOF)
+        m_lasterror=wxSTREAM_NO_ERROR;
+
+    /* RR: A call to SeekI() will automatically invalidate any previous
+       call to Ungetch(), otherwise it would be possible to SeekI() to
+       one position, unread some bytes there, SeekI() to another position
+       and the data would be corrupted.
+
+       GRG: Could add code here to try to navigate within the wback
+       buffer if possible, but is it really needed? It would only work
+       when seeking in wxFromCurrent mode, else it would invalidate
+       anyway... */
+
+    if (m_wback)
+    {
+        wxLogDebug( wxT("Seeking in stream which has data written back to it.") );
+
+        free(m_wback);
+        m_wback = NULL;
+        m_wbacksize = 0;
+        m_wbackcur = 0;
+    }
+
+    return OnSysSeek(pos, mode);
+}
+
+wxFileOffset wxInputStream::TellI() const
+{
+    wxFileOffset pos = OnSysTell();
+
+    if (pos != wxInvalidOffset)
+        pos -= (m_wbacksize - m_wbackcur);
+
+    return pos;
+}
+
+
+// ----------------------------------------------------------------------------
+// wxOutputStream
+// ----------------------------------------------------------------------------
+
+wxOutputStream::wxOutputStream()
+{
+}
+
+wxOutputStream::~wxOutputStream()
+{
+}
+
+size_t wxOutputStream::OnSysWrite(const void * WXUNUSED(buffer),
+                                  size_t WXUNUSED(bufsize))
+{
+    return 0;
+}
+
+void wxOutputStream::PutC(char c)
+{
+    Write(&c, sizeof(c));
+}
+
+wxOutputStream& wxOutputStream::Write(const void *buffer, size_t size)
+{
+    m_lastcount = OnSysWrite(buffer, size);
+    return *this;
+}
+
+wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
+{
+    stream_in.Read(*this);
+    return *this;
+}
+
+wxFileOffset wxOutputStream::TellO() const
+{
+    return OnSysTell();
+}
+
+wxFileOffset wxOutputStream::SeekO(wxFileOffset pos, wxSeekMode mode)
+{
+    return OnSysSeek(pos, mode);
+}
+
+void wxOutputStream::Sync()
+{
+}
+
+
+// ----------------------------------------------------------------------------
+// wxCountingOutputStream
+// ----------------------------------------------------------------------------
+
+wxCountingOutputStream::wxCountingOutputStream ()
+{
+     m_currentPos = 0;
+}
+
+wxFileOffset wxCountingOutputStream::GetLength() const
+{
+    return m_lastcount;
+}
+
+size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer),
+                                          size_t size)
+{
+    m_currentPos += size;
+    if (m_currentPos > m_lastcount)
+        m_lastcount = m_currentPos;
+
+    return m_currentPos;
+}
+
+wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    ssize_t new_pos = wx_truncate_cast(ssize_t, pos);
+
+    switch ( mode )
+    {
+        case wxFromStart:
+            wxCHECK_MSG( (wxFileOffset)new_pos == pos, wxInvalidOffset, wxT("huge position not supported") );
+            break;
+
+        case wxFromEnd:
+            new_pos = m_lastcount + new_pos;
+            wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_lastcount + pos), wxInvalidOffset, wxT("huge position not supported") );
+            break;
+
+        case wxFromCurrent:
+            new_pos = m_currentPos + new_pos;
+            wxCHECK_MSG( (wxFileOffset)new_pos == (wxFileOffset)(m_currentPos + pos), wxInvalidOffset, wxT("huge position not supported") );
+            break;
+
+        default:
+            wxFAIL_MSG( _T("invalid seek mode") );
+            return wxInvalidOffset;
+    }
+
+    m_currentPos = new_pos;
+
+    if (m_currentPos > m_lastcount)
+        m_lastcount = m_currentPos;
+
+    return m_currentPos;
+}
+
+wxFileOffset wxCountingOutputStream::OnSysTell() const
+{
+    return m_currentPos;
+}
+
+// ----------------------------------------------------------------------------
+// wxFilterInputStream
+// ----------------------------------------------------------------------------
+
+wxFilterInputStream::wxFilterInputStream()
+ :  m_parent_i_stream(NULL),
+    m_owns(false)
+{
+}
+
+wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
+ :  m_parent_i_stream(&stream),
+    m_owns(false)
+{
+}
+
+wxFilterInputStream::wxFilterInputStream(wxInputStream *stream)
+ :  m_parent_i_stream(stream),
+    m_owns(true)
+{
+}
+
+wxFilterInputStream::~wxFilterInputStream()
+{
+    if (m_owns)
+        delete m_parent_i_stream;
+}
+
+// ----------------------------------------------------------------------------
+// wxFilterOutputStream
+// ----------------------------------------------------------------------------
+
+wxFilterOutputStream::wxFilterOutputStream()
+ :  m_parent_o_stream(NULL),
+    m_owns(false)
+{
+}
+
+wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
+ :  m_parent_o_stream(&stream),
+    m_owns(false)
+{
+}
+
+wxFilterOutputStream::wxFilterOutputStream(wxOutputStream *stream)
+ :  m_parent_o_stream(stream),
+    m_owns(true)
+{
+}
+
+bool wxFilterOutputStream::Close()
+{
+    if (m_parent_o_stream && m_owns)
+        return m_parent_o_stream->Close();
+    else
+        return true;
+}
+
+wxFilterOutputStream::~wxFilterOutputStream()
+{
+    if (m_owns)
+        delete m_parent_o_stream;
+}
+
+// ----------------------------------------------------------------------------
+// wxFilterClassFactoryBase
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactoryBase, wxObject)
+
+wxString wxFilterClassFactoryBase::PopExtension(const wxString& location) const
+{
+    return location.substr(0, FindExtension(location));
+}
+
+wxString::size_type wxFilterClassFactoryBase::FindExtension(
+        const wxChar *location) const
+{
+    size_t len = wxStrlen(location);
+
+    for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXT); *p; p++)
+    {
+        size_t l = wxStrlen(*p);
+
+        if (l <= len && wxStrcmp(*p, location + len - l) == 0)
+            return len - l;
+    }
+
+    return wxString::npos;
+}
+
+bool wxFilterClassFactoryBase::CanHandle(const wxChar *protocol,
+                                         wxStreamProtocolType type) const
+{
+    if (type == wxSTREAM_FILEEXT)
+        return FindExtension(protocol) != wxString::npos;
+    else
+        for (const wxChar *const *p = GetProtocols(type); *p; p++)
+            if (wxStrcmp(*p, protocol) == 0)
+                return true;
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// wxFilterClassFactory
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxFilterClassFactory, wxFilterClassFactoryBase)
+
+wxFilterClassFactory *wxFilterClassFactory::sm_first = NULL;
+
+void wxFilterClassFactory::Remove()
+{
+    if (m_next != this)
+    {
+        wxFilterClassFactory **pp = &sm_first;
+
+        while (*pp != this)
+            pp = &(*pp)->m_next;
+
+        *pp = m_next;
+
+        m_next = this;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxBufferedInputStream
+// ----------------------------------------------------------------------------
+
+wxBufferedInputStream::wxBufferedInputStream(wxInputStream& s,
+                                             wxStreamBuffer *buffer)
+                     : wxFilterInputStream(s)
+{
+    if ( buffer )
+    {
+        // use the buffer provided by the user
+        m_i_streambuf = buffer;
+    }
+    else // create a default buffer
+    {
+        m_i_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::read);
+
+        m_i_streambuf->SetBufferIO(1024);
+    }
+}
+
+wxBufferedInputStream::~wxBufferedInputStream()
+{
+    m_parent_i_stream->SeekI(-(wxFileOffset)m_i_streambuf->GetBytesLeft(),
+                             wxFromCurrent);
+
+    delete m_i_streambuf;
+}
+
+char wxBufferedInputStream::Peek()
+{
+    return m_i_streambuf->Peek();
+}
+
+wxInputStream& wxBufferedInputStream::Read(void *buf, size_t size)
+{
+    // reset the error flag
+    Reset();
+
+    // first read from the already cached data
+    m_lastcount = GetWBack(buf, size);
+
+    // do we have to read anything more?
+    if ( m_lastcount < size )
+    {
+        size -= m_lastcount;
+        buf = (char *)buf + m_lastcount;
+
+        // the call to wxStreamBuffer::Read() below may reset our m_lastcount
+        // (but it also may not do it if the buffer is associated to another
+        // existing stream and wasn't created by us), so save it
+        size_t countOld = m_lastcount;
+
+        // the new count of the bytes read is the count of bytes read this time
+        m_lastcount = m_i_streambuf->Read(buf, size);
+
+        // plus those we had read before
+        m_lastcount += countOld;
+    }
+
+    return *this;
+}
+
+wxFileOffset wxBufferedInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
+{
+    // RR: Look at wxInputStream for comments.
+
+    if (m_lasterror==wxSTREAM_EOF)
+        Reset();
+
+    if (m_wback)
+    {
+        wxLogDebug( wxT("Seeking in stream which has data written back to it.") );
+
+        free(m_wback);
+        m_wback = NULL;
+        m_wbacksize = 0;
+        m_wbackcur = 0;
+    }
+
+    return m_i_streambuf->Seek(pos, mode);
+}
+
+wxFileOffset wxBufferedInputStream::TellI() const
+{
+    wxFileOffset pos = m_i_streambuf->Tell();
+
+    if (pos != wxInvalidOffset)
+        pos -= (m_wbacksize - m_wbackcur);
+
+    return pos;
+}
+
+size_t wxBufferedInputStream::OnSysRead(void *buffer, size_t bufsize)
+{
+    return m_parent_i_stream->Read(buffer, bufsize).LastRead();
+}
+
+wxFileOffset wxBufferedInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
+{
+    return m_parent_i_stream->SeekI(seek, mode);
+}
+
+wxFileOffset wxBufferedInputStream::OnSysTell() const
+{
+    return m_parent_i_stream->TellI();
+}
+
+void wxBufferedInputStream::SetInputStreamBuffer(wxStreamBuffer *buffer)
+{
+    wxCHECK_RET( buffer, _T("wxBufferedInputStream needs buffer") );
+
+    delete m_i_streambuf;
+    m_i_streambuf = buffer;
+}
+
+// ----------------------------------------------------------------------------
+// wxBufferedOutputStream
+// ----------------------------------------------------------------------------
+
+wxBufferedOutputStream::wxBufferedOutputStream(wxOutputStream& s,
+                                               wxStreamBuffer *buffer)
+                      : wxFilterOutputStream(s)
+{
+    if ( buffer )
+    {
+        m_o_streambuf = buffer;
+    }
+    else // create a default one
+    {
+        m_o_streambuf = new wxStreamBuffer(*this, wxStreamBuffer::write);
+
+        m_o_streambuf->SetBufferIO(1024);
+    }
+}
+
+wxBufferedOutputStream::~wxBufferedOutputStream()
+{
+    Sync();
+    delete m_o_streambuf;
+}
+
+bool wxBufferedOutputStream::Close()
+{
+    Sync();
+    return IsOk();
+}
+
+
+wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)
+{
+    m_lastcount = 0;
+    m_o_streambuf->Write(buffer, size);
+    return *this;
+}
+
+wxFileOffset wxBufferedOutputStream::SeekO(wxFileOffset pos, wxSeekMode mode)
+{
+    Sync();
+    return m_o_streambuf->Seek(pos, mode);
+}
+
+wxFileOffset wxBufferedOutputStream::TellO() const
+{
+    return m_o_streambuf->Tell();
+}
+
+void wxBufferedOutputStream::Sync()
+{
+    m_o_streambuf->FlushBuffer();
+    m_parent_o_stream->Sync();
+}
+
+size_t wxBufferedOutputStream::OnSysWrite(const void *buffer, size_t bufsize)
+{
+    return m_parent_o_stream->Write(buffer, bufsize).LastWrite();
+}
+
+wxFileOffset wxBufferedOutputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
+{
+    return m_parent_o_stream->SeekO(seek, mode);
+}
+
+wxFileOffset wxBufferedOutputStream::OnSysTell() const
+{
+    return m_parent_o_stream->TellO();
+}
+
+wxFileOffset wxBufferedOutputStream::GetLength() const
+{
+   return m_parent_o_stream->GetLength() + m_o_streambuf->GetIntPosition();
+}
+
+void wxBufferedOutputStream::SetOutputStreamBuffer(wxStreamBuffer *buffer)
+{
+    wxCHECK_RET( buffer, _T("wxBufferedOutputStream needs buffer") );
+
+    delete m_o_streambuf;
+    m_o_streambuf = buffer;
+}
+
+// ----------------------------------------------------------------------------
+// Some IOManip function
+// ----------------------------------------------------------------------------
+
+wxOutputStream& wxEndL(wxOutputStream& stream)
+{
+    static const wxChar *eol = wxTextFile::GetEOL();
+
+    return stream.Write(eol, wxStrlen(eol));
+}
+
+#endif // wxUSE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/string.cpp b/Source/3rd Party/wx/src/common/string.cpp
index 6eedc18b7..1bb1052ed 100644
--- a/Source/3rd Party/wx/src/common/string.cpp	
+++ b/Source/3rd Party/wx/src/common/string.cpp	
@@ -1,2326 +1,2659 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/string.cpp
-// Purpose:     wxString class
-// Author:      Vadim Zeitlin, Ryan Norton
-// Modified by:
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-//              (c) 2004 Ryan Norton <wxprojects@comcast.net>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// headers, declarations, constants
-// ===========================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/wxcrtvararg.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif
-
-#include <ctype.h>
-
-#ifndef __WXWINCE__
-    #include <errno.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
-#include "wx/hashmap.h"
-#include "wx/vector.h"
-#include "wx/xlocale.h"
-
-#ifdef __WINDOWS__
-    #include "wx/msw/wrapwin.h"
-#endif // __WINDOWS__
-
-#if wxUSE_STD_IOSTREAM
-    #include <sstream>
-#endif
-
-// string handling functions used by wxString:
-#if wxUSE_UNICODE_UTF8
-    #define wxStringMemcpy   memcpy
-    #define wxStringMemcmp   memcmp
-    #define wxStringMemchr   memchr
-    #define wxStringStrlen   strlen
-#else
-    #define wxStringMemcpy   wxTmemcpy
-    #define wxStringMemcmp   wxTmemcmp
-    #define wxStringMemchr   wxTmemchr
-    #define wxStringStrlen   wxStrlen
-#endif
-
-// define a function declared in wx/buffer.h here as we don't have buffer.cpp
-// and don't want to add it just because of this simple function
-namespace wxPrivate
-{
-
-// wxXXXBuffer classes can be (implicitly) used during global statics
-// initialization so wrap the status UntypedBufferData variable in a function
-// to make it safe to access it even before all global statics are initialized
-UntypedBufferData *GetUntypedNullData()
-{
-    static UntypedBufferData s_untypedNullData(NULL, 0);
-
-    return &s_untypedNullData;
-}
-
-} // namespace wxPrivate
-
-// ---------------------------------------------------------------------------
-// static class variables definition
-// ---------------------------------------------------------------------------
-
-//According to STL _must_ be a -1 size_t
-const size_t wxString::npos = (size_t) -1;
-
-#if wxUSE_STRING_POS_CACHE
-
-#ifdef wxHAS_COMPILER_TLS
-
-wxTLS_TYPE(wxString::Cache) wxString::ms_cache;
-
-#else // !wxHAS_COMPILER_TLS
-
-struct wxStrCacheInitializer
-{
-    wxStrCacheInitializer()
-    {
-        // calling this function triggers s_cache initialization in it, and
-        // from now on it becomes safe to call from multiple threads
-        wxString::GetCache();
-    }
-};
-
-/*
-wxString::Cache& wxString::GetCache()
-{
-    static wxTLS_TYPE(Cache) s_cache;
-
-    return wxTLS_VALUE(s_cache);
-}
-*/
-
-static wxStrCacheInitializer gs_stringCacheInit;
-
-#endif // wxHAS_COMPILER_TLS/!wxHAS_COMPILER_TLS
-
-// gdb seems to be unable to display thread-local variables correctly, at least
-// not my 6.4.98 version under amd64, so provide this debugging helper to do it
-#if wxDEBUG_LEVEL >= 2
-
-struct wxStrCacheDumper
-{
-    static void ShowAll()
-    {
-        puts("*** wxString cache dump:");
-        for ( unsigned n = 0; n < wxString::Cache::SIZE; n++ )
-        {
-            const wxString::Cache::Element&
-                c = wxString::GetCacheBegin()[n];
-
-            printf("\t%u%s\t%p: pos=(%lu, %lu), len=%ld\n",
-                   n,
-                   n == wxString::LastUsedCacheElement() ? " [*]" : "",
-                   c.str,
-                   (unsigned long)c.pos,
-                   (unsigned long)c.impl,
-                   (long)c.len);
-        }
-    }
-};
-
-void wxDumpStrCache() { wxStrCacheDumper::ShowAll(); }
-
-#endif // wxDEBUG_LEVEL >= 2
-
-#ifdef wxPROFILE_STRING_CACHE
-
-wxString::CacheStats wxString::ms_cacheStats;
-
-struct wxStrCacheStatsDumper
-{
-    ~wxStrCacheStatsDumper()
-    {
-        const wxString::CacheStats& stats = wxString::ms_cacheStats;
-
-        if ( stats.postot )
-        {
-            puts("*** wxString cache statistics:");
-            printf("\tTotal non-trivial calls to PosToImpl(): %u\n",
-                   stats.postot);
-            printf("\tHits %u (of which %u not used) or %.2f%%\n",
-                   stats.poshits,
-                   stats.mishits,
-                   100.*float(stats.poshits - stats.mishits)/stats.postot);
-            printf("\tAverage position requested: %.2f\n",
-                   float(stats.sumpos) / stats.postot);
-            printf("\tAverage offset after cached hint: %.2f\n",
-                   float(stats.sumofs) / stats.postot);
-        }
-
-        if ( stats.lentot )
-        {
-            printf("\tNumber of calls to length(): %u, hits=%.2f%%\n",
-                   stats.lentot, 100.*float(stats.lenhits)/stats.lentot);
-        }
-    }
-};
-
-static wxStrCacheStatsDumper s_showCacheStats;
-
-#endif // wxPROFILE_STRING_CACHE
-
-#endif // wxUSE_STRING_POS_CACHE
-
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STD_IOSTREAM
-
-#include <iostream>
-
-wxSTD ostream& operator<<(wxSTD ostream& os, const wxCStrData& str)
-{
-#if wxUSE_UNICODE && !wxUSE_UNICODE_UTF8
-    const wxScopedCharBuffer buf(str.AsCharBuf());
-    if ( !buf )
-        os.clear(wxSTD ios_base::failbit);
-    else
-        os << buf.data();
-
-    return os;
-#else
-    return os << str.AsInternal();
-#endif
-}
-
-wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
-{
-    return os << str.c_str();
-}
-
-wxSTD ostream& operator<<(wxSTD ostream& os, const wxScopedCharBuffer& str)
-{
-    return os << str.data();
-}
-
-#ifndef __BORLANDC__
-wxSTD ostream& operator<<(wxSTD ostream& os, const wxScopedWCharBuffer& str)
-{
-    return os << str.data();
-}
-#endif
-
-#if wxUSE_UNICODE && defined(HAVE_WOSTREAM)
-
-wxSTD wostream& operator<<(wxSTD wostream& wos, const wxString& str)
-{
-    return wos << str.wc_str();
-}
-
-wxSTD wostream& operator<<(wxSTD wostream& wos, const wxCStrData& str)
-{
-    return wos << str.AsWChar();
-}
-
-wxSTD wostream& operator<<(wxSTD wostream& wos, const wxScopedWCharBuffer& str)
-{
-    return wos << str.data();
-}
-
-#endif  // wxUSE_UNICODE && defined(HAVE_WOSTREAM)
-
-#endif // wxUSE_STD_IOSTREAM
-
-// ===========================================================================
-// wxString class core
-// ===========================================================================
-
-#if wxUSE_UNICODE_UTF8
-
-void wxString::PosLenToImpl(size_t pos, size_t len,
-                            size_t *implPos, size_t *implLen) const
-{
-    if ( pos == npos )
-    {
-        *implPos = npos;
-    }
-    else // have valid start position
-    {
-        const const_iterator b = GetIterForNthChar(pos);
-        *implPos = wxStringImpl::const_iterator(b.impl()) - m_impl.begin();
-        if ( len == npos )
-        {
-            *implLen = npos;
-        }
-        else // have valid length too
-        {
-            // we need to handle the case of length specifying a substring
-            // going beyond the end of the string, just as std::string does
-            const const_iterator e(end());
-            const_iterator i(b);
-            while ( len && i <= e )
-            {
-                ++i;
-                --len;
-            }
-
-            *implLen = i.impl() - b.impl();
-        }
-    }
-}
-
-#endif // wxUSE_UNICODE_UTF8
-
-// ----------------------------------------------------------------------------
-// wxCStrData converted strings caching
-// ----------------------------------------------------------------------------
-
-// FIXME-UTF8: temporarily disabled because it doesn't work with global
-//             string objects; re-enable after fixing this bug and benchmarking
-//             performance to see if using a hash is a good idea at all
-#if 0
-
-// For backward compatibility reasons, it must be possible to assign the value
-// returned by wxString::c_str() to a char* or wchar_t* variable and work with
-// it. Returning wxCharBuffer from (const char*)c_str() wouldn't do the trick,
-// because the memory would be freed immediately, but it has to be valid as long
-// as the string is not modified, so that code like this still works:
-//
-// const wxChar *s = str.c_str();
-// while ( s ) { ... }
-
-// FIXME-UTF8: not thread safe!
-// FIXME-UTF8: we currently clear the cached conversion only when the string is
-//             destroyed, but we should do it when the string is modified, to
-//             keep memory usage down
-// FIXME-UTF8: we do the conversion every time As[W]Char() is called, but if we
-//             invalidated the cache on every change, we could keep the previous
-//             conversion
-// FIXME-UTF8: add tracing of usage of these two methods - new code is supposed
-//             to use mb_str() or wc_str() instead of (const [w]char*)c_str()
-
-template<typename T>
-static inline void DeleteStringFromConversionCache(T& hash, const wxString *s)
-{
-    typename T::iterator i = hash.find(wxConstCast(s, wxString));
-    if ( i != hash.end() )
-    {
-        free(i->second);
-        hash.erase(i);
-    }
-}
-
-#if wxUSE_UNICODE
-// NB: non-STL implementation doesn't compile with "const wxString*" key type,
-//     so we have to use wxString* here and const-cast when used
-WX_DECLARE_HASH_MAP(wxString*, char*, wxPointerHash, wxPointerEqual,
-                    wxStringCharConversionCache);
-static wxStringCharConversionCache gs_stringsCharCache;
-
-const char* wxCStrData::AsChar() const
-{
-    // remove previously cache value, if any (see FIXMEs above):
-    DeleteStringFromConversionCache(gs_stringsCharCache, m_str);
-
-    // convert the string and keep it:
-    const char *s = gs_stringsCharCache[wxConstCast(m_str, wxString)] =
-        m_str->mb_str().release();
-
-    return s + m_offset;
-}
-#endif // wxUSE_UNICODE
-
-#if !wxUSE_UNICODE_WCHAR
-WX_DECLARE_HASH_MAP(wxString*, wchar_t*, wxPointerHash, wxPointerEqual,
-                    wxStringWCharConversionCache);
-static wxStringWCharConversionCache gs_stringsWCharCache;
-
-const wchar_t* wxCStrData::AsWChar() const
-{
-    // remove previously cache value, if any (see FIXMEs above):
-    DeleteStringFromConversionCache(gs_stringsWCharCache, m_str);
-
-    // convert the string and keep it:
-    const wchar_t *s = gs_stringsWCharCache[wxConstCast(m_str, wxString)] =
-        m_str->wc_str().release();
-
-    return s + m_offset;
-}
-#endif // !wxUSE_UNICODE_WCHAR
-
-wxString::~wxString()
-{
-#if wxUSE_UNICODE
-    // FIXME-UTF8: do this only if locale is not UTF8 if wxUSE_UNICODE_UTF8
-    DeleteStringFromConversionCache(gs_stringsCharCache, this);
-#endif
-#if !wxUSE_UNICODE_WCHAR
-    DeleteStringFromConversionCache(gs_stringsWCharCache, this);
-#endif
-}
-#endif
-
-// ===========================================================================
-// wxString class core
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// construction and conversion
-// ---------------------------------------------------------------------------
-
-#if wxUSE_UNICODE_WCHAR
-/* static */
-wxString::SubstrBufFromMB wxString::ConvertStr(const char *psz, size_t nLength,
-                                               const wxMBConv& conv)
-{
-    // anything to do?
-    if ( !psz || nLength == 0 )
-        return SubstrBufFromMB(wxWCharBuffer(L""), 0);
-
-    if ( nLength == npos )
-        nLength = wxNO_LEN;
-
-    size_t wcLen;
-    wxScopedWCharBuffer wcBuf(conv.cMB2WC(psz, nLength, &wcLen));
-    if ( !wcLen )
-        return SubstrBufFromMB(wxWCharBuffer(L""), 0);
-    else
-        return SubstrBufFromMB(wcBuf, wcLen);
-}
-#endif // wxUSE_UNICODE_WCHAR
-
-#if wxUSE_UNICODE_UTF8
-/* static */
-wxString::SubstrBufFromMB wxString::ConvertStr(const char *psz, size_t nLength,
-                                               const wxMBConv& conv)
-{
-    // anything to do?
-    if ( !psz || nLength == 0 )
-        return SubstrBufFromMB(wxCharBuffer(""), 0);
-
-    // if psz is already in UTF-8, we don't have to do the roundtrip to
-    // wchar_t* and back:
-    if ( conv.IsUTF8() )
-    {
-        // we need to validate the input because UTF8 iterators assume valid
-        // UTF-8 sequence and psz may be invalid:
-        if ( wxStringOperations::IsValidUtf8String(psz, nLength) )
-        {
-            // we must pass the real string length to SubstrBufFromMB ctor
-            if ( nLength == npos )
-                nLength = psz ? strlen(psz) : 0;
-            return SubstrBufFromMB(wxScopedCharBuffer::CreateNonOwned(psz, nLength),
-                                   nLength);
-        }
-        // else: do the roundtrip through wchar_t*
-    }
-
-    if ( nLength == npos )
-        nLength = wxNO_LEN;
-
-    // first convert to wide string:
-    size_t wcLen;
-    wxScopedWCharBuffer wcBuf(conv.cMB2WC(psz, nLength, &wcLen));
-    if ( !wcLen )
-        return SubstrBufFromMB(wxCharBuffer(""), 0);
-
-    // and then to UTF-8:
-    SubstrBufFromMB buf(ConvertStr(wcBuf, wcLen, wxMBConvStrictUTF8()));
-    // widechar -> UTF-8 conversion isn't supposed to ever fail:
-    wxASSERT_MSG( buf.data, wxT("conversion to UTF-8 failed") );
-
-    return buf;
-}
-#endif // wxUSE_UNICODE_UTF8
-
-#if wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE
-/* static */
-wxString::SubstrBufFromWC wxString::ConvertStr(const wchar_t *pwz, size_t nLength,
-                                               const wxMBConv& conv)
-{
-    // anything to do?
-    if ( !pwz || nLength == 0 )
-        return SubstrBufFromWC(wxCharBuffer(""), 0);
-
-    if ( nLength == npos )
-        nLength = wxNO_LEN;
-
-    size_t mbLen;
-    wxScopedCharBuffer mbBuf(conv.cWC2MB(pwz, nLength, &mbLen));
-    if ( !mbLen )
-        return SubstrBufFromWC(wxCharBuffer(""), 0);
-    else
-        return SubstrBufFromWC(mbBuf, mbLen);
-}
-#endif // wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE
-
-// This std::string::c_str()-like method returns a wide char pointer to string
-// contents. In wxUSE_UNICODE_WCHAR case it is trivial as it can simply return
-// a pointer to the internal representation. Otherwise a conversion is required
-// and it returns a temporary buffer.
-//
-// However for compatibility with c_str() and to avoid breaking existing code
-// doing
-//
-//      for ( const wchar_t *p = s.wc_str(); *p; p++ )
-//          ... use *p...
-//
-// we actually need to ensure that the returned buffer is _not_ temporary and
-// so we use wxString::m_convertedToWChar to store the returned data
-#if !wxUSE_UNICODE_WCHAR
-
-const wchar_t *wxString::AsWChar(const wxMBConv& conv) const
-{
-    const char * const strMB = m_impl.c_str();
-    const size_t lenMB = m_impl.length();
-
-    // find out the size of the buffer needed
-    const size_t lenWC = conv.ToWChar(NULL, 0, strMB, lenMB);
-    if ( lenWC == wxCONV_FAILED )
-        return NULL;
-
-    // keep the same buffer if the string size didn't change: this is not only
-    // an optimization but also ensure that code which modifies string
-    // character by character (without changing its length) can continue to use
-    // the pointer returned by a previous wc_str() call even after changing the
-    // string
-
-    // TODO-UTF8: we could check for ">" instead of "!=" here as this would
-    //            allow to save on buffer reallocations but at the cost of
-    //            consuming (even) more memory, we should benchmark this to
-    //            determine if it's worth doing
-    if ( !m_convertedToWChar.m_str || lenWC != m_convertedToWChar.m_len )
-    {
-        if ( !const_cast<wxString *>(this)->m_convertedToWChar.Extend(lenWC) )
-            return NULL;
-    }
-
-    // finally do convert
-    m_convertedToWChar.m_str[lenWC] = L'\0';
-    if ( conv.ToWChar(m_convertedToWChar.m_str, lenWC,
-                      strMB, lenMB) == wxCONV_FAILED )
-        return NULL;
-
-    return m_convertedToWChar.m_str;
-}
-
-#endif // !wxUSE_UNICODE_WCHAR
-
-
-// Same thing for mb_str() which returns a normal char pointer to string
-// contents: this always requires converting it to the specified encoding in
-// non-ANSI build except if we need to convert to UTF-8 and this is what we
-// already use internally.
-#if wxUSE_UNICODE
-
-const char *wxString::AsChar(const wxMBConv& conv) const
-{
-#if wxUSE_UNICODE_UTF8
-    if ( conv.IsUTF8() )
-        return m_impl.c_str();
-
-    const wchar_t * const strWC = AsWChar(wxMBConvStrictUTF8());
-    const size_t lenWC = m_convertedToWChar.m_len;
-#else // wxUSE_UNICODE_WCHAR
-    const wchar_t * const strWC = m_impl.c_str();
-    const size_t lenWC = m_impl.length();
-#endif // wxUSE_UNICODE_UTF8/wxUSE_UNICODE_WCHAR
-
-    const size_t lenMB = conv.FromWChar(NULL, 0, strWC, lenWC);
-    if ( lenMB == wxCONV_FAILED )
-        return NULL;
-
-    if ( !m_convertedToChar.m_str || lenMB != m_convertedToChar.m_len )
-    {
-        if ( !const_cast<wxString *>(this)->m_convertedToChar.Extend(lenMB) )
-            return NULL;
-    }
-
-    m_convertedToChar.m_str[lenMB] = '\0';
-    if ( conv.FromWChar(m_convertedToChar.m_str, lenMB,
-                        strWC, lenWC) == wxCONV_FAILED )
-        return NULL;
-
-    return m_convertedToChar.m_str;
-}
-
-#endif // wxUSE_UNICODE
-
-// shrink to minimal size (releasing extra memory)
-bool wxString::Shrink()
-{
-  wxString tmp(begin(), end());
-  swap(tmp);
-  return tmp.length() == length();
-}
-
-// deprecated compatibility code:
-#if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-wxStringCharType *wxString::GetWriteBuf(size_t nLen)
-{
-    return DoGetWriteBuf(nLen);
-}
-
-void wxString::UngetWriteBuf()
-{
-    DoUngetWriteBuf();
-}
-
-void wxString::UngetWriteBuf(size_t nLen)
-{
-    DoUngetWriteBuf(nLen);
-}
-#endif // WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
-
-
-// ---------------------------------------------------------------------------
-// data access
-// ---------------------------------------------------------------------------
-
-// all functions are inline in string.h
-
-// ---------------------------------------------------------------------------
-// concatenation operators
-// ---------------------------------------------------------------------------
-
-/*
- * concatenation functions come in 5 flavours:
- *  string + string
- *  char   + string      and      string + char
- *  C str  + string      and      string + C str
- */
-
-wxString operator+(const wxString& str1, const wxString& str2)
-{
-#if !wxUSE_STL_BASED_WXSTRING
-    wxASSERT( str1.IsValid() );
-    wxASSERT( str2.IsValid() );
-#endif
-
-    wxString s = str1;
-    s += str2;
-
-    return s;
-}
-
-wxString operator+(const wxString& str, wxUniChar ch)
-{
-#if !wxUSE_STL_BASED_WXSTRING
-    wxASSERT( str.IsValid() );
-#endif
-
-    wxString s = str;
-    s += ch;
-
-    return s;
-}
-
-wxString operator+(wxUniChar ch, const wxString& str)
-{
-#if !wxUSE_STL_BASED_WXSTRING
-    wxASSERT( str.IsValid() );
-#endif
-
-    wxString s = ch;
-    s += str;
-
-    return s;
-}
-
-wxString operator+(const wxString& str, const char *psz)
-{
-#if !wxUSE_STL_BASED_WXSTRING
-    wxASSERT( str.IsValid() );
-#endif
-
-    wxString s;
-    if ( !s.Alloc(strlen(psz) + str.length()) ) {
-        wxFAIL_MSG( wxT("out of memory in wxString::operator+") );
-    }
-    s += str;
-    s += psz;
-
-    return s;
-}
-
-wxString operator+(const wxString& str, const wchar_t *pwz)
-{
-#if !wxUSE_STL_BASED_WXSTRING
-    wxASSERT( str.IsValid() );
-#endif
-
-    wxString s;
-    if ( !s.Alloc(wxWcslen(pwz) + str.length()) ) {
-        wxFAIL_MSG( wxT("out of memory in wxString::operator+") );
-    }
-    s += str;
-    s += pwz;
-
-    return s;
-}
-
-wxString operator+(const char *psz, const wxString& str)
-{
-#if !wxUSE_STL_BASED_WXSTRING
-    wxASSERT( str.IsValid() );
-#endif
-
-    wxString s;
-    if ( !s.Alloc(strlen(psz) + str.length()) ) {
-        wxFAIL_MSG( wxT("out of memory in wxString::operator+") );
-    }
-    s = psz;
-    s += str;
-
-    return s;
-}
-
-wxString operator+(const wchar_t *pwz, const wxString& str)
-{
-#if !wxUSE_STL_BASED_WXSTRING
-    wxASSERT( str.IsValid() );
-#endif
-
-    wxString s;
-    if ( !s.Alloc(wxWcslen(pwz) + str.length()) ) {
-        wxFAIL_MSG( wxT("out of memory in wxString::operator+") );
-    }
-    s = pwz;
-    s += str;
-
-    return s;
-}
-
-// ---------------------------------------------------------------------------
-// string comparison
-// ---------------------------------------------------------------------------
-
-bool wxString::IsSameAs(wxUniChar c, bool compareWithCase) const
-{
-    return (length() == 1) && (compareWithCase ? GetChar(0u) == c
-                               : wxToupper(GetChar(0u)) == wxToupper(c));
-}
-
-#ifdef HAVE_STD_STRING_COMPARE
-
-// NB: Comparison code (both if HAVE_STD_STRING_COMPARE and if not) works with
-//     UTF-8 encoded strings too, thanks to UTF-8's design which allows us to
-//     sort strings in characters code point order by sorting the byte sequence
-//     in byte values order (i.e. what strcmp() and memcmp() do).
-
-int wxString::compare(const wxString& str) const
-{
-    return m_impl.compare(str.m_impl);
-}
-
-int wxString::compare(size_t nStart, size_t nLen,
-                      const wxString& str) const
-{
-    size_t pos, len;
-    PosLenToImpl(nStart, nLen, &pos, &len);
-    return m_impl.compare(pos, len, str.m_impl);
-}
-
-int wxString::compare(size_t nStart, size_t nLen,
-                      const wxString& str,
-                      size_t nStart2, size_t nLen2) const
-{
-    size_t pos, len;
-    PosLenToImpl(nStart, nLen, &pos, &len);
-
-    size_t pos2, len2;
-    str.PosLenToImpl(nStart2, nLen2, &pos2, &len2);
-
-    return m_impl.compare(pos, len, str.m_impl, pos2, len2);
-}
-
-int wxString::compare(const char* sz) const
-{
-    return m_impl.compare(ImplStr(sz));
-}
-
-int wxString::compare(const wchar_t* sz) const
-{
-    return m_impl.compare(ImplStr(sz));
-}
-
-int wxString::compare(size_t nStart, size_t nLen,
-                      const char* sz, size_t nCount) const
-{
-    size_t pos, len;
-    PosLenToImpl(nStart, nLen, &pos, &len);
-
-    SubstrBufFromMB str(ImplStr(sz, nCount));
-
-    return m_impl.compare(pos, len, str.data, str.len);
-}
-
-int wxString::compare(size_t nStart, size_t nLen,
-                      const wchar_t* sz, size_t nCount) const
-{
-    size_t pos, len;
-    PosLenToImpl(nStart, nLen, &pos, &len);
-
-    SubstrBufFromWC str(ImplStr(sz, nCount));
-
-    return m_impl.compare(pos, len, str.data, str.len);
-}
-
-#else // !HAVE_STD_STRING_COMPARE
-
-static inline int wxDoCmp(const wxStringCharType* s1, size_t l1,
-                          const wxStringCharType* s2, size_t l2)
-{
-    if( l1 == l2 )
-        return wxStringMemcmp(s1, s2, l1);
-    else if( l1 < l2 )
-    {
-        int ret = wxStringMemcmp(s1, s2, l1);
-        return ret == 0 ? -1 : ret;
-    }
-    else
-    {
-        int ret = wxStringMemcmp(s1, s2, l2);
-        return ret == 0 ? +1 : ret;
-    }
-}
-
-int wxString::compare(const wxString& str) const
-{
-    return ::wxDoCmp(m_impl.data(), m_impl.length(),
-                     str.m_impl.data(), str.m_impl.length());
-}
-
-int wxString::compare(size_t nStart, size_t nLen,
-                      const wxString& str) const
-{
-    wxASSERT(nStart <= length());
-    size_type strLen = length() - nStart;
-    nLen = strLen < nLen ? strLen : nLen;
-
-    size_t pos, len;
-    PosLenToImpl(nStart, nLen, &pos, &len);
-
-    return ::wxDoCmp(m_impl.data() + pos,  len,
-                     str.m_impl.data(), str.m_impl.length());
-}
-
-int wxString::compare(size_t nStart, size_t nLen,
-                      const wxString& str,
-                      size_t nStart2, size_t nLen2) const
-{
-    wxASSERT(nStart <= length());
-    wxASSERT(nStart2 <= str.length());
-    size_type strLen  =     length() - nStart,
-              strLen2 = str.length() - nStart2;
-    nLen  = strLen  < nLen  ? strLen  : nLen;
-    nLen2 = strLen2 < nLen2 ? strLen2 : nLen2;
-
-    size_t pos, len;
-    PosLenToImpl(nStart, nLen, &pos, &len);
-    size_t pos2, len2;
-    str.PosLenToImpl(nStart2, nLen2, &pos2, &len2);
-
-    return ::wxDoCmp(m_impl.data() + pos, len,
-                     str.m_impl.data() + pos2, len2);
-}
-
-int wxString::compare(const char* sz) const
-{
-    SubstrBufFromMB str(ImplStr(sz, npos));
-    if ( str.len == npos )
-        str.len = wxStringStrlen(str.data);
-    return ::wxDoCmp(m_impl.data(), m_impl.length(), str.data, str.len);
-}
-
-int wxString::compare(const wchar_t* sz) const
-{
-    SubstrBufFromWC str(ImplStr(sz, npos));
-    if ( str.len == npos )
-        str.len = wxStringStrlen(str.data);
-    return ::wxDoCmp(m_impl.data(), m_impl.length(), str.data, str.len);
-}
-
-int wxString::compare(size_t nStart, size_t nLen,
-                      const char* sz, size_t nCount) const
-{
-    wxASSERT(nStart <= length());
-    size_type strLen = length() - nStart;
-    nLen = strLen < nLen ? strLen : nLen;
-
-    size_t pos, len;
-    PosLenToImpl(nStart, nLen, &pos, &len);
-
-    SubstrBufFromMB str(ImplStr(sz, nCount));
-    if ( str.len == npos )
-        str.len = wxStringStrlen(str.data);
-
-    return ::wxDoCmp(m_impl.data() + pos, len, str.data, str.len);
-}
-
-int wxString::compare(size_t nStart, size_t nLen,
-                      const wchar_t* sz, size_t nCount) const
-{
-    wxASSERT(nStart <= length());
-    size_type strLen = length() - nStart;
-    nLen = strLen < nLen ? strLen : nLen;
-
-    size_t pos, len;
-    PosLenToImpl(nStart, nLen, &pos, &len);
-
-    SubstrBufFromWC str(ImplStr(sz, nCount));
-    if ( str.len == npos )
-        str.len = wxStringStrlen(str.data);
-
-    return ::wxDoCmp(m_impl.data() + pos, len, str.data, str.len);
-}
-
-#endif // HAVE_STD_STRING_COMPARE/!HAVE_STD_STRING_COMPARE
-
-
-// ---------------------------------------------------------------------------
-// find_{first,last}_[not]_of functions
-// ---------------------------------------------------------------------------
-
-#if !wxUSE_STL_BASED_WXSTRING || wxUSE_UNICODE_UTF8
-
-// NB: All these functions are implemented  with the argument being wxChar*,
-//     i.e. widechar string in any Unicode build, even though native string
-//     representation is char* in the UTF-8 build. This is because we couldn't
-//     use memchr() to determine if a character is in a set encoded as UTF-8.
-
-size_t wxString::find_first_of(const wxChar* sz, size_t nStart) const
-{
-    return find_first_of(sz, nStart, wxStrlen(sz));
-}
-
-size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart) const
-{
-    return find_first_not_of(sz, nStart, wxStrlen(sz));
-}
-
-size_t wxString::find_first_of(const wxChar* sz, size_t nStart, size_t n) const
-{
-    wxASSERT_MSG( nStart <= length(),  wxT("invalid index") );
-
-    size_t idx = nStart;
-    for ( const_iterator i = begin() + nStart; i != end(); ++idx, ++i )
-    {
-        if ( wxTmemchr(sz, *i, n) )
-            return idx;
-    }
-
-    return npos;
-}
-
-size_t wxString::find_first_not_of(const wxChar* sz, size_t nStart, size_t n) const
-{
-    wxASSERT_MSG( nStart <= length(),  wxT("invalid index") );
-
-    size_t idx = nStart;
-    for ( const_iterator i = begin() + nStart; i != end(); ++idx, ++i )
-    {
-        if ( !wxTmemchr(sz, *i, n) )
-            return idx;
-    }
-
-    return npos;
-}
-
-
-size_t wxString::find_last_of(const wxChar* sz, size_t nStart) const
-{
-    return find_last_of(sz, nStart, wxStrlen(sz));
-}
-
-size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart) const
-{
-    return find_last_not_of(sz, nStart, wxStrlen(sz));
-}
-
-size_t wxString::find_last_of(const wxChar* sz, size_t nStart, size_t n) const
-{
-    size_t len = length();
-
-    if ( nStart == npos )
-    {
-        nStart = len - 1;
-    }
-    else
-    {
-        wxASSERT_MSG( nStart <= len, wxT("invalid index") );
-    }
-
-    size_t idx = nStart;
-    for ( const_reverse_iterator i = rbegin() + (len - nStart - 1);
-          i != rend(); --idx, ++i )
-    {
-        if ( wxTmemchr(sz, *i, n) )
-            return idx;
-    }
-
-    return npos;
-}
-
-size_t wxString::find_last_not_of(const wxChar* sz, size_t nStart, size_t n) const
-{
-    size_t len = length();
-
-    if ( nStart == npos )
-    {
-        nStart = len - 1;
-    }
-    else
-    {
-        wxASSERT_MSG( nStart <= len, wxT("invalid index") );
-    }
-
-    size_t idx = nStart;
-    for ( const_reverse_iterator i = rbegin() + (len - nStart - 1);
-          i != rend(); --idx, ++i )
-    {
-        if ( !wxTmemchr(sz, *i, n) )
-            return idx;
-    }
-
-    return npos;
-}
-
-size_t wxString::find_first_not_of(wxUniChar ch, size_t nStart) const
-{
-    wxASSERT_MSG( nStart <= length(),  wxT("invalid index") );
-
-    size_t idx = nStart;
-    for ( const_iterator i = begin() + nStart; i != end(); ++idx, ++i )
-    {
-        if ( *i != ch )
-            return idx;
-    }
-
-    return npos;
-}
-
-size_t wxString::find_last_not_of(wxUniChar ch, size_t nStart) const
-{
-    size_t len = length();
-
-    if ( nStart == npos )
-    {
-        nStart = len - 1;
-    }
-    else
-    {
-        wxASSERT_MSG( nStart <= len, wxT("invalid index") );
-    }
-
-    size_t idx = nStart;
-    for ( const_reverse_iterator i = rbegin() + (len - nStart - 1);
-          i != rend(); --idx, ++i )
-    {
-        if ( *i != ch )
-            return idx;
-    }
-
-    return npos;
-}
-
-// the functions above were implemented for wchar_t* arguments in Unicode
-// build and char* in ANSI build; below are implementations for the other
-// version:
-#if wxUSE_UNICODE
-    #define wxOtherCharType char
-    #define STRCONV         (const wxChar*)wxConvLibc.cMB2WC
-#else
-    #define wxOtherCharType wchar_t
-    #define STRCONV         (const wxChar*)wxConvLibc.cWC2MB
-#endif
-
-size_t wxString::find_first_of(const wxOtherCharType* sz, size_t nStart) const
-    { return find_first_of(STRCONV(sz), nStart); }
-
-size_t wxString::find_first_of(const wxOtherCharType* sz, size_t nStart,
-                               size_t n) const
-    { return find_first_of(STRCONV(sz, n, NULL), nStart, n); }
-size_t wxString::find_last_of(const wxOtherCharType* sz, size_t nStart) const
-    { return find_last_of(STRCONV(sz), nStart); }
-size_t wxString::find_last_of(const wxOtherCharType* sz, size_t nStart,
-                              size_t n) const
-    { return find_last_of(STRCONV(sz, n, NULL), nStart, n); }
-size_t wxString::find_first_not_of(const wxOtherCharType* sz, size_t nStart) const
-    { return find_first_not_of(STRCONV(sz), nStart); }
-size_t wxString::find_first_not_of(const wxOtherCharType* sz, size_t nStart,
-                                   size_t n) const
-    { return find_first_not_of(STRCONV(sz, n, NULL), nStart, n); }
-size_t wxString::find_last_not_of(const wxOtherCharType* sz, size_t nStart) const
-    { return find_last_not_of(STRCONV(sz), nStart); }
-size_t wxString::find_last_not_of(const wxOtherCharType* sz, size_t nStart,
-                                  size_t n) const
-    { return find_last_not_of(STRCONV(sz, n, NULL), nStart, n); }
-
-#undef wxOtherCharType
-#undef STRCONV
-
-#endif // !wxUSE_STL_BASED_WXSTRING || wxUSE_UNICODE_UTF8
-
-// ===========================================================================
-// other common string functions
-// ===========================================================================
-
-int wxString::CmpNoCase(const wxString& s) const
-{
-#if !wxUSE_UNICODE_UTF8
-    // We compare NUL-delimited chunks of the strings inside the loop. We will
-    // do as many iterations as there are embedded NULs in the string, i.e.
-    // usually we will run it just once.
-
-    typedef const wxStringImpl::value_type *pchar_type;
-    const pchar_type thisBegin = m_impl.c_str();
-    const pchar_type thatBegin = s.m_impl.c_str();
-
-    const pchar_type thisEnd = thisBegin + m_impl.length();
-    const pchar_type thatEnd = thatBegin + s.m_impl.length();
-
-    pchar_type thisCur = thisBegin;
-    pchar_type thatCur = thatBegin;
-
-    int rc;
-    for ( ;; )
-    {
-        // Compare until the next NUL, if the strings differ this is the final
-        // result.
-        rc = wxStricmp(thisCur, thatCur);
-        if ( rc )
-            break;
-
-        const size_t lenChunk = wxStrlen(thisCur);
-        thisCur += lenChunk;
-        thatCur += lenChunk;
-
-        // Skip all the NULs as wxStricmp() doesn't handle them.
-        for ( ; !*thisCur; thisCur++, thatCur++ )
-        {
-            // Check if we exhausted either of the strings.
-            if ( thisCur == thisEnd )
-            {
-                // This one is exhausted, is the other one too?
-                return thatCur == thatEnd ? 0 : -1;
-            }
-
-            if ( thatCur == thatEnd )
-            {
-                // Because of the test above we know that this one is not
-                // exhausted yet so it's greater than the other one that is.
-                return 1;
-            }
-
-            if ( *thatCur )
-            {
-                // Anything non-NUL is greater than NUL.
-                return -1;
-            }
-        }
-    }
-
-    return rc;
-#else // wxUSE_UNICODE_UTF8
-    // CRT functions can't be used for case-insensitive comparison of UTF-8
-    // strings so do it in the naive, simple and inefficient way.
-
-    // FIXME-UTF8: use wxUniChar::ToLower/ToUpper once added
-    const_iterator i1 = begin();
-    const_iterator end1 = end();
-    const_iterator i2 = s.begin();
-    const_iterator end2 = s.end();
-
-    for ( ; i1 != end1 && i2 != end2; ++i1, ++i2 )
-    {
-        wxUniChar lower1 = (wxChar)wxTolower(*i1);
-        wxUniChar lower2 = (wxChar)wxTolower(*i2);
-        if ( lower1 != lower2 )
-            return lower1 < lower2 ? -1 : 1;
-    }
-
-    size_t len1 = length();
-    size_t len2 = s.length();
-
-    if ( len1 < len2 )
-        return -1;
-    else if ( len1 > len2 )
-        return 1;
-    return 0;
-#endif // !wxUSE_UNICODE_UTF8/wxUSE_UNICODE_UTF8
-}
-
-
-#if wxUSE_UNICODE
-
-wxString wxString::FromAscii(const char *ascii, size_t len)
-{
-    if (!ascii || len == 0)
-       return wxEmptyString;
-
-    wxString res;
-
-    {
-        wxStringInternalBuffer buf(res, len);
-        wxStringCharType *dest = buf;
-
-        for ( ; len > 0; --len )
-        {
-            unsigned char c = (unsigned char)*ascii++;
-            wxASSERT_MSG( c < 0x80,
-                          wxT("Non-ASCII value passed to FromAscii().") );
-
-            *dest++ = (wchar_t)c;
-        }
-    }
-
-    return res;
-}
-
-wxString wxString::FromAscii(const char *ascii)
-{
-    return FromAscii(ascii, wxStrlen(ascii));
-}
-
-wxString wxString::FromAscii(char ascii)
-{
-    // What do we do with '\0' ?
-
-    unsigned char c = (unsigned char)ascii;
-
-    wxASSERT_MSG( c < 0x80, wxT("Non-ASCII value passed to FromAscii().") );
-
-    // NB: the cast to wchar_t causes interpretation of 'ascii' as Latin1 value
-    return wxString(wxUniChar((wchar_t)c));
-}
-
-const wxScopedCharBuffer wxString::ToAscii() const
-{
-    // this will allocate enough space for the terminating NUL too
-    wxCharBuffer buffer(length());
-    char *dest = buffer.data();
-
-    for ( const_iterator i = begin(); i != end(); ++i )
-    {
-        wxUniChar c(*i);
-        // FIXME-UTF8: unify substituted char ('_') with wxUniChar ('?')
-        *dest++ = c.IsAscii() ? (char)c : '_';
-
-        // the output string can't have embedded NULs anyhow, so we can safely
-        // stop at first of them even if we do have any
-        if ( !c )
-            break;
-    }
-
-    return buffer;
-}
-
-#endif // wxUSE_UNICODE
-
-// extract string of length nCount starting at nFirst
-wxString wxString::Mid(size_t nFirst, size_t nCount) const
-{
-    size_t nLen = length();
-
-    // default value of nCount is npos and means "till the end"
-    if ( nCount == npos )
-    {
-        nCount = nLen - nFirst;
-    }
-
-    // out-of-bounds requests return sensible things
-    if ( nFirst + nCount > nLen )
-    {
-        nCount = nLen - nFirst;
-    }
-
-    if ( nFirst > nLen )
-    {
-        // AllocCopy() will return empty string
-        return wxEmptyString;
-    }
-
-    wxString dest(*this, nFirst, nCount);
-    if ( dest.length() != nCount )
-    {
-        wxFAIL_MSG( wxT("out of memory in wxString::Mid") );
-    }
-
-    return dest;
-}
-
-// check that the string starts with prefix and return the rest of the string
-// in the provided pointer if it is not NULL, otherwise return false
-bool wxString::StartsWith(const wxString& prefix, wxString *rest) const
-{
-    if ( compare(0, prefix.length(), prefix) != 0 )
-        return false;
-
-    if ( rest )
-    {
-        // put the rest of the string into provided pointer
-        rest->assign(*this, prefix.length(), npos);
-    }
-
-    return true;
-}
-
-
-// check that the string ends with suffix and return the rest of it in the
-// provided pointer if it is not NULL, otherwise return false
-bool wxString::EndsWith(const wxString& suffix, wxString *rest) const
-{
-    int start = length() - suffix.length();
-
-    if ( start < 0 || compare(start, npos, suffix) != 0 )
-        return false;
-
-    if ( rest )
-    {
-        // put the rest of the string into provided pointer
-        rest->assign(*this, 0, start);
-    }
-
-    return true;
-}
-
-
-// extract nCount last (rightmost) characters
-wxString wxString::Right(size_t nCount) const
-{
-  if ( nCount > length() )
-    nCount = length();
-
-  wxString dest(*this, length() - nCount, nCount);
-  if ( dest.length() != nCount ) {
-    wxFAIL_MSG( wxT("out of memory in wxString::Right") );
-  }
-  return dest;
-}
-
-// get all characters after the last occurrence of ch
-// (returns the whole string if ch not found)
-wxString wxString::AfterLast(wxUniChar ch) const
-{
-  wxString str;
-  int iPos = Find(ch, true);
-  if ( iPos == wxNOT_FOUND )
-    str = *this;
-  else
-    str.assign(*this, iPos + 1, npos);
-
-  return str;
-}
-
-// extract nCount first (leftmost) characters
-wxString wxString::Left(size_t nCount) const
-{
-  if ( nCount > length() )
-    nCount = length();
-
-  wxString dest(*this, 0, nCount);
-  if ( dest.length() != nCount ) {
-    wxFAIL_MSG( wxT("out of memory in wxString::Left") );
-  }
-  return dest;
-}
-
-// get all characters before the first occurrence of ch
-// (returns the whole string if ch not found)
-wxString wxString::BeforeFirst(wxUniChar ch, wxString *rest) const
-{
-  int iPos = Find(ch);
-  if ( iPos == wxNOT_FOUND )
-  {
-    iPos = length();
-    if ( rest )
-      rest->clear();
-  }
-  else
-  {
-    if ( rest )
-      rest->assign(*this, iPos + 1, npos);
-  }
-
-  return wxString(*this, 0, iPos);
-}
-
-/// get all characters before the last occurrence of ch
-/// (returns empty string if ch not found)
-wxString wxString::BeforeLast(wxUniChar ch, wxString *rest) const
-{
-  wxString str;
-  int iPos = Find(ch, true);
-  if ( iPos != wxNOT_FOUND )
-  {
-    if ( iPos != 0 )
-      str.assign(*this, 0, iPos);
-
-    if ( rest )
-      rest->assign(*this, iPos + 1, npos);
-  }
-  else
-  {
-    if ( rest )
-      *rest = *this;
-  }
-
-  return str;
-}
-
-/// get all characters after the first occurrence of ch
-/// (returns empty string if ch not found)
-wxString wxString::AfterFirst(wxUniChar ch) const
-{
-  wxString str;
-  int iPos = Find(ch);
-  if ( iPos != wxNOT_FOUND )
-      str.assign(*this, iPos + 1, npos);
-
-  return str;
-}
-
-// replace first (or all) occurrences of some substring with another one
-size_t wxString::Replace(const wxString& strOld,
-                         const wxString& strNew, bool bReplaceAll)
-{
-    // if we tried to replace an empty string we'd enter an infinite loop below
-    wxCHECK_MSG( !strOld.empty(), 0,
-                 wxT("wxString::Replace(): invalid parameter") );
-
-    wxSTRING_INVALIDATE_CACHE();
-
-    size_t uiCount = 0;   // count of replacements made
-
-    // optimize the special common case: replacement of one character by
-    // another one (in UTF-8 case we can only do this for ASCII characters)
-    //
-    // benchmarks show that this special version is around 3 times faster
-    // (depending on the proportion of matching characters and UTF-8/wchar_t
-    // build)
-    if ( strOld.m_impl.length() == 1 && strNew.m_impl.length() == 1 )
-    {
-        const wxStringCharType chOld = strOld.m_impl[0],
-                               chNew = strNew.m_impl[0];
-
-        // this loop is the simplified version of the one below
-        for ( size_t pos = 0; ; )
-        {
-            pos = m_impl.find(chOld, pos);
-            if ( pos == npos )
-                break;
-
-            m_impl[pos++] = chNew;
-
-            uiCount++;
-
-            if ( !bReplaceAll )
-                break;
-        }
-    }
-    else if ( !bReplaceAll)
-    {
-        size_t pos = m_impl.find(strOld.m_impl, 0);
-        if ( pos != npos )
-        {
-            m_impl.replace(pos, strOld.m_impl.length(), strNew.m_impl);
-            uiCount = 1;
-        }
-    }
-    else // replace all occurrences
-    {
-        const size_t uiOldLen = strOld.m_impl.length();
-        const size_t uiNewLen = strNew.m_impl.length();
-
-        // first scan the string to find all positions at which the replacement
-        // should be made
-        wxVector<size_t> replacePositions;
-
-        size_t pos;
-        for ( pos = m_impl.find(strOld.m_impl, 0);
-              pos != npos;
-              pos = m_impl.find(strOld.m_impl, pos + uiOldLen))
-        {
-            replacePositions.push_back(pos);
-            ++uiCount;
-        }
-
-        if ( !uiCount )
-            return 0;
-
-        // allocate enough memory for the whole new string
-        wxString tmp;
-        tmp.m_impl.reserve(m_impl.length() + uiCount*(uiNewLen - uiOldLen));
-
-        // copy this string to tmp doing replacements on the fly
-        size_t replNum = 0;
-        for ( pos = 0; replNum < uiCount; replNum++ )
-        {
-            const size_t nextReplPos = replacePositions[replNum];
-
-            if ( pos != nextReplPos )
-            {
-                tmp.m_impl.append(m_impl, pos, nextReplPos - pos);
-            }
-
-            tmp.m_impl.append(strNew.m_impl);
-            pos = nextReplPos + uiOldLen;
-        }
-
-        if ( pos != m_impl.length() )
-        {
-            // append the rest of the string unchanged
-            tmp.m_impl.append(m_impl, pos, m_impl.length() - pos);
-        }
-
-        swap(tmp);
-    }
-
-    return uiCount;
-}
-
-bool wxString::IsAscii() const
-{
-    for ( const_iterator i = begin(); i != end(); ++i )
-    {
-        if ( !(*i).IsAscii() )
-            return false;
-    }
-
-    return true;
-}
-
-bool wxString::IsWord() const
-{
-    for ( const_iterator i = begin(); i != end(); ++i )
-    {
-        if ( !wxIsalpha(*i) )
-            return false;
-    }
-
-    return true;
-}
-
-bool wxString::IsNumber() const
-{
-    if ( empty() )
-        return true;
-
-    const_iterator i = begin();
-
-    if ( *i == wxT('-') || *i == wxT('+') )
-        ++i;
-
-    for ( ; i != end(); ++i )
-    {
-        if ( !wxIsdigit(*i) )
-            return false;
-    }
-
-    return true;
-}
-
-wxString wxString::Strip(stripType w) const
-{
-    wxString s = *this;
-    if ( w & leading ) s.Trim(false);
-    if ( w & trailing ) s.Trim(true);
-    return s;
-}
-
-// ---------------------------------------------------------------------------
-// case conversion
-// ---------------------------------------------------------------------------
-
-wxString& wxString::MakeUpper()
-{
-  for ( iterator it = begin(), en = end(); it != en; ++it )
-    *it = (wxChar)wxToupper(*it);
-
-  return *this;
-}
-
-wxString& wxString::MakeLower()
-{
-  for ( iterator it = begin(), en = end(); it != en; ++it )
-    *it = (wxChar)wxTolower(*it);
-
-  return *this;
-}
-
-wxString& wxString::MakeCapitalized()
-{
-    const iterator en = end();
-    iterator it = begin();
-    if ( it != en )
-    {
-        *it = (wxChar)wxToupper(*it);
-        for ( ++it; it != en; ++it )
-            *it = (wxChar)wxTolower(*it);
-    }
-
-    return *this;
-}
-
-// ---------------------------------------------------------------------------
-// trimming and padding
-// ---------------------------------------------------------------------------
-
-// some compilers (VC++ 6.0 not to name them) return true for a call to
-// isspace('\xEA') in the C locale which seems to be broken to me, but we have
-// to live with this by checking that the character is a 7 bit one - even if
-// this may fail to detect some spaces (I don't know if Unicode doesn't have
-// space-like symbols somewhere except in the first 128 chars), it is arguably
-// still better than trimming away accented letters
-inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
-
-// trims spaces (in the sense of isspace) from left or right side
-wxString& wxString::Trim(bool bFromRight)
-{
-    // first check if we're going to modify the string at all
-    if ( !empty() &&
-         (
-          (bFromRight && wxSafeIsspace(GetChar(length() - 1))) ||
-          (!bFromRight && wxSafeIsspace(GetChar(0u)))
-         )
-       )
-    {
-        if ( bFromRight )
-        {
-            // find last non-space character
-            reverse_iterator psz = rbegin();
-            while ( (psz != rend()) && wxSafeIsspace(*psz) )
-                ++psz;
-
-            // truncate at trailing space start
-            erase(psz.base(), end());
-        }
-        else
-        {
-            // find first non-space character
-            iterator psz = begin();
-            while ( (psz != end()) && wxSafeIsspace(*psz) )
-                ++psz;
-
-            // fix up data and length
-            erase(begin(), psz);
-        }
-    }
-
-    return *this;
-}
-
-// adds nCount characters chPad to the string from either side
-wxString& wxString::Pad(size_t nCount, wxUniChar chPad, bool bFromRight)
-{
-    wxString s(chPad, nCount);
-
-    if ( bFromRight )
-        *this += s;
-    else
-    {
-        s += *this;
-        swap(s);
-    }
-
-    return *this;
-}
-
-// truncate the string
-wxString& wxString::Truncate(size_t uiLen)
-{
-    if ( uiLen < length() )
-    {
-        erase(begin() + uiLen, end());
-    }
-    //else: nothing to do, string is already short enough
-
-    return *this;
-}
-
-// ---------------------------------------------------------------------------
-// finding (return wxNOT_FOUND if not found and index otherwise)
-// ---------------------------------------------------------------------------
-
-// find a character
-int wxString::Find(wxUniChar ch, bool bFromEnd) const
-{
-    size_type idx = bFromEnd ? find_last_of(ch) : find_first_of(ch);
-
-    return (idx == npos) ? wxNOT_FOUND : (int)idx;
-}
-
-// ----------------------------------------------------------------------------
-// conversion to numbers
-// ----------------------------------------------------------------------------
-
-// The implementation of all the functions below is exactly the same so factor
-// it out. Note that number extraction works correctly on UTF-8 strings, so
-// we can use wxStringCharType and wx_str() for maximum efficiency.
-
-#ifndef __WXWINCE__
-    #define DO_IF_NOT_WINCE(x) x
-#else
-    #define DO_IF_NOT_WINCE(x)
-#endif
-
-#define WX_STRING_TO_X_TYPE_START                                           \
-    wxCHECK_MSG( pVal, false, wxT("NULL output pointer") );                  \
-    DO_IF_NOT_WINCE( errno = 0; )                                           \
-    const wxStringCharType *start = wx_str();                               \
-    wxStringCharType *end;
-
-// notice that we return false without modifying the output parameter at all if
-// nothing could be parsed but we do modify it and return false then if we did
-// parse something successfully but not the entire string
-#define WX_STRING_TO_X_TYPE_END                                             \
-    if ( end == start DO_IF_NOT_WINCE(|| errno == ERANGE) )                 \
-        return false;                                                       \
-    *pVal = val;                                                            \
-    return !*end;
-
-bool wxString::ToLong(long *pVal, int base) const
-{
-    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
-
-    WX_STRING_TO_X_TYPE_START
-    long val = wxStrtol(start, &end, base);
-    WX_STRING_TO_X_TYPE_END
-}
-
-bool wxString::ToULong(unsigned long *pVal, int base) const
-{
-    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
-
-    WX_STRING_TO_X_TYPE_START
-    unsigned long val = wxStrtoul(start, &end, base);
-    WX_STRING_TO_X_TYPE_END
-}
-
-bool wxString::ToLongLong(wxLongLong_t *pVal, int base) const
-{
-    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
-
-    WX_STRING_TO_X_TYPE_START
-    wxLongLong_t val = wxStrtoll(start, &end, base);
-    WX_STRING_TO_X_TYPE_END
-}
-
-bool wxString::ToULongLong(wxULongLong_t *pVal, int base) const
-{
-    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
-
-    WX_STRING_TO_X_TYPE_START
-    wxULongLong_t val = wxStrtoull(start, &end, base);
-    WX_STRING_TO_X_TYPE_END
-}
-
-bool wxString::ToDouble(double *pVal) const
-{
-    WX_STRING_TO_X_TYPE_START
-    double val = wxStrtod(start, &end);
-    WX_STRING_TO_X_TYPE_END
-}
-
-#if wxUSE_XLOCALE
-
-bool wxString::ToCLong(long *pVal, int base) const
-{
-    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
-
-    WX_STRING_TO_X_TYPE_START
-#if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT)
-    long val = wxStrtol_lA(start, &end, base, wxCLocale);
-#else
-    long val = wxStrtol_l(start, &end, base, wxCLocale);
-#endif
-    WX_STRING_TO_X_TYPE_END
-}
-
-bool wxString::ToCULong(unsigned long *pVal, int base) const
-{
-    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
-
-    WX_STRING_TO_X_TYPE_START
-#if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT)
-    unsigned long val = wxStrtoul_lA(start, &end, base, wxCLocale);
-#else
-    unsigned long val = wxStrtoul_l(start, &end, base, wxCLocale);
-#endif
-    WX_STRING_TO_X_TYPE_END
-}
-
-bool wxString::ToCDouble(double *pVal) const
-{
-    WX_STRING_TO_X_TYPE_START
-#if (wxUSE_UNICODE_UTF8 || !wxUSE_UNICODE) && defined(wxHAS_XLOCALE_SUPPORT)
-    double val = wxStrtod_lA(start, &end, wxCLocale);
-#else
-    double val = wxStrtod_l(start, &end, wxCLocale);
-#endif
-    WX_STRING_TO_X_TYPE_END
-}
-
-#else // wxUSE_XLOCALE
-
-// Provide implementation of these functions even when wxUSE_XLOCALE is
-// disabled, we still need them in wxWidgets internal code.
-
-// For integers we just assume the current locale uses the same number
-// representation as the C one as there is nothing else we can do.
-bool wxString::ToCLong(long *pVal, int base) const
-{
-    return ToLong(pVal, base);
-}
-
-bool wxString::ToCULong(unsigned long *pVal, int base) const
-{
-    return ToULong(pVal, base);
-}
-
-// For floating point numbers we have to handle the problem of the decimal
-// point which is different in different locales.
-bool wxString::ToCDouble(double *pVal) const
-{
-    // Create a copy of this string using the decimal point instead of whatever
-    // separator the current locale uses.
-#if wxUSE_INTL
-    wxString sep = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
-                                     wxLOCALE_CAT_NUMBER);
-    if ( sep == "." )
-    {
-        // We can avoid an unnecessary string copy in this case.
-        return ToDouble(pVal);
-    }
-#else // !wxUSE_INTL
-    // We don't know what the current separator is so it might even be a point
-    // already, try to parse the string as a double:
-    if ( ToDouble(pVal) )
-    {
-        // It must have been the point, nothing else to do.
-        return true;
-    }
-
-    // Try to guess the separator, using the most common alternative value.
-    wxString sep(",");
-#endif // wxUSE_INTL/!wxUSE_INTL
-    wxString cstr(*this);
-    cstr.Replace(".", sep);
-
-    return cstr.ToDouble(pVal);
-}
-
-#endif  // wxUSE_XLOCALE/!wxUSE_XLOCALE
-
-// ----------------------------------------------------------------------------
-// number to string conversion
-// ----------------------------------------------------------------------------
-
-/* static */
-wxString wxString::FromDouble(double val, int precision)
-{
-    wxCHECK_MSG( precision >= -1, wxString(), "Invalid negative precision" );
-
-    wxString format;
-    if ( precision == -1 )
-    {
-        format = "%g";
-    }
-    else // Use fixed precision.
-    {
-        format.Printf("%%.%df", precision);
-    }
-
-    return wxString::Format(format, val);
-}
-
-/* static */
-wxString wxString::FromCDouble(double val, int precision)
-{
-    wxCHECK_MSG( precision >= -1, wxString(), "Invalid negative precision" );
-
-#if wxUSE_STD_IOSTREAM && wxUSE_STD_STRING
-    // We assume that we can use the ostream and not wstream for numbers.
-    wxSTD ostringstream os;
-    if ( precision != -1 )
-    {
-        os.precision(precision);
-        os.setf(std::ios::fixed, std::ios::floatfield);
-    }
-
-    os << val;
-    return os.str();
-#else // !wxUSE_STD_IOSTREAM
-    // Can't use iostream locale support, fall back to the manual method
-    // instead.
-    wxString s = FromDouble(val, precision);
-#if wxUSE_INTL
-    wxString sep = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
-                                     wxLOCALE_CAT_NUMBER);
-#else // !wxUSE_INTL
-    // As above, this is the most common alternative value. Notice that here it
-    // doesn't matter if we guess wrongly and the current separator is already
-    // ".": we'll just waste a call to Replace() in this case.
-    wxString sep(",");
-#endif // wxUSE_INTL/!wxUSE_INTL
-
-    s.Replace(sep, ".");
-    return s;
-#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
-}
-
-// ---------------------------------------------------------------------------
-// formatted output
-// ---------------------------------------------------------------------------
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-/* static */
-#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
-wxString wxStringPrintfMixinBase::DoFormatWchar(const wxChar *format, ...)
-#else
-wxString wxString::DoFormatWchar(const wxChar *format, ...)
-#endif
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    wxString s;
-    s.PrintfV(format, argptr);
-
-    va_end(argptr);
-
-    return s;
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-/* static */
-wxString wxString::DoFormatUtf8(const char *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    wxString s;
-    s.PrintfV(format, argptr);
-
-    va_end(argptr);
-
-    return s;
-}
-#endif // wxUSE_UNICODE_UTF8
-
-/* static */
-wxString wxString::FormatV(const wxString& format, va_list argptr)
-{
-    wxString s;
-    s.PrintfV(format, argptr);
-    return s;
-}
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
-int wxStringPrintfMixinBase::DoPrintfWchar(const wxChar *format, ...)
-#else
-int wxString::DoPrintfWchar(const wxChar *format, ...)
-#endif
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-#ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
-    // get a pointer to the wxString instance; we have to use dynamic_cast<>
-    // because it's the only cast that works safely for downcasting when
-    // multiple inheritance is used:
-    wxString *str = static_cast<wxString*>(this);
-#else
-    wxString *str = this;
-#endif
-
-    int iLen = str->PrintfV(format, argptr);
-
-    va_end(argptr);
-
-    return iLen;
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-int wxString::DoPrintfUtf8(const char *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int iLen = PrintfV(format, argptr);
-
-    va_end(argptr);
-
-    return iLen;
-}
-#endif // wxUSE_UNICODE_UTF8
-
-/*
-    Uses wxVsnprintf and places the result into the this string.
-
-    In ANSI build, wxVsnprintf is effectively vsnprintf but in Unicode build
-    it is vswprintf.  Due to a discrepancy between vsnprintf and vswprintf in
-    the ISO C99 (and thus SUSv3) standard the return value for the case of
-    an undersized buffer is inconsistent.  For conforming vsnprintf
-    implementations the function must return the number of characters that
-    would have been printed had the buffer been large enough.  For conforming
-    vswprintf implementations the function must return a negative number
-    and set errno.
-
-    What vswprintf sets errno to is undefined but Darwin seems to set it to
-    EOVERFLOW.  The only expected errno are EILSEQ and EINVAL.  Both of
-    those are defined in the standard and backed up by several conformance
-    statements.  Note that ENOMEM mentioned in the manual page does not
-    apply to swprintf, only wprintf and fwprintf.
-
-    Official manual page:
-    http://www.opengroup.org/onlinepubs/009695399/functions/swprintf.html
-
-    Some conformance statements (AIX, Solaris):
-    http://www.opengroup.org/csq/view.mhtml?RID=ibm%2FSD1%2F3
-    http://www.theopengroup.org/csq/view.mhtml?norationale=1&noreferences=1&RID=Fujitsu%2FSE2%2F10
-
-    Since EILSEQ and EINVAL are rather common but EOVERFLOW is not and since
-    EILSEQ and EINVAL are specifically defined to mean the error is other than
-    an undersized buffer and no other errno are defined we treat those two
-    as meaning hard errors and everything else gets the old behaviour which
-    is to keep looping and increasing buffer size until the function succeeds.
-
-    In practice it's impossible to determine before compilation which behaviour
-    may be used.  The vswprintf function may have vsnprintf-like behaviour or
-    vice-versa.  Behaviour detected on one release can theoretically change
-    with an updated release.  Not to mention that configure testing for it
-    would require the test to be run on the host system, not the build system
-    which makes cross compilation difficult. Therefore, we make no assumptions
-    about behaviour and try our best to handle every known case, including the
-    case where wxVsnprintf returns a negative number and fails to set errno.
-
-    There is yet one more non-standard implementation and that is our own.
-    Fortunately, that can be detected at compile-time.
-
-    On top of all that, ISO C99 explicitly defines snprintf to write a null
-    character to the last position of the specified buffer.  That would be at
-    at the given buffer size minus 1.  It is supposed to do this even if it
-    turns out that the buffer is sized too small.
-
-    Darwin (tested on 10.5) follows the C99 behaviour exactly.
-
-    Glibc 2.6 almost follows the C99 behaviour except vswprintf never sets
-    errno even when it fails.  However, it only seems to ever fail due
-    to an undersized buffer.
-*/
-#if wxUSE_UNICODE_UTF8
-template<typename BufferType>
-#else
-// we only need one version in non-UTF8 builds and at least two Windows
-// compilers have problems with this function template, so use just one
-// normal function here
-#endif
-static int DoStringPrintfV(wxString& str,
-                           const wxString& format, va_list argptr)
-{
-    int size = 1024;
-
-    for ( ;; )
-    {
-#if wxUSE_UNICODE_UTF8
-        BufferType tmp(str, size + 1);
-        typename BufferType::CharType *buf = tmp;
-#else
-        wxStringBuffer tmp(str, size + 1);
-        wxChar *buf = tmp;
-#endif
-
-        if ( !buf )
-        {
-            // out of memory
-            return -1;
-        }
-
-        // wxVsnprintf() may modify the original arg pointer, so pass it
-        // only a copy
-        va_list argptrcopy;
-        wxVaCopy(argptrcopy, argptr);
-
-#ifndef __WXWINCE__
-        // Set errno to 0 to make it determinate if wxVsnprintf fails to set it.
-        errno = 0;
-#endif
-        int len = wxVsnprintf(buf, size, format, argptrcopy);
-        va_end(argptrcopy);
-
-        // some implementations of vsnprintf() don't NUL terminate
-        // the string if there is not enough space for it so
-        // always do it manually
-        // FIXME: This really seems to be the wrong and would be an off-by-one
-        // bug except the code above allocates an extra character.
-        buf[size] = wxT('\0');
-
-        // vsnprintf() may return either -1 (traditional Unix behaviour) or the
-        // total number of characters which would have been written if the
-        // buffer were large enough (newer standards such as Unix98)
-        if ( len < 0 )
-        {
-            // NB: wxVsnprintf() may call either wxCRT_VsnprintfW or
-            //     wxCRT_VsnprintfA in UTF-8 build; wxUSE_WXVSNPRINTF
-            //     is true if *both* of them use our own implementation,
-            //     otherwise we can't be sure
-#if wxUSE_WXVSNPRINTF
-            // we know that our own implementation of wxVsnprintf() returns -1
-            // only for a format error - thus there's something wrong with
-            // the user's format string
-            buf[0] = '\0';
-            return -1;
-#else // possibly using system version
-            // assume it only returns error if there is not enough space, but
-            // as we don't know how much we need, double the current size of
-            // the buffer
-#ifndef __WXWINCE__
-            if( (errno == EILSEQ) || (errno == EINVAL) )
-            // If errno was set to one of the two well-known hard errors
-            // then fail immediately to avoid an infinite loop.
-                return -1;
-            else
-#endif // __WXWINCE__
-            // still not enough, as we don't know how much we need, double the
-            // current size of the buffer
-                size *= 2;
-#endif // wxUSE_WXVSNPRINTF/!wxUSE_WXVSNPRINTF
-        }
-        else if ( len >= size )
-        {
-#if wxUSE_WXVSNPRINTF
-            // we know that our own implementation of wxVsnprintf() returns
-            // size+1 when there's not enough space but that's not the size
-            // of the required buffer!
-            size *= 2;      // so we just double the current size of the buffer
-#else
-            // some vsnprintf() implementations NUL-terminate the buffer and
-            // some don't in len == size case, to be safe always add 1
-            // FIXME: I don't quite understand this comment.  The vsnprintf
-            // function is specifically defined to return the number of
-            // characters printed not including the null terminator.
-            // So OF COURSE you need to add 1 to get the right buffer size.
-            // The following line is definitely correct, no question.
-            size = len + 1;
-#endif
-        }
-        else // ok, there was enough space
-        {
-            break;
-        }
-    }
-
-    // we could have overshot
-    str.Shrink();
-
-    return str.length();
-}
-
-int wxString::PrintfV(const wxString& format, va_list argptr)
-{
-#if wxUSE_UNICODE_UTF8
-    #if wxUSE_STL_BASED_WXSTRING
-        typedef wxStringTypeBuffer<char> Utf8Buffer;
-    #else
-        typedef wxStringInternalBuffer Utf8Buffer;
-    #endif
-#endif
-
-#if wxUSE_UTF8_LOCALE_ONLY
-    return DoStringPrintfV<Utf8Buffer>(*this, format, argptr);
-#else
-    #if wxUSE_UNICODE_UTF8
-    if ( wxLocaleIsUtf8 )
-        return DoStringPrintfV<Utf8Buffer>(*this, format, argptr);
-    else
-        // wxChar* version
-        return DoStringPrintfV<wxStringBuffer>(*this, format, argptr);
-    #else
-        return DoStringPrintfV(*this, format, argptr);
-    #endif // UTF8/WCHAR
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// misc other operations
-// ----------------------------------------------------------------------------
-
-// returns true if the string matches the pattern which may contain '*' and
-// '?' metacharacters (as usual, '?' matches any character and '*' any number
-// of them)
-bool wxString::Matches(const wxString& mask) const
-{
-    // I disable this code as it doesn't seem to be faster (in fact, it seems
-    // to be much slower) than the old, hand-written code below and using it
-    // here requires always linking with libregex even if the user code doesn't
-    // use it
-#if 0 // wxUSE_REGEX
-    // first translate the shell-like mask into a regex
-    wxString pattern;
-    pattern.reserve(wxStrlen(pszMask));
-
-    pattern += wxT('^');
-    while ( *pszMask )
-    {
-        switch ( *pszMask )
-        {
-            case wxT('?'):
-                pattern += wxT('.');
-                break;
-
-            case wxT('*'):
-                pattern += wxT(".*");
-                break;
-
-            case wxT('^'):
-            case wxT('.'):
-            case wxT('$'):
-            case wxT('('):
-            case wxT(')'):
-            case wxT('|'):
-            case wxT('+'):
-            case wxT('\\'):
-                // these characters are special in a RE, quote them
-                // (however note that we don't quote '[' and ']' to allow
-                // using them for Unix shell like matching)
-                pattern += wxT('\\');
-                // fall through
-
-            default:
-                pattern += *pszMask;
-        }
-
-        pszMask++;
-    }
-    pattern += wxT('$');
-
-    // and now use it
-    return wxRegEx(pattern, wxRE_NOSUB | wxRE_EXTENDED).Matches(c_str());
-#else // !wxUSE_REGEX
-  // TODO: this is, of course, awfully inefficient...
-
-  // FIXME-UTF8: implement using iterators, remove #if
-#if wxUSE_UNICODE_UTF8
-  const wxScopedWCharBuffer maskBuf = mask.wc_str();
-  const wxScopedWCharBuffer txtBuf = wc_str();
-  const wxChar *pszMask = maskBuf.data();
-  const wxChar *pszTxt = txtBuf.data();
-#else
-  const wxChar *pszMask = mask.wx_str();
-  // the char currently being checked
-  const wxChar *pszTxt = wx_str();
-#endif
-
-  // the last location where '*' matched
-  const wxChar *pszLastStarInText = NULL;
-  const wxChar *pszLastStarInMask = NULL;
-
-match:
-  for ( ; *pszMask != wxT('\0'); pszMask++, pszTxt++ ) {
-    switch ( *pszMask ) {
-      case wxT('?'):
-        if ( *pszTxt == wxT('\0') )
-          return false;
-
-        // pszTxt and pszMask will be incremented in the loop statement
-
-        break;
-
-      case wxT('*'):
-        {
-          // remember where we started to be able to backtrack later
-          pszLastStarInText = pszTxt;
-          pszLastStarInMask = pszMask;
-
-          // ignore special chars immediately following this one
-          // (should this be an error?)
-          while ( *pszMask == wxT('*') || *pszMask == wxT('?') )
-            pszMask++;
-
-          // if there is nothing more, match
-          if ( *pszMask == wxT('\0') )
-            return true;
-
-          // are there any other metacharacters in the mask?
-          size_t uiLenMask;
-          const wxChar *pEndMask = wxStrpbrk(pszMask, wxT("*?"));
-
-          if ( pEndMask != NULL ) {
-            // we have to match the string between two metachars
-            uiLenMask = pEndMask - pszMask;
-          }
-          else {
-            // we have to match the remainder of the string
-            uiLenMask = wxStrlen(pszMask);
-          }
-
-          wxString strToMatch(pszMask, uiLenMask);
-          const wxChar* pMatch = wxStrstr(pszTxt, strToMatch);
-          if ( pMatch == NULL )
-            return false;
-
-          // -1 to compensate "++" in the loop
-          pszTxt = pMatch + uiLenMask - 1;
-          pszMask += uiLenMask - 1;
-        }
-        break;
-
-      default:
-        if ( *pszMask != *pszTxt )
-          return false;
-        break;
-    }
-  }
-
-  // match only if nothing left
-  if ( *pszTxt == wxT('\0') )
-    return true;
-
-  // if we failed to match, backtrack if we can
-  if ( pszLastStarInText ) {
-    pszTxt = pszLastStarInText + 1;
-    pszMask = pszLastStarInMask;
-
-    pszLastStarInText = NULL;
-
-    // don't bother resetting pszLastStarInMask, it's unnecessary
-
-    goto match;
-  }
-
-  return false;
-#endif // wxUSE_REGEX/!wxUSE_REGEX
-}
-
-// Count the number of chars
-int wxString::Freq(wxUniChar ch) const
-{
-    int count = 0;
-    for ( const_iterator i = begin(); i != end(); ++i )
-    {
-        if ( *i == ch )
-            count ++;
-    }
-    return count;
-}
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/string.cpp
+// Purpose:     wxString class
+// Author:      Vadim Zeitlin, Ryan Norton
+// Modified by:
+// Created:     29/01/98
+// RCS-ID:      $Id: string.cpp 63008 2009-12-28 20:01:39Z VZ $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+//              (c) 2004 Ryan Norton <wxprojects@comcast.net>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/*
+ * About ref counting:
+ *  1) all empty strings use g_strEmpty, nRefs = -1 (set in Init())
+ *  2) AllocBuffer() sets nRefs to 1, Lock() increments it by one
+ *  3) Unlock() decrements nRefs and frees memory if it goes to 0
+ */
+
+// ===========================================================================
+// headers, declarations, constants
+// ===========================================================================
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/thread.h"
+#endif
+
+#include <ctype.h>
+
+#ifndef __WXWINCE__
+    #include <errno.h>
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef __SALFORDC__
+    #include <clib.h>
+#endif
+
+// allocating extra space for each string consumes more memory but speeds up
+// the concatenation operations (nLen is the current string's length)
+// NB: EXTRA_ALLOC must be >= 0!
+#define EXTRA_ALLOC       (19 - nLen % 16)
+
+// ---------------------------------------------------------------------------
+// static class variables definition
+// ---------------------------------------------------------------------------
+
+#if !wxUSE_STL
+  //According to STL _must_ be a -1 size_t
+  const size_t wxStringBase::npos = (size_t) -1;
+#endif
+
+// ----------------------------------------------------------------------------
+// static data
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STL
+
+extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = _T("");
+
+#else
+
+// for an empty string, GetStringData() will return this address: this
+// structure has the same layout as wxStringData and it's data() method will
+// return the empty string (dummy pointer)
+static const struct
+{
+  wxStringData data;
+  wxChar dummy;
+} g_strEmpty = { {-1, 0, 0}, wxT('\0') };
+
+// empty C style string: points to 'string data' byte of g_strEmpty
+extern const wxChar WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy;
+
+#endif
+
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STD_IOSTREAM
+
+#include <iostream>
+
+wxSTD ostream& operator<<(wxSTD ostream& os, const wxString& str)
+{
+#ifdef __BORLANDC__
+    os << str.mb_str();
+#else
+    os << str.c_str();
+#endif
+    return os;
+}
+
+#endif // wxUSE_STD_IOSTREAM
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// this small class is used to gather statistics for performance tuning
+//#define WXSTRING_STATISTICS
+#ifdef  WXSTRING_STATISTICS
+  class Averager
+  {
+  public:
+    Averager(const wxChar *sz) { m_sz = sz; m_nTotal = m_nCount = 0; }
+   ~Averager()
+   { wxPrintf("wxString: average %s = %f\n", m_sz, ((float)m_nTotal)/m_nCount); }
+
+    void Add(size_t n) { m_nTotal += n; m_nCount++; }
+
+  private:
+    size_t m_nCount, m_nTotal;
+    const wxChar *m_sz;
+  } g_averageLength("allocation size"),
+    g_averageSummandLength("summand length"),
+    g_averageConcatHit("hit probability in concat"),
+    g_averageInitialLength("initial string length");
+
+  #define STATISTICS_ADD(av, val) g_average##av.Add(val)
+#else
+  #define STATISTICS_ADD(av, val)
+#endif // WXSTRING_STATISTICS
+
+#if !wxUSE_STL
+
+// ===========================================================================
+// wxStringData class deallocation
+// ===========================================================================
+
+#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
+#  pragma message (__FILE__ ": building with Multithreaded non DLL runtime has a performance impact on wxString!")
+void wxStringData::Free()
+{
+    free(this);
+}
+#endif
+
+// ===========================================================================
+// wxStringBase
+// ===========================================================================
+
+// takes nLength elements of psz starting at nPos
+void wxStringBase::InitWith(const wxChar *psz, size_t nPos, size_t nLength)
+{
+  Init();
+
+  // if the length is not given, assume the string to be NUL terminated
+  if ( nLength == npos ) {
+    wxASSERT_MSG( nPos <= wxStrlen(psz), _T("index out of bounds") );
+
+    nLength = wxStrlen(psz + nPos);
+  }
+
+  STATISTICS_ADD(InitialLength, nLength);
+
+  if ( nLength > 0 ) {
+    // trailing '\0' is written in AllocBuffer()
+    if ( !AllocBuffer(nLength) ) {
+      wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
+      return;
+    }
+    wxTmemcpy(m_pchData, psz + nPos, nLength);
+  }
+}
+
+// poor man's iterators are "void *" pointers
+wxStringBase::wxStringBase(const void *pStart, const void *pEnd)
+{
+  if ( pEnd >= pStart )
+  {
+    InitWith((const wxChar *)pStart, 0,
+             (const wxChar *)pEnd - (const wxChar *)pStart);
+  }
+  else
+  {
+    wxFAIL_MSG( _T("pStart is not before pEnd") );
+    Init();
+  }
+}
+
+wxStringBase::wxStringBase(size_type n, wxChar ch)
+{
+  Init();
+  append(n, ch);
+}
+
+// ---------------------------------------------------------------------------
+// memory allocation
+// ---------------------------------------------------------------------------
+
+// allocates memory needed to store a C string of length nLen
+bool wxStringBase::AllocBuffer(size_t nLen)
+{
+  // allocating 0 sized buffer doesn't make sense, all empty strings should
+  // reuse g_strEmpty
+  wxASSERT( nLen >  0 );
+
+  // make sure that we don't overflow
+  wxCHECK( nLen < (INT_MAX / sizeof(wxChar)) -
+                  (sizeof(wxStringData) + EXTRA_ALLOC + 1), false );
+
+  STATISTICS_ADD(Length, nLen);
+
+  // allocate memory:
+  // 1) one extra character for '\0' termination
+  // 2) sizeof(wxStringData) for housekeeping info
+  wxStringData* pData = (wxStringData*)
+    malloc(sizeof(wxStringData) + (nLen + EXTRA_ALLOC + 1)*sizeof(wxChar));
+
+  if ( pData == NULL ) {
+    // allocation failures are handled by the caller
+    return false;
+  }
+
+  pData->nRefs        = 1;
+  pData->nDataLength  = nLen;
+  pData->nAllocLength = nLen + EXTRA_ALLOC;
+  m_pchData           = pData->data();  // data starts after wxStringData
+  m_pchData[nLen]     = wxT('\0');
+  return true;
+}
+
+// must be called before changing this string
+bool wxStringBase::CopyBeforeWrite()
+{
+  wxStringData* pData = GetStringData();
+
+  if ( pData->IsShared() ) {
+    pData->Unlock();                // memory not freed because shared
+    size_t nLen = pData->nDataLength;
+    if ( !AllocBuffer(nLen) ) {
+      // allocation failures are handled by the caller
+      return false;
+    }
+    wxTmemcpy(m_pchData, pData->data(), nLen);
+  }
+
+  wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
+
+  return true;
+}
+
+// must be called before replacing contents of this string
+bool wxStringBase::AllocBeforeWrite(size_t nLen)
+{
+  wxASSERT( nLen != 0 );  // doesn't make any sense
+
+  // must not share string and must have enough space
+  wxStringData* pData = GetStringData();
+  if ( pData->IsShared() || pData->IsEmpty() ) {
+    // can't work with old buffer, get new one
+    pData->Unlock();
+    if ( !AllocBuffer(nLen) ) {
+      // allocation failures are handled by the caller
+      return false;
+    }
+  }
+  else {
+    if ( nLen > pData->nAllocLength ) {
+      // realloc the buffer instead of calling malloc() again, this is more
+      // efficient
+      STATISTICS_ADD(Length, nLen);
+
+      nLen += EXTRA_ALLOC;
+
+      pData = (wxStringData*)
+          realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
+
+      if ( pData == NULL ) {
+        // allocation failures are handled by the caller
+        // keep previous data since reallocation failed
+        return false;
+      }
+
+      pData->nAllocLength = nLen;
+      m_pchData = pData->data();
+    }
+  }
+
+  wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
+
+  // it doesn't really matter what the string length is as it's going to be
+  // overwritten later but, for extra safety, set it to 0 for now as we may
+  // have some junk in m_pchData
+  GetStringData()->nDataLength = 0;
+
+  return true;
+}
+
+wxStringBase& wxStringBase::append(size_t n, wxChar ch)
+{
+    size_type len = length();
+
+    if ( !Alloc(len + n) || !CopyBeforeWrite() ) {
+      wxFAIL_MSG( _T("out of memory in wxStringBase::append") );
+    }
+    GetStringData()->nDataLength = len + n;
+    m_pchData[len + n] = '\0';
+    for ( size_t i = 0; i < n; ++i )
+        m_pchData[len + i] = ch;
+    return *this;
+}
+
+void wxStringBase::resize(size_t nSize, wxChar ch)
+{
+    size_t len = length();
+
+    if ( nSize < len )
+    {
+        erase(begin() + nSize, end());
+    }
+    else if ( nSize > len )
+    {
+        append(nSize - len, ch);
+    }
+    //else: we have exactly the specified length, nothing to do
+}
+
+// allocate enough memory for nLen characters
+bool wxStringBase::Alloc(size_t nLen)
+{
+  wxStringData *pData = GetStringData();
+  if ( pData->nAllocLength <= nLen ) {
+    if ( pData->IsEmpty() ) {
+      nLen += EXTRA_ALLOC;
+
+      pData = (wxStringData *)
+                malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
+
+      if ( pData == NULL ) {
+        // allocation failure handled by caller
+        return false;
+      }
+
+      pData->nRefs = 1;
+      pData->nDataLength = 0;
+      pData->nAllocLength = nLen;
+      m_pchData = pData->data();  // data starts after wxStringData
+      m_pchData[0u] = wxT('\0');
+    }
+    else if ( pData->IsShared() ) {
+      pData->Unlock();                // memory not freed because shared
+      size_t nOldLen = pData->nDataLength;
+      if ( !AllocBuffer(nLen) ) {
+        // allocation failure handled by caller
+        return false;
+      }
+      // +1 to copy the terminator, too
+      memcpy(m_pchData, pData->data(), (nOldLen+1)*sizeof(wxChar));
+      GetStringData()->nDataLength = nOldLen;
+    }
+    else {
+      nLen += EXTRA_ALLOC;
+
+      pData = (wxStringData *)
+        realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxChar));
+
+      if ( pData == NULL ) {
+        // allocation failure handled by caller
+        // keep previous data since reallocation failed
+        return false;
+      }
+
+      // it's not important if the pointer changed or not (the check for this
+      // is not faster than assigning to m_pchData in all cases)
+      pData->nAllocLength = nLen;
+      m_pchData = pData->data();
+    }
+  }
+  //else: we've already got enough
+  return true;
+}
+
+wxStringBase::iterator wxStringBase::begin()
+{
+    if (length() > 0)
+        CopyBeforeWrite();
+    return m_pchData;
+}
+
+wxStringBase::iterator wxStringBase::end()
+{
+    if (length() > 0)
+        CopyBeforeWrite();
+    return m_pchData + length();
+}
+
+wxStringBase::iterator wxStringBase::erase(iterator it)
+{
+    size_type idx = it - begin();
+    erase(idx, 1);
+    return begin() + idx;
+}
+
+wxStringBase& wxStringBase::erase(size_t nStart, size_t nLen)
+{
+    wxASSERT(nStart <= length());
+    size_t strLen = length() - nStart;
+    // delete nLen or up to the end of the string characters
+    nLen = strLen < nLen ? strLen : nLen;
+    wxString strTmp(c_str(), nStart);
+    strTmp.append(c_str() + nStart + nLen, length() - nStart - nLen);
+
+    swap(strTmp);
+    return *this;
+}
+
+wxStringBase& wxStringBase::insert(size_t nPos, const wxChar *sz, size_t n)
+{
+    wxASSERT( nPos <= length() );
+
+    if ( n == npos ) n = wxStrlen(sz);
+    if ( n == 0 ) return *this;
+
+    if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {
+        wxFAIL_MSG( _T("out of memory in wxStringBase::insert") );
+    }
+
+    memmove(m_pchData + nPos + n, m_pchData + nPos,
+            (length() - nPos) * sizeof(wxChar));
+    memcpy(m_pchData + nPos, sz, n * sizeof(wxChar));
+    GetStringData()->nDataLength = length() + n;
+    m_pchData[length()] = '\0';
+
+    return *this;
+}
+
+void wxStringBase::swap(wxStringBase& str)
+{
+    wxChar* tmp = str.m_pchData;
+    str.m_pchData = m_pchData;
+    m_pchData = tmp;
+}
+
+size_t wxStringBase::find(const wxStringBase& str, size_t nStart) const
+{
+    // deal with the special case of empty string first
+    const size_t nLen = length();
+    const size_t nLenOther = str.length();
+
+    if ( !nLenOther )
+    {
+        // empty string is a substring of anything
+        return 0;
+    }
+
+    if ( !nLen )
+    {
+        // the other string is non empty so can't be our substring
+        return npos;
+    }
+
+    wxASSERT( str.GetStringData()->IsValid() );
+    wxASSERT( nStart <= nLen );
+
+    const wxChar * const other = str.c_str();
+
+    // anchor
+    const wxChar* p = (const wxChar*)wxTmemchr(c_str() + nStart,
+                                               *other,
+                                               nLen - nStart);
+
+    if ( !p )
+        return npos;
+
+    while ( p - c_str() + nLenOther <= nLen && wxTmemcmp(p, other, nLenOther) )
+    {
+        p++;
+
+        // anchor again
+        p = (const wxChar*)wxTmemchr(p, *other, nLen - (p - c_str()));
+
+        if ( !p )
+            return npos;
+    }
+
+    return p - c_str() + nLenOther <= nLen ? p - c_str() : npos;
+}
+
+size_t wxStringBase::find(const wxChar* sz, size_t nStart, size_t n) const
+{
+    return find(wxStringBase(sz, n), nStart);
+}
+
+size_t wxStringBase::find(wxChar ch, size_t nStart) const
+{
+    wxASSERT( nStart <= length() );
+
+    const wxChar *p = (const wxChar*)wxTmemchr(c_str() + nStart, ch, length() - nStart);
+
+    return p == NULL ? npos : p - c_str();
+}
+
+size_t wxStringBase::rfind(const wxStringBase& str, size_t nStart) const
+{
+    wxASSERT( str.GetStringData()->IsValid() );
+    wxASSERT( nStart == npos || nStart <= length() );
+
+    if ( length() >= str.length() )
+    {
+        // avoids a corner case later
+        if ( length() == 0 && str.length() == 0 )
+            return 0;
+
+        // "top" is the point where search starts from
+        size_t top = length() - str.length();
+
+        if ( nStart == npos )
+            nStart = length() - 1;
+        if ( nStart < top )
+            top = nStart;
+
+        const wxChar *cursor = c_str() + top;
+        do
+        {
+            if ( wxTmemcmp(cursor, str.c_str(),
+                        str.length()) == 0 )
+            {
+                return cursor - c_str();
+            }
+        } while ( cursor-- > c_str() );
+    }
+
+    return npos;
+}
+
+size_t wxStringBase::rfind(const wxChar* sz, size_t nStart, size_t n) const
+{
+    return rfind(wxStringBase(sz, n), nStart);
+}
+
+size_t wxStringBase::rfind(wxChar ch, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = length();
+    }
+    else
+    {
+        wxASSERT( nStart <= length() );
+    }
+
+    const wxChar *actual;
+    for ( actual = c_str() + ( nStart == npos ? length() : nStart + 1 );
+          actual > c_str(); --actual )
+    {
+        if ( *(actual - 1) == ch )
+            return (actual - 1) - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart) const
+{
+    wxASSERT(nStart <= length());
+
+    size_t len = wxStrlen(sz);
+
+    size_t i;
+    for(i = nStart; i < this->length(); ++i)
+    {
+        if (wxTmemchr(sz, *(c_str() + i), len))
+            break;
+    }
+
+    if(i == this->length())
+        return npos;
+    else
+        return i;
+}
+
+size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart,
+                                   size_t n) const
+{
+    return find_first_of(wxStringBase(sz, n), nStart);
+}
+
+size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = length() - 1;
+    }
+    else
+    {
+        wxASSERT_MSG( nStart <= length(),
+                        _T("invalid index in find_last_of()") );
+    }
+
+    size_t len = wxStrlen(sz);
+
+    for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
+    {
+        if ( wxTmemchr(sz, *p, len) )
+            return p - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxStringBase::find_last_of(const wxChar* sz, size_t nStart,
+                                   size_t n) const
+{
+    return find_last_of(wxStringBase(sz, n), nStart);
+}
+
+size_t wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = length();
+    }
+    else
+    {
+        wxASSERT( nStart <= length() );
+    }
+
+    size_t len = wxStrlen(sz);
+
+    size_t i;
+    for(i = nStart; i < this->length(); ++i)
+    {
+        if (!wxTmemchr(sz, *(c_str() + i), len))
+            break;
+    }
+
+    if(i == this->length())
+         return npos;
+     else
+        return i;
+}
+
+size_t wxStringBase::find_first_not_of(const wxChar* sz, size_t nStart,
+                                       size_t n) const
+{
+    return find_first_not_of(wxStringBase(sz, n), nStart);
+}
+
+size_t wxStringBase::find_first_not_of(wxChar ch, size_t nStart) const
+{
+    wxASSERT( nStart <= length() );
+
+    for ( const wxChar *p = c_str() + nStart; *p; p++ )
+    {
+        if ( *p != ch )
+            return p - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = length() - 1;
+    }
+    else
+    {
+        wxASSERT( nStart <= length() );
+    }
+
+    size_t len = wxStrlen(sz);
+
+    for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
+    {
+        if ( !wxTmemchr(sz, *p,len) )
+             return p - c_str();
+    }
+
+    return npos;
+}
+
+size_t wxStringBase::find_last_not_of(const wxChar* sz, size_t nStart,
+                                      size_t n) const
+{
+    return find_last_not_of(wxStringBase(sz, n), nStart);
+}
+
+size_t wxStringBase::find_last_not_of(wxChar ch, size_t nStart) const
+{
+    if ( nStart == npos )
+    {
+        nStart = length() - 1;
+    }
+    else
+    {
+        wxASSERT( nStart <= length() );
+    }
+
+    for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
+    {
+        if ( *p != ch )
+            return p - c_str();
+    }
+
+    return npos;
+}
+
+wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
+                                    const wxChar *sz)
+{
+  wxASSERT_MSG( nStart <= length(),
+                _T("index out of bounds in wxStringBase::replace") );
+  size_t strLen = length() - nStart;
+  nLen = strLen < nLen ? strLen : nLen;
+
+  wxStringBase strTmp;
+  strTmp.reserve(length()); // micro optimisation to avoid multiple mem allocs
+
+  //This is kind of inefficient, but its pretty good considering...
+  //we don't want to use character access operators here because on STL
+  //it will freeze the reference count of strTmp, which means a deep copy
+  //at the end when swap is called
+  //
+  //Also, we can't use append with the full character pointer and must
+  //do it manually because this string can contain null characters
+  for(size_t i1 = 0; i1 < nStart; ++i1)
+      strTmp.append(1, this->c_str()[i1]);
+
+  //its safe to do the full version here because
+  //sz must be a normal c string
+  strTmp.append(sz);
+
+  for(size_t i2 = nStart + nLen; i2 < length(); ++i2)
+      strTmp.append(1, this->c_str()[i2]);
+
+  swap(strTmp);
+  return *this;
+}
+
+wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
+                                    size_t nCount, wxChar ch)
+{
+  return replace(nStart, nLen, wxStringBase(nCount, ch).c_str());
+}
+
+wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
+                                    const wxStringBase& str,
+                                    size_t nStart2, size_t nLen2)
+{
+  return replace(nStart, nLen, str.substr(nStart2, nLen2));
+}
+
+wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
+                                    const wxChar* sz, size_t nCount)
+{
+  return replace(nStart, nLen, wxStringBase(sz, nCount).c_str());
+}
+
+wxStringBase wxStringBase::substr(size_t nStart, size_t nLen) const
+{
+  if ( nLen == npos )
+    nLen = length() - nStart;
+  return wxStringBase(*this, nStart, nLen);
+}
+
+// assigns one string to another
+wxStringBase& wxStringBase::operator=(const wxStringBase& stringSrc)
+{
+  wxASSERT( stringSrc.GetStringData()->IsValid() );
+
+  // don't copy string over itself
+  if ( m_pchData != stringSrc.m_pchData ) {
+    if ( stringSrc.GetStringData()->IsEmpty() ) {
+      Reinit();
+    }
+    else {
+      // adjust references
+      GetStringData()->Unlock();
+      m_pchData = stringSrc.m_pchData;
+      GetStringData()->Lock();
+    }
+  }
+
+  return *this;
+}
+
+// assigns a single character
+wxStringBase& wxStringBase::operator=(wxChar ch)
+{
+  if ( !AssignCopy(1, &ch) ) {
+    wxFAIL_MSG( _T("out of memory in wxStringBase::operator=(wxChar)") );
+  }
+  return *this;
+}
+
+// assigns C string
+wxStringBase& wxStringBase::operator=(const wxChar *psz)
+{
+  if ( !AssignCopy(wxStrlen(psz), psz) ) {
+    wxFAIL_MSG( _T("out of memory in wxStringBase::operator=(const wxChar *)") );
+  }
+  return *this;
+}
+
+// helper function: does real copy
+bool wxStringBase::AssignCopy(size_t nSrcLen, const wxChar *pszSrcData)
+{
+  if ( nSrcLen == 0 ) {
+    Reinit();
+  }
+  else {
+    if ( !AllocBeforeWrite(nSrcLen) ) {
+      // allocation failure handled by caller
+      return false;
+    }
+
+    // use memmove() and not memcpy() here as we might be copying from our own
+    // buffer in case of assignment such as "s = s.c_str()" (see #11294)
+    memmove(m_pchData, pszSrcData, nSrcLen*sizeof(wxChar));
+
+    GetStringData()->nDataLength = nSrcLen;
+    m_pchData[nSrcLen] = wxT('\0');
+  }
+  return true;
+}
+
+// ---------------------------------------------------------------------------
+// string concatenation
+// ---------------------------------------------------------------------------
+
+// add something to this string
+bool wxStringBase::ConcatSelf(size_t nSrcLen, const wxChar *pszSrcData,
+                              size_t nMaxLen)
+{
+  STATISTICS_ADD(SummandLength, nSrcLen);
+
+  nSrcLen = nSrcLen < nMaxLen ? nSrcLen : nMaxLen;
+
+  // concatenating an empty string is a NOP
+  if ( nSrcLen > 0 ) {
+    wxStringData *pData = GetStringData();
+    size_t nLen = pData->nDataLength;
+    size_t nNewLen = nLen + nSrcLen;
+
+    // take special care when appending part of this string to itself: the code
+    // below reallocates our buffer and this invalidates pszSrcData pointer so
+    // we have to copy it in another temporary string in this case (but avoid
+    // doing this unnecessarily)
+    if ( pszSrcData >= m_pchData && pszSrcData < m_pchData + nLen )
+    {
+        wxStringBase tmp(pszSrcData, nSrcLen);
+        return ConcatSelf(nSrcLen, tmp.m_pchData, nSrcLen);
+    }
+
+    // alloc new buffer if current is too small
+    if ( pData->IsShared() ) {
+      STATISTICS_ADD(ConcatHit, 0);
+
+      // we have to allocate another buffer
+      wxStringData* pOldData = GetStringData();
+      if ( !AllocBuffer(nNewLen) ) {
+          // allocation failure handled by caller
+          return false;
+      }
+      memcpy(m_pchData, pOldData->data(), nLen*sizeof(wxChar));
+      pOldData->Unlock();
+    }
+    else if ( nNewLen > pData->nAllocLength ) {
+      STATISTICS_ADD(ConcatHit, 0);
+
+      reserve(nNewLen);
+      // we have to grow the buffer
+      if ( capacity() < nNewLen ) {
+          // allocation failure handled by caller
+          return false;
+      }
+    }
+    else {
+      STATISTICS_ADD(ConcatHit, 1);
+
+      // the buffer is already big enough
+    }
+
+    // should be enough space
+    wxASSERT( nNewLen <= GetStringData()->nAllocLength );
+
+    // fast concatenation - all is done in our buffer
+    memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(wxChar));
+
+    m_pchData[nNewLen] = wxT('\0');          // put terminating '\0'
+    GetStringData()->nDataLength = nNewLen; // and fix the length
+  }
+  //else: the string to append was empty
+  return true;
+}
+
+// ---------------------------------------------------------------------------
+// simple sub-string extraction
+// ---------------------------------------------------------------------------
+
+// helper function: clone the data attached to this string
+bool wxStringBase::AllocCopy(wxString& dest, int nCopyLen, int nCopyIndex) const
+{
+  if ( nCopyLen == 0 ) {
+    dest.Init();
+  }
+  else {
+    if ( !dest.AllocBuffer(nCopyLen) ) {
+      // allocation failure handled by caller
+      return false;
+    }
+    memcpy(dest.m_pchData, m_pchData + nCopyIndex, nCopyLen*sizeof(wxChar));
+  }
+  return true;
+}
+
+#endif // !wxUSE_STL
+
+#if !wxUSE_STL || !defined(HAVE_STD_STRING_COMPARE)
+
+#if !wxUSE_STL
+    #define STRINGCLASS wxStringBase
+#else
+    #define STRINGCLASS wxString
+#endif
+
+static inline int wxDoCmp(const wxChar* s1, size_t l1,
+                          const wxChar* s2, size_t l2)
+{
+    if( l1 == l2 )
+        return wxTmemcmp(s1, s2, l1);
+    else if( l1 < l2 )
+    {
+        int ret = wxTmemcmp(s1, s2, l1);
+        return ret == 0 ? -1 : ret;
+    }
+    else
+    {
+        int ret = wxTmemcmp(s1, s2, l2);
+        return ret == 0 ? +1 : ret;
+    }
+}
+
+int STRINGCLASS::compare(const wxStringBase& str) const
+{
+    return ::wxDoCmp(data(), length(), str.data(), str.length());
+}
+
+int STRINGCLASS::compare(size_t nStart, size_t nLen,
+                         const wxStringBase& str) const
+{
+    wxASSERT(nStart <= length());
+    size_type strLen = length() - nStart;
+    nLen = strLen < nLen ? strLen : nLen;
+    return ::wxDoCmp(data() + nStart, nLen, str.data(), str.length());
+}
+
+int STRINGCLASS::compare(size_t nStart, size_t nLen,
+                         const wxStringBase& str,
+                         size_t nStart2, size_t nLen2) const
+{
+    wxASSERT(nStart <= length());
+    wxASSERT(nStart2 <= str.length());
+    size_type strLen  =     length() - nStart,
+              strLen2 = str.length() - nStart2;
+    nLen  = strLen  < nLen  ? strLen  : nLen;
+    nLen2 = strLen2 < nLen2 ? strLen2 : nLen2;
+    return ::wxDoCmp(data() + nStart, nLen, str.data() + nStart2, nLen2);
+}
+
+int STRINGCLASS::compare(const wxChar* sz) const
+{
+    size_t nLen = wxStrlen(sz);
+    return ::wxDoCmp(data(), length(), sz, nLen);
+}
+
+int STRINGCLASS::compare(size_t nStart, size_t nLen,
+                         const wxChar* sz, size_t nCount) const
+{
+    wxASSERT(nStart <= length());
+    size_type strLen = length() - nStart;
+    nLen = strLen < nLen ? strLen : nLen;
+    if( nCount == npos )
+        nCount = wxStrlen(sz);
+
+    return ::wxDoCmp(data() + nStart, nLen, sz, nCount);
+}
+
+#undef STRINGCLASS
+
+#endif // !wxUSE_STL || !defined(HAVE_STD_STRING_COMPARE)
+
+// ===========================================================================
+// wxString class core
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// construction and conversion
+// ---------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+
+// from multibyte string
+wxString::wxString(const char *psz, const wxMBConv& conv, size_t nLength)
+{
+    // anything to do?
+    if ( psz && nLength != 0 )
+    {
+        if ( nLength == npos )
+        {
+            nLength = wxNO_LEN;
+        }
+
+        size_t nLenWide;
+        wxWCharBuffer wbuf = conv.cMB2WC(psz, nLength, &nLenWide);
+
+        if ( nLenWide )
+            assign(wbuf, nLenWide);
+    }
+}
+
+//Convert wxString in Unicode mode to a multi-byte string
+const wxCharBuffer wxString::mb_str(const wxMBConv& conv) const
+{
+    return conv.cWC2MB(c_str(), length() + 1 /* size, not length */, NULL);
+}
+
+#else // ANSI
+
+#if wxUSE_WCHAR_T
+
+// from wide string
+wxString::wxString(const wchar_t *pwz, const wxMBConv& conv, size_t nLength)
+{
+    // anything to do?
+    if ( pwz && nLength != 0 )
+    {
+        if ( nLength == npos )
+        {
+            nLength = wxNO_LEN;
+        }
+
+        size_t nLenMB;
+        wxCharBuffer buf = conv.cWC2MB(pwz, nLength, &nLenMB);
+
+        if ( nLenMB )
+            assign(buf, nLenMB);
+    }
+}
+
+//Converts this string to a wide character string if unicode
+//mode is not enabled and wxUSE_WCHAR_T is enabled
+const wxWCharBuffer wxString::wc_str(const wxMBConv& conv) const
+{
+    return conv.cMB2WC(c_str(), length() + 1 /* size, not length */, NULL);
+}
+
+#endif // wxUSE_WCHAR_T
+
+#endif // Unicode/ANSI
+
+// shrink to minimal size (releasing extra memory)
+bool wxString::Shrink()
+{
+  wxString tmp(begin(), end());
+  swap(tmp);
+  return tmp.length() == length();
+}
+
+#if !wxUSE_STL
+// get the pointer to writable buffer of (at least) nLen bytes
+wxChar *wxString::GetWriteBuf(size_t nLen)
+{
+  if ( !AllocBeforeWrite(nLen) ) {
+    // allocation failure handled by caller
+    return NULL;
+  }
+
+  wxASSERT( GetStringData()->nRefs == 1 );
+  GetStringData()->Validate(false);
+
+  return m_pchData;
+}
+
+// put string back in a reasonable state after GetWriteBuf
+void wxString::UngetWriteBuf()
+{
+  UngetWriteBuf(wxStrlen(m_pchData));
+}
+
+void wxString::UngetWriteBuf(size_t nLen)
+{
+  wxStringData * const pData = GetStringData();
+
+  wxASSERT_MSG( nLen < pData->nAllocLength, _T("buffer overrun") );
+
+  // the strings we store are always NUL-terminated
+  pData->data()[nLen] = _T('\0');
+  pData->nDataLength = nLen;
+  pData->Validate(true);
+}
+#endif // !wxUSE_STL
+
+// ---------------------------------------------------------------------------
+// data access
+// ---------------------------------------------------------------------------
+
+// all functions are inline in string.h
+
+// ---------------------------------------------------------------------------
+// assignment operators
+// ---------------------------------------------------------------------------
+
+#if !wxUSE_UNICODE
+
+// same as 'signed char' variant
+wxString& wxString::operator=(const unsigned char* psz)
+{
+  *this = (const char *)psz;
+  return *this;
+}
+
+#if wxUSE_WCHAR_T
+wxString& wxString::operator=(const wchar_t *pwz)
+{
+  wxString str(pwz);
+  swap(str);
+  return *this;
+}
+#endif
+
+#endif
+
+/*
+ * concatenation functions come in 5 flavours:
+ *  string + string
+ *  char   + string      and      string + char
+ *  C str  + string      and      string + C str
+ */
+
+wxString operator+(const wxString& str1, const wxString& str2)
+{
+#if !wxUSE_STL
+    wxASSERT( str1.GetStringData()->IsValid() );
+    wxASSERT( str2.GetStringData()->IsValid() );
+#endif
+
+    wxString s = str1;
+    s += str2;
+
+    return s;
+}
+
+wxString operator+(const wxString& str, wxChar ch)
+{
+#if !wxUSE_STL
+    wxASSERT( str.GetStringData()->IsValid() );
+#endif
+
+    wxString s = str;
+    s += ch;
+
+    return s;
+}
+
+wxString operator+(wxChar ch, const wxString& str)
+{
+#if !wxUSE_STL
+    wxASSERT( str.GetStringData()->IsValid() );
+#endif
+
+    wxString s = ch;
+    s += str;
+
+    return s;
+}
+
+wxString operator+(const wxString& str, const wxChar *psz)
+{
+#if !wxUSE_STL
+    wxASSERT( str.GetStringData()->IsValid() );
+#endif
+
+    wxString s;
+    if ( !s.Alloc(wxStrlen(psz) + str.length()) ) {
+        wxFAIL_MSG( _T("out of memory in wxString::operator+") );
+    }
+    s += str;
+    s += psz;
+
+    return s;
+}
+
+wxString operator+(const wxChar *psz, const wxString& str)
+{
+#if !wxUSE_STL
+    wxASSERT( str.GetStringData()->IsValid() );
+#endif
+
+    wxString s;
+    if ( !s.Alloc(wxStrlen(psz) + str.length()) ) {
+        wxFAIL_MSG( _T("out of memory in wxString::operator+") );
+    }
+    s = psz;
+    s += str;
+
+    return s;
+}
+
+// ===========================================================================
+// other common string functions
+// ===========================================================================
+
+int wxString::Cmp(const wxString& s) const
+{
+    return compare(s);
+}
+
+int wxString::Cmp(const wxChar* psz) const
+{
+    return compare(psz);
+}
+
+static inline int wxDoCmpNoCase(const wxChar* s1, size_t l1,
+                                const wxChar* s2, size_t l2)
+{
+    size_t i;
+
+    if( l1 == l2 )
+    {
+        for(i = 0; i < l1; ++i)
+        {
+            if(wxTolower(s1[i]) != wxTolower(s2[i]))
+                break;
+        }
+        return i == l1 ? 0 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
+    }
+    else if( l1 < l2 )
+    {
+        for(i = 0; i < l1; ++i)
+        {
+            if(wxTolower(s1[i]) != wxTolower(s2[i]))
+                break;
+        }
+        return i == l1 ? -1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
+    }
+    else
+    {
+        for(i = 0; i < l2; ++i)
+        {
+            if(wxTolower(s1[i]) != wxTolower(s2[i]))
+                break;
+        }
+        return i == l2 ? 1 : wxTolower(s1[i]) < wxTolower(s2[i]) ? -1 : 1;
+    }
+}
+
+int wxString::CmpNoCase(const wxString& s) const
+{
+    return wxDoCmpNoCase(data(), length(), s.data(), s.length());
+}
+
+int wxString::CmpNoCase(const wxChar* psz) const
+{
+    int nLen = wxStrlen(psz);
+
+    return wxDoCmpNoCase(data(), length(), psz, nLen);
+}
+
+
+#if wxUSE_UNICODE
+
+#ifdef __MWERKS__
+#ifndef __SCHAR_MAX__
+#define __SCHAR_MAX__ 127
+#endif
+#endif
+
+wxString wxString::FromAscii(const char *ascii)
+{
+    if (!ascii)
+       return wxEmptyString;
+
+    size_t len = strlen( ascii );
+    wxString res;
+
+    if ( len )
+    {
+        wxStringBuffer buf(res, len);
+
+        wchar_t *dest = buf;
+
+        for ( ;; )
+        {
+           if ( (*dest++ = (wchar_t)(unsigned char)*ascii++) == L'\0' )
+               break;
+        }
+    }
+
+    return res;
+}
+
+wxString wxString::FromAscii(const char ascii)
+{
+    // What do we do with '\0' ?
+
+    wxString res;
+    res += (wchar_t)(unsigned char) ascii;
+
+    return res;
+}
+
+const wxCharBuffer wxString::ToAscii() const
+{
+    // this will allocate enough space for the terminating NUL too
+    wxCharBuffer buffer(length());
+
+
+    char *dest = buffer.data();
+
+    const wchar_t *pwc = c_str();
+    for ( ;; )
+    {
+        *dest++ = (char)(*pwc > SCHAR_MAX ? wxT('_') : *pwc);
+
+        // the output string can't have embedded NULs anyhow, so we can safely
+        // stop at first of them even if we do have any
+        if ( !*pwc++ )
+            break;
+    }
+
+    return buffer;
+}
+
+#endif // Unicode
+
+// extract string of length nCount starting at nFirst
+wxString wxString::Mid(size_t nFirst, size_t nCount) const
+{
+    size_t nLen = length();
+
+    // default value of nCount is npos and means "till the end"
+    if ( nCount == npos )
+    {
+        nCount = nLen - nFirst;
+    }
+
+    // out-of-bounds requests return sensible things
+    if ( nFirst + nCount > nLen )
+    {
+        nCount = nLen - nFirst;
+    }
+
+    if ( nFirst > nLen )
+    {
+        // AllocCopy() will return empty string
+        return wxEmptyString;
+    }
+
+    wxString dest(*this, nFirst, nCount);
+    if ( dest.length() != nCount )
+    {
+        wxFAIL_MSG( _T("out of memory in wxString::Mid") );
+    }
+
+    return dest;
+}
+
+// check that the string starts with prefix and return the rest of the string
+// in the provided pointer if it is not NULL, otherwise return false
+bool wxString::StartsWith(const wxChar *prefix, wxString *rest) const
+{
+    wxASSERT_MSG( prefix, _T("invalid parameter in wxString::StartsWith") );
+
+    // first check if the beginning of the string matches the prefix: note
+    // that we don't have to check that we don't run out of this string as
+    // when we reach the terminating NUL, either prefix string ends too (and
+    // then it's ok) or we break out of the loop because there is no match
+    const wxChar *p = c_str();
+    while ( *prefix )
+    {
+        if ( *prefix++ != *p++ )
+        {
+            // no match
+            return false;
+        }
+    }
+
+    if ( rest )
+    {
+        // put the rest of the string into provided pointer
+        *rest = p;
+    }
+
+    return true;
+}
+
+
+// check that the string ends with suffix and return the rest of it in the
+// provided pointer if it is not NULL, otherwise return false
+bool wxString::EndsWith(const wxChar *suffix, wxString *rest) const
+{
+    wxASSERT_MSG( suffix, _T("invalid parameter in wxString::EndssWith") );
+
+    int start = length() - wxStrlen(suffix);
+    if ( start < 0 || wxStrcmp(c_str() + start, suffix) != 0 )
+        return false;
+
+    if ( rest )
+    {
+        // put the rest of the string into provided pointer
+        rest->assign(*this, 0, start);
+    }
+
+    return true;
+}
+
+
+// extract nCount last (rightmost) characters
+wxString wxString::Right(size_t nCount) const
+{
+  if ( nCount > length() )
+    nCount = length();
+
+  wxString dest(*this, length() - nCount, nCount);
+  if ( dest.length() != nCount ) {
+    wxFAIL_MSG( _T("out of memory in wxString::Right") );
+  }
+  return dest;
+}
+
+// get all characters after the last occurence of ch
+// (returns the whole string if ch not found)
+wxString wxString::AfterLast(wxChar ch) const
+{
+  wxString str;
+  int iPos = Find(ch, true);
+  if ( iPos == wxNOT_FOUND )
+    str = *this;
+  else
+    str = c_str() + iPos + 1;
+
+  return str;
+}
+
+// extract nCount first (leftmost) characters
+wxString wxString::Left(size_t nCount) const
+{
+  if ( nCount > length() )
+    nCount = length();
+
+  wxString dest(*this, 0, nCount);
+  if ( dest.length() != nCount ) {
+    wxFAIL_MSG( _T("out of memory in wxString::Left") );
+  }
+  return dest;
+}
+
+// get all characters before the first occurence of ch
+// (returns the whole string if ch not found)
+wxString wxString::BeforeFirst(wxChar ch) const
+{
+  int iPos = Find(ch);
+  if ( iPos == wxNOT_FOUND ) iPos = length();
+  return wxString(*this, 0, iPos);
+}
+
+/// get all characters before the last occurence of ch
+/// (returns empty string if ch not found)
+wxString wxString::BeforeLast(wxChar ch) const
+{
+  wxString str;
+  int iPos = Find(ch, true);
+  if ( iPos != wxNOT_FOUND && iPos != 0 )
+    str = wxString(c_str(), iPos);
+
+  return str;
+}
+
+/// get all characters after the first occurence of ch
+/// (returns empty string if ch not found)
+wxString wxString::AfterFirst(wxChar ch) const
+{
+  wxString str;
+  int iPos = Find(ch);
+  if ( iPos != wxNOT_FOUND )
+    str = c_str() + iPos + 1;
+
+  return str;
+}
+
+// replace first (or all) occurences of some substring with another one
+size_t
+wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplaceAll)
+{
+    // if we tried to replace an empty string we'd enter an infinite loop below
+    wxCHECK_MSG( szOld && *szOld && szNew, 0,
+                 _T("wxString::Replace(): invalid parameter") );
+
+    size_t uiCount = 0;   // count of replacements made
+
+    // optimize the special common case of replacing one character with another
+    // one
+    if ( szOld[1] == '\0' && (szNew[0] != '\0' && szNew[1] == '\0') )
+    {
+        // this loop is the simplified version of the one below
+        for ( size_t pos = 0; ; )
+        {
+            pos = find(*szOld, pos);
+            if ( pos == npos )
+                break;
+
+            (*this)[pos++] = *szNew;
+
+            uiCount++;
+
+            if ( !bReplaceAll )
+                break;
+        }
+    }
+    else // general case
+    {
+        const size_t uiOldLen = wxStrlen(szOld);
+        const size_t uiNewLen = wxStrlen(szNew);
+
+        for ( size_t pos = 0; ; )
+        {
+            pos = find(szOld, pos);
+            if ( pos == npos )
+                break;
+
+            // replace this occurrence of the old string with the new one
+            replace(pos, uiOldLen, szNew, uiNewLen);
+
+            // move past the string that was replaced
+            pos += uiNewLen;
+
+            // increase replace count
+            uiCount++;
+
+            // stop now?
+            if ( !bReplaceAll )
+                break;
+        }
+    }
+
+    return uiCount;
+}
+
+bool wxString::IsAscii() const
+{
+  const wxChar *s = (const wxChar*) *this;
+  while(*s){
+    if(!isascii(*s)) return(false);
+    s++;
+  }
+  return(true);
+}
+
+bool wxString::IsWord() const
+{
+  const wxChar *s = (const wxChar*) *this;
+  while(*s){
+    if(!wxIsalpha(*s)) return(false);
+    s++;
+  }
+  return(true);
+}
+
+bool wxString::IsNumber() const
+{
+  const wxChar *s = (const wxChar*) *this;
+  if (wxStrlen(s))
+     if ((s[0] == wxT('-')) || (s[0] == wxT('+'))) s++;
+  while(*s){
+    if(!wxIsdigit(*s)) return(false);
+    s++;
+  }
+  return(true);
+}
+
+wxString wxString::Strip(stripType w) const
+{
+    wxString s = *this;
+    if ( w & leading ) s.Trim(false);
+    if ( w & trailing ) s.Trim(true);
+    return s;
+}
+
+// ---------------------------------------------------------------------------
+// case conversion
+// ---------------------------------------------------------------------------
+
+wxString& wxString::MakeUpper()
+{
+  for ( iterator it = begin(), en = end(); it != en; ++it )
+    *it = (wxChar)wxToupper(*it);
+
+  return *this;
+}
+
+wxString& wxString::MakeLower()
+{
+  for ( iterator it = begin(), en = end(); it != en; ++it )
+    *it = (wxChar)wxTolower(*it);
+
+  return *this;
+}
+
+// ---------------------------------------------------------------------------
+// trimming and padding
+// ---------------------------------------------------------------------------
+
+// some compilers (VC++ 6.0 not to name them) return true for a call to
+// isspace('\xEA') in the C locale which seems to be broken to me, but we have
+// to live with this by checking that the character is a 7 bit one - even if 
+// this may fail to detect some spaces (I don't know if Unicode doesn't have
+// space-like symbols somewhere except in the first 128 chars), it is arguably
+// still better than trimming away accented letters
+inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
+
+// trims spaces (in the sense of isspace) from left or right side
+wxString& wxString::Trim(bool bFromRight)
+{
+    // first check if we're going to modify the string at all
+    if ( !empty() &&
+         (
+          (bFromRight && wxSafeIsspace(GetChar(length() - 1))) ||
+          (!bFromRight && wxSafeIsspace(GetChar(0u)))
+         )
+       )
+    {
+        if ( bFromRight )
+        {
+            // find last non-space character
+            reverse_iterator psz = rbegin();
+            while ( (psz != rend()) && wxSafeIsspace(*psz) )
+                psz++;
+
+            // truncate at trailing space start
+            erase(psz.base(), end());
+        }
+        else
+        {
+            // find first non-space character
+            iterator psz = begin();
+            while ( (psz != end()) && wxSafeIsspace(*psz) )
+                psz++;
+
+            // fix up data and length
+            erase(begin(), psz);
+        }
+    }
+
+    return *this;
+}
+
+// adds nCount characters chPad to the string from either side
+wxString& wxString::Pad(size_t nCount, wxChar chPad, bool bFromRight)
+{
+    wxString s(chPad, nCount);
+
+    if ( bFromRight )
+        *this += s;
+    else
+    {
+        s += *this;
+        swap(s);
+    }
+
+    return *this;
+}
+
+// truncate the string
+wxString& wxString::Truncate(size_t uiLen)
+{
+    if ( uiLen < length() )
+    {
+        erase(begin() + uiLen, end());
+    }
+    //else: nothing to do, string is already short enough
+
+    return *this;
+}
+
+// ---------------------------------------------------------------------------
+// finding (return wxNOT_FOUND if not found and index otherwise)
+// ---------------------------------------------------------------------------
+
+// find a character
+int wxString::Find(wxChar ch, bool bFromEnd) const
+{
+    size_type idx = bFromEnd ? find_last_of(ch) : find_first_of(ch);
+
+    return (idx == npos) ? wxNOT_FOUND : (int)idx;
+}
+
+// find a sub-string (like strstr)
+int wxString::Find(const wxChar *pszSub) const
+{
+    size_type idx = find(pszSub);
+
+    return (idx == npos) ? wxNOT_FOUND : (int)idx;
+}
+
+// ----------------------------------------------------------------------------
+// conversion to numbers
+// ----------------------------------------------------------------------------
+
+// the implementation of all the functions below is exactly the same so factor
+// it out
+
+template <typename T, typename F>
+bool wxStringToIntType(const wxChar *start,
+                       T *val,
+                       int base,
+                       F func)
+{
+    wxCHECK_MSG( val, false, _T("NULL output pointer") );
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+
+#ifndef __WXWINCE__
+    errno = 0;
+#endif
+
+    wxChar *end;
+    *val = (*func)(start, &end, base);
+
+    // return true only if scan was stopped by the terminating NUL and if the
+    // string was not empty to start with and no under/overflow occurred
+    return !*end && (end != start)
+#ifndef __WXWINCE__
+        && (errno != ERANGE)
+#endif
+    ;
+}
+
+bool wxString::ToLong(long *val, int base) const
+{
+    return wxStringToIntType(c_str(), val, base, wxStrtol);
+}
+
+bool wxString::ToULong(unsigned long *val, int base) const
+{
+    return wxStringToIntType(c_str(), val, base, wxStrtoul);
+}
+
+bool wxString::ToLongLong(wxLongLong_t *val, int base) const
+{
+#ifdef wxHAS_STRTOLL
+    return wxStringToIntType(c_str(), val, base, wxStrtoll);
+#else
+    // TODO: implement this ourselves
+    wxUnusedVar(val);
+    wxUnusedVar(base);
+    return false;
+#endif // wxHAS_STRTOLL
+}
+
+bool wxString::ToULongLong(wxULongLong_t *val, int base) const
+{
+#ifdef wxHAS_STRTOLL
+    return wxStringToIntType(c_str(), val, base, wxStrtoull);
+#else
+    // TODO: implement this ourselves
+    wxUnusedVar(val);
+    wxUnusedVar(base);
+    return false;
+#endif
+}
+
+bool wxString::ToDouble(double *val) const
+{
+    wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") );
+
+#ifndef __WXWINCE__
+    errno = 0;
+#endif
+
+    const wxChar *start = c_str();
+    wxChar *end;
+    *val = wxStrtod(start, &end);
+
+    // return true only if scan was stopped by the terminating NUL and if the
+    // string was not empty to start with and no under/overflow occurred
+    return !*end && (end != start)
+#ifndef __WXWINCE__
+        && (errno != ERANGE)
+#endif
+    ;
+}
+
+// ---------------------------------------------------------------------------
+// formatted output
+// ---------------------------------------------------------------------------
+
+/* static */
+wxString wxString::Format(const wxChar *pszFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, pszFormat);
+
+    wxString s;
+    s.PrintfV(pszFormat, argptr);
+
+    va_end(argptr);
+
+    return s;
+}
+
+/* static */
+wxString wxString::FormatV(const wxChar *pszFormat, va_list argptr)
+{
+    wxString s;
+    s.PrintfV(pszFormat, argptr);
+    return s;
+}
+
+int wxString::Printf(const wxChar *pszFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, pszFormat);
+
+    int iLen = PrintfV(pszFormat, argptr);
+
+    va_end(argptr);
+
+    return iLen;
+}
+
+/*
+    Uses wxVsnprintf and places the result into the this string.
+
+    In ANSI build, wxVsnprintf is effectively vsnprintf but in Unicode build
+    it is vswprintf.  Due to a discrepancy between vsnprintf and vswprintf in
+    the ISO C99 (and thus SUSv3) standard the return value for the case of
+    an undersized buffer is inconsistent.  For conforming vsnprintf
+    implementations the function must return the number of characters that
+    would have been printed had the buffer been large enough.  For conforming
+    vswprintf implementations the function must return a negative number
+    and set errno.
+
+    What vswprintf sets errno to is undefined but Darwin seems to set it to
+    EOVERFLOW.  The only expected errno are EILSEQ and EINVAL.  Both of
+    those are defined in the standard and backed up by several conformance
+    statements.  Note that ENOMEM mentioned in the manual page does not
+    apply to swprintf, only wprintf and fwprintf.
+
+    Official manual page:
+    http://www.opengroup.org/onlinepubs/009695399/functions/swprintf.html
+
+    Some conformance statements (AIX, Solaris):
+    http://www.opengroup.org/csq/view.mhtml?RID=ibm%2FSD1%2F3
+    http://www.theopengroup.org/csq/view.mhtml?norationale=1&noreferences=1&RID=Fujitsu%2FSE2%2F10
+
+    Since EILSEQ and EINVAL are rather common but EOVERFLOW is not and since
+    EILSEQ and EINVAL are specifically defined to mean the error is other than
+    an undersized buffer and no other errno are defined we treat those two
+    as meaning hard errors and everything else gets the old behavior which
+    is to keep looping and increasing buffer size until the function succeeds.
+ 
+    In practice it's impossible to determine before compilation which behavior
+    may be used.  The vswprintf function may have vsnprintf-like behavior or
+    vice-versa.  Behavior detected on one release can theoretically change
+    with an updated release.  Not to mention that configure testing for it
+    would require the test to be run on the host system, not the build system
+    which makes cross compilation difficult. Therefore, we make no assumptions
+    about behavior and try our best to handle every known case, including the
+    case where wxVsnprintf returns a negative number and fails to set errno.
+
+    There is yet one more non-standard implementation and that is our own.
+    Fortunately, that can be detected at compile-time.
+
+    On top of all that, ISO C99 explicitly defines snprintf to write a null
+    character to the last position of the specified buffer.  That would be at
+    at the given buffer size minus 1.  It is supposed to do this even if it
+    turns out that the buffer is sized too small.
+
+    Darwin (tested on 10.5) follows the C99 behavior exactly.
+
+    Glibc 2.6 almost follows the C99 behavior except vswprintf never sets
+    errno even when it fails.  However, it only seems to ever fail due
+    to an undersized buffer.
+*/
+int wxString::PrintfV(const wxChar* pszFormat, va_list argptr)
+{
+    int size = 1024;
+
+    for ( ;; )
+    {
+        // Allocate 1 more character than we tell wxVsnprintf about
+        // just in case it is buggy.
+        // FIXME: I have a feeling that the underlying function was not buggy
+        // and I suspect it was to fix the buf[size] = '\0' line below
+        wxStringBuffer tmp(*this, size + 1);
+        wxChar *buf = tmp;
+
+        if ( !buf )
+        {
+            // out of memory
+            return -1;
+        }
+
+        // wxVsnprintf() may modify the original arg pointer, so pass it
+        // only a copy
+        va_list argptrcopy;
+        wxVaCopy(argptrcopy, argptr);
+
+#ifndef __WXWINCE__
+        // Set errno to 0 to make it determinate if wxVsnprintf fails to set it.
+        errno = 0;
+#endif
+        int len = wxVsnprintf(buf, size, pszFormat, argptrcopy);
+        va_end(argptrcopy);
+
+        // some implementations of vsnprintf() don't NUL terminate
+        // the string if there is not enough space for it so
+        // always do it manually
+        // FIXME: This really seems to be the wrong and would be an off-by-one
+        // bug except the code above allocates an extra character.
+        buf[size] = _T('\0');
+
+        // vsnprintf() may return either -1 (traditional Unix behaviour) or the
+        // total number of characters which would have been written if the
+        // buffer were large enough (newer standards such as Unix98)
+        if ( len < 0 )
+        {
+#if wxUSE_WXVSNPRINTF
+            // we know that our own implementation of wxVsnprintf() returns -1
+            // only for a format error - thus there's something wrong with
+            // the user's format string
+            return -1;
+#else // assume that system version only returns error if not enough space
+#if !defined(__WXWINCE__) && (!defined(__OS2__) || defined(__INNOTEK_LIBC__))
+            if( (errno == EILSEQ) || (errno == EINVAL) )
+            // If errno was set to one of the two well-known hard errors
+            // then fail immediately to avoid an infinite loop.
+                return -1;
+            else
+#endif // __WXWINCE__
+            // still not enough, as we don't know how much we need, double the
+            // current size of the buffer
+                size *= 2;
+#endif // wxUSE_WXVSNPRINTF/!wxUSE_WXVSNPRINTF
+        }
+        else if ( len >= size )
+        {
+#if wxUSE_WXVSNPRINTF
+            // we know that our own implementation of wxVsnprintf() returns 
+            // size+1 when there's not enough space but that's not the size
+            // of the required buffer!
+            size *= 2;      // so we just double the current size of the buffer
+#else
+            // some vsnprintf() implementations NUL-terminate the buffer and
+            // some don't in len == size case, to be safe always add 1
+            // FIXME: I don't quite understand this comment.  The vsnprintf
+            // function is specifically defined to return the number of
+            // characters printed not including the null terminator.
+            // So OF COURSE you need to add 1 to get the right buffer size.
+            // The following line is definitely correct, no question.
+            size = len + 1;
+#endif
+        }
+        else // ok, there was enough space
+        {
+            break;
+        }
+    }
+
+    // we could have overshot
+    Shrink();
+
+    return length();
+}
+
+// ----------------------------------------------------------------------------
+// misc other operations
+// ----------------------------------------------------------------------------
+
+// returns true if the string matches the pattern which may contain '*' and
+// '?' metacharacters (as usual, '?' matches any character and '*' any number
+// of them)
+bool wxString::Matches(const wxChar *pszMask) const
+{
+    // I disable this code as it doesn't seem to be faster (in fact, it seems
+    // to be much slower) than the old, hand-written code below and using it
+    // here requires always linking with libregex even if the user code doesn't
+    // use it
+#if 0 // wxUSE_REGEX
+    // first translate the shell-like mask into a regex
+    wxString pattern;
+    pattern.reserve(wxStrlen(pszMask));
+
+    pattern += _T('^');
+    while ( *pszMask )
+    {
+        switch ( *pszMask )
+        {
+            case _T('?'):
+                pattern += _T('.');
+                break;
+
+            case _T('*'):
+                pattern += _T(".*");
+                break;
+
+            case _T('^'):
+            case _T('.'):
+            case _T('$'):
+            case _T('('):
+            case _T(')'):
+            case _T('|'):
+            case _T('+'):
+            case _T('\\'):
+                // these characters are special in a RE, quote them
+                // (however note that we don't quote '[' and ']' to allow
+                // using them for Unix shell like matching)
+                pattern += _T('\\');
+                // fall through
+
+            default:
+                pattern += *pszMask;
+        }
+
+        pszMask++;
+    }
+    pattern += _T('$');
+
+    // and now use it
+    return wxRegEx(pattern, wxRE_NOSUB | wxRE_EXTENDED).Matches(c_str());
+#else // !wxUSE_REGEX
+  // TODO: this is, of course, awfully inefficient...
+
+  // the char currently being checked
+  const wxChar *pszTxt = c_str();
+
+  // the last location where '*' matched
+  const wxChar *pszLastStarInText = NULL;
+  const wxChar *pszLastStarInMask = NULL;
+
+match:
+  for ( ; *pszMask != wxT('\0'); pszMask++, pszTxt++ ) {
+    switch ( *pszMask ) {
+      case wxT('?'):
+        if ( *pszTxt == wxT('\0') )
+          return false;
+
+        // pszTxt and pszMask will be incremented in the loop statement
+
+        break;
+
+      case wxT('*'):
+        {
+          // remember where we started to be able to backtrack later
+          pszLastStarInText = pszTxt;
+          pszLastStarInMask = pszMask;
+
+          // ignore special chars immediately following this one
+          // (should this be an error?)
+          while ( *pszMask == wxT('*') || *pszMask == wxT('?') )
+            pszMask++;
+
+          // if there is nothing more, match
+          if ( *pszMask == wxT('\0') )
+            return true;
+
+          // are there any other metacharacters in the mask?
+          size_t uiLenMask;
+          const wxChar *pEndMask = wxStrpbrk(pszMask, wxT("*?"));
+
+          if ( pEndMask != NULL ) {
+            // we have to match the string between two metachars
+            uiLenMask = pEndMask - pszMask;
+          }
+          else {
+            // we have to match the remainder of the string
+            uiLenMask = wxStrlen(pszMask);
+          }
+
+          wxString strToMatch(pszMask, uiLenMask);
+          const wxChar* pMatch = wxStrstr(pszTxt, strToMatch);
+          if ( pMatch == NULL )
+            return false;
+
+          // -1 to compensate "++" in the loop
+          pszTxt = pMatch + uiLenMask - 1;
+          pszMask += uiLenMask - 1;
+        }
+        break;
+
+      default:
+        if ( *pszMask != *pszTxt )
+          return false;
+        break;
+    }
+  }
+
+  // match only if nothing left
+  if ( *pszTxt == wxT('\0') )
+    return true;
+
+  // if we failed to match, backtrack if we can
+  if ( pszLastStarInText ) {
+    pszTxt = pszLastStarInText + 1;
+    pszMask = pszLastStarInMask;
+
+    pszLastStarInText = NULL;
+
+    // don't bother resetting pszLastStarInMask, it's unnecessary
+
+    goto match;
+  }
+
+  return false;
+#endif // wxUSE_REGEX/!wxUSE_REGEX
+}
+
+// Count the number of chars
+int wxString::Freq(wxChar ch) const
+{
+    int count = 0;
+    int len = length();
+    for (int i = 0; i < len; i++)
+    {
+        if (GetChar(i) == ch)
+            count ++;
+    }
+    return count;
+}
+
+// convert to upper case, return the copy of the string
+wxString wxString::Upper() const
+{ wxString s(*this); return s.MakeUpper(); }
+
+// convert to lower case, return the copy of the string
+wxString wxString::Lower() const { wxString s(*this); return s.MakeLower(); }
+
+int wxString::sprintf(const wxChar *pszFormat, ...)
+  {
+    va_list argptr;
+    va_start(argptr, pszFormat);
+    int iLen = PrintfV(pszFormat, argptr);
+    va_end(argptr);
+    return iLen;
+  }
+
+// ============================================================================
+// ArrayString
+// ============================================================================
+
+#include "wx/arrstr.h"
+
+wxArrayString::wxArrayString(size_t sz, const wxChar** a)
+{
+#if !wxUSE_STL
+    Init(false);
+#endif
+    for (size_t i=0; i < sz; i++)
+        Add(a[i]);
+}
+
+wxArrayString::wxArrayString(size_t sz, const wxString* a)
+{
+#if !wxUSE_STL
+    Init(false);
+#endif
+    for (size_t i=0; i < sz; i++)
+        Add(a[i]);
+}
+
+#if !wxUSE_STL
+
+// size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
+#define   ARRAY_MAXSIZE_INCREMENT       4096
+
+#ifndef   ARRAY_DEFAULT_INITIAL_SIZE    // also defined in dynarray.h
+#define   ARRAY_DEFAULT_INITIAL_SIZE    (16)
+#endif
+
+#define   STRING(p)   ((wxString *)(&(p)))
+
+// ctor
+void wxArrayString::Init(bool autoSort)
+{
+  m_nSize  =
+  m_nCount = 0;
+  m_pItems = (wxChar **) NULL;
+  m_autoSort = autoSort;
+}
+
+// copy ctor
+wxArrayString::wxArrayString(const wxArrayString& src)
+{
+  Init(src.m_autoSort);
+
+  *this = src;
+}
+
+// assignment operator
+wxArrayString& wxArrayString::operator=(const wxArrayString& src)
+{
+  if ( m_nSize > 0 )
+    Clear();
+
+  Copy(src);
+
+  m_autoSort = src.m_autoSort;
+
+  return *this;
+}
+
+void wxArrayString::Copy(const wxArrayString& src)
+{
+  if ( src.m_nCount > ARRAY_DEFAULT_INITIAL_SIZE )
+    Alloc(src.m_nCount);
+
+  for ( size_t n = 0; n < src.m_nCount; n++ )
+    Add(src[n]);
+}
+
+// grow the array
+void wxArrayString::Grow(size_t nIncrement)
+{
+  // only do it if no more place
+  if ( (m_nSize - m_nCount) < nIncrement ) {
+    // if ARRAY_DEFAULT_INITIAL_SIZE were set to 0, the initially empty would
+    // be never resized!
+    #if ARRAY_DEFAULT_INITIAL_SIZE == 0
+      #error "ARRAY_DEFAULT_INITIAL_SIZE must be > 0!"
+    #endif
+
+    if ( m_nSize == 0 ) {
+      // was empty, alloc some memory
+      m_nSize = ARRAY_DEFAULT_INITIAL_SIZE;
+      if (m_nSize < nIncrement)
+          m_nSize = nIncrement;
+      m_pItems = new wxChar *[m_nSize];
+    }
+    else {
+      // otherwise when it's called for the first time, nIncrement would be 0
+      // and the array would never be expanded
+      // add 50% but not too much
+      size_t ndefIncrement = m_nSize < ARRAY_DEFAULT_INITIAL_SIZE
+                          ? ARRAY_DEFAULT_INITIAL_SIZE : m_nSize >> 1;
+      if ( ndefIncrement > ARRAY_MAXSIZE_INCREMENT )
+        ndefIncrement = ARRAY_MAXSIZE_INCREMENT;
+      if ( nIncrement < ndefIncrement )
+        nIncrement = ndefIncrement;
+      m_nSize += nIncrement;
+      wxChar **pNew = new wxChar *[m_nSize];
+
+      // copy data to new location
+      memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
+
+      // delete old memory (but do not release the strings!)
+      wxDELETEA(m_pItems);
+
+      m_pItems = pNew;
+    }
+  }
+}
+
+void wxArrayString::Free()
+{
+  for ( size_t n = 0; n < m_nCount; n++ ) {
+    STRING(m_pItems[n])->GetStringData()->Unlock();
+  }
+}
+
+// deletes all the strings from the list
+void wxArrayString::Empty()
+{
+  Free();
+
+  m_nCount = 0;
+}
+
+// as Empty, but also frees memory
+void wxArrayString::Clear()
+{
+  Free();
+
+  m_nSize  =
+  m_nCount = 0;
+
+  wxDELETEA(m_pItems);
+}
+
+// dtor
+wxArrayString::~wxArrayString()
+{
+  Free();
+
+  wxDELETEA(m_pItems);
+}
+
+void wxArrayString::reserve(size_t nSize)
+{
+    Alloc(nSize);
+}
+
+// pre-allocates memory (frees the previous data!)
+void wxArrayString::Alloc(size_t nSize)
+{
+  // only if old buffer was not big enough
+  if ( nSize > m_nSize ) {
+    wxChar **pNew = new wxChar *[nSize];
+    if ( !pNew )
+        return;
+
+    memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
+    delete [] m_pItems;
+
+    m_pItems = pNew;
+    m_nSize  = nSize;
+  }
+}
+
+// minimizes the memory usage by freeing unused memory
+void wxArrayString::Shrink()
+{
+  // only do it if we have some memory to free
+  if( m_nCount < m_nSize ) {
+    // allocates exactly as much memory as we need
+    wxChar **pNew = new wxChar *[m_nCount];
+
+    // copy data to new location
+    memcpy(pNew, m_pItems, m_nCount*sizeof(wxChar *));
+    delete [] m_pItems;
+    m_pItems = pNew;
+    m_nSize = m_nCount;
+  }
+}
+
+#if WXWIN_COMPATIBILITY_2_4
+
+// return a wxString[] as required for some control ctors.
+wxString* wxArrayString::GetStringArray() const
+{
+    wxString *array = 0;
+
+    if( m_nCount > 0 )
+    {
+        array = new wxString[m_nCount];
+        for( size_t i = 0; i < m_nCount; i++ )
+            array[i] = m_pItems[i];
+    }
+
+    return array;
+}
+
+void wxArrayString::Remove(size_t nIndex, size_t nRemove)
+{
+    RemoveAt(nIndex, nRemove);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
+// searches the array for an item (forward or backwards)
+int wxArrayString::Index(const wxChar *sz, bool bCase, bool bFromEnd) const
+{
+  if ( m_autoSort ) {
+    // use binary search in the sorted array
+    wxASSERT_MSG( bCase && !bFromEnd,
+                  wxT("search parameters ignored for auto sorted array") );
+
+    size_t i,
+           lo = 0,
+           hi = m_nCount;
+    int res;
+    while ( lo < hi ) {
+      i = (lo + hi)/2;
+
+      res = wxStrcmp(sz, m_pItems[i]);
+      if ( res < 0 )
+        hi = i;
+      else if ( res > 0 )
+        lo = i + 1;
+      else
+        return i;
+    }
+
+    return wxNOT_FOUND;
+  }
+  else {
+    // use linear search in unsorted array
+    if ( bFromEnd ) {
+      if ( m_nCount > 0 ) {
+        size_t ui = m_nCount;
+        do {
+          if ( STRING(m_pItems[--ui])->IsSameAs(sz, bCase) )
+            return ui;
+        }
+        while ( ui != 0 );
+      }
+    }
+    else {
+      for( size_t ui = 0; ui < m_nCount; ui++ ) {
+        if( STRING(m_pItems[ui])->IsSameAs(sz, bCase) )
+          return ui;
+      }
+    }
+  }
+
+  return wxNOT_FOUND;
+}
+
+// add item at the end
+size_t wxArrayString::Add(const wxString& str, size_t nInsert)
+{
+  if ( m_autoSort ) {
+    // insert the string at the correct position to keep the array sorted
+    size_t i,
+           lo = 0,
+           hi = m_nCount;
+    int res;
+    while ( lo < hi ) {
+      i = (lo + hi)/2;
+
+      res = str.Cmp(m_pItems[i]);
+      if ( res < 0 )
+        hi = i;
+      else if ( res > 0 )
+        lo = i + 1;
+      else {
+        lo = hi = i;
+        break;
+      }
+    }
+
+    wxASSERT_MSG( lo == hi, wxT("binary search broken") );
+
+    Insert(str, lo, nInsert);
+
+    return (size_t)lo;
+  }
+  else {
+    wxASSERT( str.GetStringData()->IsValid() );
+
+    Grow(nInsert);
+
+    for (size_t i = 0; i < nInsert; i++)
+    {
+        // the string data must not be deleted!
+        str.GetStringData()->Lock();
+
+        // just append
+        m_pItems[m_nCount + i] = (wxChar *)str.c_str(); // const_cast
+    }
+    size_t ret = m_nCount;
+    m_nCount += nInsert;
+    return ret;
+  }
+}
+
+// add item at the given position
+void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert)
+{
+  wxASSERT( str.GetStringData()->IsValid() );
+
+  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArrayString::Insert") );
+  wxCHECK_RET( m_nCount <= m_nCount + nInsert,
+               wxT("array size overflow in wxArrayString::Insert") );
+
+  Grow(nInsert);
+
+  memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex],
+          (m_nCount - nIndex)*sizeof(wxChar *));
+
+  for (size_t i = 0; i < nInsert; i++)
+  {
+      str.GetStringData()->Lock();
+      m_pItems[nIndex + i] = (wxChar *)str.c_str();
+  }
+  m_nCount += nInsert;
+}
+
+// range insert (STL 23.2.4.3)
+void
+wxArrayString::insert(iterator it, const_iterator first, const_iterator last)
+{
+    const int idx = it - begin();
+
+    // grow it once
+    Grow(last - first);
+
+    // reset "it" since it can change inside Grow()
+    it = begin() + idx;
+
+    while ( first != last )
+    {
+        it = insert(it, *first);
+
+        // insert returns an iterator to the last element inserted but we need
+        // insert the next after this one, that is before the next one
+        ++it;
+
+        ++first;
+    }
+}
+
+// expand the array
+void wxArrayString::SetCount(size_t count)
+{
+    Alloc(count);
+
+    wxString s;
+    while ( m_nCount < count )
+        m_pItems[m_nCount++] = (wxChar *)s.c_str();
+}
+
+// removes item from array (by index)
+void wxArrayString::RemoveAt(size_t nIndex, size_t nRemove)
+{
+  wxCHECK_RET( nIndex < m_nCount, wxT("bad index in wxArrayString::Remove") );
+  wxCHECK_RET( nIndex + nRemove <= m_nCount,
+               wxT("removing too many elements in wxArrayString::Remove") );
+
+  // release our lock
+  for (size_t i = 0; i < nRemove; i++)
+      Item(nIndex + i).GetStringData()->Unlock();
+
+  memmove(&m_pItems[nIndex], &m_pItems[nIndex + nRemove],
+          (m_nCount - nIndex - nRemove)*sizeof(wxChar *));
+  m_nCount -= nRemove;
+}
+
+// removes item from array (by value)
+void wxArrayString::Remove(const wxChar *sz)
+{
+  int iIndex = Index(sz);
+
+  wxCHECK_RET( iIndex != wxNOT_FOUND,
+               wxT("removing inexistent element in wxArrayString::Remove") );
+
+  RemoveAt(iIndex);
+}
+
+void wxArrayString::assign(const_iterator first, const_iterator last)
+{
+    reserve(last - first);
+    for(; first != last; ++first)
+        push_back(*first);
+}
+
+// ----------------------------------------------------------------------------
+// sorting
+// ----------------------------------------------------------------------------
+
+// we can only sort one array at a time with the quick-sort based
+// implementation
+#if wxUSE_THREADS
+  // need a critical section to protect access to gs_compareFunction and
+  // gs_sortAscending variables
+  static wxCriticalSection gs_critsectStringSort;
+#endif // wxUSE_THREADS
+
+// function to use for string comparaison
+static wxArrayString::CompareFunction gs_compareFunction = NULL;
+
+// if we don't use the compare function, this flag tells us if we sort the
+// array in ascending or descending order
+static bool gs_sortAscending = true;
+
+// function which is called by quick sort
+extern "C" int wxC_CALLING_CONV     // LINKAGEMODE
+wxStringCompareFunction(const void *first, const void *second)
+{
+  wxString *strFirst = (wxString *)first;
+  wxString *strSecond = (wxString *)second;
+
+  if ( gs_compareFunction ) {
+    return gs_compareFunction(*strFirst, *strSecond);
+  }
+  else {
+    // maybe we should use wxStrcoll
+    int result = strFirst->Cmp(*strSecond);
+
+    return gs_sortAscending ? result : -result;
+  }
+}
+
+// sort array elements using passed comparaison function
+void wxArrayString::Sort(CompareFunction compareFunction)
+{
+  wxCRIT_SECT_LOCKER(lockCmpFunc, gs_critsectStringSort);
+
+  wxASSERT( !gs_compareFunction );  // must have been reset to NULL
+  gs_compareFunction = compareFunction;
+
+  DoSort();
+
+  // reset it to NULL so that Sort(bool) will work the next time
+  gs_compareFunction = NULL;
+}
+
+extern "C"
+{
+    typedef int (wxC_CALLING_CONV * wxStringCompareFn)(const void *first,
+                                                       const void *second);
+}
+
+void wxArrayString::Sort(CompareFunction2 compareFunction)
+{
+  qsort(m_pItems, m_nCount, sizeof(wxChar *), (wxStringCompareFn)compareFunction);
+}
+
+void wxArrayString::Sort(bool reverseOrder)
+{
+  Sort(reverseOrder ? wxStringSortDescending : wxStringSortAscending);
+}
+
+void wxArrayString::DoSort()
+{
+  wxCHECK_RET( !m_autoSort, wxT("can't use this method with sorted arrays") );
+
+  // just sort the pointers using qsort() - of course it only works because
+  // wxString() *is* a pointer to its data
+  qsort(m_pItems, m_nCount, sizeof(wxChar *), wxStringCompareFunction);
+}
+
+bool wxArrayString::operator==(const wxArrayString& a) const
+{
+    if ( m_nCount != a.m_nCount )
+        return false;
+
+    for ( size_t n = 0; n < m_nCount; n++ )
+    {
+        if ( Item(n) != a[n] )
+            return false;
+    }
+
+    return true;
+}
+
+#endif // !wxUSE_STL
+
+int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2)
+{
+    return  s1->Cmp(*s2);
+}
+
+int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
+{
+    return -s1->Cmp(*s2);
+}
+
+wxString* wxCArrayString::Release()
+{
+    wxString *r = GetStrings();
+    m_strings = NULL;
+    return r;
+}
diff --git a/Source/3rd Party/wx/src/common/stringimpl.cpp b/Source/3rd Party/wx/src/common/stringimpl.cpp
deleted file mode 100644
index 383d9f68b..000000000
--- a/Source/3rd Party/wx/src/common/stringimpl.cpp	
+++ /dev/null
@@ -1,799 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/stringimpl.cpp
-// Purpose:     wxString class
-// Author:      Vadim Zeitlin, Ryan Norton
-// Modified by:
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-//              (c) 2004 Ryan Norton <wxprojects@comcast.net>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-/*
- * About ref counting:
- *  1) all empty strings use g_strEmpty, nRefs = -1 (set in Init())
- *  2) AllocBuffer() sets nRefs to 1, Lock() increments it by one
- *  3) Unlock() decrements nRefs and frees memory if it goes to 0
- */
-
-// ===========================================================================
-// headers, declarations, constants
-// ===========================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/stringimpl.h"
-    #include "wx/wxcrt.h"
-#endif
-
-#include <ctype.h>
-
-#ifndef __WXWINCE__
-    #include <errno.h>
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-
-// allocating extra space for each string consumes more memory but speeds up
-// the concatenation operations (nLen is the current string's length)
-// NB: EXTRA_ALLOC must be >= 0!
-#define EXTRA_ALLOC       (19 - nLen % 16)
-
-
-// string handling functions used by wxString:
-#if wxUSE_UNICODE_UTF8
-    #define wxStringMemcpy   memcpy
-    #define wxStringMemcmp   memcmp
-    #define wxStringMemchr   memchr
-#else
-    #define wxStringMemcpy   wxTmemcpy
-    #define wxStringMemcmp   wxTmemcmp
-    #define wxStringMemchr   wxTmemchr
-#endif
-
-
-// ---------------------------------------------------------------------------
-// static class variables definition
-// ---------------------------------------------------------------------------
-
-#if !wxUSE_STL_BASED_WXSTRING
-//According to STL _must_ be a -1 size_t
-const size_t wxStringImpl::npos = (size_t) -1;
-#endif
-
-// ----------------------------------------------------------------------------
-// static data
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STL_BASED_WXSTRING
-
-// FIXME-UTF8: get rid of this, have only one wxEmptyString
-#if wxUSE_UNICODE_UTF8
-const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyStringImpl = "";
-#endif
-const wxChar WXDLLIMPEXP_BASE *wxEmptyString = wxT("");
-
-#else
-
-// for an empty string, GetStringData() will return this address: this
-// structure has the same layout as wxStringData and it's data() method will
-// return the empty string (dummy pointer)
-static const struct
-{
-  wxStringData data;
-  wxStringCharType dummy;
-} g_strEmpty = { {-1, 0, 0}, wxT('\0') };
-
-// empty C style string: points to 'string data' byte of g_strEmpty
-#if wxUSE_UNICODE_UTF8
-// FIXME-UTF8: get rid of this, have only one wxEmptyString
-const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyStringImpl = &g_strEmpty.dummy;
-const wxChar WXDLLIMPEXP_BASE *wxEmptyString = wxT("");
-#else
-const wxStringCharType WXDLLIMPEXP_BASE *wxEmptyString = &g_strEmpty.dummy;
-#endif
-
-#endif
-
-
-#if !wxUSE_STL_BASED_WXSTRING
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-// this small class is used to gather statistics for performance tuning
-
-// uncomment this to enable gathering of some statistics about wxString
-// efficiency
-//#define WXSTRING_STATISTICS
-
-#ifdef  WXSTRING_STATISTICS
-  class Averager
-  {
-  public:
-    Averager(const wxStringCharType *sz) { m_sz = sz; m_nTotal = m_nCount = 0; }
-   ~Averager()
-    {
-        wxPrintf("wxString %s: total = %lu, average = %f\n",
-                 m_sz, m_nTotal, ((float)m_nTotal)/m_nCount);
-    }
-
-    void Add(size_t n) { m_nTotal += n; m_nCount++; }
-
-  private:
-    unsigned long m_nCount, m_nTotal;
-    const wxStringCharType *m_sz;
-  } g_averageLength("allocation size"),
-    g_averageSummandLength("summand length"),
-    g_averageConcatHit("hit probability in concat"),
-    g_averageInitialLength("initial string length");
-
-  #define STATISTICS_ADD(av, val) g_average##av.Add(val)
-#else
-  #define STATISTICS_ADD(av, val)
-#endif // WXSTRING_STATISTICS
-
-// ===========================================================================
-// wxStringData class deallocation
-// ===========================================================================
-
-#if defined(__VISUALC__) && defined(_MT) && !defined(_DLL)
-#  pragma message (__FILE__ ": building with Multithreaded non DLL runtime has a performance impact on wxString!")
-void wxStringData::Free()
-{
-    free(this);
-}
-#endif
-
-// ===========================================================================
-// wxStringImpl
-// ===========================================================================
-
-// takes nLength elements of psz starting at nPos
-void wxStringImpl::InitWith(const wxStringCharType *psz,
-                            size_t nPos, size_t nLength)
-{
-  Init();
-
-  // if the length is not given, assume the string to be NUL terminated
-  if ( nLength == npos ) {
-    wxASSERT_MSG( nPos <= wxStrlen(psz), wxT("index out of bounds") );
-
-    nLength = wxStrlen(psz + nPos);
-  }
-
-  STATISTICS_ADD(InitialLength, nLength);
-
-  if ( nLength > 0 ) {
-    // trailing '\0' is written in AllocBuffer()
-    if ( !AllocBuffer(nLength) ) {
-      wxFAIL_MSG( wxT("out of memory in wxStringImpl::InitWith") );
-      return;
-    }
-    wxStringMemcpy(m_pchData, psz + nPos, nLength);
-  }
-}
-
-wxStringImpl::wxStringImpl(const_iterator first, const_iterator last)
-{
-  if ( last >= first )
-  {
-    InitWith(first.GetPtr(), 0, last - first);
-  }
-  else
-  {
-    wxFAIL_MSG( wxT("first must be before last") );
-    Init();
-  }
-}
-
-wxStringImpl::wxStringImpl(size_type n, wxStringCharType ch)
-{
-  Init();
-  append(n, ch);
-}
-
-// ---------------------------------------------------------------------------
-// memory allocation
-// ---------------------------------------------------------------------------
-
-// allocates memory needed to store a C string of length nLen
-bool wxStringImpl::AllocBuffer(size_t nLen)
-{
-  // allocating 0 sized buffer doesn't make sense, all empty strings should
-  // reuse g_strEmpty
-  wxASSERT( nLen >  0 );
-
-  // make sure that we don't overflow
-  wxCHECK( nLen < (INT_MAX / sizeof(wxStringCharType)) -
-                  (sizeof(wxStringData) + EXTRA_ALLOC + 1), false );
-
-  STATISTICS_ADD(Length, nLen);
-
-  // allocate memory:
-  // 1) one extra character for '\0' termination
-  // 2) sizeof(wxStringData) for housekeeping info
-  wxStringData* pData = (wxStringData*)
-    malloc(sizeof(wxStringData) + (nLen + EXTRA_ALLOC + 1)*sizeof(wxStringCharType));
-
-  if ( pData == NULL ) {
-    // allocation failures are handled by the caller
-    return false;
-  }
-
-  pData->nRefs        = 1;
-  pData->nDataLength  = nLen;
-  pData->nAllocLength = nLen + EXTRA_ALLOC;
-  m_pchData           = pData->data();  // data starts after wxStringData
-  m_pchData[nLen]     = wxT('\0');
-  return true;
-}
-
-// must be called before changing this string
-bool wxStringImpl::CopyBeforeWrite()
-{
-  wxStringData* pData = GetStringData();
-
-  if ( pData->IsShared() ) {
-    pData->Unlock();                // memory not freed because shared
-    size_t nLen = pData->nDataLength;
-    if ( !AllocBuffer(nLen) ) {
-      // allocation failures are handled by the caller
-      return false;
-    }
-    wxStringMemcpy(m_pchData, pData->data(), nLen);
-  }
-
-  wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
-
-  return true;
-}
-
-// must be called before replacing contents of this string
-bool wxStringImpl::AllocBeforeWrite(size_t nLen)
-{
-  wxASSERT( nLen != 0 );  // doesn't make any sense
-
-  // must not share string and must have enough space
-  wxStringData* pData = GetStringData();
-  if ( pData->IsShared() || pData->IsEmpty() ) {
-    // can't work with old buffer, get new one
-    pData->Unlock();
-    if ( !AllocBuffer(nLen) ) {
-      // allocation failures are handled by the caller
-      return false;
-    }
-  }
-  else {
-    if ( nLen > pData->nAllocLength ) {
-      // realloc the buffer instead of calling malloc() again, this is more
-      // efficient
-      STATISTICS_ADD(Length, nLen);
-
-      nLen += EXTRA_ALLOC;
-
-      pData = (wxStringData*)
-          realloc(pData,
-                  sizeof(wxStringData) + (nLen + 1)*sizeof(wxStringCharType));
-
-      if ( pData == NULL ) {
-        // allocation failures are handled by the caller
-        // keep previous data since reallocation failed
-        return false;
-      }
-
-      pData->nAllocLength = nLen;
-      m_pchData = pData->data();
-    }
-  }
-
-  wxASSERT( !GetStringData()->IsShared() );  // we must be the only owner
-
-  // it doesn't really matter what the string length is as it's going to be
-  // overwritten later but, for extra safety, set it to 0 for now as we may
-  // have some junk in m_pchData
-  GetStringData()->nDataLength = 0;
-
-  return true;
-}
-
-wxStringImpl& wxStringImpl::append(size_t n, wxStringCharType ch)
-{
-    size_type len = length();
-
-    if ( !Alloc(len + n) || !CopyBeforeWrite() ) {
-      wxFAIL_MSG( wxT("out of memory in wxStringImpl::append") );
-      return *this;
-    }
-    GetStringData()->nDataLength = len + n;
-    m_pchData[len + n] = '\0';
-    for ( size_t i = 0; i < n; ++i )
-        m_pchData[len + i] = ch;
-    return *this;
-}
-
-void wxStringImpl::resize(size_t nSize, wxStringCharType ch)
-{
-    size_t len = length();
-
-    if ( nSize < len )
-    {
-        erase(begin() + nSize, end());
-    }
-    else if ( nSize > len )
-    {
-        append(nSize - len, ch);
-    }
-    //else: we have exactly the specified length, nothing to do
-}
-
-// allocate enough memory for nLen characters
-bool wxStringImpl::Alloc(size_t nLen)
-{
-  wxStringData *pData = GetStringData();
-  if ( pData->nAllocLength <= nLen ) {
-    if ( pData->IsEmpty() ) {
-      STATISTICS_ADD(Length, nLen);
-
-      nLen += EXTRA_ALLOC;
-
-      pData = (wxStringData *)
-             malloc(sizeof(wxStringData) + (nLen + 1)*sizeof(wxStringCharType));
-
-      if ( pData == NULL ) {
-        // allocation failure handled by caller
-        return false;
-      }
-
-      pData->nRefs = 1;
-      pData->nDataLength = 0;
-      pData->nAllocLength = nLen;
-      m_pchData = pData->data();  // data starts after wxStringData
-      m_pchData[0u] = wxT('\0');
-    }
-    else if ( pData->IsShared() ) {
-      pData->Unlock();                // memory not freed because shared
-      size_t nOldLen = pData->nDataLength;
-      if ( !AllocBuffer(nLen) ) {
-        // allocation failure handled by caller
-        return false;
-      }
-      // +1 to copy the terminator, too
-      memcpy(m_pchData, pData->data(), (nOldLen+1)*sizeof(wxStringCharType));
-      GetStringData()->nDataLength = nOldLen;
-    }
-    else {
-      nLen += EXTRA_ALLOC;
-
-      pData = (wxStringData *)
-        realloc(pData, sizeof(wxStringData) + (nLen + 1)*sizeof(wxStringCharType));
-
-      if ( pData == NULL ) {
-        // allocation failure handled by caller
-        // keep previous data since reallocation failed
-        return false;
-      }
-
-      // it's not important if the pointer changed or not (the check for this
-      // is not faster than assigning to m_pchData in all cases)
-      pData->nAllocLength = nLen;
-      m_pchData = pData->data();
-    }
-  }
-  //else: we've already got enough
-  return true;
-}
-
-wxStringImpl::iterator wxStringImpl::begin()
-{
-    if ( !empty() )
-        CopyBeforeWrite();
-    return m_pchData;
-}
-
-wxStringImpl::iterator wxStringImpl::end()
-{
-    if ( !empty() )
-        CopyBeforeWrite();
-    return m_pchData + length();
-}
-
-wxStringImpl::iterator wxStringImpl::erase(iterator it)
-{
-    size_type idx = it - begin();
-    erase(idx, 1);
-    return begin() + idx;
-}
-
-wxStringImpl& wxStringImpl::erase(size_t nStart, size_t nLen)
-{
-    wxASSERT(nStart <= length());
-    size_t strLen = length() - nStart;
-    // delete nLen or up to the end of the string characters
-    nLen = strLen < nLen ? strLen : nLen;
-    wxStringImpl strTmp(c_str(), nStart);
-    strTmp.append(c_str() + nStart + nLen, length() - nStart - nLen);
-
-    swap(strTmp);
-    return *this;
-}
-
-wxStringImpl& wxStringImpl::insert(size_t nPos,
-                                   const wxStringCharType *sz, size_t n)
-{
-    wxASSERT( nPos <= length() );
-
-    if ( n == npos ) n = wxStrlen(sz);
-    if ( n == 0 ) return *this;
-
-    if ( !Alloc(length() + n) || !CopyBeforeWrite() ) {
-        wxFAIL_MSG( wxT("out of memory in wxStringImpl::insert") );
-        return *this;
-    }
-
-    memmove(m_pchData + nPos + n, m_pchData + nPos,
-            (length() - nPos) * sizeof(wxStringCharType));
-    memcpy(m_pchData + nPos, sz, n * sizeof(wxStringCharType));
-    GetStringData()->nDataLength = length() + n;
-    m_pchData[length()] = '\0';
-
-    return *this;
-}
-
-void wxStringImpl::swap(wxStringImpl& str)
-{
-    wxStringCharType* tmp = str.m_pchData;
-    str.m_pchData = m_pchData;
-    m_pchData = tmp;
-}
-
-size_t wxStringImpl::find(const wxStringImpl& str, size_t nStart) const
-{
-    // deal with the special case of empty string first
-    const size_t nLen = length();
-    const size_t nLenOther = str.length();
-
-    if ( !nLenOther )
-    {
-        // empty string is a substring of anything
-        return 0;
-    }
-
-    if ( !nLen )
-    {
-        // the other string is non empty so can't be our substring
-        return npos;
-    }
-
-    wxASSERT( str.GetStringData()->IsValid() );
-    wxASSERT( nStart <= nLen );
-
-    const wxStringCharType * const other = str.c_str();
-
-    // anchor
-    const wxStringCharType* p =
-        (const wxStringCharType*)wxStringMemchr(c_str() + nStart,
-                                                *other,
-                                                nLen - nStart);
-
-    if ( !p )
-        return npos;
-
-    while ( p - c_str() + nLenOther <= nLen &&
-            wxStringMemcmp(p, other, nLenOther) )
-    {
-        p++;
-
-        // anchor again
-        p = (const wxStringCharType*)
-                wxStringMemchr(p, *other, nLen - (p - c_str()));
-
-        if ( !p )
-            return npos;
-    }
-
-    return p - c_str() + nLenOther <= nLen ? p - c_str() : npos;
-}
-
-size_t wxStringImpl::find(const wxStringCharType* sz,
-                          size_t nStart, size_t n) const
-{
-    return find(wxStringImpl(sz, n), nStart);
-}
-
-size_t wxStringImpl::find(wxStringCharType ch, size_t nStart) const
-{
-    wxASSERT( nStart <= length() );
-
-    const wxStringCharType *p = (const wxStringCharType*)
-        wxStringMemchr(c_str() + nStart, ch, length() - nStart);
-
-    return p == NULL ? npos : p - c_str();
-}
-
-size_t wxStringImpl::rfind(const wxStringImpl& str, size_t nStart) const
-{
-    wxASSERT( str.GetStringData()->IsValid() );
-    wxASSERT( nStart == npos || nStart <= length() );
-
-    if ( length() >= str.length() )
-    {
-        // avoids a corner case later
-        if ( empty() && str.empty() )
-            return 0;
-
-        // "top" is the point where search starts from
-        size_t top = length() - str.length();
-
-        if ( nStart == npos )
-            nStart = length() - 1;
-        if ( nStart < top )
-            top = nStart;
-
-        const wxStringCharType *cursor = c_str() + top;
-        do
-        {
-            if ( wxStringMemcmp(cursor, str.c_str(), str.length()) == 0 )
-            {
-                return cursor - c_str();
-            }
-        } while ( cursor-- > c_str() );
-    }
-
-    return npos;
-}
-
-size_t wxStringImpl::rfind(const wxStringCharType* sz,
-                           size_t nStart, size_t n) const
-{
-    return rfind(wxStringImpl(sz, n), nStart);
-}
-
-size_t wxStringImpl::rfind(wxStringCharType ch, size_t nStart) const
-{
-    if ( nStart == npos )
-    {
-        nStart = length();
-    }
-    else
-    {
-        wxASSERT( nStart <= length() );
-    }
-
-    const wxStringCharType *actual;
-    for ( actual = c_str() + ( nStart == npos ? length() : nStart + 1 );
-          actual > c_str(); --actual )
-    {
-        if ( *(actual - 1) == ch )
-            return (actual - 1) - c_str();
-    }
-
-    return npos;
-}
-
-wxStringImpl& wxStringImpl::replace(size_t nStart, size_t nLen,
-                                    const wxStringCharType *sz, size_t nCount)
-{
-    // check and adjust parameters
-    const size_t lenOld = length();
-
-    wxASSERT_MSG( nStart <= lenOld,
-                  wxT("index out of bounds in wxStringImpl::replace") );
-    size_t nEnd = nStart + nLen;
-    if ( nLen > lenOld - nStart )
-    {
-        // nLen may be out of range, as it can be npos, just clump it down
-        nLen = lenOld - nStart;
-        nEnd = lenOld;
-    }
-
-    if ( nCount == npos )
-        nCount = wxStrlen(sz);
-
-    // build the new string from 3 pieces: part of this string before nStart,
-    // the new substring and the part of this string after nStart+nLen
-    wxStringImpl tmp;
-    const size_t lenNew = lenOld + nCount - nLen;
-    if ( lenNew )
-    {
-        tmp.AllocBuffer(lenOld + nCount - nLen);
-
-        wxStringCharType *dst = tmp.m_pchData;
-        memcpy(dst, m_pchData, nStart*sizeof(wxStringCharType));
-        dst += nStart;
-
-        memcpy(dst, sz, nCount*sizeof(wxStringCharType));
-        dst += nCount;
-
-        memcpy(dst, m_pchData + nEnd, (lenOld - nEnd)*sizeof(wxStringCharType));
-    }
-
-    // and replace this string contents with the new one
-    swap(tmp);
-    return *this;
-}
-
-wxStringImpl wxStringImpl::substr(size_t nStart, size_t nLen) const
-{
-  if ( nLen == npos )
-    nLen = length() - nStart;
-  return wxStringImpl(*this, nStart, nLen);
-}
-
-// assigns one string to another
-wxStringImpl& wxStringImpl::operator=(const wxStringImpl& stringSrc)
-{
-  wxASSERT( stringSrc.GetStringData()->IsValid() );
-
-  // don't copy string over itself
-  if ( m_pchData != stringSrc.m_pchData ) {
-    if ( stringSrc.GetStringData()->IsEmpty() ) {
-      Reinit();
-    }
-    else {
-      // adjust references
-      GetStringData()->Unlock();
-      m_pchData = stringSrc.m_pchData;
-      GetStringData()->Lock();
-    }
-  }
-
-  return *this;
-}
-
-// assigns a single character
-wxStringImpl& wxStringImpl::operator=(wxStringCharType ch)
-{
-  wxStringCharType c(ch);
-  if ( !AssignCopy(1, &c) ) {
-    wxFAIL_MSG( wxT("out of memory in wxStringImpl::operator=(wxStringCharType)") );
-  }
-  return *this;
-}
-
-// assigns C string
-wxStringImpl& wxStringImpl::operator=(const wxStringCharType *psz)
-{
-  if ( !AssignCopy(wxStrlen(psz), psz) ) {
-    wxFAIL_MSG( wxT("out of memory in wxStringImpl::operator=(const wxStringCharType *)") );
-  }
-  return *this;
-}
-
-// helper function: does real copy
-bool wxStringImpl::AssignCopy(size_t nSrcLen,
-                              const wxStringCharType *pszSrcData)
-{
-  if ( nSrcLen == 0 ) {
-    Reinit();
-  }
-  else {
-    if ( !AllocBeforeWrite(nSrcLen) ) {
-      // allocation failure handled by caller
-      return false;
-    }
-
-    // use memmove() and not memcpy() here as we might be copying from our own
-    // buffer in case of assignment such as "s = s.c_str()" (see #11294)
-    memmove(m_pchData, pszSrcData, nSrcLen*sizeof(wxStringCharType));
-
-    GetStringData()->nDataLength = nSrcLen;
-    m_pchData[nSrcLen] = wxT('\0');
-  }
-  return true;
-}
-
-// ---------------------------------------------------------------------------
-// string concatenation
-// ---------------------------------------------------------------------------
-
-// add something to this string
-bool wxStringImpl::ConcatSelf(size_t nSrcLen,
-                              const wxStringCharType *pszSrcData,
-                              size_t nMaxLen)
-{
-  STATISTICS_ADD(SummandLength, nSrcLen);
-
-  nSrcLen = nSrcLen < nMaxLen ? nSrcLen : nMaxLen;
-
-  // concatenating an empty string is a NOP
-  if ( nSrcLen > 0 ) {
-    wxStringData *pData = GetStringData();
-    size_t nLen = pData->nDataLength;
-
-    // take special care when appending part of this string to itself: the code
-    // below reallocates our buffer and this invalidates pszSrcData pointer so
-    // we have to copy it in another temporary string in this case (but avoid
-    // doing this unnecessarily)
-    if ( pszSrcData >= m_pchData && pszSrcData < m_pchData + nLen )
-    {
-        wxStringImpl tmp(pszSrcData, nSrcLen);
-        return ConcatSelf(nSrcLen, tmp.m_pchData, nSrcLen);
-    }
-
-    size_t nNewLen = nLen + nSrcLen;
-
-    // alloc new buffer if current is too small
-    if ( pData->IsShared() ) {
-      STATISTICS_ADD(ConcatHit, 0);
-
-      // we have to allocate another buffer
-      wxStringData* pOldData = GetStringData();
-      if ( !AllocBuffer(nNewLen) ) {
-          // allocation failure handled by caller
-          return false;
-      }
-      memcpy(m_pchData, pOldData->data(), nLen*sizeof(wxStringCharType));
-      pOldData->Unlock();
-    }
-    else if ( nNewLen > pData->nAllocLength ) {
-      STATISTICS_ADD(ConcatHit, 0);
-
-      reserve(nNewLen);
-      // we have to grow the buffer
-      if ( capacity() < nNewLen ) {
-          // allocation failure handled by caller
-          return false;
-      }
-    }
-    else {
-      STATISTICS_ADD(ConcatHit, 1);
-
-      // the buffer is already big enough
-    }
-
-    // should be enough space
-    wxASSERT( nNewLen <= GetStringData()->nAllocLength );
-
-    // fast concatenation - all is done in our buffer
-    memcpy(m_pchData + nLen, pszSrcData, nSrcLen*sizeof(wxStringCharType));
-
-    m_pchData[nNewLen] = wxT('\0');          // put terminating '\0'
-    GetStringData()->nDataLength = nNewLen; // and fix the length
-  }
-  //else: the string to append was empty
-  return true;
-}
-
-// get the pointer to writable buffer of (at least) nLen bytes
-wxStringCharType *wxStringImpl::DoGetWriteBuf(size_t nLen)
-{
-  if ( !AllocBeforeWrite(nLen) ) {
-    // allocation failure handled by caller
-    return NULL;
-  }
-
-  wxASSERT( GetStringData()->nRefs == 1 );
-  GetStringData()->Validate(false);
-
-  return m_pchData;
-}
-
-// put string back in a reasonable state after GetWriteBuf
-void wxStringImpl::DoUngetWriteBuf()
-{
-  DoUngetWriteBuf(wxStrlen(m_pchData));
-}
-
-void wxStringImpl::DoUngetWriteBuf(size_t nLen)
-{
-  wxStringData * const pData = GetStringData();
-
-  wxASSERT_MSG( nLen < pData->nAllocLength, wxT("buffer overrun") );
-
-  // the strings we store are always NUL-terminated
-  pData->data()[nLen] = wxT('\0');
-  pData->nDataLength = nLen;
-  pData->Validate(true);
-}
-
-#endif // !wxUSE_STL_BASED_WXSTRING
diff --git a/Source/3rd Party/wx/src/common/stringops.cpp b/Source/3rd Party/wx/src/common/stringops.cpp
deleted file mode 100644
index 549d17332..000000000
--- a/Source/3rd Party/wx/src/common/stringops.cpp	
+++ /dev/null
@@ -1,317 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/stringops.cpp
-// Purpose:     implementation of wxString primitive operations
-// Author:      Vaclav Slavik
-// Modified by:
-// Created:     2007-04-16
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 REA Elektronik GmbH
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// headers
-// ===========================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/stringops.h"
-#endif
-
-// ===========================================================================
-// implementation
-// ===========================================================================
-
-#if wxUSE_UNICODE_UTF8
-
-// ---------------------------------------------------------------------------
-// UTF-8 sequences lengths
-// ---------------------------------------------------------------------------
-
-const unsigned char wxStringOperationsUtf8::ms_utf8IterTable[256] = {
-    // single-byte sequences (ASCII):
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 00..0F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 10..1F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 20..2F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 30..3F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 40..4F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 50..5F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 60..6F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 70..7F
-
-    // these are invalid, we use step 1 to skip
-    // over them (should never happen):
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 80..8F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 90..9F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // A0..AF
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // B0..BF
-    1, 1,                                            // C0,C1
-
-    // two-byte sequences:
-          2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,  // C2..CF
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,  // D0..DF
-
-    // three-byte sequences:
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,  // E0..EF
-
-    // four-byte sequences:
-    4, 4, 4, 4, 4,                                   // F0..F4
-
-    // these are invalid again (5- or 6-byte
-    // sequences and sequences for code points
-    // above U+10FFFF, as restricted by RFC 3629):
-                   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1   // F5..FF
-};
-
-// ---------------------------------------------------------------------------
-// UTF-8 operations
-// ---------------------------------------------------------------------------
-
-//
-// Table 3.1B from Unicode spec: Legal UTF-8 Byte Sequences
-//
-//     Code Points    | 1st Byte | 2nd Byte | 3rd Byte | 4th Byte |
-// -------------------+----------+----------+----------+----------+
-//   U+0000..U+007F   |  00..7F  |          |          |          |
-//   U+0080..U+07FF   |  C2..DF  |  80..BF  |          |          |
-//   U+0800..U+0FFF   |  E0      |  A0..BF  |  80..BF  |          |
-//   U+1000..U+FFFF   |  E1..EF  |  80..BF  |  80..BF  |          |
-//  U+10000..U+3FFFF  |  F0      |  90..BF  |  80..BF  |  80..BF  |
-//  U+40000..U+FFFFF  |  F1..F3  |  80..BF  |  80..BF  |  80..BF  |
-// U+100000..U+10FFFF |  F4      |  80..8F  |  80..BF  |  80..BF  |
-// -------------------+----------+----------+----------+----------+
-
-bool wxStringOperationsUtf8::IsValidUtf8String(const char *str, size_t len)
-{
-    if ( !str )
-        return true; // empty string is UTF8 string
-
-    const unsigned char *c = (const unsigned char*)str;
-    const unsigned char * const end = (len == wxStringImpl::npos) ? NULL : c + len;
-
-    for ( ; c != end && *c; ++c )
-    {
-        unsigned char b = *c;
-
-        if ( end != NULL )
-        {
-            // if the string is not NULL-terminated, verify we have enough
-            // bytes in it left for current character's encoding:
-            if ( c + ms_utf8IterTable[*c] > end )
-                return false;
-        }
-
-        if ( b <= 0x7F ) // 00..7F
-            continue;
-
-        else if ( b < 0xC2 ) // invalid lead bytes: 80..C1
-            return false;
-
-        // two-byte sequences:
-        else if ( b <= 0xDF ) // C2..DF
-        {
-            b = *(++c);
-            if ( !(b >= 0x80 && b <= 0xBF ) )
-                return false;
-        }
-
-        // three-byte sequences:
-        else if ( b == 0xE0 )
-        {
-            b = *(++c);
-            if ( !(b >= 0xA0 && b <= 0xBF ) )
-                return false;
-            b = *(++c);
-            if ( !(b >= 0x80 && b <= 0xBF ) )
-                return false;
-        }
-        else if ( b == 0xED )
-        {
-            b = *(++c);
-            if ( !(b >= 0x80 && b <= 0x9F ) )
-                return false;
-            b = *(++c);
-            if ( !(b >= 0x80 && b <= 0xBF ) )
-                return false;
-        }
-        else if ( b <= 0xEF ) // E1..EC EE..EF
-        {
-            for ( int i = 0; i < 2; ++i )
-            {
-                b = *(++c);
-                if ( !(b >= 0x80 && b <= 0xBF ) )
-                    return false;
-            }
-        }
-
-        // four-byte sequences:
-        else if ( b == 0xF0 )
-        {
-            b = *(++c);
-            if ( !(b >= 0x90 && b <= 0xBF ) )
-                return false;
-            for ( int i = 0; i < 2; ++i )
-            {
-                b = *(++c);
-                if ( !(b >= 0x80 && b <= 0xBF ) )
-                    return false;
-            }
-        }
-        else if ( b <= 0xF3 ) // F1..F3
-        {
-            for ( int i = 0; i < 3; ++i )
-            {
-                b = *(++c);
-                if ( !(b >= 0x80 && b <= 0xBF ) )
-                    return false;
-            }
-        }
-        else if ( b == 0xF4 )
-        {
-            b = *(++c);
-            if ( !(b >= 0x80 && b <= 0x8F ) )
-                return false;
-            for ( int i = 0; i < 2; ++i )
-            {
-                b = *(++c);
-                if ( !(b >= 0x80 && b <= 0xBF ) )
-                    return false;
-            }
-        }
-        else // otherwise, it's invalid lead byte
-            return false;
-    }
-
-    return true;
-}
-
-// NB: this is in this file and not unichar.cpp to keep all UTF-8 encoding
-//     code in single place
-wxUniChar::Utf8CharBuffer wxUniChar::AsUTF8() const
-{
-    Utf8CharBuffer buf = { "" }; // init to avoid g++ 4.1 warning with -O2
-    char *out = buf.data;
-
-    value_type code = GetValue();
-
-    //    Char. number range   |        UTF-8 octet sequence
-    //       (hexadecimal)     |              (binary)
-    //   ----------------------+---------------------------------------------
-    //   0000 0000 - 0000 007F | 0xxxxxxx
-    //   0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx
-    //   0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-    //   0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-    //
-    //   Code point value is stored in bits marked with 'x', lowest-order bit
-    //   of the value on the right side in the diagram above.
-    //                                                        (from RFC 3629)
-
-    if ( code <= 0x7F )
-    {
-        out[1] = 0;
-        out[0] = (char)code;
-    }
-    else if ( code <= 0x07FF )
-    {
-        out[2] = 0;
-        // NB: this line takes 6 least significant bits, encodes them as
-        // 10xxxxxx and discards them so that the next byte can be encoded:
-        out[1] = 0x80 | (code & 0x3F);  code >>= 6;
-        out[0] = 0xC0 | code;
-    }
-    else if ( code < 0xFFFF )
-    {
-        out[3] = 0;
-        out[2] = 0x80 | (code & 0x3F);  code >>= 6;
-        out[1] = 0x80 | (code & 0x3F);  code >>= 6;
-        out[0] = 0xE0 | code;
-    }
-    else if ( code <= 0x10FFFF )
-    {
-        out[4] = 0;
-        out[3] = 0x80 | (code & 0x3F);  code >>= 6;
-        out[2] = 0x80 | (code & 0x3F);  code >>= 6;
-        out[1] = 0x80 | (code & 0x3F);  code >>= 6;
-        out[0] = 0xF0 | code;
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("trying to encode undefined Unicode character") );
-        out[0] = 0;
-    }
-
-    return buf;
-}
-
-wxUniChar
-wxStringOperationsUtf8::DecodeNonAsciiChar(wxStringImpl::const_iterator i)
-{
-    wxASSERT( IsValidUtf8LeadByte(*i) );
-
-    wxUniChar::value_type code = 0;
-    size_t len = GetUtf8CharLength(*i);
-    wxASSERT_MSG( len <= 4, wxT("invalid UTF-8 sequence length") );
-
-    //    Char. number range   |        UTF-8 octet sequence
-    //       (hexadecimal)     |              (binary)
-    //   ----------------------+---------------------------------------------
-    //   0000 0000 - 0000 007F | 0xxxxxxx
-    //   0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx
-    //   0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-    //   0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-    //
-    //   Code point value is stored in bits marked with 'x', lowest-order bit
-    //   of the value on the right side in the diagram above.
-    //                                                        (from RFC 3629)
-
-    // mask to extract lead byte's value ('x' bits above), by sequence's length:
-    static const unsigned char s_leadValueMask[4] =  { 0x7F, 0x1F, 0x0F, 0x07 };
-#if wxDEBUG_LEVEL
-    // mask and value of lead byte's most significant bits, by length:
-    static const unsigned char s_leadMarkerMask[4] = { 0x80, 0xE0, 0xF0, 0xF8 };
-    static const unsigned char s_leadMarkerVal[4] =  { 0x00, 0xC0, 0xE0, 0xF0 };
-#endif
-
-    // extract the lead byte's value bits:
-    wxASSERT_MSG( ((unsigned char)*i & s_leadMarkerMask[len-1]) ==
-                  s_leadMarkerVal[len-1],
-                  wxT("invalid UTF-8 lead byte") );
-    code = (unsigned char)*i & s_leadValueMask[len-1];
-
-    // all remaining bytes, if any, are handled in the same way regardless of
-    // sequence's length:
-    for ( ++i ; len > 1; --len, ++i )
-    {
-        wxASSERT_MSG( ((unsigned char)*i & 0xC0) == 0x80,
-                      wxT("invalid UTF-8 byte") );
-
-        code <<= 6;
-        code |= (unsigned char)*i & 0x3F;
-    }
-
-    return wxUniChar(code);
-}
-
-wxCharBuffer wxStringOperationsUtf8::EncodeNChars(size_t n, const wxUniChar& ch)
-{
-    Utf8CharBuffer once(EncodeChar(ch));
-    // the IncIter() table can be used to determine the length of ch's encoding:
-    size_t len = ms_utf8IterTable[(unsigned char)once.data[0]];
-
-    wxCharBuffer buf(n * len);
-    char *ptr = buf.data();
-    for ( size_t i = 0; i < n; i++, ptr += len )
-    {
-        memcpy(ptr, once.data, len);
-    }
-
-    return buf;
-}
-
-#endif // wxUSE_UNICODE_UTF8
diff --git a/Source/3rd Party/wx/src/common/strvararg.cpp b/Source/3rd Party/wx/src/common/strvararg.cpp
deleted file mode 100644
index 92a471561..000000000
--- a/Source/3rd Party/wx/src/common/strvararg.cpp	
+++ /dev/null
@@ -1,729 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/strvararg.cpp
-// Purpose:     macros for implementing type-safe vararg passing of strings
-// Author:      Vaclav Slavik
-// Created:     2007-02-19
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 REA Elektronik GmbH
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/strvararg.h"
-#include "wx/string.h"
-#include "wx/crt.h"
-#include "wx/private/wxprintf.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxArgNormalizer<>
-// ----------------------------------------------------------------------------
-
-const wxStringCharType *wxArgNormalizerNative<const wxString&>::get() const
-{
-    return m_value.wx_str();
-}
-
-const wxStringCharType *wxArgNormalizerNative<const wxCStrData&>::get() const
-{
-    return m_value.AsInternal();
-}
-
-#if wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY
-wxArgNormalizerWchar<const wxString&>::wxArgNormalizerWchar(
-                            const wxString& s,
-                            const wxFormatString *fmt, unsigned index)
-    : wxArgNormalizerWithBuffer<wchar_t>(s.wc_str(), fmt, index)
-{
-}
-
-wxArgNormalizerWchar<const wxCStrData&>::wxArgNormalizerWchar(
-                            const wxCStrData& s,
-                            const wxFormatString *fmt, unsigned index)
-    : wxArgNormalizerWithBuffer<wchar_t>(s.AsWCharBuf(), fmt, index)
-{
-}
-#endif // wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY
-
-// ----------------------------------------------------------------------------
-// wxArgNormalizedString
-// ----------------------------------------------------------------------------
-
-wxString wxArgNormalizedString::GetString() const
-{
-    if ( !IsValid() )
-        return wxEmptyString;
-
-#if wxUSE_UTF8_LOCALE_ONLY
-    return wxString(reinterpret_cast<const char*>(m_ptr));
-#else
-    #if wxUSE_UNICODE_UTF8
-        if ( wxLocaleIsUtf8 )
-            return wxString(reinterpret_cast<const char*>(m_ptr));
-        else
-    #endif
-        return wxString(reinterpret_cast<const wxChar*>(m_ptr));
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-}
-
-wxArgNormalizedString::operator wxString() const
-{
-    return GetString();
-}
-
-// ----------------------------------------------------------------------------
-// wxFormatConverter: class doing the "%s" and "%c" normalization
-// ----------------------------------------------------------------------------
-
-/*
-   There are four problems with wxPrintf() etc. format strings:
-
-   1) The printf vararg macros convert all forms of strings into
-      wxStringCharType* representation. This may make the format string
-      incorrect: for example, if %ls was used together with a wchar_t*
-      variadic argument, this would no longer work, because the templates
-      would change wchar_t* argument to wxStringCharType* and %ls would now
-      be incorrect in e.g. UTF-8 build. We need make sure only one specifier
-      form is used.
-
-   2) To complicate matters further, the meaning of %s and %c is different
-      under Windows and on Unix. The Windows/MS convention is as follows:
-
-       In ANSI mode:
-
-       format specifier         results in
-       -----------------------------------
-       %s, %hs, %hS             char*
-       %ls, %S, %lS             wchar_t*
-
-       In Unicode mode:
-
-       format specifier         results in
-       -----------------------------------
-       %hs, %S, %hS             char*
-       %s, %ls, %lS             wchar_t*
-
-       (While on POSIX systems we have %C identical to %lc and %c always means
-       char (in any mode) while %lc always means wchar_t.)
-
-      In other words, we should _only_ use %s on Windows and %ls on Unix for
-      wxUSE_UNICODE_WCHAR build.
-
-   3) To make things even worse, we need two forms in UTF-8 build: one for
-      passing strings to ANSI functions under UTF-8 locales (this one should
-      use %s) and one for widechar functions used under non-UTF-8 locales
-      (this one should use %ls).
-
-   And, of course, the same should be done for %c as well.
-
-
-   wxScanf() family of functions is simpler, because we don't normalize their
-   variadic arguments and we only have to handle 2) above and only for widechar
-   versions.
-*/
-
-template<typename T>
-class wxFormatConverterBase
-{
-public:
-    typedef T CharType;
-
-    wxFormatConverterBase()
-    {
-        m_fmtOrig = NULL;
-        m_fmtLast = NULL;
-        m_nCopied = 0;
-    }
-
-    wxScopedCharTypeBuffer<CharType> Convert(const CharType *format)
-    {
-        // this is reset to NULL if we modify the format string
-        m_fmtOrig = format;
-
-        while ( *format )
-        {
-            if ( CopyFmtChar(*format++) == wxT('%') )
-            {
-#if wxUSE_PRINTF_POS_PARAMS
-                if ( *format >= '0' && *format <= '9' )
-                {
-                    SkipDigits(&format);
-                    if ( *format == '$' )
-                    {
-                        // It was a positional argument specification.
-                        CopyFmtChar(*format++);
-                    }
-                    //else: it was a width specification, nothing else to do.
-                }
-#endif // wxUSE_PRINTF_POS_PARAMS
-
-                // skip any flags
-                while ( IsFlagChar(*format) )
-                    CopyFmtChar(*format++);
-
-                // and possible width
-                if ( *format == wxT('*') )
-                    CopyFmtChar(*format++);
-                else
-                    SkipDigits(&format);
-
-                // precision?
-                if ( *format == wxT('.') )
-                {
-                    CopyFmtChar(*format++);
-                    if ( *format == wxT('*') )
-                        CopyFmtChar(*format++);
-                    else
-                        SkipDigits(&format);
-                }
-
-                // next we can have a size modifier
-                SizeModifier size;
-
-                switch ( *format )
-                {
-                    case 'h':
-                        size = Size_Short;
-                        format++;
-                        break;
-
-                    case 'l':
-                        // "ll" has a different meaning!
-                        if ( format[1] != 'l' )
-                        {
-                            size = Size_Long;
-                            format++;
-                            break;
-                        }
-                        //else: fall through
-
-                    default:
-                        size = Size_Default;
-                }
-
-                CharType outConv = *format;
-                SizeModifier outSize = size;
-
-                // and finally we should have the type
-                switch ( *format )
-                {
-                    case wxT('S'):
-                    case wxT('s'):
-                        // all strings were converted into the same form by
-                        // wxArgNormalizer<T>, this form depends on the context
-                        // in which the value is used (scanf/printf/wprintf):
-                        HandleString(*format, size, outConv, outSize);
-                        break;
-
-                    case wxT('C'):
-                    case wxT('c'):
-                        HandleChar(*format, size, outConv, outSize);
-                        break;
-
-                    default:
-                        // nothing special to do
-                        break;
-                }
-
-                if ( outConv == *format && outSize == size ) // no change
-                {
-                    if ( size != Size_Default )
-                        CopyFmtChar(*(format - 1));
-                    CopyFmtChar(*format);
-                }
-                else // something changed
-                {
-                    switch ( outSize )
-                    {
-                        case Size_Long:
-                            InsertFmtChar(wxT('l'));
-                            break;
-
-                        case Size_Short:
-                            InsertFmtChar(wxT('h'));
-                            break;
-
-                        case Size_Default:
-                            // nothing to do
-                            break;
-                    }
-                    InsertFmtChar(outConv);
-                }
-
-                format++;
-            }
-        }
-
-        // notice that we only translated the string if m_fmtOrig == NULL (as
-        // set by CopyAllBefore()), otherwise we should simply use the original
-        // format
-        if ( m_fmtOrig )
-        {
-            return wxScopedCharTypeBuffer<CharType>::CreateNonOwned(m_fmtOrig);
-        }
-        else
-        {
-            // shrink converted format string to actual size (instead of
-            // over-sized allocation from CopyAllBefore()) and NUL-terminate
-            // it:
-            m_fmt.shrink(m_fmtLast - m_fmt.data());
-            return m_fmt;
-        }
-    }
-
-    virtual ~wxFormatConverterBase() {}
-
-protected:
-    enum SizeModifier
-    {
-        Size_Default,
-        Size_Short,
-        Size_Long
-    };
-
-    // called to handle %S or %s; 'conv' is conversion specifier ('S' or 's'
-    // respectively), 'size' is the preceding size modifier; the new values of
-    // conversion and size specifiers must be written to outConv and outSize
-    virtual void HandleString(CharType conv, SizeModifier size,
-                              CharType& outConv, SizeModifier& outSize) = 0;
-
-    // ditto for %C or %c
-    virtual void HandleChar(CharType conv, SizeModifier size,
-                            CharType& outConv, SizeModifier& outSize) = 0;
-
-private:
-    // copy another character to the translated format: this function does the
-    // copy if we are translating but doesn't do anything at all if we don't,
-    // so we don't create the translated format string at all unless we really
-    // need to (i.e. InsertFmtChar() is called)
-    CharType CopyFmtChar(CharType ch)
-    {
-        if ( !m_fmtOrig )
-        {
-            // we're translating, do copy
-            *(m_fmtLast++) = ch;
-        }
-        else
-        {
-            // simply increase the count which should be copied by
-            // CopyAllBefore() later if needed
-            m_nCopied++;
-        }
-
-        return ch;
-    }
-
-    // insert an extra character
-    void InsertFmtChar(CharType ch)
-    {
-        if ( m_fmtOrig )
-        {
-            // so far we haven't translated anything yet
-            CopyAllBefore();
-        }
-
-        *(m_fmtLast++) = ch;
-    }
-
-    void CopyAllBefore()
-    {
-        wxASSERT_MSG( m_fmtOrig && m_fmt.data() == NULL, "logic error" );
-
-        // the modified format string is guaranteed to be no longer than
-        // 3/2 of the original (worst case: the entire format string consists
-        // of "%s" repeated and is expanded to "%ls" on Unix), so we can
-        // allocate the buffer now and not worry about running out of space if
-        // we over-allocate a bit:
-        size_t fmtLen = wxStrlen(m_fmtOrig);
-        // worst case is of even length, so there's no rounding error in *3/2:
-        m_fmt.extend(fmtLen * 3 / 2);
-
-        if ( m_nCopied > 0 )
-            wxStrncpy(m_fmt.data(), m_fmtOrig, m_nCopied);
-        m_fmtLast = m_fmt.data() + m_nCopied;
-
-        // we won't need it any longer and resetting it also indicates that we
-        // modified the format
-        m_fmtOrig = NULL;
-    }
-
-    static bool IsFlagChar(CharType ch)
-    {
-        return ch == wxT('-') || ch == wxT('+') ||
-               ch == wxT('0') || ch == wxT(' ') || ch == wxT('#');
-    }
-
-    void SkipDigits(const CharType **ptpc)
-    {
-        while ( **ptpc >= wxT('0') && **ptpc <= wxT('9') )
-            CopyFmtChar(*(*ptpc)++);
-    }
-
-    // the translated format
-    wxCharTypeBuffer<CharType> m_fmt;
-    CharType *m_fmtLast;
-
-    // the original format
-    const CharType *m_fmtOrig;
-
-    // the number of characters already copied (i.e. already parsed, but left
-    // unmodified)
-    size_t m_nCopied;
-};
-
-#if defined(__WINDOWS__) && !defined(__CYGWIN__)
-
-// on Windows, we should use %s and %c regardless of the build:
-class wxPrintfFormatConverterWchar : public wxFormatConverterBase<wchar_t>
-{
-    virtual void HandleString(CharType WXUNUSED(conv),
-                              SizeModifier WXUNUSED(size),
-                              CharType& outConv, SizeModifier& outSize)
-    {
-        outConv = 's';
-        outSize = Size_Default;
-    }
-
-    virtual void HandleChar(CharType WXUNUSED(conv),
-                            SizeModifier WXUNUSED(size),
-                            CharType& outConv, SizeModifier& outSize)
-    {
-        outConv = 'c';
-        outSize = Size_Default;
-    }
-};
-
-#else // !__WINDOWS__
-
-// on Unix, it's %s for ANSI functions and %ls for widechar:
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-class wxPrintfFormatConverterWchar : public wxFormatConverterBase<wchar_t>
-{
-    virtual void HandleString(CharType WXUNUSED(conv),
-                              SizeModifier WXUNUSED(size),
-                              CharType& outConv, SizeModifier& outSize)
-    {
-        outConv = 's';
-        outSize = Size_Long;
-    }
-
-    virtual void HandleChar(CharType WXUNUSED(conv),
-                            SizeModifier WXUNUSED(size),
-                            CharType& outConv, SizeModifier& outSize)
-    {
-        outConv = 'c';
-        outSize = Size_Long;
-    }
-};
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#endif // __WINDOWS__/!__WINDOWS__
-
-#if wxUSE_UNICODE_UTF8
-class wxPrintfFormatConverterUtf8 : public wxFormatConverterBase<char>
-{
-    virtual void HandleString(CharType WXUNUSED(conv),
-                              SizeModifier WXUNUSED(size),
-                              CharType& outConv, SizeModifier& outSize)
-    {
-        outConv = 's';
-        outSize = Size_Default;
-    }
-
-    virtual void HandleChar(CharType WXUNUSED(conv),
-                            SizeModifier WXUNUSED(size),
-                            CharType& outConv, SizeModifier& outSize)
-    {
-        // chars are represented using wchar_t in both builds, so this is
-        // the same as above
-        outConv = 'c';
-        outSize = Size_Long;
-    }
-};
-#endif // wxUSE_UNICODE_UTF8
-
-#if !wxUSE_UNICODE // FIXME-UTF8: remove
-class wxPrintfFormatConverterANSI : public wxFormatConverterBase<char>
-{
-    virtual void HandleString(CharType WXUNUSED(conv),
-                              SizeModifier WXUNUSED(size),
-                              CharType& outConv, SizeModifier& outSize)
-    {
-        outConv = 's';
-        outSize = Size_Default;
-    }
-
-    virtual void HandleChar(CharType WXUNUSED(conv),
-                            SizeModifier WXUNUSED(size),
-                            CharType& outConv, SizeModifier& outSize)
-    {
-        outConv = 'c';
-        outSize = Size_Default;
-    }
-};
-#endif // ANSI
-
-#ifndef __WINDOWS__
-/*
-
-   wxScanf() format translation is different, we need to translate %s to %ls
-   and %c to %lc on Unix (but not Windows and for widechar functions only!).
-
-   So to use native functions in order to get our semantics we must do the
-   following translations in Unicode mode:
-
-   wxWidgets specifier      POSIX specifier
-   ----------------------------------------
-
-   %hc, %C, %hC             %c
-   %c                       %lc
-
- */
-class wxScanfFormatConverterWchar : public wxFormatConverterBase<wchar_t>
-{
-    virtual void HandleString(CharType conv, SizeModifier size,
-                              CharType& outConv, SizeModifier& outSize)
-    {
-        outConv = 's';
-        outSize = GetOutSize(conv == 'S', size);
-    }
-
-    virtual void HandleChar(CharType conv, SizeModifier size,
-                            CharType& outConv, SizeModifier& outSize)
-    {
-        outConv = 'c';
-        outSize = GetOutSize(conv == 'C', size);
-    }
-
-    SizeModifier GetOutSize(bool convIsUpper, SizeModifier size)
-    {
-        // %S and %hS -> %s and %lS -> %ls
-        if ( convIsUpper )
-        {
-            if ( size == Size_Long )
-                return Size_Long;
-            else
-                return Size_Default;
-        }
-        else // %s or %c
-        {
-            if ( size == Size_Default )
-                return Size_Long;
-            else
-                return size;
-        }
-    }
-};
-
-const wxScopedWCharBuffer wxScanfConvertFormatW(const wchar_t *format)
-{
-    return wxScanfFormatConverterWchar().Convert(format);
-}
-#endif // !__WINDOWS__
-
-
-// ----------------------------------------------------------------------------
-// wxFormatString
-// ----------------------------------------------------------------------------
-
-#if !wxUSE_UNICODE_WCHAR
-const char* wxFormatString::InputAsChar()
-{
-    if ( m_char )
-        return m_char.data();
-
-    // in ANSI build, wx_str() returns char*, in UTF-8 build, this function
-    // is only called under UTF-8 locales, so we should return UTF-8 string,
-    // which is, again, what wx_str() returns:
-    if ( m_str )
-        return m_str->wx_str();
-
-    // ditto wxCStrData:
-    if ( m_cstr )
-        return m_cstr->AsInternal();
-
-    // the last case is that wide string was passed in: in that case, we need
-    // to convert it:
-    wxASSERT( m_wchar );
-
-    m_char = wxConvLibc.cWC2MB(m_wchar.data());
-
-    return m_char.data();
-}
-
-const char* wxFormatString::AsChar()
-{
-    if ( !m_convertedChar )
-#if !wxUSE_UNICODE // FIXME-UTF8: remove this
-        m_convertedChar = wxPrintfFormatConverterANSI().Convert(InputAsChar());
-#else
-        m_convertedChar = wxPrintfFormatConverterUtf8().Convert(InputAsChar());
-#endif
-
-    return m_convertedChar.data();
-}
-#endif // !wxUSE_UNICODE_WCHAR
-
-#if wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY
-const wchar_t* wxFormatString::InputAsWChar()
-{
-    if ( m_wchar )
-        return m_wchar.data();
-
-#if wxUSE_UNICODE_WCHAR
-    if ( m_str )
-        return m_str->wc_str();
-    if ( m_cstr )
-        return m_cstr->AsInternal();
-#else // wxUSE_UNICODE_UTF8
-    if ( m_str )
-    {
-        m_wchar = m_str->wc_str();
-        return m_wchar.data();
-    }
-    if ( m_cstr )
-    {
-        m_wchar = m_cstr->AsWCharBuf();
-        return m_wchar.data();
-    }
-#endif // wxUSE_UNICODE_WCHAR/UTF8
-
-    // the last case is that narrow string was passed in: in that case, we need
-    // to convert it:
-    wxASSERT( m_char );
-
-    m_wchar = wxConvLibc.cMB2WC(m_char.data());
-
-    return m_wchar.data();
-}
-
-const wchar_t* wxFormatString::AsWChar()
-{
-    if ( !m_convertedWChar )
-        m_convertedWChar = wxPrintfFormatConverterWchar().Convert(InputAsWChar());
-
-    return m_convertedWChar.data();
-}
-#endif // wxUSE_UNICODE && !wxUSE_UTF8_LOCALE_ONLY
-
-wxString wxFormatString::InputAsString() const
-{
-    if ( m_str )
-        return *m_str;
-    if ( m_cstr )
-        return m_cstr->AsString();
-    if ( m_wchar )
-        return wxString(m_wchar);
-    if ( m_char )
-        return wxString(m_char);
-
-    wxFAIL_MSG( "invalid wxFormatString - not initialized?" );
-    return wxString();
-}
-
-// ----------------------------------------------------------------------------
-// wxFormatString::GetArgumentType()
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-template<typename CharType>
-wxFormatString::ArgumentType DoGetArgumentType(const CharType *format,
-                                               unsigned n)
-{
-    wxCHECK_MSG( format, wxFormatString::Arg_Unknown,
-                 "empty format string not allowed here" );
-
-    wxPrintfConvSpecParser<CharType> parser(format);
-
-    wxCHECK_MSG( n <= parser.nargs, wxFormatString::Arg_Unknown,
-                 "more arguments than format string specifiers?" );
-
-    wxCHECK_MSG( parser.pspec[n-1] != NULL, wxFormatString::Arg_Unknown,
-                 "requested argument not found - invalid format string?" );
-
-    switch ( parser.pspec[n-1]->m_type )
-    {
-        case wxPAT_CHAR:
-        case wxPAT_WCHAR:
-            return wxFormatString::Arg_Char;
-
-        case wxPAT_PCHAR:
-        case wxPAT_PWCHAR:
-            return wxFormatString::Arg_String;
-
-        case wxPAT_INT:
-            return wxFormatString::Arg_Int;
-        case wxPAT_LONGINT:
-            return wxFormatString::Arg_LongInt;
-#ifdef wxLongLong_t
-        case wxPAT_LONGLONGINT:
-            return wxFormatString::Arg_LongLongInt;
-#endif
-        case wxPAT_SIZET:
-            return wxFormatString::Arg_Size_t;
-
-        case wxPAT_DOUBLE:
-            return wxFormatString::Arg_Double;
-        case wxPAT_LONGDOUBLE:
-            return wxFormatString::Arg_LongDouble;
-
-        case wxPAT_POINTER:
-            return wxFormatString::Arg_Pointer;
-
-        case wxPAT_NINT:
-            return wxFormatString::Arg_IntPtr;
-        case wxPAT_NSHORTINT:
-            return wxFormatString::Arg_ShortIntPtr;
-        case wxPAT_NLONGINT:
-            return wxFormatString::Arg_LongIntPtr;
-
-        case wxPAT_STAR:
-            // "*" requires argument of type int
-            return wxFormatString::Arg_Int;
-
-        case wxPAT_INVALID:
-            // (handled after the switch statement)
-            break;
-    }
-
-    // silence warning
-    wxFAIL_MSG( "unexpected argument type" );
-    return wxFormatString::Arg_Unknown;
-}
-
-} // anonymous namespace
-
-wxFormatString::ArgumentType wxFormatString::GetArgumentType(unsigned n) const
-{
-    if ( m_char )
-        return DoGetArgumentType(m_char.data(), n);
-    else if ( m_wchar )
-        return DoGetArgumentType(m_wchar.data(), n);
-    else if ( m_str )
-        return DoGetArgumentType(m_str->wx_str(), n);
-    else if ( m_cstr )
-        return DoGetArgumentType(m_cstr->AsInternal(), n);
-
-    wxFAIL_MSG( "unreachable code" );
-    return Arg_Unknown;
-}
diff --git a/Source/3rd Party/wx/src/common/sysopt.cpp b/Source/3rd Party/wx/src/common/sysopt.cpp
index 4926336e1..7a61ad01b 100644
--- a/Source/3rd Party/wx/src/common/sysopt.cpp	
+++ b/Source/3rd Party/wx/src/common/sysopt.cpp	
@@ -1,112 +1,111 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/sysopt.cpp
-// Purpose:     wxSystemOptions
-// Author:      Julian Smart
-// Modified by:
-// Created:     2001-07-10
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#if defined(__BORLANDC__)
-    #pragma hdrstop
-#endif
-
-#if wxUSE_SYSTEM_OPTIONS
-
-#include "wx/sysopt.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/list.h"
-    #include "wx/string.h"
-    #include "wx/arrstr.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// private globals
-// ----------------------------------------------------------------------------
-
-static wxArrayString gs_optionNames,
-                     gs_optionValues;
-
-// ============================================================================
-// wxSystemOptions implementation
-// ============================================================================
-
-// Option functions (arbitrary name/value mapping)
-void wxSystemOptions::SetOption(const wxString& name, const wxString& value)
-{
-    int idx = gs_optionNames.Index(name, false);
-    if (idx == wxNOT_FOUND)
-    {
-        gs_optionNames.Add(name);
-        gs_optionValues.Add(value);
-    }
-    else
-    {
-        gs_optionNames[idx] = name;
-        gs_optionValues[idx] = value;
-    }
-}
-
-void wxSystemOptions::SetOption(const wxString& name, int value)
-{
-    SetOption(name, wxString::Format(wxT("%d"), value));
-}
-
-wxString wxSystemOptions::GetOption(const wxString& name)
-{
-    wxString val;
-
-    int idx = gs_optionNames.Index(name, false);
-    if ( idx != wxNOT_FOUND )
-    {
-        val = gs_optionValues[idx];
-    }
-    else // not set explicitly
-    {
-        // look in the environment: first for a variable named "wx_appname_name"
-        // which can be set to affect the behaviour or just this application
-        // and then for "wx_name" which can be set to change the option globally
-        wxString var(name);
-        var.Replace(wxT("."), wxT("_"));  // '.'s not allowed in env var names
-        var.Replace(wxT("-"), wxT("_"));  // and neither are '-'s
-
-        wxString appname;
-        if ( wxTheApp )
-            appname = wxTheApp->GetAppName();
-
-        if ( !appname.empty() )
-            val = wxGetenv(wxT("wx_") + appname + wxT('_') + var);
-
-        if ( val.empty() )
-            val = wxGetenv(wxT("wx_") + var);
-    }
-
-    return val;
-}
-
-int wxSystemOptions::GetOptionInt(const wxString& name)
-{
-    return wxAtoi (GetOption(name));
-}
-
-bool wxSystemOptions::HasOption(const wxString& name)
-{
-    return !GetOption(name).empty();
-}
-
-#endif // wxUSE_SYSTEM_OPTIONS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/sysopt.cpp
+// Purpose:     wxSystemOptions
+// Author:      Julian Smart
+// Modified by:
+// Created:     2001-07-10
+// RCS-ID:      $Id: sysopt.cpp 39851 2006-06-27 14:33:14Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#if wxUSE_SYSTEM_OPTIONS
+
+#include "wx/sysopt.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/arrstr.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// private globals
+// ----------------------------------------------------------------------------
+
+static wxArrayString gs_optionNames,
+                     gs_optionValues;
+
+// ============================================================================
+// wxSystemOptions implementation
+// ============================================================================
+
+// Option functions (arbitrary name/value mapping)
+void wxSystemOptions::SetOption(const wxString& name, const wxString& value)
+{
+    int idx = gs_optionNames.Index(name, false);
+    if (idx == wxNOT_FOUND)
+    {
+        gs_optionNames.Add(name);
+        gs_optionValues.Add(value);
+    }
+    else
+    {
+        gs_optionNames[idx] = name;
+        gs_optionValues[idx] = value;
+    }
+}
+
+void wxSystemOptions::SetOption(const wxString& name, int value)
+{
+    SetOption(name, wxString::Format(wxT("%d"), value));
+}
+
+wxString wxSystemOptions::GetOption(const wxString& name)
+{
+    wxString val;
+
+    int idx = gs_optionNames.Index(name, false);
+    if ( idx != wxNOT_FOUND )
+    {
+        val = gs_optionValues[idx];
+    }
+    else // not set explicitely
+    {
+        // look in the environment: first for a variable named "wx_appname_name"
+        // which can be set to affect the behaviour or just this application
+        // and then for "wx_name" which can be set to change the option globally
+        wxString var(name);
+        var.Replace(_T("."), _T("_"));  // '.'s not allowed in env var names
+
+        wxString appname;
+        if ( wxTheApp )
+            appname = wxTheApp->GetAppName();
+
+        if ( !appname.empty() )
+            val = wxGetenv(_T("wx_") + appname + _T('_') + var);
+
+        if ( val.empty() )
+            val = wxGetenv(_T("wx_") + var);
+    }
+
+    return val;
+}
+
+int wxSystemOptions::GetOptionInt(const wxString& name)
+{
+    return wxAtoi(GetOption(name));
+}
+
+bool wxSystemOptions::HasOption(const wxString& name)
+{
+    return !GetOption(name).empty();
+}
+
+#endif // wxUSE_SYSTEM_OPTIONS
diff --git a/Source/3rd Party/wx/src/common/tarstrm.cpp b/Source/3rd Party/wx/src/common/tarstrm.cpp
index 2b2173fd0..5315a996c 100644
--- a/Source/3rd Party/wx/src/common/tarstrm.cpp	
+++ b/Source/3rd Party/wx/src/common/tarstrm.cpp	
@@ -1,1547 +1,1534 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/tarstrm.cpp
-// Purpose:     Streams for Tar files
-// Author:      Mike Wetherell
-// RCS-ID:      $Id$
-// Copyright:   (c) 2004 Mike Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_TARSTREAM
-
-#include "wx/tarstrm.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-#endif
-
-#include "wx/buffer.h"
-#include "wx/datetime.h"
-#include "wx/scopedptr.h"
-#include "wx/filename.h"
-#include "wx/thread.h"
-
-#include <ctype.h>
-
-#ifdef __UNIX__
-#include <pwd.h>
-#include <grp.h>
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-// constants
-
-enum {
-    TAR_NAME,
-    TAR_MODE,
-    TAR_UID,
-    TAR_GID,
-    TAR_SIZE,
-    TAR_MTIME,
-    TAR_CHKSUM,
-    TAR_TYPEFLAG,
-    TAR_LINKNAME,
-    TAR_MAGIC,
-    TAR_VERSION,
-    TAR_UNAME,
-    TAR_GNAME,
-    TAR_DEVMAJOR,
-    TAR_DEVMINOR,
-    TAR_PREFIX,
-    TAR_UNUSED,
-    TAR_NUMFIELDS
-};
-
-enum {
-    TAR_BLOCKSIZE = 512
-};
-
-// checksum type
-enum {
-    SUM_UNKNOWN,
-    SUM_UNSIGNED,
-    SUM_SIGNED
-};
-
-// type of input tar
-enum {
-    TYPE_OLDTAR,    // fields after TAR_LINKNAME are invalid
-    TYPE_GNUTAR,    // all fields except TAR_PREFIX are valid
-    TYPE_USTAR      // all fields are valid
-};
-
-// signatures
-static const char *USTAR_MAGIC   = "ustar";
-static const char *USTAR_VERSION = "00";
-static const char *GNU_MAGIC     = "ustar ";
-static const char *GNU_VERION    = " ";
-
-IMPLEMENT_DYNAMIC_CLASS(wxTarEntry, wxArchiveEntry)
-IMPLEMENT_DYNAMIC_CLASS(wxTarClassFactory, wxArchiveClassFactory)
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Class factory
-
-static wxTarClassFactory g_wxTarClassFactory;
-
-wxTarClassFactory::wxTarClassFactory()
-{
-    if (this == &g_wxTarClassFactory)
-        PushFront();
-}
-
-const wxChar * const *
-wxTarClassFactory::GetProtocols(wxStreamProtocolType type) const
-{
-    static const wxChar *protocols[] = { wxT("tar"), NULL };
-    static const wxChar *mimetypes[] = { wxT("application/x-tar"), NULL };
-    static const wxChar *fileexts[]  = { wxT(".tar"), NULL };
-    static const wxChar *empty[]     = { NULL };
-
-    switch (type) {
-        case wxSTREAM_PROTOCOL: return protocols;
-        case wxSTREAM_MIMETYPE: return mimetypes;
-        case wxSTREAM_FILEEXT:  return fileexts;
-        default:                return empty;
-    }
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// tar header block
-
-typedef wxFileOffset wxTarNumber;
-
-struct wxTarField { const wxChar *name; int pos; };
-
-class wxTarHeaderBlock
-{
-public:
-    wxTarHeaderBlock()
-        { memset(data, 0, sizeof(data)); }
-    wxTarHeaderBlock(const wxTarHeaderBlock& hb)
-        { memcpy(data, hb.data, sizeof(data)); }
-
-    bool Read(wxInputStream& in);
-    bool Write(wxOutputStream& out);
-    inline bool WriteField(wxOutputStream& out, int id);
-
-    bool IsAllZeros() const;
-    wxUint32 Sum(bool SignedSum = false);
-    wxUint32 SumField(int id);
-
-    char *Get(int id) { return data + fields[id].pos + id; }
-    static size_t Len(int id) { return fields[id + 1].pos - fields[id].pos; }
-    static const wxChar *Name(int id) { return fields[id].name; }
-    static size_t Offset(int id) { return fields[id].pos; }
-
-    bool SetOctal(int id, wxTarNumber n);
-    wxTarNumber GetOctal(int id);
-    bool SetPath(const wxString& name, wxMBConv& conv);
-
-private:
-    char data[TAR_BLOCKSIZE + TAR_NUMFIELDS];
-    static const wxTarField fields[];
-    static void check();
-};
-
-wxDEFINE_SCOPED_PTR_TYPE(wxTarHeaderBlock)
-
-// A table giving the field names and offsets in a tar header block
-const wxTarField wxTarHeaderBlock::fields[] =
-{
-    { wxT("name"), 0 },       // 100
-    { wxT("mode"), 100 },     // 8
-    { wxT("uid"), 108 },      // 8
-    { wxT("gid"), 116 },      // 8
-    { wxT("size"), 124 },     // 12
-    { wxT("mtime"), 136 },    // 12
-    { wxT("chksum"), 148 },   // 8
-    { wxT("typeflag"), 156 }, // 1
-    { wxT("linkname"), 157 }, // 100
-    { wxT("magic"), 257 },    // 6
-    { wxT("version"), 263 },  // 2
-    { wxT("uname"), 265 },    // 32
-    { wxT("gname"), 297 },    // 32
-    { wxT("devmajor"), 329 }, // 8
-    { wxT("devminor"), 337 }, // 8
-    { wxT("prefix"), 345 },   // 155
-    { wxT("unused"), 500 },   // 12
-    { NULL, TAR_BLOCKSIZE }
-};
-
-void wxTarHeaderBlock::check()
-{
-#if 0
-    wxCOMPILE_TIME_ASSERT(
-        WXSIZEOF(fields) == TAR_NUMFIELDS + 1,
-        Wrong_number_of_elements_in_fields_table
-    );
-#endif
-}
-
-bool wxTarHeaderBlock::IsAllZeros() const
-{
-    const char *p = data;
-    for (size_t i = 0; i < sizeof(data); i++)
-        if (p[i])
-            return false;
-    return true;
-}
-
-wxUint32 wxTarHeaderBlock::Sum(bool SignedSum /*=false*/)
-{
-    // the chksum field itself should be blanks during the calculation
-    memset(Get(TAR_CHKSUM), ' ', Len(TAR_CHKSUM));
-    const char *p = data;
-    wxUint32 n = 0;
-
-    if (SignedSum)
-        for (size_t i = 0; i < sizeof(data); i++)
-            n += (signed char)p[i];
-    else
-        for (size_t i = 0; i < sizeof(data); i++)
-            n += (unsigned char)p[i];
-
-    return n;
-}
-
-wxUint32 wxTarHeaderBlock::SumField(int id)
-{
-    unsigned char *p = (unsigned char*)Get(id);
-    unsigned char *q = p + Len(id);
-    wxUint32 n = 0;
-
-    while (p < q)
-        n += *p++;
-
-    return n;
-}
-
-bool wxTarHeaderBlock::Read(wxInputStream& in)
-{
-    bool ok = true;
-
-    for (int id = 0; id < TAR_NUMFIELDS && ok; id++)
-        ok = in.Read(Get(id), Len(id)).LastRead() == Len(id);
-
-    return ok;
-}
-
-bool wxTarHeaderBlock::Write(wxOutputStream& out)
-{
-    bool ok = true;
-
-    for (int id = 0; id < TAR_NUMFIELDS && ok; id++)
-        ok = WriteField(out, id);
-
-    return ok;
-}
-
-inline bool wxTarHeaderBlock::WriteField(wxOutputStream& out, int id)
-{
-    return out.Write(Get(id), Len(id)).LastWrite() == Len(id);
-}
-
-wxTarNumber wxTarHeaderBlock::GetOctal(int id)
-{
-    wxTarNumber n = 0;
-    const char *p = Get(id);
-    while (*p == ' ')
-        p++;
-    while (*p >= '0' && *p < '8')
-        n = (n << 3) | (*p++ - '0');
-    return n;
-}
-
-bool wxTarHeaderBlock::SetOctal(int id, wxTarNumber n)
-{
-    // set an octal field, return true if the number fits
-    char *field = Get(id);
-    char *p = field + Len(id);
-    *--p = 0;
-    while (p > field) {
-        *--p = char('0' + (n & 7));
-        n >>= 3;
-    }
-    return n == 0;
-}
-
-bool wxTarHeaderBlock::SetPath(const wxString& name, wxMBConv& conv)
-{
-    bool badconv = false;
-
-#if wxUSE_UNICODE
-    wxCharBuffer nameBuf = name.mb_str(conv);
-
-    // if the conversion fails make an approximation
-    if (!nameBuf) {
-        badconv = true;
-        size_t len = name.length();
-        wxCharBuffer approx(len);
-        for (size_t i = 0; i < len; i++)
-        {
-            wxChar c = name[i];
-            approx.data()[i] = c & ~0x7F ? '_' : c;
-        }
-        nameBuf = approx;
-    }
-
-    const char *mbName = nameBuf;
-#else
-    const char *mbName = name.c_str();
-    (void)conv;
-#endif
-
-    bool fits;
-    bool notGoingToFit = false;
-    size_t len = strlen(mbName);
-    size_t maxname = Len(TAR_NAME);
-    size_t maxprefix = Len(TAR_PREFIX);
-    size_t i = 0;
-    size_t nexti = 0;
-
-    for (;;) {
-        fits = i < maxprefix && len - i <= maxname;
-
-        if (!fits) {
-            const char *p = strchr(mbName + i, '/');
-            if (p)
-                nexti = p - mbName + 1;
-            if (!p || nexti - 1 > maxprefix)
-                notGoingToFit = true;
-        }
-
-        if (fits || notGoingToFit) {
-            strncpy(Get(TAR_NAME), mbName + i, maxname);
-            if (i > 0)
-                strncpy(Get(TAR_PREFIX), mbName, i - 1);
-            break;
-        }
-
-        i = nexti;
-    }
-
-    return fits && !badconv;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Some helpers
-
-static wxFileOffset RoundUpSize(wxFileOffset size, int factor = 1)
-{
-    wxFileOffset chunk = TAR_BLOCKSIZE * factor;
-    return ((size + chunk - 1) / chunk) * chunk;
-}
-
-#ifdef __UNIX__
-
-static wxString wxTarUserName(int uid)
-{
-    struct passwd *ppw;
-
-#ifdef HAVE_GETPWUID_R
-#if defined HAVE_SYSCONF && defined _SC_GETPW_R_SIZE_MAX
-    long pwsize = sysconf(_SC_GETPW_R_SIZE_MAX);
-    size_t bufsize(wxMin(wxMax(1024l, pwsize), 32768l));
-#else
-    size_t bufsize = 1024;
-#endif
-    wxCharBuffer buf(bufsize);
-    struct passwd pw;
-
-    memset(&pw, 0, sizeof(pw));
-    if (getpwuid_r(uid, &pw, buf.data(), bufsize, &ppw) == 0 && pw.pw_name)
-        return wxString(pw.pw_name, wxConvLibc);
-#else
-    if ((ppw = getpwuid(uid)) != NULL)
-        return wxString(ppw->pw_name, wxConvLibc);
-#endif
-    return _("unknown");
-}
-
-static wxString wxTarGroupName(int gid)
-{
-    struct group *pgr;
-#ifdef HAVE_GETGRGID_R
-#if defined HAVE_SYSCONF && defined _SC_GETGR_R_SIZE_MAX
-    long grsize = sysconf(_SC_GETGR_R_SIZE_MAX);
-    size_t bufsize(wxMin(wxMax(1024l, grsize), 32768l));
-#else
-    size_t bufsize = 1024;
-#endif
-    wxCharBuffer buf(bufsize);
-    struct group gr;
-
-    memset(&gr, 0, sizeof(gr));
-    if (getgrgid_r(gid, &gr, buf.data(), bufsize, &pgr) == 0 && gr.gr_name)
-        return wxString(gr.gr_name, wxConvLibc);
-#else
-    if ((pgr = getgrgid(gid)) != NULL)
-        return wxString(pgr->gr_name, wxConvLibc);
-#endif
-    return _("unknown");
-}
-
-#endif  // __UNIX__
-
-// Cache the user and group names since getting them can be expensive,
-// get both names and ids at the same time.
-//
-struct wxTarUser
-{
-    wxTarUser();
-    ~wxTarUser() { delete [] uname; delete [] gname; }
-
-    int uid;
-    int gid;
-
-    wxChar *uname;
-    wxChar *gname;
-};
-
-wxTarUser::wxTarUser()
-{
-#ifdef __UNIX__
-    uid = getuid();
-    gid = getgid();
-    wxString usr = wxTarUserName(uid);
-    wxString grp = wxTarGroupName(gid);
-#else
-    uid = 0;
-    gid = 0;
-    wxString usr = wxGetUserId();
-    wxString grp = _("unknown");
-#endif
-
-    uname = new wxChar[usr.length() + 1];
-    wxStrcpy(uname, usr.c_str());
-
-    gname = new wxChar[grp.length() + 1];
-    wxStrcpy(gname, grp.c_str());
-}
-
-static const wxTarUser& wxGetTarUser()
-{
-#if wxUSE_THREADS
-    static wxCriticalSection cs;
-    wxCriticalSectionLocker lock(cs);
-#endif
-    static wxTarUser tu;
-    return tu;
-}
-
-// ignore the size field for entry types 3, 4, 5 and 6
-//
-static inline wxFileOffset GetDataSize(const wxTarEntry& entry)
-{
-    switch (entry.GetTypeFlag()) {
-        case wxTAR_CHRTYPE:
-        case wxTAR_BLKTYPE:
-        case wxTAR_DIRTYPE:
-        case wxTAR_FIFOTYPE:
-            return 0;
-        default:
-            return entry.GetSize();
-    }
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Tar Entry
-// Holds all the meta-data for a file in the tar
-
-wxTarEntry::wxTarEntry(const wxString& name /*=wxEmptyString*/,
-                       const wxDateTime& dt /*=wxDateTime::Now()*/,
-                       wxFileOffset size    /*=0*/)
-  : m_Mode(0644),
-    m_IsModeSet(false),
-    m_UserId(wxGetTarUser().uid),
-    m_GroupId(wxGetTarUser().gid),
-    m_Size(size),
-    m_Offset(wxInvalidOffset),
-    m_ModifyTime(dt),
-    m_TypeFlag(wxTAR_REGTYPE),
-    m_UserName(wxGetTarUser().uname),
-    m_GroupName(wxGetTarUser().gname),
-    m_DevMajor(~0),
-    m_DevMinor(~0)
-{
-    if (!name.empty())
-        SetName(name);
-}
-
-wxTarEntry::~wxTarEntry()
-{
-}
-
-wxTarEntry::wxTarEntry(const wxTarEntry& e)
-  : wxArchiveEntry(),
-    m_Name(e.m_Name),
-    m_Mode(e.m_Mode),
-    m_IsModeSet(e.m_IsModeSet),
-    m_UserId(e.m_UserId),
-    m_GroupId(e.m_GroupId),
-    m_Size(e.m_Size),
-    m_Offset(e.m_Offset),
-    m_ModifyTime(e.m_ModifyTime),
-    m_AccessTime(e.m_AccessTime),
-    m_CreateTime(e.m_CreateTime),
-    m_TypeFlag(e.m_TypeFlag),
-    m_LinkName(e.m_LinkName),
-    m_UserName(e.m_UserName),
-    m_GroupName(e.m_GroupName),
-    m_DevMajor(e.m_DevMajor),
-    m_DevMinor(e.m_DevMinor)
-{
-}
-
-wxTarEntry& wxTarEntry::operator=(const wxTarEntry& e)
-{
-    if (&e != this) {
-        m_Name = e.m_Name;
-        m_Mode = e.m_Mode;
-        m_IsModeSet = e.m_IsModeSet;
-        m_UserId = e.m_UserId;
-        m_GroupId = e.m_GroupId;
-        m_Size = e.m_Size;
-        m_Offset = e.m_Offset;
-        m_ModifyTime = e.m_ModifyTime;
-        m_AccessTime = e.m_AccessTime;
-        m_CreateTime = e.m_CreateTime;
-        m_TypeFlag = e.m_TypeFlag;
-        m_LinkName = e.m_LinkName;
-        m_UserName = e.m_UserName;
-        m_GroupName = e.m_GroupName;
-        m_DevMajor = e.m_DevMajor;
-        m_DevMinor = e.m_DevMinor;
-    }
-    return *this;
-}
-
-wxString wxTarEntry::GetName(wxPathFormat format /*=wxPATH_NATIVE*/) const
-{
-    bool isDir = IsDir() && !m_Name.empty();
-
-    // optimisations for common (and easy) cases
-    switch (wxFileName::GetFormat(format)) {
-        case wxPATH_DOS:
-        {
-            wxString name(isDir ? m_Name + wxT("\\") : m_Name);
-            for (size_t i = 0; i < name.length(); i++)
-                if (name[i] == wxT('/'))
-                    name[i] = wxT('\\');
-            return name;
-        }
-
-        case wxPATH_UNIX:
-            return isDir ? m_Name + wxT("/") : m_Name;
-
-        default:
-            ;
-    }
-
-    wxFileName fn;
-
-    if (isDir)
-        fn.AssignDir(m_Name, wxPATH_UNIX);
-    else
-        fn.Assign(m_Name, wxPATH_UNIX);
-
-    return fn.GetFullPath(format);
-}
-
-void wxTarEntry::SetName(const wxString& name, wxPathFormat format)
-{
-    bool isDir;
-    m_Name = GetInternalName(name, format, &isDir);
-    SetIsDir(isDir);
-}
-
-// Static - Internally tars and zips use forward slashes for the path
-// separator, absolute paths aren't allowed, and directory names have a
-// trailing slash.  This function converts a path into this internal format,
-// but without a trailing slash for a directory.
-//
-wxString wxTarEntry::GetInternalName(const wxString& name,
-                                     wxPathFormat format /*=wxPATH_NATIVE*/,
-                                     bool *pIsDir        /*=NULL*/)
-{
-    wxString internal;
-
-    if (wxFileName::GetFormat(format) != wxPATH_UNIX)
-        internal = wxFileName(name, format).GetFullPath(wxPATH_UNIX);
-    else
-        internal = name;
-
-    bool isDir = !internal.empty() && internal.Last() == '/';
-    if (pIsDir)
-        *pIsDir = isDir;
-    if (isDir)
-        internal.erase(internal.length() - 1);
-
-    while (!internal.empty() && *internal.begin() == '/')
-        internal.erase(0, 1);
-    while (!internal.empty() && internal.compare(0, 2, wxT("./")) == 0)
-        internal.erase(0, 2);
-    if (internal == wxT(".") || internal == wxT(".."))
-        internal = wxEmptyString;
-
-    return internal;
-}
-
-bool wxTarEntry::IsDir() const
-{
-    return m_TypeFlag == wxTAR_DIRTYPE;
-}
-
-void wxTarEntry::SetIsDir(bool isDir)
-{
-    if (isDir)
-        m_TypeFlag = wxTAR_DIRTYPE;
-    else if (m_TypeFlag == wxTAR_DIRTYPE)
-        m_TypeFlag = wxTAR_REGTYPE;
-}
-
-void wxTarEntry::SetIsReadOnly(bool isReadOnly)
-{
-    if (isReadOnly)
-        m_Mode &= ~0222;
-    else
-        m_Mode |= 0200;
-}
-
-int wxTarEntry::GetMode() const
-{
-    if (m_IsModeSet || !IsDir())
-        return m_Mode;
-    else
-        return m_Mode | 0111;
-
-}
-
-void wxTarEntry::SetMode(int mode)
-{
-    m_Mode = mode & 07777;
-    m_IsModeSet = true;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Input stream
-
-wxDECLARE_SCOPED_PTR(wxTarEntry, wxTarEntryPtr_)
-wxDEFINE_SCOPED_PTR (wxTarEntry, wxTarEntryPtr_)
-
-wxTarInputStream::wxTarInputStream(wxInputStream& stream,
-                                   wxMBConv& conv /*=wxConvLocal*/)
- :  wxArchiveInputStream(stream, conv)
-{
-    Init();
-}
-
-wxTarInputStream::wxTarInputStream(wxInputStream *stream,
-                                   wxMBConv& conv /*=wxConvLocal*/)
- :  wxArchiveInputStream(stream, conv)
-{
-    Init();
-}
-
-void wxTarInputStream::Init()
-{
-    m_pos = wxInvalidOffset;
-    m_offset = 0;
-    m_size = wxInvalidOffset;
-    m_sumType = SUM_UNKNOWN;
-    m_tarType = TYPE_USTAR;
-    m_hdr = new wxTarHeaderBlock;
-    m_HeaderRecs = NULL;
-    m_GlobalHeaderRecs = NULL;
-    m_lasterror = m_parent_i_stream->GetLastError();
-}
-
-wxTarInputStream::~wxTarInputStream()
-{
-    delete m_hdr;
-    delete m_HeaderRecs;
-    delete m_GlobalHeaderRecs;
-}
-
-wxTarEntry *wxTarInputStream::GetNextEntry()
-{
-    m_lasterror = ReadHeaders();
-
-    if (!IsOk())
-        return NULL;
-
-    wxTarEntryPtr_ entry(new wxTarEntry);
-
-    entry->SetMode(GetHeaderNumber(TAR_MODE));
-    entry->SetUserId(GetHeaderNumber(TAR_UID));
-    entry->SetGroupId(GetHeaderNumber(TAR_UID));
-    entry->SetSize(GetHeaderNumber(TAR_SIZE));
-
-    entry->SetOffset(m_offset);
-
-    entry->SetDateTime(GetHeaderDate(wxT("mtime")));
-    entry->SetAccessTime(GetHeaderDate(wxT("atime")));
-    entry->SetCreateTime(GetHeaderDate(wxT("ctime")));
-
-    entry->SetTypeFlag(*m_hdr->Get(TAR_TYPEFLAG));
-    bool isDir = entry->IsDir();
-
-    entry->SetLinkName(GetHeaderString(TAR_LINKNAME));
-
-    if (m_tarType != TYPE_OLDTAR) {
-        entry->SetUserName(GetHeaderString(TAR_UNAME));
-        entry->SetGroupName(GetHeaderString(TAR_GNAME));
-
-        entry->SetDevMajor(GetHeaderNumber(TAR_DEVMAJOR));
-        entry->SetDevMinor(GetHeaderNumber(TAR_DEVMINOR));
-    }
-
-    entry->SetName(GetHeaderPath(), wxPATH_UNIX);
-    if (isDir)
-        entry->SetIsDir();
-
-    if (m_HeaderRecs)
-        m_HeaderRecs->clear();
-
-    m_size = GetDataSize(*entry);
-    m_pos = 0;
-
-    return entry.release();
-}
-
-bool wxTarInputStream::OpenEntry(wxTarEntry& entry)
-{
-    wxFileOffset offset = entry.GetOffset();
-
-    if (GetLastError() != wxSTREAM_READ_ERROR
-            && m_parent_i_stream->IsSeekable()
-            && m_parent_i_stream->SeekI(offset) == offset)
-    {
-        m_offset = offset;
-        m_size = GetDataSize(entry);
-        m_pos = 0;
-        m_lasterror = wxSTREAM_NO_ERROR;
-        return true;
-    } else {
-        m_lasterror = wxSTREAM_READ_ERROR;
-        return false;
-    }
-}
-
-bool wxTarInputStream::OpenEntry(wxArchiveEntry& entry)
-{
-    wxTarEntry *tarEntry = wxStaticCast(&entry, wxTarEntry);
-    return tarEntry ? OpenEntry(*tarEntry) : false;
-}
-
-bool wxTarInputStream::CloseEntry()
-{
-    if (m_lasterror == wxSTREAM_READ_ERROR)
-        return false;
-    if (!IsOpened())
-        return true;
-
-    wxFileOffset size = RoundUpSize(m_size);
-    wxFileOffset remainder = size - m_pos;
-
-    if (remainder && m_parent_i_stream->IsSeekable()) {
-        wxLogNull nolog;
-        if (m_parent_i_stream->SeekI(remainder, wxFromCurrent)
-                != wxInvalidOffset)
-            remainder = 0;
-    }
-
-    if (remainder) {
-        const int BUFSIZE = 8192;
-        wxCharBuffer buf(BUFSIZE);
-
-        while (remainder > 0 && m_parent_i_stream->IsOk())
-            remainder -= m_parent_i_stream->Read(
-                    buf.data(), wxMin(BUFSIZE, remainder)).LastRead();
-    }
-
-    m_pos = wxInvalidOffset;
-    m_offset += size;
-    m_lasterror = m_parent_i_stream->GetLastError();
-
-    return IsOk();
-}
-
-wxStreamError wxTarInputStream::ReadHeaders()
-{
-    if (!CloseEntry())
-        return wxSTREAM_READ_ERROR;
-
-    bool done = false;
-
-    while (!done) {
-        m_hdr->Read(*m_parent_i_stream);
-        if (m_parent_i_stream->Eof())
-        {
-            wxLogError(_("incomplete header block in tar"));
-        }
-        if (!*m_parent_i_stream)
-            return wxSTREAM_READ_ERROR;
-        m_offset += TAR_BLOCKSIZE;
-
-        // an all-zero header marks the end of the tar
-        if (m_hdr->IsAllZeros())
-            return wxSTREAM_EOF;
-
-        // the checksum is supposed to be the unsigned sum of the header bytes,
-        // but there have been versions of tar that used the signed sum, so
-        // accept that too, but only if used throughout.
-        wxUint32 chksum = m_hdr->GetOctal(TAR_CHKSUM);
-        bool ok = false;
-
-        if (m_sumType != SUM_SIGNED) {
-            ok = chksum == m_hdr->Sum();
-            if (m_sumType == SUM_UNKNOWN)
-                m_sumType = ok ? SUM_UNSIGNED : SUM_SIGNED;
-        }
-        if (m_sumType == SUM_SIGNED)
-            ok = chksum == m_hdr->Sum(true);
-        if (!ok) {
-            wxLogError(_("checksum failure reading tar header block"));
-            return wxSTREAM_READ_ERROR;
-        }
-
-        if (strcmp(m_hdr->Get(TAR_MAGIC), USTAR_MAGIC) == 0)
-            m_tarType = TYPE_USTAR;
-        else if (strcmp(m_hdr->Get(TAR_MAGIC), GNU_MAGIC) == 0 &&
-                 strcmp(m_hdr->Get(TAR_VERSION), GNU_VERION) == 0)
-            m_tarType = TYPE_GNUTAR;
-        else
-            m_tarType = TYPE_OLDTAR;
-
-        if (m_tarType != TYPE_USTAR)
-            break;
-
-        switch (*m_hdr->Get(TAR_TYPEFLAG)) {
-            case 'g': ReadExtendedHeader(m_GlobalHeaderRecs); break;
-            case 'x': ReadExtendedHeader(m_HeaderRecs); break;
-            default:  done = true;
-        }
-    }
-
-    return wxSTREAM_NO_ERROR;
-}
-
-wxString wxTarInputStream::GetExtendedHeader(const wxString& key) const
-{
-    wxTarHeaderRecords::iterator it;
-
-    // look at normal extended header records first
-    if (m_HeaderRecs) {
-        it = m_HeaderRecs->find(key);
-        if (it != m_HeaderRecs->end())
-            return wxString(it->second.wc_str(wxConvUTF8), GetConv());
-    }
-
-    // if not found, look at the global header records
-    if (m_GlobalHeaderRecs) {
-        it = m_GlobalHeaderRecs->find(key);
-        if (it != m_GlobalHeaderRecs->end())
-            return wxString(it->second.wc_str(wxConvUTF8), GetConv());
-    }
-
-    return wxEmptyString;
-}
-
-wxString wxTarInputStream::GetHeaderPath() const
-{
-    wxString path;
-
-    if ((path = GetExtendedHeader(wxT("path"))) != wxEmptyString)
-        return path;
-
-    path = wxString(m_hdr->Get(TAR_NAME), GetConv());
-    if (m_tarType != TYPE_USTAR)
-        return path;
-
-    const char *prefix = m_hdr->Get(TAR_PREFIX);
-    return *prefix ? wxString(prefix, GetConv()) + wxT("/") + path : path;
-}
-
-wxDateTime wxTarInputStream::GetHeaderDate(const wxString& key) const
-{
-    wxString value;
-
-    // try extended header, stored as decimal seconds since the epoch
-    if ((value = GetExtendedHeader(key)) != wxEmptyString) {
-        wxLongLong ll;
-        ll.Assign(wxAtof(value) * 1000.0);
-        return ll;
-    }
-
-    if (key == wxT("mtime"))
-        return wxLongLong(m_hdr->GetOctal(TAR_MTIME)) * 1000L;
-
-    return wxDateTime();
-}
-
-wxTarNumber wxTarInputStream::GetHeaderNumber(int id) const
-{
-    wxString value;
-
-    if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) {
-        wxTarNumber n = 0;
-        wxString::const_iterator p = value.begin();
-        while (*p == ' ' && p != value.end())
-            p++;
-        while (isdigit(*p))
-            n = n * 10 + (*p++ - '0');
-        return n;
-    } else {
-        return m_hdr->GetOctal(id);
-    }
-}
-
-wxString wxTarInputStream::GetHeaderString(int id) const
-{
-    wxString value;
-
-    if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString)
-        return value;
-
-    return wxString(m_hdr->Get(id), GetConv());
-}
-
-// An extended header consists of one or more records, each constructed:
-// "%d %s=%s\n", <length>, <keyword>, <value>
-// <length> is the byte length, <keyword> and <value> are UTF-8
-
-bool wxTarInputStream::ReadExtendedHeader(wxTarHeaderRecords*& recs)
-{
-    if (!recs)
-        recs = new wxTarHeaderRecords;
-
-    // round length up to a whole number of blocks
-    size_t len = m_hdr->GetOctal(TAR_SIZE);
-    size_t size = RoundUpSize(len);
-
-    // read in the whole header since it should be small
-    wxCharBuffer buf(size);
-    size_t lastread = m_parent_i_stream->Read(buf.data(), size).LastRead();
-    if (lastread < len)
-        len = lastread;
-    buf.data()[len] = 0;
-    m_offset += lastread;
-
-    size_t recPos, recSize;
-    bool ok = true;
-
-    for (recPos = 0; recPos < len && ok; recPos += recSize) {
-        char *pRec = buf.data() + recPos;
-        char *p = pRec;
-
-        // read the record size (byte count in ascii decimal)
-        recSize = 0;
-        while (isdigit((unsigned char) *p))
-            recSize = recSize * 10 + *p++ - '0';
-
-        // validity checks
-        if (recPos + recSize > len)
-            break;
-        if (recSize < p - pRec + (size_t)3 || *p != ' '
-                || pRec[recSize - 1] != '\012') {
-            ok = false;
-            continue;
-        }
-
-        // replace the final '\n' with a nul, to terminate value
-        pRec[recSize - 1] = 0;
-        // the key is here, following the space
-        char *pKey = ++p;
-
-        // look forward for the '=', the value follows
-        while (*p && *p != '=')
-            p++;
-        if (!*p) {
-            ok = false;
-            continue;
-        }
-        // replace the '=' with a nul, to terminate the key
-        *p++ = 0;
-
-        wxString key(wxConvUTF8.cMB2WC(pKey), GetConv());
-        wxString value(wxConvUTF8.cMB2WC(p), GetConv());
-
-        // an empty value unsets a previously given value
-        if (value.empty())
-            recs->erase(key);
-        else
-            (*recs)[key] = value;
-    }
-
-    if (!ok || recPos < len || size != lastread) {
-        wxLogWarning(_("invalid data in extended tar header"));
-        return false;
-    }
-
-    return true;
-}
-
-wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    if (!IsOpened()) {
-        wxLogError(_("tar entry not open"));
-        m_lasterror = wxSTREAM_READ_ERROR;
-    }
-    if (!IsOk())
-        return wxInvalidOffset;
-
-    switch (mode) {
-        case wxFromStart:   break;
-        case wxFromCurrent: pos += m_pos; break;
-        case wxFromEnd:     pos += m_size; break;
-    }
-
-    if (pos < 0 || m_parent_i_stream->SeekI(m_offset + pos) == wxInvalidOffset)
-        return wxInvalidOffset;
-
-    m_pos = pos;
-    return m_pos;
-}
-
-size_t wxTarInputStream::OnSysRead(void *buffer, size_t size)
-{
-    if (!IsOpened()) {
-        wxLogError(_("tar entry not open"));
-        m_lasterror = wxSTREAM_READ_ERROR;
-    }
-    if (!IsOk() || !size)
-        return 0;
-
-    if (m_pos >= m_size)
-        size = 0;
-    else if (m_pos + size > m_size + (size_t)0)
-        size = m_size - m_pos;
-
-    size_t lastread = m_parent_i_stream->Read(buffer, size).LastRead();
-    m_pos += lastread;
-
-    if (m_pos >= m_size) {
-        m_lasterror = wxSTREAM_EOF;
-    } else if (!m_parent_i_stream->IsOk()) {
-        // any other error will have been reported by the underlying stream
-        if (m_parent_i_stream->Eof())
-        {
-            wxLogError(_("unexpected end of file"));
-        }
-        m_lasterror = wxSTREAM_READ_ERROR;
-    }
-
-    return lastread;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Output stream
-
-wxTarOutputStream::wxTarOutputStream(wxOutputStream& stream,
-                                     wxTarFormat format /*=wxTAR_PAX*/,
-                                     wxMBConv& conv     /*=wxConvLocal*/)
- :  wxArchiveOutputStream(stream, conv)
-{
-    Init(format);
-}
-
-wxTarOutputStream::wxTarOutputStream(wxOutputStream *stream,
-                                     wxTarFormat format /*=wxTAR_PAX*/,
-                                     wxMBConv& conv     /*=wxConvLocal*/)
- :  wxArchiveOutputStream(stream, conv)
-{
-    Init(format);
-}
-
-void wxTarOutputStream::Init(wxTarFormat format)
-{
-    m_pos = wxInvalidOffset;
-    m_maxpos = wxInvalidOffset;
-    m_size = wxInvalidOffset;
-    m_headpos = wxInvalidOffset;
-    m_datapos = wxInvalidOffset;
-    m_tarstart = wxInvalidOffset;
-    m_tarsize = 0;
-    m_pax = format == wxTAR_PAX;
-    m_BlockingFactor = m_pax ? 10 : 20;
-    m_chksum = 0;
-    m_large = false;
-    m_hdr = new wxTarHeaderBlock;
-    m_hdr2 = NULL;
-    m_extendedHdr = NULL;
-    m_extendedSize = 0;
-    m_lasterror = m_parent_o_stream->GetLastError();
-    m_endrecWritten = false;
-}
-
-wxTarOutputStream::~wxTarOutputStream()
-{
-    Close();
-    delete m_hdr;
-    delete m_hdr2;
-    delete [] m_extendedHdr;
-}
-
-bool wxTarOutputStream::PutNextEntry(wxTarEntry *entry)
-{
-    wxTarEntryPtr_ e(entry);
-
-    if (!CloseEntry())
-        return false;
-
-    if (!m_tarsize) {
-        wxLogNull nolog;
-        m_tarstart = m_parent_o_stream->TellO();
-    }
-
-    if (m_tarstart != wxInvalidOffset)
-        m_headpos = m_tarstart + m_tarsize;
-
-    if (WriteHeaders(*e)) {
-        m_pos = 0;
-        m_maxpos = 0;
-        m_size = GetDataSize(*e);
-        if (m_tarstart != wxInvalidOffset)
-            m_datapos = m_tarstart + m_tarsize;
-
-        // types that are not allowd any data
-        const char nodata[] = {
-            wxTAR_LNKTYPE, wxTAR_SYMTYPE, wxTAR_CHRTYPE, wxTAR_BLKTYPE,
-            wxTAR_DIRTYPE, wxTAR_FIFOTYPE, 0
-        };
-        int typeflag = e->GetTypeFlag();
-
-        // pax does now allow data for wxTAR_LNKTYPE
-        if (!m_pax || typeflag != wxTAR_LNKTYPE)
-            if (strchr(nodata, typeflag) != NULL)
-                CloseEntry();
-    }
-
-    return IsOk();
-}
-
-bool wxTarOutputStream::PutNextEntry(const wxString& name,
-                                     const wxDateTime& dt,
-                                     wxFileOffset size)
-{
-    return PutNextEntry(new wxTarEntry(name, dt, size));
-}
-
-bool wxTarOutputStream::PutNextDirEntry(const wxString& name,
-                                        const wxDateTime& dt)
-{
-    wxTarEntry *entry = new wxTarEntry(name, dt);
-    entry->SetIsDir();
-    return PutNextEntry(entry);
-}
-
-bool wxTarOutputStream::PutNextEntry(wxArchiveEntry *entry)
-{
-    wxTarEntry *tarEntry = wxStaticCast(entry, wxTarEntry);
-    if (!tarEntry)
-        delete entry;
-    return PutNextEntry(tarEntry);
-}
-
-bool wxTarOutputStream::CopyEntry(wxTarEntry *entry,
-                                  wxTarInputStream& inputStream)
-{
-    if (PutNextEntry(entry))
-        Write(inputStream);
-    return IsOk() && inputStream.Eof();
-}
-
-bool wxTarOutputStream::CopyEntry(wxArchiveEntry *entry,
-                                  wxArchiveInputStream& inputStream)
-{
-    if (PutNextEntry(entry))
-        Write(inputStream);
-    return IsOk() && inputStream.Eof();
-}
-
-bool wxTarOutputStream::CloseEntry()
-{
-    if (!IsOpened())
-        return true;
-
-    if (m_pos < m_maxpos) {
-        wxASSERT(m_parent_o_stream->IsSeekable());
-        m_parent_o_stream->SeekO(m_datapos + m_maxpos);
-        m_lasterror = m_parent_o_stream->GetLastError();
-        m_pos = m_maxpos;
-    }
-
-    if (IsOk()) {
-        wxFileOffset size = RoundUpSize(m_pos);
-        if (size > m_pos) {
-            memset(m_hdr, 0, size - m_pos);
-            m_parent_o_stream->Write(m_hdr, size - m_pos);
-            m_lasterror = m_parent_o_stream->GetLastError();
-        }
-        m_tarsize += size;
-    }
-
-    if (IsOk() && m_pos != m_size)
-        ModifyHeader();
-
-    m_pos = wxInvalidOffset;
-    m_maxpos = wxInvalidOffset;
-    m_size = wxInvalidOffset;
-    m_headpos = wxInvalidOffset;
-    m_datapos = wxInvalidOffset;
-
-    return IsOk();
-}
-
-bool wxTarOutputStream::Close()
-{
-    if (!CloseEntry() || (m_tarsize == 0 && m_endrecWritten))
-        return false;
-
-    memset(m_hdr, 0, sizeof(*m_hdr));
-    int count = (RoundUpSize(m_tarsize + 2 * TAR_BLOCKSIZE, m_BlockingFactor)
-                    - m_tarsize) / TAR_BLOCKSIZE;
-    while (count--)
-        m_parent_o_stream->Write(m_hdr, TAR_BLOCKSIZE);
-
-    m_tarsize = 0;
-    m_tarstart = wxInvalidOffset;
-    m_lasterror = m_parent_o_stream->GetLastError();
-    m_endrecWritten = true;
-    return IsOk();
-}
-
-bool wxTarOutputStream::WriteHeaders(wxTarEntry& entry)
-{
-    memset(m_hdr, 0, sizeof(*m_hdr));
-
-    SetHeaderPath(entry.GetName(wxPATH_UNIX));
-
-    SetHeaderNumber(TAR_MODE, entry.GetMode());
-    SetHeaderNumber(TAR_UID, entry.GetUserId());
-    SetHeaderNumber(TAR_GID, entry.GetGroupId());
-
-    if (entry.GetSize() == wxInvalidOffset)
-        entry.SetSize(0);
-    m_large = !SetHeaderNumber(TAR_SIZE, entry.GetSize());
-
-    SetHeaderDate(wxT("mtime"), entry.GetDateTime());
-    if (entry.GetAccessTime().IsValid())
-        SetHeaderDate(wxT("atime"), entry.GetAccessTime());
-    if (entry.GetCreateTime().IsValid())
-        SetHeaderDate(wxT("ctime"), entry.GetCreateTime());
-
-    *m_hdr->Get(TAR_TYPEFLAG) = char(entry.GetTypeFlag());
-
-    strcpy(m_hdr->Get(TAR_MAGIC), USTAR_MAGIC);
-    strcpy(m_hdr->Get(TAR_VERSION), USTAR_VERSION);
-
-    SetHeaderString(TAR_LINKNAME, entry.GetLinkName());
-    SetHeaderString(TAR_UNAME, entry.GetUserName());
-    SetHeaderString(TAR_GNAME, entry.GetGroupName());
-
-    if (~entry.GetDevMajor())
-        SetHeaderNumber(TAR_DEVMAJOR, entry.GetDevMajor());
-    if (~entry.GetDevMinor())
-        SetHeaderNumber(TAR_DEVMINOR, entry.GetDevMinor());
-
-    m_chksum = m_hdr->Sum();
-    m_hdr->SetOctal(TAR_CHKSUM, m_chksum);
-    if (!m_large)
-        m_chksum -= m_hdr->SumField(TAR_SIZE);
-
-    // The main header is now fully prepared so we know what extended headers
-    // (if any) will be needed. Output any extended headers before writing
-    // the main header.
-    if (m_extendedHdr && *m_extendedHdr) {
-        wxASSERT(m_pax);
-        // the extended headers are written to the tar as a file entry,
-        // so prepare a regular header block for the pseudo-file.
-        if (!m_hdr2)
-            m_hdr2 = new wxTarHeaderBlock;
-        memset(m_hdr2, 0, sizeof(*m_hdr2));
-
-        // an old tar that doesn't understand extended headers will
-        // extract it as a file, so give these fields reasonable values
-        // so that the user will have access to read and remove it.
-        m_hdr2->SetPath(PaxHeaderPath(wxT("%d/PaxHeaders.%p/%f"),
-                                      entry.GetName(wxPATH_UNIX)), GetConv());
-        m_hdr2->SetOctal(TAR_MODE, 0600);
-        strcpy(m_hdr2->Get(TAR_UID), m_hdr->Get(TAR_UID));
-        strcpy(m_hdr2->Get(TAR_GID), m_hdr->Get(TAR_GID));
-        size_t length = strlen(m_extendedHdr);
-        m_hdr2->SetOctal(TAR_SIZE, length);
-        strcpy(m_hdr2->Get(TAR_MTIME), m_hdr->Get(TAR_MTIME));
-        *m_hdr2->Get(TAR_TYPEFLAG) = 'x';
-        strcpy(m_hdr2->Get(TAR_MAGIC), USTAR_MAGIC);
-        strcpy(m_hdr2->Get(TAR_VERSION), USTAR_VERSION);
-        strcpy(m_hdr2->Get(TAR_UNAME), m_hdr->Get(TAR_UNAME));
-        strcpy(m_hdr2->Get(TAR_GNAME), m_hdr->Get(TAR_GNAME));
-
-        m_hdr2->SetOctal(TAR_CHKSUM, m_hdr2->Sum());
-
-        m_hdr2->Write(*m_parent_o_stream);
-        m_tarsize += TAR_BLOCKSIZE;
-
-        size_t rounded = RoundUpSize(length);
-        memset(m_extendedHdr + length, 0, rounded - length);
-        m_parent_o_stream->Write(m_extendedHdr, rounded);
-        m_tarsize += rounded;
-
-        *m_extendedHdr = 0;
-
-        // update m_headpos which is used to seek back to fix up the file
-        // length if it is not known in advance
-        if (m_tarstart != wxInvalidOffset)
-            m_headpos = m_tarstart + m_tarsize;
-    }
-
-    // if don't have extended headers just report error
-    if (!m_badfit.empty()) {
-        wxASSERT(!m_pax);
-        wxLogWarning(_("%s did not fit the tar header for entry '%s'"),
-                     m_badfit.c_str(), entry.GetName().c_str());
-        m_badfit.clear();
-    }
-
-    m_hdr->Write(*m_parent_o_stream);
-    m_tarsize += TAR_BLOCKSIZE;
-    m_lasterror = m_parent_o_stream->GetLastError();
-
-    return IsOk();
-}
-
-wxString wxTarOutputStream::PaxHeaderPath(const wxString& format,
-                                          const wxString& path)
-{
-    wxString d = path.BeforeLast(wxT('/'));
-    wxString f = path.AfterLast(wxT('/'));
-    wxString ret;
-
-    if (d.empty())
-        d = wxT(".");
-
-    ret.reserve(format.length() + path.length() + 16);
-
-    size_t begin = 0;
-    size_t end;
-
-    for (;;) {
-        end = format.find('%', begin);
-        if (end == wxString::npos || end + 1 >= format.length())
-            break;
-        ret << format.substr(begin, end - begin);
-        switch ( format[end + 1].GetValue() ) {
-            case 'd': ret << d; break;
-            case 'f': ret << f; break;
-            case 'p': ret << wxGetProcessId(); break;
-            case '%': ret << wxT("%"); break;
-        }
-        begin = end + 2;
-    }
-
-    ret << format.substr(begin);
-
-    return ret;
-}
-
-bool wxTarOutputStream::ModifyHeader()
-{
-    wxFileOffset originalPos = wxInvalidOffset;
-    wxFileOffset sizePos = wxInvalidOffset;
-
-    if (!m_large && m_headpos != wxInvalidOffset
-            && m_parent_o_stream->IsSeekable())
-    {
-        wxLogNull nolog;
-        originalPos = m_parent_o_stream->TellO();
-        if (originalPos != wxInvalidOffset)
-            sizePos =
-                m_parent_o_stream->SeekO(m_headpos + m_hdr->Offset(TAR_SIZE));
-    }
-
-    if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) {
-        wxLogError(_("incorrect size given for tar entry"));
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-        return false;
-    }
-
-    m_chksum += m_hdr->SumField(TAR_SIZE);
-    m_hdr->SetOctal(TAR_CHKSUM, m_chksum);
-    wxFileOffset sumPos = m_headpos + m_hdr->Offset(TAR_CHKSUM);
-
-    return
-        m_hdr->WriteField(*m_parent_o_stream, TAR_SIZE) &&
-        m_parent_o_stream->SeekO(sumPos) == sumPos &&
-        m_hdr->WriteField(*m_parent_o_stream, TAR_CHKSUM) &&
-        m_parent_o_stream->SeekO(originalPos) == originalPos;
-}
-
-void wxTarOutputStream::SetHeaderPath(const wxString& name)
-{
-    if (!m_hdr->SetPath(name, GetConv()) || (m_pax && !name.IsAscii()))
-        SetExtendedHeader(wxT("path"), name);
-}
-
-bool wxTarOutputStream::SetHeaderNumber(int id, wxTarNumber n)
-{
-    if (m_hdr->SetOctal(id, n)) {
-        return true;
-    } else {
-        SetExtendedHeader(m_hdr->Name(id), wxLongLong(n).ToString());
-        return false;
-    }
-}
-
-void wxTarOutputStream::SetHeaderString(int id, const wxString& str)
-{
-    strncpy(m_hdr->Get(id), str.mb_str(GetConv()), m_hdr->Len(id));
-    if (str.length() > m_hdr->Len(id))
-        SetExtendedHeader(m_hdr->Name(id), str);
-}
-
-void wxTarOutputStream::SetHeaderDate(const wxString& key,
-                                      const wxDateTime& datetime)
-{
-    wxLongLong ll = datetime.IsValid() ? datetime.GetValue() : wxLongLong(0);
-    wxLongLong secs = ll / 1000L;
-
-    if (key != wxT("mtime")
-        || !m_hdr->SetOctal(TAR_MTIME, wxTarNumber(secs.GetValue()))
-        || secs <= 0 || secs >= 0x7fffffff)
-    {
-        wxString str;
-        if (ll >= LONG_MIN && ll <= LONG_MAX) {
-            str.Printf(wxT("%g"), ll.ToLong() / 1000.0);
-        } else {
-            str = ll.ToString();
-            str.insert(str.end() - 3, '.');
-        }
-        SetExtendedHeader(key, str);
-    }
-}
-
-void wxTarOutputStream::SetExtendedHeader(const wxString& key,
-                                          const wxString& value)
-{
-    if (m_pax) {
-#if wxUSE_UNICODE
-        const wxCharBuffer utf_key = key.utf8_str();
-        const wxCharBuffer utf_value = value.utf8_str();
-#else
-        const wxWX2WCbuf wide_key = key.wc_str(GetConv());
-        const wxCharBuffer utf_key = wxConvUTF8.cWC2MB(wide_key);
-
-        const wxWX2WCbuf wide_value = value.wc_str(GetConv());
-        const wxCharBuffer utf_value = wxConvUTF8.cWC2MB(wide_value);
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
-        // a small buffer to format the length field in
-        char buf[32];
-        // length of "99<space><key>=<value>\n"
-        unsigned long length = strlen(utf_value) + strlen(utf_key) + 5;
-        sprintf(buf, "%lu", length);
-        // the length includes itself
-        size_t lenlen = strlen(buf);
-        if (lenlen != 2) {
-            length += lenlen - 2;
-            sprintf(buf, "%lu", length);
-            if (strlen(buf) > lenlen)
-                sprintf(buf, "%lu", ++length);
-        }
-
-        // reallocate m_extendedHdr if it's not big enough
-        if (m_extendedSize < length) {
-            size_t rounded = RoundUpSize(length);
-            m_extendedSize <<= 1;
-            if (rounded > m_extendedSize)
-                m_extendedSize = rounded;
-            char *oldHdr = m_extendedHdr;
-            m_extendedHdr = new char[m_extendedSize];
-            if (oldHdr) {
-                strcpy(m_extendedHdr, oldHdr);
-                delete oldHdr;
-            } else {
-                *m_extendedHdr = 0;
-            }
-        }
-
-        // append the new record
-        char *append = strchr(m_extendedHdr, 0);
-        sprintf(append, "%s %s=%s\012", buf,
-                (const char*)utf_key, (const char*)utf_value);
-    }
-    else {
-        // if not pax then make a list of fields to report as errors
-        if (!m_badfit.empty())
-            m_badfit += wxT(", ");
-        m_badfit += key;
-    }
-}
-
-void wxTarOutputStream::Sync()
-{
-    m_parent_o_stream->Sync();
-}
-
-wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    if (!IsOpened()) {
-        wxLogError(_("tar entry not open"));
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-    }
-    if (!IsOk() || m_datapos == wxInvalidOffset)
-        return wxInvalidOffset;
-
-    switch (mode) {
-        case wxFromStart:   break;
-        case wxFromCurrent: pos += m_pos; break;
-        case wxFromEnd:     pos += m_maxpos; break;
-    }
-
-    if (pos < 0 || m_parent_o_stream->SeekO(m_datapos + pos) == wxInvalidOffset)
-        return wxInvalidOffset;
-
-    m_pos = pos;
-    return m_pos;
-}
-
-size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size)
-{
-    if (!IsOpened()) {
-        wxLogError(_("tar entry not open"));
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-    }
-    if (!IsOk() || !size)
-        return 0;
-
-    size_t lastwrite = m_parent_o_stream->Write(buffer, size).LastWrite();
-    m_pos += lastwrite;
-    if (m_pos > m_maxpos)
-        m_maxpos = m_pos;
-
-    if (lastwrite != size)
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-
-    return lastwrite;
-}
-
-#endif // wxUSE_TARSTREAM
+/////////////////////////////////////////////////////////////////////////////
+// Name:        tarstrm.cpp
+// Purpose:     Streams for Tar files
+// Author:      Mike Wetherell
+// RCS-ID:      $Id: tarstrm.cpp 63302 2010-01-28 21:46:09Z MW $
+// Copyright:   (c) 2004 Mike Wetherell
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_TARSTREAM
+
+#include "wx/tarstrm.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+#endif
+
+#include "wx/buffer.h"
+#include "wx/datetime.h"
+#include "wx/ptr_scpd.h"
+#include "wx/filename.h"
+#include "wx/thread.h"
+
+#include <ctype.h>
+
+#ifdef __UNIX__
+#include <pwd.h>
+#include <grp.h>
+#endif
+
+
+/////////////////////////////////////////////////////////////////////////////
+// constants
+
+enum {
+    TAR_NAME,
+    TAR_MODE,
+    TAR_UID,
+    TAR_GID,
+    TAR_SIZE,
+    TAR_MTIME,
+    TAR_CHKSUM,
+    TAR_TYPEFLAG,
+    TAR_LINKNAME,
+    TAR_MAGIC,
+    TAR_VERSION,
+    TAR_UNAME,
+    TAR_GNAME,
+    TAR_DEVMAJOR,
+    TAR_DEVMINOR,
+    TAR_PREFIX,
+    TAR_UNUSED,
+    TAR_NUMFIELDS
+};
+
+enum {
+    TAR_BLOCKSIZE = 512
+};
+
+// checksum type
+enum {
+    SUM_UNKNOWN,
+    SUM_UNSIGNED,
+    SUM_SIGNED
+};
+
+// type of input tar
+enum {
+    TYPE_OLDTAR,    // fields after TAR_LINKNAME are invalid
+    TYPE_GNUTAR,    // all fields except TAR_PREFIX are valid
+    TYPE_USTAR      // all fields are valid
+};
+
+// signatures
+static const char *USTAR_MAGIC   = "ustar";
+static const char *USTAR_VERSION = "00";
+static const char *GNU_MAGIC     = "ustar ";
+static const char *GNU_VERION    = " ";
+
+IMPLEMENT_DYNAMIC_CLASS(wxTarEntry, wxArchiveEntry)
+IMPLEMENT_DYNAMIC_CLASS(wxTarClassFactory, wxArchiveClassFactory)
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Class factory
+
+static wxTarClassFactory g_wxTarClassFactory;
+
+wxTarClassFactory::wxTarClassFactory()
+{
+    if (this == &g_wxTarClassFactory)
+        PushFront();
+}
+
+const wxChar * const *
+wxTarClassFactory::GetProtocols(wxStreamProtocolType type) const
+{
+    static const wxChar *protocols[] = { _T("tar"), NULL };
+    static const wxChar *mimetypes[] = { _T("application/x-tar"), NULL };
+    static const wxChar *fileexts[]  = { _T(".tar"), NULL };
+    static const wxChar *empty[]     = { NULL };
+
+    switch (type) {
+        case wxSTREAM_PROTOCOL: return protocols;
+        case wxSTREAM_MIMETYPE: return mimetypes;
+        case wxSTREAM_FILEEXT:  return fileexts;
+        default:                return empty;
+    }
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// tar header block
+
+typedef wxFileOffset wxTarNumber;
+
+struct wxTarField { const wxChar *name; int pos; };
+
+class wxTarHeaderBlock
+{
+public:
+    wxTarHeaderBlock()
+        { memset(data, 0, sizeof(data)); }
+    wxTarHeaderBlock(const wxTarHeaderBlock& hb)
+        { memcpy(data, hb.data, sizeof(data)); }
+
+    bool Read(wxInputStream& in);
+    bool Write(wxOutputStream& out);
+    inline bool WriteField(wxOutputStream& out, int id);
+
+    bool IsAllZeros() const;
+    wxUint32 Sum(bool SignedSum = false);
+    wxUint32 SumField(int id);
+
+    char *Get(int id) { return data + fields[id].pos + id; }
+    static size_t Len(int id) { return fields[id + 1].pos - fields[id].pos; }
+    static const wxChar *Name(int id) { return fields[id].name; }
+    static size_t Offset(int id) { return fields[id].pos; }
+
+    bool SetOctal(int id, wxTarNumber n);
+    wxTarNumber GetOctal(int id);
+    bool SetPath(const wxString& name, wxMBConv& conv);
+
+private:
+    char data[TAR_BLOCKSIZE + TAR_NUMFIELDS];
+    static const wxTarField fields[];
+    static void check();
+};
+
+wxDEFINE_SCOPED_PTR_TYPE(wxTarHeaderBlock)
+
+// A table giving the field names and offsets in a tar header block
+const wxTarField wxTarHeaderBlock::fields[] =
+{
+    { _T("name"), 0 },       // 100
+    { _T("mode"), 100 },     // 8
+    { _T("uid"), 108 },      // 8
+    { _T("gid"), 116 },      // 8
+    { _T("size"), 124 },     // 12
+    { _T("mtime"), 136 },    // 12
+    { _T("chksum"), 148 },   // 8
+    { _T("typeflag"), 156 }, // 1
+    { _T("linkname"), 157 }, // 100
+    { _T("magic"), 257 },    // 6
+    { _T("version"), 263 },  // 2
+    { _T("uname"), 265 },    // 32
+    { _T("gname"), 297 },    // 32
+    { _T("devmajor"), 329 }, // 8
+    { _T("devminor"), 337 }, // 8
+    { _T("prefix"), 345 },   // 155
+    { _T("unused"), 500 },   // 12
+    { NULL, TAR_BLOCKSIZE }
+};
+
+void wxTarHeaderBlock::check()
+{
+#if 0
+    wxCOMPILE_TIME_ASSERT(
+        WXSIZEOF(fields) == TAR_NUMFIELDS + 1,
+        Wrong_number_of_elements_in_fields_table
+    );
+#endif
+}
+
+bool wxTarHeaderBlock::IsAllZeros() const
+{
+    const char *p = data;
+    for (size_t i = 0; i < sizeof(data); i++)
+        if (p[i])
+            return false;
+    return true;
+}
+
+wxUint32 wxTarHeaderBlock::Sum(bool SignedSum /*=false*/)
+{
+    // the chksum field itself should be blanks during the calculation
+    memset(Get(TAR_CHKSUM), ' ', Len(TAR_CHKSUM));
+    const char *p = data;
+    wxUint32 n = 0;
+
+    if (SignedSum)
+        for (size_t i = 0; i < sizeof(data); i++)
+            n += (signed char)p[i];
+    else
+        for (size_t i = 0; i < sizeof(data); i++)
+            n += (unsigned char)p[i];
+
+    return n;
+}
+
+wxUint32 wxTarHeaderBlock::SumField(int id)
+{
+    unsigned char *p = (unsigned char*)Get(id);
+    unsigned char *q = p + Len(id);
+    wxUint32 n = 0;
+
+    while (p < q)
+        n += *p++;
+
+    return n;
+}
+
+bool wxTarHeaderBlock::Read(wxInputStream& in)
+{
+    bool ok = true;
+
+    for (int id = 0; id < TAR_NUMFIELDS && ok; id++)
+        ok = in.Read(Get(id), Len(id)).LastRead() == Len(id);
+
+    return ok;
+}
+
+bool wxTarHeaderBlock::Write(wxOutputStream& out)
+{
+    bool ok = true;
+
+    for (int id = 0; id < TAR_NUMFIELDS && ok; id++)
+        ok = WriteField(out, id);
+
+    return ok;
+}
+
+inline bool wxTarHeaderBlock::WriteField(wxOutputStream& out, int id)
+{
+    return out.Write(Get(id), Len(id)).LastWrite() == Len(id);
+}
+
+wxTarNumber wxTarHeaderBlock::GetOctal(int id)
+{
+    wxTarNumber n = 0;
+    const char *p = Get(id);
+    while (*p == ' ')
+        p++;
+    while (*p >= '0' && *p < '8')
+        n = (n << 3) | (*p++ - '0');
+    return n;
+}
+
+bool wxTarHeaderBlock::SetOctal(int id, wxTarNumber n)
+{
+    // set an octal field, return true if the number fits
+    char *field = Get(id);
+    char *p = field + Len(id);
+    *--p = 0;
+    while (p > field) {
+        *--p = char('0' + (n & 7));
+        n >>= 3;
+    }
+    return n == 0;
+}
+
+bool wxTarHeaderBlock::SetPath(const wxString& name, wxMBConv& conv)
+{
+    bool badconv = false;
+
+#if wxUSE_UNICODE
+    wxCharBuffer nameBuf = name.mb_str(conv);
+
+    // if the conversion fails make an approximation
+    if (!nameBuf) {
+        badconv = true;
+        size_t len = name.length();
+        wxCharBuffer approx(len);
+        for (size_t i = 0; i < len; i++)
+            approx.data()[i] = name[i] & ~0x7F ? '_' : name[i];
+        nameBuf = approx;
+    }
+
+    const char *mbName = nameBuf;
+#else
+    const char *mbName = name.c_str();
+    (void)conv;
+#endif
+
+    bool fits;
+    bool notGoingToFit = false;
+    size_t len = strlen(mbName);
+    size_t maxname = Len(TAR_NAME);
+    size_t maxprefix = Len(TAR_PREFIX);
+    size_t i = 0;
+    size_t nexti = 0;
+
+    for (;;) {
+        fits = i < maxprefix && len - i <= maxname;
+
+        if (!fits) {
+            const char *p = strchr(mbName + i, '/');
+            if (p)
+                nexti = p - mbName + 1;
+            if (!p || nexti - 1 > maxprefix)
+                notGoingToFit = true;
+        }
+
+        if (fits || notGoingToFit) {
+            strncpy(Get(TAR_NAME), mbName + i, maxname);
+            if (i > 0)
+                strncpy(Get(TAR_PREFIX), mbName, i - 1);
+            break;
+        }
+
+        i = nexti;
+    }
+
+    return fits && !badconv;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Some helpers
+
+static wxFileOffset RoundUpSize(wxFileOffset size, int factor = 1)
+{
+    wxFileOffset chunk = TAR_BLOCKSIZE * factor;
+    return ((size + chunk - 1) / chunk) * chunk;
+}
+
+#ifdef __UNIX__
+
+static wxString wxTarUserName(int uid)
+{
+    struct passwd *ppw;
+
+#ifdef HAVE_GETPWUID_R
+#if defined HAVE_SYSCONF && defined _SC_GETPW_R_SIZE_MAX
+    long pwsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+    size_t bufsize(wxMin(wxMax(1024l, pwsize), 32768l));
+#else
+    size_t bufsize = 1024;
+#endif
+    wxCharBuffer buf(bufsize);
+    struct passwd pw;
+
+    memset(&pw, 0, sizeof(pw));
+    if (getpwuid_r(uid, &pw, buf.data(), bufsize, &ppw) == 0 && pw.pw_name)
+        return wxString(pw.pw_name, wxConvLibc);
+#else
+    if ((ppw = getpwuid(uid)) != NULL)
+        return wxString(ppw->pw_name, wxConvLibc);
+#endif
+    return _("unknown");
+}
+
+static wxString wxTarGroupName(int gid)
+{
+    struct group *pgr;
+#ifdef HAVE_GETGRGID_R
+#if defined HAVE_SYSCONF && defined _SC_GETGR_R_SIZE_MAX
+    long grsize = sysconf(_SC_GETGR_R_SIZE_MAX);
+    size_t bufsize(wxMin(wxMax(1024l, grsize), 32768l));
+#else
+    size_t bufsize = 1024;
+#endif
+    wxCharBuffer buf(bufsize);
+    struct group gr;
+
+    memset(&gr, 0, sizeof(gr));
+    if (getgrgid_r(gid, &gr, buf.data(), bufsize, &pgr) == 0 && gr.gr_name)
+        return wxString(gr.gr_name, wxConvLibc);
+#else
+    if ((pgr = getgrgid(gid)) != NULL)
+        return wxString(pgr->gr_name, wxConvLibc);
+#endif
+    return _("unknown");
+}
+
+#endif  // __UNIX__
+
+// Cache the user and group names since getting them can be expensive,
+// get both names and ids at the same time.
+//
+struct wxTarUser
+{
+    wxTarUser();
+    ~wxTarUser() { delete [] uname; delete [] gname; }
+
+    int uid;
+    int gid;
+
+    wxChar *uname;
+    wxChar *gname;
+};
+
+wxTarUser::wxTarUser()
+{
+#ifdef __UNIX__
+    uid = getuid();
+    gid = getgid();
+    wxString usr = wxTarUserName(uid);
+    wxString grp = wxTarGroupName(gid);
+#else
+    uid = 0;
+    gid = 0;
+    wxString usr = wxGetUserId();
+    wxString grp = _("unknown");
+#endif
+
+    uname = new wxChar[usr.length() + 1];
+    wxStrcpy(uname, usr.c_str());
+
+    gname = new wxChar[grp.length() + 1];
+    wxStrcpy(gname, grp.c_str());
+}
+
+static const wxTarUser& wxGetTarUser()
+{
+#if wxUSE_THREADS
+    static wxCriticalSection cs;
+    wxCriticalSectionLocker lock(cs);
+#endif
+    static wxTarUser tu;
+    return tu;
+}
+
+// ignore the size field for entry types 3, 4, 5 and 6
+//
+static inline wxFileOffset GetDataSize(const wxTarEntry& entry)
+{
+    switch (entry.GetTypeFlag()) {
+        case wxTAR_CHRTYPE:
+        case wxTAR_BLKTYPE:
+        case wxTAR_DIRTYPE:
+        case wxTAR_FIFOTYPE:
+            return 0;
+        default:
+            return entry.GetSize();
+    }
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Tar Entry
+// Holds all the meta-data for a file in the tar
+
+wxTarEntry::wxTarEntry(const wxString& name /*=wxEmptyString*/,
+                       const wxDateTime& dt /*=wxDateTime::Now()*/,
+                       wxFileOffset size    /*=0*/)
+  : m_Mode(0644),
+    m_IsModeSet(false),
+    m_UserId(wxGetTarUser().uid),
+    m_GroupId(wxGetTarUser().gid),
+    m_Size(size),
+    m_Offset(wxInvalidOffset),
+    m_ModifyTime(dt),
+    m_TypeFlag(wxTAR_REGTYPE),
+    m_UserName(wxGetTarUser().uname),
+    m_GroupName(wxGetTarUser().gname),
+    m_DevMajor(~0),
+    m_DevMinor(~0)
+{
+    if (!name.empty())
+        SetName(name);
+}
+
+wxTarEntry::~wxTarEntry()
+{
+}
+
+wxTarEntry::wxTarEntry(const wxTarEntry& e)
+  : wxArchiveEntry(),
+    m_Name(e.m_Name),
+    m_Mode(e.m_Mode),
+    m_IsModeSet(e.m_IsModeSet),
+    m_UserId(e.m_UserId),
+    m_GroupId(e.m_GroupId),
+    m_Size(e.m_Size),
+    m_Offset(e.m_Offset),
+    m_ModifyTime(e.m_ModifyTime),
+    m_AccessTime(e.m_AccessTime),
+    m_CreateTime(e.m_CreateTime),
+    m_TypeFlag(e.m_TypeFlag),
+    m_LinkName(e.m_LinkName),
+    m_UserName(e.m_UserName),
+    m_GroupName(e.m_GroupName),
+    m_DevMajor(e.m_DevMajor),
+    m_DevMinor(e.m_DevMinor)
+{
+}
+
+wxTarEntry& wxTarEntry::operator=(const wxTarEntry& e)
+{
+    if (&e != this) {
+        m_Name = e.m_Name;
+        m_Mode = e.m_Mode;
+        m_IsModeSet = e.m_IsModeSet;
+        m_UserId = e.m_UserId;
+        m_GroupId = e.m_GroupId;
+        m_Size = e.m_Size;
+        m_Offset = e.m_Offset;
+        m_ModifyTime = e.m_ModifyTime;
+        m_AccessTime = e.m_AccessTime;
+        m_CreateTime = e.m_CreateTime;
+        m_TypeFlag = e.m_TypeFlag;
+        m_LinkName = e.m_LinkName;
+        m_UserName = e.m_UserName;
+        m_GroupName = e.m_GroupName;
+        m_DevMajor = e.m_DevMajor;
+        m_DevMinor = e.m_DevMinor;
+    }
+    return *this;
+}
+
+wxString wxTarEntry::GetName(wxPathFormat format /*=wxPATH_NATIVE*/) const
+{
+    bool isDir = IsDir() && !m_Name.empty();
+
+    // optimisations for common (and easy) cases
+    switch (wxFileName::GetFormat(format)) {
+        case wxPATH_DOS:
+        {
+            wxString name(isDir ? m_Name + _T("\\") : m_Name);
+            for (size_t i = 0; i < name.length(); i++)
+                if (name[i] == _T('/'))
+                    name[i] = _T('\\');
+            return name;
+        }
+
+        case wxPATH_UNIX:
+            return isDir ? m_Name + _T("/") : m_Name;
+
+        default:
+            ;
+    }
+
+    wxFileName fn;
+
+    if (isDir)
+        fn.AssignDir(m_Name, wxPATH_UNIX);
+    else
+        fn.Assign(m_Name, wxPATH_UNIX);
+
+    return fn.GetFullPath(format);
+}
+
+void wxTarEntry::SetName(const wxString& name, wxPathFormat format)
+{
+    bool isDir;
+    m_Name = GetInternalName(name, format, &isDir);
+    SetIsDir(isDir);
+}
+
+// Static - Internally tars and zips use forward slashes for the path
+// separator, absolute paths aren't allowed, and directory names have a
+// trailing slash.  This function converts a path into this internal format,
+// but without a trailing slash for a directory.
+//
+wxString wxTarEntry::GetInternalName(const wxString& name,
+                                     wxPathFormat format /*=wxPATH_NATIVE*/,
+                                     bool *pIsDir        /*=NULL*/)
+{
+    wxString internal;
+
+    if (wxFileName::GetFormat(format) != wxPATH_UNIX)
+        internal = wxFileName(name, format).GetFullPath(wxPATH_UNIX);
+    else
+        internal = name;
+
+    bool isDir = !internal.empty() && internal.Last() == '/';
+    if (pIsDir)
+        *pIsDir = isDir;
+    if (isDir)
+        internal.erase(internal.length() - 1);
+
+    while (!internal.empty() && *internal.begin() == '/')
+        internal.erase(0, 1);
+    while (!internal.empty() && internal.compare(0, 2, _T("./")) == 0)
+        internal.erase(0, 2);
+    if (internal == _T(".") || internal == _T(".."))
+        internal = wxEmptyString;
+
+    return internal;
+}
+
+bool wxTarEntry::IsDir() const
+{
+    return m_TypeFlag == wxTAR_DIRTYPE;
+}
+
+void wxTarEntry::SetIsDir(bool isDir)
+{
+    if (isDir)
+        m_TypeFlag = wxTAR_DIRTYPE;
+    else if (m_TypeFlag == wxTAR_DIRTYPE)
+        m_TypeFlag = wxTAR_REGTYPE;
+}
+
+void wxTarEntry::SetIsReadOnly(bool isReadOnly)
+{
+    if (isReadOnly)
+        m_Mode &= ~0222;
+    else
+        m_Mode |= 0200;
+}
+
+int wxTarEntry::GetMode() const
+{
+    if (m_IsModeSet || !IsDir())
+        return m_Mode;
+    else
+        return m_Mode | 0111;
+
+}
+
+void wxTarEntry::SetMode(int mode)
+{
+    m_Mode = mode & 07777;
+    m_IsModeSet = true;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Input stream
+
+wxDECLARE_SCOPED_PTR(wxTarEntry, wxTarEntryPtr_)
+wxDEFINE_SCOPED_PTR (wxTarEntry, wxTarEntryPtr_)
+
+wxTarInputStream::wxTarInputStream(wxInputStream& stream,
+                                   wxMBConv& conv /*=wxConvLocal*/)
+ :  wxArchiveInputStream(stream, conv)
+{
+    Init();
+}
+
+wxTarInputStream::wxTarInputStream(wxInputStream *stream,
+                                   wxMBConv& conv /*=wxConvLocal*/)
+ :  wxArchiveInputStream(stream, conv)
+{
+    Init();
+}
+
+void wxTarInputStream::Init()
+{
+    m_pos = wxInvalidOffset;
+    m_offset = 0;
+    m_size = wxInvalidOffset;
+    m_sumType = SUM_UNKNOWN;
+    m_tarType = TYPE_USTAR;
+    m_hdr = new wxTarHeaderBlock;
+    m_HeaderRecs = NULL;
+    m_GlobalHeaderRecs = NULL;
+    m_lasterror = m_parent_i_stream->GetLastError();
+}
+
+wxTarInputStream::~wxTarInputStream()
+{
+    delete m_hdr;
+    delete m_HeaderRecs;
+    delete m_GlobalHeaderRecs;
+}
+
+wxTarEntry *wxTarInputStream::GetNextEntry()
+{
+    m_lasterror = ReadHeaders();
+
+    if (!IsOk())
+        return NULL;
+
+    wxTarEntryPtr_ entry(new wxTarEntry);
+
+    entry->SetMode(GetHeaderNumber(TAR_MODE));
+    entry->SetUserId(GetHeaderNumber(TAR_UID));
+    entry->SetGroupId(GetHeaderNumber(TAR_UID));
+    entry->SetSize(GetHeaderNumber(TAR_SIZE));
+
+    entry->SetOffset(m_offset);
+
+    entry->SetDateTime(GetHeaderDate(_T("mtime")));
+    entry->SetAccessTime(GetHeaderDate(_T("atime")));
+    entry->SetCreateTime(GetHeaderDate(_T("ctime")));
+
+    entry->SetTypeFlag(*m_hdr->Get(TAR_TYPEFLAG));
+    bool isDir = entry->IsDir();
+
+    entry->SetLinkName(GetHeaderString(TAR_LINKNAME));
+
+    if (m_tarType != TYPE_OLDTAR) {
+        entry->SetUserName(GetHeaderString(TAR_UNAME));
+        entry->SetGroupName(GetHeaderString(TAR_GNAME));
+
+        entry->SetDevMajor(GetHeaderNumber(TAR_DEVMAJOR));
+        entry->SetDevMinor(GetHeaderNumber(TAR_DEVMINOR));
+    }
+
+    entry->SetName(GetHeaderPath(), wxPATH_UNIX);
+    if (isDir)
+        entry->SetIsDir();
+
+    if (m_HeaderRecs)
+        m_HeaderRecs->clear();
+
+    m_size = GetDataSize(*entry);
+    m_pos = 0;
+
+    return entry.release();
+}
+
+bool wxTarInputStream::OpenEntry(wxTarEntry& entry)
+{
+    wxFileOffset offset = entry.GetOffset();
+
+    if (GetLastError() != wxSTREAM_READ_ERROR
+            && m_parent_i_stream->IsSeekable()
+            && m_parent_i_stream->SeekI(offset) == offset)
+    {
+        m_offset = offset;
+        m_size = GetDataSize(entry);
+        m_pos = 0;
+        m_lasterror = wxSTREAM_NO_ERROR;
+        return true;
+    } else {
+        m_lasterror = wxSTREAM_READ_ERROR;
+        return false;
+    }
+}
+
+bool wxTarInputStream::OpenEntry(wxArchiveEntry& entry)
+{
+    wxTarEntry *tarEntry = wxStaticCast(&entry, wxTarEntry);
+    return tarEntry ? OpenEntry(*tarEntry) : false;
+}
+
+bool wxTarInputStream::CloseEntry()
+{
+    if (m_lasterror == wxSTREAM_READ_ERROR)
+        return false;
+    if (!IsOpened())
+        return true;
+
+    wxFileOffset size = RoundUpSize(m_size);
+    wxFileOffset remainder = size - m_pos;
+
+    if (remainder && m_parent_i_stream->IsSeekable()) {
+        wxLogNull nolog;
+        if (m_parent_i_stream->SeekI(remainder, wxFromCurrent)
+                != wxInvalidOffset)
+            remainder = 0;
+    }
+
+    if (remainder) {
+        const int BUFSIZE = 8192;
+        wxCharBuffer buf(BUFSIZE);
+
+        while (remainder > 0 && m_parent_i_stream->IsOk())
+            remainder -= m_parent_i_stream->Read(
+                    buf.data(), wxMin(BUFSIZE, remainder)).LastRead();
+    }
+
+    m_pos = wxInvalidOffset;
+    m_offset += size;
+    m_lasterror = m_parent_i_stream->GetLastError();
+
+    return IsOk();
+}
+
+wxStreamError wxTarInputStream::ReadHeaders()
+{
+    if (!CloseEntry())
+        return wxSTREAM_READ_ERROR;
+
+    bool done = false;
+
+    while (!done) {
+        m_hdr->Read(*m_parent_i_stream);
+        if (m_parent_i_stream->Eof())
+            wxLogError(_("incomplete header block in tar"));
+        if (!*m_parent_i_stream)
+            return wxSTREAM_READ_ERROR;
+        m_offset += TAR_BLOCKSIZE;
+
+        // an all-zero header marks the end of the tar
+        if (m_hdr->IsAllZeros())
+            return wxSTREAM_EOF;
+
+        // the checksum is supposed to be the unsigned sum of the header bytes,
+        // but there have been versions of tar that used the signed sum, so
+        // accept that too, but only if used throughout.
+        wxUint32 chksum = m_hdr->GetOctal(TAR_CHKSUM);
+        bool ok = false;
+
+        if (m_sumType != SUM_SIGNED) {
+            ok = chksum == m_hdr->Sum();
+            if (m_sumType == SUM_UNKNOWN)
+                m_sumType = ok ? SUM_UNSIGNED : SUM_SIGNED;
+        }
+        if (m_sumType == SUM_SIGNED)
+            ok = chksum == m_hdr->Sum(true);
+        if (!ok) {
+            wxLogError(_("checksum failure reading tar header block"));
+            return wxSTREAM_READ_ERROR;
+        }
+
+        if (strcmp(m_hdr->Get(TAR_MAGIC), USTAR_MAGIC) == 0)
+            m_tarType = TYPE_USTAR;
+        else if (strcmp(m_hdr->Get(TAR_MAGIC), GNU_MAGIC) == 0 &&
+                 strcmp(m_hdr->Get(TAR_VERSION), GNU_VERION) == 0)
+            m_tarType = TYPE_GNUTAR;
+        else
+            m_tarType = TYPE_OLDTAR;
+
+        if (m_tarType != TYPE_USTAR)
+            break;
+
+        switch (*m_hdr->Get(TAR_TYPEFLAG)) {
+            case 'g': ReadExtendedHeader(m_GlobalHeaderRecs); break;
+            case 'x': ReadExtendedHeader(m_HeaderRecs); break;
+            default:  done = true;
+        }
+    }
+
+    return wxSTREAM_NO_ERROR;
+}
+
+wxString wxTarInputStream::GetExtendedHeader(const wxString& key) const
+{
+    wxTarHeaderRecords::iterator it;
+
+    // look at normal extended header records first
+    if (m_HeaderRecs) {
+        it = m_HeaderRecs->find(key);
+        if (it != m_HeaderRecs->end())
+            return wxString(it->second.wc_str(wxConvUTF8), GetConv());
+    }
+
+    // if not found, look at the global header records
+    if (m_GlobalHeaderRecs) {
+        it = m_GlobalHeaderRecs->find(key);
+        if (it != m_GlobalHeaderRecs->end())
+            return wxString(it->second.wc_str(wxConvUTF8), GetConv());
+    }
+
+    return wxEmptyString;
+}
+
+wxString wxTarInputStream::GetHeaderPath() const
+{
+    wxString path;
+
+    if ((path = GetExtendedHeader(_T("path"))) != wxEmptyString)
+        return path;
+
+    path = wxString(m_hdr->Get(TAR_NAME), GetConv());
+    if (m_tarType != TYPE_USTAR)
+        return path;
+
+    const char *prefix = m_hdr->Get(TAR_PREFIX);
+    return *prefix ? wxString(prefix, GetConv()) + _T("/") + path : path;
+}
+
+wxDateTime wxTarInputStream::GetHeaderDate(const wxString& key) const
+{
+    wxString value;
+
+    // try extended header, stored as decimal seconds since the epoch
+    if ((value = GetExtendedHeader(key)) != wxEmptyString) {
+        wxLongLong ll;
+        ll.Assign(wxAtof(value) * 1000.0);
+        return ll;
+    }
+
+    if (key == _T("mtime"))
+        return wxLongLong(m_hdr->GetOctal(TAR_MTIME)) * 1000L;
+
+    return wxDateTime();
+}
+
+wxTarNumber wxTarInputStream::GetHeaderNumber(int id) const
+{
+    wxString value;
+
+    if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) {
+        wxTarNumber n = 0;
+        const wxChar *p = value;
+        while (*p == ' ')
+            p++;
+        while (isdigit(*p))
+            n = n * 10 + (*p++ - '0');
+        return n;
+    } else {
+        return m_hdr->GetOctal(id);
+    }
+}
+
+wxString wxTarInputStream::GetHeaderString(int id) const
+{
+    wxString value;
+
+    if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString)
+        return value;
+
+    return wxString(m_hdr->Get(id), GetConv());
+}
+
+// An extended header consists of one or more records, each constructed:
+// "%d %s=%s\n", <length>, <keyword>, <value>
+// <length> is the byte length, <keyword> and <value> are UTF-8
+
+bool wxTarInputStream::ReadExtendedHeader(wxTarHeaderRecords*& recs)
+{
+    if (!recs)
+        recs = new wxTarHeaderRecords;
+
+    // round length up to a whole number of blocks
+    size_t len = m_hdr->GetOctal(TAR_SIZE);
+    size_t size = RoundUpSize(len);
+
+    // read in the whole header since it should be small
+    wxCharBuffer buf(size);
+    size_t lastread = m_parent_i_stream->Read(buf.data(), size).LastRead();
+    if (lastread < len)
+        len = lastread;
+    buf.data()[len] = 0;
+    m_offset += lastread;
+
+    size_t recPos, recSize;
+    bool ok = true;
+
+    for (recPos = 0; recPos < len; recPos += recSize) {
+        char *pRec = buf.data() + recPos;
+        char *p = pRec;
+
+        // read the record size (byte count in ascii decimal)
+        recSize = 0;
+        while (isdigit((unsigned char) *p))
+            recSize = recSize * 10 + *p++ - '0';
+
+        // validity checks
+        if (recPos + recSize > len)
+            break;
+        if (recSize < p - pRec + (size_t)3 || *p != ' '
+                || pRec[recSize - 1] != '\012') {
+            ok = false;
+            continue;
+        }
+
+        // replace the final '\n' with a nul, to terminate value
+        pRec[recSize - 1] = 0;
+        // the key is here, following the space
+        char *pKey = ++p;
+
+        // look forward for the '=', the value follows
+        while (*p && *p != '=')
+            p++;
+        if (!*p) {
+            ok = false;
+            continue;
+        }
+        // replace the '=' with a nul, to terminate the key
+        *p++ = 0;
+
+        wxString key(wxConvUTF8.cMB2WC(pKey), GetConv());
+        wxString value(wxConvUTF8.cMB2WC(p), GetConv());
+
+        // an empty value unsets a previously given value
+        if (value.empty())
+            recs->erase(key);
+        else
+            (*recs)[key] = value;
+    }
+
+    if (!ok || recPos < len || size != lastread) {
+        wxLogWarning(_("invalid data in extended tar header"));
+        return false;
+    }
+
+    return true;
+}
+
+wxFileOffset wxTarInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    if (!IsOpened()) {
+        wxLogError(_("tar entry not open"));
+        m_lasterror = wxSTREAM_READ_ERROR;
+    }
+    if (!IsOk())
+        return wxInvalidOffset;
+
+    switch (mode) {
+        case wxFromStart:   break;
+        case wxFromCurrent: pos += m_pos; break;
+        case wxFromEnd:     pos += m_size; break;
+    }
+
+    if (pos < 0 || m_parent_i_stream->SeekI(m_offset + pos) == wxInvalidOffset)
+        return wxInvalidOffset;
+
+    m_pos = pos;
+    return m_pos;
+}
+
+size_t wxTarInputStream::OnSysRead(void *buffer, size_t size)
+{
+    if (!IsOpened()) {
+        wxLogError(_("tar entry not open"));
+        m_lasterror = wxSTREAM_READ_ERROR;
+    }
+    if (!IsOk() || !size)
+        return 0;
+
+    if (m_pos >= m_size)
+        size = 0;
+    else if (m_pos + size > m_size + (size_t)0)
+        size = m_size - m_pos;
+
+    size_t lastread = m_parent_i_stream->Read(buffer, size).LastRead();
+    m_pos += lastread;
+
+    if (m_pos >= m_size) {
+        m_lasterror = wxSTREAM_EOF;
+    } else if (!m_parent_i_stream->IsOk()) {
+        // any other error will have been reported by the underlying stream
+        if (m_parent_i_stream->Eof())
+            wxLogError(_("unexpected end of file"));
+        m_lasterror = wxSTREAM_READ_ERROR;
+    }
+
+    return lastread;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Output stream
+
+wxTarOutputStream::wxTarOutputStream(wxOutputStream& stream,
+                                     wxTarFormat format /*=wxTAR_PAX*/,
+                                     wxMBConv& conv     /*=wxConvLocal*/)
+ :  wxArchiveOutputStream(stream, conv)
+{
+    Init(format);
+}
+
+wxTarOutputStream::wxTarOutputStream(wxOutputStream *stream,
+                                     wxTarFormat format /*=wxTAR_PAX*/,
+                                     wxMBConv& conv     /*=wxConvLocal*/)
+ :  wxArchiveOutputStream(stream, conv)
+{
+    Init(format);
+}
+
+void wxTarOutputStream::Init(wxTarFormat format)
+{
+    m_pos = wxInvalidOffset;
+    m_maxpos = wxInvalidOffset;
+    m_size = wxInvalidOffset;
+    m_headpos = wxInvalidOffset;
+    m_datapos = wxInvalidOffset;
+    m_tarstart = wxInvalidOffset;
+    m_tarsize = 0;
+    m_pax = format == wxTAR_PAX;
+    m_BlockingFactor = m_pax ? 10 : 20;
+    m_chksum = 0;
+    m_large = false;
+    m_hdr = new wxTarHeaderBlock;
+    m_hdr2 = NULL;
+    m_extendedHdr = NULL;
+    m_extendedSize = 0;
+    m_lasterror = m_parent_o_stream->GetLastError();
+}
+
+wxTarOutputStream::~wxTarOutputStream()
+{
+    if (m_tarsize)
+        Close();
+    delete m_hdr;
+    delete m_hdr2;
+    delete [] m_extendedHdr;
+}
+
+bool wxTarOutputStream::PutNextEntry(wxTarEntry *entry)
+{
+    wxTarEntryPtr_ e(entry);
+
+    if (!CloseEntry())
+        return false;
+
+    if (!m_tarsize) {
+        wxLogNull nolog;
+        m_tarstart = m_parent_o_stream->TellO();
+    }
+
+    if (m_tarstart != wxInvalidOffset)
+        m_headpos = m_tarstart + m_tarsize;
+
+    if (WriteHeaders(*e)) {
+        m_pos = 0;
+        m_maxpos = 0;
+        m_size = GetDataSize(*e);
+        if (m_tarstart != wxInvalidOffset)
+            m_datapos = m_tarstart + m_tarsize;
+
+        // types that are not allowd any data
+        const char nodata[] = {
+            wxTAR_LNKTYPE, wxTAR_SYMTYPE, wxTAR_CHRTYPE, wxTAR_BLKTYPE,
+            wxTAR_DIRTYPE, wxTAR_FIFOTYPE, 0
+        };
+        int typeflag = e->GetTypeFlag();
+
+        // pax does now allow data for wxTAR_LNKTYPE
+        if (!m_pax || typeflag != wxTAR_LNKTYPE)
+            if (strchr(nodata, typeflag) != NULL)
+                CloseEntry();
+    }
+
+    return IsOk();
+}
+
+bool wxTarOutputStream::PutNextEntry(const wxString& name,
+                                     const wxDateTime& dt,
+                                     wxFileOffset size)
+{
+    return PutNextEntry(new wxTarEntry(name, dt, size));
+}
+
+bool wxTarOutputStream::PutNextDirEntry(const wxString& name,
+                                        const wxDateTime& dt)
+{
+    wxTarEntry *entry = new wxTarEntry(name, dt);
+    entry->SetIsDir();
+    return PutNextEntry(entry);
+}
+
+bool wxTarOutputStream::PutNextEntry(wxArchiveEntry *entry)
+{
+    wxTarEntry *tarEntry = wxStaticCast(entry, wxTarEntry);
+    if (!tarEntry)
+        delete entry;
+    return PutNextEntry(tarEntry);
+}
+
+bool wxTarOutputStream::CopyEntry(wxTarEntry *entry,
+                                  wxTarInputStream& inputStream)
+{
+    if (PutNextEntry(entry))
+        Write(inputStream);
+    return IsOk() && inputStream.Eof();
+}
+
+bool wxTarOutputStream::CopyEntry(wxArchiveEntry *entry,
+                                  wxArchiveInputStream& inputStream)
+{
+    if (PutNextEntry(entry))
+        Write(inputStream);
+    return IsOk() && inputStream.Eof();
+}
+
+bool wxTarOutputStream::CloseEntry()
+{
+    if (!IsOpened())
+        return true;
+
+    if (m_pos < m_maxpos) {
+        wxASSERT(m_parent_o_stream->IsSeekable());
+        m_parent_o_stream->SeekO(m_datapos + m_maxpos);
+        m_lasterror = m_parent_o_stream->GetLastError();
+        m_pos = m_maxpos;
+    }
+
+    if (IsOk()) {
+        wxFileOffset size = RoundUpSize(m_pos);
+        if (size > m_pos) {
+            memset(m_hdr, 0, size - m_pos);
+            m_parent_o_stream->Write(m_hdr, size - m_pos);
+            m_lasterror = m_parent_o_stream->GetLastError();
+        }
+        m_tarsize += size;
+    }
+
+    if (IsOk() && m_pos != m_size)
+        ModifyHeader();
+
+    m_pos = wxInvalidOffset;
+    m_maxpos = wxInvalidOffset;
+    m_size = wxInvalidOffset;
+    m_headpos = wxInvalidOffset;
+    m_datapos = wxInvalidOffset;
+
+    return IsOk();
+}
+
+bool wxTarOutputStream::Close()
+{
+    if (!CloseEntry())
+        return false;
+
+    memset(m_hdr, 0, sizeof(*m_hdr));
+    int count = (RoundUpSize(m_tarsize + 2 * TAR_BLOCKSIZE, m_BlockingFactor)
+                    - m_tarsize) / TAR_BLOCKSIZE;
+    while (count--)
+        m_parent_o_stream->Write(m_hdr, TAR_BLOCKSIZE);
+
+    m_tarsize = 0;
+    m_tarstart = wxInvalidOffset;
+    m_lasterror = m_parent_o_stream->GetLastError();
+    return IsOk();
+}
+
+bool wxTarOutputStream::WriteHeaders(wxTarEntry& entry)
+{
+    memset(m_hdr, 0, sizeof(*m_hdr));
+
+    SetHeaderPath(entry.GetName(wxPATH_UNIX));
+
+    SetHeaderNumber(TAR_MODE, entry.GetMode());
+    SetHeaderNumber(TAR_UID, entry.GetUserId());
+    SetHeaderNumber(TAR_GID, entry.GetGroupId());
+
+    if (entry.GetSize() == wxInvalidOffset)
+        entry.SetSize(0);
+    m_large = !SetHeaderNumber(TAR_SIZE, entry.GetSize());
+
+    SetHeaderDate(_T("mtime"), entry.GetDateTime());
+    if (entry.GetAccessTime().IsValid())
+        SetHeaderDate(_T("atime"), entry.GetAccessTime());
+    if (entry.GetCreateTime().IsValid())
+        SetHeaderDate(_T("ctime"), entry.GetCreateTime());
+
+    *m_hdr->Get(TAR_TYPEFLAG) = char(entry.GetTypeFlag());
+
+    strcpy(m_hdr->Get(TAR_MAGIC), USTAR_MAGIC);
+    strcpy(m_hdr->Get(TAR_VERSION), USTAR_VERSION);
+
+    SetHeaderString(TAR_LINKNAME, entry.GetLinkName());
+    SetHeaderString(TAR_UNAME, entry.GetUserName());
+    SetHeaderString(TAR_GNAME, entry.GetGroupName());
+
+    if (~entry.GetDevMajor())
+        SetHeaderNumber(TAR_DEVMAJOR, entry.GetDevMajor());
+    if (~entry.GetDevMinor())
+        SetHeaderNumber(TAR_DEVMINOR, entry.GetDevMinor());
+
+    m_chksum = m_hdr->Sum();
+    m_hdr->SetOctal(TAR_CHKSUM, m_chksum);
+    if (!m_large)
+        m_chksum -= m_hdr->SumField(TAR_SIZE);
+
+    // The main header is now fully prepared so we know what extended headers
+    // (if any) will be needed. Output any extended headers before writing
+    // the main header.
+    if (m_extendedHdr && *m_extendedHdr) {
+        wxASSERT(m_pax);
+        // the extended headers are written to the tar as a file entry,
+        // so prepare a regular header block for the pseudo-file.
+        if (!m_hdr2)
+            m_hdr2 = new wxTarHeaderBlock;
+        memset(m_hdr2, 0, sizeof(*m_hdr2));
+
+        // an old tar that doesn't understand extended headers will
+        // extract it as a file, so give these fields reasonable values
+        // so that the user will have access to read and remove it.
+        m_hdr2->SetPath(PaxHeaderPath(_T("%d/PaxHeaders.%p/%f"),
+                                      entry.GetName(wxPATH_UNIX)), GetConv());
+        m_hdr2->SetOctal(TAR_MODE, 0600);
+        strcpy(m_hdr2->Get(TAR_UID), m_hdr->Get(TAR_UID));
+        strcpy(m_hdr2->Get(TAR_GID), m_hdr->Get(TAR_GID));
+        size_t length = strlen(m_extendedHdr);
+        m_hdr2->SetOctal(TAR_SIZE, length);
+        strcpy(m_hdr2->Get(TAR_MTIME), m_hdr->Get(TAR_MTIME));
+        *m_hdr2->Get(TAR_TYPEFLAG) = 'x';
+        strcpy(m_hdr2->Get(TAR_MAGIC), USTAR_MAGIC);
+        strcpy(m_hdr2->Get(TAR_VERSION), USTAR_VERSION);
+        strcpy(m_hdr2->Get(TAR_UNAME), m_hdr->Get(TAR_UNAME));
+        strcpy(m_hdr2->Get(TAR_GNAME), m_hdr->Get(TAR_GNAME));
+
+        m_hdr2->SetOctal(TAR_CHKSUM, m_hdr2->Sum());
+
+        m_hdr2->Write(*m_parent_o_stream);
+        m_tarsize += TAR_BLOCKSIZE;
+
+        size_t rounded = RoundUpSize(length);
+        memset(m_extendedHdr + length, 0, rounded - length);
+        m_parent_o_stream->Write(m_extendedHdr, rounded);
+        m_tarsize += rounded;
+
+        *m_extendedHdr = 0;
+
+        // update m_headpos which is used to seek back to fix up the file
+        // length if it is not known in advance
+        if (m_tarstart != wxInvalidOffset)
+            m_headpos = m_tarstart + m_tarsize;
+    }
+
+    // if don't have extended headers just report error
+    if (!m_badfit.empty()) {
+        wxASSERT(!m_pax);
+        wxLogWarning(_("%s did not fit the tar header for entry '%s'"),
+                     m_badfit.c_str(), entry.GetName().c_str());
+        m_badfit.clear();
+    }
+
+    m_hdr->Write(*m_parent_o_stream);
+    m_tarsize += TAR_BLOCKSIZE;
+    m_lasterror = m_parent_o_stream->GetLastError();
+
+    return IsOk();
+}
+
+wxString wxTarOutputStream::PaxHeaderPath(const wxString& format,
+                                          const wxString& path)
+{
+    wxString d = path.BeforeLast(_T('/'));
+    wxString f = path.AfterLast(_T('/'));
+    wxString ret;
+
+    if (d.empty())
+        d = _T(".");
+
+    ret.reserve(format.length() + path.length() + 16);
+
+    size_t begin = 0;
+    size_t end;
+
+    for (;;) {
+        end = format.find('%', begin);
+        if (end == wxString::npos || end + 1 >= format.length())
+            break;
+        ret << format.substr(begin, end - begin);
+        switch (format[end + 1]) {
+            case 'd': ret << d; break;
+            case 'f': ret << f; break;
+            case 'p': ret << wxGetProcessId(); break;
+            case '%': ret << _T("%"); break;
+        }
+        begin = end + 2;
+    }
+
+    ret << format.substr(begin);
+
+    return ret;
+}
+
+bool wxTarOutputStream::ModifyHeader()
+{
+    wxFileOffset originalPos = wxInvalidOffset;
+    wxFileOffset sizePos = wxInvalidOffset;
+
+    if (!m_large && m_headpos != wxInvalidOffset
+            && m_parent_o_stream->IsSeekable())
+    {
+        wxLogNull nolog;
+        originalPos = m_parent_o_stream->TellO();
+        if (originalPos != wxInvalidOffset)
+            sizePos =
+                m_parent_o_stream->SeekO(m_headpos + m_hdr->Offset(TAR_SIZE));
+    }
+
+    if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) {
+        wxLogError(_("incorrect size given for tar entry"));
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+        return false;
+    }
+
+    m_chksum += m_hdr->SumField(TAR_SIZE);
+    m_hdr->SetOctal(TAR_CHKSUM, m_chksum);
+    wxFileOffset sumPos = m_headpos + m_hdr->Offset(TAR_CHKSUM);
+
+    return
+        m_hdr->WriteField(*m_parent_o_stream, TAR_SIZE) &&
+        m_parent_o_stream->SeekO(sumPos) == sumPos &&
+        m_hdr->WriteField(*m_parent_o_stream, TAR_CHKSUM) &&
+        m_parent_o_stream->SeekO(originalPos) == originalPos;
+}
+
+void wxTarOutputStream::SetHeaderPath(const wxString& name)
+{
+    if (!m_hdr->SetPath(name, GetConv()) || (m_pax && !name.IsAscii()))
+        SetExtendedHeader(_T("path"), name);
+}
+
+bool wxTarOutputStream::SetHeaderNumber(int id, wxTarNumber n)
+{
+    if (m_hdr->SetOctal(id, n)) {
+        return true;
+    } else {
+        SetExtendedHeader(m_hdr->Name(id), wxLongLong(n).ToString());
+        return false;
+    }
+}
+
+void wxTarOutputStream::SetHeaderString(int id, const wxString& str)
+{
+    strncpy(m_hdr->Get(id), str.mb_str(GetConv()), m_hdr->Len(id));
+    if (str.length() > m_hdr->Len(id))
+        SetExtendedHeader(m_hdr->Name(id), str);
+}
+
+void wxTarOutputStream::SetHeaderDate(const wxString& key,
+                                      const wxDateTime& datetime)
+{
+    wxLongLong ll = datetime.IsValid() ? datetime.GetValue() : wxLongLong(0);
+    wxLongLong secs = ll / 1000L;
+
+    if (key != _T("mtime")
+        || !m_hdr->SetOctal(TAR_MTIME, wxTarNumber(secs.GetValue()))
+        || secs <= 0 || secs >= 0x7fffffff)
+    {
+        wxString str;
+        if (ll >= LONG_MIN && ll <= LONG_MAX) {
+            str.Printf(_T("%g"), ll.ToLong() / 1000.0);
+        } else {
+            str = ll.ToString();
+            str.insert(str.end() - 3, '.');
+        }
+        SetExtendedHeader(key, str);
+    }
+}
+
+void wxTarOutputStream::SetExtendedHeader(const wxString& key,
+                                          const wxString& value)
+{
+    if (m_pax) {
+        const wxWX2WCbuf wide_key = key.wc_str(GetConv());
+        const wxCharBuffer utf_key = wxConvUTF8.cWC2MB(wide_key);
+
+        const wxWX2WCbuf wide_value = value.wc_str(GetConv());
+        const wxCharBuffer utf_value = wxConvUTF8.cWC2MB(wide_value);
+
+        // a small buffer to format the length field in
+        char buf[32];
+        // length of "99<space><key>=<value>\n"
+        unsigned long length = strlen(utf_value) + strlen(utf_key) + 5;
+        sprintf(buf, "%lu", length);
+        // the length includes itself
+        size_t lenlen = strlen(buf);
+        if (lenlen != 2) {
+            length += lenlen - 2;
+            sprintf(buf, "%lu", length);
+            if (strlen(buf) > lenlen)
+                sprintf(buf, "%lu", ++length);
+        }
+
+        // reallocate m_extendedHdr if it's not big enough
+        if (m_extendedSize < length) {
+            size_t rounded = RoundUpSize(length);
+            m_extendedSize <<= 1;
+            if (rounded > m_extendedSize)
+                m_extendedSize = rounded;
+            char *oldHdr = m_extendedHdr;
+            m_extendedHdr = new char[m_extendedSize];
+            if (oldHdr) {
+                strcpy(m_extendedHdr, oldHdr);
+                delete oldHdr;
+            } else {
+                *m_extendedHdr = 0;
+            }
+        }
+
+        // append the new record
+        char *append = strchr(m_extendedHdr, 0);
+        sprintf(append, "%s %s=%s\012", buf,
+                (const char*)utf_key, (const char*)utf_value);
+    }
+    else {
+        // if not pax then make a list of fields to report as errors
+        if (!m_badfit.empty())
+            m_badfit += _T(", ");
+        m_badfit += key;
+    }
+}
+
+void wxTarOutputStream::Sync()
+{
+    m_parent_o_stream->Sync();
+}
+
+wxFileOffset wxTarOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    if (!IsOpened()) {
+        wxLogError(_("tar entry not open"));
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    }
+    if (!IsOk() || m_datapos == wxInvalidOffset)
+        return wxInvalidOffset;
+
+    switch (mode) {
+        case wxFromStart:   break;
+        case wxFromCurrent: pos += m_pos; break;
+        case wxFromEnd:     pos += m_maxpos; break;
+    }
+
+    if (pos < 0 || m_parent_o_stream->SeekO(m_datapos + pos) == wxInvalidOffset)
+        return wxInvalidOffset;
+
+    m_pos = pos;
+    return m_pos;
+}
+
+size_t wxTarOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    if (!IsOpened()) {
+        wxLogError(_("tar entry not open"));
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    }
+    if (!IsOk() || !size)
+        return 0;
+
+    size_t lastwrite = m_parent_o_stream->Write(buffer, size).LastWrite();
+    m_pos += lastwrite;
+    if (m_pos > m_maxpos)
+        m_maxpos = m_pos;
+
+    if (lastwrite != size)
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+
+    return lastwrite;
+}
+
+#endif // wxUSE_TARSTREAM
diff --git a/Source/3rd Party/wx/src/common/tbarbase.cpp b/Source/3rd Party/wx/src/common/tbarbase.cpp
index a91840135..084d17c06 100644
--- a/Source/3rd Party/wx/src/common/tbarbase.cpp	
+++ b/Source/3rd Party/wx/src/common/tbarbase.cpp	
@@ -1,762 +1,746 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/tbarbase.cpp
-// Purpose:     wxToolBarBase implementation
-// Author:      Julian Smart
-// Modified by: VZ at 11.12.99 (wxScrollableToolBar split off)
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_TOOLBAR
-
-#include "wx/toolbar.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/control.h"
-    #include "wx/frame.h"
-    #include "wx/settings.h"
-    #if WXWIN_COMPATIBILITY_2_8
-        #include "wx/image.h"
-    #endif // WXWIN_COMPATIBILITY_2_8
-    #include "wx/menu.h"
-#endif
-
-extern WXDLLEXPORT_DATA(const char) wxToolBarNameStr[] = "toolbar";
-
-// ----------------------------------------------------------------------------
-// wxWidgets macros
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
-END_EVENT_TABLE()
-
-#include "wx/listimpl.cpp"
-
-WX_DEFINE_LIST(wxToolBarToolsList)
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxToolBarToolBase
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)
-
-wxToolBarToolBase::~wxToolBarToolBase()
-{
-#if wxUSE_MENUS
-    delete m_dropdownMenu;
-#endif
-
-    if ( IsControl() )
-        GetControl()->Destroy();
-}
-
-
-bool wxToolBarToolBase::Enable(bool enable)
-{
-    if ( m_enabled == enable )
-        return false;
-
-    m_enabled = enable;
-
-    return true;
-}
-
-bool wxToolBarToolBase::Toggle(bool toggle)
-{
-    wxASSERT_MSG( CanBeToggled(), wxT("can't toggle this tool") );
-
-    if ( m_toggled == toggle )
-        return false;
-
-    m_toggled = toggle;
-
-    return true;
-}
-
-bool wxToolBarToolBase::SetToggle(bool toggle)
-{
-    wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL;
-    if ( m_kind == kind )
-        return false;
-
-    m_kind = kind;
-
-    return true;
-}
-
-bool wxToolBarToolBase::SetShortHelp(const wxString& help)
-{
-    if ( m_shortHelpString == help )
-        return false;
-
-    m_shortHelpString = help;
-
-    return true;
-}
-
-bool wxToolBarToolBase::SetLongHelp(const wxString& help)
-{
-    if ( m_longHelpString == help )
-        return false;
-
-    m_longHelpString = help;
-
-    return true;
-}
-
-
-#if wxUSE_MENUS
-void wxToolBarToolBase::SetDropdownMenu(wxMenu* menu)
-{
-    delete m_dropdownMenu;
-    m_dropdownMenu = menu;
-}
-#endif
-
-
-// ----------------------------------------------------------------------------
-// wxToolBarBase adding/deleting items
-// ----------------------------------------------------------------------------
-
-wxToolBarBase::wxToolBarBase()
-{
-    // the list owns the pointers
-    m_xMargin = m_yMargin = 0;
-    m_maxRows = m_maxCols = 0;
-    m_toolPacking = m_toolSeparation = 0;
-    m_defaultWidth = 16;
-    m_defaultHeight = 15;
-}
-
-void wxToolBarBase::FixupStyle()
-{
-    if ( !HasFlag(wxTB_TOP | wxTB_LEFT | wxTB_RIGHT | wxTB_BOTTOM) )
-    {
-        // this is the default
-        m_windowStyle |= wxTB_TOP;
-    }
-}
-
-wxToolBarToolBase *wxToolBarBase::DoAddTool(int toolid,
-                                            const wxString& label,
-                                            const wxBitmap& bitmap,
-                                            const wxBitmap& bmpDisabled,
-                                            wxItemKind kind,
-                                            const wxString& shortHelp,
-                                            const wxString& longHelp,
-                                            wxObject *clientData,
-                                            wxCoord WXUNUSED(xPos),
-                                            wxCoord WXUNUSED(yPos))
-{
-    InvalidateBestSize();
-    return InsertTool(GetToolsCount(), toolid, label, bitmap, bmpDisabled,
-                      kind, shortHelp, longHelp, clientData);
-}
-
-wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos,
-                                             int toolid,
-                                             const wxString& label,
-                                             const wxBitmap& bitmap,
-                                             const wxBitmap& bmpDisabled,
-                                             wxItemKind kind,
-                                             const wxString& shortHelp,
-                                             const wxString& longHelp,
-                                             wxObject *clientData)
-{
-    wxCHECK_MSG( pos <= GetToolsCount(), NULL,
-                 wxT("invalid position in wxToolBar::InsertTool()") );
-
-    return DoInsertNewTool(pos, CreateTool(toolid, label, bitmap, bmpDisabled, kind,
-                                           clientData, shortHelp, longHelp));
-}
-
-wxToolBarToolBase *wxToolBarBase::AddTool(wxToolBarToolBase *tool)
-{
-    return InsertTool(GetToolsCount(), tool);
-}
-
-wxToolBarToolBase *
-wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool)
-{
-    wxCHECK_MSG( pos <= GetToolsCount(), NULL,
-                 wxT("invalid position in wxToolBar::InsertTool()") );
-
-    if ( !tool || !DoInsertTool(pos, tool) )
-    {
-        return NULL;
-    }
-
-    m_tools.Insert(pos, tool);
-    tool->Attach(this);
-
-    return tool;
-}
-
-wxToolBarToolBase *
-wxToolBarBase::AddControl(wxControl *control, const wxString& label)
-{
-    return InsertControl(GetToolsCount(), control, label);
-}
-
-wxToolBarToolBase *
-wxToolBarBase::InsertControl(size_t pos,
-                             wxControl *control,
-                             const wxString& label)
-{
-    wxCHECK_MSG( control, NULL,
-                 wxT("toolbar: can't insert NULL control") );
-
-    wxCHECK_MSG( control->GetParent() == this, NULL,
-                 wxT("control must have toolbar as parent") );
-
-    return DoInsertNewTool(pos, CreateTool(control, label));
-}
-
-wxControl *wxToolBarBase::FindControl( int toolid )
-{
-    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        const wxToolBarToolBase * const tool = node->GetData();
-        if ( tool->IsControl() )
-        {
-            wxControl * const control = tool->GetControl();
-
-            if ( !control )
-            {
-                wxFAIL_MSG( wxT("NULL control in toolbar?") );
-            }
-            else if ( control->GetId() == toolid )
-            {
-                // found
-                return control;
-            }
-        }
-    }
-
-   return NULL;
-}
-
-wxToolBarToolBase *wxToolBarBase::AddSeparator()
-{
-    return InsertSeparator(GetToolsCount());
-}
-
-wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos)
-{
-    return DoInsertNewTool(pos, CreateSeparator());
-}
-
-wxToolBarToolBase *wxToolBarBase::AddStretchableSpace()
-{
-    return InsertStretchableSpace(GetToolsCount());
-}
-
-wxToolBarToolBase *wxToolBarBase::InsertStretchableSpace(size_t pos)
-{
-    wxToolBarToolBase * const tool = CreateSeparator();
-    if ( tool )
-    {
-        // this is a hack but we know that all the current implementations
-        // don't really use the tool when it's created, they will do it
-        // InsertTool() at earliest and maybe even in Realize() much later
-        //
-        // so we can create the tool as a plain separator and mark it as being
-        // a stretchable space later
-        tool->MakeStretchable();
-    }
-
-    return DoInsertNewTool(pos, tool);
-}
-
-wxToolBarToolBase *wxToolBarBase::RemoveTool(int toolid)
-{
-    size_t pos = 0;
-    wxToolBarToolsList::compatibility_iterator node;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        if ( node->GetData()->GetId() == toolid )
-            break;
-
-        pos++;
-    }
-
-    if ( !node )
-    {
-        // don't give any error messages - sometimes we might call RemoveTool()
-        // without knowing whether the tool is or not in the toolbar
-        return NULL;
-    }
-
-    wxToolBarToolBase *tool = node->GetData();
-    wxCHECK_MSG( tool, NULL, "NULL tool in the tools list?" );
-
-    if ( !DoDeleteTool(pos, tool) )
-        return NULL;
-
-    m_tools.Erase(node);
-
-    tool->Detach();
-
-    return tool;
-}
-
-bool wxToolBarBase::DeleteToolByPos(size_t pos)
-{
-    wxCHECK_MSG( pos < GetToolsCount(), false,
-                 wxT("invalid position in wxToolBar::DeleteToolByPos()") );
-
-    wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos);
-
-    if ( !DoDeleteTool(pos, node->GetData()) )
-    {
-        return false;
-    }
-
-    delete node->GetData();
-    m_tools.Erase(node);
-
-    return true;
-}
-
-bool wxToolBarBase::DeleteTool(int toolid)
-{
-    size_t pos = 0;
-    wxToolBarToolsList::compatibility_iterator node;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        if ( node->GetData()->GetId() == toolid )
-            break;
-
-        pos++;
-    }
-
-    if ( !node || !DoDeleteTool(pos, node->GetData()) )
-    {
-        return false;
-    }
-
-    delete node->GetData();
-    m_tools.Erase(node);
-
-    return true;
-}
-
-wxToolBarToolBase *wxToolBarBase::FindById(int toolid) const
-{
-    wxToolBarToolBase *tool = NULL;
-
-    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        tool = node->GetData();
-        if ( tool->GetId() == toolid )
-        {
-            // found
-            break;
-        }
-
-        tool = NULL;
-    }
-
-    return tool;
-}
-
-void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
-{
-    wxCHECK_RET( tool, wxT("NULL tool in wxToolBarTool::UnToggleRadioGroup") );
-
-    if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
-        return;
-
-    wxToolBarToolsList::compatibility_iterator node = m_tools.Find(tool);
-    wxCHECK_RET( node, wxT("invalid tool in wxToolBarTool::UnToggleRadioGroup") );
-
-    wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext();
-    while ( nodeNext )
-    {
-        wxToolBarToolBase *toolNext = nodeNext->GetData();
-
-        if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO )
-            break;
-
-        if ( toolNext->Toggle(false) )
-        {
-            DoToggleTool(toolNext, false);
-        }
-
-        nodeNext = nodeNext->GetNext();
-    }
-
-    wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
-    while ( nodePrev )
-    {
-        wxToolBarToolBase *toolNext = nodePrev->GetData();
-
-        if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO )
-            break;
-
-        if ( toolNext->Toggle(false) )
-        {
-            DoToggleTool(toolNext, false);
-        }
-
-        nodePrev = nodePrev->GetPrevious();
-    }
-}
-
-void wxToolBarBase::ClearTools()
-{
-    while ( GetToolsCount() )
-    {
-        DeleteToolByPos(0);
-    }
-}
-
-void wxToolBarBase::AdjustToolBitmapSize()
-{
-    const wxSize sizeOrig(m_defaultWidth, m_defaultHeight);
-
-    wxSize sizeActual(sizeOrig);
-
-    for ( wxToolBarToolsList::const_iterator i = m_tools.begin();
-          i != m_tools.end();
-          ++i )
-    {
-        const wxBitmap& bmp = (*i)->GetNormalBitmap();
-        if ( bmp.IsOk() )
-            sizeActual.IncTo(bmp.GetSize());
-    }
-
-    if ( sizeActual != sizeOrig )
-        SetToolBitmapSize(sizeActual);
-}
-
-bool wxToolBarBase::Realize()
-{
-    // check if we have anything to do
-    if ( m_tools.empty() )
-        return false;
-
-    // make sure tool size is large enough for all bitmaps to fit in
-    AdjustToolBitmapSize();
-
-    return true;
-}
-
-wxToolBarBase::~wxToolBarBase()
-{
-    WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
-
-    // notify the frame that it doesn't have a tool bar any longer to avoid
-    // dangling pointers
-    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
-    if ( frame && frame->GetToolBar() == this )
-    {
-        frame->SetToolBar(NULL);
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxToolBarBase tools state
-// ----------------------------------------------------------------------------
-
-void wxToolBarBase::EnableTool(int toolid, bool enable)
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-    if ( tool )
-    {
-        if ( tool->Enable(enable) )
-        {
-            DoEnableTool(tool, enable);
-        }
-    }
-}
-
-void wxToolBarBase::ToggleTool(int toolid, bool toggle)
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-    if ( tool && tool->CanBeToggled() )
-    {
-        if ( tool->Toggle(toggle) )
-        {
-            UnToggleRadioGroup(tool);
-            DoToggleTool(tool, toggle);
-        }
-    }
-}
-
-void wxToolBarBase::SetToggle(int toolid, bool toggle)
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-    if ( tool )
-    {
-        if ( tool->SetToggle(toggle) )
-        {
-            DoSetToggle(tool, toggle);
-        }
-    }
-}
-
-void wxToolBarBase::SetToolShortHelp(int toolid, const wxString& help)
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-    if ( tool )
-    {
-        (void)tool->SetShortHelp(help);
-    }
-}
-
-void wxToolBarBase::SetToolLongHelp(int toolid, const wxString& help)
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-    if ( tool )
-    {
-        (void)tool->SetLongHelp(help);
-    }
-}
-
-wxObject *wxToolBarBase::GetToolClientData(int toolid) const
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-
-    return tool ? tool->GetClientData() : NULL;
-}
-
-void wxToolBarBase::SetToolClientData(int toolid, wxObject *clientData)
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-
-    wxCHECK_RET( tool, wxT("no such tool in wxToolBar::SetToolClientData") );
-
-    tool->SetClientData(clientData);
-}
-
-int wxToolBarBase::GetToolPos(int toolid) const
-{
-    size_t pos = 0;
-    wxToolBarToolsList::compatibility_iterator node;
-
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        if ( node->GetData()->GetId() == toolid )
-            return pos;
-
-        pos++;
-    }
-
-    return wxNOT_FOUND;
-}
-
-bool wxToolBarBase::GetToolState(int toolid) const
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-    wxCHECK_MSG( tool, false, wxT("no such tool") );
-
-    return tool->IsToggled();
-}
-
-bool wxToolBarBase::GetToolEnabled(int toolid) const
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-    wxCHECK_MSG( tool, false, wxT("no such tool") );
-
-    return tool->IsEnabled();
-}
-
-wxString wxToolBarBase::GetToolShortHelp(int toolid) const
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-    wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") );
-
-    return tool->GetShortHelp();
-}
-
-wxString wxToolBarBase::GetToolLongHelp(int toolid) const
-{
-    wxToolBarToolBase *tool = FindById(toolid);
-    wxCHECK_MSG( tool, wxEmptyString, wxT("no such tool") );
-
-    return tool->GetLongHelp();
-}
-
-// ----------------------------------------------------------------------------
-// wxToolBarBase geometry
-// ----------------------------------------------------------------------------
-
-void wxToolBarBase::SetMargins(int x, int y)
-{
-    m_xMargin = x;
-    m_yMargin = y;
-}
-
-void wxToolBarBase::SetRows(int WXUNUSED(nRows))
-{
-    // nothing
-}
-
-bool wxToolBarBase::IsVertical() const
-{
-    return HasFlag(wxTB_LEFT | wxTB_RIGHT);
-}
-
-
-// ----------------------------------------------------------------------------
-// event processing
-// ----------------------------------------------------------------------------
-
-// Only allow toggle if returns true
-bool wxToolBarBase::OnLeftClick(int toolid, bool toggleDown)
-{
-    wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, toolid);
-    event.SetEventObject(this);
-
-    // we use SetInt() to make wxCommandEvent::IsChecked() return toggleDown
-    event.SetInt((int)toggleDown);
-
-    // and SetExtraLong() for backwards compatibility
-    event.SetExtraLong((long)toggleDown);
-
-    // Send events to this toolbar instead (and thence up the window hierarchy)
-    HandleWindowEvent(event);
-
-    return true;
-}
-
-// Call when right button down.
-void wxToolBarBase::OnRightClick(int toolid,
-                                 long WXUNUSED(x),
-                                 long WXUNUSED(y))
-{
-    wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, toolid);
-    event.SetEventObject(this);
-    event.SetInt(toolid);
-
-    GetEventHandler()->ProcessEvent(event);
-}
-
-// Called when the mouse cursor enters a tool bitmap (no button pressed).
-// Argument is wxID_ANY if mouse is exiting the toolbar.
-// Note that for this event, the toolid of the window is used,
-// and the integer parameter of wxCommandEvent is used to retrieve
-// the tool toolid.
-void wxToolBarBase::OnMouseEnter(int toolid)
-{
-    wxCommandEvent event(wxEVT_COMMAND_TOOL_ENTER, GetId());
-    event.SetEventObject(this);
-    event.SetInt(toolid);
-
-    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
-    if ( frame )
-    {
-        wxString help;
-        if ( toolid != wxID_ANY )
-        {
-           const wxToolBarToolBase * const tool = FindById(toolid);
-           if ( tool )
-               help = tool->GetLongHelp();
-        }
-
-        // call DoGiveHelp() even if help string is empty to avoid showing the
-        // help for the previously selected tool when another one is selected
-        frame->DoGiveHelp(help, toolid != wxID_ANY);
-    }
-
-    (void)GetEventHandler()->ProcessEvent(event);
-}
-
-// ----------------------------------------------------------------------------
-// UI updates
-// ----------------------------------------------------------------------------
-
-// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
-void wxToolBarBase::UpdateWindowUI(long flags)
-{
-    wxWindowBase::UpdateWindowUI(flags);
-
-    // don't waste time updating state of tools in a hidden toolbar
-    if ( !IsShown() )
-        return;
-
-    wxEvtHandler* evtHandler = GetEventHandler() ;
-
-    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxToolBarToolBase * const tool = node->GetData();
-        if ( tool->IsSeparator() )
-            continue;
-
-        int toolid = tool->GetId();
-
-        wxUpdateUIEvent event(toolid);
-        event.SetEventObject(this);
-
-        if ( evtHandler->ProcessEvent(event) )
-        {
-            if ( event.GetSetEnabled() )
-                EnableTool(toolid, event.GetEnabled());
-            if ( event.GetSetChecked() )
-                ToggleTool(toolid, event.GetChecked());
-#if 0
-            if ( event.GetSetText() )
-                // Set tooltip?
-#endif // 0
-        }
-    }
-}
-
-#if wxUSE_MENUS
-bool wxToolBarBase::SetDropdownMenu(int toolid, wxMenu* menu)
-{
-    wxToolBarToolBase * const tool = FindById(toolid);
-    wxCHECK_MSG( tool, false, wxT("invalid tool toolid") );
-
-    wxCHECK_MSG( tool->GetKind() == wxITEM_DROPDOWN, false,
-                    wxT("menu can be only associated with drop down tools") );
-
-    tool->SetDropdownMenu(menu);
-
-    return true;
-}
-#endif
-
-#if WXWIN_COMPATIBILITY_2_8
-
-bool wxCreateGreyedImage(const wxImage& in, wxImage& out)
-{
-#if wxUSE_IMAGE
-    out = in.ConvertToGreyscale();
-    if ( out.IsOk() )
-        return true;
-#endif // wxUSE_IMAGE
-    return false;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
-
-#endif // wxUSE_TOOLBAR
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/tbarbase.cpp
+// Purpose:     wxToolBarBase implementation
+// Author:      Julian Smart
+// Modified by: VZ at 11.12.99 (wxScrollableToolBar split off)
+// Created:     04/01/98
+// RCS-ID:      $Id: tbarbase.cpp 42840 2006-10-31 13:09:08Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_TOOLBAR
+
+#include "wx/toolbar.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/control.h"
+    #include "wx/frame.h"
+    #include "wx/settings.h"
+    #include "wx/image.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// wxWidgets macros
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
+END_EVENT_TABLE()
+
+#include "wx/listimpl.cpp"
+
+WX_DEFINE_LIST(wxToolBarToolsList)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxToolBarToolBase
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBarToolBase, wxObject)
+
+bool wxToolBarToolBase::Enable(bool enable)
+{
+    if ( m_enabled == enable )
+        return false;
+
+    m_enabled = enable;
+
+    return true;
+}
+
+bool wxToolBarToolBase::Toggle(bool toggle)
+{
+    wxASSERT_MSG( CanBeToggled(), _T("can't toggle this tool") );
+
+    if ( m_toggled == toggle )
+        return false;
+
+    m_toggled = toggle;
+
+    return true;
+}
+
+bool wxToolBarToolBase::SetToggle(bool toggle)
+{
+    wxItemKind kind = toggle ? wxITEM_CHECK : wxITEM_NORMAL;
+    if ( m_kind == kind )
+        return false;
+
+    m_kind = kind;
+
+    return true;
+}
+
+bool wxToolBarToolBase::SetShortHelp(const wxString& help)
+{
+    if ( m_shortHelpString == help )
+        return false;
+
+    m_shortHelpString = help;
+
+    return true;
+}
+
+bool wxToolBarToolBase::SetLongHelp(const wxString& help)
+{
+    if ( m_longHelpString == help )
+        return false;
+
+    m_longHelpString = help;
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBarBase adding/deleting items
+// ----------------------------------------------------------------------------
+
+wxToolBarBase::wxToolBarBase()
+{
+    // the list owns the pointers
+    m_xMargin = m_yMargin = 0;
+    m_maxRows = m_maxCols = 0;
+    m_toolPacking = m_toolSeparation = 0;
+    m_defaultWidth = 16;
+    m_defaultHeight = 15;
+}
+
+void wxToolBarBase::FixupStyle()
+{
+    if ( !HasFlag(wxTB_TOP | wxTB_LEFT | wxTB_RIGHT | wxTB_BOTTOM) )
+    {
+        // this is the default
+        m_windowStyle |= wxTB_TOP;
+    }
+}
+
+wxToolBarToolBase *wxToolBarBase::DoAddTool(int id,
+                                            const wxString& label,
+                                            const wxBitmap& bitmap,
+                                            const wxBitmap& bmpDisabled,
+                                            wxItemKind kind,
+                                            const wxString& shortHelp,
+                                            const wxString& longHelp,
+                                            wxObject *clientData,
+                                            wxCoord WXUNUSED(xPos),
+                                            wxCoord WXUNUSED(yPos))
+{
+    InvalidateBestSize();
+    return InsertTool(GetToolsCount(), id, label, bitmap, bmpDisabled,
+                      kind, shortHelp, longHelp, clientData);
+}
+
+wxToolBarToolBase *wxToolBarBase::InsertTool(size_t pos,
+                                             int id,
+                                             const wxString& label,
+                                             const wxBitmap& bitmap,
+                                             const wxBitmap& bmpDisabled,
+                                             wxItemKind kind,
+                                             const wxString& shortHelp,
+                                             const wxString& longHelp,
+                                             wxObject *clientData)
+{
+    wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
+                 _T("invalid position in wxToolBar::InsertTool()") );
+
+    wxToolBarToolBase *tool = CreateTool(id, label, bitmap, bmpDisabled, kind,
+                                         clientData, shortHelp, longHelp);
+
+    if ( !InsertTool(pos, tool) )
+    {
+        delete tool;
+
+        return NULL;
+    }
+
+    return tool;
+}
+
+wxToolBarToolBase *wxToolBarBase::AddTool(wxToolBarToolBase *tool)
+{
+    return InsertTool(GetToolsCount(), tool);
+}
+
+wxToolBarToolBase *
+wxToolBarBase::InsertTool(size_t pos, wxToolBarToolBase *tool)
+{
+    wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
+                 _T("invalid position in wxToolBar::InsertTool()") );
+
+    if ( !tool || !DoInsertTool(pos, tool) )
+    {
+        return NULL;
+    }
+
+    m_tools.Insert(pos, tool);
+
+    return tool;
+}
+
+wxToolBarToolBase *wxToolBarBase::AddControl(wxControl *control)
+{
+    return InsertControl(GetToolsCount(), control);
+}
+
+wxToolBarToolBase *wxToolBarBase::InsertControl(size_t pos, wxControl *control)
+{
+    wxCHECK_MSG( control, (wxToolBarToolBase *)NULL,
+                 _T("toolbar: can't insert NULL control") );
+
+    wxCHECK_MSG( control->GetParent() == this, (wxToolBarToolBase *)NULL,
+                 _T("control must have toolbar as parent") );
+
+    wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
+                 _T("invalid position in wxToolBar::InsertControl()") );
+
+    wxToolBarToolBase *tool = CreateTool(control);
+
+    if ( !InsertTool(pos, tool) )
+    {
+        delete tool;
+
+        return NULL;
+    }
+
+    return tool;
+}
+
+wxControl *wxToolBarBase::FindControl( int id )
+{
+    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        const wxToolBarToolBase * const tool = node->GetData();
+        if ( tool->IsControl() )
+        {
+            wxControl * const control = tool->GetControl();
+
+            if ( !control )
+            {
+                wxFAIL_MSG( _T("NULL control in toolbar?") );
+            }
+            else if ( control->GetId() == id )
+            {
+                // found
+                return control;
+            }
+        }
+    }
+
+   return NULL;
+}
+
+wxToolBarToolBase *wxToolBarBase::AddSeparator()
+{
+    return InsertSeparator(GetToolsCount());
+}
+
+wxToolBarToolBase *wxToolBarBase::InsertSeparator(size_t pos)
+{
+    wxCHECK_MSG( pos <= GetToolsCount(), (wxToolBarToolBase *)NULL,
+                 _T("invalid position in wxToolBar::InsertSeparator()") );
+
+    wxToolBarToolBase *tool = CreateTool(wxID_SEPARATOR,
+                                         wxEmptyString,
+                                         wxNullBitmap, wxNullBitmap,
+                                         wxITEM_SEPARATOR, (wxObject *)NULL,
+                                         wxEmptyString, wxEmptyString);
+
+    if ( !tool || !DoInsertTool(pos, tool) )
+    {
+        delete tool;
+
+        return NULL;
+    }
+
+    m_tools.Insert(pos, tool);
+
+    return tool;
+}
+
+wxToolBarToolBase *wxToolBarBase::RemoveTool(int id)
+{
+    size_t pos = 0;
+    wxToolBarToolsList::compatibility_iterator node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        if ( node->GetData()->GetId() == id )
+            break;
+
+        pos++;
+    }
+
+    if ( !node )
+    {
+        // don't give any error messages - sometimes we might call RemoveTool()
+        // without knowing whether the tool is or not in the toolbar
+        return (wxToolBarToolBase *)NULL;
+    }
+
+    wxToolBarToolBase *tool = node->GetData();
+    if ( !DoDeleteTool(pos, tool) )
+    {
+        return (wxToolBarToolBase *)NULL;
+    }
+
+    m_tools.Erase(node);
+
+    return tool;
+}
+
+bool wxToolBarBase::DeleteToolByPos(size_t pos)
+{
+    wxCHECK_MSG( pos < GetToolsCount(), false,
+                 _T("invalid position in wxToolBar::DeleteToolByPos()") );
+
+    wxToolBarToolsList::compatibility_iterator node = m_tools.Item(pos);
+
+    if ( !DoDeleteTool(pos, node->GetData()) )
+    {
+        return false;
+    }
+
+    delete node->GetData();
+    m_tools.Erase(node);
+
+    return true;
+}
+
+bool wxToolBarBase::DeleteTool(int id)
+{
+    size_t pos = 0;
+    wxToolBarToolsList::compatibility_iterator node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        if ( node->GetData()->GetId() == id )
+            break;
+
+        pos++;
+    }
+
+    if ( !node || !DoDeleteTool(pos, node->GetData()) )
+    {
+        return false;
+    }
+
+    delete node->GetData();
+    m_tools.Erase(node);
+
+    return true;
+}
+
+wxToolBarToolBase *wxToolBarBase::FindById(int id) const
+{
+    wxToolBarToolBase *tool = (wxToolBarToolBase *)NULL;
+
+    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        tool = node->GetData();
+        if ( tool->GetId() == id )
+        {
+            // found
+            break;
+        }
+
+        tool = NULL;
+    }
+
+    return tool;
+}
+
+void wxToolBarBase::UnToggleRadioGroup(wxToolBarToolBase *tool)
+{
+    wxCHECK_RET( tool, _T("NULL tool in wxToolBarTool::UnToggleRadioGroup") );
+
+    if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+        return;
+
+    wxToolBarToolsList::compatibility_iterator node = m_tools.Find(tool);
+    wxCHECK_RET( node, _T("invalid tool in wxToolBarTool::UnToggleRadioGroup") );
+
+    wxToolBarToolsList::compatibility_iterator nodeNext = node->GetNext();
+    while ( nodeNext )
+    {
+        wxToolBarToolBase *toolNext = nodeNext->GetData();
+
+        if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO )
+            break;
+
+        if ( toolNext->Toggle(false) )
+        {
+            DoToggleTool(toolNext, false);
+        }
+
+        nodeNext = nodeNext->GetNext();
+    }
+
+    wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+    while ( nodePrev )
+    {
+        wxToolBarToolBase *toolNext = nodePrev->GetData();
+
+        if ( !toolNext->IsButton() || toolNext->GetKind() != wxITEM_RADIO )
+            break;
+
+        if ( toolNext->Toggle(false) )
+        {
+            DoToggleTool(toolNext, false);
+        }
+
+        nodePrev = nodePrev->GetPrevious();
+    }
+}
+
+void wxToolBarBase::ClearTools()
+{
+    while ( GetToolsCount() )
+    {
+        DeleteToolByPos(0);
+    }
+}
+
+bool wxToolBarBase::Realize()
+{
+    return true;
+}
+
+wxToolBarBase::~wxToolBarBase()
+{
+    WX_CLEAR_LIST(wxToolBarToolsList, m_tools);
+
+    // notify the frame that it doesn't have a tool bar any longer to avoid
+    // dangling pointers
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && frame->GetToolBar() == this )
+    {
+        frame->SetToolBar(NULL);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBarBase tools state
+// ----------------------------------------------------------------------------
+
+void wxToolBarBase::EnableTool(int id, bool enable)
+{
+    wxToolBarToolBase *tool = FindById(id);
+    if ( tool )
+    {
+        if ( tool->Enable(enable) )
+        {
+            DoEnableTool(tool, enable);
+        }
+    }
+}
+
+void wxToolBarBase::ToggleTool(int id, bool toggle)
+{
+    wxToolBarToolBase *tool = FindById(id);
+    if ( tool && tool->CanBeToggled() )
+    {
+        if ( tool->Toggle(toggle) )
+        {
+            UnToggleRadioGroup(tool);
+            DoToggleTool(tool, toggle);
+        }
+    }
+}
+
+void wxToolBarBase::SetToggle(int id, bool toggle)
+{
+    wxToolBarToolBase *tool = FindById(id);
+    if ( tool )
+    {
+        if ( tool->SetToggle(toggle) )
+        {
+            DoSetToggle(tool, toggle);
+        }
+    }
+}
+
+void wxToolBarBase::SetToolShortHelp(int id, const wxString& help)
+{
+    wxToolBarToolBase *tool = FindById(id);
+    if ( tool )
+    {
+        (void)tool->SetShortHelp(help);
+    }
+}
+
+void wxToolBarBase::SetToolLongHelp(int id, const wxString& help)
+{
+    wxToolBarToolBase *tool = FindById(id);
+    if ( tool )
+    {
+        (void)tool->SetLongHelp(help);
+    }
+}
+
+wxObject *wxToolBarBase::GetToolClientData(int id) const
+{
+    wxToolBarToolBase *tool = FindById(id);
+
+    return tool ? tool->GetClientData() : (wxObject *)NULL;
+}
+
+void wxToolBarBase::SetToolClientData(int id, wxObject *clientData)
+{
+    wxToolBarToolBase *tool = FindById(id);
+
+    wxCHECK_RET( tool, _T("no such tool in wxToolBar::SetToolClientData") );
+
+    tool->SetClientData(clientData);
+}
+
+int wxToolBarBase::GetToolPos(int id) const
+{
+    size_t pos = 0;
+    wxToolBarToolsList::compatibility_iterator node;
+
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        if ( node->GetData()->GetId() == id )
+            return pos;
+
+        pos++;
+    }
+
+    return wxNOT_FOUND;
+}
+
+bool wxToolBarBase::GetToolState(int id) const
+{
+    wxToolBarToolBase *tool = FindById(id);
+    wxCHECK_MSG( tool, false, _T("no such tool") );
+
+    return tool->IsToggled();
+}
+
+bool wxToolBarBase::GetToolEnabled(int id) const
+{
+    wxToolBarToolBase *tool = FindById(id);
+    wxCHECK_MSG( tool, false, _T("no such tool") );
+
+    return tool->IsEnabled();
+}
+
+wxString wxToolBarBase::GetToolShortHelp(int id) const
+{
+    wxToolBarToolBase *tool = FindById(id);
+    wxCHECK_MSG( tool, wxEmptyString, _T("no such tool") );
+
+    return tool->GetShortHelp();
+}
+
+wxString wxToolBarBase::GetToolLongHelp(int id) const
+{
+    wxToolBarToolBase *tool = FindById(id);
+    wxCHECK_MSG( tool, wxEmptyString, _T("no such tool") );
+
+    return tool->GetLongHelp();
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBarBase geometry
+// ----------------------------------------------------------------------------
+
+void wxToolBarBase::SetMargins(int x, int y)
+{
+    m_xMargin = x;
+    m_yMargin = y;
+}
+
+void wxToolBarBase::SetRows(int WXUNUSED(nRows))
+{
+    // nothing
+}
+
+// ----------------------------------------------------------------------------
+// event processing
+// ----------------------------------------------------------------------------
+
+// Only allow toggle if returns true
+bool wxToolBarBase::OnLeftClick(int id, bool toggleDown)
+{
+    wxCommandEvent event(wxEVT_COMMAND_TOOL_CLICKED, id);
+    event.SetEventObject(this);
+
+    // we use SetInt() to make wxCommandEvent::IsChecked() return toggleDown
+    event.SetInt((int)toggleDown);
+
+    // and SetExtraLong() for backwards compatibility
+    event.SetExtraLong((long)toggleDown);
+
+    // Send events to this toolbar instead (and thence up the window hierarchy)
+    GetEventHandler()->ProcessEvent(event);
+
+    return true;
+}
+
+// Call when right button down.
+void wxToolBarBase::OnRightClick(int id,
+                                 long WXUNUSED(x),
+                                 long WXUNUSED(y))
+{
+    wxCommandEvent event(wxEVT_COMMAND_TOOL_RCLICKED, id);
+    event.SetEventObject(this);
+    event.SetInt(id);
+
+    GetEventHandler()->ProcessEvent(event);
+}
+
+// Called when the mouse cursor enters a tool bitmap (no button pressed).
+// Argument is wxID_ANY if mouse is exiting the toolbar.
+// Note that for this event, the id of the window is used,
+// and the integer parameter of wxCommandEvent is used to retrieve
+// the tool id.
+void wxToolBarBase::OnMouseEnter(int id)
+{
+    wxCommandEvent event(wxEVT_COMMAND_TOOL_ENTER, GetId());
+    event.SetEventObject(this);
+    event.SetInt(id);
+
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if( frame )
+    {
+        wxString help;
+        wxToolBarToolBase* tool = id == wxID_ANY ? (wxToolBarToolBase*)NULL : FindById(id);
+        if(tool)
+            help = tool->GetLongHelp();
+        frame->DoGiveHelp( help, id != wxID_ANY );
+    }
+
+    (void)GetEventHandler()->ProcessEvent(event);
+}
+
+// ----------------------------------------------------------------------------
+// UI updates
+// ----------------------------------------------------------------------------
+
+// Do the toolbar button updates (check for EVT_UPDATE_UI handlers)
+void wxToolBarBase::UpdateWindowUI(long flags)
+{
+    wxWindowBase::UpdateWindowUI(flags);
+
+    // There is no sense in updating the toolbar UI
+    // if the parent window is about to get destroyed
+    wxWindow *tlw = wxGetTopLevelParent( this );
+    if (tlw && wxPendingDelete.Member( tlw ))
+        return;
+
+    wxEvtHandler* evtHandler = GetEventHandler() ;
+
+    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        int id = node->GetData()->GetId();
+
+        wxUpdateUIEvent event(id);
+        event.SetEventObject(this);
+
+        if ( evtHandler->ProcessEvent(event) )
+        {
+            if ( event.GetSetEnabled() )
+                EnableTool(id, event.GetEnabled());
+            if ( event.GetSetChecked() )
+                ToggleTool(id, event.GetChecked());
+#if 0
+            if ( event.GetSetText() )
+                // Set tooltip?
+#endif // 0
+        }
+    }
+}
+
+#if wxUSE_IMAGE
+
+/*
+ * Make a greyed-out image suitable for disabled buttons.
+ * This code is adapted from wxNewBitmapButton in FL.
+ */
+
+bool wxCreateGreyedImage(const wxImage& src, wxImage& dst)
+{
+    dst = src.Copy();
+
+    unsigned char rBg, gBg, bBg;
+    if ( src.HasMask() )
+    {
+        src.GetOrFindMaskColour(&rBg, &gBg, &bBg);
+        dst.SetMaskColour(rBg, gBg, bBg);
+    }
+    else // assuming the pixels along the edges are of the background color
+    {
+        rBg = src.GetRed(0, 0);
+        gBg = src.GetGreen(0, 0);
+        bBg = src.GetBlue(0, 0);
+    }
+
+    const wxColour colBg(rBg, gBg, bBg);
+
+    const wxColour colDark = wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
+    const wxColour colLight = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT);
+
+    // Second attempt, just making things monochrome
+    const int width = src.GetWidth();
+    const int height = src.GetHeight();
+
+    for ( int x = 0; x < width; x++ )
+    {
+        for ( int y = 0; y < height; y++ )
+        {
+            const int r = src.GetRed(x, y);
+            const int g = src.GetGreen(x, y);
+            const int b = src.GetBlue(x, y);
+
+            if ( r == rBg && g == gBg && b == bBg )
+            {
+                // Leave the background colour as-is
+                continue;
+            }
+
+            // Change light things to the background colour
+            wxColour col;
+            if ( r >= (colLight.Red() - 50) &&
+                    g >= (colLight.Green() - 50) &&
+                        b >= (colLight.Blue() - 50) )
+            {
+                col = colBg;
+            }
+            else // Change dark things to really dark
+            {
+                col = colDark;
+            }
+
+            dst.SetRGB(x, y, col.Red(), col.Green(), col.Blue());
+        }
+    }
+
+    return true;
+}
+
+#endif // wxUSE_IMAGE
+
+#endif // wxUSE_TOOLBAR
diff --git a/Source/3rd Party/wx/src/common/textbuf.cpp b/Source/3rd Party/wx/src/common/textbuf.cpp
index fce988a72..6f97b98ca 100644
--- a/Source/3rd Party/wx/src/common/textbuf.cpp	
+++ b/Source/3rd Party/wx/src/common/textbuf.cpp	
@@ -1,279 +1,284 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/textbuf.cpp
-// Purpose:     implementation of wxTextBuffer class
-// Created:     14.11.01
-// Author:      Morten Hanssen, Vadim Zeitlin
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998-2001 wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// headers
-// ============================================================================
-
-#include  "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#ifndef WX_PRECOMP
-    #include  "wx/string.h"
-    #include  "wx/intl.h"
-    #include  "wx/log.h"
-#endif
-
-#include "wx/textbuf.h"
-
-// ============================================================================
-// wxTextBuffer class implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// static methods (always compiled in)
-// ----------------------------------------------------------------------------
-
-// default type is the native one
-
-const wxTextFileType wxTextBuffer::typeDefault =
-#if defined(__WINDOWS__) || defined(__DOS__)
-  wxTextFileType_Dos;
-#elif defined(__UNIX__)
-  wxTextFileType_Unix;
-#elif defined(__OS2__)
-  wxTextFileType_Os2;
-#else
-  wxTextFileType_None;
-  #error  "wxTextBuffer: unsupported platform."
-#endif
-
-const wxChar *wxTextBuffer::GetEOL(wxTextFileType type)
-{
-    switch ( type ) {
-        default:
-            wxFAIL_MSG(wxT("bad buffer type in wxTextBuffer::GetEOL."));
-            // fall through nevertheless - we must return something...
-
-        case wxTextFileType_None: return wxEmptyString;
-        case wxTextFileType_Unix: return wxT("\n");
-        case wxTextFileType_Dos:  return wxT("\r\n");
-        case wxTextFileType_Mac:  return wxT("\r");
-    }
-}
-
-wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type)
-{
-    // don't do anything if there is nothing to do
-    if ( type == wxTextFileType_None )
-        return text;
-
-    // nor if it is empty
-    if ( text.empty() )
-        return text;
-
-    wxString eol = GetEOL(type), result;
-
-    // optimization: we know that the length of the new string will be about
-    // the same as the length of the old one, so prealloc memory to avoid
-    // unnecessary relocations
-    result.Alloc(text.Len());
-
-    wxChar chLast = 0;
-    for ( wxString::const_iterator i = text.begin(); i != text.end(); ++i )
-    {
-        wxChar ch = *i;
-        switch ( ch ) {
-            case wxT('\n'):
-                // Dos/Unix line termination
-                result += eol;
-                chLast = 0;
-                break;
-
-            case wxT('\r'):
-                if ( chLast == wxT('\r') ) {
-                    // Mac empty line
-                    result += eol;
-                }
-                else {
-                    // just remember it: we don't know whether it is just "\r"
-                    // or "\r\n" yet
-                    chLast = wxT('\r');
-                }
-                break;
-
-            default:
-                if ( chLast == wxT('\r') ) {
-                    // Mac line termination
-                    result += eol;
-
-                    // reset chLast to avoid inserting another eol before the
-                    // next character
-                    chLast = 0;
-                }
-
-                // add to the current line
-                result += ch;
-        }
-    }
-
-    if ( chLast ) {
-        // trailing '\r'
-        result += eol;
-    }
-
-    return result;
-}
-
-#if wxUSE_TEXTBUFFER
-
-wxString wxTextBuffer::ms_eof;
-
-// ----------------------------------------------------------------------------
-// ctors & dtor
-// ----------------------------------------------------------------------------
-
-wxTextBuffer::wxTextBuffer(const wxString& strBufferName)
-            : m_strBufferName(strBufferName)
-{
-    m_nCurLine = 0;
-    m_isOpened = false;
-}
-
-wxTextBuffer::~wxTextBuffer()
-{
-    // required here for Darwin
-}
-
-// ----------------------------------------------------------------------------
-// buffer operations
-// ----------------------------------------------------------------------------
-
-bool wxTextBuffer::Exists() const
-{
-    return OnExists();
-}
-
-bool wxTextBuffer::Create(const wxString& strBufferName)
-{
-    m_strBufferName = strBufferName;
-
-    return Create();
-}
-
-bool wxTextBuffer::Create()
-{
-    // buffer name must be either given in ctor or in Create(const wxString&)
-    wxASSERT( !m_strBufferName.empty() );
-
-    // if the buffer already exists do nothing
-    if ( Exists() ) return false;
-
-    if ( !OnOpen(m_strBufferName, WriteAccess) )
-        return false;
-
-    OnClose();
-    return true;
-}
-
-bool wxTextBuffer::Open(const wxString& strBufferName, const wxMBConv& conv)
-{
-    m_strBufferName = strBufferName;
-
-    return Open(conv);
-}
-
-bool wxTextBuffer::Open(const wxMBConv& conv)
-{
-    // buffer name must be either given in ctor or in Open(const wxString&)
-    wxASSERT( !m_strBufferName.empty() );
-
-    // open buffer in read-only mode
-    if ( !OnOpen(m_strBufferName, ReadAccess) )
-        return false;
-
-    // read buffer into memory
-    m_isOpened = OnRead(conv);
-
-    OnClose();
-
-    return m_isOpened;
-}
-
-// analyse some lines of the buffer trying to guess it's type.
-// if it fails, it assumes the native type for our platform.
-wxTextFileType wxTextBuffer::GuessType() const
-{
-    wxASSERT( IsOpened() );
-
-    // scan the buffer lines
-    size_t nUnix = 0,     // number of '\n's alone
-           nDos  = 0,     // number of '\r\n'
-           nMac  = 0;     // number of '\r's
-
-    // we take MAX_LINES_SCAN in the beginning, middle and the end of buffer
-    #define MAX_LINES_SCAN    (10)
-    size_t nCount = m_aLines.GetCount() / 3,
-        nScan =  nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3;
-
-    #define   AnalyseLine(n)              \
-        switch ( m_aTypes[n] ) {            \
-            case wxTextFileType_Unix: nUnix++; break;   \
-            case wxTextFileType_Dos:  nDos++;  break;   \
-            case wxTextFileType_Mac:  nMac++;  break;   \
-            default: wxFAIL_MSG(wxT("unknown line terminator")); \
-        }
-
-    size_t n;
-    for ( n = 0; n < nScan; n++ )     // the beginning
-        AnalyseLine(n);
-    for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )
-        AnalyseLine(n);
-    for ( n = nCount - nScan; n < nCount; n++ )
-        AnalyseLine(n);
-
-    #undef   AnalyseLine
-
-    // interpret the results (FIXME far from being even 50% fool proof)
-    if ( nScan > 0 && nDos + nUnix + nMac == 0 ) {
-        // no newlines at all
-        wxLogWarning(_("'%s' is probably a binary buffer."), m_strBufferName.c_str());
-    }
-    else {
-        #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \
-                                                : n##t1 > n##t2             \
-                                                    ? wxTextFileType_##t1   \
-                                                    : wxTextFileType_##t2
-
-#if !defined(__WATCOMC__) || wxCHECK_WATCOM_VERSION(1,4)
-        if ( nDos > nUnix )
-            return GREATER_OF(Dos, Mac);
-        else if ( nDos < nUnix )
-            return GREATER_OF(Unix, Mac);
-        else {
-            // nDos == nUnix
-            return nMac > nDos ? wxTextFileType_Mac : typeDefault;
-        }
-#endif // __WATCOMC__
-
-        #undef    GREATER_OF
-    }
-
-    return typeDefault;
-}
-
-
-bool wxTextBuffer::Close()
-{
-    Clear();
-    m_isOpened = false;
-
-    return true;
-}
-
-bool wxTextBuffer::Write(wxTextFileType typeNew, const wxMBConv& conv)
-{
-    return OnWrite(typeNew, conv);
-}
-
-#endif // wxUSE_TEXTBUFFER
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/textbuf.cpp
+// Purpose:     implementation of wxTextBuffer class
+// Created:     14.11.01
+// Author:      Morten Hanssen, Vadim Zeitlin
+// RCS-ID:      $Id: textbuf.cpp 38570 2006-04-05 14:37:47Z VZ $
+// Copyright:   (c) 1998-2001 wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// headers
+// ============================================================================
+
+#include  "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif  //__BORLANDC__
+
+#ifndef WX_PRECOMP
+    #include  "wx/string.h"
+    #include  "wx/intl.h"
+    #include  "wx/log.h"
+#endif
+
+#include "wx/textbuf.h"
+
+// ============================================================================
+// wxTextBuffer class implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// static methods (always compiled in)
+// ----------------------------------------------------------------------------
+
+// default type is the native one
+// the native type under Mac OS X is:
+//   - Unix when compiling with the Apple Developer Tools (__UNIX__)
+//   - Mac when compiling with CodeWarrior (__WXMAC__)
+
+const wxTextFileType wxTextBuffer::typeDefault =
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__PALMOS__)
+  wxTextFileType_Dos;
+#elif defined(__UNIX__)
+  wxTextFileType_Unix;
+#elif defined(__WXMAC__)
+  wxTextFileType_Mac;
+#elif defined(__OS2__)
+  wxTextFileType_Os2;
+#else
+  wxTextFileType_None;
+  #error  "wxTextBuffer: unsupported platform."
+#endif
+
+const wxChar *wxTextBuffer::GetEOL(wxTextFileType type)
+{
+    switch ( type ) {
+        default:
+            wxFAIL_MSG(wxT("bad buffer type in wxTextBuffer::GetEOL."));
+            // fall through nevertheless - we must return something...
+
+        case wxTextFileType_None: return wxEmptyString;
+        case wxTextFileType_Unix: return wxT("\n");
+        case wxTextFileType_Dos:  return wxT("\r\n");
+        case wxTextFileType_Mac:  return wxT("\r");
+    }
+}
+
+wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type)
+{
+    // don't do anything if there is nothing to do
+    if ( type == wxTextFileType_None )
+        return text;
+
+    // nor if it is empty
+    if ( text.empty() )
+        return text;
+
+    wxString eol = GetEOL(type), result;
+
+    // optimization: we know that the length of the new string will be about
+    // the same as the length of the old one, so prealloc memory to aviod
+    // unnecessary relocations
+    result.Alloc(text.Len());
+
+    wxChar chLast = 0;
+    for ( const wxChar *pc = text.c_str(); *pc; pc++ )
+    {
+        wxChar ch = *pc;
+        switch ( ch ) {
+            case _T('\n'):
+                // Dos/Unix line termination
+                result += eol;
+                chLast = 0;
+                break;
+
+            case _T('\r'):
+                if ( chLast == _T('\r') ) {
+                    // Mac empty line
+                    result += eol;
+                }
+                else {
+                    // just remember it: we don't know whether it is just "\r"
+                    // or "\r\n" yet
+                    chLast = _T('\r');
+                }
+                break;
+
+            default:
+                if ( chLast == _T('\r') ) {
+                    // Mac line termination
+                    result += eol;
+
+                    // reset chLast to avoid inserting another eol before the
+                    // next character
+                    chLast = 0;
+                }
+
+                // add to the current line
+                result += ch;
+        }
+    }
+
+    if ( chLast ) {
+        // trailing '\r'
+        result += eol;
+    }
+
+    return result;
+}
+
+#if wxUSE_TEXTBUFFER
+
+wxString wxTextBuffer::ms_eof;
+
+// ----------------------------------------------------------------------------
+// ctors & dtor
+// ----------------------------------------------------------------------------
+
+wxTextBuffer::wxTextBuffer(const wxString& strBufferName)
+            : m_strBufferName(strBufferName)
+{
+    m_nCurLine = 0;
+    m_isOpened = false;
+}
+
+wxTextBuffer::~wxTextBuffer()
+{
+    // required here for Darwin
+}
+
+// ----------------------------------------------------------------------------
+// buffer operations
+// ----------------------------------------------------------------------------
+
+bool wxTextBuffer::Exists() const
+{
+    return OnExists();
+}
+
+bool wxTextBuffer::Create(const wxString& strBufferName)
+{
+    m_strBufferName = strBufferName;
+
+    return Create();
+}
+
+bool wxTextBuffer::Create()
+{
+    // buffer name must be either given in ctor or in Create(const wxString&)
+    wxASSERT( !m_strBufferName.empty() );
+
+    // if the buffer already exists do nothing
+    if ( Exists() ) return false;
+
+    if ( !OnOpen(m_strBufferName, WriteAccess) )
+        return false;
+
+    OnClose();
+    return true;
+}
+
+bool wxTextBuffer::Open(const wxString& strBufferName, const wxMBConv& conv)
+{
+    m_strBufferName = strBufferName;
+
+    return Open(conv);
+}
+
+bool wxTextBuffer::Open(const wxMBConv& conv)
+{
+    // buffer name must be either given in ctor or in Open(const wxString&)
+    wxASSERT( !m_strBufferName.empty() );
+
+    // open buffer in read-only mode
+    if ( !OnOpen(m_strBufferName, ReadAccess) )
+        return false;
+
+    // read buffer into memory
+    m_isOpened = OnRead(conv);
+
+    OnClose();
+
+    return m_isOpened;
+}
+
+// analyse some lines of the buffer trying to guess it's type.
+// if it fails, it assumes the native type for our platform.
+wxTextFileType wxTextBuffer::GuessType() const
+{
+    wxASSERT( IsOpened() );
+
+    // scan the buffer lines
+    size_t nUnix = 0,     // number of '\n's alone
+           nDos  = 0,     // number of '\r\n'
+           nMac  = 0;     // number of '\r's
+
+    // we take MAX_LINES_SCAN in the beginning, middle and the end of buffer
+    #define MAX_LINES_SCAN    (10)
+    size_t nCount = m_aLines.Count() / 3,
+        nScan =  nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3;
+
+    #define   AnalyseLine(n)              \
+        switch ( m_aTypes[n] ) {            \
+            case wxTextFileType_Unix: nUnix++; break;   \
+            case wxTextFileType_Dos:  nDos++;  break;   \
+            case wxTextFileType_Mac:  nMac++;  break;   \
+            default: wxFAIL_MSG(_("unknown line terminator")); \
+        }
+
+    size_t n;
+    for ( n = 0; n < nScan; n++ )     // the beginning
+        AnalyseLine(n);
+    for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )
+        AnalyseLine(n);
+    for ( n = nCount - nScan; n < nCount; n++ )
+        AnalyseLine(n);
+
+    #undef   AnalyseLine
+
+    // interpret the results (FIXME far from being even 50% fool proof)
+    if ( nScan > 0 && nDos + nUnix + nMac == 0 ) {
+        // no newlines at all
+        wxLogWarning(_("'%s' is probably a binary buffer."), m_strBufferName.c_str());
+    }
+    else {
+        #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \
+                                                : n##t1 > n##t2             \
+                                                    ? wxTextFileType_##t1   \
+                                                    : wxTextFileType_##t2
+
+#if !defined(__WATCOMC__) || wxCHECK_WATCOM_VERSION(1,4)
+        if ( nDos > nUnix )
+            return GREATER_OF(Dos, Mac);
+        else if ( nDos < nUnix )
+            return GREATER_OF(Unix, Mac);
+        else {
+            // nDos == nUnix
+            return nMac > nDos ? wxTextFileType_Mac : typeDefault;
+        }
+#endif // __WATCOMC__
+
+        #undef    GREATER_OF
+    }
+
+    return typeDefault;
+}
+
+
+bool wxTextBuffer::Close()
+{
+    Clear();
+    m_isOpened = false;
+
+    return true;
+}
+
+bool wxTextBuffer::Write(wxTextFileType typeNew, const wxMBConv& conv)
+{
+    return OnWrite(typeNew, conv);
+}
+
+#endif // wxUSE_TEXTBUFFER
diff --git a/Source/3rd Party/wx/src/common/textcmn.cpp b/Source/3rd Party/wx/src/common/textcmn.cpp
index 3ff05970f..952fcf974 100644
--- a/Source/3rd Party/wx/src/common/textcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/textcmn.cpp	
@@ -1,1206 +1,553 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/textcmn.cpp
-// Purpose:     implementation of platform-independent functions of wxTextCtrl
-// Author:      Julian Smart
-// Modified by:
-// Created:     13.07.99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/event.h"
-#endif // WX_PRECOMP
-
-#if wxUSE_TEXTCTRL
-
-#include "wx/textctrl.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif // WX_PRECOMP
-
-#include "wx/ffile.h"
-
-extern WXDLLEXPORT_DATA(const char) wxTextCtrlNameStr[] = "text";
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// we don't have any objects of type wxTextCtrlBase in the program, only
-// wxTextCtrl, so this cast is safe
-#define TEXTCTRL(ptr)   ((wxTextCtrl *)(ptr))
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxTextCtrlStyle )
-wxBEGIN_FLAGS( wxTextCtrlStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxTE_PROCESS_ENTER)
-wxFLAGS_MEMBER(wxTE_PROCESS_TAB)
-wxFLAGS_MEMBER(wxTE_MULTILINE)
-wxFLAGS_MEMBER(wxTE_PASSWORD)
-wxFLAGS_MEMBER(wxTE_READONLY)
-wxFLAGS_MEMBER(wxHSCROLL)
-wxFLAGS_MEMBER(wxTE_RICH)
-wxFLAGS_MEMBER(wxTE_RICH2)
-wxFLAGS_MEMBER(wxTE_AUTO_URL)
-wxFLAGS_MEMBER(wxTE_NOHIDESEL)
-wxFLAGS_MEMBER(wxTE_LEFT)
-wxFLAGS_MEMBER(wxTE_CENTRE)
-wxFLAGS_MEMBER(wxTE_RIGHT)
-wxFLAGS_MEMBER(wxTE_DONTWRAP)
-wxFLAGS_MEMBER(wxTE_CHARWRAP)
-wxFLAGS_MEMBER(wxTE_WORDWRAP)
-wxEND_FLAGS( wxTextCtrlStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl, "wx/textctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
-wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
-wxEVENT_PROPERTY( TextEnter, wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent )
-
-wxPROPERTY( Font, wxFont, SetFont, GetFont , wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group") )
-wxPROPERTY( Value, wxString, SetValue, GetValue, wxString(), \
-           0 /*flags*/, wxT("Helpstring"), wxT("group"))
-
-wxPROPERTY_FLAGS( WindowStyle, wxTextCtrlStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxTextCtrl)
-
-wxCONSTRUCTOR_6( wxTextCtrl, wxWindow*, Parent, wxWindowID, Id, \
-                wxString, Value, wxPoint, Position, wxSize, Size, \
-                long, WindowStyle)
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent)
-
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_ENTER, wxCommandEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_URL, wxTextUrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_MAXLEN, wxCommandEvent );
-
-IMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl)
-
-// ============================================================================
-// wxTextAttr implementation
-// ============================================================================
-
-wxTextAttr::wxTextAttr(const wxColour& colText,
-               const wxColour& colBack,
-               const wxFont& font,
-               wxTextAttrAlignment alignment): m_textAlignment(alignment), m_colText(colText), m_colBack(colBack)
-{
-    Init();
-
-    if (m_colText.IsOk()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
-    if (m_colBack.IsOk()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;
-    if (alignment != wxTEXT_ALIGNMENT_DEFAULT)
-        m_flags |= wxTEXT_ATTR_ALIGNMENT;
-
-    GetFontAttributes(font);
-}
-
-// Initialisation
-void wxTextAttr::Init()
-{
-    m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
-    m_flags = 0;
-    m_leftIndent = 0;
-    m_leftSubIndent = 0;
-    m_rightIndent = 0;
-
-    m_fontSize = 12;
-    m_fontStyle = wxFONTSTYLE_NORMAL;
-    m_fontWeight = wxFONTWEIGHT_NORMAL;
-    m_fontUnderlined = false;
-    m_fontStrikethrough = false;
-    m_fontEncoding = wxFONTENCODING_DEFAULT;
-    m_fontFamily = wxFONTFAMILY_DEFAULT;
-
-    m_paragraphSpacingAfter = 0;
-    m_paragraphSpacingBefore = 0;
-    m_lineSpacing = 0;
-    m_bulletStyle = wxTEXT_ATTR_BULLET_STYLE_NONE;
-    m_textEffects = wxTEXT_ATTR_EFFECT_NONE;
-    m_textEffectFlags = wxTEXT_ATTR_EFFECT_NONE;
-    m_outlineLevel = 0;
-    m_bulletNumber = 0;
-}
-
-// Copy
-void wxTextAttr::Copy(const wxTextAttr& attr)
-{
-    m_colText = attr.m_colText;
-    m_colBack = attr.m_colBack;
-    m_textAlignment = attr.m_textAlignment;
-    m_leftIndent = attr.m_leftIndent;
-    m_leftSubIndent = attr.m_leftSubIndent;
-    m_rightIndent = attr.m_rightIndent;
-    m_tabs = attr.m_tabs;
-    m_flags = attr.m_flags;
-
-    m_fontSize = attr.m_fontSize;
-    m_fontStyle = attr.m_fontStyle;
-    m_fontWeight = attr.m_fontWeight;
-    m_fontUnderlined = attr.m_fontUnderlined;
-    m_fontStrikethrough = attr.m_fontStrikethrough;
-    m_fontFaceName = attr.m_fontFaceName;
-    m_fontEncoding = attr.m_fontEncoding;
-    m_fontFamily = attr.m_fontFamily;
-    m_textEffects = attr.m_textEffects;
-    m_textEffectFlags = attr.m_textEffectFlags;
-
-    m_paragraphSpacingAfter = attr.m_paragraphSpacingAfter;
-    m_paragraphSpacingBefore = attr.m_paragraphSpacingBefore;
-    m_lineSpacing = attr.m_lineSpacing;
-    m_characterStyleName = attr.m_characterStyleName;
-    m_paragraphStyleName = attr.m_paragraphStyleName;
-    m_listStyleName = attr.m_listStyleName;
-    m_bulletStyle = attr.m_bulletStyle;
-    m_bulletNumber = attr.m_bulletNumber;
-    m_bulletText = attr.m_bulletText;
-    m_bulletFont = attr.m_bulletFont;
-    m_bulletName = attr.m_bulletName;
-    m_outlineLevel = attr.m_outlineLevel;
-
-    m_urlTarget = attr.m_urlTarget;
-}
-
-// operators
-void wxTextAttr::operator= (const wxTextAttr& attr)
-{
-    Copy(attr);
-}
-
-// Equality test
-bool wxTextAttr::operator== (const wxTextAttr& attr) const
-{
-    return  GetFlags() == attr.GetFlags() &&
-
-            GetTextColour() == attr.GetTextColour() &&
-            GetBackgroundColour() == attr.GetBackgroundColour() &&
-
-            GetAlignment() == attr.GetAlignment() &&
-            GetLeftIndent() == attr.GetLeftIndent() &&
-            GetLeftSubIndent() == attr.GetLeftSubIndent() &&
-            GetRightIndent() == attr.GetRightIndent() &&
-            TabsEq(GetTabs(), attr.GetTabs()) &&
-
-            GetParagraphSpacingAfter() == attr.GetParagraphSpacingAfter() &&
-            GetParagraphSpacingBefore() == attr.GetParagraphSpacingBefore() &&
-            GetLineSpacing() == attr.GetLineSpacing() &&
-            GetCharacterStyleName() == attr.GetCharacterStyleName() &&
-            GetParagraphStyleName() == attr.GetParagraphStyleName() &&
-            GetListStyleName() == attr.GetListStyleName() &&
-
-            GetBulletStyle() == attr.GetBulletStyle() &&
-            GetBulletText() == attr.GetBulletText() &&
-            GetBulletNumber() == attr.GetBulletNumber() &&
-            GetBulletFont() == attr.GetBulletFont() &&
-            GetBulletName() == attr.GetBulletName() &&
-
-            GetTextEffects() == attr.GetTextEffects() &&
-            GetTextEffectFlags() == attr.GetTextEffectFlags() &&
-
-            GetOutlineLevel() == attr.GetOutlineLevel() &&
-
-            GetFontSize() == attr.GetFontSize() &&
-            GetFontStyle() == attr.GetFontStyle() &&
-            GetFontWeight() == attr.GetFontWeight() &&
-            GetFontUnderlined() == attr.GetFontUnderlined() &&
-            GetFontFaceName() == attr.GetFontFaceName() &&
-            GetFontEncoding() == attr.GetFontEncoding() &&
-            GetFontFamily() == attr.GetFontFamily() &&
-
-            GetURL() == attr.GetURL();
-}
-
-// Partial equality test. Only returns false if an attribute doesn't match.
-bool wxTextAttr::EqPartial(const wxTextAttr& attr, bool weakTest) const
-{
-    int flags = attr.GetFlags();
-
-    if (!weakTest &&
-        ((!HasTextColour() && attr.HasTextColour()) ||
-         (!HasBackgroundColour() && attr.HasBackgroundColour()) ||
-         (!HasFontFaceName() && attr.HasFontFaceName()) ||
-         (!HasFontSize() && attr.HasFontSize()) ||
-         (!HasFontWeight() && attr.HasFontWeight()) ||
-         (!HasFontItalic() && attr.HasFontItalic()) ||
-         (!HasFontUnderlined() && attr.HasFontUnderlined()) ||
-         (!HasFontStrikethrough() && attr.HasFontStrikethrough()) ||
-         (!HasFontEncoding() && attr.HasFontEncoding()) ||
-         (!HasFontFamily() && attr.HasFontFamily()) ||
-         (!HasURL() && attr.HasURL()) ||
-         (!HasAlignment() && attr.HasAlignment()) ||
-         (!HasLeftIndent() && attr.HasLeftIndent()) ||
-         (!HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter()) ||
-         (!HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore()) ||
-         (!HasLineSpacing() && attr.HasLineSpacing()) ||
-         (!HasCharacterStyleName() && attr.HasCharacterStyleName()) ||
-         (!HasParagraphStyleName() && attr.HasParagraphStyleName()) ||
-         (!HasListStyleName() && attr.HasListStyleName()) ||
-         (!HasBulletStyle() && attr.HasBulletStyle()) ||
-         (!HasBulletNumber() && attr.HasBulletNumber()) ||
-         (!HasBulletText() && attr.HasBulletText()) ||
-         (!HasBulletName() && attr.HasBulletName()) ||
-         (!HasTabs() && attr.HasTabs()) ||
-         (!HasTextEffects() && attr.HasTextEffects()) ||
-         (!HasOutlineLevel() && attr.HasOutlineLevel())))
-    {
-        return false;
-    }
-
-    if (HasTextColour() && attr.HasTextColour() && GetTextColour() != attr.GetTextColour())
-        return false;
-
-    if (HasBackgroundColour() && attr.HasBackgroundColour() && GetBackgroundColour() != attr.GetBackgroundColour())
-        return false;
-
-    if (HasFontFaceName() && attr.HasFontFaceName() && GetFontFaceName() != attr.GetFontFaceName())
-        return false;
-
-    // This checks whether the two objects have the same font size dimension (px versus pt)
-    if (HasFontSize() && attr.HasFontSize() && (flags & wxTEXT_ATTR_FONT) != (GetFlags() & wxTEXT_ATTR_FONT))
-        return false;
-
-    if (HasFontPointSize() && attr.HasFontPointSize() && GetFontSize() != attr.GetFontSize())
-        return false;
-
-    if (HasFontPixelSize() && attr.HasFontPixelSize() && GetFontSize() != attr.GetFontSize())
-        return false;
-
-    if (HasFontWeight() && attr.HasFontWeight() && GetFontWeight() != attr.GetFontWeight())
-        return false;
-
-    if (HasFontItalic() && attr.HasFontItalic() && GetFontStyle() != attr.GetFontStyle())
-        return false;
-
-    if (HasFontUnderlined() && attr.HasFontUnderlined() && GetFontUnderlined() != attr.GetFontUnderlined())
-        return false;
-
-    if (HasFontStrikethrough() && attr.HasFontStrikethrough() && GetFontStrikethrough() != attr.GetFontStrikethrough())
-        return false;
-
-    if (HasFontEncoding() && attr.HasFontEncoding() && GetFontEncoding() != attr.GetFontEncoding())
-        return false;
-
-    if (HasFontFamily() && attr.HasFontFamily() && GetFontFamily() != attr.GetFontFamily())
-        return false;
-
-    if (HasURL() && attr.HasURL() && GetURL() != attr.GetURL())
-        return false;
-
-    if (HasAlignment() && attr.HasAlignment() && GetAlignment() != attr.GetAlignment())
-        return false;
-
-    if (HasLeftIndent() && attr.HasLeftIndent() &&
-        ((GetLeftIndent() != attr.GetLeftIndent()) || (GetLeftSubIndent() != attr.GetLeftSubIndent())))
-        return false;
-
-    if (HasRightIndent() && attr.HasRightIndent() && (GetRightIndent() != attr.GetRightIndent()))
-        return false;
-
-    if (HasParagraphSpacingAfter() && attr.HasParagraphSpacingAfter() &&
-        (GetParagraphSpacingAfter() != attr.GetParagraphSpacingAfter()))
-        return false;
-
-    if (HasParagraphSpacingBefore() && attr.HasParagraphSpacingBefore() &&
-        (GetParagraphSpacingBefore() != attr.GetParagraphSpacingBefore()))
-        return false;
-
-    if (HasLineSpacing() && attr.HasLineSpacing() && (GetLineSpacing() != attr.GetLineSpacing()))
-        return false;
-
-    if (HasCharacterStyleName() && attr.HasCharacterStyleName() && (GetCharacterStyleName() != attr.GetCharacterStyleName()))
-        return false;
-
-    if (HasParagraphStyleName() && attr.HasParagraphStyleName() && (GetParagraphStyleName() != attr.GetParagraphStyleName()))
-        return false;
-
-    if (HasListStyleName() && attr.HasListStyleName() && (GetListStyleName() != attr.GetListStyleName()))
-        return false;
-
-    if (HasBulletStyle() && attr.HasBulletStyle() && (GetBulletStyle() != attr.GetBulletStyle()))
-         return false;
-
-    if (HasBulletNumber() && attr.HasBulletNumber() && (GetBulletNumber() != attr.GetBulletNumber()))
-         return false;
-
-    if (HasBulletText() && attr.HasBulletText() &&
-        (GetBulletText() != attr.GetBulletText()) &&
-        (GetBulletFont() != attr.GetBulletFont()))
-         return false;
-
-    if (HasBulletName() && attr.HasBulletName() && (GetBulletName() != attr.GetBulletName()))
-         return false;
-
-    if (HasTabs() && attr.HasTabs() && !TabsEq(GetTabs(), attr.GetTabs()))
-        return false;
-
-    if ((HasPageBreak() != attr.HasPageBreak()))
-         return false;
-
-    if (HasTextEffects() && attr.HasTextEffects())
-    {
-        if (!BitlistsEqPartial(GetTextEffects(), attr.GetTextEffects(), attr.GetTextEffectFlags()))
-            return false;
-    }
-
-    if (HasOutlineLevel() && attr.HasOutlineLevel() && (GetOutlineLevel() != attr.GetOutlineLevel()))
-         return false;
-
-    return true;
-}
-
-// Create font from font attributes.
-wxFont wxTextAttr::GetFont() const
-{
-    if ( !HasFont() )
-        return wxNullFont;
-
-    int fontSize = 10;
-    if (HasFontSize())
-        fontSize = GetFontSize();
-
-    wxFontStyle fontStyle = wxFONTSTYLE_NORMAL;
-    if (HasFontItalic())
-        fontStyle = GetFontStyle();
-
-    wxFontWeight fontWeight = wxFONTWEIGHT_NORMAL;
-    if (HasFontWeight())
-        fontWeight = GetFontWeight();
-
-    bool underlined = false;
-    if (HasFontUnderlined())
-        underlined = GetFontUnderlined();
-
-    bool strikethrough = false;
-    if (HasFontStrikethrough())
-        strikethrough = GetFontStrikethrough();
-
-    wxString fontFaceName;
-    if (HasFontFaceName())
-        fontFaceName = GetFontFaceName();
-
-    wxFontEncoding encoding = wxFONTENCODING_DEFAULT;
-    if (HasFontEncoding())
-        encoding = GetFontEncoding();
-
-    wxFontFamily fontFamily = wxFONTFAMILY_DEFAULT;
-    if (HasFontFamily())
-        fontFamily = GetFontFamily();
-
-    if (HasFontPixelSize())
-    {
-        wxFont font(wxSize(0, fontSize), fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding);
-        if (strikethrough)
-            font.SetStrikethrough(true);
-        return font;
-    }
-    else
-    {
-        wxFont font(fontSize, fontFamily, fontStyle, fontWeight, underlined, fontFaceName, encoding);
-        if (strikethrough)
-            font.SetStrikethrough(true);
-        return font;
-    }
-}
-
-// Get attributes from font.
-bool wxTextAttr::GetFontAttributes(const wxFont& font, int flags)
-{
-    if (!font.IsOk())
-        return false;
-
-    // If we pass both pixel and point size attributes, this is an indication
-    // to choose the most appropriate units.
-    if ((flags & wxTEXT_ATTR_FONT) == wxTEXT_ATTR_FONT)
-    {
-        if (font.IsUsingSizeInPixels())
-        {
-            m_fontSize = font.GetPixelSize().y;
-            flags &= ~wxTEXT_ATTR_FONT_POINT_SIZE;
-        }
-        else
-        {
-            m_fontSize = font.GetPointSize();
-            flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE;
-        }
-    }
-    else if (flags & wxTEXT_ATTR_FONT_POINT_SIZE)
-    {
-        m_fontSize = font.GetPointSize();
-        flags &= ~wxTEXT_ATTR_FONT_PIXEL_SIZE;
-    }
-    else if (flags & wxTEXT_ATTR_FONT_PIXEL_SIZE)
-    {
-        m_fontSize = font.GetPixelSize().y;
-    }
-
-    if (flags & wxTEXT_ATTR_FONT_ITALIC)
-        m_fontStyle = font.GetStyle();
-
-    if (flags & wxTEXT_ATTR_FONT_WEIGHT)
-        m_fontWeight = font.GetWeight();
-
-    if (flags & wxTEXT_ATTR_FONT_UNDERLINE)
-        m_fontUnderlined = font.GetUnderlined();
-
-    if (flags & wxTEXT_ATTR_FONT_STRIKETHROUGH)
-        m_fontStrikethrough = font.GetStrikethrough();
-
-    if (flags & wxTEXT_ATTR_FONT_FACE)
-        m_fontFaceName = font.GetFaceName();
-
-    if (flags & wxTEXT_ATTR_FONT_ENCODING)
-        m_fontEncoding = font.GetEncoding();
-
-    if (flags & wxTEXT_ATTR_FONT_FAMILY)
-    {
-        // wxFont might not know its family, avoid setting m_fontFamily to an
-        // invalid value and rather pretend that we don't have any font family
-        // information at all in this case
-        const wxFontFamily fontFamily = font.GetFamily();
-        if ( fontFamily == wxFONTFAMILY_UNKNOWN )
-            flags &= ~wxTEXT_ATTR_FONT_FAMILY;
-        else
-            m_fontFamily = fontFamily;
-    }
-
-    m_flags |= flags;
-
-    return true;
-}
-
-// Resets bits in destination so new attributes aren't merged with mutually exclusive ones
-static bool wxResetIncompatibleBits(const int mask, const int srcFlags, int& destFlags, int& destBits)
-{
-    if ((srcFlags & mask) && (destFlags & mask))
-    {
-        destBits &= ~mask;
-        destFlags &= ~mask;
-    }
-
-    return true;
-}
-
-bool wxTextAttr::Apply(const wxTextAttr& style, const wxTextAttr* compareWith)
-{
-    wxTextAttr& destStyle = (*this);
-
-    if (style.HasFontWeight())
-    {
-        if (!(compareWith && compareWith->HasFontWeight() && compareWith->GetFontWeight() == style.GetFontWeight()))
-            destStyle.SetFontWeight(style.GetFontWeight());
-    }
-
-    if (style.HasFontPointSize())
-    {
-        if (!(compareWith && compareWith->HasFontPointSize() && compareWith->GetFontSize() == style.GetFontSize()))
-            destStyle.SetFontPointSize(style.GetFontSize());
-    }
-    else if (style.HasFontPixelSize())
-    {
-        if (!(compareWith && compareWith->HasFontPixelSize() && compareWith->GetFontSize() == style.GetFontSize()))
-            destStyle.SetFontPixelSize(style.GetFontSize());
-    }
-
-    if (style.HasFontItalic())
-    {
-        if (!(compareWith && compareWith->HasFontItalic() && compareWith->GetFontStyle() == style.GetFontStyle()))
-            destStyle.SetFontStyle(style.GetFontStyle());
-    }
-
-    if (style.HasFontUnderlined())
-    {
-        if (!(compareWith && compareWith->HasFontUnderlined() && compareWith->GetFontUnderlined() == style.GetFontUnderlined()))
-            destStyle.SetFontUnderlined(style.GetFontUnderlined());
-    }
-
-    if (style.HasFontStrikethrough())
-    {
-        if (!(compareWith && compareWith->HasFontStrikethrough() && compareWith->GetFontStrikethrough() == style.GetFontStrikethrough()))
-            destStyle.SetFontStrikethrough(style.GetFontStrikethrough());
-    }
-
-    if (style.HasFontFaceName())
-    {
-        if (!(compareWith && compareWith->HasFontFaceName() && compareWith->GetFontFaceName() == style.GetFontFaceName()))
-            destStyle.SetFontFaceName(style.GetFontFaceName());
-    }
-
-    if (style.HasFontEncoding())
-    {
-        if (!(compareWith && compareWith->HasFontEncoding() && compareWith->GetFontEncoding() == style.GetFontEncoding()))
-            destStyle.SetFontEncoding(style.GetFontEncoding());
-    }
-
-    if (style.HasFontFamily())
-    {
-        if (!(compareWith && compareWith->HasFontFamily() && compareWith->GetFontFamily() == style.GetFontFamily()))
-            destStyle.SetFontFamily(style.GetFontFamily());
-    }
-
-    if (style.GetTextColour().IsOk() && style.HasTextColour())
-    {
-        if (!(compareWith && compareWith->HasTextColour() && compareWith->GetTextColour() == style.GetTextColour()))
-            destStyle.SetTextColour(style.GetTextColour());
-    }
-
-    if (style.GetBackgroundColour().IsOk() && style.HasBackgroundColour())
-    {
-        if (!(compareWith && compareWith->HasBackgroundColour() && compareWith->GetBackgroundColour() == style.GetBackgroundColour()))
-            destStyle.SetBackgroundColour(style.GetBackgroundColour());
-    }
-
-    if (style.HasAlignment())
-    {
-        if (!(compareWith && compareWith->HasAlignment() && compareWith->GetAlignment() == style.GetAlignment()))
-            destStyle.SetAlignment(style.GetAlignment());
-    }
-
-    if (style.HasTabs())
-    {
-        if (!(compareWith && compareWith->HasTabs() && TabsEq(compareWith->GetTabs(), style.GetTabs())))
-            destStyle.SetTabs(style.GetTabs());
-    }
-
-    if (style.HasLeftIndent())
-    {
-        if (!(compareWith && compareWith->HasLeftIndent() && compareWith->GetLeftIndent() == style.GetLeftIndent()
-                          && compareWith->GetLeftSubIndent() == style.GetLeftSubIndent()))
-            destStyle.SetLeftIndent(style.GetLeftIndent(), style.GetLeftSubIndent());
-    }
-
-    if (style.HasRightIndent())
-    {
-        if (!(compareWith && compareWith->HasRightIndent() && compareWith->GetRightIndent() == style.GetRightIndent()))
-            destStyle.SetRightIndent(style.GetRightIndent());
-    }
-
-    if (style.HasParagraphSpacingAfter())
-    {
-        if (!(compareWith && compareWith->HasParagraphSpacingAfter() && compareWith->GetParagraphSpacingAfter() == style.GetParagraphSpacingAfter()))
-            destStyle.SetParagraphSpacingAfter(style.GetParagraphSpacingAfter());
-    }
-
-    if (style.HasParagraphSpacingBefore())
-    {
-        if (!(compareWith && compareWith->HasParagraphSpacingBefore() && compareWith->GetParagraphSpacingBefore() == style.GetParagraphSpacingBefore()))
-            destStyle.SetParagraphSpacingBefore(style.GetParagraphSpacingBefore());
-    }
-
-    if (style.HasLineSpacing())
-    {
-        if (!(compareWith && compareWith->HasLineSpacing() && compareWith->GetLineSpacing() == style.GetLineSpacing()))
-            destStyle.SetLineSpacing(style.GetLineSpacing());
-    }
-
-    if (style.HasCharacterStyleName())
-    {
-        if (!(compareWith && compareWith->HasCharacterStyleName() && compareWith->GetCharacterStyleName() == style.GetCharacterStyleName()))
-            destStyle.SetCharacterStyleName(style.GetCharacterStyleName());
-    }
-
-    if (style.HasParagraphStyleName())
-    {
-        if (!(compareWith && compareWith->HasParagraphStyleName() && compareWith->GetParagraphStyleName() == style.GetParagraphStyleName()))
-            destStyle.SetParagraphStyleName(style.GetParagraphStyleName());
-    }
-
-    if (style.HasListStyleName())
-    {
-        if (!(compareWith && compareWith->HasListStyleName() && compareWith->GetListStyleName() == style.GetListStyleName()))
-            destStyle.SetListStyleName(style.GetListStyleName());
-    }
-
-    if (style.HasBulletStyle())
-    {
-        if (!(compareWith && compareWith->HasBulletStyle() && compareWith->GetBulletStyle() == style.GetBulletStyle()))
-            destStyle.SetBulletStyle(style.GetBulletStyle());
-    }
-
-    if (style.HasBulletText())
-    {
-        if (!(compareWith && compareWith->HasBulletText() && compareWith->GetBulletText() == style.GetBulletText()))
-        {
-            destStyle.SetBulletText(style.GetBulletText());
-            destStyle.SetBulletFont(style.GetBulletFont());
-        }
-    }
-
-    if (style.HasBulletNumber())
-    {
-        if (!(compareWith && compareWith->HasBulletNumber() && compareWith->GetBulletNumber() == style.GetBulletNumber()))
-            destStyle.SetBulletNumber(style.GetBulletNumber());
-    }
-
-    if (style.HasBulletName())
-    {
-        if (!(compareWith && compareWith->HasBulletName() && compareWith->GetBulletName() == style.GetBulletName()))
-            destStyle.SetBulletName(style.GetBulletName());
-    }
-
-    if (style.HasURL())
-    {
-        if (!(compareWith && compareWith->HasURL() && compareWith->GetURL() == style.GetURL()))
-            destStyle.SetURL(style.GetURL());
-    }
-
-    if (style.HasPageBreak())
-    {
-        if (!(compareWith && compareWith->HasPageBreak()))
-            destStyle.SetPageBreak();
-    }
-
-    if (style.HasTextEffects())
-    {
-        if (!(compareWith && compareWith->HasTextEffects() && compareWith->GetTextEffects() == style.GetTextEffects()))
-        {
-            int destBits = destStyle.GetTextEffects();
-            int destFlags = destStyle.GetTextEffectFlags();
-
-            int srcBits = style.GetTextEffects();
-            int srcFlags = style.GetTextEffectFlags();
-
-            // Reset incompatible bits in the destination
-            wxResetIncompatibleBits((wxTEXT_ATTR_EFFECT_SUPERSCRIPT|wxTEXT_ATTR_EFFECT_SUBSCRIPT), srcFlags, destFlags, destBits);
-            wxResetIncompatibleBits((wxTEXT_ATTR_EFFECT_CAPITALS|wxTEXT_ATTR_EFFECT_SMALL_CAPITALS), srcFlags, destFlags, destBits);
-            wxResetIncompatibleBits((wxTEXT_ATTR_EFFECT_STRIKETHROUGH|wxTEXT_ATTR_EFFECT_DOUBLE_STRIKETHROUGH), srcFlags, destFlags, destBits);
-
-            CombineBitlists(destBits, srcBits, destFlags, srcFlags);
-
-            destStyle.SetTextEffects(destBits);
-            destStyle.SetTextEffectFlags(destFlags);
-        }
-    }
-
-    if (style.HasOutlineLevel())
-    {
-        if (!(compareWith && compareWith->HasOutlineLevel() && compareWith->GetOutlineLevel() == style.GetOutlineLevel()))
-            destStyle.SetOutlineLevel(style.GetOutlineLevel());
-    }
-
-    return true;
-}
-
-/* static */
-wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
-                               const wxTextAttr& attrDef,
-                               const wxTextCtrlBase *text)
-{
-    wxFont font;
-    if (attr.HasFont())
-        font = attr.GetFont();
-
-    if ( !font.IsOk() )
-    {
-        if (attrDef.HasFont())
-            font = attrDef.GetFont();
-
-        if ( text && !font.IsOk() )
-            font = text->GetFont();
-    }
-
-    wxColour colFg = attr.GetTextColour();
-    if ( !colFg.IsOk() )
-    {
-        colFg = attrDef.GetTextColour();
-
-        if ( text && !colFg.IsOk() )
-            colFg = text->GetForegroundColour();
-    }
-
-    wxColour colBg = attr.GetBackgroundColour();
-    if ( !colBg.IsOk() )
-    {
-        colBg = attrDef.GetBackgroundColour();
-
-        if ( text && !colBg.IsOk() )
-            colBg = text->GetBackgroundColour();
-    }
-
-    wxTextAttr newAttr(colFg, colBg, font);
-
-    if (attr.HasAlignment())
-        newAttr.SetAlignment(attr.GetAlignment());
-    else if (attrDef.HasAlignment())
-        newAttr.SetAlignment(attrDef.GetAlignment());
-
-    if (attr.HasTabs())
-        newAttr.SetTabs(attr.GetTabs());
-    else if (attrDef.HasTabs())
-        newAttr.SetTabs(attrDef.GetTabs());
-
-    if (attr.HasLeftIndent())
-        newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
-    else if (attrDef.HasLeftIndent())
-        newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
-
-    if (attr.HasRightIndent())
-        newAttr.SetRightIndent(attr.GetRightIndent());
-    else if (attrDef.HasRightIndent())
-        newAttr.SetRightIndent(attrDef.GetRightIndent());
-
-    return newAttr;
-}
-
-/// Compare tabs
-bool wxTextAttr::TabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2)
-{
-    if (tabs1.GetCount() != tabs2.GetCount())
-        return false;
-
-    size_t i;
-    for (i = 0; i < tabs1.GetCount(); i++)
-    {
-        if (tabs1[i] != tabs2[i])
-            return false;
-    }
-    return true;
-}
-
-// Remove attributes
-bool wxTextAttr::RemoveStyle(wxTextAttr& destStyle, const wxTextAttr& style)
-{
-    int flags = style.GetFlags();
-    int destFlags = destStyle.GetFlags();
-
-    destStyle.SetFlags(destFlags & ~flags);
-
-    return true;
-}
-
-/// Combine two bitlists, specifying the bits of interest with separate flags.
-bool wxTextAttr::CombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB)
-{
-    // We want to apply B's bits to A, taking into account each's flags which indicate which bits
-    // are to be taken into account. A zero in B's bits should reset that bit in A but only if B's flags
-    // indicate it.
-
-    // First, reset the 0 bits from B. We make a mask so we're only dealing with B's zero
-    // bits at this point, ignoring any 1 bits in B or 0 bits in B that are not relevant.
-    int valueA2 = ~(~valueB & flagsB) & valueA;
-
-    // Now combine the 1 bits.
-    int valueA3 = (valueB & flagsB) | valueA2;
-
-    valueA = valueA3;
-    flagsA = (flagsA | flagsB);
-
-    return true;
-}
-
-/// Compare two bitlists
-bool wxTextAttr::BitlistsEqPartial(int valueA, int valueB, int flags)
-{
-    int relevantBitsA = valueA & flags;
-    int relevantBitsB = valueB & flags;
-    return relevantBitsA == relevantBitsB;
-}
-
-/// Split into paragraph and character styles
-bool wxTextAttr::SplitParaCharStyles(const wxTextAttr& style, wxTextAttr& parStyle, wxTextAttr& charStyle)
-{
-    wxTextAttr defaultCharStyle1(style);
-    wxTextAttr defaultParaStyle1(style);
-    defaultCharStyle1.SetFlags(defaultCharStyle1.GetFlags()&wxTEXT_ATTR_CHARACTER);
-    defaultParaStyle1.SetFlags(defaultParaStyle1.GetFlags()&wxTEXT_ATTR_PARAGRAPH);
-
-    charStyle.Apply(defaultCharStyle1);
-    parStyle.Apply(defaultParaStyle1);
-
-    return true;
-}
-
-// apply styling to text range
-bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
-                              const wxTextAttr& WXUNUSED(style))
-{
-    // to be implemented in derived classes
-    return false;
-}
-
-// get the styling at the given position
-bool wxTextCtrlBase::GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
-{
-    // to be implemented in derived classes
-    return false;
-}
-
-// change default text attributes
-bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
-{
-    // keep the old attributes if the new style doesn't specify them unless the
-    // new style is empty - then reset m_defaultStyle (as there is no other way
-    // to do it)
-    if ( style.IsDefault() )
-        m_defaultStyle = style;
-    else
-        m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// file IO functions
-// ----------------------------------------------------------------------------
-
-bool wxTextAreaBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))
-{
-#if wxUSE_FFILE
-    wxFFile file(filename);
-    if ( file.IsOpened() )
-    {
-        wxString text;
-        if ( file.ReadAll(&text) )
-        {
-            SetValue(text);
-
-            DiscardEdits();
-            m_filename = filename;
-
-            return true;
-        }
-    }
-#endif // wxUSE_FFILE
-
-    wxLogError(_("File couldn't be loaded."));
-
-    return false;
-}
-
-bool wxTextAreaBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
-{
-#if wxUSE_FFILE
-    wxFFile file(filename, wxT("w"));
-    if ( file.IsOpened() && file.Write(GetValue(), *wxConvCurrent) )
-    {
-        // if it worked, save for future calls
-        m_filename = filename;
-
-        // it's not modified any longer
-        DiscardEdits();
-
-        return true;
-    }
-#endif // wxUSE_FFILE
-
-    return false;
-}
-
-bool wxTextAreaBase::SaveFile(const wxString& filename, int fileType)
-{
-    wxString filenameToUse = filename.empty() ? m_filename : filename;
-    if ( filenameToUse.empty() )
-    {
-        // what kind of message to give? is it an error or a program bug?
-        wxLogDebug(wxT("Can't save textctrl to file without filename."));
-
-        return false;
-    }
-
-    return DoSaveFile(filenameToUse, fileType);
-}
-
-// ----------------------------------------------------------------------------
-// stream-like insertion operator
-// ----------------------------------------------------------------------------
-
-wxTextCtrl& wxTextCtrlBase::operator<<(const wxString& s)
-{
-    AppendText(s);
-    return *TEXTCTRL(this);
-}
-
-wxTextCtrl& wxTextCtrlBase::operator<<(double d)
-{
-    return *this << wxString::Format("%.2f", d);
-}
-
-wxTextCtrl& wxTextCtrlBase::operator<<(int i)
-{
-    return *this << wxString::Format("%d", i);
-}
-
-wxTextCtrl& wxTextCtrlBase::operator<<(long l)
-{
-    return *this << wxString::Format("%ld", l);
-}
-
-// ----------------------------------------------------------------------------
-// streambuf methods implementation
-// ----------------------------------------------------------------------------
-
-#if wxHAS_TEXT_WINDOW_STREAM
-
-int wxTextCtrlBase::overflow(int c)
-{
-    AppendText((wxChar)c);
-
-    // return something different from EOF
-    return 0;
-}
-
-#endif // wxHAS_TEXT_WINDOW_STREAM
-
-// ----------------------------------------------------------------------------
-// emulating key presses
-// ----------------------------------------------------------------------------
-
-bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
-{
-    bool handled = false;
-    // we have a native implementation for Win32 and so don't need this one
-#ifndef __WIN32__
-    wxChar ch = 0;
-    int keycode = event.GetKeyCode();
-
-    long from, to;
-    GetSelection(&from,&to);
-    long insert = GetInsertionPoint();
-    long last = GetLastPosition();
-
-    // catch arrow left and right
-
-    switch ( keycode )
-    {
-        case WXK_LEFT:
-            if ( event.ShiftDown() )
-                SetSelection( (from > 0 ? from - 1 : 0) , to );
-            else
-            {
-                if ( from != to )
-                    insert = from;
-                else if ( insert > 0 )
-                    insert -= 1;
-                SetInsertionPoint( insert );
-            }
-            handled = true;
-            break;
-        case WXK_RIGHT:
-            if ( event.ShiftDown() )
-                SetSelection( from, (to < last ? to + 1 : last) );
-            else
-            {
-                if ( from != to )
-                    insert = to;
-                else if ( insert < last )
-                    insert += 1;
-                SetInsertionPoint( insert );
-            }
-            handled = true;
-            break;
-        case WXK_NUMPAD0:
-        case WXK_NUMPAD1:
-        case WXK_NUMPAD2:
-        case WXK_NUMPAD3:
-        case WXK_NUMPAD4:
-        case WXK_NUMPAD5:
-        case WXK_NUMPAD6:
-        case WXK_NUMPAD7:
-        case WXK_NUMPAD8:
-        case WXK_NUMPAD9:
-            ch = (wxChar)(wxT('0') + keycode - WXK_NUMPAD0);
-            break;
-
-        case WXK_MULTIPLY:
-        case WXK_NUMPAD_MULTIPLY:
-            ch = wxT('*');
-            break;
-
-        case WXK_ADD:
-        case WXK_NUMPAD_ADD:
-            ch = wxT('+');
-            break;
-
-        case WXK_SUBTRACT:
-        case WXK_NUMPAD_SUBTRACT:
-            ch = wxT('-');
-            break;
-
-        case WXK_DECIMAL:
-        case WXK_NUMPAD_DECIMAL:
-            ch = wxT('.');
-            break;
-
-        case WXK_DIVIDE:
-        case WXK_NUMPAD_DIVIDE:
-            ch = wxT('/');
-            break;
-
-        case WXK_DELETE:
-        case WXK_NUMPAD_DELETE:
-            // delete the character at cursor
-            {
-                const long pos = GetInsertionPoint();
-                if ( pos < GetLastPosition() )
-                    Remove(pos, pos + 1);
-                handled = true;
-            }
-            break;
-
-        case WXK_BACK:
-            // delete the character before the cursor
-            {
-                const long pos = GetInsertionPoint();
-                if ( pos > 0 )
-                    Remove(pos - 1, pos);
-                handled = true;
-            }
-            break;
-
-        default:
-#if wxUSE_UNICODE
-            if ( event.GetUnicodeKey() )
-            {
-                ch = event.GetUnicodeKey();
-            }
-            else
-#endif
-            if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) )
-            {
-                // FIXME this is not going to work for non letters...
-                if ( !event.ShiftDown() )
-                {
-                    keycode = wxTolower(keycode);
-                }
-
-                ch = (wxChar)keycode;
-            }
-            else
-            {
-                ch = wxT('\0');
-            }
-    }
-
-    if ( ch )
-    {
-        WriteText(ch);
-
-        handled = true;
-    }
-#else // __WIN32__
-    wxUnusedVar(event);
-#endif // !__WIN32__/__WIN32__
-
-    return handled;
-}
-
-// do the window-specific processing after processing the update event
-void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
-{
-    // call inherited, but skip the wxControl's version, and call directly the
-    // wxWindow's one instead, because the only reason why we are overriding this
-    // function is that we want to use SetValue() instead of wxControl::SetLabel()
-    wxWindowBase::DoUpdateWindowUI(event);
-
-    // update text
-    if ( event.GetSetText() )
-    {
-        if ( event.GetText() != GetValue() )
-            SetValue(event.GetText());
-    }
-}
-
-// ----------------------------------------------------------------------------
-// hit testing
-// ----------------------------------------------------------------------------
-
-wxTextCtrlHitTestResult
-wxTextAreaBase::HitTest(const wxPoint& pt, wxTextCoord *x, wxTextCoord *y) const
-{
-    // implement in terms of the other overload as the native ports typically
-    // can get the position and not (x, y) pair directly (although wxUniv
-    // directly gets x and y -- and so overrides this method as well)
-    long pos;
-    wxTextCtrlHitTestResult rc = HitTest(pt, &pos);
-
-    if ( rc != wxTE_HT_UNKNOWN )
-    {
-        PositionToXY(pos, x, y);
-    }
-
-    return rc;
-}
-
-wxTextCtrlHitTestResult
-wxTextAreaBase::HitTest(const wxPoint& WXUNUSED(pt), long * WXUNUSED(pos)) const
-{
-    // not implemented
-    return wxTE_HT_UNKNOWN;
-}
-
-wxPoint wxTextAreaBase::PositionToCoords(long pos) const
-{
-    wxCHECK_MSG( IsValidPosition(pos), wxDefaultPosition,
-                 wxS("Position argument out of range.") );
-
-    return DoPositionToCoords(pos);
-}
-
-wxPoint wxTextAreaBase::DoPositionToCoords(long WXUNUSED(pos)) const
-{
-    return wxDefaultPosition;
-}
-
-#else // !wxUSE_TEXTCTRL
-
-// define this one even if !wxUSE_TEXTCTRL because it is also used by other
-// controls (wxComboBox and wxSpinCtrl)
-
-wxDEFINE_EVENT( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent );
-
-#endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/textcmn.cpp
+// Purpose:     implementation of platform-independent functions of wxTextCtrl
+// Author:      Julian Smart
+// Modified by:
+// Created:     13.07.99
+// RCS-ID:      $Id: textcmn.cpp 62095 2009-09-24 18:20:21Z JS $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/event.h"
+#endif // WX_PRECOMP
+
+#if wxUSE_TEXTCTRL
+
+#include "wx/textctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif // WX_PRECOMP
+
+#include "wx/ffile.h"
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// we don't have any objects of type wxTextCtrlBase in the program, only
+// wxTextCtrl, so this cast is safe
+#define TEXTCTRL(ptr)   ((wxTextCtrl *)(ptr))
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(wxTextUrlEvent, wxCommandEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
+
+IMPLEMENT_ABSTRACT_CLASS(wxTextCtrlBase, wxControl)
+
+// ----------------------------------------------------------------------------
+// style functions - not implemented here
+// ----------------------------------------------------------------------------
+
+wxTextAttr::wxTextAttr(const wxColour& colText,
+               const wxColour& colBack,
+               const wxFont& font,
+               wxTextAttrAlignment alignment)
+    : m_colText(colText), m_colBack(colBack), m_font(font), m_textAlignment(alignment)
+{
+    m_flags = 0;
+    m_leftIndent = 0;
+    m_leftSubIndent = 0;
+    m_rightIndent = 0;
+    if (m_colText.Ok()) m_flags |= wxTEXT_ATTR_TEXT_COLOUR;
+    if (m_colBack.Ok()) m_flags |= wxTEXT_ATTR_BACKGROUND_COLOUR;
+    if (m_font.Ok()) m_flags |= wxTEXT_ATTR_FONT;
+    if (alignment != wxTEXT_ALIGNMENT_DEFAULT)
+        m_flags |= wxTEXT_ATTR_ALIGNMENT;
+}
+
+void wxTextAttr::Init()
+{
+    m_textAlignment = wxTEXT_ALIGNMENT_DEFAULT;
+    m_flags = 0;
+    m_leftIndent = 0;
+    m_leftSubIndent = 0;
+    m_rightIndent = 0;
+}
+
+/* static */
+wxTextAttr wxTextAttr::Combine(const wxTextAttr& attr,
+                               const wxTextAttr& attrDef,
+                               const wxTextCtrlBase *text)
+{
+    wxFont font = attr.GetFont();
+    if ( !font.Ok() )
+    {
+        font = attrDef.GetFont();
+
+        if ( text && !font.Ok() )
+            font = text->GetFont();
+    }
+
+    wxColour colFg = attr.GetTextColour();
+    if ( !colFg.Ok() )
+    {
+        colFg = attrDef.GetTextColour();
+
+        if ( text && !colFg.Ok() )
+            colFg = text->GetForegroundColour();
+    }
+
+    wxColour colBg = attr.GetBackgroundColour();
+    if ( !colBg.Ok() )
+    {
+        colBg = attrDef.GetBackgroundColour();
+
+        if ( text && !colBg.Ok() )
+            colBg = text->GetBackgroundColour();
+    }
+
+    wxTextAttr newAttr(colFg, colBg, font);
+
+    if (attr.HasAlignment())
+        newAttr.SetAlignment(attr.GetAlignment());
+    else if (attrDef.HasAlignment())
+        newAttr.SetAlignment(attrDef.GetAlignment());
+
+    if (attr.HasTabs())
+        newAttr.SetTabs(attr.GetTabs());
+    else if (attrDef.HasTabs())
+        newAttr.SetTabs(attrDef.GetTabs());
+
+    if (attr.HasLeftIndent())
+        newAttr.SetLeftIndent(attr.GetLeftIndent(), attr.GetLeftSubIndent());
+    else if (attrDef.HasLeftIndent())
+        newAttr.SetLeftIndent(attrDef.GetLeftIndent(), attr.GetLeftSubIndent());
+
+    if (attr.HasRightIndent())
+        newAttr.SetRightIndent(attr.GetRightIndent());
+    else if (attrDef.HasRightIndent())
+        newAttr.SetRightIndent(attrDef.GetRightIndent());
+
+    return newAttr;
+}
+
+void wxTextAttr::operator= (const wxTextAttr& attr)
+{
+    m_font = attr.m_font;
+    m_colText = attr.m_colText;
+    m_colBack = attr.m_colBack;
+    m_textAlignment = attr.m_textAlignment;
+    m_leftIndent = attr.m_leftIndent;
+    m_leftSubIndent = attr.m_leftSubIndent;
+    m_rightIndent = attr.m_rightIndent;
+    m_tabs = attr.m_tabs;
+    m_flags = attr.m_flags;
+}
+
+
+// apply styling to text range
+bool wxTextCtrlBase::SetStyle(long WXUNUSED(start), long WXUNUSED(end),
+                              const wxTextAttr& WXUNUSED(style))
+{
+    // to be implemented in derived TextCtrl classes
+    return false;
+}
+
+// get the styling at the given position
+bool wxTextCtrlBase::GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
+{
+    // to be implemented in derived TextCtrl classes
+    return false;
+}
+
+// change default text attributes
+bool wxTextCtrlBase::SetDefaultStyle(const wxTextAttr& style)
+{
+    // keep the old attributes if the new style doesn't specify them unless the
+    // new style is empty - then reset m_defaultStyle (as there is no other way
+    // to do it)
+    if ( style.IsDefault() )
+        m_defaultStyle = style;
+    else
+        m_defaultStyle = wxTextAttr::Combine(style, m_defaultStyle, this);
+
+    return true;
+}
+
+// get default text attributes
+const wxTextAttr& wxTextCtrlBase::GetDefaultStyle() const
+{
+    return m_defaultStyle;
+}
+
+// ----------------------------------------------------------------------------
+// file IO functions
+// ----------------------------------------------------------------------------
+
+bool wxTextCtrlBase::DoLoadFile(const wxString& filename, int WXUNUSED(fileType))
+{
+#if wxUSE_FFILE
+    wxFFile file(filename);
+    if ( file.IsOpened() )
+    {
+        wxString text;
+        if ( file.ReadAll(&text) )
+        {
+            SetValue(text);
+
+            DiscardEdits();
+
+            m_filename = filename;
+
+            return true;
+        }
+    }
+
+    wxLogError(_("File couldn't be loaded."));
+#endif // wxUSE_FFILE
+
+    return false;
+}
+
+bool wxTextCtrlBase::SaveFile(const wxString& filename, int fileType)
+{
+    wxString filenameToUse = filename.empty() ? m_filename : filename;
+    if ( filenameToUse.empty() )
+    {
+        // what kind of message to give? is it an error or a program bug?
+        wxLogDebug(wxT("Can't save textctrl to file without filename."));
+
+        return false;
+    }
+
+    return DoSaveFile(filenameToUse, fileType);
+}
+
+bool wxTextCtrlBase::DoSaveFile(const wxString& filename, int WXUNUSED(fileType))
+{
+#if wxUSE_FFILE
+    wxFFile file(filename, _T("w"));
+    if ( file.IsOpened() && file.Write(GetValue()) )
+    {
+        // if it worked, save for future calls
+        m_filename = filename;
+
+        // it's not modified any longer
+        DiscardEdits();
+
+        return true;
+    }
+#endif // wxUSE_FFILE
+
+    wxLogError(_("The text couldn't be saved."));
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// stream-like insertion operator
+// ----------------------------------------------------------------------------
+
+wxTextCtrl& wxTextCtrlBase::operator<<(const wxString& s)
+{
+    AppendText(s);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(float f)
+{
+    wxString str;
+    str.Printf(wxT("%.2f"), f);
+    AppendText(str);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(double d)
+{
+    wxString str;
+    str.Printf(wxT("%.2f"), d);
+    AppendText(str);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(int i)
+{
+    wxString str;
+    str.Printf(wxT("%d"), i);
+    AppendText(str);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(long i)
+{
+    wxString str;
+    str.Printf(wxT("%ld"), i);
+    AppendText(str);
+    return *TEXTCTRL(this);
+}
+
+wxTextCtrl& wxTextCtrlBase::operator<<(const wxChar c)
+{
+    return operator<<(wxString(c));
+}
+
+// ----------------------------------------------------------------------------
+// streambuf methods implementation
+// ----------------------------------------------------------------------------
+
+#if wxHAS_TEXT_WINDOW_STREAM
+
+int wxTextCtrlBase::overflow(int c)
+{
+    AppendText((wxChar)c);
+
+    // return something different from EOF
+    return 0;
+}
+
+#endif // wxHAS_TEXT_WINDOW_STREAM
+
+// ----------------------------------------------------------------------------
+// clipboard stuff
+// ----------------------------------------------------------------------------
+
+bool wxTextCtrlBase::CanCopy() const
+{
+    // can copy if there's a selection
+    long from, to;
+    GetSelection(&from, &to);
+    return from != to;
+}
+
+bool wxTextCtrlBase::CanCut() const
+{
+    // can cut if there's a selection and if we're not read only
+    return CanCopy() && IsEditable();
+}
+
+bool wxTextCtrlBase::CanPaste() const
+{
+    // can paste if we are not read only
+    return IsEditable();
+}
+
+// ----------------------------------------------------------------------------
+// emulating key presses
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+// the generic version is unused in wxMSW
+bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& WXUNUSED(event))
+{
+    return false;
+}
+#else // !__WIN32__
+bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
+{
+    wxChar ch = 0;
+    int keycode = event.GetKeyCode();
+    switch ( keycode )
+    {
+        case WXK_NUMPAD0:
+        case WXK_NUMPAD1:
+        case WXK_NUMPAD2:
+        case WXK_NUMPAD3:
+        case WXK_NUMPAD4:
+        case WXK_NUMPAD5:
+        case WXK_NUMPAD6:
+        case WXK_NUMPAD7:
+        case WXK_NUMPAD8:
+        case WXK_NUMPAD9:
+            ch = (wxChar)(_T('0') + keycode - WXK_NUMPAD0);
+            break;
+
+        case WXK_MULTIPLY:
+        case WXK_NUMPAD_MULTIPLY:
+            ch = _T('*');
+            break;
+
+        case WXK_ADD:
+        case WXK_NUMPAD_ADD:
+            ch = _T('+');
+            break;
+
+        case WXK_SUBTRACT:
+        case WXK_NUMPAD_SUBTRACT:
+            ch = _T('-');
+            break;
+
+        case WXK_DECIMAL:
+        case WXK_NUMPAD_DECIMAL:
+            ch = _T('.');
+            break;
+
+        case WXK_DIVIDE:
+        case WXK_NUMPAD_DIVIDE:
+            ch = _T('/');
+            break;
+
+        case WXK_DELETE:
+        case WXK_NUMPAD_DELETE:
+            // delete the character at cursor
+            {
+                const long pos = GetInsertionPoint();
+                if ( pos < GetLastPosition() )
+                    Remove(pos, pos + 1);
+            }
+            break;
+
+        case WXK_BACK:
+            // delete the character before the cursor
+            {
+                const long pos = GetInsertionPoint();
+                if ( pos > 0 )
+                    Remove(pos - 1, pos);
+            }
+            break;
+
+        default:
+#if wxUSE_UNICODE
+            if ( event.GetUnicodeKey() )
+            {
+                ch = event.GetUnicodeKey();
+            }
+            else
+#endif
+            if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) )
+            {
+                // FIXME this is not going to work for non letters...
+                if ( !event.ShiftDown() )
+                {
+                    keycode = wxTolower(keycode);
+                }
+
+                ch = (wxChar)keycode;
+            }
+            else
+            {
+                ch = _T('\0');
+            }
+    }
+
+    if ( ch )
+    {
+        WriteText(ch);
+
+        return true;
+    }
+
+    return false;
+}
+#endif // !__WIN32__
+
+// ----------------------------------------------------------------------------
+// selection and ranges
+// ----------------------------------------------------------------------------
+
+void wxTextCtrlBase::SelectAll()
+{
+    SetSelection(0, GetLastPosition());
+}
+
+wxString wxTextCtrlBase::GetStringSelection() const
+{
+    long from, to;
+    GetSelection(&from, &to);
+
+    return GetRange(from, to);
+}
+
+wxString wxTextCtrlBase::GetRange(long from, long to) const
+{
+    wxString sel;
+    if ( from < to )
+    {
+        sel = GetValue().Mid(from, to - from);
+    }
+
+    return sel;
+}
+
+// do the window-specific processing after processing the update event
+void wxTextCtrlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
+{
+    // call inherited, but skip the wxControl's version, and call directly the
+    // wxWindow's one instead, because the only reason why we are overriding this
+    // function is that we want to use SetValue() instead of wxControl::SetLabel()
+    wxWindowBase::DoUpdateWindowUI(event);
+
+    // update text
+    if ( event.GetSetText() )
+    {
+        if ( event.GetText() != GetValue() )
+            SetValue(event.GetText());
+    }
+}
+
+// ----------------------------------------------------------------------------
+// hit testing
+// ----------------------------------------------------------------------------
+
+wxTextCtrlHitTestResult
+wxTextCtrlBase::HitTest(const wxPoint& pt, wxTextCoord *x, wxTextCoord *y) const
+{
+    // implement in terms of the other overload as the native ports typically
+    // can get the position and not (x, y) pair directly (although wxUniv
+    // directly gets x and y -- and so overrides this method as well)
+    long pos;
+    wxTextCtrlHitTestResult rc = HitTest(pt, &pos);
+
+    if ( rc != wxTE_HT_UNKNOWN )
+    {
+        PositionToXY(pos, x, y);
+    }
+
+    return rc;
+}
+
+wxTextCtrlHitTestResult
+wxTextCtrlBase::HitTest(const wxPoint& WXUNUSED(pt),
+                        long * WXUNUSED(pos)) const
+{
+    // not implemented
+    return wxTE_HT_UNKNOWN;
+}
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+void wxTextCtrlBase::SendTextUpdatedEvent()
+{
+    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+
+    // do not do this as it could be very inefficient if the text control
+    // contains a lot of text and we're not using ref-counted wxString
+    // implementation -- instead, event.GetString() will query the control for
+    // its current text if needed
+    //event.SetString(GetValue());
+
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+#else // !wxUSE_TEXTCTRL
+
+// define this one even if !wxUSE_TEXTCTRL because it is also used by other
+// controls (wxComboBox and wxSpinCtrl)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)
+
+#endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL
diff --git a/Source/3rd Party/wx/src/common/textentrycmn.cpp b/Source/3rd Party/wx/src/common/textentrycmn.cpp
deleted file mode 100644
index ae492c9cd..000000000
--- a/Source/3rd Party/wx/src/common/textentrycmn.cpp	
+++ /dev/null
@@ -1,417 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/textentrycmn.cpp
-// Purpose:     wxTextEntryBase implementation
-// Author:      Vadim Zeitlin
-// Created:     2007-09-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_TEXTCTRL || wxUSE_COMBOBOX
-
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-    #include "wx/dataobj.h"
-#endif //WX_PRECOMP
-
-#include "wx/textentry.h"
-#include "wx/textcompleter.h"
-#include "wx/clipbrd.h"
-
-// ----------------------------------------------------------------------------
-// wxTextEntryHintData
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextEntryHintData wxBIND_OR_CONNECT_HACK_ONLY_BASE_CLASS
-{
-public:
-    wxTextEntryHintData(wxTextEntryBase *entry, wxWindow *win)
-        : m_entry(entry),
-          m_win(win),
-          m_text(m_entry->GetValue())
-    {
-        wxBIND_OR_CONNECT_HACK(win, wxEVT_SET_FOCUS, wxFocusEventHandler,
-                                wxTextEntryHintData::OnSetFocus, this);
-        wxBIND_OR_CONNECT_HACK(win, wxEVT_KILL_FOCUS, wxFocusEventHandler,
-                                wxTextEntryHintData::OnKillFocus, this);
-        wxBIND_OR_CONNECT_HACK(win, wxEVT_COMMAND_TEXT_UPDATED,
-                                wxCommandEventHandler,
-                                wxTextEntryHintData::OnTextChanged, this);
-    }
-
-    // default dtor is ok
-
-    // Get the real text of the control such as it was before we replaced it
-    // with the hint.
-    const wxString& GetText() const { return m_text; }
-
-    // Set the hint to show, shouldn't be empty normally.
-    //
-    // This should be called after creating a new wxTextEntryHintData object
-    // and may be called more times in the future.
-    void SetHintString(const wxString& hint)
-    {
-        m_hint = hint;
-
-        if ( !m_win->HasFocus() )
-            ShowHintIfAppropriate();
-        //else: The new hint will be shown later when we lose focus.
-    }
-
-    const wxString& GetHintString() const { return m_hint; }
-
-    // This is called whenever the text control contents changes.
-    //
-    // We call it ourselves when this change generates an event but it's also
-    // necessary to call it explicitly from wxTextEntry::ChangeValue() as it,
-    // by design, does not generate any events.
-    void HandleTextUpdate(const wxString& text)
-    {
-        m_text = text;
-
-        // If we're called because of a call to Set or ChangeValue(), the
-        // control may still have the hint text colour, reset it in this case.
-        RestoreTextColourIfNecessary();
-    }
-
-private:
-    // Show the hint in the window if we should do it, i.e. if the window
-    // doesn't have any text of its own.
-    void ShowHintIfAppropriate()
-    {
-        // Never overwrite existing window text.
-        if ( !m_text.empty() )
-            return;
-
-        // Save the old text colour and set a more inconspicuous one for the
-        // hint.
-        m_colFg = m_win->GetForegroundColour();
-        m_win->SetForegroundColour(*wxLIGHT_GREY);
-
-        m_entry->DoSetValue(m_hint, wxTextEntryBase::SetValue_NoEvent);
-    }
-
-    // Restore the original text colour if we had changed it to show the hint
-    // and not restored it yet.
-    void RestoreTextColourIfNecessary()
-    {
-        if ( m_colFg.IsOk() )
-        {
-            m_win->SetForegroundColour(m_colFg);
-            m_colFg = wxColour();
-        }
-    }
-
-    void OnSetFocus(wxFocusEvent& event)
-    {
-        // If we had been showing the hint before, remove it now and restore
-        // the normal colour.
-        if ( m_text.empty() )
-        {
-            RestoreTextColourIfNecessary();
-
-            m_entry->DoSetValue(wxString(), wxTextEntryBase::SetValue_NoEvent);
-        }
-
-        event.Skip();
-    }
-
-    void OnKillFocus(wxFocusEvent& event)
-    {
-        // Restore the hint if the user didn't enter anything.
-        ShowHintIfAppropriate();
-
-        event.Skip();
-    }
-
-    void OnTextChanged(wxCommandEvent& event)
-    {
-        // Update the stored window text.
-        //
-        // Notice that we can't use GetValue() nor wxCommandEvent::GetString()
-        // which uses it internally because this would just forward back to us
-        // so go directly to the private method which returns the real control
-        // contents.
-        HandleTextUpdate(m_entry->DoGetValue());
-
-        event.Skip();
-    }
-
-
-    // the text control we're associated with (as its interface and its window)
-    wxTextEntryBase * const m_entry;
-    wxWindow * const m_win;
-
-    // the original foreground colour of m_win before we changed it
-    wxColour m_colFg;
-
-    // The hint passed to wxTextEntry::SetHint(), never empty.
-    wxString m_hint;
-
-    // The real text of the window.
-    wxString m_text;
-
-
-    wxDECLARE_NO_COPY_CLASS(wxTextEntryHintData);
-};
-
-// ============================================================================
-// wxTextEntryBase implementation
-// ============================================================================
-
-wxTextEntryBase::~wxTextEntryBase()
-{
-    delete m_hintData;
-}
-
-// ----------------------------------------------------------------------------
-// text accessors
-// ----------------------------------------------------------------------------
-
-wxString wxTextEntryBase::GetValue() const
-{
-    return m_hintData ? m_hintData->GetText() : DoGetValue();
-}
-
-wxString wxTextEntryBase::GetRange(long from, long to) const
-{
-    wxString sel;
-    wxString value = GetValue();
-
-    if ( from < to && (long)value.length() >= to )
-    {
-        sel = value.substr(from, to - from);
-    }
-
-    return sel;
-}
-
-// ----------------------------------------------------------------------------
-// text operations
-// ----------------------------------------------------------------------------
-
-void wxTextEntryBase::ChangeValue(const wxString& value)
-{
-    DoSetValue(value, SetValue_NoEvent);
-
-    // As we didn't generate any events for wxTextEntryHintData to catch,
-    // notify it explicitly about our changed contents.
-    if ( m_hintData )
-        m_hintData->HandleTextUpdate(value);
-}
-
-void wxTextEntryBase::AppendText(const wxString& text)
-{
-    SetInsertionPointEnd();
-    WriteText(text);
-}
-
-void wxTextEntryBase::DoSetValue(const wxString& value, int flags)
-{
-    if ( value != GetValue() )
-    {
-        EventsSuppressor noeventsIf(this, !(flags & SetValue_SendEvent));
-
-        SelectAll();
-        WriteText(value);
-    }
-    else // Same value, no need to do anything.
-    {
-        // Except that we still need to generate the event for consistency with
-        // the normal case when the text does change.
-        if ( flags & SetValue_SendEvent )
-            SendTextUpdatedEvent(GetEditableWindow());
-    }
-
-    SetInsertionPoint(0);
-}
-
-void wxTextEntryBase::Replace(long from, long to, const wxString& value)
-{
-    {
-        EventsSuppressor noevents(this);
-        Remove(from, to);
-    }
-
-    SetInsertionPoint(from);
-    WriteText(value);
-}
-
-// ----------------------------------------------------------------------------
-// selection
-// ----------------------------------------------------------------------------
-
-bool wxTextEntryBase::HasSelection() const
-{
-    long from, to;
-    GetSelection(&from, &to);
-
-    return from < to;
-}
-
-void wxTextEntryBase::RemoveSelection()
-{
-    long from, to;
-    GetSelection(& from, & to);
-    if (from != -1 && to != -1)
-        Remove(from, to);
-}
-
-wxString wxTextEntryBase::GetStringSelection() const
-{
-    long from, to;
-    GetSelection(&from, &to);
-
-    return GetRange(from, to);
-}
-
-// ----------------------------------------------------------------------------
-// clipboard
-// ----------------------------------------------------------------------------
-
-bool wxTextEntryBase::CanCopy() const
-{
-    return HasSelection();
-}
-
-bool wxTextEntryBase::CanCut() const
-{
-    return CanCopy() && IsEditable();
-}
-
-bool wxTextEntryBase::CanPaste() const
-{
-    if ( IsEditable() )
-    {
-#if wxUSE_CLIPBOARD
-        // check if there is any text on the clipboard
-        if ( wxTheClipboard->IsSupported(wxDF_TEXT)
-#if wxUSE_UNICODE
-                || wxTheClipboard->IsSupported(wxDF_UNICODETEXT)
-#endif // wxUSE_UNICODE
-           )
-        {
-            return true;
-        }
-#endif // wxUSE_CLIPBOARD
-    }
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// hints support
-// ----------------------------------------------------------------------------
-
-bool wxTextEntryBase::SetHint(const wxString& hint)
-{
-    if ( !hint.empty() )
-    {
-        if ( !m_hintData )
-            m_hintData = new wxTextEntryHintData(this, GetEditableWindow());
-
-        m_hintData->SetHintString(hint);
-    }
-    else if ( m_hintData )
-    {
-        // Setting empty hint removes any currently set one.
-        delete m_hintData;
-        m_hintData = NULL;
-    }
-    //else: Setting empty hint when we don't have any doesn't do anything.
-
-    return true;
-}
-
-wxString wxTextEntryBase::GetHint() const
-{
-    return m_hintData ? m_hintData->GetHintString() : wxString();
-}
-
-// ----------------------------------------------------------------------------
-// margins support
-// ----------------------------------------------------------------------------
-
-bool wxTextEntryBase::DoSetMargins(const wxPoint& WXUNUSED(pt))
-{
-    return false;
-}
-
-wxPoint wxTextEntryBase::DoGetMargins() const
-{
-    return wxPoint(-1, -1);
-}
-
-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxTextEntryBase::SendTextUpdatedEvent(wxWindow *win)
-{
-    wxCHECK_MSG( win, false, "can't send an event without a window" );
-
-    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, win->GetId());
-
-    // do not do this as it could be very inefficient if the text control
-    // contains a lot of text and we're not using ref-counted wxString
-    // implementation -- instead, event.GetString() will query the control for
-    // its current text if needed
-    //event.SetString(win->GetValue());
-
-    event.SetEventObject(win);
-    return win->HandleWindowEvent(event);
-}
-
-// ----------------------------------------------------------------------------
-// auto-completion stubs
-// ----------------------------------------------------------------------------
-
-wxTextCompleter::~wxTextCompleter()
-{
-}
-
-bool wxTextCompleterSimple::Start(const wxString& prefix)
-{
-    m_index = 0;
-    m_completions.clear();
-    GetCompletions(prefix, m_completions);
-
-    return !m_completions.empty();
-}
-
-wxString wxTextCompleterSimple::GetNext()
-{
-    if ( m_index == m_completions.size() )
-        return wxString();
-
-    return m_completions[m_index++];
-}
-
-bool wxTextEntryBase::DoAutoCompleteCustom(wxTextCompleter *completer)
-{
-    // We don't do anything here but we still need to delete the completer for
-    // consistency with the ports that do implement this method and take
-    // ownership of the pointer.
-    delete completer;
-
-    return false;
-}
-
-#endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX
diff --git a/Source/3rd Party/wx/src/common/textfile.cpp b/Source/3rd Party/wx/src/common/textfile.cpp
index db654db19..d873e1d97 100644
--- a/Source/3rd Party/wx/src/common/textfile.cpp	
+++ b/Source/3rd Party/wx/src/common/textfile.cpp	
@@ -1,316 +1,295 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/textfile.cpp
-// Purpose:     implementation of wxTextFile class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     03.04.98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// headers
-// ============================================================================
-
-#include  "wx/wxprec.h"
-
-#ifdef    __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#if !wxUSE_FILE || !wxUSE_TEXTBUFFER
-    #undef wxUSE_TEXTFILE
-    #define wxUSE_TEXTFILE 0
-#endif // wxUSE_FILE
-
-#if wxUSE_TEXTFILE
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/file.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/textfile.h"
-#include "wx/filename.h"
-#include "wx/buffer.h"
-
-// ============================================================================
-// wxTextFile class implementation
-// ============================================================================
-
-wxTextFile::wxTextFile(const wxString& strFileName)
-          : wxTextBuffer(strFileName)
-{
-}
-
-
-// ----------------------------------------------------------------------------
-// file operations
-// ----------------------------------------------------------------------------
-
-bool wxTextFile::OnExists() const
-{
-    return wxFile::Exists(m_strBufferName);
-}
-
-
-bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode OpenMode)
-{
-    wxFile::OpenMode FileOpenMode;
-
-    switch ( OpenMode )
-    {
-        default:
-            wxFAIL_MSG( wxT("unknown open mode in wxTextFile::Open") );
-            // fall through
-
-        case ReadAccess :
-            FileOpenMode = wxFile::read;
-            break;
-
-        case WriteAccess :
-            FileOpenMode = wxFile::write;
-            break;
-    }
-
-    return m_file.Open(strBufferName.c_str(), FileOpenMode);
-}
-
-
-bool wxTextFile::OnClose()
-{
-    return m_file.Close();
-}
-
-
-bool wxTextFile::OnRead(const wxMBConv& conv)
-{
-    // file should be opened
-    wxASSERT_MSG( m_file.IsOpened(), wxT("can't read closed file") );
-
-    // read the entire file in memory: this is not the most efficient thing to
-    // do it but there is no good way to avoid it in Unicode build because if
-    // we read the file block by block we can't convert each block to Unicode
-    // separately (the last multibyte char in the block might be only partially
-    // read and so the conversion would fail) and, as the file contents is kept
-    // in memory by wxTextFile anyhow, it shouldn't be a big problem to read
-    // the file entirely
-    size_t bufSize = 0;
-
-    // number of bytes to (try to) read from disk at once
-    static const size_t BLOCK_SIZE = 4096;
-
-    wxCharBuffer buf;
-
-    // first determine if the file is seekable or not and so whether we can
-    // determine its length in advance
-    wxFileOffset fileLength;
-    {
-        wxLogNull logNull;
-        fileLength = m_file.Length();
-    }
-
-    // some non-seekable files under /proc under Linux pretend that they're
-    // seekable but always return 0; others do return an error
-    const bool seekable = fileLength != wxInvalidOffset && fileLength != 0;
-    if ( seekable )
-    {
-        // we know the required length, so set the buffer size in advance
-        bufSize = fileLength;
-        if ( !buf.extend(bufSize) )
-            return false;
-
-        // if the file is seekable, also check that we're at its beginning
-        wxASSERT_MSG( m_file.Tell() == 0, wxT("should be at start of file") );
-
-        char *dst = buf.data();
-        for ( size_t nRemaining = bufSize; nRemaining > 0; )
-        {
-            size_t nToRead = BLOCK_SIZE;
-
-            // the file size could have changed, avoid overflowing the buffer
-            // even if it did
-            if ( nToRead > nRemaining )
-                nToRead = nRemaining;
-
-            ssize_t nRead = m_file.Read(dst, nToRead);
-
-            if ( nRead == wxInvalidOffset )
-            {
-                // read error (error message already given in wxFile::Read)
-                return false;
-            }
-
-            if ( nRead == 0 )
-            {
-                // this file can't be empty because we checked for this above
-                // so this must be the end of file
-                break;
-            }
-
-            dst += nRead;
-            nRemaining -= nRead;
-        }
-
-        wxASSERT_MSG( dst - buf.data() == (wxFileOffset)bufSize,
-                      wxT("logic error") );
-    }
-    else // file is not seekable
-    {
-        char block[BLOCK_SIZE];
-        for ( ;; )
-        {
-            ssize_t nRead = m_file.Read(block, WXSIZEOF(block));
-
-            if ( nRead == wxInvalidOffset )
-            {
-                // read error (error message already given in wxFile::Read)
-                return false;
-            }
-
-            if ( nRead == 0 )
-            {
-                // if no bytes have been read, presumably this is a
-                // valid-but-empty file
-                if ( bufSize == 0 )
-                    return true;
-
-                // otherwise we've finished reading the file
-                break;
-            }
-
-            // extend the buffer for new data
-            if ( !buf.extend(bufSize + nRead) )
-                return false;
-
-            // and append it to the buffer
-            memcpy(buf.data() + bufSize, block, nRead);
-            bufSize += nRead;
-        }
-    }
-
-    const wxString str(buf, conv, bufSize);
-
-    // there's no risk of this happening in ANSI build
-#if wxUSE_UNICODE
-    if ( bufSize > 4 && str.empty() )
-    {
-        wxLogError(_("Failed to convert file \"%s\" to Unicode."), GetName());
-        return false;
-    }
-#endif // wxUSE_UNICODE
-
-    // we don't need this memory any more
-    buf.reset();
-
-
-    // now break the buffer in lines
-
-    // last processed character, we need to know if it was a CR or not
-    wxChar chLast = '\0';
-
-    // the beginning of the current line, changes inside the loop
-    wxString::const_iterator lineStart = str.begin();
-    const wxString::const_iterator end = str.end();
-    for ( wxString::const_iterator p = lineStart; p != end; p++ )
-    {
-        const wxChar ch = *p;
-        switch ( ch )
-        {
-            case '\n':
-                // could be a DOS or Unix EOL
-                if ( chLast == '\r' )
-                {
-                    if ( p - 1 >= lineStart )
-                    {
-                        AddLine(wxString(lineStart, p - 1), wxTextFileType_Dos);
-                    }
-                    else
-                    {
-                        // there were two line endings, so add an empty line:
-                        AddLine(wxEmptyString, wxTextFileType_Dos);
-                    }
-                }
-                else // bare '\n', Unix style
-                {
-                    AddLine(wxString(lineStart, p), wxTextFileType_Unix);
-                }
-
-                lineStart = p + 1;
-                break;
-
-            case '\r':
-                if ( chLast == '\r' )
-                {
-                    // Mac empty line
-                    AddLine(wxEmptyString, wxTextFileType_Mac);
-                    lineStart = p + 1;
-                }
-                //else: we don't know what this is yet -- could be a Mac EOL or
-                //      start of DOS EOL so wait for next char
-                break;
-
-            default:
-                if ( chLast == '\r' )
-                {
-                    // Mac line termination
-                    if ( p - 1 >= lineStart )
-                    {
-                        AddLine(wxString(lineStart, p - 1), wxTextFileType_Mac);
-                    }
-                    else
-                    {
-                        // there were two line endings, so add an empty line:
-                        AddLine(wxEmptyString, wxTextFileType_Mac);
-                    }
-                    lineStart = p;
-                }
-        }
-
-        chLast = ch;
-    }
-
-    // anything in the last line?
-    if ( lineStart != end )
-    {
-        // add unterminated last line
-        AddLine(wxString(lineStart, end), wxTextFileType_None);
-    }
-
-    return true;
-}
-
-
-bool wxTextFile::OnWrite(wxTextFileType typeNew, const wxMBConv& conv)
-{
-    wxFileName fn = m_strBufferName;
-
-    // We do NOT want wxPATH_NORM_CASE here, or the case will not
-    // be preserved.
-    if ( !fn.IsAbsolute() )
-        fn.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_TILDE |
-                     wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG);
-
-    wxTempFile fileTmp(fn.GetFullPath());
-
-    if ( !fileTmp.IsOpened() ) {
-        wxLogError(_("can't write buffer '%s' to disk."), m_strBufferName.c_str());
-        return false;
-    }
-
-    size_t nCount = GetLineCount();
-    for ( size_t n = 0; n < nCount; n++ ) {
-        fileTmp.Write(GetLine(n) +
-                      GetEOL(typeNew == wxTextFileType_None ? GetLineType(n)
-                                                            : typeNew),
-                      conv);
-    }
-
-    // replace the old file with this one
-    return fileTmp.Commit();
-}
-
-#endif // wxUSE_TEXTFILE
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/textfile.cpp
+// Purpose:     implementation of wxTextFile class
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     03.04.98
+// RCS-ID:      $Id: textfile.cpp 49298 2007-10-21 18:05:49Z SC $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// headers
+// ============================================================================
+
+#include  "wx/wxprec.h"
+
+#ifdef    __BORLANDC__
+    #pragma hdrstop
+#endif  //__BORLANDC__
+
+#if !wxUSE_FILE || !wxUSE_TEXTBUFFER
+    #undef wxUSE_TEXTFILE
+    #define wxUSE_TEXTFILE 0
+#endif // wxUSE_FILE
+
+#if wxUSE_TEXTFILE
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/file.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/textfile.h"
+#include "wx/filename.h"
+#include "wx/buffer.h"
+
+// ============================================================================
+// wxTextFile class implementation
+// ============================================================================
+
+wxTextFile::wxTextFile(const wxString& strFileName)
+          : wxTextBuffer(strFileName)
+{
+}
+
+
+// ----------------------------------------------------------------------------
+// file operations
+// ----------------------------------------------------------------------------
+
+bool wxTextFile::OnExists() const
+{
+    return wxFile::Exists(m_strBufferName);
+}
+
+
+bool wxTextFile::OnOpen(const wxString &strBufferName, wxTextBufferOpenMode OpenMode)
+{
+    wxFile::OpenMode FileOpenMode;
+
+    switch ( OpenMode )
+    {
+        default:
+            wxFAIL_MSG( _T("unknown open mode in wxTextFile::Open") );
+            // fall through
+
+        case ReadAccess :
+            FileOpenMode = wxFile::read;
+            break;
+
+        case WriteAccess :
+            FileOpenMode = wxFile::write;
+            break;
+    }
+
+    return m_file.Open(strBufferName.c_str(), FileOpenMode);
+}
+
+
+bool wxTextFile::OnClose()
+{
+    return m_file.Close();
+}
+
+
+bool wxTextFile::OnRead(const wxMBConv& conv)
+{
+    // file should be opened
+    wxASSERT_MSG( m_file.IsOpened(), _T("can't read closed file") );
+
+    // read the entire file in memory: this is not the most efficient thing to
+    // do but there is no good way to avoid it in Unicode build because if we
+    // read the file block by block we can't convert each block to Unicode
+    // separately (the last multibyte char in the block might be only partially
+    // read and so the conversion would fail) and, as the file contents is kept
+    // in memory by wxTextFile anyhow, it shouldn't be a big problem to read
+    // the file entirely
+    size_t bufSize = 0,
+           bufPos = 0;
+    char block[1024];
+    wxCharBuffer buf;
+
+    // first determine if the file is seekable or not and so whether we can
+    // determine its length in advance
+    wxFileOffset fileLength;
+    {
+        wxLogNull logNull;
+        fileLength = m_file.Length();
+    }
+
+    // some non-seekable files under /proc under Linux pretend that they're
+    // seekable but always return 0; others do return an error
+    const bool seekable = fileLength != wxInvalidOffset && fileLength != 0;
+    if ( seekable )
+    {
+        // we know the required length, so set the buffer size in advance
+        bufSize = fileLength;
+        if ( !buf.extend(bufSize - 1 /* it adds 1 internally */) )
+            return false;
+
+        // if the file is seekable, also check that we're at its beginning
+        wxASSERT_MSG( m_file.Tell() == 0, _T("should be at start of file") );
+    }
+
+    for ( ;; )
+    {
+        ssize_t nRead = m_file.Read(block, WXSIZEOF(block));
+
+        if ( nRead == wxInvalidOffset )
+        {
+            // read error (error message already given in wxFile::Read)
+            return false;
+        }
+
+        if ( nRead == 0 )
+        {
+            // if no bytes have been read, presumably this is a valid-but-empty file
+            if ( bufPos == 0 )
+                return true;
+
+            // otherwise we've finished reading the file
+            break;
+        }
+
+        if ( seekable )
+        {
+            // this shouldn't happen but don't overwrite the buffer if it does
+            wxCHECK_MSG( bufPos + nRead <= bufSize, false,
+                         _T("read more than file length?") );
+        }
+        else // !seekable
+        {
+            // for non-seekable files we have to allocate more memory on the go
+            if ( !buf.extend(bufPos + nRead - 1 /* it adds 1 internally */) )
+                return false;
+        }
+
+        // append to the buffer
+        memcpy(buf.data() + bufPos, block, nRead);
+        bufPos += nRead;
+    }
+
+    if ( !seekable )
+    {
+        bufSize = bufPos;
+    }
+
+    const wxString str(buf, conv, bufPos);
+
+    // there's no risk of this happening in ANSI build
+#if wxUSE_UNICODE
+    if ( bufSize > 4 && str.empty() )
+    {
+        wxLogError(_("Failed to convert file \"%s\" to Unicode."), GetName());
+        return false;
+    }
+#endif // wxUSE_UNICODE
+
+    free(buf.release()); // we don't need this memory any more
+
+
+    // now break the buffer in lines
+
+    // last processed character, we need to know if it was a CR or not
+    wxChar chLast = '\0';
+
+    // the beginning of the current line, changes inside the loop
+    wxString::const_iterator lineStart = str.begin();
+    const wxString::const_iterator end = str.end();
+    for ( wxString::const_iterator p = lineStart; p != end; p++ )
+    {
+        const wxChar ch = *p;
+        switch ( ch )
+        {
+            case '\n':
+                // could be a DOS or Unix EOL
+                if ( chLast == '\r' )
+                {
+                    if ( p - 1 >= lineStart )
+                    {
+                        AddLine(wxString(lineStart, p - 1), wxTextFileType_Dos);
+                    }
+                    else
+                    {
+                        // there were two line endings, so add an empty line:
+                        AddLine(wxEmptyString, wxTextFileType_Dos);
+                    }
+                }
+                else // bare '\n', Unix style
+                {
+                    AddLine(wxString(lineStart, p), wxTextFileType_Unix);
+                }
+
+                lineStart = p + 1;
+                break;
+
+            case '\r':
+                if ( chLast == '\r' )
+                {
+                    if ( p - 1 >= lineStart )
+                    {
+                        AddLine(wxString(lineStart, p - 1), wxTextFileType_Mac);
+                    }
+                    // Mac empty line
+                    AddLine(wxEmptyString, wxTextFileType_Mac);
+                    lineStart = p + 1;
+                }
+                //else: we don't know what this is yet -- could be a Mac EOL or
+                //      start of DOS EOL so wait for next char
+                break;
+
+            default:
+                if ( chLast == '\r' )
+                {
+                    // Mac line termination
+                    if ( p - 1 >= lineStart )
+                    {
+                        AddLine(wxString(lineStart, p - 1), wxTextFileType_Mac);
+                    }
+                    else
+                    {
+                        // there were two line endings, so add an empty line:
+                        AddLine(wxEmptyString, wxTextFileType_Mac);
+                    }
+                    lineStart = p;
+                }
+        }
+
+        chLast = ch;
+    }
+
+    // anything in the last line?
+    if ( lineStart != end )
+    {
+        // add unterminated last line
+        AddLine(wxString(lineStart, end), wxTextFileType_None);
+    }
+
+    return true;
+}
+
+
+bool wxTextFile::OnWrite(wxTextFileType typeNew, const wxMBConv& conv)
+{
+    wxFileName fn = m_strBufferName;
+
+    // We do NOT want wxPATH_NORM_CASE here, or the case will not
+    // be preserved.
+    if ( !fn.IsAbsolute() )
+        fn.Normalize(wxPATH_NORM_ENV_VARS | wxPATH_NORM_DOTS | wxPATH_NORM_TILDE |
+                     wxPATH_NORM_ABSOLUTE | wxPATH_NORM_LONG);
+
+    wxTempFile fileTmp(fn.GetFullPath());
+
+    if ( !fileTmp.IsOpened() ) {
+        wxLogError(_("can't write buffer '%s' to disk."), m_strBufferName.c_str());
+        return false;
+    }
+
+    size_t nCount = GetLineCount();
+    for ( size_t n = 0; n < nCount; n++ ) {
+        fileTmp.Write(GetLine(n) +
+                      GetEOL(typeNew == wxTextFileType_None ? GetLineType(n)
+                                                            : typeNew),
+                      conv);
+    }
+
+    // replace the old file with this one
+    return fileTmp.Commit();
+}
+
+#endif // wxUSE_TEXTFILE
diff --git a/Source/3rd Party/wx/src/common/time.cpp b/Source/3rd Party/wx/src/common/time.cpp
deleted file mode 100644
index 6deebdd59..000000000
--- a/Source/3rd Party/wx/src/common/time.cpp	
+++ /dev/null
@@ -1,362 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/time.cpp
-// Purpose:     Implementation of time-related functions.
-// Author:      Vadim Zeitlin
-// Created:     2011-11-26
-// RCS-ID:      $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/time.h"
-
-#ifndef WX_PRECOMP
-    #ifdef __WINDOWS__
-        #include "wx/msw/wrapwin.h"
-    #endif
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif
-
-#ifndef WX_GMTOFF_IN_TM
-    // Define it for some systems which don't (always) use configure but are
-    // known to have tm_gmtoff field.
-    #if defined(__DARWIN__)
-        #define WX_GMTOFF_IN_TM
-    #endif
-#endif
-
-#if defined(__VISAGECPP__) && !defined(HAVE_FTIME)
-    #define HAVE_FTIME
-#  if __IBMCPP__ >= 400
-    #  define ftime(x) _ftime(x)
-#  endif
-#endif
-
-#ifndef __WXWINCE__
-#include <time.h>
-#else
-#include "wx/msw/private.h"
-#include "wx/msw/wince/time.h"
-#endif
-
-
-#if !defined(__WXMAC__) && !defined(__WXWINCE__)
-    #include <sys/types.h>      // for time_t
-#endif
-
-#if defined(HAVE_GETTIMEOFDAY)
-    #include <sys/time.h>
-    #include <unistd.h>
-#elif defined(HAVE_FTIME)
-    #include <sys/timeb.h>
-#endif
-
-#if defined(__DJGPP__) || defined(__WINE__)
-    #include <sys/timeb.h>
-    #include <values.h>
-#endif
-
-namespace
-{
-
-const int MILLISECONDS_PER_SECOND = 1000;
-const int MICROSECONDS_PER_MILLISECOND = 1000;
-const int MICROSECONDS_PER_SECOND = 1000*1000;
-
-} // anonymous namespace
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// NB: VC8 safe time functions could/should be used for wxMSW as well probably
-#if defined(__WXWINCE__) && defined(__VISUALC8__)
-
-struct tm *wxLocaltime_r(const time_t *t, struct tm* tm)
-{
-    __time64_t t64 = *t;
-    return _localtime64_s(tm, &t64) == 0 ? tm : NULL;
-}
-
-struct tm *wxGmtime_r(const time_t* t, struct tm* tm)
-{
-    __time64_t t64 = *t;
-    return _gmtime64_s(tm, &t64) == 0 ? tm : NULL;
-}
-
-#else // !wxWinCE with VC8
-
-#if (!defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)) && wxUSE_THREADS && !defined(__WINDOWS__)
-static wxMutex timeLock;
-#endif
-
-#ifndef HAVE_LOCALTIME_R
-struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp)
-{
-#if wxUSE_THREADS && !defined(__WINDOWS__)
-  // No need to waste time with a mutex on windows since it's using
-  // thread local storage for localtime anyway.
-  wxMutexLocker locker(timeLock);
-#endif
-
-  // Borland CRT crashes when passed 0 ticks for some reason, see SF bug 1704438
-#ifdef __BORLANDC__
-  if ( !*ticks )
-      return NULL;
-#endif
-
-  const tm * const t = localtime(ticks);
-  if ( !t )
-      return NULL;
-
-  memcpy(temp, t, sizeof(struct tm));
-  return temp;
-}
-#endif // !HAVE_LOCALTIME_R
-
-#ifndef HAVE_GMTIME_R
-struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp)
-{
-#if wxUSE_THREADS && !defined(__WINDOWS__)
-  // No need to waste time with a mutex on windows since it's
-  // using thread local storage for gmtime anyway.
-  wxMutexLocker locker(timeLock);
-#endif
-
-#ifdef __BORLANDC__
-  if ( !*ticks )
-      return NULL;
-#endif
-
-  const tm * const t = gmtime(ticks);
-  if ( !t )
-      return NULL;
-
-  memcpy(temp, gmtime(ticks), sizeof(struct tm));
-  return temp;
-}
-#endif // !HAVE_GMTIME_R
-
-#endif // wxWinCE with VC8/other platforms
-
-// returns the time zone in the C sense, i.e. the difference UTC - local
-// (in seconds)
-int wxGetTimeZone()
-{
-#ifdef WX_GMTOFF_IN_TM
-    // set to true when the timezone is set
-    static bool s_timezoneSet = false;
-    static long gmtoffset = LONG_MAX; // invalid timezone
-
-    // ensure that the timezone variable is set by calling wxLocaltime_r
-    if ( !s_timezoneSet )
-    {
-        // just call wxLocaltime_r() instead of figuring out whether this
-        // system supports tzset(), _tzset() or something else
-        time_t t = time(NULL);
-        struct tm tm;
-
-        wxLocaltime_r(&t, &tm);
-        s_timezoneSet = true;
-
-        // note that GMT offset is the opposite of time zone and so to return
-        // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM
-        // cases we have to negate it
-        gmtoffset = -tm.tm_gmtoff;
-
-        // this function is supposed to return the same value whether DST is
-        // enabled or not, so we need to use an additional offset if DST is on
-        // as tm_gmtoff already does include it
-        if ( tm.tm_isdst )
-            gmtoffset += 3600;
-    }
-    return (int)gmtoffset;
-#elif defined(__DJGPP__) || defined(__WINE__)
-    struct timeb tb;
-    ftime(&tb);
-    return tb.timezone*60;
-#elif defined(__VISUALC__)
-    // We must initialize the time zone information before using it (this will
-    // be done only once internally).
-    _tzset();
-
-    // Starting with VC++ 8 timezone variable is deprecated and is not even
-    // available in some standard library version so use the new function for
-    // accessing it instead.
-    #if wxCHECK_VISUALC_VERSION(8)
-        long t;
-        _get_timezone(&t);
-        return t;
-    #else // VC++ < 8
-        return timezone;
-    #endif
-#else // Use some kind of time zone variable.
-    // In any case we must initialize the time zone before using it.
-    tzset();
-
-    #if defined(WX_TIMEZONE) // If WX_TIMEZONE was defined by configure, use it.
-        return WX_TIMEZONE;
-    #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
-        return _timezone;
-    #else // unknown platform -- assume it has timezone
-        return timezone;
-    #endif // different time zone variables
-#endif // different ways to determine time zone
-}
-
-// Get local time as seconds since 00:00:00, Jan 1st 1970
-long wxGetLocalTime()
-{
-    struct tm tm;
-    time_t t0, t1;
-
-    // This cannot be made static because mktime can overwrite it.
-    //
-    memset(&tm, 0, sizeof(tm));
-    tm.tm_year  = 70;
-    tm.tm_mon   = 0;
-    tm.tm_mday  = 5;        // not Jan 1st 1970 due to mktime 'feature'
-    tm.tm_hour  = 0;
-    tm.tm_min   = 0;
-    tm.tm_sec   = 0;
-    tm.tm_isdst = -1;       // let mktime guess
-
-    // Note that mktime assumes that the struct tm contains local time.
-    //
-    t1 = time(&t1);         // now
-    t0 = mktime(&tm);       // origin
-
-    // Return the difference in seconds.
-    //
-    if (( t0 != (time_t)-1 ) && ( t1 != (time_t)-1 ))
-        return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
-
-    wxLogSysError(_("Failed to get the local system time"));
-    return -1;
-}
-
-// Get UTC time as seconds since 00:00:00, Jan 1st 1970
-long wxGetUTCTime()
-{
-    return (long)time(NULL);
-}
-
-#if wxUSE_LONGLONG
-
-wxLongLong wxGetUTCTimeUSec()
-{
-#if defined(__WINDOWS__)
-    FILETIME ft;
-    ::GetSystemTimeAsFileTime(&ft);
-
-    // FILETIME is in 100ns or 0.1us since 1601-01-01, transform to us since
-    // 1970-01-01.
-    wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime);
-    t /= 10;
-    t -= wxLL(11644473600000000); // Unix - Windows epochs difference in us.
-    return t;
-#else // non-MSW
-
-#ifdef HAVE_GETTIMEOFDAY
-    timeval tv;
-    if ( wxGetTimeOfDay(&tv) != -1 )
-    {
-        wxLongLong val(tv.tv_sec);
-        val *= MICROSECONDS_PER_SECOND;
-        val += tv.tv_usec;
-        return val;
-    }
-#endif // HAVE_GETTIMEOFDAY
-
-    // Fall back to lesser precision function.
-    return wxGetUTCTimeMillis()*MICROSECONDS_PER_MILLISECOND;
-#endif // MSW/!MSW
-}
-
-// Get local time as milliseconds since 00:00:00, Jan 1st 1970
-wxLongLong wxGetUTCTimeMillis()
-{
-    // If possible, use a function which avoids conversions from
-    // broken-up time structures to milliseconds
-#if defined(__WINDOWS__)
-    FILETIME ft;
-    ::GetSystemTimeAsFileTime(&ft);
-
-    // FILETIME is expressed in 100ns (or 0.1us) units since 1601-01-01,
-    // transform them to ms since 1970-01-01.
-    wxLongLong t(ft.dwHighDateTime, ft.dwLowDateTime);
-    t /= 10000;
-    t -= wxLL(11644473600000); // Unix - Windows epochs difference in ms.
-    return t;
-#else // !__WINDOWS__
-    wxLongLong val = MILLISECONDS_PER_SECOND;
-
-#if defined(HAVE_GETTIMEOFDAY)
-    struct timeval tp;
-    if ( wxGetTimeOfDay(&tp) != -1 )
-    {
-        val *= tp.tv_sec;
-        return (val + (tp.tv_usec / MICROSECONDS_PER_MILLISECOND));
-    }
-    else
-    {
-        wxLogError(_("wxGetTimeOfDay failed."));
-        return 0;
-    }
-#elif defined(HAVE_FTIME)
-    struct timeb tp;
-
-    // ftime() is void and not int in some mingw32 headers, so don't
-    // test the return code (well, it shouldn't fail anyhow...)
-    (void)::ftime(&tp);
-    val *= tp.time;
-    return (val + tp.millitm);
-#else // no gettimeofday() nor ftime()
-    // If your platform/compiler does not support ms resolution please
-    // do NOT just shut off these warnings, drop me a line instead at
-    // <guille@iies.es>
-
-    #if defined(__VISUALC__) || defined (__WATCOMC__)
-        #pragma message("wxStopWatch will be up to second resolution!")
-    #elif defined(__BORLANDC__)
-        #pragma message "wxStopWatch will be up to second resolution!"
-    #else
-        #warning "wxStopWatch will be up to second resolution!"
-    #endif // compiler
-
-    val *= wxGetUTCTime();
-    return val;
-#endif // time functions
-
-#endif // __WINDOWS__/!__WINDOWS__
-}
-
-wxLongLong wxGetLocalTimeMillis()
-{
-    return wxGetUTCTimeMillis() - wxGetTimeZone()*MILLISECONDS_PER_SECOND;
-}
-
-#else // !wxUSE_LONGLONG
-
-double wxGetLocalTimeMillis(void)
-{
-    return (double(clock()) / double(CLOCKS_PER_SEC)) * 1000.0;
-}
-
-#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG
diff --git a/Source/3rd Party/wx/src/common/timercmn.cpp b/Source/3rd Party/wx/src/common/timercmn.cpp
index 7f3885ac4..43062b46d 100644
--- a/Source/3rd Party/wx/src/common/timercmn.cpp	
+++ b/Source/3rd Party/wx/src/common/timercmn.cpp	
@@ -1,139 +1,88 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/timercmn.cpp
-// Purpose:     wxTimerBase implementation
-// Author:      Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
-// Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-//              (c) 1999 Guillermo Rodriguez <guille@iies.es>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxWin headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_TIMER
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-#endif
-
-#include "wx/timer.h"
-#include "wx/apptrait.h"
-#include "wx/private/timer.h"
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
-
-wxDEFINE_EVENT(wxEVT_TIMER, wxTimerEvent);
-
-// ============================================================================
-// wxTimerBase implementation
-// ============================================================================
-
-wxTimer::~wxTimer()
-{
-    Stop();
-
-    delete m_impl;
-}
-
-void wxTimer::Init()
-{
-    wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    m_impl = traits ? traits->CreateTimerImpl(this) : NULL;
-    if ( !m_impl )
-    {
-        wxFAIL_MSG( wxT("No timer implementation for this platform") );
-
-    }
-}
-
-// ============================================================================
-// rest of wxTimer implementation forwarded to wxTimerImpl
-// ============================================================================
-
-void wxTimer::SetOwner(wxEvtHandler *owner, int timerid)
-{
-    wxCHECK_RET( m_impl, wxT("uninitialized timer") );
-
-    m_impl->SetOwner(owner, timerid);
-}
-
-wxEvtHandler *wxTimer::GetOwner() const
-{
-    wxCHECK_MSG( m_impl, NULL, wxT("uninitialized timer") );
-
-    return m_impl->GetOwner();
-}
-
-bool wxTimer::Start(int milliseconds, bool oneShot)
-{
-    wxCHECK_MSG( m_impl, false, wxT("uninitialized timer") );
-
-    return m_impl->Start(milliseconds, oneShot);
-}
-
-void wxTimer::Stop()
-{
-    wxCHECK_RET( m_impl, wxT("uninitialized timer") );
-
-    if ( m_impl->IsRunning() )
-        m_impl->Stop();
-}
-
-void wxTimer::Notify()
-{
-    // the base class version generates an event if it has owner - which it
-    // should because otherwise nobody can process timer events
-    wxCHECK_RET( GetOwner(), wxT("wxTimer::Notify() should be overridden.") );
-
-    m_impl->SendEvent();
-}
-
-bool wxTimer::IsRunning() const
-{
-    wxCHECK_MSG( m_impl, false, wxT("uninitialized timer") );
-
-    return m_impl->IsRunning();
-}
-
-int wxTimer::GetId() const
-{
-    wxCHECK_MSG( m_impl, wxID_ANY, wxT("uninitialized timer") );
-
-    return m_impl->GetId();
-}
-
-int wxTimer::GetInterval() const
-{
-    wxCHECK_MSG( m_impl, -1, wxT("uninitialized timer") );
-
-    return m_impl->GetInterval();
-}
-
-bool wxTimer::IsOneShot() const
-{
-    wxCHECK_MSG( m_impl, false, wxT("uninitialized timer") );
-
-    return m_impl->IsOneShot();
-}
-
-#endif // wxUSE_TIMER
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        common/timercmn.cpp
+// Purpose:     wxTimerBase implementation
+// Author:      Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
+// Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
+// Created:     04/01/98
+// RCS-ID:      $Id: timercmn.cpp 35650 2005-09-23 12:56:45Z MR $
+// Copyright:   (c) Julian Smart
+//              (c) 1999 Guillermo Rodriguez <guille@iies.es>
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_TIMER
+
+#ifndef WX_PRECOMP
+    #include "wx/timer.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
+
+// ============================================================================
+// wxTimerBase implementation
+// ============================================================================
+
+wxTimerBase::~wxTimerBase()
+{
+    // this destructor is required for Darwin
+}
+
+void wxTimerBase::Notify()
+{
+    // the base class version generates an event if it has owner - which it
+    // should because otherwise nobody can process timer events
+    wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
+
+    wxTimerEvent event(m_idTimer, m_milli);
+    event.SetEventObject(this);
+    (void)m_owner->ProcessEvent(event);
+}
+
+bool wxTimerBase::Start(int milliseconds, bool oneShot)
+{
+    // under MSW timers only work when they're started from the main thread so
+    // let the caller know about it
+#if wxUSE_THREADS
+    wxASSERT_MSG( wxThread::IsMain(),
+                  _T("timer can only be started from the main thread") );
+#endif // wxUSE_THREADS
+
+    if ( IsRunning() )
+    {
+        // not stopping the already running timer might work for some
+        // platforms (no problems under MSW) but leads to mysterious crashes
+        // on the others (GTK), so to be on the safe side do it here
+        Stop();
+    }
+
+    if ( milliseconds != -1 )
+    {
+        m_milli = milliseconds;
+    }
+
+    m_oneShot = oneShot;
+
+    return true;
+}
+
+#endif // wxUSE_TIMER
+
diff --git a/Source/3rd Party/wx/src/common/timerimpl.cpp b/Source/3rd Party/wx/src/common/timerimpl.cpp
deleted file mode 100644
index d452da19d..000000000
--- a/Source/3rd Party/wx/src/common/timerimpl.cpp	
+++ /dev/null
@@ -1,84 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/timerimpl.cpp
-// Purpose:     wxTimerBase implementation
-// Author:      Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
-// Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-//              (c) 1999 Guillermo Rodriguez <guille@iies.es>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxWin headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_TIMER
-
-#include "wx/private/timer.h"
-#include "wx/utils.h"               // for wxNewId()
-#include "wx/thread.h"
-
-wxTimerImpl::wxTimerImpl(wxTimer *timer)
-{
-    m_timer = timer;
-    m_owner = NULL;
-    m_idTimer = wxID_ANY;
-    m_milli = 0;
-    m_oneShot = false;
-}
-
-void wxTimerImpl::SetOwner(wxEvtHandler *owner, int timerid)
-{
-    m_owner = owner;
-    m_idTimer = timerid == wxID_ANY ? wxNewId() : timerid;
-}
-
-void wxTimerImpl::SendEvent()
-{
-    wxTimerEvent event(*m_timer);
-    (void)m_owner->SafelyProcessEvent(event);
-}
-
-bool wxTimerImpl::Start(int milliseconds, bool oneShot)
-{
-    // under MSW timers only work when they're started from the main thread so
-    // let the caller know about it
-#if wxUSE_THREADS
-    wxASSERT_MSG( wxThread::IsMain(),
-                  wxT("timer can only be started from the main thread") );
-#endif // wxUSE_THREADS
-
-    if ( IsRunning() )
-    {
-        // not stopping the already running timer might work for some
-        // platforms (no problems under MSW) but leads to mysterious crashes
-        // on the others (GTK), so to be on the safe side do it here
-        Stop();
-    }
-
-    if ( milliseconds != -1 )
-    {
-        m_milli = milliseconds;
-    }
-
-    m_oneShot = oneShot;
-
-    return true;
-}
-
-
-#endif // wxUSE_TIMER
-
diff --git a/Source/3rd Party/wx/src/common/tokenzr.cpp b/Source/3rd Party/wx/src/common/tokenzr.cpp
index bf4b9836c..b539458f8 100644
--- a/Source/3rd Party/wx/src/common/tokenzr.cpp	
+++ b/Source/3rd Party/wx/src/common/tokenzr.cpp	
@@ -1,296 +1,229 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/tokenzr.cpp
-// Purpose:     String tokenizer
-// Author:      Guilhem Lavaux
-// Modified by: Vadim Zeitlin (almost full rewrite)
-// Created:     04/22/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/tokenzr.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/arrstr.h"
-    #include "wx/crt.h"
-#endif
-
-// Required for wxIs... functions
-#include <ctype.h>
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// helpers
-// ----------------------------------------------------------------------------
-
-static wxString::const_iterator
-find_first_of(const wxChar *delims, size_t len,
-              const wxString::const_iterator& from,
-              const wxString::const_iterator& end)
-{
-    wxASSERT_MSG( from <= end,  wxT("invalid index") );
-
-    for ( wxString::const_iterator i = from; i != end; ++i )
-    {
-        if ( wxTmemchr(delims, *i, len) )
-            return i;
-    }
-
-    return end;
-}
-
-static wxString::const_iterator
-find_first_not_of(const wxChar *delims, size_t len,
-                  const wxString::const_iterator& from,
-                  const wxString::const_iterator& end)
-{
-    wxASSERT_MSG( from <= end,  wxT("invalid index") );
-
-    for ( wxString::const_iterator i = from; i != end; ++i )
-    {
-        if ( !wxTmemchr(delims, *i, len) )
-            return i;
-    }
-
-    return end;
-}
-
-// ----------------------------------------------------------------------------
-// wxStringTokenizer construction
-// ----------------------------------------------------------------------------
-
-wxStringTokenizer::wxStringTokenizer(const wxString& str,
-                                     const wxString& delims,
-                                     wxStringTokenizerMode mode)
-{
-    SetString(str, delims, mode);
-}
-
-void wxStringTokenizer::SetString(const wxString& str,
-                                  const wxString& delims,
-                                  wxStringTokenizerMode mode)
-{
-    if ( mode == wxTOKEN_DEFAULT )
-    {
-        // by default, we behave like strtok() if the delimiters are only
-        // whitespace characters and as wxTOKEN_RET_EMPTY otherwise (for
-        // whitespace delimiters, strtok() behaviour is better because we want
-        // to count consecutive spaces as one delimiter)
-        wxString::const_iterator p;
-        for ( p = delims.begin(); p != delims.end(); ++p )
-        {
-            if ( !wxIsspace(*p) )
-                break;
-        }
-
-        if ( p != delims.end() )
-        {
-            // not whitespace char in delims
-            mode = wxTOKEN_RET_EMPTY;
-        }
-        else
-        {
-            // only whitespaces
-            mode = wxTOKEN_STRTOK;
-        }
-    }
-
-#if wxUSE_UNICODE // FIXME-UTF8: only wc_str()
-    m_delims = delims.wc_str();
-#else
-    m_delims = delims.mb_str();
-#endif
-    m_delimsLen = delims.length();
-
-    m_mode = mode;
-
-    Reinit(str);
-}
-
-void wxStringTokenizer::Reinit(const wxString& str)
-{
-    wxASSERT_MSG( IsOk(), wxT("you should call SetString() first") );
-
-    m_string = str;
-    m_stringEnd = m_string.end();
-    m_pos = m_string.begin();
-    m_lastDelim = wxT('\0');
-    m_hasMoreTokens = MoreTokens_Unknown;
-}
-
-// ----------------------------------------------------------------------------
-// access to the tokens
-// ----------------------------------------------------------------------------
-
-// do we have more of them?
-bool wxStringTokenizer::HasMoreTokens() const
-{
-    // GetNextToken() calls HasMoreTokens() and so HasMoreTokens() is called
-    // twice in every interation in the following common usage patten:
-    //     while ( HasMoreTokens() )
-    //        GetNextToken();
-    // We optimize this case by caching HasMoreTokens() return value here:
-    if ( m_hasMoreTokens == MoreTokens_Unknown )
-    {
-        bool r = DoHasMoreTokens();
-        wxConstCast(this, wxStringTokenizer)->m_hasMoreTokens =
-            r ? MoreTokens_Yes : MoreTokens_No;
-        return r;
-    }
-    else
-        return m_hasMoreTokens == MoreTokens_Yes;
-}
-
-bool wxStringTokenizer::DoHasMoreTokens() const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("you should call SetString() first") );
-
-    if ( find_first_not_of(m_delims, m_delimsLen, m_pos, m_stringEnd)
-         != m_stringEnd )
-    {
-        // there are non delimiter characters left, so we do have more tokens
-        return true;
-    }
-
-    switch ( m_mode )
-    {
-        case wxTOKEN_RET_EMPTY:
-        case wxTOKEN_RET_DELIMS:
-            // special hack for wxTOKEN_RET_EMPTY: we should return the initial
-            // empty token even if there are only delimiters after it
-            return !m_string.empty() && m_pos == m_string.begin();
-
-        case wxTOKEN_RET_EMPTY_ALL:
-            // special hack for wxTOKEN_RET_EMPTY_ALL: we can know if we had
-            // already returned the trailing empty token after the last
-            // delimiter by examining m_lastDelim: it is set to NUL if we run
-            // up to the end of the string in GetNextToken(), but if it is not
-            // NUL yet we still have this last token to return even if m_pos is
-            // already at m_string.length()
-            return m_pos < m_stringEnd || m_lastDelim != wxT('\0');
-
-        case wxTOKEN_INVALID:
-        case wxTOKEN_DEFAULT:
-            wxFAIL_MSG( wxT("unexpected tokenizer mode") );
-            // fall through
-
-        case wxTOKEN_STRTOK:
-            // never return empty delimiters
-            break;
-    }
-
-    return false;
-}
-
-// count the number of (remaining) tokens in the string
-size_t wxStringTokenizer::CountTokens() const
-{
-    wxCHECK_MSG( IsOk(), 0, wxT("you should call SetString() first") );
-
-    // VZ: this function is IMHO not very useful, so it's probably not very
-    //     important if its implementation here is not as efficient as it
-    //     could be -- but OTOH like this we're sure to get the correct answer
-    //     in all modes
-    wxStringTokenizer tkz(wxString(m_pos, m_stringEnd), m_delims, m_mode);
-
-    size_t count = 0;
-    while ( tkz.HasMoreTokens() )
-    {
-        count++;
-
-        (void)tkz.GetNextToken();
-    }
-
-    return count;
-}
-
-// ----------------------------------------------------------------------------
-// token extraction
-// ----------------------------------------------------------------------------
-
-wxString wxStringTokenizer::GetNextToken()
-{
-    wxString token;
-    do
-    {
-        if ( !HasMoreTokens() )
-        {
-            break;
-        }
-
-        m_hasMoreTokens = MoreTokens_Unknown;
-
-        // find the end of this token
-        wxString::const_iterator pos =
-            find_first_of(m_delims, m_delimsLen, m_pos, m_stringEnd);
-
-        // and the start of the next one
-        if ( pos == m_stringEnd )
-        {
-            // no more delimiters, the token is everything till the end of
-            // string
-            token.assign(m_pos, m_stringEnd);
-
-            // skip the token
-            m_pos = m_stringEnd;
-
-            // it wasn't terminated
-            m_lastDelim = wxT('\0');
-        }
-        else // we found a delimiter at pos
-        {
-            // in wxTOKEN_RET_DELIMS mode we return the delimiter character
-            // with token, otherwise leave it out
-            wxString::const_iterator tokenEnd(pos);
-            if ( m_mode == wxTOKEN_RET_DELIMS )
-                ++tokenEnd;
-
-            token.assign(m_pos, tokenEnd);
-
-            // skip the token and the trailing delimiter
-            m_pos = pos + 1;
-
-            m_lastDelim = (pos == m_stringEnd) ? wxT('\0') : (wxChar)*pos;
-        }
-    }
-    while ( !AllowEmpty() && token.empty() );
-
-    return token;
-}
-
-// ----------------------------------------------------------------------------
-// public functions
-// ----------------------------------------------------------------------------
-
-wxArrayString wxStringTokenize(const wxString& str,
-                               const wxString& delims,
-                               wxStringTokenizerMode mode)
-{
-    wxArrayString tokens;
-    wxStringTokenizer tk(str, delims, mode);
-    while ( tk.HasMoreTokens() )
-    {
-        tokens.Add(tk.GetNextToken());
-    }
-
-    return tokens;
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/tokenzr.cpp
+// Purpose:     String tokenizer
+// Author:      Guilhem Lavaux
+// Modified by: Vadim Zeitlin (almost full rewrite)
+// Created:     04/22/98
+// RCS-ID:      $Id: tokenzr.cpp 39694 2006-06-13 11:30:40Z ABX $
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/tokenzr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
+
+// Required for wxIs... functions
+#include <ctype.h>
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxStringTokenizer construction
+// ----------------------------------------------------------------------------
+
+wxStringTokenizer::wxStringTokenizer(const wxString& str,
+                                     const wxString& delims,
+                                     wxStringTokenizerMode mode)
+{
+    SetString(str, delims, mode);
+}
+
+void wxStringTokenizer::SetString(const wxString& str,
+                                  const wxString& delims,
+                                  wxStringTokenizerMode mode)
+{
+    if ( mode == wxTOKEN_DEFAULT )
+    {
+        // by default, we behave like strtok() if the delimiters are only
+        // whitespace characters and as wxTOKEN_RET_EMPTY otherwise (for
+        // whitespace delimiters, strtok() behaviour is better because we want
+        // to count consecutive spaces as one delimiter)
+        const wxChar *p;
+        for ( p = delims.c_str(); *p; p++ )
+        {
+            if ( !wxIsspace(*p) )
+                break;
+        }
+
+        if ( *p )
+        {
+            // not whitespace char in delims
+            mode = wxTOKEN_RET_EMPTY;
+        }
+        else
+        {
+            // only whitespaces
+            mode = wxTOKEN_STRTOK;
+        }
+    }
+
+    m_delims = delims;
+    m_mode = mode;
+
+    Reinit(str);
+}
+
+void wxStringTokenizer::Reinit(const wxString& str)
+{
+    wxASSERT_MSG( IsOk(), _T("you should call SetString() first") );
+
+    m_string = str;
+    m_pos = 0;
+    m_lastDelim = _T('\0');
+}
+
+// ----------------------------------------------------------------------------
+// access to the tokens
+// ----------------------------------------------------------------------------
+
+// do we have more of them?
+bool wxStringTokenizer::HasMoreTokens() const
+{
+    wxCHECK_MSG( IsOk(), false, _T("you should call SetString() first") );
+
+    if ( m_string.find_first_not_of(m_delims, m_pos) != wxString::npos )
+    {
+        // there are non delimiter characters left, so we do have more tokens
+        return true;
+    }
+
+    switch ( m_mode )
+    {
+        case wxTOKEN_RET_EMPTY:
+        case wxTOKEN_RET_DELIMS:
+            // special hack for wxTOKEN_RET_EMPTY: we should return the initial
+            // empty token even if there are only delimiters after it
+            return m_pos == 0 && !m_string.empty();
+
+        case wxTOKEN_RET_EMPTY_ALL:
+            // special hack for wxTOKEN_RET_EMPTY_ALL: we can know if we had
+            // already returned the trailing empty token after the last
+            // delimiter by examining m_lastDelim: it is set to NUL if we run
+            // up to the end of the string in GetNextToken(), but if it is not
+            // NUL yet we still have this last token to return even if m_pos is
+            // already at m_string.length()
+            return m_pos < m_string.length() || m_lastDelim != _T('\0');
+
+        case wxTOKEN_INVALID:
+        case wxTOKEN_DEFAULT:
+            wxFAIL_MSG( _T("unexpected tokenizer mode") );
+            // fall through
+
+        case wxTOKEN_STRTOK:
+            // never return empty delimiters
+            break;
+    }
+
+    return false;
+}
+
+// count the number of (remaining) tokens in the string
+size_t wxStringTokenizer::CountTokens() const
+{
+    wxCHECK_MSG( IsOk(), 0, _T("you should call SetString() first") );
+
+    // VZ: this function is IMHO not very useful, so it's probably not very
+    //     important if its implementation here is not as efficient as it
+    //     could be -- but OTOH like this we're sure to get the correct answer
+    //     in all modes
+    wxStringTokenizer tkz(m_string.c_str() + m_pos, m_delims, m_mode);
+
+    size_t count = 0;
+    while ( tkz.HasMoreTokens() )
+    {
+        count++;
+
+        (void)tkz.GetNextToken();
+    }
+
+    return count;
+}
+
+// ----------------------------------------------------------------------------
+// token extraction
+// ----------------------------------------------------------------------------
+
+wxString wxStringTokenizer::GetNextToken()
+{
+    wxString token;
+    do
+    {
+        if ( !HasMoreTokens() )
+        {
+            break;
+        }
+
+        // find the end of this token
+        size_t pos = m_string.find_first_of(m_delims, m_pos);
+
+        // and the start of the next one
+        if ( pos == wxString::npos )
+        {
+            // no more delimiters, the token is everything till the end of
+            // string
+            token.assign(m_string, m_pos, wxString::npos);
+
+            // skip the token
+            m_pos = m_string.length();
+
+            // it wasn't terminated
+            m_lastDelim = _T('\0');
+        }
+        else // we found a delimiter at pos
+        {
+            // in wxTOKEN_RET_DELIMS mode we return the delimiter character
+            // with token, otherwise leave it out
+            size_t len = pos - m_pos;
+            if ( m_mode == wxTOKEN_RET_DELIMS )
+                len++;
+
+            token.assign(m_string, m_pos, len);
+
+            // skip the token and the trailing delimiter
+            m_pos = pos + 1;
+
+            m_lastDelim = m_string[pos];
+        }
+    }
+    while ( !AllowEmpty() && token.empty() );
+
+    return token;
+}
+
+// ----------------------------------------------------------------------------
+// public functions
+// ----------------------------------------------------------------------------
+
+wxArrayString wxStringTokenize(const wxString& str,
+                               const wxString& delims,
+                               wxStringTokenizerMode mode)
+{
+    wxArrayString tokens;
+    wxStringTokenizer tk(str, delims, mode);
+    while ( tk.HasMoreTokens() )
+    {
+        tokens.Add(tk.GetNextToken());
+    }
+
+    return tokens;
+}
diff --git a/Source/3rd Party/wx/src/common/toplvcmn.cpp b/Source/3rd Party/wx/src/common/toplvcmn.cpp
index d1e05ed4a..304dd3ca7 100644
--- a/Source/3rd Party/wx/src/common/toplvcmn.cpp	
+++ b/Source/3rd Party/wx/src/common/toplvcmn.cpp	
@@ -1,439 +1,431 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/toplvcmn.cpp
-// Purpose:     common (for all platforms) wxTopLevelWindow functions
-// Author:      Julian Smart, Vadim Zeitlin
-// Created:     01/02/97
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/toplevel.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
-    #include "wx/app.h"
-#endif // WX_PRECOMP
-
-#include "wx/display.h"
-
-// ----------------------------------------------------------------------------
-// event table
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow)
-    EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow)
-    EVT_SIZE(wxTopLevelWindowBase::OnSize)
-END_EVENT_TABLE()
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-IMPLEMENT_ABSTRACT_CLASS(wxTopLevelWindow, wxWindow)
-
-// ----------------------------------------------------------------------------
-// construction/destruction
-// ----------------------------------------------------------------------------
-
-wxTopLevelWindowBase::wxTopLevelWindowBase()
-{
-    // Unlike windows, top level windows are created hidden by default.
-    m_isShown = false;
-}
-
-wxTopLevelWindowBase::~wxTopLevelWindowBase()
-{
-    // don't let wxTheApp keep any stale pointers to us
-    if ( wxTheApp && wxTheApp->GetTopWindow() == this )
-        wxTheApp->SetTopWindow(NULL);
-
-    wxTopLevelWindows.DeleteObject(this);
-
-    // delete any our top level children which are still pending for deletion
-    // immediately: this could happen if a child (e.g. a temporary dialog
-    // created with this window as parent) was Destroy()'d) while this window
-    // was deleted directly (with delete, or maybe just because it was created
-    // on the stack) immediately afterwards and before the child TLW was really
-    // destroyed -- not destroying it now would leave it alive with a dangling
-    // parent pointer and result in a crash later
-    for ( wxObjectList::iterator i = wxPendingDelete.begin();
-          i != wxPendingDelete.end();
-          )
-    {
-        wxWindow * const win = wxDynamicCast(*i, wxWindow);
-        if ( win && win->GetParent() == this )
-        {
-            wxPendingDelete.erase(i);
-
-            delete win;
-
-            // deleting it invalidated the list (and not only one node because
-            // it could have resulted in deletion of other objects to)
-            i = wxPendingDelete.begin();
-        }
-        else
-        {
-            ++i;
-        }
-    }
-
-    if ( IsLastBeforeExit() )
-    {
-        // no other (important) windows left, quit the app
-        wxTheApp->ExitMainLoop();
-    }
-}
-
-bool wxTopLevelWindowBase::Destroy()
-{
-    // delayed destruction: the frame will be deleted during the next idle
-    // loop iteration
-    if ( !wxPendingDelete.Member(this) )
-        wxPendingDelete.Append(this);
-
-    // normally we want to hide the window immediately so that it doesn't get
-    // stuck on the screen while it's being destroyed, however we shouldn't
-    // hide the last visible window as then we might not get any idle events
-    // any more as no events will be sent to the hidden window and without idle
-    // events we won't prune wxPendingDelete list and the application won't
-    // terminate
-    for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
-                                     end = wxTopLevelWindows.end();
-          i != end;
-          ++i )
-    {
-        wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
-        if ( win != this && win->IsShown() )
-        {
-            // there remains at least one other visible TLW, we can hide this
-            // one
-            Hide();
-
-            break;
-        }
-    }
-
-    return true;
-}
-
-bool wxTopLevelWindowBase::IsLastBeforeExit() const
-{
-    // first of all, automatically exiting the app on last window close can be
-    // completely disabled at wxTheApp level
-    if ( !wxTheApp || !wxTheApp->GetExitOnFrameDelete() )
-        return false;
-
-    wxWindowList::const_iterator i;
-    const wxWindowList::const_iterator end = wxTopLevelWindows.end();
-
-    // then decide whether we should exit at all
-    for ( i = wxTopLevelWindows.begin(); i != end; ++i )
-    {
-        wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
-        if ( win->ShouldPreventAppExit() )
-        {
-            // there remains at least one important TLW, don't exit
-            return false;
-        }
-    }
-
-    // if yes, close all the other windows: this could still fail
-    for ( i = wxTopLevelWindows.begin(); i != end; ++i )
-    {
-        // don't close twice the windows which are already marked for deletion
-        wxTopLevelWindow * const win = static_cast<wxTopLevelWindow *>(*i);
-        if ( !wxPendingDelete.Member(win) && !win->Close() )
-        {
-            // one of the windows refused to close, don't exit
-            //
-            // NB: of course, by now some other windows could have been already
-            //     closed but there is really nothing we can do about it as we
-            //     have no way just to ask the window if it can close without
-            //     forcing it to do it
-            return false;
-        }
-    }
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wxTopLevelWindow geometry
-// ----------------------------------------------------------------------------
-
-void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize)
-{
-    SetSizeHints(minSize, GetMaxSize());
-}
-
-void wxTopLevelWindowBase::SetMaxSize(const wxSize& maxSize)
-{
-    SetSizeHints(GetMinSize(), maxSize);
-}
-
-void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
-{
-    GetPosition(x,y);
-    GetSize(w,h);
-}
-
-/* static */
-wxSize wxTopLevelWindowBase::GetDefaultSize()
-{
-    wxSize size = wxGetClientDisplayRect().GetSize();
-#ifndef __WXOSX_IPHONE__
-    // create proportionally bigger windows on small screens
-    if ( size.x >= 1024 )
-        size.x = 400;
-    else if ( size.x >= 800 )
-        size.x = 300;
-    else if ( size.x >= 320 )
-        size.x = 240;
-
-    if ( size.y >= 768 )
-        size.y = 250;
-    else if ( size.y > 200 )
-    {
-        size.y *= 2;
-        size.y /= 3;
-    }
-#endif
-    return size;
-}
-
-void wxTopLevelWindowBase::DoCentre(int dir)
-{
-    // on some platforms centering top level windows is impossible
-    // because they are always maximized by guidelines or limitations
-    //
-    // and centering a maximized window doesn't make sense as its position
-    // can't change
-    if ( IsAlwaysMaximized() || IsMaximized() )
-        return;
-
-    // we need the display rect anyhow so store it first: notice that we should
-    // be centered on the same display as our parent window, the display of
-    // this window itself is not really defined yet
-    int nDisplay = wxDisplay::GetFromWindow(GetParent() ? GetParent() : this);
-    wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay);
-    const wxRect rectDisplay(dpy.GetClientArea());
-
-    // what should we centre this window on?
-    wxRect rectParent;
-    if ( !(dir & wxCENTRE_ON_SCREEN) && GetParent() )
-    {
-        // centre on parent window: notice that we need screen coordinates for
-        // positioning this TLW
-        rectParent = GetParent()->GetScreenRect();
-
-        // if the parent is entirely off screen (happens at least with MDI
-        // parent frame under Mac but could happen elsewhere too if the frame
-        // was hidden/moved away for some reason), don't use it as otherwise
-        // this window wouldn't be visible at all
-        if ( !rectParent.Intersects(rectDisplay) )
-        {
-            // just centre on screen then
-            rectParent = rectDisplay;
-        }
-    }
-    else
-    {
-        // we were explicitly asked to centre this window on the entire screen
-        // or if we have no parent anyhow and so can't centre on it
-        rectParent = rectDisplay;
-    }
-
-    if ( !(dir & wxBOTH) )
-        dir |= wxBOTH; // if neither is specified, center in both directions
-
-    // the new window rect candidate
-    wxRect rect = GetRect().CentreIn(rectParent, dir & ~wxCENTRE_ON_SCREEN);
-
-    // we don't want to place the window off screen if Centre() is called as
-    // this is (almost?) never wanted and it would be very difficult to prevent
-    // it from happening from the user code if we didn't check for it here
-    if ( !rectDisplay.Contains(rect.GetTopLeft()) )
-    {
-        // move the window just enough to make the corner visible
-        int dx = rectDisplay.GetLeft() - rect.GetLeft();
-        int dy = rectDisplay.GetTop() - rect.GetTop();
-        rect.Offset(dx > 0 ? dx : 0, dy > 0 ? dy : 0);
-    }
-
-    if ( !rectDisplay.Contains(rect.GetBottomRight()) )
-    {
-        // do the same for this corner too
-        int dx = rectDisplay.GetRight() - rect.GetRight();
-        int dy = rectDisplay.GetBottom() - rect.GetBottom();
-        rect.Offset(dx < 0 ? dx : 0, dy < 0 ? dy : 0);
-    }
-
-    // the window top left and bottom right corner are both visible now and
-    // although the window might still be not entirely on screen (with 2
-    // staggered displays for example) we wouldn't be able to improve the
-    // layout much in such case, so we stop here
-
-    // -1 could be valid coordinate here if there are several displays
-    SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
-}
-
-// ----------------------------------------------------------------------------
-// wxTopLevelWindow size management: we exclude the areas taken by
-// menu/status/toolbars from the client area, so the client area is what's
-// really available for the frame contents
-// ----------------------------------------------------------------------------
-
-void wxTopLevelWindowBase::DoScreenToClient(int *x, int *y) const
-{
-    wxWindow::DoScreenToClient(x, y);
-
-    // translate the wxWindow client coords to our client coords
-    wxPoint pt(GetClientAreaOrigin());
-    if ( x )
-        *x -= pt.x;
-    if ( y )
-        *y -= pt.y;
-}
-
-void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const
-{
-    // our client area origin (0, 0) may be really something like (0, 30) for
-    // wxWindow if we have a toolbar, account for it before translating
-    wxPoint pt(GetClientAreaOrigin());
-    if ( x )
-        *x += pt.x;
-    if ( y )
-        *y += pt.y;
-
-    wxWindow::DoClientToScreen(x, y);
-}
-
-bool wxTopLevelWindowBase::IsAlwaysMaximized() const
-{
-#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
-    return true;
-#else
-    return false;
-#endif
-}
-
-// ----------------------------------------------------------------------------
-// icons
-// ----------------------------------------------------------------------------
-
-wxIcon wxTopLevelWindowBase::GetIcon() const
-{
-    return m_icons.IsEmpty() ? wxIcon() : m_icons.GetIcon( -1 );
-}
-
-void wxTopLevelWindowBase::SetIcon(const wxIcon& icon)
-{
-    // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
-    // have any icon), but adding an invalid icon to wxIconBundle is not
-    wxIconBundle icons;
-    if ( icon.IsOk() )
-        icons.AddIcon(icon);
-
-    SetIcons(icons);
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-// default resizing behaviour - if only ONE subwindow, resize to fill the
-// whole client area
-void wxTopLevelWindowBase::DoLayout()
-{
-    // if we're using constraints or sizers - do use them
-    if ( GetAutoLayout() )
-    {
-        Layout();
-    }
-    else
-    {
-        // do we have _exactly_ one child?
-        wxWindow *child = NULL;
-        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxWindow *win = node->GetData();
-
-            // exclude top level and managed windows (status bar isn't
-            // currently in the children list except under wxMac anyhow, but
-            // it makes no harm to test for it)
-            if ( !win->IsTopLevel() && !IsOneOfBars(win) )
-            {
-                if ( child )
-                {
-                    return;     // it's our second subwindow - nothing to do
-                }
-
-                child = win;
-            }
-        }
-
-        // do we have any children at all?
-        if ( child && child->IsShown() )
-        {
-            // exactly one child - set it's size to fill the whole frame
-            int clientW, clientH;
-            DoGetClientSize(&clientW, &clientH);
-
-            child->SetSize(0, 0, clientW, clientH);
-        }
-    }
-}
-
-// The default implementation for the close window event.
-void wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    Destroy();
-}
-
-bool wxTopLevelWindowBase::SendIconizeEvent(bool iconized)
-{
-    wxIconizeEvent event(GetId(), iconized);
-    event.SetEventObject(this);
-
-    return GetEventHandler()->ProcessEvent(event);
-}
-
-// do the window-specific processing after processing the update event
-void wxTopLevelWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
-{
-    // call inherited, but skip the wxControl's version, and call directly the
-    // wxWindow's one instead, because the only reason why we are overriding this
-    // function is that we want to use SetTitle() instead of wxControl::SetLabel()
-    wxWindowBase::DoUpdateWindowUI(event);
-
-    // update title
-    if ( event.GetSetText() )
-    {
-        if ( event.GetText() != GetTitle() )
-            SetTitle(event.GetText());
-    }
-}
-
-void wxTopLevelWindowBase::RequestUserAttention(int WXUNUSED(flags))
-{
-    // it's probably better than do nothing, isn't it?
-    Raise();
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/toplvcmn.cpp
+// Purpose:     common (for all platforms) wxTopLevelWindow functions
+// Author:      Julian Smart, Vadim Zeitlin
+// Created:     01/02/97
+// Id:          $Id: toplvcmn.cpp 53617 2008-05-17 12:56:18Z VZ $
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/toplevel.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
+    #include "wx/app.h"
+#endif // WX_PRECOMP
+
+#include "wx/display.h"
+
+// ----------------------------------------------------------------------------
+// event table
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxTopLevelWindowBase, wxWindow)
+    EVT_CLOSE(wxTopLevelWindowBase::OnCloseWindow)
+    EVT_SIZE(wxTopLevelWindowBase::OnSize)
+END_EVENT_TABLE()
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+IMPLEMENT_ABSTRACT_CLASS(wxTopLevelWindow, wxWindow)
+
+// ----------------------------------------------------------------------------
+// construction/destruction
+// ----------------------------------------------------------------------------
+
+wxTopLevelWindowBase::wxTopLevelWindowBase()
+{
+    // Unlike windows, top level windows are created hidden by default.
+    m_isShown = false;
+    m_winDefault = NULL;
+    m_winTmpDefault = NULL;
+}
+
+wxTopLevelWindowBase::~wxTopLevelWindowBase()
+{
+    // don't let wxTheApp keep any stale pointers to us
+    if ( wxTheApp && wxTheApp->GetTopWindow() == this )
+        wxTheApp->SetTopWindow(NULL);
+
+    wxTopLevelWindows.DeleteObject(this);
+
+    if ( IsLastBeforeExit() )
+    {
+        // no other (important) windows left, quit the app
+        wxTheApp->ExitMainLoop();
+    }
+}
+
+bool wxTopLevelWindowBase::Destroy()
+{
+    // delayed destruction: the frame will be deleted during the next idle
+    // loop iteration
+    if ( !wxPendingDelete.Member(this) )
+        wxPendingDelete.Append(this);
+
+#ifdef __WXMAC__
+    // on mac we know that objects will always be deleted after this event
+    // has been handled, using Hide we avoid erratic redraws during window
+    // tear down
+    Hide();
+#else // !__WXMAC__
+    // normally we want to hide the window immediately so that it doesn't get
+    // stuck on the screen while it's being destroyed, however we shouldn't
+    // hide the last visible window as then we might not get any idle events
+    // any more as no events will be sent to the hidden window and without idle
+    // events we won't prune wxPendingDelete list and the application won't
+    // terminate
+    for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(),
+                                     end = wxTopLevelWindows.end();
+          i != end;
+          ++i )
+    {
+        wxTopLevelWindow * const win = wx_static_cast(wxTopLevelWindow *, *i);
+        if ( win != this && win->IsShown() )
+        {
+            // there remains at least one other visible TLW, we can hide this
+            // one
+            Hide();
+
+            break;
+        }
+    }
+#endif // __WXMAC__/!__WXMAC__
+
+    return true;
+}
+
+bool wxTopLevelWindowBase::IsLastBeforeExit() const
+{
+    // first of all, automatically exiting the app on last window close can be
+    // completely disabled at wxTheApp level
+    if ( !wxTheApp || !wxTheApp->GetExitOnFrameDelete() )
+        return false;
+
+    wxWindowList::const_iterator i;
+    const wxWindowList::const_iterator end = wxTopLevelWindows.end();
+
+    // then decide whether we should exit at all
+    for ( i = wxTopLevelWindows.begin(); i != end; ++i )
+    {
+        wxTopLevelWindow * const win = wx_static_cast(wxTopLevelWindow *, *i);
+        if ( win->ShouldPreventAppExit() )
+        {
+            // there remains at least one important TLW, don't exit
+            return false;
+        }
+    }
+
+    // if yes, close all the other windows: this could still fail
+    for ( i = wxTopLevelWindows.begin(); i != end; ++i )
+    {
+        // don't close twice the windows which are already marked for deletion
+        wxTopLevelWindow * const win = wx_static_cast(wxTopLevelWindow *, *i);
+        if ( !wxPendingDelete.Member(win) && !win->Close() )
+        {
+            // one of the windows refused to close, don't exit
+            //
+            // NB: of course, by now some other windows could have been already
+            //     closed but there is really nothing we can do about it as we
+            //     have no way just to ask the window if it can close without
+            //     forcing it to do it
+            return false;
+        }
+    }
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// wxTopLevelWindow geometry
+// ----------------------------------------------------------------------------
+
+void wxTopLevelWindowBase::SetMinSize(const wxSize& minSize)
+{
+    SetSizeHints( minSize.x, minSize.y, GetMaxWidth(), GetMaxHeight() );    
+}
+
+void wxTopLevelWindowBase::SetMaxSize(const wxSize& maxSize)
+{
+    SetSizeHints( GetMinWidth(), GetMinHeight(), maxSize.x, maxSize.y );
+}
+
+// set the min/max size of the window
+void wxTopLevelWindowBase::DoSetSizeHints(int minW, int minH,
+                                  int maxW, int maxH,
+                                  int WXUNUSED(incW), int WXUNUSED(incH))
+{
+    // setting min width greater than max width leads to infinite loops under
+    // X11 and generally doesn't make any sense, so don't allow it
+    wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
+                    (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),
+                 _T("min width/height must be less than max width/height!") );
+
+    m_minWidth = minW;
+    m_maxWidth = maxW;
+    m_minHeight = minH;
+    m_maxHeight = maxH;
+}
+
+void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
+{
+    GetPosition(x,y);
+    GetSize(w,h);
+}
+
+/* static */
+wxSize wxTopLevelWindowBase::GetDefaultSize()
+{
+    wxSize size = wxGetClientDisplayRect().GetSize();
+
+    // create proportionally bigger windows on small screens
+    if ( size.x >= 1024 )
+        size.x = 400;
+    else if ( size.x >= 800 )
+        size.x = 300;
+    else if ( size.x >= 320 )
+        size.x = 240;
+
+    if ( size.y >= 768 )
+        size.y = 250;
+    else if ( size.y > 200 )
+    {
+        size.y *= 2;
+        size.y /= 3;
+    }
+
+    return size;
+}
+
+void wxTopLevelWindowBase::DoCentre(int dir)
+{
+    // on some platforms centering top level windows is impossible
+    // because they are always maximized by guidelines or limitations
+    if(IsAlwaysMaximized())
+        return;
+
+    // we need the display rect anyhow so store it first: notice that we should
+    // be centered on the same display as our parent window, the display of
+    // this window itself is not really defined yet
+    int nDisplay = wxDisplay::GetFromWindow(GetParent() ? GetParent() : this);
+    wxDisplay dpy(nDisplay == wxNOT_FOUND ? 0 : nDisplay);
+    const wxRect rectDisplay(dpy.GetClientArea());
+
+    // what should we centre this window on?
+    wxRect rectParent;
+    if ( !(dir & wxCENTRE_ON_SCREEN) && GetParent() )
+    {
+        // centre on parent window: notice that we need screen coordinates for
+        // positioning this TLW
+        rectParent = GetParent()->GetScreenRect();
+
+        // if the parent is entirely off screen (happens at least with MDI
+        // parent frame under Mac but could happen elsewhere too if the frame
+        // was hidden/moved away for some reason), don't use it as otherwise
+        // this window wouldn't be visible at all
+        if ( !rectDisplay.Contains(rectParent.GetTopLeft()) &&
+                !rectParent.Contains(rectParent.GetBottomRight()) )
+        {
+            // this is enough to make IsEmpty() test below pass
+            rectParent.width = 0;
+        }
+    }
+
+    if ( rectParent.IsEmpty() )
+    {
+        // we were explicitely asked to centre this window on the entire screen
+        // or if we have no parent anyhow and so can't centre on it
+        rectParent = rectDisplay;
+    }
+
+    // centering maximized window on screen is no-op
+    if((rectParent == rectDisplay) && IsMaximized())
+        return;
+
+    if ( !(dir & wxBOTH) )
+        dir |= wxBOTH; // if neither is specified, center in both directions
+
+    // the new window rect candidate
+    wxRect rect = GetRect().CentreIn(rectParent, dir & ~wxCENTRE_ON_SCREEN);
+
+    // we don't want to place the window off screen if Centre() is called as
+    // this is (almost?) never wanted and it would be very difficult to prevent
+    // it from happening from the user code if we didn't check for it here
+    if ( !rectDisplay.Contains(rect.GetTopLeft()) )
+    {
+        // move the window just enough to make the corner visible
+        int dx = rectDisplay.GetLeft() - rect.GetLeft();
+        int dy = rectDisplay.GetTop() - rect.GetTop();
+        rect.Offset(dx > 0 ? dx : 0, dy > 0 ? dy : 0);
+    }
+
+    if ( !rectDisplay.Contains(rect.GetBottomRight()) )
+    {
+        // do the same for this corner too
+        int dx = rectDisplay.GetRight() - rect.GetRight();
+        int dy = rectDisplay.GetBottom() - rect.GetBottom();
+        rect.Offset(dx < 0 ? dx : 0, dy < 0 ? dy : 0);
+    }
+
+    // the window top left and bottom right corner are both visible now and
+    // although the window might still be not entirely on screen (with 2
+    // staggered displays for example) we wouldn't be able to improve the
+    // layout much in such case, so we stop here
+
+    // -1 could be valid coordinate here if there are several displays
+    SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
+}
+
+// ----------------------------------------------------------------------------
+// wxTopLevelWindow size management: we exclude the areas taken by
+// menu/status/toolbars from the client area, so the client area is what's
+// really available for the frame contents
+// ----------------------------------------------------------------------------
+
+void wxTopLevelWindowBase::DoScreenToClient(int *x, int *y) const
+{
+    wxWindow::DoScreenToClient(x, y);
+
+    // translate the wxWindow client coords to our client coords
+    wxPoint pt(GetClientAreaOrigin());
+    if ( x )
+        *x -= pt.x;
+    if ( y )
+        *y -= pt.y;
+}
+
+void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const
+{
+    // our client area origin (0, 0) may be really something like (0, 30) for
+    // wxWindow if we have a toolbar, account for it before translating
+    wxPoint pt(GetClientAreaOrigin());
+    if ( x )
+        *x += pt.x;
+    if ( y )
+        *y += pt.y;
+
+    wxWindow::DoClientToScreen(x, y);
+}
+
+bool wxTopLevelWindowBase::IsAlwaysMaximized() const
+{
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    return true;
+#else
+    return false;
+#endif
+}
+
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+// default resizing behaviour - if only ONE subwindow, resize to fill the
+// whole client area
+void wxTopLevelWindowBase::DoLayout()
+{
+    // if we're using constraints or sizers - do use them
+    if ( GetAutoLayout() )
+    {
+        Layout();
+    }
+    else
+    {
+        // do we have _exactly_ one child?
+        wxWindow *child = (wxWindow *)NULL;
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+              node;
+              node = node->GetNext() )
+        {
+            wxWindow *win = node->GetData();
+
+            // exclude top level and managed windows (status bar isn't
+            // currently in the children list except under wxMac anyhow, but
+            // it makes no harm to test for it)
+            if ( !win->IsTopLevel() && !IsOneOfBars(win) )
+            {
+                if ( child )
+                {
+                    return;     // it's our second subwindow - nothing to do
+                }
+
+                child = win;
+            }
+        }
+
+        // do we have any children at all?
+        if ( child && child->IsShown() )
+        {
+            // exactly one child - set it's size to fill the whole frame
+            int clientW, clientH;
+            DoGetClientSize(&clientW, &clientH);
+
+            child->SetSize(0, 0, clientW, clientH);
+        }
+    }
+}
+
+// The default implementation for the close window event.
+void wxTopLevelWindowBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+{
+    Destroy();
+}
+
+bool wxTopLevelWindowBase::SendIconizeEvent(bool iconized)
+{
+    wxIconizeEvent event(GetId(), iconized);
+    event.SetEventObject(this);
+
+    return GetEventHandler()->ProcessEvent(event);
+}
+
+// do the window-specific processing after processing the update event
+void wxTopLevelWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
+{
+    // call inherited, but skip the wxControl's version, and call directly the
+    // wxWindow's one instead, because the only reason why we are overriding this
+    // function is that we want to use SetTitle() instead of wxControl::SetLabel()
+    wxWindowBase::DoUpdateWindowUI(event);
+
+    // update title
+    if ( event.GetSetText() )
+    {
+        if ( event.GetText() != GetTitle() )
+            SetTitle(event.GetText());
+    }
+}
+
+void wxTopLevelWindowBase::RequestUserAttention(int WXUNUSED(flags))
+{
+    // it's probably better than do nothing, isn't it?
+    Raise();
+}
+
+void wxTopLevelWindowBase::RemoveChild(wxWindowBase *child)
+{
+    if ( child == m_winDefault )
+        m_winDefault = NULL;
+
+    if ( child == m_winTmpDefault )
+        m_winTmpDefault = NULL;
+
+    wxWindow::RemoveChild(child);
+}
diff --git a/Source/3rd Party/wx/src/common/translation.cpp b/Source/3rd Party/wx/src/common/translation.cpp
deleted file mode 100644
index 1ac6600ee..000000000
--- a/Source/3rd Party/wx/src/common/translation.cpp	
+++ /dev/null
@@ -1,1889 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/translation.cpp
-// Purpose:     Internationalization and localisation for wxWidgets
-// Author:      Vadim Zeitlin, Vaclav Slavik,
-//              Michael N. Filippov <michael@idisys.iae.nsk.su>
-//              (2003/09/30 - PluralForms support)
-// Created:     2010-04-23
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declaration
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_INTL
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/string.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/hashmap.h"
-    #include "wx/module.h"
-#endif // WX_PRECOMP
-
-// standard headers
-#include <ctype.h>
-#include <stdlib.h>
-
-#include "wx/arrstr.h"
-#include "wx/dir.h"
-#include "wx/file.h"
-#include "wx/filename.h"
-#include "wx/tokenzr.h"
-#include "wx/fontmap.h"
-#include "wx/stdpaths.h"
-#include "wx/hashset.h"
-
-#ifdef __WINDOWS__
-    #include "wx/msw/wrapwin.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// simple types
-// ----------------------------------------------------------------------------
-
-typedef wxUint32 size_t32;
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// magic number identifying the .mo format file
-const size_t32 MSGCATALOG_MAGIC    = 0x950412de;
-const size_t32 MSGCATALOG_MAGIC_SW = 0xde120495;
-
-#define TRACE_I18N wxS("i18n")
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-namespace
-{
-
-#if !wxUSE_UNICODE
-// We need to keep track of (char*) msgids in non-Unicode legacy builds. Instead
-// of making the public wxMsgCatalog and wxTranslationsLoader APIs ugly, we
-// store them in this global map.
-wxStringToStringHashMap gs_msgIdCharset;
-#endif
-
-} // anonymous namespace
-
-// ----------------------------------------------------------------------------
-// Plural forms parser
-// ----------------------------------------------------------------------------
-
-/*
-                                Simplified Grammar
-
-Expression:
-    LogicalOrExpression '?' Expression ':' Expression
-    LogicalOrExpression
-
-LogicalOrExpression:
-    LogicalAndExpression "||" LogicalOrExpression   // to (a || b) || c
-    LogicalAndExpression
-
-LogicalAndExpression:
-    EqualityExpression "&&" LogicalAndExpression    // to (a && b) && c
-    EqualityExpression
-
-EqualityExpression:
-    RelationalExpression "==" RelationalExperession
-    RelationalExpression "!=" RelationalExperession
-    RelationalExpression
-
-RelationalExpression:
-    MultiplicativeExpression '>' MultiplicativeExpression
-    MultiplicativeExpression '<' MultiplicativeExpression
-    MultiplicativeExpression ">=" MultiplicativeExpression
-    MultiplicativeExpression "<=" MultiplicativeExpression
-    MultiplicativeExpression
-
-MultiplicativeExpression:
-    PmExpression '%' PmExpression
-    PmExpression
-
-PmExpression:
-    N
-    Number
-    '(' Expression ')'
-*/
-
-class wxPluralFormsToken
-{
-public:
-    enum Type
-    {
-        T_ERROR, T_EOF, T_NUMBER, T_N, T_PLURAL, T_NPLURALS, T_EQUAL, T_ASSIGN,
-        T_GREATER, T_GREATER_OR_EQUAL, T_LESS, T_LESS_OR_EQUAL,
-        T_REMINDER, T_NOT_EQUAL,
-        T_LOGICAL_AND, T_LOGICAL_OR, T_QUESTION, T_COLON, T_SEMICOLON,
-        T_LEFT_BRACKET, T_RIGHT_BRACKET
-    };
-    Type type() const { return m_type; }
-    void setType(Type type) { m_type = type; }
-    // for T_NUMBER only
-    typedef int Number;
-    Number number() const { return m_number; }
-    void setNumber(Number num) { m_number = num; }
-private:
-    Type m_type;
-    Number m_number;
-};
-
-
-class wxPluralFormsScanner
-{
-public:
-    wxPluralFormsScanner(const char* s);
-    const wxPluralFormsToken& token() const { return m_token; }
-    bool nextToken();  // returns false if error
-private:
-    const char* m_s;
-    wxPluralFormsToken m_token;
-};
-
-wxPluralFormsScanner::wxPluralFormsScanner(const char* s) : m_s(s)
-{
-    nextToken();
-}
-
-bool wxPluralFormsScanner::nextToken()
-{
-    wxPluralFormsToken::Type type = wxPluralFormsToken::T_ERROR;
-    while (isspace((unsigned char) *m_s))
-    {
-        ++m_s;
-    }
-    if (*m_s == 0)
-    {
-        type = wxPluralFormsToken::T_EOF;
-    }
-    else if (isdigit((unsigned char) *m_s))
-    {
-        wxPluralFormsToken::Number number = *m_s++ - '0';
-        while (isdigit((unsigned char) *m_s))
-        {
-            number = number * 10 + (*m_s++ - '0');
-        }
-        m_token.setNumber(number);
-        type = wxPluralFormsToken::T_NUMBER;
-    }
-    else if (isalpha((unsigned char) *m_s))
-    {
-        const char* begin = m_s++;
-        while (isalnum((unsigned char) *m_s))
-        {
-            ++m_s;
-        }
-        size_t size = m_s - begin;
-        if (size == 1 && memcmp(begin, "n", size) == 0)
-        {
-            type = wxPluralFormsToken::T_N;
-        }
-        else if (size == 6 && memcmp(begin, "plural", size) == 0)
-        {
-            type = wxPluralFormsToken::T_PLURAL;
-        }
-        else if (size == 8 && memcmp(begin, "nplurals", size) == 0)
-        {
-            type = wxPluralFormsToken::T_NPLURALS;
-        }
-    }
-    else if (*m_s == '=')
-    {
-        ++m_s;
-        if (*m_s == '=')
-        {
-            ++m_s;
-            type = wxPluralFormsToken::T_EQUAL;
-        }
-        else
-        {
-            type = wxPluralFormsToken::T_ASSIGN;
-        }
-    }
-    else if (*m_s == '>')
-    {
-        ++m_s;
-        if (*m_s == '=')
-        {
-            ++m_s;
-            type = wxPluralFormsToken::T_GREATER_OR_EQUAL;
-        }
-        else
-        {
-            type = wxPluralFormsToken::T_GREATER;
-        }
-    }
-    else if (*m_s == '<')
-    {
-        ++m_s;
-        if (*m_s == '=')
-        {
-            ++m_s;
-            type = wxPluralFormsToken::T_LESS_OR_EQUAL;
-        }
-        else
-        {
-            type = wxPluralFormsToken::T_LESS;
-        }
-    }
-    else if (*m_s == '%')
-    {
-        ++m_s;
-        type = wxPluralFormsToken::T_REMINDER;
-    }
-    else if (*m_s == '!' && m_s[1] == '=')
-    {
-        m_s += 2;
-        type = wxPluralFormsToken::T_NOT_EQUAL;
-    }
-    else if (*m_s == '&' && m_s[1] == '&')
-    {
-        m_s += 2;
-        type = wxPluralFormsToken::T_LOGICAL_AND;
-    }
-    else if (*m_s == '|' && m_s[1] == '|')
-    {
-        m_s += 2;
-        type = wxPluralFormsToken::T_LOGICAL_OR;
-    }
-    else if (*m_s == '?')
-    {
-        ++m_s;
-        type = wxPluralFormsToken::T_QUESTION;
-    }
-    else if (*m_s == ':')
-    {
-        ++m_s;
-        type = wxPluralFormsToken::T_COLON;
-    } else if (*m_s == ';') {
-        ++m_s;
-        type = wxPluralFormsToken::T_SEMICOLON;
-    }
-    else if (*m_s == '(')
-    {
-        ++m_s;
-        type = wxPluralFormsToken::T_LEFT_BRACKET;
-    }
-    else if (*m_s == ')')
-    {
-        ++m_s;
-        type = wxPluralFormsToken::T_RIGHT_BRACKET;
-    }
-    m_token.setType(type);
-    return type != wxPluralFormsToken::T_ERROR;
-}
-
-class wxPluralFormsNode;
-
-// NB: Can't use wxDEFINE_SCOPED_PTR_TYPE because wxPluralFormsNode is not
-//     fully defined yet:
-class wxPluralFormsNodePtr
-{
-public:
-    wxPluralFormsNodePtr(wxPluralFormsNode *p = NULL) : m_p(p) {}
-    ~wxPluralFormsNodePtr();
-    wxPluralFormsNode& operator*() const { return *m_p; }
-    wxPluralFormsNode* operator->() const { return m_p; }
-    wxPluralFormsNode* get() const { return m_p; }
-    wxPluralFormsNode* release();
-    void reset(wxPluralFormsNode *p);
-
-private:
-    wxPluralFormsNode *m_p;
-};
-
-class wxPluralFormsNode
-{
-public:
-    wxPluralFormsNode(const wxPluralFormsToken& token) : m_token(token) {}
-    const wxPluralFormsToken& token() const { return m_token; }
-    const wxPluralFormsNode* node(unsigned i) const
-        { return m_nodes[i].get(); }
-    void setNode(unsigned i, wxPluralFormsNode* n);
-    wxPluralFormsNode* releaseNode(unsigned i);
-    wxPluralFormsToken::Number evaluate(wxPluralFormsToken::Number n) const;
-
-private:
-    wxPluralFormsToken m_token;
-    wxPluralFormsNodePtr m_nodes[3];
-};
-
-wxPluralFormsNodePtr::~wxPluralFormsNodePtr()
-{
-    delete m_p;
-}
-wxPluralFormsNode* wxPluralFormsNodePtr::release()
-{
-    wxPluralFormsNode *p = m_p;
-    m_p = NULL;
-    return p;
-}
-void wxPluralFormsNodePtr::reset(wxPluralFormsNode *p)
-{
-    if (p != m_p)
-    {
-        delete m_p;
-        m_p = p;
-    }
-}
-
-
-void wxPluralFormsNode::setNode(unsigned i, wxPluralFormsNode* n)
-{
-    m_nodes[i].reset(n);
-}
-
-wxPluralFormsNode*  wxPluralFormsNode::releaseNode(unsigned i)
-{
-    return m_nodes[i].release();
-}
-
-wxPluralFormsToken::Number
-wxPluralFormsNode::evaluate(wxPluralFormsToken::Number n) const
-{
-    switch (token().type())
-    {
-        // leaf
-        case wxPluralFormsToken::T_NUMBER:
-            return token().number();
-        case wxPluralFormsToken::T_N:
-            return n;
-        // 2 args
-        case wxPluralFormsToken::T_EQUAL:
-            return node(0)->evaluate(n) == node(1)->evaluate(n);
-        case wxPluralFormsToken::T_NOT_EQUAL:
-            return node(0)->evaluate(n) != node(1)->evaluate(n);
-        case wxPluralFormsToken::T_GREATER:
-            return node(0)->evaluate(n) > node(1)->evaluate(n);
-        case wxPluralFormsToken::T_GREATER_OR_EQUAL:
-            return node(0)->evaluate(n) >= node(1)->evaluate(n);
-        case wxPluralFormsToken::T_LESS:
-            return node(0)->evaluate(n) < node(1)->evaluate(n);
-        case wxPluralFormsToken::T_LESS_OR_EQUAL:
-            return node(0)->evaluate(n) <= node(1)->evaluate(n);
-        case wxPluralFormsToken::T_REMINDER:
-            {
-                wxPluralFormsToken::Number number = node(1)->evaluate(n);
-                if (number != 0)
-                {
-                    return node(0)->evaluate(n) % number;
-                }
-                else
-                {
-                    return 0;
-                }
-            }
-        case wxPluralFormsToken::T_LOGICAL_AND:
-            return node(0)->evaluate(n) && node(1)->evaluate(n);
-        case wxPluralFormsToken::T_LOGICAL_OR:
-            return node(0)->evaluate(n) || node(1)->evaluate(n);
-        // 3 args
-        case wxPluralFormsToken::T_QUESTION:
-            return node(0)->evaluate(n)
-                ? node(1)->evaluate(n)
-                : node(2)->evaluate(n);
-        default:
-            return 0;
-    }
-}
-
-
-class wxPluralFormsCalculator
-{
-public:
-    wxPluralFormsCalculator() : m_nplurals(0), m_plural(0) {}
-
-    // input: number, returns msgstr index
-    int evaluate(int n) const;
-
-    // input: text after "Plural-Forms:" (e.g. "nplurals=2; plural=(n != 1);"),
-    // if s == 0, creates default handler
-    // returns 0 if error
-    static wxPluralFormsCalculator* make(const char* s = 0);
-
-    ~wxPluralFormsCalculator() {}
-
-    void  init(wxPluralFormsToken::Number nplurals, wxPluralFormsNode* plural);
-
-private:
-    wxPluralFormsToken::Number m_nplurals;
-    wxPluralFormsNodePtr m_plural;
-};
-
-wxDEFINE_SCOPED_PTR(wxPluralFormsCalculator, wxPluralFormsCalculatorPtr)
-
-void wxPluralFormsCalculator::init(wxPluralFormsToken::Number nplurals,
-                                wxPluralFormsNode* plural)
-{
-    m_nplurals = nplurals;
-    m_plural.reset(plural);
-}
-
-int wxPluralFormsCalculator::evaluate(int n) const
-{
-    if (m_plural.get() == 0)
-    {
-        return 0;
-    }
-    wxPluralFormsToken::Number number = m_plural->evaluate(n);
-    if (number < 0 || number > m_nplurals)
-    {
-        return 0;
-    }
-    return number;
-}
-
-
-class wxPluralFormsParser
-{
-public:
-    wxPluralFormsParser(wxPluralFormsScanner& scanner) : m_scanner(scanner) {}
-    bool parse(wxPluralFormsCalculator& rCalculator);
-
-private:
-    wxPluralFormsNode* parsePlural();
-    // stops at T_SEMICOLON, returns 0 if error
-    wxPluralFormsScanner& m_scanner;
-    const wxPluralFormsToken& token() const;
-    bool nextToken();
-
-    wxPluralFormsNode* expression();
-    wxPluralFormsNode* logicalOrExpression();
-    wxPluralFormsNode* logicalAndExpression();
-    wxPluralFormsNode* equalityExpression();
-    wxPluralFormsNode* multiplicativeExpression();
-    wxPluralFormsNode* relationalExpression();
-    wxPluralFormsNode* pmExpression();
-};
-
-bool wxPluralFormsParser::parse(wxPluralFormsCalculator& rCalculator)
-{
-    if (token().type() != wxPluralFormsToken::T_NPLURALS)
-        return false;
-    if (!nextToken())
-        return false;
-    if (token().type() != wxPluralFormsToken::T_ASSIGN)
-        return false;
-    if (!nextToken())
-        return false;
-    if (token().type() != wxPluralFormsToken::T_NUMBER)
-        return false;
-    wxPluralFormsToken::Number nplurals = token().number();
-    if (!nextToken())
-        return false;
-    if (token().type() != wxPluralFormsToken::T_SEMICOLON)
-        return false;
-    if (!nextToken())
-        return false;
-    if (token().type() != wxPluralFormsToken::T_PLURAL)
-        return false;
-    if (!nextToken())
-        return false;
-    if (token().type() != wxPluralFormsToken::T_ASSIGN)
-        return false;
-    if (!nextToken())
-        return false;
-    wxPluralFormsNode* plural = parsePlural();
-    if (plural == 0)
-        return false;
-    if (token().type() != wxPluralFormsToken::T_SEMICOLON)
-        return false;
-    if (!nextToken())
-        return false;
-    if (token().type() != wxPluralFormsToken::T_EOF)
-        return false;
-    rCalculator.init(nplurals, plural);
-    return true;
-}
-
-wxPluralFormsNode* wxPluralFormsParser::parsePlural()
-{
-    wxPluralFormsNode* p = expression();
-    if (p == NULL)
-    {
-        return NULL;
-    }
-    wxPluralFormsNodePtr n(p);
-    if (token().type() != wxPluralFormsToken::T_SEMICOLON)
-    {
-        return NULL;
-    }
-    return n.release();
-}
-
-const wxPluralFormsToken& wxPluralFormsParser::token() const
-{
-    return m_scanner.token();
-}
-
-bool wxPluralFormsParser::nextToken()
-{
-    if (!m_scanner.nextToken())
-        return false;
-    return true;
-}
-
-wxPluralFormsNode* wxPluralFormsParser::expression()
-{
-    wxPluralFormsNode* p = logicalOrExpression();
-    if (p == NULL)
-        return NULL;
-    wxPluralFormsNodePtr n(p);
-    if (token().type() == wxPluralFormsToken::T_QUESTION)
-    {
-        wxPluralFormsNodePtr qn(new wxPluralFormsNode(token()));
-        if (!nextToken())
-        {
-            return 0;
-        }
-        p = expression();
-        if (p == 0)
-        {
-            return 0;
-        }
-        qn->setNode(1, p);
-        if (token().type() != wxPluralFormsToken::T_COLON)
-        {
-            return 0;
-        }
-        if (!nextToken())
-        {
-            return 0;
-        }
-        p = expression();
-        if (p == 0)
-        {
-            return 0;
-        }
-        qn->setNode(2, p);
-        qn->setNode(0, n.release());
-        return qn.release();
-    }
-    return n.release();
-}
-
-wxPluralFormsNode*wxPluralFormsParser::logicalOrExpression()
-{
-    wxPluralFormsNode* p = logicalAndExpression();
-    if (p == NULL)
-        return NULL;
-    wxPluralFormsNodePtr ln(p);
-    if (token().type() == wxPluralFormsToken::T_LOGICAL_OR)
-    {
-        wxPluralFormsNodePtr un(new wxPluralFormsNode(token()));
-        if (!nextToken())
-        {
-            return 0;
-        }
-        p = logicalOrExpression();
-        if (p == 0)
-        {
-            return 0;
-        }
-        wxPluralFormsNodePtr rn(p);    // right
-        if (rn->token().type() == wxPluralFormsToken::T_LOGICAL_OR)
-        {
-            // see logicalAndExpression comment
-            un->setNode(0, ln.release());
-            un->setNode(1, rn->releaseNode(0));
-            rn->setNode(0, un.release());
-            return rn.release();
-        }
-
-
-        un->setNode(0, ln.release());
-        un->setNode(1, rn.release());
-        return un.release();
-    }
-    return ln.release();
-}
-
-wxPluralFormsNode* wxPluralFormsParser::logicalAndExpression()
-{
-    wxPluralFormsNode* p = equalityExpression();
-    if (p == NULL)
-        return NULL;
-    wxPluralFormsNodePtr ln(p);   // left
-    if (token().type() == wxPluralFormsToken::T_LOGICAL_AND)
-    {
-        wxPluralFormsNodePtr un(new wxPluralFormsNode(token()));  // up
-        if (!nextToken())
-        {
-            return NULL;
-        }
-        p = logicalAndExpression();
-        if (p == 0)
-        {
-            return NULL;
-        }
-        wxPluralFormsNodePtr rn(p);    // right
-        if (rn->token().type() == wxPluralFormsToken::T_LOGICAL_AND)
-        {
-// transform 1 && (2 && 3) -> (1 && 2) && 3
-//     u                  r
-// l       r     ->   u      3
-//       2   3      l   2
-            un->setNode(0, ln.release());
-            un->setNode(1, rn->releaseNode(0));
-            rn->setNode(0, un.release());
-            return rn.release();
-        }
-
-        un->setNode(0, ln.release());
-        un->setNode(1, rn.release());
-        return un.release();
-    }
-    return ln.release();
-}
-
-wxPluralFormsNode* wxPluralFormsParser::equalityExpression()
-{
-    wxPluralFormsNode* p = relationalExpression();
-    if (p == NULL)
-        return NULL;
-    wxPluralFormsNodePtr n(p);
-    if (token().type() == wxPluralFormsToken::T_EQUAL
-        || token().type() == wxPluralFormsToken::T_NOT_EQUAL)
-    {
-        wxPluralFormsNodePtr qn(new wxPluralFormsNode(token()));
-        if (!nextToken())
-        {
-            return NULL;
-        }
-        p = relationalExpression();
-        if (p == NULL)
-        {
-            return NULL;
-        }
-        qn->setNode(1, p);
-        qn->setNode(0, n.release());
-        return qn.release();
-    }
-    return n.release();
-}
-
-wxPluralFormsNode* wxPluralFormsParser::relationalExpression()
-{
-    wxPluralFormsNode* p = multiplicativeExpression();
-    if (p == NULL)
-        return NULL;
-    wxPluralFormsNodePtr n(p);
-    if (token().type() == wxPluralFormsToken::T_GREATER
-            || token().type() == wxPluralFormsToken::T_LESS
-            || token().type() == wxPluralFormsToken::T_GREATER_OR_EQUAL
-            || token().type() == wxPluralFormsToken::T_LESS_OR_EQUAL)
-    {
-        wxPluralFormsNodePtr qn(new wxPluralFormsNode(token()));
-        if (!nextToken())
-        {
-            return NULL;
-        }
-        p = multiplicativeExpression();
-        if (p == NULL)
-        {
-            return NULL;
-        }
-        qn->setNode(1, p);
-        qn->setNode(0, n.release());
-        return qn.release();
-    }
-    return n.release();
-}
-
-wxPluralFormsNode* wxPluralFormsParser::multiplicativeExpression()
-{
-    wxPluralFormsNode* p = pmExpression();
-    if (p == NULL)
-        return NULL;
-    wxPluralFormsNodePtr n(p);
-    if (token().type() == wxPluralFormsToken::T_REMINDER)
-    {
-        wxPluralFormsNodePtr qn(new wxPluralFormsNode(token()));
-        if (!nextToken())
-        {
-            return NULL;
-        }
-        p = pmExpression();
-        if (p == NULL)
-        {
-            return NULL;
-        }
-        qn->setNode(1, p);
-        qn->setNode(0, n.release());
-        return qn.release();
-    }
-    return n.release();
-}
-
-wxPluralFormsNode* wxPluralFormsParser::pmExpression()
-{
-    wxPluralFormsNodePtr n;
-    if (token().type() == wxPluralFormsToken::T_N
-        || token().type() == wxPluralFormsToken::T_NUMBER)
-    {
-        n.reset(new wxPluralFormsNode(token()));
-        if (!nextToken())
-        {
-            return NULL;
-        }
-    }
-    else if (token().type() == wxPluralFormsToken::T_LEFT_BRACKET) {
-        if (!nextToken())
-        {
-            return NULL;
-        }
-        wxPluralFormsNode* p = expression();
-        if (p == NULL)
-        {
-            return NULL;
-        }
-        n.reset(p);
-        if (token().type() != wxPluralFormsToken::T_RIGHT_BRACKET)
-        {
-            return NULL;
-        }
-        if (!nextToken())
-        {
-            return NULL;
-        }
-    }
-    else
-    {
-        return NULL;
-    }
-    return n.release();
-}
-
-wxPluralFormsCalculator* wxPluralFormsCalculator::make(const char* s)
-{
-    wxPluralFormsCalculatorPtr calculator(new wxPluralFormsCalculator);
-    if (s != NULL)
-    {
-        wxPluralFormsScanner scanner(s);
-        wxPluralFormsParser p(scanner);
-        if (!p.parse(*calculator))
-        {
-            return NULL;
-        }
-    }
-    return calculator.release();
-}
-
-
-
-
-// ----------------------------------------------------------------------------
-// wxMsgCatalogFile corresponds to one disk-file message catalog.
-//
-// This is a "low-level" class and is used only by wxMsgCatalog
-// NOTE: for the documentation of the binary catalog (.MO) files refer to
-//       the GNU gettext manual:
-//       http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html
-// ----------------------------------------------------------------------------
-
-class wxMsgCatalogFile
-{
-public:
-    typedef wxScopedCharBuffer DataBuffer;
-
-    // ctor & dtor
-    wxMsgCatalogFile();
-    ~wxMsgCatalogFile();
-
-    // load the catalog from disk
-    bool LoadFile(const wxString& filename,
-                  wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
-    bool LoadData(const DataBuffer& data,
-                  wxPluralFormsCalculatorPtr& rPluralFormsCalculator);
-
-    // fills the hash with string-translation pairs
-    bool FillHash(wxStringToStringHashMap& hash, const wxString& domain) const;
-
-    // return the charset of the strings in this catalog or empty string if
-    // none/unknown
-    wxString GetCharset() const { return m_charset; }
-
-private:
-    // this implementation is binary compatible with GNU gettext() version 0.10
-
-    // an entry in the string table
-    struct wxMsgTableEntry
-    {
-        size_t32   nLen;           // length of the string
-        size_t32   ofsString;      // pointer to the string
-    };
-
-    // header of a .mo file
-    struct wxMsgCatalogHeader
-    {
-        size_t32  magic,          // offset +00:  magic id
-                  revision,       //        +04:  revision
-                  numStrings;     //        +08:  number of strings in the file
-        size_t32  ofsOrigTable,   //        +0C:  start of original string table
-                  ofsTransTable;  //        +10:  start of translated string table
-        size_t32  nHashSize,      //        +14:  hash table size
-                  ofsHashTable;   //        +18:  offset of hash table start
-    };
-
-    // all data is stored here
-    DataBuffer m_data;
-
-    // data description
-    size_t32          m_numStrings;   // number of strings in this domain
-    wxMsgTableEntry  *m_pOrigTable,   // pointer to original   strings
-                     *m_pTransTable;  //            translated
-
-    wxString m_charset;               // from the message catalog header
-
-
-    // swap the 2 halves of 32 bit integer if needed
-    size_t32 Swap(size_t32 ui) const
-    {
-        return m_bSwapped ? (ui << 24) | ((ui & 0xff00) << 8) |
-                            ((ui >> 8) & 0xff00) | (ui >> 24)
-                            : ui;
-    }
-
-    const char *StringAtOfs(wxMsgTableEntry *pTable, size_t32 n) const
-    {
-        const wxMsgTableEntry * const ent = pTable + n;
-
-        // this check could fail for a corrupt message catalog
-        size_t32 ofsString = Swap(ent->ofsString);
-        if ( ofsString + Swap(ent->nLen) > m_data.length())
-        {
-            return NULL;
-        }
-
-        return m_data.data() + ofsString;
-    }
-
-    bool m_bSwapped;   // wrong endianness?
-
-    wxDECLARE_NO_COPY_CLASS(wxMsgCatalogFile);
-};
-
-// ----------------------------------------------------------------------------
-// wxMsgCatalogFile class
-// ----------------------------------------------------------------------------
-
-wxMsgCatalogFile::wxMsgCatalogFile()
-{
-}
-
-wxMsgCatalogFile::~wxMsgCatalogFile()
-{
-}
-
-// open disk file and read in it's contents
-bool wxMsgCatalogFile::LoadFile(const wxString& filename,
-                                wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
-{
-    wxFile fileMsg(filename);
-    if ( !fileMsg.IsOpened() )
-        return false;
-
-    // get the file size (assume it is less than 4GB...)
-    wxFileOffset lenFile = fileMsg.Length();
-    if ( lenFile == wxInvalidOffset )
-        return false;
-
-    size_t nSize = wx_truncate_cast(size_t, lenFile);
-    wxASSERT_MSG( nSize == lenFile + size_t(0), wxS("message catalog bigger than 4GB?") );
-
-    wxMemoryBuffer filedata;
-
-    // read the whole file in memory
-    if ( fileMsg.Read(filedata.GetWriteBuf(nSize), nSize) != lenFile )
-        return false;
-
-    filedata.UngetWriteBuf(nSize);
-
-    bool ok = LoadData
-              (
-                  DataBuffer::CreateOwned((char*)filedata.release(), nSize),
-                  rPluralFormsCalculator
-              );
-    if ( !ok )
-    {
-        wxLogWarning(_("'%s' is not a valid message catalog."), filename.c_str());
-        return false;
-    }
-
-    return true;
-}
-
-
-bool wxMsgCatalogFile::LoadData(const DataBuffer& data,
-                                wxPluralFormsCalculatorPtr& rPluralFormsCalculator)
-{
-    // examine header
-    bool bValid = data.length() > sizeof(wxMsgCatalogHeader);
-
-    const wxMsgCatalogHeader *pHeader = (wxMsgCatalogHeader *)data.data();
-    if ( bValid ) {
-        // we'll have to swap all the integers if it's true
-        m_bSwapped = pHeader->magic == MSGCATALOG_MAGIC_SW;
-
-        // check the magic number
-        bValid = m_bSwapped || pHeader->magic == MSGCATALOG_MAGIC;
-    }
-
-    if ( !bValid ) {
-        // it's either too short or has incorrect magic number
-        wxLogWarning(_("Invalid message catalog."));
-        return false;
-    }
-
-    m_data = data;
-
-    // initialize
-    m_numStrings  = Swap(pHeader->numStrings);
-    m_pOrigTable  = (wxMsgTableEntry *)(data.data() +
-                    Swap(pHeader->ofsOrigTable));
-    m_pTransTable = (wxMsgTableEntry *)(data.data() +
-                    Swap(pHeader->ofsTransTable));
-
-    // now parse catalog's header and try to extract catalog charset and
-    // plural forms formula from it:
-
-    const char* headerData = StringAtOfs(m_pOrigTable, 0);
-    if ( headerData && headerData[0] == '\0' )
-    {
-        // Extract the charset:
-        const char * const header = StringAtOfs(m_pTransTable, 0);
-        const char *
-            cset = strstr(header, "Content-Type: text/plain; charset=");
-        if ( cset )
-        {
-            cset += 34; // strlen("Content-Type: text/plain; charset=")
-
-            const char * const csetEnd = strchr(cset, '\n');
-            if ( csetEnd )
-            {
-                m_charset = wxString(cset, csetEnd - cset);
-                if ( m_charset == wxS("CHARSET") )
-                {
-                    // "CHARSET" is not valid charset, but lazy translator
-                    m_charset.clear();
-                }
-            }
-        }
-        // else: incorrectly filled Content-Type header
-
-        // Extract plural forms:
-        const char * plurals = strstr(header, "Plural-Forms:");
-        if ( plurals )
-        {
-            plurals += 13; // strlen("Plural-Forms:")
-            const char * const pluralsEnd = strchr(plurals, '\n');
-            if ( pluralsEnd )
-            {
-                const size_t pluralsLen = pluralsEnd - plurals;
-                wxCharBuffer buf(pluralsLen);
-                strncpy(buf.data(), plurals, pluralsLen);
-                wxPluralFormsCalculator * const
-                    pCalculator = wxPluralFormsCalculator::make(buf);
-                if ( pCalculator )
-                {
-                    rPluralFormsCalculator.reset(pCalculator);
-                }
-                else
-                {
-                    wxLogVerbose(_("Failed to parse Plural-Forms: '%s'"),
-                                 buf.data());
-                }
-            }
-        }
-
-        if ( !rPluralFormsCalculator.get() )
-            rPluralFormsCalculator.reset(wxPluralFormsCalculator::make());
-    }
-
-    // everything is fine
-    return true;
-}
-
-bool wxMsgCatalogFile::FillHash(wxStringToStringHashMap& hash,
-                                const wxString& domain) const
-{
-    wxUnusedVar(domain); // silence warning in Unicode build
-
-    // conversion to use to convert catalog strings to the GUI encoding
-    wxMBConv *inputConv = NULL;
-    wxMBConv *inputConvPtr = NULL; // same as inputConv but safely deleteable
-
-    if ( !m_charset.empty() )
-    {
-#if !wxUSE_UNICODE && wxUSE_FONTMAP
-        // determine if we need any conversion at all
-        wxFontEncoding encCat = wxFontMapperBase::GetEncodingFromName(m_charset);
-        if ( encCat != wxLocale::GetSystemEncoding() )
-#endif
-        {
-            inputConvPtr =
-            inputConv = new wxCSConv(m_charset);
-        }
-    }
-    else // no need or not possible to convert the encoding
-    {
-#if wxUSE_UNICODE
-        // we must somehow convert the narrow strings in the message catalog to
-        // wide strings, so use the default conversion if we have no charset
-        inputConv = wxConvCurrent;
-#endif
-    }
-
-#if !wxUSE_UNICODE
-    wxString msgIdCharset = gs_msgIdCharset[domain];
-
-    // conversion to apply to msgid strings before looking them up: we only
-    // need it if the msgids are neither in 7 bit ASCII nor in the same
-    // encoding as the catalog
-    wxCSConv *sourceConv = msgIdCharset.empty() || (msgIdCharset == m_charset)
-                            ? NULL
-                            : new wxCSConv(msgIdCharset);
-#endif // !wxUSE_UNICODE
-
-    for (size_t32 i = 0; i < m_numStrings; i++)
-    {
-        const char *data = StringAtOfs(m_pOrigTable, i);
-        if (!data)
-            return false; // may happen for invalid MO files
-
-        wxString msgid;
-#if wxUSE_UNICODE
-        msgid = wxString(data, *inputConv);
-#else // ASCII
-        if ( inputConv && sourceConv )
-            msgid = wxString(inputConv->cMB2WC(data), *sourceConv);
-        else
-            msgid = data;
-#endif // wxUSE_UNICODE
-
-        data = StringAtOfs(m_pTransTable, i);
-        if (!data)
-            return false; // may happen for invalid MO files
-
-        size_t length = Swap(m_pTransTable[i].nLen);
-        size_t offset = 0;
-        size_t index = 0;
-        while (offset < length)
-        {
-            const char * const str = data + offset;
-
-            wxString msgstr;
-#if wxUSE_UNICODE
-            msgstr = wxString(str, *inputConv);
-#else
-            if ( inputConv )
-                msgstr = wxString(inputConv->cMB2WC(str), *wxConvUI);
-            else
-                msgstr = str;
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
-            if ( !msgstr.empty() )
-            {
-                hash[index == 0 ? msgid : msgid + wxChar(index)] = msgstr;
-            }
-
-            // skip this string
-            // IMPORTANT: accesses to the 'data' pointer are valid only for
-            //            the first 'length+1' bytes (GNU specs says that the
-            //            final NUL is not counted in length); using wxStrnlen()
-            //            we make sure we don't access memory beyond the valid range
-            //            (which otherwise may happen for invalid MO files):
-            offset += wxStrnlen(str, length - offset) + 1;
-            ++index;
-        }
-    }
-
-#if !wxUSE_UNICODE
-    delete sourceConv;
-#endif
-    delete inputConvPtr;
-
-    return true;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxMsgCatalog class
-// ----------------------------------------------------------------------------
-
-#if !wxUSE_UNICODE
-wxMsgCatalog::~wxMsgCatalog()
-{
-    if ( m_conv )
-    {
-        if ( wxConvUI == m_conv )
-        {
-            // we only change wxConvUI if it points to wxConvLocal so we reset
-            // it back to it too
-            wxConvUI = &wxConvLocal;
-        }
-
-        delete m_conv;
-    }
-}
-#endif // !wxUSE_UNICODE
-
-/* static */
-wxMsgCatalog *wxMsgCatalog::CreateFromFile(const wxString& filename,
-                                           const wxString& domain)
-{
-    wxScopedPtr<wxMsgCatalog> cat(new wxMsgCatalog(domain));
-
-    wxMsgCatalogFile file;
-
-    if ( !file.LoadFile(filename, cat->m_pluralFormsCalculator) )
-        return NULL;
-
-    if ( !file.FillHash(cat->m_messages, domain) )
-        return NULL;
-
-    return cat.release();
-}
-
-/* static */
-wxMsgCatalog *wxMsgCatalog::CreateFromData(const wxScopedCharBuffer& data,
-                                           const wxString& domain)
-{
-    wxScopedPtr<wxMsgCatalog> cat(new wxMsgCatalog(domain));
-
-    wxMsgCatalogFile file;
-
-    if ( !file.LoadData(data, cat->m_pluralFormsCalculator) )
-        return NULL;
-
-    if ( !file.FillHash(cat->m_messages, domain) )
-        return NULL;
-
-    return cat.release();
-}
-
-const wxString *wxMsgCatalog::GetString(const wxString& str, unsigned n) const
-{
-    int index = 0;
-    if (n != UINT_MAX)
-    {
-        index = m_pluralFormsCalculator->evaluate(n);
-    }
-    wxStringToStringHashMap::const_iterator i;
-    if (index != 0)
-    {
-        i = m_messages.find(wxString(str) + wxChar(index));   // plural
-    }
-    else
-    {
-        i = m_messages.find(str);
-    }
-
-    if ( i != m_messages.end() )
-    {
-        return &i->second;
-    }
-    else
-        return NULL;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxTranslations
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-wxTranslations *gs_translations = NULL;
-bool gs_translationsOwned = false;
-
-} // anonymous namespace
-
-
-/*static*/
-wxTranslations *wxTranslations::Get()
-{
-    return gs_translations;
-}
-
-/*static*/
-void wxTranslations::Set(wxTranslations *t)
-{
-    if ( gs_translationsOwned )
-        delete gs_translations;
-    gs_translations = t;
-    gs_translationsOwned = true;
-}
-
-/*static*/
-void wxTranslations::SetNonOwned(wxTranslations *t)
-{
-    if ( gs_translationsOwned )
-        delete gs_translations;
-    gs_translations = t;
-    gs_translationsOwned = false;
-}
-
-
-wxTranslations::wxTranslations()
-{
-    m_pMsgCat = NULL;
-    m_loader = new wxFileTranslationsLoader;
-}
-
-
-wxTranslations::~wxTranslations()
-{
-    delete m_loader;
-
-    // free catalogs memory
-    wxMsgCatalog *pTmpCat;
-    while ( m_pMsgCat != NULL )
-    {
-        pTmpCat = m_pMsgCat;
-        m_pMsgCat = m_pMsgCat->m_pNext;
-        delete pTmpCat;
-    }
-}
-
-
-void wxTranslations::SetLoader(wxTranslationsLoader *loader)
-{
-    wxCHECK_RET( loader, "loader can't be NULL" );
-
-    delete m_loader;
-    m_loader = loader;
-}
-
-
-void wxTranslations::SetLanguage(wxLanguage lang)
-{
-    if ( lang == wxLANGUAGE_DEFAULT )
-        SetLanguage("");
-    else
-        SetLanguage(wxLocale::GetLanguageCanonicalName(lang));
-}
-
-void wxTranslations::SetLanguage(const wxString& lang)
-{
-    m_lang = lang;
-}
-
-
-wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) const
-{
-    wxCHECK_MSG( m_loader, wxArrayString(), "loader can't be NULL" );
-
-    return m_loader->GetAvailableTranslations(domain);
-}
-
-
-bool wxTranslations::AddStdCatalog()
-{
-    if ( !AddCatalog(wxS("wxstd")) )
-        return false;
-
-    // there may be a catalog with toolkit specific overrides, it is not
-    // an error if this does not exist
-    wxString port(wxPlatformInfo::Get().GetPortIdName());
-    if ( !port.empty() )
-    {
-        AddCatalog(port.BeforeFirst(wxS('/')).MakeLower());
-    }
-
-    return true;
-}
-
-
-bool wxTranslations::AddCatalog(const wxString& domain)
-{
-    return AddCatalog(domain, wxLANGUAGE_ENGLISH_US);
-}
-
-#if !wxUSE_UNICODE
-bool wxTranslations::AddCatalog(const wxString& domain,
-                                wxLanguage msgIdLanguage,
-                                const wxString& msgIdCharset)
-{
-    gs_msgIdCharset[domain] = msgIdCharset;
-    return AddCatalog(domain, msgIdLanguage);
-}
-#endif // !wxUSE_UNICODE
-
-bool wxTranslations::AddCatalog(const wxString& domain,
-                                wxLanguage msgIdLanguage)
-{
-    const wxString msgIdLang = wxLocale::GetLanguageCanonicalName(msgIdLanguage);
-    const wxString domain_lang = ChooseLanguageForDomain(domain, msgIdLang);
-
-    if ( domain_lang.empty() )
-    {
-        wxLogTrace(TRACE_I18N,
-                    wxS("no suitable translation for domain '%s' found"),
-                    domain);
-        return false;
-    }
-
-    wxLogTrace(TRACE_I18N,
-                wxS("adding '%s' translation for domain '%s' (msgid language '%s')"),
-                domain_lang, domain, msgIdLang);
-
-    // It is OK to not load catalog if the msgid language and m_language match,
-    // in which case we can directly display the texts embedded in program's
-    // source code:
-    if ( msgIdLang == domain_lang )
-        return true;
-
-    return LoadCatalog(domain, domain_lang);
-}
-
-
-bool wxTranslations::LoadCatalog(const wxString& domain, const wxString& lang)
-{
-    m_loader->GetAvailableTranslations(domain);
-    wxCHECK_MSG( m_loader, false, "loader can't be NULL" );
-
-    wxMsgCatalog *cat = NULL;
-
-#if wxUSE_FONTMAP
-    // first look for the catalog for this language and the current locale:
-    // notice that we don't use the system name for the locale as this would
-    // force us to install catalogs in different locations depending on the
-    // system but always use the canonical name
-    wxFontEncoding encSys = wxLocale::GetSystemEncoding();
-    if ( encSys != wxFONTENCODING_SYSTEM )
-    {
-        wxString fullname(lang);
-        fullname << wxS('.') << wxFontMapperBase::GetEncodingName(encSys);
-
-        cat = m_loader->LoadCatalog(domain, fullname);
-    }
-#endif // wxUSE_FONTMAP
-
-    if ( !cat )
-    {
-        // Next try: use the provided name language name:
-        cat = m_loader->LoadCatalog(domain, lang);
-    }
-
-    if ( !cat )
-    {
-        // Also try just base locale name: for things like "fr_BE" (Belgium
-        // French) we should use fall back on plain "fr" if no Belgium-specific
-        // message catalogs exist
-        wxString baselang = lang.BeforeFirst('_');
-        if ( lang != baselang )
-            cat = m_loader->LoadCatalog(domain, baselang);
-    }
-
-    if ( cat )
-    {
-        // add it to the head of the list so that in GetString it will
-        // be searched before the catalogs added earlier
-        cat->m_pNext = m_pMsgCat;
-        m_pMsgCat = cat;
-
-        return true;
-    }
-    else
-    {
-        // Nothing worked, the catalog just isn't there
-        wxLogTrace(TRACE_I18N,
-                   "Catalog \"%s.mo\" not found for language \"%s\".",
-                   domain, lang);
-        return false;
-    }
-}
-
-// check if the given catalog is loaded
-bool wxTranslations::IsLoaded(const wxString& domain) const
-{
-    return FindCatalog(domain) != NULL;
-}
-
-
-wxString wxTranslations::ChooseLanguageForDomain(const wxString& WXUNUSED(domain),
-                                                 const wxString& WXUNUSED(msgIdLang))
-{
-    // explicitly set language should always be respected
-    if ( !m_lang.empty() )
-        return m_lang;
-
-    // TODO: if the default language is used, pick the best (by comparing
-    //       available languages with user's preferences), instead of blindly
-    //       trusting availability of system language translation
-    return wxLocale::GetLanguageCanonicalName(wxLocale::GetSystemLanguage());
-}
-
-
-namespace
-{
-WX_DECLARE_HASH_SET(wxString, ::wxStringHash, ::wxStringEqual,
-                    wxLocaleUntranslatedStrings);
-}
-
-/* static */
-const wxString& wxTranslations::GetUntranslatedString(const wxString& str)
-{
-    static wxLocaleUntranslatedStrings s_strings;
-
-    wxLocaleUntranslatedStrings::iterator i = s_strings.find(str);
-    if ( i == s_strings.end() )
-        return *s_strings.insert(str).first;
-
-    return *i;
-}
-
-
-const wxString& wxTranslations::GetString(const wxString& origString,
-                                          const wxString& domain) const
-{
-    return GetString(origString, origString, UINT_MAX, domain);
-}
-
-const wxString& wxTranslations::GetString(const wxString& origString,
-                                          const wxString& origString2,
-                                          unsigned n,
-                                          const wxString& domain) const
-{
-    if ( origString.empty() )
-        return GetUntranslatedString(origString);
-
-    const wxString *trans = NULL;
-    wxMsgCatalog *pMsgCat;
-
-    if ( !domain.empty() )
-    {
-        pMsgCat = FindCatalog(domain);
-
-        // does the catalog exist?
-        if ( pMsgCat != NULL )
-            trans = pMsgCat->GetString(origString, n);
-    }
-    else
-    {
-        // search in all domains
-        for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
-        {
-            trans = pMsgCat->GetString(origString, n);
-            if ( trans != NULL )   // take the first found
-                break;
-        }
-    }
-
-    if ( trans == NULL )
-    {
-        wxLogTrace
-        (
-            TRACE_I18N,
-            "string \"%s\"%s not found in %slocale '%s'.",
-            origString,
-            (n != UINT_MAX ? wxString::Format("[%ld]", (long)n) : wxString()),
-            (!domain.empty() ? wxString::Format("domain '%s' ", domain) : wxString()),
-            m_lang
-        );
-
-        if (n == UINT_MAX)
-            return GetUntranslatedString(origString);
-        else
-            return GetUntranslatedString(n == 1 ? origString : origString2);
-    }
-
-    return *trans;
-}
-
-
-wxString wxTranslations::GetHeaderValue(const wxString& header,
-                                        const wxString& domain) const
-{
-    if ( header.empty() )
-        return wxEmptyString;
-
-    const wxString *trans = NULL;
-    wxMsgCatalog *pMsgCat;
-
-    if ( !domain.empty() )
-    {
-        pMsgCat = FindCatalog(domain);
-
-        // does the catalog exist?
-        if ( pMsgCat == NULL )
-            return wxEmptyString;
-
-        trans = pMsgCat->GetString(wxEmptyString, UINT_MAX);
-    }
-    else
-    {
-        // search in all domains
-        for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
-        {
-            trans = pMsgCat->GetString(wxEmptyString, UINT_MAX);
-            if ( trans != NULL )   // take the first found
-                break;
-        }
-    }
-
-    if ( !trans || trans->empty() )
-        return wxEmptyString;
-
-    size_t found = trans->find(header);
-    if ( found == wxString::npos )
-        return wxEmptyString;
-
-    found += header.length() + 2 /* ': ' */;
-
-    // Every header is separated by \n
-
-    size_t endLine = trans->find(wxS('\n'), found);
-    size_t len = (endLine == wxString::npos) ?
-                wxString::npos : (endLine - found);
-
-    return trans->substr(found, len);
-}
-
-
-// find catalog by name in a linked list, return NULL if !found
-wxMsgCatalog *wxTranslations::FindCatalog(const wxString& domain) const
-{
-    // linear search in the linked list
-    wxMsgCatalog *pMsgCat;
-    for ( pMsgCat = m_pMsgCat; pMsgCat != NULL; pMsgCat = pMsgCat->m_pNext )
-    {
-        if ( pMsgCat->GetDomain() == domain )
-            return pMsgCat;
-    }
-
-    return NULL;
-}
-
-// ----------------------------------------------------------------------------
-// wxFileTranslationsLoader
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// the list of the directories to search for message catalog files
-wxArrayString gs_searchPrefixes;
-
-// return the directories to search for message catalogs under the given
-// prefix, separated by wxPATH_SEP
-wxString GetMsgCatalogSubdirs(const wxString& prefix, const wxString& lang)
-{
-    // Search first in Unix-standard prefix/lang/LC_MESSAGES, then in
-    // prefix/lang and finally in just prefix.
-    //
-    // Note that we use LC_MESSAGES on all platforms and not just Unix, because
-    // it doesn't cost much to look into one more directory and doing it this
-    // way has two important benefits:
-    // a) we don't break compatibility with wx-2.6 and older by stopping to
-    //    look in a directory where the catalogs used to be and thus silently
-    //    breaking apps after they are recompiled against the latest wx
-    // b) it makes it possible to package app's support files in the same
-    //    way on all target platforms
-    const wxString pathPrefix = wxFileName(prefix, lang).GetFullPath();
-
-    wxString searchPath;
-    searchPath.reserve(4*pathPrefix.length());
-    searchPath << pathPrefix << wxFILE_SEP_PATH << "LC_MESSAGES" << wxPATH_SEP
-            << prefix << wxFILE_SEP_PATH << wxPATH_SEP
-            << pathPrefix;
-
-    return searchPath;
-}
-
-bool HasMsgCatalogInDir(const wxString& dir, const wxString& domain)
-{
-    return wxFileName(dir, domain, "mo").FileExists() ||
-           wxFileName(dir + wxFILE_SEP_PATH + "LC_MESSAGES", domain, "mo").FileExists();
-}
-
-// get prefixes to locale directories; if lang is empty, don't point to
-// OSX's .lproj bundles
-wxArrayString GetSearchPrefixes(const wxString& lang = wxString())
-{
-    wxArrayString paths;
-
-    // first take the entries explicitly added by the program
-    paths = gs_searchPrefixes;
-
-#if wxUSE_STDPATHS
-    // then look in the standard location
-    wxString stdp;
-    if ( lang.empty() )
-    {
-        stdp = wxStandardPaths::Get().GetResourcesDir();
-    }
-    else
-    {
-        stdp = wxStandardPaths::Get().
-            GetLocalizedResourcesDir(lang, wxStandardPaths::ResourceCat_Messages);
-    }
-    if ( paths.Index(stdp) == wxNOT_FOUND )
-        paths.Add(stdp);
-#endif // wxUSE_STDPATHS
-
-    // last look in default locations
-#ifdef __UNIX__
-    // LC_PATH is a standard env var containing the search path for the .mo
-    // files
-    const char *pszLcPath = wxGetenv("LC_PATH");
-    if ( pszLcPath )
-    {
-        const wxString lcp = pszLcPath;
-        if ( paths.Index(lcp) == wxNOT_FOUND )
-            paths.Add(lcp);
-    }
-
-    // also add the one from where wxWin was installed:
-    wxString wxp = wxGetInstallPrefix();
-    if ( !wxp.empty() )
-    {
-        wxp += wxS("/share/locale");
-        if ( paths.Index(wxp) == wxNOT_FOUND )
-            paths.Add(wxp);
-    }
-#endif // __UNIX__
-
-    return paths;
-}
-
-// construct the search path for the given language
-wxString GetFullSearchPath(const wxString& lang)
-{
-    wxString searchPath;
-    searchPath.reserve(500);
-
-    const wxArrayString prefixes = GetSearchPrefixes(lang);
-
-    for ( wxArrayString::const_iterator i = prefixes.begin();
-          i != prefixes.end();
-          ++i )
-    {
-        const wxString p = GetMsgCatalogSubdirs(*i, lang);
-
-        if ( !searchPath.empty() )
-            searchPath += wxPATH_SEP;
-        searchPath += p;
-    }
-
-    return searchPath;
-}
-
-} // anonymous namespace
-
-
-void wxFileTranslationsLoader::AddCatalogLookupPathPrefix(const wxString& prefix)
-{
-    if ( gs_searchPrefixes.Index(prefix) == wxNOT_FOUND )
-    {
-        gs_searchPrefixes.Add(prefix);
-    }
-    //else: already have it
-}
-
-
-wxMsgCatalog *wxFileTranslationsLoader::LoadCatalog(const wxString& domain,
-                                                    const wxString& lang)
-{
-    wxString searchPath = GetFullSearchPath(lang);
-
-    wxLogTrace(TRACE_I18N, wxS("Looking for \"%s.mo\" in search path \"%s\""),
-                domain, searchPath);
-
-    wxFileName fn(domain);
-    fn.SetExt(wxS("mo"));
-
-    wxString strFullName;
-    if ( !wxFindFileInPath(&strFullName, searchPath, fn.GetFullPath()) )
-        return NULL;
-
-    // open file and read its data
-    wxLogVerbose(_("using catalog '%s' from '%s'."), domain, strFullName.c_str());
-    wxLogTrace(TRACE_I18N, wxS("Using catalog \"%s\"."), strFullName.c_str());
-
-    return wxMsgCatalog::CreateFromFile(strFullName, domain);
-}
-
-
-wxArrayString wxFileTranslationsLoader::GetAvailableTranslations(const wxString& domain) const
-{
-    wxArrayString langs;
-    const wxArrayString prefixes = GetSearchPrefixes();
-
-    wxLogTrace(TRACE_I18N,
-               "looking for available translations of \"%s\" in search path \"%s\"",
-               domain, wxJoin(prefixes, wxPATH_SEP[0]));
-
-    for ( wxArrayString::const_iterator i = prefixes.begin();
-          i != prefixes.end();
-          ++i )
-    {
-        if ( i->empty() )
-            continue;
-        wxDir dir;
-        if ( !dir.Open(*i) )
-            continue;
-
-        wxString lang;
-        for ( bool ok = dir.GetFirst(&lang, "", wxDIR_DIRS);
-              ok;
-              ok = dir.GetNext(&lang) )
-        {
-            const wxString langdir = *i + wxFILE_SEP_PATH + lang;
-            if ( HasMsgCatalogInDir(langdir, domain) )
-            {
-#ifdef __WXOSX__
-                wxString rest;
-                if ( lang.EndsWith(".lproj", &rest) )
-                    lang = rest;
-#endif // __WXOSX__
-
-                wxLogTrace(TRACE_I18N,
-                           "found %s translation of \"%s\"", lang, domain);
-                langs.push_back(lang);
-            }
-        }
-    }
-
-    return langs;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxResourceTranslationsLoader
-// ----------------------------------------------------------------------------
-
-#ifdef __WINDOWS__
-
-wxMsgCatalog *wxResourceTranslationsLoader::LoadCatalog(const wxString& domain,
-                                                        const wxString& lang)
-{
-    const void *mo_data = NULL;
-    size_t mo_size = 0;
-
-    const wxString resname = wxString::Format("%s_%s", domain, lang);
-
-    if ( !wxLoadUserResource(&mo_data, &mo_size,
-                             resname,
-                             GetResourceType(),
-                             GetModule()) )
-        return NULL;
-
-    wxLogTrace(TRACE_I18N,
-               "Using catalog from Windows resource \"%s\".", resname);
-
-    wxMsgCatalog *cat = wxMsgCatalog::CreateFromData(
-        wxCharBuffer::CreateNonOwned(static_cast<const char*>(mo_data), mo_size),
-        domain);
-
-    if ( !cat )
-    {
-        wxLogWarning(_("Resource '%s' is not a valid message catalog."), resname);
-    }
-
-    return cat;
-}
-
-namespace
-{
-
-struct EnumCallbackData
-{
-    wxString prefix;
-    wxArrayString langs;
-};
-
-BOOL CALLBACK EnumTranslations(HMODULE WXUNUSED(hModule),
-                               LPCTSTR WXUNUSED(lpszType),
-                               LPTSTR lpszName,
-                               LONG_PTR lParam)
-{
-    wxString name(lpszName);
-    name.MakeLower(); // resource names are case insensitive
-
-    EnumCallbackData *data = reinterpret_cast<EnumCallbackData*>(lParam);
-
-    wxString lang;
-    if ( name.StartsWith(data->prefix, &lang) && !lang.empty() )
-        data->langs.push_back(lang);
-
-    return TRUE; // continue enumeration
-}
-
-} // anonymous namespace
-
-
-wxArrayString wxResourceTranslationsLoader::GetAvailableTranslations(const wxString& domain) const
-{
-    EnumCallbackData data;
-    data.prefix = domain + "_";
-    data.prefix.MakeLower(); // resource names are case insensitive
-
-    if ( !EnumResourceNames(GetModule(),
-                            GetResourceType().t_str(),
-                            EnumTranslations,
-                            reinterpret_cast<LONG_PTR>(&data)) )
-    {
-        const DWORD err = GetLastError();
-        if ( err != NO_ERROR && err != ERROR_RESOURCE_TYPE_NOT_FOUND )
-        {
-            wxLogSysError(_("Couldn't enumerate translations"));
-        }
-    }
-
-    return data.langs;
-}
-
-#endif // __WINDOWS__
-
-
-// ----------------------------------------------------------------------------
-// wxTranslationsModule module (for destruction of gs_translations)
-// ----------------------------------------------------------------------------
-
-class wxTranslationsModule: public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxTranslationsModule)
-    public:
-        wxTranslationsModule() {}
-
-        bool OnInit()
-        {
-            return true;
-        }
-
-        void OnExit()
-        {
-            if ( gs_translationsOwned )
-                delete gs_translations;
-            gs_translations = NULL;
-            gs_translationsOwned = true;
-        }
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxTranslationsModule, wxModule)
-
-#endif // wxUSE_INTL
diff --git a/Source/3rd Party/wx/src/common/treebase.cpp b/Source/3rd Party/wx/src/common/treebase.cpp
index d4a82b5d7..8613ab1d3 100644
--- a/Source/3rd Party/wx/src/common/treebase.cpp	
+++ b/Source/3rd Party/wx/src/common/treebase.cpp	
@@ -1,376 +1,239 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/treebase.cpp
-// Purpose:     Base wxTreeCtrl classes
-// Author:      Julian Smart
-// Created:     01/02/97
-// Modified:
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart et al
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// =============================================================================
-// declarations
-// =============================================================================
-
-// -----------------------------------------------------------------------------
-// headers
-// -----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_TREECTRL
-
-#include "wx/treectrl.h"
-#include "wx/imaglist.h"
-
-extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[] = "treeCtrl";
-
-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_BEGIN_RDRAG, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_END_LABEL_EDIT, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_DELETE_ITEM, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_GET_INFO, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_SET_INFO, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_EXPANDED, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_EXPANDING, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_SEL_CHANGING, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_KEY_DOWN, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_END_DRAG, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, wxTreeEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEvent );
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxTreeCtrlStyle )
-wxBEGIN_FLAGS( wxTreeCtrlStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxFLAGS_MEMBER(wxTR_EDIT_LABELS)
-wxFLAGS_MEMBER(wxTR_NO_BUTTONS)
-wxFLAGS_MEMBER(wxTR_HAS_BUTTONS)
-wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS)
-wxFLAGS_MEMBER(wxTR_NO_LINES)
-wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT)
-wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT)
-wxFLAGS_MEMBER(wxTR_HIDE_ROOT)
-wxFLAGS_MEMBER(wxTR_ROW_LINES)
-wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT)
-wxFLAGS_MEMBER(wxTR_SINGLE)
-wxFLAGS_MEMBER(wxTR_MULTIPLE)
-#if WXWIN_COMPATIBILITY_2_8
-wxFLAGS_MEMBER(wxTR_EXTENDED)
-#endif
-wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
-wxEND_FLAGS( wxTreeCtrlStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl, "wx/treectrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
-wxEVENT_PROPERTY( TextUpdated, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent )
-wxEVENT_RANGE_PROPERTY( TreeEvent, wxEVT_COMMAND_TREE_BEGIN_DRAG, \
-                       wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, wxTreeEvent )
-
-wxPROPERTY_FLAGS( WindowStyle, wxTreeCtrlStyle, long, SetWindowStyleFlag, \
-                 GetWindowStyleFlag, wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                 wxT("Helpstring"), wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxTreeCtrl)
-
-wxCONSTRUCTOR_5( wxTreeCtrl, wxWindow*, Parent, wxWindowID, Id, \
-                wxPoint, Position, wxSize, Size, long, WindowStyle )
-
-// ----------------------------------------------------------------------------
-// Tree event
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
-
-wxTreeEvent::wxTreeEvent(wxEventType commandType,
-                         wxTreeCtrlBase *tree,
-                         const wxTreeItemId& item)
-           : wxNotifyEvent(commandType, tree->GetId()),
-             m_item(item)
-{
-    m_editCancelled = false;
-
-    SetEventObject(tree);
-
-    if ( item.IsOk() )
-        SetClientObject(tree->GetItemData(item));
-}
-
-wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
-           : wxNotifyEvent(commandType, id)
-{
-    m_itemOld = 0l;
-    m_editCancelled = false;
-}
-
-wxTreeEvent::wxTreeEvent(const wxTreeEvent & event)
-           : wxNotifyEvent(event)
-{
-    m_evtKey = event.m_evtKey;
-    m_item = event.m_item;
-    m_itemOld = event.m_itemOld;
-    m_pointDrag = event.m_pointDrag;
-    m_label = event.m_label;
-    m_editCancelled = event.m_editCancelled;
-}
-
-// ----------------------------------------------------------------------------
-// wxTreeCtrlBase
-// ----------------------------------------------------------------------------
-
-wxTreeCtrlBase::wxTreeCtrlBase()
-{
-    m_imageListNormal =
-    m_imageListState = NULL;
-    m_ownsImageListNormal =
-    m_ownsImageListState = false;
-
-    // arbitrary default
-    m_spacing = 18;
-
-    // quick DoGetBestSize calculation
-    m_quickBestSize = true;
-
-    Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(wxTreeCtrlBase::OnCharHook));
-}
-
-wxTreeCtrlBase::~wxTreeCtrlBase()
-{
-    if (m_ownsImageListNormal)
-        delete m_imageListNormal;
-    if (m_ownsImageListState)
-        delete m_imageListState;
-}
-
-void wxTreeCtrlBase::SetItemState(const wxTreeItemId& item, int state)
-{
-    if ( state == wxTREE_ITEMSTATE_NEXT )
-    {
-        int current = GetItemState(item);
-        if ( current == wxTREE_ITEMSTATE_NONE )
-            return;
-        state = current + 1;
-        if ( m_imageListState && state >= m_imageListState->GetImageCount() )
-            state = 0;
-    }
-    else if ( state == wxTREE_ITEMSTATE_PREV )
-    {
-        int current = GetItemState(item);
-        if ( current == wxTREE_ITEMSTATE_NONE )
-            return;
-        state = current - 1;
-        if ( state == -1 )
-            state = m_imageListState ? m_imageListState->GetImageCount() - 1 : 0;
-    }
-    // else: wxTREE_ITEMSTATE_NONE depending on platform
-
-    DoSetItemState(item, state);
-}
-
-static void
-wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, wxTreeItemId id, wxSize& size)
-{
-    wxRect rect;
-
-    if ( treeCtrl->GetBoundingRect(id, rect, true /* just the item */) )
-    {
-        // Translate to logical position so we get the full extent
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
-        rect.x += treeCtrl->GetScrollPos(wxHORIZONTAL);
-        rect.y += treeCtrl->GetScrollPos(wxVERTICAL);
-#endif
-
-        size.IncTo(wxSize(rect.GetRight(), rect.GetBottom()));
-    }
-
-    wxTreeItemIdValue cookie;
-    for ( wxTreeItemId item = treeCtrl->GetFirstChild(id, cookie);
-          item.IsOk();
-          item = treeCtrl->GetNextChild(id, cookie) )
-    {
-        wxGetBestTreeSize(treeCtrl, item, size);
-    }
-}
-
-wxSize wxTreeCtrlBase::DoGetBestSize() const
-{
-    wxSize size;
-
-    // this doesn't really compute the total bounding rectangle of all items
-    // but a not too bad guess of it which has the advantage of not having to
-    // examine all (potentially hundreds or thousands) items in the control
-
-    if (GetQuickBestSize())
-    {
-        for ( wxTreeItemId item = GetRootItem();
-              item.IsOk();
-              item = GetLastChild(item) )
-        {
-            wxRect rect;
-
-            // last parameter is "true" to get only the dimensions of the text
-            // label, we don't want to get the entire item width as it's determined
-            // by the current size
-            if ( GetBoundingRect(item, rect, true) )
-            {
-                if ( size.x < rect.x + rect.width )
-                    size.x = rect.x + rect.width;
-                if ( size.y < rect.y + rect.height )
-                    size.y = rect.y + rect.height;
-            }
-        }
-    }
-    else // use precise, if potentially slow, size computation method
-    {
-        // iterate over all items recursively
-        wxTreeItemId idRoot = GetRootItem();
-        if ( idRoot.IsOk() )
-            wxGetBestTreeSize(this, idRoot, size);
-    }
-
-    // need some minimal size even for empty tree
-    if ( !size.x || !size.y )
-        size = wxControl::DoGetBestSize();
-    else
-    {
-        // Add border size
-        size += GetWindowBorderSize();
-
-        CacheBestSize(size);
-    }
-
-    return size;
-}
-
-void wxTreeCtrlBase::ExpandAll()
-{
-    if ( IsEmpty() )
-        return;
-
-    ExpandAllChildren(GetRootItem());
-}
-
-void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
-{
-    Freeze();
-    // expand this item first, this might result in its children being added on
-    // the fly
-    if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) )
-        Expand(item);
-    //else: expanding hidden root item is unsupported and unnecessary
-
-    // then (recursively) expand all the children
-    wxTreeItemIdValue cookie;
-    for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);
-          idCurr.IsOk();
-          idCurr = GetNextChild(item, cookie) )
-    {
-        ExpandAllChildren(idCurr);
-    }
-    Thaw();
-}
-
-void wxTreeCtrlBase::CollapseAll()
-{
-    if ( IsEmpty() )
-        return;
-
-    CollapseAllChildren(GetRootItem());
-}
-
-void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
-{
-    Freeze();
-    // first (recursively) collapse all the children
-    wxTreeItemIdValue cookie;
-    for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);
-          idCurr.IsOk();
-          idCurr = GetNextChild(item, cookie) )
-    {
-        CollapseAllChildren(idCurr);
-    }
-
-    // then collapse this element too unless it's the hidden root which can't
-    // be collapsed
-    if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) )
-        Collapse(item);
-    Thaw();
-}
-
-bool wxTreeCtrlBase::IsEmpty() const
-{
-    return !GetRootItem().IsOk();
-}
-
-void wxTreeCtrlBase::OnCharHook(wxKeyEvent& event)
-{
-    if ( GetEditControl() )
-    {
-        bool discardChanges = false;
-        switch ( event.GetKeyCode() )
-        {
-            case WXK_ESCAPE:
-                discardChanges = true;
-                // fall through
-
-            case WXK_RETURN:
-                EndEditLabel(GetFocusedItem(), discardChanges);
-
-                // Do not call Skip() below.
-                return;
-        }
-    }
-
-    event.Skip();
-}
-
-#endif // wxUSE_TREECTRL
+/////////////////////////////////////////////////////////////////////////////
+// Name:        treebase.cpp
+// Purpose:     Base wxTreeCtrl classes
+// Author:      Julian Smart
+// Created:     01/02/97
+// Modified:
+// Id:          $Id: treebase.cpp 51356 2008-01-24 11:23:30Z VZ $
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart et al
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// =============================================================================
+// declarations
+// =============================================================================
+
+// -----------------------------------------------------------------------------
+// headers
+// -----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_TREECTRL
+
+#include "wx/treectrl.h"
+#include "wx/imaglist.h"
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_BEGIN_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_BEGIN_RDRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_END_LABEL_EDIT)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_DELETE_ITEM)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_GET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_SET_INFO)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_EXPANDED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_EXPANDING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_COLLAPSED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_COLLAPSING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_SEL_CHANGING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_KEY_DOWN)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_ACTIVATED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_END_DRAG)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TREE_ITEM_MENU)
+
+// ----------------------------------------------------------------------------
+// Tree event
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxTreeEvent, wxNotifyEvent)
+
+
+wxTreeEvent::wxTreeEvent(wxEventType commandType,
+                         wxTreeCtrlBase *tree,
+                         const wxTreeItemId& item)
+           : wxNotifyEvent(commandType, tree->GetId()),
+             m_item(item)
+{
+    m_editCancelled = false;
+
+    SetEventObject(tree);
+
+    if ( item.IsOk() )
+        SetClientObject(tree->GetItemData(item));
+}
+
+wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
+           : wxNotifyEvent(commandType, id)
+{
+    m_itemOld = 0l;
+    m_editCancelled = false;
+}
+
+wxTreeEvent::wxTreeEvent(const wxTreeEvent & event)
+           : wxNotifyEvent(event)
+{
+    m_evtKey = event.m_evtKey;
+    m_item = event.m_item;
+    m_itemOld = event.m_itemOld;
+    m_pointDrag = event.m_pointDrag;
+    m_label = event.m_label;
+    m_editCancelled = event.m_editCancelled;
+}
+
+// ----------------------------------------------------------------------------
+// wxTreeCtrlBase
+// ----------------------------------------------------------------------------
+
+wxTreeCtrlBase::~wxTreeCtrlBase()
+{
+    if (m_ownsImageListNormal)
+        delete m_imageListNormal;
+    if (m_ownsImageListState)
+        delete m_imageListState;
+}
+
+static void
+wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, wxTreeItemId id, wxSize& size)
+{
+    wxRect rect;
+
+    if ( treeCtrl->GetBoundingRect(id, rect, true /* just the item */) )
+    {
+        // Translate to logical position so we get the full extent
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+        rect.x += treeCtrl->GetScrollPos(wxHORIZONTAL);
+        rect.y += treeCtrl->GetScrollPos(wxVERTICAL);
+#endif
+
+        size.IncTo(wxSize(rect.GetRight(), rect.GetBottom()));
+    }
+
+    wxTreeItemIdValue cookie;
+    for ( wxTreeItemId item = treeCtrl->GetFirstChild(id, cookie);
+          item.IsOk();
+          item = treeCtrl->GetNextChild(id, cookie) )
+    {
+        wxGetBestTreeSize(treeCtrl, item, size);
+    }
+}
+
+wxSize wxTreeCtrlBase::DoGetBestSize() const
+{
+    wxSize size;
+
+    // this doesn't really compute the total bounding rectangle of all items
+    // but a not too bad guess of it which has the advantage of not having to
+    // examine all (potentially hundreds or thousands) items in the control
+
+    if (GetQuickBestSize())
+    {
+        for ( wxTreeItemId item = GetRootItem();
+              item.IsOk();
+              item = GetLastChild(item) )
+        {
+            wxRect rect;
+
+            // last parameter is "true" to get only the dimensions of the text
+            // label, we don't want to get the entire item width as it's determined
+            // by the current size
+            if ( GetBoundingRect(item, rect, true) )
+            {
+                if ( size.x < rect.x + rect.width )
+                    size.x = rect.x + rect.width;
+                if ( size.y < rect.y + rect.height )
+                    size.y = rect.y + rect.height;
+            }
+        }
+    }
+    else // use precise, if potentially slow, size computation method
+    {
+        // iterate over all items recursively
+        wxTreeItemId idRoot = GetRootItem();
+        if ( idRoot.IsOk() )
+            wxGetBestTreeSize(this, idRoot, size);
+    }
+
+    // need some minimal size even for empty tree
+    if ( !size.x || !size.y )
+        size = wxControl::DoGetBestSize();
+    else
+    {
+        // Add border size
+        size += GetWindowBorderSize();
+
+        CacheBestSize(size);
+    }
+
+    return size;
+}
+
+void wxTreeCtrlBase::ExpandAll()
+{
+    if ( IsEmpty() )
+        return;
+
+    ExpandAllChildren(GetRootItem());
+}
+
+void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
+{
+    // expand this item first, this might result in its children being added on
+    // the fly
+    if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) )
+        Expand(item);
+    //else: expanding hidden root item is unsupported and unnecessary
+
+    // then (recursively) expand all the children
+    wxTreeItemIdValue cookie;
+    for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);
+          idCurr.IsOk();
+          idCurr = GetNextChild(item, cookie) )
+    {
+        ExpandAllChildren(idCurr);
+    }
+}
+
+void wxTreeCtrlBase::CollapseAll()
+{
+    if ( IsEmpty() )
+        return;
+
+    CollapseAllChildren(GetRootItem());
+}
+
+void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
+{
+    // first (recursively) collapse all the children
+    wxTreeItemIdValue cookie;
+    for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);
+          idCurr.IsOk();
+          idCurr = GetNextChild(item, cookie) )
+    {
+        CollapseAllChildren(idCurr);
+    }
+
+    // then collapse this element too
+    Collapse(item);
+}
+
+bool wxTreeCtrlBase::IsEmpty() const
+{
+    return !GetRootItem().IsOk();
+}
+
+#endif // wxUSE_TREECTRL
+
diff --git a/Source/3rd Party/wx/src/common/txtstrm.cpp b/Source/3rd Party/wx/src/common/txtstrm.cpp
index 7878ea565..3dad17012 100644
--- a/Source/3rd Party/wx/src/common/txtstrm.cpp	
+++ b/Source/3rd Party/wx/src/common/txtstrm.cpp	
@@ -1,544 +1,520 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/txtstrm.cpp
-// Purpose:     Text stream classes
-// Author:      Guilhem Lavaux
-// Modified by:
-// Created:     28/06/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS
-
-#include "wx/txtstrm.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/crt.h"
-#endif
-
-#include <ctype.h>
-
-// ----------------------------------------------------------------------------
-// wxTextInputStream
-// ----------------------------------------------------------------------------
-
-#if wxUSE_UNICODE
-wxTextInputStream::wxTextInputStream(wxInputStream &s,
-                                     const wxString &sep,
-                                     const wxMBConv& conv)
-  : m_input(s), m_separators(sep), m_conv(conv.Clone())
-{
-    memset((void*)m_lastBytes, 0, 10);
-}
-#else
-wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
-  : m_input(s), m_separators(sep)
-{
-    memset((void*)m_lastBytes, 0, 10);
-}
-#endif
-
-wxTextInputStream::~wxTextInputStream()
-{
-#if wxUSE_UNICODE
-    delete m_conv;
-#endif // wxUSE_UNICODE
-}
-
-void wxTextInputStream::UngetLast()
-{
-    size_t byteCount = 0;
-    while(m_lastBytes[byteCount]) // pseudo ANSI strlen (even for Unicode!)
-        byteCount++;
-    m_input.Ungetch(m_lastBytes, byteCount);
-    memset((void*)m_lastBytes, 0, 10);
-}
-
-wxChar wxTextInputStream::NextChar()
-{
-#if wxUSE_UNICODE
-    wxChar wbuf[2];
-    memset((void*)m_lastBytes, 0, 10);
-    for(size_t inlen = 0; inlen < 9; inlen++)
-    {
-        // actually read the next character
-        m_lastBytes[inlen] = m_input.GetC();
-
-        if(m_input.LastRead() <= 0)
-            return wxEOT;
-
-        switch ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1) )
-        {
-            case 0:
-                // this is a bug in converter object as it should either fail
-                // or decode non-empty string to something non-empty
-                wxFAIL_MSG("ToWChar() can't return 0 for non-empty input");
-                break;
-
-            case wxCONV_FAILED:
-                // the buffer probably doesn't contain enough bytes to decode
-                // as a complete character, try with more bytes
-                break;
-
-            default:
-                // if we couldn't decode a single character during the last
-                // loop iteration we shouldn't be able to decode 2 or more of
-                // them with an extra single byte, something fishy is going on
-                wxFAIL_MSG("unexpected decoding result");
-                // fall through nevertheless and return at least something
-
-            case 1:
-                // we finally decoded a character
-                return wbuf[0];
-        }
-    }
-
-    // there should be no encoding which requires more than nine bytes for one
-    // character so something must be wrong with our conversion but we have no
-    // way to signal it from here
-    return wxEOT;
-#else
-    m_lastBytes[0] = m_input.GetC();
-
-    if(m_input.LastRead() <= 0)
-        return wxEOT;
-
-    return m_lastBytes[0];
-#endif
-
-}
-
-wxChar wxTextInputStream::NextNonSeparators()
-{
-    for (;;)
-    {
-        wxChar c = NextChar();
-        if (c == wxEOT) return (wxChar) 0;
-
-        if (c != wxT('\n') &&
-            c != wxT('\r') &&
-            m_separators.Find(c) < 0)
-          return c;
-    }
-
-}
-
-bool wxTextInputStream::EatEOL(const wxChar &c)
-{
-    if (c == wxT('\n')) return true; // eat on UNIX
-
-    if (c == wxT('\r')) // eat on both Mac and DOS
-    {
-        wxChar c2 = NextChar();
-        if(c2 == wxEOT) return true; // end of stream reached, had enough :-)
-
-        if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac
-        return true;
-    }
-
-    return false;
-}
-
-wxUint32 wxTextInputStream::Read32(int base)
-{
-    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
-    if(!m_input) return 0;
-
-    wxString word = ReadWord();
-    if(word.empty())
-        return 0;
-    return wxStrtoul(word.c_str(), 0, base);
-}
-
-wxUint16 wxTextInputStream::Read16(int base)
-{
-    return (wxUint16)Read32(base);
-}
-
-wxUint8 wxTextInputStream::Read8(int base)
-{
-    return (wxUint8)Read32(base);
-}
-
-wxInt32 wxTextInputStream::Read32S(int base)
-{
-    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );
-    if(!m_input) return 0;
-
-    wxString word = ReadWord();
-    if(word.empty())
-        return 0;
-    return wxStrtol(word.c_str(), 0, base);
-}
-
-wxInt16 wxTextInputStream::Read16S(int base)
-{
-    return (wxInt16)Read32S(base);
-}
-
-wxInt8 wxTextInputStream::Read8S(int base)
-{
-    return (wxInt8)Read32S(base);
-}
-
-double wxTextInputStream::ReadDouble()
-{
-    if(!m_input) return 0;
-    wxString word = ReadWord();
-    if(word.empty())
-        return 0;
-    return wxStrtod(word.c_str(), 0);
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-
-wxString wxTextInputStream::ReadString()
-{
-    return ReadLine();
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
-wxString wxTextInputStream::ReadLine()
-{
-    wxString line;
-
-    while ( !m_input.Eof() )
-    {
-        wxChar c = NextChar();
-        if(c == wxEOT)
-            break;
-
-        if (EatEOL(c))
-            break;
-
-        line += c;
-    }
-
-    return line;
-}
-
-wxString wxTextInputStream::ReadWord()
-{
-    wxString word;
-
-    if ( !m_input )
-        return word;
-
-    wxChar c = NextNonSeparators();
-    if ( !c )
-        return word;
-
-    word += c;
-
-    while ( !m_input.Eof() )
-    {
-        c = NextChar();
-        if(c == wxEOT)
-            break;
-
-        if (m_separators.Find(c) >= 0)
-            break;
-
-        if (EatEOL(c))
-            break;
-
-        word += c;
-    }
-
-    return word;
-}
-
-wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
-{
-    word = ReadWord();
-    return *this;
-}
-
-wxTextInputStream& wxTextInputStream::operator>>(char& c)
-{
-    c = m_input.GetC();
-    if(m_input.LastRead() <= 0) c = 0;
-
-    if (EatEOL(c))
-        c = '\n';
-
-    return *this;
-}
-
-#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
-
-wxTextInputStream& wxTextInputStream::operator>>(wchar_t& wc)
-{
-    wc = GetChar();
-
-    return *this;
-}
-
-#endif // wxUSE_UNICODE
-
-wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
-{
-    i = (wxInt16)Read16();
-    return *this;
-}
-
-wxTextInputStream& wxTextInputStream::operator>>(wxInt32& i)
-{
-    i = (wxInt32)Read32();
-    return *this;
-}
-
-wxTextInputStream& wxTextInputStream::operator>>(wxUint16& i)
-{
-    i = Read16();
-    return *this;
-}
-
-wxTextInputStream& wxTextInputStream::operator>>(wxUint32& i)
-{
-    i = Read32();
-    return *this;
-}
-
-wxTextInputStream& wxTextInputStream::operator>>(double& i)
-{
-    i = ReadDouble();
-    return *this;
-}
-
-wxTextInputStream& wxTextInputStream::operator>>(float& f)
-{
-    f = (float)ReadDouble();
-    return *this;
-}
-
-
-
-#if wxUSE_UNICODE
-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s,
-                                       wxEOL mode,
-                                       const wxMBConv& conv)
-  : m_output(s), m_conv(conv.Clone())
-#else
-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
-  : m_output(s)
-#endif
-{
-    m_mode = mode;
-    if (m_mode == wxEOL_NATIVE)
-    {
-#if defined(__WINDOWS__) || defined(__WXPM__)
-        m_mode = wxEOL_DOS;
-#else
-        m_mode = wxEOL_UNIX;
-#endif
-    }
-}
-
-wxTextOutputStream::~wxTextOutputStream()
-{
-#if wxUSE_UNICODE
-    delete m_conv;
-#endif // wxUSE_UNICODE
-}
-
-void wxTextOutputStream::SetMode(wxEOL mode)
-{
-    m_mode = mode;
-    if (m_mode == wxEOL_NATIVE)
-    {
-#if defined(__WINDOWS__) || defined(__WXPM__)
-        m_mode = wxEOL_DOS;
-#else
-        m_mode = wxEOL_UNIX;
-#endif
-    }
-}
-
-void wxTextOutputStream::Write32(wxUint32 i)
-{
-    wxString str;
-    str.Printf(wxT("%u"), i);
-
-    WriteString(str);
-}
-
-void wxTextOutputStream::Write16(wxUint16 i)
-{
-    wxString str;
-    str.Printf(wxT("%u"), (unsigned)i);
-
-    WriteString(str);
-}
-
-void wxTextOutputStream::Write8(wxUint8 i)
-{
-    wxString str;
-    str.Printf(wxT("%u"), (unsigned)i);
-
-    WriteString(str);
-}
-
-void wxTextOutputStream::WriteDouble(double d)
-{
-    wxString str;
-
-    str.Printf(wxT("%f"), d);
-    WriteString(str);
-}
-
-void wxTextOutputStream::WriteString(const wxString& string)
-{
-    size_t len = string.length();
-
-    wxString out;
-    out.reserve(len);
-
-    for ( size_t i = 0; i < len; i++ )
-    {
-        const wxChar c = string[i];
-        if ( c == wxT('\n') )
-        {
-            switch ( m_mode )
-            {
-                case wxEOL_DOS:
-                    out << wxT("\r\n");
-                    continue;
-
-                case wxEOL_MAC:
-                    out << wxT('\r');
-                    continue;
-
-                default:
-                    wxFAIL_MSG( wxT("unknown EOL mode in wxTextOutputStream") );
-                    // fall through
-
-                case wxEOL_UNIX:
-                    // don't treat '\n' specially
-                    ;
-            }
-        }
-
-        out << c;
-    }
-
-#if wxUSE_UNICODE
-    // FIXME-UTF8: use wxCharBufferWithLength if/when we have it
-    wxCharBuffer buffer = m_conv->cWC2MB(out.wc_str(), out.length(), &len);
-    m_output.Write(buffer, len);
-#else
-    m_output.Write(out.c_str(), out.length() );
-#endif
-}
-
-wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
-{
-#if wxUSE_UNICODE
-    WriteString( wxString(&c, *m_conv, 1) );
-#else
-    WriteString( wxString(&c, wxConvLocal, 1) );
-#endif
-    return *this;
-}
-
-void wxTextOutputStream::Flush()
-{
-#if wxUSE_UNICODE
-    const size_t len = m_conv->FromWChar(NULL, 0, L"", 1);
-    if ( len > m_conv->GetMBNulLen() )
-    {
-        wxCharBuffer buf(len);
-        m_conv->FromWChar(buf.data(), len, L"", 1);
-        m_output.Write(buf, len - m_conv->GetMBNulLen());
-    }
-#endif // wxUSE_UNICODE
-}
-
-wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
-{
-    WriteString( string );
-    return *this;
-}
-
-wxTextOutputStream& wxTextOutputStream::operator<<(char c)
-{
-    WriteString( wxString::FromAscii(c) );
-
-    return *this;
-}
-
-#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
-
-wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
-{
-    WriteString( wxString(&wc, *m_conv, 1) );
-
-    return *this;
-}
-
-#endif // wxUSE_UNICODE
-
-wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
-{
-    wxString str;
-    str.Printf(wxT("%d"), (signed int)c);
-    WriteString(str);
-
-    return *this;
-}
-
-wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
-{
-    wxString str;
-    str.Printf(wxT("%ld"), (signed long)c);
-    WriteString(str);
-
-    return *this;
-}
-
-wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
-{
-    wxString str;
-    str.Printf(wxT("%u"), (unsigned int)c);
-    WriteString(str);
-
-    return *this;
-}
-
-wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
-{
-    wxString str;
-    str.Printf(wxT("%lu"), (unsigned long)c);
-    WriteString(str);
-
-    return *this;
-}
-
-wxTextOutputStream &wxTextOutputStream::operator<<(double f)
-{
-    WriteDouble(f);
-    return *this;
-}
-
-wxTextOutputStream& wxTextOutputStream::operator<<(float f)
-{
-    WriteDouble((double)f);
-    return *this;
-}
-
-wxTextOutputStream &endl( wxTextOutputStream &stream )
-{
-    return stream.PutChar(wxT('\n'));
-}
-
-#endif
-  // wxUSE_STREAMS
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/txtstrm.cpp
+// Purpose:     Text stream classes
+// Author:      Guilhem Lavaux
+// Modified by:
+// Created:     28/06/98
+// RCS-ID:      $Id: txtstrm.cpp 48920 2007-09-24 13:11:36Z JS $
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS
+
+#include "wx/txtstrm.h"
+#include <ctype.h>
+
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// Unix: "\n"
+// Dos:  "\r\n"
+// Mac:  "\r"
+
+// ----------------------------------------------------------------------------
+// wxTextInputStream
+// ----------------------------------------------------------------------------
+
+#if wxUSE_UNICODE
+wxTextInputStream::wxTextInputStream(wxInputStream &s,
+                                     const wxString &sep,
+                                     const wxMBConv& conv)
+  : m_input(s), m_separators(sep), m_conv(conv.Clone())
+{
+    memset((void*)m_lastBytes, 0, 10);
+}
+#else
+wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
+  : m_input(s), m_separators(sep)
+{
+    memset((void*)m_lastBytes, 0, 10);
+}
+#endif
+
+wxTextInputStream::~wxTextInputStream()
+{
+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE
+}
+
+void wxTextInputStream::UngetLast()
+{
+    size_t byteCount = 0;
+    while(m_lastBytes[byteCount]) // pseudo ANSI strlen (even for Unicode!)
+        byteCount++;
+    m_input.Ungetch(m_lastBytes, byteCount);
+    memset((void*)m_lastBytes, 0, 10);
+}
+
+wxChar wxTextInputStream::NextChar()
+{
+#if wxUSE_UNICODE
+    wxChar wbuf[2];
+    memset((void*)m_lastBytes, 0, 10);
+    for(size_t inlen = 0; inlen < 9; inlen++)
+    {
+        // actually read the next character
+        m_lastBytes[inlen] = m_input.GetC();
+
+        if(m_input.LastRead() <= 0)
+            return wxEOT;
+
+        if ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1)
+                != wxCONV_FAILED )
+            return wbuf[0];
+    }
+    // there should be no encoding which requires more than nine bytes for one character...
+    return wxEOT;
+#else
+    m_lastBytes[0] = m_input.GetC();
+
+    if(m_input.LastRead() <= 0)
+        return wxEOT;
+
+    return m_lastBytes[0];
+#endif
+
+}
+
+wxChar wxTextInputStream::NextNonSeparators()
+{
+    for (;;)
+    {
+        wxChar c = NextChar();
+        if (c == wxEOT) return (wxChar) 0;
+
+        if (c != wxT('\n') &&
+            c != wxT('\r') &&
+            !m_separators.Contains(c))
+          return c;
+    }
+
+}
+
+bool wxTextInputStream::EatEOL(const wxChar &c)
+{
+    if (c == wxT('\n')) return true; // eat on UNIX
+
+    if (c == wxT('\r')) // eat on both Mac and DOS
+    {
+        wxChar c2 = NextChar();
+        if(c2 == wxEOT) return true; // end of stream reached, had enough :-)
+
+        if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac
+        return true;
+    }
+
+    return false;
+}
+
+wxUint32 wxTextInputStream::Read32(int base)
+{
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    if(!m_input) return 0;
+
+    wxString word = ReadWord();
+    if(word.empty())
+        return 0;
+    return wxStrtoul(word.c_str(), 0, base);
+}
+
+wxUint16 wxTextInputStream::Read16(int base)
+{
+    return (wxUint16)Read32(base);
+}
+
+wxUint8 wxTextInputStream::Read8(int base)
+{
+    return (wxUint8)Read32(base);
+}
+
+wxInt32 wxTextInputStream::Read32S(int base)
+{
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    if(!m_input) return 0;
+
+    wxString word = ReadWord();
+    if(word.empty())
+        return 0;
+    return wxStrtol(word.c_str(), 0, base);
+}
+
+wxInt16 wxTextInputStream::Read16S(int base)
+{
+    return (wxInt16)Read32S(base);
+}
+
+wxInt8 wxTextInputStream::Read8S(int base)
+{
+    return (wxInt8)Read32S(base);
+}
+
+double wxTextInputStream::ReadDouble()
+{
+    if(!m_input) return 0;
+    wxString word = ReadWord();
+    if(word.empty())
+        return 0;
+    return wxStrtod(word.c_str(), 0);
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+
+wxString wxTextInputStream::ReadString()
+{
+    return ReadLine();
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+wxString wxTextInputStream::ReadLine()
+{
+    wxString line;
+
+    while ( !m_input.Eof() )
+    {
+        wxChar c = NextChar();
+        if(c == wxEOT)
+            break;
+
+        if (EatEOL(c))
+            break;
+
+        line += c;
+    }
+
+    return line;
+}
+
+wxString wxTextInputStream::ReadWord()
+{
+    wxString word;
+
+    if ( !m_input )
+        return word;
+
+    wxChar c = NextNonSeparators();
+    if ( !c )
+        return word;
+
+    word += c;
+
+    while ( !m_input.Eof() )
+    {
+        c = NextChar();
+        if(c == wxEOT)
+            break;
+
+        if (m_separators.Contains(c))
+            break;
+
+        if (EatEOL(c))
+            break;
+
+        word += c;
+    }
+
+    return word;
+}
+
+wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
+{
+    word = ReadWord();
+    return *this;
+}
+
+wxTextInputStream& wxTextInputStream::operator>>(char& c)
+{
+    c = m_input.GetC();
+    if(m_input.LastRead() <= 0) c = 0;
+
+    if (EatEOL(c))
+        c = '\n';
+
+    return *this;
+}
+
+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
+
+wxTextInputStream& wxTextInputStream::operator>>(wchar_t& wc)
+{
+    wc = GetChar();
+
+    return *this;
+}
+
+#endif // wxUSE_UNICODE
+
+wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
+{
+    i = (wxInt16)Read16();
+    return *this;
+}
+
+wxTextInputStream& wxTextInputStream::operator>>(wxInt32& i)
+{
+    i = (wxInt32)Read32();
+    return *this;
+}
+
+wxTextInputStream& wxTextInputStream::operator>>(wxUint16& i)
+{
+    i = Read16();
+    return *this;
+}
+
+wxTextInputStream& wxTextInputStream::operator>>(wxUint32& i)
+{
+    i = Read32();
+    return *this;
+}
+
+wxTextInputStream& wxTextInputStream::operator>>(double& i)
+{
+    i = ReadDouble();
+    return *this;
+}
+
+wxTextInputStream& wxTextInputStream::operator>>(float& f)
+{
+    f = (float)ReadDouble();
+    return *this;
+}
+
+
+
+#if wxUSE_UNICODE
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s,
+                                       wxEOL mode,
+                                       const wxMBConv& conv)
+  : m_output(s), m_conv(conv.Clone())
+#else
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
+  : m_output(s)
+#endif
+{
+    m_mode = mode;
+    if (m_mode == wxEOL_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__WXPM__)
+        m_mode = wxEOL_DOS;
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+        m_mode = wxEOL_MAC;
+#else
+        m_mode = wxEOL_UNIX;
+#endif
+    }
+}
+
+wxTextOutputStream::~wxTextOutputStream()
+{
+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE
+}
+
+void wxTextOutputStream::SetMode(wxEOL mode)
+{
+    m_mode = mode;
+    if (m_mode == wxEOL_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__WXPM__)
+        m_mode = wxEOL_DOS;
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+        m_mode = wxEOL_MAC;
+#else
+        m_mode = wxEOL_UNIX;
+#endif
+    }
+}
+
+void wxTextOutputStream::Write32(wxUint32 i)
+{
+    wxString str;
+    str.Printf(wxT("%u"), i);
+
+    WriteString(str);
+}
+
+void wxTextOutputStream::Write16(wxUint16 i)
+{
+    wxString str;
+    str.Printf(wxT("%u"), (unsigned)i);
+
+    WriteString(str);
+}
+
+void wxTextOutputStream::Write8(wxUint8 i)
+{
+    wxString str;
+    str.Printf(wxT("%u"), (unsigned)i);
+
+    WriteString(str);
+}
+
+void wxTextOutputStream::WriteDouble(double d)
+{
+    wxString str;
+
+    str.Printf(wxT("%f"), d);
+    WriteString(str);
+}
+
+void wxTextOutputStream::WriteString(const wxString& string)
+{
+    size_t len = string.length();
+
+    wxString out;
+    out.reserve(len);
+
+    for ( size_t i = 0; i < len; i++ )
+    {
+        const wxChar c = string[i];
+        if ( c == wxT('\n') )
+        {
+            switch ( m_mode )
+            {
+                case wxEOL_DOS:
+                    out << _T("\r\n");
+                    continue;
+
+                case wxEOL_MAC:
+                    out << _T('\r');
+                    continue;
+
+                default:
+                    wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") );
+                    // fall through
+
+                case wxEOL_UNIX:
+                    // don't treat '\n' specially
+                    ;
+            }
+        }
+
+        out << c;
+    }
+
+#if wxUSE_UNICODE
+    wxCharBuffer buffer = m_conv->cWC2MB(out, out.length(), &len);
+    m_output.Write(buffer, len);
+#else
+    m_output.Write(out.c_str(), out.length() );
+#endif
+}
+
+wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)
+{
+#if wxUSE_UNICODE
+    WriteString( wxString(&c, *m_conv, 1) );
+#else
+    WriteString( wxString(&c, wxConvLocal, 1) );
+#endif
+    return *this;
+}
+
+wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
+{
+    WriteString( wxString(string) );
+    return *this;
+}
+
+wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
+{
+    WriteString( string );
+    return *this;
+}
+
+wxTextOutputStream& wxTextOutputStream::operator<<(char c)
+{
+    WriteString( wxString::FromAscii(c) );
+
+    return *this;
+}
+
+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
+
+wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
+{
+    WriteString( wxString(&wc, *m_conv, 1) );
+
+    return *this;
+}
+
+#endif // wxUSE_UNICODE
+
+wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
+{
+    wxString str;
+    str.Printf(wxT("%d"), (signed int)c);
+    WriteString(str);
+
+    return *this;
+}
+
+wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
+{
+    wxString str;
+    str.Printf(wxT("%ld"), (signed long)c);
+    WriteString(str);
+
+    return *this;
+}
+
+wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
+{
+    wxString str;
+    str.Printf(wxT("%u"), (unsigned int)c);
+    WriteString(str);
+
+    return *this;
+}
+
+wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
+{
+    wxString str;
+    str.Printf(wxT("%lu"), (unsigned long)c);
+    WriteString(str);
+
+    return *this;
+}
+
+wxTextOutputStream &wxTextOutputStream::operator<<(double f)
+{
+    WriteDouble(f);
+    return *this;
+}
+
+wxTextOutputStream& wxTextOutputStream::operator<<(float f)
+{
+    WriteDouble((double)f);
+    return *this;
+}
+
+wxTextOutputStream &endl( wxTextOutputStream &stream )
+{
+    return stream.PutChar(wxT('\n'));
+}
+
+#endif
+  // wxUSE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/uiactioncmn.cpp b/Source/3rd Party/wx/src/common/uiactioncmn.cpp
deleted file mode 100644
index 32c9eedee..000000000
--- a/Source/3rd Party/wx/src/common/uiactioncmn.cpp	
+++ /dev/null
@@ -1,146 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/uiactioncmn.cpp
-// Purpose:     wxUIActionSimulator common implementation
-// Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
-// Modified by:
-// Created:     2010-03-06
-// RCS-ID:      $Id$
-// Copyright:   (c) Kevin Ollivier
-//              (c) 2010 Steven Lamerton
-//              (c) 2010 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#if wxUSE_UIACTIONSIMULATOR
-
-#include "wx/uiaction.h"
-
-bool wxUIActionSimulator::MouseClick(int button)
-{
-    MouseDown(button);
-    MouseUp(button);
-
-    return true;
-}
-
-bool wxUIActionSimulator::MouseDblClick(int button)
-{
-    MouseDown(button);
-    MouseUp(button);
-    MouseDown(button);
-    MouseUp(button);
-
-    return true;
-}
-
-bool
-wxUIActionSimulator::MouseDragDrop(long x1, long y1, long x2, long y2,
-                                   int button)
-{
-    MouseMove(x1, y1);
-    MouseDown(button);
-    MouseMove(x2, y2);
-    MouseUp(button);
-
-    return true;
-}
-
-bool
-wxUIActionSimulator::Key(int keycode, int modifiers, bool isDown)
-{
-    wxASSERT_MSG( (modifiers & wxMOD_ALTGR) != wxMOD_ALTGR,
-        "wxMOD_ALTGR is not implemented" );
-    wxASSERT_MSG( !(modifiers & wxMOD_META ),
-        "wxMOD_META is not implemented" );
-    wxASSERT_MSG( !(modifiers & wxMOD_WIN ),
-        "wxMOD_WIN is not implemented" );
-
-    if ( isDown )
-        SimulateModifiers(modifiers, true);
-
-    bool rc = DoKey(keycode, modifiers, isDown);
-
-    if ( !isDown )
-        SimulateModifiers(modifiers, false);
-
-    return rc;
-}
-
-void wxUIActionSimulator::SimulateModifiers(int modifiers, bool isDown)
-{
-    if ( modifiers & wxMOD_SHIFT )
-        DoKey(WXK_SHIFT, modifiers, isDown);
-    if ( modifiers & wxMOD_ALT )
-        DoKey(WXK_ALT, modifiers, isDown);
-    if ( modifiers & wxMOD_CONTROL )
-        DoKey(WXK_CONTROL, modifiers, isDown);
-}
-
-bool wxUIActionSimulator::Char(int keycode, int modifiers)
-{
-    switch(keycode)
-    {
-    case '0':
-        keycode = '0';
-        break;
-    case '1':
-        keycode = '1';
-        break;
-    case '2':
-        keycode = '2';
-        break;
-    case '3':
-        keycode = '3';
-        break;
-    case '4':
-        keycode = '4';
-        break;
-    case '5':
-        keycode = '5';
-        break;
-    case '6':
-        keycode = '6';
-        break;
-    case '7':
-        keycode = '7';
-        break;
-    case '8':
-        keycode = '8';
-        break;
-    case '9':
-        keycode = '9';
-        break;
-    case '+':
-        keycode = '+';
-        break;
-    case '-':
-        keycode = '-';
-        break;
-    case '.':
-        keycode = '.';
-        break;
-    default:
-        break;
-    };
-
-    Key(keycode, modifiers, true);
-    Key(keycode, modifiers, false);
-
-    return true;
-}
-
-bool wxUIActionSimulator::Text(const char *s)
-{
-    while ( *s != '\0' )
-    {
-        const char ch = *s++;
-        if ( !Char(ch, isupper(ch) ? wxMOD_SHIFT : 0) )
-            return false;
-    }
-
-    return true;
-}
-
-#endif // wxUSE_UIACTIONSIMULATOR
diff --git a/Source/3rd Party/wx/src/common/unichar.cpp b/Source/3rd Party/wx/src/common/unichar.cpp
deleted file mode 100644
index ba949e665..000000000
--- a/Source/3rd Party/wx/src/common/unichar.cpp	
+++ /dev/null
@@ -1,184 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/unichar.cpp
-// Purpose:     wxUniChar and wxUniCharRef classes
-// Author:      Vaclav Slavik
-// Created:     2007-03-19
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 REA Elektronik GmbH
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// headers
-// ===========================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/strconv.h"  // wxConvLibc
-    #include "wx/log.h"
-#endif
-
-#include "wx/unichar.h"
-#include "wx/string.h"
-
-// ===========================================================================
-// implementation
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// wxUniChar
-// ---------------------------------------------------------------------------
-
-/* static */
-wxUniChar::value_type wxUniChar::FromHi8bit(char c)
-{
-#if wxUSE_UTF8_LOCALE_ONLY
-    wxFAIL_MSG( "invalid UTF-8 character" );
-    wxUnusedVar(c);
-
-    return wxT('?'); // FIXME-UTF8: what to use as failure character?
-#else
-    char cbuf[2];
-    cbuf[0] = c;
-    cbuf[1] = '\0';
-    wchar_t wbuf[2];
-    if ( wxConvLibc.ToWChar(wbuf, 2, cbuf, 2) != 2 )
-    {
-        wxFAIL_MSG( "invalid multibyte character" );
-        return wxT('?'); // FIXME-UTF8: what to use as failure character?
-    }
-    return wbuf[0];
-#endif
-}
-
-/* static */
-char wxUniChar::ToHi8bit(wxUniChar::value_type v)
-{
-    char c;
-    if ( !GetAsHi8bit(v, &c) )
-    {
-        wxFAIL_MSG( "character cannot be converted to single byte" );
-        c = '?'; // FIXME-UTF8: what to use as failure character?
-    }
-
-    return c;
-}
-
-/* static */
-bool wxUniChar::GetAsHi8bit(value_type v, char *c)
-{
-    wchar_t wbuf[2];
-    wbuf[0] = v;
-    wbuf[1] = L'\0';
-    char cbuf[2];
-    if ( wxConvLibc.FromWChar(cbuf, 2, wbuf, 2) != 2 )
-        return false;
-
-    *c = cbuf[0];
-    return true;
-}
-
-// ---------------------------------------------------------------------------
-// wxUniCharRef
-// ---------------------------------------------------------------------------
-
-#if wxUSE_UNICODE_UTF8
-wxUniChar wxUniCharRef::UniChar() const
-{
-    return wxStringOperations::DecodeChar(m_pos);
-}
-
-wxUniCharRef& wxUniCharRef::operator=(const wxUniChar& c)
-{
-    wxStringOperations::Utf8CharBuffer utf(wxStringOperations::EncodeChar(c));
-    size_t lenOld = wxStringOperations::GetUtf8CharLength(*m_pos);
-    size_t lenNew = wxStringOperations::GetUtf8CharLength(utf[0]);
-
-    if ( lenNew == lenOld )
-    {
-        // this is the simpler case: if the new value's UTF-8 code has the
-        // same length, we can just replace it:
-
-        iterator pos(m_pos);
-        for ( size_t i = 0; i < lenNew; ++i, ++pos )
-            *pos = utf[i];
-    }
-    else // length of character encoding in UTF-8 changed
-    {
-        // the worse case is when the new value has either longer or shorter
-        // code -- in that case, we have to use wxStringImpl::replace() and
-        // this invalidates all iterators, so we have to update them too:
-
-        wxStringImpl& strimpl = m_str.m_impl;
-
-        int iterDiff = lenNew - lenOld;
-        size_t posIdx = m_pos - strimpl.begin();
-
-        // compute positions of outstanding iterators for this string after the
-        // replacement is done (there is only a small number of iterators at
-        // any time, so we use an array on the stack to avoid unneeded
-        // allocation):
-        static const size_t STATIC_SIZE = 32;
-        size_t indexes_a[STATIC_SIZE];
-        size_t *indexes = indexes_a;
-        size_t iterNum = 0;
-        wxStringIteratorNode *it;
-        for ( it = m_str.m_iterators.ptr; it; it = it->m_next, ++iterNum )
-        {
-            wxASSERT( it->m_iter || it->m_citer );
-
-            if ( iterNum == STATIC_SIZE )
-            {
-                wxLogTrace( wxT("utf8"), wxT("unexpectedly many iterators") );
-
-                size_t total = iterNum + 1;
-                for ( wxStringIteratorNode *it2 = it; it2; it2 = it2->m_next )
-                    total++;
-                indexes = new size_t[total];
-                memcpy(indexes, indexes_a, sizeof(size_t) * STATIC_SIZE);
-            }
-
-            size_t idx = it->m_iter
-                         ? (*it->m_iter - strimpl.begin())
-                         : (*it->m_citer - strimpl.begin());
-
-            if ( idx > posIdx )
-                idx += iterDiff;
-
-            indexes[iterNum] = idx;
-        }
-
-        // update the string:
-        strimpl.replace(m_pos, m_pos + lenOld, utf, lenNew);
-
-#if wxUSE_STRING_POS_CACHE
-        m_str.InvalidateCache();
-#endif // wxUSE_STRING_POS_CACHE
-
-        // finally, set the iterators to valid values again (note that this
-        // updates m_pos as well):
-        size_t i;
-        for ( i = 0, it = m_str.m_iterators.ptr; it; it = it->m_next, ++i )
-        {
-            wxASSERT( i < iterNum );
-            wxASSERT( it->m_iter || it->m_citer );
-
-            if ( it->m_iter )
-                *it->m_iter = strimpl.begin() + indexes[i];
-            else // it->m_citer
-                *it->m_citer = strimpl.begin() + indexes[i];
-        }
-
-        if ( indexes != indexes_a )
-            delete[] indexes;
-    }
-
-    return *this;
-}
-#endif // wxUSE_UNICODE_UTF8
diff --git a/Source/3rd Party/wx/src/common/unictabl.inc b/Source/3rd Party/wx/src/common/unictabl.inc
index d70727f85..d75491642 100644
--- a/Source/3rd Party/wx/src/common/unictabl.inc	
+++ b/Source/3rd Party/wx/src/common/unictabl.inc	
@@ -1,898 +1,872 @@
-
-
-/*
- *  This file is #included by encconv.cpp
- *
- *  CVS-ID: $Id$
- *
- *  *** ***  CAUTION! *** ***
- *  Do not modify this file by hand! It is generated by shell
- *  script $(WXWIN)/misc/unictabl/regenerate
- *
- *  Parts of this file are based on tables published by Unicode, Inc.
- *  Original tables are freely available at
- *      ftp://ftp.unicode.org/Public/MAPPINGS
- *
- *  Original copyright info as present in mapping tables follows:
- *
- *
- *  Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
- *
- *  This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
- *  No claims are made as to fitness for any particular purpose.  No
- *  warranties of any kind are expressed or implied.  The recipient
- *  agrees to determine applicability of information provided.  If this
- *  file has been provided on optical media by Unicode, Inc., the sole
- *  remedy for any claim will be exchange of defective media within 90
- *  days of receipt.
- *
- *  Unicode, Inc. hereby grants the right to freely use the information
- *  supplied in this file in the creation of products supporting the
- *  Unicode Standard, and to make copies of this file in any form for
- *  internal or external distribution as long as this notice remains
- *  attached.
- */
-
-
-
-
-/*
- * ISO8859_1 to Unicode recoding table
- * based on file mappings/8859-1.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_1[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
- };
-
-
-/*
- * ISO8859_10 to Unicode recoding table
- * based on file mappings/8859-10.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_10[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7,
-    0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A,
-    0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7,
-    0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B,
-    0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E,
-    0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF,
-    0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168,
-    0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
-    0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
-    0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x00EF,
-    0x00F0, 0x0146, 0x014D, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0169,
-    0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138
- };
-
-
-/*
- * ISO8859_13 to Unicode recoding table
- * based on file mappings/8859-13.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_13[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7,
-    0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7,
-    0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
-    0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
-    0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
-    0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
-    0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
-    0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
-    0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
-    0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
-    0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019
- };
-
-
-/*
- * ISO8859_14 to Unicode recoding table
- * based on file mappings/8859-14.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_14[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x1E02, 0x1E03, 0x00A3, 0x010A, 0x010B, 0x1E0A, 0x00A7,
-    0x1E80, 0x00A9, 0x1E82, 0x1E0B, 0x1EF2, 0x00AD, 0x00AE, 0x0178,
-    0x1E1E, 0x1E1F, 0x0120, 0x0121, 0x1E40, 0x1E41, 0x00B6, 0x1E56,
-    0x1E81, 0x1E57, 0x1E83, 0x1E60, 0x1EF3, 0x1E84, 0x1E85, 0x1E61,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x0174, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x1E6A,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x0176, 0x00DF,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B,
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF
- };
-
-
-/*
- * ISO8859_15 to Unicode recoding table
- * based on file mappings/8859-15.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_15[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7,
-    0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7,
-    0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
- };
-
-
-/*
- * ISO8859_2 to Unicode recoding table
- * based on file mappings/8859-2.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_2[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7,
-    0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
-    0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7,
-    0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C,
-    0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
-    0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
-    0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
-    0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
-    0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
-    0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
-    0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
-    0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
- };
-
-
-/*
- * ISO8859_3 to Unicode recoding table
- * based on file mappings/8859-3.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_3[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0x0000, 0x0124, 0x00A7,
-    0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0x0000, 0x017B,
-    0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7,
-    0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, 0x0000, 0x017C,
-    0x00C0, 0x00C1, 0x00C2, 0x0000, 0x00C4, 0x010A, 0x0108, 0x00C7,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x0000, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7,
-    0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF,
-    0x00E0, 0x00E1, 0x00E2, 0x0000, 0x00E4, 0x010B, 0x0109, 0x00E7,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x0000, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7,
-    0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9
- };
-
-
-/*
- * ISO8859_4 to Unicode recoding table
- * based on file mappings/8859-4.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_4[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7,
-    0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF,
-    0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7,
-    0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B,
-    0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E,
-    0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A,
-    0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF,
-    0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
-    0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B,
-    0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9
- };
-
-
-/*
- * ISO8859_5 to Unicode recoding table
- * based on file mappings/8859-5.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_5[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407,
-    0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F,
-    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
-    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
-    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
-    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
-    0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
-    0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F
- };
-
-
-/*
- * ISO8859_6 to Unicode recoding table
- * based on file mappings/8859-6.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_6[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x0000, 0x0000, 0x0000, 0x00A4, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x060C, 0x00AD, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x061B, 0x0000, 0x0000, 0x0000, 0x061F,
-    0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
-    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
-    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637,
-    0x0638, 0x0639, 0x063A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647,
-    0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F,
-    0x0650, 0x0651, 0x0652, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
- };
-
-
-/*
- * ISO8859_7 to Unicode recoding table
- * based on file mappings/8859-7.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_7[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x2018, 0x2019, 0x00A3, 0x0000, 0x0000, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x0000, 0x2015,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7,
-    0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
-    0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
-    0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
-    0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
-    0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
-    0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
-    0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
-    0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
-    0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000
- };
-
-
-/*
- * ISO8859_8 to Unicode recoding table
- * based on file mappings/8859-8.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_8[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x203E,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2017,
-    0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
-    0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
-    0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
-    0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
- };
-
-
-/*
- * ISO8859_9 to Unicode recoding table
- * based on file mappings/8859-9.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__ISO8859_9[128] = {
-    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
-    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
-    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
-    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
- };
-
-
-/*
- * CP1250 to Unicode recoding table
- * based on file mappings/CP1250.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__CP1250[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
-    0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A,
-    0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B,
-    0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C,
-    0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
-    0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
-    0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
-    0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
-    0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
-    0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
-    0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
-    0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
- };
-
-
-/*
- * CP1251 to Unicode recoding table
- * based on file mappings/CP1251.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__CP1251[128] = {
-    0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021,
-    0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
-    0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F,
-    0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7,
-    0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407,
-    0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7,
-    0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457,
-    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
-    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
-    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
-    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F
- };
-
-
-/*
- * CP1252 to Unicode recoding table
- * based on file mappings/CP1252.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__CP1252[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-    0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x017E, 0x0178,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
- };
-
-
-/*
- * CP1253 to Unicode recoding table
- * based on file mappings/CP1253.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__CP1253[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-    0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7,
-    0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
-    0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
-    0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
-    0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
-    0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
-    0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
-    0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
-    0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
-    0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000
- };
-
-
-/*
- * CP1254 to Unicode recoding table
- * based on file mappings/CP1254.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__CP1254[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-    0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
-    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
-    0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
-    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
-    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
-    0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
-    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
- };
-
-
-/*
- * CP1255 to Unicode recoding table
- * based on file mappings/CP1255.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__CP1255[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-    0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x02DC, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AA, 0x00A5, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
-    0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
-    0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
-    0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3,
-    0x05F4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
-    0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
-    0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
-    0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E, 0x200F, 0x0000
- };
-
-
-/*
- * CP1256 to Unicode recoding table
- * based on file mappings/CP1256.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__CP1256[128] = {
-    0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
-    0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
-    0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
-    0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
-    0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
-    0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
-    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
-    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7,
-    0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643,
-    0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7,
-    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
-    0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7,
-    0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2
- };
-
-
-/*
- * CP1257 to Unicode recoding table
- * based on file mappings/CP1257.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__CP1257[128] = {
-    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
-    0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8,
-    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
-    0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000,
-    0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x0000, 0x00A6, 0x00A7,
-    0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
-    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
-    0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
-    0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
-    0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
-    0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
-    0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
-    0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
-    0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
-    0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
-    0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9
- };
-
-
-/*
- * CP866 to Unicode recoding table
- * based on file mappings/CP866.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__CP866[128] = {
-    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
-    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
-    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
-    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
-    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
-    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
-    0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556,
-    0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510,
-    0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F,
-    0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567,
-    0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B,
-    0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
-    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
-    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
-    0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E,
-    0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0
- };
-
-
-/*
- * KOI8 to Unicode recoding table
- * based on file mappings/KOI8-R.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__KOI8[128] = {
-    0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
-    0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
-    0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248,
-    0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7,
-    0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556,
-    0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E,
-    0x255F, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565,
-    0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x00A9,
-    0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
-    0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
-    0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
-    0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A,
-    0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
-    0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
-    0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
-    0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A
- };
-
-
-/*
- * KOI8_U to Unicode recoding table
- * based on file mappings/KOI8-U.TXT by Unicode Consortium
- */
-
-static const wxUint16 encoding_table__KOI8_U[128] = {
-    0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
-    0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
-    0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248,
-    0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7,
-    0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457,
-    0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E,
-    0x255F, 0x2560, 0x2561, 0x0401, 0x0403, 0x2563, 0x0406, 0x0407,
-    0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9,
-    0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
-    0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
-    0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
-    0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A,
-    0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
-    0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
-    0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
-    0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A
- };
-
-
-
-
-
-/*
- *
- * Unicode to 7bit ASCII fallback
- * (for use with wxRECODE_SUBSTITUTE recoding mode)
- *
- */
-
-static const struct {
-    wxUint16 c  /*code*/;
-    wxUint8  s /*inaccurate substitution*/;
-} encoding_unicode_fallback[] = {
-
-    {0x00AB, 0x22},
-    {0x00BB, 0x22},
-    {0x00C0, 0x41},
-    {0x00C1, 0x41},
-    {0x00C2, 0x41},
-    {0x00C3, 0x41},
-    {0x00C4, 0x41},
-    {0x00C5, 0x41},
-    {0x00C7, 0x43},
-    {0x00C8, 0x45},
-    {0x00C9, 0x45},
-    {0x00CA, 0x45},
-    {0x00CB, 0x45},
-    {0x00CC, 0x49},
-    {0x00CD, 0x49},
-    {0x00CE, 0x49},
-    {0x00CF, 0x49},
-    {0x00D1, 0x4E},
-    {0x00D2, 0x4F},
-    {0x00D3, 0x4F},
-    {0x00D4, 0x4F},
-    {0x00D5, 0x4F},
-    {0x00D6, 0x4F},
-    {0x00D8, 0x4F},
-    {0x00D9, 0x55},
-    {0x00DA, 0x55},
-    {0x00DB, 0x55},
-    {0x00DC, 0x55},
-    {0x00DD, 0x59},
-    {0x00E0, 0x61},
-    {0x00E1, 0x61},
-    {0x00E2, 0x61},
-    {0x00E3, 0x61},
-    {0x00E4, 0x61},
-    {0x00E5, 0x61},
-    {0x00E7, 0x63},
-    {0x00E8, 0x65},
-    {0x00E9, 0x65},
-    {0x00EA, 0x65},
-    {0x00EB, 0x65},
-    {0x00EC, 0x69},
-    {0x00ED, 0x69},
-    {0x00EE, 0x69},
-    {0x00EF, 0x69},
-    {0x00F1, 0x6E},
-    {0x00F2, 0x6F},
-    {0x00F3, 0x6F},
-    {0x00F4, 0x6F},
-    {0x00F5, 0x6F},
-    {0x00F6, 0x6F},
-    {0x00F8, 0x6F},
-    {0x00F9, 0x75},
-    {0x00FA, 0x75},
-    {0x00FB, 0x75},
-    {0x00FC, 0x75},
-    {0x00FD, 0x79},
-    {0x00FF, 0x79},
-    {0x0100, 0x41},
-    {0x0101, 0x61},
-    {0x0102, 0x41},
-    {0x0103, 0x61},
-    {0x0104, 0x41},
-    {0x0105, 0x61},
-    {0x0106, 0x43},
-    {0x0107, 0x63},
-    {0x0108, 0x43},
-    {0x0109, 0x63},
-    {0x010A, 0x43},
-    {0x010B, 0x63},
-    {0x010C, 0x43},
-    {0x010D, 0x63},
-    {0x010E, 0x44},
-    {0x010F, 0x64},
-    {0x0110, 0x44},
-    {0x0111, 0x64},
-    {0x0112, 0x45},
-    {0x0113, 0x65},
-    {0x0116, 0x45},
-    {0x0117, 0x65},
-    {0x0118, 0x45},
-    {0x0119, 0x65},
-    {0x011A, 0x45},
-    {0x011B, 0x65},
-    {0x011C, 0x47},
-    {0x011D, 0x67},
-    {0x011E, 0x47},
-    {0x011F, 0x67},
-    {0x0120, 0x47},
-    {0x0121, 0x67},
-    {0x0122, 0x47},
-    {0x0123, 0x67},
-    {0x0124, 0x48},
-    {0x0125, 0x68},
-    {0x0126, 0x48},
-    {0x0127, 0x68},
-    {0x0128, 0x49},
-    {0x0129, 0x69},
-    {0x012A, 0x49},
-    {0x012B, 0x69},
-    {0x012E, 0x49},
-    {0x012F, 0x69},
-    {0x0130, 0x49},
-    {0x0134, 0x4A},
-    {0x0135, 0x6A},
-    {0x0136, 0x4B},
-    {0x0137, 0x6B},
-    {0x0139, 0x4C},
-    {0x013A, 0x6C},
-    {0x013B, 0x4C},
-    {0x013C, 0x6C},
-    {0x013D, 0x4C},
-    {0x013E, 0x6C},
-    {0x0141, 0x4C},
-    {0x0142, 0x6C},
-    {0x0143, 0x4E},
-    {0x0144, 0x6E},
-    {0x0145, 0x4E},
-    {0x0146, 0x6E},
-    {0x0147, 0x4E},
-    {0x0148, 0x6E},
-    {0x014C, 0x4F},
-    {0x014D, 0x6F},
-    {0x0150, 0x4F},
-    {0x0151, 0x6F},
-    {0x0154, 0x52},
-    {0x0155, 0x72},
-    {0x0156, 0x52},
-    {0x0157, 0x72},
-    {0x0158, 0x52},
-    {0x0159, 0x72},
-    {0x015A, 0x53},
-    {0x015B, 0x73},
-    {0x015C, 0x53},
-    {0x015D, 0x73},
-    {0x015E, 0x53},
-    {0x015F, 0x73},
-    {0x0160, 0x53},
-    {0x0161, 0x73},
-    {0x0162, 0x54},
-    {0x0163, 0x74},
-    {0x0164, 0x54},
-    {0x0165, 0x74},
-    {0x0166, 0x54},
-    {0x0167, 0x74},
-    {0x0168, 0x55},
-    {0x0169, 0x75},
-    {0x016A, 0x55},
-    {0x016B, 0x75},
-    {0x016C, 0x55},
-    {0x016D, 0x75},
-    {0x016E, 0x55},
-    {0x016F, 0x75},
-    {0x0170, 0x55},
-    {0x0171, 0x75},
-    {0x0172, 0x55},
-    {0x0173, 0x75},
-    {0x0174, 0x57},
-    {0x0175, 0x77},
-    {0x0176, 0x59},
-    {0x0177, 0x79},
-    {0x0178, 0x59},
-    {0x0179, 0x5A},
-    {0x017A, 0x7A},
-    {0x017B, 0x5A},
-    {0x017C, 0x7A},
-    {0x017D, 0x5A},
-    {0x017E, 0x7A},
-    {0x0192, 0x66},
-    {0x1E02, 0x42},
-    {0x1E03, 0x62},
-    {0x1E0A, 0x44},
-    {0x1E0B, 0x64},
-    {0x1E1E, 0x46},
-    {0x1E1F, 0x66},
-    {0x1E40, 0x4D},
-    {0x1E41, 0x6D},
-    {0x1E56, 0x50},
-    {0x1E57, 0x70},
-    {0x1E60, 0x53},
-    {0x1E61, 0x73},
-    {0x1E6A, 0x54},
-    {0x1E6B, 0x74},
-    {0x1E80, 0x57},
-    {0x1E81, 0x77},
-    {0x1E82, 0x57},
-    {0x1E83, 0x77},
-    {0x1E84, 0x57},
-    {0x1E85, 0x77},
-    {0x1EF2, 0x59},
-    {0x1EF3, 0x79},
-    {0x2013, 0x2D},
-    {0x2014, 0x2D},
-    {0x2018, 0x27},
-    {0x2019, 0x27},
-    {0x201A, 0x27},
-    {0x201C, 0x22},
-    {0x201D, 0x22},
-    {0x201E, 0x22},
-    {0x2039, 0x27},
-    {0x203A, 0x27},
-    {0, 0}
- };
-
-static const unsigned encoding_unicode_fallback_count =  200;
-
-
-
-
-/*
- *
- * Table of all supported encodings:
- *
- */
-
-static const struct {
-    wxFontEncoding encoding; // encoding identifier
-    const wxUint16 *table;         // 8bit to unicode table
-} encodings_list[] = {
-
-    { wxFONTENCODING_ISO8859_1, encoding_table__ISO8859_1},
-    { wxFONTENCODING_ISO8859_10, encoding_table__ISO8859_10},
-    { wxFONTENCODING_ISO8859_13, encoding_table__ISO8859_13},
-    { wxFONTENCODING_ISO8859_14, encoding_table__ISO8859_14},
-    { wxFONTENCODING_ISO8859_15, encoding_table__ISO8859_15},
-    { wxFONTENCODING_ISO8859_2, encoding_table__ISO8859_2},
-    { wxFONTENCODING_ISO8859_3, encoding_table__ISO8859_3},
-    { wxFONTENCODING_ISO8859_4, encoding_table__ISO8859_4},
-    { wxFONTENCODING_ISO8859_5, encoding_table__ISO8859_5},
-    { wxFONTENCODING_ISO8859_6, encoding_table__ISO8859_6},
-    { wxFONTENCODING_ISO8859_7, encoding_table__ISO8859_7},
-    { wxFONTENCODING_ISO8859_8, encoding_table__ISO8859_8},
-    { wxFONTENCODING_ISO8859_9, encoding_table__ISO8859_9},
-    { wxFONTENCODING_CP1250, encoding_table__CP1250},
-    { wxFONTENCODING_CP1251, encoding_table__CP1251},
-    { wxFONTENCODING_CP1252, encoding_table__CP1252},
-    { wxFONTENCODING_CP1253, encoding_table__CP1253},
-    { wxFONTENCODING_CP1254, encoding_table__CP1254},
-    { wxFONTENCODING_CP1255, encoding_table__CP1255},
-    { wxFONTENCODING_CP1256, encoding_table__CP1256},
-    { wxFONTENCODING_CP1257, encoding_table__CP1257},
-    { wxFONTENCODING_KOI8, encoding_table__KOI8},
-    { wxFONTENCODING_KOI8_U, encoding_table__KOI8_U},
-    { wxFONTENCODING_CP866, encoding_table__CP866},
-    {wxFONTENCODING_MAX /*anything*/, NULL}
- };
+
+
+/*
+ *  This file is #included by encconv.cpp
+ *
+ *  CVS-ID: $Id: unictabl.inc 40398 2006-07-31 16:28:43Z VS $
+ *
+ *  *** ***  CAUTION! *** ***
+ *  Do not modify this file by hand! It is generated by shell
+ *  script $(WXWIN)/misc/unictabl/regenerate
+ *
+ *  Parts of this file are based on tables published by Unicode, Inc.
+ *  Original tables are freely available at
+ *      ftp://ftp.unicode.org/Public/MAPPINGS
+ *
+ *  Original copyright info as present in mapping tables follows:
+ *
+ *
+ *  Copyright (c) 1991-1999 Unicode, Inc.  All Rights reserved.
+ *
+ *  This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+ *  No claims are made as to fitness for any particular purpose.  No
+ *  warranties of any kind are expressed or implied.  The recipient
+ *  agrees to determine applicability of information provided.  If this
+ *  file has been provided on optical media by Unicode, Inc., the sole
+ *  remedy for any claim will be exchange of defective media within 90
+ *  days of receipt.
+ *
+ *  Unicode, Inc. hereby grants the right to freely use the information
+ *  supplied in this file in the creation of products supporting the
+ *  Unicode Standard, and to make copies of this file in any form for
+ *  internal or external distribution as long as this notice remains
+ *  attached.
+ */
+
+
+
+
+/*
+ * ISO8859_1 to Unicode recoding table
+ * based on file mappings/8859-1.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_1[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
+ };
+
+
+/*
+ * ISO8859_10 to Unicode recoding table
+ * based on file mappings/8859-10.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_10[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x0104, 0x0112, 0x0122, 0x012A, 0x0128, 0x0136, 0x00A7,
+    0x013B, 0x0110, 0x0160, 0x0166, 0x017D, 0x00AD, 0x016A, 0x014A,
+    0x00B0, 0x0105, 0x0113, 0x0123, 0x012B, 0x0129, 0x0137, 0x00B7,
+    0x013C, 0x0111, 0x0161, 0x0167, 0x017E, 0x2015, 0x016B, 0x014B,
+    0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E,
+    0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x00CF,
+    0x00D0, 0x0145, 0x014C, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x0168,
+    0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+    0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
+    0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x00EF,
+    0x00F0, 0x0146, 0x014D, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x0169,
+    0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x0138
+ };
+
+
+/*
+ * ISO8859_13 to Unicode recoding table
+ * based on file mappings/8859-13.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_13[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7,
+    0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7,
+    0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+    0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
+    0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+    0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
+    0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+    0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
+    0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+    0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
+    0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019
+ };
+
+
+/*
+ * ISO8859_14 to Unicode recoding table
+ * based on file mappings/8859-14.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_14[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x1E02, 0x1E03, 0x00A3, 0x010A, 0x010B, 0x1E0A, 0x00A7,
+    0x1E80, 0x00A9, 0x1E82, 0x1E0B, 0x1EF2, 0x00AD, 0x00AE, 0x0178,
+    0x1E1E, 0x1E1F, 0x0120, 0x0121, 0x1E40, 0x1E41, 0x00B6, 0x1E56,
+    0x1E81, 0x1E57, 0x1E83, 0x1E60, 0x1EF3, 0x1E84, 0x1E85, 0x1E61,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x0174, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x1E6A,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x0176, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF
+ };
+
+
+/*
+ * ISO8859_15 to Unicode recoding table
+ * based on file mappings/8859-15.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_15[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7,
+    0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7,
+    0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
+ };
+
+
+/*
+ * ISO8859_2 to Unicode recoding table
+ * based on file mappings/8859-2.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_2[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7,
+    0x00A8, 0x0160, 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B,
+    0x00B0, 0x0105, 0x02DB, 0x0142, 0x00B4, 0x013E, 0x015B, 0x02C7,
+    0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, 0x017E, 0x017C,
+    0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+    0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+    0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+    0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+    0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+    0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+    0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
+    0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
+ };
+
+
+/*
+ * ISO8859_3 to Unicode recoding table
+ * based on file mappings/8859-3.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_3[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, 0x0000, 0x0124, 0x00A7,
+    0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, 0x0000, 0x017B,
+    0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7,
+    0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, 0x0000, 0x017C,
+    0x00C0, 0x00C1, 0x00C2, 0x0000, 0x00C4, 0x010A, 0x0108, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x0000, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7,
+    0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x0000, 0x00E4, 0x010B, 0x0109, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x0000, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7,
+    0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9
+ };
+
+
+/*
+ * ISO8859_4 to Unicode recoding table
+ * based on file mappings/8859-4.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_4[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x0104, 0x0138, 0x0156, 0x00A4, 0x0128, 0x013B, 0x00A7,
+    0x00A8, 0x0160, 0x0112, 0x0122, 0x0166, 0x00AD, 0x017D, 0x00AF,
+    0x00B0, 0x0105, 0x02DB, 0x0157, 0x00B4, 0x0129, 0x013C, 0x02C7,
+    0x00B8, 0x0161, 0x0113, 0x0123, 0x0167, 0x014A, 0x017E, 0x014B,
+    0x0100, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x012E,
+    0x010C, 0x00C9, 0x0118, 0x00CB, 0x0116, 0x00CD, 0x00CE, 0x012A,
+    0x0110, 0x0145, 0x014C, 0x0136, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x0172, 0x00DA, 0x00DB, 0x00DC, 0x0168, 0x016A, 0x00DF,
+    0x0101, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x012F,
+    0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B,
+    0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9
+ };
+
+
+/*
+ * ISO8859_5 to Unicode recoding table
+ * based on file mappings/8859-5.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_5[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407,
+    0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F,
+    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F,
+    0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457,
+    0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F
+ };
+
+
+/*
+ * ISO8859_6 to Unicode recoding table
+ * based on file mappings/8859-6.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_6[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x0000, 0x0000, 0x0000, 0x00A4, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x060C, 0x00AD, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x061B, 0x0000, 0x0000, 0x0000, 0x061F,
+    0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637,
+    0x0638, 0x0639, 0x063A, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647,
+    0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F,
+    0x0650, 0x0651, 0x0652, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+ };
+
+
+/*
+ * ISO8859_7 to Unicode recoding table
+ * based on file mappings/8859-7.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_7[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x2018, 0x2019, 0x00A3, 0x0000, 0x0000, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x0000, 0x2015,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7,
+    0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+    0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+    0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+    0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
+    0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+    0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
+    0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+    0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
+    0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000
+ };
+
+
+/*
+ * ISO8859_8 to Unicode recoding table
+ * based on file mappings/8859-8.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_8[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x203E,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2017,
+    0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
+    0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+    0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
+    0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+ };
+
+
+/*
+ * ISO8859_9 to Unicode recoding table
+ * based on file mappings/8859-9.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__ISO8859_9[128] = {
+    0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
+    0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F,
+    0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097,
+    0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F,
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
+ };
+
+
+/*
+ * CP1250 to Unicode recoding table
+ * based on file mappings/CP1250.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__CP1250[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
+    0x0000, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179,
+    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x0000, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A,
+    0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B,
+    0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C,
+    0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7,
+    0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E,
+    0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7,
+    0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF,
+    0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7,
+    0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F,
+    0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7,
+    0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9
+ };
+
+
+/*
+ * CP1251 to Unicode recoding table
+ * based on file mappings/CP1251.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__CP1251[128] = {
+    0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021,
+    0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F,
+    0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x0000, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F,
+    0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7,
+    0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407,
+    0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7,
+    0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457,
+    0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
+    0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F,
+    0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427,
+    0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F,
+    0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437,
+    0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F,
+    0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447,
+    0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F
+ };
+
+
+/*
+ * CP1252 to Unicode recoding table
+ * based on file mappings/CP1252.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__CP1252[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+    0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x017D, 0x0000,
+    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x017E, 0x0178,
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF
+ };
+
+
+/*
+ * CP1253 to Unicode recoding table
+ * based on file mappings/CP1253.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__CP1253[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+    0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x0000, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7,
+    0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F,
+    0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397,
+    0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F,
+    0x03A0, 0x03A1, 0x0000, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7,
+    0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF,
+    0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7,
+    0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF,
+    0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7,
+    0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0x0000
+ };
+
+
+/*
+ * CP1254 to Unicode recoding table
+ * based on file mappings/CP1254.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__CP1254[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+    0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, 0x0000, 0x0000, 0x0178,
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7,
+    0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF,
+    0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7,
+    0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF,
+    0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF,
+    0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7,
+    0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF
+ };
+
+
+/*
+ * CP1255 to Unicode recoding table
+ * based on file mappings/CP1255.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__CP1255[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+    0x02C6, 0x2030, 0x0000, 0x2039, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x02DC, 0x2122, 0x0000, 0x203A, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AA, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7,
+    0x05B8, 0x05B9, 0x0000, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF,
+    0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3,
+    0x05F4, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7,
+    0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF,
+    0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7,
+    0x05E8, 0x05E9, 0x05EA, 0x0000, 0x0000, 0x200E, 0x200F, 0x0000
+ };
+
+
+/*
+ * CP1256 to Unicode recoding table
+ * based on file mappings/CP1256.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__CP1256[128] = {
+    0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021,
+    0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688,
+    0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA,
+    0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7,
+    0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F,
+    0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627,
+    0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F,
+    0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7,
+    0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643,
+    0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7,
+    0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF,
+    0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7,
+    0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2
+ };
+
+
+/*
+ * CP1257 to Unicode recoding table
+ * based on file mappings/CP1257.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__CP1257[128] = {
+    0x20AC, 0x0000, 0x201A, 0x0000, 0x201E, 0x2026, 0x2020, 0x2021,
+    0x0000, 0x2030, 0x0000, 0x2039, 0x0000, 0x00A8, 0x02C7, 0x00B8,
+    0x0000, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014,
+    0x0000, 0x2122, 0x0000, 0x203A, 0x0000, 0x00AF, 0x02DB, 0x0000,
+    0x00A0, 0x0000, 0x00A2, 0x00A3, 0x00A4, 0x0000, 0x00A6, 0x00A7,
+    0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7,
+    0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6,
+    0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
+    0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B,
+    0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7,
+    0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF,
+    0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113,
+    0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C,
+    0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7,
+    0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9
+ };
+
+
+/*
+ * KOI8 to Unicode recoding table
+ * based on file mappings/KOI8-R.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__KOI8[128] = {
+    0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
+    0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
+    0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248,
+    0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7,
+    0x2550, 0x2551, 0x2552, 0x0451, 0x2553, 0x2554, 0x2555, 0x2556,
+    0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x255C, 0x255D, 0x255E,
+    0x255F, 0x2560, 0x2561, 0x0401, 0x2562, 0x2563, 0x2564, 0x2565,
+    0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x256B, 0x256C, 0x00A9,
+    0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
+    0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
+    0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
+    0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A,
+    0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
+    0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
+    0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
+    0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A
+ };
+
+
+/*
+ * KOI8_U to Unicode recoding table
+ * based on file mappings/KOI8-U.TXT by Unicode Consortium
+ */
+
+static const wxUint16 encoding_table__KOI8_U[128] = {
+    0x2500, 0x2502, 0x250C, 0x2510, 0x2514, 0x2518, 0x251C, 0x2524,
+    0x252C, 0x2534, 0x253C, 0x2580, 0x2584, 0x2588, 0x258C, 0x2590,
+    0x2591, 0x2592, 0x2593, 0x2320, 0x25A0, 0x2219, 0x221A, 0x2248,
+    0x2264, 0x2265, 0x00A0, 0x2321, 0x00B0, 0x00B2, 0x00B7, 0x00F7,
+    0x2550, 0x2551, 0x2552, 0x0451, 0x0454, 0x2554, 0x0456, 0x0457,
+    0x2557, 0x2558, 0x2559, 0x255A, 0x255B, 0x0491, 0x255D, 0x255E,
+    0x255F, 0x2560, 0x2561, 0x0401, 0x0403, 0x2563, 0x0406, 0x0407,
+    0x2566, 0x2567, 0x2568, 0x2569, 0x256A, 0x0490, 0x256C, 0x00A9,
+    0x044E, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433,
+    0x0445, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E,
+    0x043F, 0x044F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432,
+    0x044C, 0x044B, 0x0437, 0x0448, 0x044D, 0x0449, 0x0447, 0x044A,
+    0x042E, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413,
+    0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E,
+    0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412,
+    0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A
+ };
+
+
+
+
+
+/*
+ *
+ * Unicode to 7bit ASCII fallback
+ * (for use with wxRECODE_SUBSTITUTE recoding mode)
+ *
+ */
+
+static const struct {
+    wxUint16 c  /*code*/;
+    wxUint8  s /*inaccurate substitution*/;
+} encoding_unicode_fallback[] = {
+
+    {0x00AB, 0x22},
+    {0x00BB, 0x22},
+    {0x00C0, 0x41},
+    {0x00C1, 0x41},
+    {0x00C2, 0x41},
+    {0x00C3, 0x41},
+    {0x00C4, 0x41},
+    {0x00C5, 0x41},
+    {0x00C7, 0x43},
+    {0x00C8, 0x45},
+    {0x00C9, 0x45},
+    {0x00CA, 0x45},
+    {0x00CB, 0x45},
+    {0x00CC, 0x49},
+    {0x00CD, 0x49},
+    {0x00CE, 0x49},
+    {0x00CF, 0x49},
+    {0x00D1, 0x4E},
+    {0x00D2, 0x4F},
+    {0x00D3, 0x4F},
+    {0x00D4, 0x4F},
+    {0x00D5, 0x4F},
+    {0x00D6, 0x4F},
+    {0x00D8, 0x4F},
+    {0x00D9, 0x55},
+    {0x00DA, 0x55},
+    {0x00DB, 0x55},
+    {0x00DC, 0x55},
+    {0x00DD, 0x59},
+    {0x00E0, 0x61},
+    {0x00E1, 0x61},
+    {0x00E2, 0x61},
+    {0x00E3, 0x61},
+    {0x00E4, 0x61},
+    {0x00E5, 0x61},
+    {0x00E7, 0x63},
+    {0x00E8, 0x65},
+    {0x00E9, 0x65},
+    {0x00EA, 0x65},
+    {0x00EB, 0x65},
+    {0x00EC, 0x69},
+    {0x00ED, 0x69},
+    {0x00EE, 0x69},
+    {0x00EF, 0x69},
+    {0x00F1, 0x6E},
+    {0x00F2, 0x6F},
+    {0x00F3, 0x6F},
+    {0x00F4, 0x6F},
+    {0x00F5, 0x6F},
+    {0x00F6, 0x6F},
+    {0x00F8, 0x6F},
+    {0x00F9, 0x75},
+    {0x00FA, 0x75},
+    {0x00FB, 0x75},
+    {0x00FC, 0x75},
+    {0x00FD, 0x79},
+    {0x00FF, 0x79},
+    {0x0100, 0x41},
+    {0x0101, 0x61},
+    {0x0102, 0x41},
+    {0x0103, 0x61},
+    {0x0104, 0x41},
+    {0x0105, 0x61},
+    {0x0106, 0x43},
+    {0x0107, 0x63},
+    {0x0108, 0x43},
+    {0x0109, 0x63},
+    {0x010A, 0x43},
+    {0x010B, 0x63},
+    {0x010C, 0x43},
+    {0x010D, 0x63},
+    {0x010E, 0x44},
+    {0x010F, 0x64},
+    {0x0110, 0x44},
+    {0x0111, 0x64},
+    {0x0112, 0x45},
+    {0x0113, 0x65},
+    {0x0116, 0x45},
+    {0x0117, 0x65},
+    {0x0118, 0x45},
+    {0x0119, 0x65},
+    {0x011A, 0x45},
+    {0x011B, 0x65},
+    {0x011C, 0x47},
+    {0x011D, 0x67},
+    {0x011E, 0x47},
+    {0x011F, 0x67},
+    {0x0120, 0x47},
+    {0x0121, 0x67},
+    {0x0122, 0x47},
+    {0x0123, 0x67},
+    {0x0124, 0x48},
+    {0x0125, 0x68},
+    {0x0126, 0x48},
+    {0x0127, 0x68},
+    {0x0128, 0x49},
+    {0x0129, 0x69},
+    {0x012A, 0x49},
+    {0x012B, 0x69},
+    {0x012E, 0x49},
+    {0x012F, 0x69},
+    {0x0130, 0x49},
+    {0x0134, 0x4A},
+    {0x0135, 0x6A},
+    {0x0136, 0x4B},
+    {0x0137, 0x6B},
+    {0x0139, 0x4C},
+    {0x013A, 0x6C},
+    {0x013B, 0x4C},
+    {0x013C, 0x6C},
+    {0x013D, 0x4C},
+    {0x013E, 0x6C},
+    {0x0141, 0x4C},
+    {0x0142, 0x6C},
+    {0x0143, 0x4E},
+    {0x0144, 0x6E},
+    {0x0145, 0x4E},
+    {0x0146, 0x6E},
+    {0x0147, 0x4E},
+    {0x0148, 0x6E},
+    {0x014C, 0x4F},
+    {0x014D, 0x6F},
+    {0x0150, 0x4F},
+    {0x0151, 0x6F},
+    {0x0154, 0x52},
+    {0x0155, 0x72},
+    {0x0156, 0x52},
+    {0x0157, 0x72},
+    {0x0158, 0x52},
+    {0x0159, 0x72},
+    {0x015A, 0x53},
+    {0x015B, 0x73},
+    {0x015C, 0x53},
+    {0x015D, 0x73},
+    {0x015E, 0x53},
+    {0x015F, 0x73},
+    {0x0160, 0x53},
+    {0x0161, 0x73},
+    {0x0162, 0x54},
+    {0x0163, 0x74},
+    {0x0164, 0x54},
+    {0x0165, 0x74},
+    {0x0166, 0x54},
+    {0x0167, 0x74},
+    {0x0168, 0x55},
+    {0x0169, 0x75},
+    {0x016A, 0x55},
+    {0x016B, 0x75},
+    {0x016C, 0x55},
+    {0x016D, 0x75},
+    {0x016E, 0x55},
+    {0x016F, 0x75},
+    {0x0170, 0x55},
+    {0x0171, 0x75},
+    {0x0172, 0x55},
+    {0x0173, 0x75},
+    {0x0174, 0x57},
+    {0x0175, 0x77},
+    {0x0176, 0x59},
+    {0x0177, 0x79},
+    {0x0178, 0x59},
+    {0x0179, 0x5A},
+    {0x017A, 0x7A},
+    {0x017B, 0x5A},
+    {0x017C, 0x7A},
+    {0x017D, 0x5A},
+    {0x017E, 0x7A},
+    {0x0192, 0x66},
+    {0x1E02, 0x42},
+    {0x1E03, 0x62},
+    {0x1E0A, 0x44},
+    {0x1E0B, 0x64},
+    {0x1E1E, 0x46},
+    {0x1E1F, 0x66},
+    {0x1E40, 0x4D},
+    {0x1E41, 0x6D},
+    {0x1E56, 0x50},
+    {0x1E57, 0x70},
+    {0x1E60, 0x53},
+    {0x1E61, 0x73},
+    {0x1E6A, 0x54},
+    {0x1E6B, 0x74},
+    {0x1E80, 0x57},
+    {0x1E81, 0x77},
+    {0x1E82, 0x57},
+    {0x1E83, 0x77},
+    {0x1E84, 0x57},
+    {0x1E85, 0x77},
+    {0x1EF2, 0x59},
+    {0x1EF3, 0x79},
+    {0x2013, 0x2D},
+    {0x2014, 0x2D},
+    {0x2018, 0x27},
+    {0x2019, 0x27},
+    {0x201A, 0x27},
+    {0x201C, 0x22},
+    {0x201D, 0x22},
+    {0x201E, 0x22},
+    {0x2039, 0x27},
+    {0x203A, 0x27},
+    {0, 0}
+ };
+
+static const unsigned encoding_unicode_fallback_count =  200;
+
+
+
+
+/*
+ *
+ * Table of all supported encodings:
+ *
+ */
+
+static const struct {
+    wxFontEncoding encoding; // encoding identifier
+    const wxUint16 *table;         // 8bit to unicode table
+} encodings_list[] = {
+
+    { wxFONTENCODING_ISO8859_1, encoding_table__ISO8859_1},
+    { wxFONTENCODING_ISO8859_10, encoding_table__ISO8859_10},
+    { wxFONTENCODING_ISO8859_13, encoding_table__ISO8859_13},
+    { wxFONTENCODING_ISO8859_14, encoding_table__ISO8859_14},
+    { wxFONTENCODING_ISO8859_15, encoding_table__ISO8859_15},
+    { wxFONTENCODING_ISO8859_2, encoding_table__ISO8859_2},
+    { wxFONTENCODING_ISO8859_3, encoding_table__ISO8859_3},
+    { wxFONTENCODING_ISO8859_4, encoding_table__ISO8859_4},
+    { wxFONTENCODING_ISO8859_5, encoding_table__ISO8859_5},
+    { wxFONTENCODING_ISO8859_6, encoding_table__ISO8859_6},
+    { wxFONTENCODING_ISO8859_7, encoding_table__ISO8859_7},
+    { wxFONTENCODING_ISO8859_8, encoding_table__ISO8859_8},
+    { wxFONTENCODING_ISO8859_9, encoding_table__ISO8859_9},
+    { wxFONTENCODING_CP1250, encoding_table__CP1250},
+    { wxFONTENCODING_CP1251, encoding_table__CP1251},
+    { wxFONTENCODING_CP1252, encoding_table__CP1252},
+    { wxFONTENCODING_CP1253, encoding_table__CP1253},
+    { wxFONTENCODING_CP1254, encoding_table__CP1254},
+    { wxFONTENCODING_CP1255, encoding_table__CP1255},
+    { wxFONTENCODING_CP1256, encoding_table__CP1256},
+    { wxFONTENCODING_CP1257, encoding_table__CP1257},
+    { wxFONTENCODING_KOI8, encoding_table__KOI8},
+    { wxFONTENCODING_KOI8_U, encoding_table__KOI8_U},
+    {wxFONTENCODING_MAX /*anything*/, NULL}
+ };
diff --git a/Source/3rd Party/wx/src/common/uri.cpp b/Source/3rd Party/wx/src/common/uri.cpp
index 540752bb5..9ff50a0cc 100644
--- a/Source/3rd Party/wx/src/common/uri.cpp	
+++ b/Source/3rd Party/wx/src/common/uri.cpp	
@@ -1,1088 +1,1295 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/uri.cpp
-// Purpose:     Implementation of a URI parser
-// Author:      Ryan Norton,
-//              Vadim Zeitlin (UTF-8 URI support, many other changes)
-// Created:     10/26/04
-// RCS-ID:      $Id$
-// Copyright:   (c) 2004 Ryan Norton,
-//                  2008 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// declarations
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/crt.h"
-#endif
-
-#include "wx/uri.h"
-
-// ---------------------------------------------------------------------------
-// definitions
-// ---------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxURI, wxObject)
-
-// ===========================================================================
-// wxURI implementation
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// Constructors and cleanup
-// ---------------------------------------------------------------------------
-
-wxURI::wxURI()
-     : m_hostType(wxURI_REGNAME),
-       m_fields(0)
-{
-}
-
-wxURI::wxURI(const wxString& uri)
-     : m_hostType(wxURI_REGNAME),
-       m_fields(0)
-{
-    Create(uri);
-}
-
-bool wxURI::Create(const wxString& uri)
-{
-    if (m_fields)
-        Clear();
-
-    return Parse(uri.utf8_str());
-}
-
-void wxURI::Clear()
-{
-    m_scheme =
-    m_userinfo =
-    m_server =
-    m_port =
-    m_path =
-    m_query =
-    m_fragment = wxEmptyString;
-
-    m_hostType = wxURI_REGNAME;
-
-    m_fields = 0;
-}
-
-// ---------------------------------------------------------------------------
-// Escaped characters handling
-// ---------------------------------------------------------------------------
-
-// Converts a character into a numeric hexadecimal value, or -1 if the passed
-// in character is not a valid hex character
-
-/* static */
-int wxURI::CharToHex(char c)
-{
-    if ((c >= 'A') && (c <= 'Z'))
-        return c - 'A' + 10;
-    if ((c >= 'a') && (c <= 'z'))
-        return c - 'a' + 10;
-    if ((c >= '0') && (c <= '9'))
-        return c - '0';
-
-    return -1;
-}
-
-int wxURI::DecodeEscape(wxString::const_iterator& i)
-{
-    int hi = CharToHex(*++i);
-    if ( hi == -1 )
-        return -1;
-
-    int lo = CharToHex(*++i);
-    if ( lo == -1 )
-        return -1;
-
-    return (hi << 4) | lo;
-}
-
-/* static */
-wxString wxURI::Unescape(const wxString& uri)
-{
-    // the unescaped version can't be longer than the original one
-    wxCharBuffer buf(uri.length());
-    char *p = buf.data();
-
-    for ( wxString::const_iterator i = uri.begin(); i != uri.end(); ++i, ++p )
-    {
-        char c = *i;
-        if ( c == '%' )
-        {
-            int n = wxURI::DecodeEscape(i);
-            if ( n == -1 )
-                return wxString();
-
-            wxASSERT_MSG( n >= 0 && n <= 0xff, "unexpected character value" );
-
-            c = static_cast<char>(n);
-        }
-
-        *p = c;
-    }
-
-    *p = '\0';
-
-    // by default assume that the URI is in UTF-8, this is the most common
-    // practice
-    wxString s = wxString::FromUTF8(buf);
-    if ( s.empty() )
-    {
-        // if it isn't, use latin-1 as a fallback -- at least this always
-        // succeeds
-        s = wxCSConv(wxFONTENCODING_ISO8859_1).cMB2WC(buf);
-    }
-
-    return s;
-}
-
-void wxURI::AppendNextEscaped(wxString& s, const char *& p)
-{
-    // check for an already encoded character:
-    //
-    // pct-encoded   = "%" HEXDIG HEXDIG
-    if ( p[0] == '%' && IsHex(p[1]) && IsHex(p[2]) )
-    {
-        s += *p++;
-        s += *p++;
-        s += *p++;
-    }
-    else // really needs escaping
-    {
-        static const char* hexDigits = "0123456789abcdef";
-
-        const char c = *p++;
-
-        s += '%';
-        s += hexDigits[(c >> 4) & 15];
-        s += hexDigits[c & 15];
-    }
-}
-
-// ---------------------------------------------------------------------------
-// GetUser
-// GetPassword
-//
-// Gets the username and password via the old URL method.
-// ---------------------------------------------------------------------------
-wxString wxURI::GetUser() const
-{
-    // if there is no colon at all, find() returns npos and this method returns
-    // the entire string which is correct as it means that password was omitted
-    return m_userinfo(0, m_userinfo.find(':'));
-}
-
-wxString wxURI::GetPassword() const
-{
-      size_t posColon = m_userinfo.find(':');
-
-      if ( posColon == wxString::npos )
-          return "";
-
-      return m_userinfo(posColon + 1, wxString::npos);
-}
-
-// combine all URI fields in a single string, applying funcDecode to each
-// component which it may make sense to decode (i.e. "unescape")
-wxString wxURI::DoBuildURI(wxString (*funcDecode)(const wxString&)) const
-{
-    wxString ret;
-
-    if (HasScheme())
-        ret += m_scheme + ":";
-
-    if (HasServer())
-    {
-        ret += "//";
-
-        if (HasUserInfo())
-            ret += funcDecode(m_userinfo) + "@";
-
-        if (m_hostType == wxURI_REGNAME)
-            ret += funcDecode(m_server);
-        else
-            ret += m_server;
-
-        if (HasPort())
-            ret += ":" + m_port;
-    }
-
-    ret += funcDecode(m_path);
-
-    if (HasQuery())
-        ret += "?" + funcDecode(m_query);
-
-    if (HasFragment())
-        ret += "#" + funcDecode(m_fragment);
-
-    return ret;
-}
-
-// ---------------------------------------------------------------------------
-// Comparison
-// ---------------------------------------------------------------------------
-
-bool wxURI::operator==(const wxURI& uri) const
-{
-    if (HasScheme())
-    {
-        if(m_scheme != uri.m_scheme)
-            return false;
-    }
-    else if (uri.HasScheme())
-        return false;
-
-
-    if (HasServer())
-    {
-        if (HasUserInfo())
-        {
-            if (m_userinfo != uri.m_userinfo)
-                return false;
-        }
-        else if (uri.HasUserInfo())
-            return false;
-
-        if (m_server != uri.m_server ||
-            m_hostType != uri.m_hostType)
-            return false;
-
-        if (HasPort())
-        {
-            if(m_port != uri.m_port)
-                return false;
-        }
-        else if (uri.HasPort())
-            return false;
-    }
-    else if (uri.HasServer())
-        return false;
-
-
-    if (HasPath())
-    {
-        if(m_path != uri.m_path)
-            return false;
-    }
-    else if (uri.HasPath())
-        return false;
-
-    if (HasQuery())
-    {
-        if (m_query != uri.m_query)
-            return false;
-    }
-    else if (uri.HasQuery())
-        return false;
-
-    if (HasFragment())
-    {
-        if (m_fragment != uri.m_fragment)
-            return false;
-    }
-    else if (uri.HasFragment())
-        return false;
-
-    return true;
-}
-
-// ---------------------------------------------------------------------------
-// IsReference
-//
-// if there is no authority or scheme, it is a reference
-// ---------------------------------------------------------------------------
-
-bool wxURI::IsReference() const
-{
-    return !HasScheme() || !HasServer();
-}
-
-// ---------------------------------------------------------------------------
-// Parse
-//
-// Master URI parsing method.  Just calls the individual parsing methods
-//
-// URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
-// URI-reference = URI / relative
-// ---------------------------------------------------------------------------
-
-bool wxURI::Parse(const char *uri)
-{
-    uri = ParseScheme(uri);
-    if ( uri )
-        uri = ParseAuthority(uri);
-    if ( uri )
-        uri = ParsePath(uri);
-    if ( uri )
-        uri = ParseQuery(uri);
-    if ( uri )
-        uri = ParseFragment(uri);
-
-    // we only succeed if we parsed the entire string
-    return uri && *uri == '\0';
-}
-
-const char* wxURI::ParseScheme(const char *uri)
-{
-    const char * const start = uri;
-
-    // assume that we have a scheme if we have the valid start of it
-    if ( IsAlpha(*uri) )
-    {
-        m_scheme += *uri++;
-
-        //scheme        = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-        while (IsAlpha(*uri) || IsDigit(*uri) ||
-               *uri == '+'   ||
-               *uri == '-'   ||
-               *uri == '.')
-        {
-            m_scheme += *uri++;
-        }
-
-        //valid scheme?
-        if (*uri == ':')
-        {
-            //mark the scheme as valid
-            m_fields |= wxURI_SCHEME;
-
-            //move reference point up to input buffer
-            ++uri;
-        }
-        else // no valid scheme finally
-        {
-            uri = start; // rewind
-            m_scheme.clear();
-        }
-    }
-    //else: can't have schema, possible a relative URI
-
-    return uri;
-}
-
-const char* wxURI::ParseAuthority(const char* uri)
-{
-    // authority     = [ userinfo "@" ] host [ ":" port ]
-    if ( uri[0] == '/' && uri[1] == '/' )
-    {
-        //skip past the two slashes
-        uri += 2;
-
-        // ############# DEVIATION FROM RFC #########################
-        // Don't parse the server component for file URIs
-        if(m_scheme != "file")
-        {
-            //normal way
-            uri = ParseUserInfo(uri);
-            uri = ParseServer(uri);
-            return ParsePort(uri);
-        }
-    }
-
-    return uri;
-}
-
-const char* wxURI::ParseUserInfo(const char* uri)
-{
-    const char * const start = uri;
-
-    // userinfo      = *( unreserved / pct-encoded / sub-delims / ":" )
-    while ( *uri && *uri != '@' && *uri != '/' && *uri != '#' && *uri != '?' )
-    {
-        if ( IsUnreserved(*uri) || IsSubDelim(*uri) || *uri == ':' )
-            m_userinfo += *uri++;
-        else
-            AppendNextEscaped(m_userinfo, uri);
-    }
-
-    if ( *uri++ == '@' )
-    {
-        // valid userinfo
-        m_fields |= wxURI_USERINFO;
-    }
-    else
-    {
-        uri = start; // rewind
-        m_userinfo.clear();
-    }
-
-    return uri;
-}
-
-const char* wxURI::ParseServer(const char* uri)
-{
-    const char * const start = uri;
-
-    // host          = IP-literal / IPv4address / reg-name
-    // IP-literal    = "[" ( IPv6address / IPvFuture  ) "]"
-    if (*uri == '[')
-    {
-        ++uri;
-        if (ParseIPv6address(uri) && *uri == ']')
-        {
-            m_hostType = wxURI_IPV6ADDRESS;
-
-            m_server.assign(start + 1, uri - start - 1);
-            ++uri;
-        }
-        else
-        {
-            uri = start + 1; // skip the leading '[' again
-
-            if (ParseIPvFuture(uri) && *uri == ']')
-            {
-                m_hostType = wxURI_IPVFUTURE;
-
-                m_server.assign(start + 1, uri - start - 1);
-                ++uri;
-            }
-            else // unrecognized IP literal
-            {
-                uri = start;
-            }
-        }
-    }
-    else // IPv4 or a reg-name
-    {
-        if (ParseIPv4address(uri))
-        {
-            m_hostType = wxURI_IPV4ADDRESS;
-
-            m_server.assign(start, uri - start);
-        }
-        else
-        {
-            uri = start;
-        }
-    }
-
-    if ( m_hostType == wxURI_REGNAME )
-    {
-        uri = start;
-        // reg-name      = *( unreserved / pct-encoded / sub-delims )
-        while ( *uri && *uri != '/' && *uri != ':' && *uri != '#' && *uri != '?' )
-        {
-            if ( IsUnreserved(*uri) || IsSubDelim(*uri) )
-                m_server += *uri++;
-            else
-                AppendNextEscaped(m_server, uri);
-        }
-    }
-
-    m_fields |= wxURI_SERVER;
-
-    return uri;
-}
-
-
-const char* wxURI::ParsePort(const char* uri)
-{
-    // port          = *DIGIT
-    if( *uri == ':' )
-    {
-        ++uri;
-        while ( IsDigit(*uri) )
-        {
-            m_port += *uri++;
-        }
-
-        m_fields |= wxURI_PORT;
-    }
-
-    return uri;
-}
-
-const char* wxURI::ParsePath(const char* uri)
-{
-    /// hier-part     = "//" authority path-abempty
-    ///               / path-absolute
-    ///               / path-rootless
-    ///               / path-empty
-    ///
-    /// relative-part = "//" authority path-abempty
-    ///               / path-absolute
-    ///               / path-noscheme
-    ///               / path-empty
-    ///
-    /// path-abempty  = *( "/" segment )
-    /// path-absolute = "/" [ segment-nz *( "/" segment ) ]
-    /// path-noscheme = segment-nz-nc *( "/" segment )
-    /// path-rootless = segment-nz *( "/" segment )
-    /// path-empty    = 0<pchar>
-    ///
-    /// segment       = *pchar
-    /// segment-nz    = 1*pchar
-    /// segment-nz-nc = 1*( unreserved / pct-encoded / sub-delims / "@" )
-    ///               ; non-zero-length segment without any colon ":"
-    ///
-    /// pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-
-    if ( IsEndPath(*uri) )
-        return uri;
-
-    const bool isAbs = *uri == '/';
-    if ( isAbs )
-        m_path += *uri++;
-
-    wxArrayString segments;
-    wxString segment;
-    for ( ;; )
-    {
-        const bool endPath = IsEndPath(*uri);
-        if ( endPath || *uri == '/' )
-        {
-            // end of a segment, look at what we got
-            if ( segment == ".." )
-            {
-                if ( !segments.empty() && *segments.rbegin() != ".." )
-                    segments.pop_back();
-                else if ( !isAbs )
-                    segments.push_back("..");
-            }
-            else if ( segment == "." )
-            {
-                // normally we ignore "." but the last one should be taken into
-                // account as "path/." is the same as "path/" and not just "path"
-                if ( endPath )
-                    segments.push_back("");
-            }
-            else // normal segment
-            {
-                segments.push_back(segment);
-            }
-
-            if ( endPath )
-                break;
-
-            segment.clear();
-            ++uri;
-            continue;
-        }
-
-        if ( IsUnreserved(*uri) || IsSubDelim(*uri) || *uri == ':' || *uri == '@' )
-            segment += *uri++;
-        else
-            AppendNextEscaped(segment, uri);
-    }
-
-    m_path += wxJoin(segments, '/', '\0');
-    m_fields |= wxURI_PATH;
-
-    return uri;
-}
-
-
-const char* wxURI::ParseQuery(const char* uri)
-{
-    // query         = *( pchar / "/" / "?" )
-    if ( *uri == '?' )
-    {
-        ++uri;
-        while ( *uri && *uri != '#' )
-        {
-            if ( IsUnreserved(*uri) || IsSubDelim(*uri) ||
-                    *uri == ':' || *uri == '@' || *uri == '/' || *uri == '?' )
-                m_query += *uri++;
-            else
-                AppendNextEscaped(m_query, uri);
-        }
-
-        m_fields |= wxURI_QUERY;
-    }
-
-    return uri;
-}
-
-
-const char* wxURI::ParseFragment(const char* uri)
-{
-    // fragment      = *( pchar / "/" / "?" )
-    if ( *uri == '#' )
-    {
-        ++uri;
-        while ( *uri )
-        {
-            if ( IsUnreserved(*uri) || IsSubDelim(*uri) ||
-                    *uri == ':' || *uri == '@' || *uri == '/' || *uri == '?')
-                m_fragment += *uri++;
-            else
-                AppendNextEscaped(m_fragment, uri);
-        }
-
-        m_fields |= wxURI_FRAGMENT;
-    }
-
-    return uri;
-}
-
-// ---------------------------------------------------------------------------
-// Resolve
-//
-// Builds missing components of this uri from a base uri
-//
-// A version of the algorithm outlined in the RFC is used here
-// (it is shown in comments)
-//
-// Note that an empty URI inherits all components
-// ---------------------------------------------------------------------------
-
-/* static */
-wxArrayString wxURI::SplitInSegments(const wxString& path)
-{
-    return wxSplit(path, '/', '\0' /* no escape character */);
-}
-
-void wxURI::Resolve(const wxURI& base, int flags)
-{
-    wxASSERT_MSG(!base.IsReference(),
-                "wxURI to inherit from must not be a reference!");
-
-    // If we aren't being strict, enable the older (pre-RFC2396) loophole that
-    // allows this uri to inherit other properties from the base uri - even if
-    // the scheme is defined
-    if ( !(flags & wxURI_STRICT) &&
-            HasScheme() && base.HasScheme() &&
-                m_scheme == base.m_scheme )
-    {
-        m_fields -= wxURI_SCHEME;
-    }
-
-
-    // Do nothing if this is an absolute wxURI
-    //    if defined(R.scheme) then
-    //       T.scheme    = R.scheme;
-    //       T.authority = R.authority;
-    //       T.path      = remove_dot_segments(R.path);
-    //       T.query     = R.query;
-    if (HasScheme())
-        return;
-
-    //No scheme - inherit
-    m_scheme = base.m_scheme;
-    m_fields |= wxURI_SCHEME;
-
-    // All we need to do for relative URIs with an
-    // authority component is just inherit the scheme
-    //       if defined(R.authority) then
-    //          T.authority = R.authority;
-    //          T.path      = remove_dot_segments(R.path);
-    //          T.query     = R.query;
-    if (HasServer())
-        return;
-
-    //No authority - inherit
-    if (base.HasUserInfo())
-    {
-        m_userinfo = base.m_userinfo;
-        m_fields |= wxURI_USERINFO;
-    }
-
-    m_server = base.m_server;
-    m_hostType = base.m_hostType;
-    m_fields |= wxURI_SERVER;
-
-    if (base.HasPort())
-    {
-        m_port = base.m_port;
-        m_fields |= wxURI_PORT;
-    }
-
-
-    // Simple path inheritance from base
-    if (!HasPath())
-    {
-        //             T.path = Base.path;
-        m_path = base.m_path;
-        m_fields |= wxURI_PATH;
-
-
-        //             if defined(R.query) then
-        //                T.query = R.query;
-        //             else
-        //                T.query = Base.query;
-        //             endif;
-        if (!HasQuery())
-        {
-            m_query = base.m_query;
-            m_fields |= wxURI_QUERY;
-        }
-    }
-    else if ( m_path.empty() || m_path[0u] != '/' )
-    {
-        //             if (R.path starts-with "/") then
-        //                T.path = remove_dot_segments(R.path);
-        //             else
-        //                T.path = merge(Base.path, R.path);
-        //                T.path = remove_dot_segments(T.path);
-        //             endif;
-        //             T.query = R.query;
-        //
-        // So we don't do anything for absolute paths and implement merge for
-        // the relative ones
-
-        wxArrayString our(SplitInSegments(m_path)),
-                      result(SplitInSegments(base.m_path));
-
-        if ( !result.empty() )
-            result.pop_back();
-
-        if ( our.empty() )
-        {
-            // if we have an empty path it means we were constructed from a "."
-            // string or something similar (e.g. "././././"), it should count
-            // as (empty) segment
-            our.push_back("");
-        }
-
-        const wxArrayString::const_iterator end = our.end();
-        for ( wxArrayString::const_iterator i = our.begin(); i != end; ++i )
-        {
-            if ( i->empty() || *i == "." )
-            {
-                // as in ParsePath(), while normally we ignore the empty
-                // segments, we need to take account of them at the end
-                if ( i == end - 1 )
-                    result.push_back("");
-                continue;
-            }
-
-            if ( *i == ".." )
-            {
-                if ( !result.empty() )
-                {
-                    result.pop_back();
-
-                    if ( i == end - 1 )
-                        result.push_back("");
-                }
-                //else: just ignore, extra ".." don't accumulate
-            }
-            else
-            {
-                if ( result.empty() )
-                {
-                    // ensure that the resulting path will always be absolute
-                    result.push_back("");
-                }
-
-                result.push_back(*i);
-            }
-        }
-
-        m_path = wxJoin(result, '/', '\0');
-    }
-
-    //T.fragment = R.fragment;
-}
-
-// ---------------------------------------------------------------------------
-// ParseH16
-//
-// Parses 1 to 4 hex values.  Returns true if the first character of the input
-// string is a valid hex character.  It is the caller's responsibility to move
-// the input string back to its original position on failure.
-// ---------------------------------------------------------------------------
-
-bool wxURI::ParseH16(const char*& uri)
-{
-    // h16           = 1*4HEXDIG
-    if(!IsHex(*++uri))
-        return false;
-
-    if(IsHex(*++uri) && IsHex(*++uri) && IsHex(*++uri))
-        ++uri;
-
-    return true;
-}
-
-// ---------------------------------------------------------------------------
-// ParseIPXXX
-//
-// Parses a certain version of an IP address and moves the input string past
-// it.  Returns true if the input  string contains the proper version of an ip
-// address.  It is the caller's responsibility to move the input string back
-// to its original position on failure.
-// ---------------------------------------------------------------------------
-
-bool wxURI::ParseIPv4address(const char*& uri)
-{
-    //IPv4address   = dec-octet "." dec-octet "." dec-octet "." dec-octet
-    //
-    //dec-octet     =      DIGIT                    ; 0-9
-    //                / %x31-39 DIGIT               ; 10-99
-    //                / "1" 2DIGIT                  ; 100-199
-    //                / "2" %x30-34 DIGIT           ; 200-249
-    //                / "25" %x30-35                ; 250-255
-    size_t iIPv4 = 0;
-    if (IsDigit(*uri))
-    {
-        ++iIPv4;
-
-
-        //each ip part must be between 0-255 (dupe of version in for loop)
-        if( IsDigit(*++uri) && IsDigit(*++uri) &&
-           //100 or less  (note !)
-           !( (*(uri-2) < '2') ||
-           //240 or less
-             (*(uri-2) == '2' &&
-               (*(uri-1) < '5' || (*(uri-1) == '5' && *uri <= '5'))
-             )
-            )
-          )
-        {
-            return false;
-        }
-
-        if(IsDigit(*uri))++uri;
-
-        //compilers should unroll this loop
-        for(; iIPv4 < 4; ++iIPv4)
-        {
-            if (*uri != '.' || !IsDigit(*++uri))
-                break;
-
-            //each ip part must be between 0-255
-            if( IsDigit(*++uri) && IsDigit(*++uri) &&
-               //100 or less  (note !)
-               !( (*(uri-2) < '2') ||
-               //240 or less
-                 (*(uri-2) == '2' &&
-                   (*(uri-1) < '5' || (*(uri-1) == '5' && *uri <= '5'))
-                 )
-                )
-              )
-            {
-                return false;
-            }
-            if(IsDigit(*uri))++uri;
-        }
-    }
-    return iIPv4 == 4;
-}
-
-bool wxURI::ParseIPv6address(const char*& uri)
-{
-    // IPv6address   =                            6( h16 ":" ) ls32
-    //               /                       "::" 5( h16 ":" ) ls32
-    //               / [               h16 ] "::" 4( h16 ":" ) ls32
-    //               / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
-    //               / [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
-    //               / [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32
-    //               / [ *4( h16 ":" ) h16 ] "::"              ls32
-    //               / [ *5( h16 ":" ) h16 ] "::"              h16
-    //               / [ *6( h16 ":" ) h16 ] "::"
-
-    size_t numPrefix = 0,
-              maxPostfix;
-
-    bool bEndHex = false;
-
-    for( ; numPrefix < 6; ++numPrefix)
-    {
-        if(!ParseH16(uri))
-        {
-            --uri;
-            bEndHex = true;
-            break;
-        }
-
-        if(*uri != ':')
-        {
-            break;
-        }
-    }
-
-    if(!bEndHex && !ParseH16(uri))
-    {
-        --uri;
-
-        if (numPrefix)
-            return false;
-
-        if (*uri == ':')
-        {
-            if (*++uri != ':')
-                return false;
-
-            maxPostfix = 5;
-        }
-        else
-            maxPostfix = 6;
-    }
-    else
-    {
-        if (*uri != ':' || *(uri+1) != ':')
-        {
-            if (numPrefix != 6)
-                return false;
-
-            while (*--uri != ':') {}
-            ++uri;
-
-            const char * const start = uri;
-            //parse ls32
-            // ls32          = ( h16 ":" h16 ) / IPv4address
-            if (ParseH16(uri) && *uri == ':' && ParseH16(uri))
-                return true;
-
-            uri = start;
-
-            if (ParseIPv4address(uri))
-                return true;
-            else
-                return false;
-        }
-        else
-        {
-            uri += 2;
-
-            if (numPrefix > 3)
-                maxPostfix = 0;
-            else
-                maxPostfix = 4 - numPrefix;
-        }
-    }
-
-    bool bAllowAltEnding = maxPostfix == 0;
-
-    for(; maxPostfix != 0; --maxPostfix)
-    {
-        if(!ParseH16(uri) || *uri != ':')
-            return false;
-    }
-
-    if(numPrefix <= 4)
-    {
-        const char * const start = uri;
-        //parse ls32
-        // ls32          = ( h16 ":" h16 ) / IPv4address
-        if (ParseH16(uri) && *uri == ':' && ParseH16(uri))
-            return true;
-
-        uri = start;
-
-        if (ParseIPv4address(uri))
-            return true;
-
-        uri = start;
-
-        if (!bAllowAltEnding)
-            return false;
-    }
-
-    if(numPrefix <= 5 && ParseH16(uri))
-        return true;
-
-    return true;
-}
-
-bool wxURI::ParseIPvFuture(const char*& uri)
-{
-    // IPvFuture     = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
-    if (*++uri != 'v' || !IsHex(*++uri))
-        return false;
-
-    while (IsHex(*++uri))
-        ;
-
-    if (*uri != '.' || !(IsUnreserved(*++uri) || IsSubDelim(*uri) || *uri == ':'))
-        return false;
-
-    while(IsUnreserved(*++uri) || IsSubDelim(*uri) || *uri == ':') {}
-
-    return true;
-}
-
-
-// ---------------------------------------------------------------------------
-// IsXXX
-//
-// Returns true if the passed in character meets the criteria of the method
-// ---------------------------------------------------------------------------
-
-// unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-bool wxURI::IsUnreserved(char c)
-{
-    return IsAlpha(c) ||
-           IsDigit(c) ||
-           c == '-' ||
-           c == '.' ||
-           c == '_' ||
-           c == '~'
-           ;
-}
-
-bool wxURI::IsReserved(char c)
-{
-    return IsGenDelim(c) || IsSubDelim(c);
-}
-
-// gen-delims    = ":" / "/" / "?" / "#" / "[" / "]" / "@"
-bool wxURI::IsGenDelim(char c)
-{
-    return c == ':' ||
-           c == '/' ||
-           c == '?' ||
-           c == '#' ||
-           c == '[' ||
-           c == ']' ||
-           c == '@';
-}
-
-// sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
-//               / "*" / "+" / "," / ";" / "="
-bool wxURI::IsSubDelim(char c)
-{
-    return c == '!' ||
-           c == '$' ||
-           c == '&' ||
-           c == '\'' ||
-           c == '(' ||
-           c == ')' ||
-           c == '*' ||
-           c == '+' ||
-           c == ',' ||
-           c == ';' ||
-           c == '='
-           ;
-}
-
-bool wxURI::IsHex(char c)
-{
-    return IsDigit(c) ||
-           (c >= 'a' && c <= 'f') ||
-           (c >= 'A' && c <= 'F');
-}
-
-bool wxURI::IsAlpha(char c)
-{
-    return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
-}
-
-bool wxURI::IsDigit(char c)
-{
-    return c >= '0' && c <= '9';
-}
-
-bool wxURI::IsEndPath(char c)
-{
-    return c == '\0' || c == '#' || c == '?';
-}
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        uri.cpp
+// Purpose:     Implementation of a uri parser
+// Author:      Ryan Norton
+// Created:     10/26/04
+// RCS-ID:      $Id: uri.cpp 58728 2009-02-07 22:03:30Z VZ $
+// Copyright:   (c) 2004 Ryan Norton
+// Licence:     wxWindows
+/////////////////////////////////////////////////////////////////////////////
+
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/uri.h"
+
+// ---------------------------------------------------------------------------
+// definitions
+// ---------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxURI, wxObject)
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// utilities
+// ---------------------------------------------------------------------------
+
+// ---------------------------------------------------------------------------
+//
+//                        wxURI
+//
+// ---------------------------------------------------------------------------
+
+// ---------------------------------------------------------------------------
+//  Constructors
+// ---------------------------------------------------------------------------
+
+wxURI::wxURI() : m_hostType(wxURI_REGNAME), m_fields(0)
+{
+}
+
+wxURI::wxURI(const wxString& uri) : m_hostType(wxURI_REGNAME), m_fields(0)
+{
+    Create(uri);
+}
+
+wxURI::wxURI(const wxURI& uri)  : wxObject(), m_hostType(wxURI_REGNAME), m_fields(0)
+{
+    Assign(uri);
+}
+
+// ---------------------------------------------------------------------------
+// Destructor and cleanup
+// ---------------------------------------------------------------------------
+
+wxURI::~wxURI()
+{
+    Clear();
+}
+
+void wxURI::Clear()
+{
+    m_scheme = m_userinfo = m_server = m_port = m_path =
+    m_query = m_fragment = wxEmptyString;
+
+    m_hostType = wxURI_REGNAME;
+
+    m_fields = 0;
+}
+
+// ---------------------------------------------------------------------------
+// Create
+//
+// This creates the URI - all we do here is call the main parsing method
+// ---------------------------------------------------------------------------
+
+const wxChar* wxURI::Create(const wxString& uri)
+{
+    if (m_fields)
+        Clear();
+
+    return Parse(uri);
+}
+
+// ---------------------------------------------------------------------------
+// Escape Methods
+//
+// TranslateEscape unencodes a 3 character URL escape sequence
+//
+// Escape encodes an invalid URI character into a 3 character sequence
+//
+// IsEscape determines if the input string contains an escape sequence,
+// if it does, then it moves the input string past the escape sequence
+//
+// Unescape unencodes all 3 character URL escape sequences in a wxString
+// ---------------------------------------------------------------------------
+
+wxChar wxURI::TranslateEscape(const wxChar* s)
+{
+    wxASSERT_MSG( IsHex(s[0]) && IsHex(s[1]), wxT("Invalid escape sequence!"));
+
+    return wx_truncate_cast(wxChar, (CharToHex(s[0]) << 4 ) | CharToHex(s[1]));
+}
+
+wxString wxURI::Unescape(const wxString& uri)
+{
+    wxString new_uri;
+
+    for(size_t i = 0; i < uri.length(); ++i)
+    {
+        if (uri[i] == wxT('%'))
+        {
+            new_uri += wxURI::TranslateEscape( &(uri.c_str()[i+1]) );
+            i += 2;
+        }
+        else
+            new_uri += uri[i];
+    }
+
+    return new_uri;
+}
+
+void wxURI::Escape(wxString& s, const wxChar& c)
+{
+    const wxChar* hdig = wxT("0123456789abcdef");
+    s += wxT('%');
+    s += hdig[(c >> 4) & 15];
+    s += hdig[c & 15];
+}
+
+bool wxURI::IsEscape(const wxChar*& uri)
+{
+    // pct-encoded   = "%" HEXDIG HEXDIG
+    if(*uri == wxT('%') && IsHex(*(uri+1)) && IsHex(*(uri+2)))
+        return true;
+    else
+        return false;
+}
+
+// ---------------------------------------------------------------------------
+// GetUser
+// GetPassword
+//
+// Gets the username and password via the old URL method.
+// ---------------------------------------------------------------------------
+wxString wxURI::GetUser() const
+{
+    // if there is no colon at all, find() returns npos and this method returns
+    // the entire string which is correct as it means that password was omitted
+    return m_userinfo(0, m_userinfo.find(':'));
+}
+
+wxString wxURI::GetPassword() const
+{
+      size_t posColon = m_userinfo.find(':');
+
+      if ( posColon == wxString::npos )
+          return wxT("");
+
+      return m_userinfo(posColon + 1, wxString::npos);
+}
+
+// ---------------------------------------------------------------------------
+// BuildURI
+//
+// BuildURI() builds the entire URI into a useable
+// representation, including proper identification characters such as slashes
+//
+// BuildUnescapedURI() does the same thing as BuildURI(), only it unescapes
+// the components that accept escape sequences
+// ---------------------------------------------------------------------------
+
+wxString wxURI::BuildURI() const
+{
+    wxString ret;
+
+    if (HasScheme())
+        ret = ret + m_scheme + wxT(":");
+
+    if (HasServer())
+    {
+        ret += wxT("//");
+
+        if (HasUserInfo())
+            ret = ret + m_userinfo + wxT("@");
+
+        ret += m_server;
+
+        if (HasPort())
+            ret = ret + wxT(":") + m_port;
+    }
+
+    ret += m_path;
+
+    if (HasQuery())
+        ret = ret + wxT("?") + m_query;
+
+    if (HasFragment())
+        ret = ret + wxT("#") + m_fragment;
+
+    return ret;
+}
+
+wxString wxURI::BuildUnescapedURI() const
+{
+    wxString ret;
+
+    if (HasScheme())
+        ret = ret + m_scheme + wxT(":");
+
+    if (HasServer())
+    {
+        ret += wxT("//");
+
+        if (HasUserInfo())
+            ret = ret + wxURI::Unescape(m_userinfo) + wxT("@");
+
+        if (m_hostType == wxURI_REGNAME)
+            ret += wxURI::Unescape(m_server);
+        else
+            ret += m_server;
+
+        if (HasPort())
+            ret = ret + wxT(":") + m_port;
+    }
+
+    ret += wxURI::Unescape(m_path);
+
+    if (HasQuery())
+        ret = ret + wxT("?") + wxURI::Unescape(m_query);
+
+    if (HasFragment())
+        ret = ret + wxT("#") + wxURI::Unescape(m_fragment);
+
+    return ret;
+}
+
+// ---------------------------------------------------------------------------
+// Assignment
+// ---------------------------------------------------------------------------
+
+wxURI& wxURI::Assign(const wxURI& uri)
+{
+    //assign fields
+    m_fields = uri.m_fields;
+
+    //ref over components
+    m_scheme = uri.m_scheme;
+    m_userinfo = uri.m_userinfo;
+    m_server = uri.m_server;
+    m_hostType = uri.m_hostType;
+    m_port = uri.m_port;
+    m_path = uri.m_path;
+    m_query = uri.m_query;
+    m_fragment = uri.m_fragment;
+
+    return *this;
+}
+
+wxURI& wxURI::operator = (const wxURI& uri)
+{
+    return Assign(uri);
+}
+
+wxURI& wxURI::operator = (const wxString& string)
+{
+    Create(string);
+    return *this;
+}
+
+// ---------------------------------------------------------------------------
+// Comparison
+// ---------------------------------------------------------------------------
+
+bool wxURI::operator == (const wxURI& uri) const
+{
+    if (HasScheme())
+    {
+        if(m_scheme != uri.m_scheme)
+            return false;
+    }
+    else if (uri.HasScheme())
+        return false;
+
+
+    if (HasServer())
+    {
+        if (HasUserInfo())
+        {
+            if (m_userinfo != uri.m_userinfo)
+                return false;
+        }
+        else if (uri.HasUserInfo())
+            return false;
+
+        if (m_server != uri.m_server ||
+            m_hostType != uri.m_hostType)
+            return false;
+
+        if (HasPort())
+        {
+            if(m_port != uri.m_port)
+                return false;
+        }
+        else if (uri.HasPort())
+            return false;
+    }
+    else if (uri.HasServer())
+        return false;
+
+
+    if (HasPath())
+    {
+        if(m_path != uri.m_path)
+            return false;
+    }
+    else if (uri.HasPath())
+        return false;
+
+    if (HasQuery())
+    {
+        if (m_query != uri.m_query)
+            return false;
+    }
+    else if (uri.HasQuery())
+        return false;
+
+    if (HasFragment())
+    {
+        if (m_fragment != uri.m_fragment)
+            return false;
+    }
+    else if (uri.HasFragment())
+        return false;
+
+    return true;
+}
+
+// ---------------------------------------------------------------------------
+// IsReference
+//
+// if there is no authority or scheme, it is a reference
+// ---------------------------------------------------------------------------
+
+bool wxURI::IsReference() const
+{   return !HasScheme() || !HasServer();  }
+
+// ---------------------------------------------------------------------------
+// Parse
+//
+// Master URI parsing method.  Just calls the individual parsing methods
+//
+// URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
+// URI-reference = URI / relative
+// ---------------------------------------------------------------------------
+
+const wxChar* wxURI::Parse(const wxChar* uri)
+{
+    uri = ParseScheme(uri);
+    uri = ParseAuthority(uri);
+    uri = ParsePath(uri);
+    uri = ParseQuery(uri);
+    return ParseFragment(uri);
+}
+
+// ---------------------------------------------------------------------------
+// ParseXXX
+//
+// Individual parsers for each URI component
+// ---------------------------------------------------------------------------
+
+const wxChar* wxURI::ParseScheme(const wxChar* uri)
+{
+    wxASSERT(uri != NULL);
+
+    //copy of the uri - used for figuring out
+    //length of each component
+    const wxChar* uricopy = uri;
+
+    //Does the uri have a scheme (first character alpha)?
+    if (IsAlpha(*uri))
+    {
+        m_scheme += *uri++;
+
+        //scheme        = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
+        while (IsAlpha(*uri) || IsDigit(*uri) ||
+               *uri == wxT('+')   ||
+               *uri == wxT('-')   ||
+               *uri == wxT('.'))
+        {
+            m_scheme += *uri++;
+        }
+
+        //valid scheme?
+        if (*uri == wxT(':'))
+        {
+            //mark the scheme as valid
+            m_fields |= wxURI_SCHEME;
+
+            //move reference point up to input buffer
+            uricopy = ++uri;
+        }
+        else
+            //relative uri with relative path reference
+            m_scheme = wxEmptyString;
+    }
+//    else
+        //relative uri with _possible_ relative path reference
+
+    return uricopy;
+}
+
+const wxChar* wxURI::ParseAuthority(const wxChar* uri)
+{
+    // authority     = [ userinfo "@" ] host [ ":" port ]
+    if (*uri == wxT('/') && *(uri+1) == wxT('/'))
+    {
+        //skip past the two slashes
+        uri += 2;
+
+        // ############# DEVIATION FROM RFC #########################
+        // Don't parse the server component for file URIs
+        if(m_scheme != wxT("file"))
+        {
+            //normal way
+        uri = ParseUserInfo(uri);
+        uri = ParseServer(uri);
+        return ParsePort(uri);
+        }
+    }
+
+    return uri;
+}
+
+const wxChar* wxURI::ParseUserInfo(const wxChar* uri)
+{
+    wxASSERT(uri != NULL);
+
+    //copy of the uri - used for figuring out
+    //length of each component
+    const wxChar* uricopy = uri;
+
+    // userinfo      = *( unreserved / pct-encoded / sub-delims / ":" )
+    while(*uri && *uri != wxT('@') && *uri != wxT('/') && *uri != wxT('#') && *uri != wxT('?'))
+    {
+        if(IsUnreserved(*uri) ||
+           IsSubDelim(*uri) || *uri == wxT(':'))
+            m_userinfo += *uri++;
+        else if (IsEscape(uri))
+        {
+            m_userinfo += *uri++;
+            m_userinfo += *uri++;
+            m_userinfo += *uri++;
+        }
+        else
+            Escape(m_userinfo, *uri++);
+    }
+
+    if(*uri == wxT('@'))
+    {
+        //valid userinfo
+        m_fields |= wxURI_USERINFO;
+
+        uricopy = ++uri;
+    }
+    else
+        m_userinfo = wxEmptyString;
+
+    return uricopy;
+}
+
+const wxChar* wxURI::ParseServer(const wxChar* uri)
+{
+    wxASSERT(uri != NULL);
+
+    //copy of the uri - used for figuring out
+    //length of each component
+    const wxChar* uricopy = uri;
+
+    // host          = IP-literal / IPv4address / reg-name
+    // IP-literal    = "[" ( IPv6address / IPvFuture  ) "]"
+    if (*uri == wxT('['))
+    {
+        ++uri; //some compilers don't support *&ing a ++*
+        if (ParseIPv6address(uri) && *uri == wxT(']'))
+        {
+            ++uri;
+            m_hostType = wxURI_IPV6ADDRESS;
+
+            wxStringBufferLength theBuffer(m_server, uri - uricopy);
+            wxTmemcpy(theBuffer, uricopy, uri-uricopy);
+            theBuffer.SetLength(uri-uricopy);
+        }
+        else
+        {
+            uri = uricopy;
+
+            ++uri; //some compilers don't support *&ing a ++*
+            if (ParseIPvFuture(uri) && *uri == wxT(']'))
+            {
+                ++uri;
+                m_hostType = wxURI_IPVFUTURE;
+
+                wxStringBufferLength theBuffer(m_server, uri - uricopy);
+                wxTmemcpy(theBuffer, uricopy, uri-uricopy);
+                theBuffer.SetLength(uri-uricopy);
+            }
+            else
+                uri = uricopy;
+        }
+    }
+    else
+    {
+        if (ParseIPv4address(uri))
+        {
+            m_hostType = wxURI_IPV4ADDRESS;
+
+            wxStringBufferLength theBuffer(m_server, uri - uricopy);
+            wxTmemcpy(theBuffer, uricopy, uri-uricopy);
+            theBuffer.SetLength(uri-uricopy);
+        }
+        else
+            uri = uricopy;
+    }
+
+    if(m_hostType == wxURI_REGNAME)
+    {
+        uri = uricopy;
+        // reg-name      = *( unreserved / pct-encoded / sub-delims )
+        while(*uri && *uri != wxT('/') && *uri != wxT(':') && *uri != wxT('#') && *uri != wxT('?'))
+        {
+            if(IsUnreserved(*uri) ||  IsSubDelim(*uri))
+                m_server += *uri++;
+            else if (IsEscape(uri))
+            {
+                m_server += *uri++;
+                m_server += *uri++;
+                m_server += *uri++;
+            }
+            else
+                Escape(m_server, *uri++);
+        }
+    }
+
+    //mark the server as valid
+    m_fields |= wxURI_SERVER;
+
+    return uri;
+}
+
+
+const wxChar* wxURI::ParsePort(const wxChar* uri)
+{
+    wxASSERT(uri != NULL);
+
+    // port          = *DIGIT
+    if(*uri == wxT(':'))
+    {
+        ++uri;
+        while(IsDigit(*uri))
+        {
+            m_port += *uri++;
+        }
+
+        //mark the port as valid
+        m_fields |= wxURI_PORT;
+    }
+
+    return uri;
+}
+
+const wxChar* wxURI::ParsePath(const wxChar* uri, bool bReference, bool bNormalize)
+{
+    wxASSERT(uri != NULL);
+
+    //copy of the uri - used for figuring out
+    //length of each component
+    const wxChar* uricopy = uri;
+
+    /// hier-part     = "//" authority path-abempty
+    ///               / path-absolute
+    ///               / path-rootless
+    ///               / path-empty
+    ///
+    /// relative-part = "//" authority path-abempty
+    ///               / path-absolute
+    ///               / path-noscheme
+    ///               / path-empty
+    ///
+    /// path-abempty  = *( "/" segment )
+    /// path-absolute = "/" [ segment-nz *( "/" segment ) ]
+    /// path-noscheme = segment-nz-nc *( "/" segment )
+    /// path-rootless = segment-nz *( "/" segment )
+    /// path-empty    = 0<pchar>
+    ///
+    /// segment       = *pchar
+    /// segment-nz    = 1*pchar
+    /// segment-nz-nc = 1*( unreserved / pct-encoded / sub-delims / "@" )
+    ///               ; non-zero-length segment without any colon ":"
+    ///
+    /// pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+    if (*uri == wxT('/'))
+    {
+        m_path += *uri++;
+
+        while(*uri && *uri != wxT('#') && *uri != wxT('?'))
+        {
+            if( IsUnreserved(*uri) || IsSubDelim(*uri) ||
+                *uri == wxT(':') || *uri == wxT('@') || *uri == wxT('/'))
+                m_path += *uri++;
+            else if (IsEscape(uri))
+            {
+                m_path += *uri++;
+                m_path += *uri++;
+                m_path += *uri++;
+            }
+            else
+                Escape(m_path, *uri++);
+        }
+
+        if (bNormalize)
+        {
+            wxStringBufferLength theBuffer(m_path, m_path.length() + 1);
+#if wxUSE_STL
+            wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1);
+#endif
+            Normalize(theBuffer, true);
+            theBuffer.SetLength(wxStrlen(theBuffer));
+        }
+        //mark the path as valid
+        m_fields |= wxURI_PATH;
+    }
+    else if(*uri) //Relative path
+    {
+        if (bReference)
+        {
+            //no colon allowed
+            while(*uri && *uri != wxT('#') && *uri != wxT('?'))
+            {
+                if(IsUnreserved(*uri) || IsSubDelim(*uri) ||
+                  *uri == wxT('@') || *uri == wxT('/'))
+                    m_path += *uri++;
+                else if (IsEscape(uri))
+                {
+                    m_path += *uri++;
+                    m_path += *uri++;
+                    m_path += *uri++;
+                }
+                else
+                    Escape(m_path, *uri++);
+            }
+        }
+        else
+        {
+            while(*uri && *uri != wxT('#') && *uri != wxT('?'))
+            {
+                if(IsUnreserved(*uri) || IsSubDelim(*uri) ||
+                   *uri == wxT(':') || *uri == wxT('@') || *uri == wxT('/'))
+                    m_path += *uri++;
+                else if (IsEscape(uri))
+                {
+                    m_path += *uri++;
+                    m_path += *uri++;
+                    m_path += *uri++;
+                }
+                else
+                    Escape(m_path, *uri++);
+            }
+        }
+
+        if (uri != uricopy)
+        {
+            if (bNormalize)
+            {
+                wxStringBufferLength theBuffer(m_path, m_path.length() + 1);
+#if wxUSE_STL
+                wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1);
+#endif
+                Normalize(theBuffer);
+                theBuffer.SetLength(wxStrlen(theBuffer));
+            }
+
+            //mark the path as valid
+            m_fields |= wxURI_PATH;
+        }
+    }
+
+    return uri;
+}
+
+
+const wxChar* wxURI::ParseQuery(const wxChar* uri)
+{
+    wxASSERT(uri != NULL);
+
+    // query         = *( pchar / "/" / "?" )
+    if (*uri == wxT('?'))
+    {
+        ++uri;
+        while(*uri && *uri != wxT('#'))
+        {
+            if (IsUnreserved(*uri) || IsSubDelim(*uri) ||
+                *uri == wxT(':') || *uri == wxT('@') || *uri == wxT('/') || *uri == wxT('?'))
+                  m_query += *uri++;
+            else if (IsEscape(uri))
+            {
+                  m_query += *uri++;
+                  m_query += *uri++;
+                  m_query += *uri++;
+            }
+            else
+                  Escape(m_query, *uri++);
+        }
+
+        //mark the server as valid
+        m_fields |= wxURI_QUERY;
+    }
+
+    return uri;
+}
+
+
+const wxChar* wxURI::ParseFragment(const wxChar* uri)
+{
+    wxASSERT(uri != NULL);
+
+    // fragment      = *( pchar / "/" / "?" )
+    if (*uri == wxT('#'))
+    {
+        ++uri;
+        while(*uri)
+        {
+            if (IsUnreserved(*uri) || IsSubDelim(*uri) ||
+                *uri == wxT(':') || *uri == wxT('@') || *uri == wxT('/') || *uri == wxT('?'))
+                  m_fragment += *uri++;
+            else if (IsEscape(uri))
+            {
+                  m_fragment += *uri++;
+                  m_fragment += *uri++;
+                  m_fragment += *uri++;
+            }
+            else
+                  Escape(m_fragment, *uri++);
+        }
+
+        //mark the server as valid
+        m_fields |= wxURI_FRAGMENT;
+    }
+
+    return uri;
+}
+
+// ---------------------------------------------------------------------------
+// Resolve
+//
+// Builds missing components of this uri from a base uri
+//
+// A version of the algorithm outlined in the RFC is used here
+// (it is shown in comments)
+//
+// Note that an empty URI inherits all components
+// ---------------------------------------------------------------------------
+
+void wxURI::Resolve(const wxURI& base, int flags)
+{
+    wxASSERT_MSG(!base.IsReference(),
+                wxT("wxURI to inherit from must not be a reference!"));
+
+    // If we arn't being strict, enable the older (pre-RFC2396)
+    // loophole that allows this uri to inherit other
+    // properties from the base uri - even if the scheme
+    // is defined
+    if ( !(flags & wxURI_STRICT) &&
+            HasScheme() && base.HasScheme() &&
+                m_scheme == base.m_scheme )
+    {
+        m_fields -= wxURI_SCHEME;
+    }
+
+
+    // Do nothing if this is an absolute wxURI
+    //    if defined(R.scheme) then
+    //       T.scheme    = R.scheme;
+    //       T.authority = R.authority;
+    //       T.path      = remove_dot_segments(R.path);
+    //       T.query     = R.query;
+    if (HasScheme())
+    {
+        return;
+    }
+
+    //No scheme - inherit
+    m_scheme = base.m_scheme;
+    m_fields |= wxURI_SCHEME;
+
+    // All we need to do for relative URIs with an
+    // authority component is just inherit the scheme
+    //       if defined(R.authority) then
+    //          T.authority = R.authority;
+    //          T.path      = remove_dot_segments(R.path);
+    //          T.query     = R.query;
+    if (HasServer())
+    {
+        return;
+    }
+
+    //No authority - inherit
+    if (base.HasUserInfo())
+    {
+        m_userinfo = base.m_userinfo;
+        m_fields |= wxURI_USERINFO;
+    }
+
+    m_server = base.m_server;
+    m_hostType = base.m_hostType;
+    m_fields |= wxURI_SERVER;
+
+    if (base.HasPort())
+    {
+        m_port = base.m_port;
+        m_fields |= wxURI_PORT;
+    }
+
+
+    // Simple path inheritance from base
+    if (!HasPath())
+    {
+        //             T.path = Base.path;
+        m_path = base.m_path;
+        m_fields |= wxURI_PATH;
+
+
+        //             if defined(R.query) then
+        //                T.query = R.query;
+        //             else
+        //                T.query = Base.query;
+        //             endif;
+        if (!HasQuery())
+        {
+            m_query = base.m_query;
+            m_fields |= wxURI_QUERY;
+        }
+    }
+    else
+    {
+        //             if (R.path starts-with "/") then
+        //                T.path = remove_dot_segments(R.path);
+        //             else
+        //                T.path = merge(Base.path, R.path);
+        //                T.path = remove_dot_segments(T.path);
+        //             endif;
+        //             T.query = R.query;
+        if (m_path.empty() || m_path[0u] != wxT('/'))
+        {
+            //Merge paths
+            const wxChar* op = m_path.c_str();
+            const wxChar* bp = base.m_path.c_str() + base.m_path.Length();
+
+            //not a ending directory?  move up
+            if (base.m_path[0] && *(bp-1) != wxT('/'))
+                UpTree(base.m_path, bp);
+
+            //normalize directories
+            while(*op == wxT('.') && *(op+1) == wxT('.') &&
+                       (*(op+2) == '\0' || *(op+2) == wxT('/')) )
+            {
+                UpTree(base.m_path, bp);
+
+                if (*(op+2) == '\0')
+                    op += 2;
+                else
+                    op += 3;
+            }
+
+            m_path = base.m_path.substr(0, bp - base.m_path.c_str()) +
+                    m_path.substr((op - m_path.c_str()), m_path.Length());
+        }
+    }
+
+    //T.fragment = R.fragment;
+}
+
+// ---------------------------------------------------------------------------
+// UpTree
+//
+// Moves a URI path up a directory
+// ---------------------------------------------------------------------------
+
+//static
+void wxURI::UpTree(const wxChar* uristart, const wxChar*& uri)
+{
+    if (uri != uristart && *(uri-1) == wxT('/'))
+    {
+        uri -= 2;
+    }
+
+    for(;uri != uristart; --uri)
+    {
+        if (*uri == wxT('/'))
+        {
+            ++uri;
+            break;
+        }
+    }
+
+    //!!!TODO:HACK!!!//
+    if (uri == uristart && *uri == wxT('/'))
+        ++uri;
+    //!!!//
+}
+
+// ---------------------------------------------------------------------------
+// Normalize
+//
+// Normalizes directories in-place
+//
+// I.E. ./ and . are ignored
+//
+// ../ and .. are removed if a directory is before it, along
+// with that directory (leading .. and ../ are kept)
+// ---------------------------------------------------------------------------
+
+//static
+void wxURI::Normalize(wxChar* s, bool bIgnoreLeads)
+{
+    wxChar* cp = s;
+    wxChar* bp = s;
+
+    if(s[0] == wxT('/'))
+        ++bp;
+
+    while(*cp)
+    {
+        if (*cp == wxT('.') && (*(cp+1) == wxT('/') || *(cp+1) == '\0')
+            && (bp == cp || *(cp-1) == wxT('/')))
+        {
+            //. _or_ ./  - ignore
+            if (*(cp+1) == '\0')
+                cp += 1;
+            else
+                cp += 2;
+        }
+        else if (*cp == wxT('.') && *(cp+1) == wxT('.') &&
+                (*(cp+2) == wxT('/') || *(cp+2) == '\0')
+                && (bp == cp || *(cp-1) == wxT('/')))
+        {
+            //.. _or_ ../ - go up the tree
+            if (s != bp)
+            {
+                UpTree((const wxChar*)bp, (const wxChar*&)s);
+
+                if (*(cp+2) == '\0')
+                    cp += 2;
+                else
+                    cp += 3;
+            }
+            else if (!bIgnoreLeads)
+
+            {
+                *bp++ = *cp++;
+                *bp++ = *cp++;
+                if (*cp)
+                    *bp++ = *cp++;
+
+                s = bp;
+            }
+            else
+            {
+                if (*(cp+2) == '\0')
+                    cp += 2;
+                else
+                    cp += 3;
+            }
+        }
+        else
+            *s++ = *cp++;
+    }
+
+    *s = '\0';
+}
+
+// ---------------------------------------------------------------------------
+// ParseH16
+//
+// Parses 1 to 4 hex values.  Returns true if the first character of the input
+// string is a valid hex character.  It is the caller's responsability to move
+// the input string back to its original position on failure.
+// ---------------------------------------------------------------------------
+
+bool wxURI::ParseH16(const wxChar*& uri)
+{
+    // h16           = 1*4HEXDIG
+    if(!IsHex(*++uri))
+        return false;
+
+    if(IsHex(*++uri) && IsHex(*++uri) && IsHex(*++uri))
+        ++uri;
+
+    return true;
+}
+
+// ---------------------------------------------------------------------------
+// ParseIPXXX
+//
+// Parses a certain version of an IP address and moves the input string past
+// it.  Returns true if the input  string contains the proper version of an ip
+// address.  It is the caller's responsability to move the input string back
+// to its original position on failure.
+// ---------------------------------------------------------------------------
+
+bool wxURI::ParseIPv4address(const wxChar*& uri)
+{
+    //IPv4address   = dec-octet "." dec-octet "." dec-octet "." dec-octet
+    //
+    //dec-octet     =      DIGIT                    ; 0-9
+    //                / %x31-39 DIGIT               ; 10-99
+    //                / "1" 2DIGIT                  ; 100-199
+    //                / "2" %x30-34 DIGIT           ; 200-249
+    //                / "25" %x30-35                ; 250-255
+    size_t iIPv4 = 0;
+    if (IsDigit(*uri))
+    {
+        ++iIPv4;
+
+
+        //each ip part must be between 0-255 (dupe of version in for loop)
+        if( IsDigit(*++uri) && IsDigit(*++uri) &&
+           //100 or less  (note !)
+           !( (*(uri-2) < wxT('2')) ||
+           //240 or less
+             (*(uri-2) == wxT('2') &&
+               (*(uri-1) < wxT('5') || (*(uri-1) == wxT('5') && *uri <= wxT('5')))
+             )
+            )
+          )
+        {
+            return false;
+        }
+
+        if(IsDigit(*uri))++uri;
+
+        //compilers should unroll this loop
+        for(; iIPv4 < 4; ++iIPv4)
+        {
+            if (*uri != wxT('.') || !IsDigit(*++uri))
+                break;
+
+            //each ip part must be between 0-255
+            if( IsDigit(*++uri) && IsDigit(*++uri) &&
+               //100 or less  (note !)
+               !( (*(uri-2) < wxT('2')) ||
+               //240 or less
+                 (*(uri-2) == wxT('2') &&
+                   (*(uri-1) < wxT('5') || (*(uri-1) == wxT('5') && *uri <= wxT('5')))
+                 )
+                )
+              )
+            {
+                return false;
+            }
+            if(IsDigit(*uri))++uri;
+        }
+    }
+    return iIPv4 == 4;
+}
+
+bool wxURI::ParseIPv6address(const wxChar*& uri)
+{
+    // IPv6address   =                            6( h16 ":" ) ls32
+    //               /                       "::" 5( h16 ":" ) ls32
+    //               / [               h16 ] "::" 4( h16 ":" ) ls32
+    //               / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
+    //               / [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
+    //               / [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32
+    //               / [ *4( h16 ":" ) h16 ] "::"              ls32
+    //               / [ *5( h16 ":" ) h16 ] "::"              h16
+    //               / [ *6( h16 ":" ) h16 ] "::"
+
+    size_t numPrefix = 0,
+              maxPostfix;
+
+    bool bEndHex = false;
+
+    for( ; numPrefix < 6; ++numPrefix)
+    {
+        if(!ParseH16(uri))
+        {
+            --uri;
+            bEndHex = true;
+            break;
+        }
+
+        if(*uri != wxT(':'))
+        {
+            break;
+        }
+    }
+
+    if(!bEndHex && !ParseH16(uri))
+    {
+        --uri;
+
+        if (numPrefix)
+            return false;
+
+        if (*uri == wxT(':'))
+        {
+            if (*++uri != wxT(':'))
+                return false;
+
+            maxPostfix = 5;
+        }
+        else
+            maxPostfix = 6;
+    }
+    else
+    {
+        if (*uri != wxT(':') || *(uri+1) != wxT(':'))
+        {
+            if (numPrefix != 6)
+                return false;
+
+            while (*--uri != wxT(':')) {}
+            ++uri;
+
+            const wxChar* uristart = uri;
+            //parse ls32
+            // ls32          = ( h16 ":" h16 ) / IPv4address
+            if (ParseH16(uri) && *uri == wxT(':') && ParseH16(uri))
+                return true;
+
+            uri = uristart;
+
+            if (ParseIPv4address(uri))
+                return true;
+            else
+                return false;
+        }
+        else
+        {
+            uri += 2;
+
+            if (numPrefix > 3)
+                maxPostfix = 0;
+            else
+                maxPostfix = 4 - numPrefix;
+        }
+    }
+
+    bool bAllowAltEnding = maxPostfix == 0;
+
+    for(; maxPostfix != 0; --maxPostfix)
+    {
+        if(!ParseH16(uri) || *uri != wxT(':'))
+            return false;
+    }
+
+    if(numPrefix <= 4)
+    {
+        const wxChar* uristart = uri;
+        //parse ls32
+        // ls32          = ( h16 ":" h16 ) / IPv4address
+        if (ParseH16(uri) && *uri == wxT(':') && ParseH16(uri))
+            return true;
+
+        uri = uristart;
+
+        if (ParseIPv4address(uri))
+            return true;
+
+        uri = uristart;
+
+        if (!bAllowAltEnding)
+            return false;
+    }
+
+    if(numPrefix <= 5 && ParseH16(uri))
+        return true;
+
+    return true;
+}
+
+bool wxURI::ParseIPvFuture(const wxChar*& uri)
+{
+    // IPvFuture     = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
+    if (*++uri != wxT('v') || !IsHex(*++uri))
+        return false;
+
+    while (IsHex(*++uri)) {}
+
+    if (*uri != wxT('.') || !(IsUnreserved(*++uri) || IsSubDelim(*uri) || *uri == wxT(':')))
+        return false;
+
+    while(IsUnreserved(*++uri) || IsSubDelim(*uri) || *uri == wxT(':')) {}
+
+    return true;
+}
+
+
+// ---------------------------------------------------------------------------
+// CharToHex
+//
+// Converts a character into a numeric hexidecimal value, or 0 if the
+// passed in character is not a valid hex character
+// ---------------------------------------------------------------------------
+
+//static
+wxChar wxURI::CharToHex(const wxChar& c)
+{
+    if ((c >= wxT('A')) && (c <= wxT('Z'))) return wxChar(c - wxT('A') + 0x0A);
+    if ((c >= wxT('a')) && (c <= wxT('z'))) return wxChar(c - wxT('a') + 0x0a);
+    if ((c >= wxT('0')) && (c <= wxT('9'))) return wxChar(c - wxT('0') + 0x00);
+
+    return 0;
+}
+
+// ---------------------------------------------------------------------------
+// IsXXX
+//
+// Returns true if the passed in character meets the criteria of the method
+// ---------------------------------------------------------------------------
+
+//! unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+bool wxURI::IsUnreserved (const wxChar& c)
+{   return IsAlpha(c) || IsDigit(c) ||
+           c == wxT('-') ||
+           c == wxT('.') ||
+           c == wxT('_') ||
+           c == wxT('~') //tilde
+           ;
+}
+
+bool wxURI::IsReserved (const wxChar& c)
+{
+    return IsGenDelim(c) || IsSubDelim(c);
+}
+
+//! gen-delims    = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+bool wxURI::IsGenDelim (const wxChar& c)
+{
+    return c == wxT(':') ||
+           c == wxT('/') ||
+           c == wxT('?') ||
+           c == wxT('#') ||
+           c == wxT('[') ||
+           c == wxT(']') ||
+           c == wxT('@');
+}
+
+//! sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+//!               / "*" / "+" / "," / ";" / "="
+bool wxURI::IsSubDelim (const wxChar& c)
+{
+    return c == wxT('!') ||
+           c == wxT('$') ||
+           c == wxT('&') ||
+           c == wxT('\'') ||
+           c == wxT('(') ||
+           c == wxT(')') ||
+           c == wxT('*') ||
+           c == wxT('+') ||
+           c == wxT(',') ||
+           c == wxT(';') ||
+           c == wxT('=')
+           ;
+}
+
+bool wxURI::IsHex(const wxChar& c)
+{   return IsDigit(c) || (c >= wxT('a') && c <= wxT('f')) || (c >= wxT('A') && c <= wxT('F')); }
+
+bool wxURI::IsAlpha(const wxChar& c)
+{   return (c >= wxT('a') && c <= wxT('z')) || (c >= wxT('A') && c <= wxT('Z'));  }
+
+bool wxURI::IsDigit(const wxChar& c)
+{   return c >= wxT('0') && c <= wxT('9');        }
+
+
+//end of uri.cpp
+
+
+
diff --git a/Source/3rd Party/wx/src/common/ustring.cpp b/Source/3rd Party/wx/src/common/ustring.cpp
deleted file mode 100644
index efa1e1939..000000000
--- a/Source/3rd Party/wx/src/common/ustring.cpp	
+++ /dev/null
@@ -1,538 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/ustring.cpp
-// Purpose:     wxUString class
-// Author:      Robert Roebling
-// Created:     2008-07-25
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/ustring.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/crt.h"
-    #include "wx/log.h"
-#endif
-
-wxUString &wxUString::assignFromAscii( const char *str )
-{
-   size_type len = wxStrlen( str );
-
-   wxU32CharBuffer buffer( len );
-   wxChar32 *ptr = buffer.data();
-
-   size_type i;
-   for (i = 0; i < len; i++)
-   {
-       *ptr = *str;
-       ptr++;
-       str++;
-   }
-
-   return assign( buffer );
-}
-
-wxUString &wxUString::assignFromAscii( const char *str, size_type n )
-{
-   size_type len = 0;
-   const char *s = str;
-   while (len < n && *s)
-   {
-       len++;
-       s++;
-   }
-
-   wxU32CharBuffer buffer( len );
-   wxChar32 *ptr = buffer.data();
-
-   size_type i;
-   for (i = 0; i < len; i++)
-   {
-       *ptr = *str;
-       ptr++;
-       str++;
-   }
-
-   return *this;
-}
-
-// ----------------------------------------------------------------------------
-// UTF-8
-// ----------------------------------------------------------------------------
-
-// this table gives the length of the UTF-8 encoding from its first character:
-const unsigned char tableUtf8Lengths[256] = {
-    // single-byte sequences (ASCII):
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 00..0F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 10..1F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 20..2F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 30..3F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 40..4F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 50..5F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 60..6F
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 70..7F
-
-    // these are invalid:
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // 80..8F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // 90..9F
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // A0..AF
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  // B0..BF
-    0, 0,                                            // C0,C1
-
-    // two-byte sequences:
-          2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,  // C2..CF
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,  // D0..DF
-
-    // three-byte sequences:
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,  // E0..EF
-
-    // four-byte sequences:
-    4, 4, 4, 4, 4,                                   // F0..F4
-
-    // these are invalid again (5- or 6-byte
-    // sequences and sequences for code points
-    // above U+10FFFF, as restricted by RFC 3629):
-                   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0   // F5..FF
-};
-
-wxUString &wxUString::assignFromUTF8( const char *str )
-{
-    if (!str)
-        return assign( wxUString() );
-
-    size_type ucs4_len = 0;
-    const char *p = str;
-    while (*p)
-    {
-        unsigned char c = *p;
-        size_type len = tableUtf8Lengths[c];
-        if (!len)
-           return assign( wxUString() );  // don't try to convert invalid UTF-8
-        ucs4_len++;
-        p += len;
-    }
-
-    wxU32CharBuffer buffer( ucs4_len );
-    wxChar32 *out = buffer.data();
-
-    p = str;
-    while (*p)
-    {
-        unsigned char c = *p;
-        if (c < 0x80)
-        {
-            *out = c;
-            p++;
-        }
-        else
-        {
-            size_type len = tableUtf8Lengths[c];  // len == 0 is caught above
-
-            //   Char. number range   |        UTF-8 octet sequence
-            //      (hexadecimal)     |              (binary)
-            //  ----------------------+----------------------------------------
-            //  0000 0000 - 0000 007F | 0xxxxxxx
-            //  0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx
-            //  0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-            //  0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-            //
-            //  Code point value is stored in bits marked with 'x',
-            //  lowest-order bit of the value on the right side in the diagram
-            //  above.                                         (from RFC 3629)
-
-            // mask to extract lead byte's value ('x' bits above), by sequence
-            // length:
-            static const unsigned char leadValueMask[] = { 0x7F, 0x1F, 0x0F, 0x07 };
-
-            // mask and value of lead byte's most significant bits, by length:
-            static const unsigned char leadMarkerMask[] = { 0x80, 0xE0, 0xF0, 0xF8 };
-            static const unsigned char leadMarkerVal[] = { 0x00, 0xC0, 0xE0, 0xF0 };
-
-            len--; // it's more convenient to work with 0-based length here
-
-            // extract the lead byte's value bits:
-            if ( (c & leadMarkerMask[len]) != leadMarkerVal[len] )
-                break;
-
-            wxChar32 code = c & leadValueMask[len];
-
-            // all remaining bytes, if any, are handled in the same way
-            // regardless of sequence's length:
-            for ( ; len; --len )
-            {
-                c = *++p;
-                if ( (c & 0xC0) != 0x80 )
-                    return assign( wxUString() );  // don't try to convert invalid UTF-8
-
-                code <<= 6;
-                code |= c & 0x3F;
-            }
-
-            *out = code;
-            p++;
-        }
-        out++;
-    }
-
-    return assign( buffer.data() );
-}
-
-wxUString &wxUString::assignFromUTF8( const char *str, size_type n )
-{
-    if (!str)
-        return assign( wxUString() );
-
-    size_type ucs4_len = 0;
-    size_type utf8_pos = 0;
-    const char *p = str;
-    while (*p)
-    {
-        unsigned char c = *p;
-        size_type len = tableUtf8Lengths[c];
-        if (!len)
-           return assign( wxUString() );  // don't try to convert invalid UTF-8
-        if (utf8_pos + len > n)
-            break;
-        utf8_pos += len;
-        ucs4_len ++;
-        p += len;
-    }
-
-    wxU32CharBuffer buffer( ucs4_len );
-    wxChar32 *out = buffer.data();
-
-    utf8_pos = 0;
-    p = str;
-    while (*p)
-    {
-        unsigned char c = *p;
-        if (c < 0x80)
-        {
-            if (utf8_pos + 1 > n)
-                break;
-            utf8_pos++;
-
-            *out = c;
-            p++;
-        }
-        else
-        {
-            size_type len = tableUtf8Lengths[c];  // len == 0 is caught above
-            if (utf8_pos + len > n)
-                break;
-            utf8_pos += len;
-
-            //   Char. number range   |        UTF-8 octet sequence
-            //      (hexadecimal)     |              (binary)
-            //  ----------------------+----------------------------------------
-            //  0000 0000 - 0000 007F | 0xxxxxxx
-            //  0000 0080 - 0000 07FF | 110xxxxx 10xxxxxx
-            //  0000 0800 - 0000 FFFF | 1110xxxx 10xxxxxx 10xxxxxx
-            //  0001 0000 - 0010 FFFF | 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-            //
-            //  Code point value is stored in bits marked with 'x',
-            //  lowest-order bit of the value on the right side in the diagram
-            //  above.                                         (from RFC 3629)
-
-            // mask to extract lead byte's value ('x' bits above), by sequence
-            // length:
-            static const unsigned char leadValueMask[] = { 0x7F, 0x1F, 0x0F, 0x07 };
-
-            // mask and value of lead byte's most significant bits, by length:
-            static const unsigned char leadMarkerMask[] = { 0x80, 0xE0, 0xF0, 0xF8 };
-            static const unsigned char leadMarkerVal[] = { 0x00, 0xC0, 0xE0, 0xF0 };
-
-            len--; // it's more convenient to work with 0-based length here
-
-            // extract the lead byte's value bits:
-            if ( (c & leadMarkerMask[len]) != leadMarkerVal[len] )
-                break;
-
-            wxChar32 code = c & leadValueMask[len];
-
-            // all remaining bytes, if any, are handled in the same way
-            // regardless of sequence's length:
-            for ( ; len; --len )
-            {
-                c = *++p;
-                if ( (c & 0xC0) != 0x80 )
-                    return assign( wxUString() );  // don't try to convert invalid UTF-8
-
-                code <<= 6;
-                code |= c & 0x3F;
-            }
-
-            *out = code;
-            p++;
-        }
-        out++;
-    }
-
-    *out = 0;
-
-    return assign( buffer.data() );
-}
-
-wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
-{
-    if (!str)
-        return assign( wxUString() );
-
-    size_type ucs4_len = 0;
-    size_type utf16_pos = 0;
-    const wxChar16 *p = str;
-    while (*p)
-    {
-        size_type len;
-        if ((*p < 0xd800) || (*p > 0xdfff))
-        {
-            len = 1;
-        }
-        else if ((p[1] < 0xdc00) || (p[1] > 0xdfff))
-        {
-            return assign( wxUString() );  // don't try to convert invalid UTF-16
-        }
-        else
-        {
-           len = 2;
-        }
-
-        if (utf16_pos + len > n)
-            break;
-
-        ucs4_len++;
-        p += len;
-        utf16_pos += len;
-    }
-
-    wxU32CharBuffer buffer( ucs4_len );
-    wxChar32 *out = buffer.data();
-
-    utf16_pos = 0;
-
-    p = str;
-    while (*p)
-    {
-        if ((*p < 0xd800) || (*p > 0xdfff))
-        {
-            if (utf16_pos + 1 > n)
-                break;
-
-            *out = *p;
-            p++;
-            utf16_pos++;
-        }
-        else
-        {
-            if (utf16_pos + 2 > n)
-                break;
-
-           *out = ((p[0] - 0xd7c0) << 10) + (p[1] - 0xdc00);
-           p += 2;
-           utf16_pos += 2;
-        }
-        out++;
-    }
-
-    return assign( buffer.data() );
-}
-
-wxUString &wxUString::assignFromUTF16( const wxChar16* str )
-{
-    if (!str)
-        return assign( wxUString() );
-
-    size_type ucs4_len = 0;
-    const wxChar16 *p = str;
-    while (*p)
-    {
-        size_type len;
-        if ((*p < 0xd800) || (*p > 0xdfff))
-        {
-            len = 1;
-        }
-        else if ((p[1] < 0xdc00) || (p[1] > 0xdfff))
-        {
-            return assign( wxUString() );  // don't try to convert invalid UTF-16
-        }
-        else
-        {
-           len = 2;
-        }
-
-        ucs4_len++;
-        p += len;
-    }
-
-    wxU32CharBuffer buffer( ucs4_len );
-    wxChar32 *out = buffer.data();
-
-    p = str;
-    while (*p)
-    {
-        if ((*p < 0xd800) || (*p > 0xdfff))
-        {
-            *out = *p;
-            p++;
-        }
-        else
-        {
-           *out = ((p[0] - 0xd7c0) << 10) + (p[1] - 0xdc00);
-           p += 2;
-        }
-        out++;
-    }
-
-    return assign( buffer.data() );
-}
-
-wxUString &wxUString::assignFromCString( const char* str )
-{
-    if (!str)
-        return assign( wxUString() );
-
-    wxScopedWCharBuffer buffer = wxConvLibc.cMB2WC( str );
-
-    return assign( buffer );
-}
-
-wxUString &wxUString::assignFromCString( const char* str, const wxMBConv &conv )
-{
-    if (!str)
-        return assign( wxUString() );
-
-    wxScopedWCharBuffer buffer = conv.cMB2WC( str );
-
-    return assign( buffer );
-}
-
-wxScopedCharBuffer wxUString::utf8_str() const
-{
-    size_type utf8_length = 0;
-    const wxChar32 *ptr = data();
-
-    while (*ptr)
-    {
-        wxChar32 code = *ptr;
-        ptr++;
-
-        if ( code <= 0x7F )
-        {
-            utf8_length++;
-        }
-        else if ( code <= 0x07FF )
-        {
-            utf8_length += 2;
-        }
-        else if ( code < 0xFFFF )
-        {
-            utf8_length += 3;
-        }
-        else if ( code <= 0x10FFFF )
-        {
-            utf8_length += 4;
-        }
-        else
-        {
-            // invalid range, skip
-        }
-    }
-
-    wxCharBuffer result( utf8_length );
-
-    char *out = result.data();
-
-    ptr = data();
-    while (*ptr)
-    {
-        wxChar32 code = *ptr;
-        ptr++;
-
-        if ( code <= 0x7F )
-        {
-            out[0] = (char)code;
-            out++;
-        }
-        else if ( code <= 0x07FF )
-        {
-            out[1] = 0x80 | (code & 0x3F);  code >>= 6;
-            out[0] = 0xC0 | code;
-            out += 2;
-        }
-        else if ( code < 0xFFFF )
-        {
-            out[2] = 0x80 | (code & 0x3F);  code >>= 6;
-            out[1] = 0x80 | (code & 0x3F);  code >>= 6;
-            out[0] = 0xE0 | code;
-            out += 3;
-        }
-        else if ( code <= 0x10FFFF )
-        {
-            out[3] = 0x80 | (code & 0x3F);  code >>= 6;
-            out[2] = 0x80 | (code & 0x3F);  code >>= 6;
-            out[1] = 0x80 | (code & 0x3F);  code >>= 6;
-            out[0] = 0xF0 | code;
-            out += 4;
-        }
-        else
-        {
-            // invalid range, skip
-        }
-    }
-
-    return result;
-}
-
-wxScopedU16CharBuffer wxUString::utf16_str() const
-{
-    size_type utf16_length = 0;
-    const wxChar32 *ptr = data();
-
-    while (*ptr)
-    {
-        wxChar32 code = *ptr;
-        ptr++;
-
-        // TODO: error range checks
-
-        if (code < 0x10000)
-           utf16_length++;
-        else
-           utf16_length += 2;
-    }
-
-    wxU16CharBuffer result( utf16_length );
-    wxChar16 *out = result.data();
-
-    ptr = data();
-
-    while (*ptr)
-    {
-        wxChar32 code = *ptr;
-        ptr++;
-
-        // TODO: error range checks
-
-        if (code < 0x10000)
-        {
-           out[0] = code;
-           out++;
-        }
-        else
-        {
-           out[0] = (code - 0x10000) / 0x400 + 0xd800;
-           out[1] = (code - 0x10000) % 0x400 + 0xdc00;
-           out += 2;
-        }
-    }
-
-    return result;
-}
diff --git a/Source/3rd Party/wx/src/common/utilscmn.cpp b/Source/3rd Party/wx/src/common/utilscmn.cpp
index bb2f74128..e2835b7d7 100644
--- a/Source/3rd Party/wx/src/common/utilscmn.cpp	
+++ b/Source/3rd Party/wx/src/common/utilscmn.cpp	
@@ -1,1679 +1,1417 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/utilscmn.cpp
-// Purpose:     Miscellaneous utility functions and classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     29/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/string.h"
-    #include "wx/utils.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-
-    #if wxUSE_GUI
-        #include "wx/window.h"
-        #include "wx/frame.h"
-        #include "wx/menu.h"
-        #include "wx/msgdlg.h"
-        #include "wx/textdlg.h"
-        #include "wx/textctrl.h"    // for wxTE_PASSWORD
-        #if wxUSE_ACCEL
-            #include "wx/menuitem.h"
-            #include "wx/accel.h"
-        #endif // wxUSE_ACCEL
-    #endif // wxUSE_GUI
-#endif // WX_PRECOMP
-
-#include "wx/apptrait.h"
-
-#include "wx/process.h"
-#include "wx/txtstrm.h"
-#include "wx/uri.h"
-#include "wx/mimetype.h"
-#include "wx/config.h"
-#include "wx/versioninfo.h"
-
-#if defined(__WXWINCE__) && wxUSE_DATETIME
-    #include "wx/datetime.h"
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if !wxONLY_WATCOM_EARLIER_THAN(1,4)
-    #if !(defined(_MSC_VER) && (_MSC_VER > 800))
-        #include <errno.h>
-    #endif
-#endif
-
-#if wxUSE_GUI
-    #include "wx/colordlg.h"
-    #include "wx/fontdlg.h"
-    #include "wx/notebook.h"
-    #include "wx/statusbr.h"
-#endif // wxUSE_GUI
-
-#ifndef __WXWINCE__
-    #include <time.h>
-#else
-    #include "wx/msw/wince/time.h"
-#endif
-
-#ifdef __WXMAC__
-    #include "wx/osx/private.h"
-#endif
-
-#if !defined(__WXWINCE__)
-    #include <sys/types.h>
-    #include <sys/stat.h>
-#endif
-
-#if defined(__WINDOWS__)
-    #include "wx/msw/private.h"
-    #include "wx/filesys.h"
-#endif
-
-#if wxUSE_GUI && defined(__WXGTK__)
-    #include <gtk/gtk.h>    // for GTK_XXX_VERSION constants
-#endif
-
-#if wxUSE_BASE
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// Array used in DecToHex conversion routine.
-static const wxChar hexArray[] = wxT("0123456789ABCDEF");
-
-// Convert 2-digit hex number to decimal
-int wxHexToDec(const wxString& str)
-{
-    char buf[2];
-    buf[0] = str.GetChar(0);
-    buf[1] = str.GetChar(1);
-    return wxHexToDec((const char*) buf);
-}
-
-// Convert decimal integer to 2-character hex string
-void wxDecToHex(int dec, wxChar *buf)
-{
-    int firstDigit = (int)(dec/16.0);
-    int secondDigit = (int)(dec - (firstDigit*16.0));
-    buf[0] = hexArray[firstDigit];
-    buf[1] = hexArray[secondDigit];
-    buf[2] = 0;
-}
-
-// Convert decimal integer to 2 characters
-void wxDecToHex(int dec, char* ch1, char* ch2)
-{
-    int firstDigit = (int)(dec/16.0);
-    int secondDigit = (int)(dec - (firstDigit*16.0));
-    (*ch1) = (char) hexArray[firstDigit];
-    (*ch2) = (char) hexArray[secondDigit];
-}
-
-// Convert decimal integer to 2-character hex string
-wxString wxDecToHex(int dec)
-{
-    wxChar buf[3];
-    wxDecToHex(dec, buf);
-    return wxString(buf);
-}
-
-// ----------------------------------------------------------------------------
-// misc functions
-// ----------------------------------------------------------------------------
-
-// Return the current date/time
-wxString wxNow()
-{
-#ifdef __WXWINCE__
-#if wxUSE_DATETIME
-    wxDateTime now = wxDateTime::Now();
-    return now.Format();
-#else
-    return wxEmptyString;
-#endif
-#else
-    time_t now = time(NULL);
-    char *date = ctime(&now);
-    date[24] = '\0';
-    return wxString::FromAscii(date);
-#endif
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-void wxUsleep(unsigned long milliseconds)
-{
-    wxMilliSleep(milliseconds);
-}
-#endif
-
-const wxChar *wxGetInstallPrefix()
-{
-    wxString prefix;
-
-    if ( wxGetEnv(wxT("WXPREFIX"), &prefix) )
-        return prefix.c_str();
-
-#ifdef wxINSTALL_PREFIX
-    return wxT(wxINSTALL_PREFIX);
-#else
-    return wxEmptyString;
-#endif
-}
-
-wxString wxGetDataDir()
-{
-    wxString dir = wxGetInstallPrefix();
-    dir <<  wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx");
-    return dir;
-}
-
-bool wxIsPlatformLittleEndian()
-{
-    // Are we little or big endian? This method is from Harbison & Steele.
-    union
-    {
-        long l;
-        char c[sizeof(long)];
-    } u;
-    u.l = 1;
-
-    return u.c[0] == 1;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxPlatform
-// ----------------------------------------------------------------------------
-
-/*
- * Class to make it easier to specify platform-dependent values
- */
-
-wxArrayInt*  wxPlatform::sm_customPlatforms = NULL;
-
-void wxPlatform::Copy(const wxPlatform& platform)
-{
-    m_longValue = platform.m_longValue;
-    m_doubleValue = platform.m_doubleValue;
-    m_stringValue = platform.m_stringValue;
-}
-
-wxPlatform wxPlatform::If(int platform, long value)
-{
-    if (Is(platform))
-        return wxPlatform(value);
-    else
-        return wxPlatform();
-}
-
-wxPlatform wxPlatform::IfNot(int platform, long value)
-{
-    if (!Is(platform))
-        return wxPlatform(value);
-    else
-        return wxPlatform();
-}
-
-wxPlatform& wxPlatform::ElseIf(int platform, long value)
-{
-    if (Is(platform))
-        m_longValue = value;
-    return *this;
-}
-
-wxPlatform& wxPlatform::ElseIfNot(int platform, long value)
-{
-    if (!Is(platform))
-        m_longValue = value;
-    return *this;
-}
-
-wxPlatform wxPlatform::If(int platform, double value)
-{
-    if (Is(platform))
-        return wxPlatform(value);
-    else
-        return wxPlatform();
-}
-
-wxPlatform wxPlatform::IfNot(int platform, double value)
-{
-    if (!Is(platform))
-        return wxPlatform(value);
-    else
-        return wxPlatform();
-}
-
-wxPlatform& wxPlatform::ElseIf(int platform, double value)
-{
-    if (Is(platform))
-        m_doubleValue = value;
-    return *this;
-}
-
-wxPlatform& wxPlatform::ElseIfNot(int platform, double value)
-{
-    if (!Is(platform))
-        m_doubleValue = value;
-    return *this;
-}
-
-wxPlatform wxPlatform::If(int platform, const wxString& value)
-{
-    if (Is(platform))
-        return wxPlatform(value);
-    else
-        return wxPlatform();
-}
-
-wxPlatform wxPlatform::IfNot(int platform, const wxString& value)
-{
-    if (!Is(platform))
-        return wxPlatform(value);
-    else
-        return wxPlatform();
-}
-
-wxPlatform& wxPlatform::ElseIf(int platform, const wxString& value)
-{
-    if (Is(platform))
-        m_stringValue = value;
-    return *this;
-}
-
-wxPlatform& wxPlatform::ElseIfNot(int platform, const wxString& value)
-{
-    if (!Is(platform))
-        m_stringValue = value;
-    return *this;
-}
-
-wxPlatform& wxPlatform::Else(long value)
-{
-    m_longValue = value;
-    return *this;
-}
-
-wxPlatform& wxPlatform::Else(double value)
-{
-    m_doubleValue = value;
-    return *this;
-}
-
-wxPlatform& wxPlatform::Else(const wxString& value)
-{
-    m_stringValue = value;
-    return *this;
-}
-
-void wxPlatform::AddPlatform(int platform)
-{
-    if (!sm_customPlatforms)
-        sm_customPlatforms = new wxArrayInt;
-    sm_customPlatforms->Add(platform);
-}
-
-void wxPlatform::ClearPlatforms()
-{
-    wxDELETE(sm_customPlatforms);
-}
-
-/// Function for testing current platform
-
-bool wxPlatform::Is(int platform)
-{
-#ifdef __WINDOWS__
-    if (platform == wxOS_WINDOWS)
-        return true;
-#endif
-#ifdef __WXWINCE__
-    if (platform == wxOS_WINDOWS_CE)
-        return true;
-#endif
-
-#if 0
-
-// FIXME: wxWinPocketPC and wxWinSmartPhone are unknown symbols
-
-#if defined(__WXWINCE__) && defined(__POCKETPC__)
-    if (platform == wxWinPocketPC)
-        return true;
-#endif
-#if defined(__WXWINCE__) && defined(__SMARTPHONE__)
-    if (platform == wxWinSmartPhone)
-        return true;
-#endif
-
-#endif
-
-#ifdef __WXGTK__
-    if (platform == wxPORT_GTK)
-        return true;
-#endif
-#ifdef __WXMAC__
-    if (platform == wxPORT_MAC)
-        return true;
-#endif
-#ifdef __WXX11__
-    if (platform == wxPORT_X11)
-        return true;
-#endif
-#ifdef __UNIX__
-    if (platform == wxOS_UNIX)
-        return true;
-#endif
-#ifdef __OS2__
-    if (platform == wxOS_OS2)
-        return true;
-#endif
-#ifdef __WXPM__
-    if (platform == wxPORT_PM)
-        return true;
-#endif
-#ifdef __WXCOCOA__
-    if (platform == wxPORT_MAC)
-        return true;
-#endif
-
-    if (sm_customPlatforms && sm_customPlatforms->Index(platform) != wxNOT_FOUND)
-        return true;
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// network and user id functions
-// ----------------------------------------------------------------------------
-
-// Get Full RFC822 style email address
-bool wxGetEmailAddress(wxChar *address, int maxSize)
-{
-    wxString email = wxGetEmailAddress();
-    if ( !email )
-        return false;
-
-    wxStrlcpy(address, email.t_str(), maxSize);
-
-    return true;
-}
-
-wxString wxGetEmailAddress()
-{
-    wxString email;
-
-    wxString host = wxGetFullHostName();
-    if ( !host.empty() )
-    {
-        wxString user = wxGetUserId();
-        if ( !user.empty() )
-        {
-            email << user << wxT('@') << host;
-        }
-    }
-
-    return email;
-}
-
-wxString wxGetUserId()
-{
-    static const int maxLoginLen = 256; // FIXME arbitrary number
-
-    wxString buf;
-    bool ok = wxGetUserId(wxStringBuffer(buf, maxLoginLen), maxLoginLen);
-
-    if ( !ok )
-        buf.Empty();
-
-    return buf;
-}
-
-wxString wxGetUserName()
-{
-    static const int maxUserNameLen = 1024; // FIXME arbitrary number
-
-    wxString buf;
-    bool ok = wxGetUserName(wxStringBuffer(buf, maxUserNameLen), maxUserNameLen);
-
-    if ( !ok )
-        buf.Empty();
-
-    return buf;
-}
-
-wxString wxGetHostName()
-{
-    static const size_t hostnameSize = 257;
-
-    wxString buf;
-    bool ok = wxGetHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);
-
-    if ( !ok )
-        buf.Empty();
-
-    return buf;
-}
-
-wxString wxGetFullHostName()
-{
-    static const size_t hostnameSize = 257;
-
-    wxString buf;
-    bool ok = wxGetFullHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);
-
-    if ( !ok )
-        buf.Empty();
-
-    return buf;
-}
-
-wxString wxGetHomeDir()
-{
-    wxString home;
-    wxGetHomeDir(&home);
-
-    return home;
-}
-
-#if 0
-
-wxString wxGetCurrentDir()
-{
-    wxString dir;
-    size_t len = 1024;
-    bool ok;
-    do
-    {
-        ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL;
-        dir.UngetWriteBuf();
-
-        if ( !ok )
-        {
-            if ( errno != ERANGE )
-            {
-                wxLogSysError(wxT("Failed to get current directory"));
-
-                return wxEmptyString;
-            }
-            else
-            {
-                // buffer was too small, retry with a larger one
-                len *= 2;
-            }
-        }
-        //else: ok
-    } while ( !ok );
-
-    return dir;
-}
-
-#endif // 0
-
-// ----------------------------------------------------------------------------
-// Environment
-// ----------------------------------------------------------------------------
-
-#ifdef __WXOSX__
-#if wxOSX_USE_COCOA_OR_CARBON
-    #include <crt_externs.h>
-#endif
-#endif
-
-bool wxGetEnvMap(wxEnvVariableHashMap *map)
-{
-    wxCHECK_MSG( map, false, wxS("output pointer can't be NULL") );
-
-#if defined(__VISUALC__)
-    // This variable only exists to force the CRT to fill the wide char array,
-    // it might only have it in narrow char version until now as we use main()
-    // (and not _wmain()) as our entry point.
-    static wxChar* s_dummyEnvVar = _tgetenv(wxT("TEMP"));
-
-    wxChar **env = _tenviron;
-#elif defined(__VMS)
-   // Now this routine wil give false for OpenVMS
-   // TODO : should we do something with logicals?
-    char **env=NULL;
-#elif defined(__WXOSX__)
-#if wxOSX_USE_COCOA_OR_CARBON
-    // Under Mac shared libraries don't have access to the global environ
-    // variable so use this Mac-specific function instead as advised by
-    // environ(7) under Darwin
-    char ***penv = _NSGetEnviron();
-    if ( !penv )
-        return false;
-    char **env = *penv;
-#else
-    char **env=NULL;
-    // todo translate NSProcessInfo environment into map
-#endif
-#else // non-MSVC non-Mac
-    // Not sure if other compilers have _tenviron so use the (more standard)
-    // ANSI version only for them.
-
-    // Both POSIX and Single UNIX Specification say that this variable must
-    // exist but not that it must be declared anywhere and, indeed, it's not
-    // declared in several common systems (some BSDs, Solaris with native CC)
-    // so we (re)declare it ourselves to deal with these cases. However we do
-    // not do this under MSW where there can be DLL-related complications, i.e.
-    // the variable might be DLL-imported or not. Luckily we don't have to
-    // worry about this as all MSW compilers do seem to define it in their
-    // standard headers anyhow so we can just rely on already having the
-    // correct declaration. And if this turns out to be wrong, we can always
-    // add a configure test checking whether it is declared later.
-#ifndef __WINDOWS__
-    extern char **environ;
-#endif // !__WINDOWS__
-
-    char **env = environ;
-#endif
-
-    if ( env )
-    {
-        wxString name,
-                 value;
-        while ( *env )
-        {
-            const wxString var(*env);
-
-            name = var.BeforeFirst(wxS('='), &value);
-
-            (*map)[name] = value;
-
-            env++;
-        }
-
-        return true;
-    }
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// wxExecute
-// ----------------------------------------------------------------------------
-
-// wxDoExecuteWithCapture() helper: reads an entire stream into one array
-//
-// returns true if ok, false if error
-#if wxUSE_STREAMS
-static bool ReadAll(wxInputStream *is, wxArrayString& output)
-{
-    wxCHECK_MSG( is, false, wxT("NULL stream in wxExecute()?") );
-
-    // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state
-    is->Reset();
-
-    wxTextInputStream tis(*is);
-
-    for ( ;; )
-    {
-        wxString line = tis.ReadLine();
-
-        // check for EOF before other errors as it's not really an error
-        if ( is->Eof() )
-        {
-            // add the last, possibly incomplete, line
-            if ( !line.empty() )
-                output.Add(line);
-            break;
-        }
-
-        // any other error is fatal
-        if ( !*is )
-            return false;
-
-        output.Add(line);
-    }
-
-    return true;
-}
-#endif // wxUSE_STREAMS
-
-// this is a private function because it hasn't a clean interface: the first
-// array is passed by reference, the second by pointer - instead we have 2
-// public versions of wxExecute() below
-static long wxDoExecuteWithCapture(const wxString& command,
-                                   wxArrayString& output,
-                                   wxArrayString* error,
-                                   int flags,
-                                   const wxExecuteEnv *env)
-{
-    // create a wxProcess which will capture the output
-    wxProcess *process = new wxProcess;
-    process->Redirect();
-
-    long rc = wxExecute(command, wxEXEC_SYNC | flags, process, env);
-
-#if wxUSE_STREAMS
-    if ( rc != -1 )
-    {
-        if ( !ReadAll(process->GetInputStream(), output) )
-            rc = -1;
-
-        if ( error )
-        {
-            if ( !ReadAll(process->GetErrorStream(), *error) )
-                rc = -1;
-        }
-
-    }
-#else
-    wxUnusedVar(output);
-    wxUnusedVar(error);
-#endif // wxUSE_STREAMS/!wxUSE_STREAMS
-
-    delete process;
-
-    return rc;
-}
-
-long wxExecute(const wxString& command, wxArrayString& output, int flags,
-               const wxExecuteEnv *env)
-{
-    return wxDoExecuteWithCapture(command, output, NULL, flags, env);
-}
-
-long wxExecute(const wxString& command,
-               wxArrayString& output,
-               wxArrayString& error,
-               int flags,
-               const wxExecuteEnv *env)
-{
-    return wxDoExecuteWithCapture(command, output, &error, flags, env);
-}
-
-// ----------------------------------------------------------------------------
-// Id functions
-// ----------------------------------------------------------------------------
-
-// Id generation
-static long wxCurrentId = 100;
-
-long wxNewId()
-{
-    // skip the part of IDs space that contains hard-coded values:
-    if (wxCurrentId == wxID_LOWEST)
-        wxCurrentId = wxID_HIGHEST + 1;
-
-    return wxCurrentId++;
-}
-
-long
-wxGetCurrentId(void) { return wxCurrentId; }
-
-void
-wxRegisterId (long id)
-{
-  if (id >= wxCurrentId)
-    wxCurrentId = id + 1;
-}
-
-// ----------------------------------------------------------------------------
-// wxQsort, adapted by RR to allow user_data
-// ----------------------------------------------------------------------------
-
-/* This file is part of the GNU C Library.
-   Written by Douglas C. Schmidt (schmidt@ics.uci.edu).
-
-   Douglas Schmidt kindly gave permission to relicence the
-   code under the wxWindows licence:
-
-From: "Douglas C. Schmidt" <schmidt@dre.vanderbilt.edu>
-To: Robert Roebling <robert.roebling@uni-ulm.de>
-Subject: Re: qsort licence
-Date: Mon, 23 Jul 2007 03:44:25 -0500
-Sender: schmidt@dre.vanderbilt.edu
-Message-Id: <20070723084426.64F511000A8@tango.dre.vanderbilt.edu>
-
-Hi Robert,
-
-> [...] I'm asking if you'd be willing to relicence your code
-> under the wxWindows licence. [...]
-
-That's fine with me [...]
-
-Thanks,
-
-     Doug */
-
-
-/* Byte-wise swap two items of size SIZE. */
-#define SWAP(a, b, size)                                                      \
-  do                                                                          \
-    {                                                                         \
-      register size_t __size = (size);                                        \
-      register char *__a = (a), *__b = (b);                                   \
-      do                                                                      \
-        {                                                                     \
-          char __tmp = *__a;                                                  \
-          *__a++ = *__b;                                                      \
-          *__b++ = __tmp;                                                     \
-        } while (--__size > 0);                                               \
-    } while (0)
-
-/* Discontinue quicksort algorithm when partition gets below this size.
-   This particular magic number was chosen to work best on a Sun 4/260. */
-#define MAX_THRESH 4
-
-/* Stack node declarations used to store unfulfilled partition obligations. */
-typedef struct
-  {
-    char *lo;
-    char *hi;
-  } stack_node;
-
-/* The next 4 #defines implement a very fast in-line stack abstraction. */
-#define STACK_SIZE        (8 * sizeof(unsigned long int))
-#define PUSH(low, high)   ((void) ((top->lo = (low)), (top->hi = (high)), ++top))
-#define POP(low, high)    ((void) (--top, (low = top->lo), (high = top->hi)))
-#define STACK_NOT_EMPTY   (stack < top)
-
-
-/* Order size using quicksort.  This implementation incorporates
-   four optimizations discussed in Sedgewick:
-
-   1. Non-recursive, using an explicit stack of pointer that store the
-      next array partition to sort.  To save time, this maximum amount
-      of space required to store an array of MAX_INT is allocated on the
-      stack.  Assuming a 32-bit integer, this needs only 32 *
-      sizeof(stack_node) == 136 bits.  Pretty cheap, actually.
-
-   2. Chose the pivot element using a median-of-three decision tree.
-      This reduces the probability of selecting a bad pivot value and
-      eliminates certain extraneous comparisons.
-
-   3. Only quicksorts TOTAL_ELEMS / MAX_THRESH partitions, leaving
-      insertion sort to order the MAX_THRESH items within each partition.
-      This is a big win, since insertion sort is faster for small, mostly
-      sorted array segments.
-
-   4. The larger of the two sub-partitions is always pushed onto the
-      stack first, with the algorithm then concentrating on the
-      smaller partition.  This *guarantees* no more than log (n)
-      stack size is needed (actually O(1) in this case)!  */
-
-void wxQsort(void* pbase, size_t total_elems,
-             size_t size, wxSortCallback cmp, const void* user_data)
-{
-  register char *base_ptr = (char *) pbase;
-  const size_t max_thresh = MAX_THRESH * size;
-
-  if (total_elems == 0)
-    /* Avoid lossage with unsigned arithmetic below.  */
-    return;
-
-  if (total_elems > MAX_THRESH)
-    {
-      char *lo = base_ptr;
-      char *hi = &lo[size * (total_elems - 1)];
-      stack_node stack[STACK_SIZE];
-      stack_node *top = stack;
-
-      PUSH (NULL, NULL);
-
-      while (STACK_NOT_EMPTY)
-        {
-          char *left_ptr;
-          char *right_ptr;
-
-          /* Select median value from among LO, MID, and HI. Rearrange
-             LO and HI so the three values are sorted. This lowers the
-             probability of picking a pathological pivot value and
-             skips a comparison for both the LEFT_PTR and RIGHT_PTR. */
-
-          char *mid = lo + size * ((hi - lo) / size >> 1);
-
-          if ((*cmp) ((void *) mid, (void *) lo, user_data) < 0)
-            SWAP (mid, lo, size);
-          if ((*cmp) ((void *) hi, (void *) mid, user_data) < 0)
-            SWAP (mid, hi, size);
-          else
-            goto jump_over;
-          if ((*cmp) ((void *) mid, (void *) lo, user_data) < 0)
-            SWAP (mid, lo, size);
-        jump_over:;
-          left_ptr  = lo + size;
-          right_ptr = hi - size;
-
-          /* Here's the famous ``collapse the walls'' section of quicksort.
-             Gotta like those tight inner loops!  They are the main reason
-             that this algorithm runs much faster than others. */
-          do
-            {
-              while ((*cmp) ((void *) left_ptr, (void *) mid, user_data) < 0)
-                left_ptr += size;
-
-              while ((*cmp) ((void *) mid, (void *) right_ptr, user_data) < 0)
-                right_ptr -= size;
-
-              if (left_ptr < right_ptr)
-                {
-                  SWAP (left_ptr, right_ptr, size);
-                  if (mid == left_ptr)
-                    mid = right_ptr;
-                  else if (mid == right_ptr)
-                    mid = left_ptr;
-                  left_ptr += size;
-                  right_ptr -= size;
-                }
-              else if (left_ptr == right_ptr)
-                {
-                  left_ptr += size;
-                  right_ptr -= size;
-                  break;
-                }
-            }
-          while (left_ptr <= right_ptr);
-
-          /* Set up pointers for next iteration.  First determine whether
-             left and right partitions are below the threshold size.  If so,
-             ignore one or both.  Otherwise, push the larger partition's
-             bounds on the stack and continue sorting the smaller one. */
-
-          if ((size_t) (right_ptr - lo) <= max_thresh)
-            {
-              if ((size_t) (hi - left_ptr) <= max_thresh)
-                /* Ignore both small partitions. */
-                POP (lo, hi);
-              else
-                /* Ignore small left partition. */
-                lo = left_ptr;
-            }
-          else if ((size_t) (hi - left_ptr) <= max_thresh)
-            /* Ignore small right partition. */
-            hi = right_ptr;
-          else if ((right_ptr - lo) > (hi - left_ptr))
-            {
-              /* Push larger left partition indices. */
-              PUSH (lo, right_ptr);
-              lo = left_ptr;
-            }
-          else
-            {
-              /* Push larger right partition indices. */
-              PUSH (left_ptr, hi);
-              hi = right_ptr;
-            }
-        }
-    }
-
-  /* Once the BASE_PTR array is partially sorted by quicksort the rest
-     is completely sorted using insertion sort, since this is efficient
-     for partitions below MAX_THRESH size. BASE_PTR points to the beginning
-     of the array to sort, and END_PTR points at the very last element in
-     the array (*not* one beyond it!). */
-
-  {
-    char *const end_ptr = &base_ptr[size * (total_elems - 1)];
-    char *tmp_ptr = base_ptr;
-    char *thresh = base_ptr + max_thresh;
-    if ( thresh > end_ptr )
-        thresh = end_ptr;
-    register char *run_ptr;
-
-    /* Find smallest element in first threshold and place it at the
-       array's beginning.  This is the smallest array element,
-       and the operation speeds up insertion sort's inner loop. */
-
-    for (run_ptr = tmp_ptr + size; run_ptr <= thresh; run_ptr += size)
-      if ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, user_data) < 0)
-        tmp_ptr = run_ptr;
-
-    if (tmp_ptr != base_ptr)
-      SWAP (tmp_ptr, base_ptr, size);
-
-    /* Insertion sort, running from left-hand-side up to right-hand-side.  */
-
-    run_ptr = base_ptr + size;
-    while ((run_ptr += size) <= end_ptr)
-      {
-        tmp_ptr = run_ptr - size;
-        while ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, user_data) < 0)
-          tmp_ptr -= size;
-
-        tmp_ptr += size;
-        if (tmp_ptr != run_ptr)
-          {
-            char *trav;
-
-            trav = run_ptr + size;
-            while (--trav >= run_ptr)
-              {
-                char c = *trav;
-                char *hi, *lo;
-
-                for (hi = lo = trav; (lo -= size) >= tmp_ptr; hi = lo)
-                  *hi = *lo;
-                *hi = c;
-              }
-          }
-      }
-  }
-}
-
-#endif // wxUSE_BASE
-
-
-
-// ============================================================================
-// GUI-only functions from now on
-// ============================================================================
-
-#if wxUSE_GUI
-
-// this function is only really implemented for X11-based ports, including GTK1
-// (GTK2 sets detectable auto-repeat automatically anyhow)
-#if !(defined(__WXX11__) || defined(__WXMOTIF__) || \
-        (defined(__WXGTK__) && !defined(__WXGTK20__)))
-bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
-{
-    return true;
-}
-#endif // !X11-based port
-
-// ----------------------------------------------------------------------------
-// Launch default browser
-// ----------------------------------------------------------------------------
-
-#if defined(__WINDOWS__)
-
-// implemented in a port-specific utils source file:
-bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags);
-
-#elif defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXCOCOA__) || \
-      (defined(__WXOSX__) )
-
-// implemented in a port-specific utils source file:
-bool wxDoLaunchDefaultBrowser(const wxString& url, int flags);
-
-#else
-
-// a "generic" implementation:
-bool wxDoLaunchDefaultBrowser(const wxString& url, int flags)
-{
-    // on other platforms try to use mime types or wxExecute...
-
-    bool ok = false;
-    wxString cmd;
-
-#if wxUSE_MIMETYPE
-    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(wxT("html"));
-    if ( ft )
-    {
-        wxString mt;
-        ft->GetMimeType(&mt);
-
-        ok = ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(url));
-        delete ft;
-    }
-#endif // wxUSE_MIMETYPE
-
-    if ( !ok || cmd.empty() )
-    {
-        // fallback to checking for the BROWSER environment variable
-        if ( !wxGetEnv(wxT("BROWSER"), &cmd) || cmd.empty() )
-            cmd << wxT(' ') << url;
-    }
-
-    ok = ( !cmd.empty() && wxExecute(cmd) );
-    if (ok)
-        return ok;
-
-    // no file type for HTML extension
-    wxLogError(_("No default application configured for HTML files."));
-
-    return false;
-}
-#endif
-
-static bool DoLaunchDefaultBrowserHelper(const wxString& urlOrig, int flags)
-{
-    // NOTE: we don't have to care about the wxBROWSER_NOBUSYCURSOR flag
-    //       as it was already handled by wxLaunchDefaultBrowser
-
-    wxUnusedVar(flags);
-
-    wxString url(urlOrig), scheme;
-    wxURI uri(url);
-
-    // this check is useful to avoid that wxURI recognizes as scheme parts of
-    // the filename, in case urlOrig is a local filename
-    // (e.g. "C:\\test.txt" when parsed by wxURI reports a scheme == "C")
-    bool hasValidScheme = uri.HasScheme() && uri.GetScheme().length() > 1;
-
-#if defined(__WINDOWS__)
-
-    // NOTE: when testing wxMSW's wxLaunchDefaultBrowser all possible forms
-    //       of the URL/flags should be tested; e.g.:
-    //
-    // for (int i=0; i<2; i++)
-    // {
-    //   // test arguments without a valid URL scheme:
-    //   wxLaunchDefaultBrowser("C:\\test.txt", i==0 ? 0 : wxBROWSER_NEW_WINDOW);
-    //   wxLaunchDefaultBrowser("wxwidgets.org", i==0 ? 0 : wxBROWSER_NEW_WINDOW);
-    //
-    //   // test arguments with different valid schemes:
-    //   wxLaunchDefaultBrowser("file:/C%3A/test.txt", i==0 ? 0 : wxBROWSER_NEW_WINDOW);
-    //   wxLaunchDefaultBrowser("http://wxwidgets.org", i==0 ? 0 : wxBROWSER_NEW_WINDOW);
-    //   wxLaunchDefaultBrowser("mailto:user@host.org", i==0 ? 0 : wxBROWSER_NEW_WINDOW);
-    // }
-    // (assuming you have a C:\test.txt file)
-
-    if ( !hasValidScheme )
-    {
-        if (wxFileExists(urlOrig) || wxDirExists(urlOrig))
-        {
-            scheme = "file";
-            // do not prepend the file scheme to the URL as ShellExecuteEx() doesn't like it
-        }
-        else
-        {
-            url.Prepend(wxS("http://"));
-            scheme = "http";
-        }
-    }
-    else if ( hasValidScheme )
-    {
-        scheme = uri.GetScheme();
-
-        if ( uri.GetScheme() == "file" )
-        {
-            // TODO: extract URLToFileName() to some always compiled in
-            //       function
-#if wxUSE_FILESYSTEM
-            // ShellExecuteEx() doesn't like the "file" scheme when opening local files;
-            // remove it
-            url = wxFileSystem::URLToFileName(url).GetFullPath();
-#endif // wxUSE_FILESYSTEM
-        }
-    }
-
-    if (wxDoLaunchDefaultBrowser(url, scheme, flags))
-        return true;
-    //else: call wxLogSysError
-#else
-    if ( !hasValidScheme )
-    {
-        // set the scheme of url to "http" or "file" if it does not have one
-        if (wxFileExists(urlOrig) || wxDirExists(urlOrig))
-            url.Prepend(wxS("file://"));
-        else
-            url.Prepend(wxS("http://"));
-    }
-
-    if (wxDoLaunchDefaultBrowser(url, flags))
-        return true;
-    //else: call wxLogSysError
-#endif
-
-    wxLogSysError(_("Failed to open URL \"%s\" in default browser."),
-                  url.c_str());
-
-    return false;
-}
-
-bool wxLaunchDefaultBrowser(const wxString& url, int flags)
-{
-    // NOTE: as documented, "url" may be both a real well-formed URL
-    //       and a local file name
-
-    if ( flags & wxBROWSER_NOBUSYCURSOR )
-        return DoLaunchDefaultBrowserHelper(url, flags);
-
-    wxBusyCursor bc;
-    return DoLaunchDefaultBrowserHelper(url, flags);
-}
-
-// ----------------------------------------------------------------------------
-// Menu accelerators related functions
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_6
-wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
-{
-#if wxUSE_MENUS
-    wxString s = wxMenuItem::GetLabelText(in);
-#else
-    wxString str(in);
-    wxString s = wxStripMenuCodes(str);
-#endif // wxUSE_MENUS
-    if ( out )
-    {
-        // go smash their buffer if it's not big enough - I love char * params
-        memcpy(out, s.c_str(), s.length() * sizeof(wxChar));
-    }
-    else
-    {
-        out = new wxChar[s.length() + 1];
-        wxStrcpy(out, s.c_str());
-    }
-
-    return out;
-}
-#endif
-
-wxString wxStripMenuCodes(const wxString& in, int flags)
-{
-    wxASSERT_MSG( flags, wxT("this is useless to call without any flags") );
-
-    wxString out;
-
-    size_t len = in.length();
-    out.reserve(len);
-
-    for ( wxString::const_iterator it = in.begin(); it != in.end(); ++it )
-    {
-        wxChar ch = *it;
-        if ( (flags & wxStrip_Mnemonics) && ch == wxT('&') )
-        {
-            // skip it, it is used to introduce the accel char (or to quote
-            // itself in which case it should still be skipped): note that it
-            // can't be the last character of the string
-            if ( ++it == in.end() )
-            {
-                wxLogDebug(wxT("Invalid menu string '%s'"), in.c_str());
-            }
-            else
-            {
-                // use the next char instead
-                ch = *it;
-            }
-        }
-        else if ( (flags & wxStrip_Accel) && ch == wxT('\t') )
-        {
-            // everything after TAB is accel string, exit the loop
-            break;
-        }
-
-        out += ch;
-    }
-
-    return out;
-}
-
-// ----------------------------------------------------------------------------
-// Window search functions
-// ----------------------------------------------------------------------------
-
-/*
- * If parent is non-NULL, look through children for a label or title
- * matching the specified string. If NULL, look through all top-level windows.
- *
- */
-
-wxWindow *
-wxFindWindowByLabel (const wxString& title, wxWindow * parent)
-{
-    return wxWindow::FindWindowByLabel( title, parent );
-}
-
-
-/*
- * If parent is non-NULL, look through children for a name
- * matching the specified string. If NULL, look through all top-level windows.
- *
- */
-
-wxWindow *
-wxFindWindowByName (const wxString& name, wxWindow * parent)
-{
-    return wxWindow::FindWindowByName( name, parent );
-}
-
-// Returns menu item id or wxNOT_FOUND if none.
-int
-wxFindMenuItemId(wxFrame *frame,
-                 const wxString& menuString,
-                 const wxString& itemString)
-{
-#if wxUSE_MENUS
-    wxMenuBar *menuBar = frame->GetMenuBar ();
-    if ( menuBar )
-        return menuBar->FindMenuItem (menuString, itemString);
-#else // !wxUSE_MENUS
-    wxUnusedVar(frame);
-    wxUnusedVar(menuString);
-    wxUnusedVar(itemString);
-#endif // wxUSE_MENUS/!wxUSE_MENUS
-
-    return wxNOT_FOUND;
-}
-
-// Try to find the deepest child that contains 'pt'.
-// We go backwards, to try to allow for controls that are spacially
-// within other controls, but are still siblings (e.g. buttons within
-// static boxes). Static boxes are likely to be created _before_ controls
-// that sit inside them.
-wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
-{
-    if (!win->IsShown())
-        return NULL;
-
-    // Hack for wxNotebook case: at least in wxGTK, all pages
-    // claim to be shown, so we must only deal with the selected one.
-#if wxUSE_NOTEBOOK
-    if (wxDynamicCast(win, wxNotebook))
-    {
-      wxNotebook* nb = (wxNotebook*) win;
-      int sel = nb->GetSelection();
-      if (sel >= 0)
-      {
-        wxWindow* child = nb->GetPage(sel);
-        wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
-        if (foundWin)
-           return foundWin;
-      }
-    }
-#endif
-
-    wxWindowList::compatibility_iterator node = win->GetChildren().GetLast();
-    while (node)
-    {
-        wxWindow* child = node->GetData();
-        wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
-        if (foundWin)
-          return foundWin;
-        node = node->GetPrevious();
-    }
-
-    wxPoint pos = win->GetPosition();
-    wxSize sz = win->GetSize();
-    if ( !win->IsTopLevel() && win->GetParent() )
-    {
-        pos = win->GetParent()->ClientToScreen(pos);
-    }
-
-    wxRect rect(pos, sz);
-    if (rect.Contains(pt))
-        return win;
-
-    return NULL;
-}
-
-wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt)
-{
-    // Go backwards through the list since windows
-    // on top are likely to have been appended most
-    // recently.
-    wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetLast();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        wxWindow* found = wxFindWindowAtPoint(win, pt);
-        if (found)
-            return found;
-        node = node->GetPrevious();
-    }
-    return NULL;
-}
-
-// ----------------------------------------------------------------------------
-// GUI helpers
-// ----------------------------------------------------------------------------
-
-/*
- * N.B. these convenience functions must be separate from msgdlgg.cpp, textdlgg.cpp
- * since otherwise the generic code may be pulled in unnecessarily.
- */
-
-#if wxUSE_MSGDLG
-
-int wxMessageBox(const wxString& message, const wxString& caption, long style,
-                 wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) )
-{
-    // add the appropriate icon unless this was explicitly disabled by use of
-    // wxICON_NONE
-    if ( !(style & wxICON_NONE) && !(style & wxICON_MASK) )
-    {
-        style |= style & wxYES ? wxICON_QUESTION : wxICON_INFORMATION;
-    }
-
-    wxMessageDialog dialog(parent, message, caption, style);
-
-    int ans = dialog.ShowModal();
-    switch ( ans )
-    {
-        case wxID_OK:
-            return wxOK;
-        case wxID_YES:
-            return wxYES;
-        case wxID_NO:
-            return wxNO;
-        case wxID_CANCEL:
-            return wxCANCEL;
-        case wxID_HELP:
-            return wxHELP;
-    }
-
-    wxFAIL_MSG( wxT("unexpected return code from wxMessageDialog") );
-
-    return wxCANCEL;
-}
-
-wxVersionInfo wxGetLibraryVersionInfo()
-{
-    // don't translate these strings, they're for diagnostics purposes only
-    wxString msg;
-    msg.Printf(wxS("wxWidgets Library (%s port)\n")
-               wxS("Version %d.%d.%d (Unicode: %s, debug level: %d),\n")
-               wxS("compiled at %s %s\n\n")
-               wxS("Runtime version of toolkit used is %d.%d.\n"),
-               wxPlatformInfo::Get().GetPortIdName(),
-               wxMAJOR_VERSION,
-               wxMINOR_VERSION,
-               wxRELEASE_NUMBER,
-#if wxUSE_UNICODE_UTF8
-               "UTF-8",
-#elif wxUSE_UNICODE
-               "wchar_t",
-#else
-               "none",
-#endif
-               wxDEBUG_LEVEL,
-               __TDATE__,
-               __TTIME__,
-               wxPlatformInfo::Get().GetToolkitMajorVersion(),
-               wxPlatformInfo::Get().GetToolkitMinorVersion()
-              );
-
-#ifdef __WXGTK__
-    msg += wxString::Format("Compile-time GTK+ version is %d.%d.%d.\n",
-                            GTK_MAJOR_VERSION,
-                            GTK_MINOR_VERSION,
-                            GTK_MICRO_VERSION);
-#endif // __WXGTK__
-
-    return wxVersionInfo(wxS("wxWidgets"),
-                         wxMAJOR_VERSION,
-                         wxMINOR_VERSION,
-                         wxRELEASE_NUMBER,
-                         msg,
-                         wxS("Copyright (c) 1995-2011 wxWidgets team"));
-}
-
-void wxInfoMessageBox(wxWindow* parent)
-{
-    wxVersionInfo info = wxGetLibraryVersionInfo();
-    wxString msg = info.ToString();
-
-    msg << wxS("\n") << info.GetCopyright();
-
-    wxMessageBox(msg, wxT("wxWidgets information"),
-                 wxICON_INFORMATION | wxOK,
-                 parent);
-}
-
-#endif // wxUSE_MSGDLG
-
-#if wxUSE_TEXTDLG
-
-wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
-                        const wxString& defaultValue, wxWindow *parent,
-                        wxCoord x, wxCoord y, bool centre )
-{
-    wxString str;
-    long style = wxTextEntryDialogStyle;
-
-    if (centre)
-        style |= wxCENTRE;
-    else
-        style &= ~wxCENTRE;
-
-    wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y));
-
-    if (dialog.ShowModal() == wxID_OK)
-    {
-        str = dialog.GetValue();
-    }
-
-    return str;
-}
-
-wxString wxGetPasswordFromUser(const wxString& message,
-                               const wxString& caption,
-                               const wxString& defaultValue,
-                               wxWindow *parent,
-                               wxCoord x, wxCoord y, bool centre )
-{
-    wxString str;
-    long style = wxTextEntryDialogStyle;
-
-    if (centre)
-        style |= wxCENTRE;
-    else
-        style &= ~wxCENTRE;
-
-    wxPasswordEntryDialog dialog(parent, message, caption, defaultValue,
-                             style, wxPoint(x, y));
-    if ( dialog.ShowModal() == wxID_OK )
-    {
-        str = dialog.GetValue();
-    }
-
-    return str;
-}
-
-#endif // wxUSE_TEXTDLG
-
-#if wxUSE_COLOURDLG
-
-wxColour wxGetColourFromUser(wxWindow *parent,
-                             const wxColour& colInit,
-                             const wxString& caption,
-                             wxColourData *ptrData)
-{
-    // contains serialized representation of wxColourData used the last time
-    // the dialog was shown: we want to reuse it the next time in order to show
-    // the same custom colours to the user (and we can't just have static
-    // wxColourData itself because it's a GUI object and so should be destroyed
-    // before GUI shutdown and doing it during static cleanup is too late)
-    static wxString s_strColourData;
-
-    wxColourData data;
-    if ( !ptrData )
-    {
-        ptrData = &data;
-        if ( !s_strColourData.empty() )
-        {
-            if ( !data.FromString(s_strColourData) )
-            {
-                wxFAIL_MSG( "bug in wxColourData::FromString()?" );
-            }
-
-#ifdef __WXMSW__
-            // we don't get back the "choose full" flag value from the native
-            // dialog and so we can't preserve it between runs, so we decide to
-            // always use it as it seems better than not using it (user can
-            // just ignore the extra controls in the dialog but having to click
-            // a button each time to show them would be very annoying
-            data.SetChooseFull(true);
-#endif // __WXMSW__
-        }
-    }
-
-    if ( colInit.IsOk() )
-    {
-        ptrData->SetColour(colInit);
-    }
-
-    wxColour colRet;
-    wxColourDialog dialog(parent, ptrData);
-    if (!caption.empty())
-        dialog.SetTitle(caption);
-    if ( dialog.ShowModal() == wxID_OK )
-    {
-        *ptrData = dialog.GetColourData();
-        colRet = ptrData->GetColour();
-        s_strColourData = ptrData->ToString();
-    }
-    //else: leave colRet invalid
-
-    return colRet;
-}
-
-#endif // wxUSE_COLOURDLG
-
-#if wxUSE_FONTDLG
-
-wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
-{
-    wxFontData data;
-    if ( fontInit.IsOk() )
-    {
-        data.SetInitialFont(fontInit);
-    }
-
-    wxFont fontRet;
-    wxFontDialog dialog(parent, data);
-    if (!caption.empty())
-        dialog.SetTitle(caption);
-    if ( dialog.ShowModal() == wxID_OK )
-    {
-        fontRet = dialog.GetFontData().GetChosenFont();
-    }
-    //else: leave it invalid
-
-    return fontRet;
-}
-
-#endif // wxUSE_FONTDLG
-
-// ----------------------------------------------------------------------------
-// wxSafeYield and supporting functions
-// ----------------------------------------------------------------------------
-
-void wxEnableTopLevelWindows(bool enable)
-{
-    wxWindowList::compatibility_iterator node;
-    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
-        node->GetData()->Enable(enable);
-}
-
-#if defined(__WXOSX__) && wxOSX_USE_COCOA
-
-// defined in evtloop.mm
-
-#else
-
-wxWindowDisabler::wxWindowDisabler(bool disable)
-{
-    m_disabled = disable;
-    if ( disable )
-        DoDisable();
-}
-
-wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
-{
-    m_disabled = true;
-    DoDisable(winToSkip);
-}
-
-void wxWindowDisabler::DoDisable(wxWindow *winToSkip)
-{
-    // remember the top level windows which were already disabled, so that we
-    // don't reenable them later
-    m_winDisabled = NULL;
-
-    wxWindowList::compatibility_iterator node;
-    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
-    {
-        wxWindow *winTop = node->GetData();
-        if ( winTop == winToSkip )
-            continue;
-
-        // we don't need to disable the hidden or already disabled windows
-        if ( winTop->IsEnabled() && winTop->IsShown() )
-        {
-            winTop->Disable();
-        }
-        else
-        {
-            if ( !m_winDisabled )
-            {
-                m_winDisabled = new wxWindowList;
-            }
-
-            m_winDisabled->Append(winTop);
-        }
-    }
-}
-
-wxWindowDisabler::~wxWindowDisabler()
-{
-    if ( !m_disabled )
-        return;
-
-    wxWindowList::compatibility_iterator node;
-    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
-    {
-        wxWindow *winTop = node->GetData();
-        if ( !m_winDisabled || !m_winDisabled->Find(winTop) )
-        {
-            winTop->Enable();
-        }
-        //else: had been already disabled, don't reenable
-    }
-
-    delete m_winDisabled;
-}
-
-#endif
-
-// Yield to other apps/messages and disable user input to all windows except
-// the given one
-bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)
-{
-    wxWindowDisabler wd(win);
-
-    bool rc;
-    if (onlyIfNeeded)
-        rc = wxYieldIfNeeded();
-    else
-        rc = wxYield();
-
-    return rc;
-}
-
-// ----------------------------------------------------------------------------
-// wxApp::Yield() wrappers for backwards compatibility
-// ----------------------------------------------------------------------------
-
-bool wxYield()
-{
-    return wxTheApp && wxTheApp->Yield();
-}
-
-bool wxYieldIfNeeded()
-{
-    return wxTheApp && wxTheApp->Yield(true);
-}
-
-#endif // wxUSE_GUI
+// Name:        src/common/utilscmn.cpp
+// Purpose:     Miscellaneous utility functions and classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     29/01/98
+// RCS-ID:      $Id: utilscmn.cpp 66917 2011-02-16 21:51:31Z JS $
+// Copyright:   (c) 1998 Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+
+    #if wxUSE_GUI
+        #include "wx/window.h"
+        #include "wx/frame.h"
+        #include "wx/menu.h"
+        #include "wx/msgdlg.h"
+        #include "wx/textdlg.h"
+        #include "wx/textctrl.h"    // for wxTE_PASSWORD
+        #if wxUSE_ACCEL
+            #include "wx/menuitem.h"
+            #include "wx/accel.h"
+        #endif // wxUSE_ACCEL
+    #endif // wxUSE_GUI
+#endif // WX_PRECOMP
+
+#include "wx/apptrait.h"
+
+#include "wx/process.h"
+#include "wx/txtstrm.h"
+#include "wx/uri.h"
+#include "wx/mimetype.h"
+#include "wx/config.h"
+
+#if defined(__WXWINCE__) && wxUSE_DATETIME
+#include "wx/datetime.h"
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if !wxONLY_WATCOM_EARLIER_THAN(1,4)
+    #if !(defined(_MSC_VER) && (_MSC_VER > 800))
+        #include <errno.h>
+    #endif
+#endif
+
+#if wxUSE_GUI
+    #include "wx/colordlg.h"
+    #include "wx/fontdlg.h"
+    #include "wx/notebook.h"
+    #include "wx/statusbr.h"
+#endif // wxUSE_GUI
+
+#ifndef __WXWINCE__
+#include <time.h>
+#else
+#include "wx/msw/wince/time.h"
+#endif
+
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include "InternetConfig.h"
+#endif
+#endif
+
+#if !defined(__MWERKS__) && !defined(__WXWINCE__)
+    #include <sys/types.h>
+    #include <sys/stat.h>
+#endif
+
+#if defined(__WXMSW__)
+    #include "wx/msw/private.h"
+    #include "wx/msw/registry.h"
+    #include <shellapi.h> // needed for SHELLEXECUTEINFO
+#endif
+
+#if wxUSE_BASE
+
+// ----------------------------------------------------------------------------
+// common data
+// ----------------------------------------------------------------------------
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+#if WXWIN_COMPATIBILITY_2_4
+
+wxChar *
+copystring (const wxChar *s)
+{
+    if (s == NULL) s = wxEmptyString;
+    size_t len = wxStrlen (s) + 1;
+
+    wxChar *news = new wxChar[len];
+    memcpy (news, s, len * sizeof(wxChar));    // Should be the fastest
+
+    return news;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// String <-> Number conversions (deprecated)
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+
+WXDLLIMPEXP_DATA_BASE(const wxChar *) wxFloatToStringStr = wxT("%.2f");
+WXDLLIMPEXP_DATA_BASE(const wxChar *) wxDoubleToStringStr = wxT("%.2f");
+
+void
+StringToFloat (const wxChar *s, float *number)
+{
+    if (s && *s && number)
+        *number = (float) wxStrtod (s, (wxChar **) NULL);
+}
+
+void
+StringToDouble (const wxChar *s, double *number)
+{
+    if (s && *s && number)
+        *number = wxStrtod (s, (wxChar **) NULL);
+}
+
+wxChar *
+FloatToString (float number, const wxChar *fmt)
+{
+    static wxChar buf[256];
+
+    wxSprintf (buf, fmt, number);
+    return buf;
+}
+
+wxChar *
+DoubleToString (double number, const wxChar *fmt)
+{
+    static wxChar buf[256];
+
+    wxSprintf (buf, fmt, number);
+    return buf;
+}
+
+void
+StringToInt (const wxChar *s, int *number)
+{
+    if (s && *s && number)
+        *number = (int) wxStrtol (s, (wxChar **) NULL, 10);
+}
+
+void
+StringToLong (const wxChar *s, long *number)
+{
+    if (s && *s && number)
+        *number = wxStrtol (s, (wxChar **) NULL, 10);
+}
+
+wxChar *
+IntToString (int number)
+{
+    static wxChar buf[20];
+
+    wxSprintf (buf, wxT("%d"), number);
+    return buf;
+}
+
+wxChar *
+LongToString (long number)
+{
+    static wxChar buf[20];
+
+    wxSprintf (buf, wxT("%ld"), number);
+    return buf;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
+// Array used in DecToHex conversion routine.
+static wxChar hexArray[] = wxT("0123456789ABCDEF");
+
+// Convert 2-digit hex number to decimal
+int wxHexToDec(const wxString& buf)
+{
+    int firstDigit, secondDigit;
+
+    if (buf.GetChar(0) >= wxT('A'))
+        firstDigit = buf.GetChar(0) - wxT('A') + 10;
+    else
+       firstDigit = buf.GetChar(0) - wxT('0');
+
+    if (buf.GetChar(1) >= wxT('A'))
+        secondDigit = buf.GetChar(1) - wxT('A') + 10;
+    else
+        secondDigit = buf.GetChar(1) - wxT('0');
+
+    return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
+}
+
+// Convert decimal integer to 2-character hex string
+void wxDecToHex(int dec, wxChar *buf)
+{
+    int firstDigit = (int)(dec/16.0);
+    int secondDigit = (int)(dec - (firstDigit*16.0));
+    buf[0] = hexArray[firstDigit];
+    buf[1] = hexArray[secondDigit];
+    buf[2] = 0;
+}
+
+// Convert decimal integer to 2-character hex string
+wxString wxDecToHex(int dec)
+{
+    wxChar buf[3];
+    wxDecToHex(dec, buf);
+    return wxString(buf);
+}
+
+// ----------------------------------------------------------------------------
+// misc functions
+// ----------------------------------------------------------------------------
+
+// Return the current date/time
+wxString wxNow()
+{
+#ifdef __WXWINCE__
+#if wxUSE_DATETIME
+    wxDateTime now = wxDateTime::Now();
+    return now.Format();
+#else
+    return wxEmptyString;
+#endif
+#else
+    time_t now = time((time_t *) NULL);
+    char *date = ctime(&now);
+    date[24] = '\0';
+    return wxString::FromAscii(date);
+#endif
+}
+
+void wxUsleep(unsigned long milliseconds)
+{
+    wxMilliSleep(milliseconds);
+}
+
+const wxChar *wxGetInstallPrefix()
+{
+    wxString prefix;
+
+    if ( wxGetEnv(wxT("WXPREFIX"), &prefix) )
+        return prefix.c_str();
+
+#ifdef wxINSTALL_PREFIX
+    return wxT(wxINSTALL_PREFIX);
+#else
+    return wxEmptyString;
+#endif
+}
+
+wxString wxGetDataDir()
+{
+    wxString dir = wxGetInstallPrefix();
+    dir <<  wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx");
+    return dir;
+}
+
+bool wxIsPlatformLittleEndian()
+{
+    // Are we little or big endian? This method is from Harbison & Steele.
+    union
+    {
+        long l;
+        char c[sizeof(long)];
+    } u;
+    u.l = 1;
+
+    return u.c[0] == 1;
+}
+
+
+/*
+ * Class to make it easier to specify platform-dependent values
+ */
+
+wxArrayInt*  wxPlatform::sm_customPlatforms = NULL;
+
+void wxPlatform::Copy(const wxPlatform& platform)
+{
+    m_longValue = platform.m_longValue;
+    m_doubleValue = platform.m_doubleValue;
+    m_stringValue = platform.m_stringValue;
+}
+
+wxPlatform wxPlatform::If(int platform, long value)
+{
+    if (Is(platform))
+        return wxPlatform(value);
+    else
+        return wxPlatform();
+}
+
+wxPlatform wxPlatform::IfNot(int platform, long value)
+{
+    if (!Is(platform))
+        return wxPlatform(value);
+    else
+        return wxPlatform();
+}
+
+wxPlatform& wxPlatform::ElseIf(int platform, long value)
+{
+    if (Is(platform))
+        m_longValue = value;
+    return *this;
+}
+
+wxPlatform& wxPlatform::ElseIfNot(int platform, long value)
+{
+    if (!Is(platform))
+        m_longValue = value;
+    return *this;
+}
+
+wxPlatform wxPlatform::If(int platform, double value)
+{
+    if (Is(platform))
+        return wxPlatform(value);
+    else
+        return wxPlatform();
+}
+
+wxPlatform wxPlatform::IfNot(int platform, double value)
+{
+    if (!Is(platform))
+        return wxPlatform(value);
+    else
+        return wxPlatform();
+}
+
+wxPlatform& wxPlatform::ElseIf(int platform, double value)
+{
+    if (Is(platform))
+        m_doubleValue = value;
+    return *this;
+}
+
+wxPlatform& wxPlatform::ElseIfNot(int platform, double value)
+{
+    if (!Is(platform))
+        m_doubleValue = value;
+    return *this;
+}
+
+wxPlatform wxPlatform::If(int platform, const wxString& value)
+{
+    if (Is(platform))
+        return wxPlatform(value);
+    else
+        return wxPlatform();
+}
+
+wxPlatform wxPlatform::IfNot(int platform, const wxString& value)
+{
+    if (!Is(platform))
+        return wxPlatform(value);
+    else
+        return wxPlatform();
+}
+
+wxPlatform& wxPlatform::ElseIf(int platform, const wxString& value)
+{
+    if (Is(platform))
+        m_stringValue = value;
+    return *this;
+}
+
+wxPlatform& wxPlatform::ElseIfNot(int platform, const wxString& value)
+{
+    if (!Is(platform))
+        m_stringValue = value;
+    return *this;
+}
+
+wxPlatform& wxPlatform::Else(long value)
+{
+    m_longValue = value;
+    return *this;
+}
+
+wxPlatform& wxPlatform::Else(double value)
+{
+    m_doubleValue = value;
+    return *this;
+}
+
+wxPlatform& wxPlatform::Else(const wxString& value)
+{
+    m_stringValue = value;
+    return *this;
+}
+
+void wxPlatform::AddPlatform(int platform)
+{
+    if (!sm_customPlatforms)
+        sm_customPlatforms = new wxArrayInt;
+    sm_customPlatforms->Add(platform);
+}
+
+void wxPlatform::ClearPlatforms()
+{
+    delete sm_customPlatforms;
+    sm_customPlatforms = NULL;
+}
+
+/// Function for testing current platform
+
+bool wxPlatform::Is(int platform)
+{
+#ifdef __WXMSW__
+    if (platform == wxOS_WINDOWS)
+        return true;
+#endif
+#ifdef __WXWINCE__
+    if (platform == wxOS_WINDOWS_CE)
+        return true;
+#endif
+
+#if 0
+
+// FIXME: wxWinPocketPC and wxWinSmartPhone are unknown symbols
+
+#if defined(__WXWINCE__) && defined(__POCKETPC__)
+    if (platform == wxWinPocketPC)
+        return true;
+#endif
+#if defined(__WXWINCE__) && defined(__SMARTPHONE__)
+    if (platform == wxWinSmartPhone)
+        return true;
+#endif
+
+#endif
+
+#ifdef __WXGTK__
+    if (platform == wxPORT_GTK)
+        return true;
+#endif
+#ifdef __WXMAC__
+    if (platform == wxPORT_MAC)
+        return true;
+#endif
+#ifdef __WXX11__
+    if (platform == wxPORT_X11)
+        return true;
+#endif
+#ifdef __UNIX__
+    if (platform == wxOS_UNIX)
+        return true;
+#endif
+#ifdef __WXMGL__
+    if (platform == wxPORT_MGL)
+        return true;
+#endif
+#ifdef __OS2__
+    if (platform == wxOS_OS2)
+        return true;
+#endif
+#ifdef __WXPM__
+    if (platform == wxPORT_PM)
+        return true;
+#endif
+#ifdef __WXCOCOA__
+    if (platform == wxPORT_MAC)
+        return true;
+#endif
+
+    if (sm_customPlatforms && sm_customPlatforms->Index(platform) != wxNOT_FOUND)
+        return true;
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// network and user id functions
+// ----------------------------------------------------------------------------
+
+// Get Full RFC822 style email address
+bool wxGetEmailAddress(wxChar *address, int maxSize)
+{
+    wxString email = wxGetEmailAddress();
+    if ( !email )
+        return false;
+
+    wxStrncpy(address, email, maxSize - 1);
+    address[maxSize - 1] = wxT('\0');
+
+    return true;
+}
+
+wxString wxGetEmailAddress()
+{
+    wxString email;
+
+    wxString host = wxGetFullHostName();
+    if ( !host.empty() )
+    {
+        wxString user = wxGetUserId();
+        if ( !user.empty() )
+        {
+            email << user << wxT('@') << host;
+        }
+    }
+
+    return email;
+}
+
+wxString wxGetUserId()
+{
+    static const int maxLoginLen = 256; // FIXME arbitrary number
+
+    wxString buf;
+    bool ok = wxGetUserId(wxStringBuffer(buf, maxLoginLen), maxLoginLen);
+
+    if ( !ok )
+        buf.Empty();
+
+    return buf;
+}
+
+wxString wxGetUserName()
+{
+    static const int maxUserNameLen = 1024; // FIXME arbitrary number
+
+    wxString buf;
+    bool ok = wxGetUserName(wxStringBuffer(buf, maxUserNameLen), maxUserNameLen);
+
+    if ( !ok )
+        buf.Empty();
+
+    return buf;
+}
+
+wxString wxGetHostName()
+{
+    static const size_t hostnameSize = 257;
+
+    wxString buf;
+    bool ok = wxGetHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);
+
+    if ( !ok )
+        buf.Empty();
+
+    return buf;
+}
+
+wxString wxGetFullHostName()
+{
+    static const size_t hostnameSize = 257;
+
+    wxString buf;
+    bool ok = wxGetFullHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);
+
+    if ( !ok )
+        buf.Empty();
+
+    return buf;
+}
+
+wxString wxGetHomeDir()
+{
+    wxString home;
+    wxGetHomeDir(&home);
+
+    return home;
+}
+
+#if 0
+
+wxString wxGetCurrentDir()
+{
+    wxString dir;
+    size_t len = 1024;
+    bool ok;
+    do
+    {
+        ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL;
+        dir.UngetWriteBuf();
+
+        if ( !ok )
+        {
+            if ( errno != ERANGE )
+            {
+                wxLogSysError(_T("Failed to get current directory"));
+
+                return wxEmptyString;
+            }
+            else
+            {
+                // buffer was too small, retry with a larger one
+                len *= 2;
+            }
+        }
+        //else: ok
+    } while ( !ok );
+
+    return dir;
+}
+
+#endif // 0
+
+// ----------------------------------------------------------------------------
+// wxExecute
+// ----------------------------------------------------------------------------
+
+// wxDoExecuteWithCapture() helper: reads an entire stream into one array
+//
+// returns true if ok, false if error
+#if wxUSE_STREAMS
+static bool ReadAll(wxInputStream *is, wxArrayString& output)
+{
+    wxCHECK_MSG( is, false, _T("NULL stream in wxExecute()?") );
+
+    // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state
+    is->Reset();
+
+    wxTextInputStream tis(*is);
+
+    for ( ;; )
+    {
+        wxString line = tis.ReadLine();
+
+        // check for EOF before other errors as it's not really an error
+        if ( is->Eof() )
+        {
+            // add the last, possibly incomplete, line
+            if ( !line.empty() )
+                output.Add(line);
+            break;
+        }
+
+        // any other error is fatal
+        if ( !*is )
+            return false;
+
+        output.Add(line);
+    }
+
+    return true;
+}
+#endif // wxUSE_STREAMS
+
+// this is a private function because it hasn't a clean interface: the first
+// array is passed by reference, the second by pointer - instead we have 2
+// public versions of wxExecute() below
+static long wxDoExecuteWithCapture(const wxString& command,
+                                   wxArrayString& output,
+                                   wxArrayString* error,
+                                   int flags)
+{
+    // create a wxProcess which will capture the output
+    wxProcess *process = new wxProcess;
+    process->Redirect();
+
+    long rc = wxExecute(command, wxEXEC_SYNC | flags, process);
+
+#if wxUSE_STREAMS
+    if ( rc != -1 )
+    {
+        if ( !ReadAll(process->GetInputStream(), output) )
+            rc = -1;
+
+        if ( error )
+        {
+            if ( !ReadAll(process->GetErrorStream(), *error) )
+                rc = -1;
+        }
+
+    }
+#else
+    wxUnusedVar(output);
+    wxUnusedVar(error);
+#endif // wxUSE_STREAMS/!wxUSE_STREAMS
+
+    delete process;
+
+    return rc;
+}
+
+long wxExecute(const wxString& command, wxArrayString& output, int flags)
+{
+    return wxDoExecuteWithCapture(command, output, NULL, flags);
+}
+
+long wxExecute(const wxString& command,
+               wxArrayString& output,
+               wxArrayString& error,
+               int flags)
+{
+    return wxDoExecuteWithCapture(command, output, &error, flags);
+}
+
+// ----------------------------------------------------------------------------
+// Launch default browser
+// ----------------------------------------------------------------------------
+
+#include "wx/private/browserhack28.h"
+
+static bool wxLaunchDefaultBrowserBaseImpl(const wxString& url, int flags);
+
+// Use wxLaunchDefaultBrowserBaseImpl by default
+static wxLaunchDefaultBrowserImpl_t s_launchBrowserImpl = &wxLaunchDefaultBrowserBaseImpl;
+
+// Function the GUI library can call to provide a better implementation
+WXDLLIMPEXP_BASE void wxSetLaunchDefaultBrowserImpl(wxLaunchDefaultBrowserImpl_t newImpl)
+{
+    s_launchBrowserImpl = newImpl!=NULL ? newImpl : &wxLaunchDefaultBrowserBaseImpl;
+}
+
+static bool wxLaunchDefaultBrowserBaseImpl(const wxString& url, int flags)
+{
+    wxUnusedVar(flags);
+
+#if defined(__WXMSW__)
+
+#if wxUSE_IPC
+    if ( flags & wxBROWSER_NEW_WINDOW )
+    {
+        // ShellExecuteEx() opens the URL in an existing window by default so
+        // we can't use it if we need a new window
+        wxURI uri(url);
+        wxRegKey key(wxRegKey::HKCR, uri.GetScheme() + _T("\\shell\\open"));
+        if ( !key.Exists() )
+        {
+            // try default browser, it must be registered at least for http URLs
+            key.SetName(wxRegKey::HKCR, _T("http\\shell\\open"));
+        }
+
+        if ( key.Exists() )
+        {
+            wxRegKey keyDDE(key, wxT("DDEExec"));
+            if ( keyDDE.Exists() )
+            {
+                // we only know the syntax of WWW_OpenURL DDE request for IE,
+                // optimistically assume that all other browsers are compatible
+                // with it
+                static const wxString TOPIC_OPEN_URL = wxT("WWW_OpenURL");
+                wxString ddeCmd;
+                wxRegKey keyTopic(keyDDE, wxT("topic"));
+                bool ok = keyTopic.Exists() && (keyTopic.QueryDefaultValue() = TOPIC_OPEN_URL);
+                if ( ok )
+                {
+                    ddeCmd = keyDDE.QueryDefaultValue();
+                    ok = !ddeCmd.empty();
+                }
+
+                if ( ok )
+                {
+                    // for WWW_OpenURL, the index of the window to open the URL
+                    // in is -1 (meaning "current") by default, replace it with
+                    // 0 which means "new" (see KB article 160957)
+                    ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
+                                        false /* only first occurence */) == 1;
+                }
+
+                if ( ok )
+                {
+                    // and also replace the parameters: the topic should
+                    // contain a placeholder for the URL
+                    ok = ddeCmd.Replace(wxT("%1"), url, false) == 1;
+                }
+
+                if ( ok )
+                {
+                    // try to send it the DDE request now but ignore the errors
+                    wxLogNull noLog;
+
+                    const wxString ddeServer = wxRegKey(keyDDE, wxT("application")).QueryDefaultValue();
+                    if ( wxExecuteDDE(ddeServer, TOPIC_OPEN_URL, ddeCmd) )
+                        return true;
+
+                    // this is not necessarily an error: maybe browser is
+                    // simply not running, but no matter, in any case we're
+                    // going to launch it using ShellExecuteEx() below now and
+                    // we shouldn't try to open a new window if we open a new
+                    // browser anyhow
+                }
+            }
+        }
+    }
+#endif // wxUSE_IPC
+
+    WinStruct<SHELLEXECUTEINFO> sei;
+    sei.lpFile = url.c_str();
+    sei.lpVerb = _T("open");
+    sei.nShow = SW_SHOWNORMAL;
+    sei.fMask = SEE_MASK_FLAG_NO_UI; // we give error message ourselves
+
+    BOOL nExecResult = ::ShellExecuteEx(&sei);
+
+    //From MSDN for wince
+    //hInstApp member is only valid if the function fails, in which case it
+    //receives one of the following error values, which are less than or
+    //equal to 32.
+    const int nResult = (int) sei.hInstApp;
+
+    // Firefox returns file not found for some reason, so make an exception
+    // for it
+    if ( nResult > 32 || nResult == SE_ERR_FNF  || nExecResult == TRUE )
+    {
+#ifdef __WXDEBUG__
+        // Log something if SE_ERR_FNF happens
+        if ( nResult == SE_ERR_FNF || nExecResult == FALSE )
+            wxLogDebug(wxT("SE_ERR_FNF from ShellExecute -- maybe FireFox?"));
+#endif // __WXDEBUG__
+        return true;
+    }
+#elif defined(__WXMAC__)
+    OSStatus err;
+    ICInstance inst;
+    long int startSel;
+    long int endSel;
+
+    err = ICStart(&inst, 'STKA'); // put your app creator code here
+    if (err == noErr)
+    {
+#if !TARGET_CARBON
+        err = ICFindConfigFile(inst, 0, NULL);
+#endif
+        if (err == noErr)
+        {
+            ConstStr255Param hint = 0;
+            startSel = 0;
+            endSel = url.length();
+            err = ICLaunchURL(inst, hint, url.fn_str(), endSel, &startSel, &endSel);
+            if (err != noErr)
+                wxLogDebug(wxT("ICLaunchURL error %d"), (int) err);
+        }
+        ICStop(inst);
+        return true;
+    }
+    else
+    {
+        wxLogDebug(wxT("ICStart error %d"), (int) err);
+        return false;
+    }
+#else
+    // (non-Mac, non-MSW)
+
+#ifdef __UNIX__
+
+    // Our best best is to use xdg-open from freedesktop.org cross-desktop
+    // compatibility suite xdg-utils
+    // (see http://portland.freedesktop.org/wiki/) -- this is installed on
+    // most modern distributions and may be tweaked by them to handle
+    // distribution specifics. Only if that fails, try to find the right
+    // browser ourselves.
+    wxString path, xdg_open;
+    if ( wxGetEnv(_T("PATH"), &path) &&
+         wxFindFileInPath(&xdg_open, path, _T("xdg-open")) )
+    {
+        if ( wxExecute(xdg_open + _T(" ") + url) )
+            return true;
+    }
+
+    wxString desktop = wxTheApp->GetTraits()->GetDesktopEnvironment();
+
+    // GNOME and KDE desktops have some applications which should be always installed
+    // together with their main parts, which give us the
+    if (desktop == wxT("GNOME"))
+    {
+        wxArrayString errors;
+        wxArrayString output;
+
+        // gconf will tell us the path of the application to use as browser
+        long res = wxExecute( wxT("gconftool-2 --get /desktop/gnome/applications/browser/exec"),
+                              output, errors, wxEXEC_NODISABLE );
+        if (res >= 0 && errors.GetCount() == 0)
+        {
+            wxString cmd = output[0];
+            cmd << _T(' ') << url;
+            if (wxExecute(cmd))
+                return true;
+        }
+    }
+    else if (desktop == wxT("KDE"))
+    {
+        // kfmclient directly opens the given URL
+        if (wxExecute(wxT("kfmclient openURL ") + url))
+            return true;
+    }
+#endif
+
+    bool ok = false;
+    wxString cmd;
+
+#if wxUSE_MIMETYPE
+    wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("html"));
+    if ( ft )
+    {
+        wxString mt;
+        ft->GetMimeType(&mt);
+
+        ok = ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(url));
+        delete ft;
+    }
+#endif // wxUSE_MIMETYPE
+
+    if ( !ok || cmd.empty() )
+    {
+        // fallback to checking for the BROWSER environment variable
+        cmd = wxGetenv(wxT("BROWSER"));
+        if ( !cmd.empty() )
+            cmd << _T(' ') << url;
+    }
+
+    ok = ( !cmd.empty() && wxExecute(cmd) );
+    if (ok)
+        return ok;
+
+    // no file type for HTML extension
+    wxLogError(_T("No default application configured for HTML files."));
+
+#endif // !wxUSE_MIMETYPE && !__WXMSW__
+    return false;
+}
+
+bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
+{
+    // set the scheme of url to http if it does not have one
+    // RR: This doesn't work if the url is just a local path
+    wxString url(urlOrig);
+    wxURI uri(url);
+    if ( !uri.HasScheme() )
+    {
+        if (wxFileExists(urlOrig))
+            url.Prepend( wxT("file://") );
+        else
+            url.Prepend(wxT("http://"));
+    }
+
+    if(s_launchBrowserImpl(url, flags))
+        return true;
+
+    wxLogSysError(_T("Failed to open URL \"%s\" in default browser."),
+                  url.c_str());
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// wxApp::Yield() wrappers for backwards compatibility
+// ----------------------------------------------------------------------------
+
+bool wxYield()
+{
+    return wxTheApp && wxTheApp->Yield();
+}
+
+bool wxYieldIfNeeded()
+{
+    return wxTheApp && wxTheApp->Yield(true);
+}
+
+#endif // wxUSE_BASE
+
+// ============================================================================
+// GUI-only functions from now on
+// ============================================================================
+
+#if wxUSE_GUI
+
+// Id generation
+static long wxCurrentId = 100;
+
+long wxNewId()
+{
+    // skip the part of IDs space that contains hard-coded values:
+    if (wxCurrentId == wxID_LOWEST)
+        wxCurrentId = wxID_HIGHEST + 1;
+
+    return wxCurrentId++;
+}
+
+long
+wxGetCurrentId(void) { return wxCurrentId; }
+
+void
+wxRegisterId (long id)
+{
+  if (id >= wxCurrentId)
+    wxCurrentId = id + 1;
+}
+
+// ----------------------------------------------------------------------------
+// Menu accelerators related functions
+// ----------------------------------------------------------------------------
+
+wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
+{
+#if wxUSE_MENUS
+    wxString s = wxMenuItem::GetLabelFromText(in);
+#else
+    wxString str(in);
+    wxString s = wxStripMenuCodes(str);
+#endif // wxUSE_MENUS
+    if ( out )
+    {
+        // go smash their buffer if it's not big enough - I love char * params
+        memcpy(out, s.c_str(), s.length() * sizeof(wxChar));
+    }
+    else
+    {
+        // MYcopystring - for easier search...
+        out = new wxChar[s.length() + 1];
+        wxStrcpy(out, s.c_str());
+    }
+
+    return out;
+}
+
+wxString wxStripMenuCodes(const wxString& in, int flags)
+{
+    wxASSERT_MSG( flags, _T("this is useless to call without any flags") );
+
+    wxString out;
+
+    size_t len = in.length();
+    out.reserve(len);
+
+    for ( size_t n = 0; n < len; n++ )
+    {
+        wxChar ch = in[n];
+        if ( (flags & wxStrip_Mnemonics) && ch == _T('&') )
+        {
+            // skip it, it is used to introduce the accel char (or to quote
+            // itself in which case it should still be skipped): note that it
+            // can't be the last character of the string
+            if ( ++n == len )
+            {
+                wxLogDebug(_T("Invalid menu string '%s'"), in.c_str());
+            }
+            else
+            {
+                // use the next char instead
+                ch = in[n];
+            }
+        }
+        else if ( (flags & wxStrip_Accel) && ch == _T('\t') )
+        {
+            // everything after TAB is accel string, exit the loop
+            break;
+        }
+
+        out += ch;
+    }
+
+    return out;
+}
+
+// ----------------------------------------------------------------------------
+// Window search functions
+// ----------------------------------------------------------------------------
+
+/*
+ * If parent is non-NULL, look through children for a label or title
+ * matching the specified string. If NULL, look through all top-level windows.
+ *
+ */
+
+wxWindow *
+wxFindWindowByLabel (const wxString& title, wxWindow * parent)
+{
+    return wxWindow::FindWindowByLabel( title, parent );
+}
+
+
+/*
+ * If parent is non-NULL, look through children for a name
+ * matching the specified string. If NULL, look through all top-level windows.
+ *
+ */
+
+wxWindow *
+wxFindWindowByName (const wxString& name, wxWindow * parent)
+{
+    return wxWindow::FindWindowByName( name, parent );
+}
+
+// Returns menu item id or wxNOT_FOUND if none.
+int
+wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
+{
+#if wxUSE_MENUS
+    wxMenuBar *menuBar = frame->GetMenuBar ();
+    if ( menuBar )
+        return menuBar->FindMenuItem (menuString, itemString);
+#endif // wxUSE_MENUS
+
+    return wxNOT_FOUND;
+}
+
+// Try to find the deepest child that contains 'pt'.
+// We go backwards, to try to allow for controls that are spacially
+// within other controls, but are still siblings (e.g. buttons within
+// static boxes). Static boxes are likely to be created _before_ controls
+// that sit inside them.
+wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
+{
+    if (!win->IsShown())
+        return NULL;
+
+    // Hack for wxNotebook case: at least in wxGTK, all pages
+    // claim to be shown, so we must only deal with the selected one.
+#if wxUSE_NOTEBOOK
+    if (win->IsKindOf(CLASSINFO(wxNotebook)))
+    {
+      wxNotebook* nb = (wxNotebook*) win;
+      int sel = nb->GetSelection();
+      if (sel >= 0)
+      {
+        wxWindow* child = nb->GetPage(sel);
+        wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+        if (foundWin)
+           return foundWin;
+      }
+    }
+#endif
+
+    wxWindowList::compatibility_iterator node = win->GetChildren().GetLast();
+    while (node)
+    {
+        wxWindow* child = node->GetData();
+        wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+        if (foundWin)
+          return foundWin;
+        node = node->GetPrevious();
+    }
+
+    wxPoint pos = win->GetPosition();
+    wxSize sz = win->GetSize();
+    if ( !win->IsTopLevel() && win->GetParent() )
+    {
+        pos = win->GetParent()->ClientToScreen(pos);
+    }
+
+    wxRect rect(pos, sz);
+    if (rect.Contains(pt))
+        return win;
+
+    return NULL;
+}
+
+wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt)
+{
+    // Go backwards through the list since windows
+    // on top are likely to have been appended most
+    // recently.
+    wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetLast();
+    while (node)
+    {
+        wxWindow* win = node->GetData();
+        wxWindow* found = wxFindWindowAtPoint(win, pt);
+        if (found)
+            return found;
+        node = node->GetPrevious();
+    }
+    return NULL;
+}
+
+// ----------------------------------------------------------------------------
+// GUI helpers
+// ----------------------------------------------------------------------------
+
+/*
+ * N.B. these convenience functions must be separate from msgdlgg.cpp, textdlgg.cpp
+ * since otherwise the generic code may be pulled in unnecessarily.
+ */
+
+#if wxUSE_MSGDLG
+
+int wxMessageBox(const wxString& message, const wxString& caption, long style,
+                 wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) )
+{
+    long decorated_style = style;
+
+    if ( ( style & ( wxICON_EXCLAMATION | wxICON_HAND | wxICON_INFORMATION | wxICON_QUESTION ) ) == 0 )
+    {
+        decorated_style |= ( style & wxYES ) ? wxICON_QUESTION : wxICON_INFORMATION ;
+    }
+
+    wxMessageDialog dialog(parent, message, caption, decorated_style);
+
+    int ans = dialog.ShowModal();
+    switch ( ans )
+    {
+        case wxID_OK:
+            return wxOK;
+        case wxID_YES:
+            return wxYES;
+        case wxID_NO:
+            return wxNO;
+        case wxID_CANCEL:
+            return wxCANCEL;
+    }
+
+    wxFAIL_MSG( _T("unexpected return code from wxMessageDialog") );
+
+    return wxCANCEL;
+}
+
+#endif // wxUSE_MSGDLG
+
+#if wxUSE_TEXTDLG
+
+wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
+                        const wxString& defaultValue, wxWindow *parent,
+                        wxCoord x, wxCoord y, bool centre )
+{
+    wxString str;
+    long style = wxTextEntryDialogStyle;
+
+    if (centre)
+        style |= wxCENTRE;
+    else
+        style &= ~wxCENTRE;
+
+    wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y));
+
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        str = dialog.GetValue();
+    }
+
+    return str;
+}
+
+wxString wxGetPasswordFromUser(const wxString& message,
+                               const wxString& caption,
+                               const wxString& defaultValue,
+                               wxWindow *parent,
+                               wxCoord x, wxCoord y, bool centre )
+{
+    wxString str;
+    long style = wxTextEntryDialogStyle;
+
+    if (centre)
+        style |= wxCENTRE;
+    else
+        style &= ~wxCENTRE;
+
+    wxPasswordEntryDialog dialog(parent, message, caption, defaultValue,
+                             style, wxPoint(x, y));
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        str = dialog.GetValue();
+    }
+
+    return str;
+}
+
+#endif // wxUSE_TEXTDLG
+
+#if wxUSE_COLOURDLG
+
+wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption)
+{
+    static wxColourData data;
+    data.SetChooseFull(true);
+    if ( colInit.Ok() )
+    {
+        data.SetColour((wxColour &)colInit); // const_cast
+    }
+
+    wxColour colRet;
+    wxColourDialog dialog(parent, &data);
+    if (!caption.empty())
+        dialog.SetTitle(caption);
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        colRet = dialog.GetColourData().GetColour();
+    }
+    //else: leave it invalid
+
+    return colRet;
+}
+
+#endif // wxUSE_COLOURDLG
+
+#if wxUSE_FONTDLG
+
+wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
+{
+    wxFontData data;
+    if ( fontInit.Ok() )
+    {
+        data.SetInitialFont(fontInit);
+    }
+
+    wxFont fontRet;
+    wxFontDialog dialog(parent, data);
+    if (!caption.empty())
+        dialog.SetTitle(caption);
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        fontRet = dialog.GetFontData().GetChosenFont();
+    }
+    //else: leave it invalid
+
+    return fontRet;
+}
+
+#endif // wxUSE_FONTDLG
+
+// ----------------------------------------------------------------------------
+// wxSafeYield and supporting functions
+// ----------------------------------------------------------------------------
+
+void wxEnableTopLevelWindows(bool enable)
+{
+    wxWindowList::compatibility_iterator node;
+    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
+        node->GetData()->Enable(enable);
+}
+
+wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
+{
+    // remember the top level windows which were already disabled, so that we
+    // don't reenable them later
+    m_winDisabled = NULL;
+
+    wxWindowList::compatibility_iterator node;
+    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
+    {
+        wxWindow *winTop = node->GetData();
+        if ( winTop == winToSkip )
+            continue;
+
+        // we don't need to disable the hidden or already disabled windows
+        if ( winTop->IsEnabled() && winTop->IsShown() )
+        {
+            winTop->Disable();
+        }
+        else
+        {
+            if ( !m_winDisabled )
+            {
+                m_winDisabled = new wxWindowList;
+            }
+
+            m_winDisabled->Append(winTop);
+        }
+    }
+}
+
+wxWindowDisabler::~wxWindowDisabler()
+{
+    wxWindowList::compatibility_iterator node;
+    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
+    {
+        wxWindow *winTop = node->GetData();
+        if ( !m_winDisabled || !m_winDisabled->Find(winTop) )
+        {
+            winTop->Enable();
+        }
+        //else: had been already disabled, don't reenable
+    }
+
+    delete m_winDisabled;
+}
+
+// Yield to other apps/messages and disable user input to all windows except
+// the given one
+bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)
+{
+    wxWindowDisabler wd(win);
+
+    bool rc;
+    if (onlyIfNeeded)
+        rc = wxYieldIfNeeded();
+    else
+        rc = wxYield();
+
+    return rc;
+}
+
+// Don't synthesize KeyUp events holding down a key and producing KeyDown
+// events with autorepeat. On by default and always on in wxMSW. wxGTK version
+// in utilsgtk.cpp.
+#ifndef __WXGTK__
+bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
+{
+    return true;    // detectable auto-repeat is the only mode MSW supports
+}
+#endif // !wxGTK
+
+#endif // wxUSE_GUI
diff --git a/Source/3rd Party/wx/src/common/valgen.cpp b/Source/3rd Party/wx/src/common/valgen.cpp
index 26027d8a3..b010537ce 100644
--- a/Source/3rd Party/wx/src/common/valgen.cpp	
+++ b/Source/3rd Party/wx/src/common/valgen.cpp	
@@ -1,712 +1,591 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/valgen.cpp
-// Purpose:     wxGenericValidator class
-// Author:      Kevin Smith
-// Modified by:
-// Created:     Jan 22 1999
-// RCS-ID:      $Id$
-// Copyright:   (c) 1999 Kevin Smith
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_VALIDATORS
-
-#ifndef WX_PRECOMP
-    #include "wx/dynarray.h"
-    #include "wx/utils.h"
-    #include "wx/intl.h"
-    #include "wx/choice.h"
-    #include "wx/combobox.h"
-    #include "wx/radiobox.h"
-    #include "wx/radiobut.h"
-    #include "wx/checkbox.h"
-    #include "wx/scrolbar.h"
-    #include "wx/gauge.h"
-    #include "wx/stattext.h"
-    #include "wx/textctrl.h"
-    #include "wx/button.h"
-    #include "wx/listbox.h"
-    #include "wx/slider.h"
-    #include "wx/checklst.h"
-#endif
-
-#include "wx/spinctrl.h"
-// #include "wx/datectrl.h" -- can't use it in this (core) file for now
-
-#if wxUSE_SPINBTN
-    #include "wx/spinbutt.h"
-#endif
-#if wxUSE_TOGGLEBTN
-    #include "wx/tglbtn.h"
-#endif
-#include "wx/filename.h"
-
-#include "wx/valgen.h"
-
-IMPLEMENT_CLASS(wxGenericValidator, wxValidator)
-
-wxGenericValidator::wxGenericValidator(bool *val)
-{
-    Initialize();
-    m_pBool = val;
-}
-
-wxGenericValidator::wxGenericValidator(int *val)
-{
-    Initialize();
-    m_pInt = val;
-}
-
-wxGenericValidator::wxGenericValidator(wxString *val)
-{
-    Initialize();
-    m_pString = val;
-}
-
-wxGenericValidator::wxGenericValidator(wxArrayInt *val)
-{
-    Initialize();
-    m_pArrayInt = val;
-}
-
-#if wxUSE_DATETIME
-
-wxGenericValidator::wxGenericValidator(wxDateTime *val)
-{
-    Initialize();
-    m_pDateTime = val;
-}
-
-#endif // wxUSE_DATETIME
-
-wxGenericValidator::wxGenericValidator(wxFileName *val)
-{
-    Initialize();
-    m_pFileName = val;
-}
-
-wxGenericValidator::wxGenericValidator(float *val)
-{
-    Initialize();
-    m_pFloat = val;
-}
-
-wxGenericValidator::wxGenericValidator(double *val)
-{
-    Initialize();
-    m_pDouble = val;
-}
-
-wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
-    : wxValidator()
-{
-    Copy(val);
-}
-
-bool wxGenericValidator::Copy(const wxGenericValidator& val)
-{
-    wxValidator::Copy(val);
-
-    m_pBool = val.m_pBool;
-    m_pInt = val.m_pInt;
-    m_pString = val.m_pString;
-    m_pArrayInt = val.m_pArrayInt;
-#if wxUSE_DATETIME
-    m_pDateTime = val.m_pDateTime;
-#endif // wxUSE_DATETIME
-    m_pFileName = val.m_pFileName;
-    m_pFloat = val.m_pFloat;
-    m_pDouble = val.m_pDouble;
-
-    return true;
-}
-
-// Called to transfer data to the window
-bool wxGenericValidator::TransferToWindow(void)
-{
-    if ( !m_validatorWindow )
-        return false;
-
-    // bool controls
-#if wxUSE_CHECKBOX
-    if (wxDynamicCast(m_validatorWindow, wxCheckBox))
-    {
-        wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
-        if (m_pBool)
-        {
-            pControl->SetValue(*m_pBool);
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_RADIOBTN
-    if (wxDynamicCast(m_validatorWindow, wxRadioButton))
-    {
-        wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
-        if (m_pBool)
-        {
-            pControl->SetValue(*m_pBool) ;
-            return true;
-        }
-    } else
-#endif
-
-#if wxUSE_TOGGLEBTN
-    if (wxDynamicCast(m_validatorWindow, wxToggleButton))
-    {
-        wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
-        if (m_pBool)
-        {
-            pControl->SetValue(*m_pBool);
-            return true;
-        }
-    } else
-#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
-    if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton))
-    {
-        wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
-        if (m_pBool)
-        {
-            pControl->SetValue(*m_pBool);
-            return true;
-        }
-    } else
-#endif
-#endif
-
-    // int controls
-#if wxUSE_GAUGE
-    if (wxDynamicCast(m_validatorWindow, wxGauge))
-    {
-        wxGauge* pControl = (wxGauge*) m_validatorWindow;
-        if (m_pInt)
-        {
-            pControl->SetValue(*m_pInt);
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_RADIOBOX
-    if (wxDynamicCast(m_validatorWindow, wxRadioBox))
-    {
-        wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
-        if (m_pInt)
-        {
-            pControl->SetSelection(*m_pInt) ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_SCROLLBAR
-    if (wxDynamicCast(m_validatorWindow, wxScrollBar))
-    {
-        wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
-        if (m_pInt)
-        {
-            pControl->SetThumbPosition(*m_pInt) ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
-    if (wxDynamicCast(m_validatorWindow, wxSpinCtrl))
-    {
-        wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
-        if (m_pInt)
-        {
-            pControl->SetValue(*m_pInt);
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_SPINBTN
-    if (wxDynamicCast(m_validatorWindow, wxSpinButton))
-    {
-        wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
-        if (m_pInt)
-        {
-            pControl->SetValue(*m_pInt) ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_SLIDER
-    if (wxDynamicCast(m_validatorWindow, wxSlider))
-    {
-        wxSlider* pControl = (wxSlider*) m_validatorWindow;
-        if (m_pInt)
-        {
-            pControl->SetValue(*m_pInt) ;
-            return true;
-        }
-    } else
-#endif
-
-    // date time controls
-#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
-    if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl))
-    {
-        wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
-        if (m_pDateTime)
-        {
-            pControl->SetValue(*m_pDateTime) ;
-            return true;
-        }
-    } else
-#endif
-
-    // string controls
-#if wxUSE_BUTTON
-    if (wxDynamicCast(m_validatorWindow, wxButton))
-    {
-        wxButton* pControl = (wxButton*) m_validatorWindow;
-        if (m_pString)
-        {
-            pControl->SetLabel(*m_pString) ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_COMBOBOX
-    if (wxDynamicCast(m_validatorWindow, wxComboBox))
-    {
-        wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
-        if (m_pInt)
-        {
-            pControl->SetSelection(*m_pInt) ;
-            return true;
-        }
-        else if (m_pString)
-        {
-            if (pControl->FindString(* m_pString) != wxNOT_FOUND)
-            {
-                pControl->SetStringSelection(* m_pString);
-            }
-            if ((m_validatorWindow->GetWindowStyle() & wxCB_READONLY) == 0)
-            {
-                pControl->SetValue(* m_pString);
-            }
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_CHOICE
-    if (wxDynamicCast(m_validatorWindow, wxChoice))
-    {
-        wxChoice* pControl = (wxChoice*) m_validatorWindow;
-        if (m_pInt)
-        {
-            pControl->SetSelection(*m_pInt) ;
-            return true;
-        }
-        else if (m_pString)
-        {
-            if (pControl->FindString(* m_pString) != wxNOT_FOUND)
-            {
-                pControl->SetStringSelection(* m_pString);
-            }
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_STATTEXT
-    if (wxDynamicCast(m_validatorWindow, wxStaticText))
-    {
-        wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
-        if (m_pString)
-        {
-            pControl->SetLabel(*m_pString) ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_TEXTCTRL
-    if (wxDynamicCast(m_validatorWindow, wxTextCtrl))
-    {
-        wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
-        if (m_pString)
-        {
-            pControl->SetValue(*m_pString) ;
-            return true;
-        }
-        else if (m_pInt)
-        {
-            wxString str;
-            str.Printf(wxT("%d"), *m_pInt);
-            pControl->SetValue(str);
-            return true;
-        }
-        else if (m_pFileName)
-        {
-            pControl->SetValue(m_pFileName->GetFullPath());
-            return true;
-        }
-        else if (m_pFloat)
-        {
-            pControl->SetValue(wxString::Format(wxT("%g"), *m_pFloat));
-            return true;
-        }
-        else if (m_pDouble)
-        {
-            pControl->SetValue(wxString::Format(wxT("%g"), *m_pDouble));
-            return true;
-        }
-    } else
-#endif
-
-    // array controls
-#if wxUSE_CHECKLISTBOX
-    // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
-    if (wxDynamicCast(m_validatorWindow, wxCheckListBox))
-    {
-        wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
-        if (m_pArrayInt)
-        {
-            // clear all selections
-            size_t i,
-                   count = pControl->GetCount();
-            for ( i = 0 ; i < count; i++ )
-                pControl->Check(i, false);
-
-            // select each item in our array
-            count = m_pArrayInt->GetCount();
-            for ( i = 0 ; i < count; i++ )
-                pControl->Check(m_pArrayInt->Item(i));
-
-            return true;
-        }
-        else
-            return false;
-    } else
-#endif
-#if wxUSE_LISTBOX
-    if (wxDynamicCast(m_validatorWindow, wxListBox))
-    {
-        wxListBox* pControl = (wxListBox*) m_validatorWindow;
-        if (m_pArrayInt)
-        {
-            // clear all selections
-            size_t i,
-                   count = pControl->GetCount();
-            for ( i = 0 ; i < count; i++ )
-                pControl->Deselect(i);
-
-            // select each item in our array
-            count = m_pArrayInt->GetCount();
-            for ( i = 0 ; i < count; i++ )
-                pControl->SetSelection(m_pArrayInt->Item(i));
-
-            return true;
-        }
-    } else
-#endif
-    {   // to match the last 'else' above
-    }
-
-  // unrecognized control, or bad pointer
-  return false;
-}
-
-// Called to transfer data from the window
-bool wxGenericValidator::TransferFromWindow(void)
-{
-    if ( !m_validatorWindow )
-        return false;
-
-    // BOOL CONTROLS **************************************
-#if wxUSE_CHECKBOX
-    if (wxDynamicCast(m_validatorWindow, wxCheckBox))
-    {
-        wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
-        if (m_pBool)
-        {
-            *m_pBool = pControl->GetValue() ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_RADIOBTN
-    if (wxDynamicCast(m_validatorWindow, wxRadioButton))
-    {
-        wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
-        if (m_pBool)
-        {
-            *m_pBool = pControl->GetValue() ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_TOGGLEBTN
-    if (wxDynamicCast(m_validatorWindow, wxToggleButton))
-    {
-        wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
-        if (m_pBool)
-        {
-            *m_pBool = pControl->GetValue() ;
-            return true;
-        }
-    } else
-#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
-    if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton))
-    {
-        wxBitmapToggleButton *pControl = (wxBitmapToggleButton *) m_validatorWindow;
-        if (m_pBool)
-        {
-            *m_pBool = pControl->GetValue() ;
-            return true;
-        }
-    } else
-#endif
-#endif
-
-    // INT CONTROLS ***************************************
-#if wxUSE_GAUGE
-    if (wxDynamicCast(m_validatorWindow, wxGauge))
-    {
-        wxGauge* pControl = (wxGauge*) m_validatorWindow;
-        if (m_pInt)
-        {
-            *m_pInt = pControl->GetValue() ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_RADIOBOX
-    if (wxDynamicCast(m_validatorWindow, wxRadioBox))
-    {
-        wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
-        if (m_pInt)
-        {
-            *m_pInt = pControl->GetSelection() ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_SCROLLBAR
-    if (wxDynamicCast(m_validatorWindow, wxScrollBar))
-    {
-        wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
-        if (m_pInt)
-        {
-            *m_pInt = pControl->GetThumbPosition() ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
-    if (wxDynamicCast(m_validatorWindow, wxSpinCtrl))
-    {
-        wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
-        if (m_pInt)
-        {
-            *m_pInt=pControl->GetValue();
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_SPINBTN
-    if (wxDynamicCast(m_validatorWindow, wxSpinButton))
-    {
-        wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
-        if (m_pInt)
-        {
-            *m_pInt = pControl->GetValue() ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_SLIDER
-    if (wxDynamicCast(m_validatorWindow, wxSlider))
-    {
-        wxSlider* pControl = (wxSlider*) m_validatorWindow;
-        if (m_pInt)
-        {
-            *m_pInt = pControl->GetValue() ;
-            return true;
-        }
-    } else
-#endif
-
-    // DATE TIME CONTROLS ************************************
-#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
-    if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl))
-    {
-        wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
-        if (m_pDateTime)
-        {
-            *m_pDateTime = pControl->GetValue() ;
-            return true;
-        }
-    } else
-#endif
-
-    // STRING CONTROLS ************************************
-#if wxUSE_BUTTON
-    if (wxDynamicCast(m_validatorWindow, wxButton))
-    {
-        wxButton* pControl = (wxButton*) m_validatorWindow;
-        if (m_pString)
-        {
-            *m_pString = pControl->GetLabel() ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_COMBOBOX
-    if (wxDynamicCast(m_validatorWindow, wxComboBox))
-    {
-        wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
-        if (m_pInt)
-        {
-            *m_pInt = pControl->GetSelection() ;
-            return true;
-        }
-        else if (m_pString)
-        {
-            if (m_validatorWindow->GetWindowStyle() & wxCB_READONLY)
-                *m_pString = pControl->GetStringSelection();
-            else
-                *m_pString = pControl->GetValue();
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_CHOICE
-    if (wxDynamicCast(m_validatorWindow, wxChoice))
-    {
-        wxChoice* pControl = (wxChoice*) m_validatorWindow;
-        if (m_pInt)
-        {
-            *m_pInt = pControl->GetSelection() ;
-            return true;
-        }
-        else if (m_pString)
-        {
-            *m_pString = pControl->GetStringSelection();
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_STATTEXT
-    if (wxDynamicCast(m_validatorWindow, wxStaticText))
-    {
-        wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
-        if (m_pString)
-        {
-            *m_pString = pControl->GetLabel() ;
-            return true;
-        }
-    } else
-#endif
-#if wxUSE_TEXTCTRL
-    if (wxDynamicCast(m_validatorWindow, wxTextCtrl))
-    {
-        wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
-        if (m_pString)
-        {
-            *m_pString = pControl->GetValue() ;
-            return true;
-        }
-        else if (m_pInt)
-        {
-            *m_pInt = wxAtoi(pControl->GetValue());
-            return true;
-        }
-        else if (m_pFileName)
-        {
-            m_pFileName->Assign(pControl->GetValue());
-            return true;
-        }
-        else if (m_pFloat)
-        {
-            *m_pFloat = (float)wxAtof(pControl->GetValue());
-            return true;
-        }
-        else if (m_pDouble)
-        {
-            *m_pDouble = wxAtof(pControl->GetValue());
-            return true;
-        }
-    } else
-#endif
-
-    // ARRAY CONTROLS *************************************
-#if wxUSE_CHECKLISTBOX
-    // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
-    if (wxDynamicCast(m_validatorWindow, wxCheckListBox))
-    {
-        wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
-        if (m_pArrayInt)
-        {
-            // clear our array
-            m_pArrayInt->Clear();
-
-            // add each selected item to our array
-            size_t i,
-                   count = pControl->GetCount();
-            for ( i = 0; i < count; i++ )
-            {
-                if (pControl->IsChecked(i))
-                    m_pArrayInt->Add(i);
-            }
-
-            return true;
-        }
-        else
-            return false;
-    } else
-#endif
-#if wxUSE_LISTBOX
-    if (wxDynamicCast(m_validatorWindow, wxListBox))
-    {
-        wxListBox* pControl = (wxListBox*) m_validatorWindow;
-        if (m_pArrayInt)
-        {
-            // clear our array
-            m_pArrayInt->Clear();
-
-            // add each selected item to our array
-            size_t i,
-                   count = pControl->GetCount();
-            for ( i = 0; i < count; i++ )
-            {
-                if (pControl->IsSelected(i))
-                    m_pArrayInt->Add(i);
-            }
-
-            return true;
-        }
-    } else
-#endif
-
-    // unrecognized control, or bad pointer
-        return false;
-
-    return false;
-}
-
-/*
-  Called by constructors to initialize ALL data members
-*/
-void wxGenericValidator::Initialize()
-{
-    m_pBool = NULL;
-    m_pInt = NULL;
-    m_pString = NULL;
-    m_pArrayInt = NULL;
-#if wxUSE_DATETIME
-    m_pDateTime = NULL;
-#endif // wxUSE_DATETIME
-    m_pFileName = NULL;
-    m_pFloat = NULL;
-    m_pDouble = NULL;
-}
-
-#endif // wxUSE_VALIDATORS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/valgen.cpp
+// Purpose:     wxGenericValidator class
+// Author:      Kevin Smith
+// Modified by:
+// Created:     Jan 22 1999
+// RCS-ID:      $Id: valgen.cpp 39463 2006-05-29 21:26:35Z ABX $
+// Copyright:   (c) 1999 Kevin Smith
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_VALIDATORS
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/choice.h"
+    #include "wx/combobox.h"
+    #include "wx/radiobox.h"
+    #include "wx/radiobut.h"
+    #include "wx/checkbox.h"
+    #include "wx/scrolbar.h"
+    #include "wx/gauge.h"
+    #include "wx/stattext.h"
+    #include "wx/textctrl.h"
+    #include "wx/button.h"
+    #include "wx/listbox.h"
+    #include "wx/slider.h"
+    #include "wx/checklst.h"
+#endif
+
+#include "wx/spinctrl.h"
+
+#if wxUSE_SPINBTN
+    #include "wx/spinbutt.h"
+#endif
+#if wxUSE_TOGGLEBTN
+    #include "wx/tglbtn.h"
+#endif
+
+#include "wx/valgen.h"
+
+IMPLEMENT_CLASS(wxGenericValidator, wxValidator)
+
+wxGenericValidator::wxGenericValidator(bool *val)
+{
+    Initialize();
+    m_pBool = val;
+}
+
+wxGenericValidator::wxGenericValidator(int *val)
+{
+    Initialize();
+    m_pInt = val;
+}
+
+wxGenericValidator::wxGenericValidator(wxString *val)
+{
+    Initialize();
+    m_pString = val;
+}
+
+wxGenericValidator::wxGenericValidator(wxArrayInt *val)
+{
+    Initialize();
+    m_pArrayInt = val;
+}
+
+wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
+    : wxValidator()
+{
+    Copy(val);
+}
+
+bool wxGenericValidator::Copy(const wxGenericValidator& val)
+{
+    wxValidator::Copy(val);
+
+    m_pBool = val.m_pBool;
+    m_pInt = val.m_pInt;
+    m_pString = val.m_pString;
+    m_pArrayInt = val.m_pArrayInt;
+
+    return true;
+}
+
+// Called to transfer data to the window
+bool wxGenericValidator::TransferToWindow(void)
+{
+    if ( !m_validatorWindow )
+        return false;
+
+    // bool controls
+#if wxUSE_CHECKBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
+    {
+        wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_RADIOBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+    {
+        wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool) ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_TOGGLEBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    {
+        wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }
+    } else
+#endif
+
+    // int controls
+#if wxUSE_GAUGE
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
+    {
+        wxGauge* pControl = (wxGauge*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt);
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_RADIOBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
+    {
+        wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetSelection(*m_pInt) ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SCROLLBAR
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
+    {
+        wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetThumbPosition(*m_pInt) ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
+    {
+        wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt);
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SPINBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
+    {
+        wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt) ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SLIDER
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
+    {
+        wxSlider* pControl = (wxSlider*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt) ;
+            return true;
+        }
+    } else
+#endif
+
+    // string controls
+#if wxUSE_BUTTON
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
+    {
+        wxButton* pControl = (wxButton*) m_validatorWindow;
+        if (m_pString)
+        {
+            pControl->SetLabel(*m_pString) ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_COMBOBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
+    {
+        wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetSelection(*m_pInt) ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            if (pControl->FindString(* m_pString) != wxNOT_FOUND)
+            {
+                pControl->SetStringSelection(* m_pString);
+            }
+            if ((m_validatorWindow->GetWindowStyle() & wxCB_READONLY) == 0)
+            {
+                pControl->SetValue(* m_pString);
+            }
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_CHOICE
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
+    {
+        wxChoice* pControl = (wxChoice*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetSelection(*m_pInt) ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            if (pControl->FindString(* m_pString) != wxNOT_FOUND)
+            {
+                pControl->SetStringSelection(* m_pString);
+            }
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_STATTEXT
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
+    {
+        wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
+        if (m_pString)
+        {
+            pControl->SetLabel(*m_pString) ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_TEXTCTRL
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+    {
+        wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
+        if (m_pString)
+        {
+            pControl->SetValue(*m_pString) ;
+            return true;
+        }
+        else if (m_pInt)
+        {
+            wxString str;
+            str.Printf(wxT("%d"), *m_pInt);
+            pControl->SetValue(str);
+            return true;
+        }
+    } else
+#endif
+
+    // array controls
+#if wxUSE_CHECKLISTBOX
+    // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    {
+        wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear all selections
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->Check(i, false);
+
+            // select each item in our array
+            count = m_pArrayInt->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->Check(m_pArrayInt->Item(i));
+
+            return true;
+        }
+        else
+            return false;
+    } else
+#endif
+#if wxUSE_LISTBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
+    {
+        wxListBox* pControl = (wxListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear all selections
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->Deselect(i);
+
+            // select each item in our array
+            count = m_pArrayInt->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->SetSelection(m_pArrayInt->Item(i));
+
+            return true;
+        }
+    } else
+#endif
+        ;   // to match the last 'else' above
+
+  // unrecognized control, or bad pointer
+  return false;
+}
+
+// Called to transfer data from the window
+bool wxGenericValidator::TransferFromWindow(void)
+{
+    if ( !m_validatorWindow )
+        return false;
+
+    // BOOL CONTROLS **************************************
+#if wxUSE_CHECKBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
+    {
+        wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_RADIOBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+    {
+        wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_TOGGLEBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    {
+        wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+
+    // INT CONTROLS ***************************************
+#if wxUSE_GAUGE
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
+    {
+        wxGauge* pControl = (wxGauge*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_RADIOBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
+    {
+        wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetSelection() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SCROLLBAR
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
+    {
+        wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetThumbPosition() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
+    {
+        wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt=pControl->GetValue();
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SPINBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
+    {
+        wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SLIDER
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
+    {
+        wxSlider* pControl = (wxSlider*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+
+    // STRING CONTROLS ************************************
+#if wxUSE_BUTTON
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
+    {
+        wxButton* pControl = (wxButton*) m_validatorWindow;
+        if (m_pString)
+        {
+            *m_pString = pControl->GetLabel() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_COMBOBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
+    {
+        wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetSelection() ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            if (m_validatorWindow->GetWindowStyle() & wxCB_READONLY)
+                *m_pString = pControl->GetStringSelection();
+            else
+                *m_pString = pControl->GetValue();
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_CHOICE
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
+    {
+        wxChoice* pControl = (wxChoice*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetSelection() ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            *m_pString = pControl->GetStringSelection();
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_STATTEXT
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
+    {
+        wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
+        if (m_pString)
+        {
+            *m_pString = pControl->GetLabel() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_TEXTCTRL
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+    {
+        wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
+        if (m_pString)
+        {
+            *m_pString = pControl->GetValue() ;
+            return true;
+        }
+        else if (m_pInt)
+        {
+            *m_pInt = wxAtoi(pControl->GetValue());
+            return true;
+        }
+    } else
+#endif
+
+    // ARRAY CONTROLS *************************************
+#if wxUSE_CHECKLISTBOX
+    // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    {
+        wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear our array
+            m_pArrayInt->Clear();
+
+            // add each selected item to our array
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0; i < count; i++ )
+            {
+                if (pControl->IsChecked(i))
+                    m_pArrayInt->Add(i);
+            }
+
+            return true;
+        }
+        else
+            return false;
+    } else
+#endif
+#if wxUSE_LISTBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
+    {
+        wxListBox* pControl = (wxListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear our array
+            m_pArrayInt->Clear();
+
+            // add each selected item to our array
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0; i < count; i++ )
+            {
+                if (pControl->IsSelected(i))
+                    m_pArrayInt->Add(i);
+            }
+
+            return true;
+        }
+    } else
+#endif
+
+    // unrecognized control, or bad pointer
+        return false;
+
+    return false;
+}
+
+/*
+  Called by constructors to initialize ALL data members
+*/
+void wxGenericValidator::Initialize()
+{
+    m_pBool = 0;
+    m_pInt = 0;
+    m_pString = 0;
+    m_pArrayInt = 0;
+}
+
+#endif
+  // wxUSE_VALIDATORS
diff --git a/Source/3rd Party/wx/src/common/validate.cpp b/Source/3rd Party/wx/src/common/validate.cpp
index 63680dd4d..e01711bae 100644
--- a/Source/3rd Party/wx/src/common/validate.cpp	
+++ b/Source/3rd Party/wx/src/common/validate.cpp	
@@ -1,45 +1,45 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/validate.cpp
-// Purpose:     wxValidator
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_VALIDATORS
-
-#include "wx/validate.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/window.h"
-#endif
-
-const wxValidator wxDefaultValidator;
-
-IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
-
-// VZ: personally, I think true would be more appropriate - these bells are
-//     _annoying_
-bool wxValidator::ms_isSilent = false;
-
-wxValidator::wxValidator()
-{
-  m_validatorWindow = NULL;
-}
-
-wxValidator::~wxValidator()
-{
-}
-
-#endif
-  // wxUSE_VALIDATORS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/validate.cpp
+// Purpose:     wxValidator
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: validate.cpp 39656 2006-06-09 21:21:53Z ABX $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_VALIDATORS
+
+#include "wx/validate.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
+
+const wxValidator wxDefaultValidator;
+
+IMPLEMENT_DYNAMIC_CLASS(wxValidator, wxEvtHandler)
+
+// VZ: personally, I think true would be more appropriate - these bells are
+//     _annoying_
+bool wxValidator::ms_isSilent = false;
+
+wxValidator::wxValidator()
+{
+  m_validatorWindow = (wxWindow *) NULL;
+}
+
+wxValidator::~wxValidator()
+{
+}
+
+#endif
+  // wxUSE_VALIDATORS
diff --git a/Source/3rd Party/wx/src/common/valnum.cpp b/Source/3rd Party/wx/src/common/valnum.cpp
deleted file mode 100644
index 3a1a84742..000000000
--- a/Source/3rd Party/wx/src/common/valnum.cpp	
+++ /dev/null
@@ -1,299 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/valnum.cpp
-// Purpose:     Numeric validator classes implementation
-// Author:      Vadim Zeitlin based on the submission of Fulvio Senore
-// Created:     2010-11-06
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// Declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
-
-#ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
-    #include "wx/combobox.h"
-#endif
-
-#include "wx/valnum.h"
-#include "wx/numformatter.h"
-
-// ============================================================================
-// wxNumValidatorBase implementation
-// ============================================================================
-
-BEGIN_EVENT_TABLE(wxNumValidatorBase, wxValidator)
-    EVT_CHAR(wxNumValidatorBase::OnChar)
-    EVT_KILL_FOCUS(wxNumValidatorBase::OnKillFocus)
-END_EVENT_TABLE()
-
-int wxNumValidatorBase::GetFormatFlags() const
-{
-    int flags = wxNumberFormatter::Style_None;
-    if ( m_style & wxNUM_VAL_THOUSANDS_SEPARATOR )
-        flags |= wxNumberFormatter::Style_WithThousandsSep;
-    if ( m_style & wxNUM_VAL_NO_TRAILING_ZEROES )
-        flags |= wxNumberFormatter::Style_NoTrailingZeroes;
-
-    return flags;
-}
-
-wxTextEntry *wxNumValidatorBase::GetTextEntry() const
-{
-#if wxUSE_TEXTCTRL
-    if ( wxTextCtrl *text = wxDynamicCast(m_validatorWindow, wxTextCtrl) )
-        return text;
-#endif // wxUSE_TEXTCTRL
-
-#if wxUSE_COMBOBOX
-    if ( wxComboBox *combo = wxDynamicCast(m_validatorWindow, wxComboBox) )
-        return combo;
-#endif // wxUSE_COMBOBOX
-
-    wxFAIL_MSG("Can only be used with wxTextCtrl or wxComboBox");
-
-    return NULL;
-}
-
-void
-wxNumValidatorBase::GetCurrentValueAndInsertionPoint(wxString& val,
-                                                             int& pos) const
-{
-    wxTextEntry * const control = GetTextEntry();
-    if ( !control )
-        return;
-
-    val = control->GetValue();
-    pos = control->GetInsertionPoint();
-
-    long selFrom, selTo;
-    control->GetSelection(&selFrom, &selTo);
-
-    const long selLen = selTo - selFrom;
-    if ( selLen )
-    {
-        // Remove selected text because pressing a key would make it disappear.
-        val.erase(selFrom, selLen);
-
-        // And adjust the insertion point to have correct position in the new
-        // string.
-        if ( pos > selFrom )
-        {
-            if ( pos >= selTo )
-                pos -= selLen;
-            else
-                pos = selFrom;
-        }
-    }
-}
-
-bool wxNumValidatorBase::IsMinusOk(const wxString& val, int pos) const
-{
-    // Minus is only ever accepted in the beginning of the string.
-    if ( pos != 0 )
-        return false;
-
-    // And then only if there is no existing minus sign there.
-    if ( !val.empty() && val[0] == '-' )
-        return false;
-
-    return true;
-}
-
-void wxNumValidatorBase::OnChar(wxKeyEvent& event)
-{
-    // By default we just validate this key so don't prevent the normal
-    // handling from taking place.
-    event.Skip();
-
-    if ( !m_validatorWindow )
-        return;
-
-#if wxUSE_UNICODE
-    const int ch = event.GetUnicodeKey();
-    if ( ch == WXK_NONE )
-    {
-        // It's a character without any Unicode equivalent at all, e.g. cursor
-        // arrow or function key, we never filter those.
-        return;
-    }
-#else // !wxUSE_UNICODE
-    const int ch = event.GetKeyCode();
-    if ( ch > WXK_DELETE )
-    {
-        // Not a character neither.
-        return;
-    }
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
-    if ( ch < WXK_SPACE || ch == WXK_DELETE )
-    {
-        // Allow ASCII control characters and Delete.
-        return;
-    }
-
-    // Check if this character is allowed in the current state.
-    wxString val;
-    int pos;
-    GetCurrentValueAndInsertionPoint(val, pos);
-
-    if ( !IsCharOk(val, pos, ch) )
-    {
-        if ( !wxValidator::IsSilent() )
-            wxBell();
-
-        // Do not skip the event in this case, stop handling it here.
-        event.Skip(false);
-    }
-}
-
-void wxNumValidatorBase::OnKillFocus(wxFocusEvent& event)
-{
-    wxTextEntry * const control = GetTextEntry();
-    if ( !control )
-        return;
-
-    // When we change the control value below, its "modified" status is reset
-    // so we need to explicitly keep it marked as modified if it was so in the
-    // first place.
-    //
-    // Notice that only wxTextCtrl (and not wxTextEntry) has
-    // IsModified()/MarkDirty() methods hence the need for dynamic cast.
-    wxTextCtrl * const text = wxDynamicCast(m_validatorWindow, wxTextCtrl);
-    const bool wasModified = text ? text->IsModified() : false;
-
-    control->ChangeValue(NormalizeString(control->GetValue()));
-
-    if ( wasModified )
-        text->MarkDirty();
-
-    event.Skip();
-}
-
-// ============================================================================
-// wxIntegerValidatorBase implementation
-// ============================================================================
-
-wxString wxIntegerValidatorBase::ToString(LongestValueType value) const
-{
-    return wxNumberFormatter::ToString(value, GetFormatFlags());
-}
-
-bool
-wxIntegerValidatorBase::FromString(const wxString& s, LongestValueType *value)
-{
-    return wxNumberFormatter::FromString(s, value);
-}
-
-bool
-wxIntegerValidatorBase::IsCharOk(const wxString& val, int pos, wxChar ch) const
-{
-    // We may accept minus sign if we can represent negative numbers at all.
-    if ( ch == '-' )
-    {
-        // Notice that entering '-' can make our value invalid, for example if
-        // we're limited to -5..15 range and the current value is 12, then the
-        // new value would be (invalid) -12. We consider it better to let the
-        // user do this because perhaps he is going to press Delete key next to
-        // make it -2 and forcing him to delete 1 first would be unnatural.
-        //
-        // TODO: It would be nice to indicate that the current control contents
-        //       is invalid (if it's indeed going to be the case) once
-        //       wxValidator supports doing this non-intrusively.
-        return m_min < 0 && IsMinusOk(val, pos);
-    }
-
-    // We only accept digits here (remember that '-' is taken care of by the
-    // base class already).
-    if ( ch < '0' || ch > '9' )
-        return false;
-
-    // And the value after insertion needs to be in the defined range.
-    LongestValueType value;
-    if ( !FromString(GetValueAfterInsertingChar(val, pos, ch), &value) )
-        return false;
-
-    return IsInRange(value);
-}
-
-// ============================================================================
-// wxFloatingPointValidatorBase implementation
-// ============================================================================
-
-wxString wxFloatingPointValidatorBase::ToString(LongestValueType value) const
-{
-    return wxNumberFormatter::ToString(value, m_precision, GetFormatFlags());
-}
-
-bool
-wxFloatingPointValidatorBase::FromString(const wxString& s,
-                                         LongestValueType *value)
-{
-    return wxNumberFormatter::FromString(s, value);
-}
-
-bool
-wxFloatingPointValidatorBase::IsCharOk(const wxString& val,
-                                       int pos,
-                                       wxChar ch) const
-{
-    // We may accept minus sign if we can represent negative numbers at all.
-    if ( ch == '-' )
-        return m_min < 0 && IsMinusOk(val, pos);
-
-    const wxChar separator = wxNumberFormatter::GetDecimalSeparator();
-    if ( ch == separator )
-    {
-        if ( val.find(separator) != wxString::npos )
-        {
-            // There is already a decimal separator, can't insert another one.
-            return false;
-        }
-
-        // Prepending a separator before the minus sign isn't allowed.
-        if ( pos == 0 && !val.empty() && val[0] == '-' )
-            return false;
-
-        // Otherwise always accept it, adding a decimal separator doesn't
-        // change the number value and, in particular, can't make it invalid.
-        // OTOH the checks below might not pass because strings like "." or
-        // "-." are not valid numbers so parsing them would fail, hence we need
-        // to treat it specially here.
-        return true;
-    }
-
-    // Must be a digit then.
-    if ( ch < '0' || ch > '9' )
-        return false;
-
-    // Check whether the value we'd obtain if we accepted this key is correct.
-    const wxString newval(GetValueAfterInsertingChar(val, pos, ch));
-
-    LongestValueType value;
-    if ( !FromString(newval, &value) )
-        return false;
-
-    // Also check that it doesn't have too many decimal digits.
-    const size_t posSep = newval.find(separator);
-    if ( posSep != wxString::npos && newval.length() - posSep - 1 > m_precision )
-        return false;
-
-    // Finally check whether it is in the range.
-    return IsInRange(value);
-}
-
-#endif // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
diff --git a/Source/3rd Party/wx/src/common/valtext.cpp b/Source/3rd Party/wx/src/common/valtext.cpp
index abd4874f8..6f3d8b560 100644
--- a/Source/3rd Party/wx/src/common/valtext.cpp	
+++ b/Source/3rd Party/wx/src/common/valtext.cpp	
@@ -1,335 +1,344 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/valtext.cpp
-// Purpose:     wxTextValidator
-// Author:      Julian Smart
-// Modified by: Francesco Montorsi
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
-
-#include "wx/valtext.h"
-
-#ifndef WX_PRECOMP
-  #include <stdio.h>
-  #include "wx/textctrl.h"
-  #include "wx/combobox.h"
-  #include "wx/utils.h"
-  #include "wx/msgdlg.h"
-  #include "wx/intl.h"
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "wx/combo.h"
-
-// ----------------------------------------------------------------------------
-// global helpers
-// ----------------------------------------------------------------------------
-
-static bool wxIsNumeric(const wxString& val)
-{
-    for ( wxString::const_iterator i = val.begin(); i != val.end(); ++i )
-    {
-        // Allow for "," (French) as well as "." -- in future we should
-        // use wxSystemSettings or other to do better localisation
-        if ((!wxIsdigit(*i)) &&
-            (*i != wxS('.')) && (*i != wxS(',')) && (*i != wxS('e')) &&
-            (*i != wxS('E')) && (*i != wxS('+')) && (*i != wxS('-')))
-            return false;
-    }
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wxTextValidator
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
-BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
-    EVT_CHAR(wxTextValidator::OnChar)
-END_EVENT_TABLE()
-
-wxTextValidator::wxTextValidator(long style, wxString *val)
-{
-    m_stringValue = val;
-    SetStyle(style);
-}
-
-wxTextValidator::wxTextValidator(const wxTextValidator& val)
-    : wxValidator()
-{
-    Copy(val);
-}
-
-void wxTextValidator::SetStyle(long style)
-{
-    m_validatorStyle = style;
-
-#if wxDEBUG_LEVEL
-    int check;
-    check = (int)HasFlag(wxFILTER_ALPHA) + (int)HasFlag(wxFILTER_ALPHANUMERIC) +
-            (int)HasFlag(wxFILTER_DIGITS) + (int)HasFlag(wxFILTER_NUMERIC);
-    wxASSERT_MSG(check <= 1,
-        "It makes sense to use only one of the wxFILTER_ALPHA/wxFILTER_ALPHANUMERIC/"
-        "wxFILTER_SIMPLE_NUMBER/wxFILTER_NUMERIC styles");
-
-    wxASSERT_MSG(((int)HasFlag(wxFILTER_INCLUDE_LIST) + (int)HasFlag(wxFILTER_INCLUDE_CHAR_LIST) <= 1) &&
-                 ((int)HasFlag(wxFILTER_EXCLUDE_LIST) + (int)HasFlag(wxFILTER_EXCLUDE_CHAR_LIST) <= 1),
-        "Using both wxFILTER_[IN|EX]CLUDE_LIST _and_ wxFILTER_[IN|EX]CLUDE_CHAR_LIST "
-        "doesn't work since wxTextValidator internally uses the same array for both");
-
-    check = (int)HasFlag(wxFILTER_INCLUDE_LIST) + (int)HasFlag(wxFILTER_INCLUDE_CHAR_LIST) +
-            (int)HasFlag(wxFILTER_EXCLUDE_LIST) + (int)HasFlag(wxFILTER_EXCLUDE_CHAR_LIST);
-    wxASSERT_MSG(check <= 1,
-        "Using both an include/exclude list may lead to unexpected results");
-#endif // wxDEBUG_LEVEL
-}
-
-bool wxTextValidator::Copy(const wxTextValidator& val)
-{
-    wxValidator::Copy(val);
-
-    m_validatorStyle = val.m_validatorStyle;
-    m_stringValue = val.m_stringValue;
-
-    m_includes    = val.m_includes;
-    m_excludes    = val.m_excludes;
-
-    return true;
-}
-
-wxTextEntry *wxTextValidator::GetTextEntry()
-{
-#if wxUSE_TEXTCTRL
-    if (wxDynamicCast(m_validatorWindow, wxTextCtrl))
-    {
-        return (wxTextCtrl*)m_validatorWindow;
-    }
-#endif
-
-#if wxUSE_COMBOBOX
-    if (wxDynamicCast(m_validatorWindow, wxComboBox))
-    {
-        return (wxComboBox*)m_validatorWindow;
-    }
-#endif
-
-#if wxUSE_COMBOCTRL
-    if (wxDynamicCast(m_validatorWindow, wxComboCtrl))
-    {
-        return (wxComboCtrl*)m_validatorWindow;
-    }
-#endif
-
-    wxFAIL_MSG(
-        "wxTextValidator can only be used with wxTextCtrl, wxComboBox, "
-        "or wxComboCtrl"
-    );
-
-    return NULL;
-}
-
-// Called when the value in the window must be validated.
-// This function can pop up an error message.
-bool wxTextValidator::Validate(wxWindow *parent)
-{
-    // If window is disabled, simply return
-    if ( !m_validatorWindow->IsEnabled() )
-        return true;
-
-    wxTextEntry * const text = GetTextEntry();
-    if ( !text )
-        return false;
-
-    wxString val(text->GetValue());
-
-    wxString errormsg;
-    if ( HasFlag(wxFILTER_EMPTY) && val.empty() )
-    {
-        errormsg = _("Required information entry is empty.");
-    }
-    else if ( !(errormsg = IsValid(val)).empty() )
-    {
-        // NB: this format string should always contain exactly one '%s'
-        wxString buf;
-        buf.Printf(errormsg, val.c_str());
-        errormsg = buf;
-    }
-
-    if ( !errormsg.empty() )
-    {
-        m_validatorWindow->SetFocus();
-        wxMessageBox(errormsg, _("Validation conflict"),
-                     wxOK | wxICON_EXCLAMATION, parent);
-
-        return false;
-    }
-
-    return true;
-}
-
-// Called to transfer data to the window
-bool wxTextValidator::TransferToWindow()
-{
-    if ( m_stringValue )
-    {
-        wxTextEntry * const text = GetTextEntry();
-        if ( !text )
-            return false;
-
-        text->SetValue(*m_stringValue);
-    }
-
-    return true;
-}
-
-// Called to transfer data to the window
-bool wxTextValidator::TransferFromWindow()
-{
-    if ( m_stringValue )
-    {
-        wxTextEntry * const text = GetTextEntry();
-        if ( !text )
-            return false;
-
-        *m_stringValue = text->GetValue();
-    }
-
-    return true;
-}
-
-// IRIX mipsPro refuses to compile wxStringCheck<func>() if func is inline so
-// let's work around this by using this non-template function instead of
-// wxStringCheck(). And while this might be fractionally less efficient because
-// the function call won't be inlined like this, we don't care enough about
-// this to add extra #ifs for non-IRIX case.
-namespace
-{
-
-bool CheckString(bool (*func)(const wxUniChar&), const wxString& str)
-{
-    for ( wxString::const_iterator i = str.begin(); i != str.end(); ++i )
-    {
-        if ( !func(*i) )
-            return false;
-    }
-
-    return true;
-}
-
-} // anonymous namespace
-
-wxString wxTextValidator::IsValid(const wxString& val) const
-{
-    // wxFILTER_EMPTY is checked for in wxTextValidator::Validate
-
-    if ( HasFlag(wxFILTER_ASCII) && !val.IsAscii() )
-        return _("'%s' should only contain ASCII characters.");
-    if ( HasFlag(wxFILTER_ALPHA) && !CheckString(wxIsalpha, val) )
-        return _("'%s' should only contain alphabetic characters.");
-    if ( HasFlag(wxFILTER_ALPHANUMERIC) && !CheckString(wxIsalnum, val) )
-        return _("'%s' should only contain alphabetic or numeric characters.");
-    if ( HasFlag(wxFILTER_DIGITS) && !CheckString(wxIsdigit, val) )
-        return _("'%s' should only contain digits.");
-    if ( HasFlag(wxFILTER_NUMERIC) && !wxIsNumeric(val) )
-        return _("'%s' should be numeric.");
-    if ( HasFlag(wxFILTER_INCLUDE_LIST) && m_includes.Index(val) == wxNOT_FOUND )
-        return _("'%s' is invalid");
-    if ( HasFlag(wxFILTER_INCLUDE_CHAR_LIST) && !ContainsOnlyIncludedCharacters(val) )
-        return _("'%s' is invalid");
-    if ( HasFlag(wxFILTER_EXCLUDE_LIST) && m_excludes.Index(val) != wxNOT_FOUND )
-        return _("'%s' is invalid");
-    if ( HasFlag(wxFILTER_EXCLUDE_CHAR_LIST) && ContainsExcludedCharacters(val) )
-        return _("'%s' is invalid");
-
-    return wxEmptyString;
-}
-
-bool wxTextValidator::ContainsOnlyIncludedCharacters(const wxString& val) const
-{
-    for ( wxString::const_iterator i = val.begin(); i != val.end(); ++i )
-        if (m_includes.Index((wxString) *i) == wxNOT_FOUND)
-            // one character of 'val' is NOT present in m_includes...
-            return false;
-
-    // all characters of 'val' are present in m_includes
-    return true;
-}
-
-bool wxTextValidator::ContainsExcludedCharacters(const wxString& val) const
-{
-    for ( wxString::const_iterator i = val.begin(); i != val.end(); ++i )
-        if (m_excludes.Index((wxString) *i) != wxNOT_FOUND)
-            // one character of 'val' is present in m_excludes...
-            return true;
-
-    // all characters of 'val' are NOT present in m_excludes
-    return false;
-}
-
-void wxTextValidator::SetCharIncludes(const wxString& chars)
-{
-    wxArrayString arr;
-
-    for ( wxString::const_iterator i = chars.begin(); i != chars.end(); ++i )
-        arr.Add(*i);
-
-    SetIncludes(arr);
-}
-
-void wxTextValidator::SetCharExcludes(const wxString& chars)
-{
-    wxArrayString arr;
-
-    for ( wxString::const_iterator i = chars.begin(); i != chars.end(); ++i )
-        arr.Add(*i);
-
-    SetExcludes(arr);
-}
-
-void wxTextValidator::OnChar(wxKeyEvent& event)
-{
-    if (!m_validatorWindow)
-    {
-        event.Skip();
-        return;
-    }
-
-    int keyCode = event.GetKeyCode();
-
-    // we don't filter special keys and delete
-    if (keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode >= WXK_START)
-    {
-        event.Skip();
-        return;
-    }
-
-    wxString str((wxUniChar)keyCode, 1);
-    if (!IsValid(str).empty())
-    {
-        if ( !wxValidator::IsSilent() )
-            wxBell();
-
-        // eat message
-        return;
-    }
-    else
-        event.Skip();
-}
-
-
-#endif
-  // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/valtext.cpp
+// Purpose:     wxTextValidator
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: valtext.cpp 39656 2006-06-09 21:21:53Z ABX $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+
+#include "wx/valtext.h"
+
+#ifndef WX_PRECOMP
+  #include <stdio.h>
+  #include "wx/textctrl.h"
+  #include "wx/utils.h"
+  #include "wx/msgdlg.h"
+  #include "wx/intl.h"
+#endif
+
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef __SALFORDC__
+    #include <clib.h>
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
+
+BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
+    EVT_CHAR(wxTextValidator::OnChar)
+END_EVENT_TABLE()
+
+static bool wxIsNumeric(const wxString& val);
+
+wxTextValidator::wxTextValidator(long style, wxString *val)
+{
+    m_validatorStyle = style;
+    m_stringValue = val;
+/*
+    m_refData = new wxVTextRefData;
+
+    M_VTEXTDATA->m_validatorStyle = style;
+    M_VTEXTDATA->m_stringValue = val;
+*/
+}
+
+wxTextValidator::wxTextValidator(const wxTextValidator& val)
+    : wxValidator()
+{
+    Copy(val);
+}
+
+bool wxTextValidator::Copy(const wxTextValidator& val)
+{
+    wxValidator::Copy(val);
+
+    m_validatorStyle = val.m_validatorStyle;
+    m_stringValue = val.m_stringValue;
+
+    m_includes    = val.m_includes;
+    m_excludes    = val.m_excludes;
+
+    return true;
+}
+
+static bool wxIsAlpha(const wxString& val)
+{
+    int i;
+    for ( i = 0; i < (int)val.length(); i++)
+    {
+        if (!wxIsalpha(val[i]))
+            return false;
+    }
+    return true;
+}
+
+static bool wxIsAlphaNumeric(const wxString& val)
+{
+    int i;
+    for ( i = 0; i < (int)val.length(); i++)
+    {
+        if (!wxIsalnum(val[i]))
+            return false;
+    }
+    return true;
+}
+
+// Called when the value in the window must be validated.
+// This function can pop up an error message.
+bool wxTextValidator::Validate(wxWindow *parent)
+{
+    if( !CheckValidator() )
+        return false;
+
+    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
+
+    // If window is disabled, simply return
+    if ( !control->IsEnabled() )
+        return true;
+
+    wxString val(control->GetValue());
+
+    bool ok = true;
+
+    // NB: this format string should contian exactly one '%s'
+    wxString errormsg;
+
+    bool includes = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0;
+    if ( includes || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) )
+    {
+        // if includes, it's only ok to have the members of the list,
+        // otherwise it's only ok to have non-members
+        ok = includes == (m_includes.Index(val) != wxNOT_FOUND);
+        if ( !ok )
+        {
+            errormsg = _("'%s' is invalid");
+        }
+    }
+    else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
+    {
+        ok = false;
+
+        errormsg = _("'%s' should only contain ASCII characters.");
+    }
+    else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
+    {
+        ok = false;
+
+        errormsg = _("'%s' should only contain alphabetic characters.");
+    }
+    else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
+    {
+        ok = false;
+
+        errormsg = _("'%s' should only contain alphabetic or numeric characters.");
+    }
+    else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
+    {
+        ok = false;
+
+        errormsg = _("'%s' should be numeric.");
+    }
+    else if ( (m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludes(val))
+    {
+        //it's only ok to have the members of the list
+        errormsg = _("'%s' is invalid");
+        ok = false;
+    }
+    else if ( (m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludes(val))
+    {
+        // it's only ok to have non-members of the list
+        errormsg = _("'%s' is invalid");
+        ok = false;
+    }
+
+    if ( !ok )
+    {
+        wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") );
+
+        m_validatorWindow->SetFocus();
+
+        wxString buf;
+        buf.Printf(errormsg, val.c_str());
+
+        wxMessageBox(buf, _("Validation conflict"),
+                     wxOK | wxICON_EXCLAMATION, parent);
+    }
+
+    return ok;
+}
+
+// Called to transfer data to the window
+bool wxTextValidator::TransferToWindow(void)
+{
+    if( !CheckValidator() )
+        return false;
+
+    if ( m_stringValue )
+    {
+        wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
+        control->SetValue(* m_stringValue);
+    }
+
+    return true;
+}
+
+// Called to transfer data to the window
+bool wxTextValidator::TransferFromWindow(void)
+{
+    if( !CheckValidator() )
+        return false;
+
+    if ( m_stringValue )
+    {
+        wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
+        *m_stringValue = control->GetValue();
+    }
+
+    return true;
+}
+
+#if WXWIN_COMPATIBILITY_2_4
+
+inline void wxCopyStringListToArrayString(wxArrayString& to, const wxStringList& from)
+{
+    to.Clear();
+
+    for ( wxStringList::compatibility_iterator pNode = from.GetFirst();
+          pNode;
+          pNode = pNode->GetNext() )
+    {
+        to.Add(pNode->GetData());
+    }
+}
+
+inline void wxCopyArrayStringToStringList(wxStringList& to, const wxArrayString& from)
+{
+    to.Clear();
+
+    for(size_t i = 0; i < from.GetCount(); ++i)
+        to.Add(from[i]);
+}
+
+wxStringList& wxTextValidator::GetIncludeList()
+{
+    wxCopyArrayStringToStringList(m_includeList, m_includes);
+    return m_includeList;
+}
+
+wxStringList& wxTextValidator::GetExcludeList()
+{
+    wxCopyArrayStringToStringList(m_excludeList, m_excludes);
+    return m_excludeList;
+}
+
+void wxTextValidator::SetIncludeList(const wxStringList& list)
+{
+    wxCopyStringListToArrayString(m_includes, list);
+}
+
+void wxTextValidator::SetExcludeList(const wxStringList& list)
+{
+    wxCopyStringListToArrayString(m_excludes, list);
+}
+
+bool wxTextValidator::IsInCharIncludeList(const wxString& val)
+{
+    return IsInCharIncludes(val);
+}
+
+bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
+{
+    return IsNotInCharExcludes(val);
+}
+
+#endif //compat 2.4
+
+
+bool wxTextValidator::IsInCharIncludes(const wxString& val)
+{
+    size_t i;
+    for ( i = 0; i < val.length(); i++)
+    {
+        if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND)
+            return false;
+    }
+    return true;
+}
+
+bool wxTextValidator::IsNotInCharExcludes(const wxString& val)
+{
+    size_t i;
+    for ( i = 0; i < val.length(); i++)
+    {
+       if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND)
+            return false;
+    }
+    return true;
+}
+
+void wxTextValidator::OnChar(wxKeyEvent& event)
+{
+/*
+    if ( !M_VTEXTDATA )
+        return;
+*/
+
+    if ( m_validatorWindow )
+    {
+        int keyCode = event.GetKeyCode();
+
+        // we don't filter special keys and Delete
+        if (
+             !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) &&
+             (
+              ((m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludes(wxString((wxChar) keyCode, 1))) ||
+              ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludes(wxString((wxChar) keyCode, 1))) ||
+              ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) ||
+              ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
+              ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
+              ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)
+                                && keyCode != wxT('.') && keyCode != wxT(',') && keyCode != wxT('-') && keyCode != wxT('+') && keyCode != wxT('e') && keyCode != wxT('E'))
+             )
+           )
+        {
+            if ( !wxValidator::IsSilent() )
+                wxBell();
+
+            // eat message
+            return;
+        }
+    }
+
+    event.Skip();
+}
+
+static bool wxIsNumeric(const wxString& val)
+{
+    int i;
+    for ( i = 0; i < (int)val.length(); i++)
+    {
+        // Allow for "," (French) as well as "." -- in future we should
+        // use wxSystemSettings or other to do better localisation
+        if ((!wxIsdigit(val[i])) && (val[i] != wxT('.')) && (val[i] != wxT(',')) && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-')))
+            return false;
+    }
+    return true;
+}
+
+
+#endif
+  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
diff --git a/Source/3rd Party/wx/src/common/variant.cpp b/Source/3rd Party/wx/src/common/variant.cpp
index 6ebc56a60..eb653c0ff 100644
--- a/Source/3rd Party/wx/src/common/variant.cpp	
+++ b/Source/3rd Party/wx/src/common/variant.cpp	
@@ -1,2511 +1,2040 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/variant.cpp
-// Purpose:     wxVariant class, container for any type
-// Author:      Julian Smart
-// Modified by:
-// Created:     10/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/variant.h"
-
-#if wxUSE_VARIANT
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/math.h"
-    #include "wx/crt.h"
-    #if wxUSE_STREAMS
-        #include "wx/stream.h"
-    #endif
-#endif
-
-#if wxUSE_STD_IOSTREAM
-    #if wxUSE_IOSTREAMH
-        #include <fstream.h>
-    #else
-        #include <fstream>
-    #endif
-#endif
-
-#if wxUSE_STREAMS
-    #include "wx/txtstrm.h"
-#endif
-
-#include "wx/string.h"
-#include "wx/tokenzr.h"
-
-wxVariant WXDLLIMPEXP_BASE wxNullVariant;
-
-
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxVariantList)
-
-/*
- * wxVariant
- */
-
-IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
-
-wxVariant::wxVariant()
-    : wxObject()
-{
-}
-
-bool wxVariant::IsNull() const
-{
-     return (m_refData == NULL);
-}
-
-void wxVariant::MakeNull()
-{
-    UnRef();
-}
-
-void wxVariant::Clear()
-{
-    m_name = wxEmptyString;
-}
-
-wxVariant::wxVariant(const wxVariant& variant)
-    : wxObject()
-{
-    if (!variant.IsNull())
-        Ref(variant);
-
-    m_name = variant.m_name;
-}
-
-wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data
-    : wxObject()
-{
-    m_refData = data;
-    m_name = name;
-}
-
-wxVariant::~wxVariant()
-{
-}
-
-wxObjectRefData *wxVariant::CreateRefData() const
-{
-    // We cannot create any particular wxVariantData.
-    wxFAIL_MSG("wxVariant::CreateRefData() cannot be implemented");
-    return NULL;
-}
-
-wxObjectRefData *wxVariant::CloneRefData(const wxObjectRefData *data) const
-{
-    return ((wxVariantData*) data)->Clone();
-}
-
-// Assignment
-void wxVariant::operator= (const wxVariant& variant)
-{
-    Ref(variant);
-    m_name = variant.m_name;
-}
-
-// myVariant = new wxStringVariantData("hello")
-void wxVariant::operator= (wxVariantData* variantData)
-{
-    UnRef();
-    m_refData = variantData;
-}
-
-bool wxVariant::operator== (const wxVariant& variant) const
-{
-    if (IsNull() || variant.IsNull())
-        return (IsNull() == variant.IsNull());
-
-    if (GetType() != variant.GetType())
-        return false;
-
-    return (GetData()->Eq(* variant.GetData()));
-}
-
-bool wxVariant::operator!= (const wxVariant& variant) const
-{
-    return (!(*this == variant));
-}
-
-wxString wxVariant::MakeString() const
-{
-    if (!IsNull())
-    {
-        wxString str;
-        if (GetData()->Write(str))
-            return str;
-    }
-    return wxEmptyString;
-}
-
-void wxVariant::SetData(wxVariantData* data)
-{
-    UnRef();
-    m_refData = data;
-}
-
-bool wxVariant::Unshare()
-{
-    if ( !m_refData || m_refData->GetRefCount() == 1 )
-        return true;
-
-    wxObject::UnShare();
-
-    return (m_refData && m_refData->GetRefCount() == 1);
-}
-
-
-// Returns a string representing the type of the variant,
-// e.g. "string", "bool", "list", "double", "long"
-wxString wxVariant::GetType() const
-{
-    if (IsNull())
-        return wxString(wxT("null"));
-    else
-        return GetData()->GetType();
-}
-
-
-bool wxVariant::IsType(const wxString& type) const
-{
-    return (GetType() == type);
-}
-
-bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
-{
-    wxClassInfo* info=GetData()->GetValueClassInfo();
-    return info ? info->IsKindOf(type) : false ;
-}
-
-// -----------------------------------------------------------------
-// wxVariant <-> wxAny conversion code
-// -----------------------------------------------------------------
-
-#if wxUSE_ANY
-
-wxAnyToVariantRegistration::
-    wxAnyToVariantRegistration(wxVariantDataFactory factory)
-        : m_factory(factory)
-{
-    wxPreRegisterAnyToVariant(this);
-}
-
-wxAnyToVariantRegistration::~wxAnyToVariantRegistration()
-{
-}
-
-wxVariant::wxVariant(const wxAny& any)
-    : wxObject()
-{
-    wxVariant variant;
-    if ( !any.GetAs(&variant) )
-    {
-        wxFAIL_MSG("wxAny of this type cannot be converted to wxVariant");
-        return;
-    }
-
-    *this = variant;
-}
-
-wxAny wxVariant::GetAny() const
-{
-    if ( IsNull() )
-        return wxAny();
-
-    wxAny any;
-    wxVariantData* data = GetData();
-
-    if ( data->GetAsAny(&any) )
-        return any;
-
-    // If everything else fails, wrap the whole wxVariantData
-    return wxAny(data);
-}
-
-#endif // wxUSE_ANY
-
-// -----------------------------------------------------------------
-// wxVariantDataLong
-// -----------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
-{
-public:
-    wxVariantDataLong() { m_value = 0; }
-    wxVariantDataLong(long value) { m_value = value; }
-
-    inline long GetValue() const { return m_value; }
-    inline void SetValue(long value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-#if wxUSE_STREAMS
-    virtual bool Read(wxInputStream& str);
-    virtual bool Write(wxOutputStream &str) const;
-#endif // wxUSE_STREAMS
-
-    wxVariantData* Clone() const { return new wxVariantDataLong(m_value); }
-
-    virtual wxString GetType() const { return wxT("long"); }
-
-#if wxUSE_ANY
-    // Since wxAny does not have separate type for integers shorter than
-    // longlong, we do not usually implement wxVariant->wxAny conversion
-    // here (but in wxVariantDataLongLong instead).
-  #ifndef wxLongLong_t
-    DECLARE_WXANY_CONVERSION()
-  #else
-    bool GetAsAny(wxAny* any) const
-    {
-        *any = m_value;
-        return true;
-    }
-  #endif
-#endif // wxUSE_ANY
-
-protected:
-    long m_value;
-};
-
-#ifndef wxLongLong_t
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(long, wxVariantDataLong)
-#endif
-
-bool wxVariantDataLong::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") );
-
-    wxVariantDataLong& otherData = (wxVariantDataLong&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataLong::Write(wxSTD ostream& str) const
-{
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDataLong::Write(wxString& str) const
-{
-    str.Printf(wxT("%ld"), m_value);
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataLong::Read(wxSTD istream& str)
-{
-    str >> m_value;
-    return true;
-}
-#endif
-
-#if wxUSE_STREAMS
-bool wxVariantDataLong::Write(wxOutputStream& str) const
-{
-    wxTextOutputStream s(str);
-
-    s.Write32((size_t)m_value);
-    return true;
-}
-
-bool wxVariantDataLong::Read(wxInputStream& str)
-{
-   wxTextInputStream s(str);
-   m_value = s.Read32();
-   return true;
-}
-#endif // wxUSE_STREAMS
-
-bool wxVariantDataLong::Read(wxString& str)
-{
-    m_value = wxAtol(str);
-    return true;
-}
-
-// wxVariant
-
-wxVariant::wxVariant(long val, const wxString& name)
-{
-    m_refData = new wxVariantDataLong(val);
-    m_name = name;
-}
-
-wxVariant::wxVariant(int val, const wxString& name)
-{
-    m_refData = new wxVariantDataLong((long)val);
-    m_name = name;
-}
-
-wxVariant::wxVariant(short val, const wxString& name)
-{
-    m_refData = new wxVariantDataLong((long)val);
-    m_name = name;
-}
-
-bool wxVariant::operator== (long value) const
-{
-    long thisValue;
-    if (!Convert(&thisValue))
-        return false;
-    else
-        return (value == thisValue);
-}
-
-bool wxVariant::operator!= (long value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (long value)
-{
-    if (GetType() == wxT("long") &&
-        m_refData->GetRefCount() == 1)
-    {
-        ((wxVariantDataLong*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataLong(value);
-    }
-}
-
-long wxVariant::GetLong() const
-{
-    long value;
-    if (Convert(& value))
-        return value;
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a long"));
-        return 0;
-    }
-}
-
-// -----------------------------------------------------------------
-// wxVariantDoubleData
-// -----------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData
-{
-public:
-    wxVariantDoubleData() { m_value = 0.0; }
-    wxVariantDoubleData(double value) { m_value = value; }
-
-    inline double GetValue() const { return m_value; }
-    inline void SetValue(double value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-    virtual bool Read(wxString& str);
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-#if wxUSE_STREAMS
-    virtual bool Read(wxInputStream& str);
-    virtual bool Write(wxOutputStream &str) const;
-#endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("double"); }
-
-    wxVariantData* Clone() const { return new wxVariantDoubleData(m_value); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    double m_value;
-};
-
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(double, wxVariantDoubleData)
-
-bool wxVariantDoubleData::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") );
-
-    wxVariantDoubleData& otherData = (wxVariantDoubleData&) data;
-
-    return wxIsSameDouble(otherData.m_value, m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDoubleData::Write(wxSTD ostream& str) const
-{
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDoubleData::Write(wxString& str) const
-{
-    str.Printf(wxT("%.14g"), m_value);
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDoubleData::Read(wxSTD istream& str)
-{
-    str >> m_value;
-    return true;
-}
-#endif
-
-#if wxUSE_STREAMS
-bool wxVariantDoubleData::Write(wxOutputStream& str) const
-{
-    wxTextOutputStream s(str);
-    s.WriteDouble((double)m_value);
-    return true;
-}
-
-bool wxVariantDoubleData::Read(wxInputStream& str)
-{
-    wxTextInputStream s(str);
-    m_value = (float)s.ReadDouble();
-    return true;
-}
-#endif // wxUSE_STREAMS
-
-bool wxVariantDoubleData::Read(wxString& str)
-{
-    m_value = wxAtof(str);
-    return true;
-}
-
-//  wxVariant double code
-
-wxVariant::wxVariant(double val, const wxString& name)
-{
-    m_refData = new wxVariantDoubleData(val);
-    m_name = name;
-}
-
-bool wxVariant::operator== (double value) const
-{
-    double thisValue;
-    if (!Convert(&thisValue))
-        return false;
-
-    return wxIsSameDouble(value, thisValue);
-}
-
-bool wxVariant::operator!= (double value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (double value)
-{
-    if (GetType() == wxT("double") &&
-        m_refData->GetRefCount() == 1)
-    {
-        ((wxVariantDoubleData*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDoubleData(value);
-    }
-}
-
-double wxVariant::GetDouble() const
-{
-    double value;
-    if (Convert(& value))
-        return value;
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a double number"));
-        return 0.0;
-    }
-}
-
-// -----------------------------------------------------------------
-// wxVariantBoolData
-// -----------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
-{
-public:
-    wxVariantDataBool() { m_value = 0; }
-    wxVariantDataBool(bool value) { m_value = value; }
-
-    inline bool GetValue() const { return m_value; }
-    inline void SetValue(bool value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-    virtual bool Read(wxString& str);
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-#if wxUSE_STREAMS
-    virtual bool Read(wxInputStream& str);
-    virtual bool Write(wxOutputStream& str) const;
-#endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("bool"); }
-
-    wxVariantData* Clone() const { return new wxVariantDataBool(m_value); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    bool m_value;
-};
-
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(bool, wxVariantDataBool)
-
-bool wxVariantDataBool::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") );
-
-    wxVariantDataBool& otherData = (wxVariantDataBool&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataBool::Write(wxSTD ostream& str) const
-{
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDataBool::Write(wxString& str) const
-{
-    str.Printf(wxT("%d"), (int) m_value);
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str))
-{
-    wxFAIL_MSG(wxT("Unimplemented"));
-//    str >> (long) m_value;
-    return false;
-}
-#endif
-
-#if wxUSE_STREAMS
-bool wxVariantDataBool::Write(wxOutputStream& str) const
-{
-    wxTextOutputStream s(str);
-
-    s.Write8(m_value);
-    return true;
-}
-
-bool wxVariantDataBool::Read(wxInputStream& str)
-{
-    wxTextInputStream s(str);
-
-    m_value = s.Read8() != 0;
-    return true;
-}
-#endif // wxUSE_STREAMS
-
-bool wxVariantDataBool::Read(wxString& str)
-{
-    m_value = (wxAtol(str) != 0);
-    return true;
-}
-
-// wxVariant ****
-
-wxVariant::wxVariant(bool val, const wxString& name)
-{
-    m_refData = new wxVariantDataBool(val);
-    m_name = name;
-}
-
-bool wxVariant::operator== (bool value) const
-{
-    bool thisValue;
-    if (!Convert(&thisValue))
-        return false;
-    else
-        return (value == thisValue);
-}
-
-bool wxVariant::operator!= (bool value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (bool value)
-{
-    if (GetType() == wxT("bool") &&
-        m_refData->GetRefCount() == 1)
-    {
-        ((wxVariantDataBool*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataBool(value);
-    }
-}
-
-bool wxVariant::GetBool() const
-{
-    bool value;
-    if (Convert(& value))
-        return value;
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a bool"));
-        return 0;
-    }
-}
-
-// -----------------------------------------------------------------
-// wxVariantDataChar
-// -----------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
-{
-public:
-    wxVariantDataChar() { m_value = 0; }
-    wxVariantDataChar(const wxUniChar& value) { m_value = value; }
-
-    inline wxUniChar GetValue() const { return m_value; }
-    inline void SetValue(const wxUniChar& value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STREAMS
-    virtual bool Read(wxInputStream& str);
-    virtual bool Write(wxOutputStream& str) const;
-#endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("char"); }
-    wxVariantData* Clone() const { return new wxVariantDataChar(m_value); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    wxUniChar m_value;
-};
-
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxUniChar, wxVariantDataChar)
-
-bool wxVariantDataChar::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") );
-
-    wxVariantDataChar& otherData = (wxVariantDataChar&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataChar::Write(wxSTD ostream& str) const
-{
-    str << wxString(m_value);
-    return true;
-}
-#endif
-
-bool wxVariantDataChar::Write(wxString& str) const
-{
-    str = m_value;
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
-{
-    wxFAIL_MSG(wxT("Unimplemented"));
-
-    return false;
-}
-#endif
-
-#if wxUSE_STREAMS
-bool wxVariantDataChar::Write(wxOutputStream& str) const
-{
-    wxTextOutputStream s(str);
-
-    // FIXME-UTF8: this should be just "s << m_value;" after removal of
-    //             ANSI build and addition of wxUniChar to wxTextOutputStream:
-    s << (wxChar)m_value;
-
-    return true;
-}
-
-bool wxVariantDataChar::Read(wxInputStream& str)
-{
-    wxTextInputStream s(str);
-
-    // FIXME-UTF8: this should be just "s >> m_value;" after removal of
-    //             ANSI build and addition of wxUniChar to wxTextInputStream:
-    wxChar ch;
-    s >> ch;
-    m_value = ch;
-
-    return true;
-}
-#endif // wxUSE_STREAMS
-
-bool wxVariantDataChar::Read(wxString& str)
-{
-    m_value = str[0u];
-    return true;
-}
-
-wxVariant::wxVariant(const wxUniChar& val, const wxString& name)
-{
-    m_refData = new wxVariantDataChar(val);
-    m_name = name;
-}
-
-wxVariant::wxVariant(char val, const wxString& name)
-{
-    m_refData = new wxVariantDataChar(val);
-    m_name = name;
-}
-
-wxVariant::wxVariant(wchar_t val, const wxString& name)
-{
-    m_refData = new wxVariantDataChar(val);
-    m_name = name;
-}
-
-bool wxVariant::operator==(const wxUniChar& value) const
-{
-    wxUniChar thisValue;
-    if (!Convert(&thisValue))
-        return false;
-    else
-        return (value == thisValue);
-}
-
-wxVariant& wxVariant::operator=(const wxUniChar& value)
-{
-    if (GetType() == wxT("char") &&
-        m_refData->GetRefCount() == 1)
-    {
-        ((wxVariantDataChar*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataChar(value);
-    }
-
-    return *this;
-}
-
-wxUniChar wxVariant::GetChar() const
-{
-    wxUniChar value;
-    if (Convert(& value))
-        return value;
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a char"));
-        return wxUniChar(0);
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxVariantDataString
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
-{
-public:
-    wxVariantDataString() { }
-    wxVariantDataString(const wxString& value) { m_value = value; }
-
-    inline wxString GetValue() const { return m_value; }
-    inline void SetValue(const wxString& value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }
-#endif
-#if wxUSE_STREAMS
-    virtual bool Read(wxInputStream& str);
-    virtual bool Write(wxOutputStream& str) const;
-#endif // wxUSE_STREAMS
-    virtual wxString GetType() const { return wxT("string"); }
-    wxVariantData* Clone() const { return new wxVariantDataString(m_value); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    wxString m_value;
-};
-
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxString, wxVariantDataString)
-
-#if wxUSE_ANY
-// This allows converting string literal wxAnys to string variants
-wxVariantData* wxVariantDataFromConstCharPAny(const wxAny& any)
-{
-    return new wxVariantDataString(wxANY_AS(any, const char*));
-}
-
-wxVariantData* wxVariantDataFromConstWchar_tPAny(const wxAny& any)
-{
-    return new wxVariantDataString(wxANY_AS(any, const wchar_t*));
-}
-
-_REGISTER_WXANY_CONVERSION(const char*,
-                           ConstCharP,
-                           wxVariantDataFromConstCharPAny)
-_REGISTER_WXANY_CONVERSION(const wchar_t*,
-                           ConstWchar_tP,
-                           wxVariantDataFromConstWchar_tPAny)
-#endif
-
-bool wxVariantDataString::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") );
-
-    wxVariantDataString& otherData = (wxVariantDataString&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataString::Write(wxSTD ostream& str) const
-{
-    str << (const char*) m_value.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDataString::Write(wxString& str) const
-{
-    str = m_value;
-    return true;
-}
-
-#if wxUSE_STREAMS
-bool wxVariantDataString::Write(wxOutputStream& str) const
-{
-  // why doesn't wxOutputStream::operator<< take "const wxString&"
-    wxTextOutputStream s(str);
-    s.WriteString(m_value);
-    return true;
-}
-
-bool wxVariantDataString::Read(wxInputStream& str)
-{
-    wxTextInputStream s(str);
-
-    m_value = s.ReadLine();
-    return true;
-}
-#endif // wxUSE_STREAMS
-
-bool wxVariantDataString::Read(wxString& str)
-{
-    m_value = str;
-    return true;
-}
-
-// wxVariant ****
-
-wxVariant::wxVariant(const wxString& val, const wxString& name)
-{
-    m_refData = new wxVariantDataString(val);
-    m_name = name;
-}
-
-wxVariant::wxVariant(const char* val, const wxString& name)
-{
-    m_refData = new wxVariantDataString(wxString(val));
-    m_name = name;
-}
-
-wxVariant::wxVariant(const wchar_t* val, const wxString& name)
-{
-    m_refData = new wxVariantDataString(wxString(val));
-    m_name = name;
-}
-
-wxVariant::wxVariant(const wxCStrData& val, const wxString& name)
-{
-    m_refData = new wxVariantDataString(val.AsString());
-    m_name = name;
-}
-
-wxVariant::wxVariant(const wxScopedCharBuffer& val, const wxString& name)
-{
-    m_refData = new wxVariantDataString(wxString(val));
-    m_name = name;
-}
-
-wxVariant::wxVariant(const wxScopedWCharBuffer& val, const wxString& name)
-{
-    m_refData = new wxVariantDataString(wxString(val));
-    m_name = name;
-}
-
-#if wxUSE_STD_STRING
-wxVariant::wxVariant(const std::string& val, const wxString& name)
-{
-    m_refData = new wxVariantDataString(wxString(val));
-    m_name = name;
-}
-
-wxVariant::wxVariant(const wxStdWideString& val, const wxString& name)
-{
-    m_refData = new wxVariantDataString(wxString(val));
-    m_name = name;
-}
-#endif // wxUSE_STD_STRING
-
-bool wxVariant::operator== (const wxString& value) const
-{
-    wxString thisValue;
-    if (!Convert(&thisValue))
-        return false;
-
-    return value == thisValue;
-}
-
-bool wxVariant::operator!= (const wxString& value) const
-{
-    return (!((*this) == value));
-}
-
-wxVariant& wxVariant::operator= (const wxString& value)
-{
-    if (GetType() == wxT("string") &&
-        m_refData->GetRefCount() == 1)
-    {
-        ((wxVariantDataString*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataString(value);
-    }
-    return *this;
-}
-
-wxString wxVariant::GetString() const
-{
-    wxString value;
-    if (!Convert(& value))
-    {
-        wxFAIL_MSG(wxT("Could not convert to a string"));
-    }
-
-    return value;
-}
-
-// ----------------------------------------------------------------------------
-// wxVariantDataWxObjectPtr
-// ----------------------------------------------------------------------------
-
-class wxVariantDataWxObjectPtr: public wxVariantData
-{
-public:
-    wxVariantDataWxObjectPtr() { }
-    wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }
-
-    inline wxObject* GetValue() const { return m_value; }
-    inline void SetValue(wxObject* value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const ;
-    virtual wxVariantData* Clone() const { return new wxVariantDataWxObjectPtr(m_value); }
-
-    virtual wxClassInfo* GetValueClassInfo();
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    wxObject* m_value;
-};
-
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxObject*, wxVariantDataWxObjectPtr)
-
-bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );
-
-    wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-wxString wxVariantDataWxObjectPtr::GetType() const
-{
-    wxString returnVal(wxT("wxObject*"));
-
-    if (m_value)
-    {
-        returnVal = m_value->GetClassInfo()->GetClassName();
-        returnVal += wxT("*");
-    }
-
-    return returnVal;
-}
-
-wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()
-{
-    wxClassInfo* returnVal=NULL;
-
-    if (m_value) returnVal = m_value->GetClassInfo();
-
-    return returnVal;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
-{
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDataWxObjectPtr::Write(wxString& str) const
-{
-    str.Printf(wxT("%s(%p)"), GetType().c_str(), static_cast<void*>(m_value));
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))
-{
-    // Not implemented
-    return false;
-}
-#endif
-
-bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))
-{
-    // Not implemented
-    return false;
-}
-
-// wxVariant
-
-wxVariant::wxVariant( wxObject* val, const wxString& name)
-{
-    m_refData = new wxVariantDataWxObjectPtr(val);
-    m_name = name;
-}
-
-bool wxVariant::operator== (wxObject* value) const
-{
-    return (value == ((wxVariantDataWxObjectPtr*)GetData())->GetValue());
-}
-
-bool wxVariant::operator!= (wxObject* value) const
-{
-    return (!((*this) == (wxObject*) value));
-}
-
-void wxVariant::operator= (wxObject* value)
-{
-    UnRef();
-    m_refData = new wxVariantDataWxObjectPtr(value);
-}
-
-wxObject* wxVariant::GetWxObjectPtr() const
-{
-    return (wxObject*) ((wxVariantDataWxObjectPtr*) m_refData)->GetValue();
-}
-
-// ----------------------------------------------------------------------------
-// wxVariantDataVoidPtr
-// ----------------------------------------------------------------------------
-
-class wxVariantDataVoidPtr: public wxVariantData
-{
-public:
-    wxVariantDataVoidPtr() { }
-    wxVariantDataVoidPtr(void* value) { m_value = value; }
-
-    inline void* GetValue() const { return m_value; }
-    inline void SetValue(void* value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("void*"); }
-    virtual wxVariantData* Clone() const { return new wxVariantDataVoidPtr(m_value); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    void* m_value;
-};
-
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(void*, wxVariantDataVoidPtr)
-
-bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( data.GetType() == wxT("void*"), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
-
-    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
-{
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDataVoidPtr::Write(wxString& str) const
-{
-    str.Printf(wxT("%p"), m_value);
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
-{
-    // Not implemented
-    return false;
-}
-#endif
-
-bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
-{
-    // Not implemented
-    return false;
-}
-
-// wxVariant
-
-wxVariant::wxVariant( void* val, const wxString& name)
-{
-    m_refData = new wxVariantDataVoidPtr(val);
-    m_name = name;
-}
-
-bool wxVariant::operator== (void* value) const
-{
-    return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
-}
-
-bool wxVariant::operator!= (void* value) const
-{
-    return (!((*this) == (void*) value));
-}
-
-void wxVariant::operator= (void* value)
-{
-    if (GetType() == wxT("void*") && (m_refData->GetRefCount() == 1))
-    {
-        ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataVoidPtr(value);
-    }
-}
-
-void* wxVariant::GetVoidPtr() const
-{
-    // handling this specially is convenient when working with COM, see #9873
-    if ( IsNull() )
-        return NULL;
-
-    wxASSERT( GetType() == wxT("void*") );
-
-    return (void*) ((wxVariantDataVoidPtr*) m_refData)->GetValue();
-}
-
-// ----------------------------------------------------------------------------
-// wxVariantDataDateTime
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DATETIME
-
-class wxVariantDataDateTime: public wxVariantData
-{
-public:
-    wxVariantDataDateTime() { }
-    wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
-
-    inline wxDateTime GetValue() const { return m_value; }
-    inline void SetValue(const wxDateTime& value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("datetime"); }
-    virtual wxVariantData* Clone() const { return new wxVariantDataDateTime(m_value); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    wxDateTime m_value;
-};
-
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxDateTime, wxVariantDataDateTime)
-
-bool wxVariantDataDateTime::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") );
-
-    wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
-{
-    wxString value;
-    Write( value );
-    str << value.c_str();
-    return true;
-}
-#endif
-
-
-bool wxVariantDataDateTime::Write(wxString& str) const
-{
-    if ( m_value.IsValid() )
-        str = m_value.Format();
-    else
-        str = wxS("Invalid");
-    return true;
-}
-
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
-{
-    // Not implemented
-    return false;
-}
-#endif
-
-
-bool wxVariantDataDateTime::Read(wxString& str)
-{
-    if ( str == wxS("Invalid") )
-    {
-        m_value = wxInvalidDateTime;
-        return true;
-    }
-
-    wxString::const_iterator end;
-    return m_value.ParseDateTime(str, &end) && end == str.end();
-}
-
-// wxVariant
-
-wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
-{
-    m_refData = new wxVariantDataDateTime(val);
-    m_name = name;
-}
-
-bool wxVariant::operator== (const wxDateTime& value) const
-{
-    wxDateTime thisValue;
-    if (!Convert(&thisValue))
-        return false;
-
-    return value.IsEqualTo(thisValue);
-}
-
-bool wxVariant::operator!= (const wxDateTime& value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxDateTime& value)
-{
-    if (GetType() == wxT("datetime") &&
-        m_refData->GetRefCount() == 1)
-    {
-        ((wxVariantDataDateTime*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataDateTime(value);
-    }
-}
-
-wxDateTime wxVariant::GetDateTime() const
-{
-    wxDateTime value;
-    if (!Convert(& value))
-    {
-        wxFAIL_MSG(wxT("Could not convert to a datetime"));
-    }
-
-    return value;
-}
-
-#endif // wxUSE_DATETIME
-
-// ----------------------------------------------------------------------------
-// wxVariantDataArrayString
-// ----------------------------------------------------------------------------
-
-class wxVariantDataArrayString: public wxVariantData
-{
-public:
-    wxVariantDataArrayString() { }
-    wxVariantDataArrayString(const wxArrayString& value) { m_value = value; }
-
-    wxArrayString GetValue() const { return m_value; }
-    void SetValue(const wxArrayString& value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("arrstring"); }
-    virtual wxVariantData* Clone() const { return new wxVariantDataArrayString(m_value); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    wxArrayString m_value;
-};
-
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(wxArrayString, wxVariantDataArrayString)
-
-bool wxVariantDataArrayString::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") );
-
-    wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
-
-    return otherData.m_value == m_value;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(str)) const
-{
-    // Not implemented
-    return false;
-}
-#endif
-
-bool wxVariantDataArrayString::Write(wxString& str) const
-{
-    size_t count = m_value.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        if ( n )
-            str += wxT(';');
-
-        str += m_value[n];
-    }
-
-    return true;
-}
-
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
-{
-    // Not implemented
-    return false;
-}
-#endif
-
-
-bool wxVariantDataArrayString::Read(wxString& str)
-{
-    wxStringTokenizer tk(str, wxT(";"));
-    while ( tk.HasMoreTokens() )
-    {
-        m_value.Add(tk.GetNextToken());
-    }
-
-    return true;
-}
-
-// wxVariant
-
-wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
-{
-    m_refData = new wxVariantDataArrayString(val);
-    m_name = name;
-}
-
-bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
-{
-    wxFAIL_MSG( wxT("TODO") );
-
-    return false;
-}
-
-bool wxVariant::operator!=(const wxArrayString& value) const
-{
-    return !(*this == value);
-}
-
-void wxVariant::operator=(const wxArrayString& value)
-{
-    if (GetType() == wxT("arrstring") &&
-        m_refData->GetRefCount() == 1)
-    {
-        ((wxVariantDataArrayString *)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataArrayString(value);
-    }
-}
-
-wxArrayString wxVariant::GetArrayString() const
-{
-    if ( GetType() == wxT("arrstring") )
-        return ((wxVariantDataArrayString *)GetData())->GetValue();
-
-    return wxArrayString();
-}
-
-// ----------------------------------------------------------------------------
-// wxVariantDataLongLong
-// ----------------------------------------------------------------------------
-
-#if wxUSE_LONGLONG
-
-class WXDLLIMPEXP_BASE wxVariantDataLongLong : public wxVariantData
-{
-public:
-    wxVariantDataLongLong() { m_value = 0; }
-    wxVariantDataLongLong(wxLongLong value) { m_value = value; }
-
-    wxLongLong GetValue() const { return m_value; }
-    void SetValue(wxLongLong value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-#if wxUSE_STREAMS
-    virtual bool Read(wxInputStream& str);
-    virtual bool Write(wxOutputStream &str) const;
-#endif // wxUSE_STREAMS
-
-    wxVariantData* Clone() const
-    {
-        return new wxVariantDataLongLong(m_value);
-    }
-
-    virtual wxString GetType() const { return wxS("longlong"); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    wxLongLong m_value;
-};
-
-//
-// wxLongLong type requires customized wxAny conversion code
-//
-#if wxUSE_ANY
-#ifdef wxLongLong_t
-
-bool wxVariantDataLongLong::GetAsAny(wxAny* any) const
-{
-    *any = m_value.GetValue();
-    return true;
-}
-
-wxVariantData* wxVariantDataLongLong::VariantDataFactory(const wxAny& any)
-{
-    return new wxVariantDataLongLong(wxANY_AS(any, wxLongLong_t));
-}
-
-REGISTER_WXANY_CONVERSION(wxLongLong_t, wxVariantDataLongLong)
-
-#else // if !defined(wxLongLong_t)
-
-bool wxVariantDataLongLong::GetAsAny(wxAny* any) const
-{
-    *any = m_value;
-    return true;
-}
-
-wxVariantData* wxVariantDataLongLong::VariantDataFactory(const wxAny& any)
-{
-    return new wxVariantDataLongLong(wxANY_AS(any, wxLongLong));
-}
-
-REGISTER_WXANY_CONVERSION(wxLongLong, wxVariantDataLongLong)
-
-#endif // defined(wxLongLong_t)/!defined(wxLongLong_t)
-#endif // wxUSE_ANY
-
-bool wxVariantDataLongLong::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxS("longlong")),
-                  "wxVariantDataLongLong::Eq: argument mismatch" );
-
-    wxVariantDataLongLong& otherData = (wxVariantDataLongLong&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataLongLong::Write(wxSTD ostream& str) const
-{
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDataLongLong::Write(wxString& str) const
-{
-#ifdef wxLongLong_t
-    str.Printf(wxS("%lld"), m_value.GetValue());
-    return true;
-#else
-    return false;
-#endif
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataLongLong::Read(wxSTD istream& WXUNUSED(str))
-{
-    wxFAIL_MSG(wxS("Unimplemented"));
-    return false;
-}
-#endif
-
-#if wxUSE_STREAMS
-bool wxVariantDataLongLong::Write(wxOutputStream& str) const
-{
-    wxTextOutputStream s(str);
-    s.Write32(m_value.GetLo());
-    s.Write32(m_value.GetHi());
-    return true;
-}
-
-bool wxVariantDataLongLong::Read(wxInputStream& str)
-{
-   wxTextInputStream s(str);
-   unsigned long lo = s.Read32();
-   long hi = s.Read32();
-   m_value = wxLongLong(hi, lo);
-   return true;
-}
-#endif // wxUSE_STREAMS
-
-bool wxVariantDataLongLong::Read(wxString& str)
-{
-#ifdef wxLongLong_t
-    wxLongLong_t value_t;
-    if ( !str.ToLongLong(&value_t) )
-        return false;
-    m_value = value_t;
-    return true;
-#else
-    return false;
-#endif
-}
-
-// wxVariant
-
-wxVariant::wxVariant(wxLongLong val, const wxString& name)
-{
-    m_refData = new wxVariantDataLongLong(val);
-    m_name = name;
-}
-
-bool wxVariant::operator==(wxLongLong value) const
-{
-    wxLongLong thisValue;
-    if ( !Convert(&thisValue) )
-        return false;
-    else
-        return (value == thisValue);
-}
-
-bool wxVariant::operator!=(wxLongLong value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator=(wxLongLong value)
-{
-    if ( GetType() == wxS("longlong") &&
-         m_refData->GetRefCount() == 1 )
-    {
-        ((wxVariantDataLongLong*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataLongLong(value);
-    }
-}
-
-wxLongLong wxVariant::GetLongLong() const
-{
-    wxLongLong value;
-    if ( Convert(&value) )
-    {
-        return value;
-    }
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a long long"));
-        return 0;
-    }
-}
-
-#endif // wxUSE_LONGLONG
-
-// ----------------------------------------------------------------------------
-// wxVariantDataULongLong
-// ----------------------------------------------------------------------------
-
-#if wxUSE_LONGLONG
-
-class WXDLLIMPEXP_BASE wxVariantDataULongLong : public wxVariantData
-{
-public:
-    wxVariantDataULongLong() { m_value = 0; }
-    wxVariantDataULongLong(wxULongLong value) { m_value = value; }
-
-    wxULongLong GetValue() const { return m_value; }
-    void SetValue(wxULongLong value) { m_value = value; }
-
-    virtual bool Eq(wxVariantData& data) const;
-
-    virtual bool Read(wxString& str);
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-#if wxUSE_STREAMS
-    virtual bool Read(wxInputStream& str);
-    virtual bool Write(wxOutputStream &str) const;
-#endif // wxUSE_STREAMS
-
-    wxVariantData* Clone() const
-    {
-        return new wxVariantDataULongLong(m_value);
-    }
-
-    virtual wxString GetType() const { return wxS("ulonglong"); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    wxULongLong m_value;
-};
-
-//
-// wxULongLong type requires customized wxAny conversion code
-//
-#if wxUSE_ANY
-#ifdef wxLongLong_t
-
-bool wxVariantDataULongLong::GetAsAny(wxAny* any) const
-{
-    *any = m_value.GetValue();
-    return true;
-}
-
-wxVariantData* wxVariantDataULongLong::VariantDataFactory(const wxAny& any)
-{
-    return new wxVariantDataULongLong(wxANY_AS(any, wxULongLong_t));
-}
-
-REGISTER_WXANY_CONVERSION(wxULongLong_t, wxVariantDataULongLong)
-
-#else // if !defined(wxLongLong_t)
-
-bool wxVariantDataULongLong::GetAsAny(wxAny* any) const
-{
-    *any = m_value;
-    return true;
-}
-
-wxVariantData* wxVariantDataULongLong::VariantDataFactory(const wxAny& any)
-{
-    return new wxVariantDataULongLong(wxANY_AS(any, wxULongLong));
-}
-
-REGISTER_WXANY_CONVERSION(wxULongLong, wxVariantDataULongLong)
-
-#endif // defined(wxLongLong_t)/!defined(wxLongLong_t)
-#endif // wxUSE_ANY
-
-
-bool wxVariantDataULongLong::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxS("ulonglong")),
-                  "wxVariantDataULongLong::Eq: argument mismatch" );
-
-    wxVariantDataULongLong& otherData = (wxVariantDataULongLong&) data;
-
-    return (otherData.m_value == m_value);
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataULongLong::Write(wxSTD ostream& str) const
-{
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDataULongLong::Write(wxString& str) const
-{
-#ifdef wxLongLong_t
-    str.Printf(wxS("%llu"), m_value.GetValue());
-    return true;
-#else
-    return false;
-#endif
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataULongLong::Read(wxSTD istream& WXUNUSED(str))
-{
-    wxFAIL_MSG(wxS("Unimplemented"));
-    return false;
-}
-#endif
-
-#if wxUSE_STREAMS
-bool wxVariantDataULongLong::Write(wxOutputStream& str) const
-{
-    wxTextOutputStream s(str);
-    s.Write32(m_value.GetLo());
-    s.Write32(m_value.GetHi());
-    return true;
-}
-
-bool wxVariantDataULongLong::Read(wxInputStream& str)
-{
-   wxTextInputStream s(str);
-   unsigned long lo = s.Read32();
-   long hi = s.Read32();
-   m_value = wxULongLong(hi, lo);
-   return true;
-}
-#endif // wxUSE_STREAMS
-
-bool wxVariantDataULongLong::Read(wxString& str)
-{
-#ifdef wxLongLong_t
-    wxULongLong_t value_t;
-    if ( !str.ToULongLong(&value_t) )
-        return false;
-    m_value = value_t;
-    return true;
-#else
-    return false;
-#endif
-}
-
-// wxVariant
-
-wxVariant::wxVariant(wxULongLong val, const wxString& name)
-{
-    m_refData = new wxVariantDataULongLong(val);
-    m_name = name;
-}
-
-bool wxVariant::operator==(wxULongLong value) const
-{
-    wxULongLong thisValue;
-    if ( !Convert(&thisValue) )
-        return false;
-    else
-        return (value == thisValue);
-}
-
-bool wxVariant::operator!=(wxULongLong value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator=(wxULongLong value)
-{
-    if ( GetType() == wxS("ulonglong") &&
-         m_refData->GetRefCount() == 1 )
-    {
-        ((wxVariantDataULongLong*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataULongLong(value);
-    }
-}
-
-wxULongLong wxVariant::GetULongLong() const
-{
-    wxULongLong value;
-    if ( Convert(&value) )
-    {
-        return value;
-    }
-    else
-    {
-        wxFAIL_MSG(wxT("Could not convert to a long long"));
-        return 0;
-    }
-}
-
-#endif // wxUSE_LONGLONG
-
-// ----------------------------------------------------------------------------
-// wxVariantDataList
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
-{
-public:
-    wxVariantDataList() {}
-    wxVariantDataList(const wxVariantList& list);
-    virtual ~wxVariantDataList();
-
-    wxVariantList& GetValue() { return m_value; }
-    void SetValue(const wxVariantList& value) ;
-
-    virtual bool Eq(wxVariantData& data) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Write(wxSTD ostream& str) const;
-#endif
-    virtual bool Write(wxString& str) const;
-#if wxUSE_STD_IOSTREAM
-    virtual bool Read(wxSTD istream& str);
-#endif
-    virtual bool Read(wxString& str);
-    virtual wxString GetType() const { return wxT("list"); }
-
-    void Clear();
-
-    wxVariantData* Clone() const { return new wxVariantDataList(m_value); }
-
-    DECLARE_WXANY_CONVERSION()
-protected:
-    wxVariantList  m_value;
-};
-
-#if wxUSE_ANY
-
-//
-// Convert to/from list of wxAnys
-//
-
-bool wxVariantDataList::GetAsAny(wxAny* any) const
-{
-    wxAnyList dst;
-    wxVariantList::compatibility_iterator node = m_value.GetFirst();
-    while (node)
-    {
-        wxVariant* pVar = node->GetData();
-        dst.push_back(new wxAny(((const wxVariant&)*pVar)));
-        node = node->GetNext();
-    }
-
-    *any = dst;
-    return true;
-}
-
-wxVariantData* wxVariantDataList::VariantDataFactory(const wxAny& any)
-{
-    wxAnyList src = wxANY_AS(any, wxAnyList);
-    wxVariantList dst;
-    wxAnyList::compatibility_iterator node = src.GetFirst();
-    while (node)
-    {
-        wxAny* pAny = node->GetData();
-        dst.push_back(new wxVariant(*pAny));
-        node = node->GetNext();
-    }
-
-    return new wxVariantDataList(dst);
-}
-
-REGISTER_WXANY_CONVERSION(wxAnyList, wxVariantDataList)
-
-#endif // wxUSE_ANY
-
-wxVariantDataList::wxVariantDataList(const wxVariantList& list)
-{
-    SetValue(list);
-}
-
-wxVariantDataList::~wxVariantDataList()
-{
-    Clear();
-}
-
-void wxVariantDataList::SetValue(const wxVariantList& value)
-{
-    Clear();
-    wxVariantList::compatibility_iterator node = value.GetFirst();
-    while (node)
-    {
-        wxVariant* var = node->GetData();
-        m_value.Append(new wxVariant(*var));
-        node = node->GetNext();
-    }
-}
-
-void wxVariantDataList::Clear()
-{
-    wxVariantList::compatibility_iterator node = m_value.GetFirst();
-    while (node)
-    {
-        wxVariant* var = node->GetData();
-        delete var;
-        node = node->GetNext();
-    }
-    m_value.Clear();
-}
-
-bool wxVariantDataList::Eq(wxVariantData& data) const
-{
-    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
-
-    wxVariantDataList& listData = (wxVariantDataList&) data;
-    wxVariantList::compatibility_iterator node1 = m_value.GetFirst();
-    wxVariantList::compatibility_iterator node2 = listData.GetValue().GetFirst();
-    while (node1 && node2)
-    {
-        wxVariant* var1 = node1->GetData();
-        wxVariant* var2 = node2->GetData();
-        if ((*var1) != (*var2))
-            return false;
-        node1 = node1->GetNext();
-        node2 = node2->GetNext();
-    }
-    if (node1 || node2) return false;
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Write(wxSTD ostream& str) const
-{
-    wxString s;
-    Write(s);
-    str << (const char*) s.mb_str();
-    return true;
-}
-#endif
-
-bool wxVariantDataList::Write(wxString& str) const
-{
-    str = wxEmptyString;
-    wxVariantList::compatibility_iterator node = m_value.GetFirst();
-    while (node)
-    {
-        wxVariant* var = node->GetData();
-        if (node != m_value.GetFirst())
-          str += wxT(" ");
-        wxString str1;
-        str += var->MakeString();
-        node = node->GetNext();
-    }
-
-    return true;
-}
-
-#if wxUSE_STD_IOSTREAM
-bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
-{
-    wxFAIL_MSG(wxT("Unimplemented"));
-    // TODO
-    return false;
-}
-#endif
-
-bool wxVariantDataList::Read(wxString& WXUNUSED(str))
-{
-    wxFAIL_MSG(wxT("Unimplemented"));
-    // TODO
-    return false;
-}
-
-// wxVariant
-
-wxVariant::wxVariant(const wxVariantList& val, const wxString& name) // List of variants
-{
-    m_refData = new wxVariantDataList(val);
-    m_name = name;
-}
-
-bool wxVariant::operator== (const wxVariantList& value) const
-{
-    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
-
-    wxVariantDataList other(value);
-    return (GetData()->Eq(other));
-}
-
-bool wxVariant::operator!= (const wxVariantList& value) const
-{
-    return (!((*this) == value));
-}
-
-void wxVariant::operator= (const wxVariantList& value)
-{
-    if (GetType() == wxT("list") &&
-        m_refData->GetRefCount() == 1)
-    {
-        ((wxVariantDataList*)GetData())->SetValue(value);
-    }
-    else
-    {
-        UnRef();
-        m_refData = new wxVariantDataList(value);
-    }
-}
-
-wxVariantList& wxVariant::GetList() const
-{
-    wxASSERT( (GetType() == wxT("list")) );
-
-    return (wxVariantList&) ((wxVariantDataList*) m_refData)->GetValue();
-}
-
-// Make empty list
-void wxVariant::NullList()
-{
-    SetData(new wxVariantDataList());
-}
-
-// Append to list
-void wxVariant::Append(const wxVariant& value)
-{
-    wxVariantList& list = GetList();
-
-    list.Append(new wxVariant(value));
-}
-
-// Insert at front of list
-void wxVariant::Insert(const wxVariant& value)
-{
-    wxVariantList& list = GetList();
-
-    list.Insert(new wxVariant(value));
-}
-
-// Returns true if the variant is a member of the list
-bool wxVariant::Member(const wxVariant& value) const
-{
-    wxVariantList& list = GetList();
-
-    wxVariantList::compatibility_iterator node = list.GetFirst();
-    while (node)
-    {
-        wxVariant* other = node->GetData();
-        if (value == *other)
-            return true;
-        node = node->GetNext();
-    }
-    return false;
-}
-
-// Deletes the nth element of the list
-bool wxVariant::Delete(size_t item)
-{
-    wxVariantList& list = GetList();
-
-    wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );
-    wxVariantList::compatibility_iterator node = list.Item(item);
-    wxVariant* variant = node->GetData();
-    delete variant;
-    list.Erase(node);
-    return true;
-}
-
-// Clear list
-void wxVariant::ClearList()
-{
-    if (!IsNull() && (GetType() == wxT("list")))
-    {
-        ((wxVariantDataList*) m_refData)->Clear();
-    }
-    else
-    {
-        if (!GetType().IsSameAs(wxT("list")))
-            UnRef();
-
-        m_refData = new wxVariantDataList;
-    }
-}
-
-// Treat a list variant as an array
-wxVariant wxVariant::operator[] (size_t idx) const
-{
-    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") );
-
-    if (GetType() == wxT("list"))
-    {
-        wxVariantDataList* data = (wxVariantDataList*) m_refData;
-        wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
-        return *(data->GetValue().Item(idx)->GetData());
-    }
-    return wxNullVariant;
-}
-
-wxVariant& wxVariant::operator[] (size_t idx)
-{
-    // We can't return a reference to a variant for a string list, since the string
-    // is actually stored as a char*, not a variant.
-
-    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
-
-    wxVariantDataList* data = (wxVariantDataList*) m_refData;
-    wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
-
-    return * (data->GetValue().Item(idx)->GetData());
-}
-
-// Return the number of elements in a list
-size_t wxVariant::GetCount() const
-{
-    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") );
-
-    if (GetType() == wxT("list"))
-    {
-        wxVariantDataList* data = (wxVariantDataList*) m_refData;
-        return data->GetValue().GetCount();
-    }
-    return 0;
-}
-
-// ----------------------------------------------------------------------------
-// Type conversion
-// ----------------------------------------------------------------------------
-
-bool wxVariant::Convert(long* value) const
-{
-    wxString type(GetType());
-    if (type == wxS("double"))
-        *value = (long) (((wxVariantDoubleData*)GetData())->GetValue());
-    else if (type == wxS("long"))
-        *value = ((wxVariantDataLong*)GetData())->GetValue();
-    else if (type == wxS("bool"))
-        *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
-    else if (type == wxS("string"))
-        *value = wxAtol(((wxVariantDataString*)GetData())->GetValue());
-#if wxUSE_LONGLONG
-    else if (type == wxS("longlong"))
-    {
-        wxLongLong v = ((wxVariantDataLongLong*)GetData())->GetValue();
-        // Don't convert if return value would be vague
-        if ( v < LONG_MIN || v > LONG_MAX )
-            return false;
-        *value = v.ToLong();
-    }
-    else if (type == wxS("ulonglong"))
-    {
-        wxULongLong v = ((wxVariantDataULongLong*)GetData())->GetValue();
-        // Don't convert if return value would be vague
-        if ( v.GetHi() )
-            return false;
-        *value = (long) v.ToULong();
-    }
-#endif
-    else
-        return false;
-
-    return true;
-}
-
-bool wxVariant::Convert(bool* value) const
-{
-    wxString type(GetType());
-    if (type == wxT("double"))
-        *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0);
-    else if (type == wxT("long"))
-        *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
-    else if (type == wxT("bool"))
-        *value = ((wxVariantDataBool*)GetData())->GetValue();
-    else if (type == wxT("string"))
-    {
-        wxString val(((wxVariantDataString*)GetData())->GetValue());
-        val.MakeLower();
-        if (val == wxT("true") || val == wxT("yes") || val == wxT('1') )
-            *value = true;
-        else if (val == wxT("false") || val == wxT("no") || val == wxT('0') )
-            *value = false;
-        else
-            return false;
-    }
-    else
-        return false;
-
-    return true;
-}
-
-bool wxVariant::Convert(double* value) const
-{
-    wxString type(GetType());
-    if (type == wxT("double"))
-        *value = ((wxVariantDoubleData*)GetData())->GetValue();
-    else if (type == wxT("long"))
-        *value = (double) (((wxVariantDataLong*)GetData())->GetValue());
-    else if (type == wxT("bool"))
-        *value = (double) (((wxVariantDataBool*)GetData())->GetValue());
-    else if (type == wxT("string"))
-        *value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue());
-#if wxUSE_LONGLONG
-    else if (type == wxS("longlong"))
-    {
-        *value = ((wxVariantDataLongLong*)GetData())->GetValue().ToDouble();
-    }
-    else if (type == wxS("ulonglong"))
-    {
-        *value = ((wxVariantDataULongLong*)GetData())->GetValue().ToDouble();
-    }
-#endif
-    else
-        return false;
-
-    return true;
-}
-
-bool wxVariant::Convert(wxUniChar* value) const
-{
-    wxString type(GetType());
-    if (type == wxT("char"))
-        *value = ((wxVariantDataChar*)GetData())->GetValue();
-    else if (type == wxT("long"))
-        *value = (char) (((wxVariantDataLong*)GetData())->GetValue());
-    else if (type == wxT("bool"))
-        *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
-    else if (type == wxS("string"))
-    {
-        // Also accept strings of length 1
-        const wxString& str = (((wxVariantDataString*)GetData())->GetValue());
-        if ( str.length() == 1 )
-            *value = str[0];
-        else
-            return false;
-    }
-    else
-        return false;
-
-    return true;
-}
-
-bool wxVariant::Convert(char* value) const
-{
-    wxUniChar ch;
-    if ( !Convert(&ch) )
-        return false;
-    *value = ch;
-    return true;
-}
-
-bool wxVariant::Convert(wchar_t* value) const
-{
-    wxUniChar ch;
-    if ( !Convert(&ch) )
-        return false;
-    *value = ch;
-    return true;
-}
-
-bool wxVariant::Convert(wxString* value) const
-{
-    *value = MakeString();
-    return true;
-}
-
-#if wxUSE_LONGLONG
-bool wxVariant::Convert(wxLongLong* value) const
-{
-    wxString type(GetType());
-    if (type == wxS("longlong"))
-        *value = ((wxVariantDataLongLong*)GetData())->GetValue();
-    else if (type == wxS("long"))
-        *value = ((wxVariantDataLong*)GetData())->GetValue();
-    else if (type == wxS("string"))
-    {
-        wxString s = ((wxVariantDataString*)GetData())->GetValue();
-#ifdef wxLongLong_t
-        wxLongLong_t value_t;
-        if ( !s.ToLongLong(&value_t) )
-            return false;
-        *value = value_t;
-#else
-        long l_value;
-        if ( !s.ToLong(&l_value) )
-            return false;
-        *value = l_value;
-#endif
-    }
-    else if (type == wxS("bool"))
-        *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
-    else if (type == wxS("double"))
-    {
-        value->Assign(((wxVariantDoubleData*)GetData())->GetValue());
-    }
-    else if (type == wxS("ulonglong"))
-        *value = ((wxVariantDataULongLong*)GetData())->GetValue();
-    else
-        return false;
-
-    return true;
-}
-
-bool wxVariant::Convert(wxULongLong* value) const
-{
-    wxString type(GetType());
-    if (type == wxS("ulonglong"))
-        *value = ((wxVariantDataULongLong*)GetData())->GetValue();
-    else if (type == wxS("long"))
-        *value = ((wxVariantDataLong*)GetData())->GetValue();
-    else if (type == wxS("string"))
-    {
-        wxString s = ((wxVariantDataString*)GetData())->GetValue();
-#ifdef wxLongLong_t
-        wxULongLong_t value_t;
-        if ( !s.ToULongLong(&value_t) )
-            return false;
-        *value = value_t;
-#else
-        unsigned long l_value;
-        if ( !s.ToULong(&l_value) )
-            return false;
-        *value = l_value;
-#endif
-    }
-    else if (type == wxS("bool"))
-        *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
-    else if (type == wxS("double"))
-    {
-        double value_d = ((wxVariantDoubleData*)GetData())->GetValue();
-
-        if ( value_d < 0.0 )
-            return false;
-
-#ifdef wxLongLong_t
-        *value = (wxULongLong_t) value_d;
-#else
-        wxLongLong temp;
-        temp.Assign(value_d);
-        *value = temp;
-#endif
-    }
-    else if (type == wxS("longlong"))
-        *value = ((wxVariantDataLongLong*)GetData())->GetValue();
-    else
-        return false;
-
-    return true;
-}
-#endif // wxUSE_LONGLONG
-
-#if wxUSE_DATETIME
-bool wxVariant::Convert(wxDateTime* value) const
-{
-    wxString type(GetType());
-    if (type == wxT("datetime"))
-    {
-        *value = ((wxVariantDataDateTime*)GetData())->GetValue();
-        return true;
-    }
-
-    // Fallback to string conversion
-    wxString val;
-    if ( !Convert(&val) )
-        return false;
-
-    // Try to parse this as either date and time, only date or only time
-    // checking that the entire string was parsed
-    wxString::const_iterator end;
-    if ( value->ParseDateTime(val, &end) && end == val.end() )
-        return true;
-
-    if ( value->ParseDate(val, &end) && end == val.end() )
-        return true;
-
-    if ( value->ParseTime(val, &end) && end == val.end() )
-        return true;
-
-    return false;
-}
-#endif // wxUSE_DATETIME
-
-#endif // wxUSE_VARIANT
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/variant.cpp
+// Purpose:     wxVariant class, container for any type
+// Author:      Julian Smart
+// Modified by:
+// Created:     10/09/98
+// RCS-ID:      $Id: variant.cpp 58054 2009-01-12 17:27:53Z JMS $
+// Copyright:   (c)
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/variant.h"
+
+#if wxUSE_VARIANT
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/math.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
+#endif
+
+#if wxUSE_STD_IOSTREAM
+    #if wxUSE_IOSTREAMH
+        #include <fstream.h>
+    #else
+        #include <fstream>
+    #endif
+#endif
+
+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+namespace std {}
+using namespace std ;
+#endif
+
+#if wxUSE_STREAMS
+    #include "wx/txtstrm.h"
+#endif
+
+#include "wx/string.h"
+#include "wx/tokenzr.h"
+
+IMPLEMENT_ABSTRACT_CLASS(wxVariantData, wxObject)
+
+wxVariant WXDLLIMPEXP_BASE wxNullVariant;
+
+
+/*
+ * wxVariant
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariant, wxObject)
+
+wxVariant::wxVariant()
+{
+    m_data = (wxVariantData*) NULL;
+}
+
+bool wxVariant::IsNull() const
+{
+     return (m_data == (wxVariantData*) NULL);
+}
+
+void wxVariant::MakeNull()
+{
+    UnRef();
+}
+
+void wxVariant::Clear()
+{
+    m_name = wxEmptyString;
+}
+
+wxVariant::wxVariant(const wxVariant& variant)
+    : wxObject()
+{
+    m_data = (wxVariantData*) NULL;
+
+    if (!variant.IsNull())
+        Ref(variant);
+
+    m_name = variant.m_name;
+}
+
+wxVariant::wxVariant(wxVariantData* data, const wxString& name) // User-defined data
+{
+    m_data = data;
+    m_name = name;
+}
+
+wxVariant::~wxVariant()
+{
+    UnRef();
+}
+
+// Assignment
+void wxVariant::operator= (const wxVariant& variant)
+{
+    Ref(variant);
+    m_name = variant.m_name;
+}
+
+// myVariant = new wxStringVariantData("hello")
+void wxVariant::operator= (wxVariantData* variantData)
+{
+    UnRef();
+    m_data = variantData;
+}
+
+bool wxVariant::operator== (const wxVariant& variant) const
+{
+    if (IsNull() || variant.IsNull())
+        return (IsNull() == variant.IsNull());
+
+    return (GetData()->Eq(* variant.GetData()));
+}
+
+bool wxVariant::operator!= (const wxVariant& variant) const
+{
+    return (!(*this == variant));
+}
+
+
+wxString wxVariant::MakeString() const
+{
+    if (!IsNull())
+    {
+        wxString str;
+        if (GetData()->Write(str))
+            return str;
+    }
+    return wxEmptyString;
+}
+
+void wxVariant::SetData(wxVariantData* data)
+{
+    UnRef();
+    m_data = data;
+}
+
+void wxVariant::Ref(const wxVariant& clone)
+{
+    // nothing to be done
+    if (m_data == clone.m_data)
+        return;
+
+    // delete reference to old data
+    UnRef();
+
+    // reference new data
+    if ( clone.m_data )
+    {
+        m_data = clone.m_data;
+        m_data->m_count++;
+    }
+}
+
+
+void wxVariant::UnRef()
+{
+    if ( m_data )
+    {
+        wxASSERT_MSG( m_data->m_count > 0, _T("invalid ref data count") );
+
+        m_data->DecRef();
+        m_data = NULL;
+    }
+}
+
+
+// Returns a string representing the type of the variant,
+// e.g. "string", "bool", "list", "double", "long"
+wxString wxVariant::GetType() const
+{
+    if (IsNull())
+        return wxString(wxT("null"));
+    else
+        return GetData()->GetType();
+}
+
+
+bool wxVariant::IsType(const wxString& type) const
+{
+    return (GetType() == type);
+}
+
+bool wxVariant::IsValueKindOf(const wxClassInfo* type) const
+{
+    wxClassInfo* info=GetData()->GetValueClassInfo();
+    return info ? info->IsKindOf(type) : false ;
+}
+
+
+// -----------------------------------------------------------------
+// wxVariantDataLong
+// -----------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxVariantDataLong: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDataLong)
+public:
+    wxVariantDataLong() { m_value = 0; }
+    wxVariantDataLong(long value) { m_value = value; }
+
+    inline long GetValue() const { return m_value; }
+    inline void SetValue(long value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+
+    virtual bool Read(wxString& str);
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+#if wxUSE_STREAMS
+    virtual bool Read(wxInputStream& str);
+    virtual bool Write(wxOutputStream &str) const;
+#endif // wxUSE_STREAMS
+
+    virtual wxString GetType() const { return wxT("long"); }
+
+protected:
+    long m_value;
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataLong, wxVariantData)
+
+bool wxVariantDataLong::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("long")), wxT("wxVariantDataLong::Eq: argument mismatch") );
+
+    wxVariantDataLong& otherData = (wxVariantDataLong&) data;
+
+    return (otherData.m_value == m_value);
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataLong::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDataLong::Write(wxString& str) const
+{
+    str.Printf(wxT("%ld"), m_value);
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataLong::Read(wxSTD istream& str)
+{
+    str >> m_value;
+    return true;
+}
+#endif
+
+#if wxUSE_STREAMS
+bool wxVariantDataLong::Write(wxOutputStream& str) const
+{
+    wxTextOutputStream s(str);
+
+    s.Write32((size_t)m_value);
+    return true;
+}
+
+bool wxVariantDataLong::Read(wxInputStream& str)
+{
+   wxTextInputStream s(str);
+   m_value = s.Read32();
+   return true;
+}
+#endif // wxUSE_STREAMS
+
+bool wxVariantDataLong::Read(wxString& str)
+{
+    m_value = wxAtol((const wxChar*) str);
+    return true;
+}
+
+// wxVariant
+
+wxVariant::wxVariant(long val, const wxString& name)
+{
+    m_data = new wxVariantDataLong(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(int val, const wxString& name)
+{
+    m_data = new wxVariantDataLong((long)val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(short val, const wxString& name)
+{
+    m_data = new wxVariantDataLong((long)val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (long value) const
+{
+    long thisValue;
+    if (!Convert(&thisValue))
+        return false;
+    else
+        return (value == thisValue);
+}
+
+bool wxVariant::operator!= (long value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (long value)
+{
+    if (GetType() == wxT("long") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataLong*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataLong(value);
+    }
+}
+
+long wxVariant::GetLong() const
+{
+    long value;
+    if (Convert(& value))
+        return value;
+    else
+    {
+        wxFAIL_MSG(wxT("Could not convert to a long"));
+        return 0;
+    }
+}
+
+// -----------------------------------------------------------------
+// wxVariantDoubleData
+// -----------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxVariantDoubleData: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDoubleData)
+public:
+    wxVariantDoubleData() { m_value = 0.0; }
+    wxVariantDoubleData(double value) { m_value = value; }
+
+    inline double GetValue() const { return m_value; }
+    inline void SetValue(double value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+    virtual bool Read(wxString& str);
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+#if wxUSE_STREAMS
+    virtual bool Read(wxInputStream& str);
+    virtual bool Write(wxOutputStream &str) const;
+#endif // wxUSE_STREAMS
+    virtual wxString GetType() const { return wxT("double"); }
+
+protected:
+    double m_value;
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDoubleData, wxVariantData)
+
+bool wxVariantDoubleData::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("double")), wxT("wxVariantDoubleData::Eq: argument mismatch") );
+
+    wxVariantDoubleData& otherData = (wxVariantDoubleData&) data;
+
+    return wxIsSameDouble(otherData.m_value, m_value);
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDoubleData::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDoubleData::Write(wxString& str) const
+{
+    str.Printf(wxT("%.14g"), m_value);
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDoubleData::Read(wxSTD istream& str)
+{
+    str >> m_value;
+    return true;
+}
+#endif
+
+#if wxUSE_STREAMS
+bool wxVariantDoubleData::Write(wxOutputStream& str) const
+{
+    wxTextOutputStream s(str);
+    s.WriteDouble((double)m_value);
+    return true;
+}
+
+bool wxVariantDoubleData::Read(wxInputStream& str)
+{
+    wxTextInputStream s(str);
+    m_value = (float)s.ReadDouble();
+    return true;
+}
+#endif // wxUSE_STREAMS
+
+bool wxVariantDoubleData::Read(wxString& str)
+{
+    m_value = wxAtof((const wxChar*) str);
+    return true;
+}
+
+//  wxVariant double code
+
+wxVariant::wxVariant(double val, const wxString& name)
+{
+    m_data = new wxVariantDoubleData(val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (double value) const
+{
+    double thisValue;
+    if (!Convert(&thisValue))
+        return false;
+
+    return wxIsSameDouble(value, thisValue);
+}
+
+bool wxVariant::operator!= (double value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (double value)
+{
+    if (GetType() == wxT("double") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDoubleData*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDoubleData(value);
+    }
+}
+
+double wxVariant::GetDouble() const
+{
+    double value;
+    if (Convert(& value))
+        return value;
+    else
+    {
+        wxFAIL_MSG(wxT("Could not convert to a double number"));
+        return 0.0;
+    }
+}
+
+// -----------------------------------------------------------------
+// wxVariantBoolData
+// -----------------------------------------------------------------
+
+#ifdef HAVE_BOOL
+
+class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDataBool)
+public:
+    wxVariantDataBool() { m_value = 0; }
+    wxVariantDataBool(bool value) { m_value = value; }
+
+    inline bool GetValue() const { return m_value; }
+    inline void SetValue(bool value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+    virtual bool Read(wxString& str);
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+#if wxUSE_STREAMS
+    virtual bool Read(wxInputStream& str);
+    virtual bool Write(wxOutputStream& str) const;
+#endif // wxUSE_STREAMS
+    virtual wxString GetType() const { return wxT("bool"); }
+
+protected:
+    bool m_value;
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataBool, wxVariantData)
+
+bool wxVariantDataBool::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("bool")), wxT("wxVariantDataBool::Eq: argument mismatch") );
+
+    wxVariantDataBool& otherData = (wxVariantDataBool&) data;
+
+    return (otherData.m_value == m_value);
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataBool::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDataBool::Write(wxString& str) const
+{
+    str.Printf(wxT("%d"), (int) m_value);
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataBool::Read(wxSTD istream& WXUNUSED(str))
+{
+    wxFAIL_MSG(wxT("Unimplemented"));
+//    str >> (long) m_value;
+    return false;
+}
+#endif
+
+#if wxUSE_STREAMS
+bool wxVariantDataBool::Write(wxOutputStream& str) const
+{
+    wxTextOutputStream s(str);
+
+    s.Write8(m_value);
+    return true;
+}
+
+bool wxVariantDataBool::Read(wxInputStream& str)
+{
+    wxTextInputStream s(str);
+
+    m_value = s.Read8() != 0;
+    return true;
+}
+#endif // wxUSE_STREAMS
+
+bool wxVariantDataBool::Read(wxString& str)
+{
+    m_value = (wxAtol((const wxChar*) str) != 0);
+    return true;
+}
+
+// wxVariant ****
+
+wxVariant::wxVariant(bool val, const wxString& name)
+{
+    m_data = new wxVariantDataBool(val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (bool value) const
+{
+    bool thisValue;
+    if (!Convert(&thisValue))
+        return false;
+    else
+        return (value == thisValue);
+}
+
+bool wxVariant::operator!= (bool value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (bool value)
+{
+    if (GetType() == wxT("bool") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataBool*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataBool(value);
+    }
+}
+
+bool wxVariant::GetBool() const
+{
+    bool value;
+    if (Convert(& value))
+        return value;
+    else
+    {
+        wxFAIL_MSG(wxT("Could not convert to a bool"));
+        return 0;
+    }
+}
+
+#endif // HAVE_BOOL
+
+// -----------------------------------------------------------------
+// wxVariantDataChar
+// -----------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxVariantDataChar: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDataChar)
+public:
+    wxVariantDataChar() { m_value = 0; }
+    wxVariantDataChar(wxChar value) { m_value = value; }
+
+    inline wxChar GetValue() const { return m_value; }
+    inline void SetValue(wxChar value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Read(wxString& str);
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STREAMS
+    virtual bool Read(wxInputStream& str);
+    virtual bool Write(wxOutputStream& str) const;
+#endif // wxUSE_STREAMS
+    virtual wxString GetType() const { return wxT("char"); }
+
+protected:
+    wxChar m_value;
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataChar, wxVariantData)
+
+bool wxVariantDataChar::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("char")), wxT("wxVariantDataChar::Eq: argument mismatch") );
+
+    wxVariantDataChar& otherData = (wxVariantDataChar&) data;
+
+    return (otherData.m_value == m_value);
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataChar::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDataChar::Write(wxString& str) const
+{
+    str.Printf(wxT("%c"), m_value);
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
+{
+    wxFAIL_MSG(wxT("Unimplemented"));
+
+    return false;
+}
+#endif
+
+#if wxUSE_STREAMS
+bool wxVariantDataChar::Write(wxOutputStream& str) const
+{
+    wxTextOutputStream s(str);
+
+    s << m_value;
+
+    return true;
+}
+
+bool wxVariantDataChar::Read(wxInputStream& str)
+{
+    wxTextInputStream s(str);
+
+    s >> m_value;
+
+    return true;
+}
+#endif // wxUSE_STREAMS
+
+bool wxVariantDataChar::Read(wxString& str)
+{
+    m_value = str[size_t(0)];
+    return true;
+}
+
+wxVariant::wxVariant(wxChar val, const wxString& name)
+{
+    m_data = new wxVariantDataChar(val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (wxChar value) const
+{
+    wxChar thisValue;
+    if (!Convert(&thisValue))
+        return false;
+    else
+        return (value == thisValue);
+}
+
+bool wxVariant::operator!= (wxChar value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (wxChar value)
+{
+    if (GetType() == wxT("char") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataChar*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataChar(value);
+    }
+}
+
+wxChar wxVariant::GetChar() const
+{
+    wxChar value;
+    if (Convert(& value))
+        return value;
+    else
+    {
+        wxFAIL_MSG(wxT("Could not convert to a char"));
+        return 0;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxVariantDataString
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxVariantDataString: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDataString)
+public:
+    wxVariantDataString() { }
+    wxVariantDataString(const wxString& value) { m_value = value; }
+
+    inline wxString GetValue() const { return m_value; }
+    inline void SetValue(const wxString& value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Read(wxString& str);
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; }
+#endif
+#if wxUSE_STREAMS
+    virtual bool Read(wxInputStream& str);
+    virtual bool Write(wxOutputStream& str) const;
+#endif // wxUSE_STREAMS
+    virtual wxString GetType() const { return wxT("string"); }
+
+protected:
+    wxString m_value;
+};
+
+bool wxVariantDataString::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("string")), wxT("wxVariantDataString::Eq: argument mismatch") );
+
+    wxVariantDataString& otherData = (wxVariantDataString&) data;
+
+    return (otherData.m_value == m_value);
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataString::Write(wxSTD ostream& str) const
+{
+    str << (const char*) m_value.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDataString::Write(wxString& str) const
+{
+    str = m_value;
+    return true;
+}
+
+#if wxUSE_STREAMS
+bool wxVariantDataString::Write(wxOutputStream& str) const
+{
+  // why doesn't wxOutputStream::operator<< take "const wxString&"
+    wxTextOutputStream s(str);
+    s.WriteString(m_value);
+    return true;
+}
+
+bool wxVariantDataString::Read(wxInputStream& str)
+{
+    wxTextInputStream s(str);
+
+    m_value = s.ReadLine();
+    return true;
+}
+#endif // wxUSE_STREAMS
+
+bool wxVariantDataString::Read(wxString& str)
+{
+    m_value = str;
+    return true;
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
+
+// wxVariant ****
+
+wxVariant::wxVariant(const wxString& val, const wxString& name)
+{
+    m_data = new wxVariantDataString(val);
+    m_name = name;
+}
+
+wxVariant::wxVariant(const wxChar* val, const wxString& name)
+{
+    m_data = new wxVariantDataString(wxString(val));
+    m_name = name;
+}
+
+bool wxVariant::operator== (const wxString& value) const
+{
+    wxString thisValue;
+    if (!Convert(&thisValue))
+        return false;
+
+    return value == thisValue;
+}
+
+bool wxVariant::operator!= (const wxString& value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (const wxString& value)
+{
+    if (GetType() == wxT("string") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataString*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataString(value);
+    }
+}
+
+void wxVariant::operator= (const wxChar* value)
+{
+    if (GetType() == wxT("string") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataString*)GetData())->SetValue(wxString(value));
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataString(wxString(value));
+    }
+}
+
+wxString wxVariant::GetString() const
+{
+    wxString value;
+    if (!Convert(& value))
+    {
+        wxFAIL_MSG(wxT("Could not convert to a string"));
+    }
+
+    return value;
+}
+
+// ----------------------------------------------------------------------------
+// wxVariantDataWxObjectPtr
+// ----------------------------------------------------------------------------
+
+class wxVariantDataWxObjectPtr: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDataWxObjectPtr)
+public:
+    wxVariantDataWxObjectPtr() { }
+    wxVariantDataWxObjectPtr(wxObject* value) { m_value = value; }
+
+    inline wxObject* GetValue() const { return m_value; }
+    inline void SetValue(wxObject* value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+    virtual bool Read(wxString& str);
+    virtual wxString GetType() const ;
+    virtual wxVariantData* Clone() { return new wxVariantDataWxObjectPtr; }
+
+    virtual wxClassInfo* GetValueClassInfo() ;
+protected:
+    wxObject* m_value;
+
+    DECLARE_NO_COPY_CLASS(wxVariantDataWxObjectPtr)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataWxObjectPtr, wxVariantData)
+
+bool wxVariantDataWxObjectPtr::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG(   wxIsKindOf((&data), wxVariantDataWxObjectPtr), wxT("wxVariantDataWxObjectPtr::Eq: argument mismatch") );
+
+    wxVariantDataWxObjectPtr& otherData = (wxVariantDataWxObjectPtr&) data;
+
+    return (otherData.m_value == m_value);
+}
+
+wxString wxVariantDataWxObjectPtr::GetType() const
+{
+    wxString returnVal(wxT("wxObject"));
+    if (m_value) {
+        returnVal = m_value->GetClassInfo()->GetClassName();
+    }
+    return returnVal;
+}
+
+wxClassInfo* wxVariantDataWxObjectPtr::GetValueClassInfo()
+{
+    wxClassInfo* returnVal=NULL;
+
+    if (m_value) returnVal = m_value->GetClassInfo();
+
+    return returnVal;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataWxObjectPtr::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDataWxObjectPtr::Write(wxString& str) const
+{
+    str.Printf(wxT("%s(%p)"), GetType().c_str(), wx_static_cast(void*, m_value));
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataWxObjectPtr::Read(wxSTD istream& WXUNUSED(str))
+{
+    // Not implemented
+    return false;
+}
+#endif
+
+bool wxVariantDataWxObjectPtr::Read(wxString& WXUNUSED(str))
+{
+    // Not implemented
+    return false;
+}
+
+// wxVariant
+
+wxVariant::wxVariant( wxObject* val, const wxString& name)
+{
+    m_data = new wxVariantDataWxObjectPtr(val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (wxObject* value) const
+{
+    return (value == ((wxVariantDataWxObjectPtr*)GetData())->GetValue());
+}
+
+bool wxVariant::operator!= (wxObject* value) const
+{
+    return (!((*this) == (wxObject*) value));
+}
+
+void wxVariant::operator= (wxObject* value)
+{
+    UnRef();
+    m_data = new wxVariantDataWxObjectPtr(value);
+}
+
+wxObject* wxVariant::GetWxObjectPtr() const
+{
+    wxASSERT(wxIsKindOf(GetData(), wxVariantDataWxObjectPtr));
+    return (wxObject*) ((wxVariantDataWxObjectPtr*) m_data)->GetValue();
+}
+
+// ----------------------------------------------------------------------------
+// wxVariantDataVoidPtr
+// ----------------------------------------------------------------------------
+
+class wxVariantDataVoidPtr: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDataVoidPtr)
+public:
+    wxVariantDataVoidPtr() { }
+    wxVariantDataVoidPtr(void* value) { m_value = value; }
+
+    inline void* GetValue() const { return m_value; }
+    inline void SetValue(void* value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+    virtual bool Read(wxString& str);
+    virtual wxString GetType() const { return wxT("void*"); }
+    virtual wxVariantData* Clone() { return new wxVariantDataVoidPtr; }
+
+protected:
+    void* m_value;
+
+    DECLARE_NO_COPY_CLASS(wxVariantDataVoidPtr)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataVoidPtr, wxVariantData)
+
+bool wxVariantDataVoidPtr::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("void*")), wxT("wxVariantDataVoidPtr::Eq: argument mismatch") );
+
+    wxVariantDataVoidPtr& otherData = (wxVariantDataVoidPtr&) data;
+
+    return (otherData.m_value == m_value);
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataVoidPtr::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDataVoidPtr::Write(wxString& str) const
+{
+    str.Printf(wxT("%p"), m_value);
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataVoidPtr::Read(wxSTD istream& WXUNUSED(str))
+{
+    // Not implemented
+    return false;
+}
+#endif
+
+bool wxVariantDataVoidPtr::Read(wxString& WXUNUSED(str))
+{
+    // Not implemented
+    return false;
+}
+
+// wxVariant
+
+wxVariant::wxVariant( void* val, const wxString& name)
+{
+    m_data = new wxVariantDataVoidPtr(val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (void* value) const
+{
+    return (value == ((wxVariantDataVoidPtr*)GetData())->GetValue());
+}
+
+bool wxVariant::operator!= (void* value) const
+{
+    return (!((*this) == (void*) value));
+}
+
+void wxVariant::operator= (void* value)
+{
+    if (GetType() == wxT("void*") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataVoidPtr*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataVoidPtr(value);
+    }
+}
+
+void* wxVariant::GetVoidPtr() const
+{
+    wxASSERT( (GetType() == wxT("void*")) );
+
+    return (void*) ((wxVariantDataVoidPtr*) m_data)->GetValue();
+}
+
+// ----------------------------------------------------------------------------
+// wxVariantDataDateTime
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DATETIME
+
+class wxVariantDataDateTime: public wxVariantData
+{
+    DECLARE_DYNAMIC_CLASS(wxVariantDataDateTime)
+
+public:
+    wxVariantDataDateTime() { }
+    wxVariantDataDateTime(const wxDateTime& value) { m_value = value; }
+#if wxUSE_ODBC
+    wxVariantDataDateTime(const TIME_STRUCT* valptr)
+        { m_value = wxDateTime(valptr->hour, valptr->minute, valptr->second); }
+    wxVariantDataDateTime(const DATE_STRUCT* valptr)
+        { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1),valptr->year); }
+    wxVariantDataDateTime(const TIMESTAMP_STRUCT* valptr)
+        { m_value = wxDateTime(valptr->day, (wxDateTime::Month) (valptr->month - 1), valptr->year,
+                        valptr->hour, valptr->minute, valptr->second, (wxDateTime::wxDateTime_t)valptr->fraction ); }
+#endif //ODBC
+
+    inline wxDateTime GetValue() const { return m_value; }
+    inline void SetValue(const wxDateTime& value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+    virtual bool Read(wxString& str);
+    virtual wxString GetType() const { return wxT("datetime"); }
+    virtual wxVariantData* Clone() { return new wxVariantDataDateTime; }
+
+protected:
+    wxDateTime m_value;
+};
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataDateTime, wxVariantData)
+
+bool wxVariantDataDateTime::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("datetime")), wxT("wxVariantDataDateTime::Eq: argument mismatch") );
+
+    wxVariantDataDateTime& otherData = (wxVariantDataDateTime&) data;
+
+    return (otherData.m_value == m_value);
+}
+
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDateTime::Write(wxSTD ostream& str) const
+{
+    wxString value;
+    Write( value );
+    str << value.c_str();
+    return true;
+}
+#endif
+
+
+bool wxVariantDataDateTime::Write(wxString& str) const
+{
+    if ( m_value.IsValid() )
+        str = m_value.Format();
+    else
+        str = wxT("Invalid");
+
+    return true;
+}
+
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataDateTime::Read(wxSTD istream& WXUNUSED(str))
+{
+    // Not implemented
+    return false;
+}
+#endif
+
+
+bool wxVariantDataDateTime::Read(wxString& str)
+{
+    if ( str == wxT("Invalid") )
+    {
+        m_value = wxInvalidDateTime;
+        return true;
+    }
+
+    if(! m_value.ParseDateTime(str))
+        return false;
+    return true;
+}
+
+// wxVariant
+
+wxVariant::wxVariant(const wxDateTime& val, const wxString& name) // Date
+{
+    m_data = new wxVariantDataDateTime(val);
+    m_name = name;
+}
+
+#if wxUSE_ODBC
+wxVariant::wxVariant(const TIME_STRUCT* valptr, const wxString& name) // Date
+{
+    m_data = new wxVariantDataDateTime(valptr);
+    m_name = name;
+}
+
+wxVariant::wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name) // Date
+{
+    m_data = new wxVariantDataDateTime(valptr);
+    m_name = name;
+}
+
+wxVariant::wxVariant(const DATE_STRUCT* valptr, const wxString& name) // Date
+{
+    m_data = new wxVariantDataDateTime(valptr);
+    m_name = name;
+}
+#endif // wxUSE_ODBC
+
+bool wxVariant::operator== (const wxDateTime& value) const
+{
+    wxDateTime thisValue;
+    if (!Convert(&thisValue))
+        return false;
+
+    return value.IsEqualTo(thisValue);
+}
+
+bool wxVariant::operator!= (const wxDateTime& value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (const wxDateTime& value)
+{
+    if (GetType() == wxT("datetime") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataDateTime*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataDateTime(value);
+    }
+}
+
+#if wxUSE_ODBC
+void wxVariant::operator= (const DATE_STRUCT* value)
+{
+    UnRef();
+    m_data = new wxVariantDataDateTime(value);
+}
+
+void wxVariant::operator= (const TIME_STRUCT* value)
+{
+    UnRef();
+    m_data = new wxVariantDataDateTime(value);
+}
+
+void wxVariant::operator= (const TIMESTAMP_STRUCT* value)
+{
+    UnRef();
+    m_data = new wxVariantDataDateTime(value);
+}
+
+#endif // wxUSE_ODBC
+
+wxDateTime wxVariant::GetDateTime() const
+{
+    wxDateTime value;
+    if (!Convert(& value))
+    {
+        wxFAIL_MSG(wxT("Could not convert to a datetime"));
+    }
+
+    return value;
+}
+
+#endif // wxUSE_DATETIME
+
+// ----------------------------------------------------------------------------
+// wxVariantDataArrayString
+// ----------------------------------------------------------------------------
+
+class wxVariantDataArrayString: public wxVariantData
+{
+public:
+    wxVariantDataArrayString() { }
+    wxVariantDataArrayString(const wxArrayString& value) { m_value = value; }
+
+    wxArrayString GetValue() const { return m_value; }
+    void SetValue(const wxArrayString& value) { m_value = value; }
+
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+    virtual bool Read(wxString& str);
+    virtual wxString GetType() const { return wxT("arrstring"); }
+    virtual wxVariantData* Clone() { return new wxVariantDataArrayString; }
+
+protected:
+    wxArrayString m_value;
+
+    DECLARE_DYNAMIC_CLASS(wxVariantDataArrayString)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataArrayString, wxVariantData)
+
+bool wxVariantDataArrayString::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( data.GetType() == GetType(), wxT("wxVariantDataArrayString::Eq: argument mismatch") );
+
+    wxVariantDataArrayString& otherData = (wxVariantDataArrayString&) data;
+
+    return otherData.m_value == m_value;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataArrayString::Write(wxSTD ostream& WXUNUSED(str)) const
+{
+    // Not implemented
+    return false;
+}
+#endif
+
+bool wxVariantDataArrayString::Write(wxString& str) const
+{
+    size_t count = m_value.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if ( n )
+            str += _T(';');
+
+        str += m_value[n];
+    }
+
+    return true;
+}
+
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataArrayString::Read(wxSTD istream& WXUNUSED(str))
+{
+    // Not implemented
+    return false;
+}
+#endif
+
+
+bool wxVariantDataArrayString::Read(wxString& str)
+{
+    wxStringTokenizer tk(str, _T(";"));
+    while ( tk.HasMoreTokens() )
+    {
+        m_value.Add(tk.GetNextToken());
+    }
+
+    return true;
+}
+
+// wxVariant
+
+wxVariant::wxVariant(const wxArrayString& val, const wxString& name) // Strings
+{
+    m_data = new wxVariantDataArrayString(val);
+    m_name = name;
+}
+
+bool wxVariant::operator==(const wxArrayString& WXUNUSED(value)) const
+{
+    wxFAIL_MSG( _T("TODO") );
+
+    return false;
+}
+
+bool wxVariant::operator!=(const wxArrayString& value) const
+{
+    return !(*this == value);
+}
+
+void wxVariant::operator=(const wxArrayString& value)
+{
+    if (GetType() == wxT("arrstring") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataArrayString *)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataArrayString(value);
+    }
+}
+
+wxArrayString wxVariant::GetArrayString() const
+{
+    if ( GetType() == wxT("arrstring") )
+        return ((wxVariantDataArrayString *)GetData())->GetValue();
+
+    return wxArrayString();
+}
+
+// ----------------------------------------------------------------------------
+// wxVariantDataList
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxVariantDataList: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDataList)
+public:
+    wxVariantDataList() {}
+    wxVariantDataList(const wxList& list);
+    virtual ~wxVariantDataList();
+
+    wxList& GetValue() { return m_value; }
+    void SetValue(const wxList& value) ;
+
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+    virtual bool Read(wxString& str);
+    virtual wxString GetType() const { return wxT("list"); }
+
+    void Clear();
+
+protected:
+    wxList  m_value;
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataList, wxVariantData)
+
+wxVariantDataList::wxVariantDataList(const wxList& list)
+{
+    SetValue(list);
+}
+
+wxVariantDataList::~wxVariantDataList()
+{
+    Clear();
+}
+
+void wxVariantDataList::SetValue(const wxList& value)
+{
+    Clear();
+    wxList::compatibility_iterator node = value.GetFirst();
+    while (node)
+    {
+        wxVariant* var = (wxVariant*) node->GetData();
+        m_value.Append(new wxVariant(*var));
+        node = node->GetNext();
+    }
+}
+
+void wxVariantDataList::Clear()
+{
+    wxList::compatibility_iterator node = m_value.GetFirst();
+    while (node)
+    {
+        wxVariant* var = (wxVariant*) node->GetData();
+        delete var;
+        node = node->GetNext();
+    }
+    m_value.Clear();
+}
+
+bool wxVariantDataList::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("list")), wxT("wxVariantDataList::Eq: argument mismatch") );
+
+    wxVariantDataList& listData = (wxVariantDataList&) data;
+    wxList::compatibility_iterator node1 = m_value.GetFirst();
+    wxList::compatibility_iterator node2 = listData.GetValue().GetFirst();
+    while (node1 && node2)
+    {
+        wxVariant* var1 = (wxVariant*) node1->GetData();
+        wxVariant* var2 = (wxVariant*) node2->GetData();
+        if ((*var1) != (*var2))
+            return false;
+        node1 = node1->GetNext();
+        node2 = node2->GetNext();
+    }
+    if (node1 || node2) return false;
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataList::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDataList::Write(wxString& str) const
+{
+    str = wxEmptyString;
+    wxList::compatibility_iterator node = m_value.GetFirst();
+    while (node)
+    {
+        wxVariant* var = (wxVariant*) node->GetData();
+        if (node != m_value.GetFirst())
+          str += wxT(" ");
+        wxString str1;
+        str += var->MakeString();
+        node = node->GetNext();
+    }
+
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataList::Read(wxSTD istream& WXUNUSED(str))
+{
+    wxFAIL_MSG(wxT("Unimplemented"));
+    // TODO
+    return false;
+}
+#endif
+
+bool wxVariantDataList::Read(wxString& WXUNUSED(str))
+{
+    wxFAIL_MSG(wxT("Unimplemented"));
+    // TODO
+    return false;
+}
+
+// wxVariant
+
+wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variants
+{
+    m_data = new wxVariantDataList(val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (const wxList& value) const
+{
+    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for == operator") );
+
+    wxVariantDataList other(value);
+    return (GetData()->Eq(other));
+}
+
+bool wxVariant::operator!= (const wxList& value) const
+{
+    return (!((*this) == value));
+}
+
+void wxVariant::operator= (const wxList& value)
+{
+    if (GetType() == wxT("list") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataList*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataList(value);
+    }
+}
+
+wxList& wxVariant::GetList() const
+{
+    wxASSERT( (GetType() == wxT("list")) );
+
+    return (wxList&) ((wxVariantDataList*) m_data)->GetValue();
+}
+
+// Make empty list
+void wxVariant::NullList()
+{
+    SetData(new wxVariantDataList());
+}
+
+// Append to list
+void wxVariant::Append(const wxVariant& value)
+{
+    wxList& list = GetList();
+
+    list.Append(new wxVariant(value));
+}
+
+// Insert at front of list
+void wxVariant::Insert(const wxVariant& value)
+{
+    wxList& list = GetList();
+
+    list.Insert(new wxVariant(value));
+}
+
+// Returns true if the variant is a member of the list
+bool wxVariant::Member(const wxVariant& value) const
+{
+    wxList& list = GetList();
+
+    wxList::compatibility_iterator node = list.GetFirst();
+    while (node)
+    {
+        wxVariant* other = (wxVariant*) node->GetData();
+        if (value == *other)
+            return true;
+        node = node->GetNext();
+    }
+    return false;
+}
+
+// Deletes the nth element of the list
+bool wxVariant::Delete(size_t item)
+{
+    wxList& list = GetList();
+
+    wxASSERT_MSG( (item < list.GetCount()), wxT("Invalid index to Delete") );
+    wxList::compatibility_iterator node = list.Item(item);
+    wxVariant* variant = (wxVariant*) node->GetData();
+    delete variant;
+    list.Erase(node);
+    return true;
+}
+
+// Clear list
+void wxVariant::ClearList()
+{
+    if (!IsNull() && (GetType() == wxT("list")))
+    {
+        ((wxVariantDataList*) m_data)->Clear();
+    }
+    else
+    {
+        if (!GetType().IsSameAs(wxT("list")))
+            UnRef();
+
+        m_data = new wxVariantDataList;
+    }
+}
+
+#if WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
+// wxVariantDataStringList
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxVariantDataStringList: public wxVariantData
+{
+DECLARE_DYNAMIC_CLASS(wxVariantDataStringList)
+public:
+    wxVariantDataStringList() {}
+    wxVariantDataStringList(const wxStringList& list) { m_value = list; }
+
+    wxStringList& GetValue() const { return (wxStringList&) m_value; }
+    void SetValue(const wxStringList& value);
+
+    virtual bool Eq(wxVariantData& data) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Write(wxSTD ostream& str) const;
+#endif
+    virtual bool Write(wxString& str) const;
+#if wxUSE_STD_IOSTREAM
+    virtual bool Read(wxSTD istream& str);
+#endif
+    virtual bool Read(wxString& str);
+    virtual wxString GetType() const { return wxT("stringlist"); };
+
+protected:
+    wxStringList  m_value;
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxVariantDataStringList, wxVariantData)
+
+void wxVariantDataStringList::SetValue(const wxStringList& value)
+{
+    m_value = value;
+}
+
+bool wxVariantDataStringList::Eq(wxVariantData& data) const
+{
+    wxASSERT_MSG( (data.GetType() == wxT("stringlist")), wxT("wxVariantDataStringList::Eq: argument mismatch") );
+
+    wxVariantDataStringList& listData = (wxVariantDataStringList&) data;
+    wxStringList::compatibility_iterator node1 = m_value.GetFirst();
+    wxStringList::compatibility_iterator node2 = listData.GetValue().GetFirst();
+    while (node1 && node2)
+    {
+        wxString str1 ( node1->GetData() );
+        wxString str2 ( node2->GetData() );
+        if (str1 != str2)
+            return false;
+        node1 = node1->GetNext();
+        node2 = node2->GetNext();
+    }
+    if (node1 || node2) return false;
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataStringList::Write(wxSTD ostream& str) const
+{
+    wxString s;
+    Write(s);
+    str << (const char*) s.mb_str();
+    return true;
+}
+#endif
+
+bool wxVariantDataStringList::Write(wxString& str) const
+{
+    str.Empty();
+    wxStringList::compatibility_iterator node = m_value.GetFirst();
+    while (node)
+    {
+        const wxChar* s = node->GetData();
+        if (node != m_value.GetFirst())
+          str += wxT(" ");
+        str += s;
+        node = node->GetNext();
+    }
+
+    return true;
+}
+
+#if wxUSE_STD_IOSTREAM
+bool wxVariantDataStringList::Read(wxSTD istream& WXUNUSED(str))
+{
+    wxFAIL_MSG(wxT("Unimplemented"));
+    // TODO
+    return false;
+}
+#endif
+
+bool wxVariantDataStringList::Read(wxString& WXUNUSED(str))
+{
+    wxFAIL_MSG(wxT("Unimplemented"));
+    // TODO
+    return false;
+}
+
+#endif //2.4 compat
+
+#if WXWIN_COMPATIBILITY_2_4
+
+wxVariant::wxVariant(const wxStringList& val, const wxString& name)
+{
+    m_data = new wxVariantDataStringList(val);
+    m_name = name;
+}
+
+bool wxVariant::operator== (const wxStringList& value) const
+{
+    wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
+
+    wxVariantDataStringList other(value);
+    return (GetData()->Eq(other));
+}
+
+bool wxVariant::operator!= (const wxStringList& value) const
+{
+    wxASSERT_MSG( (GetType() == wxT("stringlist")), wxT("Invalid type for == operator") );
+
+    wxVariantDataStringList other(value);
+    return !(GetData()->Eq(other));
+}
+
+void wxVariant::operator= (const wxStringList& value)
+{
+    if (GetType() == wxT("stringlist") &&
+        m_data->GetRefCount() == 1)
+    {
+        ((wxVariantDataStringList*)GetData())->SetValue(value);
+    }
+    else
+    {
+        UnRef();
+        m_data = new wxVariantDataStringList(value);
+    }
+}
+
+// wxVariant
+
+wxStringList& wxVariant::GetStringList() const
+{
+    wxASSERT( (GetType() == wxT("stringlist")) );
+
+    return (wxStringList&) ((wxVariantDataStringList*) m_data)->GetValue();
+}
+
+#endif
+
+// Treat a list variant as an array
+wxVariant wxVariant::operator[] (size_t idx) const
+{
+#if WXWIN_COMPATIBILITY_2_4
+    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for array operator") );
+#else
+    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for array operator") );
+#endif
+
+    if (GetType() == wxT("list"))
+    {
+        wxVariantDataList* data = (wxVariantDataList*) m_data;
+        wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
+        return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
+    }
+#if WXWIN_COMPATIBILITY_2_4
+    else if (GetType() == wxT("stringlist"))
+    {
+        wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
+        wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
+
+        wxString str( (const wxChar*) (data->GetValue().Item(idx)->GetData()) );
+        wxVariant variant( str );
+        return variant;
+    }
+#endif
+    return wxNullVariant;
+}
+
+wxVariant& wxVariant::operator[] (size_t idx)
+{
+    // We can't return a reference to a variant for a string list, since the string
+    // is actually stored as a char*, not a variant.
+
+    wxASSERT_MSG( (GetType() == wxT("list")), wxT("Invalid type for array operator") );
+
+    wxVariantDataList* data = (wxVariantDataList*) m_data;
+    wxASSERT_MSG( (idx < data->GetValue().GetCount()), wxT("Invalid index for array") );
+
+    return * (wxVariant*) (data->GetValue().Item(idx)->GetData());
+}
+
+// Return the number of elements in a list
+size_t wxVariant::GetCount() const
+{
+#if WXWIN_COMPATIBILITY_2_4
+    wxASSERT_MSG( (GetType() == wxT("list") || GetType() == wxT("stringlist")), wxT("Invalid type for GetCount()") );
+#else
+    wxASSERT_MSG( GetType() == wxT("list"), wxT("Invalid type for GetCount()") );
+#endif
+
+    if (GetType() == wxT("list"))
+    {
+        wxVariantDataList* data = (wxVariantDataList*) m_data;
+        return data->GetValue().GetCount();
+    }
+#if WXWIN_COMPATIBILITY_2_4
+    else if (GetType() == wxT("stringlist"))
+    {
+        wxVariantDataStringList* data = (wxVariantDataStringList*) m_data;
+        return data->GetValue().GetCount();
+    }
+#endif
+    return 0;
+}
+
+// ----------------------------------------------------------------------------
+// Type conversion
+// ----------------------------------------------------------------------------
+
+bool wxVariant::Convert(long* value) const
+{
+    wxString type(GetType());
+    if (type == wxT("double"))
+        *value = (long) (((wxVariantDoubleData*)GetData())->GetValue());
+    else if (type == wxT("long"))
+        *value = ((wxVariantDataLong*)GetData())->GetValue();
+#ifdef HAVE_BOOL
+    else if (type == wxT("bool"))
+        *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
+#endif
+    else if (type == wxT("string"))
+        *value = wxAtol((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
+    else
+        return false;
+
+    return true;
+}
+
+bool wxVariant::Convert(bool* value) const
+{
+    wxString type(GetType());
+    if (type == wxT("double"))
+        *value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0);
+    else if (type == wxT("long"))
+        *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
+#ifdef HAVE_BOOL
+    else if (type == wxT("bool"))
+        *value = ((wxVariantDataBool*)GetData())->GetValue();
+#endif
+    else if (type == wxT("string"))
+    {
+        wxString val(((wxVariantDataString*)GetData())->GetValue());
+        val.MakeLower();
+        if (val == wxT("true") || val == wxT("yes") || val == wxT('1') )
+            *value = true;
+        else if (val == wxT("false") || val == wxT("no") || val == wxT('0') )
+            *value = false;
+        else
+            return false;
+    }
+    else
+        return false;
+
+    return true;
+}
+
+bool wxVariant::Convert(double* value) const
+{
+    wxString type(GetType());
+    if (type == wxT("double"))
+        *value = ((wxVariantDoubleData*)GetData())->GetValue();
+    else if (type == wxT("long"))
+        *value = (double) (((wxVariantDataLong*)GetData())->GetValue());
+#ifdef HAVE_BOOL
+    else if (type == wxT("bool"))
+        *value = (double) (((wxVariantDataBool*)GetData())->GetValue());
+#endif
+    else if (type == wxT("string"))
+        *value = (double) wxAtof((const wxChar*) ((wxVariantDataString*)GetData())->GetValue());
+    else
+        return false;
+
+    return true;
+}
+
+bool wxVariant::Convert(wxChar* value) const
+{
+    wxString type(GetType());
+    if (type == wxT("char"))
+        *value = ((wxVariantDataChar*)GetData())->GetValue();
+    else if (type == wxT("long"))
+        *value = (char) (((wxVariantDataLong*)GetData())->GetValue());
+#ifdef HAVE_BOOL
+    else if (type == wxT("bool"))
+        *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
+#endif
+    else
+        return false;
+
+    return true;
+}
+
+bool wxVariant::Convert(wxString* value) const
+{
+    *value = MakeString();
+    return true;
+}
+
+#if wxUSE_DATETIME
+bool wxVariant::Convert(wxDateTime* value) const
+{
+    wxString type(GetType());
+    if (type == wxT("datetime"))
+    {
+        *value = ((wxVariantDataDateTime*)GetData())->GetValue();
+        return true;
+    }
+    // Fallback to string conversion
+    wxString val;
+    return Convert(&val) &&
+                (value->ParseDateTime(val) || value->ParseDate(val) || value->ParseTime(val));
+}
+#endif // wxUSE_DATETIME
+
+#endif // wxUSE_VARIANT
diff --git a/Source/3rd Party/wx/src/common/wfstream.cpp b/Source/3rd Party/wx/src/common/wfstream.cpp
index 65ba2fbae..c5fe73be6 100644
--- a/Source/3rd Party/wx/src/common/wfstream.cpp	
+++ b/Source/3rd Party/wx/src/common/wfstream.cpp	
@@ -1,431 +1,418 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/wfstream.cpp
-// Purpose:     "File stream" classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     11/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STREAMS
-
-#include "wx/wfstream.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/stream.h"
-#endif
-
-#include <stdio.h>
-
-#if wxUSE_FILE
-
-// ----------------------------------------------------------------------------
-// wxFileInputStream
-// ----------------------------------------------------------------------------
-
-wxFileInputStream::wxFileInputStream(const wxString& fileName)
-  : wxInputStream()
-{
-    m_file = new wxFile(fileName, wxFile::read);
-    m_file_destroy = true;
-    if ( !m_file->IsOpened() )
-        m_lasterror = wxSTREAM_READ_ERROR;
-}
-
-wxFileInputStream::wxFileInputStream()
-  : wxInputStream()
-{
-    m_file_destroy = false;
-    m_file = NULL;
-}
-
-wxFileInputStream::wxFileInputStream(wxFile& file)
-{
-    m_file = &file;
-    m_file_destroy = false;
-}
-
-wxFileInputStream::wxFileInputStream(int fd)
-{
-    m_file = new wxFile(fd);
-    m_file_destroy = true;
-}
-
-wxFileInputStream::~wxFileInputStream()
-{
-    if (m_file_destroy)
-        delete m_file;
-}
-
-wxFileOffset wxFileInputStream::GetLength() const
-{
-    return m_file->Length();
-}
-
-size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
-{
-    ssize_t ret = m_file->Read(buffer, size);
-
-    // NB: we can't use a switch here because HP-UX CC doesn't allow
-    //     switching over long long (which size_t is in 64bit mode)
-
-    if ( !ret )
-    {
-        // nothing read, so nothing more to read
-        m_lasterror = wxSTREAM_EOF;
-    }
-    else if ( ret == wxInvalidOffset )
-    {
-        m_lasterror = wxSTREAM_READ_ERROR;
-        ret = 0;
-    }
-    else
-    {
-        // normal case
-        m_lasterror = wxSTREAM_NO_ERROR;
-    }
-
-    return ret;
-}
-
-wxFileOffset wxFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    return m_file->Seek(pos, mode);
-}
-
-wxFileOffset wxFileInputStream::OnSysTell() const
-{
-    return m_file->Tell();
-}
-
-bool wxFileInputStream::IsOk() const
-{
-    return wxInputStream::IsOk() && m_file->IsOpened();
-}
-
-// ----------------------------------------------------------------------------
-// wxFileOutputStream
-// ----------------------------------------------------------------------------
-
-wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
-{
-    m_file = new wxFile(fileName, wxFile::write);
-    m_file_destroy = true;
-
-    if (!m_file->IsOpened())
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-}
-
-wxFileOutputStream::wxFileOutputStream(wxFile& file)
-{
-    m_file = &file;
-    m_file_destroy = false;
-}
-
-wxFileOutputStream::wxFileOutputStream()
-                  : wxOutputStream()
-{
-    m_file_destroy = false;
-    m_file = NULL;
-}
-
-wxFileOutputStream::wxFileOutputStream(int fd)
-{
-    m_file = new wxFile(fd);
-    m_file_destroy = true;
-}
-
-wxFileOutputStream::~wxFileOutputStream()
-{
-    if (m_file_destroy)
-    {
-        Sync();
-        delete m_file;
-    }
-}
-
-size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
-{
-    size_t ret = m_file->Write(buffer, size);
-
-    m_lasterror = m_file->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
-
-    return ret;
-}
-
-wxFileOffset wxFileOutputStream::OnSysTell() const
-{
-    return m_file->Tell();
-}
-
-wxFileOffset wxFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    return m_file->Seek(pos, mode);
-}
-
-void wxFileOutputStream::Sync()
-{
-    wxOutputStream::Sync();
-    m_file->Flush();
-}
-
-wxFileOffset wxFileOutputStream::GetLength() const
-{
-    return m_file->Length();
-}
-
-bool wxFileOutputStream::IsOk() const
-{
-    return wxOutputStream::IsOk() && m_file->IsOpened();
-}
-
-// ----------------------------------------------------------------------------
-// wxTempFileOutputStream
-// ----------------------------------------------------------------------------
-
-wxTempFileOutputStream::wxTempFileOutputStream(const wxString& fileName)
-{
-    m_file = new wxTempFile(fileName);
-
-    if (!m_file->IsOpened())
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-}
-
-wxTempFileOutputStream::~wxTempFileOutputStream()
-{
-    if (m_file->IsOpened())
-        Discard();
-    delete m_file;
-}
-
-size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size)
-{
-    if (IsOk() && m_file->Write(buffer, size))
-        return size;
-    m_lasterror = wxSTREAM_WRITE_ERROR;
-    return 0;
-}
-
-// ----------------------------------------------------------------------------
-// wxFileStream
-// ----------------------------------------------------------------------------
-
-wxFileStream::wxFileStream(const wxString& fileName)
-            : wxFileInputStream(),
-              wxFileOutputStream()
-{
-    wxFileOutputStream::m_file =
-    wxFileInputStream::m_file = new wxFile(fileName, wxFile::read_write);
-
-    // this is a bit ugly as streams are symmetric but we still have to delete
-    // the file we created above exactly once so we decide to (arbitrarily) do
-    // it in wxFileInputStream
-    wxFileInputStream::m_file_destroy = true;
-}
-
-bool wxFileStream::IsOk() const
-{
-    return wxFileOutputStream::IsOk() && wxFileInputStream::IsOk();
-}
-
-#endif // wxUSE_FILE
-
-#if wxUSE_FFILE
-
-// ----------------------------------------------------------------------------
-// wxFFileInputStream
-// ----------------------------------------------------------------------------
-
-wxFFileInputStream::wxFFileInputStream(const wxString& fileName,
-                                       const wxString& mode)
-                  : wxInputStream()
-{
-    m_file = new wxFFile(fileName, mode);
-    m_file_destroy = true;
-
-    if (!m_file->IsOpened())
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-}
-
-wxFFileInputStream::wxFFileInputStream()
-                  : wxInputStream()
-{
-    m_file = NULL;
-    m_file_destroy = false;
-}
-
-wxFFileInputStream::wxFFileInputStream(wxFFile& file)
-{
-    m_file = &file;
-    m_file_destroy = false;
-}
-
-wxFFileInputStream::wxFFileInputStream(FILE *file)
-{
-    m_file = new wxFFile(file);
-    m_file_destroy = true;
-}
-
-wxFFileInputStream::~wxFFileInputStream()
-{
-    if (m_file_destroy)
-        delete m_file;
-}
-
-wxFileOffset wxFFileInputStream::GetLength() const
-{
-    return m_file->Length();
-}
-
-size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
-{
-    ssize_t ret = m_file->Read(buffer, size);
-
-    // It is not safe to call Eof() if the file is not opened.
-    if (!m_file->IsOpened() || m_file->Eof())
-        m_lasterror = wxSTREAM_EOF;
-    if (ret == wxInvalidOffset)
-    {
-        m_lasterror = wxSTREAM_READ_ERROR;
-        ret = 0;
-    }
-
-    return ret;
-}
-
-wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;
-}
-
-wxFileOffset wxFFileInputStream::OnSysTell() const
-{
-    return m_file->Tell();
-}
-
-bool wxFFileInputStream::IsOk() const
-{
-    return wxStreamBase::IsOk() && m_file->IsOpened();
-}
-
-// ----------------------------------------------------------------------------
-// wxFFileOutputStream
-// ----------------------------------------------------------------------------
-
-wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName,
-                                         const wxString& mode)
-{
-    m_file = new wxFFile(fileName, mode);
-    m_file_destroy = true;
-
-    if (!m_file->IsOpened())
-    {
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-    }
-    else
-    {
-        if (m_file->Error())
-            m_lasterror = wxSTREAM_WRITE_ERROR;
-    }
-}
-
-wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
-{
-    m_file = &file;
-    m_file_destroy = false;
-}
-
-wxFFileOutputStream::wxFFileOutputStream()
-                   : wxOutputStream()
-{
-    m_file = NULL;
-    m_file_destroy = false;
-}
-
-wxFFileOutputStream::wxFFileOutputStream(FILE *file)
-{
-    m_file = new wxFFile(file);
-    m_file_destroy = true;
-}
-
-wxFFileOutputStream::~wxFFileOutputStream()
-{
-    if (m_file_destroy)
-    {
-        Sync();
-        delete m_file;
-    }
-}
-
-size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size)
-{
-    size_t ret = m_file->Write(buffer, size);
-    // It is not safe to call Error() if the file is not opened.
-    if (!m_file->IsOpened() || m_file->Error())
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-    else
-        m_lasterror = wxSTREAM_NO_ERROR;
-    return ret;
-}
-
-wxFileOffset wxFFileOutputStream::OnSysTell() const
-{
-    return m_file->Tell();
-}
-
-wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
-{
-    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;
-}
-
-void wxFFileOutputStream::Sync()
-{
-    wxOutputStream::Sync();
-    m_file->Flush();
-}
-
-wxFileOffset wxFFileOutputStream::GetLength() const
-{
-    return m_file->Length();
-}
-
-bool wxFFileOutputStream::IsOk() const
-{
-    return wxStreamBase::IsOk() && m_file->IsOpened();
-}
-
-// ----------------------------------------------------------------------------
-// wxFFileStream
-// ----------------------------------------------------------------------------
-
-wxFFileStream::wxFFileStream(const wxString& fileName, const wxString& mode)
-             : wxFFileInputStream(),
-               wxFFileOutputStream()
-{
-    wxASSERT_MSG( mode.find_first_of('+') != wxString::npos,
-                  "must be opened in read-write mode for this class to work" );
-
-    wxFFileOutputStream::m_file =
-    wxFFileInputStream::m_file = new wxFFile(fileName, mode);
-
-    // see comment in wxFileStream ctor
-    wxFFileInputStream::m_file_destroy = true;
-}
-
-bool wxFFileStream::IsOk() const
-{
-    return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk();
-}
-
-#endif //wxUSE_FFILE
-
-#endif // wxUSE_STREAMS
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/fstream.cpp
+// Purpose:     "File stream" classes
+// Author:      Julian Smart
+// Modified by:
+// Created:     11/07/98
+// RCS-ID:      $Id: wfstream.cpp 54418 2008-06-29 01:28:43Z VZ $
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_STREAMS
+
+#include "wx/wfstream.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/stream.h"
+#endif
+
+#include <stdio.h>
+
+#if wxUSE_FILE
+
+// ----------------------------------------------------------------------------
+// wxFileInputStream
+// ----------------------------------------------------------------------------
+
+wxFileInputStream::wxFileInputStream(const wxString& fileName)
+  : wxInputStream()
+{
+    m_file = new wxFile(fileName, wxFile::read);
+    m_file_destroy = true;
+    if ( !m_file->IsOpened() )
+        m_lasterror = wxSTREAM_READ_ERROR;
+}
+
+wxFileInputStream::wxFileInputStream()
+  : wxInputStream()
+{
+    m_file_destroy = false;
+    m_file = NULL;
+}
+
+wxFileInputStream::wxFileInputStream(wxFile& file)
+{
+    m_file = &file;
+    m_file_destroy = false;
+}
+
+wxFileInputStream::wxFileInputStream(int fd)
+{
+    m_file = new wxFile(fd);
+    m_file_destroy = true;
+}
+
+wxFileInputStream::~wxFileInputStream()
+{
+    if (m_file_destroy)
+        delete m_file;
+}
+
+wxFileOffset wxFileInputStream::GetLength() const
+{
+    return m_file->Length();
+}
+
+size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
+{
+    ssize_t ret = m_file->Read(buffer, size);
+
+    // NB: we can't use a switch here because HP-UX CC doesn't allow
+    //     switching over long long (which size_t is in 64bit mode)
+
+    if ( !ret )
+    {
+        // nothing read, so nothing more to read
+        m_lasterror = wxSTREAM_EOF;
+    }
+    else if ( ret == wxInvalidOffset )
+    {
+        m_lasterror = wxSTREAM_READ_ERROR;
+        ret = 0;
+    }
+    else
+    {
+        // normal case
+        m_lasterror = wxSTREAM_NO_ERROR;
+    }
+
+    return ret;
+}
+
+wxFileOffset wxFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_file->Seek(pos, mode);
+}
+
+wxFileOffset wxFileInputStream::OnSysTell() const
+{
+    return m_file->Tell();
+}
+
+bool wxFileInputStream::IsOk() const
+{
+    return (wxStreamBase::IsOk() && m_file->IsOpened());
+}
+
+// ----------------------------------------------------------------------------
+// wxFileOutputStream
+// ----------------------------------------------------------------------------
+
+wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
+{
+    m_file = new wxFile(fileName, wxFile::write);
+    m_file_destroy = true;
+
+    if (!m_file->IsOpened())
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+}
+
+wxFileOutputStream::wxFileOutputStream(wxFile& file)
+{
+    m_file = &file;
+    m_file_destroy = false;
+}
+
+wxFileOutputStream::wxFileOutputStream()
+                  : wxOutputStream()
+{
+    m_file_destroy = false;
+    m_file = NULL;
+}
+
+wxFileOutputStream::wxFileOutputStream(int fd)
+{
+    m_file = new wxFile(fd);
+    m_file_destroy = true;
+}
+
+wxFileOutputStream::~wxFileOutputStream()
+{
+    if (m_file_destroy)
+    {
+        Sync();
+        delete m_file;
+    }
+}
+
+size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    size_t ret = m_file->Write(buffer, size);
+
+    m_lasterror = m_file->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
+
+    return ret;
+}
+
+wxFileOffset wxFileOutputStream::OnSysTell() const
+{
+    return m_file->Tell();
+}
+
+wxFileOffset wxFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_file->Seek(pos, mode);
+}
+
+void wxFileOutputStream::Sync()
+{
+    wxOutputStream::Sync();
+    m_file->Flush();
+}
+
+wxFileOffset wxFileOutputStream::GetLength() const
+{
+    return m_file->Length();
+}
+
+bool wxFileOutputStream::IsOk() const
+{
+    return (wxStreamBase::IsOk() && m_file->IsOpened());
+}
+
+// ----------------------------------------------------------------------------
+// wxTempFileOutputStream
+// ----------------------------------------------------------------------------
+
+wxTempFileOutputStream::wxTempFileOutputStream(const wxString& fileName)
+{
+    m_file = new wxTempFile(fileName);
+
+    if (!m_file->IsOpened())
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+}
+
+wxTempFileOutputStream::~wxTempFileOutputStream()
+{
+    if (m_file->IsOpened())
+        Discard();
+    delete m_file;
+}
+
+size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    if (IsOk() && m_file->Write(buffer, size))
+        return size;
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+    return 0;
+}
+
+// ----------------------------------------------------------------------------
+// wxFileStream
+// ----------------------------------------------------------------------------
+
+wxFileStream::wxFileStream(const wxString& fileName)
+            : wxFileInputStream(),
+              wxFileOutputStream()
+{
+    wxFileOutputStream::m_file =
+    wxFileInputStream::m_file = new wxFile(fileName, wxFile::read_write);
+
+    // this is a bit ugly as streams are symmetric but we still have to delete
+    // the file we created above exactly once so we decide to (arbitrarily) do
+    // it in wxFileInputStream
+    wxFileInputStream::m_file_destroy = true;
+}
+
+#endif //wxUSE_FILE
+
+#if wxUSE_FFILE
+
+// ----------------------------------------------------------------------------
+// wxFFileInputStream
+// ----------------------------------------------------------------------------
+
+wxFFileInputStream::wxFFileInputStream(const wxString& fileName,
+                                       const wxChar *mode)
+                  : wxInputStream()
+{
+    m_file = new wxFFile(fileName, mode);
+    m_file_destroy = true;
+
+    if (!m_file->IsOpened())
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+}
+
+wxFFileInputStream::wxFFileInputStream()
+                  : wxInputStream()
+{
+    m_file = NULL;
+    m_file_destroy = false;
+}
+
+wxFFileInputStream::wxFFileInputStream(wxFFile& file)
+{
+    m_file = &file;
+    m_file_destroy = false;
+}
+
+wxFFileInputStream::wxFFileInputStream(FILE *file)
+{
+    m_file = new wxFFile(file);
+    m_file_destroy = true;
+}
+
+wxFFileInputStream::~wxFFileInputStream()
+{
+    if (m_file_destroy)
+        delete m_file;
+}
+
+wxFileOffset wxFFileInputStream::GetLength() const
+{
+    return m_file->Length();
+}
+
+size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
+{
+    ssize_t ret = m_file->Read(buffer, size);
+
+    // It is not safe to call Eof() if the file is not opened.
+    if (!m_file->IsOpened() || m_file->Eof())
+        m_lasterror = wxSTREAM_EOF;
+    if (ret == wxInvalidOffset)
+    {
+        m_lasterror = wxSTREAM_READ_ERROR;
+        ret = 0;
+    }
+
+    return ret;
+}
+
+wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;
+}
+
+wxFileOffset wxFFileInputStream::OnSysTell() const
+{
+    return m_file->Tell();
+}
+
+bool wxFFileInputStream::IsOk() const
+{
+    return (wxStreamBase::IsOk() && m_file->IsOpened());
+}
+
+// ----------------------------------------------------------------------------
+// wxFFileOutputStream
+// ----------------------------------------------------------------------------
+
+wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName,
+                                         const wxChar *mode)
+{
+    m_file = new wxFFile(fileName, mode);
+    m_file_destroy = true;
+
+    if (!m_file->IsOpened())
+    {
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    }
+    else
+    {
+        if (m_file->Error())
+            m_lasterror = wxSTREAM_WRITE_ERROR;
+    }
+}
+
+wxFFileOutputStream::wxFFileOutputStream(wxFFile& file)
+{
+    m_file = &file;
+    m_file_destroy = false;
+}
+
+wxFFileOutputStream::wxFFileOutputStream()
+                   : wxOutputStream()
+{
+    m_file = NULL;
+    m_file_destroy = false;
+}
+
+wxFFileOutputStream::wxFFileOutputStream(FILE *file)
+{
+    m_file = new wxFFile(file);
+    m_file_destroy = true;
+}
+
+wxFFileOutputStream::~wxFFileOutputStream()
+{
+    if (m_file_destroy)
+    {
+        Sync();
+        delete m_file;
+    }
+}
+
+size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    size_t ret = m_file->Write(buffer, size);
+    // It is not safe to call Error() if the file is not opened.
+    if (!m_file->IsOpened() || m_file->Error())
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    else
+        m_lasterror = wxSTREAM_NO_ERROR;
+    return ret;
+}
+
+wxFileOffset wxFFileOutputStream::OnSysTell() const
+{
+    return m_file->Tell();
+}
+
+wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
+{
+    return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset;
+}
+
+void wxFFileOutputStream::Sync()
+{
+    wxOutputStream::Sync();
+    m_file->Flush();
+}
+
+wxFileOffset wxFFileOutputStream::GetLength() const
+{
+    return m_file->Length();
+}
+
+bool wxFFileOutputStream::IsOk() const
+{
+    return (wxStreamBase::IsOk() && m_file->IsOpened());
+}
+
+// ----------------------------------------------------------------------------
+// wxFFileStream
+// ----------------------------------------------------------------------------
+
+wxFFileStream::wxFFileStream(const wxString& fileName)
+             : wxFFileInputStream(),
+               wxFFileOutputStream()
+{
+    wxFFileOutputStream::m_file =
+    wxFFileInputStream::m_file = new wxFFile(fileName, _T("w+b"));
+
+    // see comment in wxFileStream ctor
+    wxFFileInputStream::m_file_destroy = true;
+}
+
+#endif //wxUSE_FFILE
+
+#endif // wxUSE_STREAMS
diff --git a/Source/3rd Party/wx/src/common/wincmn.cpp b/Source/3rd Party/wx/src/common/wincmn.cpp
index 0905f424d..03394bf2b 100644
--- a/Source/3rd Party/wx/src/common/wincmn.cpp	
+++ b/Source/3rd Party/wx/src/common/wincmn.cpp	
@@ -1,3917 +1,3255 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/wincmn.cpp
-// Purpose:     common (to all ports) wxWindow functions
-// Author:      Julian Smart, Vadim Zeitlin
-// Modified by:
-// Created:     13/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/frame.h"
-    #include "wx/window.h"
-    #include "wx/control.h"
-    #include "wx/checkbox.h"
-    #include "wx/radiobut.h"
-    #include "wx/statbox.h"
-    #include "wx/textctrl.h"
-    #include "wx/settings.h"
-    #include "wx/dialog.h"
-    #include "wx/msgdlg.h"
-    #include "wx/msgout.h"
-    #include "wx/statusbr.h"
-    #include "wx/toolbar.h"
-    #include "wx/dcclient.h"
-    #include "wx/scrolbar.h"
-    #include "wx/layout.h"
-    #include "wx/sizer.h"
-    #include "wx/menu.h"
-#endif //WX_PRECOMP
-
-#if wxUSE_DRAG_AND_DROP
-    #include "wx/dnd.h"
-#endif // wxUSE_DRAG_AND_DROP
-
-#if wxUSE_ACCESSIBILITY
-    #include "wx/access.h"
-#endif
-
-#if wxUSE_HELP
-    #include "wx/cshelp.h"
-#endif // wxUSE_HELP
-
-#if wxUSE_TOOLTIPS
-    #include "wx/tooltip.h"
-#endif // wxUSE_TOOLTIPS
-
-#if wxUSE_CARET
-    #include "wx/caret.h"
-#endif // wxUSE_CARET
-
-#if wxUSE_SYSTEM_OPTIONS
-    #include "wx/sysopt.h"
-#endif
-
-#include "wx/platinfo.h"
-#include "wx/private/window.h"
-
-#ifdef __WINDOWS__
-    #include "wx/msw/wrapwin.h"
-#endif
-
-// Windows List
-WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows;
-
-// globals
-#if wxUSE_MENUS
-wxMenu *wxCurrentPopupMenu = NULL;
-#endif // wxUSE_MENUS
-
-extern WXDLLEXPORT_DATA(const char) wxPanelNameStr[] = "panel";
-
-// ----------------------------------------------------------------------------
-// static data
-// ----------------------------------------------------------------------------
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler)
-
-// ----------------------------------------------------------------------------
-// event table
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler)
-    EVT_SYS_COLOUR_CHANGED(wxWindowBase::OnSysColourChanged)
-    EVT_INIT_DIALOG(wxWindowBase::OnInitDialog)
-    EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick)
-
-#if wxUSE_HELP
-    EVT_HELP(wxID_ANY, wxWindowBase::OnHelp)
-#endif // wxUSE_HELP
-
-    EVT_SIZE(wxWindowBase::InternalOnSize)
-END_EVENT_TABLE()
-
-// ============================================================================
-// implementation of the common functionality of the wxWindow class
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-
-// windows that are created from a parent window during its Create method, 
-// eg. spin controls in a calendar controls must never been streamed out 
-// separately otherwise chaos occurs. Right now easiest is to test for negative ids, 
-// as windows with negative ids never can be recreated anyway
-
-
-bool wxWindowStreamingCallback( const wxObject *object, wxObjectWriter *, 
-                               wxObjectWriterCallback *, const wxStringToAnyHashMap & )
-{
-    const wxWindow * win = wx_dynamic_cast(const wxWindow*, object);
-    if ( win && win->GetId() < 0 )
-        return false;
-    return true;
-}
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxWindow, wxWindowBase, "wx/window.h", \
-                                       wxWindowStreamingCallback)
-
-// make wxWindowList known before the property is used
-
-wxCOLLECTION_TYPE_INFO( wxWindow*, wxWindowList );
-
-template<> void wxCollectionToVariantArray( wxWindowList const &theList, 
-                                           wxAnyList &value)
-{
-    wxListCollectionToAnyList<wxWindowList::compatibility_iterator>( theList, value );
-}
-
-wxDEFINE_FLAGS( wxWindowStyle )
-
-wxBEGIN_FLAGS( wxWindowStyle )
-// new style border flags, we put them first to
-// use them for streaming out
-
-wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-wxFLAGS_MEMBER(wxBORDER_RAISED)
-wxFLAGS_MEMBER(wxBORDER_STATIC)
-wxFLAGS_MEMBER(wxBORDER_NONE)
-
-// old style border flags
-wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-wxFLAGS_MEMBER(wxRAISED_BORDER)
-wxFLAGS_MEMBER(wxSTATIC_BORDER)
-wxFLAGS_MEMBER(wxBORDER)
-
-// standard window styles
-wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-wxFLAGS_MEMBER(wxWANTS_CHARS)
-wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-wxFLAGS_MEMBER(wxVSCROLL)
-wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxWindowStyle )
-
-wxBEGIN_PROPERTIES_TABLE(wxWindow)
-wxEVENT_PROPERTY( Close, wxEVT_CLOSE_WINDOW, wxCloseEvent)
-wxEVENT_PROPERTY( Create, wxEVT_CREATE, wxWindowCreateEvent )
-wxEVENT_PROPERTY( Destroy, wxEVT_DESTROY, wxWindowDestroyEvent )
-// Always constructor Properties first
-
-wxREADONLY_PROPERTY( Parent,wxWindow*, GetParent, wxEMPTY_PARAMETER_VALUE, \
-                    0 /*flags*/, wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Id,wxWindowID, SetId, GetId, -1 /*wxID_ANY*/, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group") )
-wxPROPERTY( Position,wxPoint, SetPosition, GetPosition, wxDefaultPosition, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group")) // pos
-wxPROPERTY( Size,wxSize, SetSize, GetSize, wxDefaultSize, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group")) // size
-wxPROPERTY( WindowStyle, long, SetWindowStyleFlag, GetWindowStyleFlag, \
-           wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // style
-wxPROPERTY( Name,wxString, SetName, GetName, wxEmptyString, 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group") )
-
-// Then all relations of the object graph
-
-wxREADONLY_PROPERTY_COLLECTION( Children, wxWindowList, wxWindowBase*, \
-                               GetWindowChildren, wxPROP_OBJECT_GRAPH /*flags*/, \
-                               wxT("Helpstring"), wxT("group"))
-
-// and finally all other properties
-
-wxPROPERTY( ExtraStyle, long, SetExtraStyle, GetExtraStyle, wxEMPTY_PARAMETER_VALUE, \
-           0 /*flags*/, wxT("Helpstring"), wxT("group")) // extstyle
-wxPROPERTY( BackgroundColour, wxColour, SetBackgroundColour, GetBackgroundColour, \
-           wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // bg
-wxPROPERTY( ForegroundColour, wxColour, SetForegroundColour, GetForegroundColour, \
-           wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), wxT("group")) // fg
-wxPROPERTY( Enabled, bool, Enable, IsEnabled, wxAny((bool)true), 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-wxPROPERTY( Shown, bool, Show, IsShown, wxAny((bool)true), 0 /*flags*/, \
-           wxT("Helpstring"), wxT("group"))
-
-#if 0
-// possible property candidates (not in xrc) or not valid in all subclasses
-wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString )
-wxPROPERTY( Font, wxFont, SetFont, GetWindowFont , )
-wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )
-// MaxHeight, Width, MinHeight, Width
-// TODO switch label to control and title to toplevels
-
-wxPROPERTY( ThemeEnabled, bool, SetThemeEnabled, GetThemeEnabled, )
-//wxPROPERTY( Cursor, wxCursor, SetCursor, GetCursor, )
-// wxPROPERTY( ToolTip, wxString, SetToolTip, GetToolTipText, )
-wxPROPERTY( AutoLayout, bool, SetAutoLayout, GetAutoLayout, )
-#endif
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxWindow)
-
-wxCONSTRUCTOR_DUMMY(wxWindow)
-
-#else
-
-#ifndef __WXUNIVERSAL__
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif
-
-#endif
-
-// ----------------------------------------------------------------------------
-// initialization
-// ----------------------------------------------------------------------------
-
-// the default initialization
-wxWindowBase::wxWindowBase()
-{
-    // no window yet, no parent nor children
-    m_parent = NULL;
-    m_windowId = wxID_ANY;
-
-    // no constraints on the minimal window size
-    m_minWidth =
-    m_maxWidth = wxDefaultCoord;
-    m_minHeight =
-    m_maxHeight = wxDefaultCoord;
-
-    // invalidiated cache value
-    m_bestSizeCache = wxDefaultSize;
-
-    // window are created enabled and visible by default
-    m_isShown =
-    m_isEnabled = true;
-
-    // the default event handler is just this window
-    m_eventHandler = this;
-
-#if wxUSE_VALIDATORS
-    // no validator
-    m_windowValidator = NULL;
-#endif // wxUSE_VALIDATORS
-
-    // the colours/fonts are default for now, so leave m_font,
-    // m_backgroundColour and m_foregroundColour uninitialized and set those
-    m_hasBgCol =
-    m_hasFgCol =
-    m_hasFont = false;
-    m_inheritBgCol =
-    m_inheritFgCol =
-    m_inheritFont = false;
-
-    // no style bits
-    m_exStyle =
-    m_windowStyle = 0;
-
-    m_backgroundStyle = wxBG_STYLE_ERASE;
-
-#if wxUSE_CONSTRAINTS
-    // no constraints whatsoever
-    m_constraints = NULL;
-    m_constraintsInvolvedIn = NULL;
-#endif // wxUSE_CONSTRAINTS
-
-    m_windowSizer = NULL;
-    m_containingSizer = NULL;
-    m_autoLayout = false;
-
-#if wxUSE_DRAG_AND_DROP
-    m_dropTarget = NULL;
-#endif // wxUSE_DRAG_AND_DROP
-
-#if wxUSE_TOOLTIPS
-    m_tooltip = NULL;
-#endif // wxUSE_TOOLTIPS
-
-#if wxUSE_CARET
-    m_caret = NULL;
-#endif // wxUSE_CARET
-
-#if wxUSE_PALETTE
-    m_hasCustomPalette = false;
-#endif // wxUSE_PALETTE
-
-#if wxUSE_ACCESSIBILITY
-    m_accessible = NULL;
-#endif
-
-    m_virtualSize = wxDefaultSize;
-
-    m_scrollHelper = NULL;
-
-    m_windowVariant = wxWINDOW_VARIANT_NORMAL;
-#if wxUSE_SYSTEM_OPTIONS
-    if ( wxSystemOptions::HasOption(wxWINDOW_DEFAULT_VARIANT) )
-    {
-       m_windowVariant = (wxWindowVariant) wxSystemOptions::GetOptionInt( wxWINDOW_DEFAULT_VARIANT ) ;
-    }
-#endif
-
-    // Whether we're using the current theme for this window (wxGTK only for now)
-    m_themeEnabled = false;
-
-    // This is set to true by SendDestroyEvent() which should be called by the
-    // most derived class to ensure that the destruction event is sent as soon
-    // as possible to allow its handlers to still see the undestroyed window
-    m_isBeingDeleted = false;
-
-    m_freezeCount = 0;
-}
-
-// common part of window creation process
-bool wxWindowBase::CreateBase(wxWindowBase *parent,
-                              wxWindowID id,
-                              const wxPoint& WXUNUSED(pos),
-                              const wxSize& size,
-                              long style,
-                              const wxString& name)
-{
-    // ids are limited to 16 bits under MSW so if you care about portability,
-    // it's not a good idea to use ids out of this range (and negative ids are
-    // reserved for wxWidgets own usage)
-    wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767) ||
-                  (id >= wxID_AUTO_LOWEST && id <= wxID_AUTO_HIGHEST),
-                  wxT("invalid id value") );
-
-    // generate a new id if the user doesn't care about it
-    if ( id == wxID_ANY )
-    {
-        m_windowId = NewControlId();
-    }
-    else // valid id specified
-    {
-        m_windowId = id;
-    }
-
-    // don't use SetWindowStyleFlag() here, this function should only be called
-    // to change the flag after creation as it tries to reflect the changes in
-    // flags by updating the window dynamically and we don't need this here
-    m_windowStyle = style;
-
-    // assume the user doesn't want this window to shrink beneath its initial
-    // size, this worked like this in wxWidgets 2.8 and before and generally
-    // often makes sense for child windows (for top level ones it definitely
-    // does not as the user should be able to resize the window)
-    //
-    // note that we can't use IsTopLevel() from ctor
-    if ( size != wxDefaultSize && !wxTopLevelWindows.Find((wxWindow *)this) )
-        SetMinSize(size);
-
-    SetName(name);
-    SetParent(parent);
-
-    return true;
-}
-
-bool wxWindowBase::CreateBase(wxWindowBase *parent,
-                              wxWindowID id,
-                              const wxPoint& pos,
-                              const wxSize& size,
-                              long style,
-                              const wxValidator& wxVALIDATOR_PARAM(validator),
-                              const wxString& name)
-{
-    if ( !CreateBase(parent, id, pos, size, style, name) )
-        return false;
-
-#if wxUSE_VALIDATORS
-    SetValidator(validator);
-#endif // wxUSE_VALIDATORS
-
-    // if the parent window has wxWS_EX_VALIDATE_RECURSIVELY set, we want to
-    // have it too - like this it's possible to set it only in the top level
-    // dialog/frame and all children will inherit it by defult
-    if ( parent && (parent->GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) )
-    {
-        SetExtraStyle(GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY);
-    }
-
-    return true;
-}
-
-bool wxWindowBase::ToggleWindowStyle(int flag)
-{
-    wxASSERT_MSG( flag, wxT("flags with 0 value can't be toggled") );
-
-    bool rc;
-    long style = GetWindowStyleFlag();
-    if ( style & flag )
-    {
-        style &= ~flag;
-        rc = false;
-    }
-    else // currently off
-    {
-        style |= flag;
-        rc = true;
-    }
-
-    SetWindowStyleFlag(style);
-
-    return rc;
-}
-
-// ----------------------------------------------------------------------------
-// destruction
-// ----------------------------------------------------------------------------
-
-// common clean up
-wxWindowBase::~wxWindowBase()
-{
-    wxASSERT_MSG( GetCapture() != this, wxT("attempt to destroy window with mouse capture") );
-
-    // FIXME if these 2 cases result from programming errors in the user code
-    //       we should probably assert here instead of silently fixing them
-
-    // Just in case the window has been Closed, but we're then deleting
-    // immediately: don't leave dangling pointers.
-    wxPendingDelete.DeleteObject(this);
-
-    // Just in case we've loaded a top-level window via LoadNativeDialog but
-    // we weren't a dialog class
-    wxTopLevelWindows.DeleteObject((wxWindow*)this);
-
-    // Any additional event handlers should be popped before the window is
-    // deleted as otherwise the last handler will be left with a dangling
-    // pointer to this window result in a difficult to diagnose crash later on.
-    wxASSERT_MSG( GetEventHandler() == this,
-                    wxT("any pushed event handlers must have been removed") );
-
-#if wxUSE_MENUS
-    // The associated popup menu can still be alive, disassociate from it in
-    // this case
-    if ( wxCurrentPopupMenu && wxCurrentPopupMenu->GetInvokingWindow() == this )
-        wxCurrentPopupMenu->SetInvokingWindow(NULL);
-#endif // wxUSE_MENUS
-
-    wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
-
-    // notify the parent about this window destruction
-    if ( m_parent )
-        m_parent->RemoveChild(this);
-
-#if wxUSE_CARET
-    delete m_caret;
-#endif // wxUSE_CARET
-
-#if wxUSE_VALIDATORS
-    delete m_windowValidator;
-#endif // wxUSE_VALIDATORS
-
-#if wxUSE_CONSTRAINTS
-    // Have to delete constraints/sizer FIRST otherwise sizers may try to look
-    // at deleted windows as they delete themselves.
-    DeleteRelatedConstraints();
-
-    if ( m_constraints )
-    {
-        // This removes any dangling pointers to this window in other windows'
-        // constraintsInvolvedIn lists.
-        UnsetConstraints(m_constraints);
-        wxDELETE(m_constraints);
-    }
-#endif // wxUSE_CONSTRAINTS
-
-    if ( m_containingSizer )
-        m_containingSizer->Detach( (wxWindow*)this );
-
-    delete m_windowSizer;
-
-#if wxUSE_DRAG_AND_DROP
-    delete m_dropTarget;
-#endif // wxUSE_DRAG_AND_DROP
-
-#if wxUSE_TOOLTIPS
-    delete m_tooltip;
-#endif // wxUSE_TOOLTIPS
-
-#if wxUSE_ACCESSIBILITY
-    delete m_accessible;
-#endif
-
-#if wxUSE_HELP
-    // NB: this has to be called unconditionally, because we don't know
-    //     whether this window has associated help text or not
-    wxHelpProvider *helpProvider = wxHelpProvider::Get();
-    if ( helpProvider )
-        helpProvider->RemoveHelp(this);
-#endif
-}
-
-bool wxWindowBase::IsBeingDeleted() const
-{
-    return m_isBeingDeleted ||
-            (!IsTopLevel() && m_parent && m_parent->IsBeingDeleted());
-}
-
-void wxWindowBase::SendDestroyEvent()
-{
-    if ( m_isBeingDeleted )
-    {
-        // we could have been already called from a more derived class dtor,
-        // e.g. ~wxTLW calls us and so does ~wxWindow and the latter call
-        // should be simply ignored
-        return;
-    }
-
-    m_isBeingDeleted = true;
-
-    wxWindowDestroyEvent event;
-    event.SetEventObject(this);
-    event.SetId(GetId());
-    GetEventHandler()->ProcessEvent(event);
-}
-
-bool wxWindowBase::Destroy()
-{
-    // If our handle is invalid, it means that this window has never been
-    // created, either because creating it failed or, more typically, because
-    // this wxWindow object was default-constructed and its Create() method had
-    // never been called. As we didn't send wxWindowCreateEvent in this case
-    // (which is sent after successful creation), don't send the matching
-    // wxWindowDestroyEvent neither.
-    if ( GetHandle() )
-        SendDestroyEvent();
-
-    delete this;
-
-    return true;
-}
-
-bool wxWindowBase::Close(bool force)
-{
-    wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
-    event.SetEventObject(this);
-    event.SetCanVeto(!force);
-
-    // return false if window wasn't closed because the application vetoed the
-    // close event
-    return HandleWindowEvent(event) && !event.GetVeto();
-}
-
-bool wxWindowBase::DestroyChildren()
-{
-    wxWindowList::compatibility_iterator node;
-    for ( ;; )
-    {
-        // we iterate until the list becomes empty
-        node = GetChildren().GetFirst();
-        if ( !node )
-            break;
-
-        wxWindow *child = node->GetData();
-
-        // note that we really want to delete it immediately so don't call the
-        // possible overridden Destroy() version which might not delete the
-        // child immediately resulting in problems with our (top level) child
-        // outliving its parent
-        child->wxWindowBase::Destroy();
-
-        wxASSERT_MSG( !GetChildren().Find(child),
-                      wxT("child didn't remove itself using RemoveChild()") );
-    }
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// size/position related methods
-// ----------------------------------------------------------------------------
-
-// centre the window with respect to its parent in either (or both) directions
-void wxWindowBase::DoCentre(int dir)
-{
-    wxCHECK_RET( !(dir & wxCENTRE_ON_SCREEN) && GetParent(),
-                 wxT("this method only implements centering child windows") );
-
-    SetSize(GetRect().CentreIn(GetParent()->GetClientSize(), dir));
-}
-
-// fits the window around the children
-void wxWindowBase::Fit()
-{
-    if ( !GetChildren().empty() )
-    {
-        SetSize(GetBestSize());
-    }
-    //else: do nothing if we have no children
-}
-
-// fits virtual size (ie. scrolled area etc.) around children
-void wxWindowBase::FitInside()
-{
-    if ( GetChildren().GetCount() > 0 )
-    {
-        SetVirtualSize( GetBestVirtualSize() );
-    }
-}
-
-// On Mac, scrollbars are explicitly children.
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
-static bool wxHasRealChildren(const wxWindowBase* win)
-{
-    int realChildCount = 0;
-
-    for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindow *win = node->GetData();
-        if ( !win->IsTopLevel() && win->IsShown()
-#if wxUSE_SCROLLBAR
-            && !wxDynamicCast(win, wxScrollBar)
-#endif
-            )
-            realChildCount ++;
-    }
-    return (realChildCount > 0);
-}
-#endif
-
-void wxWindowBase::InvalidateBestSize()
-{
-    m_bestSizeCache = wxDefaultSize;
-
-    // parent's best size calculation may depend on its children's
-    // as long as child window we are in is not top level window itself
-    // (because the TLW size is never resized automatically)
-    // so let's invalidate it as well to be safe:
-    if (m_parent && !IsTopLevel())
-        m_parent->InvalidateBestSize();
-}
-
-// return the size best suited for the current window
-wxSize wxWindowBase::DoGetBestSize() const
-{
-    wxSize best;
-
-    if ( m_windowSizer )
-    {
-        best = m_windowSizer->GetMinSize();
-    }
-#if wxUSE_CONSTRAINTS
-    else if ( m_constraints )
-    {
-        wxConstCast(this, wxWindowBase)->SatisfyConstraints();
-
-        // our minimal acceptable size is such that all our windows fit inside
-        int maxX = 0,
-            maxY = 0;
-
-        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxLayoutConstraints *c = node->GetData()->GetConstraints();
-            if ( !c )
-            {
-                // it's not normal that we have an unconstrained child, but
-                // what can we do about it?
-                continue;
-            }
-
-            int x = c->right.GetValue(),
-                y = c->bottom.GetValue();
-
-            if ( x > maxX )
-                maxX = x;
-
-            if ( y > maxY )
-                maxY = y;
-
-            // TODO: we must calculate the overlaps somehow, otherwise we
-            //       will never return a size bigger than the current one :-(
-        }
-
-        best = wxSize(maxX, maxY);
-    }
-#endif // wxUSE_CONSTRAINTS
-    else if ( !GetChildren().empty()
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
-              && wxHasRealChildren(this)
-#endif
-              )
-    {
-        // our minimal acceptable size is such that all our visible child
-        // windows fit inside
-        int maxX = 0,
-            maxY = 0;
-
-        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxWindow *win = node->GetData();
-            if ( win->IsTopLevel()
-                    || !win->IsShown()
-#if wxUSE_STATUSBAR
-                        || wxDynamicCast(win, wxStatusBar)
-#endif // wxUSE_STATUSBAR
-               )
-            {
-                // dialogs and frames lie in different top level windows -
-                // don't deal with them here; as for the status bars, they
-                // don't lie in the client area at all
-                continue;
-            }
-
-            int wx, wy, ww, wh;
-            win->GetPosition(&wx, &wy);
-
-            // if the window hadn't been positioned yet, assume that it is in
-            // the origin
-            if ( wx == wxDefaultCoord )
-                wx = 0;
-            if ( wy == wxDefaultCoord )
-                wy = 0;
-
-            win->GetSize(&ww, &wh);
-            if ( wx + ww > maxX )
-                maxX = wx + ww;
-            if ( wy + wh > maxY )
-                maxY = wy + wh;
-        }
-
-        best = wxSize(maxX, maxY);
-    }
-    else // ! has children
-    {
-        wxSize size = GetMinSize();
-        if ( !size.IsFullySpecified() )
-        {
-            // if the window doesn't define its best size we assume that it can
-            // be arbitrarily small -- usually this is not the case, of course,
-            // but we have no way to know what the limit is, it should really
-            // override DoGetBestClientSize() itself to tell us
-            size.SetDefaults(wxSize(1, 1));
-        }
-
-        // return as-is, unadjusted by the client size difference.
-        return size;
-    }
-
-    // Add any difference between size and client size
-    wxSize diff = GetSize() - GetClientSize();
-    best.x += wxMax(0, diff.x);
-    best.y += wxMax(0, diff.y);
-
-    return best;
-}
-
-// helper of GetWindowBorderSize(): as many ports don't implement support for
-// wxSYS_BORDER/EDGE_X/Y metrics in their wxSystemSettings, use hard coded
-// fallbacks in this case
-static int wxGetMetricOrDefault(wxSystemMetric what, const wxWindowBase* win)
-{
-    int rc = wxSystemSettings::GetMetric(
-        what, static_cast<wxWindow*>(const_cast<wxWindowBase*>(win)));
-    if ( rc == -1 )
-    {
-        switch ( what )
-        {
-            case wxSYS_BORDER_X:
-            case wxSYS_BORDER_Y:
-                // 2D border is by default 1 pixel wide
-                rc = 1;
-                break;
-
-            case wxSYS_EDGE_X:
-            case wxSYS_EDGE_Y:
-                // 3D borders are by default 2 pixels
-                rc = 2;
-                break;
-
-            default:
-                wxFAIL_MSG( wxT("unexpected wxGetMetricOrDefault() argument") );
-                rc = 0;
-        }
-    }
-
-    return rc;
-}
-
-wxSize wxWindowBase::GetWindowBorderSize() const
-{
-    wxSize size;
-
-    switch ( GetBorder() )
-    {
-        case wxBORDER_NONE:
-            // nothing to do, size is already (0, 0)
-            break;
-
-        case wxBORDER_SIMPLE:
-        case wxBORDER_STATIC:
-            size.x = wxGetMetricOrDefault(wxSYS_BORDER_X, this);
-            size.y = wxGetMetricOrDefault(wxSYS_BORDER_Y, this);
-            break;
-
-        case wxBORDER_SUNKEN:
-        case wxBORDER_RAISED:
-            size.x = wxMax(wxGetMetricOrDefault(wxSYS_EDGE_X, this),
-                           wxGetMetricOrDefault(wxSYS_BORDER_X, this));
-            size.y = wxMax(wxGetMetricOrDefault(wxSYS_EDGE_Y, this),
-                           wxGetMetricOrDefault(wxSYS_BORDER_Y, this));
-            break;
-
-        case wxBORDER_DOUBLE:
-            size.x = wxGetMetricOrDefault(wxSYS_EDGE_X, this) +
-                        wxGetMetricOrDefault(wxSYS_BORDER_X, this);
-            size.y = wxGetMetricOrDefault(wxSYS_EDGE_Y, this) +
-                        wxGetMetricOrDefault(wxSYS_BORDER_Y, this);
-            break;
-
-        default:
-            wxFAIL_MSG(wxT("Unknown border style."));
-            break;
-    }
-
-    // we have borders on both sides
-    return size*2;
-}
-
-bool
-wxWindowBase::InformFirstDirection(int direction,
-                                   int size,
-                                   int availableOtherDir)
-{
-    return GetSizer() && GetSizer()->InformFirstDirection(direction,
-                                                          size,
-                                                          availableOtherDir);
-}
-
-wxSize wxWindowBase::GetEffectiveMinSize() const
-{
-    // merge the best size with the min size, giving priority to the min size
-    wxSize min = GetMinSize();
-
-    if (min.x == wxDefaultCoord || min.y == wxDefaultCoord)
-    {
-        wxSize best = GetBestSize();
-        if (min.x == wxDefaultCoord) min.x =  best.x;
-        if (min.y == wxDefaultCoord) min.y =  best.y;
-    }
-
-    return min;
-}
-
-wxSize wxWindowBase::DoGetBorderSize() const
-{
-    // there is one case in which we can implement it for all ports easily
-    if ( GetBorder() == wxBORDER_NONE )
-        return wxSize(0, 0);
-
-    // otherwise use the difference between the real size and the client size
-    // as a fallback: notice that this is incorrect in general as client size
-    // also doesn't take the scrollbars into account
-    return GetSize() - GetClientSize();
-}
-
-wxSize wxWindowBase::GetBestSize() const
-{
-    if ( !m_windowSizer && m_bestSizeCache.IsFullySpecified() )
-        return m_bestSizeCache;
-
-    // call DoGetBestClientSize() first, if a derived class overrides it wants
-    // it to be used
-    wxSize size = DoGetBestClientSize();
-    if ( size != wxDefaultSize )
-    {
-        size += DoGetBorderSize();
-
-        CacheBestSize(size);
-        return size;
-    }
-
-    return DoGetBestSize();
-}
-
-int wxWindowBase::GetBestHeight(int width) const
-{
-    const int height = DoGetBestClientHeight(width);
-
-    return height == wxDefaultCoord
-            ? GetBestSize().y
-            : height + DoGetBorderSize().y;
-}
-
-int wxWindowBase::GetBestWidth(int height) const
-{
-    const int width = DoGetBestClientWidth(height);
-
-    return width == wxDefaultCoord
-            ? GetBestSize().x
-            : width + DoGetBorderSize().x;
-}
-
-void wxWindowBase::SetMinSize(const wxSize& minSize)
-{
-    m_minWidth = minSize.x;
-    m_minHeight = minSize.y;
-}
-
-void wxWindowBase::SetMaxSize(const wxSize& maxSize)
-{
-    m_maxWidth = maxSize.x;
-    m_maxHeight = maxSize.y;
-}
-
-void wxWindowBase::SetInitialSize(const wxSize& size)
-{
-    // Set the min size to the size passed in.  This will usually either be
-    // wxDefaultSize or the size passed to this window's ctor/Create function.
-    SetMinSize(size);
-
-    // Merge the size with the best size if needed
-    wxSize best = GetEffectiveMinSize();
-
-    // If the current size doesn't match then change it
-    if (GetSize() != best)
-        SetSize(best);
-}
-
-
-// by default the origin is not shifted
-wxPoint wxWindowBase::GetClientAreaOrigin() const
-{
-    return wxPoint(0,0);
-}
-
-wxSize wxWindowBase::ClientToWindowSize(const wxSize& size) const
-{
-    const wxSize diff(GetSize() - GetClientSize());
-
-    return wxSize(size.x == -1 ? -1 : size.x + diff.x,
-                  size.y == -1 ? -1 : size.y + diff.y);
-}
-
-wxSize wxWindowBase::WindowToClientSize(const wxSize& size) const
-{
-    const wxSize diff(GetSize() - GetClientSize());
-
-    return wxSize(size.x == -1 ? -1 : size.x - diff.x,
-                  size.y == -1 ? -1 : size.y - diff.y);
-}
-
-void wxWindowBase::SetWindowVariant( wxWindowVariant variant )
-{
-    if ( m_windowVariant != variant )
-    {
-        m_windowVariant = variant;
-
-        DoSetWindowVariant(variant);
-    }
-}
-
-void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant )
-{
-    // adjust the font height to correspond to our new variant (notice that
-    // we're only called if something really changed)
-    wxFont font = GetFont();
-    int size = font.GetPointSize();
-    switch ( variant )
-    {
-        case wxWINDOW_VARIANT_NORMAL:
-            break;
-
-        case wxWINDOW_VARIANT_SMALL:
-            size = wxRound(size * 3.0 / 4.0);
-            break;
-
-        case wxWINDOW_VARIANT_MINI:
-            size = wxRound(size * 2.0 / 3.0);
-            break;
-
-        case wxWINDOW_VARIANT_LARGE:
-            size = wxRound(size * 5.0 / 4.0);
-            break;
-
-        default:
-            wxFAIL_MSG(wxT("unexpected window variant"));
-            break;
-    }
-
-    font.SetPointSize(size);
-    SetFont(font);
-}
-
-void wxWindowBase::DoSetSizeHints( int minW, int minH,
-                                   int maxW, int maxH,
-                                   int WXUNUSED(incW), int WXUNUSED(incH) )
-{
-    wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
-                    (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),
-                 wxT("min width/height must be less than max width/height!") );
-
-    m_minWidth = minW;
-    m_maxWidth = maxW;
-    m_minHeight = minH;
-    m_maxHeight = maxH;
-}
-
-
-#if WXWIN_COMPATIBILITY_2_8
-void wxWindowBase::SetVirtualSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
-                                       int WXUNUSED(maxW), int WXUNUSED(maxH))
-{
-}
-
-void wxWindowBase::SetVirtualSizeHints(const wxSize& WXUNUSED(minsize),
-                                       const wxSize& WXUNUSED(maxsize))
-{
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-void wxWindowBase::DoSetVirtualSize( int x, int y )
-{
-    m_virtualSize = wxSize(x, y);
-}
-
-wxSize wxWindowBase::DoGetVirtualSize() const
-{
-    // we should use the entire client area so if it is greater than our
-    // virtual size, expand it to fit (otherwise if the window is big enough we
-    // wouldn't be using parts of it)
-    wxSize size = GetClientSize();
-    if ( m_virtualSize.x > size.x )
-        size.x = m_virtualSize.x;
-
-    if ( m_virtualSize.y >= size.y )
-        size.y = m_virtualSize.y;
-
-    return size;
-}
-
-void wxWindowBase::DoGetScreenPosition(int *x, int *y) const
-{
-    // screen position is the same as (0, 0) in client coords for non TLWs (and
-    // TLWs override this method)
-    if ( x )
-        *x = 0;
-    if ( y )
-        *y = 0;
-
-    ClientToScreen(x, y);
-}
-
-void wxWindowBase::SendSizeEvent(int flags)
-{
-    wxSizeEvent event(GetSize(), GetId());
-    event.SetEventObject(this);
-    if ( flags & wxSEND_EVENT_POST )
-        wxPostEvent(GetEventHandler(), event);
-    else
-        HandleWindowEvent(event);
-}
-
-void wxWindowBase::SendSizeEventToParent(int flags)
-{
-    wxWindow * const parent = GetParent();
-    if ( parent && !parent->IsBeingDeleted() )
-        parent->SendSizeEvent(flags);
-}
-
-bool wxWindowBase::HasScrollbar(int orient) const
-{
-    // if scrolling in the given direction is disabled, we can't have the
-    // corresponding scrollbar no matter what
-    if ( !CanScroll(orient) )
-        return false;
-
-    const wxSize sizeVirt = GetVirtualSize();
-    const wxSize sizeClient = GetClientSize();
-
-    return orient == wxHORIZONTAL ? sizeVirt.x > sizeClient.x
-                                  : sizeVirt.y > sizeClient.y;
-}
-
-// ----------------------------------------------------------------------------
-// show/hide/enable/disable the window
-// ----------------------------------------------------------------------------
-
-bool wxWindowBase::Show(bool show)
-{
-    if ( show != m_isShown )
-    {
-        m_isShown = show;
-
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-bool wxWindowBase::IsEnabled() const
-{
-    return IsThisEnabled() && (IsTopLevel() || !GetParent() || GetParent()->IsEnabled());
-}
-
-void wxWindowBase::NotifyWindowOnEnableChange(bool enabled)
-{
-    // Under some platforms there is no need to update the window state
-    // explicitly, it will become disabled when its parent is. On other ones we
-    // do need to disable all windows recursively though.
-#ifndef wxHAS_NATIVE_ENABLED_MANAGEMENT
-    DoEnable(enabled);
-#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
-
-    OnEnabled(enabled);
-
-    // Disabling a top level window is typically done when showing a modal
-    // dialog and we don't need to disable its children in this case, they will
-    // be logically disabled anyhow (i.e. their IsEnabled() will return false)
-    // and the TLW won't accept any input for them. Moreover, explicitly
-    // disabling them would look ugly as the entire TLW would be greyed out
-    // whenever a modal dialog is shown and no native applications under any
-    // platform behave like this.
-    if ( IsTopLevel() && !enabled )
-        return;
-
-    // When disabling (or enabling back) a non-TLW window we need to
-    // recursively propagate the change of the state to its children, otherwise
-    // they would still show as enabled even though they wouldn't actually
-    // accept any input (at least under MSW where children don't accept input
-    // if any of the windows in their parent chain is enabled).
-    //
-    // Notice that we must do this even for wxHAS_NATIVE_ENABLED_MANAGEMENT
-    // platforms as we still need to call the children OnEnabled() recursively.
-    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindowBase * const child = node->GetData();
-        if ( !child->IsTopLevel() && child->IsThisEnabled() )
-            child->NotifyWindowOnEnableChange(enabled);
-    }
-}
-
-bool wxWindowBase::Enable(bool enable)
-{
-    if ( enable == IsThisEnabled() )
-        return false;
-
-    m_isEnabled = enable;
-
-    // If we call DoEnable() from NotifyWindowOnEnableChange(), we don't need
-    // to do it from here.
-#ifdef wxHAS_NATIVE_ENABLED_MANAGEMENT
-    DoEnable(enable);
-#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
-
-    NotifyWindowOnEnableChange(enable);
-
-    return true;
-}
-
-bool wxWindowBase::IsShownOnScreen() const
-{
-    // A window is shown on screen if it itself is shown and so are all its
-    // parents. But if a window is toplevel one, then its always visible on
-    // screen if IsShown() returns true, even if it has a hidden parent.
-    return IsShown() &&
-           (IsTopLevel() || GetParent() == NULL || GetParent()->IsShownOnScreen());
-}
-
-// ----------------------------------------------------------------------------
-// RTTI
-// ----------------------------------------------------------------------------
-
-bool wxWindowBase::IsTopLevel() const
-{
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// Freeze/Thaw
-// ----------------------------------------------------------------------------
-
-void wxWindowBase::Freeze()
-{
-    if ( !m_freezeCount++ )
-    {
-        // physically freeze this window:
-        DoFreeze();
-
-        // and recursively freeze all children:
-        for ( wxWindowList::iterator i = GetChildren().begin();
-              i != GetChildren().end(); ++i )
-        {
-            wxWindow *child = *i;
-            if ( child->IsTopLevel() )
-                continue;
-
-            child->Freeze();
-        }
-    }
-}
-
-void wxWindowBase::Thaw()
-{
-    wxASSERT_MSG( m_freezeCount, "Thaw() without matching Freeze()" );
-
-    if ( !--m_freezeCount )
-    {
-        // recursively thaw all children:
-        for ( wxWindowList::iterator i = GetChildren().begin();
-              i != GetChildren().end(); ++i )
-        {
-            wxWindow *child = *i;
-            if ( child->IsTopLevel() )
-                continue;
-
-            child->Thaw();
-        }
-
-        // physically thaw this window:
-        DoThaw();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// Dealing with parents and children.
-// ----------------------------------------------------------------------------
-
-bool wxWindowBase::IsDescendant(wxWindowBase* win) const
-{
-    // Iterate until we find this window in the parent chain or exhaust it.
-    while ( win )
-    {
-        if ( win == this )
-            return true;
-
-        // Stop iterating on reaching the top level window boundary.
-        if ( win->IsTopLevel() )
-            break;
-
-        win = win->GetParent();
-    }
-
-    return false;
-}
-
-void wxWindowBase::AddChild(wxWindowBase *child)
-{
-    wxCHECK_RET( child, wxT("can't add a NULL child") );
-
-    // this should never happen and it will lead to a crash later if it does
-    // because RemoveChild() will remove only one node from the children list
-    // and the other(s) one(s) will be left with dangling pointers in them
-    wxASSERT_MSG( !GetChildren().Find((wxWindow*)child), wxT("AddChild() called twice") );
-
-    GetChildren().Append((wxWindow*)child);
-    child->SetParent(this);
-
-    // adding a child while frozen will assert when thawed, so freeze it as if
-    // it had been already present when we were frozen
-    if ( IsFrozen() && !child->IsTopLevel() )
-        child->Freeze();
-}
-
-void wxWindowBase::RemoveChild(wxWindowBase *child)
-{
-    wxCHECK_RET( child, wxT("can't remove a NULL child") );
-
-    // removing a child while frozen may result in permanently frozen window
-    // if used e.g. from Reparent(), so thaw it
-    //
-    // NB: IsTopLevel() doesn't return true any more when a TLW child is being
-    //     removed from its ~wxWindowBase, so check for IsBeingDeleted() too
-    if ( IsFrozen() && !child->IsBeingDeleted() && !child->IsTopLevel() )
-        child->Thaw();
-
-    GetChildren().DeleteObject((wxWindow *)child);
-    child->SetParent(NULL);
-}
-
-bool wxWindowBase::Reparent(wxWindowBase *newParent)
-{
-    wxWindow *oldParent = GetParent();
-    if ( newParent == oldParent )
-    {
-        // nothing done
-        return false;
-    }
-
-    const bool oldEnabledState = IsEnabled();
-
-    // unlink this window from the existing parent.
-    if ( oldParent )
-    {
-        oldParent->RemoveChild(this);
-    }
-    else
-    {
-        wxTopLevelWindows.DeleteObject((wxWindow *)this);
-    }
-
-    // add it to the new one
-    if ( newParent )
-    {
-        newParent->AddChild(this);
-    }
-    else
-    {
-        wxTopLevelWindows.Append((wxWindow *)this);
-    }
-
-    // We need to notify window (and its subwindows) if by changing the parent
-    // we also change our enabled/disabled status.
-    const bool newEnabledState = IsEnabled();
-    if ( newEnabledState != oldEnabledState )
-    {
-        NotifyWindowOnEnableChange(newEnabledState);
-    }
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// event handler stuff
-// ----------------------------------------------------------------------------
-
-void wxWindowBase::SetEventHandler(wxEvtHandler *handler)
-{
-    wxCHECK_RET(handler != NULL, "SetEventHandler(NULL) called");
-
-    m_eventHandler = handler;
-}
-
-void wxWindowBase::SetNextHandler(wxEvtHandler *WXUNUSED(handler))
-{
-    // disable wxEvtHandler chain mechanism for wxWindows:
-    // wxWindow uses its own stack mechanism which doesn't mix well with wxEvtHandler's one
-
-    wxFAIL_MSG("wxWindow cannot be part of a wxEvtHandler chain");
-}
-void wxWindowBase::SetPreviousHandler(wxEvtHandler *WXUNUSED(handler))
-{
-    // we can't simply wxFAIL here as in SetNextHandler: in fact the last
-    // handler of our stack when is destroyed will be Unlink()ed and thus
-    // will call this function to update the pointer of this window...
-
-    //wxFAIL_MSG("wxWindow cannot be part of a wxEvtHandler chain");
-}
-
-void wxWindowBase::PushEventHandler(wxEvtHandler *handlerToPush)
-{
-    wxCHECK_RET( handlerToPush != NULL, "PushEventHandler(NULL) called" );
-
-    // the new handler is going to be part of the wxWindow stack of event handlers:
-    // it can't be part also of an event handler double-linked chain:
-    wxASSERT_MSG(handlerToPush->IsUnlinked(),
-        "The handler being pushed in the wxWindow stack shouldn't be part of "
-        "a wxEvtHandler chain; call Unlink() on it first");
-
-    wxEvtHandler *handlerOld = GetEventHandler();
-    wxCHECK_RET( handlerOld, "an old event handler is NULL?" );
-
-    // now use wxEvtHandler double-linked list to implement a stack:
-    handlerToPush->SetNextHandler(handlerOld);
-
-    if (handlerOld != this)
-        handlerOld->SetPreviousHandler(handlerToPush);
-
-    SetEventHandler(handlerToPush);
-
-#if wxDEBUG_LEVEL
-    // final checks of the operations done above:
-    wxASSERT_MSG( handlerToPush->GetPreviousHandler() == NULL,
-        "the first handler of the wxWindow stack should "
-        "have no previous handlers set" );
-    wxASSERT_MSG( handlerToPush->GetNextHandler() != NULL,
-        "the first handler of the wxWindow stack should "
-        "have non-NULL next handler" );
-
-    wxEvtHandler* pLast = handlerToPush;
-    while ( pLast && pLast != this )
-        pLast = pLast->GetNextHandler();
-    wxASSERT_MSG( pLast->GetNextHandler() == NULL,
-        "the last handler of the wxWindow stack should "
-        "have this window as next handler" );
-#endif // wxDEBUG_LEVEL
-}
-
-wxEvtHandler *wxWindowBase::PopEventHandler(bool deleteHandler)
-{
-    // we need to pop the wxWindow stack, i.e. we need to remove the first handler
-
-    wxEvtHandler *firstHandler = GetEventHandler();
-    wxCHECK_MSG( firstHandler != NULL, NULL, "wxWindow cannot have a NULL event handler" );
-    wxCHECK_MSG( firstHandler != this, NULL, "cannot pop the wxWindow itself" );
-    wxCHECK_MSG( firstHandler->GetPreviousHandler() == NULL, NULL,
-        "the first handler of the wxWindow stack should have no previous handlers set" );
-
-    wxEvtHandler *secondHandler = firstHandler->GetNextHandler();
-    wxCHECK_MSG( secondHandler != NULL, NULL,
-        "the first handler of the wxWindow stack should have non-NULL next handler" );
-
-    firstHandler->SetNextHandler(NULL);
-
-    // It is harmless but useless to unset the previous handler of the window
-    // itself as it's always NULL anyhow, so don't do this.
-    if ( secondHandler != this )
-        secondHandler->SetPreviousHandler(NULL);
-
-    // now firstHandler is completely unlinked; set secondHandler as the new window event handler
-    SetEventHandler(secondHandler);
-
-    if ( deleteHandler )
-    {
-        wxDELETE(firstHandler);
-    }
-
-    return firstHandler;
-}
-
-bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handlerToRemove)
-{
-    wxCHECK_MSG( handlerToRemove != NULL, false, "RemoveEventHandler(NULL) called" );
-    wxCHECK_MSG( handlerToRemove != this, false, "Cannot remove the window itself" );
-
-    if (handlerToRemove == GetEventHandler())
-    {
-        // removing the first event handler is equivalent to "popping" the stack
-        PopEventHandler(false);
-        return true;
-    }
-
-    // NOTE: the wxWindow event handler list is always terminated with "this" handler
-    wxEvtHandler *handlerCur = GetEventHandler()->GetNextHandler();
-    while ( handlerCur != this && handlerCur )
-    {
-        wxEvtHandler *handlerNext = handlerCur->GetNextHandler();
-
-        if ( handlerCur == handlerToRemove )
-        {
-            handlerCur->Unlink();
-
-            wxASSERT_MSG( handlerCur != GetEventHandler(),
-                        "the case Remove == Pop should was already handled" );
-            return true;
-        }
-
-        handlerCur = handlerNext;
-    }
-
-    wxFAIL_MSG( wxT("where has the event handler gone?") );
-
-    return false;
-}
-
-bool wxWindowBase::HandleWindowEvent(wxEvent& event) const
-{
-    // SafelyProcessEvent() will handle exceptions nicely
-    return GetEventHandler()->SafelyProcessEvent(event);
-}
-
-// ----------------------------------------------------------------------------
-// colours, fonts &c
-// ----------------------------------------------------------------------------
-
-void wxWindowBase::InheritAttributes()
-{
-    const wxWindowBase * const parent = GetParent();
-    if ( !parent )
-        return;
-
-    // we only inherit attributes which had been explicitly set for the parent
-    // which ensures that this only happens if the user really wants it and
-    // not by default which wouldn't make any sense in modern GUIs where the
-    // controls don't all use the same fonts (nor colours)
-    if ( parent->m_inheritFont && !m_hasFont )
-        SetFont(parent->GetFont());
-
-    // in addition, there is a possibility to explicitly forbid inheriting
-    // colours at each class level by overriding ShouldInheritColours()
-    if ( ShouldInheritColours() )
-    {
-        if ( parent->m_inheritFgCol && !m_hasFgCol )
-            SetForegroundColour(parent->GetForegroundColour());
-
-        // inheriting (solid) background colour is wrong as it totally breaks
-        // any kind of themed backgrounds
-        //
-        // instead, the controls should use the same background as their parent
-        // (ideally by not drawing it at all)
-#if 0
-        if ( parent->m_inheritBgCol && !m_hasBgCol )
-            SetBackgroundColour(parent->GetBackgroundColour());
-#endif // 0
-    }
-}
-
-/* static */ wxVisualAttributes
-wxWindowBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
-{
-    // it is important to return valid values for all attributes from here,
-    // GetXXX() below rely on this
-    wxVisualAttributes attrs;
-    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-
-    // On Smartphone/PocketPC, wxSYS_COLOUR_WINDOW is a better reflection of
-    // the usual background colour than wxSYS_COLOUR_BTNFACE.
-    // It's a pity that wxSYS_COLOUR_WINDOW isn't always a suitable background
-    // colour on other platforms.
-
-#if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
-    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-#else
-    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
-#endif
-    return attrs;
-}
-
-wxColour wxWindowBase::GetBackgroundColour() const
-{
-    if ( !m_backgroundColour.IsOk() )
-    {
-        wxASSERT_MSG( !m_hasBgCol, wxT("we have invalid explicit bg colour?") );
-
-        // get our default background colour
-        wxColour colBg = GetDefaultAttributes().colBg;
-
-        // we must return some valid colour to avoid redoing this every time
-        // and also to avoid surprising the applications written for older
-        // wxWidgets versions where GetBackgroundColour() always returned
-        // something -- so give them something even if it doesn't make sense
-        // for this window (e.g. it has a themed background)
-        if ( !colBg.IsOk() )
-            colBg = GetClassDefaultAttributes().colBg;
-
-        return colBg;
-    }
-    else
-        return m_backgroundColour;
-}
-
-wxColour wxWindowBase::GetForegroundColour() const
-{
-    // logic is the same as above
-    if ( !m_hasFgCol && !m_foregroundColour.IsOk() )
-    {
-        wxColour colFg = GetDefaultAttributes().colFg;
-
-        if ( !colFg.IsOk() )
-            colFg = GetClassDefaultAttributes().colFg;
-
-        return colFg;
-    }
-    else
-        return m_foregroundColour;
-}
-
-bool wxWindowBase::SetBackgroundStyle(wxBackgroundStyle style)
-{
-    // The checks below shouldn't be triggered if we're not really changing the
-    // style.
-    if ( style == m_backgroundStyle )
-        return true;
-
-    // Transparent background style can be only set before creation because of
-    // wxGTK limitation.
-    wxCHECK_MSG( (style != wxBG_STYLE_TRANSPARENT) || !GetHandle(),
-                 false,
-                 "wxBG_STYLE_TRANSPARENT style can only be set before "
-                 "Create()-ing the window." );
-
-    // And once it is set, wxBG_STYLE_TRANSPARENT can't be unset.
-    wxCHECK_MSG( (m_backgroundStyle != wxBG_STYLE_TRANSPARENT) ||
-                 (style == wxBG_STYLE_TRANSPARENT),
-                 false,
-                 "wxBG_STYLE_TRANSPARENT can't be unset once it was set." );
-
-    m_backgroundStyle = style;
-
-    return true;
-}
-
-bool wxWindowBase::IsTransparentBackgroundSupported(wxString *reason) const
-{
-    if ( reason )
-        *reason = _("This platform does not support background transparency.");
-
-    return false;
-}
-
-bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
-{
-    if ( colour == m_backgroundColour )
-        return false;
-
-    m_hasBgCol = colour.IsOk();
-
-    m_inheritBgCol = m_hasBgCol;
-    m_backgroundColour = colour;
-    SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.IsOk() );
-    return true;
-}
-
-bool wxWindowBase::SetForegroundColour( const wxColour &colour )
-{
-    if (colour == m_foregroundColour )
-        return false;
-
-    m_hasFgCol = colour.IsOk();
-    m_inheritFgCol = m_hasFgCol;
-    m_foregroundColour = colour;
-    SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.IsOk() );
-    return true;
-}
-
-bool wxWindowBase::SetCursor(const wxCursor& cursor)
-{
-    // setting an invalid cursor is ok, it means that we don't have any special
-    // cursor
-    if ( m_cursor.IsSameAs(cursor) )
-    {
-        // no change
-        return false;
-    }
-
-    m_cursor = cursor;
-
-    return true;
-}
-
-wxFont wxWindowBase::GetFont() const
-{
-    // logic is the same as in GetBackgroundColour()
-    if ( !m_font.IsOk() )
-    {
-        wxASSERT_MSG( !m_hasFont, wxT("we have invalid explicit font?") );
-
-        wxFont font = GetDefaultAttributes().font;
-        if ( !font.IsOk() )
-            font = GetClassDefaultAttributes().font;
-
-        return font;
-    }
-    else
-        return m_font;
-}
-
-bool wxWindowBase::SetFont(const wxFont& font)
-{
-    if ( font == m_font )
-    {
-        // no change
-        return false;
-    }
-
-    m_font = font;
-    m_hasFont = font.IsOk();
-    m_inheritFont = m_hasFont;
-
-    InvalidateBestSize();
-
-    return true;
-}
-
-#if wxUSE_PALETTE
-
-void wxWindowBase::SetPalette(const wxPalette& pal)
-{
-    m_hasCustomPalette = true;
-    m_palette = pal;
-
-    // VZ: can anyone explain me what do we do here?
-    wxWindowDC d((wxWindow *) this);
-    d.SetPalette(pal);
-}
-
-wxWindow *wxWindowBase::GetAncestorWithCustomPalette() const
-{
-    wxWindow *win = (wxWindow *)this;
-    while ( win && !win->HasCustomPalette() )
-    {
-        win = win->GetParent();
-    }
-
-    return win;
-}
-
-#endif // wxUSE_PALETTE
-
-#if wxUSE_CARET
-void wxWindowBase::SetCaret(wxCaret *caret)
-{
-    if ( m_caret )
-    {
-        delete m_caret;
-    }
-
-    m_caret = caret;
-
-    if ( m_caret )
-    {
-        wxASSERT_MSG( m_caret->GetWindow() == this,
-                      wxT("caret should be created associated to this window") );
-    }
-}
-#endif // wxUSE_CARET
-
-#if wxUSE_VALIDATORS
-// ----------------------------------------------------------------------------
-// validators
-// ----------------------------------------------------------------------------
-
-void wxWindowBase::SetValidator(const wxValidator& validator)
-{
-    if ( m_windowValidator )
-        delete m_windowValidator;
-
-    m_windowValidator = (wxValidator *)validator.Clone();
-
-    if ( m_windowValidator )
-        m_windowValidator->SetWindow(this);
-}
-#endif // wxUSE_VALIDATORS
-
-// ----------------------------------------------------------------------------
-// update region stuff
-// ----------------------------------------------------------------------------
-
-wxRect wxWindowBase::GetUpdateClientRect() const
-{
-    wxRegion rgnUpdate = GetUpdateRegion();
-    rgnUpdate.Intersect(GetClientRect());
-    wxRect rectUpdate = rgnUpdate.GetBox();
-    wxPoint ptOrigin = GetClientAreaOrigin();
-    rectUpdate.x -= ptOrigin.x;
-    rectUpdate.y -= ptOrigin.y;
-
-    return rectUpdate;
-}
-
-bool wxWindowBase::DoIsExposed(int x, int y) const
-{
-    return m_updateRegion.Contains(x, y) != wxOutRegion;
-}
-
-bool wxWindowBase::DoIsExposed(int x, int y, int w, int h) const
-{
-    return m_updateRegion.Contains(x, y, w, h) != wxOutRegion;
-}
-
-void wxWindowBase::ClearBackground()
-{
-    // wxGTK uses its own version, no need to add never used code
-#ifndef __WXGTK__
-    wxClientDC dc((wxWindow *)this);
-    wxBrush brush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID);
-    dc.SetBackground(brush);
-    dc.Clear();
-#endif // __WXGTK__
-}
-
-// ----------------------------------------------------------------------------
-// find child window by id or name
-// ----------------------------------------------------------------------------
-
-wxWindow *wxWindowBase::FindWindow(long id) const
-{
-    if ( id == m_windowId )
-        return (wxWindow *)this;
-
-    wxWindowBase *res = NULL;
-    wxWindowList::compatibility_iterator node;
-    for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
-    {
-        wxWindowBase *child = node->GetData();
-        res = child->FindWindow( id );
-    }
-
-    return (wxWindow *)res;
-}
-
-wxWindow *wxWindowBase::FindWindow(const wxString& name) const
-{
-    if ( name == m_windowName )
-        return (wxWindow *)this;
-
-    wxWindowBase *res = NULL;
-    wxWindowList::compatibility_iterator node;
-    for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
-    {
-        wxWindow *child = node->GetData();
-        res = child->FindWindow(name);
-    }
-
-    return (wxWindow *)res;
-}
-
-
-// find any window by id or name or label: If parent is non-NULL, look through
-// children for a label or title matching the specified string. If NULL, look
-// through all top-level windows.
-//
-// to avoid duplicating code we reuse the same helper function but with
-// different comparators
-
-typedef bool (*wxFindWindowCmp)(const wxWindow *win,
-                                const wxString& label, long id);
-
-static
-bool wxFindWindowCmpLabels(const wxWindow *win, const wxString& label,
-                           long WXUNUSED(id))
-{
-    return win->GetLabel() == label;
-}
-
-static
-bool wxFindWindowCmpNames(const wxWindow *win, const wxString& label,
-                          long WXUNUSED(id))
-{
-    return win->GetName() == label;
-}
-
-static
-bool wxFindWindowCmpIds(const wxWindow *win, const wxString& WXUNUSED(label),
-                        long id)
-{
-    return win->GetId() == id;
-}
-
-// recursive helper for the FindWindowByXXX() functions
-static
-wxWindow *wxFindWindowRecursively(const wxWindow *parent,
-                                  const wxString& label,
-                                  long id,
-                                  wxFindWindowCmp cmp)
-{
-    if ( parent )
-    {
-        // see if this is the one we're looking for
-        if ( (*cmp)(parent, label, id) )
-            return (wxWindow *)parent;
-
-        // It wasn't, so check all its children
-        for ( wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            // recursively check each child
-            wxWindow *win = (wxWindow *)node->GetData();
-            wxWindow *retwin = wxFindWindowRecursively(win, label, id, cmp);
-            if (retwin)
-                return retwin;
-        }
-    }
-
-    // Not found
-    return NULL;
-}
-
-// helper for FindWindowByXXX()
-static
-wxWindow *wxFindWindowHelper(const wxWindow *parent,
-                             const wxString& label,
-                             long id,
-                             wxFindWindowCmp cmp)
-{
-    if ( parent )
-    {
-        // just check parent and all its children
-        return wxFindWindowRecursively(parent, label, id, cmp);
-    }
-
-    // start at very top of wx's windows
-    for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        // recursively check each window & its children
-        wxWindow *win = node->GetData();
-        wxWindow *retwin = wxFindWindowRecursively(win, label, id, cmp);
-        if (retwin)
-            return retwin;
-    }
-
-    return NULL;
-}
-
-/* static */
-wxWindow *
-wxWindowBase::FindWindowByLabel(const wxString& title, const wxWindow *parent)
-{
-    return wxFindWindowHelper(parent, title, 0, wxFindWindowCmpLabels);
-}
-
-/* static */
-wxWindow *
-wxWindowBase::FindWindowByName(const wxString& title, const wxWindow *parent)
-{
-    wxWindow *win = wxFindWindowHelper(parent, title, 0, wxFindWindowCmpNames);
-
-    if ( !win )
-    {
-        // fall back to the label
-        win = FindWindowByLabel(title, parent);
-    }
-
-    return win;
-}
-
-/* static */
-wxWindow *
-wxWindowBase::FindWindowById( long id, const wxWindow* parent )
-{
-    return wxFindWindowHelper(parent, wxEmptyString, id, wxFindWindowCmpIds);
-}
-
-// ----------------------------------------------------------------------------
-// dialog oriented functions
-// ----------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-void wxWindowBase::MakeModal(bool modal)
-{
-    // Disable all other windows
-    if ( IsTopLevel() )
-    {
-        wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
-        while (node)
-        {
-            wxWindow *win = node->GetData();
-            if (win != this)
-                win->Enable(!modal);
-
-            node = node->GetNext();
-        }
-    }
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-bool wxWindowBase::Validate()
-{
-#if wxUSE_VALIDATORS
-    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
-
-    wxWindowList::compatibility_iterator node;
-    for ( node = m_children.GetFirst(); node; node = node->GetNext() )
-    {
-        wxWindowBase *child = node->GetData();
-        wxValidator *validator = child->GetValidator();
-        if ( validator && !validator->Validate((wxWindow *)this) )
-        {
-            return false;
-        }
-
-        if ( recurse && !child->Validate() )
-        {
-            return false;
-        }
-    }
-#endif // wxUSE_VALIDATORS
-
-    return true;
-}
-
-bool wxWindowBase::TransferDataToWindow()
-{
-#if wxUSE_VALIDATORS
-    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
-
-    wxWindowList::compatibility_iterator node;
-    for ( node = m_children.GetFirst(); node; node = node->GetNext() )
-    {
-        wxWindowBase *child = node->GetData();
-        wxValidator *validator = child->GetValidator();
-        if ( validator && !validator->TransferToWindow() )
-        {
-            wxLogWarning(_("Could not transfer data to window"));
-#if wxUSE_LOG
-            wxLog::FlushActive();
-#endif // wxUSE_LOG
-
-            return false;
-        }
-
-        if ( recurse )
-        {
-            if ( !child->TransferDataToWindow() )
-            {
-                // warning already given
-                return false;
-            }
-        }
-    }
-#endif // wxUSE_VALIDATORS
-
-    return true;
-}
-
-bool wxWindowBase::TransferDataFromWindow()
-{
-#if wxUSE_VALIDATORS
-    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
-
-    wxWindowList::compatibility_iterator node;
-    for ( node = m_children.GetFirst(); node; node = node->GetNext() )
-    {
-        wxWindow *child = node->GetData();
-        wxValidator *validator = child->GetValidator();
-        if ( validator && !validator->TransferFromWindow() )
-        {
-            // nop warning here because the application is supposed to give
-            // one itself - we don't know here what might have gone wrongly
-
-            return false;
-        }
-
-        if ( recurse )
-        {
-            if ( !child->TransferDataFromWindow() )
-            {
-                // warning already given
-                return false;
-            }
-        }
-    }
-#endif // wxUSE_VALIDATORS
-
-    return true;
-}
-
-void wxWindowBase::InitDialog()
-{
-    wxInitDialogEvent event(GetId());
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(event);
-}
-
-// ----------------------------------------------------------------------------
-// context-sensitive help support
-// ----------------------------------------------------------------------------
-
-#if wxUSE_HELP
-
-// associate this help text with this window
-void wxWindowBase::SetHelpText(const wxString& text)
-{
-    wxHelpProvider *helpProvider = wxHelpProvider::Get();
-    if ( helpProvider )
-    {
-        helpProvider->AddHelp(this, text);
-    }
-}
-
-#if WXWIN_COMPATIBILITY_2_8
-// associate this help text with all windows with the same id as this
-// one
-void wxWindowBase::SetHelpTextForId(const wxString& text)
-{
-    wxHelpProvider *helpProvider = wxHelpProvider::Get();
-    if ( helpProvider )
-    {
-        helpProvider->AddHelp(GetId(), text);
-    }
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
-// get the help string associated with this window (may be empty)
-// default implementation forwards calls to the help provider
-wxString
-wxWindowBase::GetHelpTextAtPoint(const wxPoint & WXUNUSED(pt),
-                                 wxHelpEvent::Origin WXUNUSED(origin)) const
-{
-    wxString text;
-    wxHelpProvider *helpProvider = wxHelpProvider::Get();
-    if ( helpProvider )
-    {
-        text = helpProvider->GetHelp(this);
-    }
-
-    return text;
-}
-
-// show help for this window
-void wxWindowBase::OnHelp(wxHelpEvent& event)
-{
-    wxHelpProvider *helpProvider = wxHelpProvider::Get();
-    if ( helpProvider )
-    {
-        wxPoint pos = event.GetPosition();
-        const wxHelpEvent::Origin origin = event.GetOrigin();
-        if ( origin == wxHelpEvent::Origin_Keyboard )
-        {
-            // if the help event was generated from keyboard it shouldn't
-            // appear at the mouse position (which is still the only position
-            // associated with help event) if the mouse is far away, although
-            // we still do use the mouse position if it's over the window
-            // because we suppose the user looks approximately at the mouse
-            // already and so it would be more convenient than showing tooltip
-            // at some arbitrary position which can be quite far from it
-            const wxRect rectClient = GetClientRect();
-            if ( !rectClient.Contains(ScreenToClient(pos)) )
-            {
-                // position help slightly under and to the right of this window
-                pos = ClientToScreen(wxPoint(
-                        2*GetCharWidth(),
-                        rectClient.height + GetCharHeight()
-                      ));
-            }
-        }
-
-        if ( helpProvider->ShowHelpAtPoint(this, pos, origin) )
-        {
-            // skip the event.Skip() below
-            return;
-        }
-    }
-
-    event.Skip();
-}
-
-#endif // wxUSE_HELP
-
-// ----------------------------------------------------------------------------
-// tooltips
-// ----------------------------------------------------------------------------
-
-#if wxUSE_TOOLTIPS
-
-wxString wxWindowBase::GetToolTipText() const
-{
-    return m_tooltip ? m_tooltip->GetTip() : wxString();
-}
-
-void wxWindowBase::SetToolTip( const wxString &tip )
-{
-    // don't create the new tooltip if we already have one
-    if ( m_tooltip )
-    {
-        m_tooltip->SetTip( tip );
-    }
-    else
-    {
-        SetToolTip( new wxToolTip( tip ) );
-    }
-
-    // setting empty tooltip text does not remove the tooltip any more - use
-    // SetToolTip(NULL) for this
-}
-
-void wxWindowBase::DoSetToolTip(wxToolTip *tooltip)
-{
-    if ( m_tooltip != tooltip )
-    {
-        if ( m_tooltip )
-            delete m_tooltip;
-
-        m_tooltip = tooltip;
-    }
-}
-
-bool wxWindowBase::CopyToolTip(wxToolTip *tip)
-{
-    SetToolTip(tip ? new wxToolTip(tip->GetTip()) : NULL);
-
-    return tip != NULL;
-}
-
-#endif // wxUSE_TOOLTIPS
-
-// ----------------------------------------------------------------------------
-// constraints and sizers
-// ----------------------------------------------------------------------------
-
-#if wxUSE_CONSTRAINTS
-
-void wxWindowBase::SetConstraints( wxLayoutConstraints *constraints )
-{
-    if ( m_constraints )
-    {
-        UnsetConstraints(m_constraints);
-        delete m_constraints;
-    }
-    m_constraints = constraints;
-    if ( m_constraints )
-    {
-        // Make sure other windows know they're part of a 'meaningful relationship'
-        if ( m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this) )
-            m_constraints->left.GetOtherWindow()->AddConstraintReference(this);
-        if ( m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this) )
-            m_constraints->top.GetOtherWindow()->AddConstraintReference(this);
-        if ( m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this) )
-            m_constraints->right.GetOtherWindow()->AddConstraintReference(this);
-        if ( m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this) )
-            m_constraints->bottom.GetOtherWindow()->AddConstraintReference(this);
-        if ( m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this) )
-            m_constraints->width.GetOtherWindow()->AddConstraintReference(this);
-        if ( m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this) )
-            m_constraints->height.GetOtherWindow()->AddConstraintReference(this);
-        if ( m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this) )
-            m_constraints->centreX.GetOtherWindow()->AddConstraintReference(this);
-        if ( m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this) )
-            m_constraints->centreY.GetOtherWindow()->AddConstraintReference(this);
-    }
-}
-
-// This removes any dangling pointers to this window in other windows'
-// constraintsInvolvedIn lists.
-void wxWindowBase::UnsetConstraints(wxLayoutConstraints *c)
-{
-    if ( c )
-    {
-        if ( c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this) )
-            c->left.GetOtherWindow()->RemoveConstraintReference(this);
-        if ( c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this) )
-            c->top.GetOtherWindow()->RemoveConstraintReference(this);
-        if ( c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this) )
-            c->right.GetOtherWindow()->RemoveConstraintReference(this);
-        if ( c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this) )
-            c->bottom.GetOtherWindow()->RemoveConstraintReference(this);
-        if ( c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this) )
-            c->width.GetOtherWindow()->RemoveConstraintReference(this);
-        if ( c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this) )
-            c->height.GetOtherWindow()->RemoveConstraintReference(this);
-        if ( c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this) )
-            c->centreX.GetOtherWindow()->RemoveConstraintReference(this);
-        if ( c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this) )
-            c->centreY.GetOtherWindow()->RemoveConstraintReference(this);
-    }
-}
-
-// Back-pointer to other windows we're involved with, so if we delete this
-// window, we must delete any constraints we're involved with.
-void wxWindowBase::AddConstraintReference(wxWindowBase *otherWin)
-{
-    if ( !m_constraintsInvolvedIn )
-        m_constraintsInvolvedIn = new wxWindowList;
-    if ( !m_constraintsInvolvedIn->Find((wxWindow *)otherWin) )
-        m_constraintsInvolvedIn->Append((wxWindow *)otherWin);
-}
-
-// REMOVE back-pointer to other windows we're involved with.
-void wxWindowBase::RemoveConstraintReference(wxWindowBase *otherWin)
-{
-    if ( m_constraintsInvolvedIn )
-        m_constraintsInvolvedIn->DeleteObject((wxWindow *)otherWin);
-}
-
-// Reset any constraints that mention this window
-void wxWindowBase::DeleteRelatedConstraints()
-{
-    if ( m_constraintsInvolvedIn )
-    {
-        wxWindowList::compatibility_iterator node = m_constraintsInvolvedIn->GetFirst();
-        while (node)
-        {
-            wxWindow *win = node->GetData();
-            wxLayoutConstraints *constr = win->GetConstraints();
-
-            // Reset any constraints involving this window
-            if ( constr )
-            {
-                constr->left.ResetIfWin(this);
-                constr->top.ResetIfWin(this);
-                constr->right.ResetIfWin(this);
-                constr->bottom.ResetIfWin(this);
-                constr->width.ResetIfWin(this);
-                constr->height.ResetIfWin(this);
-                constr->centreX.ResetIfWin(this);
-                constr->centreY.ResetIfWin(this);
-            }
-
-            wxWindowList::compatibility_iterator next = node->GetNext();
-            m_constraintsInvolvedIn->Erase(node);
-            node = next;
-        }
-
-        wxDELETE(m_constraintsInvolvedIn);
-    }
-}
-
-#endif // wxUSE_CONSTRAINTS
-
-void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld)
-{
-    if ( sizer == m_windowSizer)
-        return;
-
-    if ( m_windowSizer )
-    {
-        m_windowSizer->SetContainingWindow(NULL);
-
-        if ( deleteOld )
-            delete m_windowSizer;
-    }
-
-    m_windowSizer = sizer;
-    if ( m_windowSizer )
-    {
-        m_windowSizer->SetContainingWindow((wxWindow *)this);
-    }
-
-    SetAutoLayout(m_windowSizer != NULL);
-}
-
-void wxWindowBase::SetSizerAndFit(wxSizer *sizer, bool deleteOld)
-{
-    SetSizer( sizer, deleteOld );
-    sizer->SetSizeHints( (wxWindow*) this );
-}
-
-
-void wxWindowBase::SetContainingSizer(wxSizer* sizer)
-{
-    // adding a window to a sizer twice is going to result in fatal and
-    // hard to debug problems later because when deleting the second
-    // associated wxSizerItem we're going to dereference a dangling
-    // pointer; so try to detect this as early as possible
-    wxASSERT_MSG( !sizer || m_containingSizer != sizer,
-                  wxT("Adding a window to the same sizer twice?") );
-
-    m_containingSizer = sizer;
-}
-
-#if wxUSE_CONSTRAINTS
-
-void wxWindowBase::SatisfyConstraints()
-{
-    wxLayoutConstraints *constr = GetConstraints();
-    bool wasOk = constr && constr->AreSatisfied();
-
-    ResetConstraints();   // Mark all constraints as unevaluated
-
-    int noChanges = 1;
-
-    // if we're a top level panel (i.e. our parent is frame/dialog), our
-    // own constraints will never be satisfied any more unless we do it
-    // here
-    if ( wasOk )
-    {
-        while ( noChanges > 0 )
-        {
-            LayoutPhase1(&noChanges);
-        }
-    }
-
-    LayoutPhase2(&noChanges);
-}
-
-#endif // wxUSE_CONSTRAINTS
-
-bool wxWindowBase::Layout()
-{
-    // If there is a sizer, use it instead of the constraints
-    if ( GetSizer() )
-    {
-        int w = 0, h = 0;
-        GetVirtualSize(&w, &h);
-        GetSizer()->SetDimension( 0, 0, w, h );
-    }
-#if wxUSE_CONSTRAINTS
-    else
-    {
-        SatisfyConstraints(); // Find the right constraints values
-        SetConstraintSizes(); // Recursively set the real window sizes
-    }
-#endif
-
-    return true;
-}
-
-void wxWindowBase::InternalOnSize(wxSizeEvent& event)
-{
-    if ( GetAutoLayout() )
-        Layout();
-
-    event.Skip();
-}
-
-#if wxUSE_CONSTRAINTS
-
-// first phase of the constraints evaluation: set our own constraints
-bool wxWindowBase::LayoutPhase1(int *noChanges)
-{
-    wxLayoutConstraints *constr = GetConstraints();
-
-    return !constr || constr->SatisfyConstraints(this, noChanges);
-}
-
-// second phase: set the constraints for our children
-bool wxWindowBase::LayoutPhase2(int *noChanges)
-{
-    *noChanges = 0;
-
-    // Layout children
-    DoPhase(1);
-
-    // Layout grand children
-    DoPhase(2);
-
-    return true;
-}
-
-// Do a phase of evaluating child constraints
-bool wxWindowBase::DoPhase(int phase)
-{
-    // the list containing the children for which the constraints are already
-    // set correctly
-    wxWindowList succeeded;
-
-    // the max number of iterations we loop before concluding that we can't set
-    // the constraints
-    static const int maxIterations = 500;
-
-    for ( int noIterations = 0; noIterations < maxIterations; noIterations++ )
-    {
-        int noChanges = 0;
-
-        // loop over all children setting their constraints
-        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
-        {
-            wxWindow *child = node->GetData();
-            if ( child->IsTopLevel() )
-            {
-                // top level children are not inside our client area
-                continue;
-            }
-
-            if ( !child->GetConstraints() || succeeded.Find(child) )
-            {
-                // this one is either already ok or nothing we can do about it
-                continue;
-            }
-
-            int tempNoChanges = 0;
-            bool success = phase == 1 ? child->LayoutPhase1(&tempNoChanges)
-                                      : child->LayoutPhase2(&tempNoChanges);
-            noChanges += tempNoChanges;
-
-            if ( success )
-            {
-                succeeded.Append(child);
-            }
-        }
-
-        if ( !noChanges )
-        {
-            // constraints are set
-            break;
-        }
-    }
-
-    return true;
-}
-
-void wxWindowBase::ResetConstraints()
-{
-    wxLayoutConstraints *constr = GetConstraints();
-    if ( constr )
-    {
-        constr->left.SetDone(false);
-        constr->top.SetDone(false);
-        constr->right.SetDone(false);
-        constr->bottom.SetDone(false);
-        constr->width.SetDone(false);
-        constr->height.SetDone(false);
-        constr->centreX.SetDone(false);
-        constr->centreY.SetDone(false);
-    }
-
-    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-    while (node)
-    {
-        wxWindow *win = node->GetData();
-        if ( !win->IsTopLevel() )
-            win->ResetConstraints();
-        node = node->GetNext();
-    }
-}
-
-// Need to distinguish between setting the 'fake' size for windows and sizers,
-// and setting the real values.
-void wxWindowBase::SetConstraintSizes(bool recurse)
-{
-    wxLayoutConstraints *constr = GetConstraints();
-    if ( constr && constr->AreSatisfied() )
-    {
-        int x = constr->left.GetValue();
-        int y = constr->top.GetValue();
-        int w = constr->width.GetValue();
-        int h = constr->height.GetValue();
-
-        if ( (constr->width.GetRelationship() != wxAsIs ) ||
-             (constr->height.GetRelationship() != wxAsIs) )
-        {
-            // We really shouldn't set negative sizes for the windows so make
-            // them at least of 1*1 size
-            SetSize(x, y, w > 0 ? w : 1, h > 0 ? h : 1);
-        }
-        else
-        {
-            // If we don't want to resize this window, just move it...
-            Move(x, y);
-        }
-    }
-    else if ( constr )
-    {
-        wxLogDebug(wxT("Constraints not satisfied for %s named '%s'."),
-                   GetClassInfo()->GetClassName(),
-                   GetName().c_str());
-    }
-
-    if ( recurse )
-    {
-        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-        while (node)
-        {
-            wxWindow *win = node->GetData();
-            if ( !win->IsTopLevel() && win->GetConstraints() )
-                win->SetConstraintSizes();
-            node = node->GetNext();
-        }
-    }
-}
-
-// Only set the size/position of the constraint (if any)
-void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
-{
-    wxLayoutConstraints *constr = GetConstraints();
-    if ( constr )
-    {
-        if ( x != wxDefaultCoord )
-        {
-            constr->left.SetValue(x);
-            constr->left.SetDone(true);
-        }
-        if ( y != wxDefaultCoord )
-        {
-            constr->top.SetValue(y);
-            constr->top.SetDone(true);
-        }
-        if ( w != wxDefaultCoord )
-        {
-            constr->width.SetValue(w);
-            constr->width.SetDone(true);
-        }
-        if ( h != wxDefaultCoord )
-        {
-            constr->height.SetValue(h);
-            constr->height.SetDone(true);
-        }
-    }
-}
-
-void wxWindowBase::MoveConstraint(int x, int y)
-{
-    wxLayoutConstraints *constr = GetConstraints();
-    if ( constr )
-    {
-        if ( x != wxDefaultCoord )
-        {
-            constr->left.SetValue(x);
-            constr->left.SetDone(true);
-        }
-        if ( y != wxDefaultCoord )
-        {
-            constr->top.SetValue(y);
-            constr->top.SetDone(true);
-        }
-    }
-}
-
-void wxWindowBase::GetSizeConstraint(int *w, int *h) const
-{
-    wxLayoutConstraints *constr = GetConstraints();
-    if ( constr )
-    {
-        *w = constr->width.GetValue();
-        *h = constr->height.GetValue();
-    }
-    else
-        GetSize(w, h);
-}
-
-void wxWindowBase::GetClientSizeConstraint(int *w, int *h) const
-{
-    wxLayoutConstraints *constr = GetConstraints();
-    if ( constr )
-    {
-        *w = constr->width.GetValue();
-        *h = constr->height.GetValue();
-    }
-    else
-        GetClientSize(w, h);
-}
-
-void wxWindowBase::GetPositionConstraint(int *x, int *y) const
-{
-    wxLayoutConstraints *constr = GetConstraints();
-    if ( constr )
-    {
-        *x = constr->left.GetValue();
-        *y = constr->top.GetValue();
-    }
-    else
-        GetPosition(x, y);
-}
-
-#endif // wxUSE_CONSTRAINTS
-
-void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) const
-{
-    wxWindow *parent = GetParent();
-    if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent )
-    {
-        wxPoint pt(parent->GetClientAreaOrigin());
-        x += pt.x;
-        y += pt.y;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// Update UI processing
-// ----------------------------------------------------------------------------
-
-void wxWindowBase::UpdateWindowUI(long flags)
-{
-    wxUpdateUIEvent event(GetId());
-    event.SetEventObject(this);
-
-    if ( GetEventHandler()->ProcessEvent(event) )
-    {
-        DoUpdateWindowUI(event);
-    }
-
-    if (flags & wxUPDATE_UI_RECURSE)
-    {
-        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-        while (node)
-        {
-            wxWindow* child = (wxWindow*) node->GetData();
-            child->UpdateWindowUI(flags);
-            node = node->GetNext();
-        }
-    }
-}
-
-// do the window-specific processing after processing the update event
-void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
-{
-    if ( event.GetSetEnabled() )
-        Enable(event.GetEnabled());
-
-    if ( event.GetSetShown() )
-        Show(event.GetShown());
-}
-
-// ----------------------------------------------------------------------------
-// Idle processing
-// ----------------------------------------------------------------------------
-
-// Send idle event to window and all subwindows
-bool wxWindowBase::SendIdleEvents(wxIdleEvent& event)
-{
-    bool needMore = false;
-
-    OnInternalIdle();
-
-    // should we send idle event to this window?
-    if (wxIdleEvent::GetMode() == wxIDLE_PROCESS_ALL ||
-        HasExtraStyle(wxWS_EX_PROCESS_IDLE))
-    {
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
-
-        if (event.MoreRequested())
-            needMore = true;
-    }
-    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-    for (; node; node = node->GetNext())
-    {
-        wxWindow* child = node->GetData();
-        if (child->SendIdleEvents(event))
-            needMore = true;
-    }
-
-    return needMore;
-}
-
-void wxWindowBase::OnInternalIdle()
-{
-    if ( wxUpdateUIEvent::CanUpdate(this) )
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
-// ----------------------------------------------------------------------------
-// dialog units translations
-// ----------------------------------------------------------------------------
-
-// Windows' computes dialog units using average character width over upper-
-// and lower-case ASCII alphabet and not using the average character width
-// metadata stored in the font; see
-// http://support.microsoft.com/default.aspx/kb/145994 for detailed discussion.
-// It's important that we perform the conversion in identical way, because
-// dialog units natively exist only on Windows and Windows HIG is expressed
-// using them.
-wxSize wxWindowBase::GetDlgUnitBase() const
-{
-    const wxWindowBase * const parent = wxGetTopLevelParent((wxWindow*)this);
-
-    wxCHECK_MSG( parent, wxDefaultSize, wxS("Must have TLW parent") );
-
-    if ( !parent->m_font.IsOk() )
-    {
-        // Default GUI font is used. This is the most common case, so
-        // cache the results.
-        static wxSize s_defFontSize;
-        if ( s_defFontSize.x == 0 )
-            s_defFontSize = wxPrivate::GetAverageASCIILetterSize(*parent);
-        return s_defFontSize;
-    }
-    else
-    {
-        // Custom font, we always need to compute the result
-        return wxPrivate::GetAverageASCIILetterSize(*parent);
-    }
-}
-
-wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt) const
-{
-    const wxSize base = GetDlgUnitBase();
-
-    // NB: wxMulDivInt32() is used, because it correctly rounds the result
-
-    wxPoint pt2 = wxDefaultPosition;
-    if (pt.x != wxDefaultCoord)
-        pt2.x = wxMulDivInt32(pt.x, 4, base.x);
-    if (pt.y != wxDefaultCoord)
-        pt2.y = wxMulDivInt32(pt.y, 8, base.y);
-
-    return pt2;
-}
-
-wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) const
-{
-    const wxSize base = GetDlgUnitBase();
-
-    wxPoint pt2 = wxDefaultPosition;
-    if (pt.x != wxDefaultCoord)
-        pt2.x = wxMulDivInt32(pt.x, base.x, 4);
-    if (pt.y != wxDefaultCoord)
-        pt2.y = wxMulDivInt32(pt.y, base.y, 8);
-
-    return pt2;
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-// propagate the colour change event to the subwindows
-void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
-{
-    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-    while ( node )
-    {
-        // Only propagate to non-top-level windows
-        wxWindow *win = node->GetData();
-        if ( !win->IsTopLevel() )
-        {
-            wxSysColourChangedEvent event2;
-            event2.SetEventObject(win);
-            win->GetEventHandler()->ProcessEvent(event2);
-        }
-
-        node = node->GetNext();
-    }
-
-    Refresh();
-}
-
-// the default action is to populate dialog with data when it's created,
-// and nudge the UI into displaying itself correctly in case
-// we've turned the wxUpdateUIEvents frequency down low.
-void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
-{
-    TransferDataToWindow();
-
-    // Update the UI at this point
-    UpdateWindowUI(wxUPDATE_UI_RECURSE);
-}
-
-// ----------------------------------------------------------------------------
-// menu-related functions
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MENUS
-
-bool wxWindowBase::PopupMenu(wxMenu *menu, int x, int y)
-{
-    wxCHECK_MSG( menu, false, "can't popup NULL menu" );
-
-    wxMenuInvokingWindowSetter
-        setInvokingWin(*menu, static_cast<wxWindow *>(this));
-
-    wxCurrentPopupMenu = menu;
-    const bool rc = DoPopupMenu(menu, x, y);
-    wxCurrentPopupMenu = NULL;
-
-    return rc;
-}
-
-// this is used to pass the id of the selected item from the menu event handler
-// to the main function itself
-//
-// it's ok to use a global here as there can be at most one popup menu shown at
-// any time
-static int gs_popupMenuSelection = wxID_NONE;
-
-void wxWindowBase::InternalOnPopupMenu(wxCommandEvent& event)
-{
-    // store the id in a global variable where we'll retrieve it from later
-    gs_popupMenuSelection = event.GetId();
-}
-
-void wxWindowBase::InternalOnPopupMenuUpdate(wxUpdateUIEvent& WXUNUSED(event))
-{
-    // nothing to do but do not skip it
-}
-
-int
-wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y)
-{
-    gs_popupMenuSelection = wxID_NONE;
-
-    Connect(wxEVT_COMMAND_MENU_SELECTED,
-            wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
-            NULL,
-            this);
-
-    // it is common to construct the menu passed to this function dynamically
-    // using some fixed range of ids which could clash with the ids used
-    // elsewhere in the program, which could result in some menu items being
-    // unintentionally disabled or otherwise modified by update UI handlers
-    // elsewhere in the program code and this is difficult to avoid in the
-    // program itself, so instead we just temporarily suspend UI updating while
-    // this menu is shown
-    Connect(wxEVT_UPDATE_UI,
-            wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate),
-            NULL,
-            this);
-
-    PopupMenu(&menu, x, y);
-
-    Disconnect(wxEVT_UPDATE_UI,
-               wxUpdateUIEventHandler(wxWindowBase::InternalOnPopupMenuUpdate),
-               NULL,
-               this);
-    Disconnect(wxEVT_COMMAND_MENU_SELECTED,
-               wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
-               NULL,
-               this);
-
-    return gs_popupMenuSelection;
-}
-
-#endif // wxUSE_MENUS
-
-// methods for drawing the sizers in a visible way: this is currently only
-// enabled for "full debug" builds with wxDEBUG_LEVEL==2 as it doesn't work
-// that well and also because we don't want to leave it enabled in default
-// builds used for production
-#if wxDEBUG_LEVEL > 1
-
-static void DrawSizers(wxWindowBase *win);
-
-static void DrawBorder(wxWindowBase *win, const wxRect& rect, bool fill, const wxPen* pen)
-{
-    wxClientDC dc((wxWindow *)win);
-    dc.SetPen(*pen);
-    dc.SetBrush(fill ? wxBrush(pen->GetColour(), wxBRUSHSTYLE_CROSSDIAG_HATCH) :
-                       *wxTRANSPARENT_BRUSH);
-    dc.DrawRectangle(rect.Deflate(1, 1));
-}
-
-static void DrawSizer(wxWindowBase *win, wxSizer *sizer)
-{
-    const wxSizerItemList& items = sizer->GetChildren();
-    for ( wxSizerItemList::const_iterator i = items.begin(),
-                                        end = items.end();
-          i != end;
-          ++i )
-    {
-        wxSizerItem *item = *i;
-        if ( item->IsSizer() )
-        {
-            DrawBorder(win, item->GetRect().Deflate(2), false, wxRED_PEN);
-            DrawSizer(win, item->GetSizer());
-        }
-        else if ( item->IsSpacer() )
-        {
-            DrawBorder(win, item->GetRect().Deflate(2), true, wxBLUE_PEN);
-        }
-        else if ( item->IsWindow() )
-        {
-            DrawSizers(item->GetWindow());
-        }
-        else
-            wxFAIL_MSG("inconsistent wxSizerItem status!");
-    }
-}
-
-static void DrawSizers(wxWindowBase *win)
-{
-    DrawBorder(win, win->GetClientSize(), false, wxGREEN_PEN);
-
-    wxSizer *sizer = win->GetSizer();
-    if ( sizer )
-    {
-        DrawSizer(win, sizer);
-    }
-    else // no sizer, still recurse into the children
-    {
-        const wxWindowList& children = win->GetChildren();
-        for ( wxWindowList::const_iterator i = children.begin(),
-                                         end = children.end();
-              i != end;
-              ++i )
-        {
-            DrawSizers(*i);
-        }
-
-        // show all kind of sizes of this window; see the "window sizing" topic
-        // overview for more info about the various differences:
-        wxSize fullSz = win->GetSize();
-        wxSize clientSz = win->GetClientSize();
-        wxSize bestSz = win->GetBestSize();
-        wxSize minSz = win->GetMinSize();
-        wxSize maxSz = win->GetMaxSize();
-        wxSize virtualSz = win->GetVirtualSize();
-
-        wxMessageOutputDebug dbgout;
-        dbgout.Printf(
-            "%-10s => fullsz=%4d;%-4d  clientsz=%4d;%-4d  bestsz=%4d;%-4d  minsz=%4d;%-4d  maxsz=%4d;%-4d virtualsz=%4d;%-4d\n",
-            win->GetName(),
-            fullSz.x, fullSz.y,
-            clientSz.x, clientSz.y,
-            bestSz.x, bestSz.y,
-            minSz.x, minSz.y,
-            maxSz.x, maxSz.y,
-            virtualSz.x, virtualSz.y);
-    }
-}
-
-#endif // wxDEBUG_LEVEL
-
-// process special middle clicks
-void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
-{
-    if ( event.ControlDown() && event.AltDown() )
-    {
-#if wxDEBUG_LEVEL > 1
-        // Ctrl-Alt-Shift-mclick makes the sizers visible in debug builds
-        if ( event.ShiftDown() )
-        {
-            DrawSizers(this);
-        }
-        else
-#endif // __WXDEBUG__
-        {
-#if wxUSE_MSGDLG
-            // just Ctrl-Alt-middle click shows information about wx version
-            ::wxInfoMessageBox((wxWindow*)this);
-#endif // wxUSE_MSGDLG
-        }
-    }
-    else
-    {
-        event.Skip();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// accessibility
-// ----------------------------------------------------------------------------
-
-#if wxUSE_ACCESSIBILITY
-void wxWindowBase::SetAccessible(wxAccessible* accessible)
-{
-    if (m_accessible && (accessible != m_accessible))
-        delete m_accessible;
-    m_accessible = accessible;
-    if (m_accessible)
-        m_accessible->SetWindow((wxWindow*) this);
-}
-
-// Returns the accessible object, creating if necessary.
-wxAccessible* wxWindowBase::GetOrCreateAccessible()
-{
-    if (!m_accessible)
-        m_accessible = CreateAccessible();
-    return m_accessible;
-}
-
-// Override to create a specific accessible object.
-wxAccessible* wxWindowBase::CreateAccessible()
-{
-    return new wxWindowAccessible((wxWindow*) this);
-}
-
-#endif
-
-// ----------------------------------------------------------------------------
-// list classes implementation
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STD_CONTAINERS
-
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxWindowList)
-
-#else // !wxUSE_STD_CONTAINERS
-
-void wxWindowListNode::DeleteData()
-{
-    delete (wxWindow *)GetData();
-}
-
-#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
-
-// ----------------------------------------------------------------------------
-// borders
-// ----------------------------------------------------------------------------
-
-wxBorder wxWindowBase::GetBorder(long flags) const
-{
-    wxBorder border = (wxBorder)(flags & wxBORDER_MASK);
-    if ( border == wxBORDER_DEFAULT )
-    {
-        border = GetDefaultBorder();
-    }
-    else if ( border == wxBORDER_THEME )
-    {
-        border = GetDefaultBorderForControl();
-    }
-
-    return border;
-}
-
-wxBorder wxWindowBase::GetDefaultBorder() const
-{
-    return wxBORDER_NONE;
-}
-
-// ----------------------------------------------------------------------------
-// hit testing
-// ----------------------------------------------------------------------------
-
-wxHitTest wxWindowBase::DoHitTest(wxCoord x, wxCoord y) const
-{
-    // here we just check if the point is inside the window or not
-
-    // check the top and left border first
-    bool outside = x < 0 || y < 0;
-    if ( !outside )
-    {
-        // check the right and bottom borders too
-        wxSize size = GetSize();
-        outside = x >= size.x || y >= size.y;
-    }
-
-    return outside ? wxHT_WINDOW_OUTSIDE : wxHT_WINDOW_INSIDE;
-}
-
-// ----------------------------------------------------------------------------
-// mouse capture
-// ----------------------------------------------------------------------------
-
-struct WXDLLEXPORT wxWindowNext
-{
-    wxWindow *win;
-    wxWindowNext *next;
-} *wxWindowBase::ms_winCaptureNext = NULL;
-wxWindow *wxWindowBase::ms_winCaptureCurrent = NULL;
-bool wxWindowBase::ms_winCaptureChanging = false;
-
-void wxWindowBase::CaptureMouse()
-{
-    wxLogTrace(wxT("mousecapture"), wxT("CaptureMouse(%p)"), static_cast<void*>(this));
-
-    wxASSERT_MSG( !ms_winCaptureChanging, wxT("recursive CaptureMouse call?") );
-
-    ms_winCaptureChanging = true;
-
-    wxWindow *winOld = GetCapture();
-    if ( winOld )
-    {
-        ((wxWindowBase*) winOld)->DoReleaseMouse();
-
-        // save it on stack
-        wxWindowNext *item = new wxWindowNext;
-        item->win = winOld;
-        item->next = ms_winCaptureNext;
-        ms_winCaptureNext = item;
-    }
-    //else: no mouse capture to save
-
-    DoCaptureMouse();
-    ms_winCaptureCurrent = (wxWindow*)this;
-
-    ms_winCaptureChanging = false;
-}
-
-void wxWindowBase::ReleaseMouse()
-{
-    wxLogTrace(wxT("mousecapture"), wxT("ReleaseMouse(%p)"), static_cast<void*>(this));
-
-    wxASSERT_MSG( !ms_winCaptureChanging, wxT("recursive ReleaseMouse call?") );
-
-    wxASSERT_MSG( GetCapture() == this,
-                  "attempt to release mouse, but this window hasn't captured it" );
-    wxASSERT_MSG( ms_winCaptureCurrent == this,
-                  "attempt to release mouse, but this window hasn't captured it" );
-
-    ms_winCaptureChanging = true;
-
-    DoReleaseMouse();
-    ms_winCaptureCurrent = NULL;
-
-    if ( ms_winCaptureNext )
-    {
-        ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();
-        ms_winCaptureCurrent = ms_winCaptureNext->win;
-
-        wxWindowNext *item = ms_winCaptureNext;
-        ms_winCaptureNext = item->next;
-        delete item;
-    }
-    //else: stack is empty, no previous capture
-
-    ms_winCaptureChanging = false;
-
-    wxLogTrace(wxT("mousecapture"),
-        (const wxChar *) wxT("After ReleaseMouse() mouse is captured by %p"),
-        static_cast<void*>(GetCapture()));
-}
-
-static void DoNotifyWindowAboutCaptureLost(wxWindow *win)
-{
-    wxMouseCaptureLostEvent event(win->GetId());
-    event.SetEventObject(win);
-    if ( !win->GetEventHandler()->ProcessEvent(event) )
-    {
-        // windows must handle this event, otherwise the app wouldn't behave
-        // correctly if it loses capture unexpectedly; see the discussion here:
-        // http://sourceforge.net/tracker/index.php?func=detail&aid=1153662&group_id=9863&atid=109863
-        // http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/82376
-        wxFAIL_MSG( wxT("window that captured the mouse didn't process wxEVT_MOUSE_CAPTURE_LOST") );
-    }
-}
-
-/* static */
-void wxWindowBase::NotifyCaptureLost()
-{
-    // don't do anything if capture lost was expected, i.e. resulted from
-    // a wx call to ReleaseMouse or CaptureMouse:
-    if ( ms_winCaptureChanging )
-        return;
-
-    // if the capture was lost unexpectedly, notify every window that has
-    // capture (on stack or current) about it and clear the stack:
-
-    if ( ms_winCaptureCurrent )
-    {
-        DoNotifyWindowAboutCaptureLost(ms_winCaptureCurrent);
-        ms_winCaptureCurrent = NULL;
-    }
-
-    while ( ms_winCaptureNext )
-    {
-        wxWindowNext *item = ms_winCaptureNext;
-        ms_winCaptureNext = item->next;
-
-        DoNotifyWindowAboutCaptureLost(item->win);
-
-        delete item;
-    }
-}
-
-#if wxUSE_HOTKEY
-
-bool
-wxWindowBase::RegisterHotKey(int WXUNUSED(hotkeyId),
-                             int WXUNUSED(modifiers),
-                             int WXUNUSED(keycode))
-{
-    // not implemented
-    return false;
-}
-
-bool wxWindowBase::UnregisterHotKey(int WXUNUSED(hotkeyId))
-{
-    // not implemented
-    return false;
-}
-
-#endif // wxUSE_HOTKEY
-
-// ----------------------------------------------------------------------------
-// event processing
-// ----------------------------------------------------------------------------
-
-bool wxWindowBase::TryBefore(wxEvent& event)
-{
-#if wxUSE_VALIDATORS
-    // Can only use the validator of the window which
-    // is receiving the event
-    if ( event.GetEventObject() == this )
-    {
-        wxValidator * const validator = GetValidator();
-        if ( validator && validator->ProcessEventLocally(event) )
-        {
-            return true;
-        }
-    }
-#endif // wxUSE_VALIDATORS
-
-    return wxEvtHandler::TryBefore(event);
-}
-
-bool wxWindowBase::TryAfter(wxEvent& event)
-{
-    // carry on up the parent-child hierarchy if the propagation count hasn't
-    // reached zero yet
-    if ( event.ShouldPropagate() )
-    {
-        // honour the requests to stop propagation at this window: this is
-        // used by the dialogs, for example, to prevent processing the events
-        // from the dialog controls in the parent frame which rarely, if ever,
-        // makes sense
-        if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
-        {
-            wxWindow *parent = GetParent();
-            if ( parent && !parent->IsBeingDeleted() )
-            {
-                wxPropagateOnce propagateOnce(event);
-
-                return parent->GetEventHandler()->ProcessEvent(event);
-            }
-        }
-    }
-
-    return wxEvtHandler::TryAfter(event);
-}
-
-// ----------------------------------------------------------------------------
-// window relationships
-// ----------------------------------------------------------------------------
-
-wxWindow *wxWindowBase::DoGetSibling(WindowOrder order) const
-{
-    wxCHECK_MSG( GetParent(), NULL,
-                    wxT("GetPrev/NextSibling() don't work for TLWs!") );
-
-    wxWindowList& siblings = GetParent()->GetChildren();
-    wxWindowList::compatibility_iterator i = siblings.Find((wxWindow *)this);
-    wxCHECK_MSG( i, NULL, wxT("window not a child of its parent?") );
-
-    if ( order == OrderBefore )
-        i = i->GetPrevious();
-    else // OrderAfter
-        i = i->GetNext();
-
-    return i ? i->GetData() : NULL;
-}
-
-// ----------------------------------------------------------------------------
-// keyboard navigation
-// ----------------------------------------------------------------------------
-
-// Navigates in the specified direction inside this window
-bool wxWindowBase::DoNavigateIn(int flags)
-{
-#ifdef wxHAS_NATIVE_TAB_TRAVERSAL
-    // native code doesn't process our wxNavigationKeyEvents anyhow
-    wxUnusedVar(flags);
-    return false;
-#else // !wxHAS_NATIVE_TAB_TRAVERSAL
-    wxNavigationKeyEvent eventNav;
-    wxWindow *focused = FindFocus();
-    eventNav.SetCurrentFocus(focused);
-    eventNav.SetEventObject(focused);
-    eventNav.SetFlags(flags);
-    return GetEventHandler()->ProcessEvent(eventNav);
-#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL
-}
-
-bool wxWindowBase::HandleAsNavigationKey(const wxKeyEvent& event)
-{
-    if ( event.GetKeyCode() != WXK_TAB )
-        return false;
-
-    int flags = wxNavigationKeyEvent::FromTab;
-
-    if ( event.ShiftDown() )
-        flags |= wxNavigationKeyEvent::IsBackward;
-    else
-        flags |= wxNavigationKeyEvent::IsForward;
-
-    if ( event.ControlDown() )
-        flags |= wxNavigationKeyEvent::WinChange;
-
-    Navigate(flags);
-    return true;
-}
-
-void wxWindowBase::DoMoveInTabOrder(wxWindow *win, WindowOrder move)
-{
-    // check that we're not a top level window
-    wxCHECK_RET( GetParent(),
-                    wxT("MoveBefore/AfterInTabOrder() don't work for TLWs!") );
-
-    // detect the special case when we have nothing to do anyhow and when the
-    // code below wouldn't work
-    if ( win == this )
-        return;
-
-    // find the target window in the siblings list
-    wxWindowList& siblings = GetParent()->GetChildren();
-    wxWindowList::compatibility_iterator i = siblings.Find(win);
-    wxCHECK_RET( i, wxT("MoveBefore/AfterInTabOrder(): win is not a sibling") );
-
-    // unfortunately, when wxUSE_STD_CONTAINERS == 1 DetachNode() is not
-    // implemented so we can't just move the node around
-    wxWindow *self = (wxWindow *)this;
-    siblings.DeleteObject(self);
-    if ( move == OrderAfter )
-    {
-        i = i->GetNext();
-    }
-
-    if ( i )
-    {
-        siblings.Insert(i, self);
-    }
-    else // OrderAfter and win was the last sibling
-    {
-        siblings.Append(self);
-    }
-}
-
-// ----------------------------------------------------------------------------
-// focus handling
-// ----------------------------------------------------------------------------
-
-/*static*/ wxWindow* wxWindowBase::FindFocus()
-{
-    wxWindowBase *win = DoFindFocus();
-    return win ? win->GetMainWindowOfCompositeControl() : NULL;
-}
-
-bool wxWindowBase::HasFocus() const
-{
-    wxWindowBase* const win = DoFindFocus();
-    return win &&
-            (this == win || this == win->GetMainWindowOfCompositeControl());
-}
-
-// ----------------------------------------------------------------------------
-// drag and drop
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DRAG_AND_DROP && !defined(__WXMSW__)
-
-namespace
-{
-
-class DragAcceptFilesTarget : public wxFileDropTarget
-{
-public:
-    DragAcceptFilesTarget(wxWindowBase *win) : m_win(win) {}
-
-    virtual bool OnDropFiles(wxCoord x, wxCoord y,
-                             const wxArrayString& filenames)
-    {
-        wxDropFilesEvent event(wxEVT_DROP_FILES,
-                               filenames.size(),
-                               wxCArrayString(filenames).Release());
-        event.SetEventObject(m_win);
-        event.m_pos.x = x;
-        event.m_pos.y = y;
-
-        return m_win->HandleWindowEvent(event);
-    }
-
-private:
-    wxWindowBase * const m_win;
-
-    wxDECLARE_NO_COPY_CLASS(DragAcceptFilesTarget);
-};
-
-
-} // anonymous namespace
-
-// Generic version of DragAcceptFiles(). It works by installing a simple
-// wxFileDropTarget-to-EVT_DROP_FILES adaptor and therefore cannot be used
-// together with explicit SetDropTarget() calls.
-void wxWindowBase::DragAcceptFiles(bool accept)
-{
-    if ( accept )
-    {
-        wxASSERT_MSG( !GetDropTarget(),
-                      "cannot use DragAcceptFiles() and SetDropTarget() together" );
-        SetDropTarget(new DragAcceptFilesTarget(this));
-    }
-    else
-    {
-        SetDropTarget(NULL);
-    }
-}
-
-#endif // wxUSE_DRAG_AND_DROP && !defined(__WXMSW__)
-
-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-wxWindow* wxGetTopLevelParent(wxWindow *win)
-{
-    while ( win && !win->IsTopLevel() )
-         win = win->GetParent();
-
-    return win;
-}
-
-#if wxUSE_ACCESSIBILITY
-// ----------------------------------------------------------------------------
-// accessible object for windows
-// ----------------------------------------------------------------------------
-
-// Can return either a child object, or an integer
-// representing the child element, starting from 1.
-wxAccStatus wxWindowAccessible::HitTest(const wxPoint& WXUNUSED(pt), int* WXUNUSED(childId), wxAccessible** WXUNUSED(childObject))
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Returns the rectangle for this object (id = 0) or a child element (id > 0).
-wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    wxWindow* win = NULL;
-    if (elementId == 0)
-    {
-        win = GetWindow();
-    }
-    else
-    {
-        if (elementId <= (int) GetWindow()->GetChildren().GetCount())
-        {
-            win = GetWindow()->GetChildren().Item(elementId-1)->GetData();
-        }
-        else
-            return wxACC_FAIL;
-    }
-    if (win)
-    {
-        rect = win->GetRect();
-        if (win->GetParent() && !wxDynamicCast(win, wxTopLevelWindow))
-            rect.SetPosition(win->GetParent()->ClientToScreen(rect.GetPosition()));
-        return wxACC_OK;
-    }
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Navigates from fromId to toId/toObject.
-wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
-                             int* WXUNUSED(toId), wxAccessible** toObject)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    switch (navDir)
-    {
-    case wxNAVDIR_FIRSTCHILD:
-        {
-            if (GetWindow()->GetChildren().GetCount() == 0)
-                return wxACC_FALSE;
-            wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().GetFirst()->GetData();
-            *toObject = childWindow->GetOrCreateAccessible();
-
-            return wxACC_OK;
-        }
-    case wxNAVDIR_LASTCHILD:
-        {
-            if (GetWindow()->GetChildren().GetCount() == 0)
-                return wxACC_FALSE;
-            wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().GetLast()->GetData();
-            *toObject = childWindow->GetOrCreateAccessible();
-
-            return wxACC_OK;
-        }
-    case wxNAVDIR_RIGHT:
-    case wxNAVDIR_DOWN:
-    case wxNAVDIR_NEXT:
-        {
-            wxWindowList::compatibility_iterator node =
-                wxWindowList::compatibility_iterator();
-            if (fromId == 0)
-            {
-                // Can't navigate to sibling of this window
-                // if we're a top-level window.
-                if (!GetWindow()->GetParent())
-                    return wxACC_NOT_IMPLEMENTED;
-
-                node = GetWindow()->GetParent()->GetChildren().Find(GetWindow());
-            }
-            else
-            {
-                if (fromId <= (int) GetWindow()->GetChildren().GetCount())
-                    node = GetWindow()->GetChildren().Item(fromId-1);
-            }
-
-            if (node && node->GetNext())
-            {
-                wxWindow* nextWindow = node->GetNext()->GetData();
-                *toObject = nextWindow->GetOrCreateAccessible();
-                return wxACC_OK;
-            }
-            else
-                return wxACC_FALSE;
-        }
-    case wxNAVDIR_LEFT:
-    case wxNAVDIR_UP:
-    case wxNAVDIR_PREVIOUS:
-        {
-            wxWindowList::compatibility_iterator node =
-                wxWindowList::compatibility_iterator();
-            if (fromId == 0)
-            {
-                // Can't navigate to sibling of this window
-                // if we're a top-level window.
-                if (!GetWindow()->GetParent())
-                    return wxACC_NOT_IMPLEMENTED;
-
-                node = GetWindow()->GetParent()->GetChildren().Find(GetWindow());
-            }
-            else
-            {
-                if (fromId <= (int) GetWindow()->GetChildren().GetCount())
-                    node = GetWindow()->GetChildren().Item(fromId-1);
-            }
-
-            if (node && node->GetPrevious())
-            {
-                wxWindow* previousWindow = node->GetPrevious()->GetData();
-                *toObject = previousWindow->GetOrCreateAccessible();
-                return wxACC_OK;
-            }
-            else
-                return wxACC_FALSE;
-        }
-    }
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Gets the name of the specified object.
-wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    wxString title;
-
-    // If a child, leave wxWidgets to call the function on the actual
-    // child object.
-    if (childId > 0)
-        return wxACC_NOT_IMPLEMENTED;
-
-    // This will eventually be replaced by specialised
-    // accessible classes, one for each kind of wxWidgets
-    // control or window.
-#if wxUSE_BUTTON
-    if (wxDynamicCast(GetWindow(), wxButton))
-        title = ((wxButton*) GetWindow())->GetLabel();
-    else
-#endif
-        title = GetWindow()->GetName();
-
-    if (!title.empty())
-    {
-        *name = title;
-        return wxACC_OK;
-    }
-    else
-        return wxACC_NOT_IMPLEMENTED;
-}
-
-// Gets the number of children.
-wxAccStatus wxWindowAccessible::GetChildCount(int* childId)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    *childId = (int) GetWindow()->GetChildren().GetCount();
-    return wxACC_OK;
-}
-
-// Gets the specified child (starting from 1).
-// If *child is NULL and return value is wxACC_OK,
-// this means that the child is a simple element and
-// not an accessible object.
-wxAccStatus wxWindowAccessible::GetChild(int childId, wxAccessible** child)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    if (childId == 0)
-    {
-        *child = this;
-        return wxACC_OK;
-    }
-
-    if (childId > (int) GetWindow()->GetChildren().GetCount())
-        return wxACC_FAIL;
-
-    wxWindow* childWindow = GetWindow()->GetChildren().Item(childId-1)->GetData();
-    *child = childWindow->GetOrCreateAccessible();
-    if (*child)
-        return wxACC_OK;
-    else
-        return wxACC_FAIL;
-}
-
-// Gets the parent, or NULL.
-wxAccStatus wxWindowAccessible::GetParent(wxAccessible** parent)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    wxWindow* parentWindow = GetWindow()->GetParent();
-    if (!parentWindow)
-    {
-        *parent = NULL;
-        return wxACC_OK;
-    }
-    else
-    {
-        *parent = parentWindow->GetOrCreateAccessible();
-        if (*parent)
-            return wxACC_OK;
-        else
-            return wxACC_FAIL;
-    }
-}
-
-// Performs the default action. childId is 0 (the action for this object)
-// or > 0 (the action for a child).
-// Return wxACC_NOT_SUPPORTED if there is no default action for this
-// window (e.g. an edit control).
-wxAccStatus wxWindowAccessible::DoDefaultAction(int WXUNUSED(childId))
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Gets the default action for this object (0) or > 0 (the action for a child).
-// Return wxACC_OK even if there is no action. actionName is the action, or the empty
-// string if there is no action.
-// The retrieved string describes the action that is performed on an object,
-// not what the object does as a result. For example, a toolbar button that prints
-// a document has a default action of "Press" rather than "Prints the current document."
-wxAccStatus wxWindowAccessible::GetDefaultAction(int WXUNUSED(childId), wxString* WXUNUSED(actionName))
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Returns the description for this object or a child.
-wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString* description)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
-    if (!ht.empty())
-    {
-        *description = ht;
-        return wxACC_OK;
-    }
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Returns help text for this object or a child, similar to tooltip text.
-wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* helpText)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
-    if (!ht.empty())
-    {
-        *helpText = ht;
-        return wxACC_OK;
-    }
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Returns the keyboard shortcut for this object or child.
-// Return e.g. ALT+K
-wxAccStatus wxWindowAccessible::GetKeyboardShortcut(int WXUNUSED(childId), wxString* WXUNUSED(shortcut))
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Returns a role constant.
-wxAccStatus wxWindowAccessible::GetRole(int childId, wxAccRole* role)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    // If a child, leave wxWidgets to call the function on the actual
-    // child object.
-    if (childId > 0)
-        return wxACC_NOT_IMPLEMENTED;
-
-    if (wxDynamicCast(GetWindow(), wxControl))
-        return wxACC_NOT_IMPLEMENTED;
-#if wxUSE_STATUSBAR
-    if (wxDynamicCast(GetWindow(), wxStatusBar))
-        return wxACC_NOT_IMPLEMENTED;
-#endif
-#if wxUSE_TOOLBAR
-    if (wxDynamicCast(GetWindow(), wxToolBar))
-        return wxACC_NOT_IMPLEMENTED;
-#endif
-
-    //*role = wxROLE_SYSTEM_CLIENT;
-    *role = wxROLE_SYSTEM_CLIENT;
-    return wxACC_OK;
-
-    #if 0
-    return wxACC_NOT_IMPLEMENTED;
-    #endif
-}
-
-// Returns a state constant.
-wxAccStatus wxWindowAccessible::GetState(int childId, long* state)
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    // If a child, leave wxWidgets to call the function on the actual
-    // child object.
-    if (childId > 0)
-        return wxACC_NOT_IMPLEMENTED;
-
-    if (wxDynamicCast(GetWindow(), wxControl))
-        return wxACC_NOT_IMPLEMENTED;
-
-#if wxUSE_STATUSBAR
-    if (wxDynamicCast(GetWindow(), wxStatusBar))
-        return wxACC_NOT_IMPLEMENTED;
-#endif
-#if wxUSE_TOOLBAR
-    if (wxDynamicCast(GetWindow(), wxToolBar))
-        return wxACC_NOT_IMPLEMENTED;
-#endif
-
-    *state = 0;
-    return wxACC_OK;
-
-    #if 0
-    return wxACC_NOT_IMPLEMENTED;
-    #endif
-}
-
-// Returns a localized string representing the value for the object
-// or child.
-wxAccStatus wxWindowAccessible::GetValue(int WXUNUSED(childId), wxString* WXUNUSED(strValue))
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Selects the object or child.
-wxAccStatus wxWindowAccessible::Select(int WXUNUSED(childId), wxAccSelectionFlags WXUNUSED(selectFlags))
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-// Gets the window with the keyboard focus.
-// If childId is 0 and child is NULL, no object in
-// this subhierarchy has the focus.
-// If this object has the focus, child should be 'this'.
-wxAccStatus wxWindowAccessible::GetFocus(int* WXUNUSED(childId), wxAccessible** WXUNUSED(child))
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-
-#if wxUSE_VARIANT
-// Gets a variant representing the selected children
-// of this object.
-// Acceptable values:
-// - a null variant (IsNull() returns true)
-// - a list variant (GetType() == wxT("list")
-// - an integer representing the selected child element,
-//   or 0 if this object is selected (GetType() == wxT("long")
-// - a "void*" pointer to a wxAccessible child object
-wxAccStatus wxWindowAccessible::GetSelections(wxVariant* WXUNUSED(selections))
-{
-    wxASSERT( GetWindow() != NULL );
-    if (!GetWindow())
-        return wxACC_FAIL;
-
-    return wxACC_NOT_IMPLEMENTED;
-}
-#endif // wxUSE_VARIANT
-
-#endif // wxUSE_ACCESSIBILITY
-
-// ----------------------------------------------------------------------------
-// RTL support
-// ----------------------------------------------------------------------------
-
-wxCoord
-wxWindowBase::AdjustForLayoutDirection(wxCoord x,
-                                       wxCoord width,
-                                       wxCoord widthTotal) const
-{
-    if ( GetLayoutDirection() == wxLayout_RightToLeft )
-    {
-        x = widthTotal - x - width;
-    }
-
-    return x;
-}
-
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/window.cpp
+// Purpose:     common (to all ports) wxWindow functions
+// Author:      Julian Smart, Vadim Zeitlin
+// Modified by:
+// Created:     13/07/98
+// RCS-ID:      $Id: wincmn.cpp 63032 2009-12-31 13:37:24Z VZ $
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/frame.h"
+    #include "wx/window.h"
+    #include "wx/control.h"
+    #include "wx/checkbox.h"
+    #include "wx/radiobut.h"
+    #include "wx/statbox.h"
+    #include "wx/textctrl.h"
+    #include "wx/settings.h"
+    #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
+    #include "wx/statusbr.h"
+    #include "wx/toolbar.h"
+    #include "wx/dcclient.h"
+    #include "wx/scrolbar.h"
+    #include "wx/layout.h"
+    #include "wx/sizer.h"
+#endif //WX_PRECOMP
+
+#if wxUSE_DRAG_AND_DROP
+    #include "wx/dnd.h"
+#endif // wxUSE_DRAG_AND_DROP
+
+#if wxUSE_ACCESSIBILITY
+    #include "wx/access.h"
+#endif
+
+#if wxUSE_HELP
+    #include "wx/cshelp.h"
+#endif // wxUSE_HELP
+
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+
+#if wxUSE_CARET
+    #include "wx/caret.h"
+#endif // wxUSE_CARET
+
+#if wxUSE_SYSTEM_OPTIONS
+    #include "wx/sysopt.h"
+#endif
+
+// For reporting compile- and runtime version of GTK+ in the ctrl+alt+mclick dialog.
+// The gtk includes don't pull any other headers in, at least not on my system - MR
+#ifdef __WXGTK__
+    #ifdef __WXGTK20__
+        #include <gtk/gtkversion.h>
+    #else
+        #include <gtk/gtkfeatures.h>
+    #endif
+    extern const unsigned int gtk_major_version;
+    extern const unsigned int gtk_minor_version;
+    extern const unsigned int gtk_micro_version;
+#endif
+
+#include "wx/platinfo.h"
+
+// Windows List
+WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows;
+
+// ----------------------------------------------------------------------------
+// static data
+// ----------------------------------------------------------------------------
+
+#if defined(__WXPALMOS__)
+int wxWindowBase::ms_lastControlId = 32767;
+#elif defined(__WXPM__)
+int wxWindowBase::ms_lastControlId = 2000;
+#else
+int wxWindowBase::ms_lastControlId = -200;
+#endif
+
+IMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler)
+
+// ----------------------------------------------------------------------------
+// event table
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler)
+    EVT_SYS_COLOUR_CHANGED(wxWindowBase::OnSysColourChanged)
+    EVT_INIT_DIALOG(wxWindowBase::OnInitDialog)
+    EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick)
+
+#if wxUSE_HELP
+    EVT_HELP(wxID_ANY, wxWindowBase::OnHelp)
+#endif // wxUSE_HELP
+
+END_EVENT_TABLE()
+
+// ============================================================================
+// implementation of the common functionality of the wxWindow class
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// initialization
+// ----------------------------------------------------------------------------
+
+// the default initialization
+wxWindowBase::wxWindowBase()
+{
+    // no window yet, no parent nor children
+    m_parent = (wxWindow *)NULL;
+    m_windowId = wxID_ANY;
+
+    // no constraints on the minimal window size
+    m_minWidth =
+    m_maxWidth = wxDefaultCoord;
+    m_minHeight =
+    m_maxHeight = wxDefaultCoord;
+
+    // invalidiated cache value
+    m_bestSizeCache = wxDefaultSize;
+
+    // window are created enabled and visible by default
+    m_isShown =
+    m_isEnabled = true;
+
+    // the default event handler is just this window
+    m_eventHandler = this;
+
+#if wxUSE_VALIDATORS
+    // no validator
+    m_windowValidator = (wxValidator *) NULL;
+#endif // wxUSE_VALIDATORS
+
+    // the colours/fonts are default for now, so leave m_font,
+    // m_backgroundColour and m_foregroundColour uninitialized and set those
+    m_hasBgCol =
+    m_hasFgCol =
+    m_hasFont = false;
+    m_inheritBgCol =
+    m_inheritFgCol =
+    m_inheritFont = false;
+
+    // no style bits
+    m_exStyle =
+    m_windowStyle = 0;
+
+    m_backgroundStyle = wxBG_STYLE_SYSTEM;
+
+#if wxUSE_CONSTRAINTS
+    // no constraints whatsoever
+    m_constraints = (wxLayoutConstraints *) NULL;
+    m_constraintsInvolvedIn = (wxWindowList *) NULL;
+#endif // wxUSE_CONSTRAINTS
+
+    m_windowSizer = (wxSizer *) NULL;
+    m_containingSizer = (wxSizer *) NULL;
+    m_autoLayout = false;
+
+#if wxUSE_DRAG_AND_DROP
+    m_dropTarget = (wxDropTarget *)NULL;
+#endif // wxUSE_DRAG_AND_DROP
+
+#if wxUSE_TOOLTIPS
+    m_tooltip = (wxToolTip *)NULL;
+#endif // wxUSE_TOOLTIPS
+
+#if wxUSE_CARET
+    m_caret = (wxCaret *)NULL;
+#endif // wxUSE_CARET
+
+#if wxUSE_PALETTE
+    m_hasCustomPalette = false;
+#endif // wxUSE_PALETTE
+
+#if wxUSE_ACCESSIBILITY
+    m_accessible = NULL;
+#endif
+
+    m_virtualSize = wxDefaultSize;
+
+    m_scrollHelper = (wxScrollHelper *) NULL;
+
+    m_minVirtualWidth =
+    m_maxVirtualWidth = wxDefaultCoord;
+    m_minVirtualHeight =
+    m_maxVirtualHeight = wxDefaultCoord;
+
+    m_windowVariant = wxWINDOW_VARIANT_NORMAL;
+#if wxUSE_SYSTEM_OPTIONS
+    if ( wxSystemOptions::HasOption(wxWINDOW_DEFAULT_VARIANT) )
+    {
+       m_windowVariant = (wxWindowVariant) wxSystemOptions::GetOptionInt( wxWINDOW_DEFAULT_VARIANT ) ;
+    }
+#endif
+
+    // Whether we're using the current theme for this window (wxGTK only for now)
+    m_themeEnabled = false;
+
+    // VZ: this one shouldn't exist...
+    m_isBeingDeleted = false;
+}
+
+// common part of window creation process
+bool wxWindowBase::CreateBase(wxWindowBase *parent,
+                              wxWindowID id,
+                              const wxPoint& WXUNUSED(pos),
+                              const wxSize& WXUNUSED(size),
+                              long style,
+                              const wxValidator& wxVALIDATOR_PARAM(validator),
+                              const wxString& name)
+{
+#if wxUSE_STATBOX
+    // wxGTK doesn't allow to create controls with static box as the parent so
+    // this will result in a crash when the program is ported to wxGTK so warn
+    // the user about it
+
+    // if you get this assert, the correct solution is to create the controls
+    // as siblings of the static box
+    wxASSERT_MSG( !parent || !wxDynamicCast(parent, wxStaticBox),
+                  _T("wxStaticBox can't be used as a window parent!") );
+#endif // wxUSE_STATBOX
+
+    // ids are limited to 16 bits under MSW so if you care about portability,
+    // it's not a good idea to use ids out of this range (and negative ids are
+    // reserved for wxWidgets own usage)
+    wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767),
+                  _T("invalid id value") );
+
+    // generate a new id if the user doesn't care about it
+    m_windowId = id == wxID_ANY ? NewControlId() : id;
+
+    // don't use SetWindowStyleFlag() here, this function should only be called
+    // to change the flag after creation as it tries to reflect the changes in
+    // flags by updating the window dynamically and we don't need this here
+    m_windowStyle = style;
+
+    SetName(name);
+    SetParent(parent);
+
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif // wxUSE_VALIDATORS
+
+    // if the parent window has wxWS_EX_VALIDATE_RECURSIVELY set, we want to
+    // have it too - like this it's possible to set it only in the top level
+    // dialog/frame and all children will inherit it by defult
+    if ( parent && (parent->GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) )
+    {
+        SetExtraStyle(GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY);
+    }
+
+    return true;
+}
+
+bool wxWindowBase::ToggleWindowStyle(int flag)
+{
+    wxASSERT_MSG( flag, _T("flags with 0 value can't be toggled") );
+
+    bool rc;
+    long style = GetWindowStyleFlag();
+    if ( style & flag )
+    {
+        style &= ~flag;
+        rc = false;
+    }
+    else // currently off
+    {
+        style |= flag;
+        rc = true;
+    }
+
+    SetWindowStyleFlag(style);
+
+    return rc;
+}
+
+// ----------------------------------------------------------------------------
+// destruction
+// ----------------------------------------------------------------------------
+
+// common clean up
+wxWindowBase::~wxWindowBase()
+{
+    wxASSERT_MSG( GetCapture() != this, wxT("attempt to destroy window with mouse capture") );
+
+    // FIXME if these 2 cases result from programming errors in the user code
+    //       we should probably assert here instead of silently fixing them
+
+    // Just in case the window has been Closed, but we're then deleting
+    // immediately: don't leave dangling pointers.
+    wxPendingDelete.DeleteObject(this);
+
+    // Just in case we've loaded a top-level window via LoadNativeDialog but
+    // we weren't a dialog class
+    wxTopLevelWindows.DeleteObject((wxWindow*)this);
+
+    wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
+
+    // reset the top-level parent's default item if it is this widget
+    if ( m_parent )
+    {
+        wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent((wxWindow*)this),
+                                              wxTopLevelWindow);
+
+        if ( tlw )
+        {
+            wxWindow* tmpDefaultItem = tlw->GetTmpDefaultItem();
+            if ( tmpDefaultItem == this )
+                tlw->SetTmpDefaultItem(NULL);
+            else if ( tmpDefaultItem )
+            {
+                // A temporary default item masks the real default item, so
+                // temporarily unset the temporary default item so we can access the
+                // real default item.
+                tlw->SetTmpDefaultItem(NULL);
+
+                if ( tlw->GetDefaultItem() == this )
+                    tlw->SetDefaultItem(NULL);
+
+                // Set the temporary default item back.
+                tlw->SetTmpDefaultItem(tmpDefaultItem);
+            }
+            else if ( tlw->GetDefaultItem() == this )
+                tlw->SetDefaultItem(NULL);
+        }
+    }
+
+    // reset the dangling pointer our parent window may keep to us
+    if ( m_parent )
+    {
+        m_parent->RemoveChild(this);
+    }
+
+#if wxUSE_CARET
+    delete m_caret;
+#endif // wxUSE_CARET
+
+#if wxUSE_VALIDATORS
+    delete m_windowValidator;
+#endif // wxUSE_VALIDATORS
+
+#if wxUSE_CONSTRAINTS
+    // Have to delete constraints/sizer FIRST otherwise sizers may try to look
+    // at deleted windows as they delete themselves.
+    DeleteRelatedConstraints();
+
+    if ( m_constraints )
+    {
+        // This removes any dangling pointers to this window in other windows'
+        // constraintsInvolvedIn lists.
+        UnsetConstraints(m_constraints);
+        delete m_constraints;
+        m_constraints = NULL;
+    }
+#endif // wxUSE_CONSTRAINTS
+
+    if ( m_containingSizer )
+        m_containingSizer->Detach( (wxWindow*)this );
+
+    delete m_windowSizer;
+
+#if wxUSE_DRAG_AND_DROP
+    delete m_dropTarget;
+#endif // wxUSE_DRAG_AND_DROP
+
+#if wxUSE_TOOLTIPS
+    delete m_tooltip;
+#endif // wxUSE_TOOLTIPS
+
+#if wxUSE_ACCESSIBILITY
+    delete m_accessible;
+#endif
+
+#if wxUSE_HELP
+    // NB: this has to be called unconditionally, because we don't
+    //     know whether this window has associated help text or not
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+        helpProvider->RemoveHelp(this);
+#endif
+}
+
+void wxWindowBase::SendDestroyEvent()
+{
+    wxWindowDestroyEvent event;
+    event.SetEventObject(this);
+    event.SetId(GetId());
+    GetEventHandler()->ProcessEvent(event);
+}
+
+bool wxWindowBase::Destroy()
+{
+    delete this;
+
+    return true;
+}
+
+bool wxWindowBase::Close(bool force)
+{
+    wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
+    event.SetEventObject(this);
+    event.SetCanVeto(!force);
+
+    // return false if window wasn't closed because the application vetoed the
+    // close event
+    return GetEventHandler()->ProcessEvent(event) && !event.GetVeto();
+}
+
+bool wxWindowBase::DestroyChildren()
+{
+    wxWindowList::compatibility_iterator node;
+    for ( ;; )
+    {
+        // we iterate until the list becomes empty
+        node = GetChildren().GetFirst();
+        if ( !node )
+            break;
+
+        wxWindow *child = node->GetData();
+
+        // note that we really want to call delete and not ->Destroy() here
+        // because we want to delete the child immediately, before we are
+        // deleted, and delayed deletion would result in problems as our (top
+        // level) child could outlive its parent
+        delete child;
+
+        wxASSERT_MSG( !GetChildren().Find(child),
+                      wxT("child didn't remove itself using RemoveChild()") );
+    }
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// size/position related methods
+// ----------------------------------------------------------------------------
+
+// centre the window with respect to its parent in either (or both) directions
+void wxWindowBase::DoCentre(int dir)
+{
+    wxCHECK_RET( !(dir & wxCENTRE_ON_SCREEN) && GetParent(),
+                 _T("this method only implements centering child windows") );
+
+    SetSize(GetRect().CentreIn(GetParent()->GetClientSize(), dir));
+}
+
+// fits the window around the children
+void wxWindowBase::Fit()
+{
+    if ( !GetChildren().empty() )
+    {
+        SetSize(GetBestSize());
+    }
+    //else: do nothing if we have no children
+}
+
+// fits virtual size (ie. scrolled area etc.) around children
+void wxWindowBase::FitInside()
+{
+    if ( GetChildren().GetCount() > 0 )
+    {
+        SetVirtualSize( GetBestVirtualSize() );
+    }
+}
+
+// On Mac, scrollbars are explicitly children.
+#ifdef __WXMAC__
+static bool wxHasRealChildren(const wxWindowBase* win)
+{
+    int realChildCount = 0;
+
+    for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+        if ( !win->IsTopLevel() && win->IsShown() && !win->IsKindOf(CLASSINFO(wxScrollBar)))
+            realChildCount ++;
+    }
+    return (realChildCount > 0);
+}
+#endif
+
+void wxWindowBase::InvalidateBestSize()
+{
+    m_bestSizeCache = wxDefaultSize;
+
+    // parent's best size calculation may depend on its children's
+    // as long as child window we are in is not top level window itself
+    // (because the TLW size is never resized automatically)
+    // so let's invalidate it as well to be safe:
+    if (m_parent && !IsTopLevel())
+        m_parent->InvalidateBestSize();
+}
+
+// return the size best suited for the current window
+wxSize wxWindowBase::DoGetBestSize() const
+{
+    wxSize best;
+
+    if ( m_windowSizer )
+    {
+        // Adjust to window size, since the return value of GetWindowSizeForVirtualSize is
+        // expressed in window and not client size
+        wxSize minSize = m_windowSizer->GetMinSize();
+        wxSize size(GetSize());
+        wxSize clientSize(GetClientSize());
+
+        wxSize minWindowSize(minSize.x + size.x - clientSize.x,
+                             minSize.y + size.y - clientSize.y);
+
+        best = GetWindowSizeForVirtualSize(minWindowSize);
+
+        return best;
+    }
+#if wxUSE_CONSTRAINTS
+    else if ( m_constraints )
+    {
+        wxConstCast(this, wxWindowBase)->SatisfyConstraints();
+
+        // our minimal acceptable size is such that all our windows fit inside
+        int maxX = 0,
+            maxY = 0;
+
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+              node;
+              node = node->GetNext() )
+        {
+            wxLayoutConstraints *c = node->GetData()->GetConstraints();
+            if ( !c )
+            {
+                // it's not normal that we have an unconstrained child, but
+                // what can we do about it?
+                continue;
+            }
+
+            int x = c->right.GetValue(),
+                y = c->bottom.GetValue();
+
+            if ( x > maxX )
+                maxX = x;
+
+            if ( y > maxY )
+                maxY = y;
+
+            // TODO: we must calculate the overlaps somehow, otherwise we
+            //       will never return a size bigger than the current one :-(
+        }
+
+        best = wxSize(maxX, maxY);
+    }
+#endif // wxUSE_CONSTRAINTS
+    else if ( !GetChildren().empty()
+#ifdef __WXMAC__
+              && wxHasRealChildren(this)
+#endif
+              )
+    {
+        // our minimal acceptable size is such that all our visible child
+        // windows fit inside
+        int maxX = 0,
+            maxY = 0;
+
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+              node;
+              node = node->GetNext() )
+        {
+            wxWindow *win = node->GetData();
+            if ( win->IsTopLevel()
+                    || !win->IsShown()
+#if wxUSE_STATUSBAR
+                        || wxDynamicCast(win, wxStatusBar)
+#endif // wxUSE_STATUSBAR
+               )
+            {
+                // dialogs and frames lie in different top level windows -
+                // don't deal with them here; as for the status bars, they
+                // don't lie in the client area at all
+                continue;
+            }
+
+            int wx, wy, ww, wh;
+            win->GetPosition(&wx, &wy);
+
+            // if the window hadn't been positioned yet, assume that it is in
+            // the origin
+            if ( wx == wxDefaultCoord )
+                wx = 0;
+            if ( wy == wxDefaultCoord )
+                wy = 0;
+
+            win->GetSize(&ww, &wh);
+            if ( wx + ww > maxX )
+                maxX = wx + ww;
+            if ( wy + wh > maxY )
+                maxY = wy + wh;
+        }
+
+        best = wxSize(maxX, maxY);
+    }
+    else // ! has children
+    {
+        // for a generic window there is no natural best size so, if the
+        // minimal size is not set, use the current size but take care to
+        // remember it as minimal size for the next time because our best size
+        // should be constant: otherwise we could get into a situation when the
+        // window is initially at some size, then expanded to a larger size and
+        // then, when the containing window is shrunk back (because our initial
+        // best size had been used for computing the parent min size), we can't
+        // be shrunk back any more because our best size is now bigger
+        wxSize size = GetMinSize();
+        if ( !size.IsFullySpecified() )
+        {
+            size.SetDefaults(GetSize());
+            wxConstCast(this, wxWindowBase)->SetMinSize(size);
+        }
+
+        // return as-is, unadjusted by the client size difference.
+        return size;
+    }
+
+    // Add any difference between size and client size
+    wxSize diff = GetSize() - GetClientSize();
+    best.x += wxMax(0, diff.x);
+    best.y += wxMax(0, diff.y);
+
+    return best;
+}
+
+// helper of GetWindowBorderSize(): as many ports don't implement support for
+// wxSYS_BORDER/EDGE_X/Y metrics in their wxSystemSettings, use hard coded
+// fallbacks in this case
+static int wxGetMetricOrDefault(wxSystemMetric what)
+{
+    int rc = wxSystemSettings::GetMetric(what);
+    if ( rc == -1 )
+    {
+        switch ( what )
+        {
+            case wxSYS_BORDER_X:
+            case wxSYS_BORDER_Y:
+                // 2D border is by default 1 pixel wide
+                rc = 1;
+                break;
+
+            case wxSYS_EDGE_X:
+            case wxSYS_EDGE_Y:
+                // 3D borders are by default 2 pixels
+                rc = 2;
+                break;
+
+            default:
+                wxFAIL_MSG( _T("unexpected wxGetMetricOrDefault() argument") );
+                rc = 0;
+        }
+    }
+
+    return rc;
+}
+
+wxSize wxWindowBase::GetWindowBorderSize() const
+{
+    wxSize size;
+
+    switch ( GetBorder() )
+    {
+        case wxBORDER_NONE:
+            // nothing to do, size is already (0, 0)
+            break;
+
+        case wxBORDER_SIMPLE:
+        case wxBORDER_STATIC:
+            size.x = wxGetMetricOrDefault(wxSYS_BORDER_X);
+            size.y = wxGetMetricOrDefault(wxSYS_BORDER_Y);
+            break;
+
+        case wxBORDER_SUNKEN:
+        case wxBORDER_RAISED:
+            size.x = wxMax(wxGetMetricOrDefault(wxSYS_EDGE_X),
+                           wxGetMetricOrDefault(wxSYS_BORDER_X));
+            size.y = wxMax(wxGetMetricOrDefault(wxSYS_EDGE_Y),
+                           wxGetMetricOrDefault(wxSYS_BORDER_Y));
+            break;
+
+        case wxBORDER_DOUBLE:
+            size.x = wxGetMetricOrDefault(wxSYS_EDGE_X) +
+                        wxGetMetricOrDefault(wxSYS_BORDER_X);
+            size.y = wxGetMetricOrDefault(wxSYS_EDGE_Y) +
+                        wxGetMetricOrDefault(wxSYS_BORDER_Y);
+            break;
+
+        default:
+            wxFAIL_MSG(_T("Unknown border style."));
+            break;
+    }
+
+    // we have borders on both sides
+    return size*2;
+}
+
+wxSize wxWindowBase::GetEffectiveMinSize() const
+{
+    // merge the best size with the min size, giving priority to the min size
+    wxSize min = GetMinSize();
+    if (min.x == wxDefaultCoord || min.y == wxDefaultCoord)
+    {
+        wxSize best = GetBestSize();
+        if (min.x == wxDefaultCoord) min.x =  best.x;
+        if (min.y == wxDefaultCoord) min.y =  best.y;
+    }
+    return min;
+}
+
+
+void wxWindowBase::SetInitialSize(const wxSize& size)
+{
+    // Set the min size to the size passed in.  This will usually either be
+    // wxDefaultSize or the size passed to this window's ctor/Create function.
+    SetMinSize(size);
+
+    // Merge the size with the best size if needed
+    wxSize best = GetEffectiveMinSize();
+
+    // If the current size doesn't match then change it
+    if (GetSize() != best)
+        SetSize(best);
+}
+
+
+// by default the origin is not shifted
+wxPoint wxWindowBase::GetClientAreaOrigin() const
+{
+    return wxPoint(0,0);
+}
+
+wxSize wxWindowBase::ClientToWindowSize(const wxSize& size) const
+{
+    const wxSize diff(GetSize() - GetClientSize());
+
+    return wxSize(size.x == -1 ? -1 : size.x + diff.x,
+                  size.y == -1 ? -1 : size.y + diff.y);
+}
+
+wxSize wxWindowBase::WindowToClientSize(const wxSize& size) const
+{
+    const wxSize diff(GetSize() - GetClientSize());
+
+    return wxSize(size.x == -1 ? -1 : size.x - diff.x,
+                  size.y == -1 ? -1 : size.y - diff.y);
+}
+
+void wxWindowBase::SetWindowVariant( wxWindowVariant variant )
+{
+    if ( m_windowVariant != variant )
+    {
+        m_windowVariant = variant;
+
+        DoSetWindowVariant(variant);
+    }
+}
+
+void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant )
+{
+    // adjust the font height to correspond to our new variant (notice that
+    // we're only called if something really changed)
+    wxFont font = GetFont();
+    int size = font.GetPointSize();
+    switch ( variant )
+    {
+        case wxWINDOW_VARIANT_NORMAL:
+            break;
+
+        case wxWINDOW_VARIANT_SMALL:
+            size *= 3;
+            size /= 4;
+            break;
+
+        case wxWINDOW_VARIANT_MINI:
+            size *= 2;
+            size /= 3;
+            break;
+
+        case wxWINDOW_VARIANT_LARGE:
+            size *= 5;
+            size /= 4;
+            break;
+
+        default:
+            wxFAIL_MSG(_T("unexpected window variant"));
+            break;
+    }
+
+    font.SetPointSize(size);
+    SetFont(font);
+}
+
+void wxWindowBase::DoSetSizeHints( int minW, int minH,
+                                   int maxW, int maxH,
+                                   int WXUNUSED(incW), int WXUNUSED(incH) )
+{
+    wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
+                    (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),
+                 _T("min width/height must be less than max width/height!") );
+
+    m_minWidth = minW;
+    m_maxWidth = maxW;
+    m_minHeight = minH;
+    m_maxHeight = maxH;
+}
+
+
+void wxWindowBase::SetVirtualSizeHints( int minW, int minH,
+                                        int maxW, int maxH )
+{
+    m_minVirtualWidth = minW;
+    m_maxVirtualWidth = maxW;
+    m_minVirtualHeight = minH;
+    m_maxVirtualHeight = maxH;
+}
+
+void wxWindowBase::DoSetVirtualSize( int x, int y )
+{
+    if ( m_minVirtualWidth != wxDefaultCoord && m_minVirtualWidth > x )
+        x = m_minVirtualWidth;
+    if ( m_maxVirtualWidth != wxDefaultCoord && m_maxVirtualWidth < x )
+        x = m_maxVirtualWidth;
+    if ( m_minVirtualHeight != wxDefaultCoord && m_minVirtualHeight > y )
+        y = m_minVirtualHeight;
+    if ( m_maxVirtualHeight != wxDefaultCoord && m_maxVirtualHeight < y )
+        y = m_maxVirtualHeight;
+
+    m_virtualSize = wxSize(x, y);
+}
+
+wxSize wxWindowBase::DoGetVirtualSize() const
+{
+    // we should use the entire client area so if it is greater than our
+    // virtual size, expand it to fit (otherwise if the window is big enough we
+    // wouldn't be using parts of it)
+    wxSize size = GetClientSize();
+    if ( m_virtualSize.x > size.x )
+        size.x = m_virtualSize.x;
+
+    if ( m_virtualSize.y >= size.y )
+        size.y = m_virtualSize.y;
+
+    return size;
+}
+
+void wxWindowBase::DoGetScreenPosition(int *x, int *y) const
+{
+    // screen position is the same as (0, 0) in client coords for non TLWs (and
+    // TLWs override this method)
+    if ( x )
+        *x = 0;
+    if ( y )
+        *y = 0;
+
+    ClientToScreen(x, y);
+}
+
+// ----------------------------------------------------------------------------
+// show/hide/enable/disable the window
+// ----------------------------------------------------------------------------
+
+bool wxWindowBase::Show(bool show)
+{
+    if ( show != m_isShown )
+    {
+        m_isShown = show;
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+bool wxWindowBase::Enable(bool enable)
+{
+    if ( enable != m_isEnabled )
+    {
+        m_isEnabled = enable;
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+bool wxWindowBase::IsShownOnScreen() const
+{
+    // A window is shown on screen if it itself is shown and so are all its
+    // parents. But if a window is toplevel one, then its always visible on
+    // screen if IsShown() returns true, even if it has a hidden parent.
+    return IsShown() &&
+           (IsTopLevel() || !GetParent() || GetParent()->IsShownOnScreen());
+}
+
+// ----------------------------------------------------------------------------
+// RTTI
+// ----------------------------------------------------------------------------
+
+bool wxWindowBase::IsTopLevel() const
+{
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// reparenting the window
+// ----------------------------------------------------------------------------
+
+void wxWindowBase::AddChild(wxWindowBase *child)
+{
+    wxCHECK_RET( child, wxT("can't add a NULL child") );
+
+    // this should never happen and it will lead to a crash later if it does
+    // because RemoveChild() will remove only one node from the children list
+    // and the other(s) one(s) will be left with dangling pointers in them
+    wxASSERT_MSG( !GetChildren().Find((wxWindow*)child), _T("AddChild() called twice") );
+
+    GetChildren().Append((wxWindow*)child);
+    child->SetParent(this);
+}
+
+void wxWindowBase::RemoveChild(wxWindowBase *child)
+{
+    wxCHECK_RET( child, wxT("can't remove a NULL child") );
+
+    GetChildren().DeleteObject((wxWindow *)child);
+    child->SetParent(NULL);
+}
+
+bool wxWindowBase::Reparent(wxWindowBase *newParent)
+{
+    wxWindow *oldParent = GetParent();
+    if ( newParent == oldParent )
+    {
+        // nothing done
+        return false;
+    }
+
+    // unlink this window from the existing parent.
+    if ( oldParent )
+    {
+        oldParent->RemoveChild(this);
+    }
+    else
+    {
+        wxTopLevelWindows.DeleteObject((wxWindow *)this);
+    }
+
+    // add it to the new one
+    if ( newParent )
+    {
+        newParent->AddChild(this);
+    }
+    else
+    {
+        wxTopLevelWindows.Append((wxWindow *)this);
+    }
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// event handler stuff
+// ----------------------------------------------------------------------------
+
+void wxWindowBase::PushEventHandler(wxEvtHandler *handler)
+{
+    wxEvtHandler *handlerOld = GetEventHandler();
+
+    handler->SetNextHandler(handlerOld);
+
+    if ( handlerOld )
+        GetEventHandler()->SetPreviousHandler(handler);
+
+    SetEventHandler(handler);
+}
+
+wxEvtHandler *wxWindowBase::PopEventHandler(bool deleteHandler)
+{
+    wxEvtHandler *handlerA = GetEventHandler();
+    if ( handlerA )
+    {
+        wxEvtHandler *handlerB = handlerA->GetNextHandler();
+        handlerA->SetNextHandler((wxEvtHandler *)NULL);
+
+        if ( handlerB )
+            handlerB->SetPreviousHandler((wxEvtHandler *)NULL);
+        SetEventHandler(handlerB);
+
+        if ( deleteHandler )
+        {
+            delete handlerA;
+            handlerA = (wxEvtHandler *)NULL;
+        }
+    }
+
+    return handlerA;
+}
+
+bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
+{
+    wxCHECK_MSG( handler, false, _T("RemoveEventHandler(NULL) called") );
+
+    wxEvtHandler *handlerPrev = NULL,
+                 *handlerCur = GetEventHandler();
+    while ( handlerCur )
+    {
+        wxEvtHandler *handlerNext = handlerCur->GetNextHandler();
+
+        if ( handlerCur == handler )
+        {
+            if ( handlerPrev )
+            {
+                handlerPrev->SetNextHandler(handlerNext);
+            }
+            else
+            {
+                SetEventHandler(handlerNext);
+            }
+
+            if ( handlerNext )
+            {
+                handlerNext->SetPreviousHandler ( handlerPrev );
+            }
+
+            handler->SetNextHandler(NULL);
+            handler->SetPreviousHandler(NULL);
+
+            return true;
+        }
+
+        handlerPrev = handlerCur;
+        handlerCur = handlerNext;
+    }
+
+    wxFAIL_MSG( _T("where has the event handler gone?") );
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// colours, fonts &c
+// ----------------------------------------------------------------------------
+
+void wxWindowBase::InheritAttributes()
+{
+    const wxWindowBase * const parent = GetParent();
+    if ( !parent )
+        return;
+
+    // we only inherit attributes which had been explicitly set for the parent
+    // which ensures that this only happens if the user really wants it and
+    // not by default which wouldn't make any sense in modern GUIs where the
+    // controls don't all use the same fonts (nor colours)
+    if ( parent->m_inheritFont && !m_hasFont )
+        SetFont(parent->GetFont());
+
+    // in addition, there is a possibility to explicitly forbid inheriting
+    // colours at each class level by overriding ShouldInheritColours()
+    if ( ShouldInheritColours() )
+    {
+        if ( parent->m_inheritFgCol && !m_hasFgCol )
+            SetForegroundColour(parent->GetForegroundColour());
+
+        // inheriting (solid) background colour is wrong as it totally breaks
+        // any kind of themed backgrounds
+        //
+        // instead, the controls should use the same background as their parent
+        // (ideally by not drawing it at all)
+#if 0
+        if ( parent->m_inheritBgCol && !m_hasBgCol )
+            SetBackgroundColour(parent->GetBackgroundColour());
+#endif // 0
+    }
+}
+
+/* static */ wxVisualAttributes
+wxWindowBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    // it is important to return valid values for all attributes from here,
+    // GetXXX() below rely on this
+    wxVisualAttributes attrs;
+    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+
+    // On Smartphone/PocketPC, wxSYS_COLOUR_WINDOW is a better reflection of
+    // the usual background colour than wxSYS_COLOUR_BTNFACE.
+    // It's a pity that wxSYS_COLOUR_WINDOW isn't always a suitable background
+    // colour on other platforms.
+
+#if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
+    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#else
+    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+#endif
+    return attrs;
+}
+
+wxColour wxWindowBase::GetBackgroundColour() const
+{
+    if ( !m_backgroundColour.Ok() )
+    {
+        wxASSERT_MSG( !m_hasBgCol, _T("we have invalid explicit bg colour?") );
+
+        // get our default background colour
+        wxColour colBg = GetDefaultAttributes().colBg;
+
+        // we must return some valid colour to avoid redoing this every time
+        // and also to avoid surprizing the applications written for older
+        // wxWidgets versions where GetBackgroundColour() always returned
+        // something -- so give them something even if it doesn't make sense
+        // for this window (e.g. it has a themed background)
+        if ( !colBg.Ok() )
+            colBg = GetClassDefaultAttributes().colBg;
+
+        return colBg;
+    }
+    else
+        return m_backgroundColour;
+}
+
+wxColour wxWindowBase::GetForegroundColour() const
+{
+    // logic is the same as above
+    if ( !m_hasFgCol && !m_foregroundColour.Ok() )
+    {
+        wxASSERT_MSG( !m_hasFgCol, _T("we have invalid explicit fg colour?") );
+
+        wxColour colFg = GetDefaultAttributes().colFg;
+
+        if ( !colFg.Ok() )
+            colFg = GetClassDefaultAttributes().colFg;
+
+        return colFg;
+    }
+    else
+        return m_foregroundColour;
+}
+
+bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
+{
+    if ( colour == m_backgroundColour )
+        return false;
+
+    m_hasBgCol = colour.Ok();
+    if ( m_backgroundStyle != wxBG_STYLE_CUSTOM )
+        m_backgroundStyle = m_hasBgCol ? wxBG_STYLE_COLOUR : wxBG_STYLE_SYSTEM;
+
+    m_inheritBgCol = m_hasBgCol;
+    m_backgroundColour = colour;
+    SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.Ok() );
+    return true;
+}
+
+bool wxWindowBase::SetForegroundColour( const wxColour &colour )
+{
+    if (colour == m_foregroundColour )
+        return false;
+
+    m_hasFgCol = colour.Ok();
+    m_inheritFgCol = m_hasFgCol;
+    m_foregroundColour = colour;
+    SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );
+    return true;
+}
+
+bool wxWindowBase::SetCursor(const wxCursor& cursor)
+{
+    // setting an invalid cursor is ok, it means that we don't have any special
+    // cursor
+    if ( m_cursor.IsSameAs(cursor) )
+    {
+        // no change
+        return false;
+    }
+
+    m_cursor = cursor;
+
+    return true;
+}
+
+wxFont wxWindowBase::GetFont() const
+{
+    // logic is the same as in GetBackgroundColour()
+    if ( !m_font.Ok() )
+    {
+        wxASSERT_MSG( !m_hasFont, _T("we have invalid explicit font?") );
+
+        wxFont font = GetDefaultAttributes().font;
+        if ( !font.Ok() )
+            font = GetClassDefaultAttributes().font;
+
+        return font;
+    }
+    else
+        return m_font;
+}
+
+bool wxWindowBase::SetFont(const wxFont& font)
+{
+    if ( font == m_font )
+    {
+        // no change
+        return false;
+    }
+
+    m_font = font;
+    m_hasFont = font.Ok();
+    m_inheritFont = m_hasFont;
+
+    InvalidateBestSize();
+
+    return true;
+}
+
+#if wxUSE_PALETTE
+
+void wxWindowBase::SetPalette(const wxPalette& pal)
+{
+    m_hasCustomPalette = true;
+    m_palette = pal;
+
+    // VZ: can anyone explain me what do we do here?
+    wxWindowDC d((wxWindow *) this);
+    d.SetPalette(pal);
+}
+
+wxWindow *wxWindowBase::GetAncestorWithCustomPalette() const
+{
+    wxWindow *win = (wxWindow *)this;
+    while ( win && !win->HasCustomPalette() )
+    {
+        win = win->GetParent();
+    }
+
+    return win;
+}
+
+#endif // wxUSE_PALETTE
+
+#if wxUSE_CARET
+void wxWindowBase::SetCaret(wxCaret *caret)
+{
+    if ( m_caret )
+    {
+        delete m_caret;
+    }
+
+    m_caret = caret;
+
+    if ( m_caret )
+    {
+        wxASSERT_MSG( m_caret->GetWindow() == this,
+                      wxT("caret should be created associated to this window") );
+    }
+}
+#endif // wxUSE_CARET
+
+#if wxUSE_VALIDATORS
+// ----------------------------------------------------------------------------
+// validators
+// ----------------------------------------------------------------------------
+
+void wxWindowBase::SetValidator(const wxValidator& validator)
+{
+    if ( m_windowValidator )
+        delete m_windowValidator;
+
+    m_windowValidator = (wxValidator *)validator.Clone();
+
+    if ( m_windowValidator )
+        m_windowValidator->SetWindow(this);
+}
+#endif // wxUSE_VALIDATORS
+
+// ----------------------------------------------------------------------------
+// update region stuff
+// ----------------------------------------------------------------------------
+
+wxRect wxWindowBase::GetUpdateClientRect() const
+{
+    wxRegion rgnUpdate = GetUpdateRegion();
+    rgnUpdate.Intersect(GetClientRect());
+    wxRect rectUpdate = rgnUpdate.GetBox();
+    wxPoint ptOrigin = GetClientAreaOrigin();
+    rectUpdate.x -= ptOrigin.x;
+    rectUpdate.y -= ptOrigin.y;
+
+    return rectUpdate;
+}
+
+bool wxWindowBase::DoIsExposed(int x, int y) const
+{
+    return m_updateRegion.Contains(x, y) != wxOutRegion;
+}
+
+bool wxWindowBase::DoIsExposed(int x, int y, int w, int h) const
+{
+    return m_updateRegion.Contains(x, y, w, h) != wxOutRegion;
+}
+
+void wxWindowBase::ClearBackground()
+{
+    // wxGTK uses its own version, no need to add never used code
+#ifndef __WXGTK__
+    wxClientDC dc((wxWindow *)this);
+    wxBrush brush(GetBackgroundColour(), wxSOLID);
+    dc.SetBackground(brush);
+    dc.Clear();
+#endif // __WXGTK__
+}
+
+// ----------------------------------------------------------------------------
+// find child window by id or name
+// ----------------------------------------------------------------------------
+
+wxWindow *wxWindowBase::FindWindow(long id) const
+{
+    if ( id == m_windowId )
+        return (wxWindow *)this;
+
+    wxWindowBase *res = (wxWindow *)NULL;
+    wxWindowList::compatibility_iterator node;
+    for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
+    {
+        wxWindowBase *child = node->GetData();
+        res = child->FindWindow( id );
+    }
+
+    return (wxWindow *)res;
+}
+
+wxWindow *wxWindowBase::FindWindow(const wxString& name) const
+{
+    if ( name == m_windowName )
+        return (wxWindow *)this;
+
+    wxWindowBase *res = (wxWindow *)NULL;
+    wxWindowList::compatibility_iterator node;
+    for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
+    {
+        wxWindow *child = node->GetData();
+        res = child->FindWindow(name);
+    }
+
+    return (wxWindow *)res;
+}
+
+
+// find any window by id or name or label: If parent is non-NULL, look through
+// children for a label or title matching the specified string. If NULL, look
+// through all top-level windows.
+//
+// to avoid duplicating code we reuse the same helper function but with
+// different comparators
+
+typedef bool (*wxFindWindowCmp)(const wxWindow *win,
+                                const wxString& label, long id);
+
+static
+bool wxFindWindowCmpLabels(const wxWindow *win, const wxString& label,
+                           long WXUNUSED(id))
+{
+    return win->GetLabel() == label;
+}
+
+static
+bool wxFindWindowCmpNames(const wxWindow *win, const wxString& label,
+                          long WXUNUSED(id))
+{
+    return win->GetName() == label;
+}
+
+static
+bool wxFindWindowCmpIds(const wxWindow *win, const wxString& WXUNUSED(label),
+                        long id)
+{
+    return win->GetId() == id;
+}
+
+// recursive helper for the FindWindowByXXX() functions
+static
+wxWindow *wxFindWindowRecursively(const wxWindow *parent,
+                                  const wxString& label,
+                                  long id,
+                                  wxFindWindowCmp cmp)
+{
+    if ( parent )
+    {
+        // see if this is the one we're looking for
+        if ( (*cmp)(parent, label, id) )
+            return (wxWindow *)parent;
+
+        // It wasn't, so check all its children
+        for ( wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst();
+              node;
+              node = node->GetNext() )
+        {
+            // recursively check each child
+            wxWindow *win = (wxWindow *)node->GetData();
+            wxWindow *retwin = wxFindWindowRecursively(win, label, id, cmp);
+            if (retwin)
+                return retwin;
+        }
+    }
+
+    // Not found
+    return NULL;
+}
+
+// helper for FindWindowByXXX()
+static
+wxWindow *wxFindWindowHelper(const wxWindow *parent,
+                             const wxString& label,
+                             long id,
+                             wxFindWindowCmp cmp)
+{
+    if ( parent )
+    {
+        // just check parent and all its children
+        return wxFindWindowRecursively(parent, label, id, cmp);
+    }
+
+    // start at very top of wx's windows
+    for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        // recursively check each window & its children
+        wxWindow *win = node->GetData();
+        wxWindow *retwin = wxFindWindowRecursively(win, label, id, cmp);
+        if (retwin)
+            return retwin;
+    }
+
+    return NULL;
+}
+
+/* static */
+wxWindow *
+wxWindowBase::FindWindowByLabel(const wxString& title, const wxWindow *parent)
+{
+    return wxFindWindowHelper(parent, title, 0, wxFindWindowCmpLabels);
+}
+
+/* static */
+wxWindow *
+wxWindowBase::FindWindowByName(const wxString& title, const wxWindow *parent)
+{
+    wxWindow *win = wxFindWindowHelper(parent, title, 0, wxFindWindowCmpNames);
+
+    if ( !win )
+    {
+        // fall back to the label
+        win = FindWindowByLabel(title, parent);
+    }
+
+    return win;
+}
+
+/* static */
+wxWindow *
+wxWindowBase::FindWindowById( long id, const wxWindow* parent )
+{
+    return wxFindWindowHelper(parent, wxEmptyString, id, wxFindWindowCmpIds);
+}
+
+// ----------------------------------------------------------------------------
+// dialog oriented functions
+// ----------------------------------------------------------------------------
+
+void wxWindowBase::MakeModal(bool modal)
+{
+    // Disable all other windows
+    if ( IsTopLevel() )
+    {
+        wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+        while (node)
+        {
+            wxWindow *win = node->GetData();
+            if (win != this)
+                win->Enable(!modal);
+
+            node = node->GetNext();
+        }
+    }
+}
+
+bool wxWindowBase::Validate()
+{
+#if wxUSE_VALIDATORS
+    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
+
+    wxWindowList::compatibility_iterator node;
+    for ( node = m_children.GetFirst(); node; node = node->GetNext() )
+    {
+        wxWindowBase *child = node->GetData();
+        wxValidator *validator = child->GetValidator();
+        if ( validator && !validator->Validate((wxWindow *)this) )
+        {
+            return false;
+        }
+
+        if ( recurse && !child->Validate() )
+        {
+            return false;
+        }
+    }
+#endif // wxUSE_VALIDATORS
+
+    return true;
+}
+
+bool wxWindowBase::TransferDataToWindow()
+{
+#if wxUSE_VALIDATORS
+    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
+
+    wxWindowList::compatibility_iterator node;
+    for ( node = m_children.GetFirst(); node; node = node->GetNext() )
+    {
+        wxWindowBase *child = node->GetData();
+        wxValidator *validator = child->GetValidator();
+        if ( validator && !validator->TransferToWindow() )
+        {
+            wxLogWarning(_("Could not transfer data to window"));
+#if wxUSE_LOG
+            wxLog::FlushActive();
+#endif // wxUSE_LOG
+
+            return false;
+        }
+
+        if ( recurse )
+        {
+            if ( !child->TransferDataToWindow() )
+            {
+                // warning already given
+                return false;
+            }
+        }
+    }
+#endif // wxUSE_VALIDATORS
+
+    return true;
+}
+
+bool wxWindowBase::TransferDataFromWindow()
+{
+#if wxUSE_VALIDATORS
+    bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
+
+    wxWindowList::compatibility_iterator node;
+    for ( node = m_children.GetFirst(); node; node = node->GetNext() )
+    {
+        wxWindow *child = node->GetData();
+        wxValidator *validator = child->GetValidator();
+        if ( validator && !validator->TransferFromWindow() )
+        {
+            // nop warning here because the application is supposed to give
+            // one itself - we don't know here what might have gone wrongly
+
+            return false;
+        }
+
+        if ( recurse )
+        {
+            if ( !child->TransferDataFromWindow() )
+            {
+                // warning already given
+                return false;
+            }
+        }
+    }
+#endif // wxUSE_VALIDATORS
+
+    return true;
+}
+
+void wxWindowBase::InitDialog()
+{
+    wxInitDialogEvent event(GetId());
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(event);
+}
+
+// ----------------------------------------------------------------------------
+// context-sensitive help support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_HELP
+
+// associate this help text with this window
+void wxWindowBase::SetHelpText(const wxString& text)
+{
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        helpProvider->AddHelp(this, text);
+    }
+}
+
+// associate this help text with all windows with the same id as this
+// one
+void wxWindowBase::SetHelpTextForId(const wxString& text)
+{
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        helpProvider->AddHelp(GetId(), text);
+    }
+}
+
+// get the help string associated with this window (may be empty)
+// default implementation forwards calls to the help provider
+wxString
+wxWindowBase::GetHelpTextAtPoint(const wxPoint & WXUNUSED(pt),
+                                 wxHelpEvent::Origin WXUNUSED(origin)) const
+{
+    wxString text;
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        text = helpProvider->GetHelp(this);
+    }
+
+    return text;
+}
+
+// show help for this window
+void wxWindowBase::OnHelp(wxHelpEvent& event)
+{
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        wxPoint pos = event.GetPosition();
+        const wxHelpEvent::Origin origin = event.GetOrigin();
+        if ( origin == wxHelpEvent::Origin_Keyboard )
+        {
+            // if the help event was generated from keyboard it shouldn't
+            // appear at the mouse position (which is still the only position
+            // associated with help event) if the mouse is far away, although
+            // we still do use the mouse position if it's over the window
+            // because we suppose the user looks approximately at the mouse
+            // already and so it would be more convenient than showing tooltip
+            // at some arbitrary position which can be quite far from it
+            const wxRect rectClient = GetClientRect();
+            if ( !rectClient.Contains(ScreenToClient(pos)) )
+            {
+                // position help slightly under and to the right of this window
+                pos = ClientToScreen(wxPoint(
+                        2*GetCharWidth(),
+                        rectClient.height + GetCharHeight()
+                      ));
+            }
+        }
+
+        if ( helpProvider->ShowHelpAtPoint(this, pos, origin) )
+        {
+            // skip the event.Skip() below
+            return;
+        }
+    }
+
+    event.Skip();
+}
+
+#endif // wxUSE_HELP
+
+// ----------------------------------------------------------------------------
+// tooltips
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLTIPS
+
+void wxWindowBase::SetToolTip( const wxString &tip )
+{
+    // don't create the new tooltip if we already have one
+    if ( m_tooltip )
+    {
+        m_tooltip->SetTip( tip );
+    }
+    else
+    {
+        SetToolTip( new wxToolTip( tip ) );
+    }
+
+    // setting empty tooltip text does not remove the tooltip any more - use
+    // SetToolTip((wxToolTip *)NULL) for this
+}
+
+void wxWindowBase::DoSetToolTip(wxToolTip *tooltip)
+{
+    if ( m_tooltip != tooltip )
+    {
+        if ( m_tooltip )
+            delete m_tooltip;
+
+        m_tooltip = tooltip;
+    }
+}
+
+#endif // wxUSE_TOOLTIPS
+
+// ----------------------------------------------------------------------------
+// constraints and sizers
+// ----------------------------------------------------------------------------
+
+#if wxUSE_CONSTRAINTS
+
+void wxWindowBase::SetConstraints( wxLayoutConstraints *constraints )
+{
+    if ( m_constraints )
+    {
+        UnsetConstraints(m_constraints);
+        delete m_constraints;
+    }
+    m_constraints = constraints;
+    if ( m_constraints )
+    {
+        // Make sure other windows know they're part of a 'meaningful relationship'
+        if ( m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this) )
+            m_constraints->left.GetOtherWindow()->AddConstraintReference(this);
+        if ( m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this) )
+            m_constraints->top.GetOtherWindow()->AddConstraintReference(this);
+        if ( m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this) )
+            m_constraints->right.GetOtherWindow()->AddConstraintReference(this);
+        if ( m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this) )
+            m_constraints->bottom.GetOtherWindow()->AddConstraintReference(this);
+        if ( m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this) )
+            m_constraints->width.GetOtherWindow()->AddConstraintReference(this);
+        if ( m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this) )
+            m_constraints->height.GetOtherWindow()->AddConstraintReference(this);
+        if ( m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this) )
+            m_constraints->centreX.GetOtherWindow()->AddConstraintReference(this);
+        if ( m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this) )
+            m_constraints->centreY.GetOtherWindow()->AddConstraintReference(this);
+    }
+}
+
+// This removes any dangling pointers to this window in other windows'
+// constraintsInvolvedIn lists.
+void wxWindowBase::UnsetConstraints(wxLayoutConstraints *c)
+{
+    if ( c )
+    {
+        if ( c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this) )
+            c->left.GetOtherWindow()->RemoveConstraintReference(this);
+        if ( c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this) )
+            c->top.GetOtherWindow()->RemoveConstraintReference(this);
+        if ( c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this) )
+            c->right.GetOtherWindow()->RemoveConstraintReference(this);
+        if ( c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this) )
+            c->bottom.GetOtherWindow()->RemoveConstraintReference(this);
+        if ( c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this) )
+            c->width.GetOtherWindow()->RemoveConstraintReference(this);
+        if ( c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this) )
+            c->height.GetOtherWindow()->RemoveConstraintReference(this);
+        if ( c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this) )
+            c->centreX.GetOtherWindow()->RemoveConstraintReference(this);
+        if ( c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this) )
+            c->centreY.GetOtherWindow()->RemoveConstraintReference(this);
+    }
+}
+
+// Back-pointer to other windows we're involved with, so if we delete this
+// window, we must delete any constraints we're involved with.
+void wxWindowBase::AddConstraintReference(wxWindowBase *otherWin)
+{
+    if ( !m_constraintsInvolvedIn )
+        m_constraintsInvolvedIn = new wxWindowList;
+    if ( !m_constraintsInvolvedIn->Find((wxWindow *)otherWin) )
+        m_constraintsInvolvedIn->Append((wxWindow *)otherWin);
+}
+
+// REMOVE back-pointer to other windows we're involved with.
+void wxWindowBase::RemoveConstraintReference(wxWindowBase *otherWin)
+{
+    if ( m_constraintsInvolvedIn )
+        m_constraintsInvolvedIn->DeleteObject((wxWindow *)otherWin);
+}
+
+// Reset any constraints that mention this window
+void wxWindowBase::DeleteRelatedConstraints()
+{
+    if ( m_constraintsInvolvedIn )
+    {
+        wxWindowList::compatibility_iterator node = m_constraintsInvolvedIn->GetFirst();
+        while (node)
+        {
+            wxWindow *win = node->GetData();
+            wxLayoutConstraints *constr = win->GetConstraints();
+
+            // Reset any constraints involving this window
+            if ( constr )
+            {
+                constr->left.ResetIfWin(this);
+                constr->top.ResetIfWin(this);
+                constr->right.ResetIfWin(this);
+                constr->bottom.ResetIfWin(this);
+                constr->width.ResetIfWin(this);
+                constr->height.ResetIfWin(this);
+                constr->centreX.ResetIfWin(this);
+                constr->centreY.ResetIfWin(this);
+            }
+
+            wxWindowList::compatibility_iterator next = node->GetNext();
+            m_constraintsInvolvedIn->Erase(node);
+            node = next;
+        }
+
+        delete m_constraintsInvolvedIn;
+        m_constraintsInvolvedIn = (wxWindowList *) NULL;
+    }
+}
+
+#endif // wxUSE_CONSTRAINTS
+
+void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld)
+{
+    if ( sizer == m_windowSizer)
+        return;
+
+    if ( m_windowSizer )
+    {
+        m_windowSizer->SetContainingWindow(NULL);
+
+        if ( deleteOld )
+            delete m_windowSizer;
+    }
+
+    m_windowSizer = sizer;
+    if ( m_windowSizer )
+    {
+        m_windowSizer->SetContainingWindow((wxWindow *)this);
+    }
+
+    SetAutoLayout(m_windowSizer != NULL);
+}
+
+void wxWindowBase::SetSizerAndFit(wxSizer *sizer, bool deleteOld)
+{
+    SetSizer( sizer, deleteOld );
+    sizer->SetSizeHints( (wxWindow*) this );
+}
+
+
+void wxWindowBase::SetContainingSizer(wxSizer* sizer)
+{
+    // adding a window to a sizer twice is going to result in fatal and
+    // hard to debug problems later because when deleting the second
+    // associated wxSizerItem we're going to dereference a dangling
+    // pointer; so try to detect this as early as possible
+    wxASSERT_MSG( !sizer || m_containingSizer != sizer,
+                  _T("Adding a window to the same sizer twice?") );
+
+    m_containingSizer = sizer;
+}
+
+#if wxUSE_CONSTRAINTS
+
+void wxWindowBase::SatisfyConstraints()
+{
+    wxLayoutConstraints *constr = GetConstraints();
+    bool wasOk = constr && constr->AreSatisfied();
+
+    ResetConstraints();   // Mark all constraints as unevaluated
+
+    int noChanges = 1;
+
+    // if we're a top level panel (i.e. our parent is frame/dialog), our
+    // own constraints will never be satisfied any more unless we do it
+    // here
+    if ( wasOk )
+    {
+        while ( noChanges > 0 )
+        {
+            LayoutPhase1(&noChanges);
+        }
+    }
+
+    LayoutPhase2(&noChanges);
+}
+
+#endif // wxUSE_CONSTRAINTS
+
+bool wxWindowBase::Layout()
+{
+    // If there is a sizer, use it instead of the constraints
+    if ( GetSizer() )
+    {
+        int w = 0, h = 0;
+        GetVirtualSize(&w, &h);
+        GetSizer()->SetDimension( 0, 0, w, h );
+    }
+#if wxUSE_CONSTRAINTS
+    else
+    {
+        SatisfyConstraints(); // Find the right constraints values
+        SetConstraintSizes(); // Recursively set the real window sizes
+    }
+#endif
+
+    return true;
+}
+
+#if wxUSE_CONSTRAINTS
+
+// first phase of the constraints evaluation: set our own constraints
+bool wxWindowBase::LayoutPhase1(int *noChanges)
+{
+    wxLayoutConstraints *constr = GetConstraints();
+
+    return !constr || constr->SatisfyConstraints(this, noChanges);
+}
+
+// second phase: set the constraints for our children
+bool wxWindowBase::LayoutPhase2(int *noChanges)
+{
+    *noChanges = 0;
+
+    // Layout children
+    DoPhase(1);
+
+    // Layout grand children
+    DoPhase(2);
+
+    return true;
+}
+
+// Do a phase of evaluating child constraints
+bool wxWindowBase::DoPhase(int phase)
+{
+    // the list containing the children for which the constraints are already
+    // set correctly
+    wxWindowList succeeded;
+
+    // the max number of iterations we loop before concluding that we can't set
+    // the constraints
+    static const int maxIterations = 500;
+
+    for ( int noIterations = 0; noIterations < maxIterations; noIterations++ )
+    {
+        int noChanges = 0;
+
+        // loop over all children setting their constraints
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+              node;
+              node = node->GetNext() )
+        {
+            wxWindow *child = node->GetData();
+            if ( child->IsTopLevel() )
+            {
+                // top level children are not inside our client area
+                continue;
+            }
+
+            if ( !child->GetConstraints() || succeeded.Find(child) )
+            {
+                // this one is either already ok or nothing we can do about it
+                continue;
+            }
+
+            int tempNoChanges = 0;
+            bool success = phase == 1 ? child->LayoutPhase1(&tempNoChanges)
+                                      : child->LayoutPhase2(&tempNoChanges);
+            noChanges += tempNoChanges;
+
+            if ( success )
+            {
+                succeeded.Append(child);
+            }
+        }
+
+        if ( !noChanges )
+        {
+            // constraints are set
+            break;
+        }
+    }
+
+    return true;
+}
+
+void wxWindowBase::ResetConstraints()
+{
+    wxLayoutConstraints *constr = GetConstraints();
+    if ( constr )
+    {
+        constr->left.SetDone(false);
+        constr->top.SetDone(false);
+        constr->right.SetDone(false);
+        constr->bottom.SetDone(false);
+        constr->width.SetDone(false);
+        constr->height.SetDone(false);
+        constr->centreX.SetDone(false);
+        constr->centreY.SetDone(false);
+    }
+
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    while (node)
+    {
+        wxWindow *win = node->GetData();
+        if ( !win->IsTopLevel() )
+            win->ResetConstraints();
+        node = node->GetNext();
+    }
+}
+
+// Need to distinguish between setting the 'fake' size for windows and sizers,
+// and setting the real values.
+void wxWindowBase::SetConstraintSizes(bool recurse)
+{
+    wxLayoutConstraints *constr = GetConstraints();
+    if ( constr && constr->AreSatisfied() )
+    {
+        int x = constr->left.GetValue();
+        int y = constr->top.GetValue();
+        int w = constr->width.GetValue();
+        int h = constr->height.GetValue();
+
+        if ( (constr->width.GetRelationship() != wxAsIs ) ||
+             (constr->height.GetRelationship() != wxAsIs) )
+        {
+            SetSize(x, y, w, h);
+        }
+        else
+        {
+            // If we don't want to resize this window, just move it...
+            Move(x, y);
+        }
+    }
+    else if ( constr )
+    {
+        wxLogDebug(wxT("Constraints not satisfied for %s named '%s'."),
+                   GetClassInfo()->GetClassName(),
+                   GetName().c_str());
+    }
+
+    if ( recurse )
+    {
+        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+        while (node)
+        {
+            wxWindow *win = node->GetData();
+            if ( !win->IsTopLevel() && win->GetConstraints() )
+                win->SetConstraintSizes();
+            node = node->GetNext();
+        }
+    }
+}
+
+// Only set the size/position of the constraint (if any)
+void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
+{
+    wxLayoutConstraints *constr = GetConstraints();
+    if ( constr )
+    {
+        if ( x != wxDefaultCoord )
+        {
+            constr->left.SetValue(x);
+            constr->left.SetDone(true);
+        }
+        if ( y != wxDefaultCoord )
+        {
+            constr->top.SetValue(y);
+            constr->top.SetDone(true);
+        }
+        if ( w != wxDefaultCoord )
+        {
+            constr->width.SetValue(w);
+            constr->width.SetDone(true);
+        }
+        if ( h != wxDefaultCoord )
+        {
+            constr->height.SetValue(h);
+            constr->height.SetDone(true);
+        }
+    }
+}
+
+void wxWindowBase::MoveConstraint(int x, int y)
+{
+    wxLayoutConstraints *constr = GetConstraints();
+    if ( constr )
+    {
+        if ( x != wxDefaultCoord )
+        {
+            constr->left.SetValue(x);
+            constr->left.SetDone(true);
+        }
+        if ( y != wxDefaultCoord )
+        {
+            constr->top.SetValue(y);
+            constr->top.SetDone(true);
+        }
+    }
+}
+
+void wxWindowBase::GetSizeConstraint(int *w, int *h) const
+{
+    wxLayoutConstraints *constr = GetConstraints();
+    if ( constr )
+    {
+        *w = constr->width.GetValue();
+        *h = constr->height.GetValue();
+    }
+    else
+        GetSize(w, h);
+}
+
+void wxWindowBase::GetClientSizeConstraint(int *w, int *h) const
+{
+    wxLayoutConstraints *constr = GetConstraints();
+    if ( constr )
+    {
+        *w = constr->width.GetValue();
+        *h = constr->height.GetValue();
+    }
+    else
+        GetClientSize(w, h);
+}
+
+void wxWindowBase::GetPositionConstraint(int *x, int *y) const
+{
+    wxLayoutConstraints *constr = GetConstraints();
+    if ( constr )
+    {
+        *x = constr->left.GetValue();
+        *y = constr->top.GetValue();
+    }
+    else
+        GetPosition(x, y);
+}
+
+#endif // wxUSE_CONSTRAINTS
+
+void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) const
+{
+    // don't do it for the dialogs/frames - they float independently of their
+    // parent
+    if ( !IsTopLevel() )
+    {
+        wxWindow *parent = GetParent();
+        if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent )
+        {
+            wxPoint pt(parent->GetClientAreaOrigin());
+            x += pt.x;
+            y += pt.y;
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// Update UI processing
+// ----------------------------------------------------------------------------
+
+void wxWindowBase::UpdateWindowUI(long flags)
+{
+    wxUpdateUIEvent event(GetId());
+    event.SetEventObject(this);
+
+    if ( GetEventHandler()->ProcessEvent(event) )
+    {
+        DoUpdateWindowUI(event);
+    }
+
+    if (flags & wxUPDATE_UI_RECURSE)
+    {
+        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+        while (node)
+        {
+            wxWindow* child = (wxWindow*) node->GetData();
+            child->UpdateWindowUI(flags);
+            node = node->GetNext();
+        }
+    }
+}
+
+// do the window-specific processing after processing the update event
+void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
+{
+    if ( event.GetSetEnabled() )
+        Enable(event.GetEnabled());
+
+    if ( event.GetSetShown() )
+        Show(event.GetShown());
+}
+
+// ----------------------------------------------------------------------------
+// dialog units translations
+// ----------------------------------------------------------------------------
+
+wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt)
+{
+    int charWidth = GetCharWidth();
+    int charHeight = GetCharHeight();
+    wxPoint pt2 = wxDefaultPosition;
+    if (pt.x != wxDefaultCoord)
+        pt2.x = (int) ((pt.x * 4) / charWidth);
+    if (pt.y != wxDefaultCoord)
+        pt2.y = (int) ((pt.y * 8) / charHeight);
+
+    return pt2;
+}
+
+wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
+{
+    int charWidth = GetCharWidth();
+    int charHeight = GetCharHeight();
+    wxPoint pt2 = wxDefaultPosition;
+    if (pt.x != wxDefaultCoord)
+        pt2.x = (int) ((pt.x * charWidth) / 4);
+    if (pt.y != wxDefaultCoord)
+        pt2.y = (int) ((pt.y * charHeight) / 8);
+
+    return pt2;
+}
+
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+// propagate the colour change event to the subwindows
+void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    while ( node )
+    {
+        // Only propagate to non-top-level windows
+        wxWindow *win = node->GetData();
+        if ( !win->IsTopLevel() )
+        {
+            wxSysColourChangedEvent event2;
+            event.SetEventObject(win);
+            win->GetEventHandler()->ProcessEvent(event2);
+        }
+
+        node = node->GetNext();
+    }
+
+    Refresh();
+}
+
+// the default action is to populate dialog with data when it's created,
+// and nudge the UI into displaying itself correctly in case
+// we've turned the wxUpdateUIEvents frequency down low.
+void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
+{
+    TransferDataToWindow();
+
+    // Update the UI at this point
+    UpdateWindowUI(wxUPDATE_UI_RECURSE);
+}
+
+// methods for drawing the sizers in a visible way
+#ifdef __WXDEBUG__
+
+static void DrawSizers(wxWindowBase *win);
+
+static void DrawBorder(wxWindowBase *win, const wxRect& rect, bool fill = false)
+{
+    wxClientDC dc((wxWindow *)win);
+    dc.SetPen(*wxRED_PEN);
+    dc.SetBrush(fill ? wxBrush(*wxRED, wxCROSSDIAG_HATCH): *wxTRANSPARENT_BRUSH);
+    dc.DrawRectangle(rect.Deflate(1, 1));
+}
+
+static void DrawSizer(wxWindowBase *win, wxSizer *sizer)
+{
+    const wxSizerItemList& items = sizer->GetChildren();
+    for ( wxSizerItemList::const_iterator i = items.begin(),
+                                        end = items.end();
+          i != end;
+          ++i )
+    {
+        wxSizerItem *item = *i;
+        if ( item->IsSizer() )
+        {
+            DrawBorder(win, item->GetRect().Deflate(2));
+            DrawSizer(win, item->GetSizer());
+        }
+        else if ( item->IsSpacer() )
+        {
+            DrawBorder(win, item->GetRect().Deflate(2), true);
+        }
+        else if ( item->IsWindow() )
+        {
+            DrawSizers(item->GetWindow());
+        }
+    }
+}
+
+static void DrawSizers(wxWindowBase *win)
+{
+    wxSizer *sizer = win->GetSizer();
+    if ( sizer )
+    {
+        DrawBorder(win, win->GetClientSize());
+        DrawSizer(win, sizer);
+    }
+    else // no sizer, still recurse into the children
+    {
+        const wxWindowList& children = win->GetChildren();
+        for ( wxWindowList::const_iterator i = children.begin(),
+                                         end = children.end();
+              i != end;
+              ++i )
+        {
+            DrawSizers(*i);
+        }
+    }
+}
+
+#endif // __WXDEBUG__
+
+// process special middle clicks
+void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
+{
+    if ( event.ControlDown() && event.AltDown() )
+    {
+#ifdef __WXDEBUG__
+        // Ctrl-Alt-Shift-mclick makes the sizers visible in debug builds
+        if ( event.ShiftDown() )
+        {
+            DrawSizers(this);
+            return;
+        }
+#endif // __WXDEBUG__
+
+#if wxUSE_MSGDLG
+        // don't translate these strings, they're for diagnostics purposes only
+        wxString msg;
+        msg.Printf(_T("wxWidgets Library (%s port)\n")
+                   _T("Version %d.%d.%d%s%s, compiled at %s %s\n")
+                   _T("Runtime version of toolkit used is %d.%d.%s\n")
+                   _T("Copyright (c) 1995-2010 wxWidgets team"),
+                   wxPlatformInfo::Get().GetPortIdName().c_str(),
+                   wxMAJOR_VERSION,
+                   wxMINOR_VERSION,
+                   wxRELEASE_NUMBER,
+#if wxUSE_UNICODE
+                   L" (Unicode)",
+#else
+                   wxEmptyString,
+#endif
+#ifdef __WXDEBUG__
+                   _T(" Debug build"),
+#else
+                   wxEmptyString,
+#endif
+                   __TDATE__,
+                   __TTIME__,
+                   wxPlatformInfo::Get().GetToolkitMajorVersion(),
+                   wxPlatformInfo::Get().GetToolkitMinorVersion(),
+#ifdef __WXGTK__
+                   wxString::Format(_T("\nThe compile-time GTK+ version is %d.%d.%d."), GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION).c_str()
+#else
+                   wxEmptyString
+#endif
+                   );
+
+        wxMessageBox(msg, _T("wxWidgets information"),
+                     wxICON_INFORMATION | wxOK,
+                     (wxWindow *)this);
+    }
+    else
+#endif // wxUSE_MSGDLG
+    {
+        event.Skip();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// accessibility
+// ----------------------------------------------------------------------------
+
+#if wxUSE_ACCESSIBILITY
+void wxWindowBase::SetAccessible(wxAccessible* accessible)
+{
+    if (m_accessible && (accessible != m_accessible))
+        delete m_accessible;
+    m_accessible = accessible;
+    if (m_accessible)
+        m_accessible->SetWindow((wxWindow*) this);
+}
+
+// Returns the accessible object, creating if necessary.
+wxAccessible* wxWindowBase::GetOrCreateAccessible()
+{
+    if (!m_accessible)
+        m_accessible = CreateAccessible();
+    return m_accessible;
+}
+
+// Override to create a specific accessible object.
+wxAccessible* wxWindowBase::CreateAccessible()
+{
+    return new wxWindowAccessible((wxWindow*) this);
+}
+
+#endif
+
+// ----------------------------------------------------------------------------
+// list classes implementation
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STL
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxWindowList)
+
+#else // !wxUSE_STL
+
+void wxWindowListNode::DeleteData()
+{
+    delete (wxWindow *)GetData();
+}
+
+#endif // wxUSE_STL/!wxUSE_STL
+
+// ----------------------------------------------------------------------------
+// borders
+// ----------------------------------------------------------------------------
+
+wxBorder wxWindowBase::GetBorder(long flags) const
+{
+    wxBorder border = (wxBorder)(flags & wxBORDER_MASK);
+    if ( border == wxBORDER_DEFAULT )
+    {
+        border = GetDefaultBorder();
+    }
+
+    return border;
+}
+
+wxBorder wxWindowBase::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
+}
+
+// ----------------------------------------------------------------------------
+// hit testing
+// ----------------------------------------------------------------------------
+
+wxHitTest wxWindowBase::DoHitTest(wxCoord x, wxCoord y) const
+{
+    // here we just check if the point is inside the window or not
+
+    // check the top and left border first
+    bool outside = x < 0 || y < 0;
+    if ( !outside )
+    {
+        // check the right and bottom borders too
+        wxSize size = GetSize();
+        outside = x >= size.x || y >= size.y;
+    }
+
+    return outside ? wxHT_WINDOW_OUTSIDE : wxHT_WINDOW_INSIDE;
+}
+
+// ----------------------------------------------------------------------------
+// mouse capture
+// ----------------------------------------------------------------------------
+
+struct WXDLLEXPORT wxWindowNext
+{
+    wxWindow *win;
+    wxWindowNext *next;
+} *wxWindowBase::ms_winCaptureNext = NULL;
+wxWindow *wxWindowBase::ms_winCaptureCurrent = NULL;
+bool wxWindowBase::ms_winCaptureChanging = false;
+
+void wxWindowBase::CaptureMouse()
+{
+    wxLogTrace(_T("mousecapture"), _T("CaptureMouse(%p)"), wx_static_cast(void*, this));
+
+    wxASSERT_MSG( !ms_winCaptureChanging, _T("recursive CaptureMouse call?") );
+
+    ms_winCaptureChanging = true;
+
+    wxWindow *winOld = GetCapture();
+    if ( winOld )
+    {
+        ((wxWindowBase*) winOld)->DoReleaseMouse();
+
+        // save it on stack
+        wxWindowNext *item = new wxWindowNext;
+        item->win = winOld;
+        item->next = ms_winCaptureNext;
+        ms_winCaptureNext = item;
+    }
+    //else: no mouse capture to save
+
+    DoCaptureMouse();
+    ms_winCaptureCurrent = (wxWindow*)this;
+
+    ms_winCaptureChanging = false;
+}
+
+void wxWindowBase::ReleaseMouse()
+{
+    wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(%p)"), wx_static_cast(void*, this));
+
+    wxASSERT_MSG( !ms_winCaptureChanging, _T("recursive ReleaseMouse call?") );
+
+    wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") );
+
+    ms_winCaptureChanging = true;
+
+    DoReleaseMouse();
+    ms_winCaptureCurrent = NULL;
+
+    if ( ms_winCaptureNext )
+    {
+        ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();
+        ms_winCaptureCurrent = ms_winCaptureNext->win;
+
+        wxWindowNext *item = ms_winCaptureNext;
+        ms_winCaptureNext = item->next;
+        delete item;
+    }
+    //else: stack is empty, no previous capture
+
+    ms_winCaptureChanging = false;
+
+    wxLogTrace(_T("mousecapture"),
+        (const wxChar *) _T("After ReleaseMouse() mouse is captured by %p"),
+        wx_static_cast(void*, GetCapture()));
+}
+
+static void DoNotifyWindowAboutCaptureLost(wxWindow *win)
+{
+    wxMouseCaptureLostEvent event(win->GetId());
+    event.SetEventObject(win);
+    if ( !win->GetEventHandler()->ProcessEvent(event) )
+    {
+        // windows must handle this event, otherwise the app wouldn't behave
+        // correctly if it loses capture unexpectedly; see the discussion here:
+        // http://sourceforge.net/tracker/index.php?func=detail&aid=1153662&group_id=9863&atid=109863
+        // http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/82376
+        wxFAIL_MSG( _T("window that captured the mouse didn't process wxEVT_MOUSE_CAPTURE_LOST") );
+    }
+}
+
+/* static */
+void wxWindowBase::NotifyCaptureLost()
+{
+    // don't do anything if capture lost was expected, i.e. resulted from
+    // a wx call to ReleaseMouse or CaptureMouse:
+    if ( ms_winCaptureChanging )
+        return;
+
+    // if the capture was lost unexpectedly, notify every window that has
+    // capture (on stack or current) about it and clear the stack:
+
+    if ( ms_winCaptureCurrent )
+    {
+        DoNotifyWindowAboutCaptureLost(ms_winCaptureCurrent);
+        ms_winCaptureCurrent = NULL;
+    }
+
+    while ( ms_winCaptureNext )
+    {
+        wxWindowNext *item = ms_winCaptureNext;
+        ms_winCaptureNext = item->next;
+
+        DoNotifyWindowAboutCaptureLost(item->win);
+
+        delete item;
+    }
+}
+
+#if wxUSE_HOTKEY
+
+bool
+wxWindowBase::RegisterHotKey(int WXUNUSED(hotkeyId),
+                             int WXUNUSED(modifiers),
+                             int WXUNUSED(keycode))
+{
+    // not implemented
+    return false;
+}
+
+bool wxWindowBase::UnregisterHotKey(int WXUNUSED(hotkeyId))
+{
+    // not implemented
+    return false;
+}
+
+#endif // wxUSE_HOTKEY
+
+// ----------------------------------------------------------------------------
+// event processing
+// ----------------------------------------------------------------------------
+
+bool wxWindowBase::TryValidator(wxEvent& wxVALIDATOR_PARAM(event))
+{
+#if wxUSE_VALIDATORS
+    // Can only use the validator of the window which
+    // is receiving the event
+    if ( event.GetEventObject() == this )
+    {
+        wxValidator *validator = GetValidator();
+        if ( validator && validator->ProcessEvent(event) )
+        {
+            return true;
+        }
+    }
+#endif // wxUSE_VALIDATORS
+
+    return false;
+}
+
+bool wxWindowBase::TryParent(wxEvent& event)
+{
+    // carry on up the parent-child hierarchy if the propagation count hasn't
+    // reached zero yet
+    if ( event.ShouldPropagate() )
+    {
+        // honour the requests to stop propagation at this window: this is
+        // used by the dialogs, for example, to prevent processing the events
+        // from the dialog controls in the parent frame which rarely, if ever,
+        // makes sense
+        if ( !(GetExtraStyle() & wxWS_EX_BLOCK_EVENTS) )
+        {
+            wxWindow *parent = GetParent();
+            if ( parent && !parent->IsBeingDeleted() )
+            {
+                wxPropagateOnce propagateOnce(event);
+
+                return parent->GetEventHandler()->ProcessEvent(event);
+            }
+        }
+    }
+
+    return wxEvtHandler::TryParent(event);
+}
+
+// ----------------------------------------------------------------------------
+// window relationships
+// ----------------------------------------------------------------------------
+
+wxWindow *wxWindowBase::DoGetSibling(MoveKind order) const
+{
+    wxCHECK_MSG( GetParent(), NULL,
+                    _T("GetPrev/NextSibling() don't work for TLWs!") );
+
+    wxWindowList& siblings = GetParent()->GetChildren();
+    wxWindowList::compatibility_iterator i = siblings.Find((wxWindow *)this);
+    wxCHECK_MSG( i, NULL, _T("window not a child of its parent?") );
+
+    if ( order == MoveBefore )
+        i = i->GetPrevious();
+    else // MoveAfter
+        i = i->GetNext();
+
+    return i ? i->GetData() : NULL;
+}
+
+// ----------------------------------------------------------------------------
+// keyboard navigation
+// ----------------------------------------------------------------------------
+
+// Navigates in the specified direction.
+bool wxWindowBase::Navigate(int flags)
+{
+    wxNavigationKeyEvent eventNav;
+    eventNav.SetFlags(flags);
+    eventNav.SetEventObject(this);
+    if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) )
+    {
+        return true;
+    }
+    return false;
+}
+
+void wxWindowBase::DoMoveInTabOrder(wxWindow *win, MoveKind move)
+{
+    // check that we're not a top level window
+    wxCHECK_RET( GetParent(),
+                    _T("MoveBefore/AfterInTabOrder() don't work for TLWs!") );
+
+    // detect the special case when we have nothing to do anyhow and when the
+    // code below wouldn't work
+    if ( win == this )
+        return;
+
+    // find the target window in the siblings list
+    wxWindowList& siblings = GetParent()->GetChildren();
+    wxWindowList::compatibility_iterator i = siblings.Find(win);
+    wxCHECK_RET( i, _T("MoveBefore/AfterInTabOrder(): win is not a sibling") );
+
+    // unfortunately, when wxUSE_STL == 1 DetachNode() is not implemented so we
+    // can't just move the node around
+    wxWindow *self = (wxWindow *)this;
+    siblings.DeleteObject(self);
+    if ( move == MoveAfter )
+    {
+        i = i->GetNext();
+    }
+
+    if ( i )
+    {
+        siblings.Insert(i, self);
+    }
+    else // MoveAfter and win was the last sibling
+    {
+        siblings.Append(self);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// focus handling
+// ----------------------------------------------------------------------------
+
+/*static*/ wxWindow* wxWindowBase::FindFocus()
+{
+    wxWindowBase *win = DoFindFocus();
+    return win ? win->GetMainWindowOfCompositeControl() : NULL;
+}
+
+// ----------------------------------------------------------------------------
+// drag and drop
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DRAG_AND_DROP && !defined(__WXMSW__)
+
+class wxDragAcceptFilesImplTarget : public wxFileDropTarget
+{
+public:
+    wxDragAcceptFilesImplTarget(wxWindowBase *win) : m_win(win) {}
+
+    virtual bool OnDropFiles(wxCoord x, wxCoord y,
+                             const wxArrayString& filenames)
+    {
+        wxDropFilesEvent event(wxEVT_DROP_FILES,
+                               filenames.size(),
+                               wxCArrayString(filenames).Release());
+        event.SetEventObject(m_win);
+        event.m_pos.x = x;
+        event.m_pos.y = y;
+
+        return m_win->GetEventHandler()->ProcessEvent(event);
+    }
+
+private:
+    wxWindowBase * const m_win;
+
+    DECLARE_NO_COPY_CLASS(wxDragAcceptFilesImplTarget)
+};
+
+
+// Generic version of DragAcceptFiles(). It works by installing a simple
+// wxFileDropTarget-to-EVT_DROP_FILES adaptor and therefore cannot be used
+// together with explicit SetDropTarget() calls.
+void wxWindowBase::DragAcceptFiles(bool accept)
+{
+    if ( accept )
+    {
+        wxASSERT_MSG( !GetDropTarget(),
+                      _T("cannot use DragAcceptFiles() and SetDropTarget() together") );
+        SetDropTarget(new wxDragAcceptFilesImplTarget(this));
+    }
+    else
+    {
+        SetDropTarget(NULL);
+    }
+}
+
+#endif // wxUSE_DRAG_AND_DROP && !defined(__WXMSW__)
+
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+wxWindow* wxGetTopLevelParent(wxWindow *win)
+{
+    while ( win && !win->IsTopLevel() )
+         win = win->GetParent();
+
+    return win;
+}
+
+#if wxUSE_ACCESSIBILITY
+// ----------------------------------------------------------------------------
+// accessible object for windows
+// ----------------------------------------------------------------------------
+
+// Can return either a child object, or an integer
+// representing the child element, starting from 1.
+wxAccStatus wxWindowAccessible::HitTest(const wxPoint& WXUNUSED(pt), int* WXUNUSED(childId), wxAccessible** WXUNUSED(childObject))
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns the rectangle for this object (id = 0) or a child element (id > 0).
+wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    wxWindow* win = NULL;
+    if (elementId == 0)
+    {
+        win = GetWindow();
+    }
+    else
+    {
+        if (elementId <= (int) GetWindow()->GetChildren().GetCount())
+        {
+            win = GetWindow()->GetChildren().Item(elementId-1)->GetData();
+        }
+        else
+            return wxACC_FAIL;
+    }
+    if (win)
+    {
+        rect = win->GetRect();
+        if (win->GetParent() && !win->IsKindOf(CLASSINFO(wxTopLevelWindow)))
+            rect.SetPosition(win->GetParent()->ClientToScreen(rect.GetPosition()));
+        return wxACC_OK;
+    }
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Navigates from fromId to toId/toObject.
+wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
+                             int* WXUNUSED(toId), wxAccessible** toObject)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    switch (navDir)
+    {
+    case wxNAVDIR_FIRSTCHILD:
+        {
+            if (GetWindow()->GetChildren().GetCount() == 0)
+                return wxACC_FALSE;
+            wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().GetFirst()->GetData();
+            *toObject = childWindow->GetOrCreateAccessible();
+
+            return wxACC_OK;
+        }
+    case wxNAVDIR_LASTCHILD:
+        {
+            if (GetWindow()->GetChildren().GetCount() == 0)
+                return wxACC_FALSE;
+            wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().GetLast()->GetData();
+            *toObject = childWindow->GetOrCreateAccessible();
+
+            return wxACC_OK;
+        }
+    case wxNAVDIR_RIGHT:
+    case wxNAVDIR_DOWN:
+    case wxNAVDIR_NEXT:
+        {
+            wxWindowList::compatibility_iterator node =
+                wxWindowList::compatibility_iterator();
+            if (fromId == 0)
+            {
+                // Can't navigate to sibling of this window
+                // if we're a top-level window.
+                if (!GetWindow()->GetParent())
+                    return wxACC_NOT_IMPLEMENTED;
+
+                node = GetWindow()->GetParent()->GetChildren().Find(GetWindow());
+            }
+            else
+            {
+                if (fromId <= (int) GetWindow()->GetChildren().GetCount())
+                    node = GetWindow()->GetChildren().Item(fromId-1);
+            }
+
+            if (node && node->GetNext())
+            {
+                wxWindow* nextWindow = node->GetNext()->GetData();
+                *toObject = nextWindow->GetOrCreateAccessible();
+                return wxACC_OK;
+            }
+            else
+                return wxACC_FALSE;
+        }
+    case wxNAVDIR_LEFT:
+    case wxNAVDIR_UP:
+    case wxNAVDIR_PREVIOUS:
+        {
+            wxWindowList::compatibility_iterator node =
+                wxWindowList::compatibility_iterator();
+            if (fromId == 0)
+            {
+                // Can't navigate to sibling of this window
+                // if we're a top-level window.
+                if (!GetWindow()->GetParent())
+                    return wxACC_NOT_IMPLEMENTED;
+
+                node = GetWindow()->GetParent()->GetChildren().Find(GetWindow());
+            }
+            else
+            {
+                if (fromId <= (int) GetWindow()->GetChildren().GetCount())
+                    node = GetWindow()->GetChildren().Item(fromId-1);
+            }
+
+            if (node && node->GetPrevious())
+            {
+                wxWindow* previousWindow = node->GetPrevious()->GetData();
+                *toObject = previousWindow->GetOrCreateAccessible();
+                return wxACC_OK;
+            }
+            else
+                return wxACC_FALSE;
+        }
+    }
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Gets the name of the specified object.
+wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    wxString title;
+
+    // If a child, leave wxWidgets to call the function on the actual
+    // child object.
+    if (childId > 0)
+        return wxACC_NOT_IMPLEMENTED;
+
+    // This will eventually be replaced by specialised
+    // accessible classes, one for each kind of wxWidgets
+    // control or window.
+#if wxUSE_BUTTON
+    if (GetWindow()->IsKindOf(CLASSINFO(wxButton)))
+        title = ((wxButton*) GetWindow())->GetLabel();
+    else
+#endif
+        title = GetWindow()->GetName();
+
+    if (!title.empty())
+    {
+        *name = title;
+        return wxACC_OK;
+    }
+    else
+        return wxACC_NOT_IMPLEMENTED;
+}
+
+// Gets the number of children.
+wxAccStatus wxWindowAccessible::GetChildCount(int* childId)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    *childId = (int) GetWindow()->GetChildren().GetCount();
+    return wxACC_OK;
+}
+
+// Gets the specified child (starting from 1).
+// If *child is NULL and return value is wxACC_OK,
+// this means that the child is a simple element and
+// not an accessible object.
+wxAccStatus wxWindowAccessible::GetChild(int childId, wxAccessible** child)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    if (childId == 0)
+    {
+        *child = this;
+        return wxACC_OK;
+    }
+
+    if (childId > (int) GetWindow()->GetChildren().GetCount())
+        return wxACC_FAIL;
+
+    wxWindow* childWindow = GetWindow()->GetChildren().Item(childId-1)->GetData();
+    *child = childWindow->GetOrCreateAccessible();
+    if (*child)
+        return wxACC_OK;
+    else
+        return wxACC_FAIL;
+}
+
+// Gets the parent, or NULL.
+wxAccStatus wxWindowAccessible::GetParent(wxAccessible** parent)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    wxWindow* parentWindow = GetWindow()->GetParent();
+    if (!parentWindow)
+    {
+        *parent = NULL;
+        return wxACC_OK;
+    }
+    else
+    {
+        *parent = parentWindow->GetOrCreateAccessible();
+        if (*parent)
+            return wxACC_OK;
+        else
+            return wxACC_FAIL;
+    }
+}
+
+// Performs the default action. childId is 0 (the action for this object)
+// or > 0 (the action for a child).
+// Return wxACC_NOT_SUPPORTED if there is no default action for this
+// window (e.g. an edit control).
+wxAccStatus wxWindowAccessible::DoDefaultAction(int WXUNUSED(childId))
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Gets the default action for this object (0) or > 0 (the action for a child).
+// Return wxACC_OK even if there is no action. actionName is the action, or the empty
+// string if there is no action.
+// The retrieved string describes the action that is performed on an object,
+// not what the object does as a result. For example, a toolbar button that prints
+// a document has a default action of "Press" rather than "Prints the current document."
+wxAccStatus wxWindowAccessible::GetDefaultAction(int WXUNUSED(childId), wxString* WXUNUSED(actionName))
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns the description for this object or a child.
+wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString* description)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
+    if (!ht.empty())
+    {
+        *description = ht;
+        return wxACC_OK;
+    }
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns help text for this object or a child, similar to tooltip text.
+wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* helpText)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
+    if (!ht.empty())
+    {
+        *helpText = ht;
+        return wxACC_OK;
+    }
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns the keyboard shortcut for this object or child.
+// Return e.g. ALT+K
+wxAccStatus wxWindowAccessible::GetKeyboardShortcut(int WXUNUSED(childId), wxString* WXUNUSED(shortcut))
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Returns a role constant.
+wxAccStatus wxWindowAccessible::GetRole(int childId, wxAccRole* role)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    // If a child, leave wxWidgets to call the function on the actual
+    // child object.
+    if (childId > 0)
+        return wxACC_NOT_IMPLEMENTED;
+
+    if (GetWindow()->IsKindOf(CLASSINFO(wxControl)))
+        return wxACC_NOT_IMPLEMENTED;
+#if wxUSE_STATUSBAR
+    if (GetWindow()->IsKindOf(CLASSINFO(wxStatusBar)))
+        return wxACC_NOT_IMPLEMENTED;
+#endif
+#if wxUSE_TOOLBAR
+    if (GetWindow()->IsKindOf(CLASSINFO(wxToolBar)))
+        return wxACC_NOT_IMPLEMENTED;
+#endif
+
+    //*role = wxROLE_SYSTEM_CLIENT;
+    *role = wxROLE_SYSTEM_CLIENT;
+    return wxACC_OK;
+
+    #if 0
+    return wxACC_NOT_IMPLEMENTED;
+    #endif
+}
+
+// Returns a state constant.
+wxAccStatus wxWindowAccessible::GetState(int childId, long* state)
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    // If a child, leave wxWidgets to call the function on the actual
+    // child object.
+    if (childId > 0)
+        return wxACC_NOT_IMPLEMENTED;
+
+    if (GetWindow()->IsKindOf(CLASSINFO(wxControl)))
+        return wxACC_NOT_IMPLEMENTED;
+
+#if wxUSE_STATUSBAR
+    if (GetWindow()->IsKindOf(CLASSINFO(wxStatusBar)))
+        return wxACC_NOT_IMPLEMENTED;
+#endif
+#if wxUSE_TOOLBAR
+    if (GetWindow()->IsKindOf(CLASSINFO(wxToolBar)))
+        return wxACC_NOT_IMPLEMENTED;
+#endif
+
+    *state = 0;
+    return wxACC_OK;
+
+    #if 0
+    return wxACC_NOT_IMPLEMENTED;
+    #endif
+}
+
+// Returns a localized string representing the value for the object
+// or child.
+wxAccStatus wxWindowAccessible::GetValue(int WXUNUSED(childId), wxString* WXUNUSED(strValue))
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Selects the object or child.
+wxAccStatus wxWindowAccessible::Select(int WXUNUSED(childId), wxAccSelectionFlags WXUNUSED(selectFlags))
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+// Gets the window with the keyboard focus.
+// If childId is 0 and child is NULL, no object in
+// this subhierarchy has the focus.
+// If this object has the focus, child should be 'this'.
+wxAccStatus wxWindowAccessible::GetFocus(int* WXUNUSED(childId), wxAccessible** WXUNUSED(child))
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+
+#if wxUSE_VARIANT
+// Gets a variant representing the selected children
+// of this object.
+// Acceptable values:
+// - a null variant (IsNull() returns true)
+// - a list variant (GetType() == wxT("list")
+// - an integer representing the selected child element,
+//   or 0 if this object is selected (GetType() == wxT("long")
+// - a "void*" pointer to a wxAccessible child object
+wxAccStatus wxWindowAccessible::GetSelections(wxVariant* WXUNUSED(selections))
+{
+    wxASSERT( GetWindow() != NULL );
+    if (!GetWindow())
+        return wxACC_FAIL;
+
+    return wxACC_NOT_IMPLEMENTED;
+}
+#endif // wxUSE_VARIANT
+
+#endif // wxUSE_ACCESSIBILITY
+
+// ----------------------------------------------------------------------------
+// RTL support
+// ----------------------------------------------------------------------------
+
+wxCoord
+wxWindowBase::AdjustForLayoutDirection(wxCoord x,
+                                       wxCoord width,
+                                       wxCoord widthTotal) const
+{
+    if ( GetLayoutDirection() == wxLayout_RightToLeft )
+    {
+        x = widthTotal - x - width;
+    }
+
+    return x;
+}
+
diff --git a/Source/3rd Party/wx/src/common/windowid.cpp b/Source/3rd Party/wx/src/common/windowid.cpp
deleted file mode 100644
index ac55532a2..000000000
--- a/Source/3rd Party/wx/src/common/windowid.cpp	
+++ /dev/null
@@ -1,301 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/windowid.cpp
-// Purpose:     wxWindowID class - a class for managing window ids
-// Author:      Brian Vanderburg II
-// Created:     2007-09-21
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Brian Vanderburg II
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// Needed headers
-// ----------------------------------------------------------------------------
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/intl.h"
-#endif //WX_PRECOMP
-
-#include "wx/hashmap.h"
-
-// Not needed, included in defs.h
-// #include "wx/windowid.h"
-
-#define wxTRACE_WINDOWID wxT("windowid")
-
-namespace
-{
-
-#if wxUSE_AUTOID_MANAGEMENT
-
-
-// initially no ids are in use and we allocate them consecutively, but after we
-// exhaust the entire range, we wrap around and reuse the ids freed in the
-// meanwhile
-static const wxUint8 ID_FREE = 0;
-static const wxUint8 ID_STARTCOUNT = 1;
-static const wxUint8 ID_COUNTTOOLARGE = 254;
-static const wxUint8 ID_RESERVED = 255;
-
-// we use a two level count, most IDs will be used less than ID_COUNTTOOLARGE-1
-// thus we store their count directly in this array, however when the same ID
-// is reused a great number of times (more than or equal to ID_COUNTTOOLARGE),
-// the hash map stores the actual count
-wxUint8 gs_autoIdsRefCount[wxID_AUTO_HIGHEST - wxID_AUTO_LOWEST + 1] = { 0 };
-
-// NB: this variable is allocated (again) only when an ID gets at least
-// ID_COUNTTOOLARGE refs, and is freed when the latest entry in the map gets
-// freed. The cell storing the count for an ID is freed only when its count
-// gets to zero (not when it goes below ID_COUNTTOOLARGE, so as to avoid
-// degenerate cases)
-wxLongToLongHashMap *gs_autoIdsLargeRefCount = NULL;
-
-// this is an optimization used until we wrap around wxID_AUTO_HIGHEST: if this
-// value is < wxID_AUTO_HIGHEST we know that we haven't wrapped yet and so can
-// allocate the ids simply by incrementing it
-wxWindowID gs_nextAutoId = wxID_AUTO_LOWEST;
-
-// Reserve an ID
-void ReserveIdRefCount(wxWindowID winid)
-{
-    wxCHECK_RET(winid >= wxID_AUTO_LOWEST && winid <= wxID_AUTO_HIGHEST,
-            wxT("invalid id range"));
-
-    winid -= wxID_AUTO_LOWEST;
-
-    wxCHECK_RET(gs_autoIdsRefCount[winid] == ID_FREE,
-            wxT("id already in use or already reserved"));
-    gs_autoIdsRefCount[winid] = ID_RESERVED;
-}
-
-// Unreserve and id
-void UnreserveIdRefCount(wxWindowID winid)
-{
-    wxCHECK_RET(winid >= wxID_AUTO_LOWEST && winid <= wxID_AUTO_HIGHEST,
-            wxT("invalid id range"));
-
-    winid -= wxID_AUTO_LOWEST;
-
-    wxCHECK_RET(gs_autoIdsRefCount[winid] == ID_RESERVED,
-            wxT("id already in use or not reserved"));
-    gs_autoIdsRefCount[winid] = ID_FREE;
-}
-
-// Get the usage count of an id
-int GetIdRefCount(wxWindowID winid)
-{
-    wxCHECK_MSG(winid >= wxID_AUTO_LOWEST && winid <= wxID_AUTO_HIGHEST, 0,
-            wxT("invalid id range"));
-
-    winid -= wxID_AUTO_LOWEST;
-    int refCount = gs_autoIdsRefCount[winid];
-    if (refCount == ID_COUNTTOOLARGE)
-        refCount = (*gs_autoIdsLargeRefCount)[winid];
-    return refCount;
-}
-
-// Increase the count for an id
-void IncIdRefCount(wxWindowID winid)
-{
-    wxCHECK_RET(winid >= wxID_AUTO_LOWEST && winid <= wxID_AUTO_HIGHEST,
-            wxT("invalid id range"));
-
-    winid -= wxID_AUTO_LOWEST;
-
-    wxCHECK_RET(gs_autoIdsRefCount[winid] != ID_FREE, wxT("id should first be reserved"));
-
-    if(gs_autoIdsRefCount[winid] == ID_RESERVED)
-    {
-        gs_autoIdsRefCount[winid] = ID_STARTCOUNT;
-    }
-    else if (gs_autoIdsRefCount[winid] >= ID_COUNTTOOLARGE-1)
-    {
-        if (gs_autoIdsRefCount[winid] == ID_COUNTTOOLARGE-1)
-        {
-            // we need to allocate a cell, and maybe the hash map itself
-            if (!gs_autoIdsLargeRefCount)
-                gs_autoIdsLargeRefCount = new wxLongToLongHashMap;
-            (*gs_autoIdsLargeRefCount)[winid] = ID_COUNTTOOLARGE-1;
-
-            gs_autoIdsRefCount[winid] = ID_COUNTTOOLARGE;
-        }
-        ++(*gs_autoIdsLargeRefCount)[winid];
-    }
-    else
-    {
-        gs_autoIdsRefCount[winid]++;
-    }
-
-    wxLogTrace(wxTRACE_WINDOWID, wxT("Increasing ref count of ID %d to %d"),
-            winid + wxID_AUTO_LOWEST, GetIdRefCount(winid + wxID_AUTO_LOWEST));
-}
-
-// Decrease the count for an id
-void DecIdRefCount(wxWindowID winid)
-{
-    wxCHECK_RET(winid >= wxID_AUTO_LOWEST && winid <= wxID_AUTO_HIGHEST,
-            wxT("invalid id range"));
-
-    winid -= wxID_AUTO_LOWEST;
-
-    wxCHECK_RET(gs_autoIdsRefCount[winid] != ID_FREE, wxT("id count already 0"));
-
-    // DecIdRefCount is only called on an ID that has been IncIdRefCount'ed'
-    // so it should never be reserved, but test anyway
-    if(gs_autoIdsRefCount[winid] == ID_RESERVED)
-    {
-        wxFAIL_MSG(wxT("reserve id being decreased"));
-        gs_autoIdsRefCount[winid] = ID_FREE;
-    }
-    else if(gs_autoIdsRefCount[winid] == ID_COUNTTOOLARGE)
-    {
-        long &largeCount = (*gs_autoIdsLargeRefCount)[winid];
-        --largeCount;
-        if (largeCount == 0)
-        {
-            gs_autoIdsLargeRefCount->erase (winid);
-            gs_autoIdsRefCount[winid] = ID_FREE;
-
-            if (gs_autoIdsLargeRefCount->empty())
-                wxDELETE (gs_autoIdsLargeRefCount);
-        }
-    }
-    else
-        gs_autoIdsRefCount[winid]--;
-
-    wxLogTrace(wxTRACE_WINDOWID, wxT("Decreasing ref count of ID %d to %d"),
-            winid + wxID_AUTO_LOWEST, GetIdRefCount(winid + wxID_AUTO_LOWEST));
-}
-
-#else // wxUSE_AUTOID_MANAGEMENT
-
-static wxWindowID gs_nextAutoId = wxID_AUTO_HIGHEST;
-
-#endif
-
-} // anonymous namespace
-
-
-#if wxUSE_AUTOID_MANAGEMENT
-
-void wxWindowIDRef::Assign(wxWindowID winid)
-{
-    if ( winid != m_id )
-    {
-        // decrease count if it is in the managed range
-        if ( m_id >= wxID_AUTO_LOWEST && m_id <= wxID_AUTO_HIGHEST )
-            DecIdRefCount(m_id);
-
-        m_id = winid;
-
-        // increase count if it is in the managed range
-        if ( m_id >= wxID_AUTO_LOWEST && m_id <= wxID_AUTO_HIGHEST )
-            IncIdRefCount(m_id);
-    }
-}
-
-#endif // wxUSE_AUTOID_MANAGEMENT
-
-
-
-wxWindowID wxIdManager::ReserveId(int count)
-{
-    wxASSERT_MSG(count > 0, wxT("can't allocate less than 1 id"));
-
-
-#if wxUSE_AUTOID_MANAGEMENT
-    if ( gs_nextAutoId + count - 1 <= wxID_AUTO_HIGHEST )
-    {
-        wxWindowID winid = gs_nextAutoId;
-
-        while(count--)
-        {
-            ReserveIdRefCount(gs_nextAutoId++);
-        }
-
-        return winid;
-    }
-    else
-    {
-        int found = 0;
-
-        for(wxWindowID winid = wxID_AUTO_LOWEST; winid <= wxID_AUTO_HIGHEST; winid++)
-        {
-            if(GetIdRefCount(winid) == 0)
-            {
-                found++;
-                if(found == count)
-                {
-                    // Imagine this:  100 free IDs left.  Then NewId(50) takes 50
-                    // so 50 left.  Then, the 25 before that last 50 are freed, but
-                    // gs_nextAutoId does not decrement and stays where it is at
-                    // with 50 free. Then NewId(75) gets called, and since there
-                    // are only 50 left according to gs_nextAutoId, it does a
-                    // search and finds the 75 at the end.  Then NewId(10) gets
-                    // called, and accorind to gs_nextAutoId, their are still
-                    // 50 at the end so it returns them without testing the ref
-                    // To fix this, the next ID is also updated here as needed
-                    if(winid >= gs_nextAutoId)
-                        gs_nextAutoId = winid + 1;
-
-                    while(count--)
-                        ReserveIdRefCount(winid--);
-
-                    return winid + 1;
-                }
-            }
-            else
-            {
-                found = 0;
-            }
-        }
-    }
-
-    wxLogError(_("Out of window IDs.  Recommend shutting down application."));
-    return wxID_NONE;
-#else // !wxUSE_AUTOID_MANAGEMENT
-    // Make sure enough in the range
-    wxWindowID winid;
-
-    winid = gs_nextAutoId - count + 1;
-
-    if ( winid >= wxID_AUTO_LOWEST && winid <= wxID_AUTO_HIGHEST )
-    {
-        // There is enough, but it may be time to wrap
-        if(winid == wxID_AUTO_LOWEST)
-            gs_nextAutoId = wxID_AUTO_HIGHEST;
-        else
-            gs_nextAutoId = winid - 1;
-
-        return winid;
-    }
-    else
-    {
-        // There is not enough at the low end of the range or
-        // count was big enough to wrap around to the positive
-        // Surely 'count' is not so big to take up much of the range
-        gs_nextAutoId = wxID_AUTO_HIGHEST - count;
-        return gs_nextAutoId + 1;
-    }
-#endif // wxUSE_AUTOID_MANAGEMENT/!wxUSE_AUTOID_MANAGEMENT
-}
-
-void wxIdManager::UnreserveId(wxWindowID winid, int count)
-{
-    wxASSERT_MSG(count > 0, wxT("can't unreserve less than 1 id"));
-
-#if wxUSE_AUTOID_MANAGEMENT
-    while (count--)
-        UnreserveIdRefCount(winid++);
-#else
-    wxUnusedVar(winid);
-    wxUnusedVar(count);
-#endif
-}
-
diff --git a/Source/3rd Party/wx/src/common/wrapsizer.cpp b/Source/3rd Party/wx/src/common/wrapsizer.cpp
deleted file mode 100644
index 9fc675510..000000000
--- a/Source/3rd Party/wx/src/common/wrapsizer.cpp	
+++ /dev/null
@@ -1,598 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/wrapsizer.cpp
-// Purpose:     provides wxWrapSizer class for layout
-// Author:      Arne Steinarson
-// Created:     2008-05-08
-// RCS-ID:      $Id$
-// Copyright:   (c) Arne Steinarson
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/wrapsizer.h"
-#include "wx/vector.h"
-
-namespace
-{
-
-// ----------------------------------------------------------------------------
-// helper local classes
-// ----------------------------------------------------------------------------
-
-// This object changes the item proportion to INT_MAX in its ctor and restores
-// it back in the dtor.
-class wxPropChanger : public wxObject
-{
-public:
-    wxPropChanger(wxSizer& sizer, wxSizerItem& item)
-        : m_sizer(sizer),
-          m_item(item),
-          m_propOld(item.GetProportion())
-    {
-        // ensure that this item expands more than all the other ones
-        item.SetProportion(INT_MAX);
-    }
-
-    ~wxPropChanger()
-    {
-        // check if the sizer still has this item, it could have been removed
-        if ( m_sizer.GetChildren().Find(&m_item) )
-            m_item.SetProportion(m_propOld);
-    }
-
-private:
-    wxSizer& m_sizer;
-    wxSizerItem& m_item;
-    const int m_propOld;
-
-    wxDECLARE_NO_COPY_CLASS(wxPropChanger);
-};
-
-} // anonymous namespace
-
-// ============================================================================
-// wxWrapSizer implementation
-// ============================================================================
-
-IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer)
-
-wxWrapSizer::wxWrapSizer(int orient, int flags)
-           : wxBoxSizer(orient),
-             m_flags(flags),
-             m_dirInform(0),
-             m_availSize(-1),
-             m_availableOtherDir(0),
-             m_lastUsed(true),
-             m_minSizeMinor(0),
-             m_maxSizeMajor(0),
-             m_minItemMajor(INT_MAX),
-             m_rows(orient ^ wxBOTH)
-{
-}
-
-wxWrapSizer::~wxWrapSizer()
-{
-    ClearRows();
-}
-
-void wxWrapSizer::ClearRows()
-{
-    // all elements of the row sizers are also elements of this one (we
-    // directly add pointers to elements of our own m_children list to the row
-    // sizers in RecalcSizes()), so we need to detach them from the row sizer
-    // to avoid double deletion
-    wxSizerItemList& rows = m_rows.GetChildren();
-    for ( wxSizerItemList::iterator i = rows.begin(),
-                                  end = rows.end();
-          i != end;
-          ++i )
-    {
-        wxSizerItem * const item = *i;
-        wxSizer * const row = item->GetSizer();
-        if ( !row )
-        {
-            wxFAIL_MSG( "all elements of m_rows must be sizers" );
-            continue;
-        }
-
-        row->GetChildren().clear();
-
-        wxPropChanger * const
-            propChanger = static_cast<wxPropChanger *>(item->GetUserData());
-        if ( propChanger )
-        {
-            // this deletes propChanger and so restores the old proportion
-            item->SetUserData(NULL);
-        }
-    }
-}
-
-wxSizer *wxWrapSizer::GetRowSizer(size_t n)
-{
-    const wxSizerItemList& rows = m_rows.GetChildren();
-    if ( n < rows.size() )
-        return rows[n]->GetSizer();
-
-    wxSizer * const sizer = new wxBoxSizer(GetOrientation());
-    m_rows.Add(sizer, wxSizerFlags().Expand());
-    return sizer;
-}
-
-bool wxWrapSizer::InformFirstDirection(int direction,
-                                       int size,
-                                       int availableOtherDir)
-{
-    if ( !direction )
-        return false;
-
-    // Store the values for later use
-    m_availSize = size;
-    m_availableOtherDir = availableOtherDir +
-                            (direction == wxHORIZONTAL ? m_minSize.y
-                                                       : m_minSize.x);
-    m_dirInform = direction;
-    m_lastUsed = false;
-    return true;
-}
-
-
-void wxWrapSizer::AdjustLastRowItemProp(size_t n, wxSizerItem *itemLast)
-{
-    if ( !itemLast || !(m_flags & wxEXTEND_LAST_ON_EACH_LINE) )
-    {
-        // nothing to do
-        return;
-    }
-
-    wxSizerItem * const item = m_rows.GetItem(n);
-    wxCHECK_RET( item, "invalid sizer item" );
-
-    // store the item we modified and its original proportion
-    item->SetUserData(new wxPropChanger(*this, *itemLast));
-}
-
-wxSize wxWrapSizer::CalcMin()
-{
-    if ( m_children.empty() )
-        return wxSize();
-
-    // We come here to calculate min size in two different situations:
-    // 1 - Immediately after InformFirstDirection, then we find a min size that
-    //     uses one dimension maximally and the other direction minimally.
-    // 2 - Ordinary case, get a sensible min size value using the current line
-    //     layout, trying to maintain the possibility to re-arrange lines by
-    //     sizing
-
-    wxSize szBoundary;    // Keep track of boundary so we don't overflow
-    if ( m_availSize > 0 )
-    {
-        if ( m_dirInform == m_orient )
-            szBoundary = SizeFromMajorMinor(m_availSize, m_availableOtherDir);
-        else
-            szBoundary = SizeFromMajorMinor(m_availableOtherDir, m_availSize);
-    }
-
-    if ( !m_lastUsed )
-    {
-        // Case 1 above: InformFirstDirection() has just been called
-        m_lastUsed = true;
-
-        // There are two different algorithms for finding a useful min size for
-        // a wrap sizer, depending on whether the first reported size component
-        // is the opposite as our own orientation (the simpler case) or the same
-        // one (more complicated).
-        wxSize szMinPrev = m_minSize;
-        if ( m_dirInform == m_orient )
-            CalcMinFromMajor(m_availSize);
-        else
-            CalcMinFromMinor(m_availSize);
-
-        // If overflowing given boundary, go back to previous min size
-        if ( m_minSize.x > szBoundary.x || m_minSize.y>szBoundary.y )
-            m_minSize = szMinPrev;
-    }
-    else // Case 2 above: not immediately after InformFirstDirection()
-    {
-        if ( m_availSize > 0 )
-        {
-            CalcMinFittingSize(szBoundary);
-        }
-        else // Initial calculation, before we have size available to us
-        {
-            CalcMaxSingleItemSize();
-        }
-    }
-
-    return m_minSize;
-}
-
-void wxWrapSizer::CalcMinFittingSize(const wxSize& szBoundary)
-{
-    // Min size based on current line layout. It is important to
-    // provide a smaller size when possible to allow for resizing with
-    // the help of re-arranging the lines.
-    wxSize sizeMin = SizeFromMajorMinor(m_maxSizeMajor, m_minSizeMinor);
-    if ( m_minSizeMinor < SizeInMinorDir(m_size) &&
-            m_maxSizeMajor < SizeInMajorDir(m_size) )
-    {
-        m_minSize = sizeMin;
-    }
-    else
-    {
-        // Try making it a bit more narrow
-        bool done = false;
-        if ( m_minItemMajor != INT_MAX && m_maxSizeMajor > 0 )
-        {
-            // We try to present a lower min value by removing an item in
-            // the major direction (and preserving current minor min size).
-            CalcMinFromMajor(m_maxSizeMajor - m_minItemMajor);
-            if ( m_minSize.x <= szBoundary.x && m_minSize.y <= szBoundary.y )
-            {
-                SizeInMinorDir(m_minSize) = SizeInMinorDir(sizeMin);
-                done = true;
-            }
-        }
-
-        if ( !done )
-        {
-            // If failed finding little smaller area, go back to what we had
-            m_minSize = sizeMin;
-        }
-    }
-}
-
-void wxWrapSizer::CalcMaxSingleItemSize()
-{
-    // Find max item size in each direction
-    int maxMajor = 0;    // Widest item
-    int maxMinor = 0;    // Line height
-    for ( wxSizerItemList::const_iterator i = m_children.begin();
-          i != m_children.end();
-          ++i )
-    {
-        wxSizerItem * const item = *i;
-        if ( item->IsShown() )
-        {
-            wxSize sz = item->CalcMin();
-            if ( SizeInMajorDir(sz) > maxMajor )
-                maxMajor = SizeInMajorDir(sz);
-            if ( SizeInMinorDir(sz) > maxMinor )
-                maxMinor = SizeInMinorDir(sz);
-        }
-    }
-
-    // This is, of course, not our real minimal size but if we return more
-    // than this it would be impossible to shrink us to one row/column so
-    // we have to pretend that this is all we need for now.
-    m_minSize = SizeFromMajorMinor(maxMajor, maxMinor);
-}
-
-void wxWrapSizer::CalcMinFromMajor(int totMajor)
-{
-    // Algorithm for calculating min size: (assuming horizontal orientation)
-    // This is the simpler case (known major size)
-    // X: Given, totMajor
-    // Y: Based on X, calculate how many lines needed
-
-    int maxTotalMajor = 0;      // max of rowTotalMajor over all rows
-    int minorSum = 0;           // sum of sizes of all rows in minor direction
-    int maxRowMinor = 0;        // max of item minor sizes in this row
-    int rowTotalMajor = 0;      // sum of major sizes of items in this row
-
-    // pack the items in each row until we reach totMajor, then start a new row
-    for ( wxSizerItemList::const_iterator i = m_children.begin();
-          i != m_children.end();
-          ++i )
-    {
-        wxSizerItem * const item = *i;
-        if ( !item->IsShown() )
-            continue;
-
-        wxSize minItemSize = item->CalcMin();
-        const int itemMajor = SizeInMajorDir(minItemSize);
-        const int itemMinor = SizeInMinorDir(minItemSize);
-
-        // check if this is the first item in a new row: if so, we have to put
-        // it in it, whether it fits or not, as it would never fit better
-        // anyhow
-        //
-        // otherwise check if we have enough space left for this item here
-        if ( !rowTotalMajor || rowTotalMajor + itemMajor <= totMajor )
-        {
-            // continue this row
-            rowTotalMajor += itemMajor;
-            if ( itemMinor > maxRowMinor )
-                maxRowMinor = itemMinor;
-        }
-        else // start a new row
-        {
-            // minor size of the row is the max of minor sizes of its items
-            minorSum += maxRowMinor;
-            if ( rowTotalMajor > maxTotalMajor )
-                maxTotalMajor = rowTotalMajor;
-            maxRowMinor = itemMinor;
-            rowTotalMajor = itemMajor;
-        }
-    }
-
-    // account for the last (unfinished) row too
-    minorSum += maxRowMinor;
-    if ( rowTotalMajor > maxTotalMajor )
-        maxTotalMajor = rowTotalMajor;
-
-    m_minSize = SizeFromMajorMinor(maxTotalMajor, minorSum);
-}
-
-// Helper struct for CalcMinFromMinor
-struct wxWrapLine
-{
-    wxWrapLine() : m_first(NULL), m_width(0) { }
-    wxSizerItem *m_first;
-    int m_width;        // Width of line
-};
-
-void wxWrapSizer::CalcMinFromMinor(int totMinor)
-{
-    // Algorithm for calculating min size:
-    // This is the more complex case (known minor size)
-
-    // First step, find total sum of all items in primary direction
-    // and max item size in secondary direction, that gives initial
-    // estimate of the minimum number of lines.
-
-    int totMajor = 0;    // Sum of widths
-    int maxMinor = 0;    // Line height
-    int maxMajor = 0;    // Widest item
-    int itemCount = 0;
-    wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-    wxSize sz;
-    while (node)
-    {
-        wxSizerItem *item = node->GetData();
-        if ( item->IsShown() )
-        {
-            sz = item->CalcMin();
-            totMajor += SizeInMajorDir(sz);
-            if ( SizeInMinorDir(sz)>maxMinor )
-                maxMinor = SizeInMinorDir(sz);
-            if ( SizeInMajorDir(sz)>maxMinor )
-                maxMajor = SizeInMajorDir(sz);
-            itemCount++;
-        }
-        node = node->GetNext();
-    }
-
-    // The trivial case
-    if ( !itemCount || totMajor==0 || maxMinor==0 )
-    {
-        m_minSize = wxSize(0,0);
-        return;
-    }
-
-    // First attempt, use lines of average size:
-    int nrLines = totMinor / maxMinor; // Rounding down is right here
-    if ( nrLines<=1 )
-    {
-        // Another simple case, everything fits on one line
-        m_minSize = SizeFromMajorMinor(totMajor,maxMinor);
-        return;
-    }
-
-    int lineSize = totMajor / nrLines;
-    if ( lineSize<maxMajor )     // At least as wide as the widest element
-        lineSize = maxMajor;
-
-    // The algorithm is as follows (horz case):
-    // 1 - Vertical (minor) size is known.
-    // 2 - We have a reasonable estimated width from above
-    // 3 - Loop
-    // 3a - Do layout with suggested width
-    // 3b - See how much we spill over in minor dir
-    // 3c - If no spill, we're done
-    // 3d - Otherwise increase width by known smallest item
-    //      and redo loop
-
-    // First algo step: put items on lines of known max width
-    wxVector<wxWrapLine*> lines;
-
-    int sumMinor;       // Sum of all minor sizes (height of all lines)
-
-    // While we still have items 'spilling over' extend the tested line width
-    for ( ;; )
-    {
-        wxWrapLine *line = new wxWrapLine;
-        lines.push_back( line );
-
-        int tailSize = 0;   // Width of what exceeds nrLines
-        maxMinor = 0;
-        sumMinor = 0;
-        for ( node=m_children.GetFirst(); node; node=node->GetNext() )
-        {
-            wxSizerItem *item = node->GetData();
-            if ( item->IsShown() )
-            {
-                sz = item->GetMinSizeWithBorder();
-                if ( line->m_width+SizeInMajorDir(sz)>lineSize )
-                {
-                    line = new wxWrapLine;
-                    lines.push_back(line);
-                    sumMinor += maxMinor;
-                    maxMinor = 0;
-                }
-                line->m_width += SizeInMajorDir(sz);
-                if ( line->m_width && !line->m_first )
-                    line->m_first = item;
-                if ( SizeInMinorDir(sz)>maxMinor )
-                    maxMinor = SizeInMinorDir(sz);
-                if ( sumMinor+maxMinor>totMinor )
-                {
-                    // Keep track of widest tail item
-                    if ( SizeInMajorDir(sz)>tailSize )
-                        tailSize = SizeInMajorDir(sz);
-                }
-            }
-        }
-
-        if ( tailSize )
-        {
-            // Now look how much we need to extend our size
-            // We know we must have at least one more line than nrLines
-            // (otherwise no tail size).
-            int bestExtSize = 0; // Minimum extension width for current tailSize
-            for ( int ix=0; ix<nrLines; ix++ )
-            {
-                // Take what is not used on this line, see how much extension we get
-                // by adding first item on next line.
-                int size = lineSize-lines[ix]->m_width; // Left over at end of this line
-                int extSize = GetSizeInMajorDir(lines[ix+1]->m_first->GetMinSizeWithBorder()) - size;
-                if ( (extSize>=tailSize && (extSize<bestExtSize || bestExtSize<tailSize)) ||
-                    (extSize>bestExtSize && bestExtSize<tailSize) )
-                    bestExtSize = extSize;
-            }
-            // Have an extension size, ready to redo line layout
-            lineSize += bestExtSize;
-        }
-
-        // Clear helper items
-        for ( wxVector<wxWrapLine*>::iterator it=lines.begin(); it<lines.end(); ++it )
-            delete *it;
-        lines.clear();
-
-        // No spill over?
-        if ( !tailSize )
-            break;
-    }
-
-    // Now have min size in the opposite direction
-    m_minSize = SizeFromMajorMinor(lineSize,sumMinor);
-}
-
-void wxWrapSizer::FinishRow(size_t n,
-                            int rowMajor, int rowMinor,
-                            wxSizerItem *itemLast)
-{
-    // Account for the finished row size.
-    m_minSizeMinor += rowMinor;
-    if ( rowMajor > m_maxSizeMajor )
-        m_maxSizeMajor = rowMajor;
-
-    // And adjust proportion of its last item if necessary.
-    AdjustLastRowItemProp(n, itemLast);
-}
-
-void wxWrapSizer::RecalcSizes()
-{
-    // First restore any proportions we may have changed and remove the old rows
-    ClearRows();
-
-    if ( m_children.empty() )
-        return;
-
-    // Put all our items into as many row box sizers as needed.
-    const int majorSize = SizeInMajorDir(m_size);   // max size of each row
-    int rowTotalMajor = 0;                          // running row major size
-    int maxRowMinor = 0;
-
-    m_minSizeMinor = 0;
-    m_minItemMajor = INT_MAX;
-    m_maxSizeMajor = 0;
-
-    // We need at least one row
-    size_t nRow = 0;
-    wxSizer *sizer = GetRowSizer(nRow);
-
-    wxSizerItem *itemLast = NULL,   // last item processed in this row
-                *itemSpace = NULL;  // spacer which we delayed adding
-
-    // Now put our child items into child sizers instead
-    for ( wxSizerItemList::iterator i = m_children.begin();
-          i != m_children.end();
-          ++i )
-    {
-        wxSizerItem * const item = *i;
-        if ( !item->IsShown() )
-            continue;
-
-        wxSize minItemSize = item->GetMinSizeWithBorder();
-        const int itemMajor = SizeInMajorDir(minItemSize);
-        const int itemMinor = SizeInMinorDir(minItemSize);
-        if ( itemMajor > 0 && itemMajor < m_minItemMajor )
-            m_minItemMajor = itemMajor;
-
-        // Is there more space on this line? Notice that if this is the first
-        // item we add it unconditionally as it wouldn't fit in the next line
-        // any better than in this one.
-        if ( !rowTotalMajor || rowTotalMajor + itemMajor <= majorSize )
-        {
-            // There is enough space here
-            rowTotalMajor += itemMajor;
-            if ( itemMinor > maxRowMinor )
-                maxRowMinor = itemMinor;
-        }
-        else // Start a new row
-        {
-            FinishRow(nRow, rowTotalMajor, maxRowMinor, itemLast);
-
-            rowTotalMajor = itemMajor;
-            maxRowMinor = itemMinor;
-
-            // Get a new empty sizer to insert into
-            sizer = GetRowSizer(++nRow);
-
-            itemLast =
-            itemSpace = NULL;
-        }
-
-        // Only remove first/last spaces if that flag is set
-        if ( (m_flags & wxREMOVE_LEADING_SPACES) && IsSpaceItem(item) )
-        {
-            // Remember space only if we have a first item
-            if ( itemLast )
-                itemSpace = item;
-        }
-        else // not a space
-        {
-            if ( itemLast && itemSpace )
-            {
-                // We had a spacer after a real item and now that we add
-                // another real item to the same row we need to add the spacer
-                // between them two.
-                sizer->Add(itemSpace);
-            }
-
-            // Notice that we reuse a pointer to our own sizer item here, so we
-            // must remember to remove it by calling ClearRows() to avoid
-            // double deletion later
-            sizer->Add(item);
-
-            itemLast = item;
-            itemSpace = NULL;
-        }
-
-        // If item is a window, it now has a pointer to the child sizer,
-        // which is wrong. Set it to point to us.
-        if ( wxWindow *win = item->GetWindow() )
-            win->SetContainingSizer(this);
-    }
-
-    FinishRow(nRow, rowTotalMajor, maxRowMinor, itemLast);
-
-    // Now do layout on row sizer
-    m_rows.SetDimension(m_position, m_size);
-}
-
-
diff --git a/Source/3rd Party/wx/src/common/wxchar.cpp b/Source/3rd Party/wx/src/common/wxchar.cpp
new file mode 100644
index 000000000..068a1a09e
--- /dev/null
+++ b/Source/3rd Party/wx/src/common/wxchar.cpp	
@@ -0,0 +1,2293 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/wxchar.cpp
+// Purpose:     wxChar implementation
+// Author:      Ove Kaven
+// Modified by: Ron Lee, Francesco Montorsi
+// Created:     09/04/99
+// RCS-ID:      $Id: wxchar.cpp 58994 2009-02-18 15:49:09Z FM $
+// Copyright:   (c) wxWidgets copyright
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ===========================================================================
+// headers, declarations, constants
+// ===========================================================================
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/wxchar.h"
+
+#define _ISOC9X_SOURCE 1 // to get vsscanf()
+#define _BSD_SOURCE    1 // to still get strdup()
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef __WXWINCE__
+    #include <time.h>
+    #include <locale.h>
+#else
+    #include "wx/msw/wince/time.h"
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/hash.h"
+    #include "wx/utils.h"     // for wxMin and wxMax
+    #include "wx/log.h"
+#endif
+
+#if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H)
+  #include <windef.h>
+    #include <winbase.h>
+    #include <winnls.h>
+    #include <winnt.h>
+#endif
+
+#if defined(__MWERKS__) && __MSL__ >= 0x6000
+namespace std {}
+using namespace std ;
+#endif
+
+#if wxUSE_WCHAR_T
+size_t WXDLLEXPORT wxMB2WC(wchar_t *buf, const char *psz, size_t n)
+{
+  // assume that we have mbsrtowcs() too if we have wcsrtombs()
+#ifdef HAVE_WCSRTOMBS
+  mbstate_t mbstate;
+  memset(&mbstate, 0, sizeof(mbstate_t));
+#endif
+
+  if (buf) {
+    if (!n || !*psz) {
+      if (n) *buf = wxT('\0');
+      return 0;
+    }
+#ifdef HAVE_WCSRTOMBS
+    return mbsrtowcs(buf, &psz, n, &mbstate);
+#else
+    return wxMbstowcs(buf, psz, n);
+#endif
+  }
+
+  // note that we rely on common (and required by Unix98 but unfortunately not
+  // C99) extension which allows to call mbs(r)towcs() with NULL output pointer
+  // to just get the size of the needed buffer -- this is needed as otherwise
+  // we have no idea about how much space we need and if the CRT doesn't
+  // support it (the only currently known example being Metrowerks, see
+  // wx/wxchar.h) we don't use its mbstowcs() at all
+#ifdef HAVE_WCSRTOMBS
+  return mbsrtowcs((wchar_t *) NULL, &psz, 0, &mbstate);
+#else
+  return wxMbstowcs((wchar_t *) NULL, psz, 0);
+#endif
+}
+
+size_t WXDLLEXPORT wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
+{
+#ifdef HAVE_WCSRTOMBS
+  mbstate_t mbstate;
+  memset(&mbstate, 0, sizeof(mbstate_t));
+#endif
+
+  if (buf) {
+    if (!n || !*pwz) {
+      // glibc2.1 chokes on null input
+      if (n) *buf = '\0';
+      return 0;
+    }
+#ifdef HAVE_WCSRTOMBS
+    return wcsrtombs(buf, &pwz, n, &mbstate);
+#else
+    return wxWcstombs(buf, pwz, n);
+#endif
+  }
+
+#ifdef HAVE_WCSRTOMBS
+  return wcsrtombs((char *) NULL, &pwz, 0, &mbstate);
+#else
+  return wxWcstombs((char *) NULL, pwz, 0);
+#endif
+}
+#endif // wxUSE_WCHAR_T
+
+bool WXDLLEXPORT wxOKlibc()
+{
+#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) && !defined(__WINE__)
+  // glibc 2.0 uses UTF-8 even when it shouldn't
+  wchar_t res = 0;
+  if ((MB_CUR_MAX == 2) &&
+      (wxMB2WC(&res, "\xdd\xa5", 1) == 1) &&
+      (res==0x765)) {
+    // this is UTF-8 allright, check whether that's what we want
+    char *cur_locale = setlocale(LC_CTYPE, NULL);
+    if ((strlen(cur_locale) < 4) ||
+            (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) ||
+            (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) {
+      // nope, don't use libc conversion
+      return false;
+    }
+  }
+#endif
+  return true;
+}
+
+// ============================================================================
+// printf() functions business
+// ============================================================================
+
+// special test mode: define all functions below even if we don't really need
+// them to be able to test them
+#ifdef wxTEST_PRINTF
+    #undef wxFprintf
+    #undef wxPrintf
+    #undef wxSprintf
+    #undef wxVfprintf
+    #undef wxVsprintf
+    #undef wxVprintf
+    #undef wxVsnprintf_
+    #undef wxSnprintf_
+
+    #define wxNEED_WPRINTF
+
+    int wxVfprintf( FILE *stream, const wxChar *format, va_list argptr );
+#endif
+
+// ----------------------------------------------------------------------------
+// implement [v]snprintf() if the system doesn't provide a safe one
+// or if the system's one does not support positional parameters
+// (very useful for i18n purposes)
+// ----------------------------------------------------------------------------
+
+#if !defined(wxVsnprintf_)
+
+#if !wxUSE_WXVSNPRINTF
+    #error wxUSE_WXVSNPRINTF must be 1 if our wxVsnprintf_ is used
+#endif
+
+// wxUSE_STRUTILS says our wxVsnprintf_ implementation to use or not to
+// use wxStrlen and wxStrncpy functions over one-char processing loops.
+//
+// Some benchmarking revealed that wxUSE_STRUTILS == 1 has the following
+// effects:
+// -> on Windows:
+//     when in ANSI mode, this setting does not change almost anything
+//     when in Unicode mode, it gives ~ 50% of slowdown !
+// -> on Linux:
+//     both in ANSI and Unicode mode it gives ~ 60% of speedup !
+//
+#if defined(WIN32) && wxUSE_UNICODE
+#define wxUSE_STRUTILS      0
+#else
+#define wxUSE_STRUTILS      1
+#endif
+
+// some limits of our implementation
+#define wxMAX_SVNPRINTF_ARGUMENTS         64
+#define wxMAX_SVNPRINTF_FLAGBUFFER_LEN    32
+#define wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN   512
+
+// prefer snprintf over sprintf
+#if defined(__VISUALC__) || \
+        (defined(__BORLANDC__) && __BORLANDC__ >= 0x540)
+    #define system_sprintf(buff, max, flags, data)      \
+        ::_snprintf(buff, max, flags, data)
+#elif defined(HAVE_SNPRINTF)
+    #define system_sprintf(buff, max, flags, data)      \
+        ::snprintf(buff, max, flags, data)
+#else       // NB: at least sprintf() should always be available
+    // since 'max' is not used in this case, wxVsnprintf() should always
+    // ensure that 'buff' is big enough for all common needs
+    // (see wxMAX_SVNPRINTF_FLAGBUFFER_LEN and wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN)
+    #define system_sprintf(buff, max, flags, data)      \
+        ::sprintf(buff, flags, data)
+
+    #define SYSTEM_SPRINTF_IS_UNSAFE
+#endif
+
+// the conversion specifiers accepted by wxVsnprintf_
+enum wxPrintfArgType {
+    wxPAT_INVALID = -1,
+
+    wxPAT_INT,          // %d, %i, %o, %u, %x, %X
+    wxPAT_LONGINT,      // %ld, etc
+#ifdef wxLongLong_t
+    wxPAT_LONGLONGINT,  // %Ld, etc
+#endif
+    wxPAT_SIZET,        // %Zd, etc
+
+    wxPAT_DOUBLE,       // %e, %E, %f, %g, %G
+    wxPAT_LONGDOUBLE,   // %le, etc
+
+    wxPAT_POINTER,      // %p
+
+    wxPAT_CHAR,         // %hc  (in ANSI mode: %c, too)
+    wxPAT_WCHAR,        // %lc  (in Unicode mode: %c, too)
+
+    wxPAT_PCHAR,        // %s   (related to a char *)
+    wxPAT_PWCHAR,       // %s   (related to a wchar_t *)
+
+    wxPAT_NINT,         // %n
+    wxPAT_NSHORTINT,    // %hn
+    wxPAT_NLONGINT      // %ln
+};
+
+// an argument passed to wxVsnprintf_
+typedef union {
+    int pad_int;                        //  %d, %i, %o, %u, %x, %X
+    long int pad_longint;               // %ld, etc
+#ifdef wxLongLong_t
+    wxLongLong_t pad_longlongint;      // %Ld, etc
+#endif
+    size_t pad_sizet;                   // %Zd, etc
+
+    double pad_double;                  // %e, %E, %f, %g, %G
+    long double pad_longdouble;         // %le, etc
+
+    void *pad_pointer;                  // %p
+
+    char pad_char;                      // %hc  (in ANSI mode: %c, too)
+    wchar_t pad_wchar;                  // %lc  (in Unicode mode: %c, too)
+
+    char *pad_pchar;                    // %s   (related to a char *)
+    wchar_t *pad_pwchar;                // %s   (related to a wchar_t *)
+
+    int *pad_nint;                      // %n
+    short int *pad_nshortint;           // %hn
+    long int *pad_nlongint;             // %ln
+} wxPrintfArg;
+
+
+// Contains parsed data relative to a conversion specifier given to
+// wxVsnprintf_ and parsed from the format string
+// NOTE: in C++ there is almost no difference between struct & classes thus
+//       there is no performance gain by using a struct here...
+class wxPrintfConvSpec
+{
+public:
+
+    // the position of the argument relative to this conversion specifier
+    size_t m_pos;
+
+    // the type of this conversion specifier
+    wxPrintfArgType m_type;
+
+    // the minimum and maximum width
+    // when one of this var is set to -1 it means: use the following argument
+    // in the stack as minimum/maximum width for this conversion specifier
+    int m_nMinWidth, m_nMaxWidth;
+
+    // does the argument need to the be aligned to left ?
+    bool m_bAlignLeft;
+
+    // pointer to the '%' of this conversion specifier in the format string
+    // NOTE: this points somewhere in the string given to the Parse() function -
+    //       it's task of the caller ensure that memory is still valid !
+    const wxChar *m_pArgPos;
+
+    // pointer to the last character of this conversion specifier in the
+    // format string
+    // NOTE: this points somewhere in the string given to the Parse() function -
+    //       it's task of the caller ensure that memory is still valid !
+    const wxChar *m_pArgEnd;
+
+    // a little buffer where formatting flags like #+\.hlqLZ are stored by Parse()
+    // for use in Process()
+    // NB: even if this buffer is used only for numeric conversion specifiers and
+    //     thus could be safely declared as a char[] buffer, we want it to be wxChar
+    //     so that in Unicode builds we can avoid to convert its contents to Unicode
+    //     chars when copying it in user's buffer.
+    char m_szFlags[wxMAX_SVNPRINTF_FLAGBUFFER_LEN];
+
+
+public:
+
+    // we don't declare this as a constructor otherwise it would be called
+    // automatically and we don't want this: to be optimized, wxVsnprintf_
+    // calls this function only on really-used instances of this class.
+    void Init();
+
+    // Parses the first conversion specifier in the given string, which must
+    // begin with a '%'. Returns false if the first '%' does not introduce a
+    // (valid) conversion specifier and thus should be ignored.
+    bool Parse(const wxChar *format);
+
+    // Process this conversion specifier and puts the result in the given
+    // buffer. Returns the number of characters written in 'buf' or -1 if
+    // there's not enough space.
+    int Process(wxChar *buf, size_t lenMax, wxPrintfArg *p, size_t written);
+
+    // Loads the argument of this conversion specifier from given va_list.
+    bool LoadArg(wxPrintfArg *p, va_list &argptr);
+
+private:
+    // An helper function of LoadArg() which is used to handle the '*' flag
+    void ReplaceAsteriskWith(int w);
+};
+
+void wxPrintfConvSpec::Init()
+{
+    m_nMinWidth = 0;
+    m_nMaxWidth = 0xFFFF;
+    m_pos = 0;
+    m_bAlignLeft = false;
+    m_pArgPos = m_pArgEnd = NULL;
+    m_type = wxPAT_INVALID;
+
+    // this character will never be removed from m_szFlags array and
+    // is important when calling sprintf() in wxPrintfConvSpec::Process() !
+    m_szFlags[0] = '%';
+}
+
+bool wxPrintfConvSpec::Parse(const wxChar *format)
+{
+    bool done = false;
+
+    // temporary parse data
+    size_t flagofs = 1;
+    bool in_prec,       // true if we found the dot in some previous iteration
+         prec_dot;      // true if the dot has been already added to m_szFlags
+    int ilen = 0;
+
+    m_bAlignLeft = in_prec = prec_dot = false;
+    m_pArgPos = m_pArgEnd = format;
+    do
+    {
+#define CHECK_PREC \
+        if (in_prec && !prec_dot) \
+        { \
+            m_szFlags[flagofs++] = '.'; \
+            prec_dot = true; \
+        }
+
+        // what follows '%'?
+        const wxChar ch = *(++m_pArgEnd);
+        switch ( ch )
+        {
+            case wxT('\0'):
+                return false;       // not really an argument
+
+            case wxT('%'):
+                return false;       // not really an argument
+
+            case wxT('#'):
+            case wxT('0'):
+            case wxT(' '):
+            case wxT('+'):
+            case wxT('\''):
+                CHECK_PREC
+                m_szFlags[flagofs++] = char(ch);
+                break;
+
+            case wxT('-'):
+                CHECK_PREC
+                m_bAlignLeft = true;
+                m_szFlags[flagofs++] = char(ch);
+                break;
+
+            case wxT('.'):
+                CHECK_PREC
+                in_prec = true;
+                prec_dot = false;
+                m_nMaxWidth = 0;
+                // dot will be auto-added to m_szFlags if non-negative
+                // number follows
+                break;
+
+            case wxT('h'):
+                ilen = -1;
+                CHECK_PREC
+                m_szFlags[flagofs++] = char(ch);
+                break;
+
+            case wxT('l'):
+                // NB: it's safe to use flagofs-1 as flagofs always start from 1
+                if (m_szFlags[flagofs-1] == 'l')       // 'll' modifier is the same as 'L' or 'q'
+                    ilen = 2;
+                else
+                ilen = 1;
+                CHECK_PREC
+                m_szFlags[flagofs++] = char(ch);
+                break;
+
+            case wxT('q'):
+            case wxT('L'):
+                ilen = 2;
+                CHECK_PREC
+                m_szFlags[flagofs++] = char(ch);
+                break;
+#ifdef __WXMSW__
+            // under Windows we support the special '%I64' notation as longlong
+            // integer conversion specifier for MSVC compatibility
+            // (it behaves exactly as '%lli' or '%Li' or '%qi')
+            case wxT('I'):
+                if (*(m_pArgEnd+1) != wxT('6') ||
+                    *(m_pArgEnd+2) != wxT('4'))
+                    return false;       // bad format
+
+                m_pArgEnd++;
+                m_pArgEnd++;
+
+                ilen = 2;
+                CHECK_PREC
+                m_szFlags[flagofs++] = char(ch);
+                m_szFlags[flagofs++] = '6';
+                m_szFlags[flagofs++] = '4';
+                break;
+#endif      // __WXMSW__
+
+            case wxT('Z'):
+                ilen = 3;
+                CHECK_PREC
+                m_szFlags[flagofs++] = char(ch);
+                break;
+
+            case wxT('*'):
+                if (in_prec)
+                {
+                    CHECK_PREC
+
+                    // tell Process() to use the next argument
+                    // in the stack as maxwidth...
+                    m_nMaxWidth = -1;
+                }
+                else
+                {
+                    // tell Process() to use the next argument
+                    // in the stack as minwidth...
+                    m_nMinWidth = -1;
+                }
+
+                // save the * in our formatting buffer...
+                // will be replaced later by Process()
+                m_szFlags[flagofs++] = char(ch);
+                break;
+
+            case wxT('1'): case wxT('2'): case wxT('3'):
+            case wxT('4'): case wxT('5'): case wxT('6'):
+            case wxT('7'): case wxT('8'): case wxT('9'):
+                {
+                    int len = 0;
+                    CHECK_PREC
+                    while ( (*m_pArgEnd >= wxT('0')) &&
+                            (*m_pArgEnd <= wxT('9')) )
+                    {
+                        m_szFlags[flagofs++] = char(*m_pArgEnd);
+                        len = len*10 + (*m_pArgEnd - wxT('0'));
+                        m_pArgEnd++;
+                    }
+
+                    if (in_prec)
+                        m_nMaxWidth = len;
+                    else
+                        m_nMinWidth = len;
+
+                    m_pArgEnd--; // the main loop pre-increments n again
+                }
+                break;
+
+            case wxT('$'):      // a positional parameter (e.g. %2$s) ?
+                {
+                    if (m_nMinWidth <= 0)
+                        break;      // ignore this formatting flag as no
+                                    // numbers are preceding it
+
+                    // remove from m_szFlags all digits previously added
+                    do {
+                        flagofs--;
+                    } while (m_szFlags[flagofs] >= '1' &&
+                             m_szFlags[flagofs] <= '9');
+
+                    // re-adjust the offset making it point to the
+                    // next free char of m_szFlags
+                    flagofs++;
+
+                    m_pos = m_nMinWidth;
+                    m_nMinWidth = 0;
+                }
+                break;
+
+            case wxT('d'):
+            case wxT('i'):
+            case wxT('o'):
+            case wxT('u'):
+            case wxT('x'):
+            case wxT('X'):
+                CHECK_PREC
+                m_szFlags[flagofs++] = char(ch);
+                m_szFlags[flagofs] = '\0';
+                if (ilen == 0)
+                    m_type = wxPAT_INT;
+                else if (ilen == -1)
+                    // NB: 'short int' value passed through '...'
+                    //      is promoted to 'int', so we have to get
+                    //      an int from stack even if we need a short
+                    m_type = wxPAT_INT;
+                else if (ilen == 1)
+                    m_type = wxPAT_LONGINT;
+                else if (ilen == 2)
+#ifdef wxLongLong_t
+                    m_type = wxPAT_LONGLONGINT;
+#else // !wxLongLong_t
+                    m_type = wxPAT_LONGINT;
+#endif // wxLongLong_t/!wxLongLong_t
+                else if (ilen == 3)
+                    m_type = wxPAT_SIZET;
+                done = true;
+                break;
+
+            case wxT('e'):
+            case wxT('E'):
+            case wxT('f'):
+            case wxT('g'):
+            case wxT('G'):
+                CHECK_PREC
+                m_szFlags[flagofs++] = char(ch);
+                m_szFlags[flagofs] = '\0';
+                if (ilen == 2)
+                    m_type = wxPAT_LONGDOUBLE;
+                else
+                    m_type = wxPAT_DOUBLE;
+                done = true;
+                break;
+
+            case wxT('p'):
+                m_type = wxPAT_POINTER;
+                m_szFlags[flagofs++] = char(ch);
+                m_szFlags[flagofs] = '\0';
+                done = true;
+                break;
+
+            case wxT('c'):
+                m_szFlags[flagofs++] = char(ch);
+                m_szFlags[flagofs] = '\0';
+                if (ilen == -1)
+                {
+                    // in Unicode mode %hc == ANSI character
+                    // and in ANSI mode, %hc == %c == ANSI...
+                    m_type = wxPAT_CHAR;
+                }
+                else if (ilen == 1)
+                {
+                    // in ANSI mode %lc == Unicode character
+                    // and in Unicode mode, %lc == %c == Unicode...
+                    m_type = wxPAT_WCHAR;
+                }
+                else
+                {
+#if wxUSE_UNICODE
+                    // in Unicode mode, %c == Unicode character
+                    m_type = wxPAT_WCHAR;
+#else
+                    // in ANSI mode, %c == ANSI character
+                    m_type = wxPAT_CHAR;
+#endif
+                }
+                done = true;
+                break;
+
+            case wxT('s'):
+                m_szFlags[flagofs++] = char(ch);
+                m_szFlags[flagofs] = '\0';
+                if (ilen == -1)
+                {
+                    // Unicode mode wx extension: we'll let %hs mean non-Unicode
+                    // strings (when in ANSI mode, %s == %hs == ANSI string)
+                    m_type = wxPAT_PCHAR;
+                }
+                else if (ilen == 1)
+                {
+                    // in Unicode mode, %ls == %s == Unicode string
+                    // in ANSI mode, %ls == Unicode string
+                    m_type = wxPAT_PWCHAR;
+                }
+                else
+                {
+#if wxUSE_UNICODE
+                    m_type = wxPAT_PWCHAR;
+#else
+                    m_type = wxPAT_PCHAR;
+#endif
+                }
+                done = true;
+                break;
+
+            case wxT('n'):
+                m_szFlags[flagofs++] = char(ch);
+                m_szFlags[flagofs] = '\0';
+                if (ilen == 0)
+                    m_type = wxPAT_NINT;
+                else if (ilen == -1)
+                    m_type = wxPAT_NSHORTINT;
+                else if (ilen >= 1)
+                    m_type = wxPAT_NLONGINT;
+                done = true;
+                break;
+
+            default:
+                // bad format, don't consider this an argument;
+                // leave it unchanged
+                return false;
+        }
+
+        if (flagofs == wxMAX_SVNPRINTF_FLAGBUFFER_LEN)
+        {
+            wxLogDebug(wxT("Too many flags specified for a single conversion specifier!"));
+            return false;
+        }
+    }
+    while (!done);
+
+    return true;        // parsing was successful
+}
+
+
+void wxPrintfConvSpec::ReplaceAsteriskWith(int width)
+{
+    char temp[wxMAX_SVNPRINTF_FLAGBUFFER_LEN];
+
+    // find the first * in our flag buffer
+    char *pwidth = strchr(m_szFlags, '*');
+    wxCHECK_RET(pwidth, _T("field width must be specified"));
+
+    // save what follows the * (the +1 is to skip the asterisk itself!)
+    strcpy(temp, pwidth+1);
+    if (width < 0)
+    {
+        pwidth[0] = wxT('-');
+        pwidth++;
+    }
+
+    // replace * with the actual integer given as width
+#ifndef SYSTEM_SPRINTF_IS_UNSAFE
+    int maxlen = (m_szFlags + wxMAX_SVNPRINTF_FLAGBUFFER_LEN - pwidth) /
+                        sizeof(*m_szFlags);
+#endif
+    int offset = system_sprintf(pwidth, maxlen, "%d", abs(width));
+
+    // restore after the expanded * what was following it
+    strcpy(pwidth+offset, temp);
+}
+
+bool wxPrintfConvSpec::LoadArg(wxPrintfArg *p, va_list &argptr)
+{
+    // was the '*' width/precision specifier used ?
+    if (m_nMaxWidth == -1)
+    {
+        // take the maxwidth specifier from the stack
+        m_nMaxWidth = va_arg(argptr, int);
+        if (m_nMaxWidth < 0)
+            m_nMaxWidth = 0;
+        else
+            ReplaceAsteriskWith(m_nMaxWidth);
+    }
+
+    if (m_nMinWidth == -1)
+    {
+        // take the minwidth specifier from the stack
+        m_nMinWidth = va_arg(argptr, int);
+
+        ReplaceAsteriskWith(m_nMinWidth);
+        if (m_nMinWidth < 0)
+        {
+            m_bAlignLeft = !m_bAlignLeft;
+            m_nMinWidth = -m_nMinWidth;
+        }
+    }
+
+    switch (m_type) {
+        case wxPAT_INT:
+            p->pad_int = va_arg(argptr, int);
+            break;
+        case wxPAT_LONGINT:
+            p->pad_longint = va_arg(argptr, long int);
+            break;
+#ifdef wxLongLong_t
+        case wxPAT_LONGLONGINT:
+            p->pad_longlongint = va_arg(argptr, wxLongLong_t);
+            break;
+#endif // wxLongLong_t
+        case wxPAT_SIZET:
+            p->pad_sizet = va_arg(argptr, size_t);
+            break;
+        case wxPAT_DOUBLE:
+            p->pad_double = va_arg(argptr, double);
+            break;
+        case wxPAT_LONGDOUBLE:
+            p->pad_longdouble = va_arg(argptr, long double);
+            break;
+        case wxPAT_POINTER:
+            p->pad_pointer = va_arg(argptr, void *);
+            break;
+
+        case wxPAT_CHAR:
+            p->pad_char = (char)va_arg(argptr, int);  // char is promoted to int when passed through '...'
+            break;
+        case wxPAT_WCHAR:
+            p->pad_wchar = (wchar_t)va_arg(argptr, int);  // char is promoted to int when passed through '...'
+            break;
+
+        case wxPAT_PCHAR:
+            p->pad_pchar = va_arg(argptr, char *);
+            break;
+        case wxPAT_PWCHAR:
+            p->pad_pwchar = va_arg(argptr, wchar_t *);
+            break;
+
+        case wxPAT_NINT:
+            p->pad_nint = va_arg(argptr, int *);
+            break;
+        case wxPAT_NSHORTINT:
+            p->pad_nshortint = va_arg(argptr, short int *);
+            break;
+        case wxPAT_NLONGINT:
+            p->pad_nlongint = va_arg(argptr, long int *);
+            break;
+
+        case wxPAT_INVALID:
+        default:
+            return false;
+    }
+
+    return true;    // loading was successful
+}
+
+int wxPrintfConvSpec::Process(wxChar *buf, size_t lenMax, wxPrintfArg *p, size_t written)
+{
+    // buffer to avoid dynamic memory allocation each time for small strings;
+    // note that this buffer is used only to hold results of number formatting,
+    // %s directly writes user's string in buf, without using szScratch
+    char szScratch[wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN];
+    size_t lenScratch = 0, lenCur = 0;
+
+#define APPEND_CH(ch) \
+                { \
+                    if ( lenCur == lenMax ) \
+                        return -1; \
+                    \
+                    buf[lenCur++] = ch; \
+                }
+
+#define APPEND_STR(s) \
+                { \
+                    for ( const wxChar *p = s; *p; p++ ) \
+                    { \
+                        APPEND_CH(*p); \
+                    } \
+                }
+
+    switch ( m_type )
+    {
+        case wxPAT_INT:
+            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_int);
+            break;
+
+        case wxPAT_LONGINT:
+            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longint);
+            break;
+
+#ifdef wxLongLong_t
+        case wxPAT_LONGLONGINT:
+            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longlongint);
+            break;
+#endif // SIZEOF_LONG_LONG
+
+        case wxPAT_SIZET:
+            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_sizet);
+            break;
+
+        case wxPAT_LONGDOUBLE:
+            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longdouble);
+            break;
+
+        case wxPAT_DOUBLE:
+            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_double);
+            break;
+
+        case wxPAT_POINTER:
+            lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_pointer);
+            break;
+
+        case wxPAT_CHAR:
+        case wxPAT_WCHAR:
+            {
+                wxChar val =
+#if wxUSE_UNICODE
+                    p->pad_wchar;
+
+                if (m_type == wxPAT_CHAR)
+                {
+                    // user passed a character explicitely indicated as ANSI...
+                    const char buf[2] = { p->pad_char, 0 };
+                    val = wxString(buf, wxConvLibc)[0u];
+
+                    //wprintf(L"converting ANSI=>Unicode");   // for debug
+                }
+#else
+                    p->pad_char;
+
+#if wxUSE_WCHAR_T
+                if (m_type == wxPAT_WCHAR)
+                {
+                    // user passed a character explicitely indicated as Unicode...
+                    const wchar_t buf[2] = { p->pad_wchar, 0 };
+                    val = wxString(buf, wxConvLibc)[0u];
+
+                    //printf("converting Unicode=>ANSI");   // for debug
+                }
+#endif
+#endif
+
+                size_t i;
+
+                if (!m_bAlignLeft)
+                    for (i = 1; i < (size_t)m_nMinWidth; i++)
+                        APPEND_CH(_T(' '));
+
+                APPEND_CH(val);
+
+                if (m_bAlignLeft)
+                    for (i = 1; i < (size_t)m_nMinWidth; i++)
+                        APPEND_CH(_T(' '));
+            }
+            break;
+
+        case wxPAT_PCHAR:
+        case wxPAT_PWCHAR:
+            {
+                wxString s;
+                const wxChar *val =
+#if wxUSE_UNICODE
+                    p->pad_pwchar;
+
+                if (m_type == wxPAT_PCHAR)
+                {
+                    // user passed a string explicitely indicated as ANSI...
+                    val = s = wxString(p->pad_pchar, wxConvLibc);
+
+                    //wprintf(L"converting ANSI=>Unicode");   // for debug
+                }
+#else
+                    p->pad_pchar;
+
+#if wxUSE_WCHAR_T
+                if (m_type == wxPAT_PWCHAR)
+                {
+                    // user passed a string explicitely indicated as Unicode...
+                    val = s = wxString(p->pad_pwchar, wxConvLibc);
+
+                    //printf("converting Unicode=>ANSI");   // for debug
+                }
+#endif
+#endif
+                int len;
+
+                if (val)
+                {
+#if wxUSE_STRUTILS
+                    // at this point we are sure that m_nMaxWidth is positive or null
+                    // (see top of wxPrintfConvSpec::LoadArg)
+                    len = wxMin((unsigned int)m_nMaxWidth, wxStrlen(val));
+#else
+                    for ( len = 0; val[len] && (len < m_nMaxWidth); len++ )
+                        ;
+#endif
+                }
+                else if (m_nMaxWidth >= 6)
+                {
+                    val = wxT("(null)");
+                    len = 6;
+                }
+                else
+                {
+                    val = wxEmptyString;
+                    len = 0;
+                }
+
+                int i;
+
+                if (!m_bAlignLeft)
+                {
+                    for (i = len; i < m_nMinWidth; i++)
+                        APPEND_CH(_T(' '));
+                }
+
+#if wxUSE_STRUTILS
+                len = wxMin((unsigned int)len, lenMax-lenCur);
+                wxStrncpy(buf+lenCur, val, len);
+                lenCur += len;
+#else
+                for (i = 0; i < len; i++)
+                    APPEND_CH(val[i]);
+#endif
+
+                if (m_bAlignLeft)
+                {
+                    for (i = len; i < m_nMinWidth; i++)
+                        APPEND_CH(_T(' '));
+                }
+            }
+            break;
+
+        case wxPAT_NINT:
+            *p->pad_nint = written;
+            break;
+
+        case wxPAT_NSHORTINT:
+            *p->pad_nshortint = (short int)written;
+            break;
+
+        case wxPAT_NLONGINT:
+            *p->pad_nlongint = written;
+            break;
+
+        case wxPAT_INVALID:
+        default:
+            return -1;
+    }
+
+    // if we used system's sprintf() then we now need to append the s_szScratch
+    // buffer to the given one...
+    switch (m_type)
+    {
+        case wxPAT_INT:
+        case wxPAT_LONGINT:
+#ifdef wxLongLong_t
+        case wxPAT_LONGLONGINT:
+#endif
+        case wxPAT_SIZET:
+        case wxPAT_LONGDOUBLE:
+        case wxPAT_DOUBLE:
+        case wxPAT_POINTER:
+            wxASSERT(lenScratch < wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN);
+#if !wxUSE_UNICODE
+            {
+                if (lenMax < lenScratch)
+                {
+                    // fill output buffer and then return -1
+                    wxStrncpy(buf, szScratch, lenMax);
+                    return -1;
+                }
+                wxStrncpy(buf, szScratch, lenScratch);
+                lenCur += lenScratch;
+            }
+#else
+            {
+                // Copy the char scratch to the wide output. This requires
+                // conversion, but we can optimise by making use of the fact
+                // that we are formatting numbers, this should mean only 7-bit
+                // ascii characters are involved.
+                wxChar *bufptr = buf;
+                const wxChar *bufend = buf + lenMax;
+                const char *scratchptr = szScratch;
+
+                // Simply copy each char to a wxChar, stopping on the first
+                // null or non-ascii byte. Checking '(signed char)*scratchptr
+                // > 0' is an extra optimisation over '*scratchptr != 0 &&
+                // isascii(*scratchptr)', though it assumes signed char is
+                // 8-bit 2 complement.
+                while ((signed char)*scratchptr > 0 && bufptr != bufend)
+                    *bufptr++ = *scratchptr++;
+
+                if (bufptr == bufend)
+                    return -1;
+
+                lenCur += bufptr - buf;
+
+                // check if the loop stopped on a non-ascii char, if yes then
+                // fall back to wxMB2WX
+                if (*scratchptr)
+                {
+                    size_t len = wxMB2WX(bufptr, scratchptr, bufend - bufptr);
+
+                    if (len && len != (size_t)(-1))
+                        if (bufptr[len - 1])
+                            return -1;
+                        else
+                            lenCur += len;
+                }
+            }
+#endif
+            break;
+
+        default:
+            break;      // all other cases were completed previously
+    }
+
+    return lenCur;
+}
+
+// Copy chars from source to dest converting '%%' to '%'. Takes at most maxIn
+// chars from source and write at most outMax chars to dest, returns the
+// number of chars actually written. Does not treat null specially.
+//
+static int wxCopyStrWithPercents(
+        size_t maxOut,
+        wxChar *dest,
+        size_t maxIn,
+        const wxChar *source)
+{
+    size_t written = 0;
+
+    if (maxIn == 0)
+        return 0;
+
+    size_t i;
+    for ( i = 0; i < maxIn-1 && written < maxOut; source++, i++)
+    {
+        dest[written++] = *source;
+        if (*(source+1) == wxT('%'))
+        {
+            // skip this additional '%' character
+            source++;
+            i++;
+        }
+    }
+
+    if (i < maxIn && written < maxOut)
+        // copy last character inconditionally
+        dest[written++] = *source;
+
+    return written;
+}
+
+int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
+                             const wxChar *format, va_list argptr)
+{
+    // useful for debugging, to understand if we are really using this function
+    // rather than the system implementation
+#if 0
+    wprintf(L"Using wxVsnprintf_\n");
+#endif
+
+    // required memory:
+    wxPrintfConvSpec arg[wxMAX_SVNPRINTF_ARGUMENTS];
+    wxPrintfArg argdata[wxMAX_SVNPRINTF_ARGUMENTS];
+    wxPrintfConvSpec *pspec[wxMAX_SVNPRINTF_ARGUMENTS] = { NULL };
+
+    size_t i;
+
+    // number of characters in the buffer so far, must be less than lenMax
+    size_t lenCur = 0;
+
+    size_t nargs = 0;
+    const wxChar *toparse = format;
+
+    // parse the format string
+    bool posarg_present = false, nonposarg_present = false;
+    for (; *toparse != wxT('\0'); toparse++)
+    {
+        if (*toparse == wxT('%') )
+        {
+            arg[nargs].Init();
+
+            // let's see if this is a (valid) conversion specifier...
+            if (arg[nargs].Parse(toparse))
+            {
+                // ...yes it is
+                wxPrintfConvSpec *current = &arg[nargs];
+
+                // make toparse point to the end of this specifier
+                toparse = current->m_pArgEnd;
+
+                if (current->m_pos > 0)
+                {
+                    // the positionals start from number 1... adjust the index
+                    current->m_pos--;
+                    posarg_present = true;
+                }
+                else
+                {
+                    // not a positional argument...
+                    current->m_pos = nargs;
+                    nonposarg_present = true;
+                }
+
+                // this conversion specifier is tied to the pos-th argument...
+                pspec[current->m_pos] = current;
+                nargs++;
+
+                if (nargs == wxMAX_SVNPRINTF_ARGUMENTS)
+                {
+                    wxLogDebug(wxT("A single call to wxVsnprintf() has more than %d arguments; ")
+                               wxT("ignoring all remaining arguments."), wxMAX_SVNPRINTF_ARGUMENTS);
+                    break;  // cannot handle any additional conv spec
+                }
+            }
+            else
+            {
+                // it's safe to look in the next character of toparse as at worst
+                // we'll hit its \0
+                if (*(toparse+1) == wxT('%'))
+                    toparse++;      // the Parse() returned false because we've found a %%
+            }
+        }
+    }
+
+    if (posarg_present && nonposarg_present)
+    {
+        buf[0] = 0;
+        return -1;      // format strings with both positional and
+    }                   // non-positional conversion specifier are unsupported !!
+
+    // on platforms where va_list is an array type, it is necessary to make a
+    // copy to be able to pass it to LoadArg as a reference.
+    bool ok = true;
+    va_list ap;
+    wxVaCopy(ap, argptr);
+
+    // now load arguments from stack
+    for (i=0; i < nargs && ok; i++)
+    {
+        // !pspec[i] means that the user forgot a positional parameter (e.g. %$1s %$3s);
+        // LoadArg == false means that wxPrintfConvSpec::Parse failed to set the
+        // conversion specifier 'type' to a valid value...
+        ok = pspec[i] && pspec[i]->LoadArg(&argdata[i], ap);
+    }
+
+    va_end(ap);
+
+    // something failed while loading arguments from the variable list...
+    // (e.g. the user repeated twice the same positional argument)
+    if (!ok)
+    {
+        buf[0] = 0;
+        return -1;
+    }
+
+    // finally, process each conversion specifier with its own argument
+    toparse = format;
+    for (i=0; i < nargs; i++)
+    {
+        // copy in the output buffer the portion of the format string between
+        // last specifier and the current one
+        size_t tocopy = ( arg[i].m_pArgPos - toparse );
+
+        lenCur += wxCopyStrWithPercents(lenMax - lenCur, buf + lenCur,
+                                        tocopy, toparse);
+        if (lenCur == lenMax)
+        {
+            buf[lenMax - 1] = 0;
+            return lenMax+1;      // not enough space in the output buffer !
+        }
+
+        // process this specifier directly in the output buffer
+        int n = arg[i].Process(buf+lenCur, lenMax - lenCur, &argdata[arg[i].m_pos], lenCur);
+        if (n == -1)
+        {
+            buf[lenMax-1] = wxT('\0');  // be sure to always NUL-terminate the string
+            return lenMax+1;      // not enough space in the output buffer !
+        }
+        lenCur += n;
+
+        // the +1 is because wxPrintfConvSpec::m_pArgEnd points to the last character
+        // of the format specifier, but we are not interested to it...
+        toparse = arg[i].m_pArgEnd + 1;
+    }
+
+    // copy portion of the format string after last specifier
+    // NOTE: toparse is pointing to the character just after the last processed
+    //       conversion specifier
+    // NOTE2: the +1 is because we want to copy also the '\0'
+    size_t tocopy = wxStrlen(format) + 1  - ( toparse - format ) ;
+
+    lenCur += wxCopyStrWithPercents(lenMax - lenCur, buf + lenCur,
+                                    tocopy, toparse) - 1;
+    if (buf[lenCur])
+    {
+        buf[lenCur] = 0;
+        return lenMax+1;     // not enough space in the output buffer !
+    }
+
+    // Don't do:
+    //      wxASSERT(lenCur == wxStrlen(buf));
+    // in fact if we embedded NULLs in the output buffer (using %c with a '\0')
+    // such check would fail
+
+    return lenCur;
+}
+
+#undef APPEND_CH
+#undef APPEND_STR
+#undef CHECK_PREC
+
+#else    // wxVsnprintf_ is defined
+
+#if wxUSE_WXVSNPRINTF
+    #error wxUSE_WXVSNPRINTF must be 0 if our wxVsnprintf_ is not used
+#endif
+
+#endif // !wxVsnprintf_
+
+#if !defined(wxSnprintf_)
+int WXDLLEXPORT wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+
+    int iLen = wxVsnprintf_(buf, len, format, argptr);
+
+    va_end(argptr);
+
+    return iLen;
+}
+#endif // wxSnprintf_
+
+#if defined(__DMC__)
+    /* Digital Mars adds count to _stprintf (C99) so convert */
+    #if wxUSE_UNICODE
+        int wxSprintf (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... )
+        {
+            va_list arglist;
+
+            va_start( arglist, format );
+            int iLen = swprintf ( s, -1, format, arglist );
+            va_end( arglist );
+            return iLen ;
+        }
+
+    #endif // wxUSE_UNICODE
+
+#endif //__DMC__
+
+#if defined(__MINGW32__) && ( defined(_STLPORT_VERSION) && _STLPORT_VERSION >= 0x510 )
+    /* MinGW with STLPort 5.1 has clashing defines for _stprintf so use swprintf */
+    /* STLPort 5.1 defines standard (C99) vswprintf() and swprintf() that takes count. */
+    int wxSprintf (wchar_t * s, const wchar_t * format, ... )
+    {
+        va_list arglist;
+
+        va_start( arglist, format );
+        int iLen = swprintf ( s, -1, format, arglist );
+        va_end( arglist );
+        return iLen ;
+    }
+#endif // MINGW32 _STLPORT_VERSION >= 0x510
+
+// ----------------------------------------------------------------------------
+// implement the standard IO functions for wide char if libc doesn't have them
+// ----------------------------------------------------------------------------
+
+#ifdef wxNEED_FPUTS
+int wxFputs(const wchar_t *ws, FILE *stream)
+{
+    wxCharBuffer buf(wxConvLibc.cWC2MB(ws));
+    if ( !buf )
+        return -1;
+
+    // counting the number of wide characters written isn't worth the trouble,
+    // simply distinguish between ok and error
+    return fputs(buf, stream) == -1 ? -1 : 0;
+}
+#endif // wxNEED_FPUTS
+
+#ifdef wxNEED_PUTS
+int wxPuts(const wxChar *ws)
+{
+    int rc = wxFputs(ws, stdout);
+    if ( rc != -1 )
+    {
+        if ( wxFputs(L"\n", stdout) == -1 )
+            return -1;
+
+        rc++;
+    }
+
+    return rc;
+}
+#endif // wxNEED_PUTS
+
+#ifdef wxNEED_PUTC
+int /* not wint_t */ wxPutc(wchar_t wc, FILE *stream)
+{
+    wchar_t ws[2] = { wc, L'\0' };
+
+    return wxFputs(ws, stream);
+}
+#endif // wxNEED_PUTC
+
+// NB: we only implement va_list functions here, the ones taking ... are
+//     defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse
+//     the definitions there to avoid duplicating them here
+#ifdef wxNEED_WPRINTF
+
+// TODO: implement the scanf() functions
+int vwscanf(const wxChar *format, va_list argptr)
+{
+    wxFAIL_MSG( _T("TODO") );
+
+    return -1;
+}
+
+int vswscanf(const wxChar *ws, const wxChar *format, va_list argptr)
+{
+    // The best we can do without proper Unicode support in glibc is to
+    // convert the strings into MB representation and run ANSI version
+    // of the function. This doesn't work with %c and %s because of difference
+    // in size of char and wchar_t, though.
+
+    wxCHECK_MSG( wxStrstr(format, _T("%s")) == NULL, -1,
+                 _T("incomplete vswscanf implementation doesn't allow %s") );
+    wxCHECK_MSG( wxStrstr(format, _T("%c")) == NULL, -1,
+                 _T("incomplete vswscanf implementation doesn't allow %c") );
+
+    va_list argcopy;
+    wxVaCopy(argcopy, argptr);
+    return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argcopy);
+}
+
+int vfwscanf(FILE *stream, const wxChar *format, va_list argptr)
+{
+    wxFAIL_MSG( _T("TODO") );
+
+    return -1;
+}
+
+#define vswprintf wxVsnprintf_
+
+int vfwprintf(FILE *stream, const wxChar *format, va_list argptr)
+{
+    wxString s;
+    int rc = s.PrintfV(format, argptr);
+
+    if ( rc != -1 )
+    {
+        // we can't do much better without Unicode support in libc...
+        if ( fprintf(stream, "%s", (const char*)s.mb_str() ) == -1 )
+            return -1;
+    }
+
+    return rc;
+}
+
+int vwprintf(const wxChar *format, va_list argptr)
+{
+    return wxVfprintf(stdout, format, argptr);
+}
+
+#endif // wxNEED_WPRINTF
+
+#ifdef wxNEED_PRINTF_CONVERSION
+
+// ----------------------------------------------------------------------------
+// wxFormatConverter: class doing the "%s" -> "%ls" conversion
+// ----------------------------------------------------------------------------
+
+/*
+   Here are the gory details. We want to follow the Windows/MS conventions,
+   that is to have
+
+   In ANSI mode:
+
+   format specifier         results in
+   -----------------------------------
+   %c, %hc, %hC             char
+   %lc, %C, %lC             wchar_t
+
+   In Unicode mode:
+
+   format specifier         results in
+   -----------------------------------
+   %hc, %C, %hC             char
+   %c, %lc, %lC             wchar_t
+
+
+   while on POSIX systems we have %C identical to %lc and %c always means char
+   (in any mode) while %lc always means wchar_t,
+
+   So to use native functions in order to get our semantics we must do the
+   following translations in Unicode mode (nothing to do in ANSI mode):
+
+   wxWidgets specifier      POSIX specifier
+   ----------------------------------------
+
+   %hc, %C, %hC             %c
+   %c                       %lc
+
+
+   And, of course, the same should be done for %s as well.
+*/
+
+class wxFormatConverter
+{
+public:
+    wxFormatConverter(const wxChar *format);
+
+    // notice that we only translated the string if m_fmtOrig == NULL (as set
+    // by CopyAllBefore()), otherwise we should simply use the original format
+    operator const wxChar *() const
+        { return m_fmtOrig ? m_fmtOrig : m_fmt.c_str(); }
+
+private:
+    // copy another character to the translated format: this function does the
+    // copy if we are translating but doesn't do anything at all if we don't,
+    // so we don't create the translated format string at all unless we really
+    // need to (i.e. InsertFmtChar() is called)
+    wxChar CopyFmtChar(wxChar ch)
+    {
+        if ( !m_fmtOrig )
+        {
+            // we're translating, do copy
+            m_fmt += ch;
+        }
+        else
+        {
+            // simply increase the count which should be copied by
+            // CopyAllBefore() later if needed
+            m_nCopied++;
+        }
+
+        return ch;
+    }
+
+    // insert an extra character
+    void InsertFmtChar(wxChar ch)
+    {
+        if ( m_fmtOrig )
+        {
+            // so far we haven't translated anything yet
+            CopyAllBefore();
+        }
+
+        m_fmt += ch;
+    }
+
+    void CopyAllBefore()
+    {
+        wxASSERT_MSG( m_fmtOrig && m_fmt.empty(), _T("logic error") );
+
+        m_fmt = wxString(m_fmtOrig, m_nCopied);
+
+        // we won't need it any longer
+        m_fmtOrig = NULL;
+    }
+
+    static bool IsFlagChar(wxChar ch)
+    {
+        return ch == _T('-') || ch == _T('+') ||
+               ch == _T('0') || ch == _T(' ') || ch == _T('#');
+    }
+
+    void SkipDigits(const wxChar **ptpc)
+    {
+        while ( **ptpc >= _T('0') && **ptpc <= _T('9') )
+            CopyFmtChar(*(*ptpc)++);
+    }
+
+    // the translated format
+    wxString m_fmt;
+
+    // the original format
+    const wxChar *m_fmtOrig;
+
+    // the number of characters already copied
+    size_t m_nCopied;
+};
+
+wxFormatConverter::wxFormatConverter(const wxChar *format)
+{
+    m_fmtOrig = format;
+    m_nCopied = 0;
+
+    while ( *format )
+    {
+        if ( CopyFmtChar(*format++) == _T('%') )
+        {
+            // skip any flags
+            while ( IsFlagChar(*format) )
+                CopyFmtChar(*format++);
+
+            // and possible width
+            if ( *format == _T('*') )
+                CopyFmtChar(*format++);
+            else
+                SkipDigits(&format);
+
+            // precision?
+            if ( *format == _T('.') )
+            {
+                CopyFmtChar(*format++);
+                if ( *format == _T('*') )
+                    CopyFmtChar(*format++);
+                else
+                    SkipDigits(&format);
+            }
+
+            // next we can have a size modifier
+            enum
+            {
+                Default,
+                Short,
+                Long
+            } size;
+
+            switch ( *format )
+            {
+                case _T('h'):
+                    size = Short;
+                    format++;
+                    break;
+
+                case _T('l'):
+                    // "ll" has a different meaning!
+                    if ( format[1] != _T('l') )
+                    {
+                        size = Long;
+                        format++;
+                        break;
+                    }
+                    //else: fall through
+
+                default:
+                    size = Default;
+            }
+
+            // and finally we should have the type
+            switch ( *format )
+            {
+                case _T('C'):
+                case _T('S'):
+                    // %C and %hC -> %c and %lC -> %lc
+                    if ( size == Long )
+                        CopyFmtChar(_T('l'));
+
+                    InsertFmtChar(*format++ == _T('C') ? _T('c') : _T('s'));
+                    break;
+
+                case _T('c'):
+                case _T('s'):
+                    // %c -> %lc but %hc stays %hc and %lc is still %lc
+                    if ( size == Default)
+                        InsertFmtChar(_T('l'));
+                    // fall through
+
+                default:
+                    // nothing special to do
+                    if ( size != Default )
+                        CopyFmtChar(*(format - 1));
+                    CopyFmtChar(*format++);
+            }
+        }
+    }
+}
+
+#else // !wxNEED_PRINTF_CONVERSION
+    // no conversion necessary
+    #define wxFormatConverter(x) (x)
+#endif // wxNEED_PRINTF_CONVERSION/!wxNEED_PRINTF_CONVERSION
+
+#ifdef __WXDEBUG__
+// For testing the format converter
+wxString wxConvertFormat(const wxChar *format)
+{
+    return wxString(wxFormatConverter(format));
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// wxPrintf(), wxScanf() and relatives
+// ----------------------------------------------------------------------------
+
+#if defined(wxNEED_PRINTF_CONVERSION) || defined(wxNEED_WPRINTF)
+
+int wxScanf( const wxChar *format, ... )
+{
+    va_list argptr;
+    va_start(argptr, format);
+
+    int ret = vwscanf(wxFormatConverter(format), argptr );
+
+    va_end(argptr);
+
+    return ret;
+}
+
+int wxSscanf( const wxChar *str, const wxChar *format, ... )
+{
+    va_list argptr;
+    va_start(argptr, format);
+
+    int ret = vswscanf( str, wxFormatConverter(format), argptr );
+
+    va_end(argptr);
+
+    return ret;
+}
+
+int wxFscanf( FILE *stream, const wxChar *format, ... )
+{
+    va_list argptr;
+    va_start(argptr, format);
+    int ret = vfwscanf(stream, wxFormatConverter(format), argptr);
+
+    va_end(argptr);
+
+    return ret;
+}
+
+int wxPrintf( const wxChar *format, ... )
+{
+    va_list argptr;
+    va_start(argptr, format);
+
+    int ret = vwprintf( wxFormatConverter(format), argptr );
+
+    va_end(argptr);
+
+    return ret;
+}
+
+#ifndef wxSnprintf
+int wxSnprintf( wxChar *str, size_t size, const wxChar *format, ... )
+{
+    va_list argptr;
+    va_start(argptr, format);
+
+    int ret = vswprintf( str, size, wxFormatConverter(format), argptr );
+
+    // VsnprintfTestCase reveals that glibc's implementation of vswprintf
+    // doesn't nul terminate on truncation.
+    str[size - 1] = 0;
+
+    va_end(argptr);
+
+    return ret;
+}
+#endif // wxSnprintf
+
+int wxSprintf( wxChar *str, const wxChar *format, ... )
+{
+    va_list argptr;
+    va_start(argptr, format);
+
+    // note that wxString::FormatV() uses wxVsnprintf(), not wxSprintf(), so
+    // it's safe to implement this one in terms of it
+    wxString s(wxString::FormatV(format, argptr));
+    wxStrcpy(str, s);
+
+    va_end(argptr);
+
+    return s.length();
+}
+
+int wxFprintf( FILE *stream, const wxChar *format, ... )
+{
+    va_list argptr;
+    va_start( argptr, format );
+
+    int ret = vfwprintf( stream, wxFormatConverter(format), argptr );
+
+    va_end(argptr);
+
+    return ret;
+}
+
+int wxVsscanf( const wxChar *str, const wxChar *format, va_list argptr )
+{
+    return vswscanf( str, wxFormatConverter(format), argptr );
+}
+
+int wxVfprintf( FILE *stream, const wxChar *format, va_list argptr )
+{
+    return vfwprintf( stream, wxFormatConverter(format), argptr );
+}
+
+int wxVprintf( const wxChar *format, va_list argptr )
+{
+    return vwprintf( wxFormatConverter(format), argptr );
+}
+
+#ifndef wxVsnprintf
+int wxVsnprintf( wxChar *str, size_t size, const wxChar *format, va_list argptr )
+{
+    return vswprintf( str, size, wxFormatConverter(format), argptr );
+}
+#endif // wxVsnprintf
+
+int wxVsprintf( wxChar *str, const wxChar *format, va_list argptr )
+{
+    // same as for wxSprintf()
+    return vswprintf(str, INT_MAX / 4, wxFormatConverter(format), argptr);
+}
+
+#endif // wxNEED_PRINTF_CONVERSION
+
+#if wxUSE_WCHAR_T
+
+// ----------------------------------------------------------------------------
+// ctype.h stuff (currently unused)
+// ----------------------------------------------------------------------------
+
+#if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H)
+inline WORD wxMSW_ctype(wxChar ch)
+{
+  WORD ret;
+  GetStringTypeEx(LOCALE_USER_DEFAULT, CT_CTYPE1, &ch, 1, &ret);
+  return ret;
+}
+
+WXDLLEXPORT int wxIsalnum(wxChar ch) { return IsCharAlphaNumeric(ch); }
+WXDLLEXPORT int wxIsalpha(wxChar ch) { return IsCharAlpha(ch); }
+WXDLLEXPORT int wxIscntrl(wxChar ch) { return wxMSW_ctype(ch) & C1_CNTRL; }
+WXDLLEXPORT int wxIsdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_DIGIT; }
+WXDLLEXPORT int wxIsgraph(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_PUNCT|C1_ALPHA); }
+WXDLLEXPORT int wxIslower(wxChar ch) { return IsCharLower(ch); }
+WXDLLEXPORT int wxIsprint(wxChar ch) { return wxMSW_ctype(ch) & (C1_DIGIT|C1_SPACE|C1_PUNCT|C1_ALPHA); }
+WXDLLEXPORT int wxIspunct(wxChar ch) { return wxMSW_ctype(ch) & C1_PUNCT; }
+WXDLLEXPORT int wxIsspace(wxChar ch) { return wxMSW_ctype(ch) & C1_SPACE; }
+WXDLLEXPORT int wxIsupper(wxChar ch) { return IsCharUpper(ch); }
+WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxMSW_ctype(ch) & C1_XDIGIT; }
+WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)CharLower((LPTSTR)(ch)); }
+WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)CharUpper((LPTSTR)(ch)); }
+#endif
+
+#ifdef wxNEED_WX_MBSTOWCS
+
+WXDLLEXPORT size_t wxMbstowcs (wchar_t * out, const char * in, size_t outlen)
+{
+    if (!out)
+    {
+        size_t outsize = 0;
+        while(*in++)
+            outsize++;
+        return outsize;
+    }
+
+    const char* origin = in;
+
+    while (outlen-- && *in)
+    {
+        *out++ = (wchar_t) *in++;
+    }
+
+    *out = '\0';
+
+    return in - origin;
+}
+
+WXDLLEXPORT size_t wxWcstombs (char * out, const wchar_t * in, size_t outlen)
+{
+    if (!out)
+    {
+        size_t outsize = 0;
+        while(*in++)
+            outsize++;
+        return outsize;
+    }
+
+    const wchar_t* origin = in;
+
+    while (outlen-- && *in)
+    {
+        *out++ = (char) *in++;
+    }
+
+    *out = '\0';
+
+    return in - origin;
+}
+
+#endif // wxNEED_WX_MBSTOWCS
+
+#if defined(wxNEED_WX_CTYPE_H)
+
+#include <CoreFoundation/CoreFoundation.h>
+
+#define cfalnumset CFCharacterSetGetPredefined(kCFCharacterSetAlphaNumeric)
+#define cfalphaset CFCharacterSetGetPredefined(kCFCharacterSetLetter)
+#define cfcntrlset CFCharacterSetGetPredefined(kCFCharacterSetControl)
+#define cfdigitset CFCharacterSetGetPredefined(kCFCharacterSetDecimalDigit)
+//CFCharacterSetRef cfgraphset = kCFCharacterSetControl && !' '
+#define cflowerset CFCharacterSetGetPredefined(kCFCharacterSetLowercaseLetter)
+//CFCharacterSetRef cfprintset = !kCFCharacterSetControl
+#define cfpunctset CFCharacterSetGetPredefined(kCFCharacterSetPunctuation)
+#define cfspaceset CFCharacterSetGetPredefined(kCFCharacterSetWhitespaceAndNewline)
+#define cfupperset CFCharacterSetGetPredefined(kCFCharacterSetUppercaseLetter)
+
+WXDLLEXPORT int wxIsalnum(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalnumset, ch); }
+WXDLLEXPORT int wxIsalpha(wxChar ch) { return CFCharacterSetIsCharacterMember(cfalphaset, ch); }
+WXDLLEXPORT int wxIscntrl(wxChar ch) { return CFCharacterSetIsCharacterMember(cfcntrlset, ch); }
+WXDLLEXPORT int wxIsdigit(wxChar ch) { return CFCharacterSetIsCharacterMember(cfdigitset, ch); }
+WXDLLEXPORT int wxIsgraph(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch) && ch != ' '; }
+WXDLLEXPORT int wxIslower(wxChar ch) { return CFCharacterSetIsCharacterMember(cflowerset, ch); }
+WXDLLEXPORT int wxIsprint(wxChar ch) { return !CFCharacterSetIsCharacterMember(cfcntrlset, ch); }
+WXDLLEXPORT int wxIspunct(wxChar ch) { return CFCharacterSetIsCharacterMember(cfpunctset, ch); }
+WXDLLEXPORT int wxIsspace(wxChar ch) { return CFCharacterSetIsCharacterMember(cfspaceset, ch); }
+WXDLLEXPORT int wxIsupper(wxChar ch) { return CFCharacterSetIsCharacterMember(cfupperset, ch); }
+WXDLLEXPORT int wxIsxdigit(wxChar ch) { return wxIsdigit(ch) || (ch>='a' && ch<='f') || (ch>='A' && ch<='F'); }
+WXDLLEXPORT int wxTolower(wxChar ch) { return (wxChar)tolower((char)(ch)); }
+WXDLLEXPORT int wxToupper(wxChar ch) { return (wxChar)toupper((char)(ch)); }
+
+#endif  // wxNEED_WX_CTYPE_H
+
+#ifndef wxStrdupA
+
+WXDLLEXPORT char *wxStrdupA(const char *s)
+{
+    return strcpy((char *)malloc(strlen(s) + 1), s);
+}
+
+#endif // wxStrdupA
+
+#ifndef wxStrdupW
+
+WXDLLEXPORT wchar_t * wxStrdupW(const wchar_t *pwz)
+{
+  size_t size = (wxWcslen(pwz) + 1) * sizeof(wchar_t);
+  wchar_t *ret = (wchar_t *) malloc(size);
+  memcpy(ret, pwz, size);
+  return ret;
+}
+
+#endif // wxStrdupW
+
+#ifndef wxStricmp
+int WXDLLEXPORT wxStricmp(const wxChar *psz1, const wxChar *psz2)
+{
+  register wxChar c1, c2;
+  do {
+    c1 = wxTolower(*psz1++);
+    c2 = wxTolower(*psz2++);
+  } while ( c1 && (c1 == c2) );
+  return c1 - c2;
+}
+#endif
+
+#ifndef wxStricmp
+int WXDLLEXPORT wxStrnicmp(const wxChar *s1, const wxChar *s2, size_t n)
+{
+  // initialize the variables just to suppress stupid gcc warning
+  register wxChar c1 = 0, c2 = 0;
+  while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++;
+  if (n) {
+    if (c1 < c2) return -1;
+    if (c1 > c2) return 1;
+  }
+  return 0;
+}
+#endif
+
+#ifndef wxSetlocale
+WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale)
+{
+    char *localeOld = setlocale(category, wxConvLibc.cWX2MB(locale));
+
+    return wxWCharBuffer(wxConvLibc.cMB2WC(localeOld));
+}
+#endif
+
+#if wxUSE_WCHAR_T && !defined(HAVE_WCSLEN)
+WXDLLEXPORT size_t wxWcslen(const wchar_t *s)
+{
+    size_t n = 0;
+    while ( *s++ )
+        n++;
+
+    return n;
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// string.h functions
+// ----------------------------------------------------------------------------
+
+#ifdef wxNEED_WX_STRING_H
+
+// RN:  These need to be c externed for the regex lib
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src)
+{
+  wxChar *ret = dest;
+  while (*dest) dest++;
+  while ((*dest++ = *src++));
+  return ret;
+}
+
+WXDLLEXPORT const wxChar * wxStrchr(const wxChar *s, wxChar c)
+{
+    // be careful here as the terminating NUL makes part of the string
+    while ( *s != c )
+    {
+        if ( !*s++ )
+            return NULL;
+    }
+
+    return s;
+}
+
+WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2)
+{
+  while ((*s1 == *s2) && *s1) s1++, s2++;
+  if ((wxUChar)*s1 < (wxUChar)*s2) return -1;
+  if ((wxUChar)*s1 > (wxUChar)*s2) return 1;
+  return 0;
+}
+
+WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src)
+{
+  wxChar *ret = dest;
+  while ((*dest++ = *src++));
+  return ret;
+}
+
+WXDLLEXPORT size_t wxStrlen_(const wxChar *s)
+{
+    size_t n = 0;
+    while ( *s++ )
+        n++;
+
+    return n;
+}
+
+
+WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n)
+{
+  wxChar *ret = dest;
+  while (*dest) dest++;
+  while (n && (*dest++ = *src++)) n--;
+  return ret;
+}
+
+WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n)
+{
+  while (n && (*s1 == *s2) && *s1) n--, s1++, s2++;
+  if (n) {
+    if ((wxUChar)*s1 < (wxUChar)*s2) return -1;
+    if ((wxUChar)*s1 > (wxUChar)*s2) return 1;
+  }
+  return 0;
+}
+
+WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n)
+{
+  wxChar *ret = dest;
+  while (n && (*dest++ = *src++)) n--;
+  while (n) *dest++=0, n--; // the docs specify padding with zeroes
+  return ret;
+}
+
+WXDLLEXPORT const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept)
+{
+  while (*s && !wxStrchr(accept, *s))
+      s++;
+
+  return *s ? s : NULL;
+}
+
+WXDLLEXPORT const wxChar * wxStrrchr(const wxChar *s, wxChar c)
+{
+    const wxChar *ret = NULL;
+    do
+    {
+        if ( *s == c )
+            ret = s;
+        s++;
+    }
+    while ( *s );
+
+    return ret;
+}
+
+WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept)
+{
+  size_t len = 0;
+  while (wxStrchr(accept, *s++)) len++;
+  return len;
+}
+
+WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle)
+{
+    wxASSERT_MSG( needle != NULL, _T("NULL argument in wxStrstr") );
+
+    // VZ: this is not exactly the most efficient string search algorithm...
+
+    const size_t len = wxStrlen(needle);
+
+    while ( const wxChar *fnd = wxStrchr(haystack, *needle) )
+    {
+        if ( !wxStrncmp(fnd, needle, len) )
+            return fnd;
+
+        haystack = fnd + 1;
+    }
+
+    return NULL;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)
+{
+  const wxChar decSep(
+#if wxUSE_INTL
+      wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER)[0]
+#else
+      _T('.')
+#endif
+      );
+  const wxChar *start = nptr;
+
+  while (wxIsspace(*nptr)) nptr++;
+  if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;
+  while (wxIsdigit(*nptr)) nptr++;
+  if (*nptr == decSep) {
+    nptr++;
+    while (wxIsdigit(*nptr)) nptr++;
+  }
+  if (*nptr == wxT('E') || *nptr == wxT('e')) {
+    nptr++;
+    if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;
+    while (wxIsdigit(*nptr)) nptr++;
+  }
+
+  wxString data(start, nptr-start);
+  const wxWX2MBbuf dat = data.mb_str(wxConvLibc);
+  char *rdat = wxMBSTRINGCAST dat;
+  double ret = strtod(dat, &rdat);
+
+  if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat));
+
+  return ret;
+}
+
+WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base)
+{
+  const wxChar *start = nptr;
+
+  while (wxIsspace(*nptr)) nptr++;
+  if (*nptr == wxT('+') || *nptr == wxT('-')) nptr++;
+  if (((base == 0) || (base == 16)) &&
+      (nptr[0] == wxT('0') && nptr[1] == wxT('x'))) {
+    nptr += 2;
+    base = 16;
+  }
+  else if ((base == 0) && (nptr[0] == wxT('0'))) base = 8;
+  else if (base == 0) base = 10;
+
+  while ((wxIsdigit(*nptr) && (*nptr - wxT('0') < base)) ||
+         (wxIsalpha(*nptr) && (wxToupper(*nptr) - wxT('A') + 10 < base))) nptr++;
+
+  wxString data(start, nptr-start);
+  wxWX2MBbuf dat = data.mb_str(wxConvLibc);
+  char *rdat = wxMBSTRINGCAST dat;
+  long int ret = strtol(dat, &rdat, base);
+
+  if (endptr) *endptr = (wxChar *)(start + (rdat - (const char *)dat));
+
+  return ret;
+}
+
+WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base)
+{
+    return (unsigned long int) wxStrtol(nptr, endptr, base);
+}
+
+#endif // wxNEED_WX_STRING_H
+
+#ifdef wxNEED_WX_STDIO_H
+WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode)
+{
+    char mode_buffer[10];
+    for (size_t i = 0; i < wxStrlen(mode)+1; i++)
+       mode_buffer[i] = (char) mode[i];
+
+    return fopen( wxConvFile.cWX2MB(path), mode_buffer );
+}
+
+WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream)
+{
+    char mode_buffer[10];
+    for (size_t i = 0; i < wxStrlen(mode)+1; i++)
+       mode_buffer[i] = (char) mode[i];
+
+    return freopen( wxConvFile.cWX2MB(path), mode_buffer, stream );
+}
+
+WXDLLEXPORT int wxRemove(const wxChar *path)
+{
+    return remove( wxConvFile.cWX2MB(path) );
+}
+
+WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath)
+{
+    return rename( wxConvFile.cWX2MB(oldpath), wxConvFile.cWX2MB(newpath) );
+}
+#endif
+
+#ifndef wxAtof
+double   WXDLLEXPORT wxAtof(const wxChar *psz)
+{
+#ifdef __WXWINCE__
+    double d;
+    wxString str(psz);
+    if (str.ToDouble(& d))
+        return d;
+
+    return 0.0;
+#else
+    return atof(wxConvLibc.cWX2MB(psz));
+#endif
+}
+#endif
+
+#ifdef wxNEED_WX_STDLIB_H
+int      WXDLLEXPORT wxAtoi(const wxChar *psz)
+{
+  return atoi(wxConvLibc.cWX2MB(psz));
+}
+
+long     WXDLLEXPORT wxAtol(const wxChar *psz)
+{
+  return atol(wxConvLibc.cWX2MB(psz));
+}
+
+wxChar * WXDLLEXPORT wxGetenv(const wxChar *name)
+{
+#if wxUSE_UNICODE
+    // NB: buffer returned by getenv() is allowed to be overwritten next
+    //     time getenv() is called, so it is OK to use static string
+    //     buffer to hold the data.
+    static wxWCharBuffer value((wxChar*)NULL);
+    value = wxConvLibc.cMB2WX(getenv(wxConvLibc.cWX2MB(name)));
+    return value.data();
+#else
+    return getenv(name);
+#endif
+}
+#endif // wxNEED_WX_STDLIB_H
+
+#ifdef wxNEED_WXSYSTEM
+int WXDLLEXPORT wxSystem(const wxChar *psz)
+{
+    return system(wxConvLibc.cWX2MB(psz));
+}
+#endif // wxNEED_WXSYSTEM
+
+#ifdef wxNEED_WX_TIME_H
+WXDLLEXPORT size_t
+wxStrftime(wxChar *s, size_t maxsize, const wxChar *fmt, const struct tm *tm)
+{
+    if ( !maxsize )
+        return 0;
+
+    wxCharBuffer buf(maxsize);
+
+    wxCharBuffer bufFmt(wxConvLibc.cWX2MB(fmt));
+    if ( !bufFmt )
+        return 0;
+
+    size_t ret = strftime(buf.data(), maxsize, bufFmt, tm);
+    if  ( !ret )
+        return 0;
+
+    wxWCharBuffer wbuf = wxConvLibc.cMB2WX(buf);
+    if ( !wbuf )
+        return 0;
+
+    wxStrncpy(s, wbuf, maxsize);
+    return wxStrlen(s);
+}
+#endif // wxNEED_WX_TIME_H
+
+#ifndef wxCtime
+WXDLLEXPORT wxChar *wxCtime(const time_t *timep)
+{
+    // normally the string is 26 chars but give one more in case some broken
+    // DOS compiler decides to use "\r\n" instead of "\n" at the end
+    static wxChar buf[27];
+
+    // ctime() is guaranteed to return a string containing only ASCII
+    // characters, as its format is always the same for any locale
+    wxStrncpy(buf, wxString::FromAscii(ctime(timep)), WXSIZEOF(buf));
+    buf[WXSIZEOF(buf) - 1] = _T('\0');
+
+    return buf;
+}
+#endif // wxCtime
+
+#endif // wxUSE_WCHAR_T
+
+// ----------------------------------------------------------------------------
+// functions which we may need even if !wxUSE_WCHAR_T
+// ----------------------------------------------------------------------------
+
+#ifndef wxStrtok
+
+WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr)
+{
+    if (!psz)
+    {
+        psz = *save_ptr;
+        if ( !psz )
+            return NULL;
+    }
+
+    psz += wxStrspn(psz, delim);
+    if (!*psz)
+    {
+        *save_ptr = (wxChar *)NULL;
+        return (wxChar *)NULL;
+    }
+
+    wxChar *ret = psz;
+    psz = wxStrpbrk(psz, delim);
+    if (!psz)
+    {
+        *save_ptr = (wxChar*)NULL;
+    }
+    else
+    {
+        *psz = wxT('\0');
+        *save_ptr = psz + 1;
+    }
+
+    return ret;
+}
+
+#endif // wxStrtok
+
+// ----------------------------------------------------------------------------
+// missing C RTL functions
+// ----------------------------------------------------------------------------
+
+#ifdef wxNEED_STRDUP
+
+char *strdup(const char *s)
+{
+    char *dest = (char*) malloc( strlen( s ) + 1 ) ;
+    if ( dest )
+        strcpy( dest , s ) ;
+    return dest ;
+}
+#endif // wxNEED_STRDUP
+
+#if defined(__WXWINCE__) && (_WIN32_WCE <= 211)
+
+void *calloc( size_t num, size_t size )
+{
+    void** ptr = (void **)malloc(num * size);
+    memset( ptr, 0, num * size);
+    return ptr;
+}
+
+#endif // __WXWINCE__ <= 211
+
+#ifdef __WXWINCE__
+
+int wxRemove(const wxChar *path)
+{
+    return ::DeleteFile(path) == 0;
+}
+
+#endif
diff --git a/Source/3rd Party/wx/src/common/wxcrt.cpp b/Source/3rd Party/wx/src/common/wxcrt.cpp
deleted file mode 100644
index 387bb760c..000000000
--- a/Source/3rd Party/wx/src/common/wxcrt.cpp	
+++ /dev/null
@@ -1,1332 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/wxcrt.cpp
-// Purpose:     wxChar CRT wrappers implementation
-// Author:      Ove Kaven
-// Modified by: Ron Lee, Francesco Montorsi
-// Created:     09/04/99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets copyright
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// headers, declarations, constants
-// ===========================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#include "wx/crt.h"
-#include "wx/strconv.h" // wxMBConv::cWC2MB()
-
-#define _ISOC9X_SOURCE 1 // to get vsscanf()
-#define _BSD_SOURCE    1 // to still get strdup()
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-#ifdef __SGI__
-    // wide character functions are declared in std namespace under IRIX
-    using namespace std;
-
-    // and this one is only declared if __c99 is defined which is not the case
-    // for C++ builds, so declare it ourselves
-    extern "C" int vswscanf(const wchar_t *, const wchar_t *, va_list);
-#endif
-
-#ifndef __WXWINCE__
-    #include <time.h>
-    #include <locale.h>
-#else
-    #include "wx/msw/wince/time.h"
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/hash.h"
-    #include "wx/utils.h"     // for wxMin and wxMax
-    #include "wx/log.h"
-#endif
-
-#ifdef HAVE_LANGINFO_H
-    #include <langinfo.h>
-#endif
-
-#ifdef __WXWINCE__
-    // there is no errno.h under CE apparently
-    #define wxSET_ERRNO(value)
-#else
-    #include <errno.h>
-
-    #define wxSET_ERRNO(value) errno = value
-#endif
-
-#if defined(__DARWIN__)
-    #include "wx/osx/core/cfref.h"
-    #include <CoreFoundation/CFLocale.h>
-    #include "wx/osx/core/cfstring.h"
-    #include <xlocale.h>
-#endif
-
-WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n)
-{
-  // assume that we have mbsrtowcs() too if we have wcsrtombs()
-#ifdef HAVE_WCSRTOMBS
-  mbstate_t mbstate;
-  memset(&mbstate, 0, sizeof(mbstate_t));
-#endif
-
-  if (buf) {
-    if (!n || !*psz) {
-      if (n) *buf = wxT('\0');
-      return 0;
-    }
-#ifdef HAVE_WCSRTOMBS
-    return mbsrtowcs(buf, &psz, n, &mbstate);
-#else
-    return wxMbstowcs(buf, psz, n);
-#endif
-  }
-
-  // Note that we rely on common (and required by Unix98 but unfortunately not
-  // C99) extension which allows to call mbs(r)towcs() with NULL output pointer
-  // to just get the size of the needed buffer -- this is needed as otherwise
-  // we have no idea about how much space we need. Currently all supported
-  // compilers do provide it and if they don't, HAVE_WCSRTOMBS shouldn't be
-  // defined at all.
-#ifdef HAVE_WCSRTOMBS
-  return mbsrtowcs(NULL, &psz, 0, &mbstate);
-#else
-  return wxMbstowcs(NULL, psz, 0);
-#endif
-}
-
-WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *pwz, size_t n)
-{
-#ifdef HAVE_WCSRTOMBS
-  mbstate_t mbstate;
-  memset(&mbstate, 0, sizeof(mbstate_t));
-#endif
-
-  if (buf) {
-    if (!n || !*pwz) {
-      // glibc2.1 chokes on null input
-      if (n) *buf = '\0';
-      return 0;
-    }
-#ifdef HAVE_WCSRTOMBS
-    return wcsrtombs(buf, &pwz, n, &mbstate);
-#else
-    return wxWcstombs(buf, pwz, n);
-#endif
-  }
-
-#ifdef HAVE_WCSRTOMBS
-  return wcsrtombs(NULL, &pwz, 0, &mbstate);
-#else
-  return wxWcstombs(NULL, pwz, 0);
-#endif
-}
-
-char* wxSetlocale(int category, const char *locale)
-{
-#ifdef __WXWINCE__
-    // FIXME-CE: there is no setlocale() in CE CRT, use SetThreadLocale()?
-    wxUnusedVar(category);
-    wxUnusedVar(locale);
-
-    return NULL;
-#else // !__WXWINCE__
-#ifdef __WXMAC__
-    char *rv = NULL ;
-    if ( locale != NULL && locale[0] == 0 )
-    {
-        // the attempt to use newlocale(LC_ALL_MASK, "", NULL);
-        // here in order to deduce the language along the environment vars rules
-        // lead to strange crashes later...
-
-        // we have to emulate the behaviour under OS X
-        wxCFRef<CFLocaleRef> userLocaleRef(CFLocaleCopyCurrent());
-        wxCFStringRef str(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleLanguageCode)));
-        wxString langFull = str.AsString()+"_";
-        str.reset(wxCFRetain((CFStringRef)CFLocaleGetValue(userLocaleRef, kCFLocaleCountryCode)));
-        langFull += str.AsString();
-        rv = setlocale(category, langFull.c_str());
-    }
-    else
-        rv = setlocale(category, locale);
-#else
-    char *rv = setlocale(category, locale);
-#endif
-    if ( locale != NULL /* setting locale, not querying */ &&
-         rv /* call was successful */ )
-    {
-        wxUpdateLocaleIsUtf8();
-    }
-    return rv;
-#endif // __WXWINCE__/!__WXWINCE__
-}
-
-// ============================================================================
-// printf() functions business
-// ============================================================================
-
-// special test mode: define all functions below even if we don't really need
-// them to be able to test them
-#ifdef wxTEST_PRINTF
-    #undef wxFprintf
-    #undef wxPrintf
-    #undef wxSprintf
-    #undef wxVfprintf
-    #undef wxVsprintf
-    #undef wxVprintf
-    #undef wxVsnprintf_
-
-    #define wxNEED_WPRINTF
-
-    int wxCRT_VfprintfW( FILE *stream, const wchar_t *format, va_list argptr );
-#endif
-
-#if defined(__DMC__)
-/* Digital Mars adds count to _stprintf (C99) so convert */
-int wxCRT_SprintfW (wchar_t * __RESTRICT s, const wchar_t * __RESTRICT format, ... )
-{
-    va_list arglist;
-
-    va_start( arglist, format );
-    int iLen = swprintf ( s, -1, format, arglist );
-    va_end( arglist );
-    return iLen ;
-}
-#endif //__DMC__
-
-// ----------------------------------------------------------------------------
-// implement the standard IO functions for wide char if libc doesn't have them
-// ----------------------------------------------------------------------------
-
-#ifndef wxCRT_FputsW
-int wxCRT_FputsW(const wchar_t *ws, FILE *stream)
-{
-    wxCharBuffer buf(wxConvLibc.cWC2MB(ws));
-    if ( !buf )
-        return -1;
-
-    // counting the number of wide characters written isn't worth the trouble,
-    // simply distinguish between ok and error
-    return wxCRT_FputsA(buf, stream) == -1 ? -1 : 0;
-}
-#endif // !wxCRT_FputsW
-
-#ifndef wxCRT_PutsW
-int wxCRT_PutsW(const wchar_t *ws)
-{
-    int rc = wxCRT_FputsW(ws, stdout);
-    if ( rc != -1 )
-    {
-        if ( wxCRT_FputsW(L"\n", stdout) == -1 )
-            return -1;
-
-        rc++;
-    }
-
-    return rc;
-}
-#endif // !wxCRT_PutsW
-
-#ifndef wxCRT_FputcW
-int /* not wint_t */ wxCRT_FputcW(wchar_t wc, FILE *stream)
-{
-    wchar_t ws[2] = { wc, L'\0' };
-
-    return wxCRT_FputsW(ws, stream);
-}
-#endif // !wxCRT_FputcW
-
-// NB: we only implement va_list functions here, the ones taking ... are
-//     defined below for wxNEED_PRINTF_CONVERSION case anyhow and we reuse
-//     the definitions there to avoid duplicating them here
-#ifdef wxNEED_WPRINTF
-
-// TODO: implement the scanf() functions
-static int vwscanf(const wchar_t *format, va_list argptr)
-{
-    wxFAIL_MSG( wxT("TODO") );
-
-    return -1;
-}
-
-static int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
-{
-    wxFAIL_MSG( wxT("TODO") );
-
-    return -1;
-}
-
-#define vswprintf wxCRT_VsnprintfW
-
-static int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr)
-{
-    wxString s;
-    int rc = s.PrintfV(format, argptr);
-
-    if ( rc != -1 )
-    {
-        // we can't do much better without Unicode support in libc...
-        if ( fprintf(stream, "%s", (const char*)s.mb_str() ) == -1 )
-            return -1;
-    }
-
-    return rc;
-}
-
-static int vwprintf(const wchar_t *format, va_list argptr)
-{
-    return wxCRT_VfprintfW(stdout, format, argptr);
-}
-
-#endif // wxNEED_WPRINTF
-
-#ifdef wxNEED_VSWSCANF
-static int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
-{
-    // The best we can do without proper Unicode support in glibc is to
-    // convert the strings into MB representation and run ANSI version
-    // of the function. This doesn't work with %c and %s because of difference
-    // in size of char and wchar_t, though.
-
-    wxCHECK_MSG( wxStrstr(format, wxT("%s")) == NULL, -1,
-                 wxT("incomplete vswscanf implementation doesn't allow %s") );
-    wxCHECK_MSG( wxStrstr(format, wxT("%c")) == NULL, -1,
-                 wxT("incomplete vswscanf implementation doesn't allow %c") );
-
-    return vsscanf(static_cast<const char*>(wxConvLibc.cWX2MB(ws)),
-        wxConvLibc.cWX2MB(format), argptr);
-}
-#endif
-
-// ----------------------------------------------------------------------------
-// wxPrintf(), wxScanf() and relatives
-// ----------------------------------------------------------------------------
-
-// FIXME-UTF8: do format conversion using (modified) wxFormatConverter in
-//             template wrappers, not here; note that it will needed to
-//             translate all forms of string specifiers to %(l)s for wxPrintf(),
-//             but it only should do what it did in 2.8 for wxScanf()!
-
-#ifndef wxCRT_PrintfW
-int wxCRT_PrintfW( const wchar_t *format, ... )
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int ret = vwprintf( format, argptr );
-
-    va_end(argptr);
-
-    return ret;
-}
-#endif
-
-#ifndef wxCRT_FprintfW
-int wxCRT_FprintfW( FILE *stream, const wchar_t *format, ... )
-{
-    va_list argptr;
-    va_start( argptr, format );
-
-    int ret = vfwprintf( stream, format, argptr );
-
-    va_end(argptr);
-
-    return ret;
-}
-#endif
-
-#ifndef wxCRT_VfprintfW
-int wxCRT_VfprintfW( FILE *stream, const wchar_t *format, va_list argptr )
-{
-    return vfwprintf( stream, format, argptr );
-}
-#endif
-
-#ifndef wxCRT_VprintfW
-int wxCRT_VprintfW( const wchar_t *format, va_list argptr )
-{
-    return vwprintf( format, argptr );
-}
-#endif
-
-#ifndef wxCRT_VsprintfW
-int wxCRT_VsprintfW( wchar_t *str, const wchar_t *format, va_list argptr )
-{
-    // same as for wxSprintf()
-    return vswprintf(str, INT_MAX / 4, format, argptr);
-}
-#endif
-
-#ifndef wxCRT_ScanfW
-int wxCRT_ScanfW(const wchar_t *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-#ifdef __VMS
-#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
-   int ret = std::vwscanf(format, argptr);
-#else
-   int ret = vwscanf(format, argptr);
-#endif
-#else
-   int ret = vwscanf(format, argptr);
-#endif
-
-    va_end(argptr);
-
-    return ret;
-}
-#endif
-
-#ifndef wxCRT_SscanfW
-int wxCRT_SscanfW(const wchar_t *str, const wchar_t *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-#ifdef __VMS
-#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
-   int ret = std::vswscanf(str, format, argptr);
-#else
-   int ret = vswscanf(str, format, argptr);
-#endif
-#else
-   int ret = vswscanf(str, format, argptr);
-#endif
-
-    va_end(argptr);
-
-    return ret;
-}
-#endif
-
-#ifndef wxCRT_FscanfW
-int wxCRT_FscanfW(FILE *stream, const wchar_t *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-#ifdef __VMS
-#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
-   int ret = std::vfwscanf(stream, format, argptr);
-#else
-   int ret = vfwscanf(stream, format, argptr);
-#endif
-#else
-   int ret = vfwscanf(stream, format, argptr);
-#endif
-
-    va_end(argptr);
-
-    return ret;
-}
-#endif
-
-#ifndef wxCRT_VsscanfW
-int wxCRT_VsscanfW(const wchar_t *str, const wchar_t *format, va_list argptr)
-{
-#ifdef __VMS
-#if (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
-   return std::vswscanf(str, format, argptr);
-#else
-   return vswscanf(str, format, argptr);
-#endif
-#else
-   return vswscanf(str, format, argptr);
-#endif
-}
-#endif
-
-
-// ----------------------------------------------------------------------------
-// wrappers to printf and scanf function families
-// ----------------------------------------------------------------------------
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-int wxDoSprintfWchar(char *str, const wxChar *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int rv = wxVsprintf(str, format, argptr);
-
-    va_end(argptr);
-    return rv;
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-int wxDoSprintfUtf8(char *str, const char *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int rv = wxVsprintf(str, format, argptr);
-
-    va_end(argptr);
-    return rv;
-}
-#endif // wxUSE_UNICODE_UTF8
-
-#if wxUSE_UNICODE
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-int wxDoSprintfWchar(wchar_t *str, const wxChar *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int rv = wxVsprintf(str, format, argptr);
-
-    va_end(argptr);
-    return rv;
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-int wxDoSprintfUtf8(wchar_t *str, const char *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int rv = wxVsprintf(str, format, argptr);
-
-    va_end(argptr);
-    return rv;
-}
-#endif // wxUSE_UNICODE_UTF8
-
-#endif // wxUSE_UNICODE
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-int wxDoSnprintfWchar(char *str, size_t size, const wxChar *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int rv = wxVsnprintf(str, size, format, argptr);
-
-    va_end(argptr);
-    return rv;
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-int wxDoSnprintfUtf8(char *str, size_t size, const char *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int rv = wxVsnprintf(str, size, format, argptr);
-
-    va_end(argptr);
-    return rv;
-}
-#endif // wxUSE_UNICODE_UTF8
-
-#if wxUSE_UNICODE
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-int wxDoSnprintfWchar(wchar_t *str, size_t size, const wxChar *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int rv = wxVsnprintf(str, size, format, argptr);
-
-    va_end(argptr);
-    return rv;
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-int wxDoSnprintfUtf8(wchar_t *str, size_t size, const char *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-
-    int rv = wxVsnprintf(str, size, format, argptr);
-
-    va_end(argptr);
-    return rv;
-}
-#endif // wxUSE_UNICODE_UTF8
-
-#endif // wxUSE_UNICODE
-
-
-#ifdef HAVE_BROKEN_VSNPRINTF_DECL
-    #define vsnprintf wx_fixed_vsnprintf
-#endif
-
-#if wxUSE_UNICODE
-
-namespace
-{
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-int ConvertStringToBuf(const wxString& s, char *out, size_t outsize)
-{
-    const wxCharBuffer buf(s.mb_str());
-
-    const size_t len = buf.length();
-    if ( outsize > len )
-    {
-        memcpy(out, buf, (len+1) * sizeof(char));
-    }
-    else // not enough space
-    {
-        memcpy(out, buf, (outsize-1) * sizeof(char));
-        out[outsize-1] = '\0';
-    }
-
-    return len;
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-int ConvertStringToBuf(const wxString& s, wchar_t *out, size_t outsize)
-{
-    const wxWX2WCbuf buf(s.wc_str());
-    size_t len = s.length(); // same as buf length for wchar_t*
-    if ( outsize > len )
-    {
-        memcpy(out, buf, (len+1) * sizeof(wchar_t));
-    }
-    else // not enough space
-    {
-        memcpy(out, buf, (outsize-1) * sizeof(wchar_t));
-        out[outsize-1] = 0;
-    }
-    return len;
-}
-#endif // wxUSE_UNICODE_UTF8
-
-} // anonymous namespace
-
-template<typename T>
-static size_t PrintfViaString(T *out, size_t outsize,
-                              const wxString& format, va_list argptr)
-{
-    wxString s;
-    s.PrintfV(format, argptr);
-
-    return ConvertStringToBuf(s, out, outsize);
-}
-#endif // wxUSE_UNICODE
-
-int wxVsprintf(char *str, const wxString& format, va_list argptr)
-{
-#if wxUSE_UTF8_LOCALE_ONLY
-    return wxCRT_VsprintfA(str, format.wx_str(), argptr);
-#else
-    #if wxUSE_UNICODE_UTF8
-    if ( wxLocaleIsUtf8 )
-        return wxCRT_VsprintfA(str, format.wx_str(), argptr);
-    else
-    #endif
-    #if wxUSE_UNICODE
-    return PrintfViaString(str, wxNO_LEN, format, argptr);
-    #else
-    return wxCRT_VsprintfA(str, format.mb_str(), argptr);
-    #endif
-#endif
-}
-
-#if wxUSE_UNICODE
-int wxVsprintf(wchar_t *str, const wxString& format, va_list argptr)
-{
-#if wxUSE_UNICODE_WCHAR
-#ifdef __DMC__
-/*
-This fails with a bug similar to
-http://www.digitalmars.com/pnews/read.php?server=news.digitalmars.com&group=c++.beta&artnum=680
-in DMC 8.49 and 8.50
-I don't see it being used in the wxWidgets sources at present (oct 2007) CE
-*/
-#pragma message ( "warning ::::: wxVsprintf(wchar_t *str, const wxString& format, va_list argptr) not yet implemented" )
-    wxFAIL_MSG( wxT("TODO") );
-
-    return -1;
-#else
-    return wxCRT_VsprintfW(str, format.wc_str(), argptr);
-#endif //DMC
-#else // wxUSE_UNICODE_UTF8
-    #if !wxUSE_UTF8_LOCALE_ONLY
-    if ( !wxLocaleIsUtf8 )
-        return wxCRT_VsprintfW(str, format.wc_str(), argptr);
-    else
-    #endif
-        return PrintfViaString(str, wxNO_LEN, format, argptr);
-#endif // wxUSE_UNICODE_UTF8
-}
-#endif // wxUSE_UNICODE
-
-int wxVsnprintf(char *str, size_t size, const wxString& format, va_list argptr)
-{
-    int rv;
-#if wxUSE_UTF8_LOCALE_ONLY
-    rv = wxCRT_VsnprintfA(str, size, format.wx_str(), argptr);
-#else
-    #if wxUSE_UNICODE_UTF8
-    if ( wxLocaleIsUtf8 )
-        rv = wxCRT_VsnprintfA(str, size, format.wx_str(), argptr);
-    else
-    #endif
-    #if wxUSE_UNICODE
-    {
-        // NB: if this code is called, then wxString::PrintV() would use the
-        //     wchar_t* version of wxVsnprintf(), so it's safe to use PrintV()
-        //     from here
-        rv = PrintfViaString(str, size, format, argptr);
-    }
-    #else
-    rv = wxCRT_VsnprintfA(str, size, format.mb_str(), argptr);
-    #endif
-#endif
-
-    // VsnprintfTestCase reveals that glibc's implementation of vswprintf
-    // doesn't nul terminate on truncation.
-    str[size - 1] = 0;
-
-    return rv;
-}
-
-#if wxUSE_UNICODE
-int wxVsnprintf(wchar_t *str, size_t size, const wxString& format, va_list argptr)
-{
-    int rv;
-
-#if wxUSE_UNICODE_WCHAR
-    rv = wxCRT_VsnprintfW(str, size, format.wc_str(), argptr);
-#else // wxUSE_UNICODE_UTF8
-    #if !wxUSE_UTF8_LOCALE_ONLY
-    if ( !wxLocaleIsUtf8 )
-        rv = wxCRT_VsnprintfW(str, size, format.wc_str(), argptr);
-    else
-    #endif
-    {
-        // NB: if this code is called, then wxString::PrintV() would use the
-        //     char* version of wxVsnprintf(), so it's safe to use PrintV()
-        //     from here
-        rv = PrintfViaString(str, size, format, argptr);
-    }
-#endif // wxUSE_UNICODE_UTF8
-
-    // VsnprintfTestCase reveals that glibc's implementation of vswprintf
-    // doesn't nul terminate on truncation.
-    str[size - 1] = 0;
-
-    return rv;
-}
-#endif // wxUSE_UNICODE
-
-
-// ----------------------------------------------------------------------------
-// ctype.h stuff (currently unused)
-// ----------------------------------------------------------------------------
-
-#ifdef wxNEED_WX_MBSTOWCS
-
-WXDLLIMPEXP_BASE size_t wxMbstowcs (wchar_t * out, const char * in, size_t outlen)
-{
-    if (!out)
-    {
-        size_t outsize = 0;
-        while(*in++)
-            outsize++;
-        return outsize;
-    }
-
-    const char* origin = in;
-
-    while (outlen-- && *in)
-    {
-        *out++ = (wchar_t) *in++;
-    }
-
-    *out = '\0';
-
-    return in - origin;
-}
-
-WXDLLIMPEXP_BASE size_t wxWcstombs (char * out, const wchar_t * in, size_t outlen)
-{
-    if (!out)
-    {
-        size_t outsize = 0;
-        while(*in++)
-            outsize++;
-        return outsize;
-    }
-
-    const wchar_t* origin = in;
-
-    while (outlen-- && *in)
-    {
-        *out++ = (char) *in++;
-    }
-
-    *out = '\0';
-
-    return in - origin;
-}
-
-#endif // wxNEED_WX_MBSTOWCS
-
-#ifndef wxCRT_StrdupA
-WXDLLIMPEXP_BASE char *wxCRT_StrdupA(const char *s)
-{
-    return strcpy((char *)malloc(strlen(s) + 1), s);
-}
-#endif // wxCRT_StrdupA
-
-#ifndef wxCRT_StrdupW
-WXDLLIMPEXP_BASE wchar_t * wxCRT_StrdupW(const wchar_t *pwz)
-{
-  size_t size = (wxWcslen(pwz) + 1) * sizeof(wchar_t);
-  wchar_t *ret = (wchar_t *) malloc(size);
-  memcpy(ret, pwz, size);
-  return ret;
-}
-#endif // wxCRT_StrdupW
-
-#ifndef wxWCHAR_T_IS_WXCHAR16
-size_t wxStrlen(const wxChar16 *s )
-{
-    if (!s) return 0;
-    size_t i=0;
-    while (*s!=0) { ++i; ++s; };
-    return i;
-}
-
-wxChar16* wxStrdup(const wxChar16* s)
-{
-  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar16);
-  wxChar16 *ret = (wxChar16*) malloc(size);
-  memcpy(ret, s, size);
-  return ret;
-}
-#endif
-
-#ifndef wxWCHAR_T_IS_WXCHAR32
-size_t wxStrlen(const wxChar32 *s )
-{
-    if (!s) return 0;
-    size_t i=0;
-    while (*s!=0) { ++i; ++s; };
-    return i;
-}
-
-wxChar32* wxStrdup(const wxChar32* s)
-{
-  size_t size = (wxStrlen(s) + 1) * sizeof(wxChar32);
-  wxChar32 *ret = (wxChar32*) malloc(size);
-  memcpy(ret, s, size);
-  return ret;
-}
-#endif
-
-#ifndef wxCRT_StricmpA
-WXDLLIMPEXP_BASE int wxCRT_StricmpA(const char *psz1, const char *psz2)
-{
-  register char c1, c2;
-  do {
-    c1 = wxTolower(*psz1++);
-    c2 = wxTolower(*psz2++);
-  } while ( c1 && (c1 == c2) );
-  return c1 - c2;
-}
-#endif // !defined(wxCRT_StricmpA)
-
-#ifndef wxCRT_StricmpW
-WXDLLIMPEXP_BASE int wxCRT_StricmpW(const wchar_t *psz1, const wchar_t *psz2)
-{
-  register wchar_t c1, c2;
-  do {
-    c1 = wxTolower(*psz1++);
-    c2 = wxTolower(*psz2++);
-  } while ( c1 && (c1 == c2) );
-  return c1 - c2;
-}
-#endif // !defined(wxCRT_StricmpW)
-
-#ifndef wxCRT_StrnicmpA
-WXDLLIMPEXP_BASE int wxCRT_StrnicmpA(const char *s1, const char *s2, size_t n)
-{
-  // initialize the variables just to suppress stupid gcc warning
-  register char c1 = 0, c2 = 0;
-  while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++;
-  if (n) {
-    if (c1 < c2) return -1;
-    if (c1 > c2) return 1;
-  }
-  return 0;
-}
-#endif // !defined(wxCRT_StrnicmpA)
-
-#ifndef wxCRT_StrnicmpW
-WXDLLIMPEXP_BASE int wxCRT_StrnicmpW(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-  // initialize the variables just to suppress stupid gcc warning
-  register wchar_t c1 = 0, c2 = 0;
-  while (n && ((c1 = wxTolower(*s1)) == (c2 = wxTolower(*s2)) ) && c1) n--, s1++, s2++;
-  if (n) {
-    if (c1 < c2) return -1;
-    if (c1 > c2) return 1;
-  }
-  return 0;
-}
-#endif // !defined(wxCRT_StrnicmpW)
-
-// ----------------------------------------------------------------------------
-// string.h functions
-// ----------------------------------------------------------------------------
-
-// this (and wxCRT_StrncmpW below) are extern "C" because they are needed
-// by regex code, the rest isn't needed, so it's not declared as extern "C"
-#ifndef wxCRT_StrlenW
-extern "C" WXDLLIMPEXP_BASE size_t wxCRT_StrlenW(const wchar_t *s)
-{
-    size_t n = 0;
-    while ( *s++ )
-        n++;
-
-    return n;
-}
-#endif
-
-// ----------------------------------------------------------------------------
-// stdlib.h functions
-// ----------------------------------------------------------------------------
-
-#ifndef wxCRT_GetenvW
-WXDLLIMPEXP_BASE wchar_t* wxCRT_GetenvW(const wchar_t *name)
-{
-    // NB: buffer returned by getenv() is allowed to be overwritten next
-    //     time getenv() is called, so it is OK to use static string
-    //     buffer to hold the data.
-    static wxWCharBuffer value;
-    value = wxConvLibc.cMB2WC(getenv(wxConvLibc.cWC2MB(name)));
-    return value.data();
-}
-#endif // !wxCRT_GetenvW
-
-#ifndef wxCRT_StrftimeW
-WXDLLIMPEXP_BASE size_t
-wxCRT_StrftimeW(wchar_t *s, size_t maxsize, const wchar_t *fmt, const struct tm *tm)
-{
-    if ( !maxsize )
-        return 0;
-
-    wxCharBuffer buf(maxsize);
-
-    wxCharBuffer bufFmt(wxConvLibc.cWX2MB(fmt));
-    if ( !bufFmt )
-        return 0;
-
-    size_t ret = strftime(buf.data(), maxsize, bufFmt, tm);
-    if  ( !ret )
-        return 0;
-
-    wxWCharBuffer wbuf = wxConvLibc.cMB2WX(buf);
-    if ( !wbuf )
-        return 0;
-
-    wxCRT_StrncpyW(s, wbuf, maxsize);
-    return wxCRT_StrlenW(s);
-}
-#endif // !wxCRT_StrftimeW
-
-#ifdef wxLongLong_t
-template<typename T>
-static wxULongLong_t
-wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign)
-{
-    wxULongLong_t sum = 0;
-    wxString wxstr(nptr);
-    wxString::const_iterator i = wxstr.begin();
-    wxString::const_iterator end = wxstr.end();
-
-    // Skip spaces
-    while ( i != end && wxIsspace(*i) ) ++i;
-
-    // Starts with sign?
-    *sign = wxT(' ');
-    if ( i != end )
-    {
-        T c = *i;
-        if ( c == wxT('+') || c == wxT('-') )
-        {
-            *sign = c;
-            ++i;
-        }
-    }
-
-    // Starts with 0x?
-    if ( i != end && *i == wxT('0') )
-    {
-        ++i;
-        if ( i != end )
-        {
-            if ( *i == wxT('x') && (base == 16 || base == 0) )
-            {
-                base = 16;
-                ++i;
-            }
-            else
-            {
-                if ( endptr )
-                    *endptr = (T*) nptr;
-                wxSET_ERRNO(EINVAL);
-                return sum;
-            }
-        }
-        else
-            --i;
-    }
-
-    if ( base == 0 )
-        base = 10;
-
-    for ( ; i != end; ++i )
-    {
-        unsigned int n;
-
-        T c = *i;
-        if ( c >= '0' )
-        {
-            if ( c <= '9' )
-                n = c - wxT('0');
-            else
-                n = wxTolower(c) - wxT('a') + 10;
-        }
-        else
-            break;
-
-        if ( n >= (unsigned int)base )
-            // Invalid character (for this base)
-            break;
-
-        wxULongLong_t prevsum = sum;
-        sum = (sum * base) + n;
-
-        if ( sum < prevsum )
-        {
-            wxSET_ERRNO(ERANGE);
-            break;
-        }
-    }
-
-    if ( endptr )
-    {
-        *endptr = (T*)(nptr + (i - wxstr.begin()));
-    }
-
-    return sum;
-}
-
-template<typename T>
-static wxULongLong_t wxCRT_DoStrtoull(const T* nptr, T** endptr, int base)
-{
-    T sign;
-    wxULongLong_t uval = ::wxCRT_StrtoullBase(nptr, endptr, base, &sign);
-
-    if ( sign == wxT('-') )
-    {
-        wxSET_ERRNO(ERANGE);
-        uval = 0;
-    }
-
-    return uval;
-}
-
-template<typename T>
-static wxLongLong_t wxCRT_DoStrtoll(const T* nptr, T** endptr, int base)
-{
-    T sign;
-    wxULongLong_t uval = ::wxCRT_StrtoullBase(nptr, endptr, base, &sign);
-    wxLongLong_t val = 0;
-
-    if ( sign == wxT('-') )
-    {
-        if (uval <= (wxULongLong_t)wxINT64_MAX + 1)
-        {
-            val = -(wxLongLong_t)uval;
-        }
-        else
-        {
-            wxSET_ERRNO(ERANGE);
-        }
-    }
-    else if ( uval <= wxINT64_MAX )
-    {
-        val = uval;
-    }
-    else
-    {
-        wxSET_ERRNO(ERANGE);
-    }
-
-    return val;
-}
-
-#ifndef wxCRT_StrtollA
-wxLongLong_t wxCRT_StrtollA(const char* nptr, char** endptr, int base)
-    { return wxCRT_DoStrtoll(nptr, endptr, base); }
-#endif
-#ifndef wxCRT_StrtollW
-wxLongLong_t wxCRT_StrtollW(const wchar_t* nptr, wchar_t** endptr, int base)
-    { return wxCRT_DoStrtoll(nptr, endptr, base); }
-#endif
-
-#ifndef wxCRT_StrtoullA
-wxULongLong_t wxCRT_StrtoullA(const char* nptr, char** endptr, int base)
-    { return wxCRT_DoStrtoull(nptr, endptr, base); }
-#endif
-#ifndef wxCRT_StrtoullW
-wxULongLong_t wxCRT_StrtoullW(const wchar_t* nptr, wchar_t** endptr, int base)
-    { return wxCRT_DoStrtoull(nptr, endptr, base); }
-#endif
-
-#endif // wxLongLong_t
-
-// ----------------------------------------------------------------------------
-// strtok() functions
-// ----------------------------------------------------------------------------
-
-template<typename T>
-static T *wxCRT_DoStrtok(T *psz, const T *delim, T **save_ptr)
-{
-    if (!psz)
-    {
-        psz = *save_ptr;
-        if ( !psz )
-            return NULL;
-    }
-
-    psz += wxStrspn(psz, delim);
-    if (!*psz)
-    {
-        *save_ptr = NULL;
-        return NULL;
-    }
-
-    T *ret = psz;
-    psz = wxStrpbrk(psz, delim);
-    if (!psz)
-    {
-        *save_ptr = NULL;
-    }
-    else
-    {
-        *psz = wxT('\0');
-        *save_ptr = psz + 1;
-    }
-
-    return ret;
-}
-
-#ifndef wxCRT_StrtokA
-char *wxCRT_StrtokA(char *psz, const char *delim, char **save_ptr)
-    { return wxCRT_DoStrtok(psz, delim, save_ptr); }
-#endif
-#ifndef wxCRT_StrtokW
-wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wchar_t **save_ptr)
-    { return wxCRT_DoStrtok(psz, delim, save_ptr); }
-#endif
-
-// ----------------------------------------------------------------------------
-// missing C RTL functions
-// ----------------------------------------------------------------------------
-
-#ifdef wxNEED_STRDUP
-
-char *strdup(const char *s)
-{
-    char *dest = (char*) malloc( strlen( s ) + 1 ) ;
-    if ( dest )
-        strcpy( dest , s ) ;
-    return dest ;
-}
-#endif // wxNEED_STRDUP
-
-#if defined(__WXWINCE__) && (_WIN32_WCE <= 211)
-
-void *calloc( size_t num, size_t size )
-{
-    void** ptr = (void **)malloc(num * size);
-    memset( ptr, 0, num * size);
-    return ptr;
-}
-
-#endif // __WXWINCE__ <= 211
-
-// ============================================================================
-// wxLocaleIsUtf8
-// ============================================================================
-
-#if wxUSE_UNICODE_UTF8
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-bool wxLocaleIsUtf8 = false; // the safer setting if not known
-#endif
-
-static bool wxIsLocaleUtf8()
-{
-    // NB: we intentionally don't use wxLocale::GetSystemEncodingName(),
-    //     because a) it may be unavailable in some builds and b) has slightly
-    //     different semantics (default locale instead of current)
-
-#if defined(HAVE_LANGINFO_H) && defined(CODESET)
-    // GNU libc provides current character set this way (this conforms to
-    // Unix98)
-    const char *charset = nl_langinfo(CODESET);
-    if ( charset )
-    {
-        // "UTF-8" is used by modern glibc versions, but test other variants
-        // as well, just in case:
-        if ( strcmp(charset, "UTF-8") == 0 ||
-             strcmp(charset, "utf-8") == 0 ||
-             strcmp(charset, "UTF8") == 0 ||
-             strcmp(charset, "utf8") == 0 )
-        {
-            return true;
-        }
-    }
-#endif // HAVE_LANGINFO_H
-
-    // check if we're running under the "C" locale: it is 7bit subset
-    // of UTF-8, so it can be safely used with the UTF-8 build:
-    const char *lc_ctype = setlocale(LC_CTYPE, NULL);
-    if ( lc_ctype &&
-         (strcmp(lc_ctype, "C") == 0 || strcmp(lc_ctype, "POSIX") == 0) )
-    {
-        return true;
-    }
-
-    // we don't know what charset libc is using, so assume the worst
-    // to be safe:
-    return false;
-}
-
-void wxUpdateLocaleIsUtf8()
-{
-#if wxUSE_UTF8_LOCALE_ONLY
-    if ( !wxIsLocaleUtf8() )
-    {
-        wxLogFatalError(wxT("This program requires UTF-8 locale to run."));
-    }
-#else // !wxUSE_UTF8_LOCALE_ONLY
-    wxLocaleIsUtf8 = wxIsLocaleUtf8();
-#endif
-}
-
-#endif // wxUSE_UNICODE_UTF8
-
-// ============================================================================
-// wx wrappers for CRT functions
-// ============================================================================
-
-#if wxUSE_UNICODE_WCHAR
-    #define CALL_ANSI_OR_UNICODE(return_kw, callA, callW)  return_kw callW
-#elif wxUSE_UNICODE_UTF8 && !wxUSE_UTF8_LOCALE_ONLY
-    #define CALL_ANSI_OR_UNICODE(return_kw, callA, callW) \
-            return_kw wxLocaleIsUtf8 ? callA : callW
-#else // ANSI or UTF8 only
-    #define CALL_ANSI_OR_UNICODE(return_kw, callA, callW)  return_kw callA
-#endif
-
-int wxPuts(const wxString& s)
-{
-    // under IRIX putws() takes a non-const argument so use wchar_str() instead
-    // of wc_str()
-    CALL_ANSI_OR_UNICODE(return,
-                         wxCRT_PutsA(s.mb_str()),
-                         wxCRT_PutsW(s.wchar_str()));
-}
-
-int wxFputs(const wxString& s, FILE *stream)
-{
-    CALL_ANSI_OR_UNICODE(return,
-                         wxCRT_FputsA(s.mb_str(), stream),
-                         wxCRT_FputsW(s.wc_str(), stream));
-}
-
-int wxFputc(const wxUniChar& c, FILE *stream)
-{
-#if !wxUSE_UNICODE // FIXME-UTF8: temporary, remove this with ANSI build
-    return wxCRT_FputcA((char)c, stream);
-#else
-    CALL_ANSI_OR_UNICODE(return,
-                         wxCRT_FputsA(c.AsUTF8(), stream),
-                         wxCRT_FputcW((wchar_t)c, stream));
-#endif
-}
-
-#ifdef wxCRT_PerrorA
-
-void wxPerror(const wxString& s)
-{
-#ifdef wxCRT_PerrorW
-    CALL_ANSI_OR_UNICODE(wxEMPTY_PARAMETER_VALUE,
-                         wxCRT_PerrorA(s.mb_str()),
-                         wxCRT_PerrorW(s.wc_str()));
-#else
-    wxCRT_PerrorA(s.mb_str());
-#endif
-}
-
-#endif // wxCRT_PerrorA
-
-wchar_t *wxFgets(wchar_t *s, int size, FILE *stream)
-{
-    wxCHECK_MSG( s, NULL, "empty buffer passed to wxFgets()" );
-
-    wxCharBuffer buf(size - 1);
-    // FIXME: this reads too little data if wxConvLibc uses UTF-8 ('size' wide
-    //        characters may be encoded by up to 'size'*4 bytes), but what
-    //        else can we do?
-    if ( wxFgets(buf.data(), size, stream) == NULL )
-        return NULL;
-
-    if ( wxConvLibc.ToWChar(s, size, buf, wxNO_LEN) == wxCONV_FAILED )
-        return NULL;
-
-    return s;
-}
-
-// ----------------------------------------------------------------------------
-// wxScanf() and friends
-// ----------------------------------------------------------------------------
-
-#ifdef HAVE_VSSCANF // __VISUALC__ and __DMC__ see wx/crt.h
-int wxVsscanf(const char *str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(str, format, ap); }
-int wxVsscanf(const wchar_t *str, const wchar_t *format, va_list ap)
-    { return wxCRT_VsscanfW(str, format, ap); }
-int wxVsscanf(const wxCharBuffer& str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(static_cast<const char*>(str), format, ap); }
-int wxVsscanf(const wxWCharBuffer& str, const wchar_t *format, va_list ap)
-    { return wxCRT_VsscanfW(str, format, ap); }
-int wxVsscanf(const wxString& str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(static_cast<const char*>(str.mb_str()), format, ap); }
-int wxVsscanf(const wxString& str, const wchar_t *format, va_list ap)
-    { return wxCRT_VsscanfW(str.wc_str(), format, ap); }
-int wxVsscanf(const wxCStrData& str, const char *format, va_list ap)
-    { return wxCRT_VsscanfA(static_cast<const char*>(str.AsCharBuf()), format, ap); }
-int wxVsscanf(const wxCStrData& str, const wchar_t *format, va_list ap)
-    { return wxCRT_VsscanfW(str.AsWCharBuf(), format, ap); }
-#endif // HAVE_NO_VSSCANF
diff --git a/Source/3rd Party/wx/src/common/wxprintf.cpp b/Source/3rd Party/wx/src/common/wxprintf.cpp
deleted file mode 100644
index ff44e3fc8..000000000
--- a/Source/3rd Party/wx/src/common/wxprintf.cpp	
+++ /dev/null
@@ -1,249 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/wxprintf.cpp
-// Purpose:     wxWidgets wxPrintf() implementation
-// Author:      Ove Kaven
-// Modified by: Ron Lee, Francesco Montorsi
-// Created:     09/04/99
-// RCS-ID:      $Id$
-// Copyright:   (c) wxWidgets copyright
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// headers, declarations, constants
-// ===========================================================================
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-    #include "wx/hash.h"
-    #include "wx/utils.h"     // for wxMin and wxMax
-    #include "wx/log.h"
-#endif
-
-#include "wx/private/wxprintf.h"
-
-
-// ============================================================================
-// printf() implementation
-// ============================================================================
-
-// special test mode: define all functions below even if we don't really need
-// them to be able to test them
-#ifdef wxTEST_PRINTF
-    #undef wxCRT_VsnprintfW
-    #undef wxCRT_VsnprintfA
-#endif
-
-// ----------------------------------------------------------------------------
-// implement [v]snprintf() if the system doesn't provide a safe one
-// or if the system's one does not support positional parameters
-// (very useful for i18n purposes)
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// common code for both ANSI and Unicode versions
-// ----------------------------------------------------------------------------
-
-#if !defined(wxCRT_VsnprintfW) || !defined(wxCRT_VsnprintfA)
-
-
-// Copy chars from source to dest converting '%%' to '%'. Takes at most maxIn
-// chars from source and write at most outMax chars to dest, returns the
-// number of chars actually written. Does not treat null specially.
-template<typename CharType>
-static int wxCopyStrWithPercents(
-        size_t maxOut,
-        CharType *dest,
-        size_t maxIn,
-        const CharType *source)
-{
-    size_t written = 0;
-
-    if (maxIn == 0)
-        return 0;
-
-    size_t i;
-    for ( i = 0; i < maxIn-1 && written < maxOut; source++, i++)
-    {
-        dest[written++] = *source;
-        if (*(source+1) == wxT('%'))
-        {
-            // skip this additional '%' character
-            source++;
-            i++;
-        }
-    }
-
-    if (i < maxIn && written < maxOut)
-        // copy last character inconditionally
-        dest[written++] = *source;
-
-    return written;
-}
-
-template<typename CharType>
-static int wxDoVsnprintf(CharType *buf, size_t lenMax,
-                         const CharType *format, va_list argptr)
-{
-    // useful for debugging, to understand if we are really using this function
-    // rather than the system implementation
-#if 0
-    wprintf(L"Using wxCRT_VsnprintfW\n");
-#endif
-
-    wxPrintfConvSpecParser<CharType> parser(format);
-
-    wxPrintfArg argdata[wxMAX_SVNPRINTF_ARGUMENTS];
-
-    size_t i;
-
-    // number of characters in the buffer so far, must be less than lenMax
-    size_t lenCur = 0;
-
-    if (parser.posarg_present && parser.nonposarg_present)
-    {
-        buf[0] = 0;
-        return -1;      // format strings with both positional and
-    }                   // non-positional conversion specifier are unsupported !!
-
-    // on platforms where va_list is an array type, it is necessary to make a
-    // copy to be able to pass it to LoadArg as a reference.
-    bool ok = true;
-    va_list ap;
-    wxVaCopy(ap, argptr);
-
-    // now load arguments from stack
-    for (i=0; i < parser.nargs && ok; i++)
-    {
-        // !pspec[i] means that the user forgot a positional parameter (e.g. %$1s %$3s);
-        // LoadArg == false means that wxPrintfConvSpec::Parse failed to set the
-        // conversion specifier 'type' to a valid value...
-        ok = parser.pspec[i] && parser.pspec[i]->LoadArg(&argdata[i], ap);
-    }
-
-    va_end(ap);
-
-    // something failed while loading arguments from the variable list...
-    // (e.g. the user repeated twice the same positional argument)
-    if (!ok)
-    {
-        buf[0] = 0;
-        return -1;
-    }
-
-    // finally, process each conversion specifier with its own argument
-    const CharType *toparse = format;
-    for (i=0; i < parser.nargs; i++)
-    {
-        wxPrintfConvSpec<CharType>& spec = parser.specs[i];
-
-        // skip any asterisks, they're processed as part of the conversion they
-        // apply to
-        if ( spec.m_type == wxPAT_STAR )
-            continue;
-
-        // copy in the output buffer the portion of the format string between
-        // last specifier and the current one
-        size_t tocopy = ( spec.m_pArgPos - toparse );
-
-        lenCur += wxCopyStrWithPercents(lenMax - lenCur, buf + lenCur,
-                                        tocopy, toparse);
-        if (lenCur == lenMax)
-        {
-            buf[lenMax - 1] = 0;
-            return lenMax+1;      // not enough space in the output buffer !
-        }
-
-        // process this specifier directly in the output buffer
-        int n = spec.Process(buf+lenCur, lenMax - lenCur,
-                                      &argdata[spec.m_pos], lenCur);
-        if (n == -1)
-        {
-            buf[lenMax-1] = wxT('\0');  // be sure to always NUL-terminate the string
-            return lenMax+1;      // not enough space in the output buffer !
-        }
-        lenCur += n;
-
-        // the +1 is because wxPrintfConvSpec::m_pArgEnd points to the last character
-        // of the format specifier, but we are not interested to it...
-        toparse = spec.m_pArgEnd + 1;
-    }
-
-    // copy portion of the format string after last specifier
-    // NOTE: toparse is pointing to the character just after the last processed
-    //       conversion specifier
-    // NOTE2: the +1 is because we want to copy also the '\0'
-    size_t tocopy = wxStrlen(format) + 1  - ( toparse - format ) ;
-
-    lenCur += wxCopyStrWithPercents(lenMax - lenCur, buf + lenCur,
-                                    tocopy, toparse) - 1;
-    if (buf[lenCur])
-    {
-        buf[lenCur] = 0;
-        return lenMax+1;     // not enough space in the output buffer !
-    }
-
-    // Don't do:
-    //      wxASSERT(lenCur == wxStrlen(buf));
-    // in fact if we embedded NULLs in the output buffer (using %c with a '\0')
-    // such check would fail
-
-    return lenCur;
-}
-
-#endif // !defined(wxCRT_VsnprintfW) || !defined(wxCRT_VsnprintfA)
-
-// ----------------------------------------------------------------------------
-// wxCRT_VsnprintfW
-// ----------------------------------------------------------------------------
-
-#if !defined(wxCRT_VsnprintfW)
-
-#if !wxUSE_WXVSNPRINTFW
-    #error "wxUSE_WXVSNPRINTFW must be 1 if our wxCRT_VsnprintfW is used"
-#endif
-
-int wxCRT_VsnprintfW(wchar_t *buf, size_t len,
-                     const wchar_t *format, va_list argptr)
-{
-    return wxDoVsnprintf(buf, len, format, argptr);
-}
-
-#else    // wxCRT_VsnprintfW is defined
-
-#if wxUSE_WXVSNPRINTFW
-    #error "wxUSE_WXVSNPRINTFW must be 0 if our wxCRT_VsnprintfW is not used"
-#endif
-
-#endif // !wxCRT_VsnprintfW
-
-// ----------------------------------------------------------------------------
-// wxCRT_VsnprintfA
-// ----------------------------------------------------------------------------
-
-#ifndef wxCRT_VsnprintfA
-
-#if !wxUSE_WXVSNPRINTFA
-    #error "wxUSE_WXVSNPRINTFA must be 1 if our wxCRT_VsnprintfA is used"
-#endif
-
-int wxCRT_VsnprintfA(char *buf, size_t len,
-                     const char *format, va_list argptr)
-{
-    return wxDoVsnprintf(buf, len, format, argptr);
-}
-
-#else    // wxCRT_VsnprintfA is defined
-
-#if wxUSE_WXVSNPRINTFA
-    #error "wxUSE_WXVSNPRINTFA must be 0 if our wxCRT_VsnprintfA is not used"
-#endif
-
-#endif // !wxCRT_VsnprintfA
diff --git a/Source/3rd Party/wx/src/common/xlocale.cpp b/Source/3rd Party/wx/src/common/xlocale.cpp
deleted file mode 100644
index f46b9b71b..000000000
--- a/Source/3rd Party/wx/src/common/xlocale.cpp	
+++ /dev/null
@@ -1,370 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/xlocale.cpp
-// Purpose:     xlocale wrappers/impl to provide some xlocale wrappers
-// Author:      Brian Vanderburg II, Vadim Zeitlin
-// Created:     2008-01-07
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Brian Vanderburg II
-//                  2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XLOCALE
-
-#ifndef WX_PRECOMP
-    #include "wx/module.h"
-#endif
-
-#include "wx/xlocale.h"
-
-#include <errno.h>
-#include <locale.h>
-
-// ----------------------------------------------------------------------------
-// module globals
-// ----------------------------------------------------------------------------
-
-// This is the C locale object, it is created on demand
-static wxXLocale *gs_cLocale = NULL;
-
-wxXLocale wxNullXLocale;
-
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// Module for gs_cLocale cleanup
-// ----------------------------------------------------------------------------
-
-class wxXLocaleModule : public wxModule
-{
-public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDELETE(gs_cLocale); }
-
-    DECLARE_DYNAMIC_CLASS(wxXLocaleModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxXLocaleModule, wxModule)
-
-
-// ============================================================================
-// wxXLocale implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// common parts
-// ----------------------------------------------------------------------------
-
-// Get the C locale
-wxXLocale& wxXLocale::GetCLocale()
-{
-    if ( !gs_cLocale )
-    {
-        // NOTE: bcc551 has trouble doing static_cast with incomplete
-        //       type definition. reinterpret_cast used as workaround
-        gs_cLocale = new wxXLocale( reinterpret_cast<wxXLocaleCTag *>(NULL) );
-    }
-
-    return *gs_cLocale;
-}
-
-#ifdef wxHAS_XLOCALE_SUPPORT
-
-wxXLocale::wxXLocale(wxLanguage lang)
-{
-    const wxLanguageInfo * const info = wxLocale::GetLanguageInfo(lang);
-    if ( !info )
-    {
-        m_locale = NULL;
-    }
-    else
-    {
-        Init(info->GetLocaleName().c_str());
-    }
-}
-
-#if wxCHECK_VISUALC_VERSION(8)
-
-// ----------------------------------------------------------------------------
-// implementation using MSVC locale API
-// ----------------------------------------------------------------------------
-
-void wxXLocale::Init(const char *loc)
-{
-    if (!loc || *loc == '\0')
-        return;
-
-    m_locale = _create_locale(LC_ALL, loc);
-}
-
-void wxXLocale::Free()
-{
-    if ( m_locale )
-        _free_locale(m_locale);
-}
-
-#elif defined(HAVE_LOCALE_T)
-
-// ----------------------------------------------------------------------------
-// implementation using xlocale API
-// ----------------------------------------------------------------------------
-
-void wxXLocale::Init(const char *loc)
-{
-    if (!loc || *loc == '\0')
-        return;
-
-    m_locale = newlocale(LC_ALL_MASK, loc, NULL);
-    if (!m_locale)
-    {
-        // NOTE: here we do something similar to what wxSetLocaleTryUTF8() does
-        //       in wxLocale code (but with newlocale() calls instead of wxSetlocale())
-        wxString buf(loc);
-        wxString buf2;
-        buf2 = buf + wxS(".UTF-8");
-        m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL);
-        if ( !m_locale )
-        {
-            buf2 = buf + wxS(".utf-8");
-            m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL);
-        }
-        if ( !m_locale )
-        {
-            buf2 = buf + wxS(".UTF8");
-            m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL);
-        }
-        if ( !m_locale )
-        {
-            buf2 = buf + wxS(".utf8");
-            m_locale = newlocale(LC_ALL_MASK, buf2.c_str(), NULL);
-        }
-    }
-
-    // TODO: wxLocale performs many more manipulations of the given locale
-    //       string in the attempt to set a valid locale; reusing that code
-    //       (changing it to take a generic wxTryLocale callback) would be nice
-}
-
-void wxXLocale::Free()
-{
-    if ( m_locale )
-        freelocale(m_locale);
-}
-
-#else
-    #error "Unknown xlocale support."
-#endif
-
-#endif // wxHAS_XLOCALE_SUPPORT
-
-#ifndef wxHAS_XLOCALE_SUPPORT
-
-// ============================================================================
-// Implementation of wxFoo_l() functions for "C" locale without xlocale support
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// character classification and transformation functions
-// ----------------------------------------------------------------------------
-
-// lookup table and macros for character type functions
-#define CTYPE_ALNUM 0x0001
-#define CTYPE_ALPHA 0x0002
-#define CTYPE_CNTRL 0x0004
-#define CTYPE_DIGIT 0x0008
-#define CTYPE_GRAPH 0x0010
-#define CTYPE_LOWER 0x0020
-#define CTYPE_PRINT 0x0040
-#define CTYPE_PUNCT 0x0080
-#define CTYPE_SPACE 0x0100
-#define CTYPE_UPPER 0x0200
-#define CTYPE_XDIGIT 0x0400
-
-static const unsigned int gs_lookup[] =
-{
-    0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004,
-    0x0004, 0x0104, 0x0104, 0x0104, 0x0104, 0x0104, 0x0004, 0x0004,
-    0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004,
-    0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004,
-    0x0140, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0,
-    0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0,
-    0x0459, 0x0459, 0x0459, 0x0459, 0x0459, 0x0459, 0x0459, 0x0459,
-    0x0459, 0x0459, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0,
-    0x00D0, 0x0653, 0x0653, 0x0653, 0x0653, 0x0653, 0x0653, 0x0253,
-    0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253,
-    0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253, 0x0253,
-    0x0253, 0x0253, 0x0253, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x00D0,
-    0x00D0, 0x0473, 0x0473, 0x0473, 0x0473, 0x0473, 0x0473, 0x0073,
-    0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073,
-    0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073, 0x0073,
-    0x0073, 0x0073, 0x0073, 0x00D0, 0x00D0, 0x00D0, 0x00D0, 0x0004
-};
-
-
-#define CTYPE_TEST(c, t) ( (c) <= 127 && (gs_lookup[(c)] & (t)) )
-
-
-// ctype functions
-#define GEN_ISFUNC(name, test) \
-int name(const wxUniChar& c, const wxXLocale& loc) \
-{ \
-    wxCHECK(loc.IsOk(), false); \
-    return CTYPE_TEST(c.GetValue(), test); \
-}
-
-GEN_ISFUNC(wxIsalnum_l, CTYPE_ALNUM)
-GEN_ISFUNC(wxIsalpha_l, CTYPE_ALPHA)
-GEN_ISFUNC(wxIscntrl_l, CTYPE_CNTRL)
-GEN_ISFUNC(wxIsdigit_l, CTYPE_DIGIT)
-GEN_ISFUNC(wxIsgraph_l, CTYPE_GRAPH)
-GEN_ISFUNC(wxIslower_l, CTYPE_LOWER)
-GEN_ISFUNC(wxIsprint_l, CTYPE_PRINT)
-GEN_ISFUNC(wxIspunct_l, CTYPE_PUNCT)
-GEN_ISFUNC(wxIsspace_l, CTYPE_SPACE)
-GEN_ISFUNC(wxIsupper_l, CTYPE_UPPER)
-GEN_ISFUNC(wxIsxdigit_l, CTYPE_XDIGIT)
-
-int wxTolower_l(const wxUniChar& c, const wxXLocale& loc)
-{
-    wxCHECK(loc.IsOk(), false);
-
-    if(CTYPE_TEST(c.GetValue(), CTYPE_UPPER))
-    {
-        return c - 'A' + 'a';
-    }
-
-    return c;
-}
-
-int wxToupper_l(const wxUniChar& c, const wxXLocale& loc)
-{
-    wxCHECK(loc.IsOk(), false);
-
-    if(CTYPE_TEST(c.GetValue(), CTYPE_LOWER))
-    {
-        return c - 'a' + 'A';
-    }
-
-    return c;
-}
-
-
-// ----------------------------------------------------------------------------
-// string --> number conversion functions
-// ----------------------------------------------------------------------------
-
-/*
-    WARNING: the implementation of the wxStrtoX_l() functions below is unsafe
-             in a multi-threaded environment as we temporary change the locale
-             and if in the meanwhile an other thread performs some locale-dependent
-             operation, it may get unexpected results...
-             However this is the best we can do without reinventing the wheel in the
-             case !wxHAS_XLOCALE_SUPPORT...
-*/
-
-namespace
-{
-
-// Helper class that changes LC_NUMERIC facet of the global locale in its ctor
-// to "C" locale and restores it in its dtor later.
-class CNumericLocaleSetter
-{
-public:
-    CNumericLocaleSetter()
-        : m_oldLocale(wxStrdupA(setlocale(LC_NUMERIC, NULL)))
-    {
-        if ( !wxSetlocale(LC_NUMERIC, "C") )
-        {
-            // Setting locale to "C" should really always work.
-            wxFAIL_MSG( wxS("Couldn't set LC_NUMERIC to \"C\"") );
-        }
-    }
-
-    ~CNumericLocaleSetter()
-    {
-        wxSetlocale(LC_NUMERIC, m_oldLocale);
-        free(m_oldLocale);
-    }
-
-private:
-    char * const m_oldLocale;
-
-    wxDECLARE_NO_COPY_CLASS(CNumericLocaleSetter);
-};
-
-} // anonymous namespace
-
-double wxStrtod_l(const wchar_t* str, wchar_t **endptr, const wxXLocale& loc)
-{
-    wxCHECK( loc.IsOk(), 0. );
-
-    CNumericLocaleSetter locSetter;
-
-    return wxStrtod(str, endptr);
-}
-
-double wxStrtod_l(const char* str, char **endptr, const wxXLocale& loc)
-{
-    wxCHECK( loc.IsOk(), 0. );
-
-    CNumericLocaleSetter locSetter;
-
-    return wxStrtod(str, endptr);
-}
-
-long wxStrtol_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc)
-{
-    wxCHECK( loc.IsOk(), 0 );
-
-    CNumericLocaleSetter locSetter;
-
-    return wxStrtol(str, endptr, base);
-}
-
-long wxStrtol_l(const char* str, char **endptr, int base, const wxXLocale& loc)
-{
-    wxCHECK( loc.IsOk(), 0 );
-
-    CNumericLocaleSetter locSetter;
-
-    return wxStrtol(str, endptr, base);
-}
-
-unsigned long wxStrtoul_l(const wchar_t* str, wchar_t **endptr, int base, const wxXLocale& loc)
-{
-    wxCHECK( loc.IsOk(), 0 );
-
-    CNumericLocaleSetter locSetter;
-
-    return wxStrtoul(str, endptr, base);
-}
-
-unsigned long wxStrtoul_l(const char* str, char **endptr, int base, const wxXLocale& loc)
-{
-    wxCHECK( loc.IsOk(), 0 );
-
-    CNumericLocaleSetter locSetter;
-
-    return wxStrtoul(str, endptr, base);
-}
-
-#endif // !defined(wxHAS_XLOCALE_SUPPORT)
-
-#endif // wxUSE_XLOCALE
diff --git a/Source/3rd Party/wx/src/common/xpmdecod.cpp b/Source/3rd Party/wx/src/common/xpmdecod.cpp
index 163ae05df..3b01094c6 100644
--- a/Source/3rd Party/wx/src/common/xpmdecod.cpp	
+++ b/Source/3rd Party/wx/src/common/xpmdecod.cpp	
@@ -1,831 +1,833 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/xpmdecod.cpp
-// Purpose:     wxXPMDecoder
-// Author:      John Cristy, Vaclav Slavik
-// RCS-ID:      $Id$
-// Copyright:   (c) John Cristy, Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-/*
-
-This file is partially based on source code of ImageMagick by John Cristy. Its
-license is as follows:
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%                            X   X  PPPP   M   M                              %
-%                             X X   P   P  MM MM                              %
-%                              X    PPPP   M M M                              %
-%                             X X   P      M   M                              %
-%                            X   X  P      M   M                              %
-%                                                                             %
-%                                                                             %
-%                    Read/Write ImageMagick Image Format.                     %
-%                                                                             %
-%                                                                             %
-%                              Software Design                                %
-%                                John Cristy                                  %
-%                                 July 1992                                   %
-%                                                                             %
-%                                                                             %
-%  Copyright (C) 2001 ImageMagick Studio, a non-profit organization dedicated %
-%  to making software imaging solutions freely available.                     %
-%                                                                             %
-%  Permission is hereby granted, free of charge, to any person obtaining a    %
-%  copy of this software and associated documentation files ("ImageMagick"),  %
-%  to deal in ImageMagick without restriction, including without limitation   %
-%  the rights to use, copy, modify, merge, publish, distribute, sublicense,   %
-%  and/or sell copies of ImageMagick, and to permit persons to whom the       %
-%  ImageMagick is furnished to do so, subject to the following conditions:    %
-%                                                                             %
-%  The above copyright notice and this permission notice shall be included in %
-%  all copies or substantial portions of ImageMagick.                         %
-%                                                                             %
-%  The software is provided "as is", without warranty of any kind, express or %
-%  implied, including but not limited to the warranties of merchantability,   %
-%  fitness for a particular purpose and noninfringement.  In no event shall   %
-%  ImageMagick Studio be liable for any claim, damages or other liability,    %
-%  whether in an action of contract, tort or otherwise, arising from, out of  %
-%  or in connection with ImageMagick or the use or other dealings in          %
-%  ImageMagick.                                                               %
-%                                                                             %
-%  Except as contained in this notice, the name of the ImageMagick Studio     %
-%  shall not be used in advertising or otherwise to promote the sale, use or  %
-%  other dealings in ImageMagick without prior written authorization from the %
-%  ImageMagick Studio.                                                        %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-/*
- * Also contains some pieces from libxpm and its modification for win32 by
- * HeDu <hedu@cul-ipn.uni-kiel.de>:
- *
- * Copyright (C) 1989-95 GROUPE BULL
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of GROUPE BULL shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from GROUPE BULL.
- */
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_IMAGE && wxUSE_XPM
-
-#include "wx/xpmdecod.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-    #include "wx/hashmap.h"
-    #include "wx/stream.h"
-    #include "wx/image.h"
-    #include "wx/palette.h"
-#endif
-
-#include <string.h>
-#include <ctype.h>
-
-#if wxUSE_STREAMS
-bool wxXPMDecoder::CanRead(wxInputStream& stream)
-{
-    unsigned char buf[9];
-
-    if ( !stream.Read(buf, WXSIZEOF(buf)) )
-        return false;
-
-    return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0;
-}
-
-wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
-{
-    size_t length = stream.GetSize();
-    wxCHECK_MSG( length != 0, wxNullImage,
-                 wxT("Cannot read XPM from stream of unknown size") );
-
-    // use a smart buffer to be sure to free memory even when we return on
-    // error
-    wxCharBuffer buffer(length);
-
-    char *xpm_buffer = (char *)buffer.data();
-    if ( stream.Read(xpm_buffer, length).GetLastError() == wxSTREAM_READ_ERROR )
-        return wxNullImage;
-    xpm_buffer[length] = '\0';
-
-    /*
-     *  Remove comments from the file:
-     */
-    char *p, *q;
-    for (p = xpm_buffer; *p != '\0'; p++)
-    {
-        if ( (*p == '"') || (*p == '\'') )
-        {
-            if (*p == '"')
-            {
-              for (p++; *p != '\0'; p++)
-                if ( (*p == '"') && (*(p - 1) != '\\') )
-                    break;
-            }
-            else // *p == '\''
-            {
-                for (p++; *p != '\0'; p++)
-                    if ( (*p == '\'') && (*(p - 1) != '\\') )
-                        break;
-            }
-            if (*p == '\0')
-                break;
-            continue;
-        }
-        if ( (*p != '/') || (*(p + 1) != '*') )
-            continue;
-        for (q = p + 2; *q != '\0'; q++)
-        {
-            if ( (*q == '*') && (*(q + 1) == '/') )
-                break;
-        }
-
-        // memmove allows overlaps (unlike strcpy):
-        size_t cpylen = strlen(q + 2) + 1;
-        memmove(p, q + 2, cpylen);
-    }
-
-    /*
-     *  Remove unquoted characters:
-     */
-    size_t i = 0;
-    for (p = xpm_buffer; *p != '\0'; p++)
-    {
-        if ( *p != '"' )
-            continue;
-        for (q = p + 1; *q != '\0'; q++)
-            if (*q == '"')
-                break;
-        strncpy(xpm_buffer + i, p + 1, q - p - 1);
-        i += q - p - 1;
-        xpm_buffer[i++] = '\n';
-        p = q + 1;
-    }
-    xpm_buffer[i] = '\0';
-
-    /*
-     *  Create array of lines and convert \n's to \0's:
-     */
-    const char **xpm_lines;
-    size_t lines_cnt = 0;
-    size_t line;
-
-    for (p = xpm_buffer; *p != '\0'; p++)
-    {
-        if ( *p == '\n' )
-            lines_cnt++;
-    }
-
-    if ( !lines_cnt )
-    {
-        // this doesn't really look an XPM image
-        return wxNullImage;
-    }
-
-    xpm_lines = new const char*[lines_cnt + 1];
-    xpm_lines[0] = xpm_buffer;
-    line = 1;
-    for (p = xpm_buffer; (*p != '\0') && (line < lines_cnt); p++)
-    {
-        if ( *p == '\n' )
-        {
-            xpm_lines[line] = p + 1;
-            *p = '\0';
-            line++;
-        }
-    }
-
-    xpm_lines[lines_cnt] = NULL;
-
-    /*
-     *  Read the image:
-     */
-    wxImage img = ReadData(xpm_lines);
-
-    delete[] xpm_lines;
-
-    return img;
-}
-#endif // wxUSE_STREAMS
-
-
-/*****************************************************************************\
-* rgbtab.h                                                                    *
-*                                                                             *
-* A hard coded rgb.txt. To keep it short I removed all colornames with        *
-* trailing numbers, Blue3 etc, except the GrayXX. Sorry Grey-lovers I prefer  *
-* Gray ;-). But Grey is recognized on lookups, only on save Gray will be      *
-* used, maybe you want to do some substitue there too.                        *
-*                                                                             *
-* To save memory the RGBs are coded in one long value, as done by the RGB     *
-* macro.                                                                      *
-*                                                                             *
-* Developed by HeDu 3/94 (hedu@cul-ipn.uni-kiel.de)                           *
-\*****************************************************************************/
-
-
-typedef struct
-{
-    const char *name;
-    wxUint32 rgb;
-} rgbRecord;
-
-#define myRGB(r,g,b)   ((wxUint32)r<<16|(wxUint32)g<<8|(wxUint32)b)
-
-static const rgbRecord theRGBRecords[] =
-{
-    {"aliceblue", myRGB(240, 248, 255)},
-    {"antiquewhite", myRGB(250, 235, 215)},
-    {"aquamarine", myRGB(50, 191, 193)},
-    {"azure", myRGB(240, 255, 255)},
-    {"beige", myRGB(245, 245, 220)},
-    {"bisque", myRGB(255, 228, 196)},
-    {"black", myRGB(0, 0, 0)},
-    {"blanchedalmond", myRGB(255, 235, 205)},
-    {"blue", myRGB(0, 0, 255)},
-    {"blueviolet", myRGB(138, 43, 226)},
-    {"brown", myRGB(165, 42, 42)},
-    {"burlywood", myRGB(222, 184, 135)},
-    {"cadetblue", myRGB(95, 146, 158)},
-    {"chartreuse", myRGB(127, 255, 0)},
-    {"chocolate", myRGB(210, 105, 30)},
-    {"coral", myRGB(255, 114, 86)},
-    {"cornflowerblue", myRGB(34, 34, 152)},
-    {"cornsilk", myRGB(255, 248, 220)},
-    {"cyan", myRGB(0, 255, 255)},
-    {"darkgoldenrod", myRGB(184, 134, 11)},
-    {"darkgreen", myRGB(0, 86, 45)},
-    {"darkkhaki", myRGB(189, 183, 107)},
-    {"darkolivegreen", myRGB(85, 86, 47)},
-    {"darkorange", myRGB(255, 140, 0)},
-    {"darkorchid", myRGB(139, 32, 139)},
-    {"darksalmon", myRGB(233, 150, 122)},
-    {"darkseagreen", myRGB(143, 188, 143)},
-    {"darkslateblue", myRGB(56, 75, 102)},
-    {"darkslategray", myRGB(47, 79, 79)},
-    {"darkturquoise", myRGB(0, 166, 166)},
-    {"darkviolet", myRGB(148, 0, 211)},
-    {"deeppink", myRGB(255, 20, 147)},
-    {"deepskyblue", myRGB(0, 191, 255)},
-    {"dimgray", myRGB(84, 84, 84)},
-    {"dodgerblue", myRGB(30, 144, 255)},
-    {"firebrick", myRGB(142, 35, 35)},
-    {"floralwhite", myRGB(255, 250, 240)},
-    {"forestgreen", myRGB(80, 159, 105)},
-    {"gainsboro", myRGB(220, 220, 220)},
-    {"ghostwhite", myRGB(248, 248, 255)},
-    {"gold", myRGB(218, 170, 0)},
-    {"goldenrod", myRGB(239, 223, 132)},
-    {"gray", myRGB(126, 126, 126)},
-    {"gray0", myRGB(0, 0, 0)},
-    {"gray1", myRGB(3, 3, 3)},
-    {"gray10", myRGB(26, 26, 26)},
-    {"gray100", myRGB(255, 255, 255)},
-    {"gray11", myRGB(28, 28, 28)},
-    {"gray12", myRGB(31, 31, 31)},
-    {"gray13", myRGB(33, 33, 33)},
-    {"gray14", myRGB(36, 36, 36)},
-    {"gray15", myRGB(38, 38, 38)},
-    {"gray16", myRGB(41, 41, 41)},
-    {"gray17", myRGB(43, 43, 43)},
-    {"gray18", myRGB(46, 46, 46)},
-    {"gray19", myRGB(48, 48, 48)},
-    {"gray2", myRGB(5, 5, 5)},
-    {"gray20", myRGB(51, 51, 51)},
-    {"gray21", myRGB(54, 54, 54)},
-    {"gray22", myRGB(56, 56, 56)},
-    {"gray23", myRGB(59, 59, 59)},
-    {"gray24", myRGB(61, 61, 61)},
-    {"gray25", myRGB(64, 64, 64)},
-    {"gray26", myRGB(66, 66, 66)},
-    {"gray27", myRGB(69, 69, 69)},
-    {"gray28", myRGB(71, 71, 71)},
-    {"gray29", myRGB(74, 74, 74)},
-    {"gray3", myRGB(8, 8, 8)},
-    {"gray30", myRGB(77, 77, 77)},
-    {"gray31", myRGB(79, 79, 79)},
-    {"gray32", myRGB(82, 82, 82)},
-    {"gray33", myRGB(84, 84, 84)},
-    {"gray34", myRGB(87, 87, 87)},
-    {"gray35", myRGB(89, 89, 89)},
-    {"gray36", myRGB(92, 92, 92)},
-    {"gray37", myRGB(94, 94, 94)},
-    {"gray38", myRGB(97, 97, 97)},
-    {"gray39", myRGB(99, 99, 99)},
-    {"gray4", myRGB(10, 10, 10)},
-    {"gray40", myRGB(102, 102, 102)},
-    {"gray41", myRGB(105, 105, 105)},
-    {"gray42", myRGB(107, 107, 107)},
-    {"gray43", myRGB(110, 110, 110)},
-    {"gray44", myRGB(112, 112, 112)},
-    {"gray45", myRGB(115, 115, 115)},
-    {"gray46", myRGB(117, 117, 117)},
-    {"gray47", myRGB(120, 120, 120)},
-    {"gray48", myRGB(122, 122, 122)},
-    {"gray49", myRGB(125, 125, 125)},
-    {"gray5", myRGB(13, 13, 13)},
-    {"gray50", myRGB(127, 127, 127)},
-    {"gray51", myRGB(130, 130, 130)},
-    {"gray52", myRGB(133, 133, 133)},
-    {"gray53", myRGB(135, 135, 135)},
-    {"gray54", myRGB(138, 138, 138)},
-    {"gray55", myRGB(140, 140, 140)},
-    {"gray56", myRGB(143, 143, 143)},
-    {"gray57", myRGB(145, 145, 145)},
-    {"gray58", myRGB(148, 148, 148)},
-    {"gray59", myRGB(150, 150, 150)},
-    {"gray6", myRGB(15, 15, 15)},
-    {"gray60", myRGB(153, 153, 153)},
-    {"gray61", myRGB(156, 156, 156)},
-    {"gray62", myRGB(158, 158, 158)},
-    {"gray63", myRGB(161, 161, 161)},
-    {"gray64", myRGB(163, 163, 163)},
-    {"gray65", myRGB(166, 166, 166)},
-    {"gray66", myRGB(168, 168, 168)},
-    {"gray67", myRGB(171, 171, 171)},
-    {"gray68", myRGB(173, 173, 173)},
-    {"gray69", myRGB(176, 176, 176)},
-    {"gray7", myRGB(18, 18, 18)},
-    {"gray70", myRGB(179, 179, 179)},
-    {"gray71", myRGB(181, 181, 181)},
-    {"gray72", myRGB(184, 184, 184)},
-    {"gray73", myRGB(186, 186, 186)},
-    {"gray74", myRGB(189, 189, 189)},
-    {"gray75", myRGB(191, 191, 191)},
-    {"gray76", myRGB(194, 194, 194)},
-    {"gray77", myRGB(196, 196, 196)},
-    {"gray78", myRGB(199, 199, 199)},
-    {"gray79", myRGB(201, 201, 201)},
-    {"gray8", myRGB(20, 20, 20)},
-    {"gray80", myRGB(204, 204, 204)},
-    {"gray81", myRGB(207, 207, 207)},
-    {"gray82", myRGB(209, 209, 209)},
-    {"gray83", myRGB(212, 212, 212)},
-    {"gray84", myRGB(214, 214, 214)},
-    {"gray85", myRGB(217, 217, 217)},
-    {"gray86", myRGB(219, 219, 219)},
-    {"gray87", myRGB(222, 222, 222)},
-    {"gray88", myRGB(224, 224, 224)},
-    {"gray89", myRGB(227, 227, 227)},
-    {"gray9", myRGB(23, 23, 23)},
-    {"gray90", myRGB(229, 229, 229)},
-    {"gray91", myRGB(232, 232, 232)},
-    {"gray92", myRGB(235, 235, 235)},
-    {"gray93", myRGB(237, 237, 237)},
-    {"gray94", myRGB(240, 240, 240)},
-    {"gray95", myRGB(242, 242, 242)},
-    {"gray96", myRGB(245, 245, 245)},
-    {"gray97", myRGB(247, 247, 247)},
-    {"gray98", myRGB(250, 250, 250)},
-    {"gray99", myRGB(252, 252, 252)},
-    {"green", myRGB(0, 255, 0)},
-    {"greenyellow", myRGB(173, 255, 47)},
-    {"honeydew", myRGB(240, 255, 240)},
-    {"hotpink", myRGB(255, 105, 180)},
-    {"indianred", myRGB(107, 57, 57)},
-    {"ivory", myRGB(255, 255, 240)},
-    {"khaki", myRGB(179, 179, 126)},
-    {"lavender", myRGB(230, 230, 250)},
-    {"lavenderblush", myRGB(255, 240, 245)},
-    {"lawngreen", myRGB(124, 252, 0)},
-    {"lemonchiffon", myRGB(255, 250, 205)},
-    {"lightblue", myRGB(176, 226, 255)},
-    {"lightcoral", myRGB(240, 128, 128)},
-    {"lightcyan", myRGB(224, 255, 255)},
-    {"lightgoldenrod", myRGB(238, 221, 130)},
-    {"lightgoldenrodyellow", myRGB(250, 250, 210)},
-    {"lightgray", myRGB(168, 168, 168)},
-    {"lightpink", myRGB(255, 182, 193)},
-    {"lightsalmon", myRGB(255, 160, 122)},
-    {"lightseagreen", myRGB(32, 178, 170)},
-    {"lightskyblue", myRGB(135, 206, 250)},
-    {"lightslateblue", myRGB(132, 112, 255)},
-    {"lightslategray", myRGB(119, 136, 153)},
-    {"lightsteelblue", myRGB(124, 152, 211)},
-    {"lightyellow", myRGB(255, 255, 224)},
-    {"limegreen", myRGB(0, 175, 20)},
-    {"linen", myRGB(250, 240, 230)},
-    {"magenta", myRGB(255, 0, 255)},
-    {"maroon", myRGB(143, 0, 82)},
-    {"mediumaquamarine", myRGB(0, 147, 143)},
-    {"mediumblue", myRGB(50, 50, 204)},
-    {"mediumforestgreen", myRGB(50, 129, 75)},
-    {"mediumgoldenrod", myRGB(209, 193, 102)},
-    {"mediumorchid", myRGB(189, 82, 189)},
-    {"mediumpurple", myRGB(147, 112, 219)},
-    {"mediumseagreen", myRGB(52, 119, 102)},
-    {"mediumslateblue", myRGB(106, 106, 141)},
-    {"mediumspringgreen", myRGB(35, 142, 35)},
-    {"mediumturquoise", myRGB(0, 210, 210)},
-    {"mediumvioletred", myRGB(213, 32, 121)},
-    {"midnightblue", myRGB(47, 47, 100)},
-    {"mintcream", myRGB(245, 255, 250)},
-    {"mistyrose", myRGB(255, 228, 225)},
-    {"moccasin", myRGB(255, 228, 181)},
-    {"navajowhite", myRGB(255, 222, 173)},
-    {"navy", myRGB(35, 35, 117)},
-    {"navyblue", myRGB(35, 35, 117)},
-    {"oldlace", myRGB(253, 245, 230)},
-    {"olivedrab", myRGB(107, 142, 35)},
-    {"orange", myRGB(255, 135, 0)},
-    {"orangered", myRGB(255, 69, 0)},
-    {"orchid", myRGB(239, 132, 239)},
-    {"palegoldenrod", myRGB(238, 232, 170)},
-    {"palegreen", myRGB(115, 222, 120)},
-    {"paleturquoise", myRGB(175, 238, 238)},
-    {"palevioletred", myRGB(219, 112, 147)},
-    {"papayawhip", myRGB(255, 239, 213)},
-    {"peachpuff", myRGB(255, 218, 185)},
-    {"peru", myRGB(205, 133, 63)},
-    {"pink", myRGB(255, 181, 197)},
-    {"plum", myRGB(197, 72, 155)},
-    {"powderblue", myRGB(176, 224, 230)},
-    {"purple", myRGB(160, 32, 240)},
-    {"red", myRGB(255, 0, 0)},
-    {"rosybrown", myRGB(188, 143, 143)},
-    {"royalblue", myRGB(65, 105, 225)},
-    {"saddlebrown", myRGB(139, 69, 19)},
-    {"salmon", myRGB(233, 150, 122)},
-    {"sandybrown", myRGB(244, 164, 96)},
-    {"seagreen", myRGB(82, 149, 132)},
-    {"seashell", myRGB(255, 245, 238)},
-    {"sienna", myRGB(150, 82, 45)},
-    {"silver", myRGB(192, 192, 192)},
-    {"skyblue", myRGB(114, 159, 255)},
-    {"slateblue", myRGB(126, 136, 171)},
-    {"slategray", myRGB(112, 128, 144)},
-    {"snow", myRGB(255, 250, 250)},
-    {"springgreen", myRGB(65, 172, 65)},
-    {"steelblue", myRGB(84, 112, 170)},
-    {"tan", myRGB(222, 184, 135)},
-    {"thistle", myRGB(216, 191, 216)},
-    {"tomato", myRGB(255, 99, 71)},
-    {"transparent", myRGB(0, 0, 1)},
-    {"turquoise", myRGB(25, 204, 223)},
-    {"violet", myRGB(156, 62, 206)},
-    {"violetred", myRGB(243, 62, 150)},
-    {"wheat", myRGB(245, 222, 179)},
-    {"white", myRGB(255, 255, 255)},
-    {"whitesmoke", myRGB(245, 245, 245)},
-    {"yellow", myRGB(255, 255, 0)},
-    {"yellowgreen", myRGB(50, 216, 56)},
-    {NULL, myRGB(0, 0, 0)}
-};
-static const int numTheRGBRecords = 235;
-
-static unsigned char ParseHexadecimal(char digit1, char digit2)
-{
-    unsigned char i1, i2;
-
-    if (digit1 >= 'a')
-        i1 = (unsigned char)(digit1 - 'a' + 0x0A);
-    else if (digit1 >= 'A')
-        i1 = (unsigned char)(digit1 - 'A' + 0x0A);
-    else
-        i1 = (unsigned char)(digit1 - '0');
-    if (digit2 >= 'a')
-        i2 = (unsigned char)(digit2 - 'a' + 0x0A);
-    else if (digit2 >= 'A')
-        i2 = (unsigned char)(digit2 - 'A' + 0x0A);
-    else
-        i2 = (unsigned char)(digit2 - '0');
-    return (unsigned char)(0x10 * i1 + i2);
-}
-
-static bool GetRGBFromName(const char *inname, bool *isNone,
-                           unsigned char *r, unsigned char*g, unsigned char *b)
-{
-    int left, right, middle;
-    int cmp;
-    wxUint32 rgbVal;
-    char *name;
-    char *grey, *p;
-
-    // Neither #rrggbb nor #rrrrggggbbbb are in database, we parse them directly
-    size_t inname_len = strlen(inname);
-    if ( *inname == '#' && (inname_len == 7 || inname_len == 13))
-    {
-        size_t ofs = (inname_len == 7) ? 2 : 4;
-        *r = ParseHexadecimal(inname[1], inname[2]);
-        *g = ParseHexadecimal(inname[1*ofs+1], inname[1*ofs+2]);
-        *b = ParseHexadecimal(inname[2*ofs+1], inname[2*ofs+2]);
-        *isNone = false;
-        return true;
-    }
-
-    name = wxStrdupA(inname);
-
-    // theRGBRecords[] has no names with spaces, and no grey, but a
-    // lot of gray...
-
-    // so first extract ' '
-    while ((p = strchr(name, ' ')) != NULL)
-    {
-        while (*(p))            // till eof of string
-        {
-            *p = *(p + 1);      // copy to the left
-            p++;
-        }
-    }
-    // fold to lower case
-    p = name;
-    while (*p)
-    {
-        *p = (char)tolower(*p);
-        p++;
-    }
-
-    // substitute Grey with Gray, else rgbtab.h would have more than 100
-    // 'duplicate' entries
-    if ( (grey = strstr(name, "grey")) != NULL )
-        grey[2] = 'a';
-
-    // check for special 'none' colour:
-    bool found;
-    if ( strcmp(name, "none") == 0 )
-    {
-        *isNone = true;
-        found = true;
-    }
-    else // not "None"
-    {
-        found = false;
-
-        // binary search:
-        left = 0;
-        right = numTheRGBRecords - 1;
-        do
-        {
-            middle = (left + right) / 2;
-            cmp = strcmp(name, theRGBRecords[middle].name);
-            if ( cmp == 0 )
-            {
-                rgbVal = theRGBRecords[middle].rgb;
-                *r = (unsigned char)((rgbVal >> 16) & 0xFF);
-                *g = (unsigned char)((rgbVal >> 8) & 0xFF);
-                *b = (unsigned char)((rgbVal) & 0xFF);
-                *isNone = false;
-                found = true;
-                break;
-            }
-            else if ( cmp < 0 )
-            {
-                right = middle - 1;
-            }
-            else // cmp > 0
-            {
-                left = middle + 1;
-            }
-        } while (left <= right);
-    }
-
-    free(name);
-
-    return found;
-}
-
-static const char *ParseColor(const char *data)
-{
-    static const char *const targets[] =
-                        {"c ", "g ", "g4 ", "m ", "b ", "s ", NULL};
-
-    const char *p, *r;
-    const char *q;
-    int i;
-
-    for (i = 0; targets[i] != NULL; i++)
-    {
-        r = data;
-        for (q = targets[i]; *r != '\0'; r++)
-        {
-            if ( *r != *q )
-                continue;
-            if ( !isspace((int) (*(r - 1))) )
-                continue;
-            p = r;
-            for (;;)
-            {
-                if ( *q == '\0' )
-                    return p;
-                if ( *p++ != *q++ )
-                    break;
-            }
-            q = targets[i];
-        }
-    }
-    return NULL;
-}
-
-struct wxXPMColourMapData
-{
-    wxXPMColourMapData() { R = G = B = 0; }
-    unsigned char R,G,B;
-};
-WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap);
-
-wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
-{
-    wxCHECK_MSG(xpm_data, wxNullImage, wxT("NULL XPM data") );
-
-    wxImage img;
-    int count;
-    unsigned width, height, colors_cnt, chars_per_pixel;
-    size_t i, j, i_key;
-    char key[64];
-    const char *clr_def;
-    wxXPMColourMap clr_tbl;
-    wxXPMColourMap::iterator it;
-    wxString maskKey;
-    wxString keyString;
-
-    /*
-     *  Read hints and initialize structures:
-     */
-
-    count = sscanf(xpm_data[0], "%u %u %u %u",
-                   &width, &height, &colors_cnt, &chars_per_pixel);
-    if ( count != 4 || width * height * colors_cnt == 0 )
-    {
-        wxLogError(_("XPM: incorrect header format!"));
-        return wxNullImage;
-    }
-
-    // VS: XPM color map this large would be insane, since XPMs are encoded with
-    //     92 possible values on each position, 92^64 is *way* larger space than
-    //     8bit RGB...
-    wxCHECK_MSG(chars_per_pixel < 64, wxNullImage, wxT("XPM colormaps this large not supported."));
-
-    if (!img.Create(width, height, false))
-        return wxNullImage;
-
-    key[chars_per_pixel] = '\0';
-
-    /*
-     *  Create colour map:
-     */
-    wxXPMColourMapData clr_data;
-    for (i = 0; i < colors_cnt; i++)
-    {
-        const char *xmpColLine = xpm_data[1 + i];
-
-        // we must have at least " x y" after the colour index, hence +5
-        if ( !xmpColLine || strlen(xmpColLine) < chars_per_pixel + 5 )
-        {
-            wxLogError(_("XPM: incorrect colour description in line %d"),
-                       (int)(1 + i));
-            return wxNullImage;
-        }
-
-        for (i_key = 0; i_key < chars_per_pixel; i_key++)
-            key[i_key] = xmpColLine[i_key];
-        clr_def = ParseColor(xmpColLine + chars_per_pixel);
-
-        if ( clr_def == NULL )
-        {
-            wxLogError(_("XPM: malformed colour definition '%s' at line %d!"),
-                       xmpColLine, (int)(1 + i));
-            return wxNullImage;
-        }
-
-        bool isNone = false;
-        if ( !GetRGBFromName(clr_def, &isNone,
-                             &clr_data.R, &clr_data.G, &clr_data.B) )
-        {
-            wxLogError(_("XPM: malformed colour definition '%s' at line %d!"),
-                       xmpColLine, (int)(1 + i));
-            return wxNullImage;
-        }
-
-        keyString = key;
-        if ( isNone )
-            maskKey = keyString;
-
-        clr_tbl[keyString] = clr_data;
-    }
-
-    // deal with the mask: we must replace pseudo-colour "None" with the mask
-    // colour (which can be any colour not otherwise used in the image)
-    if (!maskKey.empty())
-    {
-        wxLongToLongHashMap rgb_table;
-        long rgb;
-        const size_t n = clr_tbl.size();
-        wxXPMColourMap::const_iterator iter = clr_tbl.begin();
-        for (i = 0; i < n; ++i, ++iter)
-        {
-            const wxXPMColourMapData& data = iter->second;
-            rgb = (data.R << 16) + (data.G << 8) + data.B;
-            rgb_table[rgb];
-        }
-        for (rgb = 0; rgb <= 0xffffff && rgb_table.count(rgb); ++rgb)
-            ;
-        if (rgb > 0xffffff)
-        {
-            wxLogError(_("XPM: no colors left to use for mask!"));
-            return wxNullImage;
-        }
-
-        wxXPMColourMapData& maskData = clr_tbl[maskKey];
-        maskData.R = wxByte(rgb >> 16);
-        maskData.G = wxByte(rgb >> 8);
-        maskData.B = wxByte(rgb);
-
-        img.SetMaskColour(maskData.R, maskData.G, maskData.B);
-    }
-
-    /*
-     *  Parse image data:
-     */
-
-    unsigned char *img_data = img.GetData();
-    wxXPMColourMap::iterator entry;
-    wxXPMColourMap::iterator end = clr_tbl.end();
-
-    for (j = 0; j < height; j++)
-    {
-        for (i = 0; i < width; i++, img_data += 3)
-        {
-            const char *xpmImgLine = xpm_data[1 + colors_cnt + j];
-            if ( !xpmImgLine || strlen(xpmImgLine) < width*chars_per_pixel )
-            {
-                wxLogError(_("XPM: truncated image data at line %d!"),
-                           (int)(1 + colors_cnt + j));
-                return wxNullImage;
-            }
-
-            for (i_key = 0; i_key < chars_per_pixel; i_key++)
-            {
-                key[i_key] = xpmImgLine[chars_per_pixel * i + i_key];
-            }
-
-            keyString = key;
-            entry = clr_tbl.find(keyString);
-            if ( entry == end )
-            {
-                wxLogError(_("XPM: Malformed pixel data!"));
-
-                // better return right now as otherwise we risk to flood the
-                // user with error messages as something seems to be seriously
-                // wrong with the file and so we could give this message for
-                // each remaining pixel if we don't bail out
-                return wxNullImage;
-            }
-
-            img_data[0] = entry->second.R;
-            img_data[1] = entry->second.G;
-            img_data[2] = entry->second.B;
-        }
-    }
-#if wxUSE_PALETTE
-    unsigned char* r = new unsigned char[colors_cnt];
-    unsigned char* g = new unsigned char[colors_cnt];
-    unsigned char* b = new unsigned char[colors_cnt];
-
-    for (it = clr_tbl.begin(), i = 0; it != clr_tbl.end(); it++, i++)
-    {
-        r[i] = it->second.R;
-        g[i] = it->second.G;
-        b[i] = it->second.B;
-    }
-    wxASSERT(i == colors_cnt);
-    img.SetPalette(wxPalette(colors_cnt, r, g, b));
-    delete[] r;
-    delete[] g;
-    delete[] b;
-#endif // wxUSE_PALETTE
-    return img;
-}
-
-#endif // wxUSE_IMAGE && wxUSE_XPM
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/xpmdecod.cpp
+// Purpose:     wxXPMDecoder
+// Author:      John Cristy, Vaclav Slavik
+// RCS-ID:      $Id: xpmdecod.cpp 54948 2008-08-03 10:54:33Z VZ $
+// Copyright:   (c) John Cristy, Vaclav Slavik
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+/*
+
+This file is partially based on source code of ImageMagick by John Cristy. Its
+license is as follows:
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%                            X   X  PPPP   M   M                              %
+%                             X X   P   P  MM MM                              %
+%                              X    PPPP   M M M                              %
+%                             X X   P      M   M                              %
+%                            X   X  P      M   M                              %
+%                                                                             %
+%                                                                             %
+%                    Read/Write ImageMagick Image Format.                     %
+%                                                                             %
+%                                                                             %
+%                              Software Design                                %
+%                                John Cristy                                  %
+%                                 July 1992                                   %
+%                                                                             %
+%                                                                             %
+%  Copyright (C) 2001 ImageMagick Studio, a non-profit organization dedicated %
+%  to making software imaging solutions freely available.                     %
+%                                                                             %
+%  Permission is hereby granted, free of charge, to any person obtaining a    %
+%  copy of this software and associated documentation files ("ImageMagick"),  %
+%  to deal in ImageMagick without restriction, including without limitation   %
+%  the rights to use, copy, modify, merge, publish, distribute, sublicense,   %
+%  and/or sell copies of ImageMagick, and to permit persons to whom the       %
+%  ImageMagick is furnished to do so, subject to the following conditions:    %
+%                                                                             %
+%  The above copyright notice and this permission notice shall be included in %
+%  all copies or substantial portions of ImageMagick.                         %
+%                                                                             %
+%  The software is provided "as is", without warranty of any kind, express or %
+%  implied, including but not limited to the warranties of merchantability,   %
+%  fitness for a particular purpose and noninfringement.  In no event shall   %
+%  ImageMagick Studio be liable for any claim, damages or other liability,    %
+%  whether in an action of contract, tort or otherwise, arising from, out of  %
+%  or in connection with ImageMagick or the use or other dealings in          %
+%  ImageMagick.                                                               %
+%                                                                             %
+%  Except as contained in this notice, the name of the ImageMagick Studio     %
+%  shall not be used in advertising or otherwise to promote the sale, use or  %
+%  other dealings in ImageMagick without prior written authorization from the %
+%  ImageMagick Studio.                                                        %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+*/
+
+/*
+ * Also contains some pieces from libxpm and its modification for win32 by
+ * HeDu <hedu@cul-ipn.uni-kiel.de>:
+ *
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_IMAGE && wxUSE_XPM
+
+#include "wx/xpmdecod.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/hashmap.h"
+    #include "wx/stream.h"
+    #include "wx/image.h"
+    #include "wx/palette.h"
+#endif
+
+#include <string.h>
+#include <ctype.h>
+
+#if wxUSE_STREAMS
+bool wxXPMDecoder::CanRead(wxInputStream& stream)
+{
+    unsigned char buf[9];
+
+    if ( !stream.Read(buf, WXSIZEOF(buf)) )
+        return false;
+
+    stream.SeekI(-(wxFileOffset)WXSIZEOF(buf), wxFromCurrent);
+
+    return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0;
+}
+
+wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
+{
+    size_t length = stream.GetSize();
+    wxCHECK_MSG( length != 0, wxNullImage,
+                 wxT("Cannot read XPM from stream of unknown size") );
+
+    // use a smart buffer to be sure to free memory even when we return on
+    // error
+    wxCharBuffer buffer(length);
+
+    char *xpm_buffer = (char *)buffer.data();
+    if ( stream.Read(xpm_buffer, length).GetLastError() == wxSTREAM_READ_ERROR )
+        return wxNullImage;
+    xpm_buffer[length] = '\0';
+
+    /*
+     *  Remove comments from the file:
+     */
+    char *p, *q;
+    for (p = xpm_buffer; *p != '\0'; p++)
+    {
+        if ( (*p == '"') || (*p == '\'') )
+        {
+            if (*p == '"')
+            {
+              for (p++; *p != '\0'; p++)
+                if ( (*p == '"') && (*(p - 1) != '\\') )
+                    break;
+            }
+            else // *p == '\''
+            {
+                for (p++; *p != '\0'; p++)
+                    if ( (*p == '\'') && (*(p - 1) != '\\') )
+                        break;
+            }
+            if (*p == '\0')
+                break;
+            continue;
+        }
+        if ( (*p != '/') || (*(p + 1) != '*') )
+            continue;
+        for (q = p + 2; *q != '\0'; q++)
+        {
+            if ( (*q == '*') && (*(q + 1) == '/') )
+                break;
+        }
+
+        // memmove allows overlaps (unlike strcpy):
+        size_t cpylen = strlen(q + 2) + 1;
+        memmove(p, q + 2, cpylen);
+    }
+
+    /*
+     *  Remove unquoted characters:
+     */
+    size_t i = 0;
+    for (p = xpm_buffer; *p != '\0'; p++)
+    {
+        if ( *p != '"' )
+            continue;
+        for (q = p + 1; *q != '\0'; q++)
+            if (*q == '"')
+                break;
+        strncpy(xpm_buffer + i, p + 1, q - p - 1);
+        i += q - p - 1;
+        xpm_buffer[i++] = '\n';
+        p = q + 1;
+    }
+    xpm_buffer[i] = '\0';
+
+    /*
+     *  Create array of lines and convert \n's to \0's:
+     */
+    const char **xpm_lines;
+    size_t lines_cnt = 0;
+    size_t line;
+
+    for (p = xpm_buffer; *p != '\0'; p++)
+    {
+        if ( *p == '\n' )
+            lines_cnt++;
+    }
+
+    if ( !lines_cnt )
+    {
+        // this doesn't really look an XPM image
+        return wxNullImage;
+    }
+
+    xpm_lines = new const char*[lines_cnt + 1];
+    xpm_lines[0] = xpm_buffer;
+    line = 1;
+    for (p = xpm_buffer; (*p != '\0') && (line < lines_cnt); p++)
+    {
+        if ( *p == '\n' )
+        {
+            xpm_lines[line] = p + 1;
+            *p = '\0';
+            line++;
+        }
+    }
+
+    xpm_lines[lines_cnt] = NULL;
+
+    /*
+     *  Read the image:
+     */
+    wxImage img = ReadData(xpm_lines);
+
+    delete[] xpm_lines;
+
+    return img;
+}
+#endif // wxUSE_STREAMS
+
+
+/*****************************************************************************\
+* rgbtab.h                                                                    *
+*                                                                             *
+* A hard coded rgb.txt. To keep it short I removed all colornames with        *
+* trailing numbers, Blue3 etc, except the GrayXX. Sorry Grey-lovers I prefer  *
+* Gray ;-). But Grey is recognized on lookups, only on save Gray will be      *
+* used, maybe you want to do some substitue there too.                        *
+*                                                                             *
+* To save memory the RGBs are coded in one long value, as done by the RGB     *
+* macro.                                                                      *
+*                                                                             *
+* Developed by HeDu 3/94 (hedu@cul-ipn.uni-kiel.de)                           *
+\*****************************************************************************/
+
+
+typedef struct
+{
+    const char *name;
+    wxUint32 rgb;
+} rgbRecord;
+
+#define myRGB(r,g,b)   ((wxUint32)r<<16|(wxUint32)g<<8|(wxUint32)b)
+
+static rgbRecord theRGBRecords[] =
+{
+    {"aliceblue", myRGB(240, 248, 255)},
+    {"antiquewhite", myRGB(250, 235, 215)},
+    {"aquamarine", myRGB(50, 191, 193)},
+    {"azure", myRGB(240, 255, 255)},
+    {"beige", myRGB(245, 245, 220)},
+    {"bisque", myRGB(255, 228, 196)},
+    {"black", myRGB(0, 0, 0)},
+    {"blanchedalmond", myRGB(255, 235, 205)},
+    {"blue", myRGB(0, 0, 255)},
+    {"blueviolet", myRGB(138, 43, 226)},
+    {"brown", myRGB(165, 42, 42)},
+    {"burlywood", myRGB(222, 184, 135)},
+    {"cadetblue", myRGB(95, 146, 158)},
+    {"chartreuse", myRGB(127, 255, 0)},
+    {"chocolate", myRGB(210, 105, 30)},
+    {"coral", myRGB(255, 114, 86)},
+    {"cornflowerblue", myRGB(34, 34, 152)},
+    {"cornsilk", myRGB(255, 248, 220)},
+    {"cyan", myRGB(0, 255, 255)},
+    {"darkgoldenrod", myRGB(184, 134, 11)},
+    {"darkgreen", myRGB(0, 86, 45)},
+    {"darkkhaki", myRGB(189, 183, 107)},
+    {"darkolivegreen", myRGB(85, 86, 47)},
+    {"darkorange", myRGB(255, 140, 0)},
+    {"darkorchid", myRGB(139, 32, 139)},
+    {"darksalmon", myRGB(233, 150, 122)},
+    {"darkseagreen", myRGB(143, 188, 143)},
+    {"darkslateblue", myRGB(56, 75, 102)},
+    {"darkslategray", myRGB(47, 79, 79)},
+    {"darkturquoise", myRGB(0, 166, 166)},
+    {"darkviolet", myRGB(148, 0, 211)},
+    {"deeppink", myRGB(255, 20, 147)},
+    {"deepskyblue", myRGB(0, 191, 255)},
+    {"dimgray", myRGB(84, 84, 84)},
+    {"dodgerblue", myRGB(30, 144, 255)},
+    {"firebrick", myRGB(142, 35, 35)},
+    {"floralwhite", myRGB(255, 250, 240)},
+    {"forestgreen", myRGB(80, 159, 105)},
+    {"gainsboro", myRGB(220, 220, 220)},
+    {"ghostwhite", myRGB(248, 248, 255)},
+    {"gold", myRGB(218, 170, 0)},
+    {"goldenrod", myRGB(239, 223, 132)},
+    {"gray", myRGB(126, 126, 126)},
+    {"gray0", myRGB(0, 0, 0)},
+    {"gray1", myRGB(3, 3, 3)},
+    {"gray10", myRGB(26, 26, 26)},
+    {"gray100", myRGB(255, 255, 255)},
+    {"gray11", myRGB(28, 28, 28)},
+    {"gray12", myRGB(31, 31, 31)},
+    {"gray13", myRGB(33, 33, 33)},
+    {"gray14", myRGB(36, 36, 36)},
+    {"gray15", myRGB(38, 38, 38)},
+    {"gray16", myRGB(41, 41, 41)},
+    {"gray17", myRGB(43, 43, 43)},
+    {"gray18", myRGB(46, 46, 46)},
+    {"gray19", myRGB(48, 48, 48)},
+    {"gray2", myRGB(5, 5, 5)},
+    {"gray20", myRGB(51, 51, 51)},
+    {"gray21", myRGB(54, 54, 54)},
+    {"gray22", myRGB(56, 56, 56)},
+    {"gray23", myRGB(59, 59, 59)},
+    {"gray24", myRGB(61, 61, 61)},
+    {"gray25", myRGB(64, 64, 64)},
+    {"gray26", myRGB(66, 66, 66)},
+    {"gray27", myRGB(69, 69, 69)},
+    {"gray28", myRGB(71, 71, 71)},
+    {"gray29", myRGB(74, 74, 74)},
+    {"gray3", myRGB(8, 8, 8)},
+    {"gray30", myRGB(77, 77, 77)},
+    {"gray31", myRGB(79, 79, 79)},
+    {"gray32", myRGB(82, 82, 82)},
+    {"gray33", myRGB(84, 84, 84)},
+    {"gray34", myRGB(87, 87, 87)},
+    {"gray35", myRGB(89, 89, 89)},
+    {"gray36", myRGB(92, 92, 92)},
+    {"gray37", myRGB(94, 94, 94)},
+    {"gray38", myRGB(97, 97, 97)},
+    {"gray39", myRGB(99, 99, 99)},
+    {"gray4", myRGB(10, 10, 10)},
+    {"gray40", myRGB(102, 102, 102)},
+    {"gray41", myRGB(105, 105, 105)},
+    {"gray42", myRGB(107, 107, 107)},
+    {"gray43", myRGB(110, 110, 110)},
+    {"gray44", myRGB(112, 112, 112)},
+    {"gray45", myRGB(115, 115, 115)},
+    {"gray46", myRGB(117, 117, 117)},
+    {"gray47", myRGB(120, 120, 120)},
+    {"gray48", myRGB(122, 122, 122)},
+    {"gray49", myRGB(125, 125, 125)},
+    {"gray5", myRGB(13, 13, 13)},
+    {"gray50", myRGB(127, 127, 127)},
+    {"gray51", myRGB(130, 130, 130)},
+    {"gray52", myRGB(133, 133, 133)},
+    {"gray53", myRGB(135, 135, 135)},
+    {"gray54", myRGB(138, 138, 138)},
+    {"gray55", myRGB(140, 140, 140)},
+    {"gray56", myRGB(143, 143, 143)},
+    {"gray57", myRGB(145, 145, 145)},
+    {"gray58", myRGB(148, 148, 148)},
+    {"gray59", myRGB(150, 150, 150)},
+    {"gray6", myRGB(15, 15, 15)},
+    {"gray60", myRGB(153, 153, 153)},
+    {"gray61", myRGB(156, 156, 156)},
+    {"gray62", myRGB(158, 158, 158)},
+    {"gray63", myRGB(161, 161, 161)},
+    {"gray64", myRGB(163, 163, 163)},
+    {"gray65", myRGB(166, 166, 166)},
+    {"gray66", myRGB(168, 168, 168)},
+    {"gray67", myRGB(171, 171, 171)},
+    {"gray68", myRGB(173, 173, 173)},
+    {"gray69", myRGB(176, 176, 176)},
+    {"gray7", myRGB(18, 18, 18)},
+    {"gray70", myRGB(179, 179, 179)},
+    {"gray71", myRGB(181, 181, 181)},
+    {"gray72", myRGB(184, 184, 184)},
+    {"gray73", myRGB(186, 186, 186)},
+    {"gray74", myRGB(189, 189, 189)},
+    {"gray75", myRGB(191, 191, 191)},
+    {"gray76", myRGB(194, 194, 194)},
+    {"gray77", myRGB(196, 196, 196)},
+    {"gray78", myRGB(199, 199, 199)},
+    {"gray79", myRGB(201, 201, 201)},
+    {"gray8", myRGB(20, 20, 20)},
+    {"gray80", myRGB(204, 204, 204)},
+    {"gray81", myRGB(207, 207, 207)},
+    {"gray82", myRGB(209, 209, 209)},
+    {"gray83", myRGB(212, 212, 212)},
+    {"gray84", myRGB(214, 214, 214)},
+    {"gray85", myRGB(217, 217, 217)},
+    {"gray86", myRGB(219, 219, 219)},
+    {"gray87", myRGB(222, 222, 222)},
+    {"gray88", myRGB(224, 224, 224)},
+    {"gray89", myRGB(227, 227, 227)},
+    {"gray9", myRGB(23, 23, 23)},
+    {"gray90", myRGB(229, 229, 229)},
+    {"gray91", myRGB(232, 232, 232)},
+    {"gray92", myRGB(235, 235, 235)},
+    {"gray93", myRGB(237, 237, 237)},
+    {"gray94", myRGB(240, 240, 240)},
+    {"gray95", myRGB(242, 242, 242)},
+    {"gray96", myRGB(245, 245, 245)},
+    {"gray97", myRGB(247, 247, 247)},
+    {"gray98", myRGB(250, 250, 250)},
+    {"gray99", myRGB(252, 252, 252)},
+    {"green", myRGB(0, 255, 0)},
+    {"greenyellow", myRGB(173, 255, 47)},
+    {"honeydew", myRGB(240, 255, 240)},
+    {"hotpink", myRGB(255, 105, 180)},
+    {"indianred", myRGB(107, 57, 57)},
+    {"ivory", myRGB(255, 255, 240)},
+    {"khaki", myRGB(179, 179, 126)},
+    {"lavender", myRGB(230, 230, 250)},
+    {"lavenderblush", myRGB(255, 240, 245)},
+    {"lawngreen", myRGB(124, 252, 0)},
+    {"lemonchiffon", myRGB(255, 250, 205)},
+    {"lightblue", myRGB(176, 226, 255)},
+    {"lightcoral", myRGB(240, 128, 128)},
+    {"lightcyan", myRGB(224, 255, 255)},
+    {"lightgoldenrod", myRGB(238, 221, 130)},
+    {"lightgoldenrodyellow", myRGB(250, 250, 210)},
+    {"lightgray", myRGB(168, 168, 168)},
+    {"lightpink", myRGB(255, 182, 193)},
+    {"lightsalmon", myRGB(255, 160, 122)},
+    {"lightseagreen", myRGB(32, 178, 170)},
+    {"lightskyblue", myRGB(135, 206, 250)},
+    {"lightslateblue", myRGB(132, 112, 255)},
+    {"lightslategray", myRGB(119, 136, 153)},
+    {"lightsteelblue", myRGB(124, 152, 211)},
+    {"lightyellow", myRGB(255, 255, 224)},
+    {"limegreen", myRGB(0, 175, 20)},
+    {"linen", myRGB(250, 240, 230)},
+    {"magenta", myRGB(255, 0, 255)},
+    {"maroon", myRGB(143, 0, 82)},
+    {"mediumaquamarine", myRGB(0, 147, 143)},
+    {"mediumblue", myRGB(50, 50, 204)},
+    {"mediumforestgreen", myRGB(50, 129, 75)},
+    {"mediumgoldenrod", myRGB(209, 193, 102)},
+    {"mediumorchid", myRGB(189, 82, 189)},
+    {"mediumpurple", myRGB(147, 112, 219)},
+    {"mediumseagreen", myRGB(52, 119, 102)},
+    {"mediumslateblue", myRGB(106, 106, 141)},
+    {"mediumspringgreen", myRGB(35, 142, 35)},
+    {"mediumturquoise", myRGB(0, 210, 210)},
+    {"mediumvioletred", myRGB(213, 32, 121)},
+    {"midnightblue", myRGB(47, 47, 100)},
+    {"mintcream", myRGB(245, 255, 250)},
+    {"mistyrose", myRGB(255, 228, 225)},
+    {"moccasin", myRGB(255, 228, 181)},
+    {"navajowhite", myRGB(255, 222, 173)},
+    {"navy", myRGB(35, 35, 117)},
+    {"navyblue", myRGB(35, 35, 117)},
+    {"oldlace", myRGB(253, 245, 230)},
+    {"olivedrab", myRGB(107, 142, 35)},
+    {"orange", myRGB(255, 135, 0)},
+    {"orangered", myRGB(255, 69, 0)},
+    {"orchid", myRGB(239, 132, 239)},
+    {"palegoldenrod", myRGB(238, 232, 170)},
+    {"palegreen", myRGB(115, 222, 120)},
+    {"paleturquoise", myRGB(175, 238, 238)},
+    {"palevioletred", myRGB(219, 112, 147)},
+    {"papayawhip", myRGB(255, 239, 213)},
+    {"peachpuff", myRGB(255, 218, 185)},
+    {"peru", myRGB(205, 133, 63)},
+    {"pink", myRGB(255, 181, 197)},
+    {"plum", myRGB(197, 72, 155)},
+    {"powderblue", myRGB(176, 224, 230)},
+    {"purple", myRGB(160, 32, 240)},
+    {"red", myRGB(255, 0, 0)},
+    {"rosybrown", myRGB(188, 143, 143)},
+    {"royalblue", myRGB(65, 105, 225)},
+    {"saddlebrown", myRGB(139, 69, 19)},
+    {"salmon", myRGB(233, 150, 122)},
+    {"sandybrown", myRGB(244, 164, 96)},
+    {"seagreen", myRGB(82, 149, 132)},
+    {"seashell", myRGB(255, 245, 238)},
+    {"sienna", myRGB(150, 82, 45)},
+    {"silver", myRGB(192, 192, 192)},
+    {"skyblue", myRGB(114, 159, 255)},
+    {"slateblue", myRGB(126, 136, 171)},
+    {"slategray", myRGB(112, 128, 144)},
+    {"snow", myRGB(255, 250, 250)},
+    {"springgreen", myRGB(65, 172, 65)},
+    {"steelblue", myRGB(84, 112, 170)},
+    {"tan", myRGB(222, 184, 135)},
+    {"thistle", myRGB(216, 191, 216)},
+    {"tomato", myRGB(255, 99, 71)},
+    {"transparent", myRGB(0, 0, 1)},
+    {"turquoise", myRGB(25, 204, 223)},
+    {"violet", myRGB(156, 62, 206)},
+    {"violetred", myRGB(243, 62, 150)},
+    {"wheat", myRGB(245, 222, 179)},
+    {"white", myRGB(255, 255, 255)},
+    {"whitesmoke", myRGB(245, 245, 245)},
+    {"yellow", myRGB(255, 255, 0)},
+    {"yellowgreen", myRGB(50, 216, 56)},
+    {NULL, myRGB(0, 0, 0)}
+};
+static int numTheRGBRecords = 235;
+
+static unsigned char ParseHexadecimal(char digit1, char digit2)
+{
+    unsigned char i1, i2;
+
+    if (digit1 >= 'a')
+        i1 = (unsigned char)(digit1 - 'a' + 0x0A);
+    else if (digit1 >= 'A')
+        i1 = (unsigned char)(digit1 - 'A' + 0x0A);
+    else
+        i1 = (unsigned char)(digit1 - '0');
+    if (digit2 >= 'a')
+        i2 = (unsigned char)(digit2 - 'a' + 0x0A);
+    else if (digit2 >= 'A')
+        i2 = (unsigned char)(digit2 - 'A' + 0x0A);
+    else
+        i2 = (unsigned char)(digit2 - '0');
+    return (unsigned char)(0x10 * i1 + i2);
+}
+
+static bool GetRGBFromName(const char *inname, bool *isNone,
+                           unsigned char *r, unsigned char*g, unsigned char *b)
+{
+    int left, right, middle;
+    int cmp;
+    wxUint32 rgbVal;
+    char *name;
+    char *grey, *p;
+
+    // Neither #rrggbb nor #rrrrggggbbbb are in database, we parse them directly
+    size_t inname_len = strlen(inname);
+    if ( *inname == '#' && (inname_len == 7 || inname_len == 13))
+    {
+        size_t ofs = (inname_len == 7) ? 2 : 4;
+        *r = ParseHexadecimal(inname[1], inname[2]);
+        *g = ParseHexadecimal(inname[1*ofs+1], inname[1*ofs+2]);
+        *b = ParseHexadecimal(inname[2*ofs+1], inname[2*ofs+2]);
+        *isNone = false;
+        return true;
+    }
+
+    name = wxStrdupA(inname);
+
+    // theRGBRecords[] has no names with spaces, and no grey, but a
+    // lot of gray...
+
+    // so first extract ' '
+    while ((p = strchr(name, ' ')) != NULL)
+    {
+        while (*(p))            // till eof of string
+        {
+            *p = *(p + 1);      // copy to the left
+            p++;
+        }
+    }
+    // fold to lower case
+    p = name;
+    while (*p)
+    {
+        *p = (char)tolower(*p);
+        p++;
+    }
+
+    // substitute Grey with Gray, else rgbtab.h would have more than 100
+    // 'duplicate' entries
+    if ( (grey = strstr(name, "grey")) != NULL )
+        grey[2] = 'a';
+
+    // check for special 'none' colour:
+    bool found;
+    if ( strcmp(name, "none") == 0 )
+    {
+        *isNone = true;
+        found = true;
+    }
+    else // not "None"
+    {
+        found = false;
+
+        // binary search:
+        left = 0;
+        right = numTheRGBRecords - 1;
+        do
+        {
+            middle = (left + right) / 2;
+            cmp = strcmp(name, theRGBRecords[middle].name);
+            if ( cmp == 0 )
+            {
+                rgbVal = theRGBRecords[middle].rgb;
+                *r = (unsigned char)((rgbVal >> 16) & 0xFF);
+                *g = (unsigned char)((rgbVal >> 8) & 0xFF);
+                *b = (unsigned char)((rgbVal) & 0xFF);
+                *isNone = false;
+                found = true;
+                break;
+            }
+            else if ( cmp < 0 )
+            {
+                right = middle - 1;
+            }
+            else // cmp > 0
+            {
+                left = middle + 1;
+            }
+        } while (left <= right);
+    }
+
+    free(name);
+
+    return found;
+}
+
+static const char *ParseColor(const char *data)
+{
+    static const char *targets[] =
+                        {"c ", "g ", "g4 ", "m ", "b ", "s ", NULL};
+
+    const char *p, *r;
+    const char *q;
+    int i;
+
+    for (i = 0; targets[i] != NULL; i++)
+    {
+        r = data;
+        for (q = targets[i]; *r != '\0'; r++)
+        {
+            if ( *r != *q )
+                continue;
+            if ( !isspace((int) (*(r - 1))) )
+                continue;
+            p = r;
+            for (;;)
+            {
+                if ( *q == '\0' )
+                    return p;
+                if ( *p++ != *q++ )
+                    break;
+            }
+            q = targets[i];
+        }
+    }
+    return NULL;
+}
+
+struct wxXPMColourMapData
+{
+    wxXPMColourMapData() { R = G = B = 0; }
+    unsigned char R,G,B;
+};
+WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap);
+
+wxImage wxXPMDecoder::ReadData(const char* const* xpm_data)
+{
+    wxCHECK_MSG(xpm_data, wxNullImage, wxT("NULL XPM data") );
+
+    wxImage img;
+    int count;
+    unsigned width, height, colors_cnt, chars_per_pixel;
+    size_t i, j, i_key;
+    wxChar key[64];
+    const char *clr_def;
+    bool hasMask;
+    wxXPMColourMap clr_tbl;
+    wxXPMColourMap::iterator it;
+    wxString maskKey;
+
+    /*
+     *  Read hints and initialize structures:
+     */
+
+    count = sscanf(xpm_data[0], "%u %u %u %u",
+                   &width, &height, &colors_cnt, &chars_per_pixel);
+    if ( count != 4 || width * height * colors_cnt == 0 )
+    {
+        wxLogError(_("XPM: incorrect header format!"));
+        return wxNullImage;
+    }
+
+    // VS: XPM color map this large would be insane, since XPMs are encoded with
+    //     92 possible values on each position, 92^64 is *way* larger space than
+    //     8bit RGB...
+    wxCHECK_MSG(chars_per_pixel < 64, wxNullImage, wxT("XPM colormaps this large not supported."));
+
+    if ( !img.Create(width, height) )
+        return wxNullImage;
+
+    img.SetMask(false);
+    key[chars_per_pixel] = wxT('\0');
+    hasMask = false;
+
+    /*
+     *  Create colour map:
+     */
+    wxXPMColourMapData clr_data;
+    for (i = 0; i < colors_cnt; i++)
+    {
+        const char *xmpColLine = xpm_data[1 + i];
+
+        // we must have at least " x y" after the colour index, hence +5
+        if ( !xmpColLine || strlen(xmpColLine) < chars_per_pixel + 5 )
+        {
+            wxLogError(_("XPM: incorrect colour description in line %d"),
+                       (int)(1 + i));
+            return wxNullImage;
+        }
+
+        for (i_key = 0; i_key < chars_per_pixel; i_key++)
+            key[i_key] = (wxChar)xmpColLine[i_key];
+        clr_def = ParseColor(xmpColLine + chars_per_pixel);
+
+        if ( clr_def == NULL )
+        {
+            wxLogError(_("XPM: malformed colour definition '%s' at line %d!"),
+                       xmpColLine, (int)(1 + i));
+            return wxNullImage;
+        }
+
+        bool isNone = false;
+        if ( !GetRGBFromName(clr_def, &isNone,
+                             &clr_data.R, &clr_data.G, &clr_data.B) )
+        {
+            wxLogError(_("XPM: malformed colour definition '%s' at line %d!"),
+                       xmpColLine, (int)(1 + i));
+            return wxNullImage;
+        }
+
+        if ( isNone )
+        {
+            img.SetMask(true);
+            img.SetMaskColour(255, 0, 255);
+            clr_data.R =
+            clr_data.B = 255;
+            clr_data.G = 0;
+            hasMask = true;
+            maskKey = key;
+        }
+
+        clr_tbl[key] = clr_data;
+    }
+
+    /*
+     *  Modify colour entries with RGB = (255,0,255) to (255,0,254) if
+     *  mask colour is present (so that existing pixels with (255,0,255)
+     *  magenta colour are not incorrectly made transparent):
+     */
+    if (hasMask)
+    {
+        for (it = clr_tbl.begin(); it != clr_tbl.end(); ++it)
+        {
+            if (it->second.R == 255 && it->second.G == 0 &&
+                it->second.B == 255 &&
+                it->first != maskKey)
+            {
+                it->second.B = 254;
+            }
+        }
+    }
+
+    /*
+     *  Parse image data:
+     */
+
+    unsigned char *img_data = img.GetData();
+    wxXPMColourMap::iterator entry;
+    wxXPMColourMap::iterator end = clr_tbl.end();
+
+    for (j = 0; j < height; j++)
+    {
+        for (i = 0; i < width; i++, img_data += 3)
+        {
+            const char *xpmImgLine = xpm_data[1 + colors_cnt + j];
+            if ( !xpmImgLine || strlen(xpmImgLine) < width*chars_per_pixel )
+            {
+                wxLogError(_("XPM: truncated image data at line %d!"),
+                           (int)(1 + colors_cnt + j));
+                return wxNullImage;
+            }
+
+            for (i_key = 0; i_key < chars_per_pixel; i_key++)
+            {
+                key[i_key] = (wxChar)xpmImgLine[chars_per_pixel * i + i_key];
+            }
+
+            entry = clr_tbl.find(key);
+            if ( entry == end )
+            {
+                wxLogError(_("XPM: Malformed pixel data!"));
+
+                // better return right now as otherwise we risk to flood the
+                // user with error messages as something seems to be seriously
+                // wrong with the file and so we could give this message for
+                // each remaining pixel if we don't bail out
+                return wxNullImage;
+            }
+            else
+            {
+                img_data[0] = entry->second.R;
+                img_data[1] = entry->second.G;
+                img_data[2] = entry->second.B;
+            }
+        }
+    }
+
+#if wxUSE_PALETTE
+    unsigned char* r = new unsigned char[colors_cnt];
+    unsigned char* g = new unsigned char[colors_cnt];
+    unsigned char* b = new unsigned char[colors_cnt];
+
+    for (it = clr_tbl.begin(), i = 0; it != clr_tbl.end(); it++, i++)
+    {
+        r[i] = it->second.R;
+        g[i] = it->second.G;
+        b[i] = it->second.B;
+    }
+    wxASSERT(i == colors_cnt);
+    img.SetPalette(wxPalette(colors_cnt, r, g, b));
+    delete[] r;
+    delete[] g;
+    delete[] b;
+#endif // wxUSE_PALETTE
+
+    return img;
+}
+
+#endif // wxUSE_IMAGE && wxUSE_XPM
diff --git a/Source/3rd Party/wx/src/common/xti.cpp b/Source/3rd Party/wx/src/common/xti.cpp
index f19ee16af..9542896f7 100644
--- a/Source/3rd Party/wx/src/common/xti.cpp	
+++ b/Source/3rd Party/wx/src/common/xti.cpp	
@@ -1,972 +1,767 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/xti.cpp
-// Purpose:     runtime metadata information (extended class info)
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     27/07/03
-// RCS-ID:      $Id$
-// Copyright:   (c) 1997 Julian Smart
-//              (c) 2003 Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_EXTENDED_RTTI
-
-#ifndef WX_PRECOMP
-    #include "wx/object.h"
-    #include "wx/list.h"
-    #include "wx/hash.h"
-#endif
-
-#include "wx/xti.h"
-#include "wx/xml/xml.h"
-#include "wx/tokenzr.h"
-#include "wx/range.h"
-
-#include <string.h>
-
-#include "wx/beforestd.h"
-#include <map>
-#include <string>
-#include <list>
-#include "wx/afterstd.h"
-
-using namespace std;
-
-// ----------------------------------------------------------------------------
-// wxEnumData
-// ----------------------------------------------------------------------------
-
-wxEnumData::wxEnumData( wxEnumMemberData* data )
-{
-    m_members = data;
-    for ( m_count = 0; m_members[m_count].m_name; m_count++)
-    {};
-}
-
-bool wxEnumData::HasEnumMemberValue(const wxChar *name, int *value) const
-{
-    int i;
-    for (i = 0; m_members[i].m_name; i++ )
-    {
-        if (!wxStrcmp(name, m_members[i].m_name))
-        {
-            if ( value )
-                *value = m_members[i].m_value;
-            return true;
-        }
-    }
-    return false;
-}
-
-int wxEnumData::GetEnumMemberValue(const wxChar *name) const
-{
-    int i;
-    for (i = 0; m_members[i].m_name; i++ )
-    {
-        if (!wxStrcmp(name, m_members[i].m_name))
-        {
-            return m_members[i].m_value;
-        }
-    }
-    return 0;
-}
-
-const wxChar *wxEnumData::GetEnumMemberName(int value) const
-{
-    int i;
-    for (i = 0; m_members[i].m_name; i++)
-        if (value == m_members[i].m_value)
-            return m_members[i].m_name;
-
-    return wxEmptyString;
-}
-
-int wxEnumData::GetEnumMemberValueByIndex( int idx ) const
-{
-    // we should cache the count in order to avoid out-of-bounds errors
-    return m_members[idx].m_value;
-}
-
-const wxChar * wxEnumData::GetEnumMemberNameByIndex( int idx ) const
-{
-    // we should cache the count in order to avoid out-of-bounds errors
-    return m_members[idx].m_name;
-}
-
-// ----------------------------------------------------------------------------
-// Type Information
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// value streaming
-// ----------------------------------------------------------------------------
-
-// streamer specializations
-// for all built-in types
-
-// bool
-
-template<> void wxStringReadValue(const wxString &s, bool &data )
-{
-    int intdata;
-    wxSscanf(s, wxT("%d"), &intdata );
-    data = (bool)(intdata != 0);
-}
-
-template<> void wxStringWriteValue(wxString &s, const bool &data )
-{
-    s = wxString::Format(wxT("%d"), data );
-}
-
-// char
-
-template<> void wxStringReadValue(const wxString &s, char &data )
-{
-    int intdata;
-    wxSscanf(s, wxT("%d"), &intdata );
-    data = char(intdata);
-}
-
-template<> void wxStringWriteValue(wxString &s, const char &data )
-{
-    s = wxString::Format(wxT("%d"), data );
-}
-
-// unsigned char
-
-template<> void wxStringReadValue(const wxString &s, unsigned char &data )
-{
-    int intdata;
-    wxSscanf(s, wxT("%d"), &intdata );
-    data = (unsigned char)(intdata);
-}
-
-template<> void wxStringWriteValue(wxString &s, const unsigned char &data )
-{
-    s = wxString::Format(wxT("%d"), data );
-}
-
-// int
-
-template<> void wxStringReadValue(const wxString &s, int &data )
-{
-    wxSscanf(s, wxT("%d"), &data );
-}
-
-template<> void wxStringWriteValue(wxString &s, const int &data )
-{
-    s = wxString::Format(wxT("%d"), data );
-}
-
-// unsigned int
-
-template<> void wxStringReadValue(const wxString &s, unsigned int &data )
-{
-    wxSscanf(s, wxT("%d"), &data );
-}
-
-template<> void wxStringWriteValue(wxString &s, const unsigned int &data )
-{
-    s = wxString::Format(wxT("%d"), data );
-}
-
-// long
-
-template<> void wxStringReadValue(const wxString &s, long &data )
-{
-    wxSscanf(s, wxT("%ld"), &data );
-}
-
-template<> void wxStringWriteValue(wxString &s, const long &data )
-{
-    s = wxString::Format(wxT("%ld"), data );
-}
-
-// unsigned long
-
-template<> void wxStringReadValue(const wxString &s, unsigned long &data )
-{
-    wxSscanf(s, wxT("%ld"), &data );
-}
-
-template<> void wxStringWriteValue(wxString &s, const unsigned long &data )
-{
-    s = wxString::Format(wxT("%ld"), data );
-}
-
-#ifdef wxLongLong_t
-template<> void wxStringReadValue(const wxString &s, wxLongLong_t &data )
-{
-    wxSscanf(s, wxT("%lld"), &data );
-}
-
-template<> void wxStringWriteValue(wxString &s, const wxLongLong_t &data )
-{
-    s = wxString::Format(wxT("%lld"), data );
-}
-
-template<> void wxStringReadValue(const wxString &s, wxULongLong_t &data )
-{
-    wxSscanf(s, wxT("%lld"), &data );
-}
-
-template<> void wxStringWriteValue(wxString &s, const wxULongLong_t &data )
-{
-    s = wxString::Format(wxT("%lld"), data );
-}
-#endif
-// float
-
-template<> void wxStringReadValue(const wxString &s, float &data )
-{
-    wxSscanf(s, wxT("%f"), &data );
-}
-
-template<> void wxStringWriteValue(wxString &s, const float &data )
-{
-    s = wxString::Format(wxT("%f"), data );
-}
-
-// double
-
-template<> void wxStringReadValue(const wxString &s, double &data )
-{
-    wxSscanf(s, wxT("%lf"), &data );
-}
-
-template<> void wxStringWriteValue(wxString &s, const double &data )
-{
-    s = wxString::Format(wxT("%lf"), data );
-}
-
-// wxString
-
-template<> void wxStringReadValue(const wxString &s, wxString &data )
-{
-    data = s;
-}
-
-template<> void wxStringWriteValue(wxString &s, const wxString &data )
-{
-    s = data;
-}
-
-
-// built-ins
-//
-
-#if wxUSE_FUNC_TEMPLATE_POINTER
-    #define wxBUILTIN_TYPE_INFO( element, type )                                    \
-        wxBuiltInTypeInfo                                                           \
-            s_typeInfo##type(element, &wxToStringConverter<type>,                   \
-                             &wxFromStringConverter<type>, typeid(type).name());
-#else
-    #define wxBUILTIN_TYPE_INFO( element, type )                                    \
-        void _toString##element( const wxAny& data, wxString &result )         \
-            { wxToStringConverter<type, data, result); }                            \
-        void _fromString##element( const wxString& data, wxAny &result )       \
-            { wxFromStringConverter<type, data, result); }                          \
-        wxBuiltInTypeInfo s_typeInfo##type(element, &_toString##element,            \
-                                           &_fromString##element, typeid(type).name());
-#endif
-
-typedef unsigned char unsigned_char;
-typedef unsigned int unsigned_int;
-typedef unsigned long unsigned_long;
-
-wxBuiltInTypeInfo s_typeInfovoid( wxT_VOID, NULL, NULL, typeid(void).name());
-wxBUILTIN_TYPE_INFO( wxT_BOOL,  bool);
-wxBUILTIN_TYPE_INFO( wxT_CHAR,  char);
-wxBUILTIN_TYPE_INFO( wxT_UCHAR, unsigned_char);
-wxBUILTIN_TYPE_INFO( wxT_INT, int);
-wxBUILTIN_TYPE_INFO( wxT_UINT, unsigned_int);
-wxBUILTIN_TYPE_INFO( wxT_LONG, long);
-wxBUILTIN_TYPE_INFO( wxT_ULONG, unsigned_long);
-wxBUILTIN_TYPE_INFO( wxT_FLOAT, float);
-wxBUILTIN_TYPE_INFO( wxT_DOUBLE, double);
-wxBUILTIN_TYPE_INFO( wxT_STRING, wxString);
-
-#ifdef wxLongLong_t
-wxBUILTIN_TYPE_INFO(wxT_LONGLONG, wxLongLong_t)
-wxBUILTIN_TYPE_INFO(wxT_ULONGLONG, wxULongLong_t)
-#endif
-
-// this are compiler induced specialization which are never used anywhere
-
-wxILLEGAL_TYPE_SPECIALIZATION( char const * )
-wxILLEGAL_TYPE_SPECIALIZATION( char * )
-wxILLEGAL_TYPE_SPECIALIZATION( unsigned char * )
-wxILLEGAL_TYPE_SPECIALIZATION( int * )
-wxILLEGAL_TYPE_SPECIALIZATION( bool * )
-wxILLEGAL_TYPE_SPECIALIZATION( long * )
-wxILLEGAL_TYPE_SPECIALIZATION( wxString * )
-
-// wxRange
-
-template<> void wxStringReadValue(const wxString &s , wxRange &data)
-{
-    int minValue, maxValue;
-    wxSscanf(s, wxT("%d,%d"), &minValue , &maxValue);
-    data = wxRange(minValue, maxValue);
-}
-
-template<> void wxStringWriteValue(wxString &s , const wxRange &data)
-{
-    s = wxString::Format(wxT("%d,%d"), data.GetMin() , data.GetMax());
-}
-
-wxCUSTOM_TYPE_INFO(wxRange, wxToStringConverter<wxRange> , wxFromStringConverter<wxRange>)
-
-// other types
-
-wxCOLLECTION_TYPE_INFO( wxString, wxArrayString );
-
-template<> void wxCollectionToVariantArray( wxArrayString const &theArray, 
-                                            wxAnyList &value)
-{
-    wxArrayCollectionToVariantArray( theArray, value );
-}
-
-wxTypeInfoMap *wxTypeInfo::ms_typeTable = NULL;
-
-wxTypeInfo *wxTypeInfo::FindType(const wxString& typeName)
-{
-    wxTypeInfoMap::iterator iter = ms_typeTable->find(typeName);
-
-    if (iter == ms_typeTable->end())
-        return NULL;
-
-    return (wxTypeInfo *)iter->second;
-}
-
-wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind, wxClassInfo* classInfo, 
-                                  wxVariant2StringFnc to, 
-                                  wxString2VariantFnc from, 
-                                  const wxString &name) :
-    wxTypeInfo( kind, to, from, name)
-{ 
-    wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT, 
-                  wxT("Illegal Kind for Enum Type")); m_classInfo = classInfo;
-}
-
-wxEventSourceTypeInfo::wxEventSourceTypeInfo( int eventType, wxClassInfo* eventClass, 
-                                        wxVariant2StringFnc to, 
-                                        wxString2VariantFnc from ) :
-    wxTypeInfo ( wxT_DELEGATE, to, from, wxEmptyString )
-{ 
-    m_eventClass = eventClass; 
-    m_eventType = eventType; 
-    m_lastEventType = -1;
-}
-
-wxEventSourceTypeInfo::wxEventSourceTypeInfo( int eventType, int lastEventType, 
-                                        wxClassInfo* eventClass, 
-                                        wxVariant2StringFnc to,
-                                        wxString2VariantFnc from ) :
-    wxTypeInfo ( wxT_DELEGATE, to, from, wxEmptyString )
-{ 
-    m_eventClass = eventClass; 
-    m_eventType = eventType; 
-    m_lastEventType = lastEventType; 
-}
-
-void wxTypeInfo::Register()
-{
-    if ( ms_typeTable == NULL )
-        ms_typeTable = new wxTypeInfoMap();
-
-    if( !m_name.empty() )
-        (*ms_typeTable)[m_name] = this;
-}
-
-void wxTypeInfo::Unregister()
-{
-    if( !m_name.empty() )
-        ms_typeTable->erase(m_name);
-}
-
-// removing header dependency on string tokenizer
-
-void wxSetStringToArray( const wxString &s, wxArrayString &array )
-{
-    wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK);
-    wxString flag;
-    array.Clear();
-    while (tokenizer.HasMoreTokens())
-    {
-        array.Add(tokenizer.GetNextToken());
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxPropertyInfo
-// ----------------------------------------------------------------------------
-
-void wxPropertyInfo::Insert(wxPropertyInfo* &iter)
-{
-    m_next = NULL;
-    if ( iter == NULL )
-        iter = this;
-    else
-    {
-        wxPropertyInfo* i = iter;
-        while( i->m_next )
-            i = i->m_next;
-
-        i->m_next = this;
-    }
-}
-
-void wxPropertyInfo::Remove()
-{
-    if ( this == m_itsClass->m_firstProperty )
-    {
-        m_itsClass->m_firstProperty = m_next;
-    }
-    else
-    {
-        wxPropertyInfo *info = m_itsClass->m_firstProperty;
-        while (info)
-        {
-            if ( info->m_next == this )
-            {
-                info->m_next = m_next;
-                break;
-            }
-
-            info = info->m_next;
-        }
-    }
-
-}
-
-// ----------------------------------------------------------------------------
-// wxHandlerInfo
-// ----------------------------------------------------------------------------
-
-void wxHandlerInfo::Insert(wxHandlerInfo* &iter)
-{
-    m_next = NULL;
-    if ( iter == NULL )
-        iter = this;
-    else
-    {
-        wxHandlerInfo* i = iter;
-        while( i->m_next )
-            i = i->m_next;
-
-        i->m_next = this;
-    }
-}
-
-void wxHandlerInfo::Remove()
-{
-    if ( this == m_itsClass->m_firstHandler )
-    {
-        m_itsClass->m_firstHandler = m_next;
-    }
-    else
-    {
-        wxHandlerInfo *info = m_itsClass->m_firstHandler;
-        while (info)
-        {
-            if ( info->m_next == this )
-            {
-                info->m_next = m_next;
-                break;
-            }
-
-            info = info->m_next;
-        }
-    }
-}
-
-
-// ----------------------------------------------------------------------------
-// wxClassInfo
-// ----------------------------------------------------------------------------
-
-bool wxClassInfo::Create(wxObject *object, int ParamCount, wxAny *Params) const
-{
-    if ( ParamCount != m_constructorPropertiesCount )
-    {
-        // FIXME: shouldn't we just return false and let the caller handle it?
-        wxLogError( _("Illegal Parameter Count for Create Method") );
-        return false;
-    }
-
-    return m_constructor->Create( object, Params );
-}
-
-wxObject *wxClassInfo::ConstructObject(int ParamCount, wxAny *Params) const
-{
-    if ( ParamCount != m_constructorPropertiesCount )
-    {
-        // FIXME: shouldn't we just return NULL and let the caller handle this case?
-        wxLogError( _("Illegal Parameter Count for ConstructObject Method") );
-        return NULL;
-    }
-
-    wxObject *object = NULL;
-    if (!m_constructor->Create( object, Params ))
-        return NULL;
-    return object;
-}
-
-bool wxClassInfo::IsKindOf(const wxClassInfo *info) const
-{
-    if ( info != 0 )
-    {
-        if ( info == this )
-            return true;
-
-        for ( int i = 0; m_parents[i]; ++ i )
-        {
-            if ( m_parents[i]->IsKindOf( info ) )
-                return true;
-        }
-    }
-    return false;
-}
-
-const wxPropertyAccessor *wxClassInfo::FindAccessor(const wxChar *PropertyName) const
-{
-    const wxPropertyInfo* info = FindPropertyInfo( PropertyName );
-
-    if ( info )
-        return info->GetAccessor();
-
-    return NULL;
-}
-
-wxPropertyInfo *wxClassInfo::FindPropertyInfoInThisClass (const wxChar *PropertyName) const
-{
-    wxPropertyInfo* info = GetFirstProperty();
-
-    while( info )
-    {
-        if ( wxStrcmp( info->GetName(), PropertyName ) == 0 )
-            return info;
-        info = info->GetNext();
-    }
-
-    return 0;
-}
-
-const wxPropertyInfo *wxClassInfo::FindPropertyInfo (const wxChar *PropertyName) const
-{
-    const wxPropertyInfo* info = FindPropertyInfoInThisClass( PropertyName );
-    if ( info )
-        return info;
-
-    const wxClassInfo** parents = GetParents();
-    for ( int i = 0; parents[i]; ++ i )
-    {
-        if ( ( info = parents[i]->FindPropertyInfo( PropertyName ) ) != NULL )
-            return info;
-    }
-
-    return 0;
-}
-
-wxHandlerInfo *wxClassInfo::FindHandlerInfoInThisClass (const wxChar *PropertyName) const
-{
-    wxHandlerInfo* info = GetFirstHandler();
-
-    while( info )
-    {
-        if ( wxStrcmp( info->GetName(), PropertyName ) == 0 )
-            return info;
-        info = info->GetNext();
-    }
-
-    return 0;
-}
-
-const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const wxChar *PropertyName) const
-{
-    const wxHandlerInfo* info = FindHandlerInfoInThisClass( PropertyName );
-
-    if ( info )
-        return info;
-
-    const wxClassInfo** parents = GetParents();
-    for ( int i = 0; parents[i]; ++ i )
-    {
-        if ( ( info = parents[i]->FindHandlerInfo( PropertyName ) ) != NULL )
-            return info;
-    }
-
-    return 0;
-}
-
-wxObjectStreamingCallback wxClassInfo::GetStreamingCallback() const
-{
-    if ( m_streamingCallback )
-        return m_streamingCallback;
-
-    wxObjectStreamingCallback retval = NULL;
-    const wxClassInfo** parents = GetParents();
-    for ( int i = 0; parents[i] && retval == NULL; ++ i )
-    {
-        retval = parents[i]->GetStreamingCallback();
-    }
-    return retval;
-}
-
-bool wxClassInfo::BeforeWriteObject( const wxObject *obj, wxObjectWriter *streamer, 
-                                     wxObjectWriterCallback *writercallback, const wxStringToAnyHashMap &metadata) const
-{
-    wxObjectStreamingCallback sb = GetStreamingCallback();
-    if ( sb )
-        return (*sb)(obj, streamer, writercallback, metadata );
-
-    return true;
-}
-
-void wxClassInfo::SetProperty(wxObject *object, const wxChar *propertyName, 
-                              const wxAny &value) const
-{
-    const wxPropertyAccessor *accessor;
-
-    accessor = FindAccessor(propertyName);
-    wxASSERT(accessor->HasSetter());
-    accessor->SetProperty( object, value );
-}
-
-wxAny wxClassInfo::GetProperty(wxObject *object, const wxChar *propertyName) const
-{
-    const wxPropertyAccessor *accessor;
-
-    accessor = FindAccessor(propertyName);
-    wxASSERT(accessor->HasGetter());
-    wxAny result;
-    accessor->GetProperty(object,result);
-    return result;
-}
-
-wxAnyList wxClassInfo::GetPropertyCollection(wxObject *object, 
-                                                   const wxChar *propertyName) const
-{
-    const wxPropertyAccessor *accessor;
-
-    accessor = FindAccessor(propertyName);
-    wxASSERT(accessor->HasGetter());
-    wxAnyList result;
-    accessor->GetPropertyCollection(object,result);
-    return result;
-}
-
-void wxClassInfo::AddToPropertyCollection(wxObject *object, const wxChar *propertyName, 
-                                          const wxAny& value) const
-{
-    const wxPropertyAccessor *accessor;
-
-    accessor = FindAccessor(propertyName);
-    wxASSERT(accessor->HasAdder());
-    accessor->AddToPropertyCollection( object, value );
-}
-
-// void wxClassInfo::GetProperties( wxPropertyInfoMap &map ) const
-// The map parameter (the name map that is) seems something special
-// to MSVC and so we use a other name.
-void wxClassInfo::GetProperties( wxPropertyInfoMap &infomap ) const
-{
-    const wxPropertyInfo *pi = GetFirstProperty();
-    while( pi )
-    {
-        if ( infomap.find( pi->GetName() ) == infomap.end() )
-            infomap[pi->GetName()] = (wxPropertyInfo*) pi;
-
-        pi = pi->GetNext();
-    }
-
-    const wxClassInfo** parents = GetParents();
-    for ( int i = 0; parents[i]; ++ i )
-    {
-        parents[i]->GetProperties( infomap );
-    }
-}
-
-wxObject* wxClassInfo::AnyToObjectPtr( const wxAny &data) const
-{
-    return m_variantOfPtrToObjectConverter(data);
-}
-
-void wxClassInfo::CallOnAny( const wxAny &data, wxObjectFunctor* functor ) const
-{
-    if ( data.GetTypeInfo()->GetKind() == wxT_OBJECT )
-        return m_variantToObjectConverter(data, functor);
-    else
-        return (*functor)(m_variantOfPtrToObjectConverter(data));
-}
-
-wxAny wxClassInfo::ObjectPtrToAny( wxObject* obj) const
-{
-    return m_objectToVariantConverter(obj);
-}
-
-bool wxClassInfo::NeedsDirectConstruction() const 
-{ 
-    return wx_dynamic_cast(wxObjectAllocator*, m_constructor) != NULL; 
-}
-
-// ----------------------------------------------------------------------------
-// wxDynamicObject support
-// ----------------------------------------------------------------------------
-
-// Dynamic Objects are objects that have a real superclass instance and carry their
-// own attributes in a hash map. Like this it is possible to create the objects and
-// stream them, as if their class information was already available from compiled data
-
-struct wxDynamicObject::wxDynamicObjectInternal
-{
-    wxDynamicObjectInternal() {}
-
-    wxStringToAnyHashMap m_properties;
-};
-
-typedef list< wxDynamicObject* > wxDynamicObjectList;
-
-struct wxDynamicClassInfo::wxDynamicClassInfoInternal
-{
-    wxDynamicObjectList m_dynamicObjects;
-};
-
-// instantiates this object with an instance of its superclass
-wxDynamicObject::wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info)
-{
-    m_superClassInstance = superClassInstance;
-    m_classInfo = info;
-    m_data = new wxDynamicObjectInternal;
-}
-
-wxDynamicObject::~wxDynamicObject()
-{
-    wx_dynamic_cast(const wxDynamicClassInfo*, m_classInfo)->
-        m_data->m_dynamicObjects.remove( this );
-    delete m_data;
-    delete m_superClassInstance;
-}
-
-void wxDynamicObject::SetProperty (const wxChar *propertyName, const wxAny &value)
-{
-    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),
-                 wxT("Accessing Unknown Property in a Dynamic Object") );
-    m_data->m_properties[propertyName] = value;
-}
-
-wxAny wxDynamicObject::GetProperty (const wxChar *propertyName) const
-{
-    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),
-                 wxT("Accessing Unknown Property in a Dynamic Object") );
-    return m_data->m_properties[propertyName];
-}
-
-void wxDynamicObject::RemoveProperty( const wxChar *propertyName )
-{
-    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),
-                 wxT("Removing Unknown Property in a Dynamic Object") );
-    m_data->m_properties.erase( propertyName );
-}
-
-void wxDynamicObject::RenameProperty( const wxChar *oldPropertyName, 
-                                      const wxChar *newPropertyName )
-{
-    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(oldPropertyName),
-                 wxT("Renaming Unknown Property in a Dynamic Object") );
-
-    wxAny value = m_data->m_properties[oldPropertyName];
-    m_data->m_properties.erase( oldPropertyName );
-    m_data->m_properties[newPropertyName] = value;
-}
-
-
-// ----------------------------------------------------------------------------
-// wxDynamicClassInfo
-// ----------------------------------------------------------------------------
-
-wxDynamicClassInfo::wxDynamicClassInfo( const wxChar *unitName, 
-                                        const wxChar *className, 
-                                        const wxClassInfo* superClass ) :
-    wxClassInfo( unitName, className, new const wxClassInfo*[2])
-{
-    GetParents()[0] = superClass;
-    GetParents()[1] = NULL;
-    m_data = new wxDynamicClassInfoInternal;
-}
-
-wxDynamicClassInfo::~wxDynamicClassInfo()
-{
-    delete[] GetParents();
-    delete m_data;
-}
-
-wxObject *wxDynamicClassInfo::AllocateObject() const
-{
-    wxObject* parent = GetParents()[0]->AllocateObject();
-    wxDynamicObject *obj = new wxDynamicObject( parent, this );
-    m_data->m_dynamicObjects.push_back( obj );
-    return obj;
-}
-
-bool wxDynamicClassInfo::Create (wxObject *object, int paramCount, wxAny *params) const
-{
-    wxDynamicObject *dynobj = wx_dynamic_cast( wxDynamicObject *,  object );
-    wxASSERT_MSG( dynobj, 
-        wxT("cannot call wxDynamicClassInfo::Create on ")
-        wxT("an object other than wxDynamicObject") );
-
-    return GetParents()[0]->Create( dynobj->GetSuperClassInstance(), paramCount, params );
-}
-
-// get number of parameters for constructor
-int wxDynamicClassInfo::GetCreateParamCount() const
-{
-    return GetParents()[0]->GetCreateParamCount();
-}
-
-// get i-th constructor parameter
-const wxChar* wxDynamicClassInfo::GetCreateParamName(int i) const
-{
-    return GetParents()[0]->GetCreateParamName( i );
-}
-
-void wxDynamicClassInfo::SetProperty(wxObject *object, const wxChar *propertyName, const wxAny &value) const
-{
-    wxDynamicObject* dynobj = wx_dynamic_cast(wxDynamicObject*, object);
-    wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") );
-    if ( FindPropertyInfoInThisClass(propertyName) )
-        dynobj->SetProperty( propertyName, value );
-    else
-        GetParents()[0]->SetProperty( dynobj->GetSuperClassInstance(), propertyName, value );
-}
-
-wxAny wxDynamicClassInfo::GetProperty(wxObject *object, const wxChar *propertyName) const
-{
-    wxDynamicObject* dynobj = wx_dynamic_cast(wxDynamicObject*, object);
-    wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") );
-    if ( FindPropertyInfoInThisClass(propertyName) )
-        return dynobj->GetProperty( propertyName );
-    else
-        return GetParents()[0]->GetProperty( dynobj->GetSuperClassInstance(), propertyName );
-}
-
-void wxDynamicClassInfo::AddProperty( const wxChar *propertyName, const wxTypeInfo* typeInfo )
-{
-    EnsureInfosInited();
-    new wxPropertyInfo( m_firstProperty, this, propertyName, typeInfo->GetTypeName(), new wxGenericPropertyAccessor( propertyName ), wxAny() );
-}
-
-void wxDynamicClassInfo::AddHandler( const wxChar *handlerName, wxObjectEventFunction address, const wxClassInfo* eventClassInfo )
-{
-    EnsureInfosInited();
-    new wxHandlerInfo( m_firstHandler, this, handlerName, address, eventClassInfo );
-}
-
-// removes an existing runtime-property
-void wxDynamicClassInfo::RemoveProperty( const wxChar *propertyName )
-{
-    for ( wxDynamicObjectList::iterator iter = m_data->m_dynamicObjects.begin(); iter != m_data->m_dynamicObjects.end(); ++iter )
-        (*iter)->RemoveProperty( propertyName );
-    delete FindPropertyInfoInThisClass(propertyName);
-}
-
-// removes an existing runtime-handler
-void wxDynamicClassInfo::RemoveHandler( const wxChar *handlerName )
-{
-    delete FindHandlerInfoInThisClass(handlerName);
-}
-
-// renames an existing runtime-property
-void wxDynamicClassInfo::RenameProperty( const wxChar *oldPropertyName, const wxChar *newPropertyName )
-{
-    wxPropertyInfo* pi = FindPropertyInfoInThisClass(oldPropertyName);
-    wxASSERT_MSG( pi,wxT("not existing property") );
-    pi->m_name = newPropertyName;
-    wx_dynamic_cast(wxGenericPropertyAccessor*, pi->GetAccessor())->RenameProperty( oldPropertyName, newPropertyName );
-    for ( wxDynamicObjectList::iterator iter = m_data->m_dynamicObjects.begin(); iter != m_data->m_dynamicObjects.end(); ++iter )
-        (*iter)->RenameProperty( oldPropertyName, newPropertyName );
-}
-
-// renames an existing runtime-handler
-void wxDynamicClassInfo::RenameHandler( const wxChar *oldHandlerName, const wxChar *newHandlerName )
-{
-    wxASSERT_MSG(FindHandlerInfoInThisClass(oldHandlerName),wxT("not existing handler") );
-    FindHandlerInfoInThisClass(oldHandlerName)->m_name = newHandlerName;
-}
-
-// ----------------------------------------------------------------------------
-// wxGenericPropertyAccessor
-// ----------------------------------------------------------------------------
-
-struct wxGenericPropertyAccessor::wxGenericPropertyAccessorInternal
-{
-    char filler;
-};
-
-wxGenericPropertyAccessor::wxGenericPropertyAccessor( const wxString& propertyName )
-: wxPropertyAccessor( NULL, NULL, NULL, NULL )
-{
-    m_data = new wxGenericPropertyAccessorInternal;
-    m_propertyName = propertyName;
-    m_getterName = wxT("Get")+propertyName;
-    m_setterName = wxT("Set")+propertyName;
-}
-
-wxGenericPropertyAccessor::~wxGenericPropertyAccessor()
-{
-    delete m_data;
-}
-
-void wxGenericPropertyAccessor::SetProperty(wxObject *object, const wxAny &value) const
-{
-    wxDynamicObject* dynobj = wx_dynamic_cast(wxDynamicObject*, object);
-    wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") );
-    dynobj->SetProperty(m_propertyName.c_str(), value );
-}
-
-void wxGenericPropertyAccessor::GetProperty(const wxObject *object, wxAny& value) const
-{
-    const wxDynamicObject* dynobj = wx_dynamic_cast( const wxDynamicObject * ,  object );
-    wxASSERT_MSG( dynobj, wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") );
-    value = dynobj->GetProperty( m_propertyName.c_str() );
-}
-
-// ----------------------------------------------------------------------------
-// wxGenericPropertyAccessor
-// ----------------------------------------------------------------------------
-
-wxString wxAnyGetAsString( const wxAny& data)
-{
-    if ( data.IsNull() || data.GetTypeInfo()==NULL )
-        return wxEmptyString;
-
-    wxString s;
-    data.GetTypeInfo()->ConvertToString(data,s);
-    return s;
-}
-
-const wxObject* wxAnyGetAsObjectPtr( const wxAny& data)
-{
-    if ( !data.IsNull() )
-    {
-        const wxClassTypeInfo* ti = wx_dynamic_cast(const wxClassTypeInfo*, data.GetTypeInfo());
-        if( ti )
-            return ti->GetClassInfo()->AnyToObjectPtr(data);
-    }
-    return NULL;
-}
-
-wxObjectFunctor::~wxObjectFunctor()
-{};
-
-#endif // wxUSE_EXTENDED_RTTI
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/xti.cpp
+// Purpose:     runtime metadata information (extended class info
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     27/07/03
+// RCS-ID:      $Id: xti.cpp 38857 2006-04-20 07:31:44Z ABX $
+// Copyright:   (c) 1997 Julian Smart
+//              (c) 2003 Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_EXTENDED_RTTI
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/list.h"
+    #include "wx/hash.h"
+#endif
+
+#include "wx/xti.h"
+#include "wx/xml/xml.h"
+#include "wx/tokenzr.h"
+#include <string.h>
+
+#include "wx/beforestd.h"
+#include <map>
+#include <string>
+#include <list>
+#include "wx/afterstd.h"
+
+using namespace std ;
+
+// ----------------------------------------------------------------------------
+// Enum Support
+// ----------------------------------------------------------------------------
+
+wxEnumData::wxEnumData( wxEnumMemberData* data )
+{
+    m_members = data ;
+    for ( m_count = 0; m_members[m_count].m_name ; m_count++)
+    {} ;
+}
+
+bool wxEnumData::HasEnumMemberValue(const wxChar *name, int *value) const
+{
+    int i;
+    for (i = 0; m_members[i].m_name ; i++ )
+    {
+        if (!wxStrcmp(name, m_members[i].m_name))
+        {
+            if ( value )
+                *value = m_members[i].m_value;
+            return true ;
+        }
+    }
+    return false ;
+}
+
+int wxEnumData::GetEnumMemberValue(const wxChar *name) const
+{
+    int i;
+    for (i = 0; m_members[i].m_name ; i++ )
+    {
+        if (!wxStrcmp(name, m_members[i].m_name))
+        {
+            return m_members[i].m_value;
+        }
+    }
+    return 0 ;
+}
+
+const wxChar *wxEnumData::GetEnumMemberName(int value) const
+{
+    int i;
+    for (i = 0; m_members[i].m_name ; i++)
+        if (value == m_members[i].m_value)
+            return m_members[i].m_name;
+
+    return wxEmptyString ;
+}
+
+int wxEnumData::GetEnumMemberValueByIndex( int idx ) const
+{
+    // we should cache the count in order to avoid out-of-bounds errors
+    return m_members[idx].m_value ;
+}
+
+const wxChar * wxEnumData::GetEnumMemberNameByIndex( int idx ) const
+{
+    // we should cache the count in order to avoid out-of-bounds errors
+    return m_members[idx].m_name ;
+}
+
+// ----------------------------------------------------------------------------
+// Type Information
+// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// value streaming
+// ----------------------------------------------------------------------------
+
+// streamer specializations
+// for all built-in types
+
+// bool
+
+template<> void wxStringReadValue(const wxString &s , bool &data )
+{
+    int intdata ;
+    wxSscanf(s, _T("%d"), &intdata ) ;
+    data = (bool)intdata ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const bool &data )
+{
+    s = wxString::Format(_T("%d"), data ) ;
+}
+
+// char
+
+template<> void wxStringReadValue(const wxString &s , char &data )
+{
+    int intdata ;
+    wxSscanf(s, _T("%d"), &intdata ) ;
+    data = char(intdata) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const char &data )
+{
+    s = wxString::Format(_T("%d"), data ) ;
+}
+
+// unsigned char
+
+template<> void wxStringReadValue(const wxString &s , unsigned char &data )
+{
+    int intdata ;
+    wxSscanf(s, _T("%d"), &intdata ) ;
+    data = (unsigned char)(intdata) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const unsigned char &data )
+{
+    s = wxString::Format(_T("%d"), data ) ;
+}
+
+// int
+
+template<> void wxStringReadValue(const wxString &s , int &data )
+{
+    wxSscanf(s, _T("%d"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const int &data )
+{
+    s = wxString::Format(_T("%d"), data ) ;
+}
+
+// unsigned int
+
+template<> void wxStringReadValue(const wxString &s , unsigned int &data )
+{
+    wxSscanf(s, _T("%d"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const unsigned int &data )
+{
+    s = wxString::Format(_T("%d"), data ) ;
+}
+
+// long
+
+template<> void wxStringReadValue(const wxString &s , long &data )
+{
+    wxSscanf(s, _T("%ld"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const long &data )
+{
+    s = wxString::Format(_T("%ld"), data ) ;
+}
+
+// unsigned long
+
+template<> void wxStringReadValue(const wxString &s , unsigned long &data )
+{
+    wxSscanf(s, _T("%ld"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const unsigned long &data )
+{
+    s = wxString::Format(_T("%ld"), data ) ;
+}
+
+// float
+
+template<> void wxStringReadValue(const wxString &s , float &data )
+{
+    wxSscanf(s, _T("%f"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const float &data )
+{
+    s = wxString::Format(_T("%f"), data ) ;
+}
+
+// double
+
+template<> void wxStringReadValue(const wxString &s , double &data )
+{
+    wxSscanf(s, _T("%lf"), &data ) ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const double &data )
+{
+    s = wxString::Format(_T("%lf"), data ) ;
+}
+
+// wxString
+
+template<> void wxStringReadValue(const wxString &s , wxString &data )
+{
+    data = s ;
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxString &data )
+{
+    s = data ;
+}
+
+// built-ins
+//
+
+#if wxUSE_FUNC_TEMPLATE_POINTER
+#define wxBUILTIN_TYPE_INFO( element , type ) \
+    wxBuiltInTypeInfo s_typeInfo##type(element , &wxToStringConverter<type> , &wxFromStringConverter<type> , typeid(type).name()) ;
+#else
+#define wxBUILTIN_TYPE_INFO( element , type ) \
+    void _toString##element( const wxxVariant& data , wxString &result ) { wxToStringConverter<type>(data, result); } \
+    void _fromString##element( const wxString& data , wxxVariant &result ) { wxFromStringConverter<type>(data, result); } \
+    wxBuiltInTypeInfo s_typeInfo##type(element , &_toString##element , &_fromString##element , typeid(type).name()) ;
+#endif
+
+typedef unsigned char unsigned_char;
+typedef unsigned int unsigned_int;
+typedef unsigned long unsigned_long;
+
+wxBuiltInTypeInfo s_typeInfovoid( wxT_VOID , NULL , NULL , typeid(void).name());
+wxBUILTIN_TYPE_INFO( wxT_BOOL ,  bool);
+wxBUILTIN_TYPE_INFO( wxT_CHAR ,  char);
+wxBUILTIN_TYPE_INFO( wxT_UCHAR , unsigned_char);
+wxBUILTIN_TYPE_INFO( wxT_INT , int);
+wxBUILTIN_TYPE_INFO( wxT_UINT , unsigned_int);
+wxBUILTIN_TYPE_INFO( wxT_LONG , long);
+wxBUILTIN_TYPE_INFO( wxT_ULONG , unsigned_long);
+wxBUILTIN_TYPE_INFO( wxT_FLOAT , float);
+wxBUILTIN_TYPE_INFO( wxT_DOUBLE , double);
+wxBUILTIN_TYPE_INFO( wxT_STRING , wxString);
+
+
+// this are compiler induced specialization which are never used anywhere
+
+wxILLEGAL_TYPE_SPECIALIZATION( char const * )
+wxILLEGAL_TYPE_SPECIALIZATION( char * )
+wxILLEGAL_TYPE_SPECIALIZATION( unsigned char * )
+wxILLEGAL_TYPE_SPECIALIZATION( int * )
+wxILLEGAL_TYPE_SPECIALIZATION( bool * )
+wxILLEGAL_TYPE_SPECIALIZATION( long * )
+wxILLEGAL_TYPE_SPECIALIZATION( wxString * )
+
+wxCOLLECTION_TYPE_INFO( wxString , wxArrayString ) ;
+
+template<> void wxCollectionToVariantArray( wxArrayString const &theArray, wxxVariantArray &value)
+{
+    wxArrayCollectionToVariantArray( theArray , value ) ;
+}
+
+wxTypeInfoMap *wxTypeInfo::ms_typeTable = NULL ;
+
+wxTypeInfo *wxTypeInfo::FindType(const wxChar *typeName)
+{
+    wxTypeInfoMap::iterator iter = ms_typeTable->find(typeName) ;
+    wxASSERT_MSG( iter != ms_typeTable->end() , wxT("lookup for a non-existent type-info") ) ;
+    return (wxTypeInfo *)iter->second;
+}
+
+#if wxUSE_UNICODE
+wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to , converterFromString_t from , const char *name) :
+wxTypeInfo( kind , to , from , name)
+{ wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT , wxT("Illegal Kind for Enum Type")) ; m_classInfo = classInfo ;}
+#endif
+
+wxClassTypeInfo::wxClassTypeInfo( wxTypeKind kind , wxClassInfo* classInfo , converterToString_t to , converterFromString_t from , const wxString &name) :
+wxTypeInfo( kind , to , from , name)
+{ wxASSERT_MSG( kind == wxT_OBJECT_PTR || kind == wxT_OBJECT , wxT("Illegal Kind for Enum Type")) ; m_classInfo = classInfo ;}
+
+wxDelegateTypeInfo::wxDelegateTypeInfo( int eventType , wxClassInfo* eventClass , converterToString_t to , converterFromString_t from ) :
+wxTypeInfo ( wxT_DELEGATE , to , from , wxEmptyString )
+{ m_eventClass = eventClass ; m_eventType = eventType ; m_lastEventType = -1 ;}
+
+wxDelegateTypeInfo::wxDelegateTypeInfo( int eventType , int lastEventType , wxClassInfo* eventClass , converterToString_t to , converterFromString_t from ) :
+wxTypeInfo ( wxT_DELEGATE , to , from , wxEmptyString )
+{ m_eventClass = eventClass ; m_eventType = eventType ; m_lastEventType = lastEventType; }
+
+void wxTypeInfo::Register()
+{
+    if ( ms_typeTable == NULL )
+        ms_typeTable = new wxTypeInfoMap() ;
+
+    if( !m_name.empty() )
+        (*ms_typeTable)[m_name] = this ;
+}
+
+void wxTypeInfo::Unregister()
+{
+    if( !m_name.empty() )
+        ms_typeTable->erase(m_name);
+}
+
+// removing header dependancy on string tokenizer
+
+void wxSetStringToArray( const wxString &s , wxArrayString &array )
+{
+    wxStringTokenizer tokenizer(s, wxT("| \t\n"), wxTOKEN_STRTOK);
+    wxString flag;
+    array.Clear() ;
+    while (tokenizer.HasMoreTokens())
+    {
+        array.Add(tokenizer.GetNextToken()) ;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxClassInfo
+// ----------------------------------------------------------------------------
+
+wxPropertyInfo::~wxPropertyInfo()
+{
+    if ( this == m_itsClass->m_firstProperty )
+    {
+        m_itsClass->m_firstProperty = m_next;
+    }
+    else
+    {
+        wxPropertyInfo *info = m_itsClass->m_firstProperty;
+        while (info)
+        {
+            if ( info->m_next == this )
+            {
+                info->m_next = m_next;
+                break;
+            }
+
+            info = info->m_next;
+        }
+    }
+}
+
+wxHandlerInfo::~wxHandlerInfo()
+{
+    if ( this == m_itsClass->m_firstHandler )
+    {
+        m_itsClass->m_firstHandler = m_next;
+    }
+    else
+    {
+        wxHandlerInfo *info = m_itsClass->m_firstHandler;
+        while (info)
+        {
+            if ( info->m_next == this )
+            {
+                info->m_next = m_next;
+                break;
+            }
+
+            info = info->m_next;
+        }
+    }
+}
+
+const wxPropertyAccessor *wxClassInfo::FindAccessor(const wxChar *PropertyName) const
+{
+    const wxPropertyInfo* info = FindPropertyInfo( PropertyName ) ;
+
+    if ( info )
+        return info->GetAccessor() ;
+
+    return NULL ;
+}
+
+wxPropertyInfo *wxClassInfo::FindPropertyInfoInThisClass (const wxChar *PropertyName) const
+{
+    wxPropertyInfo* info = m_firstProperty ;
+
+    while( info )
+    {
+        if ( wxStrcmp( info->GetName() , PropertyName ) == 0 )
+            return info ;
+        info = info->GetNext() ;
+    }
+
+    return 0;
+}
+
+const wxPropertyInfo *wxClassInfo::FindPropertyInfo (const wxChar *PropertyName) const
+{
+    const wxPropertyInfo* info = FindPropertyInfoInThisClass( PropertyName ) ;
+    if ( info )
+        return info ;
+
+    const wxClassInfo** parents = GetParents() ;
+    for ( int i = 0 ; parents[i] ; ++ i )
+    {
+        if ( ( info = parents[i]->FindPropertyInfo( PropertyName ) ) != NULL )
+            return info ;
+    }
+
+    return 0;
+}
+
+wxHandlerInfo *wxClassInfo::FindHandlerInfoInThisClass (const wxChar *PropertyName) const
+{
+    wxHandlerInfo* info = m_firstHandler ;
+
+    while( info )
+    {
+        if ( wxStrcmp( info->GetName() , PropertyName ) == 0 )
+            return info ;
+        info = info->GetNext() ;
+    }
+
+    return 0;
+}
+
+const wxHandlerInfo *wxClassInfo::FindHandlerInfo (const wxChar *PropertyName) const
+{
+    const wxHandlerInfo* info = FindHandlerInfoInThisClass( PropertyName ) ;
+
+    if ( info )
+        return info ;
+
+    const wxClassInfo** parents = GetParents() ;
+    for ( int i = 0 ; parents[i] ; ++ i )
+    {
+        if ( ( info = parents[i]->FindHandlerInfo( PropertyName ) ) != NULL )
+            return info ;
+    }
+
+    return 0;
+}
+
+wxObjectStreamingCallback wxClassInfo::GetStreamingCallback() const
+{
+    if ( m_streamingCallback )
+        return m_streamingCallback ;
+
+    wxObjectStreamingCallback retval = NULL ;
+    const wxClassInfo** parents = GetParents() ;
+    for ( int i = 0 ; parents[i] && retval == NULL ; ++ i )
+    {
+        retval = parents[i]->GetStreamingCallback() ;
+    }
+    return retval ;
+}
+
+bool wxClassInfo::BeforeWriteObject( const wxObject *obj, wxWriter *streamer , wxPersister *persister , wxxVariantArray &metadata) const
+{
+    wxObjectStreamingCallback sb = GetStreamingCallback() ;
+    if ( sb )
+        return (*sb)(obj , streamer , persister , metadata ) ;
+
+    return true ;
+}
+
+void wxClassInfo::SetProperty(wxObject *object, const wxChar *propertyName, const wxxVariant &value) const
+{
+    const wxPropertyAccessor *accessor;
+
+    accessor = FindAccessor(propertyName);
+    wxASSERT(accessor->HasSetter());
+    accessor->SetProperty( object , value ) ;
+}
+
+wxxVariant wxClassInfo::GetProperty(wxObject *object, const wxChar *propertyName) const
+{
+    const wxPropertyAccessor *accessor;
+
+    accessor = FindAccessor(propertyName);
+    wxASSERT(accessor->HasGetter());
+    wxxVariant result ;
+    accessor->GetProperty(object,result);
+    return result ;
+}
+
+wxxVariantArray wxClassInfo::GetPropertyCollection(wxObject *object, const wxChar *propertyName) const
+{
+    const wxPropertyAccessor *accessor;
+
+    accessor = FindAccessor(propertyName);
+    wxASSERT(accessor->HasGetter());
+    wxxVariantArray result ;
+    accessor->GetPropertyCollection(object,result);
+    return result ;
+}
+
+void wxClassInfo::AddToPropertyCollection(wxObject *object, const wxChar *propertyName , const wxxVariant& value) const
+{
+    const wxPropertyAccessor *accessor;
+
+    accessor = FindAccessor(propertyName);
+    wxASSERT(accessor->HasAdder());
+    accessor->AddToPropertyCollection( object , value ) ;
+}
+
+// void wxClassInfo::GetProperties( wxPropertyInfoMap &map ) const
+// The map parameter (the name map that is) seems something special
+// to MSVC and so we use a other name.
+void wxClassInfo::GetProperties( wxPropertyInfoMap &infomap ) const
+{
+    const wxPropertyInfo *pi = GetFirstProperty() ;
+    while( pi )
+    {
+        if ( infomap.find( pi->GetName() ) == infomap.end() )
+            infomap[pi->GetName()] = (wxPropertyInfo*) pi ;
+
+        pi = pi->GetNext() ;
+    }
+
+    const wxClassInfo** parents = GetParents() ;
+    for ( int i = 0 ; parents[i] ; ++ i )
+    {
+        parents[i]->GetProperties( infomap ) ;
+    }
+}
+
+/*
+VARIANT TO OBJECT
+*/
+
+wxObject* wxxVariant::GetAsObject()
+{
+    const wxClassTypeInfo *ti = dynamic_cast<const wxClassTypeInfo*>( m_data->GetTypeInfo() ) ;
+    if ( ti )
+        return ti->GetClassInfo()->VariantToInstance(*this) ;
+    else
+        return NULL ;
+}
+
+// ----------------------------------------------------------------------------
+// wxDynamicObject support
+// ----------------------------------------------------------------------------
+//
+// Dynamic Objects are objects that have a real superclass instance and carry their
+// own attributes in a hash map. Like this it is possible to create the objects and
+// stream them, as if their class information was already available from compiled data
+
+struct wxDynamicObject::wxDynamicObjectInternal
+{
+    wxDynamicObjectInternal() {}
+
+#if wxUSE_UNICODE
+    map<wstring,wxxVariant> m_properties ;
+#else
+    map<string,wxxVariant> m_properties ;
+#endif
+} ;
+
+typedef list< wxDynamicObject* > wxDynamicObjectList ;
+
+struct wxDynamicClassInfo::wxDynamicClassInfoInternal
+{
+    wxDynamicObjectList m_dynamicObjects ;
+} ;
+
+// instantiates this object with an instance of its superclass
+wxDynamicObject::wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info)
+{
+    m_superClassInstance = superClassInstance ;
+    m_classInfo = info ;
+    m_data = new wxDynamicObjectInternal ;
+}
+
+wxDynamicObject::~wxDynamicObject()
+{
+    dynamic_cast<const wxDynamicClassInfo*>(m_classInfo)->m_data->m_dynamicObjects.remove( this ) ;
+    delete m_data ;
+    delete m_superClassInstance ;
+}
+
+void wxDynamicObject::SetProperty (const wxChar *propertyName, const wxxVariant &value)
+{
+    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),wxT("Accessing Unknown Property in a Dynamic Object") ) ;
+    m_data->m_properties[propertyName] = value ;
+}
+
+wxxVariant wxDynamicObject::GetProperty (const wxChar *propertyName) const
+{
+    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),wxT("Accessing Unknown Property in a Dynamic Object") ) ;
+    return m_data->m_properties[propertyName] ;
+}
+
+void wxDynamicObject::RemoveProperty( const wxChar *propertyName )
+{
+    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(propertyName),wxT("Removing Unknown Property in a Dynamic Object") ) ;
+    m_data->m_properties.erase( propertyName ) ;
+}
+
+void wxDynamicObject::RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName )
+{
+    wxASSERT_MSG(m_classInfo->FindPropertyInfoInThisClass(oldPropertyName),wxT("Renaming Unknown Property in a Dynamic Object") ) ;
+    wxxVariant value = m_data->m_properties[oldPropertyName] ;
+    m_data->m_properties.erase( oldPropertyName ) ;
+    m_data->m_properties[newPropertyName] = value ;
+}
+
+
+// ----------------------------------------------------------------------------
+// wxDynamiClassInfo
+// ----------------------------------------------------------------------------
+
+wxDynamicClassInfo::wxDynamicClassInfo( const wxChar *unitName, const wxChar *className , const wxClassInfo* superClass ) :
+wxClassInfo( unitName, className , new const wxClassInfo*[2])
+{
+    GetParents()[0] = superClass ;
+    GetParents()[1] = NULL ;
+    m_data = new wxDynamicClassInfoInternal ;
+}
+
+wxDynamicClassInfo::~wxDynamicClassInfo()
+{
+    delete[] GetParents() ;
+    delete m_data ;
+}
+
+wxObject *wxDynamicClassInfo::AllocateObject() const
+{
+    wxObject* parent = GetParents()[0]->AllocateObject() ;
+    wxDynamicObject *obj = new wxDynamicObject( parent , this ) ;
+    m_data->m_dynamicObjects.push_back( obj ) ;
+    return obj ;
+}
+
+void wxDynamicClassInfo::Create (wxObject *object, int paramCount, wxxVariant *params) const
+{
+    wxDynamicObject *dynobj = dynamic_cast< wxDynamicObject *>( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::Create on an object other than wxDynamicObject") ) ;
+    GetParents()[0]->Create( dynobj->GetSuperClassInstance() , paramCount , params ) ;
+}
+
+// get number of parameters for constructor
+int wxDynamicClassInfo::GetCreateParamCount() const
+{
+    return GetParents()[0]->GetCreateParamCount() ;
+}
+
+// get i-th constructor parameter
+const wxChar* wxDynamicClassInfo::GetCreateParamName(int i) const
+{
+    return GetParents()[0]->GetCreateParamName( i ) ;
+}
+
+void wxDynamicClassInfo::SetProperty(wxObject *object, const wxChar *propertyName, const wxxVariant &value) const
+{
+    wxDynamicObject* dynobj = dynamic_cast< wxDynamicObject * >( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
+    if ( FindPropertyInfoInThisClass(propertyName) )
+        dynobj->SetProperty( propertyName , value ) ;
+    else
+        GetParents()[0]->SetProperty( dynobj->GetSuperClassInstance() , propertyName , value ) ;
+}
+
+wxxVariant wxDynamicClassInfo::GetProperty(wxObject *object, const wxChar *propertyName) const
+{
+    wxDynamicObject* dynobj = dynamic_cast< wxDynamicObject * >( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
+    if ( FindPropertyInfoInThisClass(propertyName) )
+        return dynobj->GetProperty( propertyName ) ;
+    else
+        return GetParents()[0]->GetProperty( dynobj->GetSuperClassInstance() , propertyName ) ;
+}
+
+void wxDynamicClassInfo::AddProperty( const wxChar *propertyName , const wxTypeInfo* typeInfo )
+{
+    new wxPropertyInfo( m_firstProperty , this , propertyName , typeInfo->GetTypeName() , new wxGenericPropertyAccessor( propertyName ) , wxxVariant() ) ;
+}
+
+void wxDynamicClassInfo::AddHandler( const wxChar *handlerName , wxObjectEventFunction address , const wxClassInfo* eventClassInfo )
+{
+    new wxHandlerInfo( m_firstHandler , this , handlerName , address , eventClassInfo ) ;
+}
+
+// removes an existing runtime-property
+void wxDynamicClassInfo::RemoveProperty( const wxChar *propertyName )
+{
+    for ( wxDynamicObjectList::iterator iter = m_data->m_dynamicObjects.begin() ; iter != m_data->m_dynamicObjects.end() ; ++iter )
+        (*iter)->RemoveProperty( propertyName ) ;
+    delete FindPropertyInfoInThisClass(propertyName) ;
+}
+
+// removes an existing runtime-handler
+void wxDynamicClassInfo::RemoveHandler( const wxChar *handlerName )
+{
+    delete FindHandlerInfoInThisClass(handlerName) ;
+}
+
+// renames an existing runtime-property
+void wxDynamicClassInfo::RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName )
+{
+    wxPropertyInfo* pi = FindPropertyInfoInThisClass(oldPropertyName) ;
+    wxASSERT_MSG( pi ,wxT("not existing property") ) ;
+    pi->m_name = newPropertyName ;
+    dynamic_cast<wxGenericPropertyAccessor*>(pi->GetAccessor())->RenameProperty( oldPropertyName , newPropertyName ) ;
+    for ( wxDynamicObjectList::iterator iter = m_data->m_dynamicObjects.begin() ; iter != m_data->m_dynamicObjects.end() ; ++iter )
+        (*iter)->RenameProperty( oldPropertyName , newPropertyName ) ;
+}
+
+// renames an existing runtime-handler
+void wxDynamicClassInfo::RenameHandler( const wxChar *oldHandlerName , const wxChar *newHandlerName )
+{
+    wxASSERT_MSG(FindHandlerInfoInThisClass(oldHandlerName),wxT("not existing handler") ) ;
+    FindHandlerInfoInThisClass(oldHandlerName)->m_name = newHandlerName ;
+}
+
+// ----------------------------------------------------------------------------
+// wxGenericPropertyAccessor
+// ----------------------------------------------------------------------------
+
+struct wxGenericPropertyAccessor::wxGenericPropertyAccessorInternal
+{
+    char filler ;
+} ;
+
+wxGenericPropertyAccessor::wxGenericPropertyAccessor( const wxString& propertyName )
+: wxPropertyAccessor( NULL , NULL , NULL , NULL )
+{
+    m_data = new wxGenericPropertyAccessorInternal ;
+    m_propertyName = propertyName ;
+    m_getterName = wxT("Get")+propertyName ;
+    m_setterName = wxT("Set")+propertyName ;
+}
+
+wxGenericPropertyAccessor::~wxGenericPropertyAccessor()
+{
+    delete m_data ;
+}
+void wxGenericPropertyAccessor::SetProperty(wxObject *object, const wxxVariant &value) const
+{
+    wxDynamicObject* dynobj = dynamic_cast< wxDynamicObject * >( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
+    dynobj->SetProperty(m_propertyName , value ) ;
+}
+
+void wxGenericPropertyAccessor::GetProperty(const wxObject *object, wxxVariant& value) const
+{
+    const wxDynamicObject* dynobj = dynamic_cast< const wxDynamicObject * >( object ) ;
+    wxASSERT_MSG( dynobj , wxT("cannot call wxDynamicClassInfo::SetProperty on an object other than wxDynamicObject") ) ;
+    value = dynobj->GetProperty( m_propertyName ) ;
+}
+
+#endif // wxUSE_EXTENDED_RTTI
diff --git a/Source/3rd Party/wx/src/common/xtistrm.cpp b/Source/3rd Party/wx/src/common/xtistrm.cpp
index 4c09363bd..eeb0cf4d5 100644
--- a/Source/3rd Party/wx/src/common/xtistrm.cpp	
+++ b/Source/3rd Party/wx/src/common/xtistrm.cpp	
@@ -1,681 +1,847 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/xtistrm.cpp
-// Purpose:     streaming runtime metadata information
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     27/07/03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_EXTENDED_RTTI
-
-#include "wx/xtistrm.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/event.h"
-#endif
-
-#include "wx/tokenzr.h"
-#include "wx/txtstrm.h"
-
-// STL headers:
-
-#include "wx/beforestd.h"
-#include <map>
-#include <vector>
-#include <string>
-#include "wx/afterstd.h"
-using namespace std;
-
-
-// ----------------------------------------------------------------------------
-// wxObjectWriter
-// ----------------------------------------------------------------------------
-
-struct wxObjectWriter::wxObjectWriterInternal
-{
-    map< const wxObject*, int > m_writtenObjects;
-    int m_nextId;
-};
-
-wxObjectWriter::wxObjectWriter()
-{
-    m_data = new wxObjectWriterInternal;
-    m_data->m_nextId = 0;
-}
-
-wxObjectWriter::~wxObjectWriter()
-{
-    delete m_data;
-}
-
-struct wxObjectWriter::wxObjectWriterInternalPropertiesData
-{
-    char nothing;
-};
-
-void wxObjectWriter::ClearObjectContext()
-{
-    delete m_data;
-    m_data = new wxObjectWriterInternal();
-    m_data->m_nextId = 0;
-}
-
-void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo, 
-                           wxObjectWriterCallback *writercallback, const wxString &name, 
-                           const wxStringToAnyHashMap &metadata )
-{
-    DoBeginWriteTopLevelEntry( name );
-    WriteObject( object, classInfo, writercallback, false, metadata);
-    DoEndWriteTopLevelEntry( name );
-}
-
-void wxObjectWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo, 
-                           wxObjectWriterCallback *writercallback, bool isEmbedded, 
-                           const wxStringToAnyHashMap &metadata )
-{
-    if ( !classInfo->BeforeWriteObject( object, this, writercallback, metadata) )
-        return;
-
-    if ( writercallback->BeforeWriteObject( this, object, classInfo, metadata) )
-    {
-        if ( object == NULL )
-            DoWriteNullObject();
-        else if ( IsObjectKnown( object ) )
-            DoWriteRepeatedObject( GetObjectID(object) );
-        else
-        {
-            int oid = m_data->m_nextId++;
-            if ( !isEmbedded )
-                m_data->m_writtenObjects[object] = oid;
-
-            // in case this object is a wxDynamicObject we also have to insert is superclass
-            // instance with the same id, so that object relations are streamed out correctly
-            const wxDynamicObject* dynobj = wx_dynamic_cast(const wxDynamicObject*, object);
-            if ( !isEmbedded && dynobj )
-                m_data->m_writtenObjects[dynobj->GetSuperClassInstance()] = oid;
-
-            DoBeginWriteObject( object, classInfo, oid, metadata );
-            wxObjectWriterInternalPropertiesData data;
-            WriteAllProperties( object, classInfo, writercallback, &data );
-            DoEndWriteObject( object, classInfo, oid  );
-        }
-        writercallback->AfterWriteObject( this,object, classInfo );
-    }
-}
-
-void wxObjectWriter::FindConnectEntry(const wxEvtHandler * evSource,
-                                const wxEventSourceTypeInfo* dti, 
-                                const wxObject* &sink, 
-                                const wxHandlerInfo *&handler)
-{
-    wxList *dynamicEvents = evSource->GetDynamicEventTable();
-
-    if ( dynamicEvents )
-    {
-        for ( wxList::const_iterator node = dynamicEvents->begin(); node != dynamicEvents->end(); ++node )
-        {
-            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)(*node);
-
-            // find the match
-            if ( entry->m_fn &&
-                (dti->GetEventType() == entry->m_eventType) &&
-                (entry->m_id == -1 ) &&
-                (entry->m_fn->GetEvtHandler() != NULL ) )
-            {
-                sink = entry->m_fn->GetEvtHandler();
-                const wxClassInfo* sinkClassInfo = sink->GetClassInfo();
-                const wxHandlerInfo* sinkHandler = sinkClassInfo->GetFirstHandler();
-                while ( sinkHandler )
-                {
-                    if ( sinkHandler->GetEventFunction() == entry->m_fn->GetEvtMethod() )
-                    {
-                        handler = sinkHandler;
-                        break;
-                    }
-                    sinkHandler = sinkHandler->GetNext();
-                }
-                break;
-            }
-        }
-    }
-}
-void wxObjectWriter::WriteAllProperties( const wxObject * obj, const wxClassInfo* ci, 
-                                   wxObjectWriterCallback *writercallback, 
-                                   wxObjectWriterInternalPropertiesData * data )
-{
-    wxPropertyInfoMap map;
-    ci->GetProperties( map );
-    for ( int i = 0; i < ci->GetCreateParamCount(); ++i )
-    {
-        wxString name = ci->GetCreateParamName(i);
-        wxPropertyInfoMap::const_iterator iter = map.find(name);
-        const wxPropertyInfo* prop = iter == map.end() ? NULL : iter->second;
-        if ( prop )
-        {
-            WriteOneProperty( obj, prop->GetDeclaringClass(), prop, writercallback, data );
-        }
-        else
-        {
-            wxLogError( _("Create Parameter %s not found in declared RTTI Parameters"), name.c_str() );
-        }
-        map.erase( name );
-    }
-    { // Extra block for broken compilers
-        for( wxPropertyInfoMap::iterator iter = map.begin(); iter != map.end(); ++iter )
-        {
-            const wxPropertyInfo* prop = iter->second;
-            if ( prop->GetFlags() & wxPROP_OBJECT_GRAPH )
-            {
-                WriteOneProperty( obj, prop->GetDeclaringClass(), prop, writercallback, data );
-            }
-        }
-    }
-    { // Extra block for broken compilers
-        for( wxPropertyInfoMap::iterator iter = map.begin(); iter != map.end(); ++iter )
-        {
-            const wxPropertyInfo* prop = iter->second;
-            if ( !(prop->GetFlags() & wxPROP_OBJECT_GRAPH) )
-            {
-                WriteOneProperty( obj, prop->GetDeclaringClass(), prop, writercallback, data );
-            }
-        }
-    }
-}
-
-class WXDLLIMPEXP_BASE wxObjectPropertyWriter: public wxObjectWriterFunctor
-{
-public:
-    wxObjectPropertyWriter(const wxClassTypeInfo* cti,
-        wxObjectWriterCallback *writercallback,
-        wxObjectWriter* writer,
-        wxStringToAnyHashMap &props) : 
-    m_cti(cti),m_persister(writercallback),m_writer(writer),m_props(props)
-    {}
-
-    virtual void operator()(const wxObject *vobj)
-    {
-        m_writer->WriteObject( vobj, (vobj ? vobj->GetClassInfo() : m_cti->GetClassInfo() ), 
-            m_persister, m_cti->GetKind()== wxT_OBJECT, m_props );
-    }
-private:
-    const wxClassTypeInfo* m_cti;
-    wxObjectWriterCallback *m_persister;
-    wxObjectWriter* m_writer;
-    wxStringToAnyHashMap& m_props;
-};
-
-void wxObjectWriter::WriteOneProperty( const wxObject *obj, const wxClassInfo* ci, 
-                                 const wxPropertyInfo* pi, wxObjectWriterCallback *writercallback, 
-                                 wxObjectWriterInternalPropertiesData *WXUNUSED(data) )
-{
-    if ( pi->GetFlags() & wxPROP_DONT_STREAM )
-        return;
-
-    // make sure that we are picking the correct object for accessing the property
-    const wxDynamicObject* dynobj = wx_dynamic_cast(const wxDynamicObject*, obj );
-    if ( dynobj && (wx_dynamic_cast(const wxDynamicClassInfo*, ci) == NULL) )
-        obj = dynobj->GetSuperClassInstance();
-
-    if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION )
-    {
-        wxAnyList data;
-        pi->GetAccessor()->GetPropertyCollection(obj, data);
-        const wxTypeInfo * elementType = 
-            wx_dynamic_cast( const wxCollectionTypeInfo*, pi->GetTypeInfo() )->GetElementType();
-        if ( !data.empty() )
-        {
-            DoBeginWriteProperty( pi );
-            for ( wxAnyList::const_iterator iter = data.begin(); iter != data.end(); ++iter )
-            {
-                DoBeginWriteElement();
-                const wxAny* valptr = *iter;
-                if ( writercallback->BeforeWriteProperty( this, obj, pi, *valptr ) )
-                {
-                    const wxClassTypeInfo* cti = 
-                        wx_dynamic_cast( const wxClassTypeInfo*, elementType );
-                    if ( cti )
-                    {
-                        wxStringToAnyHashMap md;
-                        wxObjectPropertyWriter pw(cti,writercallback,this, md);
-
-                        const wxClassInfo* pci = cti->GetClassInfo();
-                        pci->CallOnAny( *valptr, &pw);
-                    }
-                    else
-                    {
-                        DoWriteSimpleType( *valptr );
-                    }
-                }
-                DoEndWriteElement();
-            }
-            DoEndWriteProperty( pi );
-        }
-    }
-    else
-    {
-        const wxEventSourceTypeInfo* dti = 
-            wx_dynamic_cast( const wxEventSourceTypeInfo* , pi->GetTypeInfo() );
-        if ( dti )
-        {
-            const wxObject* sink = NULL;
-            const wxHandlerInfo *handler = NULL;
-
-            const wxEvtHandler * evSource = wx_dynamic_cast(const wxEvtHandler *, obj);
-            if ( evSource )
-            {
-                FindConnectEntry( evSource, dti, sink, handler );
-                if ( writercallback->BeforeWriteDelegate( this, obj, ci, pi, sink, handler ) )
-                {
-                    if ( sink != NULL && handler != NULL )
-                    {
-                        DoBeginWriteProperty( pi );
-                        if ( IsObjectKnown( sink ) )
-                        {
-                            DoWriteDelegate( obj, ci, pi, sink, GetObjectID( sink ), 
-                                             sink->GetClassInfo(), handler );
-                            DoEndWriteProperty( pi );
-                        }
-                        else
-                        {
-                            wxLogError( wxT("Streaming delegates for not already ")
-                                        wxT("streamed objects not yet supported") );
-                        }
-                    }
-                }
-            }
-            else
-            {
-                wxLogError(_("Illegal Object Class (Non-wxEvtHandler) as Event Source") );
-            }
-        }
-        else
-        {
-            wxAny value;
-            pi->GetAccessor()->GetProperty(obj, value);
-
-            // avoid streaming out void objects
-            // TODO Verify
-            if( value.IsNull() )
-                return;
-
-            if ( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
-            {
-                const wxEnumTypeInfo *eti = 
-                    wx_dynamic_cast(const wxEnumTypeInfo*,  pi->GetTypeInfo() );
-                if ( eti )
-                {
-                    eti->ConvertFromLong( wxANY_AS(value, long ), value );
-                }
-                else
-                {
-                    wxLogError( _("Type must have enum - long conversion") );
-                }
-            }
-
-            // avoid streaming out default values
-            if ( pi->GetTypeInfo()->HasStringConverters() && 
-                 !pi->GetDefaultValue().IsNull() ) // TODO Verify
-            {
-                if ( wxAnyGetAsString(value) == wxAnyGetAsString(pi->GetDefaultValue()) )
-                    return;
-            }
-
-            // avoid streaming out null objects
-            const wxClassTypeInfo* cti = 
-                wx_dynamic_cast( const wxClassTypeInfo* , pi->GetTypeInfo() );
-
-            if ( cti && cti->GetKind() == wxT_OBJECT_PTR && wxAnyGetAsObjectPtr(value) == NULL )
-                return;
-
-            if ( writercallback->BeforeWriteProperty( this, obj, pi, value ) )
-            {
-                DoBeginWriteProperty( pi );
-                if ( cti )
-                {
-                    if ( cti->HasStringConverters() )
-                    {
-                        wxString stringValue;
-                        cti->ConvertToString( value, stringValue );
-                        wxAny convertedValue(stringValue);
-                        DoWriteSimpleType( convertedValue );
-                    }
-                    else
-                    {
-                        wxStringToAnyHashMap md;
-                        wxObjectPropertyWriter pw(cti,writercallback,this, md);
-
-                        const wxClassInfo* pci = cti->GetClassInfo();
-                        pci->CallOnAny(value, &pw);
-                    }
-                }
-                else
-                {
-                    DoWriteSimpleType( value );
-                }
-                DoEndWriteProperty( pi );
-            }
-        }
-    }
-}
-
-int wxObjectWriter::GetObjectID(const wxObject *obj)
-{
-    if ( !IsObjectKnown( obj ) )
-        return wxInvalidObjectID;
-
-    return m_data->m_writtenObjects[obj];
-}
-
-bool wxObjectWriter::IsObjectKnown( const wxObject *obj )
-{
-    return m_data->m_writtenObjects.find( obj ) != m_data->m_writtenObjects.end();
-}
-
-
-// ----------------------------------------------------------------------------
-// wxObjectReader
-// ----------------------------------------------------------------------------
-
-struct wxObjectReader::wxObjectReaderInternal
-{
-    map<int,wxClassInfo*> m_classInfos;
-};
-
-wxObjectReader::wxObjectReader()
-{
-    m_data = new wxObjectReaderInternal;
-}
-
-wxObjectReader::~wxObjectReader()
-{
-    delete m_data;
-}
-
-wxClassInfo* wxObjectReader::GetObjectClassInfo(int objectID)
-{
-    if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
-    {
-        wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) );
-        return NULL;
-    }
-    if ( m_data->m_classInfos.find(objectID) == m_data->m_classInfos.end() )
-    {
-        wxLogError( _("Unknown Object passed to GetObjectClassInfo" ) );
-        return NULL;
-    }
-    return m_data->m_classInfos[objectID];
-}
-
-void wxObjectReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo )
-{
-    if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
-    {
-        wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) );
-        return;
-    }
-    if ( m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() )
-    {
-        wxLogError( _("Already Registered Object passed to SetObjectClassInfo" ) );
-        return;
-    }
-    m_data->m_classInfos[objectID] = classInfo;
-}
-
-bool wxObjectReader::HasObjectClassInfo( int objectID )
-{
-    if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
-    {
-        wxLogError( _("Invalid or Null Object ID passed to HasObjectClassInfo" ) );
-        return false;
-    }
-    return m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end();
-}
-
-
-// ----------------------------------------------------------------------------
-// reading xml in
-// ----------------------------------------------------------------------------
-
-/*
-Reading components has not to be extended for components
-as properties are always sought by typeinfo over all levels
-and create params are always toplevel class only
-*/
-
-
-// ----------------------------------------------------------------------------
-// wxObjectRuntimeReaderCallback - depersisting to memory
-// ----------------------------------------------------------------------------
-
-struct wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallbackInternal
-{
-    map<int,wxObject *> m_objects;
-
-    void SetObject(int objectID, wxObject *obj )
-    {
-        if ( m_objects.find(objectID) != m_objects.end() )
-        {
-            wxLogError( _("Passing a already registered object to SetObject") );
-            return ;
-        }
-        m_objects[objectID] = obj;
-    }
-    wxObject* GetObject( int objectID )
-    {
-        if ( objectID == wxNullObjectID )
-            return NULL;
-        if ( m_objects.find(objectID) == m_objects.end() )
-        {
-            wxLogError( _("Passing an unknown object to GetObject") );
-            return NULL;
-        }
-
-        return m_objects[objectID];
-    }
-};
-
-wxObjectRuntimeReaderCallback::wxObjectRuntimeReaderCallback()
-{
-    m_data = new wxObjectRuntimeReaderCallbackInternal();
-}
-
-wxObjectRuntimeReaderCallback::~wxObjectRuntimeReaderCallback()
-{
-    delete m_data;
-}
-
-void wxObjectRuntimeReaderCallback::AllocateObject(int objectID, wxClassInfo *classInfo,
-                                          wxStringToAnyHashMap &WXUNUSED(metadata))
-{
-    wxObject *O;
-    O = classInfo->CreateObject();
-    m_data->SetObject(objectID, O);
-}
-
-void wxObjectRuntimeReaderCallback::CreateObject(int objectID,
-                                        const wxClassInfo *classInfo,
-                                        int paramCount,
-                                        wxAny *params,
-                                        int *objectIdValues,
-                                        const wxClassInfo **objectClassInfos,
-                                        wxStringToAnyHashMap &WXUNUSED(metadata))
-{
-    wxObject *o;
-    o = m_data->GetObject(objectID);
-    for ( int i = 0; i < paramCount; ++i )
-    {
-        if ( objectIdValues[i] != wxInvalidObjectID )
-        {
-            wxObject *o;
-            o = m_data->GetObject(objectIdValues[i]);
-            // if this is a dynamic object and we are asked for another class
-            // than wxDynamicObject we cast it down manually.
-            wxDynamicObject *dyno = wx_dynamic_cast( wxDynamicObject *, o);
-            if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) )
-            {
-                o = dyno->GetSuperClassInstance();
-            }
-            params[i] = objectClassInfos[i]->ObjectPtrToAny(o);
-        }
-    }
-    classInfo->Create(o, paramCount, params);
-}
-
-void wxObjectRuntimeReaderCallback::ConstructObject(int objectID,
-                                        const wxClassInfo *classInfo,
-                                        int paramCount,
-                                        wxAny *params,
-                                        int *objectIdValues,
-                                        const wxClassInfo **objectClassInfos,
-                                        wxStringToAnyHashMap &WXUNUSED(metadata))
-{
-    wxObject *o;
-    for ( int i = 0; i < paramCount; ++i )
-    {
-        if ( objectIdValues[i] != wxInvalidObjectID )
-        {
-            wxObject *o;
-            o = m_data->GetObject(objectIdValues[i]);
-            // if this is a dynamic object and we are asked for another class
-            // than wxDynamicObject we cast it down manually.
-            wxDynamicObject *dyno = wx_dynamic_cast( wxDynamicObject *, o);
-            if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) )
-            {
-                o = dyno->GetSuperClassInstance();
-            }
-            params[i] = objectClassInfos[i]->ObjectPtrToAny(o);
-        }
-    }
-    o = classInfo->ConstructObject(paramCount, params);
-    m_data->SetObject(objectID, o);
-}
-
-
-void wxObjectRuntimeReaderCallback::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
-{
-    wxObject *o;
-    o = m_data->GetObject(objectID);
-    delete o;
-}
-
-void wxObjectRuntimeReaderCallback::SetProperty(int objectID,
-                                       const wxClassInfo *classInfo,
-                                       const wxPropertyInfo* propertyInfo,
-                                       const wxAny &value)
-{
-    wxObject *o;
-    o = m_data->GetObject(objectID);
-    classInfo->SetProperty( o, propertyInfo->GetName().c_str(), value );
-}
-
-void wxObjectRuntimeReaderCallback::SetPropertyAsObject(int objectID,
-                                               const wxClassInfo *classInfo,
-                                               const wxPropertyInfo* propertyInfo,
-                                               int valueObjectId)
-{
-    wxObject *o, *valo;
-    o = m_data->GetObject(objectID);
-    valo = m_data->GetObject(valueObjectId);
-    const wxClassInfo* valClassInfo = 
-        (wx_dynamic_cast(const wxClassTypeInfo*,propertyInfo->GetTypeInfo()))->GetClassInfo();
-
-    // if this is a dynamic object and we are asked for another class
-    // than wxDynamicObject we cast it down manually.
-    wxDynamicObject *dynvalo = wx_dynamic_cast( wxDynamicObject *, valo);
-    if ( dynvalo!=NULL  && (valClassInfo != dynvalo->GetClassInfo()) )
-    {
-        valo = dynvalo->GetSuperClassInstance();
-    }
-
-    classInfo->SetProperty( o, propertyInfo->GetName().c_str(),
-                            valClassInfo->ObjectPtrToAny(valo) );
-}
-
-void wxObjectRuntimeReaderCallback::SetConnect(int eventSourceObjectID,
-                                      const wxClassInfo *WXUNUSED(eventSourceClassInfo),
-                                      const wxPropertyInfo *delegateInfo,
-                                      const wxClassInfo *WXUNUSED(eventSinkClassInfo),
-                                      const wxHandlerInfo* handlerInfo,
-                                      int eventSinkObjectID )
-{
-    wxEvtHandler *ehsource = 
-        wx_dynamic_cast( wxEvtHandler* , m_data->GetObject( eventSourceObjectID ) );
-    wxEvtHandler *ehsink = 
-        wx_dynamic_cast( wxEvtHandler *,m_data->GetObject(eventSinkObjectID) );
-
-    if ( ehsource && ehsink )
-    {
-        const wxEventSourceTypeInfo *delegateTypeInfo = 
-            wx_dynamic_cast(const wxEventSourceTypeInfo*,delegateInfo->GetTypeInfo());
-        if( delegateTypeInfo && delegateTypeInfo->GetLastEventType() == -1 )
-        {
-            ehsource->Connect( -1, delegateTypeInfo->GetEventType(),
-                handlerInfo->GetEventFunction(), NULL /*user data*/,
-                ehsink );
-        }
-        else
-        {
-            for ( wxEventType iter = delegateTypeInfo->GetEventType(); 
-                  iter <= delegateTypeInfo->GetLastEventType(); ++iter )
-            {
-                ehsource->Connect( -1, iter,
-                    handlerInfo->GetEventFunction(), NULL /*user data*/,
-                    ehsink );
-            }
-        }
-    }
-}
-
-wxObject *wxObjectRuntimeReaderCallback::GetObject(int objectID)
-{
-    return m_data->GetObject( objectID );
-}
-
-void wxObjectRuntimeReaderCallback::AddToPropertyCollection( int objectID,
-                                                   const wxClassInfo *classInfo,
-                                                   const wxPropertyInfo* propertyInfo,
-                                                   const wxAny &value)
-{
-    wxObject *o;
-    o = m_data->GetObject(objectID);
-    classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(), value );
-}
-
-void wxObjectRuntimeReaderCallback::AddToPropertyCollectionAsObject(int objectID,
-                                                           const wxClassInfo *classInfo,
-                                                           const wxPropertyInfo* propertyInfo,
-                                                           int valueObjectId)
-{
-    wxObject *o, *valo;
-    o = m_data->GetObject(objectID);
-    valo = m_data->GetObject(valueObjectId);
-    const wxCollectionTypeInfo * collectionTypeInfo = 
-        wx_dynamic_cast( const wxCollectionTypeInfo *, propertyInfo->GetTypeInfo() );
-    const wxClassInfo* valClassInfo = 
-        (wx_dynamic_cast(const wxClassTypeInfo*,collectionTypeInfo->GetElementType()))->GetClassInfo();
-
-    // if this is a dynamic object and we are asked for another class
-    // than wxDynamicObject we cast it down manually.
-    wxDynamicObject *dynvalo = wx_dynamic_cast( wxDynamicObject *, valo);
-    if ( dynvalo!=NULL  && (valClassInfo != dynvalo->GetClassInfo()) )
-    {
-        valo = dynvalo->GetSuperClassInstance();
-    }
-
-    classInfo->AddToPropertyCollection( o, propertyInfo->GetName().c_str(),
-                                        valClassInfo->ObjectPtrToAny(valo) );
-}
-
-#endif // wxUSE_EXTENDED_RTTI
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/xtistrm.cpp
+// Purpose:     streaming runtime metadata information
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     27/07/03
+// RCS-ID:      $Id: xtistrm.cpp 38939 2006-04-27 12:47:14Z ABX $
+// Copyright:   (c) 2003 Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_EXTENDED_RTTI
+
+#include "wx/xtistrm.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/hash.h"
+    #include "wx/event.h"
+#endif
+
+#include "wx/tokenzr.h"
+#include "wx/txtstrm.h"
+
+#include "wx/beforestd.h"
+#include <map>
+#include <vector>
+#include <string>
+#include "wx/afterstd.h"
+
+using namespace std ;
+
+struct wxWriter::wxWriterInternal
+{
+    map< const wxObject* , int > m_writtenObjects ;
+    int m_nextId ;
+} ;
+
+wxWriter::wxWriter()
+{
+    m_data = new wxWriterInternal ;
+    m_data->m_nextId = 0 ;
+}
+
+wxWriter::~wxWriter()
+{
+    delete m_data ;
+}
+
+struct wxWriter::wxWriterInternalPropertiesData
+{
+    char nothing ;
+} ;
+
+void wxWriter::ClearObjectContext()
+{
+    delete m_data ;
+    m_data = new wxWriterInternal() ;
+    m_data->m_nextId = 0 ;
+}
+
+void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , const wxString &name , wxxVariantArray &metadata )
+{
+    DoBeginWriteTopLevelEntry( name ) ;
+    WriteObject( object , classInfo , persister , false , metadata) ;
+    DoEndWriteTopLevelEntry( name ) ;
+}
+
+void wxWriter::WriteObject(const wxObject *object, const wxClassInfo *classInfo , wxPersister *persister , bool isEmbedded, wxxVariantArray &metadata )
+{
+    if ( !classInfo->BeforeWriteObject( object , this , persister , metadata) )
+        return ;
+
+    if ( persister->BeforeWriteObject( this , object , classInfo , metadata) )
+    {
+        if ( object == NULL )
+            DoWriteNullObject() ;
+        else if ( IsObjectKnown( object ) )
+            DoWriteRepeatedObject( GetObjectID(object) ) ;
+        else
+        {
+            int oid = m_data->m_nextId++ ;
+            if ( !isEmbedded )
+                m_data->m_writtenObjects[object] = oid ;
+
+            // in case this object is a wxDynamicObject we also have to insert is superclass
+            // instance with the same id, so that object relations are streamed out correctly
+            const wxDynamicObject* dynobj = dynamic_cast<const wxDynamicObject *>( object ) ;
+            if ( !isEmbedded && dynobj )
+                m_data->m_writtenObjects[dynobj->GetSuperClassInstance()] = oid ;
+
+            DoBeginWriteObject( object , classInfo , oid , metadata ) ;
+            wxWriterInternalPropertiesData data ;
+            WriteAllProperties( object , classInfo , persister , &data ) ;
+            DoEndWriteObject( object , classInfo , oid  ) ;
+        }
+        persister->AfterWriteObject( this ,object , classInfo ) ;
+    }
+}
+
+void wxWriter::FindConnectEntry(const wxEvtHandler * evSource,const wxDelegateTypeInfo* dti, const wxObject* &sink , const wxHandlerInfo *&handler)
+{
+    wxList *dynamicEvents = evSource->GetDynamicEventTable() ;
+
+    if ( dynamicEvents )
+    {
+        wxList::compatibility_iterator node = dynamicEvents->GetFirst();
+        while (node)
+        {
+            wxDynamicEventTableEntry *entry = (wxDynamicEventTableEntry*)node->GetData();
+
+            // find the match
+            if ( entry->m_fn &&
+                (dti->GetEventType() == entry->m_eventType) &&
+                (entry->m_id == -1 ) &&
+                (entry->m_eventSink != NULL ) )
+            {
+                sink = entry->m_eventSink ;
+                const wxClassInfo* sinkClassInfo = sink->GetClassInfo() ;
+                const wxHandlerInfo* sinkHandler = sinkClassInfo->GetFirstHandler() ;
+                while ( sinkHandler )
+                {
+                    if ( sinkHandler->GetEventFunction() == entry->m_fn )
+                    {
+                        handler = sinkHandler ;
+                        break ;
+                    }
+                    sinkHandler = sinkHandler->GetNext() ;
+                }
+                break ;
+            }
+            node = node->GetNext();
+        }
+    }
+}
+void wxWriter::WriteAllProperties( const wxObject * obj , const wxClassInfo* ci , wxPersister *persister, wxWriterInternalPropertiesData * data )
+{
+    wxPropertyInfoMap map ;
+    ci->GetProperties( map ) ;
+    for ( int i = 0 ; i < ci->GetCreateParamCount() ; ++i )
+    {
+        wxString name = ci->GetCreateParamName(i) ;
+        const wxPropertyInfo* prop = map.find(name)->second ;
+        if ( prop )
+        {
+            WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+        }
+        else
+        {
+            wxLogError( _("Create Parameter not found in declared RTTI Parameters") ) ;
+        }
+        map.erase( name ) ;
+    }
+    { // Extra block for broken compilers
+        for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter )
+        {
+            const wxPropertyInfo* prop = iter->second ;
+            if ( prop->GetFlags() & wxPROP_OBJECT_GRAPH )
+            {
+                WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+            }
+        }
+    }
+    { // Extra block for broken compilers
+        for( wxPropertyInfoMap::iterator iter = map.begin() ; iter != map.end() ; ++iter )
+        {
+            const wxPropertyInfo* prop = iter->second ;
+            if ( !(prop->GetFlags() & wxPROP_OBJECT_GRAPH) )
+            {
+                WriteOneProperty( obj , prop->GetDeclaringClass() , prop , persister , data ) ;
+            }
+        }
+    }
+}
+
+void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , const wxPropertyInfo* pi , wxPersister *persister , wxWriterInternalPropertiesData *WXUNUSED(data) )
+{
+    if ( pi->GetFlags() & wxPROP_DONT_STREAM )
+        return ;
+
+    // make sure that we are picking the correct object for accessing the property
+    const wxDynamicObject* dynobj = dynamic_cast< const wxDynamicObject* > (obj ) ;
+    if ( dynobj && (dynamic_cast<const wxDynamicClassInfo*>(ci) == NULL) )
+        obj = dynobj->GetSuperClassInstance() ;
+
+    if ( pi->GetTypeInfo()->GetKind() == wxT_COLLECTION )
+    {
+        wxxVariantArray data ;
+        pi->GetAccessor()->GetPropertyCollection(obj, data) ;
+        const wxTypeInfo * elementType = dynamic_cast< const wxCollectionTypeInfo* >( pi->GetTypeInfo() )->GetElementType() ;
+        for ( size_t i = 0 ; i < data.GetCount() ; ++i )
+        {
+            if ( i == 0 )
+                DoBeginWriteProperty( pi ) ;
+
+            DoBeginWriteElement() ;
+            wxxVariant value = data[i] ;
+            if ( persister->BeforeWriteProperty( this , obj, pi , value ) )
+            {
+                const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( elementType ) ;
+                if ( cti )
+                {
+                    const wxClassInfo* pci = cti->GetClassInfo() ;
+                    wxObject *vobj = pci->VariantToInstance( value ) ;
+                    wxxVariantArray md ;
+                    WriteObject( vobj , (vobj ? vobj->GetClassInfo() : pci ) , persister , cti->GetKind()== wxT_OBJECT , md ) ;
+                }
+                else
+                {
+                    DoWriteSimpleType( value ) ;
+                }
+            }
+            DoEndWriteElement() ;
+            if ( i == data.GetCount() - 1 )
+                 DoEndWriteProperty( pi ) ;
+       }
+   }
+    else
+    {
+        const wxDelegateTypeInfo* dti = dynamic_cast< const wxDelegateTypeInfo* > ( pi->GetTypeInfo() ) ;
+        if ( dti )
+        {
+            const wxObject* sink = NULL ;
+            const wxHandlerInfo *handler = NULL ;
+
+            const wxEvtHandler * evSource = dynamic_cast<const wxEvtHandler *>(obj) ;
+            if ( evSource )
+            {
+                FindConnectEntry( evSource , dti , sink , handler ) ;
+                if ( persister->BeforeWriteDelegate( this , obj , ci , pi , sink , handler ) )
+                {
+                    if ( sink != NULL && handler != NULL )
+                    {
+                        DoBeginWriteProperty( pi ) ;
+                        if ( IsObjectKnown( sink ) )
+                        {
+                            DoWriteDelegate( obj , ci , pi , sink , GetObjectID( sink ) , sink->GetClassInfo() , handler ) ;
+                            DoEndWriteProperty( pi ) ;
+                        }
+                        else
+                        {
+                            wxLogError( _("Streaming delegates for not already streamed objects not yet supported") ) ;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                wxLogError(_("Illegal Object Class (Non-wxEvtHandler) as Event Source") ) ;
+            }
+        }
+        else
+        {
+            wxxVariant value ;
+            pi->GetAccessor()->GetProperty(obj, value) ;
+
+            // avoid streaming out void objects
+            if( value.IsEmpty() )
+                return ;
+
+            if ( pi->GetFlags() & wxPROP_ENUM_STORE_LONG )
+            {
+                const wxEnumTypeInfo *eti = dynamic_cast<const wxEnumTypeInfo*>( pi->GetTypeInfo() ) ;
+                if ( eti )
+                {
+                    eti->ConvertFromLong( value.wxTEMPLATED_MEMBER_CALL(Get , long) , value ) ;
+                }
+                else
+                {
+                    wxLogError( _("Type must have enum - long conversion") ) ;
+                }
+            }
+
+            // avoid streaming out default values
+            if ( pi->GetTypeInfo()->HasStringConverters() && !pi->GetDefaultValue().IsEmpty() )
+            {
+                if ( value.GetAsString() == pi->GetDefaultValue().GetAsString() )
+                    return ;
+            }
+
+            // avoid streaming out null objects
+            const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ;
+
+            if ( cti && value.GetAsObject() == NULL )
+                return ;
+
+            if ( persister->BeforeWriteProperty( this , obj, pi , value ) )
+            {
+                DoBeginWriteProperty( pi ) ;
+                if ( cti )
+                {
+                    const wxClassInfo* pci = cti->GetClassInfo() ;
+                    wxObject *vobj = pci->VariantToInstance( value ) ;
+                    if ( vobj && pi->GetTypeInfo()->HasStringConverters() )
+                    {
+                        wxString stringValue ;
+                        cti->ConvertToString( value , stringValue ) ;
+                        wxxVariant convertedValue(stringValue) ;
+                        DoWriteSimpleType( convertedValue ) ;
+                    }
+                    else
+                    {
+                        wxxVariantArray md ;
+                        WriteObject( vobj , (vobj ? vobj->GetClassInfo() : pci ) , persister , cti->GetKind()== wxT_OBJECT , md) ;
+                    }
+                }
+                else
+                {
+                    DoWriteSimpleType( value ) ;
+                }
+                DoEndWriteProperty( pi ) ;
+            }
+        }
+    }
+}
+
+int wxWriter::GetObjectID(const wxObject *obj)
+{
+    if ( !IsObjectKnown( obj ) )
+        return wxInvalidObjectID ;
+
+    return m_data->m_writtenObjects[obj] ;
+}
+
+bool wxWriter::IsObjectKnown( const wxObject *obj )
+{
+    return m_data->m_writtenObjects.find( obj ) != m_data->m_writtenObjects.end() ;
+}
+
+
+// ----------------------------------------------------------------------------
+// reading objects in
+// ----------------------------------------------------------------------------
+
+struct wxReader::wxReaderInternal
+{
+    map<int,wxClassInfo*> m_classInfos;
+};
+
+wxReader::wxReader()
+{
+    m_data = new wxReaderInternal;
+}
+
+wxReader::~wxReader()
+{
+    delete m_data;
+}
+
+wxClassInfo* wxReader::GetObjectClassInfo(int objectID)
+{
+    if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+    {
+        wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ) ;
+        return NULL ;
+    }
+    if ( m_data->m_classInfos.find(objectID) == m_data->m_classInfos.end() )
+    {
+        wxLogError( _("Unknown Object passed to GetObjectClassInfo" ) ) ;
+        return NULL ;
+    }
+    return m_data->m_classInfos[objectID] ;
+}
+
+void wxReader::SetObjectClassInfo(int objectID, wxClassInfo *classInfo )
+{
+    if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+    {
+        wxLogError( _("Invalid or Null Object ID passed to GetObjectClassInfo" ) ) ;
+        return ;
+    }
+    if ( m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() )
+    {
+        wxLogError( _("Already Registered Object passed to SetObjectClassInfo" ) ) ;
+        return ;
+    }
+    m_data->m_classInfos[objectID] = classInfo ;
+}
+
+bool wxReader::HasObjectClassInfo( int objectID )
+{
+    if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
+    {
+        wxLogError( _("Invalid or Null Object ID passed to HasObjectClassInfo" ) ) ;
+        return NULL ;
+    }
+    return m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ;
+}
+
+
+// ----------------------------------------------------------------------------
+// reading xml in
+// ----------------------------------------------------------------------------
+
+/*
+Reading components has not to be extended for components
+as properties are always sought by typeinfo over all levels
+and create params are always toplevel class only
+*/
+
+
+// ----------------------------------------------------------------------------
+// depersisting to memory
+// ----------------------------------------------------------------------------
+
+struct wxRuntimeDepersister::wxRuntimeDepersisterInternal
+{
+    map<int,wxObject *> m_objects;
+
+    void SetObject(int objectID, wxObject *obj )
+    {
+        if ( m_objects.find(objectID) != m_objects.end() )
+        {
+            wxLogError( _("Passing a already registered object to SetObject") ) ;
+            return  ;
+        }
+        m_objects[objectID] = obj ;
+    }
+    wxObject* GetObject( int objectID )
+    {
+        if ( objectID == wxNullObjectID )
+            return NULL ;
+        if ( m_objects.find(objectID) == m_objects.end() )
+        {
+            wxLogError( _("Passing an unkown object to GetObject") ) ;
+            return NULL ;
+        }
+
+        return m_objects[objectID] ;
+    }
+} ;
+
+wxRuntimeDepersister::wxRuntimeDepersister()
+{
+    m_data = new wxRuntimeDepersisterInternal() ;
+}
+
+wxRuntimeDepersister::~wxRuntimeDepersister()
+{
+    delete m_data ;
+}
+
+void wxRuntimeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo ,
+                                          wxxVariantArray &WXUNUSED(metadata))
+{
+    wxObject *O;
+    O = classInfo->CreateObject();
+    m_data->SetObject(objectID, O);
+}
+
+void wxRuntimeDepersister::CreateObject(int objectID,
+                                        const wxClassInfo *classInfo,
+                                        int paramCount,
+                                        wxxVariant *params,
+                                        int *objectIdValues,
+                                        const wxClassInfo **objectClassInfos ,
+                                        wxxVariantArray &WXUNUSED(metadata))
+{
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    for ( int i = 0 ; i < paramCount ; ++i )
+    {
+        if ( objectIdValues[i] != wxInvalidObjectID )
+        {
+            wxObject *o;
+            o = m_data->GetObject(objectIdValues[i]);
+            // if this is a dynamic object and we are asked for another class
+            // than wxDynamicObject we cast it down manually.
+            wxDynamicObject *dyno = dynamic_cast< wxDynamicObject * > (o) ;
+            if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) )
+            {
+                o = dyno->GetSuperClassInstance() ;
+            }
+            params[i] = objectClassInfos[i]->InstanceToVariant(o) ;
+        }
+    }
+    classInfo->Create(o, paramCount, params);
+}
+
+void wxRuntimeDepersister::ConstructObject(int objectID,
+                                        const wxClassInfo *classInfo,
+                                        int paramCount,
+                                        wxxVariant *params,
+                                        int *objectIdValues,
+                                        const wxClassInfo **objectClassInfos ,
+                                        wxxVariantArray &WXUNUSED(metadata))
+{
+    wxObject *o;
+    for ( int i = 0 ; i < paramCount ; ++i )
+    {
+        if ( objectIdValues[i] != wxInvalidObjectID )
+        {
+            wxObject *o;
+            o = m_data->GetObject(objectIdValues[i]);
+            // if this is a dynamic object and we are asked for another class
+            // than wxDynamicObject we cast it down manually.
+            wxDynamicObject *dyno = dynamic_cast< wxDynamicObject * > (o) ;
+            if ( dyno!=NULL && (objectClassInfos[i] != dyno->GetClassInfo()) )
+            {
+                o = dyno->GetSuperClassInstance() ;
+            }
+            params[i] = objectClassInfos[i]->InstanceToVariant(o) ;
+        }
+    }
+    o = classInfo->ConstructObject(paramCount, params);
+    m_data->SetObject(objectID, o);
+}
+
+
+void wxRuntimeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
+{
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    delete o ;
+}
+
+void wxRuntimeDepersister::SetProperty(int objectID,
+                                       const wxClassInfo *classInfo,
+                                       const wxPropertyInfo* propertyInfo,
+                                       const wxxVariant &value)
+{
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    classInfo->SetProperty( o , propertyInfo->GetName() , value ) ;
+}
+
+void wxRuntimeDepersister::SetPropertyAsObject(int objectID,
+                                               const wxClassInfo *classInfo,
+                                               const wxPropertyInfo* propertyInfo,
+                                               int valueObjectId)
+{
+    wxObject *o, *valo;
+    o = m_data->GetObject(objectID);
+    valo = m_data->GetObject(valueObjectId);
+    const wxClassInfo* valClassInfo = (dynamic_cast<const wxClassTypeInfo*>(propertyInfo->GetTypeInfo()))->GetClassInfo() ;
+    // if this is a dynamic object and we are asked for another class
+    // than wxDynamicObject we cast it down manually.
+    wxDynamicObject *dynvalo = dynamic_cast< wxDynamicObject * > (valo) ;
+    if ( dynvalo!=NULL  && (valClassInfo != dynvalo->GetClassInfo()) )
+    {
+        valo = dynvalo->GetSuperClassInstance() ;
+    }
+
+    classInfo->SetProperty( o , propertyInfo->GetName() , valClassInfo->InstanceToVariant(valo) ) ;
+}
+
+void wxRuntimeDepersister::SetConnect(int eventSourceObjectID,
+                                      const wxClassInfo *WXUNUSED(eventSourceClassInfo),
+                                      const wxPropertyInfo *delegateInfo ,
+                                      const wxClassInfo *WXUNUSED(eventSinkClassInfo) ,
+                                      const wxHandlerInfo* handlerInfo ,
+                                      int eventSinkObjectID )
+{
+    wxEvtHandler *ehsource = dynamic_cast< wxEvtHandler* >( m_data->GetObject( eventSourceObjectID ) ) ;
+    wxEvtHandler *ehsink = dynamic_cast< wxEvtHandler *>(m_data->GetObject(eventSinkObjectID) ) ;
+
+    if ( ehsource && ehsink )
+    {
+        const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<const wxDelegateTypeInfo*>(delegateInfo->GetTypeInfo());
+        if( delegateTypeInfo && delegateTypeInfo->GetLastEventType() == -1 )
+        {
+            ehsource->Connect( -1 , delegateTypeInfo->GetEventType() ,
+                handlerInfo->GetEventFunction() , NULL /*user data*/ ,
+                ehsink ) ;
+        }
+        else
+        {
+            for ( wxEventType iter = delegateTypeInfo->GetEventType() ; iter <= delegateTypeInfo->GetLastEventType() ; ++iter )
+            {
+                ehsource->Connect( -1 , iter ,
+                    handlerInfo->GetEventFunction() , NULL /*user data*/ ,
+                    ehsink ) ;
+            }
+        }
+    }
+}
+
+wxObject *wxRuntimeDepersister::GetObject(int objectID)
+{
+    return m_data->GetObject( objectID ) ;
+}
+
+// adds an element to a property collection
+void wxRuntimeDepersister::AddToPropertyCollection( int objectID ,
+                                                   const wxClassInfo *classInfo,
+                                                   const wxPropertyInfo* propertyInfo ,
+                                                   const wxxVariant &value)
+{
+    wxObject *o;
+    o = m_data->GetObject(objectID);
+    classInfo->AddToPropertyCollection( o , propertyInfo->GetName() , value ) ;
+}
+
+// sets the corresponding property (value is an object)
+void wxRuntimeDepersister::AddToPropertyCollectionAsObject(int objectID,
+                                                           const wxClassInfo *classInfo,
+                                                           const wxPropertyInfo* propertyInfo ,
+                                                           int valueObjectId)
+{
+    wxObject *o, *valo;
+    o = m_data->GetObject(objectID);
+    valo = m_data->GetObject(valueObjectId);
+    const wxCollectionTypeInfo * collectionTypeInfo = dynamic_cast< const wxCollectionTypeInfo * >(propertyInfo->GetTypeInfo() ) ;
+    const wxClassInfo* valClassInfo = (dynamic_cast<const wxClassTypeInfo*>(collectionTypeInfo->GetElementType()))->GetClassInfo() ;
+    // if this is a dynamic object and we are asked for another class
+    // than wxDynamicObject we cast it down manually.
+    wxDynamicObject *dynvalo = dynamic_cast< wxDynamicObject * > (valo) ;
+    if ( dynvalo!=NULL  && (valClassInfo != dynvalo->GetClassInfo()) )
+    {
+        valo = dynvalo->GetSuperClassInstance() ;
+    }
+
+    classInfo->AddToPropertyCollection( o , propertyInfo->GetName() , valClassInfo->InstanceToVariant(valo) ) ;
+}
+
+// ----------------------------------------------------------------------------
+// depersisting to code
+// ----------------------------------------------------------------------------
+
+struct wxCodeDepersister::wxCodeDepersisterInternal
+{
+#if wxUSE_UNICODE
+    map<int,wstring> m_objectNames ;
+#else
+    map<int,string> m_objectNames ;
+#endif
+
+    void SetObjectName(int objectID, const wxString &name )
+    {
+        if ( m_objectNames.find(objectID) != m_objectNames.end() )
+        {
+            wxLogError( _("Passing a already registered object to SetObjectName") ) ;
+            return  ;
+        }
+        m_objectNames[objectID] = (const wxChar *)name;
+    }
+
+    wxString GetObjectName( int objectID )
+    {
+        if ( objectID == wxNullObjectID )
+            return wxT("NULL") ;
+
+        if ( m_objectNames.find(objectID) == m_objectNames.end() )
+        {
+            wxLogError( _("Passing an unkown object to GetObject") ) ;
+            return wxEmptyString ;
+        }
+        return wxString( m_objectNames[objectID].c_str() ) ;
+    }
+} ;
+
+wxCodeDepersister::wxCodeDepersister(wxTextOutputStream *out)
+: m_fp(out)
+{
+    m_data = new wxCodeDepersisterInternal ;
+}
+
+wxCodeDepersister::~wxCodeDepersister()
+{
+    delete m_data ;
+}
+
+void wxCodeDepersister::AllocateObject(int objectID, wxClassInfo *classInfo ,
+                                       wxxVariantArray &WXUNUSED(metadata))
+{
+    wxString objectName = wxString::Format( wxT("LocalObject_%d") , objectID ) ;
+    m_fp->WriteString( wxString::Format( wxT("\t%s *%s = new %s;\n"),
+        classInfo->GetClassName(),
+        objectName.c_str(),
+        classInfo->GetClassName()) );
+    m_data->SetObjectName( objectID , objectName ) ;
+}
+
+void wxCodeDepersister::DestroyObject(int objectID, wxClassInfo *WXUNUSED(classInfo))
+{
+    m_fp->WriteString( wxString::Format( wxT("\tdelete %s;\n"),
+        m_data->GetObjectName( objectID).c_str() ) );
+}
+
+wxString wxCodeDepersister::ValueAsCode( const wxxVariant &param )
+{
+    wxString value ;
+    const wxTypeInfo* type = param.GetTypeInfo() ;
+    if ( type->GetKind() == wxT_CUSTOM )
+    {
+        const wxCustomTypeInfo* cti = dynamic_cast<const wxCustomTypeInfo*>(type) ;
+        if ( cti )
+        {
+            value.Printf( wxT("%s(%s)"), cti->GetTypeName().c_str(),param.GetAsString().c_str() );
+        }
+        else
+        {
+            wxLogError ( _("Internal error, illegal wxCustomTypeInfo") ) ;
+        }
+    }
+    else if ( type->GetKind() == wxT_STRING )
+    {
+        value.Printf( wxT("\"%s\""),param.GetAsString().c_str() );
+    }
+    else
+    {
+        value.Printf( wxT("%s"), param.GetAsString().c_str() );
+    }
+    return value ;
+}
+
+void wxCodeDepersister::CreateObject(int objectID,
+                                     const wxClassInfo *WXUNUSED(classInfo),
+                                     int paramCount,
+                                     wxxVariant *params,
+                                     int *objectIDValues,
+                                     const wxClassInfo **WXUNUSED(objectClassInfos) ,
+                                     wxxVariantArray &WXUNUSED(metadata)
+                                     )
+{
+    int i;
+    m_fp->WriteString( wxString::Format( wxT("\t%s->Create("), m_data->GetObjectName(objectID).c_str() ) );
+    for (i = 0; i < paramCount; i++)
+    {
+        if ( objectIDValues[i] != wxInvalidObjectID )
+            m_fp->WriteString( wxString::Format( wxT("%s"), m_data->GetObjectName( objectIDValues[i] ).c_str() ) );
+        else
+        {
+            m_fp->WriteString( wxString::Format( wxT("%s"), ValueAsCode(params[i]).c_str() ) );
+        }
+        if (i < paramCount - 1)
+            m_fp->WriteString( wxT(", "));
+    }
+    m_fp->WriteString( wxT(");\n") );
+}
+
+void wxCodeDepersister::ConstructObject(int objectID,
+                                     const wxClassInfo *classInfo,
+                                     int paramCount,
+                                     wxxVariant *params,
+                                     int *objectIDValues,
+                                     const wxClassInfo **WXUNUSED(objectClassInfos) ,
+                                     wxxVariantArray &WXUNUSED(metadata)
+                                     )
+{
+    wxString objectName = wxString::Format( wxT("LocalObject_%d") , objectID ) ;
+    m_fp->WriteString( wxString::Format( wxT("\t%s *%s = new %s("),
+        classInfo->GetClassName(),
+        objectName.c_str(),
+        classInfo->GetClassName()) );
+    m_data->SetObjectName( objectID , objectName ) ;
+
+    int i;
+    for (i = 0; i < paramCount; i++)
+    {
+        if ( objectIDValues[i] != wxInvalidObjectID )
+            m_fp->WriteString( wxString::Format( wxT("%s"), m_data->GetObjectName( objectIDValues[i] ).c_str() ) );
+        else
+        {
+            m_fp->WriteString( wxString::Format( wxT("%s"), ValueAsCode(params[i]).c_str() ) );
+        }
+        if (i < paramCount - 1)
+            m_fp->WriteString( wxT(", ") );
+    }
+    m_fp->WriteString( wxT(");\n") );
+}
+
+void wxCodeDepersister::SetProperty(int objectID,
+                                    const wxClassInfo *WXUNUSED(classInfo),
+                                    const wxPropertyInfo* propertyInfo,
+                                    const wxxVariant &value)
+{
+    m_fp->WriteString( wxString::Format( wxT("\t%s->%s(%s);\n"),
+        m_data->GetObjectName(objectID).c_str(),
+        propertyInfo->GetAccessor()->GetSetterName().c_str(),
+        ValueAsCode(value).c_str()) );
+}
+
+void wxCodeDepersister::SetPropertyAsObject(int objectID,
+                                            const wxClassInfo *WXUNUSED(classInfo),
+                                            const wxPropertyInfo* propertyInfo,
+                                            int valueObjectId)
+{
+    if ( propertyInfo->GetTypeInfo()->GetKind() == wxT_OBJECT )
+        m_fp->WriteString( wxString::Format( wxT("\t%s->%s(*%s);\n"),
+        m_data->GetObjectName(objectID).c_str(),
+        propertyInfo->GetAccessor()->GetSetterName().c_str(),
+        m_data->GetObjectName( valueObjectId).c_str() ) );
+    else
+        m_fp->WriteString( wxString::Format( wxT("\t%s->%s(%s);\n"),
+        m_data->GetObjectName(objectID).c_str(),
+        propertyInfo->GetAccessor()->GetSetterName().c_str(),
+        m_data->GetObjectName( valueObjectId).c_str() ) );
+}
+
+void wxCodeDepersister::AddToPropertyCollection( int objectID ,
+                                                const wxClassInfo *WXUNUSED(classInfo),
+                                                const wxPropertyInfo* propertyInfo ,
+                                                const wxxVariant &value)
+{
+    m_fp->WriteString( wxString::Format( wxT("\t%s->%s(%s);\n"),
+        m_data->GetObjectName(objectID).c_str(),
+        propertyInfo->GetAccessor()->GetAdderName().c_str(),
+        ValueAsCode(value).c_str()) );
+}
+
+// sets the corresponding property (value is an object)
+void wxCodeDepersister::AddToPropertyCollectionAsObject(int WXUNUSED(objectID),
+                                                        const wxClassInfo *WXUNUSED(classInfo),
+                                                        const wxPropertyInfo* WXUNUSED(propertyInfo) ,
+                                                        int WXUNUSED(valueObjectId))
+{
+    // TODO
+}
+
+void wxCodeDepersister::SetConnect(int eventSourceObjectID,
+                                   const wxClassInfo *WXUNUSED(eventSourceClassInfo),
+                                   const wxPropertyInfo *delegateInfo ,
+                                   const wxClassInfo *eventSinkClassInfo ,
+                                   const wxHandlerInfo* handlerInfo ,
+                                   int eventSinkObjectID )
+{
+    wxString ehsource = m_data->GetObjectName( eventSourceObjectID ) ;
+    wxString ehsink = m_data->GetObjectName(eventSinkObjectID) ;
+    wxString ehsinkClass = eventSinkClassInfo->GetClassName() ;
+    const wxDelegateTypeInfo *delegateTypeInfo = dynamic_cast<const wxDelegateTypeInfo*>(delegateInfo->GetTypeInfo());
+    if ( delegateTypeInfo )
+    {
+        int eventType = delegateTypeInfo->GetEventType() ;
+        wxString handlerName = handlerInfo->GetName() ;
+
+        m_fp->WriteString( wxString::Format(  wxT("\t%s->Connect( %s->GetId() , %d , (wxObjectEventFunction)(wxEventFunction) & %s::%s , NULL , %s ) ;") ,
+            ehsource.c_str() , ehsource.c_str() , eventType , ehsinkClass.c_str() , handlerName.c_str() , ehsink.c_str() ) );
+    }
+    else
+    {
+        wxLogError(_("delegate has no type info"));
+    }
+}
+
+#include "wx/arrimpl.cpp"
+
+WX_DEFINE_OBJARRAY(wxxVariantArray);
+
+#endif // wxUSE_EXTENDED_RTTI
diff --git a/Source/3rd Party/wx/src/common/zipstrm.cpp b/Source/3rd Party/wx/src/common/zipstrm.cpp
index 35eacef35..a77df8dc8 100644
--- a/Source/3rd Party/wx/src/common/zipstrm.cpp	
+++ b/Source/3rd Party/wx/src/common/zipstrm.cpp	
@@ -1,2439 +1,2425 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/zipstrm.cpp
-// Purpose:     Streams for Zip files
-// Author:      Mike Wetherell
-// RCS-ID:      $Id$
-// Copyright:   (c) Mike Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ZIPSTREAM
-
-#include "wx/zipstrm.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/hashmap.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-#endif
-
-#include "wx/datstrm.h"
-#include "wx/zstream.h"
-#include "wx/mstream.h"
-#include "wx/scopedptr.h"
-#include "wx/wfstream.h"
-#include "zlib.h"
-
-// value for the 'version needed to extract' field (20 means 2.0)
-enum {
-    VERSION_NEEDED_TO_EXTRACT = 20
-};
-
-// signatures for the various records (PKxx)
-enum {
-    CENTRAL_MAGIC = 0x02014b50,     // central directory record
-    LOCAL_MAGIC   = 0x04034b50,     // local header
-    END_MAGIC     = 0x06054b50,     // end of central directory record
-    SUMS_MAGIC    = 0x08074b50      // data descriptor (info-zip)
-};
-
-// unix file attributes. zip stores them in the high 16 bits of the
-// 'external attributes' field, hence the extra zeros.
-enum {
-    wxZIP_S_IFMT  = 0xF0000000,
-    wxZIP_S_IFDIR = 0x40000000,
-    wxZIP_S_IFREG = 0x80000000
-};
-
-// minimum sizes for the various records
-enum {
-    CENTRAL_SIZE  = 46,
-    LOCAL_SIZE    = 30,
-    END_SIZE      = 22,
-    SUMS_SIZE     = 12
-};
-
-// The number of bytes that must be written to an wxZipOutputStream before
-// a zip entry is created. The purpose of this latency is so that
-// OpenCompressor() can see a little data before deciding which compressor
-// it should use.
-enum {
-    OUTPUT_LATENCY = 4096
-};
-
-// Some offsets into the local header
-enum {
-    SUMS_OFFSET  = 14
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxZipEntry, wxArchiveEntry)
-IMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory)
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Helpers
-
-// read a string of a given length
-//
-static wxString ReadString(wxInputStream& stream, wxUint16 len, wxMBConv& conv)
-{
-    if (len == 0)
-        return wxEmptyString;
-
-#if wxUSE_UNICODE
-    wxCharBuffer buf(len);
-    stream.Read(buf.data(), len);
-    wxString str(buf, conv);
-#else
-    wxString str;
-    (void)conv;
-    {
-        wxStringBuffer buf(str, len);
-        stream.Read(buf, len);
-    }
-#endif
-
-    return str;
-}
-
-// Decode a little endian wxUint32 number from a character array
-//
-static inline wxUint32 CrackUint32(const char *m)
-{
-    const unsigned char *n = (const unsigned char*)m;
-    return (n[3] << 24) | (n[2] << 16) | (n[1] << 8) | n[0];
-}
-
-// Decode a little endian wxUint16 number from a character array
-//
-static inline wxUint16 CrackUint16(const char *m)
-{
-    const unsigned char *n = (const unsigned char*)m;
-    return (n[1] << 8) | n[0];
-}
-
-// Temporarily lower the logging level in debug mode to avoid a warning
-// from SeekI about seeking on a stream with data written back to it.
-//
-static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos)
-{
-#if wxUSE_LOG
-    wxLogLevel level = wxLog::GetLogLevel();
-    wxLog::SetLogLevel(wxLOG_Debug - 1);
-    wxFileOffset result = stream.SeekI(pos);
-    wxLog::SetLogLevel(level);
-    return result;
-#else
-    return stream.SeekI(pos);
-#endif
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Class factory
-
-static wxZipClassFactory g_wxZipClassFactory;
-
-wxZipClassFactory::wxZipClassFactory()
-{
-    if (this == &g_wxZipClassFactory)
-        PushFront();
-}
-
-const wxChar * const *
-wxZipClassFactory::GetProtocols(wxStreamProtocolType type) const
-{
-    static const wxChar *protocols[] = { wxT("zip"), NULL };
-    static const wxChar *mimetypes[] = { wxT("application/zip"), NULL };
-    static const wxChar *fileexts[]  = { wxT(".zip"), wxT(".htb"), NULL };
-    static const wxChar *empty[]     = { NULL };
-
-    switch (type) {
-        case wxSTREAM_PROTOCOL: return protocols;
-        case wxSTREAM_MIMETYPE: return mimetypes;
-        case wxSTREAM_FILEEXT:  return fileexts;
-        default:                return empty;
-    }
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Read a zip header
-
-class wxZipHeader
-{
-public:
-    wxZipHeader(wxInputStream& stream, size_t size);
-
-    inline wxUint8 Read8();
-    inline wxUint16 Read16();
-    inline wxUint32 Read32();
-
-    const char *GetData() const             { return m_data; }
-    size_t GetSize() const                  { return m_size; }
-    operator bool() const                   { return m_ok; }
-
-    size_t Seek(size_t pos)                 { m_pos = pos; return m_pos; }
-    size_t Skip(size_t size)                { m_pos += size; return m_pos; }
-
-    wxZipHeader& operator>>(wxUint8& n)     { n = Read8();  return *this; }
-    wxZipHeader& operator>>(wxUint16& n)    { n = Read16(); return *this; }
-    wxZipHeader& operator>>(wxUint32& n)    { n = Read32(); return *this; }
-
-private:
-    char m_data[64];
-    size_t m_size;
-    size_t m_pos;
-    bool m_ok;
-};
-
-wxZipHeader::wxZipHeader(wxInputStream& stream, size_t size)
-  : m_size(0),
-    m_pos(0),
-    m_ok(false)
-{
-    wxCHECK_RET(size <= sizeof(m_data), wxT("buffer too small"));
-    m_size = stream.Read(m_data, size).LastRead();
-    m_ok = m_size == size;
-}
-
-inline wxUint8 wxZipHeader::Read8()
-{
-    wxASSERT(m_pos < m_size);
-    return m_data[m_pos++];
-}
-
-inline wxUint16 wxZipHeader::Read16()
-{
-    wxASSERT(m_pos + 2 <= m_size);
-    wxUint16 n = CrackUint16(m_data + m_pos);
-    m_pos += 2;
-    return n;
-}
-
-inline wxUint32 wxZipHeader::Read32()
-{
-    wxASSERT(m_pos + 4 <= m_size);
-    wxUint32 n = CrackUint32(m_data + m_pos);
-    m_pos += 4;
-    return n;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Stored input stream
-// Trival decompressor for files which are 'stored' in the zip file.
-
-class wxStoredInputStream : public wxFilterInputStream
-{
-public:
-    wxStoredInputStream(wxInputStream& stream);
-
-    void Open(wxFileOffset len) { Close(); m_len = len; }
-    void Close() { m_pos = 0; m_lasterror = wxSTREAM_NO_ERROR; }
-
-    virtual char Peek() { return wxInputStream::Peek(); }
-    virtual wxFileOffset GetLength() const { return m_len; }
-
-protected:
-    virtual size_t OnSysRead(void *buffer, size_t size);
-    virtual wxFileOffset OnSysTell() const { return m_pos; }
-
-private:
-    wxFileOffset m_pos;
-    wxFileOffset m_len;
-
-    wxDECLARE_NO_COPY_CLASS(wxStoredInputStream);
-};
-
-wxStoredInputStream::wxStoredInputStream(wxInputStream& stream)
-  : wxFilterInputStream(stream),
-    m_pos(0),
-    m_len(0)
-{
-}
-
-size_t wxStoredInputStream::OnSysRead(void *buffer, size_t size)
-{
-    size_t count = wx_truncate_cast(size_t,
-                wxMin(size + wxFileOffset(0), m_len - m_pos + size_t(0)));
-    count = m_parent_i_stream->Read(buffer, count).LastRead();
-    m_pos += count;
-
-    if (count < size)
-        m_lasterror = m_pos == m_len ? wxSTREAM_EOF : wxSTREAM_READ_ERROR;
-
-    return count;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Stored output stream
-// Trival compressor for files which are 'stored' in the zip file.
-
-class wxStoredOutputStream : public wxFilterOutputStream
-{
-public:
-    wxStoredOutputStream(wxOutputStream& stream) :
-        wxFilterOutputStream(stream), m_pos(0) { }
-
-    bool Close() {
-        m_pos = 0;
-        m_lasterror = wxSTREAM_NO_ERROR;
-        return true;
-    }
-
-protected:
-    virtual size_t OnSysWrite(const void *buffer, size_t size);
-    virtual wxFileOffset OnSysTell() const { return m_pos; }
-
-private:
-    wxFileOffset m_pos;
-    wxDECLARE_NO_COPY_CLASS(wxStoredOutputStream);
-};
-
-size_t wxStoredOutputStream::OnSysWrite(const void *buffer, size_t size)
-{
-    if (!IsOk() || !size)
-        return 0;
-    size_t count = m_parent_o_stream->Write(buffer, size).LastWrite();
-    if (count != size)
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-    m_pos += count;
-    return count;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// wxRawInputStream
-//
-// Used to handle the unusal case of raw copying an entry of unknown
-// length. This can only happen when the zip being copied from is being
-// read from a non-seekable stream, and also was original written to a
-// non-seekable stream.
-//
-// In this case there's no option but to decompress the stream to find
-// it's length, but we can still write the raw compressed data to avoid the
-// compression overhead (which is the greater one).
-//
-// Usage is like this:
-//  m_rawin = new wxRawInputStream(*m_parent_i_stream);
-//  m_decomp = m_rawin->Open(OpenDecompressor(m_rawin->GetTee()));
-//
-// The wxRawInputStream owns a wxTeeInputStream object, the role of which
-// is something like the unix 'tee' command; it is a transparent filter, but
-// allows the data read to be read a second time via an extra method 'GetData'.
-//
-// The wxRawInputStream then draws data through the tee using a decompressor
-// then instead of returning the decompressed data, retuns the raw data
-// from wxTeeInputStream::GetData().
-
-class wxTeeInputStream : public wxFilterInputStream
-{
-public:
-    wxTeeInputStream(wxInputStream& stream);
-
-    size_t GetCount() const { return m_end - m_start; }
-    size_t GetData(char *buffer, size_t size);
-
-    void Open();
-    bool Final();
-
-    wxInputStream& Read(void *buffer, size_t size);
-
-protected:
-    virtual size_t OnSysRead(void *buffer, size_t size);
-    virtual wxFileOffset OnSysTell() const { return m_pos; }
-
-private:
-    wxFileOffset m_pos;
-    wxMemoryBuffer m_buf;
-    size_t m_start;
-    size_t m_end;
-
-    wxDECLARE_NO_COPY_CLASS(wxTeeInputStream);
-};
-
-wxTeeInputStream::wxTeeInputStream(wxInputStream& stream)
-  : wxFilterInputStream(stream),
-    m_pos(0), m_buf(8192), m_start(0), m_end(0)
-{
-}
-
-void wxTeeInputStream::Open()
-{
-    m_pos = m_start = m_end = 0;
-    m_lasterror = wxSTREAM_NO_ERROR;
-}
-
-bool wxTeeInputStream::Final()
-{
-    bool final = m_end == m_buf.GetDataLen();
-    m_end = m_buf.GetDataLen();
-    return final;
-}
-
-wxInputStream& wxTeeInputStream::Read(void *buffer, size_t size)
-{
-    size_t count = wxInputStream::Read(buffer, size).LastRead();
-    m_end = m_buf.GetDataLen();
-    m_buf.AppendData(buffer, count);
-    return *this;
-}
-
-size_t wxTeeInputStream::OnSysRead(void *buffer, size_t size)
-{
-    size_t count = m_parent_i_stream->Read(buffer, size).LastRead();
-    if (count < size)
-        m_lasterror = m_parent_i_stream->GetLastError();
-    return count;
-}
-
-size_t wxTeeInputStream::GetData(char *buffer, size_t size)
-{
-    if (m_wbacksize) {
-        size_t len = m_buf.GetDataLen();
-        len = len > m_wbacksize ? len - m_wbacksize : 0;
-        m_buf.SetDataLen(len);
-        if (m_end > len) {
-            wxFAIL; // we've already returned data that's now being ungot
-            m_end = len;
-        }
-        m_parent_i_stream->Reset();
-        m_parent_i_stream->Ungetch(m_wback, m_wbacksize);
-        free(m_wback);
-        m_wback = NULL;
-        m_wbacksize = 0;
-        m_wbackcur = 0;
-    }
-
-    if (size > GetCount())
-        size = GetCount();
-    if (size) {
-        memcpy(buffer, m_buf + m_start, size);
-        m_start += size;
-        wxASSERT(m_start <= m_end);
-    }
-
-    if (m_start == m_end && m_start > 0 && m_buf.GetDataLen() > 0) {
-        size_t len = m_buf.GetDataLen();
-        char *buf = (char*)m_buf.GetWriteBuf(len);
-        len -= m_end;
-        memmove(buf, buf + m_end, len);
-        m_buf.UngetWriteBuf(len);
-        m_start = m_end = 0;
-    }
-
-    return size;
-}
-
-class wxRawInputStream : public wxFilterInputStream
-{
-public:
-    wxRawInputStream(wxInputStream& stream);
-    virtual ~wxRawInputStream() { delete m_tee; }
-
-    wxInputStream* Open(wxInputStream *decomp);
-    wxInputStream& GetTee() const { return *m_tee; }
-
-protected:
-    virtual size_t OnSysRead(void *buffer, size_t size);
-    virtual wxFileOffset OnSysTell() const { return m_pos; }
-
-private:
-    wxFileOffset m_pos;
-    wxTeeInputStream *m_tee;
-
-    enum { BUFSIZE = 8192 };
-    wxCharBuffer m_dummy;
-
-    wxDECLARE_NO_COPY_CLASS(wxRawInputStream);
-};
-
-wxRawInputStream::wxRawInputStream(wxInputStream& stream)
-  : wxFilterInputStream(stream),
-    m_pos(0),
-    m_tee(new wxTeeInputStream(stream)),
-    m_dummy(BUFSIZE)
-{
-}
-
-wxInputStream *wxRawInputStream::Open(wxInputStream *decomp)
-{
-    if (decomp) {
-        m_parent_i_stream = decomp;
-        m_pos = 0;
-        m_lasterror = wxSTREAM_NO_ERROR;
-        m_tee->Open();
-        return this;
-    } else {
-        return NULL;
-    }
-}
-
-size_t wxRawInputStream::OnSysRead(void *buffer, size_t size)
-{
-    char *buf = (char*)buffer;
-    size_t count = 0;
-
-    while (count < size && IsOk())
-    {
-        while (m_parent_i_stream->IsOk() && m_tee->GetCount() == 0)
-            m_parent_i_stream->Read(m_dummy.data(), BUFSIZE);
-
-        size_t n = m_tee->GetData(buf + count, size - count);
-        count += n;
-
-        if (n == 0 && m_tee->Final())
-            m_lasterror = m_parent_i_stream->GetLastError();
-    }
-
-    m_pos += count;
-    return count;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Zlib streams than can be reused without recreating.
-
-class wxZlibOutputStream2 : public wxZlibOutputStream
-{
-public:
-    wxZlibOutputStream2(wxOutputStream& stream, int level) :
-        wxZlibOutputStream(stream, level, wxZLIB_NO_HEADER) { }
-
-    bool Open(wxOutputStream& stream);
-    bool Close() { DoFlush(true); m_pos = wxInvalidOffset; return IsOk(); }
-};
-
-bool wxZlibOutputStream2::Open(wxOutputStream& stream)
-{
-    wxCHECK(m_pos == wxInvalidOffset, false);
-
-    m_deflate->next_out = m_z_buffer;
-    m_deflate->avail_out = m_z_size;
-    m_pos = 0;
-    m_lasterror = wxSTREAM_NO_ERROR;
-    m_parent_o_stream = &stream;
-
-    if (deflateReset(m_deflate) != Z_OK) {
-        wxLogError(_("can't re-initialize zlib deflate stream"));
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-        return false;
-    }
-
-    return true;
-}
-
-class wxZlibInputStream2 : public wxZlibInputStream
-{
-public:
-    wxZlibInputStream2(wxInputStream& stream) :
-        wxZlibInputStream(stream, wxZLIB_NO_HEADER) { }
-
-    bool Open(wxInputStream& stream);
-};
-
-bool wxZlibInputStream2::Open(wxInputStream& stream)
-{
-    m_inflate->avail_in = 0;
-    m_pos = 0;
-    m_lasterror = wxSTREAM_NO_ERROR;
-    m_parent_i_stream = &stream;
-
-    if (inflateReset(m_inflate) != Z_OK) {
-        wxLogError(_("can't re-initialize zlib inflate stream"));
-        m_lasterror = wxSTREAM_READ_ERROR;
-        return false;
-    }
-
-    return true;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Class to hold wxZipEntry's Extra and LocalExtra fields
-
-class wxZipMemory
-{
-public:
-    wxZipMemory() : m_data(NULL), m_size(0), m_capacity(0), m_ref(1) { }
-
-    wxZipMemory *AddRef() { m_ref++; return this; }
-    void Release() { if (--m_ref == 0) delete this; }
-
-    char *GetData() const { return m_data; }
-    size_t GetSize() const { return m_size; }
-    size_t GetCapacity() const { return m_capacity; }
-
-    wxZipMemory *Unique(size_t size);
-
-private:
-    ~wxZipMemory() { delete [] m_data; }
-
-    char *m_data;
-    size_t m_size;
-    size_t m_capacity;
-    int m_ref;
-
-    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipMemory)
-};
-
-wxZipMemory *wxZipMemory::Unique(size_t size)
-{
-    wxZipMemory *zm;
-
-    if (m_ref > 1) {
-        --m_ref;
-        zm = new wxZipMemory;
-    } else {
-        zm = this;
-    }
-
-    if (zm->m_capacity < size) {
-        delete [] zm->m_data;
-        zm->m_data = new char[size];
-        zm->m_capacity = size;
-    }
-
-    zm->m_size = size;
-    return zm;
-}
-
-static inline wxZipMemory *AddRef(wxZipMemory *zm)
-{
-    if (zm)
-        zm->AddRef();
-    return zm;
-}
-
-static inline void Release(wxZipMemory *zm)
-{
-    if (zm)
-        zm->Release();
-}
-
-static void Copy(wxZipMemory*& dest, wxZipMemory *src)
-{
-    Release(dest);
-    dest = AddRef(src);
-}
-
-static void Unique(wxZipMemory*& zm, size_t size)
-{
-    if (!zm && size)
-        zm = new wxZipMemory;
-    if (zm)
-        zm = zm->Unique(size);
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Collection of weak references to entries
-
-WX_DECLARE_HASH_MAP(long, wxZipEntry*, wxIntegerHash,
-                    wxIntegerEqual, wxOffsetZipEntryMap_);
-
-class wxZipWeakLinks
-{
-public:
-    wxZipWeakLinks() : m_ref(1) { }
-
-    void Release(const wxZipInputStream* WXUNUSED(x))
-        { if (--m_ref == 0) delete this; }
-    void Release(wxFileOffset key)
-        { RemoveEntry(key); if (--m_ref == 0) delete this; }
-
-    wxZipWeakLinks *AddEntry(wxZipEntry *entry, wxFileOffset key);
-    void RemoveEntry(wxFileOffset key)
-        { m_entries.erase(wx_truncate_cast(key_type, key)); }
-    wxZipEntry *GetEntry(wxFileOffset key) const;
-    bool IsEmpty() const { return m_entries.empty(); }
-
-private:
-    ~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
-
-    typedef wxOffsetZipEntryMap_::key_type key_type;
-
-    int m_ref;
-    wxOffsetZipEntryMap_ m_entries;
-
-    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipWeakLinks)
-};
-
-wxZipWeakLinks *wxZipWeakLinks::AddEntry(wxZipEntry *entry, wxFileOffset key)
-{
-    m_entries[wx_truncate_cast(key_type, key)] = entry;
-    m_ref++;
-    return this;
-}
-
-wxZipEntry *wxZipWeakLinks::GetEntry(wxFileOffset key) const
-{
-    wxOffsetZipEntryMap_::const_iterator it =
-        m_entries.find(wx_truncate_cast(key_type, key));
-    return it != m_entries.end() ?  it->second : NULL;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// ZipEntry
-
-wxZipEntry::wxZipEntry(
-    const wxString& name /*=wxEmptyString*/,
-    const wxDateTime& dt /*=wxDateTime::Now()*/,
-    wxFileOffset size    /*=wxInvalidOffset*/)
-  :
-    m_SystemMadeBy(wxZIP_SYSTEM_MSDOS),
-    m_VersionMadeBy(wxMAJOR_VERSION * 10 + wxMINOR_VERSION),
-    m_VersionNeeded(VERSION_NEEDED_TO_EXTRACT),
-    m_Flags(0),
-    m_Method(wxZIP_METHOD_DEFAULT),
-    m_DateTime(dt),
-    m_Crc(0),
-    m_CompressedSize(wxInvalidOffset),
-    m_Size(size),
-    m_Key(wxInvalidOffset),
-    m_Offset(wxInvalidOffset),
-    m_DiskStart(0),
-    m_InternalAttributes(0),
-    m_ExternalAttributes(0),
-    m_Extra(NULL),
-    m_LocalExtra(NULL),
-    m_zipnotifier(NULL),
-    m_backlink(NULL)
-{
-    if (!name.empty())
-        SetName(name);
-}
-
-wxZipEntry::~wxZipEntry()
-{
-    if (m_backlink)
-        m_backlink->Release(m_Key);
-    Release(m_Extra);
-    Release(m_LocalExtra);
-}
-
-wxZipEntry::wxZipEntry(const wxZipEntry& e)
-  : wxArchiveEntry(e),
-    m_SystemMadeBy(e.m_SystemMadeBy),
-    m_VersionMadeBy(e.m_VersionMadeBy),
-    m_VersionNeeded(e.m_VersionNeeded),
-    m_Flags(e.m_Flags),
-    m_Method(e.m_Method),
-    m_DateTime(e.m_DateTime),
-    m_Crc(e.m_Crc),
-    m_CompressedSize(e.m_CompressedSize),
-    m_Size(e.m_Size),
-    m_Name(e.m_Name),
-    m_Key(e.m_Key),
-    m_Offset(e.m_Offset),
-    m_Comment(e.m_Comment),
-    m_DiskStart(e.m_DiskStart),
-    m_InternalAttributes(e.m_InternalAttributes),
-    m_ExternalAttributes(e.m_ExternalAttributes),
-    m_Extra(AddRef(e.m_Extra)),
-    m_LocalExtra(AddRef(e.m_LocalExtra)),
-    m_zipnotifier(NULL),
-    m_backlink(NULL)
-{
-}
-
-wxZipEntry& wxZipEntry::operator=(const wxZipEntry& e)
-{
-    if (&e != this) {
-        m_SystemMadeBy = e.m_SystemMadeBy;
-        m_VersionMadeBy = e.m_VersionMadeBy;
-        m_VersionNeeded = e.m_VersionNeeded;
-        m_Flags = e.m_Flags;
-        m_Method = e.m_Method;
-        m_DateTime = e.m_DateTime;
-        m_Crc = e.m_Crc;
-        m_CompressedSize = e.m_CompressedSize;
-        m_Size = e.m_Size;
-        m_Name = e.m_Name;
-        m_Key = e.m_Key;
-        m_Offset = e.m_Offset;
-        m_Comment = e.m_Comment;
-        m_DiskStart = e.m_DiskStart;
-        m_InternalAttributes = e.m_InternalAttributes;
-        m_ExternalAttributes = e.m_ExternalAttributes;
-        Copy(m_Extra, e.m_Extra);
-        Copy(m_LocalExtra, e.m_LocalExtra);
-        m_zipnotifier = NULL;
-        if (m_backlink) {
-            m_backlink->Release(m_Key);
-            m_backlink = NULL;
-        }
-    }
-    return *this;
-}
-
-wxString wxZipEntry::GetName(wxPathFormat format /*=wxPATH_NATIVE*/) const
-{
-    bool isDir = IsDir() && !m_Name.empty();
-
-    // optimisations for common (and easy) cases
-    switch (wxFileName::GetFormat(format)) {
-        case wxPATH_DOS:
-        {
-            wxString name(isDir ? m_Name + wxT("\\") : m_Name);
-            for (size_t i = 0; i < name.length(); i++)
-                if (name[i] == wxT('/'))
-                    name[i] = wxT('\\');
-            return name;
-        }
-
-        case wxPATH_UNIX:
-            return isDir ? m_Name + wxT("/") : m_Name;
-
-        default:
-            ;
-    }
-
-    wxFileName fn;
-
-    if (isDir)
-        fn.AssignDir(m_Name, wxPATH_UNIX);
-    else
-        fn.Assign(m_Name, wxPATH_UNIX);
-
-    return fn.GetFullPath(format);
-}
-
-// Static - Internally tars and zips use forward slashes for the path
-// separator, absolute paths aren't allowed, and directory names have a
-// trailing slash.  This function converts a path into this internal format,
-// but without a trailing slash for a directory.
-//
-wxString wxZipEntry::GetInternalName(const wxString& name,
-                                     wxPathFormat format /*=wxPATH_NATIVE*/,
-                                     bool *pIsDir        /*=NULL*/)
-{
-    wxString internal;
-
-    if (wxFileName::GetFormat(format) != wxPATH_UNIX)
-        internal = wxFileName(name, format).GetFullPath(wxPATH_UNIX);
-    else
-        internal = name;
-
-    bool isDir = !internal.empty() && internal.Last() == '/';
-    if (pIsDir)
-        *pIsDir = isDir;
-    if (isDir)
-        internal.erase(internal.length() - 1);
-
-    while (!internal.empty() && *internal.begin() == '/')
-        internal.erase(0, 1);
-    while (!internal.empty() && internal.compare(0, 2, wxT("./")) == 0)
-        internal.erase(0, 2);
-    if (internal == wxT(".") || internal == wxT(".."))
-        internal = wxEmptyString;
-
-    return internal;
-}
-
-void wxZipEntry::SetSystemMadeBy(int system)
-{
-    int mode = GetMode();
-    bool wasUnix = IsMadeByUnix();
-
-    m_SystemMadeBy = (wxUint8)system;
-
-    if (!wasUnix && IsMadeByUnix()) {
-        SetIsDir(IsDir());
-        SetMode(mode);
-    } else if (wasUnix && !IsMadeByUnix()) {
-        m_ExternalAttributes &= 0xffff;
-    }
-}
-
-void wxZipEntry::SetIsDir(bool isDir /*=true*/)
-{
-    if (isDir)
-        m_ExternalAttributes |= wxZIP_A_SUBDIR;
-    else
-        m_ExternalAttributes &= ~wxZIP_A_SUBDIR;
-
-    if (IsMadeByUnix()) {
-        m_ExternalAttributes &= ~wxZIP_S_IFMT;
-        if (isDir)
-            m_ExternalAttributes |= wxZIP_S_IFDIR;
-        else
-            m_ExternalAttributes |= wxZIP_S_IFREG;
-    }
-}
-
-// Return unix style permission bits
-//
-int wxZipEntry::GetMode() const
-{
-    // return unix permissions if present
-    if (IsMadeByUnix())
-        return (m_ExternalAttributes >> 16) & 0777;
-
-    // otherwise synthesize from the dos attribs
-    int mode = 0644;
-    if (m_ExternalAttributes & wxZIP_A_RDONLY)
-        mode &= ~0200;
-    if (m_ExternalAttributes & wxZIP_A_SUBDIR)
-        mode |= 0111;
-
-    return mode;
-}
-
-// Set unix permissions
-//
-void wxZipEntry::SetMode(int mode)
-{
-    // Set dos attrib bits to be compatible
-    if (mode & 0222)
-        m_ExternalAttributes &= ~wxZIP_A_RDONLY;
-    else
-        m_ExternalAttributes |= wxZIP_A_RDONLY;
-
-    // set the actual unix permission bits if the system type allows
-    if (IsMadeByUnix()) {
-        m_ExternalAttributes &= ~(0777L << 16);
-        m_ExternalAttributes |= (mode & 0777L) << 16;
-    }
-}
-
-const char *wxZipEntry::GetExtra() const
-{
-    return m_Extra ? m_Extra->GetData() : NULL;
-}
-
-size_t wxZipEntry::GetExtraLen() const
-{
-    return m_Extra ? m_Extra->GetSize() : 0;
-}
-
-void wxZipEntry::SetExtra(const char *extra, size_t len)
-{
-    Unique(m_Extra, len);
-    if (len)
-        memcpy(m_Extra->GetData(), extra, len);
-}
-
-const char *wxZipEntry::GetLocalExtra() const
-{
-    return m_LocalExtra ? m_LocalExtra->GetData() : NULL;
-}
-
-size_t  wxZipEntry::GetLocalExtraLen() const
-{
-    return m_LocalExtra ? m_LocalExtra->GetSize() : 0;
-}
-
-void wxZipEntry::SetLocalExtra(const char *extra, size_t len)
-{
-    Unique(m_LocalExtra, len);
-    if (len)
-        memcpy(m_LocalExtra->GetData(), extra, len);
-}
-
-void wxZipEntry::SetNotifier(wxZipNotifier& notifier)
-{
-    wxArchiveEntry::UnsetNotifier();
-    m_zipnotifier = &notifier;
-    m_zipnotifier->OnEntryUpdated(*this);
-}
-
-void wxZipEntry::Notify()
-{
-    if (m_zipnotifier)
-        m_zipnotifier->OnEntryUpdated(*this);
-    else if (GetNotifier())
-        GetNotifier()->OnEntryUpdated(*this);
-}
-
-void wxZipEntry::UnsetNotifier()
-{
-    wxArchiveEntry::UnsetNotifier();
-    m_zipnotifier = NULL;
-}
-
-size_t wxZipEntry::ReadLocal(wxInputStream& stream, wxMBConv& conv)
-{
-    wxUint16 nameLen, extraLen;
-    wxUint32 compressedSize, size, crc;
-
-    wxZipHeader ds(stream, LOCAL_SIZE - 4);
-    if (!ds)
-        return 0;
-
-    ds >> m_VersionNeeded >> m_Flags >> m_Method;
-    SetDateTime(wxDateTime().SetFromDOS(ds.Read32()));
-    ds >> crc >> compressedSize >> size >> nameLen >> extraLen;
-
-    bool sumsValid = (m_Flags & wxZIP_SUMS_FOLLOW) == 0;
-
-    if (sumsValid || crc)
-        m_Crc = crc;
-    if ((sumsValid || compressedSize) || m_Method == wxZIP_METHOD_STORE)
-        m_CompressedSize = compressedSize;
-    if ((sumsValid || size) || m_Method == wxZIP_METHOD_STORE)
-        m_Size = size;
-
-    SetName(ReadString(stream, nameLen, conv), wxPATH_UNIX);
-    if (stream.LastRead() != nameLen + 0u)
-        return 0;
-
-    if (extraLen || GetLocalExtraLen()) {
-        Unique(m_LocalExtra, extraLen);
-        if (extraLen) {
-            stream.Read(m_LocalExtra->GetData(), extraLen);
-            if (stream.LastRead() != extraLen + 0u)
-                return 0;
-        }
-    }
-
-    return LOCAL_SIZE + nameLen + extraLen;
-}
-
-size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
-{
-    wxString unixName = GetName(wxPATH_UNIX);
-    const wxWX2MBbuf name_buf = unixName.mb_str(conv);
-    const char *name = name_buf;
-    if (!name) name = "";
-    wxUint16 nameLen = wx_truncate_cast(wxUint16, strlen(name));
-
-    wxDataOutputStream ds(stream);
-
-    ds << m_VersionNeeded << m_Flags << m_Method;
-    ds.Write32(GetDateTime().GetAsDOS());
-
-    ds.Write32(m_Crc);
-    ds.Write32(m_CompressedSize != wxInvalidOffset ?
-               wx_truncate_cast(wxUint32, m_CompressedSize) : 0);
-    ds.Write32(m_Size != wxInvalidOffset ?
-               wx_truncate_cast(wxUint32, m_Size) : 0);
-
-    ds << nameLen;
-    wxUint16 extraLen = wx_truncate_cast(wxUint16, GetLocalExtraLen());
-    ds.Write16(extraLen);
-
-    stream.Write(name, nameLen);
-    if (extraLen)
-        stream.Write(m_LocalExtra->GetData(), extraLen);
-
-    return LOCAL_SIZE + nameLen + extraLen;
-}
-
-size_t wxZipEntry::ReadCentral(wxInputStream& stream, wxMBConv& conv)
-{
-    wxUint16 nameLen, extraLen, commentLen;
-
-    wxZipHeader ds(stream, CENTRAL_SIZE - 4);
-    if (!ds)
-        return 0;
-
-    ds >> m_VersionMadeBy >> m_SystemMadeBy;
-
-    SetVersionNeeded(ds.Read16());
-    SetFlags(ds.Read16());
-    SetMethod(ds.Read16());
-    SetDateTime(wxDateTime().SetFromDOS(ds.Read32()));
-    SetCrc(ds.Read32());
-    SetCompressedSize(ds.Read32());
-    SetSize(ds.Read32());
-
-    ds >> nameLen >> extraLen >> commentLen
-       >> m_DiskStart >> m_InternalAttributes >> m_ExternalAttributes;
-    SetOffset(ds.Read32());
-
-    SetName(ReadString(stream, nameLen, conv), wxPATH_UNIX);
-    if (stream.LastRead() != nameLen + 0u)
-        return 0;
-
-    if (extraLen || GetExtraLen()) {
-        Unique(m_Extra, extraLen);
-        if (extraLen) {
-            stream.Read(m_Extra->GetData(), extraLen);
-            if (stream.LastRead() != extraLen + 0u)
-                return 0;
-        }
-    }
-
-    if (commentLen) {
-        m_Comment = ReadString(stream, commentLen, conv);
-        if (stream.LastRead() != commentLen + 0u)
-            return 0;
-    } else {
-        m_Comment.clear();
-    }
-
-    return CENTRAL_SIZE + nameLen + extraLen + commentLen;
-}
-
-size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const
-{
-    wxString unixName = GetName(wxPATH_UNIX);
-    const wxWX2MBbuf name_buf = unixName.mb_str(conv);
-    const char *name = name_buf;
-    if (!name) name = "";
-    wxUint16 nameLen = wx_truncate_cast(wxUint16, strlen(name));
-
-    const wxWX2MBbuf comment_buf = m_Comment.mb_str(conv);
-    const char *comment = comment_buf;
-    if (!comment) comment = "";
-    wxUint16 commentLen = wx_truncate_cast(wxUint16, strlen(comment));
-
-    wxUint16 extraLen = wx_truncate_cast(wxUint16, GetExtraLen());
-
-    wxDataOutputStream ds(stream);
-
-    ds << CENTRAL_MAGIC << m_VersionMadeBy << m_SystemMadeBy;
-
-    ds.Write16(wx_truncate_cast(wxUint16, GetVersionNeeded()));
-    ds.Write16(wx_truncate_cast(wxUint16, GetFlags()));
-    ds.Write16(wx_truncate_cast(wxUint16, GetMethod()));
-    ds.Write32(GetDateTime().GetAsDOS());
-    ds.Write32(GetCrc());
-    ds.Write32(wx_truncate_cast(wxUint32, GetCompressedSize()));
-    ds.Write32(wx_truncate_cast(wxUint32, GetSize()));
-    ds.Write16(nameLen);
-    ds.Write16(extraLen);
-
-    ds << commentLen << m_DiskStart << m_InternalAttributes
-       << m_ExternalAttributes << wx_truncate_cast(wxUint32, GetOffset());
-
-    stream.Write(name, nameLen);
-    if (extraLen)
-        stream.Write(GetExtra(), extraLen);
-    stream.Write(comment, commentLen);
-
-    return CENTRAL_SIZE + nameLen + extraLen + commentLen;
-}
-
-// Info-zip prefixes this record with a signature, but pkzip doesn't. So if
-// the 1st value is the signature then it is probably an info-zip record,
-// though there is a small chance that it is in fact a pkzip record which
-// happens to have the signature as it's CRC.
-//
-size_t wxZipEntry::ReadDescriptor(wxInputStream& stream)
-{
-    wxZipHeader ds(stream, SUMS_SIZE);
-    if (!ds)
-        return 0;
-
-    m_Crc = ds.Read32();
-    m_CompressedSize = ds.Read32();
-    m_Size = ds.Read32();
-
-    // if 1st value is the signature then this is probably an info-zip record
-    if (m_Crc == SUMS_MAGIC)
-    {
-        wxZipHeader buf(stream, 8);
-        wxUint32 u1 = buf.GetSize() >= 4 ? buf.Read32() : (wxUint32)LOCAL_MAGIC;
-        wxUint32 u2 = buf.GetSize() == 8 ? buf.Read32() : 0;
-
-        // look for the signature of the following record to decide which
-        if ((u1 == LOCAL_MAGIC || u1 == CENTRAL_MAGIC) &&
-            (u2 != LOCAL_MAGIC && u2 != CENTRAL_MAGIC))
-        {
-            // it's a pkzip style record after all!
-            if (buf.GetSize() > 0)
-                stream.Ungetch(buf.GetData(), buf.GetSize());
-        }
-        else
-        {
-            // it's an info-zip record as expected
-            if (buf.GetSize() > 4)
-                stream.Ungetch(buf.GetData() + 4, buf.GetSize() - 4);
-            m_Crc = wx_truncate_cast(wxUint32, m_CompressedSize);
-            m_CompressedSize = m_Size;
-            m_Size = u1;
-            return SUMS_SIZE + 4;
-        }
-    }
-
-    return SUMS_SIZE;
-}
-
-size_t wxZipEntry::WriteDescriptor(wxOutputStream& stream, wxUint32 crc,
-                                   wxFileOffset compressedSize, wxFileOffset size)
-{
-    m_Crc = crc;
-    m_CompressedSize = compressedSize;
-    m_Size = size;
-
-    wxDataOutputStream ds(stream);
-
-    ds.Write32(crc);
-    ds.Write32(wx_truncate_cast(wxUint32, compressedSize));
-    ds.Write32(wx_truncate_cast(wxUint32, size));
-
-    return SUMS_SIZE;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// wxZipEndRec - holds the end of central directory record
-
-class wxZipEndRec
-{
-public:
-    wxZipEndRec();
-
-    int GetDiskNumber() const                   { return m_DiskNumber; }
-    int GetStartDisk() const                    { return m_StartDisk; }
-    int GetEntriesHere() const                  { return m_EntriesHere; }
-    int GetTotalEntries() const                 { return m_TotalEntries; }
-    wxFileOffset GetSize() const                { return m_Size; }
-    wxFileOffset GetOffset() const              { return m_Offset; }
-    wxString GetComment() const                 { return m_Comment; }
-
-    void SetDiskNumber(int num)
-        { m_DiskNumber = wx_truncate_cast(wxUint16, num); }
-    void SetStartDisk(int num)
-        { m_StartDisk = wx_truncate_cast(wxUint16, num); }
-    void SetEntriesHere(int num)
-        { m_EntriesHere = wx_truncate_cast(wxUint16, num); }
-    void SetTotalEntries(int num)
-        { m_TotalEntries = wx_truncate_cast(wxUint16, num); }
-    void SetSize(wxFileOffset size)
-        { m_Size = wx_truncate_cast(wxUint32, size); }
-    void SetOffset(wxFileOffset offset)
-        { m_Offset = wx_truncate_cast(wxUint32, offset); }
-    void SetComment(const wxString& comment)
-        { m_Comment = comment; }
-
-    bool Read(wxInputStream& stream, wxMBConv& conv);
-    bool Write(wxOutputStream& stream, wxMBConv& conv) const;
-
-private:
-    wxUint16 m_DiskNumber;
-    wxUint16 m_StartDisk;
-    wxUint16 m_EntriesHere;
-    wxUint16 m_TotalEntries;
-    wxUint32 m_Size;
-    wxUint32 m_Offset;
-    wxString m_Comment;
-};
-
-wxZipEndRec::wxZipEndRec()
-  : m_DiskNumber(0),
-    m_StartDisk(0),
-    m_EntriesHere(0),
-    m_TotalEntries(0),
-    m_Size(0),
-    m_Offset(0)
-{
-}
-
-bool wxZipEndRec::Write(wxOutputStream& stream, wxMBConv& conv) const
-{
-    const wxWX2MBbuf comment_buf = m_Comment.mb_str(conv);
-    const char *comment = comment_buf;
-    if (!comment) comment = "";
-    wxUint16 commentLen = (wxUint16)strlen(comment);
-
-    wxDataOutputStream ds(stream);
-
-    ds << END_MAGIC << m_DiskNumber << m_StartDisk << m_EntriesHere
-       << m_TotalEntries << m_Size << m_Offset << commentLen;
-
-    stream.Write(comment, commentLen);
-
-    return stream.IsOk();
-}
-
-bool wxZipEndRec::Read(wxInputStream& stream, wxMBConv& conv)
-{
-    wxZipHeader ds(stream, END_SIZE - 4);
-    if (!ds)
-        return false;
-
-    wxUint16 commentLen;
-
-    ds >> m_DiskNumber >> m_StartDisk >> m_EntriesHere
-       >> m_TotalEntries >> m_Size >> m_Offset >> commentLen;
-
-    if (commentLen) {
-        m_Comment = ReadString(stream, commentLen, conv);
-        if (stream.LastRead() != commentLen + 0u)
-            return false;
-    }
-
-    if (m_DiskNumber != 0 || m_StartDisk != 0 ||
-            m_EntriesHere != m_TotalEntries)
-    {
-        wxLogWarning(_("assuming this is a multi-part zip concatenated"));
-    }
-
-    return true;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// A weak link from an input stream to an output stream
-
-class wxZipStreamLink
-{
-public:
-    wxZipStreamLink(wxZipOutputStream *stream) : m_ref(1), m_stream(stream) { }
-
-    wxZipStreamLink *AddRef() { m_ref++; return this; }
-    wxZipOutputStream *GetOutputStream() const { return m_stream; }
-
-    void Release(class wxZipInputStream *WXUNUSED(s))
-        { if (--m_ref == 0) delete this; }
-    void Release(class wxZipOutputStream *WXUNUSED(s))
-        { m_stream = NULL; if (--m_ref == 0) delete this; }
-
-private:
-    ~wxZipStreamLink() { }
-
-    int m_ref;
-    wxZipOutputStream *m_stream;
-
-    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipStreamLink)
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Input stream
-
-// leave the default wxZipEntryPtr free for users
-wxDECLARE_SCOPED_PTR(wxZipEntry, wxZipEntryPtr_)
-wxDEFINE_SCOPED_PTR (wxZipEntry, wxZipEntryPtr_)
-
-// constructor
-//
-wxZipInputStream::wxZipInputStream(wxInputStream& stream,
-                                   wxMBConv& conv /*=wxConvLocal*/)
-  : wxArchiveInputStream(stream, conv)
-{
-    Init();
-}
-
-wxZipInputStream::wxZipInputStream(wxInputStream *stream,
-                                   wxMBConv& conv /*=wxConvLocal*/)
-  : wxArchiveInputStream(stream, conv)
-{
-    Init();
-}
-
-#if WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE
-
-// Part of the compatibility constructor, which has been made inline to
-// avoid a problem with it not being exported by mingw 3.2.3
-//
-void wxZipInputStream::Init(const wxString& file)
-{
-    // no error messages
-    wxLogNull nolog;
-    Init();
-    m_allowSeeking = true;
-    wxFFileInputStream *ffile;
-    ffile = static_cast<wxFFileInputStream*>(m_parent_i_stream);
-    wxZipEntryPtr_ entry;
-
-    if (ffile->IsOk()) {
-        do {
-            entry.reset(GetNextEntry());
-        }
-        while (entry.get() != NULL && entry->GetInternalName() != file);
-    }
-
-    if (entry.get() == NULL)
-        m_lasterror = wxSTREAM_READ_ERROR;
-}
-
-wxInputStream* wxZipInputStream::OpenFile(const wxString& archive)
-{
-    wxLogNull nolog;
-    return new wxFFileInputStream(archive);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE
-
-void wxZipInputStream::Init()
-{
-    m_store = new wxStoredInputStream(*m_parent_i_stream);
-    m_inflate = NULL;
-    m_rawin = NULL;
-    m_raw = false;
-    m_headerSize = 0;
-    m_decomp = NULL;
-    m_parentSeekable = false;
-    m_weaklinks = new wxZipWeakLinks;
-    m_streamlink = NULL;
-    m_offsetAdjustment = 0;
-    m_position = wxInvalidOffset;
-    m_signature = 0;
-    m_TotalEntries = 0;
-    m_lasterror = m_parent_i_stream->GetLastError();
-#if WXWIN_COMPATIBILITY_2_6
-    m_allowSeeking = false;
-#endif
-}
-
-wxZipInputStream::~wxZipInputStream()
-{
-    CloseDecompressor(m_decomp);
-
-    delete m_store;
-    delete m_inflate;
-    delete m_rawin;
-
-    m_weaklinks->Release(this);
-
-    if (m_streamlink)
-        m_streamlink->Release(this);
-}
-
-wxString wxZipInputStream::GetComment()
-{
-    if (m_position == wxInvalidOffset)
-        if (!LoadEndRecord())
-            return wxEmptyString;
-
-    if (!m_parentSeekable && Eof() && m_signature) {
-        m_lasterror = wxSTREAM_NO_ERROR;
-        m_lasterror = ReadLocal(true);
-    }
-
-    return m_Comment;
-}
-
-int wxZipInputStream::GetTotalEntries()
-{
-    if (m_position == wxInvalidOffset)
-        LoadEndRecord();
-    return m_TotalEntries;
-}
-
-wxZipStreamLink *wxZipInputStream::MakeLink(wxZipOutputStream *out)
-{
-    wxZipStreamLink *link = NULL;
-
-    if (!m_parentSeekable && (IsOpened() || !Eof())) {
-        link = new wxZipStreamLink(out);
-        if (m_streamlink)
-            m_streamlink->Release(this);
-        m_streamlink = link->AddRef();
-    }
-
-    return link;
-}
-
-bool wxZipInputStream::LoadEndRecord()
-{
-    wxCHECK(m_position == wxInvalidOffset, false);
-    if (!IsOk())
-        return false;
-
-    m_position = 0;
-
-    // First find the end-of-central-directory record.
-    if (!FindEndRecord()) {
-        // failed, so either this is a non-seekable stream (ok), or not a zip
-        if (m_parentSeekable) {
-            m_lasterror = wxSTREAM_READ_ERROR;
-            wxLogError(_("invalid zip file"));
-            return false;
-        }
-        else {
-            wxLogNull nolog;
-            wxFileOffset pos = m_parent_i_stream->TellI();
-            if (pos != wxInvalidOffset)
-                m_offsetAdjustment = m_position = pos;
-            return true;
-        }
-    }
-
-    wxZipEndRec endrec;
-
-    // Read in the end record
-    wxFileOffset endPos = m_parent_i_stream->TellI() - 4;
-    if (!endrec.Read(*m_parent_i_stream, GetConv()))
-        return false;
-
-    m_TotalEntries = endrec.GetTotalEntries();
-    m_Comment = endrec.GetComment();
-
-    wxUint32 magic = m_TotalEntries ? CENTRAL_MAGIC : END_MAGIC;
-
-    // Now find the central-directory. we have the file offset of
-    // the CD, so look there first.
-    if (m_parent_i_stream->SeekI(endrec.GetOffset()) != wxInvalidOffset &&
-            ReadSignature() == magic) {
-        m_signature = magic;
-        m_position = endrec.GetOffset();
-        m_offsetAdjustment = 0;
-        return true;
-    }
-
-    // If it's not there, then it could be that the zip has been appended
-    // to a self extractor, so take the CD size (also in endrec), subtract
-    // it from the file offset of the end-central-directory and look there.
-    if (m_parent_i_stream->SeekI(endPos - endrec.GetSize())
-            != wxInvalidOffset && ReadSignature() == magic) {
-        m_signature = magic;
-        m_position = endPos - endrec.GetSize();
-        m_offsetAdjustment = m_position - endrec.GetOffset();
-        return true;
-    }
-
-    wxLogError(_("can't find central directory in zip"));
-    m_lasterror = wxSTREAM_READ_ERROR;
-    return false;
-}
-
-// Find the end-of-central-directory record.
-// If found the stream will be positioned just past the 4 signature bytes.
-//
-bool wxZipInputStream::FindEndRecord()
-{
-    if (!m_parent_i_stream->IsSeekable())
-        return false;
-
-    // usually it's 22 bytes in size and the last thing in the file
-    {
-        wxLogNull nolog;
-        if (m_parent_i_stream->SeekI(-END_SIZE, wxFromEnd) == wxInvalidOffset)
-            return false;
-    }
-
-    m_parentSeekable = true;
-    m_signature = 0;
-    char magic[4];
-    if (m_parent_i_stream->Read(magic, 4).LastRead() != 4)
-        return false;
-    if ((m_signature = CrackUint32(magic)) == END_MAGIC)
-        return true;
-
-    // unfortunately, the record has a comment field that can be up to 65535
-    // bytes in length, so if the signature not found then search backwards.
-    wxFileOffset pos = m_parent_i_stream->TellI();
-    const int BUFSIZE = 1024;
-    wxCharBuffer buf(BUFSIZE);
-
-    memcpy(buf.data(), magic, 3);
-    wxFileOffset minpos = wxMax(pos - 65535L, 0);
-
-    while (pos > minpos) {
-        size_t len = wx_truncate_cast(size_t,
-                        pos - wxMax(pos - (BUFSIZE - 3), minpos));
-        memcpy(buf.data() + len, buf, 3);
-        pos -= len;
-
-        if (m_parent_i_stream->SeekI(pos, wxFromStart) == wxInvalidOffset ||
-                m_parent_i_stream->Read(buf.data(), len).LastRead() != len)
-            return false;
-
-        char *p = buf.data() + len;
-
-        while (p-- > buf.data()) {
-            if ((m_signature = CrackUint32(p)) == END_MAGIC) {
-                size_t remainder = buf.data() + len - p;
-                if (remainder > 4)
-                    m_parent_i_stream->Ungetch(p + 4, remainder - 4);
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-wxZipEntry *wxZipInputStream::GetNextEntry()
-{
-    if (m_position == wxInvalidOffset)
-        if (!LoadEndRecord())
-            return NULL;
-
-    m_lasterror = m_parentSeekable ? ReadCentral() : ReadLocal();
-    if (!IsOk())
-        return NULL;
-
-    wxZipEntryPtr_ entry(new wxZipEntry(m_entry));
-    entry->m_backlink = m_weaklinks->AddEntry(entry.get(), entry->GetKey());
-    return entry.release();
-}
-
-wxStreamError wxZipInputStream::ReadCentral()
-{
-    if (!AtHeader())
-        CloseEntry();
-
-    if (m_signature == END_MAGIC)
-        return wxSTREAM_EOF;
-
-    if (m_signature != CENTRAL_MAGIC) {
-        wxLogError(_("error reading zip central directory"));
-        return wxSTREAM_READ_ERROR;
-    }
-
-    if (QuietSeek(*m_parent_i_stream, m_position + 4) == wxInvalidOffset)
-        return wxSTREAM_READ_ERROR;
-
-    size_t size = m_entry.ReadCentral(*m_parent_i_stream, GetConv());
-    if (!size) {
-        m_signature = 0;
-        return wxSTREAM_READ_ERROR;
-    }
-
-    m_position += size;
-    m_signature = ReadSignature();
-
-    if (m_offsetAdjustment)
-        m_entry.SetOffset(m_entry.GetOffset() + m_offsetAdjustment);
-    m_entry.SetKey(m_entry.GetOffset());
-
-    return wxSTREAM_NO_ERROR;
-}
-
-wxStreamError wxZipInputStream::ReadLocal(bool readEndRec /*=false*/)
-{
-    if (!AtHeader())
-        CloseEntry();
-
-    if (!m_signature)
-        m_signature = ReadSignature();
-
-    if (m_signature == CENTRAL_MAGIC || m_signature == END_MAGIC) {
-        if (m_streamlink && !m_streamlink->GetOutputStream()) {
-            m_streamlink->Release(this);
-            m_streamlink = NULL;
-        }
-    }
-
-    while (m_signature == CENTRAL_MAGIC) {
-        if (m_weaklinks->IsEmpty() && m_streamlink == NULL)
-            return wxSTREAM_EOF;
-
-        size_t size = m_entry.ReadCentral(*m_parent_i_stream, GetConv());
-        m_position += size;
-        m_signature = 0;
-        if (!size)
-            return wxSTREAM_READ_ERROR;
-
-        wxZipEntry *entry = m_weaklinks->GetEntry(m_entry.GetOffset());
-        if (entry) {
-            entry->SetSystemMadeBy(m_entry.GetSystemMadeBy());
-            entry->SetVersionMadeBy(m_entry.GetVersionMadeBy());
-            entry->SetComment(m_entry.GetComment());
-            entry->SetDiskStart(m_entry.GetDiskStart());
-            entry->SetInternalAttributes(m_entry.GetInternalAttributes());
-            entry->SetExternalAttributes(m_entry.GetExternalAttributes());
-            Copy(entry->m_Extra, m_entry.m_Extra);
-            entry->Notify();
-            m_weaklinks->RemoveEntry(entry->GetOffset());
-        }
-
-        m_signature = ReadSignature();
-    }
-
-    if (m_signature == END_MAGIC) {
-        if (readEndRec || m_streamlink) {
-            wxZipEndRec endrec;
-            endrec.Read(*m_parent_i_stream, GetConv());
-            m_Comment = endrec.GetComment();
-            m_signature = 0;
-            if (m_streamlink) {
-                m_streamlink->GetOutputStream()->SetComment(endrec.GetComment());
-                m_streamlink->Release(this);
-                m_streamlink = NULL;
-            }
-        }
-        return wxSTREAM_EOF;
-    }
-
-    if (m_signature == LOCAL_MAGIC) {
-        m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv());
-        m_signature = 0;
-        m_entry.SetOffset(m_position);
-        m_entry.SetKey(m_position);
-
-        if (m_headerSize) {
-            m_TotalEntries++;
-            return wxSTREAM_NO_ERROR;
-        }
-    }
-
-    wxLogError(_("error reading zip local header"));
-    return wxSTREAM_READ_ERROR;
-}
-
-wxUint32 wxZipInputStream::ReadSignature()
-{
-    char magic[4];
-    m_parent_i_stream->Read(magic, 4);
-    return m_parent_i_stream->LastRead() == 4 ? CrackUint32(magic) : 0;
-}
-
-bool wxZipInputStream::OpenEntry(wxArchiveEntry& entry)
-{
-    wxZipEntry *zipEntry = wxStaticCast(&entry, wxZipEntry);
-    return zipEntry ? OpenEntry(*zipEntry) : false;
-}
-
-// Open an entry
-//
-bool wxZipInputStream::DoOpen(wxZipEntry *entry, bool raw)
-{
-    if (m_position == wxInvalidOffset)
-        if (!LoadEndRecord())
-            return false;
-    if (m_lasterror == wxSTREAM_READ_ERROR)
-        return false;
-    if (IsOpened())
-        CloseEntry();
-
-    m_raw = raw;
-
-    if (entry) {
-        if (AfterHeader() && entry->GetKey() == m_entry.GetOffset())
-            return true;
-        // can only open the current entry on a non-seekable stream
-        wxCHECK(m_parentSeekable, false);
-    }
-
-    m_lasterror = wxSTREAM_READ_ERROR;
-
-    if (entry)
-        m_entry = *entry;
-
-    if (m_parentSeekable) {
-        if (QuietSeek(*m_parent_i_stream, m_entry.GetOffset())
-                == wxInvalidOffset)
-            return false;
-        if (ReadSignature() != LOCAL_MAGIC) {
-            wxLogError(_("bad zipfile offset to entry"));
-            return false;
-        }
-    }
-
-    if (m_parentSeekable || AtHeader()) {
-        m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv());
-        if (m_headerSize && m_parentSeekable) {
-            wxZipEntry *ref = m_weaklinks->GetEntry(m_entry.GetKey());
-            if (ref) {
-                Copy(ref->m_LocalExtra, m_entry.m_LocalExtra);
-                ref->Notify();
-                m_weaklinks->RemoveEntry(ref->GetKey());
-            }
-            if (entry && entry != ref) {
-                Copy(entry->m_LocalExtra, m_entry.m_LocalExtra);
-                entry->Notify();
-            }
-        }
-    }
-
-    if (m_headerSize)
-        m_lasterror = wxSTREAM_NO_ERROR;
-    return IsOk();
-}
-
-bool wxZipInputStream::OpenDecompressor(bool raw /*=false*/)
-{
-    wxASSERT(AfterHeader());
-
-    wxFileOffset compressedSize = m_entry.GetCompressedSize();
-
-    if (raw)
-        m_raw = true;
-
-    if (m_raw) {
-        if (compressedSize != wxInvalidOffset) {
-            m_store->Open(compressedSize);
-            m_decomp = m_store;
-        } else {
-            if (!m_rawin)
-                m_rawin = new wxRawInputStream(*m_parent_i_stream);
-            m_decomp = m_rawin->Open(OpenDecompressor(m_rawin->GetTee()));
-        }
-    } else {
-        if (compressedSize != wxInvalidOffset &&
-                (m_entry.GetMethod() != wxZIP_METHOD_DEFLATE ||
-                 wxZlibInputStream::CanHandleGZip())) {
-            m_store->Open(compressedSize);
-            m_decomp = OpenDecompressor(*m_store);
-        } else {
-            m_decomp = OpenDecompressor(*m_parent_i_stream);
-        }
-    }
-
-    m_crcAccumulator = crc32(0, Z_NULL, 0);
-    m_lasterror = m_decomp ? m_decomp->GetLastError() : wxSTREAM_READ_ERROR;
-    return IsOk();
-}
-
-// Can be overridden to add support for additional decompression methods
-//
-wxInputStream *wxZipInputStream::OpenDecompressor(wxInputStream& stream)
-{
-    switch (m_entry.GetMethod()) {
-        case wxZIP_METHOD_STORE:
-            if (m_entry.GetSize() == wxInvalidOffset) {
-                wxLogError(_("stored file length not in Zip header"));
-                break;
-            }
-            m_store->Open(m_entry.GetSize());
-            return m_store;
-
-        case wxZIP_METHOD_DEFLATE:
-            if (!m_inflate)
-                m_inflate = new wxZlibInputStream2(stream);
-            else
-                m_inflate->Open(stream);
-            return m_inflate;
-
-        default:
-            wxLogError(_("unsupported Zip compression method"));
-    }
-
-    return NULL;
-}
-
-bool wxZipInputStream::CloseDecompressor(wxInputStream *decomp)
-{
-    if (decomp && decomp == m_rawin)
-        return CloseDecompressor(m_rawin->GetFilterInputStream());
-    if (decomp != m_store && decomp != m_inflate)
-        delete decomp;
-    return true;
-}
-
-// Closes the current entry and positions the underlying stream at the start
-// of the next entry
-//
-bool wxZipInputStream::CloseEntry()
-{
-    if (AtHeader())
-        return true;
-    if (m_lasterror == wxSTREAM_READ_ERROR)
-        return false;
-
-    if (!m_parentSeekable) {
-        if (!IsOpened() && !OpenDecompressor(true))
-            return false;
-
-        const int BUFSIZE = 8192;
-        wxCharBuffer buf(BUFSIZE);
-        while (IsOk())
-            Read(buf.data(), BUFSIZE);
-
-        m_position += m_headerSize + m_entry.GetCompressedSize();
-    }
-
-    if (m_lasterror == wxSTREAM_EOF)
-        m_lasterror = wxSTREAM_NO_ERROR;
-
-    CloseDecompressor(m_decomp);
-    m_decomp = NULL;
-    m_entry = wxZipEntry();
-    m_headerSize = 0;
-    m_raw = false;
-
-    return IsOk();
-}
-
-size_t wxZipInputStream::OnSysRead(void *buffer, size_t size)
-{
-    if (!IsOpened())
-        if ((AtHeader() && !DoOpen()) || !OpenDecompressor())
-            m_lasterror = wxSTREAM_READ_ERROR;
-    if (!IsOk() || !size)
-        return 0;
-
-    size_t count = m_decomp->Read(buffer, size).LastRead();
-    if (!m_raw)
-        m_crcAccumulator = crc32(m_crcAccumulator, (Byte*)buffer, count);
-    if (count < size)
-        m_lasterror = m_decomp->GetLastError();
-
-    if (Eof()) {
-        if ((m_entry.GetFlags() & wxZIP_SUMS_FOLLOW) != 0) {
-            m_headerSize += m_entry.ReadDescriptor(*m_parent_i_stream);
-            wxZipEntry *entry = m_weaklinks->GetEntry(m_entry.GetKey());
-
-            if (entry) {
-                entry->SetCrc(m_entry.GetCrc());
-                entry->SetCompressedSize(m_entry.GetCompressedSize());
-                entry->SetSize(m_entry.GetSize());
-                entry->Notify();
-            }
-        }
-
-        if (!m_raw) {
-            m_lasterror = wxSTREAM_READ_ERROR;
-
-            if (m_entry.GetSize() != TellI())
-            {
-                wxLogError(_("reading zip stream (entry %s): bad length"),
-                           m_entry.GetName().c_str());
-            }
-            else if (m_crcAccumulator != m_entry.GetCrc())
-            {
-                wxLogError(_("reading zip stream (entry %s): bad crc"),
-                           m_entry.GetName().c_str());
-            }
-            else
-            {
-                m_lasterror = wxSTREAM_EOF;
-            }
-        }
-    }
-
-    return count;
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-
-// Borrowed from VS's zip stream (c) 1999 Vaclav Slavik
-//
-wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
-{
-    // seeking works when the stream is created with the compatibility
-    // constructor
-    if (!m_allowSeeking)
-        return wxInvalidOffset;
-    if (!IsOpened())
-        if ((AtHeader() && !DoOpen()) || !OpenDecompressor())
-            m_lasterror = wxSTREAM_READ_ERROR;
-    if (!IsOk())
-        return wxInvalidOffset;
-
-    // NB: since ZIP files don't natively support seeking, we have to
-    //     implement a brute force workaround -- reading all the data
-    //     between current and the new position (or between beginning of
-    //     the file and new position...)
-
-    wxFileOffset nextpos;
-    wxFileOffset pos = TellI();
-
-    switch ( mode )
-    {
-        case wxFromCurrent : nextpos = seek + pos; break;
-        case wxFromStart : nextpos = seek; break;
-        case wxFromEnd : nextpos = GetLength() + seek; break;
-        default : nextpos = pos; break; /* just to fool compiler, never happens */
-    }
-
-    wxFileOffset toskip wxDUMMY_INITIALIZE(0);
-    if ( nextpos >= pos )
-    {
-        toskip = nextpos - pos;
-    }
-    else
-    {
-        wxZipEntry current(m_entry);
-        if (!OpenEntry(current))
-        {
-            m_lasterror = wxSTREAM_READ_ERROR;
-            return pos;
-        }
-        toskip = nextpos;
-    }
-
-    if ( toskip > 0 )
-    {
-        const int BUFSIZE = 4096;
-        size_t sz;
-        char buffer[BUFSIZE];
-        while ( toskip > 0 )
-        {
-            sz = wx_truncate_cast(size_t, wxMin(toskip, BUFSIZE));
-            Read(buffer, sz);
-            toskip -= sz;
-        }
-    }
-
-    pos = nextpos;
-    return pos;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Output stream
-
-#include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxZipEntryList_)
-
-wxZipOutputStream::wxZipOutputStream(wxOutputStream& stream,
-                                     int level      /*=-1*/,
-                                     wxMBConv& conv /*=wxConvLocal*/)
-  : wxArchiveOutputStream(stream, conv)
-{
-    Init(level);
-}
-
-wxZipOutputStream::wxZipOutputStream(wxOutputStream *stream,
-                                     int level      /*=-1*/,
-                                     wxMBConv& conv /*=wxConvLocal*/)
-  : wxArchiveOutputStream(stream, conv)
-{
-    Init(level);
-}
-
-void wxZipOutputStream::Init(int level)
-{
-    m_store = new wxStoredOutputStream(*m_parent_o_stream);
-    m_deflate = NULL;
-    m_backlink = NULL;
-    m_initialData = new char[OUTPUT_LATENCY];
-    m_initialSize = 0;
-    m_pending = NULL;
-    m_raw = false;
-    m_headerOffset = 0;
-    m_headerSize = 0;
-    m_entrySize = 0;
-    m_comp = NULL;
-    m_level = level;
-    m_offsetAdjustment = wxInvalidOffset;
-    m_endrecWritten = false;
-}
-
-wxZipOutputStream::~wxZipOutputStream()
-{
-    Close();
-    WX_CLEAR_LIST(wxZipEntryList_, m_entries);
-    delete m_store;
-    delete m_deflate;
-    delete m_pending;
-    delete [] m_initialData;
-    if (m_backlink)
-        m_backlink->Release(this);
-}
-
-bool wxZipOutputStream::PutNextEntry(
-    const wxString& name,
-    const wxDateTime& dt /*=wxDateTime::Now()*/,
-    wxFileOffset size    /*=wxInvalidOffset*/)
-{
-    return PutNextEntry(new wxZipEntry(name, dt, size));
-}
-
-bool wxZipOutputStream::PutNextDirEntry(
-    const wxString& name,
-    const wxDateTime& dt /*=wxDateTime::Now()*/)
-{
-    wxZipEntry *entry = new wxZipEntry(name, dt);
-    entry->SetIsDir();
-    return PutNextEntry(entry);
-}
-
-bool wxZipOutputStream::CopyEntry(wxZipEntry *entry,
-                                  wxZipInputStream& inputStream)
-{
-    wxZipEntryPtr_ e(entry);
-
-    return
-        inputStream.DoOpen(e.get(), true) &&
-        DoCreate(e.release(), true) &&
-        Write(inputStream).IsOk() && inputStream.Eof();
-}
-
-bool wxZipOutputStream::PutNextEntry(wxArchiveEntry *entry)
-{
-    wxZipEntry *zipEntry = wxStaticCast(entry, wxZipEntry);
-    if (!zipEntry)
-        delete entry;
-    return PutNextEntry(zipEntry);
-}
-
-bool wxZipOutputStream::CopyEntry(wxArchiveEntry *entry,
-                                  wxArchiveInputStream& stream)
-{
-    wxZipEntry *zipEntry = wxStaticCast(entry, wxZipEntry);
-
-    if (!zipEntry || !stream.OpenEntry(*zipEntry)) {
-        delete entry;
-        return false;
-    }
-
-    return CopyEntry(zipEntry, static_cast<wxZipInputStream&>(stream));
-}
-
-bool wxZipOutputStream::CopyArchiveMetaData(wxZipInputStream& inputStream)
-{
-    m_Comment = inputStream.GetComment();
-    if (m_backlink)
-        m_backlink->Release(this);
-    m_backlink = inputStream.MakeLink(this);
-    return true;
-}
-
-bool wxZipOutputStream::CopyArchiveMetaData(wxArchiveInputStream& stream)
-{
-    return CopyArchiveMetaData(static_cast<wxZipInputStream&>(stream));
-}
-
-void wxZipOutputStream::SetLevel(int level)
-{
-    if (level != m_level) {
-        if (m_comp != m_deflate)
-            delete m_deflate;
-        m_deflate = NULL;
-        m_level = level;
-    }
-}
-
-bool wxZipOutputStream::DoCreate(wxZipEntry *entry, bool raw /*=false*/)
-{
-    CloseEntry();
-
-    m_pending = entry;
-    if (!m_pending)
-        return false;
-
-    // write the signature bytes right away
-    wxDataOutputStream ds(*m_parent_o_stream);
-    ds << LOCAL_MAGIC;
-
-    // and if this is the first entry test for seekability
-    if (m_headerOffset == 0 && m_parent_o_stream->IsSeekable()) {
-#if wxUSE_LOG
-        bool logging = wxLog::IsEnabled();
-        wxLogNull nolog;
-#endif // wxUSE_LOG
-        wxFileOffset here = m_parent_o_stream->TellO();
-
-        if (here != wxInvalidOffset && here >= 4) {
-            if (m_parent_o_stream->SeekO(here - 4) == here - 4) {
-                m_offsetAdjustment = here - 4;
-#if wxUSE_LOG
-                wxLog::EnableLogging(logging);
-#endif // wxUSE_LOG
-                m_parent_o_stream->SeekO(here);
-            }
-        }
-    }
-
-    m_pending->SetOffset(m_headerOffset);
-
-    m_crcAccumulator = crc32(0, Z_NULL, 0);
-
-    if (raw)
-        m_raw = true;
-
-    m_lasterror = wxSTREAM_NO_ERROR;
-    return true;
-}
-
-// Can be overridden to add support for additional compression methods
-//
-wxOutputStream *wxZipOutputStream::OpenCompressor(
-    wxOutputStream& stream,
-    wxZipEntry& entry,
-    const Buffer bufs[])
-{
-    if (entry.GetMethod() == wxZIP_METHOD_DEFAULT) {
-        if (GetLevel() == 0
-                && (IsParentSeekable()
-                    || entry.GetCompressedSize() != wxInvalidOffset
-                    || entry.GetSize() != wxInvalidOffset)) {
-            entry.SetMethod(wxZIP_METHOD_STORE);
-        } else {
-            int size = 0;
-            for (int i = 0; bufs[i].m_data; ++i)
-                size += bufs[i].m_size;
-            entry.SetMethod(size <= 6 ?
-                            wxZIP_METHOD_STORE : wxZIP_METHOD_DEFLATE);
-        }
-    }
-
-    switch (entry.GetMethod()) {
-        case wxZIP_METHOD_STORE:
-            if (entry.GetCompressedSize() == wxInvalidOffset)
-                entry.SetCompressedSize(entry.GetSize());
-            return m_store;
-
-        case wxZIP_METHOD_DEFLATE:
-        {
-            int defbits = wxZIP_DEFLATE_NORMAL;
-            switch (GetLevel()) {
-                case 0: case 1:
-                    defbits = wxZIP_DEFLATE_SUPERFAST;
-                    break;
-                case 2: case 3: case 4:
-                    defbits = wxZIP_DEFLATE_FAST;
-                    break;
-                case 8: case 9:
-                    defbits = wxZIP_DEFLATE_EXTRA;
-                    break;
-            }
-            entry.SetFlags((entry.GetFlags() & ~wxZIP_DEFLATE_MASK) |
-                            defbits | wxZIP_SUMS_FOLLOW);
-
-            if (!m_deflate)
-                m_deflate = new wxZlibOutputStream2(stream, GetLevel());
-            else
-                m_deflate->Open(stream);
-
-            return m_deflate;
-        }
-
-        default:
-            wxLogError(_("unsupported Zip compression method"));
-    }
-
-    return NULL;
-}
-
-bool wxZipOutputStream::CloseCompressor(wxOutputStream *comp)
-{
-    if (comp == m_deflate)
-        m_deflate->Close();
-    else if (comp != m_store)
-        delete comp;
-    return true;
-}
-
-// This is called when OUPUT_LATENCY bytes has been written to the
-// wxZipOutputStream to actually create the zip entry.
-//
-void wxZipOutputStream::CreatePendingEntry(const void *buffer, size_t size)
-{
-    wxASSERT(IsOk() && m_pending && !m_comp);
-    wxZipEntryPtr_ spPending(m_pending);
-    m_pending = NULL;
-
-    Buffer bufs[] = {
-        { m_initialData, m_initialSize },
-        { (const char*)buffer, size },
-        { NULL, 0 }
-    };
-
-    if (m_raw)
-        m_comp = m_store;
-    else
-        m_comp = OpenCompressor(*m_store, *spPending,
-                                m_initialSize ? bufs : bufs + 1);
-
-    if (IsParentSeekable()
-        || (spPending->m_Crc
-            && spPending->m_CompressedSize != wxInvalidOffset
-            && spPending->m_Size != wxInvalidOffset))
-        spPending->m_Flags &= ~wxZIP_SUMS_FOLLOW;
-    else
-        if (spPending->m_CompressedSize != wxInvalidOffset)
-            spPending->m_Flags |= wxZIP_SUMS_FOLLOW;
-
-    m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv());
-    m_lasterror = m_parent_o_stream->GetLastError();
-
-    if (IsOk()) {
-        m_entries.push_back(spPending.release());
-        OnSysWrite(m_initialData, m_initialSize);
-    }
-
-    m_initialSize = 0;
-}
-
-// This is called to write out the zip entry when Close has been called
-// before OUTPUT_LATENCY bytes has been written to the wxZipOutputStream.
-//
-void wxZipOutputStream::CreatePendingEntry()
-{
-    wxASSERT(IsOk() && m_pending && !m_comp);
-    wxZipEntryPtr_ spPending(m_pending);
-    m_pending = NULL;
-    m_lasterror = wxSTREAM_WRITE_ERROR;
-
-    if (!m_raw) {
-        // Initially compresses the data to memory, then fall back to 'store'
-        // if the compressor makes the data larger rather than smaller.
-        wxMemoryOutputStream mem;
-        Buffer bufs[] = { { m_initialData, m_initialSize }, { NULL, 0 } };
-        wxOutputStream *comp = OpenCompressor(mem, *spPending, bufs);
-
-        if (!comp)
-            return;
-        if (comp != m_store) {
-            bool ok = comp->Write(m_initialData, m_initialSize).IsOk();
-            CloseCompressor(comp);
-            if (!ok)
-                return;
-        }
-
-        m_entrySize = m_initialSize;
-        m_crcAccumulator = crc32(0, (Byte*)m_initialData, m_initialSize);
-
-        if (mem.GetSize() > 0 && mem.GetSize() < m_initialSize) {
-            m_initialSize = mem.GetSize();
-            mem.CopyTo(m_initialData, m_initialSize);
-        } else {
-            spPending->SetMethod(wxZIP_METHOD_STORE);
-        }
-
-        spPending->SetSize(m_entrySize);
-        spPending->SetCrc(m_crcAccumulator);
-        spPending->SetCompressedSize(m_initialSize);
-    }
-
-    spPending->m_Flags &= ~wxZIP_SUMS_FOLLOW;
-    m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv());
-
-    if (m_parent_o_stream->IsOk()) {
-        m_entries.push_back(spPending.release());
-        m_comp = m_store;
-        m_store->Write(m_initialData, m_initialSize);
-    }
-
-    m_initialSize = 0;
-    m_lasterror = m_parent_o_stream->GetLastError();
-}
-
-// Write the 'central directory' and the 'end-central-directory' records.
-//
-bool wxZipOutputStream::Close()
-{
-    CloseEntry();
-
-    if (m_lasterror == wxSTREAM_WRITE_ERROR
-        || (m_entries.size() == 0 && m_endrecWritten))
-    {
-        wxFilterOutputStream::Close();
-        return false;
-    }
-
-    wxZipEndRec endrec;
-
-    endrec.SetEntriesHere(m_entries.size());
-    endrec.SetTotalEntries(m_entries.size());
-    endrec.SetOffset(m_headerOffset);
-    endrec.SetComment(m_Comment);
-
-    wxZipEntryList_::iterator it;
-    wxFileOffset size = 0;
-
-    for (it = m_entries.begin(); it != m_entries.end(); ++it) {
-        size += (*it)->WriteCentral(*m_parent_o_stream, GetConv());
-        delete *it;
-    }
-    m_entries.clear();
-
-    endrec.SetSize(size);
-    endrec.Write(*m_parent_o_stream, GetConv());
-
-    m_lasterror = m_parent_o_stream->GetLastError();
-    m_endrecWritten = true;
-
-    if (!wxFilterOutputStream::Close() || !IsOk())
-        return false;
-    m_lasterror = wxSTREAM_EOF;
-    return true;
-}
-
-// Finish writing the current entry
-//
-bool wxZipOutputStream::CloseEntry()
-{
-    if (IsOk() && m_pending)
-        CreatePendingEntry();
-    if (!IsOk())
-        return false;
-    if (!m_comp)
-        return true;
-
-    CloseCompressor(m_comp);
-    m_comp = NULL;
-
-    wxFileOffset compressedSize = m_store->TellO();
-
-    wxZipEntry& entry = *m_entries.back();
-
-    // When writing raw the crc and size can't be checked
-    if (m_raw) {
-        m_crcAccumulator = entry.GetCrc();
-        m_entrySize = entry.GetSize();
-    }
-
-    // Write the sums in the trailing 'data descriptor' if necessary
-    if (entry.m_Flags & wxZIP_SUMS_FOLLOW) {
-        wxASSERT(!IsParentSeekable());
-        m_headerOffset +=
-            entry.WriteDescriptor(*m_parent_o_stream, m_crcAccumulator,
-                                  compressedSize, m_entrySize);
-        m_lasterror = m_parent_o_stream->GetLastError();
-    }
-
-    // If the local header didn't have the correct crc and size written to
-    // it then seek back and fix it
-    else if (m_crcAccumulator != entry.GetCrc()
-            || m_entrySize != entry.GetSize()
-            || compressedSize != entry.GetCompressedSize())
-    {
-        if (IsParentSeekable()) {
-            wxFileOffset here = m_parent_o_stream->TellO();
-            wxFileOffset headerOffset = m_headerOffset + m_offsetAdjustment;
-            m_parent_o_stream->SeekO(headerOffset + SUMS_OFFSET);
-            entry.WriteDescriptor(*m_parent_o_stream, m_crcAccumulator,
-                                  compressedSize, m_entrySize);
-            m_parent_o_stream->SeekO(here);
-            m_lasterror = m_parent_o_stream->GetLastError();
-        } else {
-            m_lasterror = wxSTREAM_WRITE_ERROR;
-        }
-    }
-
-    m_headerOffset += m_headerSize + compressedSize;
-    m_headerSize = 0;
-    m_entrySize = 0;
-    m_store->Close();
-    m_raw = false;
-
-    if (IsOk())
-        m_lasterror = m_parent_o_stream->GetLastError();
-    else
-        wxLogError(_("error writing zip entry '%s': bad crc or length"),
-                   entry.GetName().c_str());
-    return IsOk();
-}
-
-void wxZipOutputStream::Sync()
-{
-    if (IsOk() && m_pending)
-        CreatePendingEntry(NULL, 0);
-    if (!m_comp)
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-    if (IsOk()) {
-        m_comp->Sync();
-        m_lasterror = m_comp->GetLastError();
-    }
-}
-
-size_t wxZipOutputStream::OnSysWrite(const void *buffer, size_t size)
-{
-    if (IsOk() && m_pending) {
-        if (m_initialSize + size < OUTPUT_LATENCY) {
-            memcpy(m_initialData + m_initialSize, buffer, size);
-            m_initialSize += size;
-            return size;
-        } else {
-            CreatePendingEntry(buffer, size);
-        }
-    }
-
-    if (!m_comp)
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-    if (!IsOk() || !size)
-        return 0;
-
-    if (m_comp->Write(buffer, size).LastWrite() != size)
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-    m_crcAccumulator = crc32(m_crcAccumulator, (Byte*)buffer, size);
-    m_entrySize += m_comp->LastWrite();
-
-    return m_comp->LastWrite();
-}
-
-#endif // wxUSE_ZIPSTREAM
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/zipstrm.cpp
+// Purpose:     Streams for Zip files
+// Author:      Mike Wetherell
+// RCS-ID:      $Id: zipstrm.cpp 51009 2008-01-03 17:11:45Z MW $
+// Copyright:   (c) Mike Wetherell
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_ZIPSTREAM
+
+#include "wx/zipstrm.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/hashmap.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+#endif
+
+#include "wx/datstrm.h"
+#include "wx/zstream.h"
+#include "wx/mstream.h"
+#include "wx/ptr_scpd.h"
+#include "wx/wfstream.h"
+#include "zlib.h"
+
+// value for the 'version needed to extract' field (20 means 2.0)
+enum {
+    VERSION_NEEDED_TO_EXTRACT = 20
+};
+
+// signatures for the various records (PKxx)
+enum {
+    CENTRAL_MAGIC = 0x02014b50,     // central directory record
+    LOCAL_MAGIC   = 0x04034b50,     // local header
+    END_MAGIC     = 0x06054b50,     // end of central directory record
+    SUMS_MAGIC    = 0x08074b50      // data descriptor (info-zip)
+};
+
+// unix file attributes. zip stores them in the high 16 bits of the
+// 'external attributes' field, hence the extra zeros.
+enum {
+    wxZIP_S_IFMT  = 0xF0000000,
+    wxZIP_S_IFDIR = 0x40000000,
+    wxZIP_S_IFREG = 0x80000000
+};
+
+// minimum sizes for the various records
+enum {
+    CENTRAL_SIZE  = 46,
+    LOCAL_SIZE    = 30,
+    END_SIZE      = 22,
+    SUMS_SIZE     = 12
+};
+
+// The number of bytes that must be written to an wxZipOutputStream before
+// a zip entry is created. The purpose of this latency is so that
+// OpenCompressor() can see a little data before deciding which compressor
+// it should use.
+enum {
+    OUTPUT_LATENCY = 4096
+};
+
+// Some offsets into the local header
+enum {
+    SUMS_OFFSET  = 14
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxZipEntry, wxArchiveEntry)
+IMPLEMENT_DYNAMIC_CLASS(wxZipClassFactory, wxArchiveClassFactory)
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Helpers
+
+// read a string of a given length
+//
+static wxString ReadString(wxInputStream& stream, wxUint16 len, wxMBConv& conv)
+{
+    if (len == 0)
+        return wxEmptyString;
+
+#if wxUSE_UNICODE
+    wxCharBuffer buf(len);
+    stream.Read(buf.data(), len);
+    wxString str(buf, conv);
+#else
+    wxString str;
+    (void)conv;
+    {
+        wxStringBuffer buf(str, len);
+        stream.Read(buf, len);
+    }
+#endif
+
+    return str;
+}
+
+// Decode a little endian wxUint32 number from a character array
+//
+static inline wxUint32 CrackUint32(const char *m)
+{
+    const unsigned char *n = (const unsigned char*)m;
+    return (n[3] << 24) | (n[2] << 16) | (n[1] << 8) | n[0];
+}
+
+// Decode a little endian wxUint16 number from a character array
+//
+static inline wxUint16 CrackUint16(const char *m)
+{
+    const unsigned char *n = (const unsigned char*)m;
+    return (n[1] << 8) | n[0];
+}
+
+// Temporarily lower the logging level in debug mode to avoid a warning
+// from SeekI about seeking on a stream with data written back to it.
+//
+static wxFileOffset QuietSeek(wxInputStream& stream, wxFileOffset pos)
+{
+#if defined(__WXDEBUG__) && wxUSE_LOG
+    wxLogLevel level = wxLog::GetLogLevel();
+    wxLog::SetLogLevel(wxLOG_Debug - 1);
+    wxFileOffset result = stream.SeekI(pos);
+    wxLog::SetLogLevel(level);
+    return result;
+#else
+    return stream.SeekI(pos);
+#endif
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Class factory
+
+wxZipClassFactory g_wxZipClassFactory;
+
+wxZipClassFactory::wxZipClassFactory()
+{
+    if (this == &g_wxZipClassFactory)
+        PushFront();
+}
+
+const wxChar * const *
+wxZipClassFactory::GetProtocols(wxStreamProtocolType type) const
+{
+    static const wxChar *protocols[] = { _T("zip"), NULL };
+    static const wxChar *mimetypes[] = { _T("application/zip"), NULL };
+    static const wxChar *fileexts[]  = { _T(".zip"), _T(".htb"), NULL };
+    static const wxChar *empty[]     = { NULL };
+
+    switch (type) {
+        case wxSTREAM_PROTOCOL: return protocols;
+        case wxSTREAM_MIMETYPE: return mimetypes;
+        case wxSTREAM_FILEEXT:  return fileexts;
+        default:                return empty;
+    }
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Read a zip header
+
+class wxZipHeader
+{
+public:
+    wxZipHeader(wxInputStream& stream, size_t size);
+
+    inline wxUint8 Read8();
+    inline wxUint16 Read16();
+    inline wxUint32 Read32();
+
+    const char *GetData() const             { return m_data; }
+    size_t GetSize() const                  { return m_size; }
+    operator bool() const                   { return m_ok; }
+
+    size_t Seek(size_t pos)                 { m_pos = pos; return m_pos; }
+    size_t Skip(size_t size)                { m_pos += size; return m_pos; }
+
+    wxZipHeader& operator>>(wxUint8& n)     { n = Read8();  return *this; }
+    wxZipHeader& operator>>(wxUint16& n)    { n = Read16(); return *this; }
+    wxZipHeader& operator>>(wxUint32& n)    { n = Read32(); return *this; }
+
+private:
+    char m_data[64];
+    size_t m_size;
+    size_t m_pos;
+    bool m_ok;
+};
+
+wxZipHeader::wxZipHeader(wxInputStream& stream, size_t size)
+  : m_size(0),
+    m_pos(0),
+    m_ok(false)
+{
+    wxCHECK_RET(size <= sizeof(m_data), _T("buffer too small"));
+    m_size = stream.Read(m_data, size).LastRead();
+    m_ok = m_size == size;
+}
+
+inline wxUint8 wxZipHeader::Read8()
+{
+    wxASSERT(m_pos < m_size);
+    return m_data[m_pos++];
+}
+
+inline wxUint16 wxZipHeader::Read16()
+{
+    wxASSERT(m_pos + 2 <= m_size);
+    wxUint16 n = CrackUint16(m_data + m_pos);
+    m_pos += 2;
+    return n;
+}
+
+inline wxUint32 wxZipHeader::Read32()
+{
+    wxASSERT(m_pos + 4 <= m_size);
+    wxUint32 n = CrackUint32(m_data + m_pos);
+    m_pos += 4;
+    return n;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Stored input stream
+// Trival decompressor for files which are 'stored' in the zip file.
+
+class wxStoredInputStream : public wxFilterInputStream
+{
+public:
+    wxStoredInputStream(wxInputStream& stream);
+
+    void Open(wxFileOffset len) { Close(); m_len = len; }
+    void Close() { m_pos = 0; m_lasterror = wxSTREAM_NO_ERROR; }
+
+    virtual char Peek() { return wxInputStream::Peek(); }
+    virtual wxFileOffset GetLength() const { return m_len; }
+
+protected:
+    virtual size_t OnSysRead(void *buffer, size_t size);
+    virtual wxFileOffset OnSysTell() const { return m_pos; }
+
+private:
+    wxFileOffset m_pos;
+    wxFileOffset m_len;
+
+    DECLARE_NO_COPY_CLASS(wxStoredInputStream)
+};
+
+wxStoredInputStream::wxStoredInputStream(wxInputStream& stream)
+  : wxFilterInputStream(stream),
+    m_pos(0),
+    m_len(0)
+{
+}
+
+size_t wxStoredInputStream::OnSysRead(void *buffer, size_t size)
+{
+    size_t count = wx_truncate_cast(size_t,
+                wxMin(size + wxFileOffset(0), m_len - m_pos + size_t(0)));
+    count = m_parent_i_stream->Read(buffer, count).LastRead();
+    m_pos += count;
+
+    if (count < size)
+        m_lasterror = m_pos == m_len ? wxSTREAM_EOF : wxSTREAM_READ_ERROR;
+
+    return count;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Stored output stream
+// Trival compressor for files which are 'stored' in the zip file.
+
+class wxStoredOutputStream : public wxFilterOutputStream
+{
+public:
+    wxStoredOutputStream(wxOutputStream& stream) :
+        wxFilterOutputStream(stream), m_pos(0) { }
+
+    bool Close() {
+        m_pos = 0;
+        m_lasterror = wxSTREAM_NO_ERROR;
+        return true;
+    }
+
+protected:
+    virtual size_t OnSysWrite(const void *buffer, size_t size);
+    virtual wxFileOffset OnSysTell() const { return m_pos; }
+
+private:
+    wxFileOffset m_pos;
+    DECLARE_NO_COPY_CLASS(wxStoredOutputStream)
+};
+
+size_t wxStoredOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    if (!IsOk() || !size)
+        return 0;
+    size_t count = m_parent_o_stream->Write(buffer, size).LastWrite();
+    if (count != size)
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    m_pos += count;
+    return count;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// wxRawInputStream
+//
+// Used to handle the unusal case of raw copying an entry of unknown
+// length. This can only happen when the zip being copied from is being
+// read from a non-seekable stream, and also was original written to a
+// non-seekable stream.
+//
+// In this case there's no option but to decompress the stream to find
+// it's length, but we can still write the raw compressed data to avoid the
+// compression overhead (which is the greater one).
+//
+// Usage is like this:
+//  m_rawin = new wxRawInputStream(*m_parent_i_stream);
+//  m_decomp = m_rawin->Open(OpenDecompressor(m_rawin->GetTee()));
+//
+// The wxRawInputStream owns a wxTeeInputStream object, the role of which
+// is something like the unix 'tee' command; it is a transparent filter, but
+// allows the data read to be read a second time via an extra method 'GetData'.
+//
+// The wxRawInputStream then draws data through the tee using a decompressor
+// then instead of returning the decompressed data, retuns the raw data
+// from wxTeeInputStream::GetData().
+
+class wxTeeInputStream : public wxFilterInputStream
+{
+public:
+    wxTeeInputStream(wxInputStream& stream);
+
+    size_t GetCount() const { return m_end - m_start; }
+    size_t GetData(char *buffer, size_t size);
+
+    void Open();
+    bool Final();
+
+    wxInputStream& Read(void *buffer, size_t size);
+
+protected:
+    virtual size_t OnSysRead(void *buffer, size_t size);
+    virtual wxFileOffset OnSysTell() const { return m_pos; }
+
+private:
+    wxFileOffset m_pos;
+    wxMemoryBuffer m_buf;
+    size_t m_start;
+    size_t m_end;
+
+    DECLARE_NO_COPY_CLASS(wxTeeInputStream)
+};
+
+wxTeeInputStream::wxTeeInputStream(wxInputStream& stream)
+  : wxFilterInputStream(stream),
+    m_pos(0), m_buf(8192), m_start(0), m_end(0)
+{
+}
+
+void wxTeeInputStream::Open()
+{
+    m_pos = m_start = m_end = 0;
+    m_lasterror = wxSTREAM_NO_ERROR;
+}
+
+bool wxTeeInputStream::Final()
+{
+    bool final = m_end == m_buf.GetDataLen();
+    m_end = m_buf.GetDataLen();
+    return final;
+}
+
+wxInputStream& wxTeeInputStream::Read(void *buffer, size_t size)
+{
+    size_t count = wxInputStream::Read(buffer, size).LastRead();
+    m_end = m_buf.GetDataLen();
+    m_buf.AppendData(buffer, count);
+    return *this;
+}
+
+size_t wxTeeInputStream::OnSysRead(void *buffer, size_t size)
+{
+    size_t count = m_parent_i_stream->Read(buffer, size).LastRead();
+    if (count < size)
+        m_lasterror = m_parent_i_stream->GetLastError();
+    return count;
+}
+
+size_t wxTeeInputStream::GetData(char *buffer, size_t size)
+{
+    if (m_wbacksize) {
+        size_t len = m_buf.GetDataLen();
+        len = len > m_wbacksize ? len - m_wbacksize : 0;
+        m_buf.SetDataLen(len);
+        if (m_end > len) {
+            wxFAIL; // we've already returned data that's now being ungot
+            m_end = len;
+        }
+        m_parent_i_stream->Reset();
+        m_parent_i_stream->Ungetch(m_wback, m_wbacksize);
+        free(m_wback);
+        m_wback = NULL;
+        m_wbacksize = 0;
+        m_wbackcur = 0;
+    }
+
+    if (size > GetCount())
+        size = GetCount();
+    if (size) {
+        memcpy(buffer, m_buf + m_start, size);
+        m_start += size;
+        wxASSERT(m_start <= m_end);
+    }
+
+    if (m_start == m_end && m_start > 0 && m_buf.GetDataLen() > 0) {
+        size_t len = m_buf.GetDataLen();
+        char *buf = (char*)m_buf.GetWriteBuf(len);
+        len -= m_end;
+        memmove(buf, buf + m_end, len);
+        m_buf.UngetWriteBuf(len);
+        m_start = m_end = 0;
+    }
+
+    return size;
+}
+
+class wxRawInputStream : public wxFilterInputStream
+{
+public:
+    wxRawInputStream(wxInputStream& stream);
+    virtual ~wxRawInputStream() { delete m_tee; }
+
+    wxInputStream* Open(wxInputStream *decomp);
+    wxInputStream& GetTee() const { return *m_tee; }
+
+protected:
+    virtual size_t OnSysRead(void *buffer, size_t size);
+    virtual wxFileOffset OnSysTell() const { return m_pos; }
+
+private:
+    wxFileOffset m_pos;
+    wxTeeInputStream *m_tee;
+
+    enum { BUFSIZE = 8192 };
+    wxCharBuffer m_dummy;
+
+    DECLARE_NO_COPY_CLASS(wxRawInputStream)
+};
+
+wxRawInputStream::wxRawInputStream(wxInputStream& stream)
+  : wxFilterInputStream(stream),
+    m_pos(0),
+    m_tee(new wxTeeInputStream(stream)),
+    m_dummy(BUFSIZE)
+{
+}
+
+wxInputStream *wxRawInputStream::Open(wxInputStream *decomp)
+{
+    if (decomp) {
+        m_parent_i_stream = decomp;
+        m_pos = 0;
+        m_lasterror = wxSTREAM_NO_ERROR;
+        m_tee->Open();
+        return this;
+    } else {
+        return NULL;
+    }
+}
+
+size_t wxRawInputStream::OnSysRead(void *buffer, size_t size)
+{
+    char *buf = (char*)buffer;
+    size_t count = 0;
+
+    while (count < size && IsOk())
+    {
+        while (m_parent_i_stream->IsOk() && m_tee->GetCount() == 0)
+            m_parent_i_stream->Read(m_dummy.data(), BUFSIZE);
+
+        size_t n = m_tee->GetData(buf + count, size - count);
+        count += n;
+
+        if (n == 0 && m_tee->Final())
+            m_lasterror = m_parent_i_stream->GetLastError();
+    }
+
+    m_pos += count;
+    return count;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Zlib streams than can be reused without recreating.
+
+class wxZlibOutputStream2 : public wxZlibOutputStream
+{
+public:
+    wxZlibOutputStream2(wxOutputStream& stream, int level) :
+        wxZlibOutputStream(stream, level, wxZLIB_NO_HEADER) { }
+
+    bool Open(wxOutputStream& stream);
+    bool Close() { DoFlush(true); m_pos = wxInvalidOffset; return IsOk(); }
+};
+
+bool wxZlibOutputStream2::Open(wxOutputStream& stream)
+{
+    wxCHECK(m_pos == wxInvalidOffset, false);
+
+    m_deflate->next_out = m_z_buffer;
+    m_deflate->avail_out = m_z_size;
+    m_pos = 0;
+    m_lasterror = wxSTREAM_NO_ERROR;
+    m_parent_o_stream = &stream;
+
+    if (deflateReset(m_deflate) != Z_OK) {
+        wxLogError(_("can't re-initialize zlib deflate stream"));
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+        return false;
+    }
+
+    return true;
+}
+
+class wxZlibInputStream2 : public wxZlibInputStream
+{
+public:
+    wxZlibInputStream2(wxInputStream& stream) :
+        wxZlibInputStream(stream, wxZLIB_NO_HEADER) { }
+
+    bool Open(wxInputStream& stream);
+};
+
+bool wxZlibInputStream2::Open(wxInputStream& stream)
+{
+    m_inflate->avail_in = 0;
+    m_pos = 0;
+    m_lasterror = wxSTREAM_NO_ERROR;
+    m_parent_i_stream = &stream;
+
+    if (inflateReset(m_inflate) != Z_OK) {
+        wxLogError(_("can't re-initialize zlib inflate stream"));
+        m_lasterror = wxSTREAM_READ_ERROR;
+        return false;
+    }
+
+    return true;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Class to hold wxZipEntry's Extra and LocalExtra fields
+
+class wxZipMemory
+{
+public:
+    wxZipMemory() : m_data(NULL), m_size(0), m_capacity(0), m_ref(1) { }
+
+    wxZipMemory *AddRef() { m_ref++; return this; }
+    void Release() { if (--m_ref == 0) delete this; }
+
+    char *GetData() const { return m_data; }
+    size_t GetSize() const { return m_size; }
+    size_t GetCapacity() const { return m_capacity; }
+
+    wxZipMemory *Unique(size_t size);
+
+private:
+    ~wxZipMemory() { delete [] m_data; }
+
+    char *m_data;
+    size_t m_size;
+    size_t m_capacity;
+    int m_ref;
+
+    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipMemory)
+};
+
+wxZipMemory *wxZipMemory::Unique(size_t size)
+{
+    wxZipMemory *zm;
+
+    if (m_ref > 1) {
+        --m_ref;
+        zm = new wxZipMemory;
+    } else {
+        zm = this;
+    }
+
+    if (zm->m_capacity < size) {
+        delete [] zm->m_data;
+        zm->m_data = new char[size];
+        zm->m_capacity = size;
+    }
+
+    zm->m_size = size;
+    return zm;
+}
+
+static inline wxZipMemory *AddRef(wxZipMemory *zm)
+{
+    if (zm)
+        zm->AddRef();
+    return zm;
+}
+
+static inline void Release(wxZipMemory *zm)
+{
+    if (zm)
+        zm->Release();
+}
+
+static void Copy(wxZipMemory*& dest, wxZipMemory *src)
+{
+    Release(dest);
+    dest = AddRef(src);
+}
+
+static void Unique(wxZipMemory*& zm, size_t size)
+{
+    if (!zm && size)
+        zm = new wxZipMemory;
+    if (zm)
+        zm = zm->Unique(size);
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Collection of weak references to entries
+
+WX_DECLARE_HASH_MAP(long, wxZipEntry*, wxIntegerHash,
+                    wxIntegerEqual, wxOffsetZipEntryMap_);
+
+class wxZipWeakLinks
+{
+public:
+    wxZipWeakLinks() : m_ref(1) { }
+
+    void Release(const wxZipInputStream* WXUNUSED(x))
+        { if (--m_ref == 0) delete this; }
+    void Release(wxFileOffset key)
+        { RemoveEntry(key); if (--m_ref == 0) delete this; }
+
+    wxZipWeakLinks *AddEntry(wxZipEntry *entry, wxFileOffset key);
+    void RemoveEntry(wxFileOffset key)
+        { m_entries.erase(wx_truncate_cast(key_type, key)); }
+    wxZipEntry *GetEntry(wxFileOffset key) const;
+    bool IsEmpty() const { return m_entries.empty(); }
+
+private:
+    ~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
+
+    typedef wxOffsetZipEntryMap_::key_type key_type;
+
+    int m_ref;
+    wxOffsetZipEntryMap_ m_entries;
+
+    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipWeakLinks)
+};
+
+wxZipWeakLinks *wxZipWeakLinks::AddEntry(wxZipEntry *entry, wxFileOffset key)
+{
+    m_entries[wx_truncate_cast(key_type, key)] = entry;
+    m_ref++;
+    return this;
+}
+
+wxZipEntry *wxZipWeakLinks::GetEntry(wxFileOffset key) const
+{
+    wxOffsetZipEntryMap_::const_iterator it =
+        m_entries.find(wx_truncate_cast(key_type, key));
+    return it != m_entries.end() ?  it->second : NULL;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// ZipEntry
+
+wxZipEntry::wxZipEntry(
+    const wxString& name /*=wxEmptyString*/,
+    const wxDateTime& dt /*=wxDateTime::Now()*/,
+    wxFileOffset size    /*=wxInvalidOffset*/)
+  :
+    m_SystemMadeBy(wxZIP_SYSTEM_MSDOS),
+    m_VersionMadeBy(wxMAJOR_VERSION * 10 + wxMINOR_VERSION),
+    m_VersionNeeded(VERSION_NEEDED_TO_EXTRACT),
+    m_Flags(0),
+    m_Method(wxZIP_METHOD_DEFAULT),
+    m_DateTime(dt),
+    m_Crc(0),
+    m_CompressedSize(wxInvalidOffset),
+    m_Size(size),
+    m_Key(wxInvalidOffset),
+    m_Offset(wxInvalidOffset),
+    m_DiskStart(0),
+    m_InternalAttributes(0),
+    m_ExternalAttributes(0),
+    m_Extra(NULL),
+    m_LocalExtra(NULL),
+    m_zipnotifier(NULL),
+    m_backlink(NULL)
+{
+    if (!name.empty())
+        SetName(name);
+}
+
+wxZipEntry::~wxZipEntry()
+{
+    if (m_backlink)
+        m_backlink->Release(m_Key);
+    Release(m_Extra);
+    Release(m_LocalExtra);
+}
+
+wxZipEntry::wxZipEntry(const wxZipEntry& e)
+  : wxArchiveEntry(e),
+    m_SystemMadeBy(e.m_SystemMadeBy),
+    m_VersionMadeBy(e.m_VersionMadeBy),
+    m_VersionNeeded(e.m_VersionNeeded),
+    m_Flags(e.m_Flags),
+    m_Method(e.m_Method),
+    m_DateTime(e.m_DateTime),
+    m_Crc(e.m_Crc),
+    m_CompressedSize(e.m_CompressedSize),
+    m_Size(e.m_Size),
+    m_Name(e.m_Name),
+    m_Key(e.m_Key),
+    m_Offset(e.m_Offset),
+    m_Comment(e.m_Comment),
+    m_DiskStart(e.m_DiskStart),
+    m_InternalAttributes(e.m_InternalAttributes),
+    m_ExternalAttributes(e.m_ExternalAttributes),
+    m_Extra(AddRef(e.m_Extra)),
+    m_LocalExtra(AddRef(e.m_LocalExtra)),
+    m_zipnotifier(NULL),
+    m_backlink(NULL)
+{
+}
+
+wxZipEntry& wxZipEntry::operator=(const wxZipEntry& e)
+{
+    if (&e != this) {
+        m_SystemMadeBy = e.m_SystemMadeBy;
+        m_VersionMadeBy = e.m_VersionMadeBy;
+        m_VersionNeeded = e.m_VersionNeeded;
+        m_Flags = e.m_Flags;
+        m_Method = e.m_Method;
+        m_DateTime = e.m_DateTime;
+        m_Crc = e.m_Crc;
+        m_CompressedSize = e.m_CompressedSize;
+        m_Size = e.m_Size;
+        m_Name = e.m_Name;
+        m_Key = e.m_Key;
+        m_Offset = e.m_Offset;
+        m_Comment = e.m_Comment;
+        m_DiskStart = e.m_DiskStart;
+        m_InternalAttributes = e.m_InternalAttributes;
+        m_ExternalAttributes = e.m_ExternalAttributes;
+        Copy(m_Extra, e.m_Extra);
+        Copy(m_LocalExtra, e.m_LocalExtra);
+        m_zipnotifier = NULL;
+        if (m_backlink) {
+            m_backlink->Release(m_Key);
+            m_backlink = NULL;
+        }
+    }
+    return *this;
+}
+
+wxString wxZipEntry::GetName(wxPathFormat format /*=wxPATH_NATIVE*/) const
+{
+    bool isDir = IsDir() && !m_Name.empty();
+
+    // optimisations for common (and easy) cases
+    switch (wxFileName::GetFormat(format)) {
+        case wxPATH_DOS:
+        {
+            wxString name(isDir ? m_Name + _T("\\") : m_Name);
+            for (size_t i = 0; i < name.length(); i++)
+                if (name[i] == _T('/'))
+                    name[i] = _T('\\');
+            return name;
+        }
+
+        case wxPATH_UNIX:
+            return isDir ? m_Name + _T("/") : m_Name;
+
+        default:
+            ;
+    }
+
+    wxFileName fn;
+
+    if (isDir)
+        fn.AssignDir(m_Name, wxPATH_UNIX);
+    else
+        fn.Assign(m_Name, wxPATH_UNIX);
+
+    return fn.GetFullPath(format);
+}
+
+// Static - Internally tars and zips use forward slashes for the path
+// separator, absolute paths aren't allowed, and directory names have a
+// trailing slash.  This function converts a path into this internal format,
+// but without a trailing slash for a directory.
+//
+wxString wxZipEntry::GetInternalName(const wxString& name,
+                                     wxPathFormat format /*=wxPATH_NATIVE*/,
+                                     bool *pIsDir        /*=NULL*/)
+{
+    wxString internal;
+
+    if (wxFileName::GetFormat(format) != wxPATH_UNIX)
+        internal = wxFileName(name, format).GetFullPath(wxPATH_UNIX);
+    else
+        internal = name;
+
+    bool isDir = !internal.empty() && internal.Last() == '/';
+    if (pIsDir)
+        *pIsDir = isDir;
+    if (isDir)
+        internal.erase(internal.length() - 1);
+
+    while (!internal.empty() && *internal.begin() == '/')
+        internal.erase(0, 1);
+    while (!internal.empty() && internal.compare(0, 2, _T("./")) == 0)
+        internal.erase(0, 2);
+    if (internal == _T(".") || internal == _T(".."))
+        internal = wxEmptyString;
+
+    return internal;
+}
+
+void wxZipEntry::SetSystemMadeBy(int system)
+{
+    int mode = GetMode();
+    bool wasUnix = IsMadeByUnix();
+
+    m_SystemMadeBy = (wxUint8)system;
+
+    if (!wasUnix && IsMadeByUnix()) {
+        SetIsDir(IsDir());
+        SetMode(mode);
+    } else if (wasUnix && !IsMadeByUnix()) {
+        m_ExternalAttributes &= 0xffff;
+    }
+}
+
+void wxZipEntry::SetIsDir(bool isDir /*=true*/)
+{
+    if (isDir)
+        m_ExternalAttributes |= wxZIP_A_SUBDIR;
+    else
+        m_ExternalAttributes &= ~wxZIP_A_SUBDIR;
+
+    if (IsMadeByUnix()) {
+        m_ExternalAttributes &= ~wxZIP_S_IFMT;
+        if (isDir)
+            m_ExternalAttributes |= wxZIP_S_IFDIR;
+        else
+            m_ExternalAttributes |= wxZIP_S_IFREG;
+    }
+}
+
+// Return unix style permission bits
+//
+int wxZipEntry::GetMode() const
+{
+    // return unix permissions if present
+    if (IsMadeByUnix())
+        return (m_ExternalAttributes >> 16) & 0777;
+
+    // otherwise synthesize from the dos attribs
+    int mode = 0644;
+    if (m_ExternalAttributes & wxZIP_A_RDONLY)
+        mode &= ~0200;
+    if (m_ExternalAttributes & wxZIP_A_SUBDIR)
+        mode |= 0111;
+
+    return mode;
+}
+
+// Set unix permissions
+//
+void wxZipEntry::SetMode(int mode)
+{
+    // Set dos attrib bits to be compatible
+    if (mode & 0222)
+        m_ExternalAttributes &= ~wxZIP_A_RDONLY;
+    else
+        m_ExternalAttributes |= wxZIP_A_RDONLY;
+
+    // set the actual unix permission bits if the system type allows
+    if (IsMadeByUnix()) {
+        m_ExternalAttributes &= ~(0777L << 16);
+        m_ExternalAttributes |= (mode & 0777L) << 16;
+    }
+}
+
+const char *wxZipEntry::GetExtra() const
+{
+    return m_Extra ? m_Extra->GetData() : NULL;
+}
+
+size_t wxZipEntry::GetExtraLen() const
+{
+    return m_Extra ? m_Extra->GetSize() : 0;
+}
+
+void wxZipEntry::SetExtra(const char *extra, size_t len)
+{
+    Unique(m_Extra, len);
+    if (len)
+        memcpy(m_Extra->GetData(), extra, len);
+}
+
+const char *wxZipEntry::GetLocalExtra() const
+{
+    return m_LocalExtra ? m_LocalExtra->GetData() : NULL;
+}
+
+size_t  wxZipEntry::GetLocalExtraLen() const
+{
+    return m_LocalExtra ? m_LocalExtra->GetSize() : 0;
+}
+
+void wxZipEntry::SetLocalExtra(const char *extra, size_t len)
+{
+    Unique(m_LocalExtra, len);
+    if (len)
+        memcpy(m_LocalExtra->GetData(), extra, len);
+}
+
+void wxZipEntry::SetNotifier(wxZipNotifier& notifier)
+{
+    wxArchiveEntry::UnsetNotifier();
+    m_zipnotifier = &notifier;
+    m_zipnotifier->OnEntryUpdated(*this);
+}
+
+void wxZipEntry::Notify()
+{
+    if (m_zipnotifier)
+        m_zipnotifier->OnEntryUpdated(*this);
+    else if (GetNotifier())
+        GetNotifier()->OnEntryUpdated(*this);
+}
+
+void wxZipEntry::UnsetNotifier()
+{
+    wxArchiveEntry::UnsetNotifier();
+    m_zipnotifier = NULL;
+}
+
+size_t wxZipEntry::ReadLocal(wxInputStream& stream, wxMBConv& conv)
+{
+    wxUint16 nameLen, extraLen;
+    wxUint32 compressedSize, size, crc;
+
+    wxZipHeader ds(stream, LOCAL_SIZE - 4);
+    if (!ds)
+        return 0;
+
+    ds >> m_VersionNeeded >> m_Flags >> m_Method;
+    SetDateTime(wxDateTime().SetFromDOS(ds.Read32()));
+    ds >> crc >> compressedSize >> size >> nameLen >> extraLen;
+
+    bool sumsValid = (m_Flags & wxZIP_SUMS_FOLLOW) == 0;
+
+    if (sumsValid || crc)
+        m_Crc = crc;
+    if ((sumsValid || compressedSize) || m_Method == wxZIP_METHOD_STORE)
+        m_CompressedSize = compressedSize;
+    if ((sumsValid || size) || m_Method == wxZIP_METHOD_STORE)
+        m_Size = size;
+
+    SetName(ReadString(stream, nameLen, conv), wxPATH_UNIX);
+    if (stream.LastRead() != nameLen + 0u)
+        return 0;
+
+    if (extraLen || GetLocalExtraLen()) {
+        Unique(m_LocalExtra, extraLen);
+        if (extraLen) {
+            stream.Read(m_LocalExtra->GetData(), extraLen);
+            if (stream.LastRead() != extraLen + 0u)
+                return 0;
+        }
+    }
+
+    return LOCAL_SIZE + nameLen + extraLen;
+}
+
+size_t wxZipEntry::WriteLocal(wxOutputStream& stream, wxMBConv& conv) const
+{
+    wxString unixName = GetName(wxPATH_UNIX);
+    const wxWX2MBbuf name_buf = conv.cWX2MB(unixName);
+    const char *name = name_buf;
+    if (!name) name = "";
+    wxUint16 nameLen = wx_truncate_cast(wxUint16, strlen(name));
+
+    wxDataOutputStream ds(stream);
+
+    ds << m_VersionNeeded << m_Flags << m_Method;
+    ds.Write32(GetDateTime().GetAsDOS());
+
+    ds.Write32(m_Crc);
+    ds.Write32(m_CompressedSize != wxInvalidOffset ?
+               wx_truncate_cast(wxUint32, m_CompressedSize) : 0);
+    ds.Write32(m_Size != wxInvalidOffset ?
+               wx_truncate_cast(wxUint32, m_Size) : 0);
+
+    ds << nameLen;
+    wxUint16 extraLen = wx_truncate_cast(wxUint16, GetLocalExtraLen());
+    ds.Write16(extraLen);
+
+    stream.Write(name, nameLen);
+    if (extraLen)
+        stream.Write(m_LocalExtra->GetData(), extraLen);
+
+    return LOCAL_SIZE + nameLen + extraLen;
+}
+
+size_t wxZipEntry::ReadCentral(wxInputStream& stream, wxMBConv& conv)
+{
+    wxUint16 nameLen, extraLen, commentLen;
+
+    wxZipHeader ds(stream, CENTRAL_SIZE - 4);
+    if (!ds)
+        return 0;
+
+    ds >> m_VersionMadeBy >> m_SystemMadeBy;
+
+    SetVersionNeeded(ds.Read16());
+    SetFlags(ds.Read16());
+    SetMethod(ds.Read16());
+    SetDateTime(wxDateTime().SetFromDOS(ds.Read32()));
+    SetCrc(ds.Read32());
+    SetCompressedSize(ds.Read32());
+    SetSize(ds.Read32());
+
+    ds >> nameLen >> extraLen >> commentLen
+       >> m_DiskStart >> m_InternalAttributes >> m_ExternalAttributes;
+    SetOffset(ds.Read32());
+
+    SetName(ReadString(stream, nameLen, conv), wxPATH_UNIX);
+    if (stream.LastRead() != nameLen + 0u)
+        return 0;
+
+    if (extraLen || GetExtraLen()) {
+        Unique(m_Extra, extraLen);
+        if (extraLen) {
+            stream.Read(m_Extra->GetData(), extraLen);
+            if (stream.LastRead() != extraLen + 0u)
+                return 0;
+        }
+    }
+
+    if (commentLen) {
+        m_Comment = ReadString(stream, commentLen, conv);
+        if (stream.LastRead() != commentLen + 0u)
+            return 0;
+    } else {
+        m_Comment.clear();
+    }
+
+    return CENTRAL_SIZE + nameLen + extraLen + commentLen;
+}
+
+size_t wxZipEntry::WriteCentral(wxOutputStream& stream, wxMBConv& conv) const
+{
+    wxString unixName = GetName(wxPATH_UNIX);
+    const wxWX2MBbuf name_buf = conv.cWX2MB(unixName);
+    const char *name = name_buf;
+    if (!name) name = "";
+    wxUint16 nameLen = wx_truncate_cast(wxUint16, strlen(name));
+
+    const wxWX2MBbuf comment_buf = conv.cWX2MB(m_Comment);
+    const char *comment = comment_buf;
+    if (!comment) comment = "";
+    wxUint16 commentLen = wx_truncate_cast(wxUint16, strlen(comment));
+
+    wxUint16 extraLen = wx_truncate_cast(wxUint16, GetExtraLen());
+
+    wxDataOutputStream ds(stream);
+
+    ds << CENTRAL_MAGIC << m_VersionMadeBy << m_SystemMadeBy;
+
+    ds.Write16(wx_truncate_cast(wxUint16, GetVersionNeeded()));
+    ds.Write16(wx_truncate_cast(wxUint16, GetFlags()));
+    ds.Write16(wx_truncate_cast(wxUint16, GetMethod()));
+    ds.Write32(GetDateTime().GetAsDOS());
+    ds.Write32(GetCrc());
+    ds.Write32(wx_truncate_cast(wxUint32, GetCompressedSize()));
+    ds.Write32(wx_truncate_cast(wxUint32, GetSize()));
+    ds.Write16(nameLen);
+    ds.Write16(extraLen);
+
+    ds << commentLen << m_DiskStart << m_InternalAttributes
+       << m_ExternalAttributes << wx_truncate_cast(wxUint32, GetOffset());
+
+    stream.Write(name, nameLen);
+    if (extraLen)
+        stream.Write(GetExtra(), extraLen);
+    stream.Write(comment, commentLen);
+
+    return CENTRAL_SIZE + nameLen + extraLen + commentLen;
+}
+
+// Info-zip prefixes this record with a signature, but pkzip doesn't. So if
+// the 1st value is the signature then it is probably an info-zip record,
+// though there is a small chance that it is in fact a pkzip record which
+// happens to have the signature as it's CRC.
+//
+size_t wxZipEntry::ReadDescriptor(wxInputStream& stream)
+{
+    wxZipHeader ds(stream, SUMS_SIZE);
+    if (!ds)
+        return 0;
+
+    m_Crc = ds.Read32();
+    m_CompressedSize = ds.Read32();
+    m_Size = ds.Read32();
+
+    // if 1st value is the signature then this is probably an info-zip record
+    if (m_Crc == SUMS_MAGIC)
+    {
+        wxZipHeader buf(stream, 8);
+        wxUint32 u1 = buf.GetSize() >= 4 ? buf.Read32() : (wxUint32)LOCAL_MAGIC;
+        wxUint32 u2 = buf.GetSize() == 8 ? buf.Read32() : 0;
+
+        // look for the signature of the following record to decide which
+        if ((u1 == LOCAL_MAGIC || u1 == CENTRAL_MAGIC) &&
+            (u2 != LOCAL_MAGIC && u2 != CENTRAL_MAGIC))
+        {
+            // it's a pkzip style record after all!
+            if (buf.GetSize() > 0)
+                stream.Ungetch(buf.GetData(), buf.GetSize());
+        }
+        else
+        {
+            // it's an info-zip record as expected
+            if (buf.GetSize() > 4)
+                stream.Ungetch(buf.GetData() + 4, buf.GetSize() - 4);
+            m_Crc = wx_truncate_cast(wxUint32, m_CompressedSize);
+            m_CompressedSize = m_Size;
+            m_Size = u1;
+            return SUMS_SIZE + 4;
+        }
+    }
+
+    return SUMS_SIZE;
+}
+
+size_t wxZipEntry::WriteDescriptor(wxOutputStream& stream, wxUint32 crc,
+                                   wxFileOffset compressedSize, wxFileOffset size)
+{
+    m_Crc = crc;
+    m_CompressedSize = compressedSize;
+    m_Size = size;
+
+    wxDataOutputStream ds(stream);
+
+    ds.Write32(crc);
+    ds.Write32(wx_truncate_cast(wxUint32, compressedSize));
+    ds.Write32(wx_truncate_cast(wxUint32, size));
+
+    return SUMS_SIZE;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// wxZipEndRec - holds the end of central directory record
+
+class wxZipEndRec
+{
+public:
+    wxZipEndRec();
+
+    int GetDiskNumber() const                   { return m_DiskNumber; }
+    int GetStartDisk() const                    { return m_StartDisk; }
+    int GetEntriesHere() const                  { return m_EntriesHere; }
+    int GetTotalEntries() const                 { return m_TotalEntries; }
+    wxFileOffset GetSize() const                { return m_Size; }
+    wxFileOffset GetOffset() const              { return m_Offset; }
+    wxString GetComment() const                 { return m_Comment; }
+
+    void SetDiskNumber(int num)
+        { m_DiskNumber = wx_truncate_cast(wxUint16, num); }
+    void SetStartDisk(int num)
+        { m_StartDisk = wx_truncate_cast(wxUint16, num); }
+    void SetEntriesHere(int num)
+        { m_EntriesHere = wx_truncate_cast(wxUint16, num); }
+    void SetTotalEntries(int num)
+        { m_TotalEntries = wx_truncate_cast(wxUint16, num); }
+    void SetSize(wxFileOffset size)
+        { m_Size = wx_truncate_cast(wxUint32, size); }
+    void SetOffset(wxFileOffset offset)
+        { m_Offset = wx_truncate_cast(wxUint32, offset); }
+    void SetComment(const wxString& comment)
+        { m_Comment = comment; }
+
+    bool Read(wxInputStream& stream, wxMBConv& conv);
+    bool Write(wxOutputStream& stream, wxMBConv& conv) const;
+
+private:
+    wxUint16 m_DiskNumber;
+    wxUint16 m_StartDisk;
+    wxUint16 m_EntriesHere;
+    wxUint16 m_TotalEntries;
+    wxUint32 m_Size;
+    wxUint32 m_Offset;
+    wxString m_Comment;
+};
+
+wxZipEndRec::wxZipEndRec()
+  : m_DiskNumber(0),
+    m_StartDisk(0),
+    m_EntriesHere(0),
+    m_TotalEntries(0),
+    m_Size(0),
+    m_Offset(0)
+{
+}
+
+bool wxZipEndRec::Write(wxOutputStream& stream, wxMBConv& conv) const
+{
+    const wxWX2MBbuf comment_buf = conv.cWX2MB(m_Comment);
+    const char *comment = comment_buf;
+    if (!comment) comment = "";
+    wxUint16 commentLen = (wxUint16)strlen(comment);
+
+    wxDataOutputStream ds(stream);
+
+    ds << END_MAGIC << m_DiskNumber << m_StartDisk << m_EntriesHere
+       << m_TotalEntries << m_Size << m_Offset << commentLen;
+
+    stream.Write(comment, commentLen);
+
+    return stream.IsOk();
+}
+
+bool wxZipEndRec::Read(wxInputStream& stream, wxMBConv& conv)
+{
+    wxZipHeader ds(stream, END_SIZE - 4);
+    if (!ds)
+        return false;
+
+    wxUint16 commentLen;
+
+    ds >> m_DiskNumber >> m_StartDisk >> m_EntriesHere
+       >> m_TotalEntries >> m_Size >> m_Offset >> commentLen;
+
+    if (commentLen) {
+        m_Comment = ReadString(stream, commentLen, conv);
+        if (stream.LastRead() != commentLen + 0u)
+            return false;
+    }
+
+    if (m_DiskNumber != 0 || m_StartDisk != 0 ||
+            m_EntriesHere != m_TotalEntries)
+        wxLogWarning(_("assuming this is a multi-part zip concatenated"));
+
+    return true;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// A weak link from an input stream to an output stream
+
+class wxZipStreamLink
+{
+public:
+    wxZipStreamLink(wxZipOutputStream *stream) : m_ref(1), m_stream(stream) { }
+
+    wxZipStreamLink *AddRef() { m_ref++; return this; }
+    wxZipOutputStream *GetOutputStream() const { return m_stream; }
+
+    void Release(class wxZipInputStream *WXUNUSED(s))
+        { if (--m_ref == 0) delete this; }
+    void Release(class wxZipOutputStream *WXUNUSED(s))
+        { m_stream = NULL; if (--m_ref == 0) delete this; }
+
+private:
+    ~wxZipStreamLink() { }
+
+    int m_ref;
+    wxZipOutputStream *m_stream;
+
+    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipStreamLink)
+};
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Input stream
+
+// leave the default wxZipEntryPtr free for users
+wxDECLARE_SCOPED_PTR(wxZipEntry, wxZipEntryPtr_)
+wxDEFINE_SCOPED_PTR (wxZipEntry, wxZipEntryPtr_)
+
+// constructor
+//
+wxZipInputStream::wxZipInputStream(wxInputStream& stream,
+                                   wxMBConv& conv /*=wxConvLocal*/)
+  : wxArchiveInputStream(stream, conv)
+{
+    Init();
+}
+
+wxZipInputStream::wxZipInputStream(wxInputStream *stream,
+                                   wxMBConv& conv /*=wxConvLocal*/)
+  : wxArchiveInputStream(stream, conv)
+{
+    Init();
+}
+
+#if WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE
+
+// Part of the compatibility constructor, which has been made inline to
+// avoid a problem with it not being exported by mingw 3.2.3
+//
+void wxZipInputStream::Init(const wxString& file)
+{
+    // no error messages
+    wxLogNull nolog;
+    Init();
+    m_allowSeeking = true;
+    wxFFileInputStream *ffile;
+    ffile = wx_static_cast(wxFFileInputStream*, m_parent_i_stream);
+    wxZipEntryPtr_ entry;
+
+    if (ffile->Ok()) {
+        do {
+            entry.reset(GetNextEntry());
+        }
+        while (entry.get() != NULL && entry->GetInternalName() != file);
+    }
+
+    if (entry.get() == NULL)
+        m_lasterror = wxSTREAM_READ_ERROR;
+}
+
+wxInputStream* wxZipInputStream::OpenFile(const wxString& archive)
+{
+    wxLogNull nolog;
+    return new wxFFileInputStream(archive);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6 && wxUSE_FFILE
+
+void wxZipInputStream::Init()
+{
+    m_store = new wxStoredInputStream(*m_parent_i_stream);
+    m_inflate = NULL;
+    m_rawin = NULL;
+    m_raw = false;
+    m_headerSize = 0;
+    m_decomp = NULL;
+    m_parentSeekable = false;
+    m_weaklinks = new wxZipWeakLinks;
+    m_streamlink = NULL;
+    m_offsetAdjustment = 0;
+    m_position = wxInvalidOffset;
+    m_signature = 0;
+    m_TotalEntries = 0;
+    m_lasterror = m_parent_i_stream->GetLastError();
+#if WXWIN_COMPATIBILITY_2_6
+    m_allowSeeking = false;
+#endif
+}
+
+wxZipInputStream::~wxZipInputStream()
+{
+    CloseDecompressor(m_decomp);
+
+    delete m_store;
+    delete m_inflate;
+    delete m_rawin;
+
+    m_weaklinks->Release(this);
+
+    if (m_streamlink)
+        m_streamlink->Release(this);
+}
+
+wxString wxZipInputStream::GetComment()
+{
+    if (m_position == wxInvalidOffset)
+        if (!LoadEndRecord())
+            return wxEmptyString;
+
+    if (!m_parentSeekable && Eof() && m_signature) {
+        m_lasterror = wxSTREAM_NO_ERROR;
+        m_lasterror = ReadLocal(true);
+    }
+
+    return m_Comment;
+}
+
+int wxZipInputStream::GetTotalEntries()
+{
+    if (m_position == wxInvalidOffset)
+        LoadEndRecord();
+    return m_TotalEntries;
+}
+
+wxZipStreamLink *wxZipInputStream::MakeLink(wxZipOutputStream *out)
+{
+    wxZipStreamLink *link = NULL;
+
+    if (!m_parentSeekable && (IsOpened() || !Eof())) {
+        link = new wxZipStreamLink(out);
+        if (m_streamlink)
+            m_streamlink->Release(this);
+        m_streamlink = link->AddRef();
+    }
+
+    return link;
+}
+
+bool wxZipInputStream::LoadEndRecord()
+{
+    wxCHECK(m_position == wxInvalidOffset, false);
+    if (!IsOk())
+        return false;
+
+    m_position = 0;
+
+    // First find the end-of-central-directory record.
+    if (!FindEndRecord()) {
+        // failed, so either this is a non-seekable stream (ok), or not a zip
+        if (m_parentSeekable) {
+            m_lasterror = wxSTREAM_READ_ERROR;
+            wxLogError(_("invalid zip file"));
+            return false;
+        }
+        else {
+            wxLogNull nolog;
+            wxFileOffset pos = m_parent_i_stream->TellI();
+            if (pos != wxInvalidOffset)
+                m_offsetAdjustment = m_position = pos;
+            return true;
+        }
+    }
+
+    wxZipEndRec endrec;
+
+    // Read in the end record
+    wxFileOffset endPos = m_parent_i_stream->TellI() - 4;
+    if (!endrec.Read(*m_parent_i_stream, GetConv()))
+        return false;
+
+    m_TotalEntries = endrec.GetTotalEntries();
+    m_Comment = endrec.GetComment();
+
+    // Now find the central-directory. we have the file offset of
+    // the CD, so look there first.
+    if (m_parent_i_stream->SeekI(endrec.GetOffset()) != wxInvalidOffset &&
+            ReadSignature() == CENTRAL_MAGIC) {
+        m_signature = CENTRAL_MAGIC;
+        m_position = endrec.GetOffset();
+        m_offsetAdjustment = 0;
+        return true;
+    }
+
+    // If it's not there, then it could be that the zip has been appended
+    // to a self extractor, so take the CD size (also in endrec), subtract
+    // it from the file offset of the end-central-directory and look there.
+    if (m_parent_i_stream->SeekI(endPos - endrec.GetSize())
+            != wxInvalidOffset && ReadSignature() == CENTRAL_MAGIC) {
+        m_signature = CENTRAL_MAGIC;
+        m_position = endPos - endrec.GetSize();
+        m_offsetAdjustment = m_position - endrec.GetOffset();
+        return true;
+    }
+
+    wxLogError(_("can't find central directory in zip"));
+    m_lasterror = wxSTREAM_READ_ERROR;
+    return false;
+}
+
+// Find the end-of-central-directory record.
+// If found the stream will be positioned just past the 4 signature bytes.
+//
+bool wxZipInputStream::FindEndRecord()
+{
+    if (!m_parent_i_stream->IsSeekable())
+        return false;
+
+    // usually it's 22 bytes in size and the last thing in the file
+    {
+        wxLogNull nolog;
+        if (m_parent_i_stream->SeekI(-END_SIZE, wxFromEnd) == wxInvalidOffset)
+            return false;
+    }
+
+    m_parentSeekable = true;
+    m_signature = 0;
+    char magic[4];
+    if (m_parent_i_stream->Read(magic, 4).LastRead() != 4)
+        return false;
+    if ((m_signature = CrackUint32(magic)) == END_MAGIC)
+        return true;
+
+    // unfortunately, the record has a comment field that can be up to 65535
+    // bytes in length, so if the signature not found then search backwards.
+    wxFileOffset pos = m_parent_i_stream->TellI();
+    const int BUFSIZE = 1024;
+    wxCharBuffer buf(BUFSIZE);
+
+    memcpy(buf.data(), magic, 3);
+    wxFileOffset minpos = wxMax(pos - 65535L, 0);
+
+    while (pos > minpos) {
+        size_t len = wx_truncate_cast(size_t,
+                        pos - wxMax(pos - (BUFSIZE - 3), minpos));
+        memcpy(buf.data() + len, buf, 3);
+        pos -= len;
+
+        if (m_parent_i_stream->SeekI(pos, wxFromStart) == wxInvalidOffset ||
+                m_parent_i_stream->Read(buf.data(), len).LastRead() != len)
+            return false;
+
+        char *p = buf.data() + len;
+
+        while (p-- > buf.data()) {
+            if ((m_signature = CrackUint32(p)) == END_MAGIC) {
+                size_t remainder = buf.data() + len - p;
+                if (remainder > 4)
+                    m_parent_i_stream->Ungetch(p + 4, remainder - 4);
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+wxZipEntry *wxZipInputStream::GetNextEntry()
+{
+    if (m_position == wxInvalidOffset)
+        if (!LoadEndRecord())
+            return NULL;
+
+    m_lasterror = m_parentSeekable ? ReadCentral() : ReadLocal();
+    if (!IsOk())
+        return NULL;
+
+    wxZipEntryPtr_ entry(new wxZipEntry(m_entry));
+    entry->m_backlink = m_weaklinks->AddEntry(entry.get(), entry->GetKey());
+    return entry.release();
+}
+
+wxStreamError wxZipInputStream::ReadCentral()
+{
+    if (!AtHeader())
+        CloseEntry();
+
+    if (m_signature == END_MAGIC)
+        return wxSTREAM_EOF;
+
+    if (m_signature != CENTRAL_MAGIC) {
+        wxLogError(_("error reading zip central directory"));
+        return wxSTREAM_READ_ERROR;
+    }
+
+    if (QuietSeek(*m_parent_i_stream, m_position + 4) == wxInvalidOffset)
+        return wxSTREAM_READ_ERROR;
+
+    size_t size = m_entry.ReadCentral(*m_parent_i_stream, GetConv());
+    if (!size) {
+        m_signature = 0;
+        return wxSTREAM_READ_ERROR;
+    }
+
+    m_position += size;
+    m_signature = ReadSignature();
+
+    if (m_offsetAdjustment)
+        m_entry.SetOffset(m_entry.GetOffset() + m_offsetAdjustment);
+    m_entry.SetKey(m_entry.GetOffset());
+
+    return wxSTREAM_NO_ERROR;
+}
+
+wxStreamError wxZipInputStream::ReadLocal(bool readEndRec /*=false*/)
+{
+    if (!AtHeader())
+        CloseEntry();
+
+    if (!m_signature)
+        m_signature = ReadSignature();
+
+    if (m_signature == CENTRAL_MAGIC || m_signature == END_MAGIC) {
+        if (m_streamlink && !m_streamlink->GetOutputStream()) {
+            m_streamlink->Release(this);
+            m_streamlink = NULL;
+        }
+    }
+
+    while (m_signature == CENTRAL_MAGIC) {
+        if (m_weaklinks->IsEmpty() && m_streamlink == NULL)
+            return wxSTREAM_EOF;
+
+        size_t size = m_entry.ReadCentral(*m_parent_i_stream, GetConv());
+        m_position += size;
+        m_signature = 0;
+        if (!size)
+            return wxSTREAM_READ_ERROR;
+
+        wxZipEntry *entry = m_weaklinks->GetEntry(m_entry.GetOffset());
+        if (entry) {
+            entry->SetSystemMadeBy(m_entry.GetSystemMadeBy());
+            entry->SetVersionMadeBy(m_entry.GetVersionMadeBy());
+            entry->SetComment(m_entry.GetComment());
+            entry->SetDiskStart(m_entry.GetDiskStart());
+            entry->SetInternalAttributes(m_entry.GetInternalAttributes());
+            entry->SetExternalAttributes(m_entry.GetExternalAttributes());
+            Copy(entry->m_Extra, m_entry.m_Extra);
+            entry->Notify();
+            m_weaklinks->RemoveEntry(entry->GetOffset());
+        }
+
+        m_signature = ReadSignature();
+    }
+
+    if (m_signature == END_MAGIC) {
+        if (readEndRec || m_streamlink) {
+            wxZipEndRec endrec;
+            endrec.Read(*m_parent_i_stream, GetConv());
+            m_Comment = endrec.GetComment();
+            m_signature = 0;
+            if (m_streamlink) {
+                m_streamlink->GetOutputStream()->SetComment(endrec.GetComment());
+                m_streamlink->Release(this);
+                m_streamlink = NULL;
+            }
+        }
+        return wxSTREAM_EOF;
+    }
+
+    if (m_signature == LOCAL_MAGIC) {
+        m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv());
+        m_signature = 0;
+        m_entry.SetOffset(m_position);
+        m_entry.SetKey(m_position);
+
+        if (m_headerSize) {
+            m_TotalEntries++;
+            return wxSTREAM_NO_ERROR;
+        }
+    }
+
+    wxLogError(_("error reading zip local header"));
+    return wxSTREAM_READ_ERROR;
+}
+
+wxUint32 wxZipInputStream::ReadSignature()
+{
+    char magic[4];
+    m_parent_i_stream->Read(magic, 4);
+    return m_parent_i_stream->LastRead() == 4 ? CrackUint32(magic) : 0;
+}
+
+bool wxZipInputStream::OpenEntry(wxArchiveEntry& entry)
+{
+    wxZipEntry *zipEntry = wxStaticCast(&entry, wxZipEntry);
+    return zipEntry ? OpenEntry(*zipEntry) : false;
+}
+
+// Open an entry
+//
+bool wxZipInputStream::DoOpen(wxZipEntry *entry, bool raw)
+{
+    if (m_position == wxInvalidOffset)
+        if (!LoadEndRecord())
+            return false;
+    if (m_lasterror == wxSTREAM_READ_ERROR)
+        return false;
+    if (IsOpened())
+        CloseEntry();
+
+    m_raw = raw;
+
+    if (entry) {
+        if (AfterHeader() && entry->GetKey() == m_entry.GetOffset())
+            return true;
+        // can only open the current entry on a non-seekable stream
+        wxCHECK(m_parentSeekable, false);
+    }
+
+    m_lasterror = wxSTREAM_READ_ERROR;
+
+    if (entry)
+        m_entry = *entry;
+
+    if (m_parentSeekable) {
+        if (QuietSeek(*m_parent_i_stream, m_entry.GetOffset())
+                == wxInvalidOffset)
+            return false;
+        if (ReadSignature() != LOCAL_MAGIC) {
+            wxLogError(_("bad zipfile offset to entry"));
+            return false;
+        }
+    }
+
+    if (m_parentSeekable || AtHeader()) {
+        m_headerSize = m_entry.ReadLocal(*m_parent_i_stream, GetConv());
+        if (m_headerSize && m_parentSeekable) {
+            wxZipEntry *ref = m_weaklinks->GetEntry(m_entry.GetKey());
+            if (ref) {
+                Copy(ref->m_LocalExtra, m_entry.m_LocalExtra);
+                ref->Notify();
+                m_weaklinks->RemoveEntry(ref->GetKey());
+            }
+            if (entry && entry != ref) {
+                Copy(entry->m_LocalExtra, m_entry.m_LocalExtra);
+                entry->Notify();
+            }
+        }
+    }
+
+    if (m_headerSize)
+        m_lasterror = wxSTREAM_NO_ERROR;
+    return IsOk();
+}
+
+bool wxZipInputStream::OpenDecompressor(bool raw /*=false*/)
+{
+    wxASSERT(AfterHeader());
+
+    wxFileOffset compressedSize = m_entry.GetCompressedSize();
+
+    if (raw)
+        m_raw = true;
+
+    if (m_raw) {
+        if (compressedSize != wxInvalidOffset) {
+            m_store->Open(compressedSize);
+            m_decomp = m_store;
+        } else {
+            if (!m_rawin)
+                m_rawin = new wxRawInputStream(*m_parent_i_stream);
+            m_decomp = m_rawin->Open(OpenDecompressor(m_rawin->GetTee()));
+        }
+    } else {
+        if (compressedSize != wxInvalidOffset &&
+                (m_entry.GetMethod() != wxZIP_METHOD_DEFLATE ||
+                 wxZlibInputStream::CanHandleGZip())) {
+            m_store->Open(compressedSize);
+            m_decomp = OpenDecompressor(*m_store);
+        } else {
+            m_decomp = OpenDecompressor(*m_parent_i_stream);
+        }
+    }
+
+    m_crcAccumulator = crc32(0, Z_NULL, 0);
+    m_lasterror = m_decomp ? m_decomp->GetLastError() : wxSTREAM_READ_ERROR;
+    return IsOk();
+}
+
+// Can be overriden to add support for additional decompression methods
+//
+wxInputStream *wxZipInputStream::OpenDecompressor(wxInputStream& stream)
+{
+    switch (m_entry.GetMethod()) {
+        case wxZIP_METHOD_STORE:
+            if (m_entry.GetSize() == wxInvalidOffset) {
+                wxLogError(_("stored file length not in Zip header"));
+                break;
+            }
+            m_store->Open(m_entry.GetSize());
+            return m_store;
+
+        case wxZIP_METHOD_DEFLATE:
+            if (!m_inflate)
+                m_inflate = new wxZlibInputStream2(stream);
+            else
+                m_inflate->Open(stream);
+            return m_inflate;
+
+        default:
+            wxLogError(_("unsupported Zip compression method"));
+    }
+
+    return NULL;
+}
+
+bool wxZipInputStream::CloseDecompressor(wxInputStream *decomp)
+{
+    if (decomp && decomp == m_rawin)
+        return CloseDecompressor(m_rawin->GetFilterInputStream());
+    if (decomp != m_store && decomp != m_inflate)
+        delete decomp;
+    return true;
+}
+
+// Closes the current entry and positions the underlying stream at the start
+// of the next entry
+//
+bool wxZipInputStream::CloseEntry()
+{
+    if (AtHeader())
+        return true;
+    if (m_lasterror == wxSTREAM_READ_ERROR)
+        return false;
+
+    if (!m_parentSeekable) {
+        if (!IsOpened() && !OpenDecompressor(true))
+            return false;
+
+        const int BUFSIZE = 8192;
+        wxCharBuffer buf(BUFSIZE);
+        while (IsOk())
+            Read(buf.data(), BUFSIZE);
+
+        m_position += m_headerSize + m_entry.GetCompressedSize();
+    }
+
+    if (m_lasterror == wxSTREAM_EOF)
+        m_lasterror = wxSTREAM_NO_ERROR;
+
+    CloseDecompressor(m_decomp);
+    m_decomp = NULL;
+    m_entry = wxZipEntry();
+    m_headerSize = 0;
+    m_raw = false;
+
+    return IsOk();
+}
+
+size_t wxZipInputStream::OnSysRead(void *buffer, size_t size)
+{
+    if (!IsOpened())
+        if ((AtHeader() && !DoOpen()) || !OpenDecompressor())
+            m_lasterror = wxSTREAM_READ_ERROR;
+    if (!IsOk() || !size)
+        return 0;
+
+    size_t count = m_decomp->Read(buffer, size).LastRead();
+    if (!m_raw)
+        m_crcAccumulator = crc32(m_crcAccumulator, (Byte*)buffer, count);
+    if (count < size)
+        m_lasterror = m_decomp->GetLastError();
+
+    if (Eof()) {
+        if ((m_entry.GetFlags() & wxZIP_SUMS_FOLLOW) != 0) {
+            m_headerSize += m_entry.ReadDescriptor(*m_parent_i_stream);
+            wxZipEntry *entry = m_weaklinks->GetEntry(m_entry.GetKey());
+
+            if (entry) {
+                entry->SetCrc(m_entry.GetCrc());
+                entry->SetCompressedSize(m_entry.GetCompressedSize());
+                entry->SetSize(m_entry.GetSize());
+                entry->Notify();
+            }
+        }
+
+        if (!m_raw) {
+            m_lasterror = wxSTREAM_READ_ERROR;
+
+            if (m_entry.GetSize() != TellI())
+                wxLogError(_("reading zip stream (entry %s): bad length"),
+                           m_entry.GetName().c_str());
+            else if (m_crcAccumulator != m_entry.GetCrc())
+                wxLogError(_("reading zip stream (entry %s): bad crc"),
+                           m_entry.GetName().c_str());
+            else
+                m_lasterror = wxSTREAM_EOF;
+        }
+    }
+
+    return count;
+}
+
+#if WXWIN_COMPATIBILITY_2_6
+
+// Borrowed from VS's zip stream (c) 1999 Vaclav Slavik
+//
+wxFileOffset wxZipInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
+{
+    // seeking works when the stream is created with the compatibility
+    // constructor
+    if (!m_allowSeeking)
+        return wxInvalidOffset;
+    if (!IsOpened())
+        if ((AtHeader() && !DoOpen()) || !OpenDecompressor())
+            m_lasterror = wxSTREAM_READ_ERROR;
+    if (!IsOk())
+        return wxInvalidOffset;
+
+    // NB: since ZIP files don't natively support seeking, we have to
+    //     implement a brute force workaround -- reading all the data
+    //     between current and the new position (or between beginning of
+    //     the file and new position...)
+
+    wxFileOffset nextpos;
+    wxFileOffset pos = TellI();
+
+    switch ( mode )
+    {
+        case wxFromCurrent : nextpos = seek + pos; break;
+        case wxFromStart : nextpos = seek; break;
+        case wxFromEnd : nextpos = GetLength() + seek; break;
+        default : nextpos = pos; break; /* just to fool compiler, never happens */
+    }
+
+    wxFileOffset toskip wxDUMMY_INITIALIZE(0);
+    if ( nextpos >= pos )
+    {
+        toskip = nextpos - pos;
+    }
+    else
+    {
+        wxZipEntry current(m_entry);
+        if (!OpenEntry(current))
+        {
+            m_lasterror = wxSTREAM_READ_ERROR;
+            return pos;
+        }
+        toskip = nextpos;
+    }
+
+    if ( toskip > 0 )
+    {
+        const int BUFSIZE = 4096;
+        size_t sz;
+        char buffer[BUFSIZE];
+        while ( toskip > 0 )
+        {
+            sz = wx_truncate_cast(size_t, wxMin(toskip, BUFSIZE));
+            Read(buffer, sz);
+            toskip -= sz;
+        }
+    }
+
+    pos = nextpos;
+    return pos;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Output stream
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxZipEntryList_)
+
+wxZipOutputStream::wxZipOutputStream(wxOutputStream& stream,
+                                     int level      /*=-1*/,
+                                     wxMBConv& conv /*=wxConvLocal*/)
+  : wxArchiveOutputStream(stream, conv)
+{
+    Init(level);
+}
+
+wxZipOutputStream::wxZipOutputStream(wxOutputStream *stream,
+                                     int level      /*=-1*/,
+                                     wxMBConv& conv /*=wxConvLocal*/)
+  : wxArchiveOutputStream(stream, conv)
+{
+    Init(level);
+}
+
+void wxZipOutputStream::Init(int level)
+{
+    m_store = new wxStoredOutputStream(*m_parent_o_stream);
+    m_deflate = NULL;
+    m_backlink = NULL;
+    m_initialData = new char[OUTPUT_LATENCY];
+    m_initialSize = 0;
+    m_pending = NULL;
+    m_raw = false;
+    m_headerOffset = 0;
+    m_headerSize = 0;
+    m_entrySize = 0;
+    m_comp = NULL;
+    m_level = level;
+    m_offsetAdjustment = wxInvalidOffset;
+}
+
+wxZipOutputStream::~wxZipOutputStream()
+{
+    Close();
+    WX_CLEAR_LIST(wxZipEntryList_, m_entries);
+    delete m_store;
+    delete m_deflate;
+    delete m_pending;
+    delete [] m_initialData;
+    if (m_backlink)
+        m_backlink->Release(this);
+}
+
+bool wxZipOutputStream::PutNextEntry(
+    const wxString& name,
+    const wxDateTime& dt /*=wxDateTime::Now()*/,
+    wxFileOffset size    /*=wxInvalidOffset*/)
+{
+    return PutNextEntry(new wxZipEntry(name, dt, size));
+}
+
+bool wxZipOutputStream::PutNextDirEntry(
+    const wxString& name,
+    const wxDateTime& dt /*=wxDateTime::Now()*/)
+{
+    wxZipEntry *entry = new wxZipEntry(name, dt);
+    entry->SetIsDir();
+    return PutNextEntry(entry);
+}
+
+bool wxZipOutputStream::CopyEntry(wxZipEntry *entry,
+                                  wxZipInputStream& inputStream)
+{
+    wxZipEntryPtr_ e(entry);
+
+    return
+        inputStream.DoOpen(e.get(), true) &&
+        DoCreate(e.release(), true) &&
+        Write(inputStream).IsOk() && inputStream.Eof();
+}
+
+bool wxZipOutputStream::PutNextEntry(wxArchiveEntry *entry)
+{
+    wxZipEntry *zipEntry = wxStaticCast(entry, wxZipEntry);
+    if (!zipEntry)
+        delete entry;
+    return PutNextEntry(zipEntry);
+}
+
+bool wxZipOutputStream::CopyEntry(wxArchiveEntry *entry,
+                                  wxArchiveInputStream& stream)
+{
+    wxZipEntry *zipEntry = wxStaticCast(entry, wxZipEntry);
+
+    if (!zipEntry || !stream.OpenEntry(*zipEntry)) {
+        delete entry;
+        return false;
+    }
+
+    return CopyEntry(zipEntry, wx_static_cast(wxZipInputStream&, stream));
+}
+
+bool wxZipOutputStream::CopyArchiveMetaData(wxZipInputStream& inputStream)
+{
+    m_Comment = inputStream.GetComment();
+    if (m_backlink)
+        m_backlink->Release(this);
+    m_backlink = inputStream.MakeLink(this);
+    return true;
+}
+
+bool wxZipOutputStream::CopyArchiveMetaData(wxArchiveInputStream& stream)
+{
+    return CopyArchiveMetaData(wx_static_cast(wxZipInputStream&, stream));
+}
+
+void wxZipOutputStream::SetLevel(int level)
+{
+    if (level != m_level) {
+        if (m_comp != m_deflate)
+            delete m_deflate;
+        m_deflate = NULL;
+        m_level = level;
+    }
+}
+
+bool wxZipOutputStream::DoCreate(wxZipEntry *entry, bool raw /*=false*/)
+{
+    CloseEntry();
+
+    m_pending = entry;
+    if (!m_pending)
+        return false;
+
+    // write the signature bytes right away
+    wxDataOutputStream ds(*m_parent_o_stream);
+    ds << LOCAL_MAGIC;
+
+    // and if this is the first entry test for seekability
+    if (m_headerOffset == 0 && m_parent_o_stream->IsSeekable()) {
+#if wxUSE_LOG
+        bool logging = wxLog::IsEnabled();
+        wxLogNull nolog;
+#endif // wxUSE_LOG
+        wxFileOffset here = m_parent_o_stream->TellO();
+
+        if (here != wxInvalidOffset && here >= 4) {
+            if (m_parent_o_stream->SeekO(here - 4) == here - 4) {
+                m_offsetAdjustment = here - 4;
+#if wxUSE_LOG
+                wxLog::EnableLogging(logging);
+#endif // wxUSE_LOG
+                m_parent_o_stream->SeekO(here);
+            }
+        }
+    }
+
+    m_pending->SetOffset(m_headerOffset);
+
+    m_crcAccumulator = crc32(0, Z_NULL, 0);
+
+    if (raw)
+        m_raw = true;
+
+    m_lasterror = wxSTREAM_NO_ERROR;
+    return true;
+}
+
+// Can be overriden to add support for additional compression methods
+//
+wxOutputStream *wxZipOutputStream::OpenCompressor(
+    wxOutputStream& stream,
+    wxZipEntry& entry,
+    const Buffer bufs[])
+{
+    if (entry.GetMethod() == wxZIP_METHOD_DEFAULT) {
+        if (GetLevel() == 0
+                && (IsParentSeekable()
+                    || entry.GetCompressedSize() != wxInvalidOffset
+                    || entry.GetSize() != wxInvalidOffset)) {
+            entry.SetMethod(wxZIP_METHOD_STORE);
+        } else {
+            int size = 0;
+            for (int i = 0; bufs[i].m_data; ++i)
+                size += bufs[i].m_size;
+            entry.SetMethod(size <= 6 ?
+                            wxZIP_METHOD_STORE : wxZIP_METHOD_DEFLATE);
+        }
+    }
+
+    switch (entry.GetMethod()) {
+        case wxZIP_METHOD_STORE:
+            if (entry.GetCompressedSize() == wxInvalidOffset)
+                entry.SetCompressedSize(entry.GetSize());
+            return m_store;
+
+        case wxZIP_METHOD_DEFLATE:
+        {
+            int defbits = wxZIP_DEFLATE_NORMAL;
+            switch (GetLevel()) {
+                case 0: case 1:
+                    defbits = wxZIP_DEFLATE_SUPERFAST;
+                    break;
+                case 2: case 3: case 4:
+                    defbits = wxZIP_DEFLATE_FAST;
+                    break;
+                case 8: case 9:
+                    defbits = wxZIP_DEFLATE_EXTRA;
+                    break;
+            }
+            entry.SetFlags((entry.GetFlags() & ~wxZIP_DEFLATE_MASK) |
+                            defbits | wxZIP_SUMS_FOLLOW);
+
+            if (!m_deflate)
+                m_deflate = new wxZlibOutputStream2(stream, GetLevel());
+            else
+                m_deflate->Open(stream);
+
+            return m_deflate;
+        }
+
+        default:
+            wxLogError(_("unsupported Zip compression method"));
+    }
+
+    return NULL;
+}
+
+bool wxZipOutputStream::CloseCompressor(wxOutputStream *comp)
+{
+    if (comp == m_deflate)
+        m_deflate->Close();
+    else if (comp != m_store)
+        delete comp;
+    return true;
+}
+
+// This is called when OUPUT_LATENCY bytes has been written to the
+// wxZipOutputStream to actually create the zip entry.
+//
+void wxZipOutputStream::CreatePendingEntry(const void *buffer, size_t size)
+{
+    wxASSERT(IsOk() && m_pending && !m_comp);
+    wxZipEntryPtr_ spPending(m_pending);
+    m_pending = NULL;
+
+    Buffer bufs[] = {
+        { m_initialData, m_initialSize },
+        { (const char*)buffer, size },
+        { NULL, 0 }
+    };
+
+    if (m_raw)
+        m_comp = m_store;
+    else
+        m_comp = OpenCompressor(*m_store, *spPending,
+                                m_initialSize ? bufs : bufs + 1);
+
+    if (IsParentSeekable()
+        || (spPending->m_Crc
+            && spPending->m_CompressedSize != wxInvalidOffset
+            && spPending->m_Size != wxInvalidOffset))
+        spPending->m_Flags &= ~wxZIP_SUMS_FOLLOW;
+    else
+        if (spPending->m_CompressedSize != wxInvalidOffset)
+            spPending->m_Flags |= wxZIP_SUMS_FOLLOW;
+
+    m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv());
+    m_lasterror = m_parent_o_stream->GetLastError();
+
+    if (IsOk()) {
+        m_entries.push_back(spPending.release());
+        OnSysWrite(m_initialData, m_initialSize);
+    }
+
+    m_initialSize = 0;
+}
+
+// This is called to write out the zip entry when Close has been called
+// before OUTPUT_LATENCY bytes has been written to the wxZipOutputStream.
+//
+void wxZipOutputStream::CreatePendingEntry()
+{
+    wxASSERT(IsOk() && m_pending && !m_comp);
+    wxZipEntryPtr_ spPending(m_pending);
+    m_pending = NULL;
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+
+    if (!m_raw) {
+        // Initially compresses the data to memory, then fall back to 'store'
+        // if the compressor makes the data larger rather than smaller.
+        wxMemoryOutputStream mem;
+        Buffer bufs[] = { { m_initialData, m_initialSize }, { NULL, 0 } };
+        wxOutputStream *comp = OpenCompressor(mem, *spPending, bufs);
+
+        if (!comp)
+            return;
+        if (comp != m_store) {
+            bool ok = comp->Write(m_initialData, m_initialSize).IsOk();
+            CloseCompressor(comp);
+            if (!ok)
+                return;
+        }
+
+        m_entrySize = m_initialSize;
+        m_crcAccumulator = crc32(0, (Byte*)m_initialData, m_initialSize);
+
+        if (mem.GetSize() > 0 && mem.GetSize() < m_initialSize) {
+            m_initialSize = mem.GetSize();
+            mem.CopyTo(m_initialData, m_initialSize);
+        } else {
+            spPending->SetMethod(wxZIP_METHOD_STORE);
+        }
+
+        spPending->SetSize(m_entrySize);
+        spPending->SetCrc(m_crcAccumulator);
+        spPending->SetCompressedSize(m_initialSize);
+    }
+
+    spPending->m_Flags &= ~wxZIP_SUMS_FOLLOW;
+    m_headerSize = spPending->WriteLocal(*m_parent_o_stream, GetConv());
+
+    if (m_parent_o_stream->IsOk()) {
+        m_entries.push_back(spPending.release());
+        m_comp = m_store;
+        m_store->Write(m_initialData, m_initialSize);
+    }
+
+    m_initialSize = 0;
+    m_lasterror = m_parent_o_stream->GetLastError();
+}
+
+// Write the 'central directory' and the 'end-central-directory' records.
+//
+bool wxZipOutputStream::Close()
+{
+    CloseEntry();
+
+    if (m_lasterror == wxSTREAM_WRITE_ERROR || m_entries.size() == 0) {
+        wxFilterOutputStream::Close();
+        return false;
+    }
+
+    wxZipEndRec endrec;
+
+    endrec.SetEntriesHere(m_entries.size());
+    endrec.SetTotalEntries(m_entries.size());
+    endrec.SetOffset(m_headerOffset);
+    endrec.SetComment(m_Comment);
+
+    wxZipEntryList_::iterator it;
+    wxFileOffset size = 0;
+
+    for (it = m_entries.begin(); it != m_entries.end(); ++it) {
+        size += (*it)->WriteCentral(*m_parent_o_stream, GetConv());
+        delete *it;
+    }
+    m_entries.clear();
+
+    endrec.SetSize(size);
+    endrec.Write(*m_parent_o_stream, GetConv());
+
+    m_lasterror = m_parent_o_stream->GetLastError();
+    
+    if (!wxFilterOutputStream::Close() || !IsOk())
+        return false;
+    m_lasterror = wxSTREAM_EOF;
+    return true;
+}
+
+// Finish writing the current entry
+//
+bool wxZipOutputStream::CloseEntry()
+{
+    if (IsOk() && m_pending)
+        CreatePendingEntry();
+    if (!IsOk())
+        return false;
+    if (!m_comp)
+        return true;
+
+    CloseCompressor(m_comp);
+    m_comp = NULL;
+
+    wxFileOffset compressedSize = m_store->TellO();
+
+    wxZipEntry& entry = *m_entries.back();
+
+    // When writing raw the crc and size can't be checked
+    if (m_raw) {
+        m_crcAccumulator = entry.GetCrc();
+        m_entrySize = entry.GetSize();
+    }
+
+    // Write the sums in the trailing 'data descriptor' if necessary
+    if (entry.m_Flags & wxZIP_SUMS_FOLLOW) {
+        wxASSERT(!IsParentSeekable());
+        m_headerOffset +=
+            entry.WriteDescriptor(*m_parent_o_stream, m_crcAccumulator,
+                                  compressedSize, m_entrySize);
+        m_lasterror = m_parent_o_stream->GetLastError();
+    }
+
+    // If the local header didn't have the correct crc and size written to
+    // it then seek back and fix it
+    else if (m_crcAccumulator != entry.GetCrc()
+            || m_entrySize != entry.GetSize()
+            || compressedSize != entry.GetCompressedSize())
+    {
+        if (IsParentSeekable()) {
+            wxFileOffset here = m_parent_o_stream->TellO();
+            wxFileOffset headerOffset = m_headerOffset + m_offsetAdjustment;
+            m_parent_o_stream->SeekO(headerOffset + SUMS_OFFSET);
+            entry.WriteDescriptor(*m_parent_o_stream, m_crcAccumulator,
+                                  compressedSize, m_entrySize);
+            m_parent_o_stream->SeekO(here);
+            m_lasterror = m_parent_o_stream->GetLastError();
+        } else {
+            m_lasterror = wxSTREAM_WRITE_ERROR;
+        }
+    }
+
+    m_headerOffset += m_headerSize + compressedSize;
+    m_headerSize = 0;
+    m_entrySize = 0;
+    m_store->Close();
+    m_raw = false;
+
+    if (IsOk())
+        m_lasterror = m_parent_o_stream->GetLastError();
+    else
+        wxLogError(_("error writing zip entry '%s': bad crc or length"),
+                   entry.GetName().c_str());
+    return IsOk();
+}
+
+void wxZipOutputStream::Sync()
+{
+    if (IsOk() && m_pending)
+        CreatePendingEntry(NULL, 0);
+    if (!m_comp)
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    if (IsOk()) {
+        m_comp->Sync();
+        m_lasterror = m_comp->GetLastError();
+    }
+}
+
+size_t wxZipOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+    if (IsOk() && m_pending) {
+        if (m_initialSize + size < OUTPUT_LATENCY) {
+            memcpy(m_initialData + m_initialSize, buffer, size);
+            m_initialSize += size;
+            return size;
+        } else {
+            CreatePendingEntry(buffer, size);
+        }
+    }
+
+    if (!m_comp)
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    if (!IsOk() || !size)
+        return 0;
+
+    if (m_comp->Write(buffer, size).LastWrite() != size)
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+    m_crcAccumulator = crc32(m_crcAccumulator, (Byte*)buffer, size);
+    m_entrySize += m_comp->LastWrite();
+
+    return m_comp->LastWrite();
+}
+
+#endif // wxUSE_ZIPSTREAM
diff --git a/Source/3rd Party/wx/src/common/zstream.cpp b/Source/3rd Party/wx/src/common/zstream.cpp
index 5d012de86..8f66fce17 100644
--- a/Source/3rd Party/wx/src/common/zstream.cpp	
+++ b/Source/3rd Party/wx/src/common/zstream.cpp	
@@ -1,452 +1,428 @@
-//////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/zstream.cpp
-// Purpose:     Compressed stream classes
-// Author:      Guilhem Lavaux
-// Modified by: Mike Wetherell
-// Created:     11/07/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_ZLIB && wxUSE_STREAMS
-
-#include "wx/zstream.h"
-#include "wx/versioninfo.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/utils.h"
-#endif
-
-
-// normally, the compiler options should contain -I../zlib, but it is
-// apparently not the case for all MSW makefiles and so, unless we use
-// configure (which defines __WX_SETUP_H__) or it is explicitly overridden by
-// the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
-#if defined(__WINDOWS__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
-    #include "../zlib/zlib.h"
-#else
-    #include "zlib.h"
-#endif
-
-enum {
-    ZSTREAM_BUFFER_SIZE = 16384,
-    ZSTREAM_GZIP        = 0x10,     // gzip header
-    ZSTREAM_AUTO        = 0x20      // auto detect between gzip and zlib
-};
-
-
-wxVersionInfo wxGetZlibVersionInfo()
-{
-    int major,
-        minor,
-        build;
-
-    if ( sscanf(zlibVersion(), "%d.%d.%d", &major, &minor, &build) != 3 )
-    {
-        major =
-        minor =
-        build = 0;
-    }
-
-    return wxVersionInfo("zlib", major, minor, build);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Zlib Class factory
-
-IMPLEMENT_DYNAMIC_CLASS(wxZlibClassFactory, wxFilterClassFactory)
-
-static wxZlibClassFactory g_wxZlibClassFactory;
-
-wxZlibClassFactory::wxZlibClassFactory()
-{
-    if (this == &g_wxZlibClassFactory)
-        PushFront();
-}
-
-const wxChar * const *
-wxZlibClassFactory::GetProtocols(wxStreamProtocolType type) const
-{
-    static const wxChar *mimes[] = { wxT("application/x-deflate"), NULL };
-    static const wxChar *encs[] =  { wxT("deflate"), NULL };
-    static const wxChar *empty[] = { NULL };
-
-    switch (type) {
-        case wxSTREAM_MIMETYPE:         return mimes;
-        case wxSTREAM_ENCODING:         return encs;
-        default:                        return empty;
-    }
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Gzip Class factory
-
-IMPLEMENT_DYNAMIC_CLASS(wxGzipClassFactory, wxFilterClassFactory)
-
-static wxGzipClassFactory g_wxGzipClassFactory;
-
-wxGzipClassFactory::wxGzipClassFactory()
-{
-    if (this == &g_wxGzipClassFactory && wxZlibInputStream::CanHandleGZip())
-        PushFront();
-}
-
-const wxChar * const *
-wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const
-{
-    static const wxChar *protos[] =
-        { wxT("gzip"), NULL };
-    static const wxChar *mimes[] =
-        { wxT("application/gzip"), wxT("application/x-gzip"), NULL };
-    static const wxChar *encs[] =
-        { wxT("gzip"), NULL };
-    static const wxChar *exts[] =
-        { wxT(".gz"), wxT(".gzip"), NULL };
-    static const wxChar *empty[] =
-        { NULL };
-
-    switch (type) {
-        case wxSTREAM_PROTOCOL: return protos;
-        case wxSTREAM_MIMETYPE: return mimes;
-        case wxSTREAM_ENCODING: return encs;
-        case wxSTREAM_FILEEXT:  return exts;
-        default:                return empty;
-    }
-}
-
-
-//////////////////////
-// wxZlibInputStream
-//////////////////////
-
-wxZlibInputStream::wxZlibInputStream(wxInputStream& stream, int flags)
-  : wxFilterInputStream(stream)
-{
-    Init(flags);
-}
-
-wxZlibInputStream::wxZlibInputStream(wxInputStream *stream, int flags)
-  : wxFilterInputStream(stream)
-{
-    Init(flags);
-}
-
-void wxZlibInputStream::Init(int flags)
-{
-  m_inflate = NULL;
-  m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
-  m_z_size = ZSTREAM_BUFFER_SIZE;
-  m_pos = 0;
-
-  // if gzip is asked for but not supported...
-  if ((flags == wxZLIB_GZIP || flags == wxZLIB_AUTO) && !CanHandleGZip()) {
-    if (flags == wxZLIB_AUTO) {
-      // an error will come later if the input turns out not to be a zlib
-      flags = wxZLIB_ZLIB;
-    }
-    else {
-      wxLogError(_("Gzip not supported by this version of zlib"));
-      m_lasterror = wxSTREAM_READ_ERROR;
-      return;
-    }
-  }
-
-  if (m_z_buffer) {
-    m_inflate = new z_stream_s;
-
-    if (m_inflate) {
-      memset(m_inflate, 0, sizeof(z_stream_s));
-
-      // see zlib.h for documentation on windowBits
-      int windowBits = MAX_WBITS;
-      switch (flags) {
-        case wxZLIB_NO_HEADER:  windowBits = -MAX_WBITS; break;
-        case wxZLIB_ZLIB:       windowBits = MAX_WBITS; break;
-        case wxZLIB_GZIP:       windowBits = MAX_WBITS | ZSTREAM_GZIP; break;
-        case wxZLIB_AUTO:       windowBits = MAX_WBITS | ZSTREAM_AUTO; break;
-        default:                wxFAIL_MSG(wxT("Invalid zlib flag"));
-      }
-
-      if (inflateInit2(m_inflate, windowBits) == Z_OK)
-        return;
-    }
-  }
-
-  wxLogError(_("Can't initialize zlib inflate stream."));
-  m_lasterror = wxSTREAM_READ_ERROR;
-}
-
-wxZlibInputStream::~wxZlibInputStream()
-{
-  inflateEnd(m_inflate);
-  delete m_inflate;
-
-  delete [] m_z_buffer;
-}
-
-size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
-{
-  wxASSERT_MSG(m_inflate && m_z_buffer, wxT("Inflate stream not open"));
-
-  if (!m_inflate || !m_z_buffer)
-    m_lasterror = wxSTREAM_READ_ERROR;
-  if (!IsOk() || !size)
-    return 0;
-
-  int err = Z_OK;
-  m_inflate->next_out = (unsigned char *)buffer;
-  m_inflate->avail_out = size;
-
-  while (err == Z_OK && m_inflate->avail_out > 0) {
-    if (m_inflate->avail_in == 0 && m_parent_i_stream->IsOk()) {
-      m_parent_i_stream->Read(m_z_buffer, m_z_size);
-      m_inflate->next_in = m_z_buffer;
-      m_inflate->avail_in = m_parent_i_stream->LastRead();
-    }
-    err = inflate(m_inflate, Z_SYNC_FLUSH);
-  }
-
-  switch (err) {
-    case Z_OK:
-        break;
-
-    case Z_STREAM_END:
-      if (m_inflate->avail_out) {
-        // Unread any data taken from past the end of the deflate stream, so that
-        // any additional data can be read from the underlying stream (the crc
-        // in a gzip for example)
-        if (m_inflate->avail_in) {
-          m_parent_i_stream->Reset();
-          m_parent_i_stream->Ungetch(m_inflate->next_in, m_inflate->avail_in);
-          m_inflate->avail_in = 0;
-        }
-        m_lasterror = wxSTREAM_EOF;
-      }
-      break;
-
-    case Z_BUF_ERROR:
-      // Indicates that zlib was expecting more data, but the parent stream
-      // has none. Other than Eof the error will have been already reported
-      // by the parent strean,
-      m_lasterror = wxSTREAM_READ_ERROR;
-      if (m_parent_i_stream->Eof())
-      {
-          wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
-      }
-      break;
-
-    default:
-      wxString msg(m_inflate->msg, *wxConvCurrent);
-      if (!msg)
-        msg = wxString::Format(_("zlib error %d"), err);
-      wxLogError(_("Can't read from inflate stream: %s"), msg.c_str());
-      m_lasterror = wxSTREAM_READ_ERROR;
-  }
-
-  size -= m_inflate->avail_out;
-  m_pos += size;
-  return size;
-}
-
-/* static */ bool wxZlibInputStream::CanHandleGZip()
-{
-  const char *dot = strchr(zlibVersion(), '.');
-  int major = atoi(zlibVersion());
-  int minor = dot ? atoi(dot + 1) : 0;
-  return major > 1 || (major == 1 && minor >= 2);
-}
-
-bool wxZlibInputStream::SetDictionary(const char *data, const size_t datalen)
-{
-    return (inflateSetDictionary(m_inflate, (Bytef*)data, datalen) == Z_OK);
-}
-
-bool wxZlibInputStream::SetDictionary(const wxMemoryBuffer &buf)
-{
-    return SetDictionary((char*)buf.GetData(), buf.GetDataLen());
-}
-
-
-//////////////////////
-// wxZlibOutputStream
-//////////////////////
-
-wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream,
-                                       int level,
-                                       int flags)
- : wxFilterOutputStream(stream)
-{
-    Init(level, flags);
-}
-
-wxZlibOutputStream::wxZlibOutputStream(wxOutputStream *stream,
-                                       int level,
-                                       int flags)
- : wxFilterOutputStream(stream)
-{
-    Init(level, flags);
-}
-
-void wxZlibOutputStream::Init(int level, int flags)
-{
-  m_deflate = NULL;
-  m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
-  m_z_size = ZSTREAM_BUFFER_SIZE;
-  m_pos = 0;
-
-  if ( level == -1 )
-  {
-    level = Z_DEFAULT_COMPRESSION;
-  }
-  else
-  {
-    wxASSERT_MSG(level >= 0 && level <= 9, wxT("wxZlibOutputStream compression level must be between 0 and 9!"));
-  }
-
-  // if gzip is asked for but not supported...
-  if (flags == wxZLIB_GZIP && !CanHandleGZip()) {
-    wxLogError(_("Gzip not supported by this version of zlib"));
-    m_lasterror = wxSTREAM_WRITE_ERROR;
-    return;
-  }
-
-  if (m_z_buffer) {
-    m_deflate = new z_stream_s;
-
-    if (m_deflate) {
-      memset(m_deflate, 0, sizeof(z_stream_s));
-      m_deflate->next_out = m_z_buffer;
-      m_deflate->avail_out = m_z_size;
-
-      // see zlib.h for documentation on windowBits
-      int windowBits = MAX_WBITS;
-      switch (flags) {
-        case wxZLIB_NO_HEADER:  windowBits = -MAX_WBITS; break;
-        case wxZLIB_ZLIB:       windowBits = MAX_WBITS; break;
-        case wxZLIB_GZIP:       windowBits = MAX_WBITS | ZSTREAM_GZIP; break;
-        default:                wxFAIL_MSG(wxT("Invalid zlib flag"));
-      }
-
-      if (deflateInit2(m_deflate, level, Z_DEFLATED, windowBits,
-                       8, Z_DEFAULT_STRATEGY) == Z_OK)
-        return;
-    }
-  }
-
-  wxLogError(_("Can't initialize zlib deflate stream."));
-  m_lasterror = wxSTREAM_WRITE_ERROR;
-}
-
-bool wxZlibOutputStream::Close()
- {
-  DoFlush(true);
-   deflateEnd(m_deflate);
-   wxDELETE(m_deflate);
-   wxDELETEA(m_z_buffer);
-
-  return wxFilterOutputStream::Close() && IsOk();
- }
-
-void wxZlibOutputStream::DoFlush(bool final)
-{
-  if (!m_deflate || !m_z_buffer)
-    m_lasterror = wxSTREAM_WRITE_ERROR;
-  if (!IsOk())
-    return;
-
-  int err = Z_OK;
-  bool done = false;
-
-  while (err == Z_OK || err == Z_STREAM_END) {
-    size_t len = m_z_size  - m_deflate->avail_out;
-    if (len) {
-      if (m_parent_o_stream->Write(m_z_buffer, len).LastWrite() != len) {
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-        wxLogDebug(wxT("wxZlibOutputStream: Error writing to underlying stream"));
-        break;
-      }
-      m_deflate->next_out = m_z_buffer;
-      m_deflate->avail_out = m_z_size;
-    }
-
-    if (done)
-      break;
-    err = deflate(m_deflate, final ? Z_FINISH : Z_FULL_FLUSH);
-    done = m_deflate->avail_out != 0 || err == Z_STREAM_END;
-  }
-}
-
-size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
-{
-  wxASSERT_MSG(m_deflate && m_z_buffer, wxT("Deflate stream not open"));
-
-  if (!m_deflate || !m_z_buffer)
-  {
-    // notice that this will make IsOk() test just below return false
-    m_lasterror = wxSTREAM_WRITE_ERROR;
-  }
-
-  if (!IsOk() || !size)
-    return 0;
-
-  int err = Z_OK;
-  m_deflate->next_in = (unsigned char *)buffer;
-  m_deflate->avail_in = size;
-
-  while (err == Z_OK && m_deflate->avail_in > 0) {
-    if (m_deflate->avail_out == 0) {
-      m_parent_o_stream->Write(m_z_buffer, m_z_size);
-      if (m_parent_o_stream->LastWrite() != m_z_size) {
-        m_lasterror = wxSTREAM_WRITE_ERROR;
-        wxLogDebug(wxT("wxZlibOutputStream: Error writing to underlying stream"));
-        break;
-      }
-
-      m_deflate->next_out = m_z_buffer;
-      m_deflate->avail_out = m_z_size;
-    }
-
-    err = deflate(m_deflate, Z_NO_FLUSH);
-  }
-
-  if (err != Z_OK) {
-    m_lasterror = wxSTREAM_WRITE_ERROR;
-    wxString msg(m_deflate->msg, *wxConvCurrent);
-    if (!msg)
-      msg = wxString::Format(_("zlib error %d"), err);
-    wxLogError(_("Can't write to deflate stream: %s"), msg.c_str());
-  }
-
-  size -= m_deflate->avail_in;
-  m_pos += size;
-  return size;
-}
-
-/* static */ bool wxZlibOutputStream::CanHandleGZip()
-{
-  return wxZlibInputStream::CanHandleGZip();
-}
-
-bool wxZlibOutputStream::SetDictionary(const char *data, const size_t datalen)
-{
-    return (deflateSetDictionary(m_deflate, (Bytef*)data, datalen) == Z_OK);
-}
-
-bool wxZlibOutputStream::SetDictionary(const wxMemoryBuffer &buf)
-{
-    return SetDictionary((char*)buf.GetData(), buf.GetDataLen());
-}
-
-#endif
-  // wxUSE_ZLIB && wxUSE_STREAMS
+//////////////////////////////////////////////////////////////////////////////
+// Name:        src/common/zstream.cpp
+// Purpose:     Compressed stream classes
+// Author:      Guilhem Lavaux
+// Modified by: Mike Wetherell
+// Created:     11/07/98
+// RCS-ID:      $Id: zstream.cpp 42621 2006-10-29 16:47:20Z MW $
+// Copyright:   (c) Guilhem Lavaux
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_ZLIB && wxUSE_STREAMS
+
+#include "wx/zstream.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+#endif
+
+
+// normally, the compiler options should contain -I../zlib, but it is
+// apparently not the case for all MSW makefiles and so, unless we use
+// configure (which defines __WX_SETUP_H__) or it is explicitly overridden by
+// the user (who can define wxUSE_ZLIB_H_IN_PATH), we hardcode the path here
+#if defined(__WXMSW__) && !defined(__WX_SETUP_H__) && !defined(wxUSE_ZLIB_H_IN_PATH)
+    #include "../zlib/zlib.h"
+#else
+    #include "zlib.h"
+#endif
+
+enum {
+    ZSTREAM_BUFFER_SIZE = 16384,
+    ZSTREAM_GZIP        = 0x10,     // gzip header
+    ZSTREAM_AUTO        = 0x20      // auto detect between gzip and zlib
+};
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Zlib Class factory
+
+IMPLEMENT_DYNAMIC_CLASS(wxZlibClassFactory, wxFilterClassFactory)
+
+static wxZlibClassFactory g_wxZlibClassFactory;
+
+wxZlibClassFactory::wxZlibClassFactory()
+{
+    if (this == &g_wxZlibClassFactory)
+        PushFront();
+}
+
+const wxChar * const *
+wxZlibClassFactory::GetProtocols(wxStreamProtocolType type) const
+{
+    static const wxChar *mimes[] = { _T("application/x-deflate"), NULL };
+    static const wxChar *encs[] =  { _T("deflate"), NULL };
+    static const wxChar *empty[] = { NULL };
+
+    switch (type) {
+        case wxSTREAM_MIMETYPE:         return mimes;
+        case wxSTREAM_ENCODING:         return encs;
+        default:                        return empty;
+    }
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Gzip Class factory
+
+IMPLEMENT_DYNAMIC_CLASS(wxGzipClassFactory, wxFilterClassFactory)
+
+static wxGzipClassFactory g_wxGzipClassFactory;
+
+wxGzipClassFactory::wxGzipClassFactory()
+{
+    if (this == &g_wxGzipClassFactory && wxZlibInputStream::CanHandleGZip())
+        PushFront();
+}
+
+const wxChar * const *
+wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const
+{
+    static const wxChar *protos[] =     
+        { _T("gzip"), NULL };
+    static const wxChar *mimes[] =     
+        { _T("application/gzip"), _T("application/x-gzip"), NULL };
+    static const wxChar *encs[] = 
+        { _T("gzip"), NULL };
+    static const wxChar *exts[] =    
+        { _T(".gz"), _T(".gzip"), NULL };
+    static const wxChar *empty[] =
+        { NULL };
+
+    switch (type) {
+        case wxSTREAM_PROTOCOL: return protos;
+        case wxSTREAM_MIMETYPE: return mimes;
+        case wxSTREAM_ENCODING: return encs;
+        case wxSTREAM_FILEEXT:  return exts;
+        default:                return empty;
+    }
+}
+
+
+//////////////////////
+// wxZlibInputStream
+//////////////////////
+
+wxZlibInputStream::wxZlibInputStream(wxInputStream& stream, int flags)
+  : wxFilterInputStream(stream)
+{
+    Init(flags);
+}
+
+wxZlibInputStream::wxZlibInputStream(wxInputStream *stream, int flags)
+  : wxFilterInputStream(stream)
+{
+    Init(flags);
+}
+
+void wxZlibInputStream::Init(int flags)
+{
+  m_inflate = NULL;
+  m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
+  m_z_size = ZSTREAM_BUFFER_SIZE;
+  m_pos = 0;
+
+#if WXWIN_COMPATIBILITY_2_4
+  // treat compatibility mode as auto
+  m_24compatibilty = flags == wxZLIB_24COMPATIBLE;
+  if (m_24compatibilty)
+    flags = wxZLIB_AUTO;
+#endif
+
+  // if gzip is asked for but not supported...
+  if ((flags == wxZLIB_GZIP || flags == wxZLIB_AUTO) && !CanHandleGZip()) {
+    if (flags == wxZLIB_AUTO) {
+      // an error will come later if the input turns out not to be a zlib
+      flags = wxZLIB_ZLIB;
+    }
+    else {
+      wxLogError(_("Gzip not supported by this version of zlib"));
+      m_lasterror = wxSTREAM_READ_ERROR;
+      return;
+    }
+  }
+
+  if (m_z_buffer) {
+    m_inflate = new z_stream_s;
+
+    if (m_inflate) {
+      memset(m_inflate, 0, sizeof(z_stream_s));
+
+      // see zlib.h for documentation on windowBits
+      int windowBits = MAX_WBITS;
+      switch (flags) {
+        case wxZLIB_NO_HEADER:  windowBits = -MAX_WBITS; break;
+        case wxZLIB_ZLIB:       windowBits = MAX_WBITS; break;
+        case wxZLIB_GZIP:       windowBits = MAX_WBITS | ZSTREAM_GZIP; break;
+        case wxZLIB_AUTO:       windowBits = MAX_WBITS | ZSTREAM_AUTO; break;
+        default:                wxFAIL_MSG(wxT("Invalid zlib flag"));
+      }
+
+      if (inflateInit2(m_inflate, windowBits) == Z_OK)
+        return;
+    }
+  }
+
+  wxLogError(_("Can't initialize zlib inflate stream."));
+  m_lasterror = wxSTREAM_READ_ERROR;
+}
+
+wxZlibInputStream::~wxZlibInputStream()
+{
+  inflateEnd(m_inflate);
+  delete m_inflate;
+
+  delete [] m_z_buffer;
+}
+
+size_t wxZlibInputStream::OnSysRead(void *buffer, size_t size)
+{
+  wxASSERT_MSG(m_inflate && m_z_buffer, wxT("Inflate stream not open"));
+
+  if (!m_inflate || !m_z_buffer)
+    m_lasterror = wxSTREAM_READ_ERROR;
+  if (!IsOk() || !size)
+    return 0;
+
+  int err = Z_OK;
+  m_inflate->next_out = (unsigned char *)buffer;
+  m_inflate->avail_out = size;
+
+  while (err == Z_OK && m_inflate->avail_out > 0) {
+    if (m_inflate->avail_in == 0 && m_parent_i_stream->IsOk()) {
+      m_parent_i_stream->Read(m_z_buffer, m_z_size);
+      m_inflate->next_in = m_z_buffer;
+      m_inflate->avail_in = m_parent_i_stream->LastRead();
+    }
+    err = inflate(m_inflate, Z_SYNC_FLUSH);
+  }
+
+  switch (err) {
+    case Z_OK:
+        break;
+
+    case Z_STREAM_END:
+      if (m_inflate->avail_out) {
+        // Unread any data taken from past the end of the deflate stream, so that
+        // any additional data can be read from the underlying stream (the crc
+        // in a gzip for example)
+        if (m_inflate->avail_in) {
+          m_parent_i_stream->Reset();
+          m_parent_i_stream->Ungetch(m_inflate->next_in, m_inflate->avail_in);
+          m_inflate->avail_in = 0;
+        }
+        m_lasterror = wxSTREAM_EOF;
+      }
+      break;
+
+    case Z_BUF_ERROR:
+      // Indicates that zlib was expecting more data, but the parent stream
+      // has none. Other than Eof the error will have been already reported
+      // by the parent strean,
+      m_lasterror = wxSTREAM_READ_ERROR;
+      if (m_parent_i_stream->Eof())
+#if WXWIN_COMPATIBILITY_2_4
+        if (m_24compatibilty)
+          m_lasterror = wxSTREAM_EOF;
+        else
+#endif
+          wxLogError(_("Can't read inflate stream: unexpected EOF in underlying stream."));
+      break;
+
+    default:
+      wxString msg(m_inflate->msg, *wxConvCurrent);
+      if (!msg)
+        msg = wxString::Format(_("zlib error %d"), err);
+      wxLogError(_("Can't read from inflate stream: %s"), msg.c_str());
+      m_lasterror = wxSTREAM_READ_ERROR;
+  }
+
+  size -= m_inflate->avail_out;
+  m_pos += size;
+  return size;
+}
+
+/* static */ bool wxZlibInputStream::CanHandleGZip()
+{
+  const char *dot = strchr(zlibVersion(), '.');
+  int major = atoi(zlibVersion());
+  int minor = dot ? atoi(dot + 1) : 0;
+  return major > 1 || (major == 1 && minor >= 2);
+}
+
+
+//////////////////////
+// wxZlibOutputStream
+//////////////////////
+
+wxZlibOutputStream::wxZlibOutputStream(wxOutputStream& stream,
+                                       int level,
+                                       int flags)
+ : wxFilterOutputStream(stream)
+{
+    Init(level, flags);
+}
+
+wxZlibOutputStream::wxZlibOutputStream(wxOutputStream *stream,
+                                       int level,
+                                       int flags)
+ : wxFilterOutputStream(stream)
+{
+    Init(level, flags);
+}
+
+void wxZlibOutputStream::Init(int level, int flags)
+{
+  m_deflate = NULL;
+  m_z_buffer = new unsigned char[ZSTREAM_BUFFER_SIZE];
+  m_z_size = ZSTREAM_BUFFER_SIZE;
+  m_pos = 0;
+
+  if ( level == -1 )
+  {
+    level = Z_DEFAULT_COMPRESSION;
+  }
+  else
+  {
+    wxASSERT_MSG(level >= 0 && level <= 9, wxT("wxZlibOutputStream compression level must be between 0 and 9!"));
+  }
+
+  // if gzip is asked for but not supported...
+  if (flags == wxZLIB_GZIP && !CanHandleGZip()) {
+    wxLogError(_("Gzip not supported by this version of zlib"));
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+    return;
+  }
+
+  if (m_z_buffer) {
+    m_deflate = new z_stream_s;
+
+    if (m_deflate) {
+      memset(m_deflate, 0, sizeof(z_stream_s));
+      m_deflate->next_out = m_z_buffer;
+      m_deflate->avail_out = m_z_size;
+
+      // see zlib.h for documentation on windowBits
+      int windowBits = MAX_WBITS;
+      switch (flags) {
+        case wxZLIB_NO_HEADER:  windowBits = -MAX_WBITS; break;
+        case wxZLIB_ZLIB:       windowBits = MAX_WBITS; break;
+        case wxZLIB_GZIP:       windowBits = MAX_WBITS | ZSTREAM_GZIP; break;
+        default:                wxFAIL_MSG(wxT("Invalid zlib flag"));
+      }
+
+      if (deflateInit2(m_deflate, level, Z_DEFLATED, windowBits,
+                       8, Z_DEFAULT_STRATEGY) == Z_OK)
+        return;
+    }
+  }
+
+  wxLogError(_("Can't initialize zlib deflate stream."));
+  m_lasterror = wxSTREAM_WRITE_ERROR;
+}
+
+bool wxZlibOutputStream::Close()
+ {
+  DoFlush(true);
+   deflateEnd(m_deflate);
+   delete m_deflate;
+
+  m_deflate = NULL;
+   delete[] m_z_buffer;
+  m_z_buffer = NULL;
+
+  return wxFilterOutputStream::Close() && IsOk();
+ }
+
+void wxZlibOutputStream::DoFlush(bool final)
+{
+  if (!m_deflate || !m_z_buffer)
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+  if (!IsOk())
+    return;
+
+  int err = Z_OK;
+  bool done = false;
+
+  while (err == Z_OK || err == Z_STREAM_END) {
+    size_t len = m_z_size  - m_deflate->avail_out;
+    if (len) {
+      if (m_parent_o_stream->Write(m_z_buffer, len).LastWrite() != len) {
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+        wxLogDebug(wxT("wxZlibOutputStream: Error writing to underlying stream"));
+        break;
+      }
+      m_deflate->next_out = m_z_buffer;
+      m_deflate->avail_out = m_z_size;
+    }
+
+    if (done)
+      break;
+    err = deflate(m_deflate, final ? Z_FINISH : Z_FULL_FLUSH);
+    done = m_deflate->avail_out != 0 || err == Z_STREAM_END;
+  }
+}
+
+size_t wxZlibOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+  wxASSERT_MSG(m_deflate && m_z_buffer, wxT("Deflate stream not open"));
+
+  if (!m_deflate || !m_z_buffer)
+  {
+    // notice that this will make IsOk() test just below return false
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+  }
+
+  if (!IsOk() || !size)
+    return 0;
+
+  int err = Z_OK;
+  m_deflate->next_in = (unsigned char *)buffer;
+  m_deflate->avail_in = size;
+
+  while (err == Z_OK && m_deflate->avail_in > 0) {
+    if (m_deflate->avail_out == 0) {
+      m_parent_o_stream->Write(m_z_buffer, m_z_size);
+      if (m_parent_o_stream->LastWrite() != m_z_size) {
+        m_lasterror = wxSTREAM_WRITE_ERROR;
+        wxLogDebug(wxT("wxZlibOutputStream: Error writing to underlying stream"));
+        break;
+      }
+
+      m_deflate->next_out = m_z_buffer;
+      m_deflate->avail_out = m_z_size;
+    }
+
+    err = deflate(m_deflate, Z_NO_FLUSH);
+  }
+
+  if (err != Z_OK) {
+    m_lasterror = wxSTREAM_WRITE_ERROR;
+    wxString msg(m_deflate->msg, *wxConvCurrent);
+    if (!msg)
+      msg = wxString::Format(_("zlib error %d"), err);
+    wxLogError(_("Can't write to deflate stream: %s"), msg.c_str());
+  }
+
+  size -= m_deflate->avail_in;
+  m_pos += size;
+  return size;
+}
+
+/* static */ bool wxZlibOutputStream::CanHandleGZip()
+{
+  return wxZlibInputStream::CanHandleGZip();
+}
+
+#endif
+  // wxUSE_ZLIB && wxUSE_STREAMS
diff --git a/Source/3rd Party/wx/src/generic/busyinfo.cpp b/Source/3rd Party/wx/src/generic/busyinfo.cpp
index 39cd49586..257c23366 100644
--- a/Source/3rd Party/wx/src/generic/busyinfo.cpp	
+++ b/Source/3rd Party/wx/src/generic/busyinfo.cpp	
@@ -3,7 +3,7 @@
 // Purpose:     Information window when app is busy
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: busyinfo.cpp 44898 2007-03-18 20:39:13Z VZ $
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -24,7 +24,6 @@
 #endif
 
 #include "wx/busyinfo.h"
-#include "wx/generic/stattextg.h"
 
 class WXDLLEXPORT wxInfoFrame : public wxFrame
 {
@@ -32,7 +31,7 @@ public:
     wxInfoFrame(wxWindow *parent, const wxString& message);
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxInfoFrame);
+    DECLARE_NO_COPY_CLASS(wxInfoFrame)
 };
 
 
@@ -44,14 +43,10 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 #else
                      wxSIMPLE_BORDER
 #endif
-                     | wxFRAME_TOOL_WINDOW | wxSTAY_ON_TOP)
+                     | wxFRAME_TOOL_WINDOW)
 {
     wxPanel *panel = new wxPanel( this );
-#ifdef __WXGTK__
-    wxGenericStaticText *text = new wxGenericStaticText(panel, wxID_ANY, message);
-#else
     wxStaticText *text = new wxStaticText(panel, wxID_ANY, message);
-#endif
 
     panel->SetCursor(*wxHOURGLASS_CURSOR);
     text->SetCursor(*wxHOURGLASS_CURSOR);
@@ -119,7 +114,13 @@ wxInfoFrame::wxInfoFrame(wxWindow *parent, const wxString& message)
 
 wxBusyInfo::wxBusyInfo(const wxString& message, wxWindow *parent)
 {
-    m_InfoFrame = new wxInfoFrame(parent, message);
+    m_InfoFrame = new wxInfoFrame( parent, message);
+    if ( parent && parent->HasFlag(wxSTAY_ON_TOP) )
+    {
+        // we must have this flag to be in front of our parent if it has it
+        m_InfoFrame->SetWindowStyleFlag(wxSTAY_ON_TOP);
+    }
+
     m_InfoFrame->Show(true);
     m_InfoFrame->Refresh();
     m_InfoFrame->Update();
diff --git a/Source/3rd Party/wx/src/generic/buttonbar.cpp b/Source/3rd Party/wx/src/generic/buttonbar.cpp
index a3c247373..b229d7275 100644
--- a/Source/3rd Party/wx/src/generic/buttonbar.cpp	
+++ b/Source/3rd Party/wx/src/generic/buttonbar.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, after Robert Roebling, Vadim Zeitlin, SciTech
 // Modified by:
 // Created:     2006-04-13
-// Id:          $Id$
+// Id:          $Id: buttonbar.cpp 42816 2006-10-31 08:50:17Z RD $
 // Copyright:   (c) Julian Smart, Robert Roebling, Vadim Zeitlin,
 //              SciTech Software, Inc.
 // Licence:     wxWindows licence
@@ -66,10 +66,8 @@ public:
         m_button = NULL;
     }
 
-    wxButtonToolBarTool(wxButtonToolBar *tbar,
-                        wxControl *control,
-                        const wxString& label)
-        : wxToolBarToolBase(tbar, control, label)
+    wxButtonToolBarTool(wxButtonToolBar *tbar, wxControl *control)
+        : wxToolBarToolBase(tbar, control)
     {
         m_x = m_y = wxDefaultCoord;
         m_width =
@@ -140,10 +138,7 @@ bool wxButtonToolBar::Create(wxWindow *parent,
 
     // wxColour lightBackground(244, 244, 244);
 
-    wxFont font(wxSMALL_FONT->GetPointSize(),
-                wxNORMAL_FONT->GetFamily(),
-                wxNORMAL_FONT->GetStyle(),
-                wxFONTWEIGHT_NORMAL);
+    wxFont font(wxSMALL_FONT->GetPointSize(), wxNORMAL_FONT->GetFamily(), wxNORMAL_FONT->GetStyle(), wxNORMAL);
     SetFont(font);
 
     // Calculate the label height if necessary
@@ -210,7 +205,7 @@ void wxButtonToolBar::GetRectLimits(const wxRect& rect,
                               wxCoord *start,
                               wxCoord *end) const
 {
-    wxCHECK_RET( start && end, wxT("NULL pointer in GetRectLimits") );
+    wxCHECK_RET( start && end, _T("NULL pointer in GetRectLimits") );
 
     if ( IsVertical() )
     {
@@ -229,7 +224,7 @@ void wxButtonToolBar::SetToolShortHelp(int id, const wxString& help)
 {
     wxToolBarToolBase *tool = FindById(id);
 
-    wxCHECK_RET( tool, wxT("SetToolShortHelp: no such tool") );
+    wxCHECK_RET( tool, _T("SetToolShortHelp: no such tool") );
 
     // TODO: set tooltip/short help
     tool->SetShortHelp(help);
@@ -276,10 +271,9 @@ wxToolBarToolBase *wxButtonToolBar::CreateTool(int id,
                              clientData, shortHelp, longHelp);
 }
 
-wxToolBarToolBase *wxButtonToolBar::CreateTool(wxControl *control,
-                                               const wxString& label)
+wxToolBarToolBase *wxButtonToolBar::CreateTool(wxControl *control)
 {
-    return new wxButtonToolBarTool(this, control, label);
+    return new wxButtonToolBarTool(this, control);
 }
 
 // ----------------------------------------------------------------------------
@@ -292,7 +286,7 @@ wxRect wxButtonToolBar::GetToolRect(wxToolBarToolBase *toolBase) const
 
     wxRect rect;
 
-    wxCHECK_MSG( tool, rect, wxT("GetToolRect: NULL tool") );
+    wxCHECK_MSG( tool, rect, _T("GetToolRect: NULL tool") );
 
     // ensure that we always have the valid tool position
     if ( m_needsLayout )
@@ -496,7 +490,7 @@ void wxButtonToolBar::OnCommand(wxCommandEvent& event)
 }
 
 // paints a border
-void wxButtonToolBar::OnPaint(wxPaintEvent& WXUNUSED(event))
+void wxButtonToolBar::OnPaint(wxPaintEvent& event)
 {
     wxPaintDC dc(this);
 
@@ -552,7 +546,7 @@ void wxButtonToolBar::OnLeftUp(wxMouseEvent& event)
         {
             wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, tool->GetId());
             event.SetEventObject(tool->GetButton());
-            if (!GetEventHandler()->ProcessEvent(event))
+            if (!ProcessEvent(event))
                 event.Skip();
         }
     }
diff --git a/Source/3rd Party/wx/src/generic/choicbkg.cpp b/Source/3rd Party/wx/src/generic/choicbkg.cpp
index d9a2b3239..a5df5f1e4 100644
--- a/Source/3rd Party/wx/src/generic/choicbkg.cpp	
+++ b/Source/3rd Party/wx/src/generic/choicbkg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by: Wlodzimierz ABX Skiba from generic/listbkg.cpp
 // Created:     15.09.04
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: choicbkg.cpp 58355 2009-01-24 14:12:59Z VZ $
 // Copyright:   (c) Vadim Zeitlin, Wlodzimierz Skiba
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -48,9 +48,12 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
+IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType();
+const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType();
+#endif
 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
     EVT_CHOICE(wxID_ANY, wxChoicebook::OnChoiceSelected)
@@ -64,6 +67,11 @@ END_EVENT_TABLE()
 // wxChoicebook creation
 // ----------------------------------------------------------------------------
 
+void wxChoicebook::Init()
+{
+    m_selection = wxNOT_FOUND;
+}
+
 bool
 wxChoicebook::Create(wxWindow *parent,
                      wxWindowID id,
@@ -106,6 +114,53 @@ wxChoicebook::Create(wxWindow *parent,
     return true;
 }
 
+// ----------------------------------------------------------------------------
+// wxChoicebook geometry management
+// ----------------------------------------------------------------------------
+
+wxSize wxChoicebook::GetControllerSize() const
+{
+    const wxSize sizeClient = GetClientSize(),
+                 sizeChoice = m_controlSizer->CalcMin();
+
+    wxSize size;
+    if ( IsVertical() )
+    {
+        size.x = sizeClient.x;
+        size.y = sizeChoice.y;
+    }
+    else // left/right aligned
+    {
+        size.x = sizeChoice.x;
+        size.y = sizeClient.y;
+    }
+
+    return size;
+}
+
+wxSize wxChoicebook::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    // we need to add the size of the choice control and the border between
+    const wxSize sizeChoice = GetControllerSize();
+
+    wxSize size = sizePage;
+    if ( IsVertical() )
+    {
+        if ( sizeChoice.x > sizePage.x )
+            size.x = sizeChoice.x;
+        size.y += sizeChoice.y + GetInternalBorder();
+    }
+    else // left/right aligned
+    {
+        size.x += sizeChoice.x + GetInternalBorder();
+        if ( sizeChoice.y > sizePage.y )
+            size.y = sizeChoice.y;
+    }
+
+    return size;
+}
+
+
 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------
@@ -124,31 +179,22 @@ wxString wxChoicebook::GetPageText(size_t n) const
 
 int wxChoicebook::GetPageImage(size_t WXUNUSED(n)) const
 {
+    wxFAIL_MSG( _T("wxChoicebook::GetPageImage() not implemented") );
+
     return wxNOT_FOUND;
 }
 
 bool wxChoicebook::SetPageImage(size_t WXUNUSED(n), int WXUNUSED(imageId))
 {
-    // fail silently, the code may be written to use one of several book
-    // classes and call SetPageImage() unconditionally, it's better to just
-    // ignore it (which is the best we can do short of rewriting this class to
-    // use wxBitmapComboBox anyhow) than complain loudly about a rather
-    // harmless problem
+    wxFAIL_MSG( _T("wxChoicebook::SetPageImage() not implemented") );
 
     return false;
 }
 
 // ----------------------------------------------------------------------------
-// miscellaneous other stuff
+// image list stuff
 // ----------------------------------------------------------------------------
 
-void wxChoicebook::DoSetWindowVariant(wxWindowVariant variant)
-{
-    wxBookCtrlBase::DoSetWindowVariant(variant);
-    if (m_bookctrl)
-        m_bookctrl->SetWindowVariant(variant);
-}
-
 void wxChoicebook::SetImageList(wxImageList *imageList)
 {
     // TODO: can be implemented in form of static bitmap near choice control
@@ -160,12 +206,17 @@ void wxChoicebook::SetImageList(wxImageList *imageList)
 // selection
 // ----------------------------------------------------------------------------
 
-wxBookCtrlEvent* wxChoicebook::CreatePageChangingEvent() const
+int wxChoicebook::GetSelection() const
 {
-    return new wxBookCtrlEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
+    return m_selection;
 }
 
-void wxChoicebook::MakeChangedEvent(wxBookCtrlEvent &event)
+wxBookCtrlBaseEvent* wxChoicebook::CreatePageChangingEvent() const
+{
+    return new wxChoicebookEvent(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, m_windowId);
+}
+
+void wxChoicebook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
 {
     event.SetEventType(wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED);
 }
@@ -195,36 +246,47 @@ wxChoicebook::InsertPage(size_t n,
         GetChoiceCtrl()->Select(m_selection);
     }
 
-    if ( !DoSetSelectionAfterInsertion(n, bSelect) )
+    // some page should be selected: either this one or the first one if there
+    // is still no selection
+    int selNew = wxNOT_FOUND;
+    if ( bSelect )
+        selNew = n;
+    else if ( m_selection == wxNOT_FOUND )
+        selNew = 0;
+
+    if ( selNew != m_selection )
         page->Hide();
 
+    if ( selNew != wxNOT_FOUND )
+        SetSelection(selNew);
+
     return true;
 }
 
 wxWindow *wxChoicebook::DoRemovePage(size_t page)
 {
+    const size_t page_count = GetPageCount();
     wxWindow *win = wxBookCtrlBase::DoRemovePage(page);
 
     if ( win )
     {
         GetChoiceCtrl()->Delete(page);
 
-        if ( m_selection >= (int)page )
+        if (m_selection >= (int)page)
         {
-            // ensure that the selection is valid
-            int sel;
-            if ( GetPageCount() == 0 )
+            // force new sel valid if possible
+            int sel = m_selection - 1;
+            if (page_count == 1)
                 sel = wxNOT_FOUND;
-            else
-                sel = m_selection ? m_selection - 1 : 0;
+            else if ((page_count == 2) || (sel == -1))
+                sel = 0;
 
-            // if deleting current page we shouldn't try to hide it
-            m_selection = m_selection == (int)page ? wxNOT_FOUND
-                                                   : m_selection - 1;
+            // force sel invalid if deleting current page - don't try to hide it
+            m_selection = (m_selection == (int)page) ? wxNOT_FOUND : m_selection - 1;
 
-            if ( sel != wxNOT_FOUND && sel != m_selection )
+            if ((sel != wxNOT_FOUND) && (sel != m_selection))
                 SetSelection(sel);
-        }
+           }
     }
 
     return win;
@@ -233,6 +295,7 @@ wxWindow *wxChoicebook::DoRemovePage(size_t page)
 
 bool wxChoicebook::DeleteAllPages()
 {
+    m_selection = wxNOT_FOUND;
     GetChoiceCtrl()->Clear();
     return wxBookCtrlBase::DeleteAllPages();
 }
diff --git a/Source/3rd Party/wx/src/generic/choicdgg.cpp b/Source/3rd Party/wx/src/generic/choicdgg.cpp
index 4cf6348e4..1caf90aa3 100644
--- a/Source/3rd Party/wx/src/generic/choicdgg.cpp	
+++ b/Source/3rd Party/wx/src/generic/choicdgg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: 03.11.00: VZ to add wxArrayString and multiple sel functions
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: choicdgg.cpp 44620 2007-03-06 09:56:43Z JS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -87,13 +87,9 @@ wxString wxGetSingleChoice( const wxString& message,
                             wxWindow *parent,
                             int WXUNUSED(x), int WXUNUSED(y),
                             bool WXUNUSED(centre),
-                            int WXUNUSED(width), int WXUNUSED(height),
-                            int initialSelection)
+                            int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
-
-    dialog.SetSelection(initialSelection);
-
     wxString choice;
     if ( dialog.ShowModal() == wxID_OK )
         choice = dialog.GetStringSelection();
@@ -107,56 +103,26 @@ wxString wxGetSingleChoice( const wxString& message,
                             wxWindow *parent,
                             int x, int y,
                             bool centre,
-                            int width, int height,
-                            int initialSelection)
+                            int width, int height)
 {
     wxString *choices;
     int n = ConvertWXArrayToC(aChoices, &choices);
     wxString res = wxGetSingleChoice(message, caption, n, choices, parent,
-                                     x, y, centre, width, height,
-                                     initialSelection);
+                                     x, y, centre, width, height);
     delete [] choices;
 
     return res;
 }
 
-wxString wxGetSingleChoice( const wxString& message,
-                            const wxString& caption,
-                            const wxArrayString& choices,
-                            int initialSelection,
-                            wxWindow *parent)
-{
-    return wxGetSingleChoice(message, caption, choices, parent,
-                             wxDefaultCoord, wxDefaultCoord,
-                             true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
-                             initialSelection);
-}
-
-wxString wxGetSingleChoice( const wxString& message,
-                            const wxString& caption,
-                            int n, const wxString *choices,
-                            int initialSelection,
-                            wxWindow *parent)
-{
-    return wxGetSingleChoice(message, caption, n, choices, parent,
-                             wxDefaultCoord, wxDefaultCoord,
-                             true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
-                             initialSelection);
-}
-
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,
                             int n, const wxString *choices,
                             wxWindow *parent,
                             int WXUNUSED(x), int WXUNUSED(y),
                             bool WXUNUSED(centre),
-                            int WXUNUSED(width), int WXUNUSED(height),
-                            int initialSelection)
+                            int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices);
-
-    dialog.SetSelection(initialSelection);
-
     int choice;
     if ( dialog.ShowModal() == wxID_OK )
         choice = dialog.GetSelection();
@@ -172,45 +138,17 @@ int wxGetSingleChoiceIndex( const wxString& message,
                             wxWindow *parent,
                             int x, int y,
                             bool centre,
-                            int width, int height,
-                            int initialSelection)
+                            int width, int height)
 {
     wxString *choices;
     int n = ConvertWXArrayToC(aChoices, &choices);
     int res = wxGetSingleChoiceIndex(message, caption, n, choices, parent,
-                                     x, y, centre, width, height,
-                                     initialSelection);
+                                     x, y, centre, width, height);
     delete [] choices;
 
     return res;
 }
 
-int wxGetSingleChoiceIndex( const wxString& message,
-                            const wxString& caption,
-                            const wxArrayString& choices,
-                            int initialSelection,
-                            wxWindow *parent)
-{
-    return wxGetSingleChoiceIndex(message, caption, choices, parent,
-                                  wxDefaultCoord, wxDefaultCoord,
-                                  true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
-                                  initialSelection);
-}
-
-
-int wxGetSingleChoiceIndex( const wxString& message,
-                            const wxString& caption,
-                            int n, const wxString *choices,
-                            int initialSelection,
-                            wxWindow *parent)
-{
-    return wxGetSingleChoiceIndex(message, caption, n, choices, parent,
-                                  wxDefaultCoord, wxDefaultCoord,
-                                  true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
-                                  initialSelection);
-}
-
-
 void *wxGetSingleChoiceData( const wxString& message,
                              const wxString& caption,
                              int n, const wxString *choices,
@@ -218,17 +156,13 @@ void *wxGetSingleChoiceData( const wxString& message,
                              wxWindow *parent,
                              int WXUNUSED(x), int WXUNUSED(y),
                              bool WXUNUSED(centre),
-                             int WXUNUSED(width), int WXUNUSED(height),
-                             int initialSelection)
+                             int WXUNUSED(width), int WXUNUSED(height) )
 {
     wxSingleChoiceDialog dialog(parent, message, caption, n, choices,
-                                client_data);
-
-    dialog.SetSelection(initialSelection);
-
+                                (char **)client_data);
     void *data;
     if ( dialog.ShowModal() == wxID_OK )
-        data = dialog.GetSelectionData();
+        data = dialog.GetSelectionClientData();
     else
         data = NULL;
 
@@ -242,50 +176,19 @@ void *wxGetSingleChoiceData( const wxString& message,
                              wxWindow *parent,
                              int x, int y,
                              bool centre,
-                             int width, int height,
-                             int initialSelection)
+                             int width, int height)
 {
     wxString *choices;
     int n = ConvertWXArrayToC(aChoices, &choices);
     void *res = wxGetSingleChoiceData(message, caption, n, choices,
                                       client_data, parent,
-                                      x, y, centre, width, height,
-                                      initialSelection);
+                                      x, y, centre, width, height);
     delete [] choices;
 
     return res;
 }
 
-void* wxGetSingleChoiceData( const wxString& message,
-                             const wxString& caption,
-                             const wxArrayString& choices,
-                             void **client_data,
-                             int initialSelection,
-                             wxWindow *parent)
-{
-    return wxGetSingleChoiceData(message, caption, choices,
-                                 client_data, parent,
-                                 wxDefaultCoord, wxDefaultCoord,
-                                 true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
-                                 initialSelection);
-}
-
-void* wxGetSingleChoiceData( const wxString& message,
-                             const wxString& caption,
-                             int n, const wxString *choices,
-                             void **client_data,
-                             int initialSelection,
-                             wxWindow *parent)
-{
-    return wxGetSingleChoiceData(message, caption, n, choices,
-                                 client_data, parent,
-                                 wxDefaultCoord, wxDefaultCoord,
-                                 true, wxCHOICE_WIDTH, wxCHOICE_HEIGHT,
-                                 initialSelection);
-}
-
-
-int wxGetSelectedChoices(wxArrayInt& selections,
+size_t wxGetMultipleChoices(wxArrayInt& selections,
                             const wxString& message,
                             const wxString& caption,
                             int n, const wxString *choices,
@@ -300,19 +203,15 @@ int wxGetSelectedChoices(wxArrayInt& selections,
     // deselects the first item which is selected by default
     dialog.SetSelections(selections);
 
-    if ( dialog.ShowModal() != wxID_OK )
-    {
-        // NB: intentionally do not clear the selections array here, the caller
-        //     might want to preserve its original contents if the dialog was
-        //     cancelled
-        return -1;
-    }
+    if ( dialog.ShowModal() == wxID_OK )
+        selections = dialog.GetSelections();
+    else
+        selections.Empty();
 
-    selections = dialog.GetSelections();
     return selections.GetCount();
 }
 
-int wxGetSelectedChoices(wxArrayInt& selections,
+size_t wxGetMultipleChoices(wxArrayInt& selections,
                             const wxString& message,
                             const wxString& caption,
                             const wxArrayString& aChoices,
@@ -323,7 +222,7 @@ int wxGetSelectedChoices(wxArrayInt& selections,
 {
     wxString *choices;
     int n = ConvertWXArrayToC(aChoices, &choices);
-    int res = wxGetSelectedChoices(selections, message, caption,
+    size_t res = wxGetMultipleChoices(selections, message, caption,
                                       n, choices, parent,
                                       x, y, centre, width, height);
     delete [] choices;
@@ -331,50 +230,6 @@ int wxGetSelectedChoices(wxArrayInt& selections,
     return res;
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-size_t wxGetMultipleChoices(wxArrayInt& selections,
-                            const wxString& message,
-                            const wxString& caption,
-                            int n, const wxString *choices,
-                            wxWindow *parent,
-                            int x, int y,
-                            bool centre,
-                            int width, int height)
-{
-    int rc = wxGetSelectedChoices(selections, message, caption,
-                                  n, choices,
-                                  parent, x, y, centre, width, height);
-    if ( rc == -1 )
-    {
-        selections.clear();
-        return 0;
-    }
-
-    return rc;
-}
-
-size_t wxGetMultipleChoices(wxArrayInt& selections,
-                            const wxString& message,
-                            const wxString& caption,
-                            const wxArrayString& aChoices,
-                            wxWindow *parent,
-                            int x, int y,
-                            bool centre,
-                            int width, int height)
-{
-    int rc = wxGetSelectedChoices(selections, message, caption,
-                                  aChoices,
-                                  parent, x, y, centre, width, height);
-    if ( rc == -1 )
-    {
-        selections.clear();
-        return 0;
-    }
-
-    return rc;
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // ----------------------------------------------------------------------------
 // wxAnyChoiceDialog
 // ----------------------------------------------------------------------------
@@ -387,12 +242,14 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
                                const wxPoint& pos,
                                long styleLbox)
 {
-    // extract the buttons styles from the dialog one and remove them from it
-    const long styleBtns = styleDlg & (wxOK | wxCANCEL);
-    styleDlg &= ~styleBtns;
-
+#ifdef __WXMAC__
+    // FIXME: why??
+    if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg & (~wxCANCEL) ) )
+        return false;
+#else
     if ( !wxDialog::Create(parent, wxID_ANY, caption, pos, wxDefaultSize, styleDlg) )
         return false;
+#endif
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
@@ -411,7 +268,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
 
     // 3) buttons if any
     wxSizer *
-        buttonSizer = CreateSeparatedButtonSizer(styleBtns);
+        buttonSizer = CreateSeparatedButtonSizer(styleDlg & ButtonSizerFlags);
     if ( buttonSizer )
     {
         topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());
@@ -445,8 +302,11 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
 
 wxListBoxBase *wxAnyChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox)
 {
+	wxSize size = wxDefaultSize;
+	if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA)
+		size = wxSize(300, 200);
     return new wxListBox( this, wxID_LISTBOX,
-                          wxDefaultPosition, wxDefaultSize,
+                          wxDefaultPosition, size,
                           n, choices,
                           styleLbox );
 }
@@ -467,12 +327,35 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
 
+wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
+                                           const wxString& message,
+                                           const wxString& caption,
+                                           int n,
+                                           const wxString *choices,
+                                           char **clientData,
+                                           long style,
+                                           const wxPoint& WXUNUSED(pos))
+{
+    Create(parent, message, caption, n, choices, clientData, style);
+}
+
+wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
+                                           const wxString& message,
+                                           const wxString& caption,
+                                           const wxArrayString& choices,
+                                           char **clientData,
+                                           long style,
+                                           const wxPoint& WXUNUSED(pos))
+{
+    Create(parent, message, caption, choices, clientData, style);
+}
+
 bool wxSingleChoiceDialog::Create( wxWindow *parent,
                                    const wxString& message,
                                    const wxString& caption,
                                    int n,
                                    const wxString *choices,
-                                   void **clientData,
+                                   char **clientData,
                                    long style,
                                    const wxPoint& pos )
 {
@@ -496,7 +379,7 @@ bool wxSingleChoiceDialog::Create( wxWindow *parent,
                                    const wxString& message,
                                    const wxString& caption,
                                    const wxArrayString& choices,
-                                   void **clientData,
+                                   char **clientData,
                                    long style,
                                    const wxPoint& pos )
 {
@@ -508,9 +391,6 @@ bool wxSingleChoiceDialog::Create( wxWindow *parent,
 // Set the selection
 void wxSingleChoiceDialog::SetSelection(int sel)
 {
-    wxCHECK_RET( sel >= 0 && (unsigned)sel < m_listbox->GetCount(),
-                 "Invalid initial selection" );
-
     m_listbox->SetSelection(sel);
     m_selection = sel;
 }
@@ -661,8 +541,12 @@ bool wxMultiChoiceDialog::TransferDataFromWindow()
 
 wxListBoxBase *wxMultiChoiceDialog::CreateList(int n, const wxString *choices, long styleLbox)
 {
+	wxSize size = wxDefaultSize;
+	if (wxSystemSettings::GetScreenType() > wxSYS_SCREEN_PDA)
+		size = wxSize(300, 200);
+
     return new wxCheckListBox( this, wxID_LISTBOX,
-                               wxDefaultPosition, wxDefaultSize,
+                               wxDefaultPosition, size,
                                n, choices,
                                styleLbox );
 }
diff --git a/Source/3rd Party/wx/src/generic/clrpickerg.cpp b/Source/3rd Party/wx/src/generic/clrpickerg.cpp
index 5c76f5afd..a02d2accd 100644
--- a/Source/3rd Party/wx/src/generic/clrpickerg.cpp	
+++ b/Source/3rd Party/wx/src/generic/clrpickerg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi (readapted code written by Vadim Zeitlin)
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: clrpickerg.cpp 58967 2009-02-17 13:31:28Z SC $
 // Copyright:   (c) Vadim Zeitlin, Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -27,8 +27,8 @@
 #if wxUSE_COLOURPICKERCTRL
 
 #include "wx/clrpicker.h"
+
 #include "wx/colordlg.h"
-#include "wx/dcmemory.h"
 
 
 // ============================================================================
@@ -36,7 +36,7 @@
 // ============================================================================
 
 wxColourData wxGenericColourButton::ms_data;
-IMPLEMENT_DYNAMIC_CLASS(wxGenericColourButton, wxBitmapButton)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericColourButton, wxCLRBTN_BASE_CLASS)
 
 // ----------------------------------------------------------------------------
 // wxGenericColourButton
@@ -47,11 +47,15 @@ bool wxGenericColourButton::Create( wxWindow *parent, wxWindowID id,
                         const wxSize &size, long style,
                         const wxValidator& validator, const wxString &name)
 {
-    m_bitmap = wxBitmap( 60, 13 );
-
     // create this button
-    if (!wxBitmapButton::Create( parent, id, m_bitmap, pos,
-                           size, style | wxBU_AUTODRAW, validator, name ))
+#if wxCLRBTN_USES_BMP_BUTTON
+    wxBitmap empty(1,1);
+    if (!wxBitmapButton::Create( parent, id, empty, pos,
+                           size, style, validator, name ))
+#else
+    if (!wxButton::Create( parent, id, wxEmptyString, pos,
+                           size, style, validator, name ))
+#endif
     {
         wxFAIL_MSG( wxT("wxGenericColourButton creation failed") );
         return false;
@@ -83,7 +87,7 @@ void wxGenericColourButton::InitColourData()
 
 void wxGenericColourButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
-    // update the wxColouData to be shown in the dialog
+    // update the wxColouData to be shown in the the dialog
     ms_data.SetColour(m_colour);
 
     // create the colour dialog and display it
@@ -101,38 +105,83 @@ void wxGenericColourButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 
 void wxGenericColourButton::UpdateColour()
 {
-    wxMemoryDC dc(m_bitmap);
-    dc.SetPen( *wxTRANSPARENT_PEN );
-    dc.SetBrush( wxBrush(m_colour) );
-    dc.DrawRectangle( 0,0,m_bitmap.GetWidth(),m_bitmap.GetHeight() );
-
-    if ( HasFlag(wxCLRP_SHOW_LABEL) )
+    if ( !m_colour.Ok() )
     {
-        wxColour col( ~m_colour.Red(), ~m_colour.Green(), ~m_colour.Blue() );
-        dc.SetTextForeground( col );
-        dc.SetFont( GetFont() );
-        dc.DrawText( m_colour.GetAsString(wxC2S_HTML_SYNTAX), 0, 0 );
+#if wxCLRBTN_USES_BMP_BUTTON
+        wxBitmap empty(1,1);
+        SetBitmapLabel(empty);
+#else
+        if ( HasFlag(wxCLRP_SHOW_LABEL) )
+            SetLabel(wxEmptyString);
+#endif
+        return;
     }
 
-    dc.SelectObject( wxNullBitmap );
-    SetBitmapLabel( m_bitmap );
+    // some combinations of the fg/bg colours may be unreadable, so we invert
+    // the colour to make sure fg colour is different enough from m_colour
+    wxColour colFg(~m_colour.Red(), ~m_colour.Green(), ~m_colour.Blue());
+
+#if wxCLRBTN_USES_BMP_BUTTON
+    wxSize sz = GetSize();
+    sz.x -= 2*GetMarginX();
+    sz.y -= 2*GetMarginY();
+
+    wxPoint topleft;
+    
+    if ( sz.x < 1 )
+        sz.x = 1;
+    else
+    if ( sz.y < 1 )
+        sz.y = 1;
+    
+    wxBitmap bmp(sz.x, sz.y);
+    {
+        wxMemoryDC memdc(bmp);
+        memdc.SetPen(colFg);
+        memdc.SetBrush(m_colour);
+        memdc.DrawRectangle(topleft,sz);
+        if ( HasFlag(wxCLRP_SHOW_LABEL) )
+        {
+            int x, y, leading, desc;
+            wxString label = m_colour.GetAsString(wxC2S_HTML_SYNTAX);
+            memdc.GetTextExtent(label,&x,&y,&desc,&leading);
+            if ( x <= sz.x && y <= sz.y )
+            {
+                topleft.x += (sz.x-x)/2;
+                topleft.y += (sz.y-y)/2;
+                memdc.SetTextForeground(colFg);
+                memdc.DrawText(label,topleft);
+            }
+        }
+    }
+    SetBitmapLabel(bmp);
+#else
+    SetForegroundColour(colFg);
+    SetBackgroundColour(m_colour);
+
+    if ( HasFlag(wxCLRP_SHOW_LABEL) )
+        SetLabel(m_colour.GetAsString(wxC2S_HTML_SYNTAX));
+#endif
 }
 
 wxSize wxGenericColourButton::DoGetBestSize() const
 {
-    wxSize sz(wxBitmapButton::DoGetBestSize());
-#ifdef __WXMAC__
-    sz.y += 6;
-#else
-    sz.y += 2;
-#endif
-    sz.x += 30;
+    wxSize sz(wxButton::DoGetBestSize());
     if ( HasFlag(wxCLRP_SHOW_LABEL) )
+    {
+#if wxCLRBTN_USES_BMP_BUTTON
+        int x, y, leading, desc;
+        wxString label = m_colour.GetAsString(wxC2S_HTML_SYNTAX);
+        wxClientDC dc(const_cast<wxGenericColourButton*>(this));
+        dc.GetTextExtent(label,&x,&y,&desc,&leading);
+        sz.x = sz.y+x;
+#endif
         return sz;
+    }
 
     // if we have no label, then make this button a square
-    // (like e.g. native GTK version of this control) ???
-    // sz.SetWidth(sz.GetHeight());
+    // (like e.g. native GTK version of this control)
+    sz.SetWidth(sz.GetHeight());
     return sz;
 }
 
diff --git a/Source/3rd Party/wx/src/generic/collpaneg.cpp b/Source/3rd Party/wx/src/generic/collpaneg.cpp
index c43168ed7..7f8848f4b 100644
--- a/Source/3rd Party/wx/src/generic/collpaneg.cpp	
+++ b/Source/3rd Party/wx/src/generic/collpaneg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi
 // Modified By:
 // Created:     8/10/2006
-// Id:          $Id$
+// Id:          $Id: collpaneg.cpp 43371 2006-11-12 21:38:49Z VZ $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,11 +16,6 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_COLLPANE && wxUSE_BUTTON && wxUSE_STATLINE
@@ -44,13 +39,13 @@
 // implementation
 // ============================================================================
 
-const char wxCollapsiblePaneNameStr[] = "collapsiblePane";
+const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane");
 
 //-----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 //-----------------------------------------------------------------------------
 
-wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 
@@ -59,13 +54,6 @@ BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl)
     EVT_SIZE(wxGenericCollapsiblePane::OnSize)
 END_EVENT_TABLE()
 
-void wxGenericCollapsiblePane::Init()
-{
-    m_pButton = NULL;
-    m_pPane = NULL;
-    m_pStaticLine = NULL;
-    m_sz = NULL;
-}
 
 bool wxGenericCollapsiblePane::Create(wxWindow *parent,
                                       wxWindowID id,
@@ -81,35 +69,32 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 
     m_strLabel = label;
 
-    // sizer containing the expand button and possibly a static line
-    m_sz = new wxBoxSizer(wxHORIZONTAL);
-
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
-    // on Mac we use the special disclosure triangle button
-    m_pStaticLine = NULL;
-    m_pButton = new wxDisclosureTriangle(this, wxID_ANY, GetBtnLabel());
-    m_sz->Add(m_pButton);
-#else
     // create children and lay them out using a wxBoxSizer
     // (so that we automatically get RTL features)
     m_pButton = new wxButton(this, wxID_ANY, GetBtnLabel(), wxPoint(0, 0),
                              wxDefaultSize, wxBU_EXACTFIT);
     m_pStaticLine = new wxStaticLine(this, wxID_ANY);
-
+#ifdef __WXMAC__
+    // on Mac we put the static libe above the button
+    m_sz = new wxBoxSizer(wxVERTICAL);
+    m_sz->Add(m_pStaticLine, 0, wxALL|wxGROW, GetBorder());
+    m_sz->Add(m_pButton, 0, wxLEFT|wxRIGHT|wxBOTTOM, GetBorder());
+#else
     // on other platforms we put the static line and the button horizontally
+    m_sz = new wxBoxSizer(wxHORIZONTAL);
     m_sz->Add(m_pButton, 0, wxLEFT|wxTOP|wxBOTTOM, GetBorder());
     m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder());
 #endif
 
     // FIXME: at least under wxCE and wxGTK1 the background is black if we don't do
     //        this, no idea why...
-#if defined(__WXWINCE__) || defined(__WXGTK__)
+#if defined(__WXWINCE__) || (defined(__WXGTK__) && !defined(__WXGTK20__))
     SetBackgroundColour(parent->GetBackgroundColour());
 #endif
 
     // do not set sz as our sizers since we handle the pane window without using sizers
     m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                          wxTAB_TRAVERSAL|wxNO_BORDER, wxT("wxCollapsiblePanePane") );
+                          wxTAB_TRAVERSAL|wxNO_BORDER);
 
     // start as collapsed:
     m_pPane->Hide();
@@ -119,14 +104,14 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent,
 
 wxGenericCollapsiblePane::~wxGenericCollapsiblePane()
 {
-    if (m_pButton)
+    if (m_pButton && m_pStaticLine && m_sz)
+    {
         m_pButton->SetContainingSizer(NULL);
-
-    if (m_pStaticLine)
         m_pStaticLine->SetContainingSizer(NULL);
 
-    // our sizer is not deleted automatically since we didn't use SetSizer()!
-    wxDELETE(m_sz);
+        // our sizer is not deleted automatically since we didn't use SetSizer()!
+        wxDELETE(m_sz);
+    }
 }
 
 wxSize wxGenericCollapsiblePane::DoGetBestSize() const
@@ -146,42 +131,78 @@ wxSize wxGenericCollapsiblePane::DoGetBestSize() const
 
 wxString wxGenericCollapsiblePane::GetBtnLabel() const
 {
-    // on mac the triangle indicates the state, no string change
-#ifdef __WXMAC__
-    return m_strLabel;
-#else
     return m_strLabel + (IsCollapsed() ? wxT(" >>") : wxT(" <<"));
-#endif
 }
 
 void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
 {
     // minimal size has priority over the best size so set here our min size
-//    SetMinSize(sz);
+    SetMinSize(sz);
     SetSize(sz);
 
     if (this->HasFlag(wxCP_NO_TLW_RESIZE))
     {
-        // the user asked to explicitly handle the resizing itself...
+        // the user asked to explicitely handle the resizing itself...
         return;
     }
 
 
-    wxTopLevelWindow *top =
-        wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-    if ( !top )
-        return;
+    //
+    // NB: the following block of code has been accurately designed to
+    //     as much flicker-free as possible; be careful when modifying it!
+    //
 
-    wxSizer *sizer = top->GetSizer();
-    if ( !sizer )
-        return;
+    wxTopLevelWindow *
+        top = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( top )
+    {
+        // NB: don't Layout() the 'top' window as its size has not been correctly
+        //     updated yet and we don't want to do an initial Layout() with the old
+        //     size immediately followed by a SetClientSize/Fit call for the new
+        //     size; that would provoke flickering!
 
-    const wxSize newBestSize = sizer->ComputeFittingClientSize(top);
-    top->SetMinClientSize(newBestSize);
+        if (top->GetSizer())
+#ifdef __WXGTK__
+        // FIXME: the SetSizeHints() call would be required also for GTK+ for
+        //        the expanded->collapsed transition. Unfortunately if we
+        //        enable this line, then the GTK+ top window won't always be
+        //        resized by the SetClientSize() call below! As a side effect
+        //        of this dirty fix, the minimal size for the pane window is
+        //        not set in GTK+ and the user can hide it shrinking the "top"
+        //        window...
+        if (IsCollapsed())
+#endif
+            top->GetSizer()->SetSizeHints(top);
 
-    // we shouldn't attempt to resize a maximized window, whatever happens
-    if ( !top->IsMaximized() )
-        top->SetClientSize(newBestSize);
+
+        // we shouldn't attempt to resize a maximized window, whatever happens
+        if ( !top->IsMaximized() )
+        {
+            if ( IsCollapsed() )
+            {
+                // expanded -> collapsed transition
+                if (top->GetSizer())
+                {
+                    // we have just set the size hints...
+                    wxSize sz = top->GetSizer()->CalcMin();
+
+                    // use SetClientSize() and not SetSize() otherwise the size for
+                    // e.g. a wxFrame with a menubar wouldn't be correctly set
+                    top->SetClientSize(sz);
+                }
+                else
+                    top->Layout();
+            }
+            else
+            {
+                // collapsed -> expanded transition
+
+                // force our parent to "fit", i.e. expand so that it can honour
+                // our minimal size
+                top->Fit();
+            }
+        }
+    }
 }
 
 void wxGenericCollapsiblePane::Collapse(bool collapse)
@@ -194,13 +215,8 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
     m_pPane->Show(!collapse);
 
     // update button label
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
-    m_pButton->SetOpen( !collapse );
-#else
     // NB: this must be done after updating our "state"
     m_pButton->SetLabel(GetBtnLabel());
-#endif
-
 
     OnStateChange(GetBestSize());
 }
@@ -208,25 +224,16 @@ void wxGenericCollapsiblePane::Collapse(bool collapse)
 void wxGenericCollapsiblePane::SetLabel(const wxString &label)
 {
     m_strLabel = label;
-#ifdef __WXMAC__
-    m_pButton->SetLabel(GetBtnLabel());
-#else
     m_pButton->SetLabel(GetBtnLabel());
     m_pButton->SetInitialSize();
-#endif
 
     Layout();
 }
 
 bool wxGenericCollapsiblePane::Layout()
 {
-#ifdef __WXMAC__
-    if (!m_pButton || !m_pPane || !m_sz)
-        return false;     // we need to complete the creation first!
-#else
     if (!m_pButton || !m_pStaticLine || !m_pPane || !m_sz)
         return false;     // we need to complete the creation first!
-#endif
 
     wxSize oursz(GetSize());
 
@@ -252,6 +259,8 @@ int wxGenericCollapsiblePane::GetBorder() const
 {
 #if defined( __WXMAC__ )
     return 6;
+#elif defined(__WXGTK20__)
+    return 3;
 #elif defined(__WXMSW__)
     wxASSERT(m_pButton);
     return m_pButton->ConvertDialogToPixels(wxSize(2, 0)).x;
diff --git a/Source/3rd Party/wx/src/generic/combog.cpp b/Source/3rd Party/wx/src/generic/combog.cpp
index 579b5104e..798170e91 100644
--- a/Source/3rd Party/wx/src/generic/combog.cpp	
+++ b/Source/3rd Party/wx/src/generic/combog.cpp	
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: combog.cpp 67178 2011-03-13 09:32:19Z JMS $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,7 +32,6 @@
     #include "wx/combobox.h"
     #include "wx/dcclient.h"
     #include "wx/settings.h"
-    #include "wx/textctrl.h"
 #endif
 
 #include "wx/dcbuffer.h"
@@ -42,46 +41,36 @@
 
 #if defined(__WXUNIVERSAL__)
 
-// position adjustment for wxTextCtrl, to achieve zero left margin
-// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
-#define TEXTCTRLXADJUST                 0
-
+#define TEXTCTRLXADJUST                 0 // position adjustment for wxTextCtrl, with zero indent
+#define TEXTCTRLYADJUST                 0
 #define TEXTXADJUST                     0 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        19
 
 #elif defined(__WXMSW__)
 
-// position adjustment for wxTextCtrl, to achieve zero left margin
-// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
-#define TEXTCTRLXADJUST                 2
-
+#define TEXTCTRLXADJUST                 2 // position adjustment for wxTextCtrl, with zero indent
+#define TEXTCTRLYADJUST                 3
 #define TEXTXADJUST                     0 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        17
 
 #elif defined(__WXGTK__)
 
-// position adjustment for wxTextCtrl, to achieve zero left margin
-// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
-#define TEXTCTRLXADJUST                 -1
-
+#define TEXTCTRLXADJUST                 -1 // position adjustment for wxTextCtrl, with zero indent
+#define TEXTCTRLYADJUST                 0
 #define TEXTXADJUST                     1 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        23
 
 #elif defined(__WXMAC__)
 
-// position adjustment for wxTextCtrl, to achieve zero left margin
-// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
-#define TEXTCTRLXADJUST                 0
-
+#define TEXTCTRLXADJUST                 0 // position adjustment for wxTextCtrl, with zero indent
+#define TEXTCTRLYADJUST                 0
 #define TEXTXADJUST                     0 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        22
 
 #else
 
-// position adjustment for wxTextCtrl, to achieve zero left margin
-// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
-#define TEXTCTRLXADJUST                 0
-
+#define TEXTCTRLXADJUST                 0 // position adjustment for wxTextCtrl, with zero indent
+#define TEXTCTRLYADJUST                 0
 #define TEXTXADJUST                     0 // how much is read-only text's x adjusted
 #define DEFAULT_DROPBUTTON_WIDTH        19
 
@@ -170,8 +159,7 @@ bool wxGenericComboCtrl::Create(wxWindow *parent,
     border = wxBORDER_NONE;
 
     Customize( wxCC_BUTTON_OUTSIDE_BORDER |
-               wxCC_NO_TEXT_AUTO_SELECT |
-               wxCC_BUTTON_STAYS_DOWN );
+               wxCC_NO_TEXT_AUTO_SELECT );
 
 #endif
 
@@ -186,20 +174,18 @@ bool wxGenericComboCtrl::Create(wxWindow *parent,
                                   pos,
                                   size,
                                   style | wxFULL_REPAINT_ON_RESIZE,
-                                  validator,
+                                  wxDefaultValidator,
                                   name) )
         return false;
 
     // Create textctrl, if necessary
-    CreateTextCtrl( tcBorder );
+    CreateTextCtrl( tcBorder, validator );
 
     // Add keyboard input handlers for main control and textctrl
     InstallInputHandlers();
 
-    // Set background style for double-buffering, when needed
-    // (cannot use when system draws background automatically)
-    if ( !HasTransparentBackground() )
-        SetBackgroundStyle( wxBG_STYLE_PAINT );
+    // Set background
+    SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // for double-buffering
 
     // SetInitialSize should be called last
     SetInitialSize(size);
@@ -230,24 +216,16 @@ void wxGenericComboCtrl::OnResize()
 #endif
 
     // Move textctrl, if any, accordingly
-    PositionTextCtrl( TEXTCTRLXADJUST );
+    PositionTextCtrl( TEXTCTRLXADJUST, TEXTCTRLYADJUST );
 }
 
 void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 {
-    // Determine wxDC to use based on need to double-buffer or
-    // use system-generated transparent background portions
-    wxDC* dcPtr;
-    if ( HasTransparentBackground() )
-        dcPtr = new wxPaintDC(this);
-    else
-        dcPtr = new wxAutoBufferedPaintDC(this);
-    wxDC& dc = *dcPtr;
-
     wxSize sz = GetClientSize();
-    const wxRect& butRect = m_btnArea;
-    wxRect tcRect = m_tcArea;
-    wxRect fullRect(0, 0, sz.x, sz.y);
+    wxAutoBufferedPaintDC dc(this);
+
+    const wxRect& rectb = m_btnArea;
+    wxRect rect = m_tcArea;
 
     // artificial simple border
     if ( m_widthCustomBorder )
@@ -255,22 +233,16 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         int customBorder = m_widthCustomBorder;
 
         // Set border colour
-#ifdef __WXMAC__
-        wxPen pen1( wxColour(133,133,133),
-                    customBorder,
-                    wxSOLID );
-#else        
         wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT),
                     customBorder,
-                    wxPENSTYLE_SOLID);
-#endif
+                    wxSOLID );
         dc.SetPen( pen1 );
 
         // area around both controls
-        wxRect rect2(fullRect);
+        wxRect rect2(0,0,sz.x,sz.y);
         if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
         {
-            rect2 = tcRect;
+            rect2 = m_tcArea;
             if ( customBorder == 1 )
             {
                 rect2.Inflate(1);
@@ -293,49 +265,50 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         dc.DrawRectangle(rect2);
     }
 
-    // Clear the main background if the system doesn't do it by itself
-    if ( !HasTransparentBackground() &&
-         (tcRect.x > 0 || tcRect.y > 0) )
-    {
-        wxColour winCol = GetParent()->GetBackgroundColour();
-        dc.SetBrush(winCol);
-        dc.SetPen(winCol);
+#if defined(__WXMAC__) || defined(__WXGTK__)  // see note in OnThemeChange
+    wxColour winCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#else
+    wxColour winCol = GetBackgroundColour();
+#endif
+    dc.SetBrush(winCol);
+    dc.SetPen(winCol);
 
-        dc.DrawRectangle(fullRect);
-    }
+    //wxLogDebug(wxT("hei: %i tcy: %i tchei: %i"),GetClientSize().y,m_tcArea.y,m_tcArea.height);
+    //wxLogDebug(wxT("btnx: %i tcx: %i tcwid: %i"),m_btnArea.x,m_tcArea.x,m_tcArea.width);
 
+    // clear main background
+    dc.DrawRectangle(rect);
+    
     if ( !m_btn )
     {
+    #ifdef __WXGTK__
+        // Under GTK+ this avoids drawing the button background with wrong
+        // colour
+        DrawButton(dc,rectb,0);
+    #else
         // Standard button rendering
-        DrawButton(dc, butRect);
+        DrawButton(dc,rectb);
+    #endif
     }
 
     // paint required portion on the control
-    if ( !m_text || m_widthCustomPaint )
+    if ( (!m_text || m_widthCustomPaint) )
     {
         wxASSERT( m_widthCustomPaint >= 0 );
 
-        // Clear the text-control area background
-        wxColour tcCol = GetBackgroundColour();
-        dc.SetBrush(tcCol);
-        dc.SetPen(tcCol);
-        dc.DrawRectangle(tcRect);
-
         // this is intentionally here to allow drawed rectangle's
         // right edge to be hidden
         if ( m_text )
-            tcRect.width = m_widthCustomPaint;
+            rect.width = m_widthCustomPaint;
 
         dc.SetFont( GetFont() );
 
-        dc.SetClippingRegion(tcRect);
+        dc.SetClippingRegion(rect);
         if ( m_popupInterface )
-            m_popupInterface->PaintComboControl(dc, tcRect);
+            m_popupInterface->PaintComboControl(dc,rect);
         else
-            wxComboPopup::DefaultPaintComboControl(this, dc, tcRect);
+            wxComboPopup::DefaultPaintComboControl(this,dc,rect);
     }
-
-    delete dcPtr;
 }
 
 void wxGenericComboCtrl::OnMouseEvent( wxMouseEvent& event )
@@ -424,7 +397,19 @@ void wxGenericComboCtrl::SetCustomPaintWidth( int width )
             tc->RemoveEventHandler(m_textEvtHandler);
             delete m_textEvtHandler;
 
-            CreateTextCtrl( tcCreateStyle );
+#if wxUSE_VALIDATORS
+            wxValidator* pValidator = tc->GetValidator();
+            if ( pValidator )
+            {
+                pValidator = (wxValidator*) pValidator->Clone();
+                CreateTextCtrl( tcCreateStyle, *pValidator );
+                delete pValidator;
+            }
+            else
+#endif
+            {
+                CreateTextCtrl( tcCreateStyle, wxDefaultValidator );
+            }
 
             InstallInputHandlers();
         }
@@ -449,8 +434,7 @@ bool wxGenericComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
     }
     else
     {
-        if ( (keycode == WXK_DOWN && event.AltDown()) ||
-             (keycode == WXK_F4) )
+        if ( keycode == WXK_DOWN && event.AltDown() )
             return true;
     }
 
diff --git a/Source/3rd Party/wx/src/generic/dcpsg.cpp b/Source/3rd Party/wx/src/generic/dcpsg.cpp
index b0f10e6b3..f19e75d66 100644
--- a/Source/3rd Party/wx/src/generic/dcpsg.cpp	
+++ b/Source/3rd Party/wx/src/generic/dcpsg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Robert Roebling, Markus Holzhem
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcpsg.cpp 55927 2008-09-28 09:12:16Z VS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,9 +32,11 @@
 #include "wx/prntbase.h"
 #include "wx/generic/prntdlgg.h"
 #include "wx/paper.h"
-#include "wx/filename.h"
+#include "wx/filefn.h"
 #include "wx/stdpaths.h"
 
+WXDLLIMPEXP_DATA_CORE(int) wxPageNumber;
+
 #ifdef __WXMSW__
 
 #ifdef DrawText
@@ -190,7 +192,7 @@ static const char *wxPostScriptHeaderColourImage = "\
   } ifelse          % end of 'false' case\n\
 ";
 
-static const char wxPostScriptHeaderReencodeISO1[] =
+static char wxPostScriptHeaderReencodeISO1[] =
     "\n/reencodeISO {\n"
 "dup dup findfont dup length dict begin\n"
 "{ 1 index /FID ne { def }{ pop pop } ifelse } forall\n"
@@ -214,7 +216,7 @@ static const char wxPostScriptHeaderReencodeISO1[] =
 "/.notdef/dotlessi/grave/acute/circumflex/tilde/macron/breve\n"
 "/dotaccent/dieresis/.notdef/ring/cedilla/.notdef/hungarumlaut\n";
 
-static const char wxPostScriptHeaderReencodeISO2[] =
+static char wxPostScriptHeaderReencodeISO2[] =
 "/ogonek/caron/space/exclamdown/cent/sterling/currency/yen/brokenbar\n"
 "/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot\n"
 "/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior\n"
@@ -235,85 +237,25 @@ static const char wxPostScriptHeaderReencodeISO2[] =
 // wxPostScriptDC
 //-------------------------------------------------------------------------------
 
-
 IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
 
-wxPostScriptDC::wxPostScriptDC()
-              : wxDC(new wxPostScriptDCImpl(this))
+float wxPostScriptDC::ms_PSScaleFactor = 1.0;
+
+void wxPostScriptDC::SetResolution(int ppi)
 {
+    ms_PSScaleFactor = (float)ppi / 72.0;
 }
 
-wxPostScriptDC::wxPostScriptDC(const wxPrintData& printData)
-              : wxDC(new wxPostScriptDCImpl(this, printData))
+int wxPostScriptDC::GetResolution()
 {
+    return (int)(ms_PSScaleFactor * 72.0);
 }
 
-// conversion
-static const double RAD2DEG  = 180.0 / M_PI;
-
-// we don't want to use only 72 dpi from PS print
-static const int DPI = 600;
-static const double PS2DEV = 600.0 / 72.0;
-static const double DEV2PS = 72.0 / 600.0;
-
-#define XLOG2DEV(x)     ((double)(LogicalToDeviceX(x)) * DEV2PS)
-#define XLOG2DEVREL(x)  ((double)(LogicalToDeviceXRel(x)) * DEV2PS)
-#define YLOG2DEV(x)     ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS)
-#define YLOG2DEVREL(x)  ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
-
-
-IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl)
-
 //-------------------------------------------------------------------------------
 
-wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner ) :
-   wxDCImpl( owner )
+wxPostScriptDC::wxPostScriptDC ()
 {
-    Init();
-
-    m_pageHeight = 842 * PS2DEV;
-
-    m_ok = true;
-}
-
-wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data ) :
-   wxDCImpl( owner )
-{
-    Init();
-
-    // this calculates m_pageHeight required for
-    // taking the inverted Y axis into account
-    SetPrintData( data );
-
-    m_ok = true;
-}
-
-
-wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner ) :
-   wxDCImpl( owner )
-{
-    Init();
-
-    m_pageHeight = 842 * PS2DEV;
-
-    m_ok = true;
-}
-
-wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
-   wxDCImpl( owner )
-{
-    Init();
-
-    // this calculates m_pageHeight required for
-    // taking the inverted Y axis into account
-    SetPrintData( data );
-
-    m_ok = true;
-}
-
-void wxPostScriptDCImpl::Init()
-{
-    m_pstream = NULL;
+    m_pstream = (FILE*) NULL;
 
     m_currentRed = 0;
     m_currentGreen = 0;
@@ -326,67 +268,71 @@ void wxPostScriptDCImpl::Init()
     m_underlinePosition = 0.0;
     m_underlineThickness = 0.0;
 
+    m_signX =  1;  // default x-axis left to right
+    m_signY = -1;  // default y-axis bottom up -> top down
 }
 
-wxPostScriptDCImpl::~wxPostScriptDCImpl ()
+wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData)
+{
+    m_pstream = (FILE*) NULL;
+
+    m_currentRed = 0;
+    m_currentGreen = 0;
+    m_currentBlue = 0;
+
+    m_pageNumber = 0;
+
+    m_clipping = false;
+
+    m_underlinePosition = 0.0;
+    m_underlineThickness = 0.0;
+
+    m_signX =  1;  // default x-axis left to right
+    m_signY = -1;  // default y-axis bottom up -> top down
+
+    m_printData = printData;
+
+    m_ok = true;
+}
+
+wxPostScriptDC::~wxPostScriptDC ()
 {
     if (m_pstream)
     {
         fclose( m_pstream );
-        m_pstream = NULL;
+        m_pstream = (FILE*) NULL;
     }
 }
 
-bool wxPostScriptDCImpl::IsOk() const
+bool wxPostScriptDC::IsOk() const
 {
   return m_ok;
 }
 
-wxRect wxPostScriptDCImpl::GetPaperRect() const
-{
-    int w = 0;
-    int h = 0;
-    DoGetSize( &w, &h );
-    return wxRect(0,0,w,h);
-}
-
-int wxPostScriptDCImpl::GetResolution() const
-{
-    return DPI;
-}
-
-void wxPostScriptDCImpl::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {
     wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 
-    if (m_clipping)
-        DestroyClippingRegion();
+    if (m_clipping) DestroyClippingRegion();
 
-    m_clipX1 = x;
-    m_clipY1 = y;
-    m_clipX2 = x + w;
-    m_clipY2 = y + h;
+    wxDC::DoSetClippingRegion(x, y, w, h);
 
     m_clipping = true;
 
-    wxString buffer;
-    buffer.Printf( "gsave\n"
-                   "newpath\n"
-                   "%f %f moveto\n"
-                   "%f %f lineto\n"
-                   "%f %f lineto\n"
-                   "%f %f lineto\n"
-                   "closepath clip newpath\n",
-            XLOG2DEV(x),   YLOG2DEV(y),
-            XLOG2DEV(x+w), YLOG2DEV(y),
-            XLOG2DEV(x+w), YLOG2DEV(y+h),
-            XLOG2DEV(x),   YLOG2DEV(y+h) );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
+    PsPrintf( wxT("gsave\n newpath\n")
+              wxT("%d %d moveto\n")
+              wxT("%d %d lineto\n")
+              wxT("%d %d lineto\n")
+              wxT("%d %d lineto\n")
+              wxT("closepath clip newpath\n"),
+            LogicalToDeviceX(x),   LogicalToDeviceY(y),
+            LogicalToDeviceX(x+w), LogicalToDeviceY(y),
+            LogicalToDeviceX(x+w), LogicalToDeviceY(y+h),
+            LogicalToDeviceX(x),   LogicalToDeviceY(y+h) );
 }
 
 
-void wxPostScriptDCImpl::DestroyClippingRegion()
+void wxPostScriptDC::DestroyClippingRegion()
 {
     wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 
@@ -396,63 +342,61 @@ void wxPostScriptDCImpl::DestroyClippingRegion()
         PsPrint( "grestore\n" );
     }
 
-    wxDCImpl::DestroyClippingRegion();
+    wxDC::DestroyClippingRegion();
 }
 
-void wxPostScriptDCImpl::Clear()
+void wxPostScriptDC::Clear()
 {
     // This should fail silently to avoid unnecessary
     // asserts
-    //    wxFAIL_MSG( wxT("wxPostScriptDCImpl::Clear not implemented.") );
+    //    wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") );
 }
 
-bool wxPostScriptDCImpl::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), wxFloodFillStyle WXUNUSED(style))
+bool wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
 {
-    wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") );
+    wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") );
     return false;
 }
 
-bool wxPostScriptDCImpl::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const
+bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const
 {
-    wxFAIL_MSG( wxT("wxPostScriptDCImpl::GetPixel not implemented.") );
+    wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") );
     return false;
 }
 
-void wxPostScriptDCImpl::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
+void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 {
-    wxFAIL_MSG( wxT("wxPostScriptDCImpl::CrossHair not implemented.") );
+    wxFAIL_MSG( wxT("wxPostScriptDC::CrossHair not implemented.") );
 }
 
-void wxPostScriptDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if ( m_pen.IsTransparent() )
-        return;
+    if  (m_pen.GetStyle() == wxTRANSPARENT) return;
 
     SetPen( m_pen );
 
-    wxString buffer;
-    buffer.Printf( "newpath\n"
-                   "%f %f moveto\n"
-                   "%f %f lineto\n"
-                   "stroke\n",
-            XLOG2DEV(x1), YLOG2DEV(y1),
-            XLOG2DEV(x2), YLOG2DEV(y2) );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
+    PsPrintf( wxT("newpath\n")
+              wxT("%d %d moveto\n")
+              wxT("%d %d lineto\n")
+              wxT("stroke\n"),
+            LogicalToDeviceX(x1), LogicalToDeviceY(y1),
+            LogicalToDeviceX(x2), LogicalToDeviceY (y2) );
 
     CalcBoundingBox( x1, y1 );
     CalcBoundingBox( x2, y2 );
 }
 
-void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
+#define RAD2DEG 57.29577951308
+
+void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     wxCoord dx = x1 - xc;
     wxCoord dy = y1 - yc;
-    double radius = sqrt( (double)(dx*dx+dy*dy) );
+    wxCoord radius = (wxCoord) sqrt( (double)(dx*dx+dy*dy) );
     double alpha1, alpha2;
 
     if (x1 == x2 && y1 == y2)
@@ -479,49 +423,40 @@ void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord
     while (alpha1 > 360)  alpha1 -= 360; // 0 and 360 degree
     while (alpha2 > 360)  alpha2 -= 360;
 
-    int i_radius = wxRound( radius );
-
-    if ( m_brush.IsNonTransparent() )
+    if (m_brush.GetStyle() != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f %f %f %f %f ellipse\n"
-                       "%f %f lineto\n"
-                       "closepath\n"
-                       "fill\n",
-                XLOG2DEV(xc), YLOG2DEV(yc),
-                XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius),
-                alpha1, alpha2,
-                XLOG2DEV(xc), YLOG2DEV(yc) );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d %d %d ellipse\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("fill\n"),
+                LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
+                LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
 
-        CalcBoundingBox( xc-i_radius, yc-i_radius );
-        CalcBoundingBox( xc+i_radius, yc+i_radius );
+        CalcBoundingBox( xc-radius, yc-radius );
+        CalcBoundingBox( xc+radius, yc+radius );
     }
 
-    if ( m_pen.IsNonTransparent() )
+    if (m_pen.GetStyle() != wxTRANSPARENT)
     {
         SetPen( m_pen );
 
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f %f %f %f %f ellipse\n"
-                       "stroke\n",
-                XLOG2DEV(xc), YLOG2DEV(yc),
-                XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius),
-                alpha1, alpha2 );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d %d %d ellipse\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("stroke\n"),
+                LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2,
+                LogicalToDeviceX(xc), LogicalToDeviceY(yc) );
 
-        CalcBoundingBox( xc-i_radius, yc-i_radius );
-        CalcBoundingBox( xc+i_radius, yc+i_radius );
+        CalcBoundingBox( xc-radius, yc-radius );
+        CalcBoundingBox( xc+radius, yc+radius );
     }
 }
 
-void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
@@ -536,97 +471,82 @@ void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord
 
     if ( wxIsSameDouble(sa, ea) )
     {
-        DoDrawEllipse(x,y,w,h);
+        DrawEllipse(x,y,w,h);
         return;
     }
 
-    if ( m_brush.IsNonTransparent() )
+    if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f %f %f %f %f true ellipticarc\n",
-                  XLOG2DEV(x+w/2), YLOG2DEV(y+h/2),
-                  XLOG2DEVREL(w/2), YLOG2DEVREL(h/2),
-                  sa, ea );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d %d %d true ellipticarc\n"),
+                  LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2),
+                  LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2),
+                  (wxCoord)sa, (wxCoord)ea );
 
         CalcBoundingBox( x ,y );
         CalcBoundingBox( x+w, y+h );
     }
 
-    if ( m_pen.IsNonTransparent() )
+    if (m_pen.GetStyle () != wxTRANSPARENT)
     {
         SetPen( m_pen );
 
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f %f %f %f %f false ellipticarc\n",
-                  XLOG2DEV(x+w/2), YLOG2DEV(y+h/2),
-                  XLOG2DEVREL(w/2), YLOG2DEVREL(h/2),
-                  sa, ea );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d %d %d false ellipticarc\n"),
+                LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2),
+                LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2),
+                (wxCoord)sa, (wxCoord)ea );
 
         CalcBoundingBox( x ,y );
         CalcBoundingBox( x+w, y+h );
     }
 }
 
-void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y)
+void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if ( m_pen.IsTransparent() )
-        return;
+    if (m_pen.GetStyle() == wxTRANSPARENT) return;
 
     SetPen (m_pen);
 
-    wxString buffer;
-    buffer.Printf( "newpath\n"
-                   "%f %f moveto\n"
-                   "%f %f lineto\n"
-                   "stroke\n",
-            XLOG2DEV(x),   YLOG2DEV(y),
-            XLOG2DEV(x+1), YLOG2DEV(y) );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
+    PsPrintf( wxT("newpath\n")
+              wxT("%d %d moveto\n")
+              wxT("%d %d lineto\n")
+              wxT("stroke\n"),
+            LogicalToDeviceX(x),   LogicalToDeviceY(y),
+            LogicalToDeviceX(x+1), LogicalToDeviceY(y) );
 
     CalcBoundingBox( x, y );
 }
 
-void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
+void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (n <= 0) return;
 
-    if ( m_brush.IsNonTransparent() )
+    if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
         PsPrint( "newpath\n" );
 
-        double xx = XLOG2DEV(points[0].x + xoffset);
-        double yy = YLOG2DEV(points[0].y + yoffset);
+        wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
+        wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
 
-        wxString buffer;
-        buffer.Printf( "%f %f moveto\n", xx, yy );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("%d %d moveto\n"), xx, yy );
 
         CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
 
         for (int i = 1; i < n; i++)
         {
-            xx = XLOG2DEV(points[i].x + xoffset);
-            yy = YLOG2DEV(points[i].y + yoffset);
+            xx = LogicalToDeviceX(points[i].x + xoffset);
+            yy = LogicalToDeviceY(points[i].y + yoffset);
 
-            buffer.Printf( "%f %f lineto\n", xx, yy );
-            buffer.Replace( ",", "." );
-            PsPrint( buffer );
+            PsPrintf( wxT("%d %d lineto\n"), xx, yy );
 
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
@@ -634,30 +554,25 @@ void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset
         PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
     }
 
-    if ( m_pen.IsNonTransparent() )
+    if (m_pen.GetStyle () != wxTRANSPARENT)
     {
         SetPen( m_pen );
 
         PsPrint( "newpath\n" );
 
-        double xx = XLOG2DEV(points[0].x + xoffset);
-        double yy = YLOG2DEV(points[0].y + yoffset);
+        wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
+        wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
 
-        wxString buffer;
-        buffer.Printf( "%f %f moveto\n", xx, yy );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("%d %d moveto\n"), xx, yy );
 
         CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
 
         for (int i = 1; i < n; i++)
         {
-            xx = XLOG2DEV(points[i].x + xoffset);
-            yy = YLOG2DEV(points[i].y + yoffset);
+            xx = LogicalToDeviceX(points[i].x + xoffset);
+            yy = LogicalToDeviceY(points[i].y + yoffset);
 
-            buffer.Printf( "%f %f lineto\n", xx, yy );
-            buffer.Replace( ",", "." );
-            PsPrint( buffer );
+            PsPrintf( wxT("%d %d lineto\n"), xx, yy );
 
             CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
         }
@@ -667,13 +582,13 @@ void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset
     }
 }
 
-void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
+void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
     if (n <= 0) return;
 
-    if ( m_brush.IsNonTransparent() )
+    if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
@@ -682,24 +597,19 @@ void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[]
         int ofs = 0;
         for (int i = 0; i < n; ofs += count[i++])
         {
-            double xx = XLOG2DEV(points[ofs].x + xoffset);
-            double yy = YLOG2DEV(points[ofs].y + yoffset);
+            wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
+            wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);
 
-            wxString buffer;
-            buffer.Printf( "%f %f moveto\n", xx, yy );
-            buffer.Replace( ",", "." );
-            PsPrint( buffer );
+            PsPrintf( wxT("%d %d moveto\n"), xx, yy );
 
             CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
 
             for (int j = 1; j < count[i]; j++)
             {
-                xx = XLOG2DEV(points[ofs+j].x + xoffset);
-                yy = YLOG2DEV(points[ofs+j].y + yoffset);
+                xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
+                yy = LogicalToDeviceY(points[ofs+j].y + yoffset);
 
-                buffer.Printf( "%f %f lineto\n", xx, yy );
-                buffer.Replace( ",", "." );
-                PsPrint( buffer );
+                PsPrintf( wxT("%d %d lineto\n"), xx, yy );
 
                 CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset);
             }
@@ -707,7 +617,7 @@ void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[]
         PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
     }
 
-    if ( m_pen.IsNonTransparent() )
+    if (m_pen.GetStyle () != wxTRANSPARENT)
     {
         SetPen( m_pen );
 
@@ -716,24 +626,19 @@ void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[]
         int ofs = 0;
         for (int i = 0; i < n; ofs += count[i++])
         {
-            double xx = XLOG2DEV(points[ofs].x + xoffset);
-            double yy = YLOG2DEV(points[ofs].y + yoffset);
+            wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
+            wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);
 
-            wxString buffer;
-            buffer.Printf( "%f %f moveto\n", xx, yy );
-            buffer.Replace( ",", "." );
-            PsPrint( buffer );
+            PsPrintf( wxT("%d %d moveto\n"), xx, yy );
 
             CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
 
             for (int j = 1; j < count[i]; j++)
             {
-                xx = XLOG2DEV(points[ofs+j].x + xoffset);
-                yy = YLOG2DEV(points[ofs+j].y + yoffset);
+                xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
+                yy = LogicalToDeviceY(points[ofs+j].y + yoffset);
 
-                buffer.Printf( "%f %f lineto\n", xx, yy );
-                buffer.Replace( ",", "." );
-                PsPrint( buffer );
+                PsPrintf( wxT("%d %d lineto\n"), xx, yy );
 
                 CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset);
             }
@@ -743,12 +648,11 @@ void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[]
     }
 }
 
-void wxPostScriptDCImpl::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if ( m_pen.IsTransparent() )
-        return;
+    if (m_pen.GetStyle() == wxTRANSPARENT) return;
 
     if (n <= 0) return;
 
@@ -756,89 +660,74 @@ void wxPostScriptDCImpl::DoDrawLines (int n, wxPoint points[], wxCoord xoffset,
 
     int i;
     for ( i =0; i<n ; i++ )
-        CalcBoundingBox( points[i].x+xoffset, points[i].y+yoffset );
+    {
+        CalcBoundingBox( LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset));
+    }
 
-    wxString buffer;
-    buffer.Printf( "newpath\n"
-                   "%f %f moveto\n",
-              XLOG2DEV(points[0].x+xoffset),
-              YLOG2DEV(points[0].y+yoffset) );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
+    PsPrintf( wxT("newpath\n")
+              wxT("%d %d moveto\n"),
+              LogicalToDeviceX(points[0].x+xoffset),
+              LogicalToDeviceY(points[0].y+yoffset) );
 
     for (i = 1; i < n; i++)
     {
-        buffer.Printf( "%f %f lineto\n",
-                  XLOG2DEV(points[i].x+xoffset),
-                  YLOG2DEV(points[i].y+yoffset) );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("%d %d lineto\n"),
+                  LogicalToDeviceX(points[i].x+xoffset),
+                  LogicalToDeviceY(points[i].y+yoffset) );
     }
 
     PsPrint( "stroke\n" );
 }
 
-void wxPostScriptDCImpl::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    width--;
-    height--;
-
-    if ( m_brush.IsNonTransparent() )
+    if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f moveto\n"
-                       "%f %f lineto\n"
-                       "%f %f lineto\n"
-                       "%f %f lineto\n"
-                       "closepath\n"
-                       "fill\n",
-                XLOG2DEV(x),         YLOG2DEV(y),
-                XLOG2DEV(x + width), YLOG2DEV(y),
-                XLOG2DEV(x + width), YLOG2DEV(y + height),
-                XLOG2DEV(x),         YLOG2DEV(y + height) );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d moveto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("fill\n"),
+                LogicalToDeviceX(x),         LogicalToDeviceY(y),
+                LogicalToDeviceX(x + width), LogicalToDeviceY(y),
+                LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),
+                LogicalToDeviceX(x),         LogicalToDeviceY(y + height) );
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 
-    if ( m_pen.IsNonTransparent() )
+    if (m_pen.GetStyle () != wxTRANSPARENT)
     {
         SetPen (m_pen);
 
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f moveto\n"
-                       "%f %f lineto\n"
-                       "%f %f lineto\n"
-                       "%f %f lineto\n"
-                       "closepath\n"
-                       "stroke\n",
-                XLOG2DEV(x),         YLOG2DEV(y),
-                XLOG2DEV(x + width), YLOG2DEV(y),
-                XLOG2DEV(x + width), YLOG2DEV(y + height),
-                XLOG2DEV(x),         YLOG2DEV(y + height) );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d moveto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("stroke\n"),
+                LogicalToDeviceX(x),         LogicalToDeviceY(y),
+                LogicalToDeviceX(x + width), LogicalToDeviceY(y),
+                LogicalToDeviceX(x + width), LogicalToDeviceY(y + height),
+                LogicalToDeviceX(x),         LogicalToDeviceY(y + height) );
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
-void wxPostScriptDCImpl::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    width--;
-    height--;
-
     if (radius < 0.0)
     {
         // Now, a negative radius is interpreted to mean
@@ -849,167 +738,149 @@ void wxPostScriptDCImpl::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord w
 
     wxCoord rad = (wxCoord) radius;
 
-    if ( m_brush.IsNonTransparent() )
+    if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush( m_brush );
 
         /* Draw rectangle anticlockwise */
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f %f 90 180 arc\n"
-                       "%f %f lineto\n"
-                       "%f %f %f 180 270 arc\n"
-                       "%f %f lineto\n"
-                       "%f %f %f 270 0 arc\n"
-                       "%f %f lineto\n"
-                       "%f %f %f 0 90 arc\n"
-                       "%f %f lineto\n"
-                       "closepath\n"
-                       "fill\n",
-                XLOG2DEV(x + rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad),
-                XLOG2DEV(x), YLOG2DEV(y + height - rad),
-                XLOG2DEV(x + rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad),
-                XLOG2DEV(x + width - rad), YLOG2DEV(y + height),
-                XLOG2DEV(x + width - rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad),
-                XLOG2DEV(x + width), YLOG2DEV(y + rad),
-                XLOG2DEV(x + width - rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad),
-                XLOG2DEV(x + rad), YLOG2DEV(y) );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d 90 180 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 180 270 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 270 0 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 0 90 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("fill\n"),
+                LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
+                LogicalToDeviceX(x), LogicalToDeviceY(y + height - rad),
+                LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
+                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
+                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
+                LogicalToDeviceX(x + width), LogicalToDeviceY(y + rad),
+                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
+                LogicalToDeviceX(x + rad), LogicalToDeviceY(y) );
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 
-    if ( m_pen.IsNonTransparent() )
+    if (m_pen.GetStyle () != wxTRANSPARENT)
     {
         SetPen (m_pen);
 
         /* Draw rectangle anticlockwise */
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f %f 90 180 arc\n"
-                       "%f %f lineto\n"
-                       "%f %f %f 180 270 arc\n"
-                       "%f %f lineto\n"
-                       "%f %f %f 270 0 arc\n"
-                       "%f %f lineto\n"
-                       "%f %f %f 0 90 arc\n"
-                       "%f %f lineto\n"
-                       "closepath\n"
-                       "stroke\n",
-                XLOG2DEV(x + rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad),
-                XLOG2DEV(x), YLOG2DEV(y + height - rad),
-                XLOG2DEV(x + rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad),
-                XLOG2DEV(x + width - rad), YLOG2DEV(y + height),
-                XLOG2DEV(x + width - rad), YLOG2DEV(y + height - rad), XLOG2DEVREL(rad),
-                XLOG2DEV(x + width), YLOG2DEV(y + rad),
-                XLOG2DEV(x + width - rad), YLOG2DEV(y + rad), XLOG2DEVREL(rad),
-                XLOG2DEV(x + rad), YLOG2DEV(y) );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d 90 180 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 180 270 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 270 0 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("%d %d %d 0 90 arc\n")
+                  wxT("%d %d lineto\n")
+                  wxT("closepath\n")
+                  wxT("stroke\n"),
+                LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
+                LogicalToDeviceX(x), LogicalToDeviceY(y + height - rad),
+                LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
+                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
+                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
+                LogicalToDeviceX(x + width), LogicalToDeviceY(y + rad),
+                LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
+                LogicalToDeviceX(x + rad), LogicalToDeviceY(y) );
 
         CalcBoundingBox( x, y );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
-void wxPostScriptDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    width--;
-    height--;
-
-    if ( m_brush.IsNonTransparent() )
+    if (m_brush.GetStyle () != wxTRANSPARENT)
     {
         SetBrush (m_brush);
 
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f %f %f 0 360 ellipse\n"
-                       "fill\n",
-                XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),
-                XLOG2DEVREL(width / 2), YLOG2DEVREL(height / 2) );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d 0 360 ellipse\n")
+                  wxT("fill\n"),
+                LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
+                LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );
     }
 
-    if ( m_pen.IsNonTransparent() )
+    if (m_pen.GetStyle () != wxTRANSPARENT)
     {
         SetPen (m_pen);
 
-        wxString buffer;
-        buffer.Printf( "newpath\n"
-                       "%f %f %f %f 0 360 ellipse\n"
-                       "stroke\n",
-                XLOG2DEV(x + width / 2), YLOG2DEV(y + height / 2),
-                XLOG2DEVREL(width / 2), YLOG2DEVREL(height / 2) );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("newpath\n")
+                  wxT("%d %d %d %d 0 360 ellipse\n")
+                  wxT("stroke\n"),
+                LogicalToDeviceX(x + width / 2), LogicalToDeviceY(y + height / 2),
+                LogicalToDeviceXRel(width / 2), LogicalToDeviceYRel(height / 2) );
 
         CalcBoundingBox( x - width, y - height );
         CalcBoundingBox( x + width, y + height );
     }
 }
 
-void wxPostScriptDCImpl::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
+void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
 {
-    DoDrawBitmap( icon, x, y, true );
+    DrawBitmap( icon, x, y, true );
 }
 
 /* this has to be char, not wxChar */
-static const char hexArray[] = "0123456789ABCDEF";
+static char hexArray[] = "0123456789ABCDEF";
 
-void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
+void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if (!bitmap.IsOk()) return;
+    if (!bitmap.Ok()) return;
 
     wxImage image = bitmap.ConvertToImage();
 
-    if (!image.IsOk()) return;
+    if (!image.Ok()) return;
 
     wxCoord w = image.GetWidth();
     wxCoord h = image.GetHeight();
 
-    double ww = XLOG2DEVREL(image.GetWidth());
-    double hh = YLOG2DEVREL(image.GetHeight());
+    wxCoord ww = LogicalToDeviceXRel(image.GetWidth());
+    wxCoord hh = LogicalToDeviceYRel(image.GetHeight());
 
-    double xx = XLOG2DEV(x);
-    double yy = YLOG2DEV(y + bitmap.GetHeight());
+    wxCoord xx = LogicalToDeviceX(x);
+    wxCoord yy = LogicalToDeviceY(y + bitmap.GetHeight());
 
-    wxString buffer;
-    buffer.Printf( "/origstate save def\n"
-                   "20 dict begin\n"
-                   "/pix %d string def\n"
-                   "/grays %d string def\n"
-                   "/npixels 0 def\n"
-                   "/rgbindx 0 def\n"
-                   "%f %f translate\n"
-                   "%f %f scale\n"
-                   "%d %d 8\n"
-                   "[%d 0 0 %d 0 %d]\n"
-                   "{currentfile pix readhexstring pop}\n"
-                   "false 3 colorimage\n",
+    PsPrintf( wxT("/origstate save def\n")
+              wxT("20 dict begin\n")
+              wxT("/pix %d string def\n")
+              wxT("/grays %d string def\n")
+              wxT("/npixels 0 def\n")
+              wxT("/rgbindx 0 def\n")
+              wxT("%d %d translate\n")
+              wxT("%d %d scale\n")
+              wxT("%d %d 8\n")
+              wxT("[%d 0 0 %d 0 %d]\n")
+              wxT("{currentfile pix readhexstring pop}\n")
+              wxT("false 3 colorimage\n"),
             w, w, xx, yy, ww, hh, w, h, w, -h, h );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
 
     unsigned char* data = image.GetData();
 
     // size of the buffer = width*rgb(3)*hexa(2)+'\n'
-    wxCharBuffer charbuffer(w*6 + 1);
+    wxCharBuffer buffer(w*6 + 1);
     int firstDigit, secondDigit;
 
     //rows
     for (int j = 0; j < h; j++)
     {
-        char* bufferindex = charbuffer.data();
+        char* bufferindex = buffer.data();
 
         //cols
         for (int i = 0; i < w*3; i++)
@@ -1023,22 +894,18 @@ void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoor
         }
         *(bufferindex++) = '\n';
         *bufferindex = 0;
-
-        if (m_pstream)
-            fwrite( charbuffer, 1, strlen( charbuffer ), m_pstream );
-        else
-            PsPrint( charbuffer );
+        PsPrint( buffer );
     }
 
     PsPrint( "end\n" );
     PsPrint( "origstate restore\n" );
 }
 
-void wxPostScriptDCImpl::SetFont( const wxFont& font )
+void wxPostScriptDC::SetFont( const wxFont& font )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if (!font.IsOk())  return;
+    if (!font.Ok())  return;
 
     m_font = font;
 
@@ -1120,35 +987,33 @@ void wxPostScriptDCImpl::SetFont( const wxFont& font )
     PsPrint( name );
     PsPrint( " findfont\n" );
 
-
     float size = float(m_font.GetPointSize());
-    size = size * GetFontPointSizeAdjustment(DPI);
-    wxString buffer;
-    buffer.Printf( "%f scalefont setfont\n", size * m_scaleX );
-    buffer.Replace( ",", "." );
+    size = size * GetFontPointSizeAdjustment(GetResolution());
+
+    char buffer[100];
+    sprintf( buffer, "%f scalefont setfont\n", size * m_scaleX);
+    // this is a hack - we must scale font size (in pts) according to m_scaleY but
+    // LogicalToDeviceYRel works with wxCoord type (int or longint). Se we first convert font size
+    // to 1/1000th of pt and then back.
+    for (int i = 0; i < 100; i++)
+        if (buffer[i] == ',') buffer[i] = '.';
     PsPrint( buffer );
 }
 
-void wxPostScriptDCImpl::SetPen( const wxPen& pen )
+void wxPostScriptDC::SetPen( const wxPen& pen )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if (!pen.IsOk()) return;
+    if (!pen.Ok()) return;
 
-    int oldStyle = m_pen.IsOk() ? m_pen.GetStyle() : wxPENSTYLE_INVALID;
+    int oldStyle = m_pen.GetStyle();
 
     m_pen = pen;
 
-    double width;
-
-    if (m_pen.GetWidth() <= 0)
-        width = 0.1;
-    else
-        width = (double) m_pen.GetWidth();
-
-    wxString buffer;
-    buffer.Printf( "%f setlinewidth\n", width * DEV2PS * m_scaleX );
-    buffer.Replace( ",", "." );
+    char buffer[100];
+    sprintf( buffer, "%f setlinewidth\n", LogicalToDeviceXRel(1000 * m_pen.GetWidth()) / 1000.0f );
+    for (int i = 0; i < 100; i++)
+        if (buffer[i] == ',') buffer[i] = '.';
     PsPrint( buffer );
 
 /*
@@ -1172,26 +1037,26 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
 
     switch (m_pen.GetStyle())
     {
-        case wxPENSTYLE_DOT:        psdash = dotted;         break;
-        case wxPENSTYLE_SHORT_DASH: psdash = short_dashed;   break;
-        case wxPENSTYLE_LONG_DASH:  psdash = wxCoord_dashed; break;
-        case wxPENSTYLE_DOT_DASH:   psdash = dotted_dashed;  break;
-        case wxPENSTYLE_USER_DASH:
+        case wxDOT:           psdash = dotted;         break;
+        case wxSHORT_DASH:    psdash = short_dashed;   break;
+        case wxLONG_DASH:     psdash = wxCoord_dashed; break;
+        case wxDOT_DASH:      psdash = dotted_dashed;  break;
+        case wxUSER_DASH:
         {
             wxDash *dashes;
             int nDashes = m_pen.GetDashes (&dashes);
             PsPrint ("[");
             for (int i = 0; i < nDashes; ++i)
             {
-                buffer.Printf( "%d ", dashes [i] );
+                sprintf( buffer, "%d ", dashes [i] );
                 PsPrint( buffer );
             }
             PsPrint ("] 0 setdash\n");
             psdash = 0;
         }
         break;
-        case wxPENSTYLE_SOLID:
-        case wxPENSTYLE_TRANSPARENT:
+        case wxSOLID:
+        case wxTRANSPARENT:
         default:              psdash = "[] 0";         break;
     }
 
@@ -1226,8 +1091,12 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 
-        buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
-        buffer.Replace( ",", "." );
+        sprintf( buffer,
+            "%.8f %.8f %.8f setrgbcolor\n",
+            redPS, greenPS, bluePS );
+        for (int i = 0; i < 100; i++)
+            if (buffer[i] == ',') buffer[i] = '.';
+
         PsPrint( buffer );
 
         m_currentRed = red;
@@ -1236,11 +1105,11 @@ void wxPostScriptDCImpl::SetPen( const wxPen& pen )
     }
 }
 
-void wxPostScriptDCImpl::SetBrush( const wxBrush& brush )
+void wxPostScriptDC::SetBrush( const wxBrush& brush )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    if (!brush.IsOk()) return;
+    if (!brush.Ok()) return;
 
     m_brush = brush;
 
@@ -1269,9 +1138,13 @@ void wxPostScriptDCImpl::SetBrush( const wxBrush& brush )
         double bluePS = (double)(blue) / 255.0;
         double greenPS = (double)(green) / 255.0;
 
-        wxString buffer;
-        buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
-        buffer.Replace( ",", "." );
+        char buffer[100];
+        sprintf( buffer,
+                "%.8f %.8f %.8f setrgbcolor\n",
+                redPS, greenPS, bluePS );
+        for (int i = 0; i < 100; i++)
+            if (buffer[i] == ',') buffer[i] = '.';
+
         PsPrint( buffer );
 
         m_currentRed = red;
@@ -1280,15 +1153,11 @@ void wxPostScriptDCImpl::SetBrush( const wxBrush& brush )
     }
 }
 
-void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
+void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    const wxWX2MBbuf textbuf = text.mb_str();
-    if ( !textbuf )
-        return;
-
-    if (m_textForegroundColour.IsOk())
+    if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();
@@ -1314,9 +1183,12 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
             double bluePS = (double)(blue) / 255.0;
             double greenPS = (double)(green) / 255.0;
 
-            wxString buffer;
-            buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
-            buffer.Replace( ",", "." );
+            char buffer[100];
+            sprintf( buffer,
+                "%.8f %.8f %.8f setrgbcolor\n",
+                redPS, greenPS, bluePS );
+            for (size_t i = 0; i < strlen(buffer); i++)
+                if (buffer[i] == ',') buffer[i] = '.';
             PsPrint( buffer );
 
             m_currentRed = red;
@@ -1327,7 +1199,12 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
 
     wxCoord text_w, text_h, text_descent;
 
-    GetOwner()->GetTextExtent(text, &text_w, &text_h, &text_descent);
+    GetTextExtent(text, &text_w, &text_h, &text_descent);
+
+    // VZ: this seems to be unnecessary, so taking it out for now, if it
+    //     doesn't create any problems, remove this comment entirely
+    //SetFont( m_font );
+
 
     int size = m_font.GetPointSize();
 
@@ -1336,30 +1213,29 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
 //        - note that there is still rounding error in text_descent!
     wxCoord by = y + size - text_descent; // baseline
 
-    wxString buffer;
-    buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(by) );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
+    PsPrintf( wxT("%d %d moveto\n"), LogicalToDeviceX(x), LogicalToDeviceY(by) );
     PsPrint( "(" );
 
-    for ( const char *p = textbuf; *p != '\0'; p++ )
+    const wxWX2MBbuf textbuf = text.mb_str();
+    size_t len = strlen(textbuf);
+    size_t i;
+    for (i = 0; i < len; i++)
     {
-        int c = (unsigned char)*p;
+        int c = (unsigned char) textbuf[i];
         if (c == ')' || c == '(' || c == '\\')
         {
             /* Cope with special characters */
             PsPrint( "\\" );
-            PsPrint( (char) c );
+            PsPrint(c);
         }
         else if ( c >= 128 )
         {
             /* Cope with character codes > 127 */
-            buffer.Printf( "\\%o", c );
-            PsPrint( buffer );
+            PsPrintf( wxT("\\%o"), c);
         }
         else
         {
-            PsPrint( (char) c );
+            PsPrint(c);
         }
     }
 
@@ -1368,17 +1244,20 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
     if (m_font.GetUnderlined())
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
+        char buffer[100];
 
-        buffer.Printf( "gsave\n"
-                       "%f %f moveto\n"
-                       "%f setlinewidth\n"
-                       "%f %f lineto\n"
-                       "stroke\n"
-                       "grestore\n",
-                XLOG2DEV(x), YLOG2DEV(uy),
+        sprintf( buffer,
+                "gsave\n"
+                "%d %d moveto\n"
+                "%f setlinewidth\n"
+                "%d %d lineto\n"
+                "stroke\n"
+                "grestore\n",
+                LogicalToDeviceX(x), LogicalToDeviceY(uy),
                 m_underlineThickness,
-                XLOG2DEV(x + text_w), YLOG2DEV(uy) );
-        buffer.Replace( ",", "." );
+                LogicalToDeviceX(x + text_w), LogicalToDeviceY(uy) );
+        for (i = 0; i < 100; i++)
+            if (buffer[i] == ',') buffer[i] = '.';
         PsPrint( buffer );
     }
 
@@ -1386,7 +1265,7 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
     CalcBoundingBox( x + size * text.length() * 2/3 , y );
 }
 
-void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle )
+void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle )
 {
     if ( wxIsNullDouble(angle) )
     {
@@ -1398,7 +1277,7 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC
 
     SetFont( m_font );
 
-    if (m_textForegroundColour.IsOk())
+    if (m_textForegroundColour.Ok())
     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();
@@ -1424,9 +1303,12 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC
             double bluePS = (double)(blue) / 255.0;
             double greenPS = (double)(green) / 255.0;
 
-            wxString buffer;
-            buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
-            buffer.Replace( ",", "." );
+            char buffer[100];
+            sprintf( buffer,
+                "%.8f %.8f %.8f setrgbcolor\n",
+                redPS, greenPS, bluePS );
+            for (int i = 0; i < 100; i++)
+                if (buffer[i] == ',') buffer[i] = '.';
             PsPrint( buffer );
 
             m_currentRed = red;
@@ -1437,64 +1319,70 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC
 
     int size = m_font.GetPointSize();
 
-    wxString buffer;
-    buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(y));
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
+    PsPrintf( wxT("%d %d moveto\n"),
+            LogicalToDeviceX(x), LogicalToDeviceY(y));
 
-    buffer.Printf( "%f rotate\n", angle );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
+    char buffer[100];
+    sprintf(buffer, "%.8f rotate\n", angle);
+    size_t i;
+    for (i = 0; i < 100; i++)
+    {
+        if (buffer[i] == ',') buffer[i] = '.';
+    }
+    PsPrint( buffer);
 
     PsPrint( "(" );
     const wxWX2MBbuf textbuf = text.mb_str();
-    if ( textbuf )
+    size_t len = strlen(textbuf);
+    for (i = 0; i < len; i++)
     {
-        for ( const char *p = textbuf; *p != '\0'; p++ )
+        int c = (unsigned char) textbuf[i];
+        if (c == ')' || c == '(' || c == '\\')
         {
-            int c = (unsigned char)*p;
-            if (c == ')' || c == '(' || c == '\\')
-            {
-                /* Cope with special characters */
-                PsPrint( "\\" );
-                PsPrint( (char) c );
-            }
-            else if ( c >= 128 )
-            {
-                /* Cope with character codes > 127 */
-                buffer.Printf( "\\%o", c);
-                PsPrint( buffer );
-            }
-            else
-            {
-                PsPrint( (char) c );
-            }
+            /* Cope with special characters */
+            PsPrint( "\\" );
+            PsPrint(c);
+        }
+        else if ( c >= 128 )
+        {
+            /* Cope with character codes > 127 */
+            PsPrintf( wxT("\\%o"), c);
+        }
+        else
+        {
+            PsPrint(c);
         }
     }
 
     PsPrint( ") show\n" );
 
-    buffer.Printf( "%f rotate\n", -angle );
-    buffer.Replace( ",", "." );
+    sprintf( buffer, "%.8f rotate\n", -angle );
+    for (i = 0; i < 100; i++)
+    {
+        if (buffer[i] == ',') buffer[i] = '.';
+    }
     PsPrint( buffer );
 
     if (m_font.GetUnderlined())
     {
         wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
         wxCoord w, h;
-        GetOwner()->GetTextExtent(text, &w, &h);
+        GetTextExtent(text, &w, &h);
 
-        buffer.Printf(
+        sprintf( buffer,
                 "gsave\n"
-                "%f %f moveto\n"
+                "%d %d moveto\n"
                 "%f setlinewidth\n"
-                "%f %f lineto\n"
+                "%d %d lineto\n"
                 "stroke\n"
                 "grestore\n",
-                XLOG2DEV(x), YLOG2DEV(uy),
+                LogicalToDeviceX(x), LogicalToDeviceY(uy),
                 m_underlineThickness,
-                XLOG2DEV(x + w), YLOG2DEV(uy) );
-        buffer.Replace( ",", "." );
+                LogicalToDeviceX(x + w), LogicalToDeviceY(uy) );
+        for (i = 0; i < 100; i++)
+        {
+            if (buffer[i] == ',') buffer[i] = '.';
+        }
         PsPrint( buffer );
     }
 
@@ -1502,18 +1390,18 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC
     CalcBoundingBox( x + size * text.length() * 2/3 , y );
 }
 
-void wxPostScriptDCImpl::SetBackground (const wxBrush& brush)
+void wxPostScriptDC::SetBackground (const wxBrush& brush)
 {
     m_backgroundBrush = brush;
 }
 
-void wxPostScriptDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
+void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function))
 {
-    wxFAIL_MSG( wxT("wxPostScriptDCImpl::SetLogicalFunction not implemented.") );
+    wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") );
 }
 
 #if wxUSE_SPLINES
-void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points )
+void wxPostScriptDC::DoDrawSpline( wxList *points )
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
@@ -1524,13 +1412,13 @@ void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points )
     double c, d, x1, y1, x2, y2, x3, y3;
     wxPoint *p, *q;
 
-    wxPointList::compatibility_iterator node = points->GetFirst();
-    p = node->GetData();
+    wxList::compatibility_iterator node = points->GetFirst();
+    p = (wxPoint *)node->GetData();
     x1 = p->x;
     y1 = p->y;
 
     node = node->GetNext();
-    p = node->GetData();
+    p = (wxPoint *)node->GetData();
     c = p->x;
     d = p->y;
     x3 =
@@ -1544,14 +1432,11 @@ void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points )
          #endif
          (double)(y1 + d) / 2;
 
-    wxString buffer;
-    buffer.Printf( "newpath\n"
-                   "%f %f moveto\n"
-                   "%f %f lineto\n",
-            XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)),
-            XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
+    PsPrintf( wxT("newpath\n")
+              wxT("%d %d moveto\n")
+              wxT("%d %d lineto\n"),
+            LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
+            LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );
 
     CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
     CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
@@ -1559,7 +1444,7 @@ void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points )
     node = node->GetNext();
     while (node)
     {
-        q = node->GetData();
+        q = (wxPoint *)node->GetData();
 
         x1 = x3;
         y1 = y3;
@@ -1570,12 +1455,10 @@ void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points )
         x3 = (double)(x2 + c) / 2;
         y3 = (double)(y2 + d) / 2;
 
-        buffer.Printf( "%f %f %f %f %f %f DrawSplineSection\n",
-            XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)),
-            XLOG2DEV(wxRound(x2)), YLOG2DEV(wxRound(y2)),
-            XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) );
-        buffer.Replace( ",", "." );
-        PsPrint( buffer );
+        PsPrintf( wxT("%d %d %d %d %d %d DrawSplineSection\n"),
+            LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
+            LogicalToDeviceX((wxCoord)x2), LogicalToDeviceY((wxCoord)y2),
+            LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) );
 
         CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
         CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
@@ -1588,55 +1471,41 @@ void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points )
        next-to-last and last point respectively, in the point list
      */
 
-    buffer.Printf( "%f %f lineto\nstroke\n", XLOG2DEV(wxRound(c)), YLOG2DEV(wxRound(d)) );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
+    PsPrintf( wxT("%d %d lineto\n")
+              wxT("stroke\n"),
+            LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) );
 }
 #endif // wxUSE_SPLINES
 
-wxCoord wxPostScriptDCImpl::GetCharWidth() const
+wxCoord wxPostScriptDC::GetCharWidth() const
 {
     // Chris Breeze: reasonable approximation using wxMODERN/Courier
     return (wxCoord) (GetCharHeight() * 72.0 / 120.0);
 }
 
-void wxPostScriptDCImpl::SetPrintData(const wxPrintData& data)
+
+void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {
-    m_printData = data;
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    wxPaperSize id = m_printData.GetPaperId();
-    wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id);
-    if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4);
-    int w = 595;
-    int h = 842;
-    if (paper)
-    {
-        w = paper->GetSizeDeviceUnits().x;
-        h = paper->GetSizeDeviceUnits().y;
-    }
+    m_signX = (xLeftRight ? 1 : -1);
+    m_signY = (yBottomUp  ? 1 : -1);
 
-    if (m_printData.GetOrientation() == wxLANDSCAPE)
-        m_pageHeight = w * PS2DEV;
-    else
-        m_pageHeight = h * PS2DEV;
+    ComputeScaleAndOrigin();
 }
 
-void wxPostScriptDCImpl::ComputeScaleAndOrigin()
+void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {
-    const wxRealPoint origScale(m_scaleX, m_scaleY);
+    wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    wxDCImpl::ComputeScaleAndOrigin();
+    int h = 0;
+    int w = 0;
+    GetSize( &w, &h );
 
-    // If scale has changed call SetPen to recalulate the line width
-    // and SetFont to recalculate font size
-    if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() )
-    {
-        SetPen( m_pen );
-        SetFont( m_font  );
-    }
+    wxDC::SetDeviceOrigin( x, h-y );
 }
 
-void wxPostScriptDCImpl::DoGetSize(int* width, int* height) const
+void wxPostScriptDC::DoGetSize(int* width, int* height) const
 {
     wxPaperSize id = m_printData.GetPaperId();
 
@@ -1659,14 +1528,11 @@ void wxPostScriptDCImpl::DoGetSize(int* width, int* height) const
         h = tmp;
     }
 
-    if (width)
-        *width = wxRound( w * PS2DEV );
-
-    if (height)
-        *height = wxRound( h * PS2DEV );
+    if (width) *width = (int)(w * ms_PSScaleFactor);
+    if (height) *height = (int)(h * ms_PSScaleFactor);
 }
 
-void wxPostScriptDCImpl::DoGetSizeMM(int *width, int *height) const
+void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const
 {
     wxPaperSize id = m_printData.GetPaperId();
 
@@ -1694,13 +1560,14 @@ void wxPostScriptDCImpl::DoGetSizeMM(int *width, int *height) const
 }
 
 // Resolution in pixels per logical inch
-wxSize wxPostScriptDCImpl::GetPPI(void) const
+wxSize wxPostScriptDC::GetPPI(void) const
 {
-    return wxSize( DPI, DPI );
+    return wxSize((int)(72 * ms_PSScaleFactor),
+                  (int)(72 * ms_PSScaleFactor));
 }
 
 
-bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
+bool wxPostScriptDC::StartDoc( const wxString& message )
 {
     wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
 
@@ -1708,7 +1575,7 @@ bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
     {
         if (m_printData.GetFilename() == wxEmptyString)
         {
-            wxString filename = wxFileName::CreateTempFileName( wxT("ps") );
+            wxString filename = wxGetTempFileName( wxT("ps") );
             m_printData.SetFilename(filename);
         }
 
@@ -1723,21 +1590,18 @@ bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
     }
 
     m_ok = true;
-
-    wxString buffer;
+    m_title = message;
 
     PsPrint( "%!PS-Adobe-2.0\n" );
-
     PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );
-
-    buffer.Printf( "%%%%CreationDate: %s\n", wxNow() );
-    PsPrint( buffer );
-
+    PsPrintf( wxT("%%%%CreationDate: %s\n"), wxNow().c_str() );
     if (m_printData.GetOrientation() == wxLANDSCAPE)
         PsPrint( "%%Orientation: Landscape\n" );
     else
         PsPrint( "%%Orientation: Portrait\n" );
 
+    // PsPrintf( wxT("%%%%Pages: %d\n"), (wxPageNumber - 1) );
+
     const wxChar *paper;
     switch (m_printData.GetPaperId())
     {
@@ -1757,10 +1621,7 @@ bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
        case wxPAPER_10X14: paper = wxT("10x14"); break;         // 10-by-14-inch sheet
        default: paper = wxT("A4");
     }
-
-    buffer.Printf( "%%%%DocumentPaperSizes: %s\n", paper );
-    PsPrint( buffer );
-
+    PsPrintf( wxT("%%%%DocumentPaperSizes: %s\n"), paper );
     PsPrint( "%%EndComments\n\n" );
 
     PsPrint( "%%BeginProlog\n" );
@@ -1782,11 +1643,12 @@ bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
     // set origin according to paper size
     SetDeviceOrigin( 0,0 );
 
+    wxPageNumber = 1;
     m_pageNumber = 1;
     return true;
 }
 
-void wxPostScriptDCImpl::EndDoc ()
+void wxPostScriptDC::EndDoc ()
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
@@ -1798,7 +1660,7 @@ void wxPostScriptDCImpl::EndDoc ()
 
     if ( m_pstream ) {
         fclose( m_pstream );
-        m_pstream = NULL;
+        m_pstream = (FILE *) NULL;
     }
 
 #if 0
@@ -1814,10 +1676,10 @@ void wxPostScriptDCImpl::EndDoc ()
 
     // Compute the bounding box.  Note that it is in the default user
     // coordinate system, thus we have to convert the values.
-    wxCoord minX = (wxCoord) XLOG2DEV(m_minX);
-    wxCoord minY = (wxCoord) YLOG2DEV(m_minY);
-    wxCoord maxX = (wxCoord) XLOG2DEV(m_maxX);
-    wxCoord maxY = (wxCoord) YLOG2DEV(m_maxY);
+    wxCoord minX = (wxCoord) LogicalToDeviceX(m_minX);
+    wxCoord minY = (wxCoord) LogicalToDeviceY(m_minY);
+    wxCoord maxX = (wxCoord) LogicalToDeviceX(m_maxX);
+    wxCoord maxY = (wxCoord) LogicalToDeviceY(m_maxY);
 
     // LOG2DEV may have changed the minimum to maximum vice versa
     if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; }
@@ -1886,118 +1748,100 @@ void wxPostScriptDCImpl::EndDoc ()
 #endif
 }
 
-void wxPostScriptDCImpl::StartPage()
+void wxPostScriptDC::StartPage()
 {
     wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
 
-    wxString buffer;
-    buffer.Printf( wxT("%%%%Page: %d\n"), m_pageNumber++ );
-    PsPrint( buffer );
+    PsPrintf( wxT("%%%%Page: %d\n"), wxPageNumber++ );
+
+    //  What is this one supposed to do? RR.
+//  *m_pstream << "matrix currentmatrix\n";
+
+    // Added by Chris Breeze
+
+    // Each page starts with an "initgraphics" which resets the
+    // transformation and so we need to reset the origin
+    // (and rotate the page for landscape printing)
+
+    // Output scaling
+    wxCoord translate_x, translate_y;
+    double scale_x, scale_y;
 
-#if 0
     wxPostScriptPrintNativeData *data =
         (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
 
-    wxCoord translate_x = (wxCoord)data->GetPrinterTranslateX();
-    wxCoord translate_y = (wxCoord)data->GetPrinterTranslateY();
+    translate_x = (wxCoord)data->GetPrinterTranslateX();
+    translate_y = (wxCoord)data->GetPrinterTranslateY();
 
-    buffer.Printf( "%d %d translate\n", translate_x, translate_y );
-    PsPrint( buffer );
-
-    double scale_x = data->GetPrinterScaleX();
-    double scale_y = data->GetPrinterScaleY();
-
-    buffer.Printf( "%f %f scale\n", scale_x, scale_y );
-    buffer.Replace( ",", "." );
-    PsPrint( buffer );
-
-#endif
-
-    // Each page starts with an "initgraphics" which resets the
-    // transformation and so we need to rotate the page for
-    // landscape printing)
-
-    // I copied this one from a PostScript tutorial, but to no avail. RR.
-    // PsPrint( "90 rotate llx neg ury nef translate\n" );
+    scale_x = data->GetPrinterScaleX();
+    scale_y = data->GetPrinterScaleY();
 
     if (m_printData.GetOrientation() == wxLANDSCAPE)
+    {
+        int h;
+        GetSize( (int*) NULL, &h );
+        translate_y -= h;
         PsPrint( "90 rotate\n" );
+        // I copied this one from a PostScript tutorial, but to no avail. RR.
+        // PsPrint( "90 rotate llx neg ury nef translate\n" );
+    }
+
+    char buffer[100];
+    sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor,
+            scale_y / ms_PSScaleFactor);
+    for (int i = 0; i < 100; i++)
+        if (buffer[i] == ',') buffer[i] = '.';
+    PsPrint( buffer );
+
+    PsPrintf( wxT("%d %d translate\n"), translate_x, translate_y );
 }
 
-void wxPostScriptDCImpl::EndPage ()
+void wxPostScriptDC::EndPage ()
 {
     wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
 
     PsPrint( "showpage\n" );
 }
 
-bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
+bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest,
                            wxCoord fwidth, wxCoord fheight,
                            wxDC *source,
                            wxCoord xsrc, wxCoord ysrc,
-                           wxRasterOperationMode rop,
-                           bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
+                           int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
 {
     wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
 
     wxCHECK_MSG( source, false, wxT("invalid source dc") );
 
-    // blit into a bitmap
+    /* blit into a bitmap */
     wxBitmap bitmap( (int)fwidth, (int)fheight );
     wxMemoryDC memDC;
     memDC.SelectObject(bitmap);
     memDC.Blit(0, 0, fwidth, fheight, source, xsrc, ysrc, rop); /* TODO: Blit transparently? */
     memDC.SelectObject(wxNullBitmap);
 
-    //draw bitmap. scaling and positioning is done there
-    GetOwner()->DrawBitmap( bitmap, xdest, ydest );
+    /* draw bitmap. scaling and positioning is done there */
+    DrawBitmap( bitmap, xdest, ydest );
 
     return true;
 }
 
-wxCoord wxPostScriptDCImpl::GetCharHeight() const
+wxCoord wxPostScriptDC::GetCharHeight() const
 {
-    if (m_font.IsOk())
+    if (m_font.Ok())
         return m_font.GetPointSize();
     else
         return 12;
 }
 
-void wxPostScriptDCImpl::PsPrint( const wxString& str )
-{
-    const wxCharBuffer psdata(str.utf8_str());
-
-    wxPostScriptPrintNativeData *data =
-        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
-
-    switch (m_printData.GetPrintMode())
-    {
-#if wxUSE_STREAMS
-        // append to output stream
-        case wxPRINT_MODE_STREAM:
-            {
-                wxOutputStream* outputstream = data->GetOutputStream();
-                wxCHECK_RET( outputstream, wxT("invalid outputstream") );
-                outputstream->Write( psdata, strlen( psdata ) );
-            }
-            break;
-#endif // wxUSE_STREAMS
-
-        // save data into file
-        default:
-            wxCHECK_RET( m_pstream, wxT("invalid postscript dc") );
-            fwrite( psdata, 1, strlen( psdata ), m_pstream );
-    }
-}
-
-void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
+void wxPostScriptDC::DoGetTextExtent(const wxString& string,
                                      wxCoord *x, wxCoord *y,
                                      wxCoord *descent, wxCoord *externalLeading,
-                                     const wxFont *theFont ) const
+                                     wxFont *theFont ) const
 {
-    const wxFont *fontToUse = theFont;
+    wxFont *fontToUse = theFont;
 
-    if (!fontToUse) fontToUse = &m_font;
+    if (!fontToUse) fontToUse = (wxFont*) &m_font;
 
     const float fontSize =
         fontToUse->GetPointSize() * GetFontPointSizeAdjustment(72.0);
@@ -2015,10 +1859,6 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
 
     const wxWX2MBbuf strbuf = string.mb_str();
 
-    // conversion failed (non e.g. ISO characters)
-    if ( !strbuf )
-        return;
-
 #if !wxUSE_AFM_FOR_POSTSCRIPT
     /* Provide a VERY rough estimate (avoid using it).
      * Produces accurate results for mono-spaced font
@@ -2049,13 +1889,13 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
     /        in 'points' (1/72 of an inch). this should later on be
     /        changed to depend on the mapping mode.
     /  CAVE: the path to the AFM files must be set before calling this
-    /        fun3B3Bction. this is usually done by a call like the following:
+    /        function. this is usually done by a call like the following:
     /        wxSetAFMPath("d:\\wxw161\\afm\\");
     /
     /  example:
     /
     /    wxPostScriptDC dc(NULL, true);
-    /    if (dc.IsOk()){
+    /    if (dc.Ok()){
     /      wxSetAFMPath("d:\\wxw161\\afm\\");
     /      dc.StartDoc("Test");
     /      dc.StartPage();
@@ -2294,9 +2134,9 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
         // VS: dirty, but is there any better solution?
         double *pt;
         pt = (double*) &m_underlinePosition;
-        *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontSize)) / 1000.0f;
+        *pt = LogicalToDeviceYRel((wxCoord)(UnderlinePosition * fontSize)) / 1000.0f;
         pt = (double*) &m_underlineThickness;
-        *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontSize)) / 1000.0f;
+        *pt = LogicalToDeviceYRel((wxCoord)(UnderlineThickness * fontSize)) / 1000.0f;
 
     }
 
@@ -2358,6 +2198,64 @@ void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string,
     // Use AFM
 }
 
+// print postscript datas via required method (file, stream)
+void wxPostScriptDC::PsPrintf( const wxChar* fmt, ... )
+{
+    va_list argptr;
+    va_start(argptr, fmt);
+
+    PsPrint( wxString::FormatV( fmt, argptr ).c_str() );
+}
+
+void wxPostScriptDC::PsPrint( const char* psdata )
+{
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    switch (m_printData.GetPrintMode())
+    {
+#if wxUSE_STREAMS
+        // append to output stream
+        case wxPRINT_MODE_STREAM:
+            {
+                wxOutputStream* outputstream = data->GetOutputStream();
+                wxCHECK_RET( outputstream, wxT("invalid outputstream") );
+                outputstream->Write( psdata, strlen( psdata ) );
+            }
+            break;
+#endif // wxUSE_STREAMS
+
+        // save data into file
+        default:
+            wxCHECK_RET( m_pstream, wxT("invalid postscript dc") );
+            fwrite( psdata, 1, strlen( psdata ), m_pstream );
+    }
+}
+
+void wxPostScriptDC::PsPrint( int ch )
+{
+    wxPostScriptPrintNativeData *data =
+        (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+    switch (m_printData.GetPrintMode())
+    {
+#if wxUSE_STREAMS
+        // append to output stream
+        case wxPRINT_MODE_STREAM:
+            {
+                wxOutputStream* outputstream = data->GetOutputStream();
+                wxCHECK_RET( outputstream, wxT("invalid outputstream") );
+                outputstream->PutC( (char)ch );
+            }
+            break;
+#endif // wxUSE_STREAMS
+
+        // save data into file
+        default:
+            wxCHECK_RET( m_pstream, wxT("invalid postscript dc") );
+            fputc( ch, m_pstream );
+    }
+}
 
 #endif // wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
 
diff --git a/Source/3rd Party/wx/src/generic/dirctrlg.cpp b/Source/3rd Party/wx/src/generic/dirctrlg.cpp
index 60ee92ae3..9edf105f6 100644
--- a/Source/3rd Party/wx/src/generic/dirctrlg.cpp	
+++ b/Source/3rd Party/wx/src/generic/dirctrlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Harm van der Heijden, Robert Roebling, Julian Smart
 // Modified by:
 // Created:     12/12/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dirctrlg.cpp 62093 2009-09-24 17:04:10Z JS $
 // Copyright:   (c) Harm van der Heijden, Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,6 +29,7 @@
     #include "wx/icon.h"
     #include "wx/settings.h"
     #include "wx/msgdlg.h"
+    #include "wx/cmndata.h"
     #include "wx/choice.h"
     #include "wx/textctrl.h"
     #include "wx/layout.h"
@@ -39,7 +40,6 @@
     #include "wx/module.h"
 #endif
 
-#include "wx/filename.h"
 #include "wx/filefn.h"
 #include "wx/imaglist.h"
 #include "wx/tokenzr.h"
@@ -52,13 +52,12 @@
 #endif
 
 #if defined(__WXMAC__)
-    #include  "wx/osx/private.h"  // includes mac headers
+    #include  "wx/mac/private.h"  // includes mac headers
 #endif
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
 #include <windows.h>
 #include "wx/msw/winundef.h"
-#include "wx/volume.h"
 
 // FIXME - Mingw32 1.0 has both _getdrive() and _chdrive(). For now, let's assume
 //         older releases don't, but it should be verified and the checks modified
@@ -71,7 +70,7 @@
     #include <ctype.h>
 #endif
 
-#endif // __WINDOWS__
+#endif
 
 #if defined(__OS2__) || defined(__DOS__)
     #ifdef __OS2__
@@ -83,74 +82,77 @@
         #include <stdlib.h>
         #include <ctype.h>
     #endif
+    extern bool wxIsDriveAvailable(const wxString& dirName);
 #endif // __OS2__
 
 #if defined(__WXMAC__)
-//    #include "MoreFilesX.h"
+    #include "MoreFilesX.h"
 #endif
 
 #ifdef __BORLANDC__
     #include "dos.h"
 #endif
 
-extern WXDLLEXPORT_DATA(const char) wxFileSelectorDefaultWildcardStr[];
-
 // If compiled under Windows, this macro can cause problems
 #ifdef GetFirstChild
 #undef GetFirstChild
 #endif
 
-bool wxIsDriveAvailable(const wxString& dirName);
-
 // ----------------------------------------------------------------------------
 // wxGetAvailableDrives, for WINDOWS, DOS, OS2, MAC, UNIX (returns "/")
 // ----------------------------------------------------------------------------
 
 size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids)
 {
-#ifdef wxHAS_FILESYSTEM_VOLUMES
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)
 
 #ifdef __WXWINCE__
     // No logical drives; return "\"
     paths.Add(wxT("\\"));
     names.Add(wxT("\\"));
     icon_ids.Add(wxFileIconsTable::computer);
-#elif defined(__WIN32__) && wxUSE_FSVOLUME
-    // TODO: this code (using wxFSVolumeBase) should be used for all platforms
-    //       but unfortunately wxFSVolumeBase is not implemented everywhere
-    const wxArrayString as = wxFSVolumeBase::GetVolumes();
-
-    for (size_t i = 0; i < as.GetCount(); i++)
+#elif defined(__WIN32__)
+    wxChar driveBuffer[256];
+    size_t n = (size_t) GetLogicalDriveStrings(255, driveBuffer);
+    size_t i = 0;
+    while (i < n)
     {
-        wxString path = as[i];
-        wxFSVolume vol(path);
+        wxString path, name;
+        path.Printf(wxT("%c:\\"), driveBuffer[i]);
+        name.Printf(wxT("%c:"), driveBuffer[i]);
+
+        // Do not use GetVolumeInformation to further decorate the
+        // name, since it can cause severe delays on network drives.
+
         int imageId;
-        switch (vol.GetKind())
+        int driveType = ::GetDriveType(path);
+        switch (driveType)
         {
-            case wxFS_VOL_FLOPPY:
-                if ( (path == wxT("a:\\")) || (path == wxT("b:\\")) )
+            case DRIVE_REMOVABLE:
+                if (path == wxT("a:\\") || path == wxT("b:\\"))
                     imageId = wxFileIconsTable::floppy;
                 else
                     imageId = wxFileIconsTable::removeable;
                 break;
-            case wxFS_VOL_DVDROM:
-            case wxFS_VOL_CDROM:
+            case DRIVE_CDROM:
                 imageId = wxFileIconsTable::cdrom;
                 break;
-            case wxFS_VOL_NETWORK:
-                if (path[0] == wxT('\\'))
-                    continue; // skip "\\computer\folder"
-                imageId = wxFileIconsTable::drive;
-                break;
-            case wxFS_VOL_DISK:
-            case wxFS_VOL_OTHER:
+            case DRIVE_REMOTE:
+            case DRIVE_FIXED:
             default:
                 imageId = wxFileIconsTable::drive;
                 break;
         }
+
         paths.Add(path);
-        names.Add(vol.GetDisplayName());
+        names.Add(name);
         icon_ids.Add(imageId);
+
+        while (driveBuffer[i] != wxT('\0'))
+            i ++;
+        i ++;
+        if (driveBuffer[i] == wxT('\0'))
+            break;
     }
 #elif defined(__OS2__)
     APIRET rc;
@@ -164,10 +166,9 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
         {
             if (ulDriveMap & ( 1 << i ))
             {
-                const wxString path = wxFileName::GetVolumeString(
-                                        'A' + i, wxPATH_GET_SEPARATOR);
-                const wxString name = wxFileName::GetVolumeString(
-                                        'A' + i, wxPATH_NO_SEPARATOR);
+                wxString path, name;
+                path.Printf(wxT("%c:\\"), 'A' + i);
+                name.Printf(wxT("%c:"), 'A' + i);
 
                 // Note: If _filesys is unsupported by some compilers,
                 //       we can always replace it by DosQueryFSAttach
@@ -202,23 +203,25 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
         }
     }
 #else // !__WIN32__, !__OS2__
+    int drive;
+
     /* If we can switch to the drive, it exists. */
-    for ( char drive = 'A'; drive <= 'Z'; drive++ )
+    for( drive = 1; drive <= 26; drive++ )
     {
-        const wxString
-            path = wxFileName::GetVolumeString(drive, wxPATH_GET_SEPARATOR);
+        wxString path, name;
+        path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1));
+        name.Printf(wxT("%c:"), (char) (drive + 'A' - 1));
 
         if (wxIsDriveAvailable(path))
         {
             paths.Add(path);
-            names.Add(wxFileName::GetVolumeString(drive, wxPATH_NO_SEPARATOR));
-            icon_ids.Add(drive <= 2 ? wxFileIconsTable::floppy
-                                    : wxFileIconsTable::drive);
+            names.Add(name);
+            icon_ids.Add((drive <= 2) ? wxFileIconsTable::floppy : wxFileIconsTable::drive);
         }
     }
 #endif // __WIN32__/!__WIN32__
 
-#elif defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON
+#elif defined(__WXMAC__)
 
     ItemCount volumeIndex = 1;
     OSErr err = noErr ;
@@ -270,7 +273,7 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI
 
 bool wxIsDriveAvailable(const wxString& dirName)
 {
-    // FIXME: this method leads to hang up under Watcom for some reason
+    // FIXME_MGL - this method leads to hang up under Watcom for some reason
 #ifdef __WATCOMC__
     wxUnusedVar(dirName);
 #else
@@ -310,7 +313,7 @@ int setdrive(int WXUNUSED_IN_WINCE(drive))
 #else
     newdrive[2] = wxT('\0');
 #endif
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
     if (::SetCurrentDirectory(newdrive))
 #else
     // VA doesn't know what LPSTR is and has its own set
@@ -436,6 +439,64 @@ bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
 // wxGenericDirCtrl
 //-----------------------------------------------------------------------------
 
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxGenericDirCtrlStyle )
+
+wxBEGIN_FLAGS( wxGenericDirCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxDIRCTRL_DIR_ONLY)
+    wxFLAGS_MEMBER(wxDIRCTRL_3D_INTERNAL)
+    wxFLAGS_MEMBER(wxDIRCTRL_SELECT_FIRST)
+    wxFLAGS_MEMBER(wxDIRCTRL_SHOW_FILTERS)
+
+wxEND_FLAGS( wxGenericDirCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericDirCtrl, wxControl,"wx/dirctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxGenericDirCtrl)
+    wxHIDE_PROPERTY( Children )
+    wxPROPERTY( DefaultPath , wxString , SetDefaultPath , GetDefaultPath  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Filter , wxString , SetFilter , GetFilter  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( DefaultFilter , int , SetFilterIndex, GetFilterIndex, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY_FLAGS( WindowStyle, wxGenericDirCtrlStyle, long, SetWindowStyleFlag, GetWindowStyleFlag, EMPTY_MACROVALUE , 0, wxT("Helpstring"), wxT("group") )
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxGenericDirCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_8( wxGenericDirCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , DefaultPath ,
+                 wxPoint , Position , wxSize , Size , long , WindowStyle , wxString , Filter , int , DefaultFilter )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrl, wxControl)
+#endif
+
 BEGIN_EVENT_TABLE(wxGenericDirCtrl, wxControl)
   EVT_TREE_ITEM_EXPANDING     (wxID_TREECTRL, wxGenericDirCtrl::OnExpandItem)
   EVT_TREE_ITEM_COLLAPSED     (wxID_TREECTRL, wxGenericDirCtrl::OnCollapseItem)
@@ -470,7 +531,7 @@ void wxGenericDirCtrl::ExpandRoot()
 }
 
 bool wxGenericDirCtrl::Create(wxWindow *parent,
-                              const wxWindowID treeid,
+                              const wxWindowID id,
                               const wxString& dir,
                               const wxPoint& pos,
                               const wxSize& size,
@@ -479,7 +540,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
                               int defaultFilter,
                               const wxString& name)
 {
-    if (!wxControl::Create(parent, treeid, pos, size, style, wxDefaultValidator, name))
+    if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
         return false;
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
@@ -502,23 +563,32 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
     if (style & wxDIRCTRL_EDIT_LABELS)
         treeStyle |= wxTR_EDIT_LABELS;
 
-    if (style & wxDIRCTRL_MULTIPLE)
-        treeStyle |= wxTR_MULTIPLE;
-
     if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
         treeStyle |= wxNO_BORDER;
+    else
+        treeStyle |= wxBORDER_SUNKEN;
+
+    long filterStyle = 0;
+    if ((style & wxDIRCTRL_3D_INTERNAL) == 0)
+        filterStyle |= wxNO_BORDER;
+    else
+        filterStyle |= wxBORDER_SUNKEN;
 
     m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL,
                                 wxPoint(0,0), GetClientSize(), treeStyle);
 
-    if (!filter.empty())
-        m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);
+    if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS))
+        m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle);
 
     m_defaultPath = dir;
     m_filter = filter;
 
     if (m_filter.empty())
-        m_filter = wxFileSelectorDefaultWildcardStr;
+#ifdef __UNIX__
+        m_filter = wxT("*");
+#else
+        m_filter = wxT("*.*");
+#endif
 
     SetFilterIndex(defaultFilter);
 
@@ -562,34 +632,18 @@ void wxGenericDirCtrl::Init()
     m_filterListCtrl = NULL;
 }
 
-wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID treeid, const wxPoint& pos, const wxSize& size, long treeStyle)
+wxTreeCtrl* wxGenericDirCtrl::CreateTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long treeStyle)
 {
-    return new wxTreeCtrl(parent, treeid, pos, size, treeStyle);
+    return new wxTreeCtrl(parent, id, pos, size, treeStyle);
 }
 
 void wxGenericDirCtrl::ShowHidden( bool show )
 {
-    if ( m_showHidden == show )
-        return;
-
     m_showHidden = show;
 
-    if ( HasFlag(wxDIRCTRL_MULTIPLE) )
-    {
-        wxArrayString paths;
-        GetPaths(paths);
-        ReCreateTree();
-        for ( unsigned n = 0; n < paths.size(); n++ )
-        {
-            ExpandPath(paths[n]);
-        }
-    }
-    else
-    {
-        wxString path = GetPath();
-        ReCreateTree();
-        SetPath(path);
-    }
+    wxString path = GetPath();
+    ReCreateTree();
+    SetPath(path);
 }
 
 const wxTreeItemId
@@ -597,11 +651,11 @@ wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int ima
 {
     wxDirItemData *dir_item = new wxDirItemData(path,name,true);
 
-    wxTreeItemId treeid = AppendItem( m_rootId, name, imageId, -1, dir_item);
+    wxTreeItemId id = AppendItem( m_rootId, name, imageId, -1, dir_item);
 
-    m_treeCtrl->SetItemHasChildren(treeid);
+    m_treeCtrl->SetItemHasChildren(id);
 
-    return treeid;
+    return id;
 }
 
 void wxGenericDirCtrl::SetupSections()
@@ -622,14 +676,6 @@ void wxGenericDirCtrl::SetupSections()
         AddSection(paths[n], names[n], icons[n]);
 }
 
-void wxGenericDirCtrl::SetFocus()
-{
-    // we don't need focus ourselves, give it to the tree so that the user
-    // could navigate it
-    if (m_treeCtrl)
-        m_treeCtrl->SetFocus();
-}
-
 void wxGenericDirCtrl::OnBeginEditItem(wxTreeEvent &event)
 {
     // don't rename the main entry "Sections"
@@ -665,8 +711,8 @@ void wxGenericDirCtrl::OnEndEditItem(wxTreeEvent &event)
         return;
     }
 
-    wxTreeItemId treeid = event.GetItem();
-    wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( treeid );
+    wxTreeItemId id = event.GetItem();
+    wxDirItemData *data = (wxDirItemData*)m_treeCtrl->GetItemData( id );
     wxASSERT( data );
 
     wxString new_name( wxPathOnly( data->m_path ) );
@@ -702,6 +748,7 @@ void wxGenericDirCtrl::OnExpandItem(wxTreeEvent &event)
     //     ctor when wxTR_HIDE_ROOT was specified
 
     if (!m_rootId.IsOk())
+
         m_rootId = m_treeCtrl->GetRootItem();
 
     ExpandDir(parentId);
@@ -729,7 +776,7 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
     m_treeCtrl->Thaw();
 }
 
-void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
+void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
 {
     wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(parentId);
 
@@ -797,7 +844,7 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
     dirs.Sort(wxDirCtrlStringCompareFunction);
 
     // Now do the filenames -- but only if we're allowed to
-    if (!HasFlag(wxDIRCTRL_DIR_ONLY))
+    if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
     {
         d.Open(dirName);
 
@@ -828,13 +875,9 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
         filenames.Sort(wxDirCtrlStringCompareFunction);
     }
 
-    // Now we really know whether we have any children so tell the tree control
-    // about it.
-    m_treeCtrl->SetItemHasChildren(parentId, !dirs.empty() || !filenames.empty());
-
     // Add the sorted dirs
     size_t i;
-    for (i = 0; i < dirs.GetCount(); i++)
+    for (i = 0; i < dirs.Count(); i++)
     {
         eachFilename = dirs[i];
         path = dirName;
@@ -843,23 +886,27 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
         path += eachFilename;
 
         wxDirItemData *dir_item = new wxDirItemData(path,eachFilename,true);
-        wxTreeItemId treeid = AppendItem( parentId, eachFilename,
+        wxTreeItemId id = AppendItem( parentId, eachFilename,
                                       wxFileIconsTable::folder, -1, dir_item);
-        m_treeCtrl->SetItemImage( treeid, wxFileIconsTable::folder_open,
+        m_treeCtrl->SetItemImage( id, wxFileIconsTable::folder_open,
                                   wxTreeItemIcon_Expanded );
 
-        // assume that it does have children by default as it can take a long
-        // time to really check for this (think remote drives...)
-        //
-        // and if we're wrong, we'll correct the icon later if
-        // the user really tries to open this item
-        m_treeCtrl->SetItemHasChildren(treeid);
+        // Has this got any children? If so, make it expandable.
+        // (There are two situations when a dir has children: either it
+        // has subdirectories or it contains files that weren't filtered
+        // out. The latter only applies to dirctrl with files.)
+        if ( dir_item->HasSubDirs() ||
+             (((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0) &&
+               dir_item->HasFiles(m_currentFilterStr)) )
+        {
+            m_treeCtrl->SetItemHasChildren(id);
+        }
     }
 
     // Add the sorted filenames
-    if (!HasFlag(wxDIRCTRL_DIR_ONLY))
+    if ((GetWindowStyle() & wxDIRCTRL_DIR_ONLY) == 0)
     {
-        for (i = 0; i < filenames.GetCount(); i++)
+        for (i = 0; i < filenames.Count(); i++)
         {
             eachFilename = filenames[i];
             path = dirName;
@@ -876,12 +923,6 @@ void wxGenericDirCtrl::PopulateNode(wxTreeItemId parentId)
     }
 }
 
-void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
-{
-    // ExpandDir() will not actually expand the tree node, just populate it
-    PopulateNode(parentId);
-}
-
 void wxGenericDirCtrl::ReCreateTree()
 {
     CollapseDir(m_treeCtrl->GetRootItem());
@@ -960,15 +1001,15 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
 bool wxGenericDirCtrl::ExpandPath(const wxString& path)
 {
     bool done = false;
-    wxTreeItemId treeid = FindChild(m_rootId, path, done);
-    wxTreeItemId lastId = treeid; // The last non-zero treeid
-    while (treeid.IsOk() && !done)
+    wxTreeItemId id = FindChild(m_rootId, path, done);
+    wxTreeItemId lastId = id; // The last non-zero id
+    while (id.IsOk() && !done)
     {
-        ExpandDir(treeid);
+        ExpandDir(id);
 
-        treeid = FindChild(treeid, path, done);
-        if (treeid.IsOk())
-            lastId = treeid;
+        id = FindChild(id, path, done);
+        if (id.IsOk())
+            lastId = id;
     }
     if (!lastId.IsOk())
         return false;
@@ -978,7 +1019,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
     {
         m_treeCtrl->Expand(lastId);
     }
-    if (HasFlag(wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
+    if ((GetWindowStyle() & wxDIRCTRL_SELECT_FIRST) && data->m_isDir)
     {
         // Find the first file in this directory
         wxTreeItemIdValue cookie;
@@ -1016,17 +1057,17 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
 bool wxGenericDirCtrl::CollapsePath(const wxString& path)
 {
     bool done           = false;
-    wxTreeItemId treeid     = FindChild(m_rootId, path, done);
-    wxTreeItemId lastId = treeid; // The last non-zero treeid
+    wxTreeItemId id     = FindChild(m_rootId, path, done);
+    wxTreeItemId lastId = id; // The last non-zero id
 
-    while ( treeid.IsOk() && !done )
+    while ( id.IsOk() && !done )
     {
-        CollapseDir(treeid);
+        CollapseDir(id);
 
-        treeid = FindChild(treeid, path, done);
+        id = FindChild(id, path, done);
 
-        if ( treeid.IsOk() )
-            lastId = treeid;
+        if ( id.IsOk() )
+            lastId = id;
     }
 
     if ( !lastId.IsOk() )
@@ -1041,52 +1082,22 @@ bool wxGenericDirCtrl::CollapsePath(const wxString& path)
 
 wxString wxGenericDirCtrl::GetPath() const
 {
-    // Allow calling GetPath() in multiple selection from OnSelFilter
-    if (m_treeCtrl->HasFlag(wxTR_MULTIPLE))
+    wxTreeItemId id = m_treeCtrl->GetSelection();
+    if (id)
     {
-        wxArrayTreeItemIds items;
-        m_treeCtrl->GetSelections(items);
-        if (items.size() > 0)
-        {
-            // return first string only
-            wxTreeItemId treeid = items[0];
-            wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
-            return data->m_path;
-        }
-
-        return wxEmptyString;
-    }
-
-    wxTreeItemId treeid = m_treeCtrl->GetSelection();
-    if (treeid)
-    {
-        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
         return data->m_path;
     }
     else
         return wxEmptyString;
 }
 
-void wxGenericDirCtrl::GetPaths(wxArrayString& paths) const
-{
-    paths.clear();
-
-    wxArrayTreeItemIds items;
-    m_treeCtrl->GetSelections(items);
-    for ( unsigned n = 0; n < items.size(); n++ )
-    {
-        wxTreeItemId treeid = items[n];
-        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
-        paths.Add(data->m_path);
-    }
-}
-
 wxString wxGenericDirCtrl::GetFilePath() const
 {
-    wxTreeItemId treeid = m_treeCtrl->GetSelection();
-    if (treeid)
+    wxTreeItemId id = m_treeCtrl->GetSelection();
+    if (id)
     {
-        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
+        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(id);
         if (data->m_isDir)
             return wxEmptyString;
         else
@@ -1096,21 +1107,6 @@ wxString wxGenericDirCtrl::GetFilePath() const
         return wxEmptyString;
 }
 
-void wxGenericDirCtrl::GetFilePaths(wxArrayString& paths) const
-{
-    paths.clear();
-
-    wxArrayTreeItemIds items;
-    m_treeCtrl->GetSelections(items);
-    for ( unsigned n = 0; n < items.size(); n++ )
-    {
-        wxTreeItemId treeid = items[n];
-        wxDirItemData* data = (wxDirItemData*) m_treeCtrl->GetItemData(treeid);
-        if ( !data->m_isDir )
-            paths.Add(data->m_path);
-    }
-}
-
 void wxGenericDirCtrl::SetPath(const wxString& path)
 {
     m_defaultPath = path;
@@ -1118,48 +1114,11 @@ void wxGenericDirCtrl::SetPath(const wxString& path)
         ExpandPath(path);
 }
 
-void wxGenericDirCtrl::SelectPath(const wxString& path, bool select)
-{
-    bool done = false;
-    wxTreeItemId treeid = FindChild(m_rootId, path, done);
-    wxTreeItemId lastId = treeid; // The last non-zero treeid
-    while ( treeid.IsOk() && !done )
-    {
-        treeid = FindChild(treeid, path, done);
-        if ( treeid.IsOk() )
-            lastId = treeid;
-    }
-    if ( !lastId.IsOk() )
-        return;
-
-    if ( done )
-    {
-        m_treeCtrl->SelectItem(treeid, select);
-    }
-}
-
-void wxGenericDirCtrl::SelectPaths(const wxArrayString& paths)
-{
-    if ( HasFlag(wxDIRCTRL_MULTIPLE) )
-    {
-        UnselectAll();
-        for ( unsigned n = 0; n < paths.size(); n++ )
-        {
-            SelectPath(paths[n]);
-        }
-    }
-}
-
-void wxGenericDirCtrl::UnselectAll()
-{
-    m_treeCtrl->UnselectAll();
-}
-
 // Not used
 #if 0
-void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArrayString& filenames)
+void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayString& filenames)
 {
-    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(treeid);
+    wxDirItemData *data = (wxDirItemData *) m_treeCtrl->GetItemData(id);
 
     // This may take a longish time. Go to busy cursor
     wxBusyCursor busy;
@@ -1170,7 +1129,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId treeid, int dirFlags, wxArray
 
     wxString dirName(data->m_path);
 
-#if defined(__WINDOWS__) || defined(__OS2__)
+#if defined(__WXMSW__) || defined(__OS2__)
     if (dirName.Last() == ':')
         dirName += wxString(wxFILE_SEP_PATH);
 #endif
@@ -1217,14 +1176,6 @@ void wxGenericDirCtrl::SetFilter(const wxString& filter)
 {
     m_filter = filter;
 
-    if (!filter.empty() && !m_filterListCtrl)
-        m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL);
-    else if (filter.empty() && m_filterListCtrl)
-    {
-        m_filterListCtrl->Destroy();
-        m_filterListCtrl = NULL;
-    }
-
     wxString f, d;
     if (ExtractWildcard(m_filter, m_currentFilter, f, d))
         m_currentFilterStr = f;
@@ -1234,6 +1185,7 @@ void wxGenericDirCtrl::SetFilter(const wxString& filter)
 #else
         m_currentFilterStr = wxT("*.*");
 #endif
+
     // current filter index is meaningless after filter change, set it to zero
     SetFilterIndex(0);
     if (m_filterListCtrl)
@@ -1255,6 +1207,15 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin
     return false;
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+// Parses the global filter, returning the number of filters.
+// Returns 0 if none or if there's a problem.
+// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpg"
+int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions)
+{
+    return wxParseCommonDialogsFilter(filterStr, descriptions, filters );
+}
+#endif // WXWIN_COMPATIBILITY_2_4
 
 void wxGenericDirCtrl::DoResize()
 {
@@ -1314,22 +1275,13 @@ BEGIN_EVENT_TABLE(wxDirFilterListCtrl, wxChoice)
     EVT_CHOICE(wxID_ANY, wxDirFilterListCtrl::OnSelFilter)
 END_EVENT_TABLE()
 
-bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent,
-                                 const wxWindowID treeid,
-                                 const wxPoint& pos,
-                                 const wxSize& size,
-                                 long style)
+bool wxDirFilterListCtrl::Create(wxGenericDirCtrl* parent, const wxWindowID id,
+              const wxPoint& pos,
+              const wxSize& size,
+              long style)
 {
     m_dirCtrl = parent;
-
-    // by default our border style is determined by the style of our parent
-    if ( !(style & wxBORDER_MASK) )
-    {
-        style |= parent->HasFlag(wxDIRCTRL_3D_INTERNAL) ? wxBORDER_SUNKEN
-                                                        : wxBORDER_NONE;
-    }
-
-    return wxChoice::Create(parent, treeid, pos, size, 0, NULL, style);
+    return wxChoice::Create(parent, id, pos, size, 0, NULL, style);
 }
 
 void wxDirFilterListCtrl::Init()
@@ -1341,33 +1293,16 @@ void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& WXUNUSED(event))
 {
     int sel = GetSelection();
 
-    if (m_dirCtrl->HasFlag(wxDIRCTRL_MULTIPLE))
-    {
-        wxArrayString paths;
-        m_dirCtrl->GetPaths(paths);
+    wxString currentPath = m_dirCtrl->GetPath();
 
-        m_dirCtrl->SetFilterIndex(sel);
+    m_dirCtrl->SetFilterIndex(sel);
 
-        // If the filter has changed, the view is out of date, so
-        // collapse the tree.
-        m_dirCtrl->ReCreateTree();
+    // If the filter has changed, the view is out of date, so
+    // collapse the tree.
+    m_dirCtrl->ReCreateTree();
 
-        // Expand and select the previously selected paths
-        for (unsigned int i = 0; i < paths.GetCount(); i++)
-        {
-            m_dirCtrl->ExpandPath(paths.Item(i));
-        }
-    }
-    else
-    {
-        wxString currentPath = m_dirCtrl->GetPath();
-
-        m_dirCtrl->SetFilterIndex(sel);
-        m_dirCtrl->ReCreateTree();
-
-        // Try to restore the selection, or at least the directory
-        m_dirCtrl->ExpandPath(currentPath);
-    }
+    // Try to restore the selection, or at least the directory
+    m_dirCtrl->ExpandPath(currentPath);
 }
 
 void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilter)
@@ -1391,9 +1326,9 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt
 // wxFileIconsTable icons
 // ----------------------------------------------------------------------------
 
-#ifndef __WXGTK20__
+#ifndef __WXGTK24__
 /* Computer (c) Julian Smart */
-static const char* const file_icons_tbl_computer_xpm[] = {
+static const char * file_icons_tbl_computer_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 42 1",
 "r c #4E7FD0",
@@ -1456,14 +1391,14 @@ static const char* const file_icons_tbl_computer_xpm[] = {
 " dfffffffffffffd",
 "                "
 };
-#endif // !GTK+ 2
+#endif // GTK+ < 2.4
 
 // ----------------------------------------------------------------------------
 // wxFileIconsTable & friends
 // ----------------------------------------------------------------------------
 
 // global instance of a wxFileIconsTable
-wxFileIconsTable* wxTheFileIconsTable = NULL;
+wxFileIconsTable* wxTheFileIconsTable = (wxFileIconsTable *)NULL;
 
 // A module to allow icons table cleanup
 
@@ -1475,7 +1410,11 @@ public:
     bool OnInit() { wxTheFileIconsTable = new wxFileIconsTable; return true; }
     void OnExit()
     {
-        wxDELETE(wxTheFileIconsTable);
+        if (wxTheFileIconsTable)
+        {
+            delete wxTheFileIconsTable;
+            wxTheFileIconsTable = NULL;
+        }
     }
 };
 
@@ -1484,9 +1423,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileIconsTableModule, wxModule)
 class wxFileIconEntry : public wxObject
 {
 public:
-    wxFileIconEntry(int i) { iconid = i; }
+    wxFileIconEntry(int i) { id = i; }
 
-    int iconid;
+    int id;
 };
 
 wxFileIconsTable::wxFileIconsTable()
@@ -1521,7 +1460,7 @@ void wxFileIconsTable::Create()
                                                    wxART_CMN_DIALOG,
                                                    wxSize(16, 16)));
     // computer
-#ifdef __WXGTK20__
+#ifdef __WXGTK24__
     // GTK24 uses this icon in the file open dialog
     m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK,
                                                    wxART_CMN_DIALOG,
@@ -1550,14 +1489,14 @@ void wxFileIconsTable::Create()
                                                    wxART_CMN_DIALOG,
                                                    wxSize(16, 16)));
     // executable
-    if (GetIconID(wxEmptyString, wxT("application/x-executable")) == file)
+    if (GetIconID(wxEmptyString, _T("application/x-executable")) == file)
     {
         m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE,
                                                        wxART_CMN_DIALOG,
                                                        wxSize(16, 16)));
-        delete m_HashTable->Get(wxT("exe"));
-        m_HashTable->Delete(wxT("exe"));
-        m_HashTable->Put(wxT("exe"), new wxFileIconEntry(executable));
+        delete m_HashTable->Get(_T("exe"));
+        m_HashTable->Delete(_T("exe"));
+        m_HashTable->Put(_T("exe"), new wxFileIconEntry(executable));
     }
     /* else put into list by GetIconID
        (KDE defines application/x-executable for *.exe and has nice icon)
@@ -1572,7 +1511,7 @@ wxImageList *wxFileIconsTable::GetSmallImageList()
     return m_smallImageList;
 }
 
-#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WINDOWS__) || wxUSE_WXDIB)
+#if wxUSE_MIMETYPE && wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
 // VS: we don't need this function w/o wxMimeTypesManager because we'll only have
 //     one icon and we won't resize it
 
@@ -1688,7 +1627,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
     if (!extension.empty())
     {
         wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable->Get(extension);
-        if (entry) return (entry -> iconid);
+        if (entry) return (entry -> id);
     }
 
     wxFileType *ft = (mime.empty()) ?
@@ -1708,7 +1647,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
 
     delete ft;
 
-    if ( !ic.IsOk() )
+    if ( !ic.Ok() )
     {
         int newid = file;
         m_HashTable->Put(extension, new wxFileIconEntry(newid));
@@ -1718,7 +1657,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
     wxBitmap bmp;
     bmp.CopyFromIcon(ic);
 
-    if ( !bmp.IsOk() )
+    if ( !bmp.Ok() )
     {
         int newid = file;
         m_HashTable->Put(extension, new wxFileIconEntry(newid));
@@ -1727,12 +1666,12 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
 
     const unsigned int size = 16;
 
-    int treeid = m_smallImageList->GetImageCount();
+    int id = m_smallImageList->GetImageCount();
     if ((bmp.GetWidth() == (int) size) && (bmp.GetHeight() == (int) size))
     {
         m_smallImageList->Add(bmp);
     }
-#if wxUSE_IMAGE && (!defined(__WINDOWS__) || wxUSE_WXDIB)
+#if wxUSE_IMAGE && (!defined(__WXMSW__) || wxUSE_WXDIB)
     else
     {
         wxImage img = bmp.ConvertToImage();
@@ -1745,8 +1684,8 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
     }
 #endif // wxUSE_IMAGE
 
-    m_HashTable->Put(extension, new wxFileIconEntry(treeid));
-    return treeid;
+    m_HashTable->Put(extension, new wxFileIconEntry(id));
+    return id;
 
 #else // !wxUSE_MIMETYPE
 
diff --git a/Source/3rd Party/wx/src/generic/dragimgg.cpp b/Source/3rd Party/wx/src/generic/dragimgg.cpp
index 83a55343c..d3c8ac474 100644
--- a/Source/3rd Party/wx/src/generic/dragimgg.cpp	
+++ b/Source/3rd Party/wx/src/generic/dragimgg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     29/2/2000
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dragimgg.cpp 42397 2006-10-25 12:12:56Z VS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -69,13 +69,13 @@ void wxGenericDragImage::Init()
 {
     m_isDirty = false;
     m_isShown = false;
-    m_windowDC = NULL;
-    m_window = NULL;
+    m_windowDC = (wxDC*) NULL;
+    m_window = (wxWindow*) NULL;
     m_fullScreen = false;
 #ifdef wxHAS_NATIVE_OVERLAY
     m_dcOverlay = NULL;
 #else
-    m_pBackingBitmap = NULL;
+    m_pBackingBitmap = (wxBitmap*) NULL;
 #endif
 }
 
@@ -172,7 +172,7 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor)
 {
     wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
-    wxCoord w = 0, h = 0;
+    long w = 0, h = 0;
     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);
@@ -187,7 +187,7 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor)
     dc2.SetFont(font);
     dc2.SetBackground(* wxWHITE_BRUSH);
     dc2.Clear();
-    dc2.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    dc2.SetBackgroundMode(wxTRANSPARENT);
     dc2.SetTextForeground(* wxLIGHT_GREY);
     dc2.DrawText(str, 0, 0);
     dc2.DrawText(str, 1, 0);
@@ -236,7 +236,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
                                    bool fullScreen,
                                    wxRect* rect)
 {
-    wxCHECK_MSG( window, false, wxT("Window must not be null in BeginDrag."));
+    wxASSERT_MSG( (window != 0), wxT("Window must not be null in BeginDrag."));
 
     // The image should be offset by this amount
     m_offset = hotspot;
@@ -247,15 +247,18 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
         m_boundingRect = * rect;
 
     m_isDirty = false;
-    m_isShown = false;
+    m_isDirty = false;
 
-    if (m_cursor.IsOk())
+    if (window)
     {
-        m_oldCursor = window->GetCursor();
-        window->SetCursor(m_cursor);
-    }
+        window->CaptureMouse();
 
-    window->CaptureMouse();
+        if (m_cursor.Ok())
+        {
+            m_oldCursor = window->GetCursor();
+            window->SetCursor(m_cursor);
+        }
+    }
 
     // Make a copy of the window so we can repair damage done as the image is
     // dragged.
@@ -288,7 +291,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
 #ifndef wxHAS_NATIVE_OVERLAY
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
 
-    if (!backing->IsOk() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y))
+    if (!backing->Ok() || (backing->GetWidth() < clientSize.x || backing->GetHeight() < clientSize.y))
         (*backing) = wxBitmap(clientSize.x, clientSize.y);
 #endif // !wxHAS_NATIVE_OVERLAY
 
@@ -324,7 +327,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxW
 
     wxSize sz = fullScreenRect->GetSize();
 
-    if (fullScreenRect->GetParent() && !wxDynamicCast(fullScreenRect, wxFrame))
+    if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
         fullScreenRect->GetParent()->ClientToScreen(& x, & y);
 
     rect.x = x; rect.y = y;
@@ -345,7 +348,7 @@ bool wxGenericDragImage::EndDrag()
 #endif
             m_window->ReleaseMouse();
 
-        if (m_cursor.IsOk() && m_oldCursor.IsOk())
+        if (m_cursor.Ok() && m_oldCursor.Ok())
         {
             m_window->SetCursor(m_oldCursor);
         }
@@ -358,7 +361,8 @@ bool wxGenericDragImage::EndDrag()
 #else
         m_windowDC->DestroyClippingRegion();
 #endif
-        wxDELETE(m_windowDC);
+        delete m_windowDC;
+        m_windowDC = (wxDC*) NULL;
     }
 
 #ifndef wxHAS_NATIVE_OVERLAY
@@ -372,7 +376,7 @@ bool wxGenericDragImage::EndDrag()
 // is non-NULL, or in screen coordinates if NULL.
 bool wxGenericDragImage::Move(const wxPoint& pt)
 {
-    wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Move()") );
+    wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Move()") );
 
     wxPoint pt2(pt);
     if (m_fullScreen)
@@ -396,7 +400,7 @@ bool wxGenericDragImage::Move(const wxPoint& pt)
 
 bool wxGenericDragImage::Show()
 {
-    wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Show()") );
+    wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Show()") );
 
     // Show at the current position
 
@@ -434,7 +438,7 @@ bool wxGenericDragImage::UpdateBackingFromWindow(wxDC& windowDC, wxMemoryDC& des
 
 bool wxGenericDragImage::Hide()
 {
-    wxASSERT_MSG( (m_windowDC != NULL), wxT("No window DC in wxGenericDragImage::Hide()") );
+    wxASSERT_MSG( (m_windowDC != (wxDC*) NULL), wxT("No window DC in wxGenericDragImage::Hide()") );
 
     // Repair the old position
 
@@ -450,16 +454,13 @@ bool wxGenericDragImage::Hide()
 }
 
 // More efficient: erase and redraw simultaneously if possible
-bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos,
-                                     const wxPoint& newPos,
+bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPos,
                                      bool eraseOld, bool drawNew)
 {
     if (!m_windowDC)
         return false;
 
 #ifdef wxHAS_NATIVE_OVERLAY
-    wxUnusedVar(oldPos);
-
     wxDCOverlay dcoverlay( m_overlay, (wxWindowDC*) m_windowDC ) ;
     if ( eraseOld )
         dcoverlay.Clear() ;
@@ -467,7 +468,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos,
         DoDrawImage(*m_windowDC, newPos);
 #else // !wxHAS_NATIVE_OVERLAY
     wxBitmap* backing = (m_pBackingBitmap ? m_pBackingBitmap : (wxBitmap*) & m_backingBitmap);
-    if (!backing->IsOk())
+    if (!backing->Ok())
         return false;
 
     wxRect oldRect(GetImageRect(oldPos));
@@ -499,7 +500,7 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos,
     // keep reallocating all the time.
     int excess = 50;
 
-    if (!m_repairBitmap.IsOk() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight()))
+    if (!m_repairBitmap.Ok() || (m_repairBitmap.GetWidth() < fullRect.GetWidth() || m_repairBitmap.GetHeight() < fullRect.GetHeight()))
     {
         m_repairBitmap = wxBitmap(fullRect.GetWidth() + excess, fullRect.GetHeight() + excess);
     }
@@ -539,12 +540,12 @@ bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos,
 // Override this if you are using a virtual image (drawing your own image)
 bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const
 {
-    if (m_bitmap.IsOk())
+    if (m_bitmap.Ok())
     {
         dc.DrawBitmap(m_bitmap, pos.x, pos.y, (m_bitmap.GetMask() != 0));
         return true;
     }
-    else if (m_icon.IsOk())
+    else if (m_icon.Ok())
     {
         dc.DrawIcon(m_icon, pos.x, pos.y);
         return true;
@@ -556,11 +557,11 @@ bool wxGenericDragImage::DoDrawImage(wxDC& dc, const wxPoint& pos) const
 // Override this if you are using a virtual image (drawing your own image)
 wxRect wxGenericDragImage::GetImageRect(const wxPoint& pos) const
 {
-    if (m_bitmap.IsOk())
+    if (m_bitmap.Ok())
     {
         return wxRect(pos.x, pos.y, m_bitmap.GetWidth(), m_bitmap.GetHeight());
     }
-    else if (m_icon.IsOk())
+    else if (m_icon.Ok())
     {
         return wxRect(pos.x, pos.y, m_icon.GetWidth(), m_icon.GetHeight());
     }
diff --git a/Source/3rd Party/wx/src/generic/filectrlg.cpp b/Source/3rd Party/wx/src/generic/filectrlg.cpp
deleted file mode 100644
index fbbab5bf1..000000000
--- a/Source/3rd Party/wx/src/generic/filectrlg.cpp	
+++ /dev/null
@@ -1,1473 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/filectrlg.cpp
-// Purpose:     wxGenericFileCtrl Implementation
-// Author:      Diaa M. Sami
-// Created:     2007-07-07
-// RCS-ID:      $Id$
-// Copyright:   (c) Diaa M. Sami
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if wxUSE_FILECTRL
-
-#include "wx/generic/filectrlg.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/settings.h"
-    #include "wx/sizer.h"
-    #include "wx/stattext.h"
-    #include "wx/checkbox.h"
-    #include "wx/msgdlg.h"
-    #include "wx/log.h"
-    #include "wx/filedlg.h"
-#endif
-
-#include "wx/clntdata.h"
-#include "wx/file.h"        // for wxS_IXXX constants only
-#include "wx/generic/dirctrlg.h" // for wxFileIconsTable
-#include "wx/dir.h"
-#include "wx/tokenzr.h"
-#include "wx/imaglist.h"
-
-#ifdef __WINDOWS__
-    #include "wx/msw/wrapwin.h"
-#endif
-
-#if defined(__WXWINCE__)
-#define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/"))
-#elif (defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__))
-#define IsTopMostDir(dir)   (dir.empty())
-#else
-#define IsTopMostDir(dir)   (dir == wxT("/"))
-#endif
-
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-static
-int wxCALLBACK wxFileDataNameCompare( wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
-{
-     wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
-     wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
-
-     if (fd1->GetFileName() == wxT(".."))
-         return -sortOrder;
-     if (fd2->GetFileName() == wxT(".."))
-         return sortOrder;
-     if (fd1->IsDir() && !fd2->IsDir())
-         return -sortOrder;
-     if (fd2->IsDir() && !fd1->IsDir())
-         return sortOrder;
-
-     return sortOrder*wxStrcmp( fd1->GetFileName(), fd2->GetFileName() );
-}
-
-static
-int wxCALLBACK wxFileDataSizeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
-{
-     wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
-     wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
-
-     if (fd1->GetFileName() == wxT(".."))
-         return -sortOrder;
-     if (fd2->GetFileName() == wxT(".."))
-         return sortOrder;
-     if (fd1->IsDir() && !fd2->IsDir())
-         return -sortOrder;
-     if (fd2->IsDir() && !fd1->IsDir())
-         return sortOrder;
-     if (fd1->IsLink() && !fd2->IsLink())
-         return -sortOrder;
-     if (fd2->IsLink() && !fd1->IsLink())
-         return sortOrder;
-
-     return fd1->GetSize() > fd2->GetSize() ? sortOrder : -sortOrder;
-}
-
-static
-int wxCALLBACK wxFileDataTypeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
-{
-     wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
-     wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
-
-     if (fd1->GetFileName() == wxT(".."))
-         return -sortOrder;
-     if (fd2->GetFileName() == wxT(".."))
-         return sortOrder;
-     if (fd1->IsDir() && !fd2->IsDir())
-         return -sortOrder;
-     if (fd2->IsDir() && !fd1->IsDir())
-         return sortOrder;
-     if (fd1->IsLink() && !fd2->IsLink())
-         return -sortOrder;
-     if (fd2->IsLink() && !fd1->IsLink())
-         return sortOrder;
-
-     return sortOrder*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() );
-}
-
-static
-int wxCALLBACK wxFileDataTimeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)
-{
-     wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
-     wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
-
-     if (fd1->GetFileName() == wxT(".."))
-         return -sortOrder;
-     if (fd2->GetFileName() == wxT(".."))
-         return sortOrder;
-     if (fd1->IsDir() && !fd2->IsDir())
-         return -sortOrder;
-     if (fd2->IsDir() && !fd1->IsDir())
-         return sortOrder;
-
-     return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? sortOrder : -sortOrder;
-}
-
-// defined in src/generic/dirctrlg.cpp
-extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids);
-
-//-----------------------------------------------------------------------------
-//  wxFileData
-//-----------------------------------------------------------------------------
-
-wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id )
-{
-    Init();
-    m_fileName = fileName;
-    m_filePath = filePath;
-    m_type = type;
-    m_image = image_id;
-
-    ReadData();
-}
-
-void wxFileData::Init()
-{
-    m_size = 0;
-    m_type = wxFileData::is_file;
-    m_image = wxFileIconsTable::file;
-}
-
-void wxFileData::Copy( const wxFileData& fileData )
-{
-    m_fileName = fileData.GetFileName();
-    m_filePath = fileData.GetFilePath();
-    m_size = fileData.GetSize();
-    m_dateTime = fileData.GetDateTime();
-    m_permissions = fileData.GetPermissions();
-    m_type = fileData.GetType();
-    m_image = fileData.GetImageId();
-}
-
-void wxFileData::ReadData()
-{
-    if (IsDrive())
-    {
-        m_size = 0;
-        return;
-    }
-
-#if defined(__DOS__) || (defined(__WINDOWS__) && !defined(__WXWINCE__)) || defined(__OS2__)
-    // c:\.. is a drive don't stat it
-    if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5))
-    {
-        m_type = is_drive;
-        m_size = 0;
-        return;
-    }
-#endif // __DOS__ || __WINDOWS__
-
-#ifdef __WXWINCE__
-
-    // WinCE
-
-    DWORD fileAttribs = GetFileAttributes(m_filePath.fn_str());
-    m_type |= (fileAttribs & FILE_ATTRIBUTE_DIRECTORY) != 0 ? is_dir : 0;
-
-    wxString p, f, ext;
-    wxFileName::SplitPath(m_filePath, & p, & f, & ext);
-    if (wxStricmp(ext, wxT("exe")) == 0)
-        m_type |= is_exe;
-
-    // Find out size
-    m_size = 0;
-    HANDLE fileHandle = CreateFile(m_filePath.fn_str(),
-            GENERIC_READ,
-            FILE_SHARE_READ,
-            NULL,
-            OPEN_EXISTING,
-            FILE_ATTRIBUTE_NORMAL,
-            NULL);
-
-    if (fileHandle != INVALID_HANDLE_VALUE)
-    {
-        m_size = GetFileSize(fileHandle, 0);
-        CloseHandle(fileHandle);
-    }
-
-    m_dateTime = wxFileModificationTime(m_filePath);
-
-#else
-
-    // OTHER PLATFORMS
-
-    wxStructStat buff;
-
-#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))
-    lstat( m_filePath.fn_str(), &buff );
-    m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
-#else // no lstat()
-    wxStat( m_filePath, &buff );
-#endif
-
-    m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
-    m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0;
-
-    m_size = buff.st_size;
-
-    m_dateTime = buff.st_mtime;
-#endif
-    // __WXWINCE__
-
-#if defined(__UNIX__)
-    m_permissions.Printf(wxT("%c%c%c%c%c%c%c%c%c"),
-                         buff.st_mode & wxS_IRUSR ? wxT('r') : wxT('-'),
-                         buff.st_mode & wxS_IWUSR ? wxT('w') : wxT('-'),
-                         buff.st_mode & wxS_IXUSR ? wxT('x') : wxT('-'),
-                         buff.st_mode & wxS_IRGRP ? wxT('r') : wxT('-'),
-                         buff.st_mode & wxS_IWGRP ? wxT('w') : wxT('-'),
-                         buff.st_mode & wxS_IXGRP ? wxT('x') : wxT('-'),
-                         buff.st_mode & wxS_IROTH ? wxT('r') : wxT('-'),
-                         buff.st_mode & wxS_IWOTH ? wxT('w') : wxT('-'),
-                         buff.st_mode & wxS_IXOTH ? wxT('x') : wxT('-'));
-#elif defined(__WIN32__)
-    DWORD attribs = ::GetFileAttributes(m_filePath.c_str());
-    if (attribs != (DWORD)-1)
-    {
-        m_permissions.Printf(wxT("%c%c%c%c"),
-                             attribs & FILE_ATTRIBUTE_ARCHIVE  ? wxT('A') : wxT(' '),
-                             attribs & FILE_ATTRIBUTE_READONLY ? wxT('R') : wxT(' '),
-                             attribs & FILE_ATTRIBUTE_HIDDEN   ? wxT('H') : wxT(' '),
-                             attribs & FILE_ATTRIBUTE_SYSTEM   ? wxT('S') : wxT(' '));
-    }
-#endif
-
-    // try to get a better icon
-    if (m_image == wxFileIconsTable::file)
-    {
-        if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
-        {
-            m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.')));
-        } else if (IsExe())
-        {
-            m_image = wxFileIconsTable::executable;
-        }
-    }
-}
-
-wxString wxFileData::GetFileType() const
-{
-    if (IsDir())
-        return _("<DIR>");
-    else if (IsLink())
-        return _("<LINK>");
-    else if (IsDrive())
-        return _("<DRIVE>");
-    else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
-        return m_fileName.AfterLast(wxT('.'));
-
-    return wxEmptyString;
-}
-
-wxString wxFileData::GetModificationTime() const
-{
-    // want time as 01:02 so they line up nicely, no %r in WIN32
-    return m_dateTime.FormatDate() + wxT(" ") + m_dateTime.Format(wxT("%I:%M:%S %p"));
-}
-
-wxString wxFileData::GetHint() const
-{
-    wxString s = m_filePath;
-    s += wxT("  ");
-
-    if (IsDir())
-        s += _("<DIR>");
-    else if (IsLink())
-        s += _("<LINK>");
-    else if (IsDrive())
-        s += _("<DRIVE>");
-    else // plain file
-        s += wxString::Format(wxPLURAL("%ld byte", "%ld bytes", m_size),
-                              wxLongLong(m_size).ToString().c_str());
-
-    s += wxT(' ');
-
-    if ( !IsDrive() )
-    {
-        s << GetModificationTime()
-          << wxT("  ")
-          << m_permissions;
-    }
-
-    return s;
-}
-
-wxString wxFileData::GetEntry( fileListFieldType num ) const
-{
-    wxString s;
-    switch ( num )
-    {
-        case FileList_Name:
-            s = m_fileName;
-            break;
-
-        case FileList_Size:
-            if (!IsDir() && !IsLink() && !IsDrive())
-                s = wxLongLong(m_size).ToString();
-            break;
-
-        case FileList_Type:
-            s = GetFileType();
-            break;
-
-        case FileList_Time:
-            if (!IsDrive())
-                s = GetModificationTime();
-            break;
-
-#if defined(__UNIX__) || defined(__WIN32__)
-        case FileList_Perm:
-            s = m_permissions;
-            break;
-#endif // defined(__UNIX__) || defined(__WIN32__)
-
-        default:
-            wxFAIL_MSG( wxT("unexpected field in wxFileData::GetEntry()") );
-    }
-
-    return s;
-}
-
-void wxFileData::SetNewName( const wxString &filePath, const wxString &fileName )
-{
-    m_fileName = fileName;
-    m_filePath = filePath;
-}
-
-void wxFileData::MakeItem( wxListItem &item )
-{
-    item.m_text = m_fileName;
-    item.ClearAttributes();
-    if (IsExe())
-        item.SetTextColour(*wxRED);
-    if (IsDir())
-        item.SetTextColour(*wxBLUE);
-
-    item.m_image = m_image;
-
-    if (IsLink())
-    {
-        wxColour dg = wxTheColourDatabase->Find( wxT("MEDIUM GREY") );
-        if ( dg.IsOk() )
-            item.SetTextColour(dg);
-    }
-    item.m_data = wxPtrToUInt(this);
-}
-
-//-----------------------------------------------------------------------------
-//  wxFileListCtrl
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileListCtrl,wxListCtrl)
-
-BEGIN_EVENT_TABLE(wxFileListCtrl,wxListCtrl)
-    EVT_LIST_DELETE_ITEM(wxID_ANY, wxFileListCtrl::OnListDeleteItem)
-    EVT_LIST_DELETE_ALL_ITEMS(wxID_ANY, wxFileListCtrl::OnListDeleteAllItems)
-    EVT_LIST_END_LABEL_EDIT(wxID_ANY, wxFileListCtrl::OnListEndLabelEdit)
-    EVT_LIST_COL_CLICK(wxID_ANY, wxFileListCtrl::OnListColClick)
-END_EVENT_TABLE()
-
-
-wxFileListCtrl::wxFileListCtrl()
-{
-    m_showHidden = false;
-    m_sort_forward = true;
-    m_sort_field = wxFileData::FileList_Name;
-}
-
-wxFileListCtrl::wxFileListCtrl(wxWindow *win,
-                       wxWindowID id,
-                       const wxString& wild,
-                       bool showHidden,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       long style,
-                       const wxValidator &validator,
-                       const wxString &name)
-          : wxListCtrl(win, id, pos, size, style, validator, name),
-            m_wild(wild)
-{
-    wxImageList *imageList = wxTheFileIconsTable->GetSmallImageList();
-
-    SetImageList( imageList, wxIMAGE_LIST_SMALL );
-
-    m_showHidden = showHidden;
-
-    m_sort_forward = true;
-    m_sort_field = wxFileData::FileList_Name;
-
-    m_dirName = wxT("*");
-
-    if (style & wxLC_REPORT)
-        ChangeToReportMode();
-}
-
-void wxFileListCtrl::ChangeToListMode()
-{
-    ClearAll();
-    SetSingleStyle( wxLC_LIST );
-    UpdateFiles();
-}
-
-void wxFileListCtrl::ChangeToReportMode()
-{
-    ClearAll();
-    SetSingleStyle( wxLC_REPORT );
-
-    // do this since WIN32 does mm/dd/yy UNIX does mm/dd/yyyy
-    // don't hardcode since mm/dd is dd/mm elsewhere
-    int w, h;
-    wxDateTime dt(22, wxDateTime::Dec, 2002, 22, 22, 22);
-    wxString txt = dt.FormatDate() + wxT("22") + dt.Format(wxT("%I:%M:%S %p"));
-    GetTextExtent(txt, &w, &h);
-
-    InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, w );
-    InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, w/2 );
-    InsertColumn( 2, _("Type"), wxLIST_FORMAT_LEFT, w/2 );
-    InsertColumn( 3, _("Modified"), wxLIST_FORMAT_LEFT, w );
-#if defined(__UNIX__)
-    GetTextExtent(wxT("Permissions 2"), &w, &h);
-    InsertColumn( 4, _("Permissions"), wxLIST_FORMAT_LEFT, w );
-#elif defined(__WIN32__)
-    GetTextExtent(wxT("Attributes 2"), &w, &h);
-    InsertColumn( 4, _("Attributes"), wxLIST_FORMAT_LEFT, w );
-#endif
-
-    UpdateFiles();
-}
-
-void wxFileListCtrl::ChangeToSmallIconMode()
-{
-    ClearAll();
-    SetSingleStyle( wxLC_SMALL_ICON );
-    UpdateFiles();
-}
-
-void wxFileListCtrl::ShowHidden( bool show )
-{
-    m_showHidden = show;
-    UpdateFiles();
-}
-
-long wxFileListCtrl::Add( wxFileData *fd, wxListItem &item )
-{
-    long ret = -1;
-    item.m_mask = wxLIST_MASK_TEXT + wxLIST_MASK_DATA + wxLIST_MASK_IMAGE;
-    fd->MakeItem( item );
-    long my_style = GetWindowStyleFlag();
-    if (my_style & wxLC_REPORT)
-    {
-        ret = InsertItem( item );
-        for (int i = 1; i < wxFileData::FileList_Max; i++)
-            SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) );
-    }
-    else if ((my_style & wxLC_LIST) || (my_style & wxLC_SMALL_ICON))
-    {
-        ret = InsertItem( item );
-    }
-    return ret;
-}
-
-void wxFileListCtrl::UpdateItem(const wxListItem &item)
-{
-    wxFileData *fd = (wxFileData*)GetItemData(item);
-    wxCHECK_RET(fd, wxT("invalid filedata"));
-
-    fd->ReadData();
-
-    SetItemText(item, fd->GetFileName());
-    SetItemImage(item, fd->GetImageId());
-
-    if (GetWindowStyleFlag() & wxLC_REPORT)
-    {
-        for (int i = 1; i < wxFileData::FileList_Max; i++)
-            SetItem( item.m_itemId, i, fd->GetEntry((wxFileData::fileListFieldType)i) );
-    }
-}
-
-void wxFileListCtrl::UpdateFiles()
-{
-    // don't do anything before ShowModal() call which sets m_dirName
-    if ( m_dirName == wxT("*") )
-        return;
-
-    wxBusyCursor bcur; // this may take a while...
-
-    DeleteAllItems();
-
-    wxListItem item;
-    item.m_itemId = 0;
-    item.m_col = 0;
-
-#if (defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)) && !defined(__WXWINCE__)
-    if ( IsTopMostDir(m_dirName) )
-    {
-        wxArrayString names, paths;
-        wxArrayInt icons;
-        const size_t count = wxGetAvailableDrives(paths, names, icons);
-
-        for ( size_t n = 0; n < count; n++ )
-        {
-            // use paths[n] as the drive name too as our HandleAction() can't
-            // deal with the drive names (of the form "System (C:)") currently
-            // as it mistakenly treats them as file names
-            //
-            // it would be preferable to show names, and not paths, in the
-            // dialog just as the native dialog does but for this we must:
-            //  a) store the item type as item data and modify HandleAction()
-            //     to use it instead of wxDirExists() to check whether the item
-            //     is a directory
-            //  b) store the drives by their drive letters and not their
-            //     descriptions as otherwise it's pretty confusing to the user
-            wxFileData *fd = new wxFileData(paths[n], paths[n],
-                                            wxFileData::is_drive, icons[n]);
-            if (Add(fd, item) != -1)
-                item.m_itemId++;
-            else
-                delete fd;
-        }
-    }
-    else
-#endif // defined(__DOS__) || defined(__WINDOWS__)
-    {
-        // Real directory...
-        if ( !IsTopMostDir(m_dirName) && !m_dirName.empty() )
-        {
-            wxString p(wxPathOnly(m_dirName));
-#if (defined(__UNIX__) || defined(__WXWINCE__)) && !defined(__OS2__)
-            if (p.empty()) p = wxT("/");
-#endif // __UNIX__
-            wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
-            if (Add(fd, item) != -1)
-                item.m_itemId++;
-            else
-                delete fd;
-        }
-
-        wxString dirname(m_dirName);
-#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
-        if (dirname.length() == 2 && dirname[1u] == wxT(':'))
-            dirname << wxT('\\');
-#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
-
-        if (dirname.empty())
-            dirname = wxFILE_SEP_PATH;
-
-        wxLogNull logNull;
-        wxDir dir(dirname);
-
-        if ( dir.IsOpened() )
-        {
-            wxString dirPrefix(dirname);
-            if (dirPrefix.Last() != wxFILE_SEP_PATH)
-                dirPrefix += wxFILE_SEP_PATH;
-
-            int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0;
-
-            bool cont;
-            wxString f;
-
-            // Get the directories first (not matched against wildcards):
-            cont = dir.GetFirst(&f, wxEmptyString, wxDIR_DIRS | hiddenFlag);
-            while (cont)
-            {
-                wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_dir, wxFileIconsTable::folder);
-                if (Add(fd, item) != -1)
-                    item.m_itemId++;
-                else
-                    delete fd;
-
-                cont = dir.GetNext(&f);
-            }
-
-            // Tokenize the wildcard string, so we can handle more than 1
-            // search pattern in a wildcard.
-            wxStringTokenizer tokenWild(m_wild, wxT(";"));
-            while ( tokenWild.HasMoreTokens() )
-            {
-                cont = dir.GetFirst(&f, tokenWild.GetNextToken(),
-                                        wxDIR_FILES | hiddenFlag);
-                while (cont)
-                {
-                    wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
-                    if (Add(fd, item) != -1)
-                        item.m_itemId++;
-                    else
-                        delete fd;
-
-                    cont = dir.GetNext(&f);
-                }
-            }
-        }
-    }
-
-    SortItems(m_sort_field, m_sort_forward);
-}
-
-void wxFileListCtrl::SetWild( const wxString &wild )
-{
-    if (wild.Find(wxT('|')) != wxNOT_FOUND)
-        return;
-
-    m_wild = wild;
-    UpdateFiles();
-}
-
-void wxFileListCtrl::MakeDir()
-{
-    wxString new_name( _("NewName") );
-    wxString path( m_dirName );
-    path += wxFILE_SEP_PATH;
-    path += new_name;
-    if (wxFileExists(path))
-    {
-        // try NewName0, NewName1 etc.
-        int i = 0;
-        do {
-            new_name = _("NewName");
-            wxString num;
-            num.Printf( wxT("%d"), i );
-            new_name += num;
-
-            path = m_dirName;
-            path += wxFILE_SEP_PATH;
-            path += new_name;
-            i++;
-        } while (wxFileExists(path));
-    }
-
-    wxLogNull log;
-    if (!wxMkdir(path))
-    {
-        wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        return;
-    }
-
-    wxFileData *fd = new wxFileData( path, new_name, wxFileData::is_dir, wxFileIconsTable::folder );
-    wxListItem item;
-    item.m_itemId = 0;
-    item.m_col = 0;
-    long itemid = Add( fd, item );
-
-    if (itemid != -1)
-    {
-        SortItems(m_sort_field, m_sort_forward);
-        itemid = FindItem( 0, wxPtrToUInt(fd) );
-        EnsureVisible( itemid );
-        EditLabel( itemid );
-    }
-    else
-        delete fd;
-}
-
-void wxFileListCtrl::GoToParentDir()
-{
-    if (!IsTopMostDir(m_dirName))
-    {
-        size_t len = m_dirName.length();
-        if (wxEndsWithPathSeparator(m_dirName))
-            m_dirName.Remove( len-1, 1 );
-        wxString fname( wxFileNameFromPath(m_dirName) );
-        m_dirName = wxPathOnly( m_dirName );
-#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
-        if (!m_dirName.empty())
-        {
-            if (m_dirName.Last() == wxT('.'))
-                m_dirName = wxEmptyString;
-        }
-#elif defined(__UNIX__)
-        if (m_dirName.empty())
-            m_dirName = wxT("/");
-#endif
-        UpdateFiles();
-        long id = FindItem( 0, fname );
-        if (id != wxNOT_FOUND)
-        {
-            SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-            EnsureVisible( id );
-        }
-    }
-}
-
-void wxFileListCtrl::GoToHomeDir()
-{
-    wxString s = wxGetUserHome( wxString() );
-    GoToDir(s);
-}
-
-void wxFileListCtrl::GoToDir( const wxString &dir )
-{
-    if (!wxDirExists(dir)) return;
-
-    m_dirName = dir;
-    UpdateFiles();
-
-    SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-
-    EnsureVisible( 0 );
-}
-
-void wxFileListCtrl::FreeItemData(wxListItem& item)
-{
-    if ( item.m_data )
-    {
-        wxFileData *fd = (wxFileData*)item.m_data;
-        delete fd;
-
-        item.m_data = 0;
-    }
-}
-
-void wxFileListCtrl::OnListDeleteItem( wxListEvent &event )
-{
-    FreeItemData(event.m_item);
-}
-
-void wxFileListCtrl::OnListDeleteAllItems( wxListEvent & WXUNUSED(event) )
-{
-    FreeAllItemsData();
-}
-
-void wxFileListCtrl::FreeAllItemsData()
-{
-    wxListItem item;
-    item.m_mask = wxLIST_MASK_DATA;
-
-    item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL );
-    while ( item.m_itemId != -1 )
-    {
-        GetItem( item );
-        FreeItemData(item);
-        item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
-    }
-}
-
-void wxFileListCtrl::OnListEndLabelEdit( wxListEvent &event )
-{
-    wxFileData *fd = (wxFileData*)event.m_item.m_data;
-    wxASSERT( fd );
-
-    if ((event.GetLabel().empty()) ||
-        (event.GetLabel() == wxT(".")) ||
-        (event.GetLabel() == wxT("..")) ||
-        (event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
-    {
-        wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        event.Veto();
-        return;
-    }
-
-    wxString new_name( wxPathOnly( fd->GetFilePath() ) );
-    new_name += wxFILE_SEP_PATH;
-    new_name += event.GetLabel();
-
-    wxLogNull log;
-
-    if (wxFileExists(new_name))
-    {
-        wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        event.Veto();
-    }
-
-    if (wxRenameFile(fd->GetFilePath(),new_name))
-    {
-        fd->SetNewName( new_name, event.GetLabel() );
-
-        SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-
-        UpdateItem( event.GetItem() );
-        EnsureVisible( event.GetItem() );
-    }
-    else
-    {
-        wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
-        dialog.ShowModal();
-        event.Veto();
-    }
-}
-
-void wxFileListCtrl::OnListColClick( wxListEvent &event )
-{
-    int col = event.GetColumn();
-
-    switch (col)
-    {
-        case wxFileData::FileList_Name :
-        case wxFileData::FileList_Size :
-        case wxFileData::FileList_Type :
-        case wxFileData::FileList_Time : break;
-        default : return;
-    }
-
-    if ((wxFileData::fileListFieldType)col == m_sort_field)
-        m_sort_forward = !m_sort_forward;
-    else
-        m_sort_field = (wxFileData::fileListFieldType)col;
-
-    SortItems(m_sort_field, m_sort_forward);
-}
-
-void wxFileListCtrl::SortItems(wxFileData::fileListFieldType field, bool forward)
-{
-    m_sort_field = field;
-    m_sort_forward = forward;
-    const long sort_dir = forward ? 1 : -1;
-
-    switch (m_sort_field)
-    {
-        case wxFileData::FileList_Size :
-            wxListCtrl::SortItems(wxFileDataSizeCompare, sort_dir);
-            break;
-
-        case wxFileData::FileList_Type :
-            wxListCtrl::SortItems(wxFileDataTypeCompare, sort_dir);
-            break;
-
-        case wxFileData::FileList_Time :
-            wxListCtrl::SortItems(wxFileDataTimeCompare, sort_dir);
-            break;
-
-        case wxFileData::FileList_Name :
-        default :
-            wxListCtrl::SortItems(wxFileDataNameCompare, sort_dir);
-            break;
-    }
-}
-
-wxFileListCtrl::~wxFileListCtrl()
-{
-    // Normally the data are freed via an EVT_LIST_DELETE_ALL_ITEMS event and
-    // wxFileListCtrl::OnListDeleteAllItems. But if the event is generated after
-    // the destruction of the wxFileListCtrl we need to free any data here:
-    FreeAllItemsData();
-}
-
-#define  ID_CHOICE        (wxID_FILECTRL + 1)
-#define  ID_TEXT          (wxID_FILECTRL + 2)
-#define  ID_FILELIST_CTRL (wxID_FILECTRL + 3)
-#define  ID_CHECK         (wxID_FILECTRL + 4)
-
-///////////////////////////////////////////////////////////////////////////////
-// wxGenericFileCtrl implementation
-///////////////////////////////////////////////////////////////////////////////
-
-IMPLEMENT_DYNAMIC_CLASS( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
-
-BEGIN_EVENT_TABLE( wxGenericFileCtrl, wxNavigationEnabled<wxControl> )
-    EVT_LIST_ITEM_SELECTED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnSelected )
-    EVT_LIST_ITEM_ACTIVATED( ID_FILELIST_CTRL, wxGenericFileCtrl::OnActivated )
-    EVT_CHOICE( ID_CHOICE, wxGenericFileCtrl::OnChoiceFilter )
-    EVT_TEXT_ENTER( ID_TEXT, wxGenericFileCtrl::OnTextEnter )
-    EVT_TEXT( ID_TEXT, wxGenericFileCtrl::OnTextChange )
-    EVT_CHECKBOX( ID_CHECK, wxGenericFileCtrl::OnCheck )
-END_EVENT_TABLE()
-
-bool wxGenericFileCtrl::Create( wxWindow *parent,
-                                wxWindowID id,
-                                const wxString& defaultDirectory,
-                                const wxString& defaultFileName,
-                                const wxString& wildCard,
-                                long style,
-                                const wxPoint& pos,
-                                const wxSize& size,
-                                const wxString& name )
-{
-    this->m_style = style;
-    m_inSelected = false;
-    m_noSelChgEvent = false;
-    m_check = NULL;
-
-    // check that the styles are not contradictory
-    wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_OPEN ) ),
-                  wxT( "can't specify both wxFC_SAVE and wxFC_OPEN at once" ) );
-
-    wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_MULTIPLE ) ),
-                  wxT( "wxFC_MULTIPLE can't be used with wxFC_SAVE" ) );
-
-    wxNavigationEnabled<wxControl>::Create( parent, id,
-                                            pos, size,
-                                            wxTAB_TRAVERSAL,
-                                            wxDefaultValidator,
-                                            name );
-
-    m_dir = defaultDirectory;
-
-    m_ignoreChanges = true;
-
-    if ( ( m_dir.empty() ) || ( m_dir == wxT( "." ) ) )
-    {
-        m_dir = wxGetCwd();
-        if ( m_dir.empty() )
-            m_dir = wxFILE_SEP_PATH;
-    }
-
-    const size_t len = m_dir.length();
-    if ( ( len > 1 ) && ( wxEndsWithPathSeparator( m_dir ) ) )
-        m_dir.Remove( len - 1, 1 );
-
-    m_filterExtension = wxEmptyString;
-
-    // layout
-
-    const bool is_pda = ( wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA );
-
-    wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
-    if ( is_pda )
-        staticsizer->Add( new wxStaticText( this, wxID_ANY, _( "Current directory:" ) ),
-                          wxSizerFlags().DoubleBorder(wxRIGHT) );
-    m_static = new wxStaticText( this, wxID_ANY, m_dir );
-    staticsizer->Add( m_static, 1 );
-    mainsizer->Add( staticsizer, wxSizerFlags().Expand().Border());
-
-    long style2 = wxLC_LIST;
-    if ( !( m_style & wxFC_MULTIPLE ) )
-        style2 |= wxLC_SINGLE_SEL;
-
-#ifdef __WXWINCE__
-    style2 |= wxSIMPLE_BORDER;
-#else
-    style2 |= wxSUNKEN_BORDER;
-#endif
-
-    m_list = new wxFileListCtrl( this, ID_FILELIST_CTRL,
-                                 wxEmptyString, false,
-                                 wxDefaultPosition, wxSize( 400, 140 ),
-                                 style2 );
-
-    m_text = new wxTextCtrl( this, ID_TEXT, wxEmptyString,
-                             wxDefaultPosition, wxDefaultSize,
-                             wxTE_PROCESS_ENTER );
-    m_choice = new wxChoice( this, ID_CHOICE );
-
-    if ( is_pda )
-    {
-        // PDAs have a different screen layout
-        mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().HorzBorder() );
-
-        wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
-        textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().Border() );
-        textsizer->Add( m_choice, wxSizerFlags( 1 ).Centre().Border() );
-        mainsizer->Add( textsizer, wxSizerFlags().Expand() );
-
-    }
-    else // !is_pda
-    {
-        mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().Border() );
-        mainsizer->Add( m_text, wxSizerFlags().Expand().Border() );
-
-        wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
-        choicesizer->Add( m_choice, wxSizerFlags( 1 ).Centre() );
-
-        if ( !( m_style & wxFC_NOSHOWHIDDEN ) )
-        {
-            m_check = new wxCheckBox( this, ID_CHECK, _( "Show &hidden files" ) );
-            choicesizer->Add( m_check, wxSizerFlags().Centre().DoubleBorder(wxLEFT) );
-        }
-
-        mainsizer->Add( choicesizer, wxSizerFlags().Expand().Border() );
-    }
-
-    SetWildcard( wildCard );
-
-    SetAutoLayout( true );
-    SetSizer( mainsizer );
-
-    if ( !is_pda )
-    {
-        mainsizer->Fit( this );
-    }
-
-    m_list->GoToDir( m_dir );
-    UpdateControls();
-    m_text->SetValue( m_fileName );
-
-    m_ignoreChanges = false;
-
-    // must be after m_ignoreChanges = false
-    SetFilename( defaultFileName );
-
-    return true;
-}
-
-// NB: there is an unfortunate mismatch between wxFileName and wxFileDialog
-//     method names but our GetDirectory() does correspond to wxFileName::
-//     GetPath() while our GetPath() is wxFileName::GetFullPath()
-wxString wxGenericFileCtrl::GetPath() const
-{
-    wxASSERT_MSG ( !(m_style & wxFC_MULTIPLE), "use GetPaths() instead" );
-
-    return DoGetFileName().GetFullPath();
-}
-
-wxString wxGenericFileCtrl::GetFilename() const
-{
-    wxASSERT_MSG ( !(m_style & wxFC_MULTIPLE), "use GetFilenames() instead" );
-
-    return DoGetFileName().GetFullName();
-}
-
-wxString wxGenericFileCtrl::GetDirectory() const
-{
-    // don't check for wxFC_MULTIPLE here, this one is probably safe to call in
-    // any case as it can be always taken to mean "current directory"
-    return DoGetFileName().GetPath();
-}
-
-wxFileName wxGenericFileCtrl::DoGetFileName() const
-{
-    wxFileName fn;
-
-    wxString value = m_text->GetValue();
-    if ( value.empty() )
-    {
-        // nothing in the text control, get the selected file from the list
-        wxListItem item;
-        item.m_itemId = m_list->GetNextItem(-1, wxLIST_NEXT_ALL,
-                                            wxLIST_STATE_SELECTED);
-        m_list->GetItem(item);
-
-        fn.Assign(m_list->GetDir(), item.m_text);
-    }
-    else // user entered the value
-    {
-        // the path can be either absolute or relative
-        fn.Assign(value);
-        if ( fn.IsRelative() )
-            fn.MakeAbsolute(m_list->GetDir());
-    }
-
-    return fn;
-}
-
-// helper used in DoGetFilenames() and needed because Borland can't compile
-// operator?: inline
-static inline wxString GetFileNameOrPath(const wxFileName& fn, bool fullPath)
-{
-    return fullPath ? fn.GetFullPath() : fn.GetFullName();
-}
-
-void
-wxGenericFileCtrl::DoGetFilenames(wxArrayString& filenames, bool fullPath) const
-{
-    filenames.clear();
-
-    const wxString dir = m_list->GetDir();
-
-    const wxString value = m_text->GetValue();
-    if ( !value.empty() )
-    {
-        wxFileName fn(value);
-        if ( fn.IsRelative() )
-            fn.MakeAbsolute(dir);
-
-        filenames.push_back(GetFileNameOrPath(fn, fullPath));
-        return;
-    }
-
-    const int numSel = m_list->GetSelectedItemCount();
-    if ( !numSel )
-        return;
-
-    filenames.reserve(numSel);
-
-    wxListItem item;
-    item.m_mask = wxLIST_MASK_TEXT;
-    item.m_itemId = -1;
-    for ( ;; )
-    {
-        item.m_itemId = m_list->GetNextItem(item.m_itemId, wxLIST_NEXT_ALL,
-                                            wxLIST_STATE_SELECTED);
-
-        if ( item.m_itemId == -1 )
-            break;
-
-        m_list->GetItem(item);
-
-        const wxFileName fn(dir, item.m_text);
-        filenames.push_back(GetFileNameOrPath(fn, fullPath));
-    }
-}
-
-bool wxGenericFileCtrl::SetDirectory( const wxString& dir )
-{
-    m_ignoreChanges = true;
-    m_list->GoToDir( dir );
-    UpdateControls();
-    m_ignoreChanges = false;
-
-    return wxFileName( dir ).SameAs( m_list->GetDir() );
-}
-
-bool wxGenericFileCtrl::SetFilename( const wxString& name )
-{
-    const long item = m_list->FindItem( -1, name );
-
-    if ( item == -1 ) // file not found either because it doesn't exist or the
-        // current filter doesn't show it.
-        return false;
-
-    m_noSelChgEvent = true;
-
-    // Deselect selected items
-    {
-        const int numSelectedItems = m_list->GetSelectedItemCount();
-
-        if ( numSelectedItems > 0 )
-        {
-            long itemIndex = -1;
-
-            for ( ;; )
-            {
-                itemIndex = m_list->GetNextItem( itemIndex, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-                if ( itemIndex == -1 )
-                    break;
-
-                m_list->SetItemState( itemIndex, 0, wxLIST_STATE_SELECTED );
-            }
-        }
-    }
-
-    m_list->SetItemState( item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
-    m_list->EnsureVisible( item );
-
-    m_noSelChgEvent = false;
-
-    return true;
-}
-
-void wxGenericFileCtrl::DoSetFilterIndex( int filterindex )
-{
-    wxClientData *pcd = m_choice->GetClientObject( filterindex );
-    if ( !pcd )
-        return;
-
-    const wxString& str = ((static_cast<wxStringClientData *>(pcd))->GetData());
-    m_list->SetWild( str );
-    m_filterIndex = filterindex;
-    if ( str.Left( 2 ) == wxT( "*." ) )
-    {
-        m_filterExtension = str.Mid( 1 );
-        if ( m_filterExtension == wxT( ".*" ) )
-            m_filterExtension.clear();
-    }
-    else
-    {
-        m_filterExtension.clear();
-    }
-
-    GenerateFilterChangedEvent( this, this );
-}
-
-void wxGenericFileCtrl::SetWildcard( const wxString& wildCard )
-{
-    if ( wildCard.empty() || wildCard == wxFileSelectorDefaultWildcardStr )
-    {
-        m_wildCard = wxString::Format( _( "All files (%s)|%s" ),
-                                       wxFileSelectorDefaultWildcardStr,
-                                       wxFileSelectorDefaultWildcardStr );
-    }
-    else
-        m_wildCard = wildCard;
-
-    wxArrayString wildDescriptions, wildFilters;
-    const size_t count = wxParseCommonDialogsFilter( m_wildCard,
-                         wildDescriptions,
-                         wildFilters );
-    wxCHECK_RET( count, wxT( "wxFileDialog: bad wildcard string" ) );
-
-    m_choice->Clear();
-
-    for ( size_t n = 0; n < count; n++ )
-    {
-        m_choice->Append(wildDescriptions[n], new wxStringClientData(wildFilters[n]));
-    }
-
-    SetFilterIndex( 0 );
-}
-
-void wxGenericFileCtrl::SetFilterIndex( int filterindex )
-{
-    m_choice->SetSelection( filterindex );
-
-    DoSetFilterIndex( filterindex );
-}
-
-void wxGenericFileCtrl::OnChoiceFilter( wxCommandEvent &event )
-{
-    DoSetFilterIndex( ( int )event.GetInt() );
-}
-
-void wxGenericFileCtrl::OnCheck( wxCommandEvent &event )
-{
-    m_list->ShowHidden( event.GetInt() != 0 );
-}
-
-void wxGenericFileCtrl::OnActivated( wxListEvent &event )
-{
-    HandleAction( event.m_item.m_text );
-}
-
-void wxGenericFileCtrl::OnTextEnter( wxCommandEvent &WXUNUSED( event ) )
-{
-    HandleAction( m_text->GetValue() );
-}
-
-void wxGenericFileCtrl::OnTextChange( wxCommandEvent &WXUNUSED( event ) )
-{
-    if ( !m_ignoreChanges )
-    {
-        // Clear selections.  Otherwise when the user types in a value they may
-        // not get the file whose name they typed.
-        if ( m_list->GetSelectedItemCount() > 0 )
-        {
-            long item = m_list->GetNextItem( -1, wxLIST_NEXT_ALL,
-                                             wxLIST_STATE_SELECTED );
-            while ( item != -1 )
-            {
-                m_list->SetItemState( item, 0, wxLIST_STATE_SELECTED );
-                item = m_list->GetNextItem( item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-            }
-        }
-    }
-}
-
-void wxGenericFileCtrl::OnSelected( wxListEvent &event )
-{
-    if ( m_ignoreChanges )
-        return;
-
-    if ( m_inSelected )
-        return;
-
-    m_inSelected = true;
-    const wxString filename( event.m_item.m_text );
-
-#ifdef __WXWINCE__
-    // No double-click on most WinCE devices, so do action immediately.
-    HandleAction( filename );
-#else
-    if ( filename == wxT( ".." ) )
-    {
-        m_inSelected = false;
-        return;
-    }
-
-    wxString dir = m_list->GetDir();
-    if ( !IsTopMostDir( dir ) )
-        dir += wxFILE_SEP_PATH;
-    dir += filename;
-    if ( wxDirExists( dir ) )
-    {
-        m_inSelected = false;
-
-        return;
-    }
-
-
-    m_ignoreChanges = true;
-    m_text->SetValue( filename );
-
-    if ( m_list->GetSelectedItemCount() > 1 )
-    {
-        m_text->Clear();
-    }
-
-    if ( !m_noSelChgEvent )
-        GenerateSelectionChangedEvent( this, this );
-
-    m_ignoreChanges = false;
-#endif
-    m_inSelected = false;
-}
-
-void wxGenericFileCtrl::HandleAction( const wxString &fn )
-{
-    if ( m_ignoreChanges )
-        return;
-
-    wxString filename( fn );
-    if ( filename.empty() )
-    {
-        return;
-    }
-    if ( filename == wxT( "." ) ) return;
-
-    wxString dir = m_list->GetDir();
-
-    // "some/place/" means they want to chdir not try to load "place"
-    const bool want_dir = filename.Last() == wxFILE_SEP_PATH;
-    if ( want_dir )
-        filename = filename.RemoveLast();
-
-    if ( filename == wxT( ".." ) )
-    {
-        m_ignoreChanges = true;
-        m_list->GoToParentDir();
-
-        GenerateFolderChangedEvent( this, this );
-
-        UpdateControls();
-        m_ignoreChanges = false;
-        return;
-    }
-
-#ifdef __UNIX__
-    if ( filename == wxT( "~" ) )
-    {
-        m_ignoreChanges = true;
-        m_list->GoToHomeDir();
-
-        GenerateFolderChangedEvent( this, this );
-
-        UpdateControls();
-        m_ignoreChanges = false;
-        return;
-    }
-
-    if ( filename.BeforeFirst( wxT( '/' ) ) == wxT( "~" ) )
-    {
-        filename = wxString( wxGetUserHome() ) + filename.Remove( 0, 1 );
-    }
-#endif // __UNIX__
-
-    if ( !( m_style & wxFC_SAVE ) )
-    {
-        if ( ( filename.Find( wxT( '*' ) ) != wxNOT_FOUND ) ||
-                ( filename.Find( wxT( '?' ) ) != wxNOT_FOUND ) )
-        {
-            if ( filename.Find( wxFILE_SEP_PATH ) != wxNOT_FOUND )
-            {
-                wxMessageBox( _( "Illegal file specification." ),
-                              _( "Error" ), wxOK | wxICON_ERROR, this );
-                return;
-            }
-            m_list->SetWild( filename );
-            return;
-        }
-    }
-
-    if ( !IsTopMostDir( dir ) )
-        dir += wxFILE_SEP_PATH;
-    if ( !wxIsAbsolutePath( filename ) )
-    {
-        dir += filename;
-        filename = dir;
-    }
-
-    if ( wxDirExists( filename ) )
-    {
-        m_ignoreChanges = true;
-        m_list->GoToDir( filename );
-        UpdateControls();
-
-        GenerateFolderChangedEvent( this, this );
-
-        m_ignoreChanges = false;
-        return;
-    }
-
-    // they really wanted a dir, but it doesn't exist
-    if ( want_dir )
-    {
-        wxMessageBox( _( "Directory doesn't exist." ), _( "Error" ),
-                      wxOK | wxICON_ERROR, this );
-        return;
-    }
-
-    // append the default extension to the filename if it doesn't have any
-    //
-    // VZ: the logic of testing for !wxFileExists() only for the open file
-    //     dialog is not entirely clear to me, why don't we allow saving to a
-    //     file without extension as well?
-    if ( !( m_style & wxFC_OPEN ) || !wxFileExists( filename ) )
-    {
-        filename = wxFileDialogBase::AppendExtension( filename, m_filterExtension );
-        GenerateFileActivatedEvent( this, this, wxFileName( filename ).GetFullName() );
-        return;
-    }
-
-    GenerateFileActivatedEvent( this, this );
-}
-
-bool wxGenericFileCtrl::SetPath( const wxString& path )
-{
-    if ( !wxFileName::FileExists( ( path ) ) )
-        return false;
-
-    wxString ext;
-    wxFileName::SplitPath( path, &m_dir, &m_fileName, &ext );
-    if ( !ext.empty() )
-    {
-        m_fileName += wxT( "." );
-        m_fileName += ext;
-    }
-
-    SetDirectory( m_dir );
-    SetFilename( m_fileName );
-
-    return true;
-}
-
-void wxGenericFileCtrl::GetPaths( wxArrayString& paths ) const
-{
-    DoGetFilenames( paths, true );
-}
-
-void wxGenericFileCtrl::GetFilenames( wxArrayString& files ) const
-{
-    DoGetFilenames( files, false );
-}
-
-void wxGenericFileCtrl::UpdateControls()
-{
-    const wxString dir = m_list->GetDir();
-    m_static->SetLabel( dir );
-}
-
-void wxGenericFileCtrl::GoToParentDir()
-{
-    m_list->GoToParentDir();
-    UpdateControls();
-}
-
-void wxGenericFileCtrl::GoToHomeDir()
-{
-    m_list->GoToHomeDir();
-    UpdateControls();
-}
-
-#endif // wxUSE_FILECTRL
diff --git a/Source/3rd Party/wx/src/generic/filepickerg.cpp b/Source/3rd Party/wx/src/generic/filepickerg.cpp
index 3779dc4ff..96eb79916 100644
--- a/Source/3rd Party/wx/src/generic/filepickerg.cpp	
+++ b/Source/3rd Party/wx/src/generic/filepickerg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filepickerg.cpp 52835 2008-03-26 15:49:08Z JS $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -26,11 +26,8 @@
 
 #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
 
-#include "wx/filename.h"
 #include "wx/filepicker.h"
 
-#include "wx/scopedptr.h"
-
 
 // ============================================================================
 // implementation
@@ -43,38 +40,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericDirButton, wxButton)
 // wxGenericFileButton
 // ----------------------------------------------------------------------------
 
-bool wxGenericFileDirButton::Create(wxWindow *parent,
-                                    wxWindowID id,
-                                    const wxString& label,
-                                    const wxString& path,
-                                    const wxString& message,
-                                    const wxString& wildcard,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    const wxValidator& validator,
-                                    const wxString& name)
+bool wxGenericFileDirButton::Create( wxWindow *parent, wxWindowID id,
+                        const wxString &label, const wxString &path,
+                        const wxString &message, const wxString &wildcard,
+                        const wxPoint &pos, const wxSize &size, long style,
+                        const wxValidator& validator, const wxString &name)
 {
-    m_pickerStyle = style;
-
-    // If the special wxPB_SMALL flag is used, ignore the provided label and
-    // use the shortest possible label and the smallest possible button fitting
-    // it.
-    long styleButton = 0;
-    wxString labelButton;
-    if ( m_pickerStyle & wxPB_SMALL )
-    {
-        labelButton = _("...");
-        styleButton = wxBU_EXACTFIT;
-    }
-    else
-    {
-        labelButton = label;
-    }
-
     // create this button
-    if ( !wxButton::Create(parent, id, labelButton,
-                           pos, size, styleButton, validator, name) )
+    if (!wxButton::Create(parent, id, label, pos, size, style,
+                          validator, name))
     {
         wxFAIL_MSG( wxT("wxGenericFileButton creation failed") );
         return false;
@@ -95,80 +69,18 @@ bool wxGenericFileDirButton::Create(wxWindow *parent,
 
 void wxGenericFileDirButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
-    wxScopedPtr<wxDialog> p(CreateDialog());
+    wxDialog *p = CreateDialog();
     if (p->ShowModal() == wxID_OK)
     {
         // save updated path in m_path
-        UpdatePathFromDialog(p.get());
+        UpdatePathFromDialog(p);
 
         // fire an event
         wxFileDirPickerEvent event(GetEventType(), this, GetId(), m_path);
         GetEventHandler()->ProcessEvent(event);
     }
-}
 
-void wxGenericFileDirButton::SetInitialDirectory(const wxString& dir)
-{
-    m_initialDir = dir;
-}
-
-// ----------------------------------------------------------------------------
-// wxGenericFileutton
-// ----------------------------------------------------------------------------
-
-void
-wxGenericFileButton::DoSetInitialDirectory(wxFileDialog* dialog,
-                                           const wxString& dir)
-{
-    if ( m_path.find_first_of(wxFileName::GetPathSeparators()) ==
-            wxString::npos )
-    {
-        dialog->SetDirectory(dir);
-    }
-}
-
-wxDialog *wxGenericFileButton::CreateDialog()
-{
-    wxFileDialog* const dialog = new wxFileDialog
-                                     (
-                                        GetDialogParent(),
-                                        m_message,
-                                        wxEmptyString,
-                                        wxEmptyString,
-                                        m_wildcard,
-                                        GetDialogStyle()
-                                     );
-
-    // If there is no default file or if it doesn't have any path, use the
-    // explicitly set initial directory.
-    //
-    // Notice that it is important to call this before SetPath() below as if we
-    // do have m_initialDir and no directory in m_path, we need to interpret
-    // the path as being relative with respect to m_initialDir.
-    if ( !m_initialDir.empty() )
-        DoSetInitialDirectory(dialog, m_initialDir);
-
-    // This sets both the default file name and the default directory of the
-    // dialog if m_path contains directory part.
-    dialog->SetPath(m_path);
-
-    return dialog;
-}
-
-// ----------------------------------------------------------------------------
-// wxGenericDirButton
-// ----------------------------------------------------------------------------
-
-wxDialog *wxGenericDirButton::CreateDialog()
-{
-    wxDirDialog* const dialog = new wxDirDialog
-                                    (
-                                        GetDialogParent(),
-                                        m_message,
-                                        m_path.empty() ? m_initialDir : m_path,
-                                        GetDialogStyle()
-                                    );
-    return dialog;
+    wxDELETE(p);
 }
 
 #endif      // wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL
diff --git a/Source/3rd Party/wx/src/generic/fontpickerg.cpp b/Source/3rd Party/wx/src/generic/fontpickerg.cpp
index d26865af1..e01bcd544 100644
--- a/Source/3rd Party/wx/src/generic/fontpickerg.cpp	
+++ b/Source/3rd Party/wx/src/generic/fontpickerg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Francesco Montorsi
 // Modified by:
 // Created:     15/04/2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontpickerg.cpp 52835 2008-03-26 15:49:08Z JS $
 // Copyright:   (c) Francesco Montorsi
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -35,6 +35,7 @@
 // implementation
 // ============================================================================
 
+wxFontData wxGenericFontButton::ms_data;
 IMPLEMENT_DYNAMIC_CLASS(wxGenericFontButton, wxButton)
 
 // ----------------------------------------------------------------------------
@@ -47,8 +48,8 @@ bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id,
                         const wxValidator& validator, const wxString &name)
 {
     wxString label = (style & wxFNTP_FONTDESC_AS_LABEL) ?
-                        wxString() : // label will be updated by UpdateFont
-                        _("Choose font");
+                        wxEmptyString : // label will be updated by UpdateFont
+                        wxT("Choose font");
 
     // create this button
     if (!wxButton::Create( parent, id, label, pos,
@@ -72,22 +73,22 @@ bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id,
 
 void wxGenericFontButton::InitFontData()
 {
-    m_data.SetAllowSymbols(true);
-    m_data.SetColour(*wxBLACK);
-    m_data.EnableEffects(true);
+    ms_data.SetAllowSymbols(true);
+    ms_data.SetColour(*wxBLACK);
+    ms_data.EnableEffects(true);
 }
 
 void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 {
-    // update the wxFontData to be shown in the dialog
-    m_data.SetInitialFont(m_selectedFont);
+    // update the wxFontData to be shown in the the dialog
+    ms_data.SetInitialFont(m_selectedFont);
 
     // create the font dialog and display it
-    wxFontDialog dlg(this, m_data);
+    wxFontDialog dlg(this, ms_data);
     if (dlg.ShowModal() == wxID_OK)
     {
-        m_data = dlg.GetFontData();
-        SetSelectedFont(m_data.GetChosenFont());
+        ms_data = dlg.GetFontData();
+        SetSelectedFont(ms_data.GetChosenFont());
 
         // fire an event
         wxFontPickerEvent event(this, GetId(), m_selectedFont);
@@ -97,10 +98,10 @@ void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 
 void wxGenericFontButton::UpdateFont()
 {
-    if ( !m_selectedFont.IsOk() )
+    if ( !m_selectedFont.Ok() )
         return;
 
-    SetForegroundColour(m_data.GetColour());
+    SetForegroundColour(ms_data.GetColour());
 
     if (HasFlag(wxFNTP_USEFONT_FOR_LABEL))
     {
diff --git a/Source/3rd Party/wx/src/generic/fswatcherg.cpp b/Source/3rd Party/wx/src/generic/fswatcherg.cpp
deleted file mode 100644
index 91c4fe9fe..000000000
--- a/Source/3rd Party/wx/src/generic/fswatcherg.cpp	
+++ /dev/null
@@ -1,22 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/fswatcherg.cpp
-// Purpose:     wxPollingFileSystemWatcher
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FSWATCHER
-
-#include "wx/fswatcher.h"
-
-#endif // wxUSE_FSWATCHER
diff --git a/Source/3rd Party/wx/src/generic/graphicc.cpp b/Source/3rd Party/wx/src/generic/graphicc.cpp
index 71c31814b..75744b086 100644
--- a/Source/3rd Party/wx/src/generic/graphicc.cpp	
+++ b/Source/3rd Party/wx/src/generic/graphicc.cpp	
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: graphicc.cpp 66928 2011-02-16 23:31:13Z JS $
 // Copyright:   (c) 2006 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,35 +12,62 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
+#pragma hdrstop
 #endif
 
 #if wxUSE_GRAPHICS_CONTEXT
 
+#ifndef WX_PRECOMP
+#include "wx/image.h"
+#include "wx/window.h"
+#include "wx/dc.h"
+#include "wx/utils.h"
+#include "wx/dialog.h"
+#include "wx/app.h"
+#include "wx/bitmap.h"
+#include "wx/dcmemory.h"
+#include "wx/log.h"
+#include "wx/icon.h"
+#include "wx/dcprint.h"
+#include "wx/module.h"
+#endif
+
+#ifdef __WXGTK__
+#include "wx/gtk/win_gtk.h"
+#endif
+
 #include "wx/graphics.h"
+#include "wx/rawbmp.h"
 
 #if wxUSE_CAIRO
 
-// keep cairo.h from defining dllimport as we're defining the symbols inside
-// the wx dll in order to load them dynamically.
-#define cairo_public 
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
 
-#include "wx/cairo.h"
+const double RAD2DEG = 180.0 / M_PI;
 
-#ifndef WX_PRECOMP
-    #include "wx/bitmap.h"
-    #include "wx/icon.h"
-    #include "wx/dcclient.h"
-    #include "wx/dcmemory.h"
-    #include "wx/dcprint.h"
-    #include "wx/window.h"
-#endif
+//-----------------------------------------------------------------------------
+// Local functions
+//-----------------------------------------------------------------------------
 
-#include "wx/private/graphics.h"
-#include "wx/rawbmp.h"
-#include "wx/vector.h"
+static inline double dmin(double a, double b)
+{
+    return a < b ? a : b;
+}
+static inline double dmax(double a, double b)
+{
+    return a > b ? a : b;
+}
 
-using namespace std;
+static inline double DegToRad(double deg)
+{
+    return (deg * M_PI) / 180.0;
+}
+static inline double RadToDeg(double deg)
+{
+    return (deg * 180.0) / M_PI;
+}
 
 //-----------------------------------------------------------------------------
 // device context implementation
@@ -71,24 +98,10 @@ using namespace std;
 #include <cairo.h>
 #ifdef __WXMSW__
 #include <cairo-win32.h>
-// Notice that the order is important: cairo-win32.h includes windows.h which
-// pollutes the global name space with macros so include our own header which
-// #undefines them after it.
-#include "wx/msw/private.h"
 #endif
 
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
-#include "wx/fontutil.h"
-#ifndef __WXGTK3__
-#include "wx/gtk/dc.h"
-#endif
-#endif
-
-#ifdef __WXMAC__
-#include "wx/osx/private.h"
-#include <cairo-quartz.h>
-#include <cairo-atsui.h>
 #endif
 
 class WXDLLIMPEXP_CORE wxCairoPathData : public wxGraphicsPathData
@@ -132,7 +145,7 @@ public :
 
     /*
 
-    // appends a rectangle as a new closed subpath
+    // appends a rectangle as a new closed subpath 
     virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) ;
     // appends an ellipsis as a new closed subpath fitting the passed rectangle
     virtual void AddEllipsis( wxDouble x, wxDouble y, wxDouble w , wxDouble h ) ;
@@ -153,7 +166,7 @@ public :
     // gets the bounding box enclosing all points (possibly including control points)
     virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const;
 
-    virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxWINDING_RULE) const;
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE) const;
 
 private :
     cairo_t* m_pathContext;
@@ -171,13 +184,13 @@ public :
     virtual void Concat( const wxGraphicsMatrixData *t );
 
     // sets the matrix to the respective values
-    virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
+    virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
         wxDouble tx=0.0, wxDouble ty=0.0);
 
     // gets the component valuess of the matrix
     virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
                      wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
-
+       
     // makes this the inverse matrix
     virtual void Invert();
 
@@ -216,44 +229,7 @@ private:
     cairo_matrix_t m_matrix ;
 } ;
 
-// Common base class for pens and brushes.
-class wxCairoPenBrushBaseData : public wxGraphicsObjectRefData
-{
-public:
-    wxCairoPenBrushBaseData(wxGraphicsRenderer* renderer,
-                            const wxColour& col,
-                            bool isTransparent);
-    virtual ~wxCairoPenBrushBaseData();
-
-    virtual void Apply( wxGraphicsContext* context );
-
-protected:
-    // Call this to use the given bitmap as stipple. Bitmap must be non-null
-    // and valid.
-    void InitStipple(wxBitmap* bmp);
-
-    // Call this to use the given hatch style. Hatch style must be valid.
-    void InitHatch(wxHatchStyle hatchStyle);
-
-
-    double m_red;
-    double m_green;
-    double m_blue;
-    double m_alpha;
-
-    cairo_pattern_t* m_pattern;
-    class wxCairoBitmapData* m_bmpdata;
-
-private:
-    // Called once to allocate m_pattern if needed.
-    void InitHatchPattern(cairo_t* ctext);
-
-    wxHatchStyle m_hatchStyle;
-
-    wxDECLARE_NO_COPY_CLASS(wxCairoPenBrushBaseData);
-};
-
-class WXDLLIMPEXP_CORE wxCairoPenData : public wxCairoPenBrushBaseData
+class WXDLLIMPEXP_CORE wxCairoPenData : public wxGraphicsObjectRefData
 {
 public:
     wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen );
@@ -266,7 +242,12 @@ public:
 
 private :
     double m_width;
-
+    
+    double m_red;
+    double m_green;
+    double m_blue;
+    double m_alpha;
+    
     cairo_line_cap_t m_cap;
     cairo_line_join_t m_join;
 
@@ -274,106 +255,62 @@ private :
     const double *m_lengths;
     double *m_userLengths;
 
-    wxDECLARE_NO_COPY_CLASS(wxCairoPenData);
+    wxPen m_pen;
 };
 
-class WXDLLIMPEXP_CORE wxCairoBrushData : public wxCairoPenBrushBaseData
+class WXDLLIMPEXP_CORE wxCairoBrushData : public wxGraphicsObjectRefData
 {
 public:
     wxCairoBrushData( wxGraphicsRenderer* renderer );
     wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
+    ~wxCairoBrushData ();
 
-    void CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                                   wxDouble x2, wxDouble y2,
-                                   const wxGraphicsGradientStops& stops);
-    void CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                                   wxDouble xc, wxDouble yc, wxDouble radius,
-                                   const wxGraphicsGradientStops& stops);
+    virtual void Apply( wxGraphicsContext* context );
+    void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+        const wxColour&c1, const wxColour&c2 );
+    void CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor );
 
 protected:
     virtual void Init();
 
-    // common part of Create{Linear,Radial}GradientBrush()
-    void AddGradientStops(const wxGraphicsGradientStops& stops);
+private :
+    double m_red;
+    double m_green;
+    double m_blue;
+    double m_alpha;
+
+    cairo_pattern_t* m_brushPattern;
 };
 
 class wxCairoFontData : public wxGraphicsObjectRefData
 {
 public:
     wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
-    wxCairoFontData(wxGraphicsRenderer* renderer,
-                    double sizeInPixels,
-                    const wxString& facename,
-                    int flags,
-                    const wxColour& col);
     ~wxCairoFontData();
 
-    virtual bool Apply( wxGraphicsContext* context );
-#ifdef __WXGTK__
-    const wxFont& GetFont() const { return m_wxfont; }
-#endif
+    virtual void Apply( wxGraphicsContext* context );
 private :
-    void InitColour(const wxColour& col);
-    void InitFontComponents(const wxString& facename,
-                            cairo_font_slant_t slant,
-                            cairo_font_weight_t weight);
-
+    wxCharBuffer m_fontName;
     double m_size;
+    cairo_font_slant_t m_slant;
+    cairo_font_weight_t m_weight;
     double m_red;
     double m_green;
     double m_blue;
     double m_alpha;
-#ifdef __WXMAC__
-    cairo_font_face_t *m_font;
-#elif defined(__WXGTK__)
-    wxFont m_wxfont;
-#endif
-
-    // These members are used when the font is created from its face name and
-    // flags (and not from wxFont) and also even when creating it from wxFont
-    // on the platforms not covered above.
-    //
-    // Notice that we can't use cairo_font_face_t instead of storing those,
-    // even though it would be simpler and need less #ifdefs, because
-    // cairo_toy_font_face_create() that we'd need to create it is only
-    // available in Cairo 1.8 and we require just 1.2 currently. If we do drop
-    // support for < 1.8 versions in the future it would be definitely better
-    // to use cairo_toy_font_face_create() instead.
-    wxCharBuffer m_fontName;
-    cairo_font_slant_t m_slant;
-    cairo_font_weight_t m_weight;
 };
 
-class wxCairoBitmapData : public wxGraphicsBitmapData
+class wxCairoBitmapData : public wxGraphicsObjectRefData
 {
 public:
     wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp );
-#if wxUSE_IMAGE
-    wxCairoBitmapData(wxGraphicsRenderer* renderer, const wxImage& image);
-#endif // wxUSE_IMAGE
-    wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap );
     ~wxCairoBitmapData();
 
     virtual cairo_surface_t* GetCairoSurface() { return m_surface; }
     virtual cairo_pattern_t* GetCairoPattern() { return m_pattern; }
-    virtual void* GetNativeBitmap() const { return m_surface; }
     virtual wxSize GetSize() { return wxSize(m_width, m_height); }
-
-#if wxUSE_IMAGE
-    wxImage ConvertToImage() const;
-#endif // wxUSE_IMAGE
-
 private :
-    // Allocate m_buffer for the bitmap of the given size in the given format.
-    //
-    // Returns the stride used for the buffer.
-    int InitBuffer(int width, int height, cairo_format_t format);
-
-    // Really create the surface using the buffer (which was supposed to be
-    // filled since InitBuffer() call).
-    void InitSurface(cairo_format_t format, int stride);
-
-
     cairo_surface_t* m_surface;
     cairo_pattern_t* m_pattern;
     int m_width;
@@ -383,44 +320,22 @@ private :
 
 class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext
 {
+    DECLARE_NO_COPY_CLASS(wxCairoContext)
+
 public:
     wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc );
-    wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc );
-    wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc );
-#ifdef __WXGTK__
-    wxCairoContext( wxGraphicsRenderer* renderer, GdkWindow *window );
-#endif
 #ifdef __WXMSW__
     wxCairoContext( wxGraphicsRenderer* renderer, HDC context );
+#endif
+#ifdef __WXGTK__
+    wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable );
 #endif
     wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context );
     wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window);
-
-    // If this ctor is used, Init() must be called by the derived class later.
-    wxCairoContext( wxGraphicsRenderer* renderer );
-
+    wxCairoContext();
     virtual ~wxCairoContext();
 
-    virtual bool ShouldOffset() const
-    {
-        if ( !m_enableOffset )
-            return false;
-        
-        int penwidth = 0 ;
-        if ( !m_pen.IsNull() )
-        {
-            penwidth = (int)((wxCairoPenData*)m_pen.GetRefData())->GetWidth();
-            if ( penwidth == 0 )
-                penwidth = 1;
-        }
-        return ( penwidth % 2 ) == 1;
-    }
-
     virtual void Clip( const wxRegion &region );
-#ifdef __WXMSW__
-    cairo_surface_t* m_mswSurface;
-    WindowHDC m_mswWindowHDC;
-#endif
 
     // clips drawings to the rect
     virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
@@ -430,18 +345,8 @@ public:
 
     virtual void * GetNativeContext();
 
-    virtual bool SetAntialiasMode(wxAntialiasMode antialias);
-
-    virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation);
-
-    virtual bool SetCompositionMode(wxCompositionMode op);
-
-    virtual void BeginLayer(wxDouble opacity);
-
-    virtual void EndLayer();
-
     virtual void StrokePath( const wxGraphicsPath& p );
-    virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxWINDING_RULE );
+    virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxWINDING_RULE );
 
     virtual void Translate( wxDouble dx , wxDouble dy );
     virtual void Scale( wxDouble xScale , wxDouble yScale );
@@ -456,191 +361,24 @@ public:
     // gets the matrix of this context
     virtual wxGraphicsMatrix GetTransform() const;
 
-    virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+    void DrawGraphicsBitmapInternal( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
     virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
     virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
     virtual void PushState();
     virtual void PopState();
 
+    virtual void DrawText( const wxString &str, wxDouble x, wxDouble y);
     virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
                                 wxDouble *descent, wxDouble *externalLeading ) const;
     virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;
 
-protected:
-    virtual void DoDrawText( const wxString &str, wxDouble x, wxDouble y );
-
-    void Init(cairo_t *context);
-
 private:
     cairo_t* m_context;
-
-    wxVector<float> m_layerOpacities;
-
-    wxDECLARE_NO_COPY_CLASS(wxCairoContext);
+#ifdef __WXMSW__
+    cairo_surface_t* m_mswSurface;
+#endif
 };
 
-#if wxUSE_IMAGE
-// ----------------------------------------------------------------------------
-// wxCairoImageContext: context associated with a wxImage.
-// ----------------------------------------------------------------------------
-
-class wxCairoImageContext : public wxCairoContext
-{
-public:
-    wxCairoImageContext(wxGraphicsRenderer* renderer, wxImage& image) :
-        wxCairoContext(renderer),
-        m_image(image),
-        m_data(renderer, image)
-    {
-        Init(cairo_create(m_data.GetCairoSurface()));
-    }
-
-    virtual ~wxCairoImageContext()
-    {
-        m_image = m_data.ConvertToImage();
-    }
-
-private:
-    wxImage& m_image;
-    wxCairoBitmapData m_data;
-
-    wxDECLARE_NO_COPY_CLASS(wxCairoImageContext);
-};
-#endif // wxUSE_IMAGE
-
-// ----------------------------------------------------------------------------
-// wxCairoPenBrushBaseData implementation
-//-----------------------------------------------------------------------------
-
-wxCairoPenBrushBaseData::wxCairoPenBrushBaseData(wxGraphicsRenderer* renderer,
-                                                 const wxColour& col,
-                                                 bool isTransparent)
-    : wxGraphicsObjectRefData(renderer)
-{
-    m_hatchStyle = wxHATCHSTYLE_INVALID;
-    m_pattern = NULL;
-    m_bmpdata = NULL;
-
-    if ( isTransparent )
-    {
-        m_red =
-        m_green =
-        m_blue =
-        m_alpha = 0;
-    }
-    else // non-transparent
-    {
-        m_red = col.Red()/255.0;
-        m_green = col.Green()/255.0;
-        m_blue = col.Blue()/255.0;
-        m_alpha = col.Alpha()/255.0;
-    }
-}
-
-wxCairoPenBrushBaseData::~wxCairoPenBrushBaseData()
-{
-    if (m_bmpdata)
-    {
-        // Deleting the bitmap data also deletes the pattern referenced by
-        // m_pattern, so set it to NULL to avoid deleting it twice.
-        delete m_bmpdata;
-        m_pattern = NULL;
-    }
-    if (m_pattern)
-        cairo_pattern_destroy(m_pattern);
-}
-
-void wxCairoPenBrushBaseData::InitHatchPattern(cairo_t* ctext)
-{
-    cairo_surface_t* const
-        surface = cairo_surface_create_similar(
-                    cairo_get_target(ctext), CAIRO_CONTENT_COLOR_ALPHA, 10, 10
-                );
-
-    cairo_t* const cr = cairo_create(surface);
-    cairo_set_line_cap(cr, CAIRO_LINE_CAP_SQUARE);
-    cairo_set_line_width(cr, 1);
-    cairo_set_line_join(cr,CAIRO_LINE_JOIN_MITER);
-
-    switch ( m_hatchStyle )
-    {
-        case wxHATCHSTYLE_CROSS:
-            cairo_move_to(cr, 5, 0);
-            cairo_line_to(cr, 5, 10);
-            cairo_move_to(cr, 0, 5);
-            cairo_line_to(cr, 10, 5);
-            break;
-
-        case wxHATCHSTYLE_BDIAGONAL:
-            cairo_move_to(cr, 0, 10);
-            cairo_line_to(cr, 10, 0);
-            break;
-
-        case wxHATCHSTYLE_FDIAGONAL:
-            cairo_move_to(cr, 0, 0);
-            cairo_line_to(cr, 10, 10);
-            break;
-
-        case wxHATCHSTYLE_CROSSDIAG:
-            cairo_move_to(cr, 0, 0);
-            cairo_line_to(cr, 10, 10);
-            cairo_move_to(cr, 10, 0);
-            cairo_line_to(cr, 0, 10);
-            break;
-
-        case wxHATCHSTYLE_HORIZONTAL:
-            cairo_move_to(cr, 0, 5);
-            cairo_line_to(cr, 10, 5);
-            break;
-
-        case wxHATCHSTYLE_VERTICAL:
-            cairo_move_to(cr, 5, 0);
-            cairo_line_to(cr, 5, 10);
-            break;
-
-        default:
-            wxFAIL_MSG(wxS("Invalid hatch pattern style."));
-    }
-
-    cairo_set_source_rgba(cr, m_red, m_green, m_blue, m_alpha);
-    cairo_stroke(cr);
-
-    cairo_destroy(cr);
-
-    m_pattern = cairo_pattern_create_for_surface(surface);
-    cairo_surface_destroy(surface);
-    cairo_pattern_set_extend(m_pattern, CAIRO_EXTEND_REPEAT);
-}
-
-void wxCairoPenBrushBaseData::InitStipple(wxBitmap* bmp)
-{
-    wxCHECK_RET( bmp && bmp->IsOk(), wxS("Invalid stippled bitmap") );
-
-    m_bmpdata = new wxCairoBitmapData(GetRenderer(), *bmp);
-    m_pattern = m_bmpdata->GetCairoPattern();
-    cairo_pattern_set_extend(m_pattern, CAIRO_EXTEND_REPEAT);
-}
-
-void wxCairoPenBrushBaseData::InitHatch(wxHatchStyle hatchStyle)
-{
-    // We can't create m_pattern right now as we don't have the Cairo context
-    // needed for it, so just remember that we need to do it.
-    m_hatchStyle = hatchStyle;
-}
-
-void wxCairoPenBrushBaseData::Apply( wxGraphicsContext* context )
-{
-    cairo_t* const ctext = (cairo_t*) context->GetNativeContext();
-
-    if ( m_hatchStyle != wxHATCHSTYLE_INVALID && !m_pattern )
-        InitHatchPattern(ctext);
-
-    if ( m_pattern )
-        cairo_set_source(ctext, m_pattern);
-    else
-        cairo_set_source_rgba(ctext, m_red, m_green, m_blue, m_alpha);
-}
-
 //-----------------------------------------------------------------------------
 // wxCairoPenData implementation
 //-----------------------------------------------------------------------------
@@ -659,14 +397,20 @@ void wxCairoPenData::Init()
 }
 
 wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
-    : wxCairoPenBrushBaseData(renderer, pen.GetColour(), pen.IsTransparent())
-{
+: wxGraphicsObjectRefData(renderer)
+{    
     Init();
-    m_width = pen.GetWidth();
+    m_pen = pen;
+    m_width = m_pen.GetWidth();
     if (m_width <= 0.0)
         m_width = 0.1;
 
-    switch ( pen.GetCap() )
+    m_red = m_pen.GetColour().Red()/255.0;
+    m_green = m_pen.GetColour().Green()/255.0; 
+    m_blue = m_pen.GetColour().Blue()/255.0;
+    m_alpha = m_pen.GetColour().Alpha()/255.0;
+
+    switch ( m_pen.GetCap() )
     {
     case wxCAP_ROUND :
         m_cap = CAIRO_LINE_CAP_ROUND;
@@ -685,7 +429,7 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
         break;
     }
 
-    switch ( pen.GetJoin() )
+    switch ( m_pen.GetJoin() )
     {
     case wxJOIN_BEVEL :
         m_join = CAIRO_LINE_JOIN_BEVEL;
@@ -722,37 +466,37 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
         9.0 , 6.0 , 3.0 , 3.0
     };
 
-    switch ( pen.GetStyle() )
+    switch ( m_pen.GetStyle() )
     {
-    case wxPENSTYLE_SOLID :
+    case wxSOLID :
         break;
 
-    case wxPENSTYLE_DOT :
+    case wxDOT :
         m_count = WXSIZEOF(dotted);
         m_userLengths = new double[ m_count ] ;
         memcpy( m_userLengths, dotted, sizeof(dotted) );
         m_lengths = m_userLengths;
         break;
 
-    case wxPENSTYLE_LONG_DASH :
-        m_lengths = dashed ;
+    case wxLONG_DASH :
+        m_lengths = dotted ;
         m_count = WXSIZEOF(dashed);
         break;
 
-    case wxPENSTYLE_SHORT_DASH :
-        m_lengths = short_dashed ;
+    case wxSHORT_DASH :
+        m_lengths = dotted ;
         m_count = WXSIZEOF(short_dashed);
         break;
 
-    case wxPENSTYLE_DOT_DASH :
-        m_lengths = dotted_dashed ;
+    case wxDOT_DASH :
+        m_lengths = dotted ;
         m_count = WXSIZEOF(dotted_dashed);
         break;
 
-    case wxPENSTYLE_USER_DASH :
+    case wxUSER_DASH :
         {
             wxDash *wxdashes ;
-            m_count = pen.GetDashes( &wxdashes ) ;
+            m_count = m_pen.GetDashes( &wxdashes ) ;
             if ((wxdashes != NULL) && (m_count > 0))
             {
                 m_userLengths = new double[m_count] ;
@@ -769,18 +513,53 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
             m_lengths = m_userLengths ;
         }
         break;
-
-    case wxPENSTYLE_STIPPLE :
-    case wxPENSTYLE_STIPPLE_MASK :
-    case wxPENSTYLE_STIPPLE_MASK_OPAQUE :
-        InitStipple(pen.GetStipple());
-        break;
-
-    default :
-        if ( pen.GetStyle() >= wxPENSTYLE_FIRST_HATCH
-            && pen.GetStyle() <= wxPENSTYLE_LAST_HATCH )
+    case wxSTIPPLE :
         {
-            InitHatch(static_cast<wxHatchStyle>(pen.GetStyle()));
+            /*
+            wxBitmap* bmp = pen.GetStipple();
+            if ( bmp && bmp->Ok() )
+            {
+            wxDELETE( m_penImage );
+            wxDELETE( m_penBrush );
+            m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
+            m_penBrush = new TextureBrush(m_penImage);
+            m_pen->SetBrush( m_penBrush );
+            }
+            */
+        }
+        break;
+    default :
+        if ( m_pen.GetStyle() >= wxFIRST_HATCH && m_pen.GetStyle() <= wxLAST_HATCH )
+        {
+            /*
+            wxDELETE( m_penBrush );
+            HatchStyle style = HatchStyleHorizontal;
+            switch( pen.GetStyle() )
+            {
+            case wxBDIAGONAL_HATCH :
+            style = HatchStyleBackwardDiagonal;
+            break ;
+            case wxCROSSDIAG_HATCH :
+            style = HatchStyleDiagonalCross;
+            break ;
+            case wxFDIAGONAL_HATCH :
+            style = HatchStyleForwardDiagonal;
+            break ;
+            case wxCROSS_HATCH :
+            style = HatchStyleCross;
+            break ;
+            case wxHORIZONTAL_HATCH :
+            style = HatchStyleHorizontal;
+            break ;
+            case wxVERTICAL_HATCH :
+            style = HatchStyleVertical;
+            break ;
+
+            }
+            m_penBrush = new HatchBrush(style,Color( pen.GetColour().Alpha() , pen.GetColour().Red() ,
+            pen.GetColour().Green() , pen.GetColour().Blue() ), Color.Transparent );
+            m_pen->SetBrush( m_penBrush )
+            */
         }
         break;
     }
@@ -788,10 +567,9 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
 
 void wxCairoPenData::Apply( wxGraphicsContext* context )
 {
-    wxCairoPenBrushBaseData::Apply(context);
-
     cairo_t * ctext = (cairo_t*) context->GetNativeContext();
     cairo_set_line_width(ctext,m_width);
+    cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
     cairo_set_line_cap(ctext,m_cap);
     cairo_set_line_join(ctext,m_join);
     cairo_set_dash(ctext,(double*)m_lengths,m_count,0.0);
@@ -802,199 +580,143 @@ void wxCairoPenData::Apply( wxGraphicsContext* context )
 //-----------------------------------------------------------------------------
 
 wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer )
-    : wxCairoPenBrushBaseData(renderer, wxColour(), true /* transparent */)
+  : wxGraphicsObjectRefData( renderer )
 {
     Init();
 }
 
-wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer,
-                                    const wxBrush &brush )
-    : wxCairoPenBrushBaseData(renderer, brush.GetColour(), brush.IsTransparent())
+wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush )
+  : wxGraphicsObjectRefData(renderer)
 {
     Init();
-
-    switch ( brush.GetStyle() )
+    
+    m_red = brush.GetColour().Red()/255.0;
+    m_green = brush.GetColour().Green()/255.0; 
+    m_blue = brush.GetColour().Blue()/255.0;
+    m_alpha = brush.GetColour().Alpha()/255.0;
+    /*
+    if ( brush.GetStyle() == wxSOLID)
     {
-        case wxBRUSHSTYLE_STIPPLE:
-        case wxBRUSHSTYLE_STIPPLE_MASK:
-        case wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE:
-            InitStipple(brush.GetStipple());
-            break;
+    m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
+    brush.GetColour().Green() , brush.GetColour().Blue() ) );
+    }
+    else if ( brush.IsHatch() )
+    {
+    HatchStyle style = HatchStyleHorizontal;
+    switch( brush.GetStyle() )
+    {
+    case wxBDIAGONAL_HATCH :
+    style = HatchStyleBackwardDiagonal;
+    break ;
+    case wxCROSSDIAG_HATCH :
+    style = HatchStyleDiagonalCross;
+    break ;
+    case wxFDIAGONAL_HATCH :
+    style = HatchStyleForwardDiagonal;
+    break ;
+    case wxCROSS_HATCH :
+    style = HatchStyleCross;
+    break ;
+    case wxHORIZONTAL_HATCH :
+    style = HatchStyleHorizontal;
+    break ;
+    case wxVERTICAL_HATCH :
+    style = HatchStyleVertical;
+    break ;
 
-        default:
-            if ( brush.IsHatch() )
-                InitHatch(static_cast<wxHatchStyle>(brush.GetStyle()));
-            break;
+    }
+    m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
+    brush.GetColour().Green() , brush.GetColour().Blue() ), Color.Transparent );
+    }
+    else 
+    {
+    wxBitmap* bmp = brush.GetStipple();
+    if ( bmp && bmp->Ok() )
+    {
+    wxDELETE( m_brushImage );
+    m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
+    m_brush = new TextureBrush(m_brushImage);
+    }
+    }
+    */
+}
+
+wxCairoBrushData::~wxCairoBrushData ()
+{
+    if (m_brushPattern)
+        cairo_pattern_destroy(m_brushPattern);
+}
+
+void wxCairoBrushData::Apply( wxGraphicsContext* context )
+{
+    cairo_t * ctext = (cairo_t*) context->GetNativeContext();
+    if ( m_brushPattern )
+    {
+        cairo_set_source(ctext,m_brushPattern);
+    }
+    else
+    {
+        cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
     }
 }
 
-void wxCairoBrushData::AddGradientStops(const wxGraphicsGradientStops& stops)
+void wxCairoBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+        const wxColour&c1, const wxColour&c2 )
 {
-    // loop over all the stops, they include the beginning and ending ones
-    const unsigned numStops = stops.GetCount();
-    for ( unsigned n = 0; n < numStops; n++ )
-    {
-        const wxGraphicsGradientStop stop = stops.Item(n);
-
-        const wxColour col = stop.GetColour();
-
-        cairo_pattern_add_color_stop_rgba
-        (
-            m_pattern,
-            stop.GetPosition(),
-            col.Red()/255.0,
-            col.Green()/255.0,
-            col.Blue()/255.0,
-            col.Alpha()/255.0
-        );
-    }
-
-    wxASSERT_MSG(cairo_pattern_status(m_pattern) == CAIRO_STATUS_SUCCESS,
-                 wxT("Couldn't create cairo pattern"));
+    m_brushPattern = cairo_pattern_create_linear(x1,y1,x2,y2);
+    cairo_pattern_add_color_stop_rgba(m_brushPattern,0.0,c1.Red()/255.0,
+        c1.Green()/255.0, c1.Blue()/255.0,c1.Alpha()/255.0);
+    cairo_pattern_add_color_stop_rgba(m_brushPattern,1.0,c2.Red()/255.0,
+        c2.Green()/255.0, c2.Blue()/255.0,c2.Alpha()/255.0);
+    wxASSERT_MSG(cairo_pattern_status(m_brushPattern) == CAIRO_STATUS_SUCCESS, wxT("Couldn't create cairo pattern"));
 }
 
-void
-wxCairoBrushData::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                                            wxDouble x2, wxDouble y2,
-                                            const wxGraphicsGradientStops& stops)
+void wxCairoBrushData::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor )
 {
-    m_pattern = cairo_pattern_create_linear(x1,y1,x2,y2);
-
-    AddGradientStops(stops);
-}
-
-void
-wxCairoBrushData::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                                            wxDouble xc, wxDouble yc,
-                                            wxDouble radius,
-                                            const wxGraphicsGradientStops& stops)
-{
-    m_pattern = cairo_pattern_create_radial(xo,yo,0.0,xc,yc,radius);
-
-    AddGradientStops(stops);
+    m_brushPattern = cairo_pattern_create_radial(xo,yo,0.0,xc,yc,radius);
+    cairo_pattern_add_color_stop_rgba(m_brushPattern,0.0,oColor.Red()/255.0,
+        oColor.Green()/255.0, oColor.Blue()/255.0,oColor.Alpha()/255.0);
+    cairo_pattern_add_color_stop_rgba(m_brushPattern,1.0,cColor.Red()/255.0,
+        cColor.Green()/255.0, cColor.Blue()/255.0,cColor.Alpha()/255.0);
+    wxASSERT_MSG(cairo_pattern_status(m_brushPattern) == CAIRO_STATUS_SUCCESS, wxT("Couldn't create cairo pattern"));
 }
 
 void wxCairoBrushData::Init()
 {
-    m_pattern = NULL;
-    m_bmpdata = NULL;
+    m_brushPattern = NULL;
 }
 
 //-----------------------------------------------------------------------------
 // wxCairoFontData implementation
 //-----------------------------------------------------------------------------
 
-void wxCairoFontData::InitColour(const wxColour& col)
+wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font, 
+                         const wxColour& col ) : wxGraphicsObjectRefData(renderer)
 {
     m_red = col.Red()/255.0;
-    m_green = col.Green()/255.0;
+    m_green = col.Green()/255.0; 
     m_blue = col.Blue()/255.0;
     m_alpha = col.Alpha()/255.0;
-}
-
-void
-wxCairoFontData::InitFontComponents(const wxString& facename,
-                                    cairo_font_slant_t slant,
-                                    cairo_font_weight_t weight)
-{
-    m_fontName = facename.mb_str(wxConvUTF8);
-    m_slant = slant;
-    m_weight = weight;
-}
-
-wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font,
-                         const wxColour& col )
-    : wxGraphicsObjectRefData(renderer)
-#ifdef __WXGTK__
-    , m_wxfont(font)
-#endif
-{
-    InitColour(col);
 
     m_size = font.GetPointSize();
-
-#ifdef __WXMAC__
-    m_font = cairo_quartz_font_face_create_for_cgfont( font.OSXGetCGFont() );
-#elif defined(__WXGTK__)
-#else
-    InitFontComponents
-    (
-        font.GetFaceName(),
-        font.GetStyle() == wxFONTSTYLE_ITALIC ? CAIRO_FONT_SLANT_ITALIC
-                                              : CAIRO_FONT_SLANT_NORMAL,
-        font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD
-                                              : CAIRO_FONT_WEIGHT_NORMAL
-    );
-#endif
-}
-
-wxCairoFontData::wxCairoFontData(wxGraphicsRenderer* renderer,
-                                 double sizeInPixels,
-                                 const wxString& facename,
-                                 int flags,
-                                 const wxColour& col) :
-    wxGraphicsObjectRefData(renderer)
-{
-    InitColour(col);
-
-    // Resolution for Cairo image surfaces is 72 DPI meaning that the sizes in
-    // points and pixels are identical, so we can just pass the size in pixels
-    // directly to cairo_set_font_size().
-    m_size = sizeInPixels;
-
-#if defined(__WXMAC__)
-    m_font = NULL;
-#endif
-
-    // There is no need to set m_underlined under wxGTK in this case, it can
-    // only be used if m_font != NULL.
-
-    InitFontComponents
-    (
-        facename,
-        flags & wxFONTFLAG_ITALIC ? CAIRO_FONT_SLANT_ITALIC
-                                  : CAIRO_FONT_SLANT_NORMAL,
-        flags & wxFONTFLAG_BOLD ? CAIRO_FONT_WEIGHT_BOLD
-                                : CAIRO_FONT_WEIGHT_NORMAL
-    );
+    m_fontName = font.GetFaceName().mb_str(wxConvUTF8);
+    m_slant = font.GetStyle() == wxFONTSTYLE_ITALIC ? CAIRO_FONT_SLANT_ITALIC:CAIRO_FONT_SLANT_NORMAL;
+    m_weight = font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD:CAIRO_FONT_WEIGHT_NORMAL;
 }
 
 wxCairoFontData::~wxCairoFontData()
 {
-#ifdef __WXMAC__
-    if ( m_font )
-        cairo_font_face_destroy( m_font );
-#endif
 }
 
-bool wxCairoFontData::Apply( wxGraphicsContext* context )
+void wxCairoFontData::Apply( wxGraphicsContext* context )
 {
     cairo_t * ctext = (cairo_t*) context->GetNativeContext();
     cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
-#ifdef __WXGTK__
-    if (m_wxfont.IsOk())
-    {
-        // Nothing to do, the caller uses Pango layout functions to do
-        // everything.
-        return true;
-    }
-#elif defined(__WXMAC__)
-    if ( m_font )
-    {
-        cairo_set_font_face(ctext, m_font);
-        cairo_set_font_size(ctext, m_size );
-        return true;
-    }
-#endif
-
-    // If we get here, we must be on a platform without native font support or
-    // we're using toy Cairo API even under wxGTK/wxMac.
-    cairo_select_font_face(ctext, m_fontName, m_slant, m_weight );
-    cairo_set_font_size(ctext, m_size );
-
-    // Indicate that we don't use native fonts for the platforms which care
-    // about this (currently only wxGTK).
-    return false;
+    cairo_select_font_face(ctext,m_fontName,m_slant,m_weight);
+    cairo_set_font_size(ctext,m_size);
+    // TODO UNDERLINE
+    // TODO FIX SIZE
 }
 
 //-----------------------------------------------------------------------------
@@ -1088,7 +810,7 @@ void wxCairoPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const
 
 void wxCairoPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise )
 {
-    // as clockwise means positive in our system (y pointing downwards)
+    // as clockwise means positive in our system (y pointing downwards) 
     // TODO make this interpretation dependent of the
     // real device trans
     if ( clockwise||(endAngle-startAngle)>=2*M_PI)
@@ -1098,14 +820,14 @@ void wxCairoPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAn
 }
 
 // transforms each point of this path by the matrix
-void wxCairoPathData::Transform( const wxGraphicsMatrixData* matrix )
+void wxCairoPathData::Transform( const wxGraphicsMatrixData* matrix ) 
 {
     // as we don't have a true path object, we have to apply the inverse
     // matrix to the context
     cairo_matrix_t m = *((cairo_matrix_t*) matrix->GetNativeMatrix());
     cairo_matrix_invert( &m );
     cairo_transform(m_pathContext,&m);
-}
+}   
 
 // gets the bounding box enclosing all points (possibly including control points)
 void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const
@@ -1123,7 +845,7 @@ void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
         *x = x1;
         *w = x2-x1;
     }
-
+    
     if( y2 < y1 )
     {
         *y = y2;
@@ -1136,10 +858,9 @@ void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
     }
 }
 
-bool wxCairoPathData::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const
+bool wxCairoPathData::Contains( wxDouble x, wxDouble y, int fillStyle ) const
 {
-    cairo_set_fill_rule(m_pathContext,fillStyle==wxODDEVEN_RULE ? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING);
-    return cairo_in_fill( m_pathContext, x, y) != 0;
+    return cairo_in_stroke( m_pathContext, x, y) != 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -1153,25 +874,25 @@ wxCairoMatrixData::wxCairoMatrixData(wxGraphicsRenderer* renderer, const cairo_m
         m_matrix = *matrix;
 }
 
-wxCairoMatrixData::~wxCairoMatrixData()
+wxCairoMatrixData::~wxCairoMatrixData() 
 {
     // nothing to do
 }
 
-wxGraphicsObjectRefData *wxCairoMatrixData::Clone() const
+wxGraphicsObjectRefData *wxCairoMatrixData::Clone() const 
 {
     return new wxCairoMatrixData(GetRenderer(),&m_matrix);
 }
 
 // concatenates the matrix
-void wxCairoMatrixData::Concat( const wxGraphicsMatrixData *t )
+void wxCairoMatrixData::Concat( const wxGraphicsMatrixData *t ) 
 {
-    cairo_matrix_multiply( &m_matrix, &m_matrix, (cairo_matrix_t*) t->GetNativeMatrix());
+    cairo_matrix_multiply( &m_matrix, &m_matrix, (cairo_matrix_t*) t->GetNativeMatrix());           
 }
 
 // sets the matrix to the respective values
-void wxCairoMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,
-                        wxDouble tx, wxDouble ty)
+void wxCairoMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+                        wxDouble tx, wxDouble ty) 
 {
     cairo_matrix_init( &m_matrix, a, b, c, d, tx, ty);
 }
@@ -1189,21 +910,21 @@ void wxCairoMatrixData::Get(wxDouble* a, wxDouble* b,  wxDouble* c,
 }
 
 // makes this the inverse matrix
-void wxCairoMatrixData::Invert()
+void wxCairoMatrixData::Invert() 
 {
     cairo_matrix_invert( &m_matrix );
 }
 
 // returns true if the elements of the transformation matrix are equal ?
-bool wxCairoMatrixData::IsEqual( const wxGraphicsMatrixData* t) const
+bool wxCairoMatrixData::IsEqual( const wxGraphicsMatrixData* t) const  
 {
     const cairo_matrix_t* tm = (cairo_matrix_t*) t->GetNativeMatrix();
-    return (
-        m_matrix.xx == tm->xx &&
-        m_matrix.yx == tm->yx &&
-        m_matrix.xy == tm->xy &&
-        m_matrix.yy == tm->yy &&
-        m_matrix.x0 == tm->x0 &&
+    return ( 
+        m_matrix.xx == tm->xx && 
+        m_matrix.yx == tm->yx && 
+        m_matrix.xy == tm->xy && 
+        m_matrix.yy == tm->yy && 
+        m_matrix.x0 == tm->x0 && 
         m_matrix.y0 == tm->y0 ) ;
 }
 
@@ -1231,7 +952,7 @@ void wxCairoMatrixData::Scale( wxDouble xScale , wxDouble yScale )
 }
 
 // add the rotation to this matrix (radians)
-void wxCairoMatrixData::Rotate( wxDouble angle )
+void wxCairoMatrixData::Rotate( wxDouble angle ) 
 {
     cairo_matrix_rotate( &m_matrix, angle) ;
 }
@@ -1264,90 +985,35 @@ void * wxCairoMatrixData::GetNativeMatrix() const
     return (void*) &m_matrix;
 }
 
-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // wxCairoBitmap implementation
-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 
-int wxCairoBitmapData::InitBuffer(int width, int height, cairo_format_t format)
-{
-    wxUnusedVar(format); // Only really unused with Cairo < 1.6.
-
-    // Determine the stride: use cairo_format_stride_for_width() if available
-    // but fall back to 4*width for the earlier versions as this is what that
-    // function always returns, even in latest Cairo, anyhow.
-    int stride;
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 6, 0)
-    if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 6, 0) )
-    {
-        stride = cairo_format_stride_for_width(format, width);
-
-        // All our code would totally break if stride were not a multiple of 4
-        // so ensure this is the case.
-        if ( stride % 4 )
-        {
-            wxFAIL_MSG("Unexpected Cairo image surface stride.");
-
-            stride += 4 - stride % 4;
-        }
-    }
-    else
-#endif
-        stride = 4*width;
-
-    m_width = width;
-    m_height = height;
-    m_buffer = new unsigned char[height*stride];
-
-    return stride;
-}
-
-void wxCairoBitmapData::InitSurface(cairo_format_t format, int stride)
-{
-    m_surface = cairo_image_surface_create_for_data(
-                            m_buffer, format, m_width, m_height, stride);
-    m_pattern = cairo_pattern_create_for_surface(m_surface);
-}
-
-wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap ) :
-    wxGraphicsBitmapData( renderer )
-{
-    m_surface = bitmap;
-    m_pattern = cairo_pattern_create_for_surface(m_surface);
-}
-
-wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ) : wxGraphicsBitmapData( renderer )
+wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ) : wxGraphicsObjectRefData( renderer )
 {
     wxCHECK_RET( bmp.IsOk(), wxT("Invalid bitmap in wxCairoContext::DrawBitmap"));
 
-#ifdef wxHAS_RAW_BITMAP
+    int bw = m_width = bmp.GetWidth();
+    int bh = m_height = bmp.GetHeight();
+    wxBitmap bmpSource = bmp;  // we need a non-const instance
+    m_buffer = new unsigned char[bw*bh*4];
+    wxUint32* data = (wxUint32*)m_buffer;
+    
     // Create a surface object and copy the bitmap pixel data to it.  if the
     // image has alpha (or a mask represented as alpha) then we'll use a
     // different format and iterator than if it doesn't...
-    cairo_format_t bufferFormat = bmp.GetDepth() == 32
-#if defined(__WXGTK__) && !defined(__WXGTK3__)
-                                            || bmp.GetMask()
-#endif
-                                        ? CAIRO_FORMAT_ARGB32
-                                        : CAIRO_FORMAT_RGB24;
-
-    int stride = InitBuffer(bmp.GetWidth(), bmp.GetHeight(), bufferFormat);
-
-    wxBitmap bmpSource = bmp;  // we need a non-const instance
-    wxUint32* data = (wxUint32*)m_buffer;
-
-    if ( bufferFormat == CAIRO_FORMAT_ARGB32 )
+    if (bmpSource.HasAlpha() || bmpSource.GetMask())
     {
-        // use the bitmap's alpha
-        wxAlphaPixelData
-            pixData(bmpSource, wxPoint(0, 0), wxSize(m_width, m_height));
+        m_surface = cairo_image_surface_create_for_data(
+            m_buffer, CAIRO_FORMAT_ARGB32, bw, bh, bw*4);
+        wxAlphaPixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
         wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
-
+        
         wxAlphaPixelData::Iterator p(pixData);
-        for (int y=0; y<m_height; y++)
+        for (int y=0; y<bh; y++)
         {
             wxAlphaPixelData::Iterator rowStart = p;
-            wxUint32* const rowStartDst = data;
-            for (int x=0; x<m_width; x++)
+            for (int x=0; x<bw; x++)
             {
                 // Each pixel in CAIRO_FORMAT_ARGB32 is a 32-bit quantity,
                 // with alpha in the upper 8 bits, then red, then green, then
@@ -1357,31 +1023,29 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
                 if (alpha == 0)
                     *data = 0;
                 else
-                    *data = ( alpha                      << 24
-                              | (p.Red() * alpha/255)    << 16
-                              | (p.Green() * alpha/255)  <<  8
+                    *data = ( alpha                      << 24 
+                              | (p.Red() * alpha/255)    << 16 
+                              | (p.Green() * alpha/255)  <<  8 
                               | (p.Blue() * alpha/255) );
                 ++data;
                 ++p;
             }
-
-            data = rowStartDst + stride / 4;
             p = rowStart;
             p.OffsetY(pixData, 1);
-        }
+        }        
     }
     else  // no alpha
     {
-        wxNativePixelData
-            pixData(bmpSource, wxPoint(0, 0), wxSize(m_width, m_height));
+        m_surface = cairo_image_surface_create_for_data(
+            m_buffer, CAIRO_FORMAT_RGB24, bw, bh, bw*4);
+        wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
         wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
-
+        
         wxNativePixelData::Iterator p(pixData);
-        for (int y=0; y<m_height; y++)
+        for (int y=0; y<bh; y++)
         {
             wxNativePixelData::Iterator rowStart = p;
-            wxUint32* const rowStartDst = data;
-            for (int x=0; x<m_width; x++)
+            for (int x=0; x<bw; x++)
             {
                 // Each pixel in CAIRO_FORMAT_RGB24 is a 32-bit quantity, with
                 // the upper 8 bits unused. Red, Green, and Blue are stored in
@@ -1391,226 +1055,17 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
                 ++data;
                 ++p;
             }
-
-            data = rowStartDst + stride / 4;
             p = rowStart;
             p.OffsetY(pixData, 1);
-        }
+        }        
     }
-#if defined(__WXMSW__) || defined(__WXGTK3__)
-    // if there is a mask, set the alpha bytes in the target buffer to 
-    // fully transparent or fully opaque
-    if (bmpSource.GetMask())
-    {
-        wxBitmap bmpMask = bmpSource.GetMaskBitmap();
-        bufferFormat = CAIRO_FORMAT_ARGB32;
-        data = (wxUint32*)m_buffer;
-        wxNativePixelData
-            pixData(bmpMask, wxPoint(0, 0), wxSize(m_width, m_height));
-        wxCHECK_RET( pixData, wxT("Failed to gain raw access to mask data."));
-
-        wxNativePixelData::Iterator p(pixData);
-        for (int y=0; y<m_height; y++)
-        {
-            wxNativePixelData::Iterator rowStart = p;
-            wxUint32* const rowStartDst = data;
-            for (int x=0; x<m_width; x++)
-            {
-                if (p.Red()+p.Green()+p.Blue() == 0)
-                    *data = 0;
-                else
-                    *data = (wxALPHA_OPAQUE << 24) | (*data & 0x00FFFFFF);
-                ++data;
-                ++p;
-            }
-
-            data = rowStartDst + stride / 4;
-            p = rowStart;
-            p.OffsetY(pixData, 1);
-        }
-    }
-#endif
-
-    InitSurface(bufferFormat, stride);
-#endif // wxHAS_RAW_BITMAP
+    m_pattern = cairo_pattern_create_for_surface(m_surface);
 }
 
-#if wxUSE_IMAGE
-
-// Helper functions for dealing with alpha pre-multiplication.
-namespace
-{
-
-inline unsigned char Premultiply(unsigned char alpha, unsigned char data)
-{
-    return alpha ? (data * alpha)/0xff : data;
-}
-
-inline unsigned char Unpremultiply(unsigned char alpha, unsigned char data)
-{
-    return alpha ? (data * 0xff)/alpha : data;
-}
-
-} // anonymous namespace
-
-wxCairoBitmapData::wxCairoBitmapData(wxGraphicsRenderer* renderer,
-                                     const wxImage& image)
-    : wxGraphicsBitmapData(renderer)
-{
-    const cairo_format_t bufferFormat = image.HasAlpha()
-                                            ? CAIRO_FORMAT_ARGB32
-                                            : CAIRO_FORMAT_RGB24;
-
-    int stride = InitBuffer(image.GetWidth(), image.GetHeight(), bufferFormat);
-
-    // Copy wxImage data into the buffer. Notice that we work with wxUint32
-    // values and not bytes becase Cairo always works with buffers in native
-    // endianness.
-    wxUint32* dst = reinterpret_cast<wxUint32*>(m_buffer);
-    const unsigned char* src = image.GetData();
-
-    if ( bufferFormat == CAIRO_FORMAT_ARGB32 )
-    {
-        const unsigned char* alpha = image.GetAlpha();
-
-        for ( int y = 0; y < m_height; y++ )
-        {
-            wxUint32* const rowStartDst = dst;
-
-            for ( int x = 0; x < m_width; x++ )
-            {
-                const unsigned char a = *alpha++;
-
-                *dst++ = a                      << 24 |
-                         Premultiply(a, src[0]) << 16 |
-                         Premultiply(a, src[1]) <<  8 |
-                         Premultiply(a, src[2]);
-                src += 3;
-            }
-
-            dst = rowStartDst + stride / 4;
-        }
-    }
-    else // RGB
-    {
-        for ( int y = 0; y < m_height; y++ )
-        {
-            wxUint32* const rowStartDst = dst;
-
-            for ( int x = 0; x < m_width; x++ )
-            {
-                *dst++ = src[0] << 16 |
-                         src[1] <<  8 |
-                         src[2];
-                src += 3;
-            }
-
-            dst = rowStartDst + stride / 4;
-        }
-    }
-
-    InitSurface(bufferFormat, stride);
-}
-
-wxImage wxCairoBitmapData::ConvertToImage() const
-{
-    wxImage image(m_width, m_height, false /* don't clear */);
-
-    // Get the surface type and format.
-    wxCHECK_MSG( cairo_surface_get_type(m_surface) == CAIRO_SURFACE_TYPE_IMAGE,
-                 wxNullImage,
-                 wxS("Can't convert non-image surface to image.") );
-
-    switch ( cairo_image_surface_get_format(m_surface) )
-    {
-        case CAIRO_FORMAT_ARGB32:
-            image.SetAlpha();
-            break;
-
-        case CAIRO_FORMAT_RGB24:
-            // Nothing to do, we don't use alpha by default.
-            break;
-
-        case CAIRO_FORMAT_A8:
-        case CAIRO_FORMAT_A1:
-            wxFAIL_MSG(wxS("Unsupported Cairo image surface type."));
-            return wxNullImage;
-
-        default:
-            wxFAIL_MSG(wxS("Unknown Cairo image surface type."));
-            return wxNullImage;
-    }
-
-    // Prepare for copying data.
-    const wxUint32* src = (wxUint32*)cairo_image_surface_get_data(m_surface);
-    wxCHECK_MSG( src, wxNullImage, wxS("Failed to get Cairo surface data.") );
-
-    int stride = cairo_image_surface_get_stride(m_surface);
-    wxCHECK_MSG( stride > 0, wxNullImage,
-                 wxS("Failed to get Cairo surface stride.") );
-
-    // As we work with wxUint32 pointers and not char ones, we need to adjust
-    // the stride accordingly. This should be lossless as the stride must be a
-    // multiple of pixel size.
-    wxASSERT_MSG( !(stride % sizeof(wxUint32)), wxS("Unexpected stride.") );
-    stride /= sizeof(wxUint32);
-
-    unsigned char* dst = image.GetData();
-    unsigned char *alpha = image.GetAlpha();
-    if ( alpha )
-    {
-        // We need to also copy alpha and undo the pre-multiplication as Cairo
-        // stores pre-multiplied values in this format while wxImage does not.
-        for ( int y = 0; y < m_height; y++ )
-        {
-            const wxUint32* const rowStart = src;
-            for ( int x = 0; x < m_width; x++ )
-            {
-                const wxUint32 argb = *src++;
-
-                *alpha++ = (argb & 0xff000000) >> 24;
-
-                // Copy the RGB data undoing the pre-multiplication.
-                *dst++ = Unpremultiply(*alpha, (argb & 0x00ff0000) >> 16);
-                *dst++ = Unpremultiply(*alpha, (argb & 0x0000ff00) >>  8);
-                *dst++ = Unpremultiply(*alpha, (argb & 0x000000ff));
-            }
-
-            src = rowStart + stride;
-        }
-    }
-    else // RGB
-    {
-        // Things are pretty simple in this case, just copy RGB bytes.
-        for ( int y = 0; y < m_height; y++ )
-        {
-            const wxUint32* const rowStart = src;
-            for ( int x = 0; x < m_width; x++ )
-            {
-                const wxUint32 argb = *src++;
-
-                *dst++ = (argb & 0x00ff0000) >> 16;
-                *dst++ = (argb & 0x0000ff00) >>  8;
-                *dst++ = (argb & 0x000000ff);
-            }
-
-            src = rowStart + stride;
-        }
-    }
-
-    return image;
-}
-
-#endif // wxUSE_IMAGE
-
 wxCairoBitmapData::~wxCairoBitmapData()
 {
-    if (m_pattern)
-        cairo_pattern_destroy(m_pattern);
-
-    if (m_surface)
-        cairo_surface_destroy(m_surface);
-
+    cairo_pattern_destroy(m_pattern);
+    cairo_surface_destroy(m_surface);
     delete [] m_buffer;
 }
 
@@ -1618,207 +1073,23 @@ wxCairoBitmapData::~wxCairoBitmapData()
 // wxCairoContext implementation
 //-----------------------------------------------------------------------------
 
-class wxCairoOffsetHelper
-{
-public :
-    wxCairoOffsetHelper( cairo_t* ctx , bool offset )
-    {
-        m_ctx = ctx;
-        m_offset = offset;
-        if ( m_offset )
-             cairo_translate( m_ctx, 0.5, 0.5 );
-    }
-    ~wxCairoOffsetHelper( )
-    {
-        if ( m_offset )
-            cairo_translate( m_ctx, -0.5, -0.5 );
-    }
-public :
-    cairo_t* m_ctx;
-    bool m_offset;
-} ;
-
-wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc )
-: wxGraphicsContext(renderer)
-{
-#ifdef __WXMSW__
-    // wxMSW contexts always use MM_ANISOTROPIC, which messes up 
-    // text rendering when printing using Cairo. Switch it to MM_TEXT
-    // map mode to avoid this problem.
-    HDC hdc = (HDC)dc.GetHDC();
-    ::SetMapMode(hdc, MM_TEXT);
-    m_mswSurface = cairo_win32_printing_surface_create(hdc);
-    Init( cairo_create(m_mswSurface) );
-#endif
-
-#ifdef __WXGTK20__
-    const wxDCImpl *impl = dc.GetImpl();
-    Init( (cairo_t*) impl->GetCairoContext() );
-#endif
-    wxSize sz = dc.GetSize();
-    m_width = sz.x;
-    m_height = sz.y;
-
-    wxPoint org = dc.GetDeviceOrigin();
-    cairo_translate( m_context, org.x, org.y );
-
-    double sx,sy;
-    dc.GetUserScale( &sx, &sy );
-
-// TODO: Determine if these fixes are needed on other platforms too.
-// On MSW, without this the printer context will not respect wxDC SetMapMode calls.
-// For example, using dc.SetMapMode(wxMM_POINTS) can let us share printer and screen
-// drawing code
-#ifdef __WXMSW__
-    double lsx,lsy;
-    dc.GetLogicalScale( &lsx, &lsy );
-    sx *= lsx;
-    sy *= lsy;
-#endif
-    cairo_scale( m_context, sx, sy );
-
-    org = dc.GetLogicalOrigin();
-    cairo_translate( m_context, -org.x, -org.y );
-}
-
 wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc )
 : wxGraphicsContext(renderer)
 {
-    int width, height;
-    dc.GetSize( &width, &height );
-    m_width = width;
-    m_height = height;
-
-    m_enableOffset = true;
-
-#ifdef __WXMSW__
-    m_mswSurface = cairo_win32_surface_create((HDC)dc.GetHDC());
-    Init( cairo_create(m_mswSurface) );
-#endif
-
-#ifdef __WXGTK3__
-    cairo_t* cr = static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext());
-    if (cr)
-        Init(cr);
-#elif defined __WXGTK20__
-    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
-    Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
-
-#if 0
-    wxGraphicsMatrix matrix = CreateMatrix();
-
-    wxPoint org = dc.GetDeviceOrigin();
-    matrix.Translate( org.x, org.y );
-
-    org = dc.GetLogicalOrigin();
-    matrix.Translate( -org.x, -org.y );
-
-    double sx,sy;
-    dc.GetUserScale( &sx, &sy );
-    matrix.Scale( sx, sy );
-
-    ConcatTransform( matrix );
-#endif
-#endif
-
-#ifdef __WXMAC__
-    CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef();
-    cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height);
-    Init( cairo_create( surface ) );
-    cairo_surface_destroy( surface );
+#ifdef __WXGTK__
+    m_context = gdk_cairo_create( dc.m_window ) ;
 #endif
+    PushState();
+    PushState();
 }
 
-wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc )
+#ifdef __WXGTK__
+wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable )
 : wxGraphicsContext(renderer)
 {
-    int width, height;
-    dc.GetSize( &width, &height );
-    m_width = width;
-    m_height = height;
-
-    m_enableOffset = true;
-
-#ifdef __WXMSW__
-
-    HDC hdc = (HDC)dc.GetHDC();
-
-    HBITMAP bitmap = (HBITMAP)GetCurrentObject(hdc, OBJ_BITMAP);
-
-    BITMAP info;
-    bool hasBitmap = false;
-
-    // cairo_win32_surface_create creates a 24-bit bitmap,
-    // so if we have alpha, we need to create a 32-bit surface instead.
-    if (!GetObject(bitmap, sizeof(info), &info) || info.bmBitsPixel < 32)
-        m_mswSurface = cairo_win32_surface_create(hdc);
-    else {
-        hasBitmap = true;
-        m_mswSurface = cairo_image_surface_create_for_data((unsigned char*)info.bmBits,
-                                               CAIRO_FORMAT_ARGB32,
-                                               info.bmWidth,
-                                               info.bmHeight,
-                                               info.bmWidthBytes);
-    }
-
-    Init( cairo_create(m_mswSurface) );
-    // If we've created a image surface, we need to flip the Y axis so that 
-    // all drawing will appear right side up.
-    if (hasBitmap) {
-        cairo_matrix_t matrix;
-        cairo_matrix_init(&matrix, 1.0, 0.0, 0.0, -1.0, 0.0, height);
-        cairo_set_matrix(m_context, &matrix);
-    }
-#endif
-    
-#ifdef __WXGTK3__
-    cairo_t* cr = static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext());
-    if (cr)
-        Init(cr);
-#elif defined __WXGTK20__
-    wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
-    Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
-
-#if 0
-    wxGraphicsMatrix matrix = CreateMatrix();
-
-    wxPoint org = dc.GetDeviceOrigin();
-    matrix.Translate( org.x, org.y );
-
-    org = dc.GetLogicalOrigin();
-    matrix.Translate( -org.x, -org.y );
-
-    double sx,sy;
-    dc.GetUserScale( &sx, &sy );
-    matrix.Scale( sx, sy );
-
-    ConcatTransform( matrix );
-#endif
-#endif
-
-#ifdef __WXMAC__
-    CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef();
-    cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height);
-    Init( cairo_create( surface ) );
-    cairo_surface_destroy( surface );
-#endif
-}
-
-#ifdef __WXGTK20__
-wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkWindow *window )
-: wxGraphicsContext(renderer)
-{
-    Init( gdk_cairo_create( window ) );
-
-#ifdef __WXGTK3__
-    m_width = gdk_window_get_width(window);
-    m_height = gdk_window_get_height(window);
-#else
-    int width, height;
-    gdk_drawable_get_size(window, &width, &height);
-    m_width = width;
-    m_height = height;
-#endif
+    m_context = gdk_cairo_create( drawable ) ;
+    PushState();
+    PushState();
 }
 #endif
 
@@ -1827,9 +1098,9 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, HDC handle )
 : wxGraphicsContext(renderer)
 {
     m_mswSurface = cairo_win32_surface_create(handle);
-    Init( cairo_create(m_mswSurface) );
-    m_width =
-    m_height = 0;
+    m_context = cairo_create(m_mswSurface);
+    PushState();
+    PushState();
 }
 #endif
 
@@ -1837,49 +1108,40 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, HDC handle )
 wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context )
 : wxGraphicsContext(renderer)
 {
-    Init( context );
-    m_width =
-    m_height = 0;
+    m_context = context ;
+    PushState();
+    PushState();
 }
 
 wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window)
-    : wxGraphicsContext(renderer)
-#ifdef __WXMSW__
-    , m_mswWindowHDC(GetHwndOf(window))
-#endif
+: wxGraphicsContext(renderer)
 {
-    m_enableOffset = true;    
 #ifdef __WXGTK__
     // something along these lines (copied from dcclient)
 
+    GtkWidget *widget = window->m_wxwindow;
+
     // Some controls don't have m_wxwindow - like wxStaticBox, but the user
     // code should still be able to create wxClientDCs for them, so we will
     // use the parent window here then.
-    if (window->m_wxwindow == NULL)
+    if ( !widget )
     {
         window = window->GetParent();
+        widget = window->m_wxwindow;
     }
 
-    wxASSERT_MSG( window->m_wxwindow, wxT("wxCairoContext needs a widget") );
+    wxASSERT_MSG( widget, wxT("wxCairoContext needs a widget") );
 
-    Init(gdk_cairo_create(window->GTKGetDrawingWindow()));
-
-    wxSize sz = window->GetSize();
-    m_width = sz.x;
-    m_height = sz.y;
+    GtkPizza *pizza = GTK_PIZZA( widget );
+    GdkDrawable* drawable = pizza->bin_window;
+    m_context = gdk_cairo_create( drawable ) ;
 #endif
-
 #ifdef __WXMSW__
-    m_mswSurface = cairo_win32_surface_create((HDC)m_mswWindowHDC);
-    Init(cairo_create(m_mswSurface));
+    m_mswSurface = cairo_win32_surface_create((HDC)window->GetHandle());
+    m_context = cairo_create(m_mswSurface);
 #endif
-
-}
-
-wxCairoContext::wxCairoContext(wxGraphicsRenderer* renderer) :
-    wxGraphicsContext(renderer)
-{
-    m_context = NULL;
+    PushState();
+    PushState();
 }
 
 wxCairoContext::~wxCairoContext()
@@ -1896,13 +1158,6 @@ wxCairoContext::~wxCairoContext()
 #endif
 }
 
-void wxCairoContext::Init(cairo_t *context)
-{
-    m_context = context ;
-    PushState();
-    PushState();
-}
-
 
 void wxCairoContext::Clip( const wxRegion& region )
 {
@@ -1912,16 +1167,16 @@ void wxCairoContext::Clip( const wxRegion& region )
     while (ri)
     {
         path.AddRectangle(ri.GetX(), ri.GetY(), ri.GetW(), ri.GetH());
-        ++ri;
+        ri++;
     }
-
+    
     // Put it in the context
     cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
     cairo_append_path(m_context, cp);
 
     // clip to that path
     cairo_clip(m_context);
-    path.UnGetNativePath(cp);
+    path.UnGetNativePath(cp);  
 }
 
 void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
@@ -1936,7 +1191,7 @@ void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 
     // clip to that path
     cairo_clip(m_context);
-    path.UnGetNativePath(cp);
+    path.UnGetNativePath(cp);  
 }
 
 void wxCairoContext::ResetClip()
@@ -1948,8 +1203,7 @@ void wxCairoContext::ResetClip()
 void wxCairoContext::StrokePath( const wxGraphicsPath& path )
 {
     if ( !m_pen.IsNull() )
-    {
-        wxCairoOffsetHelper helper( m_context, ShouldOffset() ) ;
+    {   
         cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
         cairo_append_path(m_context,cp);
         ((wxCairoPenData*)m_pen.GetRefData())->Apply(this);
@@ -1958,11 +1212,10 @@ void wxCairoContext::StrokePath( const wxGraphicsPath& path )
     }
 }
 
-void wxCairoContext::FillPath( const wxGraphicsPath& path , wxPolygonFillMode fillStyle )
+void wxCairoContext::FillPath( const wxGraphicsPath& path , int fillStyle )
 {
     if ( !m_brush.IsNull() )
     {
-        wxCairoOffsetHelper helper( m_context, ShouldOffset() ) ;
         cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
         cairo_append_path(m_context,cp);
         ((wxCairoBrushData*)m_brush.GetRefData())->Apply(this);
@@ -2019,29 +1272,31 @@ void wxCairoContext::PopState()
     cairo_restore(m_context);
 }
 
+void wxGraphicsContext::DrawGraphicsBitmap(const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h)
+{
+    static_cast<wxCairoContext*>(this)->DrawGraphicsBitmapInternal(bmp, x, y, w, h);
+}
+
 void wxCairoContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
     wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp);
-    DrawBitmap(bitmap, x, y, w, h);
-
+    DrawGraphicsBitmapInternal(bitmap, x, y, w, h);
 }
 
-void wxCairoContext::DrawBitmap(const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+void wxCairoContext::DrawGraphicsBitmapInternal(const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
-    PushState();
-
-    // In case we're scaling the image by using a width and height different
-    // than the bitmap's size create a pattern transformation on the surface and
-    // draw the transformed pattern.
     wxCairoBitmapData* data = static_cast<wxCairoBitmapData*>(bmp.GetRefData());
     cairo_pattern_t* pattern = data->GetCairoPattern();
     wxSize size = data->GetSize();
-
-    wxDouble scaleX = w / size.GetWidth();
-    wxDouble scaleY = h / size.GetHeight();
-
+    PushState();
+    
     // prepare to draw the image
     cairo_translate(m_context, x, y);
+    // In case we're scaling the image by using a width and height different
+    // than the bitmap's size create a pattern transformation on the surface and
+    // draw the transformed pattern.
+    wxDouble scaleX = w / size.GetWidth();
+    wxDouble scaleY = h / size.GetHeight();
     cairo_scale(m_context, scaleX, scaleY);
     cairo_set_source(m_context, pattern);
     // use the original size here since the context is scaled already...
@@ -2049,6 +1304,7 @@ void wxCairoContext::DrawBitmap(const wxGraphicsBitmap &bmp, wxDouble x, wxDoubl
     // fill the rectangle using the pattern
     cairo_fill(m_context);
 
+    // clean up
     PopState();
 }
 
@@ -2061,44 +1317,23 @@ void wxCairoContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDou
 }
 
 
-void wxCairoContext::DoDrawText(const wxString& str, wxDouble x, wxDouble y)
+void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
 {
-    wxCHECK_RET( !m_font.IsNull(),
-                 wxT("wxCairoContext::DrawText - no valid font set") );
+    wxCHECK_RET( !m_font.IsNull(), wxT("wxCairoContext::DrawText - no valid font set") );
 
     if ( str.empty())
         return;
-
-    const wxCharBuffer data = str.utf8_str();
-    if ( !data )
-        return;
-
-    if ( ((wxCairoFontData*)m_font.GetRefData())->Apply(this) )
-    {
-#ifdef __WXGTK__
-        PangoLayout *layout = pango_cairo_create_layout (m_context);
-        const wxFont& font = static_cast<wxCairoFontData*>(m_font.GetRefData())->GetFont();
-        pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description);
-        pango_layout_set_text(layout, data, data.length());
-        font.GTKSetPangoAttrs(layout);
-
-        cairo_move_to(m_context, x, y);
-        pango_cairo_show_layout (m_context, layout);
-
-        g_object_unref (layout);
-
-        // Don't use Cairo text API, we already did everything.
-        return;
-#endif
-    }
+    
+    ((wxCairoFontData*)m_font.GetRefData())->Apply(this);
 
     // Cairo's x,y for drawing text is at the baseline, so we need to adjust
     // the position we move to by the ascent.
     cairo_font_extents_t fe;
     cairo_font_extents(m_context, &fe);
     cairo_move_to(m_context, x, y+fe.ascent);
-
-    cairo_show_text(m_context, data);
+    
+    const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
+    cairo_show_text(m_context,buf);
 }
 
 void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
@@ -2106,48 +1341,10 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub
 {
     wxCHECK_RET( !m_font.IsNull(), wxT("wxCairoContext::GetTextExtent - no valid font set") );
 
-    if ( width )
-        *width = 0;
-    if ( height )
-        *height = 0;
-    if ( descent )
-        *descent = 0;
-    if ( externalLeading )
-        *externalLeading = 0;
-
     if ( str.empty())
         return;
 
-    if ( ((wxCairoFontData*)m_font.GetRefData())->Apply((wxCairoContext*)this) )
-    {
-#ifdef __WXGTK__
-        int w, h;
-
-        PangoLayout *layout = pango_cairo_create_layout (m_context);
-        const wxFont& font = static_cast<wxCairoFontData*>(m_font.GetRefData())->GetFont();
-        pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description);
-        const wxCharBuffer data = str.utf8_str();
-        if ( !data )
-        {
-            return;
-        }
-        pango_layout_set_text(layout, data, data.length());
-        pango_layout_get_pixel_size (layout, &w, &h);
-        if ( width )
-            *width = w;
-        if ( height )
-            *height = h;
-        if (descent)
-        {
-            PangoLayoutIter *iter = pango_layout_get_iter(layout);
-            int baseline = pango_layout_iter_get_baseline(iter);
-            pango_layout_iter_free(iter);
-            *descent = h - PANGO_PIXELS(baseline);
-        }
-        g_object_unref (layout);
-        return;
-#endif
-    }
+    ((wxCairoFontData*)m_font.GetRefData())->Apply((wxCairoContext*)this);
 
     if (width)
     {
@@ -2161,18 +1358,7 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub
     {
         cairo_font_extents_t fe;
         cairo_font_extents(m_context, &fe);
-
-        // some backends have negative descents
-
-        if ( fe.descent < 0 )
-            fe.descent = -fe.descent;
-
-        if ( fe.height < (fe.ascent + fe.descent ) )
-        {
-            // some backends are broken re height ... (eg currently ATSUI)
-            fe.height = fe.ascent + fe.descent;
-        }
-
+    
         if (height)
             *height = fe.height;
         if ( descent )
@@ -2185,138 +1371,21 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub
 void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const
 {
     widths.Empty();
+    widths.Add(0, text.length());
+
     wxCHECK_RET( !m_font.IsNull(), wxT("wxCairoContext::GetPartialTextExtents - no valid font set") );
-#if __WXGTK__
-    const wxCharBuffer data = text.utf8_str();
-    int w = 0;
-    if (data.length())
-    {
-        PangoLayout* layout = pango_cairo_create_layout(m_context);
-        const wxFont& font = static_cast<wxCairoFontData*>(m_font.GetRefData())->GetFont();
-        pango_layout_set_font_description(layout, font.GetNativeFontInfo()->description);
-        pango_layout_set_text(layout, data, data.length());
-        PangoLayoutIter* iter = pango_layout_get_iter(layout);
-        PangoRectangle rect;
-        do {
-            pango_layout_iter_get_cluster_extents(iter, NULL, &rect);
-            w += rect.width;
-            widths.Add(PANGO_PIXELS(w));
-        } while (pango_layout_iter_next_cluster(iter));
-        pango_layout_iter_free(iter);
-        g_object_unref(layout);
-    }
-    size_t i = widths.GetCount();
-    const size_t len = text.length();
-    while (i++ < len)
-        widths.Add(PANGO_PIXELS(w));
-#else
+
+    if (text.empty())
+        return;
+
     // TODO
-#endif
 }
 
-void * wxCairoContext::GetNativeContext()
+void * wxCairoContext::GetNativeContext() 
 {
     return m_context;
 }
 
-bool wxCairoContext::SetAntialiasMode(wxAntialiasMode antialias)
-{
-    if (m_antialias == antialias)
-        return true;
-
-    m_antialias = antialias;
-
-    cairo_antialias_t antialiasMode;
-    switch (antialias)
-    {
-        case wxANTIALIAS_DEFAULT:
-            antialiasMode = CAIRO_ANTIALIAS_DEFAULT;
-            break;
-        case wxANTIALIAS_NONE:
-            antialiasMode = CAIRO_ANTIALIAS_NONE;
-            break;
-        default:
-            return false;
-    }
-    cairo_set_antialias(m_context, antialiasMode);
-    return true;
-}
-
-bool wxCairoContext::SetInterpolationQuality(wxInterpolationQuality WXUNUSED(interpolation))
-{
-    // placeholder
-    return false;
-}
-
-bool wxCairoContext::SetCompositionMode(wxCompositionMode op)
-{
-    if ( m_composition == op )
-        return true;
-
-    m_composition = op;
-    cairo_operator_t cop;
-    switch (op)
-    {
-        case wxCOMPOSITION_CLEAR:
-            cop = CAIRO_OPERATOR_CLEAR;
-            break;
-        case wxCOMPOSITION_SOURCE:
-            cop = CAIRO_OPERATOR_SOURCE;
-            break;
-        case wxCOMPOSITION_OVER:
-            cop = CAIRO_OPERATOR_OVER;
-            break;
-        case wxCOMPOSITION_IN:
-            cop = CAIRO_OPERATOR_IN;
-            break;
-        case wxCOMPOSITION_OUT:
-            cop = CAIRO_OPERATOR_OUT;
-            break;
-        case wxCOMPOSITION_ATOP:
-            cop = CAIRO_OPERATOR_ATOP;
-            break;
-        case wxCOMPOSITION_DEST:
-            cop = CAIRO_OPERATOR_DEST;
-            break;
-        case wxCOMPOSITION_DEST_OVER:
-            cop = CAIRO_OPERATOR_DEST_OVER;
-            break;
-        case wxCOMPOSITION_DEST_IN:
-            cop = CAIRO_OPERATOR_DEST_IN;
-            break;
-        case wxCOMPOSITION_DEST_OUT:
-            cop = CAIRO_OPERATOR_DEST_OUT;
-            break;
-        case wxCOMPOSITION_DEST_ATOP:
-            cop = CAIRO_OPERATOR_DEST_ATOP;
-            break;
-        case wxCOMPOSITION_XOR:
-            cop = CAIRO_OPERATOR_XOR;
-            break;
-        case wxCOMPOSITION_ADD:
-            cop = CAIRO_OPERATOR_ADD;
-            break;
-        default:
-            return false;
-    }
-    cairo_set_operator(m_context, cop);
-    return true;
-}
-
-void wxCairoContext::BeginLayer(wxDouble opacity)
-{
-    m_layerOpacities.push_back(opacity);
-    cairo_push_group(m_context);
-}
-
-void wxCairoContext::EndLayer()
-{
-    float opacity = m_layerOpacities.back();
-    m_layerOpacities.pop_back();
-    cairo_pop_group_to_source(m_context);
-    cairo_paint_with_alpha(m_context,opacity);
-}
-
 //-----------------------------------------------------------------------------
 // wxCairoRenderer declaration
 //-----------------------------------------------------------------------------
@@ -2331,31 +1400,26 @@ public :
     // Context
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
+
+#ifdef __WXMSW__
     virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
-    virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc);
+#endif
 
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
 
     virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
-#if wxUSE_IMAGE
-    virtual wxGraphicsContext * CreateContextFromImage(wxImage& image);
-#endif // wxUSE_IMAGE
 
     virtual wxGraphicsContext * CreateContext( wxWindow* window );
 
     virtual wxGraphicsContext * CreateMeasuringContext();
-#ifdef __WXMSW__
-#if wxUSE_ENH_METAFILE
-    virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc);
-#endif
-#endif
+
     // Path
 
     virtual wxGraphicsPath CreatePath();
 
     // Matrix
 
-    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
+    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
         wxDouble tx=0.0, wxDouble ty=0.0);
 
 
@@ -2363,44 +1427,21 @@ public :
 
     virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ;
 
-    virtual wxGraphicsBrush
-    CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                              wxDouble x2, wxDouble y2,
-                              const wxGraphicsGradientStops& stops);
+    // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+    virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+        const wxColour&c1, const wxColour&c2) ;
 
-    virtual wxGraphicsBrush
-    CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                              wxDouble xc, wxDouble yc,
-                              wxDouble radius,
-                              const wxGraphicsGradientStops& stops);
+    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) 
+    // with radius r and color cColor
+    virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor) ;
 
     // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
-    virtual wxGraphicsFont CreateFont(double sizeInPixels,
-                                      const wxString& facename,
-                                      int flags = wxFONTFLAG_DEFAULT,
-                                      const wxColour& col = *wxBLACK);
+    
+    wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap ) ;
 
-    // create a native bitmap representation
-    virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap );
-#if wxUSE_IMAGE
-    virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image);
-    virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp);
-#endif // wxUSE_IMAGE
-
-    // create a graphics bitmap from a native bitmap
-    virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap );
-
-    // create a subimage from a native image representation
-    virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  );
-
-protected :
-    bool EnsureIsLoaded();
-    void Load();
-    void Unload();
-    friend class wxCairoModule;
 private :
-    int m_loaded;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer)
 } ;
 
@@ -2411,69 +1452,32 @@ private :
 IMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer)
 
 static wxCairoRenderer gs_cairoGraphicsRenderer;
-// temporary hack to allow creating a cairo context on any platform
-extern wxGraphicsRenderer* gCairoRenderer;
-wxGraphicsRenderer* gCairoRenderer = &gs_cairoGraphicsRenderer;
 
-bool wxCairoRenderer::EnsureIsLoaded()
+#ifdef __WXGTK__
+wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()
 {
-#ifndef __WXGTK__
-    Load();
-    return wxCairoInit();
-#else
-    return true;
+    return &gs_cairoGraphicsRenderer;
+}
 #endif
-}
-
-void wxCairoRenderer::Load()
-{
-    wxCairoInit();
-}
-
-void wxCairoRenderer::Unload()
-{
-    wxCairoCleanUp();
-}
-
-// call EnsureIsLoaded() and return returnOnFail value if it fails
-#define ENSURE_LOADED_OR_RETURN(returnOnFail)  \
-    if ( !EnsureIsLoaded() )                   \
-        return (returnOnFail)
 
 wxGraphicsContext * wxCairoRenderer::CreateContext( const wxWindowDC& dc)
 {
-    ENSURE_LOADED_OR_RETURN(NULL);
     return new wxCairoContext(this,dc);
 }
 
-wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc)
-{
-    ENSURE_LOADED_OR_RETURN(NULL);
-    return new wxCairoContext(this,dc);
-}
-
-wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc)
-{
-    ENSURE_LOADED_OR_RETURN(NULL);
-    return new wxCairoContext(this, dc);
-}
-
 #ifdef __WXMSW__
-#if wxUSE_ENH_METAFILE
-wxGraphicsContext * wxCairoRenderer::CreateContext( const wxEnhMetaFileDC& WXUNUSED(dc) )
+wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc)
 {
-    ENSURE_LOADED_OR_RETURN(NULL);
     return NULL;
 }
 #endif
-#endif
 
 wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context )
 {
-    ENSURE_LOADED_OR_RETURN(NULL);
-#ifdef __WXMSW__
+#if __WXMSW__
     return new wxCairoContext(this,(HDC)context);
-#else
+#endif
+#if __WXGTK__
     return new wxCairoContext(this,(cairo_t*)context);
 #endif
 }
@@ -2481,36 +1485,24 @@ wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * cont
 
 wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeWindow( void * window )
 {
-    ENSURE_LOADED_OR_RETURN(NULL);
 #ifdef __WXGTK__
-    return new wxCairoContext(this, static_cast<GdkWindow*>(window));
+    return new wxCairoContext(this,(GdkDrawable*)window);
 #else
-    wxUnusedVar(window);
     return NULL;
 #endif
 }
 
-#if wxUSE_IMAGE
-wxGraphicsContext * wxCairoRenderer::CreateContextFromImage(wxImage& image)
-{
-    return new wxCairoImageContext(this, image);
-}
-#endif // wxUSE_IMAGE
-
 wxGraphicsContext * wxCairoRenderer::CreateMeasuringContext()
 {
-    ENSURE_LOADED_OR_RETURN(NULL);
 #ifdef __WXGTK__
     return CreateContextFromNativeWindow(gdk_get_default_root_window());
-#else
+#endif
     return NULL;
     // TODO
-#endif
 }
 
 wxGraphicsContext * wxCairoRenderer::CreateContext( wxWindow* window )
 {
-    ENSURE_LOADED_OR_RETURN(NULL);
     return new wxCairoContext(this, window );
 }
 
@@ -2518,7 +1510,6 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( wxWindow* window )
 
 wxGraphicsPath wxCairoRenderer::CreatePath()
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsPath);
     wxGraphicsPath path;
     path.SetRefData( new wxCairoPathData(this) );
     return path;
@@ -2527,11 +1518,10 @@ wxGraphicsPath wxCairoRenderer::CreatePath()
 
 // Matrix
 
-wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d,
+wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
                                                 wxDouble tx, wxDouble ty)
 
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsMatrix);
     wxGraphicsMatrix m;
     wxCairoMatrixData* data = new wxCairoMatrixData( this );
     data->Set( a,b,c,d,tx,ty ) ;
@@ -2539,10 +1529,9 @@ wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble
     return m;
 }
 
-wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen)
+wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen) 
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsPen);
-    if ( !pen.IsOk() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
+    if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
         return wxNullGraphicsPen;
     else
     {
@@ -2552,10 +1541,9 @@ wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen)
     }
 }
 
-wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush )
+wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush ) 
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
-    if ( !brush.IsOk() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT )
+    if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
         return wxNullGraphicsBrush;
     else
     {
@@ -2565,37 +1553,34 @@ wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush )
     }
 }
 
-wxGraphicsBrush
-wxCairoRenderer::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                                           wxDouble x2, wxDouble y2,
-                                           const wxGraphicsGradientStops& stops)
+// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+wxGraphicsBrush wxCairoRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+                                                                      const wxColour&c1, const wxColour&c2) 
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
     wxGraphicsBrush p;
     wxCairoBrushData* d = new wxCairoBrushData( this );
-    d->CreateLinearGradientBrush(x1, y1, x2, y2, stops);
+    d->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2);
     p.SetRefData(d);
     return p;
 }
 
-wxGraphicsBrush
-wxCairoRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                                           wxDouble xc, wxDouble yc, wxDouble r,
-                                           const wxGraphicsGradientStops& stops)
+// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) 
+// with radius r and color cColor
+wxGraphicsBrush wxCairoRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+                                                                      const wxColour &oColor, const wxColour &cColor) 
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
     wxGraphicsBrush p;
     wxCairoBrushData* d = new wxCairoBrushData( this );
-    d->CreateRadialGradientBrush(xo, yo, xc, yc, r, stops);
+    d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
     p.SetRefData(d);
     return p;
 }
 
-wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour &col )
+// sets the font
+wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour &col ) 
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont);
-    if ( font.IsOk() )
-    {
+    if ( font.Ok() )
+    {        
         wxGraphicsFont p;
         p.SetRefData(new wxCairoFontData( this , font, col ));
         return p;
@@ -2604,23 +1589,9 @@ wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour
         return wxNullGraphicsFont;
 }
 
-wxGraphicsFont
-wxCairoRenderer::CreateFont(double sizeInPixels,
-                            const wxString& facename,
-                            int flags,
-                            const wxColour& col)
+wxGraphicsBitmap wxGraphicsRenderer::CreateBitmap( const wxBitmap& bmp )
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont);
-
-    wxGraphicsFont font;
-    font.SetRefData(new wxCairoFontData(this, sizeInPixels, facename, flags, col));
-    return font;
-}
-
-wxGraphicsBitmap wxCairoRenderer::CreateBitmap( const wxBitmap& bmp )
-{
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
-    if ( bmp.IsOk() )
+    if ( bmp.Ok() )
     {
         wxGraphicsBitmap p;
         p.SetRefData(new wxCairoBitmapData( this , bmp ));
@@ -2630,81 +1601,15 @@ wxGraphicsBitmap wxCairoRenderer::CreateBitmap( const wxBitmap& bmp )
         return wxNullGraphicsBitmap;
 }
 
-#if wxUSE_IMAGE
-
-wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromImage(const wxImage& image)
-{
-    wxGraphicsBitmap bmp;
-
-    ENSURE_LOADED_OR_RETURN(bmp);
-
-    if ( image.IsOk() )
-    {
-        bmp.SetRefData(new wxCairoBitmapData(this, image));
-    }
-
-    return bmp;
-}
-
-wxImage wxCairoRenderer::CreateImageFromBitmap(const wxGraphicsBitmap& bmp)
-{
-    ENSURE_LOADED_OR_RETURN(wxNullImage);
-
-    const wxCairoBitmapData* const
-        data = static_cast<wxCairoBitmapData*>(bmp.GetGraphicsData());
-
-    return data ? data->ConvertToImage() : wxNullImage;
-}
-
-#endif // wxUSE_IMAGE
-
-
-wxGraphicsBitmap wxCairoRenderer::CreateBitmapFromNativeBitmap( void* bitmap )
-{
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
-    if ( bitmap != NULL )
-    {
-        wxGraphicsBitmap p;
-        p.SetRefData(new wxCairoBitmapData( this , (cairo_surface_t*) bitmap ));
-        return p;
-    }
-    else
-        return wxNullGraphicsBitmap;
-}
-
-wxGraphicsBitmap
-wxCairoRenderer::CreateSubBitmap(const wxGraphicsBitmap& WXUNUSED(bitmap),
-                                 wxDouble WXUNUSED(x),
-                                 wxDouble WXUNUSED(y),
-                                 wxDouble WXUNUSED(w),
-                                 wxDouble WXUNUSED(h))
-{
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
-    wxFAIL_MSG("wxCairoRenderer::CreateSubBitmap is not implemented.");
-    return wxNullGraphicsBitmap;
-}
+#endif  // wxUSE_CAIRO
 
 wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer()
 {
+#if wxUSE_CAIRO
     return &gs_cairoGraphicsRenderer;
-}
-
-#else // !wxUSE_CAIRO
-
-wxGraphicsRenderer* wxGraphicsRenderer::GetCairoRenderer()
-{
+#else
     return NULL;
+#endif
 }
 
-#endif  // wxUSE_CAIRO/!wxUSE_CAIRO
-
-// MSW and OS X have their own native default renderers, but the other ports
-// use Cairo by default
-#if !(defined(__WXMSW__) || defined(__WXOSX__))
-wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()
-{
-    return GetCairoRenderer();
-}
-#endif // !(__WXMSW__ || __WXOSX__)
-
 #endif // wxUSE_GRAPHICS_CONTEXT
diff --git a/Source/3rd Party/wx/src/generic/headerctrlg.cpp b/Source/3rd Party/wx/src/generic/headerctrlg.cpp
deleted file mode 100644
index 0529a6ace..000000000
--- a/Source/3rd Party/wx/src/generic/headerctrlg.cpp	
+++ /dev/null
@@ -1,721 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/headerctrlg.cpp
-// Purpose:     generic wxHeaderCtrl implementation
-// Author:      Vadim Zeitlin
-// Created:     2008-12-03
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_HEADERCTRL
-
-#include "wx/headerctrl.h"
-
-#ifdef wxHAS_GENERIC_HEADERCTRL
-
-#include "wx/dcbuffer.h"
-#include "wx/renderer.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-const unsigned COL_NONE = (unsigned)-1;
-
-} // anonymous namespace
-
-// ============================================================================
-// wxHeaderCtrl implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl creation
-// ----------------------------------------------------------------------------
-
-void wxHeaderCtrl::Init()
-{
-    m_numColumns = 0;
-    m_hover =
-    m_colBeingResized =
-    m_colBeingReordered = COL_NONE;
-    m_dragOffset = 0;
-    m_scrollOffset = 0;
-}
-
-bool wxHeaderCtrl::Create(wxWindow *parent,
-                          wxWindowID id,
-                          const wxPoint& pos,
-                          const wxSize& size,
-                          long style,
-                          const wxString& name)
-{
-    if ( !wxHeaderCtrlBase::Create(parent, id, pos, size,
-                                   style, wxDefaultValidator, name) )
-        return false;
-
-    // tell the system to not paint the background at all to avoid flicker as
-    // we paint the entire window area in our OnPaint()
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-
-    return true;
-}
-
-wxHeaderCtrl::~wxHeaderCtrl()
-{
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl columns manipulation
-// ----------------------------------------------------------------------------
-
-void wxHeaderCtrl::DoSetCount(unsigned int count)
-{
-    // update the column indices order array before changing m_numColumns
-    DoResizeColumnIndices(m_colIndices, count);
-
-    m_numColumns = count;
-
-    InvalidateBestSize();
-    Refresh();
-}
-
-unsigned int wxHeaderCtrl::DoGetCount() const
-{
-    return m_numColumns;
-}
-
-void wxHeaderCtrl::DoUpdate(unsigned int idx)
-{
-    InvalidateBestSize();
-
-    // we need to refresh not only this column but also the ones after it in
-    // case it was shown or hidden or its width changed -- it would be nice to
-    // avoid doing this unnecessary by storing the old column width (TODO)
-    RefreshColsAfter(idx);
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl scrolling
-// ----------------------------------------------------------------------------
-
-void wxHeaderCtrl::DoScrollHorz(int dx)
-{
-    m_scrollOffset += dx;
-
-    // don't call our own version which calls this function!
-    wxControl::ScrollWindow(dx, 0);
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl geometry
-// ----------------------------------------------------------------------------
-
-wxSize wxHeaderCtrl::DoGetBestSize() const
-{
-    wxWindow *win = GetParent();
-    int height = wxRendererNative::Get().GetHeaderButtonHeight( win );
-
-    // the vertical size is rather arbitrary but it looks better if we leave
-    // some space around the text
-    const wxSize size(IsEmpty() ? wxHeaderCtrlBase::DoGetBestSize().x
-                                : GetColEnd(GetColumnCount() - 1),
-                                height ); // (7*GetCharHeight())/4);
-    CacheBestSize(size);
-    return size;
-}
-
-int wxHeaderCtrl::GetColStart(unsigned int idx) const
-{
-    int pos = m_scrollOffset;
-    for ( unsigned n = 0; ; n++ )
-    {
-        const unsigned i = m_colIndices[n];
-        if ( i == idx )
-            break;
-
-        const wxHeaderColumn& col = GetColumn(i);
-        if ( col.IsShown() )
-            pos += col.GetWidth();
-    }
-
-    return pos;
-}
-
-int wxHeaderCtrl::GetColEnd(unsigned int idx) const
-{
-    int x = GetColStart(idx);
-
-    return x + GetColumn(idx).GetWidth();
-}
-
-unsigned int wxHeaderCtrl::FindColumnAtPoint(int x, bool *onSeparator) const
-{
-    int pos = 0;
-    const unsigned count = GetColumnCount();
-    for ( unsigned n = 0; n < count; n++ )
-    {
-        const unsigned idx = m_colIndices[n];
-        const wxHeaderColumn& col = GetColumn(idx);
-        if ( col.IsHidden() )
-            continue;
-
-        pos += col.GetWidth();
-
-        // if the column is resizable, check if we're approximatively over the
-        // line separating it from the next column
-        //
-        // TODO: don't hardcode sensitivity
-        if ( col.IsResizeable() && abs(x - pos) < 8 )
-        {
-            if ( onSeparator )
-                *onSeparator = true;
-            return idx;
-        }
-
-        // inside this column?
-        if ( x < pos )
-        {
-            if ( onSeparator )
-                *onSeparator = false;
-            return idx;
-        }
-    }
-
-    if ( onSeparator )
-        *onSeparator = false;
-    return COL_NONE;
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl repainting
-// ----------------------------------------------------------------------------
-
-void wxHeaderCtrl::RefreshCol(unsigned int idx)
-{
-    wxRect rect = GetClientRect();
-    rect.x += GetColStart(idx);
-    rect.width = GetColumn(idx).GetWidth();
-
-    RefreshRect(rect);
-}
-
-void wxHeaderCtrl::RefreshColIfNotNone(unsigned int idx)
-{
-    if ( idx != COL_NONE )
-        RefreshCol(idx);
-}
-
-void wxHeaderCtrl::RefreshColsAfter(unsigned int idx)
-{
-    wxRect rect = GetClientRect();
-    const int ofs = GetColStart(idx);
-    rect.x += ofs;
-    rect.width -= ofs;
-
-    RefreshRect(rect);
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl dragging/resizing/reordering
-// ----------------------------------------------------------------------------
-
-bool wxHeaderCtrl::IsResizing() const
-{
-    return m_colBeingResized != COL_NONE;
-}
-
-bool wxHeaderCtrl::IsReordering() const
-{
-    return m_colBeingReordered != COL_NONE;
-}
-
-void wxHeaderCtrl::ClearMarkers()
-{
-    wxClientDC dc(this);
-
-    wxDCOverlay dcover(m_overlay, &dc);
-    dcover.Clear();
-}
-
-void wxHeaderCtrl::EndDragging()
-{
-    // We currently only use markers for reordering, not for resizing
-    if (IsReordering())
-    {
-        ClearMarkers();
-        m_overlay.Reset();
-    }
-
-    // don't use the special dragging cursor any more
-    SetCursor(wxNullCursor);
-}
-
-void wxHeaderCtrl::CancelDragging()
-{
-    wxASSERT_MSG( IsDragging(),
-                  "shouldn't be called if we're not dragging anything" );
-
-    EndDragging();
-
-    unsigned int& col = IsResizing() ? m_colBeingResized : m_colBeingReordered;
-
-    wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED, GetId());
-    event.SetEventObject(this);
-    event.SetColumn(col);
-
-    GetEventHandler()->ProcessEvent(event);
-
-    col = COL_NONE;
-}
-
-int wxHeaderCtrl::ConstrainByMinWidth(unsigned int col, int& xPhysical)
-{
-    const int xStart = GetColStart(col);
-
-    // notice that GetMinWidth() returns 0 if there is no minimal width so it
-    // still makes sense to use it even in this case
-    const int xMinEnd = xStart + GetColumn(col).GetMinWidth();
-
-    if ( xPhysical < xMinEnd )
-        xPhysical = xMinEnd;
-
-    return xPhysical - xStart;
-}
-
-void wxHeaderCtrl::StartOrContinueResizing(unsigned int col, int xPhysical)
-{
-    wxHeaderCtrlEvent event(IsResizing() ? wxEVT_COMMAND_HEADER_RESIZING
-                                         : wxEVT_COMMAND_HEADER_BEGIN_RESIZE,
-                            GetId());
-    event.SetEventObject(this);
-    event.SetColumn(col);
-
-    event.SetWidth(ConstrainByMinWidth(col, xPhysical));
-
-    if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
-    {
-        if ( IsResizing() )
-        {
-            ReleaseMouse();
-            CancelDragging();
-        }
-        //else: nothing to do -- we just don't start to resize
-    }
-    else // go ahead with resizing
-    {
-        if ( !IsResizing() )
-        {
-            m_colBeingResized = col;
-            SetCursor(wxCursor(wxCURSOR_SIZEWE));
-            CaptureMouse();
-        }
-        //else: we had already done the above when we started
-
-    }
-}
-
-void wxHeaderCtrl::EndResizing(int xPhysical)
-{
-    wxASSERT_MSG( IsResizing(), "shouldn't be called if we're not resizing" );
-
-    EndDragging();
-
-    ReleaseMouse();
-
-    wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_END_RESIZE, GetId());
-    event.SetEventObject(this);
-    event.SetColumn(m_colBeingResized);
-    event.SetWidth(ConstrainByMinWidth(m_colBeingResized, xPhysical));
-
-    GetEventHandler()->ProcessEvent(event);
-
-    m_colBeingResized = COL_NONE;
-}
-
-void wxHeaderCtrl::UpdateReorderingMarker(int xPhysical)
-{
-    wxClientDC dc(this);
-
-    wxDCOverlay dcover(m_overlay, &dc);
-    dcover.Clear();
-
-    dc.SetPen(*wxBLUE);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-    // draw the phantom position of the column being dragged
-    int x = xPhysical - m_dragOffset;
-    int y = GetClientSize().y;
-    dc.DrawRectangle(x, 0,
-                     GetColumn(m_colBeingReordered).GetWidth(), y);
-
-    // and also a hint indicating where it is going to be inserted if it's
-    // dropped now
-    unsigned int col = FindColumnAtPoint(xPhysical);
-    if ( col != COL_NONE )
-    {
-        static const int DROP_MARKER_WIDTH = 4;
-
-        dc.SetBrush(*wxBLUE);
-        dc.DrawRectangle(GetColEnd(col) - DROP_MARKER_WIDTH/2, 0,
-                         DROP_MARKER_WIDTH, y);
-    }
-}
-
-void wxHeaderCtrl::StartReordering(unsigned int col, int xPhysical)
-{
-    wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_BEGIN_REORDER, GetId());
-    event.SetEventObject(this);
-    event.SetColumn(col);
-
-    if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() )
-    {
-        // don't start dragging it, nothing to do otherwise
-        return;
-    }
-
-    m_dragOffset = xPhysical - GetColStart(col);
-
-    m_colBeingReordered = col;
-    SetCursor(wxCursor(wxCURSOR_HAND));
-    CaptureMouse();
-
-    // do not call UpdateReorderingMarker() here: we don't want to give
-    // feedback for reordering until the user starts to really move the mouse
-    // as he might want to just click on the column and not move it at all
-}
-
-bool wxHeaderCtrl::EndReordering(int xPhysical)
-{
-    wxASSERT_MSG( IsReordering(), "shouldn't be called if we're not reordering" );
-
-    EndDragging();
-
-    ReleaseMouse();
-
-    const int colOld = m_colBeingReordered,
-              colNew = FindColumnAtPoint(xPhysical);
-
-    m_colBeingReordered = COL_NONE;
-
-    if ( xPhysical - GetColStart(colOld) == m_dragOffset )
-        return false;
-
-    if ( colNew != colOld )
-    {
-        wxHeaderCtrlEvent event(wxEVT_COMMAND_HEADER_END_REORDER, GetId());
-        event.SetEventObject(this);
-        event.SetColumn(colOld);
-
-        const unsigned pos = GetColumnPos(FindColumnAtPoint(xPhysical));
-        event.SetNewOrder(pos);
-
-        if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
-        {
-            // do reorder the columns
-            DoMoveCol(colOld, pos);
-        }
-    }
-
-    // whether we moved the column or not, the user did move the mouse and so
-    // did try to do it so return true
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl column reordering
-// ----------------------------------------------------------------------------
-
-void wxHeaderCtrl::DoSetColumnsOrder(const wxArrayInt& order)
-{
-    m_colIndices = order;
-    Refresh();
-}
-
-wxArrayInt wxHeaderCtrl::DoGetColumnsOrder() const
-{
-    return m_colIndices;
-}
-
-void wxHeaderCtrl::DoMoveCol(unsigned int idx, unsigned int pos)
-{
-    MoveColumnInOrderArray(m_colIndices, idx, pos);
-
-    Refresh();
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl event handlers
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxHeaderCtrl, wxHeaderCtrlBase)
-    EVT_PAINT(wxHeaderCtrl::OnPaint)
-
-    EVT_MOUSE_EVENTS(wxHeaderCtrl::OnMouse)
-
-    EVT_MOUSE_CAPTURE_LOST(wxHeaderCtrl::OnCaptureLost)
-
-    EVT_KEY_DOWN(wxHeaderCtrl::OnKeyDown)
-END_EVENT_TABLE()
-
-void wxHeaderCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    int w, h;
-    GetClientSize(&w, &h);
-
-#ifdef __WXGTK__
-//    int vw;
-//    GetVirtualSize(&vw, NULL);
-#endif
-
-    wxAutoBufferedPaintDC dc(this);
-
-    dc.SetBackground(GetBackgroundColour());
-    dc.Clear();
-
-    // account for the horizontal scrollbar offset in the parent window
-    dc.SetDeviceOrigin(m_scrollOffset, 0);
-
-    const unsigned int count = m_numColumns;
-    int xpos = 0;
-    for ( unsigned int i = 0; i < count; i++ )
-    {
-        const unsigned idx = m_colIndices[i];
-        const wxHeaderColumn& col = GetColumn(idx);
-        if ( col.IsHidden() )
-            continue;
-
-        int colWidth = col.GetWidth();
-
-        wxHeaderSortIconType sortArrow;
-        if ( col.IsSortKey() )
-        {
-            sortArrow = col.IsSortOrderAscending() ? wxHDR_SORT_ICON_UP
-                                                   : wxHDR_SORT_ICON_DOWN;
-        }
-        else // not sorting by this column
-        {
-            sortArrow = wxHDR_SORT_ICON_NONE;
-        }
-
-        int state = 0;
-        if ( IsEnabled() )
-        {
-            if ( idx == m_hover )
-                state = wxCONTROL_CURRENT;
-        }
-        else // disabled
-        {
-            state = wxCONTROL_DISABLED;
-        }
-
-        if (i == 0)
-           state |= wxCONTROL_SPECIAL;
-
-        wxHeaderButtonParams params;
-        params.m_labelText = col.GetTitle();
-        params.m_labelBitmap = col.GetBitmap();
-        params.m_labelAlignment = col.GetAlignment();
-
-#ifdef __WXGTK__
-        if (i == count-1)
-        {
-//            colWidth = wxMax( colWidth, vw - xpos );
-            state |= wxCONTROL_DIRTY;
-        }
-#endif
-
-        wxRendererNative::Get().DrawHeaderButton
-                                (
-                                    this,
-                                    dc,
-                                    wxRect(xpos, 0, colWidth, h),
-                                    state,
-                                    sortArrow,
-                                    &params
-                                );
-
-        xpos += colWidth;
-    }
-}
-
-void wxHeaderCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
-{
-    if ( IsDragging() )
-        CancelDragging();
-}
-
-void wxHeaderCtrl::OnKeyDown(wxKeyEvent& event)
-{
-    if ( event.GetKeyCode() == WXK_ESCAPE )
-    {
-        if ( IsDragging() )
-        {
-            ReleaseMouse();
-            CancelDragging();
-
-            return;
-        }
-    }
-
-    event.Skip();
-}
-
-void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent)
-{
-    // do this in advance to allow simply returning if we're not interested,
-    // we'll undo it if we do handle the event below
-    mevent.Skip();
-
-
-    // account for the control displacement
-    const int xPhysical = mevent.GetX();
-    const int xLogical = xPhysical - m_scrollOffset;
-
-    // first deal with the [continuation of any] dragging operations in
-    // progress
-    if ( IsResizing() )
-    {
-        if ( mevent.LeftUp() )
-            EndResizing(xPhysical);
-        else // update the live separator position
-            StartOrContinueResizing(m_colBeingResized, xPhysical);
-
-        return;
-    }
-
-    if ( IsReordering() )
-    {
-        if ( !mevent.LeftUp() )
-        {
-            // update the column position
-            UpdateReorderingMarker(xPhysical);
-
-            return;
-        }
-
-        // finish reordering and continue to generate a click event below if we
-        // didn't really reorder anything
-        if ( EndReordering(xPhysical) )
-            return;
-    }
-
-
-    // find if the event is over a column at all
-    bool onSeparator;
-    const unsigned col = mevent.Leaving()
-                            ? (onSeparator = false, COL_NONE)
-                            : FindColumnAtPoint(xLogical, &onSeparator);
-
-
-    // update the highlighted column if it changed
-    if ( col != m_hover )
-    {
-        const unsigned hoverOld = m_hover;
-        m_hover = col;
-
-        RefreshColIfNotNone(hoverOld);
-        RefreshColIfNotNone(m_hover);
-    }
-
-    // update mouse cursor as it moves around
-    if ( mevent.Moving() )
-    {
-        SetCursor(onSeparator ? wxCursor(wxCURSOR_SIZEWE) : wxNullCursor);
-        return;
-    }
-
-    // all the other events only make sense when they happen over a column
-    if ( col == COL_NONE )
-        return;
-
-
-    // enter various dragging modes on left mouse press
-    if ( mevent.LeftDown() )
-    {
-        if ( onSeparator )
-        {
-            // start resizing the column
-            wxASSERT_MSG( !IsResizing(), "reentering column resize mode?" );
-            StartOrContinueResizing(col, xPhysical);
-        }
-        else // on column itself
-        {
-            // start dragging the column
-            wxASSERT_MSG( !IsReordering(), "reentering column move mode?" );
-
-            StartReordering(col, xPhysical);
-        }
-
-        return;
-    }
-
-    // determine the type of header event corresponding to click events
-    wxEventType evtType = wxEVT_NULL;
-    const bool click = mevent.ButtonUp(),
-               dblclk = mevent.ButtonDClick();
-    if ( click || dblclk )
-    {
-        switch ( mevent.GetButton() )
-        {
-            case wxMOUSE_BTN_LEFT:
-                // treat left double clicks on separator specially
-                if ( onSeparator && dblclk )
-                {
-                    evtType = wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK;
-                }
-                else // not double click on separator
-                {
-                    evtType = click ? wxEVT_COMMAND_HEADER_CLICK
-                                    : wxEVT_COMMAND_HEADER_DCLICK;
-                }
-                break;
-
-            case wxMOUSE_BTN_RIGHT:
-                evtType = click ? wxEVT_COMMAND_HEADER_RIGHT_CLICK
-                                : wxEVT_COMMAND_HEADER_RIGHT_DCLICK;
-                break;
-
-            case wxMOUSE_BTN_MIDDLE:
-                evtType = click ? wxEVT_COMMAND_HEADER_MIDDLE_CLICK
-                                : wxEVT_COMMAND_HEADER_MIDDLE_DCLICK;
-                break;
-
-            default:
-                // ignore clicks from other mouse buttons
-                ;
-        }
-    }
-
-    if ( evtType == wxEVT_NULL )
-        return;
-
-    wxHeaderCtrlEvent event(evtType, GetId());
-    event.SetEventObject(this);
-    event.SetColumn(col);
-
-    if ( GetEventHandler()->ProcessEvent(event) )
-        mevent.Skip(false);
-}
-
-#endif // wxHAS_GENERIC_HEADERCTRL
-
-#endif // wxUSE_HEADERCTRL
diff --git a/Source/3rd Party/wx/src/generic/infobar.cpp b/Source/3rd Party/wx/src/generic/infobar.cpp
deleted file mode 100644
index 40d194dbe..000000000
--- a/Source/3rd Party/wx/src/generic/infobar.cpp	
+++ /dev/null
@@ -1,374 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/infobar.cpp
-// Purpose:     generic wxInfoBar implementation
-// Author:      Vadim Zeitlin
-// Created:     2009-07-28
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_INFOBAR
-
-#include "wx/infobar.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/bmpbuttn.h"
-    #include "wx/button.h"
-    #include "wx/dcmemory.h"
-    #include "wx/settings.h"
-    #include "wx/statbmp.h"
-    #include "wx/stattext.h"
-    #include "wx/sizer.h"
-#endif // WX_PRECOMP
-
-#include "wx/artprov.h"
-#include "wx/renderer.h"
-#include "wx/scopeguard.h"
-
-BEGIN_EVENT_TABLE(wxInfoBarGeneric, wxInfoBarBase)
-    EVT_BUTTON(wxID_ANY, wxInfoBarGeneric::OnButton)
-END_EVENT_TABLE()
-
-// ----------------------------------------------------------------------------
-// local helpers
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-
-wxBitmap
-GetCloseButtonBitmap(wxWindow *win,
-                     const wxSize& size,
-                     const wxColour& colBg,
-                     int flags = 0)
-{
-    wxBitmap bmp(size);
-    wxMemoryDC dc(bmp);
-    dc.SetBackground(colBg);
-    dc.Clear();
-    wxRendererNative::Get().
-        DrawTitleBarBitmap(win, dc, size, wxTITLEBAR_BUTTON_CLOSE, flags);
-    return bmp;
-}
-
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-
-} // anonymous namespace
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-void wxInfoBarGeneric::Init()
-{
-    m_icon = NULL;
-    m_text = NULL;
-    m_button = NULL;
-
-    m_showEffect =
-    m_hideEffect = wxSHOW_EFFECT_MAX;
-
-    // use default effect duration
-    m_effectDuration = 0;
-}
-
-bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid)
-{
-    // calling Hide() before Create() ensures that we're created initially
-    // hidden
-    Hide();
-    if ( !wxWindow::Create(parent, winid) )
-        return false;
-
-    // use special, easy to notice, colours
-    const wxColour colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK);
-    SetBackgroundColour(colBg);
-    SetOwnForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
-
-    // create the controls: icon, text and the button to dismiss the
-    // message.
-
-    // the icon is not shown unless it's assigned a valid bitmap
-    m_icon = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap);
-
-    m_text = new wxStaticText(this, wxID_ANY, "");
-
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-    const wxSize sizeBmp = wxArtProvider::GetSizeHint(wxART_BUTTON);
-    wxBitmap bmp = GetCloseButtonBitmap(this, sizeBmp, colBg);
-#else // !wxHAS_DRAW_TITLE_BAR_BITMAP
-    wxBitmap bmp = wxArtProvider::GetBitmap(wxART_CLOSE, wxART_BUTTON);
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-    m_button = new wxBitmapButton
-                   (
-                    this,
-                    wxID_ANY,
-                    bmp,
-                    wxDefaultPosition,
-                    wxDefaultSize,
-                    wxBORDER_NONE
-                   );
-
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-    m_button->SetBitmapPressed(
-        GetCloseButtonBitmap(this, sizeBmp, colBg, wxCONTROL_PRESSED));
-
-    m_button->SetBitmapCurrent(
-        GetCloseButtonBitmap(this, sizeBmp, colBg, wxCONTROL_CURRENT));
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-
-    m_button->SetBackgroundColour(colBg);
-    m_button->SetToolTip(_("Hide this notification message."));
-
-    // center the text inside the sizer with an icon to the left of it and a
-    // button at the very right
-    //
-    // NB: AddButton() relies on the button being the last control in the sizer
-    //     and being preceded by a spacer
-    wxSizer * const sizer = new wxBoxSizer(wxHORIZONTAL);
-    sizer->Add(m_icon, wxSizerFlags().Centre().Border());
-    sizer->Add(m_text, wxSizerFlags().Centre());
-    sizer->AddStretchSpacer();
-    sizer->Add(m_button, wxSizerFlags().Centre().Border());
-    SetSizer(sizer);
-
-    return true;
-}
-
-bool wxInfoBarGeneric::SetFont(const wxFont& font)
-{
-    if ( !wxInfoBarBase::SetFont(font) )
-        return false;
-
-    // check that we're not called before Create()
-    if ( m_text )
-        m_text->SetFont(font);
-
-    return true;
-}
-
-wxInfoBarGeneric::BarPlacement wxInfoBarGeneric::GetBarPlacement() const
-{
-    wxSizer * const sizer = GetContainingSizer();
-    if ( !sizer )
-        return BarPlacement_Unknown;
-
-    // FIXME-VC6: can't compare "const wxInfoBarGeneric *" and "wxWindow *",
-    //            so need this workaround
-    wxWindow * const self = const_cast<wxInfoBarGeneric *>(this);
-    const wxSizerItemList& siblings = sizer->GetChildren();
-    if ( siblings.GetFirst()->GetData()->GetWindow() == self )
-        return BarPlacement_Top;
-    else if ( siblings.GetLast()->GetData()->GetWindow() == self )
-        return BarPlacement_Bottom;
-    else
-        return BarPlacement_Unknown;
-}
-
-wxShowEffect wxInfoBarGeneric::GetShowEffect() const
-{
-    if ( m_showEffect != wxSHOW_EFFECT_MAX )
-        return m_showEffect;
-
-    switch ( GetBarPlacement() )
-    {
-        case BarPlacement_Top:
-            return wxSHOW_EFFECT_SLIDE_TO_BOTTOM;
-
-        case BarPlacement_Bottom:
-            return wxSHOW_EFFECT_SLIDE_TO_TOP;
-
-        default:
-            wxFAIL_MSG( "unknown info bar placement" );
-            // fall through
-
-        case BarPlacement_Unknown:
-            return wxSHOW_EFFECT_NONE;
-    }
-}
-
-wxShowEffect wxInfoBarGeneric::GetHideEffect() const
-{
-    if ( m_hideEffect != wxSHOW_EFFECT_MAX )
-        return m_hideEffect;
-
-    switch ( GetBarPlacement() )
-    {
-        case BarPlacement_Top:
-            return wxSHOW_EFFECT_SLIDE_TO_TOP;
-
-        case BarPlacement_Bottom:
-            return wxSHOW_EFFECT_SLIDE_TO_BOTTOM;
-
-        default:
-            wxFAIL_MSG( "unknown info bar placement" );
-            // fall through
-
-        case BarPlacement_Unknown:
-            return wxSHOW_EFFECT_NONE;
-    }
-}
-
-void wxInfoBarGeneric::UpdateParent()
-{
-    wxWindow * const parent = GetParent();
-    parent->Layout();
-}
-
-void wxInfoBarGeneric::DoHide()
-{
-    HideWithEffect(GetHideEffect(), GetEffectDuration());
-
-    UpdateParent();
-}
-
-void wxInfoBarGeneric::DoShow()
-{
-    // re-layout the parent first so that the window expands into an already
-    // unoccupied by the other controls area: for this we need to change our
-    // internal visibility flag to force Layout() to take us into account (an
-    // alternative solution to this hack would be to temporarily set
-    // wxRESERVE_SPACE_EVEN_IF_HIDDEN flag but it's not really batter)
-
-    // just change the internal flag indicating that the window is visible,
-    // without really showing it
-    wxWindowBase::Show();
-
-    // adjust the parent layout to account for us
-    UpdateParent();
-
-    // reset the flag back before really showing the window or it wouldn't be
-    // shown at all because it would believe itself already visible
-    wxWindowBase::Show(false);
-
-
-    // finally do really show the window.
-    ShowWithEffect(GetShowEffect(), GetEffectDuration());
-}
-
-void wxInfoBarGeneric::ShowMessage(const wxString& msg, int flags)
-{
-    // first update the controls
-    const int icon = flags & wxICON_MASK;
-    if ( !icon || (icon == wxICON_NONE) )
-    {
-        m_icon->Hide();
-    }
-    else // do show an icon
-    {
-        m_icon->SetBitmap(wxArtProvider::GetBitmap(
-                            wxArtProvider::GetMessageBoxIconId(flags),
-                          wxART_BUTTON));
-        m_icon->Show();
-    }
-
-    // notice the use of EscapeMnemonics() to ensure that "&" come through
-    // correctly
-    m_text->SetLabel(wxControl::EscapeMnemonics(msg));
-
-
-    // then show this entire window if not done yet
-    if ( !IsShown() )
-    {
-        DoShow();
-    }
-    else // we're already shown
-    {
-        // just update the layout to correspond to the new message
-        Layout();
-    }
-}
-
-void wxInfoBarGeneric::Dismiss()
-{
-    DoHide();
-}
-
-void wxInfoBarGeneric::AddButton(wxWindowID btnid, const wxString& label)
-{
-    wxSizer * const sizer = GetSizer();
-    wxCHECK_RET( sizer, "must be created first" );
-
-    // user-added buttons replace the standard close button so remove it if we
-    // hadn't done it yet
-    if ( sizer->Detach(m_button) )
-    {
-        m_button->Hide();
-    }
-
-    wxButton * const button = new wxButton(this, btnid, label);
-
-#ifdef __WXMAC__
-    // smaller buttons look better in the (narrow) info bar under OS X
-    button->SetWindowVariant(wxWINDOW_VARIANT_SMALL);
-#endif // __WXMAC__
-
-    sizer->Add(button, wxSizerFlags().Centre().DoubleBorder());
-}
-
-void wxInfoBarGeneric::RemoveButton(wxWindowID btnid)
-{
-    wxSizer * const sizer = GetSizer();
-    wxCHECK_RET( sizer, "must be created first" );
-
-    // iterate over the sizer items in reverse order to find the last added
-    // button with this id (ids of all buttons should be unique anyhow but if
-    // they are repeated removing the last added one probably makes more sense)
-    const wxSizerItemList& items = sizer->GetChildren();
-    for ( wxSizerItemList::compatibility_iterator node = items.GetLast();
-          node != items.GetFirst();
-          node = node->GetPrevious() )
-    {
-        const wxSizerItem * const item = node->GetData();
-
-        // if we reached the spacer separating the buttons from the text
-        // preceding them without finding our button, it must mean it's not
-        // there at all
-        if ( item->IsSpacer() )
-        {
-            wxFAIL_MSG( wxString::Format("button with id %d not found", btnid) );
-            return;
-        }
-
-        // check if we found our button
-        if ( item->GetWindow()->GetId() == btnid )
-        {
-            delete item->GetWindow();
-            break;
-        }
-    }
-
-    // check if there are any custom buttons left
-    if ( sizer->GetChildren().GetLast()->GetData()->IsSpacer() )
-    {
-        // if the last item is the spacer, none are left so restore the
-        // standard close button
-        sizer->Add(m_button, wxSizerFlags().Centre().DoubleBorder());
-        m_button->Show();
-    }
-}
-
-void wxInfoBarGeneric::OnButton(wxCommandEvent& WXUNUSED(event))
-{
-    DoHide();
-}
-
-#endif // wxUSE_INFOBAR
diff --git a/Source/3rd Party/wx/src/generic/listbkg.cpp b/Source/3rd Party/wx/src/generic/listbkg.cpp
index 0fc2ff6be..50a6ea40e 100644
--- a/Source/3rd Party/wx/src/generic/listbkg.cpp	
+++ b/Source/3rd Party/wx/src/generic/listbkg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.08.03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listbkg.cpp 48783 2007-09-19 11:24:38Z RR $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -36,8 +36,6 @@
 #include "wx/statline.h"
 #include "wx/imaglist.h"
 
-#include "wx/sysopt.h"
-
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 // ----------------------------------------------------------------------------
@@ -50,9 +48,12 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbook, wxBookCtrlBase)
+IMPLEMENT_DYNAMIC_CLASS(wxListbookEvent, wxNotifyEvent)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wxNewEventType();
+const wxEventType wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxNewEventType();
+#endif
 
 BEGIN_EVENT_TABLE(wxListbook, wxBookCtrlBase)
     EVT_SIZE(wxListbook::OnSize)
@@ -67,6 +68,11 @@ END_EVENT_TABLE()
 // wxListbook creation
 // ----------------------------------------------------------------------------
 
+void wxListbook::Init()
+{
+    m_selection = wxNOT_FOUND;
+}
+
 bool
 wxListbook::Create(wxWindow *parent,
                    wxWindowID id,
@@ -99,9 +105,8 @@ wxListbook::Create(wxWindow *parent,
                     wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    wxLC_SINGLE_SEL |
-                    (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP) |
-                    wxLC_LIST
+                    wxLC_ICON | wxLC_SINGLE_SEL |
+                        (IsVertical() ? wxLC_ALIGN_LEFT : wxLC_ALIGN_TOP)
                  );
 
 #ifdef __WXMSW__
@@ -121,6 +126,28 @@ wxListbook::Create(wxWindow *parent,
 // wxListbook geometry management
 // ----------------------------------------------------------------------------
 
+wxSize wxListbook::GetControllerSize() const
+{
+    const wxSize sizeClient = GetClientSize(),
+                 sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
+                 sizeList = GetListView()->GetViewRect().GetSize() + sizeBorder;
+
+    wxSize size;
+
+    if ( IsVertical() )
+    {
+        size.x = sizeClient.x;
+        size.y = sizeList.y;
+    }
+    else // left/right aligned
+    {
+        size.x = sizeList.x;
+        size.y = sizeClient.y;
+    }
+
+    return size;
+}
+
 void wxListbook::OnSize(wxSizeEvent& event)
 {
     // arrange the icons before calling SetClientSize(), otherwise it wouldn't
@@ -128,11 +155,9 @@ void wxListbook::OnSize(wxSizeEvent& event)
     // under MSW, we'd finish with an ugly looking list control with both
     // vertical and horizontal scrollbar (with one of them being added because
     // the other one is not accounted for in client size computations)
-    wxListView * const list = GetListView();
-    if ( list )
-        list->Arrange();
-
-    event.Skip();
+    wxListView *list = GetListView();
+    if (list) list->Arrange();
+    wxBookCtrlBase::OnSize(event);
 }
 
 int wxListbook::HitTest(const wxPoint& pt, long *flags) const
@@ -174,14 +199,25 @@ int wxListbook::HitTest(const wxPoint& pt, long *flags) const
     return pagePos;
 }
 
-void wxListbook::UpdateSize()
+wxSize wxListbook::CalcSizeFromPage(const wxSize& sizePage) const
 {
-    // we should find a more elegant way to force a layout than generating this
-    // dummy event
-    wxSizeEvent sz(GetSize(), GetId());
-    GetEventHandler()->ProcessEvent(sz);
+    // we need to add the size of the list control and the border between
+    const wxSize sizeList = GetControllerSize();
+
+    wxSize size = sizePage;
+    if ( IsVertical() )
+    {
+        size.y += sizeList.y + GetInternalBorder();
+    }
+    else // left/right aligned
+    {
+        size.x += sizeList.x + GetInternalBorder();
+    }
+
+    return size;
 }
 
+
 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------
@@ -198,19 +234,11 @@ wxString wxListbook::GetPageText(size_t n) const
     return GetListView()->GetItemText(n);
 }
 
-int wxListbook::GetPageImage(size_t n) const
+int wxListbook::GetPageImage(size_t WXUNUSED(n)) const
 {
-    wxListItem item;
-    item.SetId(n);
+    wxFAIL_MSG( _T("wxListbook::GetPageImage() not implemented") );
 
-    if (GetListView()->GetItem(item))
-    {
-       return item.GetImage();
-    }
-    else
-    {
-       return wxNOT_FOUND;
-    }
+    return wxNOT_FOUND;
 }
 
 bool wxListbook::SetPageImage(size_t n, int imageId)
@@ -224,33 +252,7 @@ bool wxListbook::SetPageImage(size_t n, int imageId)
 
 void wxListbook::SetImageList(wxImageList *imageList)
 {
-    wxListView * const list = GetListView();
-
-    // If imageList presence has changed, we update the list control style
-    if ( (imageList != NULL) != (GetImageList() != NULL) )
-    {
-        // Preserve the selection which is lost when changing the mode
-        const int oldSel = GetSelection();
-
-        // Update the style to use icon view for images, list view otherwise
-        long style = list->GetWindowStyle() & ~wxLC_MASK_TYPE;
-        if ( imageList )
-        {
-            style |= wxLC_ICON;
-        }
-        else // no image list
-        {
-            style |= wxLC_LIST;
-        }
-
-        list->SetWindowStyleFlag(style);
-
-        // Restore selection
-        if ( oldSel != wxNOT_FOUND )
-            SetSelection(oldSel);
-    }
-
-    list->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
+    GetListView()->SetImageList(imageList, wxIMAGE_LIST_NORMAL);
 
     wxBookCtrlBase::SetImageList(imageList);
 }
@@ -266,12 +268,17 @@ void wxListbook::UpdateSelectedPage(size_t newsel)
     GetListView()->Focus(newsel);
 }
 
-wxBookCtrlEvent* wxListbook::CreatePageChangingEvent() const
+int wxListbook::GetSelection() const
 {
-    return new wxBookCtrlEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
+    return m_selection;
 }
 
-void wxListbook::MakeChangedEvent(wxBookCtrlEvent &event)
+wxBookCtrlBaseEvent* wxListbook::CreatePageChangingEvent() const
+{
+    return new wxListbookEvent(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, m_windowId);
+}
+
+void wxListbook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
 {
     event.SetEventType(wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED);
 }
@@ -303,10 +310,22 @@ wxListbook::InsertPage(size_t n,
         GetListView()->Focus(m_selection);
     }
 
-    if ( !DoSetSelectionAfterInsertion(n, bSelect) )
+    // some page should be selected: either this one or the first one if there
+    // is still no selection
+    int selNew = -1;
+    if ( bSelect )
+        selNew = n;
+    else if ( m_selection == -1 )
+        selNew = 0;
+
+    if ( selNew != m_selection )
         page->Hide();
 
-    UpdateSize();
+    if ( selNew != -1 )
+        SetSelection(selNew);
+
+    wxSizeEvent sz(GetSize(), GetId());
+    GetEventHandler()->ProcessEvent(sz);
 
     return true;
 }
@@ -326,7 +345,7 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
             int sel = m_selection - 1;
             if (page_count == 1)
                 sel = wxNOT_FOUND;
-            else if ((page_count == 2) || (sel == wxNOT_FOUND))
+            else if ((page_count == 2) || (sel == -1))
                 sel = 0;
 
             // force sel invalid if deleting current page - don't try to hide it
@@ -337,7 +356,11 @@ wxWindow *wxListbook::DoRemovePage(size_t page)
         }
 
         GetListView()->Arrange();
-        UpdateSize();
+        if (GetPageCount() == 0)
+        {
+            wxSizeEvent sz(GetSize(), GetId());
+            ProcessEvent(sz);
+        }
     }
 
     return win;
@@ -350,7 +373,10 @@ bool wxListbook::DeleteAllPages()
     if (!wxBookCtrlBase::DeleteAllPages())
         return false;
 
-    UpdateSize();
+    m_selection = -1;
+
+    wxSizeEvent sz(GetSize(), GetId());
+    ProcessEvent(sz);
 
     return true;
 }
diff --git a/Source/3rd Party/wx/src/generic/logg.cpp b/Source/3rd Party/wx/src/generic/logg.cpp
index 572cc04bc..e370dc4ea 100644
--- a/Source/3rd Party/wx/src/generic/logg.cpp	
+++ b/Source/3rd Party/wx/src/generic/logg.cpp	
@@ -5,7 +5,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.09.99 (extracted from src/common/log.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: logg.cpp 43078 2006-11-04 23:46:02Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,27 +38,20 @@
     #include "wx/sizer.h"
     #include "wx/statbmp.h"
     #include "wx/settings.h"
-    #include "wx/wxcrtvararg.h"
 #endif // WX_PRECOMP
 
 #if wxUSE_LOGGUI || wxUSE_LOGWINDOW
 
 #include "wx/file.h"
-#include "wx/clipbrd.h"
-#include "wx/dataobj.h"
 #include "wx/textfile.h"
 #include "wx/statline.h"
 #include "wx/artprov.h"
-#include "wx/collpane.h"
-#include "wx/arrstr.h"
-#include "wx/msgout.h"
 
 #ifdef  __WXMSW__
     // for OutputDebugString()
     #include  "wx/msw/private.h"
 #endif // Windows
 
-
 #ifdef  __WXPM__
     #include <time.h>
 #endif
@@ -69,12 +62,14 @@
     #include "wx/image.h"
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 
-#include "wx/time.h"
+#if defined(__MWERKS__) && wxUSE_UNICODE
+    #include <wtime.h>
+#endif
+
+#include "wx/datetime.h"
 
 // the suffix we add to the button to show that the dialog can be expanded
-#define EXPAND_SUFFIX wxT(" >>")
-
-#define CAN_SAVE_FILES (wxUSE_FILE && wxUSE_FILEDLG)
+#define EXPAND_SUFFIX _T(" >>")
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -84,16 +79,20 @@
 
 // this function is a wrapper around strftime(3)
 // allows to exclude the usage of wxDateTime
-static wxString TimeStamp(const wxString& format, time_t t)
+static wxString TimeStamp(const wxChar *format, time_t t)
 {
+#if wxUSE_DATETIME
     wxChar buf[4096];
     struct tm tm;
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, wxLocaltime_r(&t, &tm)) )
     {
         // buffer is too small?
-        wxFAIL_MSG(wxT("strftime() failed"));
+        wxFAIL_MSG(_T("strftime() failed"));
     }
     return wxString(buf);
+#else // !wxUSE_DATETIME
+    return wxEmptyString;
+#endif // wxUSE_DATETIME/!wxUSE_DATETIME
 }
 
 
@@ -110,67 +109,53 @@ public:
 
     // event handlers
     void OnOk(wxCommandEvent& event);
-#if wxUSE_CLIPBOARD
-    void OnCopy(wxCommandEvent& event);
-#endif // wxUSE_CLIPBOARD
-#if CAN_SAVE_FILES
+    void OnDetails(wxCommandEvent& event);
+#if wxUSE_FILE
     void OnSave(wxCommandEvent& event);
-#endif // CAN_SAVE_FILES
-    void OnListItemActivated(wxListEvent& event);
+#endif // wxUSE_FILE
+    void OnListSelect(wxListEvent& event);
 
 private:
     // create controls needed for the details display
-    void CreateDetailsControls(wxWindow *);
-
-    // if necessary truncates the given string and adds an ellipsis
-    wxString EllipsizeString(const wxString &text)
-    {
-        if (ms_maxLength > 0 &&
-            text.length() > ms_maxLength)
-        {
-            wxString ret(text);
-            ret.Truncate(ms_maxLength);
-            ret << "...";
-            return ret;
-        }
-
-        return text;
-    }
-
-#if CAN_SAVE_FILES || wxUSE_CLIPBOARD
-    // return the contents of the dialog as a multiline string
-    wxString GetLogMessages() const;
-#endif // CAN_SAVE_FILES || wxUSE_CLIPBOARD
-
+    void CreateDetailsControls();
 
     // the data for the listctrl
     wxArrayString m_messages;
     wxArrayInt m_severity;
     wxArrayLong m_times;
 
+    // the "toggle" button and its state
+#ifndef __SMARTPHONE__
+    wxButton *m_btnDetails;
+#endif
+    bool      m_showingDetails;
+
     // the controls which are not shown initially (but only when details
     // button is pressed)
     wxListCtrl *m_listctrl;
+#ifndef __SMARTPHONE__
+#if wxUSE_STATLINE
+    wxStaticLine *m_statline;
+#endif // wxUSE_STATLINE
+#if wxUSE_FILE
+    wxButton *m_btnSave;
+#endif // wxUSE_FILE
+#endif // __SMARTPHONE__
 
     // the translated "Details" string
     static wxString ms_details;
 
-    // the maximum length of the log message
-    static size_t ms_maxLength;
-
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxLogDialog);
+    DECLARE_NO_COPY_CLASS(wxLogDialog)
 };
 
 BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxLogDialog::OnOk)
-#if wxUSE_CLIPBOARD
-    EVT_BUTTON(wxID_COPY,   wxLogDialog::OnCopy)
-#endif // wxUSE_CLIPBOARD
-#if CAN_SAVE_FILES
+    EVT_BUTTON(wxID_MORE,   wxLogDialog::OnDetails)
+#if wxUSE_FILE
     EVT_BUTTON(wxID_SAVE,   wxLogDialog::OnSave)
-#endif // CAN_SAVE_FILES
-    EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxLogDialog::OnListItemActivated)
+#endif // wxUSE_FILE
+    EVT_LIST_ITEM_SELECTED(wxID_ANY, wxLogDialog::OnListSelect)
 END_EVENT_TABLE()
 
 #endif // wxUSE_LOG_DIALOG
@@ -179,7 +164,7 @@ END_EVENT_TABLE()
 // private functions
 // ----------------------------------------------------------------------------
 
-#if CAN_SAVE_FILES
+#if wxUSE_FILE && wxUSE_FILEDLG
 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns true on success (file was opened),
@@ -187,12 +172,53 @@ END_EVENT_TABLE()
 // dialog was cancelled
 static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL);
 
-#endif // CAN_SAVE_FILES
+#endif // wxUSE_FILE
+
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
+// we use a global variable to store the frame pointer for wxLogStatus - bad,
+// but it's the easiest way
+static wxFrame *gs_pFrame = NULL; // FIXME MT-unsafe
 
 // ============================================================================
 // implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+// accepts an additional argument which tells to which frame the output should
+// be directed
+void wxVLogStatus(wxFrame *pFrame, const wxChar *szFormat, va_list argptr)
+{
+  wxString msg;
+
+  wxLog *pLog = wxLog::GetActiveTarget();
+  if ( pLog != NULL ) {
+    msg.PrintfV(szFormat, argptr);
+
+    wxASSERT( gs_pFrame == NULL ); // should be reset!
+    gs_pFrame = pFrame;
+#ifdef __WXWINCE__
+    wxLog::OnLog(wxLOG_Status, msg, 0);
+#else
+    wxLog::OnLog(wxLOG_Status, msg, time(NULL));
+#endif
+    gs_pFrame = (wxFrame *) NULL;
+  }
+}
+
+void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogStatus(pFrame, szFormat, argptr);
+    va_end(argptr);
+}
+
 // ----------------------------------------------------------------------------
 // wxLogGui implementation (FIXME MT-unsafe)
 // ----------------------------------------------------------------------------
@@ -215,124 +241,95 @@ void wxLogGui::Clear()
     m_aTimes.Empty();
 }
 
-int wxLogGui::GetSeverityIcon() const
-{
-    return m_bErrors ? wxICON_STOP
-                     : m_bWarnings ? wxICON_EXCLAMATION
-                                   : wxICON_INFORMATION;
-}
-
-wxString wxLogGui::GetTitle() const
-{
-    wxString titleFormat;
-    switch ( GetSeverityIcon() )
-    {
-        case wxICON_STOP:
-            titleFormat = _("%s Error");
-            break;
-
-        case wxICON_EXCLAMATION:
-            titleFormat = _("%s Warning");
-            break;
-
-        default:
-            wxFAIL_MSG( "unexpected icon severity" );
-            // fall through
-
-        case wxICON_INFORMATION:
-            titleFormat = _("%s Information");
-    }
-
-    return wxString::Format(titleFormat, wxTheApp->GetAppDisplayName());
-}
-
-void
-wxLogGui::DoShowSingleLogMessage(const wxString& message,
-                                 const wxString& title,
-                                 int style)
-{
-    wxMessageBox(message, title, wxOK | style);
-}
-
-void
-wxLogGui::DoShowMultipleLogMessages(const wxArrayString& messages,
-                                    const wxArrayInt& severities,
-                                    const wxArrayLong& times,
-                                    const wxString& title,
-                                    int style)
-{
-#if wxUSE_LOG_DIALOG
-    wxLogDialog dlg(NULL,
-                    messages, severities, times,
-                    title, style);
-
-    // clear the message list before showing the dialog because while it's
-    // shown some new messages may appear
-    Clear();
-
-    (void)dlg.ShowModal();
-#else // !wxUSE_LOG_DIALOG
-    // start from the most recent message
-    wxString message;
-    const size_t nMsgCount = messages.size();
-    message.reserve(nMsgCount*100);
-    for ( size_t n = nMsgCount; n > 0; n-- ) {
-        message << m_aMessages[n - 1] << wxT("\n");
-    }
-
-    DoShowSingleLogMessage(message, title, style);
-#endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
-}
-
 void wxLogGui::Flush()
 {
-    wxLog::Flush();
-
     if ( !m_bHasMessages )
         return;
 
     // do it right now to block any new calls to Flush() while we're here
     m_bHasMessages = false;
 
-    // note that this must be done before examining m_aMessages as it may log
-    // yet another message
-    const unsigned repeatCount = LogLastRepeatIfNeeded();
-
-    const size_t nMsgCount = m_aMessages.size();
-
-    if ( repeatCount > 0 )
+    unsigned repeatCount = 0;
+    if ( wxLog::GetRepetitionCounting() )
     {
-        m_aMessages[nMsgCount - 1] << " (" << m_aMessages[nMsgCount - 2] << ")";
+        repeatCount = wxLog::DoLogNumberOfRepeats();
     }
 
-    const wxString title = GetTitle();
-    const int style = GetSeverityIcon();
+    wxString appName = wxTheApp->GetAppName();
+    if ( !appName.empty() )
+        appName[0u] = (wxChar)wxToupper(appName[0u]);
+
+    long style;
+    wxString titleFormat;
+    if ( m_bErrors ) {
+        titleFormat = _("%s Error");
+        style = wxICON_STOP;
+    }
+    else if ( m_bWarnings ) {
+        titleFormat = _("%s Warning");
+        style = wxICON_EXCLAMATION;
+    }
+    else {
+        titleFormat = _("%s Information");
+        style = wxICON_INFORMATION;
+    }
+
+    wxString title;
+    title.Printf(titleFormat, appName.c_str());
+
+    size_t nMsgCount = m_aMessages.Count();
 
     // avoid showing other log dialogs until we're done with the dialog we're
     // showing right now: nested modal dialogs make for really bad UI!
     Suspend();
 
+    wxString str;
     if ( nMsgCount == 1 )
     {
-        // make a copy before calling Clear()
-        const wxString message(m_aMessages[0]);
-        Clear();
-
-        DoShowSingleLogMessage(message, title, style);
+        str = m_aMessages[0];
     }
     else // more than one message
     {
-        wxArrayString messages;
-        wxArrayInt severities;
-        wxArrayLong times;
+#if wxUSE_LOG_DIALOG
 
-        messages.swap(m_aMessages);
-        severities.swap(m_aSeverity);
-        times.swap(m_aTimes);
+        if ( repeatCount > 0 )
+            m_aMessages[nMsgCount-1] += wxString::Format(wxT(" (%s)"), m_aMessages[nMsgCount-2].c_str());
+        wxLogDialog dlg(NULL,
+                        m_aMessages, m_aSeverity, m_aTimes,
+                        title, style);
 
+        // clear the message list before showing the dialog because while it's
+        // shown some new messages may appear
         Clear();
 
-        DoShowMultipleLogMessages(messages, severities, times, title, style);
+        (void)dlg.ShowModal();
+#else // !wxUSE_LOG_DIALOG
+        // concatenate all strings (but not too many to not overfill the msg box)
+        size_t nLines = 0;
+
+        // start from the most recent message
+        for ( size_t n = nMsgCount; n > 0; n-- ) {
+            // for Windows strings longer than this value are wrapped (NT 4.0)
+            const size_t nMsgLineWidth = 156;
+
+            nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
+
+            if ( nLines > 25 )  // don't put too many lines in message box
+                break;
+
+            str << m_aMessages[n - 1] << wxT("\n");
+        }
+#endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
+    }
+
+    // this catches both cases of 1 message with wxUSE_LOG_DIALOG and any
+    // situation without it
+    if ( !str.empty() )
+    {
+        wxMessageBox(str, title, wxOK | style);
+
+        // no undisplayed messages whatsoever
+        Clear();
     }
 
     // allow flushing the logs again
@@ -340,19 +337,16 @@ void wxLogGui::Flush()
 }
 
 // log all kinds of messages
-void wxLogGui::DoLogRecord(wxLogLevel level,
-                           const wxString& msg,
-                           const wxLogRecordInfo& info)
+void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
 {
-    switch ( level )
-    {
+    switch ( level ) {
         case wxLOG_Info:
             if ( GetVerbose() )
         case wxLOG_Message:
             {
-                m_aMessages.Add(msg);
+                m_aMessages.Add(szString);
                 m_aSeverity.Add(wxLOG_Message);
-                m_aTimes.Add((long)info.timestamp);
+                m_aTimes.Add((long)t);
                 m_bHasMessages = true;
             }
             break;
@@ -360,29 +354,53 @@ void wxLogGui::DoLogRecord(wxLogLevel level,
         case wxLOG_Status:
 #if wxUSE_STATUSBAR
             {
-                wxFrame *pFrame = NULL;
-
-                // check if the frame was passed to us explicitly
-                wxUIntPtr ptr = 0;
-                if ( info.GetNumValue(wxLOG_KEY_FRAME, &ptr) )
-                {
-                    pFrame = static_cast<wxFrame *>(wxUIntToPtr(ptr));
-                }
-
                 // find the top window and set it's status text if it has any
+                wxFrame *pFrame = gs_pFrame;
                 if ( pFrame == NULL ) {
                     wxWindow *pWin = wxTheApp->GetTopWindow();
-                    if ( wxDynamicCast(pWin, wxFrame) ) {
+                    if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {
                         pFrame = (wxFrame *)pWin;
                     }
                 }
 
                 if ( pFrame && pFrame->GetStatusBar() )
-                    pFrame->SetStatusText(msg);
+                    pFrame->SetStatusText(szString);
             }
 #endif // wxUSE_STATUSBAR
             break;
 
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+            #ifdef __WXDEBUG__
+            {
+                wxString str;
+                TimeStamp(&str);
+                str += szString;
+
+                #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+                    // don't prepend debug/trace here: it goes to the
+                    // debug window anyhow
+                    str += wxT("\r\n");
+                    OutputDebugString(str);
+                #else
+                    // send them to stderr
+                    wxFprintf(stderr, wxT("[%s] %s\n"),
+                              level == wxLOG_Trace ? wxT("Trace")
+                                                   : wxT("Debug"),
+                              str.c_str());
+                    fflush(stderr);
+                #endif
+            }
+            #endif // __WXDEBUG__
+
+            break;
+
+        case wxLOG_FatalError:
+            // show this one immediately
+            wxMessageBox(szString, _("Fatal error"), wxICON_HAND);
+            wxExit();
+            break;
+
         case wxLOG_Error:
             if ( !m_bErrors ) {
 #if !wxUSE_LOG_DIALOG
@@ -403,31 +421,11 @@ void wxLogGui::DoLogRecord(wxLogLevel level,
                 m_bWarnings = true;
             }
 
-            m_aMessages.Add(msg);
+            m_aMessages.Add(szString);
             m_aSeverity.Add((int)level);
-            m_aTimes.Add((long)info.timestamp);
+            m_aTimes.Add((long)t);
             m_bHasMessages = true;
             break;
-
-        case wxLOG_Debug:
-        case wxLOG_Trace:
-            // let the base class deal with debug/trace messages
-            wxLog::DoLogRecord(level, msg, info);
-            break;
-
-        case wxLOG_FatalError:
-        case wxLOG_Max:
-            // fatal errors are shown immediately and terminate the program so
-            // we should never see them here
-            wxFAIL_MSG("unexpected log level");
-            break;
-
-        case wxLOG_Progress:
-        case wxLOG_User:
-            // just ignore those: passing them to the base class would result
-            // in asserts from DoLogText() because DoLogTextAtLevel() would
-            // call it as it doesn't know how to handle these levels otherwise
-            break;
     }
 }
 
@@ -445,22 +443,19 @@ class wxLogFrame : public wxFrame
 {
 public:
     // ctor & dtor
-    wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle);
+    wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle);
     virtual ~wxLogFrame();
 
     // menu callbacks
     void OnClose(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
-#if CAN_SAVE_FILES
-    void OnSave(wxCommandEvent& event);
-#endif // CAN_SAVE_FILES
+#if wxUSE_FILE
+    void OnSave (wxCommandEvent& event);
+#endif // wxUSE_FILE
     void OnClear(wxCommandEvent& event);
 
-    // do show the message in the text control
-    void ShowLogMessage(const wxString& message)
-    {
-        m_pTextCtrl->AppendText(message + wxS('\n'));
-    }
+    // accessors
+    wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
 
 private:
     // use standard ids for our commands!
@@ -478,21 +473,21 @@ private:
     wxLogWindow *m_log;
 
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxLogFrame);
+    DECLARE_NO_COPY_CLASS(wxLogFrame)
 };
 
 BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
     // wxLogWindow menu events
     EVT_MENU(Menu_Close, wxLogFrame::OnClose)
-#if CAN_SAVE_FILES
+#if wxUSE_FILE
     EVT_MENU(Menu_Save,  wxLogFrame::OnSave)
-#endif // CAN_SAVE_FILES
+#endif // wxUSE_FILE
     EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
 
     EVT_CLOSE(wxLogFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
-wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle)
+wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle)
           : wxFrame(pParent, wxID_ANY, szTitle)
 {
     m_log = log;
@@ -512,9 +507,9 @@ wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTi
     // create menu
     wxMenuBar *pMenuBar = new wxMenuBar;
     wxMenu *pMenu = new wxMenu;
-#if CAN_SAVE_FILES
-    pMenu->Append(Menu_Save,  _("Save &As..."), _("Save log contents to file"));
-#endif // CAN_SAVE_FILES
+#if wxUSE_FILE
+    pMenu->Append(Menu_Save,  _("&Save..."), _("Save log contents to file"));
+#endif // wxUSE_FILE
     pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents"));
     pMenu->AppendSeparator();
     pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
@@ -550,9 +545,10 @@ void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     DoClose();
 }
 
-#if CAN_SAVE_FILES
+#if wxUSE_FILE
 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_FILEDLG
     wxString filename;
     wxFile file;
     int rc = OpenLogFile(file, &filename, this);
@@ -579,10 +575,11 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
         wxLogError(_("Can't save log contents to file."));
     }
     else {
-        wxLogStatus((wxFrame*)this, _("Log saved to the file '%s'."), filename.c_str());
+        wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
     }
+#endif
 }
-#endif // CAN_SAVE_FILES
+#endif // wxUSE_FILE
 
 void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 {
@@ -598,15 +595,10 @@ wxLogFrame::~wxLogFrame()
 // -----------
 
 wxLogWindow::wxLogWindow(wxWindow *pParent,
-                         const wxString& szTitle,
+                         const wxChar *szTitle,
                          bool bShow,
                          bool bDoPass)
 {
-    // Initialize it to NULL to ensure that we don't crash if any log messages
-    // are generated before the frame is fully created (while this doesn't
-    // happen normally, it might, in principle).
-    m_pLogFrame = NULL;
-
     PassMessages(bDoPass);
 
     m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
@@ -620,20 +612,56 @@ void wxLogWindow::Show(bool bShow)
     m_pLogFrame->Show(bShow);
 }
 
-void wxLogWindow::DoLogTextAtLevel(wxLogLevel level, const wxString& msg)
+void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
 {
-    if ( !m_pLogFrame )
-        return;
+    // first let the previous logger show it
+    wxLogPassThrough::DoLog(level, szString, t);
 
-    // don't put trace messages in the text window for 2 reasons:
-    // 1) there are too many of them
-    // 2) they may provoke other trace messages (e.g. wxMSW code uses
-    //    wxLogTrace to log Windows messages and adding text to the control
-    //    sends more of them) thus sending a program into an infinite loop
-    if ( level == wxLOG_Trace )
-        return;
+    if ( m_pLogFrame ) {
+        switch ( level ) {
+            case wxLOG_Status:
+                // by default, these messages are ignored by wxLog, so process
+                // them ourselves
+                if ( !wxIsEmpty(szString) )
+                {
+                    wxString str;
+                    str << _("Status: ") << szString;
+                    DoLogString(str, t);
+                }
+                break;
 
-    m_pLogFrame->ShowLogMessage(msg);
+                // don't put trace messages in the text window for 2 reasons:
+                // 1) there are too many of them
+                // 2) they may provoke other trace messages thus sending a program
+                //    into an infinite loop
+            case wxLOG_Trace:
+                break;
+
+            default:
+                // and this will format it nicely and call our DoLogString()
+                wxLog::DoLog(level, szString, t);
+        }
+    }
+}
+
+void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+{
+    // put the text into our window
+    wxTextCtrl *pText = m_pLogFrame->TextCtrl();
+
+    // remove selection (WriteText is in fact ReplaceSelection)
+#ifdef __WXMSW__
+    wxTextPos nLen = pText->GetLastPosition();
+    pText->SetSelection(nLen, nLen);
+#endif // Windows
+
+    wxString msg;
+    TimeStamp(&msg);
+    msg << szString << wxT('\n');
+
+    pText->AppendText(msg);
+
+    // TODO ensure that the line can be seen
 }
 
 wxFrame *wxLogWindow::GetFrame() const
@@ -653,7 +681,7 @@ bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
 
 void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
 {
-    m_pLogFrame = NULL;
+    m_pLogFrame = (wxLogFrame *)NULL;
 }
 
 wxLogWindow::~wxLogWindow()
@@ -670,8 +698,13 @@ wxLogWindow::~wxLogWindow()
 
 #if wxUSE_LOG_DIALOG
 
+#ifndef __SMARTPHONE__
+static const size_t MARGIN = 10;
+#else
+static const size_t MARGIN = 0;
+#endif
+
 wxString wxLogDialog::ms_details;
-size_t wxLogDialog::ms_maxLength = 0;
 
 wxLogDialog::wxLogDialog(wxWindow *parent,
                          const wxArrayString& messages,
@@ -683,8 +716,6 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
                       wxDefaultPosition, wxDefaultSize,
                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
-    // init the static variables:
-
     if ( ms_details.empty() )
     {
         // ensure that we won't loop here if wxGetTranslation()
@@ -696,11 +727,6 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
 #endif
     }
 
-    if ( ms_maxLength == 0 )
-    {
-        ms_maxLength = (2 * wxGetDisplaySize().x/3) / GetCharWidth();
-    }
-
     size_t count = messages.GetCount();
     m_messages.Alloc(count);
     m_severity.Alloc(count);
@@ -708,89 +734,109 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
 
     for ( size_t n = 0; n < count; n++ )
     {
-        m_messages.Add(messages[n]);
+        wxString msg = messages[n];
+        msg.Replace(wxT("\n"), wxT(" "));
+        m_messages.Add(msg);
         m_severity.Add(severity[n]);
         m_times.Add(times[n]);
     }
 
-    m_listctrl = NULL;
+    m_showingDetails = false; // not initially
+    m_listctrl = (wxListCtrl *)NULL;
+
+#ifndef __SMARTPHONE__
+
+#if wxUSE_STATLINE
+    m_statline = (wxStaticLine *)NULL;
+#endif // wxUSE_STATLINE
+
+#if wxUSE_FILE
+    m_btnSave = (wxButton *)NULL;
+#endif // wxUSE_FILE
+
+#endif // __SMARTPHONE__
 
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
     // create the controls which are always shown and layout them: we use
-    // sizers even though our window is not resizable to calculate the size of
+    // sizers even though our window is not resizeable to calculate the size of
     // the dialog properly
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
+#ifndef __SMARTPHONE__
+    wxBoxSizer *sizerButtons = new wxBoxSizer(isPda ? wxHORIZONTAL : wxVERTICAL);
+#endif
     wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL);
 
-    if (!isPda)
-    {
-        wxStaticBitmap *icon = new wxStaticBitmap
-                                   (
-                                    this,
-                                    wxID_ANY,
-                                    wxArtProvider::GetMessageBoxIcon(style)
-                                   );
-        sizerAll->Add(icon, wxSizerFlags().Centre());
-    }
-
-    // create the text sizer with a minimal size so that we are sure it won't be too small
-    wxString message = EllipsizeString(messages.Last());
-    wxSizer *szText = CreateTextSizer(message);
-    szText->SetMinSize(wxMin(300, wxGetDisplaySize().x / 3), -1);
-
-    sizerAll->Add(szText, wxSizerFlags(1).Centre().Border(wxLEFT | wxRIGHT));
-
-    wxButton *btnOk = new wxButton(this, wxID_OK);
-    sizerAll->Add(btnOk, wxSizerFlags().Centre());
-
-    sizerTop->Add(sizerAll, wxSizerFlags().Expand().Border());
-
-
-    // add the details pane
-#ifndef __SMARTPHONE__
-
-#if wxUSE_COLLPANE
-    wxCollapsiblePane * const
-        collpane = new wxCollapsiblePane(this, wxID_ANY, ms_details);
-    sizerTop->Add(collpane, wxSizerFlags(1).Expand().Border());
-
-    wxWindow *win = collpane->GetPane();
-#else
-    wxPanel* win = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-                               wxBORDER_NONE);
-#endif
-    wxSizer * const paneSz = new wxBoxSizer(wxVERTICAL);
-
-    CreateDetailsControls(win);
-
-    paneSz->Add(m_listctrl, wxSizerFlags(1).Expand().Border(wxTOP));
-
-#if wxUSE_CLIPBOARD || CAN_SAVE_FILES
-    wxBoxSizer * const btnSizer = new wxBoxSizer(wxHORIZONTAL);
-
-    wxSizerFlags flagsBtn;
-    flagsBtn.Border(wxLEFT);
-
-#if wxUSE_CLIPBOARD
-    btnSizer->Add(new wxButton(win, wxID_COPY), flagsBtn);
-#endif // wxUSE_CLIPBOARD
-
-#if CAN_SAVE_FILES
-    btnSizer->Add(new wxButton(win, wxID_SAVE), flagsBtn);
-#endif // CAN_SAVE_FILES
-
-    paneSz->Add(btnSizer, wxSizerFlags().Right().Border(wxTOP|wxBOTTOM));
-#endif // wxUSE_CLIPBOARD || CAN_SAVE_FILES
-
-    win->SetSizer(paneSz);
-    paneSz->SetSizeHints(win);
-#else // __SMARTPHONE__
+#ifdef __SMARTPHONE__
     SetLeftMenu(wxID_OK);
     SetRightMenu(wxID_MORE, ms_details + EXPAND_SUFFIX);
-#endif // __SMARTPHONE__/!__SMARTPHONE__
+#else
+    wxButton *btnOk = new wxButton(this, wxID_OK);
+    sizerButtons->Add(btnOk, 0, isPda ? wxCENTRE : wxCENTRE|wxBOTTOM, MARGIN/2);
+    m_btnDetails = new wxButton(this, wxID_MORE, ms_details + EXPAND_SUFFIX);
+    sizerButtons->Add(m_btnDetails, 0, isPda ? wxCENTRE|wxLEFT : wxCENTRE | wxTOP, MARGIN/2 - 1);
+#endif
 
-    SetSizerAndFit(sizerTop);
+    wxBitmap bitmap;
+    switch ( style & wxICON_MASK )
+    {
+        case wxICON_ERROR:
+            bitmap = wxArtProvider::GetBitmap(wxART_ERROR, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+            bitmap.SetId(wxICON_SMALL_ERROR);
+#endif
+            break;
+
+        case wxICON_INFORMATION:
+            bitmap = wxArtProvider::GetBitmap(wxART_INFORMATION, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+            bitmap.SetId(wxICON_SMALL_INFO);
+#endif
+            break;
+
+        case wxICON_WARNING:
+            bitmap = wxArtProvider::GetBitmap(wxART_WARNING, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+            bitmap.SetId(wxICON_SMALL_WARNING);
+#endif
+            break;
+
+        default:
+            wxFAIL_MSG(_T("incorrect log style"));
+    }
+
+    if (!isPda)
+        sizerAll->Add(new wxStaticBitmap(this, wxID_ANY, bitmap), 0,
+                  wxALIGN_CENTRE_VERTICAL);
+
+    const wxString& message = messages.Last();
+    sizerAll->Add(CreateTextSizer(message), 1,
+                  wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT, MARGIN);
+#ifndef __SMARTPHONE__
+    sizerAll->Add(sizerButtons, 0, isPda ? wxCENTRE|wxTOP|wxBOTTOM : (wxALIGN_RIGHT | wxLEFT), MARGIN);
+#endif
+
+    sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN);
+
+    SetSizer(sizerTop);
+
+    // see comments in OnDetails()
+    //
+    // Note: Doing this, this way, triggered a nasty bug in
+    //       wxTopLevelWindowGTK::GtkOnSize which took -1 literally once
+    //       either of maxWidth or maxHeight was set.  This symptom has been
+    //       fixed there, but it is a problem that remains as long as we allow
+    //       unchecked access to the internal size members.  We really need to
+    //       encapuslate window sizes more cleanly and make it clear when -1 will
+    //       be substituted and when it will not.
+
+    wxSize size = sizerTop->Fit(this);
+    m_maxHeight = size.y;
+    SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
+
+#ifndef __SMARTPHONE__
+    btnOk->SetFocus();
+#endif
 
     Centre();
 
@@ -802,37 +848,44 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     }
 }
 
-void wxLogDialog::CreateDetailsControls(wxWindow *parent)
+void wxLogDialog::CreateDetailsControls()
 {
-    wxString fmt = wxLog::GetTimestamp();
-    bool hasTimeStamp = !fmt.IsEmpty();
+#ifndef __SMARTPHONE__
+    // create the save button and separator line if possible
+#if wxUSE_FILE
+    m_btnSave = new wxButton(this, wxID_SAVE);
+#endif // wxUSE_FILE
+
+#if wxUSE_STATLINE
+    m_statline = new wxStaticLine(this, wxID_ANY);
+#endif // wxUSE_STATLINE
+
+#endif // __SMARTPHONE__
 
     // create the list ctrl now
-    m_listctrl = new wxListCtrl(parent, wxID_ANY,
+    m_listctrl = new wxListCtrl(this, wxID_ANY,
                                 wxDefaultPosition, wxDefaultSize,
-                                wxBORDER_SIMPLE |
+                                wxSUNKEN_BORDER |
                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);
 #ifdef __WXWINCE__
-    // This makes a big aesthetic difference on WinCE but I
+    // This maks a big aesthetic difference on WinCE but I
     // don't want to risk problems on other platforms
     m_listctrl->Hide();
 #endif
 
     // no need to translate these strings as they're not shown to the
     // user anyhow (we use wxLC_NO_HEADER style)
-    m_listctrl->InsertColumn(0, wxT("Message"));
-
-    if (hasTimeStamp)
-        m_listctrl->InsertColumn(1, wxT("Time"));
+    m_listctrl->InsertColumn(0, _T("Message"));
+    m_listctrl->InsertColumn(1, _T("Time"));
 
     // prepare the imagelist
     static const int ICON_SIZE = 16;
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!
-    static const char* const icons[] =
+    static const wxChar* icons[] =
     {
         wxART_ERROR,
         wxART_WARNING,
@@ -848,7 +901,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
 
         // This may very well fail if there are insufficient colours available.
         // Degrade gracefully.
-        if ( !bmp.IsOk() )
+        if ( !bmp.Ok() )
         {
             loadedIcons = false;
 
@@ -860,7 +913,14 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
 
     m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
 
-    // fill the listctrl
+    // and fill it
+    wxString fmt = wxLog::GetTimestamp();
+    if ( !fmt )
+    {
+        // default format
+        fmt = _T("%c");
+    }
+
     size_t count = m_messages.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
@@ -887,20 +947,13 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
             image = -1;
         }
 
-        wxString msg = m_messages[n];
-        msg.Replace(wxT("\n"), wxT(" "));
-        msg = EllipsizeString(msg);
-
-        m_listctrl->InsertItem(n, msg, image);
-
-        if (hasTimeStamp)
-            m_listctrl->SetItem(n, 1, TimeStamp(fmt, (time_t)m_times[n]));
+        m_listctrl->InsertItem(n, m_messages[n], image);
+        m_listctrl->SetItem(n, 1, TimeStamp(fmt, (time_t)m_times[n]));
     }
 
     // let the columns size themselves
     m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
-    if (hasTimeStamp)
-        m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
+    m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
 
     // calculate an approximately nice height for the listctrl
     int height = GetCharHeight()*(count + 4);
@@ -919,21 +972,12 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
     m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax));
 }
 
-void wxLogDialog::OnListItemActivated(wxListEvent& event)
+void wxLogDialog::OnListSelect(wxListEvent& event)
 {
-    // show the activated item in a message box
-    // This allow the user to correctly display the logs which are longer
-    // than the listctrl and thus gets truncated or those which contains
-    // newlines.
-
-    // NB: don't do:
-    //    wxString str = m_listctrl->GetItemText(event.GetIndex());
-    // as there's a 260 chars limit on the items inside a wxListCtrl in wxMSW.
-    wxString str = m_messages[event.GetIndex()];
-
-    // wxMessageBox will nicely handle the '\n' in the string (if any)
-    // and supports long strings
-    wxMessageBox(str, wxT("Log message"), wxOK, this);
+    // we can't just disable the control because this looks ugly under Windows
+    // (wrong bg colour, no scrolling...), but we still want to disable
+    // selecting items - it makes no sense here
+    m_listctrl->SetItemState(event.GetIndex(), 0, wxLIST_STATE_SELECTED);
 }
 
 void wxLogDialog::OnOk(wxCommandEvent& WXUNUSED(event))
@@ -941,52 +985,11 @@ void wxLogDialog::OnOk(wxCommandEvent& WXUNUSED(event))
     EndModal(wxID_OK);
 }
 
-#if CAN_SAVE_FILES || wxUSE_CLIPBOARD
-
-wxString wxLogDialog::GetLogMessages() const
-{
-    wxString fmt = wxLog::GetTimestamp();
-    if ( fmt.empty() )
-    {
-        // use the default format
-        fmt = "%c";
-    }
-
-    const size_t count = m_messages.GetCount();
-
-    wxString text;
-    text.reserve(count*m_messages[0].length());
-    for ( size_t n = 0; n < count; n++ )
-    {
-        text << TimeStamp(fmt, (time_t)m_times[n])
-             << ": "
-             << m_messages[n]
-             << wxTextFile::GetEOL();
-    }
-
-    return text;
-}
-
-#endif // CAN_SAVE_FILES || wxUSE_CLIPBOARD
-
-#if wxUSE_CLIPBOARD
-
-void wxLogDialog::OnCopy(wxCommandEvent& WXUNUSED(event))
-{
-    wxClipboardLocker clip;
-    if ( !clip ||
-            !wxTheClipboard->AddData(new wxTextDataObject(GetLogMessages())) )
-    {
-        wxLogError(_("Failed to copy dialog contents to the clipboard."));
-    }
-}
-
-#endif // wxUSE_CLIPBOARD
-
-#if CAN_SAVE_FILES
+#if wxUSE_FILE
 
 void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_FILEDLG
     wxFile file;
     int rc = OpenLogFile(file, NULL, this);
     if ( rc == -1 )
@@ -995,13 +998,141 @@ void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
         return;
     }
 
-    if ( !rc || !file.Write(GetLogMessages()) || !file.Close() )
+    bool ok = rc != 0;
+
+    wxString fmt = wxLog::GetTimestamp();
+    if ( !fmt )
     {
-        wxLogError(_("Can't save log contents to file."));
+        // default format
+        fmt = _T("%c");
     }
+
+    size_t count = m_messages.GetCount();
+    for ( size_t n = 0; ok && (n < count); n++ )
+    {
+        wxString line;
+        line << TimeStamp(fmt, (time_t)m_times[n])
+             << _T(": ")
+             << m_messages[n]
+             << wxTextFile::GetEOL();
+
+        ok = file.Write(line);
+    }
+
+    if ( ok )
+        ok = file.Close();
+
+    if ( !ok )
+        wxLogError(_("Can't save log contents to file."));
+#endif // wxUSE_FILEDLG
 }
 
-#endif // CAN_SAVE_FILES
+#endif // wxUSE_FILE
+
+void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
+{
+    wxSizer *sizer = GetSizer();
+
+    if ( m_showingDetails )
+    {
+#ifdef __SMARTPHONE__
+        SetRightMenu(wxID_MORE, ms_details + EXPAND_SUFFIX);
+#else
+        m_btnDetails->SetLabel(ms_details + EXPAND_SUFFIX);
+#endif
+
+        sizer->Detach( m_listctrl );
+
+#ifndef __SMARTPHONE__
+
+#if wxUSE_STATLINE
+        sizer->Detach( m_statline );
+#endif // wxUSE_STATLINE
+
+#if wxUSE_FILE
+        sizer->Detach( m_btnSave );
+#endif // wxUSE_FILE
+
+#endif // __SMARTPHONE__
+    }
+    else // show details now
+    {
+#ifdef __SMARTPHONE__
+        SetRightMenu(wxID_MORE, wxString(_T("<< ")) + ms_details);
+#else
+        m_btnDetails->SetLabel(wxString(_T("<< ")) + ms_details);
+#endif
+
+        if ( !m_listctrl )
+        {
+            CreateDetailsControls();
+        }
+
+#if wxUSE_STATLINE && !defined(__SMARTPHONE__)
+        bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+        if (!isPda)
+            sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+#endif // wxUSE_STATLINE
+
+        sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+
+        // VZ: this doesn't work as this becomes the initial (and not only
+        //     minimal) listctrl height as well - why?
+#if 0
+        // allow the user to make the dialog shorter than its initial height -
+        // without this it wouldn't work as the list ctrl would have been
+        // incompressible
+        sizer->SetItemMinSize(m_listctrl, 100, 3*GetCharHeight());
+#endif // 0
+
+#if wxUSE_FILE && !defined(__SMARTPHONE__)
+        sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
+#endif // wxUSE_FILE
+    }
+
+    m_showingDetails = !m_showingDetails;
+
+    // in any case, our size changed - relayout everything and set new hints
+    // ---------------------------------------------------------------------
+
+    // we have to reset min size constraints or Fit() would never reduce the
+    // dialog size when collapsing it and we have to reset max constraint
+    // because it wouldn't expand it otherwise
+
+    m_minHeight =
+    m_maxHeight = -1;
+
+    // wxSizer::FitSize() is private, otherwise we might use it directly...
+    wxSize sizeTotal = GetSize(),
+           sizeClient = GetClientSize();
+
+    wxSize size = sizer->GetMinSize();
+    size.x += sizeTotal.x - sizeClient.x;
+    size.y += sizeTotal.y - sizeClient.y;
+
+    // we don't want to allow expanding the dialog in vertical direction as
+    // this would show the "hidden" details but we can resize the dialog
+    // vertically while the details are shown
+    if ( !m_showingDetails )
+        m_maxHeight = size.y;
+
+    SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
+
+#ifdef __WXWINCE__
+    if (m_showingDetails)
+        m_listctrl->Show();
+#endif
+
+    // don't change the width when expanding/collapsing
+    SetSize(wxDefaultCoord, size.y);
+
+#ifdef __WXGTK__
+    // VS: this is necessary in order to force frame redraw under
+    // WindowMaker or fvwm2 (and probably other broken WMs).
+    // Otherwise, detailed list wouldn't be displayed.
+    Show();
+#endif // wxGTK
+}
 
 wxLogDialog::~wxLogDialog()
 {
@@ -1013,7 +1144,7 @@ wxLogDialog::~wxLogDialog()
 
 #endif // wxUSE_LOG_DIALOG
 
-#if CAN_SAVE_FILES
+#if wxUSE_FILE && wxUSE_FILEDLG
 
 // pass an uninitialized file object, the function will ask the user for the
 // filename and try to open it, returns true on success (file was opened),
@@ -1031,7 +1162,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
 
     // open file
     // ---------
-    bool bOk = true; // suppress warning about it being possible uninitialized
+    bool bOk wxDUMMY_INITIALIZE(false);
     if ( wxFile::Exists(filename) ) {
         bool bAppend = false;
         wxString strMsg;
@@ -1071,7 +1202,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
     return bOk;
 }
 
-#endif // CAN_SAVE_FILES
+#endif // wxUSE_FILE
 
 #endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
 
@@ -1086,9 +1217,13 @@ wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
     m_pTextCtrl = pTextCtrl;
 }
 
-void wxLogTextCtrl::DoLogText(const wxString& msg)
+void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
-    m_pTextCtrl->AppendText(msg + wxS('\n'));
+    wxString msg;
+    TimeStamp(&msg);
+
+    msg << szString << wxT('\n');
+    m_pTextCtrl->AppendText(msg);
 }
 
 #endif // wxUSE_LOG && wxUSE_TEXTCTRL
diff --git a/Source/3rd Party/wx/src/generic/markuptext.cpp b/Source/3rd Party/wx/src/generic/markuptext.cpp
deleted file mode 100644
index ae3d14d73..000000000
--- a/Source/3rd Party/wx/src/generic/markuptext.cpp	
+++ /dev/null
@@ -1,254 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/markuptext.cpp
-// Purpose:     wxMarkupText implementation
-// Author:      Vadim Zeitlin
-// Created:     2011-02-21
-// RCS-ID:      $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_MARKUP
-
-#ifndef WX_PRECOMP
-    #include "wx/gdicmn.h"
-    #include "wx/control.h"
-    #include "wx/dc.h"
-#endif // WX_PRECOMP
-
-#include "wx/generic/private/markuptext.h"
-
-#include "wx/private/markupparserattr.h"
-
-namespace
-{
-
-// ----------------------------------------------------------------------------
-// wxMarkupParserMeasureOutput: measure the extends of a markup string.
-// ----------------------------------------------------------------------------
-
-class wxMarkupParserMeasureOutput : public wxMarkupParserAttrOutput
-{
-public:
-    // Initialize the base class with the font to use. As we don't care about
-    // colours (which don't affect the text measurements), don't bother to
-    // specify them at all.
-    wxMarkupParserMeasureOutput(wxDC& dc, int *visibleHeight)
-        : wxMarkupParserAttrOutput(dc.GetFont(), wxColour(), wxColour()),
-          m_dc(dc),
-          m_visibleHeight(visibleHeight)
-    {
-        if ( visibleHeight )
-            *visibleHeight = 0;
-    }
-
-    const wxSize& GetSize() const { return m_size; }
-
-
-    virtual void OnText(const wxString& text_)
-    {
-        const wxString text(wxControl::RemoveMnemonics(text_));
-
-        // TODO-MULTILINE-MARKUP: Must use GetMultiLineTextExtent().
-        const wxSize size = m_dc.GetTextExtent(text);
-
-        m_size.x += size.x;
-        if ( size.y > m_size.y )
-            m_size.y = size.y;
-
-        if ( m_visibleHeight )
-        {
-            wxFontMetrics tm = m_dc.GetFontMetrics();
-            int visibleHeight = tm.ascent - tm.internalLeading;
-            if ( *m_visibleHeight < visibleHeight )
-                *m_visibleHeight = visibleHeight;
-        }
-    }
-
-    virtual void OnAttrStart(const Attr& attr)
-    {
-        m_dc.SetFont(attr.font);
-    }
-
-    virtual void OnAttrEnd(const Attr& WXUNUSED(attr))
-    {
-        m_dc.SetFont(GetFont());
-    }
-
-private:
-    wxDC& m_dc;
-
-    // The values that we compute.
-    wxSize m_size;
-    int * const m_visibleHeight;    // may be NULL
-
-    wxDECLARE_NO_COPY_CLASS(wxMarkupParserMeasureOutput);
-};
-
-// ----------------------------------------------------------------------------
-// wxMarkupParserRenderOutput: render a markup string.
-// ----------------------------------------------------------------------------
-
-class wxMarkupParserRenderOutput : public wxMarkupParserAttrOutput
-{
-public:
-    // Notice that the bottom of rectangle passed to our ctor is used as the
-    // baseline for the text we draw, i.e. it needs to be adjusted to exclude
-    // descent by the caller.
-    wxMarkupParserRenderOutput(wxDC& dc,
-                               const wxRect& rect,
-                               int flags)
-        : wxMarkupParserAttrOutput(dc.GetFont(),
-                                   dc.GetTextForeground(),
-                                   wxColour()),
-          m_dc(dc),
-          m_rect(rect),
-          m_flags(flags)
-    {
-        m_pos = m_rect.x;
-
-        // We don't initialize the base class initial text background colour to
-        // the valid value because we want to be able to detect when we revert
-        // to the "absence of background colour" and set the background mode to
-        // be transparent in OnAttrStart() below. But do remember it to be able
-        // to restore it there later -- this doesn't affect us as the text
-        // background isn't used anyhow when the background mode is transparent
-        // but it might affect the caller if it sets the background mode to
-        // opaque and draws some text after using us.
-        m_origTextBackground = dc.GetTextBackground();
-    }
-
-    virtual void OnText(const wxString& text_)
-    {
-        wxString text;
-        int indexAccel = wxControl::FindAccelIndex(text_, &text);
-        if ( !(m_flags & wxMarkupText::Render_ShowAccels) )
-            indexAccel = wxNOT_FOUND;
-
-        // Adjust the position (unfortunately we need to do this manually as
-        // there is no notion of current text position in wx API) rectangle to
-        // ensure that all text segments use the same baseline (as there is
-        // nothing equivalent to Windows SetTextAlign(TA_BASELINE) neither).
-        wxRect rect(m_rect);
-        rect.x = m_pos;
-
-        int descent;
-        m_dc.GetTextExtent(text, &rect.width, &rect.height, &descent);
-        rect.height -= descent;
-        rect.y += m_rect.height - rect.height;
-
-        wxRect bounds;
-        m_dc.DrawLabel(text, wxBitmap(),
-                       rect, wxALIGN_LEFT | wxALIGN_TOP,
-                       indexAccel,
-                       &bounds);
-
-        // TODO-MULTILINE-MARKUP: Must update vertical position too.
-        m_pos += bounds.width;
-    }
-
-    virtual void OnAttrStart(const Attr& attr)
-    {
-        m_dc.SetFont(attr.font);
-        if ( attr.foreground.IsOk() )
-            m_dc.SetTextForeground(attr.foreground);
-
-        if ( attr.background.IsOk() )
-        {
-            // Setting the background colour is not enough, we must also change
-            // the mode to ensure that it is actually used.
-            m_dc.SetBackgroundMode(wxSOLID);
-            m_dc.SetTextBackground(attr.background);
-        }
-    }
-
-    virtual void OnAttrEnd(const Attr& attr)
-    {
-        // We always restore the font because we always change it...
-        m_dc.SetFont(GetFont());
-
-        // ...but we only need to restore the colours if we had changed them.
-        if ( attr.foreground.IsOk() )
-            m_dc.SetTextForeground(GetAttr().foreground);
-
-        if ( attr.background.IsOk() )
-        {
-            wxColour background = GetAttr().background;
-            if ( !background.IsOk() )
-            {
-                // Invalid background colour indicates that the background
-                // should actually be made transparent and in this case the
-                // actual value of background colour doesn't matter but we also
-                // restore it just in case, see comment in the ctor.
-                m_dc.SetBackgroundMode(wxTRANSPARENT);
-                background = m_origTextBackground;
-            }
-
-            m_dc.SetTextBackground(background);
-        }
-    }
-
-private:
-    wxDC& m_dc;
-    const wxRect m_rect;
-    const int m_flags;
-
-    wxColour m_origTextBackground;
-
-    // Current horizontal text output position.
-    //
-    // TODO-MULTILINE-MARKUP: Must keep vertical position too.
-    int m_pos;
-
-    wxDECLARE_NO_COPY_CLASS(wxMarkupParserRenderOutput);
-};
-
-} // anonymous namespace
-
-// ============================================================================
-// wxMarkupText implementation
-// ============================================================================
-
-wxSize wxMarkupText::Measure(wxDC& dc, int *visibleHeight) const
-{
-    wxMarkupParserMeasureOutput out(dc, visibleHeight);
-    wxMarkupParser parser(out);
-    if ( !parser.Parse(m_markup) )
-    {
-        wxFAIL_MSG( "Invalid markup" );
-        return wxDefaultSize;
-    }
-
-    return out.GetSize();
-}
-
-void wxMarkupText::Render(wxDC& dc, const wxRect& rect, int flags)
-{
-    // We want to center the above-baseline parts of the letter vertically, so
-    // we use the visible height and not the total height (which includes
-    // descent and internal leading) here.
-    int visibleHeight;
-    wxRect rectText(rect.GetPosition(), Measure(dc, &visibleHeight));
-    rectText.height = visibleHeight;
-
-    wxMarkupParserRenderOutput out(dc, rectText.CentreIn(rect), flags);
-    wxMarkupParser parser(out);
-    parser.Parse(m_markup);
-}
-
-#endif // wxUSE_MARKUP
diff --git a/Source/3rd Party/wx/src/generic/msgdlgg.cpp b/Source/3rd Party/wx/src/generic/msgdlgg.cpp
index 8f712b9f3..8887f131b 100644
--- a/Source/3rd Party/wx/src/generic/msgdlgg.cpp	
+++ b/Source/3rd Party/wx/src/generic/msgdlgg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: msgdlgg.cpp 41838 2006-10-09 21:08:45Z VZ $
 // Copyright:   (c) Julian Smart and Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_MSGDLG
+#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__) || defined(__WXGPE__))
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -38,35 +38,11 @@
 #define __WX_COMPILING_MSGDLGG_CPP__ 1
 #include "wx/msgdlg.h"
 #include "wx/artprov.h"
-#include "wx/textwrapper.h"
 
 #if wxUSE_STATLINE
     #include "wx/statline.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// wxTitleTextWrapper: simple class to create wrapped text in "title font"
-// ----------------------------------------------------------------------------
-
-class wxTitleTextWrapper : public wxTextSizerWrapper
-{
-public:
-    wxTitleTextWrapper(wxWindow *win)
-        : wxTextSizerWrapper(win)
-    {
-    }
-
-protected:
-    virtual wxWindow *OnCreateLine(const wxString& s)
-    {
-        wxWindow * const win = wxTextSizerWrapper::OnCreateLine(s);
-
-        win->SetFont(win->GetFont().Larger().MakeBold());
-
-        return win;
-    }
-};
-
 // ----------------------------------------------------------------------------
 // icons
 // ----------------------------------------------------------------------------
@@ -74,7 +50,6 @@ protected:
 BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
         EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
         EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
-        EVT_BUTTON(wxID_HELP, wxGenericMessageDialog::OnHelp)
         EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
 END_EVENT_TABLE()
 
@@ -85,85 +60,9 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
                                                 const wxString& caption,
                                                 long style,
                                                 const wxPoint& pos)
-                      : wxMessageDialogBase(GetParentForModalDialog(parent, style),
-                                            message,
-                                            caption,
-                                            style),
-                        m_pos(pos)
+                      : wxDialog( parent, wxID_ANY, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE )
 {
-    m_created = false;
-}
-
-wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer()
-{
-#ifndef __SMARTPHONE__
-    if ( HasCustomLabels() )
-    {
-        wxStdDialogButtonSizer * const sizerStd = new wxStdDialogButtonSizer;
-
-        wxButton *btnDef = NULL;
-
-        if ( m_dialogStyle & wxOK )
-        {
-            btnDef = new wxButton(this, wxID_OK, GetCustomOKLabel());
-            sizerStd->AddButton(btnDef);
-        }
-
-        if ( m_dialogStyle & wxCANCEL )
-        {
-            wxButton * const
-                cancel = new wxButton(this, wxID_CANCEL, GetCustomCancelLabel());
-            sizerStd->AddButton(cancel);
-
-            if ( m_dialogStyle & wxCANCEL_DEFAULT )
-                btnDef = cancel;
-        }
-
-        if ( m_dialogStyle & wxYES_NO )
-        {
-            wxButton * const
-                yes = new wxButton(this, wxID_YES, GetCustomYesLabel());
-            sizerStd->AddButton(yes);
-
-            wxButton * const
-                no = new wxButton(this, wxID_NO, GetCustomNoLabel());
-            sizerStd->AddButton(no);
-            if ( m_dialogStyle & wxNO_DEFAULT )
-                btnDef = no;
-            else if ( !btnDef )
-                btnDef = yes;
-        }
-
-        if ( m_dialogStyle & wxHELP )
-        {
-            wxButton * const
-                help = new wxButton(this, wxID_HELP, GetCustomHelpLabel());
-            sizerStd->AddButton(help);
-        }
-
-        if ( btnDef )
-        {
-            btnDef->SetDefault();
-            btnDef->SetFocus();
-        }
-
-        sizerStd->Realize();
-
-        return CreateSeparatedSizer(sizerStd);
-    }
-#endif // !__SMARTPHONE__
-
-    // Use standard labels for all buttons
-    return CreateSeparatedButtonSizer
-           (
-                m_dialogStyle & (wxOK | wxCANCEL | wxHELP | wxYES_NO |
-                                 wxNO_DEFAULT | wxCANCEL_DEFAULT)
-           );
-}
-
-void wxGenericMessageDialog::DoCreateMsgdialog()
-{
-    wxDialog::Create(m_parent, wxID_ANY, m_caption, m_pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE);
+    SetMessageDialogStyle(style);
 
     bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
@@ -173,57 +72,53 @@ void wxGenericMessageDialog::DoCreateMsgdialog()
 
 #if wxUSE_STATBMP
     // 1) icon
-    if (m_dialogStyle & wxICON_MASK)
+    if (style & wxICON_MASK)
     {
-        wxStaticBitmap *icon = new wxStaticBitmap
-                                   (
-                                    this,
-                                    wxID_ANY,
-                                    wxArtProvider::GetMessageBoxIcon(m_dialogStyle)
-                                   );
+        wxBitmap bitmap;
+        switch ( style & wxICON_MASK )
+        {
+            default:
+                wxFAIL_MSG(_T("incorrect log style"));
+                // fall through
+
+            case wxICON_ERROR:
+                bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX);
+                break;
+
+            case wxICON_INFORMATION:
+                bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX);
+                break;
+
+            case wxICON_WARNING:
+                bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX);
+                break;
+
+            case wxICON_QUESTION:
+                bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
+                break;
+        }
+        wxStaticBitmap *icon = new wxStaticBitmap(this, wxID_ANY, bitmap);
         if (is_pda)
             topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
         else
-            icon_text->Add(icon, wxSizerFlags().Top().Border(wxRIGHT, 20));
+            icon_text->Add( icon, 0, wxCENTER );
     }
 #endif // wxUSE_STATBMP
 
 #if wxUSE_STATTEXT
     // 2) text
+    icon_text->Add( CreateTextSizer( message ), 0, wxALIGN_CENTER | wxLEFT, 10 );
 
-    wxBoxSizer * const textsizer = new wxBoxSizer(wxVERTICAL);
-
-    // We want to show the main message in a different font to make it stand
-    // out if the extended message is used as well. This looks better and is
-    // more consistent with the native dialogs under MSW and GTK.
-    wxString lowerMessage;
-    if ( !m_extendedMessage.empty() )
-    {
-        wxTitleTextWrapper titleWrapper(this);
-        textsizer->Add(CreateTextSizer(GetMessage(), titleWrapper),
-                       wxSizerFlags().Border(wxBOTTOM, 20));
-
-        lowerMessage = GetExtendedMessage();
-    }
-    else // no extended message
-    {
-        lowerMessage = GetMessage();
-    }
-
-    textsizer->Add(CreateTextSizer(lowerMessage));
-
-    icon_text->Add(textsizer, 0, wxALIGN_CENTER, 10);
-    topsizer->Add( icon_text, 1, wxLEFT|wxRIGHT|wxTOP, 10 );
+    topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
 #endif // wxUSE_STATTEXT
 
-    // 3) optional checkbox and detailed text
-    AddMessageDialogCheckBox( topsizer );
-    AddMessageDialogDetails( topsizer );
-
-    // 4) buttons
-    wxSizer *sizerBtn = CreateMsgDlgButtonSizer();
+    // 3) buttons
+    int center_flag = wxEXPAND;
+    if (style & wxYES_NO)
+        center_flag = wxALIGN_CENTRE;
+    wxSizer *sizerBtn = CreateSeparatedButtonSizer(style & ButtonSizerFlags);
     if ( sizerBtn )
-        topsizer->Add(sizerBtn, 0, wxEXPAND | wxALL, 10 );
+        topsizer->Add(sizerBtn, 0, center_flag | wxALL, 10 );
 
     SetAutoLayout( true );
     SetSizer( topsizer );
@@ -250,11 +145,6 @@ void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
     EndModal( wxID_NO );
 }
 
-void wxGenericMessageDialog::OnHelp(wxCommandEvent& WXUNUSED(event))
-{
-    EndModal( wxID_HELP );
-}
-
 void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
     // Allow cancellation via ESC/Close button except if
@@ -266,15 +156,4 @@ void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
     }
 }
 
-int wxGenericMessageDialog::ShowModal()
-{
-    if ( !m_created )
-    {
-        m_created = true;
-        DoCreateMsgdialog();
-    }
-
-    return wxMessageDialogBase::ShowModal();
-}
-
-#endif // wxUSE_MSGDLG
+#endif // wxUSE_MSGDLG && !defined(__WXGTK20__)
diff --git a/Source/3rd Party/wx/src/generic/numdlgg.cpp b/Source/3rd Party/wx/src/generic/numdlgg.cpp
index 664e32413..38c1376d8 100644
--- a/Source/3rd Party/wx/src/generic/numdlgg.cpp	
+++ b/Source/3rd Party/wx/src/generic/numdlgg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: numdlgg.cpp 54861 2008-07-30 21:53:26Z VZ $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -77,8 +77,7 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
                                          long min,
                                          long max,
                                          const wxPoint& pos)
-                   : wxDialog(GetParentForModalDialog(parent, 0),
-                              wxID_ANY, caption,
+                   : wxDialog(parent, wxID_ANY, caption,
                               pos, wxDefaultSize)
 {
     m_value = value;
@@ -135,7 +134,7 @@ void wxNumberEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
 #if !wxUSE_SPINCTRL
     wxString tmp = m_spinctrl->GetValue();
-    if ( wxSscanf(tmp, wxT("%ld"), &m_value) != 1 )
+    if ( wxSscanf(tmp, _T("%ld"), &m_value) != 1 )
         EndModal(wxID_CANCEL);
     else
 #else
diff --git a/Source/3rd Party/wx/src/common/panelcmn.cpp b/Source/3rd Party/wx/src/generic/panelg.cpp
similarity index 56%
rename from Source/3rd Party/wx/src/common/panelcmn.cpp
rename to Source/3rd Party/wx/src/generic/panelg.cpp
index 31781d2ff..cd4dbee65 100644
--- a/Source/3rd Party/wx/src/common/panelcmn.cpp	
+++ b/Source/3rd Party/wx/src/generic/panelg.cpp	
@@ -1,121 +1,180 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/common/panelcmn.cpp
-// Purpose:     wxPanel common code
-// Author:      Julian Smart, Robert Roebling, Vadim Zeitlin
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/object.h"
-    #include "wx/font.h"
-    #include "wx/colour.h"
-    #include "wx/settings.h"
-    #include "wx/log.h"
-    #include "wx/panel.h"
-    #include "wx/containr.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// XTI
-// ----------------------------------------------------------------------------
-
-wxDEFINE_FLAGS( wxPanelStyle )
-wxBEGIN_FLAGS( wxPanelStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB)
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-wxEND_FLAGS( wxPanelStyle )
-
-wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow, "wx/panel.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxPanel)
-    wxPROPERTY_FLAGS( WindowStyle, wxPanelStyle, long, \
-                      SetWindowStyleFlag, GetWindowStyleFlag, \
-                      wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, \
-                      wxT("Helpstring"), wxT("group")) // style
-    // style wxTAB_TRAVERSAL
-wxEND_PROPERTIES_TABLE()
-
-wxEMPTY_HANDLERS_TABLE(wxPanel)
-
-wxCONSTRUCTOR_6( wxPanel, wxWindow*, Parent, wxWindowID, Id, \
-                 wxPoint, Position, wxSize, Size, long, WindowStyle, \
-                 wxString, Name)
-
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxPanelBase creation
-// ----------------------------------------------------------------------------
-
-bool wxPanelBase::Create(wxWindow *parent, wxWindowID id,
-                         const wxPoint& pos,
-                         const wxSize& size,
-                         long style,
-                         const wxString& name)
-{
-    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
-        return false;
-
-    // so that non-solid background renders correctly under GTK+:
-    SetThemeEnabled(true);
-
-#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__))
-    // Required to get solid control backgrounds under WinCE
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-#endif
-
-    return true;
-}
-
-void wxPanelBase::InitDialog()
-{
-    wxInitDialogEvent event(GetId());
-    event.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(event);
-}
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/generic/panelg.cpp
+// Purpose:     wxPanel and the keyboard handling code
+// Author:      Julian Smart, Robert Roebling, Vadim Zeitlin
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: panelg.cpp 40307 2006-07-25 01:31:13Z VZ $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/font.h"
+    #include "wx/colour.h"
+    #include "wx/settings.h"
+    #include "wx/log.h"
+    #include "wx/panel.h"
+    #include "wx/containr.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxPanelStyle )
+
+wxBEGIN_FLAGS( wxPanelStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxPanelStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxPanel, wxWindow,"wx/panel.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxPanel)
+    wxPROPERTY_FLAGS( WindowStyle , wxPanelStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+// style wxTAB_TRAVERSAL
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxPanel)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxPanel , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
+#endif
+
+BEGIN_EVENT_TABLE(wxPanel, wxWindow)
+    EVT_SIZE(wxPanel::OnSize)
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxPanel)
+END_EVENT_TABLE()
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxPanel, wxWindow)
+
+// ----------------------------------------------------------------------------
+// wxPanel creation
+// ----------------------------------------------------------------------------
+
+void wxPanel::Init()
+{
+    m_container.SetContainerWindow(this);
+}
+
+bool wxPanel::Create(wxWindow *parent, wxWindowID id,
+                     const wxPoint& pos,
+                     const wxSize& size,
+                     long style,
+                     const wxString& name)
+{
+    if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+        return false;
+
+    // so that non-solid background renders correctly under GTK+:
+    SetThemeEnabled(true);
+
+#if defined(__WXWINCE__) && (defined(__POCKETPC__) || defined(__SMARTPHONE__))
+    // Required to get solid control backgrounds under WinCE
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+#endif
+
+    return true;
+}
+
+wxPanel::~wxPanel()
+{
+}
+
+void wxPanel::InitDialog()
+{
+    wxInitDialogEvent event(GetId());
+    event.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(event);
+}
+
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+void wxPanel::OnSize(wxSizeEvent& event)
+{
+    if (GetAutoLayout())
+        Layout();
+#if wxUSE_CONSTRAINTS
+#if defined(__WXPM__) && 0
+    else
+    {
+        // Need to properly move child windows under OS/2
+
+        PSWP                        pWinSwp = GetSwp();
+
+        if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0)
+        {
+            // Uninitialized
+
+            ::WinQueryWindowPos(GetHWND(), pWinSwp);
+        }
+        else
+        {
+            SWP                     vSwp;
+            int                     nYDiff;
+
+            ::WinQueryWindowPos(GetHWND(), &vSwp);
+            nYDiff = pWinSwp->cy - vSwp.cy;
+            MoveChildren(nYDiff);
+            pWinSwp->cx = vSwp.cx;
+            pWinSwp->cy = vSwp.cy;
+        }
+    }
+#endif
+#endif // wxUSE_CONSTRAINTS
+
+    event.Skip();
+}
diff --git a/Source/3rd Party/wx/src/generic/printps.cpp b/Source/3rd Party/wx/src/generic/printps.cpp
index 71df86e3e..fafc3d8f1 100644
--- a/Source/3rd Party/wx/src/generic/printps.cpp	
+++ b/Source/3rd Party/wx/src/generic/printps.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: printps.cpp 42522 2006-10-27 13:07:40Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
 #include "wx/generic/printps.h"
 #include "wx/printdlg.h"
 #include "wx/generic/prntdlgg.h"
-#include "wx/progdlg.h"
+#include "wx/generic/progdlgg.h"
 #include "wx/paper.h"
 
 #include <stdlib.h>
@@ -72,7 +72,7 @@ wxPostScriptPrinter::~wxPostScriptPrinter()
 bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
 {
     sm_abortIt = false;
-    sm_abortWindow = NULL;
+    sm_abortWindow = (wxWindow *) NULL;
 
     if (!printout)
     {
@@ -80,6 +80,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
         return false;
     }
 
+    printout->SetIsPreview(false);
+
     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)
@@ -99,7 +101,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
     }
 
     // May have pressed cancel.
-    if (!dc || !dc->IsOk())
+    if (!dc || !dc->Ok())
     {
         if (dc) delete dc;
         sm_lastError = wxPRINTER_ERROR;
@@ -111,8 +113,8 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
 
     printout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
                             (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
-    printout->SetPPIPrinter( dc->GetResolution(),
-                             dc->GetResolution() );
+    printout->SetPPIPrinter( wxPostScriptDC::GetResolution(),
+                             wxPostScriptDC::GetResolution() );
 
     // Set printout parameters
     printout->SetDC(dc);
@@ -230,7 +232,7 @@ bool wxPostScriptPrinter::Print(wxWindow *parent, wxPrintout *printout, bool pro
 
 wxDC* wxPostScriptPrinter::PrintDialog(wxWindow *parent)
 {
-    wxDC* dc = NULL;
+    wxDC* dc = (wxDC*) NULL;
 
     wxGenericPrintDialog dialog( parent, &m_printDialogData );
     if (dialog.ShowModal() == wxID_OK)
@@ -330,20 +332,16 @@ void wxPostScriptPrintPreview::DetermineScaling()
 
     if (paper)
     {
-        int resolution = 600;  // TODO, this is correct, but get this from wxPSDC somehow
+        wxSize ScreenPixels = wxGetDisplaySize();
+        wxSize ScreenMM = wxGetDisplaySizeMM();
 
-        const wxSize screenPPI = wxGetDisplayPPI();
-        int logPPIScreenX = screenPPI.GetWidth();
-        int logPPIScreenY = screenPPI.GetHeight();
-        int logPPIPrinterX = resolution;
-        int logPPIPrinterY = resolution;
-
-        m_previewPrintout->SetPPIScreen( logPPIScreenX, logPPIScreenY );
-        m_previewPrintout->SetPPIPrinter( logPPIPrinterX, logPPIPrinterY );
+        m_previewPrintout->SetPPIScreen( (int) ((ScreenPixels.GetWidth() * 25.4) / ScreenMM.GetWidth()),
+                                         (int) ((ScreenPixels.GetHeight() * 25.4) / ScreenMM.GetHeight()) );
+        m_previewPrintout->SetPPIPrinter(wxPostScriptDC::GetResolution(), wxPostScriptDC::GetResolution());
 
         wxSize sizeDevUnits(paper->GetSizeDeviceUnits());
-        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * resolution / 72.0);
-        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * resolution / 72.0);
+        sizeDevUnits.x = (wxCoord)((float)sizeDevUnits.x * wxPostScriptDC::GetResolution() / 72.0);
+        sizeDevUnits.y = (wxCoord)((float)sizeDevUnits.y * wxPostScriptDC::GetResolution() / 72.0);
         wxSize sizeTenthsMM(paper->GetSize());
         wxSize sizeMM(sizeTenthsMM.x / 10, sizeTenthsMM.y / 10);
 
@@ -364,8 +362,8 @@ void wxPostScriptPrintPreview::DetermineScaling()
         m_previewPrintout->SetPaperRectPixels(wxRect(0, 0, m_pageWidth, m_pageHeight));
 
         // At 100%, the page should look about page-size on the screen.
-        m_previewScaleX = float(logPPIScreenX) / logPPIPrinterX;
-        m_previewScaleY = float(logPPIScreenY) / logPPIPrinterY;
+        m_previewScaleX = (float)0.8 * 72.0 / (float)wxPostScriptDC::GetResolution();
+        m_previewScaleY = m_previewScaleX;
     }
 }
 
diff --git a/Source/3rd Party/wx/src/generic/prntdlgg.cpp b/Source/3rd Party/wx/src/generic/prntdlgg.cpp
index 2909498f4..42658569c 100644
--- a/Source/3rd Party/wx/src/generic/prntdlgg.cpp	
+++ b/Source/3rd Party/wx/src/generic/prntdlgg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: prntdlgg.cpp 55256 2008-08-25 14:39:11Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -69,12 +69,7 @@
     wxFORCE_LINK_MODULE(gnome_print)
 #endif
 
-#if wxUSE_GTKPRINT
-    #include "wx/link.h"
-    wxFORCE_LINK_MODULE(gtk_print)
-#endif
-
-#endif // !wxUniv
+#endif // !__WXUNIVERSAL__
 
 // ----------------------------------------------------------------------------
 // global vars
@@ -145,8 +140,7 @@ END_EVENT_TABLE()
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintDialogData* data)
-                    : wxPrintDialogBase(GetParentForModalDialog(parent, 0),
-                               wxID_ANY, _("Print"),
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
@@ -159,8 +153,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
-                    : wxPrintDialogBase(GetParentForModalDialog(parent, 0),
-                                wxID_ANY, _("Print"),
+                    : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
                                wxPoint(0,0), wxSize(600, 600),
                                wxDEFAULT_DIALOG_STYLE |
                                wxTAB_TRAVERSAL)
@@ -221,15 +214,16 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
     choices[0] = _("All");
     choices[1] = _("Pages");
 
-    m_fromText = NULL;
-    m_toText = NULL;
-    m_rangeRadioBox = NULL;
+    m_fromText = (wxTextCtrl*)NULL;
+    m_toText = (wxTextCtrl*)NULL;
+    m_rangeRadioBox = (wxRadioBox *)NULL;
 
     if (m_printDialogData.GetFromPage() != 0)
     {
         m_rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"),
                                          wxDefaultPosition, wxDefaultSize,
-                                         2, choices);
+                                         2, choices,
+                                         1, wxRA_VERTICAL);
         m_rangeRadioBox->SetSelection(1);
 
         mainsizer->Add( m_rangeRadioBox, 0, wxLEFT|wxTOP|wxRIGHT, 10 );
@@ -356,9 +350,9 @@ bool wxGenericPrintDialog::TransferDataToWindow()
              m_fromText->Enable(true);
              m_toText->Enable(true);
              if (m_printDialogData.GetFromPage() > 0)
-                m_fromText->SetValue(wxString::Format(wxT("%d"), m_printDialogData.GetFromPage()));
+                m_fromText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetFromPage()));
              if (m_printDialogData.GetToPage() > 0)
-                m_toText->SetValue(wxString::Format(wxT("%d"), m_printDialogData.GetToPage()));
+                m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
              if(m_rangeRadioBox)
              {
                 if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
@@ -380,7 +374,7 @@ bool wxGenericPrintDialog::TransferDataToWindow()
        }
     }
     m_noCopiesText->SetValue(
-        wxString::Format(wxT("%d"), m_printDialogData.GetNoCopies()));
+        wxString::Format(_T("%d"), m_printDialogData.GetNoCopies()));
 
     m_printToFileCheckBox->SetValue(m_printDialogData.GetPrintToFile());
     m_printToFileCheckBox->Enable(m_printDialogData.GetEnablePrintToFile());
@@ -458,13 +452,13 @@ wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,0), wxSize(600, 600), wxD
 }
 
 /* XPM */
-static const char* const check_xpm[] = {
+static const char * check_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "16 16 3 1",
 /* colors */
-"  s None c None",
-"X c #000000",
-". c #808080",
+" 	s None	c None",
+"X	c #000000",
+".	c #808080",
 /* pixels */
 "                ",
 "                ",
@@ -708,7 +702,7 @@ void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event)
         li.SetMask( wxLIST_MASK_TEXT );
         li.SetId( event.GetIndex() );
         m_printerListCtrl->GetItem( li );
-        m_printerCommandText->SetValue( wxT("lpr -P") + li.GetText() );
+        m_printerCommandText->SetValue( _T("lpr -P") + li.GetText() );
     }
 }
 
@@ -717,9 +711,9 @@ bool wxGenericPrintSetupDialog::TransferDataToWindow()
     wxPostScriptPrintNativeData *data =
         (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
 
-    if (m_printerCommandText && !data->GetPrinterCommand().empty())
+    if (m_printerCommandText && data->GetPrinterCommand())
         m_printerCommandText->SetValue(data->GetPrinterCommand());
-    if (m_printerOptionsText && !data->GetPrinterOptions().empty())
+    if (m_printerOptionsText && data->GetPrinterOptions())
         m_printerOptionsText->SetValue(data->GetPrinterOptions());
     if (m_colourCheckBox)
         m_colourCheckBox->SetValue(m_printData.GetColour());
@@ -804,7 +798,7 @@ wxComboBox *wxGenericPrintSetupDialog::CreatePaperTypeChoice()
 
     wxComboBox *choice = new wxComboBox( this,
                                          wxPRINTID_PAPERSIZE,
-                                         _("Paper size"),
+                                         _("Paper Size"),
                                          wxDefaultPosition,
                                          wxSize(width, wxDefaultCoord),
                                          n, choices );
@@ -831,7 +825,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
                                                     wxPageSetupDialogData* data)
     : wxPageSetupDialogBase( parent,
                 wxID_ANY,
-                _("Page setup"),
+                _("Page Setup"),
                 wxPoint(0,0),
                 wxSize(600, 600),
                 wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
@@ -858,7 +852,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
 
     m_paperTypeChoice = new wxComboBox( this,
                                         wxPRINTID_PAPERSIZE,
-                                        _("Paper size"),
+                                        _("Paper Size"),
                                         wxDefaultPosition,
                                         wxSize(300, wxDefaultCoord),
                                         n, choices );
@@ -1060,7 +1054,7 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 
     wxComboBox *choice = new wxComboBox( this,
                                          wxPRINTID_PAPERSIZE,
-                                         _("Paper size"),
+                                         _("Paper Size"),
                                          wxPoint(*x, *y),
                                          wxSize(300, wxDefaultCoord),
                                          n, choices );
diff --git a/Source/3rd Party/wx/src/generic/progdlgg.cpp b/Source/3rd Party/wx/src/generic/progdlgg.cpp
index 821e1c213..3b63456cf 100644
--- a/Source/3rd Party/wx/src/generic/progdlgg.cpp	
+++ b/Source/3rd Party/wx/src/generic/progdlgg.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/generic/progdlgg.cpp
-// Purpose:     wxGenericProgressDialog class
+// Purpose:     wxProgressDialog class
 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     09.05.1999
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: progdlgg.cpp 50711 2007-12-15 02:57:58Z VZ $
 // Copyright:   (c) Karsten Ballueder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,11 +38,9 @@
     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
-    #include "wx/app.h"
 #endif
 
 #include "wx/progdlg.h"
-#include "wx/evtloop.h"
 
 // ---------------------------------------------------------------------------
 // macros
@@ -66,127 +64,60 @@
 
 static const int wxID_SKIP = 32000;  // whatever
 
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// update the label to show the given time (in seconds)
+static void SetTimeLabel(unsigned long val, wxStaticText *label);
+
 // ----------------------------------------------------------------------------
 // event tables
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxGenericProgressDialog, wxDialog)
-    EVT_BUTTON(wxID_CANCEL, wxGenericProgressDialog::OnCancel)
-    EVT_BUTTON(wxID_SKIP, wxGenericProgressDialog::OnSkip)
+BEGIN_EVENT_TABLE(wxProgressDialog, wxDialog)
+    EVT_BUTTON(wxID_CANCEL, wxProgressDialog::OnCancel)
+    EVT_BUTTON(wxID_SKIP, wxProgressDialog::OnSkip)
 
-    EVT_CLOSE(wxGenericProgressDialog::OnClose)
+    EVT_CLOSE(wxProgressDialog::OnClose)
 END_EVENT_TABLE()
 
+IMPLEMENT_CLASS(wxProgressDialog, wxDialog)
+
 // ============================================================================
-// wxGenericProgressDialog implementation
+// wxProgressDialog implementation
 // ============================================================================
 
-wxIMPLEMENT_CLASS(wxProgressDialog, wxDialog)
-
 // ----------------------------------------------------------------------------
-// wxGenericProgressDialog creation
+// wxProgressDialog creation
 // ----------------------------------------------------------------------------
 
-void wxGenericProgressDialog::Init()
+wxProgressDialog::wxProgressDialog(wxString const &title,
+                                   wxString const &message,
+                                   int maximum,
+                                   wxWindow *parent,
+                                   int style)
+                : wxDialog(parent, wxID_ANY, title),
+                  m_skip(false),
+                  m_delay(3),
+                  m_hasAbortButton(false),
+                  m_hasSkipButton(false)
 {
     // we may disappear at any moment, let the others know about it
     SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT);
+    m_windowStyle |= style;
 
-    // Initialize all our members that we always use (even when we don't
-    // create a valid window in this class).
+    m_hasAbortButton = (style & wxPD_CAN_ABORT) != 0;
+    m_hasSkipButton = (style & wxPD_CAN_SKIP) != 0;
 
-    m_pdStyle = 0;
-    m_parentTop = NULL;
-
-    m_gauge = NULL;
-    m_msg = NULL;
-    m_elapsed =
-    m_estimated =
-    m_remaining = NULL;
-
-    m_state = Uncancelable;
-    m_maximum = 0;
-
-    m_timeStart = wxGetCurrentTime();
-    m_timeStop = (unsigned long)-1;
-    m_break = 0;
-
-    m_skip = false;
-
-#if !defined(__SMARTPHONE__)
-    m_btnAbort =
-    m_btnSkip = NULL;
-#endif
-
-    m_display_estimated =
-    m_last_timeupdate =
-    m_ctdelay = 0;
-
-    m_delay = 3;
-
-    m_winDisabler = NULL;
-    m_tempEventLoop = NULL;
-}
-
-wxGenericProgressDialog::wxGenericProgressDialog()
-                       : wxDialog()
-{
-    Init();
-}
-
-wxGenericProgressDialog::wxGenericProgressDialog(const wxString& title,
-                                                 const wxString& message,
-                                                 int maximum,
-                                                 wxWindow *parent,
-                                                 int style)
-                       : wxDialog()
-{
-    Init();
-
-    Create( title, message, maximum, parent, style );
-}
-
-void wxGenericProgressDialog::SetTopParent(wxWindow* parent)
-{
-    m_parentTop = GetParentForModalDialog(parent, GetWindowStyle());
-}
-
-bool wxGenericProgressDialog::Create( const wxString& title,
-                                      const wxString& message,
-                                      int maximum,
-                                      wxWindow *parent,
-                                      int style )
-{
-    SetTopParent(parent);
-
-    m_parentTop = wxGetTopLevelParent(parent);
-    m_pdStyle = style;
-
-    wxWindow* const
-        realParent = GetParentForModalDialog(parent, GetWindowStyle());
-
-    if (!wxDialog::Create(realParent, wxID_ANY, title))
-        return false;
-
-    SetMaximum(maximum);
-
-    // We need a running event loop in order to update the dialog and be able
-    // to process clicks on its buttons, so ensure that there is one running
-    // even if this means we have to start it ourselves (this happens most
-    // commonly during the program initialization, e.g. for the progress
-    // dialogs shown from overridden wxApp::OnInit()).
-    if ( !wxEventLoopBase::GetActive() )
-    {
-        m_tempEventLoop = new wxEventLoop;
-        wxEventLoop::SetActive(m_tempEventLoop);
-    }
+    bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     // we have to remove the "Close" button from the title bar then as it is
     // confusing to have it - it doesn't work anyhow
     //
     // FIXME: should probably have a (extended?) window style for this
-    if ( !HasPDFlag(wxPD_CAN_ABORT) )
+    if ( !m_hasAbortButton )
     {
         EnableCloseButton(false);
     }
@@ -196,113 +127,156 @@ bool wxGenericProgressDialog::Create( const wxString& title,
     SetLeftMenu();
 #endif
 
-    m_state = HasPDFlag(wxPD_CAN_ABORT) ? Continue : Uncancelable;
+    m_state = m_hasAbortButton ? Continue : Uncancelable;
+    m_maximum = maximum;
 
-    // top-level sizerTop
-    wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
+#if defined(__WXMSW__) || defined(__WXPM__)
+    // we can't have values > 65,536 in the progress control under Windows, so
+    // scale everything down
+    m_factor = m_maximum / 65536 + 1;
+    m_maximum /= m_factor;
+#endif // __WXMSW__
+
+    m_parentTop = wxGetTopLevelParent(parent);
+
+    wxClientDC dc(this);
+    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+    long widthText = 0;
+    dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
+
+    wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 
     m_msg = new wxStaticText(this, wxID_ANY, message);
-    sizerTop->Add(m_msg, 0, wxLEFT | wxTOP, 2*LAYOUT_MARGIN);
+    sizer->Add(m_msg, 0, wxLEFT | wxTOP, 2*LAYOUT_MARGIN);
 
-    int gauge_style = wxGA_HORIZONTAL;
-    if ( style & wxPD_SMOOTH )
-        gauge_style |= wxGA_SMOOTH;
+    wxSize sizeDlg,
+           sizeLabel = m_msg->GetSize();
+    sizeDlg.y = 2*LAYOUT_MARGIN + sizeLabel.y;
 
-#ifdef __WXMSW__
-    maximum /= m_factor;
-#endif
+    if ( maximum > 0 )
+    {
+        int gauge_style = wxGA_HORIZONTAL;
+        if ( ( style & wxPD_SMOOTH ) == wxPD_SMOOTH )
+            gauge_style |= wxGA_SMOOTH;
+        m_gauge = new wxGauge(this, wxID_ANY, m_maximum,
+                              wxDefaultPosition, wxDefaultSize,
+                              gauge_style );
 
-    m_gauge = new wxGauge
-                  (
-                    this,
-                    wxID_ANY,
-                    maximum,
-                    wxDefaultPosition,
-                    // make the progress bar sufficiently long
-                    wxSize(wxMin(wxGetClientDisplayRect().width/3, 300), -1),
-                    gauge_style
-                  );
+        sizer->Add(m_gauge, 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 2*LAYOUT_MARGIN);
+        m_gauge->SetValue(0);
 
-    sizerTop->Add(m_gauge, 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, 2*LAYOUT_MARGIN);
-    m_gauge->SetValue(0);
+        wxSize sizeGauge = m_gauge->GetSize();
+        sizeDlg.y += 2*LAYOUT_MARGIN + sizeGauge.y;
+    }
+    else
+        m_gauge = (wxGauge *)NULL;
 
     // create the estimated/remaining/total time zones if requested
-    m_elapsed =
-    m_estimated =
-    m_remaining = NULL;
+    m_elapsed = m_estimated = m_remaining = (wxStaticText*)NULL;
+    m_display_estimated = m_last_timeupdate = m_break = 0;
+    m_ctdelay = 0;
+
+    // if we are going to have at least one label, remember it in this var
+    wxStaticText *label = NULL;
 
     // also count how many labels we really have
     size_t nTimeLabels = 0;
 
-    wxSizer * const sizerLabels = new wxFlexGridSizer(2);
-
     if ( style & wxPD_ELAPSED_TIME )
     {
         nTimeLabels++;
 
-        m_elapsed = CreateLabel(GetElapsedLabel(), sizerLabels);
+        label =
+        m_elapsed = CreateLabel(_("Elapsed time : "), sizer);
     }
 
     if ( style & wxPD_ESTIMATED_TIME )
     {
         nTimeLabels++;
 
-        m_estimated = CreateLabel(GetEstimatedLabel(), sizerLabels);
+        label =
+        m_estimated = CreateLabel(_("Estimated time : "), sizer);
     }
 
     if ( style & wxPD_REMAINING_TIME )
     {
         nTimeLabels++;
 
-        m_remaining = CreateLabel(GetRemainingLabel(), sizerLabels);
+        label =
+        m_remaining = CreateLabel(_("Remaining time : "), sizer);
+    }
+
+    if ( nTimeLabels > 0 )
+    {
+        // set it to the current time
+        m_timeStart = wxGetCurrentTime();
+        sizeDlg.y += nTimeLabels * (label->GetSize().y + LAYOUT_MARGIN);
     }
-    sizerTop->Add(sizerLabels, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN);
 
 #if defined(__SMARTPHONE__)
-    if ( HasPDFlag(wxPD_CAN_SKIP) )
+    if ( m_hasSkipButton )
         SetRightMenu(wxID_SKIP, _("Skip"));
-    if ( HasPDFlag(wxPD_CAN_ABORT) )
+    if ( m_hasAbortButton )
         SetLeftMenu(wxID_CANCEL);
 #else
-    m_btnAbort =
-    m_btnSkip = NULL;
-
+    m_btnAbort = m_btnSkip = (wxButton *)NULL;
+    bool sizeDlgModified = false;
     wxBoxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
 
-    // Windows dialogs usually have buttons in the lower right corner
     const int sizerFlags =
-#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXOSX__)
+#if defined(__WXMSW__) || defined(__WXPM__)
                            wxALIGN_RIGHT | wxALL
 #else // !MSW
                            wxALIGN_CENTER_HORIZONTAL | wxBOTTOM | wxTOP
 #endif // MSW/!MSW
                            ;
 
-    if ( HasPDFlag(wxPD_CAN_SKIP) )
+    if ( m_hasSkipButton )
     {
-        m_btnSkip = new wxButton(this, wxID_SKIP, _("&Skip"));
+        m_btnSkip = new wxButton(this, wxID_SKIP, _("Skip"));
 
+        // Windows dialogs usually have buttons in the lower right corner
         buttonSizer->Add(m_btnSkip, 0, sizerFlags, LAYOUT_MARGIN);
+        sizeDlg.y += 2*LAYOUT_MARGIN + wxButton::GetDefaultSize().y;
+        sizeDlgModified = true;
     }
 
-    if ( HasPDFlag(wxPD_CAN_ABORT) )
+    if ( m_hasAbortButton )
     {
         m_btnAbort = new wxButton(this, wxID_CANCEL);
 
+        // Windows dialogs usually have buttons in the lower right corner
         buttonSizer->Add(m_btnAbort, 0, sizerFlags, LAYOUT_MARGIN);
+        if(!sizeDlgModified)
+            sizeDlg.y += 2*LAYOUT_MARGIN + wxButton::GetDefaultSize().y;
     }
 
-    if ( !HasPDFlag(wxPD_CAN_SKIP | wxPD_CAN_ABORT) )
-        buttonSizer->AddSpacer(LAYOUT_MARGIN);
-
-    sizerTop->Add(buttonSizer, 0, sizerFlags, LAYOUT_MARGIN );
+    sizer->Add(buttonSizer, 0, sizerFlags, LAYOUT_MARGIN );
 #endif // __SMARTPHONE__/!__SMARTPHONE__
 
-    SetSizerAndFit(sizerTop);
+    SetSizerAndFit(sizer);
+
+    if (!isPda)
+    {
+        sizeDlg.y += 2*LAYOUT_MARGIN;
+
+        // try to make the dialog not square but rectangular of reasonable width
+        sizeDlg.x = (wxCoord)wxMax(3*widthText/2, 4*sizeDlg.y/3);
+        SetClientSize(sizeDlg);
+    }
 
     Centre(wxCENTER_FRAME | wxBOTH);
 
-    DisableOtherWindows();
+    if ( style & wxPD_APP_MODAL )
+    {
+        m_winDisabler = new wxWindowDisabler(this);
+    }
+    else
+    {
+        if ( m_parentTop )
+            m_parentTop->Disable();
+        m_winDisabler = NULL;
+    }
 
     Show();
     Enable();
@@ -316,118 +290,45 @@ bool wxGenericProgressDialog::Create( const wxString& title,
     }
 
     Update();
-    return true;
 }
 
-void wxGenericProgressDialog::UpdateTimeEstimates(int value,
-                                                  unsigned long &elapsedTime,
-                                                  unsigned long &estimatedTime,
-                                                  unsigned long &remainingTime)
+wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
+                                            wxSizer *sizer)
 {
-    unsigned long elapsed = wxGetCurrentTime() - m_timeStart;
-    if ( value != 0 && (m_last_timeupdate < elapsed || value == m_maximum) )
-    {
-        m_last_timeupdate = elapsed;
-        unsigned long estimated = m_break +
-                (unsigned long)(( (double) (elapsed-m_break) * m_maximum ) / ((double)value)) ;
-        if (    estimated > m_display_estimated
-                && m_ctdelay >= 0
-            )
-        {
-            ++m_ctdelay;
-        }
-        else if (    estimated < m_display_estimated
-                    && m_ctdelay <= 0
-                )
-        {
-            --m_ctdelay;
-        }
-        else
-        {
-            m_ctdelay = 0;
-        }
-        if (    m_ctdelay >= m_delay          // enough confirmations for a higher value
-                || m_ctdelay <= (m_delay*-1)     // enough confirmations for a lower value
-                || value == m_maximum            // to stay consistent
-                || elapsed > m_display_estimated // to stay consistent
-                || ( elapsed > 0 && elapsed < 4 ) // additional updates in the beginning
-            )
-        {
-            m_display_estimated = estimated;
-            m_ctdelay = 0;
-        }
-    }
+    wxBoxSizer *locsizer = new wxBoxSizer(wxLARGESMALL(wxHORIZONTAL,wxVERTICAL));
 
-    if ( value != 0 )
-    {
-        long display_remaining = m_display_estimated - elapsed;
-        if ( display_remaining < 0 )
-        {
-            display_remaining = 0;
-        }
-
-        estimatedTime = m_display_estimated;
-        remainingTime = display_remaining;
-    }
-
-    elapsedTime = elapsed;
-}
-
-// static
-wxString wxGenericProgressDialog::GetFormattedTime(unsigned long timeInSec)
-{
-    wxString timeAsHMS;
-
-    if ( timeInSec == (unsigned long)-1 )
-    {
-        timeAsHMS = _("Unknown");
-    }
-    else
-    {
-        unsigned hours = timeInSec / 3600;
-        unsigned minutes = (timeInSec % 3600) / 60;
-        unsigned seconds = timeInSec % 60;
-        timeAsHMS.Printf("%u:%02u:%02u", hours, minutes, seconds);
-    }
-
-    return timeAsHMS;
-}
-
-wxStaticText *
-wxGenericProgressDialog::CreateLabel(const wxString& text, wxSizer *sizer)
-{
-    wxStaticText *label = new wxStaticText(this, wxID_ANY, text);
-    wxStaticText *value = new wxStaticText(this, wxID_ANY, _("unknown"));
+    wxStaticText *dummy = new wxStaticText(this, wxID_ANY, text);
+    wxStaticText *label = new wxStaticText(this, wxID_ANY, _("unknown"));
 
     // select placement most native or nice on target GUI
 #if defined(__SMARTPHONE__)
-    // value and time to the left in two rows
-    sizer->Add(label, 1, wxALIGN_LEFT);
-    sizer->Add(value, 1, wxALIGN_LEFT);
+    // label and time to the left in two rows
+    locsizer->Add(dummy, 1, wxALIGN_LEFT);
+    locsizer->Add(label, 1, wxALIGN_LEFT);
+    sizer->Add(locsizer, 0, wxALIGN_LEFT | wxTOP | wxLEFT, LAYOUT_MARGIN);
 #elif defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__) || defined(__WXGTK20__)
-    // value and time centered in one row
-    sizer->Add(label, 1, wxLARGESMALL(wxALIGN_RIGHT,wxALIGN_LEFT) | wxTOP | wxRIGHT, LAYOUT_MARGIN);
-    sizer->Add(value, 1, wxALIGN_LEFT | wxTOP, LAYOUT_MARGIN);
+    // label and time centered in one row
+    locsizer->Add(dummy, 1, wxLARGESMALL(wxALIGN_RIGHT,wxALIGN_LEFT));
+    locsizer->Add(label, 1, wxALIGN_LEFT | wxLEFT, LAYOUT_MARGIN);
+    sizer->Add(locsizer, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, LAYOUT_MARGIN);
 #else
-    // value and time to the right in one row
-    sizer->Add(label);
-    sizer->Add(value, 0, wxLEFT, LAYOUT_MARGIN);
+    // label and time to the right in one row
+    sizer->Add(locsizer, 0, wxALIGN_RIGHT | wxRIGHT | wxTOP, LAYOUT_MARGIN);
+    locsizer->Add(dummy);
+    locsizer->Add(label, 0, wxLEFT, LAYOUT_MARGIN);
 #endif
 
-    return value;
+    return label;
 }
 
 // ----------------------------------------------------------------------------
-// wxGenericProgressDialog operations
+// wxProgressDialog operations
 // ----------------------------------------------------------------------------
 
 bool
-wxGenericProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
+wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
 {
-    if ( !DoBeforeUpdate(skip) )
-        return false;
-
-    wxCHECK_MSG( m_gauge, false, "dialog should be fully created" );
+    wxASSERT_MSG( value == -1 || m_gauge, wxT("cannot update non existent dialog") );
 
 #ifdef __WXMSW__
     value /= m_factor;
@@ -435,19 +336,54 @@ wxGenericProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
 
     wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") );
 
-    m_gauge->SetValue(value);
+    if ( m_gauge )
+        m_gauge->SetValue(value);
 
     UpdateMessage(newmsg);
 
     if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
     {
-        unsigned long elapsed;
-        unsigned long display_remaining;
+        unsigned long elapsed = wxGetCurrentTime() - m_timeStart;
+        if (    m_last_timeupdate < elapsed
+             || value == m_maximum
+           )
+        {
+            m_last_timeupdate = elapsed;
+            unsigned long estimated = m_break +
+                  (unsigned long)(( (double) (elapsed-m_break) * m_maximum ) / ((double)value)) ;
+            if (    estimated > m_display_estimated
+                 && m_ctdelay >= 0
+               )
+            {
+                ++m_ctdelay;
+            }
+            else if (    estimated < m_display_estimated
+                      && m_ctdelay <= 0
+                    )
+            {
+                --m_ctdelay;
+            }
+            else
+            {
+                m_ctdelay = 0;
+            }
+            if (    m_ctdelay >= m_delay          // enough confirmations for a higher value
+                 || m_ctdelay <= (m_delay*-1)     // enough confirmations for a lower value
+                 || value == m_maximum            // to stay consistent
+                 || elapsed > m_display_estimated // to stay consistent
+                 || ( elapsed > 0 && elapsed < 4 ) // additional updates in the beginning
+               )
+            {
+                m_display_estimated = estimated;
+                m_ctdelay = 0;
+            }
+        }
 
-        UpdateTimeEstimates( value,
-                             elapsed,
-                             m_display_estimated,
-                             display_remaining );
+        long display_remaining = m_display_estimated - elapsed;
+        if ( display_remaining < 0 )
+        {
+            display_remaining = 0;
+        }
 
         SetTimeLabel(elapsed, m_elapsed);
         SetTimeLabel(m_display_estimated, m_estimated);
@@ -468,7 +404,7 @@ wxGenericProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
         // so that we return true below and that out [Cancel] handler knew what
         // to do
         m_state = Finished;
-        if( !HasPDFlag(wxPD_AUTO_HIDE) )
+        if( !(GetWindowStyle() & wxPD_AUTO_HIDE) )
         {
             EnableClose();
             DisableSkip();
@@ -482,14 +418,8 @@ wxGenericProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
                 m_msg->SetLabel(_("Done."));
             }
 
-            // allow the window to repaint:
-            // NOTE: since we yield only for UI events with this call, there
-            //       should be no side-effects
-            wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);
+            wxYieldIfNeeded() ;
 
-            // NOTE: this call results in a new event loop being created
-            //       and to a call to ProcessPendingEvents() (which may generate
-            //       unwanted re-entrancies).
             (void)ShowModal();
         }
         else // auto hide
@@ -504,7 +434,7 @@ wxGenericProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
     }
     else // not at maximum yet
     {
-        DoAfterUpdate();
+        return DoAfterUpdate(skip);
     }
 
     // update the display in case yielding above didn't do it
@@ -513,12 +443,9 @@ wxGenericProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
     return m_state != Canceled;
 }
 
-bool wxGenericProgressDialog::Pulse(const wxString& newmsg, bool *skip)
+bool wxProgressDialog::Pulse(const wxString& newmsg, bool *skip)
 {
-    if ( !DoBeforeUpdate(skip) )
-        return false;
-
-    wxCHECK_MSG( m_gauge, false, "dialog should be fully created" );
+    wxASSERT_MSG( m_gauge, wxT("cannot update non existent dialog") );
 
     // show a bit of progress
     m_gauge->Pulse();
@@ -534,18 +461,14 @@ bool wxGenericProgressDialog::Pulse(const wxString& newmsg, bool *skip)
         SetTimeLabel((unsigned long)-1, m_remaining);
     }
 
-    DoAfterUpdate();
-
-    return m_state != Canceled;
+    return DoAfterUpdate(skip);
 }
 
-bool wxGenericProgressDialog::DoBeforeUpdate(bool *skip)
+bool wxProgressDialog::DoAfterUpdate(bool *skip)
 {
     // we have to yield because not only we want to update the display but
     // also to process the clicks on the cancel and skip buttons
-    // NOTE: using YieldFor() this call shouldn't give re-entrancy problems
-    //       for event handlers not interested to UI/user-input events.
-    wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT);
+    wxYieldIfNeeded();
 
     Update();
 
@@ -559,15 +482,7 @@ bool wxGenericProgressDialog::DoBeforeUpdate(bool *skip)
     return m_state != Canceled;
 }
 
-void wxGenericProgressDialog::DoAfterUpdate()
-{
-    // allow the window to repaint:
-    // NOTE: since we yield only for UI events with this call, there
-    //       should be no side-effects
-    wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);
-}
-
-void wxGenericProgressDialog::Resume()
+void wxProgressDialog::Resume()
 {
     m_state = Continue;
     m_ctdelay = m_delay; // force an update of the elapsed/estimated/remaining time
@@ -578,7 +493,7 @@ void wxGenericProgressDialog::Resume()
     m_skip = false;
 }
 
-bool wxGenericProgressDialog::Show( bool show )
+bool wxProgressDialog::Show( bool show )
 {
     // reenable other windows before hiding this one because otherwise
     // Windows wouldn't give the focus back to the window which had
@@ -589,83 +504,11 @@ bool wxGenericProgressDialog::Show( bool show )
     return wxDialog::Show(show);
 }
 
-int wxGenericProgressDialog::GetValue() const
-{
-    wxCHECK_MSG( m_gauge, -1, "dialog should be fully created" );
-
-    return m_gauge->GetValue();
-}
-
-int wxGenericProgressDialog::GetRange() const
-{
-    return m_maximum;
-}
-
-wxString wxGenericProgressDialog::GetMessage() const
-{
-    return m_msg->GetLabel();
-}
-
-void wxGenericProgressDialog::SetRange(int maximum)
-{
-    wxCHECK_RET( m_gauge, "dialog should be fully created" );
-
-    wxCHECK_RET( maximum > 0, "Invalid range" );
-
-    m_gauge->SetRange(maximum);
-
-    SetMaximum(maximum);
-}
-
-void wxGenericProgressDialog::SetMaximum(int maximum)
-{
-    m_maximum = maximum;
-
-#if defined(__WXMSW__) || defined(__WXPM__)
-    // we can't have values > 65,536 in the progress control under Windows, so
-    // scale everything down
-    m_factor = m_maximum / 65536 + 1;
-#endif // __WXMSW__
-}
-
-
-bool wxGenericProgressDialog::WasCancelled() const
-{
-    return HasPDFlag(wxPD_CAN_ABORT) && m_state == Canceled;
-}
-
-bool wxGenericProgressDialog::WasSkipped() const
-{
-    return HasPDFlag(wxPD_CAN_SKIP) && m_skip;
-}
-
-// static
-void wxGenericProgressDialog::SetTimeLabel(unsigned long val,
-                                           wxStaticText *label)
-{
-    if ( label )
-    {
-        wxString s;
-
-        if (val != (unsigned long)-1)
-        {
-            s = GetFormattedTime(val);
-        }
-        else
-        {
-            s = _("Unknown");
-        }
-
-        if ( s != label->GetLabel() )
-            label->SetLabel(s);
-    }
-}
-
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 
-void wxGenericProgressDialog::OnCancel(wxCommandEvent& event)
+void wxProgressDialog::OnCancel(wxCommandEvent& event)
 {
     if ( m_state == Finished )
     {
@@ -689,13 +532,13 @@ void wxGenericProgressDialog::OnCancel(wxCommandEvent& event)
     }
 }
 
-void wxGenericProgressDialog::OnSkip(wxCommandEvent& WXUNUSED(event))
+void wxProgressDialog::OnSkip(wxCommandEvent& WXUNUSED(event))
 {
     DisableSkip();
     m_skip = true;
 }
 
-void wxGenericProgressDialog::OnClose(wxCloseEvent& event)
+void wxProgressDialog::OnClose(wxCloseEvent& event)
 {
     if ( m_state == Uncancelable )
     {
@@ -722,37 +565,18 @@ void wxGenericProgressDialog::OnClose(wxCloseEvent& event)
 // destruction
 // ----------------------------------------------------------------------------
 
-wxGenericProgressDialog::~wxGenericProgressDialog()
+wxProgressDialog::~wxProgressDialog()
 {
     // normally this should have been already done, but just in case
     ReenableOtherWindows();
-
-    if ( m_tempEventLoop )
-    {
-        wxEventLoopBase::SetActive(NULL);
-        delete m_tempEventLoop;
-    }
 }
 
-void wxGenericProgressDialog::DisableOtherWindows()
+void wxProgressDialog::ReenableOtherWindows()
 {
-    if ( HasPDFlag(wxPD_APP_MODAL) )
+    if ( GetWindowStyle() & wxPD_APP_MODAL )
     {
-        m_winDisabler = new wxWindowDisabler(this);
-    }
-    else
-    {
-        if ( m_parentTop )
-            m_parentTop->Disable();
-        m_winDisabler = NULL;
-    }
-}
-
-void wxGenericProgressDialog::ReenableOtherWindows()
-{
-    if ( HasPDFlag(wxPD_APP_MODAL) )
-    {
-        wxDELETE(m_winDisabler);
+        delete m_winDisabler;
+        m_winDisabler = (wxWindowDisabler *)NULL;
     }
     else
     {
@@ -765,9 +589,32 @@ void wxGenericProgressDialog::ReenableOtherWindows()
 // private functions
 // ----------------------------------------------------------------------------
 
-void wxGenericProgressDialog::EnableSkip(bool enable)
+static void SetTimeLabel(unsigned long val, wxStaticText *label)
 {
-    if ( HasPDFlag(wxPD_CAN_SKIP) )
+    if ( label )
+    {
+        wxString s;
+
+        if (val != (unsigned long)-1)
+        {
+        unsigned long hours = val / 3600;
+        unsigned long minutes = (val % 3600) / 60;
+        unsigned long seconds = val % 60;
+        s.Printf(wxT("%lu:%02lu:%02lu"), hours, minutes, seconds);
+        }
+        else
+        {
+            s = _("Unknown");
+        }
+
+        if ( s != label->GetLabel() )
+            label->SetLabel(s);
+    }
+}
+
+void wxProgressDialog::EnableSkip(bool enable)
+{
+    if(m_hasSkipButton)
     {
 #ifdef __SMARTPHONE__
         if(enable)
@@ -781,9 +628,9 @@ void wxGenericProgressDialog::EnableSkip(bool enable)
     }
 }
 
-void wxGenericProgressDialog::EnableAbort(bool enable)
+void wxProgressDialog::EnableAbort(bool enable)
 {
-    if( HasPDFlag(wxPD_CAN_ABORT) )
+    if(m_hasAbortButton)
     {
 #ifdef __SMARTPHONE__
         if(enable)
@@ -797,9 +644,9 @@ void wxGenericProgressDialog::EnableAbort(bool enable)
     }
 }
 
-void wxGenericProgressDialog::EnableClose()
+void wxProgressDialog::EnableClose()
 {
-    if(HasPDFlag(wxPD_CAN_ABORT))
+    if(m_hasAbortButton)
     {
 #ifdef __SMARTPHONE__
         SetLeftMenu(wxID_CANCEL, _("Close"));
@@ -813,16 +660,13 @@ void wxGenericProgressDialog::EnableClose()
     }
 }
 
-void wxGenericProgressDialog::UpdateMessage(const wxString &newmsg)
+void wxProgressDialog::UpdateMessage(const wxString &newmsg)
 {
     if ( !newmsg.empty() && newmsg != m_msg->GetLabel() )
     {
         m_msg->SetLabel(newmsg);
 
-        // allow the window to repaint:
-        // NOTE: since we yield only for UI events with this call, there
-        //       should be no side-effects
-        wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);
+        wxYieldIfNeeded() ;
     }
 }
 
diff --git a/Source/3rd Party/wx/src/generic/renderg.cpp b/Source/3rd Party/wx/src/generic/renderg.cpp
index a16cb07fa..8c36e31d1 100644
--- a/Source/3rd Party/wx/src/generic/renderg.cpp	
+++ b/Source/3rd Party/wx/src/generic/renderg.cpp	
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: renderg.cpp 45498 2007-04-16 13:03:05Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -32,16 +32,11 @@
     #include "wx/settings.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"
-    #include "wx/control.h"
 #endif //WX_PRECOMP
 
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 
-#ifdef __WXMAC__
-    #include "wx/osx/private.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxRendererGeneric: our wxRendererNative implementation
 // ----------------------------------------------------------------------------
@@ -67,8 +62,6 @@ public:
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 
-    virtual int GetHeaderButtonMargin(wxWindow *win);
-
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
@@ -101,8 +94,6 @@ public:
                               const wxRect& rect,
                               int flags = 0);
 
-    virtual wxSize GetCheckBoxSize(wxWindow *win);
-
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
@@ -113,24 +104,6 @@ public:
                                        const wxRect& rect,
                                        int flags = 0);
 
-    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
-
-    virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
-
-    virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
-
-    virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
-
-    virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, int flags=0);
-
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-    virtual void DrawTitleBarBitmap(wxWindow *win,
-                                    wxDC& dc,
-                                    const wxRect& rect,
-                                    wxTitleBarButton button,
-                                    int flags = 0);
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
 
     virtual wxRendererVersion GetVersion() const
@@ -185,7 +158,10 @@ wxRendererNative& wxRendererNative::GetGeneric()
 
 void wxRendererGeneric::Cleanup()
 {
-    wxDELETE(sm_rendererGeneric);
+    if (sm_rendererGeneric)
+        delete sm_rendererGeneric;
+
+    sm_rendererGeneric = NULL;
 }
 
 wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL;
@@ -236,6 +212,8 @@ wxRendererGeneric::DrawHeaderButton(wxWindow* win,
                                     wxHeaderSortIconType sortArrow,
                                     wxHeaderButtonParams* params)
 {
+    const int CORNER = 1;
+
     const wxCoord x = rect.x,
                   y = rect.y,
                   w = rect.width,
@@ -244,20 +222,22 @@ wxRendererGeneric::DrawHeaderButton(wxWindow* win,
     dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.DrawRectangle(rect);
-
+    
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
     dc.SetPen(m_penBlack);
-    dc.DrawLine( x+w-1, y, x+w-1, y+h );  // right (outer)
-    dc.DrawLine( x, y+h-1, x+w, y+h-1 );  // bottom (outer)
+    dc.DrawLine( x+w-CORNER+1, y, x+w, y+h );  // right (outer)
+    dc.DrawRectangle( x, y+h, w+1, 1 );        // bottom (outer)
 
     dc.SetPen(m_penDarkGrey);
-    dc.DrawLine( x+w-2, y+1, x+w-2, y+h-1 );  // right (inner)
-    dc.DrawLine( x+1, y+h-2, x+w-1, y+h-2 );  // bottom (inner)
+    dc.DrawLine( x+w-CORNER, y, x+w-1, y+h );  // right (inner)
+    dc.DrawRectangle( x+1, y+h-1, w-2, 1 );    // bottom (inner)
 
     dc.SetPen(m_penHighlight);
-    dc.DrawLine( x, y, x, y+h-1 ); // left (outer)
-    dc.DrawLine( x, y, x+w-1, y ); // top (outer)
+    dc.DrawRectangle( x, y, w-CORNER+1, 1 );   // top (outer)
+    dc.DrawRectangle( x, y, 1, h );            // left (outer)
+    dc.DrawLine( x, y+h-1, x+1, y+h-1 );
+    dc.DrawLine( x+w-1, y, x+w-1, y+1 );
 
     return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
 }
@@ -272,7 +252,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
                                             wxHeaderButtonParams* params)
 {
     int labelWidth = 0;
-
+    
     // Mark this item as selected.  For the generic version we'll just draw an
     // underline
     if ( flags & wxCONTROL_SELECTED )
@@ -281,7 +261,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
         // native hot-tracking line (on XP)
         const int penwidth = 3;
         int y = rect.y + rect.height + 1 - penwidth;
-        wxColour c = (params && params->m_selectionColour.IsOk()) ?
+        wxColour c = (params && params->m_selectionColour.Ok()) ?
             params->m_selectionColour : wxColour(0x66, 0x66, 0x66);
         wxPen pen(c, penwidth);
         pen.SetCap(wxCAP_BUTT);
@@ -301,7 +281,7 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
         ar.y += (rect.height - ar.height)/2;
         ar.x = ar.x + rect.width - 3*ar.width/2;
         arrowSpace = 3*ar.width/2; // space to preserve when drawing the label
-
+        
         wxPoint triPt[3];
         if ( sortArrow & wxHDR_SORT_ICON_UP )
         {
@@ -322,116 +302,107 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
             triPt[2].y = ar.height;
         }
 
-        wxColour c = (params && params->m_arrowColour.IsOk()) ?
+        wxColour c = (params && params->m_arrowColour.Ok()) ?
             params->m_arrowColour : wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
-
-        wxDCPenChanger setPen(dc, c);
-        wxDCBrushChanger setBrush(dc, c);
-
-        wxDCClipper clip(dc, rect);
-        dc.DrawPolygon( 3, triPt, ar.x, ar.y);
+        dc.SetPen(wxPen(c));
+        dc.SetBrush(wxBrush(c));
+        dc.DrawPolygon( 3, triPt, ar.x, ar.y);                  
     }
     labelWidth += arrowSpace;
-
+    
+    const int margin = 5;   // number of pixels to reserve on either side of the label
     int bmpWidth = 0;
+    int txtEnd = 0;
+    
+    if ( params && params->m_labelBitmap.Ok() )
+        bmpWidth = params->m_labelBitmap.GetWidth() + 2;
 
-    // draw the bitmap if there is one
-    if ( params && params->m_labelBitmap.IsOk() )
-    {
-        int w = params->m_labelBitmap.GetWidth();
-        int h = params->m_labelBitmap.GetHeight();
-
-        const int margin = 1; // an extra pixel on either side of the bitmap
-
-        bmpWidth = w + 2*margin;
-        labelWidth += bmpWidth;
-
-        int x = rect.x + margin;
-        const int y = rect.y + wxMax(1, (rect.height - h) / 2);
-
-        const int extraSpace = rect.width - labelWidth;
-        if ( params->m_labelText.empty() && extraSpace > 0 )
-        {
-            // use the alignment flags
-            switch (params->m_labelAlignment)
-            {
-                default:
-                case wxALIGN_LEFT:
-                    break;
-
-                case wxALIGN_CENTER:
-                    x += extraSpace/2;
-                    break;
-
-                case wxALIGN_RIGHT:
-                    x += extraSpace;
-                    break;
-            }
-        }
-
-        wxDCClipper clip(dc, rect);
-        dc.DrawBitmap(params->m_labelBitmap, x, y, true);
-    }
-
+    labelWidth += bmpWidth + 2*margin;
+    
     // Draw a label if one is given
     if ( params && !params->m_labelText.empty() )
     {
-        const int margin = 5;   // number of pixels to reserve on either side of the label
-        labelWidth += 2*margin;
-
-        wxFont font  = params->m_labelFont.IsOk() ?
+        wxFont font  = params->m_labelFont.Ok() ?
             params->m_labelFont : win->GetFont();
-        wxColour clr = params->m_labelColour.IsOk() ?
+        wxColour clr = params->m_labelColour.Ok() ?
             params->m_labelColour : win->GetForegroundColour();
 
         wxString label( params->m_labelText );
-
+        
         dc.SetFont(font);
         dc.SetTextForeground(clr);
-        dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+        dc.SetBackgroundMode(wxTRANSPARENT);
 
-        int tw, th, td;
+        int tw, th, td, x, y;
         dc.GetTextExtent( label, &tw, &th, &td);
-
-        int x = rect.x + bmpWidth + margin;
-        const int y = rect.y + wxMax(0, (rect.height - (th+td)) / 2);
-
+        labelWidth += tw;
+        y = rect.y + wxMax(0, (rect.height - (th+td)) / 2);
+        
         // truncate and add an ellipsis (...) if the text is too wide.
-        const int availWidth = rect.width - labelWidth;
-#if wxUSE_CONTROLS
-        if ( tw > availWidth )
+        int targetWidth = rect.width - arrowSpace - bmpWidth - 2*margin;
+        if ( tw > targetWidth )        
         {
-            label = wxControl::Ellipsize(label,
-                                         dc,
-                                         wxELLIPSIZE_END,
-                                         availWidth,
-                                         wxELLIPSIZE_FLAGS_NONE);
-            tw = dc.GetTextExtent(label).x;
+            int ellipsisWidth;
+            dc.GetTextExtent( wxT("..."), &ellipsisWidth, NULL);
+            do {
+                label.Truncate( label.length() - 1 );
+                dc.GetTextExtent( label, &tw, &th);
+            } while (tw + ellipsisWidth > targetWidth && label.length() );
+            label.append( wxT("...") );
+            tw += ellipsisWidth;
         }
-        else // enough space, we can respect alignment
-#endif // wxUSE_CONTROLS
+        
+        switch (params->m_labelAlignment)
+        {
+            default:
+            case wxALIGN_LEFT:
+                x = rect.x + margin;
+                break;
+            case wxALIGN_CENTER:
+                x = rect.x + wxMax(0, (rect.width - arrowSpace  - tw - bmpWidth)/2);
+                break;
+            case wxALIGN_RIGHT:
+                x = rect.x + wxMax(0, rect.width - arrowSpace - margin - tw - bmpWidth);
+                break;
+        }
+
+        dc.DrawText(label, x, y);
+        txtEnd = x + tw + 2;
+    }
+
+    // draw the bitmap if there is one
+    if ( params && params->m_labelBitmap.Ok() )
+    {
+        int w, h, x, y;
+        w = params->m_labelBitmap.GetWidth();
+        h = params->m_labelBitmap.GetHeight();
+
+        y = rect.y + wxMax(1, (rect.height - h) / 2);
+
+        // if there is a text label, then put the bitmap at the end of the label
+        if ( txtEnd != 0 )
+        {
+            x = txtEnd;
+        }
+        // otherwise use the alignment flags
+        else
         {
             switch (params->m_labelAlignment)
             {
                 default:
                 case wxALIGN_LEFT:
+                    x = rect.x + margin;
                     break;
-
                 case wxALIGN_CENTER:
-                    x += (availWidth - tw)/2;
+                    x = rect.x + wxMax(1, (rect.width - arrowSpace - w)/2);
                     break;
-
                 case wxALIGN_RIGHT:
-                    x += availWidth - tw;
+                    x = rect.x + wxMax(1, rect.width - arrowSpace - margin - w);
                     break;
             }
         }
-
-        dc.DrawText(label, x, y);
-
-        labelWidth += tw;
+        dc.DrawBitmap(params->m_labelBitmap, x, y, true);
     }
-
     return labelWidth;
 }
 
@@ -449,11 +420,6 @@ int wxRendererGeneric::GetHeaderButtonHeight(wxWindow *win)
     return h + d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
 }
 
-int wxRendererGeneric::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
-{
-    return 5;
-}
-
 
 // draw the plus or minus sign
 void
@@ -650,11 +616,6 @@ wxRendererGeneric::DrawCheckBox(wxWindow *WXUNUSED(win),
     }
 }
 
-wxSize wxRendererGeneric::GetCheckBoxSize(wxWindow *WXUNUSED(win))
-{
-    return wxSize(16, 16);
-}
-
 void
 wxRendererGeneric::DrawPushButton(wxWindow *win,
                                   wxDC& dc,
@@ -672,7 +633,7 @@ wxRendererGeneric::DrawPushButton(wxWindow *win,
 }
 
 void
-wxRendererGeneric::DrawItemSelectionRect(wxWindow * win,
+wxRendererGeneric::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
                                          wxDC& dc,
                                          const wxRect& rect,
                                          int flags)
@@ -695,104 +656,11 @@ wxRendererGeneric::DrawItemSelectionRect(wxWindow * win,
     }
 
     dc.SetBrush(brush);
-    if ((flags & wxCONTROL_CURRENT) && (flags & wxCONTROL_FOCUSED)
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
-                && IsControlActive( (ControlRef)win->GetHandle() )
-#endif
-    )
-        dc.SetPen( *wxBLACK_PEN );
-    else
-        dc.SetPen( *wxTRANSPARENT_PEN );
+    dc.SetPen(flags & wxCONTROL_CURRENT ? *wxBLACK_PEN : *wxTRANSPARENT_PEN);
 
     dc.DrawRectangle( rect );
-
-    // it's unused everywhere except in wxOSX/Carbon
-    wxUnusedVar(win);
 }
 
-void
-wxRendererGeneric::DrawFocusRect(wxWindow* WXUNUSED(win), wxDC& dc, const wxRect& rect, int WXUNUSED(flags))
-{
-    // draw the pixels manually because the "dots" in wxPen with wxDOT style
-    // may be short traits and not really dots
-    //
-    // note that to behave in the same manner as DrawRect(), we must exclude
-    // the bottom and right borders from the rectangle
-    wxCoord x1 = rect.GetLeft(),
-            y1 = rect.GetTop(),
-            x2 = rect.GetRight(),
-            y2 = rect.GetBottom();
-
-    dc.SetPen(m_penBlack);
-
-#ifdef __WXMAC__
-    dc.SetLogicalFunction(wxCOPY);
-#else
-    // this seems to be closer than what Windows does than wxINVERT although
-    // I'm still not sure if it's correct
-    dc.SetLogicalFunction(wxAND_REVERSE);
-#endif
-
-    wxCoord z;
-    for ( z = x1 + 1; z < x2; z += 2 )
-        dc.DrawPoint(z, rect.GetTop());
-
-    wxCoord shift = z == x2 ? 0 : 1;
-    for ( z = y1 + shift; z < y2; z += 2 )
-        dc.DrawPoint(x2, z);
-
-    shift = z == y2 ? 0 : 1;
-    for ( z = x2 - shift; z > x1; z -= 2 )
-        dc.DrawPoint(z, y2);
-
-    shift = z == x1 ? 0 : 1;
-    for ( z = y2 - shift; z > y1; z -= 2 )
-        dc.DrawPoint(x1, z);
-
-    dc.SetLogicalFunction(wxCOPY);
-}
-
-void wxRendererGeneric::DrawChoice(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
-                           const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
-{
-    wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawChoice");
-}
-
-void wxRendererGeneric::DrawComboBox(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
-                           const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
-{
-    wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawComboBox");
-}
-
-void wxRendererGeneric::DrawRadioBitmap(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
-                           const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
-{
-    wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawRadioBitmap");
-}
-
-void wxRendererGeneric::DrawTextCtrl(wxWindow* WXUNUSED(win), wxDC& WXUNUSED(dc),
-                           const wxRect& WXUNUSED(rect), int WXUNUSED(flags))
-{
-    wxFAIL_MSG("UNIMPLEMENTED: wxRendererGeneric::DrawTextCtrl");
-}
-
-#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
-
-void wxRendererGeneric::DrawTitleBarBitmap(wxWindow * WXUNUSED(win),
-                                           wxDC& WXUNUSED(dc),
-                                           const wxRect& WXUNUSED(rect),
-                                           wxTitleBarButton WXUNUSED(button),
-                                           int WXUNUSED(flags))
-{
-    // no need to fail here, if wxHAS_DRAW_TITLE_BAR_BITMAP is defined this
-    // will be implemented in the native renderer and this version is never
-    // going to be used -- but we still need to define it to allow
-    // instantiation of this class (which would have been pure virtual
-    // otherwise)
-}
-
-#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
-
 
 // ----------------------------------------------------------------------------
 // A module to allow cleanup of generic renderer.
diff --git a/Source/3rd Party/wx/src/generic/richmsgdlgg.cpp b/Source/3rd Party/wx/src/generic/richmsgdlgg.cpp
deleted file mode 100644
index e51df69cd..000000000
--- a/Source/3rd Party/wx/src/generic/richmsgdlgg.cpp	
+++ /dev/null
@@ -1,90 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/richmsgdlgg.cpp
-// Purpose:     wxGenericRichMessageDialog
-// Author:      Rickard Westerlund
-// Created:     2010-07-04
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if wxUSE_RICHMSGDLG
-
-#ifndef WX_PRECOMP
-    #include "wx/checkbox.h"
-    #include "wx/stattext.h"
-    #include "wx/sizer.h"
-#endif
-
-#include "wx/collpane.h"
-#include "wx/richmsgdlg.h"
-
-wxIMPLEMENT_CLASS(wxRichMessageDialog, wxDialog)
-
-// ----------------------------------------------------------------------------
-// Events and handlers
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxGenericRichMessageDialog, wxRichMessageDialogBase)
-    EVT_COLLAPSIBLEPANE_CHANGED(wxID_ANY,
-                                wxGenericRichMessageDialog::OnPaneChanged)
-END_EVENT_TABLE()
-
-void wxGenericRichMessageDialog::OnPaneChanged(wxCollapsiblePaneEvent& event)
-{
-    if ( event.GetCollapsed() )
-        m_detailsPane->SetLabel( m_detailsExpanderCollapsedLabel );
-    else
-        m_detailsPane->SetLabel( m_detailsExpanderExpandedLabel );
-}
-
-// ----------------------------------------------------------------------------
-// wxGenericRichMessageDialog
-// ----------------------------------------------------------------------------
-
-void wxGenericRichMessageDialog::AddMessageDialogCheckBox(wxSizer *sizer)
-{
-    if ( !m_checkBoxText.empty() )
-    {
-        m_checkBox = new wxCheckBox(this, wxID_ANY, m_checkBoxText);
-        m_checkBox->SetValue(m_checkBoxValue);
-
-        sizer->Add(m_checkBox, wxSizerFlags().Left().Border(wxLEFT|wxTOP, 10));
-    }
-}
-
-void wxGenericRichMessageDialog::AddMessageDialogDetails(wxSizer *sizer)
-{
-    if ( !m_detailedText.empty() )
-    {
-        wxSizer *sizerDetails = new wxBoxSizer( wxHORIZONTAL );
-
-        m_detailsPane =
-            new wxCollapsiblePane( this, -1, m_detailsExpanderCollapsedLabel );
-
-        // add the detailed text
-        wxWindow *windowPane = m_detailsPane->GetPane();
-        wxSizer *sizerPane = new wxBoxSizer( wxHORIZONTAL );
-        sizerPane->Add( new wxStaticText( windowPane, -1, m_detailedText ) );
-        windowPane->SetSizer( sizerPane );
-
-        sizerDetails->Add( m_detailsPane, wxSizerFlags().Right().Expand() );
-        sizer->Add( sizerDetails, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
-    }
-}
-
-bool wxGenericRichMessageDialog::IsCheckBoxChecked() const
-{
-    // This function can be called before the dialog is shown and hence before
-    // the check box is created.
-    return m_checkBox ? m_checkBox->IsChecked() : m_checkBoxValue;
-}
-
-#endif // wxUSE_RICHMSGDLG
diff --git a/Source/3rd Party/wx/src/generic/scrlwing.cpp b/Source/3rd Party/wx/src/generic/scrlwing.cpp
index 46d7ba944..4ee236b03 100644
--- a/Source/3rd Party/wx/src/generic/scrlwing.cpp	
+++ b/Source/3rd Party/wx/src/generic/scrlwing.cpp	
@@ -5,7 +5,7 @@
 // Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement.
 //              Ron Lee on 10.4.02:  virtual size / auto scrollbars et al.
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: scrlwing.cpp 60600 2009-05-12 10:33:49Z VZ $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,7 +31,9 @@
     #include "wx/utils.h"
     #include "wx/panel.h"
     #include "wx/dcclient.h"
-    #include "wx/timer.h"
+    #if wxUSE_TIMER
+        #include "wx/timer.h"
+    #endif
     #include "wx/sizer.h"
     #include "wx/settings.h"
 #endif
@@ -72,7 +74,7 @@
 class WXDLLEXPORT wxScrollHelperEvtHandler : public wxEvtHandler
 {
 public:
-    wxScrollHelperEvtHandler(wxScrollHelperBase *scrollHelper)
+    wxScrollHelperEvtHandler(wxScrollHelper *scrollHelper)
     {
         m_scrollHelper = scrollHelper;
     }
@@ -82,11 +84,11 @@ public:
     void ResetDrawnFlag() { m_hasDrawnWindow = false; }
 
 private:
-    wxScrollHelperBase *m_scrollHelper;
+    wxScrollHelper *m_scrollHelper;
 
     bool m_hasDrawnWindow;
 
-    wxDECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler);
+    DECLARE_NO_COPY_CLASS(wxScrollHelperEvtHandler)
 };
 
 #if wxUSE_TIMER
@@ -98,8 +100,7 @@ private:
 class wxAutoScrollTimer : public wxTimer
 {
 public:
-    wxAutoScrollTimer(wxWindow *winToScroll,
-                      wxScrollHelperBase *scroll,
+    wxAutoScrollTimer(wxWindow *winToScroll, wxScrollHelper *scroll,
                       wxEventType eventTypeToSend,
                       int pos, int orient);
 
@@ -107,12 +108,12 @@ public:
 
 private:
     wxWindow *m_win;
-    wxScrollHelperBase *m_scrollHelper;
+    wxScrollHelper *m_scrollHelper;
     wxEventType m_eventType;
     int m_pos,
         m_orient;
 
-    wxDECLARE_NO_COPY_CLASS(wxAutoScrollTimer);
+    DECLARE_NO_COPY_CLASS(wxAutoScrollTimer)
 };
 
 // ============================================================================
@@ -124,7 +125,7 @@ private:
 // ----------------------------------------------------------------------------
 
 wxAutoScrollTimer::wxAutoScrollTimer(wxWindow *winToScroll,
-                                     wxScrollHelperBase *scroll,
+                                     wxScrollHelper *scroll,
                                      wxEventType eventTypeToSend,
                                      int pos, int orient)
 {
@@ -152,7 +153,7 @@ void wxAutoScrollTimer::Notify()
         {
             // and then send a pseudo mouse-move event to refresh the selection
             wxMouseEvent event2(wxEVT_MOTION);
-            event2.SetPosition(wxGetMousePosition());
+            wxGetMousePosition(&event2.m_x, &event2.m_y);
 
             // the mouse event coordinates should be client, not screen as
             // returned by wxGetMousePosition
@@ -203,13 +204,8 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
     // user code defined OnPaint() in the derived class)
     m_hasDrawnWindow = true;
 
-    // Pass it on to the real handler: notice that we must not call
-    // ProcessEvent() on this object itself as it wouldn't pass it to the next
-    // handler (i.e. the real window) if we're called from a previous handler
-    // (as indicated by "process here only" flag being set) and we do want to
-    // execute the handler defined in the window we're associated with right
-    // now, without waiting until TryAfter() is called from wxEvtHandler.
-    bool processed = m_nextHandler->ProcessEvent(event);
+    // pass it on to the real handler
+    bool processed = wxEvtHandler::ProcessEvent(event);
 
     // always process the size events ourselves, even if the user code handles
     // them as well, as we need to AdjustScrollbars()
@@ -236,6 +232,10 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
         }
     }
 
+    // reset the skipped flag to false as it might have been set to true in
+    // ProcessEvent() above
+    event.Skip(false);
+
     if ( evType == wxEVT_PAINT )
     {
         m_scrollHelper->HandleOnPaint((wxPaintEvent &)event);
@@ -248,12 +248,6 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
         return true;
     }
 
-    // reset the skipped flag (which might have been set to true in
-    // ProcessEvent() above) to be able to test it below
-    bool wasSkipped = event.GetSkipped();
-    if ( wasSkipped )
-        event.Skip(false);
-
     if ( evType == wxEVT_SCROLLWIN_TOP ||
          evType == wxEVT_SCROLLWIN_BOTTOM ||
          evType == wxEVT_SCROLLWIN_LINEUP ||
@@ -263,16 +257,8 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
          evType == wxEVT_SCROLLWIN_THUMBTRACK ||
          evType == wxEVT_SCROLLWIN_THUMBRELEASE )
     {
-        m_scrollHelper->HandleOnScroll((wxScrollWinEvent &)event);
-        if ( !event.GetSkipped() )
-        {
-            // it makes sense to indicate that we processed the message as we
-            // did scroll the window (and also notice that wxAutoScrollTimer
-            // relies on our return value to stop scrolling when we are at top
-            // or bottom already)
-            processed = true;
-            wasSkipped = false;
-        }
+            m_scrollHelper->HandleOnScroll((wxScrollWinEvent &)event);
+            return !event.GetSkipped();
     }
 
     if ( evType == wxEVT_ENTER_WINDOW )
@@ -284,52 +270,28 @@ bool wxScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
         m_scrollHelper->HandleOnMouseLeave((wxMouseEvent &)event);
     }
 #if wxUSE_MOUSEWHEEL
-    // Use GTK's own scroll wheel handling in GtkScrolledWindow
-#ifndef __WXGTK20__
     else if ( evType == wxEVT_MOUSEWHEEL )
     {
         m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event);
         return true;
     }
-#endif
 #endif // wxUSE_MOUSEWHEEL
     else if ( evType == wxEVT_CHAR )
     {
         m_scrollHelper->HandleOnChar((wxKeyEvent &)event);
-        if ( !event.GetSkipped() )
-        {
-            processed = true;
-            wasSkipped = false;
-        }
+        return !event.GetSkipped();
     }
 
-    event.Skip(wasSkipped);
-
-    // We called ProcessEvent() on the next handler, meaning that we explicitly
-    // worked around the request to process the event in this handler only. As
-    // explained above, this is unfortunately really necessary but the trouble
-    // is that the event will continue to be post-processed by the previous
-    // handler resulting in duplicate calls to event handlers. Call the special
-    // function below to prevent this from happening, base class DoTryChain()
-    // will check for it and behave accordingly.
-    //
-    // And if we're not called from DoTryChain(), this won't do anything anyhow.
-    event.DidntHonourProcessOnlyIn();
-
-    return processed;
+    return false;
 }
 
-// ============================================================================
-// wxScrollHelperBase implementation
-// ============================================================================
-
 // ----------------------------------------------------------------------------
-// wxScrollHelperBase construction
+// wxScrollHelper construction
 // ----------------------------------------------------------------------------
 
-wxScrollHelperBase::wxScrollHelperBase(wxWindow *win)
+wxScrollHelper::wxScrollHelper(wxWindow *win)
 {
-    wxASSERT_MSG( win, wxT("associated window can't be NULL in wxScrollHelper") );
+    wxASSERT_MSG( win, _T("associated window can't be NULL in wxScrollHelper") );
 
     m_xScrollPixelsPerLine =
     m_yScrollPixelsPerLine =
@@ -343,8 +305,6 @@ wxScrollHelperBase::wxScrollHelperBase(wxWindow *win)
     m_xScrollingEnabled =
     m_yScrollingEnabled = true;
 
-    m_kbdScrollingEnabled = true;
-
     m_scaleX =
     m_scaleY = 1.0;
 #if wxUSE_MOUSEWHEEL
@@ -352,21 +312,21 @@ wxScrollHelperBase::wxScrollHelperBase(wxWindow *win)
 #endif
 
     m_win =
-    m_targetWindow = NULL;
+    m_targetWindow = (wxWindow *)NULL;
 
-    m_timerAutoScroll = NULL;
+    m_timerAutoScroll = (wxTimer *)NULL;
 
     m_handler = NULL;
 
     m_win = win;
-
-    m_win->SetScrollHelper(static_cast<wxScrollHelper *>(this));
+    
+    m_win->SetScrollHelper( this );
 
     // by default, the associated window is also the target window
     DoSetTargetWindow(win);
 }
 
-wxScrollHelperBase::~wxScrollHelperBase()
+wxScrollHelper::~wxScrollHelper()
 {
     StopAutoScrolling();
 
@@ -377,25 +337,24 @@ wxScrollHelperBase::~wxScrollHelperBase()
 // setting scrolling parameters
 // ----------------------------------------------------------------------------
 
-void wxScrollHelperBase::SetScrollbars(int pixelsPerUnitX,
-                                       int pixelsPerUnitY,
-                                       int noUnitsX,
-                                       int noUnitsY,
-                                       int xPos,
-                                       int yPos,
-                                       bool noRefresh)
+void wxScrollHelper::SetScrollbars(int pixelsPerUnitX,
+                                   int pixelsPerUnitY,
+                                   int noUnitsX,
+                                   int noUnitsY,
+                                   int xPos,
+                                   int yPos,
+                                   bool noRefresh)
 {
-    // Convert positions expressed in scroll units to positions in pixels.
-    int xPosInPixels = (xPos + m_xScrollPosition)*m_xScrollPixelsPerLine,
-        yPosInPixels = (yPos + m_yScrollPosition)*m_yScrollPixelsPerLine;
+    int xpos, ypos;
 
+    CalcUnscrolledPosition(xPos, yPos, &xpos, &ypos);
     bool do_refresh =
     (
       (noUnitsX != 0 && m_xScrollLines == 0) ||
-      (noUnitsX < m_xScrollLines && xPosInPixels > pixelsPerUnitX * noUnitsX) ||
+      (noUnitsX < m_xScrollLines && xpos > pixelsPerUnitX * noUnitsX) ||
 
       (noUnitsY != 0 && m_yScrollLines == 0) ||
-      (noUnitsY < m_yScrollLines && yPosInPixels > pixelsPerUnitY * noUnitsY) ||
+      (noUnitsY < m_yScrollLines && ypos > pixelsPerUnitY * noUnitsY) ||
       (xPos != m_xScrollPosition) ||
       (yPos != m_yScrollPosition)
     );
@@ -445,7 +404,7 @@ void wxScrollHelperBase::SetScrollbars(int pixelsPerUnitX,
 // [target] window handling
 // ----------------------------------------------------------------------------
 
-void wxScrollHelperBase::DeleteEvtHandler()
+void wxScrollHelper::DeleteEvtHandler()
 {
     // search for m_handler in the handler list
     if ( m_win && m_handler )
@@ -461,13 +420,7 @@ void wxScrollHelperBase::DeleteEvtHandler()
     }
 }
 
-void wxScrollHelperBase::ResetDrawnFlag()
-{
-    wxCHECK_RET( m_handler, "invalid use of ResetDrawnFlag - no handler?" );
-    m_handler->ResetDrawnFlag();
-}
-
-void wxScrollHelperBase::DoSetTargetWindow(wxWindow *target)
+void wxScrollHelper::DoSetTargetWindow(wxWindow *target)
 {
     m_targetWindow = target;
 #ifdef __WXMAC__
@@ -487,7 +440,7 @@ void wxScrollHelperBase::DoSetTargetWindow(wxWindow *target)
     }
 }
 
-void wxScrollHelperBase::SetTargetWindow(wxWindow *target)
+void wxScrollHelper::SetTargetWindow(wxWindow *target)
 {
     wxCHECK_RET( target, wxT("target window must not be NULL") );
 
@@ -497,7 +450,7 @@ void wxScrollHelperBase::SetTargetWindow(wxWindow *target)
     DoSetTargetWindow(target);
 }
 
-wxWindow *wxScrollHelperBase::GetTargetWindow() const
+wxWindow *wxScrollHelper::GetTargetWindow() const
 {
     return m_targetWindow;
 }
@@ -506,7 +459,7 @@ wxWindow *wxScrollHelperBase::GetTargetWindow() const
 // scrolling implementation itself
 // ----------------------------------------------------------------------------
 
-void wxScrollHelperBase::HandleOnScroll(wxScrollWinEvent& event)
+void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
 {
     int nScrollInc = CalcScrollInc(event);
     if ( nScrollInc == 0 )
@@ -518,6 +471,7 @@ void wxScrollHelperBase::HandleOnScroll(wxScrollWinEvent& event)
     }
 
     bool needsRefresh = false;
+
     int dx = 0,
         dy = 0;
     int orient = event.GetOrientation();
@@ -578,7 +532,7 @@ void wxScrollHelperBase::HandleOnScroll(wxScrollWinEvent& event)
     }
 }
 
-int wxScrollHelperBase::CalcScrollInc(wxScrollWinEvent& event)
+int wxScrollHelper::CalcScrollInc(wxScrollWinEvent& event)
 {
     int pos = event.GetPosition();
     int orient = event.GetOrientation();
@@ -631,48 +585,261 @@ int wxScrollHelperBase::CalcScrollInc(wxScrollWinEvent& event)
 
     if (orient == wxHORIZONTAL)
     {
-        if ( m_xScrollPosition + nScrollInc < 0 )
+        if (m_xScrollPixelsPerLine > 0)
         {
-            // As -ve as we can go
-            nScrollInc = -m_xScrollPosition;
-        }
-        else // check for the other bound
-        {
-            const int posMax = m_xScrollLines - m_xScrollLinesPerPage;
-            if ( m_xScrollPosition + nScrollInc > posMax )
+            if ( m_xScrollPosition + nScrollInc < 0 )
             {
-                // As +ve as we can go
-                nScrollInc = posMax - m_xScrollPosition;
+                // As -ve as we can go
+                nScrollInc = -m_xScrollPosition;
+            }
+            else // check for the other bound
+            {
+                const int posMax = m_xScrollLines - m_xScrollLinesPerPage;
+                if ( m_xScrollPosition + nScrollInc > posMax )
+                {
+                    // As +ve as we can go
+                    nScrollInc = posMax - m_xScrollPosition;
+                }
             }
         }
+        else
+            m_targetWindow->Refresh(true, GetScrollRect());
     }
-    else // wxVERTICAL
+    else
     {
-        if ( m_yScrollPosition + nScrollInc < 0 )
+        if ( m_yScrollPixelsPerLine > 0 )
         {
-            // As -ve as we can go
-            nScrollInc = -m_yScrollPosition;
-        }
-        else // check for the other bound
-        {
-            const int posMax = m_yScrollLines - m_yScrollLinesPerPage;
-            if ( m_yScrollPosition + nScrollInc > posMax )
+            if ( m_yScrollPosition + nScrollInc < 0 )
             {
-                // As +ve as we can go
-                nScrollInc = posMax - m_yScrollPosition;
+                // As -ve as we can go
+                nScrollInc = -m_yScrollPosition;
             }
+            else // check for the other bound
+            {
+                const int posMax = m_yScrollLines - m_yScrollLinesPerPage;
+                if ( m_yScrollPosition + nScrollInc > posMax )
+                {
+                    // As +ve as we can go
+                    nScrollInc = posMax - m_yScrollPosition;
+                }
+            }
+        }
+        else
+        {
+            // VZ: why do we do this? (FIXME)
+            m_targetWindow->Refresh(true, GetScrollRect());
         }
     }
 
     return nScrollInc;
 }
 
-void wxScrollHelperBase::DoPrepareDC(wxDC& dc)
+// Adjust the scrollbars - new version.
+void wxScrollHelper::AdjustScrollbars()
+{
+    static wxRecursionGuardFlag s_flagReentrancy;
+    wxRecursionGuard guard(s_flagReentrancy);
+    if ( guard.IsInside() )
+    {
+        // don't reenter AdjustScrollbars() while another call to
+        // AdjustScrollbars() is in progress because this may lead to calling
+        // ScrollWindow() twice and this can really happen under MSW if
+        // SetScrollbar() call below adds or removes the scrollbar which
+        // changes the window size and hence results in another
+        // AdjustScrollbars() call
+        return;
+    }
+
+    int w = 0, h = 0;
+    int oldw, oldh;
+
+    int oldXScroll = m_xScrollPosition;
+    int oldYScroll = m_yScrollPosition;
+
+    // VZ: at least under Windows this loop is useless because when scrollbars
+    //     [dis]appear we get a WM_SIZE resulting in another call to
+    //     AdjustScrollbars() anyhow. As it doesn't seem to do any harm I leave
+    //     it here for now but it would be better to ensure that all ports
+    //     generate EVT_SIZE when scrollbars [dis]appear, emulating it if
+    //     necessary, and remove it later
+    // JACS: Stop potential infinite loop by limiting number of iterations
+    int iterationCount = 0;
+    const int iterationMax = 5;
+    do
+    {
+        iterationCount ++;
+
+        GetTargetSize(&w, 0);
+
+        // scroll lines per page: if 0, no scrolling is needed
+        int linesPerPage;
+
+        if ( m_xScrollPixelsPerLine == 0 )
+        {
+            // scrolling is disabled
+            m_xScrollLines = 0;
+            m_xScrollPosition = 0;
+            linesPerPage = 0;
+        }
+        else // might need scrolling
+        {
+            // Round up integer division to catch any "leftover" client space.
+            const int wVirt = m_targetWindow->GetVirtualSize().GetWidth();
+            m_xScrollLines = (wVirt + m_xScrollPixelsPerLine - 1) / m_xScrollPixelsPerLine;
+
+            // Calculate page size i.e. number of scroll units you get on the
+            // current client window.
+            linesPerPage = w / m_xScrollPixelsPerLine;
+
+            // Special case. When client and virtual size are very close but
+            // the client is big enough, kill scrollbar.
+            if ((linesPerPage < m_xScrollLines) && (w >= wVirt)) ++linesPerPage;
+
+            if (linesPerPage >= m_xScrollLines)
+            {
+                // we're big enough to not need scrolling
+                linesPerPage =
+                m_xScrollLines =
+                m_xScrollPosition = 0;
+            }
+            else // we do need a scrollbar
+            {
+                if ( linesPerPage < 1 )
+                    linesPerPage = 1;
+
+                // Correct position if greater than extent of canvas minus
+                // the visible portion of it or if below zero
+                const int posMax = m_xScrollLines - linesPerPage;
+                if ( m_xScrollPosition > posMax )
+                    m_xScrollPosition = posMax;
+                else if ( m_xScrollPosition < 0 )
+                    m_xScrollPosition = 0;
+            }
+        }
+
+        m_win->SetScrollbar(wxHORIZONTAL, m_xScrollPosition,
+                            linesPerPage, m_xScrollLines);
+
+        // The amount by which we scroll when paging
+        SetScrollPageSize(wxHORIZONTAL, linesPerPage);
+
+        GetTargetSize(0, &h);
+
+        if ( m_yScrollPixelsPerLine == 0 )
+        {
+            // scrolling is disabled
+            m_yScrollLines = 0;
+            m_yScrollPosition = 0;
+            linesPerPage = 0;
+        }
+        else // might need scrolling
+        {
+            // Round up integer division to catch any "leftover" client space.
+            const int hVirt = m_targetWindow->GetVirtualSize().GetHeight();
+            m_yScrollLines = ( hVirt + m_yScrollPixelsPerLine - 1 ) / m_yScrollPixelsPerLine;
+
+            // Calculate page size i.e. number of scroll units you get on the
+            // current client window.
+            linesPerPage = h / m_yScrollPixelsPerLine;
+
+            // Special case. When client and virtual size are very close but
+            // the client is big enough, kill scrollbar.
+            if ((linesPerPage < m_yScrollLines) && (h >= hVirt)) ++linesPerPage;
+
+            if (linesPerPage >= m_yScrollLines)
+            {
+                // we're big enough to not need scrolling
+                linesPerPage =
+                m_yScrollLines =
+                m_yScrollPosition = 0;
+            }
+            else // we do need a scrollbar
+            {
+                if ( linesPerPage < 1 )
+                    linesPerPage = 1;
+
+                // Correct position if greater than extent of canvas minus
+                // the visible portion of it or if below zero
+                const int posMax = m_yScrollLines - linesPerPage;
+                if ( m_yScrollPosition > posMax )
+                    m_yScrollPosition = posMax;
+                else if ( m_yScrollPosition < 0 )
+                    m_yScrollPosition = 0;
+            }
+        }
+
+        m_win->SetScrollbar(wxVERTICAL, m_yScrollPosition,
+                            linesPerPage, m_yScrollLines);
+
+        // The amount by which we scroll when paging
+        SetScrollPageSize(wxVERTICAL, linesPerPage);
+
+
+        // If a scrollbar (dis)appeared as a result of this, adjust them again.
+        oldw = w;
+        oldh = h;
+
+        GetTargetSize( &w, &h );
+    } while ( (w != oldw || h != oldh) && (iterationCount < iterationMax) );
+
+#ifdef __WXMOTIF__
+    // Sorry, some Motif-specific code to implement a backing pixmap
+    // for the wxRETAINED style. Implementing a backing store can't
+    // be entirely generic because it relies on the wxWindowDC implementation
+    // to duplicate X drawing calls for the backing pixmap.
+
+    if ( m_targetWindow->GetWindowStyle() & wxRETAINED )
+    {
+        Display* dpy = XtDisplay((Widget)m_targetWindow->GetMainWidget());
+
+        int totalPixelWidth = m_xScrollLines * m_xScrollPixelsPerLine;
+        int totalPixelHeight = m_yScrollLines * m_yScrollPixelsPerLine;
+        if (m_targetWindow->GetBackingPixmap() &&
+           !((m_targetWindow->GetPixmapWidth() == totalPixelWidth) &&
+             (m_targetWindow->GetPixmapHeight() == totalPixelHeight)))
+        {
+            XFreePixmap (dpy, (Pixmap) m_targetWindow->GetBackingPixmap());
+            m_targetWindow->SetBackingPixmap((WXPixmap) 0);
+        }
+
+        if (!m_targetWindow->GetBackingPixmap() &&
+           (m_xScrollLines != 0) && (m_yScrollLines != 0))
+        {
+            int depth = wxDisplayDepth();
+            m_targetWindow->SetPixmapWidth(totalPixelWidth);
+            m_targetWindow->SetPixmapHeight(totalPixelHeight);
+            m_targetWindow->SetBackingPixmap((WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
+              m_targetWindow->GetPixmapWidth(), m_targetWindow->GetPixmapHeight(), depth));
+        }
+
+    }
+#endif // Motif
+
+    if (oldXScroll != m_xScrollPosition)
+    {
+       if (m_xScrollingEnabled)
+            m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll - m_xScrollPosition), 0,
+                                          GetScrollRect() );
+       else
+            m_targetWindow->Refresh(true, GetScrollRect());
+    }
+
+    if (oldYScroll != m_yScrollPosition)
+    {
+        if (m_yScrollingEnabled)
+            m_targetWindow->ScrollWindow( 0, m_yScrollPixelsPerLine * (oldYScroll-m_yScrollPosition),
+                                          GetScrollRect() );
+        else
+            m_targetWindow->Refresh(true, GetScrollRect());
+    }
+}
+
+void wxScrollHelper::DoPrepareDC(wxDC& dc)
 {
     wxPoint pt = dc.GetDeviceOrigin();
 #ifdef __WXGTK__
     // It may actually be correct to always query
-    // the m_sign from the DC here, but I leave the
+    // the m_sign from the DC here, but I leve the
     // #ifdef GTK for now.
     if (m_win->GetLayoutDirection() == wxLayout_RightToLeft)
         dc.SetDeviceOrigin( pt.x + m_xScrollPosition * m_xScrollPixelsPerLine,
@@ -684,7 +851,7 @@ void wxScrollHelperBase::DoPrepareDC(wxDC& dc)
     dc.SetUserScale( m_scaleX, m_scaleY );
 }
 
-void wxScrollHelperBase::SetScrollRate( int xstep, int ystep )
+void wxScrollHelper::SetScrollRate( int xstep, int ystep )
 {
     int old_x = m_xScrollPixelsPerLine * m_xScrollPosition;
     int old_y = m_yScrollPixelsPerLine * m_yScrollPosition;
@@ -702,7 +869,7 @@ void wxScrollHelperBase::SetScrollRate( int xstep, int ystep )
     AdjustScrollbars();
 }
 
-void wxScrollHelperBase::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
+void wxScrollHelper::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
 {
     if ( x_unit )
         *x_unit = m_xScrollPixelsPerLine;
@@ -711,7 +878,7 @@ void wxScrollHelperBase::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
 }
 
 
-int wxScrollHelperBase::GetScrollLines( int orient ) const
+int wxScrollHelper::GetScrollLines( int orient ) const
 {
     if ( orient == wxHORIZONTAL )
         return m_xScrollLines;
@@ -719,7 +886,7 @@ int wxScrollHelperBase::GetScrollLines( int orient ) const
         return m_yScrollLines;
 }
 
-int wxScrollHelperBase::GetScrollPageSize(int orient) const
+int wxScrollHelper::GetScrollPageSize(int orient) const
 {
     if ( orient == wxHORIZONTAL )
         return m_xScrollLinesPerPage;
@@ -727,7 +894,7 @@ int wxScrollHelperBase::GetScrollPageSize(int orient) const
         return m_yScrollLinesPerPage;
 }
 
-void wxScrollHelperBase::SetScrollPageSize(int orient, int pageSize)
+void wxScrollHelper::SetScrollPageSize(int orient, int pageSize)
 {
     if ( orient == wxHORIZONTAL )
         m_xScrollLinesPerPage = pageSize;
@@ -735,14 +902,89 @@ void wxScrollHelperBase::SetScrollPageSize(int orient, int pageSize)
         m_yScrollLinesPerPage = pageSize;
 }
 
-void wxScrollHelperBase::EnableScrolling (bool x_scroll, bool y_scroll)
+/*
+ * Scroll to given position (scroll position, not pixel position)
+ */
+void wxScrollHelper::Scroll( int x_pos, int y_pos )
+{
+    if (!m_targetWindow)
+        return;
+
+    if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
+        ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
+
+    int w = 0, h = 0;
+    GetTargetSize(&w, &h);
+
+    // compute new position:
+    int new_x = m_xScrollPosition;
+    int new_y = m_yScrollPosition;
+
+    if ((x_pos != -1) && (m_xScrollPixelsPerLine))
+    {
+        new_x = x_pos;
+
+        // Calculate page size i.e. number of scroll units you get on the
+        // current client window
+        int noPagePositions = w/m_xScrollPixelsPerLine;
+        if (noPagePositions < 1) noPagePositions = 1;
+
+        // Correct position if greater than extent of canvas minus
+        // the visible portion of it or if below zero
+        new_x = wxMin( m_xScrollLines-noPagePositions, new_x );
+        new_x = wxMax( 0, new_x );
+    }
+    if ((y_pos != -1) && (m_yScrollPixelsPerLine))
+    {
+        new_y = y_pos;
+
+        // Calculate page size i.e. number of scroll units you get on the
+        // current client window
+        int noPagePositions = h/m_yScrollPixelsPerLine;
+        if (noPagePositions < 1) noPagePositions = 1;
+
+        // Correct position if greater than extent of canvas minus
+        // the visible portion of it or if below zero
+        new_y = wxMin( m_yScrollLines-noPagePositions, new_y );
+        new_y = wxMax( 0, new_y );
+    }
+
+    if ( new_x == m_xScrollPosition && new_y == m_yScrollPosition )
+        return; // nothing to do, the position didn't change
+
+    // flush all pending repaints before we change m_{x,y}ScrollPosition, as
+    // otherwise invalidated area could be updated incorrectly later when
+    // ScrollWindow() makes sure they're repainted before scrolling them
+    m_targetWindow->Update();
+
+    // update the position and scroll the window now:
+    if (m_xScrollPosition != new_x)
+    {
+        int old_x = m_xScrollPosition;
+        m_xScrollPosition = new_x;
+        m_win->SetScrollPos( wxHORIZONTAL, new_x );
+        m_targetWindow->ScrollWindow( (old_x-new_x)*m_xScrollPixelsPerLine, 0,
+                                      GetScrollRect() );
+    }
+
+    if (m_yScrollPosition != new_y)
+    {
+        int old_y = m_yScrollPosition;
+        m_yScrollPosition = new_y;
+        m_win->SetScrollPos( wxVERTICAL, new_y );
+        m_targetWindow->ScrollWindow( 0, (old_y-new_y)*m_yScrollPixelsPerLine,
+                                      GetScrollRect() );
+    }
+}
+
+void wxScrollHelper::EnableScrolling (bool x_scroll, bool y_scroll)
 {
     m_xScrollingEnabled = x_scroll;
     m_yScrollingEnabled = y_scroll;
 }
 
 // Where the current view starts from
-void wxScrollHelperBase::DoGetViewStart (int *x, int *y) const
+void wxScrollHelper::GetViewStart (int *x, int *y) const
 {
     if ( x )
         *x = m_xScrollPosition;
@@ -750,8 +992,7 @@ void wxScrollHelperBase::DoGetViewStart (int *x, int *y) const
         *y = m_yScrollPosition;
 }
 
-void wxScrollHelperBase::DoCalcScrolledPosition(int x, int y,
-                                                int *xx, int *yy) const
+void wxScrollHelper::DoCalcScrolledPosition(int x, int y, int *xx, int *yy) const
 {
     if ( xx )
         *xx = x - m_xScrollPosition * m_xScrollPixelsPerLine;
@@ -759,8 +1000,7 @@ void wxScrollHelperBase::DoCalcScrolledPosition(int x, int y,
         *yy = y - m_yScrollPosition * m_yScrollPixelsPerLine;
 }
 
-void wxScrollHelperBase::DoCalcUnscrolledPosition(int x, int y,
-                                                  int *xx, int *yy) const
+void wxScrollHelper::DoCalcUnscrolledPosition(int x, int y, int *xx, int *yy) const
 {
     if ( xx )
         *xx = x + m_xScrollPosition * m_xScrollPixelsPerLine;
@@ -772,7 +1012,7 @@ void wxScrollHelperBase::DoCalcUnscrolledPosition(int x, int y,
 // geometry
 // ----------------------------------------------------------------------------
 
-bool wxScrollHelperBase::ScrollLayout()
+bool wxScrollHelper::ScrollLayout()
 {
     if ( m_win->GetSizer() && m_targetWindow == m_win )
     {
@@ -790,7 +1030,7 @@ bool wxScrollHelperBase::ScrollLayout()
     return m_win->wxWindow::Layout();
 }
 
-void wxScrollHelperBase::ScrollDoSetVirtualSize(int x, int y)
+void wxScrollHelper::ScrollDoSetVirtualSize(int x, int y)
 {
     m_win->wxWindow::DoSetVirtualSize( x, y );
     AdjustScrollbars();
@@ -801,7 +1041,7 @@ void wxScrollHelperBase::ScrollDoSetVirtualSize(int x, int y)
 
 // wxWindow's GetBestVirtualSize returns the actual window size,
 // whereas we want to return the virtual size
-wxSize wxScrollHelperBase::ScrollGetBestVirtualSize() const
+wxSize wxScrollHelper::ScrollGetBestVirtualSize() const
 {
     wxSize clientSize(m_win->GetClientSize());
     if ( m_win->GetSizer() )
@@ -810,12 +1050,33 @@ wxSize wxScrollHelperBase::ScrollGetBestVirtualSize() const
     return clientSize;
 }
 
+// return the window best size from the given best virtual size
+wxSize
+wxScrollHelper::ScrollGetWindowSizeForVirtualSize(const wxSize& size) const
+{
+    // Only use the content to set the window size in the direction
+    // where there's no scrolling; otherwise we're going to get a huge
+    // window in the direction in which scrolling is enabled
+    int ppuX, ppuY;
+    GetScrollPixelsPerUnit(&ppuX, &ppuY);
+
+    wxSize minSize = m_win->GetMinSize();
+
+    wxSize best(size);
+    if (ppuX > 0)
+        best.x = minSize.x + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
+    if (ppuY > 0)
+        best.y = minSize.y + wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
+
+    return best;
+}
+
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 
 // Default OnSize resets scrollbars, if any
-void wxScrollHelperBase::HandleOnSize(wxSizeEvent& WXUNUSED(event))
+void wxScrollHelper::HandleOnSize(wxSizeEvent& WXUNUSED(event))
 {
     if ( m_targetWindow->GetAutoLayout() )
     {
@@ -832,7 +1093,7 @@ void wxScrollHelperBase::HandleOnSize(wxSizeEvent& WXUNUSED(event))
 
 // This calls OnDraw, having adjusted the origin according to the current
 // scroll position
-void wxScrollHelperBase::HandleOnPaint(wxPaintEvent& WXUNUSED(event))
+void wxScrollHelper::HandleOnPaint(wxPaintEvent& WXUNUSED(event))
 {
     // don't use m_targetWindow here, this is always called for ourselves
     wxPaintDC dc(m_win);
@@ -845,78 +1106,95 @@ void wxScrollHelperBase::HandleOnPaint(wxPaintEvent& WXUNUSED(event))
 // compatibility here - if we used OnKeyDown(), the programs which process
 // arrows themselves in their OnChar() would never get the message and like
 // this they always have the priority
-void wxScrollHelperBase::HandleOnChar(wxKeyEvent& event)
+void wxScrollHelper::HandleOnChar(wxKeyEvent& event)
 {
-    if ( !m_kbdScrollingEnabled )
+    int stx = 0, sty = 0,       // view origin
+        szx = 0, szy = 0,       // view size (total)
+        clix = 0, cliy = 0;     // view size (on screen)
+
+    GetViewStart(&stx, &sty);
+    GetTargetSize(&clix, &cliy);
+    m_targetWindow->GetVirtualSize(&szx, &szy);
+
+    if( m_xScrollPixelsPerLine )
     {
-        event.Skip();
-        return;
+        clix /= m_xScrollPixelsPerLine;
+        szx /= m_xScrollPixelsPerLine;
+    }
+    else
+    {
+        clix = 0;
+        szx = -1;
+    }
+    if( m_yScrollPixelsPerLine )
+    {
+        cliy /= m_yScrollPixelsPerLine;
+        szy /= m_yScrollPixelsPerLine;
+    }
+    else
+    {
+        cliy = 0;
+        szy = -1;
     }
 
-    // prepare the event this key press maps to
-    wxScrollWinEvent newEvent;
-
-    newEvent.SetPosition(0);
-    newEvent.SetEventObject(m_win);
-
-    // this is the default, it's changed to wxHORIZONTAL below if needed
-    newEvent.SetOrientation(wxVERTICAL);
-
-    // some key events result in scrolling in both horizontal and vertical
-    // direction, e.g. Ctrl-{Home,End}, if this flag is true we should generate
-    // a second event in horizontal direction in addition to the primary one
-    bool sendHorizontalToo = false;
+    int xScrollOld = m_xScrollPosition,
+        yScrollOld = m_yScrollPosition;
 
+    int dsty;
     switch ( event.GetKeyCode() )
     {
         case WXK_PAGEUP:
-            newEvent.SetEventType(wxEVT_SCROLLWIN_PAGEUP);
+            dsty = sty - (5 * cliy / 6);
+            Scroll(-1, (dsty == -1) ? 0 : dsty);
             break;
 
         case WXK_PAGEDOWN:
-            newEvent.SetEventType(wxEVT_SCROLLWIN_PAGEDOWN);
+            Scroll(-1, sty + (5 * cliy / 6));
             break;
 
         case WXK_HOME:
-            newEvent.SetEventType(wxEVT_SCROLLWIN_TOP);
-
-            sendHorizontalToo = event.ControlDown();
+            Scroll(0, event.ControlDown() ? 0 : -1);
             break;
 
         case WXK_END:
-            newEvent.SetEventType(wxEVT_SCROLLWIN_BOTTOM);
+            Scroll(szx - clix, event.ControlDown() ? szy - cliy : -1);
+            break;
 
-            sendHorizontalToo = event.ControlDown();
+        case WXK_UP:
+            Scroll(-1, sty - 1);
+            break;
+
+        case WXK_DOWN:
+            Scroll(-1, sty + 1);
             break;
 
         case WXK_LEFT:
-            newEvent.SetOrientation(wxHORIZONTAL);
-            // fall through
-
-        case WXK_UP:
-            newEvent.SetEventType(wxEVT_SCROLLWIN_LINEUP);
+            Scroll(stx - 1, -1);
             break;
 
         case WXK_RIGHT:
-            newEvent.SetOrientation(wxHORIZONTAL);
-            // fall through
-
-        case WXK_DOWN:
-            newEvent.SetEventType(wxEVT_SCROLLWIN_LINEDOWN);
+            Scroll(stx + 1, -1);
             break;
 
         default:
-            // not a scrolling key
+            // not for us
             event.Skip();
-            return;
     }
 
-    m_win->ProcessWindowEvent(newEvent);
-
-    if ( sendHorizontalToo )
+    if ( m_xScrollPosition != xScrollOld )
     {
-        newEvent.SetOrientation(wxHORIZONTAL);
-        m_win->ProcessWindowEvent(newEvent);
+        wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBTRACK, m_xScrollPosition,
+                               wxHORIZONTAL);
+        event.SetEventObject(m_win);
+        m_win->GetEventHandler()->ProcessEvent(event);
+    }
+
+    if ( m_yScrollPosition != yScrollOld )
+    {
+        wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBTRACK, m_yScrollPosition,
+                               wxVERTICAL);
+        event.SetEventObject(m_win);
+        m_win->GetEventHandler()->ProcessEvent(event);
     }
 }
 
@@ -925,28 +1203,32 @@ void wxScrollHelperBase::HandleOnChar(wxKeyEvent& event)
 // a captured mouse is being held outside the window
 // ----------------------------------------------------------------------------
 
-bool wxScrollHelperBase::SendAutoScrollEvents(wxScrollWinEvent& event) const
+bool wxScrollHelper::SendAutoScrollEvents(wxScrollWinEvent& event) const
 {
     // only send the event if the window is scrollable in this direction
     wxWindow *win = (wxWindow *)event.GetEventObject();
     return win->HasScrollbar(event.GetOrientation());
 }
 
-void wxScrollHelperBase::StopAutoScrolling()
+void wxScrollHelper::StopAutoScrolling()
 {
 #if wxUSE_TIMER
-    wxDELETE(m_timerAutoScroll);
+    if ( m_timerAutoScroll )
+    {
+        delete m_timerAutoScroll;
+        m_timerAutoScroll = (wxTimer *)NULL;
+    }
 #endif
 }
 
-void wxScrollHelperBase::HandleOnMouseEnter(wxMouseEvent& event)
+void wxScrollHelper::HandleOnMouseEnter(wxMouseEvent& event)
 {
     StopAutoScrolling();
 
     event.Skip();
 }
 
-void wxScrollHelperBase::HandleOnMouseLeave(wxMouseEvent& event)
+void wxScrollHelper::HandleOnMouseLeave(wxMouseEvent& event)
 {
     // don't prevent the usual processing of the event from taking place
     event.Skip();
@@ -987,7 +1269,7 @@ void wxScrollHelperBase::HandleOnMouseLeave(wxMouseEvent& event)
                 // but seems to happen sometimes under wxMSW - maybe it's a bug
                 // there but for now just ignore it
 
-                //wxFAIL_MSG( wxT("can't understand where has mouse gone") );
+                //wxFAIL_MSG( _T("can't understand where has mouse gone") );
 
                 return;
             }
@@ -1017,7 +1299,7 @@ void wxScrollHelperBase::HandleOnMouseLeave(wxMouseEvent& event)
 
 #if wxUSE_MOUSEWHEEL
 
-void wxScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event)
+void wxScrollHelper::HandleOnMouseWheel(wxMouseEvent& event)
 {
     m_wheelRotation += event.GetWheelRotation();
     int lines = m_wheelRotation / event.GetWheelDelta();
@@ -1029,7 +1311,7 @@ void wxScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event)
         wxScrollWinEvent newEvent;
 
         newEvent.SetPosition(0);
-        newEvent.SetOrientation( event.GetWheelAxis() == 0 ? wxVERTICAL : wxHORIZONTAL);
+        newEvent.SetOrientation(wxVERTICAL);
         newEvent.SetEventObject(m_win);
 
         if (event.IsPageScroll())
@@ -1058,7 +1340,7 @@ void wxScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event)
 
 #endif // wxUSE_MOUSEWHEEL
 
-void wxScrollHelperBase::HandleOnChildFocus(wxChildFocusEvent& event)
+void wxScrollHelper::HandleOnChildFocus(wxChildFocusEvent& event)
 {
     // this event should be processed by all windows in parenthood chain,
     // e.g. so that nested wxScrolledWindows work correctly
@@ -1070,7 +1352,7 @@ void wxScrollHelperBase::HandleOnChildFocus(wxChildFocusEvent& event)
     if ( win == m_targetWindow )
         return; // nothing to do
 
-#if defined( __WXOSX__ ) && wxUSE_SCROLLBAR
+#ifdef __WXMAC__
     if (wxDynamicCast(win, wxScrollBar))
         return;
 #endif
@@ -1102,7 +1384,7 @@ void wxScrollHelperBase::HandleOnChildFocus(wxChildFocusEvent& event)
         win->GetParent() == m_targetWindow)
         // if win is a wxPanel and receives the focus, it should not be
         // scrolled into view
-        return;
+        return; 
 
     const wxRect viewRect(m_targetWindow->GetClientRect());
 
@@ -1112,7 +1394,7 @@ void wxScrollHelperBase::HandleOnChildFocus(wxChildFocusEvent& event)
     // part of a wxComboCtrl visible and the button would still be outside the
     // scrolled area.  But do so only if the parent fits *entirely* inside the
     // scrolled window. In other situations, such as nested wxPanel or
-    // wxScrolledWindows, the parent might be way too big to fit inside the
+    // wxScrolledWindows, the parent might be way to big to fit inside the
     // scrolled window. If that is the case, then make only the focused window
     // visible
     if ( win->GetParent() != m_targetWindow)
@@ -1122,7 +1404,7 @@ void wxScrollHelperBase::HandleOnChildFocus(wxChildFocusEvent& event)
         if (parent_size.GetWidth() <= viewRect.GetWidth() &&
             parent_size.GetHeight() <= viewRect.GetHeight())
             // make the immediate parent visible instead of the focused control
-            win=parent;
+            win=parent; 
     }
 
     // make win position relative to the m_targetWindow viewing area instead of
@@ -1199,359 +1481,53 @@ void wxScrollHelperBase::HandleOnChildFocus(wxChildFocusEvent& event)
     Scroll(startx, starty);
 }
 
-
-#ifdef wxHAS_GENERIC_SCROLLWIN
-
 // ----------------------------------------------------------------------------
-// wxScrollHelper implementation
+// wxScrolledWindow implementation
 // ----------------------------------------------------------------------------
 
-wxScrollHelper::wxScrollHelper(wxWindow *winToScroll)
-    : wxScrollHelperBase(winToScroll)
+IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
+
+BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
+    EVT_PAINT(wxScrolledWindow::OnPaint)
+END_EVENT_TABLE()
+
+bool wxScrolledWindow::Create(wxWindow *parent,
+                              wxWindowID id,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxString& name)
 {
-    m_xVisibility =
-    m_yVisibility = wxSHOW_SB_DEFAULT;
+    m_targetWindow = this;
+#ifdef __WXMAC__
+    MacSetClipChildren( true ) ;
+#endif
+
+    bool ok = wxPanel::Create(parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name);
+
+    return ok;
 }
 
-void wxScrollHelper::DoShowScrollbars(wxScrollbarVisibility horz,
-                                      wxScrollbarVisibility vert)
+wxScrolledWindow::~wxScrolledWindow()
 {
-    if ( horz != m_xVisibility || vert != m_yVisibility )
-    {
-        m_xVisibility = horz;
-        m_yVisibility = vert;
-
-        AdjustScrollbars();
-    }
 }
 
-void
-wxScrollHelper::DoAdjustScrollbar(int orient,
-                                  int clientSize,
-                                  int virtSize,
-                                  int pixelsPerUnit,
-                                  int& scrollUnits,
-                                  int& scrollPosition,
-                                  int& scrollLinesPerPage,
-                                  wxScrollbarVisibility visibility)
+void wxScrolledWindow::OnPaint(wxPaintEvent& event)
 {
-    // scroll lines per page: if 0, no scrolling is needed
-    // check if we need scrollbar in this direction at all
-    if ( pixelsPerUnit == 0 || clientSize >= virtSize )
-    {
-        // scrolling is disabled or unnecessary
-        scrollUnits =
-        scrollPosition = 0;
-        scrollLinesPerPage = 0;
-    }
-    else // might need scrolling
-    {
-        // Round up integer division to catch any "leftover" client space.
-        scrollUnits = (virtSize + pixelsPerUnit - 1) / pixelsPerUnit;
+    // the user code didn't really draw the window if we got here, so set this
+    // flag to try to call OnDraw() later
+    m_handler->ResetDrawnFlag();
 
-        // Calculate the number of fully scroll units
-        scrollLinesPerPage = clientSize / pixelsPerUnit;
-
-        if ( scrollLinesPerPage >= scrollUnits )
-        {
-            // we're big enough to not need scrolling
-            scrollUnits =
-            scrollPosition = 0;
-            scrollLinesPerPage = 0;
-        }
-        else // we do need a scrollbar
-        {
-            if ( scrollLinesPerPage < 1 )
-                scrollLinesPerPage = 1;
-
-            // Correct position if greater than extent of canvas minus
-            // the visible portion of it or if below zero
-            const int posMax = scrollUnits - scrollLinesPerPage;
-            if ( scrollPosition > posMax )
-                scrollPosition = posMax;
-            else if ( scrollPosition < 0 )
-                scrollPosition = 0;
-        }
-    }
-
-    // in wxSHOW_SB_NEVER case don't show the scrollbar even if it's needed, in
-    // wxSHOW_SB_ALWAYS case show the scrollbar even if it's not needed by
-    // passing a special range value to SetScrollbar()
-    int range;
-    switch ( visibility )
-    {
-        case wxSHOW_SB_NEVER:
-            range = 0;
-            break;
-
-        case wxSHOW_SB_ALWAYS:
-            range = scrollUnits ? scrollUnits : -1;
-            break;
-
-        default:
-            wxFAIL_MSG( wxS("unknown scrollbar visibility") );
-            // fall through
-
-        case wxSHOW_SB_DEFAULT:
-            range = scrollUnits;
-            break;
-
-    }
-
-    m_win->SetScrollbar(orient, scrollPosition, scrollLinesPerPage, range);
-}
-
-void wxScrollHelper::AdjustScrollbars()
-{
-    static wxRecursionGuardFlag s_flagReentrancy;
-    wxRecursionGuard guard(s_flagReentrancy);
-    if ( guard.IsInside() )
-    {
-        // don't reenter AdjustScrollbars() while another call to
-        // AdjustScrollbars() is in progress because this may lead to calling
-        // ScrollWindow() twice and this can really happen under MSW if
-        // SetScrollbar() call below adds or removes the scrollbar which
-        // changes the window size and hence results in another
-        // AdjustScrollbars() call
-        return;
-    }
-
-    int oldXScroll = m_xScrollPosition;
-    int oldYScroll = m_yScrollPosition;
-
-    // we may need to readjust the scrollbars several times as enabling one of
-    // them reduces the area available for the window contents and so can make
-    // the other scrollbar necessary now although it wasn't necessary before
-    //
-    // VZ: normally this loop should be over in at most 2 iterations, I don't
-    //     know why do we need 5 of them
-    for ( int iterationCount = 0; iterationCount < 5; iterationCount++ )
-    {
-        wxSize clientSize = GetTargetSize();
-        const wxSize virtSize = m_targetWindow->GetVirtualSize();
-
-        // this block of code tries to work around the following problem: the
-        // window could have been just resized to have enough space to show its
-        // full contents without the scrollbars, but its client size could be
-        // not big enough because it does have the scrollbars right now and so
-        // the scrollbars would remain even though we don't need them any more
-        //
-        // to prevent this from happening, check if we have enough space for
-        // everything without the scrollbars and explicitly disable them then
-        const wxSize availSize = GetSizeAvailableForScrollTarget(
-            m_win->GetSize() - m_win->GetWindowBorderSize());
-        if ( availSize != clientSize )
-        {
-            if ( availSize.x >= virtSize.x && availSize.y >= virtSize.y )
-            {
-                // this will be enough to make the scrollbars disappear below
-                // and then the client size will indeed become equal to the
-                // full available size
-                clientSize = availSize;
-            }
-        }
-
-
-        DoAdjustScrollbar(wxHORIZONTAL,
-                          clientSize.x,
-                          virtSize.x,
-                          m_xScrollPixelsPerLine,
-                          m_xScrollLines,
-                          m_xScrollPosition,
-                          m_xScrollLinesPerPage,
-                          m_xVisibility);
-
-        DoAdjustScrollbar(wxVERTICAL,
-                          clientSize.y,
-                          virtSize.y,
-                          m_yScrollPixelsPerLine,
-                          m_yScrollLines,
-                          m_yScrollPosition,
-                          m_yScrollLinesPerPage,
-                          m_yVisibility);
-
-
-        // If a scrollbar (dis)appeared as a result of this, we need to adjust
-        // them again but if the client size didn't change, then we're done
-        if ( GetTargetSize() == clientSize )
-            break;
-    }
-
-#ifdef __WXMOTIF__
-    // Sorry, some Motif-specific code to implement a backing pixmap
-    // for the wxRETAINED style. Implementing a backing store can't
-    // be entirely generic because it relies on the wxWindowDC implementation
-    // to duplicate X drawing calls for the backing pixmap.
-
-    if ( m_targetWindow->GetWindowStyle() & wxRETAINED )
-    {
-        Display* dpy = XtDisplay((Widget)m_targetWindow->GetMainWidget());
-
-        int totalPixelWidth = m_xScrollLines * m_xScrollPixelsPerLine;
-        int totalPixelHeight = m_yScrollLines * m_yScrollPixelsPerLine;
-        if (m_targetWindow->GetBackingPixmap() &&
-           !((m_targetWindow->GetPixmapWidth() == totalPixelWidth) &&
-             (m_targetWindow->GetPixmapHeight() == totalPixelHeight)))
-        {
-            XFreePixmap (dpy, (Pixmap) m_targetWindow->GetBackingPixmap());
-            m_targetWindow->SetBackingPixmap((WXPixmap) 0);
-        }
-
-        if (!m_targetWindow->GetBackingPixmap() &&
-           (m_xScrollLines != 0) && (m_yScrollLines != 0))
-        {
-            int depth = wxDisplayDepth();
-            m_targetWindow->SetPixmapWidth(totalPixelWidth);
-            m_targetWindow->SetPixmapHeight(totalPixelHeight);
-            m_targetWindow->SetBackingPixmap((WXPixmap) XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)),
-              m_targetWindow->GetPixmapWidth(), m_targetWindow->GetPixmapHeight(), depth));
-        }
-
-    }
-#endif // Motif
-
-    if (oldXScroll != m_xScrollPosition)
-    {
-       if (m_xScrollingEnabled)
-            m_targetWindow->ScrollWindow( m_xScrollPixelsPerLine * (oldXScroll - m_xScrollPosition), 0,
-                                          GetScrollRect() );
-       else
-            m_targetWindow->Refresh(true, GetScrollRect());
-    }
-
-    if (oldYScroll != m_yScrollPosition)
-    {
-        if (m_yScrollingEnabled)
-            m_targetWindow->ScrollWindow( 0, m_yScrollPixelsPerLine * (oldYScroll-m_yScrollPosition),
-                                          GetScrollRect() );
-        else
-            m_targetWindow->Refresh(true, GetScrollRect());
-    }
-}
-
-void wxScrollHelper::DoScroll( int x_pos, int y_pos )
-{
-    if (!m_targetWindow)
-        return;
-
-    if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
-        ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
-
-    int w = 0, h = 0;
-    GetTargetSize(&w, &h);
-
-    // compute new position:
-    int new_x = m_xScrollPosition;
-    int new_y = m_yScrollPosition;
-
-    if ((x_pos != -1) && (m_xScrollPixelsPerLine))
-    {
-        new_x = x_pos;
-
-        // Calculate page size i.e. number of scroll units you get on the
-        // current client window
-        int noPagePositions = w/m_xScrollPixelsPerLine;
-        if (noPagePositions < 1) noPagePositions = 1;
-
-        // Correct position if greater than extent of canvas minus
-        // the visible portion of it or if below zero
-        new_x = wxMin( m_xScrollLines-noPagePositions, new_x );
-        new_x = wxMax( 0, new_x );
-    }
-    if ((y_pos != -1) && (m_yScrollPixelsPerLine))
-    {
-        new_y = y_pos;
-
-        // Calculate page size i.e. number of scroll units you get on the
-        // current client window
-        int noPagePositions = h/m_yScrollPixelsPerLine;
-        if (noPagePositions < 1) noPagePositions = 1;
-
-        // Correct position if greater than extent of canvas minus
-        // the visible portion of it or if below zero
-        new_y = wxMin( m_yScrollLines-noPagePositions, new_y );
-        new_y = wxMax( 0, new_y );
-    }
-
-    if ( new_x == m_xScrollPosition && new_y == m_yScrollPosition )
-        return; // nothing to do, the position didn't change
-
-    // flush all pending repaints before we change m_{x,y}ScrollPosition, as
-    // otherwise invalidated area could be updated incorrectly later when
-    // ScrollWindow() makes sure they're repainted before scrolling them
-    m_targetWindow->Update();
-
-    // update the position and scroll the window now:
-    if (m_xScrollPosition != new_x)
-    {
-        int old_x = m_xScrollPosition;
-        m_xScrollPosition = new_x;
-        m_win->SetScrollPos( wxHORIZONTAL, new_x );
-        m_targetWindow->ScrollWindow( (old_x-new_x)*m_xScrollPixelsPerLine, 0,
-                                      GetScrollRect() );
-    }
-
-    if (m_yScrollPosition != new_y)
-    {
-        int old_y = m_yScrollPosition;
-        m_yScrollPosition = new_y;
-        m_win->SetScrollPos( wxVERTICAL, new_y );
-        m_targetWindow->ScrollWindow( 0, (old_y-new_y)*m_yScrollPixelsPerLine,
-                                      GetScrollRect() );
-    }
-}
-
-#endif // wxHAS_GENERIC_SCROLLWIN
-
-// ----------------------------------------------------------------------------
-// wxScrolled<T> and wxScrolledWindow implementation
-// ----------------------------------------------------------------------------
-
-wxSize wxScrolledT_Helper::FilterBestSize(const wxWindow *win,
-                                          const wxScrollHelper *helper,
-                                          const wxSize& origBest)
-{
-    // NB: We don't do this in WX_FORWARD_TO_SCROLL_HELPER, because not
-    //     all scrollable windows should behave like this, only those that
-    //     contain children controls within scrollable area
-    //     (i.e., wxScrolledWindow) and other some scrollable windows may
-    //     have different DoGetBestSize() implementation (e.g. wxTreeCtrl).
-
-    wxSize best = origBest;
-
-    if ( win->GetAutoLayout() )
-    {
-        // Only use the content to set the window size in the direction
-        // where there's no scrolling; otherwise we're going to get a huge
-        // window in the direction in which scrolling is enabled
-        int ppuX, ppuY;
-        helper->GetScrollPixelsPerUnit(&ppuX, &ppuY);
-
-        // NB: This code used to use *current* size if min size wasn't
-        //     specified, presumably to get some reasonable (i.e., larger than
-        //     minimal) size.  But that's a wrong thing to do in GetBestSize(),
-        //     so we use minimal size as specified. If the app needs some
-        //     minimal size for its scrolled window, it should set it and put
-        //     the window into sizer as expandable so that it can use all space
-        //     available to it.
-        //
-        //     See also http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=45864
-
-        wxSize minSize = win->GetMinSize();
-
-        if ( ppuX > 0 )
-            best.x = minSize.x + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-
-        if ( ppuY > 0 )
-            best.y = minSize.y + wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
-    }
-
-    return best;
+    event.Skip();
 }
 
 #ifdef __WXMSW__
-WXLRESULT wxScrolledT_Helper::FilterMSWWindowProc(WXUINT nMsg, WXLRESULT rc)
+WXLRESULT wxScrolledWindow::MSWWindowProc(WXUINT nMsg,
+                                       WXWPARAM wParam,
+                                       WXLPARAM lParam)
 {
+    WXLRESULT rc = wxPanel::MSWWindowProc(nMsg, wParam, lParam);
+
 #ifndef __WXWINCE__
     // we need to process arrows ourselves for scrolling
     if ( nMsg == WM_GETDLGCODE )
@@ -1559,10 +1535,8 @@ WXLRESULT wxScrolledT_Helper::FilterMSWWindowProc(WXUINT nMsg, WXLRESULT rc)
         rc |= DLGC_WANTARROWS;
     }
 #endif
+
     return rc;
 }
-#endif // __WXMSW__
 
-// NB: skipping wxScrolled<T> in wxRTTI information because being a templte,
-//     it doesn't and can't implement wxRTTI support
-IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
+#endif // __WXMSW__
diff --git a/Source/3rd Party/wx/src/generic/selstore.cpp b/Source/3rd Party/wx/src/generic/selstore.cpp
index 6610de56a..653de1511 100644
--- a/Source/3rd Party/wx/src/generic/selstore.cpp	
+++ b/Source/3rd Party/wx/src/generic/selstore.cpp	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/selstore.cpp
+// Name:        generic/selstore.cpp
 // Purpose:     wxSelectionStore implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.03 (extracted from src/generic/listctrl.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: selstore.cpp 27853 2004-06-17 16:22:36Z ABX $
 // Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -33,7 +33,7 @@
 // tests
 // ----------------------------------------------------------------------------
 
-bool wxSelectionStore::IsSelected(unsigned item) const
+bool wxSelectionStore::IsSelected(size_t item) const
 {
     bool isSel = m_itemsSel.Index(item) != wxNOT_FOUND;
 
@@ -46,7 +46,7 @@ bool wxSelectionStore::IsSelected(unsigned item) const
 // Select*()
 // ----------------------------------------------------------------------------
 
-bool wxSelectionStore::SelectItem(unsigned item, bool select)
+bool wxSelectionStore::SelectItem(size_t item, bool select)
 {
     // search for the item ourselves as like this we get the index where to
     // insert it later if needed, so we do only one search in the array instead
@@ -75,16 +75,16 @@ bool wxSelectionStore::SelectItem(unsigned item, bool select)
     return false;
 }
 
-bool wxSelectionStore::SelectRange(unsigned itemFrom, unsigned itemTo,
+bool wxSelectionStore::SelectRange(size_t itemFrom, size_t itemTo,
                                    bool select,
                                    wxArrayInt *itemsChanged)
 {
     // 100 is hardcoded but it shouldn't matter much: the important thing is
     // that we don't refresh everything when really few (e.g. 1 or 2) items
     // change state
-    static const unsigned MANY_ITEMS = 100;
+    static const size_t MANY_ITEMS = 100;
 
-    wxASSERT_MSG( itemFrom <= itemTo, wxT("should be in order") );
+    wxASSERT_MSG( itemFrom <= itemTo, _T("should be in order") );
 
     // are we going to have more [un]selected items than the other ones?
     if ( itemTo - itemFrom > m_count/2 )
@@ -102,7 +102,7 @@ bool wxSelectionStore::SelectRange(unsigned itemFrom, unsigned itemTo,
             // TODO: it should be possible to optimize the searches a bit
             //       knowing the possible range
 
-            unsigned item;
+            size_t item;
             for ( item = 0; item < itemFrom; item++ )
             {
                 if ( selOld.Index(item) == wxNOT_FOUND )
@@ -166,7 +166,7 @@ bool wxSelectionStore::SelectRange(unsigned itemFrom, unsigned itemTo,
         }
 
         // just add the items to the selection
-        for ( unsigned item = itemFrom; item <= itemTo; item++ )
+        for ( size_t item = itemFrom; item <= itemTo; item++ )
         {
             if ( SelectItem(item, select) && itemsChanged )
             {
@@ -191,7 +191,7 @@ bool wxSelectionStore::SelectRange(unsigned itemFrom, unsigned itemTo,
 // callbacks
 // ----------------------------------------------------------------------------
 
-void wxSelectionStore::OnItemDelete(unsigned item)
+void wxSelectionStore::OnItemDelete(size_t item)
 {
     size_t count = m_itemsSel.GetCount(),
            i = m_itemsSel.IndexForInsert(item);
@@ -208,25 +208,9 @@ void wxSelectionStore::OnItemDelete(unsigned item)
     while ( i < count )
     {
         // all following elements must be greater than the one we deleted
-        wxASSERT_MSG( m_itemsSel[i] > item, wxT("logic error") );
+        wxASSERT_MSG( m_itemsSel[i] > item, _T("logic error") );
 
         m_itemsSel[i++]--;
     }
 }
 
-void wxSelectionStore::SetItemCount(unsigned count)
-{
-    // forget about all items whose indices are now invalid if the size
-    // decreased
-    if ( count < m_count )
-    {
-        for ( size_t i = m_itemsSel.GetCount(); i > 0; i-- )
-        {
-            if ( m_itemsSel[i - 1] >= count )
-                m_itemsSel.RemoveAt(i - 1);
-        }
-    }
-
-    // remember the new number of items
-    m_count = count;
-}
diff --git a/Source/3rd Party/wx/src/generic/spinctlg.cpp b/Source/3rd Party/wx/src/generic/spinctlg.cpp
index 83d7d5df5..92f3eeea4 100644
--- a/Source/3rd Party/wx/src/generic/spinctlg.cpp	
+++ b/Source/3rd Party/wx/src/generic/spinctlg.cpp	
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.01.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: spinctlg.cpp 52582 2008-03-17 13:46:31Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -24,196 +24,165 @@
     #pragma hdrstop
 #endif
 
+// There are port-specific versions for MSW, GTK, OS/2 and Mac, so exclude the
+// contents of this file in those cases
+#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__) || \
+    defined(__WXMAC__)) || defined(__WXUNIVERSAL__)
+
 #ifndef WX_PRECOMP
     #include "wx/textctrl.h"
 #endif //WX_PRECOMP
 
-#include "wx/spinctrl.h"
-#include "wx/tooltip.h"
-
 #if wxUSE_SPINCTRL
 
-IMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent)
-
-// There are port-specific versions for the wxSpinCtrl, so exclude the
-// contents of this file in those cases
-#if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)
-
 #include "wx/spinbutt.h"
-
-#if wxUSE_SPINBTN
+#include "wx/spinctrl.h"
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
-// The margin between the text control and the spin: the value here is the same
-// as the margin between the spin button and its "buddy" text control in wxMSW
-// so the generic control looks similarly to the native one there, we might
-// need to use different value for the other platforms (and maybe even
-// determine it dynamically?).
-static const wxCoord MARGIN = 1;
-
-#define SPINCTRLBUT_MAX 32000 // large to avoid wrap around trouble
+// the margin between the text control and the spin
+static const wxCoord MARGIN = 2;
 
 // ----------------------------------------------------------------------------
-// wxSpinCtrlTextGeneric: text control used by spin control
+// wxSpinCtrlText: text control used by spin control
 // ----------------------------------------------------------------------------
 
-class wxSpinCtrlTextGeneric : public wxTextCtrl
+class wxSpinCtrlText : public wxTextCtrl
 {
 public:
-    wxSpinCtrlTextGeneric(wxSpinCtrlGenericBase *spin, const wxString& value, long style=0)
-        : wxTextCtrl(spin->GetParent(), wxID_ANY, value, wxDefaultPosition, wxDefaultSize,
-                     style & wxALIGN_MASK)
+    wxSpinCtrlText(wxSpinCtrl *spin, const wxString& value)
+        : wxTextCtrl(spin->GetParent(), wxID_ANY, value)
     {
         m_spin = spin;
 
         // remove the default minsize, the spinctrl will have one instead
-        SetSizeHints(wxDefaultCoord, wxDefaultCoord);
+        SetSizeHints(wxDefaultCoord,wxDefaultCoord);
     }
 
-    virtual ~wxSpinCtrlTextGeneric()
+protected:
+    void OnTextChange(wxCommandEvent& event)
     {
-        // MSW sends extra kill focus event on destroy
-        if (m_spin)
-            m_spin->m_textCtrl = NULL;
-
-        m_spin = NULL;
-    }
-
-    void OnChar( wxKeyEvent &event )
-    {
-        if (m_spin)
-            m_spin->ProcessWindowEvent(event);
-    }
-
-    void OnKillFocus(wxFocusEvent& event)
-    {
-        if (m_spin)
-            m_spin->ProcessWindowEvent(event);
+        int val;
+        if ( m_spin->GetTextValue(&val) )
+        {
+            m_spin->GetSpinButton()->SetValue(val);
+        }
 
         event.Skip();
     }
 
-    wxSpinCtrlGenericBase *m_spin;
+    bool ProcessEvent(wxEvent &event)
+    {
+        // Hand button down events to wxSpinCtrl. Doesn't work.
+        if (event.GetEventType() == wxEVT_LEFT_DOWN && m_spin->ProcessEvent( event ))
+            return true;
+
+        return wxTextCtrl::ProcessEvent( event );
+    }
 
 private:
+    wxSpinCtrl *m_spin;
+
     DECLARE_EVENT_TABLE()
 };
 
-BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl)
-    EVT_CHAR(wxSpinCtrlTextGeneric::OnChar)
-
-    EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus)
+BEGIN_EVENT_TABLE(wxSpinCtrlText, wxTextCtrl)
+    EVT_TEXT(wxID_ANY, wxSpinCtrlText::OnTextChange)
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
-// wxSpinCtrlButtonGeneric: spin button used by spin control
+// wxSpinCtrlButton: spin button used by spin control
 // ----------------------------------------------------------------------------
 
-class wxSpinCtrlButtonGeneric : public wxSpinButton
+class wxSpinCtrlButton : public wxSpinButton
 {
 public:
-    wxSpinCtrlButtonGeneric(wxSpinCtrlGenericBase *spin, int style)
-        : wxSpinButton(spin->GetParent(), wxID_ANY, wxDefaultPosition,
-                       wxDefaultSize, style | wxSP_VERTICAL)
+    wxSpinCtrlButton(wxSpinCtrl *spin, int style)
+        : wxSpinButton(spin->GetParent())
     {
         m_spin = spin;
 
-        SetRange(-SPINCTRLBUT_MAX, SPINCTRLBUT_MAX);
+        SetWindowStyle(style | wxSP_VERTICAL);
 
         // remove the default minsize, the spinctrl will have one instead
-        SetSizeHints(wxDefaultCoord, wxDefaultCoord);
+        SetSizeHints(wxDefaultCoord,wxDefaultCoord);
     }
 
-    void OnSpinButton(wxSpinEvent& event)
+protected:
+    void OnSpinButton(wxSpinEvent& eventSpin)
     {
-        if (m_spin)
-            m_spin->OnSpinButton(event);
-    }
+        m_spin->SetTextValue(eventSpin.GetPosition());
 
-    wxSpinCtrlGenericBase *m_spin;
+        wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
+        event.SetEventObject(m_spin);
+        event.SetInt(eventSpin.GetPosition());
+
+        m_spin->GetEventHandler()->ProcessEvent(event);
+
+        eventSpin.Skip();
+    }
 
 private:
+    wxSpinCtrl *m_spin;
+
     DECLARE_EVENT_TABLE()
 };
 
-BEGIN_EVENT_TABLE(wxSpinCtrlButtonGeneric, wxSpinButton)
-    EVT_SPIN_UP(  wxID_ANY, wxSpinCtrlButtonGeneric::OnSpinButton)
-    EVT_SPIN_DOWN(wxID_ANY, wxSpinCtrlButtonGeneric::OnSpinButton)
+BEGIN_EVENT_TABLE(wxSpinCtrlButton, wxSpinButton)
+    EVT_SPIN(wxID_ANY, wxSpinCtrlButton::OnSpinButton)
 END_EVENT_TABLE()
 
+IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
+
 // ============================================================================
-// wxSpinCtrlGenericBase
+// implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// wxSpinCtrlGenericBase creation
+// wxSpinCtrl creation
 // ----------------------------------------------------------------------------
 
-void wxSpinCtrlGenericBase::Init()
+void wxSpinCtrl::Init()
 {
-    m_value         = 0;
-    m_min           = 0;
-    m_max           = 100;
-    m_increment     = 1;
-    m_snap_to_ticks = false;
-    m_format        = wxS("%g");
-
-    m_spin_value    = 0;
-
-    m_textCtrl = NULL;
-    m_spinButton  = NULL;
+    m_text = NULL;
+    m_btn = NULL;
 }
 
-bool wxSpinCtrlGenericBase::Create(wxWindow *parent,
-                                   wxWindowID id,
-                                   const wxString& value,
-                                   const wxPoint& pos, const wxSize& size,
-                                   long style,
-                                   double min, double max, double initial,
-                                   double increment,
-                                   const wxString& name)
+bool wxSpinCtrl::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& value,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        int min,
+                        int max,
+                        int initial,
+                        const wxString& name)
 {
-    // don't use borders for this control itself, it wouldn't look good with
-    // the text control borders (but we might want to use style border bits to
-    // select the text control style)
-    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize,
-                            (style & ~wxBORDER_MASK) | wxBORDER_NONE,
+    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style,
                             wxDefaultValidator, name) )
     {
         return false;
     }
 
-    m_value = initial;
-    m_min   = min;
-    m_max   = max;
-    m_increment = increment;
-
-    m_textCtrl   = new wxSpinCtrlTextGeneric(this, value, style);
-    m_spinButton = new wxSpinCtrlButtonGeneric(this, style);
-#if wxUSE_TOOLTIPS
-    m_textCtrl->SetToolTip(GetToolTipText());
-    m_spinButton->SetToolTip(GetToolTipText());
-#endif // wxUSE_TOOLTIPS
-
-    m_spin_value = m_spinButton->GetValue();
-
     // the string value overrides the numeric one (for backwards compatibility
     // reasons and also because it is simpler to satisfy the string value which
     // comes much sooner in the list of arguments and leave the initial
     // parameter unspecified)
     if ( !value.empty() )
     {
-        double d;
-        if ( value.ToDouble(&d) )
-        {
-            m_value = d;
-            m_textCtrl->SetValue(wxString::Format(m_format, m_value));
-        }
+        long l;
+        if ( value.ToLong(&l) )
+            initial = l;
     }
 
+    m_text = new wxSpinCtrlText(this, value);
+    m_btn = new wxSpinCtrlButton(this, style);
+
+    m_btn->SetRange(min, max);
+    m_btn->SetValue(initial);
     SetInitialSize(size);
     Move(pos);
 
@@ -230,381 +199,193 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent,
     return true;
 }
 
-wxSpinCtrlGenericBase::~wxSpinCtrlGenericBase()
+wxSpinCtrl::~wxSpinCtrl()
 {
     // delete the controls now, don't leave them alive even though they would
     // still be eventually deleted by our parent - but it will be too late, the
     // user code expects them to be gone now
-
-    if (m_textCtrl)
-    {
-        // null this since MSW sends KILL_FOCUS on deletion, see ~wxSpinCtrlTextGeneric
-        wxDynamicCast(m_textCtrl, wxSpinCtrlTextGeneric)->m_spin = NULL;
-
-        wxSpinCtrlTextGeneric *text = (wxSpinCtrlTextGeneric*)m_textCtrl;
-        m_textCtrl = NULL;
-        delete text;
-    }
-
-    wxDELETE(m_spinButton);
+    delete m_text;
+    m_text = NULL ;
+    delete m_btn;
+    m_btn = NULL ;
 }
 
 // ----------------------------------------------------------------------------
 // geometry
 // ----------------------------------------------------------------------------
 
-wxSize wxSpinCtrlGenericBase::DoGetBestSize() const
+wxSize wxSpinCtrl::DoGetBestSize() const
 {
-    wxSize sizeBtn  = m_spinButton->GetBestSize(),
-           sizeText = m_textCtrl->GetBestSize();
+    wxSize sizeBtn = m_btn->GetBestSize(),
+           sizeText = m_text->GetBestSize();
 
     return wxSize(sizeBtn.x + sizeText.x + MARGIN, sizeText.y);
 }
 
-void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)
+void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
 {
     wxControl::DoMoveWindow(x, y, width, height);
 
     // position the subcontrols inside the client area
-    wxSize sizeBtn = m_spinButton->GetSize();
+    wxSize sizeBtn = m_btn->GetSize();
 
-    wxCoord wText = width - sizeBtn.x - MARGIN;
-    m_textCtrl->SetSize(x, y, wText, height);
-    m_spinButton->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height);
+    wxCoord wText = width - sizeBtn.x;
+    m_text->SetSize(x, y, wText, height);
+    m_btn->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height);
 }
 
 // ----------------------------------------------------------------------------
 // operations forwarded to the subcontrols
 // ----------------------------------------------------------------------------
 
-void wxSpinCtrlGenericBase::SetFocus()
+bool wxSpinCtrl::Enable(bool enable)
 {
-    if ( m_textCtrl )
-        m_textCtrl->SetFocus();
-}
-
-#ifdef __WXMSW__
-
-void wxSpinCtrlGenericBase::DoEnable(bool enable)
-{
-    // We never enable this control itself, it must stay disabled to avoid
-    // interfering with the siblings event handling (see e.g. #12045 for the
-    // kind of problems which arise otherwise).
-    if ( !enable )
-        wxSpinCtrlBase::DoEnable(enable);
-}
-
-#endif // __WXMSW__
-
-bool wxSpinCtrlGenericBase::Enable(bool enable)
-{
-    if ( !wxSpinCtrlBase::Enable(enable) )
+    if ( !wxControl::Enable(enable) )
         return false;
 
-    m_spinButton->Enable(enable);
-    m_textCtrl->Enable(enable);
+    m_btn->Enable(enable);
+    m_text->Enable(enable);
 
     return true;
 }
 
-bool wxSpinCtrlGenericBase::Show(bool show)
+bool wxSpinCtrl::Show(bool show)
 {
     if ( !wxControl::Show(show) )
         return false;
 
     // under GTK Show() is called the first time before we are fully
     // constructed
-    if ( m_spinButton )
+    if ( m_btn )
     {
-        m_spinButton->Show(show);
-        m_textCtrl->Show(show);
+        m_btn->Show(show);
+        m_text->Show(show);
     }
 
     return true;
 }
 
-#if wxUSE_TOOLTIPS
-void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip)
+bool wxSpinCtrl::Reparent(wxWindow *newParent)
 {
-    // Notice that we must check for the subcontrols not being NULL (as they
-    // could be if we were created with the default ctor and this is called
-    // before Create() for some reason) and that we can't call SetToolTip(tip)
-    // because this would take ownership of the wxToolTip object (twice).
-    if ( m_textCtrl )
+    if ( m_btn )
     {
-        if ( tip )
-            m_textCtrl->SetToolTip(tip->GetTip());
-        else
-            m_textCtrl->SetToolTip(NULL);
+        m_btn->Reparent(newParent);
+        m_text->Reparent(newParent);
     }
 
-    if ( m_spinButton )
-    {
-        if( tip )
-            m_spinButton->SetToolTip(tip->GetTip());
-        else
-            m_spinButton->SetToolTip(NULL);
-    }
-
-    wxWindowBase::DoSetToolTip(tip);
-}
-#endif // wxUSE_TOOLTIPS
-
-// ----------------------------------------------------------------------------
-// Handle sub controls events
-// ----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxSpinCtrlGenericBase, wxSpinCtrlBase)
-    EVT_CHAR(wxSpinCtrlGenericBase::OnTextChar)
-    EVT_KILL_FOCUS(wxSpinCtrlGenericBase::OnTextLostFocus)
-END_EVENT_TABLE()
-
-void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event)
-{
-    event.Skip();
-
-    // Sync the textctrl since the user expects that the button will modify
-    // what they see in the textctrl.
-    SyncSpinToText();
-
-    int spin_value = event.GetPosition();
-    double step = (event.GetEventType() == wxEVT_SCROLL_LINEUP) ? 1 : -1;
-
-    // Use the spinbutton's acceleration, if any, but not if wrapping around
-    if (((spin_value >= 0) && (m_spin_value >= 0)) || ((spin_value <= 0) && (m_spin_value <= 0)))
-        step *= abs(spin_value - m_spin_value);
-
-    double value = AdjustToFitInRange(m_value + step*m_increment);
-
-    // Ignore the edges when it wraps since the up/down event may be opposite
-    // They are in GTK and Mac
-    if (abs(spin_value - m_spin_value) > SPINCTRLBUT_MAX)
-    {
-        m_spin_value = spin_value;
-        return;
-    }
-
-    m_spin_value = spin_value;
-
-    if ( DoSetValue(value) )
-        DoSendEvent();
-}
-
-void wxSpinCtrlGenericBase::OnTextLostFocus(wxFocusEvent& event)
-{
-    SyncSpinToText();
-    DoSendEvent();
-
-    event.Skip();
-}
-
-void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event)
-{
-    if ( !HasFlag(wxSP_ARROW_KEYS) )
-    {
-        event.Skip();
-        return;
-    }
-
-    double value = m_value;
-    switch ( event.GetKeyCode() )
-    {
-        case WXK_UP :
-            value += m_increment;
-            break;
-
-        case WXK_DOWN :
-            value -= m_increment;
-            break;
-
-        case WXK_PAGEUP :
-            value += m_increment * 10.0;
-            break;
-
-        case WXK_PAGEDOWN :
-            value -= m_increment * 10.0;
-            break;
-
-        default:
-            event.Skip();
-            return;
-    }
-
-    value = AdjustToFitInRange(value);
-
-    SyncSpinToText();
-
-    if ( DoSetValue(value) )
-        DoSendEvent();
+    return true;
 }
 
 // ----------------------------------------------------------------------------
-// Textctrl functions
+// value and range access
 // ----------------------------------------------------------------------------
 
-bool wxSpinCtrlGenericBase::SyncSpinToText()
+bool wxSpinCtrl::GetTextValue(int *val) const
 {
-    if ( !m_textCtrl || !m_textCtrl->IsModified() )
+    long l;
+    if ( !m_text->GetValue().ToLong(&l) )
+    {
+        // not a number at all
         return false;
-
-    double textValue;
-    if ( m_textCtrl->GetValue().ToDouble(&textValue) )
-    {
-        if (textValue > m_max)
-            textValue = m_max;
-        else if (textValue < m_min)
-            textValue = m_min;
-    }
-    else // text contents is not a valid number at all
-    {
-        // replace its contents with the last valid value
-        textValue = m_value;
     }
 
-    // we must always set the value here, even if it's equal to m_value, as
-    // otherwise we could be left with an out of range value when leaving the
-    // text control and the current value is already m_max for example
-    return DoSetValue(textValue);
+    if ( l < GetMin() || l > GetMax() )
+    {
+        // out of range
+        return false;
+    }
+
+    *val = l;
+
+    return true;
+}
+
+int wxSpinCtrl::GetValue() const
+{
+    return m_btn ? m_btn->GetValue() : 0;
+}
+
+int wxSpinCtrl::GetMin() const
+{
+    return m_btn ? m_btn->GetMin() : 0;
+}
+
+int wxSpinCtrl::GetMax() const
+{
+    return m_btn ? m_btn->GetMax() : 0;
 }
 
 // ----------------------------------------------------------------------------
 // changing value and range
 // ----------------------------------------------------------------------------
 
-void wxSpinCtrlGenericBase::SetValue(const wxString& text)
+void wxSpinCtrl::SetTextValue(int val)
 {
-    wxCHECK_RET( m_textCtrl, wxT("invalid call to wxSpinCtrl::SetValue") );
+    wxCHECK_RET( m_text, _T("invalid call to wxSpinCtrl::SetTextValue") );
 
-    double val;
-    if ( text.ToDouble(&val) && InRange(val) )
+    m_text->SetValue(wxString::Format(_T("%d"), val));
+
+    // select all text
+    m_text->SetSelection(0, -1);
+
+    // and give focus to the control!
+    // m_text->SetFocus();    Why???? TODO.
+
+#ifdef __WXCOCOA__
+    /*  It's sort of a hack to do this from here but the idea is that if the
+        user has clicked on us, which is the main reason this method is called,
+        then focus probably ought to go to the text control since clicking on
+        a text control usually gives it focus.
+
+        However, if the focus is already on us (i.e. the user has turned on
+        the ability to tab to controls) then we don't want to drop focus.
+        So we only set focus if we would steal it away from a different
+        control, not if we would steal it away from ourself.
+     */
+    wxWindow *currentFocusedWindow = wxWindow::FindFocus();
+    if(currentFocusedWindow != this && currentFocusedWindow != m_text)
+        m_text->SetFocus();
+#endif
+}
+
+void wxSpinCtrl::SetValue(int val)
+{
+    wxCHECK_RET( m_btn, _T("invalid call to wxSpinCtrl::SetValue") );
+
+    SetTextValue(val);
+
+    m_btn->SetValue(val);
+}
+
+void wxSpinCtrl::SetValue(const wxString& text)
+{
+    wxCHECK_RET( m_text, _T("invalid call to wxSpinCtrl::SetValue") );
+
+    long val;
+    if ( text.ToLong(&val) && ((val > INT_MIN) && (val < INT_MAX)) )
     {
-        DoSetValue(val);
+        SetValue((int)val);
     }
     else // not a number at all or out of range
     {
-        m_textCtrl->SetValue(text);
-        m_textCtrl->SetSelection(0, -1);
-        m_textCtrl->SetInsertionPointEnd();
+        m_text->SetValue(text);
+        m_text->SetSelection(0, -1);
     }
 }
 
-bool wxSpinCtrlGenericBase::DoSetValue(double val)
+void wxSpinCtrl::SetRange(int min, int max)
 {
-    wxCHECK_MSG( m_textCtrl, false, wxT("invalid call to wxSpinCtrl::SetValue") );
+    wxCHECK_RET( m_btn, _T("invalid call to wxSpinCtrl::SetRange") );
 
-    if (!InRange(val))
-        return false;
-
-    if ( m_snap_to_ticks && (m_increment != 0) )
-    {
-        double snap_value = val / m_increment;
-
-        if (wxFinite(snap_value)) // FIXME what to do about a failure?
-        {
-            if ((snap_value - floor(snap_value)) < (ceil(snap_value) - snap_value))
-                val = floor(snap_value) * m_increment;
-            else
-                val = ceil(snap_value) * m_increment;
-        }
-    }
-
-    wxString str(wxString::Format(m_format.c_str(), val));
-
-    if ((val != m_value) || (str != m_textCtrl->GetValue()))
-    {
-        m_value = val;
-        str.ToDouble( &m_value );    // wysiwyg for textctrl
-        m_textCtrl->SetValue( str );
-        m_textCtrl->SetInsertionPointEnd();
-        m_textCtrl->DiscardEdits();
-        return true;
-    }
-
-    return false;
+    m_btn->SetRange(min, max);
 }
 
-double wxSpinCtrlGenericBase::AdjustToFitInRange(double value) const
+void wxSpinCtrl::SetSelection(long from, long to)
 {
-    if (value < m_min)
-        value = HasFlag(wxSP_WRAP) ? m_max : m_min;
-    if (value > m_max)
-        value = HasFlag(wxSP_WRAP) ? m_min : m_max;
+    wxCHECK_RET( m_text, _T("invalid call to wxSpinCtrl::SetSelection") );
 
-    return value;
+    m_text->SetSelection(from, to);
 }
 
-void wxSpinCtrlGenericBase::DoSetRange(double min, double max)
-{
-    m_min = min;
-    m_max = max;
-}
-
-void wxSpinCtrlGenericBase::DoSetIncrement(double inc)
-{
-    m_increment = inc;
-}
-
-void wxSpinCtrlGenericBase::SetSnapToTicks(bool snap_to_ticks)
-{
-    m_snap_to_ticks = snap_to_ticks;
-    DoSetValue(m_value);
-}
-
-void wxSpinCtrlGenericBase::SetSelection(long from, long to)
-{
-    wxCHECK_RET( m_textCtrl, wxT("invalid call to wxSpinCtrl::SetSelection") );
-
-    m_textCtrl->SetSelection(from, to);
-}
-
-#ifndef wxHAS_NATIVE_SPINCTRL
-
-//-----------------------------------------------------------------------------
-// wxSpinCtrl
-//-----------------------------------------------------------------------------
-
-void wxSpinCtrl::DoSendEvent()
-{
-    wxSpinEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId());
-    event.SetEventObject( this );
-    event.SetPosition((int)(m_value + 0.5)); // FIXME should be SetValue
-    event.SetString(m_textCtrl->GetValue());
-    GetEventHandler()->ProcessEvent( event );
-}
-
-#endif // !wxHAS_NATIVE_SPINCTRL
-
-//-----------------------------------------------------------------------------
-// wxSpinCtrlDouble
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGenericBase)
-
-void wxSpinCtrlDouble::DoSendEvent()
-{
-    wxSpinDoubleEvent event( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, GetId());
-    event.SetEventObject( this );
-    event.SetValue(m_value);
-    event.SetString(m_textCtrl->GetValue());
-    GetEventHandler()->ProcessEvent( event );
-}
-
-void wxSpinCtrlDouble::SetDigits(unsigned digits)
-{
-    wxCHECK_RET( digits <= 20, "too many digits for wxSpinCtrlDouble" );
-
-    if ( digits == m_digits )
-        return;
-
-    m_digits = digits;
-
-    m_format.Printf(wxT("%%0.%ulf"), digits);
-
-    DoSetValue(m_value);
-}
-
-#endif // wxUSE_SPINBTN
-
-#endif // !wxPort-with-native-spinctrl
-
 #endif // wxUSE_SPINCTRL
+#endif // !wxPort-with-native-spinctrl
diff --git a/Source/3rd Party/wx/src/generic/splitter.cpp b/Source/3rd Party/wx/src/generic/splitter.cpp
index b51fceb3a..ccad80b62 100644
--- a/Source/3rd Party/wx/src/generic/splitter.cpp	
+++ b/Source/3rd Party/wx/src/generic/splitter.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: splitter.cpp 60837 2009-05-31 13:13:07Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,10 +39,10 @@
 
 #include <stdlib.h>
 
-wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, wxSplitterEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_SPLITTER_UNSPLIT, wxSplitterEvent );
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_UNSPLIT)
 
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 
@@ -61,25 +61,15 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     EVT_PAINT(wxSplitterWindow::OnPaint)
     EVT_SIZE(wxSplitterWindow::OnSize)
     EVT_MOUSE_EVENTS(wxSplitterWindow::OnMouseEvent)
-    EVT_MOUSE_CAPTURE_LOST(wxSplitterWindow::OnMouseCaptureLost)
 
 #if defined( __WXMSW__ ) || defined( __WXMAC__)
     EVT_SET_CURSOR(wxSplitterWindow::OnSetCursor)
 #endif // wxMSW
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow)
 END_EVENT_TABLE()
 
-static bool IsLive(wxSplitterWindow* wnd)
-{
-    // with wxSP_LIVE_UPDATE style the splitter windows are always resized
-    // following the mouse movement while it drags the sash, without it we only
-    // draw the sash at the new position but only resize the windows when the
-    // dragging is finished
-#if defined( __WXMAC__ ) && defined(TARGET_API_MAC_OSX) && TARGET_API_MAC_OSX == 1
-    return true; // Mac can't paint outside paint event - always need live mode
-#else
-    return wnd->HasFlag(wxSP_LIVE_UPDATE);
-#endif
-}
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow, wxWindow)
 
 bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
                                    const wxPoint& pos,
@@ -90,10 +80,22 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
     // allow TABbing from one window to the other
     style |= wxTAB_TRAVERSAL;
 
+    // we draw our border ourselves to blend the sash with it
+    style &= ~wxBORDER_MASK;
+    style |= wxBORDER_NONE;
+
+#if defined(__WXMAC__) && wxMAC_USE_CORE_GRAPHICS
+    // CoreGraphics can't paint sash feedback
+    style |= wxSP_LIVE_UPDATE;
+#endif
+
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;
 
-    m_lastSize = GetClientSize();
+    if (size.x >= 0)
+        m_lastSize.x = size.x;
+    if (size.y >= 0)
+        m_lastSize.y = size.y;
 
     m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
 
@@ -110,22 +112,26 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
 
 void wxSplitterWindow::Init()
 {
+    m_container.SetContainerWindow(this);
+
     m_splitMode = wxSPLIT_VERTICAL;
     m_permitUnsplitAlways = true;
-    m_windowOne = NULL;
-    m_windowTwo = NULL;
+    m_windowOne = (wxWindow *) NULL;
+    m_windowTwo = (wxWindow *) NULL;
     m_dragMode = wxSPLIT_DRAG_NONE;
     m_oldX = 0;
     m_oldY = 0;
-    m_sashStart = 0;
-    m_sashPosition = 0;
-    m_requestedSashPosition = INT_MAX;
+    m_firstX = 0;
+    m_firstY = 0;
+    m_sashPosition = m_requestedSashPosition = 0;
     m_sashGravity = 0.0;
+    m_sashSize = -1; // -1 means use the native sash size
     m_lastSize = wxSize(0,0);
+    m_checkRequestedSashPosition = false;
     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);
-    m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxPENSTYLE_SOLID);
+    m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
 
     m_needUpdating = false;
     m_isHot = false;
@@ -179,12 +185,6 @@ void wxSplitterWindow::SetResizeCursor()
 void wxSplitterWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
-#ifdef __WXOSX__
-    // as subpanels might have a transparent background we must erase the background
-    // at least on OSX, otherwise traces of the sash will remain
-    // test with: splitter sample->replace right window
-    dc.Clear();
-#endif
 
     DrawSash(dc);
 }
@@ -193,21 +193,17 @@ void wxSplitterWindow::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 
-    // We may need to update the children sizes in two cases: either because
-    // we're in the middle of a live update as indicated by m_needUpdating or
-    // because we have a requested but not yet set sash position as indicated
-    // by m_requestedSashPosition having a valid value.
-    if ( m_needUpdating )
+    // if this is the first idle time after a sash position has potentially
+    // been set, allow SizeWindows to check for a requested size.
+    if (!m_checkRequestedSashPosition)
     {
-        m_needUpdating = false;
-    }
-    else if ( m_requestedSashPosition == INT_MAX )
-    {
-        // We don't need to resize the children.
-        return;
+        m_checkRequestedSashPosition = true;
+        SizeWindows();
+        return; // it won't needUpdating in this case
     }
 
-    SizeWindows();
+    if (m_needUpdating)
+        SizeWindows();
 }
 
 void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
@@ -221,8 +217,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         return;
     }
 
-    bool isLive = IsLive(this);
-
+    // with wxSP_LIVE_UPDATE style the splitter windows are always resized
+    // following the mouse movement while it drags the sash, without it we only
+    // draw the sash at the new position but only resize the windows when the
+    // dragging is finished
+#if defined( __WXMAC__ ) && defined(TARGET_API_MAC_OSX) && TARGET_API_MAC_OSX == 1
+    bool isLive = true ; // FIXME: why?
+#else
+    bool isLive = HasFlag(wxSP_LIVE_UPDATE);
+#endif
     if (event.LeftDown())
     {
         if ( SashHitTest(x, y) )
@@ -240,13 +243,13 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 // shadow sash
                 m_sashPositionCurrent = m_sashPosition;
 
-                m_oldX = (m_splitMode == wxSPLIT_VERTICAL ? m_sashPositionCurrent : x);
-                m_oldY = (m_splitMode != wxSPLIT_VERTICAL ? m_sashPositionCurrent : y);
-                DrawSashTracker(m_oldX, m_oldY);
+                DrawSashTracker(x, y);
             }
 
-            m_ptStart = wxPoint(x,y);
-            m_sashStart = m_sashPosition;
+            m_oldX = x;
+            m_oldY = y;
+
+            SetResizeCursor();
             return;
         }
     }
@@ -274,9 +277,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         // the position of the click doesn't exactly correspond to
         // m_sashPosition, rather it changes it by the distance by which the
         // mouse has moved
-        int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_ptStart.x : y - m_ptStart.y;
+        int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY;
 
-        int posSashNew = OnSashPositionChanging(m_sashStart + diff);
+        int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent;
+        int posSashNew = OnSashPositionChanging(posSashOld + diff);
         if ( posSashNew == -1 )
         {
             // change not allowed
@@ -291,7 +295,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 // We remove the first window from the view
                 wxWindow *removedWindow = m_windowOne;
                 m_windowOne = m_windowTwo;
-                m_windowTwo = NULL;
+                m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);
                 wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
                 eventUnsplit.m_data.win = removedWindow;
@@ -302,7 +306,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
             {
                 // We remove the second window from the view
                 wxWindow *removedWindow = m_windowTwo;
-                m_windowTwo = NULL;
+                m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);
                 wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
                 eventUnsplit.m_data.win = removedWindow;
@@ -330,53 +334,62 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     }
     else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
     {
-        int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_ptStart.x : y - m_ptStart.y;
+        int diff = m_splitMode == wxSPLIT_VERTICAL ? x - m_oldX : y - m_oldY;
+        if ( !diff )
+        {
+            // nothing to do, mouse didn't really move far enough
+            return;
+        }
 
-        int posSashNew = OnSashPositionChanging(m_sashStart + diff);
+        int posSashOld = isLive ? m_sashPosition : m_sashPositionCurrent;
+        int posSashNew = OnSashPositionChanging(posSashOld + diff);
         if ( posSashNew == -1 )
         {
             // change not allowed
             return;
         }
 
+        if ( posSashNew == m_sashPosition )
+            return;
+
+        // Erase old tracker
         if ( !isLive )
         {
-            if ( posSashNew == m_sashPositionCurrent )
-                return;
-
-            m_sashPositionCurrent = posSashNew;
-
-            // Erase old tracker
             DrawSashTracker(m_oldX, m_oldY);
+        }
 
-            m_oldX = (m_splitMode == wxSPLIT_VERTICAL ? m_sashPositionCurrent : x);
-            m_oldY = (m_splitMode != wxSPLIT_VERTICAL ? m_sashPositionCurrent : y);
+        if (m_splitMode == wxSPLIT_VERTICAL)
+            x = posSashNew;
+        else
+            y = posSashNew;
+
+        // Remember old positions
+        m_oldX = x;
+        m_oldY = y;
 
 #ifdef __WXMSW__
-            // As we captured the mouse, we may get the mouse events from outside
-            // our window - for example, negative values in x, y. This has a weird
-            // consequence under MSW where we use unsigned values sometimes and
-            // signed ones other times: the coordinates turn as big positive
-            // numbers and so the sash is drawn on the *right* side of the window
-            // instead of the left (or bottom instead of top). Correct this.
-            if ( (short)m_oldX < 0 )
-                m_oldX = 0;
-            if ( (short)m_oldY < 0 )
-                m_oldY = 0;
+        // As we captured the mouse, we may get the mouse events from outside
+        // our window - for example, negative values in x, y. This has a weird
+        // consequence under MSW where we use unsigned values sometimes and
+        // signed ones other times: the coordinates turn as big positive
+        // numbers and so the sash is drawn on the *right* side of the window
+        // instead of the left (or bottom instead of top). Correct this.
+        if ( (short)m_oldX < 0 )
+            m_oldX = 0;
+        if ( (short)m_oldY < 0 )
+            m_oldY = 0;
 #endif // __WXMSW__
 
-            // Draw new one
+        // Draw new one
+        if ( !isLive )
+        {
+            m_sashPositionCurrent = posSashNew;
+
             DrawSashTracker(m_oldX, m_oldY);
         }
         else
         {
-            if ( posSashNew == m_sashPosition )
-                return;
-
             DoSetSashPosition(posSashNew);
-
-            // in live mode, the new position is the actual sash position, clear requested position!
-            m_requestedSashPosition = INT_MAX;
             m_needUpdating = true;
         }
     }
@@ -390,22 +403,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     }
 }
 
-void wxSplitterWindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
-{
-    if (m_dragMode != wxSPLIT_DRAG_DRAGGING)
-        return;
-
-    m_dragMode = wxSPLIT_DRAG_NONE;
-
-    SetCursor(* wxSTANDARD_CURSOR);
-
-    // Erase old tracker
-    if ( !IsLive(this) )
-    {
-        DrawSashTracker(m_oldX, m_oldY);
-    }
-}
-
 void wxSplitterWindow::OnSize(wxSizeEvent& event)
 {
     // only process this message if we're not iconized - otherwise iconizing
@@ -435,43 +432,30 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
         return;
     }
 
-    const wxSize curSize = event.GetSize();
-
-    // Update the sash position if needed.
-    //
-    // Notice that we shouldn't do this if the sash position requested by user
-    // couldn't be set yet as it would never be taken into account at all if we
-    // modified it before this happens.
-    if ( m_windowTwo && m_requestedSashPosition == INT_MAX )
+    if ( m_windowTwo )
     {
-        int size = m_splitMode == wxSPLIT_VERTICAL ? curSize.x : curSize.y;
+        int w, h;
+        GetClientSize(&w, &h);
+
+        int size = m_splitMode == wxSPLIT_VERTICAL ? w : h;
 
         int old_size = m_splitMode == wxSPLIT_VERTICAL ? m_lastSize.x : m_lastSize.y;
-
-        // Don't do anything if the size didn't really change.
-        if ( size != old_size )
+        if ( old_size != 0 )
         {
-            int newPosition = -1;
-
-            // Apply gravity if we use it.
             int delta = (int) ( (size - old_size)*m_sashGravity );
             if ( delta != 0 )
             {
-                newPosition = m_sashPosition + delta;
+                int newPosition = m_sashPosition + delta;
                 if( newPosition < m_minimumPaneSize )
                     newPosition = m_minimumPaneSize;
-            }
-
-            // Also check if the second window became too small.
-            newPosition = AdjustSashPosition(newPosition == -1
-                                                 ? m_sashPosition
-                                                 : newPosition);
-            if ( newPosition != m_sashPosition )
                 SetSashPositionAndNotify(newPosition);
+            }
         }
-    }
 
-    m_lastSize = curSize;
+        if ( m_sashPosition >= size - 5 )
+            SetSashPositionAndNotify(wxMax(10, size - 40));
+        m_lastSize = wxSize(w,h);
+    }
 
     SizeWindows();
 }
@@ -479,7 +463,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
 void wxSplitterWindow::SetSashGravity(double gravity)
 {
     wxCHECK_RET( gravity >= 0. && gravity <= 1.,
-                    wxT("invalid gravity value") );
+                    _T("invalid gravity value") );
 
     m_sashGravity = gravity;
 }
@@ -496,20 +480,9 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
     return z >=  hitMin && z <= hitMax;
 }
 
-void wxSplitterWindow::SetSashInvisible(bool invisible)
-{
-    if ( IsSashInvisible() != invisible )
-        ToggleWindowStyle(wxSP_NOSASH);
-}
-
 int wxSplitterWindow::GetSashSize() const
 {
-    return IsSashInvisible() ? 0 : GetDefaultSashSize();
-}
-
-int wxSplitterWindow::GetDefaultSashSize() const
-{
-    return wxRendererNative::Get().GetSplitterParams(this).widthSash;
+    return m_sashSize > -1 ? m_sashSize : wxRendererNative::Get().GetSplitterParams(this).widthSash;
 }
 
 int wxSplitterWindow::GetBorderSize() const
@@ -533,7 +506,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
         return;
 
     // nor if we're configured to not show it
-    if ( IsSashInvisible() )
+    if ( HasFlag(wxSP_NOSASH) )
         return;
 
     wxRendererNative::Get().DrawSplitterSash
@@ -560,15 +533,33 @@ void wxSplitterWindow::DrawSashTracker(int x, int y)
 
     if ( m_splitMode == wxSPLIT_VERTICAL )
     {
-        x1 = x2 = wxClip(x, 0, w) + m_sashTrackerPen->GetWidth()/2;
-        y1 = 2;
-        y2 = h-2;
+        x1 = x; y1 = 2;
+        x2 = x; y2 = h-2;
+
+        if ( x1 > w )
+        {
+            x1 = w; x2 = w;
+        }
+        else if ( x1 < 0 )
+        {
+            x1 = 0; x2 = 0;
+        }
     }
     else
     {
-        y1 = y2 = wxClip(y, 0, h) + m_sashTrackerPen->GetWidth()/2;
-        x1 = 2;
-        x2 = w-2;
+        x1 = 2; y1 = y;
+        x2 = w-2; y2 = y;
+
+        if ( y1 > h )
+        {
+            y1 = h;
+            y2 = h;
+        }
+        else if ( y1 < 0 )
+        {
+            y1 = 0;
+            y2 = 0;
+        }
     }
 
     ClientToScreen(&x1, &y1);
@@ -665,7 +656,7 @@ void wxSplitterWindow::SetSashPositionAndNotify(int sashPos)
 void wxSplitterWindow::SizeWindows()
 {
     // check if we have delayed setting the real sash position
-    if ( m_requestedSashPosition != INT_MAX )
+    if ( m_checkRequestedSashPosition && m_requestedSashPosition != INT_MAX )
     {
         int newSashPosition = ConvertSashPosition(m_requestedSashPosition);
         if ( newSashPosition != m_sashPosition )
@@ -731,19 +722,21 @@ void wxSplitterWindow::SizeWindows()
 
     wxClientDC dc(this);
     DrawSash(dc);
+
+    SetNeedUpdating(false);
 }
 
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {
-    wxASSERT_MSG( (!window || window->GetParent() == this),
-                  wxT("windows in the splitter should have it as parent!") );
+    wxASSERT_MSG( (!window || (window && window->GetParent() == this)),
+                  _T("windows in the splitter should have it as parent!") );
 
     if (window && !window->IsShown())
         window->Show();
 
     m_windowOne = window;
-    m_windowTwo = NULL;
+    m_windowTwo = (wxWindow *) NULL;
     DoSetSashPosition(0);
 }
 
@@ -758,10 +751,10 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
         return false;
 
     wxCHECK_MSG( window1 && window2, false,
-                 wxT("cannot split with NULL window(s)") );
+                 _T("can not split with NULL window(s)") );
 
     wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, false,
-                  wxT("windows in the splitter should have it as parent!") );
+                  _T("windows in the splitter should have it as parent!") );
 
     if (! window1->IsShown())
         window1->Show();
@@ -772,8 +765,15 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
     m_windowOne = window1;
     m_windowTwo = window2;
 
+    // remember the sash position we want to set for later if we can't set it
+    // right now (e.g. because the window is too small)
+    m_requestedSashPosition = sashPosition;
+    m_checkRequestedSashPosition = false;
+
+    DoSetSashPosition(ConvertSashPosition(sashPosition));
+
+    SizeWindows();
 
-    SetSashPosition(sashPosition, true);
     return true;
 }
 
@@ -806,13 +806,13 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
     if ( toRemove == NULL || toRemove == m_windowTwo)
     {
         win = m_windowTwo ;
-        m_windowTwo = NULL;
+        m_windowTwo = (wxWindow *) NULL;
     }
     else if ( toRemove == m_windowOne )
     {
         win = m_windowOne ;
         m_windowOne = m_windowTwo;
-        m_windowTwo = NULL;
+        m_windowTwo = (wxWindow *) NULL;
     }
     else
     {
@@ -866,6 +866,7 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw)
     // remember the sash position we want to set for later if we can't set it
     // right now (e.g. because the window is too small)
     m_requestedSashPosition = position;
+    m_checkRequestedSashPosition = false;
 
     DoSetSashPosition(ConvertSashPosition(position));
 
@@ -880,7 +881,9 @@ void wxSplitterWindow::SetSashPosition(int position, bool redraw)
 // window is shown, if you know the overall size is correct.
 void wxSplitterWindow::UpdateSize()
 {
+    m_checkRequestedSashPosition = true;
     SizeWindows();
+    m_checkRequestedSashPosition = false;
 }
 
 bool wxSplitterWindow::DoSendEvent(wxSplitterEvent& event)
@@ -978,13 +981,13 @@ int wxSplitterWindow::OnSashPositionChanging(int newSashPosition)
     {
         // If resultant pane would be too small, enlarge it
         newSashPosition = AdjustSashPosition(newSashPosition);
-
-        // If the result is out of bounds it means minimum size is too big,
-        // so split window in half as best compromise.
-        if ( newSashPosition < 0 || newSashPosition > window_size )
-            newSashPosition = window_size / 2;
     }
 
+    // If the result is out of bounds it means minimum size is too big,
+    // so split window in half as best compromise.
+    if ( newSashPosition < 0 || newSashPosition > window_size )
+        newSashPosition = window_size / 2;
+
     // now let the event handler have it
     //
     // FIXME: shouldn't we do it before the adjustments above so as to ensure
diff --git a/Source/3rd Party/wx/src/generic/srchctlg.cpp b/Source/3rd Party/wx/src/generic/srchctlg.cpp
index d1f1c079d..8b7edad0d 100644
--- a/Source/3rd Party/wx/src/generic/srchctlg.cpp	
+++ b/Source/3rd Party/wx/src/generic/srchctlg.cpp	
@@ -3,9 +3,9 @@
 // Purpose:     implements wxSearchCtrl as a composite control
 // Author:      Vince Harron
 // Created:     2006-02-19
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: srchctlg.cpp 47962 2007-08-08 12:38:13Z JS $
 // Copyright:   Vince Harron
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -50,6 +50,55 @@ static const wxCoord ICON_MARGIN = 0;
 static const wxCoord ICON_OFFSET = 0;
 #endif
 
+// ----------------------------------------------------------------------------
+// TODO: These functions or something like them should probably be made
+// public.  There are similar functions in src/aui/dockart.cpp...
+
+static double wxBlendColour(double fg, double bg, double alpha)
+{
+    double result = bg + (alpha * (fg - bg));
+    if (result < 0.0)
+        result = 0.0;
+    if (result > 255)
+        result = 255;
+    return result;
+}
+
+static wxColor wxStepColour(const wxColor& c, int ialpha)
+{
+    if (ialpha == 100)
+        return c;
+
+    double r = c.Red(), g = c.Green(), b = c.Blue();
+    double bg;
+
+    // ialpha is 0..200 where 0 is completely black
+    // and 200 is completely white and 100 is the same
+    // convert that to normal alpha 0.0 - 1.0
+    ialpha = wxMin(ialpha, 200);
+    ialpha = wxMax(ialpha, 0);
+    double alpha = ((double)(ialpha - 100.0))/100.0;
+
+    if (ialpha > 100)
+    {
+        // blend with white
+        bg = 255.0;
+        alpha = 1.0 - alpha;  // 0 = transparent fg; 1 = opaque fg
+    }
+     else
+    {
+        // blend with black
+        bg = 0.0;
+        alpha = 1.0 + alpha;  // 0 = transparent fg; 1 = opaque fg
+    }
+
+    r = wxBlendColour(r, bg, alpha);
+    g = wxBlendColour(g, bg, alpha);
+    b = wxBlendColour(b, bg, alpha);
+
+    return wxColour((unsigned char)r, (unsigned char)g, (unsigned char)b);
+}
+
 #define LIGHT_STEP 160
 
 // ----------------------------------------------------------------------------
@@ -61,32 +110,28 @@ class wxSearchTextCtrl : public wxTextCtrl
 public:
     wxSearchTextCtrl(wxSearchCtrl *search, const wxString& value, int style)
         : wxTextCtrl(search, wxID_ANY, value, wxDefaultPosition, wxDefaultSize,
-                     (style & ~wxBORDER_MASK) | wxNO_BORDER)
+                     style | wxNO_BORDER)
     {
         m_search = search;
-
-        SetHint(_("Search"));
+        m_defaultFG = GetForegroundColour();
 
         // remove the default minsize, the searchctrl will have one instead
         SetSizeHints(wxDefaultCoord,wxDefaultCoord);
     }
 
-
-    // provide access to the base class protected methods to wxSearchCtrl which
-    // needs to forward to them
-    void DoSetValue(const wxString& value, int flags)
+    void SetDescriptiveText(const wxString& text)
     {
-        wxTextCtrl::DoSetValue(value, flags);
+        if ( GetValue() == m_descriptiveText )
+        {
+            ChangeValue(wxEmptyString);
+        }
+
+        m_descriptiveText = text;
     }
 
-    bool DoLoadFile(const wxString& file, int fileType)
+    wxString GetDescriptiveText() const
     {
-        return wxTextCtrl::DoLoadFile(file, fileType);
-    }
-
-    bool DoSaveFile(const wxString& file, int fileType)
-    {
-        return wxTextCtrl::DoSaveFile(file, fileType);
+        return m_descriptiveText;
     }
 
 protected:
@@ -114,34 +159,30 @@ protected:
         m_search->GetEventHandler()->ProcessEvent(event);
     }
 
-#ifdef __WXMSW__
-    // We increase the text control height to be the same as for the controls
-    // with border as this is what we actually need here because even though
-    // this control itself is borderless, it's inside wxSearchCtrl which does
-    // have the border and so should have the same height as the normal text
-    // entries with border.
-    //
-    // This is a bit ugly and it would arguably be better to use whatever size
-    // the base class version returns and just centre the text vertically in
-    // the search control but I failed to modify the code in LayoutControls()
-    // to do this easily and as there is much in that code I don't understand
-    // (notably what is the logic for buttons sizing?) I prefer to not touch it
-    // at all.
-    virtual wxSize DoGetBestSize() const
+    void OnIdle(wxIdleEvent& WXUNUSED(event))
     {
-        const long flags = GetWindowStyleFlag();
-        wxSearchTextCtrl* const self = const_cast<wxSearchTextCtrl*>(this);
-
-        self->SetWindowStyleFlag((flags & ~wxBORDER_MASK) | wxBORDER_DEFAULT);
-        const wxSize size = wxTextCtrl::DoGetBestSize();
-        self->SetWindowStyleFlag(flags);
-
-        return size;
+        if ( IsEmpty() && !(wxWindow::FindFocus() == this) )
+        {
+            ChangeValue(m_descriptiveText);
+            SetInsertionPoint(0);
+            SetForegroundColour(wxStepColour(m_defaultFG, LIGHT_STEP));
+        }
+    }
+
+    void OnFocus(wxFocusEvent& event)
+    {
+        event.Skip();
+        if ( GetValue() == m_descriptiveText )
+        {
+            ChangeValue(wxEmptyString);
+            SetForegroundColour(m_defaultFG);
+        }
     }
-#endif // __WXMSW__
 
 private:
     wxSearchCtrl* m_search;
+    wxString      m_descriptiveText;
+    wxColour      m_defaultFG;
 
     DECLARE_EVENT_TABLE()
 };
@@ -151,6 +192,8 @@ BEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl)
     EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText)
     EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl)
     EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText)
+    EVT_IDLE(wxSearchTextCtrl::OnIdle)
+    EVT_SET_FOCUS(wxSearchTextCtrl::OnFocus)
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
@@ -169,13 +212,6 @@ public:
 
     void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; }
 
-    // The buttons in wxSearchCtrl shouldn't accept focus from keyboard because
-    // this would interfere with the usual TAB processing: the user expects
-    // that pressing TAB in the search control should switch focus to the next
-    // control and not give it to the button inside the same control. Besides,
-    // the search button can be already activated by pressing "Enter" so there
-    // is really no reason for it to be able to get focus from keyboard.
-    virtual bool AcceptsFocusFromKeyboard() const { return false; }
 
 protected:
     wxSize DoGetBestSize() const
@@ -188,14 +224,6 @@ protected:
         wxCommandEvent event(m_eventType, m_search->GetId());
         event.SetEventObject(m_search);
 
-        if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )
-        {
-            // it's convenient to have the string to search for directly in the
-            // event instead of having to retrieve it from the control in the
-            // event handler code later, so provide it here
-            event.SetString(m_search->GetValue());
-        }
-
         GetEventHandler()->ProcessEvent(event);
 
         m_search->SetFocus();
@@ -293,36 +321,36 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
             const wxValidator& validator,
             const wxString& name)
 {
-    // force border style for more native appearance
-    style &= ~wxBORDER_MASK;
-#ifdef __WXGTK__
-    style |= wxBORDER_SUNKEN;
-#elif defined(__WXMSW__)
-    // Don't set the style explicitly, let GetDefaultBorder() work it out, unless
-    // we will get a sunken border (e.g. on Windows 200) in which case we must
-    // override with a simple border.
-    if (GetDefaultBorder() == wxBORDER_SUNKEN)
-        style |= wxBORDER_SIMPLE;
-#else
-    style |= wxBORDER_SIMPLE;
+	int borderStyle = wxBORDER_SIMPLE;
+
+#if defined(__WXMSW__)
+    borderStyle = GetThemedBorderStyle();
+    if (borderStyle == wxBORDER_SUNKEN)
+        borderStyle = wxBORDER_SIMPLE;
+#elif defined(__WXGTK__)
+    borderStyle = wxBORDER_SUNKEN;
 #endif
-    if ( !wxSearchCtrlBaseBaseClass::Create(parent, id, pos, size,
-                                            style, validator, name) )
+
+    if ( !wxTextCtrlBase::Create(parent, id, pos, size, borderStyle | (style & ~wxBORDER_MASK), validator, name) )
     {
         return false;
     }
 
-    m_text = new wxSearchTextCtrl(this, value, style);
+    m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);
+    m_text->SetDescriptiveText(_("Search"));
 
-    m_searchButton = new wxSearchButton(this,
-                                        wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,
-                                        m_searchBitmap);
-    m_cancelButton = new wxSearchButton(this,
-                                        wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,
-                                        m_cancelBitmap);
+    wxSize sizeText = m_text->GetBestSize();
+
+    m_searchButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,m_searchBitmap);
+    m_cancelButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,m_cancelBitmap);
 
     SetForegroundColour( m_text->GetForegroundColour() );
+    m_searchButton->SetForegroundColour( m_text->GetForegroundColour() );
+    m_cancelButton->SetForegroundColour( m_text->GetForegroundColour() );
+
     SetBackgroundColour( m_text->GetBackgroundColour() );
+    m_searchButton->SetBackgroundColour( m_text->GetBackgroundColour() );
+    m_cancelButton->SetBackgroundColour( m_text->GetBackgroundColour() );
 
     RecalcBitmaps();
 
@@ -423,12 +451,12 @@ bool wxSearchCtrl::IsCancelButtonVisible() const
 
 void wxSearchCtrl::SetDescriptiveText(const wxString& text)
 {
-    m_text->SetHint(text);
+    m_text->SetDescriptiveText(text);
 }
 
 wxString wxSearchCtrl::GetDescriptiveText() const
 {
-    return m_text->GetHint();
+    return m_text->GetDescriptiveText();
 }
 
 // ----------------------------------------------------------------------------
@@ -480,8 +508,6 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
     y += BORDER;
     width -= horizontalBorder*2;
     height -= BORDER*2;
-    if (width < 0) width = 0;
-    if (height < 0) height = 0;
 
     wxSize sizeSearch(0,0);
     wxSize sizeCancel(0,0);
@@ -508,7 +534,6 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
         cancelMargin = 0;
     }
     wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin - 1;
-    if (textWidth < 0) textWidth = 0;
 
     // position the subcontrols inside the client area
 
@@ -521,22 +546,23 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
                             y + ICON_OFFSET - 1, sizeCancel.x, height);
 }
 
-wxWindowList wxSearchCtrl::GetCompositeWindowParts() const
-{
-    wxWindowList parts;
-    parts.push_back(m_text);
-    parts.push_back(m_searchButton);
-    parts.push_back(m_cancelButton);
-    return parts;
-}
 
 // accessors
 // ---------
 
-wxString wxSearchCtrl::DoGetValue() const
+wxString wxSearchCtrl::GetValue() const
 {
-    return m_text->GetValue();
+    wxString value = m_text->GetValue();
+    if (value == m_text->GetDescriptiveText())
+        return wxEmptyString;
+    else
+        return value;
 }
+void wxSearchCtrl::SetValue(const wxString& value)
+{
+    m_text->SetValue(value);
+}
+
 wxString wxSearchCtrl::GetRange(long from, long to) const
 {
     return m_text->GetRange(from, to);
@@ -758,7 +784,7 @@ long wxSearchCtrl::GetInsertionPoint() const
 {
     return m_text->GetInsertionPoint();
 }
-long wxSearchCtrl::GetLastPosition() const
+wxTextPos wxSearchCtrl::GetLastPosition() const
 {
     return m_text->GetLastPosition();
 }
@@ -779,32 +805,20 @@ void wxSearchCtrl::SetEditable(bool editable)
 
 bool wxSearchCtrl::SetFont(const wxFont& font)
 {
-    if ( !wxSearchCtrlBase::SetFont(font) )
-        return false;
-
-    // Recreate the bitmaps as their size may have changed.
+    bool result = wxSearchCtrlBase::SetFont(font);
+    if ( result && m_text )
+    {
+        result = m_text->SetFont(font);
+    }
     RecalcBitmaps();
-
-    return true;
-}
-
-bool wxSearchCtrl::SetBackgroundColour(const wxColour& colour)
-{
-    if ( !wxSearchCtrlBase::SetBackgroundColour(colour) )
-        return false;
-
-    // When the background changes, re-render the bitmaps so that the correct
-    // colour shows in their "transparent" area.
-    RecalcBitmaps();
-
-    return true;
+    return result;
 }
 
 // search control generic only
 void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
 {
     m_searchBitmap = bitmap;
-    m_searchBitmapUser = bitmap.IsOk();
+    m_searchBitmapUser = bitmap.Ok();
     if ( m_searchBitmapUser )
     {
         if ( m_searchButton && !HasMenu() )
@@ -824,7 +838,7 @@ void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
 void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
 {
     m_searchMenuBitmap = bitmap;
-    m_searchMenuBitmapUser = bitmap.IsOk();
+    m_searchMenuBitmapUser = bitmap.Ok();
     if ( m_searchMenuBitmapUser )
     {
         if ( m_searchButton && m_menu )
@@ -844,7 +858,7 @@ void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
 void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap )
 {
     m_cancelBitmap = bitmap;
-    m_cancelBitmapUser = bitmap.IsOk();
+    m_cancelBitmapUser = bitmap.Ok();
     if ( m_cancelBitmapUser )
     {
         if ( m_cancelButton )
@@ -878,17 +892,9 @@ wxTextCtrl& operator<<(const wxChar c);
 
 void wxSearchCtrl::DoSetValue(const wxString& value, int flags)
 {
-    m_text->DoSetValue(value, flags);
-}
-
-bool wxSearchCtrl::DoLoadFile(const wxString& file, int fileType)
-{
-    return m_text->DoLoadFile(file, fileType);
-}
-
-bool wxSearchCtrl::DoSaveFile(const wxString& file, int fileType)
-{
-    return m_text->DoSaveFile(file, fileType);
+    m_text->ChangeValue( value );
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();
 }
 
 // do the window-specific processing after processing the update event
@@ -923,7 +929,7 @@ static int GetMultiplier()
 wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
 {
     wxColour bg = GetBackgroundColour();
-    wxColour fg = GetForegroundColour().ChangeLightness(LIGHT_STEP-20);
+    wxColour fg = wxStepColour(GetForegroundColour(), LIGHT_STEP-20);
 
     //===============================================================================
     // begin drawing code
@@ -1028,7 +1034,7 @@ wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
 wxBitmap wxSearchCtrl::RenderCancelBitmap( int x, int y )
 {
     wxColour bg = GetBackgroundColour();
-    wxColour fg = GetForegroundColour().ChangeLightness(LIGHT_STEP);
+    wxColour fg = wxStepColour(GetForegroundColour(), LIGHT_STEP);
 
     //===============================================================================
     // begin drawing code
@@ -1124,7 +1130,7 @@ void wxSearchCtrl::RecalcBitmaps()
     if ( !m_searchBitmapUser )
     {
         if (
-            !m_searchBitmap.IsOk() ||
+            !m_searchBitmap.Ok() ||
             m_searchBitmap.GetHeight() != bitmapHeight ||
             m_searchBitmap.GetWidth() != bitmapWidth
             )
@@ -1142,7 +1148,7 @@ void wxSearchCtrl::RecalcBitmaps()
     if ( !m_searchMenuBitmapUser )
     {
         if (
-            !m_searchMenuBitmap.IsOk() ||
+            !m_searchMenuBitmap.Ok() ||
             m_searchMenuBitmap.GetHeight() != bitmapHeight ||
             m_searchMenuBitmap.GetWidth() != bitmapWidth
             )
@@ -1160,7 +1166,7 @@ void wxSearchCtrl::RecalcBitmaps()
     if ( !m_cancelBitmapUser )
     {
         if (
-            !m_cancelBitmap.IsOk() ||
+            !m_cancelBitmap.Ok() ||
             m_cancelBitmap.GetHeight() != bitmapHeight ||
             m_cancelBitmap.GetWidth() != bitmapHeight
             )
diff --git a/Source/3rd Party/wx/src/generic/statbmpg.cpp b/Source/3rd Party/wx/src/generic/statbmpg.cpp
deleted file mode 100644
index ca7a827d3..000000000
--- a/Source/3rd Party/wx/src/generic/statbmpg.cpp	
+++ /dev/null
@@ -1,49 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/statbmpg.cpp
-// Purpose:     wxGenericStaticBitmap
-// Author:      Marcin Wojdyr, Stefan Csomor
-// Created:     2008-06-16
-// RCS-ID:      $Id$
-// Copyright:   wxWidgets developers
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#if wxUSE_STATBMP
-
-#ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
-#endif
-
-#include "wx/generic/statbmpg.h"
-
-bool wxGenericStaticBitmap::Create(wxWindow *parent, wxWindowID id,
-                                   const wxBitmap& bitmap,
-                                   const wxPoint& pos, const wxSize& size,
-                                   long style, const wxString& name)
-{
-    if (! wxControl::Create(parent, id, pos, size, style,
-                            wxDefaultValidator, name))
-        return false;
-    SetBitmap(bitmap);
-    Connect(wxEVT_PAINT, wxPaintEventHandler(wxGenericStaticBitmap::OnPaint));
-    return true;
-}
-
-void wxGenericStaticBitmap::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-    if (m_bitmap.IsOk())
-        dc.DrawBitmap(m_bitmap, 0, 0, true);
-}
-
-// under OSX_cocoa is a define, avoid duplicate info
-#ifndef wxGenericStaticBitmap
-
-IMPLEMENT_DYNAMIC_CLASS(wxGenericStaticBitmap, wxStaticBitmapBase)
-
-#endif
-
-#endif // wxUSE_STATBMP
-
diff --git a/Source/3rd Party/wx/src/generic/stattextg.cpp b/Source/3rd Party/wx/src/generic/stattextg.cpp
deleted file mode 100644
index 7641c4261..000000000
--- a/Source/3rd Party/wx/src/generic/stattextg.cpp	
+++ /dev/null
@@ -1,169 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/generic/stattextg.cpp
-// Purpose:     wxGenericStaticText
-// Author:      Marcin Wojdyr
-// Created:     2008-06-26
-// RCS-ID:      $Id$
-// Copyright:   Marcin Wojdyr
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_STATTEXT
-
-#ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
-    #include "wx/settings.h"
-    #include "wx/validate.h"
-#endif
-
-#include "wx/generic/stattextg.h"
-
-#if wxUSE_MARKUP
-    #include "wx/generic/private/markuptext.h"
-#endif // wxUSE_MARKUP
-
-IMPLEMENT_DYNAMIC_CLASS(wxGenericStaticText, wxStaticTextBase)
-
-
-bool wxGenericStaticText::Create(wxWindow *parent,
-                                 wxWindowID id,
-                                 const wxString &label,
-                                 const wxPoint &pos,
-                                 const wxSize &size,
-                                 long style,
-                                 const wxString &name)
-{
-    if ( !wxControl::Create(parent, id, pos, size, style,
-                            wxDefaultValidator, name) )
-        return false;
-
-    SetLabel(label);
-    SetInitialSize(size);
-    Connect(wxEVT_PAINT, wxPaintEventHandler(wxGenericStaticText::OnPaint));
-    return true;
-}
-
-wxGenericStaticText::~wxGenericStaticText()
-{
-#if wxUSE_MARKUP
-    delete m_markupText;
-#endif // wxUSE_MARKUP
-}
-
-void wxGenericStaticText::DoDrawLabel(wxDC& dc, const wxRect& rect)
-{
-#if wxUSE_MARKUP
-    if ( m_markupText )
-        m_markupText->Render(dc, rect, wxMarkupText::Render_ShowAccels);
-    else
-#endif // wxUSE_MARKUP
-        dc.DrawLabel(m_label, rect, GetAlignment(), m_mnemonic);
-}
-
-void wxGenericStaticText::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxPaintDC dc(this);
-
-    wxRect rect = GetClientRect();
-    if ( IsEnabled() )
-    {
-        dc.SetTextForeground(
-                       wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT));
-    }
-    else // paint disabled text
-    {
-        // draw shadow of the text
-        dc.SetTextForeground(
-                       wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT));
-        wxRect rectShadow = rect;
-        rectShadow.Offset(1, 1);
-        DoDrawLabel(dc, rectShadow);
-        dc.SetTextForeground(
-                       wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
-    }
-    DoDrawLabel(dc, rect);
-}
-
-
-wxSize wxGenericStaticText::DoGetBestClientSize() const
-{
-    wxClientDC dc(wxConstCast(this, wxGenericStaticText));
-
-#if wxUSE_MARKUP
-    if ( m_markupText )
-        return m_markupText->Measure(dc);
-#endif // wxUSE_MARKUP
-
-    return dc.GetMultiLineTextExtent(GetLabel());
-}
-
-void wxGenericStaticText::SetLabel(const wxString& label)
-{
-    wxControl::SetLabel(label);
-    DoSetLabel(GetEllipsizedLabel());
-    if ( !HasFlag(wxST_NO_AUTORESIZE) && !IsEllipsized() )
-        InvalidateBestSize();
-
-#if wxUSE_MARKUP
-    if ( m_markupText )
-    {
-        delete m_markupText;
-        m_markupText = NULL;
-    }
-#endif // wxUSE_MARKUP
-
-    Refresh();
-}
-
-void wxGenericStaticText::DoSetLabel(const wxString& label)
-{
-    m_mnemonic = FindAccelIndex(label, &m_label);
-}
-
-#if wxUSE_MARKUP
-
-bool wxGenericStaticText::DoSetLabelMarkup(const wxString& markup)
-{
-    if ( !wxStaticTextBase::DoSetLabelMarkup(markup) )
-        return false;
-
-    if ( !m_markupText )
-        m_markupText = new wxMarkupText(markup);
-    else
-        m_markupText->SetMarkup(markup);
-
-    if ( !HasFlag(wxST_NO_AUTORESIZE) )
-        InvalidateBestSize();
-
-    Refresh();
-
-    return true;
-}
-
-#endif // wxUSE_MARKUP
-
-bool wxGenericStaticText::SetFont(const wxFont &font)
-{
-    if ( !wxControl::SetFont(font) )
-        return false;
-    if ( !HasFlag(wxST_NO_AUTORESIZE) )
-        InvalidateBestSize();
-    Refresh();
-    return true;
-}
-
-void wxGenericStaticText::DoSetSize(int x, int y, int width, int height,
-                                    int sizeFlags)
-{
-    wxStaticTextBase::DoSetSize(x, y, width, height, sizeFlags);
-    UpdateLabel();
-}
-
-
-#endif // wxUSE_STATTEXT
diff --git a/Source/3rd Party/wx/src/generic/statusbr.cpp b/Source/3rd Party/wx/src/generic/statusbr.cpp
index 7e5b512a7..c392cefcd 100644
--- a/Source/3rd Party/wx/src/generic/statusbr.cpp	
+++ b/Source/3rd Party/wx/src/generic/statusbr.cpp	
@@ -2,9 +2,9 @@
 // Name:        src/generic/statusbr.cpp
 // Purpose:     wxStatusBarGeneric class implementation
 // Author:      Julian Smart
-// Modified by: Francesco Montorsi
+// Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: statusbr.cpp 57542 2008-12-25 13:03:24Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -23,14 +23,11 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
-    #include "wx/toplevel.h"
-    #include "wx/control.h"
 #endif
 
 #ifdef __WXGTK20__
     #include <gtk/gtk.h>
-    #include "wx/gtk/private.h"
-    #include "wx/gtk/private/gtk2-compat.h"
+    #include "wx/gtk/win_gtk.h"
 #endif
 
 // we only have to do it here when we use wxStatusBarGeneric in addition to the
@@ -44,60 +41,16 @@
     IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
 #endif // wxUSE_NATIVE_STATUSBAR
 
-// Default status border dimensions
-#define wxTHICK_LINE_BORDER 2
-
-// Margin between the field text and the field rect
-#define wxFIELD_TEXT_MARGIN 2
-
-// ----------------------------------------------------------------------------
-// GTK+ signal handler
-// ----------------------------------------------------------------------------
-
-#if defined( __WXGTK20__ )
-#if GTK_CHECK_VERSION(2,12,0)
-extern "C" {
-static
-gboolean statusbar_query_tooltip(GtkWidget*   WXUNUSED(widget),
-                                 gint        x,
-                                 gint        y,
-                                 gboolean     WXUNUSED(keyboard_mode),
-                                 GtkTooltip *tooltip,
-                                 wxStatusBar* statbar)
-{
-    int n = statbar->GetFieldFromPoint(wxPoint(x,y));
-    if (n == wxNOT_FOUND)
-        return FALSE;
-
-    // should we show the tooltip for the n-th pane of the statusbar?
-    if (!statbar->GetField(n).IsEllipsized())
-        return FALSE;   // no, it's not useful
-
-    const wxString& str = statbar->GetStatusText(n);
-    if (str.empty())
-        return FALSE;
-
-    gtk_tooltip_set_text(tooltip, wxGTK_CONV_SYS(str));
-    return TRUE;
-}
-}
-#endif
-#endif
-
-// ----------------------------------------------------------------------------
-// wxStatusBarGeneric
-// ----------------------------------------------------------------------------
-
 BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
     EVT_PAINT(wxStatusBarGeneric::OnPaint)
-    EVT_SIZE(wxStatusBarGeneric::OnSize)
-#ifdef __WXGTK20__
     EVT_LEFT_DOWN(wxStatusBarGeneric::OnLeftDown)
     EVT_RIGHT_DOWN(wxStatusBarGeneric::OnRightDown)
-#endif
     EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged)
 END_EVENT_TABLE()
 
+// Default status border dimensions
+#define         wxTHICK_LINE_BORDER 2
+
 void wxStatusBarGeneric::Init()
 {
     m_borderX = wxTHICK_LINE_BORDER;
@@ -128,179 +81,218 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
     SetFont(*wxSMALL_FONT);
 #endif
 
-    int height = (int)((11*GetCharHeight())/10 + 2*GetBorderY());
+    wxCoord y;
+    {
+        // Set the height according to the font and the border size
+        wxClientDC dc(this);
+        dc.SetFont(GetFont());
+
+        dc.GetTextExtent(_T("X"), NULL, &y );
+    }
+    int height = (int)( (11*y)/10 + 2*GetBorderY());
+
     SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
 
     SetFieldsCount(1);
 
-#if defined( __WXGTK20__ )
-#if GTK_CHECK_VERSION(2,12,0)
-    if (HasFlag(wxSTB_SHOW_TIPS)
-#ifndef __WXGTK3__
-        && gtk_check_version(2,12,0) == NULL
-#endif
-        )
-    {
-        g_object_set(m_widget, "has-tooltip", TRUE, NULL);
-        g_signal_connect(m_widget, "query-tooltip",
-                         G_CALLBACK(statusbar_query_tooltip), this);
-    }
-#endif
-#endif
-
     return true;
 }
 
+
 wxSize wxStatusBarGeneric::DoGetBestSize() const
 {
     int width, height;
 
     // best width is the width of the parent
-    if (GetParent())
-        GetParent()->GetClientSize(&width, NULL);
-    else
-        width = 80;     // a dummy value
+    GetParent()->GetClientSize(&width, NULL);
 
-    // best height is as calculated above in Create()
-    height = (int)((11*GetCharHeight())/10 + 2*GetBorderY());
+    // best height is as calculated above in Create
+    wxClientDC dc((wxWindow*)this);
+    dc.SetFont(GetFont());
+    wxCoord y;
+    dc.GetTextExtent(_T("X"), NULL, &y );
+    height = (int)( (11*y)/10 + 2*GetBorderY());
 
     return wxSize(width, height);
 }
 
-void wxStatusBarGeneric::DoUpdateStatusText(int number)
+void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
 {
-    wxRect rect;
-    GetFieldRect(number, rect);
+    wxASSERT_MSG( number >= 0, _T("negative number of fields in wxStatusBar?") );
 
-    Refresh(true, &rect);
+    int i;
+    for(i = m_nFields; i < number; ++i)
+        m_statusStrings.Add( wxEmptyString );
 
-    // it's common to show some text in the status bar before starting a
-    // relatively lengthy operation, ensure that the text is shown to the
-    // user immediately and not after the lengthy operation end
-    Update();
+    for (i = m_nFields - 1; i >= number; --i)
+        m_statusStrings.RemoveAt(i);
+
+    // forget the old cached pixel widths
+    m_widthsAbs.Empty();
+
+    wxStatusBarBase::SetFieldsCount(number, widths);
+
+    wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(),
+                  _T("This really should never happen, can we do away with m_nFields here?") );
+}
+
+void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
+{
+    wxCHECK_RET( (number >= 0) && (number < m_nFields),
+                 _T("invalid status bar field index") );
+
+    wxString oldText = m_statusStrings[number];
+    if (oldText != text)
+    {
+        m_statusStrings[number] = text;
+
+        wxRect rect;
+        GetFieldRect(number, rect);
+
+        Refresh(true, &rect);
+
+        // it's common to show some text in the status bar before starting a
+        // relatively lengthy operation, ensure that the text is shown to the
+        // user immediately and not after the lengthy operation end
+        Update();
+    }
+}
+
+wxString wxStatusBarGeneric::GetStatusText(int n) const
+{
+    wxCHECK_MSG( (n >= 0) && (n < m_nFields), wxEmptyString,
+                 _T("invalid status bar field index") );
+
+    return m_statusStrings[n];
 }
 
 void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[])
 {
-    // only set status widths when n == number of statuswindows
-    wxCHECK_RET( (size_t)n == m_panes.GetCount(), wxT("status bar field count mismatch") );
+    // only set status widths, when n == number of statuswindows
+    wxCHECK_RET( n == m_nFields, _T("status bar field count mismatch") );
+
+    // delete the old widths in any case - this function may be used to reset
+    // the widths to the default (all equal)
+    // MBN: this is incompatible with at least wxMSW and wxMAC and not
+    //      documented, but let's keep it for now
+    ReinitWidths();
+
+    // forget the old cached pixel widths
+    m_widthsAbs.Empty();
+
+    if ( !widths_field )
+    {
+        // not an error, see the comment above
+        Refresh();
+        return;
+    }
 
     wxStatusBarBase::SetStatusWidths(n, widths_field);
-
-    // update cache
-    DoUpdateFieldWidths();
 }
 
-void wxStatusBarGeneric::DoUpdateFieldWidths()
+void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
-    m_lastClientSize = GetClientSize();
+    wxPaintDC dc(this);
 
-    // recompute the cache of the field widths if the status bar width has changed
-    m_widthsAbs = CalculateAbsWidths(m_lastClientSize.x);
-}
-
-bool wxStatusBarGeneric::ShowsSizeGrip() const
-{
-    if ( !HasFlag(wxSTB_SIZEGRIP) )
-        return false;
-
-    wxTopLevelWindow * const
-        tlw = wxDynamicCast(wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
-    return tlw && !tlw->IsMaximized() && tlw->HasFlag(wxRESIZE_BORDER);
-}
-
-void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int textHeight)
-{
-    wxString text(GetStatusText(i));
-    if (text.empty())
-        return;     // optimization
-
-    int xpos = rect.x + wxFIELD_TEXT_MARGIN,
-        maxWidth = rect.width - 2*wxFIELD_TEXT_MARGIN,
-        ypos = (int) (((rect.height - textHeight) / 2) + rect.y + 0.5);
-
-    if (ShowsSizeGrip())
+    dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+#ifdef __WXGTK20__
+    // Draw grip first
+    if (HasFlag( wxST_SIZEGRIP ))
     {
-        // don't write text over the size grip:
-        // NOTE: overloading DoGetClientSize() and GetClientAreaOrigin() wouldn't
-        //       work because the adjustment needs to be done only when drawing
-        //       the field text and not also when drawing the background, the
-        //       size grip itself, etc
-        if ((GetLayoutDirection() == wxLayout_RightToLeft && i == 0) ||
-            (GetLayoutDirection() != wxLayout_RightToLeft &&
-                 i == (int)m_panes.GetCount()-1))
+        int width, height;
+        GetClientSize(&width, &height);
+
+        if (GetLayoutDirection() == wxLayout_RightToLeft)
         {
-            const wxRect& gripRc = GetSizeGripRect();
-
-            // NOTE: we don't need any special treatment wrt to the layout direction
-            //       since DrawText() will automatically adjust the origin of the
-            //       text accordingly to the layout in use
-
-            maxWidth -= gripRc.width;
+            gtk_paint_resize_grip( m_widget->style,
+                               GTK_PIZZA(m_wxwindow)->bin_window,
+                               (GtkStateType) GTK_WIDGET_STATE (m_widget),
+                               NULL,
+                               m_widget,
+                               "statusbar",
+                               GDK_WINDOW_EDGE_SOUTH_WEST,
+                               2, 2, height-2, height-4 );
+        }
+        else
+        {
+            gtk_paint_resize_grip( m_widget->style,
+                               GTK_PIZZA(m_wxwindow)->bin_window,
+                               (GtkStateType) GTK_WIDGET_STATE (m_widget),
+                               NULL,
+                               m_widget,
+                               "statusbar",
+                               GDK_WINDOW_EDGE_SOUTH_EAST,
+                               width-height-2, 2, height-2, height-4 );
         }
     }
+#endif
 
-    // eventually ellipsize the text so that it fits the field width
+    if (GetFont().Ok())
+        dc.SetFont(GetFont());
 
-    wxEllipsizeMode ellmode = (wxEllipsizeMode)-1;
-    if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START;
-    else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE;
-    else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END;
+    dc.SetBackgroundMode(wxTRANSPARENT);
 
-    if (ellmode == (wxEllipsizeMode)-1)
-    {
-        // if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if
-        // we don't ellipsize the text but just truncate it
-        if (HasFlag(wxSTB_SHOW_TIPS))
-            SetEllipsizedFlag(i, dc.GetTextExtent(text).GetWidth() > maxWidth);
+#ifdef __WXPM__
+    wxColour vColor;
 
-        dc.SetClippingRegion(rect);
-    }
-    else
-    {
-        text = wxControl::Ellipsize(text, dc,
-                                    ellmode,
-                                    maxWidth,
-                                    wxELLIPSIZE_FLAGS_EXPAND_TABS);
-            // Ellipsize() will do something only if necessary
+    vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);
+    ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
+#endif
 
-        // update the ellipsization status for this pane; this is used later to
-        // decide whether a tooltip should be shown or not for this pane
-        // (if we have wxSTB_SHOW_TIPS)
-        SetEllipsizedFlag(i, text != GetStatusText(i));
-    }
+    for (int i = 0; i < m_nFields; i ++)
+        DrawField(dc, i);
+}
+
+void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)
+{
+    int leftMargin = 2;
+
+    wxRect rect;
+    GetFieldRect(i, rect);
+
+    wxString text(GetStatusText(i));
+
+    long x = 0, y = 0;
+
+    dc.GetTextExtent(text, &x, &y);
+
+    int xpos = rect.x + leftMargin;
+    int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
 
 #if defined( __WXGTK__ ) || defined(__WXMAC__)
     xpos++;
     ypos++;
 #endif
 
-    // draw the text
+    dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
+
     dc.DrawText(text, xpos, ypos);
 
-    if (ellmode == (wxEllipsizeMode)-1)
-        dc.DestroyClippingRegion();
+    dc.DestroyClippingRegion();
 }
 
-void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight)
+void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
 {
     wxRect rect;
     GetFieldRect(i, rect);
 
-    if (rect.GetWidth() <= 0)
-        return;     // happens when the status bar is shrunk in a very small area!
+    int style = wxSB_NORMAL;
+    if (m_statusStyles)
+        style = m_statusStyles[i];
 
-    int style = m_panes[i].GetStyle();
     if (style != wxSB_FLAT)
     {
         // Draw border
-        // For wxSB_NORMAL: paint a grey background, plus 3-d border (one black rectangle)
-        // Inside this, left and top sides (dark grey). Bottom and right (white).
+        // For wxSB_NORMAL:
+        // Have grey background, plus 3-d border -
+        // One black rectangle.
+        // Inside this, left and top sides - dark grey. Bottom and right -
+        // white.
         // Reverse it for wxSB_RAISED
 
         dc.SetPen((style == wxSB_RAISED) ? m_mediumShadowPen : m_hilightPen);
 
-#ifndef __WXPM__
+    #ifndef __WXPM__
 
         // Right and bottom lines
         dc.DrawLine(rect.x + rect.width, rect.y,
@@ -315,7 +307,7 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight)
                rect.x, rect.y);
         dc.DrawLine(rect.x, rect.y,
             rect.x + rect.width, rect.y);
-#else
+    #else
 
         dc.DrawLine(rect.x + rect.width, rect.height + 2,
                     rect.x, rect.height + 2);
@@ -326,70 +318,59 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight)
         dc.DrawLine(rect.x, rect.y,
                     rect.x + rect.width, rect.y);
         dc.DrawLine(rect.x, rect.y + rect.height,
-                    rect.x, rect.y);
+                   rect.x, rect.y);
+
 #endif
     }
 
-    DrawFieldText(dc, rect, i, textHeight);
+    DrawFieldText(dc, i);
 }
 
+  // Get the position and size of the field's internal bounding rectangle
 bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 {
-    wxCHECK_MSG( (n >= 0) && ((size_t)n < m_panes.GetCount()), false,
-                 wxT("invalid status bar field index") );
+    wxCHECK_MSG( (n >= 0) && (n < m_nFields), false,
+                 _T("invalid status bar field index") );
 
-    // We can be called from the user-defined EVT_SIZE handler in which case
-    // the widths haven't been updated yet and we need to do it now. This is
-    // not very efficient as we keep testing the size but there is no other way
-    // to make the code needing the up-to-date fields sizes in its EVT_SIZE to
-    // work.
-    if ( GetClientSize().x != m_lastClientSize.x )
+    // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ)
+    int width, height;
+#ifdef __WXPM__
+    GetSize(&width, &height);
+#else
+    GetClientSize(&width, &height);
+#endif
+
+    // we cache m_widthsAbs between calls and recompute it if client
+    // width has changed (or when it is initially empty)
+    if ( m_widthsAbs.IsEmpty() || (m_lastClientWidth != width) )
     {
-        const_cast<wxStatusBarGeneric*>(this)->DoUpdateFieldWidths();
+        wxConstCast(this, wxStatusBarGeneric)->
+            m_widthsAbs = CalculateAbsWidths(width);
+        // remember last width for which we have recomputed the widths in pixels
+        wxConstCast(this, wxStatusBarGeneric)->
+            m_lastClientWidth = width;
     }
 
-    if (m_widthsAbs.IsEmpty())
-        return false;
-
     rect.x = 0;
     for ( int i = 0; i < n; i++ )
+    {
         rect.x += m_widthsAbs[i];
-    rect.x += m_borderX;
+    }
 
+    rect.x += m_borderX;
     rect.y = m_borderY;
+
     rect.width = m_widthsAbs[n] - 2*m_borderX;
-    rect.height = m_lastClientSize.y - 2*m_borderY;
+    rect.height = height - 2*m_borderY;
 
     return true;
 }
 
-int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const
-{
-    if (m_widthsAbs.IsEmpty())
-        return wxNOT_FOUND;
-
-    // NOTE: we explicitly don't take in count the borders since they are only
-    //       useful when rendering the status text, not for hit-test computations
-
-    if (pt.y <= 0 || pt.y >= m_lastClientSize.y)
-        return wxNOT_FOUND;
-
-    int x = 0;
-    for ( size_t i = 0; i < m_panes.GetCount(); i++ )
-    {
-        if (pt.x > x && pt.x < x+m_widthsAbs[i])
-            return i;
-
-        x += m_widthsAbs[i];
-    }
-
-    return wxNOT_FOUND;
-}
-
+// Initialize colours
 void wxStatusBarGeneric::InitColours()
 {
 #if defined(__WXPM__)
-    m_mediumShadowPen = wxPen(wxColour(127, 127, 127));
+    m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
     m_hilightPen = *wxWHITE_PEN;
 
     SetBackgroundColour(*wxLIGHT_GREY);
@@ -400,83 +381,7 @@ void wxStatusBarGeneric::InitColours()
 #endif // __WXPM__/!__WXPM__
 }
 
-void wxStatusBarGeneric::SetMinHeight(int height)
-{
-    // check that this min height is not less than minimal height for the
-    // current font (min height is as calculated above in Create() except for border)
-    int minHeight = (int)((11*GetCharHeight())/10);
-
-    if ( height > minHeight )
-        SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY);
-}
-
-wxRect wxStatusBarGeneric::GetSizeGripRect() const
-{
-    int width, height;
-    wxWindow::DoGetClientSize(&width, &height);
-
-    if (GetLayoutDirection() == wxLayout_RightToLeft)
-        return wxRect(2, 2, height-2, height-4);
-    else
-        return wxRect(width-height-2, 2, height-2, height-4);
-}
-
-// ----------------------------------------------------------------------------
-// wxStatusBarGeneric - event handlers
-// ----------------------------------------------------------------------------
-
-void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
-{
-    wxPaintDC dc(this);
-
-#ifdef __WXGTK20__
-    // Draw grip first
-    if ( ShowsSizeGrip() )
-    {
-        const wxRect& rc = GetSizeGripRect();
-#ifdef __WXGTK3__
-        GtkWidget* toplevel = gtk_widget_get_toplevel(m_widget);
-        if (toplevel && !gtk_window_get_has_resize_grip(GTK_WINDOW(toplevel)))
-        {
-            GtkStyleContext* sc = gtk_widget_get_style_context(toplevel);
-            gtk_style_context_save(sc);
-            gtk_style_context_add_class(sc, GTK_STYLE_CLASS_GRIP);
-            GtkJunctionSides sides = GTK_JUNCTION_CORNER_BOTTOMRIGHT;
-            if (GetLayoutDirection() == wxLayout_RightToLeft)
-                sides = GTK_JUNCTION_CORNER_BOTTOMLEFT;
-            gtk_style_context_set_junction_sides(sc, sides);
-            gtk_render_handle(sc,
-                static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext()),
-                rc.x, rc.y, rc.width, rc.height);
-            gtk_style_context_restore(sc);
-        }
-#else
-        GdkWindowEdge edge =
-            GetLayoutDirection() == wxLayout_RightToLeft ? GDK_WINDOW_EDGE_SOUTH_WEST :
-                                                           GDK_WINDOW_EDGE_SOUTH_EAST;
-        gtk_paint_resize_grip(gtk_widget_get_style(m_widget),
-                            GTKGetDrawingWindow(),
-                            gtk_widget_get_state(m_widget),
-                            NULL,
-                            m_widget,
-                            "statusbar",
-                            edge,
-                            rc.x, rc.y, rc.width, rc.height );
-#endif
-    }
-#endif // __WXGTK20__
-
-    if (GetFont().IsOk())
-        dc.SetFont(GetFont());
-
-    // compute char height only once for all panes:
-    int textHeight = dc.GetCharHeight();
-
-    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
-    for (size_t i = 0; i < m_panes.GetCount(); i ++)
-        DrawField(dc, i, textHeight);
-}
-
+// Responds to colour changes, and passes event on to children.
 void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     InitColours();
@@ -485,21 +390,34 @@ void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(event);
 }
 
-#ifdef __WXGTK20__
+void wxStatusBarGeneric::SetMinHeight(int height)
+{
+    // check that this min height is not less than minimal height for the
+    // current font
+    wxClientDC dc(this);
+    wxCoord y;
+    dc.GetTextExtent( wxT("X"), NULL, &y );
+
+    if ( height > (11*y)/10 )
+    {
+        SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY);
+    }
+}
+
 void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
 {
+#ifdef __WXGTK20__
     int width, height;
     GetClientSize(&width, &height);
 
-    GtkWidget* ancestor = gtk_widget_get_toplevel(m_widget);
-#ifdef __WXGTK3__
-    if (ancestor && gtk_window_get_has_resize_grip(GTK_WINDOW(ancestor)))
-        ancestor = NULL;
-#endif
-
-    if (ancestor && ShowsSizeGrip() && event.GetX() > width - height)
+    if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
     {
-        GdkWindow *source = GTKGetDrawingWindow();
+        GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
+
+        if (!GTK_IS_WINDOW (ancestor))
+            return;
+
+        GdkWindow *source = GTK_PIZZA(m_wxwindow)->bin_window;
 
         int org_x = 0;
         int org_y = 0;
@@ -528,22 +446,25 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
     {
         event.Skip( true );
     }
+#else
+    event.Skip( true );
+#endif
 }
 
 void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
 {
+#ifdef __WXGTK20__
     int width, height;
     GetClientSize(&width, &height);
 
-    GtkWidget* ancestor = gtk_widget_get_toplevel(m_widget);
-#ifdef __WXGTK3__
-    if (ancestor && gtk_window_get_has_resize_grip(GTK_WINDOW(ancestor)))
-        ancestor = NULL;
-#endif
-
-    if (ancestor && ShowsSizeGrip() && event.GetX() > width - height)
+    if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
     {
-        GdkWindow *source = GTKGetDrawingWindow();
+        GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
+
+        if (!GTK_IS_WINDOW (ancestor))
+            return;
+
+        GdkWindow *source = GTK_PIZZA(m_wxwindow)->bin_window;
 
         int org_x = 0;
         int org_y = 0;
@@ -559,14 +480,9 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
     {
         event.Skip( true );
     }
-}
-#endif // __WXGTK20__
-
-void wxStatusBarGeneric::OnSize(wxSizeEvent& event)
-{
-    DoUpdateFieldWidths();
-
-    event.Skip();
+#else
+    event.Skip( true );
+#endif
 }
 
 #endif // wxUSE_STATUSBAR
diff --git a/Source/3rd Party/wx/src/generic/textdlgg.cpp b/Source/3rd Party/wx/src/generic/textdlgg.cpp
index ce3e1173d..f1c8aa64b 100644
--- a/Source/3rd Party/wx/src/generic/textdlgg.cpp	
+++ b/Source/3rd Party/wx/src/generic/textdlgg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: textdlgg.cpp 41838 2006-10-09 21:08:45Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,8 +42,8 @@
     #include "wx/statline.h"
 #endif
 
-const char wxGetTextFromUserPromptStr[] = "Input Text";
-const char wxGetPasswordFromUserPromptStr[] = "Enter Password";
+const wxChar wxGetTextFromUserPromptStr[] = wxT("Input Text");
+const wxChar wxGetPasswordFromUserPromptStr[] = wxT("Enter Password");
 
 // ----------------------------------------------------------------------------
 // constants
@@ -71,8 +71,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                                      const wxString& value,
                                      long style,
                                      const wxPoint& pos)
-                 : wxDialog(GetParentForModalDialog(parent, style),
-                            wxID_ANY, caption, pos, wxDefaultSize,
+                 : wxDialog(parent, wxID_ANY, caption, pos, wxDefaultSize,
                             wxDEFAULT_DIALOG_STYLE),
                    m_value(value)
 {
@@ -107,7 +106,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 #endif // wxUSE_VALIDATORS
 
     // 3) buttons if any
-    wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & (wxOK | wxCANCEL));
+    wxSizer *buttonSizer = CreateSeparatedButtonSizer(style & ButtonSizerFlags);
     if ( buttonSizer )
     {
         topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand());
@@ -151,15 +150,7 @@ void wxTextEntryDialog::SetValue(const wxString& val)
 }
 
 #if wxUSE_VALIDATORS
-
-#if WXWIN_COMPATIBILITY_2_8
 void wxTextEntryDialog::SetTextValidator( long style )
-{
-    SetTextValidator((wxTextValidatorStyle)style);
-}
-#endif
-
-void wxTextEntryDialog::SetTextValidator( wxTextValidatorStyle style )
 {
     wxTextValidator validator( style, &m_value );
     m_textctrl->SetValidator( validator );
diff --git a/Source/3rd Party/wx/src/generic/timer.cpp b/Source/3rd Party/wx/src/generic/timer.cpp
index 364419f9e..1fad2018b 100644
--- a/Source/3rd Party/wx/src/generic/timer.cpp	
+++ b/Source/3rd Party/wx/src/generic/timer.cpp	
@@ -2,7 +2,7 @@
 // Name:        src/generic/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
-// Id:          $Id$
+// Id:          $Id: timer.cpp 40943 2006-08-31 19:31:43Z ABX $
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,34 +22,69 @@
 
 #if wxUSE_TIMER
 
+#include "wx/timer.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/module.h"
 #endif
 
-#include "wx/apptrait.h"
-#include "wx/generic/private/timer.h"
-
 // ----------------------------------------------------------------------------
 // Time input function
 // ----------------------------------------------------------------------------
 
-#define GetMillisecondsTime wxGetLocalTimeMillis
+#ifdef __WXMGL__
+    // We take advantage of wxMGL's _EVT_getTicks because it is faster
+    // (especially under MS-DOS!) and more precise than wxGetLocalTimeMillis
+    // if we are unlucky and the latter combines information from two sources.
+    #include "wx/mgl/private.h"
+    extern "C" ulong _EVT_getTicks();
+    #define GetMillisecondsTime _EVT_getTicks
 
-typedef wxLongLong wxTimerTick_t;
+    typedef ulong wxTimerTick_t;
 
-#if wxUSE_LONGLONG_WX
-    #define wxTimerTickFmtSpec wxLongLongFmtSpec "d"
-    #define wxTimerTickPrintfArg(tt) (tt.GetValue())
-#else // using native wxLongLong
-    #define wxTimerTickFmtSpec wxT("s")
-    #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str())
-#endif // wx/native long long
+    #define wxTimerTickFmtSpec _T("lu")
+    #define wxTimerTickPrintfArg(tt) (tt)
 
-inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
-{
-    return x >= y;
-}
+    #ifdef __DOS__
+        // Under DOS the MGL timer has a 24hr period, so consider the 12 hours
+        // before y to be 'less' and the the 12 hours after 'greater' modulo
+        // 24 hours.
+        inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
+        {
+            // _EVT_getTicks wraps at 1573040 * 55
+            const wxTimerTick_t modulus = 1573040 * 55;
+            return (2 * modulus + x - y) % modulus < modulus / 2;
+        }
+    #else
+        // If wxTimerTick_t is 32-bits then it'll wrap in around 50 days. So
+        // let the 25 days before y be 'less' and 25 days after be 'greater'.
+        inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
+        {
+            // This code assumes wxTimerTick_t is an unsigned type.
+            // Set half_modulus with top bit set and the rest zeros.
+            const wxTimerTick_t half_modulus = ~((~(wxTimerTick_t)0) >> 1);
+            return x - y < half_modulus;
+        }
+    #endif
+#else // !__WXMGL__
+    #define GetMillisecondsTime wxGetLocalTimeMillis
+
+    typedef wxLongLong wxTimerTick_t;
+
+    #if wxUSE_LONGLONG_WX
+        #define wxTimerTickFmtSpec wxLongLongFmtSpec _T("d")
+        #define wxTimerTickPrintfArg(tt) (tt.GetValue())
+    #else // using native wxLongLong
+        #define wxTimerTickFmtSpec _T("s")
+        #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str())
+    #endif // wx/native long long
+
+    inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
+    {
+        return x >= y;
+    }
+#endif // __WXMGL__/!__WXMGL__
 
 // ----------------------------------------------------------------------------
 // helper structures and wxTimerScheduler
@@ -58,15 +93,15 @@ inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
 class wxTimerDesc
 {
 public:
-    wxTimerDesc(wxGenericTimerImpl *t) :
+    wxTimerDesc(wxTimer *t) :
         timer(t), running(false), next(NULL), prev(NULL),
         shotTime(0), deleteFlag(NULL) {}
 
-    wxGenericTimerImpl  *timer;
-    bool                running;
-    wxTimerDesc         *next, *prev;
-    wxTimerTick_t        shotTime;
-    volatile bool       *deleteFlag; // see comment in ~wxTimer
+    wxTimer         *timer;
+    bool             running;
+    wxTimerDesc     *next, *prev;
+    wxTimerTick_t    shotTime;
+    volatile bool   *deleteFlag; // see comment in ~wxTimer
 };
 
 class wxTimerScheduler
@@ -172,16 +207,18 @@ void wxTimerScheduler::NotifyTimers()
 // wxTimer
 // ----------------------------------------------------------------------------
 
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
+
 wxTimerScheduler *gs_scheduler = NULL;
 
-void wxGenericTimerImpl::Init()
+void wxTimer::Init()
 {
     if ( !gs_scheduler )
         gs_scheduler = new wxTimerScheduler;
     m_desc = new wxTimerDesc(this);
 }
 
-wxGenericTimerImpl::~wxGenericTimerImpl()
+wxTimer::~wxTimer()
 {
     wxLogTrace( wxT("timer"), wxT("destroying timer %p..."), this);
     if ( IsRunning() )
@@ -198,31 +235,31 @@ wxGenericTimerImpl::~wxGenericTimerImpl()
     wxLogTrace( wxT("timer"), wxT("    ...done destroying timer %p..."), this);
 }
 
-bool wxGenericTimerImpl::IsRunning() const
+bool wxTimer::IsRunning() const
 {
     return m_desc->running;
 }
 
-bool wxGenericTimerImpl::Start(int millisecs, bool oneShot)
+bool wxTimer::Start(int millisecs, bool oneShot)
 {
     wxLogTrace( wxT("timer"), wxT("started timer %p: %i ms, oneshot=%i"),
                this, millisecs, oneShot);
 
-     if ( !wxTimerImpl::Start(millisecs, oneShot) )
-         return false;
+    if ( !wxTimerBase::Start(millisecs, oneShot) )
+        return false;
 
     gs_scheduler->QueueTimer(m_desc);
     return true;
 }
 
-void wxGenericTimerImpl::Stop()
+void wxTimer::Stop()
 {
     if ( !m_desc->running ) return;
 
     gs_scheduler->RemoveTimer(m_desc);
 }
 
-/*static*/ void wxGenericTimerImpl::NotifyTimers()
+/*static*/ void wxTimer::NotifyTimers()
 {
     if ( gs_scheduler )
         gs_scheduler->NotifyTimers();
@@ -237,19 +274,10 @@ DECLARE_DYNAMIC_CLASS(wxTimerModule)
 public:
     wxTimerModule() {}
     bool OnInit() { return true; }
-    void OnExit() { wxDELETE(gs_scheduler); }
+    void OnExit() { delete gs_scheduler; gs_scheduler = NULL; }
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule)
 
-// ----------------------------------------------------------------------------
-// wxGUIAppTraits
-// ----------------------------------------------------------------------------
-
-wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
-{
-    return new wxGenericTimerImpl(timer);
-}
-
 
 #endif //wxUSE_TIMER
diff --git a/Source/3rd Party/wx/src/generic/tipwin.cpp b/Source/3rd Party/wx/src/generic/tipwin.cpp
index c93aa5ad8..0f2f2bb18 100644
--- a/Source/3rd Party/wx/src/generic/tipwin.cpp	
+++ b/Source/3rd Party/wx/src/generic/tipwin.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.09.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tipwin.cpp 43033 2006-11-04 13:31:10Z VZ $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -71,7 +71,7 @@ private:
 #endif // !wxUSE_POPUPWIN
 
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxTipWindowView);
+    DECLARE_NO_COPY_CLASS(wxTipWindowView)
 };
 
 // ============================================================================
@@ -167,7 +167,7 @@ wxTipWindow::~wxTipWindow()
     {
         *m_windowPtr = NULL;
     }
-    #if wxUSE_POPUPWIN
+    #ifdef wxUSE_POPUPWIN
         #ifdef __WXGTK__
             if ( m_view->HasCapture() )
                 m_view->ReleaseMouse();
@@ -267,7 +267,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
     bool breakLine = false;
     for ( const wxChar *p = text.c_str(); ; p++ )
     {
-        if ( *p == wxT('\n') || *p == wxT('\0') )
+        if ( *p == _T('\n') || *p == _T('\0') )
         {
             dc.GetTextExtent(current, &width, &height);
             if ( width > widthMax )
@@ -287,7 +287,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
             current.clear();
             breakLine = false;
         }
-        else if ( breakLine && (*p == wxT(' ') || *p == wxT('\t')) )
+        else if ( breakLine && (*p == _T(' ') || *p == _T('\t')) )
         {
             // word boundary - break the line here
             m_parent->m_textLines.Add(current);
@@ -326,8 +326,8 @@ void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))
     rect.height = size.y;
 
     // first filll the background
-    dc.SetBrush(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
-    dc.SetPen(wxPen(GetForegroundColour(), 1, wxPENSTYLE_SOLID));
+    dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
+    dc.SetPen( wxPen(GetForegroundColour(), 1, wxSOLID) );
     dc.DrawRectangle(rect);
 
     // and then draw the text line by line
diff --git a/Source/3rd Party/wx/src/generic/toolbkg.cpp b/Source/3rd Party/wx/src/generic/toolbkg.cpp
index 4a425a4b4..fa3bbdf97 100644
--- a/Source/3rd Party/wx/src/generic/toolbkg.cpp	
+++ b/Source/3rd Party/wx/src/generic/toolbkg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2006-01-29
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: toolbkg.cpp 44271 2007-01-21 00:52:05Z VZ $
 // Copyright:   (c) 2006 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -44,9 +44,12 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolbook, wxBookCtrlBase)
+IMPLEMENT_DYNAMIC_CLASS(wxToolbookEvent, wxNotifyEvent)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED,  wxBookCtrlEvent );
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxNewEventType();
+const wxEventType wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxNewEventType();
+#endif
 
 BEGIN_EVENT_TABLE(wxToolbook, wxBookCtrlBase)
     EVT_SIZE(wxToolbook::OnSize)
@@ -64,6 +67,7 @@ END_EVENT_TABLE()
 
 void wxToolbook::Init()
 {
+    m_selection = wxNOT_FOUND;
     m_needsRealizing = false;
 }
 
@@ -85,19 +89,14 @@ bool wxToolbook::Create(wxWindow *parent,
                             wxDefaultValidator, name) )
         return false;
 
-    int tbFlags = wxTB_TEXT | wxTB_FLAT | wxBORDER_NONE;
-    if ( (style & (wxBK_LEFT | wxBK_RIGHT)) != 0 )
-        tbFlags |= wxTB_VERTICAL;
-    else
-        tbFlags |= wxTB_HORIZONTAL;
-
-    if ( style & wxTBK_HORZ_LAYOUT )
-        tbFlags |= wxTB_HORZ_LAYOUT;
+    int orient = wxTB_HORIZONTAL;
+    if ( (style & (wxBK_LEFT | wxBK_RIGHT)) != 0)
+        orient = wxTB_VERTICAL;
 
     // TODO: make more configurable
 
 #if defined(__WXMAC__) && wxUSE_TOOLBAR && wxUSE_BMPBUTTON
-    if (style & wxTBK_BUTTONBAR)
+    if (style & wxBK_BUTTONBAR)
     {
         m_bookctrl = new wxButtonToolBar
                  (
@@ -105,7 +104,7 @@ bool wxToolbook::Create(wxWindow *parent,
                     wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    tbFlags
+                    orient|wxTB_TEXT|wxTB_FLAT|wxNO_BORDER
                  );
     }
     else
@@ -117,7 +116,7 @@ bool wxToolbook::Create(wxWindow *parent,
                     wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    tbFlags | wxTB_NODIVIDER
+                    orient|wxTB_TEXT|wxTB_FLAT|wxTB_NODIVIDER|wxNO_BORDER
                  );
     }
 
@@ -128,6 +127,28 @@ bool wxToolbook::Create(wxWindow *parent,
 // wxToolbook geometry management
 // ----------------------------------------------------------------------------
 
+wxSize wxToolbook::GetControllerSize() const
+{
+    const wxSize sizeClient = GetClientSize(),
+                 sizeBorder = m_bookctrl->GetSize() - m_bookctrl->GetClientSize(),
+                 sizeToolBar = GetToolBar()->GetSize() + sizeBorder;
+
+    wxSize size;
+
+    if ( IsVertical() )
+    {
+        size.x = sizeClient.x;
+        size.y = sizeToolBar.y;
+    }
+    else // left/right aligned
+    {
+        size.x = sizeToolBar.x;
+        size.y = sizeClient.y;
+    }
+
+    return size;
+}
+
 void wxToolbook::OnSize(wxSizeEvent& event)
 {
     if (m_needsRealizing)
@@ -136,6 +157,24 @@ void wxToolbook::OnSize(wxSizeEvent& event)
     wxBookCtrlBase::OnSize(event);
 }
 
+wxSize wxToolbook::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    // we need to add the size of the list control and the border between
+    const wxSize sizeToolBar = GetControllerSize();
+
+    wxSize size = sizePage;
+    if ( IsVertical() )
+    {
+        size.y += sizeToolBar.y + GetInternalBorder();
+    }
+    else // left/right aligned
+    {
+        size.x += sizeToolBar.x + GetInternalBorder();
+    }
+
+    return size;
+}
+
 // ----------------------------------------------------------------------------
 // accessing the pages
 // ----------------------------------------------------------------------------
@@ -164,7 +203,7 @@ wxString wxToolbook::GetPageText(size_t n) const
 
 int wxToolbook::GetPageImage(size_t WXUNUSED(n)) const
 {
-    wxFAIL_MSG( wxT("wxToolbook::GetPageImage() not implemented") );
+    wxFAIL_MSG( _T("wxToolbook::GetPageImage() not implemented") );
 
     return wxNOT_FOUND;
 }
@@ -200,12 +239,17 @@ void wxToolbook::SetImageList(wxImageList *imageList)
 // selection
 // ----------------------------------------------------------------------------
 
-wxBookCtrlEvent* wxToolbook::CreatePageChangingEvent() const
+int wxToolbook::GetSelection() const
 {
-    return new wxBookCtrlEvent(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId);
+    return m_selection;
 }
 
-void wxToolbook::MakeChangedEvent(wxBookCtrlEvent &event)
+wxBookCtrlBaseEvent* wxToolbook::CreatePageChangingEvent() const
+{
+    return new wxToolbookEvent(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, m_windowId);
+}
+
+void wxToolbook::MakeChangedEvent(wxBookCtrlBaseEvent &event)
 {
     event.SetEventType(wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED);
 }
@@ -222,20 +266,23 @@ void wxToolbook::Realize()
 {
     if (m_needsRealizing)
     {
-        m_needsRealizing = false;
-
         GetToolBar()->SetToolBitmapSize(m_maxBitmapSize);
 
+        int remap = wxSystemOptions::GetOptionInt(wxT("msw.remap"));
+        wxSystemOptions::SetOption(wxT("msw.remap"), 0);
         GetToolBar()->Realize();
+        wxSystemOptions::SetOption(wxT("msw.remap"), remap);
     }
 
-    if (m_selection == wxNOT_FOUND)
+    m_needsRealizing = false;
+
+    if (m_selection == -1)
         m_selection = 0;
 
     if (GetPageCount() > 0)
     {
         int sel = m_selection;
-        m_selection = wxNOT_FOUND;
+        m_selection = -1;
         SetSelection(sel);
     }
 
@@ -346,7 +393,7 @@ wxWindow *wxToolbook::DoRemovePage(size_t page)
             int sel = m_selection - 1;
             if (page_count == 1)
                 sel = wxNOT_FOUND;
-            else if ((page_count == 2) || (sel == wxNOT_FOUND))
+            else if ((page_count == 2) || (sel == -1))
                 sel = 0;
 
             // force sel invalid if deleting current page - don't try to hide it
diff --git a/Source/3rd Party/wx/src/generic/treebkg.cpp b/Source/3rd Party/wx/src/generic/treebkg.cpp
index 99885de0c..23f09eccb 100644
--- a/Source/3rd Party/wx/src/generic/treebkg.cpp	
+++ b/Source/3rd Party/wx/src/generic/treebkg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Evgeniy Tarassov, Vadim Zeitlin
 // Modified by:
 // Created:     2005-09-15
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: treebkg.cpp 54645 2008-07-15 21:29:10Z JS $
 // Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -46,28 +46,37 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxTreebook, wxBookCtrlBase)
+IMPLEMENT_DYNAMIC_CLASS(wxTreebookEvent, wxNotifyEvent)
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING,  wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED,   wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, wxBookCtrlEvent );
-wxDEFINE_EVENT( wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED,  wxBookCtrlEvent );
+#if !WXWIN_COMPATIBILITY_EVENT_TYPES
+const wxEventType wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = wxNewEventType();
+const wxEventType wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = wxNewEventType();
+const wxEventType wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED = wxNewEventType();
+const wxEventType wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED = wxNewEventType();
+#endif
 
 BEGIN_EVENT_TABLE(wxTreebook, wxBookCtrlBase)
     EVT_TREE_SEL_CHANGED   (wxID_ANY, wxTreebook::OnTreeSelectionChange)
     EVT_TREE_ITEM_EXPANDED (wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed)
     EVT_TREE_ITEM_COLLAPSED(wxID_ANY, wxTreebook::OnTreeNodeExpandedCollapsed)
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxTreebook)
 END_EVENT_TABLE()
 
 // ============================================================================
 // wxTreebook implementation
 // ============================================================================
 
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxTreebook, wxControl)
+
 // ----------------------------------------------------------------------------
 // wxTreebook creation
 // ----------------------------------------------------------------------------
 
 void wxTreebook::Init()
 {
+    m_container.SetContainerWindow(this);
+
     m_selection =
     m_actualSelection = wxNOT_FOUND;
 }
@@ -95,13 +104,18 @@ wxTreebook::Create(wxWindow *parent,
                             style, wxDefaultValidator, name) )
         return false;
 
+#ifdef __WXMSW__
+    long treeStyle = GetThemedBorderStyle();
+#else
+    long treeStyle = wxBORDER_SUNKEN;
+#endif
     m_bookctrl = new wxTreeCtrl
                  (
                     this,
                     wxID_ANY,
                     wxDefaultPosition,
                     wxDefaultSize,
-                    wxBORDER_THEME |
+                    treeStyle|
                     wxTR_DEFAULT_STYLE |
                     wxTR_HIDE_ROOT |
                     wxTR_SINGLE
@@ -217,7 +231,7 @@ bool wxTreebook::DoAddSubPage(wxWindow *page, const wxString& text, bool bSelect
     wxTreeItemId lastNodeId = tree->GetLastChild(rootId);
 
     wxCHECK_MSG( lastNodeId.IsOk(), false,
-                        wxT("Can't insert sub page when there are no pages") );
+                        _T("Can't insert sub page when there are no pages") );
 
     // now calculate its position (should we save/update it too?)
     size_t newPos = tree->GetCount() -
@@ -556,6 +570,21 @@ bool wxTreebook::SetPageImage(size_t n, int imageId)
     return true;
 }
 
+wxSize wxTreebook::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    const wxSize sizeTree = GetControllerSize();
+
+    wxSize size = sizePage;
+    size.x += sizeTree.x;
+
+    return size;
+}
+
+int wxTreebook::GetSelection() const
+{
+   return m_selection;
+}
+
 int wxTreebook::DoSetSelection(size_t pagePos, int flags)
 {
     wxCHECK_MSG( IS_VALID_PAGE(pagePos), wxNOT_FOUND,
@@ -563,7 +592,7 @@ int wxTreebook::DoSetSelection(size_t pagePos, int flags)
     wxASSERT_MSG( GetPageCount() == DoInternalGetPageCount(),
                   wxT("wxTreebook logic error: m_treeIds and m_pages not in sync!"));
 
-    wxBookCtrlEvent event(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, m_windowId);
+    wxTreebookEvent event(wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, m_windowId);
     const int oldSel = m_selection;
     wxTreeCtrl *tree = GetTreeCtrl();
     bool allowed = false;
@@ -701,7 +730,7 @@ void wxTreebook::OnTreeNodeExpandedCollapsed(wxTreeEvent & event)
     int pagePos = DoInternalFindPageById(nodeId);
     wxCHECK_RET( pagePos != wxNOT_FOUND, wxT("Internal problem in wxTreebook!..") );
 
-    wxBookCtrlEvent ev(GetTreeCtrl()->IsExpanded(nodeId)
+    wxTreebookEvent ev(GetTreeCtrl()->IsExpanded(nodeId)
             ? wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED
             : wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED,
         m_windowId);
diff --git a/Source/3rd Party/wx/src/generic/treectlg.cpp b/Source/3rd Party/wx/src/generic/treectlg.cpp
index ef7f551a0..e00ee5b1e 100644
--- a/Source/3rd Party/wx/src/generic/treectlg.cpp	
+++ b/Source/3rd Party/wx/src/generic/treectlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Modified:    22/10/98 - almost total rewrite, simpler interface (VZ)
-// Id:          $Id$
+// Id:          $Id: treectlg.cpp 67017 2011-02-25 09:37:28Z JS $
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,7 +42,7 @@
 #include "wx/renderer.h"
 
 #ifdef __WXMAC__
-    #include "wx/osx/private.h"
+    #include "wx/mac/private.h"
 #endif
 
 // -----------------------------------------------------------------------------
@@ -51,7 +51,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxGenericTreeItem;
 
-WX_DEFINE_ARRAY_PTR(wxGenericTreeItem *, wxArrayGenericTreeItems);
+WX_DEFINE_EXPORTED_ARRAY_PTR(wxGenericTreeItem *, wxArrayGenericTreeItems);
 
 // ----------------------------------------------------------------------------
 // constants
@@ -61,9 +61,6 @@ static const int NO_IMAGE = -1;
 
 static const int PIXELS_PER_UNIT = 10;
 
-// the margin between the item state image and the item normal image
-static const int MARGIN_BETWEEN_STATE_AND_IMAGE = 2;
-
 // the margin between the item image and the item text
 static const int MARGIN_BETWEEN_IMAGE_AND_TEXT = 4;
 
@@ -77,7 +74,7 @@ class WXDLLEXPORT wxTreeRenameTimer: public wxTimer
 public:
     // start editing the current item after half a second (if the mouse hasn't
     // been clicked/moved)
-    enum { DELAY = 500 };
+    enum { DELAY = 250 };
 
     wxTreeRenameTimer( wxGenericTreeCtrl *owner );
 
@@ -86,7 +83,7 @@ public:
 private:
     wxGenericTreeCtrl *m_owner;
 
-    wxDECLARE_NO_COPY_CLASS(wxTreeRenameTimer);
+    DECLARE_NO_COPY_CLASS(wxTreeRenameTimer)
 };
 
 // control used for in-place edit
@@ -95,7 +92,7 @@ class WXDLLEXPORT wxTreeTextCtrl: public wxTextCtrl
 public:
     wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item);
 
-    void EndEdit( bool discardChanges );
+    void EndEdit(bool discardChanges);
 
     const wxGenericTreeItem* item() const { return m_itemEdited; }
 
@@ -105,7 +102,7 @@ protected:
     void OnKillFocus( wxFocusEvent &event );
 
     bool AcceptChanges();
-    void Finish( bool setfocus );
+    void Finish( bool setfocus = true );
 
 private:
     wxGenericTreeCtrl  *m_owner;
@@ -114,7 +111,7 @@ private:
     bool                m_aboutToFinish;
 
     DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxTreeTextCtrl);
+    DECLARE_NO_COPY_CLASS(wxTreeTextCtrl)
 };
 
 // timer used to clear wxGenericTreeCtrl::m_findPrefix if no key was pressed
@@ -132,7 +129,7 @@ public:
 private:
     wxGenericTreeCtrl *m_owner;
 
-    wxDECLARE_NO_COPY_CLASS(wxTreeFindTimer);
+    DECLARE_NO_COPY_CLASS(wxTreeFindTimer)
 };
 
 // a tree item
@@ -140,8 +137,7 @@ class WXDLLEXPORT wxGenericTreeItem
 {
 public:
     // ctors & dtor
-    wxGenericTreeItem()
-    {
+    wxGenericTreeItem() {
         m_data = NULL;
         m_widthText =
         m_heightText = -1;
@@ -162,7 +158,6 @@ public:
     int GetImage(wxTreeItemIcon which = wxTreeItemIcon_Normal) const
         { return m_images[which]; }
     wxTreeItemData *GetData() const { return m_data; }
-    int GetState() const { return m_state; }
 
     // returns the current image for the item (depending on its
     // selected/expanded/whatever state)
@@ -182,7 +177,6 @@ public:
     }
 
     void SetData(wxTreeItemData *data) { m_data = data; }
-    void SetState(int state) { m_state = state; m_width = 0; }
 
     void SetHasPlus(bool has = true) { m_hasPlus = has; }
 
@@ -200,18 +194,18 @@ public:
     void SetY(int y) { m_y = y; }
 
     int GetHeight() const { return m_height; }
-    int GetWidth() const { return m_width; }
+    int GetWidth()  const { return m_width; }
 
     int GetTextHeight() const
     {
-        wxASSERT_MSG( m_heightText != -1, "must call CalculateSize() first" );
+        wxASSERT_MSG( m_heightText != -1, _T("must call CalculateSize() first") );
 
         return m_heightText;
     }
 
     int GetTextWidth() const
     {
-        wxASSERT_MSG( m_widthText != -1, "must call CalculateSize() first" );
+        wxASSERT_MSG( m_widthText != -1, _T("must call CalculateSize() first") );
 
         return m_widthText;
     }
@@ -261,9 +255,9 @@ public:
     void RecursiveResetSize();
     void RecursiveResetTextSize();
 
-        // return the item at given position (or NULL if no item), onButton is
-        // true if the point belongs to the item's button, otherwise it lies
-        // on the item's label
+    // return the item at given position (or NULL if no item), onButton is
+    // true if the point belongs to the item's button, otherwise it lies
+    // on the item's label
     wxGenericTreeItem *HitTest( const wxPoint& point,
                                 const wxGenericTreeCtrl *,
                                 int &flags,
@@ -331,8 +325,6 @@ private:
 
     wxTreeItemData     *m_data;         // user-provided data
 
-    int                 m_state;        // item state
-
     wxArrayGenericTreeItems m_children; // list of children
     wxGenericTreeItem  *m_parent;       // parent of this item
 
@@ -355,7 +347,7 @@ private:
     unsigned int        m_isBold      :1; // render the label in bold font
     unsigned int        m_ownsAttr    :1; // delete attribute when done
 
-    wxDECLARE_NO_COPY_CLASS(wxGenericTreeItem);
+    DECLARE_NO_COPY_CLASS(wxGenericTreeItem)
 };
 
 // =============================================================================
@@ -381,8 +373,7 @@ static void EventFlagsToSelType(long style,
 }
 
 // check if the given item is under another one
-static bool
-IsDescendantOf(const wxGenericTreeItem *parent, const wxGenericTreeItem *item)
+static bool IsDescendantOf(const wxGenericTreeItem *parent, const wxGenericTreeItem *item)
 {
     while ( item )
     {
@@ -429,32 +420,45 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
     m_owner = owner;
     m_aboutToFinish = false;
 
-    wxRect rect;
-    m_owner->GetBoundingRect(m_itemEdited, rect, true);
+    int w = m_itemEdited->GetWidth(),
+        h = m_itemEdited->GetHeight();
 
-    // corrects position and size for better appearance
-#ifdef __WXMSW__
-    rect.x -= 5;
-    rect.width += 10;
-#elif defined(__WXGTK__)
-    rect.x -= 5;
-    rect.y -= 2;
-    rect.width  += 8;
-    rect.height += 4;
-#elif defined(wxOSX_USE_CARBON) && wxOSX_USE_CARBON
-    int bestHeight = GetBestSize().y - 8;
-    if ( rect.height > bestHeight )
+    int x, y;
+    m_owner->CalcScrolledPosition(item->GetX(), item->GetY(), &x, &y);
+
+    int image_h = 0,
+        image_w = 0;
+
+    int image = item->GetCurrentImage();
+    if ( image != NO_IMAGE )
     {
-        int diff = rect.height - bestHeight;
-        rect.height -= diff;
-        rect.y += diff / 2;
+        if ( m_owner->m_imageListNormal )
+        {
+            m_owner->m_imageListNormal->GetSize( image, image_w, image_h );
+            image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
+        }
+        else
+        {
+            wxFAIL_MSG(_T("you must create an image list to use images!"));
+        }
     }
-#endif // platforms
+
+    // FIXME: what are all these hardcoded 4, 8 and 11s really?
+    x += image_w;
+    w -= image_w + 4;
+#ifdef __WXMAC__
+    wxSize bs = DoGetBestSize() ;
+    // edit control height
+    if ( h > bs.y - 8 )
+    {
+        int diff = h - ( bs.y - 8 ) ;
+        h -= diff ;
+        y += diff / 2 ;
+    }
+#endif
 
     (void)Create(m_owner, wxID_ANY, m_startValue,
-                 rect.GetPosition(), rect.GetSize());
-
-    SetSelection(-1, -1);
+                 wxPoint(x - 4, y - 4), wxSize(w + 11, h + 8));
 }
 
 void wxTreeTextCtrl::EndEdit(bool discardChanges)
@@ -465,7 +469,7 @@ void wxTreeTextCtrl::EndEdit(bool discardChanges)
     {
         m_owner->OnRenameCancelled(m_itemEdited);
 
-        Finish( true );
+        Finish();
     }
     else
     {
@@ -473,7 +477,7 @@ void wxTreeTextCtrl::EndEdit(bool discardChanges)
         AcceptChanges();
 
         // Even if vetoed, close the control (consistent with MSW)
-        Finish( true );
+        Finish();
     }
 }
 
@@ -541,7 +545,7 @@ void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event )
         wxPoint myPos = GetPosition();
         wxSize mySize = GetSize();
         int sx, sy;
-        GetTextExtent(GetValue() + wxT("M"), &sx, &sy);
+        GetTextExtent(GetValue() + _T("M"), &sx, &sy);
         if (myPos.x + sx > parentSize.x)
             sx = parentSize.x - myPos.x;
         if (mySize.x > sx)
@@ -582,7 +586,6 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
     m_images[wxTreeItemIcon_SelectedExpanded] = NO_IMAGE;
 
     m_data = data;
-    m_state = wxTREE_ITEMSTATE_NONE;
     m_x = m_y = 0;
 
     m_isCollapsed = true;
@@ -592,7 +595,7 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
 
     m_parent = parent;
 
-    m_attr = NULL;
+    m_attr = (wxTreeItemAttr *)NULL;
     m_ownsAttr = false;
 
     // We don't know the height here yet.
@@ -610,12 +613,12 @@ wxGenericTreeItem::~wxGenericTreeItem()
     if (m_ownsAttr) delete m_attr;
 
     wxASSERT_MSG( m_children.IsEmpty(),
-                  "must call DeleteChildren() before deleting the item" );
+                  wxT("please call DeleteChildren() before deleting the item") );
 }
 
 void wxGenericTreeItem::DeleteChildren(wxGenericTreeCtrl *tree)
 {
-    size_t count = m_children.GetCount();
+    size_t count = m_children.Count();
     for ( size_t n = 0; n < count; n++ )
     {
         wxGenericTreeItem *child = m_children[n];
@@ -632,7 +635,7 @@ void wxGenericTreeItem::DeleteChildren(wxGenericTreeCtrl *tree)
 
 size_t wxGenericTreeItem::GetChildrenCount(bool recursively) const
 {
-    size_t count = m_children.GetCount();
+    size_t count = m_children.Count();
     if ( !recursively )
         return count;
 
@@ -655,7 +658,7 @@ void wxGenericTreeItem::GetSize( int &x, int &y,
 
     if (IsExpanded())
     {
-        size_t count = m_children.GetCount();
+        size_t count = m_children.Count();
         for ( size_t n = 0; n < count; ++n )
         {
             m_children[n]->GetSize( x, y, theButton );
@@ -706,29 +709,10 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest(const wxPoint& point,
 
                 // assuming every image (normal and selected) has the same size!
                 if ( (GetImage() != NO_IMAGE) && theCtrl->m_imageListNormal )
-                {
                     theCtrl->m_imageListNormal->GetSize(GetImage(),
                                                         image_w, image_h);
-                }
 
-                int state_w = -1;
-                int state_h;
-
-                if ( (GetState() != wxTREE_ITEMSTATE_NONE) &&
-                        theCtrl->m_imageListState )
-                {
-                    theCtrl->m_imageListState->GetSize(GetState(),
-                                                       state_w, state_h);
-                }
-
-                if ((state_w != -1) && (point.x <= m_x + state_w + 1))
-                    flags |= wxTREE_HITTEST_ONITEMSTATEICON;
-                else if ((image_w != -1) &&
-                         (point.x <= m_x +
-                            (state_w != -1 ? state_w +
-                                                MARGIN_BETWEEN_STATE_AND_IMAGE
-                                           : 0)
-                                            + image_w + 1))
+                if ((image_w != -1) && (point.x <= m_x + image_w + 1))
                     flags |= wxTREE_HITTEST_ONITEMICON;
                 else
                     flags |= wxTREE_HITTEST_ONITEMLABEL;
@@ -745,11 +729,11 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest(const wxPoint& point,
         }
 
         // if children are expanded, fall through to evaluate them
-        if (m_isCollapsed) return NULL;
+        if (m_isCollapsed) return (wxGenericTreeItem*) NULL;
     }
 
     // evaluate children
-    size_t count = m_children.GetCount();
+    size_t count = m_children.Count();
     for ( size_t n = 0; n < count; n++ )
     {
         wxGenericTreeItem *res = m_children[n]->HitTest( point,
@@ -760,7 +744,7 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest(const wxPoint& point,
             return res;
     }
 
-    return NULL;
+    return (wxGenericTreeItem*) NULL;
 }
 
 int wxGenericTreeItem::GetCurrentImage() const
@@ -840,27 +824,19 @@ wxGenericTreeItem::DoCalculateSize(wxGenericTreeCtrl* control,
 
     int text_h = m_heightText + 2;
 
-    int image_h = 0, image_w = 0;
+    int image_h = 0;
+    int image_w = 0;
     int image = GetCurrentImage();
-    if ( image != NO_IMAGE && control->m_imageListNormal )
+    if ( image != NO_IMAGE )
     {
-        control->m_imageListNormal->GetSize(image, image_w, image_h);
-        image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
+        if ( control->m_imageListNormal )
+        {
+            control->m_imageListNormal->GetSize( image, image_w, image_h );
+            image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
+        }
     }
 
-    int state_h = 0, state_w = 0;
-    int state = GetState();
-    if ( state != wxTREE_ITEMSTATE_NONE && control->m_imageListState )
-    {
-        control->m_imageListState->GetSize(state, state_w, state_h);
-        if ( image_w != 0 )
-            state_w += MARGIN_BETWEEN_STATE_AND_IMAGE;
-        else
-            state_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
-    }
-
-    int img_h = wxMax(state_h, image_h);
-    m_height = wxMax(img_h, text_h);
+    m_height = (image_h > text_h) ? image_h : text_h;
 
     if (m_height < 30)
         m_height += 2;            // at least 2 pixels
@@ -870,7 +846,7 @@ wxGenericTreeItem::DoCalculateSize(wxGenericTreeCtrl* control,
     if (m_height > control->m_lineHeight)
         control->m_lineHeight = m_height;
 
-    m_width = state_w + image_w + m_widthText + 2;
+    m_width = image_w + m_widthText + 2;
 }
 
 void wxGenericTreeItem::RecursiveResetSize()
@@ -902,13 +878,21 @@ BEGIN_EVENT_TABLE(wxGenericTreeCtrl, wxTreeCtrlBase)
     EVT_PAINT          (wxGenericTreeCtrl::OnPaint)
     EVT_SIZE           (wxGenericTreeCtrl::OnSize)
     EVT_MOUSE_EVENTS   (wxGenericTreeCtrl::OnMouse)
-    EVT_KEY_DOWN       (wxGenericTreeCtrl::OnKeyDown)
     EVT_CHAR           (wxGenericTreeCtrl::OnChar)
     EVT_SET_FOCUS      (wxGenericTreeCtrl::OnSetFocus)
     EVT_KILL_FOCUS     (wxGenericTreeCtrl::OnKillFocus)
     EVT_TREE_ITEM_GETTOOLTIP(wxID_ANY, wxGenericTreeCtrl::OnGetToolTip)
 END_EVENT_TABLE()
 
+#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
+/*
+ * wxTreeCtrl has to be a real class or we have problems with
+ * the run-time information.
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxGenericTreeCtrl)
+#endif
+
 // -----------------------------------------------------------------------------
 // construction/destruction
 // -----------------------------------------------------------------------------
@@ -918,7 +902,7 @@ void wxGenericTreeCtrl::Init()
     m_current =
     m_key_current =
     m_anchor =
-    m_select_me = NULL;
+    m_select_me = (wxGenericTreeItem *) NULL;
     m_hasFocus = false;
     m_dirty = false;
 
@@ -932,7 +916,7 @@ void wxGenericTreeCtrl::Init()
                             (
                                 wxSYS_COLOUR_HIGHLIGHT
                             ),
-                            wxBRUSHSTYLE_SOLID
+                            wxSOLID
                          );
 
     m_hilightUnfocusedBrush = new wxBrush
@@ -941,7 +925,7 @@ void wxGenericTreeCtrl::Init()
                                  (
                                      wxSYS_COLOUR_BTNSHADOW
                                  ),
-                                 wxBRUSHSTYLE_SOLID
+                                 wxSOLID
                               );
 
     m_imageListButtons = NULL;
@@ -954,22 +938,26 @@ void wxGenericTreeCtrl::Init()
     m_textCtrl = NULL;
 
     m_renameTimer = NULL;
+    m_freezeCount = 0;
 
     m_findTimer = NULL;
 
     m_dropEffectAboveItem = false;
 
-    m_dndEffect = NoEffect;
-    m_dndEffectItem = NULL;
-
     m_lastOnSame = false;
 
-#if defined( __WXMAC__ )
-    m_normalFont = wxFont(wxOSX_SYSTEM_FONT_VIEWS);
+#ifdef __WXMAC_CARBON__
+    m_normalFont.MacCreateThemeFont( kThemeViewsFont ) ;
 #else
     m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
 #endif
-    m_boldFont = m_normalFont.Bold();
+    m_boldFont = wxFont(m_normalFont.GetPointSize(),
+                        m_normalFont.GetFamily(),
+                        m_normalFont.GetStyle(),
+                        wxBOLD,
+                        m_normalFont.GetUnderlined(),
+                        m_normalFont.GetFaceName(),
+                        m_normalFont.GetEncoding());
 }
 
 bool wxGenericTreeCtrl::Create(wxWindow *parent,
@@ -981,23 +969,24 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
                                const wxString& name )
 {
 #ifdef __WXMAC__
-    int major, minor;
-    wxGetOsVersion(&major, &minor);
+    int major,minor;
+    wxGetOsVersion( &major, &minor );
 
+    style &= ~wxTR_LINES_AT_ROOT;
+    style |= wxTR_NO_LINES;
     if (major < 10)
         style |= wxTR_ROW_LINES;
 
-    if (style & wxTR_HAS_BUTTONS)
-        style |= wxTR_NO_LINES;
-#endif // __WXMAC__
+    if (style == 0 || style & wxTR_DEFAULT_STYLE)
+        style |= wxTR_FULL_ROW_HIGHLIGHT;
 
+#endif // __WXMAC__
 #ifdef __WXGTK20__
-    if (style & wxTR_HAS_BUTTONS)
-        style |= wxTR_NO_LINES;
+    style |= wxTR_NO_LINES;
 #endif
 
     if ( !wxControl::Create( parent, id, pos, size,
-                             style|wxHSCROLL|wxVSCROLL|wxWANTS_CHARS,
+                             style|wxHSCROLL|wxVSCROLL,
                              validator,
                              name ) )
         return false;
@@ -1017,14 +1006,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
     if (!m_hasFont)
         SetOwnFont(attr.font);
 
-    // this is a misnomer: it's called "dotted pen" but uses (default) wxSOLID
-    // style because we apparently get performance problems when using dotted
-    // pen for drawing in some ports -- but under MSW it seems to work fine
-#ifdef __WXMSW__
-    m_dottedPen = wxPen(*wxLIGHT_GREY, 0, wxPENSTYLE_DOT);
-#else
-    m_dottedPen = *wxGREY_PEN;
-#endif
+    m_dottedPen = wxPen( wxT("grey"), 0, 0 );
 
     SetInitialSize(size);
 
@@ -1126,14 +1108,6 @@ wxTreeItemData *wxGenericTreeCtrl::GetItemData(const wxTreeItemId& item) const
     return ((wxGenericTreeItem*) item.m_pItem)->GetData();
 }
 
-int wxGenericTreeCtrl::DoGetItemState(const wxTreeItemId& item) const
-{
-    wxCHECK_MSG( item.IsOk(), wxTREE_ITEMSTATE_NONE, wxT("invalid tree item") );
-
-    wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
-    return pItem->GetState();
-}
-
 wxColour wxGenericTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
 {
     wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") );
@@ -1142,8 +1116,7 @@ wxColour wxGenericTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
     return pItem->Attr().GetTextColour();
 }
 
-wxColour
-wxGenericTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
+wxColour wxGenericTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
 {
     wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") );
 
@@ -1159,8 +1132,7 @@ wxFont wxGenericTreeCtrl::GetItemFont(const wxTreeItemId& item) const
     return pItem->Attr().GetFont();
 }
 
-void
-wxGenericTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
+void wxGenericTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
     wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
 
@@ -1182,8 +1154,7 @@ void wxGenericTreeCtrl::SetItemImage(const wxTreeItemId& item,
     RefreshLine(pItem);
 }
 
-void
-wxGenericTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
+void wxGenericTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {
     wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
 
@@ -1193,16 +1164,6 @@ wxGenericTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
     ((wxGenericTreeItem*) item.m_pItem)->SetData(data);
 }
 
-void wxGenericTreeCtrl::DoSetItemState(const wxTreeItemId& item, int state)
-{
-    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
-
-    wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
-    pItem->SetState(state);
-    pItem->CalculateSize(this);
-    RefreshLine(pItem);
-}
-
 void wxGenericTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 {
     wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
@@ -1225,7 +1186,6 @@ void wxGenericTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
         // recalculate the item size as bold and non bold fonts have different
         // widths
         pItem->CalculateSize(this);
-        RefreshLine(pItem);
     }
 }
 
@@ -1268,8 +1228,7 @@ void wxGenericTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
     RefreshLine(pItem);
 }
 
-void
-wxGenericTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
+void wxGenericTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
 {
     wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
 
@@ -1284,8 +1243,14 @@ bool wxGenericTreeCtrl::SetFont( const wxFont &font )
 {
     wxTreeCtrlBase::SetFont(font);
 
-    m_normalFont = font;
-    m_boldFont = m_normalFont.Bold();
+    m_normalFont = font ;
+    m_boldFont = wxFont(m_normalFont.GetPointSize(),
+                        m_normalFont.GetFamily(),
+                        m_normalFont.GetStyle(),
+                        wxBOLD,
+                        m_normalFont.GetUnderlined(),
+                        m_normalFont.GetFaceName(),
+                        m_normalFont.GetEncoding());
 
     if (m_anchor)
         m_anchor->RecursiveResetTextSize();
@@ -1388,13 +1353,12 @@ wxTreeItemId wxGenericTreeCtrl::GetNextChild(const wxTreeItemId& item,
 {
     wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
 
-    wxArrayGenericTreeItems&
-        children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
+    wxArrayGenericTreeItems& children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
 
     // it's ok to cast cookie to size_t, we never have indices big enough to
     // overflow "void *"
     size_t *pIndex = (size_t *)&cookie;
-    if ( *pIndex < children.GetCount() )
+    if ( *pIndex < children.Count() )
     {
         return children.Item((*pIndex)++);
     }
@@ -1405,13 +1369,42 @@ wxTreeItemId wxGenericTreeCtrl::GetNextChild(const wxTreeItemId& item,
     }
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
+wxTreeItemId wxGenericTreeCtrl::GetFirstChild(const wxTreeItemId& item,
+                                              long& cookie) const
+{
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
+    cookie = 0;
+    return GetNextChild(item, cookie);
+}
+
+wxTreeItemId wxGenericTreeCtrl::GetNextChild(const wxTreeItemId& item,
+                                             long& cookie) const
+{
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
+    wxArrayGenericTreeItems& children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
+    if ( (size_t)cookie < children.Count() )
+    {
+        return children.Item((size_t)cookie++);
+    }
+    else
+    {
+        // there are no more of them
+        return wxTreeItemId();
+    }
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
 wxTreeItemId wxGenericTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 {
     wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
 
-    wxArrayGenericTreeItems&
-        children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
-    return children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last());
+    wxArrayGenericTreeItems& children = ((wxGenericTreeItem*) item.m_pItem)->GetChildren();
+    return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()));
 }
 
 wxTreeItemId wxGenericTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
@@ -1431,8 +1424,7 @@ wxTreeItemId wxGenericTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
     wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?
 
     size_t n = (size_t)(index + 1);
-    return n == siblings.GetCount() ? wxTreeItemId()
-                                    : wxTreeItemId(siblings[n]);
+    return n == siblings.Count() ? wxTreeItemId() : wxTreeItemId(siblings[n]);
 }
 
 wxTreeItemId wxGenericTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
@@ -1484,16 +1476,16 @@ wxTreeItemId wxGenericTreeCtrl::GetNext(const wxTreeItemId& item) const
 
 wxTreeItemId wxGenericTreeCtrl::GetFirstVisibleItem() const
 {
-    wxTreeItemId itemid = GetRootItem();
-    if (!itemid.IsOk())
-        return itemid;
+    wxTreeItemId id = GetRootItem();
+    if (!id.IsOk())
+        return id;
 
     do
     {
-        if (IsVisible(itemid))
-              return itemid;
-        itemid = GetNext(itemid);
-    } while (itemid.IsOk());
+        if (IsVisible(id))
+              return id;
+        id = GetNext(id);
+    } while (id.IsOk());
 
     return wxTreeItemId();
 }
@@ -1501,7 +1493,6 @@ wxTreeItemId wxGenericTreeCtrl::GetFirstVisibleItem() const
 wxTreeItemId wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
     wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
-    wxASSERT_MSG( IsVisible(item), wxT("this item itself should be visible") );
 
     wxTreeItemId id = item;
     if (id.IsOk())
@@ -1518,37 +1509,10 @@ wxTreeItemId wxGenericTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 wxTreeItemId wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {
     wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
-    wxASSERT_MSG( IsVisible(item), wxT("this item itself should be visible") );
 
-    // find out the starting point
-    wxTreeItemId prevItem = GetPrevSibling(item);
-    if ( !prevItem.IsOk() )
-    {
-        prevItem = GetItemParent(item);
-    }
+    wxFAIL_MSG(wxT("not implemented"));
 
-    // find the first visible item after it
-    while ( prevItem.IsOk() && !IsVisible(prevItem) )
-    {
-        prevItem = GetNext(prevItem);
-        if ( !prevItem.IsOk() || prevItem == item )
-        {
-            // there are no visible items before item
-            return wxTreeItemId();
-        }
-    }
-
-    // from there we must be able to navigate until this item
-    while ( prevItem.IsOk() )
-    {
-        const wxTreeItemId nextItem = GetNextVisible(prevItem);
-        if ( !nextItem.IsOk() || nextItem == item )
-            break;
-
-        prevItem = nextItem;
-    }
-
-    return prevItem;
+    return wxTreeItemId();
 }
 
 // called by wxTextTreeCtrl when it marks itself for deletion
@@ -1570,40 +1534,39 @@ wxTreeItemId wxGenericTreeCtrl::FindItem(const wxTreeItemId& idParent,
     // allows to switch between two items starting with the same letter just by
     // pressing it) but we shouldn't jump to the next one if the user is
     // continuing to type as otherwise he might easily skip the item he wanted
-    wxTreeItemId itemid = idParent;
+    wxTreeItemId id = idParent;
     if ( prefix.length() == 1 )
     {
-        itemid = GetNext(itemid);
+        id = GetNext(id);
     }
 
     // look for the item starting with the given prefix after it
-    while ( itemid.IsOk() && !GetItemText(itemid).Lower().StartsWith(prefix) )
+    while ( id.IsOk() && !GetItemText(id).Lower().StartsWith(prefix) )
     {
-        itemid = GetNext(itemid);
+        id = GetNext(id);
     }
 
     // if we haven't found anything...
-    if ( !itemid.IsOk() )
+    if ( !id.IsOk() )
     {
         // ... wrap to the beginning
-        itemid = GetRootItem();
+        id = GetRootItem();
         if ( HasFlag(wxTR_HIDE_ROOT) )
         {
             // can't select virtual root
-            itemid = GetNext(itemid);
+            id = GetNext(id);
         }
 
         // and try all the items (stop when we get to the one we started from)
-        while ( itemid.IsOk() && itemid != idParent &&
-                    !GetItemText(itemid).Lower().StartsWith(prefix) )
+        while (id.IsOk() && id != idParent && !GetItemText(id).Lower().StartsWith(prefix) )
         {
-            itemid = GetNext(itemid);
+            id = GetNext(id);
         }
         // If we haven't found the item, id.IsOk() will be false, as per
         // documentation
     }
 
-    return itemid;
+    return id;
 }
 
 // -----------------------------------------------------------------------------
@@ -1646,11 +1609,11 @@ wxTreeItemId wxGenericTreeCtrl::AddRoot(const wxString& text,
                                         int selImage,
                                         wxTreeItemData *data)
 {
-    wxCHECK_MSG( !m_anchor, wxTreeItemId(), "tree can have only one root" );
+    wxCHECK_MSG( !m_anchor, wxTreeItemId(), wxT("tree can have only one root") );
 
     m_dirty = true;     // do this first so stuff below doesn't cause flicker
 
-    m_anchor = new wxGenericTreeItem(NULL, text,
+    m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text,
                                    image, selImage, data);
     if ( data != NULL )
     {
@@ -1663,8 +1626,8 @@ wxTreeItemId wxGenericTreeCtrl::AddRoot(const wxString& text,
         // into children
         m_anchor->SetHasPlus();
         m_anchor->Expand();
-        CalculatePositions();
     }
+    CalculatePositions();
 
     if (!HasFlag(wxTR_MULTIPLE))
     {
@@ -1692,11 +1655,9 @@ wxTreeItemId wxGenericTreeCtrl::DoInsertAfter(const wxTreeItemId& parentId,
     int index = -1;
     if (idPrevious.IsOk())
     {
-        index = parent->GetChildren().Index(
-                    (wxGenericTreeItem*) idPrevious.m_pItem);
+        index = parent->GetChildren().Index((wxGenericTreeItem*) idPrevious.m_pItem);
         wxASSERT_MSG( index != wxNOT_FOUND,
-                      "previous item in wxGenericTreeCtrl::InsertItem() "
-                      "is not a sibling" );
+                      wxT("previous item in wxGenericTreeCtrl::InsertItem() is not a sibling") );
     }
 
     return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
@@ -1706,30 +1667,22 @@ wxTreeItemId wxGenericTreeCtrl::DoInsertAfter(const wxTreeItemId& parentId,
 void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
 {
     wxTreeEvent event(wxEVT_COMMAND_TREE_DELETE_ITEM, this, item);
-    GetEventHandler()->ProcessEvent( event );
+    ProcessEvent( event );
 }
 
 // Don't leave edit or selection on a child which is about to disappear
 void wxGenericTreeCtrl::ChildrenClosing(wxGenericTreeItem* item)
 {
-    if ( m_textCtrl && item != m_textCtrl->item() &&
-            IsDescendantOf(item, m_textCtrl->item()) )
-    {
+    if (m_textCtrl != NULL && item != m_textCtrl->item() && IsDescendantOf(item, m_textCtrl->item())) {
         m_textCtrl->EndEdit( true );
     }
-
-    if ( item != m_key_current && IsDescendantOf(item, m_key_current) )
-    {
+    if (item != m_key_current && IsDescendantOf(item, m_key_current)) {
         m_key_current = NULL;
     }
-
-    if ( IsDescendantOf(item, m_select_me) )
-    {
+    if (IsDescendantOf(item, m_select_me)) {
         m_select_me = item;
     }
-
-    if ( item != m_current && IsDescendantOf(item, m_current) )
-    {
+    if (item != m_current && IsDescendantOf(item, m_current)) {
         m_current->SetHilight( false );
         m_current = NULL;
         m_select_me = item;
@@ -1760,16 +1713,6 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
 
     wxGenericTreeItem *parent = item->GetParent();
 
-    // if the selected item will be deleted, select the parent ...
-    wxGenericTreeItem *to_be_selected = parent;
-    if (parent)
-    {
-        // .. unless there is a next sibling like wxMSW does it
-        int pos = parent->GetChildren().Index( item );
-        if ((int)(parent->GetChildren().GetCount()) > pos+1)
-            to_be_selected = parent->GetChildren().Item( pos+1 );
-    }
-
     // don't keep stale pointers around!
     if ( IsDescendantOf(item, m_key_current) )
     {
@@ -1785,7 +1728,7 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
     // a different item, in idle time.
     if ( m_select_me && IsDescendantOf(item, m_select_me) )
     {
-        m_select_me = to_be_selected;
+        m_select_me = parent;
     }
 
     if ( IsDescendantOf(item, m_current) )
@@ -1796,7 +1739,7 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
 
         // m_current = parent;
         m_current = NULL;
-        m_select_me = to_be_selected;
+        m_select_me = parent;
     }
 
     // remove the item from the tree
@@ -1834,9 +1777,9 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
 {
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
 
-    wxCHECK_RET( item, wxT("invalid item in wxGenericTreeCtrl::Expand") );
+    wxCHECK_RET( item, _T("invalid item in wxGenericTreeCtrl::Expand") );
     wxCHECK_RET( !HasFlag(wxTR_HIDE_ROOT) || itemId != GetRootItem(),
-                 wxT("can't expand hidden root") );
+                 _T("can't expand hidden root") );
 
     if ( !item->HasPlus() )
         return;
@@ -1846,32 +1789,25 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
 
     wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_EXPANDING, this, item);
 
-    if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
+    if ( ProcessEvent( event ) && !event.IsAllowed() )
     {
         // cancelled by program
         return;
     }
 
     item->Expand();
-    if ( !IsFrozen() )
-    {
-        CalculatePositions();
+    CalculatePositions();
 
-        RefreshSubtree(item);
-    }
-    else // frozen
-    {
-        m_dirty = true;
-    }
+    RefreshSubtree(item);
 
     event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
-    GetEventHandler()->ProcessEvent( event );
+    ProcessEvent( event );
 }
 
 void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
 {
     wxCHECK_RET( !HasFlag(wxTR_HIDE_ROOT) || itemId != GetRootItem(),
-                 wxT("can't collapse hidden root") );
+                 _T("can't collapse hidden root") );
 
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
 
@@ -1879,7 +1815,7 @@ void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
         return;
 
     wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, this, item);
-    if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
+    if ( ProcessEvent( event ) && !event.IsAllowed() )
     {
         // cancelled by program
         return;
@@ -1890,7 +1826,7 @@ void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
 
 #if 0  // TODO why should items be collapsed recursively?
     wxArrayGenericTreeItems& children = item->GetChildren();
-    size_t count = children.GetCount();
+    size_t count = children.Count();
     for ( size_t n = 0; n < count; n++ )
     {
         Collapse(children[n]);
@@ -1902,7 +1838,7 @@ void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
     RefreshSubtree(item);
 
     event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
-    GetEventHandler()->ProcessEvent( event );
+    ProcessEvent( event );
 }
 
 void wxGenericTreeCtrl::CollapseAndReset(const wxTreeItemId& item)
@@ -1933,20 +1869,6 @@ void wxGenericTreeCtrl::Unselect()
     }
 }
 
-void wxGenericTreeCtrl::ClearFocusedItem()
-{
-    wxTreeItemId item = GetFocusedItem();
-    if ( item.IsOk() )
-        SelectItem(item, false);
-}
-
-void wxGenericTreeCtrl::SetFocusedItem(const wxTreeItemId& item)
-{
-    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
-
-    SelectItem(item, true);
-}
-
 void wxGenericTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item)
 {
     if (item->IsSelected())
@@ -1958,7 +1880,7 @@ void wxGenericTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item)
     if (item->HasChildren())
     {
         wxArrayGenericTreeItems& children = item->GetChildren();
-        size_t count = children.GetCount();
+        size_t count = children.Count();
         for ( size_t n = 0; n < count; ++n )
         {
             UnselectAllChildren(children[n]);
@@ -1977,52 +1899,13 @@ void wxGenericTreeCtrl::UnselectAll()
     }
 }
 
-void wxGenericTreeCtrl::SelectChildren(const wxTreeItemId& parent)
-{
-    wxCHECK_RET( HasFlag(wxTR_MULTIPLE),
-                 "this only works with multiple selection controls" );
-
-    UnselectAll();
-
-    if ( !HasChildren(parent) )
-        return;
-
-
-    wxArrayGenericTreeItems&
-        children = ((wxGenericTreeItem*) parent.m_pItem)->GetChildren();
-    size_t count = children.GetCount();
-
-    wxGenericTreeItem *
-        item = (wxGenericTreeItem*) ((wxTreeItemId)children[0]).m_pItem;
-    wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
-    event.m_itemOld = m_current;
-
-    if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
-        return;
-
-    for ( size_t n = 0; n < count; ++n )
-    {
-        m_current = m_key_current = children[n];
-        m_current->SetHilight(true);
-        RefreshSelected();
-    }
-
-
-    event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
-    GetEventHandler()->ProcessEvent( event );
-}
-
-
 // Recursive function !
 // To stop we must have crt_item<last_item
 // Algorithm :
 // Tag all next children, when no more children,
 // Move to parent (not to tag)
 // Keep going... if we found last_item, we stop.
-bool
-wxGenericTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item,
-                                   wxGenericTreeItem *last_item,
-                                   bool select)
+bool wxGenericTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select)
 {
     wxGenericTreeItem *parent = crt_item->GetParent();
 
@@ -2033,20 +1916,16 @@ wxGenericTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item,
     int index = children.Index(crt_item);
     wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?
 
-    size_t count = children.GetCount();
+    size_t count = children.Count();
     for (size_t n=(size_t)(index+1); n<count; ++n)
     {
-        if ( TagAllChildrenUntilLast(children[n], last_item, select) )
-            return true;
+        if (TagAllChildrenUntilLast(children[n], last_item, select)) return true;
     }
 
     return TagNextChildren(parent, last_item, select);
 }
 
-bool
-wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item,
-                                           wxGenericTreeItem *last_item,
-                                           bool select)
+bool wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select)
 {
     crt_item->SetHilight(select);
     RefreshLine(crt_item);
@@ -2054,11 +1933,10 @@ wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item,
     if (crt_item==last_item)
         return true;
 
-    // We should leave the not shown children of collapsed items alone.
-    if (crt_item->HasChildren() && crt_item->IsExpanded())
+    if (crt_item->HasChildren())
     {
         wxArrayGenericTreeItems& children = crt_item->GetChildren();
-        size_t count = children.GetCount();
+        size_t count = children.Count();
         for ( size_t n = 0; n < count; ++n )
         {
             if (TagAllChildrenUntilLast(children[n], last_item, select))
@@ -2069,9 +1947,7 @@ wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item,
   return false;
 }
 
-void
-wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1,
-                                   wxGenericTreeItem *item2)
+void wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)
 {
     m_select_me = NULL;
 
@@ -2146,8 +2022,7 @@ void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId,
     {
         if ( !m_current )
         {
-            m_current =
-            m_key_current = (wxGenericTreeItem*) GetRootItem().m_pItem;
+            m_current = m_key_current = (wxGenericTreeItem*) GetRootItem().m_pItem;
         }
 
         // don't change the mark (m_current)
@@ -2182,7 +2057,7 @@ void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId, bool select)
 
     if ( select )
     {
-        if ( !item->IsSelected() )
+        if (!item->IsSelected())
             DoSelectItem(itemId, !HasFlag(wxTR_MULTIPLE));
     }
     else // deselect
@@ -2224,7 +2099,7 @@ size_t wxGenericTreeCtrl::GetSelections(wxArrayTreeItemIds &array) const
     }
     //else: the tree is empty, so no selections
 
-    return array.GetCount();
+    return array.Count();
 }
 
 void wxGenericTreeCtrl::EnsureVisible(const wxTreeItemId& item)
@@ -2262,42 +2137,56 @@ void wxGenericTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 
 void wxGenericTreeCtrl::ScrollTo(const wxTreeItemId &item)
 {
-    if (!item.IsOk())
-        return;
+    if (!item.IsOk()) return;
 
-    // update the control before scrolling it
+    // We have to call this here because the label in
+    // question might just have been added and no screen
+    // update taken place.
     if (m_dirty)
 #if defined( __WXMSW__ ) || defined(__WXMAC__)
         Update();
 #else
         DoDirtyProcessing();
 #endif
-
     wxGenericTreeItem *gitem = (wxGenericTreeItem*) item.m_pItem;
 
-    int itemY = gitem->GetY();
+    // now scroll to the item
+    int item_y = gitem->GetY();
 
     int start_x = 0;
     int start_y = 0;
     GetViewStart( &start_x, &start_y );
+    start_y *= PIXELS_PER_UNIT;
 
-    const int clientHeight = GetClientSize().y;
+    int client_h = 0;
+    int client_w = 0;
+    GetClientSize( &client_w, &client_h );
 
-    const int itemHeight = GetLineHeight(gitem) + 2;
-
-    if ( itemY + itemHeight > start_y*PIXELS_PER_UNIT + clientHeight )
+    if (item_y < start_y+3)
     {
-        // need to scroll up by enough to show this item fully
-        itemY += itemHeight - clientHeight;
+        // going down
+        int x = 0;
+        int y = 0;
+        m_anchor->GetSize( x, y, this );
+        y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+        x += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+        int x_pos = GetScrollPos( wxHORIZONTAL );
+        // Item should appear at top
+        SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, item_y/PIXELS_PER_UNIT );
     }
-    else if ( itemY > start_y*PIXELS_PER_UNIT )
+    else if (item_y+GetLineHeight(gitem) > start_y+client_h)
     {
-        // item is already fully visible, don't do anything
-        return;
+        // going up
+        int x = 0;
+        int y = 0;
+        m_anchor->GetSize( x, y, this );
+        y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+        x += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+        item_y += PIXELS_PER_UNIT+2;
+        int x_pos = GetScrollPos( wxHORIZONTAL );
+        // Item should appear at bottom
+        SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, (item_y+GetLineHeight(gitem)-client_h)/PIXELS_PER_UNIT );
     }
-    //else: scroll down to make this item the top one displayed
-
-    Scroll(-1, itemY/PIXELS_PER_UNIT);
 }
 
 // FIXME: tree sorting functions are not reentrant and not MT-safe!
@@ -2306,8 +2195,7 @@ static wxGenericTreeCtrl *s_treeBeingSorted = NULL;
 static int LINKAGEMODE tree_ctrl_compare_func(wxGenericTreeItem **item1,
                                   wxGenericTreeItem **item2)
 {
-    wxCHECK_MSG( s_treeBeingSorted, 0,
-                 "bug in wxGenericTreeCtrl::SortChildren()" );
+    wxCHECK_MSG( s_treeBeingSorted, 0, wxT("bug in wxGenericTreeCtrl::SortChildren()") );
 
     return s_treeBeingSorted->OnCompareItems(*item1, *item2);
 }
@@ -2322,7 +2210,7 @@ void wxGenericTreeCtrl::SortChildren(const wxTreeItemId& itemId)
                  wxT("wxGenericTreeCtrl::SortChildren is not reentrant") );
 
     wxArrayGenericTreeItems& children = item->GetChildren();
-    if ( children.GetCount() > 1 )
+    if ( children.Count() > 1 )
     {
         m_dirty = true;
 
@@ -2352,20 +2240,6 @@ void wxGenericTreeCtrl::CalculateLineHeight()
         }
     }
 
-    if ( m_imageListState )
-    {
-        // Calculate a m_lineHeight value from the state Image sizes.
-        // May be toggle off. Then wxGenericTreeCtrl will spread when
-        // necessary (which might look ugly).
-        int n = m_imageListState->GetImageCount();
-        for (int i = 0; i < n ; i++)
-        {
-            int width = 0, height = 0;
-            m_imageListState->GetSize(i, width, height);
-            if (height > m_lineHeight) m_lineHeight = height;
-        }
-    }
-
     if (m_imageListButtons)
     {
         // Calculate a m_lineHeight value from the Button image sizes.
@@ -2407,15 +2281,6 @@ void wxGenericTreeCtrl::SetStateImageList(wxImageList *imageList)
     if (m_ownsImageListState) delete m_imageListState;
     m_imageListState = imageList;
     m_ownsImageListState = false;
-    m_dirty = true;
-
-    if (m_anchor)
-        m_anchor->RecursiveResetSize();
-
-    // Don't do any drawing if we're setting the list to NULL,
-    // since we may be in the process of deleting the tree control.
-    if (imageList)
-        CalculateLineHeight();
 }
 
 void wxGenericTreeCtrl::SetButtonsImageList(wxImageList *imageList)
@@ -2451,9 +2316,7 @@ void wxGenericTreeCtrl::AdjustMyScrollbars()
         x += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
         int x_pos = GetScrollPos( wxHORIZONTAL );
         int y_pos = GetScrollPos( wxVERTICAL );
-        SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT,
-                       x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT,
-                       x_pos, y_pos );
+        SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, y_pos );
     }
     else
     {
@@ -2472,7 +2335,6 @@ int wxGenericTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
 void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 {
     item->SetFont(this, dc);
-    item->CalculateSize(this, dc);
 
     wxCoord text_h = item->GetTextHeight();
 
@@ -2482,7 +2344,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
     {
         if ( m_imageListNormal )
         {
-            m_imageListNormal->GetSize(image, image_w, image_h);
+            m_imageListNormal->GetSize( image, image_w, image_h );
             image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
         }
         else
@@ -2491,24 +2353,6 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         }
     }
 
-    int state_h = 0, state_w = 0;
-    int state = item->GetState();
-    if ( state != wxTREE_ITEMSTATE_NONE )
-    {
-        if ( m_imageListState )
-        {
-            m_imageListState->GetSize(state, state_w, state_h);
-            if ( image_w != 0 )
-                state_w += MARGIN_BETWEEN_STATE_AND_IMAGE;
-            else
-                state_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
-        }
-        else
-        {
-            state = wxTREE_ITEMSTATE_NONE;
-        }
-    }
-
     int total_h = GetLineHeight(item);
     bool drawItemBackground = false,
          hasBgColour = false;
@@ -2532,17 +2376,19 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         {
             colBg = GetBackgroundColour();
         }
-        dc.SetBrush(wxBrush(colBg, wxBRUSHSTYLE_SOLID));
+        dc.SetBrush(wxBrush(colBg, wxSOLID));
     }
 
     int offset = HasFlag(wxTR_ROW_LINES) ? 1 : 0;
 
     if ( HasFlag(wxTR_FULL_ROW_HIGHLIGHT) )
     {
-        int x, w, h;
-        x=0;
+        int x = 0, w = 0, h = 0;
         GetVirtualSize(&w, &h);
         wxRect rect( x, item->GetY()+offset, w, total_h-offset);
+#if !defined(__WXGTK20__) && !defined(__WXMAC__)
+        dc.DrawRectangle(rect);
+#else
         if (!item->IsSelected())
         {
             dc.DrawRectangle(rect);
@@ -2551,30 +2397,26 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         {
             int flags = wxCONTROL_SELECTED;
             if (m_hasFocus
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON // TODO CS
+#ifdef __WXMAC__
                 && IsControlActive( (ControlRef)GetHandle() )
 #endif
             )
                 flags |= wxCONTROL_FOCUSED;
             if ((item == m_current) && (m_hasFocus))
                 flags |= wxCONTROL_CURRENT;
-
-            wxRendererNative::Get().
-                DrawItemSelectionRect(this, dc, rect, flags);
+            wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, flags );
         }
+#endif
     }
-    else // no full row highlight
+    else
     {
-        if ( item->IsSelected() &&
-                (state != wxTREE_ITEMSTATE_NONE || image != NO_IMAGE) )
+        if ( item->IsSelected() && image != NO_IMAGE )
         {
-            // If it's selected, and there's an state image or normal image,
-            // then we should take care to leave the area under the image
-            // painted in the background colour.
-            wxRect rect( item->GetX() + state_w + image_w - 2,
-                         item->GetY() + offset,
-                         item->GetWidth() - state_w - image_w + 2,
-                         total_h - offset );
+            // If it's selected, and there's an image, then we should
+            // take care to leave the area under the image painted in the
+            // background colour.
+            wxRect rect( item->GetX() + image_w - 2, item->GetY()+offset,
+                         item->GetWidth() - image_w + 2, total_h-offset );
 #if !defined(__WXGTK20__) && !defined(__WXMAC__)
             dc.DrawRectangle( rect );
 #else
@@ -2586,8 +2428,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
                 flags |= wxCONTROL_FOCUSED;
             if ((item == m_current) && (m_hasFocus))
                 flags |= wxCONTROL_CURRENT;
-            wxRendererNative::Get().
-                DrawItemSelectionRect(this, dc, rect, flags);
+            wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, flags );
 #endif
         }
         // On GTK+ 2, drawing a 'normal' background is wrong for themes that
@@ -2595,15 +2436,16 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         // except for custom item backgrounds, works for both kinds of theme.
         else if (drawItemBackground)
         {
-            wxRect rect( item->GetX() + state_w + image_w - 2,
-                         item->GetY() + offset,
-                         item->GetWidth() - state_w - image_w + 2,
-                         total_h - offset );
+            wxRect rect( item->GetX()-2, item->GetY()+offset,
+                         item->GetWidth()+2, total_h-offset );
+#if !defined(__WXGTK20__) && !defined(__WXMAC__)
+            dc.DrawRectangle( rect );
+#else
             if ( hasBgColour )
             {
                 dc.DrawRectangle( rect );
             }
-            else // no specific background colour
+            else
             {
                 rect.x -= 1;
                 rect.width += 2;
@@ -2613,86 +2455,34 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
                     flags |= wxCONTROL_FOCUSED;
                 if ((item == m_current) && (m_hasFocus))
                     flags |= wxCONTROL_CURRENT;
-                wxRendererNative::Get().
-                    DrawItemSelectionRect(this, dc, rect, flags);
+                wxRendererNative::Get().DrawItemSelectionRect( this, dc, rect, flags );
             }
+#endif
         }
     }
 
-    if ( state != wxTREE_ITEMSTATE_NONE )
-    {
-        dc.SetClippingRegion( item->GetX(), item->GetY(), state_w, total_h );
-        m_imageListState->Draw( state, dc,
-                                item->GetX(),
-                                item->GetY() +
-                                    (total_h > state_h ? (total_h-state_h)/2
-                                                       : 0),
-                                wxIMAGELIST_DRAW_TRANSPARENT );
-        dc.DestroyClippingRegion();
-    }
-
     if ( image != NO_IMAGE )
     {
-        dc.SetClippingRegion(item->GetX() + state_w, item->GetY(),
-                             image_w, total_h);
+        dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
         m_imageListNormal->Draw( image, dc,
-                                 item->GetX() + state_w,
-                                 item->GetY() +
-                                    (total_h > image_h ? (total_h-image_h)/2
-                                                       : 0),
+                                 item->GetX(),
+                                 item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
                                  wxIMAGELIST_DRAW_TRANSPARENT );
         dc.DestroyClippingRegion();
     }
 
-    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    dc.SetBackgroundMode(wxTRANSPARENT);
     int extraH = (total_h > text_h) ? (total_h - text_h)/2 : 0;
     dc.DrawText( item->GetText(),
-                 (wxCoord)(state_w + image_w + item->GetX()),
+                 (wxCoord)(image_w + item->GetX()),
                  (wxCoord)(item->GetY() + extraH));
 
     // restore normal font
     dc.SetFont( m_normalFont );
-
-    if (item == m_dndEffectItem)
-    {
-        dc.SetPen( *wxBLACK_PEN );
-        // DnD visual effects
-        switch (m_dndEffect)
-        {
-            case BorderEffect:
-            {
-                dc.SetBrush(*wxTRANSPARENT_BRUSH);
-                int w = item->GetWidth() + 2;
-                int h = total_h + 2;
-                dc.DrawRectangle( item->GetX() - 1, item->GetY() - 1, w, h);
-                break;
-            }
-            case AboveEffect:
-            {
-                int x = item->GetX(),
-                    y = item->GetY();
-                dc.DrawLine( x, y, x + item->GetWidth(), y);
-                break;
-            }
-            case BelowEffect:
-            {
-                int x = item->GetX(),
-                    y = item->GetY();
-                y += total_h - 1;
-                dc.DrawLine( x, y, x + item->GetWidth(), y);
-                break;
-            }
-            case NoEffect:
-                break;
-        }
-    }
 }
 
-void
-wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
-                              wxDC &dc,
-                              int level,
-                              int &y)
+// Now y stands for the top of the item, whereas it used to stand for middle !
+void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {
     int x = level*m_indent;
     if (!HasFlag(wxTR_HIDE_ROOT))
@@ -2704,7 +2494,7 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
         // always expand hidden root
         int origY = y;
         wxArrayGenericTreeItems& children = item->GetChildren();
-        int count = children.GetCount();
+        int count = children.Count();
         if (count > 0)
         {
             int n = 0, oldY;
@@ -2713,8 +2503,7 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
                 PaintLevel(children[n], dc, 1, y);
             } while (++n < count);
 
-            if ( !HasFlag(wxTR_NO_LINES) && HasFlag(wxTR_LINES_AT_ROOT)
-                    && count > 0 )
+            if (!HasFlag(wxTR_NO_LINES) && HasFlag(wxTR_LINES_AT_ROOT) && count > 0)
             {
                 // draw line down to last child
                 origY += GetLineHeight(children[0])>>1;
@@ -2748,7 +2537,7 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
 
         wxColour colText;
         if ( item->IsSelected()
-#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON // TODO CS
+#ifdef __WXMAC__
             // On wxMac, if the tree doesn't have the focus we draw an empty
             // rectangle, so we want to make sure that the text is visible
             // against the normal background, not the highlightbackground, so
@@ -2760,10 +2549,10 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
 #ifdef __WXMAC__
             colText = *wxWHITE;
 #else
-            if (m_hasFocus)
-                colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
-            else
-                colText = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT);
+        if (m_hasFocus)
+            colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+        else
+            colText = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT);
 #endif
         }
         else
@@ -2856,7 +2645,7 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
     if (item->IsExpanded())
     {
         wxArrayGenericTreeItems& children = item->GetChildren();
-        int count = children.GetCount();
+        int count = children.Count();
         if (count > 0)
         {
             int n = 0, oldY;
@@ -2872,21 +2661,20 @@ wxGenericTreeCtrl::PaintLevel(wxGenericTreeItem *item,
                 oldY += GetLineHeight(children[n-1])>>1;
                 if (HasButtons()) y_mid += 5;
 
-                // Only draw the portion of the line that is visible, in case
-                // it is huge
+                // Only draw the portion of the line that is visible, in case it is huge
                 wxCoord xOrigin=0, yOrigin=0, width, height;
                 dc.GetDeviceOrigin(&xOrigin, &yOrigin);
                 yOrigin = abs(yOrigin);
                 GetClientSize(&width, &height);
 
-                // Move end points to the beginning/end of the view?
+                // Move end points to the begining/end of the view?
                 if (y_mid < yOrigin)
                     y_mid = yOrigin;
                 if (oldY > yOrigin + height)
                     oldY = yOrigin + height;
 
-                // after the adjustments if y_mid is larger than oldY then the
-                // line isn't visible at all so don't draw anything
+                // after the adjustments if y_mid is larger than oldY then the line
+                // isn't visible at all so don't draw anything
                 if (y_mid < oldY)
                     dc.DrawLine(x, y_mid, x, oldY);
             }
@@ -2910,7 +2698,7 @@ void wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem *item)
             DrawLine(item, !m_dropEffectAboveItem );
         }
 
-        SetCursor(*wxSTANDARD_CURSOR);
+        SetCursor(wxCURSOR_BULLSEYE);
     }
     else
     {
@@ -2921,49 +2709,39 @@ void wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem *item)
 
 void wxGenericTreeCtrl::DrawBorder(const wxTreeItemId &item)
 {
-    wxCHECK_RET( item.IsOk(), "invalid item in wxGenericTreeCtrl::DrawLine" );
+    wxCHECK_RET( item.IsOk(), _T("invalid item in wxGenericTreeCtrl::DrawLine") );
 
     wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
 
-    if (m_dndEffect == NoEffect)
-    {
-        m_dndEffect = BorderEffect;
-        m_dndEffectItem = i;
-    }
-    else
-    {
-        m_dndEffect = NoEffect;
-        m_dndEffectItem = NULL;
-    }
+    wxClientDC dc(this);
+    PrepareDC( dc );
+    dc.SetLogicalFunction(wxINVERT);
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
 
-    wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 );
-    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-    RefreshRect( rect );
+    int w = i->GetWidth() + 2;
+    int h = GetLineHeight(i) + 2;
+
+    dc.DrawRectangle( i->GetX() - 1, i->GetY() - 1, w, h);
 }
 
 void wxGenericTreeCtrl::DrawLine(const wxTreeItemId &item, bool below)
 {
-    wxCHECK_RET( item.IsOk(), "invalid item in wxGenericTreeCtrl::DrawLine" );
+    wxCHECK_RET( item.IsOk(), _T("invalid item in wxGenericTreeCtrl::DrawLine") );
 
     wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
 
-    if (m_dndEffect == NoEffect)
+    wxClientDC dc(this);
+    PrepareDC( dc );
+    dc.SetLogicalFunction(wxINVERT);
+
+    int x = i->GetX(),
+        y = i->GetY();
+    if ( below )
     {
-        if (below)
-            m_dndEffect = BelowEffect;
-        else
-            m_dndEffect = AboveEffect;
-        m_dndEffectItem = i;
-    }
-    else
-    {
-        m_dndEffect = NoEffect;
-        m_dndEffectItem = NULL;
+        y += GetLineHeight(i) - 1;
     }
 
-    wxRect rect( i->GetX()-1, i->GetY()-1, i->GetWidth()+2, GetLineHeight(i)+2 );
-    CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
-    RefreshRect( rect );
+    dc.DrawLine( x, y, x + i->GetWidth(), y);
 }
 
 // -----------------------------------------------------------------------------
@@ -3017,19 +2795,16 @@ void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &event )
     event.Skip();
 }
 
-void wxGenericTreeCtrl::OnKeyDown( wxKeyEvent &event )
+void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
 {
-    // send a tree event
     wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, this);
     te.m_evtKey = event;
     if ( GetEventHandler()->ProcessEvent( te ) )
+    {
+        // intercepted by the user code
         return;
+    }
 
-    event.Skip();
-}
-
-void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
-{
     if ( (m_current == 0) || (m_key_current == 0) )
     {
         event.Skip();
@@ -3063,21 +2838,6 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
     // end   : go to last item without opening parents
     // alnum : start or continue searching for the item with this prefix
     int keyCode = event.GetKeyCode();
-
-#ifdef __WXOSX__
-    // Make the keys work as they do in the native control:
-    // right => expand
-    // left => collapse if current item is expanded
-    if (keyCode == WXK_RIGHT)
-    {
-        keyCode = '+';
-    }
-    else if (keyCode == WXK_LEFT && IsExpanded(m_current))
-    {
-        keyCode = '-';
-    }
-#endif // __WXOSX__
-
     switch ( keyCode )
     {
         case '+':
@@ -3108,17 +2868,14 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
 
         case WXK_MENU:
             {
-                // Use the item's bounding rectangle to determine position for
-                // the event
+                // Use the item's bounding rectangle to determine position for the event
                 wxRect ItemRect;
                 GetBoundingRect(m_current, ItemRect, true);
 
-                wxTreeEvent
-                    eventMenu(wxEVT_COMMAND_TREE_ITEM_MENU, this, m_current);
+                wxTreeEvent eventMenu(wxEVT_COMMAND_TREE_ITEM_MENU, this, m_current);
                 // Use the left edge, vertical middle
                 eventMenu.m_pointDrag = wxPoint(ItemRect.GetX(),
-                                                ItemRect.GetY() +
-                                                    ItemRect.GetHeight() / 2);
+                                                ItemRect.GetY() + ItemRect.GetHeight() / 2);
                 GetEventHandler()->ProcessEvent( eventMenu );
             }
             break;
@@ -3127,8 +2884,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
         case WXK_RETURN:
             if ( !event.HasModifiers() )
             {
-                wxTreeEvent
-                   eventAct(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, this, m_current);
+                wxTreeEvent eventAct(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, this, m_current);
                 GetEventHandler()->ProcessEvent( eventAct );
             }
 
@@ -3156,15 +2912,12 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
                     {
                         wxTreeItemIdValue cookie;
                         wxTreeItemId current = m_key_current;
-                        // TODO: Huh?  If we get here, we'd better be the first
-                        // child of our parent.  How else could it be?
+                        // TODO: Huh?  If we get here, we'd better be the first child of our parent.  How else could it be?
                         if (current == GetFirstChild( prev, cookie ))
                         {
                             // otherwise we return to where we came from
-                            DoSelectItem(prev,
-                                         unselect_others,
-                                         extended_select);
-                            m_key_current = (wxGenericTreeItem*) prev.m_pItem;
+                            DoSelectItem( prev, unselect_others, extended_select );
+                            m_key_current= (wxGenericTreeItem*) prev.m_pItem;
                             break;
                         }
                     }
@@ -3360,35 +3113,25 @@ bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
                                         wxRect& rect,
                                         bool textOnly) const
 {
-    wxCHECK_MSG( item.IsOk(), false,
-                 "invalid item in wxGenericTreeCtrl::GetBoundingRect" );
+    wxCHECK_MSG( item.IsOk(), false, _T("invalid item in wxGenericTreeCtrl::GetBoundingRect") );
 
     wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
 
     if ( textOnly )
     {
-        int image_h = 0, image_w = 0;
-        int image = ((wxGenericTreeItem*) item.m_pItem)->GetCurrentImage();
-        if ( image != NO_IMAGE && m_imageListNormal )
+        rect.x = i->GetX();
+        rect.width = i->GetWidth();
+
+        if ( m_imageListNormal )
         {
-            m_imageListNormal->GetSize( image, image_w, image_h );
-            image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
+            int image = ((wxGenericTreeItem*) item.m_pItem)->GetCurrentImage();
+            if ( image != NO_IMAGE )
+            {
+                int image_w, image_h;
+                m_imageListNormal->GetSize( image, image_w, image_h );
+                rect.width += image_w + MARGIN_BETWEEN_IMAGE_AND_TEXT;
+            }
         }
-
-        int state_h = 0, state_w = 0;
-        int state = ((wxGenericTreeItem*) item.m_pItem)->GetState();
-        if ( state != wxTREE_ITEMSTATE_NONE && m_imageListState )
-        {
-            m_imageListState->GetSize( state, state_w, state_h );
-            if ( image_w != 0 )
-                state_w += MARGIN_BETWEEN_STATE_AND_IMAGE;
-            else
-                state_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;
-        }
-
-        rect.x = i->GetX() + state_w + image_w;
-        rect.width = i->GetWidth() - state_w - image_w;
-
     }
     else // the entire line
     {
@@ -3408,7 +3151,7 @@ bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
 wxTextCtrl *wxGenericTreeCtrl::EditLabel(const wxTreeItemId& item,
                                   wxClassInfo * WXUNUSED(textCtrlClass))
 {
-    wxCHECK_MSG( item.IsOk(), NULL, wxT("can't edit an invalid item") );
+    wxCHECK_MSG( item.IsOk(), NULL, _T("can't edit an invalid item") );
 
     wxGenericTreeItem *itemEdit = (wxGenericTreeItem *)item.m_pItem;
 
@@ -3448,7 +3191,7 @@ wxTextCtrl* wxGenericTreeCtrl::GetEditControl() const
 void wxGenericTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item),
                                      bool discardChanges)
 {
-    wxCHECK_RET( m_textCtrl, wxT("not editing label") );
+    wxCHECK_RET( m_textCtrl, _T("not editing label") );
 
     m_textCtrl->EndEdit(discardChanges);
 }
@@ -3523,16 +3266,11 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
     // Determines what item we are hovering over and need a tooltip for
     wxTreeItemId hoverItem = thisItem;
 
-    // We do not want a tooltip if we are dragging, or if the rename timer is
-    // running
-    if ( underMouseChanged &&
-            hoverItem.IsOk() &&
-              !m_isDragging &&
-                (!m_renameTimer || !m_renameTimer->IsRunning()) )
+    // We do not want a tooltip if we are dragging, or if the rename timer is running
+    if (underMouseChanged && hoverItem.IsOk() && !m_isDragging && (!m_renameTimer || !m_renameTimer->IsRunning()))
     {
         // Ask the tree control what tooltip (if any) should be shown
-        wxTreeEvent
-            hevent(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,  this, hoverItem);
+        wxTreeEvent hevent(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP,  this, hoverItem);
 
         if ( GetEventHandler()->ProcessEvent(hevent) && hevent.IsAllowed() )
         {
@@ -3624,8 +3362,6 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 #if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK20__)
             Update();
 #else
-            // TODO: remove this call or use wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI)
-            //       instead (needs to be tested!)
             wxYieldIfNeeded();
 #endif
         }
@@ -3641,7 +3377,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         {
             m_oldSelection->SetHilight(true);
             RefreshLine(m_oldSelection);
-            m_oldSelection = NULL;
+            m_oldSelection = (wxGenericTreeItem *)NULL;
         }
 
         // generate the drag end event
@@ -3652,27 +3388,23 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         (void)GetEventHandler()->ProcessEvent(eventEndDrag);
 
         m_isDragging = false;
-        m_dropTarget = NULL;
+        m_dropTarget = (wxGenericTreeItem *)NULL;
 
         SetCursor(m_oldCursor);
 
-#if defined( __WXMSW__ ) || defined(__WXMAC__) || defined(__WXGTK20__)
+#if defined( __WXMSW__ ) || defined(__WXMAC__)
         Update();
 #else
-        // TODO: remove this call or use wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI)
-        //       instead (needs to be tested!)
         wxYieldIfNeeded();
 #endif
     }
     else
     {
         // If we got to this point, we are not dragging or moving the mouse.
-        // Because the code in carbon/toplevel.cpp will only set focus to the
-        // tree if we skip for EVT_LEFT_DOWN, we MUST skip this event here for
-        // focus to work.
+        // Because the code in carbon/toplevel.cpp will only set focus to the tree
+        // if we skip for EVT_LEFT_DOWN, we MUST skip this event here for focus to work.
         // We skip even if we didn't hit an item because we still should
-        // restore focus to the tree control even if we didn't exactly hit an
-        // item.
+        // restore focus to the tree control even if we didn't exactly hit an item.
         if ( event.LeftDown() )
         {
             event.Skip();
@@ -3687,40 +3419,30 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         if ( event.RightDown() )
         {
             // If the item is already selected, do not update the selection.
-            // Multi-selections should not be cleared if a selected item is
-            // clicked.
+            // Multi-selections should not be cleared if a selected item is clicked.
             if (!IsSelected(item))
             {
                 DoSelectItem(item, true, false);
             }
 
-            wxTreeEvent
-                nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,  this, item);
+            wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,  this, item);
             nevent.m_pointDrag = CalcScrolledPosition(pt);
             event.Skip(!GetEventHandler()->ProcessEvent(nevent));
 
             // Consistent with MSW (for now), send the ITEM_MENU *after*
-            // the RIGHT_CLICK event. TODO: This behaviour may change.
+            // the RIGHT_CLICK event. TODO: This behavior may change.
             wxTreeEvent nevent2(wxEVT_COMMAND_TREE_ITEM_MENU,  this, item);
             nevent2.m_pointDrag = CalcScrolledPosition(pt);
             GetEventHandler()->ProcessEvent(nevent2);
         }
         else if ( event.MiddleDown() )
         {
-            wxTreeEvent
-                nevent(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK,  this, item);
+            wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK,  this, item);
             nevent.m_pointDrag = CalcScrolledPosition(pt);
             event.Skip(!GetEventHandler()->ProcessEvent(nevent));
         }
         else if ( event.LeftUp() )
         {
-            if (flags & wxTREE_HITTEST_ONITEMSTATEICON)
-            {
-                wxTreeEvent
-                    nevent(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, this, item);
-                GetEventHandler()->ProcessEvent(nevent);
-            }
-
             // this facilitates multiple-item drag-and-drop
 
             if ( /* item && */ HasFlag(wxTR_MULTIPLE))
@@ -3758,9 +3480,8 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
                 m_lastOnSame = false;
             }
         }
-        else // !RightDown() && !MiddleDown() && !LeftUp()
+        else // !RightDown() && !MiddleDown() && !LeftUp() ==> LeftDown() || LeftDClick()
         {
-            // ==> LeftDown() || LeftDClick()
             if ( event.LeftDown() )
             {
                 m_lastOnSame = item == m_current;
@@ -3792,9 +3513,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
                 EventFlagsToSelType(GetWindowStyleFlag(),
                                     event.ShiftDown(),
                                     event.CmdDown(),
-                                    is_multiple,
-                                    extended_select,
-                                    unselect_others);
+                                    is_multiple, extended_select, unselect_others);
 
                 DoSelectItem(item, unselect_others, extended_select);
             }
@@ -3811,8 +3530,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
                 m_lastOnSame = false;
 
                 // send activate event first
-                wxTreeEvent
-                    nevent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,  this, item);
+                wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,  this, item);
                 nevent.m_pointDrag = CalcScrolledPosition(pt);
                 if ( !GetEventHandler()->ProcessEvent( nevent ) )
                 {
@@ -3851,11 +3569,15 @@ void wxGenericTreeCtrl::OnInternalIdle()
         DoDirtyProcessing();
 }
 
-void
-wxGenericTreeCtrl::CalculateLevel(wxGenericTreeItem *item,
-                                  wxDC &dc,
-                                  int level,
-                                  int &y )
+void wxGenericTreeCtrl::CalculateSize( wxGenericTreeItem *WXUNUSED(item), wxDC &WXUNUSED(dc) )
+{
+    // Should not be called anymore, keeping for ABI compatibility.
+}
+
+// -----------------------------------------------------------------------------
+// for developper : y is now the top of the level
+// not the middle of it !
+void wxGenericTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {
     int x = level*m_indent;
     if (!HasFlag(wxTR_HIDE_ROOT))
@@ -3884,7 +3606,7 @@ wxGenericTreeCtrl::CalculateLevel(wxGenericTreeItem *item,
 
   Recurse:
     wxArrayGenericTreeItems& children = item->GetChildren();
-    size_t n, count = children.GetCount();
+    size_t n, count = children.Count();
     ++level;
     for (n = 0; n < count; ++n )
         CalculateLevel( children[n], dc, level, y );  // recurse
@@ -3900,8 +3622,8 @@ void wxGenericTreeCtrl::CalculatePositions()
     dc.SetFont( m_normalFont );
 
     dc.SetPen( m_dottedPen );
-    //if(GetImageList() == NULL)
-    // m_lineHeight = (int)(dc.GetCharHeight() + 4);
+
+    m_anchor->CalculateSize(this, dc);
 
     int y = 2;
     CalculateLevel( m_anchor, dc, 0, y ); // start recursion
@@ -3909,13 +3631,13 @@ void wxGenericTreeCtrl::CalculatePositions()
 
 void wxGenericTreeCtrl::Refresh(bool eraseBackground, const wxRect *rect)
 {
-    if ( !IsFrozen() )
+    if ( !m_freezeCount )
         wxTreeCtrlBase::Refresh(eraseBackground, rect);
 }
 
 void wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
 {
-    if (m_dirty || IsFrozen() )
+    if (m_dirty || m_freezeCount)
         return;
 
     wxSize client = GetClientSize();
@@ -3932,7 +3654,7 @@ void wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
 
 void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 {
-    if (m_dirty || IsFrozen() )
+    if (m_dirty || m_freezeCount)
         return;
 
     wxRect rect;
@@ -3945,7 +3667,7 @@ void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 
 void wxGenericTreeCtrl::RefreshSelected()
 {
-    if (IsFrozen())
+    if (m_freezeCount)
         return;
 
     // TODO: this is awfully inefficient, we should keep the list of all
@@ -3956,7 +3678,7 @@ void wxGenericTreeCtrl::RefreshSelected()
 
 void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item)
 {
-    if (IsFrozen())
+    if (m_freezeCount)
         return;
 
     if ( item->IsSelected() )
@@ -3970,14 +3692,19 @@ void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item)
     }
 }
 
-void wxGenericTreeCtrl::DoThaw()
+void wxGenericTreeCtrl::Freeze()
 {
-    wxTreeCtrlBase::DoThaw();
+    m_freezeCount++;
+}
 
-    if ( m_dirty )
-        DoDirtyProcessing();
-    else
+void wxGenericTreeCtrl::Thaw()
+{
+    wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen tree control?") );
+
+    if ( --m_freezeCount == 0 )
+    {
         Refresh();
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -4036,9 +3763,23 @@ wxGenericTreeCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 #endif
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
+int wxGenericTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+    return GetItemImage(item, wxTreeItemIcon_Selected);
+}
+
+void wxGenericTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
+{
+    SetItemImage(item, image, wxTreeItemIcon_Selected);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
 void wxGenericTreeCtrl::DoDirtyProcessing()
 {
-    if (IsFrozen())
+    if (m_freezeCount)
         return;
 
     m_dirty = false;
diff --git a/Source/3rd Party/wx/src/generic/vlbox.cpp b/Source/3rd Party/wx/src/generic/vlbox.cpp
index 89f2b1691..70a5bc109 100644
--- a/Source/3rd Party/wx/src/generic/vlbox.cpp	
+++ b/Source/3rd Party/wx/src/generic/vlbox.cpp	
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: vlbox.cpp 53998 2008-06-06 22:55:23Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -36,7 +36,6 @@
 
 #include "wx/dcbuffer.h"
 #include "wx/selstore.h"
-#include "wx/renderer.h"
 
 // ----------------------------------------------------------------------------
 // event tables
@@ -48,11 +47,6 @@ BEGIN_EVENT_TABLE(wxVListBox, wxVScrolledWindow)
     EVT_KEY_DOWN(wxVListBox::OnKeyDown)
     EVT_LEFT_DOWN(wxVListBox::OnLeftDown)
     EVT_LEFT_DCLICK(wxVListBox::OnLeftDClick)
-
-    EVT_SET_FOCUS(wxVListBox::OnSetOrKillFocus)
-    EVT_KILL_FOCUS(wxVListBox::OnSetOrKillFocus)
-
-    EVT_SIZE(wxVListBox::OnSize)
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -60,7 +54,6 @@ END_EVENT_TABLE()
 // ============================================================================
 
 IMPLEMENT_ABSTRACT_CLASS(wxVListBox, wxVScrolledWindow)
-const char wxVListBoxNameStr[] = "wxVListBox";
 
 // ----------------------------------------------------------------------------
 // wxVListBox creation
@@ -80,11 +73,6 @@ bool wxVListBox::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
-#ifdef __WXMSW__
-    if ( (style & wxBORDER_MASK) == wxDEFAULT )
-        style |= wxBORDER_THEME;
-#endif
-
     style |= wxWANTS_CHARS | wxFULL_REPAINT_ON_RESIZE;
     if ( !wxVScrolledWindow::Create(parent, id, pos, size, style, name) )
         return false;
@@ -95,10 +83,7 @@ bool wxVListBox::Create(wxWindow *parent,
     // make sure the native widget has the right colour since we do
     // transparent drawing by default
     SetBackgroundColour(GetBackgroundColour());
-
-    // leave m_colBgSel in an invalid state: it means for OnDrawBackground()
-    // to use wxRendererNative instead of painting selection bg ourselves
-    m_colBgSel = wxNullColour;
+    m_colBgSel = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
 
     // flicker-free drawing requires this
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
@@ -123,7 +108,7 @@ void wxVListBox::SetItemCount(size_t count)
         m_selStore->SetItemCount(count);
     }
 
-    SetRowCount(count);
+    SetLineCount(count);
 }
 
 // ----------------------------------------------------------------------------
@@ -138,16 +123,16 @@ bool wxVListBox::IsSelected(size_t line) const
 bool wxVListBox::Select(size_t item, bool select)
 {
     wxCHECK_MSG( m_selStore, false,
-                 wxT("Select() may only be used with multiselection listbox") );
+                 _T("Select() may only be used with multiselection listbox") );
 
     wxCHECK_MSG( item < GetItemCount(), false,
-                 wxT("Select(): invalid item index") );
+                 _T("Select(): invalid item index") );
 
     bool changed = m_selStore->SelectItem(item, select);
     if ( changed )
     {
         // selection really changed
-        RefreshRow(item);
+        RefreshLine(item);
     }
 
     DoSetCurrent(item);
@@ -158,7 +143,7 @@ bool wxVListBox::Select(size_t item, bool select)
 bool wxVListBox::SelectRange(size_t from, size_t to)
 {
     wxCHECK_MSG( m_selStore, false,
-                 wxT("SelectRange() may only be used with multiselection listbox") );
+                 _T("SelectRange() may only be used with multiselection listbox") );
 
     // make sure items are in correct order
     if ( from > to )
@@ -169,14 +154,14 @@ bool wxVListBox::SelectRange(size_t from, size_t to)
     }
 
     wxCHECK_MSG( to < GetItemCount(), false,
-                    wxT("SelectRange(): invalid item index") );
+                    _T("SelectRange(): invalid item index") );
 
     wxArrayInt changed;
     if ( !m_selStore->SelectRange(from, to, true, &changed) )
     {
         // too many items have changed, we didn't record them in changed array
         // so we have no choice but to refresh everything between from and to
-        RefreshRows(from, to);
+        RefreshLines(from, to);
     }
     else // we've got the indices of the changed items
     {
@@ -190,7 +175,7 @@ bool wxVListBox::SelectRange(size_t from, size_t to)
         // refresh just the lines which have really changed
         for ( size_t n = 0; n < count; n++ )
         {
-            RefreshRow(changed[n]);
+            RefreshLine(changed[n]);
         }
     }
 
@@ -201,7 +186,7 @@ bool wxVListBox::SelectRange(size_t from, size_t to)
 bool wxVListBox::DoSelectAll(bool select)
 {
     wxCHECK_MSG( m_selStore, false,
-                 wxT("SelectAll may only be used with multiselection listbox") );
+                 _T("SelectAll may only be used with multiselection listbox") );
 
     size_t count = GetItemCount();
     if ( count )
@@ -224,7 +209,7 @@ bool wxVListBox::DoSetCurrent(int current)
 {
     wxASSERT_MSG( current == wxNOT_FOUND ||
                     (current >= 0 && (size_t)current < GetItemCount()),
-                  wxT("wxVListBox::DoSetCurrent(): invalid item index") );
+                  _T("wxVListBox::DoSetCurrent(): invalid item index") );
 
     if ( current == m_current )
     {
@@ -233,7 +218,7 @@ bool wxVListBox::DoSetCurrent(int current)
     }
 
     if ( m_current != wxNOT_FOUND )
-        RefreshRow(m_current);
+        RefreshLine(m_current);
 
     m_current = current;
 
@@ -243,40 +228,33 @@ bool wxVListBox::DoSetCurrent(int current)
         // don't need to refresh it -- it will be redrawn anyhow
         if ( !IsVisible(m_current) )
         {
-            ScrollToRow(m_current);
+            ScrollToLine(m_current);
         }
         else // line is at least partly visible
         {
             // it is, indeed, only partly visible, so scroll it into view to
             // make it entirely visible
-            // BUT scrolling down when m_current is first visible makes it
-            // completely hidden, so that is even worse
-            while ( (size_t)m_current + 1 == GetVisibleRowsEnd() &&
-                    (size_t)m_current != GetVisibleRowsBegin() &&
-                    ScrollToRow(GetVisibleBegin() + 1) ) ;
+            while ( (size_t)m_current == GetLastVisibleLine() &&
+                    ScrollToLine(GetVisibleBegin()+1) ) ;
 
             // but in any case refresh it as even if it was only partly visible
             // before we need to redraw it entirely as its background changed
-            RefreshRow(m_current);
+            RefreshLine(m_current);
         }
     }
 
     return true;
 }
 
-void wxVListBox::InitEvent(wxCommandEvent& event, int n)
-{
-    event.SetEventObject(this);
-    event.SetInt(n);
-}
-
 void wxVListBox::SendSelectedEvent()
 {
     wxASSERT_MSG( m_current != wxNOT_FOUND,
-                    wxT("SendSelectedEvent() shouldn't be called") );
+                    _T("SendSelectedEvent() shouldn't be called") );
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, GetId());
-    InitEvent(event, m_current);
+    event.SetEventObject(this);
+    event.SetInt(m_current);
+
     (void)GetEventHandler()->ProcessEvent(event);
 }
 
@@ -284,7 +262,7 @@ void wxVListBox::SetSelection(int selection)
 {
     wxCHECK_RET( selection == wxNOT_FOUND ||
                   (selection >= 0 && (size_t)selection < GetItemCount()),
-                  wxT("wxVListBox::SetSelection(): invalid item index") );
+                  _T("wxVListBox::SetSelection(): invalid item index") );
 
     if ( HasMultipleSelection() )
     {
@@ -314,7 +292,7 @@ int wxVListBox::GetFirstSelected(unsigned long& cookie) const
 int wxVListBox::GetNextSelected(unsigned long& cookie) const
 {
     wxCHECK_MSG( m_selStore, wxNOT_FOUND,
-                  wxT("GetFirst/NextSelected() may only be used with multiselection listboxes") );
+                  _T("GetFirst/NextSelected() may only be used with multiselection listboxes") );
 
     while ( cookie < GetItemCount() )
     {
@@ -325,41 +303,6 @@ int wxVListBox::GetNextSelected(unsigned long& cookie) const
     return wxNOT_FOUND;
 }
 
-void wxVListBox::RefreshSelected()
-{
-    // only refresh those items which are currently visible and selected:
-    for ( size_t n = GetVisibleBegin(), end = GetVisibleEnd(); n < end; n++ )
-    {
-        if ( IsSelected(n) )
-            RefreshRow(n);
-    }
-}
-
-wxRect wxVListBox::GetItemRect(size_t n) const
-{
-    wxRect itemrect;
-
-    // check that this item is visible
-    const size_t lineMax = GetVisibleEnd();
-    if ( n >= lineMax )
-        return itemrect;
-    size_t line = GetVisibleBegin();
-    if ( n < line )
-        return itemrect;
-
-    while ( line <= n )
-    {
-        itemrect.y += itemrect.height;
-        itemrect.height = OnGetRowHeight(line);
-
-        line++;
-    }
-
-    itemrect.width = GetClientSize().x;
-
-    return itemrect;
-}
-
 // ----------------------------------------------------------------------------
 // wxVListBox appearance parameters
 // ----------------------------------------------------------------------------
@@ -383,7 +326,7 @@ void wxVListBox::SetSelectionBackground(const wxColour& col)
 // wxVListBox painting
 // ----------------------------------------------------------------------------
 
-wxCoord wxVListBox::OnGetRowHeight(size_t line) const
+wxCoord wxVListBox::OnGetLineHeight(size_t line) const
 {
     return OnMeasureItem(line) + 2*m_ptMargins.y;
 }
@@ -394,15 +337,8 @@ void wxVListBox::OnDrawSeparator(wxDC& WXUNUSED(dc),
 {
 }
 
-bool
-wxVListBox::DoDrawSolidBackground(const wxColour& col,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  size_t n) const
+void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
 {
-    if ( !col.IsOk() )
-        return false;
-
     // we need to render selected and current items differently
     const bool isSelected = IsSelected(n),
                isCurrent = IsCurrent(n);
@@ -410,36 +346,18 @@ wxVListBox::DoDrawSolidBackground(const wxColour& col,
     {
         if ( isSelected )
         {
-            dc.SetBrush(wxBrush(col, wxBRUSHSTYLE_SOLID));
+            dc.SetBrush(wxBrush(m_colBgSel, wxSOLID));
         }
         else // !selected
         {
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
         }
+
         dc.SetPen(*(isCurrent ? wxBLACK_PEN : wxTRANSPARENT_PEN));
+
         dc.DrawRectangle(rect);
     }
     //else: do nothing for the normal items
-
-    return true;
-}
-
-void wxVListBox::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t n) const
-{
-    // use wxRendererNative for more native look unless we use custom bg colour
-    if ( !DoDrawSolidBackground(m_colBgSel, dc, rect, n) )
-    {
-        int flags = 0;
-        if ( IsSelected(n) )
-            flags |= wxCONTROL_SELECTED;
-        if ( IsCurrent(n) )
-            flags |= wxCONTROL_CURRENT;
-        if ( wxWindow::FindFocus() == const_cast<wxVListBox*>(this) )
-            flags |= wxCONTROL_FOCUSED;
-
-        wxRendererNative::Get().DrawItemSelectionRect(
-            const_cast<wxVListBox *>(this), dc, rect, flags);
-    }
 }
 
 void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
@@ -456,24 +374,24 @@ void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
     dc.Clear();
 
     // the bounding rectangle of the current line
-    wxRect rectRow;
-    rectRow.width = clientSize.x;
+    wxRect rectLine;
+    rectLine.width = clientSize.x;
 
     // iterate over all visible lines
     const size_t lineMax = GetVisibleEnd();
-    for ( size_t line = GetVisibleBegin(); line < lineMax; line++ )
+    for ( size_t line = GetFirstVisibleLine(); line < lineMax; line++ )
     {
-        const wxCoord hRow = OnGetRowHeight(line);
+        const wxCoord hLine = OnGetLineHeight(line);
 
-        rectRow.height = hRow;
+        rectLine.height = hLine;
 
         // and draw the ones which intersect the update rect
-        if ( rectRow.Intersects(rectUpdate) )
+        if ( rectLine.Intersects(rectUpdate) )
         {
             // don't allow drawing outside of the lines rectangle
-            wxDCClipper clip(dc, rectRow);
+            wxDCClipper clip(dc, rectLine);
 
-            wxRect rect = rectRow;
+            wxRect rect = rectLine;
             OnDrawBackground(dc, rect, line);
 
             OnDrawSeparator(dc, rect, line);
@@ -483,7 +401,7 @@ void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
         }
         else // no intersection
         {
-            if ( rectRow.GetTop() > rectUpdate.GetBottom() )
+            if ( rectLine.GetTop() > rectUpdate.GetBottom() )
             {
                 // we are already below the update rect, no need to continue
                 // further
@@ -492,24 +410,10 @@ void wxVListBox::OnPaint(wxPaintEvent& WXUNUSED(event))
             //else: the next line may intersect the update rect
         }
 
-        rectRow.y += hRow;
+        rectLine.y += hLine;
     }
 }
 
-void wxVListBox::OnSetOrKillFocus(wxFocusEvent& WXUNUSED(event))
-{
-    // we need to repaint the selection when we get the focus since
-    // wxRendererNative in general draws the focused selection differently
-    // from the unfocused selection (see OnDrawItem):
-    RefreshSelected();
-}
-
-void wxVListBox::OnSize(wxSizeEvent& event)
-{
-    UpdateScrollbar();
-    event.Skip();
-}
-
 // ============================================================================
 // wxVListBox keyboard/mouse handling
 // ============================================================================
@@ -608,27 +512,23 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
     switch ( event.GetKeyCode() )
     {
         case WXK_HOME:
-        case WXK_NUMPAD_HOME:
             current = 0;
             break;
 
         case WXK_END:
-        case WXK_NUMPAD_END:
-            current = GetRowCount() - 1;
+            current = GetLineCount() - 1;
             break;
 
         case WXK_DOWN:
-        case WXK_NUMPAD_DOWN:
-            if ( m_current == (int)GetRowCount() - 1 )
+            if ( m_current == (int)GetLineCount() - 1 )
                 return;
 
             current = m_current + 1;
             break;
 
         case WXK_UP:
-        case WXK_NUMPAD_UP:
             if ( m_current == wxNOT_FOUND )
-                current = GetRowCount() - 1;
+                current = GetLineCount() - 1;
             else if ( m_current != 0 )
                 current = m_current - 1;
             else // m_current == 0
@@ -636,19 +536,17 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_PAGEDOWN:
-        case WXK_NUMPAD_PAGEDOWN:
             PageDown();
-            current = GetVisibleBegin();
+            current = GetFirstVisibleLine();
             break;
 
         case WXK_PAGEUP:
-        case WXK_NUMPAD_PAGEUP:
-            if ( m_current == (int)GetVisibleBegin() )
+            if ( m_current == (int)GetFirstVisibleLine() )
             {
                 PageUp();
             }
 
-            current = GetVisibleBegin();
+            current = GetFirstVisibleLine();
             break;
 
         case WXK_SPACE:
@@ -663,7 +561,13 @@ void wxVListBox::OnKeyDown(wxKeyEvent& event)
         case WXK_TAB:
             // Since we are using wxWANTS_CHARS we need to send navigation
             // events for the tabs on MSW
-            HandleAsNavigationKey(event);
+            {
+                wxNavigationKeyEvent ne;
+                ne.SetDirection(!event.ShiftDown());
+                ne.SetCurrentFocus(this);
+                ne.SetEventObject(this);
+                GetParent()->GetEventHandler()->ProcessEvent(ne);
+            }
             // fall through to default
 #endif
         default:
@@ -689,7 +593,7 @@ void wxVListBox::OnLeftDown(wxMouseEvent& event)
 {
     SetFocus();
 
-    int item = VirtualHitTest(event.GetPosition().y);
+    int item = HitTest(event.GetPosition());
 
     if ( item != wxNOT_FOUND )
     {
@@ -712,7 +616,7 @@ void wxVListBox::OnLeftDown(wxMouseEvent& event)
 
 void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
 {
-    int item = VirtualHitTest(eventMouse.GetPosition().y);
+    int item = HitTest(eventMouse.GetPosition());
     if ( item != wxNOT_FOUND )
     {
 
@@ -721,7 +625,9 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
         if ( item == m_current )
         {
             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, GetId());
-            InitEvent(event, item);
+            event.SetEventObject(this);
+            event.SetInt(item);
+
             (void)GetEventHandler()->ProcessEvent(event);
         }
         else
diff --git a/Source/3rd Party/wx/src/generic/vscroll.cpp b/Source/3rd Party/wx/src/generic/vscroll.cpp
index ce455b362..af47dca25 100644
--- a/Source/3rd Party/wx/src/generic/vscroll.cpp	
+++ b/Source/3rd Party/wx/src/generic/vscroll.cpp	
@@ -2,9 +2,9 @@
 // Name:        src/generic/vscroll.cpp
 // Purpose:     wxVScrolledWindow implementation
 // Author:      Vadim Zeitlin
-// Modified by: Brad Anderson, David Warkentin
+// Modified by:
 // Created:     30.05.03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: vscroll.cpp 57359 2008-12-15 19:09:31Z BP $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,644 +25,405 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/dc.h"
     #include "wx/sizer.h"
 #endif
 
 #include "wx/vscroll.h"
 
-#include "wx/utils.h"   // For wxMin/wxMax().
-
-// ============================================================================
-// wxVarScrollHelperEvtHandler declaration
-// ============================================================================
-
 // ----------------------------------------------------------------------------
-// wxScrollHelperEvtHandler: intercept the events from the window and forward
-// them to wxVarScrollHelperBase
+// event tables
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxVarScrollHelperEvtHandler : public wxEvtHandler
-{
-public:
-    wxVarScrollHelperEvtHandler(wxVarScrollHelperBase *scrollHelper)
-    {
-        m_scrollHelper = scrollHelper;
-    }
-
-    virtual bool ProcessEvent(wxEvent& event);
-
-private:
-    wxVarScrollHelperBase *m_scrollHelper;
-
-    wxDECLARE_NO_COPY_CLASS(wxVarScrollHelperEvtHandler);
-};
-
-// ============================================================================
-// wxVarScrollHelperEvtHandler implementation
-// ============================================================================
-
-bool wxVarScrollHelperEvtHandler::ProcessEvent(wxEvent& event)
-{
-    wxEventType evType = event.GetEventType();
-
-    // pass it on to the real handler
-    bool processed = wxEvtHandler::ProcessEvent(event);
-
-    // always process the size events ourselves, even if the user code handles
-    // them as well, as we need to AdjustScrollbars()
-    //
-    // NB: it is important to do it after processing the event in the normal
-    //     way as HandleOnSize() may generate a wxEVT_SIZE itself if the
-    //     scrollbar[s] (dis)appear and it should be seen by the user code
-    //     after this one
-    if ( evType == wxEVT_SIZE )
-    {
-        m_scrollHelper->HandleOnSize((wxSizeEvent &)event);
-
-        return !event.GetSkipped();
-    }
-
-    if ( processed )
-    {
-        // normally, nothing more to do here - except if we have a command
-        // event
-        if ( event.IsCommandEvent() )
-        {
-            return true;
-        }
-    }
-
-    // reset the skipped flag (which might have been set to true in
-    // ProcessEvent() above) to be able to test it below
-    bool wasSkipped = event.GetSkipped();
-    if ( wasSkipped )
-        event.Skip(false);
-
-    if ( evType == wxEVT_SCROLLWIN_TOP ||
-         evType == wxEVT_SCROLLWIN_BOTTOM ||
-         evType == wxEVT_SCROLLWIN_LINEUP ||
-         evType == wxEVT_SCROLLWIN_LINEDOWN ||
-         evType == wxEVT_SCROLLWIN_PAGEUP ||
-         evType == wxEVT_SCROLLWIN_PAGEDOWN ||
-         evType == wxEVT_SCROLLWIN_THUMBTRACK ||
-         evType == wxEVT_SCROLLWIN_THUMBRELEASE )
-    {
-        m_scrollHelper->HandleOnScroll((wxScrollWinEvent &)event);
-        if ( !event.GetSkipped() )
-        {
-            // it makes sense to indicate that we processed the message as we
-            // did scroll the window (and also notice that wxAutoScrollTimer
-            // relies on our return value for continuous scrolling)
-            processed = true;
-            wasSkipped = false;
-        }
-    }
+BEGIN_EVENT_TABLE(wxVScrolledWindow, wxPanel)
+    EVT_SIZE(wxVScrolledWindow::OnSize)
+    EVT_SCROLLWIN(wxVScrolledWindow::OnScroll)
 #if wxUSE_MOUSEWHEEL
-    else if ( evType == wxEVT_MOUSEWHEEL )
-    {
-        m_scrollHelper->HandleOnMouseWheel((wxMouseEvent &)event);
-    }
-#endif // wxUSE_MOUSEWHEEL
-
-    event.Skip(wasSkipped);
-
-    return processed;
-}
+    EVT_MOUSEWHEEL(wxVScrolledWindow::OnMouseWheel)
+#endif
+END_EVENT_TABLE()
 
 
 // ============================================================================
-// wxVarScrollHelperBase implementation
+// implementation
 // ============================================================================
 
+IMPLEMENT_ABSTRACT_CLASS(wxVScrolledWindow, wxPanel)
+
 // ----------------------------------------------------------------------------
-// wxVarScrollHelperBase initialization
+// initialization
 // ----------------------------------------------------------------------------
 
-wxVarScrollHelperBase::wxVarScrollHelperBase(wxWindow *win)
+void wxVScrolledWindow::Init()
 {
-    wxASSERT_MSG( win, wxT("associated window can't be NULL in wxVarScrollHelperBase") );
+    // we're initially empty
+    m_lineMax =
+    m_lineFirst = 0;
+
+    // this one should always be strictly positive
+    m_nVisible = 1;
+
+    m_heightTotal = 0;
 
 #if wxUSE_MOUSEWHEEL
     m_sumWheelRotation = 0;
 #endif
-
-    m_unitMax = 0;
-    m_sizeTotal = 0;
-    m_unitFirst = 0;
-
-    m_win =
-    m_targetWindow = NULL;
-
-    m_physicalScrolling = true;
-    m_handler = NULL;
-
-    m_win = win;
-
-    // by default, the associated window is also the target window
-    DoSetTargetWindow(win);
-
-}
-
-wxVarScrollHelperBase::~wxVarScrollHelperBase()
-{
-    DeleteEvtHandler();
 }
 
 // ----------------------------------------------------------------------------
-// wxVarScrollHelperBase various helpers
+// various helpers
 // ----------------------------------------------------------------------------
 
-void
-wxVarScrollHelperBase::AssignOrient(wxCoord& x,
-                                    wxCoord& y,
-                                    wxCoord first,
-                                    wxCoord second)
-{
-    if ( GetOrientation() == wxVERTICAL )
-    {
-        x = first;
-        y = second;
-    }
-    else // horizontal
-    {
-        x = second;
-        y = first;
-    }
-}
-
-void
-wxVarScrollHelperBase::IncOrient(wxCoord& x, wxCoord& y, wxCoord inc)
-{
-    if ( GetOrientation() == wxVERTICAL )
-        y += inc;
-    else
-        x += inc;
-}
-
-wxCoord wxVarScrollHelperBase::DoEstimateTotalSize() const
+wxCoord wxVScrolledWindow::EstimateTotalHeight() const
 {
     // estimate the total height: it is impossible to call
-    // OnGetUnitSize() for every unit because there may be too many of
-    // them, so we just make a guess using some units in the beginning,
+    // OnGetLineHeight() for every line because there may be too many of
+    // them, so we just make a guess using some lines in the beginning,
     // some in the end and some in the middle
-    static const size_t NUM_UNITS_TO_SAMPLE = 10;
+    static const size_t NUM_LINES_TO_SAMPLE = 10;
 
-    wxCoord sizeTotal;
-    if ( m_unitMax < 3*NUM_UNITS_TO_SAMPLE )
+    wxCoord heightTotal;
+    if ( m_lineMax < 3*NUM_LINES_TO_SAMPLE )
     {
-        // in this case, full calculations are faster and more correct than
+        // in this case calculating exactly is faster and more correct than
         // guessing
-        sizeTotal = GetUnitsSize(0, m_unitMax);
+        heightTotal = GetLinesHeight(0, m_lineMax);
     }
-    else // too many units to calculate exactly
+    else // too many lines to calculate exactly
     {
-        // look at some units in the beginning/middle/end
-        sizeTotal =
-            GetUnitsSize(0, NUM_UNITS_TO_SAMPLE) +
-                GetUnitsSize(m_unitMax - NUM_UNITS_TO_SAMPLE,
-                             m_unitMax) +
-                    GetUnitsSize(m_unitMax/2 - NUM_UNITS_TO_SAMPLE/2,
-                                 m_unitMax/2 + NUM_UNITS_TO_SAMPLE/2);
+        // look at some lines in the beginning/middle/end
+        heightTotal =
+            GetLinesHeight(0, NUM_LINES_TO_SAMPLE) +
+                GetLinesHeight(m_lineMax - NUM_LINES_TO_SAMPLE, m_lineMax) +
+                    GetLinesHeight(m_lineMax/2 - NUM_LINES_TO_SAMPLE/2,
+                                   m_lineMax/2 + NUM_LINES_TO_SAMPLE/2);
 
-        // use the height of the units we looked as the average
-        sizeTotal = (wxCoord)
-                (((float)sizeTotal / (3*NUM_UNITS_TO_SAMPLE)) * m_unitMax);
+        // use the height of the lines we looked as the average
+        heightTotal = (wxCoord)
+                (((float)heightTotal / (3*NUM_LINES_TO_SAMPLE)) * m_lineMax);
     }
 
-    return sizeTotal;
+    return heightTotal;
 }
 
-wxCoord wxVarScrollHelperBase::GetUnitsSize(size_t unitMin, size_t unitMax) const
+wxCoord wxVScrolledWindow::GetLinesHeight(size_t lineMin, size_t lineMax) const
 {
-    if ( unitMin == unitMax )
+    if ( lineMin == lineMax )
         return 0;
-    else if ( unitMin > unitMax )
-        return -GetUnitsSize(unitMax, unitMin);
-    //else: unitMin < unitMax
+    else if ( lineMin > lineMax )
+        return -GetLinesHeight(lineMax, lineMin);
+    //else: lineMin < lineMax
 
-    // let the user code know that we're going to need all these units
-    OnGetUnitsSizeHint(unitMin, unitMax);
+    // let the user code know that we're going to need all these lines
+    OnGetLinesHint(lineMin, lineMax);
 
-    // sum up their sizes
-    wxCoord size = 0;
-    for ( size_t unit = unitMin; unit < unitMax; ++unit )
+    // do sum up their heights
+    wxCoord height = 0;
+    for ( size_t line = lineMin; line < lineMax; line++ )
     {
-        size += OnGetUnitSize(unit);
+        height += OnGetLineHeight(line);
     }
 
-    return size;
+    return height;
 }
 
-size_t wxVarScrollHelperBase::FindFirstVisibleFromLast(size_t unitLast, bool full) const
+size_t wxVScrolledWindow::FindFirstFromBottom(size_t lineLast, bool full)
 {
-    const wxCoord sWindow = GetOrientationTargetSize();
+    const wxCoord hWindow = GetClientSize().y;
 
-    // go upwards until we arrive at a unit such that unitLast is not visible
+    // go upwards until we arrive at a line such that lineLast is not visible
     // any more when it is shown
-    size_t unitFirst = unitLast;
-    wxCoord s = 0;
+    size_t lineFirst = lineLast;
+    wxCoord h = 0;
     for ( ;; )
     {
-        s += OnGetUnitSize(unitFirst);
+        h += OnGetLineHeight(lineFirst);
 
-        if ( s > sWindow )
+        if ( h > hWindow )
         {
-            // for this unit to be fully visible we need to go one unit
+            // for this line to be fully visible we need to go one line
             // down, but if it is enough for it to be only partly visible then
-            // this unit will do as well
+            // this line will do as well
             if ( full )
             {
-                ++unitFirst;
+                lineFirst++;
             }
 
             break;
         }
 
-        if ( !unitFirst )
+        if ( !lineFirst )
             break;
 
-        --unitFirst;
+        lineFirst--;
     }
 
-    return unitFirst;
+    return lineFirst;
 }
 
-size_t wxVarScrollHelperBase::GetNewScrollPosition(wxScrollWinEvent& event) const
+void wxVScrolledWindow::RemoveScrollbar()
 {
-    wxEventType evtType = event.GetEventType();
-
-    if ( evtType == wxEVT_SCROLLWIN_TOP )
-    {
-        return 0;
-    }
-    else if ( evtType == wxEVT_SCROLLWIN_BOTTOM )
-    {
-        return m_unitMax;
-    }
-    else if ( evtType == wxEVT_SCROLLWIN_LINEUP )
-    {
-        return m_unitFirst ? m_unitFirst - 1 : 0;
-    }
-    else if ( evtType == wxEVT_SCROLLWIN_LINEDOWN )
-    {
-        return m_unitFirst + 1;
-    }
-    else if ( evtType == wxEVT_SCROLLWIN_PAGEUP )
-    {
-        // Page up should do at least as much as line up.
-        return wxMin(FindFirstVisibleFromLast(m_unitFirst),
-                    m_unitFirst ? m_unitFirst - 1 : 0);
-    }
-    else if ( evtType == wxEVT_SCROLLWIN_PAGEDOWN )
-    {
-        // And page down should do at least as much as line down.
-        if ( GetVisibleEnd() )
-            return wxMax(GetVisibleEnd() - 1, m_unitFirst + 1);
-        else
-            return wxMax(GetVisibleEnd(), m_unitFirst + 1);
-    }
-    else if ( evtType == wxEVT_SCROLLWIN_THUMBRELEASE )
-    {
-        return event.GetPosition();
-    }
-    else if ( evtType == wxEVT_SCROLLWIN_THUMBTRACK )
-    {
-        return event.GetPosition();
-    }
-
-    // unknown scroll event?
-    wxFAIL_MSG( wxT("unknown scroll event type?") );
-    return 0;
+    m_lineFirst = 0;
+    m_nVisible = m_lineMax;
+    SetScrollbar(wxVERTICAL, 0, 0, 0);
 }
 
-void wxVarScrollHelperBase::UpdateScrollbar()
+void wxVScrolledWindow::UpdateScrollbar()
 {
-    // if there is nothing to scroll, remove the scrollbar
-    if ( !m_unitMax )
-    {
-        RemoveScrollbar();
-        return;
-    }
+    // see how many lines can we fit on screen
+    const wxCoord hWindow = GetClientSize().y;
 
-    // see how many units can we fit on screen
-    const wxCoord sWindow = GetOrientationTargetSize();
-
-    // do vertical calculations
-    wxCoord s = 0;
-    size_t unit;
-    for ( unit = m_unitFirst; unit < m_unitMax; ++unit )
+    wxCoord h = 0;
+    size_t line;
+    for ( line = m_lineFirst; line < m_lineMax; line++ )
     {
-        if ( s > sWindow )
+        if ( h > hWindow )
             break;
 
-        s += OnGetUnitSize(unit);
+        h += OnGetLineHeight(line);
     }
 
-    m_nUnitsVisible = unit - m_unitFirst;
-
-    int unitsPageSize = m_nUnitsVisible;
-    if ( s > sWindow )
+    // if we still have remaining space below, maybe we can fit everything?
+    if ( h < hWindow )
     {
-        // last unit is only partially visible, we still need the scrollbar and
-        // so we have to "fix" pageSize because if it is equal to m_unitMax
-        // the scrollbar is not shown at all under MSW
-        --unitsPageSize;
+        wxCoord hAll = h;
+        for ( size_t lineFirst = m_lineFirst; lineFirst > 0; lineFirst-- )
+        {
+            hAll += OnGetLineHeight(m_lineFirst - 1);
+            if ( hAll > hWindow )
+                break;
+        }
+
+        if ( hAll < hWindow )
+        {
+            // we don't need scrollbar at all
+            RemoveScrollbar();
+            return;
+        }
+    }
+
+    m_nVisible = line - m_lineFirst;
+
+    int pageSize = m_nVisible;
+    if ( h > hWindow )
+    {
+        // last line is only partially visible, we still need the scrollbar and
+        // so we have to "fix" pageSize because if it is equal to m_lineMax the
+        // scrollbar is not shown at all under MSW
+        pageSize--;
     }
 
     // set the scrollbar parameters to reflect this
-    m_win->SetScrollbar(GetOrientation(), m_unitFirst, unitsPageSize, m_unitMax);
-}
-
-void wxVarScrollHelperBase::RemoveScrollbar()
-{
-    m_unitFirst = 0;
-    m_nUnitsVisible = m_unitMax;
-    m_win->SetScrollbar(GetOrientation(), 0, 0, 0);
-}
-
-void wxVarScrollHelperBase::DeleteEvtHandler()
-{
-    // search for m_handler in the handler list
-    if ( m_win && m_handler )
-    {
-        if ( m_win->RemoveEventHandler(m_handler) )
-        {
-            delete m_handler;
-        }
-        //else: something is very wrong, so better [maybe] leak memory than
-        //      risk a crash because of double deletion
-
-        m_handler = NULL;
-    }
-}
-
-void wxVarScrollHelperBase::DoSetTargetWindow(wxWindow *target)
-{
-    m_targetWindow = target;
-#ifdef __WXMAC__
-    target->MacSetClipChildren( true ) ;
-#endif
-
-    // install the event handler which will intercept the events we're
-    // interested in (but only do it for our real window, not the target window
-    // which we scroll - we don't need to hijack its events)
-    if ( m_targetWindow == m_win )
-    {
-        // if we already have a handler, delete it first
-        DeleteEvtHandler();
-
-        m_handler = new wxVarScrollHelperEvtHandler(this);
-        m_targetWindow->PushEventHandler(m_handler);
-    }
+    SetScrollbar(wxVERTICAL, m_lineFirst, pageSize, m_lineMax);
 }
 
 // ----------------------------------------------------------------------------
-// wxVarScrollHelperBase operations
+// operations
 // ----------------------------------------------------------------------------
 
-void wxVarScrollHelperBase::SetTargetWindow(wxWindow *target)
+void wxVScrolledWindow::SetLineCount(size_t count)
 {
-    wxCHECK_RET( target, wxT("target window must not be NULL") );
-
-    if ( target == m_targetWindow )
-        return;
-
-    DoSetTargetWindow(target);
-}
-
-void wxVarScrollHelperBase::SetUnitCount(size_t count)
-{
-    // save the number of units
-    m_unitMax = count;
+    // save the number of lines
+    m_lineMax = count;
 
     // and our estimate for their total height
-    m_sizeTotal = EstimateTotalSize();
+    m_heightTotal = EstimateTotalHeight();
 
-    // ScrollToUnit() will update the scrollbar itself if it changes the unit
-    // we pass to it because it's out of [new] range
-    size_t oldScrollPos = m_unitFirst;
-    DoScrollToUnit(m_unitFirst);
-    if ( oldScrollPos == m_unitFirst )
+    // recalculate the scrollbars parameters
+    if ( count )
     {
-        // but if it didn't do it, we still need to update the scrollbar to
-        // reflect the changed number of units ourselves
-        UpdateScrollbar();
+        m_lineFirst = 1;    // make sure it is != 0
+        ScrollToLine(0);
+    }
+    else // no items
+    {
+        RemoveScrollbar();
     }
 }
 
-void wxVarScrollHelperBase::RefreshUnit(size_t unit)
+void wxVScrolledWindow::RefreshLine(size_t line)
 {
-    // is this unit visible?
-    if ( !IsVisible(unit) )
+    // is this line visible?
+    if ( !IsVisible(line) )
     {
         // no, it is useless to do anything
         return;
     }
 
-    // calculate the rect occupied by this unit on screen
+    // calculate the rect occupied by this line on screen
     wxRect rect;
-    AssignOrient(rect.width, rect.height,
-                 GetNonOrientationTargetSize(), OnGetUnitSize(unit));
-
-    for ( size_t n = GetVisibleBegin(); n < unit; ++n )
+    rect.width = GetClientSize().x;
+    rect.height = OnGetLineHeight(line);
+    for ( size_t n = GetVisibleBegin(); n < line; n++ )
     {
-        IncOrient(rect.x, rect.y, OnGetUnitSize(n));
+        rect.y += OnGetLineHeight(n);
     }
 
     // do refresh it
-    m_targetWindow->RefreshRect(rect);
+    RefreshRect(rect);
 }
 
-void wxVarScrollHelperBase::RefreshUnits(size_t from, size_t to)
+void wxVScrolledWindow::RefreshLines(size_t from, size_t to)
 {
-    wxASSERT_MSG( from <= to, wxT("RefreshUnits(): empty range") );
+    wxASSERT_MSG( from <= to, _T("RefreshLines(): empty range") );
 
-    // clump the range to just the visible units -- it is useless to refresh
+    // clump the range to just the visible lines -- it is useless to refresh
     // the other ones
     if ( from < GetVisibleBegin() )
         from = GetVisibleBegin();
 
-    if ( to > GetVisibleEnd() )
+    if ( to >= GetVisibleEnd() )
         to = GetVisibleEnd();
+    else
+        to++;
 
-    // calculate the rect occupied by these units on screen
-    int orient_size, nonorient_size, orient_pos;
-    orient_size = nonorient_size = orient_pos = 0;
-
-    nonorient_size = GetNonOrientationTargetSize();
-
-    for ( size_t nBefore = GetVisibleBegin();
-          nBefore < from;
-          nBefore++ )
-    {
-        orient_pos += OnGetUnitSize(nBefore);
-    }
-
-    for ( size_t nBetween = from; nBetween <= to; nBetween++ )
-    {
-        orient_size += OnGetUnitSize(nBetween);
-    }
-
+    // calculate the rect occupied by these lines on screen
     wxRect rect;
-    AssignOrient(rect.x, rect.y, 0, orient_pos);
-    AssignOrient(rect.width, rect.height, nonorient_size, orient_size);
+    rect.width = GetClientSize().x;
+    for ( size_t nBefore = GetVisibleBegin(); nBefore < from; nBefore++ )
+    {
+        rect.y += OnGetLineHeight(nBefore);
+    }
+
+    for ( size_t nBetween = from; nBetween < to; nBetween++ )
+    {
+        rect.height += OnGetLineHeight(nBetween);
+    }
 
     // do refresh it
-    m_targetWindow->RefreshRect(rect);
+    RefreshRect(rect);
 }
 
-void wxVarScrollHelperBase::RefreshAll()
+void wxVScrolledWindow::RefreshAll()
 {
     UpdateScrollbar();
 
-    m_targetWindow->Refresh();
+    Refresh();
 }
 
-bool wxVarScrollHelperBase::ScrollLayout()
+bool wxVScrolledWindow::Layout()
 {
-    if ( m_targetWindow->GetSizer() && m_physicalScrolling )
+    if ( GetSizer() )
     {
         // adjust the sizer dimensions/position taking into account the
         // virtual size and scrolled position of the window.
 
-        int x, y;
-        AssignOrient(x, y, 0, -GetScrollOffset());
+        int w = 0, h = 0;
+        GetVirtualSize(&w, &h);
 
-        int w, h;
-        m_targetWindow->GetVirtualSize(&w, &h);
+        // x is always 0 so no variable needed
+        int y = -GetLinesHeight(0, GetFirstVisibleLine());
 
-        m_targetWindow->GetSizer()->SetDimension(x, y, w, h);
+        GetSizer()->SetDimension(0, y, w, h);
         return true;
     }
 
     // fall back to default for LayoutConstraints
-    return m_targetWindow->wxWindow::Layout();
+    return wxPanel::Layout();
 }
 
-int wxVarScrollHelperBase::VirtualHitTest(wxCoord coord) const
+int wxVScrolledWindow::HitTest(wxCoord WXUNUSED(x), wxCoord y) const
 {
-    const size_t unitMax = GetVisibleEnd();
-    for ( size_t unit = GetVisibleBegin(); unit < unitMax; ++unit )
+    const size_t lineMax = GetVisibleEnd();
+    for ( size_t line = GetVisibleBegin(); line < lineMax; line++ )
     {
-        coord -= OnGetUnitSize(unit);
-        if ( coord < 0 )
-            return unit;
+        y -= OnGetLineHeight(line);
+        if ( y < 0 )
+            return line;
     }
 
     return wxNOT_FOUND;
 }
 
 // ----------------------------------------------------------------------------
-// wxVarScrollHelperBase scrolling
+// scrolling
 // ----------------------------------------------------------------------------
 
-bool wxVarScrollHelperBase::DoScrollToUnit(size_t unit)
+bool wxVScrolledWindow::ScrollToLine(size_t line)
 {
-    if ( !m_unitMax )
+    if ( !m_lineMax )
     {
         // we're empty, code below doesn't make sense in this case
         return false;
     }
 
-    // determine the real first unit to scroll to: we shouldn't scroll beyond
+    // determine the real first line to scroll to: we shouldn't scroll beyond
     // the end
-    size_t unitFirstLast = FindFirstVisibleFromLast(m_unitMax - 1, true);
-    if ( unit > unitFirstLast )
-        unit = unitFirstLast;
+    size_t lineFirstLast = FindFirstFromBottom(m_lineMax - 1, true);
+    if ( line > lineFirstLast )
+        line = lineFirstLast;
 
     // anything to do?
-    if ( unit == m_unitFirst )
+    if ( line == m_lineFirst )
     {
         // no
         return false;
     }
 
 
-    // remember the currently shown units for the refresh code below
-    size_t unitFirstOld = GetVisibleBegin(),
-           unitLastOld = GetVisibleEnd();
+    // remember the currently shown lines for the refresh code below
+    size_t lineFirstOld = GetVisibleBegin(),
+           lineLastOld = GetVisibleEnd();
 
-    m_unitFirst = unit;
+    m_lineFirst = line;
 
 
     // the size of scrollbar thumb could have changed
     UpdateScrollbar();
 
-    // finally refresh the display -- but only redraw as few units as possible
-    // to avoid flicker.  We can't do this if we have children because they
-    // won't be scrolled
-    if ( m_targetWindow->GetChildren().empty() &&
-         (GetVisibleBegin() >= unitLastOld || GetVisibleEnd() <= unitFirstOld) )
+
+    // finally refresh the display -- but only redraw as few lines as possible
+    // to avoid flicker
+    if ( GetChildren().empty() &&
+         (GetVisibleBegin() >= lineLastOld || GetVisibleEnd() <= lineFirstOld ) )
     {
-        // the simplest case: we don't have any old units left, just redraw
+        // the simplest case: we don't have any old lines left, just redraw
         // everything
-        m_targetWindow->Refresh();
+        Refresh();
     }
-    else // scroll the window
+    else // overlap between the lines we showed before and should show now
     {
         // Avoid scrolling visible parts of the screen on Mac
 #ifdef __WXMAC__
-        if (m_physicalScrolling && m_targetWindow->IsShownOnScreen())
-#else
-        if ( m_physicalScrolling )
+        if (!IsShownOnScreen())
+            Refresh();
+        else
 #endif
-        {
-            wxCoord dx = 0,
-                    dy = GetUnitsSize(GetVisibleBegin(), unitFirstOld);
-
-            if ( GetOrientation() == wxHORIZONTAL )
-            {
-                wxCoord tmp = dx;
-                dx = dy;
-                dy = tmp;
-            }
-
-            m_targetWindow->ScrollWindow(dx, dy);
-        }
-        else // !m_physicalScrolling
-        {
-            // we still need to invalidate but we can't use ScrollWindow
-            // because physical scrolling is disabled (the user either didn't
-            // want children scrolled and/or doesn't want pixels to be
-            // physically scrolled).
-            m_targetWindow->Refresh();
-        }
+        ScrollWindow(0, GetLinesHeight(GetVisibleBegin(), lineFirstOld));
     }
 
     return true;
 }
 
-bool wxVarScrollHelperBase::DoScrollUnits(int units)
+bool wxVScrolledWindow::ScrollLines(int lines)
 {
-    units += m_unitFirst;
-    if ( units < 0 )
-        units = 0;
+    lines += m_lineFirst;
+    if ( lines < 0 )
+        lines = 0;
 
-    return DoScrollToUnit(units);
+    return ScrollToLine(lines);
 }
 
-bool wxVarScrollHelperBase::DoScrollPages(int pages)
+bool wxVScrolledWindow::ScrollPages(int pages)
 {
     bool didSomething = false;
 
     while ( pages )
     {
-        int unit;
+        int line;
         if ( pages > 0 )
         {
-            unit = GetVisibleEnd();
-            if ( unit )
-                --unit;
-            --pages;
+            line = GetVisibleEnd();
+            if ( line )
+                line--;
+            pages--;
         }
         else // pages < 0
         {
-            unit = FindFirstVisibleFromLast(GetVisibleEnd());
-            ++pages;
+            line = FindFirstFromBottom(GetVisibleBegin());
+            pages++;
         }
 
-        didSomething = DoScrollToUnit(unit);
+        didSomething = ScrollToLine(line);
     }
 
     return didSomething;
@@ -672,94 +433,71 @@ bool wxVarScrollHelperBase::DoScrollPages(int pages)
 // event handling
 // ----------------------------------------------------------------------------
 
-void wxVarScrollHelperBase::HandleOnSize(wxSizeEvent& event)
+void wxVScrolledWindow::OnSize(wxSizeEvent& event)
 {
-    if ( m_unitMax )
-    {
-        // sometimes change in varscrollable window's size can result in
-        // unused empty space after the last item. Fix it by decrementing
-        // first visible item position according to the available space.
-
-        // determine free space
-        const wxCoord sWindow = GetOrientationTargetSize();
-        wxCoord s = 0;
-        size_t unit;
-        for ( unit = m_unitFirst; unit < m_unitMax; ++unit )
-        {
-            if ( s > sWindow )
-                break;
-
-            s += OnGetUnitSize(unit);
-        }
-        wxCoord freeSpace = sWindow - s;
-
-        // decrement first visible item index as long as there is free space
-        size_t idealUnitFirst;
-        for ( idealUnitFirst = m_unitFirst;
-              idealUnitFirst > 0;
-              idealUnitFirst-- )
-        {
-            wxCoord us = OnGetUnitSize(idealUnitFirst-1);
-            if ( freeSpace < us )
-                break;
-            freeSpace -= us;
-        }
-        m_unitFirst = idealUnitFirst;
-    }
-
     UpdateScrollbar();
 
     event.Skip();
 }
 
-void wxVarScrollHelperBase::HandleOnScroll(wxScrollWinEvent& event)
+void wxVScrolledWindow::OnScroll(wxScrollWinEvent& event)
 {
-    if (GetOrientation() != event.GetOrientation())
+    size_t lineFirstNew;
+
+    const wxEventType evtType = event.GetEventType();
+
+    if ( evtType == wxEVT_SCROLLWIN_TOP )
     {
-        event.Skip();
+        lineFirstNew = 0;
+    }
+    else if ( evtType == wxEVT_SCROLLWIN_BOTTOM )
+    {
+        lineFirstNew = m_lineMax;
+    }
+    else if ( evtType == wxEVT_SCROLLWIN_LINEUP )
+    {
+        lineFirstNew = m_lineFirst ? m_lineFirst - 1 : 0;
+    }
+    else if ( evtType == wxEVT_SCROLLWIN_LINEDOWN )
+    {
+        lineFirstNew = m_lineFirst + 1;
+    }
+    else if ( evtType == wxEVT_SCROLLWIN_PAGEUP )
+    {
+        lineFirstNew = FindFirstFromBottom(m_lineFirst);
+    }
+    else if ( evtType == wxEVT_SCROLLWIN_PAGEDOWN )
+    {
+        lineFirstNew = GetVisibleEnd();
+        if ( lineFirstNew )
+            lineFirstNew--;
+    }
+    else if ( evtType == wxEVT_SCROLLWIN_THUMBRELEASE )
+    {
+        lineFirstNew = event.GetPosition();
+    }
+    else if ( evtType == wxEVT_SCROLLWIN_THUMBTRACK )
+    {
+        lineFirstNew = event.GetPosition();
+    }
+
+    else // unknown scroll event?
+    {
+        wxFAIL_MSG( _T("unknown scroll event type?") );
         return;
     }
 
-    DoScrollToUnit(GetNewScrollPosition(event));
+    ScrollToLine(lineFirstNew);
 
 #ifdef __WXMAC__
-    UpdateMacScrollWindow();
+    Update();
 #endif // __WXMAC__
 }
 
-void wxVarScrollHelperBase::DoPrepareDC(wxDC& dc)
-{
-    if ( m_physicalScrolling )
-    {
-        wxPoint pt = dc.GetDeviceOrigin();
-
-        IncOrient(pt.x, pt.y, -GetScrollOffset());
-
-        dc.SetDeviceOrigin(pt.x, pt.y);
-    }
-}
-
-int wxVarScrollHelperBase::DoCalcScrolledPosition(int coord) const
-{
-    return coord - GetScrollOffset();
-}
-
-int wxVarScrollHelperBase::DoCalcUnscrolledPosition(int coord) const
-{
-    return coord + GetScrollOffset();
-}
-
 #if wxUSE_MOUSEWHEEL
 
-void wxVarScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event)
+void wxVScrolledWindow::OnMouseWheel(wxMouseEvent& event)
 {
-    // we only want to process wheel events for vertical implementations.
-    // There is no way to determine wheel orientation (and on MSW horizontal
-    // wheel rotation just fakes scroll events, rather than sending a MOUSEWHEEL
-    // event).
-    if ( GetOrientation() != wxVERTICAL )
-        return;
-
     m_sumWheelRotation += event.GetWheelRotation();
     int delta = event.GetWheelDelta();
 
@@ -771,251 +509,11 @@ void wxVarScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event)
     m_sumWheelRotation += units_to_scroll*delta;
 
     if ( !event.IsPageScroll() )
-        DoScrollUnits( units_to_scroll*event.GetLinesPerAction() );
-    else // scroll pages instead of units
-        DoScrollPages( units_to_scroll );
+        ScrollLines( units_to_scroll*event.GetLinesPerAction() );
+    else
+        // scroll pages instead of lines
+        ScrollPages( units_to_scroll );
 }
 
 #endif // wxUSE_MOUSEWHEEL
 
-
-// ============================================================================
-// wxVarHVScrollHelper implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxVarHVScrollHelper operations
-// ----------------------------------------------------------------------------
-
-void wxVarHVScrollHelper::SetRowColumnCount(size_t rowCount, size_t columnCount)
-{
-    SetRowCount(rowCount);
-    SetColumnCount(columnCount);
-}
-
-bool wxVarHVScrollHelper::ScrollToRowColumn(size_t row, size_t column)
-{
-    bool result = false;
-    result |= ScrollToRow(row);
-    result |= ScrollToColumn(column);
-    return result;
-}
-
-void wxVarHVScrollHelper::RefreshRowColumn(size_t row, size_t column)
-{
-    // is this unit visible?
-    if ( !IsRowVisible(row) || !IsColumnVisible(column) )
-    {
-        // no, it is useless to do anything
-        return;
-    }
-
-    // calculate the rect occupied by this cell on screen
-    wxRect v_rect, h_rect;
-    v_rect.height = OnGetRowHeight(row);
-    h_rect.width = OnGetColumnWidth(column);
-
-    size_t n;
-
-    for ( n = GetVisibleRowsBegin(); n < row; n++ )
-    {
-        v_rect.y += OnGetRowHeight(n);
-    }
-
-    for ( n = GetVisibleColumnsBegin(); n < column; n++ )
-    {
-        h_rect.x += OnGetColumnWidth(n);
-    }
-
-    // refresh but specialize the behaviour if we have a single target window
-    if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() )
-    {
-        v_rect.x = h_rect.x;
-        v_rect.width = h_rect.width;
-        wxVarVScrollHelper::GetTargetWindow()->RefreshRect(v_rect);
-    }
-    else
-    {
-        v_rect.x = 0;
-        v_rect.width = wxVarVScrollHelper::GetNonOrientationTargetSize();
-        h_rect.y = 0;
-        h_rect.width = wxVarHScrollHelper::GetNonOrientationTargetSize();
-
-        wxVarVScrollHelper::GetTargetWindow()->RefreshRect(v_rect);
-        wxVarHScrollHelper::GetTargetWindow()->RefreshRect(h_rect);
-    }
-}
-
-void wxVarHVScrollHelper::RefreshRowsColumns(size_t fromRow, size_t toRow,
-                                             size_t fromColumn, size_t toColumn)
-{
-    wxASSERT_MSG( fromRow <= toRow || fromColumn <= toColumn,
-        wxT("RefreshRowsColumns(): empty range") );
-
-    // clump the range to just the visible units -- it is useless to refresh
-    // the other ones
-    if ( fromRow < GetVisibleRowsBegin() )
-        fromRow = GetVisibleRowsBegin();
-
-    if ( toRow > GetVisibleRowsEnd() )
-        toRow = GetVisibleRowsEnd();
-
-    if ( fromColumn < GetVisibleColumnsBegin() )
-        fromColumn = GetVisibleColumnsBegin();
-
-    if ( toColumn > GetVisibleColumnsEnd() )
-        toColumn = GetVisibleColumnsEnd();
-
-    // calculate the rect occupied by these units on screen
-    wxRect v_rect, h_rect;
-    size_t nBefore, nBetween;
-
-    for ( nBefore = GetVisibleRowsBegin();
-          nBefore < fromRow;
-          nBefore++ )
-    {
-        v_rect.y += OnGetRowHeight(nBefore);
-    }
-
-    for ( nBetween = fromRow; nBetween <= toRow; nBetween++ )
-    {
-        v_rect.height += OnGetRowHeight(nBetween);
-    }
-
-    for ( nBefore = GetVisibleColumnsBegin();
-          nBefore < fromColumn;
-          nBefore++ )
-    {
-        h_rect.x += OnGetColumnWidth(nBefore);
-    }
-
-    for ( nBetween = fromColumn; nBetween <= toColumn; nBetween++ )
-    {
-        h_rect.width += OnGetColumnWidth(nBetween);
-    }
-
-    // refresh but specialize the behaviour if we have a single target window
-    if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() )
-    {
-        v_rect.x = h_rect.x;
-        v_rect.width = h_rect.width;
-        wxVarVScrollHelper::GetTargetWindow()->RefreshRect(v_rect);
-    }
-    else
-    {
-        v_rect.x = 0;
-        v_rect.width = wxVarVScrollHelper::GetNonOrientationTargetSize();
-        h_rect.y = 0;
-        h_rect.width = wxVarHScrollHelper::GetNonOrientationTargetSize();
-
-        wxVarVScrollHelper::GetTargetWindow()->RefreshRect(v_rect);
-        wxVarHScrollHelper::GetTargetWindow()->RefreshRect(h_rect);
-    }
-}
-
-wxPosition wxVarHVScrollHelper::VirtualHitTest(wxCoord x, wxCoord y) const
-{
-    return wxPosition(wxVarVScrollHelper::VirtualHitTest(y),
-                      wxVarHScrollHelper::VirtualHitTest(x));
-}
-
-void wxVarHVScrollHelper::DoPrepareDC(wxDC& dc)
-{
-    wxVarVScrollHelper::DoPrepareDC(dc);
-    wxVarHScrollHelper::DoPrepareDC(dc);
-}
-
-bool wxVarHVScrollHelper::ScrollLayout()
-{
-    bool layout_result = false;
-    layout_result |= wxVarVScrollHelper::ScrollLayout();
-    layout_result |= wxVarHScrollHelper::ScrollLayout();
-    return layout_result;
-}
-
-wxSize wxVarHVScrollHelper::GetRowColumnCount() const
-{
-    return wxSize(GetColumnCount(), GetRowCount());
-}
-
-wxPosition wxVarHVScrollHelper::GetVisibleBegin() const
-{
-    return wxPosition(GetVisibleRowsBegin(), GetVisibleColumnsBegin());
-}
-
-wxPosition wxVarHVScrollHelper::GetVisibleEnd() const
-{
-    return wxPosition(GetVisibleRowsEnd(), GetVisibleColumnsEnd());
-}
-
-bool wxVarHVScrollHelper::IsVisible(size_t row, size_t column) const
-{
-    return IsRowVisible(row) && IsColumnVisible(column);
-}
-
-
-// ============================================================================
-// wx[V/H/HV]ScrolledWindow implementations
-// ============================================================================
-
-IMPLEMENT_ABSTRACT_CLASS(wxVScrolledWindow, wxPanel)
-IMPLEMENT_ABSTRACT_CLASS(wxHScrolledWindow, wxPanel)
-IMPLEMENT_ABSTRACT_CLASS(wxHVScrolledWindow, wxPanel)
-
-
-#if WXWIN_COMPATIBILITY_2_8
-
-// ===========================================================================
-// wxVarVScrollLegacyAdaptor
-// ===========================================================================
-
-size_t wxVarVScrollLegacyAdaptor::GetFirstVisibleLine() const
-{ return GetVisibleRowsBegin(); }
-
-size_t wxVarVScrollLegacyAdaptor::GetLastVisibleLine() const
-{ return GetVisibleRowsEnd() - 1; }
-
-size_t wxVarVScrollLegacyAdaptor::GetLineCount() const
-{ return GetRowCount(); }
-
-void wxVarVScrollLegacyAdaptor::SetLineCount(size_t count)
-{ SetRowCount(count); }
-
-void wxVarVScrollLegacyAdaptor::RefreshLine(size_t line)
-{ RefreshRow(line); }
-
-void wxVarVScrollLegacyAdaptor::RefreshLines(size_t from, size_t to)
-{ RefreshRows(from, to); }
-
-bool wxVarVScrollLegacyAdaptor::ScrollToLine(size_t line)
-{ return ScrollToRow(line); }
-
-bool wxVarVScrollLegacyAdaptor::ScrollLines(int lines)
-{ return ScrollRows(lines); }
-
-bool wxVarVScrollLegacyAdaptor::ScrollPages(int pages)
-{ return ScrollRowPages(pages); }
-
-wxCoord wxVarVScrollLegacyAdaptor::OnGetLineHeight(size_t WXUNUSED(n)) const
-{
-    wxFAIL_MSG( wxT("OnGetLineHeight() must be overridden if OnGetRowHeight() isn't!") );
-    return -1;
-}
-
-void wxVarVScrollLegacyAdaptor::OnGetLinesHint(size_t WXUNUSED(lineMin),
-                                               size_t WXUNUSED(lineMax)) const
-{
-}
-
-wxCoord wxVarVScrollLegacyAdaptor::OnGetRowHeight(size_t n) const
-{
-    return OnGetLineHeight(n);
-}
-
-void wxVarVScrollLegacyAdaptor::OnGetRowsHeightHint(size_t rowMin,
-                                                    size_t rowMax) const
-{
-    OnGetLinesHint(rowMin, rowMax);
-}
-
-#endif // WXWIN_COMPATIBILITY_2_8
diff --git a/Source/3rd Party/wx/src/jpeg/README b/Source/3rd Party/wx/src/jpeg/README
new file mode 100644
index 000000000..86cc20669
--- /dev/null
+++ b/Source/3rd Party/wx/src/jpeg/README	
@@ -0,0 +1,385 @@
+The Independent JPEG Group's JPEG software
+==========================================
+
+README for release 6b of 27-Mar-1998
+====================================
+
+This distribution contains the sixth public release of the Independent JPEG
+Group's free JPEG software.  You are welcome to redistribute this software and
+to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
+
+Serious users of this software (particularly those incorporating it into
+larger programs) should contact IJG at jpeg-info@uunet.uu.net to be added to
+our electronic mailing list.  Mailing list members are notified of updates
+and have a chance to participate in technical discussions, etc.
+
+This software is the work of Tom Lane, Philip Gladstone, Jim Boucher,
+Lee Crocker, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi,
+Guido Vollbeding, Ge' Weijers, and other members of the Independent JPEG
+Group.
+
+IJG is not affiliated with the official ISO JPEG standards committee.
+
+
+DOCUMENTATION ROADMAP
+=====================
+
+This file contains the following sections:
+
+OVERVIEW            General description of JPEG and the IJG software.
+LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
+REFERENCES          Where to learn more about JPEG.
+ARCHIVE LOCATIONS   Where to find newer versions of this software.
+RELATED SOFTWARE    Other stuff you should get.
+FILE FORMAT WARS    Software *not* to get.
+TO DO               Plans for future IJG releases.
+
+Other documentation files in the distribution are:
+
+User documentation:
+  install.doc       How to configure and install the IJG software.
+  usage.doc         Usage instructions for cjpeg, djpeg, jpegtran,
+                    rdjpgcom, and wrjpgcom.
+  *.1               Unix-style man pages for programs (same info as usage.doc).
+  wizard.doc        Advanced usage instructions for JPEG wizards only.
+  change.log        Version-to-version change highlights.
+Programmer and internal documentation:
+  libjpeg.doc       How to use the JPEG library in your own programs.
+  example.c         Sample code for calling the JPEG library.
+  structure.doc     Overview of the JPEG library's internal structure.
+  filelist.doc      Road map of IJG files.
+  coderules.doc     Coding style rules --- please read if you contribute code.
+
+Please read at least the files install.doc and usage.doc.  Useful information
+can also be found in the JPEG FAQ (Frequently Asked Questions) article.  See
+ARCHIVE LOCATIONS below to find out where to obtain the FAQ article.
+
+If you want to understand how the JPEG code works, we suggest reading one or
+more of the REFERENCES, then looking at the documentation files (in roughly
+the order listed) before diving into the code.
+
+
+OVERVIEW
+========
+
+This package contains C software to implement JPEG image compression and
+decompression.  JPEG (pronounced "jay-peg") is a standardized compression
+method for full-color and gray-scale images.  JPEG is intended for compressing
+"real-world" scenes; line drawings, cartoons and other non-realistic images
+are not its strong suit.  JPEG is lossy, meaning that the output image is not
+exactly identical to the input image.  Hence you must not use JPEG if you
+have to have identical output bits.  However, on typical photographic images,
+very good compression levels can be obtained with no visible change, and
+remarkably high compression levels are possible if you can tolerate a
+low-quality image.  For more details, see the references, or just experiment
+with various compression settings.
+
+This software implements JPEG baseline, extended-sequential, and progressive
+compression processes.  Provision is made for supporting all variants of these
+processes, although some uncommon parameter settings aren't implemented yet.
+For legal reasons, we are not distributing code for the arithmetic-coding
+variants of JPEG; see LEGAL ISSUES.  We have made no provision for supporting
+the hierarchical or lossless processes defined in the standard.
+
+We provide a set of library routines for reading and writing JPEG image files,
+plus two sample applications "cjpeg" and "djpeg", which use the library to
+perform conversion between JPEG and some other popular image file formats.
+The library is intended to be reused in other applications.
+
+In order to support file conversion and viewing software, we have included
+considerable functionality beyond the bare JPEG coding/decoding capability;
+for example, the color quantization modules are not strictly part of JPEG
+decoding, but they are essential for output to colormapped file formats or
+colormapped displays.  These extra functions can be compiled out of the
+library if not required for a particular application.  We have also included
+"jpegtran", a utility for lossless transcoding between different JPEG
+processes, and "rdjpgcom" and "wrjpgcom", two simple applications for
+inserting and extracting textual comments in JFIF files.
+
+The emphasis in designing this software has been on achieving portability and
+flexibility, while also making it fast enough to be useful.  In particular,
+the software is not intended to be read as a tutorial on JPEG.  (See the
+REFERENCES section for introductory material.)  Rather, it is intended to
+be reliable, portable, industrial-strength code.  We do not claim to have
+achieved that goal in every aspect of the software, but we strive for it.
+
+We welcome the use of this software as a component of commercial products.
+No royalty is required, but we do ask for an acknowledgement in product
+documentation, as described under LEGAL ISSUES.
+
+
+LEGAL ISSUES
+============
+
+In plain English:
+
+1. We don't promise that this software works.  (But if you find any bugs,
+   please let us know!)
+2. You can use this software for whatever you want.  You don't have to pay us.
+3. You may not pretend that you wrote this software.  If you use it in a
+   program, you must acknowledge somewhere in your documentation that
+   you've used the IJG code.
+
+In legalese:
+
+The authors make NO WARRANTY or representation, either express or implied,
+with respect to this software, its quality, accuracy, merchantability, or
+fitness for a particular purpose.  This software is provided "AS IS", and you,
+its user, assume the entire risk as to its quality and accuracy.
+
+This software is copyright (C) 1991-1998, Thomas G. Lane.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
+
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library.  If you use our work, you ought to
+acknowledge us.
+
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it.  This software may be referred to only as "the Independent JPEG Group's
+software".
+
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
+
+
+ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
+sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
+ansi2knr.c is NOT covered by the above copyright and conditions, but instead
+by the usual distribution terms of the Free Software Foundation; principally,
+that you must include source code if you redistribute it.  (See the file
+ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
+of any program generated from the IJG code, this does not limit you more than
+the foregoing paragraphs do.
+
+The Unix configuration script "configure" was produced with GNU Autoconf.
+It is copyright by the Free Software Foundation but is freely distributable.
+The same holds for its supporting scripts (config.guess, config.sub,
+ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
+by M.I.T. but is also freely distributable.
+
+It appears that the arithmetic coding option of the JPEG spec is covered by
+patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
+legally be used without obtaining one or more licenses.  For this reason,
+support for arithmetic coding has been removed from the free JPEG software.
+(Since arithmetic coding provides only a marginal gain over the unpatented
+Huffman mode, it is unlikely that very many implementations will support it.)
+So far as we are aware, there are no patent restrictions on the remaining
+code.
+
+The IJG distribution formerly included code to read and write GIF files.
+To avoid entanglement with the Unisys LZW patent, GIF reading support has
+been removed altogether, and the GIF writer has been simplified to produce
+"uncompressed GIFs".  This technique does not use the LZW algorithm; the
+resulting GIF files are larger than usual, but are readable by all standard
+GIF decoders.
+
+We are required to state that
+    "The Graphics Interchange Format(c) is the Copyright property of
+    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
+    CompuServe Incorporated."
+
+
+REFERENCES
+==========
+
+We highly recommend reading one or more of these references before trying to
+understand the innards of the JPEG software.
+
+The best short technical introduction to the JPEG compression algorithm is
+	Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
+	Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
+(Adjacent articles in that issue discuss MPEG motion picture compression,
+applications of JPEG, and related topics.)  If you don't have the CACM issue
+handy, a PostScript file containing a revised version of Wallace's article is
+available at ftp://ftp.uu.net/graphics/jpeg/wallace.ps.gz.  The file (actually
+a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
+omits the sample images that appeared in CACM, but it includes corrections
+and some added material.  Note: the Wallace article is copyright ACM and IEEE,
+and it may not be used for commercial purposes.
+
+A somewhat less technical, more leisurely introduction to JPEG can be found in
+"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
+M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1.  This book provides
+good explanations and example C code for a multitude of compression methods
+including JPEG.  It is an excellent source if you are comfortable reading C
+code but don't know much about data compression in general.  The book's JPEG
+sample code is far from industrial-strength, but when you are ready to look
+at a full implementation, you've got one here...
+
+The best full description of JPEG is the textbook "JPEG Still Image Data
+Compression Standard" by William B. Pennebaker and Joan L. Mitchell, published
+by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.  Price US$59.95, 638 pp.
+The book includes the complete text of the ISO JPEG standards (DIS 10918-1
+and draft DIS 10918-2).  This is by far the most complete exposition of JPEG
+in existence, and we highly recommend it.
+
+The JPEG standard itself is not available electronically; you must order a
+paper copy through ISO or ITU.  (Unless you feel a need to own a certified
+official copy, we recommend buying the Pennebaker and Mitchell book instead;
+it's much cheaper and includes a great deal of useful explanatory material.)
+In the USA, copies of the standard may be ordered from ANSI Sales at (212)
+642-4900, or from Global Engineering Documents at (800) 854-7179.  (ANSI
+doesn't take credit card orders, but Global does.)  It's not cheap: as of
+1992, ANSI was charging $95 for Part 1 and $47 for Part 2, plus 7%
+shipping/handling.  The standard is divided into two parts, Part 1 being the
+actual specification, while Part 2 covers compliance testing methods.  Part 1
+is titled "Digital Compression and Coding of Continuous-tone Still Images,
+Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
+10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
+Continuous-tone Still Images, Part 2: Compliance testing" and has document
+numbers ISO/IEC IS 10918-2, ITU-T T.83.
+
+Some extensions to the original JPEG standard are defined in JPEG Part 3,
+a newer ISO standard numbered ISO/IEC IS 10918-3 and ITU-T T.84.  IJG
+currently does not support any Part 3 extensions.
+
+The JPEG standard does not specify all details of an interchangeable file
+format.  For the omitted details we follow the "JFIF" conventions, revision
+1.02.  A copy of the JFIF spec is available from:
+	Literature Department
+	C-Cube Microsystems, Inc.
+	1778 McCarthy Blvd.
+	Milpitas, CA 95035
+	phone (408) 944-6300,  fax (408) 944-6314
+A PostScript version of this document is available by FTP at
+ftp://ftp.uu.net/graphics/jpeg/jfif.ps.gz.  There is also a plain text
+version at ftp://ftp.uu.net/graphics/jpeg/jfif.txt.gz, but it is missing
+the figures.
+
+The TIFF 6.0 file format specification can be obtained by FTP from
+ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
+found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
+IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
+Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
+(Compression tag 7).  Copies of this Note can be obtained from ftp.sgi.com or
+from ftp://ftp.uu.net/graphics/jpeg/.  It is expected that the next revision
+of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
+Although IJG's own code does not support TIFF/JPEG, the free libtiff library
+uses our library to implement TIFF/JPEG per the Note.  libtiff is available
+from ftp://ftp.sgi.com/graphics/tiff/.
+
+
+ARCHIVE LOCATIONS
+=================
+
+The "official" archive site for this software is ftp.uu.net (Internet
+address 192.48.96.9).  The most recent released version can always be found
+there in directory graphics/jpeg.  This particular version will be archived
+as ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz.  If you don't have
+direct Internet access, UUNET's archives are also available via UUCP; contact
+help@uunet.uu.net for information on retrieving files that way.
+
+Numerous Internet sites maintain copies of the UUNET files.  However, only
+ftp.uu.net is guaranteed to have the latest official version.
+
+You can also obtain this software in DOS-compatible "zip" archive format from
+the SimTel archives (ftp://ftp.simtel.net/pub/simtelnet/msdos/graphics/), or
+on CompuServe in the Graphics Support forum (GO CIS:GRAPHSUP), library 12
+"JPEG Tools".  Again, these versions may sometimes lag behind the ftp.uu.net
+release.
+
+The JPEG FAQ (Frequently Asked Questions) article is a useful source of
+general information about JPEG.  It is updated constantly and therefore is
+not included in this distribution.  The FAQ is posted every two weeks to
+Usenet newsgroups comp.graphics.misc, news.answers, and other groups.
+It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
+and other news.answers archive sites, including the official news.answers
+archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
+If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
+with body
+	send usenet/news.answers/jpeg-faq/part1
+	send usenet/news.answers/jpeg-faq/part2
+
+
+RELATED SOFTWARE
+================
+
+Numerous viewing and image manipulation programs now support JPEG.  (Quite a
+few of them use this library to do so.)  The JPEG FAQ described above lists
+some of the more popular free and shareware viewers, and tells where to
+obtain them on Internet.
+
+If you are on a Unix machine, we highly recommend Jef Poskanzer's free
+PBMPLUS software, which provides many useful operations on PPM-format image
+files.  In particular, it can convert PPM images to and from a wide range of
+other formats, thus making cjpeg/djpeg considerably more useful.  The latest
+version is distributed by the NetPBM group, and is available from numerous
+sites, notably ftp://wuarchive.wustl.edu/graphics/graphics/packages/NetPBM/.
+Unfortunately PBMPLUS/NETPBM is not nearly as portable as the IJG software is;
+you are likely to have difficulty making it work on any non-Unix machine.
+
+A different free JPEG implementation, written by the PVRG group at Stanford,
+is available from ftp://havefun.stanford.edu/pub/jpeg/.  This program
+is designed for research and experimentation rather than production use;
+it is slower, harder to use, and less portable than the IJG code, but it
+is easier to read and modify.  Also, the PVRG code supports lossless JPEG,
+which we do not.  (On the other hand, it doesn't do progressive JPEG.)
+
+
+FILE FORMAT WARS
+================
+
+Some JPEG programs produce files that are not compatible with our library.
+The root of the problem is that the ISO JPEG committee failed to specify a
+concrete file format.  Some vendors "filled in the blanks" on their own,
+creating proprietary formats that no one else could read.  (For example, none
+of the early commercial JPEG implementations for the Macintosh were able to
+exchange compressed files.)
+
+The file format we have adopted is called JFIF (see REFERENCES).  This format
+has been agreed to by a number of major commercial JPEG vendors, and it has
+become the de facto standard.  JFIF is a minimal or "low end" representation.
+We recommend the use of TIFF/JPEG (TIFF revision 6.0 as modified by TIFF
+Technical Note #2) for "high end" applications that need to record a lot of
+additional data about an image.  TIFF/JPEG is fairly new and not yet widely
+supported, unfortunately.
+
+The upcoming JPEG Part 3 standard defines a file format called SPIFF.
+SPIFF is interoperable with JFIF, in the sense that most JFIF decoders should
+be able to read the most common variant of SPIFF.  SPIFF has some technical
+advantages over JFIF, but its major claim to fame is simply that it is an
+official standard rather than an informal one.  At this point it is unclear
+whether SPIFF will supersede JFIF or whether JFIF will remain the de-facto
+standard.  IJG intends to support SPIFF once the standard is frozen, but we
+have not decided whether it should become our default output format or not.
+(In any case, our decoder will remain capable of reading JFIF indefinitely.)
+
+Various proprietary file formats incorporating JPEG compression also exist.
+We have little or no sympathy for the existence of these formats.  Indeed,
+one of the original reasons for developing this free software was to help
+force convergence on common, open format standards for JPEG files.  Don't
+use a proprietary file format!
+
+
+TO DO
+=====
+
+The major thrust for v7 will probably be improvement of visual quality.
+The current method for scaling the quantization tables is known not to be
+very good at low Q values.  We also intend to investigate block boundary
+smoothing, "poor man's variable quantization", and other means of improving
+quality-vs-file-size performance without sacrificing compatibility.
+
+In future versions, we are considering supporting some of the upcoming JPEG
+Part 3 extensions --- principally, variable quantization and the SPIFF file
+format.
+
+As always, speeding things up is of great interest.
+
+Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net.
diff --git a/Source/3rd Party/wx/src/jpeg/ansi2knr.c b/Source/3rd Party/wx/src/jpeg/ansi2knr.c
new file mode 100644
index 000000000..4e05fc2d3
--- /dev/null
+++ b/Source/3rd Party/wx/src/jpeg/ansi2knr.c	
@@ -0,0 +1,693 @@
+/* ansi2knr.c */
+/* Convert ANSI C function definitions to K&R ("traditional C") syntax */
+
+/*
+ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY.  No author or distributor accepts responsibility to anyone for the
+consequences of using it or for whether it serves any particular purpose or
+works at all, unless he says so in writing.  Refer to the GNU General Public
+License (the "GPL") for full details.
+
+Everyone is granted permission to copy, modify and redistribute ansi2knr,
+but only under the conditions described in the GPL.  A copy of this license
+is supposed to have been given to you along with ansi2knr so you can know
+your rights and responsibilities.  It should be in a file named COPYLEFT.
+[In the IJG distribution, the GPL appears below, not in a separate file.]
+Among other things, the copyright notice and this notice must be preserved
+on all copies.
+
+We explicitly state here what we believe is already implied by the GPL: if
+the ansi2knr program is distributed as a separate set of sources and a
+separate executable file which are aggregated on a storage medium together
+with another program, this in itself does not bring the other program under
+the GPL, nor does the mere fact that such a program or the procedures for
+constructing it invoke the ansi2knr executable bring any other part of the
+program under the GPL.
+*/
+
+/*
+---------- Here is the GNU GPL file COPYLEFT, referred to above ----------
+----- These terms do NOT apply to the JPEG software itself; see README ------
+
+		    GHOSTSCRIPT GENERAL PUBLIC LICENSE
+		    (Clarified 11 Feb 1988)
+
+ Copyright (C) 1988 Richard M. Stallman
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license, but changing it is not allowed.  You can also use this wording
+ to make the terms for other programs.
+
+  The license agreements of most software companies keep you at the
+mercy of those companies.  By contrast, our general public license is
+intended to give everyone the right to share Ghostscript.  To make sure
+that you get the rights we want you to have, we need to make
+restrictions that forbid anyone to deny you these rights or to ask you
+to surrender the rights.  Hence this license agreement.
+
+  Specifically, we want to make sure that you have the right to give
+away copies of Ghostscript, that you receive source code or else can get
+it if you want it, that you can change Ghostscript or use pieces of it
+in new free programs, and that you know you can do these things.
+
+  To make sure that everyone has such rights, we have to forbid you to
+deprive anyone else of these rights.  For example, if you distribute
+copies of Ghostscript, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must tell them their rights.
+
+  Also, for our own protection, we must make certain that everyone finds
+out that there is no warranty for Ghostscript.  If Ghostscript is
+modified by someone else and passed on, we want its recipients to know
+that what they have is not what we distributed, so that any problems
+introduced by others will not reflect on our reputation.
+
+  Therefore we (Richard M. Stallman and the Free Software Foundation,
+Inc.) make the following terms which say what you must do to be allowed
+to distribute or change Ghostscript.
+
+
+			COPYING POLICIES
+
+  1. You may copy and distribute verbatim copies of Ghostscript source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy a valid copyright and license
+notice "Copyright (C) 1989 Aladdin Enterprises.  All rights reserved.
+Distributed by Free Software Foundation, Inc." (or with whatever year is
+appropriate); keep intact the notices on all files that refer to this
+License Agreement and to the absence of any warranty; and give any other
+recipients of the Ghostscript program a copy of this License Agreement
+along with the program.  You may charge a distribution fee for the
+physical act of transferring a copy.
+
+  2. You may modify your copy or copies of Ghostscript or any portion of
+it, and copy and distribute such modifications under the terms of
+Paragraph 1 above, provided that you also do the following:
+
+    a) cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change; and
+
+    b) cause the whole of any work that you distribute or publish,
+    that in whole or in part contains or is a derivative of Ghostscript
+    or any part thereof, to be licensed at no charge to all third
+    parties on terms identical to those contained in this License
+    Agreement (except that you may choose to grant more extensive
+    warranty protection to some or all third parties, at your option).
+
+    c) You may charge a distribution fee for the physical act of
+    transferring a copy, and you may at your option offer warranty
+    protection in exchange for a fee.
+
+Mere aggregation of another unrelated program with this program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other program under the scope of these terms.
+
+  3. You may copy and distribute Ghostscript (or a portion or derivative
+of it, under Paragraph 2) in object code or executable form under the
+terms of Paragraphs 1 and 2 above provided that you also do one of the
+following:
+
+    a) accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    b) accompany it with a written offer, valid for at least three
+    years, to give any third party free (except for a nominal
+    shipping charge) a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    c) accompany it with the information you received as to where the
+    corresponding source code may be obtained.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form alone.)
+
+For an executable file, complete source code means all the source code for
+all modules it contains; but, as a special exception, it need not include
+source code for modules which are standard libraries that accompany the
+operating system on which the executable file runs.
+
+  4. You may not copy, sublicense, distribute or transfer Ghostscript
+except as expressly provided under this License Agreement.  Any attempt
+otherwise to copy, sublicense, distribute or transfer Ghostscript is
+void and your rights to use the program under this License agreement
+shall be automatically terminated.  However, parties who have received
+computer software programs from you with this License Agreement will not
+have their licenses terminated so long as such parties remain in full
+compliance.
+
+  5. If you wish to incorporate parts of Ghostscript into other free
+programs whose distribution conditions are different, write to the Free
+Software Foundation at 675 Mass Ave, Cambridge, MA 02139.  We have not
+yet worked out a simple rule that can be stated here, but we will often
+permit this.  We will be guided by the two goals of preserving the free
+status of all derivatives of our free software and of promoting the
+sharing and reuse of software.
+
+Your comments and suggestions about our licensing policies and our
+software are welcome!  Please contact the Free Software Foundation,
+Inc., 675 Mass Ave, Cambridge, MA 02139, or call (617) 876-3296.
+
+		       NO WARRANTY
+
+  BECAUSE GHOSTSCRIPT IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY
+NO WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW.  EXCEPT
+WHEN OTHERWISE STATED IN WRITING, FREE SOFTWARE FOUNDATION, INC, RICHARD
+M. STALLMAN, ALADDIN ENTERPRISES, L. PETER DEUTSCH, AND/OR OTHER PARTIES
+PROVIDE GHOSTSCRIPT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF GHOSTSCRIPT IS WITH
+YOU.  SHOULD GHOSTSCRIPT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL RICHARD M.
+STALLMAN, THE FREE SOFTWARE FOUNDATION, INC., L. PETER DEUTSCH, ALADDIN
+ENTERPRISES, AND/OR ANY OTHER PARTY WHO MAY MODIFY AND REDISTRIBUTE
+GHOSTSCRIPT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
+ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) GHOSTSCRIPT, EVEN IF YOU
+HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM
+BY ANY OTHER PARTY.
+
+-------------------- End of file COPYLEFT ------------------------------
+*/
+
+/*
+ * Usage:
+	ansi2knr input_file [output_file]
+ * If no output_file is supplied, output goes to stdout.
+ * There are no error messages.
+ *
+ * ansi2knr recognizes function definitions by seeing a non-keyword
+ * identifier at the left margin, followed by a left parenthesis,
+ * with a right parenthesis as the last character on the line,
+ * and with a left brace as the first token on the following line
+ * (ignoring possible intervening comments).
+ * It will recognize a multi-line header provided that no intervening
+ * line ends with a left or right brace or a semicolon.
+ * These algorithms ignore whitespace and comments, except that
+ * the function name must be the first thing on the line.
+ * The following constructs will confuse it:
+ *	- Any other construct that starts at the left margin and
+ *	    follows the above syntax (such as a macro or function call).
+ *	- Some macros that tinker with the syntax of the function header.
+ */
+
+/*
+ * The original and principal author of ansi2knr is L. Peter Deutsch
+ * <ghost@aladdin.com>.  Other authors are noted in the change history
+ * that follows (in reverse chronological order):
+	lpd 96-01-21 added code to cope with not HAVE_CONFIG_H and with
+		compilers that don't understand void, as suggested by
+		Tom Lane
+	lpd 96-01-15 changed to require that the first non-comment token
+		on the line following a function header be a left brace,
+		to reduce sensitivity to macros, as suggested by Tom Lane
+		<tgl@sss.pgh.pa.us>
+	lpd 95-06-22 removed #ifndefs whose sole purpose was to define
+		undefined preprocessor symbols as 0; changed all #ifdefs
+		for configuration symbols to #ifs
+	lpd 95-04-05 changed copyright notice to make it clear that
+		including ansi2knr in a program does not bring the entire
+		program under the GPL
+	lpd 94-12-18 added conditionals for systems where ctype macros
+		don't handle 8-bit characters properly, suggested by
+		Francois Pinard <pinard@iro.umontreal.ca>;
+		removed --varargs switch (this is now the default)
+	lpd 94-10-10 removed CONFIG_BROKETS conditional
+	lpd 94-07-16 added some conditionals to help GNU `configure',
+		suggested by Francois Pinard <pinard@iro.umontreal.ca>;
+		properly erase prototype args in function parameters,
+		contributed by Jim Avera <jima@netcom.com>;
+		correct error in writeblanks (it shouldn't erase EOLs)
+	lpd 89-xx-xx original version
+ */
+
+/* Most of the conditionals here are to make ansi2knr work with */
+/* or without the GNU configure machinery. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+
+#if HAVE_CONFIG_H
+
+/*
+   For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
+   This will define HAVE_CONFIG_H and so, activate the following lines.
+ */
+
+# if STDC_HEADERS || HAVE_STRING_H
+#  include <string.h>
+# else
+#  include <strings.h>
+# endif
+
+#else /* not HAVE_CONFIG_H */
+
+/* Otherwise do it the hard way */
+
+# ifdef BSD
+#  include <strings.h>
+# else
+#  ifdef VMS
+    extern int strlen(), strncmp();
+#  else
+#   include <string.h>
+#  endif
+# endif
+
+#endif /* not HAVE_CONFIG_H */
+
+#if STDC_HEADERS
+# include <stdlib.h>
+#else
+/*
+   malloc and free should be declared in stdlib.h,
+   but if you've got a K&R compiler, they probably aren't.
+ */
+# ifdef MSDOS
+#  include <malloc.h>
+# else
+#  ifdef VMS
+     extern char *malloc();
+     extern void free();
+#  else
+     extern char *malloc();
+     extern int free();
+#  endif
+# endif
+
+#endif
+
+/*
+ * The ctype macros don't always handle 8-bit characters correctly.
+ * Compensate for this here.
+ */
+#ifdef isascii
+#  undef HAVE_ISASCII		/* just in case */
+#  define HAVE_ISASCII 1
+#else
+#endif
+#if STDC_HEADERS || !HAVE_ISASCII
+#  define is_ascii(c) 1
+#else
+#  define is_ascii(c) isascii(c)
+#endif
+
+#define is_space(c) (is_ascii(c) && isspace(c))
+#define is_alpha(c) (is_ascii(c) && isalpha(c))
+#define is_alnum(c) (is_ascii(c) && isalnum(c))
+
+/* Scanning macros */
+#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
+#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
+
+/* Forward references */
+char *skipspace();
+int writeblanks();
+int test1();
+int convert1();
+
+/* The main program */
+int
+main(argc, argv)
+    int argc;
+    char *argv[];
+{	FILE *in, *out;
+#define bufsize 5000			/* arbitrary size */
+	char *buf;
+	char *line;
+	char *more;
+	/*
+	 * In previous versions, ansi2knr recognized a --varargs switch.
+	 * If this switch was supplied, ansi2knr would attempt to convert
+	 * a ... argument to va_alist and va_dcl; if this switch was not
+	 * supplied, ansi2knr would simply drop any such arguments.
+	 * Now, ansi2knr always does this conversion, and we only
+	 * check for this switch for backward compatibility.
+	 */
+	int convert_varargs = 1;
+
+	if ( argc > 1 && argv[1][0] == '-' )
+	  {	if ( !strcmp(argv[1], "--varargs") )
+		  {	convert_varargs = 1;
+			argc--;
+			argv++;
+		  }
+		else
+		  {	fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
+			exit(1);
+		  }
+	  }
+	switch ( argc )
+	   {
+	default:
+		printf("Usage: ansi2knr input_file [output_file]\n");
+		exit(0);
+	case 2:
+		out = stdout;
+		break;
+	case 3:
+		out = fopen(argv[2], "w");
+		if ( out == NULL )
+		   {	fprintf(stderr, "Cannot open output file %s\n", argv[2]);
+			exit(1);
+		   }
+	   }
+	in = fopen(argv[1], "r");
+	if ( in == NULL )
+	   {	fprintf(stderr, "Cannot open input file %s\n", argv[1]);
+		exit(1);
+	   }
+	fprintf(out, "#line 1 \"%s\"\n", argv[1]);
+	buf = malloc(bufsize);
+	line = buf;
+	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
+	   {
+test:		line += strlen(line);
+		switch ( test1(buf) )
+		   {
+		case 2:			/* a function header */
+			convert1(buf, out, 1, convert_varargs);
+			break;
+		case 1:			/* a function */
+			/* Check for a { at the start of the next line. */
+			more = ++line;
+f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
+			  goto wl;
+			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
+			  goto wl;
+			switch ( *skipspace(more, 1) )
+			  {
+			  case '{':
+			    /* Definitely a function header. */
+			    convert1(buf, out, 0, convert_varargs);
+			    fputs(more, out);
+			    break;
+			  case 0:
+			    /* The next line was blank or a comment: */
+			    /* keep scanning for a non-comment. */
+			    line += strlen(line);
+			    goto f;
+			  default:
+			    /* buf isn't a function header, but */
+			    /* more might be. */
+			    fputs(buf, out);
+			    strcpy(buf, more);
+			    line = buf;
+			    goto test;
+			  }
+			break;
+		case -1:		/* maybe the start of a function */
+			if ( line != buf + (bufsize - 1) ) /* overflow check */
+			  continue;
+			/* falls through */
+		default:		/* not a function */
+wl:			fputs(buf, out);
+			break;
+		   }
+		line = buf;
+	   }
+	if ( line != buf )
+	  fputs(buf, out);
+	free(buf);
+	fclose(out);
+	fclose(in);
+	return 0;
+}
+
+/* Skip over space and comments, in either direction. */
+char *
+skipspace(p, dir)
+    register char *p;
+    register int dir;			/* 1 for forward, -1 for backward */
+{	for ( ; ; )
+	   {	while ( is_space(*p) )
+		  p += dir;
+		if ( !(*p == '/' && p[dir] == '*') )
+		  break;
+		p += dir;  p += dir;
+		while ( !(*p == '*' && p[dir] == '/') )
+		   {	if ( *p == 0 )
+			  return p;	/* multi-line comment?? */
+			p += dir;
+		   }
+		p += dir;  p += dir;
+	   }
+	return p;
+}
+
+/*
+ * Write blanks over part of a string.
+ * Don't overwrite end-of-line characters.
+ */
+int
+writeblanks(start, end)
+    char *start;
+    char *end;
+{	char *p;
+	for ( p = start; p < end; p++ )
+	  if ( *p != '\r' && *p != '\n' )
+	    *p = ' ';
+	return 0;
+}
+
+/*
+ * Test whether the string in buf is a function definition.
+ * The string may contain and/or end with a newline.
+ * Return as follows:
+ *	0 - definitely not a function definition;
+ *	1 - definitely a function definition;
+ *	2 - definitely a function prototype (NOT USED);
+ *	-1 - may be the beginning of a function definition,
+ *		append another line and look again.
+ * The reason we don't attempt to convert function prototypes is that
+ * Ghostscript's declaration-generating macros look too much like
+ * prototypes, and confuse the algorithms.
+ */
+int
+test1(buf)
+    char *buf;
+{	register char *p = buf;
+	char *bend;
+	char *endfn;
+	int contin;
+
+	if ( !isidfirstchar(*p) )
+	  return 0;		/* no name at left margin */
+	bend = skipspace(buf + strlen(buf) - 1, -1);
+	switch ( *bend )
+	   {
+	   case ';': contin = 0 /*2*/; break;
+	   case ')': contin = 1; break;
+	   case '{': return 0;		/* not a function */
+	   case '}': return 0;		/* not a function */
+	   default: contin = -1;
+	   }
+	while ( isidchar(*p) )
+	  p++;
+	endfn = p;
+	p = skipspace(p, 1);
+	if ( *p++ != '(' )
+	  return 0;		/* not a function */
+	p = skipspace(p, 1);
+	if ( *p == ')' )
+	  return 0;		/* no parameters */
+	/* Check that the apparent function name isn't a keyword. */
+	/* We only need to check for keywords that could be followed */
+	/* by a left parenthesis (which, unfortunately, is most of them). */
+	   {	static char *words[] =
+		   {	"asm", "auto", "case", "char", "const", "double",
+			"extern", "float", "for", "if", "int", "long",
+			"register", "return", "short", "signed", "sizeof",
+			"static", "switch", "typedef", "unsigned",
+			"void", "volatile", "while", 0
+		   };
+		char **key = words;
+		char *kp;
+		int len = endfn - buf;
+
+		while ( (kp = *key) != 0 )
+		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
+			  return 0;	/* name is a keyword */
+			key++;
+		   }
+	   }
+	return contin;
+}
+
+/* Convert a recognized function definition or header to K&R syntax. */
+int
+convert1(buf, out, header, convert_varargs)
+    char *buf;
+    FILE *out;
+    int header;			/* Boolean */
+    int convert_varargs;	/* Boolean */
+{	char *endfn;
+	register char *p;
+	char **breaks;
+	unsigned num_breaks = 2;	/* for testing */
+	char **btop;
+	char **bp;
+	char **ap;
+	char *vararg = 0;
+
+	/* Pre-ANSI implementations don't agree on whether strchr */
+	/* is called strchr or index, so we open-code it here. */
+	for ( endfn = buf; *(endfn++) != '('; )
+	  ;
+top:	p = endfn;
+	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
+	if ( breaks == 0 )
+	   {	/* Couldn't allocate break table, give up */
+		fprintf(stderr, "Unable to allocate break table!\n");
+		fputs(buf, out);
+		return -1;
+	   }
+	btop = breaks + num_breaks * 2 - 2;
+	bp = breaks;
+	/* Parse the argument list */
+	do
+	   {	int level = 0;
+		char *lp = NULL;
+		char *rp;
+		char *end = NULL;
+
+		if ( bp >= btop )
+		   {	/* Filled up break table. */
+			/* Allocate a bigger one and start over. */
+			free((char *)breaks);
+			num_breaks <<= 1;
+			goto top;
+		   }
+		*bp++ = p;
+		/* Find the end of the argument */
+		for ( ; end == NULL; p++ )
+		   {	switch(*p)
+			   {
+			   case ',':
+				if ( !level ) end = p;
+				break;
+			   case '(':
+				if ( !level ) lp = p;
+				level++;
+				break;
+			   case ')':
+				if ( --level < 0 ) end = p;
+				else rp = p;
+				break;
+			   case '/':
+				p = skipspace(p, 1) - 1;
+				break;
+			   default:
+				;
+			   }
+		   }
+		/* Erase any embedded prototype parameters. */
+		if ( lp )
+		  writeblanks(lp + 1, rp);
+		p--;			/* back up over terminator */
+		/* Find the name being declared. */
+		/* This is complicated because of procedure and */
+		/* array modifiers. */
+		for ( ; ; )
+		   {	p = skipspace(p - 1, -1);
+			switch ( *p )
+			   {
+			   case ']':	/* skip array dimension(s) */
+			   case ')':	/* skip procedure args OR name */
+			   {	int level = 1;
+				while ( level )
+				 switch ( *--p )
+				   {
+				   case ']': case ')': level++; break;
+				   case '[': case '(': level--; break;
+				   case '/': p = skipspace(p, -1) + 1; break;
+				   default: ;
+				   }
+			   }
+				if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
+				   {	/* We found the name being declared */
+					while ( !isidfirstchar(*p) )
+					  p = skipspace(p, 1) + 1;
+					goto found;
+				   }
+				break;
+			   default:
+				goto found;
+			   }
+		   }
+found:		if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
+		  {	if ( convert_varargs )
+			  {	*bp++ = "va_alist";
+				vararg = p-2;
+			  }
+			else
+			  {	p++;
+				if ( bp == breaks + 1 )	/* sole argument */
+				  writeblanks(breaks[0], p);
+				else
+				  writeblanks(bp[-1] - 1, p);
+				bp--;
+			  }
+		   }
+		else
+		   {	while ( isidchar(*p) ) p--;
+			*bp++ = p+1;
+		   }
+		p = end;
+	   }
+	while ( *p++ == ',' );
+	*bp = p;
+	/* Make a special check for 'void' arglist */
+	if ( bp == breaks+2 )
+	   {	p = skipspace(breaks[0], 1);
+		if ( !strncmp(p, "void", 4) )
+		   {	p = skipspace(p+4, 1);
+			if ( p == breaks[2] - 1 )
+			   {	bp = breaks;	/* yup, pretend arglist is empty */
+				writeblanks(breaks[0], p + 1);
+			   }
+		   }
+	   }
+	/* Put out the function name and left parenthesis. */
+	p = buf;
+	while ( p != endfn ) putc(*p, out), p++;
+	/* Put out the declaration. */
+	if ( header )
+	  {	fputs(");", out);
+		for ( p = breaks[0]; *p; p++ )
+		  if ( *p == '\r' || *p == '\n' )
+		    putc(*p, out);
+	  }
+	else
+	  {	for ( ap = breaks+1; ap < bp; ap += 2 )
+		  {	p = *ap;
+			while ( isidchar(*p) )
+			  putc(*p, out), p++;
+			if ( ap < bp - 1 )
+			  fputs(", ", out);
+		  }
+		fputs(")  ", out);
+		/* Put out the argument declarations */
+		for ( ap = breaks+2; ap <= bp; ap += 2 )
+		  (*ap)[-1] = ';';
+		if ( vararg != 0 )
+		  {	*vararg = 0;
+			fputs(breaks[0], out);		/* any prior args */
+			fputs("va_dcl", out);		/* the final arg */
+			fputs(bp[0], out);
+		  }
+		else
+		  fputs(breaks[0], out);
+	  }
+	free((char *)breaks);
+	return 0;
+}
diff --git a/Source/3rd Party/wx/src/jpeg/change.log b/Source/3rd Party/wx/src/jpeg/change.log
new file mode 100644
index 000000000..74102c0db
--- /dev/null
+++ b/Source/3rd Party/wx/src/jpeg/change.log	
@@ -0,0 +1,217 @@
+CHANGE LOG for Independent JPEG Group's JPEG software
+
+
+Version 6b  27-Mar-1998
+-----------------------
+
+jpegtran has new features for lossless image transformations (rotation
+and flipping) as well as "lossless" reduction to grayscale.
+
+jpegtran now copies comments by default; it has a -copy switch to enable
+copying all APPn blocks as well, or to suppress comments.  (Formerly it
+always suppressed comments and APPn blocks.)  jpegtran now also preserves
+JFIF version and resolution information.
+
+New decompressor library feature: COM and APPn markers found in the input
+file can be saved in memory for later use by the application.  (Before,
+you had to code this up yourself with a custom marker processor.)
+
+There is an unused field "void * client_data" now in compress and decompress
+parameter structs; this may be useful in some applications.
+
+JFIF version number information is now saved by the decoder and accepted by
+the encoder.  jpegtran uses this to copy the source file's version number,
+to ensure "jpegtran -copy all" won't create bogus files that contain JFXX
+extensions but claim to be version 1.01.  Applications that generate their
+own JFXX extension markers also (finally) have a supported way to cause the
+encoder to emit JFIF version number 1.02.
+
+djpeg's trace mode reports JFIF 1.02 thumbnail images as such, rather
+than as unknown APP0 markers.
+
+In -verbose mode, djpeg and rdjpgcom will try to print the contents of
+APP12 markers as text.  Some digital cameras store useful text information
+in APP12 markers.
+
+Handling of truncated data streams is more robust: blocks beyond the one in
+which the error occurs will be output as uniform gray, or left unchanged
+if decoding a progressive JPEG.  The appearance no longer depends on the
+Huffman tables being used.
+
+Huffman tables are checked for validity much more carefully than before.
+
+To avoid the Unisys LZW patent, djpeg's GIF output capability has been
+changed to produce "uncompressed GIFs", and cjpeg's GIF input capability
+has been removed altogether.  We're not happy about it either, but there
+seems to be no good alternative.
+
+The configure script now supports building libjpeg as a shared library
+on many flavors of Unix (all the ones that GNU libtool knows how to
+build shared libraries for).  Use "./configure --enable-shared" to
+try this out.
+
+New jconfig file and makefiles for Microsoft Visual C++ and Developer Studio.
+Also, a jconfig file and a build script for Metrowerks CodeWarrior
+on Apple Macintosh.  makefile.dj has been updated for DJGPP v2, and there
+are miscellaneous other minor improvements in the makefiles.
+
+jmemmac.c now knows how to create temporary files following Mac System 7
+conventions.
+
+djpeg's -map switch is now able to read raw-format PPM files reliably.
+
+cjpeg -progressive -restart no longer generates any unnecessary DRI markers.
+
+Multiple calls to jpeg_simple_progression for a single JPEG object
+no longer leak memory.
+
+
+Version 6a  7-Feb-96
+--------------------
+
+Library initialization sequence modified to detect version mismatches
+and struct field packing mismatches between library and calling application.
+This change requires applications to be recompiled, but does not require
+any application source code change.
+
+All routine declarations changed to the style "GLOBAL(type) name ...",
+that is, GLOBAL, LOCAL, METHODDEF, EXTERN are now macros taking the
+routine's return type as an argument.  This makes it possible to add
+Microsoft-style linkage keywords to all the routines by changing just
+these macros.  Note that any application code that was using these macros
+will have to be changed.
+
+DCT coefficient quantization tables are now stored in normal array order
+rather than zigzag order.  Application code that calls jpeg_add_quant_table,
+or otherwise manipulates quantization tables directly, will need to be
+changed.  If you need to make such code work with either older or newer
+versions of the library, a test like "#if JPEG_LIB_VERSION >= 61" is
+recommended.
+
+djpeg's trace capability now dumps DQT tables in natural order, not zigzag
+order.  This allows the trace output to be made into a "-qtables" file
+more easily.
+
+New system-dependent memory manager module for use on Apple Macintosh.
+
+Fix bug in cjpeg's -smooth option: last one or two scanlines would be
+duplicates of the prior line unless the image height mod 16 was 1 or 2.
+
+Repair minor problems in VMS, BCC, MC6 makefiles.
+
+New configure script based on latest GNU Autoconf.
+
+Correct the list of include files needed by MetroWerks C for ccommand().
+
+Numerous small documentation updates.
+
+
+Version 6  2-Aug-95
+-------------------
+
+Progressive JPEG support: library can read and write full progressive JPEG
+files.  A "buffered image" mode supports incremental decoding for on-the-fly
+display of progressive images.  Simply recompiling an existing IJG-v5-based
+decoder with v6 should allow it to read progressive files, though of course
+without any special progressive display.
+
+New "jpegtran" application performs lossless transcoding between different
+JPEG formats; primarily, it can be used to convert baseline to progressive
+JPEG and vice versa.  In support of jpegtran, the library now allows lossless
+reading and writing of JPEG files as DCT coefficient arrays.  This ability
+may be of use in other applications.
+
+Notes for programmers:
+* We changed jpeg_start_decompress() to be able to suspend; this makes all
+decoding modes available to suspending-input applications.  However,
+existing applications that use suspending input will need to be changed
+to check the return value from jpeg_start_decompress().  You don't need to
+do anything if you don't use a suspending data source.
+* We changed the interface to the virtual array routines: access_virt_array
+routines now take a count of the number of rows to access this time.  The
+last parameter to request_virt_array routines is now interpreted as the
+maximum number of rows that may be accessed at once, but not necessarily
+the height of every access.
+
+
+Version 5b  15-Mar-95
+---------------------
+
+Correct bugs with grayscale images having v_samp_factor > 1.
+
+jpeg_write_raw_data() now supports output suspension.
+
+Correct bugs in "configure" script for case of compiling in
+a directory other than the one containing the source files.
+
+Repair bug in jquant1.c: sometimes didn't use as many colors as it could.
+
+Borland C makefile and jconfig file work under either MS-DOS or OS/2.
+
+Miscellaneous improvements to documentation.
+
+
+Version 5a  7-Dec-94
+--------------------
+
+Changed color conversion roundoff behavior so that grayscale values are
+represented exactly.  (This causes test image files to change.)
+
+Make ordered dither use 16x16 instead of 4x4 pattern for a small quality
+improvement.
+
+New configure script based on latest GNU Autoconf.
+Fix configure script to handle CFLAGS correctly.
+Rename *.auto files to *.cfg, so that configure script still works if
+file names have been truncated for DOS.
+
+Fix bug in rdbmp.c: didn't allow for extra data between header and image.
+
+Modify rdppm.c/wrppm.c to handle 2-byte raw PPM/PGM formats for 12-bit data.
+
+Fix several bugs in rdrle.c.
+
+NEED_SHORT_EXTERNAL_NAMES option was broken.
+
+Revise jerror.h/jerror.c for more flexibility in message table.
+
+Repair oversight in jmemname.c NO_MKTEMP case: file could be there
+but unreadable.
+
+
+Version 5  24-Sep-94
+--------------------
+
+Version 5 represents a nearly complete redesign and rewrite of the IJG
+software.  Major user-visible changes include:
+  * Automatic configuration simplifies installation for most Unix systems.
+  * A range of speed vs. image quality tradeoffs are supported.
+    This includes resizing of an image during decompression: scaling down
+    by a factor of 1/2, 1/4, or 1/8 is handled very efficiently.
+  * New programs rdjpgcom and wrjpgcom allow insertion and extraction
+    of text comments in a JPEG file.
+
+The application programmer's interface to the library has changed completely.
+Notable improvements include:
+  * We have eliminated the use of callback routines for handling the
+    uncompressed image data.  The application now sees the library as a
+    set of routines that it calls to read or write image data on a
+    scanline-by-scanline basis.
+  * The application image data is represented in a conventional interleaved-
+    pixel format, rather than as a separate array for each color channel.
+    This can save a copying step in many programs.
+  * The handling of compressed data has been cleaned up: the application can
+    supply routines to source or sink the compressed data.  It is possible to
+    suspend processing on source/sink buffer overrun, although this is not
+    supported in all operating modes.
+  * All static state has been eliminated from the library, so that multiple
+    instances of compression or decompression can be active concurrently.
+  * JPEG abbreviated datastream formats are supported, ie, quantization and
+    Huffman tables can be stored separately from the image data.
+  * And not only that, but the documentation of the library has improved
+    considerably!
+
+
+The last widely used release before the version 5 rewrite was version 4A of
+18-Feb-93.  Change logs before that point have been discarded, since they
+are not of much interest after the rewrite.
diff --git a/Source/3rd Party/wx/src/jpeg/jcapimin.c b/Source/3rd Party/wx/src/jpeg/jcapimin.c
index ca86fe116..270a35368 100644
--- a/Source/3rd Party/wx/src/jpeg/jcapimin.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcapimin.c	
@@ -1,280 +1,280 @@
-/*
- * jcapimin.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface code for the compression half
- * of the JPEG library.  These are the "minimum" API routines that may be
- * needed in either the normal full-compression case or the transcoding-only
- * case.
- *
- * Most of the routines intended to be called directly by an application
- * are in this file or in jcapistd.c.  But also see jcparam.c for
- * parameter-setup helper routines, jcomapi.c for routines shared by
- * compression and decompression, and jctrans.c for the transcoding case.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Initialization of a JPEG compression object.
- * The error manager must already be set up (in case memory manager fails).
- */
-
-GLOBAL(void)
-jpeg_CreateCompress (j_compress_ptr cinfo, int version, size_t structsize)
-{
-  int i;
-
-  /* Guard against version mismatches between library and caller. */
-  cinfo->mem = NULL;		/* so jpeg_destroy knows mem mgr not called */
-  if (version != JPEG_LIB_VERSION)
-    ERREXIT2(cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version);
-  if (structsize != SIZEOF(struct jpeg_compress_struct))
-    ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE, 
-	     (int) SIZEOF(struct jpeg_compress_struct), (int) structsize);
-
-  /* For debugging purposes, we zero the whole master structure.
-   * But the application has already set the err pointer, and may have set
-   * client_data, so we have to save and restore those fields.
-   * Note: if application hasn't set client_data, tools like Purify may
-   * complain here.
-   */
-  {
-    struct jpeg_error_mgr * err = cinfo->err;
-    void * client_data = cinfo->client_data; /* ignore Purify complaint here */
-    MEMZERO(cinfo, SIZEOF(struct jpeg_compress_struct));
-    cinfo->err = err;
-    cinfo->client_data = client_data;
-  }
-  cinfo->is_decompressor = FALSE;
-
-  /* Initialize a memory manager instance for this object */
-  jinit_memory_mgr((j_common_ptr) cinfo);
-
-  /* Zero out pointers to permanent structures. */
-  cinfo->progress = NULL;
-  cinfo->dest = NULL;
-
-  cinfo->comp_info = NULL;
-
-  for (i = 0; i < NUM_QUANT_TBLS; i++)
-    cinfo->quant_tbl_ptrs[i] = NULL;
-
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    cinfo->dc_huff_tbl_ptrs[i] = NULL;
-    cinfo->ac_huff_tbl_ptrs[i] = NULL;
-  }
-
-  cinfo->script_space = NULL;
-
-  cinfo->input_gamma = 1.0;	/* in case application forgets */
-
-  /* OK, I'm ready */
-  cinfo->global_state = CSTATE_START;
-}
-
-
-/*
- * Destruction of a JPEG compression object
- */
-
-GLOBAL(void)
-jpeg_destroy_compress (j_compress_ptr cinfo)
-{
-  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
-}
-
-
-/*
- * Abort processing of a JPEG compression operation,
- * but don't destroy the object itself.
- */
-
-GLOBAL(void)
-jpeg_abort_compress (j_compress_ptr cinfo)
-{
-  jpeg_abort((j_common_ptr) cinfo); /* use common routine */
-}
-
-
-/*
- * Forcibly suppress or un-suppress all quantization and Huffman tables.
- * Marks all currently defined tables as already written (if suppress)
- * or not written (if !suppress).  This will control whether they get emitted
- * by a subsequent jpeg_start_compress call.
- *
- * This routine is exported for use by applications that want to produce
- * abbreviated JPEG datastreams.  It logically belongs in jcparam.c, but
- * since it is called by jpeg_start_compress, we put it here --- otherwise
- * jcparam.o would be linked whether the application used it or not.
- */
-
-GLOBAL(void)
-jpeg_suppress_tables (j_compress_ptr cinfo, wxjpeg_boolean suppress)
-{
-  int i;
-  JQUANT_TBL * qtbl;
-  JHUFF_TBL * htbl;
-
-  for (i = 0; i < NUM_QUANT_TBLS; i++) {
-    if ((qtbl = cinfo->quant_tbl_ptrs[i]) != NULL)
-      qtbl->sent_table = suppress;
-  }
-
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    if ((htbl = cinfo->dc_huff_tbl_ptrs[i]) != NULL)
-      htbl->sent_table = suppress;
-    if ((htbl = cinfo->ac_huff_tbl_ptrs[i]) != NULL)
-      htbl->sent_table = suppress;
-  }
-}
-
-
-/*
- * Finish JPEG compression.
- *
- * If a multipass operating mode was selected, this may do a great deal of
- * work including most of the actual output.
- */
-
-GLOBAL(void)
-jpeg_finish_compress (j_compress_ptr cinfo)
-{
-  JDIMENSION iMCU_row;
-
-  if (cinfo->global_state == CSTATE_SCANNING ||
-      cinfo->global_state == CSTATE_RAW_OK) {
-    /* Terminate first pass */
-    if (cinfo->next_scanline < cinfo->image_height)
-      ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);
-    (*cinfo->master->finish_pass) (cinfo);
-  } else if (cinfo->global_state != CSTATE_WRCOEFS)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  /* Perform any remaining passes */
-  while (! cinfo->master->is_last_pass) {
-    (*cinfo->master->prepare_for_pass) (cinfo);
-    for (iMCU_row = 0; iMCU_row < cinfo->total_iMCU_rows; iMCU_row++) {
-      if (cinfo->progress != NULL) {
-	cinfo->progress->pass_counter = (long) iMCU_row;
-	cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows;
-	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-      }
-      /* We bypass the main controller and invoke coef controller directly;
-       * all work is being done from the coefficient buffer.
-       */
-      if (! (*cinfo->coef->compress_data) (cinfo, (JSAMPIMAGE) NULL))
-	ERREXIT(cinfo, JERR_CANT_SUSPEND);
-    }
-    (*cinfo->master->finish_pass) (cinfo);
-  }
-  /* Write EOI, do final cleanup */
-  (*cinfo->marker->write_file_trailer) (cinfo);
-  (*cinfo->dest->term_destination) (cinfo);
-  /* We can use jpeg_abort to release memory and reset global_state */
-  jpeg_abort((j_common_ptr) cinfo);
-}
-
-
-/*
- * Write a special marker.
- * This is only recommended for writing COM or APPn markers.
- * Must be called after jpeg_start_compress() and before
- * first call to jpeg_write_scanlines() or jpeg_write_raw_data().
- */
-
-GLOBAL(void)
-jpeg_write_marker (j_compress_ptr cinfo, int marker,
-		   const JOCTET *dataptr, unsigned int datalen)
-{
-  JMETHOD(void, write_marker_byte, (j_compress_ptr info, int val));
-
-  if (cinfo->next_scanline != 0 ||
-      (cinfo->global_state != CSTATE_SCANNING &&
-       cinfo->global_state != CSTATE_RAW_OK &&
-       cinfo->global_state != CSTATE_WRCOEFS))
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
-  write_marker_byte = cinfo->marker->write_marker_byte;	/* copy for speed */
-  while (datalen--) {
-    (*write_marker_byte) (cinfo, *dataptr);
-    dataptr++;
-  }
-}
-
-/* Same, but piecemeal. */
-
-GLOBAL(void)
-jpeg_write_m_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
-{
-  if (cinfo->next_scanline != 0 ||
-      (cinfo->global_state != CSTATE_SCANNING &&
-       cinfo->global_state != CSTATE_RAW_OK &&
-       cinfo->global_state != CSTATE_WRCOEFS))
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
-}
-
-GLOBAL(void)
-jpeg_write_m_byte (j_compress_ptr cinfo, int val)
-{
-  (*cinfo->marker->write_marker_byte) (cinfo, val);
-}
-
-
-/*
- * Alternate compression function: just write an abbreviated table file.
- * Before calling this, all parameters and a data destination must be set up.
- *
- * To produce a pair of files containing abbreviated tables and abbreviated
- * image data, one would proceed as follows:
- *
- *		initialize JPEG object
- *		set JPEG parameters
- *		set destination to table file
- *		jpeg_write_tables(cinfo);
- *		set destination to image file
- *		jpeg_start_compress(cinfo, FALSE);
- *		write data...
- *		jpeg_finish_compress(cinfo);
- *
- * jpeg_write_tables has the side effect of marking all tables written
- * (same as jpeg_suppress_tables(..., TRUE)).  Thus a subsequent start_compress
- * will not re-emit the tables unless it is passed write_all_tables=TRUE.
- */
-
-GLOBAL(void)
-jpeg_write_tables (j_compress_ptr cinfo)
-{
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  /* (Re)initialize error mgr and destination modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->dest->init_destination) (cinfo);
-  /* Initialize the marker writer ... bit of a crock to do it here. */
-  jinit_marker_writer(cinfo);
-  /* Write them tables! */
-  (*cinfo->marker->write_tables_only) (cinfo);
-  /* And clean up. */
-  (*cinfo->dest->term_destination) (cinfo);
-  /*
-   * In library releases up through v6a, we called jpeg_abort() here to free
-   * any working memory allocated by the destination manager and marker
-   * writer.  Some applications had a problem with that: they allocated space
-   * of their own from the library memory manager, and didn't want it to go
-   * away during write_tables.  So now we do nothing.  This will cause a
-   * memory leak if an app calls write_tables repeatedly without doing a full
-   * compression cycle or otherwise resetting the JPEG object.  However, that
-   * seems less bad than unexpectedly freeing memory in the normal case.
-   * An app that prefers the old behavior can call jpeg_abort for itself after
-   * each call to jpeg_write_tables().
-   */
-}
+/*
+ * jcapimin.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface code for the compression half
+ * of the JPEG library.  These are the "minimum" API routines that may be
+ * needed in either the normal full-compression case or the transcoding-only
+ * case.
+ *
+ * Most of the routines intended to be called directly by an application
+ * are in this file or in jcapistd.c.  But also see jcparam.c for
+ * parameter-setup helper routines, jcomapi.c for routines shared by
+ * compression and decompression, and jctrans.c for the transcoding case.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Initialization of a JPEG compression object.
+ * The error manager must already be set up (in case memory manager fails).
+ */
+
+GLOBAL(void)
+jpeg_CreateCompress (j_compress_ptr cinfo, int version, size_t structsize)
+{
+  int i;
+
+  /* Guard against version mismatches between library and caller. */
+  cinfo->mem = NULL;		/* so jpeg_destroy knows mem mgr not called */
+  if (version != JPEG_LIB_VERSION)
+    ERREXIT2(cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version);
+  if (structsize != SIZEOF(struct jpeg_compress_struct))
+    ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE, 
+	     (int) SIZEOF(struct jpeg_compress_struct), (int) structsize);
+
+  /* For debugging purposes, we zero the whole master structure.
+   * But the application has already set the err pointer, and may have set
+   * client_data, so we have to save and restore those fields.
+   * Note: if application hasn't set client_data, tools like Purify may
+   * complain here.
+   */
+  {
+    struct jpeg_error_mgr * err = cinfo->err;
+    void * client_data = cinfo->client_data; /* ignore Purify complaint here */
+    MEMZERO(cinfo, SIZEOF(struct jpeg_compress_struct));
+    cinfo->err = err;
+    cinfo->client_data = client_data;
+  }
+  cinfo->is_decompressor = FALSE;
+
+  /* Initialize a memory manager instance for this object */
+  jinit_memory_mgr((j_common_ptr) cinfo);
+
+  /* Zero out pointers to permanent structures. */
+  cinfo->progress = NULL;
+  cinfo->dest = NULL;
+
+  cinfo->comp_info = NULL;
+
+  for (i = 0; i < NUM_QUANT_TBLS; i++)
+    cinfo->quant_tbl_ptrs[i] = NULL;
+
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    cinfo->dc_huff_tbl_ptrs[i] = NULL;
+    cinfo->ac_huff_tbl_ptrs[i] = NULL;
+  }
+
+  cinfo->script_space = NULL;
+
+  cinfo->input_gamma = 1.0;	/* in case application forgets */
+
+  /* OK, I'm ready */
+  cinfo->global_state = CSTATE_START;
+}
+
+
+/*
+ * Destruction of a JPEG compression object
+ */
+
+GLOBAL(void)
+jpeg_destroy_compress (j_compress_ptr cinfo)
+{
+  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
+}
+
+
+/*
+ * Abort processing of a JPEG compression operation,
+ * but don't destroy the object itself.
+ */
+
+GLOBAL(void)
+jpeg_abort_compress (j_compress_ptr cinfo)
+{
+  jpeg_abort((j_common_ptr) cinfo); /* use common routine */
+}
+
+
+/*
+ * Forcibly suppress or un-suppress all quantization and Huffman tables.
+ * Marks all currently defined tables as already written (if suppress)
+ * or not written (if !suppress).  This will control whether they get emitted
+ * by a subsequent jpeg_start_compress call.
+ *
+ * This routine is exported for use by applications that want to produce
+ * abbreviated JPEG datastreams.  It logically belongs in jcparam.c, but
+ * since it is called by jpeg_start_compress, we put it here --- otherwise
+ * jcparam.o would be linked whether the application used it or not.
+ */
+
+GLOBAL(void)
+jpeg_suppress_tables (j_compress_ptr cinfo, wxjpeg_boolean suppress)
+{
+  int i;
+  JQUANT_TBL * qtbl;
+  JHUFF_TBL * htbl;
+
+  for (i = 0; i < NUM_QUANT_TBLS; i++) {
+    if ((qtbl = cinfo->quant_tbl_ptrs[i]) != NULL)
+      qtbl->sent_table = suppress;
+  }
+
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    if ((htbl = cinfo->dc_huff_tbl_ptrs[i]) != NULL)
+      htbl->sent_table = suppress;
+    if ((htbl = cinfo->ac_huff_tbl_ptrs[i]) != NULL)
+      htbl->sent_table = suppress;
+  }
+}
+
+
+/*
+ * Finish JPEG compression.
+ *
+ * If a multipass operating mode was selected, this may do a great deal of
+ * work including most of the actual output.
+ */
+
+GLOBAL(void)
+jpeg_finish_compress (j_compress_ptr cinfo)
+{
+  JDIMENSION iMCU_row;
+
+  if (cinfo->global_state == CSTATE_SCANNING ||
+      cinfo->global_state == CSTATE_RAW_OK) {
+    /* Terminate first pass */
+    if (cinfo->next_scanline < cinfo->image_height)
+      ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);
+    (*cinfo->master->finish_pass) (cinfo);
+  } else if (cinfo->global_state != CSTATE_WRCOEFS)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  /* Perform any remaining passes */
+  while (! cinfo->master->is_last_pass) {
+    (*cinfo->master->prepare_for_pass) (cinfo);
+    for (iMCU_row = 0; iMCU_row < cinfo->total_iMCU_rows; iMCU_row++) {
+      if (cinfo->progress != NULL) {
+	cinfo->progress->pass_counter = (long) iMCU_row;
+	cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows;
+	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+      }
+      /* We bypass the main controller and invoke coef controller directly;
+       * all work is being done from the coefficient buffer.
+       */
+      if (! (*cinfo->coef->compress_data) (cinfo, (JSAMPIMAGE) NULL))
+	ERREXIT(cinfo, JERR_CANT_SUSPEND);
+    }
+    (*cinfo->master->finish_pass) (cinfo);
+  }
+  /* Write EOI, do final cleanup */
+  (*cinfo->marker->write_file_trailer) (cinfo);
+  (*cinfo->dest->term_destination) (cinfo);
+  /* We can use jpeg_abort to release memory and reset global_state */
+  jpeg_abort((j_common_ptr) cinfo);
+}
+
+
+/*
+ * Write a special marker.
+ * This is only recommended for writing COM or APPn markers.
+ * Must be called after jpeg_start_compress() and before
+ * first call to jpeg_write_scanlines() or jpeg_write_raw_data().
+ */
+
+GLOBAL(void)
+jpeg_write_marker (j_compress_ptr cinfo, int marker,
+		   const JOCTET *dataptr, unsigned int datalen)
+{
+  JMETHOD(void, write_marker_byte, (j_compress_ptr info, int val));
+
+  if (cinfo->next_scanline != 0 ||
+      (cinfo->global_state != CSTATE_SCANNING &&
+       cinfo->global_state != CSTATE_RAW_OK &&
+       cinfo->global_state != CSTATE_WRCOEFS))
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
+  write_marker_byte = cinfo->marker->write_marker_byte;	/* copy for speed */
+  while (datalen--) {
+    (*write_marker_byte) (cinfo, *dataptr);
+    dataptr++;
+  }
+}
+
+/* Same, but piecemeal. */
+
+GLOBAL(void)
+jpeg_write_m_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
+{
+  if (cinfo->next_scanline != 0 ||
+      (cinfo->global_state != CSTATE_SCANNING &&
+       cinfo->global_state != CSTATE_RAW_OK &&
+       cinfo->global_state != CSTATE_WRCOEFS))
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
+}
+
+GLOBAL(void)
+jpeg_write_m_byte (j_compress_ptr cinfo, int val)
+{
+  (*cinfo->marker->write_marker_byte) (cinfo, val);
+}
+
+
+/*
+ * Alternate compression function: just write an abbreviated table file.
+ * Before calling this, all parameters and a data destination must be set up.
+ *
+ * To produce a pair of files containing abbreviated tables and abbreviated
+ * image data, one would proceed as follows:
+ *
+ *		initialize JPEG object
+ *		set JPEG parameters
+ *		set destination to table file
+ *		jpeg_write_tables(cinfo);
+ *		set destination to image file
+ *		jpeg_start_compress(cinfo, FALSE);
+ *		write data...
+ *		jpeg_finish_compress(cinfo);
+ *
+ * jpeg_write_tables has the side effect of marking all tables written
+ * (same as jpeg_suppress_tables(..., TRUE)).  Thus a subsequent start_compress
+ * will not re-emit the tables unless it is passed write_all_tables=TRUE.
+ */
+
+GLOBAL(void)
+jpeg_write_tables (j_compress_ptr cinfo)
+{
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  /* (Re)initialize error mgr and destination modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->dest->init_destination) (cinfo);
+  /* Initialize the marker writer ... bit of a crock to do it here. */
+  jinit_marker_writer(cinfo);
+  /* Write them tables! */
+  (*cinfo->marker->write_tables_only) (cinfo);
+  /* And clean up. */
+  (*cinfo->dest->term_destination) (cinfo);
+  /*
+   * In library releases up through v6a, we called jpeg_abort() here to free
+   * any working memory allocated by the destination manager and marker
+   * writer.  Some applications had a problem with that: they allocated space
+   * of their own from the library memory manager, and didn't want it to go
+   * away during write_tables.  So now we do nothing.  This will cause a
+   * memory leak if an app calls write_tables repeatedly without doing a full
+   * compression cycle or otherwise resetting the JPEG object.  However, that
+   * seems less bad than unexpectedly freeing memory in the normal case.
+   * An app that prefers the old behavior can call jpeg_abort for itself after
+   * each call to jpeg_write_tables().
+   */
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jcapistd.c b/Source/3rd Party/wx/src/jpeg/jcapistd.c
index 815707dc4..c138b7c12 100644
--- a/Source/3rd Party/wx/src/jpeg/jcapistd.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcapistd.c	
@@ -1,161 +1,161 @@
-/*
- * jcapistd.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface code for the compression half
- * of the JPEG library.  These are the "standard" API routines that are
- * used in the normal full-compression case.  They are not used by a
- * transcoding-only application.  Note that if an application links in
- * jpeg_start_compress, it will end up linking in the entire compressor.
- * We thus must separate this file from jcapimin.c to avoid linking the
- * whole compression library into a transcoder.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Compression initialization.
- * Before calling this, all parameters and a data destination must be set up.
- *
- * We require a write_all_tables parameter as a failsafe check when writing
- * multiple datastreams from the same compression object.  Since prior runs
- * will have left all the tables marked sent_table=TRUE, a subsequent run
- * would emit an abbreviated stream (no tables) by default.  This may be what
- * is wanted, but for safety's sake it should not be the default behavior:
- * programmers should have to make a deliberate choice to emit abbreviated
- * images.  Therefore the documentation and examples should encourage people
- * to pass write_all_tables=TRUE; then it will take active thought to do the
- * wrong thing.
- */
-
-GLOBAL(void)
-jpeg_start_compress (j_compress_ptr cinfo, wxjpeg_boolean write_all_tables)
-{
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  if (write_all_tables)
-    jpeg_suppress_tables(cinfo, FALSE);	/* mark all tables to be written */
-
-  /* (Re)initialize error mgr and destination modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->dest->init_destination) (cinfo);
-  /* Perform master selection of active modules */
-  jinit_compress_master(cinfo);
-  /* Set up for the first pass */
-  (*cinfo->master->prepare_for_pass) (cinfo);
-  /* Ready for application to drive first pass through jpeg_write_scanlines
-   * or jpeg_write_raw_data.
-   */
-  cinfo->next_scanline = 0;
-  cinfo->global_state = (cinfo->raw_data_in ? CSTATE_RAW_OK : CSTATE_SCANNING);
-}
-
-
-/*
- * Write some scanlines of data to the JPEG compressor.
- *
- * The return value will be the number of lines actually written.
- * This should be less than the supplied num_lines only in case that
- * the data destination module has requested suspension of the compressor,
- * or if more than image_height scanlines are passed in.
- *
- * Note: we warn about excess calls to jpeg_write_scanlines() since
- * this likely signals an application programmer error.  However,
- * excess scanlines passed in the last valid call are *silently* ignored,
- * so that the application need not adjust num_lines for end-of-image
- * when using a multiple-scanline buffer.
- */
-
-GLOBAL(JDIMENSION)
-jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines,
-		      JDIMENSION num_lines)
-{
-  JDIMENSION row_ctr, rows_left;
-
-  if (cinfo->global_state != CSTATE_SCANNING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->next_scanline >= cinfo->image_height)
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->image_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Give master control module another chance if this is first call to
-   * jpeg_write_scanlines.  This lets output of the frame/scan headers be
-   * delayed so that application can write COM, etc, markers between
-   * jpeg_start_compress and jpeg_write_scanlines.
-   */
-  if (cinfo->master->call_pass_startup)
-    (*cinfo->master->pass_startup) (cinfo);
-
-  /* Ignore any extra scanlines at bottom of image. */
-  rows_left = cinfo->image_height - cinfo->next_scanline;
-  if (num_lines > rows_left)
-    num_lines = rows_left;
-
-  row_ctr = 0;
-  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, num_lines);
-  cinfo->next_scanline += row_ctr;
-  return row_ctr;
-}
-
-
-/*
- * Alternate entry point to write raw data.
- * Processes exactly one iMCU row per call, unless suspended.
- */
-
-GLOBAL(JDIMENSION)
-jpeg_write_raw_data (j_compress_ptr cinfo, JSAMPIMAGE data,
-		     JDIMENSION num_lines)
-{
-  JDIMENSION lines_per_iMCU_row;
-
-  if (cinfo->global_state != CSTATE_RAW_OK)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->next_scanline >= cinfo->image_height) {
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-    return 0;
-  }
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->image_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Give master control module another chance if this is first call to
-   * jpeg_write_raw_data.  This lets output of the frame/scan headers be
-   * delayed so that application can write COM, etc, markers between
-   * jpeg_start_compress and jpeg_write_raw_data.
-   */
-  if (cinfo->master->call_pass_startup)
-    (*cinfo->master->pass_startup) (cinfo);
-
-  /* Verify that at least one iMCU row has been passed. */
-  lines_per_iMCU_row = cinfo->max_v_samp_factor * DCTSIZE;
-  if (num_lines < lines_per_iMCU_row)
-    ERREXIT(cinfo, JERR_BUFFER_SIZE);
-
-  /* Directly compress the row. */
-  if (! (*cinfo->coef->compress_data) (cinfo, data)) {
-    /* If compressor did not consume the whole row, suspend processing. */
-    return 0;
-  }
-
-  /* OK, we processed one iMCU row. */
-  cinfo->next_scanline += lines_per_iMCU_row;
-  return lines_per_iMCU_row;
-}
+/*
+ * jcapistd.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface code for the compression half
+ * of the JPEG library.  These are the "standard" API routines that are
+ * used in the normal full-compression case.  They are not used by a
+ * transcoding-only application.  Note that if an application links in
+ * jpeg_start_compress, it will end up linking in the entire compressor.
+ * We thus must separate this file from jcapimin.c to avoid linking the
+ * whole compression library into a transcoder.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Compression initialization.
+ * Before calling this, all parameters and a data destination must be set up.
+ *
+ * We require a write_all_tables parameter as a failsafe check when writing
+ * multiple datastreams from the same compression object.  Since prior runs
+ * will have left all the tables marked sent_table=TRUE, a subsequent run
+ * would emit an abbreviated stream (no tables) by default.  This may be what
+ * is wanted, but for safety's sake it should not be the default behavior:
+ * programmers should have to make a deliberate choice to emit abbreviated
+ * images.  Therefore the documentation and examples should encourage people
+ * to pass write_all_tables=TRUE; then it will take active thought to do the
+ * wrong thing.
+ */
+
+GLOBAL(void)
+jpeg_start_compress (j_compress_ptr cinfo, wxjpeg_boolean write_all_tables)
+{
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  if (write_all_tables)
+    jpeg_suppress_tables(cinfo, FALSE);	/* mark all tables to be written */
+
+  /* (Re)initialize error mgr and destination modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->dest->init_destination) (cinfo);
+  /* Perform master selection of active modules */
+  jinit_compress_master(cinfo);
+  /* Set up for the first pass */
+  (*cinfo->master->prepare_for_pass) (cinfo);
+  /* Ready for application to drive first pass through jpeg_write_scanlines
+   * or jpeg_write_raw_data.
+   */
+  cinfo->next_scanline = 0;
+  cinfo->global_state = (cinfo->raw_data_in ? CSTATE_RAW_OK : CSTATE_SCANNING);
+}
+
+
+/*
+ * Write some scanlines of data to the JPEG compressor.
+ *
+ * The return value will be the number of lines actually written.
+ * This should be less than the supplied num_lines only in case that
+ * the data destination module has requested suspension of the compressor,
+ * or if more than image_height scanlines are passed in.
+ *
+ * Note: we warn about excess calls to jpeg_write_scanlines() since
+ * this likely signals an application programmer error.  However,
+ * excess scanlines passed in the last valid call are *silently* ignored,
+ * so that the application need not adjust num_lines for end-of-image
+ * when using a multiple-scanline buffer.
+ */
+
+GLOBAL(JDIMENSION)
+jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines,
+		      JDIMENSION num_lines)
+{
+  JDIMENSION row_ctr, rows_left;
+
+  if (cinfo->global_state != CSTATE_SCANNING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->next_scanline >= cinfo->image_height)
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->image_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Give master control module another chance if this is first call to
+   * jpeg_write_scanlines.  This lets output of the frame/scan headers be
+   * delayed so that application can write COM, etc, markers between
+   * jpeg_start_compress and jpeg_write_scanlines.
+   */
+  if (cinfo->master->call_pass_startup)
+    (*cinfo->master->pass_startup) (cinfo);
+
+  /* Ignore any extra scanlines at bottom of image. */
+  rows_left = cinfo->image_height - cinfo->next_scanline;
+  if (num_lines > rows_left)
+    num_lines = rows_left;
+
+  row_ctr = 0;
+  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, num_lines);
+  cinfo->next_scanline += row_ctr;
+  return row_ctr;
+}
+
+
+/*
+ * Alternate entry point to write raw data.
+ * Processes exactly one iMCU row per call, unless suspended.
+ */
+
+GLOBAL(JDIMENSION)
+jpeg_write_raw_data (j_compress_ptr cinfo, JSAMPIMAGE data,
+		     JDIMENSION num_lines)
+{
+  JDIMENSION lines_per_iMCU_row;
+
+  if (cinfo->global_state != CSTATE_RAW_OK)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->next_scanline >= cinfo->image_height) {
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+    return 0;
+  }
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->image_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Give master control module another chance if this is first call to
+   * jpeg_write_raw_data.  This lets output of the frame/scan headers be
+   * delayed so that application can write COM, etc, markers between
+   * jpeg_start_compress and jpeg_write_raw_data.
+   */
+  if (cinfo->master->call_pass_startup)
+    (*cinfo->master->pass_startup) (cinfo);
+
+  /* Verify that at least one iMCU row has been passed. */
+  lines_per_iMCU_row = cinfo->max_v_samp_factor * DCTSIZE;
+  if (num_lines < lines_per_iMCU_row)
+    ERREXIT(cinfo, JERR_BUFFER_SIZE);
+
+  /* Directly compress the row. */
+  if (! (*cinfo->coef->compress_data) (cinfo, data)) {
+    /* If compressor did not consume the whole row, suspend processing. */
+    return 0;
+  }
+
+  /* OK, we processed one iMCU row. */
+  cinfo->next_scanline += lines_per_iMCU_row;
+  return lines_per_iMCU_row;
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jccoefct.c b/Source/3rd Party/wx/src/jpeg/jccoefct.c
index cd81badce..3315f21b3 100644
--- a/Source/3rd Party/wx/src/jpeg/jccoefct.c	
+++ b/Source/3rd Party/wx/src/jpeg/jccoefct.c	
@@ -1,449 +1,449 @@
-/*
- * jccoefct.c
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the coefficient buffer controller for compression.
- * This controller is the top level of the JPEG compressor proper.
- * The coefficient buffer lies between forward-DCT and entropy encoding steps.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* We use a full-image coefficient buffer when doing Huffman optimization,
- * and also for writing multiple-scan JPEG files.  In all cases, the DCT
- * step is run during the first pass, and subsequent passes need only read
- * the buffered coefficients.
- */
-#ifdef ENTROPY_OPT_SUPPORTED
-#define FULL_COEF_BUFFER_SUPPORTED
-#else
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-#define FULL_COEF_BUFFER_SUPPORTED
-#endif
-#endif
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_c_coef_controller pub; /* public fields */
-
-  JDIMENSION iMCU_row_num;	/* iMCU row # within image */
-  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */
-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
-
-  /* For single-pass compression, it's sufficient to buffer just one MCU
-   * (although this may prove a bit slow in practice).  We allocate a
-   * workspace of C_MAX_BLOCKS_IN_MCU coefficient blocks, and reuse it for each
-   * MCU constructed and sent.  (On 80x86, the workspace is FAR even though
-   * it's not really very big; this is to keep the module interfaces unchanged
-   * when a large coefficient buffer is necessary.)
-   * In multi-pass modes, this array points to the current MCU's blocks
-   * within the virtual arrays.
-   */
-  JBLOCKROW MCU_buffer[C_MAX_BLOCKS_IN_MCU];
-
-  /* In multi-pass modes, we need a virtual block array for each component. */
-  jvirt_barray_ptr whole_image[MAX_COMPONENTS];
-} my_coef_controller;
-
-typedef my_coef_controller * my_coef_ptr;
-
-
-/* Forward declarations */
-METHODDEF(wxjpeg_boolean) compress_data
-    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
-#ifdef FULL_COEF_BUFFER_SUPPORTED
-METHODDEF(wxjpeg_boolean) compress_first_pass
-    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
-METHODDEF(wxjpeg_boolean) compress_output
-    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
-#endif
-
-
-LOCAL(void)
-start_iMCU_row (j_compress_ptr cinfo)
-/* Reset within-iMCU-row counters for a new row */
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  /* In an interleaved scan, an MCU row is the same as an iMCU row.
-   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
-   * But at the bottom of the image, process only what's left.
-   */
-  if (cinfo->comps_in_scan > 1) {
-    coef->MCU_rows_per_iMCU_row = 1;
-  } else {
-    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
-    else
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
-  }
-
-  coef->mcu_ctr = 0;
-  coef->MCU_vert_offset = 0;
-}
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  coef->iMCU_row_num = 0;
-  start_iMCU_row(cinfo);
-
-  switch (pass_mode) {
-  case JBUF_PASS_THRU:
-    if (coef->whole_image[0] != NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    coef->pub.compress_data = compress_data;
-    break;
-#ifdef FULL_COEF_BUFFER_SUPPORTED
-  case JBUF_SAVE_AND_PASS:
-    if (coef->whole_image[0] == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    coef->pub.compress_data = compress_first_pass;
-    break;
-  case JBUF_CRANK_DEST:
-    if (coef->whole_image[0] == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    coef->pub.compress_data = compress_output;
-    break;
-#endif
-  default:
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    break;
-  }
-}
-
-
-/*
- * Process some data in the single-pass case.
- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
- * per call, ie, v_samp_factor block rows for each component in the image.
- * Returns TRUE if the iMCU row is completed, FALSE if suspended.
- *
- * NB: input_buf contains a plane for each component in image,
- * which we index according to the component's SOF position.
- */
-
-METHODDEF(wxjpeg_boolean)
-compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  int blkn, bi, ci, yindex, yoffset, blockcnt;
-  JDIMENSION ypos, xpos;
-  jpeg_component_info *compptr;
-
-  /* Loop to write as much as one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->mcu_ctr; MCU_col_num <= last_MCU_col;
-	 MCU_col_num++) {
-      /* Determine where data comes from in input_buf and do the DCT thing.
-       * Each call on forward_DCT processes a horizontal row of DCT blocks
-       * as wide as an MCU; we rely on having allocated the MCU_buffer[] blocks
-       * sequentially.  Dummy blocks at the right or bottom edge are filled in
-       * specially.  The data in them does not matter for image reconstruction,
-       * so we fill them with values that will encode to the smallest amount of
-       * data, viz: all zeroes in the AC entries, DC entries equal to previous
-       * block's DC value.  (Thanks to Thomas Kinsman for this idea.)
-       */
-      blkn = 0;
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
-						: compptr->last_col_width;
-	xpos = MCU_col_num * compptr->MCU_sample_width;
-	ypos = yoffset * DCTSIZE; /* ypos == (yoffset+yindex) * DCTSIZE */
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  if (coef->iMCU_row_num < last_iMCU_row ||
-	      yoffset+yindex < compptr->last_row_height) {
-	    (*cinfo->fdct->forward_DCT) (cinfo, compptr,
-					 input_buf[compptr->component_index],
-					 coef->MCU_buffer[blkn],
-					 ypos, xpos, (JDIMENSION) blockcnt);
-	    if (blockcnt < compptr->MCU_width) {
-	      /* Create some dummy blocks at the right edge of the image. */
-	      jzero_far((void FAR *) coef->MCU_buffer[blkn + blockcnt],
-			(compptr->MCU_width - blockcnt) * SIZEOF(JBLOCK));
-	      for (bi = blockcnt; bi < compptr->MCU_width; bi++) {
-		coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn+bi-1][0][0];
-	      }
-	    }
-	  } else {
-	    /* Create a row of dummy blocks at the bottom of the image. */
-	    jzero_far((void FAR *) coef->MCU_buffer[blkn],
-		      compptr->MCU_width * SIZEOF(JBLOCK));
-	    for (bi = 0; bi < compptr->MCU_width; bi++) {
-	      coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn-1][0][0];
-	    }
-	  }
-	  blkn += compptr->MCU_width;
-	  ypos += DCTSIZE;
-	}
-      }
-      /* Try to write the MCU.  In event of a suspension failure, we will
-       * re-DCT the MCU on restart (a bit inefficient, could be fixed...)
-       */
-      if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->mcu_ctr = MCU_col_num;
-	return FALSE;
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->mcu_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  coef->iMCU_row_num++;
-  start_iMCU_row(cinfo);
-  return TRUE;
-}
-
-
-#ifdef FULL_COEF_BUFFER_SUPPORTED
-
-/*
- * Process some data in the first pass of a multi-pass case.
- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
- * per call, ie, v_samp_factor block rows for each component in the image.
- * This amount of data is read from the source buffer, DCT'd and quantized,
- * and saved into the virtual arrays.  We also generate suitable dummy blocks
- * as needed at the right and lower edges.  (The dummy blocks are constructed
- * in the virtual arrays, which have been padded appropriately.)  This makes
- * it possible for subsequent passes not to worry about real vs. dummy blocks.
- *
- * We must also emit the data to the entropy encoder.  This is conveniently
- * done by calling compress_output() after we've loaded the current strip
- * of the virtual arrays.
- *
- * NB: input_buf contains a plane for each component in image.  All
- * components are DCT'd and loaded into the virtual arrays in this pass.
- * However, it may be that only a subset of the components are emitted to
- * the entropy encoder during this first pass; be careful about looking
- * at the scan-dependent variables (MCU dimensions, etc).
- */
-
-METHODDEF(wxjpeg_boolean)
-compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  JDIMENSION blocks_across, MCUs_across, MCUindex;
-  int bi, ci, h_samp_factor, block_row, block_rows, ndummy;
-  JCOEF lastDC;
-  jpeg_component_info *compptr;
-  JBLOCKARRAY buffer;
-  JBLOCKROW thisblockrow, lastblockrow;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Align the virtual buffer for this component. */
-    buffer = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[ci],
-       coef->iMCU_row_num * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, TRUE);
-    /* Count non-dummy DCT block rows in this iMCU row. */
-    if (coef->iMCU_row_num < last_iMCU_row)
-      block_rows = compptr->v_samp_factor;
-    else {
-      /* NB: can't use last_row_height here, since may not be set! */
-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-      if (block_rows == 0) block_rows = compptr->v_samp_factor;
-    }
-    blocks_across = compptr->width_in_blocks;
-    h_samp_factor = compptr->h_samp_factor;
-    /* Count number of dummy blocks to be added at the right margin. */
-    ndummy = (int) (blocks_across % h_samp_factor);
-    if (ndummy > 0)
-      ndummy = h_samp_factor - ndummy;
-    /* Perform DCT for all non-dummy blocks in this iMCU row.  Each call
-     * on forward_DCT processes a complete horizontal row of DCT blocks.
-     */
-    for (block_row = 0; block_row < block_rows; block_row++) {
-      thisblockrow = buffer[block_row];
-      (*cinfo->fdct->forward_DCT) (cinfo, compptr,
-				   input_buf[ci], thisblockrow,
-				   (JDIMENSION) (block_row * DCTSIZE),
-				   (JDIMENSION) 0, blocks_across);
-      if (ndummy > 0) {
-	/* Create dummy blocks at the right edge of the image. */
-	thisblockrow += blocks_across; /* => first dummy block */
-	jzero_far((void FAR *) thisblockrow, ndummy * SIZEOF(JBLOCK));
-	lastDC = thisblockrow[-1][0];
-	for (bi = 0; bi < ndummy; bi++) {
-	  thisblockrow[bi][0] = lastDC;
-	}
-      }
-    }
-    /* If at end of image, create dummy block rows as needed.
-     * The tricky part here is that within each MCU, we want the DC values
-     * of the dummy blocks to match the last real block's DC value.
-     * This squeezes a few more bytes out of the resulting file...
-     */
-    if (coef->iMCU_row_num == last_iMCU_row) {
-      blocks_across += ndummy;	/* include lower right corner */
-      MCUs_across = blocks_across / h_samp_factor;
-      for (block_row = block_rows; block_row < compptr->v_samp_factor;
-	   block_row++) {
-	thisblockrow = buffer[block_row];
-	lastblockrow = buffer[block_row-1];
-	jzero_far((void FAR *) thisblockrow,
-		  (size_t) (blocks_across * SIZEOF(JBLOCK)));
-	for (MCUindex = 0; MCUindex < MCUs_across; MCUindex++) {
-	  lastDC = lastblockrow[h_samp_factor-1][0];
-	  for (bi = 0; bi < h_samp_factor; bi++) {
-	    thisblockrow[bi][0] = lastDC;
-	  }
-	  thisblockrow += h_samp_factor; /* advance to next MCU in row */
-	  lastblockrow += h_samp_factor;
-	}
-      }
-    }
-  }
-  /* NB: compress_output will increment iMCU_row_num if successful.
-   * A suspension return will result in redoing all the work above next time.
-   */
-
-  /* Emit data to the entropy encoder, sharing code with subsequent passes */
-  return compress_output(cinfo, input_buf);
-}
-
-
-/*
- * Process some data in subsequent passes of a multi-pass case.
- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
- * per call, ie, v_samp_factor block rows for each component in the scan.
- * The data is obtained from the virtual arrays and fed to the entropy coder.
- * Returns TRUE if the iMCU row is completed, FALSE if suspended.
- *
- * NB: input_buf is ignored; it is likely to be a NULL pointer.
- */
-
-METHODDEF(wxjpeg_boolean)
-compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  int blkn, ci, xindex, yindex, yoffset;
-  JDIMENSION start_col;
-  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
-  JBLOCKROW buffer_ptr;
-  jpeg_component_info *compptr;
-
-  /* Align the virtual buffers for the components used in this scan.
-   * NB: during first pass, this is safe only because the buffers will
-   * already be aligned properly, so jmemmgr.c won't need to do any I/O.
-   */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    buffer[ci] = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
-       coef->iMCU_row_num * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, FALSE);
-  }
-
-  /* Loop to process one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;
-	 MCU_col_num++) {
-      /* Construct list of pointers to DCT blocks belonging to this MCU */
-      blkn = 0;			/* index of current DCT block within MCU */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	start_col = MCU_col_num * compptr->MCU_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
-	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
-	    coef->MCU_buffer[blkn++] = buffer_ptr++;
-	  }
-	}
-      }
-      /* Try to write the MCU. */
-      if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->mcu_ctr = MCU_col_num;
-	return FALSE;
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->mcu_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  coef->iMCU_row_num++;
-  start_iMCU_row(cinfo);
-  return TRUE;
-}
-
-#endif /* FULL_COEF_BUFFER_SUPPORTED */
-
-
-/*
- * Initialize coefficient buffer controller.
- */
-
-GLOBAL(void)
-jinit_c_coef_controller (j_compress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_coef_ptr coef;
-
-  coef = (my_coef_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_coef_controller));
-  cinfo->coef = (struct jpeg_c_coef_controller *) coef;
-  coef->pub.start_pass = start_pass_coef;
-
-  /* Create the coefficient buffer. */
-  if (need_full_buffer) {
-#ifdef FULL_COEF_BUFFER_SUPPORTED
-    /* Allocate a full-image virtual array for each component, */
-    /* padded to a multiple of samp_factor DCT blocks in each direction. */
-    int ci;
-    jpeg_component_info *compptr;
-
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
-	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,
-				(long) compptr->h_samp_factor),
-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-				(long) compptr->v_samp_factor),
-	 (JDIMENSION) compptr->v_samp_factor);
-    }
-#else
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-#endif
-  } else {
-    /* We only need a single-MCU buffer. */
-    JBLOCKROW buffer;
-    int i;
-
-    buffer = (JBLOCKROW)
-      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
-    for (i = 0; i < C_MAX_BLOCKS_IN_MCU; i++) {
-      coef->MCU_buffer[i] = buffer + i;
-    }
-    coef->whole_image[0] = NULL; /* flag for no virtual arrays */
-  }
-}
+/*
+ * jccoefct.c
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the coefficient buffer controller for compression.
+ * This controller is the top level of the JPEG compressor proper.
+ * The coefficient buffer lies between forward-DCT and entropy encoding steps.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* We use a full-image coefficient buffer when doing Huffman optimization,
+ * and also for writing multiple-scan JPEG files.  In all cases, the DCT
+ * step is run during the first pass, and subsequent passes need only read
+ * the buffered coefficients.
+ */
+#ifdef ENTROPY_OPT_SUPPORTED
+#define FULL_COEF_BUFFER_SUPPORTED
+#else
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+#define FULL_COEF_BUFFER_SUPPORTED
+#endif
+#endif
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_c_coef_controller pub; /* public fields */
+
+  JDIMENSION iMCU_row_num;	/* iMCU row # within image */
+  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */
+  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
+  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
+
+  /* For single-pass compression, it's sufficient to buffer just one MCU
+   * (although this may prove a bit slow in practice).  We allocate a
+   * workspace of C_MAX_BLOCKS_IN_MCU coefficient blocks, and reuse it for each
+   * MCU constructed and sent.  (On 80x86, the workspace is FAR even though
+   * it's not really very big; this is to keep the module interfaces unchanged
+   * when a large coefficient buffer is necessary.)
+   * In multi-pass modes, this array points to the current MCU's blocks
+   * within the virtual arrays.
+   */
+  JBLOCKROW MCU_buffer[C_MAX_BLOCKS_IN_MCU];
+
+  /* In multi-pass modes, we need a virtual block array for each component. */
+  jvirt_barray_ptr whole_image[MAX_COMPONENTS];
+} my_coef_controller;
+
+typedef my_coef_controller * my_coef_ptr;
+
+
+/* Forward declarations */
+METHODDEF(wxjpeg_boolean) compress_data
+    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+#ifdef FULL_COEF_BUFFER_SUPPORTED
+METHODDEF(wxjpeg_boolean) compress_first_pass
+    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+METHODDEF(wxjpeg_boolean) compress_output
+    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
+#endif
+
+
+LOCAL(void)
+start_iMCU_row (j_compress_ptr cinfo)
+/* Reset within-iMCU-row counters for a new row */
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+
+  /* In an interleaved scan, an MCU row is the same as an iMCU row.
+   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
+   * But at the bottom of the image, process only what's left.
+   */
+  if (cinfo->comps_in_scan > 1) {
+    coef->MCU_rows_per_iMCU_row = 1;
+  } else {
+    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
+    else
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
+  }
+
+  coef->mcu_ctr = 0;
+  coef->MCU_vert_offset = 0;
+}
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+
+  coef->iMCU_row_num = 0;
+  start_iMCU_row(cinfo);
+
+  switch (pass_mode) {
+  case JBUF_PASS_THRU:
+    if (coef->whole_image[0] != NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    coef->pub.compress_data = compress_data;
+    break;
+#ifdef FULL_COEF_BUFFER_SUPPORTED
+  case JBUF_SAVE_AND_PASS:
+    if (coef->whole_image[0] == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    coef->pub.compress_data = compress_first_pass;
+    break;
+  case JBUF_CRANK_DEST:
+    if (coef->whole_image[0] == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    coef->pub.compress_data = compress_output;
+    break;
+#endif
+  default:
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    break;
+  }
+}
+
+
+/*
+ * Process some data in the single-pass case.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor block rows for each component in the image.
+ * Returns TRUE if the iMCU row is completed, FALSE if suspended.
+ *
+ * NB: input_buf contains a plane for each component in image,
+ * which we index according to the component's SOF position.
+ */
+
+METHODDEF(wxjpeg_boolean)
+compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int blkn, bi, ci, yindex, yoffset, blockcnt;
+  JDIMENSION ypos, xpos;
+  jpeg_component_info *compptr;
+
+  /* Loop to write as much as one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->mcu_ctr; MCU_col_num <= last_MCU_col;
+	 MCU_col_num++) {
+      /* Determine where data comes from in input_buf and do the DCT thing.
+       * Each call on forward_DCT processes a horizontal row of DCT blocks
+       * as wide as an MCU; we rely on having allocated the MCU_buffer[] blocks
+       * sequentially.  Dummy blocks at the right or bottom edge are filled in
+       * specially.  The data in them does not matter for image reconstruction,
+       * so we fill them with values that will encode to the smallest amount of
+       * data, viz: all zeroes in the AC entries, DC entries equal to previous
+       * block's DC value.  (Thanks to Thomas Kinsman for this idea.)
+       */
+      blkn = 0;
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
+						: compptr->last_col_width;
+	xpos = MCU_col_num * compptr->MCU_sample_width;
+	ypos = yoffset * DCTSIZE; /* ypos == (yoffset+yindex) * DCTSIZE */
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  if (coef->iMCU_row_num < last_iMCU_row ||
+	      yoffset+yindex < compptr->last_row_height) {
+	    (*cinfo->fdct->forward_DCT) (cinfo, compptr,
+					 input_buf[compptr->component_index],
+					 coef->MCU_buffer[blkn],
+					 ypos, xpos, (JDIMENSION) blockcnt);
+	    if (blockcnt < compptr->MCU_width) {
+	      /* Create some dummy blocks at the right edge of the image. */
+	      jzero_far((void FAR *) coef->MCU_buffer[blkn + blockcnt],
+			(compptr->MCU_width - blockcnt) * SIZEOF(JBLOCK));
+	      for (bi = blockcnt; bi < compptr->MCU_width; bi++) {
+		coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn+bi-1][0][0];
+	      }
+	    }
+	  } else {
+	    /* Create a row of dummy blocks at the bottom of the image. */
+	    jzero_far((void FAR *) coef->MCU_buffer[blkn],
+		      compptr->MCU_width * SIZEOF(JBLOCK));
+	    for (bi = 0; bi < compptr->MCU_width; bi++) {
+	      coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn-1][0][0];
+	    }
+	  }
+	  blkn += compptr->MCU_width;
+	  ypos += DCTSIZE;
+	}
+      }
+      /* Try to write the MCU.  In event of a suspension failure, we will
+       * re-DCT the MCU on restart (a bit inefficient, could be fixed...)
+       */
+      if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->mcu_ctr = MCU_col_num;
+	return FALSE;
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->mcu_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  coef->iMCU_row_num++;
+  start_iMCU_row(cinfo);
+  return TRUE;
+}
+
+
+#ifdef FULL_COEF_BUFFER_SUPPORTED
+
+/*
+ * Process some data in the first pass of a multi-pass case.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor block rows for each component in the image.
+ * This amount of data is read from the source buffer, DCT'd and quantized,
+ * and saved into the virtual arrays.  We also generate suitable dummy blocks
+ * as needed at the right and lower edges.  (The dummy blocks are constructed
+ * in the virtual arrays, which have been padded appropriately.)  This makes
+ * it possible for subsequent passes not to worry about real vs. dummy blocks.
+ *
+ * We must also emit the data to the entropy encoder.  This is conveniently
+ * done by calling compress_output() after we've loaded the current strip
+ * of the virtual arrays.
+ *
+ * NB: input_buf contains a plane for each component in image.  All
+ * components are DCT'd and loaded into the virtual arrays in this pass.
+ * However, it may be that only a subset of the components are emitted to
+ * the entropy encoder during this first pass; be careful about looking
+ * at the scan-dependent variables (MCU dimensions, etc).
+ */
+
+METHODDEF(wxjpeg_boolean)
+compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  JDIMENSION blocks_across, MCUs_across, MCUindex;
+  int bi, ci, h_samp_factor, block_row, block_rows, ndummy;
+  JCOEF lastDC;
+  jpeg_component_info *compptr;
+  JBLOCKARRAY buffer;
+  JBLOCKROW thisblockrow, lastblockrow;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Align the virtual buffer for this component. */
+    buffer = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[ci],
+       coef->iMCU_row_num * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, TRUE);
+    /* Count non-dummy DCT block rows in this iMCU row. */
+    if (coef->iMCU_row_num < last_iMCU_row)
+      block_rows = compptr->v_samp_factor;
+    else {
+      /* NB: can't use last_row_height here, since may not be set! */
+      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
+      if (block_rows == 0) block_rows = compptr->v_samp_factor;
+    }
+    blocks_across = compptr->width_in_blocks;
+    h_samp_factor = compptr->h_samp_factor;
+    /* Count number of dummy blocks to be added at the right margin. */
+    ndummy = (int) (blocks_across % h_samp_factor);
+    if (ndummy > 0)
+      ndummy = h_samp_factor - ndummy;
+    /* Perform DCT for all non-dummy blocks in this iMCU row.  Each call
+     * on forward_DCT processes a complete horizontal row of DCT blocks.
+     */
+    for (block_row = 0; block_row < block_rows; block_row++) {
+      thisblockrow = buffer[block_row];
+      (*cinfo->fdct->forward_DCT) (cinfo, compptr,
+				   input_buf[ci], thisblockrow,
+				   (JDIMENSION) (block_row * DCTSIZE),
+				   (JDIMENSION) 0, blocks_across);
+      if (ndummy > 0) {
+	/* Create dummy blocks at the right edge of the image. */
+	thisblockrow += blocks_across; /* => first dummy block */
+	jzero_far((void FAR *) thisblockrow, ndummy * SIZEOF(JBLOCK));
+	lastDC = thisblockrow[-1][0];
+	for (bi = 0; bi < ndummy; bi++) {
+	  thisblockrow[bi][0] = lastDC;
+	}
+      }
+    }
+    /* If at end of image, create dummy block rows as needed.
+     * The tricky part here is that within each MCU, we want the DC values
+     * of the dummy blocks to match the last real block's DC value.
+     * This squeezes a few more bytes out of the resulting file...
+     */
+    if (coef->iMCU_row_num == last_iMCU_row) {
+      blocks_across += ndummy;	/* include lower right corner */
+      MCUs_across = blocks_across / h_samp_factor;
+      for (block_row = block_rows; block_row < compptr->v_samp_factor;
+	   block_row++) {
+	thisblockrow = buffer[block_row];
+	lastblockrow = buffer[block_row-1];
+	jzero_far((void FAR *) thisblockrow,
+		  (size_t) (blocks_across * SIZEOF(JBLOCK)));
+	for (MCUindex = 0; MCUindex < MCUs_across; MCUindex++) {
+	  lastDC = lastblockrow[h_samp_factor-1][0];
+	  for (bi = 0; bi < h_samp_factor; bi++) {
+	    thisblockrow[bi][0] = lastDC;
+	  }
+	  thisblockrow += h_samp_factor; /* advance to next MCU in row */
+	  lastblockrow += h_samp_factor;
+	}
+      }
+    }
+  }
+  /* NB: compress_output will increment iMCU_row_num if successful.
+   * A suspension return will result in redoing all the work above next time.
+   */
+
+  /* Emit data to the entropy encoder, sharing code with subsequent passes */
+  return compress_output(cinfo, input_buf);
+}
+
+
+/*
+ * Process some data in subsequent passes of a multi-pass case.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor block rows for each component in the scan.
+ * The data is obtained from the virtual arrays and fed to the entropy coder.
+ * Returns TRUE if the iMCU row is completed, FALSE if suspended.
+ *
+ * NB: input_buf is ignored; it is likely to be a NULL pointer.
+ */
+
+METHODDEF(wxjpeg_boolean)
+compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  int blkn, ci, xindex, yindex, yoffset;
+  JDIMENSION start_col;
+  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
+  JBLOCKROW buffer_ptr;
+  jpeg_component_info *compptr;
+
+  /* Align the virtual buffers for the components used in this scan.
+   * NB: during first pass, this is safe only because the buffers will
+   * already be aligned properly, so jmemmgr.c won't need to do any I/O.
+   */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    buffer[ci] = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
+       coef->iMCU_row_num * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, FALSE);
+  }
+
+  /* Loop to process one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;
+	 MCU_col_num++) {
+      /* Construct list of pointers to DCT blocks belonging to this MCU */
+      blkn = 0;			/* index of current DCT block within MCU */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	start_col = MCU_col_num * compptr->MCU_width;
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
+	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
+	    coef->MCU_buffer[blkn++] = buffer_ptr++;
+	  }
+	}
+      }
+      /* Try to write the MCU. */
+      if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->mcu_ctr = MCU_col_num;
+	return FALSE;
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->mcu_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  coef->iMCU_row_num++;
+  start_iMCU_row(cinfo);
+  return TRUE;
+}
+
+#endif /* FULL_COEF_BUFFER_SUPPORTED */
+
+
+/*
+ * Initialize coefficient buffer controller.
+ */
+
+GLOBAL(void)
+jinit_c_coef_controller (j_compress_ptr cinfo, wxjpeg_boolean need_full_buffer)
+{
+  my_coef_ptr coef;
+
+  coef = (my_coef_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_coef_controller));
+  cinfo->coef = (struct jpeg_c_coef_controller *) coef;
+  coef->pub.start_pass = start_pass_coef;
+
+  /* Create the coefficient buffer. */
+  if (need_full_buffer) {
+#ifdef FULL_COEF_BUFFER_SUPPORTED
+    /* Allocate a full-image virtual array for each component, */
+    /* padded to a multiple of samp_factor DCT blocks in each direction. */
+    int ci;
+    jpeg_component_info *compptr;
+
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,
+				(long) compptr->h_samp_factor),
+	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
+				(long) compptr->v_samp_factor),
+	 (JDIMENSION) compptr->v_samp_factor);
+    }
+#else
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+#endif
+  } else {
+    /* We only need a single-MCU buffer. */
+    JBLOCKROW buffer;
+    int i;
+
+    buffer = (JBLOCKROW)
+      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
+    for (i = 0; i < C_MAX_BLOCKS_IN_MCU; i++) {
+      coef->MCU_buffer[i] = buffer + i;
+    }
+    coef->whole_image[0] = NULL; /* flag for no virtual arrays */
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jccolor.c b/Source/3rd Party/wx/src/jpeg/jccolor.c
index f41c35d71..2f74cc2a3 100644
--- a/Source/3rd Party/wx/src/jpeg/jccolor.c	
+++ b/Source/3rd Party/wx/src/jpeg/jccolor.c	
@@ -1,459 +1,459 @@
-/*
- * jccolor.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains input colorspace conversion routines.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_color_converter pub; /* public fields */
-
-  /* Private state for RGB->YCC conversion */
-  JPEG_INT32 * rgb_ycc_tab;		/* => table for RGB to YCbCr conversion */
-} my_color_converter;
-
-typedef my_color_converter * my_cconvert_ptr;
-
-
-/**************** RGB -> YCbCr conversion: most common case **************/
-
-/*
- * YCbCr is defined per CCIR 601-1, except that Cb and Cr are
- * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.
- * The conversion equations to be implemented are therefore
- *	Y  =  0.29900 * R + 0.58700 * G + 0.11400 * B
- *	Cb = -0.16874 * R - 0.33126 * G + 0.50000 * B  + CENTERJSAMPLE
- *	Cr =  0.50000 * R - 0.41869 * G - 0.08131 * B  + CENTERJSAMPLE
- * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.)
- * Note: older versions of the IJG code used a zero offset of MAXJSAMPLE/2,
- * rather than CENTERJSAMPLE, for Cb and Cr.  This gave equal positive and
- * negative swings for Cb/Cr, but meant that grayscale values (Cb=Cr=0)
- * were not represented exactly.  Now we sacrifice exact representation of
- * maximum red and maximum blue in order to get exact grayscales.
- *
- * To avoid floating-point arithmetic, we represent the fractional constants
- * as integers scaled up by 2^16 (about 4 digits precision); we have to divide
- * the products by 2^16, with appropriate rounding, to get the correct answer.
- *
- * For even more speed, we avoid doing any multiplications in the inner loop
- * by precalculating the constants times R,G,B for all possible values.
- * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);
- * for 12-bit samples it is still acceptable.  It's not very reasonable for
- * 16-bit samples, but if you want lossless storage you shouldn't be changing
- * colorspace anyway.
- * The CENTERJSAMPLE offsets and the rounding fudge-factor of 0.5 are included
- * in the tables to save adding them separately in the inner loop.
- */
-
-#define SCALEBITS	16	/* speediest right-shift on some machines */
-#define CBCR_OFFSET	((JPEG_INT32) CENTERJSAMPLE << SCALEBITS)
-#define ONE_HALF	((JPEG_INT32) 1 << (SCALEBITS-1))
-#define FIX(x)		((JPEG_INT32) ((x) * (1L<<SCALEBITS) + 0.5))
-
-/* We allocate one big table and divide it up into eight parts, instead of
- * doing eight alloc_small requests.  This lets us use a single table base
- * address, which can be held in a register in the inner loops on many
- * machines (more than can hold all eight addresses, anyway).
- */
-
-#define R_Y_OFF		0			/* offset to R => Y section */
-#define G_Y_OFF		(1*(MAXJSAMPLE+1))	/* offset to G => Y section */
-#define B_Y_OFF		(2*(MAXJSAMPLE+1))	/* etc. */
-#define R_CB_OFF	(3*(MAXJSAMPLE+1))
-#define G_CB_OFF	(4*(MAXJSAMPLE+1))
-#define B_CB_OFF	(5*(MAXJSAMPLE+1))
-#define R_CR_OFF	B_CB_OFF		/* B=>Cb, R=>Cr are the same */
-#define G_CR_OFF	(6*(MAXJSAMPLE+1))
-#define B_CR_OFF	(7*(MAXJSAMPLE+1))
-#define TABLE_SIZE	(8*(MAXJSAMPLE+1))
-
-
-/*
- * Initialize for RGB->YCC colorspace conversion.
- */
-
-METHODDEF(void)
-rgb_ycc_start (j_compress_ptr cinfo)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  JPEG_INT32 * rgb_ycc_tab;
-  JPEG_INT32 i;
-
-  /* Allocate and fill in the conversion tables. */
-  cconvert->rgb_ycc_tab = rgb_ycc_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(TABLE_SIZE * SIZEOF(JPEG_INT32)));
-
-  for (i = 0; i <= MAXJSAMPLE; i++) {
-    rgb_ycc_tab[i+R_Y_OFF] = FIX(0.29900) * i;
-    rgb_ycc_tab[i+G_Y_OFF] = FIX(0.58700) * i;
-    rgb_ycc_tab[i+B_Y_OFF] = FIX(0.11400) * i     + ONE_HALF;
-    rgb_ycc_tab[i+R_CB_OFF] = (-FIX(0.16874)) * i;
-    rgb_ycc_tab[i+G_CB_OFF] = (-FIX(0.33126)) * i;
-    /* We use a rounding fudge-factor of 0.5-epsilon for Cb and Cr.
-     * This ensures that the maximum output will round to MAXJSAMPLE
-     * not MAXJSAMPLE+1, and thus that we don't have to range-limit.
-     */
-    rgb_ycc_tab[i+B_CB_OFF] = FIX(0.50000) * i    + CBCR_OFFSET + ONE_HALF-1;
-/*  B=>Cb and R=>Cr tables are the same
-    rgb_ycc_tab[i+R_CR_OFF] = FIX(0.50000) * i    + CBCR_OFFSET + ONE_HALF-1;
-*/
-    rgb_ycc_tab[i+G_CR_OFF] = (-FIX(0.41869)) * i;
-    rgb_ycc_tab[i+B_CR_OFF] = (-FIX(0.08131)) * i;
-  }
-}
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- *
- * Note that we change from the application's interleaved-pixel format
- * to our internal noninterleaved, one-plane-per-component format.
- * The input buffer is therefore three times as wide as the output buffer.
- *
- * A starting row offset is provided only for the output buffer.  The caller
- * can easily adjust the passed input_buf value to accommodate any row
- * offset required on that side.
- */
-
-METHODDEF(void)
-rgb_ycc_convert (j_compress_ptr cinfo,
-		 JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-		 JDIMENSION output_row, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int r, g, b;
-  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;
-  register JSAMPROW inptr;
-  register JSAMPROW outptr0, outptr1, outptr2;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->image_width;
-
-  while (--num_rows >= 0) {
-    inptr = *input_buf++;
-    outptr0 = output_buf[0][output_row];
-    outptr1 = output_buf[1][output_row];
-    outptr2 = output_buf[2][output_row];
-    output_row++;
-    for (col = 0; col < num_cols; col++) {
-      r = GETJSAMPLE(inptr[RGB_RED]);
-      g = GETJSAMPLE(inptr[RGB_GREEN]);
-      b = GETJSAMPLE(inptr[RGB_BLUE]);
-      inptr += RGB_PIXELSIZE;
-      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
-       * must be too; we do not need an explicit range-limiting operation.
-       * Hence the value being shifted is never negative, and we don't
-       * need the general RIGHT_SHIFT macro.
-       */
-      /* Y */
-      outptr0[col] = (JSAMPLE)
-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
-		 >> SCALEBITS);
-      /* Cb */
-      outptr1[col] = (JSAMPLE)
-		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
-		 >> SCALEBITS);
-      /* Cr */
-      outptr2[col] = (JSAMPLE)
-		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
-		 >> SCALEBITS);
-    }
-  }
-}
-
-
-/**************** Cases other than RGB -> YCbCr **************/
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- * This version handles RGB->grayscale conversion, which is the same
- * as the RGB->Y portion of RGB->YCbCr.
- * We assume rgb_ycc_start has been called (we only use the Y tables).
- */
-
-METHODDEF(void)
-rgb_gray_convert (j_compress_ptr cinfo,
-		  JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-		  JDIMENSION output_row, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int r, g, b;
-  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;
-  register JSAMPROW inptr;
-  register JSAMPROW outptr;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->image_width;
-
-  while (--num_rows >= 0) {
-    inptr = *input_buf++;
-    outptr = output_buf[0][output_row];
-    output_row++;
-    for (col = 0; col < num_cols; col++) {
-      r = GETJSAMPLE(inptr[RGB_RED]);
-      g = GETJSAMPLE(inptr[RGB_GREEN]);
-      b = GETJSAMPLE(inptr[RGB_BLUE]);
-      inptr += RGB_PIXELSIZE;
-      /* Y */
-      outptr[col] = (JSAMPLE)
-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
-		 >> SCALEBITS);
-    }
-  }
-}
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- * This version handles Adobe-style CMYK->YCCK conversion,
- * where we convert R=1-C, G=1-M, and B=1-Y to YCbCr using the same
- * conversion as above, while passing K (black) unchanged.
- * We assume rgb_ycc_start has been called.
- */
-
-METHODDEF(void)
-cmyk_ycck_convert (j_compress_ptr cinfo,
-		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-		   JDIMENSION output_row, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int r, g, b;
-  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;
-  register JSAMPROW inptr;
-  register JSAMPROW outptr0, outptr1, outptr2, outptr3;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->image_width;
-
-  while (--num_rows >= 0) {
-    inptr = *input_buf++;
-    outptr0 = output_buf[0][output_row];
-    outptr1 = output_buf[1][output_row];
-    outptr2 = output_buf[2][output_row];
-    outptr3 = output_buf[3][output_row];
-    output_row++;
-    for (col = 0; col < num_cols; col++) {
-      r = MAXJSAMPLE - GETJSAMPLE(inptr[0]);
-      g = MAXJSAMPLE - GETJSAMPLE(inptr[1]);
-      b = MAXJSAMPLE - GETJSAMPLE(inptr[2]);
-      /* K passes through as-is */
-      outptr3[col] = inptr[3];	/* don't need GETJSAMPLE here */
-      inptr += 4;
-      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
-       * must be too; we do not need an explicit range-limiting operation.
-       * Hence the value being shifted is never negative, and we don't
-       * need the general RIGHT_SHIFT macro.
-       */
-      /* Y */
-      outptr0[col] = (JSAMPLE)
-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
-		 >> SCALEBITS);
-      /* Cb */
-      outptr1[col] = (JSAMPLE)
-		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
-		 >> SCALEBITS);
-      /* Cr */
-      outptr2[col] = (JSAMPLE)
-		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
-		 >> SCALEBITS);
-    }
-  }
-}
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- * This version handles grayscale output with no conversion.
- * The source can be either plain grayscale or YCbCr (since Y == gray).
- */
-
-METHODDEF(void)
-grayscale_convert (j_compress_ptr cinfo,
-		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-		   JDIMENSION output_row, int num_rows)
-{
-  register JSAMPROW inptr;
-  register JSAMPROW outptr;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->image_width;
-  int instride = cinfo->input_components;
-
-  while (--num_rows >= 0) {
-    inptr = *input_buf++;
-    outptr = output_buf[0][output_row];
-    output_row++;
-    for (col = 0; col < num_cols; col++) {
-      outptr[col] = inptr[0];	/* don't need GETJSAMPLE() here */
-      inptr += instride;
-    }
-  }
-}
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- * This version handles multi-component colorspaces without conversion.
- * We assume input_components == num_components.
- */
-
-METHODDEF(void)
-null_convert (j_compress_ptr cinfo,
-	      JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-	      JDIMENSION output_row, int num_rows)
-{
-  register JSAMPROW inptr;
-  register JSAMPROW outptr;
-  register JDIMENSION col;
-  register int ci;
-  int nc = cinfo->num_components;
-  JDIMENSION num_cols = cinfo->image_width;
-
-  while (--num_rows >= 0) {
-    /* It seems fastest to make a separate pass for each component. */
-    for (ci = 0; ci < nc; ci++) {
-      inptr = *input_buf;
-      outptr = output_buf[ci][output_row];
-      for (col = 0; col < num_cols; col++) {
-	outptr[col] = inptr[ci]; /* don't need GETJSAMPLE() here */
-	inptr += nc;
-      }
-    }
-    input_buf++;
-    output_row++;
-  }
-}
-
-
-/*
- * Empty method for start_pass.
- */
-
-METHODDEF(void)
-null_method (j_compress_ptr cinfo)
-{
-  /* no work needed */
-}
-
-
-/*
- * Module initialization routine for input colorspace conversion.
- */
-
-GLOBAL(void)
-jinit_color_converter (j_compress_ptr cinfo)
-{
-  my_cconvert_ptr cconvert;
-
-  cconvert = (my_cconvert_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_color_converter));
-  cinfo->cconvert = (struct jpeg_color_converter *) cconvert;
-  /* set start_pass to null method until we find out differently */
-  cconvert->pub.start_pass = null_method;
-
-  /* Make sure input_components agrees with in_color_space */
-  switch (cinfo->in_color_space) {
-  case JCS_GRAYSCALE:
-    if (cinfo->input_components != 1)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-
-  case JCS_RGB:
-#if RGB_PIXELSIZE != 3
-    if (cinfo->input_components != RGB_PIXELSIZE)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-#endif /* else share code with YCbCr */
-
-  case JCS_YCbCr:
-    if (cinfo->input_components != 3)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-
-  case JCS_CMYK:
-  case JCS_YCCK:
-    if (cinfo->input_components != 4)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-
-  default:			/* JCS_UNKNOWN can be anything */
-    if (cinfo->input_components < 1)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-  }
-
-  /* Check num_components, set conversion method based on requested space */
-  switch (cinfo->jpeg_color_space) {
-  case JCS_GRAYSCALE:
-    if (cinfo->num_components != 1)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_GRAYSCALE)
-      cconvert->pub.color_convert = grayscale_convert;
-    else if (cinfo->in_color_space == JCS_RGB) {
-      cconvert->pub.start_pass = rgb_ycc_start;
-      cconvert->pub.color_convert = rgb_gray_convert;
-    } else if (cinfo->in_color_space == JCS_YCbCr)
-      cconvert->pub.color_convert = grayscale_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_RGB:
-    if (cinfo->num_components != 3)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_RGB && RGB_PIXELSIZE == 3)
-      cconvert->pub.color_convert = null_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_YCbCr:
-    if (cinfo->num_components != 3)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_RGB) {
-      cconvert->pub.start_pass = rgb_ycc_start;
-      cconvert->pub.color_convert = rgb_ycc_convert;
-    } else if (cinfo->in_color_space == JCS_YCbCr)
-      cconvert->pub.color_convert = null_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_CMYK:
-    if (cinfo->num_components != 4)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_CMYK)
-      cconvert->pub.color_convert = null_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_YCCK:
-    if (cinfo->num_components != 4)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_CMYK) {
-      cconvert->pub.start_pass = rgb_ycc_start;
-      cconvert->pub.color_convert = cmyk_ycck_convert;
-    } else if (cinfo->in_color_space == JCS_YCCK)
-      cconvert->pub.color_convert = null_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  default:			/* allow null conversion of JCS_UNKNOWN */
-    if (cinfo->jpeg_color_space != cinfo->in_color_space ||
-	cinfo->num_components != cinfo->input_components)
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    cconvert->pub.color_convert = null_convert;
-    break;
-  }
-}
+/*
+ * jccolor.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains input colorspace conversion routines.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_color_converter pub; /* public fields */
+
+  /* Private state for RGB->YCC conversion */
+  JPEG_INT32 * rgb_ycc_tab;		/* => table for RGB to YCbCr conversion */
+} my_color_converter;
+
+typedef my_color_converter * my_cconvert_ptr;
+
+
+/**************** RGB -> YCbCr conversion: most common case **************/
+
+/*
+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are
+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.
+ * The conversion equations to be implemented are therefore
+ *	Y  =  0.29900 * R + 0.58700 * G + 0.11400 * B
+ *	Cb = -0.16874 * R - 0.33126 * G + 0.50000 * B  + CENTERJSAMPLE
+ *	Cr =  0.50000 * R - 0.41869 * G - 0.08131 * B  + CENTERJSAMPLE
+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.)
+ * Note: older versions of the IJG code used a zero offset of MAXJSAMPLE/2,
+ * rather than CENTERJSAMPLE, for Cb and Cr.  This gave equal positive and
+ * negative swings for Cb/Cr, but meant that grayscale values (Cb=Cr=0)
+ * were not represented exactly.  Now we sacrifice exact representation of
+ * maximum red and maximum blue in order to get exact grayscales.
+ *
+ * To avoid floating-point arithmetic, we represent the fractional constants
+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide
+ * the products by 2^16, with appropriate rounding, to get the correct answer.
+ *
+ * For even more speed, we avoid doing any multiplications in the inner loop
+ * by precalculating the constants times R,G,B for all possible values.
+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);
+ * for 12-bit samples it is still acceptable.  It's not very reasonable for
+ * 16-bit samples, but if you want lossless storage you shouldn't be changing
+ * colorspace anyway.
+ * The CENTERJSAMPLE offsets and the rounding fudge-factor of 0.5 are included
+ * in the tables to save adding them separately in the inner loop.
+ */
+
+#define SCALEBITS	16	/* speediest right-shift on some machines */
+#define CBCR_OFFSET	((JPEG_INT32) CENTERJSAMPLE << SCALEBITS)
+#define ONE_HALF	((JPEG_INT32) 1 << (SCALEBITS-1))
+#define FIX(x)		((JPEG_INT32) ((x) * (1L<<SCALEBITS) + 0.5))
+
+/* We allocate one big table and divide it up into eight parts, instead of
+ * doing eight alloc_small requests.  This lets us use a single table base
+ * address, which can be held in a register in the inner loops on many
+ * machines (more than can hold all eight addresses, anyway).
+ */
+
+#define R_Y_OFF		0			/* offset to R => Y section */
+#define G_Y_OFF		(1*(MAXJSAMPLE+1))	/* offset to G => Y section */
+#define B_Y_OFF		(2*(MAXJSAMPLE+1))	/* etc. */
+#define R_CB_OFF	(3*(MAXJSAMPLE+1))
+#define G_CB_OFF	(4*(MAXJSAMPLE+1))
+#define B_CB_OFF	(5*(MAXJSAMPLE+1))
+#define R_CR_OFF	B_CB_OFF		/* B=>Cb, R=>Cr are the same */
+#define G_CR_OFF	(6*(MAXJSAMPLE+1))
+#define B_CR_OFF	(7*(MAXJSAMPLE+1))
+#define TABLE_SIZE	(8*(MAXJSAMPLE+1))
+
+
+/*
+ * Initialize for RGB->YCC colorspace conversion.
+ */
+
+METHODDEF(void)
+rgb_ycc_start (j_compress_ptr cinfo)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  JPEG_INT32 * rgb_ycc_tab;
+  JPEG_INT32 i;
+
+  /* Allocate and fill in the conversion tables. */
+  cconvert->rgb_ycc_tab = rgb_ycc_tab = (JPEG_INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(TABLE_SIZE * SIZEOF(JPEG_INT32)));
+
+  for (i = 0; i <= MAXJSAMPLE; i++) {
+    rgb_ycc_tab[i+R_Y_OFF] = FIX(0.29900) * i;
+    rgb_ycc_tab[i+G_Y_OFF] = FIX(0.58700) * i;
+    rgb_ycc_tab[i+B_Y_OFF] = FIX(0.11400) * i     + ONE_HALF;
+    rgb_ycc_tab[i+R_CB_OFF] = (-FIX(0.16874)) * i;
+    rgb_ycc_tab[i+G_CB_OFF] = (-FIX(0.33126)) * i;
+    /* We use a rounding fudge-factor of 0.5-epsilon for Cb and Cr.
+     * This ensures that the maximum output will round to MAXJSAMPLE
+     * not MAXJSAMPLE+1, and thus that we don't have to range-limit.
+     */
+    rgb_ycc_tab[i+B_CB_OFF] = FIX(0.50000) * i    + CBCR_OFFSET + ONE_HALF-1;
+/*  B=>Cb and R=>Cr tables are the same
+    rgb_ycc_tab[i+R_CR_OFF] = FIX(0.50000) * i    + CBCR_OFFSET + ONE_HALF-1;
+*/
+    rgb_ycc_tab[i+G_CR_OFF] = (-FIX(0.41869)) * i;
+    rgb_ycc_tab[i+B_CR_OFF] = (-FIX(0.08131)) * i;
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ *
+ * Note that we change from the application's interleaved-pixel format
+ * to our internal noninterleaved, one-plane-per-component format.
+ * The input buffer is therefore three times as wide as the output buffer.
+ *
+ * A starting row offset is provided only for the output buffer.  The caller
+ * can easily adjust the passed input_buf value to accommodate any row
+ * offset required on that side.
+ */
+
+METHODDEF(void)
+rgb_ycc_convert (j_compress_ptr cinfo,
+		 JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+		 JDIMENSION output_row, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int r, g, b;
+  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;
+  register JSAMPROW inptr;
+  register JSAMPROW outptr0, outptr1, outptr2;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->image_width;
+
+  while (--num_rows >= 0) {
+    inptr = *input_buf++;
+    outptr0 = output_buf[0][output_row];
+    outptr1 = output_buf[1][output_row];
+    outptr2 = output_buf[2][output_row];
+    output_row++;
+    for (col = 0; col < num_cols; col++) {
+      r = GETJSAMPLE(inptr[RGB_RED]);
+      g = GETJSAMPLE(inptr[RGB_GREEN]);
+      b = GETJSAMPLE(inptr[RGB_BLUE]);
+      inptr += RGB_PIXELSIZE;
+      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
+       * must be too; we do not need an explicit range-limiting operation.
+       * Hence the value being shifted is never negative, and we don't
+       * need the general RIGHT_SHIFT macro.
+       */
+      /* Y */
+      outptr0[col] = (JSAMPLE)
+		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
+		 >> SCALEBITS);
+      /* Cb */
+      outptr1[col] = (JSAMPLE)
+		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
+		 >> SCALEBITS);
+      /* Cr */
+      outptr2[col] = (JSAMPLE)
+		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
+		 >> SCALEBITS);
+    }
+  }
+}
+
+
+/**************** Cases other than RGB -> YCbCr **************/
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ * This version handles RGB->grayscale conversion, which is the same
+ * as the RGB->Y portion of RGB->YCbCr.
+ * We assume rgb_ycc_start has been called (we only use the Y tables).
+ */
+
+METHODDEF(void)
+rgb_gray_convert (j_compress_ptr cinfo,
+		  JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+		  JDIMENSION output_row, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int r, g, b;
+  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;
+  register JSAMPROW inptr;
+  register JSAMPROW outptr;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->image_width;
+
+  while (--num_rows >= 0) {
+    inptr = *input_buf++;
+    outptr = output_buf[0][output_row];
+    output_row++;
+    for (col = 0; col < num_cols; col++) {
+      r = GETJSAMPLE(inptr[RGB_RED]);
+      g = GETJSAMPLE(inptr[RGB_GREEN]);
+      b = GETJSAMPLE(inptr[RGB_BLUE]);
+      inptr += RGB_PIXELSIZE;
+      /* Y */
+      outptr[col] = (JSAMPLE)
+		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
+		 >> SCALEBITS);
+    }
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ * This version handles Adobe-style CMYK->YCCK conversion,
+ * where we convert R=1-C, G=1-M, and B=1-Y to YCbCr using the same
+ * conversion as above, while passing K (black) unchanged.
+ * We assume rgb_ycc_start has been called.
+ */
+
+METHODDEF(void)
+cmyk_ycck_convert (j_compress_ptr cinfo,
+		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+		   JDIMENSION output_row, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int r, g, b;
+  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;
+  register JSAMPROW inptr;
+  register JSAMPROW outptr0, outptr1, outptr2, outptr3;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->image_width;
+
+  while (--num_rows >= 0) {
+    inptr = *input_buf++;
+    outptr0 = output_buf[0][output_row];
+    outptr1 = output_buf[1][output_row];
+    outptr2 = output_buf[2][output_row];
+    outptr3 = output_buf[3][output_row];
+    output_row++;
+    for (col = 0; col < num_cols; col++) {
+      r = MAXJSAMPLE - GETJSAMPLE(inptr[0]);
+      g = MAXJSAMPLE - GETJSAMPLE(inptr[1]);
+      b = MAXJSAMPLE - GETJSAMPLE(inptr[2]);
+      /* K passes through as-is */
+      outptr3[col] = inptr[3];	/* don't need GETJSAMPLE here */
+      inptr += 4;
+      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
+       * must be too; we do not need an explicit range-limiting operation.
+       * Hence the value being shifted is never negative, and we don't
+       * need the general RIGHT_SHIFT macro.
+       */
+      /* Y */
+      outptr0[col] = (JSAMPLE)
+		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
+		 >> SCALEBITS);
+      /* Cb */
+      outptr1[col] = (JSAMPLE)
+		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
+		 >> SCALEBITS);
+      /* Cr */
+      outptr2[col] = (JSAMPLE)
+		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
+		 >> SCALEBITS);
+    }
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ * This version handles grayscale output with no conversion.
+ * The source can be either plain grayscale or YCbCr (since Y == gray).
+ */
+
+METHODDEF(void)
+grayscale_convert (j_compress_ptr cinfo,
+		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+		   JDIMENSION output_row, int num_rows)
+{
+  register JSAMPROW inptr;
+  register JSAMPROW outptr;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->image_width;
+  int instride = cinfo->input_components;
+
+  while (--num_rows >= 0) {
+    inptr = *input_buf++;
+    outptr = output_buf[0][output_row];
+    output_row++;
+    for (col = 0; col < num_cols; col++) {
+      outptr[col] = inptr[0];	/* don't need GETJSAMPLE() here */
+      inptr += instride;
+    }
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the JPEG colorspace.
+ * This version handles multi-component colorspaces without conversion.
+ * We assume input_components == num_components.
+ */
+
+METHODDEF(void)
+null_convert (j_compress_ptr cinfo,
+	      JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+	      JDIMENSION output_row, int num_rows)
+{
+  register JSAMPROW inptr;
+  register JSAMPROW outptr;
+  register JDIMENSION col;
+  register int ci;
+  int nc = cinfo->num_components;
+  JDIMENSION num_cols = cinfo->image_width;
+
+  while (--num_rows >= 0) {
+    /* It seems fastest to make a separate pass for each component. */
+    for (ci = 0; ci < nc; ci++) {
+      inptr = *input_buf;
+      outptr = output_buf[ci][output_row];
+      for (col = 0; col < num_cols; col++) {
+	outptr[col] = inptr[ci]; /* don't need GETJSAMPLE() here */
+	inptr += nc;
+      }
+    }
+    input_buf++;
+    output_row++;
+  }
+}
+
+
+/*
+ * Empty method for start_pass.
+ */
+
+METHODDEF(void)
+null_method (j_compress_ptr cinfo)
+{
+  /* no work needed */
+}
+
+
+/*
+ * Module initialization routine for input colorspace conversion.
+ */
+
+GLOBAL(void)
+jinit_color_converter (j_compress_ptr cinfo)
+{
+  my_cconvert_ptr cconvert;
+
+  cconvert = (my_cconvert_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_color_converter));
+  cinfo->cconvert = (struct jpeg_color_converter *) cconvert;
+  /* set start_pass to null method until we find out differently */
+  cconvert->pub.start_pass = null_method;
+
+  /* Make sure input_components agrees with in_color_space */
+  switch (cinfo->in_color_space) {
+  case JCS_GRAYSCALE:
+    if (cinfo->input_components != 1)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+
+  case JCS_RGB:
+#if RGB_PIXELSIZE != 3
+    if (cinfo->input_components != RGB_PIXELSIZE)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+#endif /* else share code with YCbCr */
+
+  case JCS_YCbCr:
+    if (cinfo->input_components != 3)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+
+  case JCS_CMYK:
+  case JCS_YCCK:
+    if (cinfo->input_components != 4)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+
+  default:			/* JCS_UNKNOWN can be anything */
+    if (cinfo->input_components < 1)
+      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+    break;
+  }
+
+  /* Check num_components, set conversion method based on requested space */
+  switch (cinfo->jpeg_color_space) {
+  case JCS_GRAYSCALE:
+    if (cinfo->num_components != 1)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_GRAYSCALE)
+      cconvert->pub.color_convert = grayscale_convert;
+    else if (cinfo->in_color_space == JCS_RGB) {
+      cconvert->pub.start_pass = rgb_ycc_start;
+      cconvert->pub.color_convert = rgb_gray_convert;
+    } else if (cinfo->in_color_space == JCS_YCbCr)
+      cconvert->pub.color_convert = grayscale_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_RGB:
+    if (cinfo->num_components != 3)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_RGB && RGB_PIXELSIZE == 3)
+      cconvert->pub.color_convert = null_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_YCbCr:
+    if (cinfo->num_components != 3)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_RGB) {
+      cconvert->pub.start_pass = rgb_ycc_start;
+      cconvert->pub.color_convert = rgb_ycc_convert;
+    } else if (cinfo->in_color_space == JCS_YCbCr)
+      cconvert->pub.color_convert = null_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_CMYK:
+    if (cinfo->num_components != 4)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_CMYK)
+      cconvert->pub.color_convert = null_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_YCCK:
+    if (cinfo->num_components != 4)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    if (cinfo->in_color_space == JCS_CMYK) {
+      cconvert->pub.start_pass = rgb_ycc_start;
+      cconvert->pub.color_convert = cmyk_ycck_convert;
+    } else if (cinfo->in_color_space == JCS_YCCK)
+      cconvert->pub.color_convert = null_convert;
+    else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  default:			/* allow null conversion of JCS_UNKNOWN */
+    if (cinfo->jpeg_color_space != cinfo->in_color_space ||
+	cinfo->num_components != cinfo->input_components)
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    cconvert->pub.color_convert = null_convert;
+    break;
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jcdctmgr.c b/Source/3rd Party/wx/src/jpeg/jcdctmgr.c
index 4628ae00f..03ffc8ae4 100644
--- a/Source/3rd Party/wx/src/jpeg/jcdctmgr.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcdctmgr.c	
@@ -1,387 +1,387 @@
-/*
- * jcdctmgr.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the forward-DCT management logic.
- * This code selects a particular DCT implementation to be used,
- * and it performs related housekeeping chores including coefficient
- * quantization.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-
-/* Private subobject for this module */
-
-typedef struct {
-  struct jpeg_forward_dct pub;	/* public fields */
-
-  /* Pointer to the DCT routine actually in use */
-  forward_DCT_method_ptr do_dct;
-
-  /* The actual post-DCT divisors --- not identical to the quant table
-   * entries, because of scaling (especially for an unnormalized DCT).
-   * Each table is given in normal array order.
-   */
-  DCTELEM * divisors[NUM_QUANT_TBLS];
-
-#ifdef DCT_FLOAT_SUPPORTED
-  /* Same as above for the floating-point case. */
-  float_DCT_method_ptr do_float_dct;
-  FAST_FLOAT * float_divisors[NUM_QUANT_TBLS];
-#endif
-} my_fdct_controller;
-
-typedef my_fdct_controller * my_fdct_ptr;
-
-
-/*
- * Initialize for a processing pass.
- * Verify that all referenced Q-tables are present, and set up
- * the divisor table for each one.
- * In the current implementation, DCT of all components is done during
- * the first pass, even if only some components will be output in the
- * first scan.  Hence all components should be examined here.
- */
-
-METHODDEF(void)
-start_pass_fdctmgr (j_compress_ptr cinfo)
-{
-  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
-  int ci, qtblno, i;
-  jpeg_component_info *compptr;
-  JQUANT_TBL * qtbl;
-  DCTELEM * dtbl;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    qtblno = compptr->quant_tbl_no;
-    /* Make sure specified quantization table is present */
-    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||
-	cinfo->quant_tbl_ptrs[qtblno] == NULL)
-      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);
-    qtbl = cinfo->quant_tbl_ptrs[qtblno];
-    /* Compute divisors for this quant table */
-    /* We may do this more than once for same table, but it's not a big deal */
-    switch (cinfo->dct_method) {
-#ifdef DCT_ISLOW_SUPPORTED
-    case JDCT_ISLOW:
-      /* For LL&M IDCT method, divisors are equal to raw quantization
-       * coefficients multiplied by 8 (to counteract scaling).
-       */
-      if (fdct->divisors[qtblno] == NULL) {
-	fdct->divisors[qtblno] = (DCTELEM *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      DCTSIZE2 * SIZEOF(DCTELEM));
-      }
-      dtbl = fdct->divisors[qtblno];
-      for (i = 0; i < DCTSIZE2; i++) {
-	dtbl[i] = ((DCTELEM) qtbl->quantval[i]) << 3;
-      }
-      break;
-#endif
-#ifdef DCT_IFAST_SUPPORTED
-    case JDCT_IFAST:
-      {
-	/* For AA&N IDCT method, divisors are equal to quantization
-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
-	 *   scalefactor[0] = 1
-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
-	 * We apply a further scale factor of 8.
-	 */
-#define CONST_BITS 14
-	static const INT16 aanscales[DCTSIZE2] = {
-	  /* precomputed values scaled up by 14 bits */
-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
-	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
-	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
-	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
-	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
-	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,
-	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247
-	};
-	SHIFT_TEMPS
-
-	if (fdct->divisors[qtblno] == NULL) {
-	  fdct->divisors[qtblno] = (DCTELEM *)
-	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-					DCTSIZE2 * SIZEOF(DCTELEM));
-	}
-	dtbl = fdct->divisors[qtblno];
-	for (i = 0; i < DCTSIZE2; i++) {
-	  dtbl[i] = (DCTELEM)
-	    DESCALE(MULTIPLY16V16((JPEG_INT32) qtbl->quantval[i],
-				  (JPEG_INT32) aanscales[i]),
-		    CONST_BITS-3);
-	}
-      }
-      break;
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-    case JDCT_FLOAT:
-      {
-	/* For float AA&N IDCT method, divisors are equal to quantization
-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
-	 *   scalefactor[0] = 1
-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
-	 * We apply a further scale factor of 8.
-	 * What's actually stored is 1/divisor so that the inner loop can
-	 * use a multiplication rather than a division.
-	 */
-	FAST_FLOAT * fdtbl;
-	int row, col;
-	static const double aanscalefactor[DCTSIZE] = {
-	  1.0, 1.387039845, 1.306562965, 1.175875602,
-	  1.0, 0.785694958, 0.541196100, 0.275899379
-	};
-
-	if (fdct->float_divisors[qtblno] == NULL) {
-	  fdct->float_divisors[qtblno] = (FAST_FLOAT *)
-	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-					DCTSIZE2 * SIZEOF(FAST_FLOAT));
-	}
-	fdtbl = fdct->float_divisors[qtblno];
-	i = 0;
-	for (row = 0; row < DCTSIZE; row++) {
-	  for (col = 0; col < DCTSIZE; col++) {
-	    fdtbl[i] = (FAST_FLOAT)
-	      (1.0 / (((double) qtbl->quantval[i] *
-		       aanscalefactor[row] * aanscalefactor[col] * 8.0)));
-	    i++;
-	  }
-	}
-      }
-      break;
-#endif
-    default:
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-      break;
-    }
-  }
-}
-
-
-/*
- * Perform forward DCT on one or more blocks of a component.
- *
- * The input samples are taken from the sample_data[] array starting at
- * position start_row/start_col, and moving to the right for any additional
- * blocks. The quantized coefficients are returned in coef_blocks[].
- */
-
-METHODDEF(void)
-forward_DCT (j_compress_ptr cinfo, jpeg_component_info * compptr,
-	     JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-	     JDIMENSION start_row, JDIMENSION start_col,
-	     JDIMENSION num_blocks)
-/* This version is used for integer DCT implementations. */
-{
-  /* This routine is heavily used, so it's worth coding it tightly. */
-  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
-  forward_DCT_method_ptr do_dct = fdct->do_dct;
-  DCTELEM * divisors = fdct->divisors[compptr->quant_tbl_no];
-  DCTELEM workspace[DCTSIZE2];	/* work area for FDCT subroutine */
-  JDIMENSION bi;
-
-  sample_data += start_row;	/* fold in the vertical offset once */
-
-  for (bi = 0; bi < num_blocks; bi++, start_col += DCTSIZE) {
-    /* Load data into workspace, applying unsigned->signed conversion */
-    { register DCTELEM *workspaceptr;
-      register JSAMPROW elemptr;
-      register int elemr;
-
-      workspaceptr = workspace;
-      for (elemr = 0; elemr < DCTSIZE; elemr++) {
-	elemptr = sample_data[elemr] + start_col;
-#if DCTSIZE == 8		/* unroll the inner loop */
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-#else
-	{ register int elemc;
-	  for (elemc = DCTSIZE; elemc > 0; elemc--) {
-	    *workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	  }
-	}
-#endif
-      }
-    }
-
-    /* Perform the DCT */
-    (*do_dct) (workspace);
-
-    /* Quantize/descale the coefficients, and store into coef_blocks[] */
-    { register DCTELEM temp, qval;
-      register int i;
-      register JCOEFPTR output_ptr = coef_blocks[bi];
-
-      for (i = 0; i < DCTSIZE2; i++) {
-	qval = divisors[i];
-	temp = workspace[i];
-	/* Divide the coefficient value by qval, ensuring proper rounding.
-	 * Since C does not specify the direction of rounding for negative
-	 * quotients, we have to force the dividend positive for portability.
-	 *
-	 * In most files, at least half of the output values will be zero
-	 * (at default quantization settings, more like three-quarters...)
-	 * so we should ensure that this case is fast.  On many machines,
-	 * a comparison is enough cheaper than a divide to make a special test
-	 * a win.  Since both inputs will be nonnegative, we need only test
-	 * for a < b to discover whether a/b is 0.
-	 * If your machine's division is fast enough, define FAST_DIVIDE.
-	 */
-#ifdef FAST_DIVIDE
-#define DIVIDE_BY(a,b)	a /= b
-#else
-#define DIVIDE_BY(a,b)	if (a >= b) a /= b; else a = 0
-#endif
-	if (temp < 0) {
-	  temp = -temp;
-	  temp += qval>>1;	/* for rounding */
-	  DIVIDE_BY(temp, qval);
-	  temp = -temp;
-	} else {
-	  temp += qval>>1;	/* for rounding */
-	  DIVIDE_BY(temp, qval);
-	}
-	output_ptr[i] = (JCOEF) temp;
-      }
-    }
-  }
-}
-
-
-#ifdef DCT_FLOAT_SUPPORTED
-
-METHODDEF(void)
-forward_DCT_float (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		   JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-		   JDIMENSION start_row, JDIMENSION start_col,
-		   JDIMENSION num_blocks)
-/* This version is used for floating-point DCT implementations. */
-{
-  /* This routine is heavily used, so it's worth coding it tightly. */
-  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
-  float_DCT_method_ptr do_dct = fdct->do_float_dct;
-  FAST_FLOAT * divisors = fdct->float_divisors[compptr->quant_tbl_no];
-  FAST_FLOAT workspace[DCTSIZE2]; /* work area for FDCT subroutine */
-  JDIMENSION bi;
-
-  sample_data += start_row;	/* fold in the vertical offset once */
-
-  for (bi = 0; bi < num_blocks; bi++, start_col += DCTSIZE) {
-    /* Load data into workspace, applying unsigned->signed conversion */
-    { register FAST_FLOAT *workspaceptr;
-      register JSAMPROW elemptr;
-      register int elemr;
-
-      workspaceptr = workspace;
-      for (elemr = 0; elemr < DCTSIZE; elemr++) {
-	elemptr = sample_data[elemr] + start_col;
-#if DCTSIZE == 8		/* unroll the inner loop */
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-#else
-	{ register int elemc;
-	  for (elemc = DCTSIZE; elemc > 0; elemc--) {
-	    *workspaceptr++ = (FAST_FLOAT)
-	      (GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	  }
-	}
-#endif
-      }
-    }
-
-    /* Perform the DCT */
-    (*do_dct) (workspace);
-
-    /* Quantize/descale the coefficients, and store into coef_blocks[] */
-    { register FAST_FLOAT temp;
-      register int i;
-      register JCOEFPTR output_ptr = coef_blocks[bi];
-
-      for (i = 0; i < DCTSIZE2; i++) {
-	/* Apply the quantization and scaling factor */
-	temp = workspace[i] * divisors[i];
-	/* Round to nearest integer.
-	 * Since C does not specify the direction of rounding for negative
-	 * quotients, we have to force the dividend positive for portability.
-	 * The maximum coefficient size is +-16K (for 12-bit data), so this
-	 * code should work for either 16-bit or 32-bit ints.
-	 */
-	output_ptr[i] = (JCOEF) ((int) (temp + (FAST_FLOAT) 16384.5) - 16384);
-      }
-    }
-  }
-}
-
-#endif /* DCT_FLOAT_SUPPORTED */
-
-
-/*
- * Initialize FDCT manager.
- */
-
-GLOBAL(void)
-jinit_forward_dct (j_compress_ptr cinfo)
-{
-  my_fdct_ptr fdct;
-  int i;
-
-  fdct = (my_fdct_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_fdct_controller));
-  cinfo->fdct = (struct jpeg_forward_dct *) fdct;
-  fdct->pub.start_pass = start_pass_fdctmgr;
-
-  switch (cinfo->dct_method) {
-#ifdef DCT_ISLOW_SUPPORTED
-  case JDCT_ISLOW:
-    fdct->pub.forward_DCT = forward_DCT;
-    fdct->do_dct = jpeg_fdct_islow;
-    break;
-#endif
-#ifdef DCT_IFAST_SUPPORTED
-  case JDCT_IFAST:
-    fdct->pub.forward_DCT = forward_DCT;
-    fdct->do_dct = jpeg_fdct_ifast;
-    break;
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-  case JDCT_FLOAT:
-    fdct->pub.forward_DCT = forward_DCT_float;
-    fdct->do_float_dct = jpeg_fdct_float;
-    break;
-#endif
-  default:
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-    break;
-  }
-
-  /* Mark divisor tables unallocated */
-  for (i = 0; i < NUM_QUANT_TBLS; i++) {
-    fdct->divisors[i] = NULL;
-#ifdef DCT_FLOAT_SUPPORTED
-    fdct->float_divisors[i] = NULL;
-#endif
-  }
-}
+/*
+ * jcdctmgr.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the forward-DCT management logic.
+ * This code selects a particular DCT implementation to be used,
+ * and it performs related housekeeping chores including coefficient
+ * quantization.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+
+/* Private subobject for this module */
+
+typedef struct {
+  struct jpeg_forward_dct pub;	/* public fields */
+
+  /* Pointer to the DCT routine actually in use */
+  forward_DCT_method_ptr do_dct;
+
+  /* The actual post-DCT divisors --- not identical to the quant table
+   * entries, because of scaling (especially for an unnormalized DCT).
+   * Each table is given in normal array order.
+   */
+  DCTELEM * divisors[NUM_QUANT_TBLS];
+
+#ifdef DCT_FLOAT_SUPPORTED
+  /* Same as above for the floating-point case. */
+  float_DCT_method_ptr do_float_dct;
+  FAST_FLOAT * float_divisors[NUM_QUANT_TBLS];
+#endif
+} my_fdct_controller;
+
+typedef my_fdct_controller * my_fdct_ptr;
+
+
+/*
+ * Initialize for a processing pass.
+ * Verify that all referenced Q-tables are present, and set up
+ * the divisor table for each one.
+ * In the current implementation, DCT of all components is done during
+ * the first pass, even if only some components will be output in the
+ * first scan.  Hence all components should be examined here.
+ */
+
+METHODDEF(void)
+start_pass_fdctmgr (j_compress_ptr cinfo)
+{
+  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
+  int ci, qtblno, i;
+  jpeg_component_info *compptr;
+  JQUANT_TBL * qtbl;
+  DCTELEM * dtbl;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    qtblno = compptr->quant_tbl_no;
+    /* Make sure specified quantization table is present */
+    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||
+	cinfo->quant_tbl_ptrs[qtblno] == NULL)
+      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);
+    qtbl = cinfo->quant_tbl_ptrs[qtblno];
+    /* Compute divisors for this quant table */
+    /* We may do this more than once for same table, but it's not a big deal */
+    switch (cinfo->dct_method) {
+#ifdef DCT_ISLOW_SUPPORTED
+    case JDCT_ISLOW:
+      /* For LL&M IDCT method, divisors are equal to raw quantization
+       * coefficients multiplied by 8 (to counteract scaling).
+       */
+      if (fdct->divisors[qtblno] == NULL) {
+	fdct->divisors[qtblno] = (DCTELEM *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      DCTSIZE2 * SIZEOF(DCTELEM));
+      }
+      dtbl = fdct->divisors[qtblno];
+      for (i = 0; i < DCTSIZE2; i++) {
+	dtbl[i] = ((DCTELEM) qtbl->quantval[i]) << 3;
+      }
+      break;
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+    case JDCT_IFAST:
+      {
+	/* For AA&N IDCT method, divisors are equal to quantization
+	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
+	 *   scalefactor[0] = 1
+	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
+	 * We apply a further scale factor of 8.
+	 */
+#define CONST_BITS 14
+	static const INT16 aanscales[DCTSIZE2] = {
+	  /* precomputed values scaled up by 14 bits */
+	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
+	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
+	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
+	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
+	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
+	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
+	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,
+	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247
+	};
+	SHIFT_TEMPS
+
+	if (fdct->divisors[qtblno] == NULL) {
+	  fdct->divisors[qtblno] = (DCTELEM *)
+	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+					DCTSIZE2 * SIZEOF(DCTELEM));
+	}
+	dtbl = fdct->divisors[qtblno];
+	for (i = 0; i < DCTSIZE2; i++) {
+	  dtbl[i] = (DCTELEM)
+	    DESCALE(MULTIPLY16V16((JPEG_INT32) qtbl->quantval[i],
+				  (JPEG_INT32) aanscales[i]),
+		    CONST_BITS-3);
+	}
+      }
+      break;
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+    case JDCT_FLOAT:
+      {
+	/* For float AA&N IDCT method, divisors are equal to quantization
+	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
+	 *   scalefactor[0] = 1
+	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
+	 * We apply a further scale factor of 8.
+	 * What's actually stored is 1/divisor so that the inner loop can
+	 * use a multiplication rather than a division.
+	 */
+	FAST_FLOAT * fdtbl;
+	int row, col;
+	static const double aanscalefactor[DCTSIZE] = {
+	  1.0, 1.387039845, 1.306562965, 1.175875602,
+	  1.0, 0.785694958, 0.541196100, 0.275899379
+	};
+
+	if (fdct->float_divisors[qtblno] == NULL) {
+	  fdct->float_divisors[qtblno] = (FAST_FLOAT *)
+	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+					DCTSIZE2 * SIZEOF(FAST_FLOAT));
+	}
+	fdtbl = fdct->float_divisors[qtblno];
+	i = 0;
+	for (row = 0; row < DCTSIZE; row++) {
+	  for (col = 0; col < DCTSIZE; col++) {
+	    fdtbl[i] = (FAST_FLOAT)
+	      (1.0 / (((double) qtbl->quantval[i] *
+		       aanscalefactor[row] * aanscalefactor[col] * 8.0)));
+	    i++;
+	  }
+	}
+      }
+      break;
+#endif
+    default:
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+      break;
+    }
+  }
+}
+
+
+/*
+ * Perform forward DCT on one or more blocks of a component.
+ *
+ * The input samples are taken from the sample_data[] array starting at
+ * position start_row/start_col, and moving to the right for any additional
+ * blocks. The quantized coefficients are returned in coef_blocks[].
+ */
+
+METHODDEF(void)
+forward_DCT (j_compress_ptr cinfo, jpeg_component_info * compptr,
+	     JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+	     JDIMENSION start_row, JDIMENSION start_col,
+	     JDIMENSION num_blocks)
+/* This version is used for integer DCT implementations. */
+{
+  /* This routine is heavily used, so it's worth coding it tightly. */
+  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
+  forward_DCT_method_ptr do_dct = fdct->do_dct;
+  DCTELEM * divisors = fdct->divisors[compptr->quant_tbl_no];
+  DCTELEM workspace[DCTSIZE2];	/* work area for FDCT subroutine */
+  JDIMENSION bi;
+
+  sample_data += start_row;	/* fold in the vertical offset once */
+
+  for (bi = 0; bi < num_blocks; bi++, start_col += DCTSIZE) {
+    /* Load data into workspace, applying unsigned->signed conversion */
+    { register DCTELEM *workspaceptr;
+      register JSAMPROW elemptr;
+      register int elemr;
+
+      workspaceptr = workspace;
+      for (elemr = 0; elemr < DCTSIZE; elemr++) {
+	elemptr = sample_data[elemr] + start_col;
+#if DCTSIZE == 8		/* unroll the inner loop */
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+#else
+	{ register int elemc;
+	  for (elemc = DCTSIZE; elemc > 0; elemc--) {
+	    *workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
+	  }
+	}
+#endif
+      }
+    }
+
+    /* Perform the DCT */
+    (*do_dct) (workspace);
+
+    /* Quantize/descale the coefficients, and store into coef_blocks[] */
+    { register DCTELEM temp, qval;
+      register int i;
+      register JCOEFPTR output_ptr = coef_blocks[bi];
+
+      for (i = 0; i < DCTSIZE2; i++) {
+	qval = divisors[i];
+	temp = workspace[i];
+	/* Divide the coefficient value by qval, ensuring proper rounding.
+	 * Since C does not specify the direction of rounding for negative
+	 * quotients, we have to force the dividend positive for portability.
+	 *
+	 * In most files, at least half of the output values will be zero
+	 * (at default quantization settings, more like three-quarters...)
+	 * so we should ensure that this case is fast.  On many machines,
+	 * a comparison is enough cheaper than a divide to make a special test
+	 * a win.  Since both inputs will be nonnegative, we need only test
+	 * for a < b to discover whether a/b is 0.
+	 * If your machine's division is fast enough, define FAST_DIVIDE.
+	 */
+#ifdef FAST_DIVIDE
+#define DIVIDE_BY(a,b)	a /= b
+#else
+#define DIVIDE_BY(a,b)	if (a >= b) a /= b; else a = 0
+#endif
+	if (temp < 0) {
+	  temp = -temp;
+	  temp += qval>>1;	/* for rounding */
+	  DIVIDE_BY(temp, qval);
+	  temp = -temp;
+	} else {
+	  temp += qval>>1;	/* for rounding */
+	  DIVIDE_BY(temp, qval);
+	}
+	output_ptr[i] = (JCOEF) temp;
+      }
+    }
+  }
+}
+
+
+#ifdef DCT_FLOAT_SUPPORTED
+
+METHODDEF(void)
+forward_DCT_float (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		   JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+		   JDIMENSION start_row, JDIMENSION start_col,
+		   JDIMENSION num_blocks)
+/* This version is used for floating-point DCT implementations. */
+{
+  /* This routine is heavily used, so it's worth coding it tightly. */
+  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
+  float_DCT_method_ptr do_dct = fdct->do_float_dct;
+  FAST_FLOAT * divisors = fdct->float_divisors[compptr->quant_tbl_no];
+  FAST_FLOAT workspace[DCTSIZE2]; /* work area for FDCT subroutine */
+  JDIMENSION bi;
+
+  sample_data += start_row;	/* fold in the vertical offset once */
+
+  for (bi = 0; bi < num_blocks; bi++, start_col += DCTSIZE) {
+    /* Load data into workspace, applying unsigned->signed conversion */
+    { register FAST_FLOAT *workspaceptr;
+      register JSAMPROW elemptr;
+      register int elemr;
+
+      workspaceptr = workspace;
+      for (elemr = 0; elemr < DCTSIZE; elemr++) {
+	elemptr = sample_data[elemr] + start_col;
+#if DCTSIZE == 8		/* unroll the inner loop */
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+#else
+	{ register int elemc;
+	  for (elemc = DCTSIZE; elemc > 0; elemc--) {
+	    *workspaceptr++ = (FAST_FLOAT)
+	      (GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
+	  }
+	}
+#endif
+      }
+    }
+
+    /* Perform the DCT */
+    (*do_dct) (workspace);
+
+    /* Quantize/descale the coefficients, and store into coef_blocks[] */
+    { register FAST_FLOAT temp;
+      register int i;
+      register JCOEFPTR output_ptr = coef_blocks[bi];
+
+      for (i = 0; i < DCTSIZE2; i++) {
+	/* Apply the quantization and scaling factor */
+	temp = workspace[i] * divisors[i];
+	/* Round to nearest integer.
+	 * Since C does not specify the direction of rounding for negative
+	 * quotients, we have to force the dividend positive for portability.
+	 * The maximum coefficient size is +-16K (for 12-bit data), so this
+	 * code should work for either 16-bit or 32-bit ints.
+	 */
+	output_ptr[i] = (JCOEF) ((int) (temp + (FAST_FLOAT) 16384.5) - 16384);
+      }
+    }
+  }
+}
+
+#endif /* DCT_FLOAT_SUPPORTED */
+
+
+/*
+ * Initialize FDCT manager.
+ */
+
+GLOBAL(void)
+jinit_forward_dct (j_compress_ptr cinfo)
+{
+  my_fdct_ptr fdct;
+  int i;
+
+  fdct = (my_fdct_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_fdct_controller));
+  cinfo->fdct = (struct jpeg_forward_dct *) fdct;
+  fdct->pub.start_pass = start_pass_fdctmgr;
+
+  switch (cinfo->dct_method) {
+#ifdef DCT_ISLOW_SUPPORTED
+  case JDCT_ISLOW:
+    fdct->pub.forward_DCT = forward_DCT;
+    fdct->do_dct = jpeg_fdct_islow;
+    break;
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+  case JDCT_IFAST:
+    fdct->pub.forward_DCT = forward_DCT;
+    fdct->do_dct = jpeg_fdct_ifast;
+    break;
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+  case JDCT_FLOAT:
+    fdct->pub.forward_DCT = forward_DCT_float;
+    fdct->do_float_dct = jpeg_fdct_float;
+    break;
+#endif
+  default:
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+    break;
+  }
+
+  /* Mark divisor tables unallocated */
+  for (i = 0; i < NUM_QUANT_TBLS; i++) {
+    fdct->divisors[i] = NULL;
+#ifdef DCT_FLOAT_SUPPORTED
+    fdct->float_divisors[i] = NULL;
+#endif
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jchuff.c b/Source/3rd Party/wx/src/jpeg/jchuff.c
index d60491b13..45b3d2b6f 100644
--- a/Source/3rd Party/wx/src/jpeg/jchuff.c	
+++ b/Source/3rd Party/wx/src/jpeg/jchuff.c	
@@ -1,909 +1,909 @@
-/*
- * jchuff.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains Huffman entropy encoding routines.
- *
- * Much of the complexity here has to do with supporting output suspension.
- * If the data destination module demands suspension, we want to be able to
- * back up to the start of the current MCU.  To do this, we copy state
- * variables into local working storage, and update them back to the
- * permanent JPEG objects only upon successful completion of an MCU.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jchuff.h"		/* Declarations shared with jcphuff.c */
-
-
-/* Expanded entropy encoder object for Huffman encoding.
- *
- * The savable_state subrecord contains fields that change within an MCU,
- * but must not be updated permanently until we complete the MCU.
- */
-
-typedef struct {
-  JPEG_INT32 put_buffer;		/* current bit-accumulation buffer */
-  int put_bits;			/* # of bits now in it */
-  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
-} savable_state;
-
-/* This macro is to work around compilers with missing or broken
- * structure assignment.  You'll need to fix this code if you have
- * such a compiler and you change MAX_COMPS_IN_SCAN.
- */
-
-#ifndef NO_STRUCT_ASSIGN
-#define ASSIGN_STATE(dest,src)  ((dest) = (src))
-#else
-#if MAX_COMPS_IN_SCAN == 4
-#define ASSIGN_STATE(dest,src)  \
-	((dest).put_buffer = (src).put_buffer, \
-	 (dest).put_bits = (src).put_bits, \
-	 (dest).last_dc_val[0] = (src).last_dc_val[0], \
-	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
-	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
-	 (dest).last_dc_val[3] = (src).last_dc_val[3])
-#endif
-#endif
-
-
-typedef struct {
-  struct jpeg_entropy_encoder pub; /* public fields */
-
-  savable_state saved;		/* Bit buffer & DC state at start of MCU */
-
-  /* These fields are NOT loaded into local working state. */
-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
-  int next_restart_num;		/* next restart number to write (0-7) */
-
-  /* Pointers to derived tables (these workspaces have image lifespan) */
-  c_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];
-  c_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];
-
-#ifdef ENTROPY_OPT_SUPPORTED	/* Statistics tables for optimization */
-  long * dc_count_ptrs[NUM_HUFF_TBLS];
-  long * ac_count_ptrs[NUM_HUFF_TBLS];
-#endif
-} huff_entropy_encoder;
-
-typedef huff_entropy_encoder * huff_entropy_ptr;
-
-/* Working state while writing an MCU.
- * This struct contains all the fields that are needed by subroutines.
- */
-
-typedef struct {
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-  savable_state cur;		/* Current bit buffer & DC state */
-  j_compress_ptr cinfo;		/* dump_buffer needs access to this */
-} working_state;
-
-
-/* Forward declarations */
-METHODDEF(wxjpeg_boolean) encode_mcu_huff JPP((j_compress_ptr cinfo,
-					JBLOCKROW *MCU_data));
-METHODDEF(void) finish_pass_huff JPP((j_compress_ptr cinfo));
-#ifdef ENTROPY_OPT_SUPPORTED
-METHODDEF(wxjpeg_boolean) encode_mcu_gather JPP((j_compress_ptr cinfo,
-					  JBLOCKROW *MCU_data));
-METHODDEF(void) finish_pass_gather JPP((j_compress_ptr cinfo));
-#endif
-
-
-/*
- * Initialize for a Huffman-compressed scan.
- * If gather_statistics is TRUE, we do not output anything during the scan,
- * just count the Huffman symbols used and generate Huffman code tables.
- */
-
-METHODDEF(void)
-start_pass_huff (j_compress_ptr cinfo, wxjpeg_boolean gather_statistics)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int ci, dctbl, actbl;
-  jpeg_component_info * compptr;
-
-  if (gather_statistics) {
-#ifdef ENTROPY_OPT_SUPPORTED
-    entropy->pub.encode_mcu = encode_mcu_gather;
-    entropy->pub.finish_pass = finish_pass_gather;
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    entropy->pub.encode_mcu = encode_mcu_huff;
-    entropy->pub.finish_pass = finish_pass_huff;
-  }
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    dctbl = compptr->dc_tbl_no;
-    actbl = compptr->ac_tbl_no;
-    if (gather_statistics) {
-#ifdef ENTROPY_OPT_SUPPORTED
-      /* Check for invalid table indexes */
-      /* (make_c_derived_tbl does this in the other path) */
-      if (dctbl < 0 || dctbl >= NUM_HUFF_TBLS)
-	ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, dctbl);
-      if (actbl < 0 || actbl >= NUM_HUFF_TBLS)
-	ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, actbl);
-      /* Allocate and zero the statistics tables */
-      /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */
-      if (entropy->dc_count_ptrs[dctbl] == NULL)
-	entropy->dc_count_ptrs[dctbl] = (long *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      257 * SIZEOF(long));
-      MEMZERO(entropy->dc_count_ptrs[dctbl], 257 * SIZEOF(long));
-      if (entropy->ac_count_ptrs[actbl] == NULL)
-	entropy->ac_count_ptrs[actbl] = (long *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      257 * SIZEOF(long));
-      MEMZERO(entropy->ac_count_ptrs[actbl], 257 * SIZEOF(long));
-#endif
-    } else {
-      /* Compute derived values for Huffman tables */
-      /* We may do this more than once for a table, but it's not expensive */
-      jpeg_make_c_derived_tbl(cinfo, TRUE, dctbl,
-			      & entropy->dc_derived_tbls[dctbl]);
-      jpeg_make_c_derived_tbl(cinfo, FALSE, actbl,
-			      & entropy->ac_derived_tbls[actbl]);
-    }
-    /* Initialize DC predictions to 0 */
-    entropy->saved.last_dc_val[ci] = 0;
-  }
-
-  /* Initialize bit buffer to empty */
-  entropy->saved.put_buffer = 0;
-  entropy->saved.put_bits = 0;
-
-  /* Initialize restart stuff */
-  entropy->restarts_to_go = cinfo->restart_interval;
-  entropy->next_restart_num = 0;
-}
-
-
-/*
- * Compute the derived values for a Huffman table.
- * This routine also performs some validation checks on the table.
- *
- * Note this is also used by jcphuff.c.
- */
-
-GLOBAL(void)
-jpeg_make_c_derived_tbl (j_compress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
-			 c_derived_tbl ** pdtbl)
-{
-  JHUFF_TBL *htbl;
-  c_derived_tbl *dtbl;
-  int p, i, l, lastp, si, maxsymbol;
-  char huffsize[257];
-  unsigned int huffcode[257];
-  unsigned int code;
-
-  /* Note that huffsize[] and huffcode[] are filled in code-length order,
-   * paralleling the order of the symbols themselves in htbl->huffval[].
-   */
-
-  /* Find the input Huffman table */
-  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
-  htbl =
-    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];
-  if (htbl == NULL)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
-
-  /* Allocate a workspace if we haven't already done so. */
-  if (*pdtbl == NULL)
-    *pdtbl = (c_derived_tbl *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(c_derived_tbl));
-  dtbl = *pdtbl;
-  
-  /* Figure C.1: make table of Huffman code length for each symbol */
-
-  p = 0;
-  for (l = 1; l <= 16; l++) {
-    i = (int) htbl->bits[l];
-    if (i < 0 || p + i > 256)	/* protect against table overrun */
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    while (i--)
-      huffsize[p++] = (char) l;
-  }
-  huffsize[p] = 0;
-  lastp = p;
-  
-  /* Figure C.2: generate the codes themselves */
-  /* We also validate that the counts represent a legal Huffman code tree. */
-
-  code = 0;
-  si = huffsize[0];
-  p = 0;
-  while (huffsize[p]) {
-    while (((int) huffsize[p]) == si) {
-      huffcode[p++] = code;
-      code++;
-    }
-    /* code is now 1 more than the last code used for codelength si; but
-     * it must still fit in si bits, since no code is allowed to be all ones.
-     */
-    if (((JPEG_INT32) code) >= (((JPEG_INT32) 1) << si))
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    code <<= 1;
-    si++;
-  }
-  
-  /* Figure C.3: generate encoding tables */
-  /* These are code and size indexed by symbol value */
-
-  /* Set all codeless symbols to have code length 0;
-   * this lets us detect duplicate VAL entries here, and later
-   * allows emit_bits to detect any attempt to emit such symbols.
-   */
-  MEMZERO(dtbl->ehufsi, SIZEOF(dtbl->ehufsi));
-
-  /* This is also a convenient place to check for out-of-range
-   * and duplicated VAL entries.  We allow 0..255 for AC symbols
-   * but only 0..15 for DC.  (We could constrain them further
-   * based on data depth and mode, but this seems enough.)
-   */
-  maxsymbol = isDC ? 15 : 255;
-
-  for (p = 0; p < lastp; p++) {
-    i = htbl->huffval[p];
-    if (i < 0 || i > maxsymbol || dtbl->ehufsi[i])
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    dtbl->ehufco[i] = huffcode[p];
-    dtbl->ehufsi[i] = huffsize[p];
-  }
-}
-
-
-/* Outputting bytes to the file */
-
-/* Emit a byte, taking 'action' if must suspend. */
-#define emit_byte(state,val,action)  \
-	{ *(state)->next_output_byte++ = (JOCTET) (val);  \
-	  if (--(state)->free_in_buffer == 0)  \
-	    if (! dump_buffer(state))  \
-	      { action; } }
-
-
-LOCAL(wxjpeg_boolean)
-dump_buffer (working_state * state)
-/* Empty the output buffer; return TRUE if successful, FALSE if must suspend */
-{
-  struct jpeg_destination_mgr * dest = state->cinfo->dest;
-
-  if (! (*dest->empty_output_buffer) (state->cinfo))
-    return FALSE;
-  /* After a successful buffer dump, must reset buffer pointers */
-  state->next_output_byte = dest->next_output_byte;
-  state->free_in_buffer = dest->free_in_buffer;
-  return TRUE;
-}
-
-
-/* Outputting bits to the file */
-
-/* Only the right 24 bits of put_buffer are used; the valid bits are
- * left-justified in this part.  At most 16 bits can be passed to emit_bits
- * in one call, and we never retain more than 7 bits in put_buffer
- * between calls, so 24 bits are sufficient.
- */
-
-INLINE
-LOCAL(wxjpeg_boolean)
-emit_bits (working_state * state, unsigned int code, int size)
-/* Emit some bits; return TRUE if successful, FALSE if must suspend */
-{
-  /* This routine is heavily used, so it's worth coding tightly. */
-  register JPEG_INT32 put_buffer = (JPEG_INT32) code;
-  register int put_bits = state->cur.put_bits;
-
-  /* if size is 0, caller used an invalid Huffman table entry */
-  if (size == 0)
-    ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);
-
-  put_buffer &= (((JPEG_INT32) 1)<<size) - 1; /* mask off any extra bits in code */
-  
-  put_bits += size;		/* new number of bits in buffer */
-  
-  put_buffer <<= 24 - put_bits; /* align incoming bits */
-
-  put_buffer |= state->cur.put_buffer; /* and merge with old buffer contents */
-  
-  while (put_bits >= 8) {
-    int c = (int) ((put_buffer >> 16) & 0xFF);
-    
-    emit_byte(state, c, return FALSE);
-    if (c == 0xFF) {		/* need to stuff a zero byte? */
-      emit_byte(state, 0, return FALSE);
-    }
-    put_buffer <<= 8;
-    put_bits -= 8;
-  }
-
-  state->cur.put_buffer = put_buffer; /* update state variables */
-  state->cur.put_bits = put_bits;
-
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-flush_bits (working_state * state)
-{
-  if (! emit_bits(state, 0x7F, 7)) /* fill any partial byte with ones */
-    return FALSE;
-  state->cur.put_buffer = 0;	/* and reset bit-buffer to empty */
-  state->cur.put_bits = 0;
-  return TRUE;
-}
-
-
-/* Encode a single block's worth of coefficients */
-
-LOCAL(wxjpeg_boolean)
-encode_one_block (working_state * state, JCOEFPTR block, int last_dc_val,
-		  c_derived_tbl *dctbl, c_derived_tbl *actbl)
-{
-  register int temp, temp2;
-  register int nbits;
-  register int k, r, i;
-  
-  /* Encode the DC coefficient difference per section F.1.2.1 */
-  
-  temp = temp2 = block[0] - last_dc_val;
-
-  if (temp < 0) {
-    temp = -temp;		/* temp is abs value of input */
-    /* For a negative input, want temp2 = bitwise complement of abs(input) */
-    /* This code assumes we are on a two's complement machine */
-    temp2--;
-  }
-  
-  /* Find the number of bits needed for the magnitude of the coefficient */
-  nbits = 0;
-  while (temp) {
-    nbits++;
-    temp >>= 1;
-  }
-  /* Check for out-of-range coefficient values.
-   * Since we're encoding a difference, the range limit is twice as much.
-   */
-  if (nbits > MAX_COEF_BITS+1)
-    ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);
-  
-  /* Emit the Huffman-coded symbol for the number of bits */
-  if (! emit_bits(state, dctbl->ehufco[nbits], dctbl->ehufsi[nbits]))
-    return FALSE;
-
-  /* Emit that number of bits of the value, if positive, */
-  /* or the complement of its magnitude, if negative. */
-  if (nbits)			/* emit_bits rejects calls with size 0 */
-    if (! emit_bits(state, (unsigned int) temp2, nbits))
-      return FALSE;
-
-  /* Encode the AC coefficients per section F.1.2.2 */
-  
-  r = 0;			/* r = run length of zeros */
-  
-  for (k = 1; k < DCTSIZE2; k++) {
-    if ((temp = block[jpeg_natural_order[k]]) == 0) {
-      r++;
-    } else {
-      /* if run length > 15, must emit special run-length-16 codes (0xF0) */
-      while (r > 15) {
-	if (! emit_bits(state, actbl->ehufco[0xF0], actbl->ehufsi[0xF0]))
-	  return FALSE;
-	r -= 16;
-      }
-
-      temp2 = temp;
-      if (temp < 0) {
-	temp = -temp;		/* temp is abs value of input */
-	/* This code assumes we are on a two's complement machine */
-	temp2--;
-      }
-      
-      /* Find the number of bits needed for the magnitude of the coefficient */
-      nbits = 1;		/* there must be at least one 1 bit */
-      while ((temp >>= 1))
-	nbits++;
-      /* Check for out-of-range coefficient values */
-      if (nbits > MAX_COEF_BITS)
-	ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);
-      
-      /* Emit Huffman symbol for run length / number of bits */
-      i = (r << 4) + nbits;
-      if (! emit_bits(state, actbl->ehufco[i], actbl->ehufsi[i]))
-	return FALSE;
-
-      /* Emit that number of bits of the value, if positive, */
-      /* or the complement of its magnitude, if negative. */
-      if (! emit_bits(state, (unsigned int) temp2, nbits))
-	return FALSE;
-      
-      r = 0;
-    }
-  }
-
-  /* If the last coef(s) were zero, emit an end-of-block code */
-  if (r > 0)
-    if (! emit_bits(state, actbl->ehufco[0], actbl->ehufsi[0]))
-      return FALSE;
-
-  return TRUE;
-}
-
-
-/*
- * Emit a restart marker & resynchronize predictions.
- */
-
-LOCAL(wxjpeg_boolean)
-emit_restart (working_state * state, int restart_num)
-{
-  int ci;
-
-  if (! flush_bits(state))
-    return FALSE;
-
-  emit_byte(state, 0xFF, return FALSE);
-  emit_byte(state, JPEG_RST0 + restart_num, return FALSE);
-
-  /* Re-initialize DC predictions to 0 */
-  for (ci = 0; ci < state->cinfo->comps_in_scan; ci++)
-    state->cur.last_dc_val[ci] = 0;
-
-  /* The restart counter is not updated until we successfully write the MCU. */
-
-  return TRUE;
-}
-
-
-/*
- * Encode and output one MCU's worth of Huffman-compressed coefficients.
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_huff (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  working_state state;
-  int blkn, ci;
-  jpeg_component_info * compptr;
-
-  /* Load up working state */
-  state.next_output_byte = cinfo->dest->next_output_byte;
-  state.free_in_buffer = cinfo->dest->free_in_buffer;
-  ASSIGN_STATE(state.cur, entropy->saved);
-  state.cinfo = cinfo;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! emit_restart(&state, entropy->next_restart_num))
-	return FALSE;
-  }
-
-  /* Encode the MCU data blocks */
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    ci = cinfo->MCU_membership[blkn];
-    compptr = cinfo->cur_comp_info[ci];
-    if (! encode_one_block(&state,
-			   MCU_data[blkn][0], state.cur.last_dc_val[ci],
-			   entropy->dc_derived_tbls[compptr->dc_tbl_no],
-			   entropy->ac_derived_tbls[compptr->ac_tbl_no]))
-      return FALSE;
-    /* Update last_dc_val */
-    state.cur.last_dc_val[ci] = MCU_data[blkn][0][0];
-  }
-
-  /* Completed MCU, so update state */
-  cinfo->dest->next_output_byte = state.next_output_byte;
-  cinfo->dest->free_in_buffer = state.free_in_buffer;
-  ASSIGN_STATE(entropy->saved, state.cur);
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * Finish up at the end of a Huffman-compressed scan.
- */
-
-METHODDEF(void)
-finish_pass_huff (j_compress_ptr cinfo)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  working_state state;
-
-  /* Load up working state ... flush_bits needs it */
-  state.next_output_byte = cinfo->dest->next_output_byte;
-  state.free_in_buffer = cinfo->dest->free_in_buffer;
-  ASSIGN_STATE(state.cur, entropy->saved);
-  state.cinfo = cinfo;
-
-  /* Flush out the last data */
-  if (! flush_bits(&state))
-    ERREXIT(cinfo, JERR_CANT_SUSPEND);
-
-  /* Update state */
-  cinfo->dest->next_output_byte = state.next_output_byte;
-  cinfo->dest->free_in_buffer = state.free_in_buffer;
-  ASSIGN_STATE(entropy->saved, state.cur);
-}
-
-
-/*
- * Huffman coding optimization.
- *
- * We first scan the supplied data and count the number of uses of each symbol
- * that is to be Huffman-coded. (This process MUST agree with the code above.)
- * Then we build a Huffman coding tree for the observed counts.
- * Symbols which are not needed at all for the particular image are not
- * assigned any code, which saves space in the DHT marker as well as in
- * the compressed data.
- */
-
-#ifdef ENTROPY_OPT_SUPPORTED
-
-
-/* Process a single block's worth of coefficients */
-
-LOCAL(void)
-htest_one_block (j_compress_ptr cinfo, JCOEFPTR block, int last_dc_val,
-		 long dc_counts[], long ac_counts[])
-{
-  register int temp;
-  register int nbits;
-  register int k, r;
-  
-  /* Encode the DC coefficient difference per section F.1.2.1 */
-  
-  temp = block[0] - last_dc_val;
-  if (temp < 0)
-    temp = -temp;
-  
-  /* Find the number of bits needed for the magnitude of the coefficient */
-  nbits = 0;
-  while (temp) {
-    nbits++;
-    temp >>= 1;
-  }
-  /* Check for out-of-range coefficient values.
-   * Since we're encoding a difference, the range limit is twice as much.
-   */
-  if (nbits > MAX_COEF_BITS+1)
-    ERREXIT(cinfo, JERR_BAD_DCT_COEF);
-
-  /* Count the Huffman symbol for the number of bits */
-  dc_counts[nbits]++;
-  
-  /* Encode the AC coefficients per section F.1.2.2 */
-  
-  r = 0;			/* r = run length of zeros */
-  
-  for (k = 1; k < DCTSIZE2; k++) {
-    if ((temp = block[jpeg_natural_order[k]]) == 0) {
-      r++;
-    } else {
-      /* if run length > 15, must emit special run-length-16 codes (0xF0) */
-      while (r > 15) {
-	ac_counts[0xF0]++;
-	r -= 16;
-      }
-      
-      /* Find the number of bits needed for the magnitude of the coefficient */
-      if (temp < 0)
-	temp = -temp;
-      
-      /* Find the number of bits needed for the magnitude of the coefficient */
-      nbits = 1;		/* there must be at least one 1 bit */
-      while ((temp >>= 1))
-	nbits++;
-      /* Check for out-of-range coefficient values */
-      if (nbits > MAX_COEF_BITS)
-	ERREXIT(cinfo, JERR_BAD_DCT_COEF);
-      
-      /* Count Huffman symbol for run length / number of bits */
-      ac_counts[(r << 4) + nbits]++;
-      
-      r = 0;
-    }
-  }
-
-  /* If the last coef(s) were zero, emit an end-of-block code */
-  if (r > 0)
-    ac_counts[0]++;
-}
-
-
-/*
- * Trial-encode one MCU's worth of Huffman-compressed coefficients.
- * No data is actually output, so no suspension return is possible.
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_gather (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int blkn, ci;
-  jpeg_component_info * compptr;
-
-  /* Take care of restart intervals if needed */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      /* Re-initialize DC predictions to 0 */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++)
-	entropy->saved.last_dc_val[ci] = 0;
-      /* Update restart state */
-      entropy->restarts_to_go = cinfo->restart_interval;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    ci = cinfo->MCU_membership[blkn];
-    compptr = cinfo->cur_comp_info[ci];
-    htest_one_block(cinfo, MCU_data[blkn][0], entropy->saved.last_dc_val[ci],
-		    entropy->dc_count_ptrs[compptr->dc_tbl_no],
-		    entropy->ac_count_ptrs[compptr->ac_tbl_no]);
-    entropy->saved.last_dc_val[ci] = MCU_data[blkn][0][0];
-  }
-
-  return TRUE;
-}
-
-
-/*
- * Generate the best Huffman code table for the given counts, fill htbl.
- * Note this is also used by jcphuff.c.
- *
- * The JPEG standard requires that no symbol be assigned a codeword of all
- * one bits (so that padding bits added at the end of a compressed segment
- * can't look like a valid code).  Because of the canonical ordering of
- * codewords, this just means that there must be an unused slot in the
- * longest codeword length category.  Section K.2 of the JPEG spec suggests
- * reserving such a slot by pretending that symbol 256 is a valid symbol
- * with count 1.  In theory that's not optimal; giving it count zero but
- * including it in the symbol set anyway should give a better Huffman code.
- * But the theoretically better code actually seems to come out worse in
- * practice, because it produces more all-ones bytes (which incur stuffed
- * zero bytes in the final file).  In any case the difference is tiny.
- *
- * The JPEG standard requires Huffman codes to be no more than 16 bits long.
- * If some symbols have a very small but nonzero probability, the Huffman tree
- * must be adjusted to meet the code length restriction.  We currently use
- * the adjustment method suggested in JPEG section K.2.  This method is *not*
- * optimal; it may not choose the best possible limited-length code.  But
- * typically only very-low-frequency symbols will be given less-than-optimal
- * lengths, so the code is almost optimal.  Experimental comparisons against
- * an optimal limited-length-code algorithm indicate that the difference is
- * microscopic --- usually less than a hundredth of a percent of total size.
- * So the extra complexity of an optimal algorithm doesn't seem worthwhile.
- */
-
-GLOBAL(void)
-jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])
-{
-#define MAX_CLEN 32		/* assumed maximum initial code length */
-  UINT8 bits[MAX_CLEN+1];	/* bits[k] = # of symbols with code length k */
-  int codesize[257];		/* codesize[k] = code length of symbol k */
-  int others[257];		/* next symbol in current branch of tree */
-  int c1, c2;
-  int p, i, j;
-  long v;
-
-  /* This algorithm is explained in section K.2 of the JPEG standard */
-
-  MEMZERO(bits, SIZEOF(bits));
-  MEMZERO(codesize, SIZEOF(codesize));
-  for (i = 0; i < 257; i++)
-    others[i] = -1;		/* init links to empty */
-  
-  freq[256] = 1;		/* make sure 256 has a nonzero count */
-  /* Including the pseudo-symbol 256 in the Huffman procedure guarantees
-   * that no real symbol is given code-value of all ones, because 256
-   * will be placed last in the largest codeword category.
-   */
-
-  /* Huffman's basic algorithm to assign optimal code lengths to symbols */
-
-  for (;;) {
-    /* Find the smallest nonzero frequency, set c1 = its symbol */
-    /* In case of ties, take the larger symbol number */
-    c1 = -1;
-    v = 1000000000L;
-    for (i = 0; i <= 256; i++) {
-      if (freq[i] && freq[i] <= v) {
-	v = freq[i];
-	c1 = i;
-      }
-    }
-
-    /* Find the next smallest nonzero frequency, set c2 = its symbol */
-    /* In case of ties, take the larger symbol number */
-    c2 = -1;
-    v = 1000000000L;
-    for (i = 0; i <= 256; i++) {
-      if (freq[i] && freq[i] <= v && i != c1) {
-	v = freq[i];
-	c2 = i;
-      }
-    }
-
-    /* Done if we've merged everything into one frequency */
-    if (c2 < 0)
-      break;
-    
-    /* Else merge the two counts/trees */
-    freq[c1] += freq[c2];
-    freq[c2] = 0;
-
-    /* Increment the codesize of everything in c1's tree branch */
-    codesize[c1]++;
-    while (others[c1] >= 0) {
-      c1 = others[c1];
-      codesize[c1]++;
-    }
-    
-    others[c1] = c2;		/* chain c2 onto c1's tree branch */
-    
-    /* Increment the codesize of everything in c2's tree branch */
-    codesize[c2]++;
-    while (others[c2] >= 0) {
-      c2 = others[c2];
-      codesize[c2]++;
-    }
-  }
-
-  /* Now count the number of symbols of each code length */
-  for (i = 0; i <= 256; i++) {
-    if (codesize[i]) {
-      /* The JPEG standard seems to think that this can't happen, */
-      /* but I'm paranoid... */
-      if (codesize[i] > MAX_CLEN)
-	ERREXIT(cinfo, JERR_HUFF_CLEN_OVERFLOW);
-
-      bits[codesize[i]]++;
-    }
-  }
-
-  /* JPEG doesn't allow symbols with code lengths over 16 bits, so if the pure
-   * Huffman procedure assigned any such lengths, we must adjust the coding.
-   * Here is what the JPEG spec says about how this next bit works:
-   * Since symbols are paired for the longest Huffman code, the symbols are
-   * removed from this length category two at a time.  The prefix for the pair
-   * (which is one bit shorter) is allocated to one of the pair; then,
-   * skipping the BITS entry for that prefix length, a code word from the next
-   * shortest nonzero BITS entry is converted into a prefix for two code words
-   * one bit longer.
-   */
-  
-  for (i = MAX_CLEN; i > 16; i--) {
-    while (bits[i] > 0) {
-      j = i - 2;		/* find length of new prefix to be used */
-      while (bits[j] == 0)
-	j--;
-      
-      bits[i] -= 2;		/* remove two symbols */
-      bits[i-1]++;		/* one goes in this length */
-      bits[j+1] += 2;		/* two new symbols in this length */
-      bits[j]--;		/* symbol of this length is now a prefix */
-    }
-  }
-
-  /* Remove the count for the pseudo-symbol 256 from the largest codelength */
-  while (bits[i] == 0)		/* find largest codelength still in use */
-    i--;
-  bits[i]--;
-  
-  /* Return final symbol counts (only for lengths 0..16) */
-  MEMCOPY(htbl->bits, bits, SIZEOF(htbl->bits));
-  
-  /* Return a list of the symbols sorted by code length */
-  /* It's not real clear to me why we don't need to consider the codelength
-   * changes made above, but the JPEG spec seems to think this works.
-   */
-  p = 0;
-  for (i = 1; i <= MAX_CLEN; i++) {
-    for (j = 0; j <= 255; j++) {
-      if (codesize[j] == i) {
-	htbl->huffval[p] = (UINT8) j;
-	p++;
-      }
-    }
-  }
-
-  /* Set sent_table FALSE so updated table will be written to JPEG file. */
-  htbl->sent_table = FALSE;
-}
-
-
-/*
- * Finish up a statistics-gathering pass and create the new Huffman tables.
- */
-
-METHODDEF(void)
-finish_pass_gather (j_compress_ptr cinfo)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int ci, dctbl, actbl;
-  jpeg_component_info * compptr;
-  JHUFF_TBL **htblptr;
-  wxjpeg_boolean did_dc[NUM_HUFF_TBLS];
-  wxjpeg_boolean did_ac[NUM_HUFF_TBLS];
-
-  /* It's important not to apply jpeg_gen_optimal_table more than once
-   * per table, because it clobbers the input frequency counts!
-   */
-  MEMZERO(did_dc, SIZEOF(did_dc));
-  MEMZERO(did_ac, SIZEOF(did_ac));
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    dctbl = compptr->dc_tbl_no;
-    actbl = compptr->ac_tbl_no;
-    if (! did_dc[dctbl]) {
-      htblptr = & cinfo->dc_huff_tbl_ptrs[dctbl];
-      if (*htblptr == NULL)
-	*htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->dc_count_ptrs[dctbl]);
-      did_dc[dctbl] = TRUE;
-    }
-    if (! did_ac[actbl]) {
-      htblptr = & cinfo->ac_huff_tbl_ptrs[actbl];
-      if (*htblptr == NULL)
-	*htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->ac_count_ptrs[actbl]);
-      did_ac[actbl] = TRUE;
-    }
-  }
-}
-
-
-#endif /* ENTROPY_OPT_SUPPORTED */
-
-
-/*
- * Module initialization routine for Huffman entropy encoding.
- */
-
-GLOBAL(void)
-jinit_huff_encoder (j_compress_ptr cinfo)
-{
-  huff_entropy_ptr entropy;
-  int i;
-
-  entropy = (huff_entropy_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(huff_entropy_encoder));
-  cinfo->entropy = (struct jpeg_entropy_encoder *) entropy;
-  entropy->pub.start_pass = start_pass_huff;
-
-  /* Mark tables unallocated */
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
-#ifdef ENTROPY_OPT_SUPPORTED
-    entropy->dc_count_ptrs[i] = entropy->ac_count_ptrs[i] = NULL;
-#endif
-  }
-}
+/*
+ * jchuff.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy encoding routines.
+ *
+ * Much of the complexity here has to do with supporting output suspension.
+ * If the data destination module demands suspension, we want to be able to
+ * back up to the start of the current MCU.  To do this, we copy state
+ * variables into local working storage, and update them back to the
+ * permanent JPEG objects only upon successful completion of an MCU.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jchuff.h"		/* Declarations shared with jcphuff.c */
+
+
+/* Expanded entropy encoder object for Huffman encoding.
+ *
+ * The savable_state subrecord contains fields that change within an MCU,
+ * but must not be updated permanently until we complete the MCU.
+ */
+
+typedef struct {
+  JPEG_INT32 put_buffer;		/* current bit-accumulation buffer */
+  int put_bits;			/* # of bits now in it */
+  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
+} savable_state;
+
+/* This macro is to work around compilers with missing or broken
+ * structure assignment.  You'll need to fix this code if you have
+ * such a compiler and you change MAX_COMPS_IN_SCAN.
+ */
+
+#ifndef NO_STRUCT_ASSIGN
+#define ASSIGN_STATE(dest,src)  ((dest) = (src))
+#else
+#if MAX_COMPS_IN_SCAN == 4
+#define ASSIGN_STATE(dest,src)  \
+	((dest).put_buffer = (src).put_buffer, \
+	 (dest).put_bits = (src).put_bits, \
+	 (dest).last_dc_val[0] = (src).last_dc_val[0], \
+	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
+	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
+	 (dest).last_dc_val[3] = (src).last_dc_val[3])
+#endif
+#endif
+
+
+typedef struct {
+  struct jpeg_entropy_encoder pub; /* public fields */
+
+  savable_state saved;		/* Bit buffer & DC state at start of MCU */
+
+  /* These fields are NOT loaded into local working state. */
+  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
+  int next_restart_num;		/* next restart number to write (0-7) */
+
+  /* Pointers to derived tables (these workspaces have image lifespan) */
+  c_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];
+  c_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];
+
+#ifdef ENTROPY_OPT_SUPPORTED	/* Statistics tables for optimization */
+  long * dc_count_ptrs[NUM_HUFF_TBLS];
+  long * ac_count_ptrs[NUM_HUFF_TBLS];
+#endif
+} huff_entropy_encoder;
+
+typedef huff_entropy_encoder * huff_entropy_ptr;
+
+/* Working state while writing an MCU.
+ * This struct contains all the fields that are needed by subroutines.
+ */
+
+typedef struct {
+  JOCTET * next_output_byte;	/* => next byte to write in buffer */
+  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
+  savable_state cur;		/* Current bit buffer & DC state */
+  j_compress_ptr cinfo;		/* dump_buffer needs access to this */
+} working_state;
+
+
+/* Forward declarations */
+METHODDEF(wxjpeg_boolean) encode_mcu_huff JPP((j_compress_ptr cinfo,
+					JBLOCKROW *MCU_data));
+METHODDEF(void) finish_pass_huff JPP((j_compress_ptr cinfo));
+#ifdef ENTROPY_OPT_SUPPORTED
+METHODDEF(wxjpeg_boolean) encode_mcu_gather JPP((j_compress_ptr cinfo,
+					  JBLOCKROW *MCU_data));
+METHODDEF(void) finish_pass_gather JPP((j_compress_ptr cinfo));
+#endif
+
+
+/*
+ * Initialize for a Huffman-compressed scan.
+ * If gather_statistics is TRUE, we do not output anything during the scan,
+ * just count the Huffman symbols used and generate Huffman code tables.
+ */
+
+METHODDEF(void)
+start_pass_huff (j_compress_ptr cinfo, wxjpeg_boolean gather_statistics)
+{
+  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
+  int ci, dctbl, actbl;
+  jpeg_component_info * compptr;
+
+  if (gather_statistics) {
+#ifdef ENTROPY_OPT_SUPPORTED
+    entropy->pub.encode_mcu = encode_mcu_gather;
+    entropy->pub.finish_pass = finish_pass_gather;
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    entropy->pub.encode_mcu = encode_mcu_huff;
+    entropy->pub.finish_pass = finish_pass_huff;
+  }
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    dctbl = compptr->dc_tbl_no;
+    actbl = compptr->ac_tbl_no;
+    if (gather_statistics) {
+#ifdef ENTROPY_OPT_SUPPORTED
+      /* Check for invalid table indexes */
+      /* (make_c_derived_tbl does this in the other path) */
+      if (dctbl < 0 || dctbl >= NUM_HUFF_TBLS)
+	ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, dctbl);
+      if (actbl < 0 || actbl >= NUM_HUFF_TBLS)
+	ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, actbl);
+      /* Allocate and zero the statistics tables */
+      /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */
+      if (entropy->dc_count_ptrs[dctbl] == NULL)
+	entropy->dc_count_ptrs[dctbl] = (long *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      257 * SIZEOF(long));
+      MEMZERO(entropy->dc_count_ptrs[dctbl], 257 * SIZEOF(long));
+      if (entropy->ac_count_ptrs[actbl] == NULL)
+	entropy->ac_count_ptrs[actbl] = (long *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      257 * SIZEOF(long));
+      MEMZERO(entropy->ac_count_ptrs[actbl], 257 * SIZEOF(long));
+#endif
+    } else {
+      /* Compute derived values for Huffman tables */
+      /* We may do this more than once for a table, but it's not expensive */
+      jpeg_make_c_derived_tbl(cinfo, TRUE, dctbl,
+			      & entropy->dc_derived_tbls[dctbl]);
+      jpeg_make_c_derived_tbl(cinfo, FALSE, actbl,
+			      & entropy->ac_derived_tbls[actbl]);
+    }
+    /* Initialize DC predictions to 0 */
+    entropy->saved.last_dc_val[ci] = 0;
+  }
+
+  /* Initialize bit buffer to empty */
+  entropy->saved.put_buffer = 0;
+  entropy->saved.put_bits = 0;
+
+  /* Initialize restart stuff */
+  entropy->restarts_to_go = cinfo->restart_interval;
+  entropy->next_restart_num = 0;
+}
+
+
+/*
+ * Compute the derived values for a Huffman table.
+ * This routine also performs some validation checks on the table.
+ *
+ * Note this is also used by jcphuff.c.
+ */
+
+GLOBAL(void)
+jpeg_make_c_derived_tbl (j_compress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
+			 c_derived_tbl ** pdtbl)
+{
+  JHUFF_TBL *htbl;
+  c_derived_tbl *dtbl;
+  int p, i, l, lastp, si, maxsymbol;
+  char huffsize[257];
+  unsigned int huffcode[257];
+  unsigned int code;
+
+  /* Note that huffsize[] and huffcode[] are filled in code-length order,
+   * paralleling the order of the symbols themselves in htbl->huffval[].
+   */
+
+  /* Find the input Huffman table */
+  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
+  htbl =
+    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];
+  if (htbl == NULL)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
+
+  /* Allocate a workspace if we haven't already done so. */
+  if (*pdtbl == NULL)
+    *pdtbl = (c_derived_tbl *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(c_derived_tbl));
+  dtbl = *pdtbl;
+  
+  /* Figure C.1: make table of Huffman code length for each symbol */
+
+  p = 0;
+  for (l = 1; l <= 16; l++) {
+    i = (int) htbl->bits[l];
+    if (i < 0 || p + i > 256)	/* protect against table overrun */
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    while (i--)
+      huffsize[p++] = (char) l;
+  }
+  huffsize[p] = 0;
+  lastp = p;
+  
+  /* Figure C.2: generate the codes themselves */
+  /* We also validate that the counts represent a legal Huffman code tree. */
+
+  code = 0;
+  si = huffsize[0];
+  p = 0;
+  while (huffsize[p]) {
+    while (((int) huffsize[p]) == si) {
+      huffcode[p++] = code;
+      code++;
+    }
+    /* code is now 1 more than the last code used for codelength si; but
+     * it must still fit in si bits, since no code is allowed to be all ones.
+     */
+    if (((JPEG_INT32) code) >= (((JPEG_INT32) 1) << si))
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    code <<= 1;
+    si++;
+  }
+  
+  /* Figure C.3: generate encoding tables */
+  /* These are code and size indexed by symbol value */
+
+  /* Set all codeless symbols to have code length 0;
+   * this lets us detect duplicate VAL entries here, and later
+   * allows emit_bits to detect any attempt to emit such symbols.
+   */
+  MEMZERO(dtbl->ehufsi, SIZEOF(dtbl->ehufsi));
+
+  /* This is also a convenient place to check for out-of-range
+   * and duplicated VAL entries.  We allow 0..255 for AC symbols
+   * but only 0..15 for DC.  (We could constrain them further
+   * based on data depth and mode, but this seems enough.)
+   */
+  maxsymbol = isDC ? 15 : 255;
+
+  for (p = 0; p < lastp; p++) {
+    i = htbl->huffval[p];
+    if (i < 0 || i > maxsymbol || dtbl->ehufsi[i])
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    dtbl->ehufco[i] = huffcode[p];
+    dtbl->ehufsi[i] = huffsize[p];
+  }
+}
+
+
+/* Outputting bytes to the file */
+
+/* Emit a byte, taking 'action' if must suspend. */
+#define emit_byte(state,val,action)  \
+	{ *(state)->next_output_byte++ = (JOCTET) (val);  \
+	  if (--(state)->free_in_buffer == 0)  \
+	    if (! dump_buffer(state))  \
+	      { action; } }
+
+
+LOCAL(wxjpeg_boolean)
+dump_buffer (working_state * state)
+/* Empty the output buffer; return TRUE if successful, FALSE if must suspend */
+{
+  struct jpeg_destination_mgr * dest = state->cinfo->dest;
+
+  if (! (*dest->empty_output_buffer) (state->cinfo))
+    return FALSE;
+  /* After a successful buffer dump, must reset buffer pointers */
+  state->next_output_byte = dest->next_output_byte;
+  state->free_in_buffer = dest->free_in_buffer;
+  return TRUE;
+}
+
+
+/* Outputting bits to the file */
+
+/* Only the right 24 bits of put_buffer are used; the valid bits are
+ * left-justified in this part.  At most 16 bits can be passed to emit_bits
+ * in one call, and we never retain more than 7 bits in put_buffer
+ * between calls, so 24 bits are sufficient.
+ */
+
+INLINE
+LOCAL(wxjpeg_boolean)
+emit_bits (working_state * state, unsigned int code, int size)
+/* Emit some bits; return TRUE if successful, FALSE if must suspend */
+{
+  /* This routine is heavily used, so it's worth coding tightly. */
+  register JPEG_INT32 put_buffer = (JPEG_INT32) code;
+  register int put_bits = state->cur.put_bits;
+
+  /* if size is 0, caller used an invalid Huffman table entry */
+  if (size == 0)
+    ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);
+
+  put_buffer &= (((JPEG_INT32) 1)<<size) - 1; /* mask off any extra bits in code */
+  
+  put_bits += size;		/* new number of bits in buffer */
+  
+  put_buffer <<= 24 - put_bits; /* align incoming bits */
+
+  put_buffer |= state->cur.put_buffer; /* and merge with old buffer contents */
+  
+  while (put_bits >= 8) {
+    int c = (int) ((put_buffer >> 16) & 0xFF);
+    
+    emit_byte(state, c, return FALSE);
+    if (c == 0xFF) {		/* need to stuff a zero byte? */
+      emit_byte(state, 0, return FALSE);
+    }
+    put_buffer <<= 8;
+    put_bits -= 8;
+  }
+
+  state->cur.put_buffer = put_buffer; /* update state variables */
+  state->cur.put_bits = put_bits;
+
+  return TRUE;
+}
+
+
+LOCAL(wxjpeg_boolean)
+flush_bits (working_state * state)
+{
+  if (! emit_bits(state, 0x7F, 7)) /* fill any partial byte with ones */
+    return FALSE;
+  state->cur.put_buffer = 0;	/* and reset bit-buffer to empty */
+  state->cur.put_bits = 0;
+  return TRUE;
+}
+
+
+/* Encode a single block's worth of coefficients */
+
+LOCAL(wxjpeg_boolean)
+encode_one_block (working_state * state, JCOEFPTR block, int last_dc_val,
+		  c_derived_tbl *dctbl, c_derived_tbl *actbl)
+{
+  register int temp, temp2;
+  register int nbits;
+  register int k, r, i;
+  
+  /* Encode the DC coefficient difference per section F.1.2.1 */
+  
+  temp = temp2 = block[0] - last_dc_val;
+
+  if (temp < 0) {
+    temp = -temp;		/* temp is abs value of input */
+    /* For a negative input, want temp2 = bitwise complement of abs(input) */
+    /* This code assumes we are on a two's complement machine */
+    temp2--;
+  }
+  
+  /* Find the number of bits needed for the magnitude of the coefficient */
+  nbits = 0;
+  while (temp) {
+    nbits++;
+    temp >>= 1;
+  }
+  /* Check for out-of-range coefficient values.
+   * Since we're encoding a difference, the range limit is twice as much.
+   */
+  if (nbits > MAX_COEF_BITS+1)
+    ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);
+  
+  /* Emit the Huffman-coded symbol for the number of bits */
+  if (! emit_bits(state, dctbl->ehufco[nbits], dctbl->ehufsi[nbits]))
+    return FALSE;
+
+  /* Emit that number of bits of the value, if positive, */
+  /* or the complement of its magnitude, if negative. */
+  if (nbits)			/* emit_bits rejects calls with size 0 */
+    if (! emit_bits(state, (unsigned int) temp2, nbits))
+      return FALSE;
+
+  /* Encode the AC coefficients per section F.1.2.2 */
+  
+  r = 0;			/* r = run length of zeros */
+  
+  for (k = 1; k < DCTSIZE2; k++) {
+    if ((temp = block[jpeg_natural_order[k]]) == 0) {
+      r++;
+    } else {
+      /* if run length > 15, must emit special run-length-16 codes (0xF0) */
+      while (r > 15) {
+	if (! emit_bits(state, actbl->ehufco[0xF0], actbl->ehufsi[0xF0]))
+	  return FALSE;
+	r -= 16;
+      }
+
+      temp2 = temp;
+      if (temp < 0) {
+	temp = -temp;		/* temp is abs value of input */
+	/* This code assumes we are on a two's complement machine */
+	temp2--;
+      }
+      
+      /* Find the number of bits needed for the magnitude of the coefficient */
+      nbits = 1;		/* there must be at least one 1 bit */
+      while ((temp >>= 1))
+	nbits++;
+      /* Check for out-of-range coefficient values */
+      if (nbits > MAX_COEF_BITS)
+	ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);
+      
+      /* Emit Huffman symbol for run length / number of bits */
+      i = (r << 4) + nbits;
+      if (! emit_bits(state, actbl->ehufco[i], actbl->ehufsi[i]))
+	return FALSE;
+
+      /* Emit that number of bits of the value, if positive, */
+      /* or the complement of its magnitude, if negative. */
+      if (! emit_bits(state, (unsigned int) temp2, nbits))
+	return FALSE;
+      
+      r = 0;
+    }
+  }
+
+  /* If the last coef(s) were zero, emit an end-of-block code */
+  if (r > 0)
+    if (! emit_bits(state, actbl->ehufco[0], actbl->ehufsi[0]))
+      return FALSE;
+
+  return TRUE;
+}
+
+
+/*
+ * Emit a restart marker & resynchronize predictions.
+ */
+
+LOCAL(wxjpeg_boolean)
+emit_restart (working_state * state, int restart_num)
+{
+  int ci;
+
+  if (! flush_bits(state))
+    return FALSE;
+
+  emit_byte(state, 0xFF, return FALSE);
+  emit_byte(state, JPEG_RST0 + restart_num, return FALSE);
+
+  /* Re-initialize DC predictions to 0 */
+  for (ci = 0; ci < state->cinfo->comps_in_scan; ci++)
+    state->cur.last_dc_val[ci] = 0;
+
+  /* The restart counter is not updated until we successfully write the MCU. */
+
+  return TRUE;
+}
+
+
+/*
+ * Encode and output one MCU's worth of Huffman-compressed coefficients.
+ */
+
+METHODDEF(wxjpeg_boolean)
+encode_mcu_huff (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
+  working_state state;
+  int blkn, ci;
+  jpeg_component_info * compptr;
+
+  /* Load up working state */
+  state.next_output_byte = cinfo->dest->next_output_byte;
+  state.free_in_buffer = cinfo->dest->free_in_buffer;
+  ASSIGN_STATE(state.cur, entropy->saved);
+  state.cinfo = cinfo;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! emit_restart(&state, entropy->next_restart_num))
+	return FALSE;
+  }
+
+  /* Encode the MCU data blocks */
+  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
+    ci = cinfo->MCU_membership[blkn];
+    compptr = cinfo->cur_comp_info[ci];
+    if (! encode_one_block(&state,
+			   MCU_data[blkn][0], state.cur.last_dc_val[ci],
+			   entropy->dc_derived_tbls[compptr->dc_tbl_no],
+			   entropy->ac_derived_tbls[compptr->ac_tbl_no]))
+      return FALSE;
+    /* Update last_dc_val */
+    state.cur.last_dc_val[ci] = MCU_data[blkn][0][0];
+  }
+
+  /* Completed MCU, so update state */
+  cinfo->dest->next_output_byte = state.next_output_byte;
+  cinfo->dest->free_in_buffer = state.free_in_buffer;
+  ASSIGN_STATE(entropy->saved, state.cur);
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * Finish up at the end of a Huffman-compressed scan.
+ */
+
+METHODDEF(void)
+finish_pass_huff (j_compress_ptr cinfo)
+{
+  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
+  working_state state;
+
+  /* Load up working state ... flush_bits needs it */
+  state.next_output_byte = cinfo->dest->next_output_byte;
+  state.free_in_buffer = cinfo->dest->free_in_buffer;
+  ASSIGN_STATE(state.cur, entropy->saved);
+  state.cinfo = cinfo;
+
+  /* Flush out the last data */
+  if (! flush_bits(&state))
+    ERREXIT(cinfo, JERR_CANT_SUSPEND);
+
+  /* Update state */
+  cinfo->dest->next_output_byte = state.next_output_byte;
+  cinfo->dest->free_in_buffer = state.free_in_buffer;
+  ASSIGN_STATE(entropy->saved, state.cur);
+}
+
+
+/*
+ * Huffman coding optimization.
+ *
+ * We first scan the supplied data and count the number of uses of each symbol
+ * that is to be Huffman-coded. (This process MUST agree with the code above.)
+ * Then we build a Huffman coding tree for the observed counts.
+ * Symbols which are not needed at all for the particular image are not
+ * assigned any code, which saves space in the DHT marker as well as in
+ * the compressed data.
+ */
+
+#ifdef ENTROPY_OPT_SUPPORTED
+
+
+/* Process a single block's worth of coefficients */
+
+LOCAL(void)
+htest_one_block (j_compress_ptr cinfo, JCOEFPTR block, int last_dc_val,
+		 long dc_counts[], long ac_counts[])
+{
+  register int temp;
+  register int nbits;
+  register int k, r;
+  
+  /* Encode the DC coefficient difference per section F.1.2.1 */
+  
+  temp = block[0] - last_dc_val;
+  if (temp < 0)
+    temp = -temp;
+  
+  /* Find the number of bits needed for the magnitude of the coefficient */
+  nbits = 0;
+  while (temp) {
+    nbits++;
+    temp >>= 1;
+  }
+  /* Check for out-of-range coefficient values.
+   * Since we're encoding a difference, the range limit is twice as much.
+   */
+  if (nbits > MAX_COEF_BITS+1)
+    ERREXIT(cinfo, JERR_BAD_DCT_COEF);
+
+  /* Count the Huffman symbol for the number of bits */
+  dc_counts[nbits]++;
+  
+  /* Encode the AC coefficients per section F.1.2.2 */
+  
+  r = 0;			/* r = run length of zeros */
+  
+  for (k = 1; k < DCTSIZE2; k++) {
+    if ((temp = block[jpeg_natural_order[k]]) == 0) {
+      r++;
+    } else {
+      /* if run length > 15, must emit special run-length-16 codes (0xF0) */
+      while (r > 15) {
+	ac_counts[0xF0]++;
+	r -= 16;
+      }
+      
+      /* Find the number of bits needed for the magnitude of the coefficient */
+      if (temp < 0)
+	temp = -temp;
+      
+      /* Find the number of bits needed for the magnitude of the coefficient */
+      nbits = 1;		/* there must be at least one 1 bit */
+      while ((temp >>= 1))
+	nbits++;
+      /* Check for out-of-range coefficient values */
+      if (nbits > MAX_COEF_BITS)
+	ERREXIT(cinfo, JERR_BAD_DCT_COEF);
+      
+      /* Count Huffman symbol for run length / number of bits */
+      ac_counts[(r << 4) + nbits]++;
+      
+      r = 0;
+    }
+  }
+
+  /* If the last coef(s) were zero, emit an end-of-block code */
+  if (r > 0)
+    ac_counts[0]++;
+}
+
+
+/*
+ * Trial-encode one MCU's worth of Huffman-compressed coefficients.
+ * No data is actually output, so no suspension return is possible.
+ */
+
+METHODDEF(wxjpeg_boolean)
+encode_mcu_gather (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
+  int blkn, ci;
+  jpeg_component_info * compptr;
+
+  /* Take care of restart intervals if needed */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      /* Re-initialize DC predictions to 0 */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++)
+	entropy->saved.last_dc_val[ci] = 0;
+      /* Update restart state */
+      entropy->restarts_to_go = cinfo->restart_interval;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
+    ci = cinfo->MCU_membership[blkn];
+    compptr = cinfo->cur_comp_info[ci];
+    htest_one_block(cinfo, MCU_data[blkn][0], entropy->saved.last_dc_val[ci],
+		    entropy->dc_count_ptrs[compptr->dc_tbl_no],
+		    entropy->ac_count_ptrs[compptr->ac_tbl_no]);
+    entropy->saved.last_dc_val[ci] = MCU_data[blkn][0][0];
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * Generate the best Huffman code table for the given counts, fill htbl.
+ * Note this is also used by jcphuff.c.
+ *
+ * The JPEG standard requires that no symbol be assigned a codeword of all
+ * one bits (so that padding bits added at the end of a compressed segment
+ * can't look like a valid code).  Because of the canonical ordering of
+ * codewords, this just means that there must be an unused slot in the
+ * longest codeword length category.  Section K.2 of the JPEG spec suggests
+ * reserving such a slot by pretending that symbol 256 is a valid symbol
+ * with count 1.  In theory that's not optimal; giving it count zero but
+ * including it in the symbol set anyway should give a better Huffman code.
+ * But the theoretically better code actually seems to come out worse in
+ * practice, because it produces more all-ones bytes (which incur stuffed
+ * zero bytes in the final file).  In any case the difference is tiny.
+ *
+ * The JPEG standard requires Huffman codes to be no more than 16 bits long.
+ * If some symbols have a very small but nonzero probability, the Huffman tree
+ * must be adjusted to meet the code length restriction.  We currently use
+ * the adjustment method suggested in JPEG section K.2.  This method is *not*
+ * optimal; it may not choose the best possible limited-length code.  But
+ * typically only very-low-frequency symbols will be given less-than-optimal
+ * lengths, so the code is almost optimal.  Experimental comparisons against
+ * an optimal limited-length-code algorithm indicate that the difference is
+ * microscopic --- usually less than a hundredth of a percent of total size.
+ * So the extra complexity of an optimal algorithm doesn't seem worthwhile.
+ */
+
+GLOBAL(void)
+jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])
+{
+#define MAX_CLEN 32		/* assumed maximum initial code length */
+  UINT8 bits[MAX_CLEN+1];	/* bits[k] = # of symbols with code length k */
+  int codesize[257];		/* codesize[k] = code length of symbol k */
+  int others[257];		/* next symbol in current branch of tree */
+  int c1, c2;
+  int p, i, j;
+  long v;
+
+  /* This algorithm is explained in section K.2 of the JPEG standard */
+
+  MEMZERO(bits, SIZEOF(bits));
+  MEMZERO(codesize, SIZEOF(codesize));
+  for (i = 0; i < 257; i++)
+    others[i] = -1;		/* init links to empty */
+  
+  freq[256] = 1;		/* make sure 256 has a nonzero count */
+  /* Including the pseudo-symbol 256 in the Huffman procedure guarantees
+   * that no real symbol is given code-value of all ones, because 256
+   * will be placed last in the largest codeword category.
+   */
+
+  /* Huffman's basic algorithm to assign optimal code lengths to symbols */
+
+  for (;;) {
+    /* Find the smallest nonzero frequency, set c1 = its symbol */
+    /* In case of ties, take the larger symbol number */
+    c1 = -1;
+    v = 1000000000L;
+    for (i = 0; i <= 256; i++) {
+      if (freq[i] && freq[i] <= v) {
+	v = freq[i];
+	c1 = i;
+      }
+    }
+
+    /* Find the next smallest nonzero frequency, set c2 = its symbol */
+    /* In case of ties, take the larger symbol number */
+    c2 = -1;
+    v = 1000000000L;
+    for (i = 0; i <= 256; i++) {
+      if (freq[i] && freq[i] <= v && i != c1) {
+	v = freq[i];
+	c2 = i;
+      }
+    }
+
+    /* Done if we've merged everything into one frequency */
+    if (c2 < 0)
+      break;
+    
+    /* Else merge the two counts/trees */
+    freq[c1] += freq[c2];
+    freq[c2] = 0;
+
+    /* Increment the codesize of everything in c1's tree branch */
+    codesize[c1]++;
+    while (others[c1] >= 0) {
+      c1 = others[c1];
+      codesize[c1]++;
+    }
+    
+    others[c1] = c2;		/* chain c2 onto c1's tree branch */
+    
+    /* Increment the codesize of everything in c2's tree branch */
+    codesize[c2]++;
+    while (others[c2] >= 0) {
+      c2 = others[c2];
+      codesize[c2]++;
+    }
+  }
+
+  /* Now count the number of symbols of each code length */
+  for (i = 0; i <= 256; i++) {
+    if (codesize[i]) {
+      /* The JPEG standard seems to think that this can't happen, */
+      /* but I'm paranoid... */
+      if (codesize[i] > MAX_CLEN)
+	ERREXIT(cinfo, JERR_HUFF_CLEN_OVERFLOW);
+
+      bits[codesize[i]]++;
+    }
+  }
+
+  /* JPEG doesn't allow symbols with code lengths over 16 bits, so if the pure
+   * Huffman procedure assigned any such lengths, we must adjust the coding.
+   * Here is what the JPEG spec says about how this next bit works:
+   * Since symbols are paired for the longest Huffman code, the symbols are
+   * removed from this length category two at a time.  The prefix for the pair
+   * (which is one bit shorter) is allocated to one of the pair; then,
+   * skipping the BITS entry for that prefix length, a code word from the next
+   * shortest nonzero BITS entry is converted into a prefix for two code words
+   * one bit longer.
+   */
+  
+  for (i = MAX_CLEN; i > 16; i--) {
+    while (bits[i] > 0) {
+      j = i - 2;		/* find length of new prefix to be used */
+      while (bits[j] == 0)
+	j--;
+      
+      bits[i] -= 2;		/* remove two symbols */
+      bits[i-1]++;		/* one goes in this length */
+      bits[j+1] += 2;		/* two new symbols in this length */
+      bits[j]--;		/* symbol of this length is now a prefix */
+    }
+  }
+
+  /* Remove the count for the pseudo-symbol 256 from the largest codelength */
+  while (bits[i] == 0)		/* find largest codelength still in use */
+    i--;
+  bits[i]--;
+  
+  /* Return final symbol counts (only for lengths 0..16) */
+  MEMCOPY(htbl->bits, bits, SIZEOF(htbl->bits));
+  
+  /* Return a list of the symbols sorted by code length */
+  /* It's not real clear to me why we don't need to consider the codelength
+   * changes made above, but the JPEG spec seems to think this works.
+   */
+  p = 0;
+  for (i = 1; i <= MAX_CLEN; i++) {
+    for (j = 0; j <= 255; j++) {
+      if (codesize[j] == i) {
+	htbl->huffval[p] = (UINT8) j;
+	p++;
+      }
+    }
+  }
+
+  /* Set sent_table FALSE so updated table will be written to JPEG file. */
+  htbl->sent_table = FALSE;
+}
+
+
+/*
+ * Finish up a statistics-gathering pass and create the new Huffman tables.
+ */
+
+METHODDEF(void)
+finish_pass_gather (j_compress_ptr cinfo)
+{
+  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
+  int ci, dctbl, actbl;
+  jpeg_component_info * compptr;
+  JHUFF_TBL **htblptr;
+  wxjpeg_boolean did_dc[NUM_HUFF_TBLS];
+  wxjpeg_boolean did_ac[NUM_HUFF_TBLS];
+
+  /* It's important not to apply jpeg_gen_optimal_table more than once
+   * per table, because it clobbers the input frequency counts!
+   */
+  MEMZERO(did_dc, SIZEOF(did_dc));
+  MEMZERO(did_ac, SIZEOF(did_ac));
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    dctbl = compptr->dc_tbl_no;
+    actbl = compptr->ac_tbl_no;
+    if (! did_dc[dctbl]) {
+      htblptr = & cinfo->dc_huff_tbl_ptrs[dctbl];
+      if (*htblptr == NULL)
+	*htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->dc_count_ptrs[dctbl]);
+      did_dc[dctbl] = TRUE;
+    }
+    if (! did_ac[actbl]) {
+      htblptr = & cinfo->ac_huff_tbl_ptrs[actbl];
+      if (*htblptr == NULL)
+	*htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->ac_count_ptrs[actbl]);
+      did_ac[actbl] = TRUE;
+    }
+  }
+}
+
+
+#endif /* ENTROPY_OPT_SUPPORTED */
+
+
+/*
+ * Module initialization routine for Huffman entropy encoding.
+ */
+
+GLOBAL(void)
+jinit_huff_encoder (j_compress_ptr cinfo)
+{
+  huff_entropy_ptr entropy;
+  int i;
+
+  entropy = (huff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(huff_entropy_encoder));
+  cinfo->entropy = (struct jpeg_entropy_encoder *) entropy;
+  entropy->pub.start_pass = start_pass_huff;
+
+  /* Mark tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
+#ifdef ENTROPY_OPT_SUPPORTED
+    entropy->dc_count_ptrs[i] = entropy->ac_count_ptrs[i] = NULL;
+#endif
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jchuff.h b/Source/3rd Party/wx/src/jpeg/jchuff.h
index 952ba2472..881962ad5 100644
--- a/Source/3rd Party/wx/src/jpeg/jchuff.h	
+++ b/Source/3rd Party/wx/src/jpeg/jchuff.h	
@@ -1,47 +1,47 @@
-/*
- * jchuff.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains declarations for Huffman entropy encoding routines
- * that are shared between the sequential encoder (jchuff.c) and the
- * progressive encoder (jcphuff.c).  No other modules need to see these.
- */
-
-/* The legal range of a DCT coefficient is
- *  -1024 .. +1023  for 8-bit data;
- * -16384 .. +16383 for 12-bit data.
- * Hence the magnitude should always fit in 10 or 14 bits respectively.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define MAX_COEF_BITS 10
-#else
-#define MAX_COEF_BITS 14
-#endif
-
-/* Derived data constructed for each Huffman table */
-
-typedef struct {
-  unsigned int ehufco[256];	/* code for each symbol */
-  char ehufsi[256];		/* length of code for each symbol */
-  /* If no code has been allocated for a symbol S, ehufsi[S] contains 0 */
-} c_derived_tbl;
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_make_c_derived_tbl	jMkCDerived
-#define jpeg_gen_optimal_table	jGenOptTbl
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-/* Expand a Huffman table definition into the derived format */
-EXTERN(void) jpeg_make_c_derived_tbl
-	JPP((j_compress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
-	     c_derived_tbl ** pdtbl));
-
-/* Generate an optimal table definition given the specified counts */
-EXTERN(void) jpeg_gen_optimal_table
-	JPP((j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]));
+/*
+ * jchuff.h
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains declarations for Huffman entropy encoding routines
+ * that are shared between the sequential encoder (jchuff.c) and the
+ * progressive encoder (jcphuff.c).  No other modules need to see these.
+ */
+
+/* The legal range of a DCT coefficient is
+ *  -1024 .. +1023  for 8-bit data;
+ * -16384 .. +16383 for 12-bit data.
+ * Hence the magnitude should always fit in 10 or 14 bits respectively.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define MAX_COEF_BITS 10
+#else
+#define MAX_COEF_BITS 14
+#endif
+
+/* Derived data constructed for each Huffman table */
+
+typedef struct {
+  unsigned int ehufco[256];	/* code for each symbol */
+  char ehufsi[256];		/* length of code for each symbol */
+  /* If no code has been allocated for a symbol S, ehufsi[S] contains 0 */
+} c_derived_tbl;
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_make_c_derived_tbl	jMkCDerived
+#define jpeg_gen_optimal_table	jGenOptTbl
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+/* Expand a Huffman table definition into the derived format */
+EXTERN(void) jpeg_make_c_derived_tbl
+	JPP((j_compress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
+	     c_derived_tbl ** pdtbl));
+
+/* Generate an optimal table definition given the specified counts */
+EXTERN(void) jpeg_gen_optimal_table
+	JPP((j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]));
diff --git a/Source/3rd Party/wx/src/jpeg/jcinit.c b/Source/3rd Party/wx/src/jpeg/jcinit.c
index 24f01aa76..b9e68a9ad 100644
--- a/Source/3rd Party/wx/src/jpeg/jcinit.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcinit.c	
@@ -1,72 +1,72 @@
-/*
- * jcinit.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains initialization logic for the JPEG compressor.
- * This routine is in charge of selecting the modules to be executed and
- * making an initialization call to each one.
- *
- * Logically, this code belongs in jcmaster.c.  It's split out because
- * linking this routine implies linking the entire compression library.
- * For a transcoding-only application, we want to be able to use jcmaster.c
- * without linking in the whole library.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Master selection of compression modules.
- * This is done once at the start of processing an image.  We determine
- * which modules will be used and give them appropriate initialization calls.
- */
-
-GLOBAL(void)
-jinit_compress_master (j_compress_ptr cinfo)
-{
-  /* Initialize master control (includes parameter checking/processing) */
-  jinit_c_master_control(cinfo, FALSE /* full compression */);
-
-  /* Preprocessing */
-  if (! cinfo->raw_data_in) {
-    jinit_color_converter(cinfo);
-    jinit_downsampler(cinfo);
-    jinit_c_prep_controller(cinfo, FALSE /* never need full buffer here */);
-  }
-  /* Forward DCT */
-  jinit_forward_dct(cinfo);
-  /* Entropy encoding: either Huffman or arithmetic coding. */
-  if (cinfo->arith_code) {
-    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
-  } else {
-    if (cinfo->progressive_mode) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-      jinit_phuff_encoder(cinfo);
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else
-      jinit_huff_encoder(cinfo);
-  }
-
-  /* Need a full-image coefficient buffer in any multi-pass mode. */
-  jinit_c_coef_controller(cinfo,
-		(wxjpeg_boolean) (cinfo->num_scans > 1 || cinfo->optimize_coding));
-  jinit_c_main_controller(cinfo, FALSE /* never need full buffer here */);
-
-  jinit_marker_writer(cinfo);
-
-  /* We can now tell the memory manager to allocate virtual arrays. */
-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
-
-  /* Write the datastream header (SOI) immediately.
-   * Frame and scan headers are postponed till later.
-   * This lets application insert special markers after the SOI.
-   */
-  (*cinfo->marker->write_file_header) (cinfo);
-}
+/*
+ * jcinit.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains initialization logic for the JPEG compressor.
+ * This routine is in charge of selecting the modules to be executed and
+ * making an initialization call to each one.
+ *
+ * Logically, this code belongs in jcmaster.c.  It's split out because
+ * linking this routine implies linking the entire compression library.
+ * For a transcoding-only application, we want to be able to use jcmaster.c
+ * without linking in the whole library.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Master selection of compression modules.
+ * This is done once at the start of processing an image.  We determine
+ * which modules will be used and give them appropriate initialization calls.
+ */
+
+GLOBAL(void)
+jinit_compress_master (j_compress_ptr cinfo)
+{
+  /* Initialize master control (includes parameter checking/processing) */
+  jinit_c_master_control(cinfo, FALSE /* full compression */);
+
+  /* Preprocessing */
+  if (! cinfo->raw_data_in) {
+    jinit_color_converter(cinfo);
+    jinit_downsampler(cinfo);
+    jinit_c_prep_controller(cinfo, FALSE /* never need full buffer here */);
+  }
+  /* Forward DCT */
+  jinit_forward_dct(cinfo);
+  /* Entropy encoding: either Huffman or arithmetic coding. */
+  if (cinfo->arith_code) {
+    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+  } else {
+    if (cinfo->progressive_mode) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+      jinit_phuff_encoder(cinfo);
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    } else
+      jinit_huff_encoder(cinfo);
+  }
+
+  /* Need a full-image coefficient buffer in any multi-pass mode. */
+  jinit_c_coef_controller(cinfo,
+		(wxjpeg_boolean) (cinfo->num_scans > 1 || cinfo->optimize_coding));
+  jinit_c_main_controller(cinfo, FALSE /* never need full buffer here */);
+
+  jinit_marker_writer(cinfo);
+
+  /* We can now tell the memory manager to allocate virtual arrays. */
+  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
+
+  /* Write the datastream header (SOI) immediately.
+   * Frame and scan headers are postponed till later.
+   * This lets application insert special markers after the SOI.
+   */
+  (*cinfo->marker->write_file_header) (cinfo);
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jcmainct.c b/Source/3rd Party/wx/src/jpeg/jcmainct.c
index 80f4ac825..42846cb51 100644
--- a/Source/3rd Party/wx/src/jpeg/jcmainct.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcmainct.c	
@@ -1,293 +1,293 @@
-/*
- * jcmainct.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the main buffer controller for compression.
- * The main buffer lies between the pre-processor and the JPEG
- * compressor proper; it holds downsampled data in the JPEG colorspace.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Note: currently, there is no operating mode in which a full-image buffer
- * is needed at this step.  If there were, that mode could not be used with
- * "raw data" input, since this module is bypassed in that case.  However,
- * we've left the code here for possible use in special applications.
- */
-#undef FULL_MAIN_BUFFER_SUPPORTED
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_c_main_controller pub; /* public fields */
-
-  JDIMENSION cur_iMCU_row;	/* number of current iMCU row */
-  JDIMENSION rowgroup_ctr;	/* counts row groups received in iMCU row */
-  wxjpeg_boolean suspended;		/* remember if we suspended output */
-  J_BUF_MODE pass_mode;		/* current operating mode */
-
-  /* If using just a strip buffer, this points to the entire set of buffers
-   * (we allocate one for each component).  In the full-image case, this
-   * points to the currently accessible strips of the virtual arrays.
-   */
-  JSAMPARRAY buffer[MAX_COMPONENTS];
-
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-  /* If using full-image storage, this array holds pointers to virtual-array
-   * control blocks for each component.  Unused if not full-image storage.
-   */
-  jvirt_sarray_ptr whole_image[MAX_COMPONENTS];
-#endif
-} my_main_controller;
-
-typedef my_main_controller * my_main_ptr;
-
-
-/* Forward declarations */
-METHODDEF(void) process_data_simple_main
-	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
-	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-METHODDEF(void) process_data_buffer_main
-	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
-	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
-#endif
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_main_ptr mymain = (my_main_ptr) cinfo->main;
-
-  /* Do nothing in raw-data mode. */
-  if (cinfo->raw_data_in)
-    return;
-
-  mymain->cur_iMCU_row = 0;	/* initialize counters */
-  mymain->rowgroup_ctr = 0;
-  mymain->suspended = FALSE;
-  mymain->pass_mode = pass_mode;	/* save mode for use by process_data */
-
-  switch (pass_mode) {
-  case JBUF_PASS_THRU:
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-    if (mymain->whole_image[0] != NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-#endif
-    mymain->pub.process_data = process_data_simple_main;
-    break;
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-  case JBUF_SAVE_SOURCE:
-  case JBUF_CRANK_DEST:
-  case JBUF_SAVE_AND_PASS:
-    if (mymain->whole_image[0] == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    mymain->pub.process_data = process_data_buffer_main;
-    break;
-#endif
-  default:
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    break;
-  }
-}
-
-
-/*
- * Process some data.
- * This routine handles the simple pass-through mode,
- * where we have only a strip buffer.
- */
-
-METHODDEF(void)
-process_data_simple_main (j_compress_ptr cinfo,
-			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			  JDIMENSION in_rows_avail)
-{
-  my_main_ptr mymain = (my_main_ptr) cinfo->main;
-
-  while (mymain->cur_iMCU_row < cinfo->total_iMCU_rows) {
-    /* Read input data if we haven't filled the main buffer yet */
-    if (mymain->rowgroup_ctr < DCTSIZE)
-      (*cinfo->prep->pre_process_data) (cinfo,
-					input_buf, in_row_ctr, in_rows_avail,
-					mymain->buffer, &mymain->rowgroup_ctr,
-					(JDIMENSION) DCTSIZE);
-
-    /* If we don't have a full iMCU row buffered, return to application for
-     * more data.  Note that preprocessor will always pad to fill the iMCU row
-     * at the bottom of the image.
-     */
-    if (mymain->rowgroup_ctr != DCTSIZE)
-      return;
-
-    /* Send the completed row to the compressor */
-    if (! (*cinfo->coef->compress_data) (cinfo, mymain->buffer)) {
-      /* If compressor did not consume the whole row, then we must need to
-       * suspend processing and return to the application.  In this situation
-       * we pretend we didn't yet consume the last input row; otherwise, if
-       * it happened to be the last row of the image, the application would
-       * think we were done.
-       */
-      if (! mymain->suspended) {
-	(*in_row_ctr)--;
-	mymain->suspended = TRUE;
-      }
-      return;
-    }
-    /* We did finish the row.  Undo our little suspension hack if a previous
-     * call suspended; then mark the main buffer empty.
-     */
-    if (mymain->suspended) {
-      (*in_row_ctr)++;
-      mymain->suspended = FALSE;
-    }
-    mymain->rowgroup_ctr = 0;
-    mymain->cur_iMCU_row++;
-  }
-}
-
-
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-
-/*
- * Process some data.
- * This routine handles all of the modes that use a full-size buffer.
- */
-
-METHODDEF(void)
-process_data_buffer_main (j_compress_ptr cinfo,
-			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			  JDIMENSION in_rows_avail)
-{
-  my_main_ptr mymain = (my_main_ptr) cinfo->main;
-  int ci;
-  jpeg_component_info *compptr;
-  wxjpeg_boolean writing = (mymain->pass_mode != JBUF_CRANK_DEST);
-
-  while (mymain->cur_iMCU_row < cinfo->total_iMCU_rows) {
-    /* Realign the virtual buffers if at the start of an iMCU row. */
-    if (mymain->rowgroup_ctr == 0) {
-      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	   ci++, compptr++) {
-	mymain->buffer[ci] = (*cinfo->mem->access_virt_sarray)
-	  ((j_common_ptr) cinfo, mymain->whole_image[ci],
-	   mymain->cur_iMCU_row * (compptr->v_samp_factor * DCTSIZE),
-	   (JDIMENSION) (compptr->v_samp_factor * DCTSIZE), writing);
-      }
-      /* In a read pass, pretend we just read some source data. */
-      if (! writing) {
-	*in_row_ctr += cinfo->max_v_samp_factor * DCTSIZE;
-	mymain->rowgroup_ctr = DCTSIZE;
-      }
-    }
-
-    /* If a write pass, read input data until the current iMCU row is full. */
-    /* Note: preprocessor will pad if necessary to fill the last iMCU row. */
-    if (writing) {
-      (*cinfo->prep->pre_process_data) (cinfo,
-					input_buf, in_row_ctr, in_rows_avail,
-					mymain->buffer, &mymain->rowgroup_ctr,
-					(JDIMENSION) DCTSIZE);
-      /* Return to application if we need more data to fill the iMCU row. */
-      if (mymain->rowgroup_ctr < DCTSIZE)
-	return;
-    }
-
-    /* Emit data, unless this is a sink-only pass. */
-    if (mymain->pass_mode != JBUF_SAVE_SOURCE) {
-      if (! (*cinfo->coef->compress_data) (cinfo, mymain->buffer)) {
-	/* If compressor did not consume the whole row, then we must need to
-	 * suspend processing and return to the application.  In this situation
-	 * we pretend we didn't yet consume the last input row; otherwise, if
-	 * it happened to be the last row of the image, the application would
-	 * think we were done.
-	 */
-	if (! mymain->suspended) {
-	  (*in_row_ctr)--;
-	  mymain->suspended = TRUE;
-	}
-	return;
-      }
-      /* We did finish the row.  Undo our little suspension hack if a previous
-       * call suspended; then mark the main buffer empty.
-       */
-      if (mymain->suspended) {
-	(*in_row_ctr)++;
-	mymain->suspended = FALSE;
-      }
-    }
-
-    /* If get here, we are done with this iMCU row.  Mark buffer empty. */
-    mymain->rowgroup_ctr = 0;
-    mymain->cur_iMCU_row++;
-  }
-}
-
-#endif /* FULL_MAIN_BUFFER_SUPPORTED */
-
-
-/*
- * Initialize main buffer controller.
- */
-
-GLOBAL(void)
-jinit_c_main_controller (j_compress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_main_ptr mymain;
-  int ci;
-  jpeg_component_info *compptr;
-
-  mymain = (my_main_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_main_controller));
-  cinfo->main = (struct jpeg_c_main_controller *) mymain;
-  mymain->pub.start_pass = start_pass_main;
-
-  /* We don't need to create a buffer in raw-data mode. */
-  if (cinfo->raw_data_in)
-    return;
-
-  /* Create the buffer.  It holds downsampled data, so each component
-   * may be of a different size.
-   */
-  if (need_full_buffer) {
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-    /* Allocate a full-image virtual array for each component */
-    /* Note we pad the bottom to a multiple of the iMCU height */
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      mymain->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
-	 compptr->width_in_blocks * DCTSIZE,
-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-				(long) compptr->v_samp_factor) * DCTSIZE,
-	 (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
-    }
-#else
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-#endif
-  } else {
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-    mymain->whole_image[0] = NULL; /* flag for no virtual arrays */
-#endif
-    /* Allocate a strip buffer for each component */
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      mymain->buffer[ci] = (*cinfo->mem->alloc_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE,
-	 compptr->width_in_blocks * DCTSIZE,
-	 (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
-    }
-  }
-}
+/*
+ * jcmainct.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the main buffer controller for compression.
+ * The main buffer lies between the pre-processor and the JPEG
+ * compressor proper; it holds downsampled data in the JPEG colorspace.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Note: currently, there is no operating mode in which a full-image buffer
+ * is needed at this step.  If there were, that mode could not be used with
+ * "raw data" input, since this module is bypassed in that case.  However,
+ * we've left the code here for possible use in special applications.
+ */
+#undef FULL_MAIN_BUFFER_SUPPORTED
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_c_main_controller pub; /* public fields */
+
+  JDIMENSION cur_iMCU_row;	/* number of current iMCU row */
+  JDIMENSION rowgroup_ctr;	/* counts row groups received in iMCU row */
+  wxjpeg_boolean suspended;		/* remember if we suspended output */
+  J_BUF_MODE pass_mode;		/* current operating mode */
+
+  /* If using just a strip buffer, this points to the entire set of buffers
+   * (we allocate one for each component).  In the full-image case, this
+   * points to the currently accessible strips of the virtual arrays.
+   */
+  JSAMPARRAY buffer[MAX_COMPONENTS];
+
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+  /* If using full-image storage, this array holds pointers to virtual-array
+   * control blocks for each component.  Unused if not full-image storage.
+   */
+  jvirt_sarray_ptr whole_image[MAX_COMPONENTS];
+#endif
+} my_main_controller;
+
+typedef my_main_controller * my_main_ptr;
+
+
+/* Forward declarations */
+METHODDEF(void) process_data_simple_main
+	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
+	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+METHODDEF(void) process_data_buffer_main
+	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
+	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
+#endif
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_main_ptr mymain = (my_main_ptr) cinfo->main;
+
+  /* Do nothing in raw-data mode. */
+  if (cinfo->raw_data_in)
+    return;
+
+  mymain->cur_iMCU_row = 0;	/* initialize counters */
+  mymain->rowgroup_ctr = 0;
+  mymain->suspended = FALSE;
+  mymain->pass_mode = pass_mode;	/* save mode for use by process_data */
+
+  switch (pass_mode) {
+  case JBUF_PASS_THRU:
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+    if (mymain->whole_image[0] != NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+#endif
+    mymain->pub.process_data = process_data_simple_main;
+    break;
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+  case JBUF_SAVE_SOURCE:
+  case JBUF_CRANK_DEST:
+  case JBUF_SAVE_AND_PASS:
+    if (mymain->whole_image[0] == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    mymain->pub.process_data = process_data_buffer_main;
+    break;
+#endif
+  default:
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    break;
+  }
+}
+
+
+/*
+ * Process some data.
+ * This routine handles the simple pass-through mode,
+ * where we have only a strip buffer.
+ */
+
+METHODDEF(void)
+process_data_simple_main (j_compress_ptr cinfo,
+			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+			  JDIMENSION in_rows_avail)
+{
+  my_main_ptr mymain = (my_main_ptr) cinfo->main;
+
+  while (mymain->cur_iMCU_row < cinfo->total_iMCU_rows) {
+    /* Read input data if we haven't filled the main buffer yet */
+    if (mymain->rowgroup_ctr < DCTSIZE)
+      (*cinfo->prep->pre_process_data) (cinfo,
+					input_buf, in_row_ctr, in_rows_avail,
+					mymain->buffer, &mymain->rowgroup_ctr,
+					(JDIMENSION) DCTSIZE);
+
+    /* If we don't have a full iMCU row buffered, return to application for
+     * more data.  Note that preprocessor will always pad to fill the iMCU row
+     * at the bottom of the image.
+     */
+    if (mymain->rowgroup_ctr != DCTSIZE)
+      return;
+
+    /* Send the completed row to the compressor */
+    if (! (*cinfo->coef->compress_data) (cinfo, mymain->buffer)) {
+      /* If compressor did not consume the whole row, then we must need to
+       * suspend processing and return to the application.  In this situation
+       * we pretend we didn't yet consume the last input row; otherwise, if
+       * it happened to be the last row of the image, the application would
+       * think we were done.
+       */
+      if (! mymain->suspended) {
+	(*in_row_ctr)--;
+	mymain->suspended = TRUE;
+      }
+      return;
+    }
+    /* We did finish the row.  Undo our little suspension hack if a previous
+     * call suspended; then mark the main buffer empty.
+     */
+    if (mymain->suspended) {
+      (*in_row_ctr)++;
+      mymain->suspended = FALSE;
+    }
+    mymain->rowgroup_ctr = 0;
+    mymain->cur_iMCU_row++;
+  }
+}
+
+
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+
+/*
+ * Process some data.
+ * This routine handles all of the modes that use a full-size buffer.
+ */
+
+METHODDEF(void)
+process_data_buffer_main (j_compress_ptr cinfo,
+			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+			  JDIMENSION in_rows_avail)
+{
+  my_main_ptr mymain = (my_main_ptr) cinfo->main;
+  int ci;
+  jpeg_component_info *compptr;
+  wxjpeg_boolean writing = (mymain->pass_mode != JBUF_CRANK_DEST);
+
+  while (mymain->cur_iMCU_row < cinfo->total_iMCU_rows) {
+    /* Realign the virtual buffers if at the start of an iMCU row. */
+    if (mymain->rowgroup_ctr == 0) {
+      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	   ci++, compptr++) {
+	mymain->buffer[ci] = (*cinfo->mem->access_virt_sarray)
+	  ((j_common_ptr) cinfo, mymain->whole_image[ci],
+	   mymain->cur_iMCU_row * (compptr->v_samp_factor * DCTSIZE),
+	   (JDIMENSION) (compptr->v_samp_factor * DCTSIZE), writing);
+      }
+      /* In a read pass, pretend we just read some source data. */
+      if (! writing) {
+	*in_row_ctr += cinfo->max_v_samp_factor * DCTSIZE;
+	mymain->rowgroup_ctr = DCTSIZE;
+      }
+    }
+
+    /* If a write pass, read input data until the current iMCU row is full. */
+    /* Note: preprocessor will pad if necessary to fill the last iMCU row. */
+    if (writing) {
+      (*cinfo->prep->pre_process_data) (cinfo,
+					input_buf, in_row_ctr, in_rows_avail,
+					mymain->buffer, &mymain->rowgroup_ctr,
+					(JDIMENSION) DCTSIZE);
+      /* Return to application if we need more data to fill the iMCU row. */
+      if (mymain->rowgroup_ctr < DCTSIZE)
+	return;
+    }
+
+    /* Emit data, unless this is a sink-only pass. */
+    if (mymain->pass_mode != JBUF_SAVE_SOURCE) {
+      if (! (*cinfo->coef->compress_data) (cinfo, mymain->buffer)) {
+	/* If compressor did not consume the whole row, then we must need to
+	 * suspend processing and return to the application.  In this situation
+	 * we pretend we didn't yet consume the last input row; otherwise, if
+	 * it happened to be the last row of the image, the application would
+	 * think we were done.
+	 */
+	if (! mymain->suspended) {
+	  (*in_row_ctr)--;
+	  mymain->suspended = TRUE;
+	}
+	return;
+      }
+      /* We did finish the row.  Undo our little suspension hack if a previous
+       * call suspended; then mark the main buffer empty.
+       */
+      if (mymain->suspended) {
+	(*in_row_ctr)++;
+	mymain->suspended = FALSE;
+      }
+    }
+
+    /* If get here, we are done with this iMCU row.  Mark buffer empty. */
+    mymain->rowgroup_ctr = 0;
+    mymain->cur_iMCU_row++;
+  }
+}
+
+#endif /* FULL_MAIN_BUFFER_SUPPORTED */
+
+
+/*
+ * Initialize main buffer controller.
+ */
+
+GLOBAL(void)
+jinit_c_main_controller (j_compress_ptr cinfo, wxjpeg_boolean need_full_buffer)
+{
+  my_main_ptr mymain;
+  int ci;
+  jpeg_component_info *compptr;
+
+  mymain = (my_main_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_main_controller));
+  cinfo->main = (struct jpeg_c_main_controller *) mymain;
+  mymain->pub.start_pass = start_pass_main;
+
+  /* We don't need to create a buffer in raw-data mode. */
+  if (cinfo->raw_data_in)
+    return;
+
+  /* Create the buffer.  It holds downsampled data, so each component
+   * may be of a different size.
+   */
+  if (need_full_buffer) {
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+    /* Allocate a full-image virtual array for each component */
+    /* Note we pad the bottom to a multiple of the iMCU height */
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      mymain->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+	 compptr->width_in_blocks * DCTSIZE,
+	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
+				(long) compptr->v_samp_factor) * DCTSIZE,
+	 (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
+    }
+#else
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+#endif
+  } else {
+#ifdef FULL_MAIN_BUFFER_SUPPORTED
+    mymain->whole_image[0] = NULL; /* flag for no virtual arrays */
+#endif
+    /* Allocate a strip buffer for each component */
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      mymain->buffer[ci] = (*cinfo->mem->alloc_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE,
+	 compptr->width_in_blocks * DCTSIZE,
+	 (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
+    }
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jcmarker.c b/Source/3rd Party/wx/src/jpeg/jcmarker.c
index 39d108ade..b6d987af8 100644
--- a/Source/3rd Party/wx/src/jpeg/jcmarker.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcmarker.c	
@@ -1,664 +1,664 @@
-/*
- * jcmarker.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains routines to write JPEG datastream markers.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-typedef enum {			/* JPEG marker codes */
-  M_SOF0  = 0xc0,
-  M_SOF1  = 0xc1,
-  M_SOF2  = 0xc2,
-  M_SOF3  = 0xc3,
-  
-  M_SOF5  = 0xc5,
-  M_SOF6  = 0xc6,
-  M_SOF7  = 0xc7,
-  
-  M_JPG   = 0xc8,
-  M_SOF9  = 0xc9,
-  M_SOF10 = 0xca,
-  M_SOF11 = 0xcb,
-  
-  M_SOF13 = 0xcd,
-  M_SOF14 = 0xce,
-  M_SOF15 = 0xcf,
-  
-  M_DHT   = 0xc4,
-  
-  M_DAC   = 0xcc,
-  
-  M_RST0  = 0xd0,
-  M_RST1  = 0xd1,
-  M_RST2  = 0xd2,
-  M_RST3  = 0xd3,
-  M_RST4  = 0xd4,
-  M_RST5  = 0xd5,
-  M_RST6  = 0xd6,
-  M_RST7  = 0xd7,
-  
-  M_SOI   = 0xd8,
-  M_EOI   = 0xd9,
-  M_SOS   = 0xda,
-  M_DQT   = 0xdb,
-  M_DNL   = 0xdc,
-  M_DRI   = 0xdd,
-  M_DHP   = 0xde,
-  M_EXP   = 0xdf,
-  
-  M_APP0  = 0xe0,
-  M_APP1  = 0xe1,
-  M_APP2  = 0xe2,
-  M_APP3  = 0xe3,
-  M_APP4  = 0xe4,
-  M_APP5  = 0xe5,
-  M_APP6  = 0xe6,
-  M_APP7  = 0xe7,
-  M_APP8  = 0xe8,
-  M_APP9  = 0xe9,
-  M_APP10 = 0xea,
-  M_APP11 = 0xeb,
-  M_APP12 = 0xec,
-  M_APP13 = 0xed,
-  M_APP14 = 0xee,
-  M_APP15 = 0xef,
-  
-  M_JPG0  = 0xf0,
-  M_JPG13 = 0xfd,
-  M_COM   = 0xfe,
-  
-  M_TEM   = 0x01,
-  
-  M_ERROR = 0x100
-} JPEG_MARKER;
-
-
-/* Private state */
-
-typedef struct {
-  struct jpeg_marker_writer pub; /* public fields */
-
-  unsigned int last_restart_interval; /* last DRI value emitted; 0 after SOI */
-} my_marker_writer;
-
-typedef my_marker_writer * my_marker_ptr;
-
-
-/*
- * Basic output routines.
- *
- * Note that we do not support suspension while writing a marker.
- * Therefore, an application using suspension must ensure that there is
- * enough buffer space for the initial markers (typ. 600-700 bytes) before
- * calling jpeg_start_compress, and enough space to write the trailing EOI
- * (a few bytes) before calling jpeg_finish_compress.  Multipass compression
- * modes are not supported at all with suspension, so those two are the only
- * points where markers will be written.
- */
-
-LOCAL(void)
-emit_byte (j_compress_ptr cinfo, int val)
-/* Emit a byte */
-{
-  struct jpeg_destination_mgr * dest = cinfo->dest;
-
-  *(dest->next_output_byte)++ = (JOCTET) val;
-  if (--dest->free_in_buffer == 0) {
-    if (! (*dest->empty_output_buffer) (cinfo))
-      ERREXIT(cinfo, JERR_CANT_SUSPEND);
-  }
-}
-
-
-LOCAL(void)
-emit_marker (j_compress_ptr cinfo, JPEG_MARKER mark)
-/* Emit a marker code */
-{
-  emit_byte(cinfo, 0xFF);
-  emit_byte(cinfo, (int) mark);
-}
-
-
-LOCAL(void)
-emit_2bytes (j_compress_ptr cinfo, int value)
-/* Emit a 2-byte integer; these are always MSB first in JPEG files */
-{
-  emit_byte(cinfo, (value >> 8) & 0xFF);
-  emit_byte(cinfo, value & 0xFF);
-}
-
-
-/*
- * Routines to write specific marker types.
- */
-
-LOCAL(int)
-emit_dqt (j_compress_ptr cinfo, int index)
-/* Emit a DQT marker */
-/* Returns the precision used (0 = 8bits, 1 = 16bits) for baseline checking */
-{
-  JQUANT_TBL * qtbl = cinfo->quant_tbl_ptrs[index];
-  int prec;
-  int i;
-
-  if (qtbl == NULL)
-    ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, index);
-
-  prec = 0;
-  for (i = 0; i < DCTSIZE2; i++) {
-    if (qtbl->quantval[i] > 255)
-      prec = 1;
-  }
-
-  if (! qtbl->sent_table) {
-    emit_marker(cinfo, M_DQT);
-
-    emit_2bytes(cinfo, prec ? DCTSIZE2*2 + 1 + 2 : DCTSIZE2 + 1 + 2);
-
-    emit_byte(cinfo, index + (prec<<4));
-
-    for (i = 0; i < DCTSIZE2; i++) {
-      /* The table entries must be emitted in zigzag order. */
-      unsigned int qval = qtbl->quantval[jpeg_natural_order[i]];
-      if (prec)
-	emit_byte(cinfo, (int) (qval >> 8));
-      emit_byte(cinfo, (int) (qval & 0xFF));
-    }
-
-    qtbl->sent_table = TRUE;
-  }
-
-  return prec;
-}
-
-
-LOCAL(void)
-emit_dht (j_compress_ptr cinfo, int index, wxjpeg_boolean is_ac)
-/* Emit a DHT marker */
-{
-  JHUFF_TBL * htbl;
-  int length, i;
-  
-  if (is_ac) {
-    htbl = cinfo->ac_huff_tbl_ptrs[index];
-    index += 0x10;		/* output index has AC bit set */
-  } else {
-    htbl = cinfo->dc_huff_tbl_ptrs[index];
-  }
-
-  if (htbl == NULL)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, index);
-  
-  if (! htbl->sent_table) {
-    emit_marker(cinfo, M_DHT);
-    
-    length = 0;
-    for (i = 1; i <= 16; i++)
-      length += htbl->bits[i];
-    
-    emit_2bytes(cinfo, length + 2 + 1 + 16);
-    emit_byte(cinfo, index);
-    
-    for (i = 1; i <= 16; i++)
-      emit_byte(cinfo, htbl->bits[i]);
-    
-    for (i = 0; i < length; i++)
-      emit_byte(cinfo, htbl->huffval[i]);
-    
-    htbl->sent_table = TRUE;
-  }
-}
-
-
-LOCAL(void)
-emit_dac (j_compress_ptr cinfo)
-/* Emit a DAC marker */
-/* Since the useful info is so small, we want to emit all the tables in */
-/* one DAC marker.  Therefore this routine does its own scan of the table. */
-{
-#ifdef C_ARITH_CODING_SUPPORTED
-  char dc_in_use[NUM_ARITH_TBLS];
-  char ac_in_use[NUM_ARITH_TBLS];
-  int length, i;
-  jpeg_component_info *compptr;
-  
-  for (i = 0; i < NUM_ARITH_TBLS; i++)
-    dc_in_use[i] = ac_in_use[i] = 0;
-  
-  for (i = 0; i < cinfo->comps_in_scan; i++) {
-    compptr = cinfo->cur_comp_info[i];
-    dc_in_use[compptr->dc_tbl_no] = 1;
-    ac_in_use[compptr->ac_tbl_no] = 1;
-  }
-  
-  length = 0;
-  for (i = 0; i < NUM_ARITH_TBLS; i++)
-    length += dc_in_use[i] + ac_in_use[i];
-  
-  emit_marker(cinfo, M_DAC);
-  
-  emit_2bytes(cinfo, length*2 + 2);
-  
-  for (i = 0; i < NUM_ARITH_TBLS; i++) {
-    if (dc_in_use[i]) {
-      emit_byte(cinfo, i);
-      emit_byte(cinfo, cinfo->arith_dc_L[i] + (cinfo->arith_dc_U[i]<<4));
-    }
-    if (ac_in_use[i]) {
-      emit_byte(cinfo, i + 0x10);
-      emit_byte(cinfo, cinfo->arith_ac_K[i]);
-    }
-  }
-#endif /* C_ARITH_CODING_SUPPORTED */
-}
-
-
-LOCAL(void)
-emit_dri (j_compress_ptr cinfo)
-/* Emit a DRI marker */
-{
-  emit_marker(cinfo, M_DRI);
-  
-  emit_2bytes(cinfo, 4);	/* fixed length */
-
-  emit_2bytes(cinfo, (int) cinfo->restart_interval);
-}
-
-
-LOCAL(void)
-emit_sof (j_compress_ptr cinfo, JPEG_MARKER code)
-/* Emit a SOF marker */
-{
-  int ci;
-  jpeg_component_info *compptr;
-  
-  emit_marker(cinfo, code);
-  
-  emit_2bytes(cinfo, 3 * cinfo->num_components + 2 + 5 + 1); /* length */
-
-  /* Make sure image isn't bigger than SOF field can handle */
-  if ((long) cinfo->image_height > 65535L ||
-      (long) cinfo->image_width > 65535L)
-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) 65535);
-
-  emit_byte(cinfo, cinfo->data_precision);
-  emit_2bytes(cinfo, (int) cinfo->image_height);
-  emit_2bytes(cinfo, (int) cinfo->image_width);
-
-  emit_byte(cinfo, cinfo->num_components);
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    emit_byte(cinfo, compptr->component_id);
-    emit_byte(cinfo, (compptr->h_samp_factor << 4) + compptr->v_samp_factor);
-    emit_byte(cinfo, compptr->quant_tbl_no);
-  }
-}
-
-
-LOCAL(void)
-emit_sos (j_compress_ptr cinfo)
-/* Emit a SOS marker */
-{
-  int i, td, ta;
-  jpeg_component_info *compptr;
-  
-  emit_marker(cinfo, M_SOS);
-  
-  emit_2bytes(cinfo, 2 * cinfo->comps_in_scan + 2 + 1 + 3); /* length */
-  
-  emit_byte(cinfo, cinfo->comps_in_scan);
-  
-  for (i = 0; i < cinfo->comps_in_scan; i++) {
-    compptr = cinfo->cur_comp_info[i];
-    emit_byte(cinfo, compptr->component_id);
-    td = compptr->dc_tbl_no;
-    ta = compptr->ac_tbl_no;
-    if (cinfo->progressive_mode) {
-      /* Progressive mode: only DC or only AC tables are used in one scan;
-       * furthermore, Huffman coding of DC refinement uses no table at all.
-       * We emit 0 for unused field(s); this is recommended by the P&M text
-       * but does not seem to be specified in the standard.
-       */
-      if (cinfo->Ss == 0) {
-	ta = 0;			/* DC scan */
-	if (cinfo->Ah != 0 && !cinfo->arith_code)
-	  td = 0;		/* no DC table either */
-      } else {
-	td = 0;			/* AC scan */
-      }
-    }
-    emit_byte(cinfo, (td << 4) + ta);
-  }
-
-  emit_byte(cinfo, cinfo->Ss);
-  emit_byte(cinfo, cinfo->Se);
-  emit_byte(cinfo, (cinfo->Ah << 4) + cinfo->Al);
-}
-
-
-LOCAL(void)
-emit_jfif_app0 (j_compress_ptr cinfo)
-/* Emit a JFIF-compliant APP0 marker */
-{
-  /*
-   * Length of APP0 block	(2 bytes)
-   * Block ID			(4 bytes - ASCII "JFIF")
-   * Zero byte			(1 byte to terminate the ID string)
-   * Version Major, Minor	(2 bytes - major first)
-   * Units			(1 byte - 0x00 = none, 0x01 = inch, 0x02 = cm)
-   * Xdpu			(2 bytes - dots per unit horizontal)
-   * Ydpu			(2 bytes - dots per unit vertical)
-   * Thumbnail X size		(1 byte)
-   * Thumbnail Y size		(1 byte)
-   */
-  
-  emit_marker(cinfo, M_APP0);
-  
-  emit_2bytes(cinfo, 2 + 4 + 1 + 2 + 1 + 2 + 2 + 1 + 1); /* length */
-
-  emit_byte(cinfo, 0x4A);	/* Identifier: ASCII "JFIF" */
-  emit_byte(cinfo, 0x46);
-  emit_byte(cinfo, 0x49);
-  emit_byte(cinfo, 0x46);
-  emit_byte(cinfo, 0);
-  emit_byte(cinfo, cinfo->JFIF_major_version); /* Version fields */
-  emit_byte(cinfo, cinfo->JFIF_minor_version);
-  emit_byte(cinfo, cinfo->density_unit); /* Pixel size information */
-  emit_2bytes(cinfo, (int) cinfo->X_density);
-  emit_2bytes(cinfo, (int) cinfo->Y_density);
-  emit_byte(cinfo, 0);		/* No thumbnail image */
-  emit_byte(cinfo, 0);
-}
-
-
-LOCAL(void)
-emit_adobe_app14 (j_compress_ptr cinfo)
-/* Emit an Adobe APP14 marker */
-{
-  /*
-   * Length of APP14 block	(2 bytes)
-   * Block ID			(5 bytes - ASCII "Adobe")
-   * Version Number		(2 bytes - currently 100)
-   * Flags0			(2 bytes - currently 0)
-   * Flags1			(2 bytes - currently 0)
-   * Color transform		(1 byte)
-   *
-   * Although Adobe TN 5116 mentions Version = 101, all the Adobe files
-   * now in circulation seem to use Version = 100, so that's what we write.
-   *
-   * We write the color transform byte as 1 if the JPEG color space is
-   * YCbCr, 2 if it's YCCK, 0 otherwise.  Adobe's definition has to do with
-   * whether the encoder performed a transformation, which is pretty useless.
-   */
-  
-  emit_marker(cinfo, M_APP14);
-  
-  emit_2bytes(cinfo, 2 + 5 + 2 + 2 + 2 + 1); /* length */
-
-  emit_byte(cinfo, 0x41);	/* Identifier: ASCII "Adobe" */
-  emit_byte(cinfo, 0x64);
-  emit_byte(cinfo, 0x6F);
-  emit_byte(cinfo, 0x62);
-  emit_byte(cinfo, 0x65);
-  emit_2bytes(cinfo, 100);	/* Version */
-  emit_2bytes(cinfo, 0);	/* Flags0 */
-  emit_2bytes(cinfo, 0);	/* Flags1 */
-  switch (cinfo->jpeg_color_space) {
-  case JCS_YCbCr:
-    emit_byte(cinfo, 1);	/* Color transform = 1 */
-    break;
-  case JCS_YCCK:
-    emit_byte(cinfo, 2);	/* Color transform = 2 */
-    break;
-  default:
-    emit_byte(cinfo, 0);	/* Color transform = 0 */
-    break;
-  }
-}
-
-
-/*
- * These routines allow writing an arbitrary marker with parameters.
- * The only intended use is to emit COM or APPn markers after calling
- * write_file_header and before calling write_frame_header.
- * Other uses are not guaranteed to produce desirable results.
- * Counting the parameter bytes properly is the caller's responsibility.
- */
-
-METHODDEF(void)
-write_marker_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
-/* Emit an arbitrary marker header */
-{
-  if (datalen > (unsigned int) 65533)		/* safety check */
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  emit_marker(cinfo, (JPEG_MARKER) marker);
-
-  emit_2bytes(cinfo, (int) (datalen + 2));	/* total length */
-}
-
-METHODDEF(void)
-write_marker_byte (j_compress_ptr cinfo, int val)
-/* Emit one byte of marker parameters following write_marker_header */
-{
-  emit_byte(cinfo, val);
-}
-
-
-/*
- * Write datastream header.
- * This consists of an SOI and optional APPn markers.
- * We recommend use of the JFIF marker, but not the Adobe marker,
- * when using YCbCr or grayscale data.  The JFIF marker should NOT
- * be used for any other JPEG colorspace.  The Adobe marker is helpful
- * to distinguish RGB, CMYK, and YCCK colorspaces.
- * Note that an application can write additional header markers after
- * jpeg_start_compress returns.
- */
-
-METHODDEF(void)
-write_file_header (j_compress_ptr cinfo)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-
-  emit_marker(cinfo, M_SOI);	/* first the SOI */
-
-  /* SOI is defined to reset restart interval to 0 */
-  marker->last_restart_interval = 0;
-
-  if (cinfo->write_JFIF_header)	/* next an optional JFIF APP0 */
-    emit_jfif_app0(cinfo);
-  if (cinfo->write_Adobe_marker) /* next an optional Adobe APP14 */
-    emit_adobe_app14(cinfo);
-}
-
-
-/*
- * Write frame header.
- * This consists of DQT and SOFn markers.
- * Note that we do not emit the SOF until we have emitted the DQT(s).
- * This avoids compatibility problems with incorrect implementations that
- * try to error-check the quant table numbers as soon as they see the SOF.
- */
-
-METHODDEF(void)
-write_frame_header (j_compress_ptr cinfo)
-{
-  int ci, prec;
-  wxjpeg_boolean is_baseline;
-  jpeg_component_info *compptr;
-  
-  /* Emit DQT for each quantization table.
-   * Note that emit_dqt() suppresses any duplicate tables.
-   */
-  prec = 0;
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    prec += emit_dqt(cinfo, compptr->quant_tbl_no);
-  }
-  /* now prec is nonzero iff there are any 16-bit quant tables. */
-
-  /* Check for a non-baseline specification.
-   * Note we assume that Huffman table numbers won't be changed later.
-   */
-  if (cinfo->arith_code || cinfo->progressive_mode ||
-      cinfo->data_precision != 8) {
-    is_baseline = FALSE;
-  } else {
-    is_baseline = TRUE;
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      if (compptr->dc_tbl_no > 1 || compptr->ac_tbl_no > 1)
-	is_baseline = FALSE;
-    }
-    if (prec && is_baseline) {
-      is_baseline = FALSE;
-      /* If it's baseline except for quantizer size, warn the user */
-      TRACEMS(cinfo, 0, JTRC_16BIT_TABLES);
-    }
-  }
-
-  /* Emit the proper SOF marker */
-  if (cinfo->arith_code) {
-    emit_sof(cinfo, M_SOF9);	/* SOF code for arithmetic coding */
-  } else {
-    if (cinfo->progressive_mode)
-      emit_sof(cinfo, M_SOF2);	/* SOF code for progressive Huffman */
-    else if (is_baseline)
-      emit_sof(cinfo, M_SOF0);	/* SOF code for baseline implementation */
-    else
-      emit_sof(cinfo, M_SOF1);	/* SOF code for non-baseline Huffman file */
-  }
-}
-
-
-/*
- * Write scan header.
- * This consists of DHT or DAC markers, optional DRI, and SOS.
- * Compressed data will be written following the SOS.
- */
-
-METHODDEF(void)
-write_scan_header (j_compress_ptr cinfo)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-  int i;
-  jpeg_component_info *compptr;
-
-  if (cinfo->arith_code) {
-    /* Emit arith conditioning info.  We may have some duplication
-     * if the file has multiple scans, but it's so small it's hardly
-     * worth worrying about.
-     */
-    emit_dac(cinfo);
-  } else {
-    /* Emit Huffman tables.
-     * Note that emit_dht() suppresses any duplicate tables.
-     */
-    for (i = 0; i < cinfo->comps_in_scan; i++) {
-      compptr = cinfo->cur_comp_info[i];
-      if (cinfo->progressive_mode) {
-	/* Progressive mode: only DC or only AC tables are used in one scan */
-	if (cinfo->Ss == 0) {
-	  if (cinfo->Ah == 0)	/* DC needs no table for refinement scan */
-	    emit_dht(cinfo, compptr->dc_tbl_no, FALSE);
-	} else {
-	  emit_dht(cinfo, compptr->ac_tbl_no, TRUE);
-	}
-      } else {
-	/* Sequential mode: need both DC and AC tables */
-	emit_dht(cinfo, compptr->dc_tbl_no, FALSE);
-	emit_dht(cinfo, compptr->ac_tbl_no, TRUE);
-      }
-    }
-  }
-
-  /* Emit DRI if required --- note that DRI value could change for each scan.
-   * We avoid wasting space with unnecessary DRIs, however.
-   */
-  if (cinfo->restart_interval != marker->last_restart_interval) {
-    emit_dri(cinfo);
-    marker->last_restart_interval = cinfo->restart_interval;
-  }
-
-  emit_sos(cinfo);
-}
-
-
-/*
- * Write datastream trailer.
- */
-
-METHODDEF(void)
-write_file_trailer (j_compress_ptr cinfo)
-{
-  emit_marker(cinfo, M_EOI);
-}
-
-
-/*
- * Write an abbreviated table-specification datastream.
- * This consists of SOI, DQT and DHT tables, and EOI.
- * Any table that is defined and not marked sent_table = TRUE will be
- * emitted.  Note that all tables will be marked sent_table = TRUE at exit.
- */
-
-METHODDEF(void)
-write_tables_only (j_compress_ptr cinfo)
-{
-  int i;
-
-  emit_marker(cinfo, M_SOI);
-
-  for (i = 0; i < NUM_QUANT_TBLS; i++) {
-    if (cinfo->quant_tbl_ptrs[i] != NULL)
-      (void) emit_dqt(cinfo, i);
-  }
-
-  if (! cinfo->arith_code) {
-    for (i = 0; i < NUM_HUFF_TBLS; i++) {
-      if (cinfo->dc_huff_tbl_ptrs[i] != NULL)
-	emit_dht(cinfo, i, FALSE);
-      if (cinfo->ac_huff_tbl_ptrs[i] != NULL)
-	emit_dht(cinfo, i, TRUE);
-    }
-  }
-
-  emit_marker(cinfo, M_EOI);
-}
-
-
-/*
- * Initialize the marker writer module.
- */
-
-GLOBAL(void)
-jinit_marker_writer (j_compress_ptr cinfo)
-{
-  my_marker_ptr marker;
-
-  /* Create the subobject */
-  marker = (my_marker_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_marker_writer));
-  cinfo->marker = (struct jpeg_marker_writer *) marker;
-  /* Initialize method pointers */
-  marker->pub.write_file_header = write_file_header;
-  marker->pub.write_frame_header = write_frame_header;
-  marker->pub.write_scan_header = write_scan_header;
-  marker->pub.write_file_trailer = write_file_trailer;
-  marker->pub.write_tables_only = write_tables_only;
-  marker->pub.write_marker_header = write_marker_header;
-  marker->pub.write_marker_byte = write_marker_byte;
-  /* Initialize private state */
-  marker->last_restart_interval = 0;
-}
+/*
+ * jcmarker.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to write JPEG datastream markers.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+typedef enum {			/* JPEG marker codes */
+  M_SOF0  = 0xc0,
+  M_SOF1  = 0xc1,
+  M_SOF2  = 0xc2,
+  M_SOF3  = 0xc3,
+  
+  M_SOF5  = 0xc5,
+  M_SOF6  = 0xc6,
+  M_SOF7  = 0xc7,
+  
+  M_JPG   = 0xc8,
+  M_SOF9  = 0xc9,
+  M_SOF10 = 0xca,
+  M_SOF11 = 0xcb,
+  
+  M_SOF13 = 0xcd,
+  M_SOF14 = 0xce,
+  M_SOF15 = 0xcf,
+  
+  M_DHT   = 0xc4,
+  
+  M_DAC   = 0xcc,
+  
+  M_RST0  = 0xd0,
+  M_RST1  = 0xd1,
+  M_RST2  = 0xd2,
+  M_RST3  = 0xd3,
+  M_RST4  = 0xd4,
+  M_RST5  = 0xd5,
+  M_RST6  = 0xd6,
+  M_RST7  = 0xd7,
+  
+  M_SOI   = 0xd8,
+  M_EOI   = 0xd9,
+  M_SOS   = 0xda,
+  M_DQT   = 0xdb,
+  M_DNL   = 0xdc,
+  M_DRI   = 0xdd,
+  M_DHP   = 0xde,
+  M_EXP   = 0xdf,
+  
+  M_APP0  = 0xe0,
+  M_APP1  = 0xe1,
+  M_APP2  = 0xe2,
+  M_APP3  = 0xe3,
+  M_APP4  = 0xe4,
+  M_APP5  = 0xe5,
+  M_APP6  = 0xe6,
+  M_APP7  = 0xe7,
+  M_APP8  = 0xe8,
+  M_APP9  = 0xe9,
+  M_APP10 = 0xea,
+  M_APP11 = 0xeb,
+  M_APP12 = 0xec,
+  M_APP13 = 0xed,
+  M_APP14 = 0xee,
+  M_APP15 = 0xef,
+  
+  M_JPG0  = 0xf0,
+  M_JPG13 = 0xfd,
+  M_COM   = 0xfe,
+  
+  M_TEM   = 0x01,
+  
+  M_ERROR = 0x100
+} JPEG_MARKER;
+
+
+/* Private state */
+
+typedef struct {
+  struct jpeg_marker_writer pub; /* public fields */
+
+  unsigned int last_restart_interval; /* last DRI value emitted; 0 after SOI */
+} my_marker_writer;
+
+typedef my_marker_writer * my_marker_ptr;
+
+
+/*
+ * Basic output routines.
+ *
+ * Note that we do not support suspension while writing a marker.
+ * Therefore, an application using suspension must ensure that there is
+ * enough buffer space for the initial markers (typ. 600-700 bytes) before
+ * calling jpeg_start_compress, and enough space to write the trailing EOI
+ * (a few bytes) before calling jpeg_finish_compress.  Multipass compression
+ * modes are not supported at all with suspension, so those two are the only
+ * points where markers will be written.
+ */
+
+LOCAL(void)
+emit_byte (j_compress_ptr cinfo, int val)
+/* Emit a byte */
+{
+  struct jpeg_destination_mgr * dest = cinfo->dest;
+
+  *(dest->next_output_byte)++ = (JOCTET) val;
+  if (--dest->free_in_buffer == 0) {
+    if (! (*dest->empty_output_buffer) (cinfo))
+      ERREXIT(cinfo, JERR_CANT_SUSPEND);
+  }
+}
+
+
+LOCAL(void)
+emit_marker (j_compress_ptr cinfo, JPEG_MARKER mark)
+/* Emit a marker code */
+{
+  emit_byte(cinfo, 0xFF);
+  emit_byte(cinfo, (int) mark);
+}
+
+
+LOCAL(void)
+emit_2bytes (j_compress_ptr cinfo, int value)
+/* Emit a 2-byte integer; these are always MSB first in JPEG files */
+{
+  emit_byte(cinfo, (value >> 8) & 0xFF);
+  emit_byte(cinfo, value & 0xFF);
+}
+
+
+/*
+ * Routines to write specific marker types.
+ */
+
+LOCAL(int)
+emit_dqt (j_compress_ptr cinfo, int index)
+/* Emit a DQT marker */
+/* Returns the precision used (0 = 8bits, 1 = 16bits) for baseline checking */
+{
+  JQUANT_TBL * qtbl = cinfo->quant_tbl_ptrs[index];
+  int prec;
+  int i;
+
+  if (qtbl == NULL)
+    ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, index);
+
+  prec = 0;
+  for (i = 0; i < DCTSIZE2; i++) {
+    if (qtbl->quantval[i] > 255)
+      prec = 1;
+  }
+
+  if (! qtbl->sent_table) {
+    emit_marker(cinfo, M_DQT);
+
+    emit_2bytes(cinfo, prec ? DCTSIZE2*2 + 1 + 2 : DCTSIZE2 + 1 + 2);
+
+    emit_byte(cinfo, index + (prec<<4));
+
+    for (i = 0; i < DCTSIZE2; i++) {
+      /* The table entries must be emitted in zigzag order. */
+      unsigned int qval = qtbl->quantval[jpeg_natural_order[i]];
+      if (prec)
+	emit_byte(cinfo, (int) (qval >> 8));
+      emit_byte(cinfo, (int) (qval & 0xFF));
+    }
+
+    qtbl->sent_table = TRUE;
+  }
+
+  return prec;
+}
+
+
+LOCAL(void)
+emit_dht (j_compress_ptr cinfo, int index, wxjpeg_boolean is_ac)
+/* Emit a DHT marker */
+{
+  JHUFF_TBL * htbl;
+  int length, i;
+  
+  if (is_ac) {
+    htbl = cinfo->ac_huff_tbl_ptrs[index];
+    index += 0x10;		/* output index has AC bit set */
+  } else {
+    htbl = cinfo->dc_huff_tbl_ptrs[index];
+  }
+
+  if (htbl == NULL)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, index);
+  
+  if (! htbl->sent_table) {
+    emit_marker(cinfo, M_DHT);
+    
+    length = 0;
+    for (i = 1; i <= 16; i++)
+      length += htbl->bits[i];
+    
+    emit_2bytes(cinfo, length + 2 + 1 + 16);
+    emit_byte(cinfo, index);
+    
+    for (i = 1; i <= 16; i++)
+      emit_byte(cinfo, htbl->bits[i]);
+    
+    for (i = 0; i < length; i++)
+      emit_byte(cinfo, htbl->huffval[i]);
+    
+    htbl->sent_table = TRUE;
+  }
+}
+
+
+LOCAL(void)
+emit_dac (j_compress_ptr cinfo)
+/* Emit a DAC marker */
+/* Since the useful info is so small, we want to emit all the tables in */
+/* one DAC marker.  Therefore this routine does its own scan of the table. */
+{
+#ifdef C_ARITH_CODING_SUPPORTED
+  char dc_in_use[NUM_ARITH_TBLS];
+  char ac_in_use[NUM_ARITH_TBLS];
+  int length, i;
+  jpeg_component_info *compptr;
+  
+  for (i = 0; i < NUM_ARITH_TBLS; i++)
+    dc_in_use[i] = ac_in_use[i] = 0;
+  
+  for (i = 0; i < cinfo->comps_in_scan; i++) {
+    compptr = cinfo->cur_comp_info[i];
+    dc_in_use[compptr->dc_tbl_no] = 1;
+    ac_in_use[compptr->ac_tbl_no] = 1;
+  }
+  
+  length = 0;
+  for (i = 0; i < NUM_ARITH_TBLS; i++)
+    length += dc_in_use[i] + ac_in_use[i];
+  
+  emit_marker(cinfo, M_DAC);
+  
+  emit_2bytes(cinfo, length*2 + 2);
+  
+  for (i = 0; i < NUM_ARITH_TBLS; i++) {
+    if (dc_in_use[i]) {
+      emit_byte(cinfo, i);
+      emit_byte(cinfo, cinfo->arith_dc_L[i] + (cinfo->arith_dc_U[i]<<4));
+    }
+    if (ac_in_use[i]) {
+      emit_byte(cinfo, i + 0x10);
+      emit_byte(cinfo, cinfo->arith_ac_K[i]);
+    }
+  }
+#endif /* C_ARITH_CODING_SUPPORTED */
+}
+
+
+LOCAL(void)
+emit_dri (j_compress_ptr cinfo)
+/* Emit a DRI marker */
+{
+  emit_marker(cinfo, M_DRI);
+  
+  emit_2bytes(cinfo, 4);	/* fixed length */
+
+  emit_2bytes(cinfo, (int) cinfo->restart_interval);
+}
+
+
+LOCAL(void)
+emit_sof (j_compress_ptr cinfo, JPEG_MARKER code)
+/* Emit a SOF marker */
+{
+  int ci;
+  jpeg_component_info *compptr;
+  
+  emit_marker(cinfo, code);
+  
+  emit_2bytes(cinfo, 3 * cinfo->num_components + 2 + 5 + 1); /* length */
+
+  /* Make sure image isn't bigger than SOF field can handle */
+  if ((long) cinfo->image_height > 65535L ||
+      (long) cinfo->image_width > 65535L)
+    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) 65535);
+
+  emit_byte(cinfo, cinfo->data_precision);
+  emit_2bytes(cinfo, (int) cinfo->image_height);
+  emit_2bytes(cinfo, (int) cinfo->image_width);
+
+  emit_byte(cinfo, cinfo->num_components);
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    emit_byte(cinfo, compptr->component_id);
+    emit_byte(cinfo, (compptr->h_samp_factor << 4) + compptr->v_samp_factor);
+    emit_byte(cinfo, compptr->quant_tbl_no);
+  }
+}
+
+
+LOCAL(void)
+emit_sos (j_compress_ptr cinfo)
+/* Emit a SOS marker */
+{
+  int i, td, ta;
+  jpeg_component_info *compptr;
+  
+  emit_marker(cinfo, M_SOS);
+  
+  emit_2bytes(cinfo, 2 * cinfo->comps_in_scan + 2 + 1 + 3); /* length */
+  
+  emit_byte(cinfo, cinfo->comps_in_scan);
+  
+  for (i = 0; i < cinfo->comps_in_scan; i++) {
+    compptr = cinfo->cur_comp_info[i];
+    emit_byte(cinfo, compptr->component_id);
+    td = compptr->dc_tbl_no;
+    ta = compptr->ac_tbl_no;
+    if (cinfo->progressive_mode) {
+      /* Progressive mode: only DC or only AC tables are used in one scan;
+       * furthermore, Huffman coding of DC refinement uses no table at all.
+       * We emit 0 for unused field(s); this is recommended by the P&M text
+       * but does not seem to be specified in the standard.
+       */
+      if (cinfo->Ss == 0) {
+	ta = 0;			/* DC scan */
+	if (cinfo->Ah != 0 && !cinfo->arith_code)
+	  td = 0;		/* no DC table either */
+      } else {
+	td = 0;			/* AC scan */
+      }
+    }
+    emit_byte(cinfo, (td << 4) + ta);
+  }
+
+  emit_byte(cinfo, cinfo->Ss);
+  emit_byte(cinfo, cinfo->Se);
+  emit_byte(cinfo, (cinfo->Ah << 4) + cinfo->Al);
+}
+
+
+LOCAL(void)
+emit_jfif_app0 (j_compress_ptr cinfo)
+/* Emit a JFIF-compliant APP0 marker */
+{
+  /*
+   * Length of APP0 block	(2 bytes)
+   * Block ID			(4 bytes - ASCII "JFIF")
+   * Zero byte			(1 byte to terminate the ID string)
+   * Version Major, Minor	(2 bytes - major first)
+   * Units			(1 byte - 0x00 = none, 0x01 = inch, 0x02 = cm)
+   * Xdpu			(2 bytes - dots per unit horizontal)
+   * Ydpu			(2 bytes - dots per unit vertical)
+   * Thumbnail X size		(1 byte)
+   * Thumbnail Y size		(1 byte)
+   */
+  
+  emit_marker(cinfo, M_APP0);
+  
+  emit_2bytes(cinfo, 2 + 4 + 1 + 2 + 1 + 2 + 2 + 1 + 1); /* length */
+
+  emit_byte(cinfo, 0x4A);	/* Identifier: ASCII "JFIF" */
+  emit_byte(cinfo, 0x46);
+  emit_byte(cinfo, 0x49);
+  emit_byte(cinfo, 0x46);
+  emit_byte(cinfo, 0);
+  emit_byte(cinfo, cinfo->JFIF_major_version); /* Version fields */
+  emit_byte(cinfo, cinfo->JFIF_minor_version);
+  emit_byte(cinfo, cinfo->density_unit); /* Pixel size information */
+  emit_2bytes(cinfo, (int) cinfo->X_density);
+  emit_2bytes(cinfo, (int) cinfo->Y_density);
+  emit_byte(cinfo, 0);		/* No thumbnail image */
+  emit_byte(cinfo, 0);
+}
+
+
+LOCAL(void)
+emit_adobe_app14 (j_compress_ptr cinfo)
+/* Emit an Adobe APP14 marker */
+{
+  /*
+   * Length of APP14 block	(2 bytes)
+   * Block ID			(5 bytes - ASCII "Adobe")
+   * Version Number		(2 bytes - currently 100)
+   * Flags0			(2 bytes - currently 0)
+   * Flags1			(2 bytes - currently 0)
+   * Color transform		(1 byte)
+   *
+   * Although Adobe TN 5116 mentions Version = 101, all the Adobe files
+   * now in circulation seem to use Version = 100, so that's what we write.
+   *
+   * We write the color transform byte as 1 if the JPEG color space is
+   * YCbCr, 2 if it's YCCK, 0 otherwise.  Adobe's definition has to do with
+   * whether the encoder performed a transformation, which is pretty useless.
+   */
+  
+  emit_marker(cinfo, M_APP14);
+  
+  emit_2bytes(cinfo, 2 + 5 + 2 + 2 + 2 + 1); /* length */
+
+  emit_byte(cinfo, 0x41);	/* Identifier: ASCII "Adobe" */
+  emit_byte(cinfo, 0x64);
+  emit_byte(cinfo, 0x6F);
+  emit_byte(cinfo, 0x62);
+  emit_byte(cinfo, 0x65);
+  emit_2bytes(cinfo, 100);	/* Version */
+  emit_2bytes(cinfo, 0);	/* Flags0 */
+  emit_2bytes(cinfo, 0);	/* Flags1 */
+  switch (cinfo->jpeg_color_space) {
+  case JCS_YCbCr:
+    emit_byte(cinfo, 1);	/* Color transform = 1 */
+    break;
+  case JCS_YCCK:
+    emit_byte(cinfo, 2);	/* Color transform = 2 */
+    break;
+  default:
+    emit_byte(cinfo, 0);	/* Color transform = 0 */
+    break;
+  }
+}
+
+
+/*
+ * These routines allow writing an arbitrary marker with parameters.
+ * The only intended use is to emit COM or APPn markers after calling
+ * write_file_header and before calling write_frame_header.
+ * Other uses are not guaranteed to produce desirable results.
+ * Counting the parameter bytes properly is the caller's responsibility.
+ */
+
+METHODDEF(void)
+write_marker_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
+/* Emit an arbitrary marker header */
+{
+  if (datalen > (unsigned int) 65533)		/* safety check */
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  emit_marker(cinfo, (JPEG_MARKER) marker);
+
+  emit_2bytes(cinfo, (int) (datalen + 2));	/* total length */
+}
+
+METHODDEF(void)
+write_marker_byte (j_compress_ptr cinfo, int val)
+/* Emit one byte of marker parameters following write_marker_header */
+{
+  emit_byte(cinfo, val);
+}
+
+
+/*
+ * Write datastream header.
+ * This consists of an SOI and optional APPn markers.
+ * We recommend use of the JFIF marker, but not the Adobe marker,
+ * when using YCbCr or grayscale data.  The JFIF marker should NOT
+ * be used for any other JPEG colorspace.  The Adobe marker is helpful
+ * to distinguish RGB, CMYK, and YCCK colorspaces.
+ * Note that an application can write additional header markers after
+ * jpeg_start_compress returns.
+ */
+
+METHODDEF(void)
+write_file_header (j_compress_ptr cinfo)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+
+  emit_marker(cinfo, M_SOI);	/* first the SOI */
+
+  /* SOI is defined to reset restart interval to 0 */
+  marker->last_restart_interval = 0;
+
+  if (cinfo->write_JFIF_header)	/* next an optional JFIF APP0 */
+    emit_jfif_app0(cinfo);
+  if (cinfo->write_Adobe_marker) /* next an optional Adobe APP14 */
+    emit_adobe_app14(cinfo);
+}
+
+
+/*
+ * Write frame header.
+ * This consists of DQT and SOFn markers.
+ * Note that we do not emit the SOF until we have emitted the DQT(s).
+ * This avoids compatibility problems with incorrect implementations that
+ * try to error-check the quant table numbers as soon as they see the SOF.
+ */
+
+METHODDEF(void)
+write_frame_header (j_compress_ptr cinfo)
+{
+  int ci, prec;
+  wxjpeg_boolean is_baseline;
+  jpeg_component_info *compptr;
+  
+  /* Emit DQT for each quantization table.
+   * Note that emit_dqt() suppresses any duplicate tables.
+   */
+  prec = 0;
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    prec += emit_dqt(cinfo, compptr->quant_tbl_no);
+  }
+  /* now prec is nonzero iff there are any 16-bit quant tables. */
+
+  /* Check for a non-baseline specification.
+   * Note we assume that Huffman table numbers won't be changed later.
+   */
+  if (cinfo->arith_code || cinfo->progressive_mode ||
+      cinfo->data_precision != 8) {
+    is_baseline = FALSE;
+  } else {
+    is_baseline = TRUE;
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      if (compptr->dc_tbl_no > 1 || compptr->ac_tbl_no > 1)
+	is_baseline = FALSE;
+    }
+    if (prec && is_baseline) {
+      is_baseline = FALSE;
+      /* If it's baseline except for quantizer size, warn the user */
+      TRACEMS(cinfo, 0, JTRC_16BIT_TABLES);
+    }
+  }
+
+  /* Emit the proper SOF marker */
+  if (cinfo->arith_code) {
+    emit_sof(cinfo, M_SOF9);	/* SOF code for arithmetic coding */
+  } else {
+    if (cinfo->progressive_mode)
+      emit_sof(cinfo, M_SOF2);	/* SOF code for progressive Huffman */
+    else if (is_baseline)
+      emit_sof(cinfo, M_SOF0);	/* SOF code for baseline implementation */
+    else
+      emit_sof(cinfo, M_SOF1);	/* SOF code for non-baseline Huffman file */
+  }
+}
+
+
+/*
+ * Write scan header.
+ * This consists of DHT or DAC markers, optional DRI, and SOS.
+ * Compressed data will be written following the SOS.
+ */
+
+METHODDEF(void)
+write_scan_header (j_compress_ptr cinfo)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+  int i;
+  jpeg_component_info *compptr;
+
+  if (cinfo->arith_code) {
+    /* Emit arith conditioning info.  We may have some duplication
+     * if the file has multiple scans, but it's so small it's hardly
+     * worth worrying about.
+     */
+    emit_dac(cinfo);
+  } else {
+    /* Emit Huffman tables.
+     * Note that emit_dht() suppresses any duplicate tables.
+     */
+    for (i = 0; i < cinfo->comps_in_scan; i++) {
+      compptr = cinfo->cur_comp_info[i];
+      if (cinfo->progressive_mode) {
+	/* Progressive mode: only DC or only AC tables are used in one scan */
+	if (cinfo->Ss == 0) {
+	  if (cinfo->Ah == 0)	/* DC needs no table for refinement scan */
+	    emit_dht(cinfo, compptr->dc_tbl_no, FALSE);
+	} else {
+	  emit_dht(cinfo, compptr->ac_tbl_no, TRUE);
+	}
+      } else {
+	/* Sequential mode: need both DC and AC tables */
+	emit_dht(cinfo, compptr->dc_tbl_no, FALSE);
+	emit_dht(cinfo, compptr->ac_tbl_no, TRUE);
+      }
+    }
+  }
+
+  /* Emit DRI if required --- note that DRI value could change for each scan.
+   * We avoid wasting space with unnecessary DRIs, however.
+   */
+  if (cinfo->restart_interval != marker->last_restart_interval) {
+    emit_dri(cinfo);
+    marker->last_restart_interval = cinfo->restart_interval;
+  }
+
+  emit_sos(cinfo);
+}
+
+
+/*
+ * Write datastream trailer.
+ */
+
+METHODDEF(void)
+write_file_trailer (j_compress_ptr cinfo)
+{
+  emit_marker(cinfo, M_EOI);
+}
+
+
+/*
+ * Write an abbreviated table-specification datastream.
+ * This consists of SOI, DQT and DHT tables, and EOI.
+ * Any table that is defined and not marked sent_table = TRUE will be
+ * emitted.  Note that all tables will be marked sent_table = TRUE at exit.
+ */
+
+METHODDEF(void)
+write_tables_only (j_compress_ptr cinfo)
+{
+  int i;
+
+  emit_marker(cinfo, M_SOI);
+
+  for (i = 0; i < NUM_QUANT_TBLS; i++) {
+    if (cinfo->quant_tbl_ptrs[i] != NULL)
+      (void) emit_dqt(cinfo, i);
+  }
+
+  if (! cinfo->arith_code) {
+    for (i = 0; i < NUM_HUFF_TBLS; i++) {
+      if (cinfo->dc_huff_tbl_ptrs[i] != NULL)
+	emit_dht(cinfo, i, FALSE);
+      if (cinfo->ac_huff_tbl_ptrs[i] != NULL)
+	emit_dht(cinfo, i, TRUE);
+    }
+  }
+
+  emit_marker(cinfo, M_EOI);
+}
+
+
+/*
+ * Initialize the marker writer module.
+ */
+
+GLOBAL(void)
+jinit_marker_writer (j_compress_ptr cinfo)
+{
+  my_marker_ptr marker;
+
+  /* Create the subobject */
+  marker = (my_marker_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_marker_writer));
+  cinfo->marker = (struct jpeg_marker_writer *) marker;
+  /* Initialize method pointers */
+  marker->pub.write_file_header = write_file_header;
+  marker->pub.write_frame_header = write_frame_header;
+  marker->pub.write_scan_header = write_scan_header;
+  marker->pub.write_file_trailer = write_file_trailer;
+  marker->pub.write_tables_only = write_tables_only;
+  marker->pub.write_marker_header = write_marker_header;
+  marker->pub.write_marker_byte = write_marker_byte;
+  /* Initialize private state */
+  marker->last_restart_interval = 0;
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jcmaster.c b/Source/3rd Party/wx/src/jpeg/jcmaster.c
index 89ee2ccdc..af887794c 100644
--- a/Source/3rd Party/wx/src/jpeg/jcmaster.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcmaster.c	
@@ -1,590 +1,590 @@
-/*
- * jcmaster.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains master control logic for the JPEG compressor.
- * These routines are concerned with parameter validation, initial setup,
- * and inter-pass control (determining the number of passes and the work 
- * to be done in each pass).
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Private state */
-
-typedef enum {
-	main_pass,		/* input data, also do first output step */
-	huff_opt_pass,		/* Huffman code optimization pass */
-	output_pass		/* data output pass */
-} c_pass_type;
-
-typedef struct {
-  struct jpeg_comp_master pub;	/* public fields */
-
-  c_pass_type pass_type;	/* the type of the current pass */
-
-  int pass_number;		/* # of passes completed */
-  int total_passes;		/* total # of passes needed */
-
-  int scan_number;		/* current index in scan_info[] */
-} my_comp_master;
-
-typedef my_comp_master * my_master_ptr;
-
-
-/*
- * Support routines that do various essential calculations.
- */
-
-LOCAL(void)
-initial_setup (j_compress_ptr cinfo)
-/* Do computations that are needed before master selection phase */
-{
-  int ci;
-  jpeg_component_info *compptr;
-  long samplesperrow;
-  JDIMENSION jd_samplesperrow;
-
-  /* Sanity check on image dimensions */
-  if (cinfo->image_height <= 0 || cinfo->image_width <= 0
-      || cinfo->num_components <= 0 || cinfo->input_components <= 0)
-    ERREXIT(cinfo, JERR_EMPTY_IMAGE);
-
-  /* Make sure image isn't bigger than I can handle */
-  if ((long) cinfo->image_height > (long) JPEG_MAX_DIMENSION ||
-      (long) cinfo->image_width > (long) JPEG_MAX_DIMENSION)
-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);
-
-  /* Width of an input scanline must be representable as JDIMENSION. */
-  samplesperrow = (long) cinfo->image_width * (long) cinfo->input_components;
-  jd_samplesperrow = (JDIMENSION) samplesperrow;
-  if ((long) jd_samplesperrow != samplesperrow)
-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-
-  /* For now, precision must match compiled-in value... */
-  if (cinfo->data_precision != BITS_IN_JSAMPLE)
-    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
-
-  /* Check that number of components won't exceed internal array sizes */
-  if (cinfo->num_components > MAX_COMPONENTS)
-    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
-	     MAX_COMPONENTS);
-
-  /* Compute maximum sampling factors; check factor validity */
-  cinfo->max_h_samp_factor = 1;
-  cinfo->max_v_samp_factor = 1;
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||
-	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)
-      ERREXIT(cinfo, JERR_BAD_SAMPLING);
-    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,
-				   compptr->h_samp_factor);
-    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,
-				   compptr->v_samp_factor);
-  }
-
-  /* Compute dimensions of components */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Fill in the correct component_index value; don't rely on application */
-    compptr->component_index = ci;
-    /* For compression, we never do DCT scaling. */
-    compptr->DCT_scaled_size = DCTSIZE;
-    /* Size in DCT blocks */
-    compptr->width_in_blocks = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
-		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
-    compptr->height_in_blocks = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
-		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
-    /* Size in samples */
-    compptr->downsampled_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
-		    (long) cinfo->max_h_samp_factor);
-    compptr->downsampled_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
-		    (long) cinfo->max_v_samp_factor);
-    /* Mark component needed (this flag isn't actually used for compression) */
-    compptr->component_needed = TRUE;
-  }
-
-  /* Compute number of fully interleaved MCU rows (number of times that
-   * main controller will call coefficient controller).
-   */
-  cinfo->total_iMCU_rows = (JDIMENSION)
-    jdiv_round_up((long) cinfo->image_height,
-		  (long) (cinfo->max_v_samp_factor*DCTSIZE));
-}
-
-
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-
-LOCAL(void)
-validate_script (j_compress_ptr cinfo)
-/* Verify that the scan script in cinfo->scan_info[] is valid; also
- * determine whether it uses progressive JPEG, and set cinfo->progressive_mode.
- */
-{
-  const jpeg_scan_info * scanptr;
-  int scanno, ncomps, ci, coefi, thisi;
-  int Ss, Se, Ah, Al;
-  wxjpeg_boolean component_sent[MAX_COMPONENTS];
-#ifdef C_PROGRESSIVE_SUPPORTED
-  int * last_bitpos_ptr;
-  int last_bitpos[MAX_COMPONENTS][DCTSIZE2];
-  /* -1 until that coefficient has been seen; then last Al for it */
-#endif
-
-  if (cinfo->num_scans <= 0)
-    ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, 0);
-
-  /* For sequential JPEG, all scans must have Ss=0, Se=DCTSIZE2-1;
-   * for progressive JPEG, no scan can have this.
-   */
-  scanptr = cinfo->scan_info;
-  if (scanptr->Ss != 0 || scanptr->Se != DCTSIZE2-1) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-    cinfo->progressive_mode = TRUE;
-    last_bitpos_ptr = & last_bitpos[0][0];
-    for (ci = 0; ci < cinfo->num_components; ci++) 
-      for (coefi = 0; coefi < DCTSIZE2; coefi++)
-	*last_bitpos_ptr++ = -1;
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    cinfo->progressive_mode = FALSE;
-    for (ci = 0; ci < cinfo->num_components; ci++) 
-      component_sent[ci] = FALSE;
-  }
-
-  for (scanno = 1; scanno <= cinfo->num_scans; scanptr++, scanno++) {
-    /* Validate component indexes */
-    ncomps = scanptr->comps_in_scan;
-    if (ncomps <= 0 || ncomps > MAX_COMPS_IN_SCAN)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, ncomps, MAX_COMPS_IN_SCAN);
-    for (ci = 0; ci < ncomps; ci++) {
-      thisi = scanptr->component_index[ci];
-      if (thisi < 0 || thisi >= cinfo->num_components)
-	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
-      /* Components must appear in SOF order within each scan */
-      if (ci > 0 && thisi <= scanptr->component_index[ci-1])
-	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
-    }
-    /* Validate progression parameters */
-    Ss = scanptr->Ss;
-    Se = scanptr->Se;
-    Ah = scanptr->Ah;
-    Al = scanptr->Al;
-    if (cinfo->progressive_mode) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-      /* The JPEG spec simply gives the ranges 0..13 for Ah and Al, but that
-       * seems wrong: the upper bound ought to depend on data precision.
-       * Perhaps they really meant 0..N+1 for N-bit precision.
-       * Here we allow 0..10 for 8-bit data; Al larger than 10 results in
-       * out-of-range reconstructed DC values during the first DC scan,
-       * which might cause problems for some decoders.
-       */
-#if BITS_IN_JSAMPLE == 8
-#define MAX_AH_AL 10
-#else
-#define MAX_AH_AL 13
-#endif
-      if (Ss < 0 || Ss >= DCTSIZE2 || Se < Ss || Se >= DCTSIZE2 ||
-	  Ah < 0 || Ah > MAX_AH_AL || Al < 0 || Al > MAX_AH_AL)
-	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-      if (Ss == 0) {
-	if (Se != 0)		/* DC and AC together not OK */
-	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-      } else {
-	if (ncomps != 1)	/* AC scans must be for only one component */
-	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-      }
-      for (ci = 0; ci < ncomps; ci++) {
-	last_bitpos_ptr = & last_bitpos[scanptr->component_index[ci]][0];
-	if (Ss != 0 && last_bitpos_ptr[0] < 0) /* AC without prior DC scan */
-	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-	for (coefi = Ss; coefi <= Se; coefi++) {
-	  if (last_bitpos_ptr[coefi] < 0) {
-	    /* first scan of this coefficient */
-	    if (Ah != 0)
-	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-	  } else {
-	    /* not first scan */
-	    if (Ah != last_bitpos_ptr[coefi] || Al != Ah-1)
-	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-	  }
-	  last_bitpos_ptr[coefi] = Al;
-	}
-      }
-#endif
-    } else {
-      /* For sequential JPEG, all progression parameters must be these: */
-      if (Ss != 0 || Se != DCTSIZE2-1 || Ah != 0 || Al != 0)
-	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-      /* Make sure components are not sent twice */
-      for (ci = 0; ci < ncomps; ci++) {
-	thisi = scanptr->component_index[ci];
-	if (component_sent[thisi])
-	  ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
-	component_sent[thisi] = TRUE;
-      }
-    }
-  }
-
-  /* Now verify that everything got sent. */
-  if (cinfo->progressive_mode) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-    /* For progressive mode, we only check that at least some DC data
-     * got sent for each component; the spec does not require that all bits
-     * of all coefficients be transmitted.  Would it be wiser to enforce
-     * transmission of all coefficient bits??
-     */
-    for (ci = 0; ci < cinfo->num_components; ci++) {
-      if (last_bitpos[ci][0] < 0)
-	ERREXIT(cinfo, JERR_MISSING_DATA);
-    }
-#endif
-  } else {
-    for (ci = 0; ci < cinfo->num_components; ci++) {
-      if (! component_sent[ci])
-	ERREXIT(cinfo, JERR_MISSING_DATA);
-    }
-  }
-}
-
-#endif /* C_MULTISCAN_FILES_SUPPORTED */
-
-
-LOCAL(void)
-select_scan_parameters (j_compress_ptr cinfo)
-/* Set up the scan parameters for the current scan */
-{
-  int ci;
-
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-  if (cinfo->scan_info != NULL) {
-    /* Prepare for current scan --- the script is already validated */
-    my_master_ptr master = (my_master_ptr) cinfo->master;
-    const jpeg_scan_info * scanptr = cinfo->scan_info + master->scan_number;
-
-    cinfo->comps_in_scan = scanptr->comps_in_scan;
-    for (ci = 0; ci < scanptr->comps_in_scan; ci++) {
-      cinfo->cur_comp_info[ci] =
-	&cinfo->comp_info[scanptr->component_index[ci]];
-    }
-    cinfo->Ss = scanptr->Ss;
-    cinfo->Se = scanptr->Se;
-    cinfo->Ah = scanptr->Ah;
-    cinfo->Al = scanptr->Al;
-  }
-  else
-#endif
-  {
-    /* Prepare for single sequential-JPEG scan containing all components */
-    if (cinfo->num_components > MAX_COMPS_IN_SCAN)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
-	       MAX_COMPS_IN_SCAN);
-    cinfo->comps_in_scan = cinfo->num_components;
-    for (ci = 0; ci < cinfo->num_components; ci++) {
-      cinfo->cur_comp_info[ci] = &cinfo->comp_info[ci];
-    }
-    cinfo->Ss = 0;
-    cinfo->Se = DCTSIZE2-1;
-    cinfo->Ah = 0;
-    cinfo->Al = 0;
-  }
-}
-
-
-LOCAL(void)
-per_scan_setup (j_compress_ptr cinfo)
-/* Do computations that are needed before processing a JPEG scan */
-/* cinfo->comps_in_scan and cinfo->cur_comp_info[] are already set */
-{
-  int ci, mcublks, tmp;
-  jpeg_component_info *compptr;
-  
-  if (cinfo->comps_in_scan == 1) {
-    
-    /* Noninterleaved (single-component) scan */
-    compptr = cinfo->cur_comp_info[0];
-    
-    /* Overall image size in MCUs */
-    cinfo->MCUs_per_row = compptr->width_in_blocks;
-    cinfo->MCU_rows_in_scan = compptr->height_in_blocks;
-    
-    /* For noninterleaved scan, always one block per MCU */
-    compptr->MCU_width = 1;
-    compptr->MCU_height = 1;
-    compptr->MCU_blocks = 1;
-    compptr->MCU_sample_width = DCTSIZE;
-    compptr->last_col_width = 1;
-    /* For noninterleaved scans, it is convenient to define last_row_height
-     * as the number of block rows present in the last iMCU row.
-     */
-    tmp = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-    if (tmp == 0) tmp = compptr->v_samp_factor;
-    compptr->last_row_height = tmp;
-    
-    /* Prepare array describing MCU composition */
-    cinfo->blocks_in_MCU = 1;
-    cinfo->MCU_membership[0] = 0;
-    
-  } else {
-    
-    /* Interleaved (multi-component) scan */
-    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,
-	       MAX_COMPS_IN_SCAN);
-    
-    /* Overall image size in MCUs */
-    cinfo->MCUs_per_row = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width,
-		    (long) (cinfo->max_h_samp_factor*DCTSIZE));
-    cinfo->MCU_rows_in_scan = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height,
-		    (long) (cinfo->max_v_samp_factor*DCTSIZE));
-    
-    cinfo->blocks_in_MCU = 0;
-    
-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-      compptr = cinfo->cur_comp_info[ci];
-      /* Sampling factors give # of blocks of component in each MCU */
-      compptr->MCU_width = compptr->h_samp_factor;
-      compptr->MCU_height = compptr->v_samp_factor;
-      compptr->MCU_blocks = compptr->MCU_width * compptr->MCU_height;
-      compptr->MCU_sample_width = compptr->MCU_width * DCTSIZE;
-      /* Figure number of non-dummy blocks in last MCU column & row */
-      tmp = (int) (compptr->width_in_blocks % compptr->MCU_width);
-      if (tmp == 0) tmp = compptr->MCU_width;
-      compptr->last_col_width = tmp;
-      tmp = (int) (compptr->height_in_blocks % compptr->MCU_height);
-      if (tmp == 0) tmp = compptr->MCU_height;
-      compptr->last_row_height = tmp;
-      /* Prepare array describing MCU composition */
-      mcublks = compptr->MCU_blocks;
-      if (cinfo->blocks_in_MCU + mcublks > C_MAX_BLOCKS_IN_MCU)
-	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);
-      while (mcublks-- > 0) {
-	cinfo->MCU_membership[cinfo->blocks_in_MCU++] = ci;
-      }
-    }
-    
-  }
-
-  /* Convert restart specified in rows to actual MCU count. */
-  /* Note that count must fit in 16 bits, so we provide limiting. */
-  if (cinfo->restart_in_rows > 0) {
-    long nominal = (long) cinfo->restart_in_rows * (long) cinfo->MCUs_per_row;
-    cinfo->restart_interval = (unsigned int) MIN(nominal, 65535L);
-  }
-}
-
-
-/*
- * Per-pass setup.
- * This is called at the beginning of each pass.  We determine which modules
- * will be active during this pass and give them appropriate start_pass calls.
- * We also set is_last_pass to indicate whether any more passes will be
- * required.
- */
-
-METHODDEF(void)
-prepare_for_pass (j_compress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  switch (master->pass_type) {
-  case main_pass:
-    /* Initial pass: will collect input data, and do either Huffman
-     * optimization or data output for the first scan.
-     */
-    select_scan_parameters(cinfo);
-    per_scan_setup(cinfo);
-    if (! cinfo->raw_data_in) {
-      (*cinfo->cconvert->start_pass) (cinfo);
-      (*cinfo->downsample->start_pass) (cinfo);
-      (*cinfo->prep->start_pass) (cinfo, JBUF_PASS_THRU);
-    }
-    (*cinfo->fdct->start_pass) (cinfo);
-    (*cinfo->entropy->start_pass) (cinfo, cinfo->optimize_coding);
-    (*cinfo->coef->start_pass) (cinfo,
-				(master->total_passes > 1 ?
-				 JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));
-    (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);
-    if (cinfo->optimize_coding) {
-      /* No immediate data output; postpone writing frame/scan headers */
-      master->pub.call_pass_startup = FALSE;
-    } else {
-      /* Will write frame/scan headers at first jpeg_write_scanlines call */
-      master->pub.call_pass_startup = TRUE;
-    }
-    break;
-#ifdef ENTROPY_OPT_SUPPORTED
-  case huff_opt_pass:
-    /* Do Huffman optimization for a scan after the first one. */
-    select_scan_parameters(cinfo);
-    per_scan_setup(cinfo);
-    if (cinfo->Ss != 0 || cinfo->Ah == 0 || cinfo->arith_code) {
-      (*cinfo->entropy->start_pass) (cinfo, TRUE);
-      (*cinfo->coef->start_pass) (cinfo, JBUF_CRANK_DEST);
-      master->pub.call_pass_startup = FALSE;
-      break;
-    }
-    /* Special case: Huffman DC refinement scans need no Huffman table
-     * and therefore we can skip the optimization pass for them.
-     */
-    master->pass_type = output_pass;
-    master->pass_number++;
-    /*FALLTHROUGH*/
-#endif
-  case output_pass:
-    /* Do a data-output pass. */
-    /* We need not repeat per-scan setup if prior optimization pass did it. */
-    if (! cinfo->optimize_coding) {
-      select_scan_parameters(cinfo);
-      per_scan_setup(cinfo);
-    }
-    (*cinfo->entropy->start_pass) (cinfo, FALSE);
-    (*cinfo->coef->start_pass) (cinfo, JBUF_CRANK_DEST);
-    /* We emit frame/scan headers now */
-    if (master->scan_number == 0)
-      (*cinfo->marker->write_frame_header) (cinfo);
-    (*cinfo->marker->write_scan_header) (cinfo);
-    master->pub.call_pass_startup = FALSE;
-    break;
-  default:
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-  }
-
-  master->pub.is_last_pass = (master->pass_number == master->total_passes-1);
-
-  /* Set up progress monitor's pass info if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->completed_passes = master->pass_number;
-    cinfo->progress->total_passes = master->total_passes;
-  }
-}
-
-
-/*
- * Special start-of-pass hook.
- * This is called by jpeg_write_scanlines if call_pass_startup is TRUE.
- * In single-pass processing, we need this hook because we don't want to
- * write frame/scan headers during jpeg_start_compress; we want to let the
- * application write COM markers etc. between jpeg_start_compress and the
- * jpeg_write_scanlines loop.
- * In multi-pass processing, this routine is not used.
- */
-
-METHODDEF(void)
-pass_startup (j_compress_ptr cinfo)
-{
-  cinfo->master->call_pass_startup = FALSE; /* reset flag so call only once */
-
-  (*cinfo->marker->write_frame_header) (cinfo);
-  (*cinfo->marker->write_scan_header) (cinfo);
-}
-
-
-/*
- * Finish up at end of pass.
- */
-
-METHODDEF(void)
-finish_pass_master (j_compress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  /* The entropy coder always needs an end-of-pass call,
-   * either to analyze statistics or to flush its output buffer.
-   */
-  (*cinfo->entropy->finish_pass) (cinfo);
-
-  /* Update state for next pass */
-  switch (master->pass_type) {
-  case main_pass:
-    /* next pass is either output of scan 0 (after optimization)
-     * or output of scan 1 (if no optimization).
-     */
-    master->pass_type = output_pass;
-    if (! cinfo->optimize_coding)
-      master->scan_number++;
-    break;
-  case huff_opt_pass:
-    /* next pass is always output of current scan */
-    master->pass_type = output_pass;
-    break;
-  case output_pass:
-    /* next pass is either optimization or output of next scan */
-    if (cinfo->optimize_coding)
-      master->pass_type = huff_opt_pass;
-    master->scan_number++;
-    break;
-  }
-
-  master->pass_number++;
-}
-
-
-/*
- * Initialize master compression control.
- */
-
-GLOBAL(void)
-jinit_c_master_control (j_compress_ptr cinfo, wxjpeg_boolean transcode_only)
-{
-  my_master_ptr master;
-
-  master = (my_master_ptr)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(my_comp_master));
-  cinfo->master = (struct jpeg_comp_master *) master;
-  master->pub.prepare_for_pass = prepare_for_pass;
-  master->pub.pass_startup = pass_startup;
-  master->pub.finish_pass = finish_pass_master;
-  master->pub.is_last_pass = FALSE;
-
-  /* Validate parameters, determine derived values */
-  initial_setup(cinfo);
-
-  if (cinfo->scan_info != NULL) {
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-    validate_script(cinfo);
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    cinfo->progressive_mode = FALSE;
-    cinfo->num_scans = 1;
-  }
-
-  if (cinfo->progressive_mode)	/*  TEMPORARY HACK ??? */
-    cinfo->optimize_coding = TRUE; /* assume default tables no good for progressive mode */
-
-  /* Initialize my private state */
-  if (transcode_only) {
-    /* no main pass in transcoding */
-    if (cinfo->optimize_coding)
-      master->pass_type = huff_opt_pass;
-    else
-      master->pass_type = output_pass;
-  } else {
-    /* for normal compression, first pass is always this type: */
-    master->pass_type = main_pass;
-  }
-  master->scan_number = 0;
-  master->pass_number = 0;
-  if (cinfo->optimize_coding)
-    master->total_passes = cinfo->num_scans * 2;
-  else
-    master->total_passes = cinfo->num_scans;
-}
+/*
+ * jcmaster.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains master control logic for the JPEG compressor.
+ * These routines are concerned with parameter validation, initial setup,
+ * and inter-pass control (determining the number of passes and the work 
+ * to be done in each pass).
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Private state */
+
+typedef enum {
+	main_pass,		/* input data, also do first output step */
+	huff_opt_pass,		/* Huffman code optimization pass */
+	output_pass		/* data output pass */
+} c_pass_type;
+
+typedef struct {
+  struct jpeg_comp_master pub;	/* public fields */
+
+  c_pass_type pass_type;	/* the type of the current pass */
+
+  int pass_number;		/* # of passes completed */
+  int total_passes;		/* total # of passes needed */
+
+  int scan_number;		/* current index in scan_info[] */
+} my_comp_master;
+
+typedef my_comp_master * my_master_ptr;
+
+
+/*
+ * Support routines that do various essential calculations.
+ */
+
+LOCAL(void)
+initial_setup (j_compress_ptr cinfo)
+/* Do computations that are needed before master selection phase */
+{
+  int ci;
+  jpeg_component_info *compptr;
+  long samplesperrow;
+  JDIMENSION jd_samplesperrow;
+
+  /* Sanity check on image dimensions */
+  if (cinfo->image_height <= 0 || cinfo->image_width <= 0
+      || cinfo->num_components <= 0 || cinfo->input_components <= 0)
+    ERREXIT(cinfo, JERR_EMPTY_IMAGE);
+
+  /* Make sure image isn't bigger than I can handle */
+  if ((long) cinfo->image_height > (long) JPEG_MAX_DIMENSION ||
+      (long) cinfo->image_width > (long) JPEG_MAX_DIMENSION)
+    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);
+
+  /* Width of an input scanline must be representable as JDIMENSION. */
+  samplesperrow = (long) cinfo->image_width * (long) cinfo->input_components;
+  jd_samplesperrow = (JDIMENSION) samplesperrow;
+  if ((long) jd_samplesperrow != samplesperrow)
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+
+  /* For now, precision must match compiled-in value... */
+  if (cinfo->data_precision != BITS_IN_JSAMPLE)
+    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
+
+  /* Check that number of components won't exceed internal array sizes */
+  if (cinfo->num_components > MAX_COMPONENTS)
+    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
+	     MAX_COMPONENTS);
+
+  /* Compute maximum sampling factors; check factor validity */
+  cinfo->max_h_samp_factor = 1;
+  cinfo->max_v_samp_factor = 1;
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||
+	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)
+      ERREXIT(cinfo, JERR_BAD_SAMPLING);
+    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,
+				   compptr->h_samp_factor);
+    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,
+				   compptr->v_samp_factor);
+  }
+
+  /* Compute dimensions of components */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Fill in the correct component_index value; don't rely on application */
+    compptr->component_index = ci;
+    /* For compression, we never do DCT scaling. */
+    compptr->DCT_scaled_size = DCTSIZE;
+    /* Size in DCT blocks */
+    compptr->width_in_blocks = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
+		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
+    compptr->height_in_blocks = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
+		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
+    /* Size in samples */
+    compptr->downsampled_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
+		    (long) cinfo->max_h_samp_factor);
+    compptr->downsampled_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
+		    (long) cinfo->max_v_samp_factor);
+    /* Mark component needed (this flag isn't actually used for compression) */
+    compptr->component_needed = TRUE;
+  }
+
+  /* Compute number of fully interleaved MCU rows (number of times that
+   * main controller will call coefficient controller).
+   */
+  cinfo->total_iMCU_rows = (JDIMENSION)
+    jdiv_round_up((long) cinfo->image_height,
+		  (long) (cinfo->max_v_samp_factor*DCTSIZE));
+}
+
+
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+
+LOCAL(void)
+validate_script (j_compress_ptr cinfo)
+/* Verify that the scan script in cinfo->scan_info[] is valid; also
+ * determine whether it uses progressive JPEG, and set cinfo->progressive_mode.
+ */
+{
+  const jpeg_scan_info * scanptr;
+  int scanno, ncomps, ci, coefi, thisi;
+  int Ss, Se, Ah, Al;
+  wxjpeg_boolean component_sent[MAX_COMPONENTS];
+#ifdef C_PROGRESSIVE_SUPPORTED
+  int * last_bitpos_ptr;
+  int last_bitpos[MAX_COMPONENTS][DCTSIZE2];
+  /* -1 until that coefficient has been seen; then last Al for it */
+#endif
+
+  if (cinfo->num_scans <= 0)
+    ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, 0);
+
+  /* For sequential JPEG, all scans must have Ss=0, Se=DCTSIZE2-1;
+   * for progressive JPEG, no scan can have this.
+   */
+  scanptr = cinfo->scan_info;
+  if (scanptr->Ss != 0 || scanptr->Se != DCTSIZE2-1) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+    cinfo->progressive_mode = TRUE;
+    last_bitpos_ptr = & last_bitpos[0][0];
+    for (ci = 0; ci < cinfo->num_components; ci++) 
+      for (coefi = 0; coefi < DCTSIZE2; coefi++)
+	*last_bitpos_ptr++ = -1;
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    cinfo->progressive_mode = FALSE;
+    for (ci = 0; ci < cinfo->num_components; ci++) 
+      component_sent[ci] = FALSE;
+  }
+
+  for (scanno = 1; scanno <= cinfo->num_scans; scanptr++, scanno++) {
+    /* Validate component indexes */
+    ncomps = scanptr->comps_in_scan;
+    if (ncomps <= 0 || ncomps > MAX_COMPS_IN_SCAN)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, ncomps, MAX_COMPS_IN_SCAN);
+    for (ci = 0; ci < ncomps; ci++) {
+      thisi = scanptr->component_index[ci];
+      if (thisi < 0 || thisi >= cinfo->num_components)
+	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
+      /* Components must appear in SOF order within each scan */
+      if (ci > 0 && thisi <= scanptr->component_index[ci-1])
+	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
+    }
+    /* Validate progression parameters */
+    Ss = scanptr->Ss;
+    Se = scanptr->Se;
+    Ah = scanptr->Ah;
+    Al = scanptr->Al;
+    if (cinfo->progressive_mode) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+      /* The JPEG spec simply gives the ranges 0..13 for Ah and Al, but that
+       * seems wrong: the upper bound ought to depend on data precision.
+       * Perhaps they really meant 0..N+1 for N-bit precision.
+       * Here we allow 0..10 for 8-bit data; Al larger than 10 results in
+       * out-of-range reconstructed DC values during the first DC scan,
+       * which might cause problems for some decoders.
+       */
+#if BITS_IN_JSAMPLE == 8
+#define MAX_AH_AL 10
+#else
+#define MAX_AH_AL 13
+#endif
+      if (Ss < 0 || Ss >= DCTSIZE2 || Se < Ss || Se >= DCTSIZE2 ||
+	  Ah < 0 || Ah > MAX_AH_AL || Al < 0 || Al > MAX_AH_AL)
+	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+      if (Ss == 0) {
+	if (Se != 0)		/* DC and AC together not OK */
+	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+      } else {
+	if (ncomps != 1)	/* AC scans must be for only one component */
+	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+      }
+      for (ci = 0; ci < ncomps; ci++) {
+	last_bitpos_ptr = & last_bitpos[scanptr->component_index[ci]][0];
+	if (Ss != 0 && last_bitpos_ptr[0] < 0) /* AC without prior DC scan */
+	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+	for (coefi = Ss; coefi <= Se; coefi++) {
+	  if (last_bitpos_ptr[coefi] < 0) {
+	    /* first scan of this coefficient */
+	    if (Ah != 0)
+	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+	  } else {
+	    /* not first scan */
+	    if (Ah != last_bitpos_ptr[coefi] || Al != Ah-1)
+	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+	  }
+	  last_bitpos_ptr[coefi] = Al;
+	}
+      }
+#endif
+    } else {
+      /* For sequential JPEG, all progression parameters must be these: */
+      if (Ss != 0 || Se != DCTSIZE2-1 || Ah != 0 || Al != 0)
+	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
+      /* Make sure components are not sent twice */
+      for (ci = 0; ci < ncomps; ci++) {
+	thisi = scanptr->component_index[ci];
+	if (component_sent[thisi])
+	  ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
+	component_sent[thisi] = TRUE;
+      }
+    }
+  }
+
+  /* Now verify that everything got sent. */
+  if (cinfo->progressive_mode) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+    /* For progressive mode, we only check that at least some DC data
+     * got sent for each component; the spec does not require that all bits
+     * of all coefficients be transmitted.  Would it be wiser to enforce
+     * transmission of all coefficient bits??
+     */
+    for (ci = 0; ci < cinfo->num_components; ci++) {
+      if (last_bitpos[ci][0] < 0)
+	ERREXIT(cinfo, JERR_MISSING_DATA);
+    }
+#endif
+  } else {
+    for (ci = 0; ci < cinfo->num_components; ci++) {
+      if (! component_sent[ci])
+	ERREXIT(cinfo, JERR_MISSING_DATA);
+    }
+  }
+}
+
+#endif /* C_MULTISCAN_FILES_SUPPORTED */
+
+
+LOCAL(void)
+select_scan_parameters (j_compress_ptr cinfo)
+/* Set up the scan parameters for the current scan */
+{
+  int ci;
+
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+  if (cinfo->scan_info != NULL) {
+    /* Prepare for current scan --- the script is already validated */
+    my_master_ptr master = (my_master_ptr) cinfo->master;
+    const jpeg_scan_info * scanptr = cinfo->scan_info + master->scan_number;
+
+    cinfo->comps_in_scan = scanptr->comps_in_scan;
+    for (ci = 0; ci < scanptr->comps_in_scan; ci++) {
+      cinfo->cur_comp_info[ci] =
+	&cinfo->comp_info[scanptr->component_index[ci]];
+    }
+    cinfo->Ss = scanptr->Ss;
+    cinfo->Se = scanptr->Se;
+    cinfo->Ah = scanptr->Ah;
+    cinfo->Al = scanptr->Al;
+  }
+  else
+#endif
+  {
+    /* Prepare for single sequential-JPEG scan containing all components */
+    if (cinfo->num_components > MAX_COMPS_IN_SCAN)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
+	       MAX_COMPS_IN_SCAN);
+    cinfo->comps_in_scan = cinfo->num_components;
+    for (ci = 0; ci < cinfo->num_components; ci++) {
+      cinfo->cur_comp_info[ci] = &cinfo->comp_info[ci];
+    }
+    cinfo->Ss = 0;
+    cinfo->Se = DCTSIZE2-1;
+    cinfo->Ah = 0;
+    cinfo->Al = 0;
+  }
+}
+
+
+LOCAL(void)
+per_scan_setup (j_compress_ptr cinfo)
+/* Do computations that are needed before processing a JPEG scan */
+/* cinfo->comps_in_scan and cinfo->cur_comp_info[] are already set */
+{
+  int ci, mcublks, tmp;
+  jpeg_component_info *compptr;
+  
+  if (cinfo->comps_in_scan == 1) {
+    
+    /* Noninterleaved (single-component) scan */
+    compptr = cinfo->cur_comp_info[0];
+    
+    /* Overall image size in MCUs */
+    cinfo->MCUs_per_row = compptr->width_in_blocks;
+    cinfo->MCU_rows_in_scan = compptr->height_in_blocks;
+    
+    /* For noninterleaved scan, always one block per MCU */
+    compptr->MCU_width = 1;
+    compptr->MCU_height = 1;
+    compptr->MCU_blocks = 1;
+    compptr->MCU_sample_width = DCTSIZE;
+    compptr->last_col_width = 1;
+    /* For noninterleaved scans, it is convenient to define last_row_height
+     * as the number of block rows present in the last iMCU row.
+     */
+    tmp = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
+    if (tmp == 0) tmp = compptr->v_samp_factor;
+    compptr->last_row_height = tmp;
+    
+    /* Prepare array describing MCU composition */
+    cinfo->blocks_in_MCU = 1;
+    cinfo->MCU_membership[0] = 0;
+    
+  } else {
+    
+    /* Interleaved (multi-component) scan */
+    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,
+	       MAX_COMPS_IN_SCAN);
+    
+    /* Overall image size in MCUs */
+    cinfo->MCUs_per_row = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width,
+		    (long) (cinfo->max_h_samp_factor*DCTSIZE));
+    cinfo->MCU_rows_in_scan = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height,
+		    (long) (cinfo->max_v_samp_factor*DCTSIZE));
+    
+    cinfo->blocks_in_MCU = 0;
+    
+    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+      compptr = cinfo->cur_comp_info[ci];
+      /* Sampling factors give # of blocks of component in each MCU */
+      compptr->MCU_width = compptr->h_samp_factor;
+      compptr->MCU_height = compptr->v_samp_factor;
+      compptr->MCU_blocks = compptr->MCU_width * compptr->MCU_height;
+      compptr->MCU_sample_width = compptr->MCU_width * DCTSIZE;
+      /* Figure number of non-dummy blocks in last MCU column & row */
+      tmp = (int) (compptr->width_in_blocks % compptr->MCU_width);
+      if (tmp == 0) tmp = compptr->MCU_width;
+      compptr->last_col_width = tmp;
+      tmp = (int) (compptr->height_in_blocks % compptr->MCU_height);
+      if (tmp == 0) tmp = compptr->MCU_height;
+      compptr->last_row_height = tmp;
+      /* Prepare array describing MCU composition */
+      mcublks = compptr->MCU_blocks;
+      if (cinfo->blocks_in_MCU + mcublks > C_MAX_BLOCKS_IN_MCU)
+	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);
+      while (mcublks-- > 0) {
+	cinfo->MCU_membership[cinfo->blocks_in_MCU++] = ci;
+      }
+    }
+    
+  }
+
+  /* Convert restart specified in rows to actual MCU count. */
+  /* Note that count must fit in 16 bits, so we provide limiting. */
+  if (cinfo->restart_in_rows > 0) {
+    long nominal = (long) cinfo->restart_in_rows * (long) cinfo->MCUs_per_row;
+    cinfo->restart_interval = (unsigned int) MIN(nominal, 65535L);
+  }
+}
+
+
+/*
+ * Per-pass setup.
+ * This is called at the beginning of each pass.  We determine which modules
+ * will be active during this pass and give them appropriate start_pass calls.
+ * We also set is_last_pass to indicate whether any more passes will be
+ * required.
+ */
+
+METHODDEF(void)
+prepare_for_pass (j_compress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  switch (master->pass_type) {
+  case main_pass:
+    /* Initial pass: will collect input data, and do either Huffman
+     * optimization or data output for the first scan.
+     */
+    select_scan_parameters(cinfo);
+    per_scan_setup(cinfo);
+    if (! cinfo->raw_data_in) {
+      (*cinfo->cconvert->start_pass) (cinfo);
+      (*cinfo->downsample->start_pass) (cinfo);
+      (*cinfo->prep->start_pass) (cinfo, JBUF_PASS_THRU);
+    }
+    (*cinfo->fdct->start_pass) (cinfo);
+    (*cinfo->entropy->start_pass) (cinfo, cinfo->optimize_coding);
+    (*cinfo->coef->start_pass) (cinfo,
+				(master->total_passes > 1 ?
+				 JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));
+    (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);
+    if (cinfo->optimize_coding) {
+      /* No immediate data output; postpone writing frame/scan headers */
+      master->pub.call_pass_startup = FALSE;
+    } else {
+      /* Will write frame/scan headers at first jpeg_write_scanlines call */
+      master->pub.call_pass_startup = TRUE;
+    }
+    break;
+#ifdef ENTROPY_OPT_SUPPORTED
+  case huff_opt_pass:
+    /* Do Huffman optimization for a scan after the first one. */
+    select_scan_parameters(cinfo);
+    per_scan_setup(cinfo);
+    if (cinfo->Ss != 0 || cinfo->Ah == 0 || cinfo->arith_code) {
+      (*cinfo->entropy->start_pass) (cinfo, TRUE);
+      (*cinfo->coef->start_pass) (cinfo, JBUF_CRANK_DEST);
+      master->pub.call_pass_startup = FALSE;
+      break;
+    }
+    /* Special case: Huffman DC refinement scans need no Huffman table
+     * and therefore we can skip the optimization pass for them.
+     */
+    master->pass_type = output_pass;
+    master->pass_number++;
+    /*FALLTHROUGH*/
+#endif
+  case output_pass:
+    /* Do a data-output pass. */
+    /* We need not repeat per-scan setup if prior optimization pass did it. */
+    if (! cinfo->optimize_coding) {
+      select_scan_parameters(cinfo);
+      per_scan_setup(cinfo);
+    }
+    (*cinfo->entropy->start_pass) (cinfo, FALSE);
+    (*cinfo->coef->start_pass) (cinfo, JBUF_CRANK_DEST);
+    /* We emit frame/scan headers now */
+    if (master->scan_number == 0)
+      (*cinfo->marker->write_frame_header) (cinfo);
+    (*cinfo->marker->write_scan_header) (cinfo);
+    master->pub.call_pass_startup = FALSE;
+    break;
+  default:
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+  }
+
+  master->pub.is_last_pass = (master->pass_number == master->total_passes-1);
+
+  /* Set up progress monitor's pass info if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->completed_passes = master->pass_number;
+    cinfo->progress->total_passes = master->total_passes;
+  }
+}
+
+
+/*
+ * Special start-of-pass hook.
+ * This is called by jpeg_write_scanlines if call_pass_startup is TRUE.
+ * In single-pass processing, we need this hook because we don't want to
+ * write frame/scan headers during jpeg_start_compress; we want to let the
+ * application write COM markers etc. between jpeg_start_compress and the
+ * jpeg_write_scanlines loop.
+ * In multi-pass processing, this routine is not used.
+ */
+
+METHODDEF(void)
+pass_startup (j_compress_ptr cinfo)
+{
+  cinfo->master->call_pass_startup = FALSE; /* reset flag so call only once */
+
+  (*cinfo->marker->write_frame_header) (cinfo);
+  (*cinfo->marker->write_scan_header) (cinfo);
+}
+
+
+/*
+ * Finish up at end of pass.
+ */
+
+METHODDEF(void)
+finish_pass_master (j_compress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  /* The entropy coder always needs an end-of-pass call,
+   * either to analyze statistics or to flush its output buffer.
+   */
+  (*cinfo->entropy->finish_pass) (cinfo);
+
+  /* Update state for next pass */
+  switch (master->pass_type) {
+  case main_pass:
+    /* next pass is either output of scan 0 (after optimization)
+     * or output of scan 1 (if no optimization).
+     */
+    master->pass_type = output_pass;
+    if (! cinfo->optimize_coding)
+      master->scan_number++;
+    break;
+  case huff_opt_pass:
+    /* next pass is always output of current scan */
+    master->pass_type = output_pass;
+    break;
+  case output_pass:
+    /* next pass is either optimization or output of next scan */
+    if (cinfo->optimize_coding)
+      master->pass_type = huff_opt_pass;
+    master->scan_number++;
+    break;
+  }
+
+  master->pass_number++;
+}
+
+
+/*
+ * Initialize master compression control.
+ */
+
+GLOBAL(void)
+jinit_c_master_control (j_compress_ptr cinfo, wxjpeg_boolean transcode_only)
+{
+  my_master_ptr master;
+
+  master = (my_master_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(my_comp_master));
+  cinfo->master = (struct jpeg_comp_master *) master;
+  master->pub.prepare_for_pass = prepare_for_pass;
+  master->pub.pass_startup = pass_startup;
+  master->pub.finish_pass = finish_pass_master;
+  master->pub.is_last_pass = FALSE;
+
+  /* Validate parameters, determine derived values */
+  initial_setup(cinfo);
+
+  if (cinfo->scan_info != NULL) {
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+    validate_script(cinfo);
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    cinfo->progressive_mode = FALSE;
+    cinfo->num_scans = 1;
+  }
+
+  if (cinfo->progressive_mode)	/*  TEMPORARY HACK ??? */
+    cinfo->optimize_coding = TRUE; /* assume default tables no good for progressive mode */
+
+  /* Initialize my private state */
+  if (transcode_only) {
+    /* no main pass in transcoding */
+    if (cinfo->optimize_coding)
+      master->pass_type = huff_opt_pass;
+    else
+      master->pass_type = output_pass;
+  } else {
+    /* for normal compression, first pass is always this type: */
+    master->pass_type = main_pass;
+  }
+  master->scan_number = 0;
+  master->pass_number = 0;
+  if (cinfo->optimize_coding)
+    master->total_passes = cinfo->num_scans * 2;
+  else
+    master->total_passes = cinfo->num_scans;
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jcomapi.c b/Source/3rd Party/wx/src/jpeg/jcomapi.c
index 1b1a340c1..9b1fa7568 100644
--- a/Source/3rd Party/wx/src/jpeg/jcomapi.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcomapi.c	
@@ -1,106 +1,106 @@
-/*
- * jcomapi.c
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface routines that are used for both
- * compression and decompression.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Abort processing of a JPEG compression or decompression operation,
- * but don't destroy the object itself.
- *
- * For this, we merely clean up all the nonpermanent memory pools.
- * Note that temp files (virtual arrays) are not allowed to belong to
- * the permanent pool, so we will be able to close all temp files here.
- * Closing a data source or destination, if necessary, is the application's
- * responsibility.
- */
-
-GLOBAL(void)
-jpeg_abort (j_common_ptr cinfo)
-{
-  int pool;
-
-  /* Do nothing if called on a not-initialized or destroyed JPEG object. */
-  if (cinfo->mem == NULL)
-    return;
-
-  /* Releasing pools in reverse order might help avoid fragmentation
-   * with some (brain-damaged) malloc libraries.
-   */
-  for (pool = JPOOL_NUMPOOLS-1; pool > JPOOL_PERMANENT; pool--) {
-    (*cinfo->mem->free_pool) (cinfo, pool);
-  }
-
-  /* Reset overall state for possible reuse of object */
-  if (cinfo->is_decompressor) {
-    cinfo->global_state = DSTATE_START;
-    /* Try to keep application from accessing now-deleted marker list.
-     * A bit kludgy to do it here, but this is the most central place.
-     */
-    ((j_decompress_ptr) cinfo)->marker_list = NULL;
-  } else {
-    cinfo->global_state = CSTATE_START;
-  }
-}
-
-
-/*
- * Destruction of a JPEG object.
- *
- * Everything gets deallocated except the master jpeg_compress_struct itself
- * and the error manager struct.  Both of these are supplied by the application
- * and must be freed, if necessary, by the application.  (Often they are on
- * the stack and so don't need to be freed anyway.)
- * Closing a data source or destination, if necessary, is the application's
- * responsibility.
- */
-
-GLOBAL(void)
-jpeg_destroy (j_common_ptr cinfo)
-{
-  /* We need only tell the memory manager to release everything. */
-  /* NB: mem pointer is NULL if memory mgr failed to initialize. */
-  if (cinfo->mem != NULL)
-    (*cinfo->mem->self_destruct) (cinfo);
-  cinfo->mem = NULL;		/* be safe if jpeg_destroy is called twice */
-  cinfo->global_state = 0;	/* mark it destroyed */
-}
-
-
-/*
- * Convenience routines for allocating quantization and Huffman tables.
- * (Would jutils.c be a more reasonable place to put these?)
- */
-
-GLOBAL(JQUANT_TBL *)
-jpeg_alloc_quant_table (j_common_ptr cinfo)
-{
-  JQUANT_TBL *tbl;
-
-  tbl = (JQUANT_TBL *)
-    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JQUANT_TBL));
-  tbl->sent_table = FALSE;	/* make sure this is false in any new table */
-  return tbl;
-}
-
-
-GLOBAL(JHUFF_TBL *)
-jpeg_alloc_huff_table (j_common_ptr cinfo)
-{
-  JHUFF_TBL *tbl;
-
-  tbl = (JHUFF_TBL *)
-    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JHUFF_TBL));
-  tbl->sent_table = FALSE;	/* make sure this is false in any new table */
-  return tbl;
-}
+/*
+ * jcomapi.c
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface routines that are used for both
+ * compression and decompression.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Abort processing of a JPEG compression or decompression operation,
+ * but don't destroy the object itself.
+ *
+ * For this, we merely clean up all the nonpermanent memory pools.
+ * Note that temp files (virtual arrays) are not allowed to belong to
+ * the permanent pool, so we will be able to close all temp files here.
+ * Closing a data source or destination, if necessary, is the application's
+ * responsibility.
+ */
+
+GLOBAL(void)
+jpeg_abort (j_common_ptr cinfo)
+{
+  int pool;
+
+  /* Do nothing if called on a not-initialized or destroyed JPEG object. */
+  if (cinfo->mem == NULL)
+    return;
+
+  /* Releasing pools in reverse order might help avoid fragmentation
+   * with some (brain-damaged) malloc libraries.
+   */
+  for (pool = JPOOL_NUMPOOLS-1; pool > JPOOL_PERMANENT; pool--) {
+    (*cinfo->mem->free_pool) (cinfo, pool);
+  }
+
+  /* Reset overall state for possible reuse of object */
+  if (cinfo->is_decompressor) {
+    cinfo->global_state = DSTATE_START;
+    /* Try to keep application from accessing now-deleted marker list.
+     * A bit kludgy to do it here, but this is the most central place.
+     */
+    ((j_decompress_ptr) cinfo)->marker_list = NULL;
+  } else {
+    cinfo->global_state = CSTATE_START;
+  }
+}
+
+
+/*
+ * Destruction of a JPEG object.
+ *
+ * Everything gets deallocated except the master jpeg_compress_struct itself
+ * and the error manager struct.  Both of these are supplied by the application
+ * and must be freed, if necessary, by the application.  (Often they are on
+ * the stack and so don't need to be freed anyway.)
+ * Closing a data source or destination, if necessary, is the application's
+ * responsibility.
+ */
+
+GLOBAL(void)
+jpeg_destroy (j_common_ptr cinfo)
+{
+  /* We need only tell the memory manager to release everything. */
+  /* NB: mem pointer is NULL if memory mgr failed to initialize. */
+  if (cinfo->mem != NULL)
+    (*cinfo->mem->self_destruct) (cinfo);
+  cinfo->mem = NULL;		/* be safe if jpeg_destroy is called twice */
+  cinfo->global_state = 0;	/* mark it destroyed */
+}
+
+
+/*
+ * Convenience routines for allocating quantization and Huffman tables.
+ * (Would jutils.c be a more reasonable place to put these?)
+ */
+
+GLOBAL(JQUANT_TBL *)
+jpeg_alloc_quant_table (j_common_ptr cinfo)
+{
+  JQUANT_TBL *tbl;
+
+  tbl = (JQUANT_TBL *)
+    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JQUANT_TBL));
+  tbl->sent_table = FALSE;	/* make sure this is false in any new table */
+  return tbl;
+}
+
+
+GLOBAL(JHUFF_TBL *)
+jpeg_alloc_huff_table (j_common_ptr cinfo)
+{
+  JHUFF_TBL *tbl;
+
+  tbl = (JHUFF_TBL *)
+    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JHUFF_TBL));
+  tbl->sent_table = FALSE;	/* make sure this is false in any new table */
+  return tbl;
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jconfig.h b/Source/3rd Party/wx/src/jpeg/jconfig.h
index 27c978cd3..254d9264d 100644
--- a/Source/3rd Party/wx/src/jpeg/jconfig.h	
+++ b/Source/3rd Party/wx/src/jpeg/jconfig.h	
@@ -1,81 +1,109 @@
-#if defined(_WIN32) || defined(__OS2__)
-#include "jconfig.vc"
-#else
-
-/* jconfig.h.  Generated automatically by configure.  */
-/* jconfig.cfg --- source file edited by configure script */
-/* see jconfig.doc for explanations */
-
-/* use wxWidgets' configure */
-#include "wx/setup.h"
-
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-#undef void
-#undef const
-
-/* use wxWidgets' configure */
-/* #undef CHAR_IS_UNSIGNED */
-#ifdef __CHAR_UNSIGNED__
-  #ifndef CHAR_IS_UNSIGNED
-    #define CHAR_IS_UNSIGNED
-  #endif
-#else
-  #undef CHAR_IS_UNSIGNED
-#endif
-
-#ifndef HAVE_STDDEF_H
-#define HAVE_STDDEF_H
-#endif
-
-#ifndef HAVE_STDLIB_H
-#define HAVE_STDLIB_H
-#endif
-
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS
-#undef NEED_SHORT_EXTERNAL_NAMES
-/* Define this if you get warnings about undefined structures. */
-#undef INCOMPLETE_TYPES_BROKEN
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-
-/* use wxWidgets' configure */
-/* #define INLINE __inline__ */
-#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
-#define INLINE
-#elif defined(__WATCOMC__)
-#define INLINE
-#else
-#define INLINE inline
-#endif
-
-/* These are for configuring the JPEG memory manager. */
-#undef DEFAULT_MAX_MEM
-#undef NO_MKTEMP
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-#undef TWO_FILE_COMMANDLINE
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-
-/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
-#undef PROGRESS_REPORT
-
-#endif /* JPEG_CJPEG_DJPEG */
-#endif
-    /* _MSC_VER */
-
+/* This test added by JACS as a quick fix. What should we do
+ * to make it work with configure?
+ */
+
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__DMC__)
+#include "jconfig.vc"
+#else
+
+/* jconfig.h.  Generated automatically by configure.  */
+/* jconfig.cfg --- source file edited by configure script */
+/* see jconfig.doc for explanations */
+
+/* If using MetroWerks on Mac define __WXMAC__ if it isn't already
+   FIXME: Is this necessary any longer? */
+#ifdef __MWERKS__
+#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
+#   ifndef __WXMAC__
+#       define __WXMAC__
+#   endif
+#endif
+#endif
+
+/* use wxWidgets' configure */
+#include "wx/setup.h"
+
+/* If using Metrowerks and not using configure-generated setup */
+#if defined(__MWERKS__) && !defined(__WX_SETUP_H__)
+#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ )
+
+#   define USE_MAC_MEMMGR
+
+#   ifdef __MACH__
+#       include <ansi_prefix.mach.h>
+#       include <msl_c_version.h>
+#       include <stdint.h>
+#       undef WCHAR_MAX
+#       include <machine/ansi.h>
+#   endif
+
+/* automatically includes MacHeaders */
+#elif (__MWERKS__ >= 0x0900) && __INTEL__
+    #define __WXMSW__
+#endif
+#endif
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+#undef void
+#undef const
+
+/* use wxWidgets' configure */
+/* #undef CHAR_IS_UNSIGNED */
+#ifdef __CHAR_UNSIGNED__
+  #ifndef CHAR_IS_UNSIGNED
+    #define CHAR_IS_UNSIGNED
+  #endif
+#else
+  #undef CHAR_IS_UNSIGNED
+#endif
+
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS
+#undef NEED_SHORT_EXTERNAL_NAMES
+/* Define this if you get warnings about undefined structures. */
+#undef INCOMPLETE_TYPES_BROKEN
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+
+/* use wxWidgets' configure */
+/* #define INLINE __inline__ */
+#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
+#define INLINE
+#elif defined(__WATCOMC__)
+#define INLINE
+#else
+#define INLINE inline
+#endif
+
+/* These are for configuring the JPEG memory manager. */
+#undef DEFAULT_MAX_MEM
+#undef NO_MKTEMP
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED		/* BMP image file format */
+#define GIF_SUPPORTED		/* GIF image file format */
+#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED		/* Utah RLE image file format */
+#define TARGA_SUPPORTED		/* Targa image file format */
+
+#undef TWO_FILE_COMMANDLINE
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+
+/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
+#undef PROGRESS_REPORT
+
+#endif /* JPEG_CJPEG_DJPEG */
+#endif
+    /* _MSC_VER */
+
diff --git a/Source/3rd Party/wx/src/jpeg/jconfig.vc b/Source/3rd Party/wx/src/jpeg/jconfig.vc
index 2f4da14c5..7e291c75b 100644
--- a/Source/3rd Party/wx/src/jpeg/jconfig.vc	
+++ b/Source/3rd Party/wx/src/jpeg/jconfig.vc	
@@ -1,45 +1,45 @@
-/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
-/* see jconfig.doc for explanations */
-
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-/* #define void char */
-/* #define const */
-#undef CHAR_IS_UNSIGNED
-#define HAVE_STDDEF_H
-#define HAVE_STDLIB_H
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */
-#undef NEED_SHORT_EXTERNAL_NAMES
-#undef INCOMPLETE_TYPES_BROKEN
-
-/* Define "boolean" as unsigned char, not int, per Windows custom */
-#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
-typedef unsigned char boolean;
-#endif
-#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
-
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-#define TWO_FILE_COMMANDLINE	/* optional */
-#define USE_SETMODE		/* Microsoft has setmode() */
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-#undef PROGRESS_REPORT		/* optional */
-
-#endif /* JPEG_CJPEG_DJPEG */
+/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
+/* see jconfig.doc for explanations */
+
+#define HAVE_PROTOTYPES
+#define HAVE_UNSIGNED_CHAR
+#define HAVE_UNSIGNED_SHORT
+/* #define void char */
+/* #define const */
+#undef CHAR_IS_UNSIGNED
+#define HAVE_STDDEF_H
+#define HAVE_STDLIB_H
+#undef NEED_BSD_STRINGS
+#undef NEED_SYS_TYPES_H
+#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */
+#undef NEED_SHORT_EXTERNAL_NAMES
+#undef INCOMPLETE_TYPES_BROKEN
+
+/* Define "boolean" as unsigned char, not int, per Windows custom */
+#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
+#endif
+#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
+
+
+#ifdef JPEG_INTERNALS
+
+#undef RIGHT_SHIFT_IS_UNSIGNED
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED		/* BMP image file format */
+#define GIF_SUPPORTED		/* GIF image file format */
+#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
+#undef RLE_SUPPORTED		/* Utah RLE image file format */
+#define TARGA_SUPPORTED		/* Targa image file format */
+
+#define TWO_FILE_COMMANDLINE	/* optional */
+#define USE_SETMODE		/* Microsoft has setmode() */
+#undef NEED_SIGNAL_CATCHER
+#undef DONT_USE_B_MODE
+#undef PROGRESS_REPORT		/* optional */
+
+#endif /* JPEG_CJPEG_DJPEG */
diff --git a/Source/3rd Party/wx/src/jpeg/jcparam.c b/Source/3rd Party/wx/src/jpeg/jcparam.c
index c6fd02ad2..046bd87e0 100644
--- a/Source/3rd Party/wx/src/jpeg/jcparam.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcparam.c	
@@ -1,610 +1,610 @@
-/*
- * jcparam.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains optional default-setting code for the JPEG compressor.
- * Applications do not have to use this file, but those that don't use it
- * must know a lot more about the innards of the JPEG code.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Quantization table setup routines
- */
-
-GLOBAL(void)
-jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl,
-		      const unsigned int *basic_table,
-		      int scale_factor, wxjpeg_boolean force_baseline)
-/* Define a quantization table equal to the basic_table times
- * a scale factor (given as a percentage).
- * If force_baseline is TRUE, the computed quantization table entries
- * are limited to 1..255 for JPEG baseline compatibility.
- */
-{
-  JQUANT_TBL ** qtblptr;
-  int i;
-  long temp;
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  if (which_tbl < 0 || which_tbl >= NUM_QUANT_TBLS)
-    ERREXIT1(cinfo, JERR_DQT_INDEX, which_tbl);
-
-  qtblptr = & cinfo->quant_tbl_ptrs[which_tbl];
-
-  if (*qtblptr == NULL)
-    *qtblptr = jpeg_alloc_quant_table((j_common_ptr) cinfo);
-
-  for (i = 0; i < DCTSIZE2; i++) {
-    temp = ((long) basic_table[i] * scale_factor + 50L) / 100L;
-    /* limit the values to the valid range */
-    if (temp <= 0L) temp = 1L;
-    if (temp > 32767L) temp = 32767L; /* max quantizer needed for 12 bits */
-    if (force_baseline && temp > 255L)
-      temp = 255L;		/* limit to baseline range if requested */
-    (*qtblptr)->quantval[i] = (UINT16) temp;
-  }
-
-  /* Initialize sent_table FALSE so table will be written to JPEG file. */
-  (*qtblptr)->sent_table = FALSE;
-}
-
-
-GLOBAL(void)
-jpeg_set_linear_quality (j_compress_ptr cinfo, int scale_factor,
-			 wxjpeg_boolean force_baseline)
-/* Set or change the 'quality' (quantization) setting, using default tables
- * and a straight percentage-scaling quality scale.  In most cases it's better
- * to use jpeg_set_quality (below); this entry point is provided for
- * applications that insist on a linear percentage scaling.
- */
-{
-  /* These are the sample quantization tables given in JPEG spec section K.1.
-   * The spec says that the values given produce "good" quality, and
-   * when divided by 2, "very good" quality.
-   */
-  static const unsigned int std_luminance_quant_tbl[DCTSIZE2] = {
-    16,  11,  10,  16,  24,  40,  51,  61,
-    12,  12,  14,  19,  26,  58,  60,  55,
-    14,  13,  16,  24,  40,  57,  69,  56,
-    14,  17,  22,  29,  51,  87,  80,  62,
-    18,  22,  37,  56,  68, 109, 103,  77,
-    24,  35,  55,  64,  81, 104, 113,  92,
-    49,  64,  78,  87, 103, 121, 120, 101,
-    72,  92,  95,  98, 112, 100, 103,  99
-  };
-  static const unsigned int std_chrominance_quant_tbl[DCTSIZE2] = {
-    17,  18,  24,  47,  99,  99,  99,  99,
-    18,  21,  26,  66,  99,  99,  99,  99,
-    24,  26,  56,  99,  99,  99,  99,  99,
-    47,  66,  99,  99,  99,  99,  99,  99,
-    99,  99,  99,  99,  99,  99,  99,  99,
-    99,  99,  99,  99,  99,  99,  99,  99,
-    99,  99,  99,  99,  99,  99,  99,  99,
-    99,  99,  99,  99,  99,  99,  99,  99
-  };
-
-  /* Set up two quantization tables using the specified scaling */
-  jpeg_add_quant_table(cinfo, 0, std_luminance_quant_tbl,
-		       scale_factor, force_baseline);
-  jpeg_add_quant_table(cinfo, 1, std_chrominance_quant_tbl,
-		       scale_factor, force_baseline);
-}
-
-
-GLOBAL(int)
-jpeg_quality_scaling (int quality)
-/* Convert a user-specified quality rating to a percentage scaling factor
- * for an underlying quantization table, using our recommended scaling curve.
- * The input 'quality' factor should be 0 (terrible) to 100 (very good).
- */
-{
-  /* Safety limit on quality factor.  Convert 0 to 1 to avoid zero divide. */
-  if (quality <= 0) quality = 1;
-  if (quality > 100) quality = 100;
-
-  /* The basic table is used as-is (scaling 100) for a quality of 50.
-   * Qualities 50..100 are converted to scaling percentage 200 - 2*Q;
-   * note that at Q=100 the scaling is 0, which will cause jpeg_add_quant_table
-   * to make all the table entries 1 (hence, minimum quantization loss).
-   * Qualities 1..50 are converted to scaling percentage 5000/Q.
-   */
-  if (quality < 50)
-    quality = 5000 / quality;
-  else
-    quality = 200 - quality*2;
-
-  return quality;
-}
-
-
-GLOBAL(void)
-jpeg_set_quality (j_compress_ptr cinfo, int quality, wxjpeg_boolean force_baseline)
-/* Set or change the 'quality' (quantization) setting, using default tables.
- * This is the standard quality-adjusting entry point for typical user
- * interfaces; only those who want detailed control over quantization tables
- * would use the preceding three routines directly.
- */
-{
-  /* Convert user 0-100 rating to percentage scaling */
-  quality = jpeg_quality_scaling(quality);
-
-  /* Set up standard quality tables */
-  jpeg_set_linear_quality(cinfo, quality, force_baseline);
-}
-
-
-/*
- * Huffman table setup routines
- */
-
-LOCAL(void)
-add_huff_table (j_compress_ptr cinfo,
-		JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val)
-/* Define a Huffman table */
-{
-  int nsymbols, len;
-
-  if (*htblptr == NULL)
-    *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-
-  /* Copy the number-of-symbols-of-each-code-length counts */
-  MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
-
-  /* Validate the counts.  We do this here mainly so we can copy the right
-   * number of symbols from the val[] array, without risking marching off
-   * the end of memory.  jchuff.c will do a more thorough test later.
-   */
-  nsymbols = 0;
-  for (len = 1; len <= 16; len++)
-    nsymbols += bits[len];
-  if (nsymbols < 1 || nsymbols > 256)
-    ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-
-  MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8));
-
-  /* Initialize sent_table FALSE so table will be written to JPEG file. */
-  (*htblptr)->sent_table = FALSE;
-}
-
-
-LOCAL(void)
-std_huff_tables (j_compress_ptr cinfo)
-/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
-/* IMPORTANT: these are only valid for 8-bit data precision! */
-{
-  static const UINT8 bits_dc_luminance[17] =
-    { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
-  static const UINT8 val_dc_luminance[] =
-    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
-  
-  static const UINT8 bits_dc_chrominance[17] =
-    { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
-  static const UINT8 val_dc_chrominance[] =
-    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
-  
-  static const UINT8 bits_ac_luminance[17] =
-    { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };
-  static const UINT8 val_ac_luminance[] =
-    { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
-      0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
-      0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
-      0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
-      0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
-      0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
-      0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
-      0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
-      0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-      0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
-      0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
-      0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
-      0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
-      0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-      0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
-      0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
-      0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
-      0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
-      0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
-      0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
-      0xf9, 0xfa };
-  
-  static const UINT8 bits_ac_chrominance[17] =
-    { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 };
-  static const UINT8 val_ac_chrominance[] =
-    { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
-      0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
-      0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
-      0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
-      0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
-      0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
-      0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
-      0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
-      0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
-      0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
-      0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
-      0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-      0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
-      0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
-      0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
-      0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
-      0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
-      0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
-      0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
-      0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
-      0xf9, 0xfa };
-  
-  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0],
-		 bits_dc_luminance, val_dc_luminance);
-  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0],
-		 bits_ac_luminance, val_ac_luminance);
-  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1],
-		 bits_dc_chrominance, val_dc_chrominance);
-  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1],
-		 bits_ac_chrominance, val_ac_chrominance);
-}
-
-
-/*
- * Default parameter setup for compression.
- *
- * Applications that don't choose to use this routine must do their
- * own setup of all these parameters.  Alternately, you can call this
- * to establish defaults and then alter parameters selectively.  This
- * is the recommended approach since, if we add any new parameters,
- * your code will still work (they'll be set to reasonable defaults).
- */
-
-GLOBAL(void)
-jpeg_set_defaults (j_compress_ptr cinfo)
-{
-  int i;
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  /* Allocate comp_info array large enough for maximum component count.
-   * Array is made permanent in case application wants to compress
-   * multiple images at same param settings.
-   */
-  if (cinfo->comp_info == NULL)
-    cinfo->comp_info = (jpeg_component_info *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  MAX_COMPONENTS * SIZEOF(jpeg_component_info));
-
-  /* Initialize everything not dependent on the color space */
-
-  cinfo->data_precision = BITS_IN_JSAMPLE;
-  /* Set up two quantization tables using default quality of 75 */
-  jpeg_set_quality(cinfo, 75, TRUE);
-  /* Set up two Huffman tables */
-  std_huff_tables(cinfo);
-
-  /* Initialize default arithmetic coding conditioning */
-  for (i = 0; i < NUM_ARITH_TBLS; i++) {
-    cinfo->arith_dc_L[i] = 0;
-    cinfo->arith_dc_U[i] = 1;
-    cinfo->arith_ac_K[i] = 5;
-  }
-
-  /* Default is no multiple-scan output */
-  cinfo->scan_info = NULL;
-  cinfo->num_scans = 0;
-
-  /* Expect normal source image, not raw downsampled data */
-  cinfo->raw_data_in = FALSE;
-
-  /* Use Huffman coding, not arithmetic coding, by default */
-  cinfo->arith_code = FALSE;
-
-  /* By default, don't do extra passes to optimize entropy coding */
-  cinfo->optimize_coding = FALSE;
-  /* The standard Huffman tables are only valid for 8-bit data precision.
-   * If the precision is higher, force optimization on so that usable
-   * tables will be computed.  This test can be removed if default tables
-   * are supplied that are valid for the desired precision.
-   */
-  if (cinfo->data_precision > 8)
-    cinfo->optimize_coding = TRUE;
-
-  /* By default, use the simpler non-cosited sampling alignment */
-  cinfo->CCIR601_sampling = FALSE;
-
-  /* No input smoothing */
-  cinfo->smoothing_factor = 0;
-
-  /* DCT algorithm preference */
-  cinfo->dct_method = JDCT_DEFAULT;
-
-  /* No restart markers */
-  cinfo->restart_interval = 0;
-  cinfo->restart_in_rows = 0;
-
-  /* Fill in default JFIF marker parameters.  Note that whether the marker
-   * will actually be written is determined by jpeg_set_colorspace.
-   *
-   * By default, the library emits JFIF version code 1.01.
-   * An application that wants to emit JFIF 1.02 extension markers should set
-   * JFIF_minor_version to 2.  We could probably get away with just defaulting
-   * to 1.02, but there may still be some decoders in use that will complain
-   * about that; saying 1.01 should minimize compatibility problems.
-   */
-  cinfo->JFIF_major_version = 1; /* Default JFIF version = 1.01 */
-  cinfo->JFIF_minor_version = 1;
-  cinfo->density_unit = 0;	/* Pixel size is unknown by default */
-  cinfo->X_density = 1;		/* Pixel aspect ratio is square by default */
-  cinfo->Y_density = 1;
-
-  /* Choose JPEG colorspace based on input space, set defaults accordingly */
-
-  jpeg_default_colorspace(cinfo);
-}
-
-
-/*
- * Select an appropriate JPEG colorspace for in_color_space.
- */
-
-GLOBAL(void)
-jpeg_default_colorspace (j_compress_ptr cinfo)
-{
-  switch (cinfo->in_color_space) {
-  case JCS_GRAYSCALE:
-    jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
-    break;
-  case JCS_RGB:
-    jpeg_set_colorspace(cinfo, JCS_YCbCr);
-    break;
-  case JCS_YCbCr:
-    jpeg_set_colorspace(cinfo, JCS_YCbCr);
-    break;
-  case JCS_CMYK:
-    jpeg_set_colorspace(cinfo, JCS_CMYK); /* By default, no translation */
-    break;
-  case JCS_YCCK:
-    jpeg_set_colorspace(cinfo, JCS_YCCK);
-    break;
-  case JCS_UNKNOWN:
-    jpeg_set_colorspace(cinfo, JCS_UNKNOWN);
-    break;
-  default:
-    ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-  }
-}
-
-
-/*
- * Set the JPEG colorspace, and choose colorspace-dependent default values.
- */
-
-GLOBAL(void)
-jpeg_set_colorspace (j_compress_ptr cinfo, J_COLOR_SPACE colorspace)
-{
-  jpeg_component_info * compptr;
-  int ci;
-
-#define SET_COMP(index,id,hsamp,vsamp,quant,dctbl,actbl)  \
-  (compptr = &cinfo->comp_info[index], \
-   compptr->component_id = (id), \
-   compptr->h_samp_factor = (hsamp), \
-   compptr->v_samp_factor = (vsamp), \
-   compptr->quant_tbl_no = (quant), \
-   compptr->dc_tbl_no = (dctbl), \
-   compptr->ac_tbl_no = (actbl) )
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  /* For all colorspaces, we use Q and Huff tables 0 for luminance components,
-   * tables 1 for chrominance components.
-   */
-
-  cinfo->jpeg_color_space = colorspace;
-
-  cinfo->write_JFIF_header = FALSE; /* No marker for non-JFIF colorspaces */
-  cinfo->write_Adobe_marker = FALSE; /* write no Adobe marker by default */
-
-  switch (colorspace) {
-  case JCS_GRAYSCALE:
-    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */
-    cinfo->num_components = 1;
-    /* JFIF specifies component ID 1 */
-    SET_COMP(0, 1, 1,1, 0, 0,0);
-    break;
-  case JCS_RGB:
-    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag RGB */
-    cinfo->num_components = 3;
-    SET_COMP(0, 0x52 /* 'R' */, 1,1, 0, 0,0);
-    SET_COMP(1, 0x47 /* 'G' */, 1,1, 0, 0,0);
-    SET_COMP(2, 0x42 /* 'B' */, 1,1, 0, 0,0);
-    break;
-  case JCS_YCbCr:
-    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */
-    cinfo->num_components = 3;
-    /* JFIF specifies component IDs 1,2,3 */
-    /* We default to 2x2 subsamples of chrominance */
-    SET_COMP(0, 1, 2,2, 0, 0,0);
-    SET_COMP(1, 2, 1,1, 1, 1,1);
-    SET_COMP(2, 3, 1,1, 1, 1,1);
-    break;
-  case JCS_CMYK:
-    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag CMYK */
-    cinfo->num_components = 4;
-    SET_COMP(0, 0x43 /* 'C' */, 1,1, 0, 0,0);
-    SET_COMP(1, 0x4D /* 'M' */, 1,1, 0, 0,0);
-    SET_COMP(2, 0x59 /* 'Y' */, 1,1, 0, 0,0);
-    SET_COMP(3, 0x4B /* 'K' */, 1,1, 0, 0,0);
-    break;
-  case JCS_YCCK:
-    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag YCCK */
-    cinfo->num_components = 4;
-    SET_COMP(0, 1, 2,2, 0, 0,0);
-    SET_COMP(1, 2, 1,1, 1, 1,1);
-    SET_COMP(2, 3, 1,1, 1, 1,1);
-    SET_COMP(3, 4, 2,2, 0, 0,0);
-    break;
-  case JCS_UNKNOWN:
-    cinfo->num_components = cinfo->input_components;
-    if (cinfo->num_components < 1 || cinfo->num_components > MAX_COMPONENTS)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
-	       MAX_COMPONENTS);
-    for (ci = 0; ci < cinfo->num_components; ci++) {
-      SET_COMP(ci, ci, 1,1, 0, 0,0);
-    }
-    break;
-  default:
-    ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-  }
-}
-
-
-#ifdef C_PROGRESSIVE_SUPPORTED
-
-LOCAL(jpeg_scan_info *)
-fill_a_scan (jpeg_scan_info * scanptr, int ci,
-	     int Ss, int Se, int Ah, int Al)
-/* Support routine: generate one scan for specified component */
-{
-  scanptr->comps_in_scan = 1;
-  scanptr->component_index[0] = ci;
-  scanptr->Ss = Ss;
-  scanptr->Se = Se;
-  scanptr->Ah = Ah;
-  scanptr->Al = Al;
-  scanptr++;
-  return scanptr;
-}
-
-LOCAL(jpeg_scan_info *)
-fill_scans (jpeg_scan_info * scanptr, int ncomps,
-	    int Ss, int Se, int Ah, int Al)
-/* Support routine: generate one scan for each component */
-{
-  int ci;
-
-  for (ci = 0; ci < ncomps; ci++) {
-    scanptr->comps_in_scan = 1;
-    scanptr->component_index[0] = ci;
-    scanptr->Ss = Ss;
-    scanptr->Se = Se;
-    scanptr->Ah = Ah;
-    scanptr->Al = Al;
-    scanptr++;
-  }
-  return scanptr;
-}
-
-LOCAL(jpeg_scan_info *)
-fill_dc_scans (jpeg_scan_info * scanptr, int ncomps, int Ah, int Al)
-/* Support routine: generate interleaved DC scan if possible, else N scans */
-{
-  int ci;
-
-  if (ncomps <= MAX_COMPS_IN_SCAN) {
-    /* Single interleaved DC scan */
-    scanptr->comps_in_scan = ncomps;
-    for (ci = 0; ci < ncomps; ci++)
-      scanptr->component_index[ci] = ci;
-    scanptr->Ss = scanptr->Se = 0;
-    scanptr->Ah = Ah;
-    scanptr->Al = Al;
-    scanptr++;
-  } else {
-    /* Noninterleaved DC scan for each component */
-    scanptr = fill_scans(scanptr, ncomps, 0, 0, Ah, Al);
-  }
-  return scanptr;
-}
-
-
-/*
- * Create a recommended progressive-JPEG script.
- * cinfo->num_components and cinfo->jpeg_color_space must be correct.
- */
-
-GLOBAL(void)
-jpeg_simple_progression (j_compress_ptr cinfo)
-{
-  int ncomps = cinfo->num_components;
-  int nscans;
-  jpeg_scan_info * scanptr;
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  /* Figure space needed for script.  Calculation must match code below! */
-  if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
-    /* Custom script for YCbCr color images. */
-    nscans = 10;
-  } else {
-    /* All-purpose script for other color spaces. */
-    if (ncomps > MAX_COMPS_IN_SCAN)
-      nscans = 6 * ncomps;	/* 2 DC + 4 AC scans per component */
-    else
-      nscans = 2 + 4 * ncomps;	/* 2 DC scans; 4 AC scans per component */
-  }
-
-  /* Allocate space for script.
-   * We need to put it in the permanent pool in case the application performs
-   * multiple compressions without changing the settings.  To avoid a memory
-   * leak if jpeg_simple_progression is called repeatedly for the same JPEG
-   * object, we try to re-use previously allocated space, and we allocate
-   * enough space to handle YCbCr even if initially asked for grayscale.
-   */
-  if (cinfo->script_space == NULL || cinfo->script_space_size < nscans) {
-    cinfo->script_space_size = MAX(nscans, 10);
-    cinfo->script_space = (jpeg_scan_info *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-			cinfo->script_space_size * SIZEOF(jpeg_scan_info));
-  }
-  scanptr = cinfo->script_space;
-  cinfo->scan_info = scanptr;
-  cinfo->num_scans = nscans;
-
-  if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
-    /* Custom script for YCbCr color images. */
-    /* Initial DC scan */
-    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);
-    /* Initial AC scan: get some luma data out in a hurry */
-    scanptr = fill_a_scan(scanptr, 0, 1, 5, 0, 2);
-    /* Chroma data is too small to be worth expending many scans on */
-    scanptr = fill_a_scan(scanptr, 2, 1, 63, 0, 1);
-    scanptr = fill_a_scan(scanptr, 1, 1, 63, 0, 1);
-    /* Complete spectral selection for luma AC */
-    scanptr = fill_a_scan(scanptr, 0, 6, 63, 0, 2);
-    /* Refine next bit of luma AC */
-    scanptr = fill_a_scan(scanptr, 0, 1, 63, 2, 1);
-    /* Finish DC successive approximation */
-    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);
-    /* Finish AC successive approximation */
-    scanptr = fill_a_scan(scanptr, 2, 1, 63, 1, 0);
-    scanptr = fill_a_scan(scanptr, 1, 1, 63, 1, 0);
-    /* Luma bottom bit comes last since it's usually largest scan */
-    scanptr = fill_a_scan(scanptr, 0, 1, 63, 1, 0);
-  } else {
-    /* All-purpose script for other color spaces. */
-    /* Successive approximation first pass */
-    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);
-    scanptr = fill_scans(scanptr, ncomps, 1, 5, 0, 2);
-    scanptr = fill_scans(scanptr, ncomps, 6, 63, 0, 2);
-    /* Successive approximation second pass */
-    scanptr = fill_scans(scanptr, ncomps, 1, 63, 2, 1);
-    /* Successive approximation final pass */
-    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);
-    scanptr = fill_scans(scanptr, ncomps, 1, 63, 1, 0);
-  }
-}
-
-#endif /* C_PROGRESSIVE_SUPPORTED */
+/*
+ * jcparam.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains optional default-setting code for the JPEG compressor.
+ * Applications do not have to use this file, but those that don't use it
+ * must know a lot more about the innards of the JPEG code.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Quantization table setup routines
+ */
+
+GLOBAL(void)
+jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl,
+		      const unsigned int *basic_table,
+		      int scale_factor, wxjpeg_boolean force_baseline)
+/* Define a quantization table equal to the basic_table times
+ * a scale factor (given as a percentage).
+ * If force_baseline is TRUE, the computed quantization table entries
+ * are limited to 1..255 for JPEG baseline compatibility.
+ */
+{
+  JQUANT_TBL ** qtblptr;
+  int i;
+  long temp;
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  if (which_tbl < 0 || which_tbl >= NUM_QUANT_TBLS)
+    ERREXIT1(cinfo, JERR_DQT_INDEX, which_tbl);
+
+  qtblptr = & cinfo->quant_tbl_ptrs[which_tbl];
+
+  if (*qtblptr == NULL)
+    *qtblptr = jpeg_alloc_quant_table((j_common_ptr) cinfo);
+
+  for (i = 0; i < DCTSIZE2; i++) {
+    temp = ((long) basic_table[i] * scale_factor + 50L) / 100L;
+    /* limit the values to the valid range */
+    if (temp <= 0L) temp = 1L;
+    if (temp > 32767L) temp = 32767L; /* max quantizer needed for 12 bits */
+    if (force_baseline && temp > 255L)
+      temp = 255L;		/* limit to baseline range if requested */
+    (*qtblptr)->quantval[i] = (UINT16) temp;
+  }
+
+  /* Initialize sent_table FALSE so table will be written to JPEG file. */
+  (*qtblptr)->sent_table = FALSE;
+}
+
+
+GLOBAL(void)
+jpeg_set_linear_quality (j_compress_ptr cinfo, int scale_factor,
+			 wxjpeg_boolean force_baseline)
+/* Set or change the 'quality' (quantization) setting, using default tables
+ * and a straight percentage-scaling quality scale.  In most cases it's better
+ * to use jpeg_set_quality (below); this entry point is provided for
+ * applications that insist on a linear percentage scaling.
+ */
+{
+  /* These are the sample quantization tables given in JPEG spec section K.1.
+   * The spec says that the values given produce "good" quality, and
+   * when divided by 2, "very good" quality.
+   */
+  static const unsigned int std_luminance_quant_tbl[DCTSIZE2] = {
+    16,  11,  10,  16,  24,  40,  51,  61,
+    12,  12,  14,  19,  26,  58,  60,  55,
+    14,  13,  16,  24,  40,  57,  69,  56,
+    14,  17,  22,  29,  51,  87,  80,  62,
+    18,  22,  37,  56,  68, 109, 103,  77,
+    24,  35,  55,  64,  81, 104, 113,  92,
+    49,  64,  78,  87, 103, 121, 120, 101,
+    72,  92,  95,  98, 112, 100, 103,  99
+  };
+  static const unsigned int std_chrominance_quant_tbl[DCTSIZE2] = {
+    17,  18,  24,  47,  99,  99,  99,  99,
+    18,  21,  26,  66,  99,  99,  99,  99,
+    24,  26,  56,  99,  99,  99,  99,  99,
+    47,  66,  99,  99,  99,  99,  99,  99,
+    99,  99,  99,  99,  99,  99,  99,  99,
+    99,  99,  99,  99,  99,  99,  99,  99,
+    99,  99,  99,  99,  99,  99,  99,  99,
+    99,  99,  99,  99,  99,  99,  99,  99
+  };
+
+  /* Set up two quantization tables using the specified scaling */
+  jpeg_add_quant_table(cinfo, 0, std_luminance_quant_tbl,
+		       scale_factor, force_baseline);
+  jpeg_add_quant_table(cinfo, 1, std_chrominance_quant_tbl,
+		       scale_factor, force_baseline);
+}
+
+
+GLOBAL(int)
+jpeg_quality_scaling (int quality)
+/* Convert a user-specified quality rating to a percentage scaling factor
+ * for an underlying quantization table, using our recommended scaling curve.
+ * The input 'quality' factor should be 0 (terrible) to 100 (very good).
+ */
+{
+  /* Safety limit on quality factor.  Convert 0 to 1 to avoid zero divide. */
+  if (quality <= 0) quality = 1;
+  if (quality > 100) quality = 100;
+
+  /* The basic table is used as-is (scaling 100) for a quality of 50.
+   * Qualities 50..100 are converted to scaling percentage 200 - 2*Q;
+   * note that at Q=100 the scaling is 0, which will cause jpeg_add_quant_table
+   * to make all the table entries 1 (hence, minimum quantization loss).
+   * Qualities 1..50 are converted to scaling percentage 5000/Q.
+   */
+  if (quality < 50)
+    quality = 5000 / quality;
+  else
+    quality = 200 - quality*2;
+
+  return quality;
+}
+
+
+GLOBAL(void)
+jpeg_set_quality (j_compress_ptr cinfo, int quality, wxjpeg_boolean force_baseline)
+/* Set or change the 'quality' (quantization) setting, using default tables.
+ * This is the standard quality-adjusting entry point for typical user
+ * interfaces; only those who want detailed control over quantization tables
+ * would use the preceding three routines directly.
+ */
+{
+  /* Convert user 0-100 rating to percentage scaling */
+  quality = jpeg_quality_scaling(quality);
+
+  /* Set up standard quality tables */
+  jpeg_set_linear_quality(cinfo, quality, force_baseline);
+}
+
+
+/*
+ * Huffman table setup routines
+ */
+
+LOCAL(void)
+add_huff_table (j_compress_ptr cinfo,
+		JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val)
+/* Define a Huffman table */
+{
+  int nsymbols, len;
+
+  if (*htblptr == NULL)
+    *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+
+  /* Copy the number-of-symbols-of-each-code-length counts */
+  MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
+
+  /* Validate the counts.  We do this here mainly so we can copy the right
+   * number of symbols from the val[] array, without risking marching off
+   * the end of memory.  jchuff.c will do a more thorough test later.
+   */
+  nsymbols = 0;
+  for (len = 1; len <= 16; len++)
+    nsymbols += bits[len];
+  if (nsymbols < 1 || nsymbols > 256)
+    ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+
+  MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8));
+
+  /* Initialize sent_table FALSE so table will be written to JPEG file. */
+  (*htblptr)->sent_table = FALSE;
+}
+
+
+LOCAL(void)
+std_huff_tables (j_compress_ptr cinfo)
+/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
+/* IMPORTANT: these are only valid for 8-bit data precision! */
+{
+  static const UINT8 bits_dc_luminance[17] =
+    { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
+  static const UINT8 val_dc_luminance[] =
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+  
+  static const UINT8 bits_dc_chrominance[17] =
+    { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
+  static const UINT8 val_dc_chrominance[] =
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
+  
+  static const UINT8 bits_ac_luminance[17] =
+    { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };
+  static const UINT8 val_ac_luminance[] =
+    { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
+      0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
+      0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
+      0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
+      0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
+      0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
+      0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+      0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+      0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
+      0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+      0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+      0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+      0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
+      0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+      0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
+      0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
+      0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
+      0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
+      0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
+      0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+      0xf9, 0xfa };
+  
+  static const UINT8 bits_ac_chrominance[17] =
+    { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 };
+  static const UINT8 val_ac_chrominance[] =
+    { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
+      0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
+      0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
+      0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
+      0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
+      0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
+      0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
+      0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
+      0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+      0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+      0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+      0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+      0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
+      0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
+      0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
+      0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
+      0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
+      0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
+      0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+      0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+      0xf9, 0xfa };
+  
+  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0],
+		 bits_dc_luminance, val_dc_luminance);
+  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0],
+		 bits_ac_luminance, val_ac_luminance);
+  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1],
+		 bits_dc_chrominance, val_dc_chrominance);
+  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1],
+		 bits_ac_chrominance, val_ac_chrominance);
+}
+
+
+/*
+ * Default parameter setup for compression.
+ *
+ * Applications that don't choose to use this routine must do their
+ * own setup of all these parameters.  Alternately, you can call this
+ * to establish defaults and then alter parameters selectively.  This
+ * is the recommended approach since, if we add any new parameters,
+ * your code will still work (they'll be set to reasonable defaults).
+ */
+
+GLOBAL(void)
+jpeg_set_defaults (j_compress_ptr cinfo)
+{
+  int i;
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  /* Allocate comp_info array large enough for maximum component count.
+   * Array is made permanent in case application wants to compress
+   * multiple images at same param settings.
+   */
+  if (cinfo->comp_info == NULL)
+    cinfo->comp_info = (jpeg_component_info *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  MAX_COMPONENTS * SIZEOF(jpeg_component_info));
+
+  /* Initialize everything not dependent on the color space */
+
+  cinfo->data_precision = BITS_IN_JSAMPLE;
+  /* Set up two quantization tables using default quality of 75 */
+  jpeg_set_quality(cinfo, 75, TRUE);
+  /* Set up two Huffman tables */
+  std_huff_tables(cinfo);
+
+  /* Initialize default arithmetic coding conditioning */
+  for (i = 0; i < NUM_ARITH_TBLS; i++) {
+    cinfo->arith_dc_L[i] = 0;
+    cinfo->arith_dc_U[i] = 1;
+    cinfo->arith_ac_K[i] = 5;
+  }
+
+  /* Default is no multiple-scan output */
+  cinfo->scan_info = NULL;
+  cinfo->num_scans = 0;
+
+  /* Expect normal source image, not raw downsampled data */
+  cinfo->raw_data_in = FALSE;
+
+  /* Use Huffman coding, not arithmetic coding, by default */
+  cinfo->arith_code = FALSE;
+
+  /* By default, don't do extra passes to optimize entropy coding */
+  cinfo->optimize_coding = FALSE;
+  /* The standard Huffman tables are only valid for 8-bit data precision.
+   * If the precision is higher, force optimization on so that usable
+   * tables will be computed.  This test can be removed if default tables
+   * are supplied that are valid for the desired precision.
+   */
+  if (cinfo->data_precision > 8)
+    cinfo->optimize_coding = TRUE;
+
+  /* By default, use the simpler non-cosited sampling alignment */
+  cinfo->CCIR601_sampling = FALSE;
+
+  /* No input smoothing */
+  cinfo->smoothing_factor = 0;
+
+  /* DCT algorithm preference */
+  cinfo->dct_method = JDCT_DEFAULT;
+
+  /* No restart markers */
+  cinfo->restart_interval = 0;
+  cinfo->restart_in_rows = 0;
+
+  /* Fill in default JFIF marker parameters.  Note that whether the marker
+   * will actually be written is determined by jpeg_set_colorspace.
+   *
+   * By default, the library emits JFIF version code 1.01.
+   * An application that wants to emit JFIF 1.02 extension markers should set
+   * JFIF_minor_version to 2.  We could probably get away with just defaulting
+   * to 1.02, but there may still be some decoders in use that will complain
+   * about that; saying 1.01 should minimize compatibility problems.
+   */
+  cinfo->JFIF_major_version = 1; /* Default JFIF version = 1.01 */
+  cinfo->JFIF_minor_version = 1;
+  cinfo->density_unit = 0;	/* Pixel size is unknown by default */
+  cinfo->X_density = 1;		/* Pixel aspect ratio is square by default */
+  cinfo->Y_density = 1;
+
+  /* Choose JPEG colorspace based on input space, set defaults accordingly */
+
+  jpeg_default_colorspace(cinfo);
+}
+
+
+/*
+ * Select an appropriate JPEG colorspace for in_color_space.
+ */
+
+GLOBAL(void)
+jpeg_default_colorspace (j_compress_ptr cinfo)
+{
+  switch (cinfo->in_color_space) {
+  case JCS_GRAYSCALE:
+    jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
+    break;
+  case JCS_RGB:
+    jpeg_set_colorspace(cinfo, JCS_YCbCr);
+    break;
+  case JCS_YCbCr:
+    jpeg_set_colorspace(cinfo, JCS_YCbCr);
+    break;
+  case JCS_CMYK:
+    jpeg_set_colorspace(cinfo, JCS_CMYK); /* By default, no translation */
+    break;
+  case JCS_YCCK:
+    jpeg_set_colorspace(cinfo, JCS_YCCK);
+    break;
+  case JCS_UNKNOWN:
+    jpeg_set_colorspace(cinfo, JCS_UNKNOWN);
+    break;
+  default:
+    ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
+  }
+}
+
+
+/*
+ * Set the JPEG colorspace, and choose colorspace-dependent default values.
+ */
+
+GLOBAL(void)
+jpeg_set_colorspace (j_compress_ptr cinfo, J_COLOR_SPACE colorspace)
+{
+  jpeg_component_info * compptr;
+  int ci;
+
+#define SET_COMP(index,id,hsamp,vsamp,quant,dctbl,actbl)  \
+  (compptr = &cinfo->comp_info[index], \
+   compptr->component_id = (id), \
+   compptr->h_samp_factor = (hsamp), \
+   compptr->v_samp_factor = (vsamp), \
+   compptr->quant_tbl_no = (quant), \
+   compptr->dc_tbl_no = (dctbl), \
+   compptr->ac_tbl_no = (actbl) )
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  /* For all colorspaces, we use Q and Huff tables 0 for luminance components,
+   * tables 1 for chrominance components.
+   */
+
+  cinfo->jpeg_color_space = colorspace;
+
+  cinfo->write_JFIF_header = FALSE; /* No marker for non-JFIF colorspaces */
+  cinfo->write_Adobe_marker = FALSE; /* write no Adobe marker by default */
+
+  switch (colorspace) {
+  case JCS_GRAYSCALE:
+    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */
+    cinfo->num_components = 1;
+    /* JFIF specifies component ID 1 */
+    SET_COMP(0, 1, 1,1, 0, 0,0);
+    break;
+  case JCS_RGB:
+    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag RGB */
+    cinfo->num_components = 3;
+    SET_COMP(0, 0x52 /* 'R' */, 1,1, 0, 0,0);
+    SET_COMP(1, 0x47 /* 'G' */, 1,1, 0, 0,0);
+    SET_COMP(2, 0x42 /* 'B' */, 1,1, 0, 0,0);
+    break;
+  case JCS_YCbCr:
+    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */
+    cinfo->num_components = 3;
+    /* JFIF specifies component IDs 1,2,3 */
+    /* We default to 2x2 subsamples of chrominance */
+    SET_COMP(0, 1, 2,2, 0, 0,0);
+    SET_COMP(1, 2, 1,1, 1, 1,1);
+    SET_COMP(2, 3, 1,1, 1, 1,1);
+    break;
+  case JCS_CMYK:
+    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag CMYK */
+    cinfo->num_components = 4;
+    SET_COMP(0, 0x43 /* 'C' */, 1,1, 0, 0,0);
+    SET_COMP(1, 0x4D /* 'M' */, 1,1, 0, 0,0);
+    SET_COMP(2, 0x59 /* 'Y' */, 1,1, 0, 0,0);
+    SET_COMP(3, 0x4B /* 'K' */, 1,1, 0, 0,0);
+    break;
+  case JCS_YCCK:
+    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag YCCK */
+    cinfo->num_components = 4;
+    SET_COMP(0, 1, 2,2, 0, 0,0);
+    SET_COMP(1, 2, 1,1, 1, 1,1);
+    SET_COMP(2, 3, 1,1, 1, 1,1);
+    SET_COMP(3, 4, 2,2, 0, 0,0);
+    break;
+  case JCS_UNKNOWN:
+    cinfo->num_components = cinfo->input_components;
+    if (cinfo->num_components < 1 || cinfo->num_components > MAX_COMPONENTS)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
+	       MAX_COMPONENTS);
+    for (ci = 0; ci < cinfo->num_components; ci++) {
+      SET_COMP(ci, ci, 1,1, 0, 0,0);
+    }
+    break;
+  default:
+    ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+  }
+}
+
+
+#ifdef C_PROGRESSIVE_SUPPORTED
+
+LOCAL(jpeg_scan_info *)
+fill_a_scan (jpeg_scan_info * scanptr, int ci,
+	     int Ss, int Se, int Ah, int Al)
+/* Support routine: generate one scan for specified component */
+{
+  scanptr->comps_in_scan = 1;
+  scanptr->component_index[0] = ci;
+  scanptr->Ss = Ss;
+  scanptr->Se = Se;
+  scanptr->Ah = Ah;
+  scanptr->Al = Al;
+  scanptr++;
+  return scanptr;
+}
+
+LOCAL(jpeg_scan_info *)
+fill_scans (jpeg_scan_info * scanptr, int ncomps,
+	    int Ss, int Se, int Ah, int Al)
+/* Support routine: generate one scan for each component */
+{
+  int ci;
+
+  for (ci = 0; ci < ncomps; ci++) {
+    scanptr->comps_in_scan = 1;
+    scanptr->component_index[0] = ci;
+    scanptr->Ss = Ss;
+    scanptr->Se = Se;
+    scanptr->Ah = Ah;
+    scanptr->Al = Al;
+    scanptr++;
+  }
+  return scanptr;
+}
+
+LOCAL(jpeg_scan_info *)
+fill_dc_scans (jpeg_scan_info * scanptr, int ncomps, int Ah, int Al)
+/* Support routine: generate interleaved DC scan if possible, else N scans */
+{
+  int ci;
+
+  if (ncomps <= MAX_COMPS_IN_SCAN) {
+    /* Single interleaved DC scan */
+    scanptr->comps_in_scan = ncomps;
+    for (ci = 0; ci < ncomps; ci++)
+      scanptr->component_index[ci] = ci;
+    scanptr->Ss = scanptr->Se = 0;
+    scanptr->Ah = Ah;
+    scanptr->Al = Al;
+    scanptr++;
+  } else {
+    /* Noninterleaved DC scan for each component */
+    scanptr = fill_scans(scanptr, ncomps, 0, 0, Ah, Al);
+  }
+  return scanptr;
+}
+
+
+/*
+ * Create a recommended progressive-JPEG script.
+ * cinfo->num_components and cinfo->jpeg_color_space must be correct.
+ */
+
+GLOBAL(void)
+jpeg_simple_progression (j_compress_ptr cinfo)
+{
+  int ncomps = cinfo->num_components;
+  int nscans;
+  jpeg_scan_info * scanptr;
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  /* Figure space needed for script.  Calculation must match code below! */
+  if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
+    /* Custom script for YCbCr color images. */
+    nscans = 10;
+  } else {
+    /* All-purpose script for other color spaces. */
+    if (ncomps > MAX_COMPS_IN_SCAN)
+      nscans = 6 * ncomps;	/* 2 DC + 4 AC scans per component */
+    else
+      nscans = 2 + 4 * ncomps;	/* 2 DC scans; 4 AC scans per component */
+  }
+
+  /* Allocate space for script.
+   * We need to put it in the permanent pool in case the application performs
+   * multiple compressions without changing the settings.  To avoid a memory
+   * leak if jpeg_simple_progression is called repeatedly for the same JPEG
+   * object, we try to re-use previously allocated space, and we allocate
+   * enough space to handle YCbCr even if initially asked for grayscale.
+   */
+  if (cinfo->script_space == NULL || cinfo->script_space_size < nscans) {
+    cinfo->script_space_size = MAX(nscans, 10);
+    cinfo->script_space = (jpeg_scan_info *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+			cinfo->script_space_size * SIZEOF(jpeg_scan_info));
+  }
+  scanptr = cinfo->script_space;
+  cinfo->scan_info = scanptr;
+  cinfo->num_scans = nscans;
+
+  if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
+    /* Custom script for YCbCr color images. */
+    /* Initial DC scan */
+    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);
+    /* Initial AC scan: get some luma data out in a hurry */
+    scanptr = fill_a_scan(scanptr, 0, 1, 5, 0, 2);
+    /* Chroma data is too small to be worth expending many scans on */
+    scanptr = fill_a_scan(scanptr, 2, 1, 63, 0, 1);
+    scanptr = fill_a_scan(scanptr, 1, 1, 63, 0, 1);
+    /* Complete spectral selection for luma AC */
+    scanptr = fill_a_scan(scanptr, 0, 6, 63, 0, 2);
+    /* Refine next bit of luma AC */
+    scanptr = fill_a_scan(scanptr, 0, 1, 63, 2, 1);
+    /* Finish DC successive approximation */
+    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);
+    /* Finish AC successive approximation */
+    scanptr = fill_a_scan(scanptr, 2, 1, 63, 1, 0);
+    scanptr = fill_a_scan(scanptr, 1, 1, 63, 1, 0);
+    /* Luma bottom bit comes last since it's usually largest scan */
+    scanptr = fill_a_scan(scanptr, 0, 1, 63, 1, 0);
+  } else {
+    /* All-purpose script for other color spaces. */
+    /* Successive approximation first pass */
+    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);
+    scanptr = fill_scans(scanptr, ncomps, 1, 5, 0, 2);
+    scanptr = fill_scans(scanptr, ncomps, 6, 63, 0, 2);
+    /* Successive approximation second pass */
+    scanptr = fill_scans(scanptr, ncomps, 1, 63, 2, 1);
+    /* Successive approximation final pass */
+    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);
+    scanptr = fill_scans(scanptr, ncomps, 1, 63, 1, 0);
+  }
+}
+
+#endif /* C_PROGRESSIVE_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jcphuff.c b/Source/3rd Party/wx/src/jpeg/jcphuff.c
index c6236a9cf..84e53f403 100644
--- a/Source/3rd Party/wx/src/jpeg/jcphuff.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcphuff.c	
@@ -1,833 +1,833 @@
-/*
- * jcphuff.c
- *
- * Copyright (C) 1995-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains Huffman entropy encoding routines for progressive JPEG.
- *
- * We do not support output suspension in this module, since the library
- * currently does not allow multiple-scan files to be written with output
- * suspension.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jchuff.h"		/* Declarations shared with jchuff.c */
-
-#ifdef C_PROGRESSIVE_SUPPORTED
-
-/* Expanded entropy encoder object for progressive Huffman encoding. */
-
-typedef struct {
-  struct jpeg_entropy_encoder pub; /* public fields */
-
-  /* Mode flag: TRUE for optimization, FALSE for actual data output */
-  wxjpeg_boolean gather_statistics;
-
-  /* Bit-level coding status.
-   * next_output_byte/free_in_buffer are local copies of cinfo->dest fields.
-   */
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-  JPEG_INT32 put_buffer;		/* current bit-accumulation buffer */
-  int put_bits;			/* # of bits now in it */
-  j_compress_ptr cinfo;		/* link to cinfo (needed for dump_buffer) */
-
-  /* Coding status for DC components */
-  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
-
-  /* Coding status for AC components */
-  int ac_tbl_no;		/* the table number of the single component */
-  unsigned int EOBRUN;		/* run length of EOBs */
-  unsigned int BE;		/* # of buffered correction bits before MCU */
-  char * bit_buffer;		/* buffer for correction bits (1 per char) */
-  /* packing correction bits tightly would save some space but cost time... */
-
-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
-  int next_restart_num;		/* next restart number to write (0-7) */
-
-  /* Pointers to derived tables (these workspaces have image lifespan).
-   * Since any one scan codes only DC or only AC, we only need one set
-   * of tables, not one for DC and one for AC.
-   */
-  c_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
-
-  /* Statistics tables for optimization; again, one set is enough */
-  long * count_ptrs[NUM_HUFF_TBLS];
-} phuff_entropy_encoder;
-
-typedef phuff_entropy_encoder * phuff_entropy_ptr;
-
-/* MAX_CORR_BITS is the number of bits the AC refinement correction-bit
- * buffer can hold.  Larger sizes may slightly improve compression, but
- * 1000 is already well into the realm of overkill.
- * The minimum safe size is 64 bits.
- */
-
-#define MAX_CORR_BITS  1000	/* Max # of correction bits I can buffer */
-
-/* IRIGHT_SHIFT is like RIGHT_SHIFT, but works on int rather than INT32.
- * We assume that int right shift is unsigned if INT32 right shift is,
- * which should be safe.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define ISHIFT_TEMPS	int ishift_temp;
-#define IRIGHT_SHIFT(x,shft)  \
-	((ishift_temp = (x)) < 0 ? \
-	 (ishift_temp >> (shft)) | ((~0) << (16-(shft))) : \
-	 (ishift_temp >> (shft)))
-#else
-#define ISHIFT_TEMPS
-#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-/* Forward declarations */
-METHODDEF(wxjpeg_boolean) encode_mcu_DC_first JPP((j_compress_ptr cinfo,
-					    JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) encode_mcu_AC_first JPP((j_compress_ptr cinfo,
-					    JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) encode_mcu_DC_refine JPP((j_compress_ptr cinfo,
-					     JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) encode_mcu_AC_refine JPP((j_compress_ptr cinfo,
-					     JBLOCKROW *MCU_data));
-METHODDEF(void) finish_pass_phuff JPP((j_compress_ptr cinfo));
-METHODDEF(void) finish_pass_gather_phuff JPP((j_compress_ptr cinfo));
-
-
-/*
- * Initialize for a Huffman-compressed scan using progressive JPEG.
- */
-
-METHODDEF(void)
-start_pass_phuff (j_compress_ptr cinfo, wxjpeg_boolean gather_statistics)
-{  
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  wxjpeg_boolean is_DC_band;
-  int ci, tbl;
-  jpeg_component_info * compptr;
-
-  entropy->cinfo = cinfo;
-  entropy->gather_statistics = gather_statistics;
-
-  is_DC_band = (cinfo->Ss == 0);
-
-  /* We assume jcmaster.c already validated the scan parameters. */
-
-  /* Select execution routines */
-  if (cinfo->Ah == 0) {
-    if (is_DC_band)
-      entropy->pub.encode_mcu = encode_mcu_DC_first;
-    else
-      entropy->pub.encode_mcu = encode_mcu_AC_first;
-  } else {
-    if (is_DC_band)
-      entropy->pub.encode_mcu = encode_mcu_DC_refine;
-    else {
-      entropy->pub.encode_mcu = encode_mcu_AC_refine;
-      /* AC refinement needs a correction bit buffer */
-      if (entropy->bit_buffer == NULL)
-	entropy->bit_buffer = (char *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      MAX_CORR_BITS * SIZEOF(char));
-    }
-  }
-  if (gather_statistics)
-    entropy->pub.finish_pass = finish_pass_gather_phuff;
-  else
-    entropy->pub.finish_pass = finish_pass_phuff;
-
-  /* Only DC coefficients may be interleaved, so cinfo->comps_in_scan = 1
-   * for AC coefficients.
-   */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    /* Initialize DC predictions to 0 */
-    entropy->last_dc_val[ci] = 0;
-    /* Get table index */
-    if (is_DC_band) {
-      if (cinfo->Ah != 0)	/* DC refinement needs no table */
-	continue;
-      tbl = compptr->dc_tbl_no;
-    } else {
-      entropy->ac_tbl_no = tbl = compptr->ac_tbl_no;
-    }
-    if (gather_statistics) {
-      /* Check for invalid table index */
-      /* (make_c_derived_tbl does this in the other path) */
-      if (tbl < 0 || tbl >= NUM_HUFF_TBLS)
-        ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tbl);
-      /* Allocate and zero the statistics tables */
-      /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */
-      if (entropy->count_ptrs[tbl] == NULL)
-	entropy->count_ptrs[tbl] = (long *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      257 * SIZEOF(long));
-      MEMZERO(entropy->count_ptrs[tbl], 257 * SIZEOF(long));
-    } else {
-      /* Compute derived values for Huffman table */
-      /* We may do this more than once for a table, but it's not expensive */
-      jpeg_make_c_derived_tbl(cinfo, is_DC_band, tbl,
-			      & entropy->derived_tbls[tbl]);
-    }
-  }
-
-  /* Initialize AC stuff */
-  entropy->EOBRUN = 0;
-  entropy->BE = 0;
-
-  /* Initialize bit buffer to empty */
-  entropy->put_buffer = 0;
-  entropy->put_bits = 0;
-
-  /* Initialize restart stuff */
-  entropy->restarts_to_go = cinfo->restart_interval;
-  entropy->next_restart_num = 0;
-}
-
-
-/* Outputting bytes to the file.
- * NB: these must be called only when actually outputting,
- * that is, entropy->gather_statistics == FALSE.
- */
-
-/* Emit a byte */
-#define emit_byte(entropy,val)  \
-	{ *(entropy)->next_output_byte++ = (JOCTET) (val);  \
-	  if (--(entropy)->free_in_buffer == 0)  \
-	    dump_buffer(entropy); }
-
-
-LOCAL(void)
-dump_buffer (phuff_entropy_ptr entropy)
-/* Empty the output buffer; we do not support suspension in this module. */
-{
-  struct jpeg_destination_mgr * dest = entropy->cinfo->dest;
-
-  if (! (*dest->empty_output_buffer) (entropy->cinfo))
-    ERREXIT(entropy->cinfo, JERR_CANT_SUSPEND);
-  /* After a successful buffer dump, must reset buffer pointers */
-  entropy->next_output_byte = dest->next_output_byte;
-  entropy->free_in_buffer = dest->free_in_buffer;
-}
-
-
-/* Outputting bits to the file */
-
-/* Only the right 24 bits of put_buffer are used; the valid bits are
- * left-justified in this part.  At most 16 bits can be passed to emit_bits
- * in one call, and we never retain more than 7 bits in put_buffer
- * between calls, so 24 bits are sufficient.
- */
-
-INLINE
-LOCAL(void)
-emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size)
-/* Emit some bits, unless we are in gather mode */
-{
-  /* This routine is heavily used, so it's worth coding tightly. */
-  register JPEG_INT32 put_buffer = (JPEG_INT32) code;
-  register int put_bits = entropy->put_bits;
-
-  /* if size is 0, caller used an invalid Huffman table entry */
-  if (size == 0)
-    ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);
-
-  if (entropy->gather_statistics)
-    return;			/* do nothing if we're only getting stats */
-
-  put_buffer &= (((JPEG_INT32) 1)<<size) - 1; /* mask off any extra bits in code */
-  
-  put_bits += size;		/* new number of bits in buffer */
-  
-  put_buffer <<= 24 - put_bits; /* align incoming bits */
-
-  put_buffer |= entropy->put_buffer; /* and merge with old buffer contents */
-
-  while (put_bits >= 8) {
-    int c = (int) ((put_buffer >> 16) & 0xFF);
-    
-    emit_byte(entropy, c);
-    if (c == 0xFF) {		/* need to stuff a zero byte? */
-      emit_byte(entropy, 0);
-    }
-    put_buffer <<= 8;
-    put_bits -= 8;
-  }
-
-  entropy->put_buffer = put_buffer; /* update variables */
-  entropy->put_bits = put_bits;
-}
-
-
-LOCAL(void)
-flush_bits (phuff_entropy_ptr entropy)
-{
-  emit_bits(entropy, 0x7F, 7); /* fill any partial byte with ones */
-  entropy->put_buffer = 0;     /* and reset bit-buffer to empty */
-  entropy->put_bits = 0;
-}
-
-
-/*
- * Emit (or just count) a Huffman symbol.
- */
-
-INLINE
-LOCAL(void)
-emit_symbol (phuff_entropy_ptr entropy, int tbl_no, int symbol)
-{
-  if (entropy->gather_statistics)
-    entropy->count_ptrs[tbl_no][symbol]++;
-  else {
-    c_derived_tbl * tbl = entropy->derived_tbls[tbl_no];
-    emit_bits(entropy, tbl->ehufco[symbol], tbl->ehufsi[symbol]);
-  }
-}
-
-
-/*
- * Emit bits from a correction bit buffer.
- */
-
-LOCAL(void)
-emit_buffered_bits (phuff_entropy_ptr entropy, char * bufstart,
-		    unsigned int nbits)
-{
-  if (entropy->gather_statistics)
-    return;			/* no real work */
-
-  while (nbits > 0) {
-    emit_bits(entropy, (unsigned int) (*bufstart), 1);
-    bufstart++;
-    nbits--;
-  }
-}
-
-
-/*
- * Emit any pending EOBRUN symbol.
- */
-
-LOCAL(void)
-emit_eobrun (phuff_entropy_ptr entropy)
-{
-  register int temp, nbits;
-
-  if (entropy->EOBRUN > 0) {	/* if there is any pending EOBRUN */
-    temp = entropy->EOBRUN;
-    nbits = 0;
-    while ((temp >>= 1))
-      nbits++;
-    /* safety check: shouldn't happen given limited correction-bit buffer */
-    if (nbits > 14)
-      ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);
-
-    emit_symbol(entropy, entropy->ac_tbl_no, nbits << 4);
-    if (nbits)
-      emit_bits(entropy, entropy->EOBRUN, nbits);
-
-    entropy->EOBRUN = 0;
-
-    /* Emit any buffered correction bits */
-    emit_buffered_bits(entropy, entropy->bit_buffer, entropy->BE);
-    entropy->BE = 0;
-  }
-}
-
-
-/*
- * Emit a restart marker & resynchronize predictions.
- */
-
-LOCAL(void)
-emit_restart (phuff_entropy_ptr entropy, int restart_num)
-{
-  int ci;
-
-  emit_eobrun(entropy);
-
-  if (! entropy->gather_statistics) {
-    flush_bits(entropy);
-    emit_byte(entropy, 0xFF);
-    emit_byte(entropy, JPEG_RST0 + restart_num);
-  }
-
-  if (entropy->cinfo->Ss == 0) {
-    /* Re-initialize DC predictions to 0 */
-    for (ci = 0; ci < entropy->cinfo->comps_in_scan; ci++)
-      entropy->last_dc_val[ci] = 0;
-  } else {
-    /* Re-initialize all AC-related fields to 0 */
-    entropy->EOBRUN = 0;
-    entropy->BE = 0;
-  }
-}
-
-
-/*
- * MCU encoding for DC initial scan (either spectral selection,
- * or first pass of successive approximation).
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  register int temp, temp2;
-  register int nbits;
-  int blkn, ci;
-  int Al = cinfo->Al;
-  JBLOCKROW block;
-  jpeg_component_info * compptr;
-  ISHIFT_TEMPS
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval)
-    if (entropy->restarts_to_go == 0)
-      emit_restart(entropy, entropy->next_restart_num);
-
-  /* Encode the MCU data blocks */
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    block = MCU_data[blkn];
-    ci = cinfo->MCU_membership[blkn];
-    compptr = cinfo->cur_comp_info[ci];
-
-    /* Compute the DC value after the required point transform by Al.
-     * This is simply an arithmetic right shift.
-     */
-    temp2 = IRIGHT_SHIFT((int) ((*block)[0]), Al);
-
-    /* DC differences are figured on the point-transformed values. */
-    temp = temp2 - entropy->last_dc_val[ci];
-    entropy->last_dc_val[ci] = temp2;
-
-    /* Encode the DC coefficient difference per section G.1.2.1 */
-    temp2 = temp;
-    if (temp < 0) {
-      temp = -temp;		/* temp is abs value of input */
-      /* For a negative input, want temp2 = bitwise complement of abs(input) */
-      /* This code assumes we are on a two's complement machine */
-      temp2--;
-    }
-    
-    /* Find the number of bits needed for the magnitude of the coefficient */
-    nbits = 0;
-    while (temp) {
-      nbits++;
-      temp >>= 1;
-    }
-    /* Check for out-of-range coefficient values.
-     * Since we're encoding a difference, the range limit is twice as much.
-     */
-    if (nbits > MAX_COEF_BITS+1)
-      ERREXIT(cinfo, JERR_BAD_DCT_COEF);
-    
-    /* Count/emit the Huffman-coded symbol for the number of bits */
-    emit_symbol(entropy, compptr->dc_tbl_no, nbits);
-    
-    /* Emit that number of bits of the value, if positive, */
-    /* or the complement of its magnitude, if negative. */
-    if (nbits)			/* emit_bits rejects calls with size 0 */
-      emit_bits(entropy, (unsigned int) temp2, nbits);
-  }
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * MCU encoding for AC initial scan (either spectral selection,
- * or first pass of successive approximation).
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  register int temp, temp2;
-  register int nbits;
-  register int r, k;
-  int Se = cinfo->Se;
-  int Al = cinfo->Al;
-  JBLOCKROW block;
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval)
-    if (entropy->restarts_to_go == 0)
-      emit_restart(entropy, entropy->next_restart_num);
-
-  /* Encode the MCU data block */
-  block = MCU_data[0];
-
-  /* Encode the AC coefficients per section G.1.2.2, fig. G.3 */
-  
-  r = 0;			/* r = run length of zeros */
-   
-  for (k = cinfo->Ss; k <= Se; k++) {
-    if ((temp = (*block)[jpeg_natural_order[k]]) == 0) {
-      r++;
-      continue;
-    }
-    /* We must apply the point transform by Al.  For AC coefficients this
-     * is an integer division with rounding towards 0.  To do this portably
-     * in C, we shift after obtaining the absolute value; so the code is
-     * interwoven with finding the abs value (temp) and output bits (temp2).
-     */
-    if (temp < 0) {
-      temp = -temp;		/* temp is abs value of input */
-      temp >>= Al;		/* apply the point transform */
-      /* For a negative coef, want temp2 = bitwise complement of abs(coef) */
-      temp2 = ~temp;
-    } else {
-      temp >>= Al;		/* apply the point transform */
-      temp2 = temp;
-    }
-    /* Watch out for case that nonzero coef is zero after point transform */
-    if (temp == 0) {
-      r++;
-      continue;
-    }
-
-    /* Emit any pending EOBRUN */
-    if (entropy->EOBRUN > 0)
-      emit_eobrun(entropy);
-    /* if run length > 15, must emit special run-length-16 codes (0xF0) */
-    while (r > 15) {
-      emit_symbol(entropy, entropy->ac_tbl_no, 0xF0);
-      r -= 16;
-    }
-
-    /* Find the number of bits needed for the magnitude of the coefficient */
-    nbits = 1;			/* there must be at least one 1 bit */
-    while ((temp >>= 1))
-      nbits++;
-    /* Check for out-of-range coefficient values */
-    if (nbits > MAX_COEF_BITS)
-      ERREXIT(cinfo, JERR_BAD_DCT_COEF);
-
-    /* Count/emit Huffman symbol for run length / number of bits */
-    emit_symbol(entropy, entropy->ac_tbl_no, (r << 4) + nbits);
-
-    /* Emit that number of bits of the value, if positive, */
-    /* or the complement of its magnitude, if negative. */
-    emit_bits(entropy, (unsigned int) temp2, nbits);
-
-    r = 0;			/* reset zero run length */
-  }
-
-  if (r > 0) {			/* If there are trailing zeroes, */
-    entropy->EOBRUN++;		/* count an EOB */
-    if (entropy->EOBRUN == 0x7FFF)
-      emit_eobrun(entropy);	/* force it out to avoid overflow */
-  }
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * MCU encoding for DC successive approximation refinement scan.
- * Note: we assume such scans can be multi-component, although the spec
- * is not very clear on the point.
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  register int temp;
-  int blkn;
-  int Al = cinfo->Al;
-  JBLOCKROW block;
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval)
-    if (entropy->restarts_to_go == 0)
-      emit_restart(entropy, entropy->next_restart_num);
-
-  /* Encode the MCU data blocks */
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    block = MCU_data[blkn];
-
-    /* We simply emit the Al'th bit of the DC coefficient value. */
-    temp = (*block)[0];
-    emit_bits(entropy, (unsigned int) (temp >> Al), 1);
-  }
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * MCU encoding for AC successive approximation refinement scan.
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  register int temp;
-  register int r, k;
-  int EOB;
-  char *BR_buffer;
-  unsigned int BR;
-  int Se = cinfo->Se;
-  int Al = cinfo->Al;
-  JBLOCKROW block;
-  int absvalues[DCTSIZE2];
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval)
-    if (entropy->restarts_to_go == 0)
-      emit_restart(entropy, entropy->next_restart_num);
-
-  /* Encode the MCU data block */
-  block = MCU_data[0];
-
-  /* It is convenient to make a pre-pass to determine the transformed
-   * coefficients' absolute values and the EOB position.
-   */
-  EOB = 0;
-  for (k = cinfo->Ss; k <= Se; k++) {
-    temp = (*block)[jpeg_natural_order[k]];
-    /* We must apply the point transform by Al.  For AC coefficients this
-     * is an integer division with rounding towards 0.  To do this portably
-     * in C, we shift after obtaining the absolute value.
-     */
-    if (temp < 0)
-      temp = -temp;		/* temp is abs value of input */
-    temp >>= Al;		/* apply the point transform */
-    absvalues[k] = temp;	/* save abs value for main pass */
-    if (temp == 1)
-      EOB = k;			/* EOB = index of last newly-nonzero coef */
-  }
-
-  /* Encode the AC coefficients per section G.1.2.3, fig. G.7 */
-  
-  r = 0;			/* r = run length of zeros */
-  BR = 0;			/* BR = count of buffered bits added now */
-  BR_buffer = entropy->bit_buffer + entropy->BE; /* Append bits to buffer */
-
-  for (k = cinfo->Ss; k <= Se; k++) {
-    if ((temp = absvalues[k]) == 0) {
-      r++;
-      continue;
-    }
-
-    /* Emit any required ZRLs, but not if they can be folded into EOB */
-    while (r > 15 && k <= EOB) {
-      /* emit any pending EOBRUN and the BE correction bits */
-      emit_eobrun(entropy);
-      /* Emit ZRL */
-      emit_symbol(entropy, entropy->ac_tbl_no, 0xF0);
-      r -= 16;
-      /* Emit buffered correction bits that must be associated with ZRL */
-      emit_buffered_bits(entropy, BR_buffer, BR);
-      BR_buffer = entropy->bit_buffer; /* BE bits are gone now */
-      BR = 0;
-    }
-
-    /* If the coef was previously nonzero, it only needs a correction bit.
-     * NOTE: a straight translation of the spec's figure G.7 would suggest
-     * that we also need to test r > 15.  But if r > 15, we can only get here
-     * if k > EOB, which implies that this coefficient is not 1.
-     */
-    if (temp > 1) {
-      /* The correction bit is the next bit of the absolute value. */
-      BR_buffer[BR++] = (char) (temp & 1);
-      continue;
-    }
-
-    /* Emit any pending EOBRUN and the BE correction bits */
-    emit_eobrun(entropy);
-
-    /* Count/emit Huffman symbol for run length / number of bits */
-    emit_symbol(entropy, entropy->ac_tbl_no, (r << 4) + 1);
-
-    /* Emit output bit for newly-nonzero coef */
-    temp = ((*block)[jpeg_natural_order[k]] < 0) ? 0 : 1;
-    emit_bits(entropy, (unsigned int) temp, 1);
-
-    /* Emit buffered correction bits that must be associated with this code */
-    emit_buffered_bits(entropy, BR_buffer, BR);
-    BR_buffer = entropy->bit_buffer; /* BE bits are gone now */
-    BR = 0;
-    r = 0;			/* reset zero run length */
-  }
-
-  if (r > 0 || BR > 0) {	/* If there are trailing zeroes, */
-    entropy->EOBRUN++;		/* count an EOB */
-    entropy->BE += BR;		/* concat my correction bits to older ones */
-    /* We force out the EOB if we risk either:
-     * 1. overflow of the EOB counter;
-     * 2. overflow of the correction bit buffer during the next MCU.
-     */
-    if (entropy->EOBRUN == 0x7FFF || entropy->BE > (MAX_CORR_BITS-DCTSIZE2+1))
-      emit_eobrun(entropy);
-  }
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * Finish up at the end of a Huffman-compressed progressive scan.
- */
-
-METHODDEF(void)
-finish_pass_phuff (j_compress_ptr cinfo)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Flush out any buffered data */
-  emit_eobrun(entropy);
-  flush_bits(entropy);
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-}
-
-
-/*
- * Finish up a statistics-gathering pass and create the new Huffman tables.
- */
-
-METHODDEF(void)
-finish_pass_gather_phuff (j_compress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  wxjpeg_boolean is_DC_band;
-  int ci, tbl;
-  jpeg_component_info * compptr;
-  JHUFF_TBL **htblptr;
-  wxjpeg_boolean did[NUM_HUFF_TBLS];
-
-  /* Flush out buffered data (all we care about is counting the EOB symbol) */
-  emit_eobrun(entropy);
-
-  is_DC_band = (cinfo->Ss == 0);
-
-  /* It's important not to apply jpeg_gen_optimal_table more than once
-   * per table, because it clobbers the input frequency counts!
-   */
-  MEMZERO(did, SIZEOF(did));
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    if (is_DC_band) {
-      if (cinfo->Ah != 0)	/* DC refinement needs no table */
-	continue;
-      tbl = compptr->dc_tbl_no;
-    } else {
-      tbl = compptr->ac_tbl_no;
-    }
-    if (! did[tbl]) {
-      if (is_DC_band)
-        htblptr = & cinfo->dc_huff_tbl_ptrs[tbl];
-      else
-        htblptr = & cinfo->ac_huff_tbl_ptrs[tbl];
-      if (*htblptr == NULL)
-        *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->count_ptrs[tbl]);
-      did[tbl] = TRUE;
-    }
-  }
-}
-
-
-/*
- * Module initialization routine for progressive Huffman entropy encoding.
- */
-
-GLOBAL(void)
-jinit_phuff_encoder (j_compress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy;
-  int i;
-
-  entropy = (phuff_entropy_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(phuff_entropy_encoder));
-  cinfo->entropy = (struct jpeg_entropy_encoder *) entropy;
-  entropy->pub.start_pass = start_pass_phuff;
-
-  /* Mark tables unallocated */
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    entropy->derived_tbls[i] = NULL;
-    entropy->count_ptrs[i] = NULL;
-  }
-  entropy->bit_buffer = NULL;	/* needed only in AC refinement scan */
-}
-
-#endif /* C_PROGRESSIVE_SUPPORTED */
+/*
+ * jcphuff.c
+ *
+ * Copyright (C) 1995-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy encoding routines for progressive JPEG.
+ *
+ * We do not support output suspension in this module, since the library
+ * currently does not allow multiple-scan files to be written with output
+ * suspension.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jchuff.h"		/* Declarations shared with jchuff.c */
+
+#ifdef C_PROGRESSIVE_SUPPORTED
+
+/* Expanded entropy encoder object for progressive Huffman encoding. */
+
+typedef struct {
+  struct jpeg_entropy_encoder pub; /* public fields */
+
+  /* Mode flag: TRUE for optimization, FALSE for actual data output */
+  wxjpeg_boolean gather_statistics;
+
+  /* Bit-level coding status.
+   * next_output_byte/free_in_buffer are local copies of cinfo->dest fields.
+   */
+  JOCTET * next_output_byte;	/* => next byte to write in buffer */
+  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
+  JPEG_INT32 put_buffer;		/* current bit-accumulation buffer */
+  int put_bits;			/* # of bits now in it */
+  j_compress_ptr cinfo;		/* link to cinfo (needed for dump_buffer) */
+
+  /* Coding status for DC components */
+  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
+
+  /* Coding status for AC components */
+  int ac_tbl_no;		/* the table number of the single component */
+  unsigned int EOBRUN;		/* run length of EOBs */
+  unsigned int BE;		/* # of buffered correction bits before MCU */
+  char * bit_buffer;		/* buffer for correction bits (1 per char) */
+  /* packing correction bits tightly would save some space but cost time... */
+
+  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
+  int next_restart_num;		/* next restart number to write (0-7) */
+
+  /* Pointers to derived tables (these workspaces have image lifespan).
+   * Since any one scan codes only DC or only AC, we only need one set
+   * of tables, not one for DC and one for AC.
+   */
+  c_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
+
+  /* Statistics tables for optimization; again, one set is enough */
+  long * count_ptrs[NUM_HUFF_TBLS];
+} phuff_entropy_encoder;
+
+typedef phuff_entropy_encoder * phuff_entropy_ptr;
+
+/* MAX_CORR_BITS is the number of bits the AC refinement correction-bit
+ * buffer can hold.  Larger sizes may slightly improve compression, but
+ * 1000 is already well into the realm of overkill.
+ * The minimum safe size is 64 bits.
+ */
+
+#define MAX_CORR_BITS  1000	/* Max # of correction bits I can buffer */
+
+/* IRIGHT_SHIFT is like RIGHT_SHIFT, but works on int rather than INT32.
+ * We assume that int right shift is unsigned if INT32 right shift is,
+ * which should be safe.
+ */
+
+#ifdef RIGHT_SHIFT_IS_UNSIGNED
+#define ISHIFT_TEMPS	int ishift_temp;
+#define IRIGHT_SHIFT(x,shft)  \
+	((ishift_temp = (x)) < 0 ? \
+	 (ishift_temp >> (shft)) | ((~0) << (16-(shft))) : \
+	 (ishift_temp >> (shft)))
+#else
+#define ISHIFT_TEMPS
+#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))
+#endif
+
+/* Forward declarations */
+METHODDEF(wxjpeg_boolean) encode_mcu_DC_first JPP((j_compress_ptr cinfo,
+					    JBLOCKROW *MCU_data));
+METHODDEF(wxjpeg_boolean) encode_mcu_AC_first JPP((j_compress_ptr cinfo,
+					    JBLOCKROW *MCU_data));
+METHODDEF(wxjpeg_boolean) encode_mcu_DC_refine JPP((j_compress_ptr cinfo,
+					     JBLOCKROW *MCU_data));
+METHODDEF(wxjpeg_boolean) encode_mcu_AC_refine JPP((j_compress_ptr cinfo,
+					     JBLOCKROW *MCU_data));
+METHODDEF(void) finish_pass_phuff JPP((j_compress_ptr cinfo));
+METHODDEF(void) finish_pass_gather_phuff JPP((j_compress_ptr cinfo));
+
+
+/*
+ * Initialize for a Huffman-compressed scan using progressive JPEG.
+ */
+
+METHODDEF(void)
+start_pass_phuff (j_compress_ptr cinfo, wxjpeg_boolean gather_statistics)
+{  
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  wxjpeg_boolean is_DC_band;
+  int ci, tbl;
+  jpeg_component_info * compptr;
+
+  entropy->cinfo = cinfo;
+  entropy->gather_statistics = gather_statistics;
+
+  is_DC_band = (cinfo->Ss == 0);
+
+  /* We assume jcmaster.c already validated the scan parameters. */
+
+  /* Select execution routines */
+  if (cinfo->Ah == 0) {
+    if (is_DC_band)
+      entropy->pub.encode_mcu = encode_mcu_DC_first;
+    else
+      entropy->pub.encode_mcu = encode_mcu_AC_first;
+  } else {
+    if (is_DC_band)
+      entropy->pub.encode_mcu = encode_mcu_DC_refine;
+    else {
+      entropy->pub.encode_mcu = encode_mcu_AC_refine;
+      /* AC refinement needs a correction bit buffer */
+      if (entropy->bit_buffer == NULL)
+	entropy->bit_buffer = (char *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      MAX_CORR_BITS * SIZEOF(char));
+    }
+  }
+  if (gather_statistics)
+    entropy->pub.finish_pass = finish_pass_gather_phuff;
+  else
+    entropy->pub.finish_pass = finish_pass_phuff;
+
+  /* Only DC coefficients may be interleaved, so cinfo->comps_in_scan = 1
+   * for AC coefficients.
+   */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    /* Initialize DC predictions to 0 */
+    entropy->last_dc_val[ci] = 0;
+    /* Get table index */
+    if (is_DC_band) {
+      if (cinfo->Ah != 0)	/* DC refinement needs no table */
+	continue;
+      tbl = compptr->dc_tbl_no;
+    } else {
+      entropy->ac_tbl_no = tbl = compptr->ac_tbl_no;
+    }
+    if (gather_statistics) {
+      /* Check for invalid table index */
+      /* (make_c_derived_tbl does this in the other path) */
+      if (tbl < 0 || tbl >= NUM_HUFF_TBLS)
+        ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tbl);
+      /* Allocate and zero the statistics tables */
+      /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */
+      if (entropy->count_ptrs[tbl] == NULL)
+	entropy->count_ptrs[tbl] = (long *)
+	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				      257 * SIZEOF(long));
+      MEMZERO(entropy->count_ptrs[tbl], 257 * SIZEOF(long));
+    } else {
+      /* Compute derived values for Huffman table */
+      /* We may do this more than once for a table, but it's not expensive */
+      jpeg_make_c_derived_tbl(cinfo, is_DC_band, tbl,
+			      & entropy->derived_tbls[tbl]);
+    }
+  }
+
+  /* Initialize AC stuff */
+  entropy->EOBRUN = 0;
+  entropy->BE = 0;
+
+  /* Initialize bit buffer to empty */
+  entropy->put_buffer = 0;
+  entropy->put_bits = 0;
+
+  /* Initialize restart stuff */
+  entropy->restarts_to_go = cinfo->restart_interval;
+  entropy->next_restart_num = 0;
+}
+
+
+/* Outputting bytes to the file.
+ * NB: these must be called only when actually outputting,
+ * that is, entropy->gather_statistics == FALSE.
+ */
+
+/* Emit a byte */
+#define emit_byte(entropy,val)  \
+	{ *(entropy)->next_output_byte++ = (JOCTET) (val);  \
+	  if (--(entropy)->free_in_buffer == 0)  \
+	    dump_buffer(entropy); }
+
+
+LOCAL(void)
+dump_buffer (phuff_entropy_ptr entropy)
+/* Empty the output buffer; we do not support suspension in this module. */
+{
+  struct jpeg_destination_mgr * dest = entropy->cinfo->dest;
+
+  if (! (*dest->empty_output_buffer) (entropy->cinfo))
+    ERREXIT(entropy->cinfo, JERR_CANT_SUSPEND);
+  /* After a successful buffer dump, must reset buffer pointers */
+  entropy->next_output_byte = dest->next_output_byte;
+  entropy->free_in_buffer = dest->free_in_buffer;
+}
+
+
+/* Outputting bits to the file */
+
+/* Only the right 24 bits of put_buffer are used; the valid bits are
+ * left-justified in this part.  At most 16 bits can be passed to emit_bits
+ * in one call, and we never retain more than 7 bits in put_buffer
+ * between calls, so 24 bits are sufficient.
+ */
+
+INLINE
+LOCAL(void)
+emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size)
+/* Emit some bits, unless we are in gather mode */
+{
+  /* This routine is heavily used, so it's worth coding tightly. */
+  register JPEG_INT32 put_buffer = (JPEG_INT32) code;
+  register int put_bits = entropy->put_bits;
+
+  /* if size is 0, caller used an invalid Huffman table entry */
+  if (size == 0)
+    ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);
+
+  if (entropy->gather_statistics)
+    return;			/* do nothing if we're only getting stats */
+
+  put_buffer &= (((JPEG_INT32) 1)<<size) - 1; /* mask off any extra bits in code */
+  
+  put_bits += size;		/* new number of bits in buffer */
+  
+  put_buffer <<= 24 - put_bits; /* align incoming bits */
+
+  put_buffer |= entropy->put_buffer; /* and merge with old buffer contents */
+
+  while (put_bits >= 8) {
+    int c = (int) ((put_buffer >> 16) & 0xFF);
+    
+    emit_byte(entropy, c);
+    if (c == 0xFF) {		/* need to stuff a zero byte? */
+      emit_byte(entropy, 0);
+    }
+    put_buffer <<= 8;
+    put_bits -= 8;
+  }
+
+  entropy->put_buffer = put_buffer; /* update variables */
+  entropy->put_bits = put_bits;
+}
+
+
+LOCAL(void)
+flush_bits (phuff_entropy_ptr entropy)
+{
+  emit_bits(entropy, 0x7F, 7); /* fill any partial byte with ones */
+  entropy->put_buffer = 0;     /* and reset bit-buffer to empty */
+  entropy->put_bits = 0;
+}
+
+
+/*
+ * Emit (or just count) a Huffman symbol.
+ */
+
+INLINE
+LOCAL(void)
+emit_symbol (phuff_entropy_ptr entropy, int tbl_no, int symbol)
+{
+  if (entropy->gather_statistics)
+    entropy->count_ptrs[tbl_no][symbol]++;
+  else {
+    c_derived_tbl * tbl = entropy->derived_tbls[tbl_no];
+    emit_bits(entropy, tbl->ehufco[symbol], tbl->ehufsi[symbol]);
+  }
+}
+
+
+/*
+ * Emit bits from a correction bit buffer.
+ */
+
+LOCAL(void)
+emit_buffered_bits (phuff_entropy_ptr entropy, char * bufstart,
+		    unsigned int nbits)
+{
+  if (entropy->gather_statistics)
+    return;			/* no real work */
+
+  while (nbits > 0) {
+    emit_bits(entropy, (unsigned int) (*bufstart), 1);
+    bufstart++;
+    nbits--;
+  }
+}
+
+
+/*
+ * Emit any pending EOBRUN symbol.
+ */
+
+LOCAL(void)
+emit_eobrun (phuff_entropy_ptr entropy)
+{
+  register int temp, nbits;
+
+  if (entropy->EOBRUN > 0) {	/* if there is any pending EOBRUN */
+    temp = entropy->EOBRUN;
+    nbits = 0;
+    while ((temp >>= 1))
+      nbits++;
+    /* safety check: shouldn't happen given limited correction-bit buffer */
+    if (nbits > 14)
+      ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);
+
+    emit_symbol(entropy, entropy->ac_tbl_no, nbits << 4);
+    if (nbits)
+      emit_bits(entropy, entropy->EOBRUN, nbits);
+
+    entropy->EOBRUN = 0;
+
+    /* Emit any buffered correction bits */
+    emit_buffered_bits(entropy, entropy->bit_buffer, entropy->BE);
+    entropy->BE = 0;
+  }
+}
+
+
+/*
+ * Emit a restart marker & resynchronize predictions.
+ */
+
+LOCAL(void)
+emit_restart (phuff_entropy_ptr entropy, int restart_num)
+{
+  int ci;
+
+  emit_eobrun(entropy);
+
+  if (! entropy->gather_statistics) {
+    flush_bits(entropy);
+    emit_byte(entropy, 0xFF);
+    emit_byte(entropy, JPEG_RST0 + restart_num);
+  }
+
+  if (entropy->cinfo->Ss == 0) {
+    /* Re-initialize DC predictions to 0 */
+    for (ci = 0; ci < entropy->cinfo->comps_in_scan; ci++)
+      entropy->last_dc_val[ci] = 0;
+  } else {
+    /* Re-initialize all AC-related fields to 0 */
+    entropy->EOBRUN = 0;
+    entropy->BE = 0;
+  }
+}
+
+
+/*
+ * MCU encoding for DC initial scan (either spectral selection,
+ * or first pass of successive approximation).
+ */
+
+METHODDEF(wxjpeg_boolean)
+encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  register int temp, temp2;
+  register int nbits;
+  int blkn, ci;
+  int Al = cinfo->Al;
+  JBLOCKROW block;
+  jpeg_component_info * compptr;
+  ISHIFT_TEMPS
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval)
+    if (entropy->restarts_to_go == 0)
+      emit_restart(entropy, entropy->next_restart_num);
+
+  /* Encode the MCU data blocks */
+  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
+    block = MCU_data[blkn];
+    ci = cinfo->MCU_membership[blkn];
+    compptr = cinfo->cur_comp_info[ci];
+
+    /* Compute the DC value after the required point transform by Al.
+     * This is simply an arithmetic right shift.
+     */
+    temp2 = IRIGHT_SHIFT((int) ((*block)[0]), Al);
+
+    /* DC differences are figured on the point-transformed values. */
+    temp = temp2 - entropy->last_dc_val[ci];
+    entropy->last_dc_val[ci] = temp2;
+
+    /* Encode the DC coefficient difference per section G.1.2.1 */
+    temp2 = temp;
+    if (temp < 0) {
+      temp = -temp;		/* temp is abs value of input */
+      /* For a negative input, want temp2 = bitwise complement of abs(input) */
+      /* This code assumes we are on a two's complement machine */
+      temp2--;
+    }
+    
+    /* Find the number of bits needed for the magnitude of the coefficient */
+    nbits = 0;
+    while (temp) {
+      nbits++;
+      temp >>= 1;
+    }
+    /* Check for out-of-range coefficient values.
+     * Since we're encoding a difference, the range limit is twice as much.
+     */
+    if (nbits > MAX_COEF_BITS+1)
+      ERREXIT(cinfo, JERR_BAD_DCT_COEF);
+    
+    /* Count/emit the Huffman-coded symbol for the number of bits */
+    emit_symbol(entropy, compptr->dc_tbl_no, nbits);
+    
+    /* Emit that number of bits of the value, if positive, */
+    /* or the complement of its magnitude, if negative. */
+    if (nbits)			/* emit_bits rejects calls with size 0 */
+      emit_bits(entropy, (unsigned int) temp2, nbits);
+  }
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * MCU encoding for AC initial scan (either spectral selection,
+ * or first pass of successive approximation).
+ */
+
+METHODDEF(wxjpeg_boolean)
+encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  register int temp, temp2;
+  register int nbits;
+  register int r, k;
+  int Se = cinfo->Se;
+  int Al = cinfo->Al;
+  JBLOCKROW block;
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval)
+    if (entropy->restarts_to_go == 0)
+      emit_restart(entropy, entropy->next_restart_num);
+
+  /* Encode the MCU data block */
+  block = MCU_data[0];
+
+  /* Encode the AC coefficients per section G.1.2.2, fig. G.3 */
+  
+  r = 0;			/* r = run length of zeros */
+   
+  for (k = cinfo->Ss; k <= Se; k++) {
+    if ((temp = (*block)[jpeg_natural_order[k]]) == 0) {
+      r++;
+      continue;
+    }
+    /* We must apply the point transform by Al.  For AC coefficients this
+     * is an integer division with rounding towards 0.  To do this portably
+     * in C, we shift after obtaining the absolute value; so the code is
+     * interwoven with finding the abs value (temp) and output bits (temp2).
+     */
+    if (temp < 0) {
+      temp = -temp;		/* temp is abs value of input */
+      temp >>= Al;		/* apply the point transform */
+      /* For a negative coef, want temp2 = bitwise complement of abs(coef) */
+      temp2 = ~temp;
+    } else {
+      temp >>= Al;		/* apply the point transform */
+      temp2 = temp;
+    }
+    /* Watch out for case that nonzero coef is zero after point transform */
+    if (temp == 0) {
+      r++;
+      continue;
+    }
+
+    /* Emit any pending EOBRUN */
+    if (entropy->EOBRUN > 0)
+      emit_eobrun(entropy);
+    /* if run length > 15, must emit special run-length-16 codes (0xF0) */
+    while (r > 15) {
+      emit_symbol(entropy, entropy->ac_tbl_no, 0xF0);
+      r -= 16;
+    }
+
+    /* Find the number of bits needed for the magnitude of the coefficient */
+    nbits = 1;			/* there must be at least one 1 bit */
+    while ((temp >>= 1))
+      nbits++;
+    /* Check for out-of-range coefficient values */
+    if (nbits > MAX_COEF_BITS)
+      ERREXIT(cinfo, JERR_BAD_DCT_COEF);
+
+    /* Count/emit Huffman symbol for run length / number of bits */
+    emit_symbol(entropy, entropy->ac_tbl_no, (r << 4) + nbits);
+
+    /* Emit that number of bits of the value, if positive, */
+    /* or the complement of its magnitude, if negative. */
+    emit_bits(entropy, (unsigned int) temp2, nbits);
+
+    r = 0;			/* reset zero run length */
+  }
+
+  if (r > 0) {			/* If there are trailing zeroes, */
+    entropy->EOBRUN++;		/* count an EOB */
+    if (entropy->EOBRUN == 0x7FFF)
+      emit_eobrun(entropy);	/* force it out to avoid overflow */
+  }
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * MCU encoding for DC successive approximation refinement scan.
+ * Note: we assume such scans can be multi-component, although the spec
+ * is not very clear on the point.
+ */
+
+METHODDEF(wxjpeg_boolean)
+encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  register int temp;
+  int blkn;
+  int Al = cinfo->Al;
+  JBLOCKROW block;
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval)
+    if (entropy->restarts_to_go == 0)
+      emit_restart(entropy, entropy->next_restart_num);
+
+  /* Encode the MCU data blocks */
+  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
+    block = MCU_data[blkn];
+
+    /* We simply emit the Al'th bit of the DC coefficient value. */
+    temp = (*block)[0];
+    emit_bits(entropy, (unsigned int) (temp >> Al), 1);
+  }
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * MCU encoding for AC successive approximation refinement scan.
+ */
+
+METHODDEF(wxjpeg_boolean)
+encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  register int temp;
+  register int r, k;
+  int EOB;
+  char *BR_buffer;
+  unsigned int BR;
+  int Se = cinfo->Se;
+  int Al = cinfo->Al;
+  JBLOCKROW block;
+  int absvalues[DCTSIZE2];
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Emit restart marker if needed */
+  if (cinfo->restart_interval)
+    if (entropy->restarts_to_go == 0)
+      emit_restart(entropy, entropy->next_restart_num);
+
+  /* Encode the MCU data block */
+  block = MCU_data[0];
+
+  /* It is convenient to make a pre-pass to determine the transformed
+   * coefficients' absolute values and the EOB position.
+   */
+  EOB = 0;
+  for (k = cinfo->Ss; k <= Se; k++) {
+    temp = (*block)[jpeg_natural_order[k]];
+    /* We must apply the point transform by Al.  For AC coefficients this
+     * is an integer division with rounding towards 0.  To do this portably
+     * in C, we shift after obtaining the absolute value.
+     */
+    if (temp < 0)
+      temp = -temp;		/* temp is abs value of input */
+    temp >>= Al;		/* apply the point transform */
+    absvalues[k] = temp;	/* save abs value for main pass */
+    if (temp == 1)
+      EOB = k;			/* EOB = index of last newly-nonzero coef */
+  }
+
+  /* Encode the AC coefficients per section G.1.2.3, fig. G.7 */
+  
+  r = 0;			/* r = run length of zeros */
+  BR = 0;			/* BR = count of buffered bits added now */
+  BR_buffer = entropy->bit_buffer + entropy->BE; /* Append bits to buffer */
+
+  for (k = cinfo->Ss; k <= Se; k++) {
+    if ((temp = absvalues[k]) == 0) {
+      r++;
+      continue;
+    }
+
+    /* Emit any required ZRLs, but not if they can be folded into EOB */
+    while (r > 15 && k <= EOB) {
+      /* emit any pending EOBRUN and the BE correction bits */
+      emit_eobrun(entropy);
+      /* Emit ZRL */
+      emit_symbol(entropy, entropy->ac_tbl_no, 0xF0);
+      r -= 16;
+      /* Emit buffered correction bits that must be associated with ZRL */
+      emit_buffered_bits(entropy, BR_buffer, BR);
+      BR_buffer = entropy->bit_buffer; /* BE bits are gone now */
+      BR = 0;
+    }
+
+    /* If the coef was previously nonzero, it only needs a correction bit.
+     * NOTE: a straight translation of the spec's figure G.7 would suggest
+     * that we also need to test r > 15.  But if r > 15, we can only get here
+     * if k > EOB, which implies that this coefficient is not 1.
+     */
+    if (temp > 1) {
+      /* The correction bit is the next bit of the absolute value. */
+      BR_buffer[BR++] = (char) (temp & 1);
+      continue;
+    }
+
+    /* Emit any pending EOBRUN and the BE correction bits */
+    emit_eobrun(entropy);
+
+    /* Count/emit Huffman symbol for run length / number of bits */
+    emit_symbol(entropy, entropy->ac_tbl_no, (r << 4) + 1);
+
+    /* Emit output bit for newly-nonzero coef */
+    temp = ((*block)[jpeg_natural_order[k]] < 0) ? 0 : 1;
+    emit_bits(entropy, (unsigned int) temp, 1);
+
+    /* Emit buffered correction bits that must be associated with this code */
+    emit_buffered_bits(entropy, BR_buffer, BR);
+    BR_buffer = entropy->bit_buffer; /* BE bits are gone now */
+    BR = 0;
+    r = 0;			/* reset zero run length */
+  }
+
+  if (r > 0 || BR > 0) {	/* If there are trailing zeroes, */
+    entropy->EOBRUN++;		/* count an EOB */
+    entropy->BE += BR;		/* concat my correction bits to older ones */
+    /* We force out the EOB if we risk either:
+     * 1. overflow of the EOB counter;
+     * 2. overflow of the correction bit buffer during the next MCU.
+     */
+    if (entropy->EOBRUN == 0x7FFF || entropy->BE > (MAX_CORR_BITS-DCTSIZE2+1))
+      emit_eobrun(entropy);
+  }
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+
+  /* Update restart-interval state too */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0) {
+      entropy->restarts_to_go = cinfo->restart_interval;
+      entropy->next_restart_num++;
+      entropy->next_restart_num &= 7;
+    }
+    entropy->restarts_to_go--;
+  }
+
+  return TRUE;
+}
+
+
+/*
+ * Finish up at the end of a Huffman-compressed progressive scan.
+ */
+
+METHODDEF(void)
+finish_pass_phuff (j_compress_ptr cinfo)
+{   
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+
+  entropy->next_output_byte = cinfo->dest->next_output_byte;
+  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
+
+  /* Flush out any buffered data */
+  emit_eobrun(entropy);
+  flush_bits(entropy);
+
+  cinfo->dest->next_output_byte = entropy->next_output_byte;
+  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
+}
+
+
+/*
+ * Finish up a statistics-gathering pass and create the new Huffman tables.
+ */
+
+METHODDEF(void)
+finish_pass_gather_phuff (j_compress_ptr cinfo)
+{
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  wxjpeg_boolean is_DC_band;
+  int ci, tbl;
+  jpeg_component_info * compptr;
+  JHUFF_TBL **htblptr;
+  wxjpeg_boolean did[NUM_HUFF_TBLS];
+
+  /* Flush out buffered data (all we care about is counting the EOB symbol) */
+  emit_eobrun(entropy);
+
+  is_DC_band = (cinfo->Ss == 0);
+
+  /* It's important not to apply jpeg_gen_optimal_table more than once
+   * per table, because it clobbers the input frequency counts!
+   */
+  MEMZERO(did, SIZEOF(did));
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    if (is_DC_band) {
+      if (cinfo->Ah != 0)	/* DC refinement needs no table */
+	continue;
+      tbl = compptr->dc_tbl_no;
+    } else {
+      tbl = compptr->ac_tbl_no;
+    }
+    if (! did[tbl]) {
+      if (is_DC_band)
+        htblptr = & cinfo->dc_huff_tbl_ptrs[tbl];
+      else
+        htblptr = & cinfo->ac_huff_tbl_ptrs[tbl];
+      if (*htblptr == NULL)
+        *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->count_ptrs[tbl]);
+      did[tbl] = TRUE;
+    }
+  }
+}
+
+
+/*
+ * Module initialization routine for progressive Huffman entropy encoding.
+ */
+
+GLOBAL(void)
+jinit_phuff_encoder (j_compress_ptr cinfo)
+{
+  phuff_entropy_ptr entropy;
+  int i;
+
+  entropy = (phuff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(phuff_entropy_encoder));
+  cinfo->entropy = (struct jpeg_entropy_encoder *) entropy;
+  entropy->pub.start_pass = start_pass_phuff;
+
+  /* Mark tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->derived_tbls[i] = NULL;
+    entropy->count_ptrs[i] = NULL;
+  }
+  entropy->bit_buffer = NULL;	/* needed only in AC refinement scan */
+}
+
+#endif /* C_PROGRESSIVE_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jcprepct.c b/Source/3rd Party/wx/src/jpeg/jcprepct.c
index 6e38b33fb..d10624205 100644
--- a/Source/3rd Party/wx/src/jpeg/jcprepct.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcprepct.c	
@@ -1,354 +1,354 @@
-/*
- * jcprepct.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the compression preprocessing controller.
- * This controller manages the color conversion, downsampling,
- * and edge expansion steps.
- *
- * Most of the complexity here is associated with buffering input rows
- * as required by the downsampler.  See the comments at the head of
- * jcsample.c for the downsampler's needs.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* At present, jcsample.c can request context rows only for smoothing.
- * In the future, we might also need context rows for CCIR601 sampling
- * or other more-complex downsampling procedures.  The code to support
- * context rows should be compiled only if needed.
- */
-#ifdef INPUT_SMOOTHING_SUPPORTED
-#define CONTEXT_ROWS_SUPPORTED
-#endif
-
-
-/*
- * For the simple (no-context-row) case, we just need to buffer one
- * row group's worth of pixels for the downsampling step.  At the bottom of
- * the image, we pad to a full row group by replicating the last pixel row.
- * The downsampler's last output row is then replicated if needed to pad
- * out to a full iMCU row.
- *
- * When providing context rows, we must buffer three row groups' worth of
- * pixels.  Three row groups are physically allocated, but the row pointer
- * arrays are made five row groups high, with the extra pointers above and
- * below "wrapping around" to point to the last and first real row groups.
- * This allows the downsampler to access the proper context rows.
- * At the top and bottom of the image, we create dummy context rows by
- * copying the first or last real pixel row.  This copying could be avoided
- * by pointer hacking as is done in jdmainct.c, but it doesn't seem worth the
- * trouble on the compression side.
- */
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_c_prep_controller pub; /* public fields */
-
-  /* Downsampling input buffer.  This buffer holds color-converted data
-   * until we have enough to do a downsample step.
-   */
-  JSAMPARRAY color_buf[MAX_COMPONENTS];
-
-  JDIMENSION rows_to_go;	/* counts rows remaining in source image */
-  int next_buf_row;		/* index of next row to store in color_buf */
-
-#ifdef CONTEXT_ROWS_SUPPORTED	/* only needed for context case */
-  int this_row_group;		/* starting row index of group to process */
-  int next_buf_stop;		/* downsample when we reach this index */
-#endif
-} my_prep_controller;
-
-typedef my_prep_controller * my_prep_ptr;
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_prep (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
-
-  if (pass_mode != JBUF_PASS_THRU)
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-
-  /* Initialize total-height counter for detecting bottom of image */
-  prep->rows_to_go = cinfo->image_height;
-  /* Mark the conversion buffer empty */
-  prep->next_buf_row = 0;
-#ifdef CONTEXT_ROWS_SUPPORTED
-  /* Preset additional state variables for context mode.
-   * These aren't used in non-context mode, so we needn't test which mode.
-   */
-  prep->this_row_group = 0;
-  /* Set next_buf_stop to stop after two row groups have been read in. */
-  prep->next_buf_stop = 2 * cinfo->max_v_samp_factor;
-#endif
-}
-
-
-/*
- * Expand an image vertically from height input_rows to height output_rows,
- * by duplicating the bottom row.
- */
-
-LOCAL(void)
-expand_bottom_edge (JSAMPARRAY image_data, JDIMENSION num_cols,
-		    int input_rows, int output_rows)
-{
-  register int row;
-
-  for (row = input_rows; row < output_rows; row++) {
-    jcopy_sample_rows(image_data, input_rows-1, image_data, row,
-		      1, num_cols);
-  }
-}
-
-
-/*
- * Process some data in the simple no-context case.
- *
- * Preprocessor output data is counted in "row groups".  A row group
- * is defined to be v_samp_factor sample rows of each component.
- * Downsampling will produce this much data from each max_v_samp_factor
- * input rows.
- */
-
-METHODDEF(void)
-pre_process_data (j_compress_ptr cinfo,
-		  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-		  JDIMENSION in_rows_avail,
-		  JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,
-		  JDIMENSION out_row_groups_avail)
-{
-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
-  int numrows, ci;
-  JDIMENSION inrows;
-  jpeg_component_info * compptr;
-
-  while (*in_row_ctr < in_rows_avail &&
-	 *out_row_group_ctr < out_row_groups_avail) {
-    /* Do color conversion to fill the conversion buffer. */
-    inrows = in_rows_avail - *in_row_ctr;
-    numrows = cinfo->max_v_samp_factor - prep->next_buf_row;
-    numrows = (int) MIN((JDIMENSION) numrows, inrows);
-    (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,
-				       prep->color_buf,
-				       (JDIMENSION) prep->next_buf_row,
-				       numrows);
-    *in_row_ctr += numrows;
-    prep->next_buf_row += numrows;
-    prep->rows_to_go -= numrows;
-    /* If at bottom of image, pad to fill the conversion buffer. */
-    if (prep->rows_to_go == 0 &&
-	prep->next_buf_row < cinfo->max_v_samp_factor) {
-      for (ci = 0; ci < cinfo->num_components; ci++) {
-	expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,
-			   prep->next_buf_row, cinfo->max_v_samp_factor);
-      }
-      prep->next_buf_row = cinfo->max_v_samp_factor;
-    }
-    /* If we've filled the conversion buffer, empty it. */
-    if (prep->next_buf_row == cinfo->max_v_samp_factor) {
-      (*cinfo->downsample->downsample) (cinfo,
-					prep->color_buf, (JDIMENSION) 0,
-					output_buf, *out_row_group_ctr);
-      prep->next_buf_row = 0;
-      (*out_row_group_ctr)++;
-    }
-    /* If at bottom of image, pad the output to a full iMCU height.
-     * Note we assume the caller is providing a one-iMCU-height output buffer!
-     */
-    if (prep->rows_to_go == 0 &&
-	*out_row_group_ctr < out_row_groups_avail) {
-      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	   ci++, compptr++) {
-	expand_bottom_edge(output_buf[ci],
-			   compptr->width_in_blocks * DCTSIZE,
-			   (int) (*out_row_group_ctr * compptr->v_samp_factor),
-			   (int) (out_row_groups_avail * compptr->v_samp_factor));
-      }
-      *out_row_group_ctr = out_row_groups_avail;
-      break;			/* can exit outer loop without test */
-    }
-  }
-}
-
-
-#ifdef CONTEXT_ROWS_SUPPORTED
-
-/*
- * Process some data in the context case.
- */
-
-METHODDEF(void)
-pre_process_context (j_compress_ptr cinfo,
-		     JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-		     JDIMENSION in_rows_avail,
-		     JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,
-		     JDIMENSION out_row_groups_avail)
-{
-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
-  int numrows, ci;
-  int buf_height = cinfo->max_v_samp_factor * 3;
-  JDIMENSION inrows;
-
-  while (*out_row_group_ctr < out_row_groups_avail) {
-    if (*in_row_ctr < in_rows_avail) {
-      /* Do color conversion to fill the conversion buffer. */
-      inrows = in_rows_avail - *in_row_ctr;
-      numrows = prep->next_buf_stop - prep->next_buf_row;
-      numrows = (int) MIN((JDIMENSION) numrows, inrows);
-      (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,
-					 prep->color_buf,
-					 (JDIMENSION) prep->next_buf_row,
-					 numrows);
-      /* Pad at top of image, if first time through */
-      if (prep->rows_to_go == cinfo->image_height) {
-	for (ci = 0; ci < cinfo->num_components; ci++) {
-	  int row;
-	  for (row = 1; row <= cinfo->max_v_samp_factor; row++) {
-	    jcopy_sample_rows(prep->color_buf[ci], 0,
-			      prep->color_buf[ci], -row,
-			      1, cinfo->image_width);
-	  }
-	}
-      }
-      *in_row_ctr += numrows;
-      prep->next_buf_row += numrows;
-      prep->rows_to_go -= numrows;
-    } else {
-      /* Return for more data, unless we are at the bottom of the image. */
-      if (prep->rows_to_go != 0)
-	break;
-      /* When at bottom of image, pad to fill the conversion buffer. */
-      if (prep->next_buf_row < prep->next_buf_stop) {
-	for (ci = 0; ci < cinfo->num_components; ci++) {
-	  expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,
-			     prep->next_buf_row, prep->next_buf_stop);
-	}
-	prep->next_buf_row = prep->next_buf_stop;
-      }
-    }
-    /* If we've gotten enough data, downsample a row group. */
-    if (prep->next_buf_row == prep->next_buf_stop) {
-      (*cinfo->downsample->downsample) (cinfo,
-					prep->color_buf,
-					(JDIMENSION) prep->this_row_group,
-					output_buf, *out_row_group_ctr);
-      (*out_row_group_ctr)++;
-      /* Advance pointers with wraparound as necessary. */
-      prep->this_row_group += cinfo->max_v_samp_factor;
-      if (prep->this_row_group >= buf_height)
-	prep->this_row_group = 0;
-      if (prep->next_buf_row >= buf_height)
-	prep->next_buf_row = 0;
-      prep->next_buf_stop = prep->next_buf_row + cinfo->max_v_samp_factor;
-    }
-  }
-}
-
-
-/*
- * Create the wrapped-around downsampling input buffer needed for context mode.
- */
-
-LOCAL(void)
-create_context_buffer (j_compress_ptr cinfo)
-{
-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
-  int rgroup_height = cinfo->max_v_samp_factor;
-  int ci, i;
-  jpeg_component_info * compptr;
-  JSAMPARRAY true_buffer, fake_buffer;
-
-  /* Grab enough space for fake row pointers for all the components;
-   * we need five row groups' worth of pointers for each component.
-   */
-  fake_buffer = (JSAMPARRAY)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(cinfo->num_components * 5 * rgroup_height) *
-				SIZEOF(JSAMPROW));
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Allocate the actual buffer space (3 row groups) for this component.
-     * We make the buffer wide enough to allow the downsampler to edge-expand
-     * horizontally within the buffer, if it so chooses.
-     */
-    true_buffer = (*cinfo->mem->alloc_sarray)
-      ((j_common_ptr) cinfo, JPOOL_IMAGE,
-       (JDIMENSION) (((long) compptr->width_in_blocks * DCTSIZE *
-		      cinfo->max_h_samp_factor) / compptr->h_samp_factor),
-       (JDIMENSION) (3 * rgroup_height));
-    /* Copy true buffer row pointers into the middle of the fake row array */
-    MEMCOPY(fake_buffer + rgroup_height, true_buffer,
-	    3 * rgroup_height * SIZEOF(JSAMPROW));
-    /* Fill in the above and below wraparound pointers */
-    for (i = 0; i < rgroup_height; i++) {
-      fake_buffer[i] = true_buffer[2 * rgroup_height + i];
-      fake_buffer[4 * rgroup_height + i] = true_buffer[i];
-    }
-    prep->color_buf[ci] = fake_buffer + rgroup_height;
-    fake_buffer += 5 * rgroup_height; /* point to space for next component */
-  }
-}
-
-#endif /* CONTEXT_ROWS_SUPPORTED */
-
-
-/*
- * Initialize preprocessing controller.
- */
-
-GLOBAL(void)
-jinit_c_prep_controller (j_compress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_prep_ptr prep;
-  int ci;
-  jpeg_component_info * compptr;
-
-  if (need_full_buffer)		/* safety check */
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-
-  prep = (my_prep_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_prep_controller));
-  cinfo->prep = (struct jpeg_c_prep_controller *) prep;
-  prep->pub.start_pass = start_pass_prep;
-
-  /* Allocate the color conversion buffer.
-   * We make the buffer wide enough to allow the downsampler to edge-expand
-   * horizontally within the buffer, if it so chooses.
-   */
-  if (cinfo->downsample->need_context_rows) {
-    /* Set up to provide context rows */
-#ifdef CONTEXT_ROWS_SUPPORTED
-    prep->pub.pre_process_data = pre_process_context;
-    create_context_buffer(cinfo);
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    /* No context, just make it tall enough for one row group */
-    prep->pub.pre_process_data = pre_process_data;
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      prep->color_buf[ci] = (*cinfo->mem->alloc_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE,
-	 (JDIMENSION) (((long) compptr->width_in_blocks * DCTSIZE *
-			cinfo->max_h_samp_factor) / compptr->h_samp_factor),
-	 (JDIMENSION) cinfo->max_v_samp_factor);
-    }
-  }
-}
+/*
+ * jcprepct.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the compression preprocessing controller.
+ * This controller manages the color conversion, downsampling,
+ * and edge expansion steps.
+ *
+ * Most of the complexity here is associated with buffering input rows
+ * as required by the downsampler.  See the comments at the head of
+ * jcsample.c for the downsampler's needs.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* At present, jcsample.c can request context rows only for smoothing.
+ * In the future, we might also need context rows for CCIR601 sampling
+ * or other more-complex downsampling procedures.  The code to support
+ * context rows should be compiled only if needed.
+ */
+#ifdef INPUT_SMOOTHING_SUPPORTED
+#define CONTEXT_ROWS_SUPPORTED
+#endif
+
+
+/*
+ * For the simple (no-context-row) case, we just need to buffer one
+ * row group's worth of pixels for the downsampling step.  At the bottom of
+ * the image, we pad to a full row group by replicating the last pixel row.
+ * The downsampler's last output row is then replicated if needed to pad
+ * out to a full iMCU row.
+ *
+ * When providing context rows, we must buffer three row groups' worth of
+ * pixels.  Three row groups are physically allocated, but the row pointer
+ * arrays are made five row groups high, with the extra pointers above and
+ * below "wrapping around" to point to the last and first real row groups.
+ * This allows the downsampler to access the proper context rows.
+ * At the top and bottom of the image, we create dummy context rows by
+ * copying the first or last real pixel row.  This copying could be avoided
+ * by pointer hacking as is done in jdmainct.c, but it doesn't seem worth the
+ * trouble on the compression side.
+ */
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_c_prep_controller pub; /* public fields */
+
+  /* Downsampling input buffer.  This buffer holds color-converted data
+   * until we have enough to do a downsample step.
+   */
+  JSAMPARRAY color_buf[MAX_COMPONENTS];
+
+  JDIMENSION rows_to_go;	/* counts rows remaining in source image */
+  int next_buf_row;		/* index of next row to store in color_buf */
+
+#ifdef CONTEXT_ROWS_SUPPORTED	/* only needed for context case */
+  int this_row_group;		/* starting row index of group to process */
+  int next_buf_stop;		/* downsample when we reach this index */
+#endif
+} my_prep_controller;
+
+typedef my_prep_controller * my_prep_ptr;
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_prep (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
+
+  if (pass_mode != JBUF_PASS_THRU)
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+
+  /* Initialize total-height counter for detecting bottom of image */
+  prep->rows_to_go = cinfo->image_height;
+  /* Mark the conversion buffer empty */
+  prep->next_buf_row = 0;
+#ifdef CONTEXT_ROWS_SUPPORTED
+  /* Preset additional state variables for context mode.
+   * These aren't used in non-context mode, so we needn't test which mode.
+   */
+  prep->this_row_group = 0;
+  /* Set next_buf_stop to stop after two row groups have been read in. */
+  prep->next_buf_stop = 2 * cinfo->max_v_samp_factor;
+#endif
+}
+
+
+/*
+ * Expand an image vertically from height input_rows to height output_rows,
+ * by duplicating the bottom row.
+ */
+
+LOCAL(void)
+expand_bottom_edge (JSAMPARRAY image_data, JDIMENSION num_cols,
+		    int input_rows, int output_rows)
+{
+  register int row;
+
+  for (row = input_rows; row < output_rows; row++) {
+    jcopy_sample_rows(image_data, input_rows-1, image_data, row,
+		      1, num_cols);
+  }
+}
+
+
+/*
+ * Process some data in the simple no-context case.
+ *
+ * Preprocessor output data is counted in "row groups".  A row group
+ * is defined to be v_samp_factor sample rows of each component.
+ * Downsampling will produce this much data from each max_v_samp_factor
+ * input rows.
+ */
+
+METHODDEF(void)
+pre_process_data (j_compress_ptr cinfo,
+		  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+		  JDIMENSION in_rows_avail,
+		  JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,
+		  JDIMENSION out_row_groups_avail)
+{
+  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
+  int numrows, ci;
+  JDIMENSION inrows;
+  jpeg_component_info * compptr;
+
+  while (*in_row_ctr < in_rows_avail &&
+	 *out_row_group_ctr < out_row_groups_avail) {
+    /* Do color conversion to fill the conversion buffer. */
+    inrows = in_rows_avail - *in_row_ctr;
+    numrows = cinfo->max_v_samp_factor - prep->next_buf_row;
+    numrows = (int) MIN((JDIMENSION) numrows, inrows);
+    (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,
+				       prep->color_buf,
+				       (JDIMENSION) prep->next_buf_row,
+				       numrows);
+    *in_row_ctr += numrows;
+    prep->next_buf_row += numrows;
+    prep->rows_to_go -= numrows;
+    /* If at bottom of image, pad to fill the conversion buffer. */
+    if (prep->rows_to_go == 0 &&
+	prep->next_buf_row < cinfo->max_v_samp_factor) {
+      for (ci = 0; ci < cinfo->num_components; ci++) {
+	expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,
+			   prep->next_buf_row, cinfo->max_v_samp_factor);
+      }
+      prep->next_buf_row = cinfo->max_v_samp_factor;
+    }
+    /* If we've filled the conversion buffer, empty it. */
+    if (prep->next_buf_row == cinfo->max_v_samp_factor) {
+      (*cinfo->downsample->downsample) (cinfo,
+					prep->color_buf, (JDIMENSION) 0,
+					output_buf, *out_row_group_ctr);
+      prep->next_buf_row = 0;
+      (*out_row_group_ctr)++;
+    }
+    /* If at bottom of image, pad the output to a full iMCU height.
+     * Note we assume the caller is providing a one-iMCU-height output buffer!
+     */
+    if (prep->rows_to_go == 0 &&
+	*out_row_group_ctr < out_row_groups_avail) {
+      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	   ci++, compptr++) {
+	expand_bottom_edge(output_buf[ci],
+			   compptr->width_in_blocks * DCTSIZE,
+			   (int) (*out_row_group_ctr * compptr->v_samp_factor),
+			   (int) (out_row_groups_avail * compptr->v_samp_factor));
+      }
+      *out_row_group_ctr = out_row_groups_avail;
+      break;			/* can exit outer loop without test */
+    }
+  }
+}
+
+
+#ifdef CONTEXT_ROWS_SUPPORTED
+
+/*
+ * Process some data in the context case.
+ */
+
+METHODDEF(void)
+pre_process_context (j_compress_ptr cinfo,
+		     JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+		     JDIMENSION in_rows_avail,
+		     JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,
+		     JDIMENSION out_row_groups_avail)
+{
+  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
+  int numrows, ci;
+  int buf_height = cinfo->max_v_samp_factor * 3;
+  JDIMENSION inrows;
+
+  while (*out_row_group_ctr < out_row_groups_avail) {
+    if (*in_row_ctr < in_rows_avail) {
+      /* Do color conversion to fill the conversion buffer. */
+      inrows = in_rows_avail - *in_row_ctr;
+      numrows = prep->next_buf_stop - prep->next_buf_row;
+      numrows = (int) MIN((JDIMENSION) numrows, inrows);
+      (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,
+					 prep->color_buf,
+					 (JDIMENSION) prep->next_buf_row,
+					 numrows);
+      /* Pad at top of image, if first time through */
+      if (prep->rows_to_go == cinfo->image_height) {
+	for (ci = 0; ci < cinfo->num_components; ci++) {
+	  int row;
+	  for (row = 1; row <= cinfo->max_v_samp_factor; row++) {
+	    jcopy_sample_rows(prep->color_buf[ci], 0,
+			      prep->color_buf[ci], -row,
+			      1, cinfo->image_width);
+	  }
+	}
+      }
+      *in_row_ctr += numrows;
+      prep->next_buf_row += numrows;
+      prep->rows_to_go -= numrows;
+    } else {
+      /* Return for more data, unless we are at the bottom of the image. */
+      if (prep->rows_to_go != 0)
+	break;
+      /* When at bottom of image, pad to fill the conversion buffer. */
+      if (prep->next_buf_row < prep->next_buf_stop) {
+	for (ci = 0; ci < cinfo->num_components; ci++) {
+	  expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,
+			     prep->next_buf_row, prep->next_buf_stop);
+	}
+	prep->next_buf_row = prep->next_buf_stop;
+      }
+    }
+    /* If we've gotten enough data, downsample a row group. */
+    if (prep->next_buf_row == prep->next_buf_stop) {
+      (*cinfo->downsample->downsample) (cinfo,
+					prep->color_buf,
+					(JDIMENSION) prep->this_row_group,
+					output_buf, *out_row_group_ctr);
+      (*out_row_group_ctr)++;
+      /* Advance pointers with wraparound as necessary. */
+      prep->this_row_group += cinfo->max_v_samp_factor;
+      if (prep->this_row_group >= buf_height)
+	prep->this_row_group = 0;
+      if (prep->next_buf_row >= buf_height)
+	prep->next_buf_row = 0;
+      prep->next_buf_stop = prep->next_buf_row + cinfo->max_v_samp_factor;
+    }
+  }
+}
+
+
+/*
+ * Create the wrapped-around downsampling input buffer needed for context mode.
+ */
+
+LOCAL(void)
+create_context_buffer (j_compress_ptr cinfo)
+{
+  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
+  int rgroup_height = cinfo->max_v_samp_factor;
+  int ci, i;
+  jpeg_component_info * compptr;
+  JSAMPARRAY true_buffer, fake_buffer;
+
+  /* Grab enough space for fake row pointers for all the components;
+   * we need five row groups' worth of pointers for each component.
+   */
+  fake_buffer = (JSAMPARRAY)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(cinfo->num_components * 5 * rgroup_height) *
+				SIZEOF(JSAMPROW));
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Allocate the actual buffer space (3 row groups) for this component.
+     * We make the buffer wide enough to allow the downsampler to edge-expand
+     * horizontally within the buffer, if it so chooses.
+     */
+    true_buffer = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (JDIMENSION) (((long) compptr->width_in_blocks * DCTSIZE *
+		      cinfo->max_h_samp_factor) / compptr->h_samp_factor),
+       (JDIMENSION) (3 * rgroup_height));
+    /* Copy true buffer row pointers into the middle of the fake row array */
+    MEMCOPY(fake_buffer + rgroup_height, true_buffer,
+	    3 * rgroup_height * SIZEOF(JSAMPROW));
+    /* Fill in the above and below wraparound pointers */
+    for (i = 0; i < rgroup_height; i++) {
+      fake_buffer[i] = true_buffer[2 * rgroup_height + i];
+      fake_buffer[4 * rgroup_height + i] = true_buffer[i];
+    }
+    prep->color_buf[ci] = fake_buffer + rgroup_height;
+    fake_buffer += 5 * rgroup_height; /* point to space for next component */
+  }
+}
+
+#endif /* CONTEXT_ROWS_SUPPORTED */
+
+
+/*
+ * Initialize preprocessing controller.
+ */
+
+GLOBAL(void)
+jinit_c_prep_controller (j_compress_ptr cinfo, wxjpeg_boolean need_full_buffer)
+{
+  my_prep_ptr prep;
+  int ci;
+  jpeg_component_info * compptr;
+
+  if (need_full_buffer)		/* safety check */
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+
+  prep = (my_prep_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_prep_controller));
+  cinfo->prep = (struct jpeg_c_prep_controller *) prep;
+  prep->pub.start_pass = start_pass_prep;
+
+  /* Allocate the color conversion buffer.
+   * We make the buffer wide enough to allow the downsampler to edge-expand
+   * horizontally within the buffer, if it so chooses.
+   */
+  if (cinfo->downsample->need_context_rows) {
+    /* Set up to provide context rows */
+#ifdef CONTEXT_ROWS_SUPPORTED
+    prep->pub.pre_process_data = pre_process_context;
+    create_context_buffer(cinfo);
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    /* No context, just make it tall enough for one row group */
+    prep->pub.pre_process_data = pre_process_data;
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      prep->color_buf[ci] = (*cinfo->mem->alloc_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE,
+	 (JDIMENSION) (((long) compptr->width_in_blocks * DCTSIZE *
+			cinfo->max_h_samp_factor) / compptr->h_samp_factor),
+	 (JDIMENSION) cinfo->max_v_samp_factor);
+    }
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jcsample.c b/Source/3rd Party/wx/src/jpeg/jcsample.c
index a629d3f1e..5cc2999c1 100644
--- a/Source/3rd Party/wx/src/jpeg/jcsample.c	
+++ b/Source/3rd Party/wx/src/jpeg/jcsample.c	
@@ -1,519 +1,519 @@
-/*
- * jcsample.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains downsampling routines.
- *
- * Downsampling input data is counted in "row groups".  A row group
- * is defined to be max_v_samp_factor pixel rows of each component,
- * from which the downsampler produces v_samp_factor sample rows.
- * A single row group is processed in each call to the downsampler module.
- *
- * The downsampler is responsible for edge-expansion of its output data
- * to fill an integral number of DCT blocks horizontally.  The source buffer
- * may be modified if it is helpful for this purpose (the source buffer is
- * allocated wide enough to correspond to the desired output width).
- * The caller (the prep controller) is responsible for vertical padding.
- *
- * The downsampler may request "context rows" by setting need_context_rows
- * during startup.  In this case, the input arrays will contain at least
- * one row group's worth of pixels above and below the passed-in data;
- * the caller will create dummy rows at image top and bottom by replicating
- * the first or last real pixel row.
- *
- * An excellent reference for image resampling is
- *   Digital Image Warping, George Wolberg, 1990.
- *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
- *
- * The downsampling algorithm used here is a simple average of the source
- * pixels covered by the output pixel.  The hi-falutin sampling literature
- * refers to this as a "box filter".  In general the characteristics of a box
- * filter are not very good, but for the specific cases we normally use (1:1
- * and 2:1 ratios) the box is equivalent to a "triangle filter" which is not
- * nearly so bad.  If you intend to use other sampling ratios, you'd be well
- * advised to improve this code.
- *
- * A simple input-smoothing capability is provided.  This is mainly intended
- * for cleaning up color-dithered GIF input files (if you find it inadequate,
- * we suggest using an external filtering program such as pnmconvol).  When
- * enabled, each input pixel P is replaced by a weighted sum of itself and its
- * eight neighbors.  P's weight is 1-8*SF and each neighbor's weight is SF,
- * where SF = (smoothing_factor / 1024).
- * Currently, smoothing is only supported for 2h2v sampling factors.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Pointer to routine to downsample a single component */
-typedef JMETHOD(void, downsample1_ptr,
-		(j_compress_ptr cinfo, jpeg_component_info * compptr,
-		 JSAMPARRAY input_data, JSAMPARRAY output_data));
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_downsampler pub;	/* public fields */
-
-  /* Downsampling method pointers, one per component */
-  downsample1_ptr methods[MAX_COMPONENTS];
-} my_downsampler;
-
-typedef my_downsampler * my_downsample_ptr;
-
-
-/*
- * Initialize for a downsampling pass.
- */
-
-METHODDEF(void)
-start_pass_downsample (j_compress_ptr cinfo)
-{
-  /* no work for now */
-}
-
-
-/*
- * Expand a component horizontally from width input_cols to width output_cols,
- * by duplicating the rightmost samples.
- */
-
-LOCAL(void)
-expand_right_edge (JSAMPARRAY image_data, int num_rows,
-		   JDIMENSION input_cols, JDIMENSION output_cols)
-{
-  register JSAMPROW ptr;
-  register JSAMPLE pixval;
-  register int count;
-  int row;
-  int numcols = (int) (output_cols - input_cols);
-
-  if (numcols > 0) {
-    for (row = 0; row < num_rows; row++) {
-      ptr = image_data[row] + input_cols;
-      pixval = ptr[-1];		/* don't need GETJSAMPLE() here */
-      for (count = numcols; count > 0; count--)
-	*ptr++ = pixval;
-    }
-  }
-}
-
-
-/*
- * Do downsampling for a whole row group (all components).
- *
- * In this version we simply downsample each component independently.
- */
-
-METHODDEF(void)
-sep_downsample (j_compress_ptr cinfo,
-		JSAMPIMAGE input_buf, JDIMENSION in_row_index,
-		JSAMPIMAGE output_buf, JDIMENSION out_row_group_index)
-{
-  my_downsample_ptr downsample = (my_downsample_ptr) cinfo->downsample;
-  int ci;
-  jpeg_component_info * compptr;
-  JSAMPARRAY in_ptr, out_ptr;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    in_ptr = input_buf[ci] + in_row_index;
-    out_ptr = output_buf[ci] + (out_row_group_index * compptr->v_samp_factor);
-    (*downsample->methods[ci]) (cinfo, compptr, in_ptr, out_ptr);
-  }
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * One row group is processed per call.
- * This version handles arbitrary integral sampling ratios, without smoothing.
- * Note that this version is not actually used for customary sampling ratios.
- */
-
-METHODDEF(void)
-int_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int inrow, outrow, h_expand, v_expand, numpix, numpix2, h, v;
-  JDIMENSION outcol, outcol_h;	/* outcol_h == outcol*h_expand */
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  JSAMPROW inptr, outptr;
-  JPEG_INT32 outvalue;
-
-  h_expand = cinfo->max_h_samp_factor / compptr->h_samp_factor;
-  v_expand = cinfo->max_v_samp_factor / compptr->v_samp_factor;
-  numpix = h_expand * v_expand;
-  numpix2 = numpix/2;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data, cinfo->max_v_samp_factor,
-		    cinfo->image_width, output_cols * h_expand);
-
-  inrow = 0;
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    for (outcol = 0, outcol_h = 0; outcol < output_cols;
-	 outcol++, outcol_h += h_expand) {
-      outvalue = 0;
-      for (v = 0; v < v_expand; v++) {
-	inptr = input_data[inrow+v] + outcol_h;
-	for (h = 0; h < h_expand; h++) {
-	  outvalue += (JPEG_INT32) GETJSAMPLE(*inptr++);
-	}
-      }
-      *outptr++ = (JSAMPLE) ((outvalue + numpix2) / numpix);
-    }
-    inrow += v_expand;
-  }
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the special case of a full-size component,
- * without smoothing.
- */
-
-METHODDEF(void)
-fullsize_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		     JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  /* Copy the data */
-  jcopy_sample_rows(input_data, 0, output_data, 0,
-		    cinfo->max_v_samp_factor, cinfo->image_width);
-  /* Edge-expand */
-  expand_right_edge(output_data, cinfo->max_v_samp_factor,
-		    cinfo->image_width, compptr->width_in_blocks * DCTSIZE);
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the common case of 2:1 horizontal and 1:1 vertical,
- * without smoothing.
- *
- * A note about the "bias" calculations: when rounding fractional values to
- * integer, we do not want to always round 0.5 up to the next integer.
- * If we did that, we'd introduce a noticeable bias towards larger values.
- * Instead, this code is arranged so that 0.5 will be rounded up or down at
- * alternate pixel locations (a simple ordered dither pattern).
- */
-
-METHODDEF(void)
-h2v1_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		 JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int outrow;
-  JDIMENSION outcol;
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  register JSAMPROW inptr, outptr;
-  register int bias;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data, cinfo->max_v_samp_factor,
-		    cinfo->image_width, output_cols * 2);
-
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    inptr = input_data[outrow];
-    bias = 0;			/* bias = 0,1,0,1,... for successive samples */
-    for (outcol = 0; outcol < output_cols; outcol++) {
-      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr) + GETJSAMPLE(inptr[1])
-			      + bias) >> 1);
-      bias ^= 1;		/* 0=>1, 1=>0 */
-      inptr += 2;
-    }
-  }
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the standard case of 2:1 horizontal and 2:1 vertical,
- * without smoothing.
- */
-
-METHODDEF(void)
-h2v2_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		 JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int inrow, outrow;
-  JDIMENSION outcol;
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  register JSAMPROW inptr0, inptr1, outptr;
-  register int bias;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data, cinfo->max_v_samp_factor,
-		    cinfo->image_width, output_cols * 2);
-
-  inrow = 0;
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    inptr0 = input_data[inrow];
-    inptr1 = input_data[inrow+1];
-    bias = 1;			/* bias = 1,2,1,2,... for successive samples */
-    for (outcol = 0; outcol < output_cols; outcol++) {
-      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
-			      GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1])
-			      + bias) >> 2);
-      bias ^= 3;		/* 1=>2, 2=>1 */
-      inptr0 += 2; inptr1 += 2;
-    }
-    inrow += 2;
-  }
-}
-
-
-#ifdef INPUT_SMOOTHING_SUPPORTED
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the standard case of 2:1 horizontal and 2:1 vertical,
- * with smoothing.  One row of context is required.
- */
-
-METHODDEF(void)
-h2v2_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-			JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int inrow, outrow;
-  JDIMENSION colctr;
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  register JSAMPROW inptr0, inptr1, above_ptr, below_ptr, outptr;
-  JPEG_INT32 membersum, neighsum, memberscale, neighscale;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,
-		    cinfo->image_width, output_cols * 2);
-
-  /* We don't bother to form the individual "smoothed" input pixel values;
-   * we can directly compute the output which is the average of the four
-   * smoothed values.  Each of the four member pixels contributes a fraction
-   * (1-8*SF) to its own smoothed image and a fraction SF to each of the three
-   * other smoothed pixels, therefore a total fraction (1-5*SF)/4 to the final
-   * output.  The four corner-adjacent neighbor pixels contribute a fraction
-   * SF to just one smoothed pixel, or SF/4 to the final output; while the
-   * eight edge-adjacent neighbors contribute SF to each of two smoothed
-   * pixels, or SF/2 overall.  In order to use integer arithmetic, these
-   * factors are scaled by 2^16 = 65536.
-   * Also recall that SF = smoothing_factor / 1024.
-   */
-
-  memberscale = 16384 - cinfo->smoothing_factor * 80; /* scaled (1-5*SF)/4 */
-  neighscale = cinfo->smoothing_factor * 16; /* scaled SF/4 */
-
-  inrow = 0;
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    inptr0 = input_data[inrow];
-    inptr1 = input_data[inrow+1];
-    above_ptr = input_data[inrow-1];
-    below_ptr = input_data[inrow+2];
-
-    /* Special case for first column: pretend column -1 is same as column 0 */
-    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
-		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
-    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
-	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
-	       GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[2]) +
-	       GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[2]);
-    neighsum += neighsum;
-    neighsum += GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[2]) +
-		GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[2]);
-    membersum = membersum * memberscale + neighsum * neighscale;
-    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
-    inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
-
-    for (colctr = output_cols - 2; colctr > 0; colctr--) {
-      /* sum of pixels directly mapped to this output element */
-      membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
-		  GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
-      /* sum of edge-neighbor pixels */
-      neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
-		 GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
-		 GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[2]) +
-		 GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[2]);
-      /* The edge-neighbors count twice as much as corner-neighbors */
-      neighsum += neighsum;
-      /* Add in the corner-neighbors */
-      neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[2]) +
-		  GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[2]);
-      /* form final output scaled up by 2^16 */
-      membersum = membersum * memberscale + neighsum * neighscale;
-      /* round, descale and output it */
-      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
-      inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
-    }
-
-    /* Special case for last column */
-    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
-		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
-    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
-	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
-	       GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[1]) +
-	       GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[1]);
-    neighsum += neighsum;
-    neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[1]) +
-		GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[1]);
-    membersum = membersum * memberscale + neighsum * neighscale;
-    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);
-
-    inrow += 2;
-  }
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the special case of a full-size component,
- * with smoothing.  One row of context is required.
- */
-
-METHODDEF(void)
-fullsize_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info *compptr,
-			    JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int outrow;
-  JDIMENSION colctr;
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  register JSAMPROW inptr, above_ptr, below_ptr, outptr;
-  JPEG_INT32 membersum, neighsum, memberscale, neighscale;
-  int colsum, lastcolsum, nextcolsum;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,
-		    cinfo->image_width, output_cols);
-
-  /* Each of the eight neighbor pixels contributes a fraction SF to the
-   * smoothed pixel, while the main pixel contributes (1-8*SF).  In order
-   * to use integer arithmetic, these factors are multiplied by 2^16 = 65536.
-   * Also recall that SF = smoothing_factor / 1024.
-   */
-
-  memberscale = 65536L - cinfo->smoothing_factor * 512L; /* scaled 1-8*SF */
-  neighscale = cinfo->smoothing_factor * 64; /* scaled SF */
-
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    inptr = input_data[outrow];
-    above_ptr = input_data[outrow-1];
-    below_ptr = input_data[outrow+1];
-
-    /* Special case for first column */
-    colsum = GETJSAMPLE(*above_ptr++) + GETJSAMPLE(*below_ptr++) +
-	     GETJSAMPLE(*inptr);
-    membersum = GETJSAMPLE(*inptr++);
-    nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +
-		 GETJSAMPLE(*inptr);
-    neighsum = colsum + (colsum - membersum) + nextcolsum;
-    membersum = membersum * memberscale + neighsum * neighscale;
-    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
-    lastcolsum = colsum; colsum = nextcolsum;
-
-    for (colctr = output_cols - 2; colctr > 0; colctr--) {
-      membersum = GETJSAMPLE(*inptr++);
-      above_ptr++; below_ptr++;
-      nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +
-		   GETJSAMPLE(*inptr);
-      neighsum = lastcolsum + (colsum - membersum) + nextcolsum;
-      membersum = membersum * memberscale + neighsum * neighscale;
-      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
-      lastcolsum = colsum; colsum = nextcolsum;
-    }
-
-    /* Special case for last column */
-    membersum = GETJSAMPLE(*inptr);
-    neighsum = lastcolsum + (colsum - membersum) + colsum;
-    membersum = membersum * memberscale + neighsum * neighscale;
-    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);
-
-  }
-}
-
-#endif /* INPUT_SMOOTHING_SUPPORTED */
-
-
-/*
- * Module initialization routine for downsampling.
- * Note that we must select a routine for each component.
- */
-
-GLOBAL(void)
-jinit_downsampler (j_compress_ptr cinfo)
-{
-  my_downsample_ptr downsample;
-  int ci;
-  jpeg_component_info * compptr;
-  wxjpeg_boolean smoothok = TRUE;
-
-  downsample = (my_downsample_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_downsampler));
-  cinfo->downsample = (struct jpeg_downsampler *) downsample;
-  downsample->pub.start_pass = start_pass_downsample;
-  downsample->pub.downsample = sep_downsample;
-  downsample->pub.need_context_rows = FALSE;
-
-  if (cinfo->CCIR601_sampling)
-    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);
-
-  /* Verify we can handle the sampling factors, and set up method pointers */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    if (compptr->h_samp_factor == cinfo->max_h_samp_factor &&
-	compptr->v_samp_factor == cinfo->max_v_samp_factor) {
-#ifdef INPUT_SMOOTHING_SUPPORTED
-      if (cinfo->smoothing_factor) {
-	downsample->methods[ci] = fullsize_smooth_downsample;
-	downsample->pub.need_context_rows = TRUE;
-      } else
-#endif
-	downsample->methods[ci] = fullsize_downsample;
-    } else if (compptr->h_samp_factor * 2 == cinfo->max_h_samp_factor &&
-	       compptr->v_samp_factor == cinfo->max_v_samp_factor) {
-      smoothok = FALSE;
-      downsample->methods[ci] = h2v1_downsample;
-    } else if (compptr->h_samp_factor * 2 == cinfo->max_h_samp_factor &&
-	       compptr->v_samp_factor * 2 == cinfo->max_v_samp_factor) {
-#ifdef INPUT_SMOOTHING_SUPPORTED
-      if (cinfo->smoothing_factor) {
-	downsample->methods[ci] = h2v2_smooth_downsample;
-	downsample->pub.need_context_rows = TRUE;
-      } else
-#endif
-	downsample->methods[ci] = h2v2_downsample;
-    } else if ((cinfo->max_h_samp_factor % compptr->h_samp_factor) == 0 &&
-	       (cinfo->max_v_samp_factor % compptr->v_samp_factor) == 0) {
-      smoothok = FALSE;
-      downsample->methods[ci] = int_downsample;
-    } else
-      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);
-  }
-
-#ifdef INPUT_SMOOTHING_SUPPORTED
-  if (cinfo->smoothing_factor && !smoothok)
-    TRACEMS(cinfo, 0, JTRC_SMOOTH_NOTIMPL);
-#endif
-}
+/*
+ * jcsample.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains downsampling routines.
+ *
+ * Downsampling input data is counted in "row groups".  A row group
+ * is defined to be max_v_samp_factor pixel rows of each component,
+ * from which the downsampler produces v_samp_factor sample rows.
+ * A single row group is processed in each call to the downsampler module.
+ *
+ * The downsampler is responsible for edge-expansion of its output data
+ * to fill an integral number of DCT blocks horizontally.  The source buffer
+ * may be modified if it is helpful for this purpose (the source buffer is
+ * allocated wide enough to correspond to the desired output width).
+ * The caller (the prep controller) is responsible for vertical padding.
+ *
+ * The downsampler may request "context rows" by setting need_context_rows
+ * during startup.  In this case, the input arrays will contain at least
+ * one row group's worth of pixels above and below the passed-in data;
+ * the caller will create dummy rows at image top and bottom by replicating
+ * the first or last real pixel row.
+ *
+ * An excellent reference for image resampling is
+ *   Digital Image Warping, George Wolberg, 1990.
+ *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
+ *
+ * The downsampling algorithm used here is a simple average of the source
+ * pixels covered by the output pixel.  The hi-falutin sampling literature
+ * refers to this as a "box filter".  In general the characteristics of a box
+ * filter are not very good, but for the specific cases we normally use (1:1
+ * and 2:1 ratios) the box is equivalent to a "triangle filter" which is not
+ * nearly so bad.  If you intend to use other sampling ratios, you'd be well
+ * advised to improve this code.
+ *
+ * A simple input-smoothing capability is provided.  This is mainly intended
+ * for cleaning up color-dithered GIF input files (if you find it inadequate,
+ * we suggest using an external filtering program such as pnmconvol).  When
+ * enabled, each input pixel P is replaced by a weighted sum of itself and its
+ * eight neighbors.  P's weight is 1-8*SF and each neighbor's weight is SF,
+ * where SF = (smoothing_factor / 1024).
+ * Currently, smoothing is only supported for 2h2v sampling factors.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Pointer to routine to downsample a single component */
+typedef JMETHOD(void, downsample1_ptr,
+		(j_compress_ptr cinfo, jpeg_component_info * compptr,
+		 JSAMPARRAY input_data, JSAMPARRAY output_data));
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_downsampler pub;	/* public fields */
+
+  /* Downsampling method pointers, one per component */
+  downsample1_ptr methods[MAX_COMPONENTS];
+} my_downsampler;
+
+typedef my_downsampler * my_downsample_ptr;
+
+
+/*
+ * Initialize for a downsampling pass.
+ */
+
+METHODDEF(void)
+start_pass_downsample (j_compress_ptr cinfo)
+{
+  /* no work for now */
+}
+
+
+/*
+ * Expand a component horizontally from width input_cols to width output_cols,
+ * by duplicating the rightmost samples.
+ */
+
+LOCAL(void)
+expand_right_edge (JSAMPARRAY image_data, int num_rows,
+		   JDIMENSION input_cols, JDIMENSION output_cols)
+{
+  register JSAMPROW ptr;
+  register JSAMPLE pixval;
+  register int count;
+  int row;
+  int numcols = (int) (output_cols - input_cols);
+
+  if (numcols > 0) {
+    for (row = 0; row < num_rows; row++) {
+      ptr = image_data[row] + input_cols;
+      pixval = ptr[-1];		/* don't need GETJSAMPLE() here */
+      for (count = numcols; count > 0; count--)
+	*ptr++ = pixval;
+    }
+  }
+}
+
+
+/*
+ * Do downsampling for a whole row group (all components).
+ *
+ * In this version we simply downsample each component independently.
+ */
+
+METHODDEF(void)
+sep_downsample (j_compress_ptr cinfo,
+		JSAMPIMAGE input_buf, JDIMENSION in_row_index,
+		JSAMPIMAGE output_buf, JDIMENSION out_row_group_index)
+{
+  my_downsample_ptr downsample = (my_downsample_ptr) cinfo->downsample;
+  int ci;
+  jpeg_component_info * compptr;
+  JSAMPARRAY in_ptr, out_ptr;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    in_ptr = input_buf[ci] + in_row_index;
+    out_ptr = output_buf[ci] + (out_row_group_index * compptr->v_samp_factor);
+    (*downsample->methods[ci]) (cinfo, compptr, in_ptr, out_ptr);
+  }
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * One row group is processed per call.
+ * This version handles arbitrary integral sampling ratios, without smoothing.
+ * Note that this version is not actually used for customary sampling ratios.
+ */
+
+METHODDEF(void)
+int_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int inrow, outrow, h_expand, v_expand, numpix, numpix2, h, v;
+  JDIMENSION outcol, outcol_h;	/* outcol_h == outcol*h_expand */
+  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
+  JSAMPROW inptr, outptr;
+  JPEG_INT32 outvalue;
+
+  h_expand = cinfo->max_h_samp_factor / compptr->h_samp_factor;
+  v_expand = cinfo->max_v_samp_factor / compptr->v_samp_factor;
+  numpix = h_expand * v_expand;
+  numpix2 = numpix/2;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data, cinfo->max_v_samp_factor,
+		    cinfo->image_width, output_cols * h_expand);
+
+  inrow = 0;
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    for (outcol = 0, outcol_h = 0; outcol < output_cols;
+	 outcol++, outcol_h += h_expand) {
+      outvalue = 0;
+      for (v = 0; v < v_expand; v++) {
+	inptr = input_data[inrow+v] + outcol_h;
+	for (h = 0; h < h_expand; h++) {
+	  outvalue += (JPEG_INT32) GETJSAMPLE(*inptr++);
+	}
+      }
+      *outptr++ = (JSAMPLE) ((outvalue + numpix2) / numpix);
+    }
+    inrow += v_expand;
+  }
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the special case of a full-size component,
+ * without smoothing.
+ */
+
+METHODDEF(void)
+fullsize_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		     JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  /* Copy the data */
+  jcopy_sample_rows(input_data, 0, output_data, 0,
+		    cinfo->max_v_samp_factor, cinfo->image_width);
+  /* Edge-expand */
+  expand_right_edge(output_data, cinfo->max_v_samp_factor,
+		    cinfo->image_width, compptr->width_in_blocks * DCTSIZE);
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the common case of 2:1 horizontal and 1:1 vertical,
+ * without smoothing.
+ *
+ * A note about the "bias" calculations: when rounding fractional values to
+ * integer, we do not want to always round 0.5 up to the next integer.
+ * If we did that, we'd introduce a noticeable bias towards larger values.
+ * Instead, this code is arranged so that 0.5 will be rounded up or down at
+ * alternate pixel locations (a simple ordered dither pattern).
+ */
+
+METHODDEF(void)
+h2v1_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		 JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int outrow;
+  JDIMENSION outcol;
+  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
+  register JSAMPROW inptr, outptr;
+  register int bias;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data, cinfo->max_v_samp_factor,
+		    cinfo->image_width, output_cols * 2);
+
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    inptr = input_data[outrow];
+    bias = 0;			/* bias = 0,1,0,1,... for successive samples */
+    for (outcol = 0; outcol < output_cols; outcol++) {
+      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr) + GETJSAMPLE(inptr[1])
+			      + bias) >> 1);
+      bias ^= 1;		/* 0=>1, 1=>0 */
+      inptr += 2;
+    }
+  }
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the standard case of 2:1 horizontal and 2:1 vertical,
+ * without smoothing.
+ */
+
+METHODDEF(void)
+h2v2_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+		 JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int inrow, outrow;
+  JDIMENSION outcol;
+  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
+  register JSAMPROW inptr0, inptr1, outptr;
+  register int bias;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data, cinfo->max_v_samp_factor,
+		    cinfo->image_width, output_cols * 2);
+
+  inrow = 0;
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    inptr0 = input_data[inrow];
+    inptr1 = input_data[inrow+1];
+    bias = 1;			/* bias = 1,2,1,2,... for successive samples */
+    for (outcol = 0; outcol < output_cols; outcol++) {
+      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
+			      GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1])
+			      + bias) >> 2);
+      bias ^= 3;		/* 1=>2, 2=>1 */
+      inptr0 += 2; inptr1 += 2;
+    }
+    inrow += 2;
+  }
+}
+
+
+#ifdef INPUT_SMOOTHING_SUPPORTED
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the standard case of 2:1 horizontal and 2:1 vertical,
+ * with smoothing.  One row of context is required.
+ */
+
+METHODDEF(void)
+h2v2_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
+			JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int inrow, outrow;
+  JDIMENSION colctr;
+  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
+  register JSAMPROW inptr0, inptr1, above_ptr, below_ptr, outptr;
+  JPEG_INT32 membersum, neighsum, memberscale, neighscale;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,
+		    cinfo->image_width, output_cols * 2);
+
+  /* We don't bother to form the individual "smoothed" input pixel values;
+   * we can directly compute the output which is the average of the four
+   * smoothed values.  Each of the four member pixels contributes a fraction
+   * (1-8*SF) to its own smoothed image and a fraction SF to each of the three
+   * other smoothed pixels, therefore a total fraction (1-5*SF)/4 to the final
+   * output.  The four corner-adjacent neighbor pixels contribute a fraction
+   * SF to just one smoothed pixel, or SF/4 to the final output; while the
+   * eight edge-adjacent neighbors contribute SF to each of two smoothed
+   * pixels, or SF/2 overall.  In order to use integer arithmetic, these
+   * factors are scaled by 2^16 = 65536.
+   * Also recall that SF = smoothing_factor / 1024.
+   */
+
+  memberscale = 16384 - cinfo->smoothing_factor * 80; /* scaled (1-5*SF)/4 */
+  neighscale = cinfo->smoothing_factor * 16; /* scaled SF/4 */
+
+  inrow = 0;
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    inptr0 = input_data[inrow];
+    inptr1 = input_data[inrow+1];
+    above_ptr = input_data[inrow-1];
+    below_ptr = input_data[inrow+2];
+
+    /* Special case for first column: pretend column -1 is same as column 0 */
+    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
+		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
+    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
+	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
+	       GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[2]) +
+	       GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[2]);
+    neighsum += neighsum;
+    neighsum += GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[2]) +
+		GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[2]);
+    membersum = membersum * memberscale + neighsum * neighscale;
+    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
+    inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
+
+    for (colctr = output_cols - 2; colctr > 0; colctr--) {
+      /* sum of pixels directly mapped to this output element */
+      membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
+		  GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
+      /* sum of edge-neighbor pixels */
+      neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
+		 GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
+		 GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[2]) +
+		 GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[2]);
+      /* The edge-neighbors count twice as much as corner-neighbors */
+      neighsum += neighsum;
+      /* Add in the corner-neighbors */
+      neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[2]) +
+		  GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[2]);
+      /* form final output scaled up by 2^16 */
+      membersum = membersum * memberscale + neighsum * neighscale;
+      /* round, descale and output it */
+      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
+      inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
+    }
+
+    /* Special case for last column */
+    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
+		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
+    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
+	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
+	       GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[1]) +
+	       GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[1]);
+    neighsum += neighsum;
+    neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[1]) +
+		GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[1]);
+    membersum = membersum * memberscale + neighsum * neighscale;
+    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);
+
+    inrow += 2;
+  }
+}
+
+
+/*
+ * Downsample pixel values of a single component.
+ * This version handles the special case of a full-size component,
+ * with smoothing.  One row of context is required.
+ */
+
+METHODDEF(void)
+fullsize_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info *compptr,
+			    JSAMPARRAY input_data, JSAMPARRAY output_data)
+{
+  int outrow;
+  JDIMENSION colctr;
+  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
+  register JSAMPROW inptr, above_ptr, below_ptr, outptr;
+  JPEG_INT32 membersum, neighsum, memberscale, neighscale;
+  int colsum, lastcolsum, nextcolsum;
+
+  /* Expand input data enough to let all the output samples be generated
+   * by the standard loop.  Special-casing padded output would be more
+   * efficient.
+   */
+  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,
+		    cinfo->image_width, output_cols);
+
+  /* Each of the eight neighbor pixels contributes a fraction SF to the
+   * smoothed pixel, while the main pixel contributes (1-8*SF).  In order
+   * to use integer arithmetic, these factors are multiplied by 2^16 = 65536.
+   * Also recall that SF = smoothing_factor / 1024.
+   */
+
+  memberscale = 65536L - cinfo->smoothing_factor * 512L; /* scaled 1-8*SF */
+  neighscale = cinfo->smoothing_factor * 64; /* scaled SF */
+
+  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
+    outptr = output_data[outrow];
+    inptr = input_data[outrow];
+    above_ptr = input_data[outrow-1];
+    below_ptr = input_data[outrow+1];
+
+    /* Special case for first column */
+    colsum = GETJSAMPLE(*above_ptr++) + GETJSAMPLE(*below_ptr++) +
+	     GETJSAMPLE(*inptr);
+    membersum = GETJSAMPLE(*inptr++);
+    nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +
+		 GETJSAMPLE(*inptr);
+    neighsum = colsum + (colsum - membersum) + nextcolsum;
+    membersum = membersum * memberscale + neighsum * neighscale;
+    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
+    lastcolsum = colsum; colsum = nextcolsum;
+
+    for (colctr = output_cols - 2; colctr > 0; colctr--) {
+      membersum = GETJSAMPLE(*inptr++);
+      above_ptr++; below_ptr++;
+      nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +
+		   GETJSAMPLE(*inptr);
+      neighsum = lastcolsum + (colsum - membersum) + nextcolsum;
+      membersum = membersum * memberscale + neighsum * neighscale;
+      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
+      lastcolsum = colsum; colsum = nextcolsum;
+    }
+
+    /* Special case for last column */
+    membersum = GETJSAMPLE(*inptr);
+    neighsum = lastcolsum + (colsum - membersum) + colsum;
+    membersum = membersum * memberscale + neighsum * neighscale;
+    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);
+
+  }
+}
+
+#endif /* INPUT_SMOOTHING_SUPPORTED */
+
+
+/*
+ * Module initialization routine for downsampling.
+ * Note that we must select a routine for each component.
+ */
+
+GLOBAL(void)
+jinit_downsampler (j_compress_ptr cinfo)
+{
+  my_downsample_ptr downsample;
+  int ci;
+  jpeg_component_info * compptr;
+  wxjpeg_boolean smoothok = TRUE;
+
+  downsample = (my_downsample_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_downsampler));
+  cinfo->downsample = (struct jpeg_downsampler *) downsample;
+  downsample->pub.start_pass = start_pass_downsample;
+  downsample->pub.downsample = sep_downsample;
+  downsample->pub.need_context_rows = FALSE;
+
+  if (cinfo->CCIR601_sampling)
+    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);
+
+  /* Verify we can handle the sampling factors, and set up method pointers */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    if (compptr->h_samp_factor == cinfo->max_h_samp_factor &&
+	compptr->v_samp_factor == cinfo->max_v_samp_factor) {
+#ifdef INPUT_SMOOTHING_SUPPORTED
+      if (cinfo->smoothing_factor) {
+	downsample->methods[ci] = fullsize_smooth_downsample;
+	downsample->pub.need_context_rows = TRUE;
+      } else
+#endif
+	downsample->methods[ci] = fullsize_downsample;
+    } else if (compptr->h_samp_factor * 2 == cinfo->max_h_samp_factor &&
+	       compptr->v_samp_factor == cinfo->max_v_samp_factor) {
+      smoothok = FALSE;
+      downsample->methods[ci] = h2v1_downsample;
+    } else if (compptr->h_samp_factor * 2 == cinfo->max_h_samp_factor &&
+	       compptr->v_samp_factor * 2 == cinfo->max_v_samp_factor) {
+#ifdef INPUT_SMOOTHING_SUPPORTED
+      if (cinfo->smoothing_factor) {
+	downsample->methods[ci] = h2v2_smooth_downsample;
+	downsample->pub.need_context_rows = TRUE;
+      } else
+#endif
+	downsample->methods[ci] = h2v2_downsample;
+    } else if ((cinfo->max_h_samp_factor % compptr->h_samp_factor) == 0 &&
+	       (cinfo->max_v_samp_factor % compptr->v_samp_factor) == 0) {
+      smoothok = FALSE;
+      downsample->methods[ci] = int_downsample;
+    } else
+      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);
+  }
+
+#ifdef INPUT_SMOOTHING_SUPPORTED
+  if (cinfo->smoothing_factor && !smoothok)
+    TRACEMS(cinfo, 0, JTRC_SMOOTH_NOTIMPL);
+#endif
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jctrans.c b/Source/3rd Party/wx/src/jpeg/jctrans.c
index 383d4fc88..c5bb27f32 100644
--- a/Source/3rd Party/wx/src/jpeg/jctrans.c	
+++ b/Source/3rd Party/wx/src/jpeg/jctrans.c	
@@ -1,402 +1,402 @@
-/*
- * jctrans.c
- *
- * Copyright (C) 1995-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains library routines for transcoding compression,
- * that is, writing raw DCT coefficient arrays to an output JPEG file.
- * The routines in jcapimin.c will also be needed by a transcoder.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Forward declarations */
-LOCAL(void) transencode_master_selection
-	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
-LOCAL(void) transencode_coef_controller
-	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
-
-#if defined(__VISAGECPP__)
-/* Visual Age fixups for multiple declarations */
-#  define start_pass_coef   start_pass_coef2 /* already in jccoeft.c */
-#  define compress_output   compress_output2 /* already in jccoeft.c */
-#endif
-
-
-/*
- * Compression initialization for writing raw-coefficient data.
- * Before calling this, all parameters and a data destination must be set up.
- * Call jpeg_finish_compress() to actually write the data.
- *
- * The number of passed virtual arrays must match cinfo->num_components.
- * Note that the virtual arrays need not be filled or even realized at
- * the time write_coefficients is called; indeed, if the virtual arrays
- * were requested from this compression object's memory manager, they
- * typically will be realized during this routine and filled afterwards.
- */
-
-GLOBAL(void)
-jpeg_write_coefficients (j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays)
-{
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  /* Mark all tables to be written */
-  jpeg_suppress_tables(cinfo, FALSE);
-  /* (Re)initialize error mgr and destination modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->dest->init_destination) (cinfo);
-  /* Perform master selection of active modules */
-  transencode_master_selection(cinfo, coef_arrays);
-  /* Wait for jpeg_finish_compress() call */
-  cinfo->next_scanline = 0;	/* so jpeg_write_marker works */
-  cinfo->global_state = CSTATE_WRCOEFS;
-}
-
-
-/*
- * Initialize the compression object with default parameters,
- * then copy from the source object all parameters needed for lossless
- * transcoding.  Parameters that can be varied without loss (such as
- * scan script and Huffman optimization) are left in their default states.
- */
-
-GLOBAL(void)
-jpeg_copy_critical_parameters (j_decompress_ptr srcinfo,
-			       j_compress_ptr dstinfo)
-{
-  JQUANT_TBL ** qtblptr;
-  jpeg_component_info *incomp, *outcomp;
-  JQUANT_TBL *c_quant, *slot_quant;
-  int tblno, ci, coefi;
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (dstinfo->global_state != CSTATE_START)
-    ERREXIT1(dstinfo, JERR_BAD_STATE, dstinfo->global_state);
-  /* Copy fundamental image dimensions */
-  dstinfo->image_width = srcinfo->image_width;
-  dstinfo->image_height = srcinfo->image_height;
-  dstinfo->input_components = srcinfo->num_components;
-  dstinfo->in_color_space = srcinfo->jpeg_color_space;
-  /* Initialize all parameters to default values */
-  jpeg_set_defaults(dstinfo);
-  /* jpeg_set_defaults may choose wrong colorspace, eg YCbCr if input is RGB.
-   * Fix it to get the right header markers for the image colorspace.
-   */
-  jpeg_set_colorspace(dstinfo, srcinfo->jpeg_color_space);
-  dstinfo->data_precision = srcinfo->data_precision;
-  dstinfo->CCIR601_sampling = srcinfo->CCIR601_sampling;
-  /* Copy the source's quantization tables. */
-  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {
-    if (srcinfo->quant_tbl_ptrs[tblno] != NULL) {
-      qtblptr = & dstinfo->quant_tbl_ptrs[tblno];
-      if (*qtblptr == NULL)
-	*qtblptr = jpeg_alloc_quant_table((j_common_ptr) dstinfo);
-      MEMCOPY((*qtblptr)->quantval,
-	      srcinfo->quant_tbl_ptrs[tblno]->quantval,
-	      SIZEOF((*qtblptr)->quantval));
-      (*qtblptr)->sent_table = FALSE;
-    }
-  }
-  /* Copy the source's per-component info.
-   * Note we assume jpeg_set_defaults has allocated the dest comp_info array.
-   */
-  dstinfo->num_components = srcinfo->num_components;
-  if (dstinfo->num_components < 1 || dstinfo->num_components > MAX_COMPONENTS)
-    ERREXIT2(dstinfo, JERR_COMPONENT_COUNT, dstinfo->num_components,
-	     MAX_COMPONENTS);
-  for (ci = 0, incomp = srcinfo->comp_info, outcomp = dstinfo->comp_info;
-       ci < dstinfo->num_components; ci++, incomp++, outcomp++) {
-    outcomp->component_id = incomp->component_id;
-    outcomp->h_samp_factor = incomp->h_samp_factor;
-    outcomp->v_samp_factor = incomp->v_samp_factor;
-    outcomp->quant_tbl_no = incomp->quant_tbl_no;
-    /* Make sure saved quantization table for component matches the qtable
-     * slot.  If not, the input file re-used this qtable slot.
-     * IJG encoder currently cannot duplicate this.
-     */
-    tblno = outcomp->quant_tbl_no;
-    if (tblno < 0 || tblno >= NUM_QUANT_TBLS ||
-	srcinfo->quant_tbl_ptrs[tblno] == NULL)
-      ERREXIT1(dstinfo, JERR_NO_QUANT_TABLE, tblno);
-    slot_quant = srcinfo->quant_tbl_ptrs[tblno];
-    c_quant = incomp->quant_table;
-    if (c_quant != NULL) {
-      for (coefi = 0; coefi < DCTSIZE2; coefi++) {
-	if (c_quant->quantval[coefi] != slot_quant->quantval[coefi])
-	  ERREXIT1(dstinfo, JERR_MISMATCHED_QUANT_TABLE, tblno);
-      }
-    }
-    /* Note: we do not copy the source's Huffman table assignments;
-     * instead we rely on jpeg_set_colorspace to have made a suitable choice.
-     */
-  }
-  /* Also copy JFIF version and resolution information, if available.
-   * Strictly speaking this isn't "critical" info, but it's nearly
-   * always appropriate to copy it if available.  In particular,
-   * if the application chooses to copy JFIF 1.02 extension markers from
-   * the source file, we need to copy the version to make sure we don't
-   * emit a file that has 1.02 extensions but a claimed version of 1.01.
-   * We will *not*, however, copy version info from mislabeled "2.01" files.
-   */
-  if (srcinfo->saw_JFIF_marker) {
-    if (srcinfo->JFIF_major_version == 1) {
-      dstinfo->JFIF_major_version = srcinfo->JFIF_major_version;
-      dstinfo->JFIF_minor_version = srcinfo->JFIF_minor_version;
-    }
-    dstinfo->density_unit = srcinfo->density_unit;
-    dstinfo->X_density = srcinfo->X_density;
-    dstinfo->Y_density = srcinfo->Y_density;
-  }
-}
-
-
-/*
- * Master selection of compression modules for transcoding.
- * This substitutes for jcinit.c's initialization of the full compressor.
- */
-
-LOCAL(void)
-transencode_master_selection (j_compress_ptr cinfo,
-			      jvirt_barray_ptr * coef_arrays)
-{
-  /* Although we don't actually use input_components for transcoding,
-   * jcmaster.c's initial_setup will complain if input_components is 0.
-   */
-  cinfo->input_components = 1;
-  /* Initialize master control (includes parameter checking/processing) */
-  jinit_c_master_control(cinfo, TRUE /* transcode only */);
-
-  /* Entropy encoding: either Huffman or arithmetic coding. */
-  if (cinfo->arith_code) {
-    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
-  } else {
-    if (cinfo->progressive_mode) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-      jinit_phuff_encoder(cinfo);
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else
-      jinit_huff_encoder(cinfo);
-  }
-
-  /* We need a special coefficient buffer controller. */
-  transencode_coef_controller(cinfo, coef_arrays);
-
-  jinit_marker_writer(cinfo);
-
-  /* We can now tell the memory manager to allocate virtual arrays. */
-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
-
-  /* Write the datastream header (SOI, JFIF) immediately.
-   * Frame and scan headers are postponed till later.
-   * This lets application insert special markers after the SOI.
-   */
-  (*cinfo->marker->write_file_header) (cinfo);
-}
-
-
-/*
- * The rest of this file is a special implementation of the coefficient
- * buffer controller.  This is similar to jccoefct.c, but it handles only
- * output from presupplied virtual arrays.  Furthermore, we generate any
- * dummy padding blocks on-the-fly rather than expecting them to be present
- * in the arrays.
- */
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_c_coef_controller pub; /* public fields */
-
-  JDIMENSION iMCU_row_num;	/* iMCU row # within image */
-  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */
-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
-
-  /* Virtual block array for each component. */
-  jvirt_barray_ptr * whole_image;
-
-  /* Workspace for constructing dummy blocks at right/bottom edges. */
-  JBLOCKROW dummy_buffer[C_MAX_BLOCKS_IN_MCU];
-} my_coef_controller;
-
-typedef my_coef_controller * my_coef_ptr;
-
-
-LOCAL(void)
-start_iMCU_row (j_compress_ptr cinfo)
-/* Reset within-iMCU-row counters for a new row */
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  /* In an interleaved scan, an MCU row is the same as an iMCU row.
-   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
-   * But at the bottom of the image, process only what's left.
-   */
-  if (cinfo->comps_in_scan > 1) {
-    coef->MCU_rows_per_iMCU_row = 1;
-  } else {
-    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
-    else
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
-  }
-
-  coef->mcu_ctr = 0;
-  coef->MCU_vert_offset = 0;
-}
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  if (pass_mode != JBUF_CRANK_DEST)
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-
-  coef->iMCU_row_num = 0;
-  start_iMCU_row(cinfo);
-}
-
-
-/*
- * Process some data.
- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
- * per call, ie, v_samp_factor block rows for each component in the scan.
- * The data is obtained from the virtual arrays and fed to the entropy coder.
- * Returns TRUE if the iMCU row is completed, FALSE if suspended.
- *
- * NB: input_buf is ignored; it is likely to be a NULL pointer.
- */
-
-METHODDEF(wxjpeg_boolean)
-compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  int blkn, ci, xindex, yindex, yoffset, blockcnt;
-  JDIMENSION start_col;
-  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
-  JBLOCKROW MCU_buffer[C_MAX_BLOCKS_IN_MCU];
-  JBLOCKROW buffer_ptr;
-  jpeg_component_info *compptr;
-
-  /* Align the virtual buffers for the components used in this scan. */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    buffer[ci] = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
-       coef->iMCU_row_num * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, FALSE);
-  }
-
-  /* Loop to process one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;
-	 MCU_col_num++) {
-      /* Construct list of pointers to DCT blocks belonging to this MCU */
-      blkn = 0;			/* index of current DCT block within MCU */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	start_col = MCU_col_num * compptr->MCU_width;
-	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
-						: compptr->last_col_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  if (coef->iMCU_row_num < last_iMCU_row ||
-	      yindex+yoffset < compptr->last_row_height) {
-	    /* Fill in pointers to real blocks in this row */
-	    buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
-	    for (xindex = 0; xindex < blockcnt; xindex++)
-	      MCU_buffer[blkn++] = buffer_ptr++;
-	  } else {
-	    /* At bottom of image, need a whole row of dummy blocks */
-	    xindex = 0;
-	  }
-	  /* Fill in any dummy blocks needed in this row.
-	   * Dummy blocks are filled in the same way as in jccoefct.c:
-	   * all zeroes in the AC entries, DC entries equal to previous
-	   * block's DC value.  The init routine has already zeroed the
-	   * AC entries, so we need only set the DC entries correctly.
-	   */
-	  for (; xindex < compptr->MCU_width; xindex++) {
-	    MCU_buffer[blkn] = coef->dummy_buffer[blkn];
-	    MCU_buffer[blkn][0][0] = MCU_buffer[blkn-1][0][0];
-	    blkn++;
-	  }
-	}
-      }
-      /* Try to write the MCU. */
-      if (! (*cinfo->entropy->encode_mcu) (cinfo, MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->mcu_ctr = MCU_col_num;
-	return FALSE;
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->mcu_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  coef->iMCU_row_num++;
-  start_iMCU_row(cinfo);
-  return TRUE;
-}
-
-
-/*
- * Initialize coefficient buffer controller.
- *
- * Each passed coefficient array must be the right size for that
- * coefficient: width_in_blocks wide and height_in_blocks high,
- * with unitheight at least v_samp_factor.
- */
-
-LOCAL(void)
-transencode_coef_controller (j_compress_ptr cinfo,
-			     jvirt_barray_ptr * coef_arrays)
-{
-  my_coef_ptr coef;
-  JBLOCKROW buffer;
-  int i;
-
-  coef = (my_coef_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_coef_controller));
-  cinfo->coef = (struct jpeg_c_coef_controller *) coef;
-  coef->pub.start_pass = start_pass_coef;
-  coef->pub.compress_data = compress_output;
-
-  /* Save pointer to virtual arrays */
-  coef->whole_image = coef_arrays;
-
-  /* Allocate and pre-zero space for dummy DCT blocks. */
-  buffer = (JBLOCKROW)
-    (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
-  jzero_far((void FAR *) buffer, C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
-  for (i = 0; i < C_MAX_BLOCKS_IN_MCU; i++) {
-    coef->dummy_buffer[i] = buffer + i;
-  }
-}
-
-#if defined(__VISAGECPP__)
-#  ifdef start_pass_coef2
-#   undef start_pass_coef2
-#  endif
-#  ifdef compress_output2
-#    undef compress_output2
-#  endif
-#endif
+/*
+ * jctrans.c
+ *
+ * Copyright (C) 1995-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains library routines for transcoding compression,
+ * that is, writing raw DCT coefficient arrays to an output JPEG file.
+ * The routines in jcapimin.c will also be needed by a transcoder.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Forward declarations */
+LOCAL(void) transencode_master_selection
+	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
+LOCAL(void) transencode_coef_controller
+	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
+
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+#  define start_pass_coef   start_pass_coef2 /* already in jccoeft.c */
+#  define compress_output   compress_output2 /* already in jccoeft.c */
+#endif
+
+
+/*
+ * Compression initialization for writing raw-coefficient data.
+ * Before calling this, all parameters and a data destination must be set up.
+ * Call jpeg_finish_compress() to actually write the data.
+ *
+ * The number of passed virtual arrays must match cinfo->num_components.
+ * Note that the virtual arrays need not be filled or even realized at
+ * the time write_coefficients is called; indeed, if the virtual arrays
+ * were requested from this compression object's memory manager, they
+ * typically will be realized during this routine and filled afterwards.
+ */
+
+GLOBAL(void)
+jpeg_write_coefficients (j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays)
+{
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  /* Mark all tables to be written */
+  jpeg_suppress_tables(cinfo, FALSE);
+  /* (Re)initialize error mgr and destination modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->dest->init_destination) (cinfo);
+  /* Perform master selection of active modules */
+  transencode_master_selection(cinfo, coef_arrays);
+  /* Wait for jpeg_finish_compress() call */
+  cinfo->next_scanline = 0;	/* so jpeg_write_marker works */
+  cinfo->global_state = CSTATE_WRCOEFS;
+}
+
+
+/*
+ * Initialize the compression object with default parameters,
+ * then copy from the source object all parameters needed for lossless
+ * transcoding.  Parameters that can be varied without loss (such as
+ * scan script and Huffman optimization) are left in their default states.
+ */
+
+GLOBAL(void)
+jpeg_copy_critical_parameters (j_decompress_ptr srcinfo,
+			       j_compress_ptr dstinfo)
+{
+  JQUANT_TBL ** qtblptr;
+  jpeg_component_info *incomp, *outcomp;
+  JQUANT_TBL *c_quant, *slot_quant;
+  int tblno, ci, coefi;
+
+  /* Safety check to ensure start_compress not called yet. */
+  if (dstinfo->global_state != CSTATE_START)
+    ERREXIT1(dstinfo, JERR_BAD_STATE, dstinfo->global_state);
+  /* Copy fundamental image dimensions */
+  dstinfo->image_width = srcinfo->image_width;
+  dstinfo->image_height = srcinfo->image_height;
+  dstinfo->input_components = srcinfo->num_components;
+  dstinfo->in_color_space = srcinfo->jpeg_color_space;
+  /* Initialize all parameters to default values */
+  jpeg_set_defaults(dstinfo);
+  /* jpeg_set_defaults may choose wrong colorspace, eg YCbCr if input is RGB.
+   * Fix it to get the right header markers for the image colorspace.
+   */
+  jpeg_set_colorspace(dstinfo, srcinfo->jpeg_color_space);
+  dstinfo->data_precision = srcinfo->data_precision;
+  dstinfo->CCIR601_sampling = srcinfo->CCIR601_sampling;
+  /* Copy the source's quantization tables. */
+  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {
+    if (srcinfo->quant_tbl_ptrs[tblno] != NULL) {
+      qtblptr = & dstinfo->quant_tbl_ptrs[tblno];
+      if (*qtblptr == NULL)
+	*qtblptr = jpeg_alloc_quant_table((j_common_ptr) dstinfo);
+      MEMCOPY((*qtblptr)->quantval,
+	      srcinfo->quant_tbl_ptrs[tblno]->quantval,
+	      SIZEOF((*qtblptr)->quantval));
+      (*qtblptr)->sent_table = FALSE;
+    }
+  }
+  /* Copy the source's per-component info.
+   * Note we assume jpeg_set_defaults has allocated the dest comp_info array.
+   */
+  dstinfo->num_components = srcinfo->num_components;
+  if (dstinfo->num_components < 1 || dstinfo->num_components > MAX_COMPONENTS)
+    ERREXIT2(dstinfo, JERR_COMPONENT_COUNT, dstinfo->num_components,
+	     MAX_COMPONENTS);
+  for (ci = 0, incomp = srcinfo->comp_info, outcomp = dstinfo->comp_info;
+       ci < dstinfo->num_components; ci++, incomp++, outcomp++) {
+    outcomp->component_id = incomp->component_id;
+    outcomp->h_samp_factor = incomp->h_samp_factor;
+    outcomp->v_samp_factor = incomp->v_samp_factor;
+    outcomp->quant_tbl_no = incomp->quant_tbl_no;
+    /* Make sure saved quantization table for component matches the qtable
+     * slot.  If not, the input file re-used this qtable slot.
+     * IJG encoder currently cannot duplicate this.
+     */
+    tblno = outcomp->quant_tbl_no;
+    if (tblno < 0 || tblno >= NUM_QUANT_TBLS ||
+	srcinfo->quant_tbl_ptrs[tblno] == NULL)
+      ERREXIT1(dstinfo, JERR_NO_QUANT_TABLE, tblno);
+    slot_quant = srcinfo->quant_tbl_ptrs[tblno];
+    c_quant = incomp->quant_table;
+    if (c_quant != NULL) {
+      for (coefi = 0; coefi < DCTSIZE2; coefi++) {
+	if (c_quant->quantval[coefi] != slot_quant->quantval[coefi])
+	  ERREXIT1(dstinfo, JERR_MISMATCHED_QUANT_TABLE, tblno);
+      }
+    }
+    /* Note: we do not copy the source's Huffman table assignments;
+     * instead we rely on jpeg_set_colorspace to have made a suitable choice.
+     */
+  }
+  /* Also copy JFIF version and resolution information, if available.
+   * Strictly speaking this isn't "critical" info, but it's nearly
+   * always appropriate to copy it if available.  In particular,
+   * if the application chooses to copy JFIF 1.02 extension markers from
+   * the source file, we need to copy the version to make sure we don't
+   * emit a file that has 1.02 extensions but a claimed version of 1.01.
+   * We will *not*, however, copy version info from mislabeled "2.01" files.
+   */
+  if (srcinfo->saw_JFIF_marker) {
+    if (srcinfo->JFIF_major_version == 1) {
+      dstinfo->JFIF_major_version = srcinfo->JFIF_major_version;
+      dstinfo->JFIF_minor_version = srcinfo->JFIF_minor_version;
+    }
+    dstinfo->density_unit = srcinfo->density_unit;
+    dstinfo->X_density = srcinfo->X_density;
+    dstinfo->Y_density = srcinfo->Y_density;
+  }
+}
+
+
+/*
+ * Master selection of compression modules for transcoding.
+ * This substitutes for jcinit.c's initialization of the full compressor.
+ */
+
+LOCAL(void)
+transencode_master_selection (j_compress_ptr cinfo,
+			      jvirt_barray_ptr * coef_arrays)
+{
+  /* Although we don't actually use input_components for transcoding,
+   * jcmaster.c's initial_setup will complain if input_components is 0.
+   */
+  cinfo->input_components = 1;
+  /* Initialize master control (includes parameter checking/processing) */
+  jinit_c_master_control(cinfo, TRUE /* transcode only */);
+
+  /* Entropy encoding: either Huffman or arithmetic coding. */
+  if (cinfo->arith_code) {
+    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+  } else {
+    if (cinfo->progressive_mode) {
+#ifdef C_PROGRESSIVE_SUPPORTED
+      jinit_phuff_encoder(cinfo);
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    } else
+      jinit_huff_encoder(cinfo);
+  }
+
+  /* We need a special coefficient buffer controller. */
+  transencode_coef_controller(cinfo, coef_arrays);
+
+  jinit_marker_writer(cinfo);
+
+  /* We can now tell the memory manager to allocate virtual arrays. */
+  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
+
+  /* Write the datastream header (SOI, JFIF) immediately.
+   * Frame and scan headers are postponed till later.
+   * This lets application insert special markers after the SOI.
+   */
+  (*cinfo->marker->write_file_header) (cinfo);
+}
+
+
+/*
+ * The rest of this file is a special implementation of the coefficient
+ * buffer controller.  This is similar to jccoefct.c, but it handles only
+ * output from presupplied virtual arrays.  Furthermore, we generate any
+ * dummy padding blocks on-the-fly rather than expecting them to be present
+ * in the arrays.
+ */
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_c_coef_controller pub; /* public fields */
+
+  JDIMENSION iMCU_row_num;	/* iMCU row # within image */
+  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */
+  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
+  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
+
+  /* Virtual block array for each component. */
+  jvirt_barray_ptr * whole_image;
+
+  /* Workspace for constructing dummy blocks at right/bottom edges. */
+  JBLOCKROW dummy_buffer[C_MAX_BLOCKS_IN_MCU];
+} my_coef_controller;
+
+typedef my_coef_controller * my_coef_ptr;
+
+
+LOCAL(void)
+start_iMCU_row (j_compress_ptr cinfo)
+/* Reset within-iMCU-row counters for a new row */
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+
+  /* In an interleaved scan, an MCU row is the same as an iMCU row.
+   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
+   * But at the bottom of the image, process only what's left.
+   */
+  if (cinfo->comps_in_scan > 1) {
+    coef->MCU_rows_per_iMCU_row = 1;
+  } else {
+    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
+    else
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
+  }
+
+  coef->mcu_ctr = 0;
+  coef->MCU_vert_offset = 0;
+}
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+
+  if (pass_mode != JBUF_CRANK_DEST)
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+
+  coef->iMCU_row_num = 0;
+  start_iMCU_row(cinfo);
+}
+
+
+/*
+ * Process some data.
+ * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
+ * per call, ie, v_samp_factor block rows for each component in the scan.
+ * The data is obtained from the virtual arrays and fed to the entropy coder.
+ * Returns TRUE if the iMCU row is completed, FALSE if suspended.
+ *
+ * NB: input_buf is ignored; it is likely to be a NULL pointer.
+ */
+
+METHODDEF(wxjpeg_boolean)
+compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int blkn, ci, xindex, yindex, yoffset, blockcnt;
+  JDIMENSION start_col;
+  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
+  JBLOCKROW MCU_buffer[C_MAX_BLOCKS_IN_MCU];
+  JBLOCKROW buffer_ptr;
+  jpeg_component_info *compptr;
+
+  /* Align the virtual buffers for the components used in this scan. */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    buffer[ci] = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
+       coef->iMCU_row_num * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, FALSE);
+  }
+
+  /* Loop to process one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;
+	 MCU_col_num++) {
+      /* Construct list of pointers to DCT blocks belonging to this MCU */
+      blkn = 0;			/* index of current DCT block within MCU */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	start_col = MCU_col_num * compptr->MCU_width;
+	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
+						: compptr->last_col_width;
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  if (coef->iMCU_row_num < last_iMCU_row ||
+	      yindex+yoffset < compptr->last_row_height) {
+	    /* Fill in pointers to real blocks in this row */
+	    buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
+	    for (xindex = 0; xindex < blockcnt; xindex++)
+	      MCU_buffer[blkn++] = buffer_ptr++;
+	  } else {
+	    /* At bottom of image, need a whole row of dummy blocks */
+	    xindex = 0;
+	  }
+	  /* Fill in any dummy blocks needed in this row.
+	   * Dummy blocks are filled in the same way as in jccoefct.c:
+	   * all zeroes in the AC entries, DC entries equal to previous
+	   * block's DC value.  The init routine has already zeroed the
+	   * AC entries, so we need only set the DC entries correctly.
+	   */
+	  for (; xindex < compptr->MCU_width; xindex++) {
+	    MCU_buffer[blkn] = coef->dummy_buffer[blkn];
+	    MCU_buffer[blkn][0][0] = MCU_buffer[blkn-1][0][0];
+	    blkn++;
+	  }
+	}
+      }
+      /* Try to write the MCU. */
+      if (! (*cinfo->entropy->encode_mcu) (cinfo, MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->mcu_ctr = MCU_col_num;
+	return FALSE;
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->mcu_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  coef->iMCU_row_num++;
+  start_iMCU_row(cinfo);
+  return TRUE;
+}
+
+
+/*
+ * Initialize coefficient buffer controller.
+ *
+ * Each passed coefficient array must be the right size for that
+ * coefficient: width_in_blocks wide and height_in_blocks high,
+ * with unitheight at least v_samp_factor.
+ */
+
+LOCAL(void)
+transencode_coef_controller (j_compress_ptr cinfo,
+			     jvirt_barray_ptr * coef_arrays)
+{
+  my_coef_ptr coef;
+  JBLOCKROW buffer;
+  int i;
+
+  coef = (my_coef_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_coef_controller));
+  cinfo->coef = (struct jpeg_c_coef_controller *) coef;
+  coef->pub.start_pass = start_pass_coef;
+  coef->pub.compress_data = compress_output;
+
+  /* Save pointer to virtual arrays */
+  coef->whole_image = coef_arrays;
+
+  /* Allocate and pre-zero space for dummy DCT blocks. */
+  buffer = (JBLOCKROW)
+    (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
+  jzero_far((void FAR *) buffer, C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
+  for (i = 0; i < C_MAX_BLOCKS_IN_MCU; i++) {
+    coef->dummy_buffer[i] = buffer + i;
+  }
+}
+
+#if defined(__VISAGECPP__)
+#  ifdef start_pass_coef2
+#   undef start_pass_coef2
+#  endif
+#  ifdef compress_output2
+#    undef compress_output2
+#  endif
+#endif
diff --git a/Source/3rd Party/wx/src/jpeg/jdapimin.c b/Source/3rd Party/wx/src/jpeg/jdapimin.c
index 26ab65f39..5c8474f01 100644
--- a/Source/3rd Party/wx/src/jpeg/jdapimin.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdapimin.c	
@@ -1,395 +1,395 @@
-/*
- * jdapimin.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface code for the decompression half
- * of the JPEG library.  These are the "minimum" API routines that may be
- * needed in either the normal full-decompression case or the
- * transcoding-only case.
- *
- * Most of the routines intended to be called directly by an application
- * are in this file or in jdapistd.c.  But also see jcomapi.c for routines
- * shared by compression and decompression, and jdtrans.c for the transcoding
- * case.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Initialization of a JPEG decompression object.
- * The error manager must already be set up (in case memory manager fails).
- */
-
-GLOBAL(void)
-jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, size_t structsize)
-{
-  int i;
-
-  /* Guard against version mismatches between library and caller. */
-  cinfo->mem = NULL;		/* so jpeg_destroy knows mem mgr not called */
-  if (version != JPEG_LIB_VERSION)
-    ERREXIT2(cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version);
-  if (structsize != SIZEOF(struct jpeg_decompress_struct))
-    ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE, 
-	     (int) SIZEOF(struct jpeg_decompress_struct), (int) structsize);
-
-  /* For debugging purposes, we zero the whole master structure.
-   * But the application has already set the err pointer, and may have set
-   * client_data, so we have to save and restore those fields.
-   * Note: if application hasn't set client_data, tools like Purify may
-   * complain here.
-   */
-  {
-    struct jpeg_error_mgr * err = cinfo->err;
-    void * client_data = cinfo->client_data; /* ignore Purify complaint here */
-    MEMZERO(cinfo, SIZEOF(struct jpeg_decompress_struct));
-    cinfo->err = err;
-    cinfo->client_data = client_data;
-  }
-  cinfo->is_decompressor = TRUE;
-
-  /* Initialize a memory manager instance for this object */
-  jinit_memory_mgr((j_common_ptr) cinfo);
-
-  /* Zero out pointers to permanent structures. */
-  cinfo->progress = NULL;
-  cinfo->src = NULL;
-
-  for (i = 0; i < NUM_QUANT_TBLS; i++)
-    cinfo->quant_tbl_ptrs[i] = NULL;
-
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    cinfo->dc_huff_tbl_ptrs[i] = NULL;
-    cinfo->ac_huff_tbl_ptrs[i] = NULL;
-  }
-
-  /* Initialize marker processor so application can override methods
-   * for COM, APPn markers before calling jpeg_read_header.
-   */
-  cinfo->marker_list = NULL;
-  jinit_marker_reader(cinfo);
-
-  /* And initialize the overall input controller. */
-  jinit_input_controller(cinfo);
-
-  /* OK, I'm ready */
-  cinfo->global_state = DSTATE_START;
-}
-
-
-/*
- * Destruction of a JPEG decompression object
- */
-
-GLOBAL(void)
-jpeg_destroy_decompress (j_decompress_ptr cinfo)
-{
-  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
-}
-
-
-/*
- * Abort processing of a JPEG decompression operation,
- * but don't destroy the object itself.
- */
-
-GLOBAL(void)
-jpeg_abort_decompress (j_decompress_ptr cinfo)
-{
-  jpeg_abort((j_common_ptr) cinfo); /* use common routine */
-}
-
-
-/*
- * Set default decompression parameters.
- */
-
-LOCAL(void)
-default_decompress_parms (j_decompress_ptr cinfo)
-{
-  /* Guess the input colorspace, and set output colorspace accordingly. */
-  /* (Wish JPEG committee had provided a real way to specify this...) */
-  /* Note application may override our guesses. */
-  switch (cinfo->num_components) {
-  case 1:
-    cinfo->jpeg_color_space = JCS_GRAYSCALE;
-    cinfo->out_color_space = JCS_GRAYSCALE;
-    break;
-    
-  case 3:
-    if (cinfo->saw_JFIF_marker) {
-      cinfo->jpeg_color_space = JCS_YCbCr; /* JFIF implies YCbCr */
-    } else if (cinfo->saw_Adobe_marker) {
-      switch (cinfo->Adobe_transform) {
-      case 0:
-	cinfo->jpeg_color_space = JCS_RGB;
-	break;
-      case 1:
-	cinfo->jpeg_color_space = JCS_YCbCr;
-	break;
-      default:
-	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);
-	cinfo->jpeg_color_space = JCS_YCbCr; /* assume it's YCbCr */
-	break;
-      }
-    } else {
-      /* Saw no special markers, try to guess from the component IDs */
-      int cid0 = cinfo->comp_info[0].component_id;
-      int cid1 = cinfo->comp_info[1].component_id;
-      int cid2 = cinfo->comp_info[2].component_id;
-
-      if (cid0 == 1 && cid1 == 2 && cid2 == 3)
-	cinfo->jpeg_color_space = JCS_YCbCr; /* assume JFIF w/out marker */
-      else if (cid0 == 82 && cid1 == 71 && cid2 == 66)
-	cinfo->jpeg_color_space = JCS_RGB; /* ASCII 'R', 'G', 'B' */
-      else {
-	TRACEMS3(cinfo, 1, JTRC_UNKNOWN_IDS, cid0, cid1, cid2);
-	cinfo->jpeg_color_space = JCS_YCbCr; /* assume it's YCbCr */
-      }
-    }
-    /* Always guess RGB is proper output colorspace. */
-    cinfo->out_color_space = JCS_RGB;
-    break;
-    
-  case 4:
-    if (cinfo->saw_Adobe_marker) {
-      switch (cinfo->Adobe_transform) {
-      case 0:
-	cinfo->jpeg_color_space = JCS_CMYK;
-	break;
-      case 2:
-	cinfo->jpeg_color_space = JCS_YCCK;
-	break;
-      default:
-	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);
-	cinfo->jpeg_color_space = JCS_YCCK; /* assume it's YCCK */
-	break;
-      }
-    } else {
-      /* No special markers, assume straight CMYK. */
-      cinfo->jpeg_color_space = JCS_CMYK;
-    }
-    cinfo->out_color_space = JCS_CMYK;
-    break;
-    
-  default:
-    cinfo->jpeg_color_space = JCS_UNKNOWN;
-    cinfo->out_color_space = JCS_UNKNOWN;
-    break;
-  }
-
-  /* Set defaults for other decompression parameters. */
-  cinfo->scale_num = 1;		/* 1:1 scaling */
-  cinfo->scale_denom = 1;
-  cinfo->output_gamma = 1.0;
-  cinfo->buffered_image = FALSE;
-  cinfo->raw_data_out = FALSE;
-  cinfo->dct_method = JDCT_DEFAULT;
-  cinfo->do_fancy_upsampling = TRUE;
-  cinfo->do_block_smoothing = TRUE;
-  cinfo->quantize_colors = FALSE;
-  /* We set these in case application only sets quantize_colors. */
-  cinfo->dither_mode = JDITHER_FS;
-#ifdef QUANT_2PASS_SUPPORTED
-  cinfo->two_pass_quantize = TRUE;
-#else
-  cinfo->two_pass_quantize = FALSE;
-#endif
-  cinfo->desired_number_of_colors = 256;
-  cinfo->colormap = NULL;
-  /* Initialize for no mode change in buffered-image mode. */
-  cinfo->enable_1pass_quant = FALSE;
-  cinfo->enable_external_quant = FALSE;
-  cinfo->enable_2pass_quant = FALSE;
-}
-
-
-/*
- * Decompression startup: read start of JPEG datastream to see what's there.
- * Need only initialize JPEG object and supply a data source before calling.
- *
- * This routine will read as far as the first SOS marker (ie, actual start of
- * compressed data), and will save all tables and parameters in the JPEG
- * object.  It will also initialize the decompression parameters to default
- * values, and finally return JPEG_HEADER_OK.  On return, the application may
- * adjust the decompression parameters and then call jpeg_start_decompress.
- * (Or, if the application only wanted to determine the image parameters,
- * the data need not be decompressed.  In that case, call jpeg_abort or
- * jpeg_destroy to release any temporary space.)
- * If an abbreviated (tables only) datastream is presented, the routine will
- * return JPEG_HEADER_TABLES_ONLY upon reaching EOI.  The application may then
- * re-use the JPEG object to read the abbreviated image datastream(s).
- * It is unnecessary (but OK) to call jpeg_abort in this case.
- * The JPEG_SUSPENDED return code only occurs if the data source module
- * requests suspension of the decompressor.  In this case the application
- * should load more source data and then re-call jpeg_read_header to resume
- * processing.
- * If a non-suspending data source is used and require_image is TRUE, then the
- * return code need not be inspected since only JPEG_HEADER_OK is possible.
- *
- * This routine is now just a front end to jpeg_consume_input, with some
- * extra error checking.
- */
-
-GLOBAL(int)
-jpeg_read_header (j_decompress_ptr cinfo, wxjpeg_boolean require_image)
-{
-  int retcode;
-
-  if (cinfo->global_state != DSTATE_START &&
-      cinfo->global_state != DSTATE_INHEADER)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  retcode = jpeg_consume_input(cinfo);
-
-  switch (retcode) {
-  case JPEG_REACHED_SOS:
-    retcode = JPEG_HEADER_OK;
-    break;
-  case JPEG_REACHED_EOI:
-    if (require_image)		/* Complain if application wanted an image */
-      ERREXIT(cinfo, JERR_NO_IMAGE);
-    /* Reset to start state; it would be safer to require the application to
-     * call jpeg_abort, but we can't change it now for compatibility reasons.
-     * A side effect is to free any temporary memory (there shouldn't be any).
-     */
-    jpeg_abort((j_common_ptr) cinfo); /* sets state = DSTATE_START */
-    retcode = JPEG_HEADER_TABLES_ONLY;
-    break;
-  case JPEG_SUSPENDED:
-    /* no work */
-    break;
-  }
-
-  return retcode;
-}
-
-
-/*
- * Consume data in advance of what the decompressor requires.
- * This can be called at any time once the decompressor object has
- * been created and a data source has been set up.
- *
- * This routine is essentially a state machine that handles a couple
- * of critical state-transition actions, namely initial setup and
- * transition from header scanning to ready-for-start_decompress.
- * All the actual input is done via the input controller's consume_input
- * method.
- */
-
-GLOBAL(int)
-jpeg_consume_input (j_decompress_ptr cinfo)
-{
-  int retcode = JPEG_SUSPENDED;
-
-  /* NB: every possible DSTATE value should be listed in this switch */
-  switch (cinfo->global_state) {
-  case DSTATE_START:
-    /* Start-of-datastream actions: reset appropriate modules */
-    (*cinfo->inputctl->reset_input_controller) (cinfo);
-    /* Initialize application's data source module */
-    (*cinfo->src->init_source) (cinfo);
-    cinfo->global_state = DSTATE_INHEADER;
-    /*FALLTHROUGH*/
-  case DSTATE_INHEADER:
-    retcode = (*cinfo->inputctl->consume_input) (cinfo);
-    if (retcode == JPEG_REACHED_SOS) { /* Found SOS, prepare to decompress */
-      /* Set up default parameters based on header data */
-      default_decompress_parms(cinfo);
-      /* Set global state: ready for start_decompress */
-      cinfo->global_state = DSTATE_READY;
-    }
-    break;
-  case DSTATE_READY:
-    /* Can't advance past first SOS until start_decompress is called */
-    retcode = JPEG_REACHED_SOS;
-    break;
-  case DSTATE_PRELOAD:
-  case DSTATE_PRESCAN:
-  case DSTATE_SCANNING:
-  case DSTATE_RAW_OK:
-  case DSTATE_BUFIMAGE:
-  case DSTATE_BUFPOST:
-  case DSTATE_STOPPING:
-    retcode = (*cinfo->inputctl->consume_input) (cinfo);
-    break;
-  default:
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  }
-  return retcode;
-}
-
-
-/*
- * Have we finished reading the input file?
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_input_complete (j_decompress_ptr cinfo)
-{
-  /* Check for valid jpeg object */
-  if (cinfo->global_state < DSTATE_START ||
-      cinfo->global_state > DSTATE_STOPPING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  return cinfo->inputctl->eoi_reached;
-}
-
-
-/*
- * Is there more than one scan?
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_has_multiple_scans (j_decompress_ptr cinfo)
-{
-  /* Only valid after jpeg_read_header completes */
-  if (cinfo->global_state < DSTATE_READY ||
-      cinfo->global_state > DSTATE_STOPPING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  return cinfo->inputctl->has_multiple_scans;
-}
-
-
-/*
- * Finish JPEG decompression.
- *
- * This will normally just verify the file trailer and release temp storage.
- *
- * Returns FALSE if suspended.  The return value need be inspected only if
- * a suspending data source is used.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_finish_decompress (j_decompress_ptr cinfo)
-{
-  if ((cinfo->global_state == DSTATE_SCANNING ||
-       cinfo->global_state == DSTATE_RAW_OK) && ! cinfo->buffered_image) {
-    /* Terminate final pass of non-buffered mode */
-    if (cinfo->output_scanline < cinfo->output_height)
-      ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);
-    (*cinfo->master->finish_output_pass) (cinfo);
-    cinfo->global_state = DSTATE_STOPPING;
-  } else if (cinfo->global_state == DSTATE_BUFIMAGE) {
-    /* Finishing after a buffered-image operation */
-    cinfo->global_state = DSTATE_STOPPING;
-  } else if (cinfo->global_state != DSTATE_STOPPING) {
-    /* STOPPING = repeat call after a suspension, anything else is error */
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  }
-  /* Read until EOI */
-  while (! cinfo->inputctl->eoi_reached) {
-    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)
-      return FALSE;		/* Suspend, come back later */
-  }
-  /* Do final cleanup */
-  (*cinfo->src->term_source) (cinfo);
-  /* We can use jpeg_abort to release memory and reset global_state */
-  jpeg_abort((j_common_ptr) cinfo);
-  return TRUE;
-}
+/*
+ * jdapimin.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface code for the decompression half
+ * of the JPEG library.  These are the "minimum" API routines that may be
+ * needed in either the normal full-decompression case or the
+ * transcoding-only case.
+ *
+ * Most of the routines intended to be called directly by an application
+ * are in this file or in jdapistd.c.  But also see jcomapi.c for routines
+ * shared by compression and decompression, and jdtrans.c for the transcoding
+ * case.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * Initialization of a JPEG decompression object.
+ * The error manager must already be set up (in case memory manager fails).
+ */
+
+GLOBAL(void)
+jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, size_t structsize)
+{
+  int i;
+
+  /* Guard against version mismatches between library and caller. */
+  cinfo->mem = NULL;		/* so jpeg_destroy knows mem mgr not called */
+  if (version != JPEG_LIB_VERSION)
+    ERREXIT2(cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version);
+  if (structsize != SIZEOF(struct jpeg_decompress_struct))
+    ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE, 
+	     (int) SIZEOF(struct jpeg_decompress_struct), (int) structsize);
+
+  /* For debugging purposes, we zero the whole master structure.
+   * But the application has already set the err pointer, and may have set
+   * client_data, so we have to save and restore those fields.
+   * Note: if application hasn't set client_data, tools like Purify may
+   * complain here.
+   */
+  {
+    struct jpeg_error_mgr * err = cinfo->err;
+    void * client_data = cinfo->client_data; /* ignore Purify complaint here */
+    MEMZERO(cinfo, SIZEOF(struct jpeg_decompress_struct));
+    cinfo->err = err;
+    cinfo->client_data = client_data;
+  }
+  cinfo->is_decompressor = TRUE;
+
+  /* Initialize a memory manager instance for this object */
+  jinit_memory_mgr((j_common_ptr) cinfo);
+
+  /* Zero out pointers to permanent structures. */
+  cinfo->progress = NULL;
+  cinfo->src = NULL;
+
+  for (i = 0; i < NUM_QUANT_TBLS; i++)
+    cinfo->quant_tbl_ptrs[i] = NULL;
+
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    cinfo->dc_huff_tbl_ptrs[i] = NULL;
+    cinfo->ac_huff_tbl_ptrs[i] = NULL;
+  }
+
+  /* Initialize marker processor so application can override methods
+   * for COM, APPn markers before calling jpeg_read_header.
+   */
+  cinfo->marker_list = NULL;
+  jinit_marker_reader(cinfo);
+
+  /* And initialize the overall input controller. */
+  jinit_input_controller(cinfo);
+
+  /* OK, I'm ready */
+  cinfo->global_state = DSTATE_START;
+}
+
+
+/*
+ * Destruction of a JPEG decompression object
+ */
+
+GLOBAL(void)
+jpeg_destroy_decompress (j_decompress_ptr cinfo)
+{
+  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
+}
+
+
+/*
+ * Abort processing of a JPEG decompression operation,
+ * but don't destroy the object itself.
+ */
+
+GLOBAL(void)
+jpeg_abort_decompress (j_decompress_ptr cinfo)
+{
+  jpeg_abort((j_common_ptr) cinfo); /* use common routine */
+}
+
+
+/*
+ * Set default decompression parameters.
+ */
+
+LOCAL(void)
+default_decompress_parms (j_decompress_ptr cinfo)
+{
+  /* Guess the input colorspace, and set output colorspace accordingly. */
+  /* (Wish JPEG committee had provided a real way to specify this...) */
+  /* Note application may override our guesses. */
+  switch (cinfo->num_components) {
+  case 1:
+    cinfo->jpeg_color_space = JCS_GRAYSCALE;
+    cinfo->out_color_space = JCS_GRAYSCALE;
+    break;
+    
+  case 3:
+    if (cinfo->saw_JFIF_marker) {
+      cinfo->jpeg_color_space = JCS_YCbCr; /* JFIF implies YCbCr */
+    } else if (cinfo->saw_Adobe_marker) {
+      switch (cinfo->Adobe_transform) {
+      case 0:
+	cinfo->jpeg_color_space = JCS_RGB;
+	break;
+      case 1:
+	cinfo->jpeg_color_space = JCS_YCbCr;
+	break;
+      default:
+	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);
+	cinfo->jpeg_color_space = JCS_YCbCr; /* assume it's YCbCr */
+	break;
+      }
+    } else {
+      /* Saw no special markers, try to guess from the component IDs */
+      int cid0 = cinfo->comp_info[0].component_id;
+      int cid1 = cinfo->comp_info[1].component_id;
+      int cid2 = cinfo->comp_info[2].component_id;
+
+      if (cid0 == 1 && cid1 == 2 && cid2 == 3)
+	cinfo->jpeg_color_space = JCS_YCbCr; /* assume JFIF w/out marker */
+      else if (cid0 == 82 && cid1 == 71 && cid2 == 66)
+	cinfo->jpeg_color_space = JCS_RGB; /* ASCII 'R', 'G', 'B' */
+      else {
+	TRACEMS3(cinfo, 1, JTRC_UNKNOWN_IDS, cid0, cid1, cid2);
+	cinfo->jpeg_color_space = JCS_YCbCr; /* assume it's YCbCr */
+      }
+    }
+    /* Always guess RGB is proper output colorspace. */
+    cinfo->out_color_space = JCS_RGB;
+    break;
+    
+  case 4:
+    if (cinfo->saw_Adobe_marker) {
+      switch (cinfo->Adobe_transform) {
+      case 0:
+	cinfo->jpeg_color_space = JCS_CMYK;
+	break;
+      case 2:
+	cinfo->jpeg_color_space = JCS_YCCK;
+	break;
+      default:
+	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);
+	cinfo->jpeg_color_space = JCS_YCCK; /* assume it's YCCK */
+	break;
+      }
+    } else {
+      /* No special markers, assume straight CMYK. */
+      cinfo->jpeg_color_space = JCS_CMYK;
+    }
+    cinfo->out_color_space = JCS_CMYK;
+    break;
+    
+  default:
+    cinfo->jpeg_color_space = JCS_UNKNOWN;
+    cinfo->out_color_space = JCS_UNKNOWN;
+    break;
+  }
+
+  /* Set defaults for other decompression parameters. */
+  cinfo->scale_num = 1;		/* 1:1 scaling */
+  cinfo->scale_denom = 1;
+  cinfo->output_gamma = 1.0;
+  cinfo->buffered_image = FALSE;
+  cinfo->raw_data_out = FALSE;
+  cinfo->dct_method = JDCT_DEFAULT;
+  cinfo->do_fancy_upsampling = TRUE;
+  cinfo->do_block_smoothing = TRUE;
+  cinfo->quantize_colors = FALSE;
+  /* We set these in case application only sets quantize_colors. */
+  cinfo->dither_mode = JDITHER_FS;
+#ifdef QUANT_2PASS_SUPPORTED
+  cinfo->two_pass_quantize = TRUE;
+#else
+  cinfo->two_pass_quantize = FALSE;
+#endif
+  cinfo->desired_number_of_colors = 256;
+  cinfo->colormap = NULL;
+  /* Initialize for no mode change in buffered-image mode. */
+  cinfo->enable_1pass_quant = FALSE;
+  cinfo->enable_external_quant = FALSE;
+  cinfo->enable_2pass_quant = FALSE;
+}
+
+
+/*
+ * Decompression startup: read start of JPEG datastream to see what's there.
+ * Need only initialize JPEG object and supply a data source before calling.
+ *
+ * This routine will read as far as the first SOS marker (ie, actual start of
+ * compressed data), and will save all tables and parameters in the JPEG
+ * object.  It will also initialize the decompression parameters to default
+ * values, and finally return JPEG_HEADER_OK.  On return, the application may
+ * adjust the decompression parameters and then call jpeg_start_decompress.
+ * (Or, if the application only wanted to determine the image parameters,
+ * the data need not be decompressed.  In that case, call jpeg_abort or
+ * jpeg_destroy to release any temporary space.)
+ * If an abbreviated (tables only) datastream is presented, the routine will
+ * return JPEG_HEADER_TABLES_ONLY upon reaching EOI.  The application may then
+ * re-use the JPEG object to read the abbreviated image datastream(s).
+ * It is unnecessary (but OK) to call jpeg_abort in this case.
+ * The JPEG_SUSPENDED return code only occurs if the data source module
+ * requests suspension of the decompressor.  In this case the application
+ * should load more source data and then re-call jpeg_read_header to resume
+ * processing.
+ * If a non-suspending data source is used and require_image is TRUE, then the
+ * return code need not be inspected since only JPEG_HEADER_OK is possible.
+ *
+ * This routine is now just a front end to jpeg_consume_input, with some
+ * extra error checking.
+ */
+
+GLOBAL(int)
+jpeg_read_header (j_decompress_ptr cinfo, wxjpeg_boolean require_image)
+{
+  int retcode;
+
+  if (cinfo->global_state != DSTATE_START &&
+      cinfo->global_state != DSTATE_INHEADER)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  retcode = jpeg_consume_input(cinfo);
+
+  switch (retcode) {
+  case JPEG_REACHED_SOS:
+    retcode = JPEG_HEADER_OK;
+    break;
+  case JPEG_REACHED_EOI:
+    if (require_image)		/* Complain if application wanted an image */
+      ERREXIT(cinfo, JERR_NO_IMAGE);
+    /* Reset to start state; it would be safer to require the application to
+     * call jpeg_abort, but we can't change it now for compatibility reasons.
+     * A side effect is to free any temporary memory (there shouldn't be any).
+     */
+    jpeg_abort((j_common_ptr) cinfo); /* sets state = DSTATE_START */
+    retcode = JPEG_HEADER_TABLES_ONLY;
+    break;
+  case JPEG_SUSPENDED:
+    /* no work */
+    break;
+  }
+
+  return retcode;
+}
+
+
+/*
+ * Consume data in advance of what the decompressor requires.
+ * This can be called at any time once the decompressor object has
+ * been created and a data source has been set up.
+ *
+ * This routine is essentially a state machine that handles a couple
+ * of critical state-transition actions, namely initial setup and
+ * transition from header scanning to ready-for-start_decompress.
+ * All the actual input is done via the input controller's consume_input
+ * method.
+ */
+
+GLOBAL(int)
+jpeg_consume_input (j_decompress_ptr cinfo)
+{
+  int retcode = JPEG_SUSPENDED;
+
+  /* NB: every possible DSTATE value should be listed in this switch */
+  switch (cinfo->global_state) {
+  case DSTATE_START:
+    /* Start-of-datastream actions: reset appropriate modules */
+    (*cinfo->inputctl->reset_input_controller) (cinfo);
+    /* Initialize application's data source module */
+    (*cinfo->src->init_source) (cinfo);
+    cinfo->global_state = DSTATE_INHEADER;
+    /*FALLTHROUGH*/
+  case DSTATE_INHEADER:
+    retcode = (*cinfo->inputctl->consume_input) (cinfo);
+    if (retcode == JPEG_REACHED_SOS) { /* Found SOS, prepare to decompress */
+      /* Set up default parameters based on header data */
+      default_decompress_parms(cinfo);
+      /* Set global state: ready for start_decompress */
+      cinfo->global_state = DSTATE_READY;
+    }
+    break;
+  case DSTATE_READY:
+    /* Can't advance past first SOS until start_decompress is called */
+    retcode = JPEG_REACHED_SOS;
+    break;
+  case DSTATE_PRELOAD:
+  case DSTATE_PRESCAN:
+  case DSTATE_SCANNING:
+  case DSTATE_RAW_OK:
+  case DSTATE_BUFIMAGE:
+  case DSTATE_BUFPOST:
+  case DSTATE_STOPPING:
+    retcode = (*cinfo->inputctl->consume_input) (cinfo);
+    break;
+  default:
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  }
+  return retcode;
+}
+
+
+/*
+ * Have we finished reading the input file?
+ */
+
+GLOBAL(wxjpeg_boolean)
+jpeg_input_complete (j_decompress_ptr cinfo)
+{
+  /* Check for valid jpeg object */
+  if (cinfo->global_state < DSTATE_START ||
+      cinfo->global_state > DSTATE_STOPPING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  return cinfo->inputctl->eoi_reached;
+}
+
+
+/*
+ * Is there more than one scan?
+ */
+
+GLOBAL(wxjpeg_boolean)
+jpeg_has_multiple_scans (j_decompress_ptr cinfo)
+{
+  /* Only valid after jpeg_read_header completes */
+  if (cinfo->global_state < DSTATE_READY ||
+      cinfo->global_state > DSTATE_STOPPING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  return cinfo->inputctl->has_multiple_scans;
+}
+
+
+/*
+ * Finish JPEG decompression.
+ *
+ * This will normally just verify the file trailer and release temp storage.
+ *
+ * Returns FALSE if suspended.  The return value need be inspected only if
+ * a suspending data source is used.
+ */
+
+GLOBAL(wxjpeg_boolean)
+jpeg_finish_decompress (j_decompress_ptr cinfo)
+{
+  if ((cinfo->global_state == DSTATE_SCANNING ||
+       cinfo->global_state == DSTATE_RAW_OK) && ! cinfo->buffered_image) {
+    /* Terminate final pass of non-buffered mode */
+    if (cinfo->output_scanline < cinfo->output_height)
+      ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);
+    (*cinfo->master->finish_output_pass) (cinfo);
+    cinfo->global_state = DSTATE_STOPPING;
+  } else if (cinfo->global_state == DSTATE_BUFIMAGE) {
+    /* Finishing after a buffered-image operation */
+    cinfo->global_state = DSTATE_STOPPING;
+  } else if (cinfo->global_state != DSTATE_STOPPING) {
+    /* STOPPING = repeat call after a suspension, anything else is error */
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  }
+  /* Read until EOI */
+  while (! cinfo->inputctl->eoi_reached) {
+    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)
+      return FALSE;		/* Suspend, come back later */
+  }
+  /* Do final cleanup */
+  (*cinfo->src->term_source) (cinfo);
+  /* We can use jpeg_abort to release memory and reset global_state */
+  jpeg_abort((j_common_ptr) cinfo);
+  return TRUE;
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jdapistd.c b/Source/3rd Party/wx/src/jpeg/jdapistd.c
index 97c48bd00..9c995b4d8 100644
--- a/Source/3rd Party/wx/src/jpeg/jdapistd.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdapistd.c	
@@ -1,275 +1,275 @@
-/*
- * jdapistd.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface code for the decompression half
- * of the JPEG library.  These are the "standard" API routines that are
- * used in the normal full-decompression case.  They are not used by a
- * transcoding-only application.  Note that if an application links in
- * jpeg_start_decompress, it will end up linking in the entire decompressor.
- * We thus must separate this file from jdapimin.c to avoid linking the
- * whole decompression library into a transcoder.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Forward declarations */
-LOCAL(wxjpeg_boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
-
-
-/*
- * Decompression initialization.
- * jpeg_read_header must be completed before calling this.
- *
- * If a multipass operating mode was selected, this will do all but the
- * last pass, and thus may take a great deal of time.
- *
- * Returns FALSE if suspended.  The return value need be inspected only if
- * a suspending data source is used.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_start_decompress (j_decompress_ptr cinfo)
-{
-  if (cinfo->global_state == DSTATE_READY) {
-    /* First call: initialize master control, select active modules */
-    jinit_master_decompress(cinfo);
-    if (cinfo->buffered_image) {
-      /* No more work here; expecting jpeg_start_output next */
-      cinfo->global_state = DSTATE_BUFIMAGE;
-      return TRUE;
-    }
-    cinfo->global_state = DSTATE_PRELOAD;
-  }
-  if (cinfo->global_state == DSTATE_PRELOAD) {
-    /* If file has multiple scans, absorb them all into the coef buffer */
-    if (cinfo->inputctl->has_multiple_scans) {
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-      for (;;) {
-	int retcode;
-	/* Call progress monitor hook if present */
-	if (cinfo->progress != NULL)
-	  (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-	/* Absorb some more input */
-	retcode = (*cinfo->inputctl->consume_input) (cinfo);
-	if (retcode == JPEG_SUSPENDED)
-	  return FALSE;
-	if (retcode == JPEG_REACHED_EOI)
-	  break;
-	/* Advance progress counter if appropriate */
-	if (cinfo->progress != NULL &&
-	    (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
-	  if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
-	    /* jdmaster underestimated number of scans; ratchet up one scan */
-	    cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
-	  }
-	}
-      }
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
-    }
-    cinfo->output_scan_number = cinfo->input_scan_number;
-  } else if (cinfo->global_state != DSTATE_PRESCAN)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  /* Perform any dummy output passes, and set up for the final pass */
-  return output_pass_setup(cinfo);
-}
-
-
-/*
- * Set up for an output pass, and perform any dummy pass(es) needed.
- * Common subroutine for jpeg_start_decompress and jpeg_start_output.
- * Entry: global_state = DSTATE_PRESCAN only if previously suspended.
- * Exit: If done, returns TRUE and sets global_state for proper output mode.
- *       If suspended, returns FALSE and sets global_state = DSTATE_PRESCAN.
- */
-
-LOCAL(wxjpeg_boolean)
-output_pass_setup (j_decompress_ptr cinfo)
-{
-  if (cinfo->global_state != DSTATE_PRESCAN) {
-    /* First call: do pass setup */
-    (*cinfo->master->prepare_for_output_pass) (cinfo);
-    cinfo->output_scanline = 0;
-    cinfo->global_state = DSTATE_PRESCAN;
-  }
-  /* Loop over any required dummy passes */
-  while (cinfo->master->is_dummy_pass) {
-#ifdef QUANT_2PASS_SUPPORTED
-    /* Crank through the dummy pass */
-    while (cinfo->output_scanline < cinfo->output_height) {
-      JDIMENSION last_scanline;
-      /* Call progress monitor hook if present */
-      if (cinfo->progress != NULL) {
-	cinfo->progress->pass_counter = (long) cinfo->output_scanline;
-	cinfo->progress->pass_limit = (long) cinfo->output_height;
-	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-      }
-      /* Process some data */
-      last_scanline = cinfo->output_scanline;
-      (*cinfo->main->process_data) (cinfo, (JSAMPARRAY) NULL,
-				    &cinfo->output_scanline, (JDIMENSION) 0);
-      if (cinfo->output_scanline == last_scanline)
-	return FALSE;		/* No progress made, must suspend */
-    }
-    /* Finish up dummy pass, and set up for another one */
-    (*cinfo->master->finish_output_pass) (cinfo);
-    (*cinfo->master->prepare_for_output_pass) (cinfo);
-    cinfo->output_scanline = 0;
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif /* QUANT_2PASS_SUPPORTED */
-  }
-  /* Ready for application to drive output pass through
-   * jpeg_read_scanlines or jpeg_read_raw_data.
-   */
-  cinfo->global_state = cinfo->raw_data_out ? DSTATE_RAW_OK : DSTATE_SCANNING;
-  return TRUE;
-}
-
-
-/*
- * Read some scanlines of data from the JPEG decompressor.
- *
- * The return value will be the number of lines actually read.
- * This may be less than the number requested in several cases,
- * including bottom of image, data source suspension, and operating
- * modes that emit multiple scanlines at a time.
- *
- * Note: we warn about excess calls to jpeg_read_scanlines() since
- * this likely signals an application programmer error.  However,
- * an oversize buffer (max_lines > scanlines remaining) is not an error.
- */
-
-GLOBAL(JDIMENSION)
-jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines,
-		     JDIMENSION max_lines)
-{
-  JDIMENSION row_ctr;
-
-  if (cinfo->global_state != DSTATE_SCANNING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->output_scanline >= cinfo->output_height) {
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-    return 0;
-  }
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->output_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->output_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Process some data */
-  row_ctr = 0;
-  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, max_lines);
-  cinfo->output_scanline += row_ctr;
-  return row_ctr;
-}
-
-
-/*
- * Alternate entry point to read raw data.
- * Processes exactly one iMCU row per call, unless suspended.
- */
-
-GLOBAL(JDIMENSION)
-jpeg_read_raw_data (j_decompress_ptr cinfo, JSAMPIMAGE data,
-		    JDIMENSION max_lines)
-{
-  JDIMENSION lines_per_iMCU_row;
-
-  if (cinfo->global_state != DSTATE_RAW_OK)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->output_scanline >= cinfo->output_height) {
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-    return 0;
-  }
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->output_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->output_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Verify that at least one iMCU row can be returned. */
-  lines_per_iMCU_row = cinfo->max_v_samp_factor * cinfo->min_DCT_scaled_size;
-  if (max_lines < lines_per_iMCU_row)
-    ERREXIT(cinfo, JERR_BUFFER_SIZE);
-
-  /* Decompress directly into user's buffer. */
-  if (! (*cinfo->coef->decompress_data) (cinfo, data))
-    return 0;			/* suspension forced, can do nothing more */
-
-  /* OK, we processed one iMCU row. */
-  cinfo->output_scanline += lines_per_iMCU_row;
-  return lines_per_iMCU_row;
-}
-
-
-/* Additional entry points for buffered-image mode. */
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-
-/*
- * Initialize for an output pass in buffered-image mode.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_start_output (j_decompress_ptr cinfo, int scan_number)
-{
-  if (cinfo->global_state != DSTATE_BUFIMAGE &&
-      cinfo->global_state != DSTATE_PRESCAN)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  /* Limit scan number to valid range */
-  if (scan_number <= 0)
-    scan_number = 1;
-  if (cinfo->inputctl->eoi_reached &&
-      scan_number > cinfo->input_scan_number)
-    scan_number = cinfo->input_scan_number;
-  cinfo->output_scan_number = scan_number;
-  /* Perform any dummy output passes, and set up for the real pass */
-  return output_pass_setup(cinfo);
-}
-
-
-/*
- * Finish up after an output pass in buffered-image mode.
- *
- * Returns FALSE if suspended.  The return value need be inspected only if
- * a suspending data source is used.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_finish_output (j_decompress_ptr cinfo)
-{
-  if ((cinfo->global_state == DSTATE_SCANNING ||
-       cinfo->global_state == DSTATE_RAW_OK) && cinfo->buffered_image) {
-    /* Terminate this pass. */
-    /* We do not require the whole pass to have been completed. */
-    (*cinfo->master->finish_output_pass) (cinfo);
-    cinfo->global_state = DSTATE_BUFPOST;
-  } else if (cinfo->global_state != DSTATE_BUFPOST) {
-    /* BUFPOST = repeat call after a suspension, anything else is error */
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  }
-  /* Read markers looking for SOS or EOI */
-  while (cinfo->input_scan_number <= cinfo->output_scan_number &&
-	 ! cinfo->inputctl->eoi_reached) {
-    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)
-      return FALSE;		/* Suspend, come back later */
-  }
-  cinfo->global_state = DSTATE_BUFIMAGE;
-  return TRUE;
-}
-
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
+/*
+ * jdapistd.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains application interface code for the decompression half
+ * of the JPEG library.  These are the "standard" API routines that are
+ * used in the normal full-decompression case.  They are not used by a
+ * transcoding-only application.  Note that if an application links in
+ * jpeg_start_decompress, it will end up linking in the entire decompressor.
+ * We thus must separate this file from jdapimin.c to avoid linking the
+ * whole decompression library into a transcoder.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Forward declarations */
+LOCAL(wxjpeg_boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
+
+
+/*
+ * Decompression initialization.
+ * jpeg_read_header must be completed before calling this.
+ *
+ * If a multipass operating mode was selected, this will do all but the
+ * last pass, and thus may take a great deal of time.
+ *
+ * Returns FALSE if suspended.  The return value need be inspected only if
+ * a suspending data source is used.
+ */
+
+GLOBAL(wxjpeg_boolean)
+jpeg_start_decompress (j_decompress_ptr cinfo)
+{
+  if (cinfo->global_state == DSTATE_READY) {
+    /* First call: initialize master control, select active modules */
+    jinit_master_decompress(cinfo);
+    if (cinfo->buffered_image) {
+      /* No more work here; expecting jpeg_start_output next */
+      cinfo->global_state = DSTATE_BUFIMAGE;
+      return TRUE;
+    }
+    cinfo->global_state = DSTATE_PRELOAD;
+  }
+  if (cinfo->global_state == DSTATE_PRELOAD) {
+    /* If file has multiple scans, absorb them all into the coef buffer */
+    if (cinfo->inputctl->has_multiple_scans) {
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+      for (;;) {
+	int retcode;
+	/* Call progress monitor hook if present */
+	if (cinfo->progress != NULL)
+	  (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+	/* Absorb some more input */
+	retcode = (*cinfo->inputctl->consume_input) (cinfo);
+	if (retcode == JPEG_SUSPENDED)
+	  return FALSE;
+	if (retcode == JPEG_REACHED_EOI)
+	  break;
+	/* Advance progress counter if appropriate */
+	if (cinfo->progress != NULL &&
+	    (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
+	  if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
+	    /* jdmaster underestimated number of scans; ratchet up one scan */
+	    cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
+	  }
+	}
+      }
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
+    }
+    cinfo->output_scan_number = cinfo->input_scan_number;
+  } else if (cinfo->global_state != DSTATE_PRESCAN)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  /* Perform any dummy output passes, and set up for the final pass */
+  return output_pass_setup(cinfo);
+}
+
+
+/*
+ * Set up for an output pass, and perform any dummy pass(es) needed.
+ * Common subroutine for jpeg_start_decompress and jpeg_start_output.
+ * Entry: global_state = DSTATE_PRESCAN only if previously suspended.
+ * Exit: If done, returns TRUE and sets global_state for proper output mode.
+ *       If suspended, returns FALSE and sets global_state = DSTATE_PRESCAN.
+ */
+
+LOCAL(wxjpeg_boolean)
+output_pass_setup (j_decompress_ptr cinfo)
+{
+  if (cinfo->global_state != DSTATE_PRESCAN) {
+    /* First call: do pass setup */
+    (*cinfo->master->prepare_for_output_pass) (cinfo);
+    cinfo->output_scanline = 0;
+    cinfo->global_state = DSTATE_PRESCAN;
+  }
+  /* Loop over any required dummy passes */
+  while (cinfo->master->is_dummy_pass) {
+#ifdef QUANT_2PASS_SUPPORTED
+    /* Crank through the dummy pass */
+    while (cinfo->output_scanline < cinfo->output_height) {
+      JDIMENSION last_scanline;
+      /* Call progress monitor hook if present */
+      if (cinfo->progress != NULL) {
+	cinfo->progress->pass_counter = (long) cinfo->output_scanline;
+	cinfo->progress->pass_limit = (long) cinfo->output_height;
+	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+      }
+      /* Process some data */
+      last_scanline = cinfo->output_scanline;
+      (*cinfo->main->process_data) (cinfo, (JSAMPARRAY) NULL,
+				    &cinfo->output_scanline, (JDIMENSION) 0);
+      if (cinfo->output_scanline == last_scanline)
+	return FALSE;		/* No progress made, must suspend */
+    }
+    /* Finish up dummy pass, and set up for another one */
+    (*cinfo->master->finish_output_pass) (cinfo);
+    (*cinfo->master->prepare_for_output_pass) (cinfo);
+    cinfo->output_scanline = 0;
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif /* QUANT_2PASS_SUPPORTED */
+  }
+  /* Ready for application to drive output pass through
+   * jpeg_read_scanlines or jpeg_read_raw_data.
+   */
+  cinfo->global_state = cinfo->raw_data_out ? DSTATE_RAW_OK : DSTATE_SCANNING;
+  return TRUE;
+}
+
+
+/*
+ * Read some scanlines of data from the JPEG decompressor.
+ *
+ * The return value will be the number of lines actually read.
+ * This may be less than the number requested in several cases,
+ * including bottom of image, data source suspension, and operating
+ * modes that emit multiple scanlines at a time.
+ *
+ * Note: we warn about excess calls to jpeg_read_scanlines() since
+ * this likely signals an application programmer error.  However,
+ * an oversize buffer (max_lines > scanlines remaining) is not an error.
+ */
+
+GLOBAL(JDIMENSION)
+jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines,
+		     JDIMENSION max_lines)
+{
+  JDIMENSION row_ctr;
+
+  if (cinfo->global_state != DSTATE_SCANNING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->output_scanline >= cinfo->output_height) {
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+    return 0;
+  }
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->output_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->output_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Process some data */
+  row_ctr = 0;
+  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, max_lines);
+  cinfo->output_scanline += row_ctr;
+  return row_ctr;
+}
+
+
+/*
+ * Alternate entry point to read raw data.
+ * Processes exactly one iMCU row per call, unless suspended.
+ */
+
+GLOBAL(JDIMENSION)
+jpeg_read_raw_data (j_decompress_ptr cinfo, JSAMPIMAGE data,
+		    JDIMENSION max_lines)
+{
+  JDIMENSION lines_per_iMCU_row;
+
+  if (cinfo->global_state != DSTATE_RAW_OK)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->output_scanline >= cinfo->output_height) {
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+    return 0;
+  }
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->output_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->output_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Verify that at least one iMCU row can be returned. */
+  lines_per_iMCU_row = cinfo->max_v_samp_factor * cinfo->min_DCT_scaled_size;
+  if (max_lines < lines_per_iMCU_row)
+    ERREXIT(cinfo, JERR_BUFFER_SIZE);
+
+  /* Decompress directly into user's buffer. */
+  if (! (*cinfo->coef->decompress_data) (cinfo, data))
+    return 0;			/* suspension forced, can do nothing more */
+
+  /* OK, we processed one iMCU row. */
+  cinfo->output_scanline += lines_per_iMCU_row;
+  return lines_per_iMCU_row;
+}
+
+
+/* Additional entry points for buffered-image mode. */
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+
+/*
+ * Initialize for an output pass in buffered-image mode.
+ */
+
+GLOBAL(wxjpeg_boolean)
+jpeg_start_output (j_decompress_ptr cinfo, int scan_number)
+{
+  if (cinfo->global_state != DSTATE_BUFIMAGE &&
+      cinfo->global_state != DSTATE_PRESCAN)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  /* Limit scan number to valid range */
+  if (scan_number <= 0)
+    scan_number = 1;
+  if (cinfo->inputctl->eoi_reached &&
+      scan_number > cinfo->input_scan_number)
+    scan_number = cinfo->input_scan_number;
+  cinfo->output_scan_number = scan_number;
+  /* Perform any dummy output passes, and set up for the real pass */
+  return output_pass_setup(cinfo);
+}
+
+
+/*
+ * Finish up after an output pass in buffered-image mode.
+ *
+ * Returns FALSE if suspended.  The return value need be inspected only if
+ * a suspending data source is used.
+ */
+
+GLOBAL(wxjpeg_boolean)
+jpeg_finish_output (j_decompress_ptr cinfo)
+{
+  if ((cinfo->global_state == DSTATE_SCANNING ||
+       cinfo->global_state == DSTATE_RAW_OK) && cinfo->buffered_image) {
+    /* Terminate this pass. */
+    /* We do not require the whole pass to have been completed. */
+    (*cinfo->master->finish_output_pass) (cinfo);
+    cinfo->global_state = DSTATE_BUFPOST;
+  } else if (cinfo->global_state != DSTATE_BUFPOST) {
+    /* BUFPOST = repeat call after a suspension, anything else is error */
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  }
+  /* Read markers looking for SOS or EOI */
+  while (cinfo->input_scan_number <= cinfo->output_scan_number &&
+	 ! cinfo->inputctl->eoi_reached) {
+    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)
+      return FALSE;		/* Suspend, come back later */
+  }
+  cinfo->global_state = DSTATE_BUFIMAGE;
+  return TRUE;
+}
+
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jdatadst.c b/Source/3rd Party/wx/src/jpeg/jdatadst.c
index d37ca8edd..053431fa6 100644
--- a/Source/3rd Party/wx/src/jpeg/jdatadst.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdatadst.c	
@@ -1,151 +1,151 @@
-/*
- * jdatadst.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains compression data destination routines for the case of
- * emitting JPEG data to a file (or any stdio stream).  While these routines
- * are sufficient for most applications, some will want to use a different
- * destination manager.
- * IMPORTANT: we assume that fwrite() will correctly transcribe an array of
- * JOCTETs into 8-bit-wide elements on external storage.  If char is wider
- * than 8 bits on your machine, you may need to do some tweaking.
- */
-
-/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jerror.h"
-
-
-/* Expanded data destination object for stdio output */
-
-typedef struct {
-  struct jpeg_destination_mgr pub; /* public fields */
-
-  FILE * outfile;		/* target stream */
-  JOCTET * buffer;		/* start of buffer */
-} my_destination_mgr;
-
-typedef my_destination_mgr * my_dest_ptr;
-
-#define OUTPUT_BUF_SIZE  4096	/* choose an efficiently fwrite'able size */
-
-
-/*
- * Initialize destination --- called by jpeg_start_compress
- * before any data is actually written.
- */
-
-METHODDEF(void)
-init_destination (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
-  /* Allocate the output buffer --- it will be released when done with image */
-  dest->buffer = (JOCTET *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  OUTPUT_BUF_SIZE * SIZEOF(JOCTET));
-
-  dest->pub.next_output_byte = dest->buffer;
-  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
-}
-
-
-/*
- * Empty the output buffer --- called whenever buffer fills up.
- *
- * In typical applications, this should write the entire output buffer
- * (ignoring the current state of next_output_byte & free_in_buffer),
- * reset the pointer & count to the start of the buffer, and return TRUE
- * indicating that the buffer has been dumped.
- *
- * In applications that need to be able to suspend compression due to output
- * overrun, a FALSE return indicates that the buffer cannot be emptied now.
- * In this situation, the compressor will return to its caller (possibly with
- * an indication that it has not accepted all the supplied scanlines).  The
- * application should resume compression after it has made more room in the
- * output buffer.  Note that there are substantial restrictions on the use of
- * suspension --- see the documentation.
- *
- * When suspending, the compressor will back up to a convenient restart point
- * (typically the start of the current MCU). next_output_byte & free_in_buffer
- * indicate where the restart point will be if the current call returns FALSE.
- * Data beyond this point will be regenerated after resumption, so do not
- * write it out when emptying the buffer externally.
- */
-
-METHODDEF(wxjpeg_boolean)
-empty_output_buffer (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
-  if (JFWRITE(dest->outfile, dest->buffer, OUTPUT_BUF_SIZE) !=
-      (size_t) OUTPUT_BUF_SIZE)
-    ERREXIT(cinfo, JERR_FILE_WRITE);
-
-  dest->pub.next_output_byte = dest->buffer;
-  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
-
-  return TRUE;
-}
-
-
-/*
- * Terminate destination --- called by jpeg_finish_compress
- * after all data has been written.  Usually needs to flush buffer.
- *
- * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
- * application must deal with any cleanup that should happen even
- * for error exit.
- */
-
-METHODDEF(void)
-term_destination (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-  size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
-
-  /* Write any data remaining in the buffer */
-  if (datacount > 0) {
-    if (JFWRITE(dest->outfile, dest->buffer, datacount) != datacount)
-      ERREXIT(cinfo, JERR_FILE_WRITE);
-  }
-  fflush(dest->outfile);
-  /* Make sure we wrote the output file OK */
-  if (ferror(dest->outfile))
-    ERREXIT(cinfo, JERR_FILE_WRITE);
-}
-
-
-/*
- * Prepare for output to a stdio stream.
- * The caller must have already opened the stream, and is responsible
- * for closing it after finishing compression.
- */
-
-GLOBAL(void)
-jpeg_stdio_dest (j_compress_ptr cinfo, FILE * outfile)
-{
-  my_dest_ptr dest;
-
-  /* The destination object is made permanent so that multiple JPEG images
-   * can be written to the same file without re-executing jpeg_stdio_dest.
-   * This makes it dangerous to use this manager and a different destination
-   * manager serially with the same JPEG object, because their private object
-   * sizes may be different.  Caveat programmer.
-   */
-  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */
-    cinfo->dest = (struct jpeg_destination_mgr *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  SIZEOF(my_destination_mgr));
-  }
-
-  dest = (my_dest_ptr) cinfo->dest;
-  dest->pub.init_destination = init_destination;
-  dest->pub.empty_output_buffer = empty_output_buffer;
-  dest->pub.term_destination = term_destination;
-  dest->outfile = outfile;
-}
+/*
+ * jdatadst.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains compression data destination routines for the case of
+ * emitting JPEG data to a file (or any stdio stream).  While these routines
+ * are sufficient for most applications, some will want to use a different
+ * destination manager.
+ * IMPORTANT: we assume that fwrite() will correctly transcribe an array of
+ * JOCTETs into 8-bit-wide elements on external storage.  If char is wider
+ * than 8 bits on your machine, you may need to do some tweaking.
+ */
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jerror.h"
+
+
+/* Expanded data destination object for stdio output */
+
+typedef struct {
+  struct jpeg_destination_mgr pub; /* public fields */
+
+  FILE * outfile;		/* target stream */
+  JOCTET * buffer;		/* start of buffer */
+} my_destination_mgr;
+
+typedef my_destination_mgr * my_dest_ptr;
+
+#define OUTPUT_BUF_SIZE  4096	/* choose an efficiently fwrite'able size */
+
+
+/*
+ * Initialize destination --- called by jpeg_start_compress
+ * before any data is actually written.
+ */
+
+METHODDEF(void)
+init_destination (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+
+  /* Allocate the output buffer --- it will be released when done with image */
+  dest->buffer = (JOCTET *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  OUTPUT_BUF_SIZE * SIZEOF(JOCTET));
+
+  dest->pub.next_output_byte = dest->buffer;
+  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+}
+
+
+/*
+ * Empty the output buffer --- called whenever buffer fills up.
+ *
+ * In typical applications, this should write the entire output buffer
+ * (ignoring the current state of next_output_byte & free_in_buffer),
+ * reset the pointer & count to the start of the buffer, and return TRUE
+ * indicating that the buffer has been dumped.
+ *
+ * In applications that need to be able to suspend compression due to output
+ * overrun, a FALSE return indicates that the buffer cannot be emptied now.
+ * In this situation, the compressor will return to its caller (possibly with
+ * an indication that it has not accepted all the supplied scanlines).  The
+ * application should resume compression after it has made more room in the
+ * output buffer.  Note that there are substantial restrictions on the use of
+ * suspension --- see the documentation.
+ *
+ * When suspending, the compressor will back up to a convenient restart point
+ * (typically the start of the current MCU). next_output_byte & free_in_buffer
+ * indicate where the restart point will be if the current call returns FALSE.
+ * Data beyond this point will be regenerated after resumption, so do not
+ * write it out when emptying the buffer externally.
+ */
+
+METHODDEF(wxjpeg_boolean)
+empty_output_buffer (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+
+  if (JFWRITE(dest->outfile, dest->buffer, OUTPUT_BUF_SIZE) !=
+      (size_t) OUTPUT_BUF_SIZE)
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+
+  dest->pub.next_output_byte = dest->buffer;
+  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+
+  return TRUE;
+}
+
+
+/*
+ * Terminate destination --- called by jpeg_finish_compress
+ * after all data has been written.  Usually needs to flush buffer.
+ *
+ * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+ * application must deal with any cleanup that should happen even
+ * for error exit.
+ */
+
+METHODDEF(void)
+term_destination (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+  size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
+
+  /* Write any data remaining in the buffer */
+  if (datacount > 0) {
+    if (JFWRITE(dest->outfile, dest->buffer, datacount) != datacount)
+      ERREXIT(cinfo, JERR_FILE_WRITE);
+  }
+  fflush(dest->outfile);
+  /* Make sure we wrote the output file OK */
+  if (ferror(dest->outfile))
+    ERREXIT(cinfo, JERR_FILE_WRITE);
+}
+
+
+/*
+ * Prepare for output to a stdio stream.
+ * The caller must have already opened the stream, and is responsible
+ * for closing it after finishing compression.
+ */
+
+GLOBAL(void)
+jpeg_stdio_dest (j_compress_ptr cinfo, FILE * outfile)
+{
+  my_dest_ptr dest;
+
+  /* The destination object is made permanent so that multiple JPEG images
+   * can be written to the same file without re-executing jpeg_stdio_dest.
+   * This makes it dangerous to use this manager and a different destination
+   * manager serially with the same JPEG object, because their private object
+   * sizes may be different.  Caveat programmer.
+   */
+  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */
+    cinfo->dest = (struct jpeg_destination_mgr *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  SIZEOF(my_destination_mgr));
+  }
+
+  dest = (my_dest_ptr) cinfo->dest;
+  dest->pub.init_destination = init_destination;
+  dest->pub.empty_output_buffer = empty_output_buffer;
+  dest->pub.term_destination = term_destination;
+  dest->outfile = outfile;
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jdatasrc.c b/Source/3rd Party/wx/src/jpeg/jdatasrc.c
index 9ccf6421b..09a43300a 100644
--- a/Source/3rd Party/wx/src/jpeg/jdatasrc.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdatasrc.c	
@@ -1,212 +1,212 @@
-/*
- * jdatasrc.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains decompression data source routines for the case of
- * reading JPEG data from a file (or any stdio stream).  While these routines
- * are sufficient for most applications, some will want to use a different
- * source manager.
- * IMPORTANT: we assume that fread() will correctly transcribe an array of
- * JOCTETs from 8-bit-wide elements on external storage.  If char is wider
- * than 8 bits on your machine, you may need to do some tweaking.
- */
-
-/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jerror.h"
-
-
-/* Expanded data source object for stdio input */
-
-typedef struct {
-  struct jpeg_source_mgr pub;	/* public fields */
-
-  FILE * infile;		/* source stream */
-  JOCTET * buffer;		/* start of buffer */
-  wxjpeg_boolean start_of_file;	/* have we gotten any data yet? */
-} my_source_mgr;
-
-typedef my_source_mgr * my_src_ptr;
-
-#define INPUT_BUF_SIZE  4096	/* choose an efficiently fread'able size */
-
-
-/*
- * Initialize source --- called by jpeg_read_header
- * before any data is actually read.
- */
-
-METHODDEF(void)
-init_source (j_decompress_ptr cinfo)
-{
-  my_src_ptr src = (my_src_ptr) cinfo->src;
-
-  /* We reset the empty-input-file flag for each image,
-   * but we don't clear the input buffer.
-   * This is correct behavior for reading a series of images from one source.
-   */
-  src->start_of_file = TRUE;
-}
-
-
-/*
- * Fill the input buffer --- called whenever buffer is emptied.
- *
- * In typical applications, this should read fresh data into the buffer
- * (ignoring the current state of next_input_byte & bytes_in_buffer),
- * reset the pointer & count to the start of the buffer, and return TRUE
- * indicating that the buffer has been reloaded.  It is not necessary to
- * fill the buffer entirely, only to obtain at least one more byte.
- *
- * There is no such thing as an EOF return.  If the end of the file has been
- * reached, the routine has a choice of ERREXIT() or inserting fake data into
- * the buffer.  In most cases, generating a warning message and inserting a
- * fake EOI marker is the best course of action --- this will allow the
- * decompressor to output however much of the image is there.  However,
- * the resulting error message is misleading if the real problem is an empty
- * input file, so we handle that case specially.
- *
- * In applications that need to be able to suspend compression due to input
- * not being available yet, a FALSE return indicates that no more data can be
- * obtained right now, but more may be forthcoming later.  In this situation,
- * the decompressor will return to its caller (with an indication of the
- * number of scanlines it has read, if any).  The application should resume
- * decompression after it has loaded more data into the input buffer.  Note
- * that there are substantial restrictions on the use of suspension --- see
- * the documentation.
- *
- * When suspending, the decompressor will back up to a convenient restart point
- * (typically the start of the current MCU). next_input_byte & bytes_in_buffer
- * indicate where the restart point will be if the current call returns FALSE.
- * Data beyond this point must be rescanned after resumption, so move it to
- * the front of the buffer rather than discarding it.
- */
-
-METHODDEF(wxjpeg_boolean)
-fill_input_buffer (j_decompress_ptr cinfo)
-{
-  my_src_ptr src = (my_src_ptr) cinfo->src;
-  size_t nbytes;
-
-  nbytes = JFREAD(src->infile, src->buffer, INPUT_BUF_SIZE);
-
-  if (nbytes <= 0) {
-    if (src->start_of_file)	/* Treat empty input file as fatal error */
-      ERREXIT(cinfo, JERR_INPUT_EMPTY);
-    WARNMS(cinfo, JWRN_JPEG_EOF);
-    /* Insert a fake EOI marker */
-    src->buffer[0] = (JOCTET) 0xFF;
-    src->buffer[1] = (JOCTET) JPEG_EOI;
-    nbytes = 2;
-  }
-
-  src->pub.next_input_byte = src->buffer;
-  src->pub.bytes_in_buffer = nbytes;
-  src->start_of_file = FALSE;
-
-  return TRUE;
-}
-
-
-/*
- * Skip data --- used to skip over a potentially large amount of
- * uninteresting data (such as an APPn marker).
- *
- * Writers of suspendable-input applications must note that skip_input_data
- * is not granted the right to give a suspension return.  If the skip extends
- * beyond the data currently in the buffer, the buffer can be marked empty so
- * that the next read will cause a fill_input_buffer call that can suspend.
- * Arranging for additional bytes to be discarded before reloading the input
- * buffer is the application writer's problem.
- */
-
-METHODDEF(void)
-skip_input_data (j_decompress_ptr cinfo, long num_bytes)
-{
-  my_src_ptr src = (my_src_ptr) cinfo->src;
-
-  /* Just a dumb implementation for now.  Could use fseek() except
-   * it doesn't work on pipes.  Not clear that being smart is worth
-   * any trouble anyway --- large skips are infrequent.
-   */
-  if (num_bytes > 0) {
-    while (num_bytes > (long) src->pub.bytes_in_buffer) {
-      num_bytes -= (long) src->pub.bytes_in_buffer;
-      (void) fill_input_buffer(cinfo);
-      /* note we assume that fill_input_buffer will never return FALSE,
-       * so suspension need not be handled.
-       */
-    }
-    src->pub.next_input_byte += (size_t) num_bytes;
-    src->pub.bytes_in_buffer -= (size_t) num_bytes;
-  }
-}
-
-
-/*
- * An additional method that can be provided by data source modules is the
- * resync_to_restart method for error recovery in the presence of RST markers.
- * For the moment, this source module just uses the default resync method
- * provided by the JPEG library.  That method assumes that no backtracking
- * is possible.
- */
-
-
-/*
- * Terminate source --- called by jpeg_finish_decompress
- * after all data has been read.  Often a no-op.
- *
- * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
- * application must deal with any cleanup that should happen even
- * for error exit.
- */
-
-METHODDEF(void)
-term_source (j_decompress_ptr cinfo)
-{
-  /* no work necessary here */
-}
-
-
-/*
- * Prepare for input from a stdio stream.
- * The caller must have already opened the stream, and is responsible
- * for closing it after finishing decompression.
- */
-
-GLOBAL(void)
-jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile)
-{
-  my_src_ptr src;
-
-  /* The source object and input buffer are made permanent so that a series
-   * of JPEG images can be read from the same file by calling jpeg_stdio_src
-   * only before the first one.  (If we discarded the buffer at the end of
-   * one image, we'd likely lose the start of the next one.)
-   * This makes it unsafe to use this manager and a different source
-   * manager serially with the same JPEG object.  Caveat programmer.
-   */
-  if (cinfo->src == NULL) {	/* first time for this JPEG object? */
-    cinfo->src = (struct jpeg_source_mgr *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  SIZEOF(my_source_mgr));
-    src = (my_src_ptr) cinfo->src;
-    src->buffer = (JOCTET *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  INPUT_BUF_SIZE * SIZEOF(JOCTET));
-  }
-
-  src = (my_src_ptr) cinfo->src;
-  src->pub.init_source = init_source;
-  src->pub.fill_input_buffer = fill_input_buffer;
-  src->pub.skip_input_data = skip_input_data;
-  src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
-  src->pub.term_source = term_source;
-  src->infile = infile;
-  src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
-  src->pub.next_input_byte = NULL; /* until buffer loaded */
-}
+/*
+ * jdatasrc.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains decompression data source routines for the case of
+ * reading JPEG data from a file (or any stdio stream).  While these routines
+ * are sufficient for most applications, some will want to use a different
+ * source manager.
+ * IMPORTANT: we assume that fread() will correctly transcribe an array of
+ * JOCTETs from 8-bit-wide elements on external storage.  If char is wider
+ * than 8 bits on your machine, you may need to do some tweaking.
+ */
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jerror.h"
+
+
+/* Expanded data source object for stdio input */
+
+typedef struct {
+  struct jpeg_source_mgr pub;	/* public fields */
+
+  FILE * infile;		/* source stream */
+  JOCTET * buffer;		/* start of buffer */
+  wxjpeg_boolean start_of_file;	/* have we gotten any data yet? */
+} my_source_mgr;
+
+typedef my_source_mgr * my_src_ptr;
+
+#define INPUT_BUF_SIZE  4096	/* choose an efficiently fread'able size */
+
+
+/*
+ * Initialize source --- called by jpeg_read_header
+ * before any data is actually read.
+ */
+
+METHODDEF(void)
+init_source (j_decompress_ptr cinfo)
+{
+  my_src_ptr src = (my_src_ptr) cinfo->src;
+
+  /* We reset the empty-input-file flag for each image,
+   * but we don't clear the input buffer.
+   * This is correct behavior for reading a series of images from one source.
+   */
+  src->start_of_file = TRUE;
+}
+
+
+/*
+ * Fill the input buffer --- called whenever buffer is emptied.
+ *
+ * In typical applications, this should read fresh data into the buffer
+ * (ignoring the current state of next_input_byte & bytes_in_buffer),
+ * reset the pointer & count to the start of the buffer, and return TRUE
+ * indicating that the buffer has been reloaded.  It is not necessary to
+ * fill the buffer entirely, only to obtain at least one more byte.
+ *
+ * There is no such thing as an EOF return.  If the end of the file has been
+ * reached, the routine has a choice of ERREXIT() or inserting fake data into
+ * the buffer.  In most cases, generating a warning message and inserting a
+ * fake EOI marker is the best course of action --- this will allow the
+ * decompressor to output however much of the image is there.  However,
+ * the resulting error message is misleading if the real problem is an empty
+ * input file, so we handle that case specially.
+ *
+ * In applications that need to be able to suspend compression due to input
+ * not being available yet, a FALSE return indicates that no more data can be
+ * obtained right now, but more may be forthcoming later.  In this situation,
+ * the decompressor will return to its caller (with an indication of the
+ * number of scanlines it has read, if any).  The application should resume
+ * decompression after it has loaded more data into the input buffer.  Note
+ * that there are substantial restrictions on the use of suspension --- see
+ * the documentation.
+ *
+ * When suspending, the decompressor will back up to a convenient restart point
+ * (typically the start of the current MCU). next_input_byte & bytes_in_buffer
+ * indicate where the restart point will be if the current call returns FALSE.
+ * Data beyond this point must be rescanned after resumption, so move it to
+ * the front of the buffer rather than discarding it.
+ */
+
+METHODDEF(wxjpeg_boolean)
+fill_input_buffer (j_decompress_ptr cinfo)
+{
+  my_src_ptr src = (my_src_ptr) cinfo->src;
+  size_t nbytes;
+
+  nbytes = JFREAD(src->infile, src->buffer, INPUT_BUF_SIZE);
+
+  if (nbytes <= 0) {
+    if (src->start_of_file)	/* Treat empty input file as fatal error */
+      ERREXIT(cinfo, JERR_INPUT_EMPTY);
+    WARNMS(cinfo, JWRN_JPEG_EOF);
+    /* Insert a fake EOI marker */
+    src->buffer[0] = (JOCTET) 0xFF;
+    src->buffer[1] = (JOCTET) JPEG_EOI;
+    nbytes = 2;
+  }
+
+  src->pub.next_input_byte = src->buffer;
+  src->pub.bytes_in_buffer = nbytes;
+  src->start_of_file = FALSE;
+
+  return TRUE;
+}
+
+
+/*
+ * Skip data --- used to skip over a potentially large amount of
+ * uninteresting data (such as an APPn marker).
+ *
+ * Writers of suspendable-input applications must note that skip_input_data
+ * is not granted the right to give a suspension return.  If the skip extends
+ * beyond the data currently in the buffer, the buffer can be marked empty so
+ * that the next read will cause a fill_input_buffer call that can suspend.
+ * Arranging for additional bytes to be discarded before reloading the input
+ * buffer is the application writer's problem.
+ */
+
+METHODDEF(void)
+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+  my_src_ptr src = (my_src_ptr) cinfo->src;
+
+  /* Just a dumb implementation for now.  Could use fseek() except
+   * it doesn't work on pipes.  Not clear that being smart is worth
+   * any trouble anyway --- large skips are infrequent.
+   */
+  if (num_bytes > 0) {
+    while (num_bytes > (long) src->pub.bytes_in_buffer) {
+      num_bytes -= (long) src->pub.bytes_in_buffer;
+      (void) fill_input_buffer(cinfo);
+      /* note we assume that fill_input_buffer will never return FALSE,
+       * so suspension need not be handled.
+       */
+    }
+    src->pub.next_input_byte += (size_t) num_bytes;
+    src->pub.bytes_in_buffer -= (size_t) num_bytes;
+  }
+}
+
+
+/*
+ * An additional method that can be provided by data source modules is the
+ * resync_to_restart method for error recovery in the presence of RST markers.
+ * For the moment, this source module just uses the default resync method
+ * provided by the JPEG library.  That method assumes that no backtracking
+ * is possible.
+ */
+
+
+/*
+ * Terminate source --- called by jpeg_finish_decompress
+ * after all data has been read.  Often a no-op.
+ *
+ * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+ * application must deal with any cleanup that should happen even
+ * for error exit.
+ */
+
+METHODDEF(void)
+term_source (j_decompress_ptr cinfo)
+{
+  /* no work necessary here */
+}
+
+
+/*
+ * Prepare for input from a stdio stream.
+ * The caller must have already opened the stream, and is responsible
+ * for closing it after finishing decompression.
+ */
+
+GLOBAL(void)
+jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile)
+{
+  my_src_ptr src;
+
+  /* The source object and input buffer are made permanent so that a series
+   * of JPEG images can be read from the same file by calling jpeg_stdio_src
+   * only before the first one.  (If we discarded the buffer at the end of
+   * one image, we'd likely lose the start of the next one.)
+   * This makes it unsafe to use this manager and a different source
+   * manager serially with the same JPEG object.  Caveat programmer.
+   */
+  if (cinfo->src == NULL) {	/* first time for this JPEG object? */
+    cinfo->src = (struct jpeg_source_mgr *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  SIZEOF(my_source_mgr));
+    src = (my_src_ptr) cinfo->src;
+    src->buffer = (JOCTET *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  INPUT_BUF_SIZE * SIZEOF(JOCTET));
+  }
+
+  src = (my_src_ptr) cinfo->src;
+  src->pub.init_source = init_source;
+  src->pub.fill_input_buffer = fill_input_buffer;
+  src->pub.skip_input_data = skip_input_data;
+  src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+  src->pub.term_source = term_source;
+  src->infile = infile;
+  src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
+  src->pub.next_input_byte = NULL; /* until buffer loaded */
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jdcoefct.c b/Source/3rd Party/wx/src/jpeg/jdcoefct.c
index c69a30c81..e5c3636e4 100644
--- a/Source/3rd Party/wx/src/jpeg/jdcoefct.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdcoefct.c	
@@ -1,745 +1,745 @@
-/*
- * jdcoefct.c
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the coefficient buffer controller for decompression.
- * This controller is the top level of the JPEG decompressor proper.
- * The coefficient buffer lies between entropy decoding and inverse-DCT steps.
- *
- * In buffered-image mode, this controller is the interface between
- * input-oriented processing and output-oriented processing.
- * Also, the input side (only) is used when reading a file for transcoding.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-/* Block smoothing is only applicable for progressive JPEG, so: */
-#ifndef D_PROGRESSIVE_SUPPORTED
-#undef BLOCK_SMOOTHING_SUPPORTED
-#endif
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_d_coef_controller pub; /* public fields */
-
-  /* These variables keep track of the current location of the input side. */
-  /* cinfo->input_iMCU_row is also used for this. */
-  JDIMENSION MCU_ctr;		/* counts MCUs processed in current row */
-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
-
-  /* The output side's location is represented by cinfo->output_iMCU_row. */
-
-  /* In single-pass modes, it's sufficient to buffer just one MCU.
-   * We allocate a workspace of D_MAX_BLOCKS_IN_MCU coefficient blocks,
-   * and let the entropy decoder write into that workspace each time.
-   * (On 80x86, the workspace is FAR even though it's not really very big;
-   * this is to keep the module interfaces unchanged when a large coefficient
-   * buffer is necessary.)
-   * In multi-pass modes, this array points to the current MCU's blocks
-   * within the virtual arrays; it is used only by the input side.
-   */
-  JBLOCKROW MCU_buffer[D_MAX_BLOCKS_IN_MCU];
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-  /* In multi-pass modes, we need a virtual block array for each component. */
-  jvirt_barray_ptr whole_image[MAX_COMPONENTS];
-#endif
-
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-  /* When doing block smoothing, we latch coefficient Al values here */
-  int * coef_bits_latch;
-#define SAVED_COEFS  6		/* we save coef_bits[0..5] */
-#endif
-} my_coef_controller;
-
-typedef my_coef_controller * my_coef_ptr;
-
-/* Forward declarations */
-METHODDEF(int) decompress_onepass
-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-METHODDEF(int) decompress_data
-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
-#endif
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-LOCAL(wxjpeg_boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
-METHODDEF(int) decompress_smooth_data
-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
-#endif
-
-
-LOCAL(void)
-start_iMCU_row (j_decompress_ptr cinfo)
-/* Reset within-iMCU-row counters for a new row (input side) */
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  /* In an interleaved scan, an MCU row is the same as an iMCU row.
-   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
-   * But at the bottom of the image, process only what's left.
-   */
-  if (cinfo->comps_in_scan > 1) {
-    coef->MCU_rows_per_iMCU_row = 1;
-  } else {
-    if (cinfo->input_iMCU_row < (cinfo->total_iMCU_rows-1))
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
-    else
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
-  }
-
-  coef->MCU_ctr = 0;
-  coef->MCU_vert_offset = 0;
-}
-
-
-/*
- * Initialize for an input processing pass.
- */
-
-METHODDEF(void)
-#if defined(__VISAGECPP__)
-start_input_pass2 (j_decompress_ptr cinfo)
-#else
-start_input_pass (j_decompress_ptr cinfo)
-#endif
-{
-  cinfo->input_iMCU_row = 0;
-  start_iMCU_row(cinfo);
-}
-
-/*
- * Initialize for an output processing pass.
- */
-
-METHODDEF(void)
-start_output_pass (j_decompress_ptr cinfo)
-{
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  /* If multipass, check to see whether to use block smoothing on this pass */
-  if (coef->pub.coef_arrays != NULL) {
-    if (cinfo->do_block_smoothing && smoothing_ok(cinfo))
-      coef->pub.decompress_data = decompress_smooth_data;
-    else
-      coef->pub.decompress_data = decompress_data;
-  }
-#endif
-  cinfo->output_iMCU_row = 0;
-}
-
-
-/*
- * Decompress and return some data in the single-pass case.
- * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
- * Input and output must run in lockstep since we have only a one-MCU buffer.
- * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
- *
- * NB: output_buf contains a plane for each component in image,
- * which we index according to the component's SOF position.
- */
-
-METHODDEF(int)
-decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  int blkn, ci, xindex, yindex, yoffset, useful_width;
-  JSAMPARRAY output_ptr;
-  JDIMENSION start_col, output_col;
-  jpeg_component_info *compptr;
-  inverse_DCT_method_ptr inverse_DCT;
-
-  /* Loop to process as much as one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->MCU_ctr; MCU_col_num <= last_MCU_col;
-	 MCU_col_num++) {
-      /* Try to fetch an MCU.  Entropy decoder expects buffer to be zeroed. */
-      jzero_far((void FAR *) coef->MCU_buffer[0],
-		(size_t) (cinfo->blocks_in_MCU * SIZEOF(JBLOCK)));
-      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->MCU_ctr = MCU_col_num;
-	return JPEG_SUSPENDED;
-      }
-      /* Determine where data should go in output_buf and do the IDCT thing.
-       * We skip dummy blocks at the right and bottom edges (but blkn gets
-       * incremented past them!).  Note the inner loop relies on having
-       * allocated the MCU_buffer[] blocks sequentially.
-       */
-      blkn = 0;			/* index of current DCT block within MCU */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	/* Don't bother to IDCT an uninteresting component. */
-	if (! compptr->component_needed) {
-	  blkn += compptr->MCU_blocks;
-	  continue;
-	}
-	inverse_DCT = cinfo->idct->inverse_DCT[compptr->component_index];
-	useful_width = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
-						    : compptr->last_col_width;
-	output_ptr = output_buf[compptr->component_index] +
-	  yoffset * compptr->DCT_scaled_size;
-	start_col = MCU_col_num * compptr->MCU_sample_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  if (cinfo->input_iMCU_row < last_iMCU_row ||
-	      yoffset+yindex < compptr->last_row_height) {
-	    output_col = start_col;
-	    for (xindex = 0; xindex < useful_width; xindex++) {
-	      (*inverse_DCT) (cinfo, compptr,
-			      (JCOEFPTR) coef->MCU_buffer[blkn+xindex],
-			      output_ptr, output_col);
-	      output_col += compptr->DCT_scaled_size;
-	    }
-	  }
-	  blkn += compptr->MCU_width;
-	  output_ptr += compptr->DCT_scaled_size;
-	}
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->MCU_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  cinfo->output_iMCU_row++;
-  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
-    start_iMCU_row(cinfo);
-    return JPEG_ROW_COMPLETED;
-  }
-  /* Completed the scan */
-  (*cinfo->inputctl->finish_input_pass) (cinfo);
-  return JPEG_SCAN_COMPLETED;
-}
-
-
-/*
- * Dummy consume-input routine for single-pass operation.
- */
-
-METHODDEF(int)
-dummy_consume_data (j_decompress_ptr cinfo)
-{
-  return JPEG_SUSPENDED;	/* Always indicate nothing was done */
-}
-
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-
-/*
- * Consume input data and store it in the full-image coefficient buffer.
- * We read as much as one fully interleaved MCU row ("iMCU" row) per call,
- * ie, v_samp_factor block rows for each component in the scan.
- * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
- */
-
-METHODDEF(int)
-consume_data (j_decompress_ptr cinfo)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  int blkn, ci, xindex, yindex, yoffset;
-  JDIMENSION start_col;
-  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
-  JBLOCKROW buffer_ptr;
-  jpeg_component_info *compptr;
-
-  /* Align the virtual buffers for the components used in this scan. */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    buffer[ci] = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
-       cinfo->input_iMCU_row * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, TRUE);
-    /* Note: entropy decoder expects buffer to be zeroed,
-     * but this is handled automatically by the memory manager
-     * because we requested a pre-zeroed array.
-     */
-  }
-
-  /* Loop to process one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->MCU_ctr; MCU_col_num < cinfo->MCUs_per_row;
-	 MCU_col_num++) {
-      /* Construct list of pointers to DCT blocks belonging to this MCU */
-      blkn = 0;			/* index of current DCT block within MCU */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	start_col = MCU_col_num * compptr->MCU_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
-	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
-	    coef->MCU_buffer[blkn++] = buffer_ptr++;
-	  }
-	}
-      }
-      /* Try to fetch the MCU. */
-      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->MCU_ctr = MCU_col_num;
-	return JPEG_SUSPENDED;
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->MCU_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
-    start_iMCU_row(cinfo);
-    return JPEG_ROW_COMPLETED;
-  }
-  /* Completed the scan */
-  (*cinfo->inputctl->finish_input_pass) (cinfo);
-  return JPEG_SCAN_COMPLETED;
-}
-
-
-/*
- * Decompress and return some data in the multi-pass case.
- * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
- * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
- *
- * NB: output_buf contains a plane for each component in image.
- */
-
-METHODDEF(int)
-decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  JDIMENSION block_num;
-  int ci, block_row, block_rows;
-  JBLOCKARRAY buffer;
-  JBLOCKROW buffer_ptr;
-  JSAMPARRAY output_ptr;
-  JDIMENSION output_col;
-  jpeg_component_info *compptr;
-  inverse_DCT_method_ptr inverse_DCT;
-
-  /* Force some input to be done if we are getting ahead of the input. */
-  while (cinfo->input_scan_number < cinfo->output_scan_number ||
-	 (cinfo->input_scan_number == cinfo->output_scan_number &&
-	  cinfo->input_iMCU_row <= cinfo->output_iMCU_row)) {
-    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
-      return JPEG_SUSPENDED;
-  }
-
-  /* OK, output from the virtual arrays. */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Don't bother to IDCT an uninteresting component. */
-    if (! compptr->component_needed)
-      continue;
-    /* Align the virtual buffer for this component. */
-    buffer = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[ci],
-       cinfo->output_iMCU_row * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, FALSE);
-    /* Count non-dummy DCT block rows in this iMCU row. */
-    if (cinfo->output_iMCU_row < last_iMCU_row)
-      block_rows = compptr->v_samp_factor;
-    else {
-      /* NB: can't use last_row_height here; it is input-side-dependent! */
-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-      if (block_rows == 0) block_rows = compptr->v_samp_factor;
-    }
-    inverse_DCT = cinfo->idct->inverse_DCT[ci];
-    output_ptr = output_buf[ci];
-    /* Loop over all DCT blocks to be processed. */
-    for (block_row = 0; block_row < block_rows; block_row++) {
-      buffer_ptr = buffer[block_row];
-      output_col = 0;
-      for (block_num = 0; block_num < compptr->width_in_blocks; block_num++) {
-	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) buffer_ptr,
-			output_ptr, output_col);
-	buffer_ptr++;
-	output_col += compptr->DCT_scaled_size;
-      }
-      output_ptr += compptr->DCT_scaled_size;
-    }
-  }
-
-  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
-    return JPEG_ROW_COMPLETED;
-  return JPEG_SCAN_COMPLETED;
-}
-
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
-
-
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-
-/*
- * This code applies interblock smoothing as described by section K.8
- * of the JPEG standard: the first 5 AC coefficients are estimated from
- * the DC values of a DCT block and its 8 neighboring blocks.
- * We apply smoothing only for progressive JPEG decoding, and only if
- * the coefficients it can estimate are not yet known to full precision.
- */
-
-/* Natural-order array positions of the first 5 zigzag-order coefficients */
-#define Q01_POS  1
-#define Q10_POS  8
-#define Q20_POS  16
-#define Q11_POS  9
-#define Q02_POS  2
-
-/*
- * Determine whether block smoothing is applicable and safe.
- * We also latch the current states of the coef_bits[] entries for the
- * AC coefficients; otherwise, if the input side of the decompressor
- * advances into a new scan, we might think the coefficients are known
- * more accurately than they really are.
- */
-
-LOCAL(wxjpeg_boolean)
-smoothing_ok (j_decompress_ptr cinfo)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  wxjpeg_boolean smoothing_useful = FALSE;
-  int ci, coefi;
-  jpeg_component_info *compptr;
-  JQUANT_TBL * qtable;
-  int * coef_bits;
-  int * coef_bits_latch;
-
-  if (! cinfo->progressive_mode || cinfo->coef_bits == NULL)
-    return FALSE;
-
-  /* Allocate latch area if not already done */
-  if (coef->coef_bits_latch == NULL)
-    coef->coef_bits_latch = (int *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  cinfo->num_components *
-				  (SAVED_COEFS * SIZEOF(int)));
-  coef_bits_latch = coef->coef_bits_latch;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* All components' quantization values must already be latched. */
-    if ((qtable = compptr->quant_table) == NULL)
-      return FALSE;
-    /* Verify DC & first 5 AC quantizers are nonzero to avoid zero-divide. */
-    if (qtable->quantval[0] == 0 ||
-	qtable->quantval[Q01_POS] == 0 ||
-	qtable->quantval[Q10_POS] == 0 ||
-	qtable->quantval[Q20_POS] == 0 ||
-	qtable->quantval[Q11_POS] == 0 ||
-	qtable->quantval[Q02_POS] == 0)
-      return FALSE;
-    /* DC values must be at least partly known for all components. */
-    coef_bits = cinfo->coef_bits[ci];
-    if (coef_bits[0] < 0)
-      return FALSE;
-    /* Block smoothing is helpful if some AC coefficients remain inaccurate. */
-    for (coefi = 1; coefi <= 5; coefi++) {
-      coef_bits_latch[coefi] = coef_bits[coefi];
-      if (coef_bits[coefi] != 0)
-	smoothing_useful = TRUE;
-    }
-    coef_bits_latch += SAVED_COEFS;
-  }
-
-  return smoothing_useful;
-}
-
-
-/*
- * Variant of decompress_data for use when doing block smoothing.
- */
-
-METHODDEF(int)
-decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  JDIMENSION block_num, last_block_column;
-  int ci, block_row, block_rows, access_rows;
-  JBLOCKARRAY buffer;
-  JBLOCKROW buffer_ptr, prev_block_row, next_block_row;
-  JSAMPARRAY output_ptr;
-  JDIMENSION output_col;
-  jpeg_component_info *compptr;
-  inverse_DCT_method_ptr inverse_DCT;
-  wxjpeg_boolean first_row, last_row;
-  JBLOCK workspace;
-  int *coef_bits;
-  JQUANT_TBL *quanttbl;
-  JPEG_INT32 Q00,Q01,Q02,Q10,Q11,Q20, num;
-  int DC1,DC2,DC3,DC4,DC5,DC6,DC7,DC8,DC9;
-  int Al, pred;
-
-  /* Force some input to be done if we are getting ahead of the input. */
-  while (cinfo->input_scan_number <= cinfo->output_scan_number &&
-	 ! cinfo->inputctl->eoi_reached) {
-    if (cinfo->input_scan_number == cinfo->output_scan_number) {
-      /* If input is working on current scan, we ordinarily want it to
-       * have completed the current row.  But if input scan is DC,
-       * we want it to keep one row ahead so that next block row's DC
-       * values are up to date.
-       */
-      JDIMENSION delta = (cinfo->Ss == 0) ? 1 : 0;
-      if (cinfo->input_iMCU_row > cinfo->output_iMCU_row+delta)
-	break;
-    }
-    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
-      return JPEG_SUSPENDED;
-  }
-
-  /* OK, output from the virtual arrays. */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Don't bother to IDCT an uninteresting component. */
-    if (! compptr->component_needed)
-      continue;
-    /* Count non-dummy DCT block rows in this iMCU row. */
-    if (cinfo->output_iMCU_row < last_iMCU_row) {
-      block_rows = compptr->v_samp_factor;
-      access_rows = block_rows * 2; /* this and next iMCU row */
-      last_row = FALSE;
-    } else {
-      /* NB: can't use last_row_height here; it is input-side-dependent! */
-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-      if (block_rows == 0) block_rows = compptr->v_samp_factor;
-      access_rows = block_rows; /* this iMCU row only */
-      last_row = TRUE;
-    }
-    /* Align the virtual buffer for this component. */
-    if (cinfo->output_iMCU_row > 0) {
-      access_rows += compptr->v_samp_factor; /* prior iMCU row too */
-      buffer = (*cinfo->mem->access_virt_barray)
-	((j_common_ptr) cinfo, coef->whole_image[ci],
-	 (cinfo->output_iMCU_row - 1) * compptr->v_samp_factor,
-	 (JDIMENSION) access_rows, FALSE);
-      buffer += compptr->v_samp_factor;	/* point to current iMCU row */
-      first_row = FALSE;
-    } else {
-      buffer = (*cinfo->mem->access_virt_barray)
-	((j_common_ptr) cinfo, coef->whole_image[ci],
-	 (JDIMENSION) 0, (JDIMENSION) access_rows, FALSE);
-      first_row = TRUE;
-    }
-    /* Fetch component-dependent info */
-    coef_bits = coef->coef_bits_latch + (ci * SAVED_COEFS);
-    quanttbl = compptr->quant_table;
-    Q00 = quanttbl->quantval[0];
-    Q01 = quanttbl->quantval[Q01_POS];
-    Q10 = quanttbl->quantval[Q10_POS];
-    Q20 = quanttbl->quantval[Q20_POS];
-    Q11 = quanttbl->quantval[Q11_POS];
-    Q02 = quanttbl->quantval[Q02_POS];
-    inverse_DCT = cinfo->idct->inverse_DCT[ci];
-    output_ptr = output_buf[ci];
-    /* Loop over all DCT blocks to be processed. */
-    for (block_row = 0; block_row < block_rows; block_row++) {
-      buffer_ptr = buffer[block_row];
-      if (first_row && block_row == 0)
-	prev_block_row = buffer_ptr;
-      else
-	prev_block_row = buffer[block_row-1];
-      if (last_row && block_row == block_rows-1)
-	next_block_row = buffer_ptr;
-      else
-	next_block_row = buffer[block_row+1];
-      /* We fetch the surrounding DC values using a sliding-register approach.
-       * Initialize all nine here so as to do the right thing on narrow pics.
-       */
-      DC1 = DC2 = DC3 = (int) prev_block_row[0][0];
-      DC4 = DC5 = DC6 = (int) buffer_ptr[0][0];
-      DC7 = DC8 = DC9 = (int) next_block_row[0][0];
-      output_col = 0;
-      last_block_column = compptr->width_in_blocks - 1;
-      for (block_num = 0; block_num <= last_block_column; block_num++) {
-	/* Fetch current DCT block into workspace so we can modify it. */
-	jcopy_block_row(buffer_ptr, (JBLOCKROW) workspace, (JDIMENSION) 1);
-	/* Update DC values */
-	if (block_num < last_block_column) {
-	  DC3 = (int) prev_block_row[1][0];
-	  DC6 = (int) buffer_ptr[1][0];
-	  DC9 = (int) next_block_row[1][0];
-	}
-	/* Compute coefficient estimates per K.8.
-	 * An estimate is applied only if coefficient is still zero,
-	 * and is not known to be fully accurate.
-	 */
-	/* AC01 */
-	if ((Al=coef_bits[1]) != 0 && workspace[1] == 0) {
-	  num = 36 * Q00 * (DC4 - DC6);
-	  if (num >= 0) {
-	    pred = (int) (((Q01<<7) + num) / (Q01<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q01<<7) - num) / (Q01<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[1] = (JCOEF) pred;
-	}
-	/* AC10 */
-	if ((Al=coef_bits[2]) != 0 && workspace[8] == 0) {
-	  num = 36 * Q00 * (DC2 - DC8);
-	  if (num >= 0) {
-	    pred = (int) (((Q10<<7) + num) / (Q10<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q10<<7) - num) / (Q10<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[8] = (JCOEF) pred;
-	}
-	/* AC20 */
-	if ((Al=coef_bits[3]) != 0 && workspace[16] == 0) {
-	  num = 9 * Q00 * (DC2 + DC8 - 2*DC5);
-	  if (num >= 0) {
-	    pred = (int) (((Q20<<7) + num) / (Q20<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q20<<7) - num) / (Q20<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[16] = (JCOEF) pred;
-	}
-	/* AC11 */
-	if ((Al=coef_bits[4]) != 0 && workspace[9] == 0) {
-	  num = 5 * Q00 * (DC1 - DC3 - DC7 + DC9);
-	  if (num >= 0) {
-	    pred = (int) (((Q11<<7) + num) / (Q11<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q11<<7) - num) / (Q11<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[9] = (JCOEF) pred;
-	}
-	/* AC02 */
-	if ((Al=coef_bits[5]) != 0 && workspace[2] == 0) {
-	  num = 9 * Q00 * (DC4 + DC6 - 2*DC5);
-	  if (num >= 0) {
-	    pred = (int) (((Q02<<7) + num) / (Q02<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q02<<7) - num) / (Q02<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[2] = (JCOEF) pred;
-	}
-	/* OK, do the IDCT */
-	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) workspace,
-			output_ptr, output_col);
-	/* Advance for next column */
-	DC1 = DC2; DC2 = DC3;
-	DC4 = DC5; DC5 = DC6;
-	DC7 = DC8; DC8 = DC9;
-	buffer_ptr++, prev_block_row++, next_block_row++;
-	output_col += compptr->DCT_scaled_size;
-      }
-      output_ptr += compptr->DCT_scaled_size;
-    }
-  }
-
-  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
-    return JPEG_ROW_COMPLETED;
-  return JPEG_SCAN_COMPLETED;
-}
-
-#endif /* BLOCK_SMOOTHING_SUPPORTED */
-
-
-/*
- * Initialize coefficient buffer controller.
- */
-
-GLOBAL(void)
-jinit_d_coef_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_coef_ptr coef;
-
-  coef = (my_coef_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_coef_controller));
-  cinfo->coef = (struct jpeg_d_coef_controller *) coef;
-#if defined(__VISAGECPP__)
-  coef->pub.start_input_pass2 = start_input_pass2;
-#else
-  coef->pub.start_input_pass = start_input_pass;
-#endif
-
-  coef->pub.start_output_pass = start_output_pass;
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-  coef->coef_bits_latch = NULL;
-#endif
-
-  /* Create the coefficient buffer. */
-  if (need_full_buffer) {
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-    /* Allocate a full-image virtual array for each component, */
-    /* padded to a multiple of samp_factor DCT blocks in each direction. */
-    /* Note we ask for a pre-zeroed array. */
-    int ci, access_rows;
-    jpeg_component_info *compptr;
-
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      access_rows = compptr->v_samp_factor;
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-      /* If block smoothing could be used, need a bigger window */
-      if (cinfo->progressive_mode)
-	access_rows *= 3;
-#endif
-      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE, TRUE,
-	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,
-				(long) compptr->h_samp_factor),
-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-				(long) compptr->v_samp_factor),
-	 (JDIMENSION) access_rows);
-    }
-    coef->pub.consume_data = consume_data;
-    coef->pub.decompress_data = decompress_data;
-    coef->pub.coef_arrays = coef->whole_image; /* link to virtual arrays */
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    /* We only need a single-MCU buffer. */
-    JBLOCKROW buffer;
-    int i;
-
-    buffer = (JBLOCKROW)
-      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  D_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
-    for (i = 0; i < D_MAX_BLOCKS_IN_MCU; i++) {
-      coef->MCU_buffer[i] = buffer + i;
-    }
-    coef->pub.consume_data = dummy_consume_data;
-    coef->pub.decompress_data = decompress_onepass;
-    coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
-  }
-}
-
+/*
+ * jdcoefct.c
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the coefficient buffer controller for decompression.
+ * This controller is the top level of the JPEG decompressor proper.
+ * The coefficient buffer lies between entropy decoding and inverse-DCT steps.
+ *
+ * In buffered-image mode, this controller is the interface between
+ * input-oriented processing and output-oriented processing.
+ * Also, the input side (only) is used when reading a file for transcoding.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+/* Block smoothing is only applicable for progressive JPEG, so: */
+#ifndef D_PROGRESSIVE_SUPPORTED
+#undef BLOCK_SMOOTHING_SUPPORTED
+#endif
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_d_coef_controller pub; /* public fields */
+
+  /* These variables keep track of the current location of the input side. */
+  /* cinfo->input_iMCU_row is also used for this. */
+  JDIMENSION MCU_ctr;		/* counts MCUs processed in current row */
+  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
+  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
+
+  /* The output side's location is represented by cinfo->output_iMCU_row. */
+
+  /* In single-pass modes, it's sufficient to buffer just one MCU.
+   * We allocate a workspace of D_MAX_BLOCKS_IN_MCU coefficient blocks,
+   * and let the entropy decoder write into that workspace each time.
+   * (On 80x86, the workspace is FAR even though it's not really very big;
+   * this is to keep the module interfaces unchanged when a large coefficient
+   * buffer is necessary.)
+   * In multi-pass modes, this array points to the current MCU's blocks
+   * within the virtual arrays; it is used only by the input side.
+   */
+  JBLOCKROW MCU_buffer[D_MAX_BLOCKS_IN_MCU];
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+  /* In multi-pass modes, we need a virtual block array for each component. */
+  jvirt_barray_ptr whole_image[MAX_COMPONENTS];
+#endif
+
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+  /* When doing block smoothing, we latch coefficient Al values here */
+  int * coef_bits_latch;
+#define SAVED_COEFS  6		/* we save coef_bits[0..5] */
+#endif
+} my_coef_controller;
+
+typedef my_coef_controller * my_coef_ptr;
+
+/* Forward declarations */
+METHODDEF(int) decompress_onepass
+	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+METHODDEF(int) decompress_data
+	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+#endif
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+LOCAL(wxjpeg_boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
+METHODDEF(int) decompress_smooth_data
+	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+#endif
+
+
+LOCAL(void)
+start_iMCU_row (j_decompress_ptr cinfo)
+/* Reset within-iMCU-row counters for a new row (input side) */
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+
+  /* In an interleaved scan, an MCU row is the same as an iMCU row.
+   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
+   * But at the bottom of the image, process only what's left.
+   */
+  if (cinfo->comps_in_scan > 1) {
+    coef->MCU_rows_per_iMCU_row = 1;
+  } else {
+    if (cinfo->input_iMCU_row < (cinfo->total_iMCU_rows-1))
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
+    else
+      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
+  }
+
+  coef->MCU_ctr = 0;
+  coef->MCU_vert_offset = 0;
+}
+
+
+/*
+ * Initialize for an input processing pass.
+ */
+
+METHODDEF(void)
+#if defined(__VISAGECPP__)
+start_input_pass2 (j_decompress_ptr cinfo)
+#else
+start_input_pass (j_decompress_ptr cinfo)
+#endif
+{
+  cinfo->input_iMCU_row = 0;
+  start_iMCU_row(cinfo);
+}
+
+/*
+ * Initialize for an output processing pass.
+ */
+
+METHODDEF(void)
+start_output_pass (j_decompress_ptr cinfo)
+{
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+
+  /* If multipass, check to see whether to use block smoothing on this pass */
+  if (coef->pub.coef_arrays != NULL) {
+    if (cinfo->do_block_smoothing && smoothing_ok(cinfo))
+      coef->pub.decompress_data = decompress_smooth_data;
+    else
+      coef->pub.decompress_data = decompress_data;
+  }
+#endif
+  cinfo->output_iMCU_row = 0;
+}
+
+
+/*
+ * Decompress and return some data in the single-pass case.
+ * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
+ * Input and output must run in lockstep since we have only a one-MCU buffer.
+ * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
+ *
+ * NB: output_buf contains a plane for each component in image,
+ * which we index according to the component's SOF position.
+ */
+
+METHODDEF(int)
+decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  int blkn, ci, xindex, yindex, yoffset, useful_width;
+  JSAMPARRAY output_ptr;
+  JDIMENSION start_col, output_col;
+  jpeg_component_info *compptr;
+  inverse_DCT_method_ptr inverse_DCT;
+
+  /* Loop to process as much as one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->MCU_ctr; MCU_col_num <= last_MCU_col;
+	 MCU_col_num++) {
+      /* Try to fetch an MCU.  Entropy decoder expects buffer to be zeroed. */
+      jzero_far((void FAR *) coef->MCU_buffer[0],
+		(size_t) (cinfo->blocks_in_MCU * SIZEOF(JBLOCK)));
+      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->MCU_ctr = MCU_col_num;
+	return JPEG_SUSPENDED;
+      }
+      /* Determine where data should go in output_buf and do the IDCT thing.
+       * We skip dummy blocks at the right and bottom edges (but blkn gets
+       * incremented past them!).  Note the inner loop relies on having
+       * allocated the MCU_buffer[] blocks sequentially.
+       */
+      blkn = 0;			/* index of current DCT block within MCU */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	/* Don't bother to IDCT an uninteresting component. */
+	if (! compptr->component_needed) {
+	  blkn += compptr->MCU_blocks;
+	  continue;
+	}
+	inverse_DCT = cinfo->idct->inverse_DCT[compptr->component_index];
+	useful_width = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
+						    : compptr->last_col_width;
+	output_ptr = output_buf[compptr->component_index] +
+	  yoffset * compptr->DCT_scaled_size;
+	start_col = MCU_col_num * compptr->MCU_sample_width;
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  if (cinfo->input_iMCU_row < last_iMCU_row ||
+	      yoffset+yindex < compptr->last_row_height) {
+	    output_col = start_col;
+	    for (xindex = 0; xindex < useful_width; xindex++) {
+	      (*inverse_DCT) (cinfo, compptr,
+			      (JCOEFPTR) coef->MCU_buffer[blkn+xindex],
+			      output_ptr, output_col);
+	      output_col += compptr->DCT_scaled_size;
+	    }
+	  }
+	  blkn += compptr->MCU_width;
+	  output_ptr += compptr->DCT_scaled_size;
+	}
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->MCU_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  cinfo->output_iMCU_row++;
+  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
+    start_iMCU_row(cinfo);
+    return JPEG_ROW_COMPLETED;
+  }
+  /* Completed the scan */
+  (*cinfo->inputctl->finish_input_pass) (cinfo);
+  return JPEG_SCAN_COMPLETED;
+}
+
+
+/*
+ * Dummy consume-input routine for single-pass operation.
+ */
+
+METHODDEF(int)
+dummy_consume_data (j_decompress_ptr cinfo)
+{
+  return JPEG_SUSPENDED;	/* Always indicate nothing was done */
+}
+
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+
+/*
+ * Consume input data and store it in the full-image coefficient buffer.
+ * We read as much as one fully interleaved MCU row ("iMCU" row) per call,
+ * ie, v_samp_factor block rows for each component in the scan.
+ * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
+ */
+
+METHODDEF(int)
+consume_data (j_decompress_ptr cinfo)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  int blkn, ci, xindex, yindex, yoffset;
+  JDIMENSION start_col;
+  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
+  JBLOCKROW buffer_ptr;
+  jpeg_component_info *compptr;
+
+  /* Align the virtual buffers for the components used in this scan. */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    buffer[ci] = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
+       cinfo->input_iMCU_row * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, TRUE);
+    /* Note: entropy decoder expects buffer to be zeroed,
+     * but this is handled automatically by the memory manager
+     * because we requested a pre-zeroed array.
+     */
+  }
+
+  /* Loop to process one whole iMCU row */
+  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
+       yoffset++) {
+    for (MCU_col_num = coef->MCU_ctr; MCU_col_num < cinfo->MCUs_per_row;
+	 MCU_col_num++) {
+      /* Construct list of pointers to DCT blocks belonging to this MCU */
+      blkn = 0;			/* index of current DCT block within MCU */
+      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+	compptr = cinfo->cur_comp_info[ci];
+	start_col = MCU_col_num * compptr->MCU_width;
+	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
+	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
+	    coef->MCU_buffer[blkn++] = buffer_ptr++;
+	  }
+	}
+      }
+      /* Try to fetch the MCU. */
+      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
+	/* Suspension forced; update state counters and exit */
+	coef->MCU_vert_offset = yoffset;
+	coef->MCU_ctr = MCU_col_num;
+	return JPEG_SUSPENDED;
+      }
+    }
+    /* Completed an MCU row, but perhaps not an iMCU row */
+    coef->MCU_ctr = 0;
+  }
+  /* Completed the iMCU row, advance counters for next one */
+  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
+    start_iMCU_row(cinfo);
+    return JPEG_ROW_COMPLETED;
+  }
+  /* Completed the scan */
+  (*cinfo->inputctl->finish_input_pass) (cinfo);
+  return JPEG_SCAN_COMPLETED;
+}
+
+
+/*
+ * Decompress and return some data in the multi-pass case.
+ * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
+ * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
+ *
+ * NB: output_buf contains a plane for each component in image.
+ */
+
+METHODDEF(int)
+decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  JDIMENSION block_num;
+  int ci, block_row, block_rows;
+  JBLOCKARRAY buffer;
+  JBLOCKROW buffer_ptr;
+  JSAMPARRAY output_ptr;
+  JDIMENSION output_col;
+  jpeg_component_info *compptr;
+  inverse_DCT_method_ptr inverse_DCT;
+
+  /* Force some input to be done if we are getting ahead of the input. */
+  while (cinfo->input_scan_number < cinfo->output_scan_number ||
+	 (cinfo->input_scan_number == cinfo->output_scan_number &&
+	  cinfo->input_iMCU_row <= cinfo->output_iMCU_row)) {
+    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
+      return JPEG_SUSPENDED;
+  }
+
+  /* OK, output from the virtual arrays. */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Don't bother to IDCT an uninteresting component. */
+    if (! compptr->component_needed)
+      continue;
+    /* Align the virtual buffer for this component. */
+    buffer = (*cinfo->mem->access_virt_barray)
+      ((j_common_ptr) cinfo, coef->whole_image[ci],
+       cinfo->output_iMCU_row * compptr->v_samp_factor,
+       (JDIMENSION) compptr->v_samp_factor, FALSE);
+    /* Count non-dummy DCT block rows in this iMCU row. */
+    if (cinfo->output_iMCU_row < last_iMCU_row)
+      block_rows = compptr->v_samp_factor;
+    else {
+      /* NB: can't use last_row_height here; it is input-side-dependent! */
+      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
+      if (block_rows == 0) block_rows = compptr->v_samp_factor;
+    }
+    inverse_DCT = cinfo->idct->inverse_DCT[ci];
+    output_ptr = output_buf[ci];
+    /* Loop over all DCT blocks to be processed. */
+    for (block_row = 0; block_row < block_rows; block_row++) {
+      buffer_ptr = buffer[block_row];
+      output_col = 0;
+      for (block_num = 0; block_num < compptr->width_in_blocks; block_num++) {
+	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) buffer_ptr,
+			output_ptr, output_col);
+	buffer_ptr++;
+	output_col += compptr->DCT_scaled_size;
+      }
+      output_ptr += compptr->DCT_scaled_size;
+    }
+  }
+
+  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
+    return JPEG_ROW_COMPLETED;
+  return JPEG_SCAN_COMPLETED;
+}
+
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
+
+
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+
+/*
+ * This code applies interblock smoothing as described by section K.8
+ * of the JPEG standard: the first 5 AC coefficients are estimated from
+ * the DC values of a DCT block and its 8 neighboring blocks.
+ * We apply smoothing only for progressive JPEG decoding, and only if
+ * the coefficients it can estimate are not yet known to full precision.
+ */
+
+/* Natural-order array positions of the first 5 zigzag-order coefficients */
+#define Q01_POS  1
+#define Q10_POS  8
+#define Q20_POS  16
+#define Q11_POS  9
+#define Q02_POS  2
+
+/*
+ * Determine whether block smoothing is applicable and safe.
+ * We also latch the current states of the coef_bits[] entries for the
+ * AC coefficients; otherwise, if the input side of the decompressor
+ * advances into a new scan, we might think the coefficients are known
+ * more accurately than they really are.
+ */
+
+LOCAL(wxjpeg_boolean)
+smoothing_ok (j_decompress_ptr cinfo)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  wxjpeg_boolean smoothing_useful = FALSE;
+  int ci, coefi;
+  jpeg_component_info *compptr;
+  JQUANT_TBL * qtable;
+  int * coef_bits;
+  int * coef_bits_latch;
+
+  if (! cinfo->progressive_mode || cinfo->coef_bits == NULL)
+    return FALSE;
+
+  /* Allocate latch area if not already done */
+  if (coef->coef_bits_latch == NULL)
+    coef->coef_bits_latch = (int *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  cinfo->num_components *
+				  (SAVED_COEFS * SIZEOF(int)));
+  coef_bits_latch = coef->coef_bits_latch;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* All components' quantization values must already be latched. */
+    if ((qtable = compptr->quant_table) == NULL)
+      return FALSE;
+    /* Verify DC & first 5 AC quantizers are nonzero to avoid zero-divide. */
+    if (qtable->quantval[0] == 0 ||
+	qtable->quantval[Q01_POS] == 0 ||
+	qtable->quantval[Q10_POS] == 0 ||
+	qtable->quantval[Q20_POS] == 0 ||
+	qtable->quantval[Q11_POS] == 0 ||
+	qtable->quantval[Q02_POS] == 0)
+      return FALSE;
+    /* DC values must be at least partly known for all components. */
+    coef_bits = cinfo->coef_bits[ci];
+    if (coef_bits[0] < 0)
+      return FALSE;
+    /* Block smoothing is helpful if some AC coefficients remain inaccurate. */
+    for (coefi = 1; coefi <= 5; coefi++) {
+      coef_bits_latch[coefi] = coef_bits[coefi];
+      if (coef_bits[coefi] != 0)
+	smoothing_useful = TRUE;
+    }
+    coef_bits_latch += SAVED_COEFS;
+  }
+
+  return smoothing_useful;
+}
+
+
+/*
+ * Variant of decompress_data for use when doing block smoothing.
+ */
+
+METHODDEF(int)
+decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
+{
+  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
+  JDIMENSION block_num, last_block_column;
+  int ci, block_row, block_rows, access_rows;
+  JBLOCKARRAY buffer;
+  JBLOCKROW buffer_ptr, prev_block_row, next_block_row;
+  JSAMPARRAY output_ptr;
+  JDIMENSION output_col;
+  jpeg_component_info *compptr;
+  inverse_DCT_method_ptr inverse_DCT;
+  wxjpeg_boolean first_row, last_row;
+  JBLOCK workspace;
+  int *coef_bits;
+  JQUANT_TBL *quanttbl;
+  JPEG_INT32 Q00,Q01,Q02,Q10,Q11,Q20, num;
+  int DC1,DC2,DC3,DC4,DC5,DC6,DC7,DC8,DC9;
+  int Al, pred;
+
+  /* Force some input to be done if we are getting ahead of the input. */
+  while (cinfo->input_scan_number <= cinfo->output_scan_number &&
+	 ! cinfo->inputctl->eoi_reached) {
+    if (cinfo->input_scan_number == cinfo->output_scan_number) {
+      /* If input is working on current scan, we ordinarily want it to
+       * have completed the current row.  But if input scan is DC,
+       * we want it to keep one row ahead so that next block row's DC
+       * values are up to date.
+       */
+      JDIMENSION delta = (cinfo->Ss == 0) ? 1 : 0;
+      if (cinfo->input_iMCU_row > cinfo->output_iMCU_row+delta)
+	break;
+    }
+    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
+      return JPEG_SUSPENDED;
+  }
+
+  /* OK, output from the virtual arrays. */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Don't bother to IDCT an uninteresting component. */
+    if (! compptr->component_needed)
+      continue;
+    /* Count non-dummy DCT block rows in this iMCU row. */
+    if (cinfo->output_iMCU_row < last_iMCU_row) {
+      block_rows = compptr->v_samp_factor;
+      access_rows = block_rows * 2; /* this and next iMCU row */
+      last_row = FALSE;
+    } else {
+      /* NB: can't use last_row_height here; it is input-side-dependent! */
+      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
+      if (block_rows == 0) block_rows = compptr->v_samp_factor;
+      access_rows = block_rows; /* this iMCU row only */
+      last_row = TRUE;
+    }
+    /* Align the virtual buffer for this component. */
+    if (cinfo->output_iMCU_row > 0) {
+      access_rows += compptr->v_samp_factor; /* prior iMCU row too */
+      buffer = (*cinfo->mem->access_virt_barray)
+	((j_common_ptr) cinfo, coef->whole_image[ci],
+	 (cinfo->output_iMCU_row - 1) * compptr->v_samp_factor,
+	 (JDIMENSION) access_rows, FALSE);
+      buffer += compptr->v_samp_factor;	/* point to current iMCU row */
+      first_row = FALSE;
+    } else {
+      buffer = (*cinfo->mem->access_virt_barray)
+	((j_common_ptr) cinfo, coef->whole_image[ci],
+	 (JDIMENSION) 0, (JDIMENSION) access_rows, FALSE);
+      first_row = TRUE;
+    }
+    /* Fetch component-dependent info */
+    coef_bits = coef->coef_bits_latch + (ci * SAVED_COEFS);
+    quanttbl = compptr->quant_table;
+    Q00 = quanttbl->quantval[0];
+    Q01 = quanttbl->quantval[Q01_POS];
+    Q10 = quanttbl->quantval[Q10_POS];
+    Q20 = quanttbl->quantval[Q20_POS];
+    Q11 = quanttbl->quantval[Q11_POS];
+    Q02 = quanttbl->quantval[Q02_POS];
+    inverse_DCT = cinfo->idct->inverse_DCT[ci];
+    output_ptr = output_buf[ci];
+    /* Loop over all DCT blocks to be processed. */
+    for (block_row = 0; block_row < block_rows; block_row++) {
+      buffer_ptr = buffer[block_row];
+      if (first_row && block_row == 0)
+	prev_block_row = buffer_ptr;
+      else
+	prev_block_row = buffer[block_row-1];
+      if (last_row && block_row == block_rows-1)
+	next_block_row = buffer_ptr;
+      else
+	next_block_row = buffer[block_row+1];
+      /* We fetch the surrounding DC values using a sliding-register approach.
+       * Initialize all nine here so as to do the right thing on narrow pics.
+       */
+      DC1 = DC2 = DC3 = (int) prev_block_row[0][0];
+      DC4 = DC5 = DC6 = (int) buffer_ptr[0][0];
+      DC7 = DC8 = DC9 = (int) next_block_row[0][0];
+      output_col = 0;
+      last_block_column = compptr->width_in_blocks - 1;
+      for (block_num = 0; block_num <= last_block_column; block_num++) {
+	/* Fetch current DCT block into workspace so we can modify it. */
+	jcopy_block_row(buffer_ptr, (JBLOCKROW) workspace, (JDIMENSION) 1);
+	/* Update DC values */
+	if (block_num < last_block_column) {
+	  DC3 = (int) prev_block_row[1][0];
+	  DC6 = (int) buffer_ptr[1][0];
+	  DC9 = (int) next_block_row[1][0];
+	}
+	/* Compute coefficient estimates per K.8.
+	 * An estimate is applied only if coefficient is still zero,
+	 * and is not known to be fully accurate.
+	 */
+	/* AC01 */
+	if ((Al=coef_bits[1]) != 0 && workspace[1] == 0) {
+	  num = 36 * Q00 * (DC4 - DC6);
+	  if (num >= 0) {
+	    pred = (int) (((Q01<<7) + num) / (Q01<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q01<<7) - num) / (Q01<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[1] = (JCOEF) pred;
+	}
+	/* AC10 */
+	if ((Al=coef_bits[2]) != 0 && workspace[8] == 0) {
+	  num = 36 * Q00 * (DC2 - DC8);
+	  if (num >= 0) {
+	    pred = (int) (((Q10<<7) + num) / (Q10<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q10<<7) - num) / (Q10<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[8] = (JCOEF) pred;
+	}
+	/* AC20 */
+	if ((Al=coef_bits[3]) != 0 && workspace[16] == 0) {
+	  num = 9 * Q00 * (DC2 + DC8 - 2*DC5);
+	  if (num >= 0) {
+	    pred = (int) (((Q20<<7) + num) / (Q20<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q20<<7) - num) / (Q20<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[16] = (JCOEF) pred;
+	}
+	/* AC11 */
+	if ((Al=coef_bits[4]) != 0 && workspace[9] == 0) {
+	  num = 5 * Q00 * (DC1 - DC3 - DC7 + DC9);
+	  if (num >= 0) {
+	    pred = (int) (((Q11<<7) + num) / (Q11<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q11<<7) - num) / (Q11<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[9] = (JCOEF) pred;
+	}
+	/* AC02 */
+	if ((Al=coef_bits[5]) != 0 && workspace[2] == 0) {
+	  num = 9 * Q00 * (DC4 + DC6 - 2*DC5);
+	  if (num >= 0) {
+	    pred = (int) (((Q02<<7) + num) / (Q02<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	  } else {
+	    pred = (int) (((Q02<<7) - num) / (Q02<<8));
+	    if (Al > 0 && pred >= (1<<Al))
+	      pred = (1<<Al)-1;
+	    pred = -pred;
+	  }
+	  workspace[2] = (JCOEF) pred;
+	}
+	/* OK, do the IDCT */
+	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) workspace,
+			output_ptr, output_col);
+	/* Advance for next column */
+	DC1 = DC2; DC2 = DC3;
+	DC4 = DC5; DC5 = DC6;
+	DC7 = DC8; DC8 = DC9;
+	buffer_ptr++, prev_block_row++, next_block_row++;
+	output_col += compptr->DCT_scaled_size;
+      }
+      output_ptr += compptr->DCT_scaled_size;
+    }
+  }
+
+  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
+    return JPEG_ROW_COMPLETED;
+  return JPEG_SCAN_COMPLETED;
+}
+
+#endif /* BLOCK_SMOOTHING_SUPPORTED */
+
+
+/*
+ * Initialize coefficient buffer controller.
+ */
+
+GLOBAL(void)
+jinit_d_coef_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)
+{
+  my_coef_ptr coef;
+
+  coef = (my_coef_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_coef_controller));
+  cinfo->coef = (struct jpeg_d_coef_controller *) coef;
+#if defined(__VISAGECPP__)
+  coef->pub.start_input_pass2 = start_input_pass2;
+#else
+  coef->pub.start_input_pass = start_input_pass;
+#endif
+
+  coef->pub.start_output_pass = start_output_pass;
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+  coef->coef_bits_latch = NULL;
+#endif
+
+  /* Create the coefficient buffer. */
+  if (need_full_buffer) {
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+    /* Allocate a full-image virtual array for each component, */
+    /* padded to a multiple of samp_factor DCT blocks in each direction. */
+    /* Note we ask for a pre-zeroed array. */
+    int ci, access_rows;
+    jpeg_component_info *compptr;
+
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      access_rows = compptr->v_samp_factor;
+#ifdef BLOCK_SMOOTHING_SUPPORTED
+      /* If block smoothing could be used, need a bigger window */
+      if (cinfo->progressive_mode)
+	access_rows *= 3;
+#endif
+      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, TRUE,
+	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,
+				(long) compptr->h_samp_factor),
+	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
+				(long) compptr->v_samp_factor),
+	 (JDIMENSION) access_rows);
+    }
+    coef->pub.consume_data = consume_data;
+    coef->pub.decompress_data = decompress_data;
+    coef->pub.coef_arrays = coef->whole_image; /* link to virtual arrays */
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+  } else {
+    /* We only need a single-MCU buffer. */
+    JBLOCKROW buffer;
+    int i;
+
+    buffer = (JBLOCKROW)
+      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  D_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
+    for (i = 0; i < D_MAX_BLOCKS_IN_MCU; i++) {
+      coef->MCU_buffer[i] = buffer + i;
+    }
+    coef->pub.consume_data = dummy_consume_data;
+    coef->pub.decompress_data = decompress_onepass;
+    coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
+  }
+}
+
diff --git a/Source/3rd Party/wx/src/jpeg/jdcolor.c b/Source/3rd Party/wx/src/jpeg/jdcolor.c
index c33040ad5..cca284229 100644
--- a/Source/3rd Party/wx/src/jpeg/jdcolor.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdcolor.c	
@@ -1,410 +1,410 @@
-/*
- * jdcolor.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains output colorspace conversion routines.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-#if defined(__VISAGECPP__)
-/* Visual Age fixups for multiple declarations */
-#  define null_convert   null_convert2 /* already in jcmaint.c */
-#  define grayscale_convert   grayscale_convert2 /* already in jcmaint.c */
-#endif
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_color_deconverter pub; /* public fields */
-
-  /* Private state for YCC->RGB conversion */
-  int * Cr_r_tab;		/* => table for Cr to R conversion */
-  int * Cb_b_tab;		/* => table for Cb to B conversion */
-  JPEG_INT32 * Cr_g_tab;		/* => table for Cr to G conversion */
-  JPEG_INT32 * Cb_g_tab;		/* => table for Cb to G conversion */
-} my_color_deconverter;
-
-typedef my_color_deconverter * my_cconvert_ptr;
-
-
-/**************** YCbCr -> RGB conversion: most common case **************/
-
-/*
- * YCbCr is defined per CCIR 601-1, except that Cb and Cr are
- * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.
- * The conversion equations to be implemented are therefore
- *	R = Y                + 1.40200 * Cr
- *	G = Y - 0.34414 * Cb - 0.71414 * Cr
- *	B = Y + 1.77200 * Cb
- * where Cb and Cr represent the incoming values less CENTERJSAMPLE.
- * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.)
- *
- * To avoid floating-point arithmetic, we represent the fractional constants
- * as integers scaled up by 2^16 (about 4 digits precision); we have to divide
- * the products by 2^16, with appropriate rounding, to get the correct answer.
- * Notice that Y, being an integral input, does not contribute any fraction
- * so it need not participate in the rounding.
- *
- * For even more speed, we avoid doing any multiplications in the inner loop
- * by precalculating the constants times Cb and Cr for all possible values.
- * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);
- * for 12-bit samples it is still acceptable.  It's not very reasonable for
- * 16-bit samples, but if you want lossless storage you shouldn't be changing
- * colorspace anyway.
- * The Cr=>R and Cb=>B values can be rounded to integers in advance; the
- * values for the G calculation are left scaled up, since we must add them
- * together before rounding.
- */
-
-#define SCALEBITS	16	/* speediest right-shift on some machines */
-#define ONE_HALF	((JPEG_INT32) 1 << (SCALEBITS-1))
-#define FIX(x)		((JPEG_INT32) ((x) * (1L<<SCALEBITS) + 0.5))
-
-
-/*
- * Initialize tables for YCC->RGB colorspace conversion.
- */
-
-LOCAL(void)
-build_ycc_rgb_table (j_decompress_ptr cinfo)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  int i;
-  JPEG_INT32 x;
-  SHIFT_TEMPS
-
-  cconvert->Cr_r_tab = (int *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(int));
-  cconvert->Cb_b_tab = (int *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(int));
-  cconvert->Cr_g_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
-  cconvert->Cb_g_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
-
-  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
-    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */
-    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */
-    /* Cr=>R value is nearest int to 1.40200 * x */
-    cconvert->Cr_r_tab[i] = (int)
-		    RIGHT_SHIFT(FIX(1.40200) * x + ONE_HALF, SCALEBITS);
-    /* Cb=>B value is nearest int to 1.77200 * x */
-    cconvert->Cb_b_tab[i] = (int)
-		    RIGHT_SHIFT(FIX(1.77200) * x + ONE_HALF, SCALEBITS);
-    /* Cr=>G value is scaled-up -0.71414 * x */
-    cconvert->Cr_g_tab[i] = (- FIX(0.71414)) * x;
-    /* Cb=>G value is scaled-up -0.34414 * x */
-    /* We also add in ONE_HALF so that need not do it in inner loop */
-    cconvert->Cb_g_tab[i] = (- FIX(0.34414)) * x + ONE_HALF;
-  }
-}
-
-
-/*
- * Convert some rows of samples to the output colorspace.
- *
- * Note that we change from noninterleaved, one-plane-per-component format
- * to interleaved-pixel format.  The output buffer is therefore three times
- * as wide as the input buffer.
- * A starting row offset is provided only for the input buffer.  The caller
- * can easily adjust the passed output_buf value to accommodate any row
- * offset required on that side.
- */
-
-METHODDEF(void)
-ycc_rgb_convert (j_decompress_ptr cinfo,
-		 JSAMPIMAGE input_buf, JDIMENSION input_row,
-		 JSAMPARRAY output_buf, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int y, cb, cr;
-  register JSAMPROW outptr;
-  register JSAMPROW inptr0, inptr1, inptr2;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->output_width;
-  /* copy these pointers into registers if possible */
-  register JSAMPLE * range_limit = cinfo->sample_range_limit;
-  register int * Crrtab = cconvert->Cr_r_tab;
-  register int * Cbbtab = cconvert->Cb_b_tab;
-  register JPEG_INT32 * Crgtab = cconvert->Cr_g_tab;
-  register JPEG_INT32 * Cbgtab = cconvert->Cb_g_tab;
-  SHIFT_TEMPS
-
-  while (--num_rows >= 0) {
-    inptr0 = input_buf[0][input_row];
-    inptr1 = input_buf[1][input_row];
-    inptr2 = input_buf[2][input_row];
-    input_row++;
-    outptr = *output_buf++;
-    for (col = 0; col < num_cols; col++) {
-      y  = GETJSAMPLE(inptr0[col]);
-      cb = GETJSAMPLE(inptr1[col]);
-      cr = GETJSAMPLE(inptr2[col]);
-      /* Range-limiting is essential due to noise introduced by DCT losses. */
-      outptr[RGB_RED] =   range_limit[y + Crrtab[cr]];
-      outptr[RGB_GREEN] = range_limit[y +
-			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],
-						 SCALEBITS))];
-      outptr[RGB_BLUE] =  range_limit[y + Cbbtab[cb]];
-      outptr += RGB_PIXELSIZE;
-    }
-  }
-}
-
-
-/**************** Cases other than YCbCr -> RGB **************/
-
-
-/*
- * Color conversion for no colorspace change: just copy the data,
- * converting from separate-planes to interleaved representation.
- */
-
-METHODDEF(void)
-null_convert (j_decompress_ptr cinfo,
-	      JSAMPIMAGE input_buf, JDIMENSION input_row,
-	      JSAMPARRAY output_buf, int num_rows)
-{
-  register JSAMPROW inptr, outptr;
-  register JDIMENSION count;
-  register int num_components = cinfo->num_components;
-  JDIMENSION num_cols = cinfo->output_width;
-  int ci;
-
-  while (--num_rows >= 0) {
-    for (ci = 0; ci < num_components; ci++) {
-      inptr = input_buf[ci][input_row];
-      outptr = output_buf[0] + ci;
-      for (count = num_cols; count > 0; count--) {
-	*outptr = *inptr++;	/* needn't bother with GETJSAMPLE() here */
-	outptr += num_components;
-      }
-    }
-    input_row++;
-    output_buf++;
-  }
-}
-
-
-/*
- * Color conversion for grayscale: just copy the data.
- * This also works for YCbCr -> grayscale conversion, in which
- * we just copy the Y (luminance) component and ignore chrominance.
- */
-
-METHODDEF(void)
-grayscale_convert (j_decompress_ptr cinfo,
-		   JSAMPIMAGE input_buf, JDIMENSION input_row,
-		   JSAMPARRAY output_buf, int num_rows)
-{
-  jcopy_sample_rows(input_buf[0], (int) input_row, output_buf, 0,
-		    num_rows, cinfo->output_width);
-}
-
-
-/*
- * Convert grayscale to RGB: just duplicate the graylevel three times.
- * This is provided to support applications that don't want to cope
- * with grayscale as a separate case.
- */
-
-METHODDEF(void)
-gray_rgb_convert (j_decompress_ptr cinfo,
-		  JSAMPIMAGE input_buf, JDIMENSION input_row,
-		  JSAMPARRAY output_buf, int num_rows)
-{
-  register JSAMPROW inptr, outptr;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->output_width;
-
-  while (--num_rows >= 0) {
-    inptr = input_buf[0][input_row++];
-    outptr = *output_buf++;
-    for (col = 0; col < num_cols; col++) {
-      /* We can dispense with GETJSAMPLE() here */
-      outptr[RGB_RED] = outptr[RGB_GREEN] = outptr[RGB_BLUE] = inptr[col];
-      outptr += RGB_PIXELSIZE;
-    }
-  }
-}
-
-
-/*
- * Adobe-style YCCK->CMYK conversion.
- * We convert YCbCr to R=1-C, G=1-M, and B=1-Y using the same
- * conversion as above, while passing K (black) unchanged.
- * We assume build_ycc_rgb_table has been called.
- */
-
-METHODDEF(void)
-ycck_cmyk_convert (j_decompress_ptr cinfo,
-		   JSAMPIMAGE input_buf, JDIMENSION input_row,
-		   JSAMPARRAY output_buf, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int y, cb, cr;
-  register JSAMPROW outptr;
-  register JSAMPROW inptr0, inptr1, inptr2, inptr3;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->output_width;
-  /* copy these pointers into registers if possible */
-  register JSAMPLE * range_limit = cinfo->sample_range_limit;
-  register int * Crrtab = cconvert->Cr_r_tab;
-  register int * Cbbtab = cconvert->Cb_b_tab;
-  register JPEG_INT32 * Crgtab = cconvert->Cr_g_tab;
-  register JPEG_INT32 * Cbgtab = cconvert->Cb_g_tab;
-  SHIFT_TEMPS
-
-  while (--num_rows >= 0) {
-    inptr0 = input_buf[0][input_row];
-    inptr1 = input_buf[1][input_row];
-    inptr2 = input_buf[2][input_row];
-    inptr3 = input_buf[3][input_row];
-    input_row++;
-    outptr = *output_buf++;
-    for (col = 0; col < num_cols; col++) {
-      y  = GETJSAMPLE(inptr0[col]);
-      cb = GETJSAMPLE(inptr1[col]);
-      cr = GETJSAMPLE(inptr2[col]);
-      /* Range-limiting is essential due to noise introduced by DCT losses. */
-      outptr[0] = range_limit[MAXJSAMPLE - (y + Crrtab[cr])];	/* red */
-      outptr[1] = range_limit[MAXJSAMPLE - (y +			/* green */
-			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],
-						 SCALEBITS)))];
-      outptr[2] = range_limit[MAXJSAMPLE - (y + Cbbtab[cb])];	/* blue */
-      /* K passes through unchanged */
-      outptr[3] = inptr3[col];	/* don't need GETJSAMPLE here */
-      outptr += 4;
-    }
-  }
-}
-
-
-/*
- * Empty method for start_pass.
- */
-
-METHODDEF(void)
-start_pass_dcolor (j_decompress_ptr cinfo)
-{
-  /* no work needed */
-}
-
-
-/*
- * Module initialization routine for output colorspace conversion.
- */
-
-GLOBAL(void)
-jinit_color_deconverter (j_decompress_ptr cinfo)
-{
-  my_cconvert_ptr cconvert;
-  int ci;
-
-  cconvert = (my_cconvert_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_color_deconverter));
-  cinfo->cconvert = (struct jpeg_color_deconverter *) cconvert;
-  cconvert->pub.start_pass = start_pass_dcolor;
-
-  /* Make sure num_components agrees with jpeg_color_space */
-  switch (cinfo->jpeg_color_space) {
-  case JCS_GRAYSCALE:
-    if (cinfo->num_components != 1)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    break;
-
-  case JCS_RGB:
-  case JCS_YCbCr:
-    if (cinfo->num_components != 3)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    break;
-
-  case JCS_CMYK:
-  case JCS_YCCK:
-    if (cinfo->num_components != 4)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    break;
-
-  default:			/* JCS_UNKNOWN can be anything */
-    if (cinfo->num_components < 1)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    break;
-  }
-
-  /* Set out_color_components and conversion method based on requested space.
-   * Also clear the component_needed flags for any unused components,
-   * so that earlier pipeline stages can avoid useless computation.
-   */
-
-  switch (cinfo->out_color_space) {
-  case JCS_GRAYSCALE:
-    cinfo->out_color_components = 1;
-    if (cinfo->jpeg_color_space == JCS_GRAYSCALE ||
-	cinfo->jpeg_color_space == JCS_YCbCr) {
-      cconvert->pub.color_convert = grayscale_convert;
-      /* For color->grayscale conversion, only the Y (0) component is needed */
-      for (ci = 1; ci < cinfo->num_components; ci++)
-	cinfo->comp_info[ci].component_needed = FALSE;
-    } else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_RGB:
-    cinfo->out_color_components = RGB_PIXELSIZE;
-    if (cinfo->jpeg_color_space == JCS_YCbCr) {
-      cconvert->pub.color_convert = ycc_rgb_convert;
-      build_ycc_rgb_table(cinfo);
-    } else if (cinfo->jpeg_color_space == JCS_GRAYSCALE) {
-      cconvert->pub.color_convert = gray_rgb_convert;
-    } else if (cinfo->jpeg_color_space == JCS_RGB && RGB_PIXELSIZE == 3) {
-      cconvert->pub.color_convert = null_convert;
-    } else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_CMYK:
-    cinfo->out_color_components = 4;
-    if (cinfo->jpeg_color_space == JCS_YCCK) {
-      cconvert->pub.color_convert = ycck_cmyk_convert;
-      build_ycc_rgb_table(cinfo);
-    } else if (cinfo->jpeg_color_space == JCS_CMYK) {
-      cconvert->pub.color_convert = null_convert;
-    } else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  default:
-    /* Permit null conversion to same output space */
-    if (cinfo->out_color_space == cinfo->jpeg_color_space) {
-      cinfo->out_color_components = cinfo->num_components;
-      cconvert->pub.color_convert = null_convert;
-    } else			/* unsupported non-null conversion */
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-  }
-
-  if (cinfo->quantize_colors)
-    cinfo->output_components = 1; /* single colormapped output component */
-  else
-    cinfo->output_components = cinfo->out_color_components;
-}
-
-#if defined(__VISAGECPP__)
-#  ifdef null_convert2
-#   undef null_convert2
-#  endif
-#  ifdef grayscale_convert2
-#   undef grayscale_convert2
-#  endif
-#endif
+/*
+ * jdcolor.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains output colorspace conversion routines.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+#  define null_convert   null_convert2 /* already in jcmaint.c */
+#  define grayscale_convert   grayscale_convert2 /* already in jcmaint.c */
+#endif
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_color_deconverter pub; /* public fields */
+
+  /* Private state for YCC->RGB conversion */
+  int * Cr_r_tab;		/* => table for Cr to R conversion */
+  int * Cb_b_tab;		/* => table for Cb to B conversion */
+  JPEG_INT32 * Cr_g_tab;		/* => table for Cr to G conversion */
+  JPEG_INT32 * Cb_g_tab;		/* => table for Cb to G conversion */
+} my_color_deconverter;
+
+typedef my_color_deconverter * my_cconvert_ptr;
+
+
+/**************** YCbCr -> RGB conversion: most common case **************/
+
+/*
+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are
+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.
+ * The conversion equations to be implemented are therefore
+ *	R = Y                + 1.40200 * Cr
+ *	G = Y - 0.34414 * Cb - 0.71414 * Cr
+ *	B = Y + 1.77200 * Cb
+ * where Cb and Cr represent the incoming values less CENTERJSAMPLE.
+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.)
+ *
+ * To avoid floating-point arithmetic, we represent the fractional constants
+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide
+ * the products by 2^16, with appropriate rounding, to get the correct answer.
+ * Notice that Y, being an integral input, does not contribute any fraction
+ * so it need not participate in the rounding.
+ *
+ * For even more speed, we avoid doing any multiplications in the inner loop
+ * by precalculating the constants times Cb and Cr for all possible values.
+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);
+ * for 12-bit samples it is still acceptable.  It's not very reasonable for
+ * 16-bit samples, but if you want lossless storage you shouldn't be changing
+ * colorspace anyway.
+ * The Cr=>R and Cb=>B values can be rounded to integers in advance; the
+ * values for the G calculation are left scaled up, since we must add them
+ * together before rounding.
+ */
+
+#define SCALEBITS	16	/* speediest right-shift on some machines */
+#define ONE_HALF	((JPEG_INT32) 1 << (SCALEBITS-1))
+#define FIX(x)		((JPEG_INT32) ((x) * (1L<<SCALEBITS) + 0.5))
+
+
+/*
+ * Initialize tables for YCC->RGB colorspace conversion.
+ */
+
+LOCAL(void)
+build_ycc_rgb_table (j_decompress_ptr cinfo)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  int i;
+  JPEG_INT32 x;
+  SHIFT_TEMPS
+
+  cconvert->Cr_r_tab = (int *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(int));
+  cconvert->Cb_b_tab = (int *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(int));
+  cconvert->Cr_g_tab = (JPEG_INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
+  cconvert->Cb_g_tab = (JPEG_INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
+
+  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
+    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */
+    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */
+    /* Cr=>R value is nearest int to 1.40200 * x */
+    cconvert->Cr_r_tab[i] = (int)
+		    RIGHT_SHIFT(FIX(1.40200) * x + ONE_HALF, SCALEBITS);
+    /* Cb=>B value is nearest int to 1.77200 * x */
+    cconvert->Cb_b_tab[i] = (int)
+		    RIGHT_SHIFT(FIX(1.77200) * x + ONE_HALF, SCALEBITS);
+    /* Cr=>G value is scaled-up -0.71414 * x */
+    cconvert->Cr_g_tab[i] = (- FIX(0.71414)) * x;
+    /* Cb=>G value is scaled-up -0.34414 * x */
+    /* We also add in ONE_HALF so that need not do it in inner loop */
+    cconvert->Cb_g_tab[i] = (- FIX(0.34414)) * x + ONE_HALF;
+  }
+}
+
+
+/*
+ * Convert some rows of samples to the output colorspace.
+ *
+ * Note that we change from noninterleaved, one-plane-per-component format
+ * to interleaved-pixel format.  The output buffer is therefore three times
+ * as wide as the input buffer.
+ * A starting row offset is provided only for the input buffer.  The caller
+ * can easily adjust the passed output_buf value to accommodate any row
+ * offset required on that side.
+ */
+
+METHODDEF(void)
+ycc_rgb_convert (j_decompress_ptr cinfo,
+		 JSAMPIMAGE input_buf, JDIMENSION input_row,
+		 JSAMPARRAY output_buf, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int y, cb, cr;
+  register JSAMPROW outptr;
+  register JSAMPROW inptr0, inptr1, inptr2;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->output_width;
+  /* copy these pointers into registers if possible */
+  register JSAMPLE * range_limit = cinfo->sample_range_limit;
+  register int * Crrtab = cconvert->Cr_r_tab;
+  register int * Cbbtab = cconvert->Cb_b_tab;
+  register JPEG_INT32 * Crgtab = cconvert->Cr_g_tab;
+  register JPEG_INT32 * Cbgtab = cconvert->Cb_g_tab;
+  SHIFT_TEMPS
+
+  while (--num_rows >= 0) {
+    inptr0 = input_buf[0][input_row];
+    inptr1 = input_buf[1][input_row];
+    inptr2 = input_buf[2][input_row];
+    input_row++;
+    outptr = *output_buf++;
+    for (col = 0; col < num_cols; col++) {
+      y  = GETJSAMPLE(inptr0[col]);
+      cb = GETJSAMPLE(inptr1[col]);
+      cr = GETJSAMPLE(inptr2[col]);
+      /* Range-limiting is essential due to noise introduced by DCT losses. */
+      outptr[RGB_RED] =   range_limit[y + Crrtab[cr]];
+      outptr[RGB_GREEN] = range_limit[y +
+			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],
+						 SCALEBITS))];
+      outptr[RGB_BLUE] =  range_limit[y + Cbbtab[cb]];
+      outptr += RGB_PIXELSIZE;
+    }
+  }
+}
+
+
+/**************** Cases other than YCbCr -> RGB **************/
+
+
+/*
+ * Color conversion for no colorspace change: just copy the data,
+ * converting from separate-planes to interleaved representation.
+ */
+
+METHODDEF(void)
+null_convert (j_decompress_ptr cinfo,
+	      JSAMPIMAGE input_buf, JDIMENSION input_row,
+	      JSAMPARRAY output_buf, int num_rows)
+{
+  register JSAMPROW inptr, outptr;
+  register JDIMENSION count;
+  register int num_components = cinfo->num_components;
+  JDIMENSION num_cols = cinfo->output_width;
+  int ci;
+
+  while (--num_rows >= 0) {
+    for (ci = 0; ci < num_components; ci++) {
+      inptr = input_buf[ci][input_row];
+      outptr = output_buf[0] + ci;
+      for (count = num_cols; count > 0; count--) {
+	*outptr = *inptr++;	/* needn't bother with GETJSAMPLE() here */
+	outptr += num_components;
+      }
+    }
+    input_row++;
+    output_buf++;
+  }
+}
+
+
+/*
+ * Color conversion for grayscale: just copy the data.
+ * This also works for YCbCr -> grayscale conversion, in which
+ * we just copy the Y (luminance) component and ignore chrominance.
+ */
+
+METHODDEF(void)
+grayscale_convert (j_decompress_ptr cinfo,
+		   JSAMPIMAGE input_buf, JDIMENSION input_row,
+		   JSAMPARRAY output_buf, int num_rows)
+{
+  jcopy_sample_rows(input_buf[0], (int) input_row, output_buf, 0,
+		    num_rows, cinfo->output_width);
+}
+
+
+/*
+ * Convert grayscale to RGB: just duplicate the graylevel three times.
+ * This is provided to support applications that don't want to cope
+ * with grayscale as a separate case.
+ */
+
+METHODDEF(void)
+gray_rgb_convert (j_decompress_ptr cinfo,
+		  JSAMPIMAGE input_buf, JDIMENSION input_row,
+		  JSAMPARRAY output_buf, int num_rows)
+{
+  register JSAMPROW inptr, outptr;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->output_width;
+
+  while (--num_rows >= 0) {
+    inptr = input_buf[0][input_row++];
+    outptr = *output_buf++;
+    for (col = 0; col < num_cols; col++) {
+      /* We can dispense with GETJSAMPLE() here */
+      outptr[RGB_RED] = outptr[RGB_GREEN] = outptr[RGB_BLUE] = inptr[col];
+      outptr += RGB_PIXELSIZE;
+    }
+  }
+}
+
+
+/*
+ * Adobe-style YCCK->CMYK conversion.
+ * We convert YCbCr to R=1-C, G=1-M, and B=1-Y using the same
+ * conversion as above, while passing K (black) unchanged.
+ * We assume build_ycc_rgb_table has been called.
+ */
+
+METHODDEF(void)
+ycck_cmyk_convert (j_decompress_ptr cinfo,
+		   JSAMPIMAGE input_buf, JDIMENSION input_row,
+		   JSAMPARRAY output_buf, int num_rows)
+{
+  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
+  register int y, cb, cr;
+  register JSAMPROW outptr;
+  register JSAMPROW inptr0, inptr1, inptr2, inptr3;
+  register JDIMENSION col;
+  JDIMENSION num_cols = cinfo->output_width;
+  /* copy these pointers into registers if possible */
+  register JSAMPLE * range_limit = cinfo->sample_range_limit;
+  register int * Crrtab = cconvert->Cr_r_tab;
+  register int * Cbbtab = cconvert->Cb_b_tab;
+  register JPEG_INT32 * Crgtab = cconvert->Cr_g_tab;
+  register JPEG_INT32 * Cbgtab = cconvert->Cb_g_tab;
+  SHIFT_TEMPS
+
+  while (--num_rows >= 0) {
+    inptr0 = input_buf[0][input_row];
+    inptr1 = input_buf[1][input_row];
+    inptr2 = input_buf[2][input_row];
+    inptr3 = input_buf[3][input_row];
+    input_row++;
+    outptr = *output_buf++;
+    for (col = 0; col < num_cols; col++) {
+      y  = GETJSAMPLE(inptr0[col]);
+      cb = GETJSAMPLE(inptr1[col]);
+      cr = GETJSAMPLE(inptr2[col]);
+      /* Range-limiting is essential due to noise introduced by DCT losses. */
+      outptr[0] = range_limit[MAXJSAMPLE - (y + Crrtab[cr])];	/* red */
+      outptr[1] = range_limit[MAXJSAMPLE - (y +			/* green */
+			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],
+						 SCALEBITS)))];
+      outptr[2] = range_limit[MAXJSAMPLE - (y + Cbbtab[cb])];	/* blue */
+      /* K passes through unchanged */
+      outptr[3] = inptr3[col];	/* don't need GETJSAMPLE here */
+      outptr += 4;
+    }
+  }
+}
+
+
+/*
+ * Empty method for start_pass.
+ */
+
+METHODDEF(void)
+start_pass_dcolor (j_decompress_ptr cinfo)
+{
+  /* no work needed */
+}
+
+
+/*
+ * Module initialization routine for output colorspace conversion.
+ */
+
+GLOBAL(void)
+jinit_color_deconverter (j_decompress_ptr cinfo)
+{
+  my_cconvert_ptr cconvert;
+  int ci;
+
+  cconvert = (my_cconvert_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_color_deconverter));
+  cinfo->cconvert = (struct jpeg_color_deconverter *) cconvert;
+  cconvert->pub.start_pass = start_pass_dcolor;
+
+  /* Make sure num_components agrees with jpeg_color_space */
+  switch (cinfo->jpeg_color_space) {
+  case JCS_GRAYSCALE:
+    if (cinfo->num_components != 1)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    break;
+
+  case JCS_RGB:
+  case JCS_YCbCr:
+    if (cinfo->num_components != 3)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    break;
+
+  case JCS_CMYK:
+  case JCS_YCCK:
+    if (cinfo->num_components != 4)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    break;
+
+  default:			/* JCS_UNKNOWN can be anything */
+    if (cinfo->num_components < 1)
+      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
+    break;
+  }
+
+  /* Set out_color_components and conversion method based on requested space.
+   * Also clear the component_needed flags for any unused components,
+   * so that earlier pipeline stages can avoid useless computation.
+   */
+
+  switch (cinfo->out_color_space) {
+  case JCS_GRAYSCALE:
+    cinfo->out_color_components = 1;
+    if (cinfo->jpeg_color_space == JCS_GRAYSCALE ||
+	cinfo->jpeg_color_space == JCS_YCbCr) {
+      cconvert->pub.color_convert = grayscale_convert;
+      /* For color->grayscale conversion, only the Y (0) component is needed */
+      for (ci = 1; ci < cinfo->num_components; ci++)
+	cinfo->comp_info[ci].component_needed = FALSE;
+    } else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_RGB:
+    cinfo->out_color_components = RGB_PIXELSIZE;
+    if (cinfo->jpeg_color_space == JCS_YCbCr) {
+      cconvert->pub.color_convert = ycc_rgb_convert;
+      build_ycc_rgb_table(cinfo);
+    } else if (cinfo->jpeg_color_space == JCS_GRAYSCALE) {
+      cconvert->pub.color_convert = gray_rgb_convert;
+    } else if (cinfo->jpeg_color_space == JCS_RGB && RGB_PIXELSIZE == 3) {
+      cconvert->pub.color_convert = null_convert;
+    } else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  case JCS_CMYK:
+    cinfo->out_color_components = 4;
+    if (cinfo->jpeg_color_space == JCS_YCCK) {
+      cconvert->pub.color_convert = ycck_cmyk_convert;
+      build_ycc_rgb_table(cinfo);
+    } else if (cinfo->jpeg_color_space == JCS_CMYK) {
+      cconvert->pub.color_convert = null_convert;
+    } else
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+
+  default:
+    /* Permit null conversion to same output space */
+    if (cinfo->out_color_space == cinfo->jpeg_color_space) {
+      cinfo->out_color_components = cinfo->num_components;
+      cconvert->pub.color_convert = null_convert;
+    } else			/* unsupported non-null conversion */
+      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
+    break;
+  }
+
+  if (cinfo->quantize_colors)
+    cinfo->output_components = 1; /* single colormapped output component */
+  else
+    cinfo->output_components = cinfo->out_color_components;
+}
+
+#if defined(__VISAGECPP__)
+#  ifdef null_convert2
+#   undef null_convert2
+#  endif
+#  ifdef grayscale_convert2
+#   undef grayscale_convert2
+#  endif
+#endif
diff --git a/Source/3rd Party/wx/src/jpeg/jdct.h b/Source/3rd Party/wx/src/jpeg/jdct.h
index cd81f9eb6..42180f390 100644
--- a/Source/3rd Party/wx/src/jpeg/jdct.h	
+++ b/Source/3rd Party/wx/src/jpeg/jdct.h	
@@ -1,176 +1,176 @@
-/*
- * jdct.h
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This include file contains common declarations for the forward and
- * inverse DCT modules.  These declarations are private to the DCT managers
- * (jcdctmgr.c, jddctmgr.c) and the individual DCT algorithms.
- * The individual DCT algorithms are kept in separate files to ease 
- * machine-dependent tuning (e.g., assembly coding).
- */
-
-
-/*
- * A forward DCT routine is given a pointer to a work area of type DCTELEM[];
- * the DCT is to be performed in-place in that buffer.  Type DCTELEM is int
- * for 8-bit samples, INT32 for 12-bit samples.  (NOTE: Floating-point DCT
- * implementations use an array of type FAST_FLOAT, instead.)
- * The DCT inputs are expected to be signed (range +-CENTERJSAMPLE).
- * The DCT outputs are returned scaled up by a factor of 8; they therefore
- * have a range of +-8K for 8-bit data, +-128K for 12-bit data.  This
- * convention improves accuracy in integer implementations and saves some
- * work in floating-point ones.
- * Quantization of the output coefficients is done by jcdctmgr.c.
- */
-
-#if BITS_IN_JSAMPLE == 8
-typedef int DCTELEM;		/* 16 or 32 bits is fine */
-#else
-typedef JPEG_INT32 DCTELEM;		/* must have 32 bits */
-#endif
-
-typedef JMETHOD(void, forward_DCT_method_ptr, (DCTELEM * data));
-typedef JMETHOD(void, float_DCT_method_ptr, (FAST_FLOAT * data));
-
-
-/*
- * An inverse DCT routine is given a pointer to the input JBLOCK and a pointer
- * to an output sample array.  The routine must dequantize the input data as
- * well as perform the IDCT; for dequantization, it uses the multiplier table
- * pointed to by compptr->dct_table.  The output data is to be placed into the
- * sample array starting at a specified column.  (Any row offset needed will
- * be applied to the array pointer before it is passed to the IDCT code.)
- * Note that the number of samples emitted by the IDCT routine is
- * DCT_scaled_size * DCT_scaled_size.
- */
-
-/* typedef inverse_DCT_method_ptr is declared in jpegint.h */
-
-/*
- * Each IDCT routine has its own ideas about the best dct_table element type.
- */
-
-typedef MULTIPLIER ISLOW_MULT_TYPE; /* short or int, whichever is faster */
-#if BITS_IN_JSAMPLE == 8
-typedef MULTIPLIER IFAST_MULT_TYPE; /* 16 bits is OK, use short if faster */
-#define IFAST_SCALE_BITS  2	/* fractional bits in scale factors */
-#else
-typedef JPEG_INT32 IFAST_MULT_TYPE;	/* need 32 bits for scaled quantizers */
-#define IFAST_SCALE_BITS  13	/* fractional bits in scale factors */
-#endif
-typedef FAST_FLOAT FLOAT_MULT_TYPE; /* preferred floating type */
-
-
-/*
- * Each IDCT routine is responsible for range-limiting its results and
- * converting them to unsigned form (0..MAXJSAMPLE).  The raw outputs could
- * be quite far out of range if the input data is corrupt, so a bulletproof
- * range-limiting step is required.  We use a mask-and-table-lookup method
- * to do the combined operations quickly.  See the comments with
- * prepare_range_limit_table (in jdmaster.c) for more info.
- */
-
-#define IDCT_range_limit(cinfo)  ((cinfo)->sample_range_limit + CENTERJSAMPLE)
-
-#define RANGE_MASK  (MAXJSAMPLE * 4 + 3) /* 2 bits wider than legal samples */
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_fdct_islow		jFDislow
-#define jpeg_fdct_ifast		jFDifast
-#define jpeg_fdct_float		jFDfloat
-#define jpeg_idct_islow		jRDislow
-#define jpeg_idct_ifast		jRDifast
-#define jpeg_idct_float		jRDfloat
-#define jpeg_idct_4x4		jRD4x4
-#define jpeg_idct_2x2		jRD2x2
-#define jpeg_idct_1x1		jRD1x1
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-/* Extern declarations for the forward and inverse DCT routines. */
-
-EXTERN(void) jpeg_fdct_islow JPP((DCTELEM * data));
-EXTERN(void) jpeg_fdct_ifast JPP((DCTELEM * data));
-EXTERN(void) jpeg_fdct_float JPP((FAST_FLOAT * data));
-
-EXTERN(void) jpeg_idct_islow
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_ifast
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_float
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_4x4
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_2x2
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_1x1
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-
-
-/*
- * Macros for handling fixed-point arithmetic; these are used by many
- * but not all of the DCT/IDCT modules.
- *
- * All values are expected to be of type INT32.
- * Fractional constants are scaled left by CONST_BITS bits.
- * CONST_BITS is defined within each module using these macros,
- * and may differ from one module to the next.
- */
-
-#define ONE	((JPEG_INT32) 1)
-#define CONST_SCALE (ONE << CONST_BITS)
-
-/* Convert a positive real constant to an integer scaled by CONST_SCALE.
- * Caution: some C compilers fail to reduce "FIX(constant)" at compile time,
- * thus causing a lot of useless floating-point operations at run time.
- */
-
-#define FIX(x)	((JPEG_INT32) ((x) * CONST_SCALE + 0.5))
-
-/* Descale and correctly round an INT32 value that's scaled by N bits.
- * We assume RIGHT_SHIFT rounds towards minus infinity, so adding
- * the fudge factor is correct for either sign of X.
- */
-
-#define DESCALE(x,n)  RIGHT_SHIFT((x) + (ONE << ((n)-1)), n)
-
-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
- * This macro is used only when the two inputs will actually be no more than
- * 16 bits wide, so that a 16x16->32 bit multiply can be used instead of a
- * full 32x32 multiply.  This provides a useful speedup on many machines.
- * Unfortunately there is no way to specify a 16x16->32 multiply portably
- * in C, but some C compilers will do the right thing if you provide the
- * correct combination of casts.
- */
-
-#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */
-#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((INT16) (const)))
-#endif
-#ifdef SHORTxLCONST_32		/* known to work with Microsoft C 6.0 */
-#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((JPEG_INT32) (const)))
-#endif
-
-#ifndef MULTIPLY16C16		/* default definition */
-#define MULTIPLY16C16(var,const)  ((var) * (const))
-#endif
-
-/* Same except both inputs are variables. */
-
-#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */
-#define MULTIPLY16V16(var1,var2)  (((INT16) (var1)) * ((INT16) (var2)))
-#endif
-
-#ifndef MULTIPLY16V16		/* default definition */
-#define MULTIPLY16V16(var1,var2)  ((var1) * (var2))
-#endif
+/*
+ * jdct.h
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This include file contains common declarations for the forward and
+ * inverse DCT modules.  These declarations are private to the DCT managers
+ * (jcdctmgr.c, jddctmgr.c) and the individual DCT algorithms.
+ * The individual DCT algorithms are kept in separate files to ease 
+ * machine-dependent tuning (e.g., assembly coding).
+ */
+
+
+/*
+ * A forward DCT routine is given a pointer to a work area of type DCTELEM[];
+ * the DCT is to be performed in-place in that buffer.  Type DCTELEM is int
+ * for 8-bit samples, INT32 for 12-bit samples.  (NOTE: Floating-point DCT
+ * implementations use an array of type FAST_FLOAT, instead.)
+ * The DCT inputs are expected to be signed (range +-CENTERJSAMPLE).
+ * The DCT outputs are returned scaled up by a factor of 8; they therefore
+ * have a range of +-8K for 8-bit data, +-128K for 12-bit data.  This
+ * convention improves accuracy in integer implementations and saves some
+ * work in floating-point ones.
+ * Quantization of the output coefficients is done by jcdctmgr.c.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+typedef int DCTELEM;		/* 16 or 32 bits is fine */
+#else
+typedef JPEG_INT32 DCTELEM;		/* must have 32 bits */
+#endif
+
+typedef JMETHOD(void, forward_DCT_method_ptr, (DCTELEM * data));
+typedef JMETHOD(void, float_DCT_method_ptr, (FAST_FLOAT * data));
+
+
+/*
+ * An inverse DCT routine is given a pointer to the input JBLOCK and a pointer
+ * to an output sample array.  The routine must dequantize the input data as
+ * well as perform the IDCT; for dequantization, it uses the multiplier table
+ * pointed to by compptr->dct_table.  The output data is to be placed into the
+ * sample array starting at a specified column.  (Any row offset needed will
+ * be applied to the array pointer before it is passed to the IDCT code.)
+ * Note that the number of samples emitted by the IDCT routine is
+ * DCT_scaled_size * DCT_scaled_size.
+ */
+
+/* typedef inverse_DCT_method_ptr is declared in jpegint.h */
+
+/*
+ * Each IDCT routine has its own ideas about the best dct_table element type.
+ */
+
+typedef MULTIPLIER ISLOW_MULT_TYPE; /* short or int, whichever is faster */
+#if BITS_IN_JSAMPLE == 8
+typedef MULTIPLIER IFAST_MULT_TYPE; /* 16 bits is OK, use short if faster */
+#define IFAST_SCALE_BITS  2	/* fractional bits in scale factors */
+#else
+typedef JPEG_INT32 IFAST_MULT_TYPE;	/* need 32 bits for scaled quantizers */
+#define IFAST_SCALE_BITS  13	/* fractional bits in scale factors */
+#endif
+typedef FAST_FLOAT FLOAT_MULT_TYPE; /* preferred floating type */
+
+
+/*
+ * Each IDCT routine is responsible for range-limiting its results and
+ * converting them to unsigned form (0..MAXJSAMPLE).  The raw outputs could
+ * be quite far out of range if the input data is corrupt, so a bulletproof
+ * range-limiting step is required.  We use a mask-and-table-lookup method
+ * to do the combined operations quickly.  See the comments with
+ * prepare_range_limit_table (in jdmaster.c) for more info.
+ */
+
+#define IDCT_range_limit(cinfo)  ((cinfo)->sample_range_limit + CENTERJSAMPLE)
+
+#define RANGE_MASK  (MAXJSAMPLE * 4 + 3) /* 2 bits wider than legal samples */
+
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_fdct_islow		jFDislow
+#define jpeg_fdct_ifast		jFDifast
+#define jpeg_fdct_float		jFDfloat
+#define jpeg_idct_islow		jRDislow
+#define jpeg_idct_ifast		jRDifast
+#define jpeg_idct_float		jRDfloat
+#define jpeg_idct_4x4		jRD4x4
+#define jpeg_idct_2x2		jRD2x2
+#define jpeg_idct_1x1		jRD1x1
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+/* Extern declarations for the forward and inverse DCT routines. */
+
+EXTERN(void) jpeg_fdct_islow JPP((DCTELEM * data));
+EXTERN(void) jpeg_fdct_ifast JPP((DCTELEM * data));
+EXTERN(void) jpeg_fdct_float JPP((FAST_FLOAT * data));
+
+EXTERN(void) jpeg_idct_islow
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_ifast
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_float
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_4x4
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_2x2
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+EXTERN(void) jpeg_idct_1x1
+    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
+
+
+/*
+ * Macros for handling fixed-point arithmetic; these are used by many
+ * but not all of the DCT/IDCT modules.
+ *
+ * All values are expected to be of type INT32.
+ * Fractional constants are scaled left by CONST_BITS bits.
+ * CONST_BITS is defined within each module using these macros,
+ * and may differ from one module to the next.
+ */
+
+#define ONE	((JPEG_INT32) 1)
+#define CONST_SCALE (ONE << CONST_BITS)
+
+/* Convert a positive real constant to an integer scaled by CONST_SCALE.
+ * Caution: some C compilers fail to reduce "FIX(constant)" at compile time,
+ * thus causing a lot of useless floating-point operations at run time.
+ */
+
+#define FIX(x)	((JPEG_INT32) ((x) * CONST_SCALE + 0.5))
+
+/* Descale and correctly round an INT32 value that's scaled by N bits.
+ * We assume RIGHT_SHIFT rounds towards minus infinity, so adding
+ * the fudge factor is correct for either sign of X.
+ */
+
+#define DESCALE(x,n)  RIGHT_SHIFT((x) + (ONE << ((n)-1)), n)
+
+/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
+ * This macro is used only when the two inputs will actually be no more than
+ * 16 bits wide, so that a 16x16->32 bit multiply can be used instead of a
+ * full 32x32 multiply.  This provides a useful speedup on many machines.
+ * Unfortunately there is no way to specify a 16x16->32 multiply portably
+ * in C, but some C compilers will do the right thing if you provide the
+ * correct combination of casts.
+ */
+
+#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */
+#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((INT16) (const)))
+#endif
+#ifdef SHORTxLCONST_32		/* known to work with Microsoft C 6.0 */
+#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((JPEG_INT32) (const)))
+#endif
+
+#ifndef MULTIPLY16C16		/* default definition */
+#define MULTIPLY16C16(var,const)  ((var) * (const))
+#endif
+
+/* Same except both inputs are variables. */
+
+#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */
+#define MULTIPLY16V16(var1,var2)  (((INT16) (var1)) * ((INT16) (var2)))
+#endif
+
+#ifndef MULTIPLY16V16		/* default definition */
+#define MULTIPLY16V16(var1,var2)  ((var1) * (var2))
+#endif
diff --git a/Source/3rd Party/wx/src/jpeg/jddctmgr.c b/Source/3rd Party/wx/src/jpeg/jddctmgr.c
index 44e911628..e27cc3d51 100644
--- a/Source/3rd Party/wx/src/jpeg/jddctmgr.c	
+++ b/Source/3rd Party/wx/src/jpeg/jddctmgr.c	
@@ -1,269 +1,269 @@
-/*
- * jddctmgr.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the inverse-DCT management logic.
- * This code selects a particular IDCT implementation to be used,
- * and it performs related housekeeping chores.  No code in this file
- * is executed per IDCT step, only during output pass setup.
- *
- * Note that the IDCT routines are responsible for performing coefficient
- * dequantization as well as the IDCT proper.  This module sets up the
- * dequantization multiplier table needed by the IDCT routine.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-
-/*
- * The decompressor input side (jdinput.c) saves away the appropriate
- * quantization table for each component at the start of the first scan
- * involving that component.  (This is necessary in order to correctly
- * decode files that reuse Q-table slots.)
- * When we are ready to make an output pass, the saved Q-table is converted
- * to a multiplier table that will actually be used by the IDCT routine.
- * The multiplier table contents are IDCT-method-dependent.  To support
- * application changes in IDCT method between scans, we can remake the
- * multiplier tables if necessary.
- * In buffered-image mode, the first output pass may occur before any data
- * has been seen for some components, and thus before their Q-tables have
- * been saved away.  To handle this case, multiplier tables are preset
- * to zeroes; the result of the IDCT will be a neutral gray level.
- */
-
-
-/* Private subobject for this module */
-
-typedef struct {
-  struct jpeg_inverse_dct pub;	/* public fields */
-
-  /* This array contains the IDCT method code that each multiplier table
-   * is currently set up for, or -1 if it's not yet set up.
-   * The actual multiplier tables are pointed to by dct_table in the
-   * per-component comp_info structures.
-   */
-  int cur_method[MAX_COMPONENTS];
-} my_idct_controller;
-
-typedef my_idct_controller * my_idct_ptr;
-
-
-/* Allocated multiplier tables: big enough for any supported variant */
-
-typedef union {
-  ISLOW_MULT_TYPE islow_array[DCTSIZE2];
-#ifdef DCT_IFAST_SUPPORTED
-  IFAST_MULT_TYPE ifast_array[DCTSIZE2];
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-  FLOAT_MULT_TYPE float_array[DCTSIZE2];
-#endif
-} multiplier_table;
-
-
-/* The current scaled-IDCT routines require ISLOW-style multiplier tables,
- * so be sure to compile that code if either ISLOW or SCALING is requested.
- */
-#ifdef DCT_ISLOW_SUPPORTED
-#define PROVIDE_ISLOW_TABLES
-#else
-#ifdef IDCT_SCALING_SUPPORTED
-#define PROVIDE_ISLOW_TABLES
-#endif
-#endif
-
-
-/*
- * Prepare for an output pass.
- * Here we select the proper IDCT routine for each component and build
- * a matching multiplier table.
- */
-
-METHODDEF(void)
-start_pass (j_decompress_ptr cinfo)
-{
-  my_idct_ptr idct = (my_idct_ptr) cinfo->idct;
-  int ci, i;
-  jpeg_component_info *compptr;
-  int method = 0;
-  inverse_DCT_method_ptr method_ptr = NULL;
-  JQUANT_TBL * qtbl;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Select the proper IDCT routine for this component's scaling */
-    switch (compptr->DCT_scaled_size) {
-#ifdef IDCT_SCALING_SUPPORTED
-    case 1:
-      method_ptr = jpeg_idct_1x1;
-      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
-      break;
-    case 2:
-      method_ptr = jpeg_idct_2x2;
-      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
-      break;
-    case 4:
-      method_ptr = jpeg_idct_4x4;
-      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
-      break;
-#endif
-    case DCTSIZE:
-      switch (cinfo->dct_method) {
-#ifdef DCT_ISLOW_SUPPORTED
-      case JDCT_ISLOW:
-	method_ptr = jpeg_idct_islow;
-	method = JDCT_ISLOW;
-	break;
-#endif
-#ifdef DCT_IFAST_SUPPORTED
-      case JDCT_IFAST:
-	method_ptr = jpeg_idct_ifast;
-	method = JDCT_IFAST;
-	break;
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-      case JDCT_FLOAT:
-	method_ptr = jpeg_idct_float;
-	method = JDCT_FLOAT;
-	break;
-#endif
-      default:
-	ERREXIT(cinfo, JERR_NOT_COMPILED);
-	break;
-      }
-      break;
-    default:
-      ERREXIT1(cinfo, JERR_BAD_DCTSIZE, compptr->DCT_scaled_size);
-      break;
-    }
-    idct->pub.inverse_DCT[ci] = method_ptr;
-    /* Create multiplier table from quant table.
-     * However, we can skip this if the component is uninteresting
-     * or if we already built the table.  Also, if no quant table
-     * has yet been saved for the component, we leave the
-     * multiplier table all-zero; we'll be reading zeroes from the
-     * coefficient controller's buffer anyway.
-     */
-    if (! compptr->component_needed || idct->cur_method[ci] == method)
-      continue;
-    qtbl = compptr->quant_table;
-    if (qtbl == NULL)		/* happens if no data yet for component */
-      continue;
-    idct->cur_method[ci] = method;
-    switch (method) {
-#ifdef PROVIDE_ISLOW_TABLES
-    case JDCT_ISLOW:
-      {
-	/* For LL&M IDCT method, multipliers are equal to raw quantization
-	 * coefficients, but are stored as ints to ensure access efficiency.
-	 */
-	ISLOW_MULT_TYPE * ismtbl = (ISLOW_MULT_TYPE *) compptr->dct_table;
-	for (i = 0; i < DCTSIZE2; i++) {
-	  ismtbl[i] = (ISLOW_MULT_TYPE) qtbl->quantval[i];
-	}
-      }
-      break;
-#endif
-#ifdef DCT_IFAST_SUPPORTED
-    case JDCT_IFAST:
-      {
-	/* For AA&N IDCT method, multipliers are equal to quantization
-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
-	 *   scalefactor[0] = 1
-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
-	 * For integer operation, the multiplier table is to be scaled by
-	 * IFAST_SCALE_BITS.
-	 */
-	IFAST_MULT_TYPE * ifmtbl = (IFAST_MULT_TYPE *) compptr->dct_table;
-#define CONST_BITS 14
-	static const INT16 aanscales[DCTSIZE2] = {
-	  /* precomputed values scaled up by 14 bits */
-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
-	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
-	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
-	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
-	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
-	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,
-	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247
-	};
-	SHIFT_TEMPS
-
-	for (i = 0; i < DCTSIZE2; i++) {
-	  ifmtbl[i] = (IFAST_MULT_TYPE)
-	    DESCALE(MULTIPLY16V16((JPEG_INT32) qtbl->quantval[i],
-				  (JPEG_INT32) aanscales[i]),
-		    CONST_BITS-IFAST_SCALE_BITS);
-	}
-      }
-      break;
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-    case JDCT_FLOAT:
-      {
-	/* For float AA&N IDCT method, multipliers are equal to quantization
-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
-	 *   scalefactor[0] = 1
-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
-	 */
-	FLOAT_MULT_TYPE * fmtbl = (FLOAT_MULT_TYPE *) compptr->dct_table;
-	int row, col;
-	static const double aanscalefactor[DCTSIZE] = {
-	  1.0, 1.387039845, 1.306562965, 1.175875602,
-	  1.0, 0.785694958, 0.541196100, 0.275899379
-	};
-
-	i = 0;
-	for (row = 0; row < DCTSIZE; row++) {
-	  for (col = 0; col < DCTSIZE; col++) {
-	    fmtbl[i] = (FLOAT_MULT_TYPE)
-	      ((double) qtbl->quantval[i] *
-	       aanscalefactor[row] * aanscalefactor[col]);
-	    i++;
-	  }
-	}
-      }
-      break;
-#endif
-    default:
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-      break;
-    }
-  }
-}
-
-
-/*
- * Initialize IDCT manager.
- */
-
-GLOBAL(void)
-jinit_inverse_dct (j_decompress_ptr cinfo)
-{
-  my_idct_ptr idct;
-  int ci;
-  jpeg_component_info *compptr;
-
-  idct = (my_idct_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_idct_controller));
-  cinfo->idct = (struct jpeg_inverse_dct *) idct;
-  idct->pub.start_pass = start_pass;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Allocate and pre-zero a multiplier table for each component */
-    compptr->dct_table =
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(multiplier_table));
-    MEMZERO(compptr->dct_table, SIZEOF(multiplier_table));
-    /* Mark multiplier table not yet set up for any method */
-    idct->cur_method[ci] = -1;
-  }
-}
+/*
+ * jddctmgr.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the inverse-DCT management logic.
+ * This code selects a particular IDCT implementation to be used,
+ * and it performs related housekeeping chores.  No code in this file
+ * is executed per IDCT step, only during output pass setup.
+ *
+ * Note that the IDCT routines are responsible for performing coefficient
+ * dequantization as well as the IDCT proper.  This module sets up the
+ * dequantization multiplier table needed by the IDCT routine.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+
+/*
+ * The decompressor input side (jdinput.c) saves away the appropriate
+ * quantization table for each component at the start of the first scan
+ * involving that component.  (This is necessary in order to correctly
+ * decode files that reuse Q-table slots.)
+ * When we are ready to make an output pass, the saved Q-table is converted
+ * to a multiplier table that will actually be used by the IDCT routine.
+ * The multiplier table contents are IDCT-method-dependent.  To support
+ * application changes in IDCT method between scans, we can remake the
+ * multiplier tables if necessary.
+ * In buffered-image mode, the first output pass may occur before any data
+ * has been seen for some components, and thus before their Q-tables have
+ * been saved away.  To handle this case, multiplier tables are preset
+ * to zeroes; the result of the IDCT will be a neutral gray level.
+ */
+
+
+/* Private subobject for this module */
+
+typedef struct {
+  struct jpeg_inverse_dct pub;	/* public fields */
+
+  /* This array contains the IDCT method code that each multiplier table
+   * is currently set up for, or -1 if it's not yet set up.
+   * The actual multiplier tables are pointed to by dct_table in the
+   * per-component comp_info structures.
+   */
+  int cur_method[MAX_COMPONENTS];
+} my_idct_controller;
+
+typedef my_idct_controller * my_idct_ptr;
+
+
+/* Allocated multiplier tables: big enough for any supported variant */
+
+typedef union {
+  ISLOW_MULT_TYPE islow_array[DCTSIZE2];
+#ifdef DCT_IFAST_SUPPORTED
+  IFAST_MULT_TYPE ifast_array[DCTSIZE2];
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+  FLOAT_MULT_TYPE float_array[DCTSIZE2];
+#endif
+} multiplier_table;
+
+
+/* The current scaled-IDCT routines require ISLOW-style multiplier tables,
+ * so be sure to compile that code if either ISLOW or SCALING is requested.
+ */
+#ifdef DCT_ISLOW_SUPPORTED
+#define PROVIDE_ISLOW_TABLES
+#else
+#ifdef IDCT_SCALING_SUPPORTED
+#define PROVIDE_ISLOW_TABLES
+#endif
+#endif
+
+
+/*
+ * Prepare for an output pass.
+ * Here we select the proper IDCT routine for each component and build
+ * a matching multiplier table.
+ */
+
+METHODDEF(void)
+start_pass (j_decompress_ptr cinfo)
+{
+  my_idct_ptr idct = (my_idct_ptr) cinfo->idct;
+  int ci, i;
+  jpeg_component_info *compptr;
+  int method = 0;
+  inverse_DCT_method_ptr method_ptr = NULL;
+  JQUANT_TBL * qtbl;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Select the proper IDCT routine for this component's scaling */
+    switch (compptr->DCT_scaled_size) {
+#ifdef IDCT_SCALING_SUPPORTED
+    case 1:
+      method_ptr = jpeg_idct_1x1;
+      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
+      break;
+    case 2:
+      method_ptr = jpeg_idct_2x2;
+      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
+      break;
+    case 4:
+      method_ptr = jpeg_idct_4x4;
+      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
+      break;
+#endif
+    case DCTSIZE:
+      switch (cinfo->dct_method) {
+#ifdef DCT_ISLOW_SUPPORTED
+      case JDCT_ISLOW:
+	method_ptr = jpeg_idct_islow;
+	method = JDCT_ISLOW;
+	break;
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+      case JDCT_IFAST:
+	method_ptr = jpeg_idct_ifast;
+	method = JDCT_IFAST;
+	break;
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+      case JDCT_FLOAT:
+	method_ptr = jpeg_idct_float;
+	method = JDCT_FLOAT;
+	break;
+#endif
+      default:
+	ERREXIT(cinfo, JERR_NOT_COMPILED);
+	break;
+      }
+      break;
+    default:
+      ERREXIT1(cinfo, JERR_BAD_DCTSIZE, compptr->DCT_scaled_size);
+      break;
+    }
+    idct->pub.inverse_DCT[ci] = method_ptr;
+    /* Create multiplier table from quant table.
+     * However, we can skip this if the component is uninteresting
+     * or if we already built the table.  Also, if no quant table
+     * has yet been saved for the component, we leave the
+     * multiplier table all-zero; we'll be reading zeroes from the
+     * coefficient controller's buffer anyway.
+     */
+    if (! compptr->component_needed || idct->cur_method[ci] == method)
+      continue;
+    qtbl = compptr->quant_table;
+    if (qtbl == NULL)		/* happens if no data yet for component */
+      continue;
+    idct->cur_method[ci] = method;
+    switch (method) {
+#ifdef PROVIDE_ISLOW_TABLES
+    case JDCT_ISLOW:
+      {
+	/* For LL&M IDCT method, multipliers are equal to raw quantization
+	 * coefficients, but are stored as ints to ensure access efficiency.
+	 */
+	ISLOW_MULT_TYPE * ismtbl = (ISLOW_MULT_TYPE *) compptr->dct_table;
+	for (i = 0; i < DCTSIZE2; i++) {
+	  ismtbl[i] = (ISLOW_MULT_TYPE) qtbl->quantval[i];
+	}
+      }
+      break;
+#endif
+#ifdef DCT_IFAST_SUPPORTED
+    case JDCT_IFAST:
+      {
+	/* For AA&N IDCT method, multipliers are equal to quantization
+	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
+	 *   scalefactor[0] = 1
+	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
+	 * For integer operation, the multiplier table is to be scaled by
+	 * IFAST_SCALE_BITS.
+	 */
+	IFAST_MULT_TYPE * ifmtbl = (IFAST_MULT_TYPE *) compptr->dct_table;
+#define CONST_BITS 14
+	static const INT16 aanscales[DCTSIZE2] = {
+	  /* precomputed values scaled up by 14 bits */
+	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
+	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
+	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
+	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
+	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
+	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
+	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,
+	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247
+	};
+	SHIFT_TEMPS
+
+	for (i = 0; i < DCTSIZE2; i++) {
+	  ifmtbl[i] = (IFAST_MULT_TYPE)
+	    DESCALE(MULTIPLY16V16((JPEG_INT32) qtbl->quantval[i],
+				  (JPEG_INT32) aanscales[i]),
+		    CONST_BITS-IFAST_SCALE_BITS);
+	}
+      }
+      break;
+#endif
+#ifdef DCT_FLOAT_SUPPORTED
+    case JDCT_FLOAT:
+      {
+	/* For float AA&N IDCT method, multipliers are equal to quantization
+	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
+	 *   scalefactor[0] = 1
+	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
+	 */
+	FLOAT_MULT_TYPE * fmtbl = (FLOAT_MULT_TYPE *) compptr->dct_table;
+	int row, col;
+	static const double aanscalefactor[DCTSIZE] = {
+	  1.0, 1.387039845, 1.306562965, 1.175875602,
+	  1.0, 0.785694958, 0.541196100, 0.275899379
+	};
+
+	i = 0;
+	for (row = 0; row < DCTSIZE; row++) {
+	  for (col = 0; col < DCTSIZE; col++) {
+	    fmtbl[i] = (FLOAT_MULT_TYPE)
+	      ((double) qtbl->quantval[i] *
+	       aanscalefactor[row] * aanscalefactor[col]);
+	    i++;
+	  }
+	}
+      }
+      break;
+#endif
+    default:
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+      break;
+    }
+  }
+}
+
+
+/*
+ * Initialize IDCT manager.
+ */
+
+GLOBAL(void)
+jinit_inverse_dct (j_decompress_ptr cinfo)
+{
+  my_idct_ptr idct;
+  int ci;
+  jpeg_component_info *compptr;
+
+  idct = (my_idct_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_idct_controller));
+  cinfo->idct = (struct jpeg_inverse_dct *) idct;
+  idct->pub.start_pass = start_pass;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Allocate and pre-zero a multiplier table for each component */
+    compptr->dct_table =
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(multiplier_table));
+    MEMZERO(compptr->dct_table, SIZEOF(multiplier_table));
+    /* Mark multiplier table not yet set up for any method */
+    idct->cur_method[ci] = -1;
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jdhuff.c b/Source/3rd Party/wx/src/jpeg/jdhuff.c
index 21fa63f12..dccbc52b4 100644
--- a/Source/3rd Party/wx/src/jpeg/jdhuff.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdhuff.c	
@@ -1,651 +1,651 @@
-/*
- * jdhuff.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains Huffman entropy decoding routines.
- *
- * Much of the complexity here has to do with supporting input suspension.
- * If the data source module demands suspension, we want to be able to back
- * up to the start of the current MCU.  To do this, we copy state variables
- * into local working storage, and update them back to the permanent
- * storage only upon successful completion of an MCU.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdhuff.h"		/* Declarations shared with jdphuff.c */
-
-
-/*
- * Expanded entropy decoder object for Huffman decoding.
- *
- * The savable_state subrecord contains fields that change within an MCU,
- * but must not be updated permanently until we complete the MCU.
- */
-
-typedef struct {
-  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
-} savable_state;
-
-/* This macro is to work around compilers with missing or broken
- * structure assignment.  You'll need to fix this code if you have
- * such a compiler and you change MAX_COMPS_IN_SCAN.
- */
-
-#ifndef NO_STRUCT_ASSIGN
-#define ASSIGN_STATE(dest,src)  ((dest) = (src))
-#else
-#if MAX_COMPS_IN_SCAN == 4
-#define ASSIGN_STATE(dest,src)  \
-	((dest).last_dc_val[0] = (src).last_dc_val[0], \
-	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
-	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
-	 (dest).last_dc_val[3] = (src).last_dc_val[3])
-#endif
-#endif
-
-
-typedef struct {
-  struct jpeg_entropy_decoder pub; /* public fields */
-
-  /* These fields are loaded into local variables at start of each MCU.
-   * In case of suspension, we exit WITHOUT updating them.
-   */
-  bitread_perm_state bitstate;	/* Bit buffer at start of MCU */
-  savable_state saved;		/* Other state at start of MCU */
-
-  /* These fields are NOT loaded into local working state. */
-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
-
-  /* Pointers to derived tables (these workspaces have image lifespan) */
-  d_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];
-  d_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];
-
-  /* Precalculated info set up by start_pass for use in decode_mcu: */
-
-  /* Pointers to derived tables to be used for each block within an MCU */
-  d_derived_tbl * dc_cur_tbls[D_MAX_BLOCKS_IN_MCU];
-  d_derived_tbl * ac_cur_tbls[D_MAX_BLOCKS_IN_MCU];
-  /* Whether we care about the DC and AC coefficient values for each block */
-  wxjpeg_boolean dc_needed[D_MAX_BLOCKS_IN_MCU];
-  wxjpeg_boolean ac_needed[D_MAX_BLOCKS_IN_MCU];
-} huff_entropy_decoder;
-
-typedef huff_entropy_decoder * huff_entropy_ptr;
-
-
-/*
- * Initialize for a Huffman-compressed scan.
- */
-
-METHODDEF(void)
-start_pass_huff_decoder (j_decompress_ptr cinfo)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int ci, blkn, dctbl, actbl;
-  jpeg_component_info * compptr;
-
-  /* Check that the scan parameters Ss, Se, Ah/Al are OK for sequential JPEG.
-   * This ought to be an error condition, but we make it a warning because
-   * there are some baseline files out there with all zeroes in these bytes.
-   */
-  if (cinfo->Ss != 0 || cinfo->Se != DCTSIZE2-1 ||
-      cinfo->Ah != 0 || cinfo->Al != 0)
-    WARNMS(cinfo, JWRN_NOT_SEQUENTIAL);
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    dctbl = compptr->dc_tbl_no;
-    actbl = compptr->ac_tbl_no;
-    /* Compute derived values for Huffman tables */
-    /* We may do this more than once for a table, but it's not expensive */
-    jpeg_make_d_derived_tbl(cinfo, TRUE, dctbl,
-			    & entropy->dc_derived_tbls[dctbl]);
-    jpeg_make_d_derived_tbl(cinfo, FALSE, actbl,
-			    & entropy->ac_derived_tbls[actbl]);
-    /* Initialize DC predictions to 0 */
-    entropy->saved.last_dc_val[ci] = 0;
-  }
-
-  /* Precalculate decoding info for each block in an MCU of this scan */
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    ci = cinfo->MCU_membership[blkn];
-    compptr = cinfo->cur_comp_info[ci];
-    /* Precalculate which table to use for each block */
-    entropy->dc_cur_tbls[blkn] = entropy->dc_derived_tbls[compptr->dc_tbl_no];
-    entropy->ac_cur_tbls[blkn] = entropy->ac_derived_tbls[compptr->ac_tbl_no];
-    /* Decide whether we really care about the coefficient values */
-    if (compptr->component_needed) {
-      entropy->dc_needed[blkn] = TRUE;
-      /* we don't need the ACs if producing a 1/8th-size image */
-      entropy->ac_needed[blkn] = (compptr->DCT_scaled_size > 1);
-    } else {
-      entropy->dc_needed[blkn] = entropy->ac_needed[blkn] = FALSE;
-    }
-  }
-
-  /* Initialize bitread state variables */
-  entropy->bitstate.bits_left = 0;
-  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
-  entropy->pub.insufficient_data = FALSE;
-
-  /* Initialize restart counter */
-  entropy->restarts_to_go = cinfo->restart_interval;
-}
-
-
-/*
- * Compute the derived values for a Huffman table.
- * This routine also performs some validation checks on the table.
- *
- * Note this is also used by jdphuff.c.
- */
-
-GLOBAL(void)
-jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
-			 d_derived_tbl ** pdtbl)
-{
-  JHUFF_TBL *htbl;
-  d_derived_tbl *dtbl;
-  int p, i, l, si, numsymbols;
-  int lookbits, ctr;
-  char huffsize[257];
-  unsigned int huffcode[257];
-  unsigned int code;
-
-  /* Note that huffsize[] and huffcode[] are filled in code-length order,
-   * paralleling the order of the symbols themselves in htbl->huffval[].
-   */
-
-  /* Find the input Huffman table */
-  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
-  htbl =
-    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];
-  if (htbl == NULL)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
-
-  /* Allocate a workspace if we haven't already done so. */
-  if (*pdtbl == NULL)
-    *pdtbl = (d_derived_tbl *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(d_derived_tbl));
-  dtbl = *pdtbl;
-  dtbl->pub = htbl;		/* fill in back link */
-  
-  /* Figure C.1: make table of Huffman code length for each symbol */
-
-  p = 0;
-  for (l = 1; l <= 16; l++) {
-    i = (int) htbl->bits[l];
-    if (i < 0 || p + i > 256)	/* protect against table overrun */
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    while (i--)
-      huffsize[p++] = (char) l;
-  }
-  huffsize[p] = 0;
-  numsymbols = p;
-  
-  /* Figure C.2: generate the codes themselves */
-  /* We also validate that the counts represent a legal Huffman code tree. */
-  
-  code = 0;
-  si = huffsize[0];
-  p = 0;
-  while (huffsize[p]) {
-    while (((int) huffsize[p]) == si) {
-      huffcode[p++] = code;
-      code++;
-    }
-    /* code is now 1 more than the last code used for codelength si; but
-     * it must still fit in si bits, since no code is allowed to be all ones.
-     */
-    if (((JPEG_INT32) code) >= (((JPEG_INT32) 1) << si))
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    code <<= 1;
-    si++;
-  }
-
-  /* Figure F.15: generate decoding tables for bit-sequential decoding */
-
-  p = 0;
-  for (l = 1; l <= 16; l++) {
-    if (htbl->bits[l]) {
-      /* valoffset[l] = huffval[] index of 1st symbol of code length l,
-       * minus the minimum code of length l
-       */
-      dtbl->valoffset[l] = (JPEG_INT32) p - (JPEG_INT32) huffcode[p];
-      p += htbl->bits[l];
-      dtbl->maxcode[l] = huffcode[p-1]; /* maximum code of length l */
-    } else {
-      dtbl->maxcode[l] = -1;	/* -1 if no codes of this length */
-    }
-  }
-  dtbl->maxcode[17] = 0xFFFFFL; /* ensures jpeg_huff_decode terminates */
-
-  /* Compute lookahead tables to speed up decoding.
-   * First we set all the table entries to 0, indicating "too long";
-   * then we iterate through the Huffman codes that are short enough and
-   * fill in all the entries that correspond to bit sequences starting
-   * with that code.
-   */
-
-  MEMZERO(dtbl->look_nbits, SIZEOF(dtbl->look_nbits));
-
-  p = 0;
-  for (l = 1; l <= HUFF_LOOKAHEAD; l++) {
-    for (i = 1; i <= (int) htbl->bits[l]; i++, p++) {
-      /* l = current code's length, p = its index in huffcode[] & huffval[]. */
-      /* Generate left-justified code followed by all possible bit sequences */
-      lookbits = huffcode[p] << (HUFF_LOOKAHEAD-l);
-      for (ctr = 1 << (HUFF_LOOKAHEAD-l); ctr > 0; ctr--) {
-	dtbl->look_nbits[lookbits] = l;
-	dtbl->look_sym[lookbits] = htbl->huffval[p];
-	lookbits++;
-      }
-    }
-  }
-
-  /* Validate symbols as being reasonable.
-   * For AC tables, we make no check, but accept all byte values 0..255.
-   * For DC tables, we require the symbols to be in range 0..15.
-   * (Tighter bounds could be applied depending on the data depth and mode,
-   * but this is sufficient to ensure safe decoding.)
-   */
-  if (isDC) {
-    for (i = 0; i < numsymbols; i++) {
-      int sym = htbl->huffval[i];
-      if (sym < 0 || sym > 15)
-	ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    }
-  }
-}
-
-
-/*
- * Out-of-line code for bit fetching (shared with jdphuff.c).
- * See jdhuff.h for info about usage.
- * Note: current values of get_buffer and bits_left are passed as parameters,
- * but are returned in the corresponding fields of the state struct.
- *
- * On most machines MIN_GET_BITS should be 25 to allow the full 32-bit width
- * of get_buffer to be used.  (On machines with wider words, an even larger
- * buffer could be used.)  However, on some machines 32-bit shifts are
- * quite slow and take time proportional to the number of places shifted.
- * (This is true with most PC compilers, for instance.)  In this case it may
- * be a win to set MIN_GET_BITS to the minimum value of 15.  This reduces the
- * average shift distance at the cost of more calls to jpeg_fill_bit_buffer.
- */
-
-#ifdef SLOW_SHIFT_32
-#define MIN_GET_BITS  15	/* minimum allowable value */
-#else
-#define MIN_GET_BITS  (BIT_BUF_SIZE-7)
-#endif
-
-
-GLOBAL(wxjpeg_boolean)
-jpeg_fill_bit_buffer (bitread_working_state * state,
-		      register bit_buf_type get_buffer, register int bits_left,
-		      int nbits)
-/* Load up the bit buffer to a depth of at least nbits */
-{
-  /* Copy heavily used state fields into locals (hopefully registers) */
-  register const JOCTET * next_input_byte = state->next_input_byte;
-  register size_t bytes_in_buffer = state->bytes_in_buffer;
-  j_decompress_ptr cinfo = state->cinfo;
-
-  /* Attempt to load at least MIN_GET_BITS bits into get_buffer. */
-  /* (It is assumed that no request will be for more than that many bits.) */
-  /* We fail to do so only if we hit a marker or are forced to suspend. */
-
-  if (cinfo->unread_marker == 0) {	/* cannot advance past a marker */
-    while (bits_left < MIN_GET_BITS) {
-      register int c;
-
-      /* Attempt to read a byte */
-      if (bytes_in_buffer == 0) {
-	if (! (*cinfo->src->fill_input_buffer) (cinfo))
-	  return FALSE;
-	next_input_byte = cinfo->src->next_input_byte;
-	bytes_in_buffer = cinfo->src->bytes_in_buffer;
-      }
-      bytes_in_buffer--;
-      c = GETJOCTET(*next_input_byte++);
-
-      /* If it's 0xFF, check and discard stuffed zero byte */
-      if (c == 0xFF) {
-	/* Loop here to discard any padding FF's on terminating marker,
-	 * so that we can save a valid unread_marker value.  NOTE: we will
-	 * accept multiple FF's followed by a 0 as meaning a single FF data
-	 * byte.  This data pattern is not valid according to the standard.
-	 */
-	do {
-	  if (bytes_in_buffer == 0) {
-	    if (! (*cinfo->src->fill_input_buffer) (cinfo))
-	      return FALSE;
-	    next_input_byte = cinfo->src->next_input_byte;
-	    bytes_in_buffer = cinfo->src->bytes_in_buffer;
-	  }
-	  bytes_in_buffer--;
-	  c = GETJOCTET(*next_input_byte++);
-	} while (c == 0xFF);
-
-	if (c == 0) {
-	  /* Found FF/00, which represents an FF data byte */
-	  c = 0xFF;
-	} else {
-	  /* Oops, it's actually a marker indicating end of compressed data.
-	   * Save the marker code for later use.
-	   * Fine point: it might appear that we should save the marker into
-	   * bitread working state, not straight into permanent state.  But
-	   * once we have hit a marker, we cannot need to suspend within the
-	   * current MCU, because we will read no more bytes from the data
-	   * source.  So it is OK to update permanent state right away.
-	   */
-	  cinfo->unread_marker = c;
-	  /* See if we need to insert some fake zero bits. */
-	  goto no_more_bytes;
-	}
-      }
-
-      /* OK, load c into get_buffer */
-      get_buffer = (get_buffer << 8) | c;
-      bits_left += 8;
-    } /* end while */
-  } else {
-  no_more_bytes:
-    /* We get here if we've read the marker that terminates the compressed
-     * data segment.  There should be enough bits in the buffer register
-     * to satisfy the request; if so, no problem.
-     */
-    if (nbits > bits_left) {
-      /* Uh-oh.  Report corrupted data to user and stuff zeroes into
-       * the data stream, so that we can produce some kind of image.
-       * We use a nonvolatile flag to ensure that only one warning message
-       * appears per data segment.
-       */
-      if (! cinfo->entropy->insufficient_data) {
-	WARNMS(cinfo, JWRN_HIT_MARKER);
-	cinfo->entropy->insufficient_data = TRUE;
-      }
-      /* Fill the buffer with zero bits */
-      get_buffer <<= MIN_GET_BITS - bits_left;
-      bits_left = MIN_GET_BITS;
-    }
-  }
-
-  /* Unload the local registers */
-  state->next_input_byte = next_input_byte;
-  state->bytes_in_buffer = bytes_in_buffer;
-  state->get_buffer = get_buffer;
-  state->bits_left = bits_left;
-
-  return TRUE;
-}
-
-
-/*
- * Out-of-line code for Huffman code decoding.
- * See jdhuff.h for info about usage.
- */
-
-GLOBAL(int)
-jpeg_huff_decode (bitread_working_state * state,
-		  register bit_buf_type get_buffer, register int bits_left,
-		  d_derived_tbl * htbl, int min_bits)
-{
-  register int l = min_bits;
-  register JPEG_INT32 code;
-
-  /* HUFF_DECODE has determined that the code is at least min_bits */
-  /* bits long, so fetch that many bits in one swoop. */
-
-  CHECK_BIT_BUFFER(*state, l, return -1);
-  code = GET_BITS(l);
-
-  /* Collect the rest of the Huffman code one bit at a time. */
-  /* This is per Figure F.16 in the JPEG spec. */
-
-  while (code > htbl->maxcode[l]) {
-    code <<= 1;
-    CHECK_BIT_BUFFER(*state, 1, return -1);
-    code |= GET_BITS(1);
-    l++;
-  }
-
-  /* Unload the local registers */
-  state->get_buffer = get_buffer;
-  state->bits_left = bits_left;
-
-  /* With garbage input we may reach the sentinel value l = 17. */
-
-  if (l > 16) {
-    WARNMS(state->cinfo, JWRN_HUFF_BAD_CODE);
-    return 0;			/* fake a zero as the safest result */
-  }
-
-  return htbl->pub->huffval[ (int) (code + htbl->valoffset[l]) ];
-}
-
-
-/*
- * Figure F.12: extend sign bit.
- * On some machines, a shift and add will be faster than a table lookup.
- */
-
-#ifdef AVOID_TABLES
-
-#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
-
-#else
-
-#define HUFF_EXTEND(x,s)  ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
-
-static const int extend_test[16] =   /* entry n is 2**(n-1) */
-  { 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
-    0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
-
-static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
-  { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
-    ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
-    ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
-    ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
-
-#endif /* AVOID_TABLES */
-
-
-/*
- * Check for a restart marker & resynchronize decoder.
- * Returns FALSE if must suspend.
- */
-
-LOCAL(wxjpeg_boolean)
-process_restart (j_decompress_ptr cinfo)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int ci;
-
-  /* Throw away any unused bits remaining in bit buffer; */
-  /* include any full bytes in next_marker's count of discarded bytes */
-  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
-  entropy->bitstate.bits_left = 0;
-
-  /* Advance past the RSTn marker */
-  if (! (*cinfo->marker->read_restart_marker) (cinfo))
-    return FALSE;
-
-  /* Re-initialize DC predictions to 0 */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++)
-    entropy->saved.last_dc_val[ci] = 0;
-
-  /* Reset restart counter */
-  entropy->restarts_to_go = cinfo->restart_interval;
-
-  /* Reset out-of-data flag, unless read_restart_marker left us smack up
-   * against a marker.  In that case we will end up treating the next data
-   * segment as empty, and we can avoid producing bogus output pixels by
-   * leaving the flag set.
-   */
-  if (cinfo->unread_marker == 0)
-    entropy->pub.insufficient_data = FALSE;
-
-  return TRUE;
-}
-
-
-/*
- * Decode and return one MCU's worth of Huffman-compressed coefficients.
- * The coefficients are reordered from zigzag order into natural array order,
- * but are not dequantized.
- *
- * The i'th block of the MCU is stored into the block pointed to by
- * MCU_data[i].  WE ASSUME THIS AREA HAS BEEN ZEROED BY THE CALLER.
- * (Wholesale zeroing is usually a little faster than retail...)
- *
- * Returns FALSE if data source requested suspension.  In that case no
- * changes have been made to permanent state.  (Exception: some output
- * coefficients may already have been assigned.  This is harmless for
- * this module, since we'll just re-assign them on the next call.)
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int blkn;
-  BITREAD_STATE_VARS;
-  savable_state state;
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* If we've run out of data, just leave the MCU set to zeroes.
-   * This way, we return uniform gray for the remainder of the segment.
-   */
-  if (! entropy->pub.insufficient_data) {
-
-    /* Load up working state */
-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-    ASSIGN_STATE(state, entropy->saved);
-
-    /* Outer loop handles each block in the MCU */
-
-    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-      JBLOCKROW block = MCU_data[blkn];
-      d_derived_tbl * dctbl = entropy->dc_cur_tbls[blkn];
-      d_derived_tbl * actbl = entropy->ac_cur_tbls[blkn];
-      register int s, k, r;
-
-      /* Decode a single block's worth of coefficients */
-
-      /* Section F.2.2.1: decode the DC coefficient difference */
-      HUFF_DECODE(s, br_state, dctbl, return FALSE, label1);
-      if (s) {
-	CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	r = GET_BITS(s);
-	s = HUFF_EXTEND(r, s);
-      }
-
-      if (entropy->dc_needed[blkn]) {
-	/* Convert DC difference to actual value, update last_dc_val */
-	int ci = cinfo->MCU_membership[blkn];
-	s += state.last_dc_val[ci];
-	state.last_dc_val[ci] = s;
-	/* Output the DC coefficient (assumes jpeg_natural_order[0] = 0) */
-	(*block)[0] = (JCOEF) s;
-      }
-
-      if (entropy->ac_needed[blkn]) {
-
-	/* Section F.2.2.2: decode the AC coefficients */
-	/* Since zeroes are skipped, output area must be cleared beforehand */
-	for (k = 1; k < DCTSIZE2; k++) {
-	  HUFF_DECODE(s, br_state, actbl, return FALSE, label2);
-      
-	  r = s >> 4;
-	  s &= 15;
-      
-	  if (s) {
-	    k += r;
-	    CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	    r = GET_BITS(s);
-	    s = HUFF_EXTEND(r, s);
-	    /* Output coefficient in natural (dezigzagged) order.
-	     * Note: the extra entries in jpeg_natural_order[] will save us
-	     * if k >= DCTSIZE2, which could happen if the data is corrupted.
-	     */
-	    (*block)[jpeg_natural_order[k]] = (JCOEF) s;
-	  } else {
-	    if (r != 15)
-	      break;
-	    k += 15;
-	  }
-	}
-
-      } else {
-
-	/* Section F.2.2.2: decode the AC coefficients */
-	/* In this path we just discard the values */
-	for (k = 1; k < DCTSIZE2; k++) {
-	  HUFF_DECODE(s, br_state, actbl, return FALSE, label3);
-      
-	  r = s >> 4;
-	  s &= 15;
-      
-	  if (s) {
-	    k += r;
-	    CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	    DROP_BITS(s);
-	  } else {
-	    if (r != 15)
-	      break;
-	    k += 15;
-	  }
-	}
-
-      }
-    }
-
-    /* Completed MCU, so update state */
-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-    ASSIGN_STATE(entropy->saved, state);
-  }
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-}
-
-
-/*
- * Module initialization routine for Huffman entropy decoding.
- */
-
-GLOBAL(void)
-jinit_huff_decoder (j_decompress_ptr cinfo)
-{
-  huff_entropy_ptr entropy;
-  int i;
-
-  entropy = (huff_entropy_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(huff_entropy_decoder));
-  cinfo->entropy = (struct jpeg_entropy_decoder *) entropy;
-  entropy->pub.start_pass = start_pass_huff_decoder;
-  entropy->pub.decode_mcu = decode_mcu;
-
-  /* Mark tables unallocated */
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
-  }
-}
+/*
+ * jdhuff.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy decoding routines.
+ *
+ * Much of the complexity here has to do with supporting input suspension.
+ * If the data source module demands suspension, we want to be able to back
+ * up to the start of the current MCU.  To do this, we copy state variables
+ * into local working storage, and update them back to the permanent
+ * storage only upon successful completion of an MCU.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdhuff.h"		/* Declarations shared with jdphuff.c */
+
+
+/*
+ * Expanded entropy decoder object for Huffman decoding.
+ *
+ * The savable_state subrecord contains fields that change within an MCU,
+ * but must not be updated permanently until we complete the MCU.
+ */
+
+typedef struct {
+  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
+} savable_state;
+
+/* This macro is to work around compilers with missing or broken
+ * structure assignment.  You'll need to fix this code if you have
+ * such a compiler and you change MAX_COMPS_IN_SCAN.
+ */
+
+#ifndef NO_STRUCT_ASSIGN
+#define ASSIGN_STATE(dest,src)  ((dest) = (src))
+#else
+#if MAX_COMPS_IN_SCAN == 4
+#define ASSIGN_STATE(dest,src)  \
+	((dest).last_dc_val[0] = (src).last_dc_val[0], \
+	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
+	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
+	 (dest).last_dc_val[3] = (src).last_dc_val[3])
+#endif
+#endif
+
+
+typedef struct {
+  struct jpeg_entropy_decoder pub; /* public fields */
+
+  /* These fields are loaded into local variables at start of each MCU.
+   * In case of suspension, we exit WITHOUT updating them.
+   */
+  bitread_perm_state bitstate;	/* Bit buffer at start of MCU */
+  savable_state saved;		/* Other state at start of MCU */
+
+  /* These fields are NOT loaded into local working state. */
+  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
+
+  /* Pointers to derived tables (these workspaces have image lifespan) */
+  d_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];
+  d_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];
+
+  /* Precalculated info set up by start_pass for use in decode_mcu: */
+
+  /* Pointers to derived tables to be used for each block within an MCU */
+  d_derived_tbl * dc_cur_tbls[D_MAX_BLOCKS_IN_MCU];
+  d_derived_tbl * ac_cur_tbls[D_MAX_BLOCKS_IN_MCU];
+  /* Whether we care about the DC and AC coefficient values for each block */
+  wxjpeg_boolean dc_needed[D_MAX_BLOCKS_IN_MCU];
+  wxjpeg_boolean ac_needed[D_MAX_BLOCKS_IN_MCU];
+} huff_entropy_decoder;
+
+typedef huff_entropy_decoder * huff_entropy_ptr;
+
+
+/*
+ * Initialize for a Huffman-compressed scan.
+ */
+
+METHODDEF(void)
+start_pass_huff_decoder (j_decompress_ptr cinfo)
+{
+  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
+  int ci, blkn, dctbl, actbl;
+  jpeg_component_info * compptr;
+
+  /* Check that the scan parameters Ss, Se, Ah/Al are OK for sequential JPEG.
+   * This ought to be an error condition, but we make it a warning because
+   * there are some baseline files out there with all zeroes in these bytes.
+   */
+  if (cinfo->Ss != 0 || cinfo->Se != DCTSIZE2-1 ||
+      cinfo->Ah != 0 || cinfo->Al != 0)
+    WARNMS(cinfo, JWRN_NOT_SEQUENTIAL);
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    dctbl = compptr->dc_tbl_no;
+    actbl = compptr->ac_tbl_no;
+    /* Compute derived values for Huffman tables */
+    /* We may do this more than once for a table, but it's not expensive */
+    jpeg_make_d_derived_tbl(cinfo, TRUE, dctbl,
+			    & entropy->dc_derived_tbls[dctbl]);
+    jpeg_make_d_derived_tbl(cinfo, FALSE, actbl,
+			    & entropy->ac_derived_tbls[actbl]);
+    /* Initialize DC predictions to 0 */
+    entropy->saved.last_dc_val[ci] = 0;
+  }
+
+  /* Precalculate decoding info for each block in an MCU of this scan */
+  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
+    ci = cinfo->MCU_membership[blkn];
+    compptr = cinfo->cur_comp_info[ci];
+    /* Precalculate which table to use for each block */
+    entropy->dc_cur_tbls[blkn] = entropy->dc_derived_tbls[compptr->dc_tbl_no];
+    entropy->ac_cur_tbls[blkn] = entropy->ac_derived_tbls[compptr->ac_tbl_no];
+    /* Decide whether we really care about the coefficient values */
+    if (compptr->component_needed) {
+      entropy->dc_needed[blkn] = TRUE;
+      /* we don't need the ACs if producing a 1/8th-size image */
+      entropy->ac_needed[blkn] = (compptr->DCT_scaled_size > 1);
+    } else {
+      entropy->dc_needed[blkn] = entropy->ac_needed[blkn] = FALSE;
+    }
+  }
+
+  /* Initialize bitread state variables */
+  entropy->bitstate.bits_left = 0;
+  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
+  entropy->pub.insufficient_data = FALSE;
+
+  /* Initialize restart counter */
+  entropy->restarts_to_go = cinfo->restart_interval;
+}
+
+
+/*
+ * Compute the derived values for a Huffman table.
+ * This routine also performs some validation checks on the table.
+ *
+ * Note this is also used by jdphuff.c.
+ */
+
+GLOBAL(void)
+jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
+			 d_derived_tbl ** pdtbl)
+{
+  JHUFF_TBL *htbl;
+  d_derived_tbl *dtbl;
+  int p, i, l, si, numsymbols;
+  int lookbits, ctr;
+  char huffsize[257];
+  unsigned int huffcode[257];
+  unsigned int code;
+
+  /* Note that huffsize[] and huffcode[] are filled in code-length order,
+   * paralleling the order of the symbols themselves in htbl->huffval[].
+   */
+
+  /* Find the input Huffman table */
+  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
+  htbl =
+    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];
+  if (htbl == NULL)
+    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
+
+  /* Allocate a workspace if we haven't already done so. */
+  if (*pdtbl == NULL)
+    *pdtbl = (d_derived_tbl *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(d_derived_tbl));
+  dtbl = *pdtbl;
+  dtbl->pub = htbl;		/* fill in back link */
+  
+  /* Figure C.1: make table of Huffman code length for each symbol */
+
+  p = 0;
+  for (l = 1; l <= 16; l++) {
+    i = (int) htbl->bits[l];
+    if (i < 0 || p + i > 256)	/* protect against table overrun */
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    while (i--)
+      huffsize[p++] = (char) l;
+  }
+  huffsize[p] = 0;
+  numsymbols = p;
+  
+  /* Figure C.2: generate the codes themselves */
+  /* We also validate that the counts represent a legal Huffman code tree. */
+  
+  code = 0;
+  si = huffsize[0];
+  p = 0;
+  while (huffsize[p]) {
+    while (((int) huffsize[p]) == si) {
+      huffcode[p++] = code;
+      code++;
+    }
+    /* code is now 1 more than the last code used for codelength si; but
+     * it must still fit in si bits, since no code is allowed to be all ones.
+     */
+    if (((JPEG_INT32) code) >= (((JPEG_INT32) 1) << si))
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    code <<= 1;
+    si++;
+  }
+
+  /* Figure F.15: generate decoding tables for bit-sequential decoding */
+
+  p = 0;
+  for (l = 1; l <= 16; l++) {
+    if (htbl->bits[l]) {
+      /* valoffset[l] = huffval[] index of 1st symbol of code length l,
+       * minus the minimum code of length l
+       */
+      dtbl->valoffset[l] = (JPEG_INT32) p - (JPEG_INT32) huffcode[p];
+      p += htbl->bits[l];
+      dtbl->maxcode[l] = huffcode[p-1]; /* maximum code of length l */
+    } else {
+      dtbl->maxcode[l] = -1;	/* -1 if no codes of this length */
+    }
+  }
+  dtbl->maxcode[17] = 0xFFFFFL; /* ensures jpeg_huff_decode terminates */
+
+  /* Compute lookahead tables to speed up decoding.
+   * First we set all the table entries to 0, indicating "too long";
+   * then we iterate through the Huffman codes that are short enough and
+   * fill in all the entries that correspond to bit sequences starting
+   * with that code.
+   */
+
+  MEMZERO(dtbl->look_nbits, SIZEOF(dtbl->look_nbits));
+
+  p = 0;
+  for (l = 1; l <= HUFF_LOOKAHEAD; l++) {
+    for (i = 1; i <= (int) htbl->bits[l]; i++, p++) {
+      /* l = current code's length, p = its index in huffcode[] & huffval[]. */
+      /* Generate left-justified code followed by all possible bit sequences */
+      lookbits = huffcode[p] << (HUFF_LOOKAHEAD-l);
+      for (ctr = 1 << (HUFF_LOOKAHEAD-l); ctr > 0; ctr--) {
+	dtbl->look_nbits[lookbits] = l;
+	dtbl->look_sym[lookbits] = htbl->huffval[p];
+	lookbits++;
+      }
+    }
+  }
+
+  /* Validate symbols as being reasonable.
+   * For AC tables, we make no check, but accept all byte values 0..255.
+   * For DC tables, we require the symbols to be in range 0..15.
+   * (Tighter bounds could be applied depending on the data depth and mode,
+   * but this is sufficient to ensure safe decoding.)
+   */
+  if (isDC) {
+    for (i = 0; i < numsymbols; i++) {
+      int sym = htbl->huffval[i];
+      if (sym < 0 || sym > 15)
+	ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+    }
+  }
+}
+
+
+/*
+ * Out-of-line code for bit fetching (shared with jdphuff.c).
+ * See jdhuff.h for info about usage.
+ * Note: current values of get_buffer and bits_left are passed as parameters,
+ * but are returned in the corresponding fields of the state struct.
+ *
+ * On most machines MIN_GET_BITS should be 25 to allow the full 32-bit width
+ * of get_buffer to be used.  (On machines with wider words, an even larger
+ * buffer could be used.)  However, on some machines 32-bit shifts are
+ * quite slow and take time proportional to the number of places shifted.
+ * (This is true with most PC compilers, for instance.)  In this case it may
+ * be a win to set MIN_GET_BITS to the minimum value of 15.  This reduces the
+ * average shift distance at the cost of more calls to jpeg_fill_bit_buffer.
+ */
+
+#ifdef SLOW_SHIFT_32
+#define MIN_GET_BITS  15	/* minimum allowable value */
+#else
+#define MIN_GET_BITS  (BIT_BUF_SIZE-7)
+#endif
+
+
+GLOBAL(wxjpeg_boolean)
+jpeg_fill_bit_buffer (bitread_working_state * state,
+		      register bit_buf_type get_buffer, register int bits_left,
+		      int nbits)
+/* Load up the bit buffer to a depth of at least nbits */
+{
+  /* Copy heavily used state fields into locals (hopefully registers) */
+  register const JOCTET * next_input_byte = state->next_input_byte;
+  register size_t bytes_in_buffer = state->bytes_in_buffer;
+  j_decompress_ptr cinfo = state->cinfo;
+
+  /* Attempt to load at least MIN_GET_BITS bits into get_buffer. */
+  /* (It is assumed that no request will be for more than that many bits.) */
+  /* We fail to do so only if we hit a marker or are forced to suspend. */
+
+  if (cinfo->unread_marker == 0) {	/* cannot advance past a marker */
+    while (bits_left < MIN_GET_BITS) {
+      register int c;
+
+      /* Attempt to read a byte */
+      if (bytes_in_buffer == 0) {
+	if (! (*cinfo->src->fill_input_buffer) (cinfo))
+	  return FALSE;
+	next_input_byte = cinfo->src->next_input_byte;
+	bytes_in_buffer = cinfo->src->bytes_in_buffer;
+      }
+      bytes_in_buffer--;
+      c = GETJOCTET(*next_input_byte++);
+
+      /* If it's 0xFF, check and discard stuffed zero byte */
+      if (c == 0xFF) {
+	/* Loop here to discard any padding FF's on terminating marker,
+	 * so that we can save a valid unread_marker value.  NOTE: we will
+	 * accept multiple FF's followed by a 0 as meaning a single FF data
+	 * byte.  This data pattern is not valid according to the standard.
+	 */
+	do {
+	  if (bytes_in_buffer == 0) {
+	    if (! (*cinfo->src->fill_input_buffer) (cinfo))
+	      return FALSE;
+	    next_input_byte = cinfo->src->next_input_byte;
+	    bytes_in_buffer = cinfo->src->bytes_in_buffer;
+	  }
+	  bytes_in_buffer--;
+	  c = GETJOCTET(*next_input_byte++);
+	} while (c == 0xFF);
+
+	if (c == 0) {
+	  /* Found FF/00, which represents an FF data byte */
+	  c = 0xFF;
+	} else {
+	  /* Oops, it's actually a marker indicating end of compressed data.
+	   * Save the marker code for later use.
+	   * Fine point: it might appear that we should save the marker into
+	   * bitread working state, not straight into permanent state.  But
+	   * once we have hit a marker, we cannot need to suspend within the
+	   * current MCU, because we will read no more bytes from the data
+	   * source.  So it is OK to update permanent state right away.
+	   */
+	  cinfo->unread_marker = c;
+	  /* See if we need to insert some fake zero bits. */
+	  goto no_more_bytes;
+	}
+      }
+
+      /* OK, load c into get_buffer */
+      get_buffer = (get_buffer << 8) | c;
+      bits_left += 8;
+    } /* end while */
+  } else {
+  no_more_bytes:
+    /* We get here if we've read the marker that terminates the compressed
+     * data segment.  There should be enough bits in the buffer register
+     * to satisfy the request; if so, no problem.
+     */
+    if (nbits > bits_left) {
+      /* Uh-oh.  Report corrupted data to user and stuff zeroes into
+       * the data stream, so that we can produce some kind of image.
+       * We use a nonvolatile flag to ensure that only one warning message
+       * appears per data segment.
+       */
+      if (! cinfo->entropy->insufficient_data) {
+	WARNMS(cinfo, JWRN_HIT_MARKER);
+	cinfo->entropy->insufficient_data = TRUE;
+      }
+      /* Fill the buffer with zero bits */
+      get_buffer <<= MIN_GET_BITS - bits_left;
+      bits_left = MIN_GET_BITS;
+    }
+  }
+
+  /* Unload the local registers */
+  state->next_input_byte = next_input_byte;
+  state->bytes_in_buffer = bytes_in_buffer;
+  state->get_buffer = get_buffer;
+  state->bits_left = bits_left;
+
+  return TRUE;
+}
+
+
+/*
+ * Out-of-line code for Huffman code decoding.
+ * See jdhuff.h for info about usage.
+ */
+
+GLOBAL(int)
+jpeg_huff_decode (bitread_working_state * state,
+		  register bit_buf_type get_buffer, register int bits_left,
+		  d_derived_tbl * htbl, int min_bits)
+{
+  register int l = min_bits;
+  register JPEG_INT32 code;
+
+  /* HUFF_DECODE has determined that the code is at least min_bits */
+  /* bits long, so fetch that many bits in one swoop. */
+
+  CHECK_BIT_BUFFER(*state, l, return -1);
+  code = GET_BITS(l);
+
+  /* Collect the rest of the Huffman code one bit at a time. */
+  /* This is per Figure F.16 in the JPEG spec. */
+
+  while (code > htbl->maxcode[l]) {
+    code <<= 1;
+    CHECK_BIT_BUFFER(*state, 1, return -1);
+    code |= GET_BITS(1);
+    l++;
+  }
+
+  /* Unload the local registers */
+  state->get_buffer = get_buffer;
+  state->bits_left = bits_left;
+
+  /* With garbage input we may reach the sentinel value l = 17. */
+
+  if (l > 16) {
+    WARNMS(state->cinfo, JWRN_HUFF_BAD_CODE);
+    return 0;			/* fake a zero as the safest result */
+  }
+
+  return htbl->pub->huffval[ (int) (code + htbl->valoffset[l]) ];
+}
+
+
+/*
+ * Figure F.12: extend sign bit.
+ * On some machines, a shift and add will be faster than a table lookup.
+ */
+
+#ifdef AVOID_TABLES
+
+#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
+
+#else
+
+#define HUFF_EXTEND(x,s)  ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
+
+static const int extend_test[16] =   /* entry n is 2**(n-1) */
+  { 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
+    0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+
+static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
+  { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
+    ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
+    ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
+    ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+
+#endif /* AVOID_TABLES */
+
+
+/*
+ * Check for a restart marker & resynchronize decoder.
+ * Returns FALSE if must suspend.
+ */
+
+LOCAL(wxjpeg_boolean)
+process_restart (j_decompress_ptr cinfo)
+{
+  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
+  int ci;
+
+  /* Throw away any unused bits remaining in bit buffer; */
+  /* include any full bytes in next_marker's count of discarded bytes */
+  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
+  entropy->bitstate.bits_left = 0;
+
+  /* Advance past the RSTn marker */
+  if (! (*cinfo->marker->read_restart_marker) (cinfo))
+    return FALSE;
+
+  /* Re-initialize DC predictions to 0 */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++)
+    entropy->saved.last_dc_val[ci] = 0;
+
+  /* Reset restart counter */
+  entropy->restarts_to_go = cinfo->restart_interval;
+
+  /* Reset out-of-data flag, unless read_restart_marker left us smack up
+   * against a marker.  In that case we will end up treating the next data
+   * segment as empty, and we can avoid producing bogus output pixels by
+   * leaving the flag set.
+   */
+  if (cinfo->unread_marker == 0)
+    entropy->pub.insufficient_data = FALSE;
+
+  return TRUE;
+}
+
+
+/*
+ * Decode and return one MCU's worth of Huffman-compressed coefficients.
+ * The coefficients are reordered from zigzag order into natural array order,
+ * but are not dequantized.
+ *
+ * The i'th block of the MCU is stored into the block pointed to by
+ * MCU_data[i].  WE ASSUME THIS AREA HAS BEEN ZEROED BY THE CALLER.
+ * (Wholesale zeroing is usually a little faster than retail...)
+ *
+ * Returns FALSE if data source requested suspension.  In that case no
+ * changes have been made to permanent state.  (Exception: some output
+ * coefficients may already have been assigned.  This is harmless for
+ * this module, since we'll just re-assign them on the next call.)
+ */
+
+METHODDEF(wxjpeg_boolean)
+decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{
+  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
+  int blkn;
+  BITREAD_STATE_VARS;
+  savable_state state;
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* If we've run out of data, just leave the MCU set to zeroes.
+   * This way, we return uniform gray for the remainder of the segment.
+   */
+  if (! entropy->pub.insufficient_data) {
+
+    /* Load up working state */
+    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+    ASSIGN_STATE(state, entropy->saved);
+
+    /* Outer loop handles each block in the MCU */
+
+    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
+      JBLOCKROW block = MCU_data[blkn];
+      d_derived_tbl * dctbl = entropy->dc_cur_tbls[blkn];
+      d_derived_tbl * actbl = entropy->ac_cur_tbls[blkn];
+      register int s, k, r;
+
+      /* Decode a single block's worth of coefficients */
+
+      /* Section F.2.2.1: decode the DC coefficient difference */
+      HUFF_DECODE(s, br_state, dctbl, return FALSE, label1);
+      if (s) {
+	CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	r = GET_BITS(s);
+	s = HUFF_EXTEND(r, s);
+      }
+
+      if (entropy->dc_needed[blkn]) {
+	/* Convert DC difference to actual value, update last_dc_val */
+	int ci = cinfo->MCU_membership[blkn];
+	s += state.last_dc_val[ci];
+	state.last_dc_val[ci] = s;
+	/* Output the DC coefficient (assumes jpeg_natural_order[0] = 0) */
+	(*block)[0] = (JCOEF) s;
+      }
+
+      if (entropy->ac_needed[blkn]) {
+
+	/* Section F.2.2.2: decode the AC coefficients */
+	/* Since zeroes are skipped, output area must be cleared beforehand */
+	for (k = 1; k < DCTSIZE2; k++) {
+	  HUFF_DECODE(s, br_state, actbl, return FALSE, label2);
+      
+	  r = s >> 4;
+	  s &= 15;
+      
+	  if (s) {
+	    k += r;
+	    CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	    r = GET_BITS(s);
+	    s = HUFF_EXTEND(r, s);
+	    /* Output coefficient in natural (dezigzagged) order.
+	     * Note: the extra entries in jpeg_natural_order[] will save us
+	     * if k >= DCTSIZE2, which could happen if the data is corrupted.
+	     */
+	    (*block)[jpeg_natural_order[k]] = (JCOEF) s;
+	  } else {
+	    if (r != 15)
+	      break;
+	    k += 15;
+	  }
+	}
+
+      } else {
+
+	/* Section F.2.2.2: decode the AC coefficients */
+	/* In this path we just discard the values */
+	for (k = 1; k < DCTSIZE2; k++) {
+	  HUFF_DECODE(s, br_state, actbl, return FALSE, label3);
+      
+	  r = s >> 4;
+	  s &= 15;
+      
+	  if (s) {
+	    k += r;
+	    CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	    DROP_BITS(s);
+	  } else {
+	    if (r != 15)
+	      break;
+	    k += 15;
+	  }
+	}
+
+      }
+    }
+
+    /* Completed MCU, so update state */
+    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+    ASSIGN_STATE(entropy->saved, state);
+  }
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+}
+
+
+/*
+ * Module initialization routine for Huffman entropy decoding.
+ */
+
+GLOBAL(void)
+jinit_huff_decoder (j_decompress_ptr cinfo)
+{
+  huff_entropy_ptr entropy;
+  int i;
+
+  entropy = (huff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(huff_entropy_decoder));
+  cinfo->entropy = (struct jpeg_entropy_decoder *) entropy;
+  entropy->pub.start_pass = start_pass_huff_decoder;
+  entropy->pub.decode_mcu = decode_mcu;
+
+  /* Mark tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jdhuff.h b/Source/3rd Party/wx/src/jpeg/jdhuff.h
index bb60d760f..9e9e87dae 100644
--- a/Source/3rd Party/wx/src/jpeg/jdhuff.h	
+++ b/Source/3rd Party/wx/src/jpeg/jdhuff.h	
@@ -1,201 +1,201 @@
-/*
- * jdhuff.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains declarations for Huffman entropy decoding routines
- * that are shared between the sequential decoder (jdhuff.c) and the
- * progressive decoder (jdphuff.c).  No other modules need to see these.
- */
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_make_d_derived_tbl	jMkDDerived
-#define jpeg_fill_bit_buffer	jFilBitBuf
-#define jpeg_huff_decode	jHufDecode
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Derived data constructed for each Huffman table */
-
-#define HUFF_LOOKAHEAD	8	/* # of bits of lookahead */
-
-typedef struct {
-  /* Basic tables: (element [0] of each array is unused) */
-  JPEG_INT32 maxcode[18];		/* largest code of length k (-1 if none) */
-  /* (maxcode[17] is a sentinel to ensure jpeg_huff_decode terminates) */
-  JPEG_INT32 valoffset[17];		/* huffval[] offset for codes of length k */
-  /* valoffset[k] = huffval[] index of 1st symbol of code length k, less
-   * the smallest code of length k; so given a code of length k, the
-   * corresponding symbol is huffval[code + valoffset[k]]
-   */
-
-  /* Link to public Huffman table (needed only in jpeg_huff_decode) */
-  JHUFF_TBL *pub;
-
-  /* Lookahead tables: indexed by the next HUFF_LOOKAHEAD bits of
-   * the input data stream.  If the next Huffman code is no more
-   * than HUFF_LOOKAHEAD bits long, we can obtain its length and
-   * the corresponding symbol directly from these tables.
-   */
-  int look_nbits[1<<HUFF_LOOKAHEAD]; /* # bits, or 0 if too long */
-  UINT8 look_sym[1<<HUFF_LOOKAHEAD]; /* symbol, or unused */
-} d_derived_tbl;
-
-/* Expand a Huffman table definition into the derived format */
-EXTERN(void) jpeg_make_d_derived_tbl
-	JPP((j_decompress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
-	     d_derived_tbl ** pdtbl));
-
-
-/*
- * Fetching the next N bits from the input stream is a time-critical operation
- * for the Huffman decoders.  We implement it with a combination of inline
- * macros and out-of-line subroutines.  Note that N (the number of bits
- * demanded at one time) never exceeds 15 for JPEG use.
- *
- * We read source bytes into get_buffer and dole out bits as needed.
- * If get_buffer already contains enough bits, they are fetched in-line
- * by the macros CHECK_BIT_BUFFER and GET_BITS.  When there aren't enough
- * bits, jpeg_fill_bit_buffer is called; it will attempt to fill get_buffer
- * as full as possible (not just to the number of bits needed; this
- * prefetching reduces the overhead cost of calling jpeg_fill_bit_buffer).
- * Note that jpeg_fill_bit_buffer may return FALSE to indicate suspension.
- * On TRUE return, jpeg_fill_bit_buffer guarantees that get_buffer contains
- * at least the requested number of bits --- dummy zeroes are inserted if
- * necessary.
- */
-
-typedef JPEG_INT32 bit_buf_type;	/* type of bit-extraction buffer */
-#define BIT_BUF_SIZE  32	/* size of buffer in bits */
-
-/* If long is > 32 bits on your machine, and shifting/masking longs is
- * reasonably fast, making bit_buf_type be long and setting BIT_BUF_SIZE
- * appropriately should be a win.  Unfortunately we can't define the size
- * with something like  #define BIT_BUF_SIZE (sizeof(bit_buf_type)*8)
- * because not all machines measure sizeof in 8-bit bytes.
- */
-
-typedef struct {		/* Bitreading state saved across MCUs */
-  bit_buf_type get_buffer;	/* current bit-extraction buffer */
-  int bits_left;		/* # of unused bits in it */
-} bitread_perm_state;
-
-typedef struct {		/* Bitreading working state within an MCU */
-  /* Current data source location */
-  /* We need a copy, rather than munging the original, in case of suspension */
-  const JOCTET * next_input_byte; /* => next byte to read from source */
-  size_t bytes_in_buffer;	/* # of bytes remaining in source buffer */
-  /* Bit input buffer --- note these values are kept in register variables,
-   * not in this struct, inside the inner loops.
-   */
-  bit_buf_type get_buffer;	/* current bit-extraction buffer */
-  int bits_left;		/* # of unused bits in it */
-  /* Pointer needed by jpeg_fill_bit_buffer. */
-  j_decompress_ptr cinfo;	/* back link to decompress master record */
-} bitread_working_state;
-
-/* Macros to declare and load/save bitread local variables. */
-#define BITREAD_STATE_VARS  \
-	register bit_buf_type get_buffer;  \
-	register int bits_left;  \
-	bitread_working_state br_state
-
-#define BITREAD_LOAD_STATE(cinfop,permstate)  \
-	br_state.cinfo = cinfop; \
-	br_state.next_input_byte = cinfop->src->next_input_byte; \
-	br_state.bytes_in_buffer = cinfop->src->bytes_in_buffer; \
-	get_buffer = permstate.get_buffer; \
-	bits_left = permstate.bits_left;
-
-#define BITREAD_SAVE_STATE(cinfop,permstate)  \
-	cinfop->src->next_input_byte = br_state.next_input_byte; \
-	cinfop->src->bytes_in_buffer = br_state.bytes_in_buffer; \
-	permstate.get_buffer = get_buffer; \
-	permstate.bits_left = bits_left
-
-/*
- * These macros provide the in-line portion of bit fetching.
- * Use CHECK_BIT_BUFFER to ensure there are N bits in get_buffer
- * before using GET_BITS, PEEK_BITS, or DROP_BITS.
- * The variables get_buffer and bits_left are assumed to be locals,
- * but the state struct might not be (jpeg_huff_decode needs this).
- *	CHECK_BIT_BUFFER(state,n,action);
- *		Ensure there are N bits in get_buffer; if suspend, take action.
- *      val = GET_BITS(n);
- *		Fetch next N bits.
- *      val = PEEK_BITS(n);
- *		Fetch next N bits without removing them from the buffer.
- *	DROP_BITS(n);
- *		Discard next N bits.
- * The value N should be a simple variable, not an expression, because it
- * is evaluated multiple times.
- */
-
-#define CHECK_BIT_BUFFER(state,nbits,action) \
-	{ if (bits_left < (nbits)) {  \
-	    if (! jpeg_fill_bit_buffer(&(state),get_buffer,bits_left,nbits))  \
-	      { action; }  \
-	    get_buffer = (state).get_buffer; bits_left = (state).bits_left; } }
-
-#define GET_BITS(nbits) \
-	(((int) (get_buffer >> (bits_left -= (nbits)))) & ((1<<(nbits))-1))
-
-#define PEEK_BITS(nbits) \
-	(((int) (get_buffer >> (bits_left -  (nbits)))) & ((1<<(nbits))-1))
-
-#define DROP_BITS(nbits) \
-	(bits_left -= (nbits))
-
-/* Load up the bit buffer to a depth of at least nbits */
-EXTERN(wxjpeg_boolean) jpeg_fill_bit_buffer
-	JPP((bitread_working_state * state, register bit_buf_type get_buffer,
-	     register int bits_left, int nbits));
-
-
-/*
- * Code for extracting next Huffman-coded symbol from input bit stream.
- * Again, this is time-critical and we make the main paths be macros.
- *
- * We use a lookahead table to process codes of up to HUFF_LOOKAHEAD bits
- * without looping.  Usually, more than 95% of the Huffman codes will be 8
- * or fewer bits long.  The few overlength codes are handled with a loop,
- * which need not be inline code.
- *
- * Notes about the HUFF_DECODE macro:
- * 1. Near the end of the data segment, we may fail to get enough bits
- *    for a lookahead.  In that case, we do it the hard way.
- * 2. If the lookahead table contains no entry, the next code must be
- *    more than HUFF_LOOKAHEAD bits long.
- * 3. jpeg_huff_decode returns -1 if forced to suspend.
- */
-
-#define HUFF_DECODE(result,state,htbl,failaction,slowlabel) \
-{ register int nb, look; \
-  if (bits_left < HUFF_LOOKAHEAD) { \
-    if (! jpeg_fill_bit_buffer(&state,get_buffer,bits_left, 0)) {failaction;} \
-    get_buffer = state.get_buffer; bits_left = state.bits_left; \
-    if (bits_left < HUFF_LOOKAHEAD) { \
-      nb = 1; goto slowlabel; \
-    } \
-  } \
-  look = PEEK_BITS(HUFF_LOOKAHEAD); \
-  if ((nb = htbl->look_nbits[look]) != 0) { \
-    DROP_BITS(nb); \
-    result = htbl->look_sym[look]; \
-  } else { \
-    nb = HUFF_LOOKAHEAD+1; \
-slowlabel: \
-    if ((result=jpeg_huff_decode(&state,get_buffer,bits_left,htbl,nb)) < 0) \
-	{ failaction; } \
-    get_buffer = state.get_buffer; bits_left = state.bits_left; \
-  } \
-}
-
-/* Out-of-line case for Huffman code fetching */
-EXTERN(int) jpeg_huff_decode
-	JPP((bitread_working_state * state, register bit_buf_type get_buffer,
-	     register int bits_left, d_derived_tbl * htbl, int min_bits));
+/*
+ * jdhuff.h
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains declarations for Huffman entropy decoding routines
+ * that are shared between the sequential decoder (jdhuff.c) and the
+ * progressive decoder (jdphuff.c).  No other modules need to see these.
+ */
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_make_d_derived_tbl	jMkDDerived
+#define jpeg_fill_bit_buffer	jFilBitBuf
+#define jpeg_huff_decode	jHufDecode
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/* Derived data constructed for each Huffman table */
+
+#define HUFF_LOOKAHEAD	8	/* # of bits of lookahead */
+
+typedef struct {
+  /* Basic tables: (element [0] of each array is unused) */
+  JPEG_INT32 maxcode[18];		/* largest code of length k (-1 if none) */
+  /* (maxcode[17] is a sentinel to ensure jpeg_huff_decode terminates) */
+  JPEG_INT32 valoffset[17];		/* huffval[] offset for codes of length k */
+  /* valoffset[k] = huffval[] index of 1st symbol of code length k, less
+   * the smallest code of length k; so given a code of length k, the
+   * corresponding symbol is huffval[code + valoffset[k]]
+   */
+
+  /* Link to public Huffman table (needed only in jpeg_huff_decode) */
+  JHUFF_TBL *pub;
+
+  /* Lookahead tables: indexed by the next HUFF_LOOKAHEAD bits of
+   * the input data stream.  If the next Huffman code is no more
+   * than HUFF_LOOKAHEAD bits long, we can obtain its length and
+   * the corresponding symbol directly from these tables.
+   */
+  int look_nbits[1<<HUFF_LOOKAHEAD]; /* # bits, or 0 if too long */
+  UINT8 look_sym[1<<HUFF_LOOKAHEAD]; /* symbol, or unused */
+} d_derived_tbl;
+
+/* Expand a Huffman table definition into the derived format */
+EXTERN(void) jpeg_make_d_derived_tbl
+	JPP((j_decompress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
+	     d_derived_tbl ** pdtbl));
+
+
+/*
+ * Fetching the next N bits from the input stream is a time-critical operation
+ * for the Huffman decoders.  We implement it with a combination of inline
+ * macros and out-of-line subroutines.  Note that N (the number of bits
+ * demanded at one time) never exceeds 15 for JPEG use.
+ *
+ * We read source bytes into get_buffer and dole out bits as needed.
+ * If get_buffer already contains enough bits, they are fetched in-line
+ * by the macros CHECK_BIT_BUFFER and GET_BITS.  When there aren't enough
+ * bits, jpeg_fill_bit_buffer is called; it will attempt to fill get_buffer
+ * as full as possible (not just to the number of bits needed; this
+ * prefetching reduces the overhead cost of calling jpeg_fill_bit_buffer).
+ * Note that jpeg_fill_bit_buffer may return FALSE to indicate suspension.
+ * On TRUE return, jpeg_fill_bit_buffer guarantees that get_buffer contains
+ * at least the requested number of bits --- dummy zeroes are inserted if
+ * necessary.
+ */
+
+typedef JPEG_INT32 bit_buf_type;	/* type of bit-extraction buffer */
+#define BIT_BUF_SIZE  32	/* size of buffer in bits */
+
+/* If long is > 32 bits on your machine, and shifting/masking longs is
+ * reasonably fast, making bit_buf_type be long and setting BIT_BUF_SIZE
+ * appropriately should be a win.  Unfortunately we can't define the size
+ * with something like  #define BIT_BUF_SIZE (sizeof(bit_buf_type)*8)
+ * because not all machines measure sizeof in 8-bit bytes.
+ */
+
+typedef struct {		/* Bitreading state saved across MCUs */
+  bit_buf_type get_buffer;	/* current bit-extraction buffer */
+  int bits_left;		/* # of unused bits in it */
+} bitread_perm_state;
+
+typedef struct {		/* Bitreading working state within an MCU */
+  /* Current data source location */
+  /* We need a copy, rather than munging the original, in case of suspension */
+  const JOCTET * next_input_byte; /* => next byte to read from source */
+  size_t bytes_in_buffer;	/* # of bytes remaining in source buffer */
+  /* Bit input buffer --- note these values are kept in register variables,
+   * not in this struct, inside the inner loops.
+   */
+  bit_buf_type get_buffer;	/* current bit-extraction buffer */
+  int bits_left;		/* # of unused bits in it */
+  /* Pointer needed by jpeg_fill_bit_buffer. */
+  j_decompress_ptr cinfo;	/* back link to decompress master record */
+} bitread_working_state;
+
+/* Macros to declare and load/save bitread local variables. */
+#define BITREAD_STATE_VARS  \
+	register bit_buf_type get_buffer;  \
+	register int bits_left;  \
+	bitread_working_state br_state
+
+#define BITREAD_LOAD_STATE(cinfop,permstate)  \
+	br_state.cinfo = cinfop; \
+	br_state.next_input_byte = cinfop->src->next_input_byte; \
+	br_state.bytes_in_buffer = cinfop->src->bytes_in_buffer; \
+	get_buffer = permstate.get_buffer; \
+	bits_left = permstate.bits_left;
+
+#define BITREAD_SAVE_STATE(cinfop,permstate)  \
+	cinfop->src->next_input_byte = br_state.next_input_byte; \
+	cinfop->src->bytes_in_buffer = br_state.bytes_in_buffer; \
+	permstate.get_buffer = get_buffer; \
+	permstate.bits_left = bits_left
+
+/*
+ * These macros provide the in-line portion of bit fetching.
+ * Use CHECK_BIT_BUFFER to ensure there are N bits in get_buffer
+ * before using GET_BITS, PEEK_BITS, or DROP_BITS.
+ * The variables get_buffer and bits_left are assumed to be locals,
+ * but the state struct might not be (jpeg_huff_decode needs this).
+ *	CHECK_BIT_BUFFER(state,n,action);
+ *		Ensure there are N bits in get_buffer; if suspend, take action.
+ *      val = GET_BITS(n);
+ *		Fetch next N bits.
+ *      val = PEEK_BITS(n);
+ *		Fetch next N bits without removing them from the buffer.
+ *	DROP_BITS(n);
+ *		Discard next N bits.
+ * The value N should be a simple variable, not an expression, because it
+ * is evaluated multiple times.
+ */
+
+#define CHECK_BIT_BUFFER(state,nbits,action) \
+	{ if (bits_left < (nbits)) {  \
+	    if (! jpeg_fill_bit_buffer(&(state),get_buffer,bits_left,nbits))  \
+	      { action; }  \
+	    get_buffer = (state).get_buffer; bits_left = (state).bits_left; } }
+
+#define GET_BITS(nbits) \
+	(((int) (get_buffer >> (bits_left -= (nbits)))) & ((1<<(nbits))-1))
+
+#define PEEK_BITS(nbits) \
+	(((int) (get_buffer >> (bits_left -  (nbits)))) & ((1<<(nbits))-1))
+
+#define DROP_BITS(nbits) \
+	(bits_left -= (nbits))
+
+/* Load up the bit buffer to a depth of at least nbits */
+EXTERN(wxjpeg_boolean) jpeg_fill_bit_buffer
+	JPP((bitread_working_state * state, register bit_buf_type get_buffer,
+	     register int bits_left, int nbits));
+
+
+/*
+ * Code for extracting next Huffman-coded symbol from input bit stream.
+ * Again, this is time-critical and we make the main paths be macros.
+ *
+ * We use a lookahead table to process codes of up to HUFF_LOOKAHEAD bits
+ * without looping.  Usually, more than 95% of the Huffman codes will be 8
+ * or fewer bits long.  The few overlength codes are handled with a loop,
+ * which need not be inline code.
+ *
+ * Notes about the HUFF_DECODE macro:
+ * 1. Near the end of the data segment, we may fail to get enough bits
+ *    for a lookahead.  In that case, we do it the hard way.
+ * 2. If the lookahead table contains no entry, the next code must be
+ *    more than HUFF_LOOKAHEAD bits long.
+ * 3. jpeg_huff_decode returns -1 if forced to suspend.
+ */
+
+#define HUFF_DECODE(result,state,htbl,failaction,slowlabel) \
+{ register int nb, look; \
+  if (bits_left < HUFF_LOOKAHEAD) { \
+    if (! jpeg_fill_bit_buffer(&state,get_buffer,bits_left, 0)) {failaction;} \
+    get_buffer = state.get_buffer; bits_left = state.bits_left; \
+    if (bits_left < HUFF_LOOKAHEAD) { \
+      nb = 1; goto slowlabel; \
+    } \
+  } \
+  look = PEEK_BITS(HUFF_LOOKAHEAD); \
+  if ((nb = htbl->look_nbits[look]) != 0) { \
+    DROP_BITS(nb); \
+    result = htbl->look_sym[look]; \
+  } else { \
+    nb = HUFF_LOOKAHEAD+1; \
+slowlabel: \
+    if ((result=jpeg_huff_decode(&state,get_buffer,bits_left,htbl,nb)) < 0) \
+	{ failaction; } \
+    get_buffer = state.get_buffer; bits_left = state.bits_left; \
+  } \
+}
+
+/* Out-of-line case for Huffman code fetching */
+EXTERN(int) jpeg_huff_decode
+	JPP((bitread_working_state * state, register bit_buf_type get_buffer,
+	     register int bits_left, d_derived_tbl * htbl, int min_bits));
diff --git a/Source/3rd Party/wx/src/jpeg/jdinput.c b/Source/3rd Party/wx/src/jpeg/jdinput.c
index 1f8bf3cb0..c89b75de5 100644
--- a/Source/3rd Party/wx/src/jpeg/jdinput.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdinput.c	
@@ -1,385 +1,385 @@
-/*
- * jdinput.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains input control logic for the JPEG decompressor.
- * These routines are concerned with controlling the decompressor's input
- * processing (marker reading and coefficient decoding).  The actual input
- * reading is done in jdmarker.c, jdhuff.c, and jdphuff.c.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-/* Private state */
-
-typedef struct {
-  struct jpeg_input_controller pub; /* public fields */
-
-  wxjpeg_boolean inheaders;		/* TRUE until first SOS is reached */
-} my_input_controller;
-
-typedef my_input_controller * my_inputctl_ptr;
-
-
-/* Forward declarations */
-METHODDEF(int) consume_markers JPP((j_decompress_ptr cinfo));
-
-
-/*
- * Routines to calculate various quantities related to the size of the image.
- */
-
-LOCAL(void)
-initial_setup (j_decompress_ptr cinfo)
-/* Called once, when first SOS marker is reached */
-{
-  int ci;
-  jpeg_component_info *compptr;
-
-  /* Make sure image isn't bigger than I can handle */
-  if ((long) cinfo->image_height > (long) JPEG_MAX_DIMENSION ||
-      (long) cinfo->image_width > (long) JPEG_MAX_DIMENSION)
-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);
-
-  /* For now, precision must match compiled-in value... */
-  if (cinfo->data_precision != BITS_IN_JSAMPLE)
-    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
-
-  /* Check that number of components won't exceed internal array sizes */
-  if (cinfo->num_components > MAX_COMPONENTS)
-    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
-	     MAX_COMPONENTS);
-
-  /* Compute maximum sampling factors; check factor validity */
-  cinfo->max_h_samp_factor = 1;
-  cinfo->max_v_samp_factor = 1;
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||
-	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)
-      ERREXIT(cinfo, JERR_BAD_SAMPLING);
-    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,
-				   compptr->h_samp_factor);
-    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,
-				   compptr->v_samp_factor);
-  }
-
-  /* We initialize DCT_scaled_size and min_DCT_scaled_size to DCTSIZE.
-   * In the full decompressor, this will be overridden by jdmaster.c;
-   * but in the transcoder, jdmaster.c is not used, so we must do it here.
-   */
-  cinfo->min_DCT_scaled_size = DCTSIZE;
-
-  /* Compute dimensions of components */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    compptr->DCT_scaled_size = DCTSIZE;
-    /* Size in DCT blocks */
-    compptr->width_in_blocks = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
-		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
-    compptr->height_in_blocks = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
-		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
-    /* downsampled_width and downsampled_height will also be overridden by
-     * jdmaster.c if we are doing full decompression.  The transcoder library
-     * doesn't use these values, but the calling application might.
-     */
-    /* Size in samples */
-    compptr->downsampled_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
-		    (long) cinfo->max_h_samp_factor);
-    compptr->downsampled_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
-		    (long) cinfo->max_v_samp_factor);
-    /* Mark component needed, until color conversion says otherwise */
-    compptr->component_needed = TRUE;
-    /* Mark no quantization table yet saved for component */
-    compptr->quant_table = NULL;
-  }
-
-  /* Compute number of fully interleaved MCU rows. */
-  cinfo->total_iMCU_rows = (JDIMENSION)
-    jdiv_round_up((long) cinfo->image_height,
-		  (long) (cinfo->max_v_samp_factor*DCTSIZE));
-
-  /* Decide whether file contains multiple scans */
-  if (cinfo->comps_in_scan < cinfo->num_components || cinfo->progressive_mode)
-    cinfo->inputctl->has_multiple_scans = TRUE;
-  else
-    cinfo->inputctl->has_multiple_scans = FALSE;
-}
-
-
-LOCAL(void)
-per_scan_setup (j_decompress_ptr cinfo)
-/* Do computations that are needed before processing a JPEG scan */
-/* cinfo->comps_in_scan and cinfo->cur_comp_info[] were set from SOS marker */
-{
-  int ci, mcublks, tmp;
-  jpeg_component_info *compptr;
-
-  if (cinfo->comps_in_scan == 1) {
-
-    /* Noninterleaved (single-component) scan */
-    compptr = cinfo->cur_comp_info[0];
-
-    /* Overall image size in MCUs */
-    cinfo->MCUs_per_row = compptr->width_in_blocks;
-    cinfo->MCU_rows_in_scan = compptr->height_in_blocks;
-
-    /* For noninterleaved scan, always one block per MCU */
-    compptr->MCU_width = 1;
-    compptr->MCU_height = 1;
-    compptr->MCU_blocks = 1;
-    compptr->MCU_sample_width = compptr->DCT_scaled_size;
-    compptr->last_col_width = 1;
-    /* For noninterleaved scans, it is convenient to define last_row_height
-     * as the number of block rows present in the last iMCU row.
-     */
-    tmp = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-    if (tmp == 0) tmp = compptr->v_samp_factor;
-    compptr->last_row_height = tmp;
-
-    /* Prepare array describing MCU composition */
-    cinfo->blocks_in_MCU = 1;
-    cinfo->MCU_membership[0] = 0;
-
-  } else {
-
-    /* Interleaved (multi-component) scan */
-    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,
-	       MAX_COMPS_IN_SCAN);
-
-    /* Overall image size in MCUs */
-    cinfo->MCUs_per_row = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width,
-		    (long) (cinfo->max_h_samp_factor*DCTSIZE));
-    cinfo->MCU_rows_in_scan = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height,
-		    (long) (cinfo->max_v_samp_factor*DCTSIZE));
-
-    cinfo->blocks_in_MCU = 0;
-
-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-      compptr = cinfo->cur_comp_info[ci];
-      /* Sampling factors give # of blocks of component in each MCU */
-      compptr->MCU_width = compptr->h_samp_factor;
-      compptr->MCU_height = compptr->v_samp_factor;
-      compptr->MCU_blocks = compptr->MCU_width * compptr->MCU_height;
-      compptr->MCU_sample_width = compptr->MCU_width * compptr->DCT_scaled_size;
-      /* Figure number of non-dummy blocks in last MCU column & row */
-      tmp = (int) (compptr->width_in_blocks % compptr->MCU_width);
-      if (tmp == 0) tmp = compptr->MCU_width;
-      compptr->last_col_width = tmp;
-      tmp = (int) (compptr->height_in_blocks % compptr->MCU_height);
-      if (tmp == 0) tmp = compptr->MCU_height;
-      compptr->last_row_height = tmp;
-      /* Prepare array describing MCU composition */
-      mcublks = compptr->MCU_blocks;
-      if (cinfo->blocks_in_MCU + mcublks > D_MAX_BLOCKS_IN_MCU)
-	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);
-      while (mcublks-- > 0) {
-	cinfo->MCU_membership[cinfo->blocks_in_MCU++] = ci;
-      }
-    }
-
-  }
-}
-
-
-/*
- * Save away a copy of the Q-table referenced by each component present
- * in the current scan, unless already saved during a prior scan.
- *
- * In a multiple-scan JPEG file, the encoder could assign different components
- * the same Q-table slot number, but change table definitions between scans
- * so that each component uses a different Q-table.  (The IJG encoder is not
- * currently capable of doing this, but other encoders might.)  Since we want
- * to be able to dequantize all the components at the end of the file, this
- * means that we have to save away the table actually used for each component.
- * We do this by copying the table at the start of the first scan containing
- * the component.
- * The JPEG spec prohibits the encoder from changing the contents of a Q-table
- * slot between scans of a component using that slot.  If the encoder does so
- * anyway, this decoder will simply use the Q-table values that were current
- * at the start of the first scan for the component.
- *
- * The decompressor output side looks only at the saved quant tables,
- * not at the current Q-table slots.
- */
-
-LOCAL(void)
-latch_quant_tables (j_decompress_ptr cinfo)
-{
-  int ci, qtblno;
-  jpeg_component_info *compptr;
-  JQUANT_TBL * qtbl;
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    /* No work if we already saved Q-table for this component */
-    if (compptr->quant_table != NULL)
-      continue;
-    /* Make sure specified quantization table is present */
-    qtblno = compptr->quant_tbl_no;
-    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||
-	cinfo->quant_tbl_ptrs[qtblno] == NULL)
-      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);
-    /* OK, save away the quantization table */
-    qtbl = (JQUANT_TBL *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(JQUANT_TBL));
-    MEMCOPY(qtbl, cinfo->quant_tbl_ptrs[qtblno], SIZEOF(JQUANT_TBL));
-    compptr->quant_table = qtbl;
-  }
-}
-
-
-/*
- * Initialize the input modules to read a scan of compressed data.
- * The first call to this is done by jdmaster.c after initializing
- * the entire decompressor (during jpeg_start_decompress).
- * Subsequent calls come from consume_markers, below.
- */
-
-METHODDEF(void)
-start_input_pass (j_decompress_ptr cinfo)
-{
-  per_scan_setup(cinfo);
-  latch_quant_tables(cinfo);
-  (*cinfo->entropy->start_pass) (cinfo);
-#if defined(__VISAGECPP__)
-  (*cinfo->coef->start_input_pass2) (cinfo);
-#else
-  (*cinfo->coef->start_input_pass) (cinfo);
-#endif
-  cinfo->inputctl->consume_input = cinfo->coef->consume_data;
-}
-
-
-/*
- * Finish up after inputting a compressed-data scan.
- * This is called by the coefficient controller after it's read all
- * the expected data of the scan.
- */
-
-METHODDEF(void)
-finish_input_pass (j_decompress_ptr cinfo)
-{
-  cinfo->inputctl->consume_input = consume_markers;
-}
-
-
-/*
- * Read JPEG markers before, between, or after compressed-data scans.
- * Change state as necessary when a new scan is reached.
- * Return value is JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
- *
- * The consume_input method pointer points either here or to the
- * coefficient controller's consume_data routine, depending on whether
- * we are reading a compressed data segment or inter-segment markers.
- */
-
-METHODDEF(int)
-consume_markers (j_decompress_ptr cinfo)
-{
-  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;
-  int val;
-
-  if (inputctl->pub.eoi_reached) /* After hitting EOI, read no further */
-    return JPEG_REACHED_EOI;
-
-  val = (*cinfo->marker->read_markers) (cinfo);
-
-  switch (val) {
-  case JPEG_REACHED_SOS:	/* Found SOS */
-    if (inputctl->inheaders) {	/* 1st SOS */
-      initial_setup(cinfo);
-      inputctl->inheaders = FALSE;
-      /* Note: start_input_pass must be called by jdmaster.c
-       * before any more input can be consumed.  jdapimin.c is
-       * responsible for enforcing this sequencing.
-       */
-    } else {			/* 2nd or later SOS marker */
-      if (! inputctl->pub.has_multiple_scans)
-	ERREXIT(cinfo, JERR_EOI_EXPECTED); /* Oops, I wasn't expecting this! */
-      start_input_pass(cinfo);
-    }
-    break;
-  case JPEG_REACHED_EOI:	/* Found EOI */
-    inputctl->pub.eoi_reached = TRUE;
-    if (inputctl->inheaders) {	/* Tables-only datastream, apparently */
-      if (cinfo->marker->saw_SOF)
-	ERREXIT(cinfo, JERR_SOF_NO_SOS);
-    } else {
-      /* Prevent infinite loop in coef ctlr's decompress_data routine
-       * if user set output_scan_number larger than number of scans.
-       */
-      if (cinfo->output_scan_number > cinfo->input_scan_number)
-	cinfo->output_scan_number = cinfo->input_scan_number;
-    }
-    break;
-  case JPEG_SUSPENDED:
-    break;
-  }
-
-  return val;
-}
-
-
-/*
- * Reset state to begin a fresh datastream.
- */
-
-METHODDEF(void)
-reset_input_controller (j_decompress_ptr cinfo)
-{
-  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;
-
-  inputctl->pub.consume_input = consume_markers;
-  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */
-  inputctl->pub.eoi_reached = FALSE;
-  inputctl->inheaders = TRUE;
-  /* Reset other modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->marker->reset_marker_reader) (cinfo);
-  /* Reset progression state -- would be cleaner if entropy decoder did this */
-  cinfo->coef_bits = NULL;
-}
-
-
-/*
- * Initialize the input controller module.
- * This is called only once, when the decompression object is created.
- */
-
-GLOBAL(void)
-jinit_input_controller (j_decompress_ptr cinfo)
-{
-  my_inputctl_ptr inputctl;
-
-  /* Create subobject in permanent pool */
-  inputctl = (my_inputctl_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				SIZEOF(my_input_controller));
-  cinfo->inputctl = (struct jpeg_input_controller *) inputctl;
-  /* Initialize method pointers */
-  inputctl->pub.consume_input = consume_markers;
-  inputctl->pub.reset_input_controller = reset_input_controller;
-  inputctl->pub.start_input_pass = start_input_pass;
-  inputctl->pub.finish_input_pass = finish_input_pass;
-  /* Initialize state: can't use reset_input_controller since we don't
-   * want to try to reset other modules yet.
-   */
-  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */
-  inputctl->pub.eoi_reached = FALSE;
-  inputctl->inheaders = TRUE;
-}
-
+/*
+ * jdinput.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains input control logic for the JPEG decompressor.
+ * These routines are concerned with controlling the decompressor's input
+ * processing (marker reading and coefficient decoding).  The actual input
+ * reading is done in jdmarker.c, jdhuff.c, and jdphuff.c.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+/* Private state */
+
+typedef struct {
+  struct jpeg_input_controller pub; /* public fields */
+
+  wxjpeg_boolean inheaders;		/* TRUE until first SOS is reached */
+} my_input_controller;
+
+typedef my_input_controller * my_inputctl_ptr;
+
+
+/* Forward declarations */
+METHODDEF(int) consume_markers JPP((j_decompress_ptr cinfo));
+
+
+/*
+ * Routines to calculate various quantities related to the size of the image.
+ */
+
+LOCAL(void)
+initial_setup (j_decompress_ptr cinfo)
+/* Called once, when first SOS marker is reached */
+{
+  int ci;
+  jpeg_component_info *compptr;
+
+  /* Make sure image isn't bigger than I can handle */
+  if ((long) cinfo->image_height > (long) JPEG_MAX_DIMENSION ||
+      (long) cinfo->image_width > (long) JPEG_MAX_DIMENSION)
+    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);
+
+  /* For now, precision must match compiled-in value... */
+  if (cinfo->data_precision != BITS_IN_JSAMPLE)
+    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
+
+  /* Check that number of components won't exceed internal array sizes */
+  if (cinfo->num_components > MAX_COMPONENTS)
+    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
+	     MAX_COMPONENTS);
+
+  /* Compute maximum sampling factors; check factor validity */
+  cinfo->max_h_samp_factor = 1;
+  cinfo->max_v_samp_factor = 1;
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||
+	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)
+      ERREXIT(cinfo, JERR_BAD_SAMPLING);
+    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,
+				   compptr->h_samp_factor);
+    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,
+				   compptr->v_samp_factor);
+  }
+
+  /* We initialize DCT_scaled_size and min_DCT_scaled_size to DCTSIZE.
+   * In the full decompressor, this will be overridden by jdmaster.c;
+   * but in the transcoder, jdmaster.c is not used, so we must do it here.
+   */
+  cinfo->min_DCT_scaled_size = DCTSIZE;
+
+  /* Compute dimensions of components */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    compptr->DCT_scaled_size = DCTSIZE;
+    /* Size in DCT blocks */
+    compptr->width_in_blocks = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
+		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
+    compptr->height_in_blocks = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
+		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
+    /* downsampled_width and downsampled_height will also be overridden by
+     * jdmaster.c if we are doing full decompression.  The transcoder library
+     * doesn't use these values, but the calling application might.
+     */
+    /* Size in samples */
+    compptr->downsampled_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
+		    (long) cinfo->max_h_samp_factor);
+    compptr->downsampled_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
+		    (long) cinfo->max_v_samp_factor);
+    /* Mark component needed, until color conversion says otherwise */
+    compptr->component_needed = TRUE;
+    /* Mark no quantization table yet saved for component */
+    compptr->quant_table = NULL;
+  }
+
+  /* Compute number of fully interleaved MCU rows. */
+  cinfo->total_iMCU_rows = (JDIMENSION)
+    jdiv_round_up((long) cinfo->image_height,
+		  (long) (cinfo->max_v_samp_factor*DCTSIZE));
+
+  /* Decide whether file contains multiple scans */
+  if (cinfo->comps_in_scan < cinfo->num_components || cinfo->progressive_mode)
+    cinfo->inputctl->has_multiple_scans = TRUE;
+  else
+    cinfo->inputctl->has_multiple_scans = FALSE;
+}
+
+
+LOCAL(void)
+per_scan_setup (j_decompress_ptr cinfo)
+/* Do computations that are needed before processing a JPEG scan */
+/* cinfo->comps_in_scan and cinfo->cur_comp_info[] were set from SOS marker */
+{
+  int ci, mcublks, tmp;
+  jpeg_component_info *compptr;
+
+  if (cinfo->comps_in_scan == 1) {
+
+    /* Noninterleaved (single-component) scan */
+    compptr = cinfo->cur_comp_info[0];
+
+    /* Overall image size in MCUs */
+    cinfo->MCUs_per_row = compptr->width_in_blocks;
+    cinfo->MCU_rows_in_scan = compptr->height_in_blocks;
+
+    /* For noninterleaved scan, always one block per MCU */
+    compptr->MCU_width = 1;
+    compptr->MCU_height = 1;
+    compptr->MCU_blocks = 1;
+    compptr->MCU_sample_width = compptr->DCT_scaled_size;
+    compptr->last_col_width = 1;
+    /* For noninterleaved scans, it is convenient to define last_row_height
+     * as the number of block rows present in the last iMCU row.
+     */
+    tmp = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
+    if (tmp == 0) tmp = compptr->v_samp_factor;
+    compptr->last_row_height = tmp;
+
+    /* Prepare array describing MCU composition */
+    cinfo->blocks_in_MCU = 1;
+    cinfo->MCU_membership[0] = 0;
+
+  } else {
+
+    /* Interleaved (multi-component) scan */
+    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)
+      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,
+	       MAX_COMPS_IN_SCAN);
+
+    /* Overall image size in MCUs */
+    cinfo->MCUs_per_row = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width,
+		    (long) (cinfo->max_h_samp_factor*DCTSIZE));
+    cinfo->MCU_rows_in_scan = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height,
+		    (long) (cinfo->max_v_samp_factor*DCTSIZE));
+
+    cinfo->blocks_in_MCU = 0;
+
+    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+      compptr = cinfo->cur_comp_info[ci];
+      /* Sampling factors give # of blocks of component in each MCU */
+      compptr->MCU_width = compptr->h_samp_factor;
+      compptr->MCU_height = compptr->v_samp_factor;
+      compptr->MCU_blocks = compptr->MCU_width * compptr->MCU_height;
+      compptr->MCU_sample_width = compptr->MCU_width * compptr->DCT_scaled_size;
+      /* Figure number of non-dummy blocks in last MCU column & row */
+      tmp = (int) (compptr->width_in_blocks % compptr->MCU_width);
+      if (tmp == 0) tmp = compptr->MCU_width;
+      compptr->last_col_width = tmp;
+      tmp = (int) (compptr->height_in_blocks % compptr->MCU_height);
+      if (tmp == 0) tmp = compptr->MCU_height;
+      compptr->last_row_height = tmp;
+      /* Prepare array describing MCU composition */
+      mcublks = compptr->MCU_blocks;
+      if (cinfo->blocks_in_MCU + mcublks > D_MAX_BLOCKS_IN_MCU)
+	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);
+      while (mcublks-- > 0) {
+	cinfo->MCU_membership[cinfo->blocks_in_MCU++] = ci;
+      }
+    }
+
+  }
+}
+
+
+/*
+ * Save away a copy of the Q-table referenced by each component present
+ * in the current scan, unless already saved during a prior scan.
+ *
+ * In a multiple-scan JPEG file, the encoder could assign different components
+ * the same Q-table slot number, but change table definitions between scans
+ * so that each component uses a different Q-table.  (The IJG encoder is not
+ * currently capable of doing this, but other encoders might.)  Since we want
+ * to be able to dequantize all the components at the end of the file, this
+ * means that we have to save away the table actually used for each component.
+ * We do this by copying the table at the start of the first scan containing
+ * the component.
+ * The JPEG spec prohibits the encoder from changing the contents of a Q-table
+ * slot between scans of a component using that slot.  If the encoder does so
+ * anyway, this decoder will simply use the Q-table values that were current
+ * at the start of the first scan for the component.
+ *
+ * The decompressor output side looks only at the saved quant tables,
+ * not at the current Q-table slots.
+ */
+
+LOCAL(void)
+latch_quant_tables (j_decompress_ptr cinfo)
+{
+  int ci, qtblno;
+  jpeg_component_info *compptr;
+  JQUANT_TBL * qtbl;
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    /* No work if we already saved Q-table for this component */
+    if (compptr->quant_table != NULL)
+      continue;
+    /* Make sure specified quantization table is present */
+    qtblno = compptr->quant_tbl_no;
+    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||
+	cinfo->quant_tbl_ptrs[qtblno] == NULL)
+      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);
+    /* OK, save away the quantization table */
+    qtbl = (JQUANT_TBL *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(JQUANT_TBL));
+    MEMCOPY(qtbl, cinfo->quant_tbl_ptrs[qtblno], SIZEOF(JQUANT_TBL));
+    compptr->quant_table = qtbl;
+  }
+}
+
+
+/*
+ * Initialize the input modules to read a scan of compressed data.
+ * The first call to this is done by jdmaster.c after initializing
+ * the entire decompressor (during jpeg_start_decompress).
+ * Subsequent calls come from consume_markers, below.
+ */
+
+METHODDEF(void)
+start_input_pass (j_decompress_ptr cinfo)
+{
+  per_scan_setup(cinfo);
+  latch_quant_tables(cinfo);
+  (*cinfo->entropy->start_pass) (cinfo);
+#if defined(__VISAGECPP__)
+  (*cinfo->coef->start_input_pass2) (cinfo);
+#else
+  (*cinfo->coef->start_input_pass) (cinfo);
+#endif
+  cinfo->inputctl->consume_input = cinfo->coef->consume_data;
+}
+
+
+/*
+ * Finish up after inputting a compressed-data scan.
+ * This is called by the coefficient controller after it's read all
+ * the expected data of the scan.
+ */
+
+METHODDEF(void)
+finish_input_pass (j_decompress_ptr cinfo)
+{
+  cinfo->inputctl->consume_input = consume_markers;
+}
+
+
+/*
+ * Read JPEG markers before, between, or after compressed-data scans.
+ * Change state as necessary when a new scan is reached.
+ * Return value is JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+ *
+ * The consume_input method pointer points either here or to the
+ * coefficient controller's consume_data routine, depending on whether
+ * we are reading a compressed data segment or inter-segment markers.
+ */
+
+METHODDEF(int)
+consume_markers (j_decompress_ptr cinfo)
+{
+  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;
+  int val;
+
+  if (inputctl->pub.eoi_reached) /* After hitting EOI, read no further */
+    return JPEG_REACHED_EOI;
+
+  val = (*cinfo->marker->read_markers) (cinfo);
+
+  switch (val) {
+  case JPEG_REACHED_SOS:	/* Found SOS */
+    if (inputctl->inheaders) {	/* 1st SOS */
+      initial_setup(cinfo);
+      inputctl->inheaders = FALSE;
+      /* Note: start_input_pass must be called by jdmaster.c
+       * before any more input can be consumed.  jdapimin.c is
+       * responsible for enforcing this sequencing.
+       */
+    } else {			/* 2nd or later SOS marker */
+      if (! inputctl->pub.has_multiple_scans)
+	ERREXIT(cinfo, JERR_EOI_EXPECTED); /* Oops, I wasn't expecting this! */
+      start_input_pass(cinfo);
+    }
+    break;
+  case JPEG_REACHED_EOI:	/* Found EOI */
+    inputctl->pub.eoi_reached = TRUE;
+    if (inputctl->inheaders) {	/* Tables-only datastream, apparently */
+      if (cinfo->marker->saw_SOF)
+	ERREXIT(cinfo, JERR_SOF_NO_SOS);
+    } else {
+      /* Prevent infinite loop in coef ctlr's decompress_data routine
+       * if user set output_scan_number larger than number of scans.
+       */
+      if (cinfo->output_scan_number > cinfo->input_scan_number)
+	cinfo->output_scan_number = cinfo->input_scan_number;
+    }
+    break;
+  case JPEG_SUSPENDED:
+    break;
+  }
+
+  return val;
+}
+
+
+/*
+ * Reset state to begin a fresh datastream.
+ */
+
+METHODDEF(void)
+reset_input_controller (j_decompress_ptr cinfo)
+{
+  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;
+
+  inputctl->pub.consume_input = consume_markers;
+  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */
+  inputctl->pub.eoi_reached = FALSE;
+  inputctl->inheaders = TRUE;
+  /* Reset other modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->marker->reset_marker_reader) (cinfo);
+  /* Reset progression state -- would be cleaner if entropy decoder did this */
+  cinfo->coef_bits = NULL;
+}
+
+
+/*
+ * Initialize the input controller module.
+ * This is called only once, when the decompression object is created.
+ */
+
+GLOBAL(void)
+jinit_input_controller (j_decompress_ptr cinfo)
+{
+  my_inputctl_ptr inputctl;
+
+  /* Create subobject in permanent pool */
+  inputctl = (my_inputctl_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				SIZEOF(my_input_controller));
+  cinfo->inputctl = (struct jpeg_input_controller *) inputctl;
+  /* Initialize method pointers */
+  inputctl->pub.consume_input = consume_markers;
+  inputctl->pub.reset_input_controller = reset_input_controller;
+  inputctl->pub.start_input_pass = start_input_pass;
+  inputctl->pub.finish_input_pass = finish_input_pass;
+  /* Initialize state: can't use reset_input_controller since we don't
+   * want to try to reset other modules yet.
+   */
+  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */
+  inputctl->pub.eoi_reached = FALSE;
+  inputctl->inheaders = TRUE;
+}
+
diff --git a/Source/3rd Party/wx/src/jpeg/jdmainct.c b/Source/3rd Party/wx/src/jpeg/jdmainct.c
index 4b8d3dcf9..cd55e8ce1 100644
--- a/Source/3rd Party/wx/src/jpeg/jdmainct.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdmainct.c	
@@ -1,529 +1,529 @@
-/*
- * jdmainct.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the main buffer controller for decompression.
- * The main buffer lies between the JPEG decompressor proper and the
- * post-processor; it holds downsampled data in the JPEG colorspace.
- *
- * Note that this code is bypassed in raw-data mode, since the application
- * supplies the equivalent of the main buffer in that case.
- */
-
-/* suppress the warnings about using main for the variable names */
-#define main jpegMain
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-/*
- * In the current system design, the main buffer need never be a full-image
- * buffer; any full-height buffers will be found inside the coefficient or
- * postprocessing controllers.  Nonetheless, the main controller is not
- * trivial.  Its responsibility is to provide context rows for upsampling/
- * rescaling, and doing this in an efficient fashion is a bit tricky.
- *
- * Postprocessor input data is counted in "row groups".  A row group
- * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size)
- * sample rows of each component.  (We require DCT_scaled_size values to be
- * chosen such that these numbers are integers.  In practice DCT_scaled_size
- * values will likely be powers of two, so we actually have the stronger
- * condition that DCT_scaled_size / min_DCT_scaled_size is an integer.)
- * Upsampling will typically produce max_v_samp_factor pixel rows from each
- * row group (times any additional scale factor that the upsampler is
- * applying).
- *
- * The coefficient controller will deliver data to us one iMCU row at a time;
- * each iMCU row contains v_samp_factor * DCT_scaled_size sample rows, or
- * exactly min_DCT_scaled_size row groups.  (This amount of data corresponds
- * to one row of MCUs when the image is fully interleaved.)  Note that the
- * number of sample rows varies across components, but the number of row
- * groups does not.  Some garbage sample rows may be included in the last iMCU
- * row at the bottom of the image.
- *
- * Depending on the vertical scaling algorithm used, the upsampler may need
- * access to the sample row(s) above and below its current input row group.
- * The upsampler is required to set need_context_rows TRUE at global selection
- * time if so.  When need_context_rows is FALSE, this controller can simply
- * obtain one iMCU row at a time from the coefficient controller and dole it
- * out as row groups to the postprocessor.
- *
- * When need_context_rows is TRUE, this controller guarantees that the buffer
- * passed to postprocessing contains at least one row group's worth of samples
- * above and below the row group(s) being processed.  Note that the context
- * rows "above" the first passed row group appear at negative row offsets in
- * the passed buffer.  At the top and bottom of the image, the required
- * context rows are manufactured by duplicating the first or last real sample
- * row; this avoids having special cases in the upsampling inner loops.
- *
- * The amount of context is fixed at one row group just because that's a
- * convenient number for this controller to work with.  The existing
- * upsamplers really only need one sample row of context.  An upsampler
- * supporting arbitrary output rescaling might wish for more than one row
- * group of context when shrinking the image; tough, we don't handle that.
- * (This is justified by the assumption that downsizing will be handled mostly
- * by adjusting the DCT_scaled_size values, so that the actual scale factor at
- * the upsample step needn't be much less than one.)
- *
- * To provide the desired context, we have to retain the last two row groups
- * of one iMCU row while reading in the next iMCU row.  (The last row group
- * can't be processed until we have another row group for its below-context,
- * and so we have to save the next-to-last group too for its above-context.)
- * We could do this most simply by copying data around in our buffer, but
- * that'd be very slow.  We can avoid copying any data by creating a rather
- * strange pointer structure.  Here's how it works.  We allocate a workspace
- * consisting of M+2 row groups (where M = min_DCT_scaled_size is the number
- * of row groups per iMCU row).  We create two sets of redundant pointers to
- * the workspace.  Labeling the physical row groups 0 to M+1, the synthesized
- * pointer lists look like this:
- *                   M+1                          M-1
- * master pointer --> 0         master pointer --> 0
- *                    1                            1
- *                   ...                          ...
- *                   M-3                          M-3
- *                   M-2                           M
- *                   M-1                          M+1
- *                    M                           M-2
- *                   M+1                          M-1
- *                    0                            0
- * We read alternate iMCU rows using each master pointer; thus the last two
- * row groups of the previous iMCU row remain un-overwritten in the workspace.
- * The pointer lists are set up so that the required context rows appear to
- * be adjacent to the proper places when we pass the pointer lists to the
- * upsampler.
- *
- * The above pictures describe the normal state of the pointer lists.
- * At top and bottom of the image, we diddle the pointer lists to duplicate
- * the first or last sample row as necessary (this is cheaper than copying
- * sample rows around).
- *
- * This scheme breaks down if M < 2, ie, min_DCT_scaled_size is 1.  In that
- * situation each iMCU row provides only one row group so the buffering logic
- * must be different (eg, we must read two iMCU rows before we can emit the
- * first row group).  For now, we simply do not support providing context
- * rows when min_DCT_scaled_size is 1.  That combination seems unlikely to
- * be worth providing --- if someone wants a 1/8th-size preview, they probably
- * want it quick and dirty, so a context-free upsampler is sufficient.
- */
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_d_main_controller pub; /* public fields */
-
-  /* Pointer to allocated workspace (M or M+2 row groups). */
-  JSAMPARRAY buffer[MAX_COMPONENTS];
-
-  wxjpeg_boolean buffer_full;		/* Have we gotten an iMCU row from decoder? */
-  JDIMENSION rowgroup_ctr;	/* counts row groups output to postprocessor */
-
-  /* Remaining fields are only used in the context case. */
-
-  /* These are the master pointers to the funny-order pointer lists. */
-  JSAMPIMAGE xbuffer[2];	/* pointers to weird pointer lists */
-
-  int whichptr;			/* indicates which pointer set is now in use */
-  int context_state;		/* process_data state machine status */
-  JDIMENSION rowgroups_avail;	/* row groups available to postprocessor */
-  JDIMENSION iMCU_row_ctr;	/* counts iMCU rows to detect image top/bot */
-} my_main_controller;
-
-typedef my_main_controller * my_main_ptr;
-
-/* context_state values: */
-#define CTX_PREPARE_FOR_IMCU	0	/* need to prepare for MCU row */
-#define CTX_PROCESS_IMCU	1	/* feeding iMCU to postprocessor */
-#define CTX_POSTPONED_ROW	2	/* feeding postponed row group */
-
-
-#if defined(__VISAGECPP__)
-/* Visual Age fixups for multiple declarations */
-#  define start_pass_main   start_pass_main2 /* already in jcmaint.c */
-#  define process_data_simple_main process_data_simple_main2 /* already in jcmaint.c */
-#endif
-
-/* Forward declarations */
-METHODDEF(void) process_data_simple_main
-	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
-	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
-METHODDEF(void) process_data_context_main
-	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
-	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
-#ifdef QUANT_2PASS_SUPPORTED
-METHODDEF(void) process_data_crank_post
-	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
-	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
-#endif
-
-
-LOCAL(void)
-alloc_funny_pointers (j_decompress_ptr cinfo)
-/* Allocate space for the funny pointer lists.
- * This is done only once, not once per pass.
- */
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  int ci, rgroup;
-  int M = cinfo->min_DCT_scaled_size;
-  jpeg_component_info *compptr;
-  JSAMPARRAY xbuf;
-
-  /* Get top-level space for component array pointers.
-   * We alloc both arrays with one call to save a few cycles.
-   */
-  main->xbuffer[0] = (JSAMPIMAGE)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				cinfo->num_components * 2 * SIZEOF(JSAMPARRAY));
-  main->xbuffer[1] = main->xbuffer[0] + cinfo->num_components;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-      cinfo->min_DCT_scaled_size; /* height of a row group of component */
-    /* Get space for pointer lists --- M+4 row groups in each list.
-     * We alloc both pointer lists with one call to save a few cycles.
-     */
-    xbuf = (JSAMPARRAY)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  2 * (rgroup * (M + 4)) * SIZEOF(JSAMPROW));
-    xbuf += rgroup;		/* want one row group at negative offsets */
-    main->xbuffer[0][ci] = xbuf;
-    xbuf += rgroup * (M + 4);
-    main->xbuffer[1][ci] = xbuf;
-  }
-}
-
-
-LOCAL(void)
-make_funny_pointers (j_decompress_ptr cinfo)
-/* Create the funny pointer lists discussed in the comments above.
- * The actual workspace is already allocated (in main->buffer),
- * and the space for the pointer lists is allocated too.
- * This routine just fills in the curiously ordered lists.
- * This will be repeated at the beginning of each pass.
- */
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  int ci, i, rgroup;
-  int M = cinfo->min_DCT_scaled_size;
-  jpeg_component_info *compptr;
-  JSAMPARRAY buf, xbuf0, xbuf1;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-      cinfo->min_DCT_scaled_size; /* height of a row group of component */
-    xbuf0 = main->xbuffer[0][ci];
-    xbuf1 = main->xbuffer[1][ci];
-    /* First copy the workspace pointers as-is */
-    buf = main->buffer[ci];
-    for (i = 0; i < rgroup * (M + 2); i++) {
-      xbuf0[i] = xbuf1[i] = buf[i];
-    }
-    /* In the second list, put the last four row groups in swapped order */
-    for (i = 0; i < rgroup * 2; i++) {
-      xbuf1[rgroup*(M-2) + i] = buf[rgroup*M + i];
-      xbuf1[rgroup*M + i] = buf[rgroup*(M-2) + i];
-    }
-    /* The wraparound pointers at top and bottom will be filled later
-     * (see set_wraparound_pointers, below).  Initially we want the "above"
-     * pointers to duplicate the first actual data line.  This only needs
-     * to happen in xbuffer[0].
-     */
-    for (i = 0; i < rgroup; i++) {
-      xbuf0[i - rgroup] = xbuf0[0];
-    }
-  }
-}
-
-
-LOCAL(void)
-set_wraparound_pointers (j_decompress_ptr cinfo)
-/* Set up the "wraparound" pointers at top and bottom of the pointer lists.
- * This changes the pointer list state from top-of-image to the normal state.
- */
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  int ci, i, rgroup;
-  int M = cinfo->min_DCT_scaled_size;
-  jpeg_component_info *compptr;
-  JSAMPARRAY xbuf0, xbuf1;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-      cinfo->min_DCT_scaled_size; /* height of a row group of component */
-    xbuf0 = main->xbuffer[0][ci];
-    xbuf1 = main->xbuffer[1][ci];
-    for (i = 0; i < rgroup; i++) {
-      xbuf0[i - rgroup] = xbuf0[rgroup*(M+1) + i];
-      xbuf1[i - rgroup] = xbuf1[rgroup*(M+1) + i];
-      xbuf0[rgroup*(M+2) + i] = xbuf0[i];
-      xbuf1[rgroup*(M+2) + i] = xbuf1[i];
-    }
-  }
-}
-
-
-LOCAL(void)
-set_bottom_pointers (j_decompress_ptr cinfo)
-/* Change the pointer lists to duplicate the last sample row at the bottom
- * of the image.  whichptr indicates which xbuffer holds the final iMCU row.
- * Also sets rowgroups_avail to indicate number of nondummy row groups in row.
- */
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  int ci, i, rgroup, iMCUheight, rows_left;
-  jpeg_component_info *compptr;
-  JSAMPARRAY xbuf;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Count sample rows in one iMCU row and in one row group */
-    iMCUheight = compptr->v_samp_factor * compptr->DCT_scaled_size;
-    rgroup = iMCUheight / cinfo->min_DCT_scaled_size;
-    /* Count nondummy sample rows remaining for this component */
-    rows_left = (int) (compptr->downsampled_height % (JDIMENSION) iMCUheight);
-    if (rows_left == 0) rows_left = iMCUheight;
-    /* Count nondummy row groups.  Should get same answer for each component,
-     * so we need only do it once.
-     */
-    if (ci == 0) {
-      main->rowgroups_avail = (JDIMENSION) ((rows_left-1) / rgroup + 1);
-    }
-    /* Duplicate the last real sample row rgroup*2 times; this pads out the
-     * last partial rowgroup and ensures at least one full rowgroup of context.
-     */
-    xbuf = main->xbuffer[main->whichptr][ci];
-    for (i = 0; i < rgroup * 2; i++) {
-      xbuf[rows_left + i] = xbuf[rows_left-1];
-    }
-  }
-}
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_main (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-
-  switch (pass_mode) {
-  case JBUF_PASS_THRU:
-    if (cinfo->upsample->need_context_rows) {
-      main->pub.process_data = process_data_context_main;
-      make_funny_pointers(cinfo); /* Create the xbuffer[] lists */
-      main->whichptr = 0;	/* Read first iMCU row into xbuffer[0] */
-      main->context_state = CTX_PREPARE_FOR_IMCU;
-      main->iMCU_row_ctr = 0;
-    } else {
-      /* Simple case with no context needed */
-      main->pub.process_data = process_data_simple_main;
-    }
-    main->buffer_full = FALSE;	/* Mark buffer empty */
-    main->rowgroup_ctr = 0;
-    break;
-#ifdef QUANT_2PASS_SUPPORTED
-  case JBUF_CRANK_DEST:
-    /* For last pass of 2-pass quantization, just crank the postprocessor */
-    main->pub.process_data = process_data_crank_post;
-    break;
-#endif
-  default:
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    break;
-  }
-}
-
-
-/*
- * Process some data.
- * This handles the simple case where no context is required.
- */
-
-METHODDEF(void)
-process_data_simple_main (j_decompress_ptr cinfo,
-			  JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			  JDIMENSION out_rows_avail)
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  JDIMENSION rowgroups_avail;
-
-  /* Read input data if we haven't filled the main buffer yet */
-  if (! main->buffer_full) {
-    if (! (*cinfo->coef->decompress_data) (cinfo, main->buffer))
-      return;			/* suspension forced, can do nothing more */
-    main->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */
-  }
-
-  /* There are always min_DCT_scaled_size row groups in an iMCU row. */
-  rowgroups_avail = (JDIMENSION) cinfo->min_DCT_scaled_size;
-  /* Note: at the bottom of the image, we may pass extra garbage row groups
-   * to the postprocessor.  The postprocessor has to check for bottom
-   * of image anyway (at row resolution), so no point in us doing it too.
-   */
-
-  /* Feed the postprocessor */
-  (*cinfo->post->post_process_data) (cinfo, main->buffer,
-				     &main->rowgroup_ctr, rowgroups_avail,
-				     output_buf, out_row_ctr, out_rows_avail);
-
-  /* Has postprocessor consumed all the data yet? If so, mark buffer empty */
-  if (main->rowgroup_ctr >= rowgroups_avail) {
-    main->buffer_full = FALSE;
-    main->rowgroup_ctr = 0;
-  }
-}
-
-
-/*
- * Process some data.
- * This handles the case where context rows must be provided.
- */
-
-METHODDEF(void)
-process_data_context_main (j_decompress_ptr cinfo,
-			   JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			   JDIMENSION out_rows_avail)
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-
-  /* Read input data if we haven't filled the main buffer yet */
-  if (! main->buffer_full) {
-    if (! (*cinfo->coef->decompress_data) (cinfo,
-					   main->xbuffer[main->whichptr]))
-      return;			/* suspension forced, can do nothing more */
-    main->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */
-    main->iMCU_row_ctr++;	/* count rows received */
-  }
-
-  /* Postprocessor typically will not swallow all the input data it is handed
-   * in one call (due to filling the output buffer first).  Must be prepared
-   * to exit and restart.  This switch lets us keep track of how far we got.
-   * Note that each case falls through to the next on successful completion.
-   */
-  switch (main->context_state) {
-  case CTX_POSTPONED_ROW:
-    /* Call postprocessor using previously set pointers for postponed row */
-    (*cinfo->post->post_process_data) (cinfo, main->xbuffer[main->whichptr],
-			&main->rowgroup_ctr, main->rowgroups_avail,
-			output_buf, out_row_ctr, out_rows_avail);
-    if (main->rowgroup_ctr < main->rowgroups_avail)
-      return;			/* Need to suspend */
-    main->context_state = CTX_PREPARE_FOR_IMCU;
-    if (*out_row_ctr >= out_rows_avail)
-      return;			/* Postprocessor exactly filled output buf */
-    /*FALLTHROUGH*/
-  case CTX_PREPARE_FOR_IMCU:
-    /* Prepare to process first M-1 row groups of this iMCU row */
-    main->rowgroup_ctr = 0;
-    main->rowgroups_avail = (JDIMENSION) (cinfo->min_DCT_scaled_size - 1);
-    /* Check for bottom of image: if so, tweak pointers to "duplicate"
-     * the last sample row, and adjust rowgroups_avail to ignore padding rows.
-     */
-    if (main->iMCU_row_ctr == cinfo->total_iMCU_rows)
-      set_bottom_pointers(cinfo);
-    main->context_state = CTX_PROCESS_IMCU;
-    /*FALLTHROUGH*/
-  case CTX_PROCESS_IMCU:
-    /* Call postprocessor using previously set pointers */
-    (*cinfo->post->post_process_data) (cinfo, main->xbuffer[main->whichptr],
-			&main->rowgroup_ctr, main->rowgroups_avail,
-			output_buf, out_row_ctr, out_rows_avail);
-    if (main->rowgroup_ctr < main->rowgroups_avail)
-      return;			/* Need to suspend */
-    /* After the first iMCU, change wraparound pointers to normal state */
-    if (main->iMCU_row_ctr == 1)
-      set_wraparound_pointers(cinfo);
-    /* Prepare to load new iMCU row using other xbuffer list */
-    main->whichptr ^= 1;	/* 0=>1 or 1=>0 */
-    main->buffer_full = FALSE;
-    /* Still need to process last row group of this iMCU row, */
-    /* which is saved at index M+1 of the other xbuffer */
-    main->rowgroup_ctr = (JDIMENSION) (cinfo->min_DCT_scaled_size + 1);
-    main->rowgroups_avail = (JDIMENSION) (cinfo->min_DCT_scaled_size + 2);
-    main->context_state = CTX_POSTPONED_ROW;
-  }
-}
-
-
-/*
- * Process some data.
- * Final pass of two-pass quantization: just call the postprocessor.
- * Source data will be the postprocessor controller's internal buffer.
- */
-
-#ifdef QUANT_2PASS_SUPPORTED
-
-METHODDEF(void)
-process_data_crank_post (j_decompress_ptr cinfo,
-			 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			 JDIMENSION out_rows_avail)
-{
-  (*cinfo->post->post_process_data) (cinfo, (JSAMPIMAGE) NULL,
-				     (JDIMENSION *) NULL, (JDIMENSION) 0,
-				     output_buf, out_row_ctr, out_rows_avail);
-}
-
-#endif /* QUANT_2PASS_SUPPORTED */
-
-
-/*
- * Initialize main buffer controller.
- */
-
-GLOBAL(void)
-jinit_d_main_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_main_ptr main;
-  int ci, rgroup, ngroups;
-  jpeg_component_info *compptr;
-
-  main = (my_main_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_main_controller));
-  cinfo->main = (struct jpeg_d_main_controller *) main;
-  main->pub.start_pass = start_pass_main;
-
-  if (need_full_buffer)		/* shouldn't happen */
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-
-  /* Allocate the workspace.
-   * ngroups is the number of row groups we need.
-   */
-  if (cinfo->upsample->need_context_rows) {
-    if (cinfo->min_DCT_scaled_size < 2) /* unsupported, see comments above */
-      ERREXIT(cinfo, JERR_NOTIMPL);
-    alloc_funny_pointers(cinfo); /* Alloc space for xbuffer[] lists */
-    ngroups = cinfo->min_DCT_scaled_size + 2;
-  } else {
-    ngroups = cinfo->min_DCT_scaled_size;
-  }
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-      cinfo->min_DCT_scaled_size; /* height of a row group of component */
-    main->buffer[ci] = (*cinfo->mem->alloc_sarray)
-			((j_common_ptr) cinfo, JPOOL_IMAGE,
-			 compptr->width_in_blocks * compptr->DCT_scaled_size,
-			 (JDIMENSION) (rgroup * ngroups));
-  }
-}
-
-#if defined(__VISAGECPP__)
-#  ifdef start_pass_main2
-#   undef start_pass_main2
-#  endif
-#  ifdef process_data_simple_main2
-#   undef process_data_simple_main2
-#  endif
-#endif
+/*
+ * jdmainct.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the main buffer controller for decompression.
+ * The main buffer lies between the JPEG decompressor proper and the
+ * post-processor; it holds downsampled data in the JPEG colorspace.
+ *
+ * Note that this code is bypassed in raw-data mode, since the application
+ * supplies the equivalent of the main buffer in that case.
+ */
+
+/* suppress the warnings about using main for the variable names */
+#define main jpegMain
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+/*
+ * In the current system design, the main buffer need never be a full-image
+ * buffer; any full-height buffers will be found inside the coefficient or
+ * postprocessing controllers.  Nonetheless, the main controller is not
+ * trivial.  Its responsibility is to provide context rows for upsampling/
+ * rescaling, and doing this in an efficient fashion is a bit tricky.
+ *
+ * Postprocessor input data is counted in "row groups".  A row group
+ * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size)
+ * sample rows of each component.  (We require DCT_scaled_size values to be
+ * chosen such that these numbers are integers.  In practice DCT_scaled_size
+ * values will likely be powers of two, so we actually have the stronger
+ * condition that DCT_scaled_size / min_DCT_scaled_size is an integer.)
+ * Upsampling will typically produce max_v_samp_factor pixel rows from each
+ * row group (times any additional scale factor that the upsampler is
+ * applying).
+ *
+ * The coefficient controller will deliver data to us one iMCU row at a time;
+ * each iMCU row contains v_samp_factor * DCT_scaled_size sample rows, or
+ * exactly min_DCT_scaled_size row groups.  (This amount of data corresponds
+ * to one row of MCUs when the image is fully interleaved.)  Note that the
+ * number of sample rows varies across components, but the number of row
+ * groups does not.  Some garbage sample rows may be included in the last iMCU
+ * row at the bottom of the image.
+ *
+ * Depending on the vertical scaling algorithm used, the upsampler may need
+ * access to the sample row(s) above and below its current input row group.
+ * The upsampler is required to set need_context_rows TRUE at global selection
+ * time if so.  When need_context_rows is FALSE, this controller can simply
+ * obtain one iMCU row at a time from the coefficient controller and dole it
+ * out as row groups to the postprocessor.
+ *
+ * When need_context_rows is TRUE, this controller guarantees that the buffer
+ * passed to postprocessing contains at least one row group's worth of samples
+ * above and below the row group(s) being processed.  Note that the context
+ * rows "above" the first passed row group appear at negative row offsets in
+ * the passed buffer.  At the top and bottom of the image, the required
+ * context rows are manufactured by duplicating the first or last real sample
+ * row; this avoids having special cases in the upsampling inner loops.
+ *
+ * The amount of context is fixed at one row group just because that's a
+ * convenient number for this controller to work with.  The existing
+ * upsamplers really only need one sample row of context.  An upsampler
+ * supporting arbitrary output rescaling might wish for more than one row
+ * group of context when shrinking the image; tough, we don't handle that.
+ * (This is justified by the assumption that downsizing will be handled mostly
+ * by adjusting the DCT_scaled_size values, so that the actual scale factor at
+ * the upsample step needn't be much less than one.)
+ *
+ * To provide the desired context, we have to retain the last two row groups
+ * of one iMCU row while reading in the next iMCU row.  (The last row group
+ * can't be processed until we have another row group for its below-context,
+ * and so we have to save the next-to-last group too for its above-context.)
+ * We could do this most simply by copying data around in our buffer, but
+ * that'd be very slow.  We can avoid copying any data by creating a rather
+ * strange pointer structure.  Here's how it works.  We allocate a workspace
+ * consisting of M+2 row groups (where M = min_DCT_scaled_size is the number
+ * of row groups per iMCU row).  We create two sets of redundant pointers to
+ * the workspace.  Labeling the physical row groups 0 to M+1, the synthesized
+ * pointer lists look like this:
+ *                   M+1                          M-1
+ * master pointer --> 0         master pointer --> 0
+ *                    1                            1
+ *                   ...                          ...
+ *                   M-3                          M-3
+ *                   M-2                           M
+ *                   M-1                          M+1
+ *                    M                           M-2
+ *                   M+1                          M-1
+ *                    0                            0
+ * We read alternate iMCU rows using each master pointer; thus the last two
+ * row groups of the previous iMCU row remain un-overwritten in the workspace.
+ * The pointer lists are set up so that the required context rows appear to
+ * be adjacent to the proper places when we pass the pointer lists to the
+ * upsampler.
+ *
+ * The above pictures describe the normal state of the pointer lists.
+ * At top and bottom of the image, we diddle the pointer lists to duplicate
+ * the first or last sample row as necessary (this is cheaper than copying
+ * sample rows around).
+ *
+ * This scheme breaks down if M < 2, ie, min_DCT_scaled_size is 1.  In that
+ * situation each iMCU row provides only one row group so the buffering logic
+ * must be different (eg, we must read two iMCU rows before we can emit the
+ * first row group).  For now, we simply do not support providing context
+ * rows when min_DCT_scaled_size is 1.  That combination seems unlikely to
+ * be worth providing --- if someone wants a 1/8th-size preview, they probably
+ * want it quick and dirty, so a context-free upsampler is sufficient.
+ */
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_d_main_controller pub; /* public fields */
+
+  /* Pointer to allocated workspace (M or M+2 row groups). */
+  JSAMPARRAY buffer[MAX_COMPONENTS];
+
+  wxjpeg_boolean buffer_full;		/* Have we gotten an iMCU row from decoder? */
+  JDIMENSION rowgroup_ctr;	/* counts row groups output to postprocessor */
+
+  /* Remaining fields are only used in the context case. */
+
+  /* These are the master pointers to the funny-order pointer lists. */
+  JSAMPIMAGE xbuffer[2];	/* pointers to weird pointer lists */
+
+  int whichptr;			/* indicates which pointer set is now in use */
+  int context_state;		/* process_data state machine status */
+  JDIMENSION rowgroups_avail;	/* row groups available to postprocessor */
+  JDIMENSION iMCU_row_ctr;	/* counts iMCU rows to detect image top/bot */
+} my_main_controller;
+
+typedef my_main_controller * my_main_ptr;
+
+/* context_state values: */
+#define CTX_PREPARE_FOR_IMCU	0	/* need to prepare for MCU row */
+#define CTX_PROCESS_IMCU	1	/* feeding iMCU to postprocessor */
+#define CTX_POSTPONED_ROW	2	/* feeding postponed row group */
+
+
+#if defined(__VISAGECPP__)
+/* Visual Age fixups for multiple declarations */
+#  define start_pass_main   start_pass_main2 /* already in jcmaint.c */
+#  define process_data_simple_main process_data_simple_main2 /* already in jcmaint.c */
+#endif
+
+/* Forward declarations */
+METHODDEF(void) process_data_simple_main
+	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
+	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
+METHODDEF(void) process_data_context_main
+	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
+	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
+#ifdef QUANT_2PASS_SUPPORTED
+METHODDEF(void) process_data_crank_post
+	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
+	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
+#endif
+
+
+LOCAL(void)
+alloc_funny_pointers (j_decompress_ptr cinfo)
+/* Allocate space for the funny pointer lists.
+ * This is done only once, not once per pass.
+ */
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  int ci, rgroup;
+  int M = cinfo->min_DCT_scaled_size;
+  jpeg_component_info *compptr;
+  JSAMPARRAY xbuf;
+
+  /* Get top-level space for component array pointers.
+   * We alloc both arrays with one call to save a few cycles.
+   */
+  main->xbuffer[0] = (JSAMPIMAGE)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				cinfo->num_components * 2 * SIZEOF(JSAMPARRAY));
+  main->xbuffer[1] = main->xbuffer[0] + cinfo->num_components;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
+      cinfo->min_DCT_scaled_size; /* height of a row group of component */
+    /* Get space for pointer lists --- M+4 row groups in each list.
+     * We alloc both pointer lists with one call to save a few cycles.
+     */
+    xbuf = (JSAMPARRAY)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  2 * (rgroup * (M + 4)) * SIZEOF(JSAMPROW));
+    xbuf += rgroup;		/* want one row group at negative offsets */
+    main->xbuffer[0][ci] = xbuf;
+    xbuf += rgroup * (M + 4);
+    main->xbuffer[1][ci] = xbuf;
+  }
+}
+
+
+LOCAL(void)
+make_funny_pointers (j_decompress_ptr cinfo)
+/* Create the funny pointer lists discussed in the comments above.
+ * The actual workspace is already allocated (in main->buffer),
+ * and the space for the pointer lists is allocated too.
+ * This routine just fills in the curiously ordered lists.
+ * This will be repeated at the beginning of each pass.
+ */
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  int ci, i, rgroup;
+  int M = cinfo->min_DCT_scaled_size;
+  jpeg_component_info *compptr;
+  JSAMPARRAY buf, xbuf0, xbuf1;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
+      cinfo->min_DCT_scaled_size; /* height of a row group of component */
+    xbuf0 = main->xbuffer[0][ci];
+    xbuf1 = main->xbuffer[1][ci];
+    /* First copy the workspace pointers as-is */
+    buf = main->buffer[ci];
+    for (i = 0; i < rgroup * (M + 2); i++) {
+      xbuf0[i] = xbuf1[i] = buf[i];
+    }
+    /* In the second list, put the last four row groups in swapped order */
+    for (i = 0; i < rgroup * 2; i++) {
+      xbuf1[rgroup*(M-2) + i] = buf[rgroup*M + i];
+      xbuf1[rgroup*M + i] = buf[rgroup*(M-2) + i];
+    }
+    /* The wraparound pointers at top and bottom will be filled later
+     * (see set_wraparound_pointers, below).  Initially we want the "above"
+     * pointers to duplicate the first actual data line.  This only needs
+     * to happen in xbuffer[0].
+     */
+    for (i = 0; i < rgroup; i++) {
+      xbuf0[i - rgroup] = xbuf0[0];
+    }
+  }
+}
+
+
+LOCAL(void)
+set_wraparound_pointers (j_decompress_ptr cinfo)
+/* Set up the "wraparound" pointers at top and bottom of the pointer lists.
+ * This changes the pointer list state from top-of-image to the normal state.
+ */
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  int ci, i, rgroup;
+  int M = cinfo->min_DCT_scaled_size;
+  jpeg_component_info *compptr;
+  JSAMPARRAY xbuf0, xbuf1;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
+      cinfo->min_DCT_scaled_size; /* height of a row group of component */
+    xbuf0 = main->xbuffer[0][ci];
+    xbuf1 = main->xbuffer[1][ci];
+    for (i = 0; i < rgroup; i++) {
+      xbuf0[i - rgroup] = xbuf0[rgroup*(M+1) + i];
+      xbuf1[i - rgroup] = xbuf1[rgroup*(M+1) + i];
+      xbuf0[rgroup*(M+2) + i] = xbuf0[i];
+      xbuf1[rgroup*(M+2) + i] = xbuf1[i];
+    }
+  }
+}
+
+
+LOCAL(void)
+set_bottom_pointers (j_decompress_ptr cinfo)
+/* Change the pointer lists to duplicate the last sample row at the bottom
+ * of the image.  whichptr indicates which xbuffer holds the final iMCU row.
+ * Also sets rowgroups_avail to indicate number of nondummy row groups in row.
+ */
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  int ci, i, rgroup, iMCUheight, rows_left;
+  jpeg_component_info *compptr;
+  JSAMPARRAY xbuf;
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Count sample rows in one iMCU row and in one row group */
+    iMCUheight = compptr->v_samp_factor * compptr->DCT_scaled_size;
+    rgroup = iMCUheight / cinfo->min_DCT_scaled_size;
+    /* Count nondummy sample rows remaining for this component */
+    rows_left = (int) (compptr->downsampled_height % (JDIMENSION) iMCUheight);
+    if (rows_left == 0) rows_left = iMCUheight;
+    /* Count nondummy row groups.  Should get same answer for each component,
+     * so we need only do it once.
+     */
+    if (ci == 0) {
+      main->rowgroups_avail = (JDIMENSION) ((rows_left-1) / rgroup + 1);
+    }
+    /* Duplicate the last real sample row rgroup*2 times; this pads out the
+     * last partial rowgroup and ensures at least one full rowgroup of context.
+     */
+    xbuf = main->xbuffer[main->whichptr][ci];
+    for (i = 0; i < rgroup * 2; i++) {
+      xbuf[rows_left + i] = xbuf[rows_left-1];
+    }
+  }
+}
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_main (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+
+  switch (pass_mode) {
+  case JBUF_PASS_THRU:
+    if (cinfo->upsample->need_context_rows) {
+      main->pub.process_data = process_data_context_main;
+      make_funny_pointers(cinfo); /* Create the xbuffer[] lists */
+      main->whichptr = 0;	/* Read first iMCU row into xbuffer[0] */
+      main->context_state = CTX_PREPARE_FOR_IMCU;
+      main->iMCU_row_ctr = 0;
+    } else {
+      /* Simple case with no context needed */
+      main->pub.process_data = process_data_simple_main;
+    }
+    main->buffer_full = FALSE;	/* Mark buffer empty */
+    main->rowgroup_ctr = 0;
+    break;
+#ifdef QUANT_2PASS_SUPPORTED
+  case JBUF_CRANK_DEST:
+    /* For last pass of 2-pass quantization, just crank the postprocessor */
+    main->pub.process_data = process_data_crank_post;
+    break;
+#endif
+  default:
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    break;
+  }
+}
+
+
+/*
+ * Process some data.
+ * This handles the simple case where no context is required.
+ */
+
+METHODDEF(void)
+process_data_simple_main (j_decompress_ptr cinfo,
+			  JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+			  JDIMENSION out_rows_avail)
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+  JDIMENSION rowgroups_avail;
+
+  /* Read input data if we haven't filled the main buffer yet */
+  if (! main->buffer_full) {
+    if (! (*cinfo->coef->decompress_data) (cinfo, main->buffer))
+      return;			/* suspension forced, can do nothing more */
+    main->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */
+  }
+
+  /* There are always min_DCT_scaled_size row groups in an iMCU row. */
+  rowgroups_avail = (JDIMENSION) cinfo->min_DCT_scaled_size;
+  /* Note: at the bottom of the image, we may pass extra garbage row groups
+   * to the postprocessor.  The postprocessor has to check for bottom
+   * of image anyway (at row resolution), so no point in us doing it too.
+   */
+
+  /* Feed the postprocessor */
+  (*cinfo->post->post_process_data) (cinfo, main->buffer,
+				     &main->rowgroup_ctr, rowgroups_avail,
+				     output_buf, out_row_ctr, out_rows_avail);
+
+  /* Has postprocessor consumed all the data yet? If so, mark buffer empty */
+  if (main->rowgroup_ctr >= rowgroups_avail) {
+    main->buffer_full = FALSE;
+    main->rowgroup_ctr = 0;
+  }
+}
+
+
+/*
+ * Process some data.
+ * This handles the case where context rows must be provided.
+ */
+
+METHODDEF(void)
+process_data_context_main (j_decompress_ptr cinfo,
+			   JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+			   JDIMENSION out_rows_avail)
+{
+  my_main_ptr main = (my_main_ptr) cinfo->main;
+
+  /* Read input data if we haven't filled the main buffer yet */
+  if (! main->buffer_full) {
+    if (! (*cinfo->coef->decompress_data) (cinfo,
+					   main->xbuffer[main->whichptr]))
+      return;			/* suspension forced, can do nothing more */
+    main->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */
+    main->iMCU_row_ctr++;	/* count rows received */
+  }
+
+  /* Postprocessor typically will not swallow all the input data it is handed
+   * in one call (due to filling the output buffer first).  Must be prepared
+   * to exit and restart.  This switch lets us keep track of how far we got.
+   * Note that each case falls through to the next on successful completion.
+   */
+  switch (main->context_state) {
+  case CTX_POSTPONED_ROW:
+    /* Call postprocessor using previously set pointers for postponed row */
+    (*cinfo->post->post_process_data) (cinfo, main->xbuffer[main->whichptr],
+			&main->rowgroup_ctr, main->rowgroups_avail,
+			output_buf, out_row_ctr, out_rows_avail);
+    if (main->rowgroup_ctr < main->rowgroups_avail)
+      return;			/* Need to suspend */
+    main->context_state = CTX_PREPARE_FOR_IMCU;
+    if (*out_row_ctr >= out_rows_avail)
+      return;			/* Postprocessor exactly filled output buf */
+    /*FALLTHROUGH*/
+  case CTX_PREPARE_FOR_IMCU:
+    /* Prepare to process first M-1 row groups of this iMCU row */
+    main->rowgroup_ctr = 0;
+    main->rowgroups_avail = (JDIMENSION) (cinfo->min_DCT_scaled_size - 1);
+    /* Check for bottom of image: if so, tweak pointers to "duplicate"
+     * the last sample row, and adjust rowgroups_avail to ignore padding rows.
+     */
+    if (main->iMCU_row_ctr == cinfo->total_iMCU_rows)
+      set_bottom_pointers(cinfo);
+    main->context_state = CTX_PROCESS_IMCU;
+    /*FALLTHROUGH*/
+  case CTX_PROCESS_IMCU:
+    /* Call postprocessor using previously set pointers */
+    (*cinfo->post->post_process_data) (cinfo, main->xbuffer[main->whichptr],
+			&main->rowgroup_ctr, main->rowgroups_avail,
+			output_buf, out_row_ctr, out_rows_avail);
+    if (main->rowgroup_ctr < main->rowgroups_avail)
+      return;			/* Need to suspend */
+    /* After the first iMCU, change wraparound pointers to normal state */
+    if (main->iMCU_row_ctr == 1)
+      set_wraparound_pointers(cinfo);
+    /* Prepare to load new iMCU row using other xbuffer list */
+    main->whichptr ^= 1;	/* 0=>1 or 1=>0 */
+    main->buffer_full = FALSE;
+    /* Still need to process last row group of this iMCU row, */
+    /* which is saved at index M+1 of the other xbuffer */
+    main->rowgroup_ctr = (JDIMENSION) (cinfo->min_DCT_scaled_size + 1);
+    main->rowgroups_avail = (JDIMENSION) (cinfo->min_DCT_scaled_size + 2);
+    main->context_state = CTX_POSTPONED_ROW;
+  }
+}
+
+
+/*
+ * Process some data.
+ * Final pass of two-pass quantization: just call the postprocessor.
+ * Source data will be the postprocessor controller's internal buffer.
+ */
+
+#ifdef QUANT_2PASS_SUPPORTED
+
+METHODDEF(void)
+process_data_crank_post (j_decompress_ptr cinfo,
+			 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+			 JDIMENSION out_rows_avail)
+{
+  (*cinfo->post->post_process_data) (cinfo, (JSAMPIMAGE) NULL,
+				     (JDIMENSION *) NULL, (JDIMENSION) 0,
+				     output_buf, out_row_ctr, out_rows_avail);
+}
+
+#endif /* QUANT_2PASS_SUPPORTED */
+
+
+/*
+ * Initialize main buffer controller.
+ */
+
+GLOBAL(void)
+jinit_d_main_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)
+{
+  my_main_ptr main;
+  int ci, rgroup, ngroups;
+  jpeg_component_info *compptr;
+
+  main = (my_main_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_main_controller));
+  cinfo->main = (struct jpeg_d_main_controller *) main;
+  main->pub.start_pass = start_pass_main;
+
+  if (need_full_buffer)		/* shouldn't happen */
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+
+  /* Allocate the workspace.
+   * ngroups is the number of row groups we need.
+   */
+  if (cinfo->upsample->need_context_rows) {
+    if (cinfo->min_DCT_scaled_size < 2) /* unsupported, see comments above */
+      ERREXIT(cinfo, JERR_NOTIMPL);
+    alloc_funny_pointers(cinfo); /* Alloc space for xbuffer[] lists */
+    ngroups = cinfo->min_DCT_scaled_size + 2;
+  } else {
+    ngroups = cinfo->min_DCT_scaled_size;
+  }
+
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
+      cinfo->min_DCT_scaled_size; /* height of a row group of component */
+    main->buffer[ci] = (*cinfo->mem->alloc_sarray)
+			((j_common_ptr) cinfo, JPOOL_IMAGE,
+			 compptr->width_in_blocks * compptr->DCT_scaled_size,
+			 (JDIMENSION) (rgroup * ngroups));
+  }
+}
+
+#if defined(__VISAGECPP__)
+#  ifdef start_pass_main2
+#   undef start_pass_main2
+#  endif
+#  ifdef process_data_simple_main2
+#   undef process_data_simple_main2
+#  endif
+#endif
diff --git a/Source/3rd Party/wx/src/jpeg/jdmarker.c b/Source/3rd Party/wx/src/jpeg/jdmarker.c
index bbba98509..39bed5422 100644
--- a/Source/3rd Party/wx/src/jpeg/jdmarker.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdmarker.c	
@@ -1,1360 +1,1360 @@
-/*
- * jdmarker.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains routines to decode JPEG datastream markers.
- * Most of the complexity arises from our desire to support input
- * suspension: if not all of the data for a marker is available,
- * we must exit back to the application.  On resumption, we reprocess
- * the marker.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-typedef enum {			/* JPEG marker codes */
-  M_SOF0  = 0xc0,
-  M_SOF1  = 0xc1,
-  M_SOF2  = 0xc2,
-  M_SOF3  = 0xc3,
-  
-  M_SOF5  = 0xc5,
-  M_SOF6  = 0xc6,
-  M_SOF7  = 0xc7,
-  
-  M_JPG   = 0xc8,
-  M_SOF9  = 0xc9,
-  M_SOF10 = 0xca,
-  M_SOF11 = 0xcb,
-  
-  M_SOF13 = 0xcd,
-  M_SOF14 = 0xce,
-  M_SOF15 = 0xcf,
-  
-  M_DHT   = 0xc4,
-  
-  M_DAC   = 0xcc,
-  
-  M_RST0  = 0xd0,
-  M_RST1  = 0xd1,
-  M_RST2  = 0xd2,
-  M_RST3  = 0xd3,
-  M_RST4  = 0xd4,
-  M_RST5  = 0xd5,
-  M_RST6  = 0xd6,
-  M_RST7  = 0xd7,
-  
-  M_SOI   = 0xd8,
-  M_EOI   = 0xd9,
-  M_SOS   = 0xda,
-  M_DQT   = 0xdb,
-  M_DNL   = 0xdc,
-  M_DRI   = 0xdd,
-  M_DHP   = 0xde,
-  M_EXP   = 0xdf,
-  
-  M_APP0  = 0xe0,
-  M_APP1  = 0xe1,
-  M_APP2  = 0xe2,
-  M_APP3  = 0xe3,
-  M_APP4  = 0xe4,
-  M_APP5  = 0xe5,
-  M_APP6  = 0xe6,
-  M_APP7  = 0xe7,
-  M_APP8  = 0xe8,
-  M_APP9  = 0xe9,
-  M_APP10 = 0xea,
-  M_APP11 = 0xeb,
-  M_APP12 = 0xec,
-  M_APP13 = 0xed,
-  M_APP14 = 0xee,
-  M_APP15 = 0xef,
-  
-  M_JPG0  = 0xf0,
-  M_JPG13 = 0xfd,
-  M_COM   = 0xfe,
-  
-  M_TEM   = 0x01,
-  
-  M_ERROR = 0x100
-} JPEG_MARKER;
-
-
-/* Private state */
-
-typedef struct {
-  struct jpeg_marker_reader pub; /* public fields */
-
-  /* Application-overridable marker processing methods */
-  jpeg_marker_parser_method process_COM;
-  jpeg_marker_parser_method process_APPn[16];
-
-  /* Limit on marker data length to save for each marker type */
-  unsigned int length_limit_COM;
-  unsigned int length_limit_APPn[16];
-
-  /* Status of COM/APPn marker saving */
-  jpeg_saved_marker_ptr cur_marker;	/* NULL if not processing a marker */
-  unsigned int bytes_read;		/* data bytes read so far in marker */
-  /* Note: cur_marker is not linked into marker_list until it's all read. */
-} my_marker_reader;
-
-typedef my_marker_reader * my_marker_ptr;
-
-
-/*
- * Macros for fetching data from the data source module.
- *
- * At all times, cinfo->src->next_input_byte and ->bytes_in_buffer reflect
- * the current restart point; we update them only when we have reached a
- * suitable place to restart if a suspension occurs.
- */
-
-/* Declare and initialize local copies of input pointer/count */
-#define INPUT_VARS(cinfo)  \
-	struct jpeg_source_mgr * datasrc = (cinfo)->src;  \
-	const JOCTET * next_input_byte = datasrc->next_input_byte;  \
-	size_t bytes_in_buffer = datasrc->bytes_in_buffer
-
-/* Unload the local copies --- do this only at a restart boundary */
-#define INPUT_SYNC(cinfo)  \
-	( datasrc->next_input_byte = next_input_byte,  \
-	  datasrc->bytes_in_buffer = bytes_in_buffer )
-
-/* Reload the local copies --- used only in MAKE_BYTE_AVAIL */
-#define INPUT_RELOAD(cinfo)  \
-	( next_input_byte = datasrc->next_input_byte,  \
-	  bytes_in_buffer = datasrc->bytes_in_buffer )
-
-/* Internal macro for INPUT_BYTE and INPUT_2BYTES: make a byte available.
- * Note we do *not* do INPUT_SYNC before calling fill_input_buffer,
- * but we must reload the local copies after a successful fill.
- */
-#define MAKE_BYTE_AVAIL(cinfo,action)  \
-	if (bytes_in_buffer == 0) {  \
-	  if (! (*datasrc->fill_input_buffer) (cinfo))  \
-	    { action; }  \
-	  INPUT_RELOAD(cinfo);  \
-	}
-
-/* Read a byte into variable V.
- * If must suspend, take the specified action (typically "return FALSE").
- */
-#define INPUT_BYTE(cinfo,V,action)  \
-	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \
-		  bytes_in_buffer--; \
-		  V = GETJOCTET(*next_input_byte++); )
-
-/* As above, but read two bytes interpreted as an unsigned 16-bit integer.
- * V should be declared unsigned int or perhaps INT32.
- */
-#define INPUT_2BYTES(cinfo,V,action)  \
-	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \
-		  bytes_in_buffer--; \
-		  V = ((unsigned int) GETJOCTET(*next_input_byte++)) << 8; \
-		  MAKE_BYTE_AVAIL(cinfo,action); \
-		  bytes_in_buffer--; \
-		  V += GETJOCTET(*next_input_byte++); )
-
-
-/*
- * Routines to process JPEG markers.
- *
- * Entry condition: JPEG marker itself has been read and its code saved
- *   in cinfo->unread_marker; input restart point is just after the marker.
- *
- * Exit: if return TRUE, have read and processed any parameters, and have
- *   updated the restart point to point after the parameters.
- *   If return FALSE, was forced to suspend before reaching end of
- *   marker parameters; restart point has not been moved.  Same routine
- *   will be called again after application supplies more input data.
- *
- * This approach to suspension assumes that all of a marker's parameters
- * can fit into a single input bufferload.  This should hold for "normal"
- * markers.  Some COM/APPn markers might have large parameter segments
- * that might not fit.  If we are simply dropping such a marker, we use
- * skip_input_data to get past it, and thereby put the problem on the
- * source manager's shoulders.  If we are saving the marker's contents
- * into memory, we use a slightly different convention: when forced to
- * suspend, the marker processor updates the restart point to the end of
- * what it's consumed (ie, the end of the buffer) before returning FALSE.
- * On resumption, cinfo->unread_marker still contains the marker code,
- * but the data source will point to the next chunk of marker data.
- * The marker processor must retain internal state to deal with this.
- *
- * Note that we don't bother to avoid duplicate trace messages if a
- * suspension occurs within marker parameters.  Other side effects
- * require more care.
- */
-
-
-LOCAL(wxjpeg_boolean)
-get_soi (j_decompress_ptr cinfo)
-/* Process an SOI marker */
-{
-  int i;
-  
-  TRACEMS(cinfo, 1, JTRC_SOI);
-
-  if (cinfo->marker->saw_SOI)
-    ERREXIT(cinfo, JERR_SOI_DUPLICATE);
-
-  /* Reset all parameters that are defined to be reset by SOI */
-
-  for (i = 0; i < NUM_ARITH_TBLS; i++) {
-    cinfo->arith_dc_L[i] = 0;
-    cinfo->arith_dc_U[i] = 1;
-    cinfo->arith_ac_K[i] = 5;
-  }
-  cinfo->restart_interval = 0;
-
-  /* Set initial assumptions for colorspace etc */
-
-  cinfo->jpeg_color_space = JCS_UNKNOWN;
-  cinfo->CCIR601_sampling = FALSE; /* Assume non-CCIR sampling??? */
-
-  cinfo->saw_JFIF_marker = FALSE;
-  cinfo->JFIF_major_version = 1; /* set default JFIF APP0 values */
-  cinfo->JFIF_minor_version = 1;
-  cinfo->density_unit = 0;
-  cinfo->X_density = 1;
-  cinfo->Y_density = 1;
-  cinfo->saw_Adobe_marker = FALSE;
-  cinfo->Adobe_transform = 0;
-
-  cinfo->marker->saw_SOI = TRUE;
-
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-get_sof (j_decompress_ptr cinfo, wxjpeg_boolean is_prog, wxjpeg_boolean is_arith)
-/* Process a SOFn marker */
-{
-  JPEG_INT32 length;
-  int c, ci;
-  jpeg_component_info * compptr;
-  INPUT_VARS(cinfo);
-
-  cinfo->progressive_mode = is_prog;
-  cinfo->arith_code = is_arith;
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-
-  INPUT_BYTE(cinfo, cinfo->data_precision, return FALSE);
-  INPUT_2BYTES(cinfo, cinfo->image_height, return FALSE);
-  INPUT_2BYTES(cinfo, cinfo->image_width, return FALSE);
-  INPUT_BYTE(cinfo, cinfo->num_components, return FALSE);
-
-  length -= 8;
-
-  TRACEMS4(cinfo, 1, JTRC_SOF, cinfo->unread_marker,
-	   (int) cinfo->image_width, (int) cinfo->image_height,
-	   cinfo->num_components);
-
-  if (cinfo->marker->saw_SOF)
-    ERREXIT(cinfo, JERR_SOF_DUPLICATE);
-
-  /* We don't support files in which the image height is initially specified */
-  /* as 0 and is later redefined by DNL.  As long as we have to check that,  */
-  /* might as well have a general sanity check. */
-  if (cinfo->image_height <= 0 || cinfo->image_width <= 0
-      || cinfo->num_components <= 0)
-    ERREXIT(cinfo, JERR_EMPTY_IMAGE);
-
-  if (length != (cinfo->num_components * 3))
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  if (cinfo->comp_info == NULL)	/* do only once, even if suspend */
-    cinfo->comp_info = (jpeg_component_info *) (*cinfo->mem->alloc_small)
-			((j_common_ptr) cinfo, JPOOL_IMAGE,
-			 cinfo->num_components * SIZEOF(jpeg_component_info));
-  
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    compptr->component_index = ci;
-    INPUT_BYTE(cinfo, compptr->component_id, return FALSE);
-    INPUT_BYTE(cinfo, c, return FALSE);
-    compptr->h_samp_factor = (c >> 4) & 15;
-    compptr->v_samp_factor = (c     ) & 15;
-    INPUT_BYTE(cinfo, compptr->quant_tbl_no, return FALSE);
-
-    TRACEMS4(cinfo, 1, JTRC_SOF_COMPONENT,
-	     compptr->component_id, compptr->h_samp_factor,
-	     compptr->v_samp_factor, compptr->quant_tbl_no);
-  }
-
-  cinfo->marker->saw_SOF = TRUE;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-get_sos (j_decompress_ptr cinfo)
-/* Process a SOS marker */
-{
-  JPEG_INT32 length;
-  int i, ci, n, c, cc;
-  jpeg_component_info * compptr;
-  INPUT_VARS(cinfo);
-
-  if (! cinfo->marker->saw_SOF)
-    ERREXIT(cinfo, JERR_SOS_NO_SOF);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-
-  INPUT_BYTE(cinfo, n, return FALSE); /* Number of components */
-
-  TRACEMS1(cinfo, 1, JTRC_SOS, n);
-
-  if (length != (n * 2 + 6) || n < 1 || n > MAX_COMPS_IN_SCAN)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  cinfo->comps_in_scan = n;
-
-  /* Collect the component-spec parameters */
-
-  for (i = 0; i < n; i++) {
-    INPUT_BYTE(cinfo, cc, return FALSE);
-    INPUT_BYTE(cinfo, c, return FALSE);
-    
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      if (cc == compptr->component_id)
-	goto id_found;
-    }
-
-    ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
-
-  id_found:
-
-    cinfo->cur_comp_info[i] = compptr;
-    compptr->dc_tbl_no = (c >> 4) & 15;
-    compptr->ac_tbl_no = (c     ) & 15;
-    
-    TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
-	     compptr->dc_tbl_no, compptr->ac_tbl_no);
-  }
-
-  /* Collect the additional scan parameters Ss, Se, Ah/Al. */
-  INPUT_BYTE(cinfo, c, return FALSE);
-  cinfo->Ss = c;
-  INPUT_BYTE(cinfo, c, return FALSE);
-  cinfo->Se = c;
-  INPUT_BYTE(cinfo, c, return FALSE);
-  cinfo->Ah = (c >> 4) & 15;
-  cinfo->Al = (c     ) & 15;
-
-  TRACEMS4(cinfo, 1, JTRC_SOS_PARAMS, cinfo->Ss, cinfo->Se,
-	   cinfo->Ah, cinfo->Al);
-
-  /* Prepare to scan data & restart markers */
-  cinfo->marker->next_restart_num = 0;
-
-  /* Count another SOS marker */
-  cinfo->input_scan_number++;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-#ifdef D_ARITH_CODING_SUPPORTED
-
-LOCAL(wxjpeg_boolean)
-get_dac (j_decompress_ptr cinfo)
-/* Process a DAC marker */
-{
-  JPEG_INT32 length;
-  int index, val;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-  
-  while (length > 0) {
-    INPUT_BYTE(cinfo, index, return FALSE);
-    INPUT_BYTE(cinfo, val, return FALSE);
-
-    length -= 2;
-
-    TRACEMS2(cinfo, 1, JTRC_DAC, index, val);
-
-    if (index < 0 || index >= (2*NUM_ARITH_TBLS))
-      ERREXIT1(cinfo, JERR_DAC_INDEX, index);
-
-    if (index >= NUM_ARITH_TBLS) { /* define AC table */
-      cinfo->arith_ac_K[index-NUM_ARITH_TBLS] = (UINT8) val;
-    } else {			/* define DC table */
-      cinfo->arith_dc_L[index] = (UINT8) (val & 0x0F);
-      cinfo->arith_dc_U[index] = (UINT8) (val >> 4);
-      if (cinfo->arith_dc_L[index] > cinfo->arith_dc_U[index])
-	ERREXIT1(cinfo, JERR_DAC_VALUE, val);
-    }
-  }
-
-  if (length != 0)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-#else /* ! D_ARITH_CODING_SUPPORTED */
-
-#define get_dac(cinfo)  skip_variable(cinfo)
-
-#endif /* D_ARITH_CODING_SUPPORTED */
-
-
-LOCAL(wxjpeg_boolean)
-get_dht (j_decompress_ptr cinfo)
-/* Process a DHT marker */
-{
-  JPEG_INT32 length;
-  UINT8 bits[17];
-  UINT8 huffval[256];
-  int i, index, count;
-  JHUFF_TBL **htblptr;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-  
-  while (length > 16) {
-    INPUT_BYTE(cinfo, index, return FALSE);
-
-    TRACEMS1(cinfo, 1, JTRC_DHT, index);
-      
-    bits[0] = 0;
-    count = 0;
-    for (i = 1; i <= 16; i++) {
-      INPUT_BYTE(cinfo, bits[i], return FALSE);
-      count += bits[i];
-    }
-
-    length -= 1 + 16;
-
-    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,
-	     bits[1], bits[2], bits[3], bits[4],
-	     bits[5], bits[6], bits[7], bits[8]);
-    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,
-	     bits[9], bits[10], bits[11], bits[12],
-	     bits[13], bits[14], bits[15], bits[16]);
-
-    /* Here we just do minimal validation of the counts to avoid walking
-     * off the end of our table space.  jdhuff.c will check more carefully.
-     */
-    if (count > 256 || ((JPEG_INT32) count) > length)
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-
-    for (i = 0; i < count; i++)
-      INPUT_BYTE(cinfo, huffval[i], return FALSE);
-
-    length -= count;
-
-    if (index & 0x10) {		/* AC table definition */
-      index -= 0x10;
-      htblptr = &cinfo->ac_huff_tbl_ptrs[index];
-    } else {			/* DC table definition */
-      htblptr = &cinfo->dc_huff_tbl_ptrs[index];
-    }
-
-    if (index < 0 || index >= NUM_HUFF_TBLS)
-      ERREXIT1(cinfo, JERR_DHT_INDEX, index);
-
-    if (*htblptr == NULL)
-      *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-  
-    MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
-    MEMCOPY((*htblptr)->huffval, huffval, SIZEOF((*htblptr)->huffval));
-  }
-
-  if (length != 0)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-get_dqt (j_decompress_ptr cinfo)
-/* Process a DQT marker */
-{
-  JPEG_INT32 length;
-  int n, i, prec;
-  unsigned int tmp;
-  JQUANT_TBL *quant_ptr;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-
-  while (length > 0) {
-    INPUT_BYTE(cinfo, n, return FALSE);
-    prec = n >> 4;
-    n &= 0x0F;
-
-    TRACEMS2(cinfo, 1, JTRC_DQT, n, prec);
-
-    if (n >= NUM_QUANT_TBLS)
-      ERREXIT1(cinfo, JERR_DQT_INDEX, n);
-      
-    if (cinfo->quant_tbl_ptrs[n] == NULL)
-      cinfo->quant_tbl_ptrs[n] = jpeg_alloc_quant_table((j_common_ptr) cinfo);
-    quant_ptr = cinfo->quant_tbl_ptrs[n];
-
-    for (i = 0; i < DCTSIZE2; i++) {
-      if (prec)
-	INPUT_2BYTES(cinfo, tmp, return FALSE);
-      else
-	INPUT_BYTE(cinfo, tmp, return FALSE);
-      /* We convert the zigzag-order table to natural array order. */
-      quant_ptr->quantval[jpeg_natural_order[i]] = (UINT16) tmp;
-    }
-
-    if (cinfo->err->trace_level >= 2) {
-      for (i = 0; i < DCTSIZE2; i += 8) {
-	TRACEMS8(cinfo, 2, JTRC_QUANTVALS,
-		 quant_ptr->quantval[i],   quant_ptr->quantval[i+1],
-		 quant_ptr->quantval[i+2], quant_ptr->quantval[i+3],
-		 quant_ptr->quantval[i+4], quant_ptr->quantval[i+5],
-		 quant_ptr->quantval[i+6], quant_ptr->quantval[i+7]);
-      }
-    }
-
-    length -= DCTSIZE2+1;
-    if (prec) length -= DCTSIZE2;
-  }
-
-  if (length != 0)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-get_dri (j_decompress_ptr cinfo)
-/* Process a DRI marker */
-{
-  JPEG_INT32 length;
-  unsigned int tmp;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  
-  if (length != 4)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  INPUT_2BYTES(cinfo, tmp, return FALSE);
-
-  TRACEMS1(cinfo, 1, JTRC_DRI, tmp);
-
-  cinfo->restart_interval = tmp;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-/*
- * Routines for processing APPn and COM markers.
- * These are either saved in memory or discarded, per application request.
- * APP0 and APP14 are specially checked to see if they are
- * JFIF and Adobe markers, respectively.
- */
-
-#define APP0_DATA_LEN	14	/* Length of interesting data in APP0 */
-#define APP14_DATA_LEN	12	/* Length of interesting data in APP14 */
-#define APPN_DATA_LEN	14	/* Must be the largest of the above!! */
-
-
-LOCAL(void)
-examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data,
-	      unsigned int datalen, JPEG_INT32 remaining)
-/* Examine first few bytes from an APP0.
- * Take appropriate action if it is a JFIF marker.
- * datalen is # of bytes at data[], remaining is length of rest of marker data.
- */
-{
-  JPEG_INT32 totallen = (JPEG_INT32) datalen + remaining;
-
-  if (datalen >= APP0_DATA_LEN &&
-      GETJOCTET(data[0]) == 0x4A &&
-      GETJOCTET(data[1]) == 0x46 &&
-      GETJOCTET(data[2]) == 0x49 &&
-      GETJOCTET(data[3]) == 0x46 &&
-      GETJOCTET(data[4]) == 0) {
-    /* Found JFIF APP0 marker: save info */
-    cinfo->saw_JFIF_marker = TRUE;
-    cinfo->JFIF_major_version = GETJOCTET(data[5]);
-    cinfo->JFIF_minor_version = GETJOCTET(data[6]);
-    cinfo->density_unit = GETJOCTET(data[7]);
-    cinfo->X_density = (GETJOCTET(data[8]) << 8) + GETJOCTET(data[9]);
-    cinfo->Y_density = (GETJOCTET(data[10]) << 8) + GETJOCTET(data[11]);
-    /* Check version.
-     * Major version must be 1, anything else signals an incompatible change.
-     * (We used to treat this as an error, but now it's a nonfatal warning,
-     * because some bozo at Hijaak couldn't read the spec.)
-     * Minor version should be 0..2, but process anyway if newer.
-     */
-    if (cinfo->JFIF_major_version != 1)
-      WARNMS2(cinfo, JWRN_JFIF_MAJOR,
-	      cinfo->JFIF_major_version, cinfo->JFIF_minor_version);
-    /* Generate trace messages */
-    TRACEMS5(cinfo, 1, JTRC_JFIF,
-	     cinfo->JFIF_major_version, cinfo->JFIF_minor_version,
-	     cinfo->X_density, cinfo->Y_density, cinfo->density_unit);
-    /* Validate thumbnail dimensions and issue appropriate messages */
-    if (GETJOCTET(data[12]) | GETJOCTET(data[13]))
-      TRACEMS2(cinfo, 1, JTRC_JFIF_THUMBNAIL,
-	       GETJOCTET(data[12]), GETJOCTET(data[13]));
-    totallen -= APP0_DATA_LEN;
-    if (totallen !=
-	((JPEG_INT32)GETJOCTET(data[12]) * (JPEG_INT32)GETJOCTET(data[13]) * (JPEG_INT32) 3))
-      TRACEMS1(cinfo, 1, JTRC_JFIF_BADTHUMBNAILSIZE, (int) totallen);
-  } else if (datalen >= 6 &&
-      GETJOCTET(data[0]) == 0x4A &&
-      GETJOCTET(data[1]) == 0x46 &&
-      GETJOCTET(data[2]) == 0x58 &&
-      GETJOCTET(data[3]) == 0x58 &&
-      GETJOCTET(data[4]) == 0) {
-    /* Found JFIF "JFXX" extension APP0 marker */
-    /* The library doesn't actually do anything with these,
-     * but we try to produce a helpful trace message.
-     */
-    switch (GETJOCTET(data[5])) {
-    case 0x10:
-      TRACEMS1(cinfo, 1, JTRC_THUMB_JPEG, (int) totallen);
-      break;
-    case 0x11:
-      TRACEMS1(cinfo, 1, JTRC_THUMB_PALETTE, (int) totallen);
-      break;
-    case 0x13:
-      TRACEMS1(cinfo, 1, JTRC_THUMB_RGB, (int) totallen);
-      break;
-    default:
-      TRACEMS2(cinfo, 1, JTRC_JFIF_EXTENSION,
-	       GETJOCTET(data[5]), (int) totallen);
-      break;
-    }
-  } else {
-    /* Start of APP0 does not match "JFIF" or "JFXX", or too short */
-    TRACEMS1(cinfo, 1, JTRC_APP0, (int) totallen);
-  }
-}
-
-
-LOCAL(void)
-examine_app14 (j_decompress_ptr cinfo, JOCTET FAR * data,
-	       unsigned int datalen, JPEG_INT32 remaining)
-/* Examine first few bytes from an APP14.
- * Take appropriate action if it is an Adobe marker.
- * datalen is # of bytes at data[], remaining is length of rest of marker data.
- */
-{
-  unsigned int version, flags0, flags1, transform;
-
-  if (datalen >= APP14_DATA_LEN &&
-      GETJOCTET(data[0]) == 0x41 &&
-      GETJOCTET(data[1]) == 0x64 &&
-      GETJOCTET(data[2]) == 0x6F &&
-      GETJOCTET(data[3]) == 0x62 &&
-      GETJOCTET(data[4]) == 0x65) {
-    /* Found Adobe APP14 marker */
-    version = (GETJOCTET(data[5]) << 8) + GETJOCTET(data[6]);
-    flags0 = (GETJOCTET(data[7]) << 8) + GETJOCTET(data[8]);
-    flags1 = (GETJOCTET(data[9]) << 8) + GETJOCTET(data[10]);
-    transform = GETJOCTET(data[11]);
-    TRACEMS4(cinfo, 1, JTRC_ADOBE, version, flags0, flags1, transform);
-    cinfo->saw_Adobe_marker = TRUE;
-    cinfo->Adobe_transform = (UINT8) transform;
-  } else {
-    /* Start of APP14 does not match "Adobe", or too short */
-    TRACEMS1(cinfo, 1, JTRC_APP14, (int) (datalen + remaining));
-  }
-}
-
-
-METHODDEF(wxjpeg_boolean)
-get_interesting_appn (j_decompress_ptr cinfo)
-/* Process an APP0 or APP14 marker without saving it */
-{
-  JPEG_INT32 length;
-  JOCTET b[APPN_DATA_LEN];
-  unsigned int i, numtoread;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-
-  /* get the interesting part of the marker data */
-  if (length >= APPN_DATA_LEN)
-    numtoread = APPN_DATA_LEN;
-  else if (length > 0)
-    numtoread = (unsigned int) length;
-  else
-    numtoread = 0;
-  for (i = 0; i < numtoread; i++)
-    INPUT_BYTE(cinfo, b[i], return FALSE);
-  length -= numtoread;
-
-  /* process it */
-  switch (cinfo->unread_marker) {
-  case M_APP0:
-    examine_app0(cinfo, (JOCTET FAR *) b, numtoread, length);
-    break;
-  case M_APP14:
-    examine_app14(cinfo, (JOCTET FAR *) b, numtoread, length);
-    break;
-  default:
-    /* can't get here unless jpeg_save_markers chooses wrong processor */
-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);
-    break;
-  }
-
-  /* skip any remaining data -- could be lots */
-  INPUT_SYNC(cinfo);
-  if (length > 0)
-    (*cinfo->src->skip_input_data) (cinfo, (long) length);
-
-  return TRUE;
-}
-
-
-#ifdef SAVE_MARKERS_SUPPORTED
-
-METHODDEF(wxjpeg_boolean)
-save_marker (j_decompress_ptr cinfo)
-/* Save an APPn or COM marker into the marker list */
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-  jpeg_saved_marker_ptr cur_marker = marker->cur_marker;
-  unsigned int bytes_read, data_length;
-  JOCTET FAR * data;
-  JPEG_INT32 length = 0;
-  INPUT_VARS(cinfo);
-
-  if (cur_marker == NULL) {
-    /* begin reading a marker */
-    INPUT_2BYTES(cinfo, length, return FALSE);
-    length -= 2;
-    if (length >= 0) {		/* watch out for bogus length word */
-      /* figure out how much we want to save */
-      unsigned int limit;
-      if (cinfo->unread_marker == (int) M_COM)
-	limit = marker->length_limit_COM;
-      else
-	limit = marker->length_limit_APPn[cinfo->unread_marker - (int) M_APP0];
-      if ((unsigned int) length < limit)
-	limit = (unsigned int) length;
-      /* allocate and initialize the marker item */
-      cur_marker = (jpeg_saved_marker_ptr)
-	(*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				    SIZEOF(struct jpeg_marker_struct) + limit);
-      cur_marker->next = NULL;
-      cur_marker->marker = (UINT8) cinfo->unread_marker;
-      cur_marker->original_length = (unsigned int) length;
-      cur_marker->data_length = limit;
-      /* data area is just beyond the jpeg_marker_struct */
-      data = cur_marker->data = (JOCTET FAR *) (cur_marker + 1);
-      marker->cur_marker = cur_marker;
-      marker->bytes_read = 0;
-      bytes_read = 0;
-      data_length = limit;
-    } else {
-      /* deal with bogus length word */
-      bytes_read = data_length = 0;
-      data = NULL;
-    }
-  } else {
-    /* resume reading a marker */
-    bytes_read = marker->bytes_read;
-    data_length = cur_marker->data_length;
-    data = cur_marker->data + bytes_read;
-  }
-
-  while (bytes_read < data_length) {
-    INPUT_SYNC(cinfo);		/* move the restart point to here */
-    marker->bytes_read = bytes_read;
-    /* If there's not at least one byte in buffer, suspend */
-    MAKE_BYTE_AVAIL(cinfo, return FALSE);
-    /* Copy bytes with reasonable rapidity */
-    while (bytes_read < data_length && bytes_in_buffer > 0) {
-      *data++ = *next_input_byte++;
-      bytes_in_buffer--;
-      bytes_read++;
-    }
-  }
-
-  /* Done reading what we want to read */
-  if (cur_marker != NULL) {	/* will be NULL if bogus length word */
-    /* Add new marker to end of list */
-    if (cinfo->marker_list == NULL) {
-      cinfo->marker_list = cur_marker;
-    } else {
-      jpeg_saved_marker_ptr prev = cinfo->marker_list;
-      while (prev->next != NULL)
-	prev = prev->next;
-      prev->next = cur_marker;
-    }
-    /* Reset pointer & calc remaining data length */
-    data = cur_marker->data;
-    length = cur_marker->original_length - data_length;
-  }
-  /* Reset to initial state for next marker */
-  marker->cur_marker = NULL;
-
-  /* Process the marker if interesting; else just make a generic trace msg */
-  switch (cinfo->unread_marker) {
-  case M_APP0:
-    examine_app0(cinfo, data, data_length, length);
-    break;
-  case M_APP14:
-    examine_app14(cinfo, data, data_length, length);
-    break;
-  default:
-    TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker,
-	     (int) (data_length + length));
-    break;
-  }
-
-  /* skip any remaining data -- could be lots */
-  INPUT_SYNC(cinfo);		/* do before skip_input_data */
-  if (length > 0)
-    (*cinfo->src->skip_input_data) (cinfo, (long) length);
-
-  return TRUE;
-}
-
-#endif /* SAVE_MARKERS_SUPPORTED */
-
-
-METHODDEF(wxjpeg_boolean)
-skip_variable (j_decompress_ptr cinfo)
-/* Skip over an unknown or uninteresting variable-length marker */
-{
-  JPEG_INT32 length;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-  
-  TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker, (int) length);
-
-  INPUT_SYNC(cinfo);		/* do before skip_input_data */
-  if (length > 0)
-    (*cinfo->src->skip_input_data) (cinfo, (long) length);
-
-  return TRUE;
-}
-
-
-/*
- * Find the next JPEG marker, save it in cinfo->unread_marker.
- * Returns FALSE if had to suspend before reaching a marker;
- * in that case cinfo->unread_marker is unchanged.
- *
- * Note that the result might not be a valid marker code,
- * but it will never be 0 or FF.
- */
-
-LOCAL(wxjpeg_boolean)
-next_marker (j_decompress_ptr cinfo)
-{
-  int c;
-  INPUT_VARS(cinfo);
-
-  for (;;) {
-    INPUT_BYTE(cinfo, c, return FALSE);
-    /* Skip any non-FF bytes.
-     * This may look a bit inefficient, but it will not occur in a valid file.
-     * We sync after each discarded byte so that a suspending data source
-     * can discard the byte from its buffer.
-     */
-    while (c != 0xFF) {
-      cinfo->marker->discarded_bytes++;
-      INPUT_SYNC(cinfo);
-      INPUT_BYTE(cinfo, c, return FALSE);
-    }
-    /* This loop swallows any duplicate FF bytes.  Extra FFs are legal as
-     * pad bytes, so don't count them in discarded_bytes.  We assume there
-     * will not be so many consecutive FF bytes as to overflow a suspending
-     * data source's input buffer.
-     */
-    do {
-      INPUT_BYTE(cinfo, c, return FALSE);
-    } while (c == 0xFF);
-    if (c != 0)
-      break;			/* found a valid marker, exit loop */
-    /* Reach here if we found a stuffed-zero data sequence (FF/00).
-     * Discard it and loop back to try again.
-     */
-    cinfo->marker->discarded_bytes += 2;
-    INPUT_SYNC(cinfo);
-  }
-
-  if (cinfo->marker->discarded_bytes != 0) {
-    WARNMS2(cinfo, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c);
-    cinfo->marker->discarded_bytes = 0;
-  }
-
-  cinfo->unread_marker = c;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-first_marker (j_decompress_ptr cinfo)
-/* Like next_marker, but used to obtain the initial SOI marker. */
-/* For this marker, we do not allow preceding garbage or fill; otherwise,
- * we might well scan an entire input file before realizing it ain't JPEG.
- * If an application wants to process non-JFIF files, it must seek to the
- * SOI before calling the JPEG library.
- */
-{
-  int c, c2;
-  INPUT_VARS(cinfo);
-
-  INPUT_BYTE(cinfo, c, return FALSE);
-  INPUT_BYTE(cinfo, c2, return FALSE);
-  if (c != 0xFF || c2 != (int) M_SOI)
-    ERREXIT2(cinfo, JERR_NO_SOI, c, c2);
-
-  cinfo->unread_marker = c2;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-/*
- * Read markers until SOS or EOI.
- *
- * Returns same codes as are defined for jpeg_consume_input:
- * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
- */
-
-METHODDEF(int)
-read_markers (j_decompress_ptr cinfo)
-{
-  /* Outer loop repeats once for each marker. */
-  for (;;) {
-    /* Collect the marker proper, unless we already did. */
-    /* NB: first_marker() enforces the requirement that SOI appear first. */
-    if (cinfo->unread_marker == 0) {
-      if (! cinfo->marker->saw_SOI) {
-	if (! first_marker(cinfo))
-	  return JPEG_SUSPENDED;
-      } else {
-	if (! next_marker(cinfo))
-	  return JPEG_SUSPENDED;
-      }
-    }
-    /* At this point cinfo->unread_marker contains the marker code and the
-     * input point is just past the marker proper, but before any parameters.
-     * A suspension will cause us to return with this state still true.
-     */
-    switch (cinfo->unread_marker) {
-    case M_SOI:
-      if (! get_soi(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_SOF0:		/* Baseline */
-    case M_SOF1:		/* Extended sequential, Huffman */
-      if (! get_sof(cinfo, FALSE, FALSE))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_SOF2:		/* Progressive, Huffman */
-      if (! get_sof(cinfo, TRUE, FALSE))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_SOF9:		/* Extended sequential, arithmetic */
-      if (! get_sof(cinfo, FALSE, TRUE))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_SOF10:		/* Progressive, arithmetic */
-      if (! get_sof(cinfo, TRUE, TRUE))
-	return JPEG_SUSPENDED;
-      break;
-
-    /* Currently unsupported SOFn types */
-    case M_SOF3:		/* Lossless, Huffman */
-    case M_SOF5:		/* Differential sequential, Huffman */
-    case M_SOF6:		/* Differential progressive, Huffman */
-    case M_SOF7:		/* Differential lossless, Huffman */
-    case M_JPG:			/* Reserved for JPEG extensions */
-    case M_SOF11:		/* Lossless, arithmetic */
-    case M_SOF13:		/* Differential sequential, arithmetic */
-    case M_SOF14:		/* Differential progressive, arithmetic */
-    case M_SOF15:		/* Differential lossless, arithmetic */
-      ERREXIT1(cinfo, JERR_SOF_UNSUPPORTED, cinfo->unread_marker);
-      break;
-
-    case M_SOS:
-      if (! get_sos(cinfo))
-	return JPEG_SUSPENDED;
-      cinfo->unread_marker = 0;	/* processed the marker */
-      return JPEG_REACHED_SOS;
-    
-    case M_EOI:
-      TRACEMS(cinfo, 1, JTRC_EOI);
-      cinfo->unread_marker = 0;	/* processed the marker */
-      return JPEG_REACHED_EOI;
-      
-    case M_DAC:
-      if (! get_dac(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_DHT:
-      if (! get_dht(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_DQT:
-      if (! get_dqt(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_DRI:
-      if (! get_dri(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_APP0:
-    case M_APP1:
-    case M_APP2:
-    case M_APP3:
-    case M_APP4:
-    case M_APP5:
-    case M_APP6:
-    case M_APP7:
-    case M_APP8:
-    case M_APP9:
-    case M_APP10:
-    case M_APP11:
-    case M_APP12:
-    case M_APP13:
-    case M_APP14:
-    case M_APP15:
-      if (! (*((my_marker_ptr) cinfo->marker)->process_APPn[
-		cinfo->unread_marker - (int) M_APP0]) (cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_COM:
-      if (! (*((my_marker_ptr) cinfo->marker)->process_COM) (cinfo))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_RST0:		/* these are all parameterless */
-    case M_RST1:
-    case M_RST2:
-    case M_RST3:
-    case M_RST4:
-    case M_RST5:
-    case M_RST6:
-    case M_RST7:
-    case M_TEM:
-      TRACEMS1(cinfo, 1, JTRC_PARMLESS_MARKER, cinfo->unread_marker);
-      break;
-
-    case M_DNL:			/* Ignore DNL ... perhaps the wrong thing */
-      if (! skip_variable(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-
-    default:			/* must be DHP, EXP, JPGn, or RESn */
-      /* For now, we treat the reserved markers as fatal errors since they are
-       * likely to be used to signal incompatible JPEG Part 3 extensions.
-       * Once the JPEG 3 version-number marker is well defined, this code
-       * ought to change!
-       */
-      ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);
-      break;
-    }
-    /* Successfully processed marker, so reset state variable */
-    cinfo->unread_marker = 0;
-  } /* end loop */
-}
-
-
-/*
- * Read a restart marker, which is expected to appear next in the datastream;
- * if the marker is not there, take appropriate recovery action.
- * Returns FALSE if suspension is required.
- *
- * This is called by the entropy decoder after it has read an appropriate
- * number of MCUs.  cinfo->unread_marker may be nonzero if the entropy decoder
- * has already read a marker from the data source.  Under normal conditions
- * cinfo->unread_marker will be reset to 0 before returning; if not reset,
- * it holds a marker which the decoder will be unable to read past.
- */
-
-METHODDEF(wxjpeg_boolean)
-read_restart_marker (j_decompress_ptr cinfo)
-{
-  /* Obtain a marker unless we already did. */
-  /* Note that next_marker will complain if it skips any data. */
-  if (cinfo->unread_marker == 0) {
-    if (! next_marker(cinfo))
-      return FALSE;
-  }
-
-  if (cinfo->unread_marker ==
-      ((int) M_RST0 + cinfo->marker->next_restart_num)) {
-    /* Normal case --- swallow the marker and let entropy decoder continue */
-    TRACEMS1(cinfo, 3, JTRC_RST, cinfo->marker->next_restart_num);
-    cinfo->unread_marker = 0;
-  } else {
-    /* Uh-oh, the restart markers have been messed up. */
-    /* Let the data source manager determine how to resync. */
-    if (! (*cinfo->src->resync_to_restart) (cinfo,
-					    cinfo->marker->next_restart_num))
-      return FALSE;
-  }
-
-  /* Update next-restart state */
-  cinfo->marker->next_restart_num = (cinfo->marker->next_restart_num + 1) & 7;
-
-  return TRUE;
-}
-
-
-/*
- * This is the default resync_to_restart method for data source managers
- * to use if they don't have any better approach.  Some data source managers
- * may be able to back up, or may have additional knowledge about the data
- * which permits a more intelligent recovery strategy; such managers would
- * presumably supply their own resync method.
- *
- * read_restart_marker calls resync_to_restart if it finds a marker other than
- * the restart marker it was expecting.  (This code is *not* used unless
- * a nonzero restart interval has been declared.)  cinfo->unread_marker is
- * the marker code actually found (might be anything, except 0 or FF).
- * The desired restart marker number (0..7) is passed as a parameter.
- * This routine is supposed to apply whatever error recovery strategy seems
- * appropriate in order to position the input stream to the next data segment.
- * Note that cinfo->unread_marker is treated as a marker appearing before
- * the current data-source input point; usually it should be reset to zero
- * before returning.
- * Returns FALSE if suspension is required.
- *
- * This implementation is substantially constrained by wanting to treat the
- * input as a data stream; this means we can't back up.  Therefore, we have
- * only the following actions to work with:
- *   1. Simply discard the marker and let the entropy decoder resume at next
- *      byte of file.
- *   2. Read forward until we find another marker, discarding intervening
- *      data.  (In theory we could look ahead within the current bufferload,
- *      without having to discard data if we don't find the desired marker.
- *      This idea is not implemented here, in part because it makes behavior
- *      dependent on buffer size and chance buffer-boundary positions.)
- *   3. Leave the marker unread (by failing to zero cinfo->unread_marker).
- *      This will cause the entropy decoder to process an empty data segment,
- *      inserting dummy zeroes, and then we will reprocess the marker.
- *
- * #2 is appropriate if we think the desired marker lies ahead, while #3 is
- * appropriate if the found marker is a future restart marker (indicating
- * that we have missed the desired restart marker, probably because it got
- * corrupted).
- * We apply #2 or #3 if the found marker is a restart marker no more than
- * two counts behind or ahead of the expected one.  We also apply #2 if the
- * found marker is not a legal JPEG marker code (it's certainly bogus data).
- * If the found marker is a restart marker more than 2 counts away, we do #1
- * (too much risk that the marker is erroneous; with luck we will be able to
- * resync at some future point).
- * For any valid non-restart JPEG marker, we apply #3.  This keeps us from
- * overrunning the end of a scan.  An implementation limited to single-scan
- * files might find it better to apply #2 for markers other than EOI, since
- * any other marker would have to be bogus data in that case.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired)
-{
-  int marker = cinfo->unread_marker;
-  int action = 1;
-  
-  /* Always put up a warning. */
-  WARNMS2(cinfo, JWRN_MUST_RESYNC, marker, desired);
-  
-  /* Outer loop handles repeated decision after scanning forward. */
-  for (;;) {
-    if (marker < (int) M_SOF0)
-      action = 2;		/* invalid marker */
-    else if (marker < (int) M_RST0 || marker > (int) M_RST7)
-      action = 3;		/* valid non-restart marker */
-    else {
-      if (marker == ((int) M_RST0 + ((desired+1) & 7)) ||
-	  marker == ((int) M_RST0 + ((desired+2) & 7)))
-	action = 3;		/* one of the next two expected restarts */
-      else if (marker == ((int) M_RST0 + ((desired-1) & 7)) ||
-	       marker == ((int) M_RST0 + ((desired-2) & 7)))
-	action = 2;		/* a prior restart, so advance */
-      else
-	action = 1;		/* desired restart or too far away */
-    }
-    TRACEMS2(cinfo, 4, JTRC_RECOVERY_ACTION, marker, action);
-    switch (action) {
-    case 1:
-      /* Discard marker and let entropy decoder resume processing. */
-      cinfo->unread_marker = 0;
-      return TRUE;
-    case 2:
-      /* Scan to the next marker, and repeat the decision loop. */
-      if (! next_marker(cinfo))
-	return FALSE;
-      marker = cinfo->unread_marker;
-      break;
-    case 3:
-      /* Return without advancing past this marker. */
-      /* Entropy decoder will be forced to process an empty segment. */
-      return TRUE;
-    }
-  } /* end loop */
-}
-
-
-/*
- * Reset marker processing state to begin a fresh datastream.
- */
-
-METHODDEF(void)
-reset_marker_reader (j_decompress_ptr cinfo)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-
-  cinfo->comp_info = NULL;		/* until allocated by get_sof */
-  cinfo->input_scan_number = 0;		/* no SOS seen yet */
-  cinfo->unread_marker = 0;		/* no pending marker */
-  marker->pub.saw_SOI = FALSE;		/* set internal state too */
-  marker->pub.saw_SOF = FALSE;
-  marker->pub.discarded_bytes = 0;
-  marker->cur_marker = NULL;
-}
-
-
-/*
- * Initialize the marker reader module.
- * This is called only once, when the decompression object is created.
- */
-
-GLOBAL(void)
-jinit_marker_reader (j_decompress_ptr cinfo)
-{
-  my_marker_ptr marker;
-  int i;
-
-  /* Create subobject in permanent pool */
-  marker = (my_marker_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				SIZEOF(my_marker_reader));
-  cinfo->marker = (struct jpeg_marker_reader *) marker;
-  /* Initialize public method pointers */
-  marker->pub.reset_marker_reader = reset_marker_reader;
-  marker->pub.read_markers = read_markers;
-  marker->pub.read_restart_marker = read_restart_marker;
-  /* Initialize COM/APPn processing.
-   * By default, we examine and then discard APP0 and APP14,
-   * but simply discard COM and all other APPn.
-   */
-  marker->process_COM = skip_variable;
-  marker->length_limit_COM = 0;
-  for (i = 0; i < 16; i++) {
-    marker->process_APPn[i] = skip_variable;
-    marker->length_limit_APPn[i] = 0;
-  }
-  marker->process_APPn[0] = get_interesting_appn;
-  marker->process_APPn[14] = get_interesting_appn;
-  /* Reset marker processing state */
-  reset_marker_reader(cinfo);
-}
-
-
-/*
- * Control saving of COM and APPn markers into marker_list.
- */
-
-#ifdef SAVE_MARKERS_SUPPORTED
-
-GLOBAL(void)
-jpeg_save_markers (j_decompress_ptr cinfo, int marker_code,
-		   unsigned int length_limit)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-  long maxlength;
-  jpeg_marker_parser_method processor;
-
-  /* Length limit mustn't be larger than what we can allocate
-   * (should only be a concern in a 16-bit environment).
-   */
-  maxlength = cinfo->mem->max_alloc_chunk - SIZEOF(struct jpeg_marker_struct);
-  if (((long) length_limit) > maxlength)
-    length_limit = (unsigned int) maxlength;
-
-  /* Choose processor routine to use.
-   * APP0/APP14 have special requirements.
-   */
-  if (length_limit) {
-    processor = save_marker;
-    /* If saving APP0/APP14, save at least enough for our internal use. */
-    if (marker_code == (int) M_APP0 && length_limit < APP0_DATA_LEN)
-      length_limit = APP0_DATA_LEN;
-    else if (marker_code == (int) M_APP14 && length_limit < APP14_DATA_LEN)
-      length_limit = APP14_DATA_LEN;
-  } else {
-    processor = skip_variable;
-    /* If discarding APP0/APP14, use our regular on-the-fly processor. */
-    if (marker_code == (int) M_APP0 || marker_code == (int) M_APP14)
-      processor = get_interesting_appn;
-  }
-
-  if (marker_code == (int) M_COM) {
-    marker->process_COM = processor;
-    marker->length_limit_COM = length_limit;
-  } else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15) {
-    marker->process_APPn[marker_code - (int) M_APP0] = processor;
-    marker->length_limit_APPn[marker_code - (int) M_APP0] = length_limit;
-  } else
-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
-}
-
-#endif /* SAVE_MARKERS_SUPPORTED */
-
-
-/*
- * Install a special processing method for COM or APPn markers.
- */
-
-GLOBAL(void)
-jpeg_set_marker_processor (j_decompress_ptr cinfo, int marker_code,
-			   jpeg_marker_parser_method routine)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-
-  if (marker_code == (int) M_COM)
-    marker->process_COM = routine;
-  else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15)
-    marker->process_APPn[marker_code - (int) M_APP0] = routine;
-  else
-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
-}
+/*
+ * jdmarker.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains routines to decode JPEG datastream markers.
+ * Most of the complexity arises from our desire to support input
+ * suspension: if not all of the data for a marker is available,
+ * we must exit back to the application.  On resumption, we reprocess
+ * the marker.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+typedef enum {			/* JPEG marker codes */
+  M_SOF0  = 0xc0,
+  M_SOF1  = 0xc1,
+  M_SOF2  = 0xc2,
+  M_SOF3  = 0xc3,
+  
+  M_SOF5  = 0xc5,
+  M_SOF6  = 0xc6,
+  M_SOF7  = 0xc7,
+  
+  M_JPG   = 0xc8,
+  M_SOF9  = 0xc9,
+  M_SOF10 = 0xca,
+  M_SOF11 = 0xcb,
+  
+  M_SOF13 = 0xcd,
+  M_SOF14 = 0xce,
+  M_SOF15 = 0xcf,
+  
+  M_DHT   = 0xc4,
+  
+  M_DAC   = 0xcc,
+  
+  M_RST0  = 0xd0,
+  M_RST1  = 0xd1,
+  M_RST2  = 0xd2,
+  M_RST3  = 0xd3,
+  M_RST4  = 0xd4,
+  M_RST5  = 0xd5,
+  M_RST6  = 0xd6,
+  M_RST7  = 0xd7,
+  
+  M_SOI   = 0xd8,
+  M_EOI   = 0xd9,
+  M_SOS   = 0xda,
+  M_DQT   = 0xdb,
+  M_DNL   = 0xdc,
+  M_DRI   = 0xdd,
+  M_DHP   = 0xde,
+  M_EXP   = 0xdf,
+  
+  M_APP0  = 0xe0,
+  M_APP1  = 0xe1,
+  M_APP2  = 0xe2,
+  M_APP3  = 0xe3,
+  M_APP4  = 0xe4,
+  M_APP5  = 0xe5,
+  M_APP6  = 0xe6,
+  M_APP7  = 0xe7,
+  M_APP8  = 0xe8,
+  M_APP9  = 0xe9,
+  M_APP10 = 0xea,
+  M_APP11 = 0xeb,
+  M_APP12 = 0xec,
+  M_APP13 = 0xed,
+  M_APP14 = 0xee,
+  M_APP15 = 0xef,
+  
+  M_JPG0  = 0xf0,
+  M_JPG13 = 0xfd,
+  M_COM   = 0xfe,
+  
+  M_TEM   = 0x01,
+  
+  M_ERROR = 0x100
+} JPEG_MARKER;
+
+
+/* Private state */
+
+typedef struct {
+  struct jpeg_marker_reader pub; /* public fields */
+
+  /* Application-overridable marker processing methods */
+  jpeg_marker_parser_method process_COM;
+  jpeg_marker_parser_method process_APPn[16];
+
+  /* Limit on marker data length to save for each marker type */
+  unsigned int length_limit_COM;
+  unsigned int length_limit_APPn[16];
+
+  /* Status of COM/APPn marker saving */
+  jpeg_saved_marker_ptr cur_marker;	/* NULL if not processing a marker */
+  unsigned int bytes_read;		/* data bytes read so far in marker */
+  /* Note: cur_marker is not linked into marker_list until it's all read. */
+} my_marker_reader;
+
+typedef my_marker_reader * my_marker_ptr;
+
+
+/*
+ * Macros for fetching data from the data source module.
+ *
+ * At all times, cinfo->src->next_input_byte and ->bytes_in_buffer reflect
+ * the current restart point; we update them only when we have reached a
+ * suitable place to restart if a suspension occurs.
+ */
+
+/* Declare and initialize local copies of input pointer/count */
+#define INPUT_VARS(cinfo)  \
+	struct jpeg_source_mgr * datasrc = (cinfo)->src;  \
+	const JOCTET * next_input_byte = datasrc->next_input_byte;  \
+	size_t bytes_in_buffer = datasrc->bytes_in_buffer
+
+/* Unload the local copies --- do this only at a restart boundary */
+#define INPUT_SYNC(cinfo)  \
+	( datasrc->next_input_byte = next_input_byte,  \
+	  datasrc->bytes_in_buffer = bytes_in_buffer )
+
+/* Reload the local copies --- used only in MAKE_BYTE_AVAIL */
+#define INPUT_RELOAD(cinfo)  \
+	( next_input_byte = datasrc->next_input_byte,  \
+	  bytes_in_buffer = datasrc->bytes_in_buffer )
+
+/* Internal macro for INPUT_BYTE and INPUT_2BYTES: make a byte available.
+ * Note we do *not* do INPUT_SYNC before calling fill_input_buffer,
+ * but we must reload the local copies after a successful fill.
+ */
+#define MAKE_BYTE_AVAIL(cinfo,action)  \
+	if (bytes_in_buffer == 0) {  \
+	  if (! (*datasrc->fill_input_buffer) (cinfo))  \
+	    { action; }  \
+	  INPUT_RELOAD(cinfo);  \
+	}
+
+/* Read a byte into variable V.
+ * If must suspend, take the specified action (typically "return FALSE").
+ */
+#define INPUT_BYTE(cinfo,V,action)  \
+	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \
+		  bytes_in_buffer--; \
+		  V = GETJOCTET(*next_input_byte++); )
+
+/* As above, but read two bytes interpreted as an unsigned 16-bit integer.
+ * V should be declared unsigned int or perhaps INT32.
+ */
+#define INPUT_2BYTES(cinfo,V,action)  \
+	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \
+		  bytes_in_buffer--; \
+		  V = ((unsigned int) GETJOCTET(*next_input_byte++)) << 8; \
+		  MAKE_BYTE_AVAIL(cinfo,action); \
+		  bytes_in_buffer--; \
+		  V += GETJOCTET(*next_input_byte++); )
+
+
+/*
+ * Routines to process JPEG markers.
+ *
+ * Entry condition: JPEG marker itself has been read and its code saved
+ *   in cinfo->unread_marker; input restart point is just after the marker.
+ *
+ * Exit: if return TRUE, have read and processed any parameters, and have
+ *   updated the restart point to point after the parameters.
+ *   If return FALSE, was forced to suspend before reaching end of
+ *   marker parameters; restart point has not been moved.  Same routine
+ *   will be called again after application supplies more input data.
+ *
+ * This approach to suspension assumes that all of a marker's parameters
+ * can fit into a single input bufferload.  This should hold for "normal"
+ * markers.  Some COM/APPn markers might have large parameter segments
+ * that might not fit.  If we are simply dropping such a marker, we use
+ * skip_input_data to get past it, and thereby put the problem on the
+ * source manager's shoulders.  If we are saving the marker's contents
+ * into memory, we use a slightly different convention: when forced to
+ * suspend, the marker processor updates the restart point to the end of
+ * what it's consumed (ie, the end of the buffer) before returning FALSE.
+ * On resumption, cinfo->unread_marker still contains the marker code,
+ * but the data source will point to the next chunk of marker data.
+ * The marker processor must retain internal state to deal with this.
+ *
+ * Note that we don't bother to avoid duplicate trace messages if a
+ * suspension occurs within marker parameters.  Other side effects
+ * require more care.
+ */
+
+
+LOCAL(wxjpeg_boolean)
+get_soi (j_decompress_ptr cinfo)
+/* Process an SOI marker */
+{
+  int i;
+  
+  TRACEMS(cinfo, 1, JTRC_SOI);
+
+  if (cinfo->marker->saw_SOI)
+    ERREXIT(cinfo, JERR_SOI_DUPLICATE);
+
+  /* Reset all parameters that are defined to be reset by SOI */
+
+  for (i = 0; i < NUM_ARITH_TBLS; i++) {
+    cinfo->arith_dc_L[i] = 0;
+    cinfo->arith_dc_U[i] = 1;
+    cinfo->arith_ac_K[i] = 5;
+  }
+  cinfo->restart_interval = 0;
+
+  /* Set initial assumptions for colorspace etc */
+
+  cinfo->jpeg_color_space = JCS_UNKNOWN;
+  cinfo->CCIR601_sampling = FALSE; /* Assume non-CCIR sampling??? */
+
+  cinfo->saw_JFIF_marker = FALSE;
+  cinfo->JFIF_major_version = 1; /* set default JFIF APP0 values */
+  cinfo->JFIF_minor_version = 1;
+  cinfo->density_unit = 0;
+  cinfo->X_density = 1;
+  cinfo->Y_density = 1;
+  cinfo->saw_Adobe_marker = FALSE;
+  cinfo->Adobe_transform = 0;
+
+  cinfo->marker->saw_SOI = TRUE;
+
+  return TRUE;
+}
+
+
+LOCAL(wxjpeg_boolean)
+get_sof (j_decompress_ptr cinfo, wxjpeg_boolean is_prog, wxjpeg_boolean is_arith)
+/* Process a SOFn marker */
+{
+  JPEG_INT32 length;
+  int c, ci;
+  jpeg_component_info * compptr;
+  INPUT_VARS(cinfo);
+
+  cinfo->progressive_mode = is_prog;
+  cinfo->arith_code = is_arith;
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+
+  INPUT_BYTE(cinfo, cinfo->data_precision, return FALSE);
+  INPUT_2BYTES(cinfo, cinfo->image_height, return FALSE);
+  INPUT_2BYTES(cinfo, cinfo->image_width, return FALSE);
+  INPUT_BYTE(cinfo, cinfo->num_components, return FALSE);
+
+  length -= 8;
+
+  TRACEMS4(cinfo, 1, JTRC_SOF, cinfo->unread_marker,
+	   (int) cinfo->image_width, (int) cinfo->image_height,
+	   cinfo->num_components);
+
+  if (cinfo->marker->saw_SOF)
+    ERREXIT(cinfo, JERR_SOF_DUPLICATE);
+
+  /* We don't support files in which the image height is initially specified */
+  /* as 0 and is later redefined by DNL.  As long as we have to check that,  */
+  /* might as well have a general sanity check. */
+  if (cinfo->image_height <= 0 || cinfo->image_width <= 0
+      || cinfo->num_components <= 0)
+    ERREXIT(cinfo, JERR_EMPTY_IMAGE);
+
+  if (length != (cinfo->num_components * 3))
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  if (cinfo->comp_info == NULL)	/* do only once, even if suspend */
+    cinfo->comp_info = (jpeg_component_info *) (*cinfo->mem->alloc_small)
+			((j_common_ptr) cinfo, JPOOL_IMAGE,
+			 cinfo->num_components * SIZEOF(jpeg_component_info));
+  
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    compptr->component_index = ci;
+    INPUT_BYTE(cinfo, compptr->component_id, return FALSE);
+    INPUT_BYTE(cinfo, c, return FALSE);
+    compptr->h_samp_factor = (c >> 4) & 15;
+    compptr->v_samp_factor = (c     ) & 15;
+    INPUT_BYTE(cinfo, compptr->quant_tbl_no, return FALSE);
+
+    TRACEMS4(cinfo, 1, JTRC_SOF_COMPONENT,
+	     compptr->component_id, compptr->h_samp_factor,
+	     compptr->v_samp_factor, compptr->quant_tbl_no);
+  }
+
+  cinfo->marker->saw_SOF = TRUE;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+LOCAL(wxjpeg_boolean)
+get_sos (j_decompress_ptr cinfo)
+/* Process a SOS marker */
+{
+  JPEG_INT32 length;
+  int i, ci, n, c, cc;
+  jpeg_component_info * compptr;
+  INPUT_VARS(cinfo);
+
+  if (! cinfo->marker->saw_SOF)
+    ERREXIT(cinfo, JERR_SOS_NO_SOF);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+
+  INPUT_BYTE(cinfo, n, return FALSE); /* Number of components */
+
+  TRACEMS1(cinfo, 1, JTRC_SOS, n);
+
+  if (length != (n * 2 + 6) || n < 1 || n > MAX_COMPS_IN_SCAN)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  cinfo->comps_in_scan = n;
+
+  /* Collect the component-spec parameters */
+
+  for (i = 0; i < n; i++) {
+    INPUT_BYTE(cinfo, cc, return FALSE);
+    INPUT_BYTE(cinfo, c, return FALSE);
+    
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      if (cc == compptr->component_id)
+	goto id_found;
+    }
+
+    ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
+
+  id_found:
+
+    cinfo->cur_comp_info[i] = compptr;
+    compptr->dc_tbl_no = (c >> 4) & 15;
+    compptr->ac_tbl_no = (c     ) & 15;
+    
+    TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
+	     compptr->dc_tbl_no, compptr->ac_tbl_no);
+  }
+
+  /* Collect the additional scan parameters Ss, Se, Ah/Al. */
+  INPUT_BYTE(cinfo, c, return FALSE);
+  cinfo->Ss = c;
+  INPUT_BYTE(cinfo, c, return FALSE);
+  cinfo->Se = c;
+  INPUT_BYTE(cinfo, c, return FALSE);
+  cinfo->Ah = (c >> 4) & 15;
+  cinfo->Al = (c     ) & 15;
+
+  TRACEMS4(cinfo, 1, JTRC_SOS_PARAMS, cinfo->Ss, cinfo->Se,
+	   cinfo->Ah, cinfo->Al);
+
+  /* Prepare to scan data & restart markers */
+  cinfo->marker->next_restart_num = 0;
+
+  /* Count another SOS marker */
+  cinfo->input_scan_number++;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+#ifdef D_ARITH_CODING_SUPPORTED
+
+LOCAL(wxjpeg_boolean)
+get_dac (j_decompress_ptr cinfo)
+/* Process a DAC marker */
+{
+  JPEG_INT32 length;
+  int index, val;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+  
+  while (length > 0) {
+    INPUT_BYTE(cinfo, index, return FALSE);
+    INPUT_BYTE(cinfo, val, return FALSE);
+
+    length -= 2;
+
+    TRACEMS2(cinfo, 1, JTRC_DAC, index, val);
+
+    if (index < 0 || index >= (2*NUM_ARITH_TBLS))
+      ERREXIT1(cinfo, JERR_DAC_INDEX, index);
+
+    if (index >= NUM_ARITH_TBLS) { /* define AC table */
+      cinfo->arith_ac_K[index-NUM_ARITH_TBLS] = (UINT8) val;
+    } else {			/* define DC table */
+      cinfo->arith_dc_L[index] = (UINT8) (val & 0x0F);
+      cinfo->arith_dc_U[index] = (UINT8) (val >> 4);
+      if (cinfo->arith_dc_L[index] > cinfo->arith_dc_U[index])
+	ERREXIT1(cinfo, JERR_DAC_VALUE, val);
+    }
+  }
+
+  if (length != 0)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+#else /* ! D_ARITH_CODING_SUPPORTED */
+
+#define get_dac(cinfo)  skip_variable(cinfo)
+
+#endif /* D_ARITH_CODING_SUPPORTED */
+
+
+LOCAL(wxjpeg_boolean)
+get_dht (j_decompress_ptr cinfo)
+/* Process a DHT marker */
+{
+  JPEG_INT32 length;
+  UINT8 bits[17];
+  UINT8 huffval[256];
+  int i, index, count;
+  JHUFF_TBL **htblptr;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+  
+  while (length > 16) {
+    INPUT_BYTE(cinfo, index, return FALSE);
+
+    TRACEMS1(cinfo, 1, JTRC_DHT, index);
+      
+    bits[0] = 0;
+    count = 0;
+    for (i = 1; i <= 16; i++) {
+      INPUT_BYTE(cinfo, bits[i], return FALSE);
+      count += bits[i];
+    }
+
+    length -= 1 + 16;
+
+    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,
+	     bits[1], bits[2], bits[3], bits[4],
+	     bits[5], bits[6], bits[7], bits[8]);
+    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,
+	     bits[9], bits[10], bits[11], bits[12],
+	     bits[13], bits[14], bits[15], bits[16]);
+
+    /* Here we just do minimal validation of the counts to avoid walking
+     * off the end of our table space.  jdhuff.c will check more carefully.
+     */
+    if (count > 256 || ((JPEG_INT32) count) > length)
+      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
+
+    for (i = 0; i < count; i++)
+      INPUT_BYTE(cinfo, huffval[i], return FALSE);
+
+    length -= count;
+
+    if (index & 0x10) {		/* AC table definition */
+      index -= 0x10;
+      htblptr = &cinfo->ac_huff_tbl_ptrs[index];
+    } else {			/* DC table definition */
+      htblptr = &cinfo->dc_huff_tbl_ptrs[index];
+    }
+
+    if (index < 0 || index >= NUM_HUFF_TBLS)
+      ERREXIT1(cinfo, JERR_DHT_INDEX, index);
+
+    if (*htblptr == NULL)
+      *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+  
+    MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
+    MEMCOPY((*htblptr)->huffval, huffval, SIZEOF((*htblptr)->huffval));
+  }
+
+  if (length != 0)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+LOCAL(wxjpeg_boolean)
+get_dqt (j_decompress_ptr cinfo)
+/* Process a DQT marker */
+{
+  JPEG_INT32 length;
+  int n, i, prec;
+  unsigned int tmp;
+  JQUANT_TBL *quant_ptr;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+
+  while (length > 0) {
+    INPUT_BYTE(cinfo, n, return FALSE);
+    prec = n >> 4;
+    n &= 0x0F;
+
+    TRACEMS2(cinfo, 1, JTRC_DQT, n, prec);
+
+    if (n >= NUM_QUANT_TBLS)
+      ERREXIT1(cinfo, JERR_DQT_INDEX, n);
+      
+    if (cinfo->quant_tbl_ptrs[n] == NULL)
+      cinfo->quant_tbl_ptrs[n] = jpeg_alloc_quant_table((j_common_ptr) cinfo);
+    quant_ptr = cinfo->quant_tbl_ptrs[n];
+
+    for (i = 0; i < DCTSIZE2; i++) {
+      if (prec)
+	INPUT_2BYTES(cinfo, tmp, return FALSE);
+      else
+	INPUT_BYTE(cinfo, tmp, return FALSE);
+      /* We convert the zigzag-order table to natural array order. */
+      quant_ptr->quantval[jpeg_natural_order[i]] = (UINT16) tmp;
+    }
+
+    if (cinfo->err->trace_level >= 2) {
+      for (i = 0; i < DCTSIZE2; i += 8) {
+	TRACEMS8(cinfo, 2, JTRC_QUANTVALS,
+		 quant_ptr->quantval[i],   quant_ptr->quantval[i+1],
+		 quant_ptr->quantval[i+2], quant_ptr->quantval[i+3],
+		 quant_ptr->quantval[i+4], quant_ptr->quantval[i+5],
+		 quant_ptr->quantval[i+6], quant_ptr->quantval[i+7]);
+      }
+    }
+
+    length -= DCTSIZE2+1;
+    if (prec) length -= DCTSIZE2;
+  }
+
+  if (length != 0)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+LOCAL(wxjpeg_boolean)
+get_dri (j_decompress_ptr cinfo)
+/* Process a DRI marker */
+{
+  JPEG_INT32 length;
+  unsigned int tmp;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  
+  if (length != 4)
+    ERREXIT(cinfo, JERR_BAD_LENGTH);
+
+  INPUT_2BYTES(cinfo, tmp, return FALSE);
+
+  TRACEMS1(cinfo, 1, JTRC_DRI, tmp);
+
+  cinfo->restart_interval = tmp;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+/*
+ * Routines for processing APPn and COM markers.
+ * These are either saved in memory or discarded, per application request.
+ * APP0 and APP14 are specially checked to see if they are
+ * JFIF and Adobe markers, respectively.
+ */
+
+#define APP0_DATA_LEN	14	/* Length of interesting data in APP0 */
+#define APP14_DATA_LEN	12	/* Length of interesting data in APP14 */
+#define APPN_DATA_LEN	14	/* Must be the largest of the above!! */
+
+
+LOCAL(void)
+examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data,
+	      unsigned int datalen, JPEG_INT32 remaining)
+/* Examine first few bytes from an APP0.
+ * Take appropriate action if it is a JFIF marker.
+ * datalen is # of bytes at data[], remaining is length of rest of marker data.
+ */
+{
+  JPEG_INT32 totallen = (JPEG_INT32) datalen + remaining;
+
+  if (datalen >= APP0_DATA_LEN &&
+      GETJOCTET(data[0]) == 0x4A &&
+      GETJOCTET(data[1]) == 0x46 &&
+      GETJOCTET(data[2]) == 0x49 &&
+      GETJOCTET(data[3]) == 0x46 &&
+      GETJOCTET(data[4]) == 0) {
+    /* Found JFIF APP0 marker: save info */
+    cinfo->saw_JFIF_marker = TRUE;
+    cinfo->JFIF_major_version = GETJOCTET(data[5]);
+    cinfo->JFIF_minor_version = GETJOCTET(data[6]);
+    cinfo->density_unit = GETJOCTET(data[7]);
+    cinfo->X_density = (GETJOCTET(data[8]) << 8) + GETJOCTET(data[9]);
+    cinfo->Y_density = (GETJOCTET(data[10]) << 8) + GETJOCTET(data[11]);
+    /* Check version.
+     * Major version must be 1, anything else signals an incompatible change.
+     * (We used to treat this as an error, but now it's a nonfatal warning,
+     * because some bozo at Hijaak couldn't read the spec.)
+     * Minor version should be 0..2, but process anyway if newer.
+     */
+    if (cinfo->JFIF_major_version != 1)
+      WARNMS2(cinfo, JWRN_JFIF_MAJOR,
+	      cinfo->JFIF_major_version, cinfo->JFIF_minor_version);
+    /* Generate trace messages */
+    TRACEMS5(cinfo, 1, JTRC_JFIF,
+	     cinfo->JFIF_major_version, cinfo->JFIF_minor_version,
+	     cinfo->X_density, cinfo->Y_density, cinfo->density_unit);
+    /* Validate thumbnail dimensions and issue appropriate messages */
+    if (GETJOCTET(data[12]) | GETJOCTET(data[13]))
+      TRACEMS2(cinfo, 1, JTRC_JFIF_THUMBNAIL,
+	       GETJOCTET(data[12]), GETJOCTET(data[13]));
+    totallen -= APP0_DATA_LEN;
+    if (totallen !=
+	((JPEG_INT32)GETJOCTET(data[12]) * (JPEG_INT32)GETJOCTET(data[13]) * (JPEG_INT32) 3))
+      TRACEMS1(cinfo, 1, JTRC_JFIF_BADTHUMBNAILSIZE, (int) totallen);
+  } else if (datalen >= 6 &&
+      GETJOCTET(data[0]) == 0x4A &&
+      GETJOCTET(data[1]) == 0x46 &&
+      GETJOCTET(data[2]) == 0x58 &&
+      GETJOCTET(data[3]) == 0x58 &&
+      GETJOCTET(data[4]) == 0) {
+    /* Found JFIF "JFXX" extension APP0 marker */
+    /* The library doesn't actually do anything with these,
+     * but we try to produce a helpful trace message.
+     */
+    switch (GETJOCTET(data[5])) {
+    case 0x10:
+      TRACEMS1(cinfo, 1, JTRC_THUMB_JPEG, (int) totallen);
+      break;
+    case 0x11:
+      TRACEMS1(cinfo, 1, JTRC_THUMB_PALETTE, (int) totallen);
+      break;
+    case 0x13:
+      TRACEMS1(cinfo, 1, JTRC_THUMB_RGB, (int) totallen);
+      break;
+    default:
+      TRACEMS2(cinfo, 1, JTRC_JFIF_EXTENSION,
+	       GETJOCTET(data[5]), (int) totallen);
+      break;
+    }
+  } else {
+    /* Start of APP0 does not match "JFIF" or "JFXX", or too short */
+    TRACEMS1(cinfo, 1, JTRC_APP0, (int) totallen);
+  }
+}
+
+
+LOCAL(void)
+examine_app14 (j_decompress_ptr cinfo, JOCTET FAR * data,
+	       unsigned int datalen, JPEG_INT32 remaining)
+/* Examine first few bytes from an APP14.
+ * Take appropriate action if it is an Adobe marker.
+ * datalen is # of bytes at data[], remaining is length of rest of marker data.
+ */
+{
+  unsigned int version, flags0, flags1, transform;
+
+  if (datalen >= APP14_DATA_LEN &&
+      GETJOCTET(data[0]) == 0x41 &&
+      GETJOCTET(data[1]) == 0x64 &&
+      GETJOCTET(data[2]) == 0x6F &&
+      GETJOCTET(data[3]) == 0x62 &&
+      GETJOCTET(data[4]) == 0x65) {
+    /* Found Adobe APP14 marker */
+    version = (GETJOCTET(data[5]) << 8) + GETJOCTET(data[6]);
+    flags0 = (GETJOCTET(data[7]) << 8) + GETJOCTET(data[8]);
+    flags1 = (GETJOCTET(data[9]) << 8) + GETJOCTET(data[10]);
+    transform = GETJOCTET(data[11]);
+    TRACEMS4(cinfo, 1, JTRC_ADOBE, version, flags0, flags1, transform);
+    cinfo->saw_Adobe_marker = TRUE;
+    cinfo->Adobe_transform = (UINT8) transform;
+  } else {
+    /* Start of APP14 does not match "Adobe", or too short */
+    TRACEMS1(cinfo, 1, JTRC_APP14, (int) (datalen + remaining));
+  }
+}
+
+
+METHODDEF(wxjpeg_boolean)
+get_interesting_appn (j_decompress_ptr cinfo)
+/* Process an APP0 or APP14 marker without saving it */
+{
+  JPEG_INT32 length;
+  JOCTET b[APPN_DATA_LEN];
+  unsigned int i, numtoread;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+
+  /* get the interesting part of the marker data */
+  if (length >= APPN_DATA_LEN)
+    numtoread = APPN_DATA_LEN;
+  else if (length > 0)
+    numtoread = (unsigned int) length;
+  else
+    numtoread = 0;
+  for (i = 0; i < numtoread; i++)
+    INPUT_BYTE(cinfo, b[i], return FALSE);
+  length -= numtoread;
+
+  /* process it */
+  switch (cinfo->unread_marker) {
+  case M_APP0:
+    examine_app0(cinfo, (JOCTET FAR *) b, numtoread, length);
+    break;
+  case M_APP14:
+    examine_app14(cinfo, (JOCTET FAR *) b, numtoread, length);
+    break;
+  default:
+    /* can't get here unless jpeg_save_markers chooses wrong processor */
+    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);
+    break;
+  }
+
+  /* skip any remaining data -- could be lots */
+  INPUT_SYNC(cinfo);
+  if (length > 0)
+    (*cinfo->src->skip_input_data) (cinfo, (long) length);
+
+  return TRUE;
+}
+
+
+#ifdef SAVE_MARKERS_SUPPORTED
+
+METHODDEF(wxjpeg_boolean)
+save_marker (j_decompress_ptr cinfo)
+/* Save an APPn or COM marker into the marker list */
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+  jpeg_saved_marker_ptr cur_marker = marker->cur_marker;
+  unsigned int bytes_read, data_length;
+  JOCTET FAR * data;
+  JPEG_INT32 length = 0;
+  INPUT_VARS(cinfo);
+
+  if (cur_marker == NULL) {
+    /* begin reading a marker */
+    INPUT_2BYTES(cinfo, length, return FALSE);
+    length -= 2;
+    if (length >= 0) {		/* watch out for bogus length word */
+      /* figure out how much we want to save */
+      unsigned int limit;
+      if (cinfo->unread_marker == (int) M_COM)
+	limit = marker->length_limit_COM;
+      else
+	limit = marker->length_limit_APPn[cinfo->unread_marker - (int) M_APP0];
+      if ((unsigned int) length < limit)
+	limit = (unsigned int) length;
+      /* allocate and initialize the marker item */
+      cur_marker = (jpeg_saved_marker_ptr)
+	(*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				    SIZEOF(struct jpeg_marker_struct) + limit);
+      cur_marker->next = NULL;
+      cur_marker->marker = (UINT8) cinfo->unread_marker;
+      cur_marker->original_length = (unsigned int) length;
+      cur_marker->data_length = limit;
+      /* data area is just beyond the jpeg_marker_struct */
+      data = cur_marker->data = (JOCTET FAR *) (cur_marker + 1);
+      marker->cur_marker = cur_marker;
+      marker->bytes_read = 0;
+      bytes_read = 0;
+      data_length = limit;
+    } else {
+      /* deal with bogus length word */
+      bytes_read = data_length = 0;
+      data = NULL;
+    }
+  } else {
+    /* resume reading a marker */
+    bytes_read = marker->bytes_read;
+    data_length = cur_marker->data_length;
+    data = cur_marker->data + bytes_read;
+  }
+
+  while (bytes_read < data_length) {
+    INPUT_SYNC(cinfo);		/* move the restart point to here */
+    marker->bytes_read = bytes_read;
+    /* If there's not at least one byte in buffer, suspend */
+    MAKE_BYTE_AVAIL(cinfo, return FALSE);
+    /* Copy bytes with reasonable rapidity */
+    while (bytes_read < data_length && bytes_in_buffer > 0) {
+      *data++ = *next_input_byte++;
+      bytes_in_buffer--;
+      bytes_read++;
+    }
+  }
+
+  /* Done reading what we want to read */
+  if (cur_marker != NULL) {	/* will be NULL if bogus length word */
+    /* Add new marker to end of list */
+    if (cinfo->marker_list == NULL) {
+      cinfo->marker_list = cur_marker;
+    } else {
+      jpeg_saved_marker_ptr prev = cinfo->marker_list;
+      while (prev->next != NULL)
+	prev = prev->next;
+      prev->next = cur_marker;
+    }
+    /* Reset pointer & calc remaining data length */
+    data = cur_marker->data;
+    length = cur_marker->original_length - data_length;
+  }
+  /* Reset to initial state for next marker */
+  marker->cur_marker = NULL;
+
+  /* Process the marker if interesting; else just make a generic trace msg */
+  switch (cinfo->unread_marker) {
+  case M_APP0:
+    examine_app0(cinfo, data, data_length, length);
+    break;
+  case M_APP14:
+    examine_app14(cinfo, data, data_length, length);
+    break;
+  default:
+    TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker,
+	     (int) (data_length + length));
+    break;
+  }
+
+  /* skip any remaining data -- could be lots */
+  INPUT_SYNC(cinfo);		/* do before skip_input_data */
+  if (length > 0)
+    (*cinfo->src->skip_input_data) (cinfo, (long) length);
+
+  return TRUE;
+}
+
+#endif /* SAVE_MARKERS_SUPPORTED */
+
+
+METHODDEF(wxjpeg_boolean)
+skip_variable (j_decompress_ptr cinfo)
+/* Skip over an unknown or uninteresting variable-length marker */
+{
+  JPEG_INT32 length;
+  INPUT_VARS(cinfo);
+
+  INPUT_2BYTES(cinfo, length, return FALSE);
+  length -= 2;
+  
+  TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker, (int) length);
+
+  INPUT_SYNC(cinfo);		/* do before skip_input_data */
+  if (length > 0)
+    (*cinfo->src->skip_input_data) (cinfo, (long) length);
+
+  return TRUE;
+}
+
+
+/*
+ * Find the next JPEG marker, save it in cinfo->unread_marker.
+ * Returns FALSE if had to suspend before reaching a marker;
+ * in that case cinfo->unread_marker is unchanged.
+ *
+ * Note that the result might not be a valid marker code,
+ * but it will never be 0 or FF.
+ */
+
+LOCAL(wxjpeg_boolean)
+next_marker (j_decompress_ptr cinfo)
+{
+  int c;
+  INPUT_VARS(cinfo);
+
+  for (;;) {
+    INPUT_BYTE(cinfo, c, return FALSE);
+    /* Skip any non-FF bytes.
+     * This may look a bit inefficient, but it will not occur in a valid file.
+     * We sync after each discarded byte so that a suspending data source
+     * can discard the byte from its buffer.
+     */
+    while (c != 0xFF) {
+      cinfo->marker->discarded_bytes++;
+      INPUT_SYNC(cinfo);
+      INPUT_BYTE(cinfo, c, return FALSE);
+    }
+    /* This loop swallows any duplicate FF bytes.  Extra FFs are legal as
+     * pad bytes, so don't count them in discarded_bytes.  We assume there
+     * will not be so many consecutive FF bytes as to overflow a suspending
+     * data source's input buffer.
+     */
+    do {
+      INPUT_BYTE(cinfo, c, return FALSE);
+    } while (c == 0xFF);
+    if (c != 0)
+      break;			/* found a valid marker, exit loop */
+    /* Reach here if we found a stuffed-zero data sequence (FF/00).
+     * Discard it and loop back to try again.
+     */
+    cinfo->marker->discarded_bytes += 2;
+    INPUT_SYNC(cinfo);
+  }
+
+  if (cinfo->marker->discarded_bytes != 0) {
+    WARNMS2(cinfo, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c);
+    cinfo->marker->discarded_bytes = 0;
+  }
+
+  cinfo->unread_marker = c;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+LOCAL(wxjpeg_boolean)
+first_marker (j_decompress_ptr cinfo)
+/* Like next_marker, but used to obtain the initial SOI marker. */
+/* For this marker, we do not allow preceding garbage or fill; otherwise,
+ * we might well scan an entire input file before realizing it ain't JPEG.
+ * If an application wants to process non-JFIF files, it must seek to the
+ * SOI before calling the JPEG library.
+ */
+{
+  int c, c2;
+  INPUT_VARS(cinfo);
+
+  INPUT_BYTE(cinfo, c, return FALSE);
+  INPUT_BYTE(cinfo, c2, return FALSE);
+  if (c != 0xFF || c2 != (int) M_SOI)
+    ERREXIT2(cinfo, JERR_NO_SOI, c, c2);
+
+  cinfo->unread_marker = c2;
+
+  INPUT_SYNC(cinfo);
+  return TRUE;
+}
+
+
+/*
+ * Read markers until SOS or EOI.
+ *
+ * Returns same codes as are defined for jpeg_consume_input:
+ * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+ */
+
+METHODDEF(int)
+read_markers (j_decompress_ptr cinfo)
+{
+  /* Outer loop repeats once for each marker. */
+  for (;;) {
+    /* Collect the marker proper, unless we already did. */
+    /* NB: first_marker() enforces the requirement that SOI appear first. */
+    if (cinfo->unread_marker == 0) {
+      if (! cinfo->marker->saw_SOI) {
+	if (! first_marker(cinfo))
+	  return JPEG_SUSPENDED;
+      } else {
+	if (! next_marker(cinfo))
+	  return JPEG_SUSPENDED;
+      }
+    }
+    /* At this point cinfo->unread_marker contains the marker code and the
+     * input point is just past the marker proper, but before any parameters.
+     * A suspension will cause us to return with this state still true.
+     */
+    switch (cinfo->unread_marker) {
+    case M_SOI:
+      if (! get_soi(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF0:		/* Baseline */
+    case M_SOF1:		/* Extended sequential, Huffman */
+      if (! get_sof(cinfo, FALSE, FALSE))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF2:		/* Progressive, Huffman */
+      if (! get_sof(cinfo, TRUE, FALSE))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF9:		/* Extended sequential, arithmetic */
+      if (! get_sof(cinfo, FALSE, TRUE))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_SOF10:		/* Progressive, arithmetic */
+      if (! get_sof(cinfo, TRUE, TRUE))
+	return JPEG_SUSPENDED;
+      break;
+
+    /* Currently unsupported SOFn types */
+    case M_SOF3:		/* Lossless, Huffman */
+    case M_SOF5:		/* Differential sequential, Huffman */
+    case M_SOF6:		/* Differential progressive, Huffman */
+    case M_SOF7:		/* Differential lossless, Huffman */
+    case M_JPG:			/* Reserved for JPEG extensions */
+    case M_SOF11:		/* Lossless, arithmetic */
+    case M_SOF13:		/* Differential sequential, arithmetic */
+    case M_SOF14:		/* Differential progressive, arithmetic */
+    case M_SOF15:		/* Differential lossless, arithmetic */
+      ERREXIT1(cinfo, JERR_SOF_UNSUPPORTED, cinfo->unread_marker);
+      break;
+
+    case M_SOS:
+      if (! get_sos(cinfo))
+	return JPEG_SUSPENDED;
+      cinfo->unread_marker = 0;	/* processed the marker */
+      return JPEG_REACHED_SOS;
+    
+    case M_EOI:
+      TRACEMS(cinfo, 1, JTRC_EOI);
+      cinfo->unread_marker = 0;	/* processed the marker */
+      return JPEG_REACHED_EOI;
+      
+    case M_DAC:
+      if (! get_dac(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+      
+    case M_DHT:
+      if (! get_dht(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+      
+    case M_DQT:
+      if (! get_dqt(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+      
+    case M_DRI:
+      if (! get_dri(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+      
+    case M_APP0:
+    case M_APP1:
+    case M_APP2:
+    case M_APP3:
+    case M_APP4:
+    case M_APP5:
+    case M_APP6:
+    case M_APP7:
+    case M_APP8:
+    case M_APP9:
+    case M_APP10:
+    case M_APP11:
+    case M_APP12:
+    case M_APP13:
+    case M_APP14:
+    case M_APP15:
+      if (! (*((my_marker_ptr) cinfo->marker)->process_APPn[
+		cinfo->unread_marker - (int) M_APP0]) (cinfo))
+	return JPEG_SUSPENDED;
+      break;
+      
+    case M_COM:
+      if (! (*((my_marker_ptr) cinfo->marker)->process_COM) (cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    case M_RST0:		/* these are all parameterless */
+    case M_RST1:
+    case M_RST2:
+    case M_RST3:
+    case M_RST4:
+    case M_RST5:
+    case M_RST6:
+    case M_RST7:
+    case M_TEM:
+      TRACEMS1(cinfo, 1, JTRC_PARMLESS_MARKER, cinfo->unread_marker);
+      break;
+
+    case M_DNL:			/* Ignore DNL ... perhaps the wrong thing */
+      if (! skip_variable(cinfo))
+	return JPEG_SUSPENDED;
+      break;
+
+    default:			/* must be DHP, EXP, JPGn, or RESn */
+      /* For now, we treat the reserved markers as fatal errors since they are
+       * likely to be used to signal incompatible JPEG Part 3 extensions.
+       * Once the JPEG 3 version-number marker is well defined, this code
+       * ought to change!
+       */
+      ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);
+      break;
+    }
+    /* Successfully processed marker, so reset state variable */
+    cinfo->unread_marker = 0;
+  } /* end loop */
+}
+
+
+/*
+ * Read a restart marker, which is expected to appear next in the datastream;
+ * if the marker is not there, take appropriate recovery action.
+ * Returns FALSE if suspension is required.
+ *
+ * This is called by the entropy decoder after it has read an appropriate
+ * number of MCUs.  cinfo->unread_marker may be nonzero if the entropy decoder
+ * has already read a marker from the data source.  Under normal conditions
+ * cinfo->unread_marker will be reset to 0 before returning; if not reset,
+ * it holds a marker which the decoder will be unable to read past.
+ */
+
+METHODDEF(wxjpeg_boolean)
+read_restart_marker (j_decompress_ptr cinfo)
+{
+  /* Obtain a marker unless we already did. */
+  /* Note that next_marker will complain if it skips any data. */
+  if (cinfo->unread_marker == 0) {
+    if (! next_marker(cinfo))
+      return FALSE;
+  }
+
+  if (cinfo->unread_marker ==
+      ((int) M_RST0 + cinfo->marker->next_restart_num)) {
+    /* Normal case --- swallow the marker and let entropy decoder continue */
+    TRACEMS1(cinfo, 3, JTRC_RST, cinfo->marker->next_restart_num);
+    cinfo->unread_marker = 0;
+  } else {
+    /* Uh-oh, the restart markers have been messed up. */
+    /* Let the data source manager determine how to resync. */
+    if (! (*cinfo->src->resync_to_restart) (cinfo,
+					    cinfo->marker->next_restart_num))
+      return FALSE;
+  }
+
+  /* Update next-restart state */
+  cinfo->marker->next_restart_num = (cinfo->marker->next_restart_num + 1) & 7;
+
+  return TRUE;
+}
+
+
+/*
+ * This is the default resync_to_restart method for data source managers
+ * to use if they don't have any better approach.  Some data source managers
+ * may be able to back up, or may have additional knowledge about the data
+ * which permits a more intelligent recovery strategy; such managers would
+ * presumably supply their own resync method.
+ *
+ * read_restart_marker calls resync_to_restart if it finds a marker other than
+ * the restart marker it was expecting.  (This code is *not* used unless
+ * a nonzero restart interval has been declared.)  cinfo->unread_marker is
+ * the marker code actually found (might be anything, except 0 or FF).
+ * The desired restart marker number (0..7) is passed as a parameter.
+ * This routine is supposed to apply whatever error recovery strategy seems
+ * appropriate in order to position the input stream to the next data segment.
+ * Note that cinfo->unread_marker is treated as a marker appearing before
+ * the current data-source input point; usually it should be reset to zero
+ * before returning.
+ * Returns FALSE if suspension is required.
+ *
+ * This implementation is substantially constrained by wanting to treat the
+ * input as a data stream; this means we can't back up.  Therefore, we have
+ * only the following actions to work with:
+ *   1. Simply discard the marker and let the entropy decoder resume at next
+ *      byte of file.
+ *   2. Read forward until we find another marker, discarding intervening
+ *      data.  (In theory we could look ahead within the current bufferload,
+ *      without having to discard data if we don't find the desired marker.
+ *      This idea is not implemented here, in part because it makes behavior
+ *      dependent on buffer size and chance buffer-boundary positions.)
+ *   3. Leave the marker unread (by failing to zero cinfo->unread_marker).
+ *      This will cause the entropy decoder to process an empty data segment,
+ *      inserting dummy zeroes, and then we will reprocess the marker.
+ *
+ * #2 is appropriate if we think the desired marker lies ahead, while #3 is
+ * appropriate if the found marker is a future restart marker (indicating
+ * that we have missed the desired restart marker, probably because it got
+ * corrupted).
+ * We apply #2 or #3 if the found marker is a restart marker no more than
+ * two counts behind or ahead of the expected one.  We also apply #2 if the
+ * found marker is not a legal JPEG marker code (it's certainly bogus data).
+ * If the found marker is a restart marker more than 2 counts away, we do #1
+ * (too much risk that the marker is erroneous; with luck we will be able to
+ * resync at some future point).
+ * For any valid non-restart JPEG marker, we apply #3.  This keeps us from
+ * overrunning the end of a scan.  An implementation limited to single-scan
+ * files might find it better to apply #2 for markers other than EOI, since
+ * any other marker would have to be bogus data in that case.
+ */
+
+GLOBAL(wxjpeg_boolean)
+jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired)
+{
+  int marker = cinfo->unread_marker;
+  int action = 1;
+  
+  /* Always put up a warning. */
+  WARNMS2(cinfo, JWRN_MUST_RESYNC, marker, desired);
+  
+  /* Outer loop handles repeated decision after scanning forward. */
+  for (;;) {
+    if (marker < (int) M_SOF0)
+      action = 2;		/* invalid marker */
+    else if (marker < (int) M_RST0 || marker > (int) M_RST7)
+      action = 3;		/* valid non-restart marker */
+    else {
+      if (marker == ((int) M_RST0 + ((desired+1) & 7)) ||
+	  marker == ((int) M_RST0 + ((desired+2) & 7)))
+	action = 3;		/* one of the next two expected restarts */
+      else if (marker == ((int) M_RST0 + ((desired-1) & 7)) ||
+	       marker == ((int) M_RST0 + ((desired-2) & 7)))
+	action = 2;		/* a prior restart, so advance */
+      else
+	action = 1;		/* desired restart or too far away */
+    }
+    TRACEMS2(cinfo, 4, JTRC_RECOVERY_ACTION, marker, action);
+    switch (action) {
+    case 1:
+      /* Discard marker and let entropy decoder resume processing. */
+      cinfo->unread_marker = 0;
+      return TRUE;
+    case 2:
+      /* Scan to the next marker, and repeat the decision loop. */
+      if (! next_marker(cinfo))
+	return FALSE;
+      marker = cinfo->unread_marker;
+      break;
+    case 3:
+      /* Return without advancing past this marker. */
+      /* Entropy decoder will be forced to process an empty segment. */
+      return TRUE;
+    }
+  } /* end loop */
+}
+
+
+/*
+ * Reset marker processing state to begin a fresh datastream.
+ */
+
+METHODDEF(void)
+reset_marker_reader (j_decompress_ptr cinfo)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+
+  cinfo->comp_info = NULL;		/* until allocated by get_sof */
+  cinfo->input_scan_number = 0;		/* no SOS seen yet */
+  cinfo->unread_marker = 0;		/* no pending marker */
+  marker->pub.saw_SOI = FALSE;		/* set internal state too */
+  marker->pub.saw_SOF = FALSE;
+  marker->pub.discarded_bytes = 0;
+  marker->cur_marker = NULL;
+}
+
+
+/*
+ * Initialize the marker reader module.
+ * This is called only once, when the decompression object is created.
+ */
+
+GLOBAL(void)
+jinit_marker_reader (j_decompress_ptr cinfo)
+{
+  my_marker_ptr marker;
+  int i;
+
+  /* Create subobject in permanent pool */
+  marker = (my_marker_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				SIZEOF(my_marker_reader));
+  cinfo->marker = (struct jpeg_marker_reader *) marker;
+  /* Initialize public method pointers */
+  marker->pub.reset_marker_reader = reset_marker_reader;
+  marker->pub.read_markers = read_markers;
+  marker->pub.read_restart_marker = read_restart_marker;
+  /* Initialize COM/APPn processing.
+   * By default, we examine and then discard APP0 and APP14,
+   * but simply discard COM and all other APPn.
+   */
+  marker->process_COM = skip_variable;
+  marker->length_limit_COM = 0;
+  for (i = 0; i < 16; i++) {
+    marker->process_APPn[i] = skip_variable;
+    marker->length_limit_APPn[i] = 0;
+  }
+  marker->process_APPn[0] = get_interesting_appn;
+  marker->process_APPn[14] = get_interesting_appn;
+  /* Reset marker processing state */
+  reset_marker_reader(cinfo);
+}
+
+
+/*
+ * Control saving of COM and APPn markers into marker_list.
+ */
+
+#ifdef SAVE_MARKERS_SUPPORTED
+
+GLOBAL(void)
+jpeg_save_markers (j_decompress_ptr cinfo, int marker_code,
+		   unsigned int length_limit)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+  long maxlength;
+  jpeg_marker_parser_method processor;
+
+  /* Length limit mustn't be larger than what we can allocate
+   * (should only be a concern in a 16-bit environment).
+   */
+  maxlength = cinfo->mem->max_alloc_chunk - SIZEOF(struct jpeg_marker_struct);
+  if (((long) length_limit) > maxlength)
+    length_limit = (unsigned int) maxlength;
+
+  /* Choose processor routine to use.
+   * APP0/APP14 have special requirements.
+   */
+  if (length_limit) {
+    processor = save_marker;
+    /* If saving APP0/APP14, save at least enough for our internal use. */
+    if (marker_code == (int) M_APP0 && length_limit < APP0_DATA_LEN)
+      length_limit = APP0_DATA_LEN;
+    else if (marker_code == (int) M_APP14 && length_limit < APP14_DATA_LEN)
+      length_limit = APP14_DATA_LEN;
+  } else {
+    processor = skip_variable;
+    /* If discarding APP0/APP14, use our regular on-the-fly processor. */
+    if (marker_code == (int) M_APP0 || marker_code == (int) M_APP14)
+      processor = get_interesting_appn;
+  }
+
+  if (marker_code == (int) M_COM) {
+    marker->process_COM = processor;
+    marker->length_limit_COM = length_limit;
+  } else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15) {
+    marker->process_APPn[marker_code - (int) M_APP0] = processor;
+    marker->length_limit_APPn[marker_code - (int) M_APP0] = length_limit;
+  } else
+    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
+}
+
+#endif /* SAVE_MARKERS_SUPPORTED */
+
+
+/*
+ * Install a special processing method for COM or APPn markers.
+ */
+
+GLOBAL(void)
+jpeg_set_marker_processor (j_decompress_ptr cinfo, int marker_code,
+			   jpeg_marker_parser_method routine)
+{
+  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
+
+  if (marker_code == (int) M_COM)
+    marker->process_COM = routine;
+  else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15)
+    marker->process_APPn[marker_code - (int) M_APP0] = routine;
+  else
+    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jdmaster.c b/Source/3rd Party/wx/src/jpeg/jdmaster.c
index 98cfdeb59..d68747631 100644
--- a/Source/3rd Party/wx/src/jpeg/jdmaster.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdmaster.c	
@@ -1,557 +1,557 @@
-/*
- * jdmaster.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains master control logic for the JPEG decompressor.
- * These routines are concerned with selecting the modules to be executed
- * and with determining the number of passes and the work to be done in each
- * pass.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-/* Private state */
-
-typedef struct {
-  struct jpeg_decomp_master pub; /* public fields */
-
-  int pass_number;		/* # of passes completed */
-
-  wxjpeg_boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
-
-  /* Saved references to initialized quantizer modules,
-   * in case we need to switch modes.
-   */
-  struct jpeg_color_quantizer * quantizer_1pass;
-  struct jpeg_color_quantizer * quantizer_2pass;
-} my_decomp_master;
-
-typedef my_decomp_master * my_master_ptr;
-
-
-/*
- * Determine whether merged upsample/color conversion should be used.
- * CRUCIAL: this must match the actual capabilities of jdmerge.c!
- */
-
-LOCAL(wxjpeg_boolean)
-use_merged_upsample (j_decompress_ptr cinfo)
-{
-#ifdef UPSAMPLE_MERGING_SUPPORTED
-  /* Merging is the equivalent of plain box-filter upsampling */
-  if (cinfo->do_fancy_upsampling || cinfo->CCIR601_sampling)
-    return FALSE;
-  /* jdmerge.c only supports YCC=>RGB color conversion */
-  if (cinfo->jpeg_color_space != JCS_YCbCr || cinfo->num_components != 3 ||
-      cinfo->out_color_space != JCS_RGB ||
-      cinfo->out_color_components != RGB_PIXELSIZE)
-    return FALSE;
-  /* and it only handles 2h1v or 2h2v sampling ratios */
-  if (cinfo->comp_info[0].h_samp_factor != 2 ||
-      cinfo->comp_info[1].h_samp_factor != 1 ||
-      cinfo->comp_info[2].h_samp_factor != 1 ||
-      cinfo->comp_info[0].v_samp_factor >  2 ||
-      cinfo->comp_info[1].v_samp_factor != 1 ||
-      cinfo->comp_info[2].v_samp_factor != 1)
-    return FALSE;
-  /* furthermore, it doesn't work if we've scaled the IDCTs differently */
-  if (cinfo->comp_info[0].DCT_scaled_size != cinfo->min_DCT_scaled_size ||
-      cinfo->comp_info[1].DCT_scaled_size != cinfo->min_DCT_scaled_size ||
-      cinfo->comp_info[2].DCT_scaled_size != cinfo->min_DCT_scaled_size)
-    return FALSE;
-  /* ??? also need to test for upsample-time rescaling, when & if supported */
-  return TRUE;			/* by golly, it'll work... */
-#else
-  return FALSE;
-#endif
-}
-
-
-/*
- * Compute output image dimensions and related values.
- * NOTE: this is exported for possible use by application.
- * Hence it mustn't do anything that can't be done twice.
- * Also note that it may be called before the master module is initialized!
- */
-
-GLOBAL(void)
-jpeg_calc_output_dimensions (j_decompress_ptr cinfo)
-/* Do computations that are needed before master selection phase */
-{
-#ifdef IDCT_SCALING_SUPPORTED
-  int ci;
-  jpeg_component_info *compptr;
-#endif
-
-  /* Prevent application from calling me at wrong times */
-  if (cinfo->global_state != DSTATE_READY)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-#ifdef IDCT_SCALING_SUPPORTED
-
-  /* Compute actual output image dimensions and DCT scaling choices. */
-  if (cinfo->scale_num * 8 <= cinfo->scale_denom) {
-    /* Provide 1/8 scaling */
-    cinfo->output_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width, 8L);
-    cinfo->output_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height, 8L);
-    cinfo->min_DCT_scaled_size = 1;
-  } else if (cinfo->scale_num * 4 <= cinfo->scale_denom) {
-    /* Provide 1/4 scaling */
-    cinfo->output_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width, 4L);
-    cinfo->output_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height, 4L);
-    cinfo->min_DCT_scaled_size = 2;
-  } else if (cinfo->scale_num * 2 <= cinfo->scale_denom) {
-    /* Provide 1/2 scaling */
-    cinfo->output_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width, 2L);
-    cinfo->output_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height, 2L);
-    cinfo->min_DCT_scaled_size = 4;
-  } else {
-    /* Provide 1/1 scaling */
-    cinfo->output_width = cinfo->image_width;
-    cinfo->output_height = cinfo->image_height;
-    cinfo->min_DCT_scaled_size = DCTSIZE;
-  }
-  /* In selecting the actual DCT scaling for each component, we try to
-   * scale up the chroma components via IDCT scaling rather than upsampling.
-   * This saves time if the upsampler gets to use 1:1 scaling.
-   * Note this code assumes that the supported DCT scalings are powers of 2.
-   */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    int ssize = cinfo->min_DCT_scaled_size;
-    while (ssize < DCTSIZE &&
-	   (compptr->h_samp_factor * ssize * 2 <=
-	    cinfo->max_h_samp_factor * cinfo->min_DCT_scaled_size) &&
-	   (compptr->v_samp_factor * ssize * 2 <=
-	    cinfo->max_v_samp_factor * cinfo->min_DCT_scaled_size)) {
-      ssize = ssize * 2;
-    }
-    compptr->DCT_scaled_size = ssize;
-  }
-
-  /* Recompute downsampled dimensions of components;
-   * application needs to know these if using raw downsampled data.
-   */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Size in samples, after IDCT scaling */
-    compptr->downsampled_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width *
-		    (long) (compptr->h_samp_factor * compptr->DCT_scaled_size),
-		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
-    compptr->downsampled_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height *
-		    (long) (compptr->v_samp_factor * compptr->DCT_scaled_size),
-		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
-  }
-
-#else /* !IDCT_SCALING_SUPPORTED */
-
-  /* Hardwire it to "no scaling" */
-  cinfo->output_width = cinfo->image_width;
-  cinfo->output_height = cinfo->image_height;
-  /* jdinput.c has already initialized DCT_scaled_size to DCTSIZE,
-   * and has computed unscaled downsampled_width and downsampled_height.
-   */
-
-#endif /* IDCT_SCALING_SUPPORTED */
-
-  /* Report number of components in selected colorspace. */
-  /* Probably this should be in the color conversion module... */
-  switch (cinfo->out_color_space) {
-  case JCS_GRAYSCALE:
-    cinfo->out_color_components = 1;
-    break;
-  case JCS_RGB:
-#if RGB_PIXELSIZE != 3
-    cinfo->out_color_components = RGB_PIXELSIZE;
-    break;
-#endif /* else share code with YCbCr */
-  case JCS_YCbCr:
-    cinfo->out_color_components = 3;
-    break;
-  case JCS_CMYK:
-  case JCS_YCCK:
-    cinfo->out_color_components = 4;
-    break;
-  default:			/* else must be same colorspace as in file */
-    cinfo->out_color_components = cinfo->num_components;
-    break;
-  }
-  cinfo->output_components = (cinfo->quantize_colors ? 1 :
-			      cinfo->out_color_components);
-
-  /* See if upsampler will want to emit more than one row at a time */
-  if (use_merged_upsample(cinfo))
-    cinfo->rec_outbuf_height = cinfo->max_v_samp_factor;
-  else
-    cinfo->rec_outbuf_height = 1;
-}
-
-
-/*
- * Several decompression processes need to range-limit values to the range
- * 0..MAXJSAMPLE; the input value may fall somewhat outside this range
- * due to noise introduced by quantization, roundoff error, etc.  These
- * processes are inner loops and need to be as fast as possible.  On most
- * machines, particularly CPUs with pipelines or instruction prefetch,
- * a (subscript-check-less) C table lookup
- *		x = sample_range_limit[x];
- * is faster than explicit tests
- *		if (x < 0)  x = 0;
- *		else if (x > MAXJSAMPLE)  x = MAXJSAMPLE;
- * These processes all use a common table prepared by the routine below.
- *
- * For most steps we can mathematically guarantee that the initial value
- * of x is within MAXJSAMPLE+1 of the legal range, so a table running from
- * -(MAXJSAMPLE+1) to 2*MAXJSAMPLE+1 is sufficient.  But for the initial
- * limiting step (just after the IDCT), a wildly out-of-range value is
- * possible if the input data is corrupt.  To avoid any chance of indexing
- * off the end of memory and getting a bad-pointer trap, we perform the
- * post-IDCT limiting thus:
- *		x = range_limit[x & MASK];
- * where MASK is 2 bits wider than legal sample data, ie 10 bits for 8-bit
- * samples.  Under normal circumstances this is more than enough range and
- * a correct output will be generated; with bogus input data the mask will
- * cause wraparound, and we will safely generate a bogus-but-in-range output.
- * For the post-IDCT step, we want to convert the data from signed to unsigned
- * representation by adding CENTERJSAMPLE at the same time that we limit it.
- * So the post-IDCT limiting table ends up looking like this:
- *   CENTERJSAMPLE,CENTERJSAMPLE+1,...,MAXJSAMPLE,
- *   MAXJSAMPLE (repeat 2*(MAXJSAMPLE+1)-CENTERJSAMPLE times),
- *   0          (repeat 2*(MAXJSAMPLE+1)-CENTERJSAMPLE times),
- *   0,1,...,CENTERJSAMPLE-1
- * Negative inputs select values from the upper half of the table after
- * masking.
- *
- * We can save some space by overlapping the start of the post-IDCT table
- * with the simpler range limiting table.  The post-IDCT table begins at
- * sample_range_limit + CENTERJSAMPLE.
- *
- * Note that the table is allocated in near data space on PCs; it's small
- * enough and used often enough to justify this.
- */
-
-LOCAL(void)
-prepare_range_limit_table (j_decompress_ptr cinfo)
-/* Allocate and fill in the sample_range_limit table */
-{
-  JSAMPLE * table;
-  int i;
-
-  table = (JSAMPLE *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-		(5 * (MAXJSAMPLE+1) + CENTERJSAMPLE) * SIZEOF(JSAMPLE));
-  table += (MAXJSAMPLE+1);	/* allow negative subscripts of simple table */
-  cinfo->sample_range_limit = table;
-  /* First segment of "simple" table: limit[x] = 0 for x < 0 */
-  MEMZERO(table - (MAXJSAMPLE+1), (MAXJSAMPLE+1) * SIZEOF(JSAMPLE));
-  /* Main part of "simple" table: limit[x] = x */
-  for (i = 0; i <= MAXJSAMPLE; i++)
-    table[i] = (JSAMPLE) i;
-  table += CENTERJSAMPLE;	/* Point to where post-IDCT table starts */
-  /* End of simple table, rest of first half of post-IDCT table */
-  for (i = CENTERJSAMPLE; i < 2*(MAXJSAMPLE+1); i++)
-    table[i] = MAXJSAMPLE;
-  /* Second half of post-IDCT table */
-  MEMZERO(table + (2 * (MAXJSAMPLE+1)),
-	  (2 * (MAXJSAMPLE+1) - CENTERJSAMPLE) * SIZEOF(JSAMPLE));
-  MEMCOPY(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
-	  cinfo->sample_range_limit, CENTERJSAMPLE * SIZEOF(JSAMPLE));
-}
-
-
-/*
- * Master selection of decompression modules.
- * This is done once at jpeg_start_decompress time.  We determine
- * which modules will be used and give them appropriate initialization calls.
- * We also initialize the decompressor input side to begin consuming data.
- *
- * Since jpeg_read_header has finished, we know what is in the SOF
- * and (first) SOS markers.  We also have all the application parameter
- * settings.
- */
-
-LOCAL(void)
-master_selection (j_decompress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-  wxjpeg_boolean use_c_buffer;
-  long samplesperrow;
-  JDIMENSION jd_samplesperrow;
-
-  /* Initialize dimensions and other stuff */
-  jpeg_calc_output_dimensions(cinfo);
-  prepare_range_limit_table(cinfo);
-
-  /* Width of an output scanline must be representable as JDIMENSION. */
-  samplesperrow = (long) cinfo->output_width * (long) cinfo->out_color_components;
-  jd_samplesperrow = (JDIMENSION) samplesperrow;
-  if ((long) jd_samplesperrow != samplesperrow)
-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-
-  /* Initialize my private state */
-  master->pass_number = 0;
-  master->using_merged_upsample = use_merged_upsample(cinfo);
-
-  /* Color quantizer selection */
-  master->quantizer_1pass = NULL;
-  master->quantizer_2pass = NULL;
-  /* No mode changes if not using buffered-image mode. */
-  if (! cinfo->quantize_colors || ! cinfo->buffered_image) {
-    cinfo->enable_1pass_quant = FALSE;
-    cinfo->enable_external_quant = FALSE;
-    cinfo->enable_2pass_quant = FALSE;
-  }
-  if (cinfo->quantize_colors) {
-    if (cinfo->raw_data_out)
-      ERREXIT(cinfo, JERR_NOTIMPL);
-    /* 2-pass quantizer only works in 3-component color space. */
-    if (cinfo->out_color_components != 3) {
-      cinfo->enable_1pass_quant = TRUE;
-      cinfo->enable_external_quant = FALSE;
-      cinfo->enable_2pass_quant = FALSE;
-      cinfo->colormap = NULL;
-    } else if (cinfo->colormap != NULL) {
-      cinfo->enable_external_quant = TRUE;
-    } else if (cinfo->two_pass_quantize) {
-      cinfo->enable_2pass_quant = TRUE;
-    } else {
-      cinfo->enable_1pass_quant = TRUE;
-    }
-
-    if (cinfo->enable_1pass_quant) {
-#ifdef QUANT_1PASS_SUPPORTED
-      jinit_1pass_quantizer(cinfo);
-      master->quantizer_1pass = cinfo->cquantize;
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    }
-
-    /* We use the 2-pass code to map to external colormaps. */
-    if (cinfo->enable_2pass_quant || cinfo->enable_external_quant) {
-#ifdef QUANT_2PASS_SUPPORTED
-      jinit_2pass_quantizer(cinfo);
-      master->quantizer_2pass = cinfo->cquantize;
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    }
-    /* If both quantizers are initialized, the 2-pass one is left active;
-     * this is necessary for starting with quantization to an external map.
-     */
-  }
-
-  /* Post-processing: in particular, color conversion first */
-  if (! cinfo->raw_data_out) {
-    if (master->using_merged_upsample) {
-#ifdef UPSAMPLE_MERGING_SUPPORTED
-      jinit_merged_upsampler(cinfo); /* does color conversion too */
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else {
-      jinit_color_deconverter(cinfo);
-      jinit_upsampler(cinfo);
-    }
-    jinit_d_post_controller(cinfo, cinfo->enable_2pass_quant);
-  }
-  /* Inverse DCT */
-  jinit_inverse_dct(cinfo);
-  /* Entropy decoding: either Huffman or arithmetic coding. */
-  if (cinfo->arith_code) {
-    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
-  } else {
-    if (cinfo->progressive_mode) {
-#ifdef D_PROGRESSIVE_SUPPORTED
-      jinit_phuff_decoder(cinfo);
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else
-      jinit_huff_decoder(cinfo);
-  }
-
-  /* Initialize principal buffer controllers. */
-  use_c_buffer = cinfo->inputctl->has_multiple_scans || cinfo->buffered_image;
-  jinit_d_coef_controller(cinfo, use_c_buffer);
-
-  if (! cinfo->raw_data_out)
-    jinit_d_main_controller(cinfo, FALSE /* never need full buffer here */);
-
-  /* We can now tell the memory manager to allocate virtual arrays. */
-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
-
-  /* Initialize input side of decompressor to consume first scan. */
-  (*cinfo->inputctl->start_input_pass) (cinfo);
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-  /* If jpeg_start_decompress will read the whole file, initialize
-   * progress monitoring appropriately.  The input step is counted
-   * as one pass.
-   */
-  if (cinfo->progress != NULL && ! cinfo->buffered_image &&
-      cinfo->inputctl->has_multiple_scans) {
-    int nscans;
-    /* Estimate number of scans to set pass_limit. */
-    if (cinfo->progressive_mode) {
-      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */
-      nscans = 2 + 3 * cinfo->num_components;
-    } else {
-      /* For a nonprogressive multiscan file, estimate 1 scan per component. */
-      nscans = cinfo->num_components;
-    }
-    cinfo->progress->pass_counter = 0L;
-    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;
-    cinfo->progress->completed_passes = 0;
-    cinfo->progress->total_passes = (cinfo->enable_2pass_quant ? 3 : 2);
-    /* Count the input pass as done */
-    master->pass_number++;
-  }
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
-}
-
-
-/*
- * Per-pass setup.
- * This is called at the beginning of each output pass.  We determine which
- * modules will be active during this pass and give them appropriate
- * start_pass calls.  We also set is_dummy_pass to indicate whether this
- * is a "real" output pass or a dummy pass for color quantization.
- * (In the latter case, jdapistd.c will crank the pass to completion.)
- */
-
-METHODDEF(void)
-prepare_for_output_pass (j_decompress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  if (master->pub.is_dummy_pass) {
-#ifdef QUANT_2PASS_SUPPORTED
-    /* Final pass of 2-pass quantization */
-    master->pub.is_dummy_pass = FALSE;
-    (*cinfo->cquantize->start_pass) (cinfo, FALSE);
-    (*cinfo->post->start_pass) (cinfo, JBUF_CRANK_DEST);
-    (*cinfo->main->start_pass) (cinfo, JBUF_CRANK_DEST);
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif /* QUANT_2PASS_SUPPORTED */
-  } else {
-    if (cinfo->quantize_colors && cinfo->colormap == NULL) {
-      /* Select new quantization method */
-      if (cinfo->two_pass_quantize && cinfo->enable_2pass_quant) {
-	cinfo->cquantize = master->quantizer_2pass;
-	master->pub.is_dummy_pass = TRUE;
-      } else if (cinfo->enable_1pass_quant) {
-	cinfo->cquantize = master->quantizer_1pass;
-      } else {
-	ERREXIT(cinfo, JERR_MODE_CHANGE);
-      }
-    }
-    (*cinfo->idct->start_pass) (cinfo);
-    (*cinfo->coef->start_output_pass) (cinfo);
-    if (! cinfo->raw_data_out) {
-      if (! master->using_merged_upsample)
-	(*cinfo->cconvert->start_pass) (cinfo);
-      (*cinfo->upsample->start_pass) (cinfo);
-      if (cinfo->quantize_colors)
-	(*cinfo->cquantize->start_pass) (cinfo, master->pub.is_dummy_pass);
-      (*cinfo->post->start_pass) (cinfo,
-	    (master->pub.is_dummy_pass ? JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));
-      (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);
-    }
-  }
-
-  /* Set up progress monitor's pass info if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->completed_passes = master->pass_number;
-    cinfo->progress->total_passes = master->pass_number +
-				    (master->pub.is_dummy_pass ? 2 : 1);
-    /* In buffered-image mode, we assume one more output pass if EOI not
-     * yet reached, but no more passes if EOI has been reached.
-     */
-    if (cinfo->buffered_image && ! cinfo->inputctl->eoi_reached) {
-      cinfo->progress->total_passes += (cinfo->enable_2pass_quant ? 2 : 1);
-    }
-  }
-}
-
-
-/*
- * Finish up at end of an output pass.
- */
-
-METHODDEF(void)
-finish_output_pass (j_decompress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  if (cinfo->quantize_colors)
-    (*cinfo->cquantize->finish_pass) (cinfo);
-  master->pass_number++;
-}
-
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-
-/*
- * Switch to a new external colormap between output passes.
- */
-
-GLOBAL(void)
-jpeg_new_colormap (j_decompress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  /* Prevent application from calling me at wrong times */
-  if (cinfo->global_state != DSTATE_BUFIMAGE)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  if (cinfo->quantize_colors && cinfo->enable_external_quant &&
-      cinfo->colormap != NULL) {
-    /* Select 2-pass quantizer for external colormap use */
-    cinfo->cquantize = master->quantizer_2pass;
-    /* Notify quantizer of colormap change */
-    (*cinfo->cquantize->new_color_map) (cinfo);
-    master->pub.is_dummy_pass = FALSE; /* just in case */
-  } else
-    ERREXIT(cinfo, JERR_MODE_CHANGE);
-}
-
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
-
-
-/*
- * Initialize master decompression control and select active modules.
- * This is performed at the start of jpeg_start_decompress.
- */
-
-GLOBAL(void)
-jinit_master_decompress (j_decompress_ptr cinfo)
-{
-  my_master_ptr master;
-
-  master = (my_master_ptr)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(my_decomp_master));
-  cinfo->master = (struct jpeg_decomp_master *) master;
-  master->pub.prepare_for_output_pass = prepare_for_output_pass;
-  master->pub.finish_output_pass = finish_output_pass;
-
-  master->pub.is_dummy_pass = FALSE;
-
-  master_selection(cinfo);
-}
-
+/*
+ * jdmaster.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains master control logic for the JPEG decompressor.
+ * These routines are concerned with selecting the modules to be executed
+ * and with determining the number of passes and the work to be done in each
+ * pass.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+/* Private state */
+
+typedef struct {
+  struct jpeg_decomp_master pub; /* public fields */
+
+  int pass_number;		/* # of passes completed */
+
+  wxjpeg_boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
+
+  /* Saved references to initialized quantizer modules,
+   * in case we need to switch modes.
+   */
+  struct jpeg_color_quantizer * quantizer_1pass;
+  struct jpeg_color_quantizer * quantizer_2pass;
+} my_decomp_master;
+
+typedef my_decomp_master * my_master_ptr;
+
+
+/*
+ * Determine whether merged upsample/color conversion should be used.
+ * CRUCIAL: this must match the actual capabilities of jdmerge.c!
+ */
+
+LOCAL(wxjpeg_boolean)
+use_merged_upsample (j_decompress_ptr cinfo)
+{
+#ifdef UPSAMPLE_MERGING_SUPPORTED
+  /* Merging is the equivalent of plain box-filter upsampling */
+  if (cinfo->do_fancy_upsampling || cinfo->CCIR601_sampling)
+    return FALSE;
+  /* jdmerge.c only supports YCC=>RGB color conversion */
+  if (cinfo->jpeg_color_space != JCS_YCbCr || cinfo->num_components != 3 ||
+      cinfo->out_color_space != JCS_RGB ||
+      cinfo->out_color_components != RGB_PIXELSIZE)
+    return FALSE;
+  /* and it only handles 2h1v or 2h2v sampling ratios */
+  if (cinfo->comp_info[0].h_samp_factor != 2 ||
+      cinfo->comp_info[1].h_samp_factor != 1 ||
+      cinfo->comp_info[2].h_samp_factor != 1 ||
+      cinfo->comp_info[0].v_samp_factor >  2 ||
+      cinfo->comp_info[1].v_samp_factor != 1 ||
+      cinfo->comp_info[2].v_samp_factor != 1)
+    return FALSE;
+  /* furthermore, it doesn't work if we've scaled the IDCTs differently */
+  if (cinfo->comp_info[0].DCT_scaled_size != cinfo->min_DCT_scaled_size ||
+      cinfo->comp_info[1].DCT_scaled_size != cinfo->min_DCT_scaled_size ||
+      cinfo->comp_info[2].DCT_scaled_size != cinfo->min_DCT_scaled_size)
+    return FALSE;
+  /* ??? also need to test for upsample-time rescaling, when & if supported */
+  return TRUE;			/* by golly, it'll work... */
+#else
+  return FALSE;
+#endif
+}
+
+
+/*
+ * Compute output image dimensions and related values.
+ * NOTE: this is exported for possible use by application.
+ * Hence it mustn't do anything that can't be done twice.
+ * Also note that it may be called before the master module is initialized!
+ */
+
+GLOBAL(void)
+jpeg_calc_output_dimensions (j_decompress_ptr cinfo)
+/* Do computations that are needed before master selection phase */
+{
+#ifdef IDCT_SCALING_SUPPORTED
+  int ci;
+  jpeg_component_info *compptr;
+#endif
+
+  /* Prevent application from calling me at wrong times */
+  if (cinfo->global_state != DSTATE_READY)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+#ifdef IDCT_SCALING_SUPPORTED
+
+  /* Compute actual output image dimensions and DCT scaling choices. */
+  if (cinfo->scale_num * 8 <= cinfo->scale_denom) {
+    /* Provide 1/8 scaling */
+    cinfo->output_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width, 8L);
+    cinfo->output_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height, 8L);
+    cinfo->min_DCT_scaled_size = 1;
+  } else if (cinfo->scale_num * 4 <= cinfo->scale_denom) {
+    /* Provide 1/4 scaling */
+    cinfo->output_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width, 4L);
+    cinfo->output_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height, 4L);
+    cinfo->min_DCT_scaled_size = 2;
+  } else if (cinfo->scale_num * 2 <= cinfo->scale_denom) {
+    /* Provide 1/2 scaling */
+    cinfo->output_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width, 2L);
+    cinfo->output_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height, 2L);
+    cinfo->min_DCT_scaled_size = 4;
+  } else {
+    /* Provide 1/1 scaling */
+    cinfo->output_width = cinfo->image_width;
+    cinfo->output_height = cinfo->image_height;
+    cinfo->min_DCT_scaled_size = DCTSIZE;
+  }
+  /* In selecting the actual DCT scaling for each component, we try to
+   * scale up the chroma components via IDCT scaling rather than upsampling.
+   * This saves time if the upsampler gets to use 1:1 scaling.
+   * Note this code assumes that the supported DCT scalings are powers of 2.
+   */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    int ssize = cinfo->min_DCT_scaled_size;
+    while (ssize < DCTSIZE &&
+	   (compptr->h_samp_factor * ssize * 2 <=
+	    cinfo->max_h_samp_factor * cinfo->min_DCT_scaled_size) &&
+	   (compptr->v_samp_factor * ssize * 2 <=
+	    cinfo->max_v_samp_factor * cinfo->min_DCT_scaled_size)) {
+      ssize = ssize * 2;
+    }
+    compptr->DCT_scaled_size = ssize;
+  }
+
+  /* Recompute downsampled dimensions of components;
+   * application needs to know these if using raw downsampled data.
+   */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Size in samples, after IDCT scaling */
+    compptr->downsampled_width = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_width *
+		    (long) (compptr->h_samp_factor * compptr->DCT_scaled_size),
+		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
+    compptr->downsampled_height = (JDIMENSION)
+      jdiv_round_up((long) cinfo->image_height *
+		    (long) (compptr->v_samp_factor * compptr->DCT_scaled_size),
+		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
+  }
+
+#else /* !IDCT_SCALING_SUPPORTED */
+
+  /* Hardwire it to "no scaling" */
+  cinfo->output_width = cinfo->image_width;
+  cinfo->output_height = cinfo->image_height;
+  /* jdinput.c has already initialized DCT_scaled_size to DCTSIZE,
+   * and has computed unscaled downsampled_width and downsampled_height.
+   */
+
+#endif /* IDCT_SCALING_SUPPORTED */
+
+  /* Report number of components in selected colorspace. */
+  /* Probably this should be in the color conversion module... */
+  switch (cinfo->out_color_space) {
+  case JCS_GRAYSCALE:
+    cinfo->out_color_components = 1;
+    break;
+  case JCS_RGB:
+#if RGB_PIXELSIZE != 3
+    cinfo->out_color_components = RGB_PIXELSIZE;
+    break;
+#endif /* else share code with YCbCr */
+  case JCS_YCbCr:
+    cinfo->out_color_components = 3;
+    break;
+  case JCS_CMYK:
+  case JCS_YCCK:
+    cinfo->out_color_components = 4;
+    break;
+  default:			/* else must be same colorspace as in file */
+    cinfo->out_color_components = cinfo->num_components;
+    break;
+  }
+  cinfo->output_components = (cinfo->quantize_colors ? 1 :
+			      cinfo->out_color_components);
+
+  /* See if upsampler will want to emit more than one row at a time */
+  if (use_merged_upsample(cinfo))
+    cinfo->rec_outbuf_height = cinfo->max_v_samp_factor;
+  else
+    cinfo->rec_outbuf_height = 1;
+}
+
+
+/*
+ * Several decompression processes need to range-limit values to the range
+ * 0..MAXJSAMPLE; the input value may fall somewhat outside this range
+ * due to noise introduced by quantization, roundoff error, etc.  These
+ * processes are inner loops and need to be as fast as possible.  On most
+ * machines, particularly CPUs with pipelines or instruction prefetch,
+ * a (subscript-check-less) C table lookup
+ *		x = sample_range_limit[x];
+ * is faster than explicit tests
+ *		if (x < 0)  x = 0;
+ *		else if (x > MAXJSAMPLE)  x = MAXJSAMPLE;
+ * These processes all use a common table prepared by the routine below.
+ *
+ * For most steps we can mathematically guarantee that the initial value
+ * of x is within MAXJSAMPLE+1 of the legal range, so a table running from
+ * -(MAXJSAMPLE+1) to 2*MAXJSAMPLE+1 is sufficient.  But for the initial
+ * limiting step (just after the IDCT), a wildly out-of-range value is
+ * possible if the input data is corrupt.  To avoid any chance of indexing
+ * off the end of memory and getting a bad-pointer trap, we perform the
+ * post-IDCT limiting thus:
+ *		x = range_limit[x & MASK];
+ * where MASK is 2 bits wider than legal sample data, ie 10 bits for 8-bit
+ * samples.  Under normal circumstances this is more than enough range and
+ * a correct output will be generated; with bogus input data the mask will
+ * cause wraparound, and we will safely generate a bogus-but-in-range output.
+ * For the post-IDCT step, we want to convert the data from signed to unsigned
+ * representation by adding CENTERJSAMPLE at the same time that we limit it.
+ * So the post-IDCT limiting table ends up looking like this:
+ *   CENTERJSAMPLE,CENTERJSAMPLE+1,...,MAXJSAMPLE,
+ *   MAXJSAMPLE (repeat 2*(MAXJSAMPLE+1)-CENTERJSAMPLE times),
+ *   0          (repeat 2*(MAXJSAMPLE+1)-CENTERJSAMPLE times),
+ *   0,1,...,CENTERJSAMPLE-1
+ * Negative inputs select values from the upper half of the table after
+ * masking.
+ *
+ * We can save some space by overlapping the start of the post-IDCT table
+ * with the simpler range limiting table.  The post-IDCT table begins at
+ * sample_range_limit + CENTERJSAMPLE.
+ *
+ * Note that the table is allocated in near data space on PCs; it's small
+ * enough and used often enough to justify this.
+ */
+
+LOCAL(void)
+prepare_range_limit_table (j_decompress_ptr cinfo)
+/* Allocate and fill in the sample_range_limit table */
+{
+  JSAMPLE * table;
+  int i;
+
+  table = (JSAMPLE *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+		(5 * (MAXJSAMPLE+1) + CENTERJSAMPLE) * SIZEOF(JSAMPLE));
+  table += (MAXJSAMPLE+1);	/* allow negative subscripts of simple table */
+  cinfo->sample_range_limit = table;
+  /* First segment of "simple" table: limit[x] = 0 for x < 0 */
+  MEMZERO(table - (MAXJSAMPLE+1), (MAXJSAMPLE+1) * SIZEOF(JSAMPLE));
+  /* Main part of "simple" table: limit[x] = x */
+  for (i = 0; i <= MAXJSAMPLE; i++)
+    table[i] = (JSAMPLE) i;
+  table += CENTERJSAMPLE;	/* Point to where post-IDCT table starts */
+  /* End of simple table, rest of first half of post-IDCT table */
+  for (i = CENTERJSAMPLE; i < 2*(MAXJSAMPLE+1); i++)
+    table[i] = MAXJSAMPLE;
+  /* Second half of post-IDCT table */
+  MEMZERO(table + (2 * (MAXJSAMPLE+1)),
+	  (2 * (MAXJSAMPLE+1) - CENTERJSAMPLE) * SIZEOF(JSAMPLE));
+  MEMCOPY(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
+	  cinfo->sample_range_limit, CENTERJSAMPLE * SIZEOF(JSAMPLE));
+}
+
+
+/*
+ * Master selection of decompression modules.
+ * This is done once at jpeg_start_decompress time.  We determine
+ * which modules will be used and give them appropriate initialization calls.
+ * We also initialize the decompressor input side to begin consuming data.
+ *
+ * Since jpeg_read_header has finished, we know what is in the SOF
+ * and (first) SOS markers.  We also have all the application parameter
+ * settings.
+ */
+
+LOCAL(void)
+master_selection (j_decompress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+  wxjpeg_boolean use_c_buffer;
+  long samplesperrow;
+  JDIMENSION jd_samplesperrow;
+
+  /* Initialize dimensions and other stuff */
+  jpeg_calc_output_dimensions(cinfo);
+  prepare_range_limit_table(cinfo);
+
+  /* Width of an output scanline must be representable as JDIMENSION. */
+  samplesperrow = (long) cinfo->output_width * (long) cinfo->out_color_components;
+  jd_samplesperrow = (JDIMENSION) samplesperrow;
+  if ((long) jd_samplesperrow != samplesperrow)
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+
+  /* Initialize my private state */
+  master->pass_number = 0;
+  master->using_merged_upsample = use_merged_upsample(cinfo);
+
+  /* Color quantizer selection */
+  master->quantizer_1pass = NULL;
+  master->quantizer_2pass = NULL;
+  /* No mode changes if not using buffered-image mode. */
+  if (! cinfo->quantize_colors || ! cinfo->buffered_image) {
+    cinfo->enable_1pass_quant = FALSE;
+    cinfo->enable_external_quant = FALSE;
+    cinfo->enable_2pass_quant = FALSE;
+  }
+  if (cinfo->quantize_colors) {
+    if (cinfo->raw_data_out)
+      ERREXIT(cinfo, JERR_NOTIMPL);
+    /* 2-pass quantizer only works in 3-component color space. */
+    if (cinfo->out_color_components != 3) {
+      cinfo->enable_1pass_quant = TRUE;
+      cinfo->enable_external_quant = FALSE;
+      cinfo->enable_2pass_quant = FALSE;
+      cinfo->colormap = NULL;
+    } else if (cinfo->colormap != NULL) {
+      cinfo->enable_external_quant = TRUE;
+    } else if (cinfo->two_pass_quantize) {
+      cinfo->enable_2pass_quant = TRUE;
+    } else {
+      cinfo->enable_1pass_quant = TRUE;
+    }
+
+    if (cinfo->enable_1pass_quant) {
+#ifdef QUANT_1PASS_SUPPORTED
+      jinit_1pass_quantizer(cinfo);
+      master->quantizer_1pass = cinfo->cquantize;
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    }
+
+    /* We use the 2-pass code to map to external colormaps. */
+    if (cinfo->enable_2pass_quant || cinfo->enable_external_quant) {
+#ifdef QUANT_2PASS_SUPPORTED
+      jinit_2pass_quantizer(cinfo);
+      master->quantizer_2pass = cinfo->cquantize;
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    }
+    /* If both quantizers are initialized, the 2-pass one is left active;
+     * this is necessary for starting with quantization to an external map.
+     */
+  }
+
+  /* Post-processing: in particular, color conversion first */
+  if (! cinfo->raw_data_out) {
+    if (master->using_merged_upsample) {
+#ifdef UPSAMPLE_MERGING_SUPPORTED
+      jinit_merged_upsampler(cinfo); /* does color conversion too */
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    } else {
+      jinit_color_deconverter(cinfo);
+      jinit_upsampler(cinfo);
+    }
+    jinit_d_post_controller(cinfo, cinfo->enable_2pass_quant);
+  }
+  /* Inverse DCT */
+  jinit_inverse_dct(cinfo);
+  /* Entropy decoding: either Huffman or arithmetic coding. */
+  if (cinfo->arith_code) {
+    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+  } else {
+    if (cinfo->progressive_mode) {
+#ifdef D_PROGRESSIVE_SUPPORTED
+      jinit_phuff_decoder(cinfo);
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    } else
+      jinit_huff_decoder(cinfo);
+  }
+
+  /* Initialize principal buffer controllers. */
+  use_c_buffer = cinfo->inputctl->has_multiple_scans || cinfo->buffered_image;
+  jinit_d_coef_controller(cinfo, use_c_buffer);
+
+  if (! cinfo->raw_data_out)
+    jinit_d_main_controller(cinfo, FALSE /* never need full buffer here */);
+
+  /* We can now tell the memory manager to allocate virtual arrays. */
+  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
+
+  /* Initialize input side of decompressor to consume first scan. */
+  (*cinfo->inputctl->start_input_pass) (cinfo);
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+  /* If jpeg_start_decompress will read the whole file, initialize
+   * progress monitoring appropriately.  The input step is counted
+   * as one pass.
+   */
+  if (cinfo->progress != NULL && ! cinfo->buffered_image &&
+      cinfo->inputctl->has_multiple_scans) {
+    int nscans;
+    /* Estimate number of scans to set pass_limit. */
+    if (cinfo->progressive_mode) {
+      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */
+      nscans = 2 + 3 * cinfo->num_components;
+    } else {
+      /* For a nonprogressive multiscan file, estimate 1 scan per component. */
+      nscans = cinfo->num_components;
+    }
+    cinfo->progress->pass_counter = 0L;
+    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;
+    cinfo->progress->completed_passes = 0;
+    cinfo->progress->total_passes = (cinfo->enable_2pass_quant ? 3 : 2);
+    /* Count the input pass as done */
+    master->pass_number++;
+  }
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
+}
+
+
+/*
+ * Per-pass setup.
+ * This is called at the beginning of each output pass.  We determine which
+ * modules will be active during this pass and give them appropriate
+ * start_pass calls.  We also set is_dummy_pass to indicate whether this
+ * is a "real" output pass or a dummy pass for color quantization.
+ * (In the latter case, jdapistd.c will crank the pass to completion.)
+ */
+
+METHODDEF(void)
+prepare_for_output_pass (j_decompress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  if (master->pub.is_dummy_pass) {
+#ifdef QUANT_2PASS_SUPPORTED
+    /* Final pass of 2-pass quantization */
+    master->pub.is_dummy_pass = FALSE;
+    (*cinfo->cquantize->start_pass) (cinfo, FALSE);
+    (*cinfo->post->start_pass) (cinfo, JBUF_CRANK_DEST);
+    (*cinfo->main->start_pass) (cinfo, JBUF_CRANK_DEST);
+#else
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif /* QUANT_2PASS_SUPPORTED */
+  } else {
+    if (cinfo->quantize_colors && cinfo->colormap == NULL) {
+      /* Select new quantization method */
+      if (cinfo->two_pass_quantize && cinfo->enable_2pass_quant) {
+	cinfo->cquantize = master->quantizer_2pass;
+	master->pub.is_dummy_pass = TRUE;
+      } else if (cinfo->enable_1pass_quant) {
+	cinfo->cquantize = master->quantizer_1pass;
+      } else {
+	ERREXIT(cinfo, JERR_MODE_CHANGE);
+      }
+    }
+    (*cinfo->idct->start_pass) (cinfo);
+    (*cinfo->coef->start_output_pass) (cinfo);
+    if (! cinfo->raw_data_out) {
+      if (! master->using_merged_upsample)
+	(*cinfo->cconvert->start_pass) (cinfo);
+      (*cinfo->upsample->start_pass) (cinfo);
+      if (cinfo->quantize_colors)
+	(*cinfo->cquantize->start_pass) (cinfo, master->pub.is_dummy_pass);
+      (*cinfo->post->start_pass) (cinfo,
+	    (master->pub.is_dummy_pass ? JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));
+      (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);
+    }
+  }
+
+  /* Set up progress monitor's pass info if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->completed_passes = master->pass_number;
+    cinfo->progress->total_passes = master->pass_number +
+				    (master->pub.is_dummy_pass ? 2 : 1);
+    /* In buffered-image mode, we assume one more output pass if EOI not
+     * yet reached, but no more passes if EOI has been reached.
+     */
+    if (cinfo->buffered_image && ! cinfo->inputctl->eoi_reached) {
+      cinfo->progress->total_passes += (cinfo->enable_2pass_quant ? 2 : 1);
+    }
+  }
+}
+
+
+/*
+ * Finish up at end of an output pass.
+ */
+
+METHODDEF(void)
+finish_output_pass (j_decompress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  if (cinfo->quantize_colors)
+    (*cinfo->cquantize->finish_pass) (cinfo);
+  master->pass_number++;
+}
+
+
+#ifdef D_MULTISCAN_FILES_SUPPORTED
+
+/*
+ * Switch to a new external colormap between output passes.
+ */
+
+GLOBAL(void)
+jpeg_new_colormap (j_decompress_ptr cinfo)
+{
+  my_master_ptr master = (my_master_ptr) cinfo->master;
+
+  /* Prevent application from calling me at wrong times */
+  if (cinfo->global_state != DSTATE_BUFIMAGE)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  if (cinfo->quantize_colors && cinfo->enable_external_quant &&
+      cinfo->colormap != NULL) {
+    /* Select 2-pass quantizer for external colormap use */
+    cinfo->cquantize = master->quantizer_2pass;
+    /* Notify quantizer of colormap change */
+    (*cinfo->cquantize->new_color_map) (cinfo);
+    master->pub.is_dummy_pass = FALSE; /* just in case */
+  } else
+    ERREXIT(cinfo, JERR_MODE_CHANGE);
+}
+
+#endif /* D_MULTISCAN_FILES_SUPPORTED */
+
+
+/*
+ * Initialize master decompression control and select active modules.
+ * This is performed at the start of jpeg_start_decompress.
+ */
+
+GLOBAL(void)
+jinit_master_decompress (j_decompress_ptr cinfo)
+{
+  my_master_ptr master;
+
+  master = (my_master_ptr)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				  SIZEOF(my_decomp_master));
+  cinfo->master = (struct jpeg_decomp_master *) master;
+  master->pub.prepare_for_output_pass = prepare_for_output_pass;
+  master->pub.finish_output_pass = finish_output_pass;
+
+  master->pub.is_dummy_pass = FALSE;
+
+  master_selection(cinfo);
+}
+
diff --git a/Source/3rd Party/wx/src/jpeg/jdmerge.c b/Source/3rd Party/wx/src/jpeg/jdmerge.c
index eb0c49097..55eab3621 100644
--- a/Source/3rd Party/wx/src/jpeg/jdmerge.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdmerge.c	
@@ -1,399 +1,399 @@
-/*
- * jdmerge.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains code for merged upsampling/color conversion.
- *
- * This file combines functions from jdsample.c and jdcolor.c;
- * read those files first to understand what's going on.
- *
- * When the chroma components are to be upsampled by simple replication
- * (ie, box filtering), we can save some work in color conversion by
- * calculating all the output pixels corresponding to a pair of chroma
- * samples at one time.  In the conversion equations
- *	R = Y           + K1 * Cr
- *	G = Y + K2 * Cb + K3 * Cr
- *	B = Y + K4 * Cb
- * only the Y term varies among the group of pixels corresponding to a pair
- * of chroma samples, so the rest of the terms can be calculated just once.
- * At typical sampling ratios, this eliminates half or three-quarters of the
- * multiplications needed for color conversion.
- *
- * This file currently provides implementations for the following cases:
- *	YCbCr => RGB color conversion only.
- *	Sampling ratios of 2h1v or 2h2v.
- *	No scaling needed at upsample time.
- *	Corner-aligned (non-CCIR601) sampling alignment.
- * Other special cases could be added, but in most applications these are
- * the only common cases.  (For uncommon cases we fall back on the more
- * general code in jdsample.c and jdcolor.c.)
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-#ifdef UPSAMPLE_MERGING_SUPPORTED
-
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_upsampler pub;	/* public fields */
-
-  /* Pointer to routine to do actual upsampling/conversion of one row group */
-  JMETHOD(void, upmethod, (j_decompress_ptr cinfo,
-			   JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
-			   JSAMPARRAY output_buf));
-
-  /* Private state for YCC->RGB conversion */
-  int * Cr_r_tab;		/* => table for Cr to R conversion */
-  int * Cb_b_tab;		/* => table for Cb to B conversion */
-  JPEG_INT32 * Cr_g_tab;		/* => table for Cr to G conversion */
-  JPEG_INT32 * Cb_g_tab;		/* => table for Cb to G conversion */
-
-  /* For 2:1 vertical sampling, we produce two output rows at a time.
-   * We need a "spare" row buffer to hold the second output row if the
-   * application provides just a one-row buffer; we also use the spare
-   * to discard the dummy last row if the image height is odd.
-   */
-  JSAMPROW spare_row;
-  wxjpeg_boolean spare_full;		/* T if spare buffer is occupied */
-
-  JDIMENSION out_row_width;	/* samples per output row */
-  JDIMENSION rows_to_go;	/* counts rows remaining in image */
-} my_upsampler;
-
-typedef my_upsampler * my_upsample_ptr;
-
-#define SCALEBITS	16	/* speediest right-shift on some machines */
-#define ONE_HALF	((JPEG_INT32) 1 << (SCALEBITS-1))
-#define FIX(x)		((JPEG_INT32) ((x) * (1L<<SCALEBITS) + 0.5))
-
-
-/*
- * Initialize tables for YCC->RGB colorspace conversion.
- * This is taken directly from jdcolor.c; see that file for more info.
- */
-
-LOCAL(void)
-build_ycc_rgb_table (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  int i;
-  JPEG_INT32 x;
-  SHIFT_TEMPS
-
-  upsample->Cr_r_tab = (int *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(int));
-  upsample->Cb_b_tab = (int *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(int));
-  upsample->Cr_g_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
-  upsample->Cb_g_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
-
-  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
-    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */
-    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */
-    /* Cr=>R value is nearest int to 1.40200 * x */
-    upsample->Cr_r_tab[i] = (int)
-		    RIGHT_SHIFT(FIX(1.40200) * x + ONE_HALF, SCALEBITS);
-    /* Cb=>B value is nearest int to 1.77200 * x */
-    upsample->Cb_b_tab[i] = (int)
-		    RIGHT_SHIFT(FIX(1.77200) * x + ONE_HALF, SCALEBITS);
-    /* Cr=>G value is scaled-up -0.71414 * x */
-    upsample->Cr_g_tab[i] = (- FIX(0.71414)) * x;
-    /* Cb=>G value is scaled-up -0.34414 * x */
-    /* We also add in ONE_HALF so that need not do it in inner loop */
-    upsample->Cb_g_tab[i] = (- FIX(0.34414)) * x + ONE_HALF;
-  }
-}
-
-
-/*
- * Initialize for an upsampling pass.
- */
-
-METHODDEF(void)
-start_pass_merged_upsample (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-
-  /* Mark the spare buffer empty */
-  upsample->spare_full = FALSE;
-  /* Initialize total-height counter for detecting bottom of image */
-  upsample->rows_to_go = cinfo->output_height;
-}
-
-
-/*
- * Control routine to do upsampling (and color conversion).
- *
- * The control routine just handles the row buffering considerations.
- */
-
-METHODDEF(void)
-merged_2v_upsample (j_decompress_ptr cinfo,
-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		    JDIMENSION in_row_groups_avail,
-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		    JDIMENSION out_rows_avail)
-/* 2:1 vertical sampling case: may need a spare row. */
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  JSAMPROW work_ptrs[2];
-  JDIMENSION num_rows;		/* number of rows returned to caller */
-
-  if (upsample->spare_full) {
-    /* If we have a spare row saved from a previous cycle, just return it. */
-    jcopy_sample_rows(& upsample->spare_row, 0, output_buf + *out_row_ctr, 0,
-		      1, upsample->out_row_width);
-    num_rows = 1;
-    upsample->spare_full = FALSE;
-  } else {
-    /* Figure number of rows to return to caller. */
-    num_rows = 2;
-    /* Not more than the distance to the end of the image. */
-    if (num_rows > upsample->rows_to_go)
-      num_rows = upsample->rows_to_go;
-    /* And not more than what the client can accept: */
-    out_rows_avail -= *out_row_ctr;
-    if (num_rows > out_rows_avail)
-      num_rows = out_rows_avail;
-    /* Create output pointer array for upsampler. */
-    work_ptrs[0] = output_buf[*out_row_ctr];
-    if (num_rows > 1) {
-      work_ptrs[1] = output_buf[*out_row_ctr + 1];
-    } else {
-      work_ptrs[1] = upsample->spare_row;
-      upsample->spare_full = TRUE;
-    }
-    /* Now do the upsampling. */
-    (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr, work_ptrs);
-  }
-
-  /* Adjust counts */
-  *out_row_ctr += num_rows;
-  upsample->rows_to_go -= num_rows;
-  /* When the buffer is emptied, declare this input row group consumed */
-  if (! upsample->spare_full)
-    (*in_row_group_ctr)++;
-}
-
-
-METHODDEF(void)
-merged_1v_upsample (j_decompress_ptr cinfo,
-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		    JDIMENSION in_row_groups_avail,
-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		    JDIMENSION out_rows_avail)
-/* 1:1 vertical sampling case: much easier, never need a spare row. */
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-
-  /* Just do the upsampling. */
-  (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr,
-			 output_buf + *out_row_ctr);
-  /* Adjust counts */
-  (*out_row_ctr)++;
-  (*in_row_group_ctr)++;
-}
-
-
-/*
- * These are the routines invoked by the control routines to do
- * the actual upsampling/conversion.  One row group is processed per call.
- *
- * Note: since we may be writing directly into application-supplied buffers,
- * we have to be honest about the output width; we can't assume the buffer
- * has been rounded up to an even width.
- */
-
-
-/*
- * Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
- */
-
-METHODDEF(void)
-h2v1_merged_upsample (j_decompress_ptr cinfo,
-		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
-		      JSAMPARRAY output_buf)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  register int y, cred, cgreen, cblue;
-  int cb, cr;
-  register JSAMPROW outptr;
-  JSAMPROW inptr0, inptr1, inptr2;
-  JDIMENSION col;
-  /* copy these pointers into registers if possible */
-  register JSAMPLE * range_limit = cinfo->sample_range_limit;
-  int * Crrtab = upsample->Cr_r_tab;
-  int * Cbbtab = upsample->Cb_b_tab;
-  JPEG_INT32 * Crgtab = upsample->Cr_g_tab;
-  JPEG_INT32 * Cbgtab = upsample->Cb_g_tab;
-  SHIFT_TEMPS
-
-  inptr0 = input_buf[0][in_row_group_ctr];
-  inptr1 = input_buf[1][in_row_group_ctr];
-  inptr2 = input_buf[2][in_row_group_ctr];
-  outptr = output_buf[0];
-  /* Loop for each pair of output pixels */
-  for (col = cinfo->output_width >> 1; col > 0; col--) {
-    /* Do the chroma part of the calculation */
-    cb = GETJSAMPLE(*inptr1++);
-    cr = GETJSAMPLE(*inptr2++);
-    cred = Crrtab[cr];
-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
-    cblue = Cbbtab[cb];
-    /* Fetch 2 Y values and emit 2 pixels */
-    y  = GETJSAMPLE(*inptr0++);
-    outptr[RGB_RED] =   range_limit[y + cred];
-    outptr[RGB_GREEN] = range_limit[y + cgreen];
-    outptr[RGB_BLUE] =  range_limit[y + cblue];
-    outptr += RGB_PIXELSIZE;
-    y  = GETJSAMPLE(*inptr0++);
-    outptr[RGB_RED] =   range_limit[y + cred];
-    outptr[RGB_GREEN] = range_limit[y + cgreen];
-    outptr[RGB_BLUE] =  range_limit[y + cblue];
-    outptr += RGB_PIXELSIZE;
-  }
-  /* If image width is odd, do the last output column separately */
-  if (cinfo->output_width & 1) {
-    cb = GETJSAMPLE(*inptr1);
-    cr = GETJSAMPLE(*inptr2);
-    cred = Crrtab[cr];
-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
-    cblue = Cbbtab[cb];
-    y  = GETJSAMPLE(*inptr0);
-    outptr[RGB_RED] =   range_limit[y + cred];
-    outptr[RGB_GREEN] = range_limit[y + cgreen];
-    outptr[RGB_BLUE] =  range_limit[y + cblue];
-  }
-}
-
-/*
- * Upsample and color convert for the case of 2:1 horizontal and 2:1 vertical.
- */
-
-METHODDEF(void)
-h2v2_merged_upsample (j_decompress_ptr cinfo,
-		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
-		      JSAMPARRAY output_buf)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  register int y, cred, cgreen, cblue;
-  int cb, cr;
-  register JSAMPROW outptr0, outptr1;
-  JSAMPROW inptr00, inptr01, inptr1, inptr2;
-  JDIMENSION col;
-  /* copy these pointers into registers if possible */
-  register JSAMPLE * range_limit = cinfo->sample_range_limit;
-  int * Crrtab = upsample->Cr_r_tab;
-  int * Cbbtab = upsample->Cb_b_tab;
-  JPEG_INT32 * Crgtab = upsample->Cr_g_tab;
-  JPEG_INT32 * Cbgtab = upsample->Cb_g_tab;
-  SHIFT_TEMPS
-
-  inptr00 = input_buf[0][in_row_group_ctr*2];
-  inptr01 = input_buf[0][in_row_group_ctr*2 + 1];
-  inptr1 = input_buf[1][in_row_group_ctr];
-  inptr2 = input_buf[2][in_row_group_ctr];
-  outptr0 = output_buf[0];
-  outptr1 = output_buf[1];
-  /* Loop for each group of output pixels */
-  for (col = cinfo->output_width >> 1; col > 0; col--) {
-    /* Do the chroma part of the calculation */
-    cb = GETJSAMPLE(*inptr1++);
-    cr = GETJSAMPLE(*inptr2++);
-    cred = Crrtab[cr];
-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
-    cblue = Cbbtab[cb];
-    /* Fetch 4 Y values and emit 4 pixels */
-    y  = GETJSAMPLE(*inptr00++);
-    outptr0[RGB_RED] =   range_limit[y + cred];
-    outptr0[RGB_GREEN] = range_limit[y + cgreen];
-    outptr0[RGB_BLUE] =  range_limit[y + cblue];
-    outptr0 += RGB_PIXELSIZE;
-    y  = GETJSAMPLE(*inptr00++);
-    outptr0[RGB_RED] =   range_limit[y + cred];
-    outptr0[RGB_GREEN] = range_limit[y + cgreen];
-    outptr0[RGB_BLUE] =  range_limit[y + cblue];
-    outptr0 += RGB_PIXELSIZE;
-    y  = GETJSAMPLE(*inptr01++);
-    outptr1[RGB_RED] =   range_limit[y + cred];
-    outptr1[RGB_GREEN] = range_limit[y + cgreen];
-    outptr1[RGB_BLUE] =  range_limit[y + cblue];
-    outptr1 += RGB_PIXELSIZE;
-    y  = GETJSAMPLE(*inptr01++);
-    outptr1[RGB_RED] =   range_limit[y + cred];
-    outptr1[RGB_GREEN] = range_limit[y + cgreen];
-    outptr1[RGB_BLUE] =  range_limit[y + cblue];
-    outptr1 += RGB_PIXELSIZE;
-  }
-  /* If image width is odd, do the last output column separately */
-  if (cinfo->output_width & 1) {
-    cb = GETJSAMPLE(*inptr1);
-    cr = GETJSAMPLE(*inptr2);
-    cred = Crrtab[cr];
-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
-    cblue = Cbbtab[cb];
-    y  = GETJSAMPLE(*inptr00);
-    outptr0[RGB_RED] =   range_limit[y + cred];
-    outptr0[RGB_GREEN] = range_limit[y + cgreen];
-    outptr0[RGB_BLUE] =  range_limit[y + cblue];
-    y  = GETJSAMPLE(*inptr01);
-    outptr1[RGB_RED] =   range_limit[y + cred];
-    outptr1[RGB_GREEN] = range_limit[y + cgreen];
-    outptr1[RGB_BLUE] =  range_limit[y + cblue];
-  }
-}
-
-
-/*
- * Module initialization routine for merged upsampling/color conversion.
- *
- * NB: this is called under the conditions determined by use_merged_upsample()
- * in jdmaster.c.  That routine MUST correspond to the actual capabilities
- * of this module; no safety checks are made here.
- */
-
-GLOBAL(void)
-jinit_merged_upsampler (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample;
-
-  upsample = (my_upsample_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_upsampler));
-  cinfo->upsample = (struct jpeg_upsampler *) upsample;
-  upsample->pub.start_pass = start_pass_merged_upsample;
-  upsample->pub.need_context_rows = FALSE;
-
-  upsample->out_row_width = cinfo->output_width * cinfo->out_color_components;
-
-  if (cinfo->max_v_samp_factor == 2) {
-    upsample->pub.upsample = merged_2v_upsample;
-    upsample->upmethod = h2v2_merged_upsample;
-    /* Allocate a spare row buffer */
-    upsample->spare_row = (JSAMPROW)
-      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-		(size_t) (upsample->out_row_width * SIZEOF(JSAMPLE)));
-  } else {
-    upsample->pub.upsample = merged_1v_upsample;
-    upsample->upmethod = h2v1_merged_upsample;
-    /* No spare row needed */
-    upsample->spare_row = NULL;
-  }
-
-  build_ycc_rgb_table(cinfo);
-}
-
-#endif /* UPSAMPLE_MERGING_SUPPORTED */
+/*
+ * jdmerge.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains code for merged upsampling/color conversion.
+ *
+ * This file combines functions from jdsample.c and jdcolor.c;
+ * read those files first to understand what's going on.
+ *
+ * When the chroma components are to be upsampled by simple replication
+ * (ie, box filtering), we can save some work in color conversion by
+ * calculating all the output pixels corresponding to a pair of chroma
+ * samples at one time.  In the conversion equations
+ *	R = Y           + K1 * Cr
+ *	G = Y + K2 * Cb + K3 * Cr
+ *	B = Y + K4 * Cb
+ * only the Y term varies among the group of pixels corresponding to a pair
+ * of chroma samples, so the rest of the terms can be calculated just once.
+ * At typical sampling ratios, this eliminates half or three-quarters of the
+ * multiplications needed for color conversion.
+ *
+ * This file currently provides implementations for the following cases:
+ *	YCbCr => RGB color conversion only.
+ *	Sampling ratios of 2h1v or 2h2v.
+ *	No scaling needed at upsample time.
+ *	Corner-aligned (non-CCIR601) sampling alignment.
+ * Other special cases could be added, but in most applications these are
+ * the only common cases.  (For uncommon cases we fall back on the more
+ * general code in jdsample.c and jdcolor.c.)
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+#ifdef UPSAMPLE_MERGING_SUPPORTED
+
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_upsampler pub;	/* public fields */
+
+  /* Pointer to routine to do actual upsampling/conversion of one row group */
+  JMETHOD(void, upmethod, (j_decompress_ptr cinfo,
+			   JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+			   JSAMPARRAY output_buf));
+
+  /* Private state for YCC->RGB conversion */
+  int * Cr_r_tab;		/* => table for Cr to R conversion */
+  int * Cb_b_tab;		/* => table for Cb to B conversion */
+  JPEG_INT32 * Cr_g_tab;		/* => table for Cr to G conversion */
+  JPEG_INT32 * Cb_g_tab;		/* => table for Cb to G conversion */
+
+  /* For 2:1 vertical sampling, we produce two output rows at a time.
+   * We need a "spare" row buffer to hold the second output row if the
+   * application provides just a one-row buffer; we also use the spare
+   * to discard the dummy last row if the image height is odd.
+   */
+  JSAMPROW spare_row;
+  wxjpeg_boolean spare_full;		/* T if spare buffer is occupied */
+
+  JDIMENSION out_row_width;	/* samples per output row */
+  JDIMENSION rows_to_go;	/* counts rows remaining in image */
+} my_upsampler;
+
+typedef my_upsampler * my_upsample_ptr;
+
+#define SCALEBITS	16	/* speediest right-shift on some machines */
+#define ONE_HALF	((JPEG_INT32) 1 << (SCALEBITS-1))
+#define FIX(x)		((JPEG_INT32) ((x) * (1L<<SCALEBITS) + 0.5))
+
+
+/*
+ * Initialize tables for YCC->RGB colorspace conversion.
+ * This is taken directly from jdcolor.c; see that file for more info.
+ */
+
+LOCAL(void)
+build_ycc_rgb_table (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  int i;
+  JPEG_INT32 x;
+  SHIFT_TEMPS
+
+  upsample->Cr_r_tab = (int *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(int));
+  upsample->Cb_b_tab = (int *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(int));
+  upsample->Cr_g_tab = (JPEG_INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
+  upsample->Cb_g_tab = (JPEG_INT32 *)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
+
+  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
+    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */
+    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */
+    /* Cr=>R value is nearest int to 1.40200 * x */
+    upsample->Cr_r_tab[i] = (int)
+		    RIGHT_SHIFT(FIX(1.40200) * x + ONE_HALF, SCALEBITS);
+    /* Cb=>B value is nearest int to 1.77200 * x */
+    upsample->Cb_b_tab[i] = (int)
+		    RIGHT_SHIFT(FIX(1.77200) * x + ONE_HALF, SCALEBITS);
+    /* Cr=>G value is scaled-up -0.71414 * x */
+    upsample->Cr_g_tab[i] = (- FIX(0.71414)) * x;
+    /* Cb=>G value is scaled-up -0.34414 * x */
+    /* We also add in ONE_HALF so that need not do it in inner loop */
+    upsample->Cb_g_tab[i] = (- FIX(0.34414)) * x + ONE_HALF;
+  }
+}
+
+
+/*
+ * Initialize for an upsampling pass.
+ */
+
+METHODDEF(void)
+start_pass_merged_upsample (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+
+  /* Mark the spare buffer empty */
+  upsample->spare_full = FALSE;
+  /* Initialize total-height counter for detecting bottom of image */
+  upsample->rows_to_go = cinfo->output_height;
+}
+
+
+/*
+ * Control routine to do upsampling (and color conversion).
+ *
+ * The control routine just handles the row buffering considerations.
+ */
+
+METHODDEF(void)
+merged_2v_upsample (j_decompress_ptr cinfo,
+		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		    JDIMENSION in_row_groups_avail,
+		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		    JDIMENSION out_rows_avail)
+/* 2:1 vertical sampling case: may need a spare row. */
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  JSAMPROW work_ptrs[2];
+  JDIMENSION num_rows;		/* number of rows returned to caller */
+
+  if (upsample->spare_full) {
+    /* If we have a spare row saved from a previous cycle, just return it. */
+    jcopy_sample_rows(& upsample->spare_row, 0, output_buf + *out_row_ctr, 0,
+		      1, upsample->out_row_width);
+    num_rows = 1;
+    upsample->spare_full = FALSE;
+  } else {
+    /* Figure number of rows to return to caller. */
+    num_rows = 2;
+    /* Not more than the distance to the end of the image. */
+    if (num_rows > upsample->rows_to_go)
+      num_rows = upsample->rows_to_go;
+    /* And not more than what the client can accept: */
+    out_rows_avail -= *out_row_ctr;
+    if (num_rows > out_rows_avail)
+      num_rows = out_rows_avail;
+    /* Create output pointer array for upsampler. */
+    work_ptrs[0] = output_buf[*out_row_ctr];
+    if (num_rows > 1) {
+      work_ptrs[1] = output_buf[*out_row_ctr + 1];
+    } else {
+      work_ptrs[1] = upsample->spare_row;
+      upsample->spare_full = TRUE;
+    }
+    /* Now do the upsampling. */
+    (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr, work_ptrs);
+  }
+
+  /* Adjust counts */
+  *out_row_ctr += num_rows;
+  upsample->rows_to_go -= num_rows;
+  /* When the buffer is emptied, declare this input row group consumed */
+  if (! upsample->spare_full)
+    (*in_row_group_ctr)++;
+}
+
+
+METHODDEF(void)
+merged_1v_upsample (j_decompress_ptr cinfo,
+		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		    JDIMENSION in_row_groups_avail,
+		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		    JDIMENSION out_rows_avail)
+/* 1:1 vertical sampling case: much easier, never need a spare row. */
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+
+  /* Just do the upsampling. */
+  (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr,
+			 output_buf + *out_row_ctr);
+  /* Adjust counts */
+  (*out_row_ctr)++;
+  (*in_row_group_ctr)++;
+}
+
+
+/*
+ * These are the routines invoked by the control routines to do
+ * the actual upsampling/conversion.  One row group is processed per call.
+ *
+ * Note: since we may be writing directly into application-supplied buffers,
+ * we have to be honest about the output width; we can't assume the buffer
+ * has been rounded up to an even width.
+ */
+
+
+/*
+ * Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
+ */
+
+METHODDEF(void)
+h2v1_merged_upsample (j_decompress_ptr cinfo,
+		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+		      JSAMPARRAY output_buf)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  register int y, cred, cgreen, cblue;
+  int cb, cr;
+  register JSAMPROW outptr;
+  JSAMPROW inptr0, inptr1, inptr2;
+  JDIMENSION col;
+  /* copy these pointers into registers if possible */
+  register JSAMPLE * range_limit = cinfo->sample_range_limit;
+  int * Crrtab = upsample->Cr_r_tab;
+  int * Cbbtab = upsample->Cb_b_tab;
+  JPEG_INT32 * Crgtab = upsample->Cr_g_tab;
+  JPEG_INT32 * Cbgtab = upsample->Cb_g_tab;
+  SHIFT_TEMPS
+
+  inptr0 = input_buf[0][in_row_group_ctr];
+  inptr1 = input_buf[1][in_row_group_ctr];
+  inptr2 = input_buf[2][in_row_group_ctr];
+  outptr = output_buf[0];
+  /* Loop for each pair of output pixels */
+  for (col = cinfo->output_width >> 1; col > 0; col--) {
+    /* Do the chroma part of the calculation */
+    cb = GETJSAMPLE(*inptr1++);
+    cr = GETJSAMPLE(*inptr2++);
+    cred = Crrtab[cr];
+    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
+    cblue = Cbbtab[cb];
+    /* Fetch 2 Y values and emit 2 pixels */
+    y  = GETJSAMPLE(*inptr0++);
+    outptr[RGB_RED] =   range_limit[y + cred];
+    outptr[RGB_GREEN] = range_limit[y + cgreen];
+    outptr[RGB_BLUE] =  range_limit[y + cblue];
+    outptr += RGB_PIXELSIZE;
+    y  = GETJSAMPLE(*inptr0++);
+    outptr[RGB_RED] =   range_limit[y + cred];
+    outptr[RGB_GREEN] = range_limit[y + cgreen];
+    outptr[RGB_BLUE] =  range_limit[y + cblue];
+    outptr += RGB_PIXELSIZE;
+  }
+  /* If image width is odd, do the last output column separately */
+  if (cinfo->output_width & 1) {
+    cb = GETJSAMPLE(*inptr1);
+    cr = GETJSAMPLE(*inptr2);
+    cred = Crrtab[cr];
+    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
+    cblue = Cbbtab[cb];
+    y  = GETJSAMPLE(*inptr0);
+    outptr[RGB_RED] =   range_limit[y + cred];
+    outptr[RGB_GREEN] = range_limit[y + cgreen];
+    outptr[RGB_BLUE] =  range_limit[y + cblue];
+  }
+}
+
+/*
+ * Upsample and color convert for the case of 2:1 horizontal and 2:1 vertical.
+ */
+
+METHODDEF(void)
+h2v2_merged_upsample (j_decompress_ptr cinfo,
+		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
+		      JSAMPARRAY output_buf)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  register int y, cred, cgreen, cblue;
+  int cb, cr;
+  register JSAMPROW outptr0, outptr1;
+  JSAMPROW inptr00, inptr01, inptr1, inptr2;
+  JDIMENSION col;
+  /* copy these pointers into registers if possible */
+  register JSAMPLE * range_limit = cinfo->sample_range_limit;
+  int * Crrtab = upsample->Cr_r_tab;
+  int * Cbbtab = upsample->Cb_b_tab;
+  JPEG_INT32 * Crgtab = upsample->Cr_g_tab;
+  JPEG_INT32 * Cbgtab = upsample->Cb_g_tab;
+  SHIFT_TEMPS
+
+  inptr00 = input_buf[0][in_row_group_ctr*2];
+  inptr01 = input_buf[0][in_row_group_ctr*2 + 1];
+  inptr1 = input_buf[1][in_row_group_ctr];
+  inptr2 = input_buf[2][in_row_group_ctr];
+  outptr0 = output_buf[0];
+  outptr1 = output_buf[1];
+  /* Loop for each group of output pixels */
+  for (col = cinfo->output_width >> 1; col > 0; col--) {
+    /* Do the chroma part of the calculation */
+    cb = GETJSAMPLE(*inptr1++);
+    cr = GETJSAMPLE(*inptr2++);
+    cred = Crrtab[cr];
+    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
+    cblue = Cbbtab[cb];
+    /* Fetch 4 Y values and emit 4 pixels */
+    y  = GETJSAMPLE(*inptr00++);
+    outptr0[RGB_RED] =   range_limit[y + cred];
+    outptr0[RGB_GREEN] = range_limit[y + cgreen];
+    outptr0[RGB_BLUE] =  range_limit[y + cblue];
+    outptr0 += RGB_PIXELSIZE;
+    y  = GETJSAMPLE(*inptr00++);
+    outptr0[RGB_RED] =   range_limit[y + cred];
+    outptr0[RGB_GREEN] = range_limit[y + cgreen];
+    outptr0[RGB_BLUE] =  range_limit[y + cblue];
+    outptr0 += RGB_PIXELSIZE;
+    y  = GETJSAMPLE(*inptr01++);
+    outptr1[RGB_RED] =   range_limit[y + cred];
+    outptr1[RGB_GREEN] = range_limit[y + cgreen];
+    outptr1[RGB_BLUE] =  range_limit[y + cblue];
+    outptr1 += RGB_PIXELSIZE;
+    y  = GETJSAMPLE(*inptr01++);
+    outptr1[RGB_RED] =   range_limit[y + cred];
+    outptr1[RGB_GREEN] = range_limit[y + cgreen];
+    outptr1[RGB_BLUE] =  range_limit[y + cblue];
+    outptr1 += RGB_PIXELSIZE;
+  }
+  /* If image width is odd, do the last output column separately */
+  if (cinfo->output_width & 1) {
+    cb = GETJSAMPLE(*inptr1);
+    cr = GETJSAMPLE(*inptr2);
+    cred = Crrtab[cr];
+    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
+    cblue = Cbbtab[cb];
+    y  = GETJSAMPLE(*inptr00);
+    outptr0[RGB_RED] =   range_limit[y + cred];
+    outptr0[RGB_GREEN] = range_limit[y + cgreen];
+    outptr0[RGB_BLUE] =  range_limit[y + cblue];
+    y  = GETJSAMPLE(*inptr01);
+    outptr1[RGB_RED] =   range_limit[y + cred];
+    outptr1[RGB_GREEN] = range_limit[y + cgreen];
+    outptr1[RGB_BLUE] =  range_limit[y + cblue];
+  }
+}
+
+
+/*
+ * Module initialization routine for merged upsampling/color conversion.
+ *
+ * NB: this is called under the conditions determined by use_merged_upsample()
+ * in jdmaster.c.  That routine MUST correspond to the actual capabilities
+ * of this module; no safety checks are made here.
+ */
+
+GLOBAL(void)
+jinit_merged_upsampler (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample;
+
+  upsample = (my_upsample_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_upsampler));
+  cinfo->upsample = (struct jpeg_upsampler *) upsample;
+  upsample->pub.start_pass = start_pass_merged_upsample;
+  upsample->pub.need_context_rows = FALSE;
+
+  upsample->out_row_width = cinfo->output_width * cinfo->out_color_components;
+
+  if (cinfo->max_v_samp_factor == 2) {
+    upsample->pub.upsample = merged_2v_upsample;
+    upsample->upmethod = h2v2_merged_upsample;
+    /* Allocate a spare row buffer */
+    upsample->spare_row = (JSAMPROW)
+      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+		(size_t) (upsample->out_row_width * SIZEOF(JSAMPLE)));
+  } else {
+    upsample->pub.upsample = merged_1v_upsample;
+    upsample->upmethod = h2v1_merged_upsample;
+    /* No spare row needed */
+    upsample->spare_row = NULL;
+  }
+
+  build_ycc_rgb_table(cinfo);
+}
+
+#endif /* UPSAMPLE_MERGING_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jdphuff.c b/Source/3rd Party/wx/src/jpeg/jdphuff.c
index ff5b5c27d..96b4364e4 100644
--- a/Source/3rd Party/wx/src/jpeg/jdphuff.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdphuff.c	
@@ -1,668 +1,668 @@
-/*
- * jdphuff.c
- *
- * Copyright (C) 1995-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains Huffman entropy decoding routines for progressive JPEG.
- *
- * Much of the complexity here has to do with supporting input suspension.
- * If the data source module demands suspension, we want to be able to back
- * up to the start of the current MCU.  To do this, we copy state variables
- * into local working storage, and update them back to the permanent
- * storage only upon successful completion of an MCU.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdhuff.h"		/* Declarations shared with jdhuff.c */
-
-
-#ifdef D_PROGRESSIVE_SUPPORTED
-
-/*
- * Expanded entropy decoder object for progressive Huffman decoding.
- *
- * The savable_state subrecord contains fields that change within an MCU,
- * but must not be updated permanently until we complete the MCU.
- */
-
-typedef struct {
-  unsigned int EOBRUN;			/* remaining EOBs in EOBRUN */
-  int last_dc_val[MAX_COMPS_IN_SCAN];	/* last DC coef for each component */
-} savable_state;
-
-/* This macro is to work around compilers with missing or broken
- * structure assignment.  You'll need to fix this code if you have
- * such a compiler and you change MAX_COMPS_IN_SCAN.
- */
-
-#ifndef NO_STRUCT_ASSIGN
-#define ASSIGN_STATE(dest,src)  ((dest) = (src))
-#else
-#if MAX_COMPS_IN_SCAN == 4
-#define ASSIGN_STATE(dest,src)  \
-	((dest).EOBRUN = (src).EOBRUN, \
-	 (dest).last_dc_val[0] = (src).last_dc_val[0], \
-	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
-	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
-	 (dest).last_dc_val[3] = (src).last_dc_val[3])
-#endif
-#endif
-
-
-typedef struct {
-  struct jpeg_entropy_decoder pub; /* public fields */
-
-  /* These fields are loaded into local variables at start of each MCU.
-   * In case of suspension, we exit WITHOUT updating them.
-   */
-  bitread_perm_state bitstate;	/* Bit buffer at start of MCU */
-  savable_state saved;		/* Other state at start of MCU */
-
-  /* These fields are NOT loaded into local working state. */
-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
-
-  /* Pointers to derived tables (these workspaces have image lifespan) */
-  d_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
-
-  d_derived_tbl * ac_derived_tbl; /* active table during an AC scan */
-} phuff_entropy_decoder;
-
-typedef phuff_entropy_decoder * phuff_entropy_ptr;
-
-/* Forward declarations */
-METHODDEF(wxjpeg_boolean) decode_mcu_DC_first JPP((j_decompress_ptr cinfo,
-					    JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) decode_mcu_AC_first JPP((j_decompress_ptr cinfo,
-					    JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) decode_mcu_DC_refine JPP((j_decompress_ptr cinfo,
-					     JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) decode_mcu_AC_refine JPP((j_decompress_ptr cinfo,
-					     JBLOCKROW *MCU_data));
-
-
-/*
- * Initialize for a Huffman-compressed scan.
- */
-
-METHODDEF(void)
-start_pass_phuff_decoder (j_decompress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  wxjpeg_boolean is_DC_band, bad;
-  int ci, coefi, tbl;
-  int *coef_bit_ptr;
-  jpeg_component_info * compptr;
-
-  is_DC_band = (cinfo->Ss == 0);
-
-  /* Validate scan parameters */
-  bad = FALSE;
-  if (is_DC_band) {
-    if (cinfo->Se != 0)
-      bad = TRUE;
-  } else {
-    /* need not check Ss/Se < 0 since they came from unsigned bytes */
-    if (cinfo->Ss > cinfo->Se || cinfo->Se >= DCTSIZE2)
-      bad = TRUE;
-    /* AC scans may have only one component */
-    if (cinfo->comps_in_scan != 1)
-      bad = TRUE;
-  }
-  if (cinfo->Ah != 0) {
-    /* Successive approximation refinement scan: must have Al = Ah-1. */
-    if (cinfo->Al != cinfo->Ah-1)
-      bad = TRUE;
-  }
-  if (cinfo->Al > 13)		/* need not check for < 0 */
-    bad = TRUE;
-  /* Arguably the maximum Al value should be less than 13 for 8-bit precision,
-   * but the spec doesn't say so, and we try to be liberal about what we
-   * accept.  Note: large Al values could result in out-of-range DC
-   * coefficients during early scans, leading to bizarre displays due to
-   * overflows in the IDCT math.  But we won't crash.
-   */
-  if (bad)
-    ERREXIT4(cinfo, JERR_BAD_PROGRESSION,
-	     cinfo->Ss, cinfo->Se, cinfo->Ah, cinfo->Al);
-  /* Update progression status, and verify that scan order is legal.
-   * Note that inter-scan inconsistencies are treated as warnings
-   * not fatal errors ... not clear if this is right way to behave.
-   */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    int cindex = cinfo->cur_comp_info[ci]->component_index;
-    coef_bit_ptr = & cinfo->coef_bits[cindex][0];
-    if (!is_DC_band && coef_bit_ptr[0] < 0) /* AC without prior DC scan */
-      WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, 0);
-    for (coefi = cinfo->Ss; coefi <= cinfo->Se; coefi++) {
-      int expected = (coef_bit_ptr[coefi] < 0) ? 0 : coef_bit_ptr[coefi];
-      if (cinfo->Ah != expected)
-	WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, coefi);
-      coef_bit_ptr[coefi] = cinfo->Al;
-    }
-  }
-
-  /* Select MCU decoding routine */
-  if (cinfo->Ah == 0) {
-    if (is_DC_band)
-      entropy->pub.decode_mcu = decode_mcu_DC_first;
-    else
-      entropy->pub.decode_mcu = decode_mcu_AC_first;
-  } else {
-    if (is_DC_band)
-      entropy->pub.decode_mcu = decode_mcu_DC_refine;
-    else
-      entropy->pub.decode_mcu = decode_mcu_AC_refine;
-  }
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    /* Make sure requested tables are present, and compute derived tables.
-     * We may build same derived table more than once, but it's not expensive.
-     */
-    if (is_DC_band) {
-      if (cinfo->Ah == 0) {	/* DC refinement needs no table */
-	tbl = compptr->dc_tbl_no;
-	jpeg_make_d_derived_tbl(cinfo, TRUE, tbl,
-				& entropy->derived_tbls[tbl]);
-      }
-    } else {
-      tbl = compptr->ac_tbl_no;
-      jpeg_make_d_derived_tbl(cinfo, FALSE, tbl,
-			      & entropy->derived_tbls[tbl]);
-      /* remember the single active table */
-      entropy->ac_derived_tbl = entropy->derived_tbls[tbl];
-    }
-    /* Initialize DC predictions to 0 */
-    entropy->saved.last_dc_val[ci] = 0;
-  }
-
-  /* Initialize bitread state variables */
-  entropy->bitstate.bits_left = 0;
-  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
-  entropy->pub.insufficient_data = FALSE;
-
-  /* Initialize private state variables */
-  entropy->saved.EOBRUN = 0;
-
-  /* Initialize restart counter */
-  entropy->restarts_to_go = cinfo->restart_interval;
-}
-
-
-/*
- * Figure F.12: extend sign bit.
- * On some machines, a shift and add will be faster than a table lookup.
- */
-
-#ifdef AVOID_TABLES
-
-#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
-
-#else
-
-#define HUFF_EXTEND(x,s)  ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
-
-static const int extend_test[16] =   /* entry n is 2**(n-1) */
-  { 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
-    0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
-
-static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
-  { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
-    ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
-    ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
-    ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
-
-#endif /* AVOID_TABLES */
-
-
-/*
- * Check for a restart marker & resynchronize decoder.
- * Returns FALSE if must suspend.
- */
-
-LOCAL(wxjpeg_boolean)
-process_restart (j_decompress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int ci;
-
-  /* Throw away any unused bits remaining in bit buffer; */
-  /* include any full bytes in next_marker's count of discarded bytes */
-  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
-  entropy->bitstate.bits_left = 0;
-
-  /* Advance past the RSTn marker */
-  if (! (*cinfo->marker->read_restart_marker) (cinfo))
-    return FALSE;
-
-  /* Re-initialize DC predictions to 0 */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++)
-    entropy->saved.last_dc_val[ci] = 0;
-  /* Re-init EOB run count, too */
-  entropy->saved.EOBRUN = 0;
-
-  /* Reset restart counter */
-  entropy->restarts_to_go = cinfo->restart_interval;
-
-  /* Reset out-of-data flag, unless read_restart_marker left us smack up
-   * against a marker.  In that case we will end up treating the next data
-   * segment as empty, and we can avoid producing bogus output pixels by
-   * leaving the flag set.
-   */
-  if (cinfo->unread_marker == 0)
-    entropy->pub.insufficient_data = FALSE;
-
-  return TRUE;
-}
-
-
-/*
- * Huffman MCU decoding.
- * Each of these routines decodes and returns one MCU's worth of
- * Huffman-compressed coefficients. 
- * The coefficients are reordered from zigzag order into natural array order,
- * but are not dequantized.
- *
- * The i'th block of the MCU is stored into the block pointed to by
- * MCU_data[i].  WE ASSUME THIS AREA IS INITIALLY ZEROED BY THE CALLER.
- *
- * We return FALSE if data source requested suspension.  In that case no
- * changes have been made to permanent state.  (Exception: some output
- * coefficients may already have been assigned.  This is harmless for
- * spectral selection, since we'll just re-assign them on the next call.
- * Successive approximation AC refinement has to be more careful, however.)
- */
-
-/*
- * MCU decoding for DC initial scan (either spectral selection,
- * or first pass of successive approximation).
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int Al = cinfo->Al;
-  register int s, r;
-  int blkn, ci;
-  JBLOCKROW block;
-  BITREAD_STATE_VARS;
-  savable_state state;
-  d_derived_tbl * tbl;
-  jpeg_component_info * compptr;
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* If we've run out of data, just leave the MCU set to zeroes.
-   * This way, we return uniform gray for the remainder of the segment.
-   */
-  if (! entropy->pub.insufficient_data) {
-
-    /* Load up working state */
-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-    ASSIGN_STATE(state, entropy->saved);
-
-    /* Outer loop handles each block in the MCU */
-
-    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-      block = MCU_data[blkn];
-      ci = cinfo->MCU_membership[blkn];
-      compptr = cinfo->cur_comp_info[ci];
-      tbl = entropy->derived_tbls[compptr->dc_tbl_no];
-
-      /* Decode a single block's worth of coefficients */
-
-      /* Section F.2.2.1: decode the DC coefficient difference */
-      HUFF_DECODE(s, br_state, tbl, return FALSE, label1);
-      if (s) {
-	CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	r = GET_BITS(s);
-	s = HUFF_EXTEND(r, s);
-      }
-
-      /* Convert DC difference to actual value, update last_dc_val */
-      s += state.last_dc_val[ci];
-      state.last_dc_val[ci] = s;
-      /* Scale and output the coefficient (assumes jpeg_natural_order[0]=0) */
-      (*block)[0] = (JCOEF) (s << Al);
-    }
-
-    /* Completed MCU, so update state */
-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-    ASSIGN_STATE(entropy->saved, state);
-  }
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-}
-
-
-/*
- * MCU decoding for AC initial scan (either spectral selection,
- * or first pass of successive approximation).
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int Se = cinfo->Se;
-  int Al = cinfo->Al;
-  register int s, k, r;
-  unsigned int EOBRUN;
-  JBLOCKROW block;
-  BITREAD_STATE_VARS;
-  d_derived_tbl * tbl;
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* If we've run out of data, just leave the MCU set to zeroes.
-   * This way, we return uniform gray for the remainder of the segment.
-   */
-  if (! entropy->pub.insufficient_data) {
-
-    /* Load up working state.
-     * We can avoid loading/saving bitread state if in an EOB run.
-     */
-    EOBRUN = entropy->saved.EOBRUN;	/* only part of saved state we need */
-
-    /* There is always only one block per MCU */
-
-    if (EOBRUN > 0)		/* if it's a band of zeroes... */
-      EOBRUN--;			/* ...process it now (we do nothing) */
-    else {
-      BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-      block = MCU_data[0];
-      tbl = entropy->ac_derived_tbl;
-
-      for (k = cinfo->Ss; k <= Se; k++) {
-	HUFF_DECODE(s, br_state, tbl, return FALSE, label2);
-	r = s >> 4;
-	s &= 15;
-	if (s) {
-	  k += r;
-	  CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	  r = GET_BITS(s);
-	  s = HUFF_EXTEND(r, s);
-	  /* Scale and output coefficient in natural (dezigzagged) order */
-	  (*block)[jpeg_natural_order[k]] = (JCOEF) (s << Al);
-	} else {
-	  if (r == 15) {	/* ZRL */
-	    k += 15;		/* skip 15 zeroes in band */
-	  } else {		/* EOBr, run length is 2^r + appended bits */
-	    EOBRUN = 1 << r;
-	    if (r) {		/* EOBr, r > 0 */
-	      CHECK_BIT_BUFFER(br_state, r, return FALSE);
-	      r = GET_BITS(r);
-	      EOBRUN += r;
-	    }
-	    EOBRUN--;		/* this band is processed at this moment */
-	    break;		/* force end-of-band */
-	  }
-	}
-      }
-
-      BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-    }
-
-    /* Completed MCU, so update state */
-    entropy->saved.EOBRUN = EOBRUN;	/* only part of saved state we need */
-  }
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-}
-
-
-/*
- * MCU decoding for DC successive approximation refinement scan.
- * Note: we assume such scans can be multi-component, although the spec
- * is not very clear on the point.
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
-  int blkn;
-  JBLOCKROW block;
-  BITREAD_STATE_VARS;
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* Not worth the cycles to check insufficient_data here,
-   * since we will not change the data anyway if we read zeroes.
-   */
-
-  /* Load up working state */
-  BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-
-  /* Outer loop handles each block in the MCU */
-
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    block = MCU_data[blkn];
-
-    /* Encoded data is simply the next bit of the two's-complement DC value */
-    CHECK_BIT_BUFFER(br_state, 1, return FALSE);
-    if (GET_BITS(1))
-      (*block)[0] |= p1;
-    /* Note: since we use |=, repeating the assignment later is safe */
-  }
-
-  /* Completed MCU, so update state */
-  BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-}
-
-
-/*
- * MCU decoding for AC successive approximation refinement scan.
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int Se = cinfo->Se;
-  int p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
-  int m1 = (-1) << cinfo->Al;	/* -1 in the bit position being coded */
-  register int s, k, r;
-  unsigned int EOBRUN;
-  JBLOCKROW block;
-  JCOEFPTR thiscoef;
-  BITREAD_STATE_VARS;
-  d_derived_tbl * tbl;
-  int num_newnz;
-  int newnz_pos[DCTSIZE2];
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* If we've run out of data, don't modify the MCU.
-   */
-  if (! entropy->pub.insufficient_data) {
-
-    /* Load up working state */
-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-    EOBRUN = entropy->saved.EOBRUN; /* only part of saved state we need */
-
-    /* There is always only one block per MCU */
-    block = MCU_data[0];
-    tbl = entropy->ac_derived_tbl;
-
-    /* If we are forced to suspend, we must undo the assignments to any newly
-     * nonzero coefficients in the block, because otherwise we'd get confused
-     * next time about which coefficients were already nonzero.
-     * But we need not undo addition of bits to already-nonzero coefficients;
-     * instead, we can test the current bit to see if we already did it.
-     */
-    num_newnz = 0;
-
-    /* initialize coefficient loop counter to start of band */
-    k = cinfo->Ss;
-
-    if (EOBRUN == 0) {
-      for (; k <= Se; k++) {
-	HUFF_DECODE(s, br_state, tbl, goto undoit, label3);
-	r = s >> 4;
-	s &= 15;
-	if (s) {
-	  if (s != 1)		/* size of new coef should always be 1 */
-	    WARNMS(cinfo, JWRN_HUFF_BAD_CODE);
-	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);
-	  if (GET_BITS(1))
-	    s = p1;		/* newly nonzero coef is positive */
-	  else
-	    s = m1;		/* newly nonzero coef is negative */
-	} else {
-	  if (r != 15) {
-	    EOBRUN = 1 << r;	/* EOBr, run length is 2^r + appended bits */
-	    if (r) {
-	      CHECK_BIT_BUFFER(br_state, r, goto undoit);
-	      r = GET_BITS(r);
-	      EOBRUN += r;
-	    }
-	    break;		/* rest of block is handled by EOB logic */
-	  }
-	  /* note s = 0 for processing ZRL */
-	}
-	/* Advance over already-nonzero coefs and r still-zero coefs,
-	 * appending correction bits to the nonzeroes.  A correction bit is 1
-	 * if the absolute value of the coefficient must be increased.
-	 */
-	do {
-	  thiscoef = *block + jpeg_natural_order[k];
-	  if (*thiscoef != 0) {
-	    CHECK_BIT_BUFFER(br_state, 1, goto undoit);
-	    if (GET_BITS(1)) {
-	      if ((*thiscoef & p1) == 0) { /* do nothing if already set it */
-		if (*thiscoef >= 0)
-		  *thiscoef += p1;
-		else
-		  *thiscoef += m1;
-	      }
-	    }
-	  } else {
-	    if (--r < 0)
-	      break;		/* reached target zero coefficient */
-	  }
-	  k++;
-	} while (k <= Se);
-	if (s) {
-	  int pos = jpeg_natural_order[k];
-	  /* Output newly nonzero coefficient */
-	  (*block)[pos] = (JCOEF) s;
-	  /* Remember its position in case we have to suspend */
-	  newnz_pos[num_newnz++] = pos;
-	}
-      }
-    }
-
-    if (EOBRUN > 0) {
-      /* Scan any remaining coefficient positions after the end-of-band
-       * (the last newly nonzero coefficient, if any).  Append a correction
-       * bit to each already-nonzero coefficient.  A correction bit is 1
-       * if the absolute value of the coefficient must be increased.
-       */
-      for (; k <= Se; k++) {
-	thiscoef = *block + jpeg_natural_order[k];
-	if (*thiscoef != 0) {
-	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);
-	  if (GET_BITS(1)) {
-	    if ((*thiscoef & p1) == 0) { /* do nothing if already changed it */
-	      if (*thiscoef >= 0)
-		*thiscoef += p1;
-	      else
-		*thiscoef += m1;
-	    }
-	  }
-	}
-      }
-      /* Count one block completed in EOB run */
-      EOBRUN--;
-    }
-
-    /* Completed MCU, so update state */
-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-    entropy->saved.EOBRUN = EOBRUN; /* only part of saved state we need */
-  }
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-
-undoit:
-  /* Re-zero any output coefficients that we made newly nonzero */
-  while (num_newnz > 0)
-    (*block)[newnz_pos[--num_newnz]] = 0;
-
-  return FALSE;
-}
-
-
-/*
- * Module initialization routine for progressive Huffman entropy decoding.
- */
-
-GLOBAL(void)
-jinit_phuff_decoder (j_decompress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy;
-  int *coef_bit_ptr;
-  int ci, i;
-
-  entropy = (phuff_entropy_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(phuff_entropy_decoder));
-  cinfo->entropy = (struct jpeg_entropy_decoder *) entropy;
-  entropy->pub.start_pass = start_pass_phuff_decoder;
-
-  /* Mark derived tables unallocated */
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    entropy->derived_tbls[i] = NULL;
-  }
-
-  /* Create progression status table */
-  cinfo->coef_bits = (int (*)[DCTSIZE2])
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				cinfo->num_components*DCTSIZE2*SIZEOF(int));
-  coef_bit_ptr = & cinfo->coef_bits[0][0];
-  for (ci = 0; ci < cinfo->num_components; ci++) 
-    for (i = 0; i < DCTSIZE2; i++)
-      *coef_bit_ptr++ = -1;
-}
-
-#endif /* D_PROGRESSIVE_SUPPORTED */
+/*
+ * jdphuff.c
+ *
+ * Copyright (C) 1995-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains Huffman entropy decoding routines for progressive JPEG.
+ *
+ * Much of the complexity here has to do with supporting input suspension.
+ * If the data source module demands suspension, we want to be able to back
+ * up to the start of the current MCU.  To do this, we copy state variables
+ * into local working storage, and update them back to the permanent
+ * storage only upon successful completion of an MCU.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdhuff.h"		/* Declarations shared with jdhuff.c */
+
+
+#ifdef D_PROGRESSIVE_SUPPORTED
+
+/*
+ * Expanded entropy decoder object for progressive Huffman decoding.
+ *
+ * The savable_state subrecord contains fields that change within an MCU,
+ * but must not be updated permanently until we complete the MCU.
+ */
+
+typedef struct {
+  unsigned int EOBRUN;			/* remaining EOBs in EOBRUN */
+  int last_dc_val[MAX_COMPS_IN_SCAN];	/* last DC coef for each component */
+} savable_state;
+
+/* This macro is to work around compilers with missing or broken
+ * structure assignment.  You'll need to fix this code if you have
+ * such a compiler and you change MAX_COMPS_IN_SCAN.
+ */
+
+#ifndef NO_STRUCT_ASSIGN
+#define ASSIGN_STATE(dest,src)  ((dest) = (src))
+#else
+#if MAX_COMPS_IN_SCAN == 4
+#define ASSIGN_STATE(dest,src)  \
+	((dest).EOBRUN = (src).EOBRUN, \
+	 (dest).last_dc_val[0] = (src).last_dc_val[0], \
+	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
+	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
+	 (dest).last_dc_val[3] = (src).last_dc_val[3])
+#endif
+#endif
+
+
+typedef struct {
+  struct jpeg_entropy_decoder pub; /* public fields */
+
+  /* These fields are loaded into local variables at start of each MCU.
+   * In case of suspension, we exit WITHOUT updating them.
+   */
+  bitread_perm_state bitstate;	/* Bit buffer at start of MCU */
+  savable_state saved;		/* Other state at start of MCU */
+
+  /* These fields are NOT loaded into local working state. */
+  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
+
+  /* Pointers to derived tables (these workspaces have image lifespan) */
+  d_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
+
+  d_derived_tbl * ac_derived_tbl; /* active table during an AC scan */
+} phuff_entropy_decoder;
+
+typedef phuff_entropy_decoder * phuff_entropy_ptr;
+
+/* Forward declarations */
+METHODDEF(wxjpeg_boolean) decode_mcu_DC_first JPP((j_decompress_ptr cinfo,
+					    JBLOCKROW *MCU_data));
+METHODDEF(wxjpeg_boolean) decode_mcu_AC_first JPP((j_decompress_ptr cinfo,
+					    JBLOCKROW *MCU_data));
+METHODDEF(wxjpeg_boolean) decode_mcu_DC_refine JPP((j_decompress_ptr cinfo,
+					     JBLOCKROW *MCU_data));
+METHODDEF(wxjpeg_boolean) decode_mcu_AC_refine JPP((j_decompress_ptr cinfo,
+					     JBLOCKROW *MCU_data));
+
+
+/*
+ * Initialize for a Huffman-compressed scan.
+ */
+
+METHODDEF(void)
+start_pass_phuff_decoder (j_decompress_ptr cinfo)
+{
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  wxjpeg_boolean is_DC_band, bad;
+  int ci, coefi, tbl;
+  int *coef_bit_ptr;
+  jpeg_component_info * compptr;
+
+  is_DC_band = (cinfo->Ss == 0);
+
+  /* Validate scan parameters */
+  bad = FALSE;
+  if (is_DC_band) {
+    if (cinfo->Se != 0)
+      bad = TRUE;
+  } else {
+    /* need not check Ss/Se < 0 since they came from unsigned bytes */
+    if (cinfo->Ss > cinfo->Se || cinfo->Se >= DCTSIZE2)
+      bad = TRUE;
+    /* AC scans may have only one component */
+    if (cinfo->comps_in_scan != 1)
+      bad = TRUE;
+  }
+  if (cinfo->Ah != 0) {
+    /* Successive approximation refinement scan: must have Al = Ah-1. */
+    if (cinfo->Al != cinfo->Ah-1)
+      bad = TRUE;
+  }
+  if (cinfo->Al > 13)		/* need not check for < 0 */
+    bad = TRUE;
+  /* Arguably the maximum Al value should be less than 13 for 8-bit precision,
+   * but the spec doesn't say so, and we try to be liberal about what we
+   * accept.  Note: large Al values could result in out-of-range DC
+   * coefficients during early scans, leading to bizarre displays due to
+   * overflows in the IDCT math.  But we won't crash.
+   */
+  if (bad)
+    ERREXIT4(cinfo, JERR_BAD_PROGRESSION,
+	     cinfo->Ss, cinfo->Se, cinfo->Ah, cinfo->Al);
+  /* Update progression status, and verify that scan order is legal.
+   * Note that inter-scan inconsistencies are treated as warnings
+   * not fatal errors ... not clear if this is right way to behave.
+   */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    int cindex = cinfo->cur_comp_info[ci]->component_index;
+    coef_bit_ptr = & cinfo->coef_bits[cindex][0];
+    if (!is_DC_band && coef_bit_ptr[0] < 0) /* AC without prior DC scan */
+      WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, 0);
+    for (coefi = cinfo->Ss; coefi <= cinfo->Se; coefi++) {
+      int expected = (coef_bit_ptr[coefi] < 0) ? 0 : coef_bit_ptr[coefi];
+      if (cinfo->Ah != expected)
+	WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, coefi);
+      coef_bit_ptr[coefi] = cinfo->Al;
+    }
+  }
+
+  /* Select MCU decoding routine */
+  if (cinfo->Ah == 0) {
+    if (is_DC_band)
+      entropy->pub.decode_mcu = decode_mcu_DC_first;
+    else
+      entropy->pub.decode_mcu = decode_mcu_AC_first;
+  } else {
+    if (is_DC_band)
+      entropy->pub.decode_mcu = decode_mcu_DC_refine;
+    else
+      entropy->pub.decode_mcu = decode_mcu_AC_refine;
+  }
+
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
+    compptr = cinfo->cur_comp_info[ci];
+    /* Make sure requested tables are present, and compute derived tables.
+     * We may build same derived table more than once, but it's not expensive.
+     */
+    if (is_DC_band) {
+      if (cinfo->Ah == 0) {	/* DC refinement needs no table */
+	tbl = compptr->dc_tbl_no;
+	jpeg_make_d_derived_tbl(cinfo, TRUE, tbl,
+				& entropy->derived_tbls[tbl]);
+      }
+    } else {
+      tbl = compptr->ac_tbl_no;
+      jpeg_make_d_derived_tbl(cinfo, FALSE, tbl,
+			      & entropy->derived_tbls[tbl]);
+      /* remember the single active table */
+      entropy->ac_derived_tbl = entropy->derived_tbls[tbl];
+    }
+    /* Initialize DC predictions to 0 */
+    entropy->saved.last_dc_val[ci] = 0;
+  }
+
+  /* Initialize bitread state variables */
+  entropy->bitstate.bits_left = 0;
+  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
+  entropy->pub.insufficient_data = FALSE;
+
+  /* Initialize private state variables */
+  entropy->saved.EOBRUN = 0;
+
+  /* Initialize restart counter */
+  entropy->restarts_to_go = cinfo->restart_interval;
+}
+
+
+/*
+ * Figure F.12: extend sign bit.
+ * On some machines, a shift and add will be faster than a table lookup.
+ */
+
+#ifdef AVOID_TABLES
+
+#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
+
+#else
+
+#define HUFF_EXTEND(x,s)  ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
+
+static const int extend_test[16] =   /* entry n is 2**(n-1) */
+  { 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
+    0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
+
+static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
+  { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
+    ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
+    ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
+    ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
+
+#endif /* AVOID_TABLES */
+
+
+/*
+ * Check for a restart marker & resynchronize decoder.
+ * Returns FALSE if must suspend.
+ */
+
+LOCAL(wxjpeg_boolean)
+process_restart (j_decompress_ptr cinfo)
+{
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  int ci;
+
+  /* Throw away any unused bits remaining in bit buffer; */
+  /* include any full bytes in next_marker's count of discarded bytes */
+  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
+  entropy->bitstate.bits_left = 0;
+
+  /* Advance past the RSTn marker */
+  if (! (*cinfo->marker->read_restart_marker) (cinfo))
+    return FALSE;
+
+  /* Re-initialize DC predictions to 0 */
+  for (ci = 0; ci < cinfo->comps_in_scan; ci++)
+    entropy->saved.last_dc_val[ci] = 0;
+  /* Re-init EOB run count, too */
+  entropy->saved.EOBRUN = 0;
+
+  /* Reset restart counter */
+  entropy->restarts_to_go = cinfo->restart_interval;
+
+  /* Reset out-of-data flag, unless read_restart_marker left us smack up
+   * against a marker.  In that case we will end up treating the next data
+   * segment as empty, and we can avoid producing bogus output pixels by
+   * leaving the flag set.
+   */
+  if (cinfo->unread_marker == 0)
+    entropy->pub.insufficient_data = FALSE;
+
+  return TRUE;
+}
+
+
+/*
+ * Huffman MCU decoding.
+ * Each of these routines decodes and returns one MCU's worth of
+ * Huffman-compressed coefficients. 
+ * The coefficients are reordered from zigzag order into natural array order,
+ * but are not dequantized.
+ *
+ * The i'th block of the MCU is stored into the block pointed to by
+ * MCU_data[i].  WE ASSUME THIS AREA IS INITIALLY ZEROED BY THE CALLER.
+ *
+ * We return FALSE if data source requested suspension.  In that case no
+ * changes have been made to permanent state.  (Exception: some output
+ * coefficients may already have been assigned.  This is harmless for
+ * spectral selection, since we'll just re-assign them on the next call.
+ * Successive approximation AC refinement has to be more careful, however.)
+ */
+
+/*
+ * MCU decoding for DC initial scan (either spectral selection,
+ * or first pass of successive approximation).
+ */
+
+METHODDEF(wxjpeg_boolean)
+decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{   
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  int Al = cinfo->Al;
+  register int s, r;
+  int blkn, ci;
+  JBLOCKROW block;
+  BITREAD_STATE_VARS;
+  savable_state state;
+  d_derived_tbl * tbl;
+  jpeg_component_info * compptr;
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* If we've run out of data, just leave the MCU set to zeroes.
+   * This way, we return uniform gray for the remainder of the segment.
+   */
+  if (! entropy->pub.insufficient_data) {
+
+    /* Load up working state */
+    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+    ASSIGN_STATE(state, entropy->saved);
+
+    /* Outer loop handles each block in the MCU */
+
+    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
+      block = MCU_data[blkn];
+      ci = cinfo->MCU_membership[blkn];
+      compptr = cinfo->cur_comp_info[ci];
+      tbl = entropy->derived_tbls[compptr->dc_tbl_no];
+
+      /* Decode a single block's worth of coefficients */
+
+      /* Section F.2.2.1: decode the DC coefficient difference */
+      HUFF_DECODE(s, br_state, tbl, return FALSE, label1);
+      if (s) {
+	CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	r = GET_BITS(s);
+	s = HUFF_EXTEND(r, s);
+      }
+
+      /* Convert DC difference to actual value, update last_dc_val */
+      s += state.last_dc_val[ci];
+      state.last_dc_val[ci] = s;
+      /* Scale and output the coefficient (assumes jpeg_natural_order[0]=0) */
+      (*block)[0] = (JCOEF) (s << Al);
+    }
+
+    /* Completed MCU, so update state */
+    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+    ASSIGN_STATE(entropy->saved, state);
+  }
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+}
+
+
+/*
+ * MCU decoding for AC initial scan (either spectral selection,
+ * or first pass of successive approximation).
+ */
+
+METHODDEF(wxjpeg_boolean)
+decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{   
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  int Se = cinfo->Se;
+  int Al = cinfo->Al;
+  register int s, k, r;
+  unsigned int EOBRUN;
+  JBLOCKROW block;
+  BITREAD_STATE_VARS;
+  d_derived_tbl * tbl;
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* If we've run out of data, just leave the MCU set to zeroes.
+   * This way, we return uniform gray for the remainder of the segment.
+   */
+  if (! entropy->pub.insufficient_data) {
+
+    /* Load up working state.
+     * We can avoid loading/saving bitread state if in an EOB run.
+     */
+    EOBRUN = entropy->saved.EOBRUN;	/* only part of saved state we need */
+
+    /* There is always only one block per MCU */
+
+    if (EOBRUN > 0)		/* if it's a band of zeroes... */
+      EOBRUN--;			/* ...process it now (we do nothing) */
+    else {
+      BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+      block = MCU_data[0];
+      tbl = entropy->ac_derived_tbl;
+
+      for (k = cinfo->Ss; k <= Se; k++) {
+	HUFF_DECODE(s, br_state, tbl, return FALSE, label2);
+	r = s >> 4;
+	s &= 15;
+	if (s) {
+	  k += r;
+	  CHECK_BIT_BUFFER(br_state, s, return FALSE);
+	  r = GET_BITS(s);
+	  s = HUFF_EXTEND(r, s);
+	  /* Scale and output coefficient in natural (dezigzagged) order */
+	  (*block)[jpeg_natural_order[k]] = (JCOEF) (s << Al);
+	} else {
+	  if (r == 15) {	/* ZRL */
+	    k += 15;		/* skip 15 zeroes in band */
+	  } else {		/* EOBr, run length is 2^r + appended bits */
+	    EOBRUN = 1 << r;
+	    if (r) {		/* EOBr, r > 0 */
+	      CHECK_BIT_BUFFER(br_state, r, return FALSE);
+	      r = GET_BITS(r);
+	      EOBRUN += r;
+	    }
+	    EOBRUN--;		/* this band is processed at this moment */
+	    break;		/* force end-of-band */
+	  }
+	}
+      }
+
+      BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+    }
+
+    /* Completed MCU, so update state */
+    entropy->saved.EOBRUN = EOBRUN;	/* only part of saved state we need */
+  }
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+}
+
+
+/*
+ * MCU decoding for DC successive approximation refinement scan.
+ * Note: we assume such scans can be multi-component, although the spec
+ * is not very clear on the point.
+ */
+
+METHODDEF(wxjpeg_boolean)
+decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{   
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  int p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
+  int blkn;
+  JBLOCKROW block;
+  BITREAD_STATE_VARS;
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* Not worth the cycles to check insufficient_data here,
+   * since we will not change the data anyway if we read zeroes.
+   */
+
+  /* Load up working state */
+  BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+
+  /* Outer loop handles each block in the MCU */
+
+  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
+    block = MCU_data[blkn];
+
+    /* Encoded data is simply the next bit of the two's-complement DC value */
+    CHECK_BIT_BUFFER(br_state, 1, return FALSE);
+    if (GET_BITS(1))
+      (*block)[0] |= p1;
+    /* Note: since we use |=, repeating the assignment later is safe */
+  }
+
+  /* Completed MCU, so update state */
+  BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+}
+
+
+/*
+ * MCU decoding for AC successive approximation refinement scan.
+ */
+
+METHODDEF(wxjpeg_boolean)
+decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
+{   
+  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+  int Se = cinfo->Se;
+  int p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
+  int m1 = (-1) << cinfo->Al;	/* -1 in the bit position being coded */
+  register int s, k, r;
+  unsigned int EOBRUN;
+  JBLOCKROW block;
+  JCOEFPTR thiscoef;
+  BITREAD_STATE_VARS;
+  d_derived_tbl * tbl;
+  int num_newnz;
+  int newnz_pos[DCTSIZE2];
+
+  /* Process restart marker if needed; may have to suspend */
+  if (cinfo->restart_interval) {
+    if (entropy->restarts_to_go == 0)
+      if (! process_restart(cinfo))
+	return FALSE;
+  }
+
+  /* If we've run out of data, don't modify the MCU.
+   */
+  if (! entropy->pub.insufficient_data) {
+
+    /* Load up working state */
+    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
+    EOBRUN = entropy->saved.EOBRUN; /* only part of saved state we need */
+
+    /* There is always only one block per MCU */
+    block = MCU_data[0];
+    tbl = entropy->ac_derived_tbl;
+
+    /* If we are forced to suspend, we must undo the assignments to any newly
+     * nonzero coefficients in the block, because otherwise we'd get confused
+     * next time about which coefficients were already nonzero.
+     * But we need not undo addition of bits to already-nonzero coefficients;
+     * instead, we can test the current bit to see if we already did it.
+     */
+    num_newnz = 0;
+
+    /* initialize coefficient loop counter to start of band */
+    k = cinfo->Ss;
+
+    if (EOBRUN == 0) {
+      for (; k <= Se; k++) {
+	HUFF_DECODE(s, br_state, tbl, goto undoit, label3);
+	r = s >> 4;
+	s &= 15;
+	if (s) {
+	  if (s != 1)		/* size of new coef should always be 1 */
+	    WARNMS(cinfo, JWRN_HUFF_BAD_CODE);
+	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);
+	  if (GET_BITS(1))
+	    s = p1;		/* newly nonzero coef is positive */
+	  else
+	    s = m1;		/* newly nonzero coef is negative */
+	} else {
+	  if (r != 15) {
+	    EOBRUN = 1 << r;	/* EOBr, run length is 2^r + appended bits */
+	    if (r) {
+	      CHECK_BIT_BUFFER(br_state, r, goto undoit);
+	      r = GET_BITS(r);
+	      EOBRUN += r;
+	    }
+	    break;		/* rest of block is handled by EOB logic */
+	  }
+	  /* note s = 0 for processing ZRL */
+	}
+	/* Advance over already-nonzero coefs and r still-zero coefs,
+	 * appending correction bits to the nonzeroes.  A correction bit is 1
+	 * if the absolute value of the coefficient must be increased.
+	 */
+	do {
+	  thiscoef = *block + jpeg_natural_order[k];
+	  if (*thiscoef != 0) {
+	    CHECK_BIT_BUFFER(br_state, 1, goto undoit);
+	    if (GET_BITS(1)) {
+	      if ((*thiscoef & p1) == 0) { /* do nothing if already set it */
+		if (*thiscoef >= 0)
+		  *thiscoef += p1;
+		else
+		  *thiscoef += m1;
+	      }
+	    }
+	  } else {
+	    if (--r < 0)
+	      break;		/* reached target zero coefficient */
+	  }
+	  k++;
+	} while (k <= Se);
+	if (s) {
+	  int pos = jpeg_natural_order[k];
+	  /* Output newly nonzero coefficient */
+	  (*block)[pos] = (JCOEF) s;
+	  /* Remember its position in case we have to suspend */
+	  newnz_pos[num_newnz++] = pos;
+	}
+      }
+    }
+
+    if (EOBRUN > 0) {
+      /* Scan any remaining coefficient positions after the end-of-band
+       * (the last newly nonzero coefficient, if any).  Append a correction
+       * bit to each already-nonzero coefficient.  A correction bit is 1
+       * if the absolute value of the coefficient must be increased.
+       */
+      for (; k <= Se; k++) {
+	thiscoef = *block + jpeg_natural_order[k];
+	if (*thiscoef != 0) {
+	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);
+	  if (GET_BITS(1)) {
+	    if ((*thiscoef & p1) == 0) { /* do nothing if already changed it */
+	      if (*thiscoef >= 0)
+		*thiscoef += p1;
+	      else
+		*thiscoef += m1;
+	    }
+	  }
+	}
+      }
+      /* Count one block completed in EOB run */
+      EOBRUN--;
+    }
+
+    /* Completed MCU, so update state */
+    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
+    entropy->saved.EOBRUN = EOBRUN; /* only part of saved state we need */
+  }
+
+  /* Account for restart interval (no-op if not using restarts) */
+  entropy->restarts_to_go--;
+
+  return TRUE;
+
+undoit:
+  /* Re-zero any output coefficients that we made newly nonzero */
+  while (num_newnz > 0)
+    (*block)[newnz_pos[--num_newnz]] = 0;
+
+  return FALSE;
+}
+
+
+/*
+ * Module initialization routine for progressive Huffman entropy decoding.
+ */
+
+GLOBAL(void)
+jinit_phuff_decoder (j_decompress_ptr cinfo)
+{
+  phuff_entropy_ptr entropy;
+  int *coef_bit_ptr;
+  int ci, i;
+
+  entropy = (phuff_entropy_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(phuff_entropy_decoder));
+  cinfo->entropy = (struct jpeg_entropy_decoder *) entropy;
+  entropy->pub.start_pass = start_pass_phuff_decoder;
+
+  /* Mark derived tables unallocated */
+  for (i = 0; i < NUM_HUFF_TBLS; i++) {
+    entropy->derived_tbls[i] = NULL;
+  }
+
+  /* Create progression status table */
+  cinfo->coef_bits = (int (*)[DCTSIZE2])
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				cinfo->num_components*DCTSIZE2*SIZEOF(int));
+  coef_bit_ptr = & cinfo->coef_bits[0][0];
+  for (ci = 0; ci < cinfo->num_components; ci++) 
+    for (i = 0; i < DCTSIZE2; i++)
+      *coef_bit_ptr++ = -1;
+}
+
+#endif /* D_PROGRESSIVE_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jdpostct.c b/Source/3rd Party/wx/src/jpeg/jdpostct.c
index 3eb74ef9c..e6bcd4a9c 100644
--- a/Source/3rd Party/wx/src/jpeg/jdpostct.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdpostct.c	
@@ -1,290 +1,290 @@
-/*
- * jdpostct.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the decompression postprocessing controller.
- * This controller manages the upsampling, color conversion, and color
- * quantization/reduction steps; specifically, it controls the buffering
- * between upsample/color conversion and color quantization/reduction.
- *
- * If no color quantization/reduction is required, then this module has no
- * work to do, and it just hands off to the upsample/color conversion code.
- * An integrated upsample/convert/quantize process would replace this module
- * entirely.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_d_post_controller pub; /* public fields */
-
-  /* Color quantization source buffer: this holds output data from
-   * the upsample/color conversion step to be passed to the quantizer.
-   * For two-pass color quantization, we need a full-image buffer;
-   * for one-pass operation, a strip buffer is sufficient.
-   */
-  jvirt_sarray_ptr whole_image;	/* virtual array, or NULL if one-pass */
-  JSAMPARRAY buffer;		/* strip buffer, or current strip of virtual */
-  JDIMENSION strip_height;	/* buffer size in rows */
-  /* for two-pass mode only: */
-  JDIMENSION starting_row;	/* row # of first row in current strip */
-  JDIMENSION next_row;		/* index of next row to fill/empty in strip */
-} my_post_controller;
-
-typedef my_post_controller * my_post_ptr;
-
-
-/* Forward declarations */
-METHODDEF(void) post_process_1pass
-	JPP((j_decompress_ptr cinfo,
-	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-	     JDIMENSION in_row_groups_avail,
-	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-	     JDIMENSION out_rows_avail));
-#ifdef QUANT_2PASS_SUPPORTED
-METHODDEF(void) post_process_prepass
-	JPP((j_decompress_ptr cinfo,
-	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-	     JDIMENSION in_row_groups_avail,
-	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-	     JDIMENSION out_rows_avail));
-METHODDEF(void) post_process_2pass
-	JPP((j_decompress_ptr cinfo,
-	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-	     JDIMENSION in_row_groups_avail,
-	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-	     JDIMENSION out_rows_avail));
-#endif
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_dpost (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_post_ptr post = (my_post_ptr) cinfo->post;
-
-  switch (pass_mode) {
-  case JBUF_PASS_THRU:
-    if (cinfo->quantize_colors) {
-      /* Single-pass processing with color quantization. */
-      post->pub.post_process_data = post_process_1pass;
-      /* We could be doing buffered-image output before starting a 2-pass
-       * color quantization; in that case, jinit_d_post_controller did not
-       * allocate a strip buffer.  Use the virtual-array buffer as workspace.
-       */
-      if (post->buffer == NULL) {
-	post->buffer = (*cinfo->mem->access_virt_sarray)
-	  ((j_common_ptr) cinfo, post->whole_image,
-	   (JDIMENSION) 0, post->strip_height, TRUE);
-      }
-    } else {
-      /* For single-pass processing without color quantization,
-       * I have no work to do; just call the upsampler directly.
-       */
-      post->pub.post_process_data = cinfo->upsample->upsample;
-    }
-    break;
-#ifdef QUANT_2PASS_SUPPORTED
-  case JBUF_SAVE_AND_PASS:
-    /* First pass of 2-pass quantization */
-    if (post->whole_image == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    post->pub.post_process_data = post_process_prepass;
-    break;
-  case JBUF_CRANK_DEST:
-    /* Second pass of 2-pass quantization */
-    if (post->whole_image == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    post->pub.post_process_data = post_process_2pass;
-    break;
-#endif /* QUANT_2PASS_SUPPORTED */
-  default:
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    break;
-  }
-  post->starting_row = post->next_row = 0;
-}
-
-
-/*
- * Process some data in the one-pass (strip buffer) case.
- * This is used for color precision reduction as well as one-pass quantization.
- */
-
-METHODDEF(void)
-post_process_1pass (j_decompress_ptr cinfo,
-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		    JDIMENSION in_row_groups_avail,
-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		    JDIMENSION out_rows_avail)
-{
-  my_post_ptr post = (my_post_ptr) cinfo->post;
-  JDIMENSION num_rows, max_rows;
-
-  /* Fill the buffer, but not more than what we can dump out in one go. */
-  /* Note we rely on the upsampler to detect bottom of image. */
-  max_rows = out_rows_avail - *out_row_ctr;
-  if (max_rows > post->strip_height)
-    max_rows = post->strip_height;
-  num_rows = 0;
-  (*cinfo->upsample->upsample) (cinfo,
-		input_buf, in_row_group_ctr, in_row_groups_avail,
-		post->buffer, &num_rows, max_rows);
-  /* Quantize and emit data. */
-  (*cinfo->cquantize->color_quantize) (cinfo,
-		post->buffer, output_buf + *out_row_ctr, (int) num_rows);
-  *out_row_ctr += num_rows;
-}
-
-
-#ifdef QUANT_2PASS_SUPPORTED
-
-/*
- * Process some data in the first pass of 2-pass quantization.
- */
-
-METHODDEF(void)
-post_process_prepass (j_decompress_ptr cinfo,
-		      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		      JDIMENSION in_row_groups_avail,
-		      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		      JDIMENSION out_rows_avail)
-{
-  my_post_ptr post = (my_post_ptr) cinfo->post;
-  JDIMENSION old_next_row, num_rows;
-
-  /* Reposition virtual buffer if at start of strip. */
-  if (post->next_row == 0) {
-    post->buffer = (*cinfo->mem->access_virt_sarray)
-	((j_common_ptr) cinfo, post->whole_image,
-	 post->starting_row, post->strip_height, TRUE);
-  }
-
-  /* Upsample some data (up to a strip height's worth). */
-  old_next_row = post->next_row;
-  (*cinfo->upsample->upsample) (cinfo,
-		input_buf, in_row_group_ctr, in_row_groups_avail,
-		post->buffer, &post->next_row, post->strip_height);
-
-  /* Allow quantizer to scan new data.  No data is emitted, */
-  /* but we advance out_row_ctr so outer loop can tell when we're done. */
-  if (post->next_row > old_next_row) {
-    num_rows = post->next_row - old_next_row;
-    (*cinfo->cquantize->color_quantize) (cinfo, post->buffer + old_next_row,
-					 (JSAMPARRAY) NULL, (int) num_rows);
-    *out_row_ctr += num_rows;
-  }
-
-  /* Advance if we filled the strip. */
-  if (post->next_row >= post->strip_height) {
-    post->starting_row += post->strip_height;
-    post->next_row = 0;
-  }
-}
-
-
-/*
- * Process some data in the second pass of 2-pass quantization.
- */
-
-METHODDEF(void)
-post_process_2pass (j_decompress_ptr cinfo,
-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		    JDIMENSION in_row_groups_avail,
-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		    JDIMENSION out_rows_avail)
-{
-  my_post_ptr post = (my_post_ptr) cinfo->post;
-  JDIMENSION num_rows, max_rows;
-
-  /* Reposition virtual buffer if at start of strip. */
-  if (post->next_row == 0) {
-    post->buffer = (*cinfo->mem->access_virt_sarray)
-	((j_common_ptr) cinfo, post->whole_image,
-	 post->starting_row, post->strip_height, FALSE);
-  }
-
-  /* Determine number of rows to emit. */
-  num_rows = post->strip_height - post->next_row; /* available in strip */
-  max_rows = out_rows_avail - *out_row_ctr; /* available in output area */
-  if (num_rows > max_rows)
-    num_rows = max_rows;
-  /* We have to check bottom of image here, can't depend on upsampler. */
-  max_rows = cinfo->output_height - post->starting_row;
-  if (num_rows > max_rows)
-    num_rows = max_rows;
-
-  /* Quantize and emit data. */
-  (*cinfo->cquantize->color_quantize) (cinfo,
-		post->buffer + post->next_row, output_buf + *out_row_ctr,
-		(int) num_rows);
-  *out_row_ctr += num_rows;
-
-  /* Advance if we filled the strip. */
-  post->next_row += num_rows;
-  if (post->next_row >= post->strip_height) {
-    post->starting_row += post->strip_height;
-    post->next_row = 0;
-  }
-}
-
-#endif /* QUANT_2PASS_SUPPORTED */
-
-
-/*
- * Initialize postprocessing controller.
- */
-
-GLOBAL(void)
-jinit_d_post_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_post_ptr post;
-
-  post = (my_post_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_post_controller));
-  cinfo->post = (struct jpeg_d_post_controller *) post;
-  post->pub.start_pass = start_pass_dpost;
-  post->whole_image = NULL;	/* flag for no virtual arrays */
-  post->buffer = NULL;		/* flag for no strip buffer */
-
-  /* Create the quantization buffer, if needed */
-  if (cinfo->quantize_colors) {
-    /* The buffer strip height is max_v_samp_factor, which is typically
-     * an efficient number of rows for upsampling to return.
-     * (In the presence of output rescaling, we might want to be smarter?)
-     */
-    post->strip_height = (JDIMENSION) cinfo->max_v_samp_factor;
-    if (need_full_buffer) {
-      /* Two-pass color quantization: need full-image storage. */
-      /* We round up the number of rows to a multiple of the strip height. */
-#ifdef QUANT_2PASS_SUPPORTED
-      post->whole_image = (*cinfo->mem->request_virt_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
-	 cinfo->output_width * cinfo->out_color_components,
-	 (JDIMENSION) jround_up((long) cinfo->output_height,
-				(long) post->strip_height),
-	 post->strip_height);
-#else
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-#endif /* QUANT_2PASS_SUPPORTED */
-    } else {
-      /* One-pass color quantization: just make a strip buffer. */
-      post->buffer = (*cinfo->mem->alloc_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE,
-	 cinfo->output_width * cinfo->out_color_components,
-	 post->strip_height);
-    }
-  }
-}
+/*
+ * jdpostct.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the decompression postprocessing controller.
+ * This controller manages the upsampling, color conversion, and color
+ * quantization/reduction steps; specifically, it controls the buffering
+ * between upsample/color conversion and color quantization/reduction.
+ *
+ * If no color quantization/reduction is required, then this module has no
+ * work to do, and it just hands off to the upsample/color conversion code.
+ * An integrated upsample/convert/quantize process would replace this module
+ * entirely.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Private buffer controller object */
+
+typedef struct {
+  struct jpeg_d_post_controller pub; /* public fields */
+
+  /* Color quantization source buffer: this holds output data from
+   * the upsample/color conversion step to be passed to the quantizer.
+   * For two-pass color quantization, we need a full-image buffer;
+   * for one-pass operation, a strip buffer is sufficient.
+   */
+  jvirt_sarray_ptr whole_image;	/* virtual array, or NULL if one-pass */
+  JSAMPARRAY buffer;		/* strip buffer, or current strip of virtual */
+  JDIMENSION strip_height;	/* buffer size in rows */
+  /* for two-pass mode only: */
+  JDIMENSION starting_row;	/* row # of first row in current strip */
+  JDIMENSION next_row;		/* index of next row to fill/empty in strip */
+} my_post_controller;
+
+typedef my_post_controller * my_post_ptr;
+
+
+/* Forward declarations */
+METHODDEF(void) post_process_1pass
+	JPP((j_decompress_ptr cinfo,
+	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+	     JDIMENSION in_row_groups_avail,
+	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+	     JDIMENSION out_rows_avail));
+#ifdef QUANT_2PASS_SUPPORTED
+METHODDEF(void) post_process_prepass
+	JPP((j_decompress_ptr cinfo,
+	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+	     JDIMENSION in_row_groups_avail,
+	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+	     JDIMENSION out_rows_avail));
+METHODDEF(void) post_process_2pass
+	JPP((j_decompress_ptr cinfo,
+	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+	     JDIMENSION in_row_groups_avail,
+	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+	     JDIMENSION out_rows_avail));
+#endif
+
+
+/*
+ * Initialize for a processing pass.
+ */
+
+METHODDEF(void)
+start_pass_dpost (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)
+{
+  my_post_ptr post = (my_post_ptr) cinfo->post;
+
+  switch (pass_mode) {
+  case JBUF_PASS_THRU:
+    if (cinfo->quantize_colors) {
+      /* Single-pass processing with color quantization. */
+      post->pub.post_process_data = post_process_1pass;
+      /* We could be doing buffered-image output before starting a 2-pass
+       * color quantization; in that case, jinit_d_post_controller did not
+       * allocate a strip buffer.  Use the virtual-array buffer as workspace.
+       */
+      if (post->buffer == NULL) {
+	post->buffer = (*cinfo->mem->access_virt_sarray)
+	  ((j_common_ptr) cinfo, post->whole_image,
+	   (JDIMENSION) 0, post->strip_height, TRUE);
+      }
+    } else {
+      /* For single-pass processing without color quantization,
+       * I have no work to do; just call the upsampler directly.
+       */
+      post->pub.post_process_data = cinfo->upsample->upsample;
+    }
+    break;
+#ifdef QUANT_2PASS_SUPPORTED
+  case JBUF_SAVE_AND_PASS:
+    /* First pass of 2-pass quantization */
+    if (post->whole_image == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    post->pub.post_process_data = post_process_prepass;
+    break;
+  case JBUF_CRANK_DEST:
+    /* Second pass of 2-pass quantization */
+    if (post->whole_image == NULL)
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    post->pub.post_process_data = post_process_2pass;
+    break;
+#endif /* QUANT_2PASS_SUPPORTED */
+  default:
+    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+    break;
+  }
+  post->starting_row = post->next_row = 0;
+}
+
+
+/*
+ * Process some data in the one-pass (strip buffer) case.
+ * This is used for color precision reduction as well as one-pass quantization.
+ */
+
+METHODDEF(void)
+post_process_1pass (j_decompress_ptr cinfo,
+		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		    JDIMENSION in_row_groups_avail,
+		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		    JDIMENSION out_rows_avail)
+{
+  my_post_ptr post = (my_post_ptr) cinfo->post;
+  JDIMENSION num_rows, max_rows;
+
+  /* Fill the buffer, but not more than what we can dump out in one go. */
+  /* Note we rely on the upsampler to detect bottom of image. */
+  max_rows = out_rows_avail - *out_row_ctr;
+  if (max_rows > post->strip_height)
+    max_rows = post->strip_height;
+  num_rows = 0;
+  (*cinfo->upsample->upsample) (cinfo,
+		input_buf, in_row_group_ctr, in_row_groups_avail,
+		post->buffer, &num_rows, max_rows);
+  /* Quantize and emit data. */
+  (*cinfo->cquantize->color_quantize) (cinfo,
+		post->buffer, output_buf + *out_row_ctr, (int) num_rows);
+  *out_row_ctr += num_rows;
+}
+
+
+#ifdef QUANT_2PASS_SUPPORTED
+
+/*
+ * Process some data in the first pass of 2-pass quantization.
+ */
+
+METHODDEF(void)
+post_process_prepass (j_decompress_ptr cinfo,
+		      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		      JDIMENSION in_row_groups_avail,
+		      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		      JDIMENSION out_rows_avail)
+{
+  my_post_ptr post = (my_post_ptr) cinfo->post;
+  JDIMENSION old_next_row, num_rows;
+
+  /* Reposition virtual buffer if at start of strip. */
+  if (post->next_row == 0) {
+    post->buffer = (*cinfo->mem->access_virt_sarray)
+	((j_common_ptr) cinfo, post->whole_image,
+	 post->starting_row, post->strip_height, TRUE);
+  }
+
+  /* Upsample some data (up to a strip height's worth). */
+  old_next_row = post->next_row;
+  (*cinfo->upsample->upsample) (cinfo,
+		input_buf, in_row_group_ctr, in_row_groups_avail,
+		post->buffer, &post->next_row, post->strip_height);
+
+  /* Allow quantizer to scan new data.  No data is emitted, */
+  /* but we advance out_row_ctr so outer loop can tell when we're done. */
+  if (post->next_row > old_next_row) {
+    num_rows = post->next_row - old_next_row;
+    (*cinfo->cquantize->color_quantize) (cinfo, post->buffer + old_next_row,
+					 (JSAMPARRAY) NULL, (int) num_rows);
+    *out_row_ctr += num_rows;
+  }
+
+  /* Advance if we filled the strip. */
+  if (post->next_row >= post->strip_height) {
+    post->starting_row += post->strip_height;
+    post->next_row = 0;
+  }
+}
+
+
+/*
+ * Process some data in the second pass of 2-pass quantization.
+ */
+
+METHODDEF(void)
+post_process_2pass (j_decompress_ptr cinfo,
+		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+		    JDIMENSION in_row_groups_avail,
+		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+		    JDIMENSION out_rows_avail)
+{
+  my_post_ptr post = (my_post_ptr) cinfo->post;
+  JDIMENSION num_rows, max_rows;
+
+  /* Reposition virtual buffer if at start of strip. */
+  if (post->next_row == 0) {
+    post->buffer = (*cinfo->mem->access_virt_sarray)
+	((j_common_ptr) cinfo, post->whole_image,
+	 post->starting_row, post->strip_height, FALSE);
+  }
+
+  /* Determine number of rows to emit. */
+  num_rows = post->strip_height - post->next_row; /* available in strip */
+  max_rows = out_rows_avail - *out_row_ctr; /* available in output area */
+  if (num_rows > max_rows)
+    num_rows = max_rows;
+  /* We have to check bottom of image here, can't depend on upsampler. */
+  max_rows = cinfo->output_height - post->starting_row;
+  if (num_rows > max_rows)
+    num_rows = max_rows;
+
+  /* Quantize and emit data. */
+  (*cinfo->cquantize->color_quantize) (cinfo,
+		post->buffer + post->next_row, output_buf + *out_row_ctr,
+		(int) num_rows);
+  *out_row_ctr += num_rows;
+
+  /* Advance if we filled the strip. */
+  post->next_row += num_rows;
+  if (post->next_row >= post->strip_height) {
+    post->starting_row += post->strip_height;
+    post->next_row = 0;
+  }
+}
+
+#endif /* QUANT_2PASS_SUPPORTED */
+
+
+/*
+ * Initialize postprocessing controller.
+ */
+
+GLOBAL(void)
+jinit_d_post_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)
+{
+  my_post_ptr post;
+
+  post = (my_post_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_post_controller));
+  cinfo->post = (struct jpeg_d_post_controller *) post;
+  post->pub.start_pass = start_pass_dpost;
+  post->whole_image = NULL;	/* flag for no virtual arrays */
+  post->buffer = NULL;		/* flag for no strip buffer */
+
+  /* Create the quantization buffer, if needed */
+  if (cinfo->quantize_colors) {
+    /* The buffer strip height is max_v_samp_factor, which is typically
+     * an efficient number of rows for upsampling to return.
+     * (In the presence of output rescaling, we might want to be smarter?)
+     */
+    post->strip_height = (JDIMENSION) cinfo->max_v_samp_factor;
+    if (need_full_buffer) {
+      /* Two-pass color quantization: need full-image storage. */
+      /* We round up the number of rows to a multiple of the strip height. */
+#ifdef QUANT_2PASS_SUPPORTED
+      post->whole_image = (*cinfo->mem->request_virt_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+	 cinfo->output_width * cinfo->out_color_components,
+	 (JDIMENSION) jround_up((long) cinfo->output_height,
+				(long) post->strip_height),
+	 post->strip_height);
+#else
+      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
+#endif /* QUANT_2PASS_SUPPORTED */
+    } else {
+      /* One-pass color quantization: just make a strip buffer. */
+      post->buffer = (*cinfo->mem->alloc_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE,
+	 cinfo->output_width * cinfo->out_color_components,
+	 post->strip_height);
+    }
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jdsample.c b/Source/3rd Party/wx/src/jpeg/jdsample.c
index 3cba54045..8c8fc1713 100644
--- a/Source/3rd Party/wx/src/jpeg/jdsample.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdsample.c	
@@ -1,478 +1,478 @@
-/*
- * jdsample.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains upsampling routines.
- *
- * Upsampling input data is counted in "row groups".  A row group
- * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size)
- * sample rows of each component.  Upsampling will normally produce
- * max_v_samp_factor pixel rows from each row group (but this could vary
- * if the upsampler is applying a scale factor of its own).
- *
- * An excellent reference for image resampling is
- *   Digital Image Warping, George Wolberg, 1990.
- *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Pointer to routine to upsample a single component */
-typedef JMETHOD(void, upsample1_ptr,
-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr));
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_upsampler pub;	/* public fields */
-
-  /* Color conversion buffer.  When using separate upsampling and color
-   * conversion steps, this buffer holds one upsampled row group until it
-   * has been color converted and output.
-   * Note: we do not allocate any storage for component(s) which are full-size,
-   * ie do not need rescaling.  The corresponding entry of color_buf[] is
-   * simply set to point to the input data array, thereby avoiding copying.
-   */
-  JSAMPARRAY color_buf[MAX_COMPONENTS];
-
-  /* Per-component upsampling method pointers */
-  upsample1_ptr methods[MAX_COMPONENTS];
-
-  int next_row_out;		/* counts rows emitted from color_buf */
-  JDIMENSION rows_to_go;	/* counts rows remaining in image */
-
-  /* Height of an input row group for each component. */
-  int rowgroup_height[MAX_COMPONENTS];
-
-  /* These arrays save pixel expansion factors so that int_expand need not
-   * recompute them each time.  They are unused for other upsampling methods.
-   */
-  UINT8 h_expand[MAX_COMPONENTS];
-  UINT8 v_expand[MAX_COMPONENTS];
-} my_upsampler;
-
-typedef my_upsampler * my_upsample_ptr;
-
-
-/*
- * Initialize for an upsampling pass.
- */
-
-METHODDEF(void)
-start_pass_upsample (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-
-  /* Mark the conversion buffer empty */
-  upsample->next_row_out = cinfo->max_v_samp_factor;
-  /* Initialize total-height counter for detecting bottom of image */
-  upsample->rows_to_go = cinfo->output_height;
-}
-
-
-/*
- * Control routine to do upsampling (and color conversion).
- *
- * In this version we upsample each component independently.
- * We upsample one row group into the conversion buffer, then apply
- * color conversion a row at a time.
- */
-
-METHODDEF(void)
-sep_upsample (j_decompress_ptr cinfo,
-	      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-	      JDIMENSION in_row_groups_avail,
-	      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-	      JDIMENSION out_rows_avail)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  int ci;
-  jpeg_component_info * compptr;
-  JDIMENSION num_rows;
-
-  /* Fill the conversion buffer, if it's empty */
-  if (upsample->next_row_out >= cinfo->max_v_samp_factor) {
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      /* Invoke per-component upsample method.  Notice we pass a POINTER
-       * to color_buf[ci], so that fullsize_upsample can change it.
-       */
-      (*upsample->methods[ci]) (cinfo, compptr,
-	input_buf[ci] + (*in_row_group_ctr * upsample->rowgroup_height[ci]),
-	upsample->color_buf + ci);
-    }
-    upsample->next_row_out = 0;
-  }
-
-  /* Color-convert and emit rows */
-
-  /* How many we have in the buffer: */
-  num_rows = (JDIMENSION) (cinfo->max_v_samp_factor - upsample->next_row_out);
-  /* Not more than the distance to the end of the image.  Need this test
-   * in case the image height is not a multiple of max_v_samp_factor:
-   */
-  if (num_rows > upsample->rows_to_go) 
-    num_rows = upsample->rows_to_go;
-  /* And not more than what the client can accept: */
-  out_rows_avail -= *out_row_ctr;
-  if (num_rows > out_rows_avail)
-    num_rows = out_rows_avail;
-
-  (*cinfo->cconvert->color_convert) (cinfo, upsample->color_buf,
-				     (JDIMENSION) upsample->next_row_out,
-				     output_buf + *out_row_ctr,
-				     (int) num_rows);
-
-  /* Adjust counts */
-  *out_row_ctr += num_rows;
-  upsample->rows_to_go -= num_rows;
-  upsample->next_row_out += num_rows;
-  /* When the buffer is emptied, declare this input row group consumed */
-  if (upsample->next_row_out >= cinfo->max_v_samp_factor)
-    (*in_row_group_ctr)++;
-}
-
-
-/*
- * These are the routines invoked by sep_upsample to upsample pixel values
- * of a single component.  One row group is processed per call.
- */
-
-
-/*
- * For full-size components, we just make color_buf[ci] point at the
- * input buffer, and thus avoid copying any data.  Note that this is
- * safe only because sep_upsample doesn't declare the input row group
- * "consumed" until we are done color converting and emitting it.
- */
-
-METHODDEF(void)
-fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		   JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  *output_data_ptr = input_data;
-}
-
-
-/*
- * This is a no-op version used for "uninteresting" components.
- * These components will not be referenced by color conversion.
- */
-
-METHODDEF(void)
-noop_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  *output_data_ptr = NULL;	/* safety check */
-}
-
-
-/*
- * This version handles any integral sampling ratios.
- * This is not used for typical JPEG files, so it need not be fast.
- * Nor, for that matter, is it particularly accurate: the algorithm is
- * simple replication of the input pixel onto the corresponding output
- * pixels.  The hi-falutin sampling literature refers to this as a
- * "box filter".  A box filter tends to introduce visible artifacts,
- * so if you are actually going to use 3:1 or 4:1 sampling ratios
- * you would be well advised to improve this code.
- */
-
-METHODDEF(void)
-int_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	      JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr, outptr;
-  register JSAMPLE invalue;
-  register int h;
-  JSAMPROW outend;
-  int h_expand, v_expand;
-  int inrow, outrow;
-
-  h_expand = upsample->h_expand[compptr->component_index];
-  v_expand = upsample->v_expand[compptr->component_index];
-
-  inrow = outrow = 0;
-  while (outrow < cinfo->max_v_samp_factor) {
-    /* Generate one output row with proper horizontal expansion */
-    inptr = input_data[inrow];
-    outptr = output_data[outrow];
-    outend = outptr + cinfo->output_width;
-    while (outptr < outend) {
-      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
-      for (h = h_expand; h > 0; h--) {
-	*outptr++ = invalue;
-      }
-    }
-    /* Generate any additional output rows by duplicating the first one */
-    if (v_expand > 1) {
-      jcopy_sample_rows(output_data, outrow, output_data, outrow+1,
-			v_expand-1, cinfo->output_width);
-    }
-    inrow++;
-    outrow += v_expand;
-  }
-}
-
-
-/*
- * Fast processing for the common case of 2:1 horizontal and 1:1 vertical.
- * It's still a box filter.
- */
-
-METHODDEF(void)
-h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr, outptr;
-  register JSAMPLE invalue;
-  JSAMPROW outend;
-  int inrow;
-
-  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {
-    inptr = input_data[inrow];
-    outptr = output_data[inrow];
-    outend = outptr + cinfo->output_width;
-    while (outptr < outend) {
-      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
-      *outptr++ = invalue;
-      *outptr++ = invalue;
-    }
-  }
-}
-
-
-/*
- * Fast processing for the common case of 2:1 horizontal and 2:1 vertical.
- * It's still a box filter.
- */
-
-METHODDEF(void)
-h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr, outptr;
-  register JSAMPLE invalue;
-  JSAMPROW outend;
-  int inrow, outrow;
-
-  inrow = outrow = 0;
-  while (outrow < cinfo->max_v_samp_factor) {
-    inptr = input_data[inrow];
-    outptr = output_data[outrow];
-    outend = outptr + cinfo->output_width;
-    while (outptr < outend) {
-      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
-      *outptr++ = invalue;
-      *outptr++ = invalue;
-    }
-    jcopy_sample_rows(output_data, outrow, output_data, outrow+1,
-		      1, cinfo->output_width);
-    inrow++;
-    outrow += 2;
-  }
-}
-
-
-/*
- * Fancy processing for the common case of 2:1 horizontal and 1:1 vertical.
- *
- * The upsampling algorithm is linear interpolation between pixel centers,
- * also known as a "triangle filter".  This is a good compromise between
- * speed and visual quality.  The centers of the output pixels are 1/4 and 3/4
- * of the way between input pixel centers.
- *
- * A note about the "bias" calculations: when rounding fractional values to
- * integer, we do not want to always round 0.5 up to the next integer.
- * If we did that, we'd introduce a noticeable bias towards larger values.
- * Instead, this code is arranged so that 0.5 will be rounded up or down at
- * alternate pixel locations (a simple ordered dither pattern).
- */
-
-METHODDEF(void)
-h2v1_fancy_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		     JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr, outptr;
-  register int invalue;
-  register JDIMENSION colctr;
-  int inrow;
-
-  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {
-    inptr = input_data[inrow];
-    outptr = output_data[inrow];
-    /* Special case for first column */
-    invalue = GETJSAMPLE(*inptr++);
-    *outptr++ = (JSAMPLE) invalue;
-    *outptr++ = (JSAMPLE) ((invalue * 3 + GETJSAMPLE(*inptr) + 2) >> 2);
-
-    for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) {
-      /* General case: 3/4 * nearer pixel + 1/4 * further pixel */
-      invalue = GETJSAMPLE(*inptr++) * 3;
-      *outptr++ = (JSAMPLE) ((invalue + GETJSAMPLE(inptr[-2]) + 1) >> 2);
-      *outptr++ = (JSAMPLE) ((invalue + GETJSAMPLE(*inptr) + 2) >> 2);
-    }
-
-    /* Special case for last column */
-    invalue = GETJSAMPLE(*inptr);
-    *outptr++ = (JSAMPLE) ((invalue * 3 + GETJSAMPLE(inptr[-1]) + 1) >> 2);
-    *outptr++ = (JSAMPLE) invalue;
-  }
-}
-
-
-/*
- * Fancy processing for the common case of 2:1 horizontal and 2:1 vertical.
- * Again a triangle filter; see comments for h2v1 case, above.
- *
- * It is OK for us to reference the adjacent input rows because we demanded
- * context from the main buffer controller (see initialization code).
- */
-
-METHODDEF(void)
-h2v2_fancy_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		     JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr0, inptr1, outptr;
-#if BITS_IN_JSAMPLE == 8
-  register int thiscolsum, lastcolsum, nextcolsum;
-#else
-  register JPEG_INT32 thiscolsum, lastcolsum, nextcolsum;
-#endif
-  register JDIMENSION colctr;
-  int inrow, outrow, v;
-
-  inrow = outrow = 0;
-  while (outrow < cinfo->max_v_samp_factor) {
-    for (v = 0; v < 2; v++) {
-      /* inptr0 points to nearest input row, inptr1 points to next nearest */
-      inptr0 = input_data[inrow];
-      if (v == 0)		/* next nearest is row above */
-	inptr1 = input_data[inrow-1];
-      else			/* next nearest is row below */
-	inptr1 = input_data[inrow+1];
-      outptr = output_data[outrow++];
-
-      /* Special case for first column */
-      thiscolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
-      nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
-      *outptr++ = (JSAMPLE) ((thiscolsum * 4 + 8) >> 4);
-      *outptr++ = (JSAMPLE) ((thiscolsum * 3 + nextcolsum + 7) >> 4);
-      lastcolsum = thiscolsum; thiscolsum = nextcolsum;
-
-      for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) {
-	/* General case: 3/4 * nearer pixel + 1/4 * further pixel in each */
-	/* dimension, thus 9/16, 3/16, 3/16, 1/16 overall */
-	nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
-	*outptr++ = (JSAMPLE) ((thiscolsum * 3 + lastcolsum + 8) >> 4);
-	*outptr++ = (JSAMPLE) ((thiscolsum * 3 + nextcolsum + 7) >> 4);
-	lastcolsum = thiscolsum; thiscolsum = nextcolsum;
-      }
-
-      /* Special case for last column */
-      *outptr++ = (JSAMPLE) ((thiscolsum * 3 + lastcolsum + 8) >> 4);
-      *outptr++ = (JSAMPLE) ((thiscolsum * 4 + 7) >> 4);
-    }
-    inrow++;
-  }
-}
-
-
-/*
- * Module initialization routine for upsampling.
- */
-
-GLOBAL(void)
-jinit_upsampler (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample;
-  int ci;
-  jpeg_component_info * compptr;
-  wxjpeg_boolean need_buffer, do_fancy;
-  int h_in_group, v_in_group, h_out_group, v_out_group;
-
-  upsample = (my_upsample_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_upsampler));
-  cinfo->upsample = (struct jpeg_upsampler *) upsample;
-  upsample->pub.start_pass = start_pass_upsample;
-  upsample->pub.upsample = sep_upsample;
-  upsample->pub.need_context_rows = FALSE; /* until we find out differently */
-
-  if (cinfo->CCIR601_sampling)	/* this isn't supported */
-    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);
-
-  /* jdmainct.c doesn't support context rows when min_DCT_scaled_size = 1,
-   * so don't ask for it.
-   */
-  do_fancy = cinfo->do_fancy_upsampling && cinfo->min_DCT_scaled_size > 1;
-
-  /* Verify we can handle the sampling factors, select per-component methods,
-   * and create storage as needed.
-   */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Compute size of an "input group" after IDCT scaling.  This many samples
-     * are to be converted to max_h_samp_factor * max_v_samp_factor pixels.
-     */
-    h_in_group = (compptr->h_samp_factor * compptr->DCT_scaled_size) /
-		 cinfo->min_DCT_scaled_size;
-    v_in_group = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-		 cinfo->min_DCT_scaled_size;
-    h_out_group = cinfo->max_h_samp_factor;
-    v_out_group = cinfo->max_v_samp_factor;
-    upsample->rowgroup_height[ci] = v_in_group; /* save for use later */
-    need_buffer = TRUE;
-    if (! compptr->component_needed) {
-      /* Don't bother to upsample an uninteresting component. */
-      upsample->methods[ci] = noop_upsample;
-      need_buffer = FALSE;
-    } else if (h_in_group == h_out_group && v_in_group == v_out_group) {
-      /* Fullsize components can be processed without any work. */
-      upsample->methods[ci] = fullsize_upsample;
-      need_buffer = FALSE;
-    } else if (h_in_group * 2 == h_out_group &&
-	       v_in_group == v_out_group) {
-      /* Special cases for 2h1v upsampling */
-      if (do_fancy && compptr->downsampled_width > 2)
-	upsample->methods[ci] = h2v1_fancy_upsample;
-      else
-	upsample->methods[ci] = h2v1_upsample;
-    } else if (h_in_group * 2 == h_out_group &&
-	       v_in_group * 2 == v_out_group) {
-      /* Special cases for 2h2v upsampling */
-      if (do_fancy && compptr->downsampled_width > 2) {
-	upsample->methods[ci] = h2v2_fancy_upsample;
-	upsample->pub.need_context_rows = TRUE;
-      } else
-	upsample->methods[ci] = h2v2_upsample;
-    } else if ((h_out_group % h_in_group) == 0 &&
-	       (v_out_group % v_in_group) == 0) {
-      /* Generic integral-factors upsampling method */
-      upsample->methods[ci] = int_upsample;
-      upsample->h_expand[ci] = (UINT8) (h_out_group / h_in_group);
-      upsample->v_expand[ci] = (UINT8) (v_out_group / v_in_group);
-    } else
-      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);
-    if (need_buffer) {
-      upsample->color_buf[ci] = (*cinfo->mem->alloc_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE,
-	 (JDIMENSION) jround_up((long) cinfo->output_width,
-				(long) cinfo->max_h_samp_factor),
-	 (JDIMENSION) cinfo->max_v_samp_factor);
-    }
-  }
-}
+/*
+ * jdsample.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains upsampling routines.
+ *
+ * Upsampling input data is counted in "row groups".  A row group
+ * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size)
+ * sample rows of each component.  Upsampling will normally produce
+ * max_v_samp_factor pixel rows from each row group (but this could vary
+ * if the upsampler is applying a scale factor of its own).
+ *
+ * An excellent reference for image resampling is
+ *   Digital Image Warping, George Wolberg, 1990.
+ *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Pointer to routine to upsample a single component */
+typedef JMETHOD(void, upsample1_ptr,
+		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr));
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_upsampler pub;	/* public fields */
+
+  /* Color conversion buffer.  When using separate upsampling and color
+   * conversion steps, this buffer holds one upsampled row group until it
+   * has been color converted and output.
+   * Note: we do not allocate any storage for component(s) which are full-size,
+   * ie do not need rescaling.  The corresponding entry of color_buf[] is
+   * simply set to point to the input data array, thereby avoiding copying.
+   */
+  JSAMPARRAY color_buf[MAX_COMPONENTS];
+
+  /* Per-component upsampling method pointers */
+  upsample1_ptr methods[MAX_COMPONENTS];
+
+  int next_row_out;		/* counts rows emitted from color_buf */
+  JDIMENSION rows_to_go;	/* counts rows remaining in image */
+
+  /* Height of an input row group for each component. */
+  int rowgroup_height[MAX_COMPONENTS];
+
+  /* These arrays save pixel expansion factors so that int_expand need not
+   * recompute them each time.  They are unused for other upsampling methods.
+   */
+  UINT8 h_expand[MAX_COMPONENTS];
+  UINT8 v_expand[MAX_COMPONENTS];
+} my_upsampler;
+
+typedef my_upsampler * my_upsample_ptr;
+
+
+/*
+ * Initialize for an upsampling pass.
+ */
+
+METHODDEF(void)
+start_pass_upsample (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+
+  /* Mark the conversion buffer empty */
+  upsample->next_row_out = cinfo->max_v_samp_factor;
+  /* Initialize total-height counter for detecting bottom of image */
+  upsample->rows_to_go = cinfo->output_height;
+}
+
+
+/*
+ * Control routine to do upsampling (and color conversion).
+ *
+ * In this version we upsample each component independently.
+ * We upsample one row group into the conversion buffer, then apply
+ * color conversion a row at a time.
+ */
+
+METHODDEF(void)
+sep_upsample (j_decompress_ptr cinfo,
+	      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
+	      JDIMENSION in_row_groups_avail,
+	      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+	      JDIMENSION out_rows_avail)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  int ci;
+  jpeg_component_info * compptr;
+  JDIMENSION num_rows;
+
+  /* Fill the conversion buffer, if it's empty */
+  if (upsample->next_row_out >= cinfo->max_v_samp_factor) {
+    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+	 ci++, compptr++) {
+      /* Invoke per-component upsample method.  Notice we pass a POINTER
+       * to color_buf[ci], so that fullsize_upsample can change it.
+       */
+      (*upsample->methods[ci]) (cinfo, compptr,
+	input_buf[ci] + (*in_row_group_ctr * upsample->rowgroup_height[ci]),
+	upsample->color_buf + ci);
+    }
+    upsample->next_row_out = 0;
+  }
+
+  /* Color-convert and emit rows */
+
+  /* How many we have in the buffer: */
+  num_rows = (JDIMENSION) (cinfo->max_v_samp_factor - upsample->next_row_out);
+  /* Not more than the distance to the end of the image.  Need this test
+   * in case the image height is not a multiple of max_v_samp_factor:
+   */
+  if (num_rows > upsample->rows_to_go) 
+    num_rows = upsample->rows_to_go;
+  /* And not more than what the client can accept: */
+  out_rows_avail -= *out_row_ctr;
+  if (num_rows > out_rows_avail)
+    num_rows = out_rows_avail;
+
+  (*cinfo->cconvert->color_convert) (cinfo, upsample->color_buf,
+				     (JDIMENSION) upsample->next_row_out,
+				     output_buf + *out_row_ctr,
+				     (int) num_rows);
+
+  /* Adjust counts */
+  *out_row_ctr += num_rows;
+  upsample->rows_to_go -= num_rows;
+  upsample->next_row_out += num_rows;
+  /* When the buffer is emptied, declare this input row group consumed */
+  if (upsample->next_row_out >= cinfo->max_v_samp_factor)
+    (*in_row_group_ctr)++;
+}
+
+
+/*
+ * These are the routines invoked by sep_upsample to upsample pixel values
+ * of a single component.  One row group is processed per call.
+ */
+
+
+/*
+ * For full-size components, we just make color_buf[ci] point at the
+ * input buffer, and thus avoid copying any data.  Note that this is
+ * safe only because sep_upsample doesn't declare the input row group
+ * "consumed" until we are done color converting and emitting it.
+ */
+
+METHODDEF(void)
+fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		   JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  *output_data_ptr = input_data;
+}
+
+
+/*
+ * This is a no-op version used for "uninteresting" components.
+ * These components will not be referenced by color conversion.
+ */
+
+METHODDEF(void)
+noop_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  *output_data_ptr = NULL;	/* safety check */
+}
+
+
+/*
+ * This version handles any integral sampling ratios.
+ * This is not used for typical JPEG files, so it need not be fast.
+ * Nor, for that matter, is it particularly accurate: the algorithm is
+ * simple replication of the input pixel onto the corresponding output
+ * pixels.  The hi-falutin sampling literature refers to this as a
+ * "box filter".  A box filter tends to introduce visible artifacts,
+ * so if you are actually going to use 3:1 or 4:1 sampling ratios
+ * you would be well advised to improve this code.
+ */
+
+METHODDEF(void)
+int_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	      JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr, outptr;
+  register JSAMPLE invalue;
+  register int h;
+  JSAMPROW outend;
+  int h_expand, v_expand;
+  int inrow, outrow;
+
+  h_expand = upsample->h_expand[compptr->component_index];
+  v_expand = upsample->v_expand[compptr->component_index];
+
+  inrow = outrow = 0;
+  while (outrow < cinfo->max_v_samp_factor) {
+    /* Generate one output row with proper horizontal expansion */
+    inptr = input_data[inrow];
+    outptr = output_data[outrow];
+    outend = outptr + cinfo->output_width;
+    while (outptr < outend) {
+      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
+      for (h = h_expand; h > 0; h--) {
+	*outptr++ = invalue;
+      }
+    }
+    /* Generate any additional output rows by duplicating the first one */
+    if (v_expand > 1) {
+      jcopy_sample_rows(output_data, outrow, output_data, outrow+1,
+			v_expand-1, cinfo->output_width);
+    }
+    inrow++;
+    outrow += v_expand;
+  }
+}
+
+
+/*
+ * Fast processing for the common case of 2:1 horizontal and 1:1 vertical.
+ * It's still a box filter.
+ */
+
+METHODDEF(void)
+h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr, outptr;
+  register JSAMPLE invalue;
+  JSAMPROW outend;
+  int inrow;
+
+  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {
+    inptr = input_data[inrow];
+    outptr = output_data[inrow];
+    outend = outptr + cinfo->output_width;
+    while (outptr < outend) {
+      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
+      *outptr++ = invalue;
+      *outptr++ = invalue;
+    }
+  }
+}
+
+
+/*
+ * Fast processing for the common case of 2:1 horizontal and 2:1 vertical.
+ * It's still a box filter.
+ */
+
+METHODDEF(void)
+h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr, outptr;
+  register JSAMPLE invalue;
+  JSAMPROW outend;
+  int inrow, outrow;
+
+  inrow = outrow = 0;
+  while (outrow < cinfo->max_v_samp_factor) {
+    inptr = input_data[inrow];
+    outptr = output_data[outrow];
+    outend = outptr + cinfo->output_width;
+    while (outptr < outend) {
+      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
+      *outptr++ = invalue;
+      *outptr++ = invalue;
+    }
+    jcopy_sample_rows(output_data, outrow, output_data, outrow+1,
+		      1, cinfo->output_width);
+    inrow++;
+    outrow += 2;
+  }
+}
+
+
+/*
+ * Fancy processing for the common case of 2:1 horizontal and 1:1 vertical.
+ *
+ * The upsampling algorithm is linear interpolation between pixel centers,
+ * also known as a "triangle filter".  This is a good compromise between
+ * speed and visual quality.  The centers of the output pixels are 1/4 and 3/4
+ * of the way between input pixel centers.
+ *
+ * A note about the "bias" calculations: when rounding fractional values to
+ * integer, we do not want to always round 0.5 up to the next integer.
+ * If we did that, we'd introduce a noticeable bias towards larger values.
+ * Instead, this code is arranged so that 0.5 will be rounded up or down at
+ * alternate pixel locations (a simple ordered dither pattern).
+ */
+
+METHODDEF(void)
+h2v1_fancy_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		     JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr, outptr;
+  register int invalue;
+  register JDIMENSION colctr;
+  int inrow;
+
+  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {
+    inptr = input_data[inrow];
+    outptr = output_data[inrow];
+    /* Special case for first column */
+    invalue = GETJSAMPLE(*inptr++);
+    *outptr++ = (JSAMPLE) invalue;
+    *outptr++ = (JSAMPLE) ((invalue * 3 + GETJSAMPLE(*inptr) + 2) >> 2);
+
+    for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) {
+      /* General case: 3/4 * nearer pixel + 1/4 * further pixel */
+      invalue = GETJSAMPLE(*inptr++) * 3;
+      *outptr++ = (JSAMPLE) ((invalue + GETJSAMPLE(inptr[-2]) + 1) >> 2);
+      *outptr++ = (JSAMPLE) ((invalue + GETJSAMPLE(*inptr) + 2) >> 2);
+    }
+
+    /* Special case for last column */
+    invalue = GETJSAMPLE(*inptr);
+    *outptr++ = (JSAMPLE) ((invalue * 3 + GETJSAMPLE(inptr[-1]) + 1) >> 2);
+    *outptr++ = (JSAMPLE) invalue;
+  }
+}
+
+
+/*
+ * Fancy processing for the common case of 2:1 horizontal and 2:1 vertical.
+ * Again a triangle filter; see comments for h2v1 case, above.
+ *
+ * It is OK for us to reference the adjacent input rows because we demanded
+ * context from the main buffer controller (see initialization code).
+ */
+
+METHODDEF(void)
+h2v2_fancy_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		     JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
+{
+  JSAMPARRAY output_data = *output_data_ptr;
+  register JSAMPROW inptr0, inptr1, outptr;
+#if BITS_IN_JSAMPLE == 8
+  register int thiscolsum, lastcolsum, nextcolsum;
+#else
+  register JPEG_INT32 thiscolsum, lastcolsum, nextcolsum;
+#endif
+  register JDIMENSION colctr;
+  int inrow, outrow, v;
+
+  inrow = outrow = 0;
+  while (outrow < cinfo->max_v_samp_factor) {
+    for (v = 0; v < 2; v++) {
+      /* inptr0 points to nearest input row, inptr1 points to next nearest */
+      inptr0 = input_data[inrow];
+      if (v == 0)		/* next nearest is row above */
+	inptr1 = input_data[inrow-1];
+      else			/* next nearest is row below */
+	inptr1 = input_data[inrow+1];
+      outptr = output_data[outrow++];
+
+      /* Special case for first column */
+      thiscolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
+      nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
+      *outptr++ = (JSAMPLE) ((thiscolsum * 4 + 8) >> 4);
+      *outptr++ = (JSAMPLE) ((thiscolsum * 3 + nextcolsum + 7) >> 4);
+      lastcolsum = thiscolsum; thiscolsum = nextcolsum;
+
+      for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) {
+	/* General case: 3/4 * nearer pixel + 1/4 * further pixel in each */
+	/* dimension, thus 9/16, 3/16, 3/16, 1/16 overall */
+	nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
+	*outptr++ = (JSAMPLE) ((thiscolsum * 3 + lastcolsum + 8) >> 4);
+	*outptr++ = (JSAMPLE) ((thiscolsum * 3 + nextcolsum + 7) >> 4);
+	lastcolsum = thiscolsum; thiscolsum = nextcolsum;
+      }
+
+      /* Special case for last column */
+      *outptr++ = (JSAMPLE) ((thiscolsum * 3 + lastcolsum + 8) >> 4);
+      *outptr++ = (JSAMPLE) ((thiscolsum * 4 + 7) >> 4);
+    }
+    inrow++;
+  }
+}
+
+
+/*
+ * Module initialization routine for upsampling.
+ */
+
+GLOBAL(void)
+jinit_upsampler (j_decompress_ptr cinfo)
+{
+  my_upsample_ptr upsample;
+  int ci;
+  jpeg_component_info * compptr;
+  wxjpeg_boolean need_buffer, do_fancy;
+  int h_in_group, v_in_group, h_out_group, v_out_group;
+
+  upsample = (my_upsample_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_upsampler));
+  cinfo->upsample = (struct jpeg_upsampler *) upsample;
+  upsample->pub.start_pass = start_pass_upsample;
+  upsample->pub.upsample = sep_upsample;
+  upsample->pub.need_context_rows = FALSE; /* until we find out differently */
+
+  if (cinfo->CCIR601_sampling)	/* this isn't supported */
+    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);
+
+  /* jdmainct.c doesn't support context rows when min_DCT_scaled_size = 1,
+   * so don't ask for it.
+   */
+  do_fancy = cinfo->do_fancy_upsampling && cinfo->min_DCT_scaled_size > 1;
+
+  /* Verify we can handle the sampling factors, select per-component methods,
+   * and create storage as needed.
+   */
+  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
+       ci++, compptr++) {
+    /* Compute size of an "input group" after IDCT scaling.  This many samples
+     * are to be converted to max_h_samp_factor * max_v_samp_factor pixels.
+     */
+    h_in_group = (compptr->h_samp_factor * compptr->DCT_scaled_size) /
+		 cinfo->min_DCT_scaled_size;
+    v_in_group = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
+		 cinfo->min_DCT_scaled_size;
+    h_out_group = cinfo->max_h_samp_factor;
+    v_out_group = cinfo->max_v_samp_factor;
+    upsample->rowgroup_height[ci] = v_in_group; /* save for use later */
+    need_buffer = TRUE;
+    if (! compptr->component_needed) {
+      /* Don't bother to upsample an uninteresting component. */
+      upsample->methods[ci] = noop_upsample;
+      need_buffer = FALSE;
+    } else if (h_in_group == h_out_group && v_in_group == v_out_group) {
+      /* Fullsize components can be processed without any work. */
+      upsample->methods[ci] = fullsize_upsample;
+      need_buffer = FALSE;
+    } else if (h_in_group * 2 == h_out_group &&
+	       v_in_group == v_out_group) {
+      /* Special cases for 2h1v upsampling */
+      if (do_fancy && compptr->downsampled_width > 2)
+	upsample->methods[ci] = h2v1_fancy_upsample;
+      else
+	upsample->methods[ci] = h2v1_upsample;
+    } else if (h_in_group * 2 == h_out_group &&
+	       v_in_group * 2 == v_out_group) {
+      /* Special cases for 2h2v upsampling */
+      if (do_fancy && compptr->downsampled_width > 2) {
+	upsample->methods[ci] = h2v2_fancy_upsample;
+	upsample->pub.need_context_rows = TRUE;
+      } else
+	upsample->methods[ci] = h2v2_upsample;
+    } else if ((h_out_group % h_in_group) == 0 &&
+	       (v_out_group % v_in_group) == 0) {
+      /* Generic integral-factors upsampling method */
+      upsample->methods[ci] = int_upsample;
+      upsample->h_expand[ci] = (UINT8) (h_out_group / h_in_group);
+      upsample->v_expand[ci] = (UINT8) (v_out_group / v_in_group);
+    } else
+      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);
+    if (need_buffer) {
+      upsample->color_buf[ci] = (*cinfo->mem->alloc_sarray)
+	((j_common_ptr) cinfo, JPOOL_IMAGE,
+	 (JDIMENSION) jround_up((long) cinfo->output_width,
+				(long) cinfo->max_h_samp_factor),
+	 (JDIMENSION) cinfo->max_v_samp_factor);
+    }
+  }
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jdtrans.c b/Source/3rd Party/wx/src/jpeg/jdtrans.c
index 0ca4d280f..d22388684 100644
--- a/Source/3rd Party/wx/src/jpeg/jdtrans.c	
+++ b/Source/3rd Party/wx/src/jpeg/jdtrans.c	
@@ -1,143 +1,143 @@
-/*
- * jdtrans.c
- *
- * Copyright (C) 1995-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains library routines for transcoding decompression,
- * that is, reading raw DCT coefficient arrays from an input JPEG file.
- * The routines in jdapimin.c will also be needed by a transcoder.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Forward declarations */
-LOCAL(void) transdecode_master_selection JPP((j_decompress_ptr cinfo));
-
-
-/*
- * Read the coefficient arrays from a JPEG file.
- * jpeg_read_header must be completed before calling this.
- *
- * The entire image is read into a set of virtual coefficient-block arrays,
- * one per component.  The return value is a pointer to the array of
- * virtual-array descriptors.  These can be manipulated directly via the
- * JPEG memory manager, or handed off to jpeg_write_coefficients().
- * To release the memory occupied by the virtual arrays, call
- * jpeg_finish_decompress() when done with the data.
- *
- * An alternative usage is to simply obtain access to the coefficient arrays
- * during a buffered-image-mode decompression operation.  This is allowed
- * after any jpeg_finish_output() call.  The arrays can be accessed until
- * jpeg_finish_decompress() is called.  (Note that any call to the library
- * may reposition the arrays, so don't rely on access_virt_barray() results
- * to stay valid across library calls.)
- *
- * Returns NULL if suspended.  This case need be checked only if
- * a suspending data source is used.
- */
-
-GLOBAL(jvirt_barray_ptr *)
-jpeg_read_coefficients (j_decompress_ptr cinfo)
-{
-  if (cinfo->global_state == DSTATE_READY) {
-    /* First call: initialize active modules */
-    transdecode_master_selection(cinfo);
-    cinfo->global_state = DSTATE_RDCOEFS;
-  }
-  if (cinfo->global_state == DSTATE_RDCOEFS) {
-    /* Absorb whole file into the coef buffer */
-    for (;;) {
-      int retcode;
-      /* Call progress monitor hook if present */
-      if (cinfo->progress != NULL)
-	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-      /* Absorb some more input */
-      retcode = (*cinfo->inputctl->consume_input) (cinfo);
-      if (retcode == JPEG_SUSPENDED)
-	return NULL;
-      if (retcode == JPEG_REACHED_EOI)
-	break;
-      /* Advance progress counter if appropriate */
-      if (cinfo->progress != NULL &&
-	  (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
-	if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
-	  /* startup underestimated number of scans; ratchet up one scan */
-	  cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
-	}
-      }
-    }
-    /* Set state so that jpeg_finish_decompress does the right thing */
-    cinfo->global_state = DSTATE_STOPPING;
-  }
-  /* At this point we should be in state DSTATE_STOPPING if being used
-   * standalone, or in state DSTATE_BUFIMAGE if being invoked to get access
-   * to the coefficients during a full buffered-image-mode decompression.
-   */
-  if ((cinfo->global_state == DSTATE_STOPPING ||
-       cinfo->global_state == DSTATE_BUFIMAGE) && cinfo->buffered_image) {
-    return cinfo->coef->coef_arrays;
-  }
-  /* Oops, improper usage */
-  ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  return NULL;			/* keep compiler happy */
-}
-
-
-/*
- * Master selection of decompression modules for transcoding.
- * This substitutes for jdmaster.c's initialization of the full decompressor.
- */
-
-LOCAL(void)
-transdecode_master_selection (j_decompress_ptr cinfo)
-{
-  /* This is effectively a buffered-image operation. */
-  cinfo->buffered_image = TRUE;
-
-  /* Entropy decoding: either Huffman or arithmetic coding. */
-  if (cinfo->arith_code) {
-    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
-  } else {
-    if (cinfo->progressive_mode) {
-#ifdef D_PROGRESSIVE_SUPPORTED
-      jinit_phuff_decoder(cinfo);
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else
-      jinit_huff_decoder(cinfo);
-  }
-
-  /* Always get a full-image coefficient buffer. */
-  jinit_d_coef_controller(cinfo, TRUE);
-
-  /* We can now tell the memory manager to allocate virtual arrays. */
-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
-
-  /* Initialize input side of decompressor to consume first scan. */
-  (*cinfo->inputctl->start_input_pass) (cinfo);
-  /* Initialize progress monitoring. */
-  if (cinfo->progress != NULL) {
-    int nscans;
-    /* Estimate number of scans to set pass_limit. */
-    if (cinfo->progressive_mode) {
-      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */
-      nscans = 2 + 3 * cinfo->num_components;
-    } else if (cinfo->inputctl->has_multiple_scans) {
-      /* For a nonprogressive multiscan file, estimate 1 scan per component. */
-      nscans = cinfo->num_components;
-    } else {
-      nscans = 1;
-    }
-    cinfo->progress->pass_counter = 0L;
-    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;
-    cinfo->progress->completed_passes = 0;
-    cinfo->progress->total_passes = 1;
-  }
-}
-
+/*
+ * jdtrans.c
+ *
+ * Copyright (C) 1995-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains library routines for transcoding decompression,
+ * that is, reading raw DCT coefficient arrays from an input JPEG file.
+ * The routines in jdapimin.c will also be needed by a transcoder.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/* Forward declarations */
+LOCAL(void) transdecode_master_selection JPP((j_decompress_ptr cinfo));
+
+
+/*
+ * Read the coefficient arrays from a JPEG file.
+ * jpeg_read_header must be completed before calling this.
+ *
+ * The entire image is read into a set of virtual coefficient-block arrays,
+ * one per component.  The return value is a pointer to the array of
+ * virtual-array descriptors.  These can be manipulated directly via the
+ * JPEG memory manager, or handed off to jpeg_write_coefficients().
+ * To release the memory occupied by the virtual arrays, call
+ * jpeg_finish_decompress() when done with the data.
+ *
+ * An alternative usage is to simply obtain access to the coefficient arrays
+ * during a buffered-image-mode decompression operation.  This is allowed
+ * after any jpeg_finish_output() call.  The arrays can be accessed until
+ * jpeg_finish_decompress() is called.  (Note that any call to the library
+ * may reposition the arrays, so don't rely on access_virt_barray() results
+ * to stay valid across library calls.)
+ *
+ * Returns NULL if suspended.  This case need be checked only if
+ * a suspending data source is used.
+ */
+
+GLOBAL(jvirt_barray_ptr *)
+jpeg_read_coefficients (j_decompress_ptr cinfo)
+{
+  if (cinfo->global_state == DSTATE_READY) {
+    /* First call: initialize active modules */
+    transdecode_master_selection(cinfo);
+    cinfo->global_state = DSTATE_RDCOEFS;
+  }
+  if (cinfo->global_state == DSTATE_RDCOEFS) {
+    /* Absorb whole file into the coef buffer */
+    for (;;) {
+      int retcode;
+      /* Call progress monitor hook if present */
+      if (cinfo->progress != NULL)
+	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+      /* Absorb some more input */
+      retcode = (*cinfo->inputctl->consume_input) (cinfo);
+      if (retcode == JPEG_SUSPENDED)
+	return NULL;
+      if (retcode == JPEG_REACHED_EOI)
+	break;
+      /* Advance progress counter if appropriate */
+      if (cinfo->progress != NULL &&
+	  (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
+	if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
+	  /* startup underestimated number of scans; ratchet up one scan */
+	  cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
+	}
+      }
+    }
+    /* Set state so that jpeg_finish_decompress does the right thing */
+    cinfo->global_state = DSTATE_STOPPING;
+  }
+  /* At this point we should be in state DSTATE_STOPPING if being used
+   * standalone, or in state DSTATE_BUFIMAGE if being invoked to get access
+   * to the coefficients during a full buffered-image-mode decompression.
+   */
+  if ((cinfo->global_state == DSTATE_STOPPING ||
+       cinfo->global_state == DSTATE_BUFIMAGE) && cinfo->buffered_image) {
+    return cinfo->coef->coef_arrays;
+  }
+  /* Oops, improper usage */
+  ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  return NULL;			/* keep compiler happy */
+}
+
+
+/*
+ * Master selection of decompression modules for transcoding.
+ * This substitutes for jdmaster.c's initialization of the full decompressor.
+ */
+
+LOCAL(void)
+transdecode_master_selection (j_decompress_ptr cinfo)
+{
+  /* This is effectively a buffered-image operation. */
+  cinfo->buffered_image = TRUE;
+
+  /* Entropy decoding: either Huffman or arithmetic coding. */
+  if (cinfo->arith_code) {
+    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+  } else {
+    if (cinfo->progressive_mode) {
+#ifdef D_PROGRESSIVE_SUPPORTED
+      jinit_phuff_decoder(cinfo);
+#else
+      ERREXIT(cinfo, JERR_NOT_COMPILED);
+#endif
+    } else
+      jinit_huff_decoder(cinfo);
+  }
+
+  /* Always get a full-image coefficient buffer. */
+  jinit_d_coef_controller(cinfo, TRUE);
+
+  /* We can now tell the memory manager to allocate virtual arrays. */
+  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
+
+  /* Initialize input side of decompressor to consume first scan. */
+  (*cinfo->inputctl->start_input_pass) (cinfo);
+  /* Initialize progress monitoring. */
+  if (cinfo->progress != NULL) {
+    int nscans;
+    /* Estimate number of scans to set pass_limit. */
+    if (cinfo->progressive_mode) {
+      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */
+      nscans = 2 + 3 * cinfo->num_components;
+    } else if (cinfo->inputctl->has_multiple_scans) {
+      /* For a nonprogressive multiscan file, estimate 1 scan per component. */
+      nscans = cinfo->num_components;
+    } else {
+      nscans = 1;
+    }
+    cinfo->progress->pass_counter = 0L;
+    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;
+    cinfo->progress->completed_passes = 0;
+    cinfo->progress->total_passes = 1;
+  }
+}
+
diff --git a/Source/3rd Party/wx/src/jpeg/jerror.c b/Source/3rd Party/wx/src/jpeg/jerror.c
index 96a170a25..660c4a6dd 100644
--- a/Source/3rd Party/wx/src/jpeg/jerror.c	
+++ b/Source/3rd Party/wx/src/jpeg/jerror.c	
@@ -1,252 +1,252 @@
-/*
- * jerror.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains simple error-reporting and trace-message routines.
- * These are suitable for Unix-like systems and others where writing to
- * stderr is the right thing to do.  Many applications will want to replace
- * some or all of these routines.
- *
- * If you define USE_WINDOWS_MESSAGEBOX in jconfig.h or in the makefile,
- * you get a Windows-specific hack to display error messages in a dialog box.
- * It ain't much, but it beats dropping error messages into the bit bucket,
- * which is what happens to output to stderr under most Windows C compilers.
- *
- * These routines are used by both the compression and decompression code.
- */
-
-/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jversion.h"
-#include "jerror.h"
-
-#ifdef USE_WINDOWS_MESSAGEBOX
-#include <windows.h>
-#endif
-
-#ifndef EXIT_FAILURE		/* define exit() codes if not provided */
-#define EXIT_FAILURE  1
-#endif
-
-
-/*
- * Create the message string table.
- * We do this from the master message list in jerror.h by re-reading
- * jerror.h with a suitable definition for macro JMESSAGE.
- * The message table is made an external symbol just in case any applications
- * want to refer to it directly.
- */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_std_message_table	jMsgTable
-#endif
-
-#define JMESSAGE(code,string)	string ,
-
-const char * const jpeg_std_message_table[] = {
-#include "jerror.h"
-  NULL
-};
-
-
-/*
- * Error exit handler: must not return to caller.
- *
- * Applications may override this if they want to get control back after
- * an error.  Typically one would longjmp somewhere instead of exiting.
- * The setjmp buffer can be made a private field within an expanded error
- * handler object.  Note that the info needed to generate an error message
- * is stored in the error object, so you can generate the message now or
- * later, at your convenience.
- * You should make sure that the JPEG object is cleaned up (with jpeg_abort
- * or jpeg_destroy) at some point.
- */
-
-METHODDEF(void)
-error_exit (j_common_ptr cinfo)
-{
-  /* Always display the message */
-  (*cinfo->err->output_message) (cinfo);
-
-  /* Let the memory manager delete any temp files before we die */
-  jpeg_destroy(cinfo);
-
-  exit(EXIT_FAILURE);
-}
-
-
-/*
- * Actual output of an error or trace message.
- * Applications may override this method to send JPEG messages somewhere
- * other than stderr.
- *
- * On Windows, printing to stderr is generally completely useless,
- * so we provide optional code to produce an error-dialog popup.
- * Most Windows applications will still prefer to override this routine,
- * but if they don't, it'll do something at least marginally useful.
- *
- * NOTE: to use the library in an environment that doesn't support the
- * C stdio library, you may have to delete the call to fprintf() entirely,
- * not just not use this routine.
- */
-
-METHODDEF(void)
-output_message (j_common_ptr cinfo)
-{
-  char buffer[JMSG_LENGTH_MAX];
-
-  /* Create the message */
-  (*cinfo->err->format_message) (cinfo, buffer);
-
-#ifdef USE_WINDOWS_MESSAGEBOX
-  /* Display it in a message dialog box */
-  MessageBox(GetActiveWindow(), buffer, "JPEG Library Error",
-	     MB_OK | MB_ICONERROR);
-#else
-  /* Send it to stderr, adding a newline */
-  fprintf(stderr, "%s\n", buffer);
-#endif
-}
-
-
-/*
- * Decide whether to emit a trace or warning message.
- * msg_level is one of:
- *   -1: recoverable corrupt-data warning, may want to abort.
- *    0: important advisory messages (always display to user).
- *    1: first level of tracing detail.
- *    2,3,...: successively more detailed tracing messages.
- * An application might override this method if it wanted to abort on warnings
- * or change the policy about which messages to display.
- */
-
-METHODDEF(void)
-emit_message (j_common_ptr cinfo, int msg_level)
-{
-  struct jpeg_error_mgr * err = cinfo->err;
-
-  if (msg_level < 0) {
-    /* It's a warning message.  Since corrupt files may generate many warnings,
-     * the policy implemented here is to show only the first warning,
-     * unless trace_level >= 3.
-     */
-    if (err->num_warnings == 0 || err->trace_level >= 3)
-      (*err->output_message) (cinfo);
-    /* Always count warnings in num_warnings. */
-    err->num_warnings++;
-  } else {
-    /* It's a trace message.  Show it if trace_level >= msg_level. */
-    if (err->trace_level >= msg_level)
-      (*err->output_message) (cinfo);
-  }
-}
-
-
-/*
- * Format a message string for the most recent JPEG error or message.
- * The message is stored into buffer, which should be at least JMSG_LENGTH_MAX
- * characters.  Note that no '\n' character is added to the string.
- * Few applications should need to override this method.
- */
-
-METHODDEF(void)
-format_message (j_common_ptr cinfo, char * buffer)
-{
-  struct jpeg_error_mgr * err = cinfo->err;
-  int msg_code = err->msg_code;
-  const char * msgtext = NULL;
-  const char * msgptr;
-  char ch;
-  wxjpeg_boolean isstring;
-
-  /* Look up message string in proper table */
-  if (msg_code > 0 && msg_code <= err->last_jpeg_message) {
-    msgtext = err->jpeg_message_table[msg_code];
-  } else if (err->addon_message_table != NULL &&
-	     msg_code >= err->first_addon_message &&
-	     msg_code <= err->last_addon_message) {
-    msgtext = err->addon_message_table[msg_code - err->first_addon_message];
-  }
-
-  /* Defend against bogus message number */
-  if (msgtext == NULL) {
-    err->msg_parm.i[0] = msg_code;
-    msgtext = err->jpeg_message_table[0];
-  }
-
-  /* Check for string parameter, as indicated by %s in the message text */
-  isstring = FALSE;
-  msgptr = msgtext;
-  while ((ch = *msgptr++) != '\0') {
-    if (ch == '%') {
-      if (*msgptr == 's') isstring = TRUE;
-      break;
-    }
-  }
-
-  /* Format the message into the passed buffer */
-  if (isstring)
-    sprintf(buffer, msgtext, err->msg_parm.s);
-  else
-    sprintf(buffer, msgtext,
-	    err->msg_parm.i[0], err->msg_parm.i[1],
-	    err->msg_parm.i[2], err->msg_parm.i[3],
-	    err->msg_parm.i[4], err->msg_parm.i[5],
-	    err->msg_parm.i[6], err->msg_parm.i[7]);
-}
-
-
-/*
- * Reset error state variables at start of a new image.
- * This is called during compression startup to reset trace/error
- * processing to default state, without losing any application-specific
- * method pointers.  An application might possibly want to override
- * this method if it has additional error processing state.
- */
-
-METHODDEF(void)
-reset_error_mgr (j_common_ptr cinfo)
-{
-  cinfo->err->num_warnings = 0;
-  /* trace_level is not reset since it is an application-supplied parameter */
-  cinfo->err->msg_code = 0;	/* may be useful as a flag for "no error" */
-}
-
-
-/*
- * Fill in the standard error-handling methods in a jpeg_error_mgr object.
- * Typical call is:
- *	struct jpeg_compress_struct cinfo;
- *	struct jpeg_error_mgr err;
- *
- *	cinfo.err = jpeg_std_error(&err);
- * after which the application may override some of the methods.
- */
-
-GLOBAL(struct jpeg_error_mgr *)
-jpeg_std_error (struct jpeg_error_mgr * err)
-{
-  err->error_exit = error_exit;
-  err->emit_message = emit_message;
-  err->output_message = output_message;
-  err->format_message = format_message;
-  err->reset_error_mgr = reset_error_mgr;
-
-  err->trace_level = 0;		/* default = no tracing */
-  err->num_warnings = 0;	/* no warnings emitted yet */
-  err->msg_code = 0;		/* may be useful as a flag for "no error" */
-
-  /* Initialize message table pointers */
-  err->jpeg_message_table = jpeg_std_message_table;
-  err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1;
-
-  err->addon_message_table = NULL;
-  err->first_addon_message = 0;	/* for safety */
-  err->last_addon_message = 0;
-
-  return err;
-}
+/*
+ * jerror.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains simple error-reporting and trace-message routines.
+ * These are suitable for Unix-like systems and others where writing to
+ * stderr is the right thing to do.  Many applications will want to replace
+ * some or all of these routines.
+ *
+ * If you define USE_WINDOWS_MESSAGEBOX in jconfig.h or in the makefile,
+ * you get a Windows-specific hack to display error messages in a dialog box.
+ * It ain't much, but it beats dropping error messages into the bit bucket,
+ * which is what happens to output to stderr under most Windows C compilers.
+ *
+ * These routines are used by both the compression and decompression code.
+ */
+
+/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jversion.h"
+#include "jerror.h"
+
+#ifdef USE_WINDOWS_MESSAGEBOX
+#include <windows.h>
+#endif
+
+#ifndef EXIT_FAILURE		/* define exit() codes if not provided */
+#define EXIT_FAILURE  1
+#endif
+
+
+/*
+ * Create the message string table.
+ * We do this from the master message list in jerror.h by re-reading
+ * jerror.h with a suitable definition for macro JMESSAGE.
+ * The message table is made an external symbol just in case any applications
+ * want to refer to it directly.
+ */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_std_message_table	jMsgTable
+#endif
+
+#define JMESSAGE(code,string)	string ,
+
+const char * const jpeg_std_message_table[] = {
+#include "jerror.h"
+  NULL
+};
+
+
+/*
+ * Error exit handler: must not return to caller.
+ *
+ * Applications may override this if they want to get control back after
+ * an error.  Typically one would longjmp somewhere instead of exiting.
+ * The setjmp buffer can be made a private field within an expanded error
+ * handler object.  Note that the info needed to generate an error message
+ * is stored in the error object, so you can generate the message now or
+ * later, at your convenience.
+ * You should make sure that the JPEG object is cleaned up (with jpeg_abort
+ * or jpeg_destroy) at some point.
+ */
+
+METHODDEF(void)
+error_exit (j_common_ptr cinfo)
+{
+  /* Always display the message */
+  (*cinfo->err->output_message) (cinfo);
+
+  /* Let the memory manager delete any temp files before we die */
+  jpeg_destroy(cinfo);
+
+  exit(EXIT_FAILURE);
+}
+
+
+/*
+ * Actual output of an error or trace message.
+ * Applications may override this method to send JPEG messages somewhere
+ * other than stderr.
+ *
+ * On Windows, printing to stderr is generally completely useless,
+ * so we provide optional code to produce an error-dialog popup.
+ * Most Windows applications will still prefer to override this routine,
+ * but if they don't, it'll do something at least marginally useful.
+ *
+ * NOTE: to use the library in an environment that doesn't support the
+ * C stdio library, you may have to delete the call to fprintf() entirely,
+ * not just not use this routine.
+ */
+
+METHODDEF(void)
+output_message (j_common_ptr cinfo)
+{
+  char buffer[JMSG_LENGTH_MAX];
+
+  /* Create the message */
+  (*cinfo->err->format_message) (cinfo, buffer);
+
+#ifdef USE_WINDOWS_MESSAGEBOX
+  /* Display it in a message dialog box */
+  MessageBox(GetActiveWindow(), buffer, "JPEG Library Error",
+	     MB_OK | MB_ICONERROR);
+#else
+  /* Send it to stderr, adding a newline */
+  fprintf(stderr, "%s\n", buffer);
+#endif
+}
+
+
+/*
+ * Decide whether to emit a trace or warning message.
+ * msg_level is one of:
+ *   -1: recoverable corrupt-data warning, may want to abort.
+ *    0: important advisory messages (always display to user).
+ *    1: first level of tracing detail.
+ *    2,3,...: successively more detailed tracing messages.
+ * An application might override this method if it wanted to abort on warnings
+ * or change the policy about which messages to display.
+ */
+
+METHODDEF(void)
+emit_message (j_common_ptr cinfo, int msg_level)
+{
+  struct jpeg_error_mgr * err = cinfo->err;
+
+  if (msg_level < 0) {
+    /* It's a warning message.  Since corrupt files may generate many warnings,
+     * the policy implemented here is to show only the first warning,
+     * unless trace_level >= 3.
+     */
+    if (err->num_warnings == 0 || err->trace_level >= 3)
+      (*err->output_message) (cinfo);
+    /* Always count warnings in num_warnings. */
+    err->num_warnings++;
+  } else {
+    /* It's a trace message.  Show it if trace_level >= msg_level. */
+    if (err->trace_level >= msg_level)
+      (*err->output_message) (cinfo);
+  }
+}
+
+
+/*
+ * Format a message string for the most recent JPEG error or message.
+ * The message is stored into buffer, which should be at least JMSG_LENGTH_MAX
+ * characters.  Note that no '\n' character is added to the string.
+ * Few applications should need to override this method.
+ */
+
+METHODDEF(void)
+format_message (j_common_ptr cinfo, char * buffer)
+{
+  struct jpeg_error_mgr * err = cinfo->err;
+  int msg_code = err->msg_code;
+  const char * msgtext = NULL;
+  const char * msgptr;
+  char ch;
+  wxjpeg_boolean isstring;
+
+  /* Look up message string in proper table */
+  if (msg_code > 0 && msg_code <= err->last_jpeg_message) {
+    msgtext = err->jpeg_message_table[msg_code];
+  } else if (err->addon_message_table != NULL &&
+	     msg_code >= err->first_addon_message &&
+	     msg_code <= err->last_addon_message) {
+    msgtext = err->addon_message_table[msg_code - err->first_addon_message];
+  }
+
+  /* Defend against bogus message number */
+  if (msgtext == NULL) {
+    err->msg_parm.i[0] = msg_code;
+    msgtext = err->jpeg_message_table[0];
+  }
+
+  /* Check for string parameter, as indicated by %s in the message text */
+  isstring = FALSE;
+  msgptr = msgtext;
+  while ((ch = *msgptr++) != '\0') {
+    if (ch == '%') {
+      if (*msgptr == 's') isstring = TRUE;
+      break;
+    }
+  }
+
+  /* Format the message into the passed buffer */
+  if (isstring)
+    sprintf(buffer, msgtext, err->msg_parm.s);
+  else
+    sprintf(buffer, msgtext,
+	    err->msg_parm.i[0], err->msg_parm.i[1],
+	    err->msg_parm.i[2], err->msg_parm.i[3],
+	    err->msg_parm.i[4], err->msg_parm.i[5],
+	    err->msg_parm.i[6], err->msg_parm.i[7]);
+}
+
+
+/*
+ * Reset error state variables at start of a new image.
+ * This is called during compression startup to reset trace/error
+ * processing to default state, without losing any application-specific
+ * method pointers.  An application might possibly want to override
+ * this method if it has additional error processing state.
+ */
+
+METHODDEF(void)
+reset_error_mgr (j_common_ptr cinfo)
+{
+  cinfo->err->num_warnings = 0;
+  /* trace_level is not reset since it is an application-supplied parameter */
+  cinfo->err->msg_code = 0;	/* may be useful as a flag for "no error" */
+}
+
+
+/*
+ * Fill in the standard error-handling methods in a jpeg_error_mgr object.
+ * Typical call is:
+ *	struct jpeg_compress_struct cinfo;
+ *	struct jpeg_error_mgr err;
+ *
+ *	cinfo.err = jpeg_std_error(&err);
+ * after which the application may override some of the methods.
+ */
+
+GLOBAL(struct jpeg_error_mgr *)
+jpeg_std_error (struct jpeg_error_mgr * err)
+{
+  err->error_exit = error_exit;
+  err->emit_message = emit_message;
+  err->output_message = output_message;
+  err->format_message = format_message;
+  err->reset_error_mgr = reset_error_mgr;
+
+  err->trace_level = 0;		/* default = no tracing */
+  err->num_warnings = 0;	/* no warnings emitted yet */
+  err->msg_code = 0;		/* may be useful as a flag for "no error" */
+
+  /* Initialize message table pointers */
+  err->jpeg_message_table = jpeg_std_message_table;
+  err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1;
+
+  err->addon_message_table = NULL;
+  err->first_addon_message = 0;	/* for safety */
+  err->last_addon_message = 0;
+
+  return err;
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jerror.h b/Source/3rd Party/wx/src/jpeg/jerror.h
index 79084f2e0..fc2fffeac 100644
--- a/Source/3rd Party/wx/src/jpeg/jerror.h	
+++ b/Source/3rd Party/wx/src/jpeg/jerror.h	
@@ -1,291 +1,291 @@
-/*
- * jerror.h
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the error and message codes for the JPEG library.
- * Edit this file to add new codes, or to translate the message strings to
- * some other language.
- * A set of error-reporting macros are defined too.  Some applications using
- * the JPEG library may wish to include this file to get the error codes
- * and/or the macros.
- */
-
-/*
- * To define the enum list of message codes, include this file without
- * defining macro JMESSAGE.  To create a message string table, include it
- * again with a suitable JMESSAGE definition (see jerror.c for an example).
- */
-#ifndef JMESSAGE
-#ifndef JERROR_H
-/* First time through, define the enum list */
-#define JMAKE_ENUM_LIST
-#else
-/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
-#define JMESSAGE(code,string)
-#endif /* JERROR_H */
-#endif /* JMESSAGE */
-
-#ifdef JMAKE_ENUM_LIST
-
-typedef enum {
-
-#define JMESSAGE(code,string)	code ,
-
-#endif /* JMAKE_ENUM_LIST */
-
-JMESSAGE(JMSG_NOMESSAGE, "Bogus message code %d") /* Must be first entry! */
-
-/* For maintenance convenience, list is alphabetical by message code name */
-JMESSAGE(JERR_ARITH_NOTIMPL,
-	 "Sorry, there are legal restrictions on arithmetic coding")
-JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix")
-JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")
-JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")
-JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")
-JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")
-JMESSAGE(JERR_BAD_DCTSIZE, "IDCT output block size %d not supported")
-JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")
-JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace")
-JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace")
-JMESSAGE(JERR_BAD_LENGTH, "Bogus marker length")
-JMESSAGE(JERR_BAD_LIB_VERSION,
-	 "Wrong JPEG library version: library is %d, caller expects %d")
-JMESSAGE(JERR_BAD_MCU_SIZE, "Sampling factors too large for interleaved scan")
-JMESSAGE(JERR_BAD_POOL_ID, "Invalid memory pool code %d")
-JMESSAGE(JERR_BAD_PRECISION, "Unsupported JPEG data precision %d")
-JMESSAGE(JERR_BAD_PROGRESSION,
-	 "Invalid progressive parameters Ss=%d Se=%d Ah=%d Al=%d")
-JMESSAGE(JERR_BAD_PROG_SCRIPT,
-	 "Invalid progressive parameters at scan script entry %d")
-JMESSAGE(JERR_BAD_SAMPLING, "Bogus sampling factors")
-JMESSAGE(JERR_BAD_SCAN_SCRIPT, "Invalid scan script at entry %d")
-JMESSAGE(JERR_BAD_STATE, "Improper call to JPEG library in state %d")
-JMESSAGE(JERR_BAD_STRUCT_SIZE,
-	 "JPEG parameter struct mismatch: library thinks size is %u, caller expects %u")
-JMESSAGE(JERR_BAD_VIRTUAL_ACCESS, "Bogus virtual array access")
-JMESSAGE(JERR_BUFFER_SIZE, "Buffer passed to JPEG library is too small")
-JMESSAGE(JERR_CANT_SUSPEND, "Suspension not allowed here")
-JMESSAGE(JERR_CCIR601_NOTIMPL, "CCIR601 sampling not implemented yet")
-JMESSAGE(JERR_COMPONENT_COUNT, "Too many color components: %d, max %d")
-JMESSAGE(JERR_CONVERSION_NOTIMPL, "Unsupported color conversion request")
-JMESSAGE(JERR_DAC_INDEX, "Bogus DAC index %d")
-JMESSAGE(JERR_DAC_VALUE, "Bogus DAC value 0x%x")
-JMESSAGE(JERR_DHT_INDEX, "Bogus DHT index %d")
-JMESSAGE(JERR_DQT_INDEX, "Bogus DQT index %d")
-JMESSAGE(JERR_EMPTY_IMAGE, "Empty JPEG image (DNL not supported)")
-JMESSAGE(JERR_EMS_READ, "Read from EMS failed")
-JMESSAGE(JERR_EMS_WRITE, "Write to EMS failed")
-JMESSAGE(JERR_EOI_EXPECTED, "Didn't expect more than one scan")
-JMESSAGE(JERR_FILE_READ, "Input file read error")
-JMESSAGE(JERR_FILE_WRITE, "Output file write error --- out of disk space?")
-JMESSAGE(JERR_FRACT_SAMPLE_NOTIMPL, "Fractional sampling not implemented yet")
-JMESSAGE(JERR_HUFF_CLEN_OVERFLOW, "Huffman code size table overflow")
-JMESSAGE(JERR_HUFF_MISSING_CODE, "Missing Huffman code table entry")
-JMESSAGE(JERR_IMAGE_TOO_BIG, "Maximum supported image dimension is %u pixels")
-JMESSAGE(JERR_INPUT_EMPTY, "Empty input file")
-JMESSAGE(JERR_INPUT_EOF, "Premature end of input file")
-JMESSAGE(JERR_MISMATCHED_QUANT_TABLE,
-	 "Cannot transcode due to multiple use of quantization table %d")
-JMESSAGE(JERR_MISSING_DATA, "Scan script does not transmit all data")
-JMESSAGE(JERR_MODE_CHANGE, "Invalid color quantization mode change")
-JMESSAGE(JERR_NOTIMPL, "Not implemented yet")
-JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time")
-JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported")
-JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined")
-JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image")
-JMESSAGE(JERR_NO_QUANT_TABLE, "Quantization table 0x%02x was not defined")
-JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x")
-JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)")
-JMESSAGE(JERR_QUANT_COMPONENTS,
-	 "Cannot quantize more than %d color components")
-JMESSAGE(JERR_QUANT_FEW_COLORS, "Cannot quantize to fewer than %d colors")
-JMESSAGE(JERR_QUANT_MANY_COLORS, "Cannot quantize to more than %d colors")
-JMESSAGE(JERR_SOF_DUPLICATE, "Invalid JPEG file structure: two SOF markers")
-JMESSAGE(JERR_SOF_NO_SOS, "Invalid JPEG file structure: missing SOS marker")
-JMESSAGE(JERR_SOF_UNSUPPORTED, "Unsupported JPEG process: SOF type 0x%02x")
-JMESSAGE(JERR_SOI_DUPLICATE, "Invalid JPEG file structure: two SOI markers")
-JMESSAGE(JERR_SOS_NO_SOF, "Invalid JPEG file structure: SOS before SOF")
-JMESSAGE(JERR_TFILE_CREATE, "Failed to create temporary file %s")
-JMESSAGE(JERR_TFILE_READ, "Read failed on temporary file")
-JMESSAGE(JERR_TFILE_SEEK, "Seek failed on temporary file")
-JMESSAGE(JERR_TFILE_WRITE,
-	 "Write failed on temporary file --- out of disk space?")
-JMESSAGE(JERR_TOO_LITTLE_DATA, "Application transferred too few scanlines")
-JMESSAGE(JERR_UNKNOWN_MARKER, "Unsupported marker type 0x%02x")
-JMESSAGE(JERR_VIRTUAL_BUG, "Virtual array controller messed up")
-JMESSAGE(JERR_WIDTH_OVERFLOW, "Image too wide for this implementation")
-JMESSAGE(JERR_XMS_READ, "Read from XMS failed")
-JMESSAGE(JERR_XMS_WRITE, "Write to XMS failed")
-JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)
-JMESSAGE(JMSG_VERSION, JVERSION)
-JMESSAGE(JTRC_16BIT_TABLES,
-	 "Caution: quantization tables are too coarse for baseline JPEG")
-JMESSAGE(JTRC_ADOBE,
-	 "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
-JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")
-JMESSAGE(JTRC_APP14, "Unknown APP14 marker (not Adobe), length %u")
-JMESSAGE(JTRC_DAC, "Define Arithmetic Table 0x%02x: 0x%02x")
-JMESSAGE(JTRC_DHT, "Define Huffman Table 0x%02x")
-JMESSAGE(JTRC_DQT, "Define Quantization Table %d  precision %d")
-JMESSAGE(JTRC_DRI, "Define Restart Interval %u")
-JMESSAGE(JTRC_EMS_CLOSE, "Freed EMS handle %u")
-JMESSAGE(JTRC_EMS_OPEN, "Obtained EMS handle %u")
-JMESSAGE(JTRC_EOI, "End Of Image")
-JMESSAGE(JTRC_HUFFBITS, "        %3d %3d %3d %3d %3d %3d %3d %3d")
-JMESSAGE(JTRC_JFIF, "JFIF APP0 marker: version %d.%02d, density %dx%d  %d")
-JMESSAGE(JTRC_JFIF_BADTHUMBNAILSIZE,
-	 "Warning: thumbnail image size does not match data length %u")
-JMESSAGE(JTRC_JFIF_EXTENSION,
-	 "JFIF extension marker: type 0x%02x, length %u")
-JMESSAGE(JTRC_JFIF_THUMBNAIL, "    with %d x %d thumbnail image")
-JMESSAGE(JTRC_MISC_MARKER, "Miscellaneous marker 0x%02x, length %u")
-JMESSAGE(JTRC_PARMLESS_MARKER, "Unexpected marker 0x%02x")
-JMESSAGE(JTRC_QUANTVALS, "        %4u %4u %4u %4u %4u %4u %4u %4u")
-JMESSAGE(JTRC_QUANT_3_NCOLORS, "Quantizing to %d = %d*%d*%d colors")
-JMESSAGE(JTRC_QUANT_NCOLORS, "Quantizing to %d colors")
-JMESSAGE(JTRC_QUANT_SELECTED, "Selected %d colors for quantization")
-JMESSAGE(JTRC_RECOVERY_ACTION, "At marker 0x%02x, recovery action %d")
-JMESSAGE(JTRC_RST, "RST%d")
-JMESSAGE(JTRC_SMOOTH_NOTIMPL,
-	 "Smoothing not supported with nonstandard sampling ratios")
-JMESSAGE(JTRC_SOF, "Start Of Frame 0x%02x: width=%u, height=%u, components=%d")
-JMESSAGE(JTRC_SOF_COMPONENT, "    Component %d: %dhx%dv q=%d")
-JMESSAGE(JTRC_SOI, "Start of Image")
-JMESSAGE(JTRC_SOS, "Start Of Scan: %d components")
-JMESSAGE(JTRC_SOS_COMPONENT, "    Component %d: dc=%d ac=%d")
-JMESSAGE(JTRC_SOS_PARAMS, "  Ss=%d, Se=%d, Ah=%d, Al=%d")
-JMESSAGE(JTRC_TFILE_CLOSE, "Closed temporary file %s")
-JMESSAGE(JTRC_TFILE_OPEN, "Opened temporary file %s")
-JMESSAGE(JTRC_THUMB_JPEG,
-	 "JFIF extension marker: JPEG-compressed thumbnail image, length %u")
-JMESSAGE(JTRC_THUMB_PALETTE,
-	 "JFIF extension marker: palette thumbnail image, length %u")
-JMESSAGE(JTRC_THUMB_RGB,
-	 "JFIF extension marker: RGB thumbnail image, length %u")
-JMESSAGE(JTRC_UNKNOWN_IDS,
-	 "Unrecognized component IDs %d %d %d, assuming YCbCr")
-JMESSAGE(JTRC_XMS_CLOSE, "Freed XMS handle %u")
-JMESSAGE(JTRC_XMS_OPEN, "Obtained XMS handle %u")
-JMESSAGE(JWRN_ADOBE_XFORM, "Unknown Adobe color transform code %d")
-JMESSAGE(JWRN_BOGUS_PROGRESSION,
-	 "Inconsistent progression sequence for component %d coefficient %d")
-JMESSAGE(JWRN_EXTRANEOUS_DATA,
-	 "Corrupt JPEG data: %u extraneous bytes before marker 0x%02x")
-JMESSAGE(JWRN_HIT_MARKER, "Corrupt JPEG data: premature end of data segment")
-JMESSAGE(JWRN_HUFF_BAD_CODE, "Corrupt JPEG data: bad Huffman code")
-JMESSAGE(JWRN_JFIF_MAJOR, "Warning: unknown JFIF revision number %d.%02d")
-JMESSAGE(JWRN_JPEG_EOF, "Premature end of JPEG file")
-JMESSAGE(JWRN_MUST_RESYNC,
-	 "Corrupt JPEG data: found marker 0x%02x instead of RST%d")
-JMESSAGE(JWRN_NOT_SEQUENTIAL, "Invalid SOS parameters for sequential JPEG")
-JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines")
-
-#ifdef JMAKE_ENUM_LIST
-
-  JMSG_LASTMSGCODE
-} J_MESSAGE_CODE;
-
-#undef JMAKE_ENUM_LIST
-#endif /* JMAKE_ENUM_LIST */
-
-/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
-#undef JMESSAGE
-
-
-#ifndef JERROR_H
-#define JERROR_H
-
-/* Macros to simplify using the error and trace message stuff */
-/* The first parameter is either type of cinfo pointer */
-
-/* Fatal errors (print message and exit) */
-#define ERREXIT(cinfo,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT1(cinfo,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT2(cinfo,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT3(cinfo,code,p1,p2,p3)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (cinfo)->err->msg_parm.i[2] = (p3), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT4(cinfo,code,p1,p2,p3,p4)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (cinfo)->err->msg_parm.i[2] = (p3), \
-   (cinfo)->err->msg_parm.i[3] = (p4), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXITS(cinfo,code,str)  \
-  ((cinfo)->err->msg_code = (code), \
-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-
-#define MAKESTMT(stuff)		do { stuff } while (0)
-
-/* Nonfatal errors (we can keep going, but the data is probably corrupt) */
-#define WARNMS(cinfo,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-#define WARNMS1(cinfo,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-#define WARNMS2(cinfo,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-
-/* Informational/debugging messages */
-#define TRACEMS(cinfo,lvl,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS1(cinfo,lvl,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS2(cinfo,lvl,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS3(cinfo,lvl,code,p1,p2,p3)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS4(cinfo,lvl,code,p1,p2,p3,p4)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS5(cinfo,lvl,code,p1,p2,p3,p4,p5)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   _mp[4] = (p5); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS8(cinfo,lvl,code,p1,p2,p3,p4,p5,p6,p7,p8)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   _mp[4] = (p5); _mp[5] = (p6); _mp[6] = (p7); _mp[7] = (p8); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMSS(cinfo,lvl,code,str)  \
-  ((cinfo)->err->msg_code = (code), \
-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-
-#endif /* JERROR_H */
+/*
+ * jerror.h
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file defines the error and message codes for the JPEG library.
+ * Edit this file to add new codes, or to translate the message strings to
+ * some other language.
+ * A set of error-reporting macros are defined too.  Some applications using
+ * the JPEG library may wish to include this file to get the error codes
+ * and/or the macros.
+ */
+
+/*
+ * To define the enum list of message codes, include this file without
+ * defining macro JMESSAGE.  To create a message string table, include it
+ * again with a suitable JMESSAGE definition (see jerror.c for an example).
+ */
+#ifndef JMESSAGE
+#ifndef JERROR_H
+/* First time through, define the enum list */
+#define JMAKE_ENUM_LIST
+#else
+/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
+#define JMESSAGE(code,string)
+#endif /* JERROR_H */
+#endif /* JMESSAGE */
+
+#ifdef JMAKE_ENUM_LIST
+
+typedef enum {
+
+#define JMESSAGE(code,string)	code ,
+
+#endif /* JMAKE_ENUM_LIST */
+
+JMESSAGE(JMSG_NOMESSAGE, "Bogus message code %d") /* Must be first entry! */
+
+/* For maintenance convenience, list is alphabetical by message code name */
+JMESSAGE(JERR_ARITH_NOTIMPL,
+	 "Sorry, there are legal restrictions on arithmetic coding")
+JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix")
+JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")
+JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")
+JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")
+JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")
+JMESSAGE(JERR_BAD_DCTSIZE, "IDCT output block size %d not supported")
+JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")
+JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace")
+JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace")
+JMESSAGE(JERR_BAD_LENGTH, "Bogus marker length")
+JMESSAGE(JERR_BAD_LIB_VERSION,
+	 "Wrong JPEG library version: library is %d, caller expects %d")
+JMESSAGE(JERR_BAD_MCU_SIZE, "Sampling factors too large for interleaved scan")
+JMESSAGE(JERR_BAD_POOL_ID, "Invalid memory pool code %d")
+JMESSAGE(JERR_BAD_PRECISION, "Unsupported JPEG data precision %d")
+JMESSAGE(JERR_BAD_PROGRESSION,
+	 "Invalid progressive parameters Ss=%d Se=%d Ah=%d Al=%d")
+JMESSAGE(JERR_BAD_PROG_SCRIPT,
+	 "Invalid progressive parameters at scan script entry %d")
+JMESSAGE(JERR_BAD_SAMPLING, "Bogus sampling factors")
+JMESSAGE(JERR_BAD_SCAN_SCRIPT, "Invalid scan script at entry %d")
+JMESSAGE(JERR_BAD_STATE, "Improper call to JPEG library in state %d")
+JMESSAGE(JERR_BAD_STRUCT_SIZE,
+	 "JPEG parameter struct mismatch: library thinks size is %u, caller expects %u")
+JMESSAGE(JERR_BAD_VIRTUAL_ACCESS, "Bogus virtual array access")
+JMESSAGE(JERR_BUFFER_SIZE, "Buffer passed to JPEG library is too small")
+JMESSAGE(JERR_CANT_SUSPEND, "Suspension not allowed here")
+JMESSAGE(JERR_CCIR601_NOTIMPL, "CCIR601 sampling not implemented yet")
+JMESSAGE(JERR_COMPONENT_COUNT, "Too many color components: %d, max %d")
+JMESSAGE(JERR_CONVERSION_NOTIMPL, "Unsupported color conversion request")
+JMESSAGE(JERR_DAC_INDEX, "Bogus DAC index %d")
+JMESSAGE(JERR_DAC_VALUE, "Bogus DAC value 0x%x")
+JMESSAGE(JERR_DHT_INDEX, "Bogus DHT index %d")
+JMESSAGE(JERR_DQT_INDEX, "Bogus DQT index %d")
+JMESSAGE(JERR_EMPTY_IMAGE, "Empty JPEG image (DNL not supported)")
+JMESSAGE(JERR_EMS_READ, "Read from EMS failed")
+JMESSAGE(JERR_EMS_WRITE, "Write to EMS failed")
+JMESSAGE(JERR_EOI_EXPECTED, "Didn't expect more than one scan")
+JMESSAGE(JERR_FILE_READ, "Input file read error")
+JMESSAGE(JERR_FILE_WRITE, "Output file write error --- out of disk space?")
+JMESSAGE(JERR_FRACT_SAMPLE_NOTIMPL, "Fractional sampling not implemented yet")
+JMESSAGE(JERR_HUFF_CLEN_OVERFLOW, "Huffman code size table overflow")
+JMESSAGE(JERR_HUFF_MISSING_CODE, "Missing Huffman code table entry")
+JMESSAGE(JERR_IMAGE_TOO_BIG, "Maximum supported image dimension is %u pixels")
+JMESSAGE(JERR_INPUT_EMPTY, "Empty input file")
+JMESSAGE(JERR_INPUT_EOF, "Premature end of input file")
+JMESSAGE(JERR_MISMATCHED_QUANT_TABLE,
+	 "Cannot transcode due to multiple use of quantization table %d")
+JMESSAGE(JERR_MISSING_DATA, "Scan script does not transmit all data")
+JMESSAGE(JERR_MODE_CHANGE, "Invalid color quantization mode change")
+JMESSAGE(JERR_NOTIMPL, "Not implemented yet")
+JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time")
+JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported")
+JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined")
+JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image")
+JMESSAGE(JERR_NO_QUANT_TABLE, "Quantization table 0x%02x was not defined")
+JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x")
+JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)")
+JMESSAGE(JERR_QUANT_COMPONENTS,
+	 "Cannot quantize more than %d color components")
+JMESSAGE(JERR_QUANT_FEW_COLORS, "Cannot quantize to fewer than %d colors")
+JMESSAGE(JERR_QUANT_MANY_COLORS, "Cannot quantize to more than %d colors")
+JMESSAGE(JERR_SOF_DUPLICATE, "Invalid JPEG file structure: two SOF markers")
+JMESSAGE(JERR_SOF_NO_SOS, "Invalid JPEG file structure: missing SOS marker")
+JMESSAGE(JERR_SOF_UNSUPPORTED, "Unsupported JPEG process: SOF type 0x%02x")
+JMESSAGE(JERR_SOI_DUPLICATE, "Invalid JPEG file structure: two SOI markers")
+JMESSAGE(JERR_SOS_NO_SOF, "Invalid JPEG file structure: SOS before SOF")
+JMESSAGE(JERR_TFILE_CREATE, "Failed to create temporary file %s")
+JMESSAGE(JERR_TFILE_READ, "Read failed on temporary file")
+JMESSAGE(JERR_TFILE_SEEK, "Seek failed on temporary file")
+JMESSAGE(JERR_TFILE_WRITE,
+	 "Write failed on temporary file --- out of disk space?")
+JMESSAGE(JERR_TOO_LITTLE_DATA, "Application transferred too few scanlines")
+JMESSAGE(JERR_UNKNOWN_MARKER, "Unsupported marker type 0x%02x")
+JMESSAGE(JERR_VIRTUAL_BUG, "Virtual array controller messed up")
+JMESSAGE(JERR_WIDTH_OVERFLOW, "Image too wide for this implementation")
+JMESSAGE(JERR_XMS_READ, "Read from XMS failed")
+JMESSAGE(JERR_XMS_WRITE, "Write to XMS failed")
+JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)
+JMESSAGE(JMSG_VERSION, JVERSION)
+JMESSAGE(JTRC_16BIT_TABLES,
+	 "Caution: quantization tables are too coarse for baseline JPEG")
+JMESSAGE(JTRC_ADOBE,
+	 "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
+JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")
+JMESSAGE(JTRC_APP14, "Unknown APP14 marker (not Adobe), length %u")
+JMESSAGE(JTRC_DAC, "Define Arithmetic Table 0x%02x: 0x%02x")
+JMESSAGE(JTRC_DHT, "Define Huffman Table 0x%02x")
+JMESSAGE(JTRC_DQT, "Define Quantization Table %d  precision %d")
+JMESSAGE(JTRC_DRI, "Define Restart Interval %u")
+JMESSAGE(JTRC_EMS_CLOSE, "Freed EMS handle %u")
+JMESSAGE(JTRC_EMS_OPEN, "Obtained EMS handle %u")
+JMESSAGE(JTRC_EOI, "End Of Image")
+JMESSAGE(JTRC_HUFFBITS, "        %3d %3d %3d %3d %3d %3d %3d %3d")
+JMESSAGE(JTRC_JFIF, "JFIF APP0 marker: version %d.%02d, density %dx%d  %d")
+JMESSAGE(JTRC_JFIF_BADTHUMBNAILSIZE,
+	 "Warning: thumbnail image size does not match data length %u")
+JMESSAGE(JTRC_JFIF_EXTENSION,
+	 "JFIF extension marker: type 0x%02x, length %u")
+JMESSAGE(JTRC_JFIF_THUMBNAIL, "    with %d x %d thumbnail image")
+JMESSAGE(JTRC_MISC_MARKER, "Miscellaneous marker 0x%02x, length %u")
+JMESSAGE(JTRC_PARMLESS_MARKER, "Unexpected marker 0x%02x")
+JMESSAGE(JTRC_QUANTVALS, "        %4u %4u %4u %4u %4u %4u %4u %4u")
+JMESSAGE(JTRC_QUANT_3_NCOLORS, "Quantizing to %d = %d*%d*%d colors")
+JMESSAGE(JTRC_QUANT_NCOLORS, "Quantizing to %d colors")
+JMESSAGE(JTRC_QUANT_SELECTED, "Selected %d colors for quantization")
+JMESSAGE(JTRC_RECOVERY_ACTION, "At marker 0x%02x, recovery action %d")
+JMESSAGE(JTRC_RST, "RST%d")
+JMESSAGE(JTRC_SMOOTH_NOTIMPL,
+	 "Smoothing not supported with nonstandard sampling ratios")
+JMESSAGE(JTRC_SOF, "Start Of Frame 0x%02x: width=%u, height=%u, components=%d")
+JMESSAGE(JTRC_SOF_COMPONENT, "    Component %d: %dhx%dv q=%d")
+JMESSAGE(JTRC_SOI, "Start of Image")
+JMESSAGE(JTRC_SOS, "Start Of Scan: %d components")
+JMESSAGE(JTRC_SOS_COMPONENT, "    Component %d: dc=%d ac=%d")
+JMESSAGE(JTRC_SOS_PARAMS, "  Ss=%d, Se=%d, Ah=%d, Al=%d")
+JMESSAGE(JTRC_TFILE_CLOSE, "Closed temporary file %s")
+JMESSAGE(JTRC_TFILE_OPEN, "Opened temporary file %s")
+JMESSAGE(JTRC_THUMB_JPEG,
+	 "JFIF extension marker: JPEG-compressed thumbnail image, length %u")
+JMESSAGE(JTRC_THUMB_PALETTE,
+	 "JFIF extension marker: palette thumbnail image, length %u")
+JMESSAGE(JTRC_THUMB_RGB,
+	 "JFIF extension marker: RGB thumbnail image, length %u")
+JMESSAGE(JTRC_UNKNOWN_IDS,
+	 "Unrecognized component IDs %d %d %d, assuming YCbCr")
+JMESSAGE(JTRC_XMS_CLOSE, "Freed XMS handle %u")
+JMESSAGE(JTRC_XMS_OPEN, "Obtained XMS handle %u")
+JMESSAGE(JWRN_ADOBE_XFORM, "Unknown Adobe color transform code %d")
+JMESSAGE(JWRN_BOGUS_PROGRESSION,
+	 "Inconsistent progression sequence for component %d coefficient %d")
+JMESSAGE(JWRN_EXTRANEOUS_DATA,
+	 "Corrupt JPEG data: %u extraneous bytes before marker 0x%02x")
+JMESSAGE(JWRN_HIT_MARKER, "Corrupt JPEG data: premature end of data segment")
+JMESSAGE(JWRN_HUFF_BAD_CODE, "Corrupt JPEG data: bad Huffman code")
+JMESSAGE(JWRN_JFIF_MAJOR, "Warning: unknown JFIF revision number %d.%02d")
+JMESSAGE(JWRN_JPEG_EOF, "Premature end of JPEG file")
+JMESSAGE(JWRN_MUST_RESYNC,
+	 "Corrupt JPEG data: found marker 0x%02x instead of RST%d")
+JMESSAGE(JWRN_NOT_SEQUENTIAL, "Invalid SOS parameters for sequential JPEG")
+JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines")
+
+#ifdef JMAKE_ENUM_LIST
+
+  JMSG_LASTMSGCODE
+} J_MESSAGE_CODE;
+
+#undef JMAKE_ENUM_LIST
+#endif /* JMAKE_ENUM_LIST */
+
+/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
+#undef JMESSAGE
+
+
+#ifndef JERROR_H
+#define JERROR_H
+
+/* Macros to simplify using the error and trace message stuff */
+/* The first parameter is either type of cinfo pointer */
+
+/* Fatal errors (print message and exit) */
+#define ERREXIT(cinfo,code)  \
+  ((cinfo)->err->msg_code = (code), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT1(cinfo,code,p1)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT2(cinfo,code,p1,p2)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT3(cinfo,code,p1,p2,p3)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (cinfo)->err->msg_parm.i[2] = (p3), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT4(cinfo,code,p1,p2,p3,p4)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (cinfo)->err->msg_parm.i[2] = (p3), \
+   (cinfo)->err->msg_parm.i[3] = (p4), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXITS(cinfo,code,str)  \
+  ((cinfo)->err->msg_code = (code), \
+   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+
+#define MAKESTMT(stuff)		do { stuff } while (0)
+
+/* Nonfatal errors (we can keep going, but the data is probably corrupt) */
+#define WARNMS(cinfo,code)  \
+  ((cinfo)->err->msg_code = (code), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
+#define WARNMS1(cinfo,code,p1)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
+#define WARNMS2(cinfo,code,p1,p2)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
+
+/* Informational/debugging messages */
+#define TRACEMS(cinfo,lvl,code)  \
+  ((cinfo)->err->msg_code = (code), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+#define TRACEMS1(cinfo,lvl,code,p1)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+#define TRACEMS2(cinfo,lvl,code,p1,p2)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+#define TRACEMS3(cinfo,lvl,code,p1,p2,p3)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMS4(cinfo,lvl,code,p1,p2,p3,p4)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMS5(cinfo,lvl,code,p1,p2,p3,p4,p5)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+	   _mp[4] = (p5); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMS8(cinfo,lvl,code,p1,p2,p3,p4,p5,p6,p7,p8)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+	   _mp[4] = (p5); _mp[5] = (p6); _mp[6] = (p7); _mp[7] = (p8); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMSS(cinfo,lvl,code,str)  \
+  ((cinfo)->err->msg_code = (code), \
+   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+
+#endif /* JERROR_H */
diff --git a/Source/3rd Party/wx/src/jpeg/jfdctflt.c b/Source/3rd Party/wx/src/jpeg/jfdctflt.c
index 7ccfb3802..79d7a0078 100644
--- a/Source/3rd Party/wx/src/jpeg/jfdctflt.c	
+++ b/Source/3rd Party/wx/src/jpeg/jfdctflt.c	
@@ -1,168 +1,168 @@
-/*
- * jfdctflt.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a floating-point implementation of the
- * forward DCT (Discrete Cosine Transform).
- *
- * This implementation should be more accurate than either of the integer
- * DCT implementations.  However, it may not give the same results on all
- * machines because of differences in roundoff behavior.  Speed will depend
- * on the hardware's floating point capacity.
- *
- * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
- * on each column.  Direct algorithms are also available, but they are
- * much more complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on Arai, Agui, and Nakajima's algorithm for
- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
- * Japanese, but the algorithm is described in the Pennebaker & Mitchell
- * JPEG textbook (see REFERENCES section in file README).  The following code
- * is based directly on figure 4-8 in P&M.
- * While an 8-point DCT cannot be done in less than 11 multiplies, it is
- * possible to arrange the computation so that many of the multiplies are
- * simple scalings of the final outputs.  These multiplies can then be
- * folded into the multiplications or divisions by the JPEG quantization
- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
- * to be done in the DCT itself.
- * The primary disadvantage of this method is that with a fixed-point
- * implementation, accuracy is lost due to imprecise representation of the
- * scaled quantization values.  However, that problem does not arise if
- * we use floating point arithmetic.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_FLOAT_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/*
- * Perform the forward DCT on one block of samples.
- */
-
-GLOBAL(void)
-jpeg_fdct_float (FAST_FLOAT * data)
-{
-  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;
-  FAST_FLOAT z1, z2, z3, z4, z5, z11, z13;
-  FAST_FLOAT *dataptr;
-  int ctr;
-
-  /* Pass 1: process rows. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[0] + dataptr[7];
-    tmp7 = dataptr[0] - dataptr[7];
-    tmp1 = dataptr[1] + dataptr[6];
-    tmp6 = dataptr[1] - dataptr[6];
-    tmp2 = dataptr[2] + dataptr[5];
-    tmp5 = dataptr[2] - dataptr[5];
-    tmp3 = dataptr[3] + dataptr[4];
-    tmp4 = dataptr[3] - dataptr[4];
-    
-    /* Even part */
-    
-    tmp10 = tmp0 + tmp3;	/* phase 2 */
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[0] = tmp10 + tmp11; /* phase 3 */
-    dataptr[4] = tmp10 - tmp11;
-    
-    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */
-    dataptr[2] = tmp13 + z1;	/* phase 5 */
-    dataptr[6] = tmp13 - z1;
-    
-    /* Odd part */
-
-    tmp10 = tmp4 + tmp5;	/* phase 2 */
-    tmp11 = tmp5 + tmp6;
-    tmp12 = tmp6 + tmp7;
-
-    /* The rotator is modified from fig 4-8 to avoid extra negations. */
-    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */
-    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */
-    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */
-    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */
-
-    z11 = tmp7 + z3;		/* phase 5 */
-    z13 = tmp7 - z3;
-
-    dataptr[5] = z13 + z2;	/* phase 6 */
-    dataptr[3] = z13 - z2;
-    dataptr[1] = z11 + z4;
-    dataptr[7] = z11 - z4;
-
-    dataptr += DCTSIZE;		/* advance pointer to next row */
-  }
-
-  /* Pass 2: process columns. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
-    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
-    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
-    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
-    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
-    
-    /* Even part */
-    
-    tmp10 = tmp0 + tmp3;	/* phase 2 */
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */
-    dataptr[DCTSIZE*4] = tmp10 - tmp11;
-    
-    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */
-    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */
-    dataptr[DCTSIZE*6] = tmp13 - z1;
-    
-    /* Odd part */
-
-    tmp10 = tmp4 + tmp5;	/* phase 2 */
-    tmp11 = tmp5 + tmp6;
-    tmp12 = tmp6 + tmp7;
-
-    /* The rotator is modified from fig 4-8 to avoid extra negations. */
-    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */
-    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */
-    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */
-    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */
-
-    z11 = tmp7 + z3;		/* phase 5 */
-    z13 = tmp7 - z3;
-
-    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */
-    dataptr[DCTSIZE*3] = z13 - z2;
-    dataptr[DCTSIZE*1] = z11 + z4;
-    dataptr[DCTSIZE*7] = z11 - z4;
-
-    dataptr++;			/* advance pointer to next column */
-  }
-}
-
-#endif /* DCT_FLOAT_SUPPORTED */
+/*
+ * jfdctflt.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a floating-point implementation of the
+ * forward DCT (Discrete Cosine Transform).
+ *
+ * This implementation should be more accurate than either of the integer
+ * DCT implementations.  However, it may not give the same results on all
+ * machines because of differences in roundoff behavior.  Speed will depend
+ * on the hardware's floating point capacity.
+ *
+ * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
+ * on each column.  Direct algorithms are also available, but they are
+ * much more complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on Arai, Agui, and Nakajima's algorithm for
+ * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
+ * Japanese, but the algorithm is described in the Pennebaker & Mitchell
+ * JPEG textbook (see REFERENCES section in file README).  The following code
+ * is based directly on figure 4-8 in P&M.
+ * While an 8-point DCT cannot be done in less than 11 multiplies, it is
+ * possible to arrange the computation so that many of the multiplies are
+ * simple scalings of the final outputs.  These multiplies can then be
+ * folded into the multiplications or divisions by the JPEG quantization
+ * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
+ * to be done in the DCT itself.
+ * The primary disadvantage of this method is that with a fixed-point
+ * implementation, accuracy is lost due to imprecise representation of the
+ * scaled quantization values.  However, that problem does not arise if
+ * we use floating point arithmetic.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_FLOAT_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/*
+ * Perform the forward DCT on one block of samples.
+ */
+
+GLOBAL(void)
+jpeg_fdct_float (FAST_FLOAT * data)
+{
+  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;
+  FAST_FLOAT z1, z2, z3, z4, z5, z11, z13;
+  FAST_FLOAT *dataptr;
+  int ctr;
+
+  /* Pass 1: process rows. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[0] + dataptr[7];
+    tmp7 = dataptr[0] - dataptr[7];
+    tmp1 = dataptr[1] + dataptr[6];
+    tmp6 = dataptr[1] - dataptr[6];
+    tmp2 = dataptr[2] + dataptr[5];
+    tmp5 = dataptr[2] - dataptr[5];
+    tmp3 = dataptr[3] + dataptr[4];
+    tmp4 = dataptr[3] - dataptr[4];
+    
+    /* Even part */
+    
+    tmp10 = tmp0 + tmp3;	/* phase 2 */
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+    
+    dataptr[0] = tmp10 + tmp11; /* phase 3 */
+    dataptr[4] = tmp10 - tmp11;
+    
+    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */
+    dataptr[2] = tmp13 + z1;	/* phase 5 */
+    dataptr[6] = tmp13 - z1;
+    
+    /* Odd part */
+
+    tmp10 = tmp4 + tmp5;	/* phase 2 */
+    tmp11 = tmp5 + tmp6;
+    tmp12 = tmp6 + tmp7;
+
+    /* The rotator is modified from fig 4-8 to avoid extra negations. */
+    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */
+    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */
+    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */
+    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */
+
+    z11 = tmp7 + z3;		/* phase 5 */
+    z13 = tmp7 - z3;
+
+    dataptr[5] = z13 + z2;	/* phase 6 */
+    dataptr[3] = z13 - z2;
+    dataptr[1] = z11 + z4;
+    dataptr[7] = z11 - z4;
+
+    dataptr += DCTSIZE;		/* advance pointer to next row */
+  }
+
+  /* Pass 2: process columns. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
+    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
+    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
+    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
+    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
+    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
+    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
+    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
+    
+    /* Even part */
+    
+    tmp10 = tmp0 + tmp3;	/* phase 2 */
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+    
+    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */
+    dataptr[DCTSIZE*4] = tmp10 - tmp11;
+    
+    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */
+    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */
+    dataptr[DCTSIZE*6] = tmp13 - z1;
+    
+    /* Odd part */
+
+    tmp10 = tmp4 + tmp5;	/* phase 2 */
+    tmp11 = tmp5 + tmp6;
+    tmp12 = tmp6 + tmp7;
+
+    /* The rotator is modified from fig 4-8 to avoid extra negations. */
+    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */
+    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */
+    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */
+    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */
+
+    z11 = tmp7 + z3;		/* phase 5 */
+    z13 = tmp7 - z3;
+
+    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */
+    dataptr[DCTSIZE*3] = z13 - z2;
+    dataptr[DCTSIZE*1] = z11 + z4;
+    dataptr[DCTSIZE*7] = z11 - z4;
+
+    dataptr++;			/* advance pointer to next column */
+  }
+}
+
+#endif /* DCT_FLOAT_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jfdctfst.c b/Source/3rd Party/wx/src/jpeg/jfdctfst.c
index b503b1d3c..37900ec90 100644
--- a/Source/3rd Party/wx/src/jpeg/jfdctfst.c	
+++ b/Source/3rd Party/wx/src/jpeg/jfdctfst.c	
@@ -1,224 +1,224 @@
-/*
- * jfdctfst.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a fast, not so accurate integer implementation of the
- * forward DCT (Discrete Cosine Transform).
- *
- * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
- * on each column.  Direct algorithms are also available, but they are
- * much more complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on Arai, Agui, and Nakajima's algorithm for
- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
- * Japanese, but the algorithm is described in the Pennebaker & Mitchell
- * JPEG textbook (see REFERENCES section in file README).  The following code
- * is based directly on figure 4-8 in P&M.
- * While an 8-point DCT cannot be done in less than 11 multiplies, it is
- * possible to arrange the computation so that many of the multiplies are
- * simple scalings of the final outputs.  These multiplies can then be
- * folded into the multiplications or divisions by the JPEG quantization
- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
- * to be done in the DCT itself.
- * The primary disadvantage of this method is that with fixed-point math,
- * accuracy is lost due to imprecise representation of the scaled
- * quantization values.  The smaller the quantization table entry, the less
- * precise the scaled value, so this implementation does worse with high-
- * quality-setting files than with low-quality ones.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_IFAST_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/* Scaling decisions are generally the same as in the LL&M algorithm;
- * see jfdctint.c for more details.  However, we choose to descale
- * (right shift) multiplication products as soon as they are formed,
- * rather than carrying additional fractional bits into subsequent additions.
- * This compromises accuracy slightly, but it lets us save a few shifts.
- * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)
- * everywhere except in the multiplications proper; this saves a good deal
- * of work on 16-bit-int machines.
- *
- * Again to save a few shifts, the intermediate results between pass 1 and
- * pass 2 are not upscaled, but are represented only to integral precision.
- *
- * A final compromise is to represent the multiplicative constants to only
- * 8 fractional bits, rather than 13.  This saves some shifting work on some
- * machines, and may also reduce the cost of multiplication (since there
- * are fewer one-bits in the constants).
- */
-
-#define CONST_BITS  8
-
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 8
-#define FIX_0_382683433  ((JPEG_INT32)   98)		/* FIX(0.382683433) */
-#define FIX_0_541196100  ((JPEG_INT32)  139)		/* FIX(0.541196100) */
-#define FIX_0_707106781  ((JPEG_INT32)  181)		/* FIX(0.707106781) */
-#define FIX_1_306562965  ((JPEG_INT32)  334)		/* FIX(1.306562965) */
-#else
-#define FIX_0_382683433  FIX(0.382683433)
-#define FIX_0_541196100  FIX(0.541196100)
-#define FIX_0_707106781  FIX(0.707106781)
-#define FIX_1_306562965  FIX(1.306562965)
-#endif
-
-
-/* We can gain a little more speed, with a further compromise in accuracy,
- * by omitting the addition in a descaling shift.  This yields an incorrectly
- * rounded result half the time...
- */
-
-#ifndef USE_ACCURATE_ROUNDING
-#undef DESCALE
-#define DESCALE(x,n)  RIGHT_SHIFT(x, n)
-#endif
-
-
-/* Multiply a DCTELEM variable by an INT32 constant, and immediately
- * descale to yield a DCTELEM result.
- */
-
-#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
-
-
-/*
- * Perform the forward DCT on one block of samples.
- */
-
-GLOBAL(void)
-jpeg_fdct_ifast (DCTELEM * data)
-{
-  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  DCTELEM tmp10, tmp11, tmp12, tmp13;
-  DCTELEM z1, z2, z3, z4, z5, z11, z13;
-  DCTELEM *dataptr;
-  int ctr;
-  SHIFT_TEMPS
-
-  /* Pass 1: process rows. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[0] + dataptr[7];
-    tmp7 = dataptr[0] - dataptr[7];
-    tmp1 = dataptr[1] + dataptr[6];
-    tmp6 = dataptr[1] - dataptr[6];
-    tmp2 = dataptr[2] + dataptr[5];
-    tmp5 = dataptr[2] - dataptr[5];
-    tmp3 = dataptr[3] + dataptr[4];
-    tmp4 = dataptr[3] - dataptr[4];
-    
-    /* Even part */
-    
-    tmp10 = tmp0 + tmp3;	/* phase 2 */
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[0] = tmp10 + tmp11; /* phase 3 */
-    dataptr[4] = tmp10 - tmp11;
-    
-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
-    dataptr[2] = tmp13 + z1;	/* phase 5 */
-    dataptr[6] = tmp13 - z1;
-    
-    /* Odd part */
-
-    tmp10 = tmp4 + tmp5;	/* phase 2 */
-    tmp11 = tmp5 + tmp6;
-    tmp12 = tmp6 + tmp7;
-
-    /* The rotator is modified from fig 4-8 to avoid extra negations. */
-    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */
-    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */
-    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */
-    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */
-
-    z11 = tmp7 + z3;		/* phase 5 */
-    z13 = tmp7 - z3;
-
-    dataptr[5] = z13 + z2;	/* phase 6 */
-    dataptr[3] = z13 - z2;
-    dataptr[1] = z11 + z4;
-    dataptr[7] = z11 - z4;
-
-    dataptr += DCTSIZE;		/* advance pointer to next row */
-  }
-
-  /* Pass 2: process columns. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
-    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
-    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
-    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
-    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
-    
-    /* Even part */
-    
-    tmp10 = tmp0 + tmp3;	/* phase 2 */
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */
-    dataptr[DCTSIZE*4] = tmp10 - tmp11;
-    
-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
-    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */
-    dataptr[DCTSIZE*6] = tmp13 - z1;
-    
-    /* Odd part */
-
-    tmp10 = tmp4 + tmp5;	/* phase 2 */
-    tmp11 = tmp5 + tmp6;
-    tmp12 = tmp6 + tmp7;
-
-    /* The rotator is modified from fig 4-8 to avoid extra negations. */
-    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */
-    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */
-    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */
-    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */
-
-    z11 = tmp7 + z3;		/* phase 5 */
-    z13 = tmp7 - z3;
-
-    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */
-    dataptr[DCTSIZE*3] = z13 - z2;
-    dataptr[DCTSIZE*1] = z11 + z4;
-    dataptr[DCTSIZE*7] = z11 - z4;
-
-    dataptr++;			/* advance pointer to next column */
-  }
-}
-
-#endif /* DCT_IFAST_SUPPORTED */
+/*
+ * jfdctfst.c
+ *
+ * Copyright (C) 1994-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a fast, not so accurate integer implementation of the
+ * forward DCT (Discrete Cosine Transform).
+ *
+ * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
+ * on each column.  Direct algorithms are also available, but they are
+ * much more complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on Arai, Agui, and Nakajima's algorithm for
+ * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
+ * Japanese, but the algorithm is described in the Pennebaker & Mitchell
+ * JPEG textbook (see REFERENCES section in file README).  The following code
+ * is based directly on figure 4-8 in P&M.
+ * While an 8-point DCT cannot be done in less than 11 multiplies, it is
+ * possible to arrange the computation so that many of the multiplies are
+ * simple scalings of the final outputs.  These multiplies can then be
+ * folded into the multiplications or divisions by the JPEG quantization
+ * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
+ * to be done in the DCT itself.
+ * The primary disadvantage of this method is that with fixed-point math,
+ * accuracy is lost due to imprecise representation of the scaled
+ * quantization values.  The smaller the quantization table entry, the less
+ * precise the scaled value, so this implementation does worse with high-
+ * quality-setting files than with low-quality ones.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_IFAST_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/* Scaling decisions are generally the same as in the LL&M algorithm;
+ * see jfdctint.c for more details.  However, we choose to descale
+ * (right shift) multiplication products as soon as they are formed,
+ * rather than carrying additional fractional bits into subsequent additions.
+ * This compromises accuracy slightly, but it lets us save a few shifts.
+ * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)
+ * everywhere except in the multiplications proper; this saves a good deal
+ * of work on 16-bit-int machines.
+ *
+ * Again to save a few shifts, the intermediate results between pass 1 and
+ * pass 2 are not upscaled, but are represented only to integral precision.
+ *
+ * A final compromise is to represent the multiplicative constants to only
+ * 8 fractional bits, rather than 13.  This saves some shifting work on some
+ * machines, and may also reduce the cost of multiplication (since there
+ * are fewer one-bits in the constants).
+ */
+
+#define CONST_BITS  8
+
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 8
+#define FIX_0_382683433  ((JPEG_INT32)   98)		/* FIX(0.382683433) */
+#define FIX_0_541196100  ((JPEG_INT32)  139)		/* FIX(0.541196100) */
+#define FIX_0_707106781  ((JPEG_INT32)  181)		/* FIX(0.707106781) */
+#define FIX_1_306562965  ((JPEG_INT32)  334)		/* FIX(1.306562965) */
+#else
+#define FIX_0_382683433  FIX(0.382683433)
+#define FIX_0_541196100  FIX(0.541196100)
+#define FIX_0_707106781  FIX(0.707106781)
+#define FIX_1_306562965  FIX(1.306562965)
+#endif
+
+
+/* We can gain a little more speed, with a further compromise in accuracy,
+ * by omitting the addition in a descaling shift.  This yields an incorrectly
+ * rounded result half the time...
+ */
+
+#ifndef USE_ACCURATE_ROUNDING
+#undef DESCALE
+#define DESCALE(x,n)  RIGHT_SHIFT(x, n)
+#endif
+
+
+/* Multiply a DCTELEM variable by an INT32 constant, and immediately
+ * descale to yield a DCTELEM result.
+ */
+
+#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
+
+
+/*
+ * Perform the forward DCT on one block of samples.
+ */
+
+GLOBAL(void)
+jpeg_fdct_ifast (DCTELEM * data)
+{
+  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  DCTELEM tmp10, tmp11, tmp12, tmp13;
+  DCTELEM z1, z2, z3, z4, z5, z11, z13;
+  DCTELEM *dataptr;
+  int ctr;
+  SHIFT_TEMPS
+
+  /* Pass 1: process rows. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[0] + dataptr[7];
+    tmp7 = dataptr[0] - dataptr[7];
+    tmp1 = dataptr[1] + dataptr[6];
+    tmp6 = dataptr[1] - dataptr[6];
+    tmp2 = dataptr[2] + dataptr[5];
+    tmp5 = dataptr[2] - dataptr[5];
+    tmp3 = dataptr[3] + dataptr[4];
+    tmp4 = dataptr[3] - dataptr[4];
+    
+    /* Even part */
+    
+    tmp10 = tmp0 + tmp3;	/* phase 2 */
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+    
+    dataptr[0] = tmp10 + tmp11; /* phase 3 */
+    dataptr[4] = tmp10 - tmp11;
+    
+    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
+    dataptr[2] = tmp13 + z1;	/* phase 5 */
+    dataptr[6] = tmp13 - z1;
+    
+    /* Odd part */
+
+    tmp10 = tmp4 + tmp5;	/* phase 2 */
+    tmp11 = tmp5 + tmp6;
+    tmp12 = tmp6 + tmp7;
+
+    /* The rotator is modified from fig 4-8 to avoid extra negations. */
+    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */
+    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */
+    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */
+    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */
+
+    z11 = tmp7 + z3;		/* phase 5 */
+    z13 = tmp7 - z3;
+
+    dataptr[5] = z13 + z2;	/* phase 6 */
+    dataptr[3] = z13 - z2;
+    dataptr[1] = z11 + z4;
+    dataptr[7] = z11 - z4;
+
+    dataptr += DCTSIZE;		/* advance pointer to next row */
+  }
+
+  /* Pass 2: process columns. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
+    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
+    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
+    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
+    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
+    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
+    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
+    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
+    
+    /* Even part */
+    
+    tmp10 = tmp0 + tmp3;	/* phase 2 */
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+    
+    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */
+    dataptr[DCTSIZE*4] = tmp10 - tmp11;
+    
+    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
+    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */
+    dataptr[DCTSIZE*6] = tmp13 - z1;
+    
+    /* Odd part */
+
+    tmp10 = tmp4 + tmp5;	/* phase 2 */
+    tmp11 = tmp5 + tmp6;
+    tmp12 = tmp6 + tmp7;
+
+    /* The rotator is modified from fig 4-8 to avoid extra negations. */
+    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */
+    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */
+    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */
+    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */
+
+    z11 = tmp7 + z3;		/* phase 5 */
+    z13 = tmp7 - z3;
+
+    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */
+    dataptr[DCTSIZE*3] = z13 - z2;
+    dataptr[DCTSIZE*1] = z11 + z4;
+    dataptr[DCTSIZE*7] = z11 - z4;
+
+    dataptr++;			/* advance pointer to next column */
+  }
+}
+
+#endif /* DCT_IFAST_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jfdctint.c b/Source/3rd Party/wx/src/jpeg/jfdctint.c
index 6981b7477..4543b2e86 100644
--- a/Source/3rd Party/wx/src/jpeg/jfdctint.c	
+++ b/Source/3rd Party/wx/src/jpeg/jfdctint.c	
@@ -1,283 +1,283 @@
-/*
- * jfdctint.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a slow-but-accurate integer implementation of the
- * forward DCT (Discrete Cosine Transform).
- *
- * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
- * on each column.  Direct algorithms are also available, but they are
- * much more complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on an algorithm described in
- *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT
- *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,
- *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.
- * The primary algorithm described there uses 11 multiplies and 29 adds.
- * We use their alternate method with 12 multiplies and 32 adds.
- * The advantage of this method is that no data path contains more than one
- * multiplication; this allows a very simple and accurate implementation in
- * scaled fixed-point arithmetic, with a minimal number of shifts.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_ISLOW_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/*
- * The poop on this scaling stuff is as follows:
- *
- * Each 1-D DCT step produces outputs which are a factor of sqrt(N)
- * larger than the true DCT outputs.  The final outputs are therefore
- * a factor of N larger than desired; since N=8 this can be cured by
- * a simple right shift at the end of the algorithm.  The advantage of
- * this arrangement is that we save two multiplications per 1-D DCT,
- * because the y0 and y4 outputs need not be divided by sqrt(N).
- * In the IJG code, this factor of 8 is removed by the quantization step
- * (in jcdctmgr.c), NOT in this module.
- *
- * We have to do addition and subtraction of the integer inputs, which
- * is no problem, and multiplication by fractional constants, which is
- * a problem to do in integer arithmetic.  We multiply all the constants
- * by CONST_SCALE and convert them to integer constants (thus retaining
- * CONST_BITS bits of precision in the constants).  After doing a
- * multiplication we have to divide the product by CONST_SCALE, with proper
- * rounding, to produce the correct output.  This division can be done
- * cheaply as a right shift of CONST_BITS bits.  We postpone shifting
- * as long as possible so that partial sums can be added together with
- * full fractional precision.
- *
- * The outputs of the first pass are scaled up by PASS1_BITS bits so that
- * they are represented to better-than-integral precision.  These outputs
- * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word
- * with the recommended scaling.  (For 12-bit sample data, the intermediate
- * array is INT32 anyway.)
- *
- * To avoid overflow of the 32-bit intermediate results in pass 2, we must
- * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis
- * shows that the values given below are the most effective.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define CONST_BITS  13
-#define PASS1_BITS  2
-#else
-#define CONST_BITS  13
-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
-#endif
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 13
-#define FIX_0_298631336  ((JPEG_INT32)  2446)	/* FIX(0.298631336) */
-#define FIX_0_390180644  ((JPEG_INT32)  3196)	/* FIX(0.390180644) */
-#define FIX_0_541196100  ((JPEG_INT32)  4433)	/* FIX(0.541196100) */
-#define FIX_0_765366865  ((JPEG_INT32)  6270)	/* FIX(0.765366865) */
-#define FIX_0_899976223  ((JPEG_INT32)  7373)	/* FIX(0.899976223) */
-#define FIX_1_175875602  ((JPEG_INT32)  9633)	/* FIX(1.175875602) */
-#define FIX_1_501321110  ((JPEG_INT32)  12299)	/* FIX(1.501321110) */
-#define FIX_1_847759065  ((JPEG_INT32)  15137)	/* FIX(1.847759065) */
-#define FIX_1_961570560  ((JPEG_INT32)  16069)	/* FIX(1.961570560) */
-#define FIX_2_053119869  ((JPEG_INT32)  16819)	/* FIX(2.053119869) */
-#define FIX_2_562915447  ((JPEG_INT32)  20995)	/* FIX(2.562915447) */
-#define FIX_3_072711026  ((JPEG_INT32)  25172)	/* FIX(3.072711026) */
-#else
-#define FIX_0_298631336  FIX(0.298631336)
-#define FIX_0_390180644  FIX(0.390180644)
-#define FIX_0_541196100  FIX(0.541196100)
-#define FIX_0_765366865  FIX(0.765366865)
-#define FIX_0_899976223  FIX(0.899976223)
-#define FIX_1_175875602  FIX(1.175875602)
-#define FIX_1_501321110  FIX(1.501321110)
-#define FIX_1_847759065  FIX(1.847759065)
-#define FIX_1_961570560  FIX(1.961570560)
-#define FIX_2_053119869  FIX(2.053119869)
-#define FIX_2_562915447  FIX(2.562915447)
-#define FIX_3_072711026  FIX(3.072711026)
-#endif
-
-
-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
- * For 8-bit samples with the recommended scaling, all the variable
- * and constant values involved are no more than 16 bits wide, so a
- * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
- * For 12-bit samples, a full 32-bit multiplication will be needed.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
-#else
-#define MULTIPLY(var,const)  ((var) * (const))
-#endif
-
-
-/*
- * Perform the forward DCT on one block of samples.
- */
-
-GLOBAL(void)
-jpeg_fdct_islow (DCTELEM * data)
-{
-  JPEG_INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  JPEG_INT32 tmp10, tmp11, tmp12, tmp13;
-  JPEG_INT32 z1, z2, z3, z4, z5;
-  DCTELEM *dataptr;
-  int ctr;
-  SHIFT_TEMPS
-
-  /* Pass 1: process rows. */
-  /* Note results are scaled up by sqrt(8) compared to a true DCT; */
-  /* furthermore, we scale the results by 2**PASS1_BITS. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[0] + dataptr[7];
-    tmp7 = dataptr[0] - dataptr[7];
-    tmp1 = dataptr[1] + dataptr[6];
-    tmp6 = dataptr[1] - dataptr[6];
-    tmp2 = dataptr[2] + dataptr[5];
-    tmp5 = dataptr[2] - dataptr[5];
-    tmp3 = dataptr[3] + dataptr[4];
-    tmp4 = dataptr[3] - dataptr[4];
-    
-    /* Even part per LL&M figure 1 --- note that published figure is faulty;
-     * rotator "sqrt(2)*c1" should be "sqrt(2)*c6".
-     */
-    
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[0] = (DCTELEM) ((tmp10 + tmp11) << PASS1_BITS);
-    dataptr[4] = (DCTELEM) ((tmp10 - tmp11) << PASS1_BITS);
-    
-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
-    dataptr[2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
-				   CONST_BITS-PASS1_BITS);
-    dataptr[6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
-				   CONST_BITS-PASS1_BITS);
-    
-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
-     * cK represents cos(K*pi/16).
-     * i0..i3 in the paper are tmp4..tmp7 here.
-     */
-    
-    z1 = tmp4 + tmp7;
-    z2 = tmp5 + tmp6;
-    z3 = tmp4 + tmp6;
-    z4 = tmp5 + tmp7;
-    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
-    
-    tmp4 = MULTIPLY(tmp4, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp5 = MULTIPLY(tmp5, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp6 = MULTIPLY(tmp6, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp7 = MULTIPLY(tmp7, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    dataptr[7] = (DCTELEM) DESCALE(tmp4 + z1 + z3, CONST_BITS-PASS1_BITS);
-    dataptr[5] = (DCTELEM) DESCALE(tmp5 + z2 + z4, CONST_BITS-PASS1_BITS);
-    dataptr[3] = (DCTELEM) DESCALE(tmp6 + z2 + z3, CONST_BITS-PASS1_BITS);
-    dataptr[1] = (DCTELEM) DESCALE(tmp7 + z1 + z4, CONST_BITS-PASS1_BITS);
-    
-    dataptr += DCTSIZE;		/* advance pointer to next row */
-  }
-
-  /* Pass 2: process columns.
-   * We remove the PASS1_BITS scaling, but leave the results scaled up
-   * by an overall factor of 8.
-   */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
-    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
-    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
-    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
-    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
-    
-    /* Even part per LL&M figure 1 --- note that published figure is faulty;
-     * rotator "sqrt(2)*c1" should be "sqrt(2)*c6".
-     */
-    
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[DCTSIZE*0] = (DCTELEM) DESCALE(tmp10 + tmp11, PASS1_BITS);
-    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp10 - tmp11, PASS1_BITS);
-    
-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
-    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
-					   CONST_BITS+PASS1_BITS);
-    dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
-					   CONST_BITS+PASS1_BITS);
-    
-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
-     * cK represents cos(K*pi/16).
-     * i0..i3 in the paper are tmp4..tmp7 here.
-     */
-    
-    z1 = tmp4 + tmp7;
-    z2 = tmp5 + tmp6;
-    z3 = tmp4 + tmp6;
-    z4 = tmp5 + tmp7;
-    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
-    
-    tmp4 = MULTIPLY(tmp4, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp5 = MULTIPLY(tmp5, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp6 = MULTIPLY(tmp6, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp7 = MULTIPLY(tmp7, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp4 + z1 + z3,
-					   CONST_BITS+PASS1_BITS);
-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp5 + z2 + z4,
-					   CONST_BITS+PASS1_BITS);
-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp6 + z2 + z3,
-					   CONST_BITS+PASS1_BITS);
-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp7 + z1 + z4,
-					   CONST_BITS+PASS1_BITS);
-    
-    dataptr++;			/* advance pointer to next column */
-  }
-}
-
-#endif /* DCT_ISLOW_SUPPORTED */
+/*
+ * jfdctint.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a slow-but-accurate integer implementation of the
+ * forward DCT (Discrete Cosine Transform).
+ *
+ * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
+ * on each column.  Direct algorithms are also available, but they are
+ * much more complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on an algorithm described in
+ *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT
+ *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,
+ *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.
+ * The primary algorithm described there uses 11 multiplies and 29 adds.
+ * We use their alternate method with 12 multiplies and 32 adds.
+ * The advantage of this method is that no data path contains more than one
+ * multiplication; this allows a very simple and accurate implementation in
+ * scaled fixed-point arithmetic, with a minimal number of shifts.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_ISLOW_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/*
+ * The poop on this scaling stuff is as follows:
+ *
+ * Each 1-D DCT step produces outputs which are a factor of sqrt(N)
+ * larger than the true DCT outputs.  The final outputs are therefore
+ * a factor of N larger than desired; since N=8 this can be cured by
+ * a simple right shift at the end of the algorithm.  The advantage of
+ * this arrangement is that we save two multiplications per 1-D DCT,
+ * because the y0 and y4 outputs need not be divided by sqrt(N).
+ * In the IJG code, this factor of 8 is removed by the quantization step
+ * (in jcdctmgr.c), NOT in this module.
+ *
+ * We have to do addition and subtraction of the integer inputs, which
+ * is no problem, and multiplication by fractional constants, which is
+ * a problem to do in integer arithmetic.  We multiply all the constants
+ * by CONST_SCALE and convert them to integer constants (thus retaining
+ * CONST_BITS bits of precision in the constants).  After doing a
+ * multiplication we have to divide the product by CONST_SCALE, with proper
+ * rounding, to produce the correct output.  This division can be done
+ * cheaply as a right shift of CONST_BITS bits.  We postpone shifting
+ * as long as possible so that partial sums can be added together with
+ * full fractional precision.
+ *
+ * The outputs of the first pass are scaled up by PASS1_BITS bits so that
+ * they are represented to better-than-integral precision.  These outputs
+ * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word
+ * with the recommended scaling.  (For 12-bit sample data, the intermediate
+ * array is INT32 anyway.)
+ *
+ * To avoid overflow of the 32-bit intermediate results in pass 2, we must
+ * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis
+ * shows that the values given below are the most effective.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define CONST_BITS  13
+#define PASS1_BITS  2
+#else
+#define CONST_BITS  13
+#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
+#endif
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 13
+#define FIX_0_298631336  ((JPEG_INT32)  2446)	/* FIX(0.298631336) */
+#define FIX_0_390180644  ((JPEG_INT32)  3196)	/* FIX(0.390180644) */
+#define FIX_0_541196100  ((JPEG_INT32)  4433)	/* FIX(0.541196100) */
+#define FIX_0_765366865  ((JPEG_INT32)  6270)	/* FIX(0.765366865) */
+#define FIX_0_899976223  ((JPEG_INT32)  7373)	/* FIX(0.899976223) */
+#define FIX_1_175875602  ((JPEG_INT32)  9633)	/* FIX(1.175875602) */
+#define FIX_1_501321110  ((JPEG_INT32)  12299)	/* FIX(1.501321110) */
+#define FIX_1_847759065  ((JPEG_INT32)  15137)	/* FIX(1.847759065) */
+#define FIX_1_961570560  ((JPEG_INT32)  16069)	/* FIX(1.961570560) */
+#define FIX_2_053119869  ((JPEG_INT32)  16819)	/* FIX(2.053119869) */
+#define FIX_2_562915447  ((JPEG_INT32)  20995)	/* FIX(2.562915447) */
+#define FIX_3_072711026  ((JPEG_INT32)  25172)	/* FIX(3.072711026) */
+#else
+#define FIX_0_298631336  FIX(0.298631336)
+#define FIX_0_390180644  FIX(0.390180644)
+#define FIX_0_541196100  FIX(0.541196100)
+#define FIX_0_765366865  FIX(0.765366865)
+#define FIX_0_899976223  FIX(0.899976223)
+#define FIX_1_175875602  FIX(1.175875602)
+#define FIX_1_501321110  FIX(1.501321110)
+#define FIX_1_847759065  FIX(1.847759065)
+#define FIX_1_961570560  FIX(1.961570560)
+#define FIX_2_053119869  FIX(2.053119869)
+#define FIX_2_562915447  FIX(2.562915447)
+#define FIX_3_072711026  FIX(3.072711026)
+#endif
+
+
+/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
+ * For 8-bit samples with the recommended scaling, all the variable
+ * and constant values involved are no more than 16 bits wide, so a
+ * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
+ * For 12-bit samples, a full 32-bit multiplication will be needed.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
+#else
+#define MULTIPLY(var,const)  ((var) * (const))
+#endif
+
+
+/*
+ * Perform the forward DCT on one block of samples.
+ */
+
+GLOBAL(void)
+jpeg_fdct_islow (DCTELEM * data)
+{
+  JPEG_INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  JPEG_INT32 tmp10, tmp11, tmp12, tmp13;
+  JPEG_INT32 z1, z2, z3, z4, z5;
+  DCTELEM *dataptr;
+  int ctr;
+  SHIFT_TEMPS
+
+  /* Pass 1: process rows. */
+  /* Note results are scaled up by sqrt(8) compared to a true DCT; */
+  /* furthermore, we scale the results by 2**PASS1_BITS. */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[0] + dataptr[7];
+    tmp7 = dataptr[0] - dataptr[7];
+    tmp1 = dataptr[1] + dataptr[6];
+    tmp6 = dataptr[1] - dataptr[6];
+    tmp2 = dataptr[2] + dataptr[5];
+    tmp5 = dataptr[2] - dataptr[5];
+    tmp3 = dataptr[3] + dataptr[4];
+    tmp4 = dataptr[3] - dataptr[4];
+    
+    /* Even part per LL&M figure 1 --- note that published figure is faulty;
+     * rotator "sqrt(2)*c1" should be "sqrt(2)*c6".
+     */
+    
+    tmp10 = tmp0 + tmp3;
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+    
+    dataptr[0] = (DCTELEM) ((tmp10 + tmp11) << PASS1_BITS);
+    dataptr[4] = (DCTELEM) ((tmp10 - tmp11) << PASS1_BITS);
+    
+    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
+    dataptr[2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
+				   CONST_BITS-PASS1_BITS);
+    dataptr[6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
+				   CONST_BITS-PASS1_BITS);
+    
+    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
+     * cK represents cos(K*pi/16).
+     * i0..i3 in the paper are tmp4..tmp7 here.
+     */
+    
+    z1 = tmp4 + tmp7;
+    z2 = tmp5 + tmp6;
+    z3 = tmp4 + tmp6;
+    z4 = tmp5 + tmp7;
+    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
+    
+    tmp4 = MULTIPLY(tmp4, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
+    tmp5 = MULTIPLY(tmp5, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
+    tmp6 = MULTIPLY(tmp6, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
+    tmp7 = MULTIPLY(tmp7, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
+    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
+    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
+    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
+    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
+    
+    z3 += z5;
+    z4 += z5;
+    
+    dataptr[7] = (DCTELEM) DESCALE(tmp4 + z1 + z3, CONST_BITS-PASS1_BITS);
+    dataptr[5] = (DCTELEM) DESCALE(tmp5 + z2 + z4, CONST_BITS-PASS1_BITS);
+    dataptr[3] = (DCTELEM) DESCALE(tmp6 + z2 + z3, CONST_BITS-PASS1_BITS);
+    dataptr[1] = (DCTELEM) DESCALE(tmp7 + z1 + z4, CONST_BITS-PASS1_BITS);
+    
+    dataptr += DCTSIZE;		/* advance pointer to next row */
+  }
+
+  /* Pass 2: process columns.
+   * We remove the PASS1_BITS scaling, but leave the results scaled up
+   * by an overall factor of 8.
+   */
+
+  dataptr = data;
+  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
+    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
+    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
+    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
+    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
+    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
+    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
+    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
+    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
+    
+    /* Even part per LL&M figure 1 --- note that published figure is faulty;
+     * rotator "sqrt(2)*c1" should be "sqrt(2)*c6".
+     */
+    
+    tmp10 = tmp0 + tmp3;
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+    
+    dataptr[DCTSIZE*0] = (DCTELEM) DESCALE(tmp10 + tmp11, PASS1_BITS);
+    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp10 - tmp11, PASS1_BITS);
+    
+    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
+    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
+					   CONST_BITS+PASS1_BITS);
+    dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
+					   CONST_BITS+PASS1_BITS);
+    
+    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
+     * cK represents cos(K*pi/16).
+     * i0..i3 in the paper are tmp4..tmp7 here.
+     */
+    
+    z1 = tmp4 + tmp7;
+    z2 = tmp5 + tmp6;
+    z3 = tmp4 + tmp6;
+    z4 = tmp5 + tmp7;
+    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
+    
+    tmp4 = MULTIPLY(tmp4, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
+    tmp5 = MULTIPLY(tmp5, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
+    tmp6 = MULTIPLY(tmp6, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
+    tmp7 = MULTIPLY(tmp7, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
+    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
+    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
+    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
+    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
+    
+    z3 += z5;
+    z4 += z5;
+    
+    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp4 + z1 + z3,
+					   CONST_BITS+PASS1_BITS);
+    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp5 + z2 + z4,
+					   CONST_BITS+PASS1_BITS);
+    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp6 + z2 + z3,
+					   CONST_BITS+PASS1_BITS);
+    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp7 + z1 + z4,
+					   CONST_BITS+PASS1_BITS);
+    
+    dataptr++;			/* advance pointer to next column */
+  }
+}
+
+#endif /* DCT_ISLOW_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jidctflt.c b/Source/3rd Party/wx/src/jpeg/jidctflt.c
index 5b47feaaa..a0f22c295 100644
--- a/Source/3rd Party/wx/src/jpeg/jidctflt.c	
+++ b/Source/3rd Party/wx/src/jpeg/jidctflt.c	
@@ -1,242 +1,242 @@
-/*
- * jidctflt.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a floating-point implementation of the
- * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
- * must also perform dequantization of the input coefficients.
- *
- * This implementation should be more accurate than either of the integer
- * IDCT implementations.  However, it may not give the same results on all
- * machines because of differences in roundoff behavior.  Speed will depend
- * on the hardware's floating point capacity.
- *
- * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
- * on each row (or vice versa, but it's more convenient to emit a row at
- * a time).  Direct algorithms are also available, but they are much more
- * complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on Arai, Agui, and Nakajima's algorithm for
- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
- * Japanese, but the algorithm is described in the Pennebaker & Mitchell
- * JPEG textbook (see REFERENCES section in file README).  The following code
- * is based directly on figure 4-8 in P&M.
- * While an 8-point DCT cannot be done in less than 11 multiplies, it is
- * possible to arrange the computation so that many of the multiplies are
- * simple scalings of the final outputs.  These multiplies can then be
- * folded into the multiplications or divisions by the JPEG quantization
- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
- * to be done in the DCT itself.
- * The primary disadvantage of this method is that with a fixed-point
- * implementation, accuracy is lost due to imprecise representation of the
- * scaled quantization values.  However, that problem does not arise if
- * we use floating point arithmetic.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_FLOAT_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/* Dequantize a coefficient by multiplying it by the multiplier-table
- * entry; produce a float result.
- */
-
-#define DEQUANTIZE(coef,quantval)  (((FAST_FLOAT) (coef)) * (quantval))
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients.
- */
-
-GLOBAL(void)
-jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;
-  FAST_FLOAT z5, z10, z11, z12, z13;
-  JCOEFPTR inptr;
-  FLOAT_MULT_TYPE * quantptr;
-  FAST_FLOAT * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  FAST_FLOAT workspace[DCTSIZE2]; /* buffers data between passes */
-  SHIFT_TEMPS
-
-  /* Pass 1: process columns from input, store into work array. */
-
-  inptr = coef_block;
-  quantptr = (FLOAT_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; ctr--) {
-    /* Due to quantization, we will usually find that many of the input
-     * coefficients are zero, especially the AC terms.  We can exploit this
-     * by short-circuiting the IDCT calculation for any column in which all
-     * the AC terms are zero.  In that case each output is equal to the
-     * DC coefficient (with scale factor as needed).
-     * With typical images and quantization tables, half or more of the
-     * column DCT calculations can be simplified this way.
-     */
-    
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
-	inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero */
-      FAST_FLOAT dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-      
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      wsptr[DCTSIZE*2] = dcval;
-      wsptr[DCTSIZE*3] = dcval;
-      wsptr[DCTSIZE*4] = dcval;
-      wsptr[DCTSIZE*5] = dcval;
-      wsptr[DCTSIZE*6] = dcval;
-      wsptr[DCTSIZE*7] = dcval;
-      
-      inptr++;			/* advance pointers to next column */
-      quantptr++;
-      wsptr++;
-      continue;
-    }
-    
-    /* Even part */
-
-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
-
-    tmp10 = tmp0 + tmp2;	/* phase 3 */
-    tmp11 = tmp0 - tmp2;
-
-    tmp13 = tmp1 + tmp3;	/* phases 5-3 */
-    tmp12 = (tmp1 - tmp3) * ((FAST_FLOAT) 1.414213562) - tmp13; /* 2*c4 */
-
-    tmp0 = tmp10 + tmp13;	/* phase 2 */
-    tmp3 = tmp10 - tmp13;
-    tmp1 = tmp11 + tmp12;
-    tmp2 = tmp11 - tmp12;
-    
-    /* Odd part */
-
-    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-
-    z13 = tmp6 + tmp5;		/* phase 6 */
-    z10 = tmp6 - tmp5;
-    z11 = tmp4 + tmp7;
-    z12 = tmp4 - tmp7;
-
-    tmp7 = z11 + z13;		/* phase 5 */
-    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562); /* 2*c4 */
-
-    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */
-    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */
-    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */
-
-    tmp6 = tmp12 - tmp7;	/* phase 2 */
-    tmp5 = tmp11 - tmp6;
-    tmp4 = tmp10 + tmp5;
-
-    wsptr[DCTSIZE*0] = tmp0 + tmp7;
-    wsptr[DCTSIZE*7] = tmp0 - tmp7;
-    wsptr[DCTSIZE*1] = tmp1 + tmp6;
-    wsptr[DCTSIZE*6] = tmp1 - tmp6;
-    wsptr[DCTSIZE*2] = tmp2 + tmp5;
-    wsptr[DCTSIZE*5] = tmp2 - tmp5;
-    wsptr[DCTSIZE*4] = tmp3 + tmp4;
-    wsptr[DCTSIZE*3] = tmp3 - tmp4;
-
-    inptr++;			/* advance pointers to next column */
-    quantptr++;
-    wsptr++;
-  }
-  
-  /* Pass 2: process rows from work array, store into output array. */
-  /* Note that we must descale the results by a factor of 8 == 2**3. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < DCTSIZE; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* Rows of zeroes can be exploited in the same way as we did with columns.
-     * However, the column calculation has created many nonzero AC terms, so
-     * the simplification applies less often (typically 5% to 10% of the time).
-     * And testing floats for zero is relatively expensive, so we don't bother.
-     */
-    
-    /* Even part */
-
-    tmp10 = wsptr[0] + wsptr[4];
-    tmp11 = wsptr[0] - wsptr[4];
-
-    tmp13 = wsptr[2] + wsptr[6];
-    tmp12 = (wsptr[2] - wsptr[6]) * ((FAST_FLOAT) 1.414213562) - tmp13;
-
-    tmp0 = tmp10 + tmp13;
-    tmp3 = tmp10 - tmp13;
-    tmp1 = tmp11 + tmp12;
-    tmp2 = tmp11 - tmp12;
-
-    /* Odd part */
-
-    z13 = wsptr[5] + wsptr[3];
-    z10 = wsptr[5] - wsptr[3];
-    z11 = wsptr[1] + wsptr[7];
-    z12 = wsptr[1] - wsptr[7];
-
-    tmp7 = z11 + z13;
-    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562);
-
-    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */
-    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */
-    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */
-
-    tmp6 = tmp12 - tmp7;
-    tmp5 = tmp11 - tmp6;
-    tmp4 = tmp10 + tmp5;
-
-    /* Final output stage: scale down by a factor of 8 and range-limit */
-
-    outptr[0] = range_limit[(int) DESCALE((JPEG_INT32) (tmp0 + tmp7), 3)
-			    & RANGE_MASK];
-    outptr[7] = range_limit[(int) DESCALE((JPEG_INT32) (tmp0 - tmp7), 3)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[(int) DESCALE((JPEG_INT32) (tmp1 + tmp6), 3)
-			    & RANGE_MASK];
-    outptr[6] = range_limit[(int) DESCALE((JPEG_INT32) (tmp1 - tmp6), 3)
-			    & RANGE_MASK];
-    outptr[2] = range_limit[(int) DESCALE((JPEG_INT32) (tmp2 + tmp5), 3)
-			    & RANGE_MASK];
-    outptr[5] = range_limit[(int) DESCALE((JPEG_INT32) (tmp2 - tmp5), 3)
-			    & RANGE_MASK];
-    outptr[4] = range_limit[(int) DESCALE((JPEG_INT32) (tmp3 + tmp4), 3)
-			    & RANGE_MASK];
-    outptr[3] = range_limit[(int) DESCALE((JPEG_INT32) (tmp3 - tmp4), 3)
-			    & RANGE_MASK];
-    
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-#endif /* DCT_FLOAT_SUPPORTED */
+/*
+ * jidctflt.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a floating-point implementation of the
+ * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
+ * must also perform dequantization of the input coefficients.
+ *
+ * This implementation should be more accurate than either of the integer
+ * IDCT implementations.  However, it may not give the same results on all
+ * machines because of differences in roundoff behavior.  Speed will depend
+ * on the hardware's floating point capacity.
+ *
+ * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
+ * on each row (or vice versa, but it's more convenient to emit a row at
+ * a time).  Direct algorithms are also available, but they are much more
+ * complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on Arai, Agui, and Nakajima's algorithm for
+ * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
+ * Japanese, but the algorithm is described in the Pennebaker & Mitchell
+ * JPEG textbook (see REFERENCES section in file README).  The following code
+ * is based directly on figure 4-8 in P&M.
+ * While an 8-point DCT cannot be done in less than 11 multiplies, it is
+ * possible to arrange the computation so that many of the multiplies are
+ * simple scalings of the final outputs.  These multiplies can then be
+ * folded into the multiplications or divisions by the JPEG quantization
+ * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
+ * to be done in the DCT itself.
+ * The primary disadvantage of this method is that with a fixed-point
+ * implementation, accuracy is lost due to imprecise representation of the
+ * scaled quantization values.  However, that problem does not arise if
+ * we use floating point arithmetic.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_FLOAT_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/* Dequantize a coefficient by multiplying it by the multiplier-table
+ * entry; produce a float result.
+ */
+
+#define DEQUANTIZE(coef,quantval)  (((FAST_FLOAT) (coef)) * (quantval))
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients.
+ */
+
+GLOBAL(void)
+jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JCOEFPTR coef_block,
+		 JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;
+  FAST_FLOAT z5, z10, z11, z12, z13;
+  JCOEFPTR inptr;
+  FLOAT_MULT_TYPE * quantptr;
+  FAST_FLOAT * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  FAST_FLOAT workspace[DCTSIZE2]; /* buffers data between passes */
+  SHIFT_TEMPS
+
+  /* Pass 1: process columns from input, store into work array. */
+
+  inptr = coef_block;
+  quantptr = (FLOAT_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; ctr--) {
+    /* Due to quantization, we will usually find that many of the input
+     * coefficients are zero, especially the AC terms.  We can exploit this
+     * by short-circuiting the IDCT calculation for any column in which all
+     * the AC terms are zero.  In that case each output is equal to the
+     * DC coefficient (with scale factor as needed).
+     * With typical images and quantization tables, half or more of the
+     * column DCT calculations can be simplified this way.
+     */
+    
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
+	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
+	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
+	inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero */
+      FAST_FLOAT dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+      
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+      wsptr[DCTSIZE*2] = dcval;
+      wsptr[DCTSIZE*3] = dcval;
+      wsptr[DCTSIZE*4] = dcval;
+      wsptr[DCTSIZE*5] = dcval;
+      wsptr[DCTSIZE*6] = dcval;
+      wsptr[DCTSIZE*7] = dcval;
+      
+      inptr++;			/* advance pointers to next column */
+      quantptr++;
+      wsptr++;
+      continue;
+    }
+    
+    /* Even part */
+
+    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
+    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
+    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
+
+    tmp10 = tmp0 + tmp2;	/* phase 3 */
+    tmp11 = tmp0 - tmp2;
+
+    tmp13 = tmp1 + tmp3;	/* phases 5-3 */
+    tmp12 = (tmp1 - tmp3) * ((FAST_FLOAT) 1.414213562) - tmp13; /* 2*c4 */
+
+    tmp0 = tmp10 + tmp13;	/* phase 2 */
+    tmp3 = tmp10 - tmp13;
+    tmp1 = tmp11 + tmp12;
+    tmp2 = tmp11 - tmp12;
+    
+    /* Odd part */
+
+    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+
+    z13 = tmp6 + tmp5;		/* phase 6 */
+    z10 = tmp6 - tmp5;
+    z11 = tmp4 + tmp7;
+    z12 = tmp4 - tmp7;
+
+    tmp7 = z11 + z13;		/* phase 5 */
+    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562); /* 2*c4 */
+
+    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */
+    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */
+    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */
+
+    tmp6 = tmp12 - tmp7;	/* phase 2 */
+    tmp5 = tmp11 - tmp6;
+    tmp4 = tmp10 + tmp5;
+
+    wsptr[DCTSIZE*0] = tmp0 + tmp7;
+    wsptr[DCTSIZE*7] = tmp0 - tmp7;
+    wsptr[DCTSIZE*1] = tmp1 + tmp6;
+    wsptr[DCTSIZE*6] = tmp1 - tmp6;
+    wsptr[DCTSIZE*2] = tmp2 + tmp5;
+    wsptr[DCTSIZE*5] = tmp2 - tmp5;
+    wsptr[DCTSIZE*4] = tmp3 + tmp4;
+    wsptr[DCTSIZE*3] = tmp3 - tmp4;
+
+    inptr++;			/* advance pointers to next column */
+    quantptr++;
+    wsptr++;
+  }
+  
+  /* Pass 2: process rows from work array, store into output array. */
+  /* Note that we must descale the results by a factor of 8 == 2**3. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < DCTSIZE; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* Rows of zeroes can be exploited in the same way as we did with columns.
+     * However, the column calculation has created many nonzero AC terms, so
+     * the simplification applies less often (typically 5% to 10% of the time).
+     * And testing floats for zero is relatively expensive, so we don't bother.
+     */
+    
+    /* Even part */
+
+    tmp10 = wsptr[0] + wsptr[4];
+    tmp11 = wsptr[0] - wsptr[4];
+
+    tmp13 = wsptr[2] + wsptr[6];
+    tmp12 = (wsptr[2] - wsptr[6]) * ((FAST_FLOAT) 1.414213562) - tmp13;
+
+    tmp0 = tmp10 + tmp13;
+    tmp3 = tmp10 - tmp13;
+    tmp1 = tmp11 + tmp12;
+    tmp2 = tmp11 - tmp12;
+
+    /* Odd part */
+
+    z13 = wsptr[5] + wsptr[3];
+    z10 = wsptr[5] - wsptr[3];
+    z11 = wsptr[1] + wsptr[7];
+    z12 = wsptr[1] - wsptr[7];
+
+    tmp7 = z11 + z13;
+    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562);
+
+    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */
+    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */
+    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */
+
+    tmp6 = tmp12 - tmp7;
+    tmp5 = tmp11 - tmp6;
+    tmp4 = tmp10 + tmp5;
+
+    /* Final output stage: scale down by a factor of 8 and range-limit */
+
+    outptr[0] = range_limit[(int) DESCALE((JPEG_INT32) (tmp0 + tmp7), 3)
+			    & RANGE_MASK];
+    outptr[7] = range_limit[(int) DESCALE((JPEG_INT32) (tmp0 - tmp7), 3)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[(int) DESCALE((JPEG_INT32) (tmp1 + tmp6), 3)
+			    & RANGE_MASK];
+    outptr[6] = range_limit[(int) DESCALE((JPEG_INT32) (tmp1 - tmp6), 3)
+			    & RANGE_MASK];
+    outptr[2] = range_limit[(int) DESCALE((JPEG_INT32) (tmp2 + tmp5), 3)
+			    & RANGE_MASK];
+    outptr[5] = range_limit[(int) DESCALE((JPEG_INT32) (tmp2 - tmp5), 3)
+			    & RANGE_MASK];
+    outptr[4] = range_limit[(int) DESCALE((JPEG_INT32) (tmp3 + tmp4), 3)
+			    & RANGE_MASK];
+    outptr[3] = range_limit[(int) DESCALE((JPEG_INT32) (tmp3 - tmp4), 3)
+			    & RANGE_MASK];
+    
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+#endif /* DCT_FLOAT_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jidctfst.c b/Source/3rd Party/wx/src/jpeg/jidctfst.c
index c035e8779..d388b6178 100644
--- a/Source/3rd Party/wx/src/jpeg/jidctfst.c	
+++ b/Source/3rd Party/wx/src/jpeg/jidctfst.c	
@@ -1,368 +1,368 @@
-/*
- * jidctfst.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a fast, not so accurate integer implementation of the
- * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
- * must also perform dequantization of the input coefficients.
- *
- * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
- * on each row (or vice versa, but it's more convenient to emit a row at
- * a time).  Direct algorithms are also available, but they are much more
- * complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on Arai, Agui, and Nakajima's algorithm for
- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
- * Japanese, but the algorithm is described in the Pennebaker & Mitchell
- * JPEG textbook (see REFERENCES section in file README).  The following code
- * is based directly on figure 4-8 in P&M.
- * While an 8-point DCT cannot be done in less than 11 multiplies, it is
- * possible to arrange the computation so that many of the multiplies are
- * simple scalings of the final outputs.  These multiplies can then be
- * folded into the multiplications or divisions by the JPEG quantization
- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
- * to be done in the DCT itself.
- * The primary disadvantage of this method is that with fixed-point math,
- * accuracy is lost due to imprecise representation of the scaled
- * quantization values.  The smaller the quantization table entry, the less
- * precise the scaled value, so this implementation does worse with high-
- * quality-setting files than with low-quality ones.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_IFAST_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/* Scaling decisions are generally the same as in the LL&M algorithm;
- * see jidctint.c for more details.  However, we choose to descale
- * (right shift) multiplication products as soon as they are formed,
- * rather than carrying additional fractional bits into subsequent additions.
- * This compromises accuracy slightly, but it lets us save a few shifts.
- * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)
- * everywhere except in the multiplications proper; this saves a good deal
- * of work on 16-bit-int machines.
- *
- * The dequantized coefficients are not integers because the AA&N scaling
- * factors have been incorporated.  We represent them scaled up by PASS1_BITS,
- * so that the first and second IDCT rounds have the same input scaling.
- * For 8-bit JSAMPLEs, we choose IFAST_SCALE_BITS = PASS1_BITS so as to
- * avoid a descaling shift; this compromises accuracy rather drastically
- * for small quantization table entries, but it saves a lot of shifts.
- * For 12-bit JSAMPLEs, there's no hope of using 16x16 multiplies anyway,
- * so we use a much larger scaling factor to preserve accuracy.
- *
- * A final compromise is to represent the multiplicative constants to only
- * 8 fractional bits, rather than 13.  This saves some shifting work on some
- * machines, and may also reduce the cost of multiplication (since there
- * are fewer one-bits in the constants).
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define CONST_BITS  8
-#define PASS1_BITS  2
-#else
-#define CONST_BITS  8
-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
-#endif
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 8
-#define FIX_1_082392200  ((JPEG_INT32)  277)		/* FIX(1.082392200) */
-#define FIX_1_414213562  ((JPEG_INT32)  362)		/* FIX(1.414213562) */
-#define FIX_1_847759065  ((JPEG_INT32)  473)		/* FIX(1.847759065) */
-#define FIX_2_613125930  ((JPEG_INT32)  669)		/* FIX(2.613125930) */
-#else
-#define FIX_1_082392200  FIX(1.082392200)
-#define FIX_1_414213562  FIX(1.414213562)
-#define FIX_1_847759065  FIX(1.847759065)
-#define FIX_2_613125930  FIX(2.613125930)
-#endif
-
-
-/* We can gain a little more speed, with a further compromise in accuracy,
- * by omitting the addition in a descaling shift.  This yields an incorrectly
- * rounded result half the time...
- */
-
-#ifndef USE_ACCURATE_ROUNDING
-#undef DESCALE
-#define DESCALE(x,n)  RIGHT_SHIFT(x, n)
-#endif
-
-
-/* Multiply a DCTELEM variable by an INT32 constant, and immediately
- * descale to yield a DCTELEM result.
- */
-
-#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
-
-
-/* Dequantize a coefficient by multiplying it by the multiplier-table
- * entry; produce a DCTELEM result.  For 8-bit data a 16x16->16
- * multiplication will do.  For 12-bit data, the multiplier table is
- * declared INT32, so a 32-bit multiply will be used.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define DEQUANTIZE(coef,quantval)  (((IFAST_MULT_TYPE) (coef)) * (quantval))
-#else
-#define DEQUANTIZE(coef,quantval)  \
-	DESCALE((coef)*(quantval), IFAST_SCALE_BITS-PASS1_BITS)
-#endif
-
-
-/* Like DESCALE, but applies to a DCTELEM and produces an int.
- * We assume that int right shift is unsigned if INT32 right shift is.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define ISHIFT_TEMPS	DCTELEM ishift_temp;
-#if BITS_IN_JSAMPLE == 8
-#define DCTELEMBITS  16		/* DCTELEM may be 16 or 32 bits */
-#else
-#define DCTELEMBITS  32		/* DCTELEM must be 32 bits */
-#endif
-#define IRIGHT_SHIFT(x,shft)  \
-    ((ishift_temp = (x)) < 0 ? \
-     (ishift_temp >> (shft)) | ((~((DCTELEM) 0)) << (DCTELEMBITS-(shft))) : \
-     (ishift_temp >> (shft)))
-#else
-#define ISHIFT_TEMPS
-#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-#ifdef USE_ACCURATE_ROUNDING
-#define IDESCALE(x,n)  ((int) IRIGHT_SHIFT((x) + (1 << ((n)-1)), n))
-#else
-#define IDESCALE(x,n)  ((int) IRIGHT_SHIFT(x, n))
-#endif
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients.
- */
-
-GLOBAL(void)
-jpeg_idct_ifast (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  DCTELEM tmp10, tmp11, tmp12, tmp13;
-  DCTELEM z5, z10, z11, z12, z13;
-  JCOEFPTR inptr;
-  IFAST_MULT_TYPE * quantptr;
-  int * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  int workspace[DCTSIZE2];	/* buffers data between passes */
-  SHIFT_TEMPS			/* for DESCALE */
-  ISHIFT_TEMPS			/* for IDESCALE */
-
-  /* Pass 1: process columns from input, store into work array. */
-
-  inptr = coef_block;
-  quantptr = (IFAST_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; ctr--) {
-    /* Due to quantization, we will usually find that many of the input
-     * coefficients are zero, especially the AC terms.  We can exploit this
-     * by short-circuiting the IDCT calculation for any column in which all
-     * the AC terms are zero.  In that case each output is equal to the
-     * DC coefficient (with scale factor as needed).
-     * With typical images and quantization tables, half or more of the
-     * column DCT calculations can be simplified this way.
-     */
-    
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
-	inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero */
-      int dcval = (int) DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      wsptr[DCTSIZE*2] = dcval;
-      wsptr[DCTSIZE*3] = dcval;
-      wsptr[DCTSIZE*4] = dcval;
-      wsptr[DCTSIZE*5] = dcval;
-      wsptr[DCTSIZE*6] = dcval;
-      wsptr[DCTSIZE*7] = dcval;
-      
-      inptr++;			/* advance pointers to next column */
-      quantptr++;
-      wsptr++;
-      continue;
-    }
-    
-    /* Even part */
-
-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
-
-    tmp10 = tmp0 + tmp2;	/* phase 3 */
-    tmp11 = tmp0 - tmp2;
-
-    tmp13 = tmp1 + tmp3;	/* phases 5-3 */
-    tmp12 = MULTIPLY(tmp1 - tmp3, FIX_1_414213562) - tmp13; /* 2*c4 */
-
-    tmp0 = tmp10 + tmp13;	/* phase 2 */
-    tmp3 = tmp10 - tmp13;
-    tmp1 = tmp11 + tmp12;
-    tmp2 = tmp11 - tmp12;
-    
-    /* Odd part */
-
-    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-
-    z13 = tmp6 + tmp5;		/* phase 6 */
-    z10 = tmp6 - tmp5;
-    z11 = tmp4 + tmp7;
-    z12 = tmp4 - tmp7;
-
-    tmp7 = z11 + z13;		/* phase 5 */
-    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */
-
-    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */
-    tmp10 = MULTIPLY(z12, FIX_1_082392200) - z5; /* 2*(c2-c6) */
-    tmp12 = MULTIPLY(z10, - FIX_2_613125930) + z5; /* -2*(c2+c6) */
-
-    tmp6 = tmp12 - tmp7;	/* phase 2 */
-    tmp5 = tmp11 - tmp6;
-    tmp4 = tmp10 + tmp5;
-
-    wsptr[DCTSIZE*0] = (int) (tmp0 + tmp7);
-    wsptr[DCTSIZE*7] = (int) (tmp0 - tmp7);
-    wsptr[DCTSIZE*1] = (int) (tmp1 + tmp6);
-    wsptr[DCTSIZE*6] = (int) (tmp1 - tmp6);
-    wsptr[DCTSIZE*2] = (int) (tmp2 + tmp5);
-    wsptr[DCTSIZE*5] = (int) (tmp2 - tmp5);
-    wsptr[DCTSIZE*4] = (int) (tmp3 + tmp4);
-    wsptr[DCTSIZE*3] = (int) (tmp3 - tmp4);
-
-    inptr++;			/* advance pointers to next column */
-    quantptr++;
-    wsptr++;
-  }
-  
-  /* Pass 2: process rows from work array, store into output array. */
-  /* Note that we must descale the results by a factor of 8 == 2**3, */
-  /* and also undo the PASS1_BITS scaling. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < DCTSIZE; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* Rows of zeroes can be exploited in the same way as we did with columns.
-     * However, the column calculation has created many nonzero AC terms, so
-     * the simplification applies less often (typically 5% to 10% of the time).
-     * On machines with very fast multiplication, it's possible that the
-     * test takes more time than it's worth.  In that case this section
-     * may be commented out.
-     */
-    
-#ifndef NO_ZERO_ROW_TEST
-    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&
-	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
-      /* AC terms all zero */
-      JSAMPLE dcval = range_limit[IDESCALE(wsptr[0], PASS1_BITS+3)
-				  & RANGE_MASK];
-      
-      outptr[0] = dcval;
-      outptr[1] = dcval;
-      outptr[2] = dcval;
-      outptr[3] = dcval;
-      outptr[4] = dcval;
-      outptr[5] = dcval;
-      outptr[6] = dcval;
-      outptr[7] = dcval;
-
-      wsptr += DCTSIZE;		/* advance pointer to next row */
-      continue;
-    }
-#endif
-    
-    /* Even part */
-
-    tmp10 = ((DCTELEM) wsptr[0] + (DCTELEM) wsptr[4]);
-    tmp11 = ((DCTELEM) wsptr[0] - (DCTELEM) wsptr[4]);
-
-    tmp13 = ((DCTELEM) wsptr[2] + (DCTELEM) wsptr[6]);
-    tmp12 = MULTIPLY((DCTELEM) wsptr[2] - (DCTELEM) wsptr[6], FIX_1_414213562)
-	    - tmp13;
-
-    tmp0 = tmp10 + tmp13;
-    tmp3 = tmp10 - tmp13;
-    tmp1 = tmp11 + tmp12;
-    tmp2 = tmp11 - tmp12;
-
-    /* Odd part */
-
-    z13 = (DCTELEM) wsptr[5] + (DCTELEM) wsptr[3];
-    z10 = (DCTELEM) wsptr[5] - (DCTELEM) wsptr[3];
-    z11 = (DCTELEM) wsptr[1] + (DCTELEM) wsptr[7];
-    z12 = (DCTELEM) wsptr[1] - (DCTELEM) wsptr[7];
-
-    tmp7 = z11 + z13;		/* phase 5 */
-    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */
-
-    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */
-    tmp10 = MULTIPLY(z12, FIX_1_082392200) - z5; /* 2*(c2-c6) */
-    tmp12 = MULTIPLY(z10, - FIX_2_613125930) + z5; /* -2*(c2+c6) */
-
-    tmp6 = tmp12 - tmp7;	/* phase 2 */
-    tmp5 = tmp11 - tmp6;
-    tmp4 = tmp10 + tmp5;
-
-    /* Final output stage: scale down by a factor of 8 and range-limit */
-
-    outptr[0] = range_limit[IDESCALE(tmp0 + tmp7, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[7] = range_limit[IDESCALE(tmp0 - tmp7, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[IDESCALE(tmp1 + tmp6, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[6] = range_limit[IDESCALE(tmp1 - tmp6, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[2] = range_limit[IDESCALE(tmp2 + tmp5, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[5] = range_limit[IDESCALE(tmp2 - tmp5, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[4] = range_limit[IDESCALE(tmp3 + tmp4, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[3] = range_limit[IDESCALE(tmp3 - tmp4, PASS1_BITS+3)
-			    & RANGE_MASK];
-
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-#endif /* DCT_IFAST_SUPPORTED */
+/*
+ * jidctfst.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a fast, not so accurate integer implementation of the
+ * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
+ * must also perform dequantization of the input coefficients.
+ *
+ * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
+ * on each row (or vice versa, but it's more convenient to emit a row at
+ * a time).  Direct algorithms are also available, but they are much more
+ * complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on Arai, Agui, and Nakajima's algorithm for
+ * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
+ * Japanese, but the algorithm is described in the Pennebaker & Mitchell
+ * JPEG textbook (see REFERENCES section in file README).  The following code
+ * is based directly on figure 4-8 in P&M.
+ * While an 8-point DCT cannot be done in less than 11 multiplies, it is
+ * possible to arrange the computation so that many of the multiplies are
+ * simple scalings of the final outputs.  These multiplies can then be
+ * folded into the multiplications or divisions by the JPEG quantization
+ * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
+ * to be done in the DCT itself.
+ * The primary disadvantage of this method is that with fixed-point math,
+ * accuracy is lost due to imprecise representation of the scaled
+ * quantization values.  The smaller the quantization table entry, the less
+ * precise the scaled value, so this implementation does worse with high-
+ * quality-setting files than with low-quality ones.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_IFAST_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/* Scaling decisions are generally the same as in the LL&M algorithm;
+ * see jidctint.c for more details.  However, we choose to descale
+ * (right shift) multiplication products as soon as they are formed,
+ * rather than carrying additional fractional bits into subsequent additions.
+ * This compromises accuracy slightly, but it lets us save a few shifts.
+ * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)
+ * everywhere except in the multiplications proper; this saves a good deal
+ * of work on 16-bit-int machines.
+ *
+ * The dequantized coefficients are not integers because the AA&N scaling
+ * factors have been incorporated.  We represent them scaled up by PASS1_BITS,
+ * so that the first and second IDCT rounds have the same input scaling.
+ * For 8-bit JSAMPLEs, we choose IFAST_SCALE_BITS = PASS1_BITS so as to
+ * avoid a descaling shift; this compromises accuracy rather drastically
+ * for small quantization table entries, but it saves a lot of shifts.
+ * For 12-bit JSAMPLEs, there's no hope of using 16x16 multiplies anyway,
+ * so we use a much larger scaling factor to preserve accuracy.
+ *
+ * A final compromise is to represent the multiplicative constants to only
+ * 8 fractional bits, rather than 13.  This saves some shifting work on some
+ * machines, and may also reduce the cost of multiplication (since there
+ * are fewer one-bits in the constants).
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define CONST_BITS  8
+#define PASS1_BITS  2
+#else
+#define CONST_BITS  8
+#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
+#endif
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 8
+#define FIX_1_082392200  ((JPEG_INT32)  277)		/* FIX(1.082392200) */
+#define FIX_1_414213562  ((JPEG_INT32)  362)		/* FIX(1.414213562) */
+#define FIX_1_847759065  ((JPEG_INT32)  473)		/* FIX(1.847759065) */
+#define FIX_2_613125930  ((JPEG_INT32)  669)		/* FIX(2.613125930) */
+#else
+#define FIX_1_082392200  FIX(1.082392200)
+#define FIX_1_414213562  FIX(1.414213562)
+#define FIX_1_847759065  FIX(1.847759065)
+#define FIX_2_613125930  FIX(2.613125930)
+#endif
+
+
+/* We can gain a little more speed, with a further compromise in accuracy,
+ * by omitting the addition in a descaling shift.  This yields an incorrectly
+ * rounded result half the time...
+ */
+
+#ifndef USE_ACCURATE_ROUNDING
+#undef DESCALE
+#define DESCALE(x,n)  RIGHT_SHIFT(x, n)
+#endif
+
+
+/* Multiply a DCTELEM variable by an INT32 constant, and immediately
+ * descale to yield a DCTELEM result.
+ */
+
+#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
+
+
+/* Dequantize a coefficient by multiplying it by the multiplier-table
+ * entry; produce a DCTELEM result.  For 8-bit data a 16x16->16
+ * multiplication will do.  For 12-bit data, the multiplier table is
+ * declared INT32, so a 32-bit multiply will be used.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define DEQUANTIZE(coef,quantval)  (((IFAST_MULT_TYPE) (coef)) * (quantval))
+#else
+#define DEQUANTIZE(coef,quantval)  \
+	DESCALE((coef)*(quantval), IFAST_SCALE_BITS-PASS1_BITS)
+#endif
+
+
+/* Like DESCALE, but applies to a DCTELEM and produces an int.
+ * We assume that int right shift is unsigned if INT32 right shift is.
+ */
+
+#ifdef RIGHT_SHIFT_IS_UNSIGNED
+#define ISHIFT_TEMPS	DCTELEM ishift_temp;
+#if BITS_IN_JSAMPLE == 8
+#define DCTELEMBITS  16		/* DCTELEM may be 16 or 32 bits */
+#else
+#define DCTELEMBITS  32		/* DCTELEM must be 32 bits */
+#endif
+#define IRIGHT_SHIFT(x,shft)  \
+    ((ishift_temp = (x)) < 0 ? \
+     (ishift_temp >> (shft)) | ((~((DCTELEM) 0)) << (DCTELEMBITS-(shft))) : \
+     (ishift_temp >> (shft)))
+#else
+#define ISHIFT_TEMPS
+#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))
+#endif
+
+#ifdef USE_ACCURATE_ROUNDING
+#define IDESCALE(x,n)  ((int) IRIGHT_SHIFT((x) + (1 << ((n)-1)), n))
+#else
+#define IDESCALE(x,n)  ((int) IRIGHT_SHIFT(x, n))
+#endif
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients.
+ */
+
+GLOBAL(void)
+jpeg_idct_ifast (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JCOEFPTR coef_block,
+		 JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+  DCTELEM tmp10, tmp11, tmp12, tmp13;
+  DCTELEM z5, z10, z11, z12, z13;
+  JCOEFPTR inptr;
+  IFAST_MULT_TYPE * quantptr;
+  int * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  int workspace[DCTSIZE2];	/* buffers data between passes */
+  SHIFT_TEMPS			/* for DESCALE */
+  ISHIFT_TEMPS			/* for IDESCALE */
+
+  /* Pass 1: process columns from input, store into work array. */
+
+  inptr = coef_block;
+  quantptr = (IFAST_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; ctr--) {
+    /* Due to quantization, we will usually find that many of the input
+     * coefficients are zero, especially the AC terms.  We can exploit this
+     * by short-circuiting the IDCT calculation for any column in which all
+     * the AC terms are zero.  In that case each output is equal to the
+     * DC coefficient (with scale factor as needed).
+     * With typical images and quantization tables, half or more of the
+     * column DCT calculations can be simplified this way.
+     */
+    
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
+	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
+	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
+	inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero */
+      int dcval = (int) DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+      wsptr[DCTSIZE*2] = dcval;
+      wsptr[DCTSIZE*3] = dcval;
+      wsptr[DCTSIZE*4] = dcval;
+      wsptr[DCTSIZE*5] = dcval;
+      wsptr[DCTSIZE*6] = dcval;
+      wsptr[DCTSIZE*7] = dcval;
+      
+      inptr++;			/* advance pointers to next column */
+      quantptr++;
+      wsptr++;
+      continue;
+    }
+    
+    /* Even part */
+
+    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
+    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
+    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
+
+    tmp10 = tmp0 + tmp2;	/* phase 3 */
+    tmp11 = tmp0 - tmp2;
+
+    tmp13 = tmp1 + tmp3;	/* phases 5-3 */
+    tmp12 = MULTIPLY(tmp1 - tmp3, FIX_1_414213562) - tmp13; /* 2*c4 */
+
+    tmp0 = tmp10 + tmp13;	/* phase 2 */
+    tmp3 = tmp10 - tmp13;
+    tmp1 = tmp11 + tmp12;
+    tmp2 = tmp11 - tmp12;
+    
+    /* Odd part */
+
+    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+
+    z13 = tmp6 + tmp5;		/* phase 6 */
+    z10 = tmp6 - tmp5;
+    z11 = tmp4 + tmp7;
+    z12 = tmp4 - tmp7;
+
+    tmp7 = z11 + z13;		/* phase 5 */
+    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */
+
+    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */
+    tmp10 = MULTIPLY(z12, FIX_1_082392200) - z5; /* 2*(c2-c6) */
+    tmp12 = MULTIPLY(z10, - FIX_2_613125930) + z5; /* -2*(c2+c6) */
+
+    tmp6 = tmp12 - tmp7;	/* phase 2 */
+    tmp5 = tmp11 - tmp6;
+    tmp4 = tmp10 + tmp5;
+
+    wsptr[DCTSIZE*0] = (int) (tmp0 + tmp7);
+    wsptr[DCTSIZE*7] = (int) (tmp0 - tmp7);
+    wsptr[DCTSIZE*1] = (int) (tmp1 + tmp6);
+    wsptr[DCTSIZE*6] = (int) (tmp1 - tmp6);
+    wsptr[DCTSIZE*2] = (int) (tmp2 + tmp5);
+    wsptr[DCTSIZE*5] = (int) (tmp2 - tmp5);
+    wsptr[DCTSIZE*4] = (int) (tmp3 + tmp4);
+    wsptr[DCTSIZE*3] = (int) (tmp3 - tmp4);
+
+    inptr++;			/* advance pointers to next column */
+    quantptr++;
+    wsptr++;
+  }
+  
+  /* Pass 2: process rows from work array, store into output array. */
+  /* Note that we must descale the results by a factor of 8 == 2**3, */
+  /* and also undo the PASS1_BITS scaling. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < DCTSIZE; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* Rows of zeroes can be exploited in the same way as we did with columns.
+     * However, the column calculation has created many nonzero AC terms, so
+     * the simplification applies less often (typically 5% to 10% of the time).
+     * On machines with very fast multiplication, it's possible that the
+     * test takes more time than it's worth.  In that case this section
+     * may be commented out.
+     */
+    
+#ifndef NO_ZERO_ROW_TEST
+    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&
+	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
+      /* AC terms all zero */
+      JSAMPLE dcval = range_limit[IDESCALE(wsptr[0], PASS1_BITS+3)
+				  & RANGE_MASK];
+      
+      outptr[0] = dcval;
+      outptr[1] = dcval;
+      outptr[2] = dcval;
+      outptr[3] = dcval;
+      outptr[4] = dcval;
+      outptr[5] = dcval;
+      outptr[6] = dcval;
+      outptr[7] = dcval;
+
+      wsptr += DCTSIZE;		/* advance pointer to next row */
+      continue;
+    }
+#endif
+    
+    /* Even part */
+
+    tmp10 = ((DCTELEM) wsptr[0] + (DCTELEM) wsptr[4]);
+    tmp11 = ((DCTELEM) wsptr[0] - (DCTELEM) wsptr[4]);
+
+    tmp13 = ((DCTELEM) wsptr[2] + (DCTELEM) wsptr[6]);
+    tmp12 = MULTIPLY((DCTELEM) wsptr[2] - (DCTELEM) wsptr[6], FIX_1_414213562)
+	    - tmp13;
+
+    tmp0 = tmp10 + tmp13;
+    tmp3 = tmp10 - tmp13;
+    tmp1 = tmp11 + tmp12;
+    tmp2 = tmp11 - tmp12;
+
+    /* Odd part */
+
+    z13 = (DCTELEM) wsptr[5] + (DCTELEM) wsptr[3];
+    z10 = (DCTELEM) wsptr[5] - (DCTELEM) wsptr[3];
+    z11 = (DCTELEM) wsptr[1] + (DCTELEM) wsptr[7];
+    z12 = (DCTELEM) wsptr[1] - (DCTELEM) wsptr[7];
+
+    tmp7 = z11 + z13;		/* phase 5 */
+    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */
+
+    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */
+    tmp10 = MULTIPLY(z12, FIX_1_082392200) - z5; /* 2*(c2-c6) */
+    tmp12 = MULTIPLY(z10, - FIX_2_613125930) + z5; /* -2*(c2+c6) */
+
+    tmp6 = tmp12 - tmp7;	/* phase 2 */
+    tmp5 = tmp11 - tmp6;
+    tmp4 = tmp10 + tmp5;
+
+    /* Final output stage: scale down by a factor of 8 and range-limit */
+
+    outptr[0] = range_limit[IDESCALE(tmp0 + tmp7, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[7] = range_limit[IDESCALE(tmp0 - tmp7, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[IDESCALE(tmp1 + tmp6, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[6] = range_limit[IDESCALE(tmp1 - tmp6, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[2] = range_limit[IDESCALE(tmp2 + tmp5, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[5] = range_limit[IDESCALE(tmp2 - tmp5, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[4] = range_limit[IDESCALE(tmp3 + tmp4, PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[3] = range_limit[IDESCALE(tmp3 - tmp4, PASS1_BITS+3)
+			    & RANGE_MASK];
+
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+#endif /* DCT_IFAST_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jidctint.c b/Source/3rd Party/wx/src/jpeg/jidctint.c
index e0d89dbe4..2783c2302 100644
--- a/Source/3rd Party/wx/src/jpeg/jidctint.c	
+++ b/Source/3rd Party/wx/src/jpeg/jidctint.c	
@@ -1,389 +1,389 @@
-/*
- * jidctint.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a slow-but-accurate integer implementation of the
- * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
- * must also perform dequantization of the input coefficients.
- *
- * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
- * on each row (or vice versa, but it's more convenient to emit a row at
- * a time).  Direct algorithms are also available, but they are much more
- * complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on an algorithm described in
- *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT
- *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,
- *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.
- * The primary algorithm described there uses 11 multiplies and 29 adds.
- * We use their alternate method with 12 multiplies and 32 adds.
- * The advantage of this method is that no data path contains more than one
- * multiplication; this allows a very simple and accurate implementation in
- * scaled fixed-point arithmetic, with a minimal number of shifts.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_ISLOW_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/*
- * The poop on this scaling stuff is as follows:
- *
- * Each 1-D IDCT step produces outputs which are a factor of sqrt(N)
- * larger than the true IDCT outputs.  The final outputs are therefore
- * a factor of N larger than desired; since N=8 this can be cured by
- * a simple right shift at the end of the algorithm.  The advantage of
- * this arrangement is that we save two multiplications per 1-D IDCT,
- * because the y0 and y4 inputs need not be divided by sqrt(N).
- *
- * We have to do addition and subtraction of the integer inputs, which
- * is no problem, and multiplication by fractional constants, which is
- * a problem to do in integer arithmetic.  We multiply all the constants
- * by CONST_SCALE and convert them to integer constants (thus retaining
- * CONST_BITS bits of precision in the constants).  After doing a
- * multiplication we have to divide the product by CONST_SCALE, with proper
- * rounding, to produce the correct output.  This division can be done
- * cheaply as a right shift of CONST_BITS bits.  We postpone shifting
- * as long as possible so that partial sums can be added together with
- * full fractional precision.
- *
- * The outputs of the first pass are scaled up by PASS1_BITS bits so that
- * they are represented to better-than-integral precision.  These outputs
- * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word
- * with the recommended scaling.  (To scale up 12-bit sample data further, an
- * intermediate INT32 array would be needed.)
- *
- * To avoid overflow of the 32-bit intermediate results in pass 2, we must
- * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis
- * shows that the values given below are the most effective.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define CONST_BITS  13
-#define PASS1_BITS  2
-#else
-#define CONST_BITS  13
-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
-#endif
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 13
-#define FIX_0_298631336  ((JPEG_INT32)  2446)	/* FIX(0.298631336) */
-#define FIX_0_390180644  ((JPEG_INT32)  3196)	/* FIX(0.390180644) */
-#define FIX_0_541196100  ((JPEG_INT32)  4433)	/* FIX(0.541196100) */
-#define FIX_0_765366865  ((JPEG_INT32)  6270)	/* FIX(0.765366865) */
-#define FIX_0_899976223  ((JPEG_INT32)  7373)	/* FIX(0.899976223) */
-#define FIX_1_175875602  ((JPEG_INT32)  9633)	/* FIX(1.175875602) */
-#define FIX_1_501321110  ((JPEG_INT32)  12299)	/* FIX(1.501321110) */
-#define FIX_1_847759065  ((JPEG_INT32)  15137)	/* FIX(1.847759065) */
-#define FIX_1_961570560  ((JPEG_INT32)  16069)	/* FIX(1.961570560) */
-#define FIX_2_053119869  ((JPEG_INT32)  16819)	/* FIX(2.053119869) */
-#define FIX_2_562915447  ((JPEG_INT32)  20995)	/* FIX(2.562915447) */
-#define FIX_3_072711026  ((JPEG_INT32)  25172)	/* FIX(3.072711026) */
-#else
-#define FIX_0_298631336  FIX(0.298631336)
-#define FIX_0_390180644  FIX(0.390180644)
-#define FIX_0_541196100  FIX(0.541196100)
-#define FIX_0_765366865  FIX(0.765366865)
-#define FIX_0_899976223  FIX(0.899976223)
-#define FIX_1_175875602  FIX(1.175875602)
-#define FIX_1_501321110  FIX(1.501321110)
-#define FIX_1_847759065  FIX(1.847759065)
-#define FIX_1_961570560  FIX(1.961570560)
-#define FIX_2_053119869  FIX(2.053119869)
-#define FIX_2_562915447  FIX(2.562915447)
-#define FIX_3_072711026  FIX(3.072711026)
-#endif
-
-
-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
- * For 8-bit samples with the recommended scaling, all the variable
- * and constant values involved are no more than 16 bits wide, so a
- * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
- * For 12-bit samples, a full 32-bit multiplication will be needed.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
-#else
-#define MULTIPLY(var,const)  ((var) * (const))
-#endif
-
-
-/* Dequantize a coefficient by multiplying it by the multiplier-table
- * entry; produce an int result.  In this module, both inputs and result
- * are 16 bits or less, so either int or short multiply will work.
- */
-
-#define DEQUANTIZE(coef,quantval)  (((ISLOW_MULT_TYPE) (coef)) * (quantval))
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients.
- */
-
-GLOBAL(void)
-jpeg_idct_islow (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  JPEG_INT32 tmp0, tmp1, tmp2, tmp3;
-  JPEG_INT32 tmp10, tmp11, tmp12, tmp13;
-  JPEG_INT32 z1, z2, z3, z4, z5;
-  JCOEFPTR inptr;
-  ISLOW_MULT_TYPE * quantptr;
-  int * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  int workspace[DCTSIZE2];	/* buffers data between passes */
-  SHIFT_TEMPS
-
-  /* Pass 1: process columns from input, store into work array. */
-  /* Note results are scaled up by sqrt(8) compared to a true IDCT; */
-  /* furthermore, we scale the results by 2**PASS1_BITS. */
-
-  inptr = coef_block;
-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; ctr--) {
-    /* Due to quantization, we will usually find that many of the input
-     * coefficients are zero, especially the AC terms.  We can exploit this
-     * by short-circuiting the IDCT calculation for any column in which all
-     * the AC terms are zero.  In that case each output is equal to the
-     * DC coefficient (with scale factor as needed).
-     * With typical images and quantization tables, half or more of the
-     * column DCT calculations can be simplified this way.
-     */
-    
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
-	inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero */
-      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
-      
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      wsptr[DCTSIZE*2] = dcval;
-      wsptr[DCTSIZE*3] = dcval;
-      wsptr[DCTSIZE*4] = dcval;
-      wsptr[DCTSIZE*5] = dcval;
-      wsptr[DCTSIZE*6] = dcval;
-      wsptr[DCTSIZE*7] = dcval;
-      
-      inptr++;			/* advance pointers to next column */
-      quantptr++;
-      wsptr++;
-      continue;
-    }
-    
-    /* Even part: reverse the even part of the forward DCT. */
-    /* The rotator is sqrt(2)*c(-6). */
-    
-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
-    
-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);
-    tmp2 = z1 + MULTIPLY(z3, - FIX_1_847759065);
-    tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865);
-    
-    z2 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    z3 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
-
-    tmp0 = (z2 + z3) << CONST_BITS;
-    tmp1 = (z2 - z3) << CONST_BITS;
-    
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    /* Odd part per figure 8; the matrix is unitary and hence its
-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
-     */
-    
-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    
-    z1 = tmp0 + tmp3;
-    z2 = tmp1 + tmp2;
-    z3 = tmp0 + tmp2;
-    z4 = tmp1 + tmp3;
-    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
-    
-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    tmp0 += z1 + z3;
-    tmp1 += z2 + z4;
-    tmp2 += z2 + z3;
-    tmp3 += z1 + z4;
-    
-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
-    
-    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*7] = (int) DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*1] = (int) DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*6] = (int) DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*2] = (int) DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*5] = (int) DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*3] = (int) DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*4] = (int) DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS);
-    
-    inptr++;			/* advance pointers to next column */
-    quantptr++;
-    wsptr++;
-  }
-  
-  /* Pass 2: process rows from work array, store into output array. */
-  /* Note that we must descale the results by a factor of 8 == 2**3, */
-  /* and also undo the PASS1_BITS scaling. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < DCTSIZE; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* Rows of zeroes can be exploited in the same way as we did with columns.
-     * However, the column calculation has created many nonzero AC terms, so
-     * the simplification applies less often (typically 5% to 10% of the time).
-     * On machines with very fast multiplication, it's possible that the
-     * test takes more time than it's worth.  In that case this section
-     * may be commented out.
-     */
-    
-#ifndef NO_ZERO_ROW_TEST
-    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&
-	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
-      /* AC terms all zero */
-      JSAMPLE dcval = range_limit[(int) DESCALE((JPEG_INT32) wsptr[0], PASS1_BITS+3)
-				  & RANGE_MASK];
-      
-      outptr[0] = dcval;
-      outptr[1] = dcval;
-      outptr[2] = dcval;
-      outptr[3] = dcval;
-      outptr[4] = dcval;
-      outptr[5] = dcval;
-      outptr[6] = dcval;
-      outptr[7] = dcval;
-
-      wsptr += DCTSIZE;		/* advance pointer to next row */
-      continue;
-    }
-#endif
-    
-    /* Even part: reverse the even part of the forward DCT. */
-    /* The rotator is sqrt(2)*c(-6). */
-    
-    z2 = (JPEG_INT32) wsptr[2];
-    z3 = (JPEG_INT32) wsptr[6];
-    
-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);
-    tmp2 = z1 + MULTIPLY(z3, - FIX_1_847759065);
-    tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865);
-    
-    tmp0 = ((JPEG_INT32) wsptr[0] + (JPEG_INT32) wsptr[4]) << CONST_BITS;
-    tmp1 = ((JPEG_INT32) wsptr[0] - (JPEG_INT32) wsptr[4]) << CONST_BITS;
-    
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    /* Odd part per figure 8; the matrix is unitary and hence its
-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
-     */
-    
-    tmp0 = (JPEG_INT32) wsptr[7];
-    tmp1 = (JPEG_INT32) wsptr[5];
-    tmp2 = (JPEG_INT32) wsptr[3];
-    tmp3 = (JPEG_INT32) wsptr[1];
-    
-    z1 = tmp0 + tmp3;
-    z2 = tmp1 + tmp2;
-    z3 = tmp0 + tmp2;
-    z4 = tmp1 + tmp3;
-    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
-    
-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    tmp0 += z1 + z3;
-    tmp1 += z2 + z4;
-    tmp2 += z2 + z3;
-    tmp3 += z1 + z4;
-    
-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
-    
-    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp3,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[7] = range_limit[(int) DESCALE(tmp10 - tmp3,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[(int) DESCALE(tmp11 + tmp2,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[6] = range_limit[(int) DESCALE(tmp11 - tmp2,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[2] = range_limit[(int) DESCALE(tmp12 + tmp1,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[5] = range_limit[(int) DESCALE(tmp12 - tmp1,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[3] = range_limit[(int) DESCALE(tmp13 + tmp0,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[4] = range_limit[(int) DESCALE(tmp13 - tmp0,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-#endif /* DCT_ISLOW_SUPPORTED */
+/*
+ * jidctint.c
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a slow-but-accurate integer implementation of the
+ * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
+ * must also perform dequantization of the input coefficients.
+ *
+ * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
+ * on each row (or vice versa, but it's more convenient to emit a row at
+ * a time).  Direct algorithms are also available, but they are much more
+ * complex and seem not to be any faster when reduced to code.
+ *
+ * This implementation is based on an algorithm described in
+ *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT
+ *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,
+ *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.
+ * The primary algorithm described there uses 11 multiplies and 29 adds.
+ * We use their alternate method with 12 multiplies and 32 adds.
+ * The advantage of this method is that no data path contains more than one
+ * multiplication; this allows a very simple and accurate implementation in
+ * scaled fixed-point arithmetic, with a minimal number of shifts.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef DCT_ISLOW_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/*
+ * The poop on this scaling stuff is as follows:
+ *
+ * Each 1-D IDCT step produces outputs which are a factor of sqrt(N)
+ * larger than the true IDCT outputs.  The final outputs are therefore
+ * a factor of N larger than desired; since N=8 this can be cured by
+ * a simple right shift at the end of the algorithm.  The advantage of
+ * this arrangement is that we save two multiplications per 1-D IDCT,
+ * because the y0 and y4 inputs need not be divided by sqrt(N).
+ *
+ * We have to do addition and subtraction of the integer inputs, which
+ * is no problem, and multiplication by fractional constants, which is
+ * a problem to do in integer arithmetic.  We multiply all the constants
+ * by CONST_SCALE and convert them to integer constants (thus retaining
+ * CONST_BITS bits of precision in the constants).  After doing a
+ * multiplication we have to divide the product by CONST_SCALE, with proper
+ * rounding, to produce the correct output.  This division can be done
+ * cheaply as a right shift of CONST_BITS bits.  We postpone shifting
+ * as long as possible so that partial sums can be added together with
+ * full fractional precision.
+ *
+ * The outputs of the first pass are scaled up by PASS1_BITS bits so that
+ * they are represented to better-than-integral precision.  These outputs
+ * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word
+ * with the recommended scaling.  (To scale up 12-bit sample data further, an
+ * intermediate INT32 array would be needed.)
+ *
+ * To avoid overflow of the 32-bit intermediate results in pass 2, we must
+ * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis
+ * shows that the values given below are the most effective.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define CONST_BITS  13
+#define PASS1_BITS  2
+#else
+#define CONST_BITS  13
+#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
+#endif
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 13
+#define FIX_0_298631336  ((JPEG_INT32)  2446)	/* FIX(0.298631336) */
+#define FIX_0_390180644  ((JPEG_INT32)  3196)	/* FIX(0.390180644) */
+#define FIX_0_541196100  ((JPEG_INT32)  4433)	/* FIX(0.541196100) */
+#define FIX_0_765366865  ((JPEG_INT32)  6270)	/* FIX(0.765366865) */
+#define FIX_0_899976223  ((JPEG_INT32)  7373)	/* FIX(0.899976223) */
+#define FIX_1_175875602  ((JPEG_INT32)  9633)	/* FIX(1.175875602) */
+#define FIX_1_501321110  ((JPEG_INT32)  12299)	/* FIX(1.501321110) */
+#define FIX_1_847759065  ((JPEG_INT32)  15137)	/* FIX(1.847759065) */
+#define FIX_1_961570560  ((JPEG_INT32)  16069)	/* FIX(1.961570560) */
+#define FIX_2_053119869  ((JPEG_INT32)  16819)	/* FIX(2.053119869) */
+#define FIX_2_562915447  ((JPEG_INT32)  20995)	/* FIX(2.562915447) */
+#define FIX_3_072711026  ((JPEG_INT32)  25172)	/* FIX(3.072711026) */
+#else
+#define FIX_0_298631336  FIX(0.298631336)
+#define FIX_0_390180644  FIX(0.390180644)
+#define FIX_0_541196100  FIX(0.541196100)
+#define FIX_0_765366865  FIX(0.765366865)
+#define FIX_0_899976223  FIX(0.899976223)
+#define FIX_1_175875602  FIX(1.175875602)
+#define FIX_1_501321110  FIX(1.501321110)
+#define FIX_1_847759065  FIX(1.847759065)
+#define FIX_1_961570560  FIX(1.961570560)
+#define FIX_2_053119869  FIX(2.053119869)
+#define FIX_2_562915447  FIX(2.562915447)
+#define FIX_3_072711026  FIX(3.072711026)
+#endif
+
+
+/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
+ * For 8-bit samples with the recommended scaling, all the variable
+ * and constant values involved are no more than 16 bits wide, so a
+ * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
+ * For 12-bit samples, a full 32-bit multiplication will be needed.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
+#else
+#define MULTIPLY(var,const)  ((var) * (const))
+#endif
+
+
+/* Dequantize a coefficient by multiplying it by the multiplier-table
+ * entry; produce an int result.  In this module, both inputs and result
+ * are 16 bits or less, so either int or short multiply will work.
+ */
+
+#define DEQUANTIZE(coef,quantval)  (((ISLOW_MULT_TYPE) (coef)) * (quantval))
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients.
+ */
+
+GLOBAL(void)
+jpeg_idct_islow (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JCOEFPTR coef_block,
+		 JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  JPEG_INT32 tmp0, tmp1, tmp2, tmp3;
+  JPEG_INT32 tmp10, tmp11, tmp12, tmp13;
+  JPEG_INT32 z1, z2, z3, z4, z5;
+  JCOEFPTR inptr;
+  ISLOW_MULT_TYPE * quantptr;
+  int * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  int workspace[DCTSIZE2];	/* buffers data between passes */
+  SHIFT_TEMPS
+
+  /* Pass 1: process columns from input, store into work array. */
+  /* Note results are scaled up by sqrt(8) compared to a true IDCT; */
+  /* furthermore, we scale the results by 2**PASS1_BITS. */
+
+  inptr = coef_block;
+  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; ctr--) {
+    /* Due to quantization, we will usually find that many of the input
+     * coefficients are zero, especially the AC terms.  We can exploit this
+     * by short-circuiting the IDCT calculation for any column in which all
+     * the AC terms are zero.  In that case each output is equal to the
+     * DC coefficient (with scale factor as needed).
+     * With typical images and quantization tables, half or more of the
+     * column DCT calculations can be simplified this way.
+     */
+    
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
+	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
+	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
+	inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero */
+      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
+      
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+      wsptr[DCTSIZE*2] = dcval;
+      wsptr[DCTSIZE*3] = dcval;
+      wsptr[DCTSIZE*4] = dcval;
+      wsptr[DCTSIZE*5] = dcval;
+      wsptr[DCTSIZE*6] = dcval;
+      wsptr[DCTSIZE*7] = dcval;
+      
+      inptr++;			/* advance pointers to next column */
+      quantptr++;
+      wsptr++;
+      continue;
+    }
+    
+    /* Even part: reverse the even part of the forward DCT. */
+    /* The rotator is sqrt(2)*c(-6). */
+    
+    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
+    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
+    
+    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);
+    tmp2 = z1 + MULTIPLY(z3, - FIX_1_847759065);
+    tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865);
+    
+    z2 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    z3 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
+
+    tmp0 = (z2 + z3) << CONST_BITS;
+    tmp1 = (z2 - z3) << CONST_BITS;
+    
+    tmp10 = tmp0 + tmp3;
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+    
+    /* Odd part per figure 8; the matrix is unitary and hence its
+     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
+     */
+    
+    tmp0 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+    tmp1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    tmp2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    tmp3 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+    
+    z1 = tmp0 + tmp3;
+    z2 = tmp1 + tmp2;
+    z3 = tmp0 + tmp2;
+    z4 = tmp1 + tmp3;
+    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
+    
+    tmp0 = MULTIPLY(tmp0, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
+    tmp1 = MULTIPLY(tmp1, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
+    tmp2 = MULTIPLY(tmp2, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
+    tmp3 = MULTIPLY(tmp3, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
+    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
+    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
+    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
+    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
+    
+    z3 += z5;
+    z4 += z5;
+    
+    tmp0 += z1 + z3;
+    tmp1 += z2 + z4;
+    tmp2 += z2 + z3;
+    tmp3 += z1 + z4;
+    
+    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
+    
+    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*7] = (int) DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*1] = (int) DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*6] = (int) DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*2] = (int) DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*5] = (int) DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*3] = (int) DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS);
+    wsptr[DCTSIZE*4] = (int) DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS);
+    
+    inptr++;			/* advance pointers to next column */
+    quantptr++;
+    wsptr++;
+  }
+  
+  /* Pass 2: process rows from work array, store into output array. */
+  /* Note that we must descale the results by a factor of 8 == 2**3, */
+  /* and also undo the PASS1_BITS scaling. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < DCTSIZE; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* Rows of zeroes can be exploited in the same way as we did with columns.
+     * However, the column calculation has created many nonzero AC terms, so
+     * the simplification applies less often (typically 5% to 10% of the time).
+     * On machines with very fast multiplication, it's possible that the
+     * test takes more time than it's worth.  In that case this section
+     * may be commented out.
+     */
+    
+#ifndef NO_ZERO_ROW_TEST
+    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&
+	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
+      /* AC terms all zero */
+      JSAMPLE dcval = range_limit[(int) DESCALE((JPEG_INT32) wsptr[0], PASS1_BITS+3)
+				  & RANGE_MASK];
+      
+      outptr[0] = dcval;
+      outptr[1] = dcval;
+      outptr[2] = dcval;
+      outptr[3] = dcval;
+      outptr[4] = dcval;
+      outptr[5] = dcval;
+      outptr[6] = dcval;
+      outptr[7] = dcval;
+
+      wsptr += DCTSIZE;		/* advance pointer to next row */
+      continue;
+    }
+#endif
+    
+    /* Even part: reverse the even part of the forward DCT. */
+    /* The rotator is sqrt(2)*c(-6). */
+    
+    z2 = (JPEG_INT32) wsptr[2];
+    z3 = (JPEG_INT32) wsptr[6];
+    
+    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);
+    tmp2 = z1 + MULTIPLY(z3, - FIX_1_847759065);
+    tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865);
+    
+    tmp0 = ((JPEG_INT32) wsptr[0] + (JPEG_INT32) wsptr[4]) << CONST_BITS;
+    tmp1 = ((JPEG_INT32) wsptr[0] - (JPEG_INT32) wsptr[4]) << CONST_BITS;
+    
+    tmp10 = tmp0 + tmp3;
+    tmp13 = tmp0 - tmp3;
+    tmp11 = tmp1 + tmp2;
+    tmp12 = tmp1 - tmp2;
+    
+    /* Odd part per figure 8; the matrix is unitary and hence its
+     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
+     */
+    
+    tmp0 = (JPEG_INT32) wsptr[7];
+    tmp1 = (JPEG_INT32) wsptr[5];
+    tmp2 = (JPEG_INT32) wsptr[3];
+    tmp3 = (JPEG_INT32) wsptr[1];
+    
+    z1 = tmp0 + tmp3;
+    z2 = tmp1 + tmp2;
+    z3 = tmp0 + tmp2;
+    z4 = tmp1 + tmp3;
+    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
+    
+    tmp0 = MULTIPLY(tmp0, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
+    tmp1 = MULTIPLY(tmp1, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
+    tmp2 = MULTIPLY(tmp2, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
+    tmp3 = MULTIPLY(tmp3, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
+    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
+    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
+    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
+    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
+    
+    z3 += z5;
+    z4 += z5;
+    
+    tmp0 += z1 + z3;
+    tmp1 += z2 + z4;
+    tmp2 += z2 + z3;
+    tmp3 += z1 + z4;
+    
+    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
+    
+    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp3,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[7] = range_limit[(int) DESCALE(tmp10 - tmp3,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[(int) DESCALE(tmp11 + tmp2,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[6] = range_limit[(int) DESCALE(tmp11 - tmp2,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[2] = range_limit[(int) DESCALE(tmp12 + tmp1,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[5] = range_limit[(int) DESCALE(tmp12 - tmp1,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[3] = range_limit[(int) DESCALE(tmp13 + tmp0,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    outptr[4] = range_limit[(int) DESCALE(tmp13 - tmp0,
+					  CONST_BITS+PASS1_BITS+3)
+			    & RANGE_MASK];
+    
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+#endif /* DCT_ISLOW_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jidctred.c b/Source/3rd Party/wx/src/jpeg/jidctred.c
index 41a380de0..efda35aeb 100644
--- a/Source/3rd Party/wx/src/jpeg/jidctred.c	
+++ b/Source/3rd Party/wx/src/jpeg/jidctred.c	
@@ -1,398 +1,398 @@
-/*
- * jidctred.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains inverse-DCT routines that produce reduced-size output:
- * either 4x4, 2x2, or 1x1 pixels from an 8x8 DCT block.
- *
- * The implementation is based on the Loeffler, Ligtenberg and Moschytz (LL&M)
- * algorithm used in jidctint.c.  We simply replace each 8-to-8 1-D IDCT step
- * with an 8-to-4 step that produces the four averages of two adjacent outputs
- * (or an 8-to-2 step producing two averages of four outputs, for 2x2 output).
- * These steps were derived by computing the corresponding values at the end
- * of the normal LL&M code, then simplifying as much as possible.
- *
- * 1x1 is trivial: just take the DC coefficient divided by 8.
- *
- * See jidctint.c for additional comments.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef IDCT_SCALING_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/* Scaling is the same as in jidctint.c. */
-
-#if BITS_IN_JSAMPLE == 8
-#define CONST_BITS  13
-#define PASS1_BITS  2
-#else
-#define CONST_BITS  13
-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
-#endif
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 13
-#define FIX_0_211164243  ((JPEG_INT32)  1730)	/* FIX(0.211164243) */
-#define FIX_0_509795579  ((JPEG_INT32)  4176)	/* FIX(0.509795579) */
-#define FIX_0_601344887  ((JPEG_INT32)  4926)	/* FIX(0.601344887) */
-#define FIX_0_720959822  ((JPEG_INT32)  5906)	/* FIX(0.720959822) */
-#define FIX_0_765366865  ((JPEG_INT32)  6270)	/* FIX(0.765366865) */
-#define FIX_0_850430095  ((JPEG_INT32)  6967)	/* FIX(0.850430095) */
-#define FIX_0_899976223  ((JPEG_INT32)  7373)	/* FIX(0.899976223) */
-#define FIX_1_061594337  ((JPEG_INT32)  8697)	/* FIX(1.061594337) */
-#define FIX_1_272758580  ((JPEG_INT32)  10426)	/* FIX(1.272758580) */
-#define FIX_1_451774981  ((JPEG_INT32)  11893)	/* FIX(1.451774981) */
-#define FIX_1_847759065  ((JPEG_INT32)  15137)	/* FIX(1.847759065) */
-#define FIX_2_172734803  ((JPEG_INT32)  17799)	/* FIX(2.172734803) */
-#define FIX_2_562915447  ((JPEG_INT32)  20995)	/* FIX(2.562915447) */
-#define FIX_3_624509785  ((JPEG_INT32)  29692)	/* FIX(3.624509785) */
-#else
-#define FIX_0_211164243  FIX(0.211164243)
-#define FIX_0_509795579  FIX(0.509795579)
-#define FIX_0_601344887  FIX(0.601344887)
-#define FIX_0_720959822  FIX(0.720959822)
-#define FIX_0_765366865  FIX(0.765366865)
-#define FIX_0_850430095  FIX(0.850430095)
-#define FIX_0_899976223  FIX(0.899976223)
-#define FIX_1_061594337  FIX(1.061594337)
-#define FIX_1_272758580  FIX(1.272758580)
-#define FIX_1_451774981  FIX(1.451774981)
-#define FIX_1_847759065  FIX(1.847759065)
-#define FIX_2_172734803  FIX(2.172734803)
-#define FIX_2_562915447  FIX(2.562915447)
-#define FIX_3_624509785  FIX(3.624509785)
-#endif
-
-
-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
- * For 8-bit samples with the recommended scaling, all the variable
- * and constant values involved are no more than 16 bits wide, so a
- * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
- * For 12-bit samples, a full 32-bit multiplication will be needed.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
-#else
-#define MULTIPLY(var,const)  ((var) * (const))
-#endif
-
-
-/* Dequantize a coefficient by multiplying it by the multiplier-table
- * entry; produce an int result.  In this module, both inputs and result
- * are 16 bits or less, so either int or short multiply will work.
- */
-
-#define DEQUANTIZE(coef,quantval)  (((ISLOW_MULT_TYPE) (coef)) * (quantval))
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients,
- * producing a reduced-size 4x4 output block.
- */
-
-GLOBAL(void)
-jpeg_idct_4x4 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JCOEFPTR coef_block,
-	       JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  JPEG_INT32 tmp0, tmp2, tmp10, tmp12;
-  JPEG_INT32 z1, z2, z3, z4;
-  JCOEFPTR inptr;
-  ISLOW_MULT_TYPE * quantptr;
-  int * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  int workspace[DCTSIZE*4];	/* buffers data between passes */
-  SHIFT_TEMPS
-
-  /* Pass 1: process columns from input, store into work array. */
-
-  inptr = coef_block;
-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; inptr++, quantptr++, wsptr++, ctr--) {
-    /* Don't bother to process column 4, because second pass won't use it */
-    if (ctr == DCTSIZE-4)
-      continue;
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*5] == 0 &&
-	inptr[DCTSIZE*6] == 0 && inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero; we need not examine term 4 for 4x4 output */
-      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
-      
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      wsptr[DCTSIZE*2] = dcval;
-      wsptr[DCTSIZE*3] = dcval;
-      
-      continue;
-    }
-    
-    /* Even part */
-    
-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    tmp0 <<= (CONST_BITS+1);
-    
-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
-
-    tmp2 = MULTIPLY(z2, FIX_1_847759065) + MULTIPLY(z3, - FIX_0_765366865);
-    
-    tmp10 = tmp0 + tmp2;
-    tmp12 = tmp0 - tmp2;
-    
-    /* Odd part */
-    
-    z1 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-    z2 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    z3 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    z4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    
-    tmp0 = MULTIPLY(z1, - FIX_0_211164243) /* sqrt(2) * (c3-c1) */
-	 + MULTIPLY(z2, FIX_1_451774981) /* sqrt(2) * (c3+c7) */
-	 + MULTIPLY(z3, - FIX_2_172734803) /* sqrt(2) * (-c1-c5) */
-	 + MULTIPLY(z4, FIX_1_061594337); /* sqrt(2) * (c5+c7) */
-    
-    tmp2 = MULTIPLY(z1, - FIX_0_509795579) /* sqrt(2) * (c7-c5) */
-	 + MULTIPLY(z2, - FIX_0_601344887) /* sqrt(2) * (c5-c1) */
-	 + MULTIPLY(z3, FIX_0_899976223) /* sqrt(2) * (c3-c7) */
-	 + MULTIPLY(z4, FIX_2_562915447); /* sqrt(2) * (c1+c3) */
-
-    /* Final output stage */
-    
-    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp2, CONST_BITS-PASS1_BITS+1);
-    wsptr[DCTSIZE*3] = (int) DESCALE(tmp10 - tmp2, CONST_BITS-PASS1_BITS+1);
-    wsptr[DCTSIZE*1] = (int) DESCALE(tmp12 + tmp0, CONST_BITS-PASS1_BITS+1);
-    wsptr[DCTSIZE*2] = (int) DESCALE(tmp12 - tmp0, CONST_BITS-PASS1_BITS+1);
-  }
-  
-  /* Pass 2: process 4 rows from work array, store into output array. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < 4; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* It's not clear whether a zero row test is worthwhile here ... */
-
-#ifndef NO_ZERO_ROW_TEST
-    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 &&
-	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
-      /* AC terms all zero */
-      JSAMPLE dcval = range_limit[(int) DESCALE((JPEG_INT32) wsptr[0], PASS1_BITS+3)
-				  & RANGE_MASK];
-      
-      outptr[0] = dcval;
-      outptr[1] = dcval;
-      outptr[2] = dcval;
-      outptr[3] = dcval;
-      
-      wsptr += DCTSIZE;		/* advance pointer to next row */
-      continue;
-    }
-#endif
-    
-    /* Even part */
-    
-    tmp0 = ((JPEG_INT32) wsptr[0]) << (CONST_BITS+1);
-    
-    tmp2 = MULTIPLY((JPEG_INT32) wsptr[2], FIX_1_847759065)
-	 + MULTIPLY((JPEG_INT32) wsptr[6], - FIX_0_765366865);
-    
-    tmp10 = tmp0 + tmp2;
-    tmp12 = tmp0 - tmp2;
-    
-    /* Odd part */
-    
-    z1 = (JPEG_INT32) wsptr[7];
-    z2 = (JPEG_INT32) wsptr[5];
-    z3 = (JPEG_INT32) wsptr[3];
-    z4 = (JPEG_INT32) wsptr[1];
-    
-    tmp0 = MULTIPLY(z1, - FIX_0_211164243) /* sqrt(2) * (c3-c1) */
-	 + MULTIPLY(z2, FIX_1_451774981) /* sqrt(2) * (c3+c7) */
-	 + MULTIPLY(z3, - FIX_2_172734803) /* sqrt(2) * (-c1-c5) */
-	 + MULTIPLY(z4, FIX_1_061594337); /* sqrt(2) * (c5+c7) */
-    
-    tmp2 = MULTIPLY(z1, - FIX_0_509795579) /* sqrt(2) * (c7-c5) */
-	 + MULTIPLY(z2, - FIX_0_601344887) /* sqrt(2) * (c5-c1) */
-	 + MULTIPLY(z3, FIX_0_899976223) /* sqrt(2) * (c3-c7) */
-	 + MULTIPLY(z4, FIX_2_562915447); /* sqrt(2) * (c1+c3) */
-
-    /* Final output stage */
-    
-    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp2,
-					  CONST_BITS+PASS1_BITS+3+1)
-			    & RANGE_MASK];
-    outptr[3] = range_limit[(int) DESCALE(tmp10 - tmp2,
-					  CONST_BITS+PASS1_BITS+3+1)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[(int) DESCALE(tmp12 + tmp0,
-					  CONST_BITS+PASS1_BITS+3+1)
-			    & RANGE_MASK];
-    outptr[2] = range_limit[(int) DESCALE(tmp12 - tmp0,
-					  CONST_BITS+PASS1_BITS+3+1)
-			    & RANGE_MASK];
-    
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients,
- * producing a reduced-size 2x2 output block.
- */
-
-GLOBAL(void)
-jpeg_idct_2x2 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JCOEFPTR coef_block,
-	       JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  JPEG_INT32 tmp0, tmp10, z1;
-  JCOEFPTR inptr;
-  ISLOW_MULT_TYPE * quantptr;
-  int * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  int workspace[DCTSIZE*2];	/* buffers data between passes */
-  SHIFT_TEMPS
-
-  /* Pass 1: process columns from input, store into work array. */
-
-  inptr = coef_block;
-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; inptr++, quantptr++, wsptr++, ctr--) {
-    /* Don't bother to process columns 2,4,6 */
-    if (ctr == DCTSIZE-2 || ctr == DCTSIZE-4 || ctr == DCTSIZE-6)
-      continue;
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*3] == 0 &&
-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero; we need not examine terms 2,4,6 for 2x2 output */
-      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
-      
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      
-      continue;
-    }
-    
-    /* Even part */
-    
-    z1 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    tmp10 = z1 << (CONST_BITS+2);
-    
-    /* Odd part */
-
-    z1 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-    tmp0 = MULTIPLY(z1, - FIX_0_720959822); /* sqrt(2) * (c7-c5+c3-c1) */
-    z1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    tmp0 += MULTIPLY(z1, FIX_0_850430095); /* sqrt(2) * (-c1+c3+c5+c7) */
-    z1 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    tmp0 += MULTIPLY(z1, - FIX_1_272758580); /* sqrt(2) * (-c1+c3-c5-c7) */
-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    tmp0 += MULTIPLY(z1, FIX_3_624509785); /* sqrt(2) * (c1+c3+c5+c7) */
-
-    /* Final output stage */
-    
-    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp0, CONST_BITS-PASS1_BITS+2);
-    wsptr[DCTSIZE*1] = (int) DESCALE(tmp10 - tmp0, CONST_BITS-PASS1_BITS+2);
-  }
-  
-  /* Pass 2: process 2 rows from work array, store into output array. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < 2; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* It's not clear whether a zero row test is worthwhile here ... */
-
-#ifndef NO_ZERO_ROW_TEST
-    if (wsptr[1] == 0 && wsptr[3] == 0 && wsptr[5] == 0 && wsptr[7] == 0) {
-      /* AC terms all zero */
-      JSAMPLE dcval = range_limit[(int) DESCALE((JPEG_INT32) wsptr[0], PASS1_BITS+3)
-				  & RANGE_MASK];
-      
-      outptr[0] = dcval;
-      outptr[1] = dcval;
-      
-      wsptr += DCTSIZE;		/* advance pointer to next row */
-      continue;
-    }
-#endif
-    
-    /* Even part */
-    
-    tmp10 = ((JPEG_INT32) wsptr[0]) << (CONST_BITS+2);
-    
-    /* Odd part */
-
-    tmp0 = MULTIPLY((JPEG_INT32) wsptr[7], - FIX_0_720959822) /* sqrt(2) * (c7-c5+c3-c1) */
-	 + MULTIPLY((JPEG_INT32) wsptr[5], FIX_0_850430095) /* sqrt(2) * (-c1+c3+c5+c7) */
-	 + MULTIPLY((JPEG_INT32) wsptr[3], - FIX_1_272758580) /* sqrt(2) * (-c1+c3-c5-c7) */
-	 + MULTIPLY((JPEG_INT32) wsptr[1], FIX_3_624509785); /* sqrt(2) * (c1+c3+c5+c7) */
-
-    /* Final output stage */
-    
-    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp0,
-					  CONST_BITS+PASS1_BITS+3+2)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[(int) DESCALE(tmp10 - tmp0,
-					  CONST_BITS+PASS1_BITS+3+2)
-			    & RANGE_MASK];
-    
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients,
- * producing a reduced-size 1x1 output block.
- */
-
-GLOBAL(void)
-jpeg_idct_1x1 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JCOEFPTR coef_block,
-	       JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  int dcval;
-  ISLOW_MULT_TYPE * quantptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  SHIFT_TEMPS
-
-  /* We hardly need an inverse DCT routine for this: just take the
-   * average pixel value, which is one-eighth of the DC coefficient.
-   */
-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
-  dcval = DEQUANTIZE(coef_block[0], quantptr[0]);
-  dcval = (int) DESCALE((JPEG_INT32) dcval, 3);
-
-  output_buf[0][output_col] = range_limit[dcval & RANGE_MASK];
-}
-
-#endif /* IDCT_SCALING_SUPPORTED */
+/*
+ * jidctred.c
+ *
+ * Copyright (C) 1994-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains inverse-DCT routines that produce reduced-size output:
+ * either 4x4, 2x2, or 1x1 pixels from an 8x8 DCT block.
+ *
+ * The implementation is based on the Loeffler, Ligtenberg and Moschytz (LL&M)
+ * algorithm used in jidctint.c.  We simply replace each 8-to-8 1-D IDCT step
+ * with an 8-to-4 step that produces the four averages of two adjacent outputs
+ * (or an 8-to-2 step producing two averages of four outputs, for 2x2 output).
+ * These steps were derived by computing the corresponding values at the end
+ * of the normal LL&M code, then simplifying as much as possible.
+ *
+ * 1x1 is trivial: just take the DC coefficient divided by 8.
+ *
+ * See jidctint.c for additional comments.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jdct.h"		/* Private declarations for DCT subsystem */
+
+#ifdef IDCT_SCALING_SUPPORTED
+
+
+/*
+ * This module is specialized to the case DCTSIZE = 8.
+ */
+
+#if DCTSIZE != 8
+  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
+#endif
+
+
+/* Scaling is the same as in jidctint.c. */
+
+#if BITS_IN_JSAMPLE == 8
+#define CONST_BITS  13
+#define PASS1_BITS  2
+#else
+#define CONST_BITS  13
+#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
+#endif
+
+/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
+ * causing a lot of useless floating-point operations at run time.
+ * To get around this we use the following pre-calculated constants.
+ * If you change CONST_BITS you may want to add appropriate values.
+ * (With a reasonable C compiler, you can just rely on the FIX() macro...)
+ */
+
+#if CONST_BITS == 13
+#define FIX_0_211164243  ((JPEG_INT32)  1730)	/* FIX(0.211164243) */
+#define FIX_0_509795579  ((JPEG_INT32)  4176)	/* FIX(0.509795579) */
+#define FIX_0_601344887  ((JPEG_INT32)  4926)	/* FIX(0.601344887) */
+#define FIX_0_720959822  ((JPEG_INT32)  5906)	/* FIX(0.720959822) */
+#define FIX_0_765366865  ((JPEG_INT32)  6270)	/* FIX(0.765366865) */
+#define FIX_0_850430095  ((JPEG_INT32)  6967)	/* FIX(0.850430095) */
+#define FIX_0_899976223  ((JPEG_INT32)  7373)	/* FIX(0.899976223) */
+#define FIX_1_061594337  ((JPEG_INT32)  8697)	/* FIX(1.061594337) */
+#define FIX_1_272758580  ((JPEG_INT32)  10426)	/* FIX(1.272758580) */
+#define FIX_1_451774981  ((JPEG_INT32)  11893)	/* FIX(1.451774981) */
+#define FIX_1_847759065  ((JPEG_INT32)  15137)	/* FIX(1.847759065) */
+#define FIX_2_172734803  ((JPEG_INT32)  17799)	/* FIX(2.172734803) */
+#define FIX_2_562915447  ((JPEG_INT32)  20995)	/* FIX(2.562915447) */
+#define FIX_3_624509785  ((JPEG_INT32)  29692)	/* FIX(3.624509785) */
+#else
+#define FIX_0_211164243  FIX(0.211164243)
+#define FIX_0_509795579  FIX(0.509795579)
+#define FIX_0_601344887  FIX(0.601344887)
+#define FIX_0_720959822  FIX(0.720959822)
+#define FIX_0_765366865  FIX(0.765366865)
+#define FIX_0_850430095  FIX(0.850430095)
+#define FIX_0_899976223  FIX(0.899976223)
+#define FIX_1_061594337  FIX(1.061594337)
+#define FIX_1_272758580  FIX(1.272758580)
+#define FIX_1_451774981  FIX(1.451774981)
+#define FIX_1_847759065  FIX(1.847759065)
+#define FIX_2_172734803  FIX(2.172734803)
+#define FIX_2_562915447  FIX(2.562915447)
+#define FIX_3_624509785  FIX(3.624509785)
+#endif
+
+
+/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
+ * For 8-bit samples with the recommended scaling, all the variable
+ * and constant values involved are no more than 16 bits wide, so a
+ * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
+ * For 12-bit samples, a full 32-bit multiplication will be needed.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
+#else
+#define MULTIPLY(var,const)  ((var) * (const))
+#endif
+
+
+/* Dequantize a coefficient by multiplying it by the multiplier-table
+ * entry; produce an int result.  In this module, both inputs and result
+ * are 16 bits or less, so either int or short multiply will work.
+ */
+
+#define DEQUANTIZE(coef,quantval)  (((ISLOW_MULT_TYPE) (coef)) * (quantval))
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients,
+ * producing a reduced-size 4x4 output block.
+ */
+
+GLOBAL(void)
+jpeg_idct_4x4 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JCOEFPTR coef_block,
+	       JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  JPEG_INT32 tmp0, tmp2, tmp10, tmp12;
+  JPEG_INT32 z1, z2, z3, z4;
+  JCOEFPTR inptr;
+  ISLOW_MULT_TYPE * quantptr;
+  int * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  int workspace[DCTSIZE*4];	/* buffers data between passes */
+  SHIFT_TEMPS
+
+  /* Pass 1: process columns from input, store into work array. */
+
+  inptr = coef_block;
+  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; inptr++, quantptr++, wsptr++, ctr--) {
+    /* Don't bother to process column 4, because second pass won't use it */
+    if (ctr == DCTSIZE-4)
+      continue;
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
+	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*5] == 0 &&
+	inptr[DCTSIZE*6] == 0 && inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero; we need not examine term 4 for 4x4 output */
+      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
+      
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+      wsptr[DCTSIZE*2] = dcval;
+      wsptr[DCTSIZE*3] = dcval;
+      
+      continue;
+    }
+    
+    /* Even part */
+    
+    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    tmp0 <<= (CONST_BITS+1);
+    
+    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
+    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
+
+    tmp2 = MULTIPLY(z2, FIX_1_847759065) + MULTIPLY(z3, - FIX_0_765366865);
+    
+    tmp10 = tmp0 + tmp2;
+    tmp12 = tmp0 - tmp2;
+    
+    /* Odd part */
+    
+    z1 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+    z2 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    z3 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    z4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+    
+    tmp0 = MULTIPLY(z1, - FIX_0_211164243) /* sqrt(2) * (c3-c1) */
+	 + MULTIPLY(z2, FIX_1_451774981) /* sqrt(2) * (c3+c7) */
+	 + MULTIPLY(z3, - FIX_2_172734803) /* sqrt(2) * (-c1-c5) */
+	 + MULTIPLY(z4, FIX_1_061594337); /* sqrt(2) * (c5+c7) */
+    
+    tmp2 = MULTIPLY(z1, - FIX_0_509795579) /* sqrt(2) * (c7-c5) */
+	 + MULTIPLY(z2, - FIX_0_601344887) /* sqrt(2) * (c5-c1) */
+	 + MULTIPLY(z3, FIX_0_899976223) /* sqrt(2) * (c3-c7) */
+	 + MULTIPLY(z4, FIX_2_562915447); /* sqrt(2) * (c1+c3) */
+
+    /* Final output stage */
+    
+    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp2, CONST_BITS-PASS1_BITS+1);
+    wsptr[DCTSIZE*3] = (int) DESCALE(tmp10 - tmp2, CONST_BITS-PASS1_BITS+1);
+    wsptr[DCTSIZE*1] = (int) DESCALE(tmp12 + tmp0, CONST_BITS-PASS1_BITS+1);
+    wsptr[DCTSIZE*2] = (int) DESCALE(tmp12 - tmp0, CONST_BITS-PASS1_BITS+1);
+  }
+  
+  /* Pass 2: process 4 rows from work array, store into output array. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < 4; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* It's not clear whether a zero row test is worthwhile here ... */
+
+#ifndef NO_ZERO_ROW_TEST
+    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 &&
+	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
+      /* AC terms all zero */
+      JSAMPLE dcval = range_limit[(int) DESCALE((JPEG_INT32) wsptr[0], PASS1_BITS+3)
+				  & RANGE_MASK];
+      
+      outptr[0] = dcval;
+      outptr[1] = dcval;
+      outptr[2] = dcval;
+      outptr[3] = dcval;
+      
+      wsptr += DCTSIZE;		/* advance pointer to next row */
+      continue;
+    }
+#endif
+    
+    /* Even part */
+    
+    tmp0 = ((JPEG_INT32) wsptr[0]) << (CONST_BITS+1);
+    
+    tmp2 = MULTIPLY((JPEG_INT32) wsptr[2], FIX_1_847759065)
+	 + MULTIPLY((JPEG_INT32) wsptr[6], - FIX_0_765366865);
+    
+    tmp10 = tmp0 + tmp2;
+    tmp12 = tmp0 - tmp2;
+    
+    /* Odd part */
+    
+    z1 = (JPEG_INT32) wsptr[7];
+    z2 = (JPEG_INT32) wsptr[5];
+    z3 = (JPEG_INT32) wsptr[3];
+    z4 = (JPEG_INT32) wsptr[1];
+    
+    tmp0 = MULTIPLY(z1, - FIX_0_211164243) /* sqrt(2) * (c3-c1) */
+	 + MULTIPLY(z2, FIX_1_451774981) /* sqrt(2) * (c3+c7) */
+	 + MULTIPLY(z3, - FIX_2_172734803) /* sqrt(2) * (-c1-c5) */
+	 + MULTIPLY(z4, FIX_1_061594337); /* sqrt(2) * (c5+c7) */
+    
+    tmp2 = MULTIPLY(z1, - FIX_0_509795579) /* sqrt(2) * (c7-c5) */
+	 + MULTIPLY(z2, - FIX_0_601344887) /* sqrt(2) * (c5-c1) */
+	 + MULTIPLY(z3, FIX_0_899976223) /* sqrt(2) * (c3-c7) */
+	 + MULTIPLY(z4, FIX_2_562915447); /* sqrt(2) * (c1+c3) */
+
+    /* Final output stage */
+    
+    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp2,
+					  CONST_BITS+PASS1_BITS+3+1)
+			    & RANGE_MASK];
+    outptr[3] = range_limit[(int) DESCALE(tmp10 - tmp2,
+					  CONST_BITS+PASS1_BITS+3+1)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[(int) DESCALE(tmp12 + tmp0,
+					  CONST_BITS+PASS1_BITS+3+1)
+			    & RANGE_MASK];
+    outptr[2] = range_limit[(int) DESCALE(tmp12 - tmp0,
+					  CONST_BITS+PASS1_BITS+3+1)
+			    & RANGE_MASK];
+    
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients,
+ * producing a reduced-size 2x2 output block.
+ */
+
+GLOBAL(void)
+jpeg_idct_2x2 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JCOEFPTR coef_block,
+	       JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  JPEG_INT32 tmp0, tmp10, z1;
+  JCOEFPTR inptr;
+  ISLOW_MULT_TYPE * quantptr;
+  int * wsptr;
+  JSAMPROW outptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  int ctr;
+  int workspace[DCTSIZE*2];	/* buffers data between passes */
+  SHIFT_TEMPS
+
+  /* Pass 1: process columns from input, store into work array. */
+
+  inptr = coef_block;
+  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
+  wsptr = workspace;
+  for (ctr = DCTSIZE; ctr > 0; inptr++, quantptr++, wsptr++, ctr--) {
+    /* Don't bother to process columns 2,4,6 */
+    if (ctr == DCTSIZE-2 || ctr == DCTSIZE-4 || ctr == DCTSIZE-6)
+      continue;
+    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*3] == 0 &&
+	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*7] == 0) {
+      /* AC terms all zero; we need not examine terms 2,4,6 for 2x2 output */
+      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
+      
+      wsptr[DCTSIZE*0] = dcval;
+      wsptr[DCTSIZE*1] = dcval;
+      
+      continue;
+    }
+    
+    /* Even part */
+    
+    z1 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
+    tmp10 = z1 << (CONST_BITS+2);
+    
+    /* Odd part */
+
+    z1 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
+    tmp0 = MULTIPLY(z1, - FIX_0_720959822); /* sqrt(2) * (c7-c5+c3-c1) */
+    z1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
+    tmp0 += MULTIPLY(z1, FIX_0_850430095); /* sqrt(2) * (-c1+c3+c5+c7) */
+    z1 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
+    tmp0 += MULTIPLY(z1, - FIX_1_272758580); /* sqrt(2) * (-c1+c3-c5-c7) */
+    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
+    tmp0 += MULTIPLY(z1, FIX_3_624509785); /* sqrt(2) * (c1+c3+c5+c7) */
+
+    /* Final output stage */
+    
+    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp0, CONST_BITS-PASS1_BITS+2);
+    wsptr[DCTSIZE*1] = (int) DESCALE(tmp10 - tmp0, CONST_BITS-PASS1_BITS+2);
+  }
+  
+  /* Pass 2: process 2 rows from work array, store into output array. */
+
+  wsptr = workspace;
+  for (ctr = 0; ctr < 2; ctr++) {
+    outptr = output_buf[ctr] + output_col;
+    /* It's not clear whether a zero row test is worthwhile here ... */
+
+#ifndef NO_ZERO_ROW_TEST
+    if (wsptr[1] == 0 && wsptr[3] == 0 && wsptr[5] == 0 && wsptr[7] == 0) {
+      /* AC terms all zero */
+      JSAMPLE dcval = range_limit[(int) DESCALE((JPEG_INT32) wsptr[0], PASS1_BITS+3)
+				  & RANGE_MASK];
+      
+      outptr[0] = dcval;
+      outptr[1] = dcval;
+      
+      wsptr += DCTSIZE;		/* advance pointer to next row */
+      continue;
+    }
+#endif
+    
+    /* Even part */
+    
+    tmp10 = ((JPEG_INT32) wsptr[0]) << (CONST_BITS+2);
+    
+    /* Odd part */
+
+    tmp0 = MULTIPLY((JPEG_INT32) wsptr[7], - FIX_0_720959822) /* sqrt(2) * (c7-c5+c3-c1) */
+	 + MULTIPLY((JPEG_INT32) wsptr[5], FIX_0_850430095) /* sqrt(2) * (-c1+c3+c5+c7) */
+	 + MULTIPLY((JPEG_INT32) wsptr[3], - FIX_1_272758580) /* sqrt(2) * (-c1+c3-c5-c7) */
+	 + MULTIPLY((JPEG_INT32) wsptr[1], FIX_3_624509785); /* sqrt(2) * (c1+c3+c5+c7) */
+
+    /* Final output stage */
+    
+    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp0,
+					  CONST_BITS+PASS1_BITS+3+2)
+			    & RANGE_MASK];
+    outptr[1] = range_limit[(int) DESCALE(tmp10 - tmp0,
+					  CONST_BITS+PASS1_BITS+3+2)
+			    & RANGE_MASK];
+    
+    wsptr += DCTSIZE;		/* advance pointer to next row */
+  }
+}
+
+
+/*
+ * Perform dequantization and inverse DCT on one block of coefficients,
+ * producing a reduced-size 1x1 output block.
+ */
+
+GLOBAL(void)
+jpeg_idct_1x1 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
+	       JCOEFPTR coef_block,
+	       JSAMPARRAY output_buf, JDIMENSION output_col)
+{
+  int dcval;
+  ISLOW_MULT_TYPE * quantptr;
+  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
+  SHIFT_TEMPS
+
+  /* We hardly need an inverse DCT routine for this: just take the
+   * average pixel value, which is one-eighth of the DC coefficient.
+   */
+  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
+  dcval = DEQUANTIZE(coef_block[0], quantptr[0]);
+  dcval = (int) DESCALE((JPEG_INT32) dcval, 3);
+
+  output_buf[0][output_col] = range_limit[dcval & RANGE_MASK];
+}
+
+#endif /* IDCT_SCALING_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jinclude.h b/Source/3rd Party/wx/src/jpeg/jinclude.h
index 5ff60fedf..0a4f15146 100644
--- a/Source/3rd Party/wx/src/jpeg/jinclude.h	
+++ b/Source/3rd Party/wx/src/jpeg/jinclude.h	
@@ -1,91 +1,91 @@
-/*
- * jinclude.h
- *
- * Copyright (C) 1991-1994, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file exists to provide a single place to fix any problems with
- * including the wrong system include files.  (Common problems are taken
- * care of by the standard jconfig symbols, but on really weird systems
- * you may have to edit this file.)
- *
- * NOTE: this file is NOT intended to be included by applications using the
- * JPEG library.  Most applications need only include jpeglib.h.
- */
-
-
-/* Include auto-config file to find out which system include files we need. */
-
-#include "jconfig.h"		/* auto configuration options */
-#define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */
-
-/*
- * We need the NULL macro and size_t typedef.
- * On an ANSI-conforming system it is sufficient to include <stddef.h>.
- * Otherwise, we get them from <stdlib.h> or <stdio.h>; we may have to
- * pull in <sys/types.h> as well.
- * Note that the core JPEG library does not require <stdio.h>;
- * only the default error handler and data source/destination modules do.
- * But we must pull it in because of the references to FILE in jpeglib.h.
- * You can remove those references if you want to compile without <stdio.h>.
- */
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef NEED_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#include <stdio.h>
-
-/*
- * We need memory copying and zeroing functions, plus strncpy().
- * ANSI and System V implementations declare these in <string.h>.
- * BSD doesn't have the mem() functions, but it does have bcopy()/bzero().
- * Some systems may declare memset and memcpy in <memory.h>.
- *
- * NOTE: we assume the size parameters to these functions are of type size_t.
- * Change the casts in these macros if not!
- */
-
-#ifdef NEED_BSD_STRINGS
-
-#include <strings.h>
-#define MEMZERO(target,size)	bzero((void *)(target), (size_t)(size))
-#define MEMCOPY(dest,src,size)	bcopy((const void *)(src), (void *)(dest), (size_t)(size))
-
-#else /* not BSD, assume ANSI/SysV string lib */
-
-#include <string.h>
-#define MEMZERO(target,size)	memset((void *)(target), 0, (size_t)(size))
-#define MEMCOPY(dest,src,size)	memcpy((void *)(dest), (const void *)(src), (size_t)(size))
-
-#endif
-
-/*
- * In ANSI C, and indeed any rational implementation, size_t is also the
- * type returned by sizeof().  However, it seems there are some irrational
- * implementations out there, in which sizeof() returns an int even though
- * size_t is defined as long or unsigned long.  To ensure consistent results
- * we always use this SIZEOF() macro in place of using sizeof() directly.
- */
-
-#define SIZEOF(object)	((size_t) sizeof(object))
-
-/*
- * The modules that use fread() and fwrite() always invoke them through
- * these macros.  On some systems you may need to twiddle the argument casts.
- * CAUTION: argument order is different from underlying functions!
- */
-
-#define JFREAD(file,buf,sizeofbuf)  \
-  ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
-#define JFWRITE(file,buf,sizeofbuf)  \
-  ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
+/*
+ * jinclude.h
+ *
+ * Copyright (C) 1991-1994, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file exists to provide a single place to fix any problems with
+ * including the wrong system include files.  (Common problems are taken
+ * care of by the standard jconfig symbols, but on really weird systems
+ * you may have to edit this file.)
+ *
+ * NOTE: this file is NOT intended to be included by applications using the
+ * JPEG library.  Most applications need only include jpeglib.h.
+ */
+
+
+/* Include auto-config file to find out which system include files we need. */
+
+#include "jconfig.h"		/* auto configuration options */
+#define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */
+
+/*
+ * We need the NULL macro and size_t typedef.
+ * On an ANSI-conforming system it is sufficient to include <stddef.h>.
+ * Otherwise, we get them from <stdlib.h> or <stdio.h>; we may have to
+ * pull in <sys/types.h> as well.
+ * Note that the core JPEG library does not require <stdio.h>;
+ * only the default error handler and data source/destination modules do.
+ * But we must pull it in because of the references to FILE in jpeglib.h.
+ * You can remove those references if you want to compile without <stdio.h>.
+ */
+
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef NEED_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#include <stdio.h>
+
+/*
+ * We need memory copying and zeroing functions, plus strncpy().
+ * ANSI and System V implementations declare these in <string.h>.
+ * BSD doesn't have the mem() functions, but it does have bcopy()/bzero().
+ * Some systems may declare memset and memcpy in <memory.h>.
+ *
+ * NOTE: we assume the size parameters to these functions are of type size_t.
+ * Change the casts in these macros if not!
+ */
+
+#ifdef NEED_BSD_STRINGS
+
+#include <strings.h>
+#define MEMZERO(target,size)	bzero((void *)(target), (size_t)(size))
+#define MEMCOPY(dest,src,size)	bcopy((const void *)(src), (void *)(dest), (size_t)(size))
+
+#else /* not BSD, assume ANSI/SysV string lib */
+
+#include <string.h>
+#define MEMZERO(target,size)	memset((void *)(target), 0, (size_t)(size))
+#define MEMCOPY(dest,src,size)	memcpy((void *)(dest), (const void *)(src), (size_t)(size))
+
+#endif
+
+/*
+ * In ANSI C, and indeed any rational implementation, size_t is also the
+ * type returned by sizeof().  However, it seems there are some irrational
+ * implementations out there, in which sizeof() returns an int even though
+ * size_t is defined as long or unsigned long.  To ensure consistent results
+ * we always use this SIZEOF() macro in place of using sizeof() directly.
+ */
+
+#define SIZEOF(object)	((size_t) sizeof(object))
+
+/*
+ * The modules that use fread() and fwrite() always invoke them through
+ * these macros.  On some systems you may need to twiddle the argument casts.
+ * CAUTION: argument order is different from underlying functions!
+ */
+
+#define JFREAD(file,buf,sizeofbuf)  \
+  ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
+#define JFWRITE(file,buf,sizeofbuf)  \
+  ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
diff --git a/Source/3rd Party/wx/src/jpeg/jmemansi.c b/Source/3rd Party/wx/src/jpeg/jmemansi.c
new file mode 100644
index 000000000..2d93e4962
--- /dev/null
+++ b/Source/3rd Party/wx/src/jpeg/jmemansi.c	
@@ -0,0 +1,167 @@
+/*
+ * jmemansi.c
+ *
+ * Copyright (C) 1992-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides a simple generic implementation of the system-
+ * dependent portion of the JPEG memory manager.  This implementation
+ * assumes that you have the ANSI-standard library routine tmpfile().
+ * Also, the problem of determining the amount of memory available
+ * is shoved onto the user.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */
+extern void * malloc JPP((size_t size));
+extern void free JPP((void *ptr));
+#endif
+
+#ifndef SEEK_SET		/* pre-ANSI systems may not define this; */
+#define SEEK_SET  0		/* if not, assume 0 is correct */
+#endif
+
+
+/*
+ * Memory allocation and freeing are controlled by the regular library
+ * routines malloc() and free().
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * "Large" objects are treated the same as "small" ones.
+ * NB: although we include FAR keywords in the routine declarations,
+ * this file won't actually work in 80x86 small/medium model; at least,
+ * you probably won't be able to process useful-size images in only 64KB.
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ * It's impossible to do this in a portable way; our current solution is
+ * to make the user tell us (with a default value set at compile time).
+ * If you can actually get the available space, it's a good idea to subtract
+ * a slop factor of 5% or so.
+ */
+
+#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */
+#define DEFAULT_MAX_MEM		1000000L /* default: one megabyte */
+#endif
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  return cinfo->mem->max_memory_to_use - already_allocated;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Backing store objects are only used when the value returned by
+ * jpeg_mem_available is less than the total space needed.  You can dispense
+ * with these routines if you have plenty of virtual memory; see jmemnobs.c.
+ */
+
+
+METHODDEF(void)
+read_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		    void FAR * buffer_address,
+		    long file_offset, long byte_count)
+{
+  if (fseek(info->temp_file, file_offset, SEEK_SET))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  if (JFREAD(info->temp_file, buffer_address, byte_count)
+      != (size_t) byte_count)
+    ERREXIT(cinfo, JERR_TFILE_READ);
+}
+
+
+METHODDEF(void)
+write_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		     void FAR * buffer_address,
+		     long file_offset, long byte_count)
+{
+  if (fseek(info->temp_file, file_offset, SEEK_SET))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  if (JFWRITE(info->temp_file, buffer_address, byte_count)
+      != (size_t) byte_count)
+    ERREXIT(cinfo, JERR_TFILE_WRITE);
+}
+
+
+METHODDEF(void)
+close_backing_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  fclose(info->temp_file);
+  /* Since this implementation uses tmpfile() to create the file,
+   * no explicit file deletion is needed.
+   */
+}
+
+
+/*
+ * Initial opening of a backing-store object.
+ *
+ * This version uses tmpfile(), which constructs a suitable file name
+ * behind the scenes.  We don't have to use info->temp_name[] at all;
+ * indeed, we can't even find out the actual name of the temp file.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  if ((info->temp_file = tmpfile()) == NULL)
+    ERREXITS(cinfo, JERR_TFILE_CREATE, "");
+  info->read_backing_store = read_backing_store;
+  info->write_backing_store = write_backing_store;
+  info->close_backing_store = close_backing_store;
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* no work */
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jmemdos.c b/Source/3rd Party/wx/src/jpeg/jmemdos.c
new file mode 100644
index 000000000..d64835d57
--- /dev/null
+++ b/Source/3rd Party/wx/src/jpeg/jmemdos.c	
@@ -0,0 +1,638 @@
+/*
+ * jmemdos.c
+ *
+ * Copyright (C) 1992-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides an MS-DOS-compatible implementation of the system-
+ * dependent portion of the JPEG memory manager.  Temporary data can be
+ * stored in extended or expanded memory as well as in regular DOS files.
+ *
+ * If you use this file, you must be sure that NEED_FAR_POINTERS is defined
+ * if you compile in a small-data memory model; it should NOT be defined if
+ * you use a large-data memory model.  This file is not recommended if you
+ * are using a flat-memory-space 386 environment such as DJGCC or Watcom C.
+ * Also, this code will NOT work if struct fields are aligned on greater than
+ * 2-byte boundaries.
+ *
+ * Based on code contributed by Ge' Weijers.
+ */
+
+/*
+ * If you have both extended and expanded memory, you may want to change the
+ * order in which they are tried in jopen_backing_store.  On a 286 machine
+ * expanded memory is usually faster, since extended memory access involves
+ * an expensive protected-mode-and-back switch.  On 386 and better, extended
+ * memory is usually faster.  As distributed, the code tries extended memory
+ * first (what? not everyone has a 386? :-).
+ *
+ * You can disable use of extended/expanded memory entirely by altering these
+ * definitions or overriding them from the Makefile (eg, -DEMS_SUPPORTED=0).
+ */
+
+#ifndef XMS_SUPPORTED
+#define XMS_SUPPORTED  1
+#endif
+#ifndef EMS_SUPPORTED
+#define EMS_SUPPORTED  1
+#endif
+
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare these */
+extern void * malloc JPP((size_t size));
+extern void free JPP((void *ptr));
+extern char * getenv JPP((const char * name));
+#endif
+
+#ifdef NEED_FAR_POINTERS
+
+#ifdef __TURBOC__
+/* These definitions work for Borland C (Turbo C) */
+#include <alloc.h>		/* need farmalloc(), farfree() */
+#define far_malloc(x)	farmalloc(x)
+#define far_free(x)	farfree(x)
+#else
+/* These definitions work for Microsoft C and compatible compilers */
+#include <malloc.h>		/* need _fmalloc(), _ffree() */
+#define far_malloc(x)	_fmalloc(x)
+#define far_free(x)	_ffree(x)
+#endif
+
+#else /* not NEED_FAR_POINTERS */
+
+#define far_malloc(x)	malloc(x)
+#define far_free(x)	free(x)
+
+#endif /* NEED_FAR_POINTERS */
+
+#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
+#define READ_BINARY	"r"
+#else
+#define READ_BINARY	"rb"
+#endif
+
+#ifndef USE_MSDOS_MEMMGR	/* make sure user got configuration right */
+  You forgot to define USE_MSDOS_MEMMGR in jconfig.h. /* deliberate syntax error */
+#endif
+
+#if MAX_ALLOC_CHUNK >= 65535L	/* make sure jconfig.h got this right */
+  MAX_ALLOC_CHUNK should be less than 64K. /* deliberate syntax error */
+#endif
+
+
+/*
+ * Declarations for assembly-language support routines (see jmemdosa.asm).
+ *
+ * The functions are declared "far" as are all their pointer arguments;
+ * this ensures the assembly source code will work regardless of the
+ * compiler memory model.  We assume "short" is 16 bits, "long" is 32.
+ */
+
+typedef void far * XMSDRIVER;	/* actually a pointer to code */
+typedef struct {		/* registers for calling XMS driver */
+	unsigned short ax, dx, bx;
+	void far * ds_si;
+      } XMScontext;
+typedef struct {		/* registers for calling EMS driver */
+	unsigned short ax, dx, bx;
+	void far * ds_si;
+      } EMScontext;
+
+extern short far jdos_open JPP((short far * handle, char far * filename));
+extern short far jdos_close JPP((short handle));
+extern short far jdos_seek JPP((short handle, long offset));
+extern short far jdos_read JPP((short handle, void far * buffer,
+				unsigned short count));
+extern short far jdos_write JPP((short handle, void far * buffer,
+				 unsigned short count));
+extern void far jxms_getdriver JPP((XMSDRIVER far *));
+extern void far jxms_calldriver JPP((XMSDRIVER, XMScontext far *));
+extern short far jems_available JPP((void));
+extern void far jems_calldriver JPP((EMScontext far *));
+
+
+/*
+ * Selection of a file name for a temporary file.
+ * This is highly system-dependent, and you may want to customize it.
+ */
+
+static int next_file_num;	/* to distinguish among several temp files */
+
+LOCAL(void)
+select_file_name (char * fname)
+{
+  const char * env;
+  char * ptr;
+  FILE * tfile;
+
+  /* Keep generating file names till we find one that's not in use */
+  for (;;) {
+    /* Get temp directory name from environment TMP or TEMP variable;
+     * if none, use "."
+     */
+    if ((env = (const char *) getenv("TMP")) == NULL)
+      if ((env = (const char *) getenv("TEMP")) == NULL)
+	env = ".";
+    if (*env == '\0')		/* null string means "." */
+      env = ".";
+    ptr = fname;		/* copy name to fname */
+    while (*env != '\0')
+      *ptr++ = *env++;
+    if (ptr[-1] != '\\' && ptr[-1] != '/')
+      *ptr++ = '\\';		/* append backslash if not in env variable */
+    /* Append a suitable file name */
+    next_file_num++;		/* advance counter */
+    sprintf(ptr, "JPG%03d.TMP", next_file_num);
+    /* Probe to see if file name is already in use */
+    if ((tfile = fopen(fname, READ_BINARY)) == NULL)
+      break;
+    fclose(tfile);		/* oops, it's there; close tfile & try again */
+  }
+}
+
+
+/*
+ * Near-memory allocation and freeing are controlled by the regular library
+ * routines malloc() and free().
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * "Large" objects are allocated in far memory, if possible
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) far_malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  far_free(object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ * It's impossible to do this in a portable way; our current solution is
+ * to make the user tell us (with a default value set at compile time).
+ * If you can actually get the available space, it's a good idea to subtract
+ * a slop factor of 5% or so.
+ */
+
+#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */
+#define DEFAULT_MAX_MEM		300000L /* for total usage about 450K */
+#endif
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  return cinfo->mem->max_memory_to_use - already_allocated;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Backing store objects are only used when the value returned by
+ * jpeg_mem_available is less than the total space needed.  You can dispense
+ * with these routines if you have plenty of virtual memory; see jmemnobs.c.
+ */
+
+/*
+ * For MS-DOS we support three types of backing storage:
+ *   1. Conventional DOS files.  We access these by direct DOS calls rather
+ *      than via the stdio package.  This provides a bit better performance,
+ *      but the real reason is that the buffers to be read or written are FAR.
+ *      The stdio library for small-data memory models can't cope with that.
+ *   2. Extended memory, accessed per the XMS V2.0 specification.
+ *   3. Expanded memory, accessed per the LIM/EMS 4.0 specification.
+ * You'll need copies of those specs to make sense of the related code.
+ * The specs are available by Internet FTP from the SIMTEL archives 
+ * (oak.oakland.edu and its various mirror sites).  See files
+ * pub/msdos/microsoft/xms20.arc and pub/msdos/info/limems41.zip.
+ */
+
+
+/*
+ * Access methods for a DOS file.
+ */
+
+
+METHODDEF(void)
+read_file_store (j_common_ptr cinfo, backing_store_ptr info,
+		 void FAR * buffer_address,
+		 long file_offset, long byte_count)
+{
+  if (jdos_seek(info->handle.file_handle, file_offset))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  /* Since MAX_ALLOC_CHUNK is less than 64K, byte_count will be too. */
+  if (byte_count > 65535L)	/* safety check */
+    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
+  if (jdos_read(info->handle.file_handle, buffer_address,
+		(unsigned short) byte_count))
+    ERREXIT(cinfo, JERR_TFILE_READ);
+}
+
+
+METHODDEF(void)
+write_file_store (j_common_ptr cinfo, backing_store_ptr info,
+		  void FAR * buffer_address,
+		  long file_offset, long byte_count)
+{
+  if (jdos_seek(info->handle.file_handle, file_offset))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  /* Since MAX_ALLOC_CHUNK is less than 64K, byte_count will be too. */
+  if (byte_count > 65535L)	/* safety check */
+    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
+  if (jdos_write(info->handle.file_handle, buffer_address,
+		 (unsigned short) byte_count))
+    ERREXIT(cinfo, JERR_TFILE_WRITE);
+}
+
+
+METHODDEF(void)
+close_file_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  jdos_close(info->handle.file_handle);	/* close the file */
+  remove(info->temp_name);	/* delete the file */
+/* If your system doesn't have remove(), try unlink() instead.
+ * remove() is the ANSI-standard name for this function, but
+ * unlink() was more common in pre-ANSI systems.
+ */
+  TRACEMSS(cinfo, 1, JTRC_TFILE_CLOSE, info->temp_name);
+}
+
+
+LOCAL(wxjpeg_boolean)
+open_file_store (j_common_ptr cinfo, backing_store_ptr info,
+		 long total_bytes_needed)
+{
+  short handle;
+
+  select_file_name(info->temp_name);
+  if (jdos_open((short far *) & handle, (char far *) info->temp_name)) {
+    /* might as well exit since jpeg_open_backing_store will fail anyway */
+    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
+    return FALSE;
+  }
+  info->handle.file_handle = handle;
+  info->read_backing_store = read_file_store;
+  info->write_backing_store = write_file_store;
+  info->close_backing_store = close_file_store;
+  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);
+  return TRUE;			/* succeeded */
+}
+
+
+/*
+ * Access methods for extended memory.
+ */
+
+#if XMS_SUPPORTED
+
+static XMSDRIVER xms_driver;	/* saved address of XMS driver */
+
+typedef union {			/* either long offset or real-mode pointer */
+	long offset;
+	void far * ptr;
+      } XMSPTR;
+
+typedef struct {		/* XMS move specification structure */
+	long length;
+	XMSH src_handle;
+	XMSPTR src;
+	XMSH dst_handle;
+	XMSPTR dst;
+      } XMSspec;
+
+#define ODD(X)	(((X) & 1L) != 0)
+
+
+METHODDEF(void)
+read_xms_store (j_common_ptr cinfo, backing_store_ptr info,
+		void FAR * buffer_address,
+		long file_offset, long byte_count)
+{
+  XMScontext ctx;
+  XMSspec spec;
+  char endbuffer[2];
+
+  /* The XMS driver can't cope with an odd length, so handle the last byte
+   * specially if byte_count is odd.  We don't expect this to be common.
+   */
+
+  spec.length = byte_count & (~ 1L);
+  spec.src_handle = info->handle.xms_handle;
+  spec.src.offset = file_offset;
+  spec.dst_handle = 0;
+  spec.dst.ptr = buffer_address;
+  
+  ctx.ds_si = (void far *) & spec;
+  ctx.ax = 0x0b00;		/* EMB move */
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  if (ctx.ax != 1)
+    ERREXIT(cinfo, JERR_XMS_READ);
+
+  if (ODD(byte_count)) {
+    read_xms_store(cinfo, info, (void FAR *) endbuffer,
+		   file_offset + byte_count - 1L, 2L);
+    ((char FAR *) buffer_address)[byte_count - 1L] = endbuffer[0];
+  }
+}
+
+
+METHODDEF(void)
+write_xms_store (j_common_ptr cinfo, backing_store_ptr info,
+		 void FAR * buffer_address,
+		 long file_offset, long byte_count)
+{
+  XMScontext ctx;
+  XMSspec spec;
+  char endbuffer[2];
+
+  /* The XMS driver can't cope with an odd length, so handle the last byte
+   * specially if byte_count is odd.  We don't expect this to be common.
+   */
+
+  spec.length = byte_count & (~ 1L);
+  spec.src_handle = 0;
+  spec.src.ptr = buffer_address;
+  spec.dst_handle = info->handle.xms_handle;
+  spec.dst.offset = file_offset;
+
+  ctx.ds_si = (void far *) & spec;
+  ctx.ax = 0x0b00;		/* EMB move */
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  if (ctx.ax != 1)
+    ERREXIT(cinfo, JERR_XMS_WRITE);
+
+  if (ODD(byte_count)) {
+    read_xms_store(cinfo, info, (void FAR *) endbuffer,
+		   file_offset + byte_count - 1L, 2L);
+    endbuffer[0] = ((char FAR *) buffer_address)[byte_count - 1L];
+    write_xms_store(cinfo, info, (void FAR *) endbuffer,
+		    file_offset + byte_count - 1L, 2L);
+  }
+}
+
+
+METHODDEF(void)
+close_xms_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  XMScontext ctx;
+
+  ctx.dx = info->handle.xms_handle;
+  ctx.ax = 0x0a00;
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  TRACEMS1(cinfo, 1, JTRC_XMS_CLOSE, info->handle.xms_handle);
+  /* we ignore any error return from the driver */
+}
+
+
+LOCAL(wxjpeg_boolean)
+open_xms_store (j_common_ptr cinfo, backing_store_ptr info,
+		long total_bytes_needed)
+{
+  XMScontext ctx;
+
+  /* Get address of XMS driver */
+  jxms_getdriver((XMSDRIVER far *) & xms_driver);
+  if (xms_driver == NULL)
+    return FALSE;		/* no driver to be had */
+
+  /* Get version number, must be >= 2.00 */
+  ctx.ax = 0x0000;
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  if (ctx.ax < (unsigned short) 0x0200)
+    return FALSE;
+
+  /* Try to get space (expressed in kilobytes) */
+  ctx.dx = (unsigned short) ((total_bytes_needed + 1023L) >> 10);
+  ctx.ax = 0x0900;
+  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
+  if (ctx.ax != 1)
+    return FALSE;
+
+  /* Succeeded, save the handle and away we go */
+  info->handle.xms_handle = ctx.dx;
+  info->read_backing_store = read_xms_store;
+  info->write_backing_store = write_xms_store;
+  info->close_backing_store = close_xms_store;
+  TRACEMS1(cinfo, 1, JTRC_XMS_OPEN, ctx.dx);
+  return TRUE;			/* succeeded */
+}
+
+#endif /* XMS_SUPPORTED */
+
+
+/*
+ * Access methods for expanded memory.
+ */
+
+#if EMS_SUPPORTED
+
+/* The EMS move specification structure requires word and long fields aligned
+ * at odd byte boundaries.  Some compilers will align struct fields at even
+ * byte boundaries.  While it's usually possible to force byte alignment,
+ * that causes an overall performance penalty and may pose problems in merging
+ * JPEG into a larger application.  Instead we accept some rather dirty code
+ * here.  Note this code would fail if the hardware did not allow odd-byte
+ * word & long accesses, but all 80x86 CPUs do.
+ */
+
+typedef void far * EMSPTR;
+
+typedef union {			/* EMS move specification structure */
+	long length;		/* It's easy to access first 4 bytes */
+	char bytes[18];		/* Misaligned fields in here! */
+      } EMSspec;
+
+/* Macros for accessing misaligned fields */
+#define FIELD_AT(spec,offset,type)  (*((type *) &(spec.bytes[offset])))
+#define SRC_TYPE(spec)		FIELD_AT(spec,4,char)
+#define SRC_HANDLE(spec)	FIELD_AT(spec,5,EMSH)
+#define SRC_OFFSET(spec)	FIELD_AT(spec,7,unsigned short)
+#define SRC_PAGE(spec)		FIELD_AT(spec,9,unsigned short)
+#define SRC_PTR(spec)		FIELD_AT(spec,7,EMSPTR)
+#define DST_TYPE(spec)		FIELD_AT(spec,11,char)
+#define DST_HANDLE(spec)	FIELD_AT(spec,12,EMSH)
+#define DST_OFFSET(spec)	FIELD_AT(spec,14,unsigned short)
+#define DST_PAGE(spec)		FIELD_AT(spec,16,unsigned short)
+#define DST_PTR(spec)		FIELD_AT(spec,14,EMSPTR)
+
+#define EMSPAGESIZE	16384L	/* gospel, see the EMS specs */
+
+#define HIBYTE(W)  (((W) >> 8) & 0xFF)
+#define LOBYTE(W)  ((W) & 0xFF)
+
+
+METHODDEF(void)
+read_ems_store (j_common_ptr cinfo, backing_store_ptr info,
+		void FAR * buffer_address,
+		long file_offset, long byte_count)
+{
+  EMScontext ctx;
+  EMSspec spec;
+
+  spec.length = byte_count;
+  SRC_TYPE(spec) = 1;
+  SRC_HANDLE(spec) = info->handle.ems_handle;
+  SRC_PAGE(spec)   = (unsigned short) (file_offset / EMSPAGESIZE);
+  SRC_OFFSET(spec) = (unsigned short) (file_offset % EMSPAGESIZE);
+  DST_TYPE(spec) = 0;
+  DST_HANDLE(spec) = 0;
+  DST_PTR(spec)    = buffer_address;
+  
+  ctx.ds_si = (void far *) & spec;
+  ctx.ax = 0x5700;		/* move memory region */
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0)
+    ERREXIT(cinfo, JERR_EMS_READ);
+}
+
+
+METHODDEF(void)
+write_ems_store (j_common_ptr cinfo, backing_store_ptr info,
+		 void FAR * buffer_address,
+		 long file_offset, long byte_count)
+{
+  EMScontext ctx;
+  EMSspec spec;
+
+  spec.length = byte_count;
+  SRC_TYPE(spec) = 0;
+  SRC_HANDLE(spec) = 0;
+  SRC_PTR(spec)    = buffer_address;
+  DST_TYPE(spec) = 1;
+  DST_HANDLE(spec) = info->handle.ems_handle;
+  DST_PAGE(spec)   = (unsigned short) (file_offset / EMSPAGESIZE);
+  DST_OFFSET(spec) = (unsigned short) (file_offset % EMSPAGESIZE);
+  
+  ctx.ds_si = (void far *) & spec;
+  ctx.ax = 0x5700;		/* move memory region */
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0)
+    ERREXIT(cinfo, JERR_EMS_WRITE);
+}
+
+
+METHODDEF(void)
+close_ems_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  EMScontext ctx;
+
+  ctx.ax = 0x4500;
+  ctx.dx = info->handle.ems_handle;
+  jems_calldriver((EMScontext far *) & ctx);
+  TRACEMS1(cinfo, 1, JTRC_EMS_CLOSE, info->handle.ems_handle);
+  /* we ignore any error return from the driver */
+}
+
+
+LOCAL(wxjpeg_boolean)
+open_ems_store (j_common_ptr cinfo, backing_store_ptr info,
+		long total_bytes_needed)
+{
+  EMScontext ctx;
+
+  /* Is EMS driver there? */
+  if (! jems_available())
+    return FALSE;
+
+  /* Get status, make sure EMS is OK */
+  ctx.ax = 0x4000;
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0)
+    return FALSE;
+
+  /* Get version, must be >= 4.0 */
+  ctx.ax = 0x4600;
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0 || LOBYTE(ctx.ax) < 0x40)
+    return FALSE;
+
+  /* Try to allocate requested space */
+  ctx.ax = 0x4300;
+  ctx.bx = (unsigned short) ((total_bytes_needed + EMSPAGESIZE-1L) / EMSPAGESIZE);
+  jems_calldriver((EMScontext far *) & ctx);
+  if (HIBYTE(ctx.ax) != 0)
+    return FALSE;
+
+  /* Succeeded, save the handle and away we go */
+  info->handle.ems_handle = ctx.dx;
+  info->read_backing_store = read_ems_store;
+  info->write_backing_store = write_ems_store;
+  info->close_backing_store = close_ems_store;
+  TRACEMS1(cinfo, 1, JTRC_EMS_OPEN, ctx.dx);
+  return TRUE;			/* succeeded */
+}
+
+#endif /* EMS_SUPPORTED */
+
+
+/*
+ * Initial opening of a backing-store object.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  /* Try extended memory, then expanded memory, then regular file. */
+#if XMS_SUPPORTED
+  if (open_xms_store(cinfo, info, total_bytes_needed))
+    return;
+#endif
+#if EMS_SUPPORTED
+  if (open_ems_store(cinfo, info, total_bytes_needed))
+    return;
+#endif
+  if (open_file_store(cinfo, info, total_bytes_needed))
+    return;
+  ERREXITS(cinfo, JERR_TFILE_CREATE, "");
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  next_file_num = 0;		/* initialize temp file name generator */
+  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* Microsoft C, at least in v6.00A, will not successfully reclaim freed
+   * blocks of size > 32Kbytes unless we give it a kick in the rear, like so:
+   */
+#ifdef NEED_FHEAPMIN
+  _fheapmin();
+#endif
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jmemmac.c b/Source/3rd Party/wx/src/jpeg/jmemmac.c
new file mode 100644
index 000000000..106f9bea0
--- /dev/null
+++ b/Source/3rd Party/wx/src/jpeg/jmemmac.c	
@@ -0,0 +1,289 @@
+/*
+ * jmemmac.c
+ *
+ * Copyright (C) 1992-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * jmemmac.c provides an Apple Macintosh implementation of the system-
+ * dependent portion of the JPEG memory manager.
+ *
+ * If you use jmemmac.c, then you must define USE_MAC_MEMMGR in the
+ * JPEG_INTERNALS part of jconfig.h.
+ *
+ * jmemmac.c uses the Macintosh toolbox routines NewPtr and DisposePtr
+ * instead of malloc and free.  It accurately determines the amount of
+ * memory available by using CompactMem.  Notice that if left to its
+ * own devices, this code can chew up all available space in the
+ * application's zone, with the exception of the rather small "slop"
+ * factor computed in jpeg_mem_available().  The application can ensure
+ * that more space is left over by reducing max_memory_to_use.
+ *
+ * Large images are swapped to disk using temporary files and System 7.0+'s
+ * temporary folder functionality.
+ *
+ * Note that jmemmac.c depends on two features of MacOS that were first
+ * introduced in System 7: FindFolder and the FSSpec-based calls.
+ * If your application uses jmemmac.c and is run under System 6 or earlier,
+ * and the jpeg library decides it needs a temporary file, it will abort,
+ * printing error messages about requiring System 7.  (If no temporary files
+ * are created, it will run fine.)
+ *
+ * If you want to use jmemmac.c in an application that might be used with
+ * System 6 or earlier, then you should remove dependencies on FindFolder
+ * and the FSSpec calls.  You will need to replace FindFolder with some
+ * other mechanism for finding a place to put temporary files, and you
+ * should replace the FSSpec calls with their HFS equivalents:
+ *
+ *     FSpDelete     ->  HDelete
+ *     FSpGetFInfo   ->  HGetFInfo
+ *     FSpCreate     ->  HCreate
+ *     FSpOpenDF     ->  HOpen      *** Note: not HOpenDF ***
+ *     FSMakeFSSpec  ->  (fill in spec by hand.)
+ *
+ * (Use HOpen instead of HOpenDF.  HOpen is just a glue-interface to PBHOpen,
+ * which is on all HFS macs.  HOpenDF is a System 7 addition which avoids the
+ * ages-old problem of names starting with a period.)
+ *
+ * Contributed by Sam Bushell (jsam@iagu.on.net) and
+ * Dan Gildor (gyld@in-touch.com).
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"    /* import the system-dependent declarations */
+
+#ifndef USE_MAC_MEMMGR	/* make sure user got configuration right */
+  You forgot to define USE_MAC_MEMMGR in jconfig.h. /* deliberate syntax error */
+#endif
+
+#include <Memory.h>     /* we use the MacOS memory manager */
+#include <Files.h>      /* we use the MacOS File stuff */
+#include <Folders.h>    /* we use the MacOS HFS stuff */
+#include <Script.h>     /* for smSystemScript */
+#include <Gestalt.h>    /* we use Gestalt to test for specific functionality */
+
+#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */
+#define TEMP_FILE_NAME  "JPG%03d.TMP"
+#endif
+
+static int next_file_num;	/* to distinguish among several temp files */
+
+
+/*
+ * Memory allocation and freeing are controlled by the MacOS library
+ * routines NewPtr() and DisposePtr(), which allocate fixed-address
+ * storage.  Unfortunately, the IJG library isn't smart enough to cope
+ * with relocatable storage.
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) NewPtr(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  DisposePtr((Ptr) object);
+}
+
+
+/*
+ * "Large" objects are treated the same as "small" ones.
+ * NB: we include FAR keywords in the routine declarations simply for
+ * consistency with the rest of the IJG code; FAR should expand to empty
+ * on rational architectures like the Mac.
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) NewPtr(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  DisposePtr((Ptr) object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ */
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  long limit = cinfo->mem->max_memory_to_use - already_allocated;
+  long slop, mem;
+
+  /* Don't ask for more than what application has told us we may use */
+  if (max_bytes_needed > limit && limit > 0)
+    max_bytes_needed = limit;
+  /* Find whether there's a big enough free block in the heap.
+   * CompactMem tries to create a contiguous block of the requested size,
+   * and then returns the size of the largest free block (which could be
+   * much more or much less than we asked for).
+   * We add some slop to ensure we don't use up all available memory.
+   */
+  slop = max_bytes_needed / 16 + 32768L;
+  mem = CompactMem(max_bytes_needed + slop) - slop;
+  if (mem < 0)
+    mem = 0;			/* sigh, couldn't even get the slop */
+  /* Don't take more than the application says we can have */
+  if (mem > limit && limit > 0)
+    mem = limit;
+  return mem;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Backing store objects are only used when the value returned by
+ * jpeg_mem_available is less than the total space needed.  You can dispense
+ * with these routines if you have plenty of virtual memory; see jmemnobs.c.
+ */
+
+
+METHODDEF(void)
+read_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		    void FAR * buffer_address,
+		    long file_offset, long byte_count)
+{
+  long bytes = byte_count;
+  long retVal;
+
+  if ( SetFPos ( info->temp_file, fsFromStart, file_offset ) != noErr )
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+
+  retVal = FSRead ( info->temp_file, &bytes,
+		    (unsigned char *) buffer_address );
+  if ( retVal != noErr || bytes != byte_count )
+    ERREXIT(cinfo, JERR_TFILE_READ);
+}
+
+
+METHODDEF(void)
+write_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		     void FAR * buffer_address,
+		     long file_offset, long byte_count)
+{
+  long bytes = byte_count;
+  long retVal;
+
+  if ( SetFPos ( info->temp_file, fsFromStart, file_offset ) != noErr )
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+
+  retVal = FSWrite ( info->temp_file, &bytes,
+		     (unsigned char *) buffer_address );
+  if ( retVal != noErr || bytes != byte_count )
+    ERREXIT(cinfo, JERR_TFILE_WRITE);
+}
+
+
+METHODDEF(void)
+close_backing_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  FSClose ( info->temp_file );
+  FSpDelete ( &(info->tempSpec) );
+}
+
+
+/*
+ * Initial opening of a backing-store object.
+ *
+ * This version uses FindFolder to find the Temporary Items folder,
+ * and puts the temporary file in there.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  short         tmpRef, vRefNum;
+  long          dirID;
+  FInfo         finderInfo;
+  FSSpec        theSpec;
+  Str255        fName;
+  OSErr         osErr;
+  long          gestaltResponse = 0;
+
+  /* Check that FSSpec calls are available. */
+  osErr = Gestalt( gestaltFSAttr, &gestaltResponse );
+  if ( ( osErr != noErr )
+       || !( gestaltResponse & (1<<gestaltHasFSSpecCalls) ) )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, "- System 7.0 or later required");
+  /* TO DO: add a proper error message to jerror.h. */
+
+  /* Check that FindFolder is available. */
+  osErr = Gestalt( gestaltFindFolderAttr, &gestaltResponse );
+  if ( ( osErr != noErr )
+       || !( gestaltResponse & (1<<gestaltFindFolderPresent) ) )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, "- System 7.0 or later required.");
+  /* TO DO: add a proper error message to jerror.h. */
+
+  osErr = FindFolder ( kOnSystemDisk, kTemporaryFolderType, kCreateFolder,
+                       &vRefNum, &dirID );
+  if ( osErr != noErr )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, "- temporary items folder unavailable");
+  /* TO DO: Try putting the temp files somewhere else. */
+
+  /* Keep generating file names till we find one that's not in use */
+  for (;;) {
+    next_file_num++;		/* advance counter */
+
+    sprintf(info->temp_name, TEMP_FILE_NAME, next_file_num);
+    strcpy ( (Ptr)fName+1, info->temp_name );
+    *fName = strlen (info->temp_name);
+    osErr = FSMakeFSSpec ( vRefNum, dirID, fName, &theSpec );
+
+    if ( (osErr = FSpGetFInfo ( &theSpec, &finderInfo ) ) != noErr )
+      break;
+  }
+
+  osErr = FSpCreate ( &theSpec, '????', '????', smSystemScript );
+  if ( osErr != noErr )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
+
+  osErr = FSpOpenDF ( &theSpec, fsRdWrPerm, &(info->temp_file) );
+  if ( osErr != noErr )
+    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
+
+  info->tempSpec = theSpec;
+
+  info->read_backing_store = read_backing_store;
+  info->write_backing_store = write_backing_store;
+  info->close_backing_store = close_backing_store;
+  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  next_file_num = 0;
+
+  /* max_memory_to_use will be initialized to FreeMem()'s result;
+   * the calling application might later reduce it, for example
+   * to leave room to invoke multiple JPEG objects.
+   * Note that FreeMem returns the total number of free bytes;
+   * it may not be possible to allocate a single block of this size.
+   */
+  return FreeMem();
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* no work */
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jmemmgr.c b/Source/3rd Party/wx/src/jpeg/jmemmgr.c
index 2ebdc0167..173d9ded6 100644
--- a/Source/3rd Party/wx/src/jpeg/jmemmgr.c	
+++ b/Source/3rd Party/wx/src/jpeg/jmemmgr.c	
@@ -1,1118 +1,1118 @@
-/*
- * jmemmgr.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the JPEG system-independent memory management
- * routines.  This code is usable across a wide variety of machines; most
- * of the system dependencies have been isolated in a separate file.
- * The major functions provided here are:
- *   * pool-based allocation and freeing of memory;
- *   * policy decisions about how to divide available memory among the
- *     virtual arrays;
- *   * control logic for swapping virtual arrays between main memory and
- *     backing storage.
- * The separate system-dependent file provides the actual backing-storage
- * access code, and it contains the policy decision about how much total
- * main memory to use.
- * This file is system-dependent in the sense that some of its functions
- * are unnecessary in some systems.  For example, if there is enough virtual
- * memory so that backing storage will never be used, much of the virtual
- * array control logic could be removed.  (Of course, if you have that much
- * memory then you shouldn't care about a little bit of unused code...)
- */
-
-#define JPEG_INTERNALS
-#define AM_MEMORY_MANAGER	/* we define jvirt_Xarray_control structs */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h"		/* import the system-dependent declarations */
-
-#ifndef NO_GETENV
-#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare getenv() */
-extern char * getenv JPP((const char * name));
-#endif
-#endif
-
-
-/*
- * Some important notes:
- *   The allocation routines provided here must never return NULL.
- *   They should exit to error_exit if unsuccessful.
- *
- *   It's not a good idea to try to merge the sarray and barray routines,
- *   even though they are textually almost the same, because samples are
- *   usually stored as bytes while coefficients are shorts or ints.  Thus,
- *   in machines where byte pointers have a different representation from
- *   word pointers, the resulting machine code could not be the same.
- */
-
-
-/*
- * Many machines require storage alignment: longs must start on 4-byte
- * boundaries, doubles on 8-byte boundaries, etc.  On such machines, malloc()
- * always returns pointers that are multiples of the worst-case alignment
- * requirement, and we had better do so too.
- * There isn't any really portable way to determine the worst-case alignment
- * requirement.  This module assumes that the alignment requirement is
- * multiples of sizeof(ALIGN_TYPE).
- * By default, we define ALIGN_TYPE as double.  This is necessary on some
- * workstations (where doubles really do need 8-byte alignment) and will work
- * fine on nearly everything.  If your machine has lesser alignment needs,
- * you can save a few bytes by making ALIGN_TYPE smaller.
- * The only place I know of where this will NOT work is certain Macintosh
- * 680x0 compilers that define double as a 10-byte IEEE extended float.
- * Doing 10-byte alignment is counterproductive because longwords won't be
- * aligned well.  Put "#define ALIGN_TYPE long" in jconfig.h if you have
- * such a compiler.
- */
-
-#ifndef ALIGN_TYPE		/* so can override from jconfig.h */
-#define ALIGN_TYPE  double
-#endif
-
-
-/*
- * We allocate objects from "pools", where each pool is gotten with a single
- * request to jpeg_get_small() or jpeg_get_large().  There is no per-object
- * overhead within a pool, except for alignment padding.  Each pool has a
- * header with a link to the next pool of the same class.
- * Small and large pool headers are identical except that the latter's
- * link pointer must be FAR on 80x86 machines.
- * Notice that the "real" header fields are union'ed with a dummy ALIGN_TYPE
- * field.  This forces the compiler to make SIZEOF(small_pool_hdr) a multiple
- * of the alignment requirement of ALIGN_TYPE.
- */
-
-typedef union small_pool_struct * small_pool_ptr;
-
-typedef union small_pool_struct {
-  struct {
-    small_pool_ptr next;	/* next in list of pools */
-    size_t bytes_used;		/* how many bytes already used within pool */
-    size_t bytes_left;		/* bytes still available in this pool */
-  } hdr;
-  ALIGN_TYPE dummy;		/* included in union to ensure alignment */
-} small_pool_hdr;
-
-typedef union large_pool_struct FAR * large_pool_ptr;
-
-typedef union large_pool_struct {
-  struct {
-    large_pool_ptr next;	/* next in list of pools */
-    size_t bytes_used;		/* how many bytes already used within pool */
-    size_t bytes_left;		/* bytes still available in this pool */
-  } hdr;
-  ALIGN_TYPE dummy;		/* included in union to ensure alignment */
-} large_pool_hdr;
-
-
-/*
- * Here is the full definition of a memory manager object.
- */
-
-typedef struct {
-  struct jpeg_memory_mgr pub;	/* public fields */
-
-  /* Each pool identifier (lifetime class) names a linked list of pools. */
-  small_pool_ptr small_list[JPOOL_NUMPOOLS];
-  large_pool_ptr large_list[JPOOL_NUMPOOLS];
-
-  /* Since we only have one lifetime class of virtual arrays, only one
-   * linked list is necessary (for each datatype).  Note that the virtual
-   * array control blocks being linked together are actually stored somewhere
-   * in the small-pool list.
-   */
-  jvirt_sarray_ptr virt_sarray_list;
-  jvirt_barray_ptr virt_barray_list;
-
-  /* This counts total space obtained from jpeg_get_small/large */
-  long total_space_allocated;
-
-  /* alloc_sarray and alloc_barray set this value for use by virtual
-   * array routines.
-   */
-  JDIMENSION last_rowsperchunk;	/* from most recent alloc_sarray/barray */
-} my_memory_mgr;
-
-typedef my_memory_mgr * my_mem_ptr;
-
-
-/*
- * The control blocks for virtual arrays.
- * Note that these blocks are allocated in the "small" pool area.
- * System-dependent info for the associated backing store (if any) is hidden
- * inside the backing_store_info struct.
- */
-
-struct jvirt_sarray_control {
-  JSAMPARRAY mem_buffer;	/* => the in-memory buffer */
-  JDIMENSION rows_in_array;	/* total virtual array height */
-  JDIMENSION samplesperrow;	/* width of array (and of memory buffer) */
-  JDIMENSION maxaccess;		/* max rows accessed by access_virt_sarray */
-  JDIMENSION rows_in_mem;	/* height of memory buffer */
-  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
-  JDIMENSION cur_start_row;	/* first logical row # in the buffer */
-  JDIMENSION first_undef_row;	/* row # of first uninitialized row */
-  wxjpeg_boolean pre_zero;		/* pre-zero mode requested? */
-  wxjpeg_boolean dirty;		/* do current buffer contents need written? */
-  wxjpeg_boolean b_s_open;		/* is backing-store data valid? */
-  jvirt_sarray_ptr next;	/* link to next virtual sarray control block */
-  backing_store_info b_s_info;	/* System-dependent control info */
-};
-
-struct jvirt_barray_control {
-  JBLOCKARRAY mem_buffer;	/* => the in-memory buffer */
-  JDIMENSION rows_in_array;	/* total virtual array height */
-  JDIMENSION blocksperrow;	/* width of array (and of memory buffer) */
-  JDIMENSION maxaccess;		/* max rows accessed by access_virt_barray */
-  JDIMENSION rows_in_mem;	/* height of memory buffer */
-  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
-  JDIMENSION cur_start_row;	/* first logical row # in the buffer */
-  JDIMENSION first_undef_row;	/* row # of first uninitialized row */
-  wxjpeg_boolean pre_zero;		/* pre-zero mode requested? */
-  wxjpeg_boolean dirty;		/* do current buffer contents need written? */
-  wxjpeg_boolean b_s_open;		/* is backing-store data valid? */
-  jvirt_barray_ptr next;	/* link to next virtual barray control block */
-  backing_store_info b_s_info;	/* System-dependent control info */
-};
-
-
-#ifdef MEM_STATS		/* optional extra stuff for statistics */
-
-LOCAL(void)
-print_mem_stats (j_common_ptr cinfo, int pool_id)
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  small_pool_ptr shdr_ptr;
-  large_pool_ptr lhdr_ptr;
-
-  /* Since this is only a debugging stub, we can cheat a little by using
-   * fprintf directly rather than going through the trace message code.
-   * This is helpful because message parm array can't handle longs.
-   */
-  fprintf(stderr, "Freeing pool %d, total space = %ld\n",
-	  pool_id, mem->total_space_allocated);
-
-  for (lhdr_ptr = mem->large_list[pool_id]; lhdr_ptr != NULL;
-       lhdr_ptr = lhdr_ptr->hdr.next) {
-    fprintf(stderr, "  Large chunk used %ld\n",
-	    (long) lhdr_ptr->hdr.bytes_used);
-  }
-
-  for (shdr_ptr = mem->small_list[pool_id]; shdr_ptr != NULL;
-       shdr_ptr = shdr_ptr->hdr.next) {
-    fprintf(stderr, "  Small chunk used %ld free %ld\n",
-	    (long) shdr_ptr->hdr.bytes_used,
-	    (long) shdr_ptr->hdr.bytes_left);
-  }
-}
-
-#endif /* MEM_STATS */
-
-
-LOCAL(void)
-out_of_memory (j_common_ptr cinfo, int which)
-/* Report an out-of-memory error and stop execution */
-/* If we compiled MEM_STATS support, report alloc requests before dying */
-{
-#ifdef MEM_STATS
-  cinfo->err->trace_level = 2;	/* force self_destruct to report stats */
-#endif
-  ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, which);
-}
-
-
-/*
- * Allocation of "small" objects.
- *
- * For these, we use pooled storage.  When a new pool must be created,
- * we try to get enough space for the current request plus a "slop" factor,
- * where the slop will be the amount of leftover space in the new pool.
- * The speed vs. space tradeoff is largely determined by the slop values.
- * A different slop value is provided for each pool class (lifetime),
- * and we also distinguish the first pool of a class from later ones.
- * NOTE: the values given work fairly well on both 16- and 32-bit-int
- * machines, but may be too small if longs are 64 bits or more.
- */
-
-static const size_t first_pool_slop[JPOOL_NUMPOOLS] = 
-{
-	1600,			/* first PERMANENT pool */
-	16000			/* first IMAGE pool */
-};
-
-static const size_t extra_pool_slop[JPOOL_NUMPOOLS] = 
-{
-	0,			/* additional PERMANENT pools */
-	5000			/* additional IMAGE pools */
-};
-
-#define MIN_SLOP  50		/* greater than 0 to avoid futile looping */
-
-
-METHODDEF(void *)
-alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
-/* Allocate a "small" object */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  small_pool_ptr hdr_ptr, prev_hdr_ptr;
-  char * data_ptr;
-  size_t odd_bytes, min_request, slop;
-
-  /* Check for unsatisfiable request (do now to ensure no overflow below) */
-  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(small_pool_hdr)))
-    out_of_memory(cinfo, 1);	/* request exceeds malloc's ability */
-
-  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */
-  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);
-  if (odd_bytes > 0)
-    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;
-
-  /* See if space is available in any existing pool */
-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-  prev_hdr_ptr = NULL;
-  hdr_ptr = mem->small_list[pool_id];
-  while (hdr_ptr != NULL) {
-    if (hdr_ptr->hdr.bytes_left >= sizeofobject)
-      break;			/* found pool with enough space */
-    prev_hdr_ptr = hdr_ptr;
-    hdr_ptr = hdr_ptr->hdr.next;
-  }
-
-  /* Time to make a new pool? */
-  if (hdr_ptr == NULL) {
-    /* min_request is what we need now, slop is what will be leftover */
-    min_request = sizeofobject + SIZEOF(small_pool_hdr);
-    if (prev_hdr_ptr == NULL)	/* first pool in class? */
-      slop = first_pool_slop[pool_id];
-    else
-      slop = extra_pool_slop[pool_id];
-    /* Don't ask for more than MAX_ALLOC_CHUNK */
-    if (slop > (size_t) (MAX_ALLOC_CHUNK-min_request))
-      slop = (size_t) (MAX_ALLOC_CHUNK-min_request);
-    /* Try to get space, if fail reduce slop and try again */
-    for (;;) {
-      hdr_ptr = (small_pool_ptr) jpeg_get_small(cinfo, min_request + slop);
-      if (hdr_ptr != NULL)
-	break;
-      slop /= 2;
-      if (slop < MIN_SLOP)	/* give up when it gets real small */
-	out_of_memory(cinfo, 2); /* jpeg_get_small failed */
-    }
-    mem->total_space_allocated += min_request + slop;
-    /* Success, initialize the new pool header and add to end of list */
-    hdr_ptr->hdr.next = NULL;
-    hdr_ptr->hdr.bytes_used = 0;
-    hdr_ptr->hdr.bytes_left = sizeofobject + slop;
-    if (prev_hdr_ptr == NULL)	/* first pool in class? */
-      mem->small_list[pool_id] = hdr_ptr;
-    else
-      prev_hdr_ptr->hdr.next = hdr_ptr;
-  }
-
-  /* OK, allocate the object from the current pool */
-  data_ptr = (char *) (hdr_ptr + 1); /* point to first data byte in pool */
-  data_ptr += hdr_ptr->hdr.bytes_used; /* point to place for object */
-  hdr_ptr->hdr.bytes_used += sizeofobject;
-  hdr_ptr->hdr.bytes_left -= sizeofobject;
-
-  return (void *) data_ptr;
-}
-
-
-/*
- * Allocation of "large" objects.
- *
- * The external semantics of these are the same as "small" objects,
- * except that FAR pointers are used on 80x86.  However the pool
- * management heuristics are quite different.  We assume that each
- * request is large enough that it may as well be passed directly to
- * jpeg_get_large; the pool management just links everything together
- * so that we can free it all on demand.
- * Note: the major use of "large" objects is in JSAMPARRAY and JBLOCKARRAY
- * structures.  The routines that create these structures (see below)
- * deliberately bunch rows together to ensure a large request size.
- */
-
-METHODDEF(void FAR *)
-alloc_large (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
-/* Allocate a "large" object */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  large_pool_ptr hdr_ptr;
-  size_t odd_bytes;
-
-  /* Check for unsatisfiable request (do now to ensure no overflow below) */
-  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)))
-    out_of_memory(cinfo, 3);	/* request exceeds malloc's ability */
-
-  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */
-  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);
-  if (odd_bytes > 0)
-    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;
-
-  /* Always make a new pool */
-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-
-  hdr_ptr = (large_pool_ptr) jpeg_get_large(cinfo, sizeofobject +
-					    SIZEOF(large_pool_hdr));
-  if (hdr_ptr == NULL)
-    out_of_memory(cinfo, 4);	/* jpeg_get_large failed */
-  mem->total_space_allocated += sizeofobject + SIZEOF(large_pool_hdr);
-
-  /* Success, initialize the new pool header and add to list */
-  hdr_ptr->hdr.next = mem->large_list[pool_id];
-  /* We maintain space counts in each pool header for statistical purposes,
-   * even though they are not needed for allocation.
-   */
-  hdr_ptr->hdr.bytes_used = sizeofobject;
-  hdr_ptr->hdr.bytes_left = 0;
-  mem->large_list[pool_id] = hdr_ptr;
-
-  return (void FAR *) (hdr_ptr + 1); /* point to first data byte in pool */
-}
-
-
-/*
- * Creation of 2-D sample arrays.
- * The pointers are in near heap, the samples themselves in FAR heap.
- *
- * To minimize allocation overhead and to allow I/O of large contiguous
- * blocks, we allocate the sample rows in groups of as many rows as possible
- * without exceeding MAX_ALLOC_CHUNK total bytes per allocation request.
- * NB: the virtual array control routines, later in this file, know about
- * this chunking of rows.  The rowsperchunk value is left in the mem manager
- * object so that it can be saved away if this sarray is the workspace for
- * a virtual array.
- */
-
-METHODDEF(JSAMPARRAY)
-alloc_sarray (j_common_ptr cinfo, int pool_id,
-	      JDIMENSION samplesperrow, JDIMENSION numrows)
-/* Allocate a 2-D sample array */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  JSAMPARRAY result;
-  JSAMPROW workspace;
-  JDIMENSION rowsperchunk, currow, i;
-  long ltemp;
-
-  /* Calculate max # of rows allowed in one allocation chunk */
-  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
-	  ((long) samplesperrow * SIZEOF(JSAMPLE));
-  if (ltemp <= 0)
-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-  if (ltemp < (long) numrows)
-    rowsperchunk = (JDIMENSION) ltemp;
-  else
-    rowsperchunk = numrows;
-  mem->last_rowsperchunk = rowsperchunk;
-
-  /* Get space for row pointers (small object) */
-  result = (JSAMPARRAY) alloc_small(cinfo, pool_id,
-				    (size_t) (numrows * SIZEOF(JSAMPROW)));
-
-  /* Get the rows themselves (large objects) */
-  currow = 0;
-  while (currow < numrows) {
-    rowsperchunk = MIN(rowsperchunk, numrows - currow);
-    workspace = (JSAMPROW) alloc_large(cinfo, pool_id,
-	(size_t) ((size_t) rowsperchunk * (size_t) samplesperrow
-		  * SIZEOF(JSAMPLE)));
-    for (i = rowsperchunk; i > 0; i--) {
-      result[currow++] = workspace;
-      workspace += samplesperrow;
-    }
-  }
-
-  return result;
-}
-
-
-/*
- * Creation of 2-D coefficient-block arrays.
- * This is essentially the same as the code for sample arrays, above.
- */
-
-METHODDEF(JBLOCKARRAY)
-alloc_barray (j_common_ptr cinfo, int pool_id,
-	      JDIMENSION blocksperrow, JDIMENSION numrows)
-/* Allocate a 2-D coefficient-block array */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  JBLOCKARRAY result;
-  JBLOCKROW workspace;
-  JDIMENSION rowsperchunk, currow, i;
-  long ltemp;
-
-  /* Calculate max # of rows allowed in one allocation chunk */
-  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
-	  ((long) blocksperrow * SIZEOF(JBLOCK));
-  if (ltemp <= 0)
-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-  if (ltemp < (long) numrows)
-    rowsperchunk = (JDIMENSION) ltemp;
-  else
-    rowsperchunk = numrows;
-  mem->last_rowsperchunk = rowsperchunk;
-
-  /* Get space for row pointers (small object) */
-  result = (JBLOCKARRAY) alloc_small(cinfo, pool_id,
-				     (size_t) (numrows * SIZEOF(JBLOCKROW)));
-
-  /* Get the rows themselves (large objects) */
-  currow = 0;
-  while (currow < numrows) {
-    rowsperchunk = MIN(rowsperchunk, numrows - currow);
-    workspace = (JBLOCKROW) alloc_large(cinfo, pool_id,
-	(size_t) ((size_t) rowsperchunk * (size_t) blocksperrow
-		  * SIZEOF(JBLOCK)));
-    for (i = rowsperchunk; i > 0; i--) {
-      result[currow++] = workspace;
-      workspace += blocksperrow;
-    }
-  }
-
-  return result;
-}
-
-
-/*
- * About virtual array management:
- *
- * The above "normal" array routines are only used to allocate strip buffers
- * (as wide as the image, but just a few rows high).  Full-image-sized buffers
- * are handled as "virtual" arrays.  The array is still accessed a strip at a
- * time, but the memory manager must save the whole array for repeated
- * accesses.  The intended implementation is that there is a strip buffer in
- * memory (as high as is possible given the desired memory limit), plus a
- * backing file that holds the rest of the array.
- *
- * The request_virt_array routines are told the total size of the image and
- * the maximum number of rows that will be accessed at once.  The in-memory
- * buffer must be at least as large as the maxaccess value.
- *
- * The request routines create control blocks but not the in-memory buffers.
- * That is postponed until realize_virt_arrays is called.  At that time the
- * total amount of space needed is known (approximately, anyway), so free
- * memory can be divided up fairly.
- *
- * The access_virt_array routines are responsible for making a specific strip
- * area accessible (after reading or writing the backing file, if necessary).
- * Note that the access routines are told whether the caller intends to modify
- * the accessed strip; during a read-only pass this saves having to rewrite
- * data to disk.  The access routines are also responsible for pre-zeroing
- * any newly accessed rows, if pre-zeroing was requested.
- *
- * In current usage, the access requests are usually for nonoverlapping
- * strips; that is, successive access start_row numbers differ by exactly
- * num_rows = maxaccess.  This means we can get good performance with simple
- * buffer dump/reload logic, by making the in-memory buffer be a multiple
- * of the access height; then there will never be accesses across bufferload
- * boundaries.  The code will still work with overlapping access requests,
- * but it doesn't handle bufferload overlaps very efficiently.
- */
-
-
-METHODDEF(jvirt_sarray_ptr)
-request_virt_sarray (j_common_ptr cinfo, int pool_id, wxjpeg_boolean pre_zero,
-		     JDIMENSION samplesperrow, JDIMENSION numrows,
-		     JDIMENSION maxaccess)
-/* Request a virtual 2-D sample array */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  jvirt_sarray_ptr result;
-
-  /* Only IMAGE-lifetime virtual arrays are currently supported */
-  if (pool_id != JPOOL_IMAGE)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-
-  /* get control block */
-  result = (jvirt_sarray_ptr) alloc_small(cinfo, pool_id,
-					  SIZEOF(struct jvirt_sarray_control));
-
-  result->mem_buffer = NULL;	/* marks array not yet realized */
-  result->rows_in_array = numrows;
-  result->samplesperrow = samplesperrow;
-  result->maxaccess = maxaccess;
-  result->pre_zero = pre_zero;
-  result->b_s_open = FALSE;	/* no associated backing-store object */
-  result->next = mem->virt_sarray_list; /* add to list of virtual arrays */
-  mem->virt_sarray_list = result;
-
-  return result;
-}
-
-
-METHODDEF(jvirt_barray_ptr)
-request_virt_barray (j_common_ptr cinfo, int pool_id, wxjpeg_boolean pre_zero,
-		     JDIMENSION blocksperrow, JDIMENSION numrows,
-		     JDIMENSION maxaccess)
-/* Request a virtual 2-D coefficient-block array */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  jvirt_barray_ptr result;
-
-  /* Only IMAGE-lifetime virtual arrays are currently supported */
-  if (pool_id != JPOOL_IMAGE)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-
-  /* get control block */
-  result = (jvirt_barray_ptr) alloc_small(cinfo, pool_id,
-					  SIZEOF(struct jvirt_barray_control));
-
-  result->mem_buffer = NULL;	/* marks array not yet realized */
-  result->rows_in_array = numrows;
-  result->blocksperrow = blocksperrow;
-  result->maxaccess = maxaccess;
-  result->pre_zero = pre_zero;
-  result->b_s_open = FALSE;	/* no associated backing-store object */
-  result->next = mem->virt_barray_list; /* add to list of virtual arrays */
-  mem->virt_barray_list = result;
-
-  return result;
-}
-
-
-METHODDEF(void)
-realize_virt_arrays (j_common_ptr cinfo)
-/* Allocate the in-memory buffers for any unrealized virtual arrays */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  long space_per_minheight, maximum_space, avail_mem;
-  long minheights, max_minheights;
-  jvirt_sarray_ptr sptr;
-  jvirt_barray_ptr bptr;
-
-  /* Compute the minimum space needed (maxaccess rows in each buffer)
-   * and the maximum space needed (full image height in each buffer).
-   * These may be of use to the system-dependent jpeg_mem_available routine.
-   */
-  space_per_minheight = 0;
-  maximum_space = 0;
-  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
-    if (sptr->mem_buffer == NULL) { /* if not realized yet */
-      space_per_minheight += (long) sptr->maxaccess *
-			     (long) sptr->samplesperrow * SIZEOF(JSAMPLE);
-      maximum_space += (long) sptr->rows_in_array *
-		       (long) sptr->samplesperrow * SIZEOF(JSAMPLE);
-    }
-  }
-  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
-    if (bptr->mem_buffer == NULL) { /* if not realized yet */
-      space_per_minheight += (long) bptr->maxaccess *
-			     (long) bptr->blocksperrow * SIZEOF(JBLOCK);
-      maximum_space += (long) bptr->rows_in_array *
-		       (long) bptr->blocksperrow * SIZEOF(JBLOCK);
-    }
-  }
-
-  if (space_per_minheight <= 0)
-    return;			/* no unrealized arrays, no work */
-
-  /* Determine amount of memory to actually use; this is system-dependent. */
-  avail_mem = jpeg_mem_available(cinfo, space_per_minheight, maximum_space,
-				 mem->total_space_allocated);
-
-  /* If the maximum space needed is available, make all the buffers full
-   * height; otherwise parcel it out with the same number of minheights
-   * in each buffer.
-   */
-  if (avail_mem >= maximum_space)
-    max_minheights = 1000000000L;
-  else {
-    max_minheights = avail_mem / space_per_minheight;
-    /* If there doesn't seem to be enough space, try to get the minimum
-     * anyway.  This allows a "stub" implementation of jpeg_mem_available().
-     */
-    if (max_minheights <= 0)
-      max_minheights = 1;
-  }
-
-  /* Allocate the in-memory buffers and initialize backing store as needed. */
-
-  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
-    if (sptr->mem_buffer == NULL) { /* if not realized yet */
-      minheights = ((long) sptr->rows_in_array - 1L) / sptr->maxaccess + 1L;
-      if (minheights <= max_minheights) {
-	/* This buffer fits in memory */
-	sptr->rows_in_mem = sptr->rows_in_array;
-      } else {
-	/* It doesn't fit in memory, create backing store. */
-	sptr->rows_in_mem = (JDIMENSION) (max_minheights * sptr->maxaccess);
-	jpeg_open_backing_store(cinfo, & sptr->b_s_info,
-				(long) sptr->rows_in_array *
-				(long) sptr->samplesperrow *
-				(long) SIZEOF(JSAMPLE));
-	sptr->b_s_open = TRUE;
-      }
-      sptr->mem_buffer = alloc_sarray(cinfo, JPOOL_IMAGE,
-				      sptr->samplesperrow, sptr->rows_in_mem);
-      sptr->rowsperchunk = mem->last_rowsperchunk;
-      sptr->cur_start_row = 0;
-      sptr->first_undef_row = 0;
-      sptr->dirty = FALSE;
-    }
-  }
-
-  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
-    if (bptr->mem_buffer == NULL) { /* if not realized yet */
-      minheights = ((long) bptr->rows_in_array - 1L) / bptr->maxaccess + 1L;
-      if (minheights <= max_minheights) {
-	/* This buffer fits in memory */
-	bptr->rows_in_mem = bptr->rows_in_array;
-      } else {
-	/* It doesn't fit in memory, create backing store. */
-	bptr->rows_in_mem = (JDIMENSION) (max_minheights * bptr->maxaccess);
-	jpeg_open_backing_store(cinfo, & bptr->b_s_info,
-				(long) bptr->rows_in_array *
-				(long) bptr->blocksperrow *
-				(long) SIZEOF(JBLOCK));
-	bptr->b_s_open = TRUE;
-      }
-      bptr->mem_buffer = alloc_barray(cinfo, JPOOL_IMAGE,
-				      bptr->blocksperrow, bptr->rows_in_mem);
-      bptr->rowsperchunk = mem->last_rowsperchunk;
-      bptr->cur_start_row = 0;
-      bptr->first_undef_row = 0;
-      bptr->dirty = FALSE;
-    }
-  }
-}
-
-
-LOCAL(void)
-do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, wxjpeg_boolean writing)
-/* Do backing store read or write of a virtual sample array */
-{
-  long bytesperrow, file_offset, byte_count, rows, thisrow, i;
-
-  bytesperrow = (long) ptr->samplesperrow * SIZEOF(JSAMPLE);
-  file_offset = ptr->cur_start_row * bytesperrow;
-  /* Loop to read or write each allocation chunk in mem_buffer */
-  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {
-    /* One chunk, but check for short chunk at end of buffer */
-    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);
-    /* Transfer no more than is currently defined */
-    thisrow = (long) ptr->cur_start_row + i;
-    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);
-    /* Transfer no more than fits in file */
-    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);
-    if (rows <= 0)		/* this chunk might be past end of file! */
-      break;
-    byte_count = rows * bytesperrow;
-    if (writing)
-      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,
-					    (void FAR *) ptr->mem_buffer[i],
-					    file_offset, byte_count);
-    else
-      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,
-					   (void FAR *) ptr->mem_buffer[i],
-					   file_offset, byte_count);
-    file_offset += byte_count;
-  }
-}
-
-
-LOCAL(void)
-do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, wxjpeg_boolean writing)
-/* Do backing store read or write of a virtual coefficient-block array */
-{
-  long bytesperrow, file_offset, byte_count, rows, thisrow, i;
-
-  bytesperrow = (long) ptr->blocksperrow * SIZEOF(JBLOCK);
-  file_offset = ptr->cur_start_row * bytesperrow;
-  /* Loop to read or write each allocation chunk in mem_buffer */
-  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {
-    /* One chunk, but check for short chunk at end of buffer */
-    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);
-    /* Transfer no more than is currently defined */
-    thisrow = (long) ptr->cur_start_row + i;
-    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);
-    /* Transfer no more than fits in file */
-    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);
-    if (rows <= 0)		/* this chunk might be past end of file! */
-      break;
-    byte_count = rows * bytesperrow;
-    if (writing)
-      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,
-					    (void FAR *) ptr->mem_buffer[i],
-					    file_offset, byte_count);
-    else
-      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,
-					   (void FAR *) ptr->mem_buffer[i],
-					   file_offset, byte_count);
-    file_offset += byte_count;
-  }
-}
-
-
-METHODDEF(JSAMPARRAY)
-access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,
-		    JDIMENSION start_row, JDIMENSION num_rows,
-		    wxjpeg_boolean writable)
-/* Access the part of a virtual sample array starting at start_row */
-/* and extending for num_rows rows.  writable is true if  */
-/* caller intends to modify the accessed area. */
-{
-  JDIMENSION end_row = start_row + num_rows;
-  JDIMENSION undef_row;
-
-  /* debugging check */
-  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||
-      ptr->mem_buffer == NULL)
-    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-
-  /* Make the desired part of the virtual array accessible */
-  if (start_row < ptr->cur_start_row ||
-      end_row > ptr->cur_start_row+ptr->rows_in_mem) {
-    if (! ptr->b_s_open)
-      ERREXIT(cinfo, JERR_VIRTUAL_BUG);
-    /* Flush old buffer contents if necessary */
-    if (ptr->dirty) {
-      do_sarray_io(cinfo, ptr, TRUE);
-      ptr->dirty = FALSE;
-    }
-    /* Decide what part of virtual array to access.
-     * Algorithm: if target address > current window, assume forward scan,
-     * load starting at target address.  If target address < current window,
-     * assume backward scan, load so that target area is top of window.
-     * Note that when switching from forward write to forward read, will have
-     * start_row = 0, so the limiting case applies and we load from 0 anyway.
-     */
-    if (start_row > ptr->cur_start_row) {
-      ptr->cur_start_row = start_row;
-    } else {
-      /* use long arithmetic here to avoid overflow & unsigned problems */
-      long ltemp;
-
-      ltemp = (long) end_row - (long) ptr->rows_in_mem;
-      if (ltemp < 0)
-	ltemp = 0;		/* don't fall off front end of file */
-      ptr->cur_start_row = (JDIMENSION) ltemp;
-    }
-    /* Read in the selected part of the array.
-     * During the initial write pass, we will do no actual read
-     * because the selected part is all undefined.
-     */
-    do_sarray_io(cinfo, ptr, FALSE);
-  }
-  /* Ensure the accessed part of the array is defined; prezero if needed.
-   * To improve locality of access, we only prezero the part of the array
-   * that the caller is about to access, not the entire in-memory array.
-   */
-  if (ptr->first_undef_row < end_row) {
-    if (ptr->first_undef_row < start_row) {
-      if (writable)		/* writer skipped over a section of array */
-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-      undef_row = start_row;	/* but reader is allowed to read ahead */
-    } else {
-      undef_row = ptr->first_undef_row;
-    }
-    if (writable)
-      ptr->first_undef_row = end_row;
-    if (ptr->pre_zero) {
-      size_t bytesperrow = (size_t) ptr->samplesperrow * SIZEOF(JSAMPLE);
-      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */
-      end_row -= ptr->cur_start_row;
-      while (undef_row < end_row) {
-	jzero_far((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);
-	undef_row++;
-      }
-    } else {
-      if (! writable)		/* reader looking at undefined data */
-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-    }
-  }
-  /* Flag the buffer dirty if caller will write in it */
-  if (writable)
-    ptr->dirty = TRUE;
-  /* Return address of proper part of the buffer */
-  return ptr->mem_buffer + (start_row - ptr->cur_start_row);
-}
-
-
-METHODDEF(JBLOCKARRAY)
-access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr,
-		    JDIMENSION start_row, JDIMENSION num_rows,
-		    wxjpeg_boolean writable)
-/* Access the part of a virtual block array starting at start_row */
-/* and extending for num_rows rows.  writable is true if  */
-/* caller intends to modify the accessed area. */
-{
-  JDIMENSION end_row = start_row + num_rows;
-  JDIMENSION undef_row;
-
-  /* debugging check */
-  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||
-      ptr->mem_buffer == NULL)
-    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-
-  /* Make the desired part of the virtual array accessible */
-  if (start_row < ptr->cur_start_row ||
-      end_row > ptr->cur_start_row+ptr->rows_in_mem) {
-    if (! ptr->b_s_open)
-      ERREXIT(cinfo, JERR_VIRTUAL_BUG);
-    /* Flush old buffer contents if necessary */
-    if (ptr->dirty) {
-      do_barray_io(cinfo, ptr, TRUE);
-      ptr->dirty = FALSE;
-    }
-    /* Decide what part of virtual array to access.
-     * Algorithm: if target address > current window, assume forward scan,
-     * load starting at target address.  If target address < current window,
-     * assume backward scan, load so that target area is top of window.
-     * Note that when switching from forward write to forward read, will have
-     * start_row = 0, so the limiting case applies and we load from 0 anyway.
-     */
-    if (start_row > ptr->cur_start_row) {
-      ptr->cur_start_row = start_row;
-    } else {
-      /* use long arithmetic here to avoid overflow & unsigned problems */
-      long ltemp;
-
-      ltemp = (long) end_row - (long) ptr->rows_in_mem;
-      if (ltemp < 0)
-	ltemp = 0;		/* don't fall off front end of file */
-      ptr->cur_start_row = (JDIMENSION) ltemp;
-    }
-    /* Read in the selected part of the array.
-     * During the initial write pass, we will do no actual read
-     * because the selected part is all undefined.
-     */
-    do_barray_io(cinfo, ptr, FALSE);
-  }
-  /* Ensure the accessed part of the array is defined; prezero if needed.
-   * To improve locality of access, we only prezero the part of the array
-   * that the caller is about to access, not the entire in-memory array.
-   */
-  if (ptr->first_undef_row < end_row) {
-    if (ptr->first_undef_row < start_row) {
-      if (writable)		/* writer skipped over a section of array */
-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-      undef_row = start_row;	/* but reader is allowed to read ahead */
-    } else {
-      undef_row = ptr->first_undef_row;
-    }
-    if (writable)
-      ptr->first_undef_row = end_row;
-    if (ptr->pre_zero) {
-      size_t bytesperrow = (size_t) ptr->blocksperrow * SIZEOF(JBLOCK);
-      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */
-      end_row -= ptr->cur_start_row;
-      while (undef_row < end_row) {
-	jzero_far((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);
-	undef_row++;
-      }
-    } else {
-      if (! writable)		/* reader looking at undefined data */
-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-    }
-  }
-  /* Flag the buffer dirty if caller will write in it */
-  if (writable)
-    ptr->dirty = TRUE;
-  /* Return address of proper part of the buffer */
-  return ptr->mem_buffer + (start_row - ptr->cur_start_row);
-}
-
-
-/*
- * Release all objects belonging to a specified pool.
- */
-
-METHODDEF(void)
-free_pool (j_common_ptr cinfo, int pool_id)
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  small_pool_ptr shdr_ptr;
-  large_pool_ptr lhdr_ptr;
-  size_t space_freed;
-
-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-
-#ifdef MEM_STATS
-  if (cinfo->err->trace_level > 1)
-    print_mem_stats(cinfo, pool_id); /* print pool's memory usage statistics */
-#endif
-
-  /* If freeing IMAGE pool, close any virtual arrays first */
-  if (pool_id == JPOOL_IMAGE) {
-    jvirt_sarray_ptr sptr;
-    jvirt_barray_ptr bptr;
-
-    for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
-      if (sptr->b_s_open) {	/* there may be no backing store */
-	sptr->b_s_open = FALSE;	/* prevent recursive close if error */
-	(*sptr->b_s_info.close_backing_store) (cinfo, & sptr->b_s_info);
-      }
-    }
-    mem->virt_sarray_list = NULL;
-    for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
-      if (bptr->b_s_open) {	/* there may be no backing store */
-	bptr->b_s_open = FALSE;	/* prevent recursive close if error */
-	(*bptr->b_s_info.close_backing_store) (cinfo, & bptr->b_s_info);
-      }
-    }
-    mem->virt_barray_list = NULL;
-  }
-
-  /* Release large objects */
-  lhdr_ptr = mem->large_list[pool_id];
-  mem->large_list[pool_id] = NULL;
-
-  while (lhdr_ptr != NULL) {
-    large_pool_ptr next_lhdr_ptr = lhdr_ptr->hdr.next;
-    space_freed = lhdr_ptr->hdr.bytes_used +
-		  lhdr_ptr->hdr.bytes_left +
-		  SIZEOF(large_pool_hdr);
-    jpeg_free_large(cinfo, (void FAR *) lhdr_ptr, space_freed);
-    mem->total_space_allocated -= space_freed;
-    lhdr_ptr = next_lhdr_ptr;
-  }
-
-  /* Release small objects */
-  shdr_ptr = mem->small_list[pool_id];
-  mem->small_list[pool_id] = NULL;
-
-  while (shdr_ptr != NULL) {
-    small_pool_ptr next_shdr_ptr = shdr_ptr->hdr.next;
-    space_freed = shdr_ptr->hdr.bytes_used +
-		  shdr_ptr->hdr.bytes_left +
-		  SIZEOF(small_pool_hdr);
-    jpeg_free_small(cinfo, (void *) shdr_ptr, space_freed);
-    mem->total_space_allocated -= space_freed;
-    shdr_ptr = next_shdr_ptr;
-  }
-}
-
-
-/*
- * Close up shop entirely.
- * Note that this cannot be called unless cinfo->mem is non-NULL.
- */
-
-METHODDEF(void)
-self_destruct (j_common_ptr cinfo)
-{
-  int pool;
-
-  /* Close all backing store, release all memory.
-   * Releasing pools in reverse order might help avoid fragmentation
-   * with some (brain-damaged) malloc libraries.
-   */
-  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {
-    free_pool(cinfo, pool);
-  }
-
-  /* Release the memory manager control block too. */
-  jpeg_free_small(cinfo, (void *) cinfo->mem, SIZEOF(my_memory_mgr));
-  cinfo->mem = NULL;		/* ensures I will be called only once */
-
-  jpeg_mem_term(cinfo);		/* system-dependent cleanup */
-}
-
-
-/*
- * Memory manager initialization.
- * When this is called, only the error manager pointer is valid in cinfo!
- */
-
-GLOBAL(void)
-jinit_memory_mgr (j_common_ptr cinfo)
-{
-  my_mem_ptr mem;
-  long max_to_use;
-  int pool;
-  size_t test_mac;
-
-  cinfo->mem = NULL;		/* for safety if init fails */
-
-  /* Check for configuration errors.
-   * SIZEOF(ALIGN_TYPE) should be a power of 2; otherwise, it probably
-   * doesn't reflect any real hardware alignment requirement.
-   * The test is a little tricky: for X>0, X and X-1 have no one-bits
-   * in common if and only if X is a power of 2, ie has only one one-bit.
-   * Some compilers may give an "unreachable code" warning here; ignore it.
-   */
-  if ((SIZEOF(ALIGN_TYPE) & (SIZEOF(ALIGN_TYPE)-1)) != 0)
-    ERREXIT(cinfo, JERR_BAD_ALIGN_TYPE);
-  /* MAX_ALLOC_CHUNK must be representable as type size_t, and must be
-   * a multiple of SIZEOF(ALIGN_TYPE).
-   * Again, an "unreachable code" warning may be ignored here.
-   * But a "constant too large" warning means you need to fix MAX_ALLOC_CHUNK.
-   */
-  test_mac = (size_t) MAX_ALLOC_CHUNK;
-  if ((long) test_mac != MAX_ALLOC_CHUNK ||
-      (MAX_ALLOC_CHUNK % SIZEOF(ALIGN_TYPE)) != 0)
-    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
-
-  max_to_use = jpeg_mem_init(cinfo); /* system-dependent initialization */
-
-  /* Attempt to allocate memory manager's control block */
-  mem = (my_mem_ptr) jpeg_get_small(cinfo, SIZEOF(my_memory_mgr));
-
-  if (mem == NULL) {
-    jpeg_mem_term(cinfo);	/* system-dependent cleanup */
-    ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 0);
-  }
-
-  /* OK, fill in the method pointers */
-  mem->pub.alloc_small = alloc_small;
-  mem->pub.alloc_large = alloc_large;
-  mem->pub.alloc_sarray = alloc_sarray;
-  mem->pub.alloc_barray = alloc_barray;
-  mem->pub.request_virt_sarray = request_virt_sarray;
-  mem->pub.request_virt_barray = request_virt_barray;
-  mem->pub.realize_virt_arrays = realize_virt_arrays;
-  mem->pub.access_virt_sarray = access_virt_sarray;
-  mem->pub.access_virt_barray = access_virt_barray;
-  mem->pub.free_pool = free_pool;
-  mem->pub.self_destruct = self_destruct;
-
-  /* Make MAX_ALLOC_CHUNK accessible to other modules */
-  mem->pub.max_alloc_chunk = MAX_ALLOC_CHUNK;
-
-  /* Initialize working state */
-  mem->pub.max_memory_to_use = max_to_use;
-
-  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {
-    mem->small_list[pool] = NULL;
-    mem->large_list[pool] = NULL;
-  }
-  mem->virt_sarray_list = NULL;
-  mem->virt_barray_list = NULL;
-
-  mem->total_space_allocated = SIZEOF(my_memory_mgr);
-
-  /* Declare ourselves open for business */
-  cinfo->mem = & mem->pub;
-
-  /* Check for an environment variable JPEGMEM; if found, override the
-   * default max_memory setting from jpeg_mem_init.  Note that the
-   * surrounding application may again override this value.
-   * If your system doesn't support getenv(), define NO_GETENV to disable
-   * this feature.
-   */
-#ifndef NO_GETENV
-  { char * memenv;
-
-    if ((memenv = getenv("JPEGMEM")) != NULL) {
-      char ch = 'x';
-
-      if (sscanf(memenv, "%ld%c", &max_to_use, &ch) > 0) {
-	if (ch == 'm' || ch == 'M')
-	  max_to_use *= 1000L;
-	mem->pub.max_memory_to_use = max_to_use * 1000L;
-      }
-    }
-  }
-#endif
-
-}
+/*
+ * jmemmgr.c
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains the JPEG system-independent memory management
+ * routines.  This code is usable across a wide variety of machines; most
+ * of the system dependencies have been isolated in a separate file.
+ * The major functions provided here are:
+ *   * pool-based allocation and freeing of memory;
+ *   * policy decisions about how to divide available memory among the
+ *     virtual arrays;
+ *   * control logic for swapping virtual arrays between main memory and
+ *     backing storage.
+ * The separate system-dependent file provides the actual backing-storage
+ * access code, and it contains the policy decision about how much total
+ * main memory to use.
+ * This file is system-dependent in the sense that some of its functions
+ * are unnecessary in some systems.  For example, if there is enough virtual
+ * memory so that backing storage will never be used, much of the virtual
+ * array control logic could be removed.  (Of course, if you have that much
+ * memory then you shouldn't care about a little bit of unused code...)
+ */
+
+#define JPEG_INTERNALS
+#define AM_MEMORY_MANAGER	/* we define jvirt_Xarray_control structs */
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef NO_GETENV
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare getenv() */
+extern char * getenv JPP((const char * name));
+#endif
+#endif
+
+
+/*
+ * Some important notes:
+ *   The allocation routines provided here must never return NULL.
+ *   They should exit to error_exit if unsuccessful.
+ *
+ *   It's not a good idea to try to merge the sarray and barray routines,
+ *   even though they are textually almost the same, because samples are
+ *   usually stored as bytes while coefficients are shorts or ints.  Thus,
+ *   in machines where byte pointers have a different representation from
+ *   word pointers, the resulting machine code could not be the same.
+ */
+
+
+/*
+ * Many machines require storage alignment: longs must start on 4-byte
+ * boundaries, doubles on 8-byte boundaries, etc.  On such machines, malloc()
+ * always returns pointers that are multiples of the worst-case alignment
+ * requirement, and we had better do so too.
+ * There isn't any really portable way to determine the worst-case alignment
+ * requirement.  This module assumes that the alignment requirement is
+ * multiples of sizeof(ALIGN_TYPE).
+ * By default, we define ALIGN_TYPE as double.  This is necessary on some
+ * workstations (where doubles really do need 8-byte alignment) and will work
+ * fine on nearly everything.  If your machine has lesser alignment needs,
+ * you can save a few bytes by making ALIGN_TYPE smaller.
+ * The only place I know of where this will NOT work is certain Macintosh
+ * 680x0 compilers that define double as a 10-byte IEEE extended float.
+ * Doing 10-byte alignment is counterproductive because longwords won't be
+ * aligned well.  Put "#define ALIGN_TYPE long" in jconfig.h if you have
+ * such a compiler.
+ */
+
+#ifndef ALIGN_TYPE		/* so can override from jconfig.h */
+#define ALIGN_TYPE  double
+#endif
+
+
+/*
+ * We allocate objects from "pools", where each pool is gotten with a single
+ * request to jpeg_get_small() or jpeg_get_large().  There is no per-object
+ * overhead within a pool, except for alignment padding.  Each pool has a
+ * header with a link to the next pool of the same class.
+ * Small and large pool headers are identical except that the latter's
+ * link pointer must be FAR on 80x86 machines.
+ * Notice that the "real" header fields are union'ed with a dummy ALIGN_TYPE
+ * field.  This forces the compiler to make SIZEOF(small_pool_hdr) a multiple
+ * of the alignment requirement of ALIGN_TYPE.
+ */
+
+typedef union small_pool_struct * small_pool_ptr;
+
+typedef union small_pool_struct {
+  struct {
+    small_pool_ptr next;	/* next in list of pools */
+    size_t bytes_used;		/* how many bytes already used within pool */
+    size_t bytes_left;		/* bytes still available in this pool */
+  } hdr;
+  ALIGN_TYPE dummy;		/* included in union to ensure alignment */
+} small_pool_hdr;
+
+typedef union large_pool_struct FAR * large_pool_ptr;
+
+typedef union large_pool_struct {
+  struct {
+    large_pool_ptr next;	/* next in list of pools */
+    size_t bytes_used;		/* how many bytes already used within pool */
+    size_t bytes_left;		/* bytes still available in this pool */
+  } hdr;
+  ALIGN_TYPE dummy;		/* included in union to ensure alignment */
+} large_pool_hdr;
+
+
+/*
+ * Here is the full definition of a memory manager object.
+ */
+
+typedef struct {
+  struct jpeg_memory_mgr pub;	/* public fields */
+
+  /* Each pool identifier (lifetime class) names a linked list of pools. */
+  small_pool_ptr small_list[JPOOL_NUMPOOLS];
+  large_pool_ptr large_list[JPOOL_NUMPOOLS];
+
+  /* Since we only have one lifetime class of virtual arrays, only one
+   * linked list is necessary (for each datatype).  Note that the virtual
+   * array control blocks being linked together are actually stored somewhere
+   * in the small-pool list.
+   */
+  jvirt_sarray_ptr virt_sarray_list;
+  jvirt_barray_ptr virt_barray_list;
+
+  /* This counts total space obtained from jpeg_get_small/large */
+  long total_space_allocated;
+
+  /* alloc_sarray and alloc_barray set this value for use by virtual
+   * array routines.
+   */
+  JDIMENSION last_rowsperchunk;	/* from most recent alloc_sarray/barray */
+} my_memory_mgr;
+
+typedef my_memory_mgr * my_mem_ptr;
+
+
+/*
+ * The control blocks for virtual arrays.
+ * Note that these blocks are allocated in the "small" pool area.
+ * System-dependent info for the associated backing store (if any) is hidden
+ * inside the backing_store_info struct.
+ */
+
+struct jvirt_sarray_control {
+  JSAMPARRAY mem_buffer;	/* => the in-memory buffer */
+  JDIMENSION rows_in_array;	/* total virtual array height */
+  JDIMENSION samplesperrow;	/* width of array (and of memory buffer) */
+  JDIMENSION maxaccess;		/* max rows accessed by access_virt_sarray */
+  JDIMENSION rows_in_mem;	/* height of memory buffer */
+  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
+  JDIMENSION cur_start_row;	/* first logical row # in the buffer */
+  JDIMENSION first_undef_row;	/* row # of first uninitialized row */
+  wxjpeg_boolean pre_zero;		/* pre-zero mode requested? */
+  wxjpeg_boolean dirty;		/* do current buffer contents need written? */
+  wxjpeg_boolean b_s_open;		/* is backing-store data valid? */
+  jvirt_sarray_ptr next;	/* link to next virtual sarray control block */
+  backing_store_info b_s_info;	/* System-dependent control info */
+};
+
+struct jvirt_barray_control {
+  JBLOCKARRAY mem_buffer;	/* => the in-memory buffer */
+  JDIMENSION rows_in_array;	/* total virtual array height */
+  JDIMENSION blocksperrow;	/* width of array (and of memory buffer) */
+  JDIMENSION maxaccess;		/* max rows accessed by access_virt_barray */
+  JDIMENSION rows_in_mem;	/* height of memory buffer */
+  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
+  JDIMENSION cur_start_row;	/* first logical row # in the buffer */
+  JDIMENSION first_undef_row;	/* row # of first uninitialized row */
+  wxjpeg_boolean pre_zero;		/* pre-zero mode requested? */
+  wxjpeg_boolean dirty;		/* do current buffer contents need written? */
+  wxjpeg_boolean b_s_open;		/* is backing-store data valid? */
+  jvirt_barray_ptr next;	/* link to next virtual barray control block */
+  backing_store_info b_s_info;	/* System-dependent control info */
+};
+
+
+#ifdef MEM_STATS		/* optional extra stuff for statistics */
+
+LOCAL(void)
+print_mem_stats (j_common_ptr cinfo, int pool_id)
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  small_pool_ptr shdr_ptr;
+  large_pool_ptr lhdr_ptr;
+
+  /* Since this is only a debugging stub, we can cheat a little by using
+   * fprintf directly rather than going through the trace message code.
+   * This is helpful because message parm array can't handle longs.
+   */
+  fprintf(stderr, "Freeing pool %d, total space = %ld\n",
+	  pool_id, mem->total_space_allocated);
+
+  for (lhdr_ptr = mem->large_list[pool_id]; lhdr_ptr != NULL;
+       lhdr_ptr = lhdr_ptr->hdr.next) {
+    fprintf(stderr, "  Large chunk used %ld\n",
+	    (long) lhdr_ptr->hdr.bytes_used);
+  }
+
+  for (shdr_ptr = mem->small_list[pool_id]; shdr_ptr != NULL;
+       shdr_ptr = shdr_ptr->hdr.next) {
+    fprintf(stderr, "  Small chunk used %ld free %ld\n",
+	    (long) shdr_ptr->hdr.bytes_used,
+	    (long) shdr_ptr->hdr.bytes_left);
+  }
+}
+
+#endif /* MEM_STATS */
+
+
+LOCAL(void)
+out_of_memory (j_common_ptr cinfo, int which)
+/* Report an out-of-memory error and stop execution */
+/* If we compiled MEM_STATS support, report alloc requests before dying */
+{
+#ifdef MEM_STATS
+  cinfo->err->trace_level = 2;	/* force self_destruct to report stats */
+#endif
+  ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, which);
+}
+
+
+/*
+ * Allocation of "small" objects.
+ *
+ * For these, we use pooled storage.  When a new pool must be created,
+ * we try to get enough space for the current request plus a "slop" factor,
+ * where the slop will be the amount of leftover space in the new pool.
+ * The speed vs. space tradeoff is largely determined by the slop values.
+ * A different slop value is provided for each pool class (lifetime),
+ * and we also distinguish the first pool of a class from later ones.
+ * NOTE: the values given work fairly well on both 16- and 32-bit-int
+ * machines, but may be too small if longs are 64 bits or more.
+ */
+
+static const size_t first_pool_slop[JPOOL_NUMPOOLS] = 
+{
+	1600,			/* first PERMANENT pool */
+	16000			/* first IMAGE pool */
+};
+
+static const size_t extra_pool_slop[JPOOL_NUMPOOLS] = 
+{
+	0,			/* additional PERMANENT pools */
+	5000			/* additional IMAGE pools */
+};
+
+#define MIN_SLOP  50		/* greater than 0 to avoid futile looping */
+
+
+METHODDEF(void *)
+alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
+/* Allocate a "small" object */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  small_pool_ptr hdr_ptr, prev_hdr_ptr;
+  char * data_ptr;
+  size_t odd_bytes, min_request, slop;
+
+  /* Check for unsatisfiable request (do now to ensure no overflow below) */
+  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(small_pool_hdr)))
+    out_of_memory(cinfo, 1);	/* request exceeds malloc's ability */
+
+  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */
+  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);
+  if (odd_bytes > 0)
+    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;
+
+  /* See if space is available in any existing pool */
+  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+  prev_hdr_ptr = NULL;
+  hdr_ptr = mem->small_list[pool_id];
+  while (hdr_ptr != NULL) {
+    if (hdr_ptr->hdr.bytes_left >= sizeofobject)
+      break;			/* found pool with enough space */
+    prev_hdr_ptr = hdr_ptr;
+    hdr_ptr = hdr_ptr->hdr.next;
+  }
+
+  /* Time to make a new pool? */
+  if (hdr_ptr == NULL) {
+    /* min_request is what we need now, slop is what will be leftover */
+    min_request = sizeofobject + SIZEOF(small_pool_hdr);
+    if (prev_hdr_ptr == NULL)	/* first pool in class? */
+      slop = first_pool_slop[pool_id];
+    else
+      slop = extra_pool_slop[pool_id];
+    /* Don't ask for more than MAX_ALLOC_CHUNK */
+    if (slop > (size_t) (MAX_ALLOC_CHUNK-min_request))
+      slop = (size_t) (MAX_ALLOC_CHUNK-min_request);
+    /* Try to get space, if fail reduce slop and try again */
+    for (;;) {
+      hdr_ptr = (small_pool_ptr) jpeg_get_small(cinfo, min_request + slop);
+      if (hdr_ptr != NULL)
+	break;
+      slop /= 2;
+      if (slop < MIN_SLOP)	/* give up when it gets real small */
+	out_of_memory(cinfo, 2); /* jpeg_get_small failed */
+    }
+    mem->total_space_allocated += min_request + slop;
+    /* Success, initialize the new pool header and add to end of list */
+    hdr_ptr->hdr.next = NULL;
+    hdr_ptr->hdr.bytes_used = 0;
+    hdr_ptr->hdr.bytes_left = sizeofobject + slop;
+    if (prev_hdr_ptr == NULL)	/* first pool in class? */
+      mem->small_list[pool_id] = hdr_ptr;
+    else
+      prev_hdr_ptr->hdr.next = hdr_ptr;
+  }
+
+  /* OK, allocate the object from the current pool */
+  data_ptr = (char *) (hdr_ptr + 1); /* point to first data byte in pool */
+  data_ptr += hdr_ptr->hdr.bytes_used; /* point to place for object */
+  hdr_ptr->hdr.bytes_used += sizeofobject;
+  hdr_ptr->hdr.bytes_left -= sizeofobject;
+
+  return (void *) data_ptr;
+}
+
+
+/*
+ * Allocation of "large" objects.
+ *
+ * The external semantics of these are the same as "small" objects,
+ * except that FAR pointers are used on 80x86.  However the pool
+ * management heuristics are quite different.  We assume that each
+ * request is large enough that it may as well be passed directly to
+ * jpeg_get_large; the pool management just links everything together
+ * so that we can free it all on demand.
+ * Note: the major use of "large" objects is in JSAMPARRAY and JBLOCKARRAY
+ * structures.  The routines that create these structures (see below)
+ * deliberately bunch rows together to ensure a large request size.
+ */
+
+METHODDEF(void FAR *)
+alloc_large (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
+/* Allocate a "large" object */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  large_pool_ptr hdr_ptr;
+  size_t odd_bytes;
+
+  /* Check for unsatisfiable request (do now to ensure no overflow below) */
+  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)))
+    out_of_memory(cinfo, 3);	/* request exceeds malloc's ability */
+
+  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */
+  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);
+  if (odd_bytes > 0)
+    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;
+
+  /* Always make a new pool */
+  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+
+  hdr_ptr = (large_pool_ptr) jpeg_get_large(cinfo, sizeofobject +
+					    SIZEOF(large_pool_hdr));
+  if (hdr_ptr == NULL)
+    out_of_memory(cinfo, 4);	/* jpeg_get_large failed */
+  mem->total_space_allocated += sizeofobject + SIZEOF(large_pool_hdr);
+
+  /* Success, initialize the new pool header and add to list */
+  hdr_ptr->hdr.next = mem->large_list[pool_id];
+  /* We maintain space counts in each pool header for statistical purposes,
+   * even though they are not needed for allocation.
+   */
+  hdr_ptr->hdr.bytes_used = sizeofobject;
+  hdr_ptr->hdr.bytes_left = 0;
+  mem->large_list[pool_id] = hdr_ptr;
+
+  return (void FAR *) (hdr_ptr + 1); /* point to first data byte in pool */
+}
+
+
+/*
+ * Creation of 2-D sample arrays.
+ * The pointers are in near heap, the samples themselves in FAR heap.
+ *
+ * To minimize allocation overhead and to allow I/O of large contiguous
+ * blocks, we allocate the sample rows in groups of as many rows as possible
+ * without exceeding MAX_ALLOC_CHUNK total bytes per allocation request.
+ * NB: the virtual array control routines, later in this file, know about
+ * this chunking of rows.  The rowsperchunk value is left in the mem manager
+ * object so that it can be saved away if this sarray is the workspace for
+ * a virtual array.
+ */
+
+METHODDEF(JSAMPARRAY)
+alloc_sarray (j_common_ptr cinfo, int pool_id,
+	      JDIMENSION samplesperrow, JDIMENSION numrows)
+/* Allocate a 2-D sample array */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  JSAMPARRAY result;
+  JSAMPROW workspace;
+  JDIMENSION rowsperchunk, currow, i;
+  long ltemp;
+
+  /* Calculate max # of rows allowed in one allocation chunk */
+  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
+	  ((long) samplesperrow * SIZEOF(JSAMPLE));
+  if (ltemp <= 0)
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+  if (ltemp < (long) numrows)
+    rowsperchunk = (JDIMENSION) ltemp;
+  else
+    rowsperchunk = numrows;
+  mem->last_rowsperchunk = rowsperchunk;
+
+  /* Get space for row pointers (small object) */
+  result = (JSAMPARRAY) alloc_small(cinfo, pool_id,
+				    (size_t) (numrows * SIZEOF(JSAMPROW)));
+
+  /* Get the rows themselves (large objects) */
+  currow = 0;
+  while (currow < numrows) {
+    rowsperchunk = MIN(rowsperchunk, numrows - currow);
+    workspace = (JSAMPROW) alloc_large(cinfo, pool_id,
+	(size_t) ((size_t) rowsperchunk * (size_t) samplesperrow
+		  * SIZEOF(JSAMPLE)));
+    for (i = rowsperchunk; i > 0; i--) {
+      result[currow++] = workspace;
+      workspace += samplesperrow;
+    }
+  }
+
+  return result;
+}
+
+
+/*
+ * Creation of 2-D coefficient-block arrays.
+ * This is essentially the same as the code for sample arrays, above.
+ */
+
+METHODDEF(JBLOCKARRAY)
+alloc_barray (j_common_ptr cinfo, int pool_id,
+	      JDIMENSION blocksperrow, JDIMENSION numrows)
+/* Allocate a 2-D coefficient-block array */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  JBLOCKARRAY result;
+  JBLOCKROW workspace;
+  JDIMENSION rowsperchunk, currow, i;
+  long ltemp;
+
+  /* Calculate max # of rows allowed in one allocation chunk */
+  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
+	  ((long) blocksperrow * SIZEOF(JBLOCK));
+  if (ltemp <= 0)
+    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
+  if (ltemp < (long) numrows)
+    rowsperchunk = (JDIMENSION) ltemp;
+  else
+    rowsperchunk = numrows;
+  mem->last_rowsperchunk = rowsperchunk;
+
+  /* Get space for row pointers (small object) */
+  result = (JBLOCKARRAY) alloc_small(cinfo, pool_id,
+				     (size_t) (numrows * SIZEOF(JBLOCKROW)));
+
+  /* Get the rows themselves (large objects) */
+  currow = 0;
+  while (currow < numrows) {
+    rowsperchunk = MIN(rowsperchunk, numrows - currow);
+    workspace = (JBLOCKROW) alloc_large(cinfo, pool_id,
+	(size_t) ((size_t) rowsperchunk * (size_t) blocksperrow
+		  * SIZEOF(JBLOCK)));
+    for (i = rowsperchunk; i > 0; i--) {
+      result[currow++] = workspace;
+      workspace += blocksperrow;
+    }
+  }
+
+  return result;
+}
+
+
+/*
+ * About virtual array management:
+ *
+ * The above "normal" array routines are only used to allocate strip buffers
+ * (as wide as the image, but just a few rows high).  Full-image-sized buffers
+ * are handled as "virtual" arrays.  The array is still accessed a strip at a
+ * time, but the memory manager must save the whole array for repeated
+ * accesses.  The intended implementation is that there is a strip buffer in
+ * memory (as high as is possible given the desired memory limit), plus a
+ * backing file that holds the rest of the array.
+ *
+ * The request_virt_array routines are told the total size of the image and
+ * the maximum number of rows that will be accessed at once.  The in-memory
+ * buffer must be at least as large as the maxaccess value.
+ *
+ * The request routines create control blocks but not the in-memory buffers.
+ * That is postponed until realize_virt_arrays is called.  At that time the
+ * total amount of space needed is known (approximately, anyway), so free
+ * memory can be divided up fairly.
+ *
+ * The access_virt_array routines are responsible for making a specific strip
+ * area accessible (after reading or writing the backing file, if necessary).
+ * Note that the access routines are told whether the caller intends to modify
+ * the accessed strip; during a read-only pass this saves having to rewrite
+ * data to disk.  The access routines are also responsible for pre-zeroing
+ * any newly accessed rows, if pre-zeroing was requested.
+ *
+ * In current usage, the access requests are usually for nonoverlapping
+ * strips; that is, successive access start_row numbers differ by exactly
+ * num_rows = maxaccess.  This means we can get good performance with simple
+ * buffer dump/reload logic, by making the in-memory buffer be a multiple
+ * of the access height; then there will never be accesses across bufferload
+ * boundaries.  The code will still work with overlapping access requests,
+ * but it doesn't handle bufferload overlaps very efficiently.
+ */
+
+
+METHODDEF(jvirt_sarray_ptr)
+request_virt_sarray (j_common_ptr cinfo, int pool_id, wxjpeg_boolean pre_zero,
+		     JDIMENSION samplesperrow, JDIMENSION numrows,
+		     JDIMENSION maxaccess)
+/* Request a virtual 2-D sample array */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  jvirt_sarray_ptr result;
+
+  /* Only IMAGE-lifetime virtual arrays are currently supported */
+  if (pool_id != JPOOL_IMAGE)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+
+  /* get control block */
+  result = (jvirt_sarray_ptr) alloc_small(cinfo, pool_id,
+					  SIZEOF(struct jvirt_sarray_control));
+
+  result->mem_buffer = NULL;	/* marks array not yet realized */
+  result->rows_in_array = numrows;
+  result->samplesperrow = samplesperrow;
+  result->maxaccess = maxaccess;
+  result->pre_zero = pre_zero;
+  result->b_s_open = FALSE;	/* no associated backing-store object */
+  result->next = mem->virt_sarray_list; /* add to list of virtual arrays */
+  mem->virt_sarray_list = result;
+
+  return result;
+}
+
+
+METHODDEF(jvirt_barray_ptr)
+request_virt_barray (j_common_ptr cinfo, int pool_id, wxjpeg_boolean pre_zero,
+		     JDIMENSION blocksperrow, JDIMENSION numrows,
+		     JDIMENSION maxaccess)
+/* Request a virtual 2-D coefficient-block array */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  jvirt_barray_ptr result;
+
+  /* Only IMAGE-lifetime virtual arrays are currently supported */
+  if (pool_id != JPOOL_IMAGE)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+
+  /* get control block */
+  result = (jvirt_barray_ptr) alloc_small(cinfo, pool_id,
+					  SIZEOF(struct jvirt_barray_control));
+
+  result->mem_buffer = NULL;	/* marks array not yet realized */
+  result->rows_in_array = numrows;
+  result->blocksperrow = blocksperrow;
+  result->maxaccess = maxaccess;
+  result->pre_zero = pre_zero;
+  result->b_s_open = FALSE;	/* no associated backing-store object */
+  result->next = mem->virt_barray_list; /* add to list of virtual arrays */
+  mem->virt_barray_list = result;
+
+  return result;
+}
+
+
+METHODDEF(void)
+realize_virt_arrays (j_common_ptr cinfo)
+/* Allocate the in-memory buffers for any unrealized virtual arrays */
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  long space_per_minheight, maximum_space, avail_mem;
+  long minheights, max_minheights;
+  jvirt_sarray_ptr sptr;
+  jvirt_barray_ptr bptr;
+
+  /* Compute the minimum space needed (maxaccess rows in each buffer)
+   * and the maximum space needed (full image height in each buffer).
+   * These may be of use to the system-dependent jpeg_mem_available routine.
+   */
+  space_per_minheight = 0;
+  maximum_space = 0;
+  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
+    if (sptr->mem_buffer == NULL) { /* if not realized yet */
+      space_per_minheight += (long) sptr->maxaccess *
+			     (long) sptr->samplesperrow * SIZEOF(JSAMPLE);
+      maximum_space += (long) sptr->rows_in_array *
+		       (long) sptr->samplesperrow * SIZEOF(JSAMPLE);
+    }
+  }
+  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
+    if (bptr->mem_buffer == NULL) { /* if not realized yet */
+      space_per_minheight += (long) bptr->maxaccess *
+			     (long) bptr->blocksperrow * SIZEOF(JBLOCK);
+      maximum_space += (long) bptr->rows_in_array *
+		       (long) bptr->blocksperrow * SIZEOF(JBLOCK);
+    }
+  }
+
+  if (space_per_minheight <= 0)
+    return;			/* no unrealized arrays, no work */
+
+  /* Determine amount of memory to actually use; this is system-dependent. */
+  avail_mem = jpeg_mem_available(cinfo, space_per_minheight, maximum_space,
+				 mem->total_space_allocated);
+
+  /* If the maximum space needed is available, make all the buffers full
+   * height; otherwise parcel it out with the same number of minheights
+   * in each buffer.
+   */
+  if (avail_mem >= maximum_space)
+    max_minheights = 1000000000L;
+  else {
+    max_minheights = avail_mem / space_per_minheight;
+    /* If there doesn't seem to be enough space, try to get the minimum
+     * anyway.  This allows a "stub" implementation of jpeg_mem_available().
+     */
+    if (max_minheights <= 0)
+      max_minheights = 1;
+  }
+
+  /* Allocate the in-memory buffers and initialize backing store as needed. */
+
+  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
+    if (sptr->mem_buffer == NULL) { /* if not realized yet */
+      minheights = ((long) sptr->rows_in_array - 1L) / sptr->maxaccess + 1L;
+      if (minheights <= max_minheights) {
+	/* This buffer fits in memory */
+	sptr->rows_in_mem = sptr->rows_in_array;
+      } else {
+	/* It doesn't fit in memory, create backing store. */
+	sptr->rows_in_mem = (JDIMENSION) (max_minheights * sptr->maxaccess);
+	jpeg_open_backing_store(cinfo, & sptr->b_s_info,
+				(long) sptr->rows_in_array *
+				(long) sptr->samplesperrow *
+				(long) SIZEOF(JSAMPLE));
+	sptr->b_s_open = TRUE;
+      }
+      sptr->mem_buffer = alloc_sarray(cinfo, JPOOL_IMAGE,
+				      sptr->samplesperrow, sptr->rows_in_mem);
+      sptr->rowsperchunk = mem->last_rowsperchunk;
+      sptr->cur_start_row = 0;
+      sptr->first_undef_row = 0;
+      sptr->dirty = FALSE;
+    }
+  }
+
+  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
+    if (bptr->mem_buffer == NULL) { /* if not realized yet */
+      minheights = ((long) bptr->rows_in_array - 1L) / bptr->maxaccess + 1L;
+      if (minheights <= max_minheights) {
+	/* This buffer fits in memory */
+	bptr->rows_in_mem = bptr->rows_in_array;
+      } else {
+	/* It doesn't fit in memory, create backing store. */
+	bptr->rows_in_mem = (JDIMENSION) (max_minheights * bptr->maxaccess);
+	jpeg_open_backing_store(cinfo, & bptr->b_s_info,
+				(long) bptr->rows_in_array *
+				(long) bptr->blocksperrow *
+				(long) SIZEOF(JBLOCK));
+	bptr->b_s_open = TRUE;
+      }
+      bptr->mem_buffer = alloc_barray(cinfo, JPOOL_IMAGE,
+				      bptr->blocksperrow, bptr->rows_in_mem);
+      bptr->rowsperchunk = mem->last_rowsperchunk;
+      bptr->cur_start_row = 0;
+      bptr->first_undef_row = 0;
+      bptr->dirty = FALSE;
+    }
+  }
+}
+
+
+LOCAL(void)
+do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, wxjpeg_boolean writing)
+/* Do backing store read or write of a virtual sample array */
+{
+  long bytesperrow, file_offset, byte_count, rows, thisrow, i;
+
+  bytesperrow = (long) ptr->samplesperrow * SIZEOF(JSAMPLE);
+  file_offset = ptr->cur_start_row * bytesperrow;
+  /* Loop to read or write each allocation chunk in mem_buffer */
+  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {
+    /* One chunk, but check for short chunk at end of buffer */
+    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);
+    /* Transfer no more than is currently defined */
+    thisrow = (long) ptr->cur_start_row + i;
+    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);
+    /* Transfer no more than fits in file */
+    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);
+    if (rows <= 0)		/* this chunk might be past end of file! */
+      break;
+    byte_count = rows * bytesperrow;
+    if (writing)
+      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,
+					    (void FAR *) ptr->mem_buffer[i],
+					    file_offset, byte_count);
+    else
+      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,
+					   (void FAR *) ptr->mem_buffer[i],
+					   file_offset, byte_count);
+    file_offset += byte_count;
+  }
+}
+
+
+LOCAL(void)
+do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, wxjpeg_boolean writing)
+/* Do backing store read or write of a virtual coefficient-block array */
+{
+  long bytesperrow, file_offset, byte_count, rows, thisrow, i;
+
+  bytesperrow = (long) ptr->blocksperrow * SIZEOF(JBLOCK);
+  file_offset = ptr->cur_start_row * bytesperrow;
+  /* Loop to read or write each allocation chunk in mem_buffer */
+  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {
+    /* One chunk, but check for short chunk at end of buffer */
+    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);
+    /* Transfer no more than is currently defined */
+    thisrow = (long) ptr->cur_start_row + i;
+    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);
+    /* Transfer no more than fits in file */
+    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);
+    if (rows <= 0)		/* this chunk might be past end of file! */
+      break;
+    byte_count = rows * bytesperrow;
+    if (writing)
+      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,
+					    (void FAR *) ptr->mem_buffer[i],
+					    file_offset, byte_count);
+    else
+      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,
+					   (void FAR *) ptr->mem_buffer[i],
+					   file_offset, byte_count);
+    file_offset += byte_count;
+  }
+}
+
+
+METHODDEF(JSAMPARRAY)
+access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,
+		    JDIMENSION start_row, JDIMENSION num_rows,
+		    wxjpeg_boolean writable)
+/* Access the part of a virtual sample array starting at start_row */
+/* and extending for num_rows rows.  writable is true if  */
+/* caller intends to modify the accessed area. */
+{
+  JDIMENSION end_row = start_row + num_rows;
+  JDIMENSION undef_row;
+
+  /* debugging check */
+  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||
+      ptr->mem_buffer == NULL)
+    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+
+  /* Make the desired part of the virtual array accessible */
+  if (start_row < ptr->cur_start_row ||
+      end_row > ptr->cur_start_row+ptr->rows_in_mem) {
+    if (! ptr->b_s_open)
+      ERREXIT(cinfo, JERR_VIRTUAL_BUG);
+    /* Flush old buffer contents if necessary */
+    if (ptr->dirty) {
+      do_sarray_io(cinfo, ptr, TRUE);
+      ptr->dirty = FALSE;
+    }
+    /* Decide what part of virtual array to access.
+     * Algorithm: if target address > current window, assume forward scan,
+     * load starting at target address.  If target address < current window,
+     * assume backward scan, load so that target area is top of window.
+     * Note that when switching from forward write to forward read, will have
+     * start_row = 0, so the limiting case applies and we load from 0 anyway.
+     */
+    if (start_row > ptr->cur_start_row) {
+      ptr->cur_start_row = start_row;
+    } else {
+      /* use long arithmetic here to avoid overflow & unsigned problems */
+      long ltemp;
+
+      ltemp = (long) end_row - (long) ptr->rows_in_mem;
+      if (ltemp < 0)
+	ltemp = 0;		/* don't fall off front end of file */
+      ptr->cur_start_row = (JDIMENSION) ltemp;
+    }
+    /* Read in the selected part of the array.
+     * During the initial write pass, we will do no actual read
+     * because the selected part is all undefined.
+     */
+    do_sarray_io(cinfo, ptr, FALSE);
+  }
+  /* Ensure the accessed part of the array is defined; prezero if needed.
+   * To improve locality of access, we only prezero the part of the array
+   * that the caller is about to access, not the entire in-memory array.
+   */
+  if (ptr->first_undef_row < end_row) {
+    if (ptr->first_undef_row < start_row) {
+      if (writable)		/* writer skipped over a section of array */
+	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+      undef_row = start_row;	/* but reader is allowed to read ahead */
+    } else {
+      undef_row = ptr->first_undef_row;
+    }
+    if (writable)
+      ptr->first_undef_row = end_row;
+    if (ptr->pre_zero) {
+      size_t bytesperrow = (size_t) ptr->samplesperrow * SIZEOF(JSAMPLE);
+      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */
+      end_row -= ptr->cur_start_row;
+      while (undef_row < end_row) {
+	jzero_far((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);
+	undef_row++;
+      }
+    } else {
+      if (! writable)		/* reader looking at undefined data */
+	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+    }
+  }
+  /* Flag the buffer dirty if caller will write in it */
+  if (writable)
+    ptr->dirty = TRUE;
+  /* Return address of proper part of the buffer */
+  return ptr->mem_buffer + (start_row - ptr->cur_start_row);
+}
+
+
+METHODDEF(JBLOCKARRAY)
+access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr,
+		    JDIMENSION start_row, JDIMENSION num_rows,
+		    wxjpeg_boolean writable)
+/* Access the part of a virtual block array starting at start_row */
+/* and extending for num_rows rows.  writable is true if  */
+/* caller intends to modify the accessed area. */
+{
+  JDIMENSION end_row = start_row + num_rows;
+  JDIMENSION undef_row;
+
+  /* debugging check */
+  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||
+      ptr->mem_buffer == NULL)
+    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+
+  /* Make the desired part of the virtual array accessible */
+  if (start_row < ptr->cur_start_row ||
+      end_row > ptr->cur_start_row+ptr->rows_in_mem) {
+    if (! ptr->b_s_open)
+      ERREXIT(cinfo, JERR_VIRTUAL_BUG);
+    /* Flush old buffer contents if necessary */
+    if (ptr->dirty) {
+      do_barray_io(cinfo, ptr, TRUE);
+      ptr->dirty = FALSE;
+    }
+    /* Decide what part of virtual array to access.
+     * Algorithm: if target address > current window, assume forward scan,
+     * load starting at target address.  If target address < current window,
+     * assume backward scan, load so that target area is top of window.
+     * Note that when switching from forward write to forward read, will have
+     * start_row = 0, so the limiting case applies and we load from 0 anyway.
+     */
+    if (start_row > ptr->cur_start_row) {
+      ptr->cur_start_row = start_row;
+    } else {
+      /* use long arithmetic here to avoid overflow & unsigned problems */
+      long ltemp;
+
+      ltemp = (long) end_row - (long) ptr->rows_in_mem;
+      if (ltemp < 0)
+	ltemp = 0;		/* don't fall off front end of file */
+      ptr->cur_start_row = (JDIMENSION) ltemp;
+    }
+    /* Read in the selected part of the array.
+     * During the initial write pass, we will do no actual read
+     * because the selected part is all undefined.
+     */
+    do_barray_io(cinfo, ptr, FALSE);
+  }
+  /* Ensure the accessed part of the array is defined; prezero if needed.
+   * To improve locality of access, we only prezero the part of the array
+   * that the caller is about to access, not the entire in-memory array.
+   */
+  if (ptr->first_undef_row < end_row) {
+    if (ptr->first_undef_row < start_row) {
+      if (writable)		/* writer skipped over a section of array */
+	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+      undef_row = start_row;	/* but reader is allowed to read ahead */
+    } else {
+      undef_row = ptr->first_undef_row;
+    }
+    if (writable)
+      ptr->first_undef_row = end_row;
+    if (ptr->pre_zero) {
+      size_t bytesperrow = (size_t) ptr->blocksperrow * SIZEOF(JBLOCK);
+      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */
+      end_row -= ptr->cur_start_row;
+      while (undef_row < end_row) {
+	jzero_far((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);
+	undef_row++;
+      }
+    } else {
+      if (! writable)		/* reader looking at undefined data */
+	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
+    }
+  }
+  /* Flag the buffer dirty if caller will write in it */
+  if (writable)
+    ptr->dirty = TRUE;
+  /* Return address of proper part of the buffer */
+  return ptr->mem_buffer + (start_row - ptr->cur_start_row);
+}
+
+
+/*
+ * Release all objects belonging to a specified pool.
+ */
+
+METHODDEF(void)
+free_pool (j_common_ptr cinfo, int pool_id)
+{
+  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
+  small_pool_ptr shdr_ptr;
+  large_pool_ptr lhdr_ptr;
+  size_t space_freed;
+
+  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
+    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
+
+#ifdef MEM_STATS
+  if (cinfo->err->trace_level > 1)
+    print_mem_stats(cinfo, pool_id); /* print pool's memory usage statistics */
+#endif
+
+  /* If freeing IMAGE pool, close any virtual arrays first */
+  if (pool_id == JPOOL_IMAGE) {
+    jvirt_sarray_ptr sptr;
+    jvirt_barray_ptr bptr;
+
+    for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
+      if (sptr->b_s_open) {	/* there may be no backing store */
+	sptr->b_s_open = FALSE;	/* prevent recursive close if error */
+	(*sptr->b_s_info.close_backing_store) (cinfo, & sptr->b_s_info);
+      }
+    }
+    mem->virt_sarray_list = NULL;
+    for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
+      if (bptr->b_s_open) {	/* there may be no backing store */
+	bptr->b_s_open = FALSE;	/* prevent recursive close if error */
+	(*bptr->b_s_info.close_backing_store) (cinfo, & bptr->b_s_info);
+      }
+    }
+    mem->virt_barray_list = NULL;
+  }
+
+  /* Release large objects */
+  lhdr_ptr = mem->large_list[pool_id];
+  mem->large_list[pool_id] = NULL;
+
+  while (lhdr_ptr != NULL) {
+    large_pool_ptr next_lhdr_ptr = lhdr_ptr->hdr.next;
+    space_freed = lhdr_ptr->hdr.bytes_used +
+		  lhdr_ptr->hdr.bytes_left +
+		  SIZEOF(large_pool_hdr);
+    jpeg_free_large(cinfo, (void FAR *) lhdr_ptr, space_freed);
+    mem->total_space_allocated -= space_freed;
+    lhdr_ptr = next_lhdr_ptr;
+  }
+
+  /* Release small objects */
+  shdr_ptr = mem->small_list[pool_id];
+  mem->small_list[pool_id] = NULL;
+
+  while (shdr_ptr != NULL) {
+    small_pool_ptr next_shdr_ptr = shdr_ptr->hdr.next;
+    space_freed = shdr_ptr->hdr.bytes_used +
+		  shdr_ptr->hdr.bytes_left +
+		  SIZEOF(small_pool_hdr);
+    jpeg_free_small(cinfo, (void *) shdr_ptr, space_freed);
+    mem->total_space_allocated -= space_freed;
+    shdr_ptr = next_shdr_ptr;
+  }
+}
+
+
+/*
+ * Close up shop entirely.
+ * Note that this cannot be called unless cinfo->mem is non-NULL.
+ */
+
+METHODDEF(void)
+self_destruct (j_common_ptr cinfo)
+{
+  int pool;
+
+  /* Close all backing store, release all memory.
+   * Releasing pools in reverse order might help avoid fragmentation
+   * with some (brain-damaged) malloc libraries.
+   */
+  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {
+    free_pool(cinfo, pool);
+  }
+
+  /* Release the memory manager control block too. */
+  jpeg_free_small(cinfo, (void *) cinfo->mem, SIZEOF(my_memory_mgr));
+  cinfo->mem = NULL;		/* ensures I will be called only once */
+
+  jpeg_mem_term(cinfo);		/* system-dependent cleanup */
+}
+
+
+/*
+ * Memory manager initialization.
+ * When this is called, only the error manager pointer is valid in cinfo!
+ */
+
+GLOBAL(void)
+jinit_memory_mgr (j_common_ptr cinfo)
+{
+  my_mem_ptr mem;
+  long max_to_use;
+  int pool;
+  size_t test_mac;
+
+  cinfo->mem = NULL;		/* for safety if init fails */
+
+  /* Check for configuration errors.
+   * SIZEOF(ALIGN_TYPE) should be a power of 2; otherwise, it probably
+   * doesn't reflect any real hardware alignment requirement.
+   * The test is a little tricky: for X>0, X and X-1 have no one-bits
+   * in common if and only if X is a power of 2, ie has only one one-bit.
+   * Some compilers may give an "unreachable code" warning here; ignore it.
+   */
+  if ((SIZEOF(ALIGN_TYPE) & (SIZEOF(ALIGN_TYPE)-1)) != 0)
+    ERREXIT(cinfo, JERR_BAD_ALIGN_TYPE);
+  /* MAX_ALLOC_CHUNK must be representable as type size_t, and must be
+   * a multiple of SIZEOF(ALIGN_TYPE).
+   * Again, an "unreachable code" warning may be ignored here.
+   * But a "constant too large" warning means you need to fix MAX_ALLOC_CHUNK.
+   */
+  test_mac = (size_t) MAX_ALLOC_CHUNK;
+  if ((long) test_mac != MAX_ALLOC_CHUNK ||
+      (MAX_ALLOC_CHUNK % SIZEOF(ALIGN_TYPE)) != 0)
+    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
+
+  max_to_use = jpeg_mem_init(cinfo); /* system-dependent initialization */
+
+  /* Attempt to allocate memory manager's control block */
+  mem = (my_mem_ptr) jpeg_get_small(cinfo, SIZEOF(my_memory_mgr));
+
+  if (mem == NULL) {
+    jpeg_mem_term(cinfo);	/* system-dependent cleanup */
+    ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 0);
+  }
+
+  /* OK, fill in the method pointers */
+  mem->pub.alloc_small = alloc_small;
+  mem->pub.alloc_large = alloc_large;
+  mem->pub.alloc_sarray = alloc_sarray;
+  mem->pub.alloc_barray = alloc_barray;
+  mem->pub.request_virt_sarray = request_virt_sarray;
+  mem->pub.request_virt_barray = request_virt_barray;
+  mem->pub.realize_virt_arrays = realize_virt_arrays;
+  mem->pub.access_virt_sarray = access_virt_sarray;
+  mem->pub.access_virt_barray = access_virt_barray;
+  mem->pub.free_pool = free_pool;
+  mem->pub.self_destruct = self_destruct;
+
+  /* Make MAX_ALLOC_CHUNK accessible to other modules */
+  mem->pub.max_alloc_chunk = MAX_ALLOC_CHUNK;
+
+  /* Initialize working state */
+  mem->pub.max_memory_to_use = max_to_use;
+
+  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {
+    mem->small_list[pool] = NULL;
+    mem->large_list[pool] = NULL;
+  }
+  mem->virt_sarray_list = NULL;
+  mem->virt_barray_list = NULL;
+
+  mem->total_space_allocated = SIZEOF(my_memory_mgr);
+
+  /* Declare ourselves open for business */
+  cinfo->mem = & mem->pub;
+
+  /* Check for an environment variable JPEGMEM; if found, override the
+   * default max_memory setting from jpeg_mem_init.  Note that the
+   * surrounding application may again override this value.
+   * If your system doesn't support getenv(), define NO_GETENV to disable
+   * this feature.
+   */
+#ifndef NO_GETENV
+  { char * memenv;
+
+    if ((memenv = getenv("JPEGMEM")) != NULL) {
+      char ch = 'x';
+
+      if (sscanf(memenv, "%ld%c", &max_to_use, &ch) > 0) {
+	if (ch == 'm' || ch == 'M')
+	  max_to_use *= 1000L;
+	mem->pub.max_memory_to_use = max_to_use * 1000L;
+      }
+    }
+  }
+#endif
+
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jmemname.c b/Source/3rd Party/wx/src/jpeg/jmemname.c
new file mode 100644
index 000000000..ed96dee1b
--- /dev/null
+++ b/Source/3rd Party/wx/src/jpeg/jmemname.c	
@@ -0,0 +1,276 @@
+/*
+ * jmemname.c
+ *
+ * Copyright (C) 1992-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides a generic implementation of the system-dependent
+ * portion of the JPEG memory manager.  This implementation assumes that
+ * you must explicitly construct a name for each temp file.
+ * Also, the problem of determining the amount of memory available
+ * is shoved onto the user.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */
+extern void * malloc JPP((size_t size));
+extern void free JPP((void *ptr));
+#endif
+
+#ifndef SEEK_SET		/* pre-ANSI systems may not define this; */
+#define SEEK_SET  0		/* if not, assume 0 is correct */
+#endif
+
+#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
+#define READ_BINARY	"r"
+#define RW_BINARY	"w+"
+#else
+#ifdef VMS			/* VMS is very nonstandard */
+#define READ_BINARY	"rb", "ctx=stm"
+#define RW_BINARY	"w+b", "ctx=stm"
+#else				/* standard ANSI-compliant case */
+#define READ_BINARY	"rb"
+#define RW_BINARY	"w+b"
+#endif
+#endif
+
+
+/*
+ * Selection of a file name for a temporary file.
+ * This is system-dependent!
+ *
+ * The code as given is suitable for most Unix systems, and it is easily
+ * modified for most non-Unix systems.  Some notes:
+ *  1.  The temp file is created in the directory named by TEMP_DIRECTORY.
+ *      The default value is /usr/tmp, which is the conventional place for
+ *      creating large temp files on Unix.  On other systems you'll probably
+ *      want to change the file location.  You can do this by editing the
+ *      #define, or (preferred) by defining TEMP_DIRECTORY in jconfig.h.
+ *
+ *  2.  If you need to change the file name as well as its location,
+ *      you can override the TEMP_FILE_NAME macro.  (Note that this is
+ *      actually a printf format string; it must contain %s and %d.)
+ *      Few people should need to do this.
+ *
+ *  3.  mktemp() is used to ensure that multiple processes running
+ *      simultaneously won't select the same file names.  If your system
+ *      doesn't have mktemp(), define NO_MKTEMP to do it the hard way.
+ *      (If you don't have <errno.h>, also define NO_ERRNO_H.)
+ *
+ *  4.  You probably want to define NEED_SIGNAL_CATCHER so that cjpeg.c/djpeg.c
+ *      will cause the temp files to be removed if you stop the program early.
+ */
+
+#ifndef TEMP_DIRECTORY		/* can override from jconfig.h or Makefile */
+#define TEMP_DIRECTORY  "/usr/tmp/" /* recommended setting for Unix */
+#endif
+
+static int next_file_num;	/* to distinguish among several temp files */
+
+#ifdef NO_MKTEMP
+
+#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */
+#define TEMP_FILE_NAME  "%sJPG%03d.TMP"
+#endif
+
+#ifndef NO_ERRNO_H
+#include <errno.h>		/* to define ENOENT */
+#endif
+
+/* ANSI C specifies that errno is a macro, but on older systems it's more
+ * likely to be a plain int variable.  And not all versions of errno.h
+ * bother to declare it, so we have to in order to be most portable.  Thus:
+ */
+#ifndef errno
+extern int errno;
+#endif
+
+
+LOCAL(void)
+select_file_name (char * fname)
+{
+  FILE * tfile;
+
+  /* Keep generating file names till we find one that's not in use */
+  for (;;) {
+    next_file_num++;		/* advance counter */
+    sprintf(fname, TEMP_FILE_NAME, TEMP_DIRECTORY, next_file_num);
+    if ((tfile = fopen(fname, READ_BINARY)) == NULL) {
+      /* fopen could have failed for a reason other than the file not
+       * being there; for example, file there but unreadable.
+       * If <errno.h> isn't available, then we cannot test the cause.
+       */
+#ifdef ENOENT
+      if (errno != ENOENT)
+	continue;
+#endif
+      break;
+    }
+    fclose(tfile);		/* oops, it's there; close tfile & try again */
+  }
+}
+
+#else /* ! NO_MKTEMP */
+
+/* Note that mktemp() requires the initial filename to end in six X's */
+#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */
+#define TEMP_FILE_NAME  "%sJPG%dXXXXXX"
+#endif
+
+LOCAL(void)
+select_file_name (char * fname)
+{
+  next_file_num++;		/* advance counter */
+  sprintf(fname, TEMP_FILE_NAME, TEMP_DIRECTORY, next_file_num);
+  mktemp(fname);		/* make sure file name is unique */
+  /* mktemp replaces the trailing XXXXXX with a unique string of characters */
+}
+
+#endif /* NO_MKTEMP */
+
+
+/*
+ * Memory allocation and freeing are controlled by the regular library
+ * routines malloc() and free().
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * "Large" objects are treated the same as "small" ones.
+ * NB: although we include FAR keywords in the routine declarations,
+ * this file won't actually work in 80x86 small/medium model; at least,
+ * you probably won't be able to process useful-size images in only 64KB.
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ * It's impossible to do this in a portable way; our current solution is
+ * to make the user tell us (with a default value set at compile time).
+ * If you can actually get the available space, it's a good idea to subtract
+ * a slop factor of 5% or so.
+ */
+
+#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */
+#define DEFAULT_MAX_MEM		1000000L /* default: one megabyte */
+#endif
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  return cinfo->mem->max_memory_to_use - already_allocated;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Backing store objects are only used when the value returned by
+ * jpeg_mem_available is less than the total space needed.  You can dispense
+ * with these routines if you have plenty of virtual memory; see jmemnobs.c.
+ */
+
+
+METHODDEF(void)
+read_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		    void FAR * buffer_address,
+		    long file_offset, long byte_count)
+{
+  if (fseek(info->temp_file, file_offset, SEEK_SET))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  if (JFREAD(info->temp_file, buffer_address, byte_count)
+      != (size_t) byte_count)
+    ERREXIT(cinfo, JERR_TFILE_READ);
+}
+
+
+METHODDEF(void)
+write_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+		     void FAR * buffer_address,
+		     long file_offset, long byte_count)
+{
+  if (fseek(info->temp_file, file_offset, SEEK_SET))
+    ERREXIT(cinfo, JERR_TFILE_SEEK);
+  if (JFWRITE(info->temp_file, buffer_address, byte_count)
+      != (size_t) byte_count)
+    ERREXIT(cinfo, JERR_TFILE_WRITE);
+}
+
+
+METHODDEF(void)
+close_backing_store (j_common_ptr cinfo, backing_store_ptr info)
+{
+  fclose(info->temp_file);	/* close the file */
+  unlink(info->temp_name);	/* delete the file */
+/* If your system doesn't have unlink(), use remove() instead.
+ * remove() is the ANSI-standard name for this function, but if
+ * your system was ANSI you'd be using jmemansi.c, right?
+ */
+  TRACEMSS(cinfo, 1, JTRC_TFILE_CLOSE, info->temp_name);
+}
+
+
+/*
+ * Initial opening of a backing-store object.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  select_file_name(info->temp_name);
+  if ((info->temp_file = fopen(info->temp_name, RW_BINARY)) == NULL)
+    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
+  info->read_backing_store = read_backing_store;
+  info->write_backing_store = write_backing_store;
+  info->close_backing_store = close_backing_store;
+  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  next_file_num = 0;		/* initialize temp file name generator */
+  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* no work */
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jmemnobs.c b/Source/3rd Party/wx/src/jpeg/jmemnobs.c
index 6aa1e9295..eb8c33772 100644
--- a/Source/3rd Party/wx/src/jpeg/jmemnobs.c	
+++ b/Source/3rd Party/wx/src/jpeg/jmemnobs.c	
@@ -1,109 +1,109 @@
-/*
- * jmemnobs.c
- *
- * Copyright (C) 1992-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides a really simple implementation of the system-
- * dependent portion of the JPEG memory manager.  This implementation
- * assumes that no backing-store files are needed: all required space
- * can be obtained from malloc().
- * This is very portable in the sense that it'll compile on almost anything,
- * but you'd better have lots of main memory (or virtual memory) if you want
- * to process big images.
- * Note that the max_memory_to_use option is ignored by this implementation.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h"		/* import the system-dependent declarations */
-
-#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */
-extern void * malloc JPP((size_t size));
-extern void free JPP((void *ptr));
-#endif
-
-
-/*
- * Memory allocation and freeing are controlled by the regular library
- * routines malloc() and free().
- */
-
-GLOBAL(void *)
-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void *) malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
-{
-  free(object);
-}
-
-
-/*
- * "Large" objects are treated the same as "small" ones.
- * NB: although we include FAR keywords in the routine declarations,
- * this file won't actually work in 80x86 small/medium model; at least,
- * you probably won't be able to process useful-size images in only 64KB.
- */
-
-GLOBAL(void FAR *)
-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void FAR *) malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
-{
-  free(object);
-}
-
-
-/*
- * This routine computes the total memory space available for allocation.
- * Here we always say, "we got all you want bud!"
- */
-
-GLOBAL(long)
-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
-		    long max_bytes_needed, long already_allocated)
-{
-  return max_bytes_needed;
-}
-
-
-/*
- * Backing store (temporary file) management.
- * Since jpeg_mem_available always promised the moon,
- * this should never be called and we can just error out.
- */
-
-GLOBAL(void)
-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-			 long total_bytes_needed)
-{
-  ERREXIT(cinfo, JERR_NO_BACKING_STORE);
-}
-
-
-/*
- * These routines take care of any system-dependent initialization and
- * cleanup required.  Here, there isn't any.
- */
-
-GLOBAL(long)
-jpeg_mem_init (j_common_ptr cinfo)
-{
-  return 0;			/* just set max_memory_to_use to 0 */
-}
-
-GLOBAL(void)
-jpeg_mem_term (j_common_ptr cinfo)
-{
-  /* no work */
-}
+/*
+ * jmemnobs.c
+ *
+ * Copyright (C) 1992-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides a really simple implementation of the system-
+ * dependent portion of the JPEG memory manager.  This implementation
+ * assumes that no backing-store files are needed: all required space
+ * can be obtained from malloc().
+ * This is very portable in the sense that it'll compile on almost anything,
+ * but you'd better have lots of main memory (or virtual memory) if you want
+ * to process big images.
+ * Note that the max_memory_to_use option is ignored by this implementation.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+#include "jmemsys.h"		/* import the system-dependent declarations */
+
+#ifndef HAVE_STDLIB_H		/* <stdlib.h> should declare malloc(),free() */
+extern void * malloc JPP((size_t size));
+extern void free JPP((void *ptr));
+#endif
+
+
+/*
+ * Memory allocation and freeing are controlled by the regular library
+ * routines malloc() and free().
+ */
+
+GLOBAL(void *)
+jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * "Large" objects are treated the same as "small" ones.
+ * NB: although we include FAR keywords in the routine declarations,
+ * this file won't actually work in 80x86 small/medium model; at least,
+ * you probably won't be able to process useful-size images in only 64KB.
+ */
+
+GLOBAL(void FAR *)
+jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
+{
+  return (void FAR *) malloc(sizeofobject);
+}
+
+GLOBAL(void)
+jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
+{
+  free(object);
+}
+
+
+/*
+ * This routine computes the total memory space available for allocation.
+ * Here we always say, "we got all you want bud!"
+ */
+
+GLOBAL(long)
+jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
+		    long max_bytes_needed, long already_allocated)
+{
+  return max_bytes_needed;
+}
+
+
+/*
+ * Backing store (temporary file) management.
+ * Since jpeg_mem_available always promised the moon,
+ * this should never be called and we can just error out.
+ */
+
+GLOBAL(void)
+jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
+			 long total_bytes_needed)
+{
+  ERREXIT(cinfo, JERR_NO_BACKING_STORE);
+}
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.  Here, there isn't any.
+ */
+
+GLOBAL(long)
+jpeg_mem_init (j_common_ptr cinfo)
+{
+  return 0;			/* just set max_memory_to_use to 0 */
+}
+
+GLOBAL(void)
+jpeg_mem_term (j_common_ptr cinfo)
+{
+  /* no work */
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jmemsys.h b/Source/3rd Party/wx/src/jpeg/jmemsys.h
index 2a8796119..6c3c6d348 100644
--- a/Source/3rd Party/wx/src/jpeg/jmemsys.h	
+++ b/Source/3rd Party/wx/src/jpeg/jmemsys.h	
@@ -1,198 +1,198 @@
-/*
- * jmemsys.h
- *
- * Copyright (C) 1992-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This include file defines the interface between the system-independent
- * and system-dependent portions of the JPEG memory manager.  No other
- * modules need include it.  (The system-independent portion is jmemmgr.c;
- * there are several different versions of the system-dependent portion.)
- *
- * This file works as-is for the system-dependent memory managers supplied
- * in the IJG distribution.  You may need to modify it if you write a
- * custom memory manager.  If system-dependent changes are needed in
- * this file, the best method is to #ifdef them based on a configuration
- * symbol supplied in jconfig.h, as we have done with USE_MSDOS_MEMMGR
- * and USE_MAC_MEMMGR.
- */
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_get_small		jGetSmall
-#define jpeg_free_small		jFreeSmall
-#define jpeg_get_large		jGetLarge
-#define jpeg_free_large		jFreeLarge
-#define jpeg_mem_available	jMemAvail
-#define jpeg_open_backing_store	jOpenBackStore
-#define jpeg_mem_init		jMemInit
-#define jpeg_mem_term		jMemTerm
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/*
- * These two functions are used to allocate and release small chunks of
- * memory.  (Typically the total amount requested through jpeg_get_small is
- * no more than 20K or so; this will be requested in chunks of a few K each.)
- * Behavior should be the same as for the standard library functions malloc
- * and free; in particular, jpeg_get_small must return NULL on failure.
- * On most systems, these ARE malloc and free.  jpeg_free_small is passed the
- * size of the object being freed, just in case it's needed.
- * On an 80x86 machine using small-data memory model, these manage near heap.
- */
-
-EXTERN(void *) jpeg_get_small JPP((j_common_ptr cinfo, size_t sizeofobject));
-EXTERN(void) jpeg_free_small JPP((j_common_ptr cinfo, void * object,
-				  size_t sizeofobject));
-
-/*
- * These two functions are used to allocate and release large chunks of
- * memory (up to the total free space designated by jpeg_mem_available).
- * The interface is the same as above, except that on an 80x86 machine,
- * far pointers are used.  On most other machines these are identical to
- * the jpeg_get/free_small routines; but we keep them separate anyway,
- * in case a different allocation strategy is desirable for large chunks.
- */
-
-EXTERN(void FAR *) jpeg_get_large JPP((j_common_ptr cinfo,
-				       size_t sizeofobject));
-EXTERN(void) jpeg_free_large JPP((j_common_ptr cinfo, void FAR * object,
-				  size_t sizeofobject));
-
-/*
- * The macro MAX_ALLOC_CHUNK designates the maximum number of bytes that may
- * be requested in a single call to jpeg_get_large (and jpeg_get_small for that
- * matter, but that case should never come into play).  This macro is needed
- * to model the 64Kb-segment-size limit of far addressing on 80x86 machines.
- * On those machines, we expect that jconfig.h will provide a proper value.
- * On machines with 32-bit flat address spaces, any large constant may be used.
- *
- * NB: jmemmgr.c expects that MAX_ALLOC_CHUNK will be representable as type
- * size_t and will be a multiple of sizeof(align_type).
- */
-
-#ifndef MAX_ALLOC_CHUNK		/* may be overridden in jconfig.h */
-#define MAX_ALLOC_CHUNK  1000000000L
-#endif
-
-/*
- * This routine computes the total space still available for allocation by
- * jpeg_get_large.  If more space than this is needed, backing store will be
- * used.  NOTE: any memory already allocated must not be counted.
- *
- * There is a minimum space requirement, corresponding to the minimum
- * feasible buffer sizes; jmemmgr.c will request that much space even if
- * jpeg_mem_available returns zero.  The maximum space needed, enough to hold
- * all working storage in memory, is also passed in case it is useful.
- * Finally, the total space already allocated is passed.  If no better
- * method is available, cinfo->mem->max_memory_to_use - already_allocated
- * is often a suitable calculation.
- *
- * It is OK for jpeg_mem_available to underestimate the space available
- * (that'll just lead to more backing-store access than is really necessary).
- * However, an overestimate will lead to failure.  Hence it's wise to subtract
- * a slop factor from the true available space.  5% should be enough.
- *
- * On machines with lots of virtual memory, any large constant may be returned.
- * Conversely, zero may be returned to always use the minimum amount of memory.
- */
-
-EXTERN(long) jpeg_mem_available JPP((j_common_ptr cinfo,
-				     long min_bytes_needed,
-				     long max_bytes_needed,
-				     long already_allocated));
-
-
-/*
- * This structure holds whatever state is needed to access a single
- * backing-store object.  The read/write/close method pointers are called
- * by jmemmgr.c to manipulate the backing-store object; all other fields
- * are private to the system-dependent backing store routines.
- */
-
-#define TEMP_NAME_LENGTH   64	/* max length of a temporary file's name */
-
-
-#ifdef USE_MSDOS_MEMMGR		/* DOS-specific junk */
-
-typedef unsigned short XMSH;	/* type of extended-memory handles */
-typedef unsigned short EMSH;	/* type of expanded-memory handles */
-
-typedef union {
-  short file_handle;		/* DOS file handle if it's a temp file */
-  XMSH xms_handle;		/* handle if it's a chunk of XMS */
-  EMSH ems_handle;		/* handle if it's a chunk of EMS */
-} handle_union;
-
-#endif /* USE_MSDOS_MEMMGR */
-
-#ifdef USE_MAC_MEMMGR		/* Mac-specific junk */
-#include <Files.h>
-#endif /* USE_MAC_MEMMGR */
-
-
-typedef struct backing_store_struct * backing_store_ptr;
-
-typedef struct backing_store_struct {
-  /* Methods for reading/writing/closing this backing-store object */
-  JMETHOD(void, read_backing_store, (j_common_ptr cinfo,
-				     backing_store_ptr info,
-				     void FAR * buffer_address,
-				     long file_offset, long byte_count));
-  JMETHOD(void, write_backing_store, (j_common_ptr cinfo,
-				      backing_store_ptr info,
-				      void FAR * buffer_address,
-				      long file_offset, long byte_count));
-  JMETHOD(void, close_backing_store, (j_common_ptr cinfo,
-				      backing_store_ptr info));
-
-  /* Private fields for system-dependent backing-store management */
-#ifdef USE_MSDOS_MEMMGR
-  /* For the MS-DOS manager (jmemdos.c), we need: */
-  handle_union handle;		/* reference to backing-store storage object */
-  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */
-#else
-#ifdef USE_MAC_MEMMGR
-  /* For the Mac manager (jmemmac.c), we need: */
-  short temp_file;		/* file reference number to temp file */
-  FSSpec tempSpec;		/* the FSSpec for the temp file */
-  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */
-#else
-  /* For a typical implementation with temp files, we need: */
-  FILE * temp_file;		/* stdio reference to temp file */
-  char temp_name[TEMP_NAME_LENGTH]; /* name of temp file */
-#endif
-#endif
-} backing_store_info;
-
-
-/*
- * Initial opening of a backing-store object.  This must fill in the
- * read/write/close pointers in the object.  The read/write routines
- * may take an error exit if the specified maximum file size is exceeded.
- * (If jpeg_mem_available always returns a large value, this routine can
- * just take an error exit.)
- */
-
-EXTERN(void) jpeg_open_backing_store JPP((j_common_ptr cinfo,
-					  backing_store_ptr info,
-					  long total_bytes_needed));
-
-
-/*
- * These routines take care of any system-dependent initialization and
- * cleanup required.  jpeg_mem_init will be called before anything is
- * allocated (and, therefore, nothing in cinfo is of use except the error
- * manager pointer).  It should return a suitable default value for
- * max_memory_to_use; this may subsequently be overridden by the surrounding
- * application.  (Note that max_memory_to_use is only important if
- * jpeg_mem_available chooses to consult it ... no one else will.)
- * jpeg_mem_term may assume that all requested memory has been freed and that
- * all opened backing-store objects have been closed.
- */
-
-EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo));
-EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo));
+/*
+ * jmemsys.h
+ *
+ * Copyright (C) 1992-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This include file defines the interface between the system-independent
+ * and system-dependent portions of the JPEG memory manager.  No other
+ * modules need include it.  (The system-independent portion is jmemmgr.c;
+ * there are several different versions of the system-dependent portion.)
+ *
+ * This file works as-is for the system-dependent memory managers supplied
+ * in the IJG distribution.  You may need to modify it if you write a
+ * custom memory manager.  If system-dependent changes are needed in
+ * this file, the best method is to #ifdef them based on a configuration
+ * symbol supplied in jconfig.h, as we have done with USE_MSDOS_MEMMGR
+ * and USE_MAC_MEMMGR.
+ */
+
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_get_small		jGetSmall
+#define jpeg_free_small		jFreeSmall
+#define jpeg_get_large		jGetLarge
+#define jpeg_free_large		jFreeLarge
+#define jpeg_mem_available	jMemAvail
+#define jpeg_open_backing_store	jOpenBackStore
+#define jpeg_mem_init		jMemInit
+#define jpeg_mem_term		jMemTerm
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/*
+ * These two functions are used to allocate and release small chunks of
+ * memory.  (Typically the total amount requested through jpeg_get_small is
+ * no more than 20K or so; this will be requested in chunks of a few K each.)
+ * Behavior should be the same as for the standard library functions malloc
+ * and free; in particular, jpeg_get_small must return NULL on failure.
+ * On most systems, these ARE malloc and free.  jpeg_free_small is passed the
+ * size of the object being freed, just in case it's needed.
+ * On an 80x86 machine using small-data memory model, these manage near heap.
+ */
+
+EXTERN(void *) jpeg_get_small JPP((j_common_ptr cinfo, size_t sizeofobject));
+EXTERN(void) jpeg_free_small JPP((j_common_ptr cinfo, void * object,
+				  size_t sizeofobject));
+
+/*
+ * These two functions are used to allocate and release large chunks of
+ * memory (up to the total free space designated by jpeg_mem_available).
+ * The interface is the same as above, except that on an 80x86 machine,
+ * far pointers are used.  On most other machines these are identical to
+ * the jpeg_get/free_small routines; but we keep them separate anyway,
+ * in case a different allocation strategy is desirable for large chunks.
+ */
+
+EXTERN(void FAR *) jpeg_get_large JPP((j_common_ptr cinfo,
+				       size_t sizeofobject));
+EXTERN(void) jpeg_free_large JPP((j_common_ptr cinfo, void FAR * object,
+				  size_t sizeofobject));
+
+/*
+ * The macro MAX_ALLOC_CHUNK designates the maximum number of bytes that may
+ * be requested in a single call to jpeg_get_large (and jpeg_get_small for that
+ * matter, but that case should never come into play).  This macro is needed
+ * to model the 64Kb-segment-size limit of far addressing on 80x86 machines.
+ * On those machines, we expect that jconfig.h will provide a proper value.
+ * On machines with 32-bit flat address spaces, any large constant may be used.
+ *
+ * NB: jmemmgr.c expects that MAX_ALLOC_CHUNK will be representable as type
+ * size_t and will be a multiple of sizeof(align_type).
+ */
+
+#ifndef MAX_ALLOC_CHUNK		/* may be overridden in jconfig.h */
+#define MAX_ALLOC_CHUNK  1000000000L
+#endif
+
+/*
+ * This routine computes the total space still available for allocation by
+ * jpeg_get_large.  If more space than this is needed, backing store will be
+ * used.  NOTE: any memory already allocated must not be counted.
+ *
+ * There is a minimum space requirement, corresponding to the minimum
+ * feasible buffer sizes; jmemmgr.c will request that much space even if
+ * jpeg_mem_available returns zero.  The maximum space needed, enough to hold
+ * all working storage in memory, is also passed in case it is useful.
+ * Finally, the total space already allocated is passed.  If no better
+ * method is available, cinfo->mem->max_memory_to_use - already_allocated
+ * is often a suitable calculation.
+ *
+ * It is OK for jpeg_mem_available to underestimate the space available
+ * (that'll just lead to more backing-store access than is really necessary).
+ * However, an overestimate will lead to failure.  Hence it's wise to subtract
+ * a slop factor from the true available space.  5% should be enough.
+ *
+ * On machines with lots of virtual memory, any large constant may be returned.
+ * Conversely, zero may be returned to always use the minimum amount of memory.
+ */
+
+EXTERN(long) jpeg_mem_available JPP((j_common_ptr cinfo,
+				     long min_bytes_needed,
+				     long max_bytes_needed,
+				     long already_allocated));
+
+
+/*
+ * This structure holds whatever state is needed to access a single
+ * backing-store object.  The read/write/close method pointers are called
+ * by jmemmgr.c to manipulate the backing-store object; all other fields
+ * are private to the system-dependent backing store routines.
+ */
+
+#define TEMP_NAME_LENGTH   64	/* max length of a temporary file's name */
+
+
+#ifdef USE_MSDOS_MEMMGR		/* DOS-specific junk */
+
+typedef unsigned short XMSH;	/* type of extended-memory handles */
+typedef unsigned short EMSH;	/* type of expanded-memory handles */
+
+typedef union {
+  short file_handle;		/* DOS file handle if it's a temp file */
+  XMSH xms_handle;		/* handle if it's a chunk of XMS */
+  EMSH ems_handle;		/* handle if it's a chunk of EMS */
+} handle_union;
+
+#endif /* USE_MSDOS_MEMMGR */
+
+#ifdef USE_MAC_MEMMGR		/* Mac-specific junk */
+#include <Files.h>
+#endif /* USE_MAC_MEMMGR */
+
+
+typedef struct backing_store_struct * backing_store_ptr;
+
+typedef struct backing_store_struct {
+  /* Methods for reading/writing/closing this backing-store object */
+  JMETHOD(void, read_backing_store, (j_common_ptr cinfo,
+				     backing_store_ptr info,
+				     void FAR * buffer_address,
+				     long file_offset, long byte_count));
+  JMETHOD(void, write_backing_store, (j_common_ptr cinfo,
+				      backing_store_ptr info,
+				      void FAR * buffer_address,
+				      long file_offset, long byte_count));
+  JMETHOD(void, close_backing_store, (j_common_ptr cinfo,
+				      backing_store_ptr info));
+
+  /* Private fields for system-dependent backing-store management */
+#ifdef USE_MSDOS_MEMMGR
+  /* For the MS-DOS manager (jmemdos.c), we need: */
+  handle_union handle;		/* reference to backing-store storage object */
+  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */
+#else
+#ifdef USE_MAC_MEMMGR
+  /* For the Mac manager (jmemmac.c), we need: */
+  short temp_file;		/* file reference number to temp file */
+  FSSpec tempSpec;		/* the FSSpec for the temp file */
+  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */
+#else
+  /* For a typical implementation with temp files, we need: */
+  FILE * temp_file;		/* stdio reference to temp file */
+  char temp_name[TEMP_NAME_LENGTH]; /* name of temp file */
+#endif
+#endif
+} backing_store_info;
+
+
+/*
+ * Initial opening of a backing-store object.  This must fill in the
+ * read/write/close pointers in the object.  The read/write routines
+ * may take an error exit if the specified maximum file size is exceeded.
+ * (If jpeg_mem_available always returns a large value, this routine can
+ * just take an error exit.)
+ */
+
+EXTERN(void) jpeg_open_backing_store JPP((j_common_ptr cinfo,
+					  backing_store_ptr info,
+					  long total_bytes_needed));
+
+
+/*
+ * These routines take care of any system-dependent initialization and
+ * cleanup required.  jpeg_mem_init will be called before anything is
+ * allocated (and, therefore, nothing in cinfo is of use except the error
+ * manager pointer).  It should return a suitable default value for
+ * max_memory_to_use; this may subsequently be overridden by the surrounding
+ * application.  (Note that max_memory_to_use is only important if
+ * jpeg_mem_available chooses to consult it ... no one else will.)
+ * jpeg_mem_term may assume that all requested memory has been freed and that
+ * all opened backing-store objects have been closed.
+ */
+
+EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo));
+EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo));
diff --git a/Source/3rd Party/wx/src/jpeg/jmorecfg.h b/Source/3rd Party/wx/src/jpeg/jmorecfg.h
index 688fddbeb..c4a5d33b0 100644
--- a/Source/3rd Party/wx/src/jpeg/jmorecfg.h	
+++ b/Source/3rd Party/wx/src/jpeg/jmorecfg.h	
@@ -1,420 +1,420 @@
-/*
- * jmorecfg.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains additional configuration options that customize the
- * JPEG software for special applications or support machine-dependent
- * optimizations.  Most users will not need to touch this file.
- */
-
-
-/*
- * Define BITS_IN_JSAMPLE as either
- *   8   for 8-bit sample values (the usual setting)
- *   12  for 12-bit sample values
- * Only 8 and 12 are legal data precisions for lossy JPEG according to the
- * JPEG standard, and the IJG code does not support anything else!
- * We do not support run-time selection of data precision, sorry.
- */
-
-#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
-
-
-/*
- * Maximum number of components (color channels) allowed in JPEG image.
- * To meet the letter of the JPEG spec, set this to 255.  However, darn
- * few applications need more than 4 channels (maybe 5 for CMYK + alpha
- * mask).  We recommend 10 as a reasonable compromise; use 4 if you are
- * really short on memory.  (Each allowed component costs a hundred or so
- * bytes of storage, whether actually used in an image or not.)
- */
-
-#define MAX_COMPONENTS  10	/* maximum number of image components */
-
-
-/*
- * Basic data types.
- * You may need to change these if you have a machine with unusual data
- * type sizes; for example, "char" not 8 bits, "short" not 16 bits,
- * or "long" not 32 bits.  We don't care whether "int" is 16 or 32 bits,
- * but it had better be at least 16.
- */
-
-/* Representation of a single sample (pixel element value).
- * We frequently allocate large arrays of these, so it's important to keep
- * them small.  But if you have memory to burn and access to char or short
- * arrays is very slow on your hardware, you might want to change these.
- */
-
-#if BITS_IN_JSAMPLE == 8
-/* JSAMPLE should be the smallest type that will hold the values 0..255.
- * You can use a signed char by having GETJSAMPLE mask it with 0xFF.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JSAMPLE;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJSAMPLE(value)  ((int) (value))
-#else
-#define GETJSAMPLE(value)  ((int) (value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-#define MAXJSAMPLE	255
-#define CENTERJSAMPLE	128
-
-#endif /* BITS_IN_JSAMPLE == 8 */
-
-
-#if BITS_IN_JSAMPLE == 12
-/* JSAMPLE should be the smallest type that will hold the values 0..4095.
- * On nearly all machines "short" will do nicely.
- */
-
-typedef short JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#define MAXJSAMPLE	4095
-#define CENTERJSAMPLE	2048
-
-#endif /* BITS_IN_JSAMPLE == 12 */
-
-
-/* Representation of a DCT frequency coefficient.
- * This should be a signed value of at least 16 bits; "short" is usually OK.
- * Again, we allocate large arrays of these, but you can change to int
- * if you have memory to burn and "short" is really slow.
- */
-
-typedef short JCOEF;
-
-
-/* Compressed datastreams are represented as arrays of JOCTET.
- * These must be EXACTLY 8 bits wide, at least once they are written to
- * external storage.  Note that when using the stdio data source/destination
- * managers, this is also the data type passed to fread/fwrite.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JOCTET;
-#define GETJOCTET(value)  (value)
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JOCTET;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJOCTET(value)  (value)
-#else
-#define GETJOCTET(value)  ((value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-
-/* These typedefs are used for various table entries and so forth.
- * They must be at least as wide as specified; but making them too big
- * won't cost a huge amount of memory, so we don't provide special
- * extraction code like we did for JSAMPLE.  (In other words, these
- * typedefs live at a different point on the speed/space tradeoff curve.)
- */
-
-/* UINT8 must hold at least the values 0..255. */
-#ifndef __WINE_BASETSD_H
-
-#ifdef HAVE_UNSIGNED_CHAR
-typedef unsigned char UINT8;
-#else /* not HAVE_UNSIGNED_CHAR */
-#ifdef CHAR_IS_UNSIGNED
-typedef char UINT8;
-#else /* not CHAR_IS_UNSIGNED */
-typedef short UINT8;
-#endif /* CHAR_IS_UNSIGNED */
-#endif /* HAVE_UNSIGNED_CHAR */
-
-/* UINT16 must hold at least the values 0..65535. */
-
-#ifdef HAVE_UNSIGNED_SHORT
-typedef unsigned short UINT16;
-#else /* not HAVE_UNSIGNED_SHORT */
-typedef unsigned int UINT16;
-#endif /* HAVE_UNSIGNED_SHORT */
-
-/* INT16 must hold at least the values -32768..32767. */
-
-#ifndef XMD_H			/* X11/xmd.h correctly defines INT16 */
-typedef short INT16;
-#endif
-
-#endif /* __WINE_BASETSD_H */
-
-/* INT32 must hold at least signed 32-bit values. */
-
-/*
-    VZ: due to the horrible mess resulting in INT32 being defined in windows.h
-        for some compilers but not for the other ones, I have globally replace
-        INT32 with JPEG_INT32 in libjpeg code to avoid the eight level ifdef
-        which used to be here. The problem is that, of course, now we'll have
-        conflicts when upgrading to the next libjpeg release -- however
-        considering their frequency (1 in the last 5 years) it seems that
-        it is not too high a price to pay for the clean compilation with all
-        versions of mingw32 and cygwin
- */
-typedef long JPEG_INT32;
-
-/* Datatype used for image dimensions.  The JPEG standard only supports
- * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
- * "unsigned int" is sufficient on all machines.  However, if you need to
- * handle larger images and you don't mind deviating from the spec, you
- * can change this datatype.
- */
-
-typedef unsigned int JDIMENSION;
-
-#define JPEG_MAX_DIMENSION  65500L  /* a tad under 64K to prevent overflows */
-
-
-/* These macros are used in all function definitions and extern declarations.
- * You could modify them if you need to change function linkage conventions;
- * in particular, you'll need to do that to make the library a Windows DLL.
- * Another application is to make all functions global for use with debuggers
- * or code profilers that require it.
- */
-
-#if defined(__VISAGECPP__)
-#define JPEG_CALLING_CONV _Optlink
-#else /* !Visual Age C++ */
-#define JPEG_CALLING_CONV
-#endif
-
-/* We can't declare a static function as extern "C" as we need to do in C++
- * programs, so suppress static in METHODDEF when using C++.
- */
-#if defined(__cplusplus)
-#define JPEG_METHOD_LINKAGE
-#else /* !__cplusplus */
-#define JPEG_METHOD_LINKAGE static
-#endif
-
-/* a function called through method pointers: */
-#define METHODDEF(type)		JPEG_METHOD_LINKAGE type JPEG_CALLING_CONV
-/* a function used only in its module: */
-#define LOCAL(type)		static type JPEG_CALLING_CONV
-/* a function referenced thru EXTERNs: */
-#define GLOBAL(type)		type
-/* a reference to a GLOBAL function: */
-#define EXTERN(type)		extern type JPEG_CALLING_CONV
-
-/* This macro is used to declare a "method", that is, a function pointer.
- * We want to supply prototype parameters if the compiler can cope.
- * Note that the arglist parameter must be parenthesized!
- * Again, you can customize this if you need special linkage keywords.
- */
-
-#if defined(__VISAGECPP__) /* need this for /common/imagjpeg.obj but not loclly */
-#ifdef HAVE_PROTOTYPES
-#define JMETHOD(type,methodname,arglist)  type (_Optlink *methodname) arglist
-#else
-#define JMETHOD(type,methodname,arglist)  type (_Optlink *methodname) ()
-#endif
-
-#else
-
-#ifdef HAVE_PROTOTYPES
-#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
-#else
-#define JMETHOD(type,methodname,arglist)  type (*methodname) ()
-#endif
-
-#endif
-
-/* Here is the pseudo-keyword for declaring pointers that must be "far"
- * on 80x86 machines.  Most of the specialized coding for 80x86 is handled
- * by just saying "FAR *" where such a pointer is needed.  In a few places
- * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
- */
-
-#ifdef NEED_FAR_POINTERS
-#define FAR  far
-#else
-#ifndef FAR
-#define FAR
-#endif
-#endif
-
-
-/*
- * On a few systems, type boolean and/or its values FALSE, TRUE may appear
- * in standard header files.  Or you may have conflicts with application-
- * specific header files that you want to include together with these files.
- * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
- */
-
-#if 0
-#ifndef HAVE_BOOLEAN
-typedef int boolean;
-#endif
-#endif
-
-/*
- * Notes about boolean above:
- *
- * The main conflict we see is with the Windows headers of some compilers that
- * have a different definition of boolean. Therefore boolean has been replaced
- * with wxjpeg_boolean throughout the jpeg sources. The alternative would have
- * been to make the definition here the same as the Windows definition. It's
- * not enough to just define HAVE_BOOLEAN when using the jpeg library, the
- * definition of boolean must match when the jpeg library is compiled too.
- *
- * System jepg libs won't have this type, of course, so to use test
- * HAVE_WXJPEG_BOOLEAN and fall back to boolean when not defined.
- */
-
-typedef int wxjpeg_boolean;
-#define HAVE_WXJPEG_BOOLEAN
-
-#ifndef FALSE			/* in case these macros already exist */
-#define FALSE	0		/* values of boolean */
-#endif
-#ifndef TRUE
-#define TRUE	1
-#endif
-
-
-/*
- * The remaining options affect code selection within the JPEG library,
- * but they don't need to be visible to most applications using the library.
- * To minimize application namespace pollution, the symbols won't be
- * defined unless JPEG_INTERNALS or JPEG_INTERNAL_OPTIONS has been defined.
- */
-
-#ifdef JPEG_INTERNALS
-#define JPEG_INTERNAL_OPTIONS
-#endif
-
-#ifdef JPEG_INTERNAL_OPTIONS
-
-
-/*
- * These defines indicate whether to include various optional functions.
- * Undefining some of these symbols will produce a smaller but less capable
- * library.  Note that you can leave certain source files out of the
- * compilation/linking process if you've #undef'd the corresponding symbols.
- * (You may HAVE to do that if your compiler doesn't like null source files.)
- */
-
-/* Arithmetic coding is unsupported for legal reasons.  Complaints to IBM. */
-
-/* Capability options common to encoder and decoder: */
-
-#define DCT_ISLOW_SUPPORTED	/* slow but accurate integer algorithm */
-#define DCT_IFAST_SUPPORTED	/* faster, less accurate integer method */
-#define DCT_FLOAT_SUPPORTED	/* floating-point: accurate, fast on fast HW */
-
-/* Encoder capability options: */
-
-#undef  C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define ENTROPY_OPT_SUPPORTED	    /* Optimization of entropy coding parms? */
-/* Note: if you selected 12-bit data precision, it is dangerous to turn off
- * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
- * precision, so jchuff.c normally uses entropy optimization to compute
- * usable tables for higher precision.  If you don't want to do optimization,
- * you'll have to supply different default Huffman tables.
- * The exact same statements apply for progressive JPEG: the default tables
- * don't work for progressive mode.  (This may get fixed, however.)
- */
-#define INPUT_SMOOTHING_SUPPORTED   /* Input image smoothing option? */
-
-/* Decoder capability options: */
-
-#undef  D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define SAVE_MARKERS_SUPPORTED	    /* jpeg_save_markers() needed? */
-#define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
-#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */
-#undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */
-#define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */
-#define QUANT_1PASS_SUPPORTED	    /* 1-pass color quantization? */
-#define QUANT_2PASS_SUPPORTED	    /* 2-pass color quantization? */
-
-/* more capability options later, no doubt */
-
-
-/*
- * Ordering of RGB data in scanlines passed to or from the application.
- * If your application wants to deal with data in the order B,G,R, just
- * change these macros.  You can also deal with formats such as R,G,B,X
- * (one extra byte per pixel) by changing RGB_PIXELSIZE.  Note that changing
- * the offsets will also change the order in which colormap data is organized.
- * RESTRICTIONS:
- * 1. The sample applications cjpeg,djpeg do NOT support modified RGB formats.
- * 2. These macros only affect RGB<=>YCbCr color conversion, so they are not
- *    useful if you are using JPEG color spaces other than YCbCr or grayscale.
- * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE
- *    is not 3 (they don't understand about dummy color components!).  So you
- *    can't use color quantization if you change that value.
- */
-
-#define RGB_RED		0	/* Offset of Red in an RGB scanline element */
-#define RGB_GREEN	1	/* Offset of Green */
-#define RGB_BLUE	2	/* Offset of Blue */
-#define RGB_PIXELSIZE	3	/* JSAMPLEs per RGB scanline element */
-
-
-/* Definitions for speed-related optimizations. */
-
-
-/* If your compiler supports inline functions, define INLINE
- * as the inline keyword; otherwise define it as empty.
- */
-
-#ifndef INLINE
-#ifdef __GNUC__			/* for instance, GNU C knows about inline */
-#define INLINE __inline__
-#endif
-#ifndef INLINE
-#define INLINE			/* default is to define it as empty */
-#endif
-#endif
-
-
-/* On some machines (notably 68000 series) "int" is 32 bits, but multiplying
- * two 16-bit shorts is faster than multiplying two ints.  Define MULTIPLIER
- * as short on such a machine.  MULTIPLIER must be at least 16 bits wide.
- */
-
-#ifndef MULTIPLIER
-#define MULTIPLIER  int		/* type for fastest integer multiply */
-#endif
-
-
-/* FAST_FLOAT should be either float or double, whichever is done faster
- * by your compiler.  (Note that this type is only used in the floating point
- * DCT routines, so it only matters if you've defined DCT_FLOAT_SUPPORTED.)
- * Typically, float is faster in ANSI C compilers, while double is faster in
- * pre-ANSI compilers (because they insist on converting to double anyway).
- * The code below therefore chooses float if we have ANSI-style prototypes.
- */
-
-#ifndef FAST_FLOAT
-#ifdef HAVE_PROTOTYPES
-#define FAST_FLOAT  float
-#else
-#define FAST_FLOAT  double
-#endif
-#endif
-
-#endif /* JPEG_INTERNAL_OPTIONS */
+/*
+ * jmorecfg.h
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains additional configuration options that customize the
+ * JPEG software for special applications or support machine-dependent
+ * optimizations.  Most users will not need to touch this file.
+ */
+
+
+/*
+ * Define BITS_IN_JSAMPLE as either
+ *   8   for 8-bit sample values (the usual setting)
+ *   12  for 12-bit sample values
+ * Only 8 and 12 are legal data precisions for lossy JPEG according to the
+ * JPEG standard, and the IJG code does not support anything else!
+ * We do not support run-time selection of data precision, sorry.
+ */
+
+#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
+
+
+/*
+ * Maximum number of components (color channels) allowed in JPEG image.
+ * To meet the letter of the JPEG spec, set this to 255.  However, darn
+ * few applications need more than 4 channels (maybe 5 for CMYK + alpha
+ * mask).  We recommend 10 as a reasonable compromise; use 4 if you are
+ * really short on memory.  (Each allowed component costs a hundred or so
+ * bytes of storage, whether actually used in an image or not.)
+ */
+
+#define MAX_COMPONENTS  10	/* maximum number of image components */
+
+
+/*
+ * Basic data types.
+ * You may need to change these if you have a machine with unusual data
+ * type sizes; for example, "char" not 8 bits, "short" not 16 bits,
+ * or "long" not 32 bits.  We don't care whether "int" is 16 or 32 bits,
+ * but it had better be at least 16.
+ */
+
+/* Representation of a single sample (pixel element value).
+ * We frequently allocate large arrays of these, so it's important to keep
+ * them small.  But if you have memory to burn and access to char or short
+ * arrays is very slow on your hardware, you might want to change these.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+/* JSAMPLE should be the smallest type that will hold the values 0..255.
+ * You can use a signed char by having GETJSAMPLE mask it with 0xFF.
+ */
+
+#ifdef HAVE_UNSIGNED_CHAR
+
+typedef unsigned char JSAMPLE;
+#define GETJSAMPLE(value)  ((int) (value))
+
+#else /* not HAVE_UNSIGNED_CHAR */
+
+typedef char JSAMPLE;
+#ifdef CHAR_IS_UNSIGNED
+#define GETJSAMPLE(value)  ((int) (value))
+#else
+#define GETJSAMPLE(value)  ((int) (value) & 0xFF)
+#endif /* CHAR_IS_UNSIGNED */
+
+#endif /* HAVE_UNSIGNED_CHAR */
+
+#define MAXJSAMPLE	255
+#define CENTERJSAMPLE	128
+
+#endif /* BITS_IN_JSAMPLE == 8 */
+
+
+#if BITS_IN_JSAMPLE == 12
+/* JSAMPLE should be the smallest type that will hold the values 0..4095.
+ * On nearly all machines "short" will do nicely.
+ */
+
+typedef short JSAMPLE;
+#define GETJSAMPLE(value)  ((int) (value))
+
+#define MAXJSAMPLE	4095
+#define CENTERJSAMPLE	2048
+
+#endif /* BITS_IN_JSAMPLE == 12 */
+
+
+/* Representation of a DCT frequency coefficient.
+ * This should be a signed value of at least 16 bits; "short" is usually OK.
+ * Again, we allocate large arrays of these, but you can change to int
+ * if you have memory to burn and "short" is really slow.
+ */
+
+typedef short JCOEF;
+
+
+/* Compressed datastreams are represented as arrays of JOCTET.
+ * These must be EXACTLY 8 bits wide, at least once they are written to
+ * external storage.  Note that when using the stdio data source/destination
+ * managers, this is also the data type passed to fread/fwrite.
+ */
+
+#ifdef HAVE_UNSIGNED_CHAR
+
+typedef unsigned char JOCTET;
+#define GETJOCTET(value)  (value)
+
+#else /* not HAVE_UNSIGNED_CHAR */
+
+typedef char JOCTET;
+#ifdef CHAR_IS_UNSIGNED
+#define GETJOCTET(value)  (value)
+#else
+#define GETJOCTET(value)  ((value) & 0xFF)
+#endif /* CHAR_IS_UNSIGNED */
+
+#endif /* HAVE_UNSIGNED_CHAR */
+
+
+/* These typedefs are used for various table entries and so forth.
+ * They must be at least as wide as specified; but making them too big
+ * won't cost a huge amount of memory, so we don't provide special
+ * extraction code like we did for JSAMPLE.  (In other words, these
+ * typedefs live at a different point on the speed/space tradeoff curve.)
+ */
+
+/* UINT8 must hold at least the values 0..255. */
+#ifndef __WINE_BASETSD_H
+
+#ifdef HAVE_UNSIGNED_CHAR
+typedef unsigned char UINT8;
+#else /* not HAVE_UNSIGNED_CHAR */
+#ifdef CHAR_IS_UNSIGNED
+typedef char UINT8;
+#else /* not CHAR_IS_UNSIGNED */
+typedef short UINT8;
+#endif /* CHAR_IS_UNSIGNED */
+#endif /* HAVE_UNSIGNED_CHAR */
+
+/* UINT16 must hold at least the values 0..65535. */
+
+#ifdef HAVE_UNSIGNED_SHORT
+typedef unsigned short UINT16;
+#else /* not HAVE_UNSIGNED_SHORT */
+typedef unsigned int UINT16;
+#endif /* HAVE_UNSIGNED_SHORT */
+
+/* INT16 must hold at least the values -32768..32767. */
+
+#ifndef XMD_H			/* X11/xmd.h correctly defines INT16 */
+typedef short INT16;
+#endif
+
+#endif /* __WINE_BASETSD_H */
+
+/* INT32 must hold at least signed 32-bit values. */
+
+/*
+    VZ: due to the horrible mess resulting in INT32 being defined in windows.h
+        for some compilers but not for the other ones, I have globally replace
+        INT32 with JPEG_INT32 in libjpeg code to avoid the eight level ifdef
+        which used to be here. The problem is that, of course, now we'll have
+        conflicts when upgrading to the next libjpeg release -- however
+        considering their frequency (1 in the last 5 years) it seems that
+        it is not too high a price to pay for the clean compilation with all
+        versions of mingw32 and cygwin
+ */
+typedef long JPEG_INT32;
+
+/* Datatype used for image dimensions.  The JPEG standard only supports
+ * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
+ * "unsigned int" is sufficient on all machines.  However, if you need to
+ * handle larger images and you don't mind deviating from the spec, you
+ * can change this datatype.
+ */
+
+typedef unsigned int JDIMENSION;
+
+#define JPEG_MAX_DIMENSION  65500L  /* a tad under 64K to prevent overflows */
+
+
+/* These macros are used in all function definitions and extern declarations.
+ * You could modify them if you need to change function linkage conventions;
+ * in particular, you'll need to do that to make the library a Windows DLL.
+ * Another application is to make all functions global for use with debuggers
+ * or code profilers that require it.
+ */
+
+#if defined(__VISAGECPP__)
+#define JPEG_CALLING_CONV _Optlink
+#else /* !Visual Age C++ */
+#define JPEG_CALLING_CONV
+#endif
+
+/* We can't declare a static function as extern "C" as we need to do in C++
+ * programs, so suppress static in METHODDEF when using C++.
+ */
+#if defined(__cplusplus)
+#define JPEG_METHOD_LINKAGE
+#else /* !__cplusplus */
+#define JPEG_METHOD_LINKAGE static
+#endif
+
+/* a function called through method pointers: */
+#define METHODDEF(type)		JPEG_METHOD_LINKAGE type JPEG_CALLING_CONV
+/* a function used only in its module: */
+#define LOCAL(type)		static type JPEG_CALLING_CONV
+/* a function referenced thru EXTERNs: */
+#define GLOBAL(type)		type
+/* a reference to a GLOBAL function: */
+#define EXTERN(type)		extern type JPEG_CALLING_CONV
+
+/* This macro is used to declare a "method", that is, a function pointer.
+ * We want to supply prototype parameters if the compiler can cope.
+ * Note that the arglist parameter must be parenthesized!
+ * Again, you can customize this if you need special linkage keywords.
+ */
+
+#if defined(__VISAGECPP__) /* need this for /common/imagjpeg.obj but not loclly */
+#ifdef HAVE_PROTOTYPES
+#define JMETHOD(type,methodname,arglist)  type (_Optlink *methodname) arglist
+#else
+#define JMETHOD(type,methodname,arglist)  type (_Optlink *methodname) ()
+#endif
+
+#else
+
+#ifdef HAVE_PROTOTYPES
+#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
+#else
+#define JMETHOD(type,methodname,arglist)  type (*methodname) ()
+#endif
+
+#endif
+
+/* Here is the pseudo-keyword for declaring pointers that must be "far"
+ * on 80x86 machines.  Most of the specialized coding for 80x86 is handled
+ * by just saying "FAR *" where such a pointer is needed.  In a few places
+ * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
+ */
+
+#ifdef NEED_FAR_POINTERS
+#define FAR  far
+#else
+#ifndef FAR
+#define FAR
+#endif
+#endif
+
+
+/*
+ * On a few systems, type boolean and/or its values FALSE, TRUE may appear
+ * in standard header files.  Or you may have conflicts with application-
+ * specific header files that you want to include together with these files.
+ * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
+ */
+
+#if 0
+#ifndef HAVE_BOOLEAN
+typedef int boolean;
+#endif
+#endif
+
+/*
+ * Notes about boolean above:
+ *
+ * The main conflict we see is with the Windows headers of some compilers that
+ * have a different definition of boolean. Therefore boolean has been replaced
+ * with wxjpeg_boolean throughout the jpeg sources. The alternative would have
+ * been to make the definition here the same as the Windows definition. It's
+ * not enough to just define HAVE_BOOLEAN when using the jpeg library, the
+ * definition of boolean must match when the jpeg library is compiled too.
+ *
+ * System jepg libs won't have this type, of course, so to use test
+ * HAVE_WXJPEG_BOOLEAN and fall back to boolean when not defined.
+ */
+
+typedef int wxjpeg_boolean;
+#define HAVE_WXJPEG_BOOLEAN
+
+#ifndef FALSE			/* in case these macros already exist */
+#define FALSE	0		/* values of boolean */
+#endif
+#ifndef TRUE
+#define TRUE	1
+#endif
+
+
+/*
+ * The remaining options affect code selection within the JPEG library,
+ * but they don't need to be visible to most applications using the library.
+ * To minimize application namespace pollution, the symbols won't be
+ * defined unless JPEG_INTERNALS or JPEG_INTERNAL_OPTIONS has been defined.
+ */
+
+#ifdef JPEG_INTERNALS
+#define JPEG_INTERNAL_OPTIONS
+#endif
+
+#ifdef JPEG_INTERNAL_OPTIONS
+
+
+/*
+ * These defines indicate whether to include various optional functions.
+ * Undefining some of these symbols will produce a smaller but less capable
+ * library.  Note that you can leave certain source files out of the
+ * compilation/linking process if you've #undef'd the corresponding symbols.
+ * (You may HAVE to do that if your compiler doesn't like null source files.)
+ */
+
+/* Arithmetic coding is unsupported for legal reasons.  Complaints to IBM. */
+
+/* Capability options common to encoder and decoder: */
+
+#define DCT_ISLOW_SUPPORTED	/* slow but accurate integer algorithm */
+#define DCT_IFAST_SUPPORTED	/* faster, less accurate integer method */
+#define DCT_FLOAT_SUPPORTED	/* floating-point: accurate, fast on fast HW */
+
+/* Encoder capability options: */
+
+#undef  C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
+#define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
+#define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
+#define ENTROPY_OPT_SUPPORTED	    /* Optimization of entropy coding parms? */
+/* Note: if you selected 12-bit data precision, it is dangerous to turn off
+ * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
+ * precision, so jchuff.c normally uses entropy optimization to compute
+ * usable tables for higher precision.  If you don't want to do optimization,
+ * you'll have to supply different default Huffman tables.
+ * The exact same statements apply for progressive JPEG: the default tables
+ * don't work for progressive mode.  (This may get fixed, however.)
+ */
+#define INPUT_SMOOTHING_SUPPORTED   /* Input image smoothing option? */
+
+/* Decoder capability options: */
+
+#undef  D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
+#define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
+#define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
+#define SAVE_MARKERS_SUPPORTED	    /* jpeg_save_markers() needed? */
+#define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
+#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */
+#undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */
+#define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */
+#define QUANT_1PASS_SUPPORTED	    /* 1-pass color quantization? */
+#define QUANT_2PASS_SUPPORTED	    /* 2-pass color quantization? */
+
+/* more capability options later, no doubt */
+
+
+/*
+ * Ordering of RGB data in scanlines passed to or from the application.
+ * If your application wants to deal with data in the order B,G,R, just
+ * change these macros.  You can also deal with formats such as R,G,B,X
+ * (one extra byte per pixel) by changing RGB_PIXELSIZE.  Note that changing
+ * the offsets will also change the order in which colormap data is organized.
+ * RESTRICTIONS:
+ * 1. The sample applications cjpeg,djpeg do NOT support modified RGB formats.
+ * 2. These macros only affect RGB<=>YCbCr color conversion, so they are not
+ *    useful if you are using JPEG color spaces other than YCbCr or grayscale.
+ * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE
+ *    is not 3 (they don't understand about dummy color components!).  So you
+ *    can't use color quantization if you change that value.
+ */
+
+#define RGB_RED		0	/* Offset of Red in an RGB scanline element */
+#define RGB_GREEN	1	/* Offset of Green */
+#define RGB_BLUE	2	/* Offset of Blue */
+#define RGB_PIXELSIZE	3	/* JSAMPLEs per RGB scanline element */
+
+
+/* Definitions for speed-related optimizations. */
+
+
+/* If your compiler supports inline functions, define INLINE
+ * as the inline keyword; otherwise define it as empty.
+ */
+
+#ifndef INLINE
+#ifdef __GNUC__			/* for instance, GNU C knows about inline */
+#define INLINE __inline__
+#endif
+#ifndef INLINE
+#define INLINE			/* default is to define it as empty */
+#endif
+#endif
+
+
+/* On some machines (notably 68000 series) "int" is 32 bits, but multiplying
+ * two 16-bit shorts is faster than multiplying two ints.  Define MULTIPLIER
+ * as short on such a machine.  MULTIPLIER must be at least 16 bits wide.
+ */
+
+#ifndef MULTIPLIER
+#define MULTIPLIER  int		/* type for fastest integer multiply */
+#endif
+
+
+/* FAST_FLOAT should be either float or double, whichever is done faster
+ * by your compiler.  (Note that this type is only used in the floating point
+ * DCT routines, so it only matters if you've defined DCT_FLOAT_SUPPORTED.)
+ * Typically, float is faster in ANSI C compilers, while double is faster in
+ * pre-ANSI compilers (because they insist on converting to double anyway).
+ * The code below therefore chooses float if we have ANSI-style prototypes.
+ */
+
+#ifndef FAST_FLOAT
+#ifdef HAVE_PROTOTYPES
+#define FAST_FLOAT  float
+#else
+#define FAST_FLOAT  double
+#endif
+#endif
+
+#endif /* JPEG_INTERNAL_OPTIONS */
diff --git a/Source/3rd Party/wx/src/jpeg/jpeg_CW_Prefix.h b/Source/3rd Party/wx/src/jpeg/jpeg_CW_Prefix.h
new file mode 100644
index 000000000..92afda8c1
--- /dev/null
+++ b/Source/3rd Party/wx/src/jpeg/jpeg_CW_Prefix.h	
@@ -0,0 +1,6 @@
+// Special configuration file for building jpeg under CodeWarrior
+
+
+//#define HAVE_BOOLEAN
+
+
diff --git a/Source/3rd Party/wx/src/jpeg/jpegint.h b/Source/3rd Party/wx/src/jpeg/jpegint.h
index 4431f88bf..7928ae3c5 100644
--- a/Source/3rd Party/wx/src/jpeg/jpegint.h	
+++ b/Source/3rd Party/wx/src/jpeg/jpegint.h	
@@ -1,400 +1,400 @@
-/*
- * jpegint.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides common declarations for the various JPEG modules.
- * These declarations are considered internal to the JPEG library; most
- * applications using the library shouldn't need to include this file.
- */
-
-
-/* Declarations for both compression & decompression */
-
-typedef enum {			/* Operating modes for buffer controllers */
-	JBUF_PASS_THRU,		/* Plain stripwise operation */
-	/* Remaining modes require a full-image buffer to have been created */
-	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */
-	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */
-	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */
-} J_BUF_MODE;
-
-/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
-#define CSTATE_START	100	/* after create_compress */
-#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */
-#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */
-#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */
-#define DSTATE_START	200	/* after create_decompress */
-#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */
-#define DSTATE_READY	202	/* found SOS, ready for start_decompress */
-#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/
-#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */
-#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */
-#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */
-#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */
-#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */
-#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */
-#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */
-
-
-/* Declarations for compression modules */
-
-/* Master control module */
-struct jpeg_comp_master {
-  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  wxjpeg_boolean call_pass_startup;	/* True if pass_startup must be called */
-  wxjpeg_boolean is_last_pass;		/* True during last pass */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_c_main_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_compress_ptr cinfo,
-			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			       JDIMENSION in_rows_avail));
-};
-
-/* Compression preprocessing (downsampling input buffer control) */
-struct jpeg_c_prep_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
-				   JSAMPARRAY input_buf,
-				   JDIMENSION *in_row_ctr,
-				   JDIMENSION in_rows_avail,
-				   JSAMPIMAGE output_buf,
-				   JDIMENSION *out_row_group_ctr,
-				   JDIMENSION out_row_groups_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_c_coef_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(wxjpeg_boolean, compress_data, (j_compress_ptr cinfo,
-				   JSAMPIMAGE input_buf));
-};
-
-/* Colorspace conversion */
-struct jpeg_color_converter {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
-				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-				JDIMENSION output_row, int num_rows));
-};
-
-/* Downsampling */
-struct jpeg_downsampler {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, downsample, (j_compress_ptr cinfo,
-			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
-			     JSAMPIMAGE output_buf,
-			     JDIMENSION out_row_group_index));
-
-  wxjpeg_boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Forward DCT (also controls coefficient quantization) */
-struct jpeg_forward_dct {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  /* perhaps this should be an array??? */
-  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
-			      jpeg_component_info * compptr,
-			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-			      JDIMENSION start_row, JDIMENSION start_col,
-			      JDIMENSION num_blocks));
-};
-
-/* Entropy encoding */
-struct jpeg_entropy_encoder {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, wxjpeg_boolean gather_statistics));
-  JMETHOD(wxjpeg_boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-};
-
-/* Marker writing */
-struct jpeg_marker_writer {
-  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-  /* These routines are exported to allow insertion of extra markers */
-  /* Probably only COM and APPn markers should be written this way */
-  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-				      unsigned int datalen));
-  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-};
-
-
-/* Declarations for decompression modules */
-
-/* Master control module */
-struct jpeg_decomp_master {
-  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  wxjpeg_boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-};
-
-/* Input control module */
-struct jpeg_input_controller {
-  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  wxjpeg_boolean has_multiple_scans;	/* True if file has multiple scans */
-  wxjpeg_boolean eoi_reached;		/* True when EOI has been consumed */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_d_main_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
-			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			       JDIMENSION out_rows_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_d_coef_controller {
-#if defined(__VISAGECPP__)
-  /* the start input pass in jdcoeft must have a different name than the
-  // one in jdtrans under VisualAge or else we get a dup symbol error
-  */
-  JMETHOD(void, start_input_pass2, (j_decompress_ptr cinfo));
-#else
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-#endif
-
-  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
-				 JSAMPIMAGE output_buf));
-  /* Pointer to array of coefficient virtual arrays, or NULL if none */
-  jvirt_barray_ptr *coef_arrays;
-};
-
-/* Decompression postprocessing (color quantization buffer control) */
-struct jpeg_d_post_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
-				    JSAMPIMAGE input_buf,
-				    JDIMENSION *in_row_group_ctr,
-				    JDIMENSION in_row_groups_avail,
-				    JSAMPARRAY output_buf,
-				    JDIMENSION *out_row_ctr,
-				    JDIMENSION out_rows_avail));
-};
-
-/* Marker reading & parsing */
-struct jpeg_marker_reader {
-  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-  /* Read markers until SOS or EOI.
-   * Returns same codes as are defined for jpeg_consume_input:
-   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-   */
-  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-  /* Read a restart marker --- exported for use by entropy decoder only */
-  jpeg_marker_parser_method read_restart_marker;
-
-  /* State of marker reader --- nominally internal, but applications
-   * supplying COM or APPn handlers might like to know the state.
-   */
-  wxjpeg_boolean saw_SOI;		/* found SOI? */
-  wxjpeg_boolean saw_SOF;		/* found SOF? */
-  int next_restart_num;		/* next restart number expected (0-7) */
-  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
-};
-
-/* Entropy decoding */
-struct jpeg_entropy_decoder {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(wxjpeg_boolean, decode_mcu, (j_decompress_ptr cinfo,
-				JBLOCKROW *MCU_data));
-
-  /* This is here to share code between baseline and progressive decoders; */
-  /* other modules probably should not use it */
-  wxjpeg_boolean insufficient_data;	/* set TRUE after emitting warning */
-};
-
-/* Inverse DCT (also performs dequantization) */
-typedef JMETHOD(void, inverse_DCT_method_ptr,
-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col));
-
-struct jpeg_inverse_dct {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  /* It is useful to allow each component to have a separate IDCT method. */
-  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
-};
-
-/* Upsampling (note that upsampler must also call color converter) */
-struct jpeg_upsampler {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
-			   JSAMPIMAGE input_buf,
-			   JDIMENSION *in_row_group_ctr,
-			   JDIMENSION in_row_groups_avail,
-			   JSAMPARRAY output_buf,
-			   JDIMENSION *out_row_ctr,
-			   JDIMENSION out_rows_avail));
-
-  wxjpeg_boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Colorspace conversion */
-struct jpeg_color_deconverter {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
-				JSAMPIMAGE input_buf, JDIMENSION input_row,
-				JSAMPARRAY output_buf, int num_rows));
-};
-
-/* Color quantization or color precision reduction */
-struct jpeg_color_quantizer {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan));
-  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
-				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
-				 int num_rows));
-  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
-};
-
-
-/* Miscellaneous useful macros */
-
-#undef MAX
-#define MAX(a,b)	((a) > (b) ? (a) : (b))
-#undef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-
-
-/* We assume that right shift corresponds to signed division by 2 with
- * rounding towards minus infinity.  This is correct for typical "arithmetic
- * shift" instructions that shift in copies of the sign bit.  But some
- * C compilers implement >> with an unsigned shift.  For these machines you
- * must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
- * It is only applied with constant shift counts.  SHIFT_TEMPS must be
- * included in the variables of any routine using RIGHT_SHIFT.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS	JPEG_INT32 shift_temp;
-#define RIGHT_SHIFT(x,shft)  \
-	((shift_temp = (x)) < 0 ? \
-	 (shift_temp >> (shft)) | ((~((JPEG_INT32) 0)) << (32-(shft))) : \
-	 (shift_temp >> (shft)))
-#else
-#define SHIFT_TEMPS
-#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jinit_compress_master	jICompress
-#define jinit_c_master_control	jICMaster
-#define jinit_c_main_controller	jICMainC
-#define jinit_c_prep_controller	jICPrepC
-#define jinit_c_coef_controller	jICCoefC
-#define jinit_color_converter	jICColor
-#define jinit_downsampler	jIDownsampler
-#define jinit_forward_dct	jIFDCT
-#define jinit_huff_encoder	jIHEncoder
-#define jinit_phuff_encoder	jIPHEncoder
-#define jinit_marker_writer	jIMWriter
-#define jinit_master_decompress	jIDMaster
-#define jinit_d_main_controller	jIDMainC
-#define jinit_d_coef_controller	jIDCoefC
-#define jinit_d_post_controller	jIDPostC
-#define jinit_input_controller	jIInCtlr
-#define jinit_marker_reader	jIMReader
-#define jinit_huff_decoder	jIHDecoder
-#define jinit_phuff_decoder	jIPHDecoder
-#define jinit_inverse_dct	jIIDCT
-#define jinit_upsampler		jIUpsampler
-#define jinit_color_deconverter	jIDColor
-#define jinit_1pass_quantizer	jI1Quant
-#define jinit_2pass_quantizer	jI2Quant
-#define jinit_merged_upsampler	jIMUpsampler
-#define jinit_memory_mgr	jIMemMgr
-#define jdiv_round_up		jDivRound
-#define jround_up		jRound
-#define jcopy_sample_rows	jCopySamples
-#define jcopy_block_row		jCopyBlocks
-#define jzero_far		jZeroFar
-#define jpeg_zigzag_order	jZIGTable
-#define jpeg_natural_order	jZAGTable
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Compression module initialization routines */
-EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
-					 wxjpeg_boolean transcode_only));
-EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
-/* Decompression module initialization routines */
-EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
-/* Memory manager initialization */
-EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
-
-/* Utility routines in jutils.c */
-EXTERN(long) jdiv_round_up JPP((long a, long b));
-EXTERN(long) jround_up JPP((long a, long b));
-EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
-				    JSAMPARRAY output_array, int dest_row,
-				    int num_rows, JDIMENSION num_cols));
-EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
-				  JDIMENSION num_blocks));
-EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
-/* Constant tables in jutils.c */
-#if 0				/* This table is not actually needed in v6a */
-extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
-#endif
-extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
-
-/* Suppress undefined-structure complaints if necessary. */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-#endif
-#endif /* INCOMPLETE_TYPES_BROKEN */
+/*
+ * jpegint.h
+ *
+ * Copyright (C) 1991-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file provides common declarations for the various JPEG modules.
+ * These declarations are considered internal to the JPEG library; most
+ * applications using the library shouldn't need to include this file.
+ */
+
+
+/* Declarations for both compression & decompression */
+
+typedef enum {			/* Operating modes for buffer controllers */
+	JBUF_PASS_THRU,		/* Plain stripwise operation */
+	/* Remaining modes require a full-image buffer to have been created */
+	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */
+	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */
+	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */
+} J_BUF_MODE;
+
+/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
+#define CSTATE_START	100	/* after create_compress */
+#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */
+#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */
+#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */
+#define DSTATE_START	200	/* after create_decompress */
+#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */
+#define DSTATE_READY	202	/* found SOS, ready for start_decompress */
+#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/
+#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */
+#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */
+#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */
+#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */
+#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */
+#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */
+#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */
+
+
+/* Declarations for compression modules */
+
+/* Master control module */
+struct jpeg_comp_master {
+  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+
+  /* State variables made visible to other modules */
+  wxjpeg_boolean call_pass_startup;	/* True if pass_startup must be called */
+  wxjpeg_boolean is_last_pass;		/* True during last pass */
+};
+
+/* Main buffer control (downsampled-data buffer) */
+struct jpeg_c_main_controller {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, process_data, (j_compress_ptr cinfo,
+			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+			       JDIMENSION in_rows_avail));
+};
+
+/* Compression preprocessing (downsampling input buffer control) */
+struct jpeg_c_prep_controller {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
+				   JSAMPARRAY input_buf,
+				   JDIMENSION *in_row_ctr,
+				   JDIMENSION in_rows_avail,
+				   JSAMPIMAGE output_buf,
+				   JDIMENSION *out_row_group_ctr,
+				   JDIMENSION out_row_groups_avail));
+};
+
+/* Coefficient buffer control */
+struct jpeg_c_coef_controller {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(wxjpeg_boolean, compress_data, (j_compress_ptr cinfo,
+				   JSAMPIMAGE input_buf));
+};
+
+/* Colorspace conversion */
+struct jpeg_color_converter {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
+				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
+				JDIMENSION output_row, int num_rows));
+};
+
+/* Downsampling */
+struct jpeg_downsampler {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+  JMETHOD(void, downsample, (j_compress_ptr cinfo,
+			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
+			     JSAMPIMAGE output_buf,
+			     JDIMENSION out_row_group_index));
+
+  wxjpeg_boolean need_context_rows;	/* TRUE if need rows above & below */
+};
+
+/* Forward DCT (also controls coefficient quantization) */
+struct jpeg_forward_dct {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
+  /* perhaps this should be an array??? */
+  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
+			      jpeg_component_info * compptr,
+			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
+			      JDIMENSION start_row, JDIMENSION start_col,
+			      JDIMENSION num_blocks));
+};
+
+/* Entropy encoding */
+struct jpeg_entropy_encoder {
+  JMETHOD(void, start_pass, (j_compress_ptr cinfo, wxjpeg_boolean gather_statistics));
+  JMETHOD(wxjpeg_boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
+  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
+};
+
+/* Marker writing */
+struct jpeg_marker_writer {
+  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
+  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
+  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
+  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
+  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
+  /* These routines are exported to allow insertion of extra markers */
+  /* Probably only COM and APPn markers should be written this way */
+  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
+				      unsigned int datalen));
+  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
+};
+
+
+/* Declarations for decompression modules */
+
+/* Master control module */
+struct jpeg_decomp_master {
+  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
+
+  /* State variables made visible to other modules */
+  wxjpeg_boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
+};
+
+/* Input control module */
+struct jpeg_input_controller {
+  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
+  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
+
+  /* State variables made visible to other modules */
+  wxjpeg_boolean has_multiple_scans;	/* True if file has multiple scans */
+  wxjpeg_boolean eoi_reached;		/* True when EOI has been consumed */
+};
+
+/* Main buffer control (downsampled-data buffer) */
+struct jpeg_d_main_controller {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
+			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
+			       JDIMENSION out_rows_avail));
+};
+
+/* Coefficient buffer control */
+struct jpeg_d_coef_controller {
+#if defined(__VISAGECPP__)
+  /* the start input pass in jdcoeft must have a different name than the
+  // one in jdtrans under VisualAge or else we get a dup symbol error
+  */
+  JMETHOD(void, start_input_pass2, (j_decompress_ptr cinfo));
+#else
+  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
+#endif
+
+  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
+  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
+  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
+				 JSAMPIMAGE output_buf));
+  /* Pointer to array of coefficient virtual arrays, or NULL if none */
+  jvirt_barray_ptr *coef_arrays;
+};
+
+/* Decompression postprocessing (color quantization buffer control) */
+struct jpeg_d_post_controller {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
+  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
+				    JSAMPIMAGE input_buf,
+				    JDIMENSION *in_row_group_ctr,
+				    JDIMENSION in_row_groups_avail,
+				    JSAMPARRAY output_buf,
+				    JDIMENSION *out_row_ctr,
+				    JDIMENSION out_rows_avail));
+};
+
+/* Marker reading & parsing */
+struct jpeg_marker_reader {
+  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
+  /* Read markers until SOS or EOI.
+   * Returns same codes as are defined for jpeg_consume_input:
+   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
+   */
+  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
+  /* Read a restart marker --- exported for use by entropy decoder only */
+  jpeg_marker_parser_method read_restart_marker;
+
+  /* State of marker reader --- nominally internal, but applications
+   * supplying COM or APPn handlers might like to know the state.
+   */
+  wxjpeg_boolean saw_SOI;		/* found SOI? */
+  wxjpeg_boolean saw_SOF;		/* found SOF? */
+  int next_restart_num;		/* next restart number expected (0-7) */
+  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
+};
+
+/* Entropy decoding */
+struct jpeg_entropy_decoder {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(wxjpeg_boolean, decode_mcu, (j_decompress_ptr cinfo,
+				JBLOCKROW *MCU_data));
+
+  /* This is here to share code between baseline and progressive decoders; */
+  /* other modules probably should not use it */
+  wxjpeg_boolean insufficient_data;	/* set TRUE after emitting warning */
+};
+
+/* Inverse DCT (also performs dequantization) */
+typedef JMETHOD(void, inverse_DCT_method_ptr,
+		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
+		 JCOEFPTR coef_block,
+		 JSAMPARRAY output_buf, JDIMENSION output_col));
+
+struct jpeg_inverse_dct {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  /* It is useful to allow each component to have a separate IDCT method. */
+  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
+};
+
+/* Upsampling (note that upsampler must also call color converter) */
+struct jpeg_upsampler {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
+			   JSAMPIMAGE input_buf,
+			   JDIMENSION *in_row_group_ctr,
+			   JDIMENSION in_row_groups_avail,
+			   JSAMPARRAY output_buf,
+			   JDIMENSION *out_row_ctr,
+			   JDIMENSION out_rows_avail));
+
+  wxjpeg_boolean need_context_rows;	/* TRUE if need rows above & below */
+};
+
+/* Colorspace conversion */
+struct jpeg_color_deconverter {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
+				JSAMPIMAGE input_buf, JDIMENSION input_row,
+				JSAMPARRAY output_buf, int num_rows));
+};
+
+/* Color quantization or color precision reduction */
+struct jpeg_color_quantizer {
+  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan));
+  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
+				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
+				 int num_rows));
+  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
+  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
+};
+
+
+/* Miscellaneous useful macros */
+
+#undef MAX
+#define MAX(a,b)	((a) > (b) ? (a) : (b))
+#undef MIN
+#define MIN(a,b)	((a) < (b) ? (a) : (b))
+
+
+/* We assume that right shift corresponds to signed division by 2 with
+ * rounding towards minus infinity.  This is correct for typical "arithmetic
+ * shift" instructions that shift in copies of the sign bit.  But some
+ * C compilers implement >> with an unsigned shift.  For these machines you
+ * must define RIGHT_SHIFT_IS_UNSIGNED.
+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
+ * It is only applied with constant shift counts.  SHIFT_TEMPS must be
+ * included in the variables of any routine using RIGHT_SHIFT.
+ */
+
+#ifdef RIGHT_SHIFT_IS_UNSIGNED
+#define SHIFT_TEMPS	JPEG_INT32 shift_temp;
+#define RIGHT_SHIFT(x,shft)  \
+	((shift_temp = (x)) < 0 ? \
+	 (shift_temp >> (shft)) | ((~((JPEG_INT32) 0)) << (32-(shft))) : \
+	 (shift_temp >> (shft)))
+#else
+#define SHIFT_TEMPS
+#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
+#endif
+
+
+/* Short forms of external names for systems with brain-damaged linkers. */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jinit_compress_master	jICompress
+#define jinit_c_master_control	jICMaster
+#define jinit_c_main_controller	jICMainC
+#define jinit_c_prep_controller	jICPrepC
+#define jinit_c_coef_controller	jICCoefC
+#define jinit_color_converter	jICColor
+#define jinit_downsampler	jIDownsampler
+#define jinit_forward_dct	jIFDCT
+#define jinit_huff_encoder	jIHEncoder
+#define jinit_phuff_encoder	jIPHEncoder
+#define jinit_marker_writer	jIMWriter
+#define jinit_master_decompress	jIDMaster
+#define jinit_d_main_controller	jIDMainC
+#define jinit_d_coef_controller	jIDCoefC
+#define jinit_d_post_controller	jIDPostC
+#define jinit_input_controller	jIInCtlr
+#define jinit_marker_reader	jIMReader
+#define jinit_huff_decoder	jIHDecoder
+#define jinit_phuff_decoder	jIPHDecoder
+#define jinit_inverse_dct	jIIDCT
+#define jinit_upsampler		jIUpsampler
+#define jinit_color_deconverter	jIDColor
+#define jinit_1pass_quantizer	jI1Quant
+#define jinit_2pass_quantizer	jI2Quant
+#define jinit_merged_upsampler	jIMUpsampler
+#define jinit_memory_mgr	jIMemMgr
+#define jdiv_round_up		jDivRound
+#define jround_up		jRound
+#define jcopy_sample_rows	jCopySamples
+#define jcopy_block_row		jCopyBlocks
+#define jzero_far		jZeroFar
+#define jpeg_zigzag_order	jZIGTable
+#define jpeg_natural_order	jZAGTable
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/* Compression module initialization routines */
+EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
+					 wxjpeg_boolean transcode_only));
+EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
+					  wxjpeg_boolean need_full_buffer));
+EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
+					  wxjpeg_boolean need_full_buffer));
+EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
+					  wxjpeg_boolean need_full_buffer));
+EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
+EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
+/* Decompression module initialization routines */
+EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
+					  wxjpeg_boolean need_full_buffer));
+EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
+					  wxjpeg_boolean need_full_buffer));
+EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
+					  wxjpeg_boolean need_full_buffer));
+EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
+EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
+/* Memory manager initialization */
+EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
+
+/* Utility routines in jutils.c */
+EXTERN(long) jdiv_round_up JPP((long a, long b));
+EXTERN(long) jround_up JPP((long a, long b));
+EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
+				    JSAMPARRAY output_array, int dest_row,
+				    int num_rows, JDIMENSION num_cols));
+EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
+				  JDIMENSION num_blocks));
+EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
+/* Constant tables in jutils.c */
+#if 0				/* This table is not actually needed in v6a */
+extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
+#endif
+extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
+
+/* Suppress undefined-structure complaints if necessary. */
+
+#ifdef INCOMPLETE_TYPES_BROKEN
+#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */
+struct jvirt_sarray_control { long dummy; };
+struct jvirt_barray_control { long dummy; };
+#endif
+#endif /* INCOMPLETE_TYPES_BROKEN */
diff --git a/Source/3rd Party/wx/src/jpeg/jpeglib.h b/Source/3rd Party/wx/src/jpeg/jpeglib.h
index 9da169b76..8bdfe5174 100644
--- a/Source/3rd Party/wx/src/jpeg/jpeglib.h	
+++ b/Source/3rd Party/wx/src/jpeg/jpeglib.h	
@@ -1,1096 +1,1096 @@
-/*
- * jpeglib.h
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the application interface for the JPEG library.
- * Most applications using the library need only include this file,
- * and perhaps jerror.h if they want to know the exact error codes.
- */
-
-#ifndef JPEGLIB_H
-#define JPEGLIB_H
-
-/*
- * First we include the configuration files that record how this
- * installation of the JPEG library is set up.  jconfig.h can be
- * generated automatically for many systems.  jmorecfg.h contains
- * manual configuration options that most people need not worry about.
- */
-
-#ifndef JCONFIG_INCLUDED	/* in case jinclude.h already did */
-#include "jconfig.h"		/* widely used configuration options */
-#endif
-#include "jmorecfg.h"		/* seldom changed options */
-
-
-/* Version ID for the JPEG library.
- * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60".
- */
-
-#define JPEG_LIB_VERSION  62	/* Version 6b */
-
-
-/* Various constants determining the sizes of things.
- * All of these are specified by the JPEG standard, so don't change them
- * if you want to be compatible.
- */
-
-#define DCTSIZE		    8	/* The basic DCT block is 8x8 samples */
-#define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */
-#define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */
-#define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */
-#define NUM_ARITH_TBLS      16	/* Arith-coding tables are numbered 0..15 */
-#define MAX_COMPS_IN_SCAN   4	/* JPEG limit on # of components in one scan */
-#define MAX_SAMP_FACTOR     4	/* JPEG limit on sampling factors */
-/* Unfortunately, some bozo at Adobe saw no reason to be bound by the standard;
- * the PostScript DCT filter can emit files with many more than 10 blocks/MCU.
- * If you happen to run across such a file, you can up D_MAX_BLOCKS_IN_MCU
- * to handle it.  We even let you do this from the jconfig.h file.  However,
- * we strongly discourage changing C_MAX_BLOCKS_IN_MCU; just because Adobe
- * sometimes emits noncompliant files doesn't mean you should too.
- */
-#define C_MAX_BLOCKS_IN_MCU   10 /* compressor's limit on blocks per MCU */
-#ifndef D_MAX_BLOCKS_IN_MCU
-#define D_MAX_BLOCKS_IN_MCU   10 /* decompressor's limit on blocks per MCU */
-#endif
-
-
-/* Data structures for images (arrays of samples and of DCT coefficients).
- * On 80x86 machines, the image arrays are too big for near pointers,
- * but the pointer arrays can fit in near memory.
- */
-
-typedef JSAMPLE FAR *JSAMPROW;	/* ptr to one image row of pixel samples. */
-typedef JSAMPROW *JSAMPARRAY;	/* ptr to some rows (a 2-D sample array) */
-typedef JSAMPARRAY *JSAMPIMAGE;	/* a 3-D sample array: top index is color */
-
-typedef JCOEF JBLOCK[DCTSIZE2];	/* one block of coefficients */
-typedef JBLOCK FAR *JBLOCKROW;	/* pointer to one row of coefficient blocks */
-typedef JBLOCKROW *JBLOCKARRAY;		/* a 2-D array of coefficient blocks */
-typedef JBLOCKARRAY *JBLOCKIMAGE;	/* a 3-D array of coefficient blocks */
-
-typedef JCOEF FAR *JCOEFPTR;	/* useful in a couple of places */
-
-
-/* Types for JPEG compression parameters and working tables. */
-
-
-/* DCT coefficient quantization tables. */
-
-typedef struct {
-  /* This array gives the coefficient quantizers in natural array order
-   * (not the zigzag order in which they are stored in a JPEG DQT marker).
-   * CAUTION: IJG versions prior to v6a kept this array in zigzag order.
-   */
-  UINT16 quantval[DCTSIZE2];	/* quantization step for each coefficient */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  wxjpeg_boolean sent_table;		/* TRUE when table has been output */
-} JQUANT_TBL;
-
-
-/* Huffman coding tables. */
-
-typedef struct {
-  /* These two fields directly represent the contents of a JPEG DHT marker */
-  UINT8 bits[17];		/* bits[k] = # of symbols with codes of */
-				/* length k bits; bits[0] is unused */
-  UINT8 huffval[256];		/* The symbols, in order of incr code length */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  wxjpeg_boolean sent_table;		/* TRUE when table has been output */
-} JHUFF_TBL;
-
-
-/* Basic info about one component (color channel). */
-
-typedef struct {
-  /* These values are fixed over the whole image. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOF marker. */
-  int component_id;		/* identifier for this component (0..255) */
-  int component_index;		/* its index in SOF or cinfo->comp_info[] */
-  int h_samp_factor;		/* horizontal sampling factor (1..4) */
-  int v_samp_factor;		/* vertical sampling factor (1..4) */
-  int quant_tbl_no;		/* quantization table selector (0..3) */
-  /* These values may vary between scans. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOS marker. */
-  /* The decompressor output side may not use these variables. */
-  int dc_tbl_no;		/* DC entropy table selector (0..3) */
-  int ac_tbl_no;		/* AC entropy table selector (0..3) */
-
-  /* Remaining fields should be treated as private by applications. */
-
-  /* These values are computed during compression or decompression startup: */
-  /* Component's size in DCT blocks.
-   * Any dummy blocks added to complete an MCU are not counted; therefore
-   * these values do not depend on whether a scan is interleaved or not.
-   */
-  JDIMENSION width_in_blocks;
-  JDIMENSION height_in_blocks;
-  /* Size of a DCT block in samples.  Always DCTSIZE for compression.
-   * For decompression this is the size of the output from one DCT block,
-   * reflecting any scaling we choose to apply during the IDCT step.
-   * Values of 1,2,4,8 are likely to be supported.  Note that different
-   * components may receive different IDCT scalings.
-   */
-  int DCT_scaled_size;
-  /* The downsampled dimensions are the component's actual, unpadded number
-   * of samples at the main buffer (preprocessing/compression interface), thus
-   * downsampled_width = ceil(image_width * Hi/Hmax)
-   * and similarly for height.  For decompression, IDCT scaling is included, so
-   * downsampled_width = ceil(image_width * Hi/Hmax * DCT_scaled_size/DCTSIZE)
-   */
-  JDIMENSION downsampled_width;	 /* actual width in samples */
-  JDIMENSION downsampled_height; /* actual height in samples */
-  /* This flag is used only for decompression.  In cases where some of the
-   * components will be ignored (eg grayscale output from YCbCr image),
-   * we can skip most computations for the unused components.
-   */
-  wxjpeg_boolean component_needed;	/* do we need the value of this component? */
-
-  /* These values are computed before starting a scan of the component. */
-  /* The decompressor output side may not use these variables. */
-  int MCU_width;		/* number of blocks per MCU, horizontally */
-  int MCU_height;		/* number of blocks per MCU, vertically */
-  int MCU_blocks;		/* MCU_width * MCU_height */
-  int MCU_sample_width;		/* MCU width in samples, MCU_width*DCT_scaled_size */
-  int last_col_width;		/* # of non-dummy blocks across in last MCU */
-  int last_row_height;		/* # of non-dummy blocks down in last MCU */
-
-  /* Saved quantization table for component; NULL if none yet saved.
-   * See jdinput.c comments about the need for this information.
-   * This field is currently used only for decompression.
-   */
-  JQUANT_TBL * quant_table;
-
-  /* Private per-component storage for DCT or IDCT subsystem. */
-  void * dct_table;
-} jpeg_component_info;
-
-
-/* The script for encoding a multiple-scan file is an array of these: */
-
-typedef struct {
-  int comps_in_scan;		/* number of components encoded in this scan */
-  int component_index[MAX_COMPS_IN_SCAN]; /* their SOF/comp_info[] indexes */
-  int Ss, Se;			/* progressive JPEG spectral selection parms */
-  int Ah, Al;			/* progressive JPEG successive approx. parms */
-} jpeg_scan_info;
-
-/* The decompressor can save APPn and COM markers in a list of these: */
-
-typedef struct jpeg_marker_struct FAR * jpeg_saved_marker_ptr;
-
-struct jpeg_marker_struct {
-  jpeg_saved_marker_ptr next;	/* next in list, or NULL */
-  UINT8 marker;			/* marker code: JPEG_COM, or JPEG_APP0+n */
-  unsigned int original_length;	/* # bytes of data in the file */
-  unsigned int data_length;	/* # bytes of data saved at data[] */
-  JOCTET FAR * data;		/* the data contained in the marker */
-  /* the marker length word is not counted in data_length or original_length */
-};
-
-/* Known color spaces. */
-
-typedef enum {
-	JCS_UNKNOWN,		/* error/unspecified */
-	JCS_GRAYSCALE,		/* monochrome */
-	JCS_RGB,		/* red/green/blue */
-	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
-	JCS_CMYK,		/* C/M/Y/K */
-	JCS_YCCK		/* Y/Cb/Cr/K */
-} J_COLOR_SPACE;
-
-/* DCT/IDCT algorithm options. */
-
-typedef enum {
-	JDCT_ISLOW,		/* slow but accurate integer algorithm */
-	JDCT_IFAST,		/* faster, less accurate integer method */
-	JDCT_FLOAT		/* floating-point: accurate, fast on fast HW */
-} J_DCT_METHOD;
-
-#ifndef JDCT_DEFAULT		/* may be overridden in jconfig.h */
-#define JDCT_DEFAULT  JDCT_ISLOW
-#endif
-#ifndef JDCT_FASTEST		/* may be overridden in jconfig.h */
-#define JDCT_FASTEST  JDCT_IFAST
-#endif
-
-/* Dithering options for decompression. */
-
-typedef enum {
-	JDITHER_NONE,		/* no dithering */
-	JDITHER_ORDERED,	/* simple ordered dither */
-	JDITHER_FS		/* Floyd-Steinberg error diffusion dither */
-} J_DITHER_MODE;
-
-
-/* Common fields between JPEG compression and decompression master structs. */
-
-#define jpeg_common_fields \
-  struct jpeg_error_mgr * err;	/* Error handler module */\
-  struct jpeg_memory_mgr * mem;	/* Memory manager module */\
-  struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
-  void * client_data;		/* Available for use by application */\
-  wxjpeg_boolean is_decompressor;	/* So common code can tell which is which */\
-  int global_state		/* For checking call sequence validity */
-
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * jpeg_common_struct, only of jpeg_compress_struct and jpeg_decompress_struct.
- */
-struct jpeg_common_struct {
-  jpeg_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual jpeg_compress_struct or
-   * jpeg_decompress_struct.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-};
-
-typedef struct jpeg_common_struct * j_common_ptr;
-typedef struct jpeg_compress_struct * j_compress_ptr;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-
-
-/* Master record for a compression instance */
-
-struct jpeg_compress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_decompress_struct */
-
-  /* Destination for compressed data */
-  struct jpeg_destination_mgr * dest;
-
-  /* Description of source image --- these fields must be filled in by
-   * outer application before starting compression.  in_color_space must
-   * be correct before you can even call jpeg_set_defaults().
-   */
-
-  JDIMENSION image_width;	/* input image width */
-  JDIMENSION image_height;	/* input image height */
-  int input_components;		/* # of color components in input image */
-  J_COLOR_SPACE in_color_space;	/* colorspace of input image */
-
-  double input_gamma;		/* image gamma of input image */
-
-  /* Compression parameters --- these fields must be set before calling
-   * jpeg_start_compress().  We recommend calling jpeg_set_defaults() to
-   * initialize everything to reasonable defaults, then changing anything
-   * the application specifically wants to change.  That way you won't get
-   * burnt when new parameters are added.  Also note that there are several
-   * helper routines to simplify changing parameters.
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  int num_scans;		/* # of entries in scan_info array */
-  const jpeg_scan_info * scan_info; /* script for multi-scan file, or NULL */
-  /* The default value of scan_info is NULL, which causes a single-scan
-   * sequential JPEG file to be emitted.  To create a multi-scan file,
-   * set num_scans and scan_info to point to an array of scan definitions.
-   */
-
-  wxjpeg_boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
-  wxjpeg_boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-  wxjpeg_boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
-  wxjpeg_boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-  int smoothing_factor;		/* 1..100, or 0 for no input smoothing */
-  J_DCT_METHOD dct_method;	/* DCT algorithm selector */
-
-  /* The restart interval can be specified in absolute MCUs by setting
-   * restart_interval, or in MCU rows by setting restart_in_rows
-   * (in which case the correct restart_interval will be figured
-   * for each scan).
-   */
-  unsigned int restart_interval; /* MCUs per restart, or 0 for no restart */
-  int restart_in_rows;		/* if > 0, MCU rows per restart interval */
-
-  /* Parameters controlling emission of special markers. */
-
-  wxjpeg_boolean write_JFIF_header;	/* should a JFIF marker be written? */
-  UINT8 JFIF_major_version;	/* What to write for the JFIF version number */
-  UINT8 JFIF_minor_version;
-  /* These three values are not used by the JPEG code, merely copied */
-  /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */
-  /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */
-  /* ratio is defined by X_density/Y_density even when density_unit=0. */
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  wxjpeg_boolean write_Adobe_marker;	/* should an Adobe marker be written? */
-
-  /* State variable: index of next scanline to be written to
-   * jpeg_write_scanlines().  Application may use this to control its
-   * processing loop, e.g., "while (next_scanline < image_height)".
-   */
-
-  JDIMENSION next_scanline;	/* 0 .. image_height-1  */
-
-  /* Remaining fields are known throughout compressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during compression startup
-   */
-  wxjpeg_boolean progressive_mode;	/* TRUE if scan script uses progressive mode */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows to be input to coef ctlr */
-  /* The coefficient controller receives data in units of MCU rows as defined
-   * for fully interleaved scans (whether the JPEG file is interleaved or not).
-   * There are v_samp_factor * DCTSIZE sample rows of each component in an
-   * "iMCU" (interleaved MCU) row.
-   */
-
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[C_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  /*
-   * Links to compression subobjects (methods and private variables of modules)
-   */
-  struct jpeg_comp_master * master;
-  struct jpeg_c_main_controller * main;
-  struct jpeg_c_prep_controller * prep;
-  struct jpeg_c_coef_controller * coef;
-  struct jpeg_marker_writer * marker;
-  struct jpeg_color_converter * cconvert;
-  struct jpeg_downsampler * downsample;
-  struct jpeg_forward_dct * fdct;
-  struct jpeg_entropy_encoder * entropy;
-  jpeg_scan_info * script_space; /* workspace for jpeg_simple_progression */
-  int script_space_size;
-};
-
-
-/* Master record for a decompression instance */
-
-struct jpeg_decompress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_compress_struct */
-
-  /* Source of compressed data */
-  struct jpeg_source_mgr * src;
-
-  /* Basic description of image --- filled in by jpeg_read_header(). */
-  /* Application may inspect these values to decide how to process image. */
-
-  JDIMENSION image_width;	/* nominal image width (from SOF marker) */
-  JDIMENSION image_height;	/* nominal image height */
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  /* Decompression processing parameters --- these fields must be set before
-   * calling jpeg_start_decompress().  Note that jpeg_read_header() initializes
-   * them to default values.
-   */
-
-  J_COLOR_SPACE out_color_space; /* colorspace for output */
-
-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
-
-  double output_gamma;		/* image gamma wanted in output */
-
-  wxjpeg_boolean buffered_image;	/* TRUE=multiple output passes */
-  wxjpeg_boolean raw_data_out;		/* TRUE=downsampled data wanted */
-
-  J_DCT_METHOD dct_method;	/* IDCT algorithm selector */
-  wxjpeg_boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
-  wxjpeg_boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
-
-  wxjpeg_boolean quantize_colors;	/* TRUE=colormapped output wanted */
-  /* the following are ignored if not quantize_colors: */
-  J_DITHER_MODE dither_mode;	/* type of color dithering to use */
-  wxjpeg_boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
-  int desired_number_of_colors;	/* max # colors to use in created colormap */
-  /* these are significant only in buffered-image mode: */
-  wxjpeg_boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
-  wxjpeg_boolean enable_external_quant;/* enable future use of external colormap */
-  wxjpeg_boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
-
-  /* Description of actual output image that will be returned to application.
-   * These fields are computed by jpeg_start_decompress().
-   * You can also use jpeg_calc_output_dimensions() to determine these values
-   * in advance of calling jpeg_start_decompress().
-   */
-
-  JDIMENSION output_width;	/* scaled image width */
-  JDIMENSION output_height;	/* scaled image height */
-  int out_color_components;	/* # of color components in out_color_space */
-  int output_components;	/* # of color components returned */
-  /* output_components is 1 (a colormap index) when quantizing colors;
-   * otherwise it equals out_color_components.
-   */
-  int rec_outbuf_height;	/* min recommended height of scanline buffer */
-  /* If the buffer passed to jpeg_read_scanlines() is less than this many rows
-   * high, space and time will be wasted due to unnecessary data copying.
-   * Usually rec_outbuf_height will be 1 or 2, at most 4.
-   */
-
-  /* When quantizing colors, the output colormap is described by these fields.
-   * The application can supply a colormap by setting colormap non-NULL before
-   * calling jpeg_start_decompress; otherwise a colormap is created during
-   * jpeg_start_decompress or jpeg_start_output.
-   * The map has out_color_components rows and actual_number_of_colors columns.
-   */
-  int actual_number_of_colors;	/* number of entries in use */
-  JSAMPARRAY colormap;		/* The color map as a 2-D pixel array */
-
-  /* State variables: these variables indicate the progress of decompression.
-   * The application may examine these but must not modify them.
-   */
-
-  /* Row index of next scanline to be read from jpeg_read_scanlines().
-   * Application may use this to control its processing loop, e.g.,
-   * "while (output_scanline < output_height)".
-   */
-  JDIMENSION output_scanline;	/* 0 .. output_height-1  */
-
-  /* Current input scan number and number of iMCU rows completed in scan.
-   * These indicate the progress of the decompressor input side.
-   */
-  int input_scan_number;	/* Number of SOS markers seen so far */
-  JDIMENSION input_iMCU_row;	/* Number of iMCU rows completed */
-
-  /* The "output scan number" is the notional scan being displayed by the
-   * output side.  The decompressor will not allow output scan/row number
-   * to get ahead of input scan/row, but it can fall arbitrarily far behind.
-   */
-  int output_scan_number;	/* Nominal scan number being displayed */
-  JDIMENSION output_iMCU_row;	/* Number of iMCU rows read */
-
-  /* Current progression status.  coef_bits[c][i] indicates the precision
-   * with which component c's DCT coefficient i (in zigzag order) is known.
-   * It is -1 when no data has yet been received, otherwise it is the point
-   * transform (shift) value for the most recent scan of the coefficient
-   * (thus, 0 at completion of the progression).
-   * This pointer is NULL when reading a non-progressive file.
-   */
-  int (*coef_bits)[DCTSIZE2];	/* -1 or current Al value for each coef */
-
-  /* Internal JPEG parameters --- the application usually need not look at
-   * these fields.  Note that the decompressor output side may not use
-   * any parameters that can change between scans.
-   */
-
-  /* Quantization and Huffman tables are carried forward across input
-   * datastreams when processing abbreviated JPEG datastreams.
-   */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  /* These parameters are never carried across datastreams, since they
-   * are given in SOF/SOS markers or defined to be reset by SOI.
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  wxjpeg_boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */
-  wxjpeg_boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  unsigned int restart_interval; /* MCUs per restart interval, or 0 for no restart */
-
-  /* These fields record data obtained from optional markers recognized by
-   * the JPEG library.
-   */
-  wxjpeg_boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
-  /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
-  UINT8 JFIF_major_version;	/* JFIF version number */
-  UINT8 JFIF_minor_version;
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  wxjpeg_boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
-  UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
-
-  wxjpeg_boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-
-  /* Aside from the specific data retained from APPn markers known to the
-   * library, the uninterpreted contents of any or all APPn and COM markers
-   * can be saved in a list for examination by the application.
-   */
-  jpeg_saved_marker_ptr marker_list; /* Head of list of saved markers */
-
-  /* Remaining fields are known throughout decompressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during decompression startup
-   */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  int min_DCT_scaled_size;	/* smallest DCT_scaled_size of any component */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows in image */
-  /* The coefficient controller's input and output progress is measured in
-   * units of "iMCU" (interleaved MCU) rows.  These are the same as MCU rows
-   * in fully interleaved JPEG scans, but are used whether the scan is
-   * interleaved or not.  We define an iMCU row as v_samp_factor DCT block
-   * rows of each component.  Therefore, the IDCT output contains
-   * v_samp_factor*DCT_scaled_size sample rows of a component per iMCU row.
-   */
-
-  JSAMPLE * sample_range_limit; /* table for fast range-limiting */
-
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   * Note that the decompressor output side must not use these fields.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[D_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  /* This field is shared between entropy decoder and marker parser.
-   * It is either zero or the code of a JPEG marker that has been
-   * read from the data source, but has not yet been processed.
-   */
-  int unread_marker;
-
-  /*
-   * Links to decompression subobjects (methods, private variables of modules)
-   */
-  struct jpeg_decomp_master * master;
-  struct jpeg_d_main_controller * main;
-  struct jpeg_d_coef_controller * coef;
-  struct jpeg_d_post_controller * post;
-  struct jpeg_input_controller * inputctl;
-  struct jpeg_marker_reader * marker;
-  struct jpeg_entropy_decoder * entropy;
-  struct jpeg_inverse_dct * idct;
-  struct jpeg_upsampler * upsample;
-  struct jpeg_color_deconverter * cconvert;
-  struct jpeg_color_quantizer * cquantize;
-};
-
-
-/* "Object" declarations for JPEG modules that may be supplied or called
- * directly by the surrounding application.
- * As with all objects in the JPEG library, these structs only define the
- * publicly visible methods and state variables of a module.  Additional
- * private fields may exist after the public ones.
- */
-
-
-/* Error handler object */
-
-struct jpeg_error_mgr {
-  /* Error exit handler: does not return to caller */
-  JMETHOD(void, error_exit, (j_common_ptr cinfo));
-  /* Conditionally emit a trace or warning message */
-  JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));
-  /* Routine that actually outputs a trace or error message */
-  JMETHOD(void, output_message, (j_common_ptr cinfo));
-  /* Format a message string for the most recent JPEG error or message */
-  JMETHOD(void, format_message, (j_common_ptr cinfo, char * buffer));
-#define JMSG_LENGTH_MAX  200	/* recommended size of format_message buffer */
-  /* Reset error state variables at start of a new image */
-  JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo));
-
-  /* The message ID code and any parameters are saved here.
-   * A message can have one string parameter or up to 8 int parameters.
-   */
-  int msg_code;
-#define JMSG_STR_PARM_MAX  80
-  union {
-    int i[8];
-    char s[JMSG_STR_PARM_MAX];
-  } msg_parm;
-
-  /* Standard state variables for error facility */
-
-  int trace_level;		/* max msg_level that will be displayed */
-
-  /* For recoverable corrupt-data errors, we emit a warning message,
-   * but keep going unless emit_message chooses to abort.  emit_message
-   * should count warnings in num_warnings.  The surrounding application
-   * can check for bad data by seeing if num_warnings is nonzero at the
-   * end of processing.
-   */
-  long num_warnings;		/* number of corrupt-data warnings */
-
-  /* These fields point to the table(s) of error message strings.
-   * An application can change the table pointer to switch to a different
-   * message list (typically, to change the language in which errors are
-   * reported).  Some applications may wish to add additional error codes
-   * that will be handled by the JPEG library error mechanism; the second
-   * table pointer is used for this purpose.
-   *
-   * First table includes all errors generated by JPEG library itself.
-   * Error code 0 is reserved for a "no such error string" message.
-   */
-  const char * const * jpeg_message_table; /* Library errors */
-  int last_jpeg_message;    /* Table contains strings 0..last_jpeg_message */
-  /* Second table can be added by application (see cjpeg/djpeg for example).
-   * It contains strings numbered first_addon_message..last_addon_message.
-   */
-  const char * const * addon_message_table; /* Non-library errors */
-  int first_addon_message;	/* code for first string in addon table */
-  int last_addon_message;	/* code for last string in addon table */
-};
-
-
-/* Progress monitor object */
-
-struct jpeg_progress_mgr {
-  JMETHOD(void, progress_monitor, (j_common_ptr cinfo));
-
-  long pass_counter;		/* work units completed in this pass */
-  long pass_limit;		/* total number of work units in this pass */
-  int completed_passes;		/* passes completed so far */
-  int total_passes;		/* total number of passes expected */
-};
-
-
-/* Data destination object for compression */
-
-struct jpeg_destination_mgr {
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-
-  JMETHOD(void, init_destination, (j_compress_ptr cinfo));
-  JMETHOD(wxjpeg_boolean, empty_output_buffer, (j_compress_ptr cinfo));
-  JMETHOD(void, term_destination, (j_compress_ptr cinfo));
-};
-
-
-/* Data source object for decompression */
-
-struct jpeg_source_mgr {
-  const JOCTET * next_input_byte; /* => next byte to read from buffer */
-  size_t bytes_in_buffer;	/* # of bytes remaining in buffer */
-
-  JMETHOD(void, init_source, (j_decompress_ptr cinfo));
-  JMETHOD(wxjpeg_boolean, fill_input_buffer, (j_decompress_ptr cinfo));
-  JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
-  JMETHOD(wxjpeg_boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
-  JMETHOD(void, term_source, (j_decompress_ptr cinfo));
-};
-
-
-/* Memory manager object.
- * Allocates "small" objects (a few K total), "large" objects (tens of K),
- * and "really big" objects (virtual arrays with backing store if needed).
- * The memory manager does not allow individual objects to be freed; rather,
- * each created object is assigned to a pool, and whole pools can be freed
- * at once.  This is faster and more convenient than remembering exactly what
- * to free, especially where malloc()/free() are not too speedy.
- * NB: alloc routines never return NULL.  They exit to error_exit if not
- * successful.
- */
-
-#define JPOOL_PERMANENT	0	/* lasts until master record is destroyed */
-#define JPOOL_IMAGE	1	/* lasts until done with image/datastream */
-#define JPOOL_NUMPOOLS	2
-
-typedef struct jvirt_sarray_control * jvirt_sarray_ptr;
-typedef struct jvirt_barray_control * jvirt_barray_ptr;
-
-
-struct jpeg_memory_mgr {
-  /* Method pointers */
-  JMETHOD(void *, alloc_small, (j_common_ptr cinfo, int pool_id,
-				size_t sizeofobject));
-  JMETHOD(void FAR *, alloc_large, (j_common_ptr cinfo, int pool_id,
-				     size_t sizeofobject));
-  JMETHOD(JSAMPARRAY, alloc_sarray, (j_common_ptr cinfo, int pool_id,
-				     JDIMENSION samplesperrow,
-				     JDIMENSION numrows));
-  JMETHOD(JBLOCKARRAY, alloc_barray, (j_common_ptr cinfo, int pool_id,
-				      JDIMENSION blocksperrow,
-				      JDIMENSION numrows));
-  JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
-						  int pool_id,
-						  wxjpeg_boolean pre_zero,
-						  JDIMENSION samplesperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
-						  int pool_id,
-						  wxjpeg_boolean pre_zero,
-						  JDIMENSION blocksperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(void, realize_virt_arrays, (j_common_ptr cinfo));
-  JMETHOD(JSAMPARRAY, access_virt_sarray, (j_common_ptr cinfo,
-					   jvirt_sarray_ptr ptr,
-					   JDIMENSION start_row,
-					   JDIMENSION num_rows,
-					   wxjpeg_boolean writable));
-  JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
-					    jvirt_barray_ptr ptr,
-					    JDIMENSION start_row,
-					    JDIMENSION num_rows,
-					    wxjpeg_boolean writable));
-  JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
-  JMETHOD(void, self_destruct, (j_common_ptr cinfo));
-
-  /* Limit on memory allocation for this JPEG object.  (Note that this is
-   * merely advisory, not a guaranteed maximum; it only affects the space
-   * used for virtual-array buffers.)  May be changed by outer application
-   * after creating the JPEG object.
-   */
-  long max_memory_to_use;
-
-  /* Maximum allocation request accepted by alloc_large. */
-  long max_alloc_chunk;
-};
-
-
-/* Routine signature for application-supplied marker processing methods.
- * Need not pass marker code since it is stored in cinfo->unread_marker.
- */
-typedef JMETHOD(wxjpeg_boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
-
-
-/* Declarations for routines called by application.
- * The JPP macro hides prototype parameters from compilers that can't cope.
- * Note JPP requires double parentheses.
- */
-
-#ifdef HAVE_PROTOTYPES
-#define JPP(arglist)	arglist
-#else
-#define JPP(arglist)	()
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers.
- * We shorten external names to be unique in the first six letters, which
- * is good enough for all known systems.
- * (If your compiler itself needs names to be unique in less than 15
- * characters, you are out of luck.  Get a better compiler.)
- */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_std_error		jStdError
-#define jpeg_CreateCompress	jCreaCompress
-#define jpeg_CreateDecompress	jCreaDecompress
-#define jpeg_destroy_compress	jDestCompress
-#define jpeg_destroy_decompress	jDestDecompress
-#define jpeg_stdio_dest		jStdDest
-#define jpeg_stdio_src		jStdSrc
-#define jpeg_set_defaults	jSetDefaults
-#define jpeg_set_colorspace	jSetColorspace
-#define jpeg_default_colorspace	jDefColorspace
-#define jpeg_set_quality	jSetQuality
-#define jpeg_set_linear_quality	jSetLQuality
-#define jpeg_add_quant_table	jAddQuantTable
-#define jpeg_quality_scaling	jQualityScaling
-#define jpeg_simple_progression	jSimProgress
-#define jpeg_suppress_tables	jSuppressTables
-#define jpeg_alloc_quant_table	jAlcQTable
-#define jpeg_alloc_huff_table	jAlcHTable
-#define jpeg_start_compress	jStrtCompress
-#define jpeg_write_scanlines	jWrtScanlines
-#define jpeg_finish_compress	jFinCompress
-#define jpeg_write_raw_data	jWrtRawData
-#define jpeg_write_marker	jWrtMarker
-#define jpeg_write_m_header	jWrtMHeader
-#define jpeg_write_m_byte	jWrtMByte
-#define jpeg_write_tables	jWrtTables
-#define jpeg_read_header	jReadHeader
-#define jpeg_start_decompress	jStrtDecompress
-#define jpeg_read_scanlines	jReadScanlines
-#define jpeg_finish_decompress	jFinDecompress
-#define jpeg_read_raw_data	jReadRawData
-#define jpeg_has_multiple_scans	jHasMultScn
-#define jpeg_start_output	jStrtOutput
-#define jpeg_finish_output	jFinOutput
-#define jpeg_input_complete	jInComplete
-#define jpeg_new_colormap	jNewCMap
-#define jpeg_consume_input	jConsumeInput
-#define jpeg_calc_output_dimensions	jCalcDimensions
-#define jpeg_save_markers	jSaveMarkers
-#define jpeg_set_marker_processor	jSetMarker
-#define jpeg_read_coefficients	jReadCoefs
-#define jpeg_write_coefficients	jWrtCoefs
-#define jpeg_copy_critical_parameters	jCopyCrit
-#define jpeg_abort_compress	jAbrtCompress
-#define jpeg_abort_decompress	jAbrtDecompress
-#define jpeg_abort		jAbort
-#define jpeg_destroy		jDestroy
-#define jpeg_resync_to_restart	jResyncRestart
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Default error-management setup */
-EXTERN(struct jpeg_error_mgr *) jpeg_std_error
-	JPP((struct jpeg_error_mgr * err));
-
-/* Initialization of JPEG compression objects.
- * jpeg_create_compress() and jpeg_create_decompress() are the exported
- * names that applications should call.  These expand to calls on
- * jpeg_CreateCompress and jpeg_CreateDecompress with additional information
- * passed for version mismatch checking.
- * NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.
- */
-#define jpeg_create_compress(cinfo) \
-    jpeg_CreateCompress((cinfo), JPEG_LIB_VERSION, \
-			(size_t) sizeof(struct jpeg_compress_struct))
-#define jpeg_create_decompress(cinfo) \
-    jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \
-			  (size_t) sizeof(struct jpeg_decompress_struct))
-EXTERN(void) jpeg_CreateCompress JPP((j_compress_ptr cinfo,
-				      int version, size_t structsize));
-EXTERN(void) jpeg_CreateDecompress JPP((j_decompress_ptr cinfo,
-					int version, size_t structsize));
-/* Destruction of JPEG compression objects */
-EXTERN(void) jpeg_destroy_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo));
-
-/* Standard data source and destination managers: stdio streams. */
-/* Caller is responsible for opening the file before and closing after. */
-EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile));
-EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile));
-
-/* Default parameter setup for compression */
-EXTERN(void) jpeg_set_defaults JPP((j_compress_ptr cinfo));
-/* Compression parameter setup aids */
-EXTERN(void) jpeg_set_colorspace JPP((j_compress_ptr cinfo,
-				      J_COLOR_SPACE colorspace));
-EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
-				   wxjpeg_boolean force_baseline));
-EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
-					  int scale_factor,
-					  wxjpeg_boolean force_baseline));
-EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
-				       const unsigned int *basic_table,
-				       int scale_factor,
-				       wxjpeg_boolean force_baseline));
-EXTERN(int) jpeg_quality_scaling JPP((int quality));
-EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
-				       wxjpeg_boolean suppress));
-EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
-EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
-
-/* Main entry points for compression */
-EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
-				      wxjpeg_boolean write_all_tables));
-EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
-					     JSAMPARRAY scanlines,
-					     JDIMENSION num_lines));
-EXTERN(void) jpeg_finish_compress JPP((j_compress_ptr cinfo));
-
-/* Replaces jpeg_write_scanlines when writing raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_write_raw_data JPP((j_compress_ptr cinfo,
-					    JSAMPIMAGE data,
-					    JDIMENSION num_lines));
-
-/* Write a special marker.  See libjpeg.doc concerning safe usage. */
-EXTERN(void) jpeg_write_marker
-	JPP((j_compress_ptr cinfo, int marker,
-	     const JOCTET * dataptr, unsigned int datalen));
-/* Same, but piecemeal. */
-EXTERN(void) jpeg_write_m_header
-	JPP((j_compress_ptr cinfo, int marker, unsigned int datalen));
-EXTERN(void) jpeg_write_m_byte
-	JPP((j_compress_ptr cinfo, int val));
-
-/* Alternate compression function: just write an abbreviated table file */
-EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo));
-
-/* Decompression startup: read start of JPEG datastream to see what's there */
-EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
-				  wxjpeg_boolean require_image));
-/* Return value is one of: */
-#define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */
-#define JPEG_HEADER_OK		1 /* Found valid image datastream */
-#define JPEG_HEADER_TABLES_ONLY	2 /* Found valid table-specs-only datastream */
-/* If you pass require_image = TRUE (normal case), you need not check for
- * a TABLES_ONLY return code; an abbreviated file will cause an error exit.
- * JPEG_SUSPENDED is only possible if you use a data source module that can
- * give a suspension return (the stdio source module doesn't).
- */
-
-/* Main entry points for decompression */
-EXTERN(wxjpeg_boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
-					    JSAMPARRAY scanlines,
-					    JDIMENSION max_lines));
-EXTERN(wxjpeg_boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
-
-/* Replaces jpeg_read_scanlines when reading raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
-					   JSAMPIMAGE data,
-					   JDIMENSION max_lines));
-
-/* Additional entry points for buffered-image mode. */
-EXTERN(wxjpeg_boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
-EXTERN(wxjpeg_boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
-				       int scan_number));
-EXTERN(wxjpeg_boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
-EXTERN(wxjpeg_boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
-EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
-/* Return value is one of: */
-/* #define JPEG_SUSPENDED	0    Suspended due to lack of input data */
-#define JPEG_REACHED_SOS	1 /* Reached start of new scan */
-#define JPEG_REACHED_EOI	2 /* Reached end of image */
-#define JPEG_ROW_COMPLETED	3 /* Completed one iMCU row */
-#define JPEG_SCAN_COMPLETED	4 /* Completed last iMCU row of a scan */
-
-/* Precalculate output dimensions for current decompression parameters. */
-EXTERN(void) jpeg_calc_output_dimensions JPP((j_decompress_ptr cinfo));
-
-/* Control saving of COM and APPn markers into marker_list. */
-EXTERN(void) jpeg_save_markers
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     unsigned int length_limit));
-
-/* Install a special processing method for COM or APPn markers. */
-EXTERN(void) jpeg_set_marker_processor
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     jpeg_marker_parser_method routine));
-
-/* Read or write raw DCT coefficients --- useful for lossless transcoding. */
-EXTERN(jvirt_barray_ptr *) jpeg_read_coefficients JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_write_coefficients JPP((j_compress_ptr cinfo,
-					  jvirt_barray_ptr * coef_arrays));
-EXTERN(void) jpeg_copy_critical_parameters JPP((j_decompress_ptr srcinfo,
-						j_compress_ptr dstinfo));
-
-/* If you choose to abort compression or decompression before completing
- * jpeg_finish_(de)compress, then you need to clean up to release memory,
- * temporary files, etc.  You can just call jpeg_destroy_(de)compress
- * if you're done with the JPEG object, but if you want to clean it up and
- * reuse it, call this:
- */
-EXTERN(void) jpeg_abort_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_abort_decompress JPP((j_decompress_ptr cinfo));
-
-/* Generic versions of jpeg_abort and jpeg_destroy that work on either
- * flavor of JPEG object.  These may be more convenient in some places.
- */
-EXTERN(void) jpeg_abort JPP((j_common_ptr cinfo));
-EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
-
-/* Default restart-marker-resync procedure for use by data source modules */
-EXTERN(wxjpeg_boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
-					    int desired));
-
-
-/* These marker codes are exported since applications and data source modules
- * are likely to want to use them.
- */
-
-#define JPEG_RST0	0xD0	/* RST0 marker code */
-#define JPEG_EOI	0xD9	/* EOI marker code */
-#define JPEG_APP0	0xE0	/* APP0 marker code */
-#define JPEG_COM	0xFE	/* COM marker code */
-
-
-/* If we have a brain-damaged compiler that emits warnings (or worse, errors)
- * for structure definitions that are never filled in, keep it quiet by
- * supplying dummy definitions for the various substructures.
- */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef JPEG_INTERNALS		/* will be defined in jpegint.h */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-struct jpeg_comp_master { long dummy; };
-struct jpeg_c_main_controller { long dummy; };
-struct jpeg_c_prep_controller { long dummy; };
-struct jpeg_c_coef_controller { long dummy; };
-struct jpeg_marker_writer { long dummy; };
-struct jpeg_color_converter { long dummy; };
-struct jpeg_downsampler { long dummy; };
-struct jpeg_forward_dct { long dummy; };
-struct jpeg_entropy_encoder { long dummy; };
-struct jpeg_decomp_master { long dummy; };
-struct jpeg_d_main_controller { long dummy; };
-struct jpeg_d_coef_controller { long dummy; };
-struct jpeg_d_post_controller { long dummy; };
-struct jpeg_input_controller { long dummy; };
-struct jpeg_marker_reader { long dummy; };
-struct jpeg_entropy_decoder { long dummy; };
-struct jpeg_inverse_dct { long dummy; };
-struct jpeg_upsampler { long dummy; };
-struct jpeg_color_deconverter { long dummy; };
-struct jpeg_color_quantizer { long dummy; };
-#endif /* JPEG_INTERNALS */
-#endif /* INCOMPLETE_TYPES_BROKEN */
-
-
-/*
- * The JPEG library modules define JPEG_INTERNALS before including this file.
- * The internal structure declarations are read only when that is true.
- * Applications using the library should not include jpegint.h, but may wish
- * to include jerror.h.
- */
-
-#ifdef JPEG_INTERNALS
-#include "jpegint.h"		/* fetch private declarations */
-#include "jerror.h"		/* fetch error codes too */
-#endif
-
-#endif /* JPEGLIB_H */
+/*
+ * jpeglib.h
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file defines the application interface for the JPEG library.
+ * Most applications using the library need only include this file,
+ * and perhaps jerror.h if they want to know the exact error codes.
+ */
+
+#ifndef JPEGLIB_H
+#define JPEGLIB_H
+
+/*
+ * First we include the configuration files that record how this
+ * installation of the JPEG library is set up.  jconfig.h can be
+ * generated automatically for many systems.  jmorecfg.h contains
+ * manual configuration options that most people need not worry about.
+ */
+
+#ifndef JCONFIG_INCLUDED	/* in case jinclude.h already did */
+#include "../src/jpeg/jconfig.h"		/* widely used configuration options */
+#endif
+#include "jmorecfg.h"		/* seldom changed options */
+
+
+/* Version ID for the JPEG library.
+ * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60".
+ */
+
+#define JPEG_LIB_VERSION  62	/* Version 6b */
+
+
+/* Various constants determining the sizes of things.
+ * All of these are specified by the JPEG standard, so don't change them
+ * if you want to be compatible.
+ */
+
+#define DCTSIZE		    8	/* The basic DCT block is 8x8 samples */
+#define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */
+#define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */
+#define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */
+#define NUM_ARITH_TBLS      16	/* Arith-coding tables are numbered 0..15 */
+#define MAX_COMPS_IN_SCAN   4	/* JPEG limit on # of components in one scan */
+#define MAX_SAMP_FACTOR     4	/* JPEG limit on sampling factors */
+/* Unfortunately, some bozo at Adobe saw no reason to be bound by the standard;
+ * the PostScript DCT filter can emit files with many more than 10 blocks/MCU.
+ * If you happen to run across such a file, you can up D_MAX_BLOCKS_IN_MCU
+ * to handle it.  We even let you do this from the jconfig.h file.  However,
+ * we strongly discourage changing C_MAX_BLOCKS_IN_MCU; just because Adobe
+ * sometimes emits noncompliant files doesn't mean you should too.
+ */
+#define C_MAX_BLOCKS_IN_MCU   10 /* compressor's limit on blocks per MCU */
+#ifndef D_MAX_BLOCKS_IN_MCU
+#define D_MAX_BLOCKS_IN_MCU   10 /* decompressor's limit on blocks per MCU */
+#endif
+
+
+/* Data structures for images (arrays of samples and of DCT coefficients).
+ * On 80x86 machines, the image arrays are too big for near pointers,
+ * but the pointer arrays can fit in near memory.
+ */
+
+typedef JSAMPLE FAR *JSAMPROW;	/* ptr to one image row of pixel samples. */
+typedef JSAMPROW *JSAMPARRAY;	/* ptr to some rows (a 2-D sample array) */
+typedef JSAMPARRAY *JSAMPIMAGE;	/* a 3-D sample array: top index is color */
+
+typedef JCOEF JBLOCK[DCTSIZE2];	/* one block of coefficients */
+typedef JBLOCK FAR *JBLOCKROW;	/* pointer to one row of coefficient blocks */
+typedef JBLOCKROW *JBLOCKARRAY;		/* a 2-D array of coefficient blocks */
+typedef JBLOCKARRAY *JBLOCKIMAGE;	/* a 3-D array of coefficient blocks */
+
+typedef JCOEF FAR *JCOEFPTR;	/* useful in a couple of places */
+
+
+/* Types for JPEG compression parameters and working tables. */
+
+
+/* DCT coefficient quantization tables. */
+
+typedef struct {
+  /* This array gives the coefficient quantizers in natural array order
+   * (not the zigzag order in which they are stored in a JPEG DQT marker).
+   * CAUTION: IJG versions prior to v6a kept this array in zigzag order.
+   */
+  UINT16 quantval[DCTSIZE2];	/* quantization step for each coefficient */
+  /* This field is used only during compression.  It's initialized FALSE when
+   * the table is created, and set TRUE when it's been output to the file.
+   * You could suppress output of a table by setting this to TRUE.
+   * (See jpeg_suppress_tables for an example.)
+   */
+  wxjpeg_boolean sent_table;		/* TRUE when table has been output */
+} JQUANT_TBL;
+
+
+/* Huffman coding tables. */
+
+typedef struct {
+  /* These two fields directly represent the contents of a JPEG DHT marker */
+  UINT8 bits[17];		/* bits[k] = # of symbols with codes of */
+				/* length k bits; bits[0] is unused */
+  UINT8 huffval[256];		/* The symbols, in order of incr code length */
+  /* This field is used only during compression.  It's initialized FALSE when
+   * the table is created, and set TRUE when it's been output to the file.
+   * You could suppress output of a table by setting this to TRUE.
+   * (See jpeg_suppress_tables for an example.)
+   */
+  wxjpeg_boolean sent_table;		/* TRUE when table has been output */
+} JHUFF_TBL;
+
+
+/* Basic info about one component (color channel). */
+
+typedef struct {
+  /* These values are fixed over the whole image. */
+  /* For compression, they must be supplied by parameter setup; */
+  /* for decompression, they are read from the SOF marker. */
+  int component_id;		/* identifier for this component (0..255) */
+  int component_index;		/* its index in SOF or cinfo->comp_info[] */
+  int h_samp_factor;		/* horizontal sampling factor (1..4) */
+  int v_samp_factor;		/* vertical sampling factor (1..4) */
+  int quant_tbl_no;		/* quantization table selector (0..3) */
+  /* These values may vary between scans. */
+  /* For compression, they must be supplied by parameter setup; */
+  /* for decompression, they are read from the SOS marker. */
+  /* The decompressor output side may not use these variables. */
+  int dc_tbl_no;		/* DC entropy table selector (0..3) */
+  int ac_tbl_no;		/* AC entropy table selector (0..3) */
+
+  /* Remaining fields should be treated as private by applications. */
+
+  /* These values are computed during compression or decompression startup: */
+  /* Component's size in DCT blocks.
+   * Any dummy blocks added to complete an MCU are not counted; therefore
+   * these values do not depend on whether a scan is interleaved or not.
+   */
+  JDIMENSION width_in_blocks;
+  JDIMENSION height_in_blocks;
+  /* Size of a DCT block in samples.  Always DCTSIZE for compression.
+   * For decompression this is the size of the output from one DCT block,
+   * reflecting any scaling we choose to apply during the IDCT step.
+   * Values of 1,2,4,8 are likely to be supported.  Note that different
+   * components may receive different IDCT scalings.
+   */
+  int DCT_scaled_size;
+  /* The downsampled dimensions are the component's actual, unpadded number
+   * of samples at the main buffer (preprocessing/compression interface), thus
+   * downsampled_width = ceil(image_width * Hi/Hmax)
+   * and similarly for height.  For decompression, IDCT scaling is included, so
+   * downsampled_width = ceil(image_width * Hi/Hmax * DCT_scaled_size/DCTSIZE)
+   */
+  JDIMENSION downsampled_width;	 /* actual width in samples */
+  JDIMENSION downsampled_height; /* actual height in samples */
+  /* This flag is used only for decompression.  In cases where some of the
+   * components will be ignored (eg grayscale output from YCbCr image),
+   * we can skip most computations for the unused components.
+   */
+  wxjpeg_boolean component_needed;	/* do we need the value of this component? */
+
+  /* These values are computed before starting a scan of the component. */
+  /* The decompressor output side may not use these variables. */
+  int MCU_width;		/* number of blocks per MCU, horizontally */
+  int MCU_height;		/* number of blocks per MCU, vertically */
+  int MCU_blocks;		/* MCU_width * MCU_height */
+  int MCU_sample_width;		/* MCU width in samples, MCU_width*DCT_scaled_size */
+  int last_col_width;		/* # of non-dummy blocks across in last MCU */
+  int last_row_height;		/* # of non-dummy blocks down in last MCU */
+
+  /* Saved quantization table for component; NULL if none yet saved.
+   * See jdinput.c comments about the need for this information.
+   * This field is currently used only for decompression.
+   */
+  JQUANT_TBL * quant_table;
+
+  /* Private per-component storage for DCT or IDCT subsystem. */
+  void * dct_table;
+} jpeg_component_info;
+
+
+/* The script for encoding a multiple-scan file is an array of these: */
+
+typedef struct {
+  int comps_in_scan;		/* number of components encoded in this scan */
+  int component_index[MAX_COMPS_IN_SCAN]; /* their SOF/comp_info[] indexes */
+  int Ss, Se;			/* progressive JPEG spectral selection parms */
+  int Ah, Al;			/* progressive JPEG successive approx. parms */
+} jpeg_scan_info;
+
+/* The decompressor can save APPn and COM markers in a list of these: */
+
+typedef struct jpeg_marker_struct FAR * jpeg_saved_marker_ptr;
+
+struct jpeg_marker_struct {
+  jpeg_saved_marker_ptr next;	/* next in list, or NULL */
+  UINT8 marker;			/* marker code: JPEG_COM, or JPEG_APP0+n */
+  unsigned int original_length;	/* # bytes of data in the file */
+  unsigned int data_length;	/* # bytes of data saved at data[] */
+  JOCTET FAR * data;		/* the data contained in the marker */
+  /* the marker length word is not counted in data_length or original_length */
+};
+
+/* Known color spaces. */
+
+typedef enum {
+	JCS_UNKNOWN,		/* error/unspecified */
+	JCS_GRAYSCALE,		/* monochrome */
+	JCS_RGB,		/* red/green/blue */
+	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
+	JCS_CMYK,		/* C/M/Y/K */
+	JCS_YCCK		/* Y/Cb/Cr/K */
+} J_COLOR_SPACE;
+
+/* DCT/IDCT algorithm options. */
+
+typedef enum {
+	JDCT_ISLOW,		/* slow but accurate integer algorithm */
+	JDCT_IFAST,		/* faster, less accurate integer method */
+	JDCT_FLOAT		/* floating-point: accurate, fast on fast HW */
+} J_DCT_METHOD;
+
+#ifndef JDCT_DEFAULT		/* may be overridden in jconfig.h */
+#define JDCT_DEFAULT  JDCT_ISLOW
+#endif
+#ifndef JDCT_FASTEST		/* may be overridden in jconfig.h */
+#define JDCT_FASTEST  JDCT_IFAST
+#endif
+
+/* Dithering options for decompression. */
+
+typedef enum {
+	JDITHER_NONE,		/* no dithering */
+	JDITHER_ORDERED,	/* simple ordered dither */
+	JDITHER_FS		/* Floyd-Steinberg error diffusion dither */
+} J_DITHER_MODE;
+
+
+/* Common fields between JPEG compression and decompression master structs. */
+
+#define jpeg_common_fields \
+  struct jpeg_error_mgr * err;	/* Error handler module */\
+  struct jpeg_memory_mgr * mem;	/* Memory manager module */\
+  struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
+  void * client_data;		/* Available for use by application */\
+  wxjpeg_boolean is_decompressor;	/* So common code can tell which is which */\
+  int global_state		/* For checking call sequence validity */
+
+/* Routines that are to be used by both halves of the library are declared
+ * to receive a pointer to this structure.  There are no actual instances of
+ * jpeg_common_struct, only of jpeg_compress_struct and jpeg_decompress_struct.
+ */
+struct jpeg_common_struct {
+  jpeg_common_fields;		/* Fields common to both master struct types */
+  /* Additional fields follow in an actual jpeg_compress_struct or
+   * jpeg_decompress_struct.  All three structs must agree on these
+   * initial fields!  (This would be a lot cleaner in C++.)
+   */
+};
+
+typedef struct jpeg_common_struct * j_common_ptr;
+typedef struct jpeg_compress_struct * j_compress_ptr;
+typedef struct jpeg_decompress_struct * j_decompress_ptr;
+
+
+/* Master record for a compression instance */
+
+struct jpeg_compress_struct {
+  jpeg_common_fields;		/* Fields shared with jpeg_decompress_struct */
+
+  /* Destination for compressed data */
+  struct jpeg_destination_mgr * dest;
+
+  /* Description of source image --- these fields must be filled in by
+   * outer application before starting compression.  in_color_space must
+   * be correct before you can even call jpeg_set_defaults().
+   */
+
+  JDIMENSION image_width;	/* input image width */
+  JDIMENSION image_height;	/* input image height */
+  int input_components;		/* # of color components in input image */
+  J_COLOR_SPACE in_color_space;	/* colorspace of input image */
+
+  double input_gamma;		/* image gamma of input image */
+
+  /* Compression parameters --- these fields must be set before calling
+   * jpeg_start_compress().  We recommend calling jpeg_set_defaults() to
+   * initialize everything to reasonable defaults, then changing anything
+   * the application specifically wants to change.  That way you won't get
+   * burnt when new parameters are added.  Also note that there are several
+   * helper routines to simplify changing parameters.
+   */
+
+  int data_precision;		/* bits of precision in image data */
+
+  int num_components;		/* # of color components in JPEG image */
+  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
+
+  jpeg_component_info * comp_info;
+  /* comp_info[i] describes component that appears i'th in SOF */
+
+  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
+  /* ptrs to coefficient quantization tables, or NULL if not defined */
+
+  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
+  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
+  /* ptrs to Huffman coding tables, or NULL if not defined */
+
+  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
+  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
+  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
+
+  int num_scans;		/* # of entries in scan_info array */
+  const jpeg_scan_info * scan_info; /* script for multi-scan file, or NULL */
+  /* The default value of scan_info is NULL, which causes a single-scan
+   * sequential JPEG file to be emitted.  To create a multi-scan file,
+   * set num_scans and scan_info to point to an array of scan definitions.
+   */
+
+  wxjpeg_boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
+  wxjpeg_boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
+  wxjpeg_boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
+  wxjpeg_boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
+  int smoothing_factor;		/* 1..100, or 0 for no input smoothing */
+  J_DCT_METHOD dct_method;	/* DCT algorithm selector */
+
+  /* The restart interval can be specified in absolute MCUs by setting
+   * restart_interval, or in MCU rows by setting restart_in_rows
+   * (in which case the correct restart_interval will be figured
+   * for each scan).
+   */
+  unsigned int restart_interval; /* MCUs per restart, or 0 for no restart */
+  int restart_in_rows;		/* if > 0, MCU rows per restart interval */
+
+  /* Parameters controlling emission of special markers. */
+
+  wxjpeg_boolean write_JFIF_header;	/* should a JFIF marker be written? */
+  UINT8 JFIF_major_version;	/* What to write for the JFIF version number */
+  UINT8 JFIF_minor_version;
+  /* These three values are not used by the JPEG code, merely copied */
+  /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */
+  /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */
+  /* ratio is defined by X_density/Y_density even when density_unit=0. */
+  UINT8 density_unit;		/* JFIF code for pixel size units */
+  UINT16 X_density;		/* Horizontal pixel density */
+  UINT16 Y_density;		/* Vertical pixel density */
+  wxjpeg_boolean write_Adobe_marker;	/* should an Adobe marker be written? */
+
+  /* State variable: index of next scanline to be written to
+   * jpeg_write_scanlines().  Application may use this to control its
+   * processing loop, e.g., "while (next_scanline < image_height)".
+   */
+
+  JDIMENSION next_scanline;	/* 0 .. image_height-1  */
+
+  /* Remaining fields are known throughout compressor, but generally
+   * should not be touched by a surrounding application.
+   */
+
+  /*
+   * These fields are computed during compression startup
+   */
+  wxjpeg_boolean progressive_mode;	/* TRUE if scan script uses progressive mode */
+  int max_h_samp_factor;	/* largest h_samp_factor */
+  int max_v_samp_factor;	/* largest v_samp_factor */
+
+  JDIMENSION total_iMCU_rows;	/* # of iMCU rows to be input to coef ctlr */
+  /* The coefficient controller receives data in units of MCU rows as defined
+   * for fully interleaved scans (whether the JPEG file is interleaved or not).
+   * There are v_samp_factor * DCTSIZE sample rows of each component in an
+   * "iMCU" (interleaved MCU) row.
+   */
+
+  /*
+   * These fields are valid during any one scan.
+   * They describe the components and MCUs actually appearing in the scan.
+   */
+  int comps_in_scan;		/* # of JPEG components in this scan */
+  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
+  /* *cur_comp_info[i] describes component that appears i'th in SOS */
+
+  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
+  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
+
+  int blocks_in_MCU;		/* # of DCT blocks per MCU */
+  int MCU_membership[C_MAX_BLOCKS_IN_MCU];
+  /* MCU_membership[i] is index in cur_comp_info of component owning */
+  /* i'th block in an MCU */
+
+  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
+
+  /*
+   * Links to compression subobjects (methods and private variables of modules)
+   */
+  struct jpeg_comp_master * master;
+  struct jpeg_c_main_controller * main;
+  struct jpeg_c_prep_controller * prep;
+  struct jpeg_c_coef_controller * coef;
+  struct jpeg_marker_writer * marker;
+  struct jpeg_color_converter * cconvert;
+  struct jpeg_downsampler * downsample;
+  struct jpeg_forward_dct * fdct;
+  struct jpeg_entropy_encoder * entropy;
+  jpeg_scan_info * script_space; /* workspace for jpeg_simple_progression */
+  int script_space_size;
+};
+
+
+/* Master record for a decompression instance */
+
+struct jpeg_decompress_struct {
+  jpeg_common_fields;		/* Fields shared with jpeg_compress_struct */
+
+  /* Source of compressed data */
+  struct jpeg_source_mgr * src;
+
+  /* Basic description of image --- filled in by jpeg_read_header(). */
+  /* Application may inspect these values to decide how to process image. */
+
+  JDIMENSION image_width;	/* nominal image width (from SOF marker) */
+  JDIMENSION image_height;	/* nominal image height */
+  int num_components;		/* # of color components in JPEG image */
+  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
+
+  /* Decompression processing parameters --- these fields must be set before
+   * calling jpeg_start_decompress().  Note that jpeg_read_header() initializes
+   * them to default values.
+   */
+
+  J_COLOR_SPACE out_color_space; /* colorspace for output */
+
+  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
+
+  double output_gamma;		/* image gamma wanted in output */
+
+  wxjpeg_boolean buffered_image;	/* TRUE=multiple output passes */
+  wxjpeg_boolean raw_data_out;		/* TRUE=downsampled data wanted */
+
+  J_DCT_METHOD dct_method;	/* IDCT algorithm selector */
+  wxjpeg_boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
+  wxjpeg_boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
+
+  wxjpeg_boolean quantize_colors;	/* TRUE=colormapped output wanted */
+  /* the following are ignored if not quantize_colors: */
+  J_DITHER_MODE dither_mode;	/* type of color dithering to use */
+  wxjpeg_boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
+  int desired_number_of_colors;	/* max # colors to use in created colormap */
+  /* these are significant only in buffered-image mode: */
+  wxjpeg_boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
+  wxjpeg_boolean enable_external_quant;/* enable future use of external colormap */
+  wxjpeg_boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
+
+  /* Description of actual output image that will be returned to application.
+   * These fields are computed by jpeg_start_decompress().
+   * You can also use jpeg_calc_output_dimensions() to determine these values
+   * in advance of calling jpeg_start_decompress().
+   */
+
+  JDIMENSION output_width;	/* scaled image width */
+  JDIMENSION output_height;	/* scaled image height */
+  int out_color_components;	/* # of color components in out_color_space */
+  int output_components;	/* # of color components returned */
+  /* output_components is 1 (a colormap index) when quantizing colors;
+   * otherwise it equals out_color_components.
+   */
+  int rec_outbuf_height;	/* min recommended height of scanline buffer */
+  /* If the buffer passed to jpeg_read_scanlines() is less than this many rows
+   * high, space and time will be wasted due to unnecessary data copying.
+   * Usually rec_outbuf_height will be 1 or 2, at most 4.
+   */
+
+  /* When quantizing colors, the output colormap is described by these fields.
+   * The application can supply a colormap by setting colormap non-NULL before
+   * calling jpeg_start_decompress; otherwise a colormap is created during
+   * jpeg_start_decompress or jpeg_start_output.
+   * The map has out_color_components rows and actual_number_of_colors columns.
+   */
+  int actual_number_of_colors;	/* number of entries in use */
+  JSAMPARRAY colormap;		/* The color map as a 2-D pixel array */
+
+  /* State variables: these variables indicate the progress of decompression.
+   * The application may examine these but must not modify them.
+   */
+
+  /* Row index of next scanline to be read from jpeg_read_scanlines().
+   * Application may use this to control its processing loop, e.g.,
+   * "while (output_scanline < output_height)".
+   */
+  JDIMENSION output_scanline;	/* 0 .. output_height-1  */
+
+  /* Current input scan number and number of iMCU rows completed in scan.
+   * These indicate the progress of the decompressor input side.
+   */
+  int input_scan_number;	/* Number of SOS markers seen so far */
+  JDIMENSION input_iMCU_row;	/* Number of iMCU rows completed */
+
+  /* The "output scan number" is the notional scan being displayed by the
+   * output side.  The decompressor will not allow output scan/row number
+   * to get ahead of input scan/row, but it can fall arbitrarily far behind.
+   */
+  int output_scan_number;	/* Nominal scan number being displayed */
+  JDIMENSION output_iMCU_row;	/* Number of iMCU rows read */
+
+  /* Current progression status.  coef_bits[c][i] indicates the precision
+   * with which component c's DCT coefficient i (in zigzag order) is known.
+   * It is -1 when no data has yet been received, otherwise it is the point
+   * transform (shift) value for the most recent scan of the coefficient
+   * (thus, 0 at completion of the progression).
+   * This pointer is NULL when reading a non-progressive file.
+   */
+  int (*coef_bits)[DCTSIZE2];	/* -1 or current Al value for each coef */
+
+  /* Internal JPEG parameters --- the application usually need not look at
+   * these fields.  Note that the decompressor output side may not use
+   * any parameters that can change between scans.
+   */
+
+  /* Quantization and Huffman tables are carried forward across input
+   * datastreams when processing abbreviated JPEG datastreams.
+   */
+
+  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
+  /* ptrs to coefficient quantization tables, or NULL if not defined */
+
+  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
+  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
+  /* ptrs to Huffman coding tables, or NULL if not defined */
+
+  /* These parameters are never carried across datastreams, since they
+   * are given in SOF/SOS markers or defined to be reset by SOI.
+   */
+
+  int data_precision;		/* bits of precision in image data */
+
+  jpeg_component_info * comp_info;
+  /* comp_info[i] describes component that appears i'th in SOF */
+
+  wxjpeg_boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */
+  wxjpeg_boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
+
+  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
+  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
+  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
+
+  unsigned int restart_interval; /* MCUs per restart interval, or 0 for no restart */
+
+  /* These fields record data obtained from optional markers recognized by
+   * the JPEG library.
+   */
+  wxjpeg_boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
+  /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
+  UINT8 JFIF_major_version;	/* JFIF version number */
+  UINT8 JFIF_minor_version;
+  UINT8 density_unit;		/* JFIF code for pixel size units */
+  UINT16 X_density;		/* Horizontal pixel density */
+  UINT16 Y_density;		/* Vertical pixel density */
+  wxjpeg_boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
+  UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
+
+  wxjpeg_boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
+
+  /* Aside from the specific data retained from APPn markers known to the
+   * library, the uninterpreted contents of any or all APPn and COM markers
+   * can be saved in a list for examination by the application.
+   */
+  jpeg_saved_marker_ptr marker_list; /* Head of list of saved markers */
+
+  /* Remaining fields are known throughout decompressor, but generally
+   * should not be touched by a surrounding application.
+   */
+
+  /*
+   * These fields are computed during decompression startup
+   */
+  int max_h_samp_factor;	/* largest h_samp_factor */
+  int max_v_samp_factor;	/* largest v_samp_factor */
+
+  int min_DCT_scaled_size;	/* smallest DCT_scaled_size of any component */
+
+  JDIMENSION total_iMCU_rows;	/* # of iMCU rows in image */
+  /* The coefficient controller's input and output progress is measured in
+   * units of "iMCU" (interleaved MCU) rows.  These are the same as MCU rows
+   * in fully interleaved JPEG scans, but are used whether the scan is
+   * interleaved or not.  We define an iMCU row as v_samp_factor DCT block
+   * rows of each component.  Therefore, the IDCT output contains
+   * v_samp_factor*DCT_scaled_size sample rows of a component per iMCU row.
+   */
+
+  JSAMPLE * sample_range_limit; /* table for fast range-limiting */
+
+  /*
+   * These fields are valid during any one scan.
+   * They describe the components and MCUs actually appearing in the scan.
+   * Note that the decompressor output side must not use these fields.
+   */
+  int comps_in_scan;		/* # of JPEG components in this scan */
+  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
+  /* *cur_comp_info[i] describes component that appears i'th in SOS */
+
+  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
+  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
+
+  int blocks_in_MCU;		/* # of DCT blocks per MCU */
+  int MCU_membership[D_MAX_BLOCKS_IN_MCU];
+  /* MCU_membership[i] is index in cur_comp_info of component owning */
+  /* i'th block in an MCU */
+
+  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
+
+  /* This field is shared between entropy decoder and marker parser.
+   * It is either zero or the code of a JPEG marker that has been
+   * read from the data source, but has not yet been processed.
+   */
+  int unread_marker;
+
+  /*
+   * Links to decompression subobjects (methods, private variables of modules)
+   */
+  struct jpeg_decomp_master * master;
+  struct jpeg_d_main_controller * main;
+  struct jpeg_d_coef_controller * coef;
+  struct jpeg_d_post_controller * post;
+  struct jpeg_input_controller * inputctl;
+  struct jpeg_marker_reader * marker;
+  struct jpeg_entropy_decoder * entropy;
+  struct jpeg_inverse_dct * idct;
+  struct jpeg_upsampler * upsample;
+  struct jpeg_color_deconverter * cconvert;
+  struct jpeg_color_quantizer * cquantize;
+};
+
+
+/* "Object" declarations for JPEG modules that may be supplied or called
+ * directly by the surrounding application.
+ * As with all objects in the JPEG library, these structs only define the
+ * publicly visible methods and state variables of a module.  Additional
+ * private fields may exist after the public ones.
+ */
+
+
+/* Error handler object */
+
+struct jpeg_error_mgr {
+  /* Error exit handler: does not return to caller */
+  JMETHOD(void, error_exit, (j_common_ptr cinfo));
+  /* Conditionally emit a trace or warning message */
+  JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));
+  /* Routine that actually outputs a trace or error message */
+  JMETHOD(void, output_message, (j_common_ptr cinfo));
+  /* Format a message string for the most recent JPEG error or message */
+  JMETHOD(void, format_message, (j_common_ptr cinfo, char * buffer));
+#define JMSG_LENGTH_MAX  200	/* recommended size of format_message buffer */
+  /* Reset error state variables at start of a new image */
+  JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo));
+
+  /* The message ID code and any parameters are saved here.
+   * A message can have one string parameter or up to 8 int parameters.
+   */
+  int msg_code;
+#define JMSG_STR_PARM_MAX  80
+  union {
+    int i[8];
+    char s[JMSG_STR_PARM_MAX];
+  } msg_parm;
+
+  /* Standard state variables for error facility */
+
+  int trace_level;		/* max msg_level that will be displayed */
+
+  /* For recoverable corrupt-data errors, we emit a warning message,
+   * but keep going unless emit_message chooses to abort.  emit_message
+   * should count warnings in num_warnings.  The surrounding application
+   * can check for bad data by seeing if num_warnings is nonzero at the
+   * end of processing.
+   */
+  long num_warnings;		/* number of corrupt-data warnings */
+
+  /* These fields point to the table(s) of error message strings.
+   * An application can change the table pointer to switch to a different
+   * message list (typically, to change the language in which errors are
+   * reported).  Some applications may wish to add additional error codes
+   * that will be handled by the JPEG library error mechanism; the second
+   * table pointer is used for this purpose.
+   *
+   * First table includes all errors generated by JPEG library itself.
+   * Error code 0 is reserved for a "no such error string" message.
+   */
+  const char * const * jpeg_message_table; /* Library errors */
+  int last_jpeg_message;    /* Table contains strings 0..last_jpeg_message */
+  /* Second table can be added by application (see cjpeg/djpeg for example).
+   * It contains strings numbered first_addon_message..last_addon_message.
+   */
+  const char * const * addon_message_table; /* Non-library errors */
+  int first_addon_message;	/* code for first string in addon table */
+  int last_addon_message;	/* code for last string in addon table */
+};
+
+
+/* Progress monitor object */
+
+struct jpeg_progress_mgr {
+  JMETHOD(void, progress_monitor, (j_common_ptr cinfo));
+
+  long pass_counter;		/* work units completed in this pass */
+  long pass_limit;		/* total number of work units in this pass */
+  int completed_passes;		/* passes completed so far */
+  int total_passes;		/* total number of passes expected */
+};
+
+
+/* Data destination object for compression */
+
+struct jpeg_destination_mgr {
+  JOCTET * next_output_byte;	/* => next byte to write in buffer */
+  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
+
+  JMETHOD(void, init_destination, (j_compress_ptr cinfo));
+  JMETHOD(wxjpeg_boolean, empty_output_buffer, (j_compress_ptr cinfo));
+  JMETHOD(void, term_destination, (j_compress_ptr cinfo));
+};
+
+
+/* Data source object for decompression */
+
+struct jpeg_source_mgr {
+  const JOCTET * next_input_byte; /* => next byte to read from buffer */
+  size_t bytes_in_buffer;	/* # of bytes remaining in buffer */
+
+  JMETHOD(void, init_source, (j_decompress_ptr cinfo));
+  JMETHOD(wxjpeg_boolean, fill_input_buffer, (j_decompress_ptr cinfo));
+  JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
+  JMETHOD(wxjpeg_boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
+  JMETHOD(void, term_source, (j_decompress_ptr cinfo));
+};
+
+
+/* Memory manager object.
+ * Allocates "small" objects (a few K total), "large" objects (tens of K),
+ * and "really big" objects (virtual arrays with backing store if needed).
+ * The memory manager does not allow individual objects to be freed; rather,
+ * each created object is assigned to a pool, and whole pools can be freed
+ * at once.  This is faster and more convenient than remembering exactly what
+ * to free, especially where malloc()/free() are not too speedy.
+ * NB: alloc routines never return NULL.  They exit to error_exit if not
+ * successful.
+ */
+
+#define JPOOL_PERMANENT	0	/* lasts until master record is destroyed */
+#define JPOOL_IMAGE	1	/* lasts until done with image/datastream */
+#define JPOOL_NUMPOOLS	2
+
+typedef struct jvirt_sarray_control * jvirt_sarray_ptr;
+typedef struct jvirt_barray_control * jvirt_barray_ptr;
+
+
+struct jpeg_memory_mgr {
+  /* Method pointers */
+  JMETHOD(void *, alloc_small, (j_common_ptr cinfo, int pool_id,
+				size_t sizeofobject));
+  JMETHOD(void FAR *, alloc_large, (j_common_ptr cinfo, int pool_id,
+				     size_t sizeofobject));
+  JMETHOD(JSAMPARRAY, alloc_sarray, (j_common_ptr cinfo, int pool_id,
+				     JDIMENSION samplesperrow,
+				     JDIMENSION numrows));
+  JMETHOD(JBLOCKARRAY, alloc_barray, (j_common_ptr cinfo, int pool_id,
+				      JDIMENSION blocksperrow,
+				      JDIMENSION numrows));
+  JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
+						  int pool_id,
+						  wxjpeg_boolean pre_zero,
+						  JDIMENSION samplesperrow,
+						  JDIMENSION numrows,
+						  JDIMENSION maxaccess));
+  JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
+						  int pool_id,
+						  wxjpeg_boolean pre_zero,
+						  JDIMENSION blocksperrow,
+						  JDIMENSION numrows,
+						  JDIMENSION maxaccess));
+  JMETHOD(void, realize_virt_arrays, (j_common_ptr cinfo));
+  JMETHOD(JSAMPARRAY, access_virt_sarray, (j_common_ptr cinfo,
+					   jvirt_sarray_ptr ptr,
+					   JDIMENSION start_row,
+					   JDIMENSION num_rows,
+					   wxjpeg_boolean writable));
+  JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
+					    jvirt_barray_ptr ptr,
+					    JDIMENSION start_row,
+					    JDIMENSION num_rows,
+					    wxjpeg_boolean writable));
+  JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
+  JMETHOD(void, self_destruct, (j_common_ptr cinfo));
+
+  /* Limit on memory allocation for this JPEG object.  (Note that this is
+   * merely advisory, not a guaranteed maximum; it only affects the space
+   * used for virtual-array buffers.)  May be changed by outer application
+   * after creating the JPEG object.
+   */
+  long max_memory_to_use;
+
+  /* Maximum allocation request accepted by alloc_large. */
+  long max_alloc_chunk;
+};
+
+
+/* Routine signature for application-supplied marker processing methods.
+ * Need not pass marker code since it is stored in cinfo->unread_marker.
+ */
+typedef JMETHOD(wxjpeg_boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
+
+
+/* Declarations for routines called by application.
+ * The JPP macro hides prototype parameters from compilers that can't cope.
+ * Note JPP requires double parentheses.
+ */
+
+#ifdef HAVE_PROTOTYPES
+#define JPP(arglist)	arglist
+#else
+#define JPP(arglist)	()
+#endif
+
+
+/* Short forms of external names for systems with brain-damaged linkers.
+ * We shorten external names to be unique in the first six letters, which
+ * is good enough for all known systems.
+ * (If your compiler itself needs names to be unique in less than 15
+ * characters, you are out of luck.  Get a better compiler.)
+ */
+
+#ifdef NEED_SHORT_EXTERNAL_NAMES
+#define jpeg_std_error		jStdError
+#define jpeg_CreateCompress	jCreaCompress
+#define jpeg_CreateDecompress	jCreaDecompress
+#define jpeg_destroy_compress	jDestCompress
+#define jpeg_destroy_decompress	jDestDecompress
+#define jpeg_stdio_dest		jStdDest
+#define jpeg_stdio_src		jStdSrc
+#define jpeg_set_defaults	jSetDefaults
+#define jpeg_set_colorspace	jSetColorspace
+#define jpeg_default_colorspace	jDefColorspace
+#define jpeg_set_quality	jSetQuality
+#define jpeg_set_linear_quality	jSetLQuality
+#define jpeg_add_quant_table	jAddQuantTable
+#define jpeg_quality_scaling	jQualityScaling
+#define jpeg_simple_progression	jSimProgress
+#define jpeg_suppress_tables	jSuppressTables
+#define jpeg_alloc_quant_table	jAlcQTable
+#define jpeg_alloc_huff_table	jAlcHTable
+#define jpeg_start_compress	jStrtCompress
+#define jpeg_write_scanlines	jWrtScanlines
+#define jpeg_finish_compress	jFinCompress
+#define jpeg_write_raw_data	jWrtRawData
+#define jpeg_write_marker	jWrtMarker
+#define jpeg_write_m_header	jWrtMHeader
+#define jpeg_write_m_byte	jWrtMByte
+#define jpeg_write_tables	jWrtTables
+#define jpeg_read_header	jReadHeader
+#define jpeg_start_decompress	jStrtDecompress
+#define jpeg_read_scanlines	jReadScanlines
+#define jpeg_finish_decompress	jFinDecompress
+#define jpeg_read_raw_data	jReadRawData
+#define jpeg_has_multiple_scans	jHasMultScn
+#define jpeg_start_output	jStrtOutput
+#define jpeg_finish_output	jFinOutput
+#define jpeg_input_complete	jInComplete
+#define jpeg_new_colormap	jNewCMap
+#define jpeg_consume_input	jConsumeInput
+#define jpeg_calc_output_dimensions	jCalcDimensions
+#define jpeg_save_markers	jSaveMarkers
+#define jpeg_set_marker_processor	jSetMarker
+#define jpeg_read_coefficients	jReadCoefs
+#define jpeg_write_coefficients	jWrtCoefs
+#define jpeg_copy_critical_parameters	jCopyCrit
+#define jpeg_abort_compress	jAbrtCompress
+#define jpeg_abort_decompress	jAbrtDecompress
+#define jpeg_abort		jAbort
+#define jpeg_destroy		jDestroy
+#define jpeg_resync_to_restart	jResyncRestart
+#endif /* NEED_SHORT_EXTERNAL_NAMES */
+
+
+/* Default error-management setup */
+EXTERN(struct jpeg_error_mgr *) jpeg_std_error
+	JPP((struct jpeg_error_mgr * err));
+
+/* Initialization of JPEG compression objects.
+ * jpeg_create_compress() and jpeg_create_decompress() are the exported
+ * names that applications should call.  These expand to calls on
+ * jpeg_CreateCompress and jpeg_CreateDecompress with additional information
+ * passed for version mismatch checking.
+ * NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.
+ */
+#define jpeg_create_compress(cinfo) \
+    jpeg_CreateCompress((cinfo), JPEG_LIB_VERSION, \
+			(size_t) sizeof(struct jpeg_compress_struct))
+#define jpeg_create_decompress(cinfo) \
+    jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \
+			  (size_t) sizeof(struct jpeg_decompress_struct))
+EXTERN(void) jpeg_CreateCompress JPP((j_compress_ptr cinfo,
+				      int version, size_t structsize));
+EXTERN(void) jpeg_CreateDecompress JPP((j_decompress_ptr cinfo,
+					int version, size_t structsize));
+/* Destruction of JPEG compression objects */
+EXTERN(void) jpeg_destroy_compress JPP((j_compress_ptr cinfo));
+EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo));
+
+/* Standard data source and destination managers: stdio streams. */
+/* Caller is responsible for opening the file before and closing after. */
+EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile));
+EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile));
+
+/* Default parameter setup for compression */
+EXTERN(void) jpeg_set_defaults JPP((j_compress_ptr cinfo));
+/* Compression parameter setup aids */
+EXTERN(void) jpeg_set_colorspace JPP((j_compress_ptr cinfo,
+				      J_COLOR_SPACE colorspace));
+EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
+EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
+				   wxjpeg_boolean force_baseline));
+EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
+					  int scale_factor,
+					  wxjpeg_boolean force_baseline));
+EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
+				       const unsigned int *basic_table,
+				       int scale_factor,
+				       wxjpeg_boolean force_baseline));
+EXTERN(int) jpeg_quality_scaling JPP((int quality));
+EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
+EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
+				       wxjpeg_boolean suppress));
+EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
+EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
+
+/* Main entry points for compression */
+EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
+				      wxjpeg_boolean write_all_tables));
+EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
+					     JSAMPARRAY scanlines,
+					     JDIMENSION num_lines));
+EXTERN(void) jpeg_finish_compress JPP((j_compress_ptr cinfo));
+
+/* Replaces jpeg_write_scanlines when writing raw downsampled data. */
+EXTERN(JDIMENSION) jpeg_write_raw_data JPP((j_compress_ptr cinfo,
+					    JSAMPIMAGE data,
+					    JDIMENSION num_lines));
+
+/* Write a special marker.  See libjpeg.doc concerning safe usage. */
+EXTERN(void) jpeg_write_marker
+	JPP((j_compress_ptr cinfo, int marker,
+	     const JOCTET * dataptr, unsigned int datalen));
+/* Same, but piecemeal. */
+EXTERN(void) jpeg_write_m_header
+	JPP((j_compress_ptr cinfo, int marker, unsigned int datalen));
+EXTERN(void) jpeg_write_m_byte
+	JPP((j_compress_ptr cinfo, int val));
+
+/* Alternate compression function: just write an abbreviated table file */
+EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo));
+
+/* Decompression startup: read start of JPEG datastream to see what's there */
+EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
+				  wxjpeg_boolean require_image));
+/* Return value is one of: */
+#define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */
+#define JPEG_HEADER_OK		1 /* Found valid image datastream */
+#define JPEG_HEADER_TABLES_ONLY	2 /* Found valid table-specs-only datastream */
+/* If you pass require_image = TRUE (normal case), you need not check for
+ * a TABLES_ONLY return code; an abbreviated file will cause an error exit.
+ * JPEG_SUSPENDED is only possible if you use a data source module that can
+ * give a suspension return (the stdio source module doesn't).
+ */
+
+/* Main entry points for decompression */
+EXTERN(wxjpeg_boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
+EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
+					    JSAMPARRAY scanlines,
+					    JDIMENSION max_lines));
+EXTERN(wxjpeg_boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
+
+/* Replaces jpeg_read_scanlines when reading raw downsampled data. */
+EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
+					   JSAMPIMAGE data,
+					   JDIMENSION max_lines));
+
+/* Additional entry points for buffered-image mode. */
+EXTERN(wxjpeg_boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
+EXTERN(wxjpeg_boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
+				       int scan_number));
+EXTERN(wxjpeg_boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
+EXTERN(wxjpeg_boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
+EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
+EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
+/* Return value is one of: */
+/* #define JPEG_SUSPENDED	0    Suspended due to lack of input data */
+#define JPEG_REACHED_SOS	1 /* Reached start of new scan */
+#define JPEG_REACHED_EOI	2 /* Reached end of image */
+#define JPEG_ROW_COMPLETED	3 /* Completed one iMCU row */
+#define JPEG_SCAN_COMPLETED	4 /* Completed last iMCU row of a scan */
+
+/* Precalculate output dimensions for current decompression parameters. */
+EXTERN(void) jpeg_calc_output_dimensions JPP((j_decompress_ptr cinfo));
+
+/* Control saving of COM and APPn markers into marker_list. */
+EXTERN(void) jpeg_save_markers
+	JPP((j_decompress_ptr cinfo, int marker_code,
+	     unsigned int length_limit));
+
+/* Install a special processing method for COM or APPn markers. */
+EXTERN(void) jpeg_set_marker_processor
+	JPP((j_decompress_ptr cinfo, int marker_code,
+	     jpeg_marker_parser_method routine));
+
+/* Read or write raw DCT coefficients --- useful for lossless transcoding. */
+EXTERN(jvirt_barray_ptr *) jpeg_read_coefficients JPP((j_decompress_ptr cinfo));
+EXTERN(void) jpeg_write_coefficients JPP((j_compress_ptr cinfo,
+					  jvirt_barray_ptr * coef_arrays));
+EXTERN(void) jpeg_copy_critical_parameters JPP((j_decompress_ptr srcinfo,
+						j_compress_ptr dstinfo));
+
+/* If you choose to abort compression or decompression before completing
+ * jpeg_finish_(de)compress, then you need to clean up to release memory,
+ * temporary files, etc.  You can just call jpeg_destroy_(de)compress
+ * if you're done with the JPEG object, but if you want to clean it up and
+ * reuse it, call this:
+ */
+EXTERN(void) jpeg_abort_compress JPP((j_compress_ptr cinfo));
+EXTERN(void) jpeg_abort_decompress JPP((j_decompress_ptr cinfo));
+
+/* Generic versions of jpeg_abort and jpeg_destroy that work on either
+ * flavor of JPEG object.  These may be more convenient in some places.
+ */
+EXTERN(void) jpeg_abort JPP((j_common_ptr cinfo));
+EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
+
+/* Default restart-marker-resync procedure for use by data source modules */
+EXTERN(wxjpeg_boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
+					    int desired));
+
+
+/* These marker codes are exported since applications and data source modules
+ * are likely to want to use them.
+ */
+
+#define JPEG_RST0	0xD0	/* RST0 marker code */
+#define JPEG_EOI	0xD9	/* EOI marker code */
+#define JPEG_APP0	0xE0	/* APP0 marker code */
+#define JPEG_COM	0xFE	/* COM marker code */
+
+
+/* If we have a brain-damaged compiler that emits warnings (or worse, errors)
+ * for structure definitions that are never filled in, keep it quiet by
+ * supplying dummy definitions for the various substructures.
+ */
+
+#ifdef INCOMPLETE_TYPES_BROKEN
+#ifndef JPEG_INTERNALS		/* will be defined in jpegint.h */
+struct jvirt_sarray_control { long dummy; };
+struct jvirt_barray_control { long dummy; };
+struct jpeg_comp_master { long dummy; };
+struct jpeg_c_main_controller { long dummy; };
+struct jpeg_c_prep_controller { long dummy; };
+struct jpeg_c_coef_controller { long dummy; };
+struct jpeg_marker_writer { long dummy; };
+struct jpeg_color_converter { long dummy; };
+struct jpeg_downsampler { long dummy; };
+struct jpeg_forward_dct { long dummy; };
+struct jpeg_entropy_encoder { long dummy; };
+struct jpeg_decomp_master { long dummy; };
+struct jpeg_d_main_controller { long dummy; };
+struct jpeg_d_coef_controller { long dummy; };
+struct jpeg_d_post_controller { long dummy; };
+struct jpeg_input_controller { long dummy; };
+struct jpeg_marker_reader { long dummy; };
+struct jpeg_entropy_decoder { long dummy; };
+struct jpeg_inverse_dct { long dummy; };
+struct jpeg_upsampler { long dummy; };
+struct jpeg_color_deconverter { long dummy; };
+struct jpeg_color_quantizer { long dummy; };
+#endif /* JPEG_INTERNALS */
+#endif /* INCOMPLETE_TYPES_BROKEN */
+
+
+/*
+ * The JPEG library modules define JPEG_INTERNALS before including this file.
+ * The internal structure declarations are read only when that is true.
+ * Applications using the library should not include jpegint.h, but may wish
+ * to include jerror.h.
+ */
+
+#ifdef JPEG_INTERNALS
+#include "jpegint.h"		/* fetch private declarations */
+#include "jerror.h"		/* fetch error codes too */
+#endif
+
+#endif /* JPEGLIB_H */
diff --git a/Source/3rd Party/wx/src/jpeg/jpegtran.c b/Source/3rd Party/wx/src/jpeg/jpegtran.c
new file mode 100644
index 000000000..c81a62656
--- /dev/null
+++ b/Source/3rd Party/wx/src/jpeg/jpegtran.c	
@@ -0,0 +1,504 @@
+/*
+ * jpegtran.c
+ *
+ * Copyright (C) 1995-1997, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains a command-line user interface for JPEG transcoding.
+ * It is very similar to cjpeg.c, but provides lossless transcoding between
+ * different JPEG file formats.  It also provides some lossless and sort-of-
+ * lossless transformations of JPEG data.
+ */
+
+#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
+#include "transupp.h"		/* Support routines for jpegtran */
+#include "jversion.h"		/* for version message */
+
+#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */
+#ifdef __MWERKS__
+#include <SIOUX.h>              /* Metrowerks needs this */
+#include <console.h>		/* ... and this */
+#endif
+#ifdef THINK_C
+#include <console.h>		/* Think declares it here */
+#endif
+#endif
+
+
+/*
+ * Argument-parsing code.
+ * The switch parser is designed to be useful with DOS-style command line
+ * syntax, ie, intermixed switches and file names, where only the switches
+ * to the left of a given file name affect processing of that file.
+ * The main program in this file doesn't actually use this capability...
+ */
+
+
+static const char * progname;	/* program name for error messages */
+static char * outfilename;	/* for -outfile switch */
+static JCOPY_OPTION copyoption;	/* -copy switch */
+static jpeg_transform_info transformoption; /* image transformation options */
+
+
+LOCAL(void)
+usage (void)
+/* complain about bad command line */
+{
+  fprintf(stderr, "usage: %s [switches] ", progname);
+#ifdef TWO_FILE_COMMANDLINE
+  fprintf(stderr, "inputfile outputfile\n");
+#else
+  fprintf(stderr, "[inputfile]\n");
+#endif
+
+  fprintf(stderr, "Switches (names may be abbreviated):\n");
+  fprintf(stderr, "  -copy none     Copy no extra markers from source file\n");
+  fprintf(stderr, "  -copy comments Copy only comment markers (default)\n");
+  fprintf(stderr, "  -copy all      Copy all extra markers\n");
+#ifdef ENTROPY_OPT_SUPPORTED
+  fprintf(stderr, "  -optimize      Optimize Huffman table (smaller file, but slow compression)\n");
+#endif
+#ifdef C_PROGRESSIVE_SUPPORTED
+  fprintf(stderr, "  -progressive   Create progressive JPEG file\n");
+#endif
+#if TRANSFORMS_SUPPORTED
+  fprintf(stderr, "Switches for modifying the image:\n");
+  fprintf(stderr, "  -grayscale     Reduce to grayscale (omit color data)\n");
+  fprintf(stderr, "  -flip [horizontal|vertical]  Mirror image (left-right or top-bottom)\n");
+  fprintf(stderr, "  -rotate [90|180|270]         Rotate image (degrees clockwise)\n");
+  fprintf(stderr, "  -transpose     Transpose image\n");
+  fprintf(stderr, "  -transverse    Transverse transpose image\n");
+  fprintf(stderr, "  -trim          Drop non-transformable edge blocks\n");
+#endif /* TRANSFORMS_SUPPORTED */
+  fprintf(stderr, "Switches for advanced users:\n");
+  fprintf(stderr, "  -restart N     Set restart interval in rows, or in blocks with B\n");
+  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");
+  fprintf(stderr, "  -outfile name  Specify name for output file\n");
+  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");
+  fprintf(stderr, "Switches for wizards:\n");
+#ifdef C_ARITH_CODING_SUPPORTED
+  fprintf(stderr, "  -arithmetic    Use arithmetic coding\n");
+#endif
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+  fprintf(stderr, "  -scans file    Create multi-scan JPEG per script file\n");
+#endif
+  exit(EXIT_FAILURE);
+}
+
+
+LOCAL(void)
+select_transform (JXFORM_CODE transform)
+/* Silly little routine to detect multiple transform options,
+ * which we can't handle.
+ */
+{
+#if TRANSFORMS_SUPPORTED
+  if (transformoption.transform == JXFORM_NONE ||
+      transformoption.transform == transform) {
+    transformoption.transform = transform;
+  } else {
+    fprintf(stderr, "%s: can only do one image transformation at a time\n",
+	    progname);
+    usage();
+  }
+#else
+  fprintf(stderr, "%s: sorry, image transformation was not compiled\n",
+	  progname);
+  exit(EXIT_FAILURE);
+#endif
+}
+
+
+LOCAL(int)
+parse_switches (j_compress_ptr cinfo, int argc, char **argv,
+		int last_file_arg_seen, wxjpeg_boolean for_real)
+/* Parse optional switches.
+ * Returns argv[] index of first file-name argument (== argc if none).
+ * Any file names with indexes <= last_file_arg_seen are ignored;
+ * they have presumably been processed in a previous iteration.
+ * (Pass 0 for last_file_arg_seen on the first or only iteration.)
+ * for_real is FALSE on the first (dummy) pass; we may skip any expensive
+ * processing.
+ */
+{
+  int argn;
+  char * arg;
+  wxjpeg_boolean simple_progressive;
+  char * scansarg = NULL;	/* saves -scans parm if any */
+
+  /* Set up default JPEG parameters. */
+  simple_progressive = FALSE;
+  outfilename = NULL;
+  copyoption = JCOPYOPT_DEFAULT;
+  transformoption.transform = JXFORM_NONE;
+  transformoption.trim = FALSE;
+  transformoption.force_grayscale = FALSE;
+  cinfo->err->trace_level = 0;
+
+  /* Scan command line options, adjust parameters */
+
+  for (argn = 1; argn < argc; argn++) {
+    arg = argv[argn];
+    if (*arg != '-') {
+      /* Not a switch, must be a file name argument */
+      if (argn <= last_file_arg_seen) {
+	outfilename = NULL;	/* -outfile applies to just one input file */
+	continue;		/* ignore this name if previously processed */
+      }
+      break;			/* else done parsing switches */
+    }
+    arg++;			/* advance past switch marker character */
+
+    if (keymatch(arg, "arithmetic", 1)) {
+      /* Use arithmetic coding. */
+#ifdef C_ARITH_CODING_SUPPORTED
+      cinfo->arith_code = TRUE;
+#else
+      fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "copy", 1)) {
+      /* Select which extra markers to copy. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (keymatch(argv[argn], "none", 1)) {
+	copyoption = JCOPYOPT_NONE;
+      } else if (keymatch(argv[argn], "comments", 1)) {
+	copyoption = JCOPYOPT_COMMENTS;
+      } else if (keymatch(argv[argn], "all", 1)) {
+	copyoption = JCOPYOPT_ALL;
+      } else
+	usage();
+
+    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
+      /* Enable debug printouts. */
+      /* On first -d, print version identification */
+      static wxjpeg_boolean printed_version = FALSE;
+
+      if (! printed_version) {
+	fprintf(stderr, "Independent JPEG Group's JPEGTRAN, version %s\n%s\n",
+		JVERSION, JCOPYRIGHT);
+	printed_version = TRUE;
+      }
+      cinfo->err->trace_level++;
+
+    } else if (keymatch(arg, "flip", 1)) {
+      /* Mirror left-right or top-bottom. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (keymatch(argv[argn], "horizontal", 1))
+	select_transform(JXFORM_FLIP_H);
+      else if (keymatch(argv[argn], "vertical", 1))
+	select_transform(JXFORM_FLIP_V);
+      else
+	usage();
+
+    } else if (keymatch(arg, "grayscale", 1) || keymatch(arg, "greyscale",1)) {
+      /* Force to grayscale. */
+#if TRANSFORMS_SUPPORTED
+      transformoption.force_grayscale = TRUE;
+#else
+      select_transform(JXFORM_NONE);	/* force an error */
+#endif
+
+    } else if (keymatch(arg, "maxmemory", 3)) {
+      /* Maximum memory in Kb (or Mb with 'm'). */
+      long lval;
+      char ch = 'x';
+
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
+	usage();
+      if (ch == 'm' || ch == 'M')
+	lval *= 1000L;
+      cinfo->mem->max_memory_to_use = lval * 1000L;
+
+    } else if (keymatch(arg, "optimize", 1) || keymatch(arg, "optimise", 1)) {
+      /* Enable entropy parm optimization. */
+#ifdef ENTROPY_OPT_SUPPORTED
+      cinfo->optimize_coding = TRUE;
+#else
+      fprintf(stderr, "%s: sorry, entropy optimization was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "outfile", 4)) {
+      /* Set output file name. */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      outfilename = argv[argn];	/* save it away for later use */
+
+    } else if (keymatch(arg, "progressive", 1)) {
+      /* Select simple progressive mode. */
+#ifdef C_PROGRESSIVE_SUPPORTED
+      simple_progressive = TRUE;
+      /* We must postpone execution until num_components is known. */
+#else
+      fprintf(stderr, "%s: sorry, progressive output was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "restart", 1)) {
+      /* Restart interval in MCU rows (or in MCUs with 'b'). */
+      long lval;
+      char ch = 'x';
+
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
+	usage();
+      if (lval < 0 || lval > 65535L)
+	usage();
+      if (ch == 'b' || ch == 'B') {
+	cinfo->restart_interval = (unsigned int) lval;
+	cinfo->restart_in_rows = 0; /* else prior '-restart n' overrides me */
+      } else {
+	cinfo->restart_in_rows = (int) lval;
+	/* restart_interval will be computed during startup */
+      }
+
+    } else if (keymatch(arg, "rotate", 2)) {
+      /* Rotate 90, 180, or 270 degrees (measured clockwise). */
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      if (keymatch(argv[argn], "90", 2))
+	select_transform(JXFORM_ROT_90);
+      else if (keymatch(argv[argn], "180", 3))
+	select_transform(JXFORM_ROT_180);
+      else if (keymatch(argv[argn], "270", 3))
+	select_transform(JXFORM_ROT_270);
+      else
+	usage();
+
+    } else if (keymatch(arg, "scans", 1)) {
+      /* Set scan script. */
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+      if (++argn >= argc)	/* advance to next argument */
+	usage();
+      scansarg = argv[argn];
+      /* We must postpone reading the file in case -progressive appears. */
+#else
+      fprintf(stderr, "%s: sorry, multi-scan output was not compiled\n",
+	      progname);
+      exit(EXIT_FAILURE);
+#endif
+
+    } else if (keymatch(arg, "transpose", 1)) {
+      /* Transpose (across UL-to-LR axis). */
+      select_transform(JXFORM_TRANSPOSE);
+
+    } else if (keymatch(arg, "transverse", 6)) {
+      /* Transverse transpose (across UR-to-LL axis). */
+      select_transform(JXFORM_TRANSVERSE);
+
+    } else if (keymatch(arg, "trim", 3)) {
+      /* Trim off any partial edge MCUs that the transform can't handle. */
+      transformoption.trim = TRUE;
+
+    } else {
+      usage();			/* bogus switch */
+    }
+  }
+
+  /* Post-switch-scanning cleanup */
+
+  if (for_real) {
+
+#ifdef C_PROGRESSIVE_SUPPORTED
+    if (simple_progressive)	/* process -progressive; -scans can override */
+      jpeg_simple_progression(cinfo);
+#endif
+
+#ifdef C_MULTISCAN_FILES_SUPPORTED
+    if (scansarg != NULL)	/* process -scans if it was present */
+      if (! read_scan_script(cinfo, scansarg))
+	usage();
+#endif
+  }
+
+  return argn;			/* return index of next arg (file name) */
+}
+
+
+/*
+ * The main program.
+ */
+
+int
+main (int argc, char **argv)
+{
+  struct jpeg_decompress_struct srcinfo;
+  struct jpeg_compress_struct dstinfo;
+  struct jpeg_error_mgr jsrcerr, jdsterr;
+#ifdef PROGRESS_REPORT
+  struct cdjpeg_progress_mgr progress;
+#endif
+  jvirt_barray_ptr * src_coef_arrays;
+  jvirt_barray_ptr * dst_coef_arrays;
+  int file_index;
+  FILE * input_file;
+  FILE * output_file;
+
+  /* On Mac, fetch a command line. */
+#ifdef USE_CCOMMAND
+  argc = ccommand(&argv);
+#endif
+
+  progname = argv[0];
+  if (progname == NULL || progname[0] == 0)
+    progname = "jpegtran";	/* in case C library doesn't provide it */
+
+  /* Initialize the JPEG decompression object with default error handling. */
+  srcinfo.err = jpeg_std_error(&jsrcerr);
+  jpeg_create_decompress(&srcinfo);
+  /* Initialize the JPEG compression object with default error handling. */
+  dstinfo.err = jpeg_std_error(&jdsterr);
+  jpeg_create_compress(&dstinfo);
+
+  /* Now safe to enable signal catcher.
+   * Note: we assume only the decompression object will have virtual arrays.
+   */
+#ifdef NEED_SIGNAL_CATCHER
+  enable_signal_catcher((j_common_ptr) &srcinfo);
+#endif
+
+  /* Scan command line to find file names.
+   * It is convenient to use just one switch-parsing routine, but the switch
+   * values read here are mostly ignored; we will rescan the switches after
+   * opening the input file.  Also note that most of the switches affect the
+   * destination JPEG object, so we parse into that and then copy over what
+   * needs to affects the source too.
+   */
+
+  file_index = parse_switches(&dstinfo, argc, argv, 0, FALSE);
+  jsrcerr.trace_level = jdsterr.trace_level;
+  srcinfo.mem->max_memory_to_use = dstinfo.mem->max_memory_to_use;
+
+#ifdef TWO_FILE_COMMANDLINE
+  /* Must have either -outfile switch or explicit output file name */
+  if (outfilename == NULL) {
+    if (file_index != argc-2) {
+      fprintf(stderr, "%s: must name one input and one output file\n",
+	      progname);
+      usage();
+    }
+    outfilename = argv[file_index+1];
+  } else {
+    if (file_index != argc-1) {
+      fprintf(stderr, "%s: must name one input and one output file\n",
+	      progname);
+      usage();
+    }
+  }
+#else
+  /* Unix style: expect zero or one file name */
+  if (file_index < argc-1) {
+    fprintf(stderr, "%s: only one input file\n", progname);
+    usage();
+  }
+#endif /* TWO_FILE_COMMANDLINE */
+
+  /* Open the input file. */
+  if (file_index < argc) {
+    if ((input_file = fopen(argv[file_index], READ_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, argv[file_index]);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default input file is stdin */
+    input_file = read_stdin();
+  }
+
+  /* Open the output file. */
+  if (outfilename != NULL) {
+    if ((output_file = fopen(outfilename, WRITE_BINARY)) == NULL) {
+      fprintf(stderr, "%s: can't open %s\n", progname, outfilename);
+      exit(EXIT_FAILURE);
+    }
+  } else {
+    /* default output file is stdout */
+    output_file = write_stdout();
+  }
+
+#ifdef PROGRESS_REPORT
+  start_progress_monitor((j_common_ptr) &dstinfo, &progress);
+#endif
+
+  /* Specify data source for decompression */
+  jpeg_stdio_src(&srcinfo, input_file);
+
+  /* Enable saving of extra markers that we want to copy */
+  jcopy_markers_setup(&srcinfo, copyoption);
+
+  /* Read file header */
+  (void) jpeg_read_header(&srcinfo, TRUE);
+
+  /* Any space needed by a transform option must be requested before
+   * jpeg_read_coefficients so that memory allocation will be done right.
+   */
+#if TRANSFORMS_SUPPORTED
+  jtransform_request_workspace(&srcinfo, &transformoption);
+#endif
+
+  /* Read source file as DCT coefficients */
+  src_coef_arrays = jpeg_read_coefficients(&srcinfo);
+
+  /* Initialize destination compression parameters from source values */
+  jpeg_copy_critical_parameters(&srcinfo, &dstinfo);
+
+  /* Adjust destination parameters if required by transform options;
+   * also find out which set of coefficient arrays will hold the output.
+   */
+#if TRANSFORMS_SUPPORTED
+  dst_coef_arrays = jtransform_adjust_parameters(&srcinfo, &dstinfo,
+						 src_coef_arrays,
+						 &transformoption);
+#else
+  dst_coef_arrays = src_coef_arrays;
+#endif
+
+  /* Adjust default compression parameters by re-parsing the options */
+  file_index = parse_switches(&dstinfo, argc, argv, 0, TRUE);
+
+  /* Specify data destination for compression */
+  jpeg_stdio_dest(&dstinfo, output_file);
+
+  /* Start compressor (note no image data is actually written here) */
+  jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
+
+  /* Copy to the output file any extra markers that we want to preserve */
+  jcopy_markers_execute(&srcinfo, &dstinfo, copyoption);
+
+  /* Execute image transformation, if any */
+#if TRANSFORMS_SUPPORTED
+  jtransform_execute_transformation(&srcinfo, &dstinfo,
+				    src_coef_arrays,
+				    &transformoption);
+#endif
+
+  /* Finish compression and release memory */
+  jpeg_finish_compress(&dstinfo);
+  jpeg_destroy_compress(&dstinfo);
+  (void) jpeg_finish_decompress(&srcinfo);
+  jpeg_destroy_decompress(&srcinfo);
+
+  /* Close files, if we opened them */
+  if (input_file != stdin)
+    fclose(input_file);
+  if (output_file != stdout)
+    fclose(output_file);
+
+#ifdef PROGRESS_REPORT
+  end_progress_monitor((j_common_ptr) &dstinfo);
+#endif
+
+  /* All done. */
+  exit(jsrcerr.num_warnings + jdsterr.num_warnings ?EXIT_WARNING:EXIT_SUCCESS);
+  return 0;			/* suppress no-return-value warnings */
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jquant1.c b/Source/3rd Party/wx/src/jpeg/jquant1.c
index 8b1b7e06f..f6d221f5f 100644
--- a/Source/3rd Party/wx/src/jpeg/jquant1.c	
+++ b/Source/3rd Party/wx/src/jpeg/jquant1.c	
@@ -1,856 +1,856 @@
-/*
- * jquant1.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains 1-pass color quantization (color mapping) routines.
- * These routines provide mapping to a fixed color map using equally spaced
- * color values.  Optional Floyd-Steinberg or ordered dithering is available.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-#ifdef QUANT_1PASS_SUPPORTED
-
-
-/*
- * The main purpose of 1-pass quantization is to provide a fast, if not very
- * high quality, colormapped output capability.  A 2-pass quantizer usually
- * gives better visual quality; however, for quantized grayscale output this
- * quantizer is perfectly adequate.  Dithering is highly recommended with this
- * quantizer, though you can turn it off if you really want to.
- *
- * In 1-pass quantization the colormap must be chosen in advance of seeing the
- * image.  We use a map consisting of all combinations of Ncolors[i] color
- * values for the i'th component.  The Ncolors[] values are chosen so that
- * their product, the total number of colors, is no more than that requested.
- * (In most cases, the product will be somewhat less.)
- *
- * Since the colormap is orthogonal, the representative value for each color
- * component can be determined without considering the other components;
- * then these indexes can be combined into a colormap index by a standard
- * N-dimensional-array-subscript calculation.  Most of the arithmetic involved
- * can be precalculated and stored in the lookup table colorindex[].
- * colorindex[i][j] maps pixel value j in component i to the nearest
- * representative value (grid plane) for that component; this index is
- * multiplied by the array stride for component i, so that the
- * index of the colormap entry closest to a given pixel value is just
- *    sum( colorindex[component-number][pixel-component-value] )
- * Aside from being fast, this scheme allows for variable spacing between
- * representative values with no additional lookup cost.
- *
- * If gamma correction has been applied in color conversion, it might be wise
- * to adjust the color grid spacing so that the representative colors are
- * equidistant in linear space.  At this writing, gamma correction is not
- * implemented by jdcolor, so nothing is done here.
- */
-
-
-/* Declarations for ordered dithering.
- *
- * We use a standard 16x16 ordered dither array.  The basic concept of ordered
- * dithering is described in many references, for instance Dale Schumacher's
- * chapter II.2 of Graphics Gems II (James Arvo, ed. Academic Press, 1991).
- * In place of Schumacher's comparisons against a "threshold" value, we add a
- * "dither" value to the input pixel and then round the result to the nearest
- * output value.  The dither value is equivalent to (0.5 - threshold) times
- * the distance between output values.  For ordered dithering, we assume that
- * the output colors are equally spaced; if not, results will probably be
- * worse, since the dither may be too much or too little at a given point.
- *
- * The normal calculation would be to form pixel value + dither, range-limit
- * this to 0..MAXJSAMPLE, and then index into the colorindex table as usual.
- * We can skip the separate range-limiting step by extending the colorindex
- * table in both directions.
- */
-
-#define ODITHER_SIZE  16	/* dimension of dither matrix */
-/* NB: if ODITHER_SIZE is not a power of 2, ODITHER_MASK uses will break */
-#define ODITHER_CELLS (ODITHER_SIZE*ODITHER_SIZE)	/* # cells in matrix */
-#define ODITHER_MASK  (ODITHER_SIZE-1) /* mask for wrapping around counters */
-
-typedef int ODITHER_MATRIX[ODITHER_SIZE][ODITHER_SIZE];
-typedef int (*ODITHER_MATRIX_PTR)[ODITHER_SIZE];
-
-static const UINT8 base_dither_matrix[ODITHER_SIZE][ODITHER_SIZE] = {
-  /* Bayer's order-4 dither array.  Generated by the code given in
-   * Stephen Hawley's article "Ordered Dithering" in Graphics Gems I.
-   * The values in this array must range from 0 to ODITHER_CELLS-1.
-   */
-  {   0,192, 48,240, 12,204, 60,252,  3,195, 51,243, 15,207, 63,255 },
-  { 128, 64,176,112,140, 76,188,124,131, 67,179,115,143, 79,191,127 },
-  {  32,224, 16,208, 44,236, 28,220, 35,227, 19,211, 47,239, 31,223 },
-  { 160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95 },
-  {   8,200, 56,248,  4,196, 52,244, 11,203, 59,251,  7,199, 55,247 },
-  { 136, 72,184,120,132, 68,180,116,139, 75,187,123,135, 71,183,119 },
-  {  40,232, 24,216, 36,228, 20,212, 43,235, 27,219, 39,231, 23,215 },
-  { 168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87 },
-  {   2,194, 50,242, 14,206, 62,254,  1,193, 49,241, 13,205, 61,253 },
-  { 130, 66,178,114,142, 78,190,126,129, 65,177,113,141, 77,189,125 },
-  {  34,226, 18,210, 46,238, 30,222, 33,225, 17,209, 45,237, 29,221 },
-  { 162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93 },
-  {  10,202, 58,250,  6,198, 54,246,  9,201, 57,249,  5,197, 53,245 },
-  { 138, 74,186,122,134, 70,182,118,137, 73,185,121,133, 69,181,117 },
-  {  42,234, 26,218, 38,230, 22,214, 41,233, 25,217, 37,229, 21,213 },
-  { 170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85 }
-};
-
-
-/* Declarations for Floyd-Steinberg dithering.
- *
- * Errors are accumulated into the array fserrors[], at a resolution of
- * 1/16th of a pixel count.  The error at a given pixel is propagated
- * to its not-yet-processed neighbors using the standard F-S fractions,
- *		...	(here)	7/16
- *		3/16	5/16	1/16
- * We work left-to-right on even rows, right-to-left on odd rows.
- *
- * We can get away with a single array (holding one row's worth of errors)
- * by using it to store the current row's errors at pixel columns not yet
- * processed, but the next row's errors at columns already processed.  We
- * need only a few extra variables to hold the errors immediately around the
- * current column.  (If we are lucky, those variables are in registers, but
- * even if not, they're probably cheaper to access than array elements are.)
- *
- * The fserrors[] array is indexed [component#][position].
- * We provide (#columns + 2) entries per component; the extra entry at each
- * end saves us from special-casing the first and last pixels.
- *
- * Note: on a wide image, we might not have enough room in a PC's near data
- * segment to hold the error array; so it is allocated with alloc_large.
- */
-
-#if BITS_IN_JSAMPLE == 8
-typedef INT16 FSERROR;		/* 16 bits should be enough */
-typedef int LOCFSERROR;		/* use 'int' for calculation temps */
-#else
-typedef JPEG_INT32 FSERROR;		/* may need more than 16 bits */
-typedef JPEG_INT32 LOCFSERROR;	/* be sure calculation temps are big enough */
-#endif
-
-typedef FSERROR FAR *FSERRPTR;	/* pointer to error array (in FAR storage!) */
-
-
-/* Private subobject */
-
-#define MAX_Q_COMPS 4		/* max components I can handle */
-
-typedef struct {
-  struct jpeg_color_quantizer pub; /* public fields */
-
-  /* Initially allocated colormap is saved here */
-  JSAMPARRAY sv_colormap;	/* The color map as a 2-D pixel array */
-  int sv_actual;		/* number of entries in use */
-
-  JSAMPARRAY colorindex;	/* Precomputed mapping for speed */
-  /* colorindex[i][j] = index of color closest to pixel value j in component i,
-   * premultiplied as described above.  Since colormap indexes must fit into
-   * JSAMPLEs, the entries of this array will too.
-   */
-  wxjpeg_boolean is_padded;		/* is the colorindex padded for odither? */
-
-  int Ncolors[MAX_Q_COMPS];	/* # of values alloced to each component */
-
-  /* Variables for ordered dithering */
-  int row_index;		/* cur row's vertical index in dither matrix */
-  ODITHER_MATRIX_PTR odither[MAX_Q_COMPS]; /* one dither array per component */
-
-  /* Variables for Floyd-Steinberg dithering */
-  FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */
-  wxjpeg_boolean on_odd_row;		/* flag to remember which row we are on */
-} my_cquantizer;
-
-typedef my_cquantizer * my_cquantize_ptr;
-
-
-/*
- * Policy-making subroutines for create_colormap and create_colorindex.
- * These routines determine the colormap to be used.  The rest of the module
- * only assumes that the colormap is orthogonal.
- *
- *  * select_ncolors decides how to divvy up the available colors
- *    among the components.
- *  * output_value defines the set of representative values for a component.
- *  * largest_input_value defines the mapping from input values to
- *    representative values for a component.
- * Note that the latter two routines may impose different policies for
- * different components, though this is not currently done.
- */
-
-
-LOCAL(int)
-select_ncolors (j_decompress_ptr cinfo, int Ncolors[])
-/* Determine allocation of desired colors to components, */
-/* and fill in Ncolors[] array to indicate choice. */
-/* Return value is total number of colors (product of Ncolors[] values). */
-{
-  int nc = cinfo->out_color_components; /* number of color components */
-  int max_colors = cinfo->desired_number_of_colors;
-  int total_colors, iroot, i, j;
-  wxjpeg_boolean changed;
-  long temp;
-  static const int RGB_order[3] = { RGB_GREEN, RGB_RED, RGB_BLUE };
-
-  /* We can allocate at least the nc'th root of max_colors per component. */
-  /* Compute floor(nc'th root of max_colors). */
-  iroot = 1;
-  do {
-    iroot++;
-    temp = iroot;		/* set temp = iroot ** nc */
-    for (i = 1; i < nc; i++)
-      temp *= iroot;
-  } while (temp <= (long) max_colors); /* repeat till iroot exceeds root */
-  iroot--;			/* now iroot = floor(root) */
-
-  /* Must have at least 2 color values per component */
-  if (iroot < 2)
-    ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, (int) temp);
-
-  /* Initialize to iroot color values for each component */
-  total_colors = 1;
-  for (i = 0; i < nc; i++) {
-    Ncolors[i] = iroot;
-    total_colors *= iroot;
-  }
-  /* We may be able to increment the count for one or more components without
-   * exceeding max_colors, though we know not all can be incremented.
-   * Sometimes, the first component can be incremented more than once!
-   * (Example: for 16 colors, we start at 2*2*2, go to 3*2*2, then 4*2*2.)
-   * In RGB colorspace, try to increment G first, then R, then B.
-   */
-  do {
-    changed = FALSE;
-    for (i = 0; i < nc; i++) {
-      j = (cinfo->out_color_space == JCS_RGB ? RGB_order[i] : i);
-      /* calculate new total_colors if Ncolors[j] is incremented */
-      temp = total_colors / Ncolors[j];
-      temp *= Ncolors[j]+1;	/* done in long arith to avoid oflo */
-      if (temp > (long) max_colors)
-	break;			/* won't fit, done with this pass */
-      Ncolors[j]++;		/* OK, apply the increment */
-      total_colors = (int) temp;
-      changed = TRUE;
-    }
-  } while (changed);
-
-  return total_colors;
-}
-
-
-LOCAL(int)
-output_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
-/* Return j'th output value, where j will range from 0 to maxj */
-/* The output values must fall in 0..MAXJSAMPLE in increasing order */
-{
-  /* We always provide values 0 and MAXJSAMPLE for each component;
-   * any additional values are equally spaced between these limits.
-   * (Forcing the upper and lower values to the limits ensures that
-   * dithering can't produce a color outside the selected gamut.)
-   */
-  return (int) (((JPEG_INT32) j * MAXJSAMPLE + maxj/2) / maxj);
-}
-
-
-LOCAL(int)
-largest_input_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
-/* Return largest input value that should map to j'th output value */
-/* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
-{
-  /* Breakpoints are halfway between values returned by output_value */
-  return (int) (((JPEG_INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));
-}
-
-
-/*
- * Create the colormap.
- */
-
-LOCAL(void)
-create_colormap (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  JSAMPARRAY colormap;		/* Created colormap */
-  int total_colors;		/* Number of distinct output colors */
-  int i,j,k, nci, blksize, blkdist, ptr, val;
-
-  /* Select number of colors for each component */
-  total_colors = select_ncolors(cinfo, cquantize->Ncolors);
-
-  /* Report selected color counts */
-  if (cinfo->out_color_components == 3)
-    TRACEMS4(cinfo, 1, JTRC_QUANT_3_NCOLORS,
-	     total_colors, cquantize->Ncolors[0],
-	     cquantize->Ncolors[1], cquantize->Ncolors[2]);
-  else
-    TRACEMS1(cinfo, 1, JTRC_QUANT_NCOLORS, total_colors);
-
-  /* Allocate and fill in the colormap. */
-  /* The colors are ordered in the map in standard row-major order, */
-  /* i.e. rightmost (highest-indexed) color changes most rapidly. */
-
-  colormap = (*cinfo->mem->alloc_sarray)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE,
-     (JDIMENSION) total_colors, (JDIMENSION) cinfo->out_color_components);
-
-  /* blksize is number of adjacent repeated entries for a component */
-  /* blkdist is distance between groups of identical entries for a component */
-  blkdist = total_colors;
-
-  for (i = 0; i < cinfo->out_color_components; i++) {
-    /* fill in colormap entries for i'th color component */
-    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
-    blksize = blkdist / nci;
-    for (j = 0; j < nci; j++) {
-      /* Compute j'th output value (out of nci) for component */
-      val = output_value(cinfo, i, j, nci-1);
-      /* Fill in all colormap entries that have this value of this component */
-      for (ptr = j * blksize; ptr < total_colors; ptr += blkdist) {
-	/* fill in blksize entries beginning at ptr */
-	for (k = 0; k < blksize; k++)
-	  colormap[i][ptr+k] = (JSAMPLE) val;
-      }
-    }
-    blkdist = blksize;		/* blksize of this color is blkdist of next */
-  }
-
-  /* Save the colormap in private storage,
-   * where it will survive color quantization mode changes.
-   */
-  cquantize->sv_colormap = colormap;
-  cquantize->sv_actual = total_colors;
-}
-
-
-/*
- * Create the color index table.
- */
-
-LOCAL(void)
-create_colorindex (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  JSAMPROW indexptr;
-  int i,j,k, nci, blksize, val, pad;
-
-  /* For ordered dither, we pad the color index tables by MAXJSAMPLE in
-   * each direction (input index values can be -MAXJSAMPLE .. 2*MAXJSAMPLE).
-   * This is not necessary in the other dithering modes.  However, we
-   * flag whether it was done in case user changes dithering mode.
-   */
-  if (cinfo->dither_mode == JDITHER_ORDERED) {
-    pad = MAXJSAMPLE*2;
-    cquantize->is_padded = TRUE;
-  } else {
-    pad = 0;
-    cquantize->is_padded = FALSE;
-  }
-
-  cquantize->colorindex = (*cinfo->mem->alloc_sarray)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE,
-     (JDIMENSION) (MAXJSAMPLE+1 + pad),
-     (JDIMENSION) cinfo->out_color_components);
-
-  /* blksize is number of adjacent repeated entries for a component */
-  blksize = cquantize->sv_actual;
-
-  for (i = 0; i < cinfo->out_color_components; i++) {
-    /* fill in colorindex entries for i'th color component */
-    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
-    blksize = blksize / nci;
-
-    /* adjust colorindex pointers to provide padding at negative indexes. */
-    if (pad)
-      cquantize->colorindex[i] += MAXJSAMPLE;
-
-    /* in loop, val = index of current output value, */
-    /* and k = largest j that maps to current val */
-    indexptr = cquantize->colorindex[i];
-    val = 0;
-    k = largest_input_value(cinfo, i, 0, nci-1);
-    for (j = 0; j <= MAXJSAMPLE; j++) {
-      while (j > k)		/* advance val if past boundary */
-	k = largest_input_value(cinfo, i, ++val, nci-1);
-      /* premultiply so that no multiplication needed in main processing */
-      indexptr[j] = (JSAMPLE) (val * blksize);
-    }
-    /* Pad at both ends if necessary */
-    if (pad)
-      for (j = 1; j <= MAXJSAMPLE; j++) {
-	indexptr[-j] = indexptr[0];
-	indexptr[MAXJSAMPLE+j] = indexptr[MAXJSAMPLE];
-      }
-  }
-}
-
-
-/*
- * Create an ordered-dither array for a component having ncolors
- * distinct output values.
- */
-
-LOCAL(ODITHER_MATRIX_PTR)
-make_odither_array (j_decompress_ptr cinfo, int ncolors)
-{
-  ODITHER_MATRIX_PTR odither;
-  int j,k;
-  JPEG_INT32 num,den;
-
-  odither = (ODITHER_MATRIX_PTR)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(ODITHER_MATRIX));
-  /* The inter-value distance for this color is MAXJSAMPLE/(ncolors-1).
-   * Hence the dither value for the matrix cell with fill order f
-   * (f=0..N-1) should be (N-1-2*f)/(2*N) * MAXJSAMPLE/(ncolors-1).
-   * On 16-bit-int machine, be careful to avoid overflow.
-   */
-  den = 2 * ODITHER_CELLS * ((JPEG_INT32) (ncolors - 1));
-  for (j = 0; j < ODITHER_SIZE; j++) {
-    for (k = 0; k < ODITHER_SIZE; k++) {
-      num = ((JPEG_INT32) (ODITHER_CELLS-1 - 2*((int)base_dither_matrix[j][k])))
-	    * MAXJSAMPLE;
-      /* Ensure round towards zero despite C's lack of consistency
-       * about rounding negative values in integer division...
-       */
-      odither[j][k] = (int) (num<0 ? -((-num)/den) : num/den);
-    }
-  }
-  return odither;
-}
-
-
-/*
- * Create the ordered-dither tables.
- * Components having the same number of representative colors may 
- * share a dither table.
- */
-
-LOCAL(void)
-create_odither_tables (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  ODITHER_MATRIX_PTR odither;
-  int i, j, nci;
-
-  for (i = 0; i < cinfo->out_color_components; i++) {
-    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
-    odither = NULL;		/* search for matching prior component */
-    for (j = 0; j < i; j++) {
-      if (nci == cquantize->Ncolors[j]) {
-	odither = cquantize->odither[j];
-	break;
-      }
-    }
-    if (odither == NULL)	/* need a new table? */
-      odither = make_odither_array(cinfo, nci);
-    cquantize->odither[i] = odither;
-  }
-}
-
-
-/*
- * Map some rows of pixels to the output colormapped representation.
- */
-
-METHODDEF(void)
-color_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		JSAMPARRAY output_buf, int num_rows)
-/* General case, no dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  JSAMPARRAY colorindex = cquantize->colorindex;
-  register int pixcode, ci;
-  register JSAMPROW ptrin, ptrout;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-  register int nc = cinfo->out_color_components;
-
-  for (row = 0; row < num_rows; row++) {
-    ptrin = input_buf[row];
-    ptrout = output_buf[row];
-    for (col = width; col > 0; col--) {
-      pixcode = 0;
-      for (ci = 0; ci < nc; ci++) {
-	pixcode += GETJSAMPLE(colorindex[ci][GETJSAMPLE(*ptrin++)]);
-      }
-      *ptrout++ = (JSAMPLE) pixcode;
-    }
-  }
-}
-
-
-METHODDEF(void)
-color_quantize3 (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		 JSAMPARRAY output_buf, int num_rows)
-/* Fast path for out_color_components==3, no dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register int pixcode;
-  register JSAMPROW ptrin, ptrout;
-  JSAMPROW colorindex0 = cquantize->colorindex[0];
-  JSAMPROW colorindex1 = cquantize->colorindex[1];
-  JSAMPROW colorindex2 = cquantize->colorindex[2];
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    ptrin = input_buf[row];
-    ptrout = output_buf[row];
-    for (col = width; col > 0; col--) {
-      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*ptrin++)]);
-      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*ptrin++)]);
-      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*ptrin++)]);
-      *ptrout++ = (JSAMPLE) pixcode;
-    }
-  }
-}
-
-
-METHODDEF(void)
-quantize_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		     JSAMPARRAY output_buf, int num_rows)
-/* General case, with ordered dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register JSAMPROW input_ptr;
-  register JSAMPROW output_ptr;
-  JSAMPROW colorindex_ci;
-  int * dither;			/* points to active row of dither matrix */
-  int row_index, col_index;	/* current indexes into dither matrix */
-  int nc = cinfo->out_color_components;
-  int ci;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    /* Initialize output values to 0 so can process components separately */
-    jzero_far((void FAR *) output_buf[row],
-	      (size_t) (width * SIZEOF(JSAMPLE)));
-    row_index = cquantize->row_index;
-    for (ci = 0; ci < nc; ci++) {
-      input_ptr = input_buf[row] + ci;
-      output_ptr = output_buf[row];
-      colorindex_ci = cquantize->colorindex[ci];
-      dither = cquantize->odither[ci][row_index];
-      col_index = 0;
-
-      for (col = width; col > 0; col--) {
-	/* Form pixel value + dither, range-limit to 0..MAXJSAMPLE,
-	 * select output value, accumulate into output code for this pixel.
-	 * Range-limiting need not be done explicitly, as we have extended
-	 * the colorindex table to produce the right answers for out-of-range
-	 * inputs.  The maximum dither is +- MAXJSAMPLE; this sets the
-	 * required amount of padding.
-	 */
-	*output_ptr += colorindex_ci[GETJSAMPLE(*input_ptr)+dither[col_index]];
-	input_ptr += nc;
-	output_ptr++;
-	col_index = (col_index + 1) & ODITHER_MASK;
-      }
-    }
-    /* Advance row index for next row */
-    row_index = (row_index + 1) & ODITHER_MASK;
-    cquantize->row_index = row_index;
-  }
-}
-
-
-METHODDEF(void)
-quantize3_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		      JSAMPARRAY output_buf, int num_rows)
-/* Fast path for out_color_components==3, with ordered dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register int pixcode;
-  register JSAMPROW input_ptr;
-  register JSAMPROW output_ptr;
-  JSAMPROW colorindex0 = cquantize->colorindex[0];
-  JSAMPROW colorindex1 = cquantize->colorindex[1];
-  JSAMPROW colorindex2 = cquantize->colorindex[2];
-  int * dither0;		/* points to active row of dither matrix */
-  int * dither1;
-  int * dither2;
-  int row_index, col_index;	/* current indexes into dither matrix */
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    row_index = cquantize->row_index;
-    input_ptr = input_buf[row];
-    output_ptr = output_buf[row];
-    dither0 = cquantize->odither[0][row_index];
-    dither1 = cquantize->odither[1][row_index];
-    dither2 = cquantize->odither[2][row_index];
-    col_index = 0;
-
-    for (col = width; col > 0; col--) {
-      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*input_ptr++) +
-					dither0[col_index]]);
-      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*input_ptr++) +
-					dither1[col_index]]);
-      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*input_ptr++) +
-					dither2[col_index]]);
-      *output_ptr++ = (JSAMPLE) pixcode;
-      col_index = (col_index + 1) & ODITHER_MASK;
-    }
-    row_index = (row_index + 1) & ODITHER_MASK;
-    cquantize->row_index = row_index;
-  }
-}
-
-
-METHODDEF(void)
-quantize_fs_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		    JSAMPARRAY output_buf, int num_rows)
-/* General case, with Floyd-Steinberg dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register LOCFSERROR cur;	/* current error or pixel value */
-  LOCFSERROR belowerr;		/* error for pixel below cur */
-  LOCFSERROR bpreverr;		/* error for below/prev col */
-  LOCFSERROR bnexterr;		/* error for below/next col */
-  LOCFSERROR delta;
-  register FSERRPTR errorptr;	/* => fserrors[] at column before current */
-  register JSAMPROW input_ptr;
-  register JSAMPROW output_ptr;
-  JSAMPROW colorindex_ci;
-  JSAMPROW colormap_ci;
-  int pixcode;
-  int nc = cinfo->out_color_components;
-  int dir;			/* 1 for left-to-right, -1 for right-to-left */
-  int dirnc;			/* dir * nc */
-  int ci;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-  JSAMPLE *range_limit = cinfo->sample_range_limit;
-  SHIFT_TEMPS
-
-  for (row = 0; row < num_rows; row++) {
-    /* Initialize output values to 0 so can process components separately */
-    jzero_far((void FAR *) output_buf[row],
-	      (size_t) (width * SIZEOF(JSAMPLE)));
-    for (ci = 0; ci < nc; ci++) {
-      input_ptr = input_buf[row] + ci;
-      output_ptr = output_buf[row];
-      if (cquantize->on_odd_row) {
-	/* work right to left in this row */
-	input_ptr += (width-1) * nc; /* so point to rightmost pixel */
-	output_ptr += width-1;
-	dir = -1;
-	dirnc = -nc;
-	errorptr = cquantize->fserrors[ci] + (width+1); /* => entry after last column */
-      } else {
-	/* work left to right in this row */
-	dir = 1;
-	dirnc = nc;
-	errorptr = cquantize->fserrors[ci]; /* => entry before first column */
-      }
-      colorindex_ci = cquantize->colorindex[ci];
-      colormap_ci = cquantize->sv_colormap[ci];
-      /* Preset error values: no error propagated to first pixel from left */
-      cur = 0;
-      /* and no error propagated to row below yet */
-      belowerr = bpreverr = 0;
-
-      for (col = width; col > 0; col--) {
-	/* cur holds the error propagated from the previous pixel on the
-	 * current line.  Add the error propagated from the previous line
-	 * to form the complete error correction term for this pixel, and
-	 * round the error term (which is expressed * 16) to an integer.
-	 * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
-	 * for either sign of the error value.
-	 * Note: errorptr points to *previous* column's array entry.
-	 */
-	cur = RIGHT_SHIFT(cur + errorptr[dir] + 8, 4);
-	/* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
-	 * The maximum error is +- MAXJSAMPLE; this sets the required size
-	 * of the range_limit array.
-	 */
-	cur += GETJSAMPLE(*input_ptr);
-	cur = GETJSAMPLE(range_limit[cur]);
-	/* Select output value, accumulate into output code for this pixel */
-	pixcode = GETJSAMPLE(colorindex_ci[cur]);
-	*output_ptr += (JSAMPLE) pixcode;
-	/* Compute actual representation error at this pixel */
-	/* Note: we can do this even though we don't have the final */
-	/* pixel code, because the colormap is orthogonal. */
-	cur -= GETJSAMPLE(colormap_ci[pixcode]);
-	/* Compute error fractions to be propagated to adjacent pixels.
-	 * Add these into the running sums, and simultaneously shift the
-	 * next-line error sums left by 1 column.
-	 */
-	bnexterr = cur;
-	delta = cur * 2;
-	cur += delta;		/* form error * 3 */
-	errorptr[0] = (FSERROR) (bpreverr + cur);
-	cur += delta;		/* form error * 5 */
-	bpreverr = belowerr + cur;
-	belowerr = bnexterr;
-	cur += delta;		/* form error * 7 */
-	/* At this point cur contains the 7/16 error value to be propagated
-	 * to the next pixel on the current line, and all the errors for the
-	 * next line have been shifted over. We are therefore ready to move on.
-	 */
-	input_ptr += dirnc;	/* advance input ptr to next column */
-	output_ptr += dir;	/* advance output ptr to next column */
-	errorptr += dir;	/* advance errorptr to current column */
-      }
-      /* Post-loop cleanup: we must unload the final error value into the
-       * final fserrors[] entry.  Note we need not unload belowerr because
-       * it is for the dummy column before or after the actual array.
-       */
-      errorptr[0] = (FSERROR) bpreverr; /* unload prev err into array */
-    }
-    cquantize->on_odd_row = (cquantize->on_odd_row ? FALSE : TRUE);
-  }
-}
-
-
-/*
- * Allocate workspace for Floyd-Steinberg errors.
- */
-
-LOCAL(void)
-alloc_fs_workspace (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  size_t arraysize;
-  int i;
-
-  arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));
-  for (i = 0; i < cinfo->out_color_components; i++) {
-    cquantize->fserrors[i] = (FSERRPTR)
-      (*cinfo->mem->alloc_large)((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);
-  }
-}
-
-
-/*
- * Initialize for one-pass color quantization.
- */
-
-METHODDEF(void)
-start_pass_1_quant (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  size_t arraysize;
-  int i;
-
-  /* Install my colormap. */
-  cinfo->colormap = cquantize->sv_colormap;
-  cinfo->actual_number_of_colors = cquantize->sv_actual;
-
-  /* Initialize for desired dithering mode. */
-  switch (cinfo->dither_mode) {
-  case JDITHER_NONE:
-    if (cinfo->out_color_components == 3)
-      cquantize->pub.color_quantize = color_quantize3;
-    else
-      cquantize->pub.color_quantize = color_quantize;
-    break;
-  case JDITHER_ORDERED:
-    if (cinfo->out_color_components == 3)
-      cquantize->pub.color_quantize = quantize3_ord_dither;
-    else
-      cquantize->pub.color_quantize = quantize_ord_dither;
-    cquantize->row_index = 0;	/* initialize state for ordered dither */
-    /* If user changed to ordered dither from another mode,
-     * we must recreate the color index table with padding.
-     * This will cost extra space, but probably isn't very likely.
-     */
-    if (! cquantize->is_padded)
-      create_colorindex(cinfo);
-    /* Create ordered-dither tables if we didn't already. */
-    if (cquantize->odither[0] == NULL)
-      create_odither_tables(cinfo);
-    break;
-  case JDITHER_FS:
-    cquantize->pub.color_quantize = quantize_fs_dither;
-    cquantize->on_odd_row = FALSE; /* initialize state for F-S dither */
-    /* Allocate Floyd-Steinberg workspace if didn't already. */
-    if (cquantize->fserrors[0] == NULL)
-      alloc_fs_workspace(cinfo);
-    /* Initialize the propagated errors to zero. */
-    arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));
-    for (i = 0; i < cinfo->out_color_components; i++)
-      jzero_far((void FAR *) cquantize->fserrors[i], arraysize);
-    break;
-  default:
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-    break;
-  }
-}
-
-
-/*
- * Finish up at the end of the pass.
- */
-
-METHODDEF(void)
-finish_pass_1_quant (j_decompress_ptr cinfo)
-{
-  /* no work in 1-pass case */
-}
-
-
-/*
- * Switch to a new external colormap between output passes.
- * Shouldn't get to this module!
- */
-
-METHODDEF(void)
-new_color_map_1_quant (j_decompress_ptr cinfo)
-{
-  ERREXIT(cinfo, JERR_MODE_CHANGE);
-}
-
-
-/*
- * Module initialization routine for 1-pass color quantization.
- */
-
-GLOBAL(void)
-jinit_1pass_quantizer (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize;
-
-  cquantize = (my_cquantize_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_cquantizer));
-  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;
-  cquantize->pub.start_pass = start_pass_1_quant;
-  cquantize->pub.finish_pass = finish_pass_1_quant;
-  cquantize->pub.new_color_map = new_color_map_1_quant;
-  cquantize->fserrors[0] = NULL; /* Flag FS workspace not allocated */
-  cquantize->odither[0] = NULL;	/* Also flag odither arrays not allocated */
-
-  /* Make sure my internal arrays won't overflow */
-  if (cinfo->out_color_components > MAX_Q_COMPS)
-    ERREXIT1(cinfo, JERR_QUANT_COMPONENTS, MAX_Q_COMPS);
-  /* Make sure colormap indexes can be represented by JSAMPLEs */
-  if (cinfo->desired_number_of_colors > (MAXJSAMPLE+1))
-    ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXJSAMPLE+1);
-
-  /* Create the colormap and color index table. */
-  create_colormap(cinfo);
-  create_colorindex(cinfo);
-
-  /* Allocate Floyd-Steinberg workspace now if requested.
-   * We do this now since it is FAR storage and may affect the memory
-   * manager's space calculations.  If the user changes to FS dither
-   * mode in a later pass, we will allocate the space then, and will
-   * possibly overrun the max_memory_to_use setting.
-   */
-  if (cinfo->dither_mode == JDITHER_FS)
-    alloc_fs_workspace(cinfo);
-}
-
-#endif /* QUANT_1PASS_SUPPORTED */
+/*
+ * jquant1.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains 1-pass color quantization (color mapping) routines.
+ * These routines provide mapping to a fixed color map using equally spaced
+ * color values.  Optional Floyd-Steinberg or ordered dithering is available.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+#ifdef QUANT_1PASS_SUPPORTED
+
+
+/*
+ * The main purpose of 1-pass quantization is to provide a fast, if not very
+ * high quality, colormapped output capability.  A 2-pass quantizer usually
+ * gives better visual quality; however, for quantized grayscale output this
+ * quantizer is perfectly adequate.  Dithering is highly recommended with this
+ * quantizer, though you can turn it off if you really want to.
+ *
+ * In 1-pass quantization the colormap must be chosen in advance of seeing the
+ * image.  We use a map consisting of all combinations of Ncolors[i] color
+ * values for the i'th component.  The Ncolors[] values are chosen so that
+ * their product, the total number of colors, is no more than that requested.
+ * (In most cases, the product will be somewhat less.)
+ *
+ * Since the colormap is orthogonal, the representative value for each color
+ * component can be determined without considering the other components;
+ * then these indexes can be combined into a colormap index by a standard
+ * N-dimensional-array-subscript calculation.  Most of the arithmetic involved
+ * can be precalculated and stored in the lookup table colorindex[].
+ * colorindex[i][j] maps pixel value j in component i to the nearest
+ * representative value (grid plane) for that component; this index is
+ * multiplied by the array stride for component i, so that the
+ * index of the colormap entry closest to a given pixel value is just
+ *    sum( colorindex[component-number][pixel-component-value] )
+ * Aside from being fast, this scheme allows for variable spacing between
+ * representative values with no additional lookup cost.
+ *
+ * If gamma correction has been applied in color conversion, it might be wise
+ * to adjust the color grid spacing so that the representative colors are
+ * equidistant in linear space.  At this writing, gamma correction is not
+ * implemented by jdcolor, so nothing is done here.
+ */
+
+
+/* Declarations for ordered dithering.
+ *
+ * We use a standard 16x16 ordered dither array.  The basic concept of ordered
+ * dithering is described in many references, for instance Dale Schumacher's
+ * chapter II.2 of Graphics Gems II (James Arvo, ed. Academic Press, 1991).
+ * In place of Schumacher's comparisons against a "threshold" value, we add a
+ * "dither" value to the input pixel and then round the result to the nearest
+ * output value.  The dither value is equivalent to (0.5 - threshold) times
+ * the distance between output values.  For ordered dithering, we assume that
+ * the output colors are equally spaced; if not, results will probably be
+ * worse, since the dither may be too much or too little at a given point.
+ *
+ * The normal calculation would be to form pixel value + dither, range-limit
+ * this to 0..MAXJSAMPLE, and then index into the colorindex table as usual.
+ * We can skip the separate range-limiting step by extending the colorindex
+ * table in both directions.
+ */
+
+#define ODITHER_SIZE  16	/* dimension of dither matrix */
+/* NB: if ODITHER_SIZE is not a power of 2, ODITHER_MASK uses will break */
+#define ODITHER_CELLS (ODITHER_SIZE*ODITHER_SIZE)	/* # cells in matrix */
+#define ODITHER_MASK  (ODITHER_SIZE-1) /* mask for wrapping around counters */
+
+typedef int ODITHER_MATRIX[ODITHER_SIZE][ODITHER_SIZE];
+typedef int (*ODITHER_MATRIX_PTR)[ODITHER_SIZE];
+
+static const UINT8 base_dither_matrix[ODITHER_SIZE][ODITHER_SIZE] = {
+  /* Bayer's order-4 dither array.  Generated by the code given in
+   * Stephen Hawley's article "Ordered Dithering" in Graphics Gems I.
+   * The values in this array must range from 0 to ODITHER_CELLS-1.
+   */
+  {   0,192, 48,240, 12,204, 60,252,  3,195, 51,243, 15,207, 63,255 },
+  { 128, 64,176,112,140, 76,188,124,131, 67,179,115,143, 79,191,127 },
+  {  32,224, 16,208, 44,236, 28,220, 35,227, 19,211, 47,239, 31,223 },
+  { 160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95 },
+  {   8,200, 56,248,  4,196, 52,244, 11,203, 59,251,  7,199, 55,247 },
+  { 136, 72,184,120,132, 68,180,116,139, 75,187,123,135, 71,183,119 },
+  {  40,232, 24,216, 36,228, 20,212, 43,235, 27,219, 39,231, 23,215 },
+  { 168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87 },
+  {   2,194, 50,242, 14,206, 62,254,  1,193, 49,241, 13,205, 61,253 },
+  { 130, 66,178,114,142, 78,190,126,129, 65,177,113,141, 77,189,125 },
+  {  34,226, 18,210, 46,238, 30,222, 33,225, 17,209, 45,237, 29,221 },
+  { 162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93 },
+  {  10,202, 58,250,  6,198, 54,246,  9,201, 57,249,  5,197, 53,245 },
+  { 138, 74,186,122,134, 70,182,118,137, 73,185,121,133, 69,181,117 },
+  {  42,234, 26,218, 38,230, 22,214, 41,233, 25,217, 37,229, 21,213 },
+  { 170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85 }
+};
+
+
+/* Declarations for Floyd-Steinberg dithering.
+ *
+ * Errors are accumulated into the array fserrors[], at a resolution of
+ * 1/16th of a pixel count.  The error at a given pixel is propagated
+ * to its not-yet-processed neighbors using the standard F-S fractions,
+ *		...	(here)	7/16
+ *		3/16	5/16	1/16
+ * We work left-to-right on even rows, right-to-left on odd rows.
+ *
+ * We can get away with a single array (holding one row's worth of errors)
+ * by using it to store the current row's errors at pixel columns not yet
+ * processed, but the next row's errors at columns already processed.  We
+ * need only a few extra variables to hold the errors immediately around the
+ * current column.  (If we are lucky, those variables are in registers, but
+ * even if not, they're probably cheaper to access than array elements are.)
+ *
+ * The fserrors[] array is indexed [component#][position].
+ * We provide (#columns + 2) entries per component; the extra entry at each
+ * end saves us from special-casing the first and last pixels.
+ *
+ * Note: on a wide image, we might not have enough room in a PC's near data
+ * segment to hold the error array; so it is allocated with alloc_large.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+typedef INT16 FSERROR;		/* 16 bits should be enough */
+typedef int LOCFSERROR;		/* use 'int' for calculation temps */
+#else
+typedef JPEG_INT32 FSERROR;		/* may need more than 16 bits */
+typedef JPEG_INT32 LOCFSERROR;	/* be sure calculation temps are big enough */
+#endif
+
+typedef FSERROR FAR *FSERRPTR;	/* pointer to error array (in FAR storage!) */
+
+
+/* Private subobject */
+
+#define MAX_Q_COMPS 4		/* max components I can handle */
+
+typedef struct {
+  struct jpeg_color_quantizer pub; /* public fields */
+
+  /* Initially allocated colormap is saved here */
+  JSAMPARRAY sv_colormap;	/* The color map as a 2-D pixel array */
+  int sv_actual;		/* number of entries in use */
+
+  JSAMPARRAY colorindex;	/* Precomputed mapping for speed */
+  /* colorindex[i][j] = index of color closest to pixel value j in component i,
+   * premultiplied as described above.  Since colormap indexes must fit into
+   * JSAMPLEs, the entries of this array will too.
+   */
+  wxjpeg_boolean is_padded;		/* is the colorindex padded for odither? */
+
+  int Ncolors[MAX_Q_COMPS];	/* # of values alloced to each component */
+
+  /* Variables for ordered dithering */
+  int row_index;		/* cur row's vertical index in dither matrix */
+  ODITHER_MATRIX_PTR odither[MAX_Q_COMPS]; /* one dither array per component */
+
+  /* Variables for Floyd-Steinberg dithering */
+  FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */
+  wxjpeg_boolean on_odd_row;		/* flag to remember which row we are on */
+} my_cquantizer;
+
+typedef my_cquantizer * my_cquantize_ptr;
+
+
+/*
+ * Policy-making subroutines for create_colormap and create_colorindex.
+ * These routines determine the colormap to be used.  The rest of the module
+ * only assumes that the colormap is orthogonal.
+ *
+ *  * select_ncolors decides how to divvy up the available colors
+ *    among the components.
+ *  * output_value defines the set of representative values for a component.
+ *  * largest_input_value defines the mapping from input values to
+ *    representative values for a component.
+ * Note that the latter two routines may impose different policies for
+ * different components, though this is not currently done.
+ */
+
+
+LOCAL(int)
+select_ncolors (j_decompress_ptr cinfo, int Ncolors[])
+/* Determine allocation of desired colors to components, */
+/* and fill in Ncolors[] array to indicate choice. */
+/* Return value is total number of colors (product of Ncolors[] values). */
+{
+  int nc = cinfo->out_color_components; /* number of color components */
+  int max_colors = cinfo->desired_number_of_colors;
+  int total_colors, iroot, i, j;
+  wxjpeg_boolean changed;
+  long temp;
+  static const int RGB_order[3] = { RGB_GREEN, RGB_RED, RGB_BLUE };
+
+  /* We can allocate at least the nc'th root of max_colors per component. */
+  /* Compute floor(nc'th root of max_colors). */
+  iroot = 1;
+  do {
+    iroot++;
+    temp = iroot;		/* set temp = iroot ** nc */
+    for (i = 1; i < nc; i++)
+      temp *= iroot;
+  } while (temp <= (long) max_colors); /* repeat till iroot exceeds root */
+  iroot--;			/* now iroot = floor(root) */
+
+  /* Must have at least 2 color values per component */
+  if (iroot < 2)
+    ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, (int) temp);
+
+  /* Initialize to iroot color values for each component */
+  total_colors = 1;
+  for (i = 0; i < nc; i++) {
+    Ncolors[i] = iroot;
+    total_colors *= iroot;
+  }
+  /* We may be able to increment the count for one or more components without
+   * exceeding max_colors, though we know not all can be incremented.
+   * Sometimes, the first component can be incremented more than once!
+   * (Example: for 16 colors, we start at 2*2*2, go to 3*2*2, then 4*2*2.)
+   * In RGB colorspace, try to increment G first, then R, then B.
+   */
+  do {
+    changed = FALSE;
+    for (i = 0; i < nc; i++) {
+      j = (cinfo->out_color_space == JCS_RGB ? RGB_order[i] : i);
+      /* calculate new total_colors if Ncolors[j] is incremented */
+      temp = total_colors / Ncolors[j];
+      temp *= Ncolors[j]+1;	/* done in long arith to avoid oflo */
+      if (temp > (long) max_colors)
+	break;			/* won't fit, done with this pass */
+      Ncolors[j]++;		/* OK, apply the increment */
+      total_colors = (int) temp;
+      changed = TRUE;
+    }
+  } while (changed);
+
+  return total_colors;
+}
+
+
+LOCAL(int)
+output_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
+/* Return j'th output value, where j will range from 0 to maxj */
+/* The output values must fall in 0..MAXJSAMPLE in increasing order */
+{
+  /* We always provide values 0 and MAXJSAMPLE for each component;
+   * any additional values are equally spaced between these limits.
+   * (Forcing the upper and lower values to the limits ensures that
+   * dithering can't produce a color outside the selected gamut.)
+   */
+  return (int) (((JPEG_INT32) j * MAXJSAMPLE + maxj/2) / maxj);
+}
+
+
+LOCAL(int)
+largest_input_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
+/* Return largest input value that should map to j'th output value */
+/* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
+{
+  /* Breakpoints are halfway between values returned by output_value */
+  return (int) (((JPEG_INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));
+}
+
+
+/*
+ * Create the colormap.
+ */
+
+LOCAL(void)
+create_colormap (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  JSAMPARRAY colormap;		/* Created colormap */
+  int total_colors;		/* Number of distinct output colors */
+  int i,j,k, nci, blksize, blkdist, ptr, val;
+
+  /* Select number of colors for each component */
+  total_colors = select_ncolors(cinfo, cquantize->Ncolors);
+
+  /* Report selected color counts */
+  if (cinfo->out_color_components == 3)
+    TRACEMS4(cinfo, 1, JTRC_QUANT_3_NCOLORS,
+	     total_colors, cquantize->Ncolors[0],
+	     cquantize->Ncolors[1], cquantize->Ncolors[2]);
+  else
+    TRACEMS1(cinfo, 1, JTRC_QUANT_NCOLORS, total_colors);
+
+  /* Allocate and fill in the colormap. */
+  /* The colors are ordered in the map in standard row-major order, */
+  /* i.e. rightmost (highest-indexed) color changes most rapidly. */
+
+  colormap = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE,
+     (JDIMENSION) total_colors, (JDIMENSION) cinfo->out_color_components);
+
+  /* blksize is number of adjacent repeated entries for a component */
+  /* blkdist is distance between groups of identical entries for a component */
+  blkdist = total_colors;
+
+  for (i = 0; i < cinfo->out_color_components; i++) {
+    /* fill in colormap entries for i'th color component */
+    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
+    blksize = blkdist / nci;
+    for (j = 0; j < nci; j++) {
+      /* Compute j'th output value (out of nci) for component */
+      val = output_value(cinfo, i, j, nci-1);
+      /* Fill in all colormap entries that have this value of this component */
+      for (ptr = j * blksize; ptr < total_colors; ptr += blkdist) {
+	/* fill in blksize entries beginning at ptr */
+	for (k = 0; k < blksize; k++)
+	  colormap[i][ptr+k] = (JSAMPLE) val;
+      }
+    }
+    blkdist = blksize;		/* blksize of this color is blkdist of next */
+  }
+
+  /* Save the colormap in private storage,
+   * where it will survive color quantization mode changes.
+   */
+  cquantize->sv_colormap = colormap;
+  cquantize->sv_actual = total_colors;
+}
+
+
+/*
+ * Create the color index table.
+ */
+
+LOCAL(void)
+create_colorindex (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  JSAMPROW indexptr;
+  int i,j,k, nci, blksize, val, pad;
+
+  /* For ordered dither, we pad the color index tables by MAXJSAMPLE in
+   * each direction (input index values can be -MAXJSAMPLE .. 2*MAXJSAMPLE).
+   * This is not necessary in the other dithering modes.  However, we
+   * flag whether it was done in case user changes dithering mode.
+   */
+  if (cinfo->dither_mode == JDITHER_ORDERED) {
+    pad = MAXJSAMPLE*2;
+    cquantize->is_padded = TRUE;
+  } else {
+    pad = 0;
+    cquantize->is_padded = FALSE;
+  }
+
+  cquantize->colorindex = (*cinfo->mem->alloc_sarray)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE,
+     (JDIMENSION) (MAXJSAMPLE+1 + pad),
+     (JDIMENSION) cinfo->out_color_components);
+
+  /* blksize is number of adjacent repeated entries for a component */
+  blksize = cquantize->sv_actual;
+
+  for (i = 0; i < cinfo->out_color_components; i++) {
+    /* fill in colorindex entries for i'th color component */
+    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
+    blksize = blksize / nci;
+
+    /* adjust colorindex pointers to provide padding at negative indexes. */
+    if (pad)
+      cquantize->colorindex[i] += MAXJSAMPLE;
+
+    /* in loop, val = index of current output value, */
+    /* and k = largest j that maps to current val */
+    indexptr = cquantize->colorindex[i];
+    val = 0;
+    k = largest_input_value(cinfo, i, 0, nci-1);
+    for (j = 0; j <= MAXJSAMPLE; j++) {
+      while (j > k)		/* advance val if past boundary */
+	k = largest_input_value(cinfo, i, ++val, nci-1);
+      /* premultiply so that no multiplication needed in main processing */
+      indexptr[j] = (JSAMPLE) (val * blksize);
+    }
+    /* Pad at both ends if necessary */
+    if (pad)
+      for (j = 1; j <= MAXJSAMPLE; j++) {
+	indexptr[-j] = indexptr[0];
+	indexptr[MAXJSAMPLE+j] = indexptr[MAXJSAMPLE];
+      }
+  }
+}
+
+
+/*
+ * Create an ordered-dither array for a component having ncolors
+ * distinct output values.
+ */
+
+LOCAL(ODITHER_MATRIX_PTR)
+make_odither_array (j_decompress_ptr cinfo, int ncolors)
+{
+  ODITHER_MATRIX_PTR odither;
+  int j,k;
+  JPEG_INT32 num,den;
+
+  odither = (ODITHER_MATRIX_PTR)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(ODITHER_MATRIX));
+  /* The inter-value distance for this color is MAXJSAMPLE/(ncolors-1).
+   * Hence the dither value for the matrix cell with fill order f
+   * (f=0..N-1) should be (N-1-2*f)/(2*N) * MAXJSAMPLE/(ncolors-1).
+   * On 16-bit-int machine, be careful to avoid overflow.
+   */
+  den = 2 * ODITHER_CELLS * ((JPEG_INT32) (ncolors - 1));
+  for (j = 0; j < ODITHER_SIZE; j++) {
+    for (k = 0; k < ODITHER_SIZE; k++) {
+      num = ((JPEG_INT32) (ODITHER_CELLS-1 - 2*((int)base_dither_matrix[j][k])))
+	    * MAXJSAMPLE;
+      /* Ensure round towards zero despite C's lack of consistency
+       * about rounding negative values in integer division...
+       */
+      odither[j][k] = (int) (num<0 ? -((-num)/den) : num/den);
+    }
+  }
+  return odither;
+}
+
+
+/*
+ * Create the ordered-dither tables.
+ * Components having the same number of representative colors may 
+ * share a dither table.
+ */
+
+LOCAL(void)
+create_odither_tables (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  ODITHER_MATRIX_PTR odither;
+  int i, j, nci;
+
+  for (i = 0; i < cinfo->out_color_components; i++) {
+    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
+    odither = NULL;		/* search for matching prior component */
+    for (j = 0; j < i; j++) {
+      if (nci == cquantize->Ncolors[j]) {
+	odither = cquantize->odither[j];
+	break;
+      }
+    }
+    if (odither == NULL)	/* need a new table? */
+      odither = make_odither_array(cinfo, nci);
+    cquantize->odither[i] = odither;
+  }
+}
+
+
+/*
+ * Map some rows of pixels to the output colormapped representation.
+ */
+
+METHODDEF(void)
+color_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		JSAMPARRAY output_buf, int num_rows)
+/* General case, no dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  JSAMPARRAY colorindex = cquantize->colorindex;
+  register int pixcode, ci;
+  register JSAMPROW ptrin, ptrout;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+  register int nc = cinfo->out_color_components;
+
+  for (row = 0; row < num_rows; row++) {
+    ptrin = input_buf[row];
+    ptrout = output_buf[row];
+    for (col = width; col > 0; col--) {
+      pixcode = 0;
+      for (ci = 0; ci < nc; ci++) {
+	pixcode += GETJSAMPLE(colorindex[ci][GETJSAMPLE(*ptrin++)]);
+      }
+      *ptrout++ = (JSAMPLE) pixcode;
+    }
+  }
+}
+
+
+METHODDEF(void)
+color_quantize3 (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		 JSAMPARRAY output_buf, int num_rows)
+/* Fast path for out_color_components==3, no dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register int pixcode;
+  register JSAMPROW ptrin, ptrout;
+  JSAMPROW colorindex0 = cquantize->colorindex[0];
+  JSAMPROW colorindex1 = cquantize->colorindex[1];
+  JSAMPROW colorindex2 = cquantize->colorindex[2];
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    ptrin = input_buf[row];
+    ptrout = output_buf[row];
+    for (col = width; col > 0; col--) {
+      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*ptrin++)]);
+      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*ptrin++)]);
+      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*ptrin++)]);
+      *ptrout++ = (JSAMPLE) pixcode;
+    }
+  }
+}
+
+
+METHODDEF(void)
+quantize_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		     JSAMPARRAY output_buf, int num_rows)
+/* General case, with ordered dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register JSAMPROW input_ptr;
+  register JSAMPROW output_ptr;
+  JSAMPROW colorindex_ci;
+  int * dither;			/* points to active row of dither matrix */
+  int row_index, col_index;	/* current indexes into dither matrix */
+  int nc = cinfo->out_color_components;
+  int ci;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    /* Initialize output values to 0 so can process components separately */
+    jzero_far((void FAR *) output_buf[row],
+	      (size_t) (width * SIZEOF(JSAMPLE)));
+    row_index = cquantize->row_index;
+    for (ci = 0; ci < nc; ci++) {
+      input_ptr = input_buf[row] + ci;
+      output_ptr = output_buf[row];
+      colorindex_ci = cquantize->colorindex[ci];
+      dither = cquantize->odither[ci][row_index];
+      col_index = 0;
+
+      for (col = width; col > 0; col--) {
+	/* Form pixel value + dither, range-limit to 0..MAXJSAMPLE,
+	 * select output value, accumulate into output code for this pixel.
+	 * Range-limiting need not be done explicitly, as we have extended
+	 * the colorindex table to produce the right answers for out-of-range
+	 * inputs.  The maximum dither is +- MAXJSAMPLE; this sets the
+	 * required amount of padding.
+	 */
+	*output_ptr += colorindex_ci[GETJSAMPLE(*input_ptr)+dither[col_index]];
+	input_ptr += nc;
+	output_ptr++;
+	col_index = (col_index + 1) & ODITHER_MASK;
+      }
+    }
+    /* Advance row index for next row */
+    row_index = (row_index + 1) & ODITHER_MASK;
+    cquantize->row_index = row_index;
+  }
+}
+
+
+METHODDEF(void)
+quantize3_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		      JSAMPARRAY output_buf, int num_rows)
+/* Fast path for out_color_components==3, with ordered dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register int pixcode;
+  register JSAMPROW input_ptr;
+  register JSAMPROW output_ptr;
+  JSAMPROW colorindex0 = cquantize->colorindex[0];
+  JSAMPROW colorindex1 = cquantize->colorindex[1];
+  JSAMPROW colorindex2 = cquantize->colorindex[2];
+  int * dither0;		/* points to active row of dither matrix */
+  int * dither1;
+  int * dither2;
+  int row_index, col_index;	/* current indexes into dither matrix */
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    row_index = cquantize->row_index;
+    input_ptr = input_buf[row];
+    output_ptr = output_buf[row];
+    dither0 = cquantize->odither[0][row_index];
+    dither1 = cquantize->odither[1][row_index];
+    dither2 = cquantize->odither[2][row_index];
+    col_index = 0;
+
+    for (col = width; col > 0; col--) {
+      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*input_ptr++) +
+					dither0[col_index]]);
+      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*input_ptr++) +
+					dither1[col_index]]);
+      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*input_ptr++) +
+					dither2[col_index]]);
+      *output_ptr++ = (JSAMPLE) pixcode;
+      col_index = (col_index + 1) & ODITHER_MASK;
+    }
+    row_index = (row_index + 1) & ODITHER_MASK;
+    cquantize->row_index = row_index;
+  }
+}
+
+
+METHODDEF(void)
+quantize_fs_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		    JSAMPARRAY output_buf, int num_rows)
+/* General case, with Floyd-Steinberg dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register LOCFSERROR cur;	/* current error or pixel value */
+  LOCFSERROR belowerr;		/* error for pixel below cur */
+  LOCFSERROR bpreverr;		/* error for below/prev col */
+  LOCFSERROR bnexterr;		/* error for below/next col */
+  LOCFSERROR delta;
+  register FSERRPTR errorptr;	/* => fserrors[] at column before current */
+  register JSAMPROW input_ptr;
+  register JSAMPROW output_ptr;
+  JSAMPROW colorindex_ci;
+  JSAMPROW colormap_ci;
+  int pixcode;
+  int nc = cinfo->out_color_components;
+  int dir;			/* 1 for left-to-right, -1 for right-to-left */
+  int dirnc;			/* dir * nc */
+  int ci;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+  JSAMPLE *range_limit = cinfo->sample_range_limit;
+  SHIFT_TEMPS
+
+  for (row = 0; row < num_rows; row++) {
+    /* Initialize output values to 0 so can process components separately */
+    jzero_far((void FAR *) output_buf[row],
+	      (size_t) (width * SIZEOF(JSAMPLE)));
+    for (ci = 0; ci < nc; ci++) {
+      input_ptr = input_buf[row] + ci;
+      output_ptr = output_buf[row];
+      if (cquantize->on_odd_row) {
+	/* work right to left in this row */
+	input_ptr += (width-1) * nc; /* so point to rightmost pixel */
+	output_ptr += width-1;
+	dir = -1;
+	dirnc = -nc;
+	errorptr = cquantize->fserrors[ci] + (width+1); /* => entry after last column */
+      } else {
+	/* work left to right in this row */
+	dir = 1;
+	dirnc = nc;
+	errorptr = cquantize->fserrors[ci]; /* => entry before first column */
+      }
+      colorindex_ci = cquantize->colorindex[ci];
+      colormap_ci = cquantize->sv_colormap[ci];
+      /* Preset error values: no error propagated to first pixel from left */
+      cur = 0;
+      /* and no error propagated to row below yet */
+      belowerr = bpreverr = 0;
+
+      for (col = width; col > 0; col--) {
+	/* cur holds the error propagated from the previous pixel on the
+	 * current line.  Add the error propagated from the previous line
+	 * to form the complete error correction term for this pixel, and
+	 * round the error term (which is expressed * 16) to an integer.
+	 * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
+	 * for either sign of the error value.
+	 * Note: errorptr points to *previous* column's array entry.
+	 */
+	cur = RIGHT_SHIFT(cur + errorptr[dir] + 8, 4);
+	/* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
+	 * The maximum error is +- MAXJSAMPLE; this sets the required size
+	 * of the range_limit array.
+	 */
+	cur += GETJSAMPLE(*input_ptr);
+	cur = GETJSAMPLE(range_limit[cur]);
+	/* Select output value, accumulate into output code for this pixel */
+	pixcode = GETJSAMPLE(colorindex_ci[cur]);
+	*output_ptr += (JSAMPLE) pixcode;
+	/* Compute actual representation error at this pixel */
+	/* Note: we can do this even though we don't have the final */
+	/* pixel code, because the colormap is orthogonal. */
+	cur -= GETJSAMPLE(colormap_ci[pixcode]);
+	/* Compute error fractions to be propagated to adjacent pixels.
+	 * Add these into the running sums, and simultaneously shift the
+	 * next-line error sums left by 1 column.
+	 */
+	bnexterr = cur;
+	delta = cur * 2;
+	cur += delta;		/* form error * 3 */
+	errorptr[0] = (FSERROR) (bpreverr + cur);
+	cur += delta;		/* form error * 5 */
+	bpreverr = belowerr + cur;
+	belowerr = bnexterr;
+	cur += delta;		/* form error * 7 */
+	/* At this point cur contains the 7/16 error value to be propagated
+	 * to the next pixel on the current line, and all the errors for the
+	 * next line have been shifted over. We are therefore ready to move on.
+	 */
+	input_ptr += dirnc;	/* advance input ptr to next column */
+	output_ptr += dir;	/* advance output ptr to next column */
+	errorptr += dir;	/* advance errorptr to current column */
+      }
+      /* Post-loop cleanup: we must unload the final error value into the
+       * final fserrors[] entry.  Note we need not unload belowerr because
+       * it is for the dummy column before or after the actual array.
+       */
+      errorptr[0] = (FSERROR) bpreverr; /* unload prev err into array */
+    }
+    cquantize->on_odd_row = (cquantize->on_odd_row ? FALSE : TRUE);
+  }
+}
+
+
+/*
+ * Allocate workspace for Floyd-Steinberg errors.
+ */
+
+LOCAL(void)
+alloc_fs_workspace (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  size_t arraysize;
+  int i;
+
+  arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));
+  for (i = 0; i < cinfo->out_color_components; i++) {
+    cquantize->fserrors[i] = (FSERRPTR)
+      (*cinfo->mem->alloc_large)((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);
+  }
+}
+
+
+/*
+ * Initialize for one-pass color quantization.
+ */
+
+METHODDEF(void)
+start_pass_1_quant (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  size_t arraysize;
+  int i;
+
+  /* Install my colormap. */
+  cinfo->colormap = cquantize->sv_colormap;
+  cinfo->actual_number_of_colors = cquantize->sv_actual;
+
+  /* Initialize for desired dithering mode. */
+  switch (cinfo->dither_mode) {
+  case JDITHER_NONE:
+    if (cinfo->out_color_components == 3)
+      cquantize->pub.color_quantize = color_quantize3;
+    else
+      cquantize->pub.color_quantize = color_quantize;
+    break;
+  case JDITHER_ORDERED:
+    if (cinfo->out_color_components == 3)
+      cquantize->pub.color_quantize = quantize3_ord_dither;
+    else
+      cquantize->pub.color_quantize = quantize_ord_dither;
+    cquantize->row_index = 0;	/* initialize state for ordered dither */
+    /* If user changed to ordered dither from another mode,
+     * we must recreate the color index table with padding.
+     * This will cost extra space, but probably isn't very likely.
+     */
+    if (! cquantize->is_padded)
+      create_colorindex(cinfo);
+    /* Create ordered-dither tables if we didn't already. */
+    if (cquantize->odither[0] == NULL)
+      create_odither_tables(cinfo);
+    break;
+  case JDITHER_FS:
+    cquantize->pub.color_quantize = quantize_fs_dither;
+    cquantize->on_odd_row = FALSE; /* initialize state for F-S dither */
+    /* Allocate Floyd-Steinberg workspace if didn't already. */
+    if (cquantize->fserrors[0] == NULL)
+      alloc_fs_workspace(cinfo);
+    /* Initialize the propagated errors to zero. */
+    arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));
+    for (i = 0; i < cinfo->out_color_components; i++)
+      jzero_far((void FAR *) cquantize->fserrors[i], arraysize);
+    break;
+  default:
+    ERREXIT(cinfo, JERR_NOT_COMPILED);
+    break;
+  }
+}
+
+
+/*
+ * Finish up at the end of the pass.
+ */
+
+METHODDEF(void)
+finish_pass_1_quant (j_decompress_ptr cinfo)
+{
+  /* no work in 1-pass case */
+}
+
+
+/*
+ * Switch to a new external colormap between output passes.
+ * Shouldn't get to this module!
+ */
+
+METHODDEF(void)
+new_color_map_1_quant (j_decompress_ptr cinfo)
+{
+  ERREXIT(cinfo, JERR_MODE_CHANGE);
+}
+
+
+/*
+ * Module initialization routine for 1-pass color quantization.
+ */
+
+GLOBAL(void)
+jinit_1pass_quantizer (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize;
+
+  cquantize = (my_cquantize_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_cquantizer));
+  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;
+  cquantize->pub.start_pass = start_pass_1_quant;
+  cquantize->pub.finish_pass = finish_pass_1_quant;
+  cquantize->pub.new_color_map = new_color_map_1_quant;
+  cquantize->fserrors[0] = NULL; /* Flag FS workspace not allocated */
+  cquantize->odither[0] = NULL;	/* Also flag odither arrays not allocated */
+
+  /* Make sure my internal arrays won't overflow */
+  if (cinfo->out_color_components > MAX_Q_COMPS)
+    ERREXIT1(cinfo, JERR_QUANT_COMPONENTS, MAX_Q_COMPS);
+  /* Make sure colormap indexes can be represented by JSAMPLEs */
+  if (cinfo->desired_number_of_colors > (MAXJSAMPLE+1))
+    ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXJSAMPLE+1);
+
+  /* Create the colormap and color index table. */
+  create_colormap(cinfo);
+  create_colorindex(cinfo);
+
+  /* Allocate Floyd-Steinberg workspace now if requested.
+   * We do this now since it is FAR storage and may affect the memory
+   * manager's space calculations.  If the user changes to FS dither
+   * mode in a later pass, we will allocate the space then, and will
+   * possibly overrun the max_memory_to_use setting.
+   */
+  if (cinfo->dither_mode == JDITHER_FS)
+    alloc_fs_workspace(cinfo);
+}
+
+#endif /* QUANT_1PASS_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jquant2.c b/Source/3rd Party/wx/src/jpeg/jquant2.c
index 3de914558..b9c66a325 100644
--- a/Source/3rd Party/wx/src/jpeg/jquant2.c	
+++ b/Source/3rd Party/wx/src/jpeg/jquant2.c	
@@ -1,1310 +1,1310 @@
-/*
- * jquant2.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains 2-pass color quantization (color mapping) routines.
- * These routines provide selection of a custom color map for an image,
- * followed by mapping of the image to that color map, with optional
- * Floyd-Steinberg dithering.
- * It is also possible to use just the second pass to map to an arbitrary
- * externally-given color map.
- *
- * Note: ordered dithering is not supported, since there isn't any fast
- * way to compute intercolor distances; it's unclear that ordered dither's
- * fundamental assumptions even hold with an irregularly spaced color map.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-#ifdef QUANT_2PASS_SUPPORTED
-
-
-/*
- * This module implements the well-known Heckbert paradigm for color
- * quantization.  Most of the ideas used here can be traced back to
- * Heckbert's seminal paper
- *   Heckbert, Paul.  "Color Image Quantization for Frame Buffer Display",
- *   Proc. SIGGRAPH '82, Computer Graphics v.16 #3 (July 1982), pp 297-304.
- *
- * In the first pass over the image, we accumulate a histogram showing the
- * usage count of each possible color.  To keep the histogram to a reasonable
- * size, we reduce the precision of the input; typical practice is to retain
- * 5 or 6 bits per color, so that 8 or 4 different input values are counted
- * in the same histogram cell.
- *
- * Next, the color-selection step begins with a box representing the whole
- * color space, and repeatedly splits the "largest" remaining box until we
- * have as many boxes as desired colors.  Then the mean color in each
- * remaining box becomes one of the possible output colors.
- * 
- * The second pass over the image maps each input pixel to the closest output
- * color (optionally after applying a Floyd-Steinberg dithering correction).
- * This mapping is logically trivial, but making it go fast enough requires
- * considerable care.
- *
- * Heckbert-style quantizers vary a good deal in their policies for choosing
- * the "largest" box and deciding where to cut it.  The particular policies
- * used here have proved out well in experimental comparisons, but better ones
- * may yet be found.
- *
- * In earlier versions of the IJG code, this module quantized in YCbCr color
- * space, processing the raw upsampled data without a color conversion step.
- * This allowed the color conversion math to be done only once per colormap
- * entry, not once per pixel.  However, that optimization precluded other
- * useful optimizations (such as merging color conversion with upsampling)
- * and it also interfered with desired capabilities such as quantizing to an
- * externally-supplied colormap.  We have therefore abandoned that approach.
- * The present code works in the post-conversion color space, typically RGB.
- *
- * To improve the visual quality of the results, we actually work in scaled
- * RGB space, giving G distances more weight than R, and R in turn more than
- * B.  To do everything in integer math, we must use integer scale factors.
- * The 2/3/1 scale factors used here correspond loosely to the relative
- * weights of the colors in the NTSC grayscale equation.
- * If you want to use this code to quantize a non-RGB color space, you'll
- * probably need to change these scale factors.
- */
-
-#define R_SCALE 2		/* scale R distances by this much */
-#define G_SCALE 3		/* scale G distances by this much */
-#define B_SCALE 1		/* and B by this much */
-
-/* Relabel R/G/B as components 0/1/2, respecting the RGB ordering defined
- * in jmorecfg.h.  As the code stands, it will do the right thing for R,G,B
- * and B,G,R orders.  If you define some other weird order in jmorecfg.h,
- * you'll get compile errors until you extend this logic.  In that case
- * you'll probably want to tweak the histogram sizes too.
- */
-
-#if RGB_RED == 0
-#define C0_SCALE R_SCALE
-#endif
-#if RGB_BLUE == 0
-#define C0_SCALE B_SCALE
-#endif
-#if RGB_GREEN == 1
-#define C1_SCALE G_SCALE
-#endif
-#if RGB_RED == 2
-#define C2_SCALE R_SCALE
-#endif
-#if RGB_BLUE == 2
-#define C2_SCALE B_SCALE
-#endif
-
-
-/*
- * First we have the histogram data structure and routines for creating it.
- *
- * The number of bits of precision can be adjusted by changing these symbols.
- * We recommend keeping 6 bits for G and 5 each for R and B.
- * If you have plenty of memory and cycles, 6 bits all around gives marginally
- * better results; if you are short of memory, 5 bits all around will save
- * some space but degrade the results.
- * To maintain a fully accurate histogram, we'd need to allocate a "long"
- * (preferably unsigned long) for each cell.  In practice this is overkill;
- * we can get by with 16 bits per cell.  Few of the cell counts will overflow,
- * and clamping those that do overflow to the maximum value will give close-
- * enough results.  This reduces the recommended histogram size from 256Kb
- * to 128Kb, which is a useful savings on PC-class machines.
- * (In the second pass the histogram space is re-used for pixel mapping data;
- * in that capacity, each cell must be able to store zero to the number of
- * desired colors.  16 bits/cell is plenty for that too.)
- * Since the JPEG code is intended to run in small memory model on 80x86
- * machines, we can't just allocate the histogram in one chunk.  Instead
- * of a true 3-D array, we use a row of pointers to 2-D arrays.  Each
- * pointer corresponds to a C0 value (typically 2^5 = 32 pointers) and
- * each 2-D array has 2^6*2^5 = 2048 or 2^6*2^6 = 4096 entries.  Note that
- * on 80x86 machines, the pointer row is in near memory but the actual
- * arrays are in far memory (same arrangement as we use for image arrays).
- */
-
-#define MAXNUMCOLORS  (MAXJSAMPLE+1) /* maximum size of colormap */
-
-/* These will do the right thing for either R,G,B or B,G,R color order,
- * but you may not like the results for other color orders.
- */
-#define HIST_C0_BITS  5		/* bits of precision in R/B histogram */
-#define HIST_C1_BITS  6		/* bits of precision in G histogram */
-#define HIST_C2_BITS  5		/* bits of precision in B/R histogram */
-
-/* Number of elements along histogram axes. */
-#define HIST_C0_ELEMS  (1<<HIST_C0_BITS)
-#define HIST_C1_ELEMS  (1<<HIST_C1_BITS)
-#define HIST_C2_ELEMS  (1<<HIST_C2_BITS)
-
-/* These are the amounts to shift an input value to get a histogram index. */
-#define C0_SHIFT  (BITS_IN_JSAMPLE-HIST_C0_BITS)
-#define C1_SHIFT  (BITS_IN_JSAMPLE-HIST_C1_BITS)
-#define C2_SHIFT  (BITS_IN_JSAMPLE-HIST_C2_BITS)
-
-
-typedef UINT16 histcell;	/* histogram cell; prefer an unsigned type */
-
-typedef histcell FAR * histptr;	/* for pointers to histogram cells */
-
-typedef histcell hist1d[HIST_C2_ELEMS]; /* typedefs for the array */
-typedef hist1d FAR * hist2d;	/* type for the 2nd-level pointers */
-typedef hist2d * hist3d;	/* type for top-level pointer */
-
-
-/* Declarations for Floyd-Steinberg dithering.
- *
- * Errors are accumulated into the array fserrors[], at a resolution of
- * 1/16th of a pixel count.  The error at a given pixel is propagated
- * to its not-yet-processed neighbors using the standard F-S fractions,
- *		...	(here)	7/16
- *		3/16	5/16	1/16
- * We work left-to-right on even rows, right-to-left on odd rows.
- *
- * We can get away with a single array (holding one row's worth of errors)
- * by using it to store the current row's errors at pixel columns not yet
- * processed, but the next row's errors at columns already processed.  We
- * need only a few extra variables to hold the errors immediately around the
- * current column.  (If we are lucky, those variables are in registers, but
- * even if not, they're probably cheaper to access than array elements are.)
- *
- * The fserrors[] array has (#columns + 2) entries; the extra entry at
- * each end saves us from special-casing the first and last pixels.
- * Each entry is three values long, one value for each color component.
- *
- * Note: on a wide image, we might not have enough room in a PC's near data
- * segment to hold the error array; so it is allocated with alloc_large.
- */
-
-#if BITS_IN_JSAMPLE == 8
-typedef INT16 FSERROR;		/* 16 bits should be enough */
-typedef int LOCFSERROR;		/* use 'int' for calculation temps */
-#else
-typedef JPEG_INT32 FSERROR;		/* may need more than 16 bits */
-typedef JPEG_INT32 LOCFSERROR;	/* be sure calculation temps are big enough */
-#endif
-
-typedef FSERROR FAR *FSERRPTR;	/* pointer to error array (in FAR storage!) */
-
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_color_quantizer pub; /* public fields */
-
-  /* Space for the eventually created colormap is stashed here */
-  JSAMPARRAY sv_colormap;	/* colormap allocated at init time */
-  int desired;			/* desired # of colors = size of colormap */
-
-  /* Variables for accumulating image statistics */
-  hist3d histogram;		/* pointer to the histogram */
-
-  wxjpeg_boolean needs_zeroed;		/* TRUE if next pass must zero histogram */
-
-  /* Variables for Floyd-Steinberg dithering */
-  FSERRPTR fserrors;		/* accumulated errors */
-  wxjpeg_boolean on_odd_row;		/* flag to remember which row we are on */
-  int * error_limiter;		/* table for clamping the applied error */
-} my_cquantizer;
-
-typedef my_cquantizer * my_cquantize_ptr;
-
-
-/*
- * Prescan some rows of pixels.
- * In this module the prescan simply updates the histogram, which has been
- * initialized to zeroes by start_pass.
- * An output_buf parameter is required by the method signature, but no data
- * is actually output (in fact the buffer controller is probably passing a
- * NULL pointer).
- */
-
-METHODDEF(void)
-prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		  JSAMPARRAY output_buf, int num_rows)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register JSAMPROW ptr;
-  register histptr histp;
-  register hist3d histogram = cquantize->histogram;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    ptr = input_buf[row];
-    for (col = width; col > 0; col--) {
-      /* get pixel value and index into the histogram */
-      histp = & histogram[GETJSAMPLE(ptr[0]) >> C0_SHIFT]
-			 [GETJSAMPLE(ptr[1]) >> C1_SHIFT]
-			 [GETJSAMPLE(ptr[2]) >> C2_SHIFT];
-      /* increment, check for overflow and undo increment if so. */
-      if (++(*histp) <= 0)
-	(*histp)--;
-      ptr += 3;
-    }
-  }
-}
-
-
-/*
- * Next we have the really interesting routines: selection of a colormap
- * given the completed histogram.
- * These routines work with a list of "boxes", each representing a rectangular
- * subset of the input color space (to histogram precision).
- */
-
-typedef struct {
-  /* The bounds of the box (inclusive); expressed as histogram indexes */
-  int c0min, c0max;
-  int c1min, c1max;
-  int c2min, c2max;
-  /* The volume (actually 2-norm) of the box */
-  JPEG_INT32 volume;
-  /* The number of nonzero histogram cells within this box */
-  long colorcount;
-} box;
-
-typedef box * boxptr;
-
-
-LOCAL(boxptr)
-find_biggest_color_pop (boxptr boxlist, int numboxes)
-/* Find the splittable box with the largest color population */
-/* Returns NULL if no splittable boxes remain */
-{
-  register boxptr boxp;
-  register int i;
-  register long maxc = 0;
-  boxptr which = NULL;
-  
-  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
-    if (boxp->colorcount > maxc && boxp->volume > 0) {
-      which = boxp;
-      maxc = boxp->colorcount;
-    }
-  }
-  return which;
-}
-
-
-LOCAL(boxptr)
-find_biggest_volume (boxptr boxlist, int numboxes)
-/* Find the splittable box with the largest (scaled) volume */
-/* Returns NULL if no splittable boxes remain */
-{
-  register boxptr boxp;
-  register int i;
-  register JPEG_INT32 maxv = 0;
-  boxptr which = NULL;
-  
-  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
-    if (boxp->volume > maxv) {
-      which = boxp;
-      maxv = boxp->volume;
-    }
-  }
-  return which;
-}
-
-
-LOCAL(void)
-update_box (j_decompress_ptr cinfo, boxptr boxp)
-/* Shrink the min/max bounds of a box to enclose only nonzero elements, */
-/* and recompute its volume and population */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  histptr histp;
-  int c0,c1,c2;
-  int c0min,c0max,c1min,c1max,c2min,c2max;
-  JPEG_INT32 dist0,dist1,dist2;
-  long ccount;
-  
-  c0min = boxp->c0min;  c0max = boxp->c0max;
-  c1min = boxp->c1min;  c1max = boxp->c1max;
-  c2min = boxp->c2min;  c2max = boxp->c2max;
-  
-  if (c0max > c0min)
-    for (c0 = c0min; c0 <= c0max; c0++)
-      for (c1 = c1min; c1 <= c1max; c1++) {
-	histp = & histogram[c0][c1][c2min];
-	for (c2 = c2min; c2 <= c2max; c2++)
-	  if (*histp++ != 0) {
-	    boxp->c0min = c0min = c0;
-	    goto have_c0min;
-	  }
-      }
- have_c0min:
-  if (c0max > c0min)
-    for (c0 = c0max; c0 >= c0min; c0--)
-      for (c1 = c1min; c1 <= c1max; c1++) {
-	histp = & histogram[c0][c1][c2min];
-	for (c2 = c2min; c2 <= c2max; c2++)
-	  if (*histp++ != 0) {
-	    boxp->c0max = c0max = c0;
-	    goto have_c0max;
-	  }
-      }
- have_c0max:
-  if (c1max > c1min)
-    for (c1 = c1min; c1 <= c1max; c1++)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-	histp = & histogram[c0][c1][c2min];
-	for (c2 = c2min; c2 <= c2max; c2++)
-	  if (*histp++ != 0) {
-	    boxp->c1min = c1min = c1;
-	    goto have_c1min;
-	  }
-      }
- have_c1min:
-  if (c1max > c1min)
-    for (c1 = c1max; c1 >= c1min; c1--)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-	histp = & histogram[c0][c1][c2min];
-	for (c2 = c2min; c2 <= c2max; c2++)
-	  if (*histp++ != 0) {
-	    boxp->c1max = c1max = c1;
-	    goto have_c1max;
-	  }
-      }
- have_c1max:
-  if (c2max > c2min)
-    for (c2 = c2min; c2 <= c2max; c2++)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-	histp = & histogram[c0][c1min][c2];
-	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
-	  if (*histp != 0) {
-	    boxp->c2min = c2min = c2;
-	    goto have_c2min;
-	  }
-      }
- have_c2min:
-  if (c2max > c2min)
-    for (c2 = c2max; c2 >= c2min; c2--)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-	histp = & histogram[c0][c1min][c2];
-	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
-	  if (*histp != 0) {
-	    boxp->c2max = c2max = c2;
-	    goto have_c2max;
-	  }
-      }
- have_c2max:
-
-  /* Update box volume.
-   * We use 2-norm rather than real volume here; this biases the method
-   * against making long narrow boxes, and it has the side benefit that
-   * a box is splittable iff norm > 0.
-   * Since the differences are expressed in histogram-cell units,
-   * we have to shift back to JSAMPLE units to get consistent distances;
-   * after which, we scale according to the selected distance scale factors.
-   */
-  dist0 = ((c0max - c0min) << C0_SHIFT) * C0_SCALE;
-  dist1 = ((c1max - c1min) << C1_SHIFT) * C1_SCALE;
-  dist2 = ((c2max - c2min) << C2_SHIFT) * C2_SCALE;
-  boxp->volume = dist0*dist0 + dist1*dist1 + dist2*dist2;
-  
-  /* Now scan remaining volume of box and compute population */
-  ccount = 0;
-  for (c0 = c0min; c0 <= c0max; c0++)
-    for (c1 = c1min; c1 <= c1max; c1++) {
-      histp = & histogram[c0][c1][c2min];
-      for (c2 = c2min; c2 <= c2max; c2++, histp++)
-	if (*histp != 0) {
-	  ccount++;
-	}
-    }
-  boxp->colorcount = ccount;
-}
-
-
-LOCAL(int)
-median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,
-	    int desired_colors)
-/* Repeatedly select and split the largest box until we have enough boxes */
-{
-  int n,lb;
-  int c0,c1,c2,cmax;
-  register boxptr b1,b2;
-
-  while (numboxes < desired_colors) {
-    /* Select box to split.
-     * Current algorithm: by population for first half, then by volume.
-     */
-    if (numboxes*2 <= desired_colors) {
-      b1 = find_biggest_color_pop(boxlist, numboxes);
-    } else {
-      b1 = find_biggest_volume(boxlist, numboxes);
-    }
-    if (b1 == NULL)		/* no splittable boxes left! */
-      break;
-    b2 = &boxlist[numboxes];	/* where new box will go */
-    /* Copy the color bounds to the new box. */
-    b2->c0max = b1->c0max; b2->c1max = b1->c1max; b2->c2max = b1->c2max;
-    b2->c0min = b1->c0min; b2->c1min = b1->c1min; b2->c2min = b1->c2min;
-    /* Choose which axis to split the box on.
-     * Current algorithm: longest scaled axis.
-     * See notes in update_box about scaling distances.
-     */
-    c0 = ((b1->c0max - b1->c0min) << C0_SHIFT) * C0_SCALE;
-    c1 = ((b1->c1max - b1->c1min) << C1_SHIFT) * C1_SCALE;
-    c2 = ((b1->c2max - b1->c2min) << C2_SHIFT) * C2_SCALE;
-    /* We want to break any ties in favor of green, then red, blue last.
-     * This code does the right thing for R,G,B or B,G,R color orders only.
-     */
-#if RGB_RED == 0
-    cmax = c1; n = 1;
-    if (c0 > cmax) { cmax = c0; n = 0; }
-    if (c2 > cmax) { n = 2; }
-#else
-    cmax = c1; n = 1;
-    if (c2 > cmax) { cmax = c2; n = 2; }
-    if (c0 > cmax) { n = 0; }
-#endif
-    /* Choose split point along selected axis, and update box bounds.
-     * Current algorithm: split at halfway point.
-     * (Since the box has been shrunk to minimum volume,
-     * any split will produce two nonempty subboxes.)
-     * Note that lb value is max for lower box, so must be < old max.
-     */
-    switch (n) {
-    case 0:
-      lb = (b1->c0max + b1->c0min) / 2;
-      b1->c0max = lb;
-      b2->c0min = lb+1;
-      break;
-    case 1:
-      lb = (b1->c1max + b1->c1min) / 2;
-      b1->c1max = lb;
-      b2->c1min = lb+1;
-      break;
-    case 2:
-      lb = (b1->c2max + b1->c2min) / 2;
-      b1->c2max = lb;
-      b2->c2min = lb+1;
-      break;
-    }
-    /* Update stats for boxes */
-    update_box(cinfo, b1);
-    update_box(cinfo, b2);
-    numboxes++;
-  }
-  return numboxes;
-}
-
-
-LOCAL(void)
-compute_color (j_decompress_ptr cinfo, boxptr boxp, int icolor)
-/* Compute representative color for a box, put it in colormap[icolor] */
-{
-  /* Current algorithm: mean weighted by pixels (not colors) */
-  /* Note it is important to get the rounding correct! */
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  histptr histp;
-  int c0,c1,c2;
-  int c0min,c0max,c1min,c1max,c2min,c2max;
-  long count;
-  long total = 0;
-  long c0total = 0;
-  long c1total = 0;
-  long c2total = 0;
-  
-  c0min = boxp->c0min;  c0max = boxp->c0max;
-  c1min = boxp->c1min;  c1max = boxp->c1max;
-  c2min = boxp->c2min;  c2max = boxp->c2max;
-  
-  for (c0 = c0min; c0 <= c0max; c0++)
-    for (c1 = c1min; c1 <= c1max; c1++) {
-      histp = & histogram[c0][c1][c2min];
-      for (c2 = c2min; c2 <= c2max; c2++) {
-	if ((count = *histp++) != 0) {
-	  total += count;
-	  c0total += ((c0 << C0_SHIFT) + ((1<<C0_SHIFT)>>1)) * count;
-	  c1total += ((c1 << C1_SHIFT) + ((1<<C1_SHIFT)>>1)) * count;
-	  c2total += ((c2 << C2_SHIFT) + ((1<<C2_SHIFT)>>1)) * count;
-	}
-      }
-    }
-  
-  cinfo->colormap[0][icolor] = (JSAMPLE) ((c0total + (total>>1)) / total);
-  cinfo->colormap[1][icolor] = (JSAMPLE) ((c1total + (total>>1)) / total);
-  cinfo->colormap[2][icolor] = (JSAMPLE) ((c2total + (total>>1)) / total);
-}
-
-
-LOCAL(void)
-select_colors (j_decompress_ptr cinfo, int desired_colors)
-/* Master routine for color selection */
-{
-  boxptr boxlist;
-  int numboxes;
-  int i;
-
-  /* Allocate workspace for box list */
-  boxlist = (boxptr) (*cinfo->mem->alloc_small)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE, desired_colors * SIZEOF(box));
-  /* Initialize one box containing whole space */
-  numboxes = 1;
-  boxlist[0].c0min = 0;
-  boxlist[0].c0max = MAXJSAMPLE >> C0_SHIFT;
-  boxlist[0].c1min = 0;
-  boxlist[0].c1max = MAXJSAMPLE >> C1_SHIFT;
-  boxlist[0].c2min = 0;
-  boxlist[0].c2max = MAXJSAMPLE >> C2_SHIFT;
-  /* Shrink it to actually-used volume and set its statistics */
-  update_box(cinfo, & boxlist[0]);
-  /* Perform median-cut to produce final box list */
-  numboxes = median_cut(cinfo, boxlist, numboxes, desired_colors);
-  /* Compute the representative color for each box, fill colormap */
-  for (i = 0; i < numboxes; i++)
-    compute_color(cinfo, & boxlist[i], i);
-  cinfo->actual_number_of_colors = numboxes;
-  TRACEMS1(cinfo, 1, JTRC_QUANT_SELECTED, numboxes);
-}
-
-
-/*
- * These routines are concerned with the time-critical task of mapping input
- * colors to the nearest color in the selected colormap.
- *
- * We re-use the histogram space as an "inverse color map", essentially a
- * cache for the results of nearest-color searches.  All colors within a
- * histogram cell will be mapped to the same colormap entry, namely the one
- * closest to the cell's center.  This may not be quite the closest entry to
- * the actual input color, but it's almost as good.  A zero in the cache
- * indicates we haven't found the nearest color for that cell yet; the array
- * is cleared to zeroes before starting the mapping pass.  When we find the
- * nearest color for a cell, its colormap index plus one is recorded in the
- * cache for future use.  The pass2 scanning routines call fill_inverse_cmap
- * when they need to use an unfilled entry in the cache.
- *
- * Our method of efficiently finding nearest colors is based on the "locally
- * sorted search" idea described by Heckbert and on the incremental distance
- * calculation described by Spencer W. Thomas in chapter III.1 of Graphics
- * Gems II (James Arvo, ed.  Academic Press, 1991).  Thomas points out that
- * the distances from a given colormap entry to each cell of the histogram can
- * be computed quickly using an incremental method: the differences between
- * distances to adjacent cells themselves differ by a constant.  This allows a
- * fairly fast implementation of the "brute force" approach of computing the
- * distance from every colormap entry to every histogram cell.  Unfortunately,
- * it needs a work array to hold the best-distance-so-far for each histogram
- * cell (because the inner loop has to be over cells, not colormap entries).
- * The work array elements have to be INT32s, so the work array would need
- * 256Kb at our recommended precision.  This is not feasible in DOS machines.
- *
- * To get around these problems, we apply Thomas' method to compute the
- * nearest colors for only the cells within a small subbox of the histogram.
- * The work array need be only as big as the subbox, so the memory usage
- * problem is solved.  Furthermore, we need not fill subboxes that are never
- * referenced in pass2; many images use only part of the color gamut, so a
- * fair amount of work is saved.  An additional advantage of this
- * approach is that we can apply Heckbert's locality criterion to quickly
- * eliminate colormap entries that are far away from the subbox; typically
- * three-fourths of the colormap entries are rejected by Heckbert's criterion,
- * and we need not compute their distances to individual cells in the subbox.
- * The speed of this approach is heavily influenced by the subbox size: too
- * small means too much overhead, too big loses because Heckbert's criterion
- * can't eliminate as many colormap entries.  Empirically the best subbox
- * size seems to be about 1/512th of the histogram (1/8th in each direction).
- *
- * Thomas' article also describes a refined method which is asymptotically
- * faster than the brute-force method, but it is also far more complex and
- * cannot efficiently be applied to small subboxes.  It is therefore not
- * useful for programs intended to be portable to DOS machines.  On machines
- * with plenty of memory, filling the whole histogram in one shot with Thomas'
- * refined method might be faster than the present code --- but then again,
- * it might not be any faster, and it's certainly more complicated.
- */
-
-
-/* log2(histogram cells in update box) for each axis; this can be adjusted */
-#define BOX_C0_LOG  (HIST_C0_BITS-3)
-#define BOX_C1_LOG  (HIST_C1_BITS-3)
-#define BOX_C2_LOG  (HIST_C2_BITS-3)
-
-#define BOX_C0_ELEMS  (1<<BOX_C0_LOG) /* # of hist cells in update box */
-#define BOX_C1_ELEMS  (1<<BOX_C1_LOG)
-#define BOX_C2_ELEMS  (1<<BOX_C2_LOG)
-
-#define BOX_C0_SHIFT  (C0_SHIFT + BOX_C0_LOG)
-#define BOX_C1_SHIFT  (C1_SHIFT + BOX_C1_LOG)
-#define BOX_C2_SHIFT  (C2_SHIFT + BOX_C2_LOG)
-
-
-/*
- * The next three routines implement inverse colormap filling.  They could
- * all be folded into one big routine, but splitting them up this way saves
- * some stack space (the mindist[] and bestdist[] arrays need not coexist)
- * and may allow some compilers to produce better code by registerizing more
- * inner-loop variables.
- */
-
-LOCAL(int)
-find_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
-		    JSAMPLE colorlist[])
-/* Locate the colormap entries close enough to an update box to be candidates
- * for the nearest entry to some cell(s) in the update box.  The update box
- * is specified by the center coordinates of its first cell.  The number of
- * candidate colormap entries is returned, and their colormap indexes are
- * placed in colorlist[].
- * This routine uses Heckbert's "locally sorted search" criterion to select
- * the colors that need further consideration.
- */
-{
-  int numcolors = cinfo->actual_number_of_colors;
-  int maxc0, maxc1, maxc2;
-  int centerc0, centerc1, centerc2;
-  int i, x, ncolors;
-  JPEG_INT32 minmaxdist, min_dist, max_dist, tdist;
-  JPEG_INT32 mindist[MAXNUMCOLORS];	/* min distance to colormap entry i */
-
-  /* Compute true coordinates of update box's upper corner and center.
-   * Actually we compute the coordinates of the center of the upper-corner
-   * histogram cell, which are the upper bounds of the volume we care about.
-   * Note that since ">>" rounds down, the "center" values may be closer to
-   * min than to max; hence comparisons to them must be "<=", not "<".
-   */
-  maxc0 = minc0 + ((1 << BOX_C0_SHIFT) - (1 << C0_SHIFT));
-  centerc0 = (minc0 + maxc0) >> 1;
-  maxc1 = minc1 + ((1 << BOX_C1_SHIFT) - (1 << C1_SHIFT));
-  centerc1 = (minc1 + maxc1) >> 1;
-  maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT));
-  centerc2 = (minc2 + maxc2) >> 1;
-
-  /* For each color in colormap, find:
-   *  1. its minimum squared-distance to any point in the update box
-   *     (zero if color is within update box);
-   *  2. its maximum squared-distance to any point in the update box.
-   * Both of these can be found by considering only the corners of the box.
-   * We save the minimum distance for each color in mindist[];
-   * only the smallest maximum distance is of interest.
-   */
-  minmaxdist = 0x7FFFFFFFL;
-
-  for (i = 0; i < numcolors; i++) {
-    /* We compute the squared-c0-distance term, then add in the other two. */
-    x = GETJSAMPLE(cinfo->colormap[0][i]);
-    if (x < minc0) {
-      tdist = (x - minc0) * C0_SCALE;
-      min_dist = tdist*tdist;
-      tdist = (x - maxc0) * C0_SCALE;
-      max_dist = tdist*tdist;
-    } else if (x > maxc0) {
-      tdist = (x - maxc0) * C0_SCALE;
-      min_dist = tdist*tdist;
-      tdist = (x - minc0) * C0_SCALE;
-      max_dist = tdist*tdist;
-    } else {
-      /* within cell range so no contribution to min_dist */
-      min_dist = 0;
-      if (x <= centerc0) {
-	tdist = (x - maxc0) * C0_SCALE;
-	max_dist = tdist*tdist;
-      } else {
-	tdist = (x - minc0) * C0_SCALE;
-	max_dist = tdist*tdist;
-      }
-    }
-
-    x = GETJSAMPLE(cinfo->colormap[1][i]);
-    if (x < minc1) {
-      tdist = (x - minc1) * C1_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - maxc1) * C1_SCALE;
-      max_dist += tdist*tdist;
-    } else if (x > maxc1) {
-      tdist = (x - maxc1) * C1_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - minc1) * C1_SCALE;
-      max_dist += tdist*tdist;
-    } else {
-      /* within cell range so no contribution to min_dist */
-      if (x <= centerc1) {
-	tdist = (x - maxc1) * C1_SCALE;
-	max_dist += tdist*tdist;
-      } else {
-	tdist = (x - minc1) * C1_SCALE;
-	max_dist += tdist*tdist;
-      }
-    }
-
-    x = GETJSAMPLE(cinfo->colormap[2][i]);
-    if (x < minc2) {
-      tdist = (x - minc2) * C2_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - maxc2) * C2_SCALE;
-      max_dist += tdist*tdist;
-    } else if (x > maxc2) {
-      tdist = (x - maxc2) * C2_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - minc2) * C2_SCALE;
-      max_dist += tdist*tdist;
-    } else {
-      /* within cell range so no contribution to min_dist */
-      if (x <= centerc2) {
-	tdist = (x - maxc2) * C2_SCALE;
-	max_dist += tdist*tdist;
-      } else {
-	tdist = (x - minc2) * C2_SCALE;
-	max_dist += tdist*tdist;
-      }
-    }
-
-    mindist[i] = min_dist;	/* save away the results */
-    if (max_dist < minmaxdist)
-      minmaxdist = max_dist;
-  }
-
-  /* Now we know that no cell in the update box is more than minmaxdist
-   * away from some colormap entry.  Therefore, only colors that are
-   * within minmaxdist of some part of the box need be considered.
-   */
-  ncolors = 0;
-  for (i = 0; i < numcolors; i++) {
-    if (mindist[i] <= minmaxdist)
-      colorlist[ncolors++] = (JSAMPLE) i;
-  }
-  return ncolors;
-}
-
-
-LOCAL(void)
-find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
-		  int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[])
-/* Find the closest colormap entry for each cell in the update box,
- * given the list of candidate colors prepared by find_nearby_colors.
- * Return the indexes of the closest entries in the bestcolor[] array.
- * This routine uses Thomas' incremental distance calculation method to
- * find the distance from a colormap entry to successive cells in the box.
- */
-{
-  int ic0, ic1, ic2;
-  int i, icolor;
-  register JPEG_INT32 * bptr;	/* pointer into bestdist[] array */
-  JSAMPLE * cptr;		/* pointer into bestcolor[] array */
-  JPEG_INT32 dist0, dist1;		/* initial distance values */
-  register JPEG_INT32 dist2;		/* current distance in inner loop */
-  JPEG_INT32 xx0, xx1;		/* distance increments */
-  register JPEG_INT32 xx2;
-  JPEG_INT32 inc0, inc1, inc2;	/* initial values for increments */
-  /* This array holds the distance to the nearest-so-far color for each cell */
-  JPEG_INT32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
-
-  /* Initialize best-distance for each cell of the update box */
-  bptr = bestdist;
-  for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--)
-    *bptr++ = 0x7FFFFFFFL;
-  
-  /* For each color selected by find_nearby_colors,
-   * compute its distance to the center of each cell in the box.
-   * If that's less than best-so-far, update best distance and color number.
-   */
-  
-  /* Nominal steps between cell centers ("x" in Thomas article) */
-#define STEP_C0  ((1 << C0_SHIFT) * C0_SCALE)
-#define STEP_C1  ((1 << C1_SHIFT) * C1_SCALE)
-#define STEP_C2  ((1 << C2_SHIFT) * C2_SCALE)
-  
-  for (i = 0; i < numcolors; i++) {
-    icolor = GETJSAMPLE(colorlist[i]);
-    /* Compute (square of) distance from minc0/c1/c2 to this color */
-    inc0 = (minc0 - GETJSAMPLE(cinfo->colormap[0][icolor])) * C0_SCALE;
-    dist0 = inc0*inc0;
-    inc1 = (minc1 - GETJSAMPLE(cinfo->colormap[1][icolor])) * C1_SCALE;
-    dist0 += inc1*inc1;
-    inc2 = (minc2 - GETJSAMPLE(cinfo->colormap[2][icolor])) * C2_SCALE;
-    dist0 += inc2*inc2;
-    /* Form the initial difference increments */
-    inc0 = inc0 * (2 * STEP_C0) + STEP_C0 * STEP_C0;
-    inc1 = inc1 * (2 * STEP_C1) + STEP_C1 * STEP_C1;
-    inc2 = inc2 * (2 * STEP_C2) + STEP_C2 * STEP_C2;
-    /* Now loop over all cells in box, updating distance per Thomas method */
-    bptr = bestdist;
-    cptr = bestcolor;
-    xx0 = inc0;
-    for (ic0 = BOX_C0_ELEMS-1; ic0 >= 0; ic0--) {
-      dist1 = dist0;
-      xx1 = inc1;
-      for (ic1 = BOX_C1_ELEMS-1; ic1 >= 0; ic1--) {
-	dist2 = dist1;
-	xx2 = inc2;
-	for (ic2 = BOX_C2_ELEMS-1; ic2 >= 0; ic2--) {
-	  if (dist2 < *bptr) {
-	    *bptr = dist2;
-	    *cptr = (JSAMPLE) icolor;
-	  }
-	  dist2 += xx2;
-	  xx2 += 2 * STEP_C2 * STEP_C2;
-	  bptr++;
-	  cptr++;
-	}
-	dist1 += xx1;
-	xx1 += 2 * STEP_C1 * STEP_C1;
-      }
-      dist0 += xx0;
-      xx0 += 2 * STEP_C0 * STEP_C0;
-    }
-  }
-}
-
-
-LOCAL(void)
-fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2)
-/* Fill the inverse-colormap entries in the update box that contains */
-/* histogram cell c0/c1/c2.  (Only that one cell MUST be filled, but */
-/* we can fill as many others as we wish.) */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  int minc0, minc1, minc2;	/* lower left corner of update box */
-  int ic0, ic1, ic2;
-  register JSAMPLE * cptr;	/* pointer into bestcolor[] array */
-  register histptr cachep;	/* pointer into main cache array */
-  /* This array lists the candidate colormap indexes. */
-  JSAMPLE colorlist[MAXNUMCOLORS];
-  int numcolors;		/* number of candidate colors */
-  /* This array holds the actually closest colormap index for each cell. */
-  JSAMPLE bestcolor[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
-
-  /* Convert cell coordinates to update box ID */
-  c0 >>= BOX_C0_LOG;
-  c1 >>= BOX_C1_LOG;
-  c2 >>= BOX_C2_LOG;
-
-  /* Compute true coordinates of update box's origin corner.
-   * Actually we compute the coordinates of the center of the corner
-   * histogram cell, which are the lower bounds of the volume we care about.
-   */
-  minc0 = (c0 << BOX_C0_SHIFT) + ((1 << C0_SHIFT) >> 1);
-  minc1 = (c1 << BOX_C1_SHIFT) + ((1 << C1_SHIFT) >> 1);
-  minc2 = (c2 << BOX_C2_SHIFT) + ((1 << C2_SHIFT) >> 1);
-  
-  /* Determine which colormap entries are close enough to be candidates
-   * for the nearest entry to some cell in the update box.
-   */
-  numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist);
-
-  /* Determine the actually nearest colors. */
-  find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist,
-		   bestcolor);
-
-  /* Save the best color numbers (plus 1) in the main cache array */
-  c0 <<= BOX_C0_LOG;		/* convert ID back to base cell indexes */
-  c1 <<= BOX_C1_LOG;
-  c2 <<= BOX_C2_LOG;
-  cptr = bestcolor;
-  for (ic0 = 0; ic0 < BOX_C0_ELEMS; ic0++) {
-    for (ic1 = 0; ic1 < BOX_C1_ELEMS; ic1++) {
-      cachep = & histogram[c0+ic0][c1+ic1][c2];
-      for (ic2 = 0; ic2 < BOX_C2_ELEMS; ic2++) {
-	*cachep++ = (histcell) (GETJSAMPLE(*cptr++) + 1);
-      }
-    }
-  }
-}
-
-
-/*
- * Map some rows of pixels to the output colormapped representation.
- */
-
-METHODDEF(void)
-pass2_no_dither (j_decompress_ptr cinfo,
-		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
-/* This version performs no dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  register JSAMPROW inptr, outptr;
-  register histptr cachep;
-  register int c0, c1, c2;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    inptr = input_buf[row];
-    outptr = output_buf[row];
-    for (col = width; col > 0; col--) {
-      /* get pixel value and index into the cache */
-      c0 = GETJSAMPLE(*inptr++) >> C0_SHIFT;
-      c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT;
-      c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT;
-      cachep = & histogram[c0][c1][c2];
-      /* If we have not seen this color before, find nearest colormap entry */
-      /* and update the cache */
-      if (*cachep == 0)
-	fill_inverse_cmap(cinfo, c0,c1,c2);
-      /* Now emit the colormap index for this cell */
-      *outptr++ = (JSAMPLE) (*cachep - 1);
-    }
-  }
-}
-
-
-METHODDEF(void)
-pass2_fs_dither (j_decompress_ptr cinfo,
-		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
-/* This version performs Floyd-Steinberg dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  register LOCFSERROR cur0, cur1, cur2;	/* current error or pixel value */
-  LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */
-  LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */
-  register FSERRPTR errorptr;	/* => fserrors[] at column before current */
-  JSAMPROW inptr;		/* => current input pixel */
-  JSAMPROW outptr;		/* => current output pixel */
-  histptr cachep;
-  int dir;			/* +1 or -1 depending on direction */
-  int dir3;			/* 3*dir, for advancing inptr & errorptr */
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-  JSAMPLE *range_limit = cinfo->sample_range_limit;
-  int *error_limit = cquantize->error_limiter;
-  JSAMPROW colormap0 = cinfo->colormap[0];
-  JSAMPROW colormap1 = cinfo->colormap[1];
-  JSAMPROW colormap2 = cinfo->colormap[2];
-  SHIFT_TEMPS
-
-  for (row = 0; row < num_rows; row++) {
-    inptr = input_buf[row];
-    outptr = output_buf[row];
-    if (cquantize->on_odd_row) {
-      /* work right to left in this row */
-      inptr += (width-1) * 3;	/* so point to rightmost pixel */
-      outptr += width-1;
-      dir = -1;
-      dir3 = -3;
-      errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */
-      cquantize->on_odd_row = FALSE; /* flip for next time */
-    } else {
-      /* work left to right in this row */
-      dir = 1;
-      dir3 = 3;
-      errorptr = cquantize->fserrors; /* => entry before first real column */
-      cquantize->on_odd_row = TRUE; /* flip for next time */
-    }
-    /* Preset error values: no error propagated to first pixel from left */
-    cur0 = cur1 = cur2 = 0;
-    /* and no error propagated to row below yet */
-    belowerr0 = belowerr1 = belowerr2 = 0;
-    bpreverr0 = bpreverr1 = bpreverr2 = 0;
-
-    for (col = width; col > 0; col--) {
-      /* curN holds the error propagated from the previous pixel on the
-       * current line.  Add the error propagated from the previous line
-       * to form the complete error correction term for this pixel, and
-       * round the error term (which is expressed * 16) to an integer.
-       * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
-       * for either sign of the error value.
-       * Note: errorptr points to *previous* column's array entry.
-       */
-      cur0 = RIGHT_SHIFT(cur0 + errorptr[dir3+0] + 8, 4);
-      cur1 = RIGHT_SHIFT(cur1 + errorptr[dir3+1] + 8, 4);
-      cur2 = RIGHT_SHIFT(cur2 + errorptr[dir3+2] + 8, 4);
-      /* Limit the error using transfer function set by init_error_limit.
-       * See comments with init_error_limit for rationale.
-       */
-      cur0 = error_limit[cur0];
-      cur1 = error_limit[cur1];
-      cur2 = error_limit[cur2];
-      /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
-       * The maximum error is +- MAXJSAMPLE (or less with error limiting);
-       * this sets the required size of the range_limit array.
-       */
-      cur0 += GETJSAMPLE(inptr[0]);
-      cur1 += GETJSAMPLE(inptr[1]);
-      cur2 += GETJSAMPLE(inptr[2]);
-      cur0 = GETJSAMPLE(range_limit[cur0]);
-      cur1 = GETJSAMPLE(range_limit[cur1]);
-      cur2 = GETJSAMPLE(range_limit[cur2]);
-      /* Index into the cache with adjusted pixel value */
-      cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT];
-      /* If we have not seen this color before, find nearest colormap */
-      /* entry and update the cache */
-      if (*cachep == 0)
-	fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT);
-      /* Now emit the colormap index for this cell */
-      { register int pixcode = *cachep - 1;
-	*outptr = (JSAMPLE) pixcode;
-	/* Compute representation error for this pixel */
-	cur0 -= GETJSAMPLE(colormap0[pixcode]);
-	cur1 -= GETJSAMPLE(colormap1[pixcode]);
-	cur2 -= GETJSAMPLE(colormap2[pixcode]);
-      }
-      /* Compute error fractions to be propagated to adjacent pixels.
-       * Add these into the running sums, and simultaneously shift the
-       * next-line error sums left by 1 column.
-       */
-      { register LOCFSERROR bnexterr, delta;
-
-	bnexterr = cur0;	/* Process component 0 */
-	delta = cur0 * 2;
-	cur0 += delta;		/* form error * 3 */
-	errorptr[0] = (FSERROR) (bpreverr0 + cur0);
-	cur0 += delta;		/* form error * 5 */
-	bpreverr0 = belowerr0 + cur0;
-	belowerr0 = bnexterr;
-	cur0 += delta;		/* form error * 7 */
-	bnexterr = cur1;	/* Process component 1 */
-	delta = cur1 * 2;
-	cur1 += delta;		/* form error * 3 */
-	errorptr[1] = (FSERROR) (bpreverr1 + cur1);
-	cur1 += delta;		/* form error * 5 */
-	bpreverr1 = belowerr1 + cur1;
-	belowerr1 = bnexterr;
-	cur1 += delta;		/* form error * 7 */
-	bnexterr = cur2;	/* Process component 2 */
-	delta = cur2 * 2;
-	cur2 += delta;		/* form error * 3 */
-	errorptr[2] = (FSERROR) (bpreverr2 + cur2);
-	cur2 += delta;		/* form error * 5 */
-	bpreverr2 = belowerr2 + cur2;
-	belowerr2 = bnexterr;
-	cur2 += delta;		/* form error * 7 */
-      }
-      /* At this point curN contains the 7/16 error value to be propagated
-       * to the next pixel on the current line, and all the errors for the
-       * next line have been shifted over.  We are therefore ready to move on.
-       */
-      inptr += dir3;		/* Advance pixel pointers to next column */
-      outptr += dir;
-      errorptr += dir3;		/* advance errorptr to current column */
-    }
-    /* Post-loop cleanup: we must unload the final error values into the
-     * final fserrors[] entry.  Note we need not unload belowerrN because
-     * it is for the dummy column before or after the actual array.
-     */
-    errorptr[0] = (FSERROR) bpreverr0; /* unload prev errs into array */
-    errorptr[1] = (FSERROR) bpreverr1;
-    errorptr[2] = (FSERROR) bpreverr2;
-  }
-}
-
-
-/*
- * Initialize the error-limiting transfer function (lookup table).
- * The raw F-S error computation can potentially compute error values of up to
- * +- MAXJSAMPLE.  But we want the maximum correction applied to a pixel to be
- * much less, otherwise obviously wrong pixels will be created.  (Typical
- * effects include weird fringes at color-area boundaries, isolated bright
- * pixels in a dark area, etc.)  The standard advice for avoiding this problem
- * is to ensure that the "corners" of the color cube are allocated as output
- * colors; then repeated errors in the same direction cannot cause cascading
- * error buildup.  However, that only prevents the error from getting
- * completely out of hand; Aaron Giles reports that error limiting improves
- * the results even with corner colors allocated.
- * A simple clamping of the error values to about +- MAXJSAMPLE/8 works pretty
- * well, but the smoother transfer function used below is even better.  Thanks
- * to Aaron Giles for this idea.
- */
-
-LOCAL(void)
-init_error_limit (j_decompress_ptr cinfo)
-/* Allocate and fill in the error_limiter table */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  int * table;
-  int in, out;
-
-  table = (int *) (*cinfo->mem->alloc_small)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE*2+1) * SIZEOF(int));
-  table += MAXJSAMPLE;		/* so can index -MAXJSAMPLE .. +MAXJSAMPLE */
-  cquantize->error_limiter = table;
-
-#define STEPSIZE ((MAXJSAMPLE+1)/16)
-  /* Map errors 1:1 up to +- MAXJSAMPLE/16 */
-  out = 0;
-  for (in = 0; in < STEPSIZE; in++, out++) {
-    table[in] = out; table[-in] = -out;
-  }
-  /* Map errors 1:2 up to +- 3*MAXJSAMPLE/16 */
-  for (; in < STEPSIZE*3; in++, out += (in&1) ? 0 : 1) {
-    table[in] = out; table[-in] = -out;
-  }
-  /* Clamp the rest to final out value (which is (MAXJSAMPLE+1)/8) */
-  for (; in <= MAXJSAMPLE; in++) {
-    table[in] = out; table[-in] = -out;
-  }
-#undef STEPSIZE
-}
-
-
-/*
- * Finish up at the end of each pass.
- */
-
-METHODDEF(void)
-finish_pass1 (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-
-  /* Select the representative colors and fill in cinfo->colormap */
-  cinfo->colormap = cquantize->sv_colormap;
-  select_colors(cinfo, cquantize->desired);
-  /* Force next pass to zero the color index table */
-  cquantize->needs_zeroed = TRUE;
-}
-
-
-METHODDEF(void)
-finish_pass2 (j_decompress_ptr cinfo)
-{
-  /* no work */
-}
-
-
-/*
- * Initialize for each processing pass.
- */
-
-METHODDEF(void)
-start_pass_2_quant (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  int i;
-
-  /* Only F-S dithering or no dithering is supported. */
-  /* If user asks for ordered dither, give him F-S. */
-  if (cinfo->dither_mode != JDITHER_NONE)
-    cinfo->dither_mode = JDITHER_FS;
-
-  if (is_pre_scan) {
-    /* Set up method pointers */
-    cquantize->pub.color_quantize = prescan_quantize;
-    cquantize->pub.finish_pass = finish_pass1;
-    cquantize->needs_zeroed = TRUE; /* Always zero histogram */
-  } else {
-    /* Set up method pointers */
-    if (cinfo->dither_mode == JDITHER_FS)
-      cquantize->pub.color_quantize = pass2_fs_dither;
-    else
-      cquantize->pub.color_quantize = pass2_no_dither;
-    cquantize->pub.finish_pass = finish_pass2;
-
-    /* Make sure color count is acceptable */
-    i = cinfo->actual_number_of_colors;
-    if (i < 1)
-      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 1);
-    if (i > MAXNUMCOLORS)
-      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);
-
-    if (cinfo->dither_mode == JDITHER_FS) {
-      size_t arraysize = (size_t) ((cinfo->output_width + 2) *
-				   (3 * SIZEOF(FSERROR)));
-      /* Allocate Floyd-Steinberg workspace if we didn't already. */
-      if (cquantize->fserrors == NULL)
-	cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)
-	  ((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);
-      /* Initialize the propagated errors to zero. */
-      jzero_far((void FAR *) cquantize->fserrors, arraysize);
-      /* Make the error-limit table if we didn't already. */
-      if (cquantize->error_limiter == NULL)
-	init_error_limit(cinfo);
-      cquantize->on_odd_row = FALSE;
-    }
-
-  }
-  /* Zero the histogram or inverse color map, if necessary */
-  if (cquantize->needs_zeroed) {
-    for (i = 0; i < HIST_C0_ELEMS; i++) {
-      jzero_far((void FAR *) histogram[i],
-		HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
-    }
-    cquantize->needs_zeroed = FALSE;
-  }
-}
-
-
-/*
- * Switch to a new external colormap between output passes.
- */
-
-METHODDEF(void)
-new_color_map_2_quant (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-
-  /* Reset the inverse color map */
-  cquantize->needs_zeroed = TRUE;
-}
-
-
-/*
- * Module initialization routine for 2-pass color quantization.
- */
-
-GLOBAL(void)
-jinit_2pass_quantizer (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize;
-  int i;
-
-  cquantize = (my_cquantize_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_cquantizer));
-  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;
-  cquantize->pub.start_pass = start_pass_2_quant;
-  cquantize->pub.new_color_map = new_color_map_2_quant;
-  cquantize->fserrors = NULL;	/* flag optional arrays not allocated */
-  cquantize->error_limiter = NULL;
-
-  /* Make sure jdmaster didn't give me a case I can't handle */
-  if (cinfo->out_color_components != 3)
-    ERREXIT(cinfo, JERR_NOTIMPL);
-
-  /* Allocate the histogram/inverse colormap storage */
-  cquantize->histogram = (hist3d) (*cinfo->mem->alloc_small)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE, HIST_C0_ELEMS * SIZEOF(hist2d));
-  for (i = 0; i < HIST_C0_ELEMS; i++) {
-    cquantize->histogram[i] = (hist2d) (*cinfo->mem->alloc_large)
-      ((j_common_ptr) cinfo, JPOOL_IMAGE,
-       HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
-  }
-  cquantize->needs_zeroed = TRUE; /* histogram is garbage now */
-
-  /* Allocate storage for the completed colormap, if required.
-   * We do this now since it is FAR storage and may affect
-   * the memory manager's space calculations.
-   */
-  if (cinfo->enable_2pass_quant) {
-    /* Make sure color count is acceptable */
-    int desired = cinfo->desired_number_of_colors;
-    /* Lower bound on # of colors ... somewhat arbitrary as long as > 0 */
-    if (desired < 8)
-      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 8);
-    /* Make sure colormap indexes can be represented by JSAMPLEs */
-    if (desired > MAXNUMCOLORS)
-      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);
-    cquantize->sv_colormap = (*cinfo->mem->alloc_sarray)
-      ((j_common_ptr) cinfo,JPOOL_IMAGE, (JDIMENSION) desired, (JDIMENSION) 3);
-    cquantize->desired = desired;
-  } else
-    cquantize->sv_colormap = NULL;
-
-  /* Only F-S dithering or no dithering is supported. */
-  /* If user asks for ordered dither, give him F-S. */
-  if (cinfo->dither_mode != JDITHER_NONE)
-    cinfo->dither_mode = JDITHER_FS;
-
-  /* Allocate Floyd-Steinberg workspace if necessary.
-   * This isn't really needed until pass 2, but again it is FAR storage.
-   * Although we will cope with a later change in dither_mode,
-   * we do not promise to honor max_memory_to_use if dither_mode changes.
-   */
-  if (cinfo->dither_mode == JDITHER_FS) {
-    cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)
-      ((j_common_ptr) cinfo, JPOOL_IMAGE,
-       (size_t) ((cinfo->output_width + 2) * (3 * SIZEOF(FSERROR))));
-    /* Might as well create the error-limiting table too. */
-    init_error_limit(cinfo);
-  }
-}
-
-#endif /* QUANT_2PASS_SUPPORTED */
+/*
+ * jquant2.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains 2-pass color quantization (color mapping) routines.
+ * These routines provide selection of a custom color map for an image,
+ * followed by mapping of the image to that color map, with optional
+ * Floyd-Steinberg dithering.
+ * It is also possible to use just the second pass to map to an arbitrary
+ * externally-given color map.
+ *
+ * Note: ordered dithering is not supported, since there isn't any fast
+ * way to compute intercolor distances; it's unclear that ordered dither's
+ * fundamental assumptions even hold with an irregularly spaced color map.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+#ifdef QUANT_2PASS_SUPPORTED
+
+
+/*
+ * This module implements the well-known Heckbert paradigm for color
+ * quantization.  Most of the ideas used here can be traced back to
+ * Heckbert's seminal paper
+ *   Heckbert, Paul.  "Color Image Quantization for Frame Buffer Display",
+ *   Proc. SIGGRAPH '82, Computer Graphics v.16 #3 (July 1982), pp 297-304.
+ *
+ * In the first pass over the image, we accumulate a histogram showing the
+ * usage count of each possible color.  To keep the histogram to a reasonable
+ * size, we reduce the precision of the input; typical practice is to retain
+ * 5 or 6 bits per color, so that 8 or 4 different input values are counted
+ * in the same histogram cell.
+ *
+ * Next, the color-selection step begins with a box representing the whole
+ * color space, and repeatedly splits the "largest" remaining box until we
+ * have as many boxes as desired colors.  Then the mean color in each
+ * remaining box becomes one of the possible output colors.
+ * 
+ * The second pass over the image maps each input pixel to the closest output
+ * color (optionally after applying a Floyd-Steinberg dithering correction).
+ * This mapping is logically trivial, but making it go fast enough requires
+ * considerable care.
+ *
+ * Heckbert-style quantizers vary a good deal in their policies for choosing
+ * the "largest" box and deciding where to cut it.  The particular policies
+ * used here have proved out well in experimental comparisons, but better ones
+ * may yet be found.
+ *
+ * In earlier versions of the IJG code, this module quantized in YCbCr color
+ * space, processing the raw upsampled data without a color conversion step.
+ * This allowed the color conversion math to be done only once per colormap
+ * entry, not once per pixel.  However, that optimization precluded other
+ * useful optimizations (such as merging color conversion with upsampling)
+ * and it also interfered with desired capabilities such as quantizing to an
+ * externally-supplied colormap.  We have therefore abandoned that approach.
+ * The present code works in the post-conversion color space, typically RGB.
+ *
+ * To improve the visual quality of the results, we actually work in scaled
+ * RGB space, giving G distances more weight than R, and R in turn more than
+ * B.  To do everything in integer math, we must use integer scale factors.
+ * The 2/3/1 scale factors used here correspond loosely to the relative
+ * weights of the colors in the NTSC grayscale equation.
+ * If you want to use this code to quantize a non-RGB color space, you'll
+ * probably need to change these scale factors.
+ */
+
+#define R_SCALE 2		/* scale R distances by this much */
+#define G_SCALE 3		/* scale G distances by this much */
+#define B_SCALE 1		/* and B by this much */
+
+/* Relabel R/G/B as components 0/1/2, respecting the RGB ordering defined
+ * in jmorecfg.h.  As the code stands, it will do the right thing for R,G,B
+ * and B,G,R orders.  If you define some other weird order in jmorecfg.h,
+ * you'll get compile errors until you extend this logic.  In that case
+ * you'll probably want to tweak the histogram sizes too.
+ */
+
+#if RGB_RED == 0
+#define C0_SCALE R_SCALE
+#endif
+#if RGB_BLUE == 0
+#define C0_SCALE B_SCALE
+#endif
+#if RGB_GREEN == 1
+#define C1_SCALE G_SCALE
+#endif
+#if RGB_RED == 2
+#define C2_SCALE R_SCALE
+#endif
+#if RGB_BLUE == 2
+#define C2_SCALE B_SCALE
+#endif
+
+
+/*
+ * First we have the histogram data structure and routines for creating it.
+ *
+ * The number of bits of precision can be adjusted by changing these symbols.
+ * We recommend keeping 6 bits for G and 5 each for R and B.
+ * If you have plenty of memory and cycles, 6 bits all around gives marginally
+ * better results; if you are short of memory, 5 bits all around will save
+ * some space but degrade the results.
+ * To maintain a fully accurate histogram, we'd need to allocate a "long"
+ * (preferably unsigned long) for each cell.  In practice this is overkill;
+ * we can get by with 16 bits per cell.  Few of the cell counts will overflow,
+ * and clamping those that do overflow to the maximum value will give close-
+ * enough results.  This reduces the recommended histogram size from 256Kb
+ * to 128Kb, which is a useful savings on PC-class machines.
+ * (In the second pass the histogram space is re-used for pixel mapping data;
+ * in that capacity, each cell must be able to store zero to the number of
+ * desired colors.  16 bits/cell is plenty for that too.)
+ * Since the JPEG code is intended to run in small memory model on 80x86
+ * machines, we can't just allocate the histogram in one chunk.  Instead
+ * of a true 3-D array, we use a row of pointers to 2-D arrays.  Each
+ * pointer corresponds to a C0 value (typically 2^5 = 32 pointers) and
+ * each 2-D array has 2^6*2^5 = 2048 or 2^6*2^6 = 4096 entries.  Note that
+ * on 80x86 machines, the pointer row is in near memory but the actual
+ * arrays are in far memory (same arrangement as we use for image arrays).
+ */
+
+#define MAXNUMCOLORS  (MAXJSAMPLE+1) /* maximum size of colormap */
+
+/* These will do the right thing for either R,G,B or B,G,R color order,
+ * but you may not like the results for other color orders.
+ */
+#define HIST_C0_BITS  5		/* bits of precision in R/B histogram */
+#define HIST_C1_BITS  6		/* bits of precision in G histogram */
+#define HIST_C2_BITS  5		/* bits of precision in B/R histogram */
+
+/* Number of elements along histogram axes. */
+#define HIST_C0_ELEMS  (1<<HIST_C0_BITS)
+#define HIST_C1_ELEMS  (1<<HIST_C1_BITS)
+#define HIST_C2_ELEMS  (1<<HIST_C2_BITS)
+
+/* These are the amounts to shift an input value to get a histogram index. */
+#define C0_SHIFT  (BITS_IN_JSAMPLE-HIST_C0_BITS)
+#define C1_SHIFT  (BITS_IN_JSAMPLE-HIST_C1_BITS)
+#define C2_SHIFT  (BITS_IN_JSAMPLE-HIST_C2_BITS)
+
+
+typedef UINT16 histcell;	/* histogram cell; prefer an unsigned type */
+
+typedef histcell FAR * histptr;	/* for pointers to histogram cells */
+
+typedef histcell hist1d[HIST_C2_ELEMS]; /* typedefs for the array */
+typedef hist1d FAR * hist2d;	/* type for the 2nd-level pointers */
+typedef hist2d * hist3d;	/* type for top-level pointer */
+
+
+/* Declarations for Floyd-Steinberg dithering.
+ *
+ * Errors are accumulated into the array fserrors[], at a resolution of
+ * 1/16th of a pixel count.  The error at a given pixel is propagated
+ * to its not-yet-processed neighbors using the standard F-S fractions,
+ *		...	(here)	7/16
+ *		3/16	5/16	1/16
+ * We work left-to-right on even rows, right-to-left on odd rows.
+ *
+ * We can get away with a single array (holding one row's worth of errors)
+ * by using it to store the current row's errors at pixel columns not yet
+ * processed, but the next row's errors at columns already processed.  We
+ * need only a few extra variables to hold the errors immediately around the
+ * current column.  (If we are lucky, those variables are in registers, but
+ * even if not, they're probably cheaper to access than array elements are.)
+ *
+ * The fserrors[] array has (#columns + 2) entries; the extra entry at
+ * each end saves us from special-casing the first and last pixels.
+ * Each entry is three values long, one value for each color component.
+ *
+ * Note: on a wide image, we might not have enough room in a PC's near data
+ * segment to hold the error array; so it is allocated with alloc_large.
+ */
+
+#if BITS_IN_JSAMPLE == 8
+typedef INT16 FSERROR;		/* 16 bits should be enough */
+typedef int LOCFSERROR;		/* use 'int' for calculation temps */
+#else
+typedef JPEG_INT32 FSERROR;		/* may need more than 16 bits */
+typedef JPEG_INT32 LOCFSERROR;	/* be sure calculation temps are big enough */
+#endif
+
+typedef FSERROR FAR *FSERRPTR;	/* pointer to error array (in FAR storage!) */
+
+
+/* Private subobject */
+
+typedef struct {
+  struct jpeg_color_quantizer pub; /* public fields */
+
+  /* Space for the eventually created colormap is stashed here */
+  JSAMPARRAY sv_colormap;	/* colormap allocated at init time */
+  int desired;			/* desired # of colors = size of colormap */
+
+  /* Variables for accumulating image statistics */
+  hist3d histogram;		/* pointer to the histogram */
+
+  wxjpeg_boolean needs_zeroed;		/* TRUE if next pass must zero histogram */
+
+  /* Variables for Floyd-Steinberg dithering */
+  FSERRPTR fserrors;		/* accumulated errors */
+  wxjpeg_boolean on_odd_row;		/* flag to remember which row we are on */
+  int * error_limiter;		/* table for clamping the applied error */
+} my_cquantizer;
+
+typedef my_cquantizer * my_cquantize_ptr;
+
+
+/*
+ * Prescan some rows of pixels.
+ * In this module the prescan simply updates the histogram, which has been
+ * initialized to zeroes by start_pass.
+ * An output_buf parameter is required by the method signature, but no data
+ * is actually output (in fact the buffer controller is probably passing a
+ * NULL pointer).
+ */
+
+METHODDEF(void)
+prescan_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
+		  JSAMPARRAY output_buf, int num_rows)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  register JSAMPROW ptr;
+  register histptr histp;
+  register hist3d histogram = cquantize->histogram;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    ptr = input_buf[row];
+    for (col = width; col > 0; col--) {
+      /* get pixel value and index into the histogram */
+      histp = & histogram[GETJSAMPLE(ptr[0]) >> C0_SHIFT]
+			 [GETJSAMPLE(ptr[1]) >> C1_SHIFT]
+			 [GETJSAMPLE(ptr[2]) >> C2_SHIFT];
+      /* increment, check for overflow and undo increment if so. */
+      if (++(*histp) <= 0)
+	(*histp)--;
+      ptr += 3;
+    }
+  }
+}
+
+
+/*
+ * Next we have the really interesting routines: selection of a colormap
+ * given the completed histogram.
+ * These routines work with a list of "boxes", each representing a rectangular
+ * subset of the input color space (to histogram precision).
+ */
+
+typedef struct {
+  /* The bounds of the box (inclusive); expressed as histogram indexes */
+  int c0min, c0max;
+  int c1min, c1max;
+  int c2min, c2max;
+  /* The volume (actually 2-norm) of the box */
+  JPEG_INT32 volume;
+  /* The number of nonzero histogram cells within this box */
+  long colorcount;
+} box;
+
+typedef box * boxptr;
+
+
+LOCAL(boxptr)
+find_biggest_color_pop (boxptr boxlist, int numboxes)
+/* Find the splittable box with the largest color population */
+/* Returns NULL if no splittable boxes remain */
+{
+  register boxptr boxp;
+  register int i;
+  register long maxc = 0;
+  boxptr which = NULL;
+  
+  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+    if (boxp->colorcount > maxc && boxp->volume > 0) {
+      which = boxp;
+      maxc = boxp->colorcount;
+    }
+  }
+  return which;
+}
+
+
+LOCAL(boxptr)
+find_biggest_volume (boxptr boxlist, int numboxes)
+/* Find the splittable box with the largest (scaled) volume */
+/* Returns NULL if no splittable boxes remain */
+{
+  register boxptr boxp;
+  register int i;
+  register JPEG_INT32 maxv = 0;
+  boxptr which = NULL;
+  
+  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
+    if (boxp->volume > maxv) {
+      which = boxp;
+      maxv = boxp->volume;
+    }
+  }
+  return which;
+}
+
+
+LOCAL(void)
+update_box (j_decompress_ptr cinfo, boxptr boxp)
+/* Shrink the min/max bounds of a box to enclose only nonzero elements, */
+/* and recompute its volume and population */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  histptr histp;
+  int c0,c1,c2;
+  int c0min,c0max,c1min,c1max,c2min,c2max;
+  JPEG_INT32 dist0,dist1,dist2;
+  long ccount;
+  
+  c0min = boxp->c0min;  c0max = boxp->c0max;
+  c1min = boxp->c1min;  c1max = boxp->c1max;
+  c2min = boxp->c2min;  c2max = boxp->c2max;
+  
+  if (c0max > c0min)
+    for (c0 = c0min; c0 <= c0max; c0++)
+      for (c1 = c1min; c1 <= c1max; c1++) {
+	histp = & histogram[c0][c1][c2min];
+	for (c2 = c2min; c2 <= c2max; c2++)
+	  if (*histp++ != 0) {
+	    boxp->c0min = c0min = c0;
+	    goto have_c0min;
+	  }
+      }
+ have_c0min:
+  if (c0max > c0min)
+    for (c0 = c0max; c0 >= c0min; c0--)
+      for (c1 = c1min; c1 <= c1max; c1++) {
+	histp = & histogram[c0][c1][c2min];
+	for (c2 = c2min; c2 <= c2max; c2++)
+	  if (*histp++ != 0) {
+	    boxp->c0max = c0max = c0;
+	    goto have_c0max;
+	  }
+      }
+ have_c0max:
+  if (c1max > c1min)
+    for (c1 = c1min; c1 <= c1max; c1++)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+	histp = & histogram[c0][c1][c2min];
+	for (c2 = c2min; c2 <= c2max; c2++)
+	  if (*histp++ != 0) {
+	    boxp->c1min = c1min = c1;
+	    goto have_c1min;
+	  }
+      }
+ have_c1min:
+  if (c1max > c1min)
+    for (c1 = c1max; c1 >= c1min; c1--)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+	histp = & histogram[c0][c1][c2min];
+	for (c2 = c2min; c2 <= c2max; c2++)
+	  if (*histp++ != 0) {
+	    boxp->c1max = c1max = c1;
+	    goto have_c1max;
+	  }
+      }
+ have_c1max:
+  if (c2max > c2min)
+    for (c2 = c2min; c2 <= c2max; c2++)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+	histp = & histogram[c0][c1min][c2];
+	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
+	  if (*histp != 0) {
+	    boxp->c2min = c2min = c2;
+	    goto have_c2min;
+	  }
+      }
+ have_c2min:
+  if (c2max > c2min)
+    for (c2 = c2max; c2 >= c2min; c2--)
+      for (c0 = c0min; c0 <= c0max; c0++) {
+	histp = & histogram[c0][c1min][c2];
+	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
+	  if (*histp != 0) {
+	    boxp->c2max = c2max = c2;
+	    goto have_c2max;
+	  }
+      }
+ have_c2max:
+
+  /* Update box volume.
+   * We use 2-norm rather than real volume here; this biases the method
+   * against making long narrow boxes, and it has the side benefit that
+   * a box is splittable iff norm > 0.
+   * Since the differences are expressed in histogram-cell units,
+   * we have to shift back to JSAMPLE units to get consistent distances;
+   * after which, we scale according to the selected distance scale factors.
+   */
+  dist0 = ((c0max - c0min) << C0_SHIFT) * C0_SCALE;
+  dist1 = ((c1max - c1min) << C1_SHIFT) * C1_SCALE;
+  dist2 = ((c2max - c2min) << C2_SHIFT) * C2_SCALE;
+  boxp->volume = dist0*dist0 + dist1*dist1 + dist2*dist2;
+  
+  /* Now scan remaining volume of box and compute population */
+  ccount = 0;
+  for (c0 = c0min; c0 <= c0max; c0++)
+    for (c1 = c1min; c1 <= c1max; c1++) {
+      histp = & histogram[c0][c1][c2min];
+      for (c2 = c2min; c2 <= c2max; c2++, histp++)
+	if (*histp != 0) {
+	  ccount++;
+	}
+    }
+  boxp->colorcount = ccount;
+}
+
+
+LOCAL(int)
+median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,
+	    int desired_colors)
+/* Repeatedly select and split the largest box until we have enough boxes */
+{
+  int n,lb;
+  int c0,c1,c2,cmax;
+  register boxptr b1,b2;
+
+  while (numboxes < desired_colors) {
+    /* Select box to split.
+     * Current algorithm: by population for first half, then by volume.
+     */
+    if (numboxes*2 <= desired_colors) {
+      b1 = find_biggest_color_pop(boxlist, numboxes);
+    } else {
+      b1 = find_biggest_volume(boxlist, numboxes);
+    }
+    if (b1 == NULL)		/* no splittable boxes left! */
+      break;
+    b2 = &boxlist[numboxes];	/* where new box will go */
+    /* Copy the color bounds to the new box. */
+    b2->c0max = b1->c0max; b2->c1max = b1->c1max; b2->c2max = b1->c2max;
+    b2->c0min = b1->c0min; b2->c1min = b1->c1min; b2->c2min = b1->c2min;
+    /* Choose which axis to split the box on.
+     * Current algorithm: longest scaled axis.
+     * See notes in update_box about scaling distances.
+     */
+    c0 = ((b1->c0max - b1->c0min) << C0_SHIFT) * C0_SCALE;
+    c1 = ((b1->c1max - b1->c1min) << C1_SHIFT) * C1_SCALE;
+    c2 = ((b1->c2max - b1->c2min) << C2_SHIFT) * C2_SCALE;
+    /* We want to break any ties in favor of green, then red, blue last.
+     * This code does the right thing for R,G,B or B,G,R color orders only.
+     */
+#if RGB_RED == 0
+    cmax = c1; n = 1;
+    if (c0 > cmax) { cmax = c0; n = 0; }
+    if (c2 > cmax) { n = 2; }
+#else
+    cmax = c1; n = 1;
+    if (c2 > cmax) { cmax = c2; n = 2; }
+    if (c0 > cmax) { n = 0; }
+#endif
+    /* Choose split point along selected axis, and update box bounds.
+     * Current algorithm: split at halfway point.
+     * (Since the box has been shrunk to minimum volume,
+     * any split will produce two nonempty subboxes.)
+     * Note that lb value is max for lower box, so must be < old max.
+     */
+    switch (n) {
+    case 0:
+      lb = (b1->c0max + b1->c0min) / 2;
+      b1->c0max = lb;
+      b2->c0min = lb+1;
+      break;
+    case 1:
+      lb = (b1->c1max + b1->c1min) / 2;
+      b1->c1max = lb;
+      b2->c1min = lb+1;
+      break;
+    case 2:
+      lb = (b1->c2max + b1->c2min) / 2;
+      b1->c2max = lb;
+      b2->c2min = lb+1;
+      break;
+    }
+    /* Update stats for boxes */
+    update_box(cinfo, b1);
+    update_box(cinfo, b2);
+    numboxes++;
+  }
+  return numboxes;
+}
+
+
+LOCAL(void)
+compute_color (j_decompress_ptr cinfo, boxptr boxp, int icolor)
+/* Compute representative color for a box, put it in colormap[icolor] */
+{
+  /* Current algorithm: mean weighted by pixels (not colors) */
+  /* Note it is important to get the rounding correct! */
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  histptr histp;
+  int c0,c1,c2;
+  int c0min,c0max,c1min,c1max,c2min,c2max;
+  long count;
+  long total = 0;
+  long c0total = 0;
+  long c1total = 0;
+  long c2total = 0;
+  
+  c0min = boxp->c0min;  c0max = boxp->c0max;
+  c1min = boxp->c1min;  c1max = boxp->c1max;
+  c2min = boxp->c2min;  c2max = boxp->c2max;
+  
+  for (c0 = c0min; c0 <= c0max; c0++)
+    for (c1 = c1min; c1 <= c1max; c1++) {
+      histp = & histogram[c0][c1][c2min];
+      for (c2 = c2min; c2 <= c2max; c2++) {
+	if ((count = *histp++) != 0) {
+	  total += count;
+	  c0total += ((c0 << C0_SHIFT) + ((1<<C0_SHIFT)>>1)) * count;
+	  c1total += ((c1 << C1_SHIFT) + ((1<<C1_SHIFT)>>1)) * count;
+	  c2total += ((c2 << C2_SHIFT) + ((1<<C2_SHIFT)>>1)) * count;
+	}
+      }
+    }
+  
+  cinfo->colormap[0][icolor] = (JSAMPLE) ((c0total + (total>>1)) / total);
+  cinfo->colormap[1][icolor] = (JSAMPLE) ((c1total + (total>>1)) / total);
+  cinfo->colormap[2][icolor] = (JSAMPLE) ((c2total + (total>>1)) / total);
+}
+
+
+LOCAL(void)
+select_colors (j_decompress_ptr cinfo, int desired_colors)
+/* Master routine for color selection */
+{
+  boxptr boxlist;
+  int numboxes;
+  int i;
+
+  /* Allocate workspace for box list */
+  boxlist = (boxptr) (*cinfo->mem->alloc_small)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, desired_colors * SIZEOF(box));
+  /* Initialize one box containing whole space */
+  numboxes = 1;
+  boxlist[0].c0min = 0;
+  boxlist[0].c0max = MAXJSAMPLE >> C0_SHIFT;
+  boxlist[0].c1min = 0;
+  boxlist[0].c1max = MAXJSAMPLE >> C1_SHIFT;
+  boxlist[0].c2min = 0;
+  boxlist[0].c2max = MAXJSAMPLE >> C2_SHIFT;
+  /* Shrink it to actually-used volume and set its statistics */
+  update_box(cinfo, & boxlist[0]);
+  /* Perform median-cut to produce final box list */
+  numboxes = median_cut(cinfo, boxlist, numboxes, desired_colors);
+  /* Compute the representative color for each box, fill colormap */
+  for (i = 0; i < numboxes; i++)
+    compute_color(cinfo, & boxlist[i], i);
+  cinfo->actual_number_of_colors = numboxes;
+  TRACEMS1(cinfo, 1, JTRC_QUANT_SELECTED, numboxes);
+}
+
+
+/*
+ * These routines are concerned with the time-critical task of mapping input
+ * colors to the nearest color in the selected colormap.
+ *
+ * We re-use the histogram space as an "inverse color map", essentially a
+ * cache for the results of nearest-color searches.  All colors within a
+ * histogram cell will be mapped to the same colormap entry, namely the one
+ * closest to the cell's center.  This may not be quite the closest entry to
+ * the actual input color, but it's almost as good.  A zero in the cache
+ * indicates we haven't found the nearest color for that cell yet; the array
+ * is cleared to zeroes before starting the mapping pass.  When we find the
+ * nearest color for a cell, its colormap index plus one is recorded in the
+ * cache for future use.  The pass2 scanning routines call fill_inverse_cmap
+ * when they need to use an unfilled entry in the cache.
+ *
+ * Our method of efficiently finding nearest colors is based on the "locally
+ * sorted search" idea described by Heckbert and on the incremental distance
+ * calculation described by Spencer W. Thomas in chapter III.1 of Graphics
+ * Gems II (James Arvo, ed.  Academic Press, 1991).  Thomas points out that
+ * the distances from a given colormap entry to each cell of the histogram can
+ * be computed quickly using an incremental method: the differences between
+ * distances to adjacent cells themselves differ by a constant.  This allows a
+ * fairly fast implementation of the "brute force" approach of computing the
+ * distance from every colormap entry to every histogram cell.  Unfortunately,
+ * it needs a work array to hold the best-distance-so-far for each histogram
+ * cell (because the inner loop has to be over cells, not colormap entries).
+ * The work array elements have to be INT32s, so the work array would need
+ * 256Kb at our recommended precision.  This is not feasible in DOS machines.
+ *
+ * To get around these problems, we apply Thomas' method to compute the
+ * nearest colors for only the cells within a small subbox of the histogram.
+ * The work array need be only as big as the subbox, so the memory usage
+ * problem is solved.  Furthermore, we need not fill subboxes that are never
+ * referenced in pass2; many images use only part of the color gamut, so a
+ * fair amount of work is saved.  An additional advantage of this
+ * approach is that we can apply Heckbert's locality criterion to quickly
+ * eliminate colormap entries that are far away from the subbox; typically
+ * three-fourths of the colormap entries are rejected by Heckbert's criterion,
+ * and we need not compute their distances to individual cells in the subbox.
+ * The speed of this approach is heavily influenced by the subbox size: too
+ * small means too much overhead, too big loses because Heckbert's criterion
+ * can't eliminate as many colormap entries.  Empirically the best subbox
+ * size seems to be about 1/512th of the histogram (1/8th in each direction).
+ *
+ * Thomas' article also describes a refined method which is asymptotically
+ * faster than the brute-force method, but it is also far more complex and
+ * cannot efficiently be applied to small subboxes.  It is therefore not
+ * useful for programs intended to be portable to DOS machines.  On machines
+ * with plenty of memory, filling the whole histogram in one shot with Thomas'
+ * refined method might be faster than the present code --- but then again,
+ * it might not be any faster, and it's certainly more complicated.
+ */
+
+
+/* log2(histogram cells in update box) for each axis; this can be adjusted */
+#define BOX_C0_LOG  (HIST_C0_BITS-3)
+#define BOX_C1_LOG  (HIST_C1_BITS-3)
+#define BOX_C2_LOG  (HIST_C2_BITS-3)
+
+#define BOX_C0_ELEMS  (1<<BOX_C0_LOG) /* # of hist cells in update box */
+#define BOX_C1_ELEMS  (1<<BOX_C1_LOG)
+#define BOX_C2_ELEMS  (1<<BOX_C2_LOG)
+
+#define BOX_C0_SHIFT  (C0_SHIFT + BOX_C0_LOG)
+#define BOX_C1_SHIFT  (C1_SHIFT + BOX_C1_LOG)
+#define BOX_C2_SHIFT  (C2_SHIFT + BOX_C2_LOG)
+
+
+/*
+ * The next three routines implement inverse colormap filling.  They could
+ * all be folded into one big routine, but splitting them up this way saves
+ * some stack space (the mindist[] and bestdist[] arrays need not coexist)
+ * and may allow some compilers to produce better code by registerizing more
+ * inner-loop variables.
+ */
+
+LOCAL(int)
+find_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
+		    JSAMPLE colorlist[])
+/* Locate the colormap entries close enough to an update box to be candidates
+ * for the nearest entry to some cell(s) in the update box.  The update box
+ * is specified by the center coordinates of its first cell.  The number of
+ * candidate colormap entries is returned, and their colormap indexes are
+ * placed in colorlist[].
+ * This routine uses Heckbert's "locally sorted search" criterion to select
+ * the colors that need further consideration.
+ */
+{
+  int numcolors = cinfo->actual_number_of_colors;
+  int maxc0, maxc1, maxc2;
+  int centerc0, centerc1, centerc2;
+  int i, x, ncolors;
+  JPEG_INT32 minmaxdist, min_dist, max_dist, tdist;
+  JPEG_INT32 mindist[MAXNUMCOLORS];	/* min distance to colormap entry i */
+
+  /* Compute true coordinates of update box's upper corner and center.
+   * Actually we compute the coordinates of the center of the upper-corner
+   * histogram cell, which are the upper bounds of the volume we care about.
+   * Note that since ">>" rounds down, the "center" values may be closer to
+   * min than to max; hence comparisons to them must be "<=", not "<".
+   */
+  maxc0 = minc0 + ((1 << BOX_C0_SHIFT) - (1 << C0_SHIFT));
+  centerc0 = (minc0 + maxc0) >> 1;
+  maxc1 = minc1 + ((1 << BOX_C1_SHIFT) - (1 << C1_SHIFT));
+  centerc1 = (minc1 + maxc1) >> 1;
+  maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT));
+  centerc2 = (minc2 + maxc2) >> 1;
+
+  /* For each color in colormap, find:
+   *  1. its minimum squared-distance to any point in the update box
+   *     (zero if color is within update box);
+   *  2. its maximum squared-distance to any point in the update box.
+   * Both of these can be found by considering only the corners of the box.
+   * We save the minimum distance for each color in mindist[];
+   * only the smallest maximum distance is of interest.
+   */
+  minmaxdist = 0x7FFFFFFFL;
+
+  for (i = 0; i < numcolors; i++) {
+    /* We compute the squared-c0-distance term, then add in the other two. */
+    x = GETJSAMPLE(cinfo->colormap[0][i]);
+    if (x < minc0) {
+      tdist = (x - minc0) * C0_SCALE;
+      min_dist = tdist*tdist;
+      tdist = (x - maxc0) * C0_SCALE;
+      max_dist = tdist*tdist;
+    } else if (x > maxc0) {
+      tdist = (x - maxc0) * C0_SCALE;
+      min_dist = tdist*tdist;
+      tdist = (x - minc0) * C0_SCALE;
+      max_dist = tdist*tdist;
+    } else {
+      /* within cell range so no contribution to min_dist */
+      min_dist = 0;
+      if (x <= centerc0) {
+	tdist = (x - maxc0) * C0_SCALE;
+	max_dist = tdist*tdist;
+      } else {
+	tdist = (x - minc0) * C0_SCALE;
+	max_dist = tdist*tdist;
+      }
+    }
+
+    x = GETJSAMPLE(cinfo->colormap[1][i]);
+    if (x < minc1) {
+      tdist = (x - minc1) * C1_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - maxc1) * C1_SCALE;
+      max_dist += tdist*tdist;
+    } else if (x > maxc1) {
+      tdist = (x - maxc1) * C1_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - minc1) * C1_SCALE;
+      max_dist += tdist*tdist;
+    } else {
+      /* within cell range so no contribution to min_dist */
+      if (x <= centerc1) {
+	tdist = (x - maxc1) * C1_SCALE;
+	max_dist += tdist*tdist;
+      } else {
+	tdist = (x - minc1) * C1_SCALE;
+	max_dist += tdist*tdist;
+      }
+    }
+
+    x = GETJSAMPLE(cinfo->colormap[2][i]);
+    if (x < minc2) {
+      tdist = (x - minc2) * C2_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - maxc2) * C2_SCALE;
+      max_dist += tdist*tdist;
+    } else if (x > maxc2) {
+      tdist = (x - maxc2) * C2_SCALE;
+      min_dist += tdist*tdist;
+      tdist = (x - minc2) * C2_SCALE;
+      max_dist += tdist*tdist;
+    } else {
+      /* within cell range so no contribution to min_dist */
+      if (x <= centerc2) {
+	tdist = (x - maxc2) * C2_SCALE;
+	max_dist += tdist*tdist;
+      } else {
+	tdist = (x - minc2) * C2_SCALE;
+	max_dist += tdist*tdist;
+      }
+    }
+
+    mindist[i] = min_dist;	/* save away the results */
+    if (max_dist < minmaxdist)
+      minmaxdist = max_dist;
+  }
+
+  /* Now we know that no cell in the update box is more than minmaxdist
+   * away from some colormap entry.  Therefore, only colors that are
+   * within minmaxdist of some part of the box need be considered.
+   */
+  ncolors = 0;
+  for (i = 0; i < numcolors; i++) {
+    if (mindist[i] <= minmaxdist)
+      colorlist[ncolors++] = (JSAMPLE) i;
+  }
+  return ncolors;
+}
+
+
+LOCAL(void)
+find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
+		  int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[])
+/* Find the closest colormap entry for each cell in the update box,
+ * given the list of candidate colors prepared by find_nearby_colors.
+ * Return the indexes of the closest entries in the bestcolor[] array.
+ * This routine uses Thomas' incremental distance calculation method to
+ * find the distance from a colormap entry to successive cells in the box.
+ */
+{
+  int ic0, ic1, ic2;
+  int i, icolor;
+  register JPEG_INT32 * bptr;	/* pointer into bestdist[] array */
+  JSAMPLE * cptr;		/* pointer into bestcolor[] array */
+  JPEG_INT32 dist0, dist1;		/* initial distance values */
+  register JPEG_INT32 dist2;		/* current distance in inner loop */
+  JPEG_INT32 xx0, xx1;		/* distance increments */
+  register JPEG_INT32 xx2;
+  JPEG_INT32 inc0, inc1, inc2;	/* initial values for increments */
+  /* This array holds the distance to the nearest-so-far color for each cell */
+  JPEG_INT32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
+
+  /* Initialize best-distance for each cell of the update box */
+  bptr = bestdist;
+  for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--)
+    *bptr++ = 0x7FFFFFFFL;
+  
+  /* For each color selected by find_nearby_colors,
+   * compute its distance to the center of each cell in the box.
+   * If that's less than best-so-far, update best distance and color number.
+   */
+  
+  /* Nominal steps between cell centers ("x" in Thomas article) */
+#define STEP_C0  ((1 << C0_SHIFT) * C0_SCALE)
+#define STEP_C1  ((1 << C1_SHIFT) * C1_SCALE)
+#define STEP_C2  ((1 << C2_SHIFT) * C2_SCALE)
+  
+  for (i = 0; i < numcolors; i++) {
+    icolor = GETJSAMPLE(colorlist[i]);
+    /* Compute (square of) distance from minc0/c1/c2 to this color */
+    inc0 = (minc0 - GETJSAMPLE(cinfo->colormap[0][icolor])) * C0_SCALE;
+    dist0 = inc0*inc0;
+    inc1 = (minc1 - GETJSAMPLE(cinfo->colormap[1][icolor])) * C1_SCALE;
+    dist0 += inc1*inc1;
+    inc2 = (minc2 - GETJSAMPLE(cinfo->colormap[2][icolor])) * C2_SCALE;
+    dist0 += inc2*inc2;
+    /* Form the initial difference increments */
+    inc0 = inc0 * (2 * STEP_C0) + STEP_C0 * STEP_C0;
+    inc1 = inc1 * (2 * STEP_C1) + STEP_C1 * STEP_C1;
+    inc2 = inc2 * (2 * STEP_C2) + STEP_C2 * STEP_C2;
+    /* Now loop over all cells in box, updating distance per Thomas method */
+    bptr = bestdist;
+    cptr = bestcolor;
+    xx0 = inc0;
+    for (ic0 = BOX_C0_ELEMS-1; ic0 >= 0; ic0--) {
+      dist1 = dist0;
+      xx1 = inc1;
+      for (ic1 = BOX_C1_ELEMS-1; ic1 >= 0; ic1--) {
+	dist2 = dist1;
+	xx2 = inc2;
+	for (ic2 = BOX_C2_ELEMS-1; ic2 >= 0; ic2--) {
+	  if (dist2 < *bptr) {
+	    *bptr = dist2;
+	    *cptr = (JSAMPLE) icolor;
+	  }
+	  dist2 += xx2;
+	  xx2 += 2 * STEP_C2 * STEP_C2;
+	  bptr++;
+	  cptr++;
+	}
+	dist1 += xx1;
+	xx1 += 2 * STEP_C1 * STEP_C1;
+      }
+      dist0 += xx0;
+      xx0 += 2 * STEP_C0 * STEP_C0;
+    }
+  }
+}
+
+
+LOCAL(void)
+fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2)
+/* Fill the inverse-colormap entries in the update box that contains */
+/* histogram cell c0/c1/c2.  (Only that one cell MUST be filled, but */
+/* we can fill as many others as we wish.) */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  int minc0, minc1, minc2;	/* lower left corner of update box */
+  int ic0, ic1, ic2;
+  register JSAMPLE * cptr;	/* pointer into bestcolor[] array */
+  register histptr cachep;	/* pointer into main cache array */
+  /* This array lists the candidate colormap indexes. */
+  JSAMPLE colorlist[MAXNUMCOLORS];
+  int numcolors;		/* number of candidate colors */
+  /* This array holds the actually closest colormap index for each cell. */
+  JSAMPLE bestcolor[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
+
+  /* Convert cell coordinates to update box ID */
+  c0 >>= BOX_C0_LOG;
+  c1 >>= BOX_C1_LOG;
+  c2 >>= BOX_C2_LOG;
+
+  /* Compute true coordinates of update box's origin corner.
+   * Actually we compute the coordinates of the center of the corner
+   * histogram cell, which are the lower bounds of the volume we care about.
+   */
+  minc0 = (c0 << BOX_C0_SHIFT) + ((1 << C0_SHIFT) >> 1);
+  minc1 = (c1 << BOX_C1_SHIFT) + ((1 << C1_SHIFT) >> 1);
+  minc2 = (c2 << BOX_C2_SHIFT) + ((1 << C2_SHIFT) >> 1);
+  
+  /* Determine which colormap entries are close enough to be candidates
+   * for the nearest entry to some cell in the update box.
+   */
+  numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist);
+
+  /* Determine the actually nearest colors. */
+  find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist,
+		   bestcolor);
+
+  /* Save the best color numbers (plus 1) in the main cache array */
+  c0 <<= BOX_C0_LOG;		/* convert ID back to base cell indexes */
+  c1 <<= BOX_C1_LOG;
+  c2 <<= BOX_C2_LOG;
+  cptr = bestcolor;
+  for (ic0 = 0; ic0 < BOX_C0_ELEMS; ic0++) {
+    for (ic1 = 0; ic1 < BOX_C1_ELEMS; ic1++) {
+      cachep = & histogram[c0+ic0][c1+ic1][c2];
+      for (ic2 = 0; ic2 < BOX_C2_ELEMS; ic2++) {
+	*cachep++ = (histcell) (GETJSAMPLE(*cptr++) + 1);
+      }
+    }
+  }
+}
+
+
+/*
+ * Map some rows of pixels to the output colormapped representation.
+ */
+
+METHODDEF(void)
+pass2_no_dither (j_decompress_ptr cinfo,
+		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
+/* This version performs no dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  register JSAMPROW inptr, outptr;
+  register histptr cachep;
+  register int c0, c1, c2;
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+
+  for (row = 0; row < num_rows; row++) {
+    inptr = input_buf[row];
+    outptr = output_buf[row];
+    for (col = width; col > 0; col--) {
+      /* get pixel value and index into the cache */
+      c0 = GETJSAMPLE(*inptr++) >> C0_SHIFT;
+      c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT;
+      c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT;
+      cachep = & histogram[c0][c1][c2];
+      /* If we have not seen this color before, find nearest colormap entry */
+      /* and update the cache */
+      if (*cachep == 0)
+	fill_inverse_cmap(cinfo, c0,c1,c2);
+      /* Now emit the colormap index for this cell */
+      *outptr++ = (JSAMPLE) (*cachep - 1);
+    }
+  }
+}
+
+
+METHODDEF(void)
+pass2_fs_dither (j_decompress_ptr cinfo,
+		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
+/* This version performs Floyd-Steinberg dithering */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  register LOCFSERROR cur0, cur1, cur2;	/* current error or pixel value */
+  LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */
+  LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */
+  register FSERRPTR errorptr;	/* => fserrors[] at column before current */
+  JSAMPROW inptr;		/* => current input pixel */
+  JSAMPROW outptr;		/* => current output pixel */
+  histptr cachep;
+  int dir;			/* +1 or -1 depending on direction */
+  int dir3;			/* 3*dir, for advancing inptr & errorptr */
+  int row;
+  JDIMENSION col;
+  JDIMENSION width = cinfo->output_width;
+  JSAMPLE *range_limit = cinfo->sample_range_limit;
+  int *error_limit = cquantize->error_limiter;
+  JSAMPROW colormap0 = cinfo->colormap[0];
+  JSAMPROW colormap1 = cinfo->colormap[1];
+  JSAMPROW colormap2 = cinfo->colormap[2];
+  SHIFT_TEMPS
+
+  for (row = 0; row < num_rows; row++) {
+    inptr = input_buf[row];
+    outptr = output_buf[row];
+    if (cquantize->on_odd_row) {
+      /* work right to left in this row */
+      inptr += (width-1) * 3;	/* so point to rightmost pixel */
+      outptr += width-1;
+      dir = -1;
+      dir3 = -3;
+      errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */
+      cquantize->on_odd_row = FALSE; /* flip for next time */
+    } else {
+      /* work left to right in this row */
+      dir = 1;
+      dir3 = 3;
+      errorptr = cquantize->fserrors; /* => entry before first real column */
+      cquantize->on_odd_row = TRUE; /* flip for next time */
+    }
+    /* Preset error values: no error propagated to first pixel from left */
+    cur0 = cur1 = cur2 = 0;
+    /* and no error propagated to row below yet */
+    belowerr0 = belowerr1 = belowerr2 = 0;
+    bpreverr0 = bpreverr1 = bpreverr2 = 0;
+
+    for (col = width; col > 0; col--) {
+      /* curN holds the error propagated from the previous pixel on the
+       * current line.  Add the error propagated from the previous line
+       * to form the complete error correction term for this pixel, and
+       * round the error term (which is expressed * 16) to an integer.
+       * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
+       * for either sign of the error value.
+       * Note: errorptr points to *previous* column's array entry.
+       */
+      cur0 = RIGHT_SHIFT(cur0 + errorptr[dir3+0] + 8, 4);
+      cur1 = RIGHT_SHIFT(cur1 + errorptr[dir3+1] + 8, 4);
+      cur2 = RIGHT_SHIFT(cur2 + errorptr[dir3+2] + 8, 4);
+      /* Limit the error using transfer function set by init_error_limit.
+       * See comments with init_error_limit for rationale.
+       */
+      cur0 = error_limit[cur0];
+      cur1 = error_limit[cur1];
+      cur2 = error_limit[cur2];
+      /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
+       * The maximum error is +- MAXJSAMPLE (or less with error limiting);
+       * this sets the required size of the range_limit array.
+       */
+      cur0 += GETJSAMPLE(inptr[0]);
+      cur1 += GETJSAMPLE(inptr[1]);
+      cur2 += GETJSAMPLE(inptr[2]);
+      cur0 = GETJSAMPLE(range_limit[cur0]);
+      cur1 = GETJSAMPLE(range_limit[cur1]);
+      cur2 = GETJSAMPLE(range_limit[cur2]);
+      /* Index into the cache with adjusted pixel value */
+      cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT];
+      /* If we have not seen this color before, find nearest colormap */
+      /* entry and update the cache */
+      if (*cachep == 0)
+	fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT);
+      /* Now emit the colormap index for this cell */
+      { register int pixcode = *cachep - 1;
+	*outptr = (JSAMPLE) pixcode;
+	/* Compute representation error for this pixel */
+	cur0 -= GETJSAMPLE(colormap0[pixcode]);
+	cur1 -= GETJSAMPLE(colormap1[pixcode]);
+	cur2 -= GETJSAMPLE(colormap2[pixcode]);
+      }
+      /* Compute error fractions to be propagated to adjacent pixels.
+       * Add these into the running sums, and simultaneously shift the
+       * next-line error sums left by 1 column.
+       */
+      { register LOCFSERROR bnexterr, delta;
+
+	bnexterr = cur0;	/* Process component 0 */
+	delta = cur0 * 2;
+	cur0 += delta;		/* form error * 3 */
+	errorptr[0] = (FSERROR) (bpreverr0 + cur0);
+	cur0 += delta;		/* form error * 5 */
+	bpreverr0 = belowerr0 + cur0;
+	belowerr0 = bnexterr;
+	cur0 += delta;		/* form error * 7 */
+	bnexterr = cur1;	/* Process component 1 */
+	delta = cur1 * 2;
+	cur1 += delta;		/* form error * 3 */
+	errorptr[1] = (FSERROR) (bpreverr1 + cur1);
+	cur1 += delta;		/* form error * 5 */
+	bpreverr1 = belowerr1 + cur1;
+	belowerr1 = bnexterr;
+	cur1 += delta;		/* form error * 7 */
+	bnexterr = cur2;	/* Process component 2 */
+	delta = cur2 * 2;
+	cur2 += delta;		/* form error * 3 */
+	errorptr[2] = (FSERROR) (bpreverr2 + cur2);
+	cur2 += delta;		/* form error * 5 */
+	bpreverr2 = belowerr2 + cur2;
+	belowerr2 = bnexterr;
+	cur2 += delta;		/* form error * 7 */
+      }
+      /* At this point curN contains the 7/16 error value to be propagated
+       * to the next pixel on the current line, and all the errors for the
+       * next line have been shifted over.  We are therefore ready to move on.
+       */
+      inptr += dir3;		/* Advance pixel pointers to next column */
+      outptr += dir;
+      errorptr += dir3;		/* advance errorptr to current column */
+    }
+    /* Post-loop cleanup: we must unload the final error values into the
+     * final fserrors[] entry.  Note we need not unload belowerrN because
+     * it is for the dummy column before or after the actual array.
+     */
+    errorptr[0] = (FSERROR) bpreverr0; /* unload prev errs into array */
+    errorptr[1] = (FSERROR) bpreverr1;
+    errorptr[2] = (FSERROR) bpreverr2;
+  }
+}
+
+
+/*
+ * Initialize the error-limiting transfer function (lookup table).
+ * The raw F-S error computation can potentially compute error values of up to
+ * +- MAXJSAMPLE.  But we want the maximum correction applied to a pixel to be
+ * much less, otherwise obviously wrong pixels will be created.  (Typical
+ * effects include weird fringes at color-area boundaries, isolated bright
+ * pixels in a dark area, etc.)  The standard advice for avoiding this problem
+ * is to ensure that the "corners" of the color cube are allocated as output
+ * colors; then repeated errors in the same direction cannot cause cascading
+ * error buildup.  However, that only prevents the error from getting
+ * completely out of hand; Aaron Giles reports that error limiting improves
+ * the results even with corner colors allocated.
+ * A simple clamping of the error values to about +- MAXJSAMPLE/8 works pretty
+ * well, but the smoother transfer function used below is even better.  Thanks
+ * to Aaron Giles for this idea.
+ */
+
+LOCAL(void)
+init_error_limit (j_decompress_ptr cinfo)
+/* Allocate and fill in the error_limiter table */
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  int * table;
+  int in, out;
+
+  table = (int *) (*cinfo->mem->alloc_small)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE*2+1) * SIZEOF(int));
+  table += MAXJSAMPLE;		/* so can index -MAXJSAMPLE .. +MAXJSAMPLE */
+  cquantize->error_limiter = table;
+
+#define STEPSIZE ((MAXJSAMPLE+1)/16)
+  /* Map errors 1:1 up to +- MAXJSAMPLE/16 */
+  out = 0;
+  for (in = 0; in < STEPSIZE; in++, out++) {
+    table[in] = out; table[-in] = -out;
+  }
+  /* Map errors 1:2 up to +- 3*MAXJSAMPLE/16 */
+  for (; in < STEPSIZE*3; in++, out += (in&1) ? 0 : 1) {
+    table[in] = out; table[-in] = -out;
+  }
+  /* Clamp the rest to final out value (which is (MAXJSAMPLE+1)/8) */
+  for (; in <= MAXJSAMPLE; in++) {
+    table[in] = out; table[-in] = -out;
+  }
+#undef STEPSIZE
+}
+
+
+/*
+ * Finish up at the end of each pass.
+ */
+
+METHODDEF(void)
+finish_pass1 (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+
+  /* Select the representative colors and fill in cinfo->colormap */
+  cinfo->colormap = cquantize->sv_colormap;
+  select_colors(cinfo, cquantize->desired);
+  /* Force next pass to zero the color index table */
+  cquantize->needs_zeroed = TRUE;
+}
+
+
+METHODDEF(void)
+finish_pass2 (j_decompress_ptr cinfo)
+{
+  /* no work */
+}
+
+
+/*
+ * Initialize for each processing pass.
+ */
+
+METHODDEF(void)
+start_pass_2_quant (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+  hist3d histogram = cquantize->histogram;
+  int i;
+
+  /* Only F-S dithering or no dithering is supported. */
+  /* If user asks for ordered dither, give him F-S. */
+  if (cinfo->dither_mode != JDITHER_NONE)
+    cinfo->dither_mode = JDITHER_FS;
+
+  if (is_pre_scan) {
+    /* Set up method pointers */
+    cquantize->pub.color_quantize = prescan_quantize;
+    cquantize->pub.finish_pass = finish_pass1;
+    cquantize->needs_zeroed = TRUE; /* Always zero histogram */
+  } else {
+    /* Set up method pointers */
+    if (cinfo->dither_mode == JDITHER_FS)
+      cquantize->pub.color_quantize = pass2_fs_dither;
+    else
+      cquantize->pub.color_quantize = pass2_no_dither;
+    cquantize->pub.finish_pass = finish_pass2;
+
+    /* Make sure color count is acceptable */
+    i = cinfo->actual_number_of_colors;
+    if (i < 1)
+      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 1);
+    if (i > MAXNUMCOLORS)
+      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);
+
+    if (cinfo->dither_mode == JDITHER_FS) {
+      size_t arraysize = (size_t) ((cinfo->output_width + 2) *
+				   (3 * SIZEOF(FSERROR)));
+      /* Allocate Floyd-Steinberg workspace if we didn't already. */
+      if (cquantize->fserrors == NULL)
+	cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)
+	  ((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);
+      /* Initialize the propagated errors to zero. */
+      jzero_far((void FAR *) cquantize->fserrors, arraysize);
+      /* Make the error-limit table if we didn't already. */
+      if (cquantize->error_limiter == NULL)
+	init_error_limit(cinfo);
+      cquantize->on_odd_row = FALSE;
+    }
+
+  }
+  /* Zero the histogram or inverse color map, if necessary */
+  if (cquantize->needs_zeroed) {
+    for (i = 0; i < HIST_C0_ELEMS; i++) {
+      jzero_far((void FAR *) histogram[i],
+		HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
+    }
+    cquantize->needs_zeroed = FALSE;
+  }
+}
+
+
+/*
+ * Switch to a new external colormap between output passes.
+ */
+
+METHODDEF(void)
+new_color_map_2_quant (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
+
+  /* Reset the inverse color map */
+  cquantize->needs_zeroed = TRUE;
+}
+
+
+/*
+ * Module initialization routine for 2-pass color quantization.
+ */
+
+GLOBAL(void)
+jinit_2pass_quantizer (j_decompress_ptr cinfo)
+{
+  my_cquantize_ptr cquantize;
+  int i;
+
+  cquantize = (my_cquantize_ptr)
+    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
+				SIZEOF(my_cquantizer));
+  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;
+  cquantize->pub.start_pass = start_pass_2_quant;
+  cquantize->pub.new_color_map = new_color_map_2_quant;
+  cquantize->fserrors = NULL;	/* flag optional arrays not allocated */
+  cquantize->error_limiter = NULL;
+
+  /* Make sure jdmaster didn't give me a case I can't handle */
+  if (cinfo->out_color_components != 3)
+    ERREXIT(cinfo, JERR_NOTIMPL);
+
+  /* Allocate the histogram/inverse colormap storage */
+  cquantize->histogram = (hist3d) (*cinfo->mem->alloc_small)
+    ((j_common_ptr) cinfo, JPOOL_IMAGE, HIST_C0_ELEMS * SIZEOF(hist2d));
+  for (i = 0; i < HIST_C0_ELEMS; i++) {
+    cquantize->histogram[i] = (hist2d) (*cinfo->mem->alloc_large)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
+  }
+  cquantize->needs_zeroed = TRUE; /* histogram is garbage now */
+
+  /* Allocate storage for the completed colormap, if required.
+   * We do this now since it is FAR storage and may affect
+   * the memory manager's space calculations.
+   */
+  if (cinfo->enable_2pass_quant) {
+    /* Make sure color count is acceptable */
+    int desired = cinfo->desired_number_of_colors;
+    /* Lower bound on # of colors ... somewhat arbitrary as long as > 0 */
+    if (desired < 8)
+      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 8);
+    /* Make sure colormap indexes can be represented by JSAMPLEs */
+    if (desired > MAXNUMCOLORS)
+      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);
+    cquantize->sv_colormap = (*cinfo->mem->alloc_sarray)
+      ((j_common_ptr) cinfo,JPOOL_IMAGE, (JDIMENSION) desired, (JDIMENSION) 3);
+    cquantize->desired = desired;
+  } else
+    cquantize->sv_colormap = NULL;
+
+  /* Only F-S dithering or no dithering is supported. */
+  /* If user asks for ordered dither, give him F-S. */
+  if (cinfo->dither_mode != JDITHER_NONE)
+    cinfo->dither_mode = JDITHER_FS;
+
+  /* Allocate Floyd-Steinberg workspace if necessary.
+   * This isn't really needed until pass 2, but again it is FAR storage.
+   * Although we will cope with a later change in dither_mode,
+   * we do not promise to honor max_memory_to_use if dither_mode changes.
+   */
+  if (cinfo->dither_mode == JDITHER_FS) {
+    cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)
+      ((j_common_ptr) cinfo, JPOOL_IMAGE,
+       (size_t) ((cinfo->output_width + 2) * (3 * SIZEOF(FSERROR))));
+    /* Might as well create the error-limiting table too. */
+    init_error_limit(cinfo);
+  }
+}
+
+#endif /* QUANT_2PASS_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/jpeg/jutils.c b/Source/3rd Party/wx/src/jpeg/jutils.c
index 286cda207..d18a95556 100644
--- a/Source/3rd Party/wx/src/jpeg/jutils.c	
+++ b/Source/3rd Party/wx/src/jpeg/jutils.c	
@@ -1,179 +1,179 @@
-/*
- * jutils.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains tables and miscellaneous utility routines needed
- * for both compression and decompression.
- * Note we prefix all global names with "j" to minimize conflicts with
- * a surrounding application.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * jpeg_zigzag_order[i] is the zigzag-order position of the i'th element
- * of a DCT block read in natural order (left to right, top to bottom).
- */
-
-#if 0				/* This table is not actually needed in v6a */
-
-const int jpeg_zigzag_order[DCTSIZE2] = {
-   0,  1,  5,  6, 14, 15, 27, 28,
-   2,  4,  7, 13, 16, 26, 29, 42,
-   3,  8, 12, 17, 25, 30, 41, 43,
-   9, 11, 18, 24, 31, 40, 44, 53,
-  10, 19, 23, 32, 39, 45, 52, 54,
-  20, 22, 33, 38, 46, 51, 55, 60,
-  21, 34, 37, 47, 50, 56, 59, 61,
-  35, 36, 48, 49, 57, 58, 62, 63
-};
-
-#endif
-
-/*
- * jpeg_natural_order[i] is the natural-order position of the i'th element
- * of zigzag order.
- *
- * When reading corrupted data, the Huffman decoders could attempt
- * to reference an entry beyond the end of this array (if the decoded
- * zero run length reaches past the end of the block).  To prevent
- * wild stores without adding an inner-loop test, we put some extra
- * "63"s after the real entries.  This will cause the extra coefficient
- * to be stored in location 63 of the block, not somewhere random.
- * The worst case would be a run-length of 15, which means we need 16
- * fake entries.
- */
-
-const int jpeg_natural_order[DCTSIZE2+16] = {
-  0,  1,  8, 16,  9,  2,  3, 10,
- 17, 24, 32, 25, 18, 11,  4,  5,
- 12, 19, 26, 33, 40, 48, 41, 34,
- 27, 20, 13,  6,  7, 14, 21, 28,
- 35, 42, 49, 56, 57, 50, 43, 36,
- 29, 22, 15, 23, 30, 37, 44, 51,
- 58, 59, 52, 45, 38, 31, 39, 46,
- 53, 60, 61, 54, 47, 55, 62, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */
- 63, 63, 63, 63, 63, 63, 63, 63
-};
-
-
-/*
- * Arithmetic utilities
- */
-
-GLOBAL(long)
-jdiv_round_up (long a, long b)
-/* Compute a/b rounded up to next integer, ie, ceil(a/b) */
-/* Assumes a >= 0, b > 0 */
-{
-  return (a + b - 1L) / b;
-}
-
-
-GLOBAL(long)
-jround_up (long a, long b)
-/* Compute a rounded up to next multiple of b, ie, ceil(a/b)*b */
-/* Assumes a >= 0, b > 0 */
-{
-  a += b - 1L;
-  return a - (a % b);
-}
-
-
-/* On normal machines we can apply MEMCOPY() and MEMZERO() to sample arrays
- * and coefficient-block arrays.  This won't work on 80x86 because the arrays
- * are FAR and we're assuming a small-pointer memory model.  However, some
- * DOS compilers provide far-pointer versions of memcpy() and memset() even
- * in the small-model libraries.  These will be used if USE_FMEM is defined.
- * Otherwise, the routines below do it the hard way.  (The performance cost
- * is not all that great, because these routines aren't very heavily used.)
- */
-
-#ifndef NEED_FAR_POINTERS	/* normal case, same as regular macros */
-#define FMEMCOPY(dest,src,size)	MEMCOPY(dest,src,size)
-#define FMEMZERO(target,size)	MEMZERO(target,size)
-#else				/* 80x86 case, define if we can */
-#ifdef USE_FMEM
-#define FMEMCOPY(dest,src,size)	_fmemcpy((void FAR *)(dest), (const void FAR *)(src), (size_t)(size))
-#define FMEMZERO(target,size)	_fmemset((void FAR *)(target), 0, (size_t)(size))
-#endif
-#endif
-
-
-GLOBAL(void)
-jcopy_sample_rows (JSAMPARRAY input_array, int source_row,
-		   JSAMPARRAY output_array, int dest_row,
-		   int num_rows, JDIMENSION num_cols)
-/* Copy some rows of samples from one place to another.
- * num_rows rows are copied from input_array[source_row++]
- * to output_array[dest_row++]; these areas may overlap for duplication.
- * The source and destination arrays must be at least as wide as num_cols.
- */
-{
-  register JSAMPROW inptr, outptr;
-#ifdef FMEMCOPY
-  register size_t count = (size_t) (num_cols * SIZEOF(JSAMPLE));
-#else
-  register JDIMENSION count;
-#endif
-  register int row;
-
-  input_array += source_row;
-  output_array += dest_row;
-
-  for (row = num_rows; row > 0; row--) {
-    inptr = *input_array++;
-    outptr = *output_array++;
-#ifdef FMEMCOPY
-    FMEMCOPY(outptr, inptr, count);
-#else
-    for (count = num_cols; count > 0; count--)
-      *outptr++ = *inptr++;	/* needn't bother with GETJSAMPLE() here */
-#endif
-  }
-}
-
-
-GLOBAL(void)
-jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row,
-		 JDIMENSION num_blocks)
-/* Copy a row of coefficient blocks from one place to another. */
-{
-#ifdef FMEMCOPY
-  FMEMCOPY(output_row, input_row, num_blocks * (DCTSIZE2 * SIZEOF(JCOEF)));
-#else
-  register JCOEFPTR inptr, outptr;
-  register long count;
-
-  inptr = (JCOEFPTR) input_row;
-  outptr = (JCOEFPTR) output_row;
-  for (count = (long) num_blocks * DCTSIZE2; count > 0; count--) {
-    *outptr++ = *inptr++;
-  }
-#endif
-}
-
-
-GLOBAL(void)
-jzero_far (void FAR * target, size_t bytestozero)
-/* Zero out a chunk of FAR memory. */
-/* This might be sample-array data, block-array data, or alloc_large data. */
-{
-#ifdef FMEMZERO
-  FMEMZERO(target, bytestozero);
-#else
-  register char FAR * ptr = (char FAR *) target;
-  register size_t count;
-
-  for (count = bytestozero; count > 0; count--) {
-    *ptr++ = 0;
-  }
-#endif
-}
+/*
+ * jutils.c
+ *
+ * Copyright (C) 1991-1996, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains tables and miscellaneous utility routines needed
+ * for both compression and decompression.
+ * Note we prefix all global names with "j" to minimize conflicts with
+ * a surrounding application.
+ */
+
+#define JPEG_INTERNALS
+#include "jinclude.h"
+#include "jpeglib.h"
+
+
+/*
+ * jpeg_zigzag_order[i] is the zigzag-order position of the i'th element
+ * of a DCT block read in natural order (left to right, top to bottom).
+ */
+
+#if 0				/* This table is not actually needed in v6a */
+
+const int jpeg_zigzag_order[DCTSIZE2] = {
+   0,  1,  5,  6, 14, 15, 27, 28,
+   2,  4,  7, 13, 16, 26, 29, 42,
+   3,  8, 12, 17, 25, 30, 41, 43,
+   9, 11, 18, 24, 31, 40, 44, 53,
+  10, 19, 23, 32, 39, 45, 52, 54,
+  20, 22, 33, 38, 46, 51, 55, 60,
+  21, 34, 37, 47, 50, 56, 59, 61,
+  35, 36, 48, 49, 57, 58, 62, 63
+};
+
+#endif
+
+/*
+ * jpeg_natural_order[i] is the natural-order position of the i'th element
+ * of zigzag order.
+ *
+ * When reading corrupted data, the Huffman decoders could attempt
+ * to reference an entry beyond the end of this array (if the decoded
+ * zero run length reaches past the end of the block).  To prevent
+ * wild stores without adding an inner-loop test, we put some extra
+ * "63"s after the real entries.  This will cause the extra coefficient
+ * to be stored in location 63 of the block, not somewhere random.
+ * The worst case would be a run-length of 15, which means we need 16
+ * fake entries.
+ */
+
+const int jpeg_natural_order[DCTSIZE2+16] = {
+  0,  1,  8, 16,  9,  2,  3, 10,
+ 17, 24, 32, 25, 18, 11,  4,  5,
+ 12, 19, 26, 33, 40, 48, 41, 34,
+ 27, 20, 13,  6,  7, 14, 21, 28,
+ 35, 42, 49, 56, 57, 50, 43, 36,
+ 29, 22, 15, 23, 30, 37, 44, 51,
+ 58, 59, 52, 45, 38, 31, 39, 46,
+ 53, 60, 61, 54, 47, 55, 62, 63,
+ 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */
+ 63, 63, 63, 63, 63, 63, 63, 63
+};
+
+
+/*
+ * Arithmetic utilities
+ */
+
+GLOBAL(long)
+jdiv_round_up (long a, long b)
+/* Compute a/b rounded up to next integer, ie, ceil(a/b) */
+/* Assumes a >= 0, b > 0 */
+{
+  return (a + b - 1L) / b;
+}
+
+
+GLOBAL(long)
+jround_up (long a, long b)
+/* Compute a rounded up to next multiple of b, ie, ceil(a/b)*b */
+/* Assumes a >= 0, b > 0 */
+{
+  a += b - 1L;
+  return a - (a % b);
+}
+
+
+/* On normal machines we can apply MEMCOPY() and MEMZERO() to sample arrays
+ * and coefficient-block arrays.  This won't work on 80x86 because the arrays
+ * are FAR and we're assuming a small-pointer memory model.  However, some
+ * DOS compilers provide far-pointer versions of memcpy() and memset() even
+ * in the small-model libraries.  These will be used if USE_FMEM is defined.
+ * Otherwise, the routines below do it the hard way.  (The performance cost
+ * is not all that great, because these routines aren't very heavily used.)
+ */
+
+#ifndef NEED_FAR_POINTERS	/* normal case, same as regular macros */
+#define FMEMCOPY(dest,src,size)	MEMCOPY(dest,src,size)
+#define FMEMZERO(target,size)	MEMZERO(target,size)
+#else				/* 80x86 case, define if we can */
+#ifdef USE_FMEM
+#define FMEMCOPY(dest,src,size)	_fmemcpy((void FAR *)(dest), (const void FAR *)(src), (size_t)(size))
+#define FMEMZERO(target,size)	_fmemset((void FAR *)(target), 0, (size_t)(size))
+#endif
+#endif
+
+
+GLOBAL(void)
+jcopy_sample_rows (JSAMPARRAY input_array, int source_row,
+		   JSAMPARRAY output_array, int dest_row,
+		   int num_rows, JDIMENSION num_cols)
+/* Copy some rows of samples from one place to another.
+ * num_rows rows are copied from input_array[source_row++]
+ * to output_array[dest_row++]; these areas may overlap for duplication.
+ * The source and destination arrays must be at least as wide as num_cols.
+ */
+{
+  register JSAMPROW inptr, outptr;
+#ifdef FMEMCOPY
+  register size_t count = (size_t) (num_cols * SIZEOF(JSAMPLE));
+#else
+  register JDIMENSION count;
+#endif
+  register int row;
+
+  input_array += source_row;
+  output_array += dest_row;
+
+  for (row = num_rows; row > 0; row--) {
+    inptr = *input_array++;
+    outptr = *output_array++;
+#ifdef FMEMCOPY
+    FMEMCOPY(outptr, inptr, count);
+#else
+    for (count = num_cols; count > 0; count--)
+      *outptr++ = *inptr++;	/* needn't bother with GETJSAMPLE() here */
+#endif
+  }
+}
+
+
+GLOBAL(void)
+jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row,
+		 JDIMENSION num_blocks)
+/* Copy a row of coefficient blocks from one place to another. */
+{
+#ifdef FMEMCOPY
+  FMEMCOPY(output_row, input_row, num_blocks * (DCTSIZE2 * SIZEOF(JCOEF)));
+#else
+  register JCOEFPTR inptr, outptr;
+  register long count;
+
+  inptr = (JCOEFPTR) input_row;
+  outptr = (JCOEFPTR) output_row;
+  for (count = (long) num_blocks * DCTSIZE2; count > 0; count--) {
+    *outptr++ = *inptr++;
+  }
+#endif
+}
+
+
+GLOBAL(void)
+jzero_far (void FAR * target, size_t bytestozero)
+/* Zero out a chunk of FAR memory. */
+/* This might be sample-array data, block-array data, or alloc_large data. */
+{
+#ifdef FMEMZERO
+  FMEMZERO(target, bytestozero);
+#else
+  register char FAR * ptr = (char FAR *) target;
+  register size_t count;
+
+  for (count = bytestozero; count > 0; count--) {
+    *ptr++ = 0;
+  }
+#endif
+}
diff --git a/Source/3rd Party/wx/src/jpeg/jversion.h b/Source/3rd Party/wx/src/jpeg/jversion.h
index dadd453a4..6472c58d3 100644
--- a/Source/3rd Party/wx/src/jpeg/jversion.h	
+++ b/Source/3rd Party/wx/src/jpeg/jversion.h	
@@ -1,14 +1,14 @@
-/*
- * jversion.h
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains software version identification.
- */
-
-
-#define JVERSION	"6b  27-Mar-1998"
-
-#define JCOPYRIGHT	"Copyright (C) 1998, Thomas G. Lane"
+/*
+ * jversion.h
+ *
+ * Copyright (C) 1991-1998, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file contains software version identification.
+ */
+
+
+#define JVERSION	"6b  27-Mar-1998"
+
+#define JCOPYRIGHT	"Copyright (C) 1998, Thomas G. Lane"
diff --git a/Source/3rd Party/wx/src/msw/accel.cpp b/Source/3rd Party/wx/src/msw/accel.cpp
index 5acfc4b44..465ee8c30 100644
--- a/Source/3rd Party/wx/src/msw/accel.cpp	
+++ b/Source/3rd Party/wx/src/msw/accel.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/accel.cpp
+// Name:        msw/accel.cpp
 // Purpose:     wxAcceleratorTable
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: accel.cpp 56049 2008-10-03 12:13:21Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,7 +33,8 @@
 #include "wx/accel.h"
 
 #include "wx/msw/private.h"
-#include "wx/msw/private/keyboard.h"
+
+extern WXWORD wxCharCodeWXToMSW(int id, bool *isVirtual);
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
@@ -53,7 +54,7 @@ protected:
     HACCEL      m_hAccel;
     bool        m_ok;
 
-    wxDECLARE_NO_COPY_CLASS(wxAcceleratorRefData);
+    DECLARE_NO_COPY_CLASS(wxAcceleratorRefData)
 };
 
 // ============================================================================
@@ -89,7 +90,7 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
 {
     m_refData = new wxAcceleratorRefData;
 
-    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource.t_str());
+    HACCEL hAccel = ::LoadAccelerators(wxGetInstance(), resource);
     M_ACCELDATA->m_hAccel = hAccel;
     M_ACCELDATA->m_ok = hAccel != 0;
 }
@@ -104,15 +105,19 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
     {
         int flags = entries[i].GetFlags();
 
-        BYTE fVirt = FVIRTKEY;
+        BYTE fVirt = 0;
         if ( flags & wxACCEL_ALT )
-            fVirt |= FALT;
+            fVirt |= FALT | FVIRTKEY;
         if ( flags & wxACCEL_SHIFT )
-            fVirt |= FSHIFT;
+            fVirt |= FSHIFT | FVIRTKEY;
         if ( flags & wxACCEL_CTRL )
-            fVirt |= FCONTROL;
+            fVirt |= FCONTROL | FVIRTKEY;
 
-        WORD key = wxMSWKeyboard::WXToVK(entries[i].GetKeyCode());
+        bool isVirtual;
+
+        WORD key = wxCharCodeWXToMSW(entries[i].GetKeyCode(), &isVirtual);
+        if (isVirtual)
+            fVirt |= FVIRTKEY;
 
         arr[i].fVirt = fVirt;
         arr[i].key = key;
@@ -148,7 +153,7 @@ WXHACCEL wxAcceleratorTable::GetHACCEL() const
 bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
 {
     MSG *msg = (MSG *)wxmsg;
-    return IsOk() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
+    return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
 }
 
 #endif // wxUSE_ACCEL
diff --git a/Source/3rd Party/wx/src/msw/anybutton.cpp b/Source/3rd Party/wx/src/msw/anybutton.cpp
deleted file mode 100644
index d851d4cd8..000000000
--- a/Source/3rd Party/wx/src/msw/anybutton.cpp	
+++ /dev/null
@@ -1,1244 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/anybutton.cpp
-// Purpose:     wxAnyButton
-// Author:      Julian Smart
-// Created:     1998-01-04 (extracted from button.cpp)
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifdef wxHAS_ANY_BUTTON
-
-#include "wx/anybutton.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/brush.h"
-    #include "wx/panel.h"
-    #include "wx/bmpbuttn.h"
-    #include "wx/settings.h"
-    #include "wx/dcscreen.h"
-    #include "wx/dcclient.h"
-    #include "wx/toplevel.h"
-    #include "wx/msw/wrapcctl.h"
-    #include "wx/msw/private.h"
-    #include "wx/msw/missing.h"
-#endif
-
-#include "wx/imaglist.h"
-#include "wx/stockitem.h"
-#include "wx/msw/private/button.h"
-#include "wx/msw/private/dc.h"
-#include "wx/private/window.h"
-
-#if wxUSE_MARKUP
-    #include "wx/generic/private/markuptext.h"
-#endif // wxUSE_MARKUP
-
-using namespace wxMSWImpl;
-
-#if wxUSE_UXTHEME
-    #include "wx/msw/uxtheme.h"
-
-    // no need to include tmschema.h
-    #ifndef BP_PUSHBUTTON
-        #define BP_PUSHBUTTON 1
-
-        #define PBS_NORMAL    1
-        #define PBS_HOT       2
-        #define PBS_PRESSED   3
-        #define PBS_DISABLED  4
-        #define PBS_DEFAULTED 5
-
-        #define TMT_CONTENTMARGINS 3602
-    #endif
-
-    // provide the necessary declarations ourselves if they're missing from
-    // headers
-    #ifndef BCM_SETIMAGELIST
-        #define BCM_SETIMAGELIST    0x1602
-        #define BCM_SETTEXTMARGIN   0x1604
-
-        enum
-        {
-            BUTTON_IMAGELIST_ALIGN_LEFT,
-            BUTTON_IMAGELIST_ALIGN_RIGHT,
-            BUTTON_IMAGELIST_ALIGN_TOP,
-            BUTTON_IMAGELIST_ALIGN_BOTTOM
-        };
-
-        struct BUTTON_IMAGELIST
-        {
-            HIMAGELIST himl;
-            RECT margin;
-            UINT uAlign;
-        };
-    #endif
-#endif // wxUSE_UXTHEME
-
-#ifndef WM_THEMECHANGED
-    #define WM_THEMECHANGED     0x031A
-#endif
-
-#ifndef ODS_NOACCEL
-    #define ODS_NOACCEL         0x0100
-#endif
-
-#ifndef ODS_NOFOCUSRECT
-    #define ODS_NOFOCUSRECT     0x0200
-#endif
-
-#ifndef DT_HIDEPREFIX
-    #define DT_HIDEPREFIX       0x00100000
-#endif
-
-#if wxUSE_UXTHEME
-extern wxWindowMSW *wxWindowBeingErased; // From src/msw/window.cpp
-#endif // wxUSE_UXTHEME
-
-// ----------------------------------------------------------------------------
-// button image data
-// ----------------------------------------------------------------------------
-
-// we use different data classes for owner drawn buttons and for themed XP ones
-
-class wxButtonImageData
-{
-public:
-    wxButtonImageData() { }
-    virtual ~wxButtonImageData() { }
-
-    virtual wxBitmap GetBitmap(wxAnyButton::State which) const = 0;
-    virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) = 0;
-
-    virtual wxSize GetBitmapMargins() const = 0;
-    virtual void SetBitmapMargins(wxCoord x, wxCoord y) = 0;
-
-    virtual wxDirection GetBitmapPosition() const = 0;
-    virtual void SetBitmapPosition(wxDirection dir) = 0;
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxButtonImageData);
-};
-
-namespace
-{
-
-// the gap between button edge and the interior area used by Windows for the
-// standard buttons
-const int OD_BUTTON_MARGIN = 4;
-
-class wxODButtonImageData : public wxButtonImageData
-{
-public:
-    wxODButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap)
-    {
-        SetBitmap(bitmap, wxAnyButton::State_Normal);
-        SetBitmap(bitmap.ConvertToDisabled(), wxAnyButton::State_Disabled);
-
-        m_dir = wxLEFT;
-
-        // we use margins when we have both bitmap and text, but when we have
-        // only the bitmap it should take up the entire button area
-        if ( btn->ShowsLabel() )
-        {
-            m_margin.x = btn->GetCharWidth();
-            m_margin.y = btn->GetCharHeight() / 2;
-        }
-    }
-
-    virtual wxBitmap GetBitmap(wxAnyButton::State which) const
-    {
-        return m_bitmaps[which];
-    }
-
-    virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which)
-    {
-        m_bitmaps[which] = bitmap;
-    }
-
-    virtual wxSize GetBitmapMargins() const
-    {
-        return m_margin;
-    }
-
-    virtual void SetBitmapMargins(wxCoord x, wxCoord y)
-    {
-        m_margin = wxSize(x, y);
-    }
-
-    virtual wxDirection GetBitmapPosition() const
-    {
-        return m_dir;
-    }
-
-    virtual void SetBitmapPosition(wxDirection dir)
-    {
-        m_dir = dir;
-    }
-
-private:
-    // just store the values passed to us to be able to retrieve them later
-    // from the drawing code
-    wxBitmap m_bitmaps[wxAnyButton::State_Max];
-    wxSize m_margin;
-    wxDirection m_dir;
-
-    wxDECLARE_NO_COPY_CLASS(wxODButtonImageData);
-};
-
-#if wxUSE_UXTHEME
-
-// somehow the margin is one pixel greater than the value returned by
-// GetThemeMargins() call
-const int XP_BUTTON_EXTRA_MARGIN = 1;
-
-class wxXPButtonImageData : public wxButtonImageData
-{
-public:
-    // we must be constructed with the size of our images as we need to create
-    // the image list
-    wxXPButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap)
-        : m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */,
-                wxAnyButton::State_Max),
-          m_hwndBtn(GetHwndOf(btn))
-    {
-        // initialize all bitmaps except for the disabled one to normal state
-        for ( int n = 0; n < wxAnyButton::State_Max; n++ )
-        {
-            m_iml.Add(n == wxAnyButton::State_Disabled ? bitmap.ConvertToDisabled()
-                                                    : bitmap);
-        }
-
-        m_data.himl = GetHimagelistOf(&m_iml);
-
-        // no margins by default
-        m_data.margin.left =
-        m_data.margin.right =
-        m_data.margin.top =
-        m_data.margin.bottom = 0;
-
-        // use default alignment
-        m_data.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT;
-
-        UpdateImageInfo();
-    }
-
-    virtual wxBitmap GetBitmap(wxAnyButton::State which) const
-    {
-        return m_iml.GetBitmap(which);
-    }
-
-    virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which)
-    {
-        m_iml.Replace(which, bitmap);
-
-        UpdateImageInfo();
-    }
-
-    virtual wxSize GetBitmapMargins() const
-    {
-        return wxSize(m_data.margin.left, m_data.margin.top);
-    }
-
-    virtual void SetBitmapMargins(wxCoord x, wxCoord y)
-    {
-        RECT& margin = m_data.margin;
-        margin.left =
-        margin.right = x;
-        margin.top =
-        margin.bottom = y;
-
-        if ( !::SendMessage(m_hwndBtn, BCM_SETTEXTMARGIN, 0, (LPARAM)&margin) )
-        {
-            wxLogDebug("SendMessage(BCM_SETTEXTMARGIN) failed");
-        }
-    }
-
-    virtual wxDirection GetBitmapPosition() const
-    {
-        switch ( m_data.uAlign )
-        {
-            default:
-                wxFAIL_MSG( "invalid image alignment" );
-                // fall through
-
-            case BUTTON_IMAGELIST_ALIGN_LEFT:
-                return wxLEFT;
-
-            case BUTTON_IMAGELIST_ALIGN_RIGHT:
-                return wxRIGHT;
-
-            case BUTTON_IMAGELIST_ALIGN_TOP:
-                return wxTOP;
-
-            case BUTTON_IMAGELIST_ALIGN_BOTTOM:
-                return wxBOTTOM;
-        }
-    }
-
-    virtual void SetBitmapPosition(wxDirection dir)
-    {
-        UINT alignNew;
-        switch ( dir )
-        {
-            default:
-                wxFAIL_MSG( "invalid direction" );
-                // fall through
-
-            case wxLEFT:
-                alignNew = BUTTON_IMAGELIST_ALIGN_LEFT;
-                break;
-
-            case wxRIGHT:
-                alignNew = BUTTON_IMAGELIST_ALIGN_RIGHT;
-                break;
-
-            case wxTOP:
-                alignNew = BUTTON_IMAGELIST_ALIGN_TOP;
-                break;
-
-            case wxBOTTOM:
-                alignNew = BUTTON_IMAGELIST_ALIGN_BOTTOM;
-                break;
-        }
-
-        if ( alignNew != m_data.uAlign )
-        {
-            m_data.uAlign = alignNew;
-            UpdateImageInfo();
-        }
-    }
-
-private:
-    void UpdateImageInfo()
-    {
-        if ( !::SendMessage(m_hwndBtn, BCM_SETIMAGELIST, 0, (LPARAM)&m_data) )
-        {
-            wxLogDebug("SendMessage(BCM_SETIMAGELIST) failed");
-        }
-    }
-
-    // we store image list separately to be able to use convenient wxImageList
-    // methods instead of working with raw HIMAGELIST
-    wxImageList m_iml;
-
-    // store the rest of the data in BCM_SETIMAGELIST-friendly form
-    BUTTON_IMAGELIST m_data;
-
-    // the button we're associated with
-    const HWND m_hwndBtn;
-
-
-    wxDECLARE_NO_COPY_CLASS(wxXPButtonImageData);
-};
-
-#endif // wxUSE_UXTHEME
-
-} // anonymous namespace
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// helper functions from wx/msw/private/button.h
-// ----------------------------------------------------------------------------
-
-void wxMSWButton::UpdateMultilineStyle(HWND hwnd, const wxString& label)
-{
-    // update BS_MULTILINE style depending on the new label (resetting it
-    // doesn't seem to do anything very useful but it shouldn't hurt and we do
-    // have to set it whenever the label becomes multi line as otherwise it
-    // wouldn't be shown correctly as we don't use BS_MULTILINE when creating
-    // the control unless it already has new lines in its label)
-    long styleOld = ::GetWindowLong(hwnd, GWL_STYLE),
-         styleNew;
-    if ( label.find(wxT('\n')) != wxString::npos )
-        styleNew = styleOld | BS_MULTILINE;
-    else
-        styleNew = styleOld & ~BS_MULTILINE;
-
-    if ( styleNew != styleOld )
-        ::SetWindowLong(hwnd, GWL_STYLE, styleNew);
-}
-
-wxSize wxMSWButton::GetFittingSize(wxWindow *win,
-                                   const wxSize& sizeLabel,
-                                   int flags)
-{
-    wxSize sizeBtn = sizeLabel;
-
-    // FIXME: The numbers here are pure guesswork, no idea how should the
-    //        button margins be really calculated.
-    if ( flags & Size_ExactFit )
-    {
-        // We still need some margin or the text would be overwritten, just
-        // make it as small as possible.
-        sizeBtn.x += (3*win->GetCharWidth());
-    }
-    else
-    {
-        sizeBtn.x += 3*win->GetCharWidth();
-        sizeBtn.y += win->GetCharHeight()/2;
-    }
-
-    // account for the shield UAC icon if we have it
-    if ( flags & Size_AuthNeeded )
-        sizeBtn.x += wxSystemSettings::GetMetric(wxSYS_SMALLICON_X);
-
-    return sizeBtn;
-}
-
-wxSize wxMSWButton::ComputeBestFittingSize(wxControl *btn, int flags)
-{
-    wxClientDC dc(btn);
-
-    wxSize sizeBtn;
-    dc.GetMultiLineTextExtent(btn->GetLabelText(), &sizeBtn.x, &sizeBtn.y);
-
-    return GetFittingSize(btn, sizeBtn, flags);
-}
-
-wxSize wxMSWButton::IncreaseToStdSizeAndCache(wxControl *btn, const wxSize& size)
-{
-    wxSize sizeBtn(size);
-
-    // All buttons have at least the standard height and, unless the user
-    // explicitly wants them to be as small as possible and used wxBU_EXACTFIT
-    // style to indicate this, of at least the standard width too.
-    //
-    // Notice that we really want to make all buttons equally high, otherwise
-    // they look ugly and the existing code using wxBU_EXACTFIT only uses it to
-    // control width and not height.
-
-    // The 50x14 button size is documented in the "Recommended sizing and
-    // spacing" section of MSDN layout article.
-    //
-    // Note that we intentionally don't use GetDefaultSize() here, because
-    // it's inexact -- dialog units depend on this dialog's font.
-    const wxSize sizeDef = btn->ConvertDialogToPixels(wxSize(50, 14));
-    if ( !btn->HasFlag(wxBU_EXACTFIT) )
-    {
-        if ( sizeBtn.x < sizeDef.x )
-            sizeBtn.x = sizeDef.x;
-    }
-    if ( sizeBtn.y < sizeDef.y )
-        sizeBtn.y = sizeDef.y;
-
-    btn->CacheBestSize(sizeBtn);
-
-    return sizeBtn;
-}
-
-// ----------------------------------------------------------------------------
-// creation/destruction
-// ----------------------------------------------------------------------------
-
-wxAnyButton::~wxAnyButton()
-{
-    delete m_imageData;
-#if wxUSE_MARKUP
-    delete m_markupText;
-#endif // wxUSE_MARKUP
-}
-
-void wxAnyButton::SetLabel(const wxString& label)
-{
-    wxMSWButton::UpdateMultilineStyle(GetHwnd(), label);
-
-    wxAnyButtonBase::SetLabel(label);
-
-#if wxUSE_MARKUP
-    // If we have a plain text label, we shouldn't be using markup any longer.
-    if ( m_markupText )
-    {
-        delete m_markupText;
-        m_markupText = NULL;
-
-        // Unfortunately we don't really know whether we can reset the button
-        // to be non-owner-drawn or not: if we had made it owner-drawn just
-        // because of a call to SetLabelMarkup(), we could, but not if there
-        // were [also] calls to Set{Fore,Back}groundColour(). If it's really a
-        // problem to have button remain owner-drawn forever just because it
-        // had markup label once, we should record the reason for our current
-        // owner-drawnness and check it here.
-    }
-#endif // wxUSE_MARKUP
-}
-
-// ----------------------------------------------------------------------------
-// size management including autosizing
-// ----------------------------------------------------------------------------
-
-void wxAnyButton::AdjustForBitmapSize(wxSize &size) const
-{
-    wxCHECK_RET( m_imageData, wxT("shouldn't be called if no image") );
-
-    // account for the bitmap size
-    const wxSize sizeBmp = m_imageData->GetBitmap(State_Normal).GetSize();
-    const wxDirection dirBmp = m_imageData->GetBitmapPosition();
-    if ( dirBmp == wxLEFT || dirBmp == wxRIGHT )
-    {
-        size.x += sizeBmp.x;
-        if ( sizeBmp.y > size.y )
-            size.y = sizeBmp.y;
-    }
-    else // bitmap on top/below the text
-    {
-        size.y += sizeBmp.y;
-        if ( sizeBmp.x > size.x )
-            size.x = sizeBmp.x;
-    }
-
-    // account for the user-specified margins
-    size += 2*m_imageData->GetBitmapMargins();
-
-    // and also for the margins we always add internally (unless we have no
-    // border at all in which case the button has exactly the same size as
-    // bitmap and so no margins should be used)
-    if ( !HasFlag(wxBORDER_NONE) )
-    {
-        int marginH = 0,
-            marginV = 0;
-#if wxUSE_UXTHEME
-        if ( wxUxThemeEngine::GetIfActive() )
-        {
-            wxUxThemeHandle theme(const_cast<wxAnyButton *>(this), L"BUTTON");
-
-            MARGINS margins;
-            wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
-                                                    BP_PUSHBUTTON,
-                                                    PBS_NORMAL,
-                                                    TMT_CONTENTMARGINS,
-                                                    NULL,
-                                                    &margins);
-
-            // XP doesn't draw themed buttons correctly when the client
-            // area is smaller than 8x8 - enforce this minimum size for
-            // small bitmaps
-            size.IncTo(wxSize(8, 8));
-
-            marginH = margins.cxLeftWidth + margins.cxRightWidth
-                        + 2*XP_BUTTON_EXTRA_MARGIN;
-            marginV = margins.cyTopHeight + margins.cyBottomHeight
-                        + 2*XP_BUTTON_EXTRA_MARGIN;
-        }
-        else
-#endif // wxUSE_UXTHEME
-        {
-            marginH =
-            marginV = OD_BUTTON_MARGIN;
-        }
-
-        size.IncBy(marginH, marginV);
-    }
-}
-
-wxSize wxAnyButton::DoGetBestSize() const
-{
-    wxAnyButton * const self = const_cast<wxAnyButton *>(this);
-
-    wxSize size;
-
-    // Account for the text part if we have it.
-    if ( ShowsLabel() )
-    {
-        int flags = 0;
-        if ( HasFlag(wxBU_EXACTFIT) )
-            flags |= wxMSWButton::Size_ExactFit;
-        if ( DoGetAuthNeeded() )
-            flags |= wxMSWButton::Size_AuthNeeded;
-
-#if wxUSE_MARKUP
-        if ( m_markupText )
-        {
-            wxClientDC dc(self);
-            size = wxMSWButton::GetFittingSize(self,
-                                               m_markupText->Measure(dc),
-                                               flags);
-        }
-        else // Normal plain text (but possibly multiline) label.
-#endif // wxUSE_MARKUP
-        {
-            size = wxMSWButton::ComputeBestFittingSize(self, flags);
-        }
-    }
-
-    if ( m_imageData )
-        AdjustForBitmapSize(size);
-
-    return wxMSWButton::IncreaseToStdSizeAndCache(self, size);
-}
-
-// ----------------------------------------------------------------------------
-// event/message handlers
-// ----------------------------------------------------------------------------
-
-WXLRESULT wxAnyButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    if ( nMsg == WM_LBUTTONDBLCLK )
-    {
-        // emulate a click event to force an owner-drawn button to change its
-        // appearance - without this, it won't do it
-        (void)wxControl::MSWWindowProc(WM_LBUTTONDOWN, wParam, lParam);
-
-        // and continue with processing the message normally as well
-    }
-#if wxUSE_UXTHEME
-    else if ( nMsg == WM_THEMECHANGED )
-    {
-        // need to recalculate the best size here
-        // as the theme size might have changed
-        InvalidateBestSize();
-    }
-#endif // wxUSE_UXTHEME
-    // must use m_mouseInWindow here instead of IsMouseInWindow()
-    // since we need to know the first time the mouse enters the window
-    // and IsMouseInWindow() would return true in this case
-    else if ( (nMsg == WM_MOUSEMOVE && !m_mouseInWindow) ||
-                nMsg == WM_MOUSELEAVE )
-    {
-        if (
-                IsEnabled() &&
-                (
-#if wxUSE_UXTHEME
-                wxUxThemeEngine::GetIfActive() ||
-#endif // wxUSE_UXTHEME
-                 (m_imageData && m_imageData->GetBitmap(State_Current).IsOk())
-                )
-           )
-        {
-            Refresh();
-        }
-    }
-
-    // let the base class do all real processing
-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
-
-// ----------------------------------------------------------------------------
-// button images
-// ----------------------------------------------------------------------------
-
-wxBitmap wxAnyButton::DoGetBitmap(State which) const
-{
-    return m_imageData ? m_imageData->GetBitmap(which) : wxBitmap();
-}
-
-void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
-{
-#if wxUSE_UXTHEME
-    wxXPButtonImageData *oldData = NULL;
-#endif // wxUSE_UXTHEME
-
-    // Check if we already had bitmaps of different size.
-    if ( m_imageData &&
-          bitmap.GetSize() != m_imageData->GetBitmap(State_Normal).GetSize() )
-    {
-        wxASSERT_MSG( (which == State_Normal) || bitmap.IsNull(),
-                      "Must set normal bitmap with the new size first" );
-
-#if wxUSE_UXTHEME
-        if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() )
-        {
-            // We can't change the size of the images stored in wxImageList
-            // in wxXPButtonImageData::m_iml so force recreating it below but
-            // keep the current data to copy its values into the new one.
-            oldData = static_cast<wxXPButtonImageData *>(m_imageData);
-            m_imageData = NULL;
-        }
-#endif // wxUSE_UXTHEME
-        //else: wxODButtonImageData doesn't require anything special
-    }
-
-    // allocate the image data when the first bitmap is set
-    if ( !m_imageData )
-    {
-#if wxUSE_UXTHEME
-        // using image list doesn't work correctly if we don't have any label
-        // (even if we use BUTTON_IMAGELIST_ALIGN_CENTER alignment and
-        // BS_BITMAP style), at least under Windows 2003 so use owner drawn
-        // strategy for bitmap-only buttons
-        if ( ShowsLabel() && wxUxThemeEngine::GetIfActive() )
-        {
-            m_imageData = new wxXPButtonImageData(this, bitmap);
-
-            if ( oldData )
-            {
-                // Preserve the old values in case the user changed them.
-                m_imageData->SetBitmapPosition(oldData->GetBitmapPosition());
-
-                const wxSize oldMargins = oldData->GetBitmapMargins();
-                m_imageData->SetBitmapMargins(oldMargins.x, oldMargins.y);
-
-                // No need to preserve the bitmaps though as they were of wrong
-                // size anyhow.
-
-                delete oldData;
-            }
-        }
-        else
-#endif // wxUSE_UXTHEME
-        {
-            m_imageData = new wxODButtonImageData(this, bitmap);
-            MakeOwnerDrawn();
-        }
-    }
-    else
-    {
-        m_imageData->SetBitmap(bitmap, which);
-    }
-
-    // it should be enough to only invalidate the best size when the normal
-    // bitmap changes as all bitmaps assigned to the button should be of the
-    // same size anyhow
-    if ( which == State_Normal )
-        InvalidateBestSize();
-
-    Refresh();
-}
-
-wxSize wxAnyButton::DoGetBitmapMargins() const
-{
-    return m_imageData ? m_imageData->GetBitmapMargins() : wxSize(0, 0);
-}
-
-void wxAnyButton::DoSetBitmapMargins(wxCoord x, wxCoord y)
-{
-    wxCHECK_RET( m_imageData, "SetBitmap() must be called first" );
-
-    m_imageData->SetBitmapMargins(x, y);
-    InvalidateBestSize();
-}
-
-void wxAnyButton::DoSetBitmapPosition(wxDirection dir)
-{
-    wxCHECK_RET( m_imageData, "SetBitmap() must be called first" );
-
-    m_imageData->SetBitmapPosition(dir);
-    InvalidateBestSize();
-}
-
-// ----------------------------------------------------------------------------
-// markup support
-// ----------------------------------------------------------------------------
-
-#if wxUSE_MARKUP
-
-bool wxAnyButton::DoSetLabelMarkup(const wxString& markup)
-{
-    if ( !wxAnyButtonBase::DoSetLabelMarkup(markup) )
-        return false;
-
-    if ( !m_markupText )
-    {
-        m_markupText = new wxMarkupText(markup);
-        MakeOwnerDrawn();
-    }
-    else
-    {
-        // We are already owner-drawn so just update the text.
-        m_markupText->SetMarkup(markup);
-    }
-
-    Refresh();
-
-    return true;
-}
-
-#endif // wxUSE_MARKUP
-
-// ----------------------------------------------------------------------------
-// owner-drawn buttons support
-// ----------------------------------------------------------------------------
-
-// drawing helpers
-namespace
-{
-
-// return the button state using both the ODS_XXX flags specified in state
-// parameter and the current button state
-wxAnyButton::State GetButtonState(wxAnyButton *btn, UINT state)
-{
-    if ( state & ODS_DISABLED )
-        return wxAnyButton::State_Disabled;
-
-    if ( state & ODS_SELECTED )
-        return wxAnyButton::State_Pressed;
-
-    if ( btn->HasCapture() || btn->IsMouseInWindow() )
-        return wxAnyButton::State_Current;
-
-    if ( state & ODS_FOCUS )
-        return wxAnyButton::State_Focused;
-
-    return btn->GetNormalState();
-}
-
-void DrawButtonText(HDC hdc,
-                    RECT *pRect,
-                    wxAnyButton *btn,
-                    int flags)
-{
-    const wxString text = btn->GetLabel();
-
-    if ( text.find(wxT('\n')) != wxString::npos )
-    {
-        // draw multiline label
-
-        // center text horizontally in any case
-        flags |= DT_CENTER;
-
-        // first we need to compute its bounding rect
-        RECT rc;
-        ::CopyRect(&rc, pRect);
-        ::DrawText(hdc, text.t_str(), text.length(), &rc,
-                   DT_CENTER | DT_CALCRECT);
-
-        // now center this rect inside the entire button area
-        const LONG w = rc.right - rc.left;
-        const LONG h = rc.bottom - rc.top;
-        rc.left = pRect->left + (pRect->right - pRect->left)/2 - w/2;
-        rc.right = rc.left+w;
-        rc.top = pRect->top + (pRect->bottom - pRect->top)/2 - h/2;
-        rc.bottom = rc.top+h;
-
-        ::DrawText(hdc, text.t_str(), text.length(), &rc, flags);
-    }
-    else // single line label
-    {
-        // translate wx button flags to alignment flags for DrawText()
-        if ( btn->HasFlag(wxBU_RIGHT) )
-        {
-            flags |= DT_RIGHT;
-        }
-        else if ( !btn->HasFlag(wxBU_LEFT) )
-        {
-            flags |= DT_CENTER;
-        }
-        //else: DT_LEFT is the default anyhow (and its value is 0 too)
-
-        if ( btn->HasFlag(wxBU_BOTTOM) )
-        {
-            flags |= DT_BOTTOM;
-        }
-        else if ( !btn->HasFlag(wxBU_TOP) )
-        {
-            flags |= DT_VCENTER;
-        }
-        //else: as above, DT_TOP is the default
-
-        // notice that we must have DT_SINGLELINE for vertical alignment flags
-        // to work
-        ::DrawText(hdc, text.t_str(), text.length(), pRect,
-                   flags | DT_SINGLELINE );
-    }
-}
-
-void DrawRect(HDC hdc, const RECT& r)
-{
-    wxDrawLine(hdc, r.left, r.top, r.right, r.top);
-    wxDrawLine(hdc, r.right, r.top, r.right, r.bottom);
-    wxDrawLine(hdc, r.right, r.bottom, r.left, r.bottom);
-    wxDrawLine(hdc, r.left, r.bottom, r.left, r.top);
-}
-
-/*
-   The button frame looks like this normally:
-
-   WWWWWWWWWWWWWWWWWWB
-   WHHHHHHHHHHHHHHHHGB  W = white       (HILIGHT)
-   WH               GB  H = light grey  (LIGHT)
-   WH               GB  G = dark grey   (SHADOW)
-   WH               GB  B = black       (DKSHADOW)
-   WH               GB
-   WGGGGGGGGGGGGGGGGGB
-   BBBBBBBBBBBBBBBBBBB
-
-   When the button is selected, the button becomes like this (the total button
-   size doesn't change):
-
-   BBBBBBBBBBBBBBBBBBB
-   BWWWWWWWWWWWWWWWWBB
-   BWHHHHHHHHHHHHHHGBB
-   BWH             GBB
-   BWH             GBB
-   BWGGGGGGGGGGGGGGGBB
-   BBBBBBBBBBBBBBBBBBB
-   BBBBBBBBBBBBBBBBBBB
-
-   When the button is pushed (while selected) it is like:
-
-   BBBBBBBBBBBBBBBBBBB
-   BGGGGGGGGGGGGGGGGGB
-   BG               GB
-   BG               GB
-   BG               GB
-   BG               GB
-   BGGGGGGGGGGGGGGGGGB
-   BBBBBBBBBBBBBBBBBBB
-*/
-void DrawButtonFrame(HDC hdc, RECT& rectBtn,
-                     bool selected, bool pushed)
-{
-    RECT r;
-    CopyRect(&r, &rectBtn);
-
-    AutoHPEN hpenBlack(GetSysColor(COLOR_3DDKSHADOW)),
-             hpenGrey(GetSysColor(COLOR_3DSHADOW)),
-             hpenLightGr(GetSysColor(COLOR_3DLIGHT)),
-             hpenWhite(GetSysColor(COLOR_3DHILIGHT));
-
-    SelectInHDC selectPen(hdc, hpenBlack);
-
-    r.right--;
-    r.bottom--;
-
-    if ( pushed )
-    {
-        DrawRect(hdc, r);
-
-        (void)SelectObject(hdc, hpenGrey);
-        ::InflateRect(&r, -1, -1);
-
-        DrawRect(hdc, r);
-    }
-    else // !pushed
-    {
-        if ( selected )
-        {
-            DrawRect(hdc, r);
-
-            ::InflateRect(&r, -1, -1);
-        }
-
-        wxDrawLine(hdc, r.left, r.bottom, r.right, r.bottom);
-        wxDrawLine(hdc, r.right, r.bottom, r.right, r.top - 1);
-
-        (void)SelectObject(hdc, hpenWhite);
-        wxDrawLine(hdc, r.left, r.bottom - 1, r.left, r.top);
-        wxDrawLine(hdc, r.left, r.top, r.right, r.top);
-
-        (void)SelectObject(hdc, hpenLightGr);
-        wxDrawLine(hdc, r.left + 1, r.bottom - 2, r.left + 1, r.top + 1);
-        wxDrawLine(hdc, r.left + 1, r.top + 1, r.right - 1, r.top + 1);
-
-        (void)SelectObject(hdc, hpenGrey);
-        wxDrawLine(hdc, r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1);
-        wxDrawLine(hdc, r.right - 1, r.bottom - 1, r.right - 1, r.top);
-    }
-
-    InflateRect(&rectBtn, -OD_BUTTON_MARGIN, -OD_BUTTON_MARGIN);
-}
-
-#if wxUSE_UXTHEME
-void DrawXPBackground(wxAnyButton *button, HDC hdc, RECT& rectBtn, UINT state)
-{
-    wxUxThemeHandle theme(button, L"BUTTON");
-
-    // this array is indexed by wxAnyButton::State values and so must be kept in
-    // sync with it
-    static const int uxStates[] =
-    {
-        PBS_NORMAL, PBS_HOT, PBS_PRESSED, PBS_DISABLED, PBS_DEFAULTED
-    };
-
-    int iState = uxStates[GetButtonState(button, state)];
-
-    wxUxThemeEngine * const engine = wxUxThemeEngine::Get();
-
-    // draw parent background if needed
-    if ( engine->IsThemeBackgroundPartiallyTransparent
-                 (
-                    theme,
-                    BP_PUSHBUTTON,
-                    iState
-                 ) )
-    {
-        // Set this button as the one whose background is being erased: this
-        // allows our WM_ERASEBKGND handler used by DrawThemeParentBackground()
-        // to correctly align the background brush with this window instead of
-        // the parent window to which WM_ERASEBKGND is sent. Notice that this
-        // doesn't work with custom user-defined EVT_ERASE_BACKGROUND handlers
-        // as they won't be aligned but unfortunately all the attempts to fix
-        // it by shifting DC origin before calling DrawThemeParentBackground()
-        // failed to work so we at least do this, even though this is far from
-        // being the perfect solution.
-        wxWindowBeingErased = button;
-
-        engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
-
-        wxWindowBeingErased = NULL;
-    }
-
-    // draw background
-    engine->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState,
-                                &rectBtn, NULL);
-
-    // calculate content area margins
-    MARGINS margins;
-    engine->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
-                            TMT_CONTENTMARGINS, &rectBtn, &margins);
-    ::InflateRect(&rectBtn, -margins.cxLeftWidth, -margins.cyTopHeight);
-    ::InflateRect(&rectBtn, -XP_BUTTON_EXTRA_MARGIN, -XP_BUTTON_EXTRA_MARGIN);
-
-    if ( button->UseBgCol() )
-    {
-        COLORREF colBg = wxColourToRGB(button->GetBackgroundColour());
-        AutoHBRUSH hbrushBackground(colBg);
-
-        // don't overwrite the focus rect
-        RECT rectClient;
-        ::CopyRect(&rectClient, &rectBtn);
-        ::InflateRect(&rectClient, -1, -1);
-        FillRect(hdc, &rectClient, hbrushBackground);
-    }
-}
-#endif // wxUSE_UXTHEME
-
-} // anonymous namespace
-
-// ----------------------------------------------------------------------------
-// owner drawn buttons support
-// ----------------------------------------------------------------------------
-
-void wxAnyButton::MakeOwnerDrawn()
-{
-    if ( !IsOwnerDrawn() )
-    {
-        // make it so
-        // note that BS_OWNERDRAW is not independent from other style bits
-        long style = GetWindowLong(GetHwnd(), GWL_STYLE);
-        style &= ~(BS_3STATE | BS_AUTO3STATE | BS_AUTOCHECKBOX | BS_AUTORADIOBUTTON | BS_CHECKBOX | BS_DEFPUSHBUTTON | BS_GROUPBOX | BS_PUSHBUTTON | BS_RADIOBUTTON | BS_PUSHLIKE);
-        style |= BS_OWNERDRAW;
-        SetWindowLong(GetHwnd(), GWL_STYLE, style);
-    }
-}
-
-bool wxAnyButton::IsOwnerDrawn() const
-{
-    long style = GetWindowLong(GetHwnd(), GWL_STYLE);
-    return ( (style & BS_OWNERDRAW) == BS_OWNERDRAW );
-}
-
-bool wxAnyButton::SetBackgroundColour(const wxColour &colour)
-{
-    if ( !wxControl::SetBackgroundColour(colour) )
-    {
-        // nothing to do
-        return false;
-    }
-
-    MakeOwnerDrawn();
-
-    Refresh();
-
-    return true;
-}
-
-bool wxAnyButton::SetForegroundColour(const wxColour &colour)
-{
-    if ( !wxControl::SetForegroundColour(colour) )
-    {
-        // nothing to do
-        return false;
-    }
-
-    MakeOwnerDrawn();
-
-    Refresh();
-
-    return true;
-}
-
-bool wxAnyButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
-{
-    LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis;
-    HDC hdc = lpDIS->hDC;
-
-    UINT state = lpDIS->itemState;
-    switch ( GetButtonState(this, state) )
-    {
-        case State_Disabled:
-            state |= ODS_DISABLED;
-            break;
-        case State_Pressed:
-            state |= ODS_SELECTED;
-            break;
-        case State_Focused:
-            state |= ODS_FOCUS;
-            break;
-        default:
-            break;
-    }
-
-    bool pushed = (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0;
-
-    RECT rectBtn;
-    CopyRect(&rectBtn, &lpDIS->rcItem);
-
-    // draw the button background
-    if ( !HasFlag(wxBORDER_NONE) )
-    {
-#if wxUSE_UXTHEME
-        if ( wxUxThemeEngine::GetIfActive() )
-        {
-            DrawXPBackground(this, hdc, rectBtn, state);
-        }
-        else
-#endif // wxUSE_UXTHEME
-        {
-            COLORREF colBg = wxColourToRGB(GetBackgroundColour());
-
-            // first, draw the background
-            AutoHBRUSH hbrushBackground(colBg);
-            FillRect(hdc, &rectBtn, hbrushBackground);
-
-            // draw the border for the current state
-            bool selected = (state & ODS_SELECTED) != 0;
-            if ( !selected )
-            {
-                wxTopLevelWindow *
-                    tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-                if ( tlw )
-                {
-                    selected = tlw->GetDefaultItem() == this;
-                }
-            }
-
-            DrawButtonFrame(hdc, rectBtn, selected, pushed);
-        }
-
-        // draw the focus rectangle if we need it
-        if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) )
-        {
-            DrawFocusRect(hdc, &rectBtn);
-
-#if wxUSE_UXTHEME
-            if ( !wxUxThemeEngine::GetIfActive() )
-#endif // wxUSE_UXTHEME
-            {
-                if ( pushed )
-                {
-                    // the label is shifted by 1 pixel to create "pushed" effect
-                    OffsetRect(&rectBtn, 1, 1);
-                }
-            }
-        }
-    }
-
-
-    // draw the image, if any
-    if ( m_imageData )
-    {
-        wxBitmap bmp = m_imageData->GetBitmap(GetButtonState(this, state));
-        if ( !bmp.IsOk() )
-            bmp = m_imageData->GetBitmap(State_Normal);
-
-        const wxSize sizeBmp = bmp.GetSize();
-        const wxSize margin = m_imageData->GetBitmapMargins();
-        const wxSize sizeBmpWithMargins(sizeBmp + 2*margin);
-        wxRect rectButton(wxRectFromRECT(rectBtn));
-
-        // for simplicity, we start with centred rectangle and then move it to
-        // the appropriate edge
-        wxRect rectBitmap = wxRect(sizeBmp).CentreIn(rectButton);
-
-        // move bitmap only if we have a label, otherwise keep it centered
-        if ( ShowsLabel() )
-        {
-            switch ( m_imageData->GetBitmapPosition() )
-            {
-                default:
-                    wxFAIL_MSG( "invalid direction" );
-                    // fall through
-
-                case wxLEFT:
-                    rectBitmap.x = rectButton.x + margin.x;
-                    rectButton.x += sizeBmpWithMargins.x;
-                    rectButton.width -= sizeBmpWithMargins.x;
-                    break;
-
-                case wxRIGHT:
-                    rectBitmap.x = rectButton.GetRight() - sizeBmp.x - margin.x;
-                    rectButton.width -= sizeBmpWithMargins.x;
-                    break;
-
-                case wxTOP:
-                    rectBitmap.y = rectButton.y + margin.y;
-                    rectButton.y += sizeBmpWithMargins.y;
-                    rectButton.height -= sizeBmpWithMargins.y;
-                    break;
-
-                case wxBOTTOM:
-                    rectBitmap.y = rectButton.GetBottom() - sizeBmp.y - margin.y;
-                    rectButton.height -= sizeBmpWithMargins.y;
-                    break;
-            }
-        }
-
-        wxDCTemp dst((WXHDC)hdc);
-        dst.DrawBitmap(bmp, rectBitmap.GetPosition(), true);
-
-        wxCopyRectToRECT(rectButton, rectBtn);
-    }
-
-
-    // finally draw the label
-    if ( ShowsLabel() )
-    {
-        COLORREF colFg = state & ODS_DISABLED
-                            ? ::GetSysColor(COLOR_GRAYTEXT)
-                            : wxColourToRGB(GetForegroundColour());
-
-        wxTextColoursChanger changeFg(hdc, colFg, CLR_INVALID);
-        wxBkModeChanger changeBkMode(hdc, wxBRUSHSTYLE_TRANSPARENT);
-
-#if wxUSE_MARKUP
-        if ( m_markupText )
-        {
-            wxDCTemp dc((WXHDC)hdc);
-            dc.SetTextForeground(wxColour(colFg));
-            dc.SetFont(GetFont());
-
-            m_markupText->Render(dc, wxRectFromRECT(rectBtn),
-                                 state & ODS_NOACCEL
-                                    ? wxMarkupText::Render_Default
-                                    : wxMarkupText::Render_ShowAccels);
-        }
-        else // Plain text label
-#endif // wxUSE_MARKUP
-        {
-            // notice that DT_HIDEPREFIX doesn't work on old (pre-Windows 2000)
-            // systems but by happy coincidence ODS_NOACCEL is not used under
-            // them neither so DT_HIDEPREFIX should never be used there
-            DrawButtonText(hdc, &rectBtn, this,
-                           state & ODS_NOACCEL ? DT_HIDEPREFIX : 0);
-        }
-    }
-
-    return true;
-}
-
-#endif // wxHAS_ANY_BUTTON
diff --git a/Source/3rd Party/wx/src/msw/app.cpp b/Source/3rd Party/wx/src/msw/app.cpp
index f5c0d08ec..266ddc45c 100644
--- a/Source/3rd Party/wx/src/msw/app.cpp	
+++ b/Source/3rd Party/wx/src/msw/app.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: app.cpp 62085 2009-09-24 15:42:13Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
-    #include "wx/crt.h"
+    #include "wx/wxchar.h"
     #include "wx/log.h"
     #include "wx/module.h"
 #endif
@@ -49,14 +49,9 @@
 #include "wx/filename.h"
 #include "wx/dynlib.h"
 #include "wx/evtloop.h"
-#include "wx/thread.h"
-#include "wx/scopeguard.h"
-#include "wx/vector.h"
 
 #include "wx/msw/private.h"
-#include "wx/msw/dc.h"
 #include "wx/msw/ole/oleutils.h"
-#include "wx/msw/private/timer.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
@@ -64,7 +59,7 @@
 
 // OLE is used for drag-and-drop, clipboard, OLE Automation..., but some
 // compilers don't support it (missing headers, libs, ...)
-#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__)
+#if defined(__GNUWIN32_OLD__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0
@@ -82,7 +77,10 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "wx/msw/missing.h"
+// For MB_TASKMODAL
+#ifdef __WXWINCE__
+#include "wx/msw/wince/missing.h"
+#endif
 
 // instead of including <shlwapi.h> which is not part of the core SDK and not
 // shipped at all with other compilers, we always define the parts of it we
@@ -105,9 +103,6 @@
     typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
 #endif // defined(DLLVERSIONINFO)
 
-#ifndef ATTACH_PARENT_PROCESS
-    #define ATTACH_PARENT_PROCESS ((DWORD)-1)
-#endif
 
 // ---------------------------------------------------------------------------
 // global variables
@@ -117,27 +112,19 @@
 extern void wxSetKeyboardHook(bool doIt);
 #endif
 
-// because of mingw32 4.3 bug this struct can't be inside the namespace below:
-// see http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/110282
-struct ClassRegInfo
-{
-    ClassRegInfo(const wxChar *name)
-        : regname(name),
-          regnameNR(regname + wxApp::GetNoRedrawClassSuffix())
-    {
-    }
-
-    // the name of the registered class with and without CS_[HV]REDRAW styles
-    wxString regname;
-    wxString regnameNR;
-};
-
-namespace
-{
-
-wxVector<ClassRegInfo> gs_regClassesInfo;
-
-} // anonymous namespace
+// NB: all "NoRedraw" classes must have the same names as the "normal" classes
+//     with NR suffix - wxWindow::MSWCreate() supposes this
+#ifdef __WXWINCE__
+WXDLLIMPEXP_CORE       wxChar *wxCanvasClassName;
+WXDLLIMPEXP_CORE       wxChar *wxCanvasClassNameNR;
+#else
+WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName        = wxT("wxWindowClass");
+WXDLLIMPEXP_CORE const wxChar *wxCanvasClassNameNR      = wxT("wxWindowClassNR");
+#endif
+WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassName      = wxT("wxMDIFrameClass");
+WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
+WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
+WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -202,6 +189,11 @@ void *wxGUIAppTraits::BeforeChildWaitLoop()
     return new ChildWaitLoopData(wd, winActive);
 }
 
+void wxGUIAppTraits::AlwaysYield()
+{
+    wxYield();
+}
+
 void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
 {
     wxEndBusyCursor();
@@ -219,12 +211,11 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
     delete data;
 }
 
-#if wxUSE_THREADS
 bool wxGUIAppTraits::DoMessageFromThreadWait()
 {
     // we should return false only if the app should exit, i.e. only if
     // Dispatch() determines that the main event loop should terminate
-    wxEventLoopBase * const evtLoop = wxEventLoop::GetActive();
+    wxEventLoop *evtLoop = wxEventLoop::GetActive();
     if ( !evtLoop || !evtLoop->Pending() )
     {
         // no events means no quit event
@@ -234,33 +225,6 @@ bool wxGUIAppTraits::DoMessageFromThreadWait()
     return evtLoop->Dispatch();
 }
 
-DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread, int flags)
-{
-    // We only ever dispatch messages from the main thread and, additionally,
-    // even from the main thread we shouldn't wait for the message if we don't
-    // have a running event loop as we would never remove them from the message
-    // queue then and so we would enter an infinite loop as
-    // MsgWaitForMultipleObjects() keeps returning WAIT_OBJECT_0 + 1.
-    if ( flags == wxTHREAD_WAIT_BLOCK ||
-            !wxIsMainThread() ||
-                !wxEventLoop::GetActive() )
-    {
-        // Simple blocking wait.
-        return DoSimpleWaitForThread(hThread);
-    }
-
-    return ::MsgWaitForMultipleObjects
-             (
-               1,                   // number of objects to wait for
-               (HANDLE *)&hThread,  // the objects
-               false,               // wait for any objects, not all
-               INFINITE,            // no timeout
-               QS_ALLINPUT |        // return as soon as there are any events
-               QS_ALLPOSTMESSAGE
-             );
-}
-#endif // wxUSE_THREADS
-
 wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
 {
     OSVERSIONINFO info;
@@ -284,320 +248,6 @@ wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
 #endif
 }
 
-#if wxUSE_TIMER
-
-wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
-{
-    return new wxMSWTimerImpl(timer);
-}
-
-#endif // wxUSE_TIMER
-
-wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
-{
-    return new wxEventLoop;
-}
-
-// ---------------------------------------------------------------------------
-// Stuff for using console from the GUI applications
-// ---------------------------------------------------------------------------
-
-#ifndef __WXWINCE__
-
-#if wxUSE_DYNLIB_CLASS
-
-#include <wx/dynlib.h>
-
-namespace
-{
-
-/*
-    Helper class to manipulate console from a GUI app.
-
-    Notice that console output is available in the GUI app only if:
-    - AttachConsole() returns TRUE (which means it never works under pre-XP)
-    - we have a valid STD_ERROR_HANDLE
-    - command history hasn't been changed since our startup
-
-    To check if all these conditions are verified, you need to simple call
-    IsOkToUse(). It will check the first two conditions above the first time it
-    is called (and if this fails, the subsequent calls will return immediately)
-    and also recheck the last one every time it is called.
- */
-class wxConsoleStderr
-{
-public:
-    // default ctor does nothing, call Init() before using this class
-    wxConsoleStderr()
-    {
-        m_hStderr = INVALID_HANDLE_VALUE;
-        m_historyLen =
-        m_dataLen =
-        m_dataLine = 0;
-
-        m_ok = -1;
-    }
-
-    ~wxConsoleStderr()
-    {
-        if ( m_hStderr != INVALID_HANDLE_VALUE )
-        {
-            if ( !::FreeConsole() )
-            {
-                wxLogLastError(wxT("FreeConsole"));
-            }
-        }
-    }
-
-    // return true if we were successfully initialized and there had been no
-    // console activity which would interfere with our output since then
-    bool IsOkToUse() const
-    {
-        if ( m_ok == -1 )
-        {
-            wxConsoleStderr * const self = const_cast<wxConsoleStderr *>(this);
-            self->m_ok = self->DoInit();
-
-            // no need to call IsHistoryUnchanged() as we just initialized
-            // m_history anyhow
-            return m_ok == 1;
-        }
-
-        return m_ok && IsHistoryUnchanged();
-    }
-
-
-    // output the provided text on the console, return true if ok
-    bool Write(const wxString& text);
-
-private:
-    // called by Init() once only to do the real initialization
-    bool DoInit();
-
-    // retrieve the command line history into the provided buffer and return
-    // its length
-    int GetCommandHistory(wxWxCharBuffer& buf) const;
-
-    // check if the console history has changed
-    bool IsHistoryUnchanged() const;
-
-    int m_ok;                   // initially -1, set to true or false by Init()
-
-    wxDynamicLibrary m_dllKernel32;
-
-    HANDLE m_hStderr;           // console handle, if it's valid we must call
-                                // FreeConsole() (even if m_ok != 1)
-
-    wxWxCharBuffer m_history;   // command history on startup
-    int m_historyLen;           // length command history buffer
-
-    wxCharBuffer m_data;        // data between empty line and cursor position
-    int m_dataLen;              // length data buffer
-    int m_dataLine;             // line offset
-
-    typedef DWORD (WINAPI *GetConsoleCommandHistory_t)(LPTSTR sCommands,
-                                                       DWORD nBufferLength,
-                                                       LPCTSTR sExeName);
-    typedef DWORD (WINAPI *GetConsoleCommandHistoryLength_t)(LPCTSTR sExeName);
-
-    GetConsoleCommandHistory_t m_pfnGetConsoleCommandHistory;
-    GetConsoleCommandHistoryLength_t m_pfnGetConsoleCommandHistoryLength;
-
-    wxDECLARE_NO_COPY_CLASS(wxConsoleStderr);
-};
-
-bool wxConsoleStderr::DoInit()
-{
-    HANDLE hStderr = ::GetStdHandle(STD_ERROR_HANDLE);
-
-    if ( hStderr == INVALID_HANDLE_VALUE || !hStderr )
-        return false;
-
-    if ( !m_dllKernel32.Load(wxT("kernel32.dll")) )
-        return false;
-
-    typedef BOOL (WINAPI *AttachConsole_t)(DWORD dwProcessId);
-    AttachConsole_t wxDL_INIT_FUNC(pfn, AttachConsole, m_dllKernel32);
-
-    if ( !pfnAttachConsole || !pfnAttachConsole(ATTACH_PARENT_PROCESS) )
-        return false;
-
-    // console attached, set m_hStderr now to ensure that we free it in the
-    // dtor
-    m_hStderr = hStderr;
-
-    wxDL_INIT_FUNC_AW(m_pfn, GetConsoleCommandHistory, m_dllKernel32);
-    if ( !m_pfnGetConsoleCommandHistory )
-        return false;
-
-    wxDL_INIT_FUNC_AW(m_pfn, GetConsoleCommandHistoryLength, m_dllKernel32);
-    if ( !m_pfnGetConsoleCommandHistoryLength )
-        return false;
-
-    // remember the current command history to be able to compare with it later
-    // in IsHistoryUnchanged()
-    m_historyLen = GetCommandHistory(m_history);
-    if ( !m_history )
-        return false;
-
-
-    // now find the first blank line above the current position
-    CONSOLE_SCREEN_BUFFER_INFO csbi;
-
-    if ( !::GetConsoleScreenBufferInfo(m_hStderr, &csbi) )
-    {
-        wxLogLastError(wxT("GetConsoleScreenBufferInfo"));
-        return false;
-    }
-
-    COORD pos;
-    pos.X = 0;
-    pos.Y = csbi.dwCursorPosition.Y + 1;
-
-    // we decide that a line is empty if first 4 characters are spaces
-    DWORD ret;
-    char buf[4];
-    do
-    {
-        pos.Y--;
-        if ( !::ReadConsoleOutputCharacterA(m_hStderr, buf, WXSIZEOF(buf),
-                                            pos, &ret) )
-        {
-            wxLogLastError(wxT("ReadConsoleOutputCharacterA"));
-            return false;
-        }
-    } while ( wxStrncmp("    ", buf, WXSIZEOF(buf)) != 0 );
-
-    // calculate line offset and length of data
-    m_dataLine = csbi.dwCursorPosition.Y - pos.Y;
-    m_dataLen = m_dataLine*csbi.dwMaximumWindowSize.X + csbi.dwCursorPosition.X;
-
-    if ( m_dataLen > 0 )
-    {
-        m_data.extend(m_dataLen);
-        if ( !::ReadConsoleOutputCharacterA(m_hStderr, m_data.data(), m_dataLen,
-                                            pos, &ret) )
-        {
-            wxLogLastError(wxT("ReadConsoleOutputCharacterA"));
-            return false;
-        }
-    }
-
-    return true;
-}
-
-int wxConsoleStderr::GetCommandHistory(wxWxCharBuffer& buf) const
-{
-    // these functions are internal and may only be called by cmd.exe
-    static const wxChar *CMD_EXE = wxT("cmd.exe");
-
-    const int len = m_pfnGetConsoleCommandHistoryLength(CMD_EXE);
-    if ( len )
-    {
-        buf.extend(len);
-
-        int len2 = m_pfnGetConsoleCommandHistory(buf.data(), len, CMD_EXE);
-
-#if !wxUSE_UNICODE
-        // there seems to be a bug in the GetConsoleCommandHistoryA(), it
-        // returns the length of Unicode string and not ANSI one
-        len2 /= 2;
-#endif // !wxUSE_UNICODE
-
-        if ( len2 != len )
-        {
-            wxFAIL_MSG( wxT("failed getting history?") );
-        }
-    }
-
-    return len;
-}
-
-bool wxConsoleStderr::IsHistoryUnchanged() const
-{
-    wxASSERT_MSG( m_ok == 1, wxT("shouldn't be called if not initialized") );
-
-    // get (possibly changed) command history
-    wxWxCharBuffer history;
-    const int historyLen = GetCommandHistory(history);
-
-    // and compare it with the original one
-    return historyLen == m_historyLen && history &&
-                memcmp(m_history, history, historyLen) == 0;
-}
-
-bool wxConsoleStderr::Write(const wxString& text)
-{
-    wxASSERT_MSG( m_hStderr != INVALID_HANDLE_VALUE,
-                    wxT("should only be called if Init() returned true") );
-
-    // get current position
-    CONSOLE_SCREEN_BUFFER_INFO csbi;
-    if ( !::GetConsoleScreenBufferInfo(m_hStderr, &csbi) )
-    {
-        wxLogLastError(wxT("GetConsoleScreenBufferInfo"));
-        return false;
-    }
-
-    // and calculate new position (where is empty line)
-    csbi.dwCursorPosition.X = 0;
-    csbi.dwCursorPosition.Y -= m_dataLine;
-
-    if ( !::SetConsoleCursorPosition(m_hStderr, csbi.dwCursorPosition) )
-    {
-        wxLogLastError(wxT("SetConsoleCursorPosition"));
-        return false;
-    }
-
-    DWORD ret;
-    if ( !::FillConsoleOutputCharacter(m_hStderr, wxT(' '), m_dataLen,
-                                       csbi.dwCursorPosition, &ret) )
-    {
-        wxLogLastError(wxT("FillConsoleOutputCharacter"));
-        return false;
-    }
-
-    if ( !::WriteConsole(m_hStderr, text.t_str(), text.length(), &ret, NULL) )
-    {
-        wxLogLastError(wxT("WriteConsole"));
-        return false;
-    }
-
-    WriteConsoleA(m_hStderr, m_data, m_dataLen, &ret, 0);
-
-    return true;
-}
-
-wxConsoleStderr s_consoleStderr;
-
-} // anonymous namespace
-
-bool wxGUIAppTraits::CanUseStderr()
-{
-    return s_consoleStderr.IsOkToUse();
-}
-
-bool wxGUIAppTraits::WriteToStderr(const wxString& text)
-{
-    return s_consoleStderr.IsOkToUse() && s_consoleStderr.Write(text);
-}
-
-#else // !wxUSE_DYNLIB_CLASS
-
-bool wxGUIAppTraits::CanUseStderr()
-{
-    return false;
-}
-
-bool wxGUIAppTraits::WriteToStderr(const wxString& WXUNUSED(text))
-{
-    return false;
-}
-
-#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
-
-#endif // !__WXWINCE__
-
 // ===========================================================================
 // wxApp implementation
 // ===========================================================================
@@ -639,6 +289,20 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // ensure that base cleanup is done if we return too early
     wxCallBaseCleanup callBaseCleanup(this);
 
+#ifdef __WXWINCE__
+    wxString tmp = GetAppName();
+    tmp += wxT("ClassName");
+    wxCanvasClassName = wxStrdup( tmp.c_str() );
+    tmp += wxT("NR");
+    wxCanvasClassNameNR = wxStrdup( tmp.c_str() );
+    HWND hWnd = FindWindow( wxCanvasClassNameNR, NULL );
+    if (hWnd)
+    {
+        SetForegroundWindow( (HWND)(((DWORD)hWnd)|0x01) );
+        return false;
+    }
+#endif
+
 #if !defined(__WXMICROWIN__)
     InitCommonControls();
 #endif // !defined(__WXMICROWIN__)
@@ -655,6 +319,10 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     wxOleInitialize();
 
+    RegisterWindowClasses();
+
+    wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
+
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     wxSetKeyboardHook(true);
 #endif
@@ -665,101 +333,153 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 }
 
 // ---------------------------------------------------------------------------
-// Win32 window class registration
+// RegisterWindowClasses
 // ---------------------------------------------------------------------------
 
-/* static */
-const wxChar *wxApp::GetRegisteredClassName(const wxChar *name,
-                                            int bgBrushCol,
-                                            int extraStyles)
+// TODO we should only register classes really used by the app. For this it
+//      would be enough to just delay the class registration until an attempt
+//      to create a window of this class is made.
+bool wxApp::RegisterWindowClasses()
 {
-    const size_t count = gs_regClassesInfo.size();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        if ( gs_regClassesInfo[n].regname == name )
-            return gs_regClassesInfo[n].regname.c_str();
-    }
-
-    // we need to register this class
     WNDCLASS wndclass;
     wxZeroMemory(wndclass);
 
+    // for each class we register one with CS_(V|H)REDRAW style and one
+    // without for windows created with wxNO_FULL_REDRAW_ON_REPAINT flag
+    static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+    static const long styleNoRedraw = CS_DBLCLKS;
+
+    // the fields which are common to all classes
     wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
-    wndclass.hInstance     = wxGetInstance();
-    wndclass.hCursor       = ::LoadCursor(NULL, IDC_ARROW);
-    wndclass.hbrBackground = (HBRUSH)wxUIntToPtr(bgBrushCol + 1);
-    wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | extraStyles;
+    wndclass.hInstance     = wxhInstance;
+    wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
 
+    // register the class for all normal windows
+    wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
+    wndclass.lpszClassName = wxCanvasClassName;
+    wndclass.style         = styleNormal;
 
-    ClassRegInfo regClass(name);
-    wndclass.lpszClassName = regClass.regname.t_str();
-    if ( !::RegisterClass(&wndclass) )
+    if ( !RegisterClass(&wndclass) )
     {
-        wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"),
-                       regClass.regname));
-        return NULL;
+        wxLogLastError(wxT("RegisterClass(frame)"));
     }
 
-    wndclass.style &= ~(CS_HREDRAW | CS_VREDRAW);
-    wndclass.lpszClassName = regClass.regnameNR.t_str();
-    if ( !::RegisterClass(&wndclass) )
+    // "no redraw" frame
+    wndclass.lpszClassName = wxCanvasClassNameNR;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
     {
-        wxLogLastError(wxString::Format(wxT("RegisterClass(%s)"),
-                       regClass.regname));
-        ::UnregisterClass(regClass.regname.c_str(), wxGetInstance());
-        return NULL;
+        wxLogLastError(wxT("RegisterClass(no redraw frame)"));
     }
 
-    gs_regClassesInfo.push_back(regClass);
+    // Register the MDI frame window class.
+    wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
+    wndclass.lpszClassName = wxMDIFrameClassName;
+    wndclass.style         = styleNormal;
 
-    // take care to return the pointer which will remain valid after the
-    // function returns (it could be invalidated later if new elements are
-    // added to the vector and it's reallocated but this shouldn't matter as
-    // this pointer should be used right now, not stored)
-    return gs_regClassesInfo.back().regname.t_str();
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(MDI parent)"));
+    }
+
+    // "no redraw" MDI frame
+    wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)"));
+    }
+
+    // Register the MDI child frame window class.
+    wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    wndclass.lpszClassName = wxMDIChildFrameClassName;
+    wndclass.style         = styleNormal;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(MDI child)"));
+    }
+
+    // "no redraw" MDI child frame
+    wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
+    }
+
+    return true;
 }
 
-bool wxApp::IsRegisteredClassName(const wxString& name)
+// ---------------------------------------------------------------------------
+// UnregisterWindowClasses
+// ---------------------------------------------------------------------------
+
+bool wxApp::UnregisterWindowClasses()
 {
-    const size_t count = gs_regClassesInfo.size();
-    for ( size_t n = 0; n < count; n++ )
+    bool retval = true;
+
+#ifndef __WXMICROWIN__
+    // MDI frame window class.
+    if ( !::UnregisterClass(wxMDIFrameClassName, wxhInstance) )
     {
-        if ( gs_regClassesInfo[n].regname == name ||
-                gs_regClassesInfo[n].regnameNR == name )
-            return true;
+        wxLogLastError(wxT("UnregisterClass(MDI parent)"));
+
+        retval = false;
     }
 
-    return false;
-}
-
-void wxApp::UnregisterWindowClasses()
-{
-    const size_t count = gs_regClassesInfo.size();
-    for ( size_t n = 0; n < count; n++ )
+    // "no redraw" MDI frame
+    if ( !::UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) )
     {
-        const ClassRegInfo& regClass = gs_regClassesInfo[n];
-        if ( !::UnregisterClass(regClass.regname.c_str(), wxGetInstance()) )
-        {
-            wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"),
-                           regClass.regname));
-        }
+        wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));
 
-        if ( !::UnregisterClass(regClass.regnameNR.c_str(), wxGetInstance()) )
-        {
-            wxLogLastError(wxString::Format(wxT("UnregisterClass(%s)"),
-                           regClass.regnameNR));
-        }
+        retval = false;
     }
 
-    gs_regClassesInfo.clear();
+    // MDI child frame window class.
+    if ( !::UnregisterClass(wxMDIChildFrameClassName, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(MDI child)"));
+
+        retval = false;
+    }
+
+    // "no redraw" MDI child frame
+    if ( !::UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));
+
+        retval = false;
+    }
+
+    // canvas class name
+    if ( !::UnregisterClass(wxCanvasClassName, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(canvas)"));
+
+        retval = false;
+    }
+
+    if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
+    {
+        wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
+
+        retval = false;
+    }
+#endif // __WXMICROWIN__
+
+    return retval;
 }
 
 void wxApp::CleanUp()
 {
-    // all objects pending for deletion must be deleted first, otherwise
-    // UnregisterWindowClasses() call wouldn't succeed (because windows
-    // using the classes being unregistered still exist), so call the base
-    // class method first and only then do our clean up
+    // all objects pending for deletion must be deleted first, otherwise we
+    // would crash when they use wxWinHandleHash (and UnregisterWindowClasses()
+    // call wouldn't succeed as long as any windows still exist), so call the
+    // base class method first and only then do our clean up
     wxAppBase::CleanUp();
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
@@ -773,6 +493,14 @@ void wxApp::CleanUp()
     // which case the registration will fail after the first time if we don't
     // unregister the classes now
     UnregisterWindowClasses();
+
+    delete wxWinHandleHash;
+    wxWinHandleHash = NULL;
+
+#ifdef __WXWINCE__
+    free( wxCanvasClassName );
+    free( wxCanvasClassNameNR );
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -792,14 +520,16 @@ wxApp::~wxApp()
 // wxApp idle handling
 // ----------------------------------------------------------------------------
 
-void wxApp::OnIdle(wxIdleEvent& WXUNUSED(event))
+void wxApp::OnIdle(wxIdleEvent& event)
 {
+    wxAppBase::OnIdle(event);
+
 #if wxUSE_DC_CACHEING
     // automated DC cache management: clear the cached DCs and bitmap
     // if it's likely that the app has finished with them, that is, we
     // get an idle event and we're not dragging anything.
     if (!::GetKeyState(MK_LBUTTON) && !::GetKeyState(MK_MBUTTON) && !::GetKeyState(MK_RBUTTON))
-        wxMSWDCImpl::ClearCache();
+        wxDC::ClearCache();
 #endif // wxUSE_DC_CACHEING
 }
 
@@ -845,24 +575,8 @@ void wxApp::WakeUpIdle()
 
 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
-    // Windows will terminate the process soon after we return from
-    // WM_ENDSESSION handler or when we delete our last window, so make sure we
-    // at least execute our cleanup code before
-
-    // prevent the window from being destroyed when the corresponding wxTLW is
-    // destroyed: this will result in a leak of a HWND, of course, but who
-    // cares when the process is being killed anyhow
-    if ( !wxTopLevelWindows.empty() )
-        wxTopLevelWindows[0]->SetHWND(0);
-
-    const int rc = OnExit();
-
-    wxEntryCleanup();
-
-    // calling exit() instead of ExitProcess() or not doing anything at all and
-    // being killed by Windows has the advantage of executing the dtors of
-    // global objects
-    exit(rc);
+    if (GetTopWindow())
+        GetTopWindow()->Close(true);
 }
 
 // Default behaviour: close the application with prompts. The
@@ -877,45 +591,15 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 }
 
 // ----------------------------------------------------------------------------
-// system DLL versions
+// miscellaneous
 // ----------------------------------------------------------------------------
 
-// these functions have trivial inline implementations for CE
-#ifndef __WXWINCE__
-
-#if wxUSE_DYNLIB_CLASS
-
-namespace
-{
-
-// helper function: retrieve the DLL version by using DllGetVersion(), returns
-// 0 if the DLL doesn't export such function
-int CallDllGetVersion(wxDynamicLibrary& dll)
-{
-    // now check if the function is available during run-time
-    wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dll );
-    if ( !pfnDllGetVersion )
-        return 0;
-
-    DLLVERSIONINFO dvi;
-    dvi.cbSize = sizeof(dvi);
-
-    HRESULT hr = (*pfnDllGetVersion)(&dvi);
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(wxT("DllGetVersion"), hr);
-
-        return 0;
-    }
-
-    return 100*dvi.dwMajorVersion + dvi.dwMinorVersion;
-}
-
-} // anonymous namespace
-
 /* static */
 int wxApp::GetComCtl32Version()
 {
+#if defined(__WXMICROWIN__) || defined(__WXWINCE__)
+    return 0;
+#else
     // cache the result
     //
     // NB: this is MT-ok as in the worst case we'd compute s_verComCtl32 twice,
@@ -924,105 +608,138 @@ int wxApp::GetComCtl32Version()
 
     if ( s_verComCtl32 == -1 )
     {
+        // initally assume no comctl32.dll at all
+        s_verComCtl32 = 0;
+
         // we're prepared to handle the errors
         wxLogNull noLog;
 
+#if wxUSE_DYNLIB_CLASS
         // we don't want to load comctl32.dll, it should be already loaded but,
         // depending on the OS version and the presence of the manifest, it can
         // be either v5 or v6 and instead of trying to guess it just get the
         // handle of the already loaded version
-        wxLoadedDLL dllComCtl32(wxT("comctl32.dll"));
+        wxLoadedDLL dllComCtl32(_T("comctl32.dll"));
         if ( !dllComCtl32.IsLoaded() )
         {
             s_verComCtl32 = 0;
             return 0;
         }
 
-        // try DllGetVersion() for recent DLLs
-        s_verComCtl32 = CallDllGetVersion(dllComCtl32);
-
-        // if DllGetVersion() is unavailable either during compile or
-        // run-time, try to guess the version otherwise
-        if ( !s_verComCtl32 )
+        // if so, then we can check for the version
+        if ( dllComCtl32.IsLoaded() )
         {
-            // InitCommonControlsEx is unique to 4.70 and later
-            void *pfn = dllComCtl32.GetSymbol(wxT("InitCommonControlsEx"));
-            if ( !pfn )
+            // now check if the function is available during run-time
+            wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
+            if ( pfnDllGetVersion )
             {
-                // not found, must be 4.00
-                s_verComCtl32 = 400;
-            }
-            else // 4.70+
-            {
-                // many symbols appeared in comctl32 4.71, could use any of
-                // them except may be DllInstall()
-                pfn = dllComCtl32.GetSymbol(wxT("InitializeFlatSB"));
-                if ( !pfn )
+                DLLVERSIONINFO dvi;
+                dvi.cbSize = sizeof(dvi);
+
+                HRESULT hr = (*pfnDllGetVersion)(&dvi);
+                if ( FAILED(hr) )
                 {
-                    // not found, must be 4.70
-                    s_verComCtl32 = 470;
+                    wxLogApiError(_T("DllGetVersion"), hr);
                 }
                 else
                 {
-                    // found, must be 4.71 or later
-                    s_verComCtl32 = 471;
+                    // this is incompatible with _WIN32_IE values, but
+                    // compatible with the other values returned by
+                    // GetComCtl32Version()
+                    s_verComCtl32 = 100*dvi.dwMajorVersion +
+                                        dvi.dwMinorVersion;
+                }
+            }
+
+            // if DllGetVersion() is unavailable either during compile or
+            // run-time, try to guess the version otherwise
+            if ( !s_verComCtl32 )
+            {
+                // InitCommonControlsEx is unique to 4.70 and later
+                void *pfn = dllComCtl32.GetSymbol(_T("InitCommonControlsEx"));
+                if ( !pfn )
+                {
+                    // not found, must be 4.00
+                    s_verComCtl32 = 400;
+                }
+                else // 4.70+
+                {
+                    // many symbols appeared in comctl32 4.71, could use any of
+                    // them except may be DllInstall()
+                    pfn = dllComCtl32.GetSymbol(_T("InitializeFlatSB"));
+                    if ( !pfn )
+                    {
+                        // not found, must be 4.70
+                        s_verComCtl32 = 470;
+                    }
+                    else
+                    {
+                        // found, must be 4.71 or later
+                        s_verComCtl32 = 471;
+                    }
                 }
             }
         }
+#endif // wxUSE_DYNLIB_CLASS
     }
 
     return s_verComCtl32;
+#endif // Microwin/!Microwin
 }
 
-/* static */
-int wxApp::GetShell32Version()
+// Yield to incoming messages
+
+bool wxApp::Yield(bool onlyIfNeeded)
 {
-    static int s_verShell32 = -1;
-    if ( s_verShell32 == -1 )
+    // MT-FIXME
+    static bool s_inYield = false;
+
+#if wxUSE_LOG
+    // disable log flushing from here because a call to wxYield() shouldn't
+    // normally result in message boxes popping up &c
+    wxLog::Suspend();
+#endif // wxUSE_LOG
+
+    if ( s_inYield )
     {
-        // we're prepared to handle the errors
-        wxLogNull noLog;
-
-        wxDynamicLibrary dllShell32(wxT("shell32.dll"), wxDL_VERBATIM);
-        if ( dllShell32.IsLoaded() )
+        if ( !onlyIfNeeded )
         {
-            s_verShell32 = CallDllGetVersion(dllShell32);
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }
 
-            if ( !s_verShell32 )
-            {
-                // there doesn't seem to be any way to distinguish between 4.00
-                // and 4.70 (starting from 4.71 we have DllGetVersion()) so
-                // just assume it is 4.0
-                s_verShell32 = 400;
-            }
-        }
-        else // failed load the DLL?
-        {
-            s_verShell32 = 0;
-        }
+        return false;
     }
 
-    return s_verShell32;
+    s_inYield = true;
+
+    // we don't want to process WM_QUIT from here - it should be processed in
+    // the main event loop in order to stop it
+    wxEventLoopGuarantor dummyLoopIfNeeded;
+    MSG msg;
+    while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
+            msg.message != WM_QUIT )
+    {
+#if wxUSE_THREADS
+        wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
+
+        if ( !wxTheApp->Dispatch() )
+            break;
+    }
+
+    // if there are pending events, we must process them.
+    ProcessPendingEvents();
+
+#if wxUSE_LOG
+    // let the logs be flashed again
+    wxLog::Resume();
+#endif // wxUSE_LOG
+
+    s_inYield = false;
+
+    return true;
 }
 
-#else // !wxUSE_DYNLIB_CLASS
-
-/* static */
-int wxApp::GetComCtl32Version()
-{
-    return 0;
-}
-
-/* static */
-int wxApp::GetShell32Version()
-{
-    return 0;
-}
-
-#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
-
-#endif // !__WXWINCE__
-
 #if wxUSE_EXCEPTIONS
 
 // ----------------------------------------------------------------------------
@@ -1037,10 +754,10 @@ bool wxApp::OnExceptionInMainLoop()
             ::MessageBox
               (
                 NULL,
-                wxT("An unhandled exception occurred. Press \"Abort\" to \
+                _T("An unhandled exception occurred. Press \"Abort\" to \
 terminate the program,\r\n\
 \"Retry\" to exit the program normally and \"Ignore\" to try to continue."),
-                wxT("Unhandled exception"),
+                _T("Unhandled exception"),
                 MB_ABORTRETRYIGNORE |
                 MB_ICONERROR|
                 MB_TASKMODAL
@@ -1051,7 +768,7 @@ terminate the program,\r\n\
             throw;
 
         default:
-            wxFAIL_MSG( wxT("unexpected MessageBox() return code") );
+            wxFAIL_MSG( _T("unexpected MessageBox() return code") );
             // fall through
 
         case IDRETRY:
@@ -1063,3 +780,30 @@ terminate the program,\r\n\
 }
 
 #endif // wxUSE_EXCEPTIONS
+
+// ----------------------------------------------------------------------------
+// deprecated event loop functions
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+
+void wxApp::DoMessage(WXMSG *pMsg)
+{
+    wxEventLoop *evtLoop = wxEventLoop::GetActive();
+    if ( evtLoop )
+        evtLoop->ProcessMessage(pMsg);
+}
+
+bool wxApp::DoMessage()
+{
+    wxEventLoop *evtLoop = wxEventLoop::GetActive();
+    return evtLoop ? evtLoop->Dispatch() : false;
+}
+
+bool wxApp::ProcessMessage(WXMSG* pMsg)
+{
+    wxEventLoop *evtLoop = wxEventLoop::GetActive();
+    return evtLoop && evtLoop->PreProcessMessage(pMsg);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
diff --git a/Source/3rd Party/wx/src/msw/artmsw.cpp b/Source/3rd Party/wx/src/msw/artmsw.cpp
deleted file mode 100644
index f4c50ca64..000000000
--- a/Source/3rd Party/wx/src/msw/artmsw.cpp	
+++ /dev/null
@@ -1,133 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/artmsw.cpp
-// Purpose:     stock wxArtProvider instance with native MSW stock icons
-// Author:      Vaclav Slavik
-// Modified by:
-// Created:     2008-10-15
-// RCS-ID:      $Id$
-// Copyright:   (c) Vaclav Slavik, 2008
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#if defined(__BORLANDC__)
-    #pragma hdrstop
-#endif
-
-#include "wx/artprov.h"
-#include "wx/image.h"
-#include "wx/msw/wrapwin.h"
-
-
-// ----------------------------------------------------------------------------
-// wxWindowsArtProvider
-// ----------------------------------------------------------------------------
-
-class wxWindowsArtProvider : public wxArtProvider
-{
-protected:
-    virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
-                                  const wxSize& size);
-};
-
-static wxBitmap CreateFromStdIcon(const char *iconName,
-                                  const wxArtClient& client)
-{
-    wxIcon icon(iconName);
-    wxBitmap bmp;
-    bmp.CopyFromIcon(icon);
-
-#if wxUSE_IMAGE
-    // The standard native message box icons are in message box size (32x32).
-    // If they are requested in any size other than the default or message
-    // box size, they must be rescaled first.
-    if ( client != wxART_MESSAGE_BOX && client != wxART_OTHER )
-    {
-        const wxSize size = wxArtProvider::GetNativeSizeHint(client);
-        if ( size != wxDefaultSize )
-        {
-            wxImage img = bmp.ConvertToImage();
-            img.Rescale(size.x, size.y);
-            bmp = wxBitmap(img);
-        }
-    }
-#endif // wxUSE_IMAGE
-
-    return bmp;
-}
-
-wxBitmap wxWindowsArtProvider::CreateBitmap(const wxArtID& id,
-                                            const wxArtClient& client,
-                                            const wxSize& WXUNUSED(size))
-{
-    // handle message box icons specially (wxIcon ctor treat these names
-    // as special cases via wxICOResourceHandler::LoadIcon):
-    const char *name = NULL;
-    if ( id == wxART_ERROR )
-        name = "wxICON_ERROR";
-    else if ( id == wxART_INFORMATION )
-        name = "wxICON_INFORMATION";
-    else if ( id == wxART_WARNING )
-        name = "wxICON_WARNING";
-    else if ( id == wxART_QUESTION )
-        name = "wxICON_QUESTION";
-
-    if ( name )
-        return CreateFromStdIcon(name, client);
-
-    // for anything else, fall back to generic provider:
-    return wxNullBitmap;
-}
-
-// ----------------------------------------------------------------------------
-// wxArtProvider::InitNativeProvider()
-// ----------------------------------------------------------------------------
-
-/*static*/ void wxArtProvider::InitNativeProvider()
-{
-    PushBack(new wxWindowsArtProvider);
-}
-
-// ----------------------------------------------------------------------------
-// wxArtProvider::GetNativeSizeHint()
-// ----------------------------------------------------------------------------
-
-/*static*/
-wxSize wxArtProvider::GetNativeSizeHint(const wxArtClient& client)
-{
-    if ( client == wxART_TOOLBAR )
-    {
-        return wxSize(24, 24);
-    }
-    else if ( client == wxART_MENU )
-    {
-        return wxSize(16, 16);
-    }
-    else if ( client == wxART_FRAME_ICON )
-    {
-        return wxSize(::GetSystemMetrics(SM_CXSMICON),
-                      ::GetSystemMetrics(SM_CYSMICON));
-    }
-    else if ( client == wxART_CMN_DIALOG ||
-              client == wxART_MESSAGE_BOX )
-    {
-        return wxSize(::GetSystemMetrics(SM_CXICON),
-                      ::GetSystemMetrics(SM_CYICON));
-    }
-    else if (client == wxART_BUTTON)
-    {
-        return wxSize(16, 16);
-    }
-    else if (client == wxART_LIST)
-    {
-        return wxSize(16, 16);
-    }
-
-    return wxDefaultSize;
-}
diff --git a/Source/3rd Party/wx/src/msw/basemsw.cpp b/Source/3rd Party/wx/src/msw/basemsw.cpp
index 63b84989f..5c820d4de 100644
--- a/Source/3rd Party/wx/src/msw/basemsw.cpp	
+++ b/Source/3rd Party/wx/src/msw/basemsw.cpp	
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/basemsw.cpp
+// Name:        msw/basemsw.cpp
 // Purpose:     misc stuff only used in console applications under MSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.06.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: basemsw.cpp 39831 2006-06-25 23:53:53Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -25,35 +25,35 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/event.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
-#include "wx/evtloop.h"
-#include "wx/msw/private/timer.h"
 // MBN: this is a workaround for MSVC 5: if it is not #included in
 // some wxBase file, wxRecursionGuard methods won't be exported from
 // wxBase.dll, and MSVC 5 will give linker errors
 #include "wx/recguard.h"
 
-#include "wx/crt.h"
 #include "wx/msw/private.h"
 
-// ============================================================================
-// wxAppTraits implementation
-// ============================================================================
-
-#if wxUSE_THREADS
-WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
-{
-    return ::WaitForSingleObject((HANDLE)hThread, INFINITE);
-}
-#endif // wxUSE_THREADS
-
 // ============================================================================
 // wxConsoleAppTraits implementation
 // ============================================================================
 
+void wxConsoleAppTraits::AlwaysYield()
+{
+    // we need to use special logic to deal with WM_PAINT: as this pseudo
+    // message is generated automatically as long as there are invalidated
+    // windows belonging to this thread, we'd never return if we waited here
+    // until we have no more of them left. OTOH, this message is always the
+    // last one in the queue, so we can safely return as soon as we detect it
+    MSG msg;
+    while ( ::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) )
+    {
+        if ( msg.message == WM_PAINT )
+            break;
+    }
+}
+
 void *wxConsoleAppTraits::BeforeChildWaitLoop()
 {
     // nothing to do here
@@ -65,39 +65,9 @@ void wxConsoleAppTraits::AfterChildWaitLoop(void * WXUNUSED(data))
     // nothing to do here
 }
 
-#if wxUSE_THREADS
 bool wxConsoleAppTraits::DoMessageFromThreadWait()
 {
     // nothing to process here
     return true;
 }
 
-WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
-{
-    return DoSimpleWaitForThread(hThread);
-}
-#endif // wxUSE_THREADS
-
-#if wxUSE_TIMER
-
-wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
-{
-    return new wxMSWTimerImpl(timer);
-}
-
-#endif // wxUSE_TIMER
-
-wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
-{
-#if wxUSE_CONSOLE_EVENTLOOP
-    return new wxEventLoop();
-#else // !wxUSE_CONSOLE_EVENTLOOP
-    return NULL;
-#endif // wxUSE_CONSOLE_EVENTLOOP/!wxUSE_CONSOLE_EVENTLOOP
-}
-
-
-bool wxConsoleAppTraits::WriteToStderr(const wxString& text)
-{
-    return wxFprintf(stderr, "%s", text) != -1;
-}
diff --git a/Source/3rd Party/wx/src/msw/bitmap.cpp b/Source/3rd Party/wx/src/msw/bitmap.cpp
index e705fe9f1..fec02d9fd 100644
--- a/Source/3rd Party/wx/src/msw/bitmap.cpp	
+++ b/Source/3rd Party/wx/src/msw/bitmap.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: bitmap.cpp 56488 2008-10-22 17:01:02Z RR $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,13 +40,12 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/dc.h"
 
 #if wxUSE_WXDIB
     #include "wx/msw/dib.h"
 #endif
 
-#ifdef wxHAS_RAW_BITMAP
+#ifdef wxHAVE_RAW_BITMAP
     #include "wx/rawbmp.h"
 #endif
 
@@ -56,7 +55,7 @@
 #endif // no CLR_INVALID
 
 // ----------------------------------------------------------------------------
-// wxBitmapRefData
+// Bitmap data
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
@@ -92,12 +91,12 @@ public:
     // MSW-specific
     // ------------
 
-#if wxDEBUG_LEVEL
+#ifdef __WXDEBUG__
     // this field is solely for error checking: we detect selecting a bitmap
     // into more than one DC at once or deleting a bitmap still selected into a
     // DC (both are serious programming errors under Windows)
     wxDC         *m_selectedInto;
-#endif // wxDEBUG_LEVEL
+#endif // __WXDEBUG__
 
 #if wxUSE_WXDIB
     // when GetRawData() is called for a DDB we need to convert it to a DIB
@@ -185,7 +184,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 
 wxBitmapRefData::wxBitmapRefData()
 {
-#if wxDEBUG_LEVEL
+#ifdef __WXDEBUG__
     m_selectedInto = NULL;
 #endif
     m_bitmapMask = NULL;
@@ -202,7 +201,7 @@ wxBitmapRefData::wxBitmapRefData()
 wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
                : wxGDIImageRefData(data)
 {
-#if wxDEBUG_LEVEL
+#ifdef __WXDEBUG__
     m_selectedInto = NULL;
 #endif
 
@@ -212,10 +211,10 @@ wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
         m_bitmapMask = new wxMask(*data.m_bitmapMask);
 
     // FIXME: we don't copy m_hBitmap currently but we should, see wxBitmap::
-    //        CloneGDIRefData()
+    //        CloneRefData()
 
     wxASSERT_MSG( !data.m_isDIB,
-                    wxT("can't copy bitmap locked for raw access!") );
+                    _T("can't copy bitmap locked for raw access!") );
     m_isDIB = false;
 
     m_hasAlpha = data.m_hasAlpha;
@@ -227,7 +226,7 @@ void wxBitmapRefData::Free()
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 
 #if wxUSE_WXDIB
-    wxASSERT_MSG( !m_dib, wxT("forgot to call wxBitmap::UngetRawData()!") );
+    wxASSERT_MSG( !m_dib, _T("forgot to call wxBitmap::UngetRawData()!") );
 #endif
 
     if ( m_hBitmap)
@@ -238,7 +237,8 @@ void wxBitmapRefData::Free()
         }
     }
 
-    wxDELETE(m_bitmapMask);
+    delete m_bitmapMask;
+    m_bitmapMask = NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -250,10 +250,10 @@ wxGDIImageRefData *wxBitmap::CreateData() const
     return new wxBitmapRefData;
 }
 
-wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *dataOrig) const
+wxObjectRefData *wxBitmap::CloneRefData(const wxObjectRefData *dataOrig) const
 {
     const wxBitmapRefData *
-        data = static_cast<const wxBitmapRefData *>(dataOrig);
+        data = wx_static_cast(const wxBitmapRefData *, dataOrig);
     if ( !data )
         return NULL;
 
@@ -261,7 +261,7 @@ wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *dataOrig) const
     //        wxBitmapRefData using its copy ctor but instead it modifies this
     //        bitmap itself and then returns its m_refData -- which works, of
     //        course (except in !wxUSE_WXDIB), but is completely illogical
-    wxBitmap *self = const_cast<wxBitmap *>(this);
+    wxBitmap *self = wx_const_cast(wxBitmap *, this);
 
     wxBitmapRefData *selfdata;
 #if wxUSE_WXDIB
@@ -271,7 +271,7 @@ wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *dataOrig) const
         wxDIB dib((HBITMAP)(data->m_hBitmap));
         self->CopyFromDIB(dib);
 
-        selfdata = static_cast<wxBitmapRefData *>(m_refData);
+        selfdata = wx_static_cast(wxBitmapRefData *, m_refData);
         selfdata->m_hasAlpha = data->m_hasAlpha;
     }
     else
@@ -292,8 +292,9 @@ wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *dataOrig) const
     return selfdata;
 }
 
-bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
-                                    wxBitmapTransparency transp)
+#ifdef __WIN32__
+
+bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon)
 {
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     // it may be either HICON or HCURSOR
@@ -319,71 +320,31 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
 
     refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor;
 
-    switch ( transp )
-    {
-        default:
-            wxFAIL_MSG( wxT("unknown wxBitmapTransparency value") );
-
-        case wxBitmapTransparency_None:
-            // nothing to do, refData->m_hasAlpha is false by default
-            break;
-
-        case wxBitmapTransparency_Auto:
 #if wxUSE_WXDIB
-            // If the icon is 32 bits per pixel then it may have alpha channel
-            // data, although there are some icons that are 32 bpp but have no
-            // alpha... So convert to a DIB and manually check the 4th byte for
-            // each pixel.
+    // If the icon is 32 bits per pixel then it may have alpha channel data,
+    // although there are some icons that are 32 bpp but have no alpha... So
+    // convert to a DIB and manually check the 4th byte for each pixel.
+    BITMAP bm;
+    if ( ::GetObject(iconInfo.hbmColor, sizeof(BITMAP), (LPVOID)&bm)
+         && bm.bmBitsPixel == 32)
+    {
+        wxDIB dib(iconInfo.hbmColor);
+        if (dib.IsOk())
+        {
+            unsigned char* pixels = dib.GetData();
+            for (int idx=0; idx<w*h*4; idx+=4)
             {
-                BITMAP bm;
-                if ( ::GetObject(iconInfo.hbmColor, sizeof(bm), &bm) &&
-                        (bm.bmBitsPixel == 32) )
+                if (pixels[idx+3] != 0)
                 {
-                    wxDIB dib(iconInfo.hbmColor);
-                    if (dib.IsOk())
-                    {
-                        unsigned char* const pixels = dib.GetData();
-                        int idx;
-                        for ( idx = 0; idx < w*h*4; idx += 4 )
-                        {
-                            if (pixels[idx+3] != 0)
-                            {
-                                // If there is an alpha byte that is non-zero
-                                // then set the alpha flag and stop checking
-                                refData->m_hasAlpha = true;
-                                break;
-                            }
-                        }
-
-                        if ( refData->m_hasAlpha )
-                        {
-                            // If we do have alpha, ensure we use premultiplied
-                            // data for our pixels as this is what the bitmaps
-                            // created in other ways do and this is necessary
-                            // for e.g. AlphaBlend() to work with this bitmap.
-                            for ( idx = 0; idx < w*h*4; idx += 4 )
-                            {
-                                const unsigned char a = pixels[idx+3];
-
-                                pixels[idx]   = ((pixels[idx]  *a) + 127)/255;
-                                pixels[idx+1] = ((pixels[idx+1]*a) + 127)/255;
-                                pixels[idx+2] = ((pixels[idx+2]*a) + 127)/255;
-                            }
-
-                            ::DeleteObject(refData->m_hBitmap);
-                            refData->m_hBitmap = dib.Detach();
-                        }
-                    }
+                    // If there is an alpha byte that is non-zero then set the
+                    // alpha flag and bail out of the loop.
+                    refData->m_hasAlpha = true;
+                    break;
                 }
             }
-            break;
-#endif // wxUSE_WXDIB
-
-        case wxBitmapTransparency_Always:
-            refData->m_hasAlpha = true;
-            break;
+        }
     }
-
+#endif
     if ( !refData->m_hasAlpha )
     {
         // the mask returned by GetIconInfo() is inverted compared to the usual
@@ -395,46 +356,46 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
     ::DeleteObject(iconInfo.hbmMask);
 
     return true;
-#else // __WXMICROWIN__ || __WXWINCE__
+#else
     wxUnusedVar(icon);
-    wxUnusedVar(transp);
-
     return false;
-#endif // !__WXWINCE__/__WXWINCE__
+#endif
 }
 
-bool wxBitmap::CopyFromCursor(const wxCursor& cursor, wxBitmapTransparency transp)
+#endif // Win32
+
+bool wxBitmap::CopyFromCursor(const wxCursor& cursor)
 {
     UnRef();
 
-    if ( !cursor.IsOk() )
+    if ( !cursor.Ok() )
         return false;
 
-    return CopyFromIconOrCursor(cursor, transp);
+    return CopyFromIconOrCursor(cursor);
 }
 
-bool wxBitmap::CopyFromIcon(const wxIcon& icon, wxBitmapTransparency transp)
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     UnRef();
 
-    if ( !icon.IsOk() )
+    if ( !icon.Ok() )
         return false;
 
-    return CopyFromIconOrCursor(icon, transp);
+    return CopyFromIconOrCursor(icon);
 }
 
 #ifndef NEVER_USE_DIB
 
 bool wxBitmap::CopyFromDIB(const wxDIB& dib)
 {
-    wxCHECK_MSG( dib.IsOk(), false, wxT("invalid DIB in CopyFromDIB") );
+    wxCHECK_MSG( dib.IsOk(), false, _T("invalid DIB in CopyFromDIB") );
 
 #ifdef SOMETIMES_USE_DIB
     HBITMAP hbitmap = dib.CreateDDB();
     if ( !hbitmap )
         return false;
 #else // ALWAYS_USE_DIB
-    HBITMAP hbitmap = const_cast<wxDIB &>(dib).Detach();
+    HBITMAP hbitmap = ((wxDIB &)dib).Detach();  // const_cast
 #endif // SOMETIMES_USE_DIB/ALWAYS_USE_DIB
 
     UnRef();
@@ -513,7 +474,7 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     else
     {
         // bits should already be in Windows standard format
-        data = const_cast<char *>(bits);
+        data = (char *)bits;    // const_cast is harmless
     }
 
     HBITMAP hbmp = ::CreateBitmap(width, height, 1, depth, data);
@@ -531,19 +492,24 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 #endif
 }
 
+wxBitmap::wxBitmap(int w, int h, int d)
+{
+    (void)Create(w, h, d);
+}
+
 wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
 {
     (void)Create(w, h, dc);
 }
 
-wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth)
+wxBitmap::wxBitmap(const void* data, long type, int width, int height, int depth)
 {
     (void)Create(data, type, width, height, depth);
 }
 
 wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 {
-    LoadFile(filename, type);
+    LoadFile(filename, (int)type);
 }
 
 bool wxBitmap::Create(int width, int height, int depth)
@@ -553,14 +519,9 @@ bool wxBitmap::Create(int width, int height, int depth)
 
 bool wxBitmap::Create(int width, int height, const wxDC& dc)
 {
-    wxCHECK_MSG( dc.IsOk(), false, wxT("invalid HDC in wxBitmap::Create()") );
+    wxCHECK_MSG( dc.Ok(), false, _T("invalid HDC in wxBitmap::Create()") );
 
-    const wxMSWDCImpl *impl = wxDynamicCast( dc.GetImpl(), wxMSWDCImpl );
-
-    if (impl)
-        return DoCreate(width, height, -1, impl->GetHDC());
-    else
-        return false;
+    return DoCreate(width, height, -1, dc.GetHDC());
 }
 
 bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
@@ -625,7 +586,7 @@ bool wxBitmap::DoCreate(int w, int h, int d, WXHDC hdc)
 
     SetHBITMAP((WXHBITMAP)hbmp);
 
-    return IsOk();
+    return Ok();
 }
 
 #if wxUSE_IMAGE
@@ -759,7 +720,7 @@ wxImage wxBitmap::ConvertToImage() const
     // so the 'depth' argument is ignored.
     // TODO: transparency (create a mask image)
 
-    if (!IsOk())
+    if (!Ok())
     {
         wxFAIL_MSG( wxT("bitmap is invalid") );
         return wxNullImage;
@@ -767,7 +728,7 @@ wxImage wxBitmap::ConvertToImage() const
 
     wxImage image;
 
-    wxCHECK_MSG( IsOk(), wxNullImage, wxT("invalid bitmap") );
+    wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
     // create an wxImage object
     int width = GetWidth();
@@ -828,22 +789,17 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 
 bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
 {
-    wxCHECK_MSG( dc.IsOk(), false,
-                    wxT("invalid HDC in wxBitmap::CreateFromImage()") );
+    wxCHECK_MSG( dc.Ok(), false,
+                    _T("invalid HDC in wxBitmap::CreateFromImage()") );
 
-    const wxMSWDCImpl *impl = wxDynamicCast( dc.GetImpl(), wxMSWDCImpl );
-
-    if (impl)
-        return CreateFromImage(image, -1, impl->GetHDC());
-    else
-        return false;
+    return CreateFromImage(image, -1, dc.GetHDC());
 }
 
 #if wxUSE_WXDIB
 
 bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
 {
-    wxCHECK_MSG( image.IsOk(), false, wxT("invalid image") );
+    wxCHECK_MSG( image.Ok(), false, wxT("invalid image") );
 
     UnRef();
 
@@ -859,7 +815,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
 
     if (depth == -1)
       depth = dib.GetDepth();
-
+      
     // store the bitmap parameters
     wxBitmapRefData * const refData = new wxBitmapRefData;
     refData->m_width = w;
@@ -924,7 +880,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
         hbitmap = ::CreateBitmap(w, h, 1, 1, data);
         if ( !hbitmap )
         {
-            wxLogLastError(wxT("CreateBitmap(mask)"));
+            wxLogLastError(_T("CreateBitmap(mask)"));
         }
         else
         {
@@ -949,7 +905,7 @@ wxImage wxBitmap::ConvertToImage() const
 
     // and then DIB to our wxImage
     wxImage image = dib.ConvertToImage();
-    if ( !image.IsOk() )
+    if ( !image.Ok() )
     {
         return wxNullImage;
     }
@@ -1043,7 +999,7 @@ wxImage wxBitmap::ConvertToImage() const
 // loading and saving bitmaps
 // ----------------------------------------------------------------------------
 
-bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
+bool wxBitmap::LoadFile(const wxString& filename, long type)
 {
     UnRef();
 
@@ -1059,7 +1015,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     else // no bitmap handler found
     {
         wxImage image;
-        if ( image.LoadFile( filename, type ) && image.IsOk() )
+        if ( image.LoadFile( filename, type ) && image.Ok() )
         {
             *this = wxBitmap(image);
 
@@ -1071,7 +1027,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     return false;
 }
 
-bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height, int depth)
+bool wxBitmap::Create(const void* data, long type, int width, int height, int depth)
 {
     UnRef();
 
@@ -1090,8 +1046,8 @@ bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height
 }
 
 bool wxBitmap::SaveFile(const wxString& filename,
-                        wxBitmapType type,
-                        const wxPalette *palette) const
+                        int type,
+                        const wxPalette *palette)
 {
     wxBitmapHandler *handler = wxDynamicCast(FindHandler(type), wxBitmapHandler);
 
@@ -1104,7 +1060,7 @@ bool wxBitmap::SaveFile(const wxString& filename,
     {
         // FIXME what about palette? shouldn't we use it?
         wxImage image = ConvertToImage();
-        if ( image.IsOk() )
+        if ( image.Ok() )
         {
             return image.SaveFile(filename, type);
         }
@@ -1126,14 +1082,14 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect ) const
 
 wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const
 {
-    wxCHECK_MSG( IsOk() &&
+    wxCHECK_MSG( Ok() &&
                  (rect.x >= 0) && (rect.y >= 0) &&
                  (rect.x+rect.width <= GetWidth()) &&
                  (rect.y+rect.height <= GetHeight()),
                  wxNullBitmap, wxT("Invalid bitmap or bitmap region") );
 
     wxBitmap ret( rect.width, rect.height, GetDepth() );
-    wxASSERT_MSG( ret.IsOk(), wxT("GetSubBitmap error") );
+    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 
 #ifndef __WXMICROWIN__
     // handle alpha channel, if any
@@ -1146,16 +1102,16 @@ wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const
 
     {
         SelectInHDC selectDst(dcDst, GetHbitmapOf(ret));
-
+		
         if ( !selectDst )
         {
-            wxLogLastError(wxT("SelectObject(destBitmap)"));
+            wxLogLastError(_T("SelectObject(destBitmap)"));
         }
 
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
                        (HDC)hdc, rect.x, rect.y, SRCCOPY) )
         {
-            wxLogLastError(wxT("BitBlt"));
+            wxLogLastError(_T("BitBlt"));
         }
     }
 
@@ -1170,7 +1126,7 @@ wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
                        dcSrc, rect.x, rect.y, SRCCOPY) )
         {
-            wxLogLastError(wxT("BitBlt"));
+            wxLogLastError(_T("BitBlt"));
         }
 
         wxMask *mask = new wxMask((WXHBITMAP) hbmpMask);
@@ -1189,13 +1145,13 @@ wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const
 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
-                           : NULL;
+                           : (wxPalette *) NULL;
 }
 #endif
 
 wxMask *wxBitmap::GetMask() const
 {
-    return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;
+    return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
 }
 
 wxBitmap wxBitmap::GetMaskBitmap() const
@@ -1207,15 +1163,24 @@ wxBitmap wxBitmap::GetMaskBitmap() const
     return bmp;
 }
 
+#ifdef __WXDEBUG__
+
 wxDC *wxBitmap::GetSelectedInto() const
 {
-#if wxDEBUG_LEVEL
-    return GetBitmapData() ? GetBitmapData()->m_selectedInto : NULL;
-#else
-    return NULL;
-#endif
+    return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;
 }
 
+#endif
+
+#if WXWIN_COMPATIBILITY_2_4
+
+int wxBitmap::GetQuality() const
+{
+    return 0;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
 void wxBitmap::UseAlpha()
 {
     if ( GetBitmapData() )
@@ -1231,16 +1196,16 @@ bool wxBitmap::HasAlpha() const
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 
+#ifdef __WXDEBUG__
+
 void wxBitmap::SetSelectedInto(wxDC *dc)
 {
-#if wxDEBUG_LEVEL
     if ( GetBitmapData() )
         GetBitmapData()->m_selectedInto = dc;
-#else
-    wxUnusedVar(dc);
-#endif
 }
 
+#endif
+
 #if wxUSE_PALETTE
 
 void wxBitmap::SetPalette(const wxPalette& palette)
@@ -1259,16 +1224,23 @@ void wxBitmap::SetMask(wxMask *mask)
     GetBitmapData()->SetMask(mask);
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
+void wxBitmap::SetQuality(int WXUNUSED(quality))
+{
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
 // ----------------------------------------------------------------------------
 // raw bitmap access support
 // ----------------------------------------------------------------------------
 
-#ifdef wxHAS_RAW_BITMAP
-
+#ifdef wxHAVE_RAW_BITMAP
 void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 {
 #if wxUSE_WXDIB
-    if ( !IsOk() )
+    if ( !Ok() )
     {
         // no bitmap, no data (raw or otherwise)
         return NULL;
@@ -1281,7 +1253,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     if ( !GetBitmapData()->m_isDIB )
     {
         wxCHECK_MSG( !GetBitmapData()->m_dib, NULL,
-                        wxT("GetRawData() may be called only once") );
+                        _T("GetRawData() may be called only once") );
 
         wxDIB *dib = new wxDIB(*this);
         if ( !dib->IsOk() )
@@ -1304,7 +1276,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     DIBSECTION ds;
     if ( ::GetObject(hDIB, sizeof(ds), &ds) != sizeof(DIBSECTION) )
     {
-        wxFAIL_MSG( wxT("failed to get DIBSECTION from a DIB?") );
+        wxFAIL_MSG( _T("failed to get DIBSECTION from a DIB?") );
 
         return NULL;
     }
@@ -1312,7 +1284,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     // check that the bitmap is in correct format
     if ( ds.dsBm.bmBitsPixel != bpp )
     {
-        wxFAIL_MSG( wxT("incorrect bitmap type in wxBitmap::GetRawData()") );
+        wxFAIL_MSG( _T("incorrect bitmap type in wxBitmap::GetRawData()") );
 
         return NULL;
     }
@@ -1346,7 +1318,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
 {
 #if wxUSE_WXDIB
-    if ( !IsOk() )
+    if ( !Ok() )
         return;
 
     if ( !&dataBase )
@@ -1370,7 +1342,7 @@ void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
     }
 #endif // wxUSE_WXDIB
 }
-#endif // wxHAS_RAW_BITMAP
+#endif // #ifdef wxHAVE_RAW_BITMAP
 
 // ----------------------------------------------------------------------------
 // wxMask
@@ -1407,7 +1379,7 @@ wxMask::wxMask(const wxMask &mask)
     SelectObject(destDC, (HBITMAP) m_maskBitmap);
 
     BitBlt(destDC, 0, 0, w, h, srcDC, 0, 0, SRCCOPY);
-
+    
     SelectObject(srcDC, 0);
     DeleteDC(srcDC);
     SelectObject(destDC, 0);
@@ -1447,8 +1419,8 @@ wxMask::~wxMask()
 bool wxMask::Create(const wxBitmap& bitmap)
 {
 #ifndef __WXMICROWIN__
-    wxCHECK_MSG( bitmap.IsOk() && bitmap.GetDepth() == 1, false,
-                 wxT("can't create mask from invalid or not monochrome bitmap") );
+    wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, false,
+                 _T("can't create mask from invalid or not monochrome bitmap") );
 
     if ( m_maskBitmap )
     {
@@ -1488,7 +1460,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
     }
 
 #if wxUSE_PALETTE
-    if (bitmap.IsOk() && bitmap.GetPalette()->IsOk())
+    if (bitmap.Ok() && bitmap.GetPalette()->Ok())
     {
         unsigned char red, green, blue;
         if (bitmap.GetPalette()->GetRGB(paletteIndex, &red, &green, &blue))
@@ -1507,7 +1479,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
 #ifndef __WXMICROWIN__
-    wxCHECK_MSG( bitmap.IsOk(), false, wxT("invalid bitmap in wxMask::Create") );
+    wxCHECK_MSG( bitmap.Ok(), false, _T("invalid bitmap in wxMask::Create") );
 
     if ( m_maskBitmap )
     {
@@ -1534,7 +1506,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
     // SelectObject() will fail
     wxASSERT_MSG( !bitmap.GetSelectedInto(),
-                  wxT("bitmap can't be selected in another DC") );
+                  _T("bitmap can't be selected in another DC") );
 
     HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
     if ( !hbmpSrcOld )
@@ -1580,27 +1552,27 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
 bool wxBitmapHandler::Create(wxGDIImage *image,
                              const void* data,
-                             wxBitmapType type,
+                             long flags,
                              int width, int height, int depth)
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
-    return bitmap && Create(bitmap, data, type, width, height, depth);
+    return bitmap && Create(bitmap, data, flags, width, height, depth);
 }
 
 bool wxBitmapHandler::Load(wxGDIImage *image,
                            const wxString& name,
-                           wxBitmapType type,
+                           long flags,
                            int width, int height)
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
-    return bitmap && LoadFile(bitmap, name, type, width, height);
+    return bitmap && LoadFile(bitmap, name, flags, width, height);
 }
 
-bool wxBitmapHandler::Save(const wxGDIImage *image,
+bool wxBitmapHandler::Save(wxGDIImage *image,
                            const wxString& name,
-                           wxBitmapType type) const
+                           int type)
 {
     wxBitmap *bitmap = wxDynamicCast(image, wxBitmap);
 
@@ -1609,7 +1581,7 @@ bool wxBitmapHandler::Save(const wxGDIImage *image,
 
 bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
                              const void* WXUNUSED(data),
-                             wxBitmapType WXUNUSED(type),
+                             long WXUNUSED(type),
                              int WXUNUSED(width),
                              int WXUNUSED(height),
                              int WXUNUSED(depth))
@@ -1619,21 +1591,72 @@ bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
 
 bool wxBitmapHandler::LoadFile(wxBitmap *WXUNUSED(bitmap),
                                const wxString& WXUNUSED(name),
-                               wxBitmapType WXUNUSED(type),
+                               long WXUNUSED(type),
                                int WXUNUSED(desiredWidth),
                                int WXUNUSED(desiredHeight))
 {
     return false;
 }
 
-bool wxBitmapHandler::SaveFile(const wxBitmap *WXUNUSED(bitmap),
+bool wxBitmapHandler::SaveFile(wxBitmap *WXUNUSED(bitmap),
                                const wxString& WXUNUSED(name),
-                               wxBitmapType WXUNUSED(type),
-                               const wxPalette *WXUNUSED(palette)) const
+                               int WXUNUSED(type),
+                               const wxPalette *WXUNUSED(palette))
 {
     return false;
 }
 
+// ----------------------------------------------------------------------------
+// DIB functions
+// ----------------------------------------------------------------------------
+
+#ifndef __WXMICROWIN__
+bool wxCreateDIB(long xSize, long ySize, long bitsPerPixel,
+                 HPALETTE hPal, LPBITMAPINFO* lpDIBHeader)
+{
+   unsigned long   i, headerSize;
+
+   // Allocate space for a DIB header
+   headerSize = (sizeof(BITMAPINFOHEADER) + (256 * sizeof(PALETTEENTRY)));
+   LPBITMAPINFO lpDIBheader = (BITMAPINFO *) malloc(headerSize);
+   LPPALETTEENTRY lpPe = (PALETTEENTRY *)((BYTE*)lpDIBheader + sizeof(BITMAPINFOHEADER));
+
+   GetPaletteEntries(hPal, 0, 256, lpPe);
+
+   memset(lpDIBheader, 0x00, sizeof(BITMAPINFOHEADER));
+
+   // Fill in the static parts of the DIB header
+   lpDIBheader->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+   lpDIBheader->bmiHeader.biWidth = xSize;
+   lpDIBheader->bmiHeader.biHeight = ySize;
+   lpDIBheader->bmiHeader.biPlanes = 1;
+
+   // this value must be 1, 4, 8 or 24 so PixelDepth can only be
+   lpDIBheader->bmiHeader.biBitCount = (WORD)(bitsPerPixel);
+   lpDIBheader->bmiHeader.biCompression = BI_RGB;
+   lpDIBheader->bmiHeader.biSizeImage = (xSize * abs((int)ySize) * bitsPerPixel) >> 3;
+   lpDIBheader->bmiHeader.biClrUsed = 256;
+
+
+   // Initialize the DIB palette
+   for (i = 0; i < 256; i++) {
+      lpDIBheader->bmiColors[i].rgbReserved = lpPe[i].peFlags;
+      lpDIBheader->bmiColors[i].rgbRed = lpPe[i].peRed;
+      lpDIBheader->bmiColors[i].rgbGreen = lpPe[i].peGreen;
+      lpDIBheader->bmiColors[i].rgbBlue = lpPe[i].peBlue;
+   }
+
+   *lpDIBHeader = lpDIBheader;
+
+   return true;
+}
+
+void wxFreeDIB(LPBITMAPINFO lpDIBHeader)
+{
+    free(lpDIBHeader);
+}
+#endif
+
 // ----------------------------------------------------------------------------
 // global helper functions implemented here
 // ----------------------------------------------------------------------------
@@ -1645,7 +1668,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
                              int hotSpotX,
                              int hotSpotY)
 {
-    if ( !bmp.IsOk() )
+    if ( !bmp.Ok() )
     {
         // we can't create an icon/cursor form nothing
         return 0;
@@ -1653,25 +1676,9 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
 
     if ( bmp.HasAlpha() )
     {
-        HBITMAP hbmp;
-
-#if wxUSE_WXDIB && wxUSE_IMAGE
-        // CreateIconIndirect() requires non-pre-multiplied pixel data on input
-        // as it does pre-multiplication internally itself so we need to create
-        // a special DIB in such format to pass to it. This is inefficient but
-        // better than creating an icon with wrong colours.
-        AutoHBITMAP hbmpRelease;
-        hbmp = wxDIB(bmp.ConvertToImage(),
-                     wxDIB::PixelFormat_NotPreMultiplied).Detach();
-        hbmpRelease.Init(hbmp);
-#else // !(wxUSE_WXDIB && wxUSE_IMAGE)
-        hbmp = GetHbitmapOf(bmp);
-#endif // wxUSE_WXDIB && wxUSE_IMAGE
-
         // Create an empty mask bitmap.
         // it doesn't seem to work if we mess with the mask at all.
-        AutoHBITMAP
-            hMonoBitmap(CreateBitmap(bmp.GetWidth(),bmp.GetHeight(),1,1,NULL));
+        HBITMAP hMonoBitmap = CreateBitmap(bmp.GetWidth(),bmp.GetHeight(),1,1,NULL);
 
         ICONINFO iconInfo;
         wxZeroMemory(iconInfo);
@@ -1683,9 +1690,13 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
         }
 
         iconInfo.hbmMask = hMonoBitmap;
-        iconInfo.hbmColor = hbmp;
+        iconInfo.hbmColor = GetHbitmapOf(bmp);
 
-        return ::CreateIconIndirect(&iconInfo);
+        HICON hicon = ::CreateIconIndirect(&iconInfo);
+
+        ::DeleteObject(hMonoBitmap);
+
+        return hicon;
     }
 
     wxMask* mask = bmp.GetMask();
@@ -1706,8 +1717,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
         iconInfo.yHotspot = hotSpotY;
     }
 
-    AutoHBITMAP hbmpMask(wxInvertMask((HBITMAP)mask->GetMaskBitmap()));
-    iconInfo.hbmMask = hbmpMask;
+    iconInfo.hbmMask = wxInvertMask((HBITMAP)mask->GetMaskBitmap());
     iconInfo.hbmColor = GetHbitmapOf(bmp);
 
     // black out the transparent area to preserve background colour, because
@@ -1721,7 +1731,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
         if ( !::BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(),
                        dcSrc, 0, 0, SRCAND) )
         {
-            wxLogLastError(wxT("BitBlt"));
+            wxLogLastError(_T("BitBlt"));
         }
     }
 
@@ -1733,6 +1743,9 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
         delete mask;
     }
 
+    // delete the inverted mask bitmap we created as well
+    ::DeleteObject(iconInfo.hbmMask);
+
     return hicon;
 }
 
@@ -1749,7 +1762,7 @@ HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY)
 HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
 {
 #ifndef __WXMICROWIN__
-    wxCHECK_MSG( hbmpMask, 0, wxT("invalid bitmap in wxInvertMask") );
+    wxCHECK_MSG( hbmpMask, 0, _T("invalid bitmap in wxInvertMask") );
 
     // get width/height from the bitmap if not given
     if ( !w || !h )
diff --git a/Source/3rd Party/wx/src/msw/bmpbuttn.cpp b/Source/3rd Party/wx/src/msw/bmpbuttn.cpp
index 4aecb35f0..679765910 100644
--- a/Source/3rd Party/wx/src/msw/bmpbuttn.cpp	
+++ b/Source/3rd Party/wx/src/msw/bmpbuttn.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: bmpbuttn.cpp 42816 2006-10-31 08:50:17Z RD $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,6 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/dc.h"          // for wxDCTemp
 
 #include "wx/msw/uxtheme.h"
 
@@ -54,8 +53,64 @@
 // macros
 // ----------------------------------------------------------------------------
 
+#if wxUSE_EXTENDED_RTTI
+
+WX_DEFINE_FLAGS( wxBitmapButtonStyle )
+
+wxBEGIN_FLAGS( wxBitmapButtonStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxBU_AUTODRAW)
+    wxFLAGS_MEMBER(wxBU_LEFT)
+    wxFLAGS_MEMBER(wxBU_RIGHT)
+    wxFLAGS_MEMBER(wxBU_TOP)
+    wxFLAGS_MEMBER(wxBU_BOTTOM)
+wxEND_FLAGS( wxBitmapButtonStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton,"wx/bmpbuttn.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxBitmapButton)
+    wxPROPERTY_FLAGS( WindowStyle , wxBitmapButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxBitmapButton)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxBitmapButton , wxWindow* , Parent , wxWindowID , Id , wxBitmap , Bitmap , wxPoint , Position , wxSize , Size )
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
+#endif
+
 BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase)
     EVT_SYS_COLOUR_CHANGED(wxBitmapButton::OnSysColourChanged)
+    EVT_ENTER_WINDOW(wxBitmapButton::OnMouseEnterOrLeave)
+    EVT_LEAVE_WINDOW(wxBitmapButton::OnMouseEnterOrLeave)
 END_EVENT_TABLE()
 
 /*
@@ -68,29 +123,524 @@ bitmap "focus" ,
 bitmap "disabled" ,
 */
 
-bool wxBitmapButton::Create(wxWindow *parent,
-                            wxWindowID id,
-                            const wxBitmap& bitmap,
-                            const wxPoint& pos,
-                            const wxSize& size, long style,
-                            const wxValidator& validator,
-                            const wxString& name)
+bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
+    const wxBitmap& bitmap,
+    const wxPoint& pos,
+    const wxSize& size, long style,
+    const wxValidator& wxVALIDATOR_PARAM(validator),
+    const wxString& name)
 {
-    if ( !wxBitmapButtonBase::Create(parent, id, pos, size, style,
-                                     validator, name) )
+    m_bmpNormal = bitmap;
+    SetName(name);
+
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif // wxUSE_VALIDATORS
+
+    parent->AddChild(this);
+
+    m_windowStyle = style;
+
+    if ( style & wxBU_AUTODRAW )
+    {
+        m_marginX =
+        m_marginY = 4;
+    }
+
+    if (id == wxID_ANY)
+        m_windowId = NewControlId();
+    else
+        m_windowId = id;
+
+    long msStyle = WS_VISIBLE | WS_TABSTOP | WS_CHILD | BS_OWNERDRAW ;
+
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;
+
+#ifdef __WIN32__
+    if(m_windowStyle & wxBU_LEFT)
+        msStyle |= BS_LEFT;
+    if(m_windowStyle & wxBU_RIGHT)
+        msStyle |= BS_RIGHT;
+    if(m_windowStyle & wxBU_TOP)
+        msStyle |= BS_TOP;
+    if(m_windowStyle & wxBU_BOTTOM)
+        msStyle |= BS_BOTTOM;
+#endif
+
+    m_hWnd = (WXHWND) CreateWindowEx(
+                    0,
+                    wxT("BUTTON"),
+                    wxEmptyString,
+                    msStyle,
+                    0, 0, 0, 0,
+                    GetWinHwnd(parent),
+                    (HMENU)m_windowId,
+                    wxGetInstance(),
+                    NULL
+                   );
+
+    // Subclass again for purposes of dialog editing mode
+    SubclassWin(m_hWnd);
+
+    SetPosition(pos);
+    SetInitialSize(size);
+
+    return true;
+}
+
+bool wxBitmapButton::SetBackgroundColour(const wxColour& colour)
+{
+    if ( !wxBitmapButtonBase::SetBackgroundColour(colour) )
+    {
+        // didn't change
+        return false;
+    }
+
+    // invalidate the brush, it will be recreated the next time it's needed
+    m_brushDisabled = wxNullBrush;
+
+    return true;
+}
+
+void wxBitmapButton::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    m_brushDisabled = wxNullBrush;
+
+    if ( !IsEnabled() )
+    {
+        // this change affects our current state
+        Refresh();
+    }
+
+    event.Skip();
+}
+
+void wxBitmapButton::OnMouseEnterOrLeave(wxMouseEvent& event)
+{
+    if ( IsEnabled() && m_bmpHover.Ok() )
+        Refresh();
+
+    event.Skip();
+}
+
+void wxBitmapButton::OnSetBitmap()
+{
+    // if the focus bitmap is specified but hover one isn't, use the focus
+    // bitmap for hovering as well if this is consistent with the current
+    // Windows version look and feel
+    //
+    // rationale: this is compatible with the old wxGTK behaviour and also
+    // makes it much easier to do "the right thing" for all platforms (some of
+    // them, such as Windows XP, have "hot" buttons while others don't)
+    if ( !m_bmpHover.Ok() &&
+            m_bmpFocus.Ok() &&
+                wxUxThemeEngine::GetIfActive() )
+    {
+        m_bmpHover = m_bmpFocus;
+    }
+
+    // this will redraw us
+    wxBitmapButtonBase::OnSetBitmap();
+}
+
+#if wxUSE_UXTHEME
+static
+void MSWDrawXPBackground(wxButton *button, WXDRAWITEMSTRUCT *wxdis)
+{
+    LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis;
+    HDC hdc = lpDIS->hDC;
+    UINT state = lpDIS->itemState;
+    RECT rectBtn;
+    CopyRect(&rectBtn, &lpDIS->rcItem);
+
+    wxUxThemeHandle theme(button, L"BUTTON");
+    int iState;
+
+    if ( state & ODS_SELECTED )
+    {
+        iState = PBS_PRESSED;
+    }
+    else if ( button->HasCapture() || button->IsMouseInWindow() )
+    {
+        iState = PBS_HOT;
+    }
+    else if ( state & ODS_FOCUS )
+    {
+        iState = PBS_DEFAULTED;
+    }
+    else if ( state & ODS_DISABLED )
+    {
+        iState = PBS_DISABLED;
+    }
+    else
+    {
+        iState = PBS_NORMAL;
+    }
+
+    // draw parent background if needed
+    if ( wxUxThemeEngine::Get()->IsThemeBackgroundPartiallyTransparent(theme,
+                                                                       BP_PUSHBUTTON,
+                                                                       iState) )
+    {
+        wxUxThemeEngine::Get()->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
+    }
+
+    // draw background
+    wxUxThemeEngine::Get()->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState,
+                                                &rectBtn, NULL);
+
+    // calculate content area margins
+    MARGINS margins;
+    wxUxThemeEngine::Get()->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
+                                            TMT_CONTENTMARGINS, &rectBtn, &margins);
+    RECT rectClient;
+    ::CopyRect(&rectClient, &rectBtn);
+    ::InflateRect(&rectClient, -margins.cxLeftWidth, -margins.cyTopHeight);
+
+    // if focused and !nofocus rect
+    if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) )
+    {
+        DrawFocusRect(hdc, &rectClient);
+    }
+
+    if ( button->UseBgCol() )
+    {
+        COLORREF colBg = wxColourToRGB(button->GetBackgroundColour());
+        HBRUSH hbrushBackground = ::CreateSolidBrush(colBg);
+
+        // don't overwrite the focus rect
+        ::InflateRect(&rectClient, -1, -1);
+        FillRect(hdc, &rectClient, hbrushBackground);
+        ::DeleteObject(hbrushBackground);
+    }
+}
+#endif // wxUSE_UXTHEME
+
+// VZ: should be at the very least less than wxDEFAULT_BUTTON_MARGIN
+#define FOCUS_MARGIN 3
+
+bool wxBitmapButton::MSWOnDraw(WXDRAWITEMSTRUCT *item)
+{
+#ifndef __WXWINCE__
+    long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE);
+    if (style & BS_BITMAP)
+    {
+        // Let default procedure draw the bitmap, which is defined
+        // in the Windows resource.
+        return false;
+    }
+#endif
+
+    LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
+    HDC hDC                = lpDIS->hDC;
+    UINT state             = lpDIS->itemState;
+    bool isSelected        = (state & ODS_SELECTED) != 0;
+    bool autoDraw          = (GetWindowStyleFlag() & wxBU_AUTODRAW) != 0;
+
+
+    // choose the bitmap to use depending on the button state
+    wxBitmap *bitmap;
+
+    if ( isSelected && m_bmpSelected.Ok() )
+        bitmap = &m_bmpSelected;
+    else if ( m_bmpHover.Ok() && IsMouseInWindow() )
+        bitmap = &m_bmpHover;
+    else if ((state & ODS_FOCUS) && m_bmpFocus.Ok())
+        bitmap = &m_bmpFocus;
+    else if ((state & ODS_DISABLED) && m_bmpDisabled.Ok())
+        bitmap = &m_bmpDisabled;
+    else
+        bitmap = &m_bmpNormal;
+
+    if ( !bitmap->Ok() )
         return false;
 
-    if ( bitmap.IsOk() )
-        SetBitmapLabel(bitmap);
+    // centre the bitmap in the control area
+    int x      = lpDIS->rcItem.left;
+    int y      = lpDIS->rcItem.top;
+    int width  = lpDIS->rcItem.right - x;
+    int height = lpDIS->rcItem.bottom - y;
+    int wBmp   = bitmap->GetWidth();
+    int hBmp   = bitmap->GetHeight();
 
-    if ( !size.IsFullySpecified() )
+#if wxUSE_UXTHEME
+    if ( autoDraw && wxUxThemeEngine::GetIfActive() )
     {
-        // As our bitmap has just changed, our best size has changed as well so
-        // reset the initial size using the new value.
-        SetInitialSize(size);
+        MSWDrawXPBackground(this, item);
+        wxUxThemeHandle theme(this, L"BUTTON");
+
+        // calculate content area margins
+        // assuming here that each state is the same size
+        MARGINS margins;
+        wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
+                                                BP_PUSHBUTTON, PBS_NORMAL,
+                                                TMT_CONTENTMARGINS, NULL,
+                                                &margins);
+        int marginX = margins.cxLeftWidth + 1;
+        int marginY = margins.cyTopHeight + 1;
+        int x1,y1;
+
+        if ( m_windowStyle & wxBU_LEFT )
+        {
+            x1 = x + marginX;
+        }
+        else if ( m_windowStyle & wxBU_RIGHT )
+        {
+            x1 = x + (width - wBmp) - marginX;
+        }
+        else
+        {
+            x1 = x + (width - wBmp) / 2;
+        }
+
+        if ( m_windowStyle & wxBU_TOP )
+        {
+            y1 = y + marginY;
+        }
+        else if ( m_windowStyle & wxBU_BOTTOM )
+        {
+            y1 = y + (height - hBmp) - marginY;
+        }
+        else
+        {
+            y1 = y + (height - hBmp) / 2;
+        }
+
+        // draw the bitmap
+        wxDCTemp dst((WXHDC)hDC);
+        dst.DrawBitmap(*bitmap, x1, y1, true);
+
+        return true;
+    }
+#endif // wxUSE_UXTHEME
+
+    int x1,y1;
+
+    if(m_windowStyle & wxBU_LEFT)
+        x1 = x + (FOCUS_MARGIN+1);
+    else if(m_windowStyle & wxBU_RIGHT)
+        x1 = x + (width - wBmp) - (FOCUS_MARGIN+1);
+    else
+        x1 = x + (width - wBmp) / 2;
+
+    if(m_windowStyle & wxBU_TOP)
+        y1 = y + (FOCUS_MARGIN+1);
+    else if(m_windowStyle & wxBU_BOTTOM)
+        y1 = y + (height - hBmp) - (FOCUS_MARGIN+1);
+    else
+        y1 = y + (height - hBmp) / 2;
+
+    if ( isSelected && autoDraw )
+    {
+        x1++;
+        y1++;
+    }
+
+    // draw the face, if auto-drawing
+    if ( autoDraw )
+    {
+        DrawFace((WXHDC) hDC,
+                 lpDIS->rcItem.left, lpDIS->rcItem.top,
+                 lpDIS->rcItem.right, lpDIS->rcItem.bottom,
+                 isSelected);
+    }
+
+    // draw the bitmap
+    wxDCTemp dst((WXHDC)hDC);
+    dst.DrawBitmap(*bitmap, x1, y1, true);
+
+    // draw focus / disabled state, if auto-drawing
+    if ( (state & ODS_DISABLED) && autoDraw )
+    {
+        DrawButtonDisable((WXHDC) hDC,
+                          lpDIS->rcItem.left, lpDIS->rcItem.top,
+                          lpDIS->rcItem.right, lpDIS->rcItem.bottom,
+                          true);
+    }
+    else if ( (state & ODS_FOCUS) && autoDraw )
+    {
+        DrawButtonFocus((WXHDC) hDC,
+                        lpDIS->rcItem.left,
+                        lpDIS->rcItem.top,
+                        lpDIS->rcItem.right,
+                        lpDIS->rcItem.bottom,
+                        isSelected);
     }
 
     return true;
 }
 
+// GRG Feb/2000, support for bmp buttons with Win95/98 standard LNF
+
+void wxBitmapButton::DrawFace( WXHDC dc, int left, int top,
+    int right, int bottom, bool sel )
+{
+    HPEN oldp;
+    HPEN penHiLight;
+    HPEN penLight;
+    HPEN penShadow;
+    HPEN penDkShadow;
+    HBRUSH brushFace;
+
+    // create needed pens and brush
+    penHiLight  = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DHILIGHT));
+    penLight    = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DLIGHT));
+    penShadow   = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DSHADOW));
+    penDkShadow = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_3DDKSHADOW));
+    brushFace   = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
+
+    // draw the rectangle
+    RECT rect;
+    rect.left   = left;
+    rect.right  = right;
+    rect.top    = top;
+    rect.bottom = bottom;
+    FillRect((HDC) dc, &rect, brushFace);
+
+    // draw the border
+    oldp = (HPEN) SelectObject( (HDC) dc, sel? penDkShadow : penHiLight);
+
+    wxDrawLine((HDC) dc, left, top, right-1, top);
+    wxDrawLine((HDC) dc, left, top+1, left, bottom-1);
+
+    SelectObject( (HDC) dc, sel? penShadow : penLight);
+    wxDrawLine((HDC) dc, left+1, top+1, right-2, top+1);
+    wxDrawLine((HDC) dc, left+1, top+2, left+1, bottom-2);
+
+    SelectObject( (HDC) dc, sel? penLight : penShadow);
+    wxDrawLine((HDC) dc, left+1, bottom-2, right-1, bottom-2);
+    wxDrawLine((HDC) dc, right-2, bottom-3, right-2, top);
+
+    SelectObject( (HDC) dc, sel? penHiLight : penDkShadow);
+    wxDrawLine((HDC) dc, left, bottom-1, right+2, bottom-1);
+    wxDrawLine((HDC) dc, right-1, bottom-2, right-1, top-1);
+
+    // delete allocated resources
+    SelectObject((HDC) dc,oldp);
+    DeleteObject(penHiLight);
+    DeleteObject(penLight);
+    DeleteObject(penShadow);
+    DeleteObject(penDkShadow);
+    DeleteObject(brushFace);
+}
+
+void wxBitmapButton::DrawButtonFocus( WXHDC dc, int left, int top, int right,
+    int bottom, bool WXUNUSED(sel) )
+{
+    RECT rect;
+    rect.left = left;
+    rect.top = top;
+    rect.right = right;
+    rect.bottom = bottom;
+    InflateRect( &rect, - FOCUS_MARGIN, - FOCUS_MARGIN );
+
+    // GRG: the focus rectangle should not move when the button is pushed!
+/*
+    if ( sel )
+        OffsetRect( &rect, 1, 1 );
+*/
+
+    DrawFocusRect( (HDC) dc, &rect );
+}
+
+void
+wxBitmapButton::DrawButtonDisable( WXHDC dc,
+                                   int left, int top, int right, int bottom,
+                                   bool with_marg )
+{
+    if ( !m_brushDisabled.Ok() )
+    {
+        // draw a bitmap with two black and two background colour pixels
+        wxBitmap bmp(2, 2);
+        wxMemoryDC dc;
+        dc.SelectObject(bmp);
+        dc.SetPen(*wxBLACK_PEN);
+        dc.DrawPoint(0, 0);
+        dc.DrawPoint(1, 1);
+        dc.SetPen(GetBackgroundColour());
+        dc.DrawPoint(0, 1);
+        dc.DrawPoint(1, 0);
+
+        m_brushDisabled = wxBrush(bmp);
+    }
+
+    SelectInHDC selectBrush((HDC)dc, GetHbrushOf(m_brushDisabled));
+
+    // ROP for "dest |= pattern" operation -- as it doesn't have a standard
+    // name, give it our own
+    static const DWORD PATTERNPAINT = 0xFA0089UL;
+
+    if ( with_marg )
+    {
+        left += m_marginX;
+        top += m_marginY;
+        right -= 2 * m_marginX;
+        bottom -= 2 * m_marginY;
+    }
+
+    ::PatBlt( (HDC) dc, left, top, right, bottom, PATTERNPAINT);
+}
+
+void wxBitmapButton::SetDefault()
+{
+    wxButton::SetDefault();
+}
+
+wxSize wxBitmapButton::DoGetBestSize() const
+{
+    if ( m_bmpNormal.Ok() )
+    {
+        int width = m_bmpNormal.GetWidth(),
+            height = m_bmpNormal.GetHeight();
+        int marginH = 0,
+            marginV = 0;
+
+#if wxUSE_UXTHEME
+        if ( wxUxThemeEngine::GetIfActive() )
+        {
+            wxUxThemeHandle theme((wxBitmapButton *)this, L"BUTTON");
+
+            MARGINS margins;
+            wxUxThemeEngine::Get()->GetThemeMargins(theme, NULL,
+                                                    BP_PUSHBUTTON, PBS_NORMAL,
+                                                    TMT_CONTENTMARGINS, NULL,
+                                                    &margins);
+
+            // XP doesn't draw themed buttons correctly when the client area is
+            // smaller than 8x8 - enforce this minimum size for small bitmaps
+            if ( width < 8 )
+                width = 8;
+            if ( height < 8 )
+                height = 8;
+
+            // don't add margins for the borderless buttons, they don't need
+            // them and it just makes them appear larger than needed
+            if ( !HasFlag(wxBORDER_NONE) )
+            {
+                // we need 2 extra pixels for the focus rectangle, without them
+                // it's overwritten by the bitmap itself
+                marginH = margins.cxLeftWidth + margins.cxRightWidth + 2;
+                marginV = margins.cyTopHeight + margins.cyBottomHeight + 2;
+            }
+        }
+        else
+#endif // wxUSE_UXTHEME
+        {
+            if ( !HasFlag(wxBORDER_NONE) )
+            {
+                marginH = 2*m_marginX;
+                marginV = 2*m_marginY;
+            }
+        }
+
+        wxSize best(width + marginH, height + marginV);
+        CacheBestSize(best);
+        return best;
+    }
+
+    // no idea what our best size should be, defer to the base class
+    return wxBitmapButtonBase::DoGetBestSize();
+}
+
 #endif // wxUSE_BMPBUTTON
diff --git a/Source/3rd Party/wx/src/msw/brush.cpp b/Source/3rd Party/wx/src/msw/brush.cpp
index 70c5c918d..ac03729cb 100644
--- a/Source/3rd Party/wx/src/msw/brush.cpp	
+++ b/Source/3rd Party/wx/src/msw/brush.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: brush.cpp 42776 2006-10-30 22:03:53Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,6 @@
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
-    #include "wx/bitmap.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
@@ -42,7 +41,7 @@
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
 public:
-    wxBrushRefData(const wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+    wxBrushRefData(const wxColour& colour = wxNullColour, int style = wxSOLID);
     wxBrushRefData(const wxBitmap& stipple);
     wxBrushRefData(const wxBrushRefData& data);
     virtual ~wxBrushRefData();
@@ -53,17 +52,17 @@ public:
     void Free();
 
     const wxColour& GetColour() const { return m_colour; }
-    wxBrushStyle GetStyle() const { return m_style; }
+    int GetStyle() const { return m_style; }
     wxBitmap *GetStipple() { return &m_stipple; }
 
     void SetColour(const wxColour& colour) { Free(); m_colour = colour; }
-    void SetStyle(wxBrushStyle style) { Free(); m_style = style; }
+    void SetStyle(int style) { Free(); m_style = style; }
     void SetStipple(const wxBitmap& stipple) { Free(); DoSetStipple(stipple); }
 
 private:
     void DoSetStipple(const wxBitmap& stipple);
 
-    wxBrushStyle  m_style;
+    int           m_style;
     wxBitmap      m_stipple;
     wxColour      m_colour;
     HBRUSH        m_hBrush;
@@ -85,7 +84,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 // wxBrushRefData ctors/dtor
 // ----------------------------------------------------------------------------
 
-wxBrushRefData::wxBrushRefData(const wxColour& colour, wxBrushStyle style)
+wxBrushRefData::wxBrushRefData(const wxColour& colour, int style)
               : m_colour(colour)
 {
     m_style = style;
@@ -131,8 +130,7 @@ bool wxBrushRefData::operator==(const wxBrushRefData& data) const
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
 {
     m_stipple = stipple;
-    m_style = stipple.GetMask() ? wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE
-                                : wxBRUSHSTYLE_STIPPLE;
+    m_style = stipple.GetMask() ? wxSTIPPLE_MASK_OPAQUE : wxSTIPPLE;
 }
 
 // ----------------------------------------------------------------------------
@@ -155,12 +153,12 @@ static int TranslateHatchStyle(int style)
 {
     switch ( style )
     {
-        case wxBRUSHSTYLE_BDIAGONAL_HATCH: return HS_BDIAGONAL;
-        case wxBRUSHSTYLE_CROSSDIAG_HATCH: return HS_DIAGCROSS;
-        case wxBRUSHSTYLE_FDIAGONAL_HATCH: return HS_FDIAGONAL;
-        case wxBRUSHSTYLE_CROSS_HATCH:     return HS_CROSS;
-        case wxBRUSHSTYLE_HORIZONTAL_HATCH:return HS_HORIZONTAL;
-        case wxBRUSHSTYLE_VERTICAL_HATCH:  return HS_VERTICAL;
+        case wxBDIAGONAL_HATCH: return HS_BDIAGONAL;
+        case wxCROSSDIAG_HATCH: return HS_DIAGCROSS;
+        case wxFDIAGONAL_HATCH: return HS_FDIAGONAL;
+        case wxCROSS_HATCH:     return HS_CROSS;
+        case wxHORIZONTAL_HATCH:return HS_HORIZONTAL;
+        case wxVERTICAL_HATCH:  return HS_VERTICAL;
         default:                return -1;
     }
 }
@@ -178,24 +176,24 @@ HBRUSH wxBrushRefData::GetHBRUSH()
         {
             switch ( m_style )
             {
-                case wxBRUSHSTYLE_TRANSPARENT:
+                case wxTRANSPARENT:
                     m_hBrush = (HBRUSH)::GetStockObject(NULL_BRUSH);
                     break;
 
-                case wxBRUSHSTYLE_STIPPLE:
+                case wxSTIPPLE:
                     m_hBrush = ::CreatePatternBrush(GetHbitmapOf(m_stipple));
                     break;
 
-                case wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE:
+                case wxSTIPPLE_MASK_OPAQUE:
                     m_hBrush = ::CreatePatternBrush((HBITMAP)m_stipple.GetMask()
                                                         ->GetMaskBitmap());
                     break;
 
                 default:
-                    wxFAIL_MSG( wxT("unknown brush style") );
+                    wxFAIL_MSG( _T("unknown brush style") );
                     // fall through
 
-                case wxBRUSHSTYLE_SOLID:
+                case wxSOLID:
                     m_hBrush = ::CreateSolidBrush(m_colour.GetPixel());
                     break;
             }
@@ -209,7 +207,7 @@ HBRUSH wxBrushRefData::GetHBRUSH()
 
         if ( !m_hBrush )
         {
-            wxLogLastError(wxT("CreateXXXBrush()"));
+            wxLogLastError(_T("CreateXXXBrush()"));
         }
     }
 
@@ -228,18 +226,11 @@ wxBrush::wxBrush()
 {
 }
 
-wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
+wxBrush::wxBrush(const wxColour& col, int style)
 {
     m_refData = new wxBrushRefData(col, style);
 }
 
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-wxBrush::wxBrush(const wxColour& col, int style)
-{
-    m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
-}
-#endif
-
 wxBrush::wxBrush(const wxBitmap& stipple)
 {
     m_refData = new wxBrushRefData(stipple);
@@ -261,12 +252,12 @@ bool wxBrush::operator==(const wxBrush& brush) const
     return m_refData ? (brushData && *M_BRUSHDATA == *brushData) : !brushData;
 }
 
-wxGDIRefData *wxBrush::CreateGDIRefData() const
+wxObjectRefData *wxBrush::CreateRefData() const
 {
     return new wxBrushRefData;
 }
 
-wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
+wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
 {
     return new wxBrushRefData(*(const wxBrushRefData *)data);
 }
@@ -277,28 +268,28 @@ wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
 
 wxColour wxBrush::GetColour() const
 {
-    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") );
+    wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
 
     return M_BRUSHDATA->GetColour();
 }
 
-wxBrushStyle wxBrush::GetStyle() const
+int wxBrush::GetStyle() const
 {
-    wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
+    wxCHECK_MSG( Ok(), 0, _T("invalid brush") );
 
     return M_BRUSHDATA->GetStyle();
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") );
+    wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );
 
     return M_BRUSHDATA->GetStipple();
 }
 
 WXHANDLE wxBrush::GetResourceHandle() const
 {
-    wxCHECK_MSG( IsOk(), FALSE, wxT("invalid brush") );
+    wxCHECK_MSG( Ok(), FALSE, _T("invalid brush") );
 
     return (WXHANDLE)M_BRUSHDATA->GetHBRUSH();
 }
@@ -321,7 +312,7 @@ void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
     M_BRUSHDATA->SetColour(wxColour(r, g, b));
 }
 
-void wxBrush::SetStyle(wxBrushStyle style)
+void wxBrush::SetStyle(int style)
 {
     AllocExclusive();
 
diff --git a/Source/3rd Party/wx/src/msw/button.cpp b/Source/3rd Party/wx/src/msw/button.cpp
index a53472666..635e4b926 100644
--- a/Source/3rd Party/wx/src/msw/button.cpp	
+++ b/Source/3rd Party/wx/src/msw/button.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: button.cpp 51575 2008-02-06 19:58:30Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,34 +37,109 @@
     #include "wx/dcscreen.h"
     #include "wx/dcclient.h"
     #include "wx/toplevel.h"
-    #include "wx/msw/wrapcctl.h"
-    #include "wx/msw/private.h"
-    #include "wx/msw/missing.h"
 #endif
 
-#include "wx/imaglist.h"
 #include "wx/stockitem.h"
-#include "wx/msw/private/button.h"
-#include "wx/msw/private/dc.h"
-#include "wx/private/window.h"
+#include "wx/tokenzr.h"
+#include "wx/msw/private.h"
 
-#if wxUSE_MARKUP
-    #include "wx/generic/private/markuptext.h"
-#endif // wxUSE_MARKUP
+#if wxUSE_UXTHEME
+    #include "wx/msw/uxtheme.h"
 
-// set the value for BCM_SETSHIELD (for the UAC shield) if it's not defined in
-// the header
-#ifndef BCM_SETSHIELD
-    #define BCM_SETSHIELD       0x160c
+    // no need to include tmschema.h
+    #ifndef BP_PUSHBUTTON
+        #define BP_PUSHBUTTON 1
+
+        #define PBS_NORMAL    1
+        #define PBS_HOT       2
+        #define PBS_PRESSED   3
+        #define PBS_DISABLED  4
+        #define PBS_DEFAULTED 5
+
+        #define TMT_CONTENTMARGINS 3602
+    #endif
+#endif // wxUSE_UXTHEME
+
+#ifndef WM_THEMECHANGED
+    #define WM_THEMECHANGED     0x031A
+#endif
+
+#ifndef ODS_NOACCEL
+    #define ODS_NOACCEL         0x0100
+#endif
+
+#ifndef ODS_NOFOCUSRECT
+    #define ODS_NOFOCUSRECT     0x0200
 #endif
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxButton, wxButtonBase)
-    EVT_CHAR_HOOK(wxButton::OnCharHook)
-END_EVENT_TABLE()
+#if wxUSE_EXTENDED_RTTI
+
+WX_DEFINE_FLAGS( wxButtonStyle )
+
+wxBEGIN_FLAGS( wxButtonStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxBU_LEFT)
+    wxFLAGS_MEMBER(wxBU_RIGHT)
+    wxFLAGS_MEMBER(wxBU_TOP)
+    wxFLAGS_MEMBER(wxBU_BOTTOM)
+    wxFLAGS_MEMBER(wxBU_EXACTFIT)
+wxEND_FLAGS( wxButtonStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxButton)
+    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent)
+
+    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Label, wxString , SetLabel, GetLabel, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+
+    wxPROPERTY_FLAGS( WindowStyle , wxButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxButton)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle  )
+
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
+#endif
+
+// this macro tries to adjust the default button height to a reasonable value
+// using the char height as the base
+#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
 
 // ============================================================================
 // implementation
@@ -86,14 +161,16 @@ bool wxButton::Create(wxWindow *parent,
     wxString label(lbl);
     if (label.empty() && wxIsStockID(id))
     {
-        // On Windows, some buttons aren't supposed to have mnemonics
-        label = wxGetStockLabel
-                (
-                    id,
-                    id == wxID_OK || id == wxID_CANCEL || id == wxID_CLOSE
-                        ? wxSTOCK_NOFLAGS
-                        : wxSTOCK_WITH_MNEMONIC
-                );
+        // On Windows, some buttons aren't supposed to have
+        // mnemonics, so strip them out.
+
+        label = wxGetStockLabel(id
+#if defined(__WXMSW__) || defined(__WXWINCE__)
+                                        , ( id != wxID_OK &&
+                                            id != wxID_CANCEL &&
+                                            id != wxID_CLOSE )
+#endif
+                                );
     }
 
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
@@ -102,15 +179,21 @@ bool wxButton::Create(wxWindow *parent,
     WXDWORD exstyle;
     WXDWORD msStyle = MSWGetStyle(style, &exstyle);
 
+#ifdef __WIN32__
     // if the label contains several lines we must explicitly tell the button
     // about it or it wouldn't draw it correctly ("\n"s would just appear as
     // black boxes)
     //
     // NB: we do it here and not in MSWGetStyle() because we need the label
-    //     value and the label is not set yet when MSWGetStyle() is called
-    msStyle |= wxMSWButton::GetMultilineStyle(label);
+    //     value and m_label is not set yet when MSWGetStyle() is called;
+    //     besides changing BS_MULTILINE during run-time is pointless anyhow
+    if ( label.find(_T('\n')) != wxString::npos )
+    {
+        msStyle |= BS_MULTILINE;
+    }
+#endif // __WIN32__
 
-    return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, exstyle);
+    return MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, exstyle);
 }
 
 wxButton::~wxButton()
@@ -135,10 +218,11 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const
                       );
 
     // we must use WS_CLIPSIBLINGS with the buttons or they would draw over
-    // each other in any resizable dialog which has more than one button in
+    // each other in any resizeable dialog which has more than one button in
     // the bottom
     msStyle |= WS_CLIPSIBLINGS;
 
+#ifdef __WIN32__
     // don't use "else if" here: weird as it is, but you may combine wxBU_LEFT
     // and wxBU_RIGHT to get BS_CENTER!
     if ( style & wxBU_LEFT )
@@ -154,10 +238,47 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const
     if ( style & wxNO_BORDER )
         msStyle |= BS_FLAT;
 #endif // __WXWINCE__
+#endif // __WIN32__
 
     return msStyle;
 }
 
+// ----------------------------------------------------------------------------
+// size management including autosizing
+// ----------------------------------------------------------------------------
+
+wxSize wxButton::DoGetBestSize() const
+{
+    wxClientDC dc(wx_const_cast(wxButton *, this));
+    dc.SetFont(GetFont());
+
+    wxCoord wBtn,
+            hBtn;
+    dc.GetMultiLineTextExtent(GetLabelText(), &wBtn, &hBtn);
+
+    // add a margin -- the button is wider than just its label
+    wBtn += 3*GetCharWidth();
+    hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hBtn);
+
+    // all buttons have at least the standard size unless the user explicitly
+    // wants them to be of smaller size and used wxBU_EXACTFIT style when
+    // creating the button
+    if ( !HasFlag(wxBU_EXACTFIT) )
+    {
+        wxSize sz = GetDefaultSize();
+        if (wBtn > sz.x)
+            sz.x = wBtn;
+        if (hBtn > sz.y)
+            sz.y = hBtn;
+
+        return sz;
+    }
+
+    wxSize best(wBtn, hBtn);
+    CacheBestSize(best);
+    return best;
+}
+
 /* static */
 wxSize wxButtonBase::GetDefaultSize()
 {
@@ -168,20 +289,16 @@ wxSize wxButtonBase::GetDefaultSize()
         wxScreenDC dc;
         dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
-        // The size of a standard button in the dialog units is 50x14,
-        // translate this to pixels.
-        //
-        // Windows' computes dialog units using average character width over
-        // upper- and lower-case ASCII alphabet and not using the average
-        // character width metadata stored in the font; see
-        // http://support.microsoft.com/default.aspx/kb/145994 for detailed
-        // discussion.
-        //
-        // NB: wxMulDivInt32() is used, because it correctly rounds the result
-
-        const wxSize base = wxPrivate::GetAverageASCIILetterSize(dc);
-        s_sizeBtn.x = wxMulDivInt32(50, base.x, 4);
-        s_sizeBtn.y = wxMulDivInt32(14, base.y, 8);
+        // the size of a standard button in the dialog units is 50x14,
+        // translate this to pixels
+        // NB1: the multipliers come from the Windows convention
+        // NB2: the extra +1/+2 were needed to get the size be the same as the
+        //      size of the buttons in the standard dialog - I don't know how
+        //      this happens, but on my system this size is 75x23 in pixels and
+        //      23*8 isn't even divisible by 14... Would be nice to understand
+        //      why these constants are needed though!
+        s_sizeBtn.x = (50 * (dc.GetCharWidth() + 1))/4;
+        s_sizeBtn.y = ((14 * dc.GetCharHeight()) + 2)/8;
     }
 
     return s_sizeBtn;
@@ -192,14 +309,6 @@ wxSize wxButtonBase::GetDefaultSize()
 // ----------------------------------------------------------------------------
 
 /*
-   The comment below and all this code is probably due to not using WM_NEXTDLGCTL
-   message when changing focus (but just SetFocus() which is not enough), see
-   http://blogs.msdn.com/oldnewthing/archive/2004/08/02/205624.aspx for the
-   full explanation.
-
-   TODO: Do use WM_NEXTDLGCTL and get rid of all this code.
-
-
    "Everything you ever wanted to know about the default buttons" or "Why do we
    have to do all this?"
 
@@ -234,16 +343,18 @@ wxSize wxButtonBase::GetDefaultSize()
  */
 
 // set this button as the (permanently) default one in its panel
-wxWindow *wxButton::SetDefault()
+void wxButton::SetDefault()
 {
+    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+
+    wxCHECK_RET( tlw, _T("button without top level window?") );
+
     // set this one as the default button both for wxWidgets ...
-    wxWindow *winOldDefault = wxButtonBase::SetDefault();
+    wxWindow *winOldDefault = tlw->SetDefaultItem(this);
 
     // ... and Windows
     SetDefaultStyle(wxDynamicCast(winOldDefault, wxButton), false);
     SetDefaultStyle(this, true);
-
-    return winOldDefault;
 }
 
 // return the top level parent window if it's not being deleted yet, otherwise
@@ -266,10 +377,10 @@ static wxTopLevelWindow *GetTLWParentIfNotBeingDeleted(wxWindow *win)
         win = parent;
     }
 
-    wxASSERT_MSG( win, wxT("button without top level parent?") );
+    wxASSERT_MSG( win, _T("button without top level parent?") );
 
     wxTopLevelWindow * const tlw = wxDynamicCast(win, wxTopLevelWindow);
-    wxASSERT_MSG( tlw, wxT("logic error in GetTLWParentIfNotBeingDeleted()") );
+    wxASSERT_MSG( tlw, _T("logic error in GetTLWParentIfNotBeingDeleted()") );
 
     return tlw;
 }
@@ -277,7 +388,7 @@ static wxTopLevelWindow *GetTLWParentIfNotBeingDeleted(wxWindow *win)
 // set this button as being currently default
 void wxButton::SetTmpDefault()
 {
-    wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(this);
+    wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(GetParent());
     if ( !tlw )
         return;
 
@@ -291,7 +402,7 @@ void wxButton::SetTmpDefault()
 // unset this button as currently default, it may still stay permanent default
 void wxButton::UnsetTmpDefault()
 {
-    wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(this);
+    wxTopLevelWindow * const tlw = GetTLWParentIfNotBeingDeleted(GetParent());
     if ( !tlw )
         return;
 
@@ -321,7 +432,7 @@ wxButton::SetDefaultStyle(wxButton *btn, bool on)
             return;
 
         wxWindow * const tlw = wxGetTopLevelParent(btn);
-        wxCHECK_RET( tlw, wxT("button without top level window?") );
+        wxCHECK_RET( tlw, _T("button without top level window?") );
 
         ::SendMessage(GetHwndOf(tlw), DM_SETDEFID, btn->GetId(), 0L);
 
@@ -374,25 +485,6 @@ void wxButton::Command(wxCommandEvent & event)
 // event/message handlers
 // ----------------------------------------------------------------------------
 
-void wxButton::OnCharHook(wxKeyEvent& event)
-{
-    // We want to ensure that the button always processes Enter key events
-    // itself, even if it's inside some control that normally takes over them
-    // (this happens when the button is part of an in-place editor control for
-    // example).
-    if ( event.GetKeyCode() == WXK_RETURN )
-    {
-        // We should ensure that subsequent key events are still generated even
-        // if we did handle EVT_CHAR_HOOK (normally this would suppress their
-        // generation).
-        event.DoAllowNextEvent();
-    }
-    else
-    {
-        event.Skip();
-    }
-}
-
 bool wxButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
     bool processed = false;
@@ -432,30 +524,367 @@ WXLRESULT wxButton::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
     {
         UnsetTmpDefault();
     }
+    else if ( nMsg == WM_LBUTTONDBLCLK )
+    {
+        // emulate a click event to force an owner-drawn button to change its
+        // appearance - without this, it won't do it
+        (void)wxControl::MSWWindowProc(WM_LBUTTONDOWN, wParam, lParam);
+
+        // and continue with processing the message normally as well
+    }
+#if wxUSE_UXTHEME
+    else if ( nMsg == WM_THEMECHANGED )
+    {
+        // need to recalculate the best size here
+        // as the theme size might have changed
+        InvalidateBestSize();
+    }
+    else if ( wxUxThemeEngine::GetIfActive() )
+    {
+        // we need to Refresh() if mouse has entered or left window
+        // so we can update the hot tracking state
+        // must use m_mouseInWindow here instead of IsMouseInWindow()
+        // since we need to know the first time the mouse enters the window
+        // and IsMouseInWindow() would return true in this case
+        if ( ( nMsg == WM_MOUSEMOVE && !m_mouseInWindow ) ||
+             nMsg == WM_MOUSELEAVE )
+        {
+            Refresh();
+        }
+    }
+#endif // wxUSE_UXTHEME
 
     // let the base class do all real processing
-    return wxAnyButton::MSWWindowProc(nMsg, wParam, lParam);
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
 
 // ----------------------------------------------------------------------------
-// authentication needed handling
+// owner-drawn buttons support
 // ----------------------------------------------------------------------------
 
-bool wxButton::DoGetAuthNeeded() const
-{
-    return m_authNeeded;
-}
+#ifdef __WIN32__
 
-void wxButton::DoSetAuthNeeded(bool show)
+// drawing helpers
+
+static void DrawButtonText(HDC hdc,
+                           RECT *pRect,
+                           const wxString& text,
+                           COLORREF col)
 {
-    // show/hide UAC symbol on Windows Vista and later
-    if ( wxGetWinVersion() >= wxWinVersion_6 )
+    COLORREF colOld = SetTextColor(hdc, col);
+    int modeOld = SetBkMode(hdc, TRANSPARENT);
+
+    if ( text.find(_T('\n')) != wxString::npos )
     {
-        m_authNeeded = show;
-        ::SendMessage(GetHwnd(), BCM_SETSHIELD, 0, show);
-        InvalidateBestSize();
+        // draw multiline label
+
+        // first we need to compute its bounding rect
+        RECT rc;
+        ::CopyRect(&rc, pRect);
+        ::DrawText(hdc, text, text.length(), &rc, DT_CENTER | DT_CALCRECT);
+
+        // now center this rect inside the entire button area
+        const LONG w = rc.right - rc.left;
+        const LONG h = rc.bottom - rc.top;
+        rc.left = (pRect->right - pRect->left)/2 - w/2;
+        rc.right = rc.left+w;
+        rc.top = (pRect->bottom - pRect->top)/2 - h/2;
+        rc.bottom = rc.top+h;
+
+        ::DrawText(hdc, text, text.length(), &rc, DT_CENTER);
+    }
+    else // single line label
+    {
+        // Note: we must have DT_SINGLELINE for DT_VCENTER to work.
+        ::DrawText(hdc, text, text.length(), pRect,
+                   DT_SINGLELINE | DT_CENTER | DT_VCENTER);
+    }
+
+    SetBkMode(hdc, modeOld);
+    SetTextColor(hdc, colOld);
+}
+
+static void DrawRect(HDC hdc, const RECT& r)
+{
+    wxDrawLine(hdc, r.left, r.top, r.right, r.top);
+    wxDrawLine(hdc, r.right, r.top, r.right, r.bottom);
+    wxDrawLine(hdc, r.right, r.bottom, r.left, r.bottom);
+    wxDrawLine(hdc, r.left, r.bottom, r.left, r.top);
+}
+
+void wxButton::MakeOwnerDrawn()
+{
+    long style = GetWindowLong(GetHwnd(), GWL_STYLE);
+    if ( (style & BS_OWNERDRAW) != BS_OWNERDRAW )
+    {
+        // make it so
+        style |= BS_OWNERDRAW;
+        SetWindowLong(GetHwnd(), GWL_STYLE, style);
     }
 }
 
-#endif // wxUSE_BUTTON
+bool wxButton::SetBackgroundColour(const wxColour &colour)
+{
+    if ( !wxControl::SetBackgroundColour(colour) )
+    {
+        // nothing to do
+        return false;
+    }
 
+    MakeOwnerDrawn();
+
+    Refresh();
+
+    return true;
+}
+
+bool wxButton::SetForegroundColour(const wxColour &colour)
+{
+    if ( !wxControl::SetForegroundColour(colour) )
+    {
+        // nothing to do
+        return false;
+    }
+
+    MakeOwnerDrawn();
+
+    Refresh();
+
+    return true;
+}
+
+/*
+   The button frame looks like this normally:
+
+   WWWWWWWWWWWWWWWWWWB
+   WHHHHHHHHHHHHHHHHGB  W = white       (HILIGHT)
+   WH               GB  H = light grey  (LIGHT)
+   WH               GB  G = dark grey   (SHADOW)
+   WH               GB  B = black       (DKSHADOW)
+   WH               GB
+   WGGGGGGGGGGGGGGGGGB
+   BBBBBBBBBBBBBBBBBBB
+
+   When the button is selected, the button becomes like this (the total button
+   size doesn't change):
+
+   BBBBBBBBBBBBBBBBBBB
+   BWWWWWWWWWWWWWWWWBB
+   BWHHHHHHHHHHHHHHGBB
+   BWH             GBB
+   BWH             GBB
+   BWGGGGGGGGGGGGGGGBB
+   BBBBBBBBBBBBBBBBBBB
+   BBBBBBBBBBBBBBBBBBB
+
+   When the button is pushed (while selected) it is like:
+
+   BBBBBBBBBBBBBBBBBBB
+   BGGGGGGGGGGGGGGGGGB
+   BG               GB
+   BG               GB
+   BG               GB
+   BG               GB
+   BGGGGGGGGGGGGGGGGGB
+   BBBBBBBBBBBBBBBBBBB
+*/
+
+static void DrawButtonFrame(HDC hdc, const RECT& rectBtn,
+                            bool selected, bool pushed)
+{
+    RECT r;
+    CopyRect(&r, &rectBtn);
+
+    HPEN hpenBlack   = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DDKSHADOW)),
+         hpenGrey    = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW)),
+         hpenLightGr = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DLIGHT)),
+         hpenWhite   = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DHILIGHT));
+
+    HPEN hpenOld = (HPEN)SelectObject(hdc, hpenBlack);
+
+    r.right--;
+    r.bottom--;
+
+    if ( pushed )
+    {
+        DrawRect(hdc, r);
+
+        (void)SelectObject(hdc, hpenGrey);
+        ::InflateRect(&r, -1, -1);
+
+        DrawRect(hdc, r);
+    }
+    else // !pushed
+    {
+        if ( selected )
+        {
+            DrawRect(hdc, r);
+
+            ::InflateRect(&r, -1, -1);
+        }
+
+        wxDrawLine(hdc, r.left, r.bottom, r.right, r.bottom);
+        wxDrawLine(hdc, r.right, r.bottom, r.right, r.top - 1);
+
+        (void)SelectObject(hdc, hpenWhite);
+        wxDrawLine(hdc, r.left, r.bottom - 1, r.left, r.top);
+        wxDrawLine(hdc, r.left, r.top, r.right, r.top);
+
+        (void)SelectObject(hdc, hpenLightGr);
+        wxDrawLine(hdc, r.left + 1, r.bottom - 2, r.left + 1, r.top + 1);
+        wxDrawLine(hdc, r.left + 1, r.top + 1, r.right - 1, r.top + 1);
+
+        (void)SelectObject(hdc, hpenGrey);
+        wxDrawLine(hdc, r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1);
+        wxDrawLine(hdc, r.right - 1, r.bottom - 1, r.right - 1, r.top);
+    }
+
+    (void)SelectObject(hdc, hpenOld);
+    DeleteObject(hpenWhite);
+    DeleteObject(hpenLightGr);
+    DeleteObject(hpenGrey);
+    DeleteObject(hpenBlack);
+}
+
+#if wxUSE_UXTHEME
+static
+void MSWDrawXPBackground(wxButton *button, WXDRAWITEMSTRUCT *wxdis)
+{
+    LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis;
+    HDC hdc = lpDIS->hDC;
+    UINT state = lpDIS->itemState;
+    RECT rectBtn;
+    CopyRect(&rectBtn, &lpDIS->rcItem);
+
+    wxUxThemeHandle theme(button, L"BUTTON");
+    int iState;
+
+    if ( state & ODS_SELECTED )
+    {
+        iState = PBS_PRESSED;
+    }
+    else if ( button->HasCapture() || button->IsMouseInWindow() )
+    {
+        iState = PBS_HOT;
+    }
+    else if ( state & ODS_FOCUS )
+    {
+        iState = PBS_DEFAULTED;
+    }
+    else if ( state & ODS_DISABLED )
+    {
+        iState = PBS_DISABLED;
+    }
+    else
+    {
+        iState = PBS_NORMAL;
+    }
+
+    // draw parent background if needed
+    if ( wxUxThemeEngine::Get()->IsThemeBackgroundPartiallyTransparent(theme,
+                                                                       BP_PUSHBUTTON,
+                                                                       iState) )
+    {
+        wxUxThemeEngine::Get()->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
+    }
+
+    // draw background
+    wxUxThemeEngine::Get()->DrawThemeBackground(theme, hdc, BP_PUSHBUTTON, iState,
+                                                &rectBtn, NULL);
+
+    // calculate content area margins
+    MARGINS margins;
+    wxUxThemeEngine::Get()->GetThemeMargins(theme, hdc, BP_PUSHBUTTON, iState,
+                                            TMT_CONTENTMARGINS, &rectBtn, &margins);
+    RECT rectClient;
+    ::CopyRect(&rectClient, &rectBtn);
+    ::InflateRect(&rectClient, -margins.cxLeftWidth, -margins.cyTopHeight);
+
+    // if focused and !nofocus rect
+    if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) )
+    {
+        DrawFocusRect(hdc, &rectClient);
+    }
+
+    if ( button->UseBgCol() )
+    {
+        COLORREF colBg = wxColourToRGB(button->GetBackgroundColour());
+        HBRUSH hbrushBackground = ::CreateSolidBrush(colBg);
+
+        // don't overwrite the focus rect
+        ::InflateRect(&rectClient, -1, -1);
+        FillRect(hdc, &rectClient, hbrushBackground);
+        ::DeleteObject(hbrushBackground);
+    }
+}
+#endif // wxUSE_UXTHEME
+
+bool wxButton::MSWOnDraw(WXDRAWITEMSTRUCT *wxdis)
+{
+    LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)wxdis;
+    HDC hdc = lpDIS->hDC;
+    UINT state = lpDIS->itemState;
+    RECT rectBtn;
+    CopyRect(&rectBtn, &lpDIS->rcItem);
+
+#if wxUSE_UXTHEME
+    if ( wxUxThemeEngine::GetIfActive() )
+    {
+        MSWDrawXPBackground(this, wxdis);
+    }
+    else
+#endif // wxUSE_UXTHEME
+    {
+        COLORREF colBg = wxColourToRGB(GetBackgroundColour());
+
+        // first, draw the background
+        HBRUSH hbrushBackground = ::CreateSolidBrush(colBg);
+        FillRect(hdc, &rectBtn, hbrushBackground);
+        ::DeleteObject(hbrushBackground);
+
+        // draw the border for the current state
+        bool selected = (state & ODS_SELECTED) != 0;
+        if ( !selected )
+        {
+            wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+            if ( tlw )
+            {
+                selected = tlw->GetDefaultItem() == this;
+            }
+        }
+        bool pushed = (SendMessage(GetHwnd(), BM_GETSTATE, 0, 0) & BST_PUSHED) != 0;
+
+        DrawButtonFrame(hdc, rectBtn, selected, pushed);
+
+        // if focused and !nofocus rect
+        if ( (state & ODS_FOCUS) && !(state & ODS_NOFOCUSRECT) )
+        {
+            RECT rectFocus;
+            CopyRect(&rectFocus, &rectBtn);
+
+            // I don't know where does this constant come from, but this is how
+            // Windows draws them
+            InflateRect(&rectFocus, -4, -4);
+
+            DrawFocusRect(hdc, &rectFocus);
+        }
+
+        if ( pushed )
+        {
+            // the label is shifted by 1 pixel to create "pushed" effect
+            OffsetRect(&rectBtn, 1, 1);
+        }
+    }
+
+    COLORREF colFg = wxColourToRGB(GetForegroundColour());
+    if ( state & ODS_DISABLED ) colFg = GetSysColor(COLOR_GRAYTEXT) ;
+    wxString label = GetLabel();
+    if ( state & ODS_NOACCEL ) label = GetLabelText() ;
+    DrawButtonText(hdc, &rectBtn, label, colFg);
+
+    return true;
+}
+
+#endif // __WIN32__
+
+#endif // wxUSE_BUTTON
diff --git a/Source/3rd Party/wx/src/msw/caret.cpp b/Source/3rd Party/wx/src/msw/caret.cpp
index aa9b1e55b..9c43cdf61 100644
--- a/Source/3rd Party/wx/src/msw/caret.cpp	
+++ b/Source/3rd Party/wx/src/msw/caret.cpp	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/caret.cpp
+// Name:        msw/caret.cpp
 // Purpose:     MSW implementation of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.05.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: caret.cpp 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -39,11 +39,9 @@
 // macros
 // ---------------------------------------------------------------------------
 
-#define CALL_CARET_API(api, args) \
-        if ( !api args ) \
-        { \
-            wxLogLastError(wxT(#api)); \
-        }
+#define CALL_CARET_API(api, args)   \
+        if ( !api args )                \
+            wxLogLastError(_T(#api))
 
 // ===========================================================================
 // implementation
diff --git a/Source/3rd Party/wx/src/msw/checkbox.cpp b/Source/3rd Party/wx/src/msw/checkbox.cpp
index 4ff0c5000..550afd740 100644
--- a/Source/3rd Party/wx/src/msw/checkbox.cpp	
+++ b/Source/3rd Party/wx/src/msw/checkbox.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: checkbox.cpp 40331 2006-07-25 18:47:39Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,21 +30,37 @@
 
 #ifndef WX_PRECOMP
     #include "wx/brush.h"
-    #include "wx/dcclient.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.h"
 #endif
 
-#include "wx/msw/dc.h"          // for wxDCTemp
-#include "wx/renderer.h"
 #include "wx/msw/uxtheme.h"
-#include "wx/msw/private/button.h"
-#include "wx/msw/missing.h"
+#include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
+#ifndef BST_UNCHECKED
+    #define BST_UNCHECKED 0x0000
+#endif
+
+#ifndef BST_CHECKED
+    #define BST_CHECKED 0x0001
+#endif
+
+#ifndef BST_INDETERMINATE
+    #define BST_INDETERMINATE 0x0002
+#endif
+
+#ifndef DFCS_HOT
+    #define DFCS_HOT 0x1000
+#endif
+
+#ifndef DT_HIDEPREFIX
+    #define DT_HIDEPREFIX 0x00100000
+#endif
+
 #ifndef BP_CHECKBOX
     #define BP_CHECKBOX 3
 #endif
@@ -79,6 +95,59 @@ enum
 // implementation
 // ============================================================================
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxCheckBoxStyle )
+
+wxBEGIN_FLAGS( wxCheckBoxStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxNO_BORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxCheckBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl,"wx/checkbox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxCheckBox)
+    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_CHECKBOX_CLICKED , wxCommandEvent )
+
+    wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Value ,bool, SetValue, GetValue, EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxCheckBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxCheckBox)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxCheckBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
+#endif
+
+
 // ----------------------------------------------------------------------------
 // wxCheckBox creation
 // ----------------------------------------------------------------------------
@@ -100,24 +169,28 @@ bool wxCheckBox::Create(wxWindow *parent,
 {
     Init();
 
-    WXValidateStyle(&style);
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
     long msStyle = WS_TABSTOP;
 
     if ( style & wxCHK_3STATE )
+    {
         msStyle |= BS_3STATE;
+    }
     else
+    {
+        wxASSERT_MSG( !Is3rdStateAllowedForUser(),
+            wxT("Using wxCH_ALLOW_3RD_STATE_FOR_USER")
+            wxT(" style flag for a 2-state checkbox is useless") );
         msStyle |= BS_CHECKBOX;
+    }
 
     if ( style & wxALIGN_RIGHT )
     {
         msStyle |= BS_LEFTTEXT | BS_RIGHT;
     }
 
-    msStyle |= wxMSWButton::GetMultilineStyle(label);
-
     return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0);
 }
 
@@ -142,24 +215,9 @@ wxSize wxCheckBox::DoGetBestSize() const
     int wCheckbox, hCheckbox;
     if ( !str.empty() )
     {
-        wxClientDC dc(const_cast<wxCheckBox *>(this));
-        dc.SetFont(GetFont());
-        dc.GetMultiLineTextExtent(GetLabelText(str), &wCheckbox, &hCheckbox);
+        GetTextExtent(GetLabelText(str), &wCheckbox, &hCheckbox);
         wCheckbox += s_checkSize + GetCharWidth();
 
-        if ( ::GetWindowLong(GetHwnd(), GWL_STYLE) & BS_MULTILINE )
-        {
-            // We need to make the checkbox even wider in this case because
-            // otherwise it wraps lines automatically and not only on "\n"s as
-            // we need and this makes the size computed here wrong resulting in
-            // checkbox contents being truncated when it's actually displayed.
-            // Without this hack simple checkbox with "Some thing\n and more"
-            // label appears on 3 lines, not 2, under Windows 2003 using
-            // classic look and feel (although it works fine under Windows 7,
-            // with or without themes).
-            wCheckbox += s_checkSize;
-        }
-
         if ( hCheckbox < s_checkSize )
             hCheckbox = s_checkSize;
     }
@@ -181,13 +239,6 @@ wxSize wxCheckBox::DoGetBestSize() const
 // wxCheckBox operations
 // ----------------------------------------------------------------------------
 
-void wxCheckBox::SetLabel(const wxString& label)
-{
-    wxMSWButton::UpdateMultilineStyle(GetHwnd(), label);
-
-    wxCheckBoxBase::SetLabel(label);
-}
-
 void wxCheckBox::SetValue(bool val)
 {
     Set3StateValue(val ? wxCHK_CHECKED : wxCHK_UNCHECKED);
@@ -273,7 +324,7 @@ bool wxCheckBox::SetForegroundColour(const wxColour& colour)
     // the only way to change the checkbox foreground colour under Windows XP
     // is to owner draw it
     if ( wxUxThemeEngine::GetIfActive() )
-        MakeOwnerDrawn(colour.IsOk());
+        MakeOwnerDrawn(colour.Ok());
 
     return true;
 }
@@ -398,24 +449,28 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     const bool isFocused = m_isPressed || FindFocus() == this;
 
 
-    // draw the checkbox itself
-    wxDCTemp dc(hdc);
+    // draw the checkbox itself: note that this should really, really be in
+    // wxRendererNative but unfortunately we can't add a new virtual function
+    // to it without breaking backwards compatibility
 
-    int flags = 0;
+    // classic Win32 version -- this can be useful when we move this into
+    // wxRendererNative
+#if defined(__WXWINCE__) || !wxUSE_UXTHEME
+    UINT state = DFCS_BUTTONCHECK;
     if ( !IsEnabled() )
-        flags |= wxCONTROL_DISABLED;
+        state |= DFCS_INACTIVE;
     switch ( Get3StateValue() )
     {
         case wxCHK_CHECKED:
-            flags |= wxCONTROL_CHECKED;
+            state |= DFCS_CHECKED;
             break;
 
         case wxCHK_UNDETERMINED:
-            flags |= wxCONTROL_PRESSED;
+            state |= DFCS_PUSHED;
             break;
 
         default:
-            wxFAIL_MSG( wxT("unexpected Get3StateValue() return value") );
+            wxFAIL_MSG( _T("unexpected Get3StateValue() return value") );
             // fall through
 
         case wxCHK_UNCHECKED:
@@ -424,10 +479,62 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     }
 
     if ( wxFindWindowAtPoint(wxGetMousePosition()) == this )
-        flags |= wxCONTROL_CURRENT;
+        state |= DFCS_HOT;
 
-    wxRendererNative::Get().
-        DrawCheckBox(this, dc, wxRectFromRECT(rectCheck), flags);
+    if ( !::DrawFrameControl(hdc, &rectCheck, DFC_BUTTON, state) )
+    {
+        wxLogLastError(_T("DrawFrameControl(DFC_BUTTON)"));
+    }
+#else // XP version
+    wxUxThemeEngine *themeEngine = wxUxThemeEngine::GetIfActive();
+    if ( !themeEngine )
+        return false;
+
+    wxUxThemeHandle theme(this, L"BUTTON");
+    if ( !theme )
+        return false;
+
+    int state;
+    switch ( Get3StateValue() )
+    {
+        case wxCHK_CHECKED:
+            state = CBS_CHECKEDNORMAL;
+            break;
+
+        case wxCHK_UNDETERMINED:
+            state = CBS_MIXEDNORMAL;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unexpected Get3StateValue() return value") );
+            // fall through
+
+        case wxCHK_UNCHECKED:
+            state = CBS_UNCHECKEDNORMAL;
+            break;
+    }
+
+    if ( !IsEnabled() )
+        state += CBS_DISABLED_OFFSET;
+    else if ( m_isPressed )
+        state += CBS_PRESSED_OFFSET;
+    else if ( m_isHot )
+        state += CBS_HOT_OFFSET;
+
+    HRESULT hr = themeEngine->DrawThemeBackground
+                              (
+                                theme,
+                                hdc,
+                                BP_CHECKBOX,
+                                state,
+                                &rectCheck,
+                                NULL
+                              );
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(_T("DrawThemeBackground(BP_CHECKBOX)"), hr);
+    }
+#endif // 0/1
 
     // draw the text
     const wxString& label = GetLabel();
@@ -447,10 +554,10 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     // around it
     if ( isFocused )
     {
-        if ( !::DrawText(hdc, label.t_str(), label.length(), &rectLabel,
+        if ( !::DrawText(hdc, label, label.length(), &rectLabel,
                          fmt | DT_CALCRECT) )
         {
-            wxLogLastError(wxT("DrawText(DT_CALCRECT)"));
+            wxLogLastError(_T("DrawText(DT_CALCRECT)"));
         }
     }
 
@@ -459,9 +566,9 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         ::SetTextColor(hdc, ::GetSysColor(COLOR_GRAYTEXT));
     }
 
-    if ( !::DrawText(hdc, label.t_str(), label.length(), &rectLabel, fmt) )
+    if ( !::DrawText(hdc, label, label.length(), &rectLabel, fmt) )
     {
-        wxLogLastError(wxT("DrawText()"));
+        wxLogLastError(_T("DrawText()"));
     }
 
     // finally draw the focus
@@ -471,7 +578,7 @@ bool wxCheckBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
         rectLabel.right++;
         if ( !::DrawFocusRect(hdc, &rectLabel) )
         {
-            wxLogLastError(wxT("DrawFocusRect()"));
+            wxLogLastError(_T("DrawFocusRect()"));
         }
     }
 
diff --git a/Source/3rd Party/wx/src/msw/checklst.cpp b/Source/3rd Party/wx/src/msw/checklst.cpp
index 90336a8e5..f01f5884d 100644
--- a/Source/3rd Party/wx/src/msw/checklst.cpp	
+++ b/Source/3rd Party/wx/src/msw/checklst.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     16.11.97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: checklst.cpp 62511 2009-10-30 14:11:03Z JMS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,7 @@
 #include "wx/checklst.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/msw/wrapcctl.h"
+    #include "wx/msw/wrapwin.h"
     #include "wx/object.h"
     #include "wx/colour.h"
     #include "wx/font.h"
@@ -45,9 +45,7 @@
 
 #include <windowsx.h>
 
-#include "wx/renderer.h"
 #include "wx/msw/private.h"
-#include "wx/msw/dc.h"
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -56,113 +54,233 @@
 // get item (converted to right type)
 #define GetItem(n)    ((wxCheckListBoxItem *)(GetItem(n)))
 
-namespace
-{
-    // space around check mark bitmap in pixels
-    static const int CHECKMARK_EXTRA_SPACE = 1;
-
-    // space betwen check bitmap and text label
-    static const int CHECKMARK_LABEL_SPACE = 2;
-
-} // anonymous namespace
-
 // ============================================================================
 // implementation
 // ============================================================================
 
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxCheckListBoxStyle )
+
+wxBEGIN_FLAGS( wxCheckListBoxStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxLB_SINGLE)
+    wxFLAGS_MEMBER(wxLB_MULTIPLE)
+    wxFLAGS_MEMBER(wxLB_EXTENDED)
+    wxFLAGS_MEMBER(wxLB_HSCROLL)
+    wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
+    wxFLAGS_MEMBER(wxLB_NEEDED_SB)
+    wxFLAGS_MEMBER(wxLB_SORT)
+    wxFLAGS_MEMBER(wxLB_OWNERDRAW)
+
+wxEND_FLAGS( wxCheckListBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox,"wx/checklst.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxCheckListBox)
+    wxEVENT_PROPERTY( Toggle , wxEVT_COMMAND_CHECKLISTBOX_TOGGLED , wxCommandEvent )
+    wxPROPERTY_FLAGS( WindowStyle , wxCheckListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , wxLB_OWNERDRAW /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxCheckListBox)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_4( wxCheckListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
+#endif
+
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class
 // ----------------------------------------------------------------------------
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {
+friend class WXDLLIMPEXP_FWD_CORE wxCheckListBox;
 public:
     // ctor
-    wxCheckListBoxItem(wxCheckListBox *parent);
+    wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);
 
     // drawing functions
     virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
     // simple accessors and operations
-    wxCheckListBox *GetParent() const
-        { return m_parent; }
+    bool IsChecked() const { return m_bChecked; }
 
-    int GetIndex() const
-        { return m_parent->GetItemIndex(const_cast<wxCheckListBoxItem*>(this)); }
+    void Check(bool bCheck);
+    void Toggle() { Check(!IsChecked()); }
 
-    wxString GetName() const
-        { return m_parent->GetString(GetIndex()); }
-
-
-    bool IsChecked() const
-        { return m_checked; }
-
-    void Check(bool bCheck)
-        { m_checked = bCheck; }
-
-    void Toggle()
-        { Check(!IsChecked()); }
+    void SendEvent();
 
 private:
-    wxCheckListBox *m_parent;
-    bool m_checked;
+    bool            m_bChecked;
+    wxCheckListBox *m_pParent;
+    size_t    m_nIndex;
 
-    wxDECLARE_NO_COPY_CLASS(wxCheckListBoxItem);
+    DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
 };
 
-wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *parent)
+wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
+                  : wxOwnerDrawn(wxEmptyString, true)   // checkable
 {
-    m_parent = parent;
-    m_checked = false;
+    m_bChecked = false;
+    m_pParent  = pParent;
+    m_nIndex   = nIndex;
 
-    wxSize size = wxRendererNative::Get().GetCheckBoxSize(parent);
-    size.x += 2 * CHECKMARK_EXTRA_SPACE + CHECKMARK_LABEL_SPACE;
+    // we don't initialize m_nCheckHeight/Width vars because it's
+    // done in OnMeasure while they are used only in OnDraw and we
+    // know that there will always be OnMeasure before OnDraw
 
-    SetMarginWidth(size.GetWidth());
-    SetBackgroundColour(parent->GetBackgroundColour());
+    // fix appearance for check list boxes: they don't look quite the same as
+    // menu icons
+    SetOwnMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) -
+                      2*wxSystemSettings::GetMetric(wxSYS_EDGE_X) + 1);
+
+    SetBackgroundColour(pParent->GetBackgroundColour());
 }
 
 bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
                                     wxODAction act, wxODStatus stat)
 {
     // first draw the label
+    if ( IsChecked() )
+        stat = (wxOwnerDrawn::wxODStatus)(stat | wxOwnerDrawn::wxODChecked);
+
     if ( !wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) )
         return false;
 
+
     // now draw the check mark part
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
-    HDC hdc = GetHdcOf(*impl);
+    size_t nCheckWidth  = GetDefaultMarginWidth(),
+           nCheckHeight = m_pParent->GetItemHeight();
 
-    wxSize size = wxRendererNative::Get().GetCheckBoxSize(GetParent());
+    int x = rc.GetX(),
+        y = rc.GetY();
 
-    // first create bitmap in a memory DC
-    MemoryHDC hdcMem(hdc);
-    CompatibleBitmap hBmpCheck(hdc, size.GetWidth(), size.GetHeight());
+    HDC hdc = (HDC)dc.GetHDC();
 
-    // then draw a check mark into it
+    // create pens, brushes &c
+    COLORREF colBg = wxColourToRGB(GetBackgroundColour());
+    AutoHPEN hpenBack(colBg),
+             hpenGray(RGB(0xc0, 0xc0, 0xc0));
+
+    SelectInHDC selPen(hdc, (HGDIOBJ)hpenBack);
+    AutoHBRUSH hbrBack(colBg);
+    SelectInHDC selBrush(hdc, hbrBack);
+
+    // erase the background: it could have been filled with the selected colour
+    Rectangle(hdc, x, y, x + nCheckWidth + 1, rc.GetBottom() + 1);
+
+    // shift check mark 1 pixel to the right, looks better like this
+    x++;
+
+    if ( IsChecked() )
     {
-        SelectInHDC selBmp(hdcMem, hBmpCheck);
+        // first create a monochrome bitmap in a memory DC
+        MemoryHDC hdcMem(hdc);
+        MonoBitmap hbmpCheck(nCheckWidth, nCheckHeight);
+        SelectInHDC selBmp(hdcMem, hbmpCheck);
 
-        int flags = wxCONTROL_FLAT;
-        if ( IsChecked() )
-            flags |= wxCONTROL_CHECKED;
+        // then draw a check mark into it
+        RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
+        ::DrawFrameControl(hdcMem, &rect,
+#ifdef __WXWINCE__
+                           DFC_BUTTON, DFCS_BUTTONCHECK
+#else
+                           DFC_MENU, DFCS_MENUCHECK
+#endif
+                           );
 
-        wxDCTemp dcMem(hdcMem);
-        wxRendererNative::Get().DrawCheckBox(GetParent(), dcMem, wxRect(size), flags);
-    } // select hBmpCheck out of hdcMem
+        // finally copy it to screen DC
+        ::BitBlt(hdc, x, y, nCheckWidth, nCheckHeight, hdcMem, 0, 0, SRCCOPY);
+    }
 
-    // finally draw bitmap to screen
+    // now we draw the smaller rectangle
+    y++;
+    nCheckWidth  -= 2;
+    nCheckHeight -= 2;
 
-    // position of check mark bitmap
-    int x = rc.GetX() + CHECKMARK_EXTRA_SPACE;
-    int y = rc.GetY() + (rc.GetHeight() - size.GetHeight()) / 2;
+    // draw hollow gray rectangle
+    (void)::SelectObject(hdc, (HGDIOBJ)hpenGray);
 
-    UINT uState = stat & wxOwnerDrawn::wxODSelected ? wxDSB_SELECTED : wxDSB_NORMAL;
-    wxDrawStateBitmap(hdc, hBmpCheck, x, y, uState);
+    SelectInHDC selBrush2(hdc, ::GetStockObject(NULL_BRUSH));
+    Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
+
+    if (stat & wxODHasFocus)
+    {
+        RECT rect;
+        wxCopyRectToRECT(rc, rect);
+        DrawFocusRect(hdc, &rect);
+    }
 
     return true;
 }
 
+// change the state of the item and redraw it
+void wxCheckListBoxItem::Check(bool check)
+{
+    m_bChecked = check;
+
+    // index may be changed because new items were added/deleted
+    if ( m_pParent->GetItemIndex(this) != (int)m_nIndex )
+    {
+        // update it
+        int index = m_pParent->GetItemIndex(this);
+
+        wxASSERT_MSG( index != wxNOT_FOUND, wxT("what does this item do here?") );
+
+        m_nIndex = (size_t)index;
+    }
+
+    HWND hwndListbox = (HWND)m_pParent->GetHWND();
+
+    RECT rcUpdate;
+
+    if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
+                       m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
+    {
+        wxLogDebug(wxT("LB_GETITEMRECT failed"));
+    }
+
+    ::InvalidateRect(hwndListbox, &rcUpdate, FALSE);
+}
+
+// send an "item checked" event
+void wxCheckListBoxItem::SendEvent()
+{
+    wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId());
+    event.SetInt(m_nIndex);
+    event.SetEventObject(m_pParent);
+    m_pParent->ProcessCommand(event);
+}
+
 // ----------------------------------------------------------------------------
 // implementation of wxCheckListBox class
 // ----------------------------------------------------------------------------
@@ -221,64 +339,77 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                              style | wxLB_OWNERDRAW, validator, name);
 }
 
+// misc overloaded methods
+// -----------------------
+
+void wxCheckListBox::Delete(unsigned int n)
+{
+    wxCHECK_RET( IsValid(n),
+                 wxT("invalid index in wxListBox::Delete") );
+
+    wxListBox::Delete(n);
+
+    // free memory
+    delete m_aItems[n];
+
+    m_aItems.RemoveAt(n);
+}
+
+bool wxCheckListBox::SetFont( const wxFont &font )
+{
+    unsigned int i;
+    for ( i = 0; i < m_aItems.GetCount(); i++ )
+        m_aItems[i]->SetFont(font);
+
+    wxListBox::SetFont(font);
+
+    return true;
+}
+
 // create/retrieve item
 // --------------------
 
 // create a check list box item
-wxOwnerDrawn *wxCheckListBox::CreateLboxItem(size_t WXUNUSED(n))
+wxOwnerDrawn *wxCheckListBox::CreateLboxItem(size_t nIndex)
 {
-    wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this);
-    return pItem;
+  wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
+  return pItem;
 }
 
 // return item size
 // ----------------
 bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 {
-    if ( wxListBox::MSWOnMeasure(item) )
-    {
-        MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
+  if ( wxListBox::MSWOnMeasure(item) ) {
+    MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 
-        wxSize size = wxRendererNative::Get().GetCheckBoxSize(this);
-        size.x += 2 * CHECKMARK_EXTRA_SPACE;
-        size.y += 2 * CHECKMARK_EXTRA_SPACE;
+    // save item height
+    m_nItemHeight = pStruct->itemHeight;
 
-        // add place for the check mark
-        pStruct->itemWidth += size.GetWidth();
+    // add place for the check mark
+    pStruct->itemWidth += wxOwnerDrawn::GetDefaultMarginWidth();
 
-        if ( pStruct->itemHeight < static_cast<unsigned int>(size.GetHeight()) )
-            pStruct->itemHeight = size.GetHeight();
-
-        return true;
-    }
-
-    return false;
+    return true;
   }
 
+  return false;
+}
+
 // check items
 // -----------
 
 bool wxCheckListBox::IsChecked(unsigned int uiIndex) const
 {
-    wxCHECK_MSG( IsValid(uiIndex), false, wxT("bad wxCheckListBox index") );
+    wxCHECK_MSG( IsValid(uiIndex), false, _T("bad wxCheckListBox index") );
 
     return GetItem(uiIndex)->IsChecked();
 }
 
 void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)
 {
-    wxCHECK_RET( IsValid(uiIndex), wxT("bad wxCheckListBox index") );
+    wxCHECK_RET( IsValid(uiIndex), _T("bad wxCheckListBox index") );
 
     GetItem(uiIndex)->Check(bCheck);
-    RefreshItem(uiIndex);
-}
-
-void wxCheckListBox::Toggle(unsigned int uiIndex)
-{
-    wxCHECK_RET( IsValid(uiIndex), wxT("bad wxCheckListBox index") );
-
-    GetItem(uiIndex)->Toggle();
-    RefreshItem(uiIndex);
 }
 
 // process events
@@ -289,33 +420,33 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
     // what do we do?
     enum
     {
-        NONE,
-        TOGGLE,
-        SET,
-        CLEAR
+        None,
+        Toggle,
+        Set,
+        Clear
     } oper;
 
     switch ( event.GetKeyCode() )
     {
         case WXK_SPACE:
-            oper = TOGGLE;
+            oper = Toggle;
             break;
 
         case WXK_NUMPAD_ADD:
         case '+':
-            oper = SET;
+            oper = Set;
             break;
 
         case WXK_NUMPAD_SUBTRACT:
         case '-':
-            oper = CLEAR;
+            oper = Clear;
             break;
 
         default:
-            oper = NONE;
+            oper = None;
     }
 
-    if ( oper != NONE )
+    if ( oper != None )
     {
         wxArrayInt selections;
         int count = 0;
@@ -335,26 +466,31 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
 
         for ( int i = 0; i < count; i++ )
         {
-            int nItem = selections[i];
+            wxCheckListBoxItem *item = GetItem(selections[i]);
+            if ( !item )
+            {
+                wxFAIL_MSG( _T("no wxCheckListBoxItem?") );
+                continue;
+            }
 
             switch ( oper )
             {
-                case TOGGLE:
-                    Toggle(nItem);
+                case Toggle:
+                    item->Toggle();
                     break;
 
-                case SET:
-                case CLEAR:
-                    Check(nItem, oper == SET);
+                case Set:
+                case Clear:
+                    item->Check( oper == Set );
                     break;
 
                 default:
-                    wxFAIL_MSG( wxT("what should this key do?") );
+                    wxFAIL_MSG( _T("what should this key do?") );
             }
 
             // we should send an event as this has been done by the user and
             // not by the program
-            SendEvent(nItem);
+            item->SendEvent();
         }
     }
     else // nothing to do
@@ -366,70 +502,45 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
 void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 {
     // clicking on the item selects it, clicking on the checkmark toggles
-
-    int nItem = HitTest(event.GetX(), event.GetY());
-
-    if ( nItem != wxNOT_FOUND )
+    if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() )
     {
-        wxRect rect;
-        GetItemRect(nItem, rect);
+        int nItem = HitTest(event.GetX(), event.GetY());
 
-        // convert item rect to check mark rect
-        wxSize size = wxRendererNative::Get().GetCheckBoxSize(this);
-        rect.x += CHECKMARK_EXTRA_SPACE;
-        rect.y += (rect.GetHeight() - size.GetHeight()) / 2;
-        rect.SetSize(size);
-
-        if ( rect.Contains(event.GetX(), event.GetY()) )
+        if ( nItem != wxNOT_FOUND )
         {
-            // people expect to get "kill focus" event for the currently
-            // focused control before getting events from the other controls
-            // and, equally importantly, they may prevent the focus change from
-            // taking place at all (e.g. because the old control contents is
-            // invalid and needs to be corrected) in which case we shouldn't
-            // generate this event at all
-            SetFocus();
-            if ( FindFocus() == this )
-            {
-                Toggle(nItem);
-                SendEvent(nItem);
-
-                // scroll one item down if the item is the last one
-                // and isn't visible at all
-                int h;
-                GetClientSize(NULL, &h);
-                if ( rect.GetBottom() > h )
-                    ScrollLines(1);
-            }
-        }
-        else
-        {
-            // implement default behaviour: clicking on the item selects it
-            event.Skip();
+            wxCheckListBoxItem *item = GetItem(nItem);
+            item->Toggle();
+            item->SendEvent();
         }
+        //else: it's not an error, just click outside of client zone
     }
     else
     {
-        // implement default behaviour on click outside of client zone
+        // implement default behaviour: clicking on the item selects it
         event.Skip();
     }
 }
 
-wxSize wxCheckListBox::DoGetBestClientSize() const
+int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const
 {
-    wxSize best = wxListBox::DoGetBestClientSize();
+    int nItem = (int)::SendMessage
+                             (
+                              (HWND)GetHWND(),
+                              LB_ITEMFROMPOINT,
+                              0,
+                              MAKELPARAM(x, y)
+                             );
 
-    // add room for the checkbox
-    wxSize size = wxRendererNative::Get().GetCheckBoxSize(const_cast<wxCheckListBox*>(this));
-    size.x += 2 * CHECKMARK_EXTRA_SPACE;
-    size.y += 2 * CHECKMARK_EXTRA_SPACE;
+    return nItem >= (int)m_noItems ? wxNOT_FOUND : nItem;
+}
 
-    best.x += size.GetWidth();
-    if ( best.y < size.GetHeight() )
-        best.y = size.GetHeight();
 
+wxSize wxCheckListBox::DoGetBestSize() const
+{
+    wxSize best = wxListBox::DoGetBestSize();
+    best.x += wxOwnerDrawn::GetDefaultMarginWidth();  // add room for the checkbox
     CacheBestSize(best);
     return best;
 }
 
-#endif // wxUSE_CHECKLISTBOX
+#endif
diff --git a/Source/3rd Party/wx/src/msw/choice.cpp b/Source/3rd Party/wx/src/msw/choice.cpp
index 5f350f6a5..d154a30e0 100644
--- a/Source/3rd Party/wx/src/msw/choice.cpp	
+++ b/Source/3rd Party/wx/src/msw/choice.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to derive from wxChoiceBase
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: choice.cpp 51616 2008-02-09 15:22:15Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
-    #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/brush.h"
     #include "wx/settings.h"
@@ -38,6 +37,64 @@
 
 #include "wx/msw/private.h"
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxChoiceStyle )
+
+wxBEGIN_FLAGS( wxChoiceStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxChoiceStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl,"wx/choice.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxChoice)
+    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent )
+
+    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxChoiceStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxChoice)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+#endif
+/*
+    TODO PROPERTIES
+        selection (long)
+        content (list)
+            item
+*/
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -60,8 +117,8 @@ bool wxChoice::Create(wxWindow *parent,
     wxASSERT_MSG( !(style & wxCB_DROPDOWN) &&
                   !(style & wxCB_READONLY) &&
                   !(style & wxCB_SIMPLE),
-                  wxT("this style flag is ignored by wxChoice, you ")
-                  wxT("probably want to use a wxComboBox") );
+                  _T("this style flag is ignored by wxChoice, you ")
+                  _T("probably want to use a wxComboBox") );
 
     return CreateAndInit(parent, id, pos, size, n, choices, style,
                          validator, name);
@@ -85,8 +142,15 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
         return false;
 
 
+    // choice/combobox normally has "white" (depends on colour scheme, of
+    // course) background rather than inheriting the parent's background
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+
     // initialize the controls contents
-    Append(n, choices);
+    for ( int i = 0; i < n; i++ )
+    {
+        Append(choices[i]);
+    }
 
     // and now we may finally size the control properly (if needed)
     SetInitialSize(size);
@@ -94,6 +158,20 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
     return true;
 }
 
+bool wxChoice::Create(wxWindow *parent,
+                      wxWindowID id,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      const wxArrayString& choices,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);
+}
+
 void wxChoice::SetLabel(const wxString& label)
 {
     if ( FindString(label) == wxNOT_FOUND )
@@ -109,20 +187,6 @@ void wxChoice::SetLabel(const wxString& label)
     wxChoiceBase::SetLabel(label);
 }
 
-bool wxChoice::Create(wxWindow *parent,
-                      wxWindowID id,
-                      const wxPoint& pos,
-                      const wxSize& size,
-                      const wxArrayString& choices,
-                      long style,
-                      const wxValidator& validator,
-                      const wxString& name)
-{
-    wxCArrayString chs(choices);
-    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
-                  style, validator, name);
-}
-
 bool wxChoice::MSWShouldPreProcessMessage(WXMSG *pMsg)
 {
     MSG *msg = (MSG *) pMsg;
@@ -160,109 +224,95 @@ WXDWORD wxChoice::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
-#ifndef EP_EDITTEXT
-    #define EP_EDITTEXT         1
-    #define ETS_NORMAL          1
-#endif
-
-wxVisualAttributes
-wxChoice::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
-{
-    // it is important to return valid values for all attributes from here,
-    // GetXXX() below rely on this
-    wxVisualAttributes attrs;
-
-    // FIXME: Use better dummy window?
-    wxWindow* wnd = wxTheApp->GetTopWindow();
-    if (!wnd)
-        return attrs;
-
-    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-
-    // there doesn't seem to be any way to get the text colour using themes
-    // API: TMT_TEXTCOLOR doesn't work neither for EDIT nor COMBOBOX
-    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-
-    // NB: use EDIT, not COMBOBOX (the latter works in XP but not Vista)
-    attrs.colBg = wnd->MSWGetThemeColour(L"EDIT",
-                                         EP_EDITTEXT,
-                                         ETS_NORMAL,
-                                         ThemeColourBackground,
-                                         wxSYS_COLOUR_WINDOW);
-
-    return attrs;
-}
-
 wxChoice::~wxChoice()
 {
-    Clear();
+    Free();
 }
 
 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 
-int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
-                            unsigned int pos,
-                            void **clientData, wxClientDataType type)
+int wxChoice::DoAppend(const wxString& item)
 {
-    MSWAllocStorage(items, CB_INITSTORAGE);
-
-    const bool append = pos == GetCount();
-
-    // use CB_ADDSTRING when appending at the end to make sure the control is
-    // resorted if it has wxCB_SORT style
-    const unsigned msg = append ? CB_ADDSTRING : CB_INSERTSTRING;
-
-    if ( append )
-        pos = 0;
-
-    int n = wxNOT_FOUND;
-    const unsigned numItems = items.GetCount();
-    for ( unsigned i = 0; i < numItems; ++i )
+    int n = (int)SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LPARAM)item.c_str());
+    if ( n == CB_ERR )
     {
-        n = MSWInsertOrAppendItem(pos, items[i], msg);
-        if ( n == wxNOT_FOUND )
-            return n;
-
-        if ( !append )
-            pos++;
-
-        AssignNewItemClientData(n, clientData, i, type);
+        wxLogLastError(wxT("SendMessage(CB_ADDSTRING)"));
+    }
+    else // ok
+    {
+        // we need to refresh our size in order to have enough space for the
+        // newly added items
+        if ( !IsFrozen() )
+            UpdateVisibleHeight();
     }
 
-    // we need to refresh our size in order to have enough space for the
-    // newly added items
-    if ( !IsFrozen() )
-        MSWUpdateDropDownHeight();
-
     InvalidateBestSize();
-
     return n;
 }
 
-void wxChoice::DoDeleteOneItem(unsigned int n)
+int wxChoice::DoInsert(const wxString& item, unsigned int pos)
+{
+    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
+    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
+
+    int n = (int)SendMessage(GetHwnd(), CB_INSERTSTRING, pos, (LPARAM)item.c_str());
+    if ( n == CB_ERR )
+    {
+        wxLogLastError(wxT("SendMessage(CB_INSERTSTRING)"));
+    }
+    else // ok
+    {
+        if ( !IsFrozen() )
+            UpdateVisibleHeight();
+    }
+
+    InvalidateBestSize();
+    return n;
+}
+
+void wxChoice::Delete(unsigned int n)
 {
     wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") );
 
+    if ( HasClientObjectData() )
+    {
+        delete GetClientObject(n);
+    }
+
     SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
 
     if ( !IsFrozen() )
-        MSWUpdateDropDownHeight();
+        UpdateVisibleHeight();
 
     InvalidateBestSize();
 }
 
-void wxChoice::DoClear()
+void wxChoice::Clear()
 {
+    Free();
+
     SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
 
     if ( !IsFrozen() )
-        MSWUpdateDropDownHeight();
+        UpdateVisibleHeight();
 
     InvalidateBestSize();
 }
 
+void wxChoice::Free()
+{
+    if ( HasClientObjectData() )
+    {
+        unsigned int count = GetCount();
+        for ( unsigned int n = 0; n < count; n++ )
+        {
+            delete GetClientObject(n);
+        }
+    }
+}
+
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
@@ -333,7 +383,7 @@ int wxChoice::FindString(const wxString& s, bool bCase) const
    else
    {
        int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
-                                  (WPARAM)-1, wxMSW_CONV_LPARAM(s));
+                                  (WPARAM)-1, (LPARAM)s.c_str());
 
        return pos == LB_ERR ? wxNOT_FOUND : pos;
    }
@@ -347,32 +397,26 @@ void wxChoice::SetString(unsigned int n, const wxString& s)
     // we have to delete and add back the string as there is no way to change a
     // string in place
 
-    // we need to preserve the client data manually
-    void *oldData = NULL;
-    wxClientData *oldObjData = NULL;
-    if ( HasClientUntypedData() )
-        oldData = GetClientData(n);
-    else if ( HasClientObjectData() )
-        oldObjData = GetClientObject(n);
-
-    // and also the selection if we're going to delete the item that was
-    // selected
-    const bool wasSelected = static_cast<int>(n) == GetSelection();
+    // we need to preserve the client data
+    void *data;
+    if ( m_clientDataItemsType != wxClientData_None )
+    {
+        data = DoGetItemClientData(n);
+    }
+    else // no client data
+    {
+        data = NULL;
+    }
 
     ::SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
-    ::SendMessage(GetHwnd(), CB_INSERTSTRING, n, wxMSW_CONV_LPARAM(s) );
+    ::SendMessage(GetHwnd(), CB_INSERTSTRING, n, (LPARAM)s.c_str() );
 
-    // restore the client data
-    if ( oldData )
-        SetClientData(n, oldData);
-    else if ( oldObjData )
-        SetClientObject(n, oldObjData);
+    if ( data )
+    {
+        DoSetItemClientData(n, data);
+    }
+    //else: it's already NULL by default
 
-    // and the selection
-    if ( wasSelected )
-        SetSelection(n);
-
-    // the width could have changed so the best size needs to be recomputed
     InvalidateBestSize();
 }
 
@@ -414,7 +458,7 @@ void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
 void* wxChoice::DoGetItemClientData(unsigned int n) const
 {
     LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0);
-    if ( rc == CB_ERR && GetLastError() != ERROR_SUCCESS )
+    if ( rc == CB_ERR )
     {
         wxLogLastError(wxT("CB_GETITEMDATA"));
 
@@ -425,46 +469,24 @@ void* wxChoice::DoGetItemClientData(unsigned int n) const
     return (void *)rc;
 }
 
-// ----------------------------------------------------------------------------
-// wxMSW-specific geometry management
-// ----------------------------------------------------------------------------
-
-namespace
+void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
 {
-
-// there is a difference between the height passed to CB_SETITEMHEIGHT and the
-// real height of the combobox; it is probably not constant for all Windows
-// versions/settings but right now I don't know how to find what it is so it is
-// temporarily hardcoded to its value under XP systems with normal fonts sizes
-const int COMBO_HEIGHT_ADJ = 6;
-
-} // anonymous namespace
-
-void wxChoice::MSWUpdateVisibleHeight()
-{
-    if ( m_heightOwn != wxDefaultCoord )
-    {
-        ::SendMessage(GetHwnd(), CB_SETITEMHEIGHT,
-                      (WPARAM)-1, m_heightOwn - COMBO_HEIGHT_ADJ);
-    }
+    DoSetItemClientData(n, clientData);
 }
 
-#if wxUSE_DEFERRED_SIZING
-void wxChoice::MSWEndDeferWindowPos()
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
 {
-    // we can only set the height of the choice itself now as it is reset to
-    // default every time the control is resized
-    MSWUpdateVisibleHeight();
-
-    wxChoiceBase::MSWEndDeferWindowPos();
+    return (wxClientData *)DoGetItemClientData(n);
 }
-#endif // wxUSE_DEFERRED_SIZING
 
-void wxChoice::MSWUpdateDropDownHeight()
+// ----------------------------------------------------------------------------
+// wxMSW specific helpers
+// ----------------------------------------------------------------------------
+
+void wxChoice::UpdateVisibleHeight()
 {
     // be careful to not change the width here
-    DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, GetSize().y,
-              wxSIZE_USE_EXISTING);
+    DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, GetSize().y, wxSIZE_USE_EXISTING);
 }
 
 void wxChoice::DoMoveWindow(int x, int y, int width, int height)
@@ -487,109 +509,133 @@ void wxChoice::DoMoveWindow(int x, int y, int width, int height)
 
 void wxChoice::DoGetSize(int *w, int *h) const
 {
-    wxControl::DoGetSize(w, h);
-
     // this is weird: sometimes, the height returned by Windows is clearly the
     // total height of the control including the drop down list -- but only
-    // sometimes, and sometimes it isn't so work around this here by using our
-    // own stored value if we have it
-    if ( h && m_heightOwn != wxDefaultCoord )
-        *h = m_heightOwn;
+    // sometimes, and normally it isn't... I have no idea about what to do with
+    // this
+    wxControl::DoGetSize(w, h);
 }
 
 void wxChoice::DoSetSize(int x, int y,
                          int width, int height,
                          int sizeFlags)
 {
-    const int heightBest = GetBestSize().y;
+    int heightOrig = height;
+    
+    // the height which we must pass to Windows should be the total height of
+    // the control including the drop down list while the height given to us
+    // is, of course, just the height of the permanently visible part of it
+    if ( height != wxDefaultCoord )
+    {
+        // don't make the drop down list too tall, arbitrarily limit it to 40
+        // items max and also don't leave it empty
+        size_t nItems = GetCount();
+        if ( !nItems )
+            nItems = 9;
+        else if ( nItems > 24 )
+            nItems = 24;
 
-    // we need the real height below so get the current one if it's not given
-    if ( height == wxDefaultCoord )
-    {
-        // height not specified, use the same as before
-        DoGetSize(NULL, &height);
+        // add space for the drop down list
+        const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0);
+        height += hItem*(nItems + 1);
     }
-    else if ( height == heightBest )
+    else
     {
-        // we don't need to manually manage our height, let the system use the
-        // default one
-        m_heightOwn = wxDefaultCoord;
-    }
-    else // non-default height specified
-    {
-        // set our new own height but be careful not to make it too big: the
-        // native control apparently stores it as a single byte and so setting
-        // own height to 256 pixels results in default height being used (255
-        // is still ok)
-        m_heightOwn = height;
-
-        if ( m_heightOwn > UCHAR_MAX )
-            m_heightOwn = UCHAR_MAX;
-        // nor too small: see MSWUpdateVisibleHeight()
-        else if ( m_heightOwn < COMBO_HEIGHT_ADJ )
-            m_heightOwn = COMBO_HEIGHT_ADJ;
+        // We cannot pass wxDefaultCoord as height to wxControl. wxControl uses
+        // wxGetWindowRect() to determine the current height of the combobox,
+        // and then again sets the combobox's height to that value. Unfortunately,
+        // wxGetWindowRect doesn't include the dropdown list's height (at least
+        // on Win2K), so this would result in a combobox with dropdown height of
+        // 1 pixel. We have to determine the default height ourselves and call
+        // wxControl with that value instead.
+        int w, h;
+        RECT r;
+        DoGetSize(&w, &h);
+        if (::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r) != 0)
+        {
+            height = h + r.bottom - r.top;
+        }
     }
 
+    wxControl::DoSetSize(x, y, width, height, sizeFlags);
+
+    // If we're storing a pending size, make sure we store
+    // the original size for reporting back to the app.
+    if (m_pendingSize != wxDefaultSize)
+        m_pendingSize = wxSize(width, heightOrig);
+
+    // This solution works on XP, but causes choice/combobox lists to be
+    // too short on W2K and earlier.
+#if 0
+    int widthCurrent, heightCurrent;
+    DoGetSize(&widthCurrent, &heightCurrent);
 
     // the height which we must pass to Windows should be the total height of
     // the control including the drop down list while the height given to us
-    // is, of course, just the height of the permanently visible part of it so
-    // add the drop down height to it
-
-    // don't make the drop down list too tall, arbitrarily limit it to 30
-    // items max and also don't make it too small if it's currently empty
-    size_t nItems = GetCount();
-    if (!HasFlag(wxCB_SIMPLE))
+    // is, of course, just the height of the permanently visible part of it
+    if ( height != wxDefaultCoord && height != heightCurrent )
     {
+        // don't make the drop down list too tall, arbitrarily limit it to 40
+        // items max and also don't leave it empty
+        unsigned int nItems = GetCount();
         if ( !nItems )
             nItems = 9;
-        else if ( nItems > 30 )
-            nItems = 30;
+        else if ( nItems > 24 )
+            nItems = 24;
+
+        // add space for the drop down list
+        const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0);
+        height += hItem*(nItems + 1);
     }
-
-    const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0);
-    int heightWithItems = 0;
-    if (!HasFlag(wxCB_SIMPLE))
-        // The extra item (" + 1") is required to prevent a vertical
-        // scrollbar from appearing with comctl32.dll versions earlier
-        // than 6.0 (such as found in Win2k).
-        heightWithItems = height + hItem*(nItems + 1);
-    else
-        heightWithItems = SetHeightSimpleComboBox(nItems);
-
-
-    // do resize the native control
-    wxControl::DoSetSize(x, y, width, heightWithItems, sizeFlags);
-
-
-    // make the control itself of the requested height: notice that this
-    // must be done after changing its size or it has no effect (apparently
-    // the height is reset to default during the control layout) and that it's
-    // useless to do it when using the deferred sizing -- in this case it
-    // will be done from MSWEndDeferWindowPos()
-#if wxUSE_DEFERRED_SIZING
-    if ( m_pendingSize == wxDefaultSize )
+    else // keep the same height as now
     {
-        // not using deferred sizing, update it immediately
-        MSWUpdateVisibleHeight();
+        // normally wxWindow::DoSetSize() checks if we set the same size as the
+        // window already has and does nothing in this case, but for us the
+        // check fails as the size we pass to it includes the dropdown while
+        // the size returned by our GetSize() does not, so test if the size
+        // didn't really change ourselves here
+        if ( width == wxDefaultCoord || width == widthCurrent )
+        {
+            // size doesn't change, what about position?
+            int xCurrent, yCurrent;
+            DoGetPosition(&xCurrent, &yCurrent);
+            const bool defMeansUnchanged = !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE);
+            if ( ((x == wxDefaultCoord && defMeansUnchanged) || x == xCurrent)
+                    &&
+                 ((y == wxDefaultCoord && defMeansUnchanged) || y == yCurrent) )
+            {
+                // nothing changes, nothing to do
+                return;
+            }
+        }
+
+        // We cannot pass wxDefaultCoord as height to wxControl. wxControl uses
+        // wxGetWindowRect() to determine the current height of the combobox,
+        // and then again sets the combobox's height to that value. Unfortunately,
+        // wxGetWindowRect doesn't include the dropdown list's height (at least
+        // on Win2K), so this would result in a combobox with dropdown height of
+        // 1 pixel. We have to determine the default height ourselves and call
+        // wxControl with that value instead.
+        //
+        // Also notice that sometimes CB_GETDROPPEDCONTROLRECT seems to return
+        // wildly incorrect values (~32000) which looks like a bug in it, just
+        // ignore them in this case
+        RECT r;
+        if ( ::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r)
+                    && r.bottom < 30000 )
+        {
+            height = heightCurrent + r.bottom - r.top;
+        }
     }
-    else // in the middle of deferred sizing
-    {
-        // we need to report the size of the visible part of the control back
-        // in GetSize() and not height stored by DoSetSize() in m_pendingSize
-        m_pendingSize = wxSize(width, height);
-    }
-#else // !wxUSE_DEFERRED_SIZING
-    // always update the visible height immediately
-    MSWUpdateVisibleHeight();
-#endif // wxUSE_DEFERRED_SIZING
+
+    wxControl::DoSetSize(x, y, width, height, sizeFlags);
+#endif
 }
 
 wxSize wxChoice::DoGetBestSize() const
 {
     // find the widest string
     int wChoice = 0;
-    int hChoice;
     const unsigned int nItems = GetCount();
     for ( unsigned int i = 0; i < nItems; i++ )
     {
@@ -606,63 +652,12 @@ wxSize wxChoice::DoGetBestSize() const
 
     // the combobox should be slightly larger than the widest string
     wChoice += 5*GetCharWidth();
-    if( HasFlag( wxCB_SIMPLE ) )
-    {
-        hChoice = SetHeightSimpleComboBox( nItems );
-    }
-    else
-        hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(GetCharHeight());
 
-    wxSize best(wChoice, hChoice);
+    wxSize best(wChoice, EDIT_HEIGHT_FROM_CHAR_HEIGHT(GetCharHeight()));
     CacheBestSize(best);
     return best;
 }
 
-int wxChoice::SetHeightSimpleComboBox(int nItems) const
-{
-    int cx, cy;
-    wxGetCharSize( GetHWND(), &cx, &cy, GetFont() );
-    int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, (WPARAM)-1, 0);
-    return EDIT_HEIGHT_FROM_CHAR_HEIGHT( cy ) * wxMin( wxMax( nItems, 3 ), 6 ) + hItem - 1;
-}
-
-// ----------------------------------------------------------------------------
-// Popup operations
-// ----------------------------------------------------------------------------
-
-void wxChoice::MSWDoPopupOrDismiss(bool show)
-{
-    wxASSERT_MSG( !HasFlag(wxCB_SIMPLE),
-                  wxT("can't popup/dismiss the list for simple combo box") );
-
-    // we *must* set focus to the combobox before showing or hiding the drop
-    // down as without this we get WM_LBUTTONDOWN messages with invalid HWND
-    // when hiding it (whether programmatically or manually) resulting in a
-    // crash when we pass them to IsDialogMessage()
-    //
-    // this can be seen in the combo page of the widgets sample under Windows 7
-    SetFocus();
-
-    ::SendMessage(GetHwnd(), CB_SHOWDROPDOWN, show, 0);
-}
-
-bool wxChoice::Show(bool show)
-{
-    if ( !wxChoiceBase::Show(show) )
-        return false;
-
-    // When hiding the combobox, we also need to hide its popup part as it
-    // doesn't happen automatically.
-    if ( !show && ::SendMessage(GetHwnd(), CB_GETDROPPEDSTATE, 0, 0) )
-        MSWDoPopupOrDismiss(false);
-
-    return true;
-}
-
-// ----------------------------------------------------------------------------
-// MSW message handlers
-// ----------------------------------------------------------------------------
-
 WXLRESULT wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
     switch ( nMsg )
@@ -740,6 +735,13 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             // need to reset the selection back to it if it's eventually
             // cancelled by user
             m_lastAcceptedSelection = GetCurrentSelection();
+            if ( m_lastAcceptedSelection == -1 )
+            {
+                // no current selection so no need to restore it later (this
+                // happens when opening a combobox containing text not from its
+                // list of items and we shouldn't erase this text)
+                m_lastAcceptedSelection = wxID_NONE;
+            }
             break;
 
         case CBN_CLOSEUP:
@@ -791,7 +793,7 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 
 WXHBRUSH wxChoice::MSWControlColor(WXHDC hDC, WXHWND hWnd)
 {
-    if ( !IsThisEnabled() )
+    if ( !IsEnabled() )
         return MSWControlColorDisabled(hDC);
 
     return wxChoiceBase::MSWControlColor(hDC, hWnd);
diff --git a/Source/3rd Party/wx/src/msw/clipbrd.cpp b/Source/3rd Party/wx/src/msw/clipbrd.cpp
index 2cdbb5ddc..8091f2dd6 100644
--- a/Source/3rd Party/wx/src/msw/clipbrd.cpp	
+++ b/Source/3rd Party/wx/src/msw/clipbrd.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: clipbrd.cpp 43884 2006-12-09 19:49:40Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -79,7 +79,6 @@
 // ---------------------------------------------------------------------------
 
 static bool gs_wxClipboardIsOpen = false;
-static int gs_htmlcfid = 0;
 
 bool wxOpenClipboard()
 {
@@ -91,15 +90,13 @@ bool wxOpenClipboard()
         gs_wxClipboardIsOpen = ::OpenClipboard((HWND)win->GetHWND()) != 0;
 
         if ( !gs_wxClipboardIsOpen )
-        {
             wxLogSysError(_("Failed to open the clipboard."));
-        }
 
         return gs_wxClipboardIsOpen;
     }
     else
     {
-        wxLogDebug(wxT("Cannot open clipboard without a main window."));
+        wxLogDebug(wxT("Can not open clipboard without a main window."));
 
         return false;
     }
@@ -140,9 +137,7 @@ bool wxIsClipboardOpened()
 
 bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
 {
-    wxDataFormat::NativeFormat cf = dataFormat.GetFormatId();
-    if (cf == wxDF_HTML)
-        cf = gs_htmlcfid;
+   wxDataFormat::NativeFormat cf = dataFormat.GetFormatId();
 
     if ( ::IsClipboardFormatAvailable(cf) )
     {
@@ -217,7 +212,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
             {
                 wxBitmap *bitmap = (wxBitmap *)data;
 
-                if ( bitmap && bitmap->IsOk() )
+                if ( bitmap && bitmap->Ok() )
                 {
                     wxDIB dib(*bitmap);
                     if ( dib.IsOk() )
@@ -307,6 +302,10 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 char *buf = new char [400 + strlen(html)];
                 if(!buf) return false;
 
+                // Get clipboard id for HTML format...
+                static int cfid = 0;
+                if(!cfid) cfid = RegisterClipboardFormat(wxT("HTML Format"));
+
                 // Create a template string for the HTML header...
                 strcpy(buf,
                     "Version:0.9\r\n"
@@ -331,19 +330,19 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 // string when you overwrite it so you follow up with code to replace
                 // the 0 appended at the end with a '\r'...
                 char *ptr = strstr(buf, "StartHTML");
-                sprintf(ptr+10, "%08u", (unsigned)(strstr(buf, "<html>") - buf));
+                sprintf(ptr+10, "%08u", strstr(buf, "<html>") - buf);
                 *(ptr+10+8) = '\r';
 
                 ptr = strstr(buf, "EndHTML");
-                sprintf(ptr+8, "%08u", (unsigned)strlen(buf));
+                sprintf(ptr+8, "%08u", strlen(buf));
                 *(ptr+8+8) = '\r';
 
                 ptr = strstr(buf, "StartFragment");
-                sprintf(ptr+14, "%08u", (unsigned)(strstr(buf, "<!--StartFrag") - buf));
+                sprintf(ptr+14, "%08u", strstr(buf, "<!--StartFrag") - buf);
                 *(ptr+14+8) = '\r';
 
                 ptr = strstr(buf, "EndFragment");
-                sprintf(ptr+12, "%08u", (unsigned)(strstr(buf, "<!--EndFrag") - buf));
+                sprintf(ptr+12, "%08u", strstr(buf, "<!--EndFrag") - buf);
                 *(ptr+12+8) = '\r';
 
                 // Now you have everything in place ready to put on the
@@ -357,7 +356,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat,
                 strcpy(ptr, buf);
                 GlobalUnlock(hText);
 
-                handle = ::SetClipboardData(gs_htmlcfid, hText);
+                handle = ::SetClipboardData(cfid, hText);
 
                 // Free memory...
                 GlobalFree(hText);
@@ -548,9 +547,6 @@ wxClipboard::~wxClipboard()
 
 void wxClipboard::Clear()
 {
-    if ( IsUsingPrimarySelection() )
-        return;
-
 #if wxUSE_OLE_CLIPBOARD
     if (m_lastDataObject)
     {
@@ -597,10 +593,6 @@ bool wxClipboard::Flush()
 
 bool wxClipboard::Open()
 {
-    // Get clipboard id for HTML format...
-    if(!gs_htmlcfid)
-        gs_htmlcfid = RegisterClipboardFormat(wxT("HTML Format"));
-
     // OLE opens clipboard for us
     m_isOpened = true;
 #if wxUSE_OLE_CLIPBOARD
@@ -621,9 +613,6 @@ bool wxClipboard::IsOpened() const
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
-    if ( IsUsingPrimarySelection() )
-        return false;
-
 #if !wxUSE_OLE_CLIPBOARD
     (void)wxEmptyClipboard();
 #endif // wxUSE_OLE_CLIPBOARD
@@ -636,9 +625,6 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
-    if ( IsUsingPrimarySelection() )
-        return false;
-
     wxCHECK_MSG( data, false, wxT("data is invalid") );
 
 #if wxUSE_OLE_CLIPBOARD
@@ -732,14 +718,11 @@ void wxClipboard::Close()
 
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
-    return !IsUsingPrimarySelection() && wxIsClipboardFormatAvailable(format);
+    return wxIsClipboardFormatAvailable(format);
 }
 
 bool wxClipboard::GetData( wxDataObject& data )
 {
-    if ( IsUsingPrimarySelection() )
-        return false;
-
 #if wxUSE_OLE_CLIPBOARD
     IDataObject *pDataObject = NULL;
     HRESULT hr = OleGetClipboard(&pDataObject);
@@ -775,7 +758,7 @@ bool wxClipboard::GetData( wxDataObject& data )
     // enumerate all explicit formats on the clipboard.
     // note that this does not include implicit / synthetic (automatically
     // converted) formats.
-#if wxDEBUG_LEVEL >= 2
+#ifdef __WXDEBUG__
     // get the format enumerator
     IEnumFORMATETC *pEnumFormatEtc = NULL;
     hr = pDataObject->EnumFormatEtc(DATADIR_GET, &pEnumFormatEtc);
@@ -808,7 +791,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 
         pEnumFormatEtc->Release();
     }
-#endif // wxDEBUG_LEVEL >= 2
+#endif // Debug
 
     STGMEDIUM medium;
     // stop at the first valid format found on the clipboard
@@ -817,8 +800,6 @@ bool wxClipboard::GetData( wxDataObject& data )
         // convert to NativeFormat Id
         cf = formats[n].GetFormatId();
 
-        if (cf == wxDF_HTML)
-            cf = gs_htmlcfid;
         // if the format is not available, try the next one
         // this test includes implicit / sythetic formats
         if ( !::IsClipboardFormatAvailable(cf) )
diff --git a/Source/3rd Party/wx/src/msw/colordlg.cpp b/Source/3rd Party/wx/src/msw/colordlg.cpp
index 52916a6f1..e15c7c67a 100644
--- a/Source/3rd Party/wx/src/msw/colordlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/colordlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: colordlg.cpp 49973 2007-11-15 16:44:08Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,6 +34,8 @@
     #include "wx/colour.h"
     #include "wx/gdicmn.h"
     #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/cmndata.h"
     #include "wx/math.h"
 #endif
 
@@ -42,15 +44,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-// standard colors dialog size for the Windows systems
-// this is ok if color dialog created with standart color
-// and "Define Custom Colors" extension not shown
-static wxRect gs_rectDialog(0, 0, 222, 324);
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -74,14 +67,19 @@ wxColourDialogHookProc(HWND hwnd,
     if ( uiMsg == WM_INITDIALOG )
     {
         CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
-        wxColourDialog * const
-            dialog = reinterpret_cast<wxColourDialog *>(pCC->lCustData);
+        wxColourDialog *dialog = (wxColourDialog *)pCC->lCustData;
 
         const wxString title = dialog->GetTitle();
         if ( !title.empty() )
-            ::SetWindowText(hwnd, title.t_str());
+            ::SetWindowText(hwnd, title);
 
-        dialog->MSWOnInitDone((WXHWND)hwnd);
+        wxPoint pos = dialog->GetPosition();
+        if ( pos != wxDefaultPosition )
+        {
+            ::SetWindowPos(hwnd, NULL /* Z-order: ignored */,
+                           pos.x, pos.y, -1, -1,
+                           SWP_NOSIZE | SWP_NOZORDER);
+        }
     }
 
     return 0;
@@ -91,16 +89,16 @@ wxColourDialogHookProc(HWND hwnd,
 // wxColourDialog
 // ----------------------------------------------------------------------------
 
-void wxColourDialog::Init()
+wxColourDialog::wxColourDialog()
 {
-    m_movedWindow = false;
-    m_centreDir = 0;
+    m_pos = wxDefaultPosition;
+}
 
-    // reset to zero, otherwise the wx routines won't size the window the
-    // second time the dialog is shown, because they would believe it already
-    // has the requested size/position
-    gs_rectDialog.x =
-    gs_rectDialog.y = 0;
+wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
+{
+    m_pos = wxDefaultPosition;
+
+    Create(parent, data);
 }
 
 bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
@@ -114,18 +112,15 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
-    // initialize the struct used by Windows
     CHOOSECOLOR chooseColorStruct;
+    COLORREF custColours[16];
     memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR));
 
-    size_t i;
-
-    // and transfer data from m_colourData to it
-    COLORREF custColours[16];
-    for ( i = 0; i < WXSIZEOF(custColours); i++ )
+    int i;
+    for (i = 0; i < 16; i++)
     {
-        if ( m_colourData.GetCustomColour(i).IsOk() )
-            custColours[i] = wxColourToRGB(m_colourData.GetCustomColour(i));
+        if (m_colourData.m_custColours[i].Ok())
+            custColours[i] = wxColourToRGB(m_colourData.m_custColours[i]);
         else
             custColours[i] = RGB(255,255,255);
     }
@@ -133,45 +128,37 @@ int wxColourDialog::ShowModal()
     chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR);
     if ( m_parent )
         chooseColorStruct.hwndOwner = GetHwndOf(m_parent);
-    chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.GetColour());
+    chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.m_dataColour);
     chooseColorStruct.lpCustColors = custColours;
 
     chooseColorStruct.Flags = CC_RGBINIT | CC_ENABLEHOOK;
     chooseColorStruct.lCustData = (LPARAM)this;
     chooseColorStruct.lpfnHook = wxColourDialogHookProc;
 
-    if ( m_colourData.GetChooseFull() )
+    if (m_colourData.GetChooseFull())
         chooseColorStruct.Flags |= CC_FULLOPEN;
 
-    // do show the modal dialog
-    if ( !::ChooseColor(&chooseColorStruct) )
-    {
-        // 0 error means the dialog was simply cancelled, i.e. no real error
-        // occurred
-        const DWORD err = CommDlgExtendedError();
-        if ( err )
-        {
-            wxLogError(_("Colour selection dialog failed with error %0lx."), err);
-        }
+    // Do the modal dialog
+    bool success = ::ChooseColor(&(chooseColorStruct)) != 0;
 
-        return wxID_CANCEL;
+    // Try to highlight the correct window (the parent)
+    if (GetParent())
+    {
+      HWND hWndParent = (HWND) GetParent()->GetHWND();
+      if (hWndParent)
+        ::BringWindowToTop(hWndParent);
     }
 
 
-    // transfer the values chosen by user back into m_colourData
-    for ( i = 0; i < WXSIZEOF(custColours); i++ )
+    // Restore values
+    for (i = 0; i < 16; i++)
     {
       wxRGBToColour(m_colourData.m_custColours[i], custColours[i]);
     }
 
-    wxRGBToColour(m_colourData.GetColour(), chooseColorStruct.rgbResult);
+    wxRGBToColour(m_colourData.m_dataColour, chooseColorStruct.rgbResult);
 
-    // this doesn't seem to work (contrary to what MSDN implies) on current
-    // Windows versions: CC_FULLOPEN is never set on return if it wasn't
-    // initially set and vice versa
-    //m_colourData.SetChooseFull((chooseColorStruct.Flags & CC_FULLOPEN) != 0);
-
-    return wxID_OK;
+    return success ? wxID_OK : wxID_CANCEL;
 }
 
 // ----------------------------------------------------------------------------
@@ -195,82 +182,43 @@ wxString wxColourDialog::GetTitle() const
 void wxColourDialog::DoGetPosition(int *x, int *y) const
 {
     if ( x )
-        *x = gs_rectDialog.x;
+        *x = m_pos.x;
     if ( y )
-        *y = gs_rectDialog.y;
+        *y = m_pos.y;
 }
 
-void wxColourDialog::DoCentre(int dir)
+void wxColourDialog::DoSetSize(int x, int y,
+                               int WXUNUSED(width), int WXUNUSED(height),
+                               int WXUNUSED(sizeFlags))
 {
-    m_centreDir = dir;
+    if ( x != wxDefaultCoord )
+        m_pos.x = x;
 
-    // it's unnecessary to do anything else at this stage as we'll redo it in
-    // MSWOnInitDone() anyhow
-}
-
-void wxColourDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h))
-{
-    gs_rectDialog.x = x;
-    gs_rectDialog.y = y;
-
-    // our HWND is only set when we're called from MSWOnInitDone(), test if
-    // this is the case
-    HWND hwnd = GetHwnd();
-    if ( hwnd )
-    {
-        // size of the dialog can't be changed because the controls are not
-        // laid out correctly then
-       ::SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
-    }
-    else // just remember that we were requested to move the window
-    {
-        m_movedWindow = true;
-
-        // if Centre() had been called before, it shouldn't be taken into
-        // account now
-        m_centreDir = 0;
-    }
+    if ( y != wxDefaultCoord )
+        m_pos.y = y;
+
+    // ignore the size params - we can't change the size of a standard dialog
+    return;
 }
 
+// NB: of course, both of these functions are completely bogus, but it's better
+//     than nothing
 void wxColourDialog::DoGetSize(int *width, int *height) const
 {
+    // the standard dialog size
     if ( width )
-        *width = gs_rectDialog.width;
+        *width = 225;
     if ( height )
-        *height = gs_rectDialog.height;
+        *height = 324;
 }
 
 void wxColourDialog::DoGetClientSize(int *width, int *height) const
 {
+    // the standard dialog size
     if ( width )
-        *width = gs_rectDialog.width;
+        *width = 219;
     if ( height )
-        *height = gs_rectDialog.height;
-}
-
-void wxColourDialog::MSWOnInitDone(WXHWND hDlg)
-{
-    // set HWND so that our DoMoveWindow() works correctly
-    SetHWND(hDlg);
-
-    if ( m_centreDir )
-    {
-        // now we have the real dialog size, remember it
-        RECT rect;
-        ::GetWindowRect((HWND)hDlg, &rect);
-        gs_rectDialog = wxRectFromRECT(rect);
-
-        // and position the window correctly: notice that we must use the base
-        // class version as our own doesn't do anything except setting flags
-        wxDialog::DoCentre(m_centreDir);
-    }
-    else if ( m_movedWindow ) // need to just move it to the correct place
-    {
-        SetPosition(GetPosition());
-    }
-
-    // we shouldn't destroy hDlg, so disassociate from it
-    SetHWND(NULL);
+        *height = 299;
 }
 
 #endif // wxUSE_COLOURDLG && !(__SMARTPHONE__ && __WXWINCE__)
diff --git a/Source/3rd Party/wx/src/msw/colour.cpp b/Source/3rd Party/wx/src/msw/colour.cpp
index a697cbafe..3ab2b6ecc 100644
--- a/Source/3rd Party/wx/src/msw/colour.cpp	
+++ b/Source/3rd Party/wx/src/msw/colour.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: colour.cpp 41526 2006-09-30 13:29:45Z SC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,6 +26,42 @@
 
 #include <string.h>
 
+#if wxUSE_EXTENDED_RTTI
+
+template<> void wxStringReadValue(const wxString &s , wxColour &data )
+{
+    if ( !data.Set(s) )
+    {
+        wxLogError(_("String To Colour : Incorrect colour specification : %s"),
+            s.c_str() );
+        data = wxNullColour;
+    }
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxColour &data )
+{
+    s = data.GetAsString(wxC2S_HTML_SYNTAX);
+}
+
+wxTO_STRING_IMP( wxColour )
+wxFROM_STRING_IMP( wxColour )
+
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxTO_STRING( wxColour ) , &wxFROM_STRING( wxColour ))
+
+wxBEGIN_PROPERTIES_TABLE(wxColour)
+    wxREADONLY_PROPERTY( Red, unsigned char, Red, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+    wxREADONLY_PROPERTY( Green, unsigned char, Green, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+    wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
+
+wxBEGIN_HANDLERS_TABLE(wxColour)
+wxEND_HANDLERS_TABLE()
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+#endif
+
 // Colour
 
 void wxColour::Init()
@@ -38,6 +74,10 @@ void wxColour::Init()
     m_green = 0;
 }
 
+wxColour::~wxColour()
+{
+}
+
 void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
                         unsigned char a)
 {
diff --git a/Source/3rd Party/wx/src/msw/combo.cpp b/Source/3rd Party/wx/src/msw/combo.cpp
index 22d9d31cc..edb3d5de6 100644
--- a/Source/3rd Party/wx/src/msw/combo.cpp	
+++ b/Source/3rd Party/wx/src/msw/combo.cpp	
@@ -4,7 +4,7 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: combo.cpp 64477 2010-06-03 15:25:41Z JMS $
 // Copyright:   (c) 2005 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,10 +38,20 @@
 #include "wx/combo.h"
 
 #include "wx/msw/registry.h"
+
 #if wxUSE_UXTHEME
 #include "wx/msw/uxtheme.h"
 #endif
-#include "wx/msw/dc.h"
+
+//
+// Define wxUSE_COMBOCTRL_VISTA_RENDERING as 1 to have read-only wxComboCtrl
+// and wxOwnerDrawnComboBox appear much nicer on Win Vista/7. Disabled by
+// default as this may cause some subtle rendering bugs with custom
+// wxComboCtrls.
+//
+#ifndef wxUSE_COMBOCTRL_VISTA_RENDERING
+    #define wxUSE_COMBOCTRL_VISTA_RENDERING 0
+#endif
 
 // Change to #if 1 to include tmschema.h for easier testing of theme
 // parameters.
@@ -113,10 +123,17 @@
 
 #endif
 
+// In wx2.9, this is defined in msw\private.h
+#define wxWinVersion_Vista 0x0600
 
 #define NATIVE_TEXT_INDENT_XP       4
 #define NATIVE_TEXT_INDENT_CLASSIC  2
 
+#define TEXTCTRLXADJUST_XP          1
+#define TEXTCTRLYADJUST_XP          3
+#define TEXTCTRLXADJUST_CLASSIC     1
+#define TEXTCTRLYADJUST_CLASSIC     2
+
 #define COMBOBOX_ANIMATION_RESOLUTION   10
 
 #define COMBOBOX_ANIMATION_DURATION     200  // In milliseconds
@@ -163,10 +180,10 @@ bool wxComboCtrl::Create(wxWindow *parent,
 
     if ( !border )
     {
+        // For XP, have 1-width custom border, for older version use sunken
 #if wxUSE_UXTHEME
         if ( theme )
         {
-            // For XP, have 1-width custom border, for older version use sunken
             border = wxBORDER_NONE;
             m_widthCustomBorder = 1;
         }
@@ -184,33 +201,22 @@ bool wxComboCtrl::Create(wxWindow *parent,
                            pos,
                            size,
                            style | wxFULL_REPAINT_ON_RESIZE,
-                           validator,
+                           wxDefaultValidator,
                            name) )
         return false;
 
-#if wxUSE_UXTHEME
-    if ( theme )
-    {
-        if ( ::wxGetWinVersion() >= wxWinVersion_Vista )
-            m_iFlags |= wxCC_BUTTON_STAYS_DOWN |wxCC_BUTTON_COVERS_BORDER;
-    }
-#endif
-
     if ( style & wxCC_STD_BUTTON )
         m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;
 
-    // Prepare background for double-buffering or better background theme
-    // support, whichever is possible.
-    SetDoubleBuffered(true);
-    if ( !IsDoubleBuffered() )
-        SetBackgroundStyle( wxBG_STYLE_PAINT );
-
     // Create textctrl, if necessary
-    CreateTextCtrl( wxNO_BORDER );
+    CreateTextCtrl( wxNO_BORDER, validator );
 
     // Add keyboard input handlers for main control and textctrl
     InstallInputHandlers();
 
+    // Prepare background for double-buffering
+    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
+
     // SetInitialSize should be called last
     SetInitialSize(size);
 
@@ -221,18 +227,81 @@ wxComboCtrl::~wxComboCtrl()
 {
 }
 
+void wxComboCtrl::OnThemeChange()
+{
+    // there doesn't seem to be any way to get the text colour using themes
+    // API: TMT_TEXTCOLOR doesn't work neither for EDIT nor COMBOBOX
+    if ( !m_hasFgCol )
+    {
+        wxColour fgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+        SetForegroundColour(fgCol);
+        m_hasFgCol = false;
+    }
+
+    wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+
+#if wxUSE_UXTHEME
+    wxUxThemeEngine * const theme = wxUxThemeEngine::GetIfActive();
+    if ( theme )
+    {
+        // NB: use EDIT, not COMBOBOX (the latter works in XP but not Vista)
+        wxUxThemeHandle hTheme(this, L"EDIT");
+        COLORREF col;
+        HRESULT hr = theme->GetThemeColor
+                            (
+                                hTheme,
+                                EP_EDITTEXT,
+                                ETS_NORMAL,
+                                TMT_FILLCOLOR,
+                                &col
+                            );
+        if ( SUCCEEDED(hr) )
+        {
+            bgCol = wxRGBToColour(col);
+        }
+        else
+        {
+            wxLogApiError(_T("GetThemeColor(EDIT, ETS_NORMAL, TMT_FILLCOLOR)"),
+                          hr);
+        }
+    }
+#endif
+
+    if ( !m_hasBgCol )
+    {
+        SetBackgroundColour(bgCol);
+        m_hasBgCol = false;
+    }
+}
+
 void wxComboCtrl::OnResize()
 {
     //
     // Recalculates button and textctrl areas
 
+    int textCtrlXAdjust;
+    int textCtrlYAdjust;
+
+#if wxUSE_UXTHEME
+    if ( wxUxThemeEngine::GetIfActive() )
+    {
+        textCtrlXAdjust = TEXTCTRLXADJUST_XP;
+        textCtrlYAdjust = TEXTCTRLYADJUST_XP;
+    }
+    else
+#endif
+    {
+        textCtrlXAdjust = TEXTCTRLXADJUST_CLASSIC;
+        textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC;
+    }
+
     // Technically Classic Windows style combo has more narrow button,
     // but the native renderer doesn't paint it well like that.
     int btnWidth = 17;
     CalculateAreas(btnWidth);
 
     // Position textctrl using standard routine
-    PositionTextCtrl();
+    PositionTextCtrl(textCtrlXAdjust,textCtrlYAdjust);
 }
 
 // Draws non-XP GUI dotted line around the focus area
@@ -255,7 +324,7 @@ static void wxMSWDrawFocusRect( wxDC& dc, const wxRect& rect )
     //   it employs wxCAP_BUTT hack to have line of width 1.
     dc.SetLogicalFunction(wxINVERT);
 
-    wxPen pen(*wxBLACK, 1, wxPENSTYLE_DOT);
+    wxPen pen(*wxBLACK,1,wxDOT);
     pen.SetCap(wxCAP_BUTT);
     dc.SetPen(pen);
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
@@ -294,7 +363,7 @@ wxComboCtrl::PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const
     if ( !(flags & wxCONTROL_ISSUBMENU) )
     {
         // Drawing control
-        isEnabled = IsThisEnabled();
+        isEnabled = IsEnabled();
         doDrawFocusRect = ShouldDrawFocus();
 
 #if wxUSE_UXTHEME
@@ -420,26 +489,19 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 {
     // TODO: Convert drawing in this function to Windows API Code
 
+    // TODO: Convert drawing in this function to Windows API Code
+
     wxSize sz = GetClientSize();
-    wxDC* dcPtr = wxAutoBufferedPaintDCFactory(this);
-    wxDC& dc = *dcPtr;
+    wxAutoBufferedPaintDC dc(this);
 
     const wxRect& rectButton = m_btnArea;
     wxRect rectTextField = m_tcArea;
-
-    // FIXME: Either SetBackgroundColour or GetBackgroundColour
-    //        doesn't work under Vista, so here's a temporary
-    //        workaround.
-    //        In the theme-less rendering code below, this fixes incorrect
-    //        background on read-only comboboxes (they are gray, but should be
-    //        white).
-    wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+    wxColour bgCol = GetBackgroundColour();
 
 #if wxUSE_UXTHEME
-    const bool isEnabled = IsThisEnabled();
+    const bool isEnabled = IsEnabled();
 
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
-    HDC hDc = GetHdcOf(*impl);
+    HDC hDc = GetHdcOf(dc);
     HWND hWnd = GetHwndOf(this);
 
     wxUxThemeEngine* theme = NULL;
@@ -462,7 +524,11 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
 #if wxUSE_UXTHEME
     if ( hTheme )
     {
+  #if wxUSE_COMBOCTRL_VISTA_RENDERING
         const bool useVistaComboBox = ::wxGetWinVersion() >= wxWinVersion_Vista;
+  #else
+        const bool useVistaComboBox = false;
+  #endif
 
         RECT rFull;
         wxCopyRectToRECT(borderRect, rFull);
@@ -503,12 +569,22 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         int comboBoxPart = 0;  // For XP, use the 'default' part
         RECT* rUseForBg = &rBorder;
 
-        bool drawFullButton = false;
         int bgState = butState;
-        const bool isFocused = (FindFocus() == GetMainWindowOfCompositeControl()) ? true : false;
+
+  #if wxUSE_COMBOCTRL_VISTA_RENDERING
+        bool drawFullButton = false;
 
         if ( useVistaComboBox )
         {
+            const bool isFocused =
+                (FindFocus() == GetMainWindowOfCompositeControl()) ?
+                    true : false;
+
+            // FIXME: Either SetBackgroundColour or GetBackgroundColour
+            //        doesn't work under Vista, so here's a temporary
+            //        workaround.
+            bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+
             // Draw the entire control as a single button?
             if ( !isNonStdButton )
             {
@@ -535,6 +611,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
                     bgState = CBB_NORMAL;
             }
         }
+  #endif
 
         //
         // Draw parent's background, if necessary
@@ -567,10 +644,11 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         // Draw the drop-button
         if ( !isNonStdButton )
         {
-            drawButFlags = Button_BitmapOnly;
+            drawButFlags = Draw_BitmapOnly;
 
             int butPart = CP_DROPDOWNBUTTON;
 
+  #if wxUSE_COMBOCTRL_VISTA_RENDERING
             if ( useVistaComboBox )
             {
                 if ( drawFullButton )
@@ -588,6 +666,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
                     butPart = CP_DROPDOWNBUTTONLEFT;
 
             }
+  #endif
             theme->DrawThemeBackground( hTheme, hDc, butPart, butState, &rButton, NULL );
         }
         else if ( useVistaComboBox &&
@@ -595,14 +674,14 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         {
             // We'll do this, because DrawThemeParentBackground
             // doesn't seem to be reliable on Vista.
-            drawButFlags |= Button_PaintBackground;
+            drawButFlags |= Draw_PaintBg;
         }
     }
     else
 #endif
     {
         // Windows 2000 and earlier
-        drawButFlags = Button_PaintBackground;
+        drawButFlags = Draw_PaintBg;
 
         dc.SetBrush(bgCol);
         dc.SetPen(bgCol);
@@ -630,8 +709,6 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         else
             wxComboPopup::DefaultPaintComboControl(this,dc,rectTextField);
     }
-
-    delete dcPtr;
 }
 
 void wxComboCtrl::OnMouseEvent( wxMouseEvent& event )
@@ -718,7 +795,7 @@ static wxUint32 GetUserPreferencesMask()
 #endif
 
 #if wxUSE_COMBOCTRL_POPUP_ANIMATION
-void wxComboCtrl::DoTimerEvent()
+void wxComboCtrl::OnTimerEvent( wxTimerEvent& WXUNUSED(event) )
 {
     bool stopTimer = false;
 
@@ -792,7 +869,7 @@ bool wxComboCtrl::AnimateShow( const wxRect& rect, int flags )
         m_animTimer.SetOwner( this, wxID_ANY );
         m_animTimer.Start( COMBOBOX_ANIMATION_RESOLUTION, wxTIMER_CONTINUOUS );
 
-        DoTimerEvent();
+        OnTimerEvent(*((wxTimerEvent*)NULL));  // Event is never used, so we can give NULL
 
         return false;
     }
@@ -831,8 +908,7 @@ bool wxComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
         case WXK_UP:
         case WXK_NUMPAD_DOWN:
         case WXK_NUMPAD_UP:
-            // Arrow keys (and mouse wheel) toggle the popup in the native
-            // combo boxes
+            // Alt plus arrow key toggles the popup in the native combo box
             if ( event.AltDown() )
                 return true;
             break;
diff --git a/Source/3rd Party/wx/src/msw/combobox.cpp b/Source/3rd Party/wx/src/msw/combobox.cpp
index e357bd207..f07ad8a3d 100644
--- a/Source/3rd Party/wx/src/msw/combobox.cpp	
+++ b/Source/3rd Party/wx/src/msw/combobox.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: combobox.cpp 49562 2007-10-31 18:55:58Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,14 +39,8 @@
 #endif
 
 #include "wx/clipbrd.h"
-#include "wx/dynlib.h"
-#include "wx/wupdlock.h"
 #include "wx/msw/private.h"
 
-#if wxUSE_UXTHEME
-    #include "wx/msw/uxtheme.h"
-#endif
-
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
@@ -55,6 +49,69 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxComboBoxStyle )
+
+wxBEGIN_FLAGS( wxComboBoxStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxCB_SIMPLE)
+    wxFLAGS_MEMBER(wxCB_SORT)
+    wxFLAGS_MEMBER(wxCB_READONLY)
+    wxFLAGS_MEMBER(wxCB_DROPDOWN)
+
+wxEND_FLAGS( wxComboBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl,"wx/combobox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxComboBox)
+    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_COMBOBOX_SELECTED , wxCommandEvent )
+    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
+
+    // TODO DELEGATES
+    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Value ,wxString, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxComboBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxComboBox)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
+
+#else
+
+IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
+
+#endif
+
 BEGIN_EVENT_TABLE(wxComboBox, wxControl)
     EVT_MENU(wxID_CUT, wxComboBox::OnCut)
     EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
@@ -93,36 +150,6 @@ static WNDPROC gs_wndprocEdit = (WNDPROC)NULL;
 // implementation
 // ============================================================================
 
-namespace
-{
-
-// Check if the given message should be forwarded from the edit control which
-// is part of the combobox to wxComboBox itself. All messages generating the
-// events that the code using wxComboBox could be interested in must be
-// forwarded.
-bool ShouldForwardFromEditToCombo(UINT message)
-{
-    switch ( message )
-    {
-        case WM_KEYUP:
-        case WM_KEYDOWN:
-        case WM_CHAR:
-        case WM_SYSCHAR:
-        case WM_SYSKEYDOWN:
-        case WM_SYSKEYUP:
-        case WM_SETFOCUS:
-        case WM_KILLFOCUS:
-        case WM_CUT:
-        case WM_COPY:
-        case WM_PASTE:
-            return true;
-    }
-
-    return false;
-}
-
-} // anonymous namespace
-
 // ----------------------------------------------------------------------------
 // wnd proc for subclassed edit control
 // ----------------------------------------------------------------------------
@@ -135,34 +162,56 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
     HWND hwndCombo = ::GetParent(hWnd);
     wxWindow *win = wxFindWinFromHandle((WXHWND)hwndCombo);
 
-    if ( ShouldForwardFromEditToCombo(message) )
+    switch ( message )
     {
-        wxComboBox *combo = wxDynamicCast(win, wxComboBox);
-        if ( !combo )
-        {
-            // we can get WM_KILLFOCUS while our parent is already half
-            // destroyed and hence doesn't look like a combobx any
-            // longer, check for it to avoid bogus assert failures
-            if ( !win->IsBeingDeleted() )
+        // forward some messages to the combobox to generate the appropriate
+        // wxEvents from them
+        case WM_KEYUP:
+        case WM_KEYDOWN:
+        case WM_CHAR:
+        case WM_SYSCHAR:
+        case WM_SYSKEYDOWN:
+        case WM_SYSKEYUP:
+        case WM_SETFOCUS:
+        case WM_KILLFOCUS:
             {
-                wxFAIL_MSG( wxT("should have combo as parent") );
+                wxComboBox *combo = wxDynamicCast(win, wxComboBox);
+                if ( !combo )
+                {
+                    // we can get WM_KILLFOCUS while our parent is already half
+                    // destroyed and hence doesn't look like a combobx any
+                    // longer, check for it to avoid bogus assert failures
+                    if ( !win->IsBeingDeleted() )
+                    {
+                        wxFAIL_MSG( _T("should have combo as parent") );
+                    }
+                }
+                else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
+                {
+                    // handled by parent
+                    return 0;
+                }
             }
-        }
-        else if ( combo->MSWProcessEditMsg(message, wParam, lParam) )
-        {
-            // handled by parent
-            return 0;
-        }
-    }
-    else if ( message == WM_GETDLGCODE )
-    {
-        wxCHECK_MSG( win, 0, wxT("should have a parent") );
+            break;
 
-        if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
-        {
-            // need to return a custom dlg code or we'll never get it
-            return DLGC_WANTMESSAGE;
-        }
+        case WM_GETDLGCODE:
+            {
+                wxCHECK_MSG( win, 0, _T("should have a parent") );
+
+                if ( win->GetWindowStyle() & wxTE_PROCESS_ENTER )
+                {
+                    // need to return a custom dlg code or we'll never get it
+                    return DLGC_WANTMESSAGE;
+                }
+            }
+            break;
+
+        case WM_CUT:
+        case WM_COPY:
+        case WM_PASTE:
+            if( win->HandleClipboardEvent( message ) )
+                return 0;
+            break;
     }
 
     return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
@@ -186,28 +235,10 @@ WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
             {
                 // combobox selection sometimes spontaneously changes when its
                 // size changes, restore it to the old value if necessary
-                if ( !GetEditHWNDIfAvailable() )
-                    break;
-
                 long fromOld, toOld;
                 GetSelection(&fromOld, &toOld);
-
-                // if an editable combobox has a not empty text not from the
-                // list, it tries to autocomplete it from the list when it is
-                // resized, but we don't want this to happen as it doesn't seem
-                // to make any sense, so we forcefully restore the old text
-                wxString textOld;
-                if ( !HasFlag(wxCB_READONLY) && GetCurrentSelection() == -1 )
-                    textOld = GetValue();
-
-                // eliminate flickering during following hacks
-                wxWindowUpdateLocker lock(this);
-
                 WXLRESULT result = wxChoice::MSWWindowProc(nMsg, wParam, lParam);
 
-                if ( !textOld.empty() && GetValue() != textOld )
-                    SetLabel(textOld);
-
                 long fromNew, toNew;
                 GetSelection(&fromNew, &toNew);
 
@@ -250,16 +281,24 @@ bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam)
                     return true;
                 }
             }
-            // fall through, WM_CHAR is one of the message we should forward.
+            // fall through
 
-        default:
-            if ( ShouldForwardFromEditToCombo(msg) )
-            {
-                // For all the messages forward from the edit control the
-                // result is not used.
-                WXLRESULT result;
-                return MSWHandleMessage(&result, msg, wParam, lParam);
-            }
+        case WM_SYSCHAR:
+            return HandleChar(wParam, lParam, true /* isASCII */);
+
+        case WM_SYSKEYDOWN:
+        case WM_KEYDOWN:
+            return HandleKeyDown(wParam, lParam);
+
+        case WM_SYSKEYUP:
+        case WM_KEYUP:
+            return HandleKeyUp(wParam, lParam);
+
+        case WM_SETFOCUS:
+            return HandleSetFocus((WXHWND)wParam);
+
+        case WM_KILLFOCUS:
+            return HandleKillFocus((WXHWND)wParam);
     }
 
     return false;
@@ -272,29 +311,6 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
 
     switch ( param )
     {
-        case CBN_DROPDOWN:
-            // remember the last selection, just as wxChoice does
-            m_lastAcceptedSelection = GetCurrentSelection();
-            if ( m_lastAcceptedSelection == -1 )
-            {
-                // but unlike with wxChoice we may have no selection but still
-                // have some text and we should avoid erasing it if the drop
-                // down is cancelled (see #8474)
-                m_lastAcceptedSelection = wxID_NONE;
-            }
-            {
-                wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_DROPDOWN, GetId());
-                event.SetEventObject(this);
-                ProcessCommand(event);
-            }
-            break;
-        case CBN_CLOSEUP:
-            {
-                wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_CLOSEUP, GetId());
-                event.SetEventObject(this);
-                ProcessCommand(event);
-            }
-            break;
         case CBN_SELENDOK:
 #ifndef __SMARTPHONE__
             // we need to reset this to prevent the selection from being undone
@@ -310,7 +326,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
             // this string is going to become the new combobox value soon but
             // we need it to be done right now, otherwise the event handler
             // could get a wrong value when it calls our GetValue()
-            ::SetWindowText(GetHwnd(), value.t_str());
+            ::SetWindowText(GetHwnd(), value);
 
             {
                 wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, GetId());
@@ -326,7 +342,6 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
             // logical as the text does change)
 
         case CBN_EDITCHANGE:
-            if ( m_allowTextEvents )
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
 
@@ -348,7 +363,7 @@ bool wxComboBox::MSWCommand(WXUINT param, WXWORD id)
     }
 
     // skip wxChoice version as it would generate its own events for
-    // CBN_SELENDOK and also interfere with our handling of CBN_DROPDOWN
+    // CBN_SELENDOK
     return true;
 }
 
@@ -376,64 +391,22 @@ bool wxComboBox::MSWShouldPreProcessMessage(WXMSG *pMsg)
     return wxChoice::MSWShouldPreProcessMessage(pMsg);
 }
 
-WXHWND wxComboBox::GetEditHWNDIfAvailable() const
-{
-#if wxUSE_DYNLIB_CLASS
-#if defined(WINVER) && WINVER >= 0x0500
-    typedef BOOL (WINAPI *GetComboBoxInfo_t)(HWND, COMBOBOXINFO*);
-    static GetComboBoxInfo_t s_pfnGetComboBoxInfo = NULL;
-    static bool s_triedToLoad = false;
-    if ( !s_triedToLoad )
-    {
-        s_triedToLoad = true;
-        wxLoadedDLL dllUser32("user32.dll");
-        wxDL_INIT_FUNC(s_pfn, GetComboBoxInfo, dllUser32);
-    }
-
-    if ( s_pfnGetComboBoxInfo )
-    {
-        WinStruct<COMBOBOXINFO> info;
-        (*s_pfnGetComboBoxInfo)(GetHwnd(), &info);
-        return info.hwndItem;
-    }
-#endif // WINVER >= 0x0500
-#endif // wxUSE_DYNLIB_CLASS
-
-    if (HasFlag(wxCB_SIMPLE))
-    {
-        POINT pt;
-        pt.x = pt.y = 4;
-        return (WXHWND) ::ChildWindowFromPoint(GetHwnd(), pt);
-    }
-
-    // notice that a slightly safer alternative could be to use FindWindowEx()
-    // but it's not available under WinCE so just take the first child for now
-    // to keep one version of the code for all platforms and fix it later if
-    // problems are discovered
-
-    // we assume that the only child of the combobox is the edit window
-    return (WXHWND)::GetWindow(GetHwnd(), GW_CHILD);
-}
-
 WXHWND wxComboBox::GetEditHWND() const
 {
     // this function should not be called for wxCB_READONLY controls, it is
-    // the callers responsibility to check this
-    wxASSERT_MSG( !HasFlag(wxCB_READONLY),
-                  wxT("read-only combobox doesn't have any edit control") );
+    // the callers responsability to check this
+    wxASSERT_MSG( !(GetWindowStyle() & wxCB_READONLY),
+                  _T("read-only combobox doesn't have any edit control") );
 
-    WXHWND hWndEdit = GetEditHWNDIfAvailable();
-    wxASSERT_MSG( hWndEdit, wxT("combobox without edit control?") );
+    POINT pt;
+    pt.x = pt.y = 4;
+    HWND hwndEdit = ::ChildWindowFromPoint(GetHwnd(), pt);
+    if ( !hwndEdit || hwndEdit == GetHwnd() )
+    {
+        wxFAIL_MSG(_T("not read only combobox without edit control?"));
+    }
 
-    return hWndEdit;
-}
-
-wxWindow *wxComboBox::GetEditableWindow()
-{
-    wxASSERT_MSG( !HasFlag(wxCB_READONLY),
-                  wxT("read-only combobox doesn't have any edit control") );
-
-    return this;
+    return (WXHWND)hwndEdit;
 }
 
 // ----------------------------------------------------------------------------
@@ -531,8 +504,7 @@ WXDWORD wxComboBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxString wxComboBox::GetValue() const
 {
-    return HasFlag(wxCB_READONLY) ? GetStringSelection()
-                                  : wxTextEntry::GetValue();
+    return wxGetWindowText(m_hWnd);
 }
 
 void wxComboBox::SetValue(const wxString& value)
@@ -540,34 +512,220 @@ void wxComboBox::SetValue(const wxString& value)
     if ( HasFlag(wxCB_READONLY) )
         SetStringSelection(value);
     else
-        wxTextEntry::SetValue(value);
+        SetWindowText(GetHwnd(), value.c_str());
 }
 
-void wxComboBox::Clear()
+// Clipboard operations
+void wxComboBox::Copy()
 {
-    wxChoice::Clear();
-    if ( !HasFlag(wxCB_READONLY) )
-        wxTextEntry::Clear();
+    SendMessage(GetHwnd(), WM_COPY, 0, 0L);
 }
 
-void wxComboBox::GetSelection(long *from, long *to) const
+void wxComboBox::Cut()
 {
-    if ( !HasFlag(wxCB_READONLY) )
+    SendMessage(GetHwnd(), WM_CUT, 0, 0L);
+}
+
+void wxComboBox::Paste()
+{
+    SendMessage(GetHwnd(), WM_PASTE, 0, 0L);
+}
+
+void wxComboBox::Undo()
+{
+    if (CanUndo())
     {
-        wxTextEntry::GetSelection(from, to);
+        HWND hEditWnd = (HWND) GetEditHWND();
+        if ( hEditWnd )
+            ::SendMessage(hEditWnd, EM_UNDO, 0, 0);
     }
-    else // text selection doesn't make sense for read only comboboxes
+}
+
+void wxComboBox::Redo()
+{
+    if (CanUndo())
     {
-        if ( from )
-            *from = -1;
-        if ( to )
-            *to = -1;
+        // Same as Undo, since Undo undoes the undo, i.e. a redo.
+        HWND hEditWnd = (HWND) GetEditHWND();
+        if ( hEditWnd )
+            ::SendMessage(hEditWnd, EM_UNDO, 0, 0);
     }
 }
 
+void wxComboBox::SelectAll()
+{
+    SetSelection(0, GetLastPosition());
+}
+
+bool wxComboBox::CanUndo() const
+{
+    if (!IsEditable())
+        return false;
+
+    HWND hEditWnd = (HWND) GetEditHWND();
+    if ( hEditWnd )
+        return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
+    else
+        return false;
+}
+
+bool wxComboBox::CanRedo() const
+{
+    if (!IsEditable())
+        return false;
+
+    HWND hEditWnd = (HWND) GetEditHWND();
+    if ( hEditWnd )
+        return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
+    else
+        return false;
+}
+
+bool wxComboBox::HasSelection() const
+{
+    long from, to;
+    GetSelection(&from, &to);
+    return from != to;
+}
+
+bool wxComboBox::CanCopy() const
+{
+    // Can copy if there's a selection
+    return HasSelection();
+}
+
+bool wxComboBox::CanCut() const
+{
+    return IsEditable() && CanCopy();
+}
+
+bool wxComboBox::CanPaste() const
+{
+    if ( !IsEditable() )
+        return false;
+
+    // Standard edit control: check for straight text on clipboard
+    if ( !::OpenClipboard(GetHwndOf(wxTheApp->GetTopWindow())) )
+        return false;
+
+    bool isTextAvailable = ::IsClipboardFormatAvailable(CF_TEXT) != 0;
+    ::CloseClipboard();
+
+    return isTextAvailable;
+}
+
 bool wxComboBox::IsEditable() const
 {
-    return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable();
+    return !HasFlag(wxCB_READONLY);
+}
+
+void wxComboBox::SetEditable(bool editable)
+{
+    HWND hWnd = (HWND)GetEditHWND();
+    if ( !::SendMessage(hWnd, EM_SETREADONLY, !editable, 0) )
+    {
+        wxLogLastError(_T("SendMessage(EM_SETREADONLY)"));
+    }
+}
+
+void wxComboBox::SetInsertionPoint(long pos)
+{
+    if ( GetWindowStyle() & wxCB_READONLY )
+        return;
+
+    HWND hWnd = GetHwnd();
+    ::SendMessage(hWnd, CB_SETEDITSEL, 0, MAKELPARAM(pos, pos));
+    HWND hEditWnd = (HWND) GetEditHWND();
+    if ( hEditWnd )
+    {
+        // Scroll insertion point into view
+        SendMessage(hEditWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
+    }
+}
+
+void wxComboBox::SetInsertionPointEnd()
+{
+    // setting insertion point doesn't make sense for read only comboboxes
+    if ( !(GetWindowStyle() & wxCB_READONLY) )
+    {
+        wxTextPos pos = GetLastPosition();
+        SetInsertionPoint(pos);
+    }
+}
+
+long wxComboBox::GetInsertionPoint() const
+{
+    // CB_GETEDITSEL returns the index of the first character of the selection in
+    // its low-order word
+    DWORD pos= (DWORD)::SendMessage(GetHwnd(), CB_GETEDITSEL, 0, 0L);
+    return LOWORD(pos);
+}
+
+wxTextPos wxComboBox::GetLastPosition() const
+{
+    HWND hEditWnd = (HWND) GetEditHWND();
+
+    // Get number of characters in the last (only) line. We'll add this to the character
+    // index for the last line, 1st position.
+    wxTextPos lineLength = (wxTextPos)SendMessage(hEditWnd, EM_LINELENGTH, (WPARAM) 0, (LPARAM)0L);
+
+    return lineLength;
+}
+
+void wxComboBox::Replace(long from, long to, const wxString& value)
+{
+#if wxUSE_CLIPBOARD
+    Remove(from, to);
+
+    // Now replace with 'value', by pasting.
+    wxSetClipboardData(wxDF_TEXT, (wxObject *)(const wxChar *)value, 0, 0);
+
+    // Paste into edit control
+    SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);
+#else
+    wxUnusedVar(from);
+    wxUnusedVar(to);
+    wxUnusedVar(value);
+#endif
+}
+
+void wxComboBox::Remove(long from, long to)
+{
+    // Set selection and remove it
+    SetSelection(from, to);
+    SendMessage(GetHwnd(), WM_CUT, (WPARAM)0, (LPARAM)0);
+}
+
+void wxComboBox::SetSelection(long from, long to)
+{
+    // if from and to are both -1, it means (in wxWidgets) that all text should
+    // be selected, translate this into Windows convention
+    if ( (from == -1) && (to == -1) )
+    {
+        from = 0;
+    }
+
+    if ( SendMessage(GetHwnd(), CB_SETEDITSEL,
+                     0, (LPARAM)MAKELONG(from, to)) == CB_ERR )
+    {
+        wxLogDebug(_T("CB_SETEDITSEL failed"));
+    }
+}
+
+void wxComboBox::GetSelection(long* from, long* to) const
+{
+    DWORD dwStart, dwEnd;
+    if ( ::SendMessage(GetHwnd(), CB_GETEDITSEL,
+                       (WPARAM)&dwStart, (LPARAM)&dwEnd) == CB_ERR )
+    {
+        *from =
+        *to = 0;
+    }
+    else
+    {
+        *from = dwStart;
+        *to = dwEnd;
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -601,12 +759,15 @@ void wxComboBox::OnRedo(wxCommandEvent& WXUNUSED(event))
 
 void wxComboBox::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
-    RemoveSelection();
+    long from, to;
+    GetSelection(& from, & to);
+    if (from != -1 && to != -1)
+        Remove(from, to);
 }
 
 void wxComboBox::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {
-    SelectAll();
+    SetSelection(-1, -1);
 }
 
 void wxComboBox::OnUpdateCut(wxUpdateUIEvent& event)
@@ -626,12 +787,12 @@ void wxComboBox::OnUpdatePaste(wxUpdateUIEvent& event)
 
 void wxComboBox::OnUpdateUndo(wxUpdateUIEvent& event)
 {
-    event.Enable( IsEditable() && CanUndo() );
+    event.Enable( CanUndo() );
 }
 
 void wxComboBox::OnUpdateRedo(wxUpdateUIEvent& event)
 {
-    event.Enable( IsEditable() && CanRedo() );
+    event.Enable( CanRedo() );
 }
 
 void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
@@ -641,37 +802,7 @@ void wxComboBox::OnUpdateDelete(wxUpdateUIEvent& event)
 
 void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event)
 {
-    event.Enable(IsEditable() && !wxTextEntry::IsEmpty());
+    event.Enable(IsEditable() && GetLastPosition() > 0);
 }
 
-#if wxUSE_TOOLTIPS
-
-void wxComboBox::DoSetToolTip(wxToolTip *tip)
-{
-    wxChoice::DoSetToolTip(tip);
-
-    if ( tip && !HasFlag(wxCB_READONLY) )
-        tip->AddOtherWindow(GetEditHWND());
-}
-
-#endif // wxUSE_TOOLTIPS
-
-#if wxUSE_UXTHEME
-
-bool wxComboBox::SetHint(const wxString& hintOrig)
-{
-    wxString hint(hintOrig);
-    if ( wxUxThemeEngine::GetIfActive() )
-    {
-        // under XP (but not Vista) there is a bug in cue banners
-        // implementation for combobox edit control: the first character is
-        // partially chopped off, so prepend a space to make it fully visible
-        hint.insert(0, " ");
-    }
-
-    return wxTextEntry::SetHint(hint);
-}
-
-#endif // wxUSE_UXTHEME
-
 #endif // wxUSE_COMBOBOX
diff --git a/Source/3rd Party/wx/src/msw/control.cpp b/Source/3rd Party/wx/src/msw/control.cpp
index 2612ffeb5..7e0d0a62a 100644
--- a/Source/3rd Party/wx/src/msw/control.cpp	
+++ b/Source/3rd Party/wx/src/msw/control.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: control.cpp 54424 2008-06-29 21:46:29Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -35,7 +35,6 @@
     #include "wx/dcclient.h"
     #include "wx/log.h"
     #include "wx/settings.h"
-    #include "wx/ctrlsub.h"
 #endif
 
 #if wxUSE_LISTCTRL
@@ -59,6 +58,15 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 // wxControl implementation
 // ============================================================================
 
+// ----------------------------------------------------------------------------
+// wxControl ctor/dtor
+// ----------------------------------------------------------------------------
+
+wxControl::~wxControl()
+{
+    m_isBeingDeleted = true;
+}
+
 // ----------------------------------------------------------------------------
 // control window creation
 // ----------------------------------------------------------------------------
@@ -132,22 +140,24 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                        (
                         exstyle,            // extended style
                         classname,          // the kind of control to create
-                        label.t_str(),      // the window name
+                        label,              // the window name
                         style,              // the window style
                         x, y, w, h,         // the window position and size
-                        GetHwndOf(GetParent()),         // parent
-                        (HMENU)wxUIntToPtr(GetId()),    // child id
+                        GetHwndOf(GetParent()),  // parent
+                        (HMENU)GetId(),     // child id
                         wxGetInstance(),    // app instance
                         NULL                // creation parameters
                        );
 
     if ( !m_hWnd )
     {
-        wxLogLastError(wxString::Format
-                       (
-                        wxT("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
-                        classname, style, exstyle
-                       ));
+#ifdef __WXDEBUG__
+        wxFAIL_MSG(wxString::Format
+                   (
+                    _T("CreateWindowEx(\"%s\", flags=%08x, ex=%08x) failed"),
+                    classname, (unsigned int)style, (unsigned int)exstyle
+                   ));
+#endif // __WXDEBUG__
 
         return false;
     }
@@ -163,13 +173,9 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     // Notice that 0xffff is not a valid Unicode character so the problem
     // doesn't arise in Unicode build.
     if ( !label.empty() && label[0] == -1 )
-        ::SetWindowText(GetHwnd(), label.t_str());
+        ::SetWindowText(GetHwnd(), label.c_str());
 #endif // !wxUSE_UNICODE
 
-    // saving the label in m_labelOrig to return it verbatim
-    // later in GetLabel()
-    m_labelOrig = label;
-
     // install wxWidgets window proc for this window
     SubclassWin(m_hWnd);
 
@@ -229,11 +235,23 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
 // various accessors
 // ----------------------------------------------------------------------------
 
+wxBorder wxControl::GetDefaultBorder() const
+{
+    // we want to automatically give controls a sunken style (confusingly,
+    // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE
+    // which is not sunken at all under Windows XP -- rather, just the default)
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+    return wxBORDER_SIMPLE;
+#else
+    return wxBORDER_SUNKEN;
+#endif
+}
+
 WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxWindow::MSWGetStyle(style, exstyle);
 
-    if ( AcceptsFocusFromKeyboard() )
+    if ( AcceptsFocus() )
     {
         msStyle |= WS_TABSTOP;
     }
@@ -243,17 +261,9 @@ WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxControl::DoGetBestSize() const
 {
-    if (m_windowSizer)
-       return wxControlBase::DoGetBestSize();
-
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
-wxBorder wxControl::GetDefaultBorder() const
-{
-    return wxControlBase::GetDefaultBorder();
-}
-
 // This is a helper for all wxControls made with UPDOWN native control.
 // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in
 // WinCE of Smartphones this happens also for native wxTextCtrl,
@@ -303,13 +313,25 @@ wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
     return attrs;
 }
 
+// another version for the "composite", i.e. non simple controls
+/* static */ wxVisualAttributes
+wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    wxVisualAttributes attrs;
+    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+
+    return attrs;
+}
+
 // ----------------------------------------------------------------------------
 // message handling
 // ----------------------------------------------------------------------------
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxControl::MSWOnNotify(int idCtrl,
@@ -357,18 +379,21 @@ bool wxControl::MSWOnNotify(int idCtrl,
     event.SetEventType(eventType);
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
 {
     HDC hdc = (HDC)pDC;
+    if ( m_hasFgCol )
+    {
+        ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+    }
 
     WXHBRUSH hbr = 0;
-    if ( !colBg.IsOk() )
+    if ( !colBg.Ok() )
     {
-        if ( wxWindow *win = wxFindWinFromHandle(hWnd) )
-            hbr = win->MSWGetBgBrush(pDC);
+        hbr = MSWGetBgBrush(pDC, hWnd);
 
         // if the control doesn't have any bg colour, foreground colour will be
         // ignored as the return value would be 0 -- so forcefully give it a
@@ -377,47 +402,38 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
             colBg = GetBackgroundColour();
     }
 
-    // use the background colour override if a valid colour is given: this is
-    // used when the control is disabled to grey it out and also if colBg was
-    // set just above
-    if ( colBg.IsOk() )
+    // use the background colour override if a valid colour is given
+    if ( colBg.Ok() )
     {
-        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg);
-        hbr = (WXHBRUSH)brush->GetResourceHandle();
-    }
-
-    // always set the foreground colour if we changed the background, whether
-    // m_hasFgCol is true or not: if it true, we must do it, of course, but
-    // even if it isn't, we must set the default foreground explicitly as by
-    // default just the simple black is used
-    if ( hbr )
-    {
-        ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
-    }
-
-    // finally also set the background colour for text drawing: without this,
-    // the text in an edit control is drawn using the default background even
-    // if we return a valid brush
-    if ( colBg.IsOk() || m_hasBgCol )
-    {
-        if ( !colBg.IsOk() )
-            colBg = GetBackgroundColour();
-
         ::SetBkColor(hdc, wxColourToRGB(colBg));
+
+        // draw children with the same colour as the parent
+        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
+
+        hbr = (WXHBRUSH)brush->GetResourceHandle();
+
     }
 
+    // if we use custom background, we should set foreground ourselves too
+    if ( hbr && !m_hasFgCol )
+    {
+        ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT));
+    }
+    //else: already set above
+
     return hbr;
 }
 
 WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd)
 {
+    wxColour colBg;
+
     if ( HasTransparentBackground() )
         ::SetBkMode((HDC)pDC, TRANSPARENT);
+    else // if the control is opaque it shouldn't use the parents background
+        colBg = GetBackgroundColour();
 
-    // don't pass any background colour to DoMSWControlColor(), our own
-    // background colour will be used by it only if it is set, otherwise the
-    // defaults will be used
-    return DoMSWControlColor(pDC, wxColour(), hWnd);
+    return DoMSWControlColor(pDC, colBg, hWnd);
 }
 
 WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
@@ -427,42 +443,6 @@ WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC)
                              GetHWND());
 }
 
-// ----------------------------------------------------------------------------
-// wxControlWithItems
-// ----------------------------------------------------------------------------
-
-void wxControlWithItems::MSWAllocStorage(const wxArrayStringsAdapter& items,
-                                         unsigned wm)
-{
-    const unsigned numItems = items.GetCount();
-    unsigned long totalTextLength = numItems; // for trailing '\0' characters
-    for ( unsigned i = 0; i < numItems; ++i )
-    {
-        totalTextLength += items[i].length();
-    }
-
-    if ( SendMessage((HWND)MSWGetItemsHWND(), wm, numItems,
-                     (LPARAM)totalTextLength*sizeof(wxChar)) == LB_ERRSPACE )
-    {
-        wxLogLastError(wxT("SendMessage(XX_INITSTORAGE)"));
-    }
-}
-
-int wxControlWithItems::MSWInsertOrAppendItem(unsigned pos,
-                                              const wxString& item,
-                                              unsigned wm)
-{
-    LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos,
-                            wxMSW_CONV_LPARAM(item));
-    if ( n == CB_ERR || n == CB_ERRSPACE )
-    {
-        wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)"));
-        return wxNOT_FOUND;
-    }
-
-    return n;
-}
-
 // ---------------------------------------------------------------------------
 // global functions
 // ---------------------------------------------------------------------------
diff --git a/Source/3rd Party/wx/src/msw/crashrpt.cpp b/Source/3rd Party/wx/src/msw/crashrpt.cpp
index cfafe5add..449ee8d79 100644
--- a/Source/3rd Party/wx/src/msw/crashrpt.cpp	
+++ b/Source/3rd Party/wx/src/msw/crashrpt.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/crashrpt.cpp
+// Name:        msw/crashrpt.cpp
 // Purpose:     code to generate crash dumps (minidumps)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.07.03
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: crashrpt.cpp 34532 2005-06-02 20:58:18Z JS $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ private:
     void Output(const wxChar *format, ...);
 
     // output end of line
-    void OutputEndl() { Output(wxT("\r\n")); }
+    void OutputEndl() { Output(_T("\r\n")); }
 
     // the handle of the report file
     HANDLE m_hFile;
@@ -130,9 +130,7 @@ void wxCrashReportImpl::Output(const wxChar *format, ...)
     DWORD cbWritten;
 
     wxString s = wxString::FormatV(format, argptr);
-
-    wxCharBuffer buf(s.mb_str(wxConvUTF8));
-    ::WriteFile(m_hFile, buf.data(), strlen(buf.data()), &cbWritten, 0);
+    ::WriteFile(m_hFile, s, s.length() * sizeof(wxChar), &cbWritten, 0);
 
     va_end(argptr);
 }
@@ -148,7 +146,7 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
 
     if ( !ep )
     {
-        Output(wxT("Context for crash report generation not available."));
+        Output(_T("Context for crash report generation not available."));
         return false;
     }
 
@@ -160,14 +158,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
     TCHAR envFlags[64];
     DWORD dwLen = ::GetEnvironmentVariable
                     (
-                        wxT("WX_CRASH_FLAGS"),
+                        _T("WX_CRASH_FLAGS"),
                         envFlags,
                         WXSIZEOF(envFlags)
                     );
 
     int flagsEnv;
     if ( dwLen && dwLen < WXSIZEOF(envFlags) &&
-            wxSscanf(envFlags, wxT("%d"), &flagsEnv) == 1 )
+            wxSscanf(envFlags, _T("%d"), &flagsEnv) == 1 )
     {
         flags = flagsEnv;
     }
@@ -203,7 +201,7 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
             dumpFlags = (MINIDUMP_TYPE)(MiniDumpScanMemory
 #if _MSC_VER > 1300
                                         |MiniDumpWithIndirectlyReferencedMemory
-#endif
+#endif                                        
                                         );
         }
 
@@ -218,7 +216,7 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
                 NULL                        // no callbacks
               ) )
         {
-            Output(wxT("MiniDumpWriteDump() failed."));
+            Output(_T("MiniDumpWriteDump() failed."));
 
             return false;
         }
@@ -227,14 +225,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
     }
     else // dbghelp.dll couldn't be loaded
     {
-        Output(wxT("%s"), wxDbgHelpDLL::GetErrorMessage().c_str());
+        Output(wxDbgHelpDLL::GetErrorMessage());
     }
 #else // !wxUSE_DBGHELP
     wxUnusedVar(flags);
     wxUnusedVar(ep);
 
-    Output(wxT("Support for crash report generation was not included ")
-           wxT("in this wxWidgets version."));
+    Output(_T("Support for crash report generation was not included ")
+           _T("in this wxWidgets version."));
 #endif // wxUSE_DBGHELP/!wxUSE_DBGHELP
 
     return false;
@@ -245,13 +243,14 @@ bool wxCrashReportImpl::Generate(int flags, EXCEPTION_POINTERS *ep)
 // ----------------------------------------------------------------------------
 
 /* static */
-void wxCrashReport::SetFileName(const wxString& filename)
+void wxCrashReport::SetFileName(const wxChar *filename)
 {
-    wxStrlcpy(gs_reportFilename, filename.t_str(), WXSIZEOF(gs_reportFilename));
+    wxStrncpy(gs_reportFilename, filename, WXSIZEOF(gs_reportFilename) - 1);
+    gs_reportFilename[WXSIZEOF(gs_reportFilename) - 1] = _T('\0');
 }
 
 /* static */
-wxString wxCrashReport::GetFileName()
+const wxChar *wxCrashReport::GetFileName()
 {
     return gs_reportFilename;
 }
@@ -292,7 +291,7 @@ wxCrashContext::wxCrashContext(_EXCEPTION_POINTERS *ep)
 
     if ( !ep )
     {
-        wxCHECK_RET( wxGlobalSEInformation, wxT("no exception info available") );
+        wxCHECK_RET( wxGlobalSEInformation, _T("no exception info available") );
         ep = wxGlobalSEInformation;
     }
 
@@ -330,7 +329,7 @@ wxString wxCrashContext::GetExceptionString() const
 {
     wxString s;
 
-    #define CASE_EXCEPTION( x ) case EXCEPTION_##x: s = wxT(#x); break
+    #define CASE_EXCEPTION( x ) case EXCEPTION_##x: s = _T(#x); break
 
     switch ( code )
     {
@@ -363,7 +362,7 @@ wxString wxCrashContext::GetExceptionString() const
                     (
                      FORMAT_MESSAGE_IGNORE_INSERTS |
                      FORMAT_MESSAGE_FROM_HMODULE,
-                     ::GetModuleHandle(wxT("NTDLL.DLL")),
+                     ::GetModuleHandle(_T("NTDLL.DLL")),
                      code,
                      0,
                      wxStringBuffer(s, 1024),
@@ -371,7 +370,7 @@ wxString wxCrashContext::GetExceptionString() const
                      0
                     ) )
             {
-                s.Printf(wxT("UNKNOWN_EXCEPTION(%d)"), code);
+                s.Printf(_T("UNKNOWN_EXCEPTION(%d)"), code);
             }
     }
 
diff --git a/Source/3rd Party/wx/src/msw/cursor.cpp b/Source/3rd Party/wx/src/msw/cursor.cpp
index 443c70fd3..27ed2cb64 100644
--- a/Source/3rd Party/wx/src/msw/cursor.cpp	
+++ b/Source/3rd Party/wx/src/msw/cursor.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: cursor.cpp 46594 2007-06-21 18:14:29Z VZ $
 // Copyright:   (c) 1997-2003 Julian Smart and Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,6 +27,7 @@
 #include "wx/cursor.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h" // IDC_HAND
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
@@ -38,7 +39,6 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/missing.h" // IDC_HAND
 
 // define functions missing in MicroWin
 #ifdef __WXMICROWIN__
@@ -105,7 +105,8 @@ public:
 
     virtual void OnExit()
     {
-        wxDELETE(gs_globalCursor);
+        delete gs_globalCursor;
+        gs_globalCursor = (wxCursor *)NULL;
     }
 };
 
@@ -184,7 +185,7 @@ wxCursor::wxCursor(const wxImage& image)
 
     wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < image_w &&
                   hotSpotY >= 0 && hotSpotY < image_h,
-                  wxT("invalid cursor hot spot coordinates") );
+                  _T("invalid cursor hot spot coordinates") );
 
     wxImage imageSized(image); // final image of correct size
 
@@ -207,7 +208,6 @@ wxCursor::wxCursor(const wxImage& image)
 
     HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized),
                                          hotSpotX, hotSpotY );
-
     if ( !hcursor )
     {
         wxLogWarning(_("Failed to create cursor."));
@@ -218,17 +218,32 @@ wxCursor::wxCursor(const wxImage& image)
 }
 #endif // wxUSE_IMAGE
 
+wxCursor::wxCursor(const char WXUNUSED(bits)[],
+                   int WXUNUSED(width),
+                   int WXUNUSED(height),
+                   int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY),
+                   const char WXUNUSED(maskBits)[])
+{
+}
+
 // MicroWin doesn't have support needed for the other ctors
 #ifdef __WXMICROWIN__
 
-wxCursor::InitFromStock(wxStockCursor WXUNUSED(cursor_type))
+wxCursor::wxCursor(const wxString& WXUNUSED(filename),
+                   long WXUNUSED(kind),
+                   int WXUNUSED(hotSpotX),
+                   int WXUNUSED(hotSpotY))
+{
+}
+
+wxCursor::wxCursor(int WXUNUSED(cursor_type))
 {
 }
 
 #else // !__WXMICROWIN__
 
 wxCursor::wxCursor(const wxString& filename,
-                   wxBitmapType kind,
+                   long kind,
                    int hotSpotX,
                    int hotSpotY)
 {
@@ -236,12 +251,12 @@ wxCursor::wxCursor(const wxString& filename,
     switch ( kind )
     {
         case wxBITMAP_TYPE_CUR_RESOURCE:
-            hcursor = ::LoadCursor(wxGetInstance(), filename.t_str());
+            hcursor = ::LoadCursor(wxGetInstance(), filename);
             break;
 
 #ifndef __WXWINCE__
         case wxBITMAP_TYPE_CUR:
-            hcursor = ::LoadCursorFromFile(filename.t_str());
+            hcursor = ::LoadCursorFromFile(filename);
             break;
 #endif
 
@@ -264,7 +279,7 @@ wxCursor::wxCursor(const wxString& filename,
             break;
 
         default:
-            wxLogError( wxT("unknown cursor resource type '%d'"), kind );
+            wxFAIL_MSG( _T("unknown cursor resource type") );
 
             hcursor = NULL;
     }
@@ -276,7 +291,7 @@ wxCursor::wxCursor(const wxString& filename,
 }
 
 // Cursors by stock number
-void wxCursor::InitFromStock(wxStockCursor idCursor)
+wxCursor::wxCursor(int idCursor)
 {
     // all wxWidgets standard cursors
     static const struct StdCursor
@@ -290,20 +305,27 @@ void wxCursor::InitFromStock(wxStockCursor idCursor)
     {
         {  true, NULL                        }, // wxCURSOR_NONE
         {  true, IDC_ARROW                   }, // wxCURSOR_ARROW
-        { false, wxT("WXCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
-        { false, wxT("WXCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
+        { false, _T("WXCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
+        { false, _T("WXCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
         {  true, IDC_ARROW                   }, // WXCURSOR_CHAR
-        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
+
+        // Displays as an I-beam on XP, so use a cursor file
+//        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
+        {  false, _T("WXCURSOR_CROSS")       }, // WXCURSOR_CROSS
+
+        // See special handling below for wxCURSOR_HAND
+//        { false, _T("WXCURSOR_HAND")         }, // wxCURSOR_HAND
         {  true, IDC_HAND                    }, // wxCURSOR_HAND
+
         {  true, IDC_IBEAM                   }, // WXCURSOR_IBEAM
         {  true, IDC_ARROW                   }, // WXCURSOR_LEFT_BUTTON
-        { false, wxT("WXCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
+        { false, _T("WXCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
         {  true, IDC_ARROW                   }, // WXCURSOR_MIDDLE_BUTTON
         {  true, IDC_NO                      }, // WXCURSOR_NO_ENTRY
-        { false, wxT("WXCURSOR_PBRUSH")       }, // wxCURSOR_PAINT_BRUSH
-        { false, wxT("WXCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
-        { false, wxT("WXCURSOR_PLEFT")        }, // wxCURSOR_POINT_LEFT
-        { false, wxT("WXCURSOR_PRIGHT")       }, // wxCURSOR_POINT_RIGHT
+        { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_PAINT_BRUSH
+        { false, _T("WXCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
+        { false, _T("WXCURSOR_PLEFT")        }, // wxCURSOR_POINT_LEFT
+        { false, _T("WXCURSOR_PRIGHT")       }, // wxCURSOR_POINT_RIGHT
         {  true, IDC_HELP                    }, // WXCURSOR_QUESTION_ARROW
         {  true, IDC_ARROW                   }, // WXCURSOR_RIGHT_BUTTON
         {  true, IDC_SIZENESW                }, // WXCURSOR_SIZENESW
@@ -311,10 +333,10 @@ void wxCursor::InitFromStock(wxStockCursor idCursor)
         {  true, IDC_SIZENWSE                }, // WXCURSOR_SIZENWSE
         {  true, IDC_SIZEWE                  }, // WXCURSOR_SIZEWE
         {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING
-        { false, wxT("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
+        { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
         {  true, IDC_WAIT                    }, // WXCURSOR_WAIT
         {  true, IDC_WAIT                    }, // WXCURSOR_WATCH
-        { false, wxT("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
+        { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
         {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT
 
         // no entry for wxCURSOR_MAX
@@ -324,7 +346,7 @@ void wxCursor::InitFromStock(wxStockCursor idCursor)
                            CursorsIdArrayMismatch );
 
     wxCHECK_RET( idCursor > 0 && (size_t)idCursor < WXSIZEOF(stdCursors),
-                 wxT("invalid cursor id in wxCursor() ctor") );
+                 _T("invalid cursor id in wxCursor() ctor") );
 
     const StdCursor& stdCursor = stdCursors[idCursor];
     bool deleteLater = !stdCursor.isStd;
@@ -335,22 +357,13 @@ void wxCursor::InitFromStock(wxStockCursor idCursor)
     // IDC_HAND may not be available on some versions of Windows.
     if ( !hcursor && idCursor == wxCURSOR_HAND)
     {
-        hcursor = ::LoadCursor(wxGetInstance(), wxT("WXCURSOR_HAND"));
+        hcursor = ::LoadCursor(wxGetInstance(), _T("WXCURSOR_HAND"));
         deleteLater = true;
     }
 
     if ( !hcursor )
     {
-        if ( !stdCursor.isStd )
-        {
-            // it may be not obvious to the programmer why did loading fail,
-            // try to help by pointing to the by far the most probable reason
-            wxFAIL_MSG(wxT("Loading a cursor defined by wxWidgets failed, ")
-                       wxT("did you include include/wx/msw/wx.rc file from ")
-                       wxT("your resource file?"));
-        }
-
-        wxLogLastError(wxT("LoadCursor"));
+        wxLogLastError(_T("LoadCursor"));
     }
     else
     {
@@ -384,7 +397,7 @@ const wxCursor *wxGetGlobalCursor()
 
 void wxSetCursor(const wxCursor& cursor)
 {
-    if ( cursor.IsOk() )
+    if ( cursor.Ok() )
     {
         ::SetCursor(GetHcursorOf(cursor));
 
diff --git a/Source/3rd Party/wx/src/msw/data.cpp b/Source/3rd Party/wx/src/msw/data.cpp
index 20400528a..82eda1472 100644
--- a/Source/3rd Party/wx/src/msw/data.cpp	
+++ b/Source/3rd Party/wx/src/msw/data.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/data.cpp
+// Name:        data.cpp
 // Purpose:     Various data
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: data.cpp 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Source/3rd Party/wx/src/msw/dc.cpp b/Source/3rd Party/wx/src/msw/dc.cpp
index df81b7e71..42bcbba91 100644
--- a/Source/3rd Party/wx/src/msw/dc.cpp	
+++ b/Source/3rd Party/wx/src/msw/dc.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dc.cpp 63769 2010-03-28 22:34:08Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -28,31 +28,30 @@
     #include "wx/msw/wrapcdlg.h"
     #include "wx/image.h"
     #include "wx/window.h"
+    #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/log.h"
-    #include "wx/math.h"
     #include "wx/icon.h"
     #include "wx/dcprint.h"
     #include "wx/module.h"
 #endif
 
-#include "wx/msw/dc.h"
 #include "wx/sysopt.h"
 #include "wx/dynlib.h"
 
-#ifdef wxHAS_RAW_BITMAP
-    #include "wx/rawbmp.h"
+#ifdef wxHAVE_RAW_BITMAP
+#include "wx/rawbmp.h"
 #endif
 
 #include <string.h>
 
-#include "wx/msw/private/dc.h"
-
-using namespace wxMSWImpl;
+#ifndef __WIN32__
+    #include <print.h>
+#endif
 
 #ifndef AC_SRC_ALPHA
     #define AC_SRC_ALPHA 1
@@ -77,15 +76,16 @@ using namespace wxMSWImpl;
     #define WXMICROWIN_CHECK_HDC_RET(x)
 #endif
 
-IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl)
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
 
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 
-// The device space in Win32 GDI measures 2^27*2^27 , so we use 2^27-1 as the
-// maximal possible view port extent.
-static const int VIEWPORT_EXTENT = 134217727;
+static const int VIEWPORT_EXTENT = 1000;
+
+static const int MM_POINTS = 9;
+static const int MM_METRIC = 10;
 
 // ROPs which don't have standard names (see "Ternary Raster Operations" in the
 // MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
@@ -130,23 +130,18 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
 // return true if we could draw the bitmap in one way or the other, false
 // otherwise
 static bool AlphaBlt(HDC hdcDst,
-                     int x, int y, int dstWidth, int dstHeight,
-                     int srcX, int srcY,
-                     int srcWidth, int srcHeight,
-                     HDC hdcSrc,
-                     const wxBitmap& bmp);
+                     int x, int y, int w, int h,
+                     int srcX, int srcY, HDC hdcSrc,
+                     const wxBitmap& bmpSrc);
 
-#ifdef wxHAS_RAW_BITMAP
+#ifdef wxHAVE_RAW_BITMAP
 
 // our (limited) AlphaBlend() replacement for Windows versions not providing it
 static void
-wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
-             int dstWidth, int dstHeight,
-             int srcX, int srcY,
-             int srcWidth, int srcHeight,
-             const wxBitmap& bmpSrc);
+wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h,
+             int srcX, int srcY, const wxBitmap& bmp);
 
-#endif // wxHAS_RAW_BITMAP
+#endif // wxHAVE_RAW_BITMAP
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -156,47 +151,45 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
 // colours in each wxDC method working with wxSTIPPLE_MASK_OPAQUE brushes,
 // encapsulate this in a small helper class
 
-// wxBrushAttrsSetter: changes the text colours in the ctor if required and
+// wxColourChanger: changes the text colours in the ctor if required and
 //                  restores them in the dtor
-class wxBrushAttrsSetter : private wxBkModeChanger,
-                           private wxTextColoursChanger
+class wxColourChanger
 {
 public:
-    wxBrushAttrsSetter(wxMSWDCImpl& dc);
+    wxColourChanger(wxDC& dc);
+   ~wxColourChanger();
 
 private:
-    wxDECLARE_NO_COPY_CLASS(wxBrushAttrsSetter);
+    wxDC& m_dc;
+
+    COLORREF m_colFgOld, m_colBgOld;
+
+    bool m_changed;
+
+    DECLARE_NO_COPY_CLASS(wxColourChanger)
 };
 
-#ifdef __WXWINCE__
-
-#define SET_STRETCH_BLT_MODE(hdc)
-
-#else // !__WXWINCE__
-
-// this class sets the stretch blit mode to COLORONCOLOR during its lifetime
-//
-// don't use it directly, use SET_STRETCH_BLT_MODE() macro instead as it
-// expands to nothing under WinCE which doesn't have SetStretchBltMode()
+// this class saves the old stretch blit mode during its life time
 class StretchBltModeChanger
 {
 public:
-    StretchBltModeChanger(HDC hdc)
+    StretchBltModeChanger(HDC hdc,
+                          int WXUNUSED_IN_WINCE(mode))
         : m_hdc(hdc)
     {
-        m_modeOld = ::SetStretchBltMode(m_hdc, COLORONCOLOR);
+#ifndef __WXWINCE__
+        m_modeOld = ::SetStretchBltMode(m_hdc, mode);
         if ( !m_modeOld )
-        {
-            wxLogLastError(wxT("SetStretchBltMode"));
-        }
+            wxLogLastError(_T("SetStretchBltMode"));
+#endif
     }
 
     ~StretchBltModeChanger()
     {
+#ifndef __WXWINCE__
         if ( !::SetStretchBltMode(m_hdc, m_modeOld) )
-        {
-            wxLogLastError(wxT("SetStretchBltMode"));
-        }
+            wxLogLastError(_T("SetStretchBltMode"));
+#endif
     }
 
 private:
@@ -204,16 +197,9 @@ private:
 
     int m_modeOld;
 
-    wxDECLARE_NO_COPY_CLASS(StretchBltModeChanger);
+    DECLARE_NO_COPY_CLASS(StretchBltModeChanger)
 };
 
-#define SET_STRETCH_BLT_MODE(hdc) \
-    StretchBltModeChanger wxMAKE_UNIQUE_NAME(stretchModeChanger)(hdc)
-
-#endif // __WXWINCE__/!__WXWINCE__
-
-#if wxUSE_DYNLIB_CLASS
-
 // helper class to cache dynamically loaded libraries and not attempt reloading
 // them if it fails
 class wxOnceOnlyDLLLoader
@@ -245,177 +231,77 @@ public:
         return m_dll.IsLoaded() ? m_dll.GetSymbol(name) : NULL;
     }
 
-    void Unload()
-    {
-        if ( m_dll.IsLoaded() )
-        {
-            m_dll.Unload();
-        }
-    }
-
 private:
     wxDynamicLibrary m_dll;
     const wxChar *m_dllName;
 };
 
-static wxOnceOnlyDLLLoader wxMSIMG32DLL(wxT("msimg32"));
-
-// we must ensure that DLLs are unloaded before the static objects cleanup time
-// because we may hit the notorious DllMain() dead lock in this case if wx is
-// used as a DLL (attempting to unload another DLL from inside DllMain() hangs
-// under Windows because it tries to reacquire the same lock)
-class wxGDIDLLsCleanupModule : public wxModule
-{
-public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxMSIMG32DLL.Unload(); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGDIDLLsCleanupModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxGDIDLLsCleanupModule, wxModule)
-
-namespace
-{
-
-#if wxUSE_DC_TRANSFORM_MATRIX
-
-// Class used to dynamically load world transform related API functions.
-class GdiWorldTransformFuncs
-{
-public:
-    static bool IsOk()
-    {
-        if ( !ms_worldTransformSymbolsLoaded )
-            LoadWorldTransformSymbols();
-
-        return ms_pfnSetGraphicsMode &&
-                ms_pfnSetWorldTransform &&
-                 ms_pfnGetWorldTransform &&
-                  ms_pfnModifyWorldTransform;
-    }
-
-    typedef int (WINAPI *SetGraphicsMode_t)(HDC, int);
-    static SetGraphicsMode_t SetGraphicsMode()
-    {
-        if ( !ms_worldTransformSymbolsLoaded )
-            LoadWorldTransformSymbols();
-
-        return ms_pfnSetGraphicsMode;
-    }
-
-    typedef BOOL (WINAPI *SetWorldTransform_t)(HDC, const XFORM *);
-    static SetWorldTransform_t SetWorldTransform()
-    {
-        if ( !ms_worldTransformSymbolsLoaded )
-            LoadWorldTransformSymbols();
-
-        return ms_pfnSetWorldTransform;
-    }
-
-    typedef BOOL (WINAPI *GetWorldTransform_t)(HDC, LPXFORM);
-    static GetWorldTransform_t GetWorldTransform()
-    {
-        if ( !ms_worldTransformSymbolsLoaded )
-            LoadWorldTransformSymbols();
-
-        return ms_pfnGetWorldTransform;
-    }
-
-    typedef BOOL (WINAPI *ModifyWorldTransform_t)(HDC, const XFORM *, DWORD);
-    static ModifyWorldTransform_t ModifyWorldTransform()
-    {
-        if ( !ms_worldTransformSymbolsLoaded )
-            LoadWorldTransformSymbols();
-
-        return ms_pfnModifyWorldTransform;
-    }
-
-private:
-    static void LoadWorldTransformSymbols()
-    {
-        wxDynamicLibrary dll(wxT("gdi32.dll"));
-
-        wxDL_INIT_FUNC(ms_pfn, SetGraphicsMode, dll);
-        wxDL_INIT_FUNC(ms_pfn, SetWorldTransform, dll);
-        wxDL_INIT_FUNC(ms_pfn, GetWorldTransform, dll);
-        wxDL_INIT_FUNC(ms_pfn, ModifyWorldTransform, dll);
-
-        ms_worldTransformSymbolsLoaded = true;
-    }
-
-    static SetGraphicsMode_t ms_pfnSetGraphicsMode;
-    static SetWorldTransform_t ms_pfnSetWorldTransform;
-    static GetWorldTransform_t ms_pfnGetWorldTransform;
-    static ModifyWorldTransform_t ms_pfnModifyWorldTransform;
-
-    static bool ms_worldTransformSymbolsLoaded;
-};
-
-GdiWorldTransformFuncs::SetGraphicsMode_t
-    GdiWorldTransformFuncs::ms_pfnSetGraphicsMode = NULL;
-GdiWorldTransformFuncs::SetWorldTransform_t
-    GdiWorldTransformFuncs::ms_pfnSetWorldTransform = NULL;
-GdiWorldTransformFuncs::GetWorldTransform_t
-    GdiWorldTransformFuncs::ms_pfnGetWorldTransform = NULL;
-GdiWorldTransformFuncs::ModifyWorldTransform_t
-    GdiWorldTransformFuncs::ms_pfnModifyWorldTransform = NULL;
-
-bool GdiWorldTransformFuncs::ms_worldTransformSymbolsLoaded = false;
-
-#endif // wxUSE_DC_TRANSFORM_MATRIX
-
-} // anonymous namespace
-
-#endif // wxUSE_DYNLIB_CLASS
+static wxOnceOnlyDLLLoader wxGDI32DLL(_T("gdi32"));
+static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 
 // ----------------------------------------------------------------------------
-// wxBrushAttrsSetter
+// wxColourChanger
 // ----------------------------------------------------------------------------
 
-wxBrushAttrsSetter::wxBrushAttrsSetter(wxMSWDCImpl& dc)
-                  : wxBkModeChanger(GetHdcOf(dc)),
-                    wxTextColoursChanger(GetHdcOf(dc))
+wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
 {
     const wxBrush& brush = dc.GetBrush();
-    if ( brush.IsOk() && brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE )
+    if ( brush.Ok() && brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
     {
+        HDC hdc = GetHdcOf(dc);
+        m_colFgOld = ::GetTextColor(hdc);
+        m_colBgOld = ::GetBkColor(hdc);
+
         // note that Windows convention is opposite to wxWidgets one, this is
         // why text colour becomes the background one and vice versa
-        wxTextColoursChanger::Change(dc.GetTextBackground(),
-                                     dc.GetTextForeground());
+        const wxColour& colFg = dc.GetTextForeground();
+        if ( colFg.Ok() )
+        {
+            ::SetBkColor(hdc, colFg.GetPixel());
+        }
 
-        wxBkModeChanger::Change(dc.GetBackgroundMode());
+        const wxColour& colBg = dc.GetTextBackground();
+        if ( colBg.Ok() )
+        {
+            ::SetTextColor(hdc, colBg.GetPixel());
+        }
+
+        SetBkMode(hdc,
+                  dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
+                                                          : OPAQUE);
+
+        // flag which telsl us to undo changes in the dtor
+        m_changed = true;
+    }
+    else
+    {
+        // nothing done, nothing to undo
+        m_changed = false;
     }
 }
 
-// ----------------------------------------------------------------------------
-// wxDC MSW-specific methods
-// ----------------------------------------------------------------------------
-
-WXHDC wxDC::GetHDC() const
+wxColourChanger::~wxColourChanger()
 {
-    wxMSWDCImpl * const impl = wxDynamicCast(GetImpl(), wxMSWDCImpl);
-    return impl ? impl->GetHDC() : 0;
+    if ( m_changed )
+    {
+        // restore the colours we changed
+        HDC hdc = GetHdcOf(m_dc);
+
+        ::SetBkMode(hdc, TRANSPARENT);
+        ::SetTextColor(hdc, m_colFgOld);
+        ::SetBkColor(hdc, m_colBgOld);
+    }
 }
 
 // ---------------------------------------------------------------------------
-// wxMSWDCImpl
+// wxDC
 // ---------------------------------------------------------------------------
 
-wxMSWDCImpl::wxMSWDCImpl( wxDC *owner, WXHDC hDC ) :
-    wxDCImpl( owner )
-{
-    Init();
-    m_hDC = hDC;
-}
-
-wxMSWDCImpl::~wxMSWDCImpl()
+wxDC::~wxDC()
 {
     if ( m_hDC != 0 )
     {
@@ -429,9 +315,9 @@ wxMSWDCImpl::~wxMSWDCImpl()
         }
         else // we don't own our HDC
         {
-            if (m_window)
+            if (m_canvas)
             {
-                ::ReleaseDC(GetHwndOf(m_window), GetHdc());
+                ::ReleaseDC(GetHwndOf(m_canvas), GetHdc());
             }
             else
             {
@@ -445,17 +331,19 @@ wxMSWDCImpl::~wxMSWDCImpl()
 // This will select current objects out of the DC,
 // which is what you have to do before deleting the
 // DC.
-void wxMSWDCImpl::SelectOldObjects(WXHDC dc)
+void wxDC::SelectOldObjects(WXHDC dc)
 {
     if (dc)
     {
         if (m_oldBitmap)
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
-            if (m_selectedBitmap.IsOk())
+#ifdef __WXDEBUG__
+            if (m_selectedBitmap.Ok())
             {
                 m_selectedBitmap.SetSelectedInto(NULL);
             }
+#endif
         }
         m_oldBitmap = 0;
         if (m_oldPen)
@@ -497,7 +385,7 @@ void wxMSWDCImpl::SelectOldObjects(WXHDC dc)
 // clipping
 // ---------------------------------------------------------------------------
 
-void wxMSWDCImpl::UpdateClipBox()
+void wxDC::UpdateClipBox()
 {
     WXMICROWIN_CHECK_HDC
 
@@ -511,25 +399,25 @@ void wxMSWDCImpl::UpdateClipBox()
 }
 
 void
-wxMSWDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+wxDC::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
 {
     // check if we should try to retrieve the clipping region possibly not set
     // by our SetClippingRegion() but preset by Windows:this can only happen
     // when we're associated with an existing HDC usign SetHDC(), see there
     if ( m_clipping && !m_clipX1 && !m_clipX2 )
     {
-        wxMSWDCImpl *self = wxConstCast(this, wxMSWDCImpl);
+        wxDC *self = wxConstCast(this, wxDC);
         self->UpdateClipBox();
 
         if ( !m_clipX1 && !m_clipX2 )
             self->m_clipping = false;
     }
 
-    wxDCImpl::DoGetClippingBox(x, y, w, h);
+    wxDCBase::DoGetClippingBox(x, y, w, h);
 }
 
-// common part of DoSetClippingRegion() and DoSetDeviceClippingRegion()
-void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)
+// common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
+void wxDC::SetClippingHrgn(WXHRGN hrgn)
 {
     wxCHECK_RET( hrgn, wxT("invalid clipping region") );
 
@@ -563,7 +451,7 @@ void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)
 #else // !WinCE
     if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
     {
-        wxLogLastError(wxT("ExtSelectClipRgn"));
+        wxLogLastError(_T("ExtSelectClipRgn"));
 
         return;
     }
@@ -574,7 +462,7 @@ void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)
     UpdateClipBox();
 }
 
-void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {
     // the region coords are always the device ones, so do the translation
     // manually
@@ -586,7 +474,7 @@ void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h
                                 LogicalToDeviceY(y + h));
     if ( !hrgn )
     {
-        wxLogLastError(wxT("CreateRectRgn"));
+        wxLogLastError(_T("CreateRectRgn"));
     }
     else
     {
@@ -596,12 +484,12 @@ void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h
     }
 }
 
-void wxMSWDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
+void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 {
     SetClippingHrgn(region.GetHRGN());
 }
 
-void wxMSWDCImpl::DestroyClippingRegion()
+void wxDC::DestroyClippingRegion()
 {
     WXMICROWIN_CHECK_HDC
 
@@ -625,19 +513,19 @@ void wxMSWDCImpl::DestroyClippingRegion()
 #endif
     }
 
-    wxDCImpl::DestroyClippingRegion();
+    wxDCBase::DestroyClippingRegion();
 }
 
 // ---------------------------------------------------------------------------
 // query capabilities
 // ---------------------------------------------------------------------------
 
-bool wxMSWDCImpl::CanDrawBitmap() const
+bool wxDC::CanDrawBitmap() const
 {
     return true;
 }
 
-bool wxMSWDCImpl::CanGetTextExtent() const
+bool wxDC::CanGetTextExtent() const
 {
 #ifdef __WXMICROWIN__
     // TODO Extend MicroWindows' GetDeviceCaps function
@@ -650,7 +538,7 @@ bool wxMSWDCImpl::CanGetTextExtent() const
 #endif
 }
 
-int wxMSWDCImpl::GetDepth() const
+int wxDC::GetDepth() const
 {
     WXMICROWIN_CHECK_HDC_RET(16)
 
@@ -661,21 +549,21 @@ int wxMSWDCImpl::GetDepth() const
 // drawing
 // ---------------------------------------------------------------------------
 
-void wxMSWDCImpl::Clear()
+void wxDC::Clear()
 {
     WXMICROWIN_CHECK_HDC
 
     RECT rect;
-    if (m_window)
+    if ( m_canvas )
     {
-        GetClientRect((HWND) m_window->GetHWND(), &rect);
+        GetClientRect((HWND) m_canvas->GetHWND(), &rect);
     }
     else
     {
         // No, I think we should simply ignore this if printing on e.g.
         // a printer DC.
-        // wxCHECK_RET( m_selectedBitmap.IsOk(), wxT("this DC can't be cleared") );
-        if (!m_selectedBitmap.IsOk())
+        // wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") );
+        if (!m_selectedBitmap.Ok())
             return;
 
         rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;
@@ -692,13 +580,23 @@ void wxMSWDCImpl::Clear()
     ::FillRect(GetHdc(), &rect, brush);
     ::DeleteObject(brush);
 
-    RealizeScaleAndOrigin();
+#ifndef __WXWINCE__
+    int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
+        height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
+
+    ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
+
+    ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+    ::SetWindowExtEx(GetHdc(), width, height, NULL);
+    ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
+    ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+#endif
 }
 
-bool wxMSWDCImpl::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
+bool wxDC::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
                        wxCoord WXUNUSED_IN_WINCE(y),
                        const wxColour& WXUNUSED_IN_WINCE(col),
-                       wxFloodFillStyle WXUNUSED_IN_WINCE(style))
+                       int WXUNUSED_IN_WINCE(style))
 {
 #ifdef __WXWINCE__
     return false;
@@ -732,11 +630,11 @@ bool wxMSWDCImpl::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
 #endif
 }
 
-bool wxMSWDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
+bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {
     WXMICROWIN_CHECK_HDC_RET(false)
 
-    wxCHECK_MSG( col, false, wxT("NULL colour parameter in wxMSWDCImpl::GetPixel") );
+    wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel") );
 
     // get the color of the pixel
     COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
@@ -746,7 +644,7 @@ bool wxMSWDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
     return true;
 }
 
-void wxMSWDCImpl::DoCrossHair(wxCoord x, wxCoord y)
+void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -762,7 +660,7 @@ void wxMSWDCImpl::DoCrossHair(wxCoord x, wxCoord y)
     CalcBoundingBox(x2, y2);
 }
 
-void wxMSWDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -774,7 +672,7 @@ void wxMSWDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 
 // Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
 // and ending at (x2, y2)
-void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,
+void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {
@@ -782,24 +680,22 @@ void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,
     double dy = yc - y1;
     wxCoord r = (wxCoord)sqrt(dx*dx + dy*dy);
 
-
 #ifdef __WXWINCE__
     // Slower emulation since WinCE doesn't support Pie and Arc
     double sa = acos((x1-xc)/r)/M_PI*180; // between 0 and 180
-    if( y1>yc )
-        sa = -sa; // below center
+    if( y1>yc ) sa = -sa; // below center
     double ea = atan2(yc-y2, x2-xc)/M_PI*180;
     DoDrawEllipticArcRot( xc-r, yc-r, 2*r, 2*r, sa, ea );
 #else
 
     WXMICROWIN_CHECK_HDC
 
-    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     // treat the special case of full circle separately
     if ( x1 == x2 && y1 == y2 )
     {
-        GetOwner()->DrawEllipse(xc - r, yc - r, 2*r, 2*r);
+        DrawEllipse(xc - r, yc - r, 2*r, 2*r);
         return;
     }
 
@@ -818,7 +714,7 @@ void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,
     wxCoord xxx2 = (wxCoord) (xxc+ray);
     wxCoord yyy2 = (wxCoord) (yyc+ray);
 
-    if ( m_brush.IsNonTransparent() )
+    if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT )
     {
         // Have to add 1 to bottom-right corner of rectangle
         // to make semi-circles look right (crooked line otherwise).
@@ -837,7 +733,7 @@ void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,
 #endif
 }
 
-void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
                            wxCoord width, wxCoord height)
 {
     // cases when we don't have DrawFrameControl()
@@ -854,7 +750,7 @@ void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1,
     rect.bottom = y2;
 
 #ifdef __WXWINCE__
-    DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_CHECKED);
+    DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK);
 #else
     DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
 #endif
@@ -864,12 +760,12 @@ void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1,
 #endif // Microwin/Normal
 }
 
-void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y)
+void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
     COLORREF color = 0x00ffffff;
-    if (m_pen.IsOk())
+    if (m_pen.Ok())
     {
         color = m_pen.GetColour().GetPixel();
     }
@@ -879,15 +775,15 @@ void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y)
     CalcBoundingBox(x, y);
 }
 
-void wxMSWDCImpl::DoDrawPolygon(int n,
+void wxDC::DoDrawPolygon(int n,
                          wxPoint points[],
                          wxCoord xoffset,
                          wxCoord yoffset,
-                         wxPolygonFillMode WXUNUSED_IN_WINCE(fillStyle))
+                         int WXUNUSED_IN_WINCE(fillStyle))
 {
     WXMICROWIN_CHECK_HDC
 
-    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     // Do things less efficiently if we have offsets
     if (xoffset != 0 || yoffset != 0)
@@ -927,19 +823,19 @@ void wxMSWDCImpl::DoDrawPolygon(int n,
 }
 
 void
-wxMSWDCImpl::DoDrawPolyPolygon(int n,
+wxDC::DoDrawPolyPolygon(int n,
                         int count[],
                         wxPoint points[],
                         wxCoord xoffset,
                         wxCoord yoffset,
-                        wxPolygonFillMode fillStyle)
+                        int fillStyle)
 {
 #ifdef __WXWINCE__
-    wxDCImpl::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
+    wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
 #else
     WXMICROWIN_CHECK_HDC
 
-    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
     int i, cnt;
     for (i = cnt = 0; i < n; i++)
         cnt += count[i];
@@ -981,7 +877,7 @@ wxMSWDCImpl::DoDrawPolyPolygon(int n,
   // __WXWINCE__
 }
 
-void wxMSWDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -1010,40 +906,53 @@ void wxMSWDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord
     }
 }
 
-void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     WXMICROWIN_CHECK_HDC
 
-    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     wxCoord x2 = x + width;
     wxCoord y2 = y + height;
 
-    wxCoord x2dev = XLOG2DEV(x2),
-            y2dev = YLOG2DEV(y2);
-
-    // Windows (but not Windows CE) draws the filled rectangles without outline
-    // (i.e. drawn with a transparent pen) one pixel smaller in both directions
-    // and we want them to have the same size regardless of which pen is used
-#ifndef __WXWINCE__
-    if ( m_pen.IsTransparent() )
+    if ((m_logicalFunction == wxCOPY) && (m_pen.GetStyle() == wxTRANSPARENT))
     {
-        x2dev++;
-        y2dev++;
+        RECT rect;
+        rect.left = XLOG2DEV(x);
+        rect.top = YLOG2DEV(y);
+        rect.right = XLOG2DEV(x2);
+        rect.bottom = YLOG2DEV(y2);
+        (void)FillRect(GetHdc(), &rect, (HBRUSH)m_brush.GetResourceHandle() );
+    }
+    else
+    {
+        // Windows draws the filled rectangles without outline (i.e. drawn with a
+        // transparent pen) one pixel smaller in both directions and we want them
+        // to have the same size regardless of which pen is used - adjust
+
+        // I wonder if this shouldnt be done after the LOG2DEV() conversions. RR.
+        if ( m_pen.GetStyle() == wxTRANSPARENT )
+        {
+            // Apparently not needed for WinCE (see e.g. Life! demo)
+#ifndef __WXWINCE__
+            x2++;
+            y2++;
+#endif
+        }
+
+        (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
     }
-#endif // !__WXWINCE__
 
-    (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), x2dev, y2dev);
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 }
 
-void wxMSWDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
     WXMICROWIN_CHECK_HDC
 
-    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     // Now, a negative radius value is interpreted to mean
     // 'the proportion of the smallest X or Y dimension'
@@ -1060,7 +969,7 @@ void wxMSWDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wx
     // Windows draws the filled rectangles without outline (i.e. drawn with a
     // transparent pen) one pixel smaller in both directions and we want them
     // to have the same size regardless of which pen is used - adjust
-    if ( m_pen.IsTransparent() )
+    if ( m_pen.GetStyle() == wxTRANSPARENT )
     {
         x2++;
         y2++;
@@ -1073,29 +982,28 @@ void wxMSWDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wx
     CalcBoundingBox(x2, y2);
 }
 
-void wxMSWDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     WXMICROWIN_CHECK_HDC
 
-    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
-    // +1 below makes the ellipse more similar to other platforms.
-    // In particular, DoDrawEllipse(x,y,1,1) should draw one point.
-    wxCoord x2 = x + width + 1;
-    wxCoord y2 = y + height + 1;
+    wxCoord x2 = (x+width);
+    wxCoord y2 = (y+height);
 
-    // Problem: Windows GDI Ellipse() with x2-x == y2-y == 3 and transparent
-    // pen doesn't draw anything. Should we provide a workaround?
-
-    ::Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+    (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 }
 
-#if wxUSE_SPLINES && !defined(__WXWINCE__)
-void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
+#if wxUSE_SPLINES
+void wxDC::DoDrawSpline(wxList *points)
 {
+#ifdef  __WXWINCE__
+    // WinCE does not support ::PolyBezier so use generic version
+    wxDCBase::DoDrawSpline(points);
+#else
     // quadratic b-spline to cubic bezier spline conversion
     //
     // quadratic spline with control points P0,P1,P2
@@ -1122,8 +1030,8 @@ void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
     size_t bezier_pos = 0;
     wxCoord x1, y1, x2, y2, cx1, cy1, cx4, cy4;
 
-    wxPointList::compatibility_iterator node = points->GetFirst();
-    wxPoint *p = node->GetData();
+    wxList::compatibility_iterator node = points->GetFirst();
+    wxPoint *p = (wxPoint *)node->GetData();
     lppt[ bezier_pos ].x = x1 = p->x;
     lppt[ bezier_pos ].y = y1 = p->y;
     bezier_pos++;
@@ -1131,7 +1039,7 @@ void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
     bezier_pos++;
 
     node = node->GetNext();
-    p = node->GetData();
+    p = (wxPoint *)node->GetData();
 
     x2 = p->x;
     y2 = p->y;
@@ -1143,11 +1051,11 @@ void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
     lppt[ bezier_pos ] = lppt[ bezier_pos-1 ];
     bezier_pos++;
 
-#if !wxUSE_STD_CONTAINERS
+#if !wxUSE_STL
     while ((node = node->GetNext()) != NULL)
 #else
     while ((node = node->GetNext()))
-#endif // !wxUSE_STD_CONTAINERS
+#endif // !wxUSE_STL
     {
         p = (wxPoint *)node->GetData();
         x1 = x2;
@@ -1184,11 +1092,12 @@ void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
     ::PolyBezier( GetHdc(), lppt, bezier_pos );
 
     free(lppt);
+#endif
 }
-#endif // wxUSE_SPLINES
+#endif
 
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
-void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {
 #ifdef __WXWINCE__
     DoDrawEllipticArcRot( x, y, w, h, sa, ea );
@@ -1196,7 +1105,7 @@ void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
 
     WXMICROWIN_CHECK_HDC
 
-    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     wxCoord x2 = x + w;
     wxCoord y2 = y + h;
@@ -1216,13 +1125,13 @@ void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
 
     // Swap start and end positions if the end angle is less than the start angle.
     if (ea < sa) {
-        int temp;
-        temp = rx2;
-        rx2 = rx1;
-        rx1 = temp;
-        temp = ry2;
-        ry2 = ry1;
-        ry1 = temp;
+    int temp;
+    temp = rx2;
+    rx2 = rx1;
+    rx1 = temp;
+    temp = ry2;
+    ry2 = ry1;
+    ry1 = temp;
     }
 
     // draw pie with NULL_PEN first and then outline otherwise a line is
@@ -1249,11 +1158,11 @@ void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
 #endif
 }
 
-void wxMSWDCImpl::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
+void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
-    wxCHECK_RET( icon.IsOk(), wxT("invalid icon in DrawIcon") );
+    wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
 
 #ifdef __WIN32__
     ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
@@ -1265,11 +1174,11 @@ void wxMSWDCImpl::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
     CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());
 }
 
-void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
+void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
 {
     WXMICROWIN_CHECK_HDC
 
-    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap in wxMSWDCImpl::DrawBitmap") );
+    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();
@@ -1285,11 +1194,13 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
         MemoryHDC hdcMem;
         SelectInHDC select(hdcMem, GetHbitmapOf(bmp));
 
-        if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, width, height, hdcMem, bmp) )
+        if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, hdcMem, bmp) )
             return;
     }
 
-    SET_STRETCH_BLT_MODE(GetHdc());
+#ifndef __WXWINCE__
+    StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
+#endif
 
     if ( useMask )
     {
@@ -1309,20 +1220,13 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
 #ifdef __WIN32__
         // use MaskBlt() with ROP which doesn't do anything to dst in the mask
         // points
-        bool ok = false;
-
-#if wxUSE_SYSTEM_OPTIONS
         // On some systems, MaskBlt succeeds yet is much much slower
         // than the wxWidgets fall-back implementation. So we need
         // to be able to switch this on and off at runtime.
-        //
-        // NB: don't query the value of the option every time but do it only
-        //     once as otherwise it can have real (and bad) performance
-        //     implications (see #11172)
-        static bool
-            s_maskBltAllowed = wxSystemOptions::GetOptionInt("no-maskblt") == 0;
-        if ( s_maskBltAllowed )
-#endif // wxUSE_SYSTEM_OPTIONS
+        bool ok = false;
+#if wxUSE_SYSTEM_OPTIONS
+        if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
+#endif
         {
             HDC cdc = GetHdc();
             HDC hdcMem = ::CreateCompatibleDC(GetHdc());
@@ -1353,13 +1257,13 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
         if ( !ok )
 #endif // Win32
         {
-            // Rather than reproduce wxMSWDCImpl::Blit, let's do it at the wxWin API
+            // Rather than reproduce wxDC::Blit, let's do it at the wxWin API
             // level
             wxMemoryDC memDC;
 
             memDC.SelectObjectAsSource(bmp);
 
-            GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+            Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
 
             memDC.SelectObject(wxNullBitmap);
         }
@@ -1372,7 +1276,16 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
 
         wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
 
-        wxTextColoursChanger textCol(GetHdc(), *this);
+        COLORREF old_textground = ::GetTextColor(GetHdc());
+        COLORREF old_background = ::GetBkColor(GetHdc());
+        if (m_textForegroundColour.Ok())
+        {
+            ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
+        }
+        if (m_textBackgroundColour.Ok())
+        {
+            ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+        }
 
 #if wxUSE_PALETTE
         wxPalette *pal = bmp.GetPalette();
@@ -1393,23 +1306,14 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
 
         ::SelectObject( memdc, hOldBitmap );
         ::DeleteDC( memdc );
+
+        ::SetTextColor(GetHdc(), old_textground);
+        ::SetBkColor(GetHdc(), old_background);
     }
 }
 
-void wxMSWDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 {
-    // For compatibility with other ports (notably wxGTK) and because it's
-    // genuinely useful, we allow passing multiline strings to DrawText().
-    // However there is no native MSW function to draw them directly so we
-    // instead reuse the generic DrawLabel() method to render them. Of course,
-    // DrawLabel() itself will call back to us but with single line strings
-    // only so there won't be any infinite recursion here.
-    if ( text.find('\n') != wxString::npos )
-    {
-        GetOwner()->DrawLabel(text, wxRect(x, y, 0, 0));
-        return;
-    }
-
     WXMICROWIN_CHECK_HDC
 
     DrawAnyText(text, x, y);
@@ -1418,27 +1322,51 @@ void wxMSWDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
     CalcBoundingBox(x, y);
 
     wxCoord w, h;
-    GetOwner()->GetTextExtent(text, &w, &h);
+    GetTextExtent(text, &w, &h);
     CalcBoundingBox(x + w, y + h);
 }
 
-void wxMSWDCImpl::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
+void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
     // prepare for drawing the text
-    wxTextColoursChanger textCol(GetHdc(), *this);
+    if ( m_textForegroundColour.Ok() )
+        SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
 
-    wxBkModeChanger bkMode(GetHdc(), m_backgroundMode);
+    DWORD old_background = 0;
+    if ( m_textBackgroundColour.Ok() )
+    {
+        old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+    }
 
+    SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
+                                                          : OPAQUE);
+
+#ifdef __WXWINCE__
     if ( ::ExtTextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), 0, NULL,
                    text.c_str(), text.length(), NULL) == 0 )
     {
         wxLogLastError(wxT("TextOut"));
     }
+#else
+    if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+                   text.c_str(), text.length()) == 0 )
+    {
+        wxLogLastError(wxT("TextOut"));
+    }
+#endif
+
+    // restore the old parameters (text foreground colour may be left because
+    // it never is set to anything else, but background should remain
+    // transparent even if we just drew an opaque string)
+    if ( m_textBackgroundColour.Ok() )
+        (void)SetBkColor(GetHdc(), old_background);
+
+    SetBkMode(GetHdc(), TRANSPARENT);
 }
 
-void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
+void wxDC::DoDrawRotatedText(const wxString& text,
                              wxCoord x, wxCoord y,
                              double angle)
 {
@@ -1448,7 +1376,7 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
     // "else" part below to avoid that DrawRotatedText(angle = 180) and
     // DrawRotatedText(angle = 0) use different fonts (we can't use the default
     // font for drawing rotated fonts unfortunately)
-    if ( (angle == 0.0) && m_font.IsOk() )
+    if ( (angle == 0.0) && m_font.Ok() )
     {
         DoDrawText(text, x, y);
     }
@@ -1458,7 +1386,7 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
         // NB: don't take DEFAULT_GUI_FONT (a.k.a. wxSYS_DEFAULT_GUI_FONT)
         //     because it's not TrueType and so can't have non zero
         //     orientation/escapement under Win9x
-        wxFont font = m_font.IsOk() ? m_font : *wxSWISS_FONT;
+        wxFont font = m_font.Ok() ? m_font : *wxSWISS_FONT;
         HFONT hfont = (HFONT)font.GetResourceHandle();
         LOGFONT lf;
         if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
@@ -1490,7 +1418,7 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
         // containing the text to it (simpler and probably not slower than
         // determining which of them is really topmost/leftmost/...)
         wxCoord w, h;
-        GetOwner()->GetTextExtent(text, &w, &h);
+        GetTextExtent(text, &w, &h);
 
         double rad = DegToRad(angle);
 
@@ -1513,7 +1441,7 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
 
 #if wxUSE_PALETTE
 
-void wxMSWDCImpl::DoSelectPalette(bool realize)
+void wxDC::DoSelectPalette(bool realize)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -1525,7 +1453,7 @@ void wxMSWDCImpl::DoSelectPalette(bool realize)
         m_oldPalette = 0;
     }
 
-    if ( m_palette.IsOk() )
+    if ( m_palette.Ok() )
     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),
@@ -1538,22 +1466,22 @@ void wxMSWDCImpl::DoSelectPalette(bool realize)
     }
 }
 
-void wxMSWDCImpl::SetPalette(const wxPalette& palette)
+void wxDC::SetPalette(const wxPalette& palette)
 {
-    if ( palette.IsOk() )
+    if ( palette.Ok() )
     {
         m_palette = palette;
         DoSelectPalette(true);
     }
 }
 
-void wxMSWDCImpl::InitializePalette()
+void wxDC::InitializePalette()
 {
     if ( wxDisplayDepth() <= 8 )
     {
         // look for any window or parent that has a custom palette. If any has
         // one then we need to use it in drawing operations
-        wxWindow *win = m_window->GetAncestorWithCustomPalette();
+        wxWindow *win = m_canvas->GetAncestorWithCustomPalette();
 
         m_hasCustomPalette = win && win->HasCustomPalette();
         if ( m_hasCustomPalette )
@@ -1571,19 +1499,19 @@ void wxMSWDCImpl::InitializePalette()
 // SetFont/Pen/Brush() really ask to be implemented as a single template
 // function... but doing it is not worth breaking OpenWatcom build <sigh>
 
-void wxMSWDCImpl::SetFont(const wxFont& font)
+void wxDC::SetFont(const wxFont& font)
 {
     WXMICROWIN_CHECK_HDC
 
     if ( font == m_font )
         return;
 
-    if ( font.IsOk() )
+    if ( font.Ok() )
     {
         HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
         if ( hfont == HGDI_ERROR )
         {
-            wxLogLastError(wxT("SelectObject(font)"));
+            wxLogLastError(_T("SelectObject(font)"));
         }
         else // selected ok
         {
@@ -1599,7 +1527,7 @@ void wxMSWDCImpl::SetFont(const wxFont& font)
         {
             if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR )
             {
-                wxLogLastError(wxT("SelectObject(old font)"));
+                wxLogLastError(_T("SelectObject(old font)"));
             }
 
             m_oldFont = 0;
@@ -1609,19 +1537,19 @@ void wxMSWDCImpl::SetFont(const wxFont& font)
     }
 }
 
-void wxMSWDCImpl::SetPen(const wxPen& pen)
+void wxDC::SetPen(const wxPen& pen)
 {
     WXMICROWIN_CHECK_HDC
 
     if ( pen == m_pen )
         return;
 
-    if ( pen.IsOk() )
+    if ( pen.Ok() )
     {
         HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
         if ( hpen == HGDI_ERROR )
         {
-            wxLogLastError(wxT("SelectObject(pen)"));
+            wxLogLastError(_T("SelectObject(pen)"));
         }
         else // selected ok
         {
@@ -1637,7 +1565,7 @@ void wxMSWDCImpl::SetPen(const wxPen& pen)
         {
             if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR )
             {
-                wxLogLastError(wxT("SelectObject(old pen)"));
+                wxLogLastError(_T("SelectObject(old pen)"));
             }
 
             m_oldPen = 0;
@@ -1647,43 +1575,36 @@ void wxMSWDCImpl::SetPen(const wxPen& pen)
     }
 }
 
-void wxMSWDCImpl::SetBrush(const wxBrush& brush)
+void wxDC::SetBrush(const wxBrush& brush)
 {
     WXMICROWIN_CHECK_HDC
 
     if ( brush == m_brush )
         return;
 
-    if ( brush.IsOk() )
+    if ( brush.Ok() )
     {
         // we must make sure the brush is aligned with the logical coordinates
-        // before selecting it or using the same brush for the background of
-        // different windows would result in discontinuities
-        wxSize sizeBrushBitmap = wxDefaultSize;
+        // before selecting it
         wxBitmap *stipple = brush.GetStipple();
-        if ( stipple && stipple->IsOk() )
-            sizeBrushBitmap = stipple->GetSize();
-        else if ( brush.IsHatch() )
-            sizeBrushBitmap = wxSize(8, 8);
-
-        if ( sizeBrushBitmap.IsFullySpecified() )
+        if ( stipple && stipple->Ok() )
         {
             if ( !::SetBrushOrgEx
                     (
                         GetHdc(),
-                        m_deviceOriginX % sizeBrushBitmap.x,
-                        m_deviceOriginY % sizeBrushBitmap.y,
+                        m_deviceOriginX % stipple->GetWidth(),
+                        m_deviceOriginY % stipple->GetHeight(),
                         NULL                    // [out] previous brush origin
                     ) )
             {
-                wxLogLastError(wxT("SetBrushOrgEx()"));
+                wxLogLastError(_T("SetBrushOrgEx()"));
             }
         }
 
         HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush));
         if ( hbrush == HGDI_ERROR )
         {
-            wxLogLastError(wxT("SelectObject(brush)"));
+            wxLogLastError(_T("SelectObject(brush)"));
         }
         else // selected ok
         {
@@ -1699,7 +1620,7 @@ void wxMSWDCImpl::SetBrush(const wxBrush& brush)
         {
             if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR )
             {
-                wxLogLastError(wxT("SelectObject(old brush)"));
+                wxLogLastError(_T("SelectObject(old brush)"));
             }
 
             m_oldBrush = 0;
@@ -1709,19 +1630,19 @@ void wxMSWDCImpl::SetBrush(const wxBrush& brush)
     }
 }
 
-void wxMSWDCImpl::SetBackground(const wxBrush& brush)
+void wxDC::SetBackground(const wxBrush& brush)
 {
     WXMICROWIN_CHECK_HDC
 
     m_backgroundBrush = brush;
 
-    if ( m_backgroundBrush.IsOk() )
+    if ( m_backgroundBrush.Ok() )
     {
         (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());
     }
 }
 
-void wxMSWDCImpl::SetBackgroundMode(int mode)
+void wxDC::SetBackgroundMode(int mode)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -1731,7 +1652,7 @@ void wxMSWDCImpl::SetBackgroundMode(int mode)
     // and m_backgroundMode is used there
 }
 
-void wxMSWDCImpl::SetLogicalFunction(wxRasterOperationMode function)
+void wxDC::SetLogicalFunction(int function)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -1740,7 +1661,7 @@ void wxMSWDCImpl::SetLogicalFunction(wxRasterOperationMode function)
     SetRop(m_hDC);
 }
 
-void wxMSWDCImpl::SetRop(WXHDC dc)
+void wxDC::SetRop(WXHDC dc)
 {
     if ( !dc || m_logicalFunction < 0 )
         return;
@@ -1765,29 +1686,30 @@ void wxMSWDCImpl::SetRop(WXHDC dc)
         case wxNAND:         rop = R2_NOTMASKPEN;    break;
         case wxOR:           rop = R2_MERGEPEN;      break;
         case wxSET:          rop = R2_WHITE;         break;
+
         default:
-            wxFAIL_MSG( wxS("unknown logical function") );
-            return;
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           return;
     }
 
     SetROP2(GetHdc(), rop);
 }
 
-bool wxMSWDCImpl::StartDoc(const wxString& WXUNUSED(message))
+bool wxDC::StartDoc(const wxString& WXUNUSED(message))
 {
     // We might be previewing, so return true to let it continue.
     return true;
 }
 
-void wxMSWDCImpl::EndDoc()
+void wxDC::EndDoc()
 {
 }
 
-void wxMSWDCImpl::StartPage()
+void wxDC::StartPage()
 {
 }
 
-void wxMSWDCImpl::EndPage()
+void wxDC::EndPage()
 {
 }
 
@@ -1795,7 +1717,7 @@ void wxMSWDCImpl::EndPage()
 // text metrics
 // ---------------------------------------------------------------------------
 
-wxCoord wxMSWDCImpl::GetCharHeight() const
+wxCoord wxDC::GetCharHeight() const
 {
     WXMICROWIN_CHECK_HDC_RET(0)
 
@@ -1806,7 +1728,7 @@ wxCoord wxMSWDCImpl::GetCharHeight() const
     return lpTextMetric.tmHeight;
 }
 
-wxCoord wxMSWDCImpl::GetCharWidth() const
+wxCoord wxDC::GetCharWidth() const
 {
     WXMICROWIN_CHECK_HDC_RET(0)
 
@@ -1817,34 +1739,9 @@ wxCoord wxMSWDCImpl::GetCharWidth() const
     return lpTextMetric.tmAveCharWidth;
 }
 
-void wxMSWDCImpl::DoGetFontMetrics(int *height,
-                                   int *ascent,
-                                   int *descent,
-                                   int *internalLeading,
-                                   int *externalLeading,
-                                   int *averageWidth) const
-{
-    TEXTMETRIC tm;
-
-    GetTextMetrics(GetHdc(), &tm);
-
-    if ( height )
-        *height = tm.tmHeight;
-    if ( ascent )
-        *ascent = tm.tmAscent;
-    if ( descent )
-        *descent = tm.tmDescent;
-    if ( internalLeading )
-        *internalLeading = tm.tmInternalLeading;
-    if ( externalLeading )
-        *externalLeading = tm.tmExternalLeading;
-    if ( averageWidth )
-        *averageWidth = tm.tmAveCharWidth;
-}
-
-void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
+void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,
-                           const wxFont *font) const
+                           wxFont *font) const
 {
 #ifdef __WXMICROWIN__
     if (!GetHDC())
@@ -1860,7 +1757,7 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
     HFONT hfontOld;
     if ( font )
     {
-        wxASSERT_MSG( font->IsOk(), wxT("invalid font in wxMSWDCImpl::GetTextExtent") );
+        wxASSERT_MSG( font->Ok(), _T("invalid font in wxDC::GetTextExtent") );
 
         hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
     }
@@ -1871,9 +1768,9 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
 
     SIZE sizeRect;
     const size_t len = string.length();
-    if ( !::GetTextExtentPoint32(GetHdc(), string.t_str(), len, &sizeRect) )
+    if ( !::GetTextExtentPoint32(GetHdc(), string, len, &sizeRect) )
     {
-        wxLogLastError(wxT("GetTextExtentPoint32()"));
+        wxLogLastError(_T("GetTextExtentPoint32()"));
     }
 
 #if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
@@ -1904,15 +1801,17 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
     }
 #endif // !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
 
+    TEXTMETRIC tm;
+    ::GetTextMetrics(GetHdc(), &tm);
+
     if (x)
         *x = sizeRect.cx;
     if (y)
         *y = sizeRect.cy;
-
-    if ( descent || externalLeading )
-    {
-        DoGetFontMetrics(NULL, NULL, descent, NULL, externalLeading, NULL);
-    }
+    if (descent)
+        *descent = tm.tmDescent;
+    if (externalLeading)
+        *externalLeading = tm.tmExternalLeading;
 
     if ( hfontOld )
     {
@@ -1924,7 +1823,7 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
 // Each element of the array will be the width of the string up to and
 // including the coresoponding character in text.
 
-bool wxMSWDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
 {
     static int maxLenText = -1;
     static int maxWidth = -1;
@@ -1962,58 +1861,10 @@ bool wxMSWDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widt
     return true;
 }
 
-namespace
-{
 
-void ApplyEffectiveScale(double scale, int sign, int *device, int *logical)
-{
-    // To reduce rounding errors as much as possible, we try to use the largest
-    // possible extent (2^27-1) for the device space but we must also avoid
-    // overflowing the int range i.e. ensure that logical extents are less than
-    // 2^31 in magnitude. So the minimal scale we can use is 1/16 as for
-    // anything smaller VIEWPORT_EXTENT/scale would overflow the int range.
-    static const double MIN_LOGICAL_SCALE = 1./16;
 
-    double physExtent = VIEWPORT_EXTENT;
-    if ( scale < MIN_LOGICAL_SCALE )
-    {
-        physExtent *= scale/MIN_LOGICAL_SCALE;
-        scale = MIN_LOGICAL_SCALE;
-    }
 
-    *device = wxRound(physExtent);
-    *logical = sign*wxRound(VIEWPORT_EXTENT/scale);
-}
-
-} // anonymous namespace
-
-void wxMSWDCImpl::RealizeScaleAndOrigin()
-{
-    // although it may seem wasteful to always use MM_ANISOTROPIC here instead
-    // of using MM_TEXT if there is no scaling, benchmarking doesn't detect any
-    // noticeable difference between these mapping modes
-#ifndef __WXWINCE__
-    ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
-
-    // wxWidgets API assumes that the coordinate space is "infinite" (i.e. only
-    // limited by 2^32 range of the integer coordinates) but in MSW API we must
-    // actually specify the extents that we use so compute them here.
-
-    int devExtX, devExtY,   // Viewport, i.e. device space, extents.
-        logExtX, logExtY;   // Window, i.e. logical coordinate space, extents.
-
-    ApplyEffectiveScale(m_scaleX, m_signX, &devExtX, &logExtX);
-    ApplyEffectiveScale(m_scaleY, m_signY, &devExtY, &logExtY);
-
-    ::SetViewportExtEx(GetHdc(), devExtX, devExtY, NULL);
-    ::SetWindowExtEx(GetHdc(), logExtX, logExtY, NULL);
-
-    ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
-    ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
-#endif
-}
-
-void wxMSWDCImpl::SetMapMode(wxMappingMode mode)
+void wxDC::SetMapMode(int mode)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -2063,199 +1914,172 @@ void wxMSWDCImpl::SetMapMode(wxMappingMode mode)
                 break;
 
             default:
-                wxFAIL_MSG( wxT("unknown mapping mode in SetMapMode") );
+                wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") );
         }
     }
 
-    ComputeScaleAndOrigin();
+    // VZ: it seems very wasteful to always use MM_ANISOTROPIC when in 99% of
+    //     cases we could do with MM_TEXT and in the remaining 0.9% with
+    //     MM_ISOTROPIC (TODO!)
+#ifndef __WXWINCE__
+    ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
 
-    RealizeScaleAndOrigin();
+    int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
+        height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
+
+    ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+    ::SetWindowExtEx(GetHdc(), width, height, NULL);
+
+    ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
+    ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
+#endif
 }
 
-void wxMSWDCImpl::SetUserScale(double x, double y)
+void wxDC::SetUserScale(double x, double y)
 {
     WXMICROWIN_CHECK_HDC
 
     if ( x == m_userScaleX && y == m_userScaleY )
         return;
 
-    wxDCImpl::SetUserScale(x,y);
+    m_userScaleX = x;
+    m_userScaleY = y;
 
-    RealizeScaleAndOrigin();
+    this->SetMapMode(m_mappingMode);
 }
 
-void wxMSWDCImpl::SetAxisOrientation(bool xLeftRight,
-                              bool yBottomUp)
+void wxDC::SetAxisOrientation(bool WXUNUSED_IN_WINCE(xLeftRight),
+                              bool WXUNUSED_IN_WINCE(yBottomUp))
 {
     WXMICROWIN_CHECK_HDC
 
+#ifndef __WXWINCE__
     int signX = xLeftRight ? 1 : -1,
         signY = yBottomUp ? -1 : 1;
 
-    if (signX == m_signX && signY == m_signY)
-        return;
+    if ( signX != m_signX || signY != m_signY )
+    {
+        m_signX = signX;
+        m_signY = signY;
 
-    wxDCImpl::SetAxisOrientation( xLeftRight, yBottomUp );
-
-    RealizeScaleAndOrigin();
+        SetMapMode(m_mappingMode);
+    }
+#endif
 }
 
-void wxMSWDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y)
+void wxDC::SetSystemScale(double x, double y)
+{
+    WXMICROWIN_CHECK_HDC
+
+    if ( x == m_scaleX && y == m_scaleY )
+        return;
+
+    m_scaleX = x;
+    m_scaleY = y;
+
+#ifndef __WXWINCE__
+    SetMapMode(m_mappingMode);
+#endif
+}
+
+void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
     if ( x == m_logicalOriginX && y == m_logicalOriginY )
         return;
 
-    wxDCImpl::SetLogicalOrigin( x, y );
+    m_logicalOriginX = x;
+    m_logicalOriginY = y;
 
-    RealizeScaleAndOrigin();
+#ifndef __WXWINCE__
+    ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+#endif
 }
 
-// For use by wxWidgets only, unless custom units are required.
-void wxMSWDCImpl::SetLogicalScale(double x, double y)
-{
-    WXMICROWIN_CHECK_HDC
-
-    wxDCImpl::SetLogicalScale(x,y);
-}
-
-void wxMSWDCImpl::SetDeviceOrigin(wxCoord x, wxCoord y)
+void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
     if ( x == m_deviceOriginX && y == m_deviceOriginY )
         return;
 
-    wxDCImpl::SetDeviceOrigin( x, y );
+    m_deviceOriginX = x;
+    m_deviceOriginY = y;
 
     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
 }
 
-// ----------------------------------------------------------------------------
-// Transform matrix
-// ----------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+// coordinates transformations
+// ---------------------------------------------------------------------------
 
-#if wxUSE_DC_TRANSFORM_MATRIX
-
-bool wxMSWDCImpl::CanUseTransformMatrix() const
+wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
 {
-    return GdiWorldTransformFuncs::IsOk();
+    return DeviceToLogicalXRel(x - m_deviceOriginX)*m_signX + m_logicalOriginX;
 }
 
-bool wxMSWDCImpl::SetTransformMatrix(const wxAffineMatrix2D &matrix)
+wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
 {
-    if ( !GdiWorldTransformFuncs::IsOk() )
-        return false;
-
-    if ( matrix.IsIdentity() )
-    {
-        ResetTransformMatrix();
-        return true;
-    }
-
-    if ( !GdiWorldTransformFuncs::SetGraphicsMode()(GetHdc(), GM_ADVANCED) )
-    {
-        wxLogLastError(wxT("SetGraphicsMode"));
-        return false;
-    }
-
-    wxMatrix2D mat;
-    wxPoint2DDouble tr;
-    matrix.Get(&mat, &tr);
-
-    XFORM xform;
-    xform.eM11 = mat.m_11;
-    xform.eM12 = mat.m_12;
-    xform.eM21 = mat.m_21;
-    xform.eM22 = mat.m_22;
-    xform.eDx = tr.m_x;
-    xform.eDy = tr.m_y;
-
-    if ( !GdiWorldTransformFuncs::SetWorldTransform()(GetHdc(), &xform) )
-    {
-        wxLogLastError(wxT("SetWorldTransform"));
-        return false;
-    }
-
-    return true;
+    // axis orientation is not taken into account for conversion of a distance
+    return (wxCoord)(x / (m_logicalScaleX*m_userScaleX*m_scaleX));
 }
 
-wxAffineMatrix2D wxMSWDCImpl::GetTransformMatrix() const
+wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
 {
-    wxAffineMatrix2D transform;
-
-    if ( !GdiWorldTransformFuncs::IsOk() )
-        return transform;
-
-    XFORM xform;
-    if ( !GdiWorldTransformFuncs::GetWorldTransform()(GetHdc(), &xform) )
-    {
-        wxLogLastError(wxT("GetWorldTransform"));
-        return transform;
-    }
-
-    wxMatrix2D m(xform.eM11, xform.eM12, xform.eM21, xform.eM22);
-    wxPoint2DDouble p(xform.eDx, xform.eDy);
-    transform.Set(m, p);
-
-    return transform;
+    return DeviceToLogicalYRel(y - m_deviceOriginY)*m_signY + m_logicalOriginY;
 }
 
-void wxMSWDCImpl::ResetTransformMatrix()
+wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
 {
-    if ( GdiWorldTransformFuncs::IsOk() )
-    {
-        GdiWorldTransformFuncs::ModifyWorldTransform()(GetHdc(), NULL, MWT_IDENTITY);
-        GdiWorldTransformFuncs::SetGraphicsMode()(GetHdc(), GM_COMPATIBLE);
-    }
+    // axis orientation is not taken into account for conversion of a distance
+    return (wxCoord)( y / (m_logicalScaleY*m_userScaleY*m_scaleY));
 }
 
-#endif // wxUSE_DC_TRANSFORM_MATRIX
+wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
+{
+    return LogicalToDeviceXRel(x - m_logicalOriginX)*m_signX + m_deviceOriginX;
+}
+
+wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
+{
+    // axis orientation is not taken into account for conversion of a distance
+    return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_scaleX);
+}
+
+wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
+{
+    return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY;
+}
+
+wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
+{
+    // axis orientation is not taken into account for conversion of a distance
+    return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_scaleY);
+}
 
 // ---------------------------------------------------------------------------
 // bit blit
 // ---------------------------------------------------------------------------
 
-bool wxMSWDCImpl::DoBlit(wxCoord dstX, wxCoord dstY,
-                  wxCoord dstWidth, wxCoord dstHeight,
-                  wxDC *source,
-                  wxCoord srcX, wxCoord srcY,
-                  wxRasterOperationMode rop, bool useMask,
-                  wxCoord srcMaskX, wxCoord srcMaskY)
+bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
+                  wxCoord width, wxCoord height,
+                  wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                  int rop, bool useMask,
+                  wxCoord xsrcMask, wxCoord ysrcMask)
 {
-    return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY);
-}
-
-bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
-                         wxCoord dstWidth, wxCoord dstHeight,
-                         wxDC *source,
-                         wxCoord xsrc, wxCoord ysrc,
-                         wxCoord srcWidth, wxCoord srcHeight,
-                         wxRasterOperationMode rop, bool useMask,
-                         wxCoord xsrcMask, wxCoord ysrcMask)
-{
-    wxCHECK_MSG( source, false, wxT("wxMSWDCImpl::Blit(): NULL wxDC pointer") );
+    wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") );
 
     WXMICROWIN_CHECK_HDC_RET(false)
 
-    wxMSWDCImpl *implSrc = wxDynamicCast( source->GetImpl(), wxMSWDCImpl );
-    if ( !implSrc )
-    {
-        // TODO: Do we want to be able to blit from other DCs too?
-        return false;
-    }
-
-    const HDC hdcSrc = GetHdcOf(*implSrc);
-
     // if either the source or destination has alpha channel, we must use
     // AlphaBlt() as other function don't handle it correctly
-    const wxBitmap& bmpSrc = implSrc->GetSelectedBitmap();
-    if ( bmpSrc.IsOk() && (bmpSrc.HasAlpha() ||
-            (m_selectedBitmap.IsOk() && m_selectedBitmap.HasAlpha())) )
+    const wxBitmap& bmpSrc = source->m_selectedBitmap;
+    if ( bmpSrc.Ok() && (bmpSrc.HasAlpha() ||
+            (m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) )
     {
-        if ( AlphaBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
-                      xsrc, ysrc, srcWidth, srcHeight, hdcSrc, bmpSrc) )
+        if ( AlphaBlt(GetHdc(), xdest, ydest, width, height,
+                      xsrc, ysrc, GetHdcOf(*source), bmpSrc) )
             return true;
     }
 
@@ -2264,7 +2088,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
     {
         mask = bmpSrc.GetMask();
 
-        if ( !(bmpSrc.IsOk() && mask && mask->GetMaskBitmap()) )
+        if ( !(bmpSrc.Ok() && mask && mask->GetMaskBitmap()) )
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter
@@ -2277,7 +2101,16 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
         xsrcMask = xsrc; ysrcMask = ysrc;
     }
 
-    wxTextColoursChanger textCol(GetHdc(), *this);
+    COLORREF old_textground = ::GetTextColor(GetHdc());
+    COLORREF old_background = ::GetBkColor(GetHdc());
+    if (m_textForegroundColour.Ok())
+    {
+        ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
+    }
+    if (m_textBackgroundColour.Ok())
+    {
+        ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+    }
 
     DWORD dwRop;
     switch (rop)
@@ -2317,23 +2150,19 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
         // than the wxWidgets fall-back implementation. So we need
         // to be able to switch this on and off at runtime.
 #if wxUSE_SYSTEM_OPTIONS
-        static bool s_maskBltAllowed = wxSystemOptions::GetOptionInt("no-maskblt") == 0;
-        if ( s_maskBltAllowed )
+        if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
 #endif
         {
-            if ( dstWidth == srcWidth && dstHeight == srcHeight )
-            {
-                success = ::MaskBlt
-                            (
+           success = ::MaskBlt
+                       (
                             GetHdc(),
-                            xdest, ydest, dstWidth, dstHeight,
-                            hdcSrc,
+                            xdest, ydest, width, height,
+                            GetHdcOf(*source),
                             xsrc, ysrc,
                             (HBITMAP)mask->GetMaskBitmap(),
                             xsrcMask, ysrcMask,
                             MAKEROP4(dwRop, DSTCOPY)
-                            ) != 0;
-            }
+                        ) != 0;
         }
 
         if ( !success )
@@ -2346,64 +2175,62 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
 #if wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask
-            wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, hdcSrc);
+            wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, source->GetHDC());
             dc_mask = (HDC) dcCacheEntry1->m_dc;
 
             wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC());
             dc_buffer = (HDC) dcCacheEntry2->m_dc;
 
             wxDCCacheEntry* bitmapCacheEntry = FindBitmapInCache(GetHDC(),
-                dstWidth, dstHeight);
+                width, height);
 
             buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
 #else // !wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask
-            dc_mask = ::CreateCompatibleDC(hdcSrc);
+            dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
             dc_buffer = ::CreateCompatibleDC(GetHdc());
-            buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight);
+            buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
 #endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
             HGDIOBJ hOldMaskBitmap = ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
             HGDIOBJ hOldBufferBitmap = ::SelectObject(dc_buffer, buffer_bmap);
 
             // copy dest to buffer
-            if ( !::BitBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
                            GetHdc(), xdest, ydest, SRCCOPY) )
             {
                 wxLogLastError(wxT("BitBlt"));
             }
 
-            SET_STRETCH_BLT_MODE(GetHdc());
-
             // copy src to buffer using selected raster op
-            if ( !::StretchBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
-                               hdcSrc, xsrc, ysrc, srcWidth, srcHeight, dwRop) )
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           GetHdcOf(*source), xsrc, ysrc, dwRop) )
             {
-                wxLogLastError(wxT("StretchBlt"));
+                wxLogLastError(wxT("BitBlt"));
             }
 
-            // set masked area in buffer to BLACK
+            // set masked area in buffer to BLACK (pixel value 0)
+            COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
+            COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           dc_mask, xsrcMask, ysrcMask, SRCAND) )
             {
-                wxTextColoursChanger textCol2(GetHdc(), *wxBLACK, *wxWHITE);
-                if ( !::StretchBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
-                                   dc_mask, xsrcMask, ysrcMask,
-                                   srcWidth, srcHeight, SRCAND) )
-                {
-                    wxLogLastError(wxT("StretchBlt"));
-                }
+                wxLogLastError(wxT("BitBlt"));
+            }
 
-                // set unmasked area in dest to BLACK
-                ::SetBkColor(GetHdc(), RGB(0, 0, 0));
-                ::SetTextColor(GetHdc(), RGB(255, 255, 255));
-                if ( !::StretchBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
-                                   dc_mask, xsrcMask, ysrcMask,
-                                   srcWidth, srcHeight, SRCAND) )
-                {
-                    wxLogLastError(wxT("StretchBlt"));
-                }
-            } // restore the original text and background colours
+            // set unmasked area in dest to BLACK
+            ::SetBkColor(GetHdc(), RGB(0, 0, 0));
+            ::SetTextColor(GetHdc(), RGB(255, 255, 255));
+            if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
+                           dc_mask, xsrcMask, ysrcMask, SRCAND) )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }
+            ::SetBkColor(GetHdc(), prevBkCol);   // restore colours to original values
+            ::SetTextColor(GetHdc(), prevCol);
 
             // OR buffer to dest
-            success = ::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
+            success = ::BitBlt(GetHdc(), xdest, ydest,
+                               (int)width, (int)height,
                                dc_buffer, 0, 0, SRCPAINT) != 0;
             if ( !success )
             {
@@ -2431,7 +2258,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
         // FIXME: use appropriate WinCE functions
 #ifndef __WXWINCE__
         const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS);
-        if ( bmpSrc.IsOk() && (caps & RC_STRETCHDIB) )
+        if ( bmpSrc.Ok() && (caps & RC_STRETCHDIB) )
         {
             DIBSECTION ds;
             wxZeroMemory(ds);
@@ -2440,18 +2267,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                              sizeof(ds),
                              &ds) == sizeof(ds) )
             {
-                SET_STRETCH_BLT_MODE(GetHdc());
-
-                // Unlike all the other functions used here (i.e. AlphaBlt(),
-                // MaskBlt(), BitBlt() and StretchBlt()), StretchDIBits() does
-                // not take into account the source DC logical coordinates
-                // automatically as it doesn't even work with the source HDC.
-                // So do this manually to ensure that the coordinates are
-                // interpreted in the same way here as in all the other cases.
-                xsrc = source->LogicalToDeviceX(xsrc);
-                ysrc = source->LogicalToDeviceY(ysrc);
-                srcWidth = source->LogicalToDeviceXRel(srcWidth);
-                srcHeight = source->LogicalToDeviceYRel(srcHeight);
+                StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
 
                 // Figure out what co-ordinate system we're supposed to specify
                 // ysrc in.
@@ -2459,14 +2275,14 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                 if ( hDIB > 0 )
                 {
                     // reflect ysrc
-                    ysrc = hDIB - (ysrc + srcHeight);
+                    ysrc = hDIB - (ysrc + height);
                 }
 
                 if ( ::StretchDIBits(GetHdc(),
                                      xdest, ydest,
-                                     dstWidth, dstHeight,
+                                     width, height,
                                      xsrc, ysrc,
-                                     srcWidth, srcHeight,
+                                     width, height,
                                      ds.dsBm.bmBits,
                                      (LPBITMAPINFO)&ds.dsBmih,
                                      DIB_RGB_COLORS,
@@ -2490,18 +2306,20 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 #endif
         // __WXWINCE__
         {
-            SET_STRETCH_BLT_MODE(GetHdc());
+#ifndef __WXWINCE__
+            StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
+#endif
 
             if ( !::StretchBlt
                     (
                         GetHdc(),
-                        xdest, ydest, dstWidth, dstHeight,
-                        hdcSrc,
-                        xsrc, ysrc, srcWidth, srcHeight,
+                        xdest, ydest, width, height,
+                        GetHdcOf(*source),
+                        xsrc, ysrc, width, height,
                         dwRop
                     ) )
             {
-                wxLogLastError(wxT("StretchBlt"));
+                wxLogLastError(_T("StretchBlt"));
             }
             else
             {
@@ -2511,10 +2329,17 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
         if ( !success )
         {
-            if ( !::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
-                           hdcSrc, xsrc, ysrc, dwRop) )
+            if ( !::BitBlt
+                    (
+                        GetHdc(),
+                        xdest, ydest,
+                        (int)width, (int)height,
+                        GetHdcOf(*source),
+                        xsrc, ysrc,
+                        dwRop
+                    ) )
             {
-                wxLogLastError(wxT("BitBlt"));
+                wxLogLastError(_T("BitBlt"));
             }
             else
             {
@@ -2523,10 +2348,13 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
         }
     }
 
+    ::SetTextColor(GetHdc(), old_textground);
+    ::SetBkColor(GetHdc(), old_background);
+
     return success;
 }
 
-void wxMSWDCImpl::GetDeviceSize(int *width, int *height) const
+void wxDC::GetDeviceSize(int *width, int *height) const
 {
     WXMICROWIN_CHECK_HDC
 
@@ -2536,7 +2364,7 @@ void wxMSWDCImpl::GetDeviceSize(int *width, int *height) const
         *height = ::GetDeviceCaps(GetHdc(), VERTRES);
 }
 
-void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const
+void wxDC::DoGetSizeMM(int *w, int *h) const
 {
     WXMICROWIN_CHECK_HDC
 
@@ -2551,7 +2379,7 @@ void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const
     {
         int wTotal = ::GetDeviceCaps(GetHdc(), HORZRES);
 
-        wxCHECK_RET( wTotal, wxT("0 width device?") );
+        wxCHECK_RET( wTotal, _T("0 width device?") );
 
         *w = (wPixels * ::GetDeviceCaps(GetHdc(), HORZSIZE)) / wTotal;
     }
@@ -2560,13 +2388,13 @@ void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const
     {
         int hTotal = ::GetDeviceCaps(GetHdc(), VERTRES);
 
-        wxCHECK_RET( hTotal, wxT("0 height device?") );
+        wxCHECK_RET( hTotal, _T("0 height device?") );
 
         *h = (hPixels * ::GetDeviceCaps(GetHdc(), VERTSIZE)) / hTotal;
     }
 }
 
-wxSize wxMSWDCImpl::GetPPI() const
+wxSize wxDC::GetPPI() const
 {
     WXMICROWIN_CHECK_HDC_RET(wxSize(0,0))
 
@@ -2576,6 +2404,15 @@ wxSize wxMSWDCImpl::GetPPI() const
     return wxSize(x, y);
 }
 
+// For use by wxWidgets only, unless custom units are required.
+void wxDC::SetLogicalScale(double x, double y)
+{
+    WXMICROWIN_CHECK_HDC
+
+    m_logicalScaleX = x;
+    m_logicalScaleY = y;
+}
+
 // ----------------------------------------------------------------------------
 // DC caching
 // ----------------------------------------------------------------------------
@@ -2588,8 +2425,8 @@ wxSize wxMSWDCImpl::GetPPI() const
  * entry for the bitmap, and two for the DCs. -- JACS
  */
 
-wxObjectList wxMSWDCImpl::sm_bitmapCache;
-wxObjectList wxMSWDCImpl::sm_dcCache;
+wxList wxDC::sm_bitmapCache;
+wxList wxDC::sm_dcCache;
 
 wxDCCacheEntry::wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth)
 {
@@ -2617,7 +2454,7 @@ wxDCCacheEntry::~wxDCCacheEntry()
         ::DeleteDC((HDC) m_dc);
 }
 
-wxDCCacheEntry* wxMSWDCImpl::FindBitmapInCache(WXHDC dc, int w, int h)
+wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
     wxList::compatibility_iterator node = sm_bitmapCache.GetFirst();
@@ -2653,7 +2490,7 @@ wxDCCacheEntry* wxMSWDCImpl::FindBitmapInCache(WXHDC dc, int w, int h)
     return entry;
 }
 
-wxDCCacheEntry* wxMSWDCImpl::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
+wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
     wxList::compatibility_iterator node = sm_dcCache.GetFirst();
@@ -2682,17 +2519,17 @@ wxDCCacheEntry* wxMSWDCImpl::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
     return entry;
 }
 
-void wxMSWDCImpl::AddToBitmapCache(wxDCCacheEntry* entry)
+void wxDC::AddToBitmapCache(wxDCCacheEntry* entry)
 {
     sm_bitmapCache.Append(entry);
 }
 
-void wxMSWDCImpl::AddToDCCache(wxDCCacheEntry* entry)
+void wxDC::AddToDCCache(wxDCCacheEntry* entry)
 {
     sm_dcCache.Append(entry);
 }
 
-void wxMSWDCImpl::ClearCache()
+void wxDC::ClearCache()
 {
     WX_CLEAR_LIST(wxList, sm_dcCache);
     WX_CLEAR_LIST(wxList, sm_bitmapCache);
@@ -2703,7 +2540,7 @@ class wxDCModule : public wxModule
 {
 public:
     virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxMSWDCImpl::ClearCache(); }
+    virtual void OnExit() { wxDC::ClearCache(); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDCModule)
@@ -2718,14 +2555,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 // ----------------------------------------------------------------------------
 
 static bool AlphaBlt(HDC hdcDst,
-                     int x, int y, int dstWidth, int dstHeight,
-                     int srcX, int srcY,
-                     int srcWidth, int srcHeight,
-                     HDC hdcSrc,
+                     int x, int y, int width, int height,
+                     int srcX, int srcY, HDC hdcSrc,
                      const wxBitmap& bmp)
 {
-    wxASSERT_MSG( bmp.IsOk() && bmp.HasAlpha(), wxT("AlphaBlt(): invalid bitmap") );
-    wxASSERT_MSG( hdcDst && hdcSrc, wxT("AlphaBlt(): invalid HDC") );
+    wxASSERT_MSG( bmp.Ok() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
+    wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
 
     // do we have AlphaBlend() and company in the headers?
 #if defined(AC_SRC_OVER) && wxUSE_DYNLIB_CLASS
@@ -2735,7 +2570,7 @@ static bool AlphaBlt(HDC hdcDst,
                                         BLENDFUNCTION);
 
     static AlphaBlend_t
-        pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(wxT("AlphaBlend"));
+        pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(_T("AlphaBlend"));
     if ( pfnAlphaBlend )
     {
         BLENDFUNCTION bf;
@@ -2744,15 +2579,15 @@ static bool AlphaBlt(HDC hdcDst,
         bf.SourceConstantAlpha = 0xff;
         bf.AlphaFormat = AC_SRC_ALPHA;
 
-        if ( pfnAlphaBlend(hdcDst, x, y, dstWidth, dstHeight,
-                           hdcSrc, srcX, srcY, srcWidth, srcHeight,
+        if ( pfnAlphaBlend(hdcDst, x, y, width, height,
+                           hdcSrc, srcX, srcY, width, height,
                            bf) )
         {
             // skip wxAlphaBlend() call below
             return true;
         }
 
-        wxLogLastError(wxT("AlphaBlend"));
+        wxLogLastError(_T("AlphaBlend"));
     }
 #else
     wxUnusedVar(hdcSrc);
@@ -2760,37 +2595,35 @@ static bool AlphaBlt(HDC hdcDst,
 
     // AlphaBlend() unavailable of failed: use our own (probably much slower)
     // implementation
-#ifdef wxHAS_RAW_BITMAP
-    wxAlphaBlend(hdcDst, x, y, dstWidth, dstHeight, srcX, srcY, srcWidth, srcHeight, bmp);
+#ifdef wxHAVE_RAW_BITMAP
+    wxAlphaBlend(hdcDst, x, y, width, height, srcX, srcY, bmp);
 
     return true;
-#else // !wxHAS_RAW_BITMAP
+#else // !wxHAVE_RAW_BITMAP
     // no wxAlphaBlend() neither, fall back to using simple BitBlt() (we lose
     // alpha but at least something will be shown like this)
     wxUnusedVar(bmp);
     return false;
-#endif // wxHAS_RAW_BITMAP/!wxHAS_RAW_BITMAP
+#endif // wxHAVE_RAW_BITMAP
 }
 
 
 // wxAlphaBlend: our fallback if ::AlphaBlend() is unavailable
-#ifdef wxHAS_RAW_BITMAP
+#ifdef wxHAVE_RAW_BITMAP
 
 static void
 wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
-             int dstWidth, int dstHeight,
-             int srcX, int srcY,
-             int srcWidth, int srcHeight,
-             const wxBitmap& bmpSrc)
+             int w, int h,
+             int srcX, int srcY, const wxBitmap& bmpSrc)
 {
     // get the destination DC pixels
-    wxBitmap bmpDst(dstWidth, dstHeight, 32 /* force creating RGBA DIB */);
+    wxBitmap bmpDst(w, h, 32 /* force creating RGBA DIB */);
     MemoryHDC hdcMem;
     SelectInHDC select(hdcMem, GetHbitmapOf(bmpDst));
 
-    if ( !::BitBlt(hdcMem, 0, 0, dstWidth, dstHeight, hdcDst, xDst, yDst, SRCCOPY) )
+    if ( !::BitBlt(hdcMem, 0, 0, w, h, hdcDst, xDst, yDst, SRCCOPY) )
     {
-        wxLogLastError(wxT("BitBlt"));
+        wxLogLastError(_T("BitBlt"));
     }
 
     // combine them with the source bitmap using alpha
@@ -2798,22 +2631,20 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
                      dataSrc((wxBitmap &)bmpSrc);
 
     wxCHECK_RET( dataDst && dataSrc,
-                    wxT("failed to get raw data in wxAlphaBlend") );
+                    _T("failed to get raw data in wxAlphaBlend") );
 
     wxAlphaPixelData::Iterator pDst(dataDst),
                                pSrc(dataSrc);
 
+    pSrc.Offset(dataSrc, srcX, srcY);
 
-    for ( int y = 0; y < dstHeight; y++ )
+    for ( int y = 0; y < h; y++ )
     {
-        wxAlphaPixelData::Iterator pDstRowStart = pDst;
+        wxAlphaPixelData::Iterator pDstRowStart = pDst,
+                                   pSrcRowStart = pSrc;
 
-        for ( int x = 0; x < dstWidth; x++ )
+        for ( int x = 0; x < w; x++ )
         {
-            // source is point sampled, Alpha StretchBlit is ugly on Win95
-            // (but does not impact performance)
-            pSrc.MoveTo(dataSrc, srcX + (srcWidth*x/dstWidth), srcY + (srcHeight*y/dstHeight));
-
             // note that source bitmap uses premultiplied alpha (as required by
             // the real AlphaBlend)
             const unsigned beta = 255 - pSrc.Alpha();
@@ -2823,22 +2654,25 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
             pDst.Green() = pSrc.Green() + (beta * pDst.Green() + 127) / 255;
 
             ++pDst;
+            ++pSrc;
         }
 
         pDst = pDstRowStart;
+        pSrc = pSrcRowStart;
         pDst.OffsetY(dataDst, 1);
+        pSrc.OffsetY(dataSrc, 1);
     }
 
     // and finally blit them back to the destination DC
-    if ( !::BitBlt(hdcDst, xDst, yDst, dstWidth, dstHeight, hdcMem, 0, 0, SRCCOPY) )
+    if ( !::BitBlt(hdcDst, xDst, yDst, w, h, hdcMem, 0, 0, SRCCOPY) )
     {
-        wxLogLastError(wxT("BitBlt"));
+        wxLogLastError(_T("BitBlt"));
     }
 }
 
-#endif // wxHAS_RAW_BITMAP
+#endif // #ifdef wxHAVE_RAW_BITMAP
 
-void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
+void wxDC::DoGradientFillLinear (const wxRect& rect,
                                  const wxColour& initialColour,
                                  const wxColour& destColour,
                                  wxDirection nDirection)
@@ -2850,7 +2684,7 @@ void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
     typedef BOOL
         (WINAPI *GradientFill_t)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG);
     static GradientFill_t pfnGradientFill =
-        (GradientFill_t)wxMSIMG32DLL.GetSymbol(wxT("GradientFill"));
+        (GradientFill_t)wxMSIMG32DLL.GetSymbol(_T("GradientFill"));
 
     if ( pfnGradientFill )
     {
@@ -2895,25 +2729,23 @@ void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
             return;
         }
 
-        wxLogLastError(wxT("GradientFill"));
+        wxLogLastError(_T("GradientFill"));
     }
 #endif // wxUSE_DYNLIB_CLASS
 
-    wxDCImpl::DoGradientFillLinear(rect, initialColour, destColour, nDirection);
+    wxDCBase::DoGradientFillLinear(rect, initialColour, destColour, nDirection);
 }
 
-#if wxUSE_DYNLIB_CLASS
-
 static DWORD wxGetDCLayout(HDC hdc)
 {
     typedef DWORD (WINAPI *GetLayout_t)(HDC);
     static GetLayout_t
-        wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(wxT("gdi32.dll")));
+        pfnGetLayout = (GetLayout_t)wxGDI32DLL.GetSymbol(_T("GetLayout"));
 
-    return s_pfnGetLayout ? s_pfnGetLayout(hdc) : (DWORD)-1;
+    return pfnGetLayout ? pfnGetLayout(hdc) : (DWORD)-1;
 }
 
-wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const
+wxLayoutDirection wxDC::GetLayoutDirection() const
 {
     DWORD layout = wxGetDCLayout(GetHdc());
 
@@ -2923,12 +2755,12 @@ wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const
     return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight;
 }
 
-void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir)
+void wxDC::SetLayoutDirection(wxLayoutDirection dir)
 {
     typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
     static SetLayout_t
-        wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(wxT("gdi32.dll")));
-    if ( !s_pfnSetLayout )
+        pfnSetLayout = (SetLayout_t)wxGDI32DLL.GetSymbol(_T("SetLayout"));
+    if ( !pfnSetLayout )
         return;
 
     if ( dir == wxLayout_Default )
@@ -2944,19 +2776,5 @@ void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir)
     else
         layout &= ~LAYOUT_RTL;
 
-    s_pfnSetLayout(GetHdc(), layout);
+    pfnSetLayout(GetHdc(), layout);
 }
-
-#else // !wxUSE_DYNLIB_CLASS
-
-// we can't provide RTL support without dynamic loading, so stub it out
-wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const
-{
-    return wxLayout_Default;
-}
-
-void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection WXUNUSED(dir))
-{
-}
-
-#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
diff --git a/Source/3rd Party/wx/src/msw/dcclient.cpp b/Source/3rd Party/wx/src/msw/dcclient.cpp
index 0437f034c..6e9b05be1 100644
--- a/Source/3rd Party/wx/src/msw/dcclient.cpp	
+++ b/Source/3rd Party/wx/src/msw/dcclient.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcclient.cpp 39021 2006-05-04 07:57:04Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,7 +25,6 @@
 #endif
 
 #include "wx/dcclient.h"
-#include "wx/msw/dcclient.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
@@ -41,7 +40,7 @@
 
 struct WXDLLEXPORT wxPaintDCInfo
 {
-    wxPaintDCInfo(wxWindow *win, wxPaintDCImpl *dc)
+    wxPaintDCInfo(wxWindow *win, wxDC *dc)
     {
         hwnd = win->GetHWND();
         hdc = dc->GetHDC();
@@ -61,85 +60,87 @@ WX_DEFINE_OBJARRAY(wxArrayDCInfo)
 // macros
 // ----------------------------------------------------------------------------
 
+IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
+IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
+IMPLEMENT_CLASS(wxPaintDCEx, wxPaintDC)
+
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
 static PAINTSTRUCT g_paintStruct;
 
-#ifdef wxHAS_PAINT_DEBUG
+#ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only
     // created in response to WM_PAINT message - doing this from elsewhere is a
     // common programming error among wxWidgets programmers and might lead to
     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
-#endif // wxHAS_PAINT_DEBUG
+#endif // __WXDEBUG__
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 
 // ----------------------------------------------------------------------------
-// wxMSWWindowDCImpl
+// wxWindowDC
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxMSWDCImpl)
-
-wxWindowDCImpl::wxWindowDCImpl( wxDC *owner ) :
-   wxMSWDCImpl( owner )
+wxWindowDC::wxWindowDC()
 {
+    m_canvas = NULL;
 }
 
-wxWindowDCImpl::wxWindowDCImpl( wxDC *owner, wxWindow *window ) :
-   wxMSWDCImpl( owner )
+wxWindowDC::wxWindowDC(wxWindow *canvas)
 {
-    wxCHECK_RET( window, wxT("invalid window in wxWindowDCImpl") );
+    wxCHECK_RET( canvas, _T("invalid window in wxWindowDC") );
 
-    m_window = window;
-    m_hDC = (WXHDC) ::GetWindowDC(GetHwndOf(m_window));
+    m_canvas = canvas;
+    m_hDC = (WXHDC) ::GetWindowDC(GetHwndOf(m_canvas));
 
     // m_bOwnsDC was already set to false in the base class ctor, so the DC
     // will be released (and not deleted) in ~wxDC
     InitDC();
 }
 
-void wxWindowDCImpl::InitDC()
+void wxWindowDC::InitDC()
 {
     // the background mode is only used for text background and is set in
     // DrawText() to OPAQUE as required, otherwise always TRANSPARENT,
     ::SetBkMode(GetHdc(), TRANSPARENT);
 
+    // default bg colour is pne of the window
+    SetBackground(wxBrush(m_canvas->GetBackgroundColour(), wxSOLID));
+
     // since we are a window dc we need to grab the palette from the window
 #if wxUSE_PALETTE
     InitializePalette();
 #endif
 }
 
-void wxWindowDCImpl::DoGetSize(int *width, int *height) const
+void wxWindowDC::DoGetSize(int *width, int *height) const
 {
-    wxCHECK_RET( m_window, wxT("wxWindowDCImpl without a window?") );
+    wxCHECK_RET( m_canvas, _T("wxWindowDC without a window?") );
 
-    m_window->GetSize(width, height);
+    m_canvas->GetSize(width, height);
 }
 
 // ----------------------------------------------------------------------------
-// wxClientDCImpl
+// wxClientDC
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)
-
-wxClientDCImpl::wxClientDCImpl( wxDC *owner ) :
-   wxWindowDCImpl( owner )
+wxClientDC::wxClientDC()
 {
+    m_canvas = NULL;
 }
 
-wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *window ) :
-   wxWindowDCImpl( owner )
+wxClientDC::wxClientDC(wxWindow *canvas)
 {
-    wxCHECK_RET( window, wxT("invalid window in wxClientDCImpl") );
+    wxCHECK_RET( canvas, _T("invalid window in wxClientDC") );
 
-    m_window = window;
-    m_hDC = (WXHDC)::GetDC(GetHwndOf(window));
+    m_canvas = canvas;
+    m_hDC = (WXHDC)::GetDC(GetHwndOf(m_canvas));
 
     // m_bOwnsDC was already set to false in the base class ctor, so the DC
     // will be released (and not deleted) in ~wxDC
@@ -147,9 +148,9 @@ wxClientDCImpl::wxClientDCImpl( wxDC *owner, wxWindow *window ) :
     InitDC();
 }
 
-void wxClientDCImpl::InitDC()
+void wxClientDC::InitDC()
 {
-    wxWindowDCImpl::InitDC();
+    wxWindowDC::InitDC();
 
     // in wxUniv build we must manually do some DC adjustments usually
     // performed by Windows for us
@@ -158,7 +159,7 @@ void wxClientDCImpl::InitDC()
     // Windows CE because they're just another control there, not anything
     // special as usually under Windows
 #if defined(__WXUNIVERSAL__) || defined(__WXWINCE__)
-    wxPoint ptOrigin = m_window->GetClientAreaOrigin();
+    wxPoint ptOrigin = m_canvas->GetClientAreaOrigin();
     if ( ptOrigin.x || ptOrigin.y )
     {
         // no need to shift DC origin if shift is null
@@ -166,24 +167,23 @@ void wxClientDCImpl::InitDC()
     }
 
     // clip the DC to avoid overwriting the non client area
-    wxSize size = m_window->GetClientSize();
-    DoSetClippingRegion(0, 0, size.x, size.y);
+    SetClippingRegion(wxPoint(0,0), m_canvas->GetClientSize());
 #endif // __WXUNIVERSAL__ || __WXWINCE__
 }
 
-wxClientDCImpl::~wxClientDCImpl()
+wxClientDC::~wxClientDC()
 {
 }
 
-void wxClientDCImpl::DoGetSize(int *width, int *height) const
+void wxClientDC::DoGetSize(int *width, int *height) const
 {
-    wxCHECK_RET( m_window, wxT("wxClientDCImpl without a window?") );
+    wxCHECK_RET( m_canvas, _T("wxClientDC without a window?") );
 
-    m_window->GetClientSize(width, height);
+    m_canvas->GetClientSize(width, height);
 }
 
 // ----------------------------------------------------------------------------
-// wxPaintDCImpl
+// wxPaintDC
 // ----------------------------------------------------------------------------
 
 // VZ: initial implementation (by JACS) only remembered the last wxPaintDC
@@ -202,36 +202,27 @@ void wxClientDCImpl::DoGetSize(int *width, int *height) const
 //     "wxPaintDC *" parameter to wxPaintEvent which should be used if it's
 //     !NULL instead of creating a new DC.
 
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxClientDCImpl)
+wxArrayDCInfo wxPaintDC::ms_cache;
 
-wxArrayDCInfo wxPaintDCImpl::ms_cache;
-
-wxPaintDCImpl::wxPaintDCImpl( wxDC *owner ) :
-   wxClientDCImpl( owner )
+wxPaintDC::wxPaintDC()
 {
+    m_canvas = NULL;
 }
 
-wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) :
-   wxClientDCImpl( owner )
+wxPaintDC::wxPaintDC(wxWindow *canvas)
 {
-    wxCHECK_RET( window, wxT("NULL canvas in wxPaintDCImpl ctor") );
+    wxCHECK_RET( canvas, wxT("NULL canvas in wxPaintDC ctor") );
 
-#ifdef wxHAS_PAINT_DEBUG
+#ifdef __WXDEBUG__
     if ( g_isPainting <= 0 )
     {
-        wxFAIL_MSG( wxT("wxPaintDCImpl may be created only in EVT_PAINT handler!") );
+        wxFAIL_MSG( wxT("wxPaintDC may be created only in EVT_PAINT handler!") );
 
         return;
     }
-#endif // wxHAS_PAINT_DEBUG
+#endif // __WXDEBUG__
 
-    // see comments in src/msw/window.cpp where this is defined
-    extern bool wxDidCreatePaintDC;
-
-    wxDidCreatePaintDC = true;
-
-
-    m_window = window;
+    m_canvas = canvas;
 
     // do we have a DC for this window in the cache?
     wxPaintDCInfo *info = FindInCache();
@@ -242,24 +233,18 @@ wxPaintDCImpl::wxPaintDCImpl( wxDC *owner, wxWindow *window ) :
     }
     else // not in cache, create a new one
     {
-        m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_window), &g_paintStruct);
+        m_hDC = (WXHDC)::BeginPaint(GetHwndOf(m_canvas), &g_paintStruct);
         if (m_hDC)
-            ms_cache.Add(new wxPaintDCInfo(m_window, this));
+            ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
     }
 
-    // Note: at this point m_hDC can be NULL under MicroWindows, when dragging.
-    if (!GetHDC())
-        return;
-
     // (re)set the DC parameters.
-    InitDC();
-
-    // the HDC can have a clipping box (which we didn't set), make sure our
-    // DoGetClippingBox() checks for it
-    m_clipping = true;
+    // Note: at this point m_hDC can be NULL under MicroWindows, when dragging.
+    if (GetHDC())
+        InitDC();
 }
 
-wxPaintDCImpl::~wxPaintDCImpl()
+wxPaintDC::~wxPaintDC()
 {
     if ( m_hDC )
     {
@@ -272,7 +257,7 @@ wxPaintDCImpl::~wxPaintDCImpl()
 
         if ( --info->count == 0 )
         {
-            ::EndPaint(GetHwndOf(m_window), &g_paintStruct);
+            ::EndPaint(GetHwndOf(m_canvas), &g_paintStruct);
 
             ms_cache.RemoveAt(index);
 
@@ -288,14 +273,14 @@ wxPaintDCImpl::~wxPaintDCImpl()
     }
 }
 
-wxPaintDCInfo *wxPaintDCImpl::FindInCache(size_t *index) const
+wxPaintDCInfo *wxPaintDC::FindInCache(size_t *index) const
 {
     wxPaintDCInfo *info = NULL;
     size_t nCache = ms_cache.GetCount();
     for ( size_t n = 0; n < nCache; n++ )
     {
         wxPaintDCInfo *info1 = &ms_cache[n];
-        if ( info1->hwnd == m_window->GetHWND() )
+        if ( info1->hwnd == m_canvas->GetHWND() )
         {
             info = info1;
             if ( index )
@@ -308,7 +293,7 @@ wxPaintDCInfo *wxPaintDCImpl::FindInCache(size_t *index) const
 }
 
 // find the entry for this DC in the cache (keyed by the window)
-WXHDC wxPaintDCImpl::FindDCInCache(wxWindow* win)
+WXHDC wxPaintDC::FindDCInCache(wxWindow* win)
 {
     size_t nCache = ms_cache.GetCount();
     for ( size_t n = 0; n < nCache; n++ )
@@ -326,69 +311,47 @@ WXHDC wxPaintDCImpl::FindDCInCache(wxWindow* win)
  * wxPaintDCEx
  */
 
-// TODO: don't duplicate wxPaintDCImpl code here!!
+// TODO: don't duplicate wxPaintDC code here!!
 
-class wxPaintDCExImpl: public wxPaintDCImpl
+wxPaintDCEx::wxPaintDCEx(wxWindow *canvas, WXHDC dc) : saveState(0)
 {
-public:
-    wxPaintDCExImpl( wxDC *owner, wxWindow *window, WXHDC dc );
-    ~wxPaintDCExImpl();
+    wxCHECK_RET( dc, wxT("wxPaintDCEx requires an existing device context") );
 
-    int m_saveState;
-};
+    m_canvas = canvas;
 
-
-IMPLEMENT_ABSTRACT_CLASS(wxPaintDCEx,wxPaintDC)
-
-wxPaintDCEx::wxPaintDCEx(wxWindow *window, WXHDC dc)
-           : wxPaintDC(new wxPaintDCExImpl(this, window, dc))
-{
+    wxPaintDCInfo *info = FindInCache();
+    if ( info )
+    {
+        m_hDC = info->hdc;
+        info->count++;
+    }
+    else // not in cache, create a new one
+    {
+        m_hDC = dc;
+        ms_cache.Add(new wxPaintDCInfo(m_canvas, this));
+        saveState = SaveDC((HDC) dc);
+    }
 }
 
-wxPaintDCExImpl::wxPaintDCExImpl(wxDC *owner, wxWindow *window, WXHDC dc)
-               : wxPaintDCImpl( owner )
+wxPaintDCEx::~wxPaintDCEx()
 {
-        wxCHECK_RET( dc, wxT("wxPaintDCEx requires an existing device context") );
+    size_t index;
+    wxPaintDCInfo *info = FindInCache(&index);
 
-        m_saveState = 0;
+    wxCHECK_RET( info, wxT("existing DC should have a cache entry") );
 
-        m_window = window;
+    if ( --info->count == 0 )
+    {
+        RestoreDC((HDC) m_hDC, saveState);
+        ms_cache.RemoveAt(index);
 
-        wxPaintDCInfo *info = FindInCache();
-        if ( info )
-        {
-           m_hDC = info->hdc;
-           info->count++;
-        }
-        else // not in cache, create a new one
-        {
-                m_hDC = dc;
-                ms_cache.Add(new wxPaintDCInfo(m_window, this));
-                m_saveState = SaveDC((HDC) dc);
-        }
+        // Reduce the number of bogus reports of non-freed memory
+        // at app exit
+        if (ms_cache.IsEmpty())
+            ms_cache.Clear();
+    }
+    //else: cached DC entry is still in use
+
+    // prevent the base class dtor from ReleaseDC()ing it again
+    m_hDC = 0;
 }
-
-wxPaintDCExImpl::~wxPaintDCExImpl()
-{
-        size_t index;
-        wxPaintDCInfo *info = FindInCache(&index);
-
-        wxCHECK_RET( info, wxT("existing DC should have a cache entry") );
-
-        if ( --info->count == 0 )
-        {
-                RestoreDC((HDC) m_hDC, m_saveState);
-                ms_cache.RemoveAt(index);
-
-                // Reduce the number of bogus reports of non-freed memory
-                // at app exit
-                if (ms_cache.IsEmpty())
-                        ms_cache.Clear();
-        }
-        //else: cached DC entry is still in use
-
-        // prevent the base class dtor from ReleaseDC()ing it again
-        m_hDC = 0;
-}
-
-
diff --git a/Source/3rd Party/wx/src/msw/dcmemory.cpp b/Source/3rd Party/wx/src/msw/dcmemory.cpp
index 925c2e872..76ccc4267 100644
--- a/Source/3rd Party/wx/src/msw/dcmemory.cpp	
+++ b/Source/3rd Party/wx/src/msw/dcmemory.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcmemory.cpp 42755 2006-10-30 19:41:46Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -25,7 +25,6 @@
 #endif
 
 #include "wx/dcmemory.h"
-#include "wx/msw/dcmemory.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -35,37 +34,29 @@
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------
-// wxMemoryDCImpl
+// wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxMSWDCImpl)
+IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
-        : wxMSWDCImpl( owner )
-{
-    CreateCompatible(NULL);
-    Init();
-}
+// ============================================================================
+// implementation
+// ============================================================================
 
-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
-        : wxMSWDCImpl( owner )
-{
-    CreateCompatible(NULL);
-    Init();
-    DoSelect(bitmap);
-}
+// ----------------------------------------------------------------------------
+// wxMemoryDC
+// ----------------------------------------------------------------------------
 
-wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc )
-        : wxMSWDCImpl( owner )
+wxMemoryDC::wxMemoryDC(wxDC *dc)
 {
-    wxCHECK_RET( dc, wxT("NULL dc in wxMemoryDC ctor") );
+    wxCHECK_RET( dc, _T("NULL dc in wxMemoryDC ctor") );
 
     CreateCompatible(dc);
 
     Init();
 }
 
-void wxMemoryDCImpl::Init()
+void wxMemoryDC::Init()
 {
     if ( m_ok )
     {
@@ -78,17 +69,9 @@ void wxMemoryDCImpl::Init()
     }
 }
 
-bool wxMemoryDCImpl::CreateCompatible(wxDC *dc)
+bool wxMemoryDC::CreateCompatible(wxDC *dc)
 {
-    wxDCImpl *impl = dc ? dc->GetImpl() : NULL ;
-    wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
-    if ( dc && !msw_impl)
-    {
-        m_ok = false;
-        return false;
-    }
-
-    m_hDC = (WXHDC)::CreateCompatibleDC(dc ? GetHdcOf(*msw_impl) : NULL);
+    m_hDC = (WXHDC)::CreateCompatibleDC(dc ? GetHdcOf(*dc) : NULL);
 
     // as we created the DC, we must delete it in the dtor
     m_bOwnsDC = true;
@@ -98,22 +81,24 @@ bool wxMemoryDCImpl::CreateCompatible(wxDC *dc)
     return m_ok;
 }
 
-void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
+void wxMemoryDC::DoSelect( const wxBitmap& bitmap)
 {
     // select old bitmap out of the device context
     if ( m_oldBitmap )
     {
         ::SelectObject(GetHdc(), (HBITMAP) m_oldBitmap);
-        if ( m_selectedBitmap.IsOk() )
+        if ( m_selectedBitmap.Ok() )
         {
+#ifdef __WXDEBUG__
             m_selectedBitmap.SetSelectedInto(NULL);
+#endif
             m_selectedBitmap = wxNullBitmap;
         }
     }
 
     // check for whether the bitmap is already selected into a device context
     wxASSERT_MSG( !bitmap.GetSelectedInto() ||
-                  (bitmap.GetSelectedInto() == GetOwner()),
+                  (bitmap.GetSelectedInto() == this),
                   wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
 
     m_selectedBitmap = bitmap;
@@ -121,7 +106,9 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
     if ( !hBmp )
         return;
 
-    m_selectedBitmap.SetSelectedInto(GetOwner());
+#ifdef __WXDEBUG__
+    m_selectedBitmap.SetSelectedInto(this);
+#endif
     hBmp = (WXHBITMAP)::SelectObject(GetHdc(), (HBITMAP)hBmp);
 
     if ( !hBmp )
@@ -136,9 +123,9 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )
     }
 }
 
-void wxMemoryDCImpl::DoGetSize(int *width, int *height) const
+void wxMemoryDC::DoGetSize(int *width, int *height) const
 {
-    if ( m_selectedBitmap.IsOk() )
+    if ( m_selectedBitmap.Ok() )
     {
         *width = m_selectedBitmap.GetWidth();
         *height = m_selectedBitmap.GetHeight();
@@ -163,7 +150,7 @@ static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoo
 {
     wxBrush brush(dc.GetBrush());
     wxPen pen(dc.GetPen());
-    if (brush.IsOk() && brush.GetStyle() != wxTRANSPARENT)
+    if (brush.Ok() && brush.GetStyle() != wxTRANSPARENT)
     {
         HBRUSH hBrush = (HBRUSH) brush.GetResourceHandle() ;
         if (hBrush)
@@ -176,7 +163,7 @@ static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoo
         }
     }
     width --; height --;
-    if (pen.IsOk() && pen.GetStyle() != wxTRANSPARENT)
+    if (pen.Ok() && pen.GetStyle() != wxTRANSPARENT)
     {
         dc.DrawLine(x, y, x + width, y);
         dc.DrawLine(x, y, x, y + height);
@@ -187,12 +174,12 @@ static void wxDrawRectangle(wxDC& dc, wxCoord x, wxCoord y, wxCoord width, wxCoo
 
 #endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE
 
-void wxMemoryDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxMemoryDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
     // Set this to 1 to work around an apparent video driver bug
     // (visible with e.g. 70x70 rectangle on a memory DC; see Drawing sample)
 #if wxUSE_MEMORY_DC_DRAW_RECTANGLE
-    if (m_brush.IsOk() && m_pen.IsOk() &&
+    if (m_brush.Ok() && m_pen.Ok() &&
         (m_brush.GetStyle() == wxSOLID || m_brush.GetStyle() == wxTRANSPARENT) &&
         (m_pen.GetStyle() == wxSOLID || m_pen.GetStyle() == wxTRANSPARENT) &&
         (GetLogicalFunction() == wxCOPY))
@@ -202,6 +189,6 @@ void wxMemoryDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoor
     else
 #endif // wxUSE_MEMORY_DC_DRAW_RECTANGLE
     {
-        wxMSWDCImpl::DoDrawRectangle(x, y, width, height);
+        wxDC::DoDrawRectangle(x, y, width, height);
     }
 }
diff --git a/Source/3rd Party/wx/src/msw/dcprint.cpp b/Source/3rd Party/wx/src/msw/dcprint.cpp
index 5efe777b8..e02fe2438 100644
--- a/Source/3rd Party/wx/src/msw/dcprint.cpp	
+++ b/Source/3rd Party/wx/src/msw/dcprint.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcprint.cpp 51771 2008-02-13 22:42:45Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,6 @@
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dcprint.h"
-#include "wx/msw/dcprint.h"
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapcdlg.h"
@@ -67,7 +66,7 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxMSWDCImpl)
+IMPLEMENT_CLASS(wxPrinterDC, wxDC)
 
 // ============================================================================
 // implementation
@@ -77,13 +76,12 @@ IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxMSWDCImpl)
 // wxPrinterDC construction
 // ----------------------------------------------------------------------------
 
-#if 0
 // This form is deprecated
 wxPrinterDC::wxPrinterDC(const wxString& driver_name,
                          const wxString& device_name,
                          const wxString& file,
                          bool interactive,
-                         wxPrintOrientation orientation)
+                         int orientation)
 {
     m_isInteractive = interactive;
 
@@ -118,10 +116,7 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name,
     {
         if ( !driver_name.empty() && !device_name.empty() && !file.empty() )
         {
-            m_hDC = (WXHDC) CreateDC(driver_name.t_str(),
-                                     device_name.t_str(),
-                                     file.fn_str(),
-                                     NULL);
+            m_hDC = (WXHDC) CreateDC(driver_name, device_name, file, NULL);
         }
         else // we don't have all parameters, ask the user
         {
@@ -138,10 +133,8 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name,
 
     Init();
 }
-#endif
 
-wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printData ) :
-    wxMSWDCImpl( owner )
+wxPrinterDC::wxPrinterDC(const wxPrintData& printData)
 {
     m_printData = printData;
 
@@ -155,8 +148,7 @@ wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printDa
 }
 
 
-wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, WXHDC dc ) :
-    wxMSWDCImpl( owner )
+wxPrinterDC::wxPrinterDC(WXHDC dc)
 {
     m_isInteractive = false;
 
@@ -165,7 +157,7 @@ wxPrinterDCImpl::wxPrinterDCImpl( wxPrinterDC *owner, WXHDC dc ) :
     m_ok = true;
 }
 
-void wxPrinterDCImpl::Init()
+void wxPrinterDC::Init()
 {
     if ( m_hDC )
     {
@@ -179,21 +171,21 @@ void wxPrinterDCImpl::Init()
 }
 
 // ----------------------------------------------------------------------------
-// wxPrinterDCImpl {Start/End}{Page/Doc} methods
+// wxPrinterDC {Start/End}{Page/Doc} methods
 // ----------------------------------------------------------------------------
 
-bool wxPrinterDCImpl::StartDoc(const wxString& message)
+bool wxPrinterDC::StartDoc(const wxString& message)
 {
     DOCINFO docinfo;
     docinfo.cbSize = sizeof(DOCINFO);
-    docinfo.lpszDocName = message.t_str();
+    docinfo.lpszDocName = (const wxChar*)message;
 
     wxString filename(m_printData.GetFilename());
 
     if (filename.empty())
         docinfo.lpszOutput = NULL;
     else
-        docinfo.lpszOutput = filename.t_str();
+        docinfo.lpszOutput = (const wxChar *) filename;
 
     docinfo.lpszDatatype = NULL;
     docinfo.fwType = 0;
@@ -210,28 +202,28 @@ bool wxPrinterDCImpl::StartDoc(const wxString& message)
     return true;
 }
 
-void wxPrinterDCImpl::EndDoc()
+void wxPrinterDC::EndDoc()
 {
     if (m_hDC) ::EndDoc((HDC) m_hDC);
 }
 
-void wxPrinterDCImpl::StartPage()
+void wxPrinterDC::StartPage()
 {
     if (m_hDC)
         ::StartPage((HDC) m_hDC);
 }
 
-void wxPrinterDCImpl::EndPage()
+void wxPrinterDC::EndPage()
 {
     if (m_hDC)
         ::EndPage((HDC) m_hDC);
 }
 
 
-wxRect wxPrinterDCImpl::GetPaperRect() const
+wxRect wxPrinterDC::GetPaperRect()
 
 {
-    if (!IsOk()) return wxRect(0, 0, 0, 0);
+    if (!Ok()) return wxRect(0, 0, 0, 0);
     int w = ::GetDeviceCaps((HDC) m_hDC, PHYSICALWIDTH);
     int h = ::GetDeviceCaps((HDC) m_hDC, PHYSICALHEIGHT);
     int x = -::GetDeviceCaps((HDC) m_hDC, PHYSICALOFFSETX);
@@ -327,29 +319,23 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
     }
 
 
-    GlobalPtrLock lockDevMode;
-    const HGLOBAL devMode = data->GetDevMode();
-    if ( devMode )
-        lockDevMode.Init(devMode);
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode();
 
-    HDC hDC = ::CreateDC
-                (
-                    NULL,               // no driver name as we use device name
-                    deviceName.t_str(),
-                    NULL,               // unused
-                    static_cast<DEVMODE *>(lockDevMode.Get())
-                );
+    DEVMODE *lpDevMode = hDevMode ? (DEVMODE *)::GlobalLock(hDevMode) : NULL;
+
+    HDC hDC = ::CreateDC(NULL, deviceName, NULL, lpDevMode);
     if ( !hDC )
-    {
-        wxLogLastError(wxT("CreateDC(printer)"));
-    }
+        wxLogLastError(_T("CreateDC(printer)"));
+
+    if ( lpDevMode )
+        ::GlobalUnlock(hDevMode);
 
     return (WXHDC) hDC;
 #endif // PostScript/Windows printing
 }
 
 // ----------------------------------------------------------------------------
-// wxPrinterDCImpl bit blitting/bitmap drawing
+// wxPrinterDC bit blitting/bitmap drawing
 // ----------------------------------------------------------------------------
 
 // helper of DoDrawBitmap() and DoBlit()
@@ -367,7 +353,7 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
     DIBSECTION ds;
     if ( !::GetObject(dib.GetHandle(), sizeof(ds), &ds) )
     {
-        wxLogLastError(wxT("GetObject(DIBSECTION)"));
+        wxLogLastError(_T("GetObject(DIBSECTION)"));
 
         return false;
     }
@@ -397,11 +383,11 @@ bool DrawBitmapUsingStretchDIBits(HDC hdc,
 #endif
 }
 
-void wxPrinterDCImpl::DoDrawBitmap(const wxBitmap& bmp,
+void wxPrinterDC::DoDrawBitmap(const wxBitmap& bmp,
                                wxCoord x, wxCoord y,
                                bool useMask)
 {
-    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap in wxPrinterDC::DrawBitmap") );
+    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") );
 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();
@@ -414,32 +400,27 @@ void wxPrinterDCImpl::DoDrawBitmap(const wxBitmap& bmp,
 
         memDC.SelectObjectAsSource(bmp);
 
-        GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+        Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
 
         memDC.SelectObject(wxNullBitmap);
     }
 }
 
-bool wxPrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
+bool wxPrinterDC::DoBlit(wxCoord xdest, wxCoord ydest,
                          wxCoord width, wxCoord height,
                          wxDC *source,
                          wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc),
-                         wxRasterOperationMode WXUNUSED(rop), bool useMask,
+                         int WXUNUSED(rop), bool useMask,
                          wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {
-    wxDCImpl *impl = source->GetImpl();
-    wxMSWDCImpl *msw_impl = wxDynamicCast(impl, wxMSWDCImpl);
-    if (!msw_impl)
-        return false;
-
-    wxBitmap& bmp = msw_impl->GetSelectedBitmap();
+    wxBitmap& bmp = source->GetSelectedBitmap();
     wxMask *mask = useMask ? bmp.GetMask() : NULL;
     if ( mask )
     {
         // If we are printing source colours are screen colours not printer
         // colours and so we need copy the bitmap pixel by pixel.
         RECT rect;
-        HDC dcSrc = GetHdcOf(*msw_impl);
+        HDC dcSrc = GetHdcOf(*source);
         MemoryHDC dcMask(dcSrc);
         SelectInHDC selectMask(dcMask, (HBITMAP)mask->GetMaskBitmap());
 
@@ -470,7 +451,7 @@ bool wxPrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
 
             // as we are printing, source colours are screen colours not
             // printer colours and so we need copy the bitmap pixel by pixel.
-            HDC dcSrc = GetHdcOf(*msw_impl);
+            HDC dcSrc = GetHdcOf(*source);
             RECT rect;
             for (int y = 0; y < height; y++)
             {
diff --git a/Source/3rd Party/wx/src/msw/dcscreen.cpp b/Source/3rd Party/wx/src/msw/dcscreen.cpp
index 5a90bd746..47be41d86 100644
--- a/Source/3rd Party/wx/src/msw/dcscreen.cpp	
+++ b/Source/3rd Party/wx/src/msw/dcscreen.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dcscreen.cpp 39123 2006-05-09 13:55:29Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
-#include "wx/msw/dcscreen.h"
+#include "wx/dcscreen.h"
 
 #ifndef WX_PRECOMP
    #include "wx/string.h"
@@ -25,11 +25,10 @@
 
 #include "wx/msw/private.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxMSWDCImpl)
+IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxDC)
 
 // Create a DC representing the whole screen
-wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) :
-    wxMSWDCImpl( owner )
+wxScreenDC::wxScreenDC()
 {
     m_hDC = (WXHDC) ::GetDC((HWND) NULL);
 
@@ -37,4 +36,3 @@ wxScreenDCImpl::wxScreenDCImpl( wxScreenDC *owner ) :
     // DrawText() to OPAQUE as required, otherwise always TRANSPARENT
     ::SetBkMode( GetHdc(), TRANSPARENT );
 }
-
diff --git a/Source/3rd Party/wx/src/msw/dde.cpp b/Source/3rd Party/wx/src/msw/dde.cpp
index d75245f34..79698e2ab 100644
--- a/Source/3rd Party/wx/src/msw/dde.cpp	
+++ b/Source/3rd Party/wx/src/msw/dde.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dde.cpp 40943 2006-08-31 19:31:43Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -35,8 +35,6 @@
 
 #include "wx/dde.h"
 #include "wx/intl.h"
-#include "wx/buffer.h"
-#include "wx/strconv.h"
 
 #include "wx/msw/private.h"
 
@@ -139,7 +137,7 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxDDEServer, wxServerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxDDEClient, wxClientBase)
-IMPLEMENT_DYNAMIC_CLASS(wxDDEConnection, wxConnectionBase)
+IMPLEMENT_CLASS(wxDDEConnection, wxConnectionBase)
 IMPLEMENT_DYNAMIC_CLASS(wxDDEModule, wxModule)
 
 // ============================================================================
@@ -160,7 +158,7 @@ extern void wxDDEInitialize()
         UINT rc = DdeInitialize(&DDEIdInst, callback, APPCLASS_STANDARD, 0L);
         if ( rc != DMLERR_NO_ERROR )
         {
-            DDELogError(wxT("Failed to initialize DDE"), rc);
+            DDELogError(_T("Failed to initialize DDE"), rc);
         }
         else
         {
@@ -174,7 +172,7 @@ void wxDDECleanUp()
     // deleting them later won't work as DDE won't be initialized any more
     wxASSERT_MSG( wxDDEServerObjects.empty() &&
                     wxDDEClientObjects.empty(),
-                    wxT("all DDE objects should be deleted by now") );
+                    _T("all DDE objects should be deleted by now") );
 
     wxAtomTable.clear();
 
@@ -327,6 +325,7 @@ wxDDEServer::~wxDDEServer()
     {
         wxDDEConnection *connection = node->GetData();
         wxDDEConnectionList::compatibility_iterator next = node->GetNext();
+        connection->SetConnected(false);
         connection->OnDisconnect(); // May delete the node implicitly
         node = next;
     }
@@ -417,7 +416,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
 
     if ( !hszServer )
     {
-        return NULL;
+        return (wxConnectionBase*) NULL;
     }
 
 
@@ -426,7 +425,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
     if ( !hszTopic )
     {
         DDEFreeString(hszServer);
-        return NULL;
+        return (wxConnectionBase*) NULL;
     }
 
 
@@ -456,7 +455,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
         }
     }
 
-    return NULL;
+    return (wxConnectionBase*) NULL;
 }
 
 wxConnectionBase *wxDDEClient::OnMakeConnection()
@@ -499,7 +498,7 @@ bool wxDDEClient::DeleteConnection(WXHCONV conv)
 // wxDDEConnection
 // ----------------------------------------------------------------------------
 
-wxDDEConnection::wxDDEConnection(void *buffer, size_t size)
+wxDDEConnection::wxDDEConnection(wxChar *buffer, int size)
      : wxConnectionBase(buffer, size)
 {
     m_client = NULL;
@@ -538,7 +537,7 @@ bool wxDDEConnection::Disconnect()
     bool ok = DdeDisconnect(GetHConv()) != 0;
     if ( !ok )
     {
-        DDELogError(wxT("Failed to disconnect from DDE server gracefully"));
+        DDELogError(_T("Failed to disconnect from DDE server gracefully"));
     }
 
     SetConnected( false );  // so we don't try and disconnect again
@@ -546,119 +545,34 @@ bool wxDDEConnection::Disconnect()
     return ok;
 }
 
-bool
-wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)
+bool wxDDEConnection::Execute(const wxChar *data, int size, wxIPCFormat WXUNUSED(format))
 {
-    wxCHECK_MSG( format == wxIPC_TEXT ||
-                 format == wxIPC_UTF8TEXT ||
-                 format == wxIPC_UNICODETEXT,
-                 false,
-                 wxT("wxDDEServer::Execute() supports only text data") );
-
-    wxMemoryBuffer buffer;
-    LPBYTE realData = NULL;
-    size_t realSize = 0;
-    wxMBConv *conv = NULL;
-
-    // Windows only supports either ANSI or UTF-16 format depending on the
-    // build, so we need to convert the data if it doesn't use it already
-#if wxUSE_UNICODE
-    if ( format == wxIPC_TEXT )
-    {
-        conv = &wxConvLibc;
-    }
-    else if ( format == wxIPC_UTF8TEXT )
-    {
-        conv = &wxConvUTF8;
-    }
-    else // no conversion necessary for wxIPC_UNICODETEXT
-    {
-        realData = (LPBYTE)data;
-        realSize = size;
-    }
-
-    if ( conv )
-    {
-        const char * const text = (const char *)data;
-        const size_t len = size/sizeof(char);
-
-        realSize = conv->ToWChar(NULL, 0, text, len);
-        if ( realSize == wxCONV_FAILED )
-            return false;
-
-        realData = (LPBYTE)buffer.GetWriteBuf(realSize*sizeof(wchar_t));
-        if ( !realData )
-            return false;
-
-        realSize = conv->ToWChar((wchar_t *)realData, realSize, text, len);
-        if ( realSize == wxCONV_FAILED )
-            return false;
-
-        // We need to pass the size of the buffer to DdeClientTransaction() and
-        // not the length of the string.
-        realSize *= sizeof(wchar_t);
-    }
-#else // !wxUSE_UNICODE
-    if ( format == wxIPC_UNICODETEXT )
-    {
-        conv = &wxConvLibc;
-    }
-    else if ( format == wxIPC_UTF8TEXT )
-    {
-        // we could implement this in theory but it's not obvious how to pass
-        // the format information and, basically, why bother -- just use
-        // Unicode build
-        wxFAIL_MSG( wxT("UTF-8 text not supported in ANSI build") );
-
-        return false;
-    }
-    else // don't convert wxIPC_TEXT
-    {
-        realData = (LPBYTE)data;
-        realSize = size;
-    }
-
-    if ( conv )
-    {
-        const wchar_t * const wtext = (const wchar_t *)data;
-        const size_t len = size/sizeof(wchar_t);
-
-        realSize = conv->FromWChar(NULL, 0, wtext, len);
-        if ( realSize == wxCONV_FAILED )
-            return false;
-
-        realData = (LPBYTE)buffer.GetWriteBuf(realSize*sizeof(char));
-        if ( !realData )
-            return false;
-
-        realSize = conv->FromWChar((char*)realData, realSize, wtext, len);
-        if ( realSize == wxCONV_FAILED )
-            return false;
-    }
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
     DWORD result;
-    bool ok = DdeClientTransaction(realData,
-                                   realSize,
-                                   GetHConv(),
-                                   NULL,
-                                   // MSDN: if the transaction specified by
-                                   // the wType parameter does not pass data
-                                   // or is XTYP_EXECUTE, wFmt should be zero.
-                                   0,
-                                   XTYP_EXECUTE,
-                                   DDE_TIMEOUT,
-                                   &result) != 0;
+    if (size < 0)
+    {
+        size = (wxStrlen(data) + 1) * sizeof(wxChar);    // includes final NUL
+    }
+
+    bool ok = DdeClientTransaction((LPBYTE)data,
+                                    size,
+                                    GetHConv(),
+                                    NULL,
+// If the transaction specified by the wType parameter does not pass data or is XTYP_EXECUTE,
+// wFmt should be zero.
+                                    0,
+                                    XTYP_EXECUTE,
+                                    DDE_TIMEOUT,
+                                    &result) != 0;
 
     if ( !ok )
     {
-        DDELogError(wxT("DDE execute request failed"));
+        DDELogError(_T("DDE execute request failed"));
     }
 
     return ok;
 }
 
-const void *wxDDEConnection::Request(const wxString& item, size_t *size, wxIPCFormat format)
+wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format)
 {
     DWORD result;
 
@@ -672,29 +586,33 @@ const void *wxDDEConnection::Request(const wxString& item, size_t *size, wxIPCFo
                                                   &result);
     if ( !returned_data )
     {
-        DDELogError(wxT("DDE data request failed"));
+        DDELogError(_T("DDE data request failed"));
 
         return NULL;
     }
 
     DWORD len = DdeGetData(returned_data, NULL, 0, 0);
 
-    void *data = GetBufferAtLeast(len);
+    wxChar *data = GetBufferAtLeast( len );
     wxASSERT_MSG(data != NULL,
-                 wxT("Buffer too small in wxDDEConnection::Request") );
+                 _T("Buffer too small in wxDDEConnection::Request") );
     (void) DdeGetData(returned_data, (LPBYTE)data, len, 0);
 
     (void) DdeFreeDataHandle(returned_data);
 
     if (size)
-        *size = (size_t)len;
+        *size = (int)len;
 
     return data;
 }
 
-bool wxDDEConnection::DoPoke(const wxString& item, const void *data, size_t size, wxIPCFormat format)
+bool wxDDEConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
 {
     DWORD result;
+    if (size < 0)
+    {
+        size = (wxStrlen(data) + 1) * sizeof(wxChar);    // includes final NUL
+    }
 
     HSZ item_atom = DDEGetAtom(item);
     bool ok = DdeClientTransaction((LPBYTE)data,
@@ -751,11 +669,16 @@ bool wxDDEConnection::StopAdvise(const wxString& item)
 }
 
 // Calls that SERVER can make
-bool wxDDEConnection::DoAdvise(const wxString& item,
-                               const void *data,
-                               size_t size,
-                               wxIPCFormat format)
+bool wxDDEConnection::Advise(const wxString& item,
+                             wxChar *data,
+                             int size,
+                             wxIPCFormat format)
 {
+    if (size < 0)
+    {
+        size = (wxStrlen(data) + 1) * sizeof(wxChar);    // includes final NUL
+    }
+
     HSZ item_atom = DDEGetAtom(item);
     HSZ topic_atom = DDEGetAtom(m_topicName);
     m_sendingData = data;  // mrf: potential for scope problems here?
@@ -772,6 +695,12 @@ bool wxDDEConnection::DoAdvise(const wxString& item,
     return ok;
 }
 
+bool wxDDEConnection::OnDisconnect()
+{
+    delete this;
+    return true;
+}
+
 // ----------------------------------------------------------------------------
 // _DDECallback
 // ----------------------------------------------------------------------------
@@ -846,27 +775,19 @@ _DDECallback(WORD wType,
                 {
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
 
-                    void *data = connection->GetBufferAtLeast(len);
+                    wxChar *data = connection->GetBufferAtLeast( len );
                     wxASSERT_MSG(data != NULL,
-                                 wxT("Buffer too small in _DDECallback (XTYP_EXECUTE)") );
+                                 _T("Buffer too small in _DDECallback (XTYP_EXECUTE)") );
 
                     DdeGetData(hData, (LPBYTE)data, len, 0);
 
                     DdeFreeDataHandle(hData);
 
-                    // XTYP_EXECUTE can be used for text only and the text is
-                    // always in ANSI format for ANSI build and Unicode format
-                    // in Unicode build
-                    #if wxUSE_UNICODE
-                        wFmt = wxIPC_UNICODETEXT;
-                    #else
-                        wFmt = wxIPC_TEXT;
-                    #endif
-
+// XTYP_EXECUTE cannot be used for arbitrary data, but only for text
                     if ( connection->OnExecute(connection->m_topicName,
                                                data,
                                                (int)len,
-                                               (wxIPCFormat)wFmt) )
+                                               wxIPC_TEXT ) )
                     {
                         return (DDERETURN)(DWORD)DDE_FACK;
                     }
@@ -883,26 +804,15 @@ _DDECallback(WORD wType,
                 {
                     wxString item_name = DDEStringFromAtom(hsz2);
 
-                    size_t user_size = wxNO_LEN;
-                    const void *data = connection->OnRequest(connection->m_topicName,
-                                                             item_name,
-                                                             &user_size,
-                                                             (wxIPCFormat)wFmt);
+                    int user_size = -1;
+                    wxChar *data = connection->OnRequest(connection->m_topicName,
+                                                       item_name,
+                                                       &user_size,
+                                                       (wxIPCFormat) wFmt);
                     if (data)
                     {
-                      if (user_size == wxNO_LEN)
-                        switch (wFmt)
-                        {
-                          case wxIPC_TEXT:
-                          case wxIPC_UTF8TEXT:
-                            user_size = strlen((const char*)data) + 1;  // includes final NUL
-                            break;
-                          case wxIPC_UNICODETEXT:
-                            user_size = (wcslen((const wchar_t*)data) + 1) * sizeof(wchar_t);  // includes final NUL
-                            break;
-                          default:
-                            user_size = 0;
-                        }
+                        if (user_size < 0)
+                            user_size = (wxStrlen((wxChar*)data) + 1) * sizeof(wxChar);    // includes final NUL
 
                         HDDEDATA handle = DdeCreateDataHandle(DDEIdInst,
                                                               (LPBYTE)data,
@@ -927,9 +837,9 @@ _DDECallback(WORD wType,
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
 
-                    void *data = connection->GetBufferAtLeast(len);
+                    wxChar *data = connection->GetBufferAtLeast( len );
                     wxASSERT_MSG(data != NULL,
-                                 wxT("Buffer too small in _DDECallback (XTYP_POKE)") );
+                                 _T("Buffer too small in _DDECallback (XTYP_POKE)") );
 
                     DdeGetData(hData, (LPBYTE)data, len, 0);
 
@@ -1014,9 +924,9 @@ _DDECallback(WORD wType,
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
 
-                    void *data = connection->GetBufferAtLeast(len);
+                    wxChar *data = connection->GetBufferAtLeast( len );
                     wxASSERT_MSG(data != NULL,
-                                 wxT("Buffer too small in _DDECallback (XTYP_ADVDATA)") );
+                                 _T("Buffer too small in _DDECallback (XTYP_ADVDATA)") );
 
                     DdeGetData(hData, (LPBYTE)data, len, 0);
 
@@ -1066,9 +976,9 @@ The returned handle has to be freed by the caller (using
 */
 static HSZ DDEAtomFromString(const wxString& s)
 {
-    wxASSERT_MSG( DDEIdInst, wxT("DDE not initialized") );
+    wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") );
 
-    HSZ hsz = DdeCreateStringHandle(DDEIdInst, wxMSW_CONV_LPTSTR(s), DDE_CP);
+    HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*) s.c_str(), DDE_CP);
     if ( !hsz )
     {
         DDELogError(_("Failed to create DDE string"));
@@ -1108,7 +1018,7 @@ static void DDELogError(const wxString& s, UINT error)
         error = DdeGetLastError(DDEIdInst);
     }
 
-    wxLogError(s + wxT(": ") + DDEGetErrorMsg(error));
+    wxLogError(s + _T(": ") + DDEGetErrorMsg(error));
 }
 
 static wxString DDEGetErrorMsg(UINT error)
diff --git a/Source/3rd Party/wx/src/msw/debughlp.cpp b/Source/3rd Party/wx/src/msw/debughlp.cpp
index e3c90f922..7958eea21 100644
--- a/Source/3rd Party/wx/src/msw/debughlp.cpp	
+++ b/Source/3rd Party/wx/src/msw/debughlp.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/debughlp.cpp
+// Name:        msw/debughlp.cpp
 // Purpose:     various Win32 debug helpers
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-08 (extracted from crashrpt.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: debughlp.cpp 37037 2006-01-21 16:47:30Z JS $
 // Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -50,8 +50,7 @@ static wxString gs_errMsg;
 // static members
 // ----------------------------------------------------------------------------
 
-#define DEFINE_SYM_FUNCTION(func, name) \
-    wxDbgHelpDLL::func ## _t wxDbgHelpDLL::func = 0
+#define DEFINE_SYM_FUNCTION(func) wxDbgHelpDLL::func ## _t wxDbgHelpDLL::func = 0
 
 wxDO_FOR_ALL_SYM_FUNCS(DEFINE_SYM_FUNCTION);
 
@@ -65,12 +64,12 @@ wxDO_FOR_ALL_SYM_FUNCS(DEFINE_SYM_FUNCTION);
 
 static bool BindDbgHelpFunctions(const wxDynamicLibrary& dllDbgHelp)
 {
-    #define LOAD_SYM_FUNCTION(func, name)                                     \
-        wxDbgHelpDLL::func = (wxDbgHelpDLL::func ## _t)                       \
-            dllDbgHelp.GetSymbol(wxT(#name));                                 \
-        if ( !wxDbgHelpDLL::func )                                            \
+    #define LOAD_SYM_FUNCTION(name)                                           \
+        wxDbgHelpDLL::name = (wxDbgHelpDLL::name ## _t)                       \
+                                dllDbgHelp.GetSymbol(_T(#name));              \
+        if ( !wxDbgHelpDLL::name )                                            \
         {                                                                     \
-            gs_errMsg += wxT("Function ") wxT(#name) wxT("() not found.\n");  \
+            gs_errMsg += _T("Function ") _T(#name) _T("() not found.\n");     \
             return false;                                                     \
         }
 
@@ -84,7 +83,7 @@ static bool BindDbgHelpFunctions(const wxDynamicLibrary& dllDbgHelp)
 // called by Init() if we hadn't done this before
 static bool DoInit()
 {
-    wxDynamicLibrary dllDbgHelp(wxT("dbghelp.dll"), wxDL_VERBATIM);
+    wxDynamicLibrary dllDbgHelp(_T("dbghelp.dll"), wxDL_VERBATIM);
     if ( dllDbgHelp.IsLoaded() )
     {
         if ( BindDbgHelpFunctions(dllDbgHelp) )
@@ -100,19 +99,19 @@ static bool DoInit()
             return true;
         }
 
-        gs_errMsg += wxT("\nPlease update your dbghelp.dll version, ")
-                     wxT("at least version 5.1 is needed!\n")
-                     wxT("(if you already have a new version, please ")
-                     wxT("put it in the same directory where the program is.)\n");
+        gs_errMsg += _T("\nPlease update your dbghelp.dll version, ")
+                     _T("at least version 5.1 is needed!\n")
+                     _T("(if you already have a new version, please ")
+                     _T("put it in the same directory where the program is.)\n");
     }
     else // failed to load dbghelp.dll
     {
-        gs_errMsg += wxT("Please install dbghelp.dll available free of charge ")
-                     wxT("from Microsoft to get more detailed crash information!");
+        gs_errMsg += _T("Please install dbghelp.dll available free of charge ")
+                     _T("from Microsoft to get more detailed crash information!");
     }
 
-    gs_errMsg += wxT("\nLatest dbghelp.dll is available at ")
-                 wxT("http://www.microsoft.com/whdc/ddk/debugging/\n");
+    gs_errMsg += _T("\nLatest dbghelp.dll is available at ")
+                 _T("http://www.microsoft.com/whdc/ddk/debugging/\n");
 
     return false;
 }
@@ -145,8 +144,8 @@ const wxString& wxDbgHelpDLL::GetErrorMessage()
 /* static */
 void wxDbgHelpDLL::LogError(const wxChar *func)
 {
-    ::OutputDebugString(wxString::Format(wxT("dbghelp: %s() failed: %s\r\n"),
-                        func, wxSysErrorMsg(::GetLastError())).t_str());
+    ::OutputDebugString(wxString::Format(_T("dbghelp: %s() failed: %s\r\n"),
+                        func, wxSysErrorMsg(::GetLastError())));
 }
 
 // ----------------------------------------------------------------------------
@@ -213,12 +212,12 @@ wxDbgHelpDLL::DumpBaseType(BasicType bt, DWORD64 length, PVOID pAddress)
 {
     if ( !pAddress )
     {
-        return wxT("null");
+        return _T("null");
     }
 
     if ( ::IsBadReadPtr(pAddress, length) != 0 )
     {
-        return wxT("BAD");
+        return _T("BAD");
     }
 
 
@@ -230,13 +229,13 @@ wxDbgHelpDLL::DumpBaseType(BasicType bt, DWORD64 length, PVOID pAddress)
         const BYTE b = *(PBYTE)pAddress;
 
         if ( bt == BASICTYPE_BOOL )
-            s = b ? wxT("true") : wxT("false");
+            s = b ? _T("true") : _T("false");
         else
-            s.Printf(wxT("%#04x"), b);
+            s.Printf(_T("%#04x"), b);
     }
     else if ( length == 2 )
     {
-        s.Printf(bt == BASICTYPE_UINT ? wxT("%#06x") : wxT("%d"),
+        s.Printf(bt == BASICTYPE_UINT ? _T("%#06x") : _T("%d"),
                  *(PWORD)pAddress);
     }
     else if ( length == 4 )
@@ -245,7 +244,7 @@ wxDbgHelpDLL::DumpBaseType(BasicType bt, DWORD64 length, PVOID pAddress)
 
         if ( bt == BASICTYPE_FLOAT )
         {
-            s.Printf(wxT("%f"), *(PFLOAT)pAddress);
+            s.Printf(_T("%f"), *(PFLOAT)pAddress);
 
             handled = true;
         }
@@ -257,12 +256,12 @@ wxDbgHelpDLL::DumpBaseType(BasicType bt, DWORD64 length, PVOID pAddress)
             const char *pc = *(PSTR *)pAddress;
             if ( ::IsBadStringPtrA(pc, NUM_CHARS) == 0 )
             {
-                s += wxT('"');
+                s += _T('"');
                 for ( size_t n = 0; n < NUM_CHARS && *pc; n++, pc++ )
                 {
                     s += *pc;
                 }
-                s += wxT('"');
+                s += _T('"');
 
                 handled = true;
             }
@@ -271,18 +270,18 @@ wxDbgHelpDLL::DumpBaseType(BasicType bt, DWORD64 length, PVOID pAddress)
         if ( !handled )
         {
             // treat just as an opaque DWORD
-            s.Printf(wxT("%#x"), *(PDWORD)pAddress);
+            s.Printf(_T("%#x"), *(PDWORD)pAddress);
         }
     }
     else if ( length == 8 )
     {
         if ( bt == BASICTYPE_FLOAT )
         {
-            s.Printf(wxT("%lf"), *(double *)pAddress);
+            s.Printf(_T("%lf"), *(double *)pAddress);
         }
         else // opaque 64 bit value
         {
-            s.Printf("%#" wxLongLongFmtSpec "x", *(wxLongLong_t *)pAddress);
+            s.Printf(_T("%#" wxLongLongFmtSpec _T("x")), *(PDWORD *)pAddress);
         }
     }
 
@@ -316,7 +315,7 @@ wxDbgHelpDLL::DumpField(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
         case SYMBOL_TAG_DATA:
             if ( !pVariable )
             {
-                s = wxT("NULL");
+                s = _T("NULL");
             }
             else // valid location
             {
@@ -360,28 +359,19 @@ wxDbgHelpDLL::DumpField(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
                     case SYMBOL_TAG_BASE_CLASS:
                         s = DumpUDT(&sym, pVariable, level);
                         break;
-
-                    default:
-                        // Suppress gcc warnings about unhandled enum values.
-                        break;
                 }
             }
 
             if ( !s.empty() )
             {
-                s = GetSymbolName(pSym) + wxT(" = ") + s;
+                s = GetSymbolName(pSym) + _T(" = ") + s;
             }
             break;
-
-        default:
-            // Suppress gcc warnings about unhandled enum values, don't assert
-            // to avoid problems during fatal crash generation.
-            break;
     }
 
     if ( !s.empty() )
     {
-        s = wxString(wxT('\t'), level + 1) + s + wxT('\n');
+        s = wxString(_T('\t'), level + 1) + s + _T('\n');
     }
 
     return s;
@@ -401,11 +391,11 @@ wxDbgHelpDLL::DumpUDT(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
     s.reserve(512);
     s = GetSymbolName(pSym);
 
-#if !wxUSE_STD_STRING
+#if !wxUSE_STL
     // special handling for ubiquitous wxString: although the code below works
     // for it as well, it shows the wxStringBase class and takes 4 lines
     // instead of only one as this branch
-    if ( s == wxT("wxString") )
+    if ( s == _T("wxString") )
     {
         wxString *ps = (wxString *)pVariable;
 
@@ -426,10 +416,10 @@ wxDbgHelpDLL::DumpUDT(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
             }
         }
 
-        s << wxT("(\"") << (p ? p : wxT("???")) << wxT(")\"");
+        s << _T("(\"") << (p ? p : _T("???")) << _T(")\"");
     }
     else // any other UDT
-#endif // !wxUSE_STD_STRING
+#endif // !wxUSE_STL
     {
         // Determine how many children this type has.
         DWORD dwChildrenCount = 0;
@@ -452,7 +442,7 @@ wxDbgHelpDLL::DumpUDT(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
             return s;
         }
 
-        s << wxT(" {\n");
+        s << _T(" {\n");
 
         // Iterate through all children
         SYMBOL_INFO sym;
@@ -479,7 +469,7 @@ wxDbgHelpDLL::DumpUDT(PSYMBOL_INFO pSym, void *pVariable, unsigned level)
 
         free(children);
 
-        s << wxString(wxT('\t'), level + 1) << wxT('}');
+        s << wxString(_T('\t'), level + 1) << _T('}');
     }
 
     return s;
@@ -530,11 +520,6 @@ wxDbgHelpDLL::DumpSymbol(PSYMBOL_INFO pSym, void *pVariable)
     SYMBOL_INFO symDeref = *pSym;
     switch ( DereferenceSymbol(&symDeref, &pVariable) )
     {
-        default:
-            // Suppress gcc warnings about unhandled enum values, don't assert
-            // to avoid problems during fatal crash generation.
-            break;
-
         case SYMBOL_TAG_UDT:
             // show UDT recursively
             s = DumpUDT(&symDeref, pVariable);
@@ -565,37 +550,37 @@ static wxString TagString(wxDbgHelpDLL::SymbolTag tag)
 {
     static const wxChar *tags[] =
     {
-        wxT("null"),
-        wxT("exe"),
-        wxT("compiland"),
-        wxT("compiland details"),
-        wxT("compiland env"),
-        wxT("function"),
-        wxT("block"),
-        wxT("data"),
-        wxT("annotation"),
-        wxT("label"),
-        wxT("public symbol"),
-        wxT("udt"),
-        wxT("enum"),
-        wxT("function type"),
-        wxT("pointer type"),
-        wxT("array type"),
-        wxT("base type"),
-        wxT("typedef"),
-        wxT("base class"),
-        wxT("friend"),
-        wxT("function arg type"),
-        wxT("func debug start"),
-        wxT("func debug end"),
-        wxT("using namespace"),
-        wxT("vtable shape"),
-        wxT("vtable"),
-        wxT("custom"),
-        wxT("thunk"),
-        wxT("custom type"),
-        wxT("managed type"),
-        wxT("dimension"),
+        _T("null"),
+        _T("exe"),
+        _T("compiland"),
+        _T("compiland details"),
+        _T("compiland env"),
+        _T("function"),
+        _T("block"),
+        _T("data"),
+        _T("annotation"),
+        _T("label"),
+        _T("public symbol"),
+        _T("udt"),
+        _T("enum"),
+        _T("function type"),
+        _T("pointer type"),
+        _T("array type"),
+        _T("base type"),
+        _T("typedef"),
+        _T("base class"),
+        _T("friend"),
+        _T("function arg type"),
+        _T("func debug start"),
+        _T("func debug end"),
+        _T("using namespace"),
+        _T("vtable shape"),
+        _T("vtable"),
+        _T("custom"),
+        _T("thunk"),
+        _T("custom type"),
+        _T("managed type"),
+        _T("dimension"),
     };
 
     wxCOMPILE_TIME_ASSERT( WXSIZEOF(tags) == wxDbgHelpDLL::SYMBOL_TAG_MAX,
@@ -605,7 +590,7 @@ static wxString TagString(wxDbgHelpDLL::SymbolTag tag)
     if ( tag < WXSIZEOF(tags) )
         s = tags[tag];
     else
-        s.Printf(wxT("unrecognized tag (%d)"), tag);
+        s.Printf(_T("unrecognized tag (%d)"), tag);
 
     return s;
 }
@@ -614,16 +599,16 @@ static wxString KindString(wxDbgHelpDLL::DataKind kind)
 {
     static const wxChar *kinds[] =
     {
-         wxT("unknown"),
-         wxT("local"),
-         wxT("static local"),
-         wxT("param"),
-         wxT("object ptr"),
-         wxT("file static"),
-         wxT("global"),
-         wxT("member"),
-         wxT("static member"),
-         wxT("constant"),
+         _T("unknown"),
+         _T("local"),
+         _T("static local"),
+         _T("param"),
+         _T("object ptr"),
+         _T("file static"),
+         _T("global"),
+         _T("member"),
+         _T("static member"),
+         _T("constant"),
     };
 
     wxCOMPILE_TIME_ASSERT( WXSIZEOF(kinds) == wxDbgHelpDLL::DATA_MAX,
@@ -633,7 +618,7 @@ static wxString KindString(wxDbgHelpDLL::DataKind kind)
     if ( kind < WXSIZEOF(kinds) )
         s = kinds[kind];
     else
-        s.Printf(wxT("unrecognized kind (%d)"), kind);
+        s.Printf(_T("unrecognized kind (%d)"), kind);
 
     return s;
 }
@@ -642,9 +627,9 @@ static wxString UdtKindString(wxDbgHelpDLL::UdtKind kind)
 {
     static const wxChar *kinds[] =
     {
-         wxT("struct"),
-         wxT("class"),
-         wxT("union"),
+         _T("struct"),
+         _T("class"),
+         _T("union"),
     };
 
     wxCOMPILE_TIME_ASSERT( WXSIZEOF(kinds) == wxDbgHelpDLL::UDT_MAX,
@@ -654,7 +639,7 @@ static wxString UdtKindString(wxDbgHelpDLL::UdtKind kind)
     if ( kind < WXSIZEOF(kinds) )
         s = kinds[kind];
     else
-        s.Printf(wxT("unrecognized UDT (%d)"), kind);
+        s.Printf(_T("unrecognized UDT (%d)"), kind);
 
     return s;
 }
@@ -663,38 +648,38 @@ static wxString TypeString(wxDbgHelpDLL::BasicType bt)
 {
     static const wxChar *types[] =
     {
-        wxT("no type"),
-        wxT("void"),
-        wxT("char"),
-        wxT("wchar"),
-        wxT(""),
-        wxT(""),
-        wxT("int"),
-        wxT("uint"),
-        wxT("float"),
-        wxT("bcd"),
-        wxT("bool"),
-        wxT(""),
-        wxT(""),
-        wxT("long"),
-        wxT("ulong"),
-        wxT(""),
-        wxT(""),
-        wxT(""),
-        wxT(""),
-        wxT(""),
-        wxT(""),
-        wxT(""),
-        wxT(""),
-        wxT(""),
-        wxT(""),
-        wxT("CURRENCY"),
-        wxT("DATE"),
-        wxT("VARIANT"),
-        wxT("complex"),
-        wxT("bit"),
-        wxT("BSTR"),
-        wxT("HRESULT"),
+        _T("no type"),
+        _T("void"),
+        _T("char"),
+        _T("wchar"),
+        _T(""),
+        _T(""),
+        _T("int"),
+        _T("uint"),
+        _T("float"),
+        _T("bcd"),
+        _T("bool"),
+        _T(""),
+        _T(""),
+        _T("long"),
+        _T("ulong"),
+        _T(""),
+        _T(""),
+        _T(""),
+        _T(""),
+        _T(""),
+        _T(""),
+        _T(""),
+        _T(""),
+        _T(""),
+        _T(""),
+        _T("CURRENCY"),
+        _T("DATE"),
+        _T("VARIANT"),
+        _T("complex"),
+        _T("bit"),
+        _T("BSTR"),
+        _T("HRESULT"),
     };
 
     wxCOMPILE_TIME_ASSERT( WXSIZEOF(types) == wxDbgHelpDLL::BASICTYPE_MAX,
@@ -705,7 +690,7 @@ static wxString TypeString(wxDbgHelpDLL::BasicType bt)
         s = types[bt];
 
     if ( s.empty() )
-        s.Printf(wxT("unrecognized type (%d)"), bt);
+        s.Printf(_T("unrecognized type (%d)"), bt);
 
     return s;
 }
@@ -722,11 +707,11 @@ extern "C" void DumpTI(ULONG ti)
     DoGetTypeInfo(&sym, TI_GET_SYMTAG, &tag);
     DoGetTypeInfo(&sym, TI_GET_TYPEID, &ti);
 
-    OutputDebugString(wxString::Format(wxT("Type 0x%x: "), sym.TypeIndex));
+    OutputDebugString(wxString::Format(_T("Type 0x%x: "), sym.TypeIndex));
     wxString name = wxDbgHelpDLL::GetSymbolName(&sym);
     if ( !name.empty() )
     {
-        OutputDebugString(wxString::Format(wxT("name=\"%s\", "), name.c_str()));
+        OutputDebugString(wxString::Format(_T("name=\"%s\", "), name.c_str()));
     }
 
     DWORD nested;
@@ -735,15 +720,15 @@ extern "C" void DumpTI(ULONG ti)
         nested = FALSE;
     }
 
-    OutputDebugString(wxString::Format(wxT("tag=%s%s"),
-                      nested ? wxT("nested ") : wxEmptyString,
+    OutputDebugString(wxString::Format(_T("tag=%s%s"),
+                      nested ? _T("nested ") : wxEmptyString,
                       TagString(tag).c_str()));
     if ( tag == wxDbgHelpDLL::SYMBOL_TAG_UDT )
     {
         wxDbgHelpDLL::UdtKind udtKind;
         if ( DoGetTypeInfo(&sym, TI_GET_UDTKIND, &udtKind) )
         {
-            OutputDebugString(wxT(" (") + UdtKindString(udtKind) + wxT(')'));
+            OutputDebugString(_T(" (") + UdtKindString(udtKind) + _T(')'));
         }
     }
 
@@ -751,13 +736,13 @@ extern "C" void DumpTI(ULONG ti)
     if ( DoGetTypeInfo(&sym, TI_GET_DATAKIND, &kind) )
     {
         OutputDebugString(wxString::Format(
-            wxT(", kind=%s"), KindString(kind).c_str()));
+            _T(", kind=%s"), KindString(kind).c_str()));
         if ( kind == wxDbgHelpDLL::DATA_MEMBER )
         {
             DWORD ofs = 0;
             if ( DoGetTypeInfo(&sym, TI_GET_OFFSET, &ofs) )
             {
-                OutputDebugString(wxString::Format(wxT(" (ofs=0x%x)"), ofs));
+                OutputDebugString(wxString::Format(_T(" (ofs=0x%x)"), ofs));
             }
         }
     }
@@ -765,16 +750,16 @@ extern "C" void DumpTI(ULONG ti)
     wxDbgHelpDLL::BasicType bt = GetBasicType(&sym);
     if ( bt )
     {
-        OutputDebugString(wxString::Format(wxT(", type=%s"),
+        OutputDebugString(wxString::Format(_T(", type=%s"),
                                 TypeString(bt).c_str()));
     }
 
     if ( ti != sym.TypeIndex )
     {
-        OutputDebugString(wxString::Format(wxT(", next ti=0x%x"), ti));
+        OutputDebugString(wxString::Format(_T(", next ti=0x%x"), ti));
     }
 
-    OutputDebugString(wxT("\r\n"));
+    OutputDebugString(_T("\r\n"));
 }
 
 #endif // NDEBUG
diff --git a/Source/3rd Party/wx/src/msw/dialog.cpp b/Source/3rd Party/wx/src/msw/dialog.cpp
index 3fe93aebf..20e354018 100644
--- a/Source/3rd Party/wx/src/msw/dialog.cpp	
+++ b/Source/3rd Party/wx/src/msw/dialog.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dialog.cpp 41054 2006-09-07 19:01:45Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,7 +40,7 @@
 
 #include "wx/msw/private.h"
 #include "wx/evtloop.h"
-#include "wx/scopedptr.h"
+#include "wx/ptr_scpd.h"
 
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     #include "wx/msw/wince/resources.h"
@@ -50,6 +50,64 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxDialogStyle )
+
+wxBEGIN_FLAGS( wxDialogStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxNO_BORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+
+    // dialog styles
+    wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY)
+    wxFLAGS_MEMBER(wxSTAY_ON_TOP)
+    wxFLAGS_MEMBER(wxCAPTION)
+#if WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxTHICK_FRAME)
+#endif // WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxSYSTEM_MENU)
+    wxFLAGS_MEMBER(wxRESIZE_BORDER)
+#if WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxRESIZE_BOX)
+#endif // WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxCLOSE_BOX)
+    wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
+    wxFLAGS_MEMBER(wxMINIMIZE_BOX)
+wxEND_FLAGS( wxDialogStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxDialog)
+    wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxDialog)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
+#endif
+
 // ----------------------------------------------------------------------------
 // wxDialogModalData
 // ----------------------------------------------------------------------------
@@ -87,14 +145,13 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData)
 
 void wxDialog::Init()
 {
+    m_oldFocus = (wxWindow *)NULL;
     m_isShown = false;
     m_modalData = NULL;
+    m_endModalCalled = false;
 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     m_dialogToolBar = NULL;
 #endif
-#if wxUSE_DIALOG_SIZEGRIP
-    m_hGripper = 0;
-#endif // wxUSE_DIALOG_SIZEGRIP
 }
 
 bool wxDialog::Create(wxWindow *parent,
@@ -107,6 +164,9 @@ bool wxDialog::Create(wxWindow *parent,
 {
     SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
 
+    // save focus before doing anything which can potentially change it
+    m_oldFocus = FindFocus();
+
     // All dialogs should really have this style
     style |= wxTAB_TRAVERSAL;
 
@@ -123,33 +183,77 @@ bool wxDialog::Create(wxWindow *parent,
     CreateToolBar();
 #endif
 
-#if wxUSE_DIALOG_SIZEGRIP
-    if ( HasFlag(wxRESIZE_BORDER) )
-    {
-        CreateGripper();
-
-        Connect(wxEVT_CREATE,
-                wxWindowCreateEventHandler(wxDialog::OnWindowCreate));
-    }
-#endif // wxUSE_DIALOG_SIZEGRIP
-
     return true;
 }
 
+#if WXWIN_COMPATIBILITY_2_6
+
+// deprecated ctor
+wxDialog::wxDialog(wxWindow *parent,
+                   const wxString& title,
+                   bool WXUNUSED(modal),
+                   int x,
+                   int y,
+                   int w,
+                   int h,
+                   long style,
+                   const wxString& name)
+{
+    Init();
+
+    Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
+}
+
+void wxDialog::SetModal(bool WXUNUSED(flag))
+{
+    // nothing to do, obsolete method
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
 wxDialog::~wxDialog()
 {
+    m_isBeingDeleted = true;
+
     // this will also reenable all the other windows for a modal dialog
     Show(false);
-
-#if wxUSE_DIALOG_SIZEGRIP
-    DestroyGripper();
-#endif // wxUSE_DIALOG_SIZEGRIP
 }
 
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
+#if WXWIN_COMPATIBILITY_2_6
+
+bool wxDialog::IsModalShowing() const
+{
+    return IsModal();
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+wxWindow *wxDialog::FindSuitableParent() const
+{
+    // first try to use the currently active window
+    HWND hwndFg = ::GetForegroundWindow();
+    wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg)
+                              : NULL;
+    if ( !parent )
+    {
+        // next try the main app window
+        parent = wxTheApp->GetTopWindow();
+    }
+
+    // finally, check if the parent we found is really suitable
+    if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
+    {
+        // don't use this one
+        parent = NULL;
+    }
+
+    return parent;
+}
+
 bool wxDialog::Show(bool show)
 {
     if ( show == IsShown() )
@@ -167,9 +271,6 @@ bool wxDialog::Show(bool show)
 
     if ( show )
     {
-        if (CanDoLayoutAdaptation())
-            DoLayoutAdaptation();
-
         // this usually will result in TransferDataToWindow() being called
         // which will change the controls values so do it before showing as
         // otherwise we could have some flicker
@@ -180,35 +281,76 @@ bool wxDialog::Show(bool show)
 
     if ( show )
     {
-        // dialogs don't get WM_SIZE message from ::ShowWindow() for some
-        // reason so generate it ourselves for consistency with frames and
-        // dialogs in other ports
+        // dialogs don't get WM_SIZE message after creation unlike most (all?)
+        // other windows and so could start their life non laid out correctly
+        // if we didn't call Layout() from here
         //
         // NB: normally we should call it just the first time but doing it
         //     every time is simpler than keeping a flag
-        const wxSize size = GetClientSize();
-        ::SendMessage(GetHwnd(), WM_SIZE,
-                      SIZE_RESTORED, MAKELPARAM(size.x, size.y));
+        Layout();
     }
 
     return true;
 }
 
+void wxDialog::Raise()
+{
+    ::SetForegroundWindow(GetHwnd());
+}
+
 // show dialog modally
 int wxDialog::ShowModal()
 {
-    wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") );
+    wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );
+
+    m_endModalCalled = false;
 
     Show();
 
     // EndModal may have been called from InitDialog handler (called from
-    // inside Show()) and hidden the dialog back again
-    if ( IsShown() )
+    // inside Show()), which would cause an infinite loop if we didn't take it
+    // into account
+    if ( !m_endModalCalled )
     {
+        // modal dialog needs a parent window, so try to find one
+        wxWindow *parent = GetParent();
+        if ( !parent )
+        {
+            parent = FindSuitableParent();
+        }
+
+        // remember where the focus was
+        wxWindow *oldFocus = m_oldFocus;
+        if ( !oldFocus )
+        {
+            // VZ: do we really want to do this?
+            oldFocus = parent;
+        }
+
+        // We have to remember the HWND because we need to check
+        // the HWND still exists (oldFocus can be garbage when the dialog
+        // exits, if it has been destroyed)
+        HWND hwndOldFocus = oldFocus ? GetHwndOf(oldFocus) : NULL;
+
+
         // enter and run the modal loop
-        wxDialogModalDataTiedPtr modalData(&m_modalData,
-                                           new wxDialogModalData(this));
-        modalData->RunLoop();
+        {
+            wxDialogModalDataTiedPtr modalData(&m_modalData,
+                                               new wxDialogModalData(this));
+            modalData->RunLoop();
+        }
+
+
+        // and restore focus
+        // Note that this code MUST NOT access the dialog object's data
+        // in case the object has been deleted (which will be the case
+        // for a modal dialog that has been destroyed before calling EndModal).
+        if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus))
+        {
+            // This is likely to prove that the object still exists
+            if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+                oldFocus->SetFocus();
+        }
     }
 
     return GetReturnCode();
@@ -216,109 +358,14 @@ int wxDialog::ShowModal()
 
 void wxDialog::EndModal(int retCode)
 {
-    wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );
+    wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
 
+    m_endModalCalled = true;
     SetReturnCode(retCode);
 
     Hide();
 }
 
-// ----------------------------------------------------------------------------
-// wxDialog gripper handling
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DIALOG_SIZEGRIP
-
-void wxDialog::SetWindowStyleFlag(long style)
-{
-    wxDialogBase::SetWindowStyleFlag(style);
-
-    if ( HasFlag(wxRESIZE_BORDER) )
-        CreateGripper();
-    else
-        DestroyGripper();
-}
-
-void wxDialog::CreateGripper()
-{
-    if ( !m_hGripper )
-    {
-        // just create it here, it will be positioned and shown later
-        m_hGripper = (WXHWND)::CreateWindow
-                               (
-                                    wxT("SCROLLBAR"),
-                                    wxT(""),
-                                    WS_CHILD |
-                                    WS_CLIPSIBLINGS |
-                                    SBS_SIZEGRIP |
-                                    SBS_SIZEBOX |
-                                    SBS_SIZEBOXBOTTOMRIGHTALIGN,
-                                    0, 0, 0, 0,
-                                    GetHwnd(),
-                                    0,
-                                    wxGetInstance(),
-                                    NULL
-                               );
-    }
-}
-
-void wxDialog::DestroyGripper()
-{
-    if ( m_hGripper )
-    {
-        // we used to have trouble with gripper appearing on top (and hence
-        // overdrawing) the other, real, dialog children -- check that this
-        // isn't the case automatically (but notice that this could be false if
-        // we're not shown at all as in this case ResizeGripper() might not
-        // have been called yet)
-        wxASSERT_MSG( !IsShown() ||
-                      ::GetWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,
-            wxT("Bug in wxWidgets: gripper should be at the bottom of Z-order") );
-        ::DestroyWindow((HWND) m_hGripper);
-        m_hGripper = 0;
-    }
-}
-
-void wxDialog::ShowGripper(bool show)
-{
-    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );
-
-    if ( show )
-        ResizeGripper();
-
-    ::ShowWindow((HWND)m_hGripper, show ? SW_SHOW : SW_HIDE);
-}
-
-void wxDialog::ResizeGripper()
-{
-    wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );
-
-    HWND hwndGripper = (HWND)m_hGripper;
-
-    const wxRect rectGripper = wxRectFromRECT(wxGetWindowRect(hwndGripper));
-    const wxSize size = GetClientSize() - rectGripper.GetSize();
-
-    ::SetWindowPos(hwndGripper, HWND_BOTTOM,
-                   size.x, size.y,
-                   rectGripper.width, rectGripper.height,
-                   SWP_NOACTIVATE);
-}
-
-void wxDialog::OnWindowCreate(wxWindowCreateEvent& event)
-{
-    if ( m_hGripper && IsShown() &&
-            event.GetWindow() && event.GetWindow()->GetParent() == this )
-    {
-        // Put gripper below the newly created child window
-        ::SetWindowPos((HWND)m_hGripper, HWND_BOTTOM, 0, 0, 0, 0,
-                       SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
-    }
-
-    event.Skip();
-}
-
-#endif // wxUSE_DIALOG_SIZEGRIP
-
 // ----------------------------------------------------------------------------
 // wxWin event handlers
 // ----------------------------------------------------------------------------
@@ -336,7 +383,7 @@ bool wxDialog::DoOK()
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 #endif // __POCKETPC__
 
@@ -400,22 +447,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
             break;
 
         case WM_SIZE:
-#if wxUSE_DIALOG_SIZEGRIP
-            if ( m_hGripper )
-            {
-                switch ( wParam )
-                {
-                    case SIZE_MAXIMIZED:
-                        ShowGripper(false);
-                        break;
-
-                    case SIZE_RESTORED:
-                        ShowGripper(true);
-                }
-            }
-#endif // wxUSE_DIALOG_SIZEGRIP
-
-            // the Windows dialogs unfortunately are not meant to be resizable
+            // the Windows dialogs unfortunately are not meant to be resizeable
             // at all and their standard class doesn't include CS_[VH]REDRAW
             // styles which means that the window is not refreshed properly
             // after the resize and no amount of WS_CLIPCHILDREN/SIBLINGS can
@@ -438,7 +470,7 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
             {
                 // set our cursor for all windows (but see below)
                 wxCursor cursor = m_cursor;
-                if ( !cursor.IsOk() )
+                if ( !cursor.Ok() )
                     cursor = wxCURSOR_ARROW;
 
                 ::SetCursor(GetHcursorOf(cursor));
diff --git a/Source/3rd Party/wx/src/msw/dialup.cpp b/Source/3rd Party/wx/src/msw/dialup.cpp
index 96e5b73a8..173bc0639 100644
--- a/Source/3rd Party/wx/src/msw/dialup.cpp	
+++ b/Source/3rd Party/wx/src/msw/dialup.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     07.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dialup.cpp 52495 2008-03-14 14:18:24Z JS $
 // Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,12 +39,10 @@
 
 #include "wx/generic/choicdgg.h"
 
-#include "wx/msw/private.h"
-#include "wx/msw/private/hiddenwin.h"
 #include "wx/dynlib.h"
 
-wxDEFINE_EVENT( wxEVT_DIALUP_CONNECTED, wxDialUpEvent );
-wxDEFINE_EVENT( wxEVT_DIALUP_DISCONNECTED, wxDialUpEvent );
+DEFINE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED)
+DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED)
 
 // Doesn't yet compile under VC++ 4, BC++, Watcom C++,
 // Wine: no wininet.h
@@ -67,6 +65,10 @@ wxDEFINE_EVENT( wxEVT_DIALUP_DISCONNECTED, wxDialUpEvent );
 #define INTERNET_CONNECTION_PROXY 4
 #endif
 
+// implemented in utils.cpp
+extern "C" WXDLLIMPEXP_BASE HWND
+wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
+
 static const wxChar *
     wxMSWDIALUP_WNDCLASSNAME = wxT("_wxDialUpManager_Internal_Class");
 static const wxChar *gs_classForDialUpWindow = NULL;
@@ -109,7 +111,7 @@ static const wxChar *gs_classForDialUpWindow = NULL;
     typedef DWORD (APIENTRY * RASVALIDATEENTRYNAME)( LPCSTR, LPCSTR );
     typedef DWORD (APIENTRY * RASCONNECTIONNOTIFICATION)( HRASCONN, HANDLE, DWORD );
 
-    static const wxChar gs_funcSuffix = wxT('A');
+    static const wxChar gs_funcSuffix = _T('A');
 #else // Unicode
     typedef DWORD (APIENTRY * RASDIAL)( LPRASDIALEXTENSIONS, LPCWSTR, LPRASDIALPARAMSW, DWORD, LPVOID, LPHRASCONN );
     typedef DWORD (APIENTRY * RASENUMCONNECTIONS)( LPRASCONNW, LPDWORD, LPDWORD );
@@ -131,7 +133,7 @@ static const wxChar *gs_classForDialUpWindow = NULL;
     typedef DWORD (APIENTRY * RASVALIDATEENTRYNAME)( LPCWSTR, LPCWSTR );
     typedef DWORD (APIENTRY * RASCONNECTIONNOTIFICATION)( HRASCONN, HANDLE, DWORD );
 
-    static const wxChar gs_funcSuffix = wxT('W');
+    static const wxChar gs_funcSuffix = _T('W');
 #endif // ASCII/Unicode
 
 // structure passed to the secondary thread
@@ -235,7 +237,7 @@ private:
     private:
         wxDialUpManagerMSW *m_dialUpManager;
 
-        wxDECLARE_NO_COPY_CLASS(RasTimer);
+        DECLARE_NO_COPY_CLASS(RasTimer)
     } m_timerStatusPolling;
 
     // thread handle for the thread sitting on connection change event
@@ -286,7 +288,7 @@ private:
     // this flag tells us whether a call to RasDial() is in progress
     static wxDialUpManagerMSW *ms_dialer;
 
-    wxDECLARE_NO_COPY_CLASS(wxDialUpManagerMSW);
+    DECLARE_NO_COPY_CLASS(wxDialUpManagerMSW)
 };
 
 // module to destroy helper window created by wxDialUpManagerMSW
@@ -382,7 +384,7 @@ wxDialUpManager *wxDialUpManager::Create()
 
 wxDialUpManagerMSW::wxDialUpManagerMSW()
                   : m_timerStatusPolling(this),
-                    m_dllRas(wxT("RASAPI32"))
+                    m_dllRas(_T("RASAPI32"))
 {
     // initialize our data
     m_autoCheckLevel = 0;
@@ -403,7 +405,7 @@ wxDialUpManagerMSW::wxDialUpManagerMSW()
 
         // get the function from rasapi32.dll and abort if it's not found
         #define RESOLVE_RAS_FUNCTION(type, name)                          \
-            ms_pfn##name = (type)m_dllRas.GetSymbol( wxString(wxT(#name))  \
+            ms_pfn##name = (type)m_dllRas.GetSymbol( wxString(_T(#name))  \
                                                      + gs_funcSuffix);    \
             if ( !ms_pfn##name )                                          \
             {                                                             \
@@ -414,7 +416,7 @@ wxDialUpManagerMSW::wxDialUpManagerMSW()
         // a variant of above macro which doesn't abort if the function is
         // not found in the DLL
         #define RESOLVE_OPTIONAL_RAS_FUNCTION(type, name)                 \
-            ms_pfn##name = (type)m_dllRas.GetSymbol( wxString(wxT(#name))  \
+            ms_pfn##name = (type)m_dllRas.GetSymbol( wxString(_T(#name))  \
                                                      + gs_funcSuffix);
 
         RESOLVE_RAS_FUNCTION(RASDIAL, RasDial);
@@ -450,10 +452,12 @@ wxDialUpManagerMSW::wxDialUpManagerMSW()
 exit:
         if ( funcName )
         {
-            wxLogError(_("The version of remote access service (RAS) installed "
-                          "on this machine is too old, please upgrade (the "
-                          "following required function is missing: %s)."),
-                       funcName);
+            static const wxChar *msg = wxTRANSLATE(
+"The version of remote access service (RAS) installed on this machine is too\
+old, please upgrade (the following required function is missing: %s)."
+                                                   );
+
+            wxLogError(wxGetTranslation(msg), funcName);
             m_dllRas.Unload();
             return;
         }
@@ -580,7 +584,7 @@ void wxDialUpManagerMSW::CleanUpThreadData()
     {
         if ( !SetEvent(m_data->hEventQuit) )
         {
-            wxLogLastError(wxT("SetEvent(RasThreadQuit)"));
+            wxLogLastError(_T("SetEvent(RasThreadQuit)"));
         }
         else // sent quit request to the background thread
         {
@@ -594,7 +598,11 @@ void wxDialUpManagerMSW::CleanUpThreadData()
         m_hThread = 0;
     }
 
-    wxDELETE(m_data);
+    if ( m_data )
+    {
+        delete m_data;
+        m_data = NULL;
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -801,7 +809,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
 
     RASDIALPARAMS rasDialParams;
     rasDialParams.dwSize = sizeof(rasDialParams);
-    wxStrlcpy(rasDialParams.szEntryName, entryName.c_str(), RAS_MaxEntryName);
+    wxStrncpy(rasDialParams.szEntryName, entryName, RAS_MaxEntryName);
 
     // do we have the username and password?
     if ( !username || !password )
@@ -823,13 +831,14 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
     }
     else
     {
-        wxStrlcpy(rasDialParams.szUserName, username.c_str(), UNLEN);
-        wxStrlcpy(rasDialParams.szPassword, password.c_str(), PWLEN);
+        wxStrncpy(rasDialParams.szUserName, username, UNLEN);
+        wxStrncpy(rasDialParams.szPassword, password, PWLEN);
     }
 
     // default values for other fields
     rasDialParams.szPhoneNumber[0] = '\0';
     rasDialParams.szCallbackNumber[0] = '\0';
+    rasDialParams.szCallbackNumber[0] = '\0';
 
     rasDialParams.szDomain[0] = '*';
     rasDialParams.szDomain[1] = '\0';
@@ -875,16 +884,9 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
     if ( dwRet != 0 )
     {
         // can't pass a wxWCharBuffer through ( ... )
-        if ( async )
-        {
-            wxLogError(_("Failed to initiate dialup connection: %s"),
-                       GetErrorString(dwRet).c_str());
-        }
-        else
-        {
-            wxLogError(_("Failed to establish dialup connection: %s"),
-                       GetErrorString(dwRet).c_str());
-        }
+        wxLogError(_("Failed to %s dialup connection: %s"),
+                   wxString(async ? _("initiate") : _("establish")).c_str(),
+                   GetErrorString(dwRet).c_str());
 
         // we should still call RasHangUp() if we got a non 0 connection
         if ( ms_hRasConnection )
@@ -977,14 +979,14 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const
     //     but we allow multiple instances of wxDialUpManagerMSW so
     //     we might as well use the ref counted version here too.
 
-    wxDynamicLibrary hDll(wxT("WININET"));
+    wxDynamicLibrary hDll(_T("WININET"));
     if ( hDll.IsLoaded() )
     {
         typedef BOOL (WINAPI *INTERNETGETCONNECTEDSTATE)(LPDWORD, DWORD);
         INTERNETGETCONNECTEDSTATE pfnInternetGetConnectedState;
 
         #define RESOLVE_FUNCTION(type, name) \
-            pfn##name = (type)hDll.GetSymbol(wxT(#name))
+            pfn##name = (type)hDll.GetSymbol(_T(#name))
 
         RESOLVE_FUNCTION(INTERNETGETCONNECTEDSTATE, InternetGetConnectedState);
 
@@ -1262,10 +1264,11 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data)
                 break;
 
             default:
-                wxFAIL_MSG( wxT("unexpected return of WaitForMultipleObjects()") );
+                wxFAIL_MSG( _T("unexpected return of WaitForMultipleObjects()") );
                 // fall through
 
             case WAIT_FAILED:
+#ifdef __WXDEBUG__
                 // using wxLogLastError() from here is dangerous: we risk to
                 // deadlock the main thread if wxLog sends output to GUI
                 DWORD err = GetLastError();
@@ -1276,6 +1279,7 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data)
                     err,
                     wxSysErrorMsg(err)
                 );
+#endif // __WXDEBUG__
 
                 // no sense in continuing, who knows if the handles we're
                 // waiting for even exist yet...
diff --git a/Source/3rd Party/wx/src/msw/dib.cpp b/Source/3rd Party/wx/src/msw/dib.cpp
index be0ed85a5..fca87072e 100644
--- a/Source/3rd Party/wx/src/msw/dib.cpp	
+++ b/Source/3rd Party/wx/src/msw/dib.cpp	
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.03.03 (replaces the old file with the same name)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dib.cpp 48581 2007-09-05 23:01:02Z VZ $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -45,7 +45,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <memory.h>
+#if !defined(__MWERKS__) && !defined(__SALFORDC__)
+    #include <memory.h>
+#endif
 
 #include "wx/msw/dib.h"
 
@@ -89,38 +91,44 @@ bool wxDIB::Create(int width, int height, int depth)
 {
     // we don't support formats using palettes right now so we only create
     // either 24bpp (RGB) or 32bpp (RGBA) bitmaps
-    wxASSERT_MSG( depth, wxT("invalid image depth in wxDIB::Create()") );
+    wxASSERT_MSG( depth, _T("invalid image depth in wxDIB::Create()") );
     if ( depth < 24 )
         depth = 24;
 
     // allocate memory for bitmap structures
-    BITMAPINFO info;
-    wxZeroMemory(info);
+    static const int sizeHeader = sizeof(BITMAPINFOHEADER);
 
-    info.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-    info.bmiHeader.biWidth = width;
+    BITMAPINFO *info = (BITMAPINFO *)malloc(sizeHeader);
+    wxCHECK_MSG( info, false, _T("malloc(BITMAPINFO) failed") );
+
+    memset(info, 0, sizeHeader);
+
+    info->bmiHeader.biSize = sizeHeader;
+    info->bmiHeader.biWidth = width;
 
     // we use positive height here which corresponds to a DIB with normal, i.e.
     // bottom to top, order -- normally using negative height (which means
     // reversed for MS and hence natural for all the normal people top to
     // bottom line scan order) could be used to avoid the need for the image
     // reversal in Create(image) but this doesn't work under NT, only Win9x!
-    info.bmiHeader.biHeight = height;
+    info->bmiHeader.biHeight = height;
 
-    info.bmiHeader.biPlanes = 1;
-    info.bmiHeader.biBitCount = (WORD)depth;
-    info.bmiHeader.biSizeImage = GetLineSize(width, depth)*height;
+    info->bmiHeader.biPlanes = 1;
+    info->bmiHeader.biBitCount = (WORD)depth;
+    info->bmiHeader.biSizeImage = GetLineSize(width, depth)*height;
 
     m_handle = ::CreateDIBSection
                  (
                     0,              // hdc (unused with DIB_RGB_COLORS)
-                    &info,          // bitmap description
+                    info,           // bitmap description
                     DIB_RGB_COLORS, // use RGB, not palette
                     &m_data,        // [out] DIB bits
                     NULL,           // don't use file mapping
                     0               // file mapping offset (not used here)
                  );
 
+    free(info);
+
     if ( !m_handle )
     {
         wxLogLastError(wxT("CreateDIBSection"));
@@ -135,10 +143,20 @@ bool wxDIB::Create(int width, int height, int depth)
     return true;
 }
 
+bool wxDIB::Create(const wxBitmap& bmp)
+{
+    wxCHECK_MSG( bmp.Ok(), false, _T("wxDIB::Create(): invalid bitmap") );
+
+    if ( !Create(GetHbitmapOf(bmp)) )
+        return false;
+
+    m_hasAlpha = bmp.HasAlpha();
+
+    return true;
+}
+
 bool wxDIB::Create(HBITMAP hbmp)
 {
-    wxCHECK_MSG( hbmp, false, wxT("wxDIB::Create(): invalid bitmap") );
-
     // this bitmap could already be a DIB section in which case we don't need
     // to convert it to DIB
     DIBSECTION ds;
@@ -214,7 +232,7 @@ bool wxDIB::CopyFromDDB(HBITMAP hbmp)
                     SRCCOPY
                   ) )
     {
-        wxLogLastError(wxT("BitBlt(DDB -> DIB)"));
+        wxLogLastError(_T("BitBlt(DDB -> DIB)"));
 
         return false;
     }
@@ -230,7 +248,7 @@ bool wxDIB::CopyFromDDB(HBITMAP hbmp)
     if ( !GetDIBSection(m_handle, &ds) )
     {
         // we're sure that our handle is a DIB section, so this should work
-        wxFAIL_MSG( wxT("GetObject(DIBSECTION) unexpectedly failed") );
+        wxFAIL_MSG( _T("GetObject(DIBSECTION) unexpectedly failed") );
 
         return false;
     }
@@ -268,7 +286,7 @@ bool wxDIB::Load(const wxString& filename)
     m_handle = (HBITMAP)::LoadImage
                          (
                             wxGetInstance(),
-                            filename.t_str(),
+                            filename,
                             IMAGE_BITMAP,
                             0, 0, // don't specify the size
                             LR_CREATEDIBSECTION | LR_LOADFROMFILE
@@ -277,7 +295,7 @@ bool wxDIB::Load(const wxString& filename)
 
     if ( !m_handle )
     {
-        wxLogLastError(wxT("Loading DIB from file"));
+        wxLogLastError(_T("Loading DIB from file"));
 
         return false;
     }
@@ -287,9 +305,8 @@ bool wxDIB::Load(const wxString& filename)
 
 bool wxDIB::Save(const wxString& filename)
 {
-    wxCHECK_MSG( m_handle, false, wxT("wxDIB::Save(): invalid object") );
+    wxCHECK_MSG( m_handle, false, _T("wxDIB::Save(): invalid object") );
 
-#if wxUSE_FILE
     wxFile file(filename, wxFile::write);
     bool ok = file.IsOpened();
     if ( ok )
@@ -297,7 +314,7 @@ bool wxDIB::Save(const wxString& filename)
         DIBSECTION ds;
         if ( !GetDIBSection(m_handle, &ds) )
         {
-            wxLogLastError(wxT("GetObject(hDIB)"));
+            wxLogLastError(_T("GetObject(hDIB)"));
         }
         else
         {
@@ -318,9 +335,6 @@ bool wxDIB::Save(const wxString& filename)
                         file.Write(ds.dsBm.bmBits, sizeImage) == sizeImage;
         }
     }
-#else // !wxUSE_FILE
-    bool ok = false;
-#endif // wxUSE_FILE/!wxUSE_FILE
 
     if ( !ok )
     {
@@ -349,7 +363,7 @@ void wxDIB::DoGetObject() const
         DIBSECTION ds;
         if ( !GetDIBSection(m_handle, &ds) )
         {
-            wxLogLastError(wxT("GetObject(hDIB)"));
+            wxLogLastError(_T("GetObject(hDIB)"));
             return;
         }
 
@@ -370,12 +384,12 @@ void wxDIB::DoGetObject() const
 
 HBITMAP wxDIB::CreateDDB(HDC hdc) const
 {
-    wxCHECK_MSG( m_handle, 0, wxT("wxDIB::CreateDDB(): invalid object") );
+    wxCHECK_MSG( m_handle, 0, _T("wxDIB::CreateDDB(): invalid object") );
 
     DIBSECTION ds;
     if ( !GetDIBSection(m_handle, &ds) )
     {
-        wxLogLastError(wxT("GetObject(hDIB)"));
+        wxLogLastError(_T("GetObject(hDIB)"));
 
         return 0;
     }
@@ -410,7 +424,7 @@ HBITMAP wxDIB::CreateDDB(HDC hdc) const
 /* static */
 HBITMAP wxDIB::ConvertToBitmap(const BITMAPINFO *pbmi, HDC hdc, void *bits)
 {
-    wxCHECK_MSG( pbmi, 0, wxT("invalid DIB in ConvertToBitmap") );
+    wxCHECK_MSG( pbmi, 0, _T("invalid DIB in ConvertToBitmap") );
 
     // here we get BITMAPINFO struct followed by the actual bitmap bits and
     // BITMAPINFO starts with BITMAPINFOHEADER followed by colour info
@@ -546,7 +560,7 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
     {
         // this is an error which does risk to happen especially under Win9x
         // and which the user may understand so let him know about it
-        wxLogError(_("Failed to allocate %luKb of memory for bitmap data."),
+        wxLogError(_("Failed to allocated %luKb of memory for bitmap data."),
                    (unsigned long)(size / 1024));
 
         return NULL;
@@ -556,7 +570,7 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
     {
         // this really shouldn't happen... it worked the first time, why not
         // now?
-        wxFAIL_MSG( wxT("wxDIB::ConvertFromBitmap() unexpectedly failed") );
+        wxFAIL_MSG( _T("wxDIB::ConvertFromBitmap() unexpectedly failed") );
 
         return NULL;
     }
@@ -575,15 +589,15 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
 wxPalette *wxDIB::CreatePalette() const
 {
     // GetDIBColorTable not available in eVC3
-#if !defined(__WXMSW__) || defined(_WIN32_WCE) && _WIN32_WCE < 400
+#if defined(_WIN32_WCE) && _WIN32_WCE < 400
     return NULL;
 #else
-    wxCHECK_MSG( m_handle, NULL, wxT("wxDIB::CreatePalette(): invalid object") );
+    wxCHECK_MSG( m_handle, NULL, _T("wxDIB::CreatePalette(): invalid object") );
 
     DIBSECTION ds;
     if ( !GetDIBSection(m_handle, &ds) )
     {
-        wxLogLastError(wxT("GetObject(hDIB)"));
+        wxLogLastError(_T("GetObject(hDIB)"));
 
         return 0;
     }
@@ -611,7 +625,7 @@ wxPalette *wxDIB::CreatePalette() const
     // going to have biClrUsed of them so add necessary space
     LOGPALETTE *pPalette = (LOGPALETTE *)
         malloc(sizeof(LOGPALETTE) + (biClrUsed - 1)*sizeof(PALETTEENTRY));
-    wxCHECK_MSG( pPalette, NULL, wxT("out of memory") );
+    wxCHECK_MSG( pPalette, NULL, _T("out of memory") );
 
     // initialize the palette header
     pPalette->palVersion = 0x300;  // magic number, not in docs but works
@@ -636,7 +650,7 @@ wxPalette *wxDIB::CreatePalette() const
 
     if ( !hPalette )
     {
-        wxLogLastError(wxT("CreatePalette"));
+        wxLogLastError(_T("CreatePalette"));
 
         return NULL;
     }
@@ -656,17 +670,17 @@ wxPalette *wxDIB::CreatePalette() const
 
 #if wxUSE_IMAGE
 
-bool wxDIB::Create(const wxImage& image, PixelFormat pf)
+bool wxDIB::Create(const wxImage& image)
 {
-    wxCHECK_MSG( image.IsOk(), false, wxT("invalid wxImage in wxDIB ctor") );
+    wxCHECK_MSG( image.Ok(), false, _T("invalid wxImage in wxDIB ctor") );
 
     const int h = image.GetHeight();
     const int w = image.GetWidth();
 
     // if we have alpha channel, we need to create a 32bpp RGBA DIB, otherwise
     // a 24bpp RGB is sufficient
-    const bool hasAlpha = image.HasAlpha();
-    const int bpp = hasAlpha ? 32 : 24;
+    m_hasAlpha = image.HasAlpha();
+    const int bpp = m_hasAlpha ? 32 : 24;
 
     if ( !Create(w, h, bpp) )
         return false;
@@ -676,53 +690,32 @@ bool wxDIB::Create(const wxImage& image, PixelFormat pf)
     const int srcBytesPerLine = w * 3;
     const int dstBytesPerLine = GetLineSize(w, bpp);
     const unsigned char *src = image.GetData() + ((h - 1) * srcBytesPerLine);
-    const unsigned char *alpha = hasAlpha ? image.GetAlpha() + (h - 1)*w
-                                          : NULL;
+    const unsigned char *alpha = m_hasAlpha ? image.GetAlpha() + (h - 1)*w
+                                            : NULL;
     unsigned char *dstLineStart = (unsigned char *)m_data;
     for ( int y = 0; y < h; y++ )
     {
-        // Copy one DIB line. Note that RGB components order is reversed in
-        // Windows bitmaps compared to wxImage and is actually BGR.
+        // copy one DIB line
         unsigned char *dst = dstLineStart;
         if ( alpha )
         {
-            int x;
-
-            switch ( pf )
+            for ( int x = 0; x < w; x++ )
             {
-                case PixelFormat_PreMultiplied:
-                    // Pre-multiply pixel values so that the DIB could be used
-                    // with ::AlphaBlend().
-                    for ( x = 0; x < w; x++ )
-                    {
-                        const unsigned char a = *alpha++;
-                        *dst++ = (unsigned char)((src[2] * a + 127) / 255);
-                        *dst++ = (unsigned char)((src[1] * a + 127) / 255);
-                        *dst++ = (unsigned char)((src[0] * a + 127) / 255);
-                        *dst++ = a;
-                        src += 3;
-                    }
-                    break;
-
-                case PixelFormat_NotPreMultiplied:
-                    // Just copy pixel data without changing it.
-                    for ( x = 0; x < w; x++ )
-                    {
-                        *dst++ = src[2];
-                        *dst++ = src[1];
-                        *dst++ = src[0];
-
-                        *dst++ = *alpha++;
-                        src += 3;
-                    }
-                    break;
+                // RGB order is reversed, and we need to premultiply
+                // all channels by alpha value for use with ::AlphaBlend.
+                const unsigned char a = *alpha++;
+                *dst++ = (unsigned char)((src[2] * a + 127) / 255);
+                *dst++ = (unsigned char)((src[1] * a + 127) / 255);
+                *dst++ = (unsigned char)((src[0] * a + 127) / 255);
+                *dst++ = a;
+                src += 3;
             }
-
         }
         else // no alpha channel
         {
             for ( int x = 0; x < w; x++ )
             {
+                // RGB order is reversed.
                 *dst++ = src[2];
                 *dst++ = src[1];
                 *dst++ = src[0];
@@ -751,36 +744,26 @@ wxImage wxDIB::ConvertToImage() const
     const int w = GetWidth();
     const int h = GetHeight();
     wxImage image(w, h, false /* don't bother clearing memory */);
-    if ( !image.IsOk() )
+    if ( !image.Ok() )
     {
         wxFAIL_MSG( wxT("could not allocate data for image") );
         return wxNullImage;
     }
 
-    const int bpp = GetDepth();
-
-    // Remember if we have any "real" transparency, i.e. either any partially
-    // transparent pixels or not all pixels are fully opaque or fully
-    // transparent.
-    bool hasAlpha = false;
-    bool hasOpaque = false;
-    bool hasTransparent = false;
-
-    if ( bpp == 32 )
+    if ( m_hasAlpha )
     {
-        // 32 bit bitmaps may be either 0RGB or ARGB and we don't know in
-        // advance which one do we have so suppose we have alpha of them and
-        // get rid of it later if it turns out we didn't.
         image.SetAlpha();
     }
 
     // this is the same loop as in Create() just above but with copy direction
     // reversed
+    const int bpp = GetDepth();
     const int dstBytesPerLine = w * 3;
     const int srcBytesPerLine = GetLineSize(w, bpp);
     unsigned char *dst = image.GetData() + ((h - 1) * dstBytesPerLine);
     unsigned char *alpha = image.HasAlpha() ? image.GetAlpha() + (h - 1)*w
                                             : NULL;
+    const bool is32bit = bpp == 32;
     const unsigned char *srcLineStart = (unsigned char *)GetData();
     for ( int y = 0; y < h; y++ )
     {
@@ -792,36 +775,20 @@ wxImage wxDIB::ConvertToImage() const
             dst[1] = *src++;
             dst[0] = *src++;
 
-            if ( bpp == 32 )
+            if ( is32bit )
             {
-                // wxImage uses non premultiplied alpha so undo
-                // premultiplication done in Create() above
-                const unsigned char a = *src;
-                *alpha++ = a;
-
-                // Check what kind of alpha do we have.
-                switch ( a )
+                if ( alpha )
                 {
-                    case 0:
-                        hasTransparent = true;
-                        break;
-
-                    default:
-                        // Anything in between means we have real transparency
-                        // and must use alpha channel.
-                        hasAlpha = true;
-                        break;
-
-                    case 255:
-                        hasOpaque = true;
-                        break;
-                }
-
-                if ( a > 0 )
-                {
-                    dst[0] = (dst[0] * 255) / a;
-                    dst[1] = (dst[1] * 255) / a;
-                    dst[2] = (dst[2] * 255) / a;
+                    // wxImage uses non premultiplied alpha so undo
+                    // premultiplication done in Create() above
+                    const unsigned char a = *src;
+                    *alpha++ = a;
+                    if ( a > 0 )
+                    {
+                        dst[0] = (dst[0] * 255) / a;
+                        dst[1] = (dst[1] * 255) / a;
+                        dst[2] = (dst[2] * 255) / a;
+                    }
                 }
 
                 src++;
@@ -839,12 +806,6 @@ wxImage wxDIB::ConvertToImage() const
         srcLineStart += srcBytesPerLine;
     }
 
-    if ( hasOpaque && hasTransparent )
-        hasAlpha = true;
-
-    if ( !hasAlpha && image.HasAlpha() )
-        image.ClearAlpha();
-
     return image;
 }
 
diff --git a/Source/3rd Party/wx/src/msw/dir.cpp b/Source/3rd Party/wx/src/msw/dir.cpp
index 933c2ac45..02eeb778c 100644
--- a/Source/3rd Party/wx/src/msw/dir.cpp	
+++ b/Source/3rd Party/wx/src/msw/dir.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/dir.cpp
+// Name:        msw/dir.cpp
 // Purpose:     wxDir implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dir.cpp 42910 2006-11-01 15:29:58Z JS $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,6 +30,7 @@
 #endif // PCH
 
 #include "wx/dir.h"
+#include "wx/filefn.h"          // for wxDirExists()
 
 #ifdef __WINDOWS__
     #include "wx/msw/private.h"
@@ -39,64 +40,56 @@
 // define the types and functions used for file searching
 // ----------------------------------------------------------------------------
 
-namespace
-{
-
 typedef WIN32_FIND_DATA FIND_STRUCT;
 typedef HANDLE FIND_DATA;
 typedef DWORD FIND_ATTR;
 
-inline FIND_DATA InitFindData()
-{
-    return INVALID_HANDLE_VALUE;
-}
+static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; }
 
-inline bool IsFindDataOk(FIND_DATA fd)
+static inline bool IsFindDataOk(FIND_DATA fd)
 {
         return fd != INVALID_HANDLE_VALUE;
 }
 
-inline void FreeFindData(FIND_DATA fd)
+static inline void FreeFindData(FIND_DATA fd)
 {
-    if ( !::FindClose(fd) )
-    {
-        wxLogLastError(wxT("FindClose"));
-    }
+        if ( !::FindClose(fd) )
+        {
+            wxLogLastError(_T("FindClose"));
+        }
 }
 
-inline FIND_DATA FindFirst(const wxString& spec,
-                           FIND_STRUCT *finddata)
+static inline FIND_DATA FindFirst(const wxString& spec,
+                                      FIND_STRUCT *finddata)
 {
-    return ::FindFirstFile(spec.t_str(), finddata);
+        return ::FindFirstFile(spec, finddata);
 }
 
-inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
+static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
 {
-    return ::FindNextFile(fd, finddata) != 0;
+        return ::FindNextFile(fd, finddata) != 0;
 }
 
-const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
 {
-    return finddata->cFileName;
+        return finddata->cFileName;
 }
 
-inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
+static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
 {
-    return finddata->dwFileAttributes;
+        return finddata->dwFileAttributes;
 }
 
-inline bool IsDir(FIND_ATTR attr)
+static inline bool IsDir(FIND_ATTR attr)
 {
-    return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
+        return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
 }
 
-inline bool IsHidden(FIND_ATTR attr)
+static inline bool IsHidden(FIND_ATTR attr)
 {
-    return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
+        return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
 }
 
-} // anonymous namespace
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -139,7 +132,7 @@ private:
 
     int      m_flags;
 
-    wxDECLARE_NO_COPY_CLASS(wxDirData);
+    DECLARE_NO_COPY_CLASS(wxDirData)
 };
 
 // ============================================================================
@@ -189,12 +182,9 @@ bool wxDirData::Read(wxString *filename)
         wxString filespec = m_dirname;
         if ( !wxEndsWithPathSeparator(filespec) )
         {
-            filespec += wxT('\\');
+            filespec += _T('\\');
         }
-        if ( !m_filespec )
-            filespec += wxT("*.*");
-        else
-            filespec += m_filespec;
+        filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str());
 
         m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
 
@@ -208,7 +198,7 @@ bool wxDirData::Read(wxString *filename)
 
         if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
         {
-            wxLogSysError(err, _("Cannot enumerate files in directory '%s'"),
+            wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
                           m_dirname.c_str());
         }
 #endif // __WIN32__
@@ -235,7 +225,7 @@ bool wxDirData::Read(wxString *filename)
 
                 if ( err != ERROR_NO_MORE_FILES )
                 {
-                    wxLogLastError(wxT("FindNext"));
+                    wxLogLastError(_T("FindNext"));
                 }
 #endif // __WIN32__
                 //else: not an error, just no more (such) files
@@ -248,9 +238,9 @@ bool wxDirData::Read(wxString *filename)
         attr = GetAttrFromFindData(PTR_TO_FINDDATA);
 
         // don't return "." and ".." unless asked for
-        if ( name[0] == wxT('.') &&
-             ((name[1] == wxT('.') && name[2] == wxT('\0')) ||
-              (name[1] == wxT('\0'))) )
+        if ( name[0] == _T('.') &&
+             ((name[1] == _T('.') && name[2] == _T('\0')) ||
+              (name[1] == _T('\0'))) )
         {
             if ( !(m_flags & wxDIR_DOTDOT) )
                 continue;
@@ -286,6 +276,16 @@ bool wxDirData::Read(wxString *filename)
     return true;
 }
 
+// ----------------------------------------------------------------------------
+// wxDir helpers
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxDir::Exists(const wxString& dir)
+{
+    return wxDirExists(dir);
+}
+
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------
@@ -300,20 +300,9 @@ wxDir::wxDir(const wxString& dirname)
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
+    m_data = new wxDirData(dirname);
 
-    // The Unix code does a similar test
-    if (wxDirExists(dirname))
-    {
-        m_data = new wxDirData(dirname);
-
-        return true;
-    }
-    else
-    {
-        m_data = NULL;
-
-        return false;
-    }
+    return true;
 }
 
 bool wxDir::IsOpened() const
@@ -330,9 +319,9 @@ wxString wxDir::GetName() const
         if ( !name.empty() )
         {
             // bring to canonical Windows form
-            name.Replace(wxT("/"), wxT("\\"));
+            name.Replace(_T("/"), _T("\\"));
 
-            if ( name.Last() == wxT('\\') )
+            if ( name.Last() == _T('\\') )
             {
                 // chop off the last (back)slash
                 name.Truncate(name.length() - 1);
@@ -356,7 +345,7 @@ bool wxDir::GetFirst(wxString *filename,
                      const wxString& filespec,
                      int flags) const
 {
-    wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
 
     M_DIR->Rewind();
 
@@ -368,9 +357,9 @@ bool wxDir::GetFirst(wxString *filename,
 
 bool wxDir::GetNext(wxString *filename) const
 {
-    wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
 
-    wxCHECK_MSG( filename, false, wxT("bad pointer in wxDir::GetNext()") );
+    wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
 
     return M_DIR->Read(filename);
 }
@@ -388,11 +377,11 @@ wxGetDirectoryTimes(const wxString& dirname,
 #ifdef __WXWINCE__
     // FindFirst() is going to fail
     wxASSERT_MSG( !dirname.empty(),
-                  wxT("incorrect directory name format in wxGetDirectoryTimes") );
+                  _T("incorrect directory name format in wxGetDirectoryTimes") );
 #else
     // FindFirst() is going to fail
-    wxASSERT_MSG( !dirname.empty() && dirname.Last() != wxT('\\'),
-                  wxT("incorrect directory name format in wxGetDirectoryTimes") );
+    wxASSERT_MSG( !dirname.empty() && dirname.Last() != _T('\\'),
+                  _T("incorrect directory name format in wxGetDirectoryTimes") );
 #endif
 
     FIND_STRUCT fs;
diff --git a/Source/3rd Party/wx/src/msw/dirdlg.cpp b/Source/3rd Party/wx/src/msw/dirdlg.cpp
index 70ef2dce6..852a9ef34 100644
--- a/Source/3rd Party/wx/src/msw/dirdlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/dirdlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dirdlg.cpp 39613 2006-06-07 11:44:19Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,109 +40,6 @@
 
 #include "wx/msw/private.h"
 #include "wx/msw/wrapshl.h"
-#include "wx/msw/private/comptr.h"
-#include "wx/dynlib.h"
-
-#include <initguid.h>
-
-// We can only use IFileDialog under desktop Windows and we need
-// wxDynamicLibrary for it.
-#if wxUSE_DYNLIB_CLASS && !defined(__WXWINCE__)
-    #define wxUSE_IFILEDIALOG 1
-#else
-    #define wxUSE_IFILEDIALOG
-#endif
-
-#if wxUSE_IFILEDIALOG
-// IFileDialog related declarations missing from some compilers headers.
-
-// IShellItem
-#ifndef __IShellItem_INTERFACE_DEFINED__
-
-#ifndef SIGDN_FILESYSPATH
-    #define SIGDN_FILESYSPATH 0x80058000
-#endif
-
-struct IShellItem : public IUnknown
-{
-    virtual HRESULT wxSTDCALL BindToHandler(IBindCtx*, REFGUID, REFIID, void**) = 0;
-    virtual HRESULT wxSTDCALL GetParent(IShellItem**) = 0;
-    virtual HRESULT wxSTDCALL GetDisplayName(DWORD, LPWSTR*) = 0;
-    virtual HRESULT wxSTDCALL GetAttributes(ULONG, ULONG*) = 0;
-    virtual HRESULT wxSTDCALL Compare(IShellItem*, DWORD, int*) = 0;
-};
-
-#endif // #ifndef __IShellItem_INTERFACE_DEFINED__
-
-// Define this GUID in any case, even when __IShellItem_INTERFACE_DEFINED__ is
-// defined in the headers we might still not have it in the actual uuid.lib,
-// this happens with at least VC7 used with its original (i.e. not updated) SDK
-// and there is no harm in defining the GUID unconditionally.
-DEFINE_GUID(IID_IShellItem,
-    0x43826D1E, 0xE718, 0x42EE, 0xBC, 0x55, 0xA1, 0xE2, 0x61, 0xC3, 0x7B, 0xFE);
-
-struct IShellItemFilter;
-struct IFileDialogEvents;
-
-// IModalWindow
-#ifndef __IModalWindow_INTERFACE_DEFINED__
-
-struct IModalWindow : public IUnknown
-{
-    virtual HRESULT wxSTDCALL Show(HWND) = 0;
-};
-
-#endif // #ifndef __IModalWindow_INTERFACE_DEFINED__
-
-// IFileDialog
-#ifndef __IFileDialog_INTERFACE_DEFINED__
-
-#ifndef FOS_PICKFOLDERS
-    #define FOS_PICKFOLDERS 0x20
-#endif
-
-#ifndef FOS_FORCEFILESYSTEM
-    #define FOS_FORCEFILESYSTEM 0x40
-#endif
-
-struct COMDLG_FILTERSPEC;
-
-struct IFileDialog : public IModalWindow
-{
-    virtual HRESULT wxSTDCALL SetFileTypes(UINT, const COMDLG_FILTERSPEC*) = 0;
-    virtual HRESULT wxSTDCALL SetFileTypeIndex(UINT) = 0;
-    virtual HRESULT wxSTDCALL GetFileTypeIndex(UINT*) = 0;
-    virtual HRESULT wxSTDCALL Advise(IFileDialogEvents*, DWORD*) = 0;
-    virtual HRESULT wxSTDCALL Unadvise(DWORD) = 0;
-    virtual HRESULT wxSTDCALL SetOptions(DWORD) = 0;
-    virtual HRESULT wxSTDCALL GetOptions(DWORD*) = 0;
-    virtual HRESULT wxSTDCALL SetDefaultFolder(IShellItem*) = 0;
-    virtual HRESULT wxSTDCALL SetFolder(IShellItem*) = 0;
-    virtual HRESULT wxSTDCALL GetFolder(IShellItem**) = 0;
-    virtual HRESULT wxSTDCALL GetCurrentSelection(IShellItem**) = 0;
-    virtual HRESULT wxSTDCALL SetFileName(LPCWSTR) = 0;
-    virtual HRESULT wxSTDCALL GetFileName(LPWSTR*) = 0;
-    virtual HRESULT wxSTDCALL SetTitle(LPCWSTR) = 0;
-    virtual HRESULT wxSTDCALL SetOkButtonLabel(LPCWSTR) = 0;
-    virtual HRESULT wxSTDCALL SetFileNameLabel(LPCWSTR) = 0;
-    virtual HRESULT wxSTDCALL GetResult(IShellItem**) = 0;
-    virtual HRESULT wxSTDCALL AddPlace(IShellItem*, DWORD) = 0;
-    virtual HRESULT wxSTDCALL SetDefaultExtension(LPCWSTR) = 0;
-    virtual HRESULT wxSTDCALL Close(HRESULT) = 0;
-    virtual HRESULT wxSTDCALL SetClientGuid(REFGUID) = 0;
-    virtual HRESULT wxSTDCALL ClearClientData() = 0;
-    virtual HRESULT wxSTDCALL SetFilter(IShellItemFilter*) = 0;
-};
-
-DEFINE_GUID(CLSID_FileOpenDialog,
-    0xDC1C5A9C, 0xE88A, 0x4dde, 0xA5, 0xA1, 0x60, 0xF8, 0x2A, 0x20, 0xAE, 0xF7);
-
-DEFINE_GUID(IID_IFileDialog,
-    0x42F85136, 0xDB7E, 0x439C, 0x85, 0xF1, 0xE4, 0x07, 0x5D, 0x13, 0x5F, 0xC8);
-
-#endif // #ifndef __IFileDialog_INTERFACE_DEFINED__
-
-#endif // wxUSE_IFILEDIALOG
 
 // ----------------------------------------------------------------------------
 // constants
@@ -203,55 +100,29 @@ void wxDirDialog::SetPath(const wxString& path)
     m_path = path;
 
     // SHBrowseForFolder doesn't like '/'s nor the trailing backslashes
-    m_path.Replace(wxT("/"), wxT("\\"));
-
-    while ( !m_path.empty() && (*(m_path.end() - 1) == wxT('\\')) )
+    m_path.Replace(_T("/"), _T("\\"));
+    if ( !m_path.empty() )
     {
-        m_path.erase(m_path.length() - 1);
-    }
+        while ( *(m_path.end() - 1) == _T('\\') )
+        {
+            m_path.erase(m_path.length() - 1);
+        }
 
-    // but the root drive should have a trailing slash (again, this is just
-    // the way the native dialog works)
-    if ( !m_path.empty() && (*(m_path.end() - 1) == wxT(':')) )
-    {
-        m_path += wxT('\\');
+        // but the root drive should have a trailing slash (again, this is just
+        // the way the native dialog works)
+        if ( *(m_path.end() - 1) == _T(':') )
+        {
+            m_path += _T('\\');
+        }
     }
 }
 
 int wxDirDialog::ShowModal()
 {
-    wxWindow* const parent = GetParent();
-    WXHWND hWndParent = parent ? GetHwndOf(parent) : NULL;
+    wxWindow *parent = GetParent();
 
-    // Use IFileDialog under new enough Windows, it's more user-friendly.
-    int rc;
-#if wxUSE_IFILEDIALOG
-    if ( wxGetWinVersion() >= wxWinVersion_Vista )
-    {
-        rc = ShowIFileDialog(hWndParent);
-    }
-    else
-    {
-        rc = wxID_NONE;
-    }
-
-    if ( rc == wxID_NONE )
-#endif // wxUSE_IFILEDIALOG
-    {
-        rc = ShowSHBrowseForFolder(hWndParent);
-    }
-
-    // change current working directory if asked so
-    if ( rc == wxID_OK && HasFlag(wxDD_CHANGE_DIR) )
-        wxSetWorkingDirectory(m_path);
-
-    return rc;
-}
-
-int wxDirDialog::ShowSHBrowseForFolder(WXHWND owner)
-{
     BROWSEINFO bi;
-    bi.hwndOwner      = owner;
+    bi.hwndOwner      = parent ? GetHwndOf(parent) : NULL;
     bi.pidlRoot       = NULL;
     bi.pszDisplayName = NULL;
     // Please don't change this without checking it compiles
@@ -263,7 +134,7 @@ int wxDirDialog::ShowSHBrowseForFolder(WXHWND owner)
 #endif
     bi.ulFlags        = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT;
     bi.lpfn           = BrowseCallbackProc;
-    bi.lParam         = wxMSW_CONV_LPARAM(m_path); // param for the callback
+    bi.lParam         = (LPARAM)m_path.c_str();    // param for the callback
 
     static const int verComCtl32 = wxApp::GetComCtl32Version();
 
@@ -312,140 +183,13 @@ int wxDirDialog::ShowSHBrowseForFolder(WXHWND owner)
 
     m_path = pidl.GetPath();
 
+    // change current working directory if asked so
+    if (HasFlag(wxDD_CHANGE_DIR))
+        wxSetWorkingDirectory(m_path);
+
     return m_path.empty() ? wxID_CANCEL : wxID_OK;
 }
 
-// Function for obtaining folder name on Vista and newer.
-//
-// Returns wxID_OK on success, wxID_CANCEL if cancelled by user or wxID_NONE if
-// an error occurred and we should fall back onto the old dialog.
-#if wxUSE_IFILEDIALOG
-
-int wxDirDialog::ShowIFileDialog(WXHWND owner)
-{
-    HRESULT hr;
-    wxCOMPtr<IFileDialog> fileDialog;
-
-    hr = ::CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER,
-                            wxIID_PPV_ARGS(IFileDialog, &fileDialog));
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(wxS("CoCreateInstance(CLSID_FileOpenDialog)"), hr);
-        return wxID_NONE;
-    }
-
-    // allow user to select only a file system folder
-    hr = fileDialog->SetOptions(FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM);
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(wxS("IFileDialog::SetOptions"), hr);
-        return wxID_NONE;
-    }
-
-    hr = fileDialog->SetTitle(m_message.wc_str());
-    if ( FAILED(hr) )
-    {
-        // This error is not serious, let's just log it and continue even
-        // without the title set.
-        wxLogApiError(wxS("IFileDialog::SetTitle"), hr);
-    }
-
-    // set the initial path
-    if ( !m_path.empty() )
-    {
-        // We need to link SHCreateItemFromParsingName() dynamically as it's
-        // not available on pre-Vista systems.
-        typedef HRESULT
-        (WINAPI *SHCreateItemFromParsingName_t)(PCWSTR,
-                                                IBindCtx*,
-                                                REFIID,
-                                                void**);
-
-        SHCreateItemFromParsingName_t pfnSHCreateItemFromParsingName = NULL;
-        wxDynamicLibrary dllShell32;
-        if ( dllShell32.Load(wxS("shell32.dll"), wxDL_VERBATIM | wxDL_QUIET) )
-        {
-            wxDL_INIT_FUNC(pfn, SHCreateItemFromParsingName, dllShell32);
-        }
-
-        if ( !pfnSHCreateItemFromParsingName )
-        {
-            wxLogLastError(wxS("SHCreateItemFromParsingName() not found"));
-            return wxID_NONE;
-        }
-
-        wxCOMPtr<IShellItem> folder;
-        hr = pfnSHCreateItemFromParsingName(m_path.wc_str(),
-                                              NULL,
-                                              wxIID_PPV_ARGS(IShellItem,
-                                                             &folder));
-        if ( FAILED(hr) )
-        {
-            wxLogApiError(wxS("SHCreateItemFromParsingName"), hr);
-            return wxID_NONE;
-        }
-
-        hr = fileDialog->SetFolder(folder);
-        if ( FAILED(hr) )
-        {
-            wxLogApiError(wxS("IFileDialog::SetFolder"), hr);
-            return wxID_NONE;
-        }
-    }
-
-
-    wxString path;
-
-    hr = fileDialog->Show(owner);
-    if ( SUCCEEDED(hr) )
-    {
-        wxCOMPtr<IShellItem> folder;
-
-        hr = fileDialog->GetResult(&folder);
-        if ( SUCCEEDED(hr) )
-        {
-            LPOLESTR pathOLE = NULL;
-
-            hr = folder->GetDisplayName(SIGDN_FILESYSPATH, &pathOLE);
-            if ( SUCCEEDED(hr) )
-            {
-                path = pathOLE;
-                CoTaskMemFree(pathOLE);
-            }
-            else
-            {
-                wxLogApiError(wxS("IShellItem::GetDisplayName"), hr);
-            }
-        }
-        else
-        {
-            wxLogApiError(wxS("IFileDialog::GetResult"), hr);
-        }
-    }
-    else if ( hr == HRESULT_FROM_WIN32(ERROR_CANCELLED) )
-    {
-        return wxID_CANCEL; // the user cancelled the dialog
-    }
-    else
-    {
-        wxLogApiError(wxS("IFileDialog::Show"), hr);
-    }
-
-    if ( path.empty() )
-    {
-        // the user didn't cancel the dialog and yet the path is empty
-        // it means there was an error, already logged by wxLogApiError()
-        // now report the error to the user and return
-        wxLogSysError(_("Couldn't obtain folder name"), hr);
-        return wxID_CANCEL;
-    }
-
-    m_path = path;
-    return wxID_OK;
-}
-
-#endif // wxUSE_IFILEDIALOG
-
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
@@ -490,7 +234,7 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
                     }
 
                     SendMessage(hwnd, BFFM_SETSTATUSTEXT,
-                                0, wxMSW_CONV_LPARAM(strDir));
+                                0, (LPARAM)strDir.c_str());
                 }
             }
             break;
diff --git a/Source/3rd Party/wx/src/msw/display.cpp b/Source/3rd Party/wx/src/msw/display.cpp
index f6445d6bd..3dfcc213b 100644
--- a/Source/3rd Party/wx/src/msw/display.cpp	
+++ b/Source/3rd Party/wx/src/msw/display.cpp	
@@ -4,7 +4,7 @@
 // Author:      Royce Mitchell III, Vadim Zeitlin
 // Modified by: Ryan Norton (IsPrimary override)
 // Created:     06/21/02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: display.cpp 56865 2008-11-20 17:46:46Z VZ $
 // Copyright:   (c) wxWidgets team
 // Copyright:   (c) 2002-2006 wxWidgets team
 // Licence:     wxWindows licence
@@ -41,8 +41,14 @@
 #include "wx/display_impl.h"
 #include "wx/msw/wrapwin.h"
 #include "wx/msw/missing.h"
-#include "wx/msw/private.h"
-#include "wx/msw/private/hiddenwin.h"
+
+// define this to use DirectDraw for display mode switching: this is disabled
+// by default because ddraw.h is now always available and also it's not really
+// clear what are the benefits of using DirectDraw compared to the standard API
+
+#if !defined(wxUSE_DIRECTDRAW)
+    #define wxUSE_DIRECTDRAW 0
+#endif
 
 #ifndef __WXWINCE__
     // Older versions of windef.h don't define HMONITOR.  Unfortunately, we
@@ -71,11 +77,20 @@
     #endif
 #endif // !__WXWINCE__
 
+#if wxUSE_DIRECTDRAW
+    #include <ddraw.h>
+
+    // we don't want to link with ddraw.lib which contains the real
+    // IID_IDirectDraw2 definition
+    const GUID wxIID_IDirectDraw2 =
+     { 0xB3A6F3E0, 0x2B43, 0x11CF, { 0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 } };
+#endif // wxUSE_DIRECTDRAW
+
 // display functions are found in different DLLs under WinCE and normal Win32
 #ifdef __WXWINCE__
-static const wxChar displayDllName[] = wxT("coredll.dll");
+static const wxChar displayDllName[] = _T("coredll.dll");
 #else
-static const wxChar displayDllName[] = wxT("user32.dll");
+static const wxChar displayDllName[] = _T("user32.dll");
 #endif
 
 // ----------------------------------------------------------------------------
@@ -88,6 +103,22 @@ typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName,
                                                  DWORD dwFlags,
                                                  LPVOID lParam);
 
+#if wxUSE_DIRECTDRAW
+typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid,
+                                          LPTSTR driverDescription,
+                                          LPTSTR driverName,
+                                          LPVOID lpContext,
+                                          HMONITOR hmon);
+
+typedef HRESULT (WINAPI *DirectDrawEnumerateEx_t)(DDEnumExCallback_t lpCallback,
+                                                  LPVOID lpContext,
+                                                  DWORD dwFlags);
+
+typedef HRESULT (WINAPI *DirectDrawCreate_t)(GUID *lpGUID,
+                                             LPDIRECTDRAW *lplpDD,
+                                             IUnknown *pUnkOuter);
+#endif // wxUSE_DIRECTDRAW
+
 typedef BOOL (WINAPI *EnumDisplayMonitors_t)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
 typedef HMONITOR (WINAPI *MonitorFromPoint_t)(POINT,DWORD);
 typedef HMONITOR (WINAPI *MonitorFromWindow_t)(HWND,DWORD);
@@ -105,17 +136,56 @@ LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
 }
 #endif // !__WXWINCE__
 
-
 // ----------------------------------------------------------------------------
-// wxDisplayMSW declaration
+// display information classes
 // ----------------------------------------------------------------------------
 
-class wxDisplayMSW : public wxDisplayImpl
+struct wxDisplayInfo
+{
+    wxDisplayInfo(HMONITOR hmon = NULL)
+    {
+        m_hmon = hmon;
+        m_flags = (DWORD)-1;
+    }
+
+    virtual ~wxDisplayInfo() { }
+
+
+    // use GetMonitorInfo() to fill in all of our fields if needed (i.e. if it
+    // hadn't been done before)
+    void Initialize();
+
+
+    // handle of this monitor used by MonitorXXX() functions, never NULL
+    HMONITOR m_hmon;
+
+    // the entire area of this monitor in virtual screen coordinates
+    wxRect m_rect;
+
+    // the work or client area, i.e. the area available for the normal windows
+    wxRect m_rectClient;
+
+    // the display device name for this monitor, empty initially and retrieved
+    // on demand by DoGetName()
+    wxString m_devName;
+
+    // the flags of this monitor, also used as initialization marker: if this
+    // is -1, GetMonitorInfo() hadn't been called yet
+    DWORD m_flags;
+};
+
+WX_DEFINE_ARRAY_PTR(wxDisplayInfo *, wxDisplayInfoArray);
+
+// ----------------------------------------------------------------------------
+// common base class for all Win32 wxDisplayImpl versions
+// ----------------------------------------------------------------------------
+
+class wxDisplayImplWin32Base : public wxDisplayImpl
 {
 public:
-    wxDisplayMSW(unsigned n, HMONITOR hmon)
+    wxDisplayImplWin32Base(unsigned n, wxDisplayInfo& info)
         : wxDisplayImpl(n),
-          m_hmon(hmon)
+          m_info(info)
     {
     }
 
@@ -125,8 +195,6 @@ public:
     virtual bool IsPrimary() const;
 
     virtual wxVideoMode GetCurrentMode() const;
-    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
-    virtual bool ChangeMode(const wxVideoMode& mode);
 
 protected:
     // convert a DEVMODE to our wxVideoMode
@@ -141,51 +209,81 @@ protected:
                            dm.dmDisplayFrequency > 1 ? dm.dmDisplayFrequency : 0);
     }
 
-    // Call GetMonitorInfo() and fill in the provided struct and return true if
-    // it succeeded, otherwise return false.
-    bool GetMonInfo(MONITORINFOEX& monInfo) const;
-
-    HMONITOR m_hmon;
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxDisplayMSW);
+    wxDisplayInfo& m_info;
 };
 
-
 // ----------------------------------------------------------------------------
-// wxDisplayFactoryMSW declaration
+// common base class for all Win32 wxDisplayFactory versions
 // ----------------------------------------------------------------------------
 
-WX_DEFINE_ARRAY(HMONITOR, wxMonitorHandleArray);
-
-// functions dynamically bound by wxDisplayFactoryMSW ctor.
+// functions dynamically bound by wxDisplayFactoryWin32Base::Initialize()
 static MonitorFromPoint_t gs_MonitorFromPoint = NULL;
 static MonitorFromWindow_t gs_MonitorFromWindow = NULL;
 static GetMonitorInfo_t gs_GetMonitorInfo = NULL;
-static EnumDisplayMonitors_t gs_EnumDisplayMonitors = NULL;
 
-class wxDisplayFactoryMSW : public wxDisplayFactory
+class wxDisplayFactoryWin32Base : public wxDisplayFactory
 {
 public:
-    // ctor checks if the current system supports multimon API and dynamically
-    // bind the functions we need if this is the case and fills the
-    // m_displays array if they're available
-    wxDisplayFactoryMSW();
-
-    // Dtor destroys the hidden window we use for getting WM_SETTINGCHANGE.
-    virtual ~wxDisplayFactoryMSW();
+    virtual ~wxDisplayFactoryWin32Base();
 
     bool IsOk() const { return !m_displays.empty(); }
 
-    virtual wxDisplayImpl *CreateDisplay(unsigned n);
     virtual unsigned GetCount() { return unsigned(m_displays.size()); }
     virtual int GetFromPoint(const wxPoint& pt);
-    virtual int GetFromWindow(const wxWindow *window);
+    virtual int GetFromWindow(wxWindow *window);
 
-    // Called when we receive WM_SETTINGCHANGE to refresh the list of monitor
-    // handles.
-    static void RefreshMonitors() { ms_factory->DoRefreshMonitors(); }
+protected:
+    // ctor checks if the current system supports multimon API and dynamically
+    // bind the functions we need if this is the case and sets
+    // ms_supportsMultimon if they're available
+    wxDisplayFactoryWin32Base();
 
+    // delete all m_displays elements: can be called from the derived class
+    // dtor if it is important to do this before destroying it (as in
+    // wxDisplayFactoryDirectDraw case), otherwise will be done by our dtor
+    void Clear();
+
+    // find the monitor corresponding to the given handle, return wxNOT_FOUND
+    // if not found
+    int FindDisplayFromHMONITOR(HMONITOR hmon) const;
+
+
+    // flag indicating whether gs_MonitorXXX functions are available
+    static int ms_supportsMultimon;
+
+    // the array containing information about all available displays, should be
+    // filled by the derived class ctors
+    wxDisplayInfoArray m_displays;
+
+
+    DECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base)
+};
+
+// ----------------------------------------------------------------------------
+// wxDisplay implementation using Windows multi-monitor support functions
+// ----------------------------------------------------------------------------
+
+class wxDisplayImplMultimon : public wxDisplayImplWin32Base
+{
+public:
+    wxDisplayImplMultimon(unsigned n, wxDisplayInfo& info)
+        : wxDisplayImplWin32Base(n, info)
+    {
+    }
+
+    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
+    virtual bool ChangeMode(const wxVideoMode& mode);
+
+private:
+    DECLARE_NO_COPY_CLASS(wxDisplayImplMultimon)
+};
+
+class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base
+{
+public:
+    wxDisplayFactoryMultimon();
+
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);
 
 private:
     // EnumDisplayMonitors() callback
@@ -194,111 +292,196 @@ private:
                                           LPRECT lprcMonitor,
                                           LPARAM dwData);
 
-    // find the monitor corresponding to the given handle,
-    // return wxNOT_FOUND if not found
-    int FindDisplayFromHMONITOR(HMONITOR hmon) const;
 
-    // Update m_displays array, used by RefreshMonitors().
-    void DoRefreshMonitors();
-
-
-    // The unique factory being used (as we don't have direct access to the
-    // global factory pointer in the common code so we just duplicate this
-    // variable (also making it of correct type for us) here).
-    static wxDisplayFactoryMSW* ms_factory;
-
-
-    // the array containing information about all available displays, filled by
-    // MultimonEnumProc()
-    wxMonitorHandleArray m_displays;
-
-    // The hidden window we use for receiving WM_SETTINGCHANGE and its class
-    // name.
-    HWND m_hiddenHwnd;
-    const wxChar* m_hiddenClass;
-
-    wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryMSW);
+    // add a monitor description to m_displays array
+    void AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor);
 };
 
-wxDisplayFactoryMSW* wxDisplayFactoryMSW::ms_factory = NULL;
+// ----------------------------------------------------------------------------
+// wxDisplay implementation using DirectDraw
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DIRECTDRAW
+
+struct wxDisplayInfoDirectDraw : wxDisplayInfo
+{
+    wxDisplayInfoDirectDraw(const GUID& guid, HMONITOR hmon, LPTSTR name)
+        : wxDisplayInfo(hmon),
+          m_guid(guid)
+    {
+        m_pDD2 = NULL;
+        m_devName = name;
+    }
+
+    virtual ~wxDisplayInfoDirectDraw()
+    {
+        if ( m_pDD2 )
+            m_pDD2->Release();
+    }
+
+
+    // IDirectDraw object used to control this display, may be NULL
+    IDirectDraw2 *m_pDD2;
+
+    // DirectDraw GUID for this display, only valid when using DirectDraw
+    const GUID m_guid;
+
+
+    DECLARE_NO_COPY_CLASS(wxDisplayInfoDirectDraw)
+};
+
+class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base
+{
+public:
+    wxDisplayImplDirectDraw(unsigned n, wxDisplayInfo& info, IDirectDraw2 *pDD2)
+        : wxDisplayImplWin32Base(n, info),
+          m_pDD2(pDD2)
+    {
+        m_pDD2->AddRef();
+    }
+
+    virtual ~wxDisplayImplDirectDraw()
+    {
+        m_pDD2->Release();
+    }
+
+    virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
+    virtual bool ChangeMode(const wxVideoMode& mode);
+
+private:
+    IDirectDraw2 *m_pDD2;
+
+    DECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw)
+};
+
+class wxDisplayFactoryDirectDraw : public wxDisplayFactoryWin32Base
+{
+public:
+    wxDisplayFactoryDirectDraw();
+    virtual ~wxDisplayFactoryDirectDraw();
+
+    virtual wxDisplayImpl *CreateDisplay(unsigned n);
+
+private:
+    // callback used with DirectDrawEnumerateEx()
+    static BOOL WINAPI DDEnumExCallback(GUID *pGuid,
+                                        LPTSTR driverDescription,
+                                        LPTSTR driverName,
+                                        LPVOID lpContext,
+                                        HMONITOR hmon);
+
+    // add a monitor description to m_displays array
+    void AddDisplay(const GUID& guid, HMONITOR hmon, LPTSTR name);
+
+
+    // ddraw.dll
+    wxDynamicLibrary m_dllDDraw;
+
+    // dynamically resolved DirectDrawCreate()
+    DirectDrawCreate_t m_pfnDirectDrawCreate;
+
+    DECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw)
+};
+
+#endif // wxUSE_DIRECTDRAW
+
+
+// ============================================================================
+// common classes implementation
+// ============================================================================
 
 // ----------------------------------------------------------------------------
-// wxDisplay implementation
+// wxDisplay
 // ----------------------------------------------------------------------------
 
 /* static */ wxDisplayFactory *wxDisplay::CreateFactory()
 {
-    wxDisplayFactoryMSW *factoryMM = new wxDisplayFactoryMSW;
+    // we have 2 implementations for modern Windows: one using standard Win32
+    // and another using DirectDraw, the choice between them is done using a
+    // system option
 
+#if wxUSE_DIRECTDRAW
+    if ( wxSystemOptions::GetOptionInt(_T("msw.display.directdraw")) )
+    {
+        wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw;
+        if ( factoryDD->IsOk() )
+            return factoryDD;
+
+        delete factoryDD;
+    }
+#endif // wxUSE_DIRECTDRAW
+
+    wxDisplayFactoryMultimon *factoryMM = new wxDisplayFactoryMultimon;
     if ( factoryMM->IsOk() )
         return factoryMM;
 
     delete factoryMM;
 
-    // fall back to a stub implementation if no multimon support (Win95?)
+
+    // finally fall back to a stub implementation if all else failed (Win95?)
     return new wxDisplayFactorySingle;
 }
 
-
 // ----------------------------------------------------------------------------
-// wxDisplayMSW implementation
+// wxDisplayInfo
 // ----------------------------------------------------------------------------
 
-bool wxDisplayMSW::GetMonInfo(MONITORINFOEX& monInfo) const
+void wxDisplayInfo::Initialize()
 {
-    if ( !gs_GetMonitorInfo(m_hmon, &monInfo) )
+    if ( m_flags == (DWORD)-1 )
     {
-        wxLogLastError(wxT("GetMonitorInfo"));
-        return false;
+        WinStruct<MONITORINFOEX> monInfo;
+        if ( !gs_GetMonitorInfo(m_hmon, (LPMONITORINFO)&monInfo) )
+        {
+            wxLogLastError(_T("GetMonitorInfo"));
+            m_flags = 0;
+            return;
+        }
+
+        wxCopyRECTToRect(monInfo.rcMonitor, m_rect);
+        wxCopyRECTToRect(monInfo.rcWork, m_rectClient);
+        m_devName = monInfo.szDevice;
+        m_flags = monInfo.dwFlags;
     }
-
-    return true;
 }
 
-wxRect wxDisplayMSW::GetGeometry() const
+// ----------------------------------------------------------------------------
+// wxDisplayImplWin32Base
+// ----------------------------------------------------------------------------
+
+wxRect wxDisplayImplWin32Base::GetGeometry() const
 {
-    WinStruct<MONITORINFOEX> monInfo;
+    if ( m_info.m_rect.IsEmpty() )
+        m_info.Initialize();
 
-    wxRect rect;
-    if ( GetMonInfo(monInfo) )
-        wxCopyRECTToRect(monInfo.rcMonitor, rect);
-
-    return rect;
+    return m_info.m_rect;
 }
 
-wxRect wxDisplayMSW::GetClientArea() const
+wxRect wxDisplayImplWin32Base::GetClientArea() const
 {
-    WinStruct<MONITORINFOEX> monInfo;
+    if ( m_info.m_rectClient.IsEmpty() )
+        m_info.Initialize();
 
-    wxRect rectClient;
-    if ( GetMonInfo(monInfo) )
-        wxCopyRECTToRect(monInfo.rcWork, rectClient);
-
-    return rectClient;
+    return m_info.m_rectClient;
 }
 
-wxString wxDisplayMSW::GetName() const
+wxString wxDisplayImplWin32Base::GetName() const
 {
-    WinStruct<MONITORINFOEX> monInfo;
+    if ( m_info.m_devName.empty() )
+        m_info.Initialize();
 
-    wxString name;
-    if ( GetMonInfo(monInfo) )
-        name = monInfo.szDevice;
-
-    return name;
+    return m_info.m_devName;
 }
 
-bool wxDisplayMSW::IsPrimary() const
+bool wxDisplayImplWin32Base::IsPrimary() const
 {
-    WinStruct<MONITORINFOEX> monInfo;
+    if ( m_info.m_flags == (DWORD)-1 )
+        m_info.Initialize();
 
-    if ( !GetMonInfo(monInfo) )
-        return false;
-
-    return (monInfo.dwFlags & MONITORINFOF_PRIMARY) != 0;
+    return (m_info.m_flags & MONITORINFOF_PRIMARY) != 0;
 }
 
-wxVideoMode wxDisplayMSW::GetCurrentMode() const
+wxVideoMode wxDisplayImplWin32Base::GetCurrentMode() const
 {
     wxVideoMode mode;
 
@@ -306,17 +489,14 @@ wxVideoMode wxDisplayMSW::GetCurrentMode() const
     // according to MSDN.  The version of GetName() we implement for Win95
     // returns an empty string.
     const wxString name = GetName();
-    const wxChar * const deviceName = name.empty()
-                                          ? (const wxChar*)NULL
-                                          : (const wxChar*)name.c_str();
+    const wxChar * const deviceName = name.empty() ? NULL : name.c_str();
 
     DEVMODE dm;
     dm.dmSize = sizeof(dm);
     dm.dmDriverExtra = 0;
-
     if ( !::EnumDisplaySettings(deviceName, ENUM_CURRENT_SETTINGS, &dm) )
     {
-        wxLogLastError(wxT("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)"));
+        wxLogLastError(_T("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)"));
     }
     else
     {
@@ -326,7 +506,169 @@ wxVideoMode wxDisplayMSW::GetCurrentMode() const
     return mode;
 }
 
-wxArrayVideoModes wxDisplayMSW::GetModes(const wxVideoMode& modeMatch) const
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryWin32Base
+// ----------------------------------------------------------------------------
+
+int wxDisplayFactoryWin32Base::ms_supportsMultimon = -1;
+
+wxDisplayFactoryWin32Base::wxDisplayFactoryWin32Base()
+{
+    if ( ms_supportsMultimon == -1 )
+    {
+        ms_supportsMultimon = 0;
+
+        wxLogNull noLog;
+
+        wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM);
+
+        gs_MonitorFromPoint = (MonitorFromPoint_t)
+            dllDisplay.GetSymbol(wxT("MonitorFromPoint"));
+        if ( !gs_MonitorFromPoint )
+            return;
+
+        gs_MonitorFromWindow = (MonitorFromWindow_t)
+            dllDisplay.GetSymbol(wxT("MonitorFromWindow"));
+        if ( !gs_MonitorFromWindow )
+            return;
+
+        gs_GetMonitorInfo = (GetMonitorInfo_t)
+            dllDisplay.GetSymbolAorW(wxT("GetMonitorInfo"));
+        if ( !gs_GetMonitorInfo )
+            return;
+
+        ms_supportsMultimon = 1;
+
+        // we can safely let dllDisplay go out of scope, the DLL itself will
+        // still remain loaded as all Win32 programs use it
+    }
+}
+
+void wxDisplayFactoryWin32Base::Clear()
+{
+    WX_CLEAR_ARRAY(m_displays);
+}
+
+wxDisplayFactoryWin32Base::~wxDisplayFactoryWin32Base()
+{
+    Clear();
+}
+
+// helper for GetFromPoint() and GetFromWindow()
+int wxDisplayFactoryWin32Base::FindDisplayFromHMONITOR(HMONITOR hmon) const
+{
+    if ( hmon )
+    {
+        const size_t count = m_displays.size();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            if ( hmon == m_displays[n]->m_hmon )
+                return n;
+        }
+    }
+
+    return wxNOT_FOUND;
+}
+
+int wxDisplayFactoryWin32Base::GetFromPoint(const wxPoint& pt)
+{
+    POINT pt2;
+    pt2.x = pt.x;
+    pt2.y = pt.y;
+
+    return FindDisplayFromHMONITOR(gs_MonitorFromPoint(pt2,
+                                                       MONITOR_DEFAULTTONULL));
+}
+
+int wxDisplayFactoryWin32Base::GetFromWindow(wxWindow *window)
+{
+    return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
+                                                        MONITOR_DEFAULTTONULL));
+}
+
+// ============================================================================
+// wxDisplay implementation using Win32 multimon API
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryMultimon initialization
+// ----------------------------------------------------------------------------
+
+wxDisplayFactoryMultimon::wxDisplayFactoryMultimon()
+{
+    if ( !ms_supportsMultimon )
+        return;
+
+    // look up EnumDisplayMonitors() which we don't need with DirectDraw
+    // implementation
+    EnumDisplayMonitors_t pfnEnumDisplayMonitors;
+    {
+        wxLogNull noLog;
+
+        wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM);
+        pfnEnumDisplayMonitors = (EnumDisplayMonitors_t)
+            dllDisplay.GetSymbol(wxT("EnumDisplayMonitors"));
+        if ( !pfnEnumDisplayMonitors )
+            return;
+    }
+
+    // enumerate all displays
+    if ( !pfnEnumDisplayMonitors(NULL, NULL, MultimonEnumProc, (LPARAM)this) )
+    {
+        wxLogLastError(wxT("EnumDisplayMonitors"));
+    }
+}
+
+/* static */
+BOOL CALLBACK
+wxDisplayFactoryMultimon::MultimonEnumProc(
+  HMONITOR hMonitor,        // handle to display monitor
+  HDC WXUNUSED(hdcMonitor), // handle to monitor-appropriate device context
+  LPRECT lprcMonitor,       // pointer to monitor intersection rectangle
+  LPARAM dwData             // data passed from EnumDisplayMonitors (this)
+)
+{
+    wxDisplayFactoryMultimon *const self = (wxDisplayFactoryMultimon *)dwData;
+    self->AddDisplay(hMonitor, lprcMonitor);
+
+    // continue the enumeration
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryMultimon helper functions
+// ----------------------------------------------------------------------------
+
+void wxDisplayFactoryMultimon::AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor)
+{
+    wxDisplayInfo *info = new wxDisplayInfo(hMonitor);
+
+    // we also store the display geometry
+    info->m_rect = wxRect(lprcMonitor->left, lprcMonitor->top,
+                          lprcMonitor->right - lprcMonitor->left,
+                          lprcMonitor->bottom - lprcMonitor->top);
+
+    // now add this monitor to the array
+    m_displays.Add(info);
+}
+
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryMultimon inherited pure virtuals implementation
+// ----------------------------------------------------------------------------
+
+wxDisplayImpl *wxDisplayFactoryMultimon::CreateDisplay(unsigned n)
+{
+    wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
+
+    return new wxDisplayImplMultimon(n, *(m_displays[n]));
+}
+
+// ----------------------------------------------------------------------------
+// wxDisplayImplMultimon implementation
+// ----------------------------------------------------------------------------
+
+wxArrayVideoModes
+wxDisplayImplMultimon::GetModes(const wxVideoMode& modeMatch) const
 {
     wxArrayVideoModes modes;
 
@@ -334,14 +676,11 @@ wxArrayVideoModes wxDisplayMSW::GetModes(const wxVideoMode& modeMatch) const
     // according to MSDN.  The version of GetName() we implement for Win95
     // returns an empty string.
     const wxString name = GetName();
-    const wxChar * const deviceName = name.empty()
-                                            ? (const wxChar*)NULL
-                                            : (const wxChar*)name.c_str();
+    const wxChar * const deviceName = name.empty() ? NULL : name.c_str();
 
     DEVMODE dm;
     dm.dmSize = sizeof(dm);
     dm.dmDriverExtra = 0;
-
     for ( int iModeNum = 0;
           ::EnumDisplaySettings(deviceName, iModeNum, &dm);
           iModeNum++ )
@@ -356,7 +695,7 @@ wxArrayVideoModes wxDisplayMSW::GetModes(const wxVideoMode& modeMatch) const
     return modes;
 }
 
-bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)
+bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode)
 {
     // prepare ChangeDisplaySettingsEx() parameters
     DEVMODE dm;
@@ -372,26 +711,26 @@ bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)
     }
     else // change to the given mode
     {
-        wxCHECK_MSG( mode.GetWidth() && mode.GetHeight(), false,
-                        wxT("at least the width and height must be specified") );
+        wxCHECK_MSG( mode.w && mode.h, false,
+                        _T("at least the width and height must be specified") );
 
         wxZeroMemory(dm);
         dm.dmSize = sizeof(dm);
         dm.dmDriverExtra = 0;
         dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
-        dm.dmPelsWidth = mode.GetWidth();
-        dm.dmPelsHeight = mode.GetHeight();
+        dm.dmPelsWidth = mode.w;
+        dm.dmPelsHeight = mode.h;
 
-        if ( mode.GetDepth() )
+        if ( mode.bpp )
         {
             dm.dmFields |= DM_BITSPERPEL;
-            dm.dmBitsPerPel = mode.GetDepth();
+            dm.dmBitsPerPel = mode.bpp;
         }
 
-        if ( mode.GetRefresh() )
+        if ( mode.refresh )
         {
             dm.dmFields |= DM_DISPLAYFREQUENCY;
-            dm.dmDisplayFrequency = mode.GetRefresh();
+            dm.dmDisplayFrequency = mode.refresh;
         }
 
         pDevMode = &dm;
@@ -411,12 +750,13 @@ bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)
     static ChangeDisplaySettingsEx_t pfnChangeDisplaySettingsEx = NULL;
     if ( !pfnChangeDisplaySettingsEx )
     {
-        wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
+        wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM);
         if ( dllDisplay.IsLoaded() )
         {
-            wxDL_INIT_FUNC_AW(pfn, ChangeDisplaySettingsEx, dllDisplay);
+            pfnChangeDisplaySettingsEx = (ChangeDisplaySettingsEx_t)
+                dllDisplay.GetSymbolAorW(_T("ChangeDisplaySettingsEx"));
         }
-        //else: huh, no this DLL must always be present, what's going on??
+        //else: huh, no user32.dll??
 
 #ifndef __WXWINCE__
         if ( !pfnChangeDisplaySettingsEx )
@@ -431,25 +771,25 @@ bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)
     // do change the mode
     switch ( pfnChangeDisplaySettingsEx
              (
-                GetName().t_str(),  // display name
-                pDevMode,           // dev mode or NULL to reset
-                NULL,               // reserved
+                GetName(),      // display name
+                pDevMode,       // dev mode or NULL to reset
+                NULL,           // reserved
                 flags,
-                NULL                // pointer to video parameters (not used)
+                NULL            // pointer to video parameters (not used)
              ) )
     {
         case DISP_CHANGE_SUCCESSFUL:
             // ok
             {
                 // If we have a top-level, full-screen frame, emulate
-                // the DirectX behaviour and resize it.  This makes this
+                // the DirectX behavior and resize it.  This makes this
                 // API quite a bit easier to use.
                 wxWindow *winTop = wxTheApp->GetTopWindow();
                 wxFrame *frameTop = wxDynamicCast(winTop, wxFrame);
                 if (frameTop && frameTop->IsFullScreen())
                 {
                     wxVideoMode current = GetCurrentMode();
-                    frameTop->SetClientSize(current.GetWidth(), current.GetHeight());
+                    frameTop->SetClientSize(current.w, current.h);
                 }
             }
             return true;
@@ -459,165 +799,249 @@ bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)
             break;
 
         default:
-            wxFAIL_MSG( wxT("unexpected ChangeDisplaySettingsEx() return value") );
+            wxFAIL_MSG( _T("unexpected ChangeDisplaySettingsEx() return value") );
     }
 
     return false;
 }
 
 
+// ============================================================================
+// DirectDraw-based wxDisplay implementation
+// ============================================================================
+
+#if wxUSE_DIRECTDRAW
+
 // ----------------------------------------------------------------------------
-// wxDisplayFactoryMSW implementation
+// wxDisplayFactoryDirectDraw initialization
 // ----------------------------------------------------------------------------
 
-LRESULT APIENTRY
-wxDisplayWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+wxDisplayFactoryDirectDraw::wxDisplayFactoryDirectDraw()
 {
-    if ( msg == WM_SETTINGCHANGE )
-    {
-        wxDisplayFactoryMSW::RefreshMonitors();
-
-        return 0;
-    }
-
-    return ::DefWindowProc(hwnd, msg, wParam, lParam);
-}
-
-wxDisplayFactoryMSW::wxDisplayFactoryMSW()
-{
-    // This is not supposed to happen with the current code, the factory is
-    // implicitly a singleton.
-    wxASSERT_MSG( !ms_factory, wxS("Using more than one factory?") );
-
-    ms_factory = this;
-
-    m_hiddenHwnd = NULL;
-    m_hiddenClass = NULL;
-
-    if ( gs_MonitorFromPoint==NULL || gs_MonitorFromWindow==NULL
-         || gs_GetMonitorInfo==NULL || gs_EnumDisplayMonitors==NULL )
-    {
-        // First initialization, or last initialization failed.
-        wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET);
-
-        wxDL_INIT_FUNC(gs_, MonitorFromPoint, dllDisplay);
-        wxDL_INIT_FUNC(gs_, MonitorFromWindow, dllDisplay);
-        wxDL_INIT_FUNC_AW(gs_, GetMonitorInfo, dllDisplay);
-        wxDL_INIT_FUNC(gs_, EnumDisplayMonitors, dllDisplay);
-
-        // we can safely let dllDisplay go out of scope, the DLL itself will
-        // still remain loaded as all programs link to it statically anyhow
-    }
-
-    if ( gs_MonitorFromPoint==NULL || gs_MonitorFromWindow==NULL
-         || gs_GetMonitorInfo==NULL || gs_EnumDisplayMonitors==NULL )
+    if ( !ms_supportsMultimon )
         return;
 
-    DoRefreshMonitors();
+#if wxUSE_LOG
+    // suppress the errors if ddraw.dll is not found, we're prepared to handle
+    // this
+    wxLogNull noLog;
+#endif
 
-    // Also create a hidden window to listen for WM_SETTINGCHANGE that we
-    // receive when a monitor is added to or removed from the system as we must
-    // refresh our monitor handles information then.
-    m_hiddenHwnd = wxCreateHiddenWindow
-                   (
-                    &m_hiddenClass,
-                    wxT("wxDisplayHiddenWindow"),
-                    wxDisplayWndProc
-                   );
-}
+    m_dllDDraw.Load(_T("ddraw.dll"));
 
-wxDisplayFactoryMSW::~wxDisplayFactoryMSW()
-{
-    if ( m_hiddenHwnd )
+    if ( !m_dllDDraw.IsLoaded() )
+        return;
+
+    DirectDrawEnumerateEx_t pDDEnumEx = (DirectDrawEnumerateEx_t)
+        m_dllDDraw.GetSymbolAorW(_T("DirectDrawEnumerateEx"));
+    if ( !pDDEnumEx )
+        return;
+
+    // we can't continue without DirectDrawCreate() later, so resolve it right
+    // now and fail the initialization if it's not available
+    m_pfnDirectDrawCreate = (DirectDrawCreate_t)
+        m_dllDDraw.GetSymbol(_T("DirectDrawCreate"));
+    if ( !m_pfnDirectDrawCreate )
+        return;
+
+    if ( (*pDDEnumEx)(DDEnumExCallback,
+                      this,
+                      DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK )
     {
-        if ( !::DestroyWindow(m_hiddenHwnd) )
-        {
-            wxLogLastError(wxT("DestroyWindow(wxDisplayHiddenWindow)"));
-        }
-
-        if ( m_hiddenClass )
-        {
-            if ( !::UnregisterClass(m_hiddenClass, wxGetInstance()) )
-            {
-                wxLogLastError(wxT("UnregisterClass(wxDisplayHiddenWindow)"));
-            }
-        }
-    }
-
-    ms_factory = NULL;
-}
-
-void wxDisplayFactoryMSW::DoRefreshMonitors()
-{
-    m_displays.Clear();
-
-    if ( !gs_EnumDisplayMonitors(NULL, NULL, MultimonEnumProc, (LPARAM)this) )
-    {
-        wxLogLastError(wxT("EnumDisplayMonitors"));
+        wxLogLastError(_T("DirectDrawEnumerateEx"));
     }
 }
 
-/* static */
-BOOL CALLBACK
-wxDisplayFactoryMSW::MultimonEnumProc(
-    HMONITOR hMonitor,              // handle to display monitor
-    HDC WXUNUSED(hdcMonitor),       // handle to monitor-appropriate device context
-    LPRECT WXUNUSED(lprcMonitor),   // pointer to monitor intersection rectangle
-    LPARAM dwData)                  // data passed from EnumDisplayMonitors (this)
+wxDisplayFactoryDirectDraw::~wxDisplayFactoryDirectDraw()
 {
-    wxDisplayFactoryMSW *const self = (wxDisplayFactoryMSW *)dwData;
+    // we must clear m_displays now, before m_dllDDraw is unloaded as otherwise
+    // calling m_pDD2->Release() later would crash
+    Clear();
+}
 
-    self->m_displays.Add(hMonitor);
+// ----------------------------------------------------------------------------
+// callbacks for monitor/modes enumeration stuff
+// ----------------------------------------------------------------------------
+
+BOOL WINAPI
+wxDisplayFactoryDirectDraw::DDEnumExCallback(GUID *pGuid,
+                                             LPTSTR WXUNUSED(driverDescription),
+                                             LPTSTR driverName,
+                                             LPVOID lpContext,
+                                             HMONITOR hmon)
+{
+    if ( pGuid )
+    {
+        wxDisplayFactoryDirectDraw * self =
+            wx_static_cast(wxDisplayFactoryDirectDraw *, lpContext);
+        self->AddDisplay(*pGuid, hmon, driverName);
+    }
+    //else: we're called for the primary monitor, skip it
 
     // continue the enumeration
     return TRUE;
 }
 
-wxDisplayImpl *wxDisplayFactoryMSW::CreateDisplay(unsigned n)
-{
-    wxCHECK_MSG( n < m_displays.size(), NULL, wxT("An invalid index was passed to wxDisplay") );
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryDirectDraw helpers
+// ----------------------------------------------------------------------------
 
-    return new wxDisplayMSW(n, m_displays[n]);
+void wxDisplayFactoryDirectDraw::AddDisplay(const GUID& guid,
+                                            HMONITOR hmon,
+                                            LPTSTR name)
+{
+    m_displays.Add(new wxDisplayInfoDirectDraw(guid, hmon, name));
 }
 
-// helper for GetFromPoint() and GetFromWindow()
-int wxDisplayFactoryMSW::FindDisplayFromHMONITOR(HMONITOR hmon) const
+// ----------------------------------------------------------------------------
+// wxDisplayFactoryDirectDraw inherited pure virtuals implementation
+// ----------------------------------------------------------------------------
+
+wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(unsigned n)
 {
-    if ( hmon )
+    wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") );
+
+    wxDisplayInfoDirectDraw *
+        info = wx_static_cast(wxDisplayInfoDirectDraw *, m_displays[n]);
+
+    if ( !info->m_pDD2 )
     {
-        const size_t count = m_displays.size();
-        for ( size_t n = 0; n < count; n++ )
+        IDirectDraw *pDD;
+        GUID guid(info->m_guid);
+        HRESULT hr = (*m_pfnDirectDrawCreate)(&guid, &pDD, NULL);
+
+        if ( FAILED(hr) || !pDD )
         {
-            if ( hmon == m_displays[n] )
-                return n;
+            // what to do??
+            wxLogApiError(_T("DirectDrawCreate"), hr);
+            return NULL;
         }
+
+        // we got IDirectDraw, but we need IDirectDraw2
+        hr = pDD->QueryInterface(wxIID_IDirectDraw2, (void **)&info->m_pDD2);
+        pDD->Release();
+
+        if ( FAILED(hr) || !info->m_pDD2 )
+        {
+            wxLogApiError(_T("IDirectDraw::QueryInterface(IDD2)"), hr);
+            return NULL;
+        }
+
+        // NB: m_pDD2 will now be only destroyed when m_displays is destroyed
+        //     which is ok as we don't want to recreate DD objects all the time
+    }
+    //else: DirectDraw object corresponding to our display already exists
+
+    return new wxDisplayImplDirectDraw(n, *info, info->m_pDD2);
+}
+
+// ============================================================================
+// wxDisplayImplDirectDraw
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// video modes enumeration
+// ----------------------------------------------------------------------------
+
+// tiny helper class used to pass information from GetModes() to
+// wxDDEnumModesCallback
+class wxDDVideoModesAdder
+{
+public:
+    // our Add() method will add modes matching modeMatch to modes array
+    wxDDVideoModesAdder(wxArrayVideoModes& modes, const wxVideoMode& modeMatch)
+        : m_modes(modes),
+          m_modeMatch(modeMatch)
+    {
     }
 
-    return wxNOT_FOUND;
-}
+    void Add(const wxVideoMode& mode)
+    {
+        if ( mode.Matches(m_modeMatch) )
+            m_modes.Add(mode);
+    }
 
-int wxDisplayFactoryMSW::GetFromPoint(const wxPoint& pt)
+private:
+    wxArrayVideoModes& m_modes;
+    const wxVideoMode& m_modeMatch;
+
+    DECLARE_NO_COPY_CLASS(wxDDVideoModesAdder)
+};
+
+HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc,
+                                     LPVOID lpContext)
 {
-    POINT pt2;
-    pt2.x = pt.x;
-    pt2.y = pt.y;
+    // we need at least the mode size
+    static const DWORD FLAGS_REQUIRED = DDSD_HEIGHT | DDSD_WIDTH;
+    if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED )
+    {
+        wxDDVideoModesAdder * const vmodes =
+            wx_static_cast(wxDDVideoModesAdder *, lpContext);
 
-    return FindDisplayFromHMONITOR(gs_MonitorFromPoint(pt2,
-                                                       MONITOR_DEFAULTTONULL));
+        vmodes->Add(wxVideoMode(lpDDSurfaceDesc->dwWidth,
+                                lpDDSurfaceDesc->dwHeight,
+                                lpDDSurfaceDesc->ddpfPixelFormat.dwRGBBitCount,
+                                lpDDSurfaceDesc->dwRefreshRate));
+    }
+
+    // continue the enumeration
+    return DDENUMRET_OK;
 }
 
-int wxDisplayFactoryMSW::GetFromWindow(const wxWindow *window)
+wxArrayVideoModes
+wxDisplayImplDirectDraw::GetModes(const wxVideoMode& modeMatch) const
 {
-#ifdef __WXMSW__
-    return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window),
-                                                        MONITOR_DEFAULTTONULL));
-#else
-    const wxSize halfsize = window->GetSize() / 2;
-    wxPoint pt = window->GetScreenPosition();
-    pt.x += halfsize.x;
-    pt.y += halfsize.y;
-    return GetFromPoint(pt);
-#endif
+    wxArrayVideoModes modes;
+    wxDDVideoModesAdder modesAdder(modes, modeMatch);
+
+    HRESULT hr = m_pDD2->EnumDisplayModes
+                         (
+                            DDEDM_REFRESHRATES,
+                            NULL,                   // all modes
+                            &modesAdder,            // callback parameter
+                            wxDDEnumModesCallback
+                         );
+
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(_T("IDirectDraw::EnumDisplayModes"), hr);
+    }
+
+    return modes;
 }
 
+// ----------------------------------------------------------------------------
+// video mode switching
+// ----------------------------------------------------------------------------
+
+bool wxDisplayImplDirectDraw::ChangeMode(const wxVideoMode& mode)
+{
+    wxWindow *winTop = wxTheApp->GetTopWindow();
+    wxCHECK_MSG( winTop, false, _T("top level window required for DirectX") );
+
+    HRESULT hr = m_pDD2->SetCooperativeLevel
+                         (
+                            GetHwndOf(winTop),
+                            DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN
+                         );
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(_T("IDirectDraw2::SetCooperativeLevel"), hr);
+
+        return false;
+    }
+
+    hr = m_pDD2->SetDisplayMode(mode.w, mode.h, mode.bpp, mode.refresh, 0);
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(_T("IDirectDraw2::SetDisplayMode"), hr);
+
+        return false;
+    }
+
+    return true;
+}
+
+#endif // wxUSE_DIRECTDRAW
+
 #endif // wxUSE_DISPLAY
diff --git a/Source/3rd Party/wx/src/msw/dlmsw.cpp b/Source/3rd Party/wx/src/msw/dlmsw.cpp
index 67f6d0fe0..2b1c1e999 100644
--- a/Source/3rd Party/wx/src/msw/dlmsw.cpp	
+++ b/Source/3rd Party/wx/src/msw/dlmsw.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/dlmsw.cpp
+// Name:        msw/dlmsw.cpp
 // Purpose:     Win32-specific part of wxDynamicLibrary and related classes
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2005-01-10 (partly extracted from common/dynlib.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dlmsw.cpp 58750 2009-02-08 10:01:03Z VZ $
 // Copyright:   (c) 1998-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,9 +27,8 @@
 
 #include "wx/msw/private.h"
 #include "wx/msw/debughlp.h"
-#include "wx/filename.h"
 
-const wxString wxDynamicLibrary::ms_dllext(wxT(".dll"));
+const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -66,7 +65,7 @@ private:
     wxDynamicLibrary m_dll;
 
 
-    wxDECLARE_NO_COPY_CLASS(wxVersionDLL);
+    DECLARE_NO_COPY_CLASS(wxVersionDLL)
 };
 
 // class used to create wxDynamicLibraryDetails objects
@@ -80,6 +79,16 @@ public:
         wxVersionDLL *verDLL;
     };
 
+    // the declared type of the first EnumModulesProc() parameter changed in
+    // recent SDK versions and is no PCSTR instead of old PSTR, we know that
+    // it's const in version 11 and non-const in version 8 included with VC8
+    // (and earlier), suppose that it's only changed in version 11
+    #if defined(API_VERSION_NUMBER) && API_VERSION_NUMBER >= 11
+        typedef PCSTR NameStr_t;
+    #else
+        typedef PSTR NameStr_t;
+    #endif
+
     // TODO: fix EnumerateLoadedModules() to use EnumerateLoadedModules64()
     #ifdef __WIN64__
         typedef DWORD64 DWORD_32_64;
@@ -88,9 +97,53 @@ public:
     #endif
 
     static BOOL CALLBACK
-    EnumModulesProc(PCSTR name, DWORD_32_64 base, ULONG size, void *data);
+    EnumModulesProc(NameStr_t name, DWORD_32_64 base, ULONG size, void *data);
 };
 
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// return the module handle for the given base name
+static
+HMODULE wxGetModuleHandle(const char *name, void *addr)
+{
+    // we want to use GetModuleHandleEx() instead of usual GetModuleHandle()
+    // because the former works correctly for comctl32.dll while the latter
+    // returns NULL when comctl32.dll version 6 is used under XP (note that
+    // GetModuleHandleEx() is only available under XP and later, coincidence?)
+
+    // check if we can use GetModuleHandleEx
+    typedef BOOL (WINAPI *GetModuleHandleEx_t)(DWORD, LPCSTR, HMODULE *);
+
+    static const GetModuleHandleEx_t INVALID_FUNC_PTR = (GetModuleHandleEx_t)-1;
+
+    static GetModuleHandleEx_t s_pfnGetModuleHandleEx = INVALID_FUNC_PTR;
+    if ( s_pfnGetModuleHandleEx == INVALID_FUNC_PTR )
+    {
+        wxDynamicLibrary dll(_T("kernel32.dll"), wxDL_VERBATIM);
+        s_pfnGetModuleHandleEx =
+            (GetModuleHandleEx_t)dll.RawGetSymbol(_T("GetModuleHandleExA"));
+
+        // dll object can be destroyed, kernel32.dll won't be unloaded anyhow
+    }
+
+    // get module handle from its address
+    if ( s_pfnGetModuleHandleEx )
+    {
+        // flags are GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT |
+        //           GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
+        HMODULE hmod;
+        if ( s_pfnGetModuleHandleEx(6, (char *)addr, &hmod) && hmod )
+            return hmod;
+    }
+
+    // Windows CE only has Unicode API, so even we have an ANSI string here, we
+    // still need to use GetModuleHandleW() there and so do it everywhere to
+    // avoid #ifdefs -- this code is not performance-critical anyhow...
+    return ::GetModuleHandle(wxString::FromAscii((char *)name));
+}
+
 // ============================================================================
 // wxVersionDLL implementation
 // ============================================================================
@@ -105,7 +158,7 @@ wxVersionDLL::wxVersionDLL()
     // handle it
     wxLogNull noLog;
 
-    if ( m_dll.Load(wxT("version.dll"), wxDL_VERBATIM) )
+    if ( m_dll.Load(_T("version.dll"), wxDL_VERBATIM) )
     {
         // the functions we load have either 'A' or 'W' suffix depending on
         // whether we're in ANSI or Unicode build
@@ -116,7 +169,7 @@ wxVersionDLL::wxVersionDLL()
         #endif // UNICODE/ANSI
 
         #define LOAD_VER_FUNCTION(name)                                       \
-            m_pfn ## name = (name ## _t)m_dll.GetSymbol(wxT(#name SUFFIX));    \
+            m_pfn ## name = (name ## _t)m_dll.GetSymbol(_T(#name SUFFIX));    \
         if ( !m_pfn ## name )                                                 \
         {                                                                     \
             m_dll.Unload();                                                   \
@@ -138,7 +191,7 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const
     wxString ver;
     if ( m_dll.IsLoaded() )
     {
-        wxChar *pc = const_cast<wxChar *>((const wxChar*) filename.t_str());
+        wxChar *pc = wx_const_cast(wxChar *, filename.c_str());
 
         DWORD dummy;
         DWORD sizeVerInfo = m_pfnGetFileVersionInfoSize(pc, &dummy);
@@ -149,13 +202,10 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const
             {
                 void *pVer;
                 UINT sizeInfo;
-                if ( m_pfnVerQueryValue(buf.data(),
-                                        const_cast<wxChar *>(wxT("\\")),
-                                        &pVer,
-                                        &sizeInfo) )
+                if ( m_pfnVerQueryValue(buf.data(), _T("\\"), &pVer, &sizeInfo) )
                 {
                     VS_FIXEDFILEINFO *info = (VS_FIXEDFILEINFO *)pVer;
-                    ver.Printf(wxT("%d.%d.%d.%d"),
+                    ver.Printf(_T("%d.%d.%d.%d"),
                                HIWORD(info->dwFileVersionMS),
                                LOWORD(info->dwFileVersionMS),
                                HIWORD(info->dwFileVersionLS),
@@ -175,7 +225,7 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const
 
 /* static */
 BOOL CALLBACK
-wxDynamicLibraryDetailsCreator::EnumModulesProc(PCSTR name,
+wxDynamicLibraryDetailsCreator::EnumModulesProc(NameStr_t name,
                                                 DWORD_32_64 base,
                                                 ULONG size,
                                                 void *data)
@@ -186,12 +236,11 @@ wxDynamicLibraryDetailsCreator::EnumModulesProc(PCSTR name,
 
     // fill in simple properties
     details->m_name = wxString::FromAscii(name);
-    details->m_address = wxUIntToPtr(base);
+    details->m_address = wx_reinterpret_cast(void *, base);
     details->m_length = size;
 
     // to get the version, we first need the full path
-    const HMODULE
-        hmod = wxDynamicLibrary::MSWGetModuleHandle(name, details->m_address);
+    HMODULE hmod = wxGetModuleHandle(name, (void *)base);
     if ( hmod )
     {
         wxString fullname = wxGetFullModuleName(hmod);
@@ -225,62 +274,13 @@ wxDllType wxDynamicLibrary::GetProgramHandle()
 // loading/unloading DLLs
 // ----------------------------------------------------------------------------
 
-#ifndef MAX_PATH
-    #define MAX_PATH 260        // from VC++ headers
-#endif
-
 /* static */
 wxDllType
 wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
 {
-    if (flags & wxDL_GET_LOADED)
-        return ::GetModuleHandle(libname.t_str());
-
-    // Explicitly look in the same path as where the main wx HINSTANCE module
-    // is located (usually the executable or the DLL that uses wx).  Normally
-    // this is automatically part of the default search path but in some cases
-    // it may not be, such as when the wxPython extension modules need to load
-    // a DLL, but the intperpreter executable is located elsewhere.  Doing
-    // this allows us to always be able to dynamically load a DLL that is
-    // located at the same place as the wx modules.
-    wxString modpath, path;
-    ::GetModuleFileName(wxGetInstance(),
-                        wxStringBuffer(modpath, MAX_PATH+1),
-                        MAX_PATH);
-    
-    wxFileName::SplitPath(modpath, &path, NULL, NULL);
-
-    typedef BOOL (WINAPI *SetDllDirectory_t)(LPCTSTR lpPathName);
-
-    static SetDllDirectory_t s_pfnSetDllDirectory = (SetDllDirectory_t) -1;
-
-    if ( s_pfnSetDllDirectory == (SetDllDirectory_t) -1 )
-    {
-        /*
-        Should wxLoadedDLL ever not be used here (or rather, the
-        wxDL_GET_LOADED flag isn't used), infinite recursion will take
-        place (unless s_pfnSetDllDirectory is set to NULL here right
-        before loading the DLL).
-        */
-        wxLoadedDLL dllKernel("kernel32.dll");
-
-        wxDL_INIT_FUNC_AW(s_pfn, SetDllDirectory, dllKernel);
-    }
-
-    if (s_pfnSetDllDirectory)
-    {
-        s_pfnSetDllDirectory(path.t_str());
-    }
-
-    wxDllType handle = ::LoadLibrary(libname.t_str());
-
-    // reset the search path
-    if (s_pfnSetDllDirectory)
-    {
-        s_pfnSetDllDirectory(NULL);
-    }
-
-    return handle;
+    return flags & wxDL_GET_LOADED
+            ? ::GetModuleHandle(libname)
+            : ::LoadLibrary(libname);
 }
 
 /* static */
@@ -320,20 +320,14 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
         params.dlls = &dlls;
         params.verDLL = &verDLL;
 
-        // Note that the cast of EnumModulesProc is needed because the type of
-        // PENUMLOADED_MODULES_CALLBACK changed: in old SDK versions its first
-        // argument was non-const PSTR while now it's PCSTR. By explicitly
-        // casting to whatever the currently used headers require we ensure
-        // that the code compilers in any case.
         if ( !wxDbgHelpDLL::EnumerateLoadedModules
                             (
                                 ::GetCurrentProcess(),
-                                (PENUMLOADED_MODULES_CALLBACK)
                                 wxDynamicLibraryDetailsCreator::EnumModulesProc,
                                 &params
                             ) )
         {
-            wxLogLastError(wxT("EnumerateLoadedModules"));
+            wxLogLastError(_T("EnumerateLoadedModules"));
         }
     }
 #endif // wxUSE_DBGHELP
@@ -341,47 +335,5 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
     return dlls;
 }
 
-/* static */
-WXHMODULE wxDynamicLibrary::MSWGetModuleHandle(const char *name, void *addr)
-{
-    // we want to use GetModuleHandleEx() instead of usual GetModuleHandle()
-    // because the former works correctly for comctl32.dll while the latter
-    // returns NULL when comctl32.dll version 6 is used under XP (note that
-    // GetModuleHandleEx() is only available under XP and later, coincidence?)
-
-    // check if we can use GetModuleHandleEx
-    typedef BOOL (WINAPI *GetModuleHandleEx_t)(DWORD, LPCSTR, HMODULE *);
-
-    static const GetModuleHandleEx_t INVALID_FUNC_PTR = (GetModuleHandleEx_t)-1;
-
-    static GetModuleHandleEx_t s_pfnGetModuleHandleEx = INVALID_FUNC_PTR;
-    if ( s_pfnGetModuleHandleEx == INVALID_FUNC_PTR )
-    {
-        wxDynamicLibrary dll(wxT("kernel32.dll"), wxDL_VERBATIM);
-        s_pfnGetModuleHandleEx =
-            (GetModuleHandleEx_t)dll.RawGetSymbol(wxT("GetModuleHandleExA"));
-
-        // dll object can be destroyed, kernel32.dll won't be unloaded anyhow
-    }
-
-    // get module handle from its address
-    if ( s_pfnGetModuleHandleEx )
-    {
-        // flags are GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT |
-        //           GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
-        HMODULE hmod;
-        if ( s_pfnGetModuleHandleEx(6, (char *)addr, &hmod) && hmod )
-            return hmod;
-    }
-
-    // Windows CE only has Unicode API, so even we have an ANSI string here, we
-    // still need to use GetModuleHandleW() there
-#ifdef __WXWINCE__
-    return ::GetModuleHandleW(wxConvLibc.cMB2WC(name).data());
-#else
-    return ::GetModuleHandleA((char *)name);
-#endif
-}
-
 #endif // wxUSE_DYNLIB_CLASS
 
diff --git a/Source/3rd Party/wx/src/msw/dragimag.cpp b/Source/3rd Party/wx/src/msw/dragimag.cpp
index 725e77974..3c1e9cfb8 100644
--- a/Source/3rd Party/wx/src/msw/dragimag.cpp	
+++ b/Source/3rd Party/wx/src/msw/dragimag.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     08/04/99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dragimag.cpp 43883 2006-12-09 19:49:02Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -92,48 +92,10 @@ void wxDragImage::Init()
 #if !wxUSE_SIMPLER_DRAGIMAGE
     m_hCursorImageList = 0;
 #endif
-    m_window = NULL;
+    m_window = (wxWindow*) NULL;
     m_fullScreen = false;
 }
 
-#if WXWIN_COMPATIBILITY_2_8
-wxDragImage::wxDragImage(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
-{
-    Init();
-
-    Create(image, cursor);
-}
-
-wxDragImage::wxDragImage(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
-{
-    Init();
-
-    Create(image, cursor);
-}
-
-wxDragImage::wxDragImage(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
-{
-    Init();
-
-    Create(str, cursor);
-}
-
-bool wxDragImage::Create(const wxBitmap& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
-{
-    return Create(image, cursor);
-}
-
-bool wxDragImage::Create(const wxIcon& image, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
-{
-    return Create(image, cursor);
-}
-
-bool wxDragImage::Create(const wxString& str, const wxCursor& cursor, const wxPoint& WXUNUSED(cursorHotspot))
-{
-    return Create(str, cursor);
-}
-#endif // WXWIN_COMPATIBILITY_2_8
-
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 
@@ -243,7 +205,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 {
     wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
-    wxCoord w = 0, h = 0;
+    long w = 0, h = 0;
     wxScreenDC dc;
     dc.SetFont(font);
     dc.GetTextExtent(str, & w, & h);
@@ -256,7 +218,7 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
 
     dc2.SetBackground(* wxWHITE_BRUSH);
     dc2.Clear();
-    dc2.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
+    dc2.SetBackgroundMode(wxTRANSPARENT);
     dc2.SetTextForeground(* wxLIGHT_GREY);
     dc2.DrawText(str, 0, 0);
     dc2.DrawText(str, 1, 0);
@@ -288,13 +250,7 @@ bool wxDragImage::Create(const wxTreeCtrl& treeCtrl, wxTreeItemId& id)
         ImageList_Destroy(GetHimageList());
     m_hImageList = (WXHIMAGELIST)
         TreeView_CreateDragImage(GetHwndOf(&treeCtrl), (HTREEITEM) id.m_pItem);
-    if ( !m_hImageList )
-    {
-        // fall back on just the item text if there is no image
-        return Create(treeCtrl.GetItemText(id));
-    }
-
-    return true;
+    return m_hImageList != 0;
 }
 #endif
 
@@ -305,17 +261,8 @@ bool wxDragImage::Create(const wxListCtrl& listCtrl, long id)
     if ( m_hImageList )
         ImageList_Destroy(GetHimageList());
     POINT pt;
-    pt.x =
-    pt.y = 0;
-    m_hImageList = (WXHIMAGELIST)
-        ListView_CreateDragImage(GetHwndOf(&listCtrl), id, &pt);
-
-    if ( !m_hImageList )
-    {
-        // as for wxTreeCtrl, fall back on dragging just the item text
-        return Create(listCtrl.GetItemText(id));
-    }
-
+    pt.x = 0; pt.y = 0;
+    m_hImageList = (WXHIMAGELIST) ListView_CreateDragImage((HWND) listCtrl.GetHWND(), id, & pt);
     return true;
 }
 #endif
@@ -334,12 +281,12 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
 
     if (!ret)
     {
-        wxFAIL_MSG( wxT("BeginDrag failed.") );
+        wxFAIL_MSG( _T("BeginDrag failed.") );
 
         return false;
     }
 
-    if (m_cursor.IsOk())
+    if (m_cursor.Ok())
     {
 #if wxUSE_SIMPLER_DRAGIMAGE
         m_oldCursor = window->GetCursor();
@@ -390,7 +337,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, bool fullS
     }
 
 #if !wxUSE_SIMPLER_DRAGIMAGE
-    if (m_cursor.IsOk())
+    if (m_cursor.Ok())
         ::ShowCursor(FALSE);
 #endif
 
@@ -413,7 +360,7 @@ bool wxDragImage::BeginDrag(const wxPoint& hotspot, wxWindow* window, wxWindow*
 
     wxSize sz = fullScreenRect->GetSize();
 
-    if (fullScreenRect->GetParent() && !wxDynamicCast(fullScreenRect, wxFrame))
+    if (fullScreenRect->GetParent() && !fullScreenRect->IsKindOf(CLASSINFO(wxFrame)))
         fullScreenRect->GetParent()->ClientToScreen(& x, & y);
 
     rect.x = x; rect.y = y;
@@ -435,13 +382,13 @@ bool wxDragImage::EndDrag()
     }
 
 #if wxUSE_SIMPLER_DRAGIMAGE
-    if (m_cursor.IsOk() && m_oldCursor.IsOk())
+    if (m_cursor.Ok() && m_oldCursor.Ok())
         m_window->SetCursor(m_oldCursor);
 #else
     ::ShowCursor(TRUE);
 #endif
 
-    m_window = NULL;
+    m_window = (wxWindow*) NULL;
 
     return true;
 }
diff --git a/Source/3rd Party/wx/src/msw/enhmeta.cpp b/Source/3rd Party/wx/src/msw/enhmeta.cpp
index ff4f8f577..0b2105086 100644
--- a/Source/3rd Party/wx/src/msw/enhmeta.cpp	
+++ b/Source/3rd Party/wx/src/msw/enhmeta.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.01.00
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: enhmeta.cpp 60850 2009-06-01 10:16:13Z JS $
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -32,9 +32,6 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
-#include "wx/dc.h"
-#include "wx/msw/dc.h"
-
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 
@@ -45,6 +42,7 @@
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxEnhMetaFile, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxEnhMetaFileDC, wxDC)
 
 // ----------------------------------------------------------------------------
 // macros
@@ -59,7 +57,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxEnhMetaFile, wxObject)
 
 // we must pass NULL if the string is empty to metafile functions
 static inline const wxChar *GetMetaFileName(const wxString& fn)
-    { return !fn ? NULL : wxMSW_CONV_LPCTSTR(fn); }
+    { return !fn ? (wxChar *)NULL : fn.c_str(); }
 
 // ============================================================================
 // implementation
@@ -69,21 +67,6 @@ static inline const wxChar *GetMetaFileName(const wxString& fn)
 // wxEnhMetaFile
 // ----------------------------------------------------------------------------
 
-wxGDIRefData *wxEnhMetaFile::CreateGDIRefData() const
-{
-    wxFAIL_MSG( wxT("must be implemented if used") );
-
-    return NULL;
-}
-
-wxGDIRefData *
-wxEnhMetaFile::CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
-{
-    wxFAIL_MSG( wxT("must be implemented if used") );
-
-    return NULL;
-}
-
 void wxEnhMetaFile::Init()
 {
     if ( m_filename.empty() )
@@ -92,12 +75,10 @@ void wxEnhMetaFile::Init()
     }
     else // have valid file name, load metafile from it
     {
-        m_hMF = (WXHANDLE)::GetEnhMetaFile(m_filename.t_str());
+        m_hMF = (WXHANDLE)::GetEnhMetaFile(m_filename);
         if ( !m_hMF )
-        {
             wxLogSysError(_("Failed to load metafile from file \"%s\"."),
                           m_filename.c_str());
-        }
     }
 }
 
@@ -112,7 +93,7 @@ void wxEnhMetaFile::Assign(const wxEnhMetaFile& mf)
                                             GetMetaFileName(m_filename));
         if ( !m_hMF )
         {
-            wxLogLastError(wxT("CopyEnhMetaFile"));
+            wxLogLastError(_T("CopyEnhMetaFile"));
         }
     }
     else
@@ -127,15 +108,15 @@ void wxEnhMetaFile::Free()
     {
         if ( !::DeleteEnhMetaFile(GetEMF()) )
         {
-            wxLogLastError(wxT("DeleteEnhMetaFile"));
+            wxLogLastError(_T("DeleteEnhMetaFile"));
         }
     }
 }
 
 bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
 {
-    wxCHECK_MSG( IsOk(), false, wxT("can't play invalid enhanced metafile") );
-    wxCHECK_MSG( dc, false, wxT("invalid wxDC in wxEnhMetaFile::Play") );
+    wxCHECK_MSG( Ok(), false, _T("can't play invalid enhanced metafile") );
+    wxCHECK_MSG( dc, false, _T("invalid wxDC in wxEnhMetaFile::Play") );
 
     RECT rect;
     if ( rectBound )
@@ -155,14 +136,9 @@ bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
         rect.bottom = size.y;
     }
 
-    wxDCImpl *impl = dc->GetImpl();
-    wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
-    if (!msw_impl)
-        return false;
-
-    if ( !::PlayEnhMetaFile(GetHdcOf(*msw_impl), GetEMF(), &rect) )
+    if ( !::PlayEnhMetaFile(GetHdcOf(*dc), GetEMF(), &rect) )
     {
-        wxLogLastError(wxT("PlayEnhMetaFile"));
+        wxLogLastError(_T("PlayEnhMetaFile"));
 
         return false;
     }
@@ -174,12 +150,12 @@ wxSize wxEnhMetaFile::GetSize() const
 {
     wxSize size = wxDefaultSize;
 
-    if ( IsOk() )
+    if ( Ok() )
     {
         ENHMETAHEADER hdr;
         if ( !::GetEnhMetaFileHeader(GetEMF(), sizeof(hdr), &hdr) )
         {
-            wxLogLastError(wxT("GetEnhMetaFileHeader"));
+            wxLogLastError(_T("GetEnhMetaFileHeader"));
         }
         else
         {
@@ -201,74 +177,91 @@ wxSize wxEnhMetaFile::GetSize() const
 bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
 {
 #if wxUSE_DRAG_AND_DROP && wxUSE_CLIPBOARD
-    wxCHECK_MSG( m_hMF, false, wxT("can't copy invalid metafile to clipboard") );
+    wxCHECK_MSG( m_hMF, false, _T("can't copy invalid metafile to clipboard") );
 
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
 #else // !wxUSE_DRAG_AND_DROP
-    wxFAIL_MSG(wxT("not implemented"));
+    wxFAIL_MSG(_T("not implemented"));
     return false;
 #endif // wxUSE_DRAG_AND_DROP/!wxUSE_DRAG_AND_DROP
 }
 
 // ----------------------------------------------------------------------------
-// wxEnhMetaFileDCImpl
+// wxEnhMetaFileDC
 // ----------------------------------------------------------------------------
 
-class wxEnhMetaFileDCImpl : public wxMSWDCImpl
-{
-public:
-    wxEnhMetaFileDCImpl( wxEnhMetaFileDC *owner,
-                         const wxString& filename, int width, int height,
-                         const wxString& description );
-    wxEnhMetaFileDCImpl( wxEnhMetaFileDC *owner,
-                         const wxDC& referenceDC,
-                         const wxString& filename, int width, int height,
-                         const wxString& description );
-    virtual ~wxEnhMetaFileDCImpl();
-
-    // obtain a pointer to the new metafile (caller should delete it)
-    wxEnhMetaFile *Close();
-
-protected:
-    virtual void DoGetSize(int *width, int *height) const;
-
-private:
-    void Create(HDC hdcRef,
-                const wxString& filename, int width, int height,
-                const wxString& description);
-
-    // size passed to ctor and returned by DoGetSize()
-    int m_width,
-        m_height;
-};
-
-
-wxEnhMetaFileDCImpl::wxEnhMetaFileDCImpl( wxEnhMetaFileDC* owner,
-                                 const wxString& filename,
+wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
                                  int width, int height,
-                                 const wxString& description )
-                   : wxMSWDCImpl( owner )
+                                 const wxString& description)
 {
-    Create(ScreenHDC(), filename, width, height, description);
+    m_width = width;
+    m_height = height;
+
+    RECT rect;
+    RECT *pRect;
+    if ( width && height )
+    {
+        rect.top =
+        rect.left = 0;
+        rect.right = width;
+        rect.bottom = height;
+
+        // CreateEnhMetaFile() wants them in HIMETRIC
+        PixelToHIMETRIC(&rect.right, &rect.bottom);
+
+        pRect = &rect;
+    }
+    else
+    {
+        // GDI will try to find out the size for us (not recommended)
+        pRect = (LPRECT)NULL;
+    }
+
+    ScreenHDC hdcRef;
+    m_hDC = (WXHDC)::CreateEnhMetaFile(hdcRef, GetMetaFileName(filename),
+                                       pRect, description);
+    if ( !m_hDC )
+    {
+        wxLogLastError(_T("CreateEnhMetaFile"));
+    }
 }
 
-wxEnhMetaFileDCImpl::wxEnhMetaFileDCImpl( wxEnhMetaFileDC* owner,
-                                 const wxDC& referenceDC,
-                                 const wxString& filename,
-                                 int width, int height,
-                                 const wxString& description )
-                   : wxMSWDCImpl( owner )
+#if wxUSE_ENH_METAFILE_FROM_DC
+
+void PixelToHIMETRIC(LONG *x, LONG *y, HDC hdcRef)
 {
-    Create(GetHdcOf(referenceDC), filename, width, height, description);
+    int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE),
+        iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE),
+        iWidthPels = GetDeviceCaps(hdcRef, HORZRES),
+        iHeightPels = GetDeviceCaps(hdcRef, VERTRES);
+
+    *x *= (iWidthMM * 100);
+    *x /= iWidthPels;
+    *y *= (iHeightMM * 100);
+    *y /= iHeightPels;
 }
 
-void wxEnhMetaFileDCImpl::Create(HDC hdcRef,
+void HIMETRICToPixel(LONG *x, LONG *y, HDC hdcRef)
+{
+    int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE),
+        iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE),
+        iWidthPels = GetDeviceCaps(hdcRef, HORZRES),
+        iHeightPels = GetDeviceCaps(hdcRef, VERTRES);
+
+    *x *= iWidthPels;
+    *x /= (iWidthMM * 100);
+    *y *= iHeightPels;
+    *y /= (iHeightMM * 100);
+}
+
+wxEnhMetaFileDC::wxEnhMetaFileDC(const wxDC& referenceDC,
                                  const wxString& filename,
                                  int width, int height,
                                  const wxString& description)
 {
     m_width = width;
     m_height = height;
+    HDC hdcRef = GetHdcOf(referenceDC);
 
     RECT rect;
     RECT *pRect;
@@ -291,14 +284,16 @@ void wxEnhMetaFileDCImpl::Create(HDC hdcRef,
     }
 
     m_hDC = (WXHDC)::CreateEnhMetaFile(hdcRef, GetMetaFileName(filename),
-                                       pRect, description.t_str());
+                                       pRect, description.wx_str());
     if ( !m_hDC )
     {
-        wxLogLastError(wxT("CreateEnhMetaFile"));
+        wxLogLastError(_T("CreateEnhMetaFile"));
     }
 }
 
-void wxEnhMetaFileDCImpl::DoGetSize(int *width, int *height) const
+#endif
+
+void wxEnhMetaFileDC::DoGetSize(int *width, int *height) const
 {
     if ( width )
         *width = m_width;
@@ -306,14 +301,14 @@ void wxEnhMetaFileDCImpl::DoGetSize(int *width, int *height) const
         *height = m_height;
 }
 
-wxEnhMetaFile *wxEnhMetaFileDCImpl::Close()
+wxEnhMetaFile *wxEnhMetaFileDC::Close()
 {
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid wxEnhMetaFileDC") );
+    wxCHECK_MSG( Ok(), NULL, _T("invalid wxEnhMetaFileDC") );
 
     HENHMETAFILE hMF = ::CloseEnhMetaFile(GetHdc());
     if ( !hMF )
     {
-        wxLogLastError(wxT("CloseEnhMetaFile"));
+        wxLogLastError(_T("CloseEnhMetaFile"));
 
         return NULL;
     }
@@ -323,49 +318,12 @@ wxEnhMetaFile *wxEnhMetaFileDCImpl::Close()
     return mf;
 }
 
-wxEnhMetaFileDCImpl::~wxEnhMetaFileDCImpl()
+wxEnhMetaFileDC::~wxEnhMetaFileDC()
 {
     // avoid freeing it in the base class dtor
     m_hDC = 0;
 }
 
-// ----------------------------------------------------------------------------
-// wxEnhMetaFileDC
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxEnhMetaFileDC, wxDC)
-
-wxEnhMetaFileDC::wxEnhMetaFileDC(const wxString& filename,
-                                 int width, int height,
-                                 const wxString& description)
-               : wxDC(new wxEnhMetaFileDCImpl(this,
-                                              filename,
-                                              width, height,
-                                              description))
-{
-}
-
-wxEnhMetaFileDC::wxEnhMetaFileDC(const wxDC& referenceDC,
-                                 const wxString& filename,
-                                 int width, int height,
-                                 const wxString& description)
-               : wxDC(new wxEnhMetaFileDCImpl(this,
-                                              referenceDC,
-                                              filename,
-                                              width, height,
-                                              description))
-{
-}
-
-wxEnhMetaFile *wxEnhMetaFileDC::Close()
-{
-    wxEnhMetaFileDCImpl * const
-        impl = static_cast<wxEnhMetaFileDCImpl *>(GetImpl());
-    wxCHECK_MSG( impl, NULL, wxT("no wxEnhMetaFileDC implementation") );
-
-    return impl->Close();
-}
-
 #if wxUSE_DRAG_AND_DROP
 
 // ----------------------------------------------------------------------------
@@ -400,7 +358,7 @@ size_t wxEnhMetaFileDataObject::GetDataSize(const wxDataFormat& format) const
     }
     else
     {
-        wxASSERT_MSG( format == wxDF_METAFILE, wxT("unsupported format") );
+        wxASSERT_MSG( format == wxDF_METAFILE, _T("unsupported format") );
 
         return sizeof(METAFILEPICT);
     }
@@ -408,7 +366,7 @@ size_t wxEnhMetaFileDataObject::GetDataSize(const wxDataFormat& format) const
 
 bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
 {
-    wxCHECK_MSG( m_metafile.IsOk(), false, wxT("copying invalid enh metafile") );
+    wxCHECK_MSG( m_metafile.Ok(), false, _T("copying invalid enh metafile") );
 
     HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
 
@@ -417,7 +375,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         HENHMETAFILE hEMFCopy = ::CopyEnhMetaFile(hEMF, NULL);
         if ( !hEMFCopy )
         {
-            wxLogLastError(wxT("CopyEnhMetaFile"));
+            wxLogLastError(_T("CopyEnhMetaFile"));
 
             return false;
         }
@@ -426,7 +384,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
     }
     else
     {
-        wxASSERT_MSG( format == wxDF_METAFILE, wxT("unsupported format") );
+        wxASSERT_MSG( format == wxDF_METAFILE, _T("unsupported format") );
 
         // convert to WMF
 
@@ -434,14 +392,14 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
 
         // first get the buffer size and alloc memory
         size_t size = ::GetWinMetaFileBits(hEMF, 0, NULL, MM_ANISOTROPIC, hdc);
-        wxCHECK_MSG( size, false, wxT("GetWinMetaFileBits() failed") );
+        wxCHECK_MSG( size, false, _T("GetWinMetaFileBits() failed") );
 
         BYTE *bits = (BYTE *)malloc(size);
 
         // then get the enh metafile bits
         if ( !::GetWinMetaFileBits(hEMF, size, bits, MM_ANISOTROPIC, hdc) )
         {
-            wxLogLastError(wxT("GetWinMetaFileBits"));
+            wxLogLastError(_T("GetWinMetaFileBits"));
 
             free(bits);
 
@@ -453,7 +411,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
         free(bits);
         if ( !hMF )
         {
-            wxLogLastError(wxT("SetMetaFileBitsEx"));
+            wxLogLastError(_T("SetMetaFileBitsEx"));
 
             return false;
         }
@@ -482,24 +440,24 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
     {
         hEMF = *(HENHMETAFILE *)buf;
 
-        wxCHECK_MSG( hEMF, false, wxT("pasting invalid enh metafile") );
+        wxCHECK_MSG( hEMF, false, _T("pasting invalid enh metafile") );
     }
     else
     {
-        wxASSERT_MSG( format == wxDF_METAFILE, wxT("unsupported format") );
+        wxASSERT_MSG( format == wxDF_METAFILE, _T("unsupported format") );
 
         // convert from WMF
         const METAFILEPICT *mfpict = (const METAFILEPICT *)buf;
 
         // first get the buffer size
         size_t size = ::GetMetaFileBitsEx(mfpict->hMF, 0, NULL);
-        wxCHECK_MSG( size, false, wxT("GetMetaFileBitsEx() failed") );
+        wxCHECK_MSG( size, false, _T("GetMetaFileBitsEx() failed") );
 
         // then get metafile bits
         BYTE *bits = (BYTE *)malloc(size);
         if ( !::GetMetaFileBitsEx(mfpict->hMF, size, bits) )
         {
-            wxLogLastError(wxT("GetMetaFileBitsEx"));
+            wxLogLastError(_T("GetMetaFileBitsEx"));
 
             free(bits);
 
@@ -513,7 +471,7 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
         free(bits);
         if ( !hEMF )
         {
-            wxLogLastError(wxT("SetWinMetaFileBits"));
+            wxLogLastError(_T("SetWinMetaFileBits"));
 
             return false;
         }
@@ -536,14 +494,14 @@ size_t wxEnhMetaFileSimpleDataObject::GetDataSize() const
 
 bool wxEnhMetaFileSimpleDataObject::GetDataHere(void *buf) const
 {
-    wxCHECK_MSG( m_metafile.IsOk(), false, wxT("copying invalid enh metafile") );
+    wxCHECK_MSG( m_metafile.Ok(), false, _T("copying invalid enh metafile") );
 
     HENHMETAFILE hEMF = (HENHMETAFILE)m_metafile.GetHENHMETAFILE();
 
     HENHMETAFILE hEMFCopy = ::CopyEnhMetaFile(hEMF, NULL);
     if ( !hEMFCopy )
     {
-        wxLogLastError(wxT("CopyEnhMetaFile"));
+        wxLogLastError(_T("CopyEnhMetaFile"));
 
         return false;
     }
@@ -557,7 +515,7 @@ bool wxEnhMetaFileSimpleDataObject::SetData(size_t WXUNUSED(len),
 {
     HENHMETAFILE hEMF = *(HENHMETAFILE *)buf;
 
-    wxCHECK_MSG( hEMF, false, wxT("pasting invalid enh metafile") );
+    wxCHECK_MSG( hEMF, false, _T("pasting invalid enh metafile") );
     m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
 
     return true;
diff --git a/Source/3rd Party/wx/src/msw/evtloop.cpp b/Source/3rd Party/wx/src/msw/evtloop.cpp
index 5318543b4..bde8a2d4c 100644
--- a/Source/3rd Party/wx/src/msw/evtloop.cpp	
+++ b/Source/3rd Party/wx/src/msw/evtloop.cpp	
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/evtloop.cpp
+// Name:        msw/evtloop.cpp
 // Purpose:     implements wxEventLoop for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     01.06.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: evtloop.cpp 39912 2006-06-30 22:59:01Z VZ $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -24,138 +24,62 @@
     #pragma hdrstop
 #endif
 
-#include "wx/evtloop.h"
-
 #ifndef WX_PRECOMP
-    #if wxUSE_GUI
-        #include "wx/window.h"
-    #endif
+    #include "wx/window.h"
     #include "wx/app.h"
-    #include "wx/log.h"
 #endif //WX_PRECOMP
 
-#include "wx/thread.h"
+#include "wx/evtloop.h"
+
+#include "wx/tooltip.h"
 #include "wx/except.h"
+#include "wx/ptr_scpd.h"
+
 #include "wx/msw/private.h"
-#include "wx/scopeguard.h"
 
-#if wxUSE_GUI
-    #include "wx/tooltip.h"
-    #if wxUSE_THREADS
-        // define the list of MSG strutures
-        WX_DECLARE_LIST(MSG, wxMsgList);
+#if wxUSE_THREADS
+    #include "wx/thread.h"
 
-        #include "wx/listimpl.cpp"
+    // define the list of MSG strutures
+    WX_DECLARE_LIST(MSG, wxMsgList);
 
-        WX_DEFINE_LIST(wxMsgList)
-    #endif // wxUSE_THREADS
-#endif //wxUSE_GUI
+    #include "wx/listimpl.cpp"
 
-#if wxUSE_BASE
+    WX_DEFINE_LIST(wxMsgList)
+#endif // wxUSE_THREADS
 
 // ============================================================================
-// wxMSWEventLoopBase implementation
+// wxEventLoop implementation
 // ============================================================================
 
+wxWindowMSW *wxEventLoop::ms_winCritical = NULL;
+
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 
-wxMSWEventLoopBase::wxMSWEventLoopBase()
+wxEventLoop::wxEventLoop()
 {
     m_shouldExit = false;
     m_exitcode = 0;
 }
 
 // ----------------------------------------------------------------------------
-// wxEventLoop message processing dispatching
+// wxEventLoop message processing
 // ----------------------------------------------------------------------------
 
-bool wxMSWEventLoopBase::Pending() const
+void wxEventLoop::ProcessMessage(WXMSG *msg)
 {
-    MSG msg;
-    return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
+    // give us the chance to preprocess the message first
+    if ( !PreProcessMessage(msg) )
+    {
+        // if it wasn't done, dispatch it to the corresponding window
+        ::TranslateMessage(msg);
+        ::DispatchMessage(msg);
+    }
 }
 
-bool wxMSWEventLoopBase::GetNextMessage(WXMSG* msg)
-{
-    const BOOL rc = ::GetMessage(msg, NULL, 0, 0);
-
-    if ( rc == 0 )
-    {
-        // got WM_QUIT
-        return false;
-    }
-
-    if ( rc == -1 )
-    {
-        // should never happen, but let's test for it nevertheless
-        wxLogLastError(wxT("GetMessage"));
-
-        // still break from the loop
-        return false;
-    }
-
-    return true;
-}
-
-int wxMSWEventLoopBase::GetNextMessageTimeout(WXMSG *msg, unsigned long timeout)
-{
-    // MsgWaitForMultipleObjects() won't notice any input which was already
-    // examined (e.g. using PeekMessage()) but not yet removed from the queue
-    // so we need to remove any immediately messages manually
-    //
-    // NB: using MsgWaitForMultipleObjectsEx() could simplify the code here but
-    //     it is not available in very old Windows versions
-    if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
-    {
-        // we use this function just in order to not block longer than the
-        // given timeout, so we don't pass any handles to it at all
-        DWORD rc = ::MsgWaitForMultipleObjects
-                     (
-                        0, NULL,
-                        FALSE,
-                        timeout,
-                        QS_ALLINPUT
-                     );
-
-        switch ( rc )
-        {
-            default:
-                wxLogDebug("unexpected MsgWaitForMultipleObjects() return "
-                           "value %lu", rc);
-                // fall through
-
-            case WAIT_TIMEOUT:
-                return -1;
-
-            case WAIT_OBJECT_0:
-                if ( !::PeekMessage(msg, 0, 0, 0, PM_REMOVE) )
-                {
-                    // somehow it may happen that MsgWaitForMultipleObjects()
-                    // returns true but there are no messages -- just treat it
-                    // the same as timeout then
-                    return -1;
-                }
-                break;
-        }
-    }
-
-    return msg->message != WM_QUIT;
-}
-
-
-#endif // wxUSE_BASE
-
-#if wxUSE_GUI
-
-// ============================================================================
-// GUI wxEventLoop implementation
-// ============================================================================
-
-wxWindowMSW *wxGUIEventLoop::ms_winCritical = NULL;
-
-bool wxGUIEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
+bool wxEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
 {
     while ( win )
     {
@@ -168,7 +92,7 @@ bool wxGUIEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
     return false;
 }
 
-bool wxGUIEventLoop::PreProcessMessage(WXMSG *msg)
+bool wxEventLoop::PreProcessMessage(WXMSG *msg)
 {
     HWND hwnd = msg->hwnd;
     wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
@@ -263,22 +187,57 @@ bool wxGUIEventLoop::PreProcessMessage(WXMSG *msg)
     return false;
 }
 
-void wxGUIEventLoop::ProcessMessage(WXMSG *msg)
+// ----------------------------------------------------------------------------
+// wxEventLoop running and exiting
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// wxEventLoopManual customization
+// ----------------------------------------------------------------------------
+
+void wxEventLoop::OnNextIteration()
 {
-    // give us the chance to preprocess the message first
-    if ( !PreProcessMessage(msg) )
-    {
-        // if it wasn't done, dispatch it to the corresponding window
-        ::TranslateMessage(msg);
-        ::DispatchMessage(msg);
-    }
+#if wxUSE_THREADS
+    wxMutexGuiLeaveOrEnter();
+#endif // wxUSE_THREADS
 }
 
-bool wxGUIEventLoop::Dispatch()
+void wxEventLoop::WakeUp()
+{
+    ::PostMessage(NULL, WM_NULL, 0, 0);
+}
+
+// ----------------------------------------------------------------------------
+// wxEventLoop message processing dispatching
+// ----------------------------------------------------------------------------
+
+bool wxEventLoop::Pending() const
 {
     MSG msg;
-    if ( !GetNextMessage(&msg) )
+    return ::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE) != 0;
+}
+
+bool wxEventLoop::Dispatch()
+{
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
+
+    MSG msg;
+    BOOL rc = ::GetMessage(&msg, (HWND) NULL, 0, 0);
+
+    if ( rc == 0 )
+    {
+        // got WM_QUIT
         return false;
+    }
+
+    if ( rc == -1 )
+    {
+        // should never happen, but let's test for it nevertheless
+        wxLogLastError(wxT("GetMessage"));
+
+        // still break from the loop
+        return false;
+    }
 
 #if wxUSE_THREADS
     wxASSERT_MSG( wxThread::IsMain(),
@@ -335,270 +294,3 @@ bool wxGUIEventLoop::Dispatch()
     return true;
 }
 
-int wxGUIEventLoop::DispatchTimeout(unsigned long timeout)
-{
-    MSG msg;
-    int rc = GetNextMessageTimeout(&msg, timeout);
-    if ( rc != 1 )
-        return rc;
-
-    ProcessMessage(&msg);
-
-    return 1;
-}
-
-void wxGUIEventLoop::OnNextIteration()
-{
-#if wxUSE_THREADS
-    wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-}
-
-void wxGUIEventLoop::WakeUp()
-{
-    ::PostMessage(NULL, WM_NULL, 0, 0);
-}
-
-
-// ----------------------------------------------------------------------------
-// Yield to incoming messages
-// ----------------------------------------------------------------------------
-
-#include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY(wxMSGArray);
-
-bool wxGUIEventLoop::YieldFor(long eventsToProcess)
-{
-    // set the flag and don't forget to reset it before returning
-    m_isInsideYield = true;
-    m_eventsToProcessInsideYield = eventsToProcess;
-
-    wxON_BLOCK_EXIT_SET(m_isInsideYield, false);
-
-#if wxUSE_LOG
-    // disable log flushing from here because a call to wxYield() shouldn't
-    // normally result in message boxes popping up &c
-    wxLog::Suspend();
-
-    // ensure the logs will be flashed again when we exit
-    wxON_BLOCK_EXIT0(wxLog::Resume);
-#endif // wxUSE_LOG
-
-    // we don't want to process WM_QUIT from here - it should be processed in
-    // the main event loop in order to stop it
-    MSG msg;
-    int nPaintsReceived = 0;
-    while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
-            msg.message != WM_QUIT )
-    {
-#if wxUSE_THREADS
-        wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-
-        if (msg.message == WM_PAINT)
-        {
-            // NOTE: WM_PAINTs are categorized as wxEVT_CATEGORY_UI
-            if ((eventsToProcess & wxEVT_CATEGORY_UI) == 0)
-            {
-                // this msg is not going to be dispatched...
-                // however WM_PAINT is special: until there are damaged
-                // windows, Windows will keep sending it forever!
-                if (nPaintsReceived > 10)
-                {
-                    // we got 10 WM_PAINT consecutive messages...
-                    // we must have reached the tail of the message queue:
-                    // we're now getting _only_ WM_PAINT events and this will
-                    // continue forever (since we don't dispatch them
-                    // because of the user-specified eventsToProcess mask)...
-                    // break out of this loop!
-                    break;
-                }
-                else
-                    nPaintsReceived++;
-            }
-            //else: we're going to dispatch it below,
-            //      so we don't need to take any special action
-        }
-        else
-        {
-            // reset the counter of consecutive WM_PAINT messages received:
-            nPaintsReceived = 0;
-        }
-
-        // choose a wxEventCategory for this Windows message
-        bool processNow;
-        switch (msg.message)
-        {
-#if !defined(__WXWINCE__)
-            case WM_NCMOUSEMOVE:
-
-            case WM_NCLBUTTONDOWN:
-            case WM_NCLBUTTONUP:
-            case WM_NCLBUTTONDBLCLK:
-            case WM_NCRBUTTONDOWN:
-            case WM_NCRBUTTONUP:
-            case WM_NCRBUTTONDBLCLK:
-            case WM_NCMBUTTONDOWN:
-            case WM_NCMBUTTONUP:
-            case WM_NCMBUTTONDBLCLK:
-#endif
-
-            case WM_KEYDOWN:
-            case WM_KEYUP:
-            case WM_CHAR:
-            case WM_DEADCHAR:
-            case WM_SYSKEYDOWN:
-            case WM_SYSKEYUP:
-            case WM_SYSCHAR:
-            case WM_SYSDEADCHAR:
-#ifdef WM_UNICHAR
-            case WM_UNICHAR:
-#endif
-            case WM_HOTKEY:
-            case WM_IME_STARTCOMPOSITION:
-            case WM_IME_ENDCOMPOSITION:
-            case WM_IME_COMPOSITION:
-            case WM_COMMAND:
-            case WM_SYSCOMMAND:
-
-            case WM_IME_SETCONTEXT:
-            case WM_IME_NOTIFY:
-            case WM_IME_CONTROL:
-            case WM_IME_COMPOSITIONFULL:
-            case WM_IME_SELECT:
-            case WM_IME_CHAR:
-            case WM_IME_KEYDOWN:
-            case WM_IME_KEYUP:
-
-#if !defined(__WXWINCE__)
-            case WM_MOUSEHOVER:
-            case WM_MOUSELEAVE:
-#endif
-#ifdef WM_NCMOUSELEAVE
-            case WM_NCMOUSELEAVE:
-#endif
-
-            case WM_CUT:
-            case WM_COPY:
-            case WM_PASTE:
-            case WM_CLEAR:
-            case WM_UNDO:
-
-            case WM_MOUSEMOVE:
-            case WM_LBUTTONDOWN:
-            case WM_LBUTTONUP:
-            case WM_LBUTTONDBLCLK:
-            case WM_RBUTTONDOWN:
-            case WM_RBUTTONUP:
-            case WM_RBUTTONDBLCLK:
-            case WM_MBUTTONDOWN:
-            case WM_MBUTTONUP:
-            case WM_MBUTTONDBLCLK:
-            case WM_MOUSEWHEEL:
-                processNow = (eventsToProcess & wxEVT_CATEGORY_USER_INPUT) != 0;
-                break;
-
-            case WM_TIMER:
-                processNow = (eventsToProcess & wxEVT_CATEGORY_TIMER) != 0;
-                break;
-
-            default:
-                if (msg.message < WM_USER)
-                {
-                    // 0;WM_USER-1 is the range of message IDs reserved for use
-                    // by the system.
-                    // there are too many of these types of messages to handle
-                    // them in this switch
-                    processNow = (eventsToProcess & wxEVT_CATEGORY_UI) != 0;
-                }
-                else
-                {
-                    // Process all the unknown messages. We must do it because
-                    // failure to process some of them can be fatal, e.g. if we
-                    // don't dispatch WM_APP+2 then embedded IE ActiveX
-                    // controls don't work any more, see #14027. And there may
-                    // be more examples like this, so dispatch all unknown
-                    // messages immediately to be safe.
-                    processNow = true;
-                }
-        }
-
-        // should we process this event now?
-        if ( processNow )
-        {
-            if ( !wxTheApp->Dispatch() )
-                break;
-        }
-        else
-        {
-            // remove the message and store it
-            ::GetMessage(&msg, NULL, 0, 0);
-            m_arrMSG.Add(msg);
-        }
-    }
-
-    // if there are pending events, we must process them.
-    if (wxTheApp)
-        wxTheApp->ProcessPendingEvents();
-
-    // put back unprocessed events in the queue
-    DWORD id = GetCurrentThreadId();
-    for (size_t i=0; i<m_arrMSG.GetCount(); i++)
-    {
-        PostThreadMessage(id, m_arrMSG[i].message,
-                          m_arrMSG[i].wParam, m_arrMSG[i].lParam);
-    }
-
-    m_arrMSG.Clear();
-
-    return true;
-}
-
-
-#else // !wxUSE_GUI
-
-
-// ============================================================================
-// wxConsoleEventLoop implementation
-// ============================================================================
-
-#if wxUSE_CONSOLE_EVENTLOOP
-
-void wxConsoleEventLoop::WakeUp()
-{
-#if wxUSE_THREADS
-    wxWakeUpMainThread();
-#endif
-}
-
-void wxConsoleEventLoop::ProcessMessage(WXMSG *msg)
-{
-    ::DispatchMessage(msg);
-}
-
-bool wxConsoleEventLoop::Dispatch()
-{
-    MSG msg;
-    if ( !GetNextMessage(&msg) )
-        return false;
-
-    ProcessMessage(&msg);
-
-    return !m_shouldExit;
-}
-
-int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout)
-{
-    MSG msg;
-    int rc = GetNextMessageTimeout(&msg, timeout);
-    if ( rc != 1 )
-        return rc;
-
-    ProcessMessage(&msg);
-
-    return !m_shouldExit;
-}
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif //wxUSE_GUI
diff --git a/Source/3rd Party/wx/src/msw/fdrepdlg.cpp b/Source/3rd Party/wx/src/msw/fdrepdlg.cpp
index e37228a69..7e5d43c37 100644
--- a/Source/3rd Party/wx/src/msw/fdrepdlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/fdrepdlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Markus Greither and Vadim Zeitlin
 // Modified by:
 // Created:     23/03/2001
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fdrepdlg.cpp 46184 2007-05-23 23:40:12Z VZ $
 // Copyright:   (c) Markus Greither
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,6 +40,9 @@
 // functions prototypes
 // ----------------------------------------------------------------------------
 
+LRESULT CALLBACK wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
+                                         WPARAM wParam, LPARAM lParam);
+
 UINT_PTR CALLBACK wxFindReplaceDialogHookProc(HWND hwnd,
                                               UINT uiMsg,
                                               WPARAM wParam,
@@ -64,6 +67,10 @@ public:
     void InitFindWhat(const wxString& str);
     void InitReplaceWith(const wxString& str);
 
+    void SubclassDialog(HWND hwnd);
+
+    static UINT GetFindDialogMessage() { return ms_msgFindDialog; }
+
     // only for passing to ::FindText or ::ReplaceText
     FINDREPLACE *GetPtrFindReplace() { return &m_findReplace; }
 
@@ -72,15 +79,13 @@ public:
     bool WasClosedByUser() const { return m_wasClosedByUser; }
 
 private:
-    // called from window procedure for ms_msgFindDialog
-    static bool FindMessageHandler(wxWindow *win,
-                                   WXUINT nMsg,
-                                   WPARAM wParam,
-                                   LPARAM lParam);
-
-    // copy string str contents to ppStr and fill pLen with its length
     void InitString(const wxString& str, LPTSTR *ppStr, WORD *pLen);
 
+    // the owner of the dialog
+    HWND m_hwndOwner;
+
+    // the previous window proc of our owner
+    WNDPROC m_oldParentWndProc;
 
     // the find replace data used by the dialog
     FINDREPLACE m_findReplace;
@@ -91,7 +96,7 @@ private:
     // registered Message for Dialog
     static UINT ms_msgFindDialog;
 
-    wxDECLARE_NO_COPY_CLASS(wxFindReplaceDialogImpl);
+    DECLARE_NO_COPY_CLASS(wxFindReplaceDialogImpl)
 };
 
 UINT wxFindReplaceDialogImpl::ms_msgFindDialog = 0;
@@ -114,16 +119,13 @@ wxFindReplaceDialogImpl::wxFindReplaceDialogImpl(wxFindReplaceDialog *dialog,
 
         if ( !ms_msgFindDialog )
         {
-            wxLogLastError(wxT("RegisterWindowMessage(FINDMSGSTRING)"));
+            wxLogLastError(_T("RegisterWindowMessage(FINDMSGSTRING)"));
         }
-
-        wxWindow::MSWRegisterMessageHandler
-                  (
-                    ms_msgFindDialog,
-                    &wxFindReplaceDialogImpl::FindMessageHandler
-                  );
     }
 
+    m_hwndOwner = NULL;
+    m_oldParentWndProc = NULL;
+
     m_wasClosedByUser = false;
 
     wxZeroMemory(m_findReplace);
@@ -184,21 +186,40 @@ void wxFindReplaceDialogImpl::InitReplaceWith(const wxString& str)
                &m_findReplace.wReplaceWithLen);
 }
 
+void wxFindReplaceDialogImpl::SubclassDialog(HWND hwnd)
+{
+    m_hwndOwner = hwnd;
+
+    // check that we don't subclass the parent twice: this would be a bad idea
+    // as then we'd have infinite recursion in wxFindReplaceWindowProc
+    wxCHECK_RET( wxGetWindowProc(hwnd) != &wxFindReplaceWindowProc,
+                 _T("can't have more than one find dialog currently") );
+
+    // set the new one and save the old as user data to allow access to it
+    // from wxFindReplaceWindowProc
+    m_oldParentWndProc = wxSetWindowProc(hwnd, wxFindReplaceWindowProc);
+
+    wxSetWindowUserData(hwnd, (void *)m_oldParentWndProc);
+}
+
 wxFindReplaceDialogImpl::~wxFindReplaceDialogImpl()
 {
     delete [] m_findReplace.lpstrFindWhat;
     delete [] m_findReplace.lpstrReplaceWith;
+
+    if ( m_hwndOwner )
+    {
+        // undo subclassing
+        wxSetWindowProc(m_hwndOwner, m_oldParentWndProc);
+    }
 }
 
 // ----------------------------------------------------------------------------
-// handler for FINDMSGSTRING message
+// Window Proc for handling RegisterWindowMessage(FINDMSGSTRING)
 // ----------------------------------------------------------------------------
 
-bool
-wxFindReplaceDialogImpl::FindMessageHandler(wxWindow * WXUNUSED(win),
-                                            WXUINT WXUNUSED_UNLESS_DEBUG(nMsg),
-                                            WPARAM WXUNUSED(wParam),
-                                            LPARAM lParam)
+LRESULT CALLBACK wxFindReplaceWindowProc(HWND hwnd, WXUINT nMsg,
+                                         WPARAM wParam, LPARAM lParam)
 {
 #if wxUSE_UNICODE_MSLU
     static unsigned long s_lastMsgFlags = 0;
@@ -210,89 +231,100 @@ wxFindReplaceDialogImpl::FindMessageHandler(wxWindow * WXUNUSED(win),
     static bool s_blockMsg = false;
 #endif // wxUSE_UNICODE_MSLU
 
-    wxASSERT_MSG( nMsg == ms_msgFindDialog, wxT("unexpected message received") );
-
-    FINDREPLACE *pFR = (FINDREPLACE *)lParam;
+    if ( nMsg == wxFindReplaceDialogImpl::GetFindDialogMessage() )
+    {
+        FINDREPLACE *pFR = (FINDREPLACE *)lParam;
 
 #if wxUSE_UNICODE_MSLU
-    // This is a hack for a MSLU problem: Versions up to 1.0.4011
-    // of UNICOWS.DLL send the correct UNICODE item after button press
-    // and a bogus ANSI mode item right after this, so let's ignore
-    // the second bogus message
-    if ( wxUsingUnicowsDll() && s_lastMsgFlags == pFR->Flags )
-    {
+        // This is a hack for a MSLU problem: Versions up to 1.0.4011
+        // of UNICOWS.DLL send the correct UNICODE item after button press
+        // and a bogus ANSI mode item right after this, so lets ignore
+        // the second bogus message
+        if ( wxUsingUnicowsDll() && s_lastMsgFlags == pFR->Flags )
+        {
+            s_lastMsgFlags = 0;
+            return 0;
+        }
+        s_lastMsgFlags = pFR->Flags;
+#endif // wxUSE_UNICODE_MSLU
+
+        wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
+
+        // map flags from Windows
+        wxEventType evtType;
+
+        bool replace = false;
+        if ( pFR->Flags & FR_DIALOGTERM )
+        {
+            // we have to notify the dialog that it's being closed by user and
+            // not deleted programmatically as it behaves differently in these
+            // 2 cases
+            dialog->GetImpl()->SetClosedByUser();
+
+            evtType = wxEVT_COMMAND_FIND_CLOSE;
+        }
+        else if ( pFR->Flags & FR_FINDNEXT )
+        {
+            evtType = wxEVT_COMMAND_FIND_NEXT;
+        }
+        else if ( pFR->Flags & FR_REPLACE )
+        {
+            evtType = wxEVT_COMMAND_FIND_REPLACE;
+
+            replace = true;
+        }
+        else if ( pFR->Flags & FR_REPLACEALL )
+        {
+            evtType = wxEVT_COMMAND_FIND_REPLACE_ALL;
+
+            replace = true;
+        }
+        else
+        {
+            wxFAIL_MSG( _T("unknown find dialog event") );
+
+            return 0;
+        }
+
+        wxUint32 flags = 0;
+        if ( pFR->Flags & FR_DOWN )
+            flags |= wxFR_DOWN;
+        if ( pFR->Flags & FR_WHOLEWORD )
+            flags |= wxFR_WHOLEWORD;
+        if ( pFR->Flags & FR_MATCHCASE )
+            flags |= wxFR_MATCHCASE;
+
+        wxFindDialogEvent event(evtType, dialog->GetId());
+        event.SetEventObject(dialog);
+        event.SetFlags(flags);
+        event.SetFindString(pFR->lpstrFindWhat);
+        if ( replace )
+        {
+            event.SetReplaceString(pFR->lpstrReplaceWith);
+        }
+
+#if wxUSE_UNICODE_MSLU
+        s_blockMsg = true;
+#endif // wxUSE_UNICODE_MSLU
+
+        dialog->Send(event);
+
+#if wxUSE_UNICODE_MSLU
+        s_blockMsg = false;
+#endif // wxUSE_UNICODE_MSLU
+    }
+#if wxUSE_UNICODE_MSLU
+    else if ( !s_blockMsg )
         s_lastMsgFlags = 0;
-        return 0;
-    }
-    s_lastMsgFlags = pFR->Flags;
 #endif // wxUSE_UNICODE_MSLU
 
-    wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
+    WNDPROC wndProc = (WNDPROC)wxGetWindowUserData(hwnd);
 
-    // map flags from Windows
-    wxEventType evtType;
+    // sanity check
+    wxASSERT_MSG( wndProc != wxFindReplaceWindowProc,
+                  _T("infinite recursion detected") );
 
-    bool replace = false;
-    if ( pFR->Flags & FR_DIALOGTERM )
-    {
-        // we have to notify the dialog that it's being closed by user and
-        // not deleted programmatically as it behaves differently in these
-        // 2 cases
-        dialog->GetImpl()->SetClosedByUser();
-
-        evtType = wxEVT_COMMAND_FIND_CLOSE;
-    }
-    else if ( pFR->Flags & FR_FINDNEXT )
-    {
-        evtType = wxEVT_COMMAND_FIND_NEXT;
-    }
-    else if ( pFR->Flags & FR_REPLACE )
-    {
-        evtType = wxEVT_COMMAND_FIND_REPLACE;
-
-        replace = true;
-    }
-    else if ( pFR->Flags & FR_REPLACEALL )
-    {
-        evtType = wxEVT_COMMAND_FIND_REPLACE_ALL;
-
-        replace = true;
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("unknown find dialog event") );
-
-        return 0;
-    }
-
-    wxUint32 flags = 0;
-    if ( pFR->Flags & FR_DOWN )
-        flags |= wxFR_DOWN;
-    if ( pFR->Flags & FR_WHOLEWORD )
-        flags |= wxFR_WHOLEWORD;
-    if ( pFR->Flags & FR_MATCHCASE )
-        flags |= wxFR_MATCHCASE;
-
-    wxFindDialogEvent event(evtType, dialog->GetId());
-    event.SetEventObject(dialog);
-    event.SetFlags(flags);
-    event.SetFindString(pFR->lpstrFindWhat);
-    if ( replace )
-    {
-        event.SetReplaceString(pFR->lpstrReplaceWith);
-    }
-
-#if wxUSE_UNICODE_MSLU
-    s_blockMsg = true;
-#endif // wxUSE_UNICODE_MSLU
-
-    dialog->Send(event);
-
-#if wxUSE_UNICODE_MSLU
-    s_blockMsg = false;
-#endif // wxUSE_UNICODE_MSLU
-
-    return true;
+    return ::CallWindowProc(wndProc, hwnd, nMsg, wParam, lParam);
 }
 
 // ----------------------------------------------------------------------------
@@ -310,7 +342,7 @@ wxFindReplaceDialogHookProc(HWND hwnd,
         FINDREPLACE *pFR = (FINDREPLACE *)lParam;
         wxFindReplaceDialog *dialog = (wxFindReplaceDialog *)pFR->lCustData;
 
-        ::SetWindowText(hwnd, dialog->GetTitle().t_str());
+        ::SetWindowText(hwnd, dialog->GetTitle());
 
         // don't return FALSE from here or the dialog won't be shown
         return TRUE;
@@ -359,7 +391,7 @@ wxFindReplaceDialog::~wxFindReplaceDialog()
             // if it wasn't, delete the dialog ourselves
             if ( !::DestroyWindow(GetHwnd()) )
             {
-                wxLogLastError(wxT("DestroyWindow(find dialog)"));
+                wxLogLastError(_T("DestroyWindow(find dialog)"));
             }
         }
 
@@ -416,9 +448,9 @@ bool wxFindReplaceDialog::Show(bool show)
         return true;
     }
 
-    wxCHECK_MSG( m_FindReplaceData, false, wxT("call Create() first!") );
+    wxCHECK_MSG( m_FindReplaceData, false, _T("call Create() first!") );
 
-    wxASSERT_MSG( !m_impl, wxT("why don't we have the window then?") );
+    wxASSERT_MSG( !m_impl, _T("why don't we have the window then?") );
 
     m_impl = new wxFindReplaceDialogImpl(this, m_FindReplaceData->GetFlags());
 
@@ -443,14 +475,18 @@ bool wxFindReplaceDialog::Show(bool show)
         wxLogError(_("Failed to create the standard find/replace dialog (error code %d)"),
                    ::CommDlgExtendedError());
 
-        wxDELETE(m_impl);
+        delete m_impl;
+        m_impl = NULL;
 
         return false;
     }
 
+    // subclass parent window in order to get FINDMSGSTRING message
+    m_impl->SubclassDialog(GetHwndOf(m_parent));
+
     if ( !::ShowWindow(hwnd, SW_SHOW) )
     {
-        wxLogLastError(wxT("ShowWindow(find dialog)"));
+        wxLogLastError(_T("ShowWindow(find dialog)"));
     }
 
     m_hWnd = (WXHWND)hwnd;
diff --git a/Source/3rd Party/wx/src/msw/filedlg.cpp b/Source/3rd Party/wx/src/msw/filedlg.cpp
index cd039bc8c..e1b24aa88 100644
--- a/Source/3rd Party/wx/src/msw/filedlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/filedlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: filedlg.cpp 55642 2008-09-15 13:33:35Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,6 @@
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx.h".
-#undef WIN32_LEAN_AND_MEAN
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -41,12 +40,14 @@
     #include "wx/math.h"
 #endif
 
+#ifdef __WXMSW__
+#include <CdErr.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "wx/dynlib.h"
 #include "wx/filename.h"
-#include "wx/scopeguard.h"
 #include "wx/tokenzr.h"
 
 // ----------------------------------------------------------------------------
@@ -67,8 +68,7 @@
 // globals
 // ----------------------------------------------------------------------------
 
-// standard dialog size for the old Windows systems where the dialog wasn't
-// resizable
+// standard dialog size
 static wxRect gs_rectDialog(0, 0, 428, 266);
 
 // ============================================================================
@@ -77,78 +77,6 @@ static wxRect gs_rectDialog(0, 0, 428, 266);
 
 IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-#if wxUSE_DYNLIB_CLASS
-
-typedef BOOL (WINAPI *GetProcessUserModeExceptionPolicy_t)(LPDWORD);
-typedef BOOL (WINAPI *SetProcessUserModeExceptionPolicy_t)(DWORD);
-
-GetProcessUserModeExceptionPolicy_t gs_pfnGetProcessUserModeExceptionPolicy
-    = (GetProcessUserModeExceptionPolicy_t) -1;
-
-SetProcessUserModeExceptionPolicy_t gs_pfnSetProcessUserModeExceptionPolicy
-    = (SetProcessUserModeExceptionPolicy_t) -1;
-
-DWORD gs_oldExceptionPolicyFlags = 0;
-
-bool gs_changedPolicy = false;
-
-#endif // #if wxUSE_DYNLIB_CLASS
-
-/*
-Since Windows 7 by default (callback) exceptions aren't swallowed anymore
-with native x64 applications. Exceptions can occur in a file dialog when
-using the hook procedure in combination with third-party utilities.
-Since Windows 7 SP1 the swallowing of exceptions can be enabled again
-by using SetProcessUserModeExceptionPolicy.
-*/
-void ChangeExceptionPolicy()
-{
-#if wxUSE_DYNLIB_CLASS
-    gs_changedPolicy = false;
-
-    wxLoadedDLL dllKernel32(wxT("kernel32.dll"));
-
-    if ( gs_pfnGetProcessUserModeExceptionPolicy
-        == (GetProcessUserModeExceptionPolicy_t) -1)
-    {
-        wxDL_INIT_FUNC(gs_pfn, GetProcessUserModeExceptionPolicy, dllKernel32);
-        wxDL_INIT_FUNC(gs_pfn, SetProcessUserModeExceptionPolicy, dllKernel32);
-    }
-
-    if ( !gs_pfnGetProcessUserModeExceptionPolicy
-        || !gs_pfnSetProcessUserModeExceptionPolicy
-        || !gs_pfnGetProcessUserModeExceptionPolicy(&gs_oldExceptionPolicyFlags) )
-    {
-        return;
-    }
-
-    if ( gs_pfnSetProcessUserModeExceptionPolicy(gs_oldExceptionPolicyFlags
-        | 0x1 /* PROCESS_CALLBACK_FILTER_ENABLED */ ) )
-    {
-        gs_changedPolicy = true;
-    }
-
-#endif // wxUSE_DYNLIB_CLASS
-}
-
-void RestoreExceptionPolicy()
-{
-#if wxUSE_DYNLIB_CLASS
-    if (gs_changedPolicy)
-    {
-        gs_changedPolicy = false;
-        (void) gs_pfnSetProcessUserModeExceptionPolicy(gs_oldExceptionPolicyFlags);
-    }
-#endif // wxUSE_DYNLIB_CLASS
-}
-
-} // unnamed namespace
-
 // ----------------------------------------------------------------------------
 // hook function for moving the dialog
 // ----------------------------------------------------------------------------
@@ -161,24 +89,21 @@ wxFileDialogHookFunction(HWND      hDlg,
 {
     switch ( iMsg )
     {
-#ifndef __WXWINCE__
-        case WM_INITDIALOG:
-            {
-                OPENFILENAME* ofn = reinterpret_cast<OPENFILENAME *>(lParam);
-                reinterpret_cast<wxFileDialog *>(ofn->lCustData)
-                    ->MSWOnInitDialogHook((WXHWND)hDlg);
-            }
-            break;
-#endif // __WXWINCE__
-
         case WM_NOTIFY:
             {
-                OFNOTIFY *pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);
+                OFNOTIFY *pNotifyCode = wx_reinterpret_cast(OFNOTIFY *, lParam);
                 if ( pNotifyCode->hdr.code == CDN_INITDONE )
                 {
-                    reinterpret_cast<wxFileDialog *>(
-                                        pNotifyCode->lpOFN->lCustData)
-                        ->MSWOnInitDone((WXHWND)hDlg);
+                    // note that we need to move the parent window: hDlg is a
+                    // child of it when OFN_EXPLORER is used
+                    ::SetWindowPos
+                      (
+                        ::GetParent(hDlg),
+                        HWND_TOP,
+                        gs_rectDialog.x, gs_rectDialog.y,
+                        0, 0,
+                        SWP_NOZORDER | SWP_NOSIZE
+                      );
                  }
             }
             break;
@@ -217,22 +142,21 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     // NB: all style checks are done by wxFileDialogBase::Create
 
     m_bMovedWindow = false;
-    m_centreDir = 0;
 
     // Must set to zero, otherwise the wx routines won't size the window
     // the second time you call the file dialog, because it thinks it is
     // already at the requested size.. (when centering)
     gs_rectDialog.x =
     gs_rectDialog.y = 0;
-}
 
+}
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 {
     paths.Empty();
 
     wxString dir(m_dir);
-    if ( m_dir.empty() || m_dir.Last() != wxT('\\') )
-        dir += wxT('\\');
+    if ( m_dir.Last() != _T('\\') )
+        dir += _T('\\');
 
     size_t count = m_fileNames.GetCount();
     for ( size_t n = 0; n < count; n++ )
@@ -249,6 +173,14 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     files = m_fileNames;
 }
 
+void wxFileDialog::SetPath(const wxString& path)
+{
+    wxString ext;
+    wxSplitPath(path, &m_dir, &m_fileName, &ext);
+    if ( !ext.empty() )
+        m_fileName << _T('.') << ext;
+}
+
 void wxFileDialog::DoGetPosition(int *x, int *y) const
 {
     if ( x )
@@ -257,6 +189,7 @@ void wxFileDialog::DoGetPosition(int *x, int *y) const
         *y = gs_rectDialog.y;
 }
 
+
 void wxFileDialog::DoGetSize(int *width, int *height) const
 {
     if ( width )
@@ -267,70 +200,19 @@ void wxFileDialog::DoGetSize(int *width, int *height) const
 
 void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h))
 {
+    m_bMovedWindow = true;
+
     gs_rectDialog.x = x;
     gs_rectDialog.y = y;
 
-    // our HWND is only set when we're called from MSWOnInitDone(), test if
-    // this is the case
-    HWND hwnd = GetHwnd();
-    if ( hwnd )
-    {
-        // size of the dialog can't be changed because the controls are not
-        // laid out correctly then
-       ::SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
-    }
-    else // just remember that we were requested to move the window
-    {
-        m_bMovedWindow = true;
-
-        // if Centre() had been called before, it shouldn't be taken into
-        // account now
-        m_centreDir = 0;
-    }
+    // size of the dialog can't be changed because the controls are not laid
+    // out correctly then
 }
 
-void wxFileDialog::DoCentre(int dir)
-{
-    m_centreDir = dir;
-    m_bMovedWindow = true;
-
-    // it's unnecessary to do anything else at this stage as we'll redo it in
-    // MSWOnInitDone() anyhow
-}
-
-void wxFileDialog::MSWOnInitDone(WXHWND hDlg)
-{
-    // note the dialog is the parent window: hDlg is a child of it when
-    // OFN_EXPLORER is used
-    HWND hFileDlg = ::GetParent((HWND)hDlg);
-
-    // set HWND so that our DoMoveWindow() works correctly
-    SetHWND((WXHWND)hFileDlg);
-
-    if ( m_centreDir )
-    {
-        // now we have the real dialog size, remember it
-        RECT rect;
-        GetWindowRect(hFileDlg, &rect);
-        gs_rectDialog = wxRectFromRECT(rect);
-
-        // and position the window correctly: notice that we must use the base
-        // class version as our own doesn't do anything except setting flags
-        wxFileDialogBase::DoCentre(m_centreDir);
-    }
-    else // need to just move it to the correct place
-    {
-        SetPosition(gs_rectDialog.GetPosition());
-    }
-
-    // we shouldn't destroy this HWND
-    SetHWND(NULL);
-}
-
-// helper used below in ShowCommFileDialog(): style is used to determine
-// whether to show the "Save file" dialog (if it contains wxFD_SAVE bit) or
-// "Open file" one; returns true on success or false on failure in which case
-// err is filled with the CDERR_XXX constant
+// helper used below in ShowModal(): style is used to determine whether to show
+// the "Save file" dialog (if it contains wxFD_SAVE bit) or "Open file" one;
+// returns true on success or false on failure in which case err is filled with
+// the CDERR_XXX constant
 static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
 {
     if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) )
@@ -385,69 +267,6 @@ static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
     static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE;
 #endif // __WXWINCE__ || __WIN64__/!...
 
-static bool ShowCommFileDialog(OPENFILENAME *of, long style)
-{
-    DWORD errCode;
-    bool success = DoShowCommFileDialog(of, style, &errCode);
-
-#ifdef wxTRY_SMALLER_OPENFILENAME
-    // the system might be too old to support the new version file dialog
-    // boxes, try with the old size
-    if ( !success && errCode == CDERR_STRUCTSIZE &&
-            of->lStructSize != wxOPENFILENAME_V4_SIZE )
-    {
-        of->lStructSize = wxOPENFILENAME_V4_SIZE;
-
-        success = DoShowCommFileDialog(of, style, &errCode);
-
-        if ( success || !errCode )
-        {
-            // use this struct size for subsequent dialogs
-            gs_ofStructSize = of->lStructSize;
-        }
-    }
-#endif // wxTRY_SMALLER_OPENFILENAME
-
-    if ( !success &&
-            // FNERR_INVALIDFILENAME is not defined under CE (besides we don't
-            // use CommDlgExtendedError() there anyhow)
-#ifndef __WXWINCE__
-            errCode == FNERR_INVALIDFILENAME &&
-#endif // !__WXWINCE__
-                of->lpstrFile[0] )
-    {
-        // this can happen if the default file name is invalid, try without it
-        // now
-        of->lpstrFile[0] = wxT('\0');
-        success = DoShowCommFileDialog(of, style, &errCode);
-    }
-
-    if ( !success )
-    {
-        // common dialog failed - why?
-        if ( errCode != 0 )
-        {
-            wxLogError(_("File dialog failed with error code %0lx."), errCode);
-        }
-        //else: it was just cancelled
-
-        return false;
-    }
-
-    return true;
-}
-
-#ifndef __WXWINCE__
-void wxFileDialog::MSWOnInitDialogHook(WXHWND hwnd)
-{
-   SetHWND(hwnd);
-
-   CreateExtraControl();
-
-   SetHWND(NULL);
-}
-#endif // __WXWINCE__
-
 int wxFileDialog::ShowModal()
 {
     HWND hWnd = 0;
@@ -461,7 +280,13 @@ int wxFileDialog::ShowModal()
     *fileNameBuffer = wxT('\0');
     *titleBuffer    = wxT('\0');
 
+#if WXWIN_COMPATIBILITY_2_4
+    long msw_flags = 0;
+    if ( HasFdFlag(wxHIDE_READONLY) || HasFdFlag(wxFD_SAVE) )
+        msw_flags |= OFN_HIDEREADONLY;
+#else
     long msw_flags = OFN_HIDEREADONLY;
+#endif
 
     if ( HasFdFlag(wxFD_FILE_MUST_EXIST) )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
@@ -473,17 +298,14 @@ int wxFileDialog::ShowModal()
         in the upper left of the frame, it does not center
         automatically.
     */
-    if (m_bMovedWindow || HasExtraControlCreator()) // we need these flags.
+    if (m_bMovedWindow) // we need these flags.
     {
-        ChangeExceptionPolicy();
         msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK;
 #ifndef __WXWINCE__
         msw_flags |= OFN_ENABLESIZING;
 #endif
     }
 
-    wxON_BLOCK_EXIT0(RestoreExceptionPolicy);
-
     if ( HasFdFlag(wxFD_MULTIPLE) )
     {
         // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
@@ -508,40 +330,10 @@ int wxFileDialog::ShowModal()
 
     of.lStructSize       = gs_ofStructSize;
     of.hwndOwner         = hWnd;
-    of.lpstrTitle        = m_message.t_str();
+    of.lpstrTitle        = WXSTRINGCAST m_message;
     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;
 
-#ifndef __WXWINCE__
-    GlobalPtr hgbl;
-    if ( HasExtraControlCreator() )
-    {
-        msw_flags |= OFN_ENABLETEMPLATEHANDLE;
-
-        hgbl.Init(256, GMEM_ZEROINIT);
-        GlobalPtrLock hgblLock(hgbl);
-        LPDLGTEMPLATE lpdt = static_cast<LPDLGTEMPLATE>(hgblLock.Get());
-
-        // Define a dialog box.
-
-        lpdt->style = DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS;
-        lpdt->cdit = 0;         // Number of controls
-        lpdt->x = 0;
-        lpdt->y = 0;
-
-        // convert the size of the extra controls to the dialog units
-        const wxSize extraSize = GetExtraControlSize();
-        const LONG baseUnits = ::GetDialogBaseUnits();
-        lpdt->cx = ::MulDiv(extraSize.x, 4, LOWORD(baseUnits));
-        lpdt->cy = ::MulDiv(extraSize.y, 8, HIWORD(baseUnits));
-
-        // after the DLGTEMPLATE there are 3 additional WORDs for dialog menu,
-        // class and title, all three set to zeros.
-
-        of.hInstance = (HINSTANCE)lpdt;
-    }
-#endif // __WXWINCE__
-
     // Convert forward slashes to backslashes (file selector doesn't like
     // forward slashes) and also squeeze multiple consecutive slashes into one
     // as it doesn't like two backslashes in a row neither
@@ -554,17 +346,17 @@ int wxFileDialog::ShowModal()
         wxChar ch = m_dir[i];
         switch ( ch )
         {
-            case wxT('/'):
+            case _T('/'):
                 // convert to backslash
-                ch = wxT('\\');
+                ch = _T('\\');
 
                 // fall through
 
-            case wxT('\\'):
+            case _T('\\'):
                 while ( i < len - 1 )
                 {
                     wxChar chNext = m_dir[i + 1];
-                    if ( chNext != wxT('\\') && chNext != wxT('/') )
+                    if ( chNext != _T('\\') && chNext != _T('/') )
                         break;
 
                     // ignore the next one, unless it is at the start of a UNC path
@@ -585,13 +377,12 @@ int wxFileDialog::ShowModal()
 
     of.Flags             = msw_flags;
     of.lpfnHook          = wxFileDialogHookFunction;
-    of.lCustData         = (LPARAM)this;
 
     wxArrayString wildDescriptions, wildFilters;
 
     size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters);
 
-    wxASSERT_MSG( items > 0 , wxT("empty wildcard list") );
+    wxASSERT_MSG( items > 0 , _T("empty wildcard list") );
 
     wxString filterBuffer;
 
@@ -610,12 +401,13 @@ int wxFileDialog::ShowModal()
         }
     }
 
-    of.lpstrFilter  = filterBuffer.t_str();
+    of.lpstrFilter  = (LPTSTR)filterBuffer.c_str();
     of.nFilterIndex = m_filterIndex + 1;
 
     //=== Setting defaultFileName >>=========================================
 
-    wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer));
+    wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, wxMAXPATH-1 );
+    fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0');
 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
     of.nMaxFile  = wxMAXPATH;
@@ -627,7 +419,7 @@ int wxFileDialog::ShowModal()
     wxString defextBuffer; // we need it to be alive until GetSaveFileName()!
     if (HasFdFlag(wxFD_SAVE))
     {
-        const wxChar* extension = filterBuffer.t_str();
+        const wxChar* extension = filterBuffer;
         int maxFilter = (int)(of.nFilterIndex*2L) - 1;
 
         for( int i = 0; i < maxFilter; i++ )           // get extension
@@ -647,85 +439,133 @@ int wxFileDialog::ShowModal()
 
     //== Execute FileDialog >>=================================================
 
-    if ( !ShowCommFileDialog(&of, m_windowStyle) )
-        return wxID_CANCEL;
+    DWORD errCode;
+    bool success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
 
-    // GetOpenFileName will always change the current working directory on
-    // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag
-    // OFN_NOCHANGEDIR has no effect.  If the user did not specify
-    // wxFD_CHANGE_DIR let's restore the current working directory to what it
-    // was before the dialog was shown.
-    if ( msw_flags & OFN_NOCHANGEDIR )
+    if ( !success &&
+            // FNERR_INVALIDFILENAME is not defined under CE (besides we don't
+            // use CommDlgExtendedError() there anyhow)
+#ifndef __WXWINCE__
+            errCode == FNERR_INVALIDFILENAME &&
+#endif // !__WXWINCE__
+                of.lpstrFile[0] )
     {
-        wxSetWorkingDirectory(cwdOrig);
+        // this can happen if the default file name is invalid, try without it now
+        of.lpstrFile[0] = _T('\0');
+        success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
     }
 
-    m_fileNames.Empty();
-
-    if ( ( HasFdFlag(wxFD_MULTIPLE) ) &&
-#if defined(OFN_EXPLORER)
-         ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') )
-#else
-         ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') )
-#endif // OFN_EXPLORER
-       )
+#ifdef wxTRY_SMALLER_OPENFILENAME
+    // the system might be too old to support the new version file dialog
+    // boxes, try with the old size
+    if ( !success && errCode == CDERR_STRUCTSIZE &&
+            of.lStructSize != wxOPENFILENAME_V4_SIZE )
     {
-#if defined(OFN_EXPLORER)
-        m_dir = fileNameBuffer;
-        i = of.nFileOffset;
-        m_fileName = &fileNameBuffer[i];
-        m_fileNames.Add(m_fileName);
-        i += m_fileName.length() + 1;
+        of.lStructSize = wxOPENFILENAME_V4_SIZE;
 
-        while (fileNameBuffer[i] != wxT('\0'))
+        success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
+
+        if ( success || !errCode )
         {
-            m_fileNames.Add(&fileNameBuffer[i]);
-            i += wxStrlen(&fileNameBuffer[i]) + 1;
+            // use this struct size for subsequent dialogs
+            gs_ofStructSize = of.lStructSize;
         }
-#else
-        wxStringTokenizer toke(fileNameBuffer, wxT(" \t\r\n"));
-        m_dir = toke.GetNextToken();
-        m_fileName = toke.GetNextToken();
-        m_fileNames.Add(m_fileName);
+    }
+#endif // wxTRY_SMALLER_OPENFILENAME
 
-        while (toke.HasMoreTokens())
-            m_fileNames.Add(toke.GetNextToken());
+    if ( success )
+    {
+        // GetOpenFileName will always change the current working directory on
+        // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag
+        // OFN_NOCHANGEDIR has no effect.  If the user did not specify
+        // wxFD_CHANGE_DIR let's restore the current working directory to what it
+        // was before the dialog was shown.
+        if ( msw_flags & OFN_NOCHANGEDIR )
+        {
+            wxSetWorkingDirectory(cwdOrig);
+        }
+
+        m_fileNames.Empty();
+
+        if ( ( HasFdFlag(wxFD_MULTIPLE) ) &&
+#if defined(OFN_EXPLORER)
+             ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') )
+#else
+             ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') )
+#endif // OFN_EXPLORER
+           )
+        {
+#if defined(OFN_EXPLORER)
+            m_dir = fileNameBuffer;
+            i = of.nFileOffset;
+            m_fileName = &fileNameBuffer[i];
+            m_fileNames.Add(m_fileName);
+            i += m_fileName.length() + 1;
+
+            while (fileNameBuffer[i] != wxT('\0'))
+            {
+                m_fileNames.Add(&fileNameBuffer[i]);
+                i += wxStrlen(&fileNameBuffer[i]) + 1;
+            }
+#else
+            wxStringTokenizer toke(fileNameBuffer, _T(" \t\r\n"));
+            m_dir = toke.GetNextToken();
+            m_fileName = toke.GetNextToken();
+            m_fileNames.Add(m_fileName);
+
+            while (toke.HasMoreTokens())
+                m_fileNames.Add(toke.GetNextToken());
 #endif // OFN_EXPLORER
 
-        wxString dir(m_dir);
-        if ( m_dir.Last() != wxT('\\') )
-            dir += wxT('\\');
+            wxString dir(m_dir);
+            if ( m_dir.Last() != _T('\\') )
+                dir += _T('\\');
 
-        m_path = dir + m_fileName;
-        m_filterIndex = (int)of.nFilterIndex - 1;
+            m_path = dir + m_fileName;
+            m_filterIndex = (int)of.nFilterIndex - 1;
+        }
+        else
+        {
+            //=== Adding the correct extension >>=================================
+
+            m_filterIndex = (int)of.nFilterIndex - 1;
+
+            if ( !of.nFileExtension ||
+                 (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) )
+            {
+                // User has typed a filename without an extension:
+                const wxChar* extension = filterBuffer;
+                int   maxFilter = (int)(of.nFilterIndex*2L) - 1;
+
+                for( int i = 0; i < maxFilter; i++ )           // get extension
+                    extension = extension + wxStrlen( extension ) + 1;
+
+                m_fileName = AppendExtension(fileNameBuffer, extension);
+                wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.length(), wxMAXPATH-1));
+                fileNameBuffer[wxMin(m_fileName.length(), wxMAXPATH-1)] = wxT('\0');
+            }
+
+            m_path = fileNameBuffer;
+            m_fileName = wxFileNameFromPath(fileNameBuffer);
+            m_fileNames.Add(m_fileName);
+            m_dir = wxPathOnly(fileNameBuffer);
+        }
     }
+#ifdef __WXDEBUG__
     else
     {
-        //=== Adding the correct extension >>=================================
-
-        m_filterIndex = (int)of.nFilterIndex - 1;
-
-        if ( !of.nFileExtension ||
-             (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) )
+        // common dialog failed - why?
+        if ( errCode != 0 )
         {
-            // User has typed a filename without an extension:
-            const wxChar* extension = filterBuffer.t_str();
-            int   maxFilter = (int)(of.nFilterIndex*2L) - 1;
-
-            for( int i = 0; i < maxFilter; i++ )           // get extension
-                extension = extension + wxStrlen( extension ) + 1;
-
-            m_fileName = AppendExtension(fileNameBuffer, extension);
-            wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer));
+            // this msg is only for developers so don't translate it
+            wxLogError(wxT("Common dialog failed with error code %0lx."),
+                       errCode);
         }
+        //else: it was just cancelled
+    }
+#endif // __WXDEBUG__
 
-        m_path = fileNameBuffer;
-        m_fileName = wxFileNameFromPath(fileNameBuffer);
-        m_fileNames.Add(m_fileName);
-        m_dir = wxPathOnly(fileNameBuffer);
-        }
-
-    return wxID_OK;
+    return success ? wxID_OK : wxID_CANCEL;
 
 }
 
diff --git a/Source/3rd Party/wx/src/msw/font.cpp b/Source/3rd Party/wx/src/msw/font.cpp
index 4f6e96e82..208499a89 100644
--- a/Source/3rd Party/wx/src/msw/font.cpp	
+++ b/Source/3rd Party/wx/src/msw/font.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: font.cpp 48064 2007-08-14 08:51:44Z JS $
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,10 +31,11 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/log.h"
-    #include "wx/msw/private.h"
+    #include "wx/encinfo.h"
 #endif // WX_PRECOMP
 
-#include "wx/encinfo.h"
+#include "wx/msw/private.h"
+
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 
@@ -42,9 +43,54 @@
     #include "wx/sysopt.h"
 #endif
 
-#include "wx/scopeguard.h"
 #include "wx/tokenzr.h"
 
+#if wxUSE_EXTENDED_RTTI
+
+wxBEGIN_ENUM( wxFontFamily )
+    wxENUM_MEMBER( wxDEFAULT )
+    wxENUM_MEMBER( wxDECORATIVE )
+    wxENUM_MEMBER( wxROMAN )
+    wxENUM_MEMBER( wxSCRIPT )
+    wxENUM_MEMBER( wxSWISS )
+    wxENUM_MEMBER( wxMODERN )
+    wxENUM_MEMBER( wxTELETYPE )
+wxEND_ENUM( wxFontFamily )
+
+wxBEGIN_ENUM( wxFontStyle )
+    wxENUM_MEMBER( wxNORMAL )
+    wxENUM_MEMBER( wxITALIC )
+    wxENUM_MEMBER( wxSLANT )
+wxEND_ENUM( wxFontStyle )
+
+wxBEGIN_ENUM( wxFontWeight )
+    wxENUM_MEMBER( wxNORMAL )
+    wxENUM_MEMBER( wxLIGHT )
+    wxENUM_MEMBER( wxBOLD )
+wxEND_ENUM( wxFontWeight )
+
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI(wxFont, wxGDIObject,"wx/font.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxFont)
+    wxPROPERTY( Size,int, SetPointSize, GetPointSize, 12 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Family, int  , SetFamily, GetFamily, (int)wxDEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontFamily
+    wxPROPERTY( Style, int , SetStyle, GetStyle, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontStyle
+    wxPROPERTY( Weight, int , SetWeight, GetWeight, (int)wxNORMAL , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // wxFontWeight
+    wxPROPERTY( Underlined, bool , SetUnderlined, GetUnderlined, false , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Face, wxString , SetFaceName, GetFaceName, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Encoding, wxFontEncoding , SetEncoding, GetEncoding, wxFONTENCODING_DEFAULT , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxCONSTRUCTOR_6( wxFont , int , Size , int , Family , int , Style , int , Weight , bool , Underlined , wxString , Face )
+
+wxBEGIN_HANDLERS_TABLE(wxFont)
+wxEND_HANDLERS_TABLE()
+
+#else
+    IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+#endif
+
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -63,23 +109,22 @@ public:
     wxFontRefData()
     {
         Init(-1, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
-             wxFONTWEIGHT_NORMAL, false, false, wxEmptyString,
+             wxFONTWEIGHT_NORMAL, false, wxEmptyString,
              wxFONTENCODING_DEFAULT);
     }
 
     wxFontRefData(int size,
                   const wxSize& pixelSize,
                   bool sizeUsingPixels,
-                  wxFontFamily family,
-                  wxFontStyle style,
-                  wxFontWeight weight,
+                  int family,
+                  int style,
+                  int weight,
                   bool underlined,
-                  bool strikethrough,
                   const wxString& faceName,
                   wxFontEncoding encoding)
     {
         Init(size, pixelSize, sizeUsingPixels, family, style, weight,
-             underlined, strikethrough, faceName, encoding);
+             underlined, faceName, encoding);
     }
 
     wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)
@@ -89,248 +134,195 @@ public:
 
     wxFontRefData(const wxFontRefData& data) : wxGDIRefData()
     {
-        Init(data.m_nativeFontInfo);
+        if ( data.m_nativeFontInfoOk )
+        {
+            Init(data.m_nativeFontInfo);
+        }
+        else
+        {
+            Init(data.m_pointSize, data.m_pixelSize, data.m_sizeUsingPixels,
+                 data.m_family, data.m_style, data.m_weight,
+                 data.m_underlined, data.m_faceName, data.m_encoding);
+        }
     }
 
     virtual ~wxFontRefData();
 
     // operations
-    bool Alloc();
+    bool Alloc(wxFont *font);
 
     void Free();
 
     // all wxFont accessors
     int GetPointSize() const
     {
-        return m_nativeFontInfo.GetPointSize();
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetPointSize()
+                                  : m_pointSize;
     }
 
     wxSize GetPixelSize() const
     {
-        return m_nativeFontInfo.GetPixelSize();
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetPixelSize()
+                                  : m_pixelSize;
     }
 
     bool IsUsingSizeInPixels() const
     {
-        return m_sizeUsingPixels;
+        return m_nativeFontInfoOk ? true : m_sizeUsingPixels;
     }
 
-    wxFontFamily GetFamily() const
+    int GetFamily() const
     {
-        return m_nativeFontInfo.GetFamily();
+        return m_family;
     }
 
-    wxFontStyle GetStyle() const
+    int GetStyle() const
     {
-        return m_nativeFontInfo.GetStyle();
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetStyle()
+                                  : m_style;
     }
 
-    wxFontWeight GetWeight() const
+    int GetWeight() const
     {
-        return m_nativeFontInfo.GetWeight();
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetWeight()
+                                  : m_weight;
     }
 
     bool GetUnderlined() const
     {
-        return m_nativeFontInfo.GetUnderlined();
-    }
-
-    bool GetStrikethrough() const
-    {
-        return m_nativeFontInfo.GetStrikethrough();
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetUnderlined()
+                                  : m_underlined;
     }
 
     wxString GetFaceName() const
     {
-        wxString facename = m_nativeFontInfo.GetFaceName();
-        if ( facename.empty() )
-        {
-            facename = GetMSWFaceName();
-            if ( !facename.empty() )
-            {
-                // cache the face name, it shouldn't change unless the family
-                // does and wxNativeFontInfo::SetFamily() resets the face name
-                const_cast<wxFontRefData *>(this)->SetFaceName(facename);
-            }
-        }
+        wxString s;
+        if ( m_nativeFontInfoOk )
+            s = m_nativeFontInfo.GetFaceName();
+        else
+            s = m_faceName;
 
-        return facename;
+        return s;
     }
 
     wxFontEncoding GetEncoding() const
     {
-        return m_nativeFontInfo.GetEncoding();
+        return m_nativeFontInfoOk ? m_nativeFontInfo.GetEncoding()
+                                  : m_encoding;
     }
 
-    WXHFONT GetHFONT() const
-    {
-        AllocIfNeeded();
+    WXHFONT GetHFONT() const { return m_hFont; }
 
-        return (WXHFONT)m_hFont;
-    }
-
-    bool HasHFONT() const
-    {
-        return m_hFont != 0;
-    }
-
-    // ... and setters: notice that all of them invalidate the currently
-    // allocated HFONT, if any, so that the next call to GetHFONT() recreates a
-    // new one
+    // ... and setters
     void SetPointSize(int pointSize)
     {
-        Free();
-
-        m_nativeFontInfo.SetPointSize(pointSize);
-        m_sizeUsingPixels = false;
+        if ( m_nativeFontInfoOk )
+        {
+            m_nativeFontInfo.SetPointSize(pointSize);
+        }
+        else
+        {
+            m_pointSize = pointSize;
+            m_sizeUsingPixels = false;
+        }
     }
 
     void SetPixelSize(const wxSize& pixelSize)
     {
-        wxCHECK_RET( pixelSize.GetWidth() >= 0, "negative font width" );
-        wxCHECK_RET( pixelSize.GetHeight() != 0, "zero font height" );
-
-        Free();
-
-        m_nativeFontInfo.SetPixelSize(pixelSize);
-        m_sizeUsingPixels = true;
+        if ( m_nativeFontInfoOk )
+        {
+            m_nativeFontInfo.SetPixelSize(pixelSize);
+        }
+        else
+        {
+            m_pixelSize = pixelSize;
+            m_sizeUsingPixels = true;
+        }
     }
 
-    void SetFamily(wxFontFamily family)
+    void SetFamily(int family)
     {
-        Free();
-
-        m_nativeFontInfo.SetFamily(family);
+        m_family = family;
     }
 
-    void SetStyle(wxFontStyle style)
+    void SetStyle(int style)
     {
-        Free();
-
-        m_nativeFontInfo.SetStyle(style);
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetStyle((wxFontStyle)style);
+        else
+            m_style = style;
     }
 
-    void SetWeight(wxFontWeight weight)
+    void SetWeight(int weight)
     {
-        Free();
-
-        m_nativeFontInfo.SetWeight(weight);
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetWeight((wxFontWeight)weight);
+        else
+            m_weight = weight;
     }
 
     bool SetFaceName(const wxString& faceName)
     {
-        Free();
+        if ( m_nativeFontInfoOk )
+            return m_nativeFontInfo.SetFaceName(faceName);
 
-        return m_nativeFontInfo.SetFaceName(faceName);
+        m_faceName = faceName;
+        return true;
     }
 
     void SetUnderlined(bool underlined)
     {
-        Free();
-
-        m_nativeFontInfo.SetUnderlined(underlined);
-    }
-
-    void SetStrikethrough(bool strikethrough)
-    {
-        Free();
-
-        m_nativeFontInfo.SetStrikethrough(strikethrough);
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetUnderlined(underlined);
+        else
+            m_underlined = underlined;
     }
 
     void SetEncoding(wxFontEncoding encoding)
     {
-        Free();
-
-        m_nativeFontInfo.SetEncoding(encoding);
+        if ( m_nativeFontInfoOk )
+            m_nativeFontInfo.SetEncoding(encoding);
+        else
+            m_encoding = encoding;
     }
 
+    // native font info tests
+    bool HasNativeFontInfo() const { return m_nativeFontInfoOk; }
+
     const wxNativeFontInfo& GetNativeFontInfo() const
-    {
-        // we need to create the font now to get the corresponding LOGFONT if
-        // it hadn't been done yet
-        AllocIfNeeded();
-
-        // ensure that we have a valid face name in our font information:
-        // GetFaceName() will try to retrieve it from our HFONT and save it if
-        // it was successful
-        (void)GetFaceName();
-
-        return m_nativeFontInfo;
-    }
-
-    void SetNativeFontInfo(const wxNativeFontInfo& nativeFontInfo)
-    {
-        Free();
-
-        m_nativeFontInfo = nativeFontInfo;
-    }
+        { return m_nativeFontInfo; }
 
 protected:
     // common part of all ctors
     void Init(int size,
               const wxSize& pixelSize,
               bool sizeUsingPixels,
-              wxFontFamily family,
-              wxFontStyle style,
-              wxFontWeight weight,
+              int family,
+              int style,
+              int weight,
               bool underlined,
-              bool strikethrough,
               const wxString& faceName,
               wxFontEncoding encoding);
 
     void Init(const wxNativeFontInfo& info, WXHFONT hFont = 0);
 
-    void AllocIfNeeded() const
-    {
-        if ( !m_hFont )
-            const_cast<wxFontRefData *>(this)->Alloc();
-    }
+    // font characterstics
+    int           m_pointSize;
+    wxSize        m_pixelSize;
+    bool          m_sizeUsingPixels;
+    int           m_family;
+    int           m_style;
+    int           m_weight;
+    bool          m_underlined;
+    wxString      m_faceName;
+    wxFontEncoding m_encoding;
 
-    // retrieve the face name really being used by the font: this is used to
-    // get the face name selected by the system when we don't specify it (but
-    // use just the family for example)
-    wxString GetMSWFaceName() const
-    {
-        ScreenHDC hdc;
-        SelectInHDC selectFont(hdc, (HFONT)GetHFONT());
-
-        UINT otmSize = GetOutlineTextMetrics(hdc, 0, NULL);
-        if ( !otmSize )
-        {
-            wxLogLastError("GetOutlineTextMetrics(NULL)");
-            return wxString();
-        }
-
-        OUTLINETEXTMETRIC * const
-            otm = static_cast<OUTLINETEXTMETRIC *>(malloc(otmSize));
-        wxON_BLOCK_EXIT1( free, otm );
-
-        otm->otmSize = otmSize;
-        if ( !GetOutlineTextMetrics(hdc, otmSize, otm) )
-        {
-            wxLogLastError("GetOutlineTextMetrics()");
-            return wxString();
-        }
-
-        // in spite of its type, the otmpFamilyName field of OUTLINETEXTMETRIC
-        // gives an offset in _bytes_ of the face (not family!) name from the
-        // struct start while the name itself is an array of TCHARs
-        //
-        // FWIW otmpFaceName contains the same thing as otmpFamilyName followed
-        // by a possible " Italic" or " Bold" or something else suffix
-        return reinterpret_cast<wxChar *>(otm) +
-                    wxPtrToUInt(otm->otmpFamilyName)/sizeof(wxChar);
-    }
-
-    // are we using m_nativeFontInfo.lf.lfHeight for point size or pixel size?
-    bool             m_sizeUsingPixels;
-
-    // Windows font handle, created on demand in GetHFONT()
-    HFONT            m_hFont;
+    // Windows font handle
+    WXHFONT       m_hFont;
 
     // Native font info
     wxNativeFontInfo m_nativeFontInfo;
+    bool             m_nativeFontInfoOk;
 };
 
 #define M_FONTDATA ((wxFontRefData*)m_refData)
@@ -346,35 +338,27 @@ protected:
 void wxFontRefData::Init(int pointSize,
                          const wxSize& pixelSize,
                          bool sizeUsingPixels,
-                         wxFontFamily family,
-                         wxFontStyle style,
-                         wxFontWeight weight,
+                         int family,
+                         int style,
+                         int weight,
                          bool underlined,
-                         bool strikethrough,
                          const wxString& faceName,
                          wxFontEncoding encoding)
 {
-    m_hFont = NULL;
-
+    m_style = style;
+    m_pointSize = pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize;
+    m_pixelSize = pixelSize;
     m_sizeUsingPixels = sizeUsingPixels;
-    if ( m_sizeUsingPixels )
-        SetPixelSize(pixelSize);
-    else
-        SetPointSize(pointSize);
+    m_family = family;
+    m_style = style;
+    m_weight = weight;
+    m_underlined = underlined;
+    m_faceName = faceName;
+    m_encoding = encoding;
 
-    SetStyle(style);
-    SetWeight(weight);
-    SetUnderlined(underlined);
-    SetStrikethrough(strikethrough);
+    m_hFont = 0;
 
-    // set the family/facename
-    SetFamily(family);
-    if ( !faceName.empty() )
-        SetFaceName(faceName);
-
-    // deal with encoding now (it may override the font family and facename
-    // so do it after setting them)
-    SetEncoding(encoding);
+    m_nativeFontInfoOk = false;
 }
 
 void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
@@ -383,10 +367,13 @@ void wxFontRefData::Init(const wxNativeFontInfo& info, WXHFONT hFont)
     // use the exact font created in the underlying system
     // (for example where we can't guarantee conversion from HFONT
     // to LOGFONT back to HFONT)
-    m_hFont = (HFONT)hFont;
-    m_nativeFontInfo = info;
+    m_hFont = hFont;
 
-    // TODO: m_sizeUsingPixels?
+    m_nativeFontInfoOk = true;
+    m_nativeFontInfo = info;
+    // This is the best we can do since we don't have the
+    // correct information at this point.
+    m_family = wxSWISS;
 }
 
 wxFontRefData::~wxFontRefData()
@@ -394,15 +381,22 @@ wxFontRefData::~wxFontRefData()
     Free();
 }
 
-bool wxFontRefData::Alloc()
+bool wxFontRefData::Alloc(wxFont *font)
 {
-    m_hFont = ::CreateFontIndirect(&m_nativeFontInfo.lf);
-    if ( !m_hFont )
+    if ( !m_nativeFontInfoOk )
+    {
+        wxFillLogFont(&m_nativeFontInfo.lf, font);
+        m_nativeFontInfoOk = true;
+    }
+
+    HFONT hfont = ::CreateFontIndirect(&m_nativeFontInfo.lf);
+    if ( !hfont )
     {
         wxLogLastError(wxT("CreateFont"));
         return false;
     }
 
+    m_hFont = (WXHFONT)hfont;
     return true;
 }
 
@@ -410,7 +404,7 @@ void wxFontRefData::Free()
 {
     if ( m_hFont )
     {
-        if ( !::DeleteObject(m_hFont) )
+        if ( !::DeleteObject((HFONT) m_hFont) )
         {
             wxLogLastError(wxT("DeleteObject(font)"));
         }
@@ -434,7 +428,7 @@ void wxNativeFontInfo::Init()
 #ifdef __WXWINCE__
     lf.lfQuality = CLEARTYPE_QUALITY;
 #else
-    lf.lfQuality = wxSystemOptions::GetOptionInt("msw.font.no-proof-quality")
+    lf.lfQuality = wxSystemOptions::GetOptionInt(_T("msw.font.no-proof-quality"))
                     ? DEFAULT_QUALITY
                     : PROOF_QUALITY;
 #endif
@@ -446,14 +440,13 @@ int wxNativeFontInfo::GetPointSize() const
     //        for printing!
     const int ppInch = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
 
-    // BC++ 2007 doesn't provide abs(long) overload, hence the cast
-    return (int) (((72.0*abs((int)lf.lfHeight)) / (double) ppInch) + 0.5);
+    return (int) (((72.0*(double)abs((int) lf.lfHeight)) / (double) ppInch) + 0.5);
 }
 
 wxSize wxNativeFontInfo::GetPixelSize() const
 {
     wxSize ret;
-    ret.SetHeight(abs((int)lf.lfHeight));
+    ret.SetHeight(lf.lfHeight);
     ret.SetWidth(lf.lfWidth);
     return ret;
 }
@@ -479,11 +472,6 @@ bool wxNativeFontInfo::GetUnderlined() const
     return lf.lfUnderline != 0;
 }
 
-bool wxNativeFontInfo::GetStrikethrough() const
-{
-    return lf.lfStrikeOut != 0;
-}
-
 wxString wxNativeFontInfo::GetFaceName() const
 {
     return lf.lfFaceName;
@@ -496,14 +484,14 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
     // extract family from pitch-and-family
     switch ( lf.lfPitchAndFamily & ~PITCH_MASK )
     {
-        case 0:
-            family = wxFONTFAMILY_UNKNOWN;
-            break;
-
         case FF_ROMAN:
             family = wxFONTFAMILY_ROMAN;
             break;
 
+        default:
+            wxFAIL_MSG( _T("unknown LOGFONT::lfFamily value") );
+            // fall through
+
         case FF_SWISS:
             family = wxFONTFAMILY_SWISS;
             break;
@@ -519,11 +507,6 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
         case FF_DECORATIVE:
             family = wxFONTFAMILY_DECORATIVE;
             break;
-
-        default:
-            wxFAIL_MSG( "unknown LOGFONT::lfFamily value" );
-            family = wxFONTFAMILY_UNKNOWN;
-                // just to avoid a warning
     }
 
     return family;
@@ -545,25 +528,17 @@ void wxNativeFontInfo::SetPointSize(int pointsize)
 
 void wxNativeFontInfo::SetPixelSize(const wxSize& pixelSize)
 {
-    // MSW accepts both positive and negative heights here but they mean
-    // different things: positive specifies the cell height while negative
-    // specifies the character height. We used to just pass the value to MSW
-    // unchanged but changed the behaviour for positive values in 2.9.1 to
-    // match other ports and, more importantly, the expected behaviour. So now
-    // passing the negative height doesn't make sense at all any more but we
-    // still accept it for compatibility with the existing code which worked
-    // around the wrong interpretation of the height argument in older wxMSW
-    // versions by passing a negative value explicitly itself.
-    lf.lfHeight = -abs(pixelSize.GetHeight());
+    lf.lfHeight = pixelSize.GetHeight();
     lf.lfWidth = pixelSize.GetWidth();
 }
 
+
 void wxNativeFontInfo::SetStyle(wxFontStyle style)
 {
     switch ( style )
     {
         default:
-            wxFAIL_MSG( "unknown font style" );
+            wxFAIL_MSG( _T("unknown font style") );
             // fall through
 
         case wxFONTSTYLE_NORMAL:
@@ -582,7 +557,7 @@ void wxNativeFontInfo::SetWeight(wxFontWeight weight)
     switch ( weight )
     {
         default:
-            wxFAIL_MSG( "unknown font weight" );
+            wxFAIL_MSG( _T("unknown font weight") );
             // fall through
 
         case wxFONTWEIGHT_NORMAL:
@@ -604,57 +579,94 @@ void wxNativeFontInfo::SetUnderlined(bool underlined)
     lf.lfUnderline = underlined;
 }
 
-void wxNativeFontInfo::SetStrikethrough(bool strikethrough)
-{
-    lf.lfStrikeOut = strikethrough;
-}
-
 bool wxNativeFontInfo::SetFaceName(const wxString& facename)
 {
-    wxStrlcpy(lf.lfFaceName, facename.c_str(), WXSIZEOF(lf.lfFaceName));
+    size_t len = WXSIZEOF(lf.lfFaceName);
+    wxStrncpy(lf.lfFaceName, facename, len);
+    lf.lfFaceName[len - 1] = '\0';    // truncate the face name
     return true;
 }
 
 void wxNativeFontInfo::SetFamily(wxFontFamily family)
 {
-    BYTE ff_family = FF_DONTCARE;
+    BYTE ff_family;
+    wxArrayString facename;
+
+    // the list of fonts associated with a family was partially
+    // taken from http://www.codestyle.org/css/font-family
 
     switch ( family )
     {
-        case wxFONTFAMILY_SCRIPT:
+        case wxSCRIPT:
             ff_family = FF_SCRIPT;
+            facename.Add(_T("Script"));
+            facename.Add(_T("Brush Script MT"));
+            facename.Add(_T("Comic Sans MS"));
+            facename.Add(_T("Lucida Handwriting"));
             break;
 
-        case wxFONTFAMILY_DECORATIVE:
+        case wxDECORATIVE:
             ff_family = FF_DECORATIVE;
+            facename.Add(_T("Old English Text MT"));
+            facename.Add(_T("Comic Sans MS"));
+            facename.Add(_T("Lucida Handwriting"));
             break;
 
-        case wxFONTFAMILY_ROMAN:
+        case wxROMAN:
             ff_family = FF_ROMAN;
+            facename.Add(_T("Times New Roman"));
+            facename.Add(_T("Georgia"));
+            facename.Add(_T("Garamond"));
+            facename.Add(_T("Bookman Old Style"));
+            facename.Add(_T("Book Antiqua"));
             break;
 
-        case wxFONTFAMILY_TELETYPE:
-        case wxFONTFAMILY_MODERN:
+        case wxTELETYPE:
+        case wxMODERN:
             ff_family = FF_MODERN;
+            facename.Add(_T("Courier New"));
+            facename.Add(_T("Lucida Console"));
+            facename.Add(_T("Andale Mono"));
+            facename.Add(_T("OCR A Extended"));
+            facename.Add(_T("Terminal"));
             break;
 
-        case wxFONTFAMILY_SWISS:
-        case wxFONTFAMILY_DEFAULT:
+        case wxSWISS:
             ff_family = FF_SWISS;
+            facename.Add(_T("Arial"));
+            facename.Add(_T("Century Gothic"));
+            facename.Add(_T("Lucida Sans Unicode"));
+            facename.Add(_T("Tahoma"));
+            facename.Add(_T("Trebuchet MS"));
+            facename.Add(_T("Verdana"));
             break;
 
-        case wxFONTFAMILY_UNKNOWN:
-            wxFAIL_MSG( "invalid font family" );
-            return;
-    }
+        case wxDEFAULT:
+        default:
+        {
+            // We want Windows 2000 or later to have new fonts even MS Shell Dlg
+            // is returned as default GUI font for compatibility
+            int verMaj;
+            ff_family = FF_SWISS;
+            if(wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)
+                facename.Add(_T("MS Shell Dlg 2"));
+            else
+                facename.Add(_T("MS Shell Dlg"));
 
-    wxCHECK_RET( ff_family != FF_DONTCARE, "unknown wxFontFamily" );
+            // Quoting the MSDN:
+            //     "MS Shell Dlg is a mapping mechanism that enables
+            //     U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to
+            //     support locales that have characters that are not contained in code
+            //     page 1252. It is not a font but a face name for a nonexistent font."
+        }
+    }
 
     lf.lfPitchAndFamily = (BYTE)(DEFAULT_PITCH) | ff_family;
 
-    // reset the facename so that CreateFontIndirect() will automatically choose a
-    // face name based only on the font family.
-    lf.lfFaceName[0] = '\0';
+    if ( !wxStrlen(lf.lfFaceName) )
+    {
+        SetFaceName(facename);
+    }
 }
 
 void wxNativeFontInfo::SetEncoding(wxFontEncoding encoding)
@@ -688,11 +700,11 @@ bool wxNativeFontInfo::FromString(const wxString& s)
 {
     long l;
 
-    wxStringTokenizer tokenizer(s, wxS(";"), wxTOKEN_RET_EMPTY_ALL);
+    wxStringTokenizer tokenizer(s, _T(";"));
 
     // first the version
     wxString token = tokenizer.GetNextToken();
-    if ( token != wxS('0') )
+    if ( token != _T('0') )
         return false;
 
     token = tokenizer.GetNextToken();
@@ -760,11 +772,10 @@ bool wxNativeFontInfo::FromString(const wxString& s)
         return false;
     lf.lfPitchAndFamily = (BYTE)l;
 
-    if ( !tokenizer.HasMoreTokens() )
+    token = tokenizer.GetNextToken();
+    if(!token)
         return false;
-
-    // the face name may be empty
-    SetFaceName(tokenizer.GetNextToken());
+    wxStrcpy(lf.lfFaceName, token.c_str());
 
     return true;
 }
@@ -773,7 +784,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxString s;
 
-    s.Printf(wxS("%d;%ld;%ld;%ld;%ld;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
+    s.Printf(_T("%d;%ld;%ld;%ld;%ld;%ld;%d;%d;%d;%d;%d;%d;%d;%d;%s"),
              0, // version, in case we want to change the format later
              lf.lfHeight,
              lf.lfWidth,
@@ -797,6 +808,17 @@ wxString wxNativeFontInfo::ToString() const
 // wxFont
 // ----------------------------------------------------------------------------
 
+bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
+{
+    UnRef();
+
+    m_refData = new wxFontRefData(info, hFont);
+
+    RealizeResource();
+
+    return true;
+}
+
 wxFont::wxFont(const wxString& fontdesc)
 {
     wxNativeFontInfo info;
@@ -804,35 +826,15 @@ wxFont::wxFont(const wxString& fontdesc)
         (void)Create(info);
 }
 
-wxFont::wxFont(int pointSize,
-               wxFontFamily family,
-               int flags,
-               const wxString& face,
-               wxFontEncoding encoding)
-{
-    m_refData = new wxFontRefData(pointSize, wxDefaultSize, false,
-                                  family,
-                                  GetStyleFromFlags(flags),
-                                  GetWeightFromFlags(flags),
-                                  GetUnderlinedFromFlags(flags),
-                                  false, face, encoding);
-}
-
-bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
-{
-    UnRef();
-
-    m_refData = new wxFontRefData(info, hFont);
-
-    return RealizeResource();
-}
-
+/* Constructor for a font. Note that the real construction is done
+ * in wxDC::SetFont, when information is available about scaling etc.
+ */
 bool wxFont::DoCreate(int pointSize,
                       const wxSize& pixelSize,
                       bool sizeUsingPixels,
-                      wxFontFamily family,
-                      wxFontStyle style,
-                      wxFontWeight weight,
+                      int family,
+                      int style,
+                      int weight,
                       bool underlined,
                       const wxString& faceName,
                       wxFontEncoding encoding)
@@ -848,9 +850,11 @@ bool wxFont::DoCreate(int pointSize,
 
     m_refData = new wxFontRefData(pointSize, pixelSize, sizeUsingPixels,
                                   family, style, weight,
-                                  underlined, false, faceName, encoding);
+                                  underlined, faceName, encoding);
 
-    return RealizeResource();
+    RealizeResource();
+
+    return true;
 }
 
 wxFont::~wxFont()
@@ -861,32 +865,28 @@ wxFont::~wxFont()
 // real implementation
 // ----------------------------------------------------------------------------
 
-wxGDIRefData *wxFont::CreateGDIRefData() const
-{
-    return new wxFontRefData();
-}
-
-wxGDIRefData *wxFont::CloneGDIRefData(const wxGDIRefData *data) const
-{
-    return new wxFontRefData(*static_cast<const wxFontRefData *>(data));
-}
-
 bool wxFont::RealizeResource()
 {
-    // NOTE: the GetHFONT() call automatically triggers a reallocation of
-    //       the HFONT if necessary (will do nothing if we already have the resource);
-    //       it returns NULL only if there is a failure in wxFontRefData::Alloc()...
-    return GetHFONT() != NULL;
+    if ( GetResourceHandle() )
+    {
+        // VZ: the old code returned false in this case, but it doesn't seem
+        //     to make sense because the font _was_ created
+        return true;
+    }
+
+    return M_FONTDATA->Alloc(this);
 }
 
 bool wxFont::FreeResource(bool WXUNUSED(force))
 {
-    if ( !M_FONTDATA )
-        return false;
+    if ( GetResourceHandle() )
+    {
+        M_FONTDATA->Free();
 
-    M_FONTDATA->Free();
+        return true;
+    }
 
-    return true;
+    return false;
 }
 
 WXHANDLE wxFont::GetResourceHandle() const
@@ -896,14 +896,27 @@ WXHANDLE wxFont::GetResourceHandle() const
 
 WXHFONT wxFont::GetHFONT() const
 {
-    // NOTE: wxFontRefData::GetHFONT() will automatically call
-    //       wxFontRefData::Alloc() if necessary
     return M_FONTDATA ? M_FONTDATA->GetHFONT() : 0;
 }
 
 bool wxFont::IsFree() const
 {
-    return M_FONTDATA && !M_FONTDATA->HasHFONT();
+    return M_FONTDATA && (M_FONTDATA->GetHFONT() == 0);
+}
+
+void wxFont::Unshare()
+{
+    // Don't change shared data
+    if ( !m_refData )
+    {
+        m_refData = new wxFontRefData();
+    }
+    else
+    {
+        wxFontRefData* ref = new wxFontRefData(*M_FONTDATA);
+        UnRef();
+        m_refData = ref;
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -912,46 +925,56 @@ bool wxFont::IsFree() const
 
 void wxFont::SetPointSize(int pointSize)
 {
-    AllocExclusive();
+    Unshare();
 
-    M_FONTDATA->Free();
     M_FONTDATA->SetPointSize(pointSize);
+
+    RealizeResource();
 }
 
 void wxFont::SetPixelSize(const wxSize& pixelSize)
 {
-    AllocExclusive();
+    Unshare();
 
     M_FONTDATA->SetPixelSize(pixelSize);
+
+    RealizeResource();
 }
 
-void wxFont::SetFamily(wxFontFamily family)
+void wxFont::SetFamily(int family)
 {
-    AllocExclusive();
+    Unshare();
 
     M_FONTDATA->SetFamily(family);
+
+    RealizeResource();
 }
 
-void wxFont::SetStyle(wxFontStyle style)
+void wxFont::SetStyle(int style)
 {
-    AllocExclusive();
+    Unshare();
 
     M_FONTDATA->SetStyle(style);
+
+    RealizeResource();
 }
 
-void wxFont::SetWeight(wxFontWeight weight)
+void wxFont::SetWeight(int weight)
 {
-    AllocExclusive();
+    Unshare();
 
     M_FONTDATA->SetWeight(weight);
+
+    RealizeResource();
 }
 
 bool wxFont::SetFaceName(const wxString& faceName)
 {
-    AllocExclusive();
+    Unshare();
 
-    if ( !M_FONTDATA->SetFaceName(faceName) )
-        return false;
+    bool refdataok = M_FONTDATA->SetFaceName(faceName);
+
+    RealizeResource();
 
     // NB: using win32's GetObject() API on M_FONTDATA->GetHFONT()
     //     to retrieve a LOGFONT and then compare lf.lfFaceName
@@ -960,35 +983,36 @@ bool wxFont::SetFaceName(const wxString& faceName)
     //     without any validity check.
     //     Thus we use wxFontBase::SetFaceName to check if facename
     //     is valid...
-    return wxFontBase::SetFaceName(faceName);
+    return refdataok && wxFontBase::SetFaceName(faceName);
 }
 
 void wxFont::SetUnderlined(bool underlined)
 {
-    AllocExclusive();
+    Unshare();
 
     M_FONTDATA->SetUnderlined(underlined);
-}
 
-void wxFont::SetStrikethrough(bool strikethrough)
-{
-    AllocExclusive();
-
-    M_FONTDATA->SetStrikethrough(strikethrough);
+    RealizeResource();
 }
 
 void wxFont::SetEncoding(wxFontEncoding encoding)
 {
-    AllocExclusive();
+    Unshare();
 
     M_FONTDATA->SetEncoding(encoding);
+
+    RealizeResource();
 }
 
 void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 {
-    AllocExclusive();
+    Unshare();
 
-    M_FONTDATA->SetNativeFontInfo(info);
+    FreeResource();
+
+    *M_FONTDATA = wxFontRefData(info);
+
+    RealizeResource();
 }
 
 // ----------------------------------------------------------------------------
@@ -997,94 +1021,102 @@ void wxFont::DoSetNativeFontInfo(const wxNativeFontInfo& info)
 
 int wxFont::GetPointSize() const
 {
-    wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
     return M_FONTDATA->GetPointSize();
 }
 
 wxSize wxFont::GetPixelSize() const
 {
-    wxCHECK_MSG( IsOk(), wxDefaultSize, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxDefaultSize, wxT("invalid font") );
 
     return M_FONTDATA->GetPixelSize();
 }
 
 bool wxFont::IsUsingSizeInPixels() const
 {
-    wxCHECK_MSG( IsOk(), 0, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
     return M_FONTDATA->IsUsingSizeInPixels();
 }
 
-wxFontFamily wxFont::DoGetFamily() const
+int wxFont::GetFamily() const
 {
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
+
     return M_FONTDATA->GetFamily();
 }
 
-wxFontStyle wxFont::GetStyle() const
+int wxFont::GetStyle() const
 {
-    wxCHECK_MSG( IsOk(), wxFONTSTYLE_MAX, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
     return M_FONTDATA->GetStyle();
 }
 
-wxFontWeight wxFont::GetWeight() const
+int wxFont::GetWeight() const
 {
-    wxCHECK_MSG( IsOk(), wxFONTWEIGHT_MAX, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
     return M_FONTDATA->GetWeight();
 }
 
 bool wxFont::GetUnderlined() const
 {
-    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
 
     return M_FONTDATA->GetUnderlined();
 }
 
-bool wxFont::GetStrikethrough() const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
-
-    return M_FONTDATA->GetStrikethrough();
-}
-
 wxString wxFont::GetFaceName() const
 {
-    wxCHECK_MSG( IsOk(), wxEmptyString, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 
     return M_FONTDATA->GetFaceName();
 }
 
 wxFontEncoding wxFont::GetEncoding() const
 {
-    wxCHECK_MSG( IsOk(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
     return M_FONTDATA->GetEncoding();
 }
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
-    return IsOk() ? &(M_FONTDATA->GetNativeFontInfo()) : NULL;
+    return Ok() && M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
+                                           : NULL;
+}
+
+wxString wxFont::GetNativeFontInfoDesc() const
+{
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+
+    // be sure we have an HFONT associated...
+    wxConstCast(this, wxFont)->RealizeResource();
+    return wxFontBase::GetNativeFontInfoDesc();
+}
+
+wxString wxFont::GetNativeFontInfoUserDesc() const
+{
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
+
+    // be sure we have an HFONT associated...
+    wxConstCast(this, wxFont)->RealizeResource();
+    return wxFontBase::GetNativeFontInfoUserDesc();
 }
 
 bool wxFont::IsFixedWidth() const
 {
-    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
-
-    // LOGFONT doesn't contain the correct pitch information so we need to call
-    // GetTextMetrics() to get it
-    ScreenHDC hdc;
-    SelectInHDC selectFont(hdc, M_FONTDATA->GetHFONT());
-
-    TEXTMETRIC tm;
-    if ( !::GetTextMetrics(hdc, &tm) )
+    if ( M_FONTDATA->HasNativeFontInfo() )
     {
-        wxLogLastError(wxT("GetTextMetrics"));
-        return false;
+        // the two low-order bits specify the pitch of the font, the rest is
+        // family
+        BYTE pitch =
+            (BYTE)(M_FONTDATA->GetNativeFontInfo().lf.lfPitchAndFamily & PITCH_MASK);
+
+        return pitch == FIXED_PITCH;
     }
 
-    // Quoting MSDN description of TMPF_FIXED_PITCH: "Note very carefully that
-    // those meanings are the opposite of what the constant name implies."
-    return !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH);
+    return wxFontBase::IsFixedWidth();
 }
diff --git a/Source/3rd Party/wx/src/msw/fontdlg.cpp b/Source/3rd Party/wx/src/msw/fontdlg.cpp
index 98bd1cba7..c40e707f9 100644
--- a/Source/3rd Party/wx/src/msw/fontdlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/fontdlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontdlg.cpp 41054 2006-09-07 19:01:45Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,6 +33,7 @@
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/log.h"
+    #include "wx/cmndata.h"
     #include "wx/math.h"
 #endif
 
@@ -68,13 +69,13 @@ int wxFontDialog::ShowModal()
         chooseFontStruct.hwndOwner = GetHwndOf(m_parent);
     chooseFontStruct.lpLogFont = &logFont;
 
-    if ( m_fontData.m_initialFont.IsOk() )
+    if ( m_fontData.m_initialFont.Ok() )
     {
         flags |= CF_INITTOLOGFONTSTRUCT;
         wxFillLogFont(&logFont, &m_fontData.m_initialFont);
     }
 
-    if ( m_fontData.m_fontColour.IsOk() )
+    if ( m_fontData.m_fontColour.Ok() )
     {
         chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.m_fontColour);
     }
@@ -111,12 +112,17 @@ int wxFontDialog::ShowModal()
     }
     else
     {
+        // common dialog failed - why?
+#ifdef __WXDEBUG__
         DWORD dwErr = CommDlgExtendedError();
         if ( dwErr != 0 )
         {
-            wxLogError(_("Common dialog failed with error code %0lx."), dwErr);
+            // this msg is only for developers
+            wxLogError(wxT("Common dialog failed with error code %0lx."),
+                       dwErr);
         }
         //else: it was just cancelled
+#endif
 
         return wxID_CANCEL;
     }
diff --git a/Source/3rd Party/wx/src/msw/fontenum.cpp b/Source/3rd Party/wx/src/msw/fontenum.cpp
index ce5f3072c..dec3fe24f 100644
--- a/Source/3rd Party/wx/src/msw/fontenum.cpp	
+++ b/Source/3rd Party/wx/src/msw/fontenum.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to add support for font encodings
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontenum.cpp 47549 2007-07-18 15:03:10Z VS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -24,19 +24,19 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_FONTENUM
-
-#include "wx/fontenum.h"
+#if wxUSE_FONTMAP
 
 #ifndef WX_PRECOMP
     #include "wx/gdicmn.h"
     #include "wx/font.h"
+    #include "wx/encinfo.h"
     #include "wx/dynarray.h"
-    #include "wx/msw/private.h"
 #endif
 
-#include "wx/encinfo.h"
+#include "wx/msw/private.h"
+
 #include "wx/fontutil.h"
+#include "wx/fontenum.h"
 #include "wx/fontmap.h"
 
 // ----------------------------------------------------------------------------
@@ -90,7 +90,7 @@ private:
     // the list of facenames we already found while enumerating facenames
     wxArrayString m_facenames;
 
-    wxDECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper);
+    DECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper)
 };
 
 // ----------------------------------------------------------------------------
@@ -99,7 +99,7 @@ private:
 
 #ifndef __WXMICROWIN__
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
-                                  DWORD dwStyle, LPARAM lParam);
+                                  DWORD dwStyle, LONG lParam);
 #endif
 
 // ============================================================================
@@ -160,13 +160,13 @@ void wxFontEnumeratorHelper::DoEnumerate()
 
 #ifdef __WXWINCE__
     ::EnumFontFamilies(hDC,
-                       m_facename.empty() ? NULL : wxMSW_CONV_LPCTSTR(m_facename),
+                       m_facename.empty() ? NULL : m_facename.c_str(),
                        (wxFONTENUMPROC)wxFontEnumeratorProc,
                        (LPARAM)this) ;
 #else // __WIN32__
     LOGFONT lf;
     lf.lfCharSet = (BYTE)m_charset;
-    wxStrlcpy(lf.lfFaceName, m_facename.c_str(), WXSIZEOF(lf.lfFaceName));
+    wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));
     lf.lfPitchAndFamily = 0;
     ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
                          (LPARAM)this, 0 /* reserved */) ;
@@ -187,18 +187,9 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         {
             wxConstCast(this, wxFontEnumeratorHelper)->m_charsets.Add(cs);
 
-#if wxUSE_FONTMAP
             wxFontEncoding enc = wxGetFontEncFromCharSet(cs);
             return m_fontEnum->OnFontEncoding(lf->lfFaceName,
                                               wxFontMapper::GetEncodingName(enc));
-#else // !wxUSE_FONTMAP
-            // Just use some unique and, hopefully, understandable, name.
-            return m_fontEnum->OnFontEncoding
-                               (
-                                lf->lfFaceName,
-                                wxString::Format(wxS("Code page %d"), cs)
-                               );
-#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
         }
         else
         {
@@ -278,7 +269,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
 #ifndef __WXMICROWIN__
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
-                                  DWORD WXUNUSED(dwStyle), LPARAM lParam)
+                                  DWORD WXUNUSED(dwStyle), LONG lParam)
 {
 
     // we used to process TrueType fonts only, but there doesn't seem to be any
@@ -298,4 +289,4 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 }
 #endif
 
-#endif // wxUSE_FONTENUM
+#endif // wxUSE_FONTMAP
diff --git a/Source/3rd Party/wx/src/msw/fontutil.cpp b/Source/3rd Party/wx/src/msw/fontutil.cpp
index 500c46fe4..759bcbf82 100644
--- a/Source/3rd Party/wx/src/msw/fontutil.cpp	
+++ b/Source/3rd Party/wx/src/msw/fontutil.cpp	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/fontutil.cpp
+// Name:        msw/fontutil.cpp
 // Purpose:     font-related helper functions for wxMSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.11.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: fontutil.cpp 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -24,18 +24,18 @@
     #pragma hdrstop
 #endif
 
-#include "wx/fontutil.h"
-
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
-    #include "wx/wxcrtvararg.h"
-    #include "wx/msw/private.h"
+    #include "wx/encinfo.h"
 #endif //WX_PRECOMP
 
-#include "wx/encinfo.h"
+#include "wx/msw/private.h"
+
+#include "wx/fontutil.h"
 #include "wx/fontmap.h"
+
 #include "wx/tokenzr.h"
 
 // for MSVC5 and old w32api
@@ -56,7 +56,7 @@
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
-    wxStringTokenizer tokenizer(s, wxT(";"));
+    wxStringTokenizer tokenizer(s, _T(";"));
 
     wxString encid = tokenizer.GetNextToken();
 
@@ -95,7 +95,7 @@ bool wxNativeEncodingInfo::FromString(const wxString& s)
     }
     else
     {
-        if ( wxSscanf(tmp, wxT("%u"), &charset) != 1 )
+        if ( wxSscanf(tmp, _T("%u"), &charset) != 1 )
         {
             // should be a number!
             return false;
@@ -119,12 +119,12 @@ wxString wxNativeEncodingInfo::ToString() const
       // we don't have any choice but to use the raw value
       << (long)encoding
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
-      << wxT(';') << facename;
+      << _T(';') << facename;
 
     // ANSI_CHARSET is assumed anyhow
     if ( charset != ANSI_CHARSET )
     {
-         s << wxT(';') << charset;
+         s << _T(';') << charset;
     }
 
     return s;
@@ -137,7 +137,7 @@ wxString wxNativeEncodingInfo::ToString() const
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
-    wxCHECK_MSG( info, false, wxT("bad pointer in wxGetNativeFontEncoding") );
+    wxCHECK_MSG( info, false, _T("bad pointer in wxGetNativeFontEncoding") );
 
     if ( encoding == wxFONTENCODING_DEFAULT )
     {
@@ -161,7 +161,7 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     wxZeroMemory(lf);       // all default values
 
     lf.lfCharSet = (BYTE)info.charset;
-    wxStrlcpy(lf.lfFaceName, info.facename.c_str(), WXSIZEOF(lf.lfFaceName));
+    wxStrncpy(lf.lfFaceName, info.facename, WXSIZEOF(lf.lfFaceName));
 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )
@@ -186,7 +186,7 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
     switch ( cs )
     {
         default:
-            wxFAIL_MSG( wxT("unexpected Win32 charset") );
+            wxFAIL_MSG( _T("unexpected Win32 charset") );
             // fall through and assume the system charset
 
         case DEFAULT_CHARSET:
@@ -251,14 +251,6 @@ wxFontEncoding wxGetFontEncFromCharSet(int cs)
             fontEncoding = wxFONTENCODING_CP950;
             break;
 
-        case VIETNAMESE_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1258;
-            break;
-
-        case JOHAB_CHARSET:
-            fontEncoding = wxFONTENCODING_CP1361;
-            break;
-
 #endif // Win32
 
         case OEM_CHARSET:
diff --git a/Source/3rd Party/wx/src/msw/frame.cpp b/Source/3rd Party/wx/src/msw/frame.cpp
index 154ccc897..9d6a4c37f 100644
--- a/Source/3rd Party/wx/src/msw/frame.cpp	
+++ b/Source/3rd Party/wx/src/msw/frame.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: frame.cpp 61213 2009-06-27 12:31:00Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -57,19 +57,13 @@
     #include "wx/univ/colschem.h"
 #endif // __WXUNIVERSAL__
 
-// FIXME-VC6: Only VC6 doesn't have this in its standard headers so this
-//            could be removed once support for it is dropped.
-#ifndef WM_UNINITMENUPOPUP
-    #define WM_UNINITMENUPOPUP 0x0125
-#endif
-
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 
-#if wxUSE_MENUS || wxUSE_MENUS_NATIVE
+#if wxUSE_MENUS_NATIVE
     extern wxMenu *wxCurrentPopupMenu;
-#endif // wxUSE_MENUS || wxUSE_MENUS_NATIVE
+#endif // wxUSE_MENUS_NATIVE
 
 // ----------------------------------------------------------------------------
 // event tables
@@ -79,6 +73,78 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
     EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxFrameStyle )
+
+wxBEGIN_FLAGS( wxFrameStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    // frame styles
+    wxFLAGS_MEMBER(wxSTAY_ON_TOP)
+    wxFLAGS_MEMBER(wxCAPTION)
+#if WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxTHICK_FRAME)
+#endif // WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxSYSTEM_MENU)
+    wxFLAGS_MEMBER(wxRESIZE_BORDER)
+#if WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxRESIZE_BOX)
+#endif // WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxCLOSE_BOX)
+    wxFLAGS_MEMBER(wxMAXIMIZE_BOX)
+    wxFLAGS_MEMBER(wxMINIMIZE_BOX)
+
+    wxFLAGS_MEMBER(wxFRAME_TOOL_WINDOW)
+    wxFLAGS_MEMBER(wxFRAME_FLOAT_ON_PARENT)
+
+    wxFLAGS_MEMBER(wxFRAME_SHAPED)
+
+wxEND_FLAGS( wxFrameStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxFrame, wxTopLevelWindow,"wx/frame.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxFrame)
+    wxEVENT_PROPERTY( Menu , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
+
+    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxFrameStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY( MenuBar , wxMenuBar * , SetMenuBar , GetMenuBar , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxFrame)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxFrame , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
+#endif
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -143,8 +209,7 @@ bool wxFrame::Create(wxWindow *parent,
 
 wxFrame::~wxFrame()
 {
-    SendDestroyEvent();
-
+    m_isBeingDeleted = true;
     DeleteAllBars();
 }
 
@@ -229,7 +294,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
         wxStatusBar *statbar = GetStatusBar();
         if ( statbar && statbar->IsShown() )
         {
-            *y -= statbar->GetSize().y;
+            *y -= statbar->GetClientSize().y;
         }
     }
 #endif // wxUSE_STATUSBAR
@@ -239,25 +304,21 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
 // wxFrame: various geometry-related functions
 // ----------------------------------------------------------------------------
 
+void wxFrame::Raise()
+{
+    ::SetForegroundWindow(GetHwnd());
+}
+
 // generate an artificial resize event
-void wxFrame::SendSizeEvent(int flags)
+void wxFrame::SendSizeEvent()
 {
     if ( !m_iconized )
     {
         RECT r = wxGetWindowRect(GetHwnd());
 
-        if ( flags & wxSEND_EVENT_POST )
-        {
-            ::PostMessage(GetHwnd(), WM_SIZE,
-                          IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
-                          MAKELPARAM(r.right - r.left, r.bottom - r.top));
-        }
-        else // send it
-        {
-            ::SendMessage(GetHwnd(), WM_SIZE,
-                          IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
-                          MAKELPARAM(r.right - r.left, r.bottom - r.top));
-        }
+        (void)::PostMessage(GetHwnd(), WM_SIZE,
+                            IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED,
+                            MAKELPARAM(r.right - r.left, r.bottom - r.top));
     }
 }
 
@@ -337,7 +398,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
     if( menubar->GetMenuCount() == 1 )
     {
         autoMenu = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(menubar->GetMenu(0));
-        SetRightMenu(wxID_ANY, menubar->GetMenuLabel(0), autoMenu);
+        SetRightMenu(wxID_ANY, menubar->GetLabelTop(0), autoMenu);
     }
     else
     {
@@ -346,7 +407,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
         for( size_t n = 0; n < menubar->GetMenuCount(); n++ )
         {
             wxMenu *item = menubar->GetMenu(n);
-            wxString label = menubar->GetMenuLabel(n);
+            wxString label = menubar->GetLabelTop(n);
             wxMenu *new_item = wxTopLevelWindowMSW::ButtonMenu::DuplicateMenu(item);
             autoMenu->Append(wxID_ANY, label, new_item);
         }
@@ -406,7 +467,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
 
             if ( !m_hMenu )
             {
-                wxFAIL_MSG( wxT("failed to create menu bar") );
+                wxFAIL_MSG( _T("failed to create menu bar") );
                 return;
             }
         }
@@ -432,19 +493,15 @@ void wxFrame::InternalSetMenuBar()
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-    // Don't override the colour explicitly set by the user, if any.
-    if ( !UseBgCol() )
-    {
-        SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
-        Refresh();
-    }
+    SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+    Refresh();
 
 #if wxUSE_STATUSBAR
     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;
         event2.SetEventObject( m_frameStatusBar );
-        m_frameStatusBar->HandleWindowEvent(event2);
+        m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
     }
 #endif // wxUSE_STATUSBAR
 
@@ -510,14 +567,27 @@ bool wxFrame::ShowFullScreen(bool show, long style)
         }
 #endif // wxUSE_TOOLBAR
 
-#if wxUSE_MENUS
         if (m_fsStyle & wxFULLSCREEN_NOMENUBAR)
         {
-            const WXHMENU hmenu = MSWGetActiveMenu();
-            if ( hmenu )
-                ::SetMenu(GetHwnd(), (HMENU)hmenu);
+            WXHMENU menu = m_hMenu;
+
+#if wxUSE_MDI_ARCHITECTURE
+            wxMDIParentFrame *frame = wxDynamicCast(this, wxMDIParentFrame);
+            if (frame)
+            {
+                wxMDIChildFrame *child = frame->GetActiveChild();
+                if (child)
+                {
+                    menu = child->GetWinMenu();
+                }
+            }
+#endif // wxUSE_MDI_ARCHITECTURE
+
+            if (menu)
+            {
+                ::SetMenu(GetHwnd(), (HMENU)menu);
+            }
         }
-#endif // wxUSE_MENUS
 
 #if wxUSE_STATUSBAR
         wxStatusBar *theStatusBar = GetStatusBar();
@@ -581,7 +651,7 @@ void wxFrame::PositionToolBar()
         toolbar->GetPosition( &tx, &ty );
         toolbar->GetSize( &tw, &th );
 
-        int x, y;
+        int x = 0, y = 0;
         if ( toolbar->HasFlag(wxTB_BOTTOM) )
         {
             x = 0;
@@ -630,23 +700,49 @@ void wxFrame::PositionToolBar()
                 tx = 0;
         }
 
-        int desiredW,
-            desiredH;
+        int desiredW = tw;
+        int desiredH = th;
 
         if ( toolbar->IsVertical() )
         {
-            desiredW = tw;
             desiredH = height;
         }
         else
         {
             desiredW = width;
-            desiredH = th;
         }
 
-        // use the 'real' MSW position here, don't offset relatively to the
+        // use the 'real' MSW position here, don't offset relativly to the
         // client area origin
-        toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
+
+        // Optimise such that we don't have to always resize the toolbar
+        // when the frame changes, otherwise we'll get a lot of flicker.
+        bool heightChanging wxDUMMY_INITIALIZE(true);
+        bool widthChanging wxDUMMY_INITIALIZE(true);
+
+        if ( toolbar->IsVertical() )
+        {
+            // It's OK if the current height is greater than what can be shown.
+            heightChanging = (desiredH > th) ;
+            widthChanging = (desiredW != tw) ;
+
+            // The next time around, we may not have to set the size
+            if (heightChanging)
+                desiredH = desiredH + 200;
+        }
+        else
+        {
+            // It's OK if the current width is greater than what can be shown.
+            widthChanging = (desiredW > tw) ;
+            heightChanging = (desiredH != th) ;
+
+            // The next time around, we may not have to set the size
+            if (widthChanging)
+                desiredW = desiredW + 200;
+        }
+
+        if (tx != 0 || ty != 0 || widthChanging || heightChanging)
+            toolbar->SetSize(x, y, desiredW, desiredH, wxSIZE_NO_ADJUSTMENTS);
 
     }
 #endif // !WINCE_WITH_COMMANDBAR
@@ -725,10 +821,13 @@ bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
         return true;
 
 #if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__)
-    // try the menu bar accelerators
+    // try the menu bar accels
     wxMenuBar *menuBar = GetMenuBar();
-    if ( menuBar && menuBar->GetAcceleratorTable()->Translate(frame, pMsg) )
-        return true;
+    if ( menuBar )
+    {
+        const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
+        return acceleratorTable.Translate(frame, pMsg);
+    }
 #endif // wxUSE_MENUS && wxUSE_ACCEL
 
     return false;
@@ -738,6 +837,58 @@ bool wxFrame::MSWDoTranslateMessage(wxFrame *frame, WXMSG *pMsg)
 // our private (non virtual) message handlers
 // ---------------------------------------------------------------------------
 
+bool wxFrame::HandlePaint()
+{
+    RECT rect;
+    if ( ::GetUpdateRect(GetHwnd(), &rect, FALSE) )
+    {
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+        if ( m_iconized )
+        {
+            const wxIcon& icon = GetIcon();
+            HICON hIcon = icon.Ok() ? GetHiconOf(icon)
+                                    : (HICON)GetDefaultIcon();
+
+            // Hold a pointer to the dc so long as the OnPaint() message
+            // is being processed
+            PAINTSTRUCT ps;
+            HDC hdc = ::BeginPaint(GetHwnd(), &ps);
+
+            // Erase background before painting or we get white background
+            MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L);
+
+            if ( hIcon )
+            {
+                RECT rect;
+                ::GetClientRect(GetHwnd(), &rect);
+
+                // FIXME: why hardcoded?
+                static const int icon_width = 32;
+                static const int icon_height = 32;
+
+                int icon_x = (int)((rect.right - icon_width)/2);
+                int icon_y = (int)((rect.bottom - icon_height)/2);
+
+                ::DrawIcon(hdc, icon_x, icon_y, hIcon);
+            }
+
+            ::EndPaint(GetHwnd(), &ps);
+
+            return true;
+        }
+        else
+ #endif
+        {
+            return wxWindow::HandlePaint();
+        }
+    }
+    else
+    {
+        // nothing to paint - processed
+        return true;
+    }
+}
+
 bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
 {
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
@@ -799,97 +950,76 @@ bool wxFrame::HandleSize(int WXUNUSED(x), int WXUNUSED(y), WXUINT id)
 
 bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
-#if wxUSE_MENUS
+    if ( control )
+    {
+        // In case it's e.g. a toolbar.
+        wxWindow *win = wxFindWinFromHandle(control);
+        if ( win )
+            return win->MSWCommand(cmd, id);
+    }
 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     if (GetToolBar() && GetToolBar()->FindById(id))
         return GetToolBar()->MSWCommand(cmd, id);
 #endif
 
-    // we only need to handle the menu and accelerator commands from the items
-    // of our menu bar, base wxWindow class already handles the rest
+    // handle here commands from menus and accelerators for our menu bar items,
+    // all the rest is handled by wxWindow itself
     if ( !control && (cmd == 0 /* menu */ || cmd == 1 /* accel */) )
     {
 #if wxUSE_MENUS_NATIVE
         if ( !wxCurrentPopupMenu )
 #endif // wxUSE_MENUS_NATIVE
         {
-            wxMenuItem * const mitem = FindItemInMenuBar((signed short)id);
-            if ( mitem )
-                return ProcessCommand(mitem);
+            if ( GetMenuBar() && ProcessCommand(id) )
+                return true;
         }
     }
-#endif // wxUSE_MENUS
 
-    return wxFrameBase::HandleCommand(id, cmd, control);;
+    return wxFrameBase::HandleCommand(id, cmd, control);
 }
 
-#if wxUSE_MENUS
-
-bool
-wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU WXUNUSED(hMenu))
+bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
 {
-    // sign extend to int from unsigned short we get from Windows
-    int item = (signed short)nItem;
+    int item;
+    if ( flags == 0xFFFF && hMenu == 0 )
+    {
+        // menu was removed from screen
+        item = -1;
+    }
+#ifndef __WXMICROWIN__
+    else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
+    {
+        item = nItem;
+    }
+#endif
+    else
+    {
+        // don't give hints for separators (doesn't make sense) nor for the
+        // items opening popup menus (they don't have them anyhow) but do clear
+        // the status line - otherwise, we would be left with the help message
+        // for the previous item which doesn't apply any more
+        DoGiveHelp(wxEmptyString, false);
 
-    // WM_MENUSELECT is generated for both normal items and menus, including
-    // the top level menus of the menu bar, which can't be represented using
-    // any valid identifier in wxMenuEvent so use an otherwise unused value for
-    // them
-    if ( flags & (MF_POPUP | MF_SEPARATOR) )
-        item = wxID_NONE;
+        return false;
+    }
 
     wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
     event.SetEventObject(this);
 
-    if ( HandleWindowEvent(event) )
-        return true;
-
-    // by default, i.e. if the event wasn't handled above, clear the status bar
-    // text when an item which can't have any associated help string in wx API
-    // is selected
-    if ( item == wxID_NONE )
-        DoGiveHelp(wxEmptyString, true);
-
-    return false;
+    return GetEventHandler()->ProcessEvent(event);
 }
 
-bool
-wxFrame::DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup)
+bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup)
 {
-    wxMenuEvent event(evtType, popup ? wxID_ANY : 0, menu);
-    event.SetEventObject(menu);
+    // we don't have the menu id here, so we use the id to specify if the event
+    // was from a popup menu or a normal one
+    wxMenuEvent event(evtType, isPopup ? -1 : 0);
+    event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
-bool wxFrame::HandleExitMenuLoop(WXWORD isPopup)
-{
-    return DoSendMenuOpenCloseEvent(wxEVT_MENU_CLOSE,
-                                    isPopup ? wxCurrentPopupMenu : NULL,
-                                    isPopup != 0);
-}
-
-bool wxFrame::HandleMenuPopup(wxEventType evtType, WXHMENU hMenu)
-{
-    bool isPopup = false;
-    wxMenu* menu = NULL;
-    if ( wxCurrentPopupMenu && wxCurrentPopupMenu->GetHMenu() == hMenu )
-    {
-        menu = wxCurrentPopupMenu;
-        isPopup = true;
-    }
-    else if ( GetMenuBar() )
-    {
-        menu = GetMenuBar()->MSWGetMenu(hMenu);
-    }
-
-
-    return DoSendMenuOpenCloseEvent(evtType, menu, isPopup);
-}
-
-#endif // wxUSE_MENUS
-
 // ---------------------------------------------------------------------------
 // the window proc for wxFrame
 // ---------------------------------------------------------------------------
@@ -920,21 +1050,22 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara
 
                 HandleCommand(id, cmd, (WXHWND)hwnd);
 
-                // don't pass WM_COMMAND to the base class whether we processed
-                // it or not because we did generate an event for it (our
-                // HandleCommand() calls the base class version) and we must
-                // not do it again or the handlers which skip the event would
-                // be called twice
+                // don't pass WM_COMMAND to the base class as it would generate
+                // another wxCommandEvent which would result in its handler
+                // being called twice if it uses event.Skip()
                 processed = true;
             }
             break;
 
-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-#if wxUSE_MENUS
-        case WM_INITMENUPOPUP:
-            processed = HandleMenuPopup(wxEVT_MENU_OPEN, (WXHMENU)wParam);
+        case WM_PAINT:
+            processed = HandlePaint();
             break;
 
+        case WM_INITMENUPOPUP:
+            processed = HandleInitMenuPopup((WXHMENU) wParam);
+            break;
+
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
         case WM_MENUSELECT:
             {
                 WXWORD item, flags;
@@ -946,26 +1077,15 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara
             break;
 
         case WM_EXITMENULOOP:
-            // Under Windows 98 and 2000 and later we're going to get
-            // WM_UNINITMENUPOPUP which will be used to generate this event
-            // with more information (notably the menu that was closed) so we
-            // only need this one under old Windows systems where the newer
-            // event is never sent.
-            if ( wxGetWinVersion() < wxWinVersion_98 )
-                processed = HandleExitMenuLoop(wParam);
+            processed = HandleMenuLoop(wxEVT_MENU_CLOSE, (WXWORD)wParam);
             break;
 
-        case WM_UNINITMENUPOPUP:
-            processed = HandleMenuPopup(wxEVT_MENU_CLOSE, (WXHMENU)wParam);
-            break;
-#endif // wxUSE_MENUS
-
         case WM_QUERYDRAGICON:
             {
                 const wxIcon& icon = GetIcon();
-                HICON hIcon = icon.IsOk() ? GetHiconOf(icon)
+                HICON hIcon = icon.Ok() ? GetHiconOf(icon)
                                         : (HICON)GetDefaultIcon();
-                rc = (WXLRESULT)hIcon;
+                rc = (long)hIcon;
                 processed = rc != 0;
             }
             break;
@@ -978,6 +1098,29 @@ WXLRESULT wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPara
     return rc;
 }
 
+// handle WM_INITMENUPOPUP message
+bool wxFrame::HandleInitMenuPopup(WXHMENU hMenu)
+{
+    wxMenu* menu = NULL;
+    if (GetMenuBar())
+    {
+        int nCount = GetMenuBar()->GetMenuCount();
+        for (int n = 0; n < nCount; n++)
+        {
+            if (GetMenuBar()->GetMenu(n)->GetHMenu() == hMenu)
+            {
+                menu = GetMenuBar()->GetMenu(n);
+                break;
+            }
+        }
+    }
+
+    wxMenuEvent event(wxEVT_MENU_OPEN, 0, menu);
+    event.SetEventObject(this);
+
+    return GetEventHandler()->ProcessEvent(event);
+}
+
 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars
 // from the client area, so the client area is what's really available for the
diff --git a/Source/3rd Party/wx/src/msw/fswatcher.cpp b/Source/3rd Party/wx/src/msw/fswatcher.cpp
deleted file mode 100644
index eff4ee2e8..000000000
--- a/Source/3rd Party/wx/src/msw/fswatcher.cpp	
+++ /dev/null
@@ -1,437 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/fswatcher.cpp
-// Purpose:     wxMSWFileSystemWatcher
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_FSWATCHER
-
-#include "wx/fswatcher.h"
-#include "wx/thread.h"
-#include "wx/sharedptr.h"
-#include "wx/msw/fswatcher.h"
-#include "wx/msw/private.h"
-#include "wx/private/fswatcher.h"
-
-// ============================================================================
-// wxFSWatcherImplMSW implementation
-// ============================================================================
-
-class wxFSWatcherImplMSW : public wxFSWatcherImpl
-{
-public:
-    wxFSWatcherImplMSW(wxFileSystemWatcherBase* watcher);
-
-    virtual ~wxFSWatcherImplMSW();
-
-    bool SetUpWatch(wxFSWatchEntryMSW& watch);
-
-    void SendEvent(wxFileSystemWatcherEvent& evt);
-
-protected:
-    bool Init();
-
-    // adds watch to be monitored for file system changes
-    virtual bool DoAdd(wxSharedPtr<wxFSWatchEntryMSW> watch);
-
-    virtual bool DoRemove(wxSharedPtr<wxFSWatchEntryMSW> watch);
-
-private:
-    bool DoSetUpWatch(wxFSWatchEntryMSW& watch);
-
-    static int Watcher2NativeFlags(int flags);
-
-    wxIOCPService m_iocp;
-    wxIOCPThread m_workerThread;
-};
-
-wxFSWatcherImplMSW::wxFSWatcherImplMSW(wxFileSystemWatcherBase* watcher) :
-    wxFSWatcherImpl(watcher),
-    m_workerThread(this, &m_iocp)
-{
-}
-
-wxFSWatcherImplMSW::~wxFSWatcherImplMSW()
-{
-    // order the worker thread to finish & wait
-    m_workerThread.Finish();
-    if (m_workerThread.Wait() != 0)
-    {
-        wxLogError(_("Ungraceful worker thread termination"));
-    }
-
-    // remove all watches
-    (void) RemoveAll();
-}
-
-bool wxFSWatcherImplMSW::Init()
-{
-    wxCHECK_MSG( !m_workerThread.IsAlive(), false,
-                 "Watcher service is already initialized" );
-
-    if (m_workerThread.Create() != wxTHREAD_NO_ERROR)
-    {
-        wxLogError(_("Unable to create IOCP worker thread"));
-        return false;
-    }
-
-    // we have valid iocp service and thread
-    if (m_workerThread.Run() != wxTHREAD_NO_ERROR)
-    {
-        wxLogError(_("Unable to start IOCP worker thread"));
-        return false;
-    }
-
-    return true;
-}
-
-// adds watch to be monitored for file system changes
-bool wxFSWatcherImplMSW::DoAdd(wxSharedPtr<wxFSWatchEntryMSW> watch)
-{
-    // setting up wait for directory changes
-    if (!DoSetUpWatch(*watch))
-        return false;
-
-    // associating handle with completion port
-    return m_iocp.Add(watch);
-}
-
-bool
-wxFSWatcherImplMSW::DoRemove(wxSharedPtr<wxFSWatchEntryMSW> watch)
-{
-    return m_iocp.ScheduleForRemoval(watch);
-}
-
-// TODO ensuring that we have not already set watch for this handle/dir?
-bool wxFSWatcherImplMSW::SetUpWatch(wxFSWatchEntryMSW& watch)
-{
-    wxCHECK_MSG( watch.IsOk(), false, "Invalid watch" );
-    if (m_watches.find(watch.GetPath()) == m_watches.end())
-    {
-        wxLogTrace(wxTRACE_FSWATCHER, "Path '%s' is not watched",
-                   watch.GetPath());
-        return false;
-    }
-
-    wxLogTrace(wxTRACE_FSWATCHER, "Setting up watch for file system changes...");
-    return DoSetUpWatch(watch);
-}
-
-void wxFSWatcherImplMSW::SendEvent(wxFileSystemWatcherEvent& evt)
-{
-    // called from worker thread, so posting event in thread-safe way
-    wxQueueEvent(m_watcher->GetOwner(), evt.Clone());
-}
-
-bool wxFSWatcherImplMSW::DoSetUpWatch(wxFSWatchEntryMSW& watch)
-{
-    BOOL bWatchSubtree = FALSE;
-
-    switch ( watch.GetType() )
-    {
-        case wxFSWPath_File:
-            wxLogError(_("Monitoring individual files for changes is not "
-                         "supported currently."));
-            return false;
-
-        case wxFSWPath_Dir:
-            bWatchSubtree = FALSE;
-            break;
-
-        case wxFSWPath_Tree:
-            bWatchSubtree = TRUE;
-            break;
-
-        case wxFSWPath_None:
-            wxFAIL_MSG( "Invalid watch type." );
-            return false;
-    }
-
-    int flags = Watcher2NativeFlags(watch.GetFlags());
-    int ret = ReadDirectoryChangesW(watch.GetHandle(), watch.GetBuffer(),
-                                    wxFSWatchEntryMSW::BUFFER_SIZE,
-                                    bWatchSubtree,
-                                    flags, NULL,
-                                    watch.GetOverlapped(), NULL);
-    if (!ret)
-    {
-        wxLogSysError(_("Unable to set up watch for '%s'"),
-                        watch.GetPath());
-    }
-
-    return ret != 0;
-}
-
-// TODO we should only specify those flags, which interest us
-// this needs a bit of thinking, quick impl for now
-int wxFSWatcherImplMSW::Watcher2NativeFlags(int WXUNUSED(flags))
-{
-    static DWORD all_events = FILE_NOTIFY_CHANGE_FILE_NAME |
-            FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_ATTRIBUTES |
-            FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE |
-            FILE_NOTIFY_CHANGE_LAST_ACCESS | FILE_NOTIFY_CHANGE_CREATION |
-            FILE_NOTIFY_CHANGE_SECURITY;
-
-    return all_events;
-}
-
-
-// ============================================================================
-// wxFSWatcherImplMSW helper classes implementation
-// ============================================================================
-
-wxIOCPThread::wxIOCPThread(wxFSWatcherImplMSW* service, wxIOCPService* iocp) :
-    wxThread(wxTHREAD_JOINABLE),
-    m_service(service), m_iocp(iocp)
-{
-}
-
-// finishes this thread
-bool wxIOCPThread::Finish()
-{
-    wxLogTrace(wxTRACE_FSWATCHER, "Posting empty status!");
-
-    // send "empty" packet to i/o completion port, just to wake
-    return m_iocp->PostEmptyStatus();
-}
-
-wxThread::ExitCode wxIOCPThread::Entry()
-{
-    wxLogTrace(wxTRACE_FSWATCHER, "[iocp] Started IOCP thread");
-
-    // read events in a loop until we get false, which means we should exit
-    while ( ReadEvents() );
-
-    wxLogTrace(wxTRACE_FSWATCHER, "[iocp] Ended IOCP thread");
-    return (ExitCode)0;
-}
-
-// wait for events to occur, read them and send to interested parties
-// returns false it empty status was read, which means we whould exit
-//         true otherwise
-bool wxIOCPThread::ReadEvents()
-{
-    unsigned long count = 0;
-    wxFSWatchEntryMSW* watch = NULL;
-    OVERLAPPED* overlapped = NULL;
-    if (!m_iocp->GetStatus(&count, &watch, &overlapped))
-        return true; // error was logged already, we don't want to exit
-
-    // this is our exit condition, so we return false
-    if (!count && !watch && !overlapped)
-        return false;
-
-    // in case of spurious wakeup
-    if (!count || !watch)
-        return true;
-
-    wxLogTrace( wxTRACE_FSWATCHER, "[iocp] Read entry: path='%s'",
-                watch->GetPath());
-
-    // First check if we're still interested in this watch, we could have
-    // removed it in the meanwhile.
-    if ( m_iocp->CompleteRemoval(watch) )
-        return true;
-
-    // extract events from buffer info our vector container
-    wxVector<wxEventProcessingData> events;
-    const char* memory = static_cast<const char*>(watch->GetBuffer());
-    int offset = 0;
-    do
-    {
-        const FILE_NOTIFY_INFORMATION* e =
-              static_cast<const FILE_NOTIFY_INFORMATION*>((const void*)memory);
-
-        events.push_back(wxEventProcessingData(e, watch));
-
-        offset = e->NextEntryOffset;
-        memory += offset;
-    }
-    while (offset);
-
-    // process events
-    ProcessNativeEvents(events);
-
-    // reissue the watch. ignore possible errors, we will return true anyway
-    (void) m_service->SetUpWatch(*watch);
-
-    return true;
-}
-
-void wxIOCPThread::ProcessNativeEvents(wxVector<wxEventProcessingData>& events)
-{
-    wxVector<wxEventProcessingData>::iterator it = events.begin();
-    for ( ; it != events.end(); ++it )
-    {
-        const FILE_NOTIFY_INFORMATION& e = *(it->nativeEvent);
-        const wxFSWatchEntryMSW* watch = it->watch;
-
-        wxLogTrace( wxTRACE_FSWATCHER, "[iocp] %s",
-                    FileNotifyInformationToString(e));
-
-        int nativeFlags = e.Action;
-        int flags = Native2WatcherFlags(nativeFlags);
-        if (flags & wxFSW_EVENT_WARNING || flags & wxFSW_EVENT_ERROR)
-        {
-            // TODO think about this...do we ever have any errors to report?
-            wxString errMsg = "Error occurred";
-            wxFileSystemWatcherEvent event(flags, errMsg);
-            SendEvent(event);
-        }
-        // filter out ignored events and those not asked for.
-        // we never filter out warnings or exceptions
-        else if ((flags == 0) || !(flags & watch->GetFlags()))
-        {
-            return;
-        }
-        // rename case
-        else if (nativeFlags == FILE_ACTION_RENAMED_OLD_NAME)
-        {
-            wxFileName oldpath = GetEventPath(*watch, e);
-            wxFileName newpath;
-
-            // newpath should be in the next entry. what if there isn't?
-            ++it;
-            if ( it != events.end() )
-            {
-                newpath = GetEventPath(*(it->watch), *(it->nativeEvent));
-            }
-            wxFileSystemWatcherEvent event(flags, oldpath, newpath);
-            SendEvent(event);
-        }
-        // all other events
-        else
-        {
-            // CHECK I heard that returned path can be either in short on long
-            // form...need to account for that!
-            wxFileName path = GetEventPath(*watch, e);
-            wxFileSystemWatcherEvent event(flags, path, path);
-            SendEvent(event);
-        }
-    }
-}
-
-void wxIOCPThread::SendEvent(wxFileSystemWatcherEvent& evt)
-{
-    wxLogTrace(wxTRACE_FSWATCHER, "[iocp] EVT: %s", evt.ToString());
-    m_service->SendEvent(evt);
-}
-
-int wxIOCPThread::Native2WatcherFlags(int flags)
-{
-    static const int flag_mapping[][2] = {
-        { FILE_ACTION_ADDED,            wxFSW_EVENT_CREATE },
-        { FILE_ACTION_REMOVED,          wxFSW_EVENT_DELETE },
-
-        // TODO take attributes into account to see what happened
-        { FILE_ACTION_MODIFIED,         wxFSW_EVENT_MODIFY },
-
-        { FILE_ACTION_RENAMED_OLD_NAME, wxFSW_EVENT_RENAME },
-
-        // ignored as it should always be matched with ***_OLD_NAME
-        { FILE_ACTION_RENAMED_NEW_NAME, 0 },
-    };
-
-    for (unsigned int i=0; i < WXSIZEOF(flag_mapping); ++i) {
-        if (flags == flag_mapping[i][0])
-            return flag_mapping[i][1];
-    }
-
-    // never reached
-    wxFAIL_MSG(wxString::Format("Unknown file notify change %u", flags));
-    return -1;
-}
-
-wxString wxIOCPThread::FileNotifyInformationToString(
-                                              const FILE_NOTIFY_INFORMATION& e)
-{
-    wxString fname(e.FileName, e.FileNameLength / sizeof(e.FileName[0]));
-    return wxString::Format("Event: offset=%d, action=%d, len=%d, "
-                            "name(approx)='%s'", e.NextEntryOffset, e.Action,
-                            e.FileNameLength, fname);
-}
-
-wxFileName wxIOCPThread::GetEventPath(const wxFSWatchEntryMSW& watch,
-                                      const FILE_NOTIFY_INFORMATION& e)
-{
-    wxFileName path = watch.GetPath();
-    if (path.IsDir())
-    {
-        wxString rel(e.FileName, e.FileNameLength / sizeof(e.FileName[0]));
-        int pathFlags = wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR;
-        path = wxFileName(path.GetPath(pathFlags) + rel);
-    }
-    return path;
-}
-
-
-// ============================================================================
-// wxMSWFileSystemWatcher implementation
-// ============================================================================
-
-wxMSWFileSystemWatcher::wxMSWFileSystemWatcher() :
-    wxFileSystemWatcherBase()
-{
-    (void) Init();
-}
-
-wxMSWFileSystemWatcher::wxMSWFileSystemWatcher(const wxFileName& path,
-                                               int events) :
-    wxFileSystemWatcherBase()
-{
-    if (!Init())
-        return;
-
-    Add(path, events);
-}
-
-bool wxMSWFileSystemWatcher::Init()
-{
-    m_service = new wxFSWatcherImplMSW(this);
-    bool ret = m_service->Init();
-    if (!ret)
-    {
-        delete m_service;
-    }
-
-    return ret;
-}
-
-bool
-wxMSWFileSystemWatcher::AddTree(const wxFileName& path,
-                                int events,
-                                const wxString& filter)
-{
-    if ( !filter.empty() )
-    {
-        // Use the inefficient generic version as we can only monitor
-        // everything under the given directory.
-        //
-        // Notice that it would probably be better to still monitor everything
-        // natively and filter out the changes we're not interested in.
-        return wxFileSystemWatcherBase::AddTree(path, events, filter);
-    }
-
-
-    if ( !path.DirExists() )
-    {
-        wxLogError(_("Can't monitor non-existent directory \"%s\" for changes."),
-                   path.GetFullPath());
-        return false;
-    }
-
-    return DoAdd(path, events, wxFSWPath_Tree);
-}
-
-#endif // wxUSE_FSWATCHER
diff --git a/Source/3rd Party/wx/src/msw/gauge.cpp b/Source/3rd Party/wx/src/msw/gauge.cpp
deleted file mode 100644
index d66fd91b1..000000000
--- a/Source/3rd Party/wx/src/msw/gauge.cpp	
+++ /dev/null
@@ -1,228 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/gauge.cpp
-// Purpose:     wxGauge class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_GAUGE
-
-#include "wx/gauge.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-
-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
-#endif
-
-#include "wx/msw/private.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// old commctrl.h (< 4.71) don't have those
-#ifndef PBS_SMOOTH
-    #define PBS_SMOOTH 0x01
-#endif
-
-#ifndef PBS_VERTICAL
-    #define PBS_VERTICAL 0x04
-#endif
-
-#ifndef PBM_SETBARCOLOR
-    #define PBM_SETBARCOLOR         (WM_USER+9)
-#endif
-
-#ifndef PBM_SETBKCOLOR
-    #define PBM_SETBKCOLOR          0x2001
-#endif
-
-#ifndef PBS_MARQUEE
-    #define PBS_MARQUEE             0x08
-#endif
-
-#ifndef PBM_SETMARQUEE
-    #define PBM_SETMARQUEE          (WM_USER+10)
-#endif
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-// ============================================================================
-// wxGauge implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxGauge creation
-// ----------------------------------------------------------------------------
-
-bool wxGauge::Create(wxWindow *parent,
-                     wxWindowID id,
-                     int range,
-                     const wxPoint& pos,
-                     const wxSize& size,
-                     long style,
-                     const wxValidator& validator,
-                     const wxString& name)
-{
-    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
-        return false;
-
-    if ( !MSWCreateControl(PROGRESS_CLASS, wxEmptyString, pos, size) )
-        return false;
-
-    SetRange(range);
-
-    // in case we need to emulate indeterminate mode...
-    m_nDirection = wxRIGHT;
-
-    return true;
-}
-
-WXDWORD wxGauge::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
-
-    if ( style & wxGA_VERTICAL )
-        msStyle |= PBS_VERTICAL;
-
-    if ( style & wxGA_SMOOTH )
-        msStyle |= PBS_SMOOTH;
-
-    return msStyle;
-}
-
-// ----------------------------------------------------------------------------
-// wxGauge geometry
-// ----------------------------------------------------------------------------
-
-wxSize wxGauge::DoGetBestSize() const
-{
-    // Windows HIG (http://msdn.microsoft.com/en-us/library/aa511279.aspx)
-    // suggest progress bar size of "107 or 237 x 8 dialog units". Let's use
-    // the smaller one.
-
-    if (HasFlag(wxGA_VERTICAL))
-        return ConvertDialogToPixels(wxSize(8, 107));
-    else
-        return ConvertDialogToPixels(wxSize(107, 8));
-}
-
-// ----------------------------------------------------------------------------
-// wxGauge setters
-// ----------------------------------------------------------------------------
-
-void wxGauge::SetRange(int r)
-{
-    // Changing range implicitly means we're using determinate mode.
-    if ( IsInIndeterminateMode() )
-        SetDeterminateMode();
-
-    m_rangeMax = r;
-
-#ifdef PBM_SETRANGE32
-    ::SendMessage(GetHwnd(), PBM_SETRANGE32, 0, r);
-#else // !PBM_SETRANGE32
-    // fall back to PBM_SETRANGE (limited to 16 bits)
-    ::SendMessage(GetHwnd(), PBM_SETRANGE, 0, MAKELPARAM(0, r));
-#endif // PBM_SETRANGE32/!PBM_SETRANGE32
-}
-
-void wxGauge::SetValue(int pos)
-{
-    // Setting the value implicitly means that we're using determinate mode.
-    if ( IsInIndeterminateMode() )
-        SetDeterminateMode();
-
-    if ( GetValue() != pos )
-    {
-        m_gaugePos = pos;
-
-        ::SendMessage(GetHwnd(), PBM_SETPOS, pos, 0);
-    }
-}
-
-bool wxGauge::SetForegroundColour(const wxColour& col)
-{
-    if ( !wxControl::SetForegroundColour(col) )
-        return false;
-
-    ::SendMessage(GetHwnd(), PBM_SETBARCOLOR, 0, (LPARAM)wxColourToRGB(col));
-
-    return true;
-}
-
-bool wxGauge::SetBackgroundColour(const wxColour& col)
-{
-    if ( !wxControl::SetBackgroundColour(col) )
-        return false;
-
-    ::SendMessage(GetHwnd(), PBM_SETBKCOLOR, 0, (LPARAM)wxColourToRGB(col));
-
-    return true;
-}
-
-bool wxGauge::IsInIndeterminateMode() const
-{
-    return (::GetWindowLong(GetHwnd(), GWL_STYLE) & PBS_MARQUEE) != 0;
-}
-
-void wxGauge::SetIndeterminateMode()
-{
-    // Switch the control into indeterminate mode if necessary.
-    if ( !IsInIndeterminateMode() )
-    {
-        const long style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
-        ::SetWindowLong(GetHwnd(), GWL_STYLE, style | PBS_MARQUEE);
-        ::SendMessage(GetHwnd(), PBM_SETMARQUEE, TRUE, 0);
-    }
-}
-
-void wxGauge::SetDeterminateMode()
-{
-    if ( IsInIndeterminateMode() )
-    {
-        const long style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
-        ::SendMessage(GetHwnd(), PBM_SETMARQUEE, FALSE, 0);
-        ::SetWindowLong(GetHwnd(), GWL_STYLE, style & ~PBS_MARQUEE);
-    }
-}
-
-void wxGauge::Pulse()
-{
-    if (wxApp::GetComCtl32Version() >= 600)
-    {
-        // switch to indeterminate mode if required
-        SetIndeterminateMode();
-
-        SendMessage(GetHwnd(), PBM_STEPIT, 0, 0);
-    }
-    else
-    {
-        // emulate indeterminate mode
-        wxGaugeBase::Pulse();
-    }
-}
-
-#endif // wxUSE_GAUGE
diff --git a/Source/3rd Party/wx/src/msw/gdiimage.cpp b/Source/3rd Party/wx/src/msw/gdiimage.cpp
index fc176fa6d..43b934f98 100644
--- a/Source/3rd Party/wx/src/msw/gdiimage.cpp	
+++ b/Source/3rd Party/wx/src/msw/gdiimage.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.11.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: gdiimage.cpp 41689 2006-10-08 08:04:49Z PC $
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -19,7 +19,6 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include <ShellAPI.h>
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -45,6 +44,10 @@
 #include <shellapi.h>
 #endif
 
+#ifdef __WXMSW__
+#include <shellapi.h>
+#endif
+
 #include "wx/file.h"
 
 #include "wx/listimpl.cpp"
@@ -62,17 +65,17 @@ WX_DEFINE_LIST(wxGDIImageHandlerList)
 class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler
 {
 public:
-    wxBMPFileHandler() : wxBitmapHandler(wxT("Windows bitmap file"), wxT("bmp"),
+    wxBMPFileHandler() : wxBitmapHandler(_T("Windows bitmap file"), _T("bmp"),
                                          wxBITMAP_TYPE_BMP)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,
-                          const wxString& name, wxBitmapType flags,
+                          const wxString& name, long flags,
                           int desiredWidth, int desiredHeight);
-    virtual bool SaveFile(const wxBitmap *bitmap,
-                          const wxString& name, wxBitmapType type,
-                          const wxPalette *palette = NULL) const;
+    virtual bool SaveFile(wxBitmap *bitmap,
+                          const wxString& name, int type,
+                          const wxPalette *palette = NULL);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
@@ -81,14 +84,14 @@ private:
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {
 public:
-    wxBMPResourceHandler() : wxBitmapHandler(wxT("Windows bitmap resource"),
+    wxBMPResourceHandler() : wxBitmapHandler(_T("Windows bitmap resource"),
                                              wxEmptyString,
                                              wxBITMAP_TYPE_BMP_RESOURCE)
     {
     }
 
     virtual bool LoadFile(wxBitmap *bitmap,
-                          const wxString& name, wxBitmapType flags,
+                          const wxString& name, long flags,
                           int desiredWidth, int desiredHeight);
 
 private:
@@ -98,7 +101,7 @@ private:
 class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
 {
 public:
-    wxIconHandler(const wxString& name, const wxString& ext, wxBitmapType type)
+    wxIconHandler(const wxString& name, const wxString& ext, long type)
         : wxGDIImageHandler(name, ext, type)
     {
     }
@@ -106,7 +109,7 @@ public:
     // creating and saving icons is not supported
     virtual bool Create(wxGDIImage *WXUNUSED(image),
                         const void* WXUNUSED(data),
-                        wxBitmapType WXUNUSED(flags),
+                        long WXUNUSED(flags),
                         int WXUNUSED(width),
                         int WXUNUSED(height),
                         int WXUNUSED(depth) = 1)
@@ -114,42 +117,42 @@ public:
         return false;
     }
 
-    virtual bool Save(const wxGDIImage *WXUNUSED(image),
+    virtual bool Save(wxGDIImage *WXUNUSED(image),
                       const wxString& WXUNUSED(name),
-                      wxBitmapType WXUNUSED(type)) const
+                      int WXUNUSED(type))
     {
         return false;
     }
 
     virtual bool Load(wxGDIImage *image,
                       const wxString& name,
-                      wxBitmapType flags,
+                      long flags,
                       int desiredWidth, int desiredHeight)
     {
         wxIcon *icon = wxDynamicCast(image, wxIcon);
-        wxCHECK_MSG( icon, false, wxT("wxIconHandler only works with icons") );
+        wxCHECK_MSG( icon, false, _T("wxIconHandler only works with icons") );
 
         return LoadIcon(icon, name, flags, desiredWidth, desiredHeight);
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,
-                          const wxString& name, wxBitmapType flags,
+                          const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1) = 0;
 };
 
 class WXDLLEXPORT wxICOFileHandler : public wxIconHandler
 {
 public:
-    wxICOFileHandler() : wxIconHandler(wxT("ICO icon file"),
-                                       wxT("ico"),
+    wxICOFileHandler() : wxIconHandler(_T("ICO icon file"),
+                                       _T("ico"),
                                        wxBITMAP_TYPE_ICO)
     {
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,
-                          const wxString& name, wxBitmapType flags,
+                          const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:
@@ -159,15 +162,15 @@ private:
 class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
 {
 public:
-    wxICOResourceHandler() : wxIconHandler(wxT("ICO resource"),
-                                           wxT("ico"),
+    wxICOResourceHandler() : wxIconHandler(_T("ICO resource"),
+                                           _T("ico"),
                                            wxBITMAP_TYPE_ICO_RESOURCE)
     {
     }
 
 protected:
     virtual bool LoadIcon(wxIcon *icon,
-                          const wxString& name, wxBitmapType flags,
+                          const wxString& name, long flags,
                           int desiredWidth = -1, int desiredHeight = -1);
 
 private:
@@ -319,14 +322,14 @@ void wxGDIImage::InitStandardHandlers()
 // ----------------------------------------------------------------------------
 
 bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
-                                    const wxString& name, wxBitmapType WXUNUSED(flags),
+                                    const wxString& name, long WXUNUSED(flags),
                                     int WXUNUSED(desiredWidth),
                                     int WXUNUSED(desiredHeight))
 {
     // TODO: load colourmap.
-    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name.t_str()));
+    bitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), name));
 
-    if ( !bitmap->IsOk() )
+    if ( !bitmap->Ok() )
     {
         // it's probably not found
         wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."),
@@ -352,12 +355,12 @@ bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap,
 }
 
 bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
-                                const wxString& name, wxBitmapType WXUNUSED(flags),
+                                const wxString& name, long WXUNUSED(flags),
                                 int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {
 #if wxUSE_WXDIB
-    wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in LoadFile") );
+    wxCHECK_MSG( bitmap, false, _T("NULL bitmap in LoadFile") );
 
     wxDIB dib(name);
 
@@ -367,13 +370,13 @@ bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap,
 #endif
 }
 
-bool wxBMPFileHandler::SaveFile(const wxBitmap *bitmap,
+bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap,
                                 const wxString& name,
-                                wxBitmapType WXUNUSED(type),
-                                const wxPalette * WXUNUSED(pal)) const
+                                int WXUNUSED(type),
+                                const wxPalette * WXUNUSED(pal))
 {
 #if wxUSE_WXDIB
-    wxCHECK_MSG( bitmap, false, wxT("NULL bitmap in SaveFile") );
+    wxCHECK_MSG( bitmap, false, _T("NULL bitmap in SaveFile") );
 
     wxDIB dib(*bitmap);
 
@@ -389,7 +392,7 @@ bool wxBMPFileHandler::SaveFile(const wxBitmap *bitmap,
 
 bool wxICOFileHandler::LoadIcon(wxIcon *icon,
                                 const wxString& name,
-                                wxBitmapType WXUNUSED(flags),
+                                long WXUNUSED(flags),
                                 int desiredWidth, int desiredHeight)
 {
     icon->UnRef();
@@ -439,12 +442,12 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
          desiredHeight == ::GetSystemMetrics(SM_CYICON) )
     {
         // get the specified large icon from file
-        if ( !::ExtractIconEx(nameReal.t_str(), iconIndex, &hicon, NULL, 1) )
+        if ( !::ExtractIconEx(nameReal, iconIndex, &hicon, NULL, 1) )
         {
             // it is not an error, but it might still be useful to be informed
             // about it optionally
-            wxLogTrace(wxT("iconload"),
-                       wxT("No large icons found in the file '%s'."),
+            wxLogTrace(_T("iconload"),
+                       _T("No large icons found in the file '%s'."),
                        name.c_str());
         }
     }
@@ -452,10 +455,10 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
               desiredHeight == ::GetSystemMetrics(SM_CYSMICON) )
     {
         // get the specified small icon from file
-        if ( !::ExtractIconEx(nameReal.t_str(), iconIndex, NULL, &hicon, 1) )
+        if ( !::ExtractIconEx(nameReal, iconIndex, NULL, &hicon, 1) )
         {
-            wxLogTrace(wxT("iconload"),
-                       wxT("No small icons found in the file '%s'."),
+            wxLogTrace(_T("iconload"),
+                       _T("No small icons found in the file '%s'."),
                        name.c_str());
         }
     }
@@ -465,13 +468,13 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     if ( !hicon )
     {
         // take any size icon from the file by index
-        hicon = ::ExtractIcon(wxGetInstance(), nameReal.t_str(), iconIndex);
+        hicon = ::ExtractIcon(wxGetInstance(), nameReal, iconIndex);
     }
 #endif
 
     if ( !hicon )
     {
-        wxLogSysError(wxT("Failed to load icon from the file '%s'"),
+        wxLogSysError(_T("Failed to load icon from the file '%s'"),
                       name.c_str());
 
         return false;
@@ -482,8 +485,8 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     if ( (desiredWidth != -1 && desiredWidth != size.x) ||
          (desiredHeight != -1 && desiredHeight != size.y) )
     {
-        wxLogTrace(wxT("iconload"),
-                   wxT("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),
+        wxLogTrace(_T("iconload"),
+                   _T("Returning false from wxICOFileHandler::Load because of the size mismatch: actual (%d, %d), requested (%d, %d)"),
                    size.x, size.y,
                    desiredWidth, desiredHeight);
 
@@ -495,12 +498,12 @@ bool wxICOFileHandler::LoadIcon(wxIcon *icon,
     icon->SetHICON((WXHICON)hicon);
     icon->SetSize(size.x, size.y);
 
-    return icon->IsOk();
+    return icon->Ok();
 }
 
 bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
                                     const wxString& name,
-                                    wxBitmapType WXUNUSED(flags),
+                                    long WXUNUSED(flags),
                                     int desiredWidth, int desiredHeight)
 {
     HICON hicon;
@@ -509,7 +512,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     bool hasSize = desiredWidth != -1 || desiredHeight != -1;
 
     wxASSERT_MSG( !hasSize || (desiredWidth != -1 && desiredHeight != -1),
-                  wxT("width and height should be either both -1 or not") );
+                  _T("width and height should be either both -1 or not") );
 
     // try to load the icon from this program first to allow overriding the
     // standard icons (although why one would want to do it considering that
@@ -519,13 +522,13 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
     // some icon rescaling internally which results in very ugly 16x16 icons
     if ( hasSize )
     {
-        hicon = (HICON)::LoadImage(wxGetInstance(), name.t_str(), IMAGE_ICON,
+        hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
                                     desiredWidth, desiredHeight,
                                     LR_DEFAULTCOLOR);
     }
     else
     {
-        hicon = ::LoadIcon(wxGetInstance(), name.t_str());
+        hicon = ::LoadIcon(wxGetInstance(), name);
     }
 
     // next check if it's not a standard icon
@@ -549,7 +552,6 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
             if ( name == stdIcons[nIcon].name )
             {
                 hicon = ::LoadIcon((HINSTANCE)NULL, stdIcons[nIcon].id);
-                break;
             }
         }
     }
@@ -560,7 +562,7 @@ bool wxICOResourceHandler::LoadIcon(wxIcon *icon,
 
     icon->SetHICON((WXHICON)hicon);
 
-    return icon->IsOk();
+    return icon->Ok();
 }
 
 // ----------------------------------------------------------------------------
diff --git a/Source/3rd Party/wx/src/msw/gdiobj.cpp b/Source/3rd Party/wx/src/msw/gdiobj.cpp
index 8e55b91d8..18451569e 100644
--- a/Source/3rd Party/wx/src/msw/gdiobj.cpp	
+++ b/Source/3rd Party/wx/src/msw/gdiobj.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: gdiobj.cpp 40626 2006-08-16 14:53:49Z VS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,7 @@
 
 #include "wx/msw/private.h"
 
-#define M_GDIDATA static_cast<wxGDIRefData*>(m_refData)
+#define M_GDIDATA wx_static_cast(wxGDIRefData*, m_refData)
 
 /*
 void wxGDIObject::IncrementResourceUsage(void)
diff --git a/Source/3rd Party/wx/src/msw/gdiplus.cpp b/Source/3rd Party/wx/src/msw/gdiplus.cpp
deleted file mode 100644
index 6c7487c2c..000000000
--- a/Source/3rd Party/wx/src/msw/gdiplus.cpp	
+++ /dev/null
@@ -1,924 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/gdiplus.cpp
-// Purpose:     implements wrappers for GDI+ flat API
-// Author:      Vadim Zeitlin
-// Created:     2007-03-14
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#undef WIN32_LEAN_AND_MEAN
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_GRAPHICS_CONTEXT
-
-#ifndef WX_PRECOMP
-    #include "wx/cpp.h"
-    #include "wx/log.h"
-    #include "wx/module.h"
-    #include "wx/string.h"
-#endif // WX_PRECOMP
-
-#include "wx/dynload.h"
-
-#include "wx/msw/wrapgdip.h"
-
-// w32api headers used by both MinGW and Cygwin wrongly define UINT16 inside
-// Gdiplus namespace in gdiplus.h which results in ambiguity errors when using
-// this type as UINT16 is also defined in global scope by windows.h (or rather
-// basetsd.h included from it), so we redefine it to work around this problem.
-#if defined(__CYGWIN__) || defined(__MINGW32__)
-    #define UINT16 unsigned short
-#endif
-
-// ----------------------------------------------------------------------------
-// helper macros
-// ----------------------------------------------------------------------------
-
-// return the name we use for the type of the function with the given name
-// (without "Gdip" prefix)
-#define wxGDIPLUS_FUNC_T(name) Gdip##name##_t
-
-// to avoid repeating all (several hundreds) of GDI+ functions names several
-// times in this file, we define a macro which allows us to apply another macro
-// to all (or almost all, as we sometimes have to handle functions not
-// returning GpStatus separately) these functions at once
-
-// this macro expands into an invocation of the given macro m for all GDI+
-// functions returning standard GpStatus
-//
-// m is called with the name of the function without "Gdip" prefix as the first
-// argument, the list of function parameters with their names as the second one
-// and the list of just the parameter names as the third one
-#define wxFOR_ALL_GDIPLUS_STATUS_FUNCS(m) \
-    m(CreatePath, (GpFillMode brushMode, GpPath **path), (brushMode, path)) \
-    m(CreatePath2, (GDIPCONST GpPointF* a1, GDIPCONST BYTE* a2, INT a3, GpFillMode a4, GpPath **path), (a1, a2, a3, a4, path)) \
-    m(CreatePath2I, (GDIPCONST GpPoint* a1, GDIPCONST BYTE* a2, INT a3, GpFillMode a4, GpPath **path), (a1, a2, a3, a4, path)) \
-    m(ClonePath, (GpPath* path, GpPath **clonePath), (path, clonePath)) \
-    m(DeletePath, (GpPath* path), (path)) \
-    m(ResetPath, (GpPath* path), (path)) \
-    m(GetPointCount, (GpPath* path, INT* count), (path, count)) \
-    m(GetPathTypes, (GpPath* path, BYTE* types, INT count), (path, types, count)) \
-    m(GetPathPoints, (GpPath* a1, GpPointF* points, INT count), (a1, points, count)) \
-    m(GetPathPointsI, (GpPath* a1, GpPoint* points, INT count), (a1, points, count)) \
-    m(GetPathFillMode, (GpPath *path, GpFillMode *fillmode), (path, fillmode)) \
-    m(SetPathFillMode, (GpPath *path, GpFillMode fillmode), (path, fillmode)) \
-    m(GetPathData, (GpPath *path, GpPathData* pathData), (path, pathData)) \
-    m(StartPathFigure, (GpPath *path), (path)) \
-    m(ClosePathFigure, (GpPath *path), (path)) \
-    m(ClosePathFigures, (GpPath *path), (path)) \
-    m(SetPathMarker, (GpPath* path), (path)) \
-    m(ClearPathMarkers, (GpPath* path), (path)) \
-    m(ReversePath, (GpPath* path), (path)) \
-    m(GetPathLastPoint, (GpPath* path, GpPointF* lastPoint), (path, lastPoint)) \
-    m(AddPathLine, (GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2), (path, x1, y1, x2, y2)) \
-    m(AddPathLine2, (GpPath *path, GDIPCONST GpPointF *points, INT count), (path, points, count)) \
-    m(AddPathArc, (GpPath *path, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle), (path, x, y, width, height, startAngle, sweepAngle)) \
-    m(AddPathBezier, (GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4), (path, x1, y1, x2, y2, x3, y3, x4, y4)) \
-    m(AddPathBeziers, (GpPath *path, GDIPCONST GpPointF *points, INT count), (path, points, count)) \
-    m(AddPathCurve, (GpPath *path, GDIPCONST GpPointF *points, INT count), (path, points, count)) \
-    m(AddPathCurve2, (GpPath *path, GDIPCONST GpPointF *points, INT count, REAL tension), (path, points, count, tension)) \
-    m(AddPathCurve3, (GpPath *path, GDIPCONST GpPointF *points, INT count, INT offset, INT numberOfSegments, REAL tension), (path, points, count, offset, numberOfSegments, tension)) \
-    m(AddPathClosedCurve, (GpPath *path, GDIPCONST GpPointF *points, INT count), (path, points, count)) \
-    m(AddPathClosedCurve2, (GpPath *path, GDIPCONST GpPointF *points, INT count, REAL tension), (path, points, count, tension)) \
-    m(AddPathRectangle, (GpPath *path, REAL x, REAL y, REAL width, REAL height), (path, x, y, width, height)) \
-    m(AddPathRectangles, (GpPath *path, GDIPCONST GpRectF *rects, INT count), (path, rects, count)) \
-    m(AddPathEllipse, (GpPath *path, REAL x, REAL y, REAL width, REAL height), (path, x, y, width, height)) \
-    m(AddPathPie, (GpPath *path, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle), (path, x, y, width, height, startAngle, sweepAngle)) \
-    m(AddPathPolygon, (GpPath *path, GDIPCONST GpPointF *points, INT count), (path, points, count)) \
-    m(AddPathPath, (GpPath *path, GDIPCONST GpPath* addingPath, BOOL connect), (path, addingPath, connect)) \
-    m(AddPathString, (GpPath *path, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFontFamily *family, INT style, REAL emSize, GDIPCONST RectF *layoutRect, GDIPCONST GpStringFormat *format), (path, string, length, family, style, emSize, layoutRect, format)) \
-    m(AddPathStringI, (GpPath *path, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFontFamily *family, INT style, REAL emSize, GDIPCONST Rect *layoutRect, GDIPCONST GpStringFormat *format), (path, string, length, family, style, emSize, layoutRect, format)) \
-    m(AddPathLineI, (GpPath *path, INT x1, INT y1, INT x2, INT y2), (path, x1, y1, x2, y2)) \
-    m(AddPathLine2I, (GpPath *path, GDIPCONST GpPoint *points, INT count), (path, points, count)) \
-    m(AddPathArcI, (GpPath *path, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle), (path, x, y, width, height, startAngle, sweepAngle)) \
-    m(AddPathBezierI, (GpPath *path, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4), (path, x1, y1, x2, y2, x3, y3, x4, y4)) \
-    m(AddPathBeziersI, (GpPath *path, GDIPCONST GpPoint *points, INT count), (path, points, count)) \
-    m(AddPathCurveI, (GpPath *path, GDIPCONST GpPoint *points, INT count), (path, points, count)) \
-    m(AddPathCurve2I, (GpPath *path, GDIPCONST GpPoint *points, INT count, REAL tension), (path, points, count, tension)) \
-    m(AddPathCurve3I, (GpPath *path, GDIPCONST GpPoint *points, INT count, INT offset, INT numberOfSegments, REAL tension), (path, points, count, offset, numberOfSegments, tension)) \
-    m(AddPathClosedCurveI, (GpPath *path, GDIPCONST GpPoint *points, INT count), (path, points, count)) \
-    m(AddPathClosedCurve2I, (GpPath *path, GDIPCONST GpPoint *points, INT count, REAL tension), (path, points, count, tension)) \
-    m(AddPathRectangleI, (GpPath *path, INT x, INT y, INT width, INT height), (path, x, y, width, height)) \
-    m(AddPathRectanglesI, (GpPath *path, GDIPCONST GpRect *rects, INT count), (path, rects, count)) \
-    m(AddPathEllipseI, (GpPath *path, INT x, INT y, INT width, INT height), (path, x, y, width, height)) \
-    m(AddPathPieI, (GpPath *path, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle), (path, x, y, width, height, startAngle, sweepAngle)) \
-    m(AddPathPolygonI, (GpPath *path, GDIPCONST GpPoint *points, INT count), (path, points, count)) \
-    m(FlattenPath, (GpPath *path, GpMatrix* matrix, REAL flatness), (path, matrix, flatness)) \
-    m(WindingModeOutline, (GpPath *path, GpMatrix *matrix, REAL flatness), (path, matrix, flatness)) \
-    m(WidenPath, (GpPath *nativePath, GpPen *pen, GpMatrix *matrix, REAL flatness), (nativePath, pen, matrix, flatness)) \
-    m(WarpPath, (GpPath *path, GpMatrix* matrix, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, WarpMode warpMode, REAL flatness), (path, matrix, points, count, srcx, srcy, srcwidth, srcheight, warpMode, flatness)) \
-    m(TransformPath, (GpPath* path, GpMatrix* matrix), (path, matrix)) \
-    m(GetPathWorldBounds, (GpPath* path, GpRectF* bounds, GDIPCONST GpMatrix *matrix, GDIPCONST GpPen *pen), (path, bounds, matrix, pen)) \
-    m(GetPathWorldBoundsI, (GpPath* path, GpRect* bounds, GDIPCONST GpMatrix *matrix, GDIPCONST GpPen *pen), (path, bounds, matrix, pen)) \
-    m(IsVisiblePathPoint, (GpPath* path, REAL x, REAL y, GpGraphics *graphics, BOOL *result), (path, x, y, graphics, result)) \
-    m(IsVisiblePathPointI, (GpPath* path, INT x, INT y, GpGraphics *graphics, BOOL *result), (path, x, y, graphics, result)) \
-    m(IsOutlineVisiblePathPoint, (GpPath* path, REAL x, REAL y, GpPen *pen, GpGraphics *graphics, BOOL *result), (path, x, y, pen, graphics, result)) \
-    m(IsOutlineVisiblePathPointI, (GpPath* path, INT x, INT y, GpPen *pen, GpGraphics *graphics, BOOL *result), (path, x, y, pen, graphics, result)) \
-    m(CreatePathIter, (GpPathIterator **iterator, GpPath* path), (iterator, path)) \
-    m(DeletePathIter, (GpPathIterator *iterator), (iterator)) \
-    m(PathIterNextSubpath, (GpPathIterator* iterator, INT *resultCount, INT* startIndex, INT* endIndex, BOOL* isClosed), (iterator, resultCount, startIndex, endIndex, isClosed)) \
-    m(PathIterNextSubpathPath, (GpPathIterator* iterator, INT* resultCount, GpPath* path, BOOL* isClosed), (iterator, resultCount, path, isClosed)) \
-    m(PathIterNextPathType, (GpPathIterator* iterator, INT* resultCount, BYTE* pathType, INT* startIndex, INT* endIndex), (iterator, resultCount, pathType, startIndex, endIndex)) \
-    m(PathIterNextMarker, (GpPathIterator* iterator, INT *resultCount, INT* startIndex, INT* endIndex), (iterator, resultCount, startIndex, endIndex)) \
-    m(PathIterNextMarkerPath, (GpPathIterator* iterator, INT* resultCount, GpPath* path), (iterator, resultCount, path)) \
-    m(PathIterGetCount, (GpPathIterator* iterator, INT* count), (iterator, count)) \
-    m(PathIterGetSubpathCount, (GpPathIterator* iterator, INT* count), (iterator, count)) \
-    m(PathIterIsValid, (GpPathIterator* iterator, BOOL* valid), (iterator, valid)) \
-    m(PathIterHasCurve, (GpPathIterator* iterator, BOOL* hasCurve), (iterator, hasCurve)) \
-    m(PathIterRewind, (GpPathIterator* iterator), (iterator)) \
-    m(PathIterEnumerate, (GpPathIterator* iterator, INT* resultCount, GpPointF *points, BYTE *types, INT count), (iterator, resultCount, points, types, count)) \
-    m(PathIterCopyData, (GpPathIterator* iterator, INT* resultCount, GpPointF* points, BYTE* types, INT startIndex, INT endIndex), (iterator, resultCount, points, types, startIndex, endIndex)) \
-    m(CreateMatrix, (GpMatrix **matrix), (matrix)) \
-    m(CreateMatrix2, (REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy, GpMatrix **matrix), (m11, m12, m21, m22, dx, dy, matrix)) \
-    m(CreateMatrix3, (GDIPCONST GpRectF *rect, GDIPCONST GpPointF *dstplg, GpMatrix **matrix), (rect, dstplg, matrix)) \
-    m(CreateMatrix3I, (GDIPCONST GpRect *rect, GDIPCONST GpPoint *dstplg, GpMatrix **matrix), (rect, dstplg, matrix)) \
-    m(CloneMatrix, (GpMatrix *matrix, GpMatrix **cloneMatrix), (matrix, cloneMatrix)) \
-    m(DeleteMatrix, (GpMatrix *matrix), (matrix)) \
-    m(SetMatrixElements, (GpMatrix *matrix, REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy), (matrix, m11, m12, m21, m22, dx, dy)) \
-    m(MultiplyMatrix, (GpMatrix *matrix, GpMatrix* matrix2, GpMatrixOrder order), (matrix, matrix2, order)) \
-    m(TranslateMatrix, (GpMatrix *matrix, REAL offsetX, REAL offsetY, GpMatrixOrder order), (matrix, offsetX, offsetY, order)) \
-    m(ScaleMatrix, (GpMatrix *matrix, REAL scaleX, REAL scaleY, GpMatrixOrder order), (matrix, scaleX, scaleY, order)) \
-    m(RotateMatrix, (GpMatrix *matrix, REAL angle, GpMatrixOrder order), (matrix, angle, order)) \
-    m(ShearMatrix, (GpMatrix *matrix, REAL shearX, REAL shearY, GpMatrixOrder order), (matrix, shearX, shearY, order)) \
-    m(InvertMatrix, (GpMatrix *matrix), (matrix)) \
-    m(TransformMatrixPoints, (GpMatrix *matrix, GpPointF *pts, INT count), (matrix, pts, count)) \
-    m(TransformMatrixPointsI, (GpMatrix *matrix, GpPoint *pts, INT count), (matrix, pts, count)) \
-    m(VectorTransformMatrixPoints, (GpMatrix *matrix, GpPointF *pts, INT count), (matrix, pts, count)) \
-    m(VectorTransformMatrixPointsI, (GpMatrix *matrix, GpPoint *pts, INT count), (matrix, pts, count)) \
-    m(GetMatrixElements, (GDIPCONST GpMatrix *matrix, REAL *matrixOut), (matrix, matrixOut)) \
-    m(IsMatrixInvertible, (GDIPCONST GpMatrix *matrix, BOOL *result), (matrix, result)) \
-    m(IsMatrixIdentity, (GDIPCONST GpMatrix *matrix, BOOL *result), (matrix, result)) \
-    m(IsMatrixEqual, (GDIPCONST GpMatrix *matrix, GDIPCONST GpMatrix *matrix2, BOOL *result), (matrix, matrix2, result)) \
-    m(CreateRegion, (GpRegion **region), (region)) \
-    m(CreateRegionRect, (GDIPCONST GpRectF *rect, GpRegion **region), (rect, region)) \
-    m(CreateRegionRectI, (GDIPCONST GpRect *rect, GpRegion **region), (rect, region)) \
-    m(CreateRegionPath, (GpPath *path, GpRegion **region), (path, region)) \
-    m(CreateRegionRgnData, (GDIPCONST BYTE *regionData, INT size, GpRegion **region), (regionData, size, region)) \
-    m(CreateRegionHrgn, (HRGN hRgn, GpRegion **region), (hRgn, region)) \
-    m(CloneRegion, (GpRegion *region, GpRegion **cloneRegion), (region, cloneRegion)) \
-    m(DeleteRegion, (GpRegion *region), (region)) \
-    m(SetInfinite, (GpRegion *region), (region)) \
-    m(SetEmpty, (GpRegion *region), (region)) \
-    m(CombineRegionRect, (GpRegion *region, GDIPCONST GpRectF *rect, CombineMode combineMode), (region, rect, combineMode)) \
-    m(CombineRegionRectI, (GpRegion *region, GDIPCONST GpRect *rect, CombineMode combineMode), (region, rect, combineMode)) \
-    m(CombineRegionPath, (GpRegion *region, GpPath *path, CombineMode combineMode), (region, path, combineMode)) \
-    m(CombineRegionRegion, (GpRegion *region, GpRegion *region2, CombineMode combineMode), (region, region2, combineMode)) \
-    m(TranslateRegion, (GpRegion *region, REAL dx, REAL dy), (region, dx, dy)) \
-    m(TranslateRegionI, (GpRegion *region, INT dx, INT dy), (region, dx, dy)) \
-    m(TransformRegion, (GpRegion *region, GpMatrix *matrix), (region, matrix)) \
-    m(GetRegionBounds, (GpRegion *region, GpGraphics *graphics, GpRectF *rect), (region, graphics, rect)) \
-    m(GetRegionBoundsI, (GpRegion *region, GpGraphics *graphics, GpRect *rect), (region, graphics, rect)) \
-    m(GetRegionHRgn, (GpRegion *region, GpGraphics *graphics, HRGN *hRgn), (region, graphics, hRgn)) \
-    m(IsEmptyRegion, (GpRegion *region, GpGraphics *graphics, BOOL *result), (region, graphics, result)) \
-    m(IsInfiniteRegion, (GpRegion *region, GpGraphics *graphics, BOOL *result), (region, graphics, result)) \
-    m(IsEqualRegion, (GpRegion *region, GpRegion *region2, GpGraphics *graphics, BOOL *result), (region, region2, graphics, result)) \
-    m(GetRegionDataSize, (GpRegion *region, UINT *bufferSize), (region, bufferSize)) \
-    m(GetRegionData, (GpRegion *region, BYTE *buffer, UINT bufferSize, UINT *sizeFilled), (region, buffer, bufferSize, sizeFilled)) \
-    m(IsVisibleRegionPoint, (GpRegion *region, REAL x, REAL y, GpGraphics *graphics, BOOL *result), (region, x, y, graphics, result)) \
-    m(IsVisibleRegionPointI, (GpRegion *region, INT x, INT y, GpGraphics *graphics, BOOL *result), (region, x, y, graphics, result)) \
-    m(IsVisibleRegionRect, (GpRegion *region, REAL x, REAL y, REAL width, REAL height, GpGraphics *graphics, BOOL *result), (region, x, y, width, height, graphics, result)) \
-    m(IsVisibleRegionRectI, (GpRegion *region, INT x, INT y, INT width, INT height, GpGraphics *graphics, BOOL *result), (region, x, y, width, height, graphics, result)) \
-    m(GetRegionScansCount, (GpRegion *region, UINT* count, GpMatrix* matrix), (region, count, matrix)) \
-    m(GetRegionScans, (GpRegion *region, GpRectF* rects, INT* count, GpMatrix* matrix), (region, rects, count, matrix)) \
-    m(GetRegionScansI, (GpRegion *region, GpRect* rects, INT* count, GpMatrix* matrix), (region, rects, count, matrix)) \
-    m(CloneBrush, (GpBrush *brush, GpBrush **cloneBrush), (brush, cloneBrush)) \
-    m(DeleteBrush, (GpBrush *brush), (brush)) \
-    m(GetBrushType, (GpBrush *brush, GpBrushType *type), (brush, type)) \
-    m(CreateHatchBrush, (GpHatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush), (hatchstyle, forecol, backcol, brush)) \
-    m(GetHatchStyle, (GpHatch *brush, GpHatchStyle *hatchstyle), (brush, hatchstyle)) \
-    m(GetHatchForegroundColor, (GpHatch *brush, ARGB* forecol), (brush, forecol)) \
-    m(GetHatchBackgroundColor, (GpHatch *brush, ARGB* backcol), (brush, backcol)) \
-    m(CreateTexture, (GpImage *image, GpWrapMode wrapmode, GpTexture **texture), (image, wrapmode, texture)) \
-    m(CreateTexture2, (GpImage *image, GpWrapMode wrapmode, REAL x, REAL y, REAL width, REAL height, GpTexture **texture), (image, wrapmode, x, y, width, height, texture)) \
-    m(CreateTextureIA, (GpImage *image, GDIPCONST GpImageAttributes *imageAttributes, REAL x, REAL y, REAL width, REAL height, GpTexture **texture), (image, imageAttributes, x, y, width, height, texture)) \
-    m(CreateTexture2I, (GpImage *image, GpWrapMode wrapmode, INT x, INT y, INT width, INT height, GpTexture **texture), (image, wrapmode, x, y, width, height, texture)) \
-    m(CreateTextureIAI, (GpImage *image, GDIPCONST GpImageAttributes *imageAttributes, INT x, INT y, INT width, INT height, GpTexture **texture), (image, imageAttributes, x, y, width, height, texture)) \
-    m(GetTextureTransform, (GpTexture *brush, GpMatrix *matrix), (brush, matrix)) \
-    m(SetTextureTransform, (GpTexture *brush, GDIPCONST GpMatrix *matrix), (brush, matrix)) \
-    m(ResetTextureTransform, (GpTexture* brush), (brush)) \
-    m(MultiplyTextureTransform, (GpTexture* brush, GDIPCONST GpMatrix *matrix, GpMatrixOrder order), (brush, matrix, order)) \
-    m(TranslateTextureTransform, (GpTexture* brush, REAL dx, REAL dy, GpMatrixOrder order), (brush, dx, dy, order)) \
-    m(ScaleTextureTransform, (GpTexture* brush, REAL sx, REAL sy, GpMatrixOrder order), (brush, sx, sy, order)) \
-    m(RotateTextureTransform, (GpTexture* brush, REAL angle, GpMatrixOrder order), (brush, angle, order)) \
-    m(SetTextureWrapMode, (GpTexture *brush, GpWrapMode wrapmode), (brush, wrapmode)) \
-    m(GetTextureWrapMode, (GpTexture *brush, GpWrapMode *wrapmode), (brush, wrapmode)) \
-    m(GetTextureImage, (GpTexture *brush, GpImage **image), (brush, image)) \
-    m(CreateSolidFill, (ARGB color, GpSolidFill **brush), (color, brush)) \
-    m(SetSolidFillColor, (GpSolidFill *brush, ARGB color), (brush, color)) \
-    m(GetSolidFillColor, (GpSolidFill *brush, ARGB *color), (brush, color)) \
-    m(CreateLineBrush, (GDIPCONST GpPointF* point1, GDIPCONST GpPointF* point2, ARGB color1, ARGB color2, GpWrapMode wrapMode, GpLineGradient **lineGradient), (point1, point2, color1, color2, wrapMode, lineGradient)) \
-    m(CreateLineBrushI, (GDIPCONST GpPoint* point1, GDIPCONST GpPoint* point2, ARGB color1, ARGB color2, GpWrapMode wrapMode, GpLineGradient **lineGradient), (point1, point2, color1, color2, wrapMode, lineGradient)) \
-    m(CreateLineBrushFromRect, (GDIPCONST GpRectF* rect, ARGB color1, ARGB color2, LinearGradientMode mode, GpWrapMode wrapMode, GpLineGradient **lineGradient), (rect, color1, color2, mode, wrapMode, lineGradient)) \
-    m(CreateLineBrushFromRectI, (GDIPCONST GpRect* rect, ARGB color1, ARGB color2, LinearGradientMode mode, GpWrapMode wrapMode, GpLineGradient **lineGradient), (rect, color1, color2, mode, wrapMode, lineGradient)) \
-    m(CreateLineBrushFromRectWithAngle, (GDIPCONST GpRectF* rect, ARGB color1, ARGB color2, REAL angle, BOOL isAngleScalable, GpWrapMode wrapMode, GpLineGradient **lineGradient), (rect, color1, color2, angle, isAngleScalable, wrapMode, lineGradient)) \
-    m(CreateLineBrushFromRectWithAngleI, (GDIPCONST GpRect* rect, ARGB color1, ARGB color2, REAL angle, BOOL isAngleScalable, GpWrapMode wrapMode, GpLineGradient **lineGradient), (rect, color1, color2, angle, isAngleScalable, wrapMode, lineGradient)) \
-    m(SetLineColors, (GpLineGradient *brush, ARGB color1, ARGB color2), (brush, color1, color2)) \
-    m(GetLineColors, (GpLineGradient *brush, ARGB* colors), (brush, colors)) \
-    m(GetLineRect, (GpLineGradient *brush, GpRectF *rect), (brush, rect)) \
-    m(GetLineRectI, (GpLineGradient *brush, GpRect *rect), (brush, rect)) \
-    m(SetLineGammaCorrection, (GpLineGradient *brush, BOOL useGammaCorrection), (brush, useGammaCorrection)) \
-    m(GetLineGammaCorrection, (GpLineGradient *brush, BOOL *useGammaCorrection), (brush, useGammaCorrection)) \
-    m(GetLineBlendCount, (GpLineGradient *brush, INT *count), (brush, count)) \
-    m(GetLineBlend, (GpLineGradient *brush, REAL *blend, REAL* positions, INT count), (brush, blend, positions, count)) \
-    m(SetLineBlend, (GpLineGradient *brush, GDIPCONST REAL *blend, GDIPCONST REAL* positions, INT count), (brush, blend, positions, count)) \
-    m(GetLinePresetBlendCount, (GpLineGradient *brush, INT *count), (brush, count)) \
-    m(GetLinePresetBlend, (GpLineGradient *brush, ARGB *blend, REAL* positions, INT count), (brush, blend, positions, count)) \
-    m(SetLinePresetBlend, (GpLineGradient *brush, GDIPCONST ARGB *blend, GDIPCONST REAL* positions, INT count), (brush, blend, positions, count)) \
-    m(SetLineSigmaBlend, (GpLineGradient *brush, REAL focus, REAL scale), (brush, focus, scale)) \
-    m(SetLineLinearBlend, (GpLineGradient *brush, REAL focus, REAL scale), (brush, focus, scale)) \
-    m(SetLineWrapMode, (GpLineGradient *brush, GpWrapMode wrapmode), (brush, wrapmode)) \
-    m(GetLineWrapMode, (GpLineGradient *brush, GpWrapMode *wrapmode), (brush, wrapmode)) \
-    m(GetLineTransform, (GpLineGradient *brush, GpMatrix *matrix), (brush, matrix)) \
-    m(SetLineTransform, (GpLineGradient *brush, GDIPCONST GpMatrix *matrix), (brush, matrix)) \
-    m(ResetLineTransform, (GpLineGradient* brush), (brush)) \
-    m(MultiplyLineTransform, (GpLineGradient* brush, GDIPCONST GpMatrix *matrix, GpMatrixOrder order), (brush, matrix, order)) \
-    m(TranslateLineTransform, (GpLineGradient* brush, REAL dx, REAL dy, GpMatrixOrder order), (brush, dx, dy, order)) \
-    m(ScaleLineTransform, (GpLineGradient* brush, REAL sx, REAL sy, GpMatrixOrder order), (brush, sx, sy, order)) \
-    m(RotateLineTransform, (GpLineGradient* brush, REAL angle, GpMatrixOrder order), (brush, angle, order)) \
-    m(CreatePathGradient, (GDIPCONST GpPointF* points, INT count, GpWrapMode wrapMode, GpPathGradient **polyGradient), (points, count, wrapMode, polyGradient)) \
-    m(CreatePathGradientI, (GDIPCONST GpPoint* points, INT count, GpWrapMode wrapMode, GpPathGradient **polyGradient), (points, count, wrapMode, polyGradient)) \
-    m(CreatePathGradientFromPath, (GDIPCONST GpPath* path, GpPathGradient **polyGradient), (path, polyGradient)) \
-    m(GetPathGradientCenterColor, (GpPathGradient *brush, ARGB* colors), (brush, colors)) \
-    m(SetPathGradientCenterColor, (GpPathGradient *brush, ARGB colors), (brush, colors)) \
-    m(GetPathGradientSurroundColorsWithCount, (GpPathGradient *brush, ARGB* color, INT* count), (brush, color, count)) \
-    m(SetPathGradientSurroundColorsWithCount, (GpPathGradient *brush, GDIPCONST ARGB* color, INT* count), (brush, color, count)) \
-    m(GetPathGradientPath, (GpPathGradient *brush, GpPath *path), (brush, path)) \
-    m(SetPathGradientPath, (GpPathGradient *brush, GDIPCONST GpPath *path), (brush, path)) \
-    m(GetPathGradientCenterPoint, (GpPathGradient *brush, GpPointF* points), (brush, points)) \
-    m(GetPathGradientCenterPointI, (GpPathGradient *brush, GpPoint* points), (brush, points)) \
-    m(SetPathGradientCenterPoint, (GpPathGradient *brush, GDIPCONST GpPointF* points), (brush, points)) \
-    m(SetPathGradientCenterPointI, (GpPathGradient *brush, GDIPCONST GpPoint* points), (brush, points)) \
-    m(GetPathGradientRect, (GpPathGradient *brush, GpRectF *rect), (brush, rect)) \
-    m(GetPathGradientRectI, (GpPathGradient *brush, GpRect *rect), (brush, rect)) \
-    m(GetPathGradientPointCount, (GpPathGradient *brush, INT* count), (brush, count)) \
-    m(GetPathGradientSurroundColorCount, (GpPathGradient *brush, INT* count), (brush, count)) \
-    m(SetPathGradientGammaCorrection, (GpPathGradient *brush, BOOL useGammaCorrection), (brush, useGammaCorrection)) \
-    m(GetPathGradientGammaCorrection, (GpPathGradient *brush, BOOL *useGammaCorrection), (brush, useGammaCorrection)) \
-    m(GetPathGradientBlendCount, (GpPathGradient *brush, INT *count), (brush, count)) \
-    m(GetPathGradientBlend, (GpPathGradient *brush, REAL *blend, REAL *positions, INT count), (brush, blend, positions, count)) \
-    m(SetPathGradientBlend, (GpPathGradient *brush, GDIPCONST REAL *blend, GDIPCONST REAL *positions, INT count), (brush, blend, positions, count)) \
-    m(GetPathGradientPresetBlendCount, (GpPathGradient *brush, INT *count), (brush, count)) \
-    m(GetPathGradientPresetBlend, (GpPathGradient *brush, ARGB *blend, REAL* positions, INT count), (brush, blend, positions, count)) \
-    m(SetPathGradientPresetBlend, (GpPathGradient *brush, GDIPCONST ARGB *blend, GDIPCONST REAL* positions, INT count), (brush, blend, positions, count)) \
-    m(SetPathGradientSigmaBlend, (GpPathGradient *brush, REAL focus, REAL scale), (brush, focus, scale)) \
-    m(SetPathGradientLinearBlend, (GpPathGradient *brush, REAL focus, REAL scale), (brush, focus, scale)) \
-    m(GetPathGradientWrapMode, (GpPathGradient *brush, GpWrapMode *wrapmode), (brush, wrapmode)) \
-    m(SetPathGradientWrapMode, (GpPathGradient *brush, GpWrapMode wrapmode), (brush, wrapmode)) \
-    m(GetPathGradientTransform, (GpPathGradient *brush, GpMatrix *matrix), (brush, matrix)) \
-    m(SetPathGradientTransform, (GpPathGradient *brush, GpMatrix *matrix), (brush, matrix)) \
-    m(ResetPathGradientTransform, (GpPathGradient* brush), (brush)) \
-    m(MultiplyPathGradientTransform, (GpPathGradient* brush, GDIPCONST GpMatrix *matrix, GpMatrixOrder order), (brush, matrix, order)) \
-    m(TranslatePathGradientTransform, (GpPathGradient* brush, REAL dx, REAL dy, GpMatrixOrder order), (brush, dx, dy, order)) \
-    m(ScalePathGradientTransform, (GpPathGradient* brush, REAL sx, REAL sy, GpMatrixOrder order), (brush, sx, sy, order)) \
-    m(RotatePathGradientTransform, (GpPathGradient* brush, REAL angle, GpMatrixOrder order), (brush, angle, order)) \
-    m(GetPathGradientFocusScales, (GpPathGradient *brush, REAL* xScale, REAL* yScale), (brush, xScale, yScale)) \
-    m(SetPathGradientFocusScales, (GpPathGradient *brush, REAL xScale, REAL yScale), (brush, xScale, yScale)) \
-    m(CreatePen1, (ARGB color, REAL width, GpUnit unit, GpPen **pen), (color, width, unit, pen)) \
-    m(CreatePen2, (GpBrush *brush, REAL width, GpUnit unit, GpPen **pen), (brush, width, unit, pen)) \
-    m(ClonePen, (GpPen *pen, GpPen **clonepen), (pen, clonepen)) \
-    m(DeletePen, (GpPen *pen), (pen)) \
-    m(SetPenWidth, (GpPen *pen, REAL width), (pen, width)) \
-    m(GetPenWidth, (GpPen *pen, REAL *width), (pen, width)) \
-    m(SetPenUnit, (GpPen *pen, GpUnit unit), (pen, unit)) \
-    m(GetPenUnit, (GpPen *pen, GpUnit *unit), (pen, unit)) \
-    m(SetPenLineCap197819, (GpPen *pen, GpLineCap startCap, GpLineCap endCap, GpDashCap dashCap), (pen, startCap, endCap, dashCap)) \
-    m(SetPenStartCap, (GpPen *pen, GpLineCap startCap), (pen, startCap)) \
-    m(SetPenEndCap, (GpPen *pen, GpLineCap endCap), (pen, endCap)) \
-    m(SetPenDashCap197819, (GpPen *pen, GpDashCap dashCap), (pen, dashCap)) \
-    m(GetPenStartCap, (GpPen *pen, GpLineCap *startCap), (pen, startCap)) \
-    m(GetPenEndCap, (GpPen *pen, GpLineCap *endCap), (pen, endCap)) \
-    m(GetPenDashCap197819, (GpPen *pen, GpDashCap *dashCap), (pen, dashCap)) \
-    m(SetPenLineJoin, (GpPen *pen, GpLineJoin lineJoin), (pen, lineJoin)) \
-    m(GetPenLineJoin, (GpPen *pen, GpLineJoin *lineJoin), (pen, lineJoin)) \
-    m(SetPenCustomStartCap, (GpPen *pen, GpCustomLineCap* customCap), (pen, customCap)) \
-    m(GetPenCustomStartCap, (GpPen *pen, GpCustomLineCap** customCap), (pen, customCap)) \
-    m(SetPenCustomEndCap, (GpPen *pen, GpCustomLineCap* customCap), (pen, customCap)) \
-    m(GetPenCustomEndCap, (GpPen *pen, GpCustomLineCap** customCap), (pen, customCap)) \
-    m(SetPenMiterLimit, (GpPen *pen, REAL miterLimit), (pen, miterLimit)) \
-    m(GetPenMiterLimit, (GpPen *pen, REAL *miterLimit), (pen, miterLimit)) \
-    m(SetPenMode, (GpPen *pen, GpPenAlignment penMode), (pen, penMode)) \
-    m(GetPenMode, (GpPen *pen, GpPenAlignment *penMode), (pen, penMode)) \
-    m(SetPenTransform, (GpPen *pen, GpMatrix *matrix), (pen, matrix)) \
-    m(GetPenTransform, (GpPen *pen, GpMatrix *matrix), (pen, matrix)) \
-    m(ResetPenTransform, (GpPen *pen), (pen)) \
-    m(MultiplyPenTransform, (GpPen *pen, GDIPCONST GpMatrix *matrix, GpMatrixOrder order), (pen, matrix, order)) \
-    m(TranslatePenTransform, (GpPen *pen, REAL dx, REAL dy, GpMatrixOrder order), (pen, dx, dy, order)) \
-    m(ScalePenTransform, (GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order), (pen, sx, sy, order)) \
-    m(RotatePenTransform, (GpPen *pen, REAL angle, GpMatrixOrder order), (pen, angle, order)) \
-    m(SetPenColor, (GpPen *pen, ARGB argb), (pen, argb)) \
-    m(GetPenColor, (GpPen *pen, ARGB *argb), (pen, argb)) \
-    m(SetPenBrushFill, (GpPen *pen, GpBrush *brush), (pen, brush)) \
-    m(GetPenBrushFill, (GpPen *pen, GpBrush **brush), (pen, brush)) \
-    m(GetPenFillType, (GpPen *pen, GpPenType* type), (pen, type)) \
-    m(GetPenDashStyle, (GpPen *pen, GpDashStyle *dashstyle), (pen, dashstyle)) \
-    m(SetPenDashStyle, (GpPen *pen, GpDashStyle dashstyle), (pen, dashstyle)) \
-    m(GetPenDashOffset, (GpPen *pen, REAL *offset), (pen, offset)) \
-    m(SetPenDashOffset, (GpPen *pen, REAL offset), (pen, offset)) \
-    m(GetPenDashCount, (GpPen *pen, INT *count), (pen, count)) \
-    m(SetPenDashArray, (GpPen *pen, GDIPCONST REAL *dash, INT count), (pen, dash, count)) \
-    m(GetPenDashArray, (GpPen *pen, REAL *dash, INT count), (pen, dash, count)) \
-    m(GetPenCompoundCount, (GpPen *pen, INT *count), (pen, count)) \
-    m(SetPenCompoundArray, (GpPen *pen, GDIPCONST REAL *dash, INT count), (pen, dash, count)) \
-    m(GetPenCompoundArray, (GpPen *pen, REAL *dash, INT count), (pen, dash, count)) \
-    m(CreateCustomLineCap, (GpPath* fillPath, GpPath* strokePath, GpLineCap baseCap, REAL baseInset, GpCustomLineCap **customCap), (fillPath, strokePath, baseCap, baseInset, customCap)) \
-    m(DeleteCustomLineCap, (GpCustomLineCap* customCap), (customCap)) \
-    m(CloneCustomLineCap, (GpCustomLineCap* customCap, GpCustomLineCap** clonedCap), (customCap, clonedCap)) \
-    m(GetCustomLineCapType, (GpCustomLineCap* customCap, CustomLineCapType* capType), (customCap, capType)) \
-    m(SetCustomLineCapStrokeCaps, (GpCustomLineCap* customCap, GpLineCap startCap, GpLineCap endCap), (customCap, startCap, endCap)) \
-    m(GetCustomLineCapStrokeCaps, (GpCustomLineCap* customCap, GpLineCap* startCap, GpLineCap* endCap), (customCap, startCap, endCap)) \
-    m(SetCustomLineCapStrokeJoin, (GpCustomLineCap* customCap, GpLineJoin lineJoin), (customCap, lineJoin)) \
-    m(GetCustomLineCapStrokeJoin, (GpCustomLineCap* customCap, GpLineJoin* lineJoin), (customCap, lineJoin)) \
-    m(SetCustomLineCapBaseCap, (GpCustomLineCap* customCap, GpLineCap baseCap), (customCap, baseCap)) \
-    m(GetCustomLineCapBaseCap, (GpCustomLineCap* customCap, GpLineCap* baseCap), (customCap, baseCap)) \
-    m(SetCustomLineCapBaseInset, (GpCustomLineCap* customCap, REAL inset), (customCap, inset)) \
-    m(GetCustomLineCapBaseInset, (GpCustomLineCap* customCap, REAL* inset), (customCap, inset)) \
-    m(SetCustomLineCapWidthScale, (GpCustomLineCap* customCap, REAL widthScale), (customCap, widthScale)) \
-    m(GetCustomLineCapWidthScale, (GpCustomLineCap* customCap, REAL* widthScale), (customCap, widthScale)) \
-    m(CreateAdjustableArrowCap, (REAL height, REAL width, BOOL isFilled, GpAdjustableArrowCap **cap), (height, width, isFilled, cap)) \
-    m(SetAdjustableArrowCapHeight, (GpAdjustableArrowCap* cap, REAL height), (cap, height)) \
-    m(GetAdjustableArrowCapHeight, (GpAdjustableArrowCap* cap, REAL* height), (cap, height)) \
-    m(SetAdjustableArrowCapWidth, (GpAdjustableArrowCap* cap, REAL width), (cap, width)) \
-    m(GetAdjustableArrowCapWidth, (GpAdjustableArrowCap* cap, REAL* width), (cap, width)) \
-    m(SetAdjustableArrowCapMiddleInset, (GpAdjustableArrowCap* cap, REAL middleInset), (cap, middleInset)) \
-    m(GetAdjustableArrowCapMiddleInset, (GpAdjustableArrowCap* cap, REAL* middleInset), (cap, middleInset)) \
-    m(SetAdjustableArrowCapFillState, (GpAdjustableArrowCap* cap, BOOL fillState), (cap, fillState)) \
-    m(GetAdjustableArrowCapFillState, (GpAdjustableArrowCap* cap, BOOL* fillState), (cap, fillState)) \
-    m(LoadImageFromStream, (IStream* stream, GpImage **image), (stream, image)) \
-    m(LoadImageFromFile, (GDIPCONST WCHAR* filename, GpImage **image), (filename, image)) \
-    m(LoadImageFromStreamICM, (IStream* stream, GpImage **image), (stream, image)) \
-    m(LoadImageFromFileICM, (GDIPCONST WCHAR* filename, GpImage **image), (filename, image)) \
-    m(CloneImage, (GpImage *image, GpImage **cloneImage), (image, cloneImage)) \
-    m(DisposeImage, (GpImage *image), (image)) \
-    m(SaveImageToFile, (GpImage *image, GDIPCONST WCHAR* filename, GDIPCONST CLSID* clsidEncoder, GDIPCONST EncoderParameters* encoderParams), (image, filename, clsidEncoder, encoderParams)) \
-    m(SaveImageToStream, (GpImage *image, IStream* stream, GDIPCONST CLSID* clsidEncoder, GDIPCONST EncoderParameters* encoderParams), (image, stream, clsidEncoder, encoderParams)) \
-    m(SaveAdd, (GpImage *image, GDIPCONST EncoderParameters* encoderParams), (image, encoderParams)) \
-    m(SaveAddImage, (GpImage *image, GpImage* newImage, GDIPCONST EncoderParameters* encoderParams), (image, newImage, encoderParams)) \
-    m(GetImageGraphicsContext, (GpImage *image, GpGraphics **graphics), (image, graphics)) \
-    m(GetImageBounds, (GpImage *image, GpRectF *srcRect, GpUnit *srcUnit), (image, srcRect, srcUnit)) \
-    m(GetImageDimension, (GpImage *image, REAL *width, REAL *height), (image, width, height)) \
-    m(GetImageType, (GpImage *image, ImageType *type), (image, type)) \
-    m(GetImageWidth, (GpImage *image, UINT *width), (image, width)) \
-    m(GetImageHeight, (GpImage *image, UINT *height), (image, height)) \
-    m(GetImageHorizontalResolution, (GpImage *image, REAL *resolution), (image, resolution)) \
-    m(GetImageVerticalResolution, (GpImage *image, REAL *resolution), (image, resolution)) \
-    m(GetImageFlags, (GpImage *image, UINT *flags), (image, flags)) \
-    m(GetImageRawFormat, (GpImage *image, GUID *format), (image, format)) \
-    m(GetImagePixelFormat, (GpImage *image, PixelFormat *format), (image, format)) \
-    m(GetImageThumbnail, (GpImage *image, UINT thumbWidth, UINT thumbHeight, GpImage **thumbImage, GetThumbnailImageAbort callback, VOID *callbackData), (image, thumbWidth, thumbHeight, thumbImage, callback, callbackData)) \
-    m(GetEncoderParameterListSize, (GpImage *image, GDIPCONST CLSID* clsidEncoder, UINT* size), (image, clsidEncoder, size)) \
-    m(GetEncoderParameterList, (GpImage *image, GDIPCONST CLSID* clsidEncoder, UINT size, EncoderParameters* buffer), (image, clsidEncoder, size, buffer)) \
-    m(ImageGetFrameDimensionsCount, (GpImage* image, UINT* count), (image, count)) \
-    m(ImageGetFrameDimensionsList, (GpImage* image, GUID* dimensionIDs, UINT count), (image, dimensionIDs, count)) \
-    m(ImageGetFrameCount, (GpImage *image, GDIPCONST GUID* dimensionID, UINT* count), (image, dimensionID, count)) \
-    m(ImageSelectActiveFrame, (GpImage *image, GDIPCONST GUID* dimensionID, UINT frameIndex), (image, dimensionID, frameIndex)) \
-    m(ImageRotateFlip, (GpImage *image, RotateFlipType rfType), (image, rfType)) \
-    m(GetImagePalette, (GpImage *image, ColorPalette *palette, INT size), (image, palette, size)) \
-    m(SetImagePalette, (GpImage *image, GDIPCONST ColorPalette *palette), (image, palette)) \
-    m(GetImagePaletteSize, (GpImage *image, INT *size), (image, size)) \
-    m(GetPropertyCount, (GpImage *image, UINT* numOfProperty), (image, numOfProperty)) \
-    m(GetPropertyIdList, (GpImage *image, UINT numOfProperty, PROPID* list), (image, numOfProperty, list)) \
-    m(GetPropertyItemSize, (GpImage *image, PROPID propId, UINT* size), (image, propId, size)) \
-    m(GetPropertyItem, (GpImage *image, PROPID propId,UINT propSize, PropertyItem* buffer), (image, propId, propSize, buffer)) \
-    m(GetPropertySize, (GpImage *image, UINT* totalBufferSize, UINT* numProperties), (image, totalBufferSize, numProperties)) \
-    m(GetAllPropertyItems, (GpImage *image, UINT totalBufferSize, UINT numProperties, PropertyItem* allItems), (image, totalBufferSize, numProperties, allItems)) \
-    m(RemovePropertyItem, (GpImage *image, PROPID propId), (image, propId)) \
-    m(SetPropertyItem, (GpImage *image, GDIPCONST PropertyItem* item), (image, item)) \
-    m(ImageForceValidation, (GpImage *image), (image)) \
-    m(CreateBitmapFromStream, (IStream* stream, GpBitmap **bitmap), (stream, bitmap)) \
-    m(CreateBitmapFromFile, (GDIPCONST WCHAR* filename, GpBitmap **bitmap), (filename, bitmap)) \
-    m(CreateBitmapFromStreamICM, (IStream* stream, GpBitmap **bitmap), (stream, bitmap)) \
-    m(CreateBitmapFromFileICM, (GDIPCONST WCHAR* filename, GpBitmap **bitmap), (filename, bitmap)) \
-    m(CreateBitmapFromScan0, (INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap), (width, height, stride, format, scan0, bitmap)) \
-    m(CreateBitmapFromGraphics, (INT width, INT height, GpGraphics* target, GpBitmap** bitmap), (width, height, target, bitmap)) \
-    m(CreateBitmapFromDirectDrawSurface, (IDirectDrawSurface7* surface, GpBitmap** bitmap), (surface, bitmap)) \
-    m(CreateBitmapFromGdiDib, (GDIPCONST BITMAPINFO* gdiBitmapInfo, VOID* gdiBitmapData, GpBitmap** bitmap), (gdiBitmapInfo, gdiBitmapData, bitmap)) \
-    m(CreateBitmapFromHBITMAP, (HBITMAP hbm, HPALETTE hpal, GpBitmap** bitmap), (hbm, hpal, bitmap)) \
-    m(CreateHBITMAPFromBitmap, (GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background), (bitmap, hbmReturn, background)) \
-    m(CreateBitmapFromHICON, (HICON hicon, GpBitmap** bitmap), (hicon, bitmap)) \
-    m(CreateHICONFromBitmap, (GpBitmap* bitmap, HICON* hbmReturn), (bitmap, hbmReturn)) \
-    m(CreateBitmapFromResource, (HINSTANCE hInstance, GDIPCONST WCHAR* lpBitmapName, GpBitmap** bitmap), (hInstance, lpBitmapName, bitmap)) \
-    m(CloneBitmapArea, (REAL x, REAL y, REAL width, REAL height, PixelFormat format, GpBitmap *srcBitmap, GpBitmap **dstBitmap), (x, y, width, height, format, srcBitmap, dstBitmap)) \
-    m(CloneBitmapAreaI, (INT x, INT y, INT width, INT height, PixelFormat format, GpBitmap *srcBitmap, GpBitmap **dstBitmap), (x, y, width, height, format, srcBitmap, dstBitmap)) \
-    m(BitmapLockBits, (GpBitmap* bitmap, GDIPCONST GpRect* rect, UINT flags, PixelFormat format, BitmapData* lockedBitmapData), (bitmap, rect, flags, format, lockedBitmapData)) \
-    m(BitmapUnlockBits, (GpBitmap* bitmap, BitmapData* lockedBitmapData), (bitmap, lockedBitmapData)) \
-    m(BitmapGetPixel, (GpBitmap* bitmap, INT x, INT y, ARGB *color), (bitmap, x, y, color)) \
-    m(BitmapSetPixel, (GpBitmap* bitmap, INT x, INT y, ARGB color), (bitmap, x, y, color)) \
-    m(BitmapSetResolution, (GpBitmap* bitmap, REAL xdpi, REAL ydpi), (bitmap, xdpi, ydpi)) \
-    m(CreateImageAttributes, (GpImageAttributes **imageattr), (imageattr)) \
-    m(CloneImageAttributes, (GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr), (imageattr, cloneImageattr)) \
-    m(DisposeImageAttributes, (GpImageAttributes *imageattr), (imageattr)) \
-    m(SetImageAttributesToIdentity, (GpImageAttributes *imageattr, ColorAdjustType type), (imageattr, type)) \
-    m(ResetImageAttributes, (GpImageAttributes *imageattr, ColorAdjustType type), (imageattr, type)) \
-    m(SetImageAttributesColorMatrix, (GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, GDIPCONST ColorMatrix* colorMatrix, GDIPCONST ColorMatrix* grayMatrix, ColorMatrixFlags flags), (imageattr, type, enableFlag, colorMatrix, grayMatrix, flags)) \
-    m(SetImageAttributesThreshold, (GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, REAL threshold), (imageattr, type, enableFlag, threshold)) \
-    m(SetImageAttributesGamma, (GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, REAL gamma), (imageattr, type, enableFlag, gamma)) \
-    m(SetImageAttributesNoOp, (GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag), (imageattr, type, enableFlag)) \
-    m(SetImageAttributesColorKeys, (GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, ARGB colorLow, ARGB colorHigh), (imageattr, type, enableFlag, colorLow, colorHigh)) \
-    m(SetImageAttributesOutputChannel, (GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, ColorChannelFlags channelFlags), (imageattr, type, enableFlag, channelFlags)) \
-    m(SetImageAttributesOutputChannelColorProfile, (GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, GDIPCONST WCHAR *colorProfileFilename), (imageattr, type, enableFlag, colorProfileFilename)) \
-    m(SetImageAttributesRemapTable, (GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, UINT mapSize, GDIPCONST ColorMap *map), (imageattr, type, enableFlag, mapSize, map)) \
-    m(SetImageAttributesWrapMode, (GpImageAttributes *imageAttr, WrapMode wrap, ARGB argb, BOOL clamp), (imageAttr, wrap, argb, clamp)) \
-    m(GetImageAttributesAdjustedPalette, (GpImageAttributes *imageAttr, ColorPalette *colorPalette, ColorAdjustType colorAdjustType), (imageAttr, colorPalette, colorAdjustType)) \
-    m(Flush, (GpGraphics *graphics, GpFlushIntention intention), (graphics, intention)) \
-    m(CreateFromHDC, (HDC hdc, GpGraphics **graphics), (hdc, graphics)) \
-    m(CreateFromHDC2, (HDC hdc, HANDLE hDevice, GpGraphics **graphics), (hdc, hDevice, graphics)) \
-    m(CreateFromHWND, (HWND hwnd, GpGraphics **graphics), (hwnd, graphics)) \
-    m(CreateFromHWNDICM, (HWND hwnd, GpGraphics **graphics), (hwnd, graphics)) \
-    m(DeleteGraphics, (GpGraphics *graphics), (graphics)) \
-    m(GetDC, (GpGraphics* graphics, HDC *hdc), (graphics, hdc)) \
-    m(ReleaseDC, (GpGraphics* graphics, HDC hdc), (graphics, hdc)) \
-    m(SetCompositingMode, (GpGraphics *graphics, CompositingMode compositingMode), (graphics, compositingMode)) \
-    m(GetCompositingMode, (GpGraphics *graphics, CompositingMode *compositingMode), (graphics, compositingMode)) \
-    m(SetRenderingOrigin, (GpGraphics *graphics, INT x, INT y), (graphics, x, y)) \
-    m(GetRenderingOrigin, (GpGraphics *graphics, INT *x, INT *y), (graphics, x, y)) \
-    m(SetCompositingQuality, (GpGraphics *graphics, CompositingQuality compositingQuality), (graphics, compositingQuality)) \
-    m(GetCompositingQuality, (GpGraphics *graphics, CompositingQuality *compositingQuality), (graphics, compositingQuality)) \
-    m(SetSmoothingMode, (GpGraphics *graphics, SmoothingMode smoothingMode), (graphics, smoothingMode)) \
-    m(GetSmoothingMode, (GpGraphics *graphics, SmoothingMode *smoothingMode), (graphics, smoothingMode)) \
-    m(SetPixelOffsetMode, (GpGraphics* graphics, PixelOffsetMode pixelOffsetMode), (graphics, pixelOffsetMode)) \
-    m(GetPixelOffsetMode, (GpGraphics *graphics, PixelOffsetMode *pixelOffsetMode), (graphics, pixelOffsetMode)) \
-    m(SetTextRenderingHint, (GpGraphics *graphics, TextRenderingHint mode), (graphics, mode)) \
-    m(GetTextRenderingHint, (GpGraphics *graphics, TextRenderingHint *mode), (graphics, mode)) \
-    m(SetTextContrast, (GpGraphics *graphics, UINT contrast), (graphics, contrast)) \
-    m(GetTextContrast, (GpGraphics *graphics, UINT *contrast), (graphics, contrast)) \
-    m(SetInterpolationMode, (GpGraphics *graphics, InterpolationMode interpolationMode), (graphics, interpolationMode)) \
-    m(GetInterpolationMode, (GpGraphics *graphics, InterpolationMode *interpolationMode), (graphics, interpolationMode)) \
-    m(SetWorldTransform, (GpGraphics *graphics, GpMatrix *matrix), (graphics, matrix)) \
-    m(ResetWorldTransform, (GpGraphics *graphics), (graphics)) \
-    m(MultiplyWorldTransform, (GpGraphics *graphics, GDIPCONST GpMatrix *matrix, GpMatrixOrder order), (graphics, matrix, order)) \
-    m(TranslateWorldTransform, (GpGraphics *graphics, REAL dx, REAL dy, GpMatrixOrder order), (graphics, dx, dy, order)) \
-    m(ScaleWorldTransform, (GpGraphics *graphics, REAL sx, REAL sy, GpMatrixOrder order), (graphics, sx, sy, order)) \
-    m(RotateWorldTransform, (GpGraphics *graphics, REAL angle, GpMatrixOrder order), (graphics, angle, order)) \
-    m(GetWorldTransform, (GpGraphics *graphics, GpMatrix *matrix), (graphics, matrix)) \
-    m(ResetPageTransform, (GpGraphics *graphics), (graphics)) \
-    m(GetPageUnit, (GpGraphics *graphics, GpUnit *unit), (graphics, unit)) \
-    m(GetPageScale, (GpGraphics *graphics, REAL *scale), (graphics, scale)) \
-    m(SetPageUnit, (GpGraphics *graphics, GpUnit unit), (graphics, unit)) \
-    m(SetPageScale, (GpGraphics *graphics, REAL scale), (graphics, scale)) \
-    m(GetDpiX, (GpGraphics *graphics, REAL* dpi), (graphics, dpi)) \
-    m(GetDpiY, (GpGraphics *graphics, REAL* dpi), (graphics, dpi)) \
-    m(TransformPoints, (GpGraphics *graphics, GpCoordinateSpace destSpace, GpCoordinateSpace srcSpace, GpPointF *points, INT count), (graphics, destSpace, srcSpace, points, count)) \
-    m(TransformPointsI, (GpGraphics *graphics, GpCoordinateSpace destSpace, GpCoordinateSpace srcSpace, GpPoint *points, INT count), (graphics, destSpace, srcSpace, points, count)) \
-    m(GetNearestColor, (GpGraphics *graphics, ARGB* argb), (graphics, argb)) \
-    m(DrawLine, (GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2), (graphics, pen, x1, y1, x2, y2)) \
-    m(DrawLineI, (GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2), (graphics, pen, x1, y1, x2, y2)) \
-    m(DrawLines, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count), (graphics, pen, points, count)) \
-    m(DrawLinesI, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count), (graphics, pen, points, count)) \
-    m(DrawArc, (GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle), (graphics, pen, x, y, width, height, startAngle, sweepAngle)) \
-    m(DrawArcI, (GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle), (graphics, pen, x, y, width, height, startAngle, sweepAngle)) \
-    m(DrawBezier, (GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4), (graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4)) \
-    m(DrawBezierI, (GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4), (graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4)) \
-    m(DrawBeziers, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count), (graphics, pen, points, count)) \
-    m(DrawBeziersI, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count), (graphics, pen, points, count)) \
-    m(DrawRectangle, (GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height), (graphics, pen, x, y, width, height)) \
-    m(DrawRectangleI, (GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height), (graphics, pen, x, y, width, height)) \
-    m(DrawRectangles, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpRectF *rects, INT count), (graphics, pen, rects, count)) \
-    m(DrawRectanglesI, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpRect *rects, INT count), (graphics, pen, rects, count)) \
-    m(DrawEllipse, (GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height), (graphics, pen, x, y, width, height)) \
-    m(DrawEllipseI, (GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height), (graphics, pen, x, y, width, height)) \
-    m(DrawPie, (GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle), (graphics, pen, x, y, width, height, startAngle, sweepAngle)) \
-    m(DrawPieI, (GpGraphics *graphics, GpPen *pen, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle), (graphics, pen, x, y, width, height, startAngle, sweepAngle)) \
-    m(DrawPolygon, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count), (graphics, pen, points, count)) \
-    m(DrawPolygonI, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count), (graphics, pen, points, count)) \
-    m(DrawPath, (GpGraphics *graphics, GpPen *pen, GpPath *path), (graphics, pen, path)) \
-    m(DrawCurve, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count), (graphics, pen, points, count)) \
-    m(DrawCurveI, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count), (graphics, pen, points, count)) \
-    m(DrawCurve2, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension), (graphics, pen, points, count, tension)) \
-    m(DrawCurve2I, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count, REAL tension), (graphics, pen, points, count, tension)) \
-    m(DrawCurve3, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, INT offset, INT numberOfSegments, REAL tension), (graphics, pen, points, count, offset, numberOfSegments, tension)) \
-    m(DrawCurve3I, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count, INT offset, INT numberOfSegments, REAL tension), (graphics, pen, points, count, offset, numberOfSegments, tension)) \
-    m(DrawClosedCurve, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count), (graphics, pen, points, count)) \
-    m(DrawClosedCurveI, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count), (graphics, pen, points, count)) \
-    m(DrawClosedCurve2, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension), (graphics, pen, points, count, tension)) \
-    m(DrawClosedCurve2I, (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPoint *points, INT count, REAL tension), (graphics, pen, points, count, tension)) \
-    m(GraphicsClear, (GpGraphics *graphics, ARGB color), (graphics, color)) \
-    m(FillRectangle, (GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height), (graphics, brush, x, y, width, height)) \
-    m(FillRectangleI, (GpGraphics *graphics, GpBrush *brush, INT x, INT y, INT width, INT height), (graphics, brush, x, y, width, height)) \
-    m(FillRectangles, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRectF *rects, INT count), (graphics, brush, rects, count)) \
-    m(FillRectanglesI, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRect *rects, INT count), (graphics, brush, rects, count)) \
-    m(FillPolygon, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPointF *points, INT count, GpFillMode fillMode), (graphics, brush, points, count, fillMode)) \
-    m(FillPolygonI, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPoint *points, INT count, GpFillMode fillMode), (graphics, brush, points, count, fillMode)) \
-    m(FillPolygon2, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPointF *points, INT count), (graphics, brush, points, count)) \
-    m(FillPolygon2I, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPoint *points, INT count), (graphics, brush, points, count)) \
-    m(FillEllipse, (GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height), (graphics, brush, x, y, width, height)) \
-    m(FillEllipseI, (GpGraphics *graphics, GpBrush *brush, INT x, INT y, INT width, INT height), (graphics, brush, x, y, width, height)) \
-    m(FillPie, (GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle), (graphics, brush, x, y, width, height, startAngle, sweepAngle)) \
-    m(FillPieI, (GpGraphics *graphics, GpBrush *brush, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle), (graphics, brush, x, y, width, height, startAngle, sweepAngle)) \
-    m(FillPath, (GpGraphics *graphics, GpBrush *brush, GpPath *path), (graphics, brush, path)) \
-    m(FillClosedCurve, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPointF *points, INT count), (graphics, brush, points, count)) \
-    m(FillClosedCurveI, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPoint *points, INT count), (graphics, brush, points, count)) \
-    m(FillClosedCurve2, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPointF *points, INT count, REAL tension, GpFillMode fillMode), (graphics, brush, points, count, tension, fillMode)) \
-    m(FillClosedCurve2I, (GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPoint *points, INT count, REAL tension, GpFillMode fillMode), (graphics, brush, points, count, tension, fillMode)) \
-    m(FillRegion, (GpGraphics *graphics, GpBrush *brush, GpRegion *region), (graphics, brush, region)) \
-    m(DrawImage, (GpGraphics *graphics, GpImage *image, REAL x, REAL y), (graphics, image, x, y)) \
-    m(DrawImageI, (GpGraphics *graphics, GpImage *image, INT x, INT y), (graphics, image, x, y)) \
-    m(DrawImageRect, (GpGraphics *graphics, GpImage *image, REAL x, REAL y, REAL width, REAL height), (graphics, image, x, y, width, height)) \
-    m(DrawImageRectI, (GpGraphics *graphics, GpImage *image, INT x, INT y, INT width, INT height), (graphics, image, x, y, width, height)) \
-    m(DrawImagePoints, (GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *dstpoints, INT count), (graphics, image, dstpoints, count)) \
-    m(DrawImagePointsI, (GpGraphics *graphics, GpImage *image, GDIPCONST GpPoint *dstpoints, INT count), (graphics, image, dstpoints, count)) \
-    m(DrawImagePointRect, (GpGraphics *graphics, GpImage *image, REAL x, REAL y, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit), (graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit)) \
-    m(DrawImagePointRectI, (GpGraphics *graphics, GpImage *image, INT x, INT y, INT srcx, INT srcy, INT srcwidth, INT srcheight, GpUnit srcUnit), (graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit)) \
-    m(DrawImageRectRect, (GpGraphics *graphics, GpImage *image, REAL dstx, REAL dsty, REAL dstwidth, REAL dstheight, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, VOID *callbackData), (graphics, image, dstx, dsty, dstwidth, dstheight, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData)) \
-    m(DrawImageRectRectI, (GpGraphics *graphics, GpImage *image, INT dstx, INT dsty, INT dstwidth, INT dstheight, INT srcx, INT srcy, INT srcwidth, INT srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, VOID *callbackData), (graphics, image, dstx, dsty, dstwidth, dstheight, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData)) \
-    m(DrawImagePointsRect, (GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, VOID *callbackData), (graphics, image, points, count, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData)) \
-    m(DrawImagePointsRectI, (GpGraphics *graphics, GpImage *image, GDIPCONST GpPoint *points, INT count, INT srcx, INT srcy, INT srcwidth, INT srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, DrawImageAbort callback, VOID *callbackData), (graphics, image, points, count, srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, callbackData)) \
-    m(EnumerateMetafileDestPoint, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST PointF & destPoint, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destPoint, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileDestPointI, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST Point & destPoint, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destPoint, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileDestRect, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST RectF & destRect, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destRect, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileDestRectI, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST Rect & destRect, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destRect, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileDestPoints, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST PointF *destPoints, INT count, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destPoints, count, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileDestPointsI, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST Point *destPoints, INT count, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destPoints, count, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileSrcRectDestPoint, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST PointF & destPoint, GDIPCONST RectF & srcRect, Unit srcUnit, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destPoint, srcRect, srcUnit, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileSrcRectDestPointI, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST Point & destPoint, GDIPCONST Rect & srcRect, Unit srcUnit, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destPoint, srcRect, srcUnit, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileSrcRectDestRect, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST RectF & destRect, GDIPCONST RectF & srcRect, Unit srcUnit, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destRect, srcRect, srcUnit, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileSrcRectDestRectI, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST Rect & destRect, GDIPCONST Rect & srcRect, Unit srcUnit, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destRect, srcRect, srcUnit, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileSrcRectDestPoints, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST PointF *destPoints, INT count, GDIPCONST RectF & srcRect, Unit srcUnit, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destPoints, count, srcRect, srcUnit, callback, callbackData, imageAttributes)) \
-    m(EnumerateMetafileSrcRectDestPointsI, (GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST Point *destPoints, INT count, GDIPCONST Rect & srcRect, Unit srcUnit, EnumerateMetafileProc callback, VOID *callbackData, GDIPCONST GpImageAttributes *imageAttributes), (graphics, metafile, destPoints, count, srcRect, srcUnit, callback, callbackData, imageAttributes)) \
-    m(PlayMetafileRecord, (GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data), (metafile, recordType, flags, dataSize, data)) \
-    m(SetClipGraphics, (GpGraphics *graphics, GpGraphics *srcgraphics, CombineMode combineMode), (graphics, srcgraphics, combineMode)) \
-    m(SetClipRect, (GpGraphics *graphics, REAL x, REAL y, REAL width, REAL height, CombineMode combineMode), (graphics, x, y, width, height, combineMode)) \
-    m(SetClipRectI, (GpGraphics *graphics, INT x, INT y, INT width, INT height, CombineMode combineMode), (graphics, x, y, width, height, combineMode)) \
-    m(SetClipPath, (GpGraphics *graphics, GpPath *path, CombineMode combineMode), (graphics, path, combineMode)) \
-    m(SetClipRegion, (GpGraphics *graphics, GpRegion *region, CombineMode combineMode), (graphics, region, combineMode)) \
-    m(SetClipHrgn, (GpGraphics *graphics, HRGN hRgn, CombineMode combineMode), (graphics, hRgn, combineMode)) \
-    m(ResetClip, (GpGraphics *graphics), (graphics)) \
-    m(TranslateClip, (GpGraphics *graphics, REAL dx, REAL dy), (graphics, dx, dy)) \
-    m(TranslateClipI, (GpGraphics *graphics, INT dx, INT dy), (graphics, dx, dy)) \
-    m(GetClip, (GpGraphics *graphics, GpRegion *region), (graphics, region)) \
-    m(GetClipBounds, (GpGraphics *graphics, GpRectF *rect), (graphics, rect)) \
-    m(GetClipBoundsI, (GpGraphics *graphics, GpRect *rect), (graphics, rect)) \
-    m(IsClipEmpty, (GpGraphics *graphics, BOOL *result), (graphics, result)) \
-    m(GetVisibleClipBounds, (GpGraphics *graphics, GpRectF *rect), (graphics, rect)) \
-    m(GetVisibleClipBoundsI, (GpGraphics *graphics, GpRect *rect), (graphics, rect)) \
-    m(IsVisibleClipEmpty, (GpGraphics *graphics, BOOL *result), (graphics, result)) \
-    m(IsVisiblePoint, (GpGraphics *graphics, REAL x, REAL y, BOOL *result), (graphics, x, y, result)) \
-    m(IsVisiblePointI, (GpGraphics *graphics, INT x, INT y, BOOL *result), (graphics, x, y, result)) \
-    m(IsVisibleRect, (GpGraphics *graphics, REAL x, REAL y, REAL width, REAL height, BOOL *result), (graphics, x, y, width, height, result)) \
-    m(IsVisibleRectI, (GpGraphics *graphics, INT x, INT y, INT width, INT height, BOOL *result), (graphics, x, y, width, height, result)) \
-    m(SaveGraphics, (GpGraphics *graphics, GraphicsState *state), (graphics, state)) \
-    m(RestoreGraphics, (GpGraphics *graphics, GraphicsState state), (graphics, state)) \
-    m(BeginContainer, (GpGraphics *graphics, GDIPCONST GpRectF* dstrect, GDIPCONST GpRectF *srcrect, GpUnit unit, GraphicsContainer *state), (graphics, dstrect, srcrect, unit, state)) \
-    m(BeginContainerI, (GpGraphics *graphics, GDIPCONST GpRect* dstrect, GDIPCONST GpRect *srcrect, GpUnit unit, GraphicsContainer *state), (graphics, dstrect, srcrect, unit, state)) \
-    m(BeginContainer2, (GpGraphics *graphics, GraphicsContainer* state), (graphics, state)) \
-    m(EndContainer, (GpGraphics *graphics, GraphicsContainer state), (graphics, state)) \
-    m(GetMetafileHeaderFromEmf, (HENHMETAFILE hEmf, MetafileHeader *header), (hEmf, header)) \
-    m(GetMetafileHeaderFromFile, (GDIPCONST WCHAR* filename, MetafileHeader *header), (filename, header)) \
-    m(GetMetafileHeaderFromStream, (IStream *stream, MetafileHeader *header), (stream, header)) \
-    m(GetMetafileHeaderFromMetafile, (GpMetafile *metafile, MetafileHeader *header), (metafile, header)) \
-    m(GetHemfFromMetafile, (GpMetafile *metafile, HENHMETAFILE *hEmf), (metafile, hEmf)) \
-    m(CreateStreamOnFile, (GDIPCONST WCHAR *filename, UINT access, IStream **stream), (filename, access, stream)) \
-    m(CreateMetafileFromWmf, (HMETAFILE hWmf, BOOL deleteWmf, GDIPCONST WmfPlaceableFileHeader *wmfPlaceableFileHeader, GpMetafile **metafile), (hWmf, deleteWmf, wmfPlaceableFileHeader, metafile)) \
-    m(CreateMetafileFromEmf, (HENHMETAFILE hEmf, BOOL deleteEmf, GpMetafile **metafile), (hEmf, deleteEmf, metafile)) \
-    m(CreateMetafileFromFile, (GDIPCONST WCHAR* file, GpMetafile **metafile), (file, metafile)) \
-    m(CreateMetafileFromWmfFile, (GDIPCONST WCHAR* file, GDIPCONST WmfPlaceableFileHeader *wmfPlaceableFileHeader, GpMetafile **metafile), (file, wmfPlaceableFileHeader, metafile)) \
-    m(CreateMetafileFromStream, (IStream *stream, GpMetafile **metafile), (stream, metafile)) \
-    m(RecordMetafile, (HDC referenceHdc, EmfType type, GDIPCONST GpRectF *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *description, GpMetafile ** metafile), (referenceHdc, type, frameRect, frameUnit, description, metafile)) \
-    m(RecordMetafileI, (HDC referenceHdc, EmfType type, GDIPCONST GpRect *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *description, GpMetafile ** metafile), (referenceHdc, type, frameRect, frameUnit, description, metafile)) \
-    m(RecordMetafileFileName, (GDIPCONST WCHAR* fileName, HDC referenceHdc, EmfType type, GDIPCONST GpRectF *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *description, GpMetafile ** metafile), (fileName, referenceHdc, type, frameRect, frameUnit, description, metafile)) \
-    m(RecordMetafileFileNameI, (GDIPCONST WCHAR* fileName, HDC referenceHdc, EmfType type, GDIPCONST GpRect *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *description, GpMetafile ** metafile), (fileName, referenceHdc, type, frameRect, frameUnit, description, metafile)) \
-    m(RecordMetafileStream, (IStream *stream, HDC referenceHdc, EmfType type, GDIPCONST GpRectF *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *description, GpMetafile ** metafile), (stream, referenceHdc, type, frameRect, frameUnit, description, metafile)) \
-    m(RecordMetafileStreamI, (IStream *stream, HDC referenceHdc, EmfType type, GDIPCONST GpRect *frameRect, MetafileFrameUnit frameUnit, GDIPCONST WCHAR *description, GpMetafile ** metafile), (stream, referenceHdc, type, frameRect, frameUnit, description, metafile)) \
-    m(SetMetafileDownLevelRasterizationLimit, (GpMetafile *metafile, UINT metafileRasterizationLimitDpi), (metafile, metafileRasterizationLimitDpi)) \
-    m(GetMetafileDownLevelRasterizationLimit, (GDIPCONST GpMetafile *metafile, UINT *metafileRasterizationLimitDpi), (metafile, metafileRasterizationLimitDpi)) \
-    m(GetImageDecodersSize, (UINT *numDecoders, UINT *size), (numDecoders, size)) \
-    m(GetImageDecoders, (UINT numDecoders, UINT size, ImageCodecInfo *decoders), (numDecoders, size, decoders)) \
-    m(GetImageEncodersSize, (UINT *numEncoders, UINT *size), (numEncoders, size)) \
-    m(GetImageEncoders, (UINT numEncoders, UINT size, ImageCodecInfo *encoders), (numEncoders, size, encoders)) \
-    m(Comment, (GpGraphics* graphics, UINT sizeData, GDIPCONST BYTE *data), (graphics, sizeData, data)) \
-    m(CreateFontFamilyFromName, (GDIPCONST WCHAR *name, GpFontCollection *fontCollection, GpFontFamily **FontFamily), (name, fontCollection, FontFamily)) \
-    m(DeleteFontFamily, (GpFontFamily *FontFamily), (FontFamily)) \
-    m(CloneFontFamily, (GpFontFamily *FontFamily, GpFontFamily **clonedFontFamily), (FontFamily, clonedFontFamily)) \
-    m(GetGenericFontFamilySansSerif, (GpFontFamily **nativeFamily), (nativeFamily)) \
-    m(GetGenericFontFamilySerif, (GpFontFamily **nativeFamily), (nativeFamily)) \
-    m(GetGenericFontFamilyMonospace, (GpFontFamily **nativeFamily), (nativeFamily)) \
-    m(GetFamilyName, (GDIPCONST GpFontFamily *family, WCHAR name[LF_FACESIZE], LANGID language), (family, name, language)) \
-    m(IsStyleAvailable, (GDIPCONST GpFontFamily *family, INT style, BOOL *IsStyleAvailable), (family, style, IsStyleAvailable)) \
-    m(GetEmHeight, (GDIPCONST GpFontFamily *family, INT style, UINT16 *EmHeight), (family, style, EmHeight)) \
-    m(GetCellAscent, (GDIPCONST GpFontFamily *family, INT style, UINT16 *CellAscent), (family, style, CellAscent)) \
-    m(GetCellDescent, (GDIPCONST GpFontFamily *family, INT style, UINT16 *CellDescent), (family, style, CellDescent)) \
-    m(GetLineSpacing, (GDIPCONST GpFontFamily *family, INT style, UINT16 *LineSpacing), (family, style, LineSpacing)) \
-    m(CreateFontFromDC, (HDC hdc, GpFont **font), (hdc, font)) \
-    m(CreateFontFromLogfontA, (HDC hdc, GDIPCONST LOGFONTA *logfont, GpFont **font), (hdc, logfont, font)) \
-    m(CreateFontFromLogfontW, (HDC hdc, GDIPCONST LOGFONTW *logfont, GpFont **font), (hdc, logfont, font)) \
-    m(CreateFont, (GDIPCONST GpFontFamily *fontFamily, REAL emSize, INT style, Unit unit, GpFont **font), (fontFamily, emSize, style, unit, font)) \
-    m(CloneFont, (GpFont* font, GpFont** cloneFont), (font, cloneFont)) \
-    m(DeleteFont, (GpFont* font), (font)) \
-    m(GetFamily, (GpFont *font, GpFontFamily **family), (font, family)) \
-    m(GetFontStyle, (GpFont *font, INT *style), (font, style)) \
-    m(GetFontSize, (GpFont *font, REAL *size), (font, size)) \
-    m(GetFontUnit, (GpFont *font, Unit *unit), (font, unit)) \
-    m(GetFontHeight, (GDIPCONST GpFont *font, GDIPCONST GpGraphics *graphics, REAL *height), (font, graphics, height)) \
-    m(GetFontHeightGivenDPI, (GDIPCONST GpFont *font, REAL dpi, REAL *height), (font, dpi, height)) \
-    m(GetLogFontA, (GpFont *font, GpGraphics *graphics, LOGFONTA *logfontA), (font, graphics, logfontA)) \
-    m(GetLogFontW, (GpFont *font, GpGraphics *graphics, LOGFONTW *logfontW), (font, graphics, logfontW)) \
-    m(NewInstalledFontCollection, (GpFontCollection** fontCollection), (fontCollection)) \
-    m(NewPrivateFontCollection, (GpFontCollection** fontCollection), (fontCollection)) \
-    m(DeletePrivateFontCollection, (GpFontCollection** fontCollection), (fontCollection)) \
-    m(GetFontCollectionFamilyCount, (GpFontCollection* fontCollection, INT *numFound), (fontCollection, numFound)) \
-    m(GetFontCollectionFamilyList, (GpFontCollection* fontCollection, INT numSought, GpFontFamily* gpfamilies[], INT* numFound), (fontCollection, numSought, gpfamilies, numFound)) \
-    m(PrivateAddFontFile, (GpFontCollection* fontCollection, GDIPCONST WCHAR* filename), (fontCollection, filename)) \
-    m(PrivateAddMemoryFont, (GpFontCollection* fontCollection, GDIPCONST void* memory, INT length), (fontCollection, memory, length)) \
-    m(DrawString, (GpGraphics *graphics, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *layoutRect, GDIPCONST GpStringFormat *stringFormat, GDIPCONST GpBrush *brush), (graphics, string, length, font, layoutRect, stringFormat, brush)) \
-    m(MeasureString, (GpGraphics *graphics, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *layoutRect, GDIPCONST GpStringFormat *stringFormat, RectF *boundingBox, INT *codepointsFitted, INT *linesFilled), (graphics, string, length, font, layoutRect, stringFormat, boundingBox, codepointsFitted, linesFilled)) \
-    m(MeasureCharacterRanges, (GpGraphics *graphics, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF &layoutRect, GDIPCONST GpStringFormat *stringFormat, INT regionCount, GpRegion **regions), (graphics, string, length, font, layoutRect, stringFormat, regionCount, regions)) \
-    m(DrawDriverString, (GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, GDIPCONST GpFont *font, GDIPCONST GpBrush *brush, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix), (graphics, text, length, font, brush, positions, flags, matrix)) \
-    m(MeasureDriverString, (GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, GDIPCONST GpFont *font, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix, RectF *boundingBox), (graphics, text, length, font, positions, flags, matrix, boundingBox)) \
-    m(CreateStringFormat, (INT formatAttributes, LANGID language, GpStringFormat **format), (formatAttributes, language, format)) \
-    m(StringFormatGetGenericDefault, (GpStringFormat **format), (format)) \
-    m(StringFormatGetGenericTypographic, (GpStringFormat **format), (format)) \
-    m(DeleteStringFormat, (GpStringFormat *format), (format)) \
-    m(CloneStringFormat, (GDIPCONST GpStringFormat *format, GpStringFormat **newFormat), (format, newFormat)) \
-    m(SetStringFormatFlags, (GpStringFormat *format, INT flags), (format, flags)) \
-    m(GetStringFormatFlags, (GDIPCONST GpStringFormat *format, INT *flags), (format, flags)) \
-    m(SetStringFormatAlign, (GpStringFormat *format, StringAlignment align), (format, align)) \
-    m(GetStringFormatAlign, (GDIPCONST GpStringFormat *format, StringAlignment *align), (format, align)) \
-    m(SetStringFormatLineAlign, (GpStringFormat *format, StringAlignment align), (format, align)) \
-    m(GetStringFormatLineAlign, (GDIPCONST GpStringFormat *format, StringAlignment *align), (format, align)) \
-    m(SetStringFormatTrimming, (GpStringFormat *format, StringTrimming trimming), (format, trimming)) \
-    m(GetStringFormatTrimming, (GDIPCONST GpStringFormat *format, StringTrimming *trimming), (format, trimming)) \
-    m(SetStringFormatHotkeyPrefix, (GpStringFormat *format, INT hotkeyPrefix), (format, hotkeyPrefix)) \
-    m(GetStringFormatHotkeyPrefix, (GDIPCONST GpStringFormat *format, INT *hotkeyPrefix), (format, hotkeyPrefix)) \
-    m(SetStringFormatTabStops, (GpStringFormat *format, REAL firstTabOffset, INT count, GDIPCONST REAL *tabStops), (format, firstTabOffset, count, tabStops)) \
-    m(GetStringFormatTabStops, (GDIPCONST GpStringFormat *format, INT count, REAL *firstTabOffset, REAL *tabStops), (format, count, firstTabOffset, tabStops)) \
-    m(GetStringFormatTabStopCount, (GDIPCONST GpStringFormat *format, INT *count), (format, count)) \
-    m(SetStringFormatDigitSubstitution, (GpStringFormat *format, LANGID language, StringDigitSubstitute substitute), (format, language, substitute)) \
-    m(GetStringFormatDigitSubstitution, (GDIPCONST GpStringFormat *format, LANGID *language, StringDigitSubstitute *substitute), (format, language, substitute)) \
-    m(GetStringFormatMeasurableCharacterRangeCount, (GDIPCONST GpStringFormat *format, INT *count), (format, count)) \
-    m(SetStringFormatMeasurableCharacterRanges, (GpStringFormat *format, INT rangeCount, GDIPCONST CharacterRange *ranges), (format, rangeCount, ranges)) \
-    m(CreateCachedBitmap, (GpBitmap *bitmap, GpGraphics *graphics, GpCachedBitmap **cachedBitmap), (bitmap, graphics, cachedBitmap)) \
-    m(DeleteCachedBitmap, (GpCachedBitmap *cachedBitmap), (cachedBitmap)) \
-    m(DrawCachedBitmap, (GpGraphics *graphics, GpCachedBitmap *cachedBitmap, INT x, INT y), (graphics, cachedBitmap, x, y)) \
-    m(SetImageAttributesCachedBackground, (GpImageAttributes *imageattr, BOOL enableFlag), (imageattr, enableFlag)) \
-    m(TestControl, (GpTestControlEnum control, void *param), (control, param)) \
-
-    // non-standard/problematic functions, to review later if needed
-#if 0
-    // these functions don't seem to exist in the DLL even though they are
-    // declared in the header
-    m(SetImageAttributesICMMode, (GpImageAttributes *imageAttr, BOOL on), (imageAttr, on)) \
-    m(FontCollectionEnumerable, (GpFontCollection* fontCollection, GpGraphics* graphics, INT *numFound), (fontCollection, graphics, numFound)) \
-    m(FontCollectionEnumerate, (GpFontCollection* fontCollection, INT numSought, GpFontFamily* gpfamilies[], INT* numFound, GpGraphics* graphics), (fontCollection, numSought, gpfamilies, numFound, graphics)) \
-
-GpStatus
-GdipGetMetafileHeaderFromWmf(
-    HMETAFILE           hWmf,
-    GDIPCONST WmfPlaceableFileHeader *     wmfPlaceableFileHeader,
-    MetafileHeader *    header
-    );
-HPALETTE WINGDIPAPI
-GdipCreateHalftonePalette();
-
-UINT WINGDIPAPI
-GdipEmfToWmfBits(
-    HENHMETAFILE hemf,
-    UINT         cbData16,
-    LPBYTE       pData16,
-    INT          iMapMode,
-    INT          eFlags
-);
-#endif // 0
-
-// this macro expands into an invocation of the given macro m for all GDI+
-// functions: m is called with the name of the function without "Gdip" prefix
-#define wxFOR_ALL_GDIP_FUNCNAMES(m)                                           \
-    m(Alloc, (size_t size), (size))                                           \
-    m(Free, (void *ptr), (ptr))                                               \
-    wxFOR_ALL_GDIPLUS_STATUS_FUNCS(m)
-
-// unfortunately we need a separate macro for these functions as they have
-// "Gdiplus" prefix instead of "Gdip" for (almost) all the others (and also
-// WINAPI calling convention instead of WINGDIPAPI although they happen to be
-// both stdcall in fact)
-#define wxFOR_ALL_GDIPLUS_FUNCNAMES(m)                                        \
-    m(Startup, (ULONG_PTR *token,                                             \
-                const GdiplusStartupInput *input,                             \
-                GdiplusStartupOutput *output),                                \
-                (token, input, output))                                       \
-    m(Shutdown, (ULONG_PTR token), (token))                                   \
-    m(NotificationHook, (ULONG_PTR *token), (token))                          \
-    m(NotificationUnhook, (ULONG_PTR token), (token))                         \
-
-#define wxFOR_ALL_FUNCNAMES(m)                                                \
-    wxFOR_ALL_GDIP_FUNCNAMES(m)                                               \
-    wxFOR_ALL_GDIPLUS_FUNCNAMES(m)
-
-// ----------------------------------------------------------------------------
-// declare typedefs for types of all GDI+ functions
-// ----------------------------------------------------------------------------
-
-extern "C"
-{
-
-typedef void* (WINGDIPAPI *wxGDIPLUS_FUNC_T(Alloc))(size_t size);
-typedef void (WINGDIPAPI *wxGDIPLUS_FUNC_T(Free))(void* ptr);
-typedef Status
-(WINAPI *wxGDIPLUS_FUNC_T(Startup))(ULONG_PTR *token,
-                                    const GdiplusStartupInput *input,
-                                    GdiplusStartupOutput *output);
-typedef void (WINAPI *wxGDIPLUS_FUNC_T(Shutdown))(ULONG_PTR token);
-typedef GpStatus (WINAPI *wxGDIPLUS_FUNC_T(NotificationHook))(ULONG_PTR *token);
-typedef void (WINAPI *wxGDIPLUS_FUNC_T(NotificationUnhook))(ULONG_PTR token);
-
-#define wxDECL_GDIPLUS_FUNC_TYPE(name, params, args) \
-    typedef GpStatus (WINGDIPAPI *wxGDIPLUS_FUNC_T(name)) params ;
-
-wxFOR_ALL_GDIPLUS_STATUS_FUNCS(wxDECL_GDIPLUS_FUNC_TYPE)
-
-#undef wxDECL_GDIPLUS_FUNC_TYPE
-
-// Special hack for w32api headers that reference this variable which is
-// normally defined in w32api-specific gdiplus.lib but as we don't link with it
-// and load gdiplus.dll dynamically, it's not defined in our case resulting in
-// linking errors -- so just provide it ourselves, it doesn't matter where it
-// is and if Cygwin headers are modified to not use it in the future, it's not
-// a big deal neither, we'll just have an unused pointer.
-#if defined(__CYGWIN__) || defined(__MINGW32__)
-void *_GdipStringFormatCachedGenericTypographic = NULL;
-#endif // __CYGWIN__ || __MINGW32__
-
-} // extern "C"
-
-// ============================================================================
-// wxGdiPlus helper class
-// ============================================================================
-
-class wxGdiPlus
-{
-public:
-    // load GDI+ DLL when we're called for the first time, return true on
-    // success or false on failure
-    static bool Initialize()
-    {
-        if ( m_initialized == -1 )
-            m_initialized = DoInit();
-
-        return m_initialized == 1;
-    }
-
-    // check if we're initialized without loading the GDI+ DLL
-    static bool IsInitialized()
-    {
-        return m_initialized == 1;
-    }
-
-    // shutdown: should be called on termination to unload the GDI+ DLL, safe
-    // to call even if we hadn't loaded it
-    static void Terminate()
-    {
-        if ( m_hdll )
-        {
-            wxDynamicLibrary::Unload(m_hdll);
-            m_hdll = 0;
-        }
-
-        m_initialized = -1;
-    }
-
-
-    // define function pointers as members
-    #define wxDECL_GDIPLUS_FUNC_MEMBER(name, params, args) \
-        static wxGDIPLUS_FUNC_T(name) name;
-
-    wxFOR_ALL_FUNCNAMES(wxDECL_GDIPLUS_FUNC_MEMBER)
-
-    #undef wxDECL_GDIPLUS_FUNC_MEMBER
-
-private:
-    // do load the GDI+ DLL and bind all the functions
-    static bool DoInit();
-
-
-    // initially -1 meaning unknown, set to false or true by Initialize()
-    static int m_initialized;
-
-    // handle of the GDI+ DLL if we loaded it successfully
-    static wxDllType m_hdll;
-};
-
-#define wxINIT_GDIPLUS_FUNC(name, params, args) \
-    wxGDIPLUS_FUNC_T(name) wxGdiPlus::name = NULL;
-
-wxFOR_ALL_FUNCNAMES(wxINIT_GDIPLUS_FUNC)
-
-#undef wxINIT_GDIPLUS_FUNC
-
-int wxGdiPlus::m_initialized = -1;
-wxDllType wxGdiPlus::m_hdll = 0;
-
-/* static */
-bool wxGdiPlus::DoInit()
-{
-    // we're prepared to handler errors so suppress log messages about them
-    wxLogNull noLog;
-
-    wxDynamicLibrary dllGdip(wxT("gdiplus.dll"), wxDL_VERBATIM);
-    if ( !dllGdip.IsLoaded() )
-        return false;
-
-    // use RawGetSymbol() for efficiency, we have ~600 functions to load...
-    #define wxDO_LOAD_FUNC(name, namedll)                                     \
-        name = (wxGDIPLUS_FUNC_T(name))dllGdip.RawGetSymbol(namedll);         \
-        if ( !name )                                                          \
-            return false;
-
-    #define wxLOAD_GDIPLUS_FUNC(name, params, args)                           \
-        wxDO_LOAD_FUNC(name, wxT("Gdiplus") wxSTRINGIZE_T(name))
-
-    wxFOR_ALL_GDIPLUS_FUNCNAMES(wxLOAD_GDIPLUS_FUNC)
-
-    #undef wxLOAD_GDIPLUS_FUNC
-
-    #define wxLOAD_GDIP_FUNC(name, params, args)                              \
-        wxDO_LOAD_FUNC(name, wxT("Gdip") wxSTRINGIZE_T(name))
-
-    wxFOR_ALL_GDIP_FUNCNAMES(wxLOAD_GDIP_FUNC)
-
-    #undef wxLOAD_GDIP_FUNC
-
-    // ok, prevent the DLL from being unloaded right now, we'll do it later
-    m_hdll = dllGdip.Detach();
-
-    return true;
-}
-
-// ============================================================================
-// module to unload GDI+ DLL on program termination
-// ============================================================================
-
-class wxGdiPlusModule : public wxModule
-{
-public:
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxGdiPlus::Terminate(); }
-
-    DECLARE_DYNAMIC_CLASS(wxGdiPlusModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxGdiPlusModule, wxModule)
-
-// ============================================================================
-// implementation of the functions themselves
-// ============================================================================
-
-extern "C"
-{
-
-void* WINGDIPAPI
-GdipAlloc(size_t size)
-{
-    return wxGdiPlus::Initialize() ? wxGdiPlus::Alloc(size) : NULL;
-}
-
-void WINGDIPAPI
-GdipFree(void* ptr)
-{
-    if ( wxGdiPlus::Initialize() )
-        wxGdiPlus::Free(ptr);
-}
-
-Status WINAPI
-GdiplusStartup(ULONG_PTR *token,
-               const GdiplusStartupInput *input,
-               GdiplusStartupOutput *output)
-{
-    return wxGdiPlus::Initialize() ? wxGdiPlus::Startup(token, input, output)
-                                   : GdiplusNotInitialized;
-}
-
-void WINAPI
-GdiplusShutdown(ULONG_PTR token)
-{
-    if ( wxGdiPlus::IsInitialized() )
-        wxGdiPlus::Shutdown(token);
-}
-
-#define wxIMPL_GDIPLUS_FUNC(name, params, args)                               \
-    GpStatus WINGDIPAPI                                                       \
-    Gdip##name params                                                         \
-    {                                                                         \
-        return wxGdiPlus::Initialize() ? wxGdiPlus::name args                 \
-                                       : GdiplusNotInitialized;               \
-    }
-
-wxFOR_ALL_GDIPLUS_STATUS_FUNCS(wxIMPL_GDIPLUS_FUNC)
-
-#undef wxIMPL_GDIPLUS_FUNC
-
-} // extern "C"
-
-#endif // wxUSE_GRAPHICS_CONTEXT
diff --git a/Source/3rd Party/wx/src/msw/graphics.cpp b/Source/3rd Party/wx/src/msw/graphics.cpp
index 9b5e6e2db..3b913a479 100644
--- a/Source/3rd Party/wx/src/msw/graphics.cpp	
+++ b/Source/3rd Party/wx/src/msw/graphics.cpp	
@@ -4,58 +4,42 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-09-30
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: graphics.cpp 61747 2009-08-23 21:36:09Z VZ $
 // Copyright:   (c) 2006 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#undef WIN32_LEAN_AND_MEAN
 #include "wx/wxprec.h"
 
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
 #include "wx/dc.h"
 
-#if wxUSE_GRAPHICS_CONTEXT
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
 
 #ifndef WX_PRECOMP
-    #include "wx/msw/wrapcdlg.h"
-    #include "wx/image.h"
-    #include "wx/window.h"
-    #include "wx/utils.h"
-    #include "wx/dialog.h"
-    #include "wx/app.h"
-    #include "wx/bitmap.h"
-    #include "wx/log.h"
-    #include "wx/icon.h"
-    #include "wx/module.h"
-    // include all dc types that are used as a param
-    #include "wx/dc.h"
-    #include "wx/dcclient.h"
-    #include "wx/dcmemory.h"
-    #include "wx/dcprint.h"
+#include "wx/msw/wrapcdlg.h"
+#include "wx/image.h"
+#include "wx/window.h"
+#include "wx/dc.h"
+#include "wx/utils.h"
+#include "wx/dialog.h"
+#include "wx/app.h"
+#include "wx/bitmap.h"
+#include "wx/dcmemory.h"
+#include "wx/log.h"
+#include "wx/icon.h"
+#include "wx/dcprint.h"
+#include "wx/module.h"
 #endif
 
-#include "wx/stack.h"
+#include "wx/graphics.h"
 
-#include "wx/private/graphics.h"
-#include "wx/msw/wrapgdip.h"
-#include "wx/msw/dc.h"
-#if wxUSE_ENH_METAFILE
-    #include "wx/msw/enhmeta.h"
-#endif
-#include "wx/dcgraph.h"
+#if wxUSE_GRAPHICS_CONTEXT
 
-#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
+#include <vector>
 
-#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
-#include <commdlg.h>
-#endif
-
-namespace
-{
+using namespace std;
 
 //-----------------------------------------------------------------------------
 // constants
@@ -67,19 +51,11 @@ const double RAD2DEG = 180.0 / M_PI;
 // Local functions
 //-----------------------------------------------------------------------------
 
-inline double dmin(double a, double b) { return a < b ? a : b; }
-inline double dmax(double a, double b) { return a > b ? a : b; }
+static inline double dmin(double a, double b) { return a < b ? a : b; }
+static inline double dmax(double a, double b) { return a > b ? a : b; }
 
-inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
-inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; }
-
-// translate a wxColour to a Color
-inline Color wxColourToColor(const wxColour& col)
-{
-    return Color(col.Alpha(), col.Red(), col.Green(), col.Blue());
-}
-
-} // anonymous namespace
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
+static inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; }
 
 //-----------------------------------------------------------------------------
 // device context implementation
@@ -97,9 +73,26 @@ inline Color wxColourToColor(const wxColour& col)
 // wxGraphicsPath implementation
 //-----------------------------------------------------------------------------
 
-class wxGDIPlusContext;
+#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
 
-class wxGDIPlusPathData : public wxGraphicsPathData
+#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
+#include <commdlg.h>
+#endif
+
+// TODO remove this dependency (gdiplus needs the macros)
+
+#ifndef max
+#define max(a,b)            (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef min
+#define min(a,b)            (((a) < (b)) ? (a) : (b))
+#endif
+
+#include "gdiplus.h"
+using namespace Gdiplus;
+
+class WXDLLIMPEXP_CORE wxGDIPlusPathData : public wxGraphicsPathData
 {
 public :
     wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL);
@@ -161,13 +154,13 @@ public :
     // gets the bounding box enclosing all points (possibly including control points)
     virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const;
 
-    virtual bool Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle = wxODDEVEN_RULE) const;
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const;
 
 private :
     GraphicsPath* m_path;
 };
 
-class wxGDIPlusMatrixData : public wxGraphicsMatrixData
+class WXDLLIMPEXP_CORE wxGDIPlusMatrixData : public wxGraphicsMatrixData
 {
 public :
     wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix = NULL) ;
@@ -185,7 +178,7 @@ public :
     // gets the component valuess of the matrix
     virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
                      wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
-
+       
     // makes this the inverse matrix
     virtual void Invert();
 
@@ -224,7 +217,7 @@ private:
     Matrix* m_matrix ;
 } ;
 
-class wxGDIPlusPenData : public wxGraphicsObjectRefData
+class WXDLLIMPEXP_CORE wxGDIPlusPenData : public wxGraphicsObjectRefData
 {
 public:
     wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen );
@@ -243,92 +236,62 @@ protected :
     wxDouble m_width;
 };
 
-class wxGDIPlusBrushData : public wxGraphicsObjectRefData
+class WXDLLIMPEXP_CORE wxGDIPlusBrushData : public wxGraphicsObjectRefData
 {
 public:
     wxGDIPlusBrushData( wxGraphicsRenderer* renderer );
     wxGDIPlusBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
     ~wxGDIPlusBrushData ();
 
-    void CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                                   wxDouble x2, wxDouble y2,
-                                   const wxGraphicsGradientStops& stops);
-    void CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                                   wxDouble xc, wxDouble yc,
-                                   wxDouble radius,
-                                   const wxGraphicsGradientStops& stops);
-
+    void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+        const wxColour&c1, const wxColour&c2 );
+    void CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor );
     virtual Brush* GetGDIPlusBrush() { return m_brush; }
 
 protected:
     virtual void Init();
 
-private:
-    // common part of Create{Linear,Radial}GradientBrush()
-    template <typename T>
-    void SetGradientStops(T *brush, const wxGraphicsGradientStops& stops);
-
+private :
     Brush* m_brush;
     Image* m_brushImage;
     GraphicsPath* m_brushPath;
 };
 
-class WXDLLIMPEXP_CORE wxGDIPlusBitmapData : public wxGraphicsBitmapData
+class WXDLLIMPEXP_CORE wxGDIPlusBitmapData : public wxGraphicsObjectRefData
 {
 public:
-    wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap );
+    wxGDIPlusBitmapData( wxGraphicsRenderer* renderer );
     wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, const wxBitmap &bmp );
     ~wxGDIPlusBitmapData ();
 
     virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; }
-    virtual void* GetNativeBitmap() const { return m_bitmap; }
-
-#if wxUSE_IMAGE
-    wxImage ConvertToImage() const;
-#endif // wxUSE_IMAGE
 
 private :
     Bitmap* m_bitmap;
     Bitmap* m_helper;
 };
 
-class wxGDIPlusFontData : public wxGraphicsObjectRefData
+class WXDLLIMPEXP_CORE wxGDIPlusFontData : public wxGraphicsObjectRefData
 {
 public:
-    wxGDIPlusFontData( wxGraphicsRenderer* renderer,
-                       const wxFont &font,
-                       const wxColour& col );
-    wxGDIPlusFontData(wxGraphicsRenderer* renderer,
-                      const wxString& name,
-                      REAL sizeInPixels,
-                      int style,
-                      const wxColour& col);
+    wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
     ~wxGDIPlusFontData();
 
     virtual Brush* GetGDIPlusBrush() { return m_textBrush; }
     virtual Font* GetGDIPlusFont() { return m_font; }
-
 private :
-    // Common part of all ctors, flags here is a combination of values of
-    // FontStyle GDI+ enum.
-    void Init(const wxString& name,
-              REAL size,
-              int style,
-              const wxColour& col,
-              Unit fontUnit);
-
     Brush* m_textBrush;
     Font* m_font;
 };
 
-class wxGDIPlusContext : public wxGraphicsContext
+class WXDLLIMPEXP_CORE wxGDIPlusContext : public wxGraphicsContext
 {
 public:
-    wxGDIPlusContext( wxGraphicsRenderer* renderer, const wxDC& dc );
-    wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc, wxDouble width, wxDouble height );
+    wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc );
     wxGDIPlusContext( wxGraphicsRenderer* renderer, HWND hwnd );
     wxGDIPlusContext( wxGraphicsRenderer* renderer, Graphics* gr);
-    wxGDIPlusContext(wxGraphicsRenderer* renderer);
+    wxGDIPlusContext();
 
     virtual ~wxGDIPlusContext();
 
@@ -342,25 +305,13 @@ public:
     virtual void * GetNativeContext();
 
     virtual void StrokePath( const wxGraphicsPath& p );
-    virtual void FillPath( const wxGraphicsPath& p , wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
-
-    virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ); 
+    virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxODDEVEN_RULE );
 
     // stroke lines connecting each of the points
     virtual void StrokeLines( size_t n, const wxPoint2DDouble *points);
 
     // draws a polygon
-    virtual void DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
-
-    virtual bool SetAntialiasMode(wxAntialiasMode antialias);
-
-    virtual bool SetInterpolationQuality(wxInterpolationQuality interpolation);
-    
-    virtual bool SetCompositionMode(wxCompositionMode op);
-
-    virtual void BeginLayer(wxDouble opacity);
-
-    virtual void EndLayer();
+    virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxODDEVEN_RULE );
 
     virtual void Translate( wxDouble dx , wxDouble dy );
     virtual void Scale( wxDouble xScale , wxDouble yScale );
@@ -375,75 +326,37 @@ public:
     // gets the matrix of this context
     virtual wxGraphicsMatrix GetTransform() const;
 
-    virtual void DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+    void DrawGraphicsBitmapInternal( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
     virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
     virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
     virtual void PushState();
     virtual void PopState();
 
+    virtual void DrawText( const wxString &str, wxDouble x, wxDouble y);
     virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
         wxDouble *descent, wxDouble *externalLeading ) const;
     virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;
     virtual bool ShouldOffset() const;
-    virtual void GetSize( wxDouble* width, wxDouble *height );
-
-    Graphics* GetGraphics() const { return m_context; }
-
-protected:
-
-    wxDouble m_fontScaleRatio;
-
-    // Used from ctors (including those in the derived classes) and takes
-    // ownership of the graphics pointer that must be non-NULL.
-    void Init(Graphics* graphics, int width, int height);
 
 private:
-    virtual void DoDrawText(const wxString& str, wxDouble x, wxDouble y);
+    void    Init();
+    void    SetDefaults();
 
     Graphics* m_context;
-    wxStack<GraphicsState> m_stateStack;
+    vector<GraphicsState> m_stateStack;
     GraphicsState m_state1;
     GraphicsState m_state2;
 
-    wxDECLARE_NO_COPY_CLASS(wxGDIPlusContext);
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusContext)
 };
 
-#if wxUSE_IMAGE
-
-class wxGDIPlusImageContext : public wxGDIPlusContext
+class WXDLLIMPEXP_CORE wxGDIPlusMeasuringContext : public wxGDIPlusContext
 {
 public:
-    wxGDIPlusImageContext(wxGraphicsRenderer* renderer, wxImage& image) :
-        wxGDIPlusContext(renderer),
-        m_image(image),
-        m_bitmap(renderer, image)
+    wxGDIPlusMeasuringContext( wxGraphicsRenderer* renderer ) : wxGDIPlusContext( renderer , m_hdc = GetDC(NULL) )
     {
-        Init
-        (
-            new Graphics(m_bitmap.GetGDIPlusBitmap()),
-            image.GetWidth(),
-            image.GetHeight()
-        );
     }
-
-    virtual ~wxGDIPlusImageContext()
-    {
-        m_image = m_bitmap.ConvertToImage();
-    }
-
-private:
-    wxImage& m_image;
-    wxGDIPlusBitmapData m_bitmap;
-
-    wxDECLARE_NO_COPY_CLASS(wxGDIPlusImageContext);
-};
-
-#endif // wxUSE_IMAGE
-
-class wxGDIPlusMeasuringContext : public wxGDIPlusContext
-{
-public:
-    wxGDIPlusMeasuringContext( wxGraphicsRenderer* renderer ) : wxGDIPlusContext( renderer , m_hdc = GetDC(NULL), 1000, 1000 )
+    wxGDIPlusMeasuringContext()
     {
     }
 
@@ -454,120 +367,7 @@ public:
 
 private:
     HDC m_hdc ;
-} ;
-
-class wxGDIPlusPrintingContext : public wxGDIPlusContext
-{
-public:
-    wxGDIPlusPrintingContext( wxGraphicsRenderer* renderer, const wxDC& dc );
-    virtual ~wxGDIPlusPrintingContext() { }
-protected:
-};
-
-//-----------------------------------------------------------------------------
-// wxGDIPlusRenderer declaration
-//-----------------------------------------------------------------------------
-
-class wxGDIPlusRenderer : public wxGraphicsRenderer
-{
-public :
-    wxGDIPlusRenderer()
-    {
-        m_loaded = -1;
-        m_gditoken = 0;
-    }
-
-    virtual ~wxGDIPlusRenderer()
-    {
-        if ( m_loaded == 1 )
-        {
-            Unload();
-        }
-    }
-
-    // Context
-
-    virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
-
-    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
-
-#if wxUSE_PRINTING_ARCHITECTURE
-    virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc);
-#endif
-
-#if wxUSE_ENH_METAFILE
-    virtual wxGraphicsContext * CreateContext( const wxEnhMetaFileDC& dc);
-#endif
-
-    virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
-
-    virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
-
-    virtual wxGraphicsContext * CreateContext( wxWindow* window );
-
-#if wxUSE_IMAGE
-    virtual wxGraphicsContext * CreateContextFromImage(wxImage& image);
-#endif // wxUSE_IMAGE
-
-    virtual wxGraphicsContext * CreateMeasuringContext();
-
-    // Path
-
-    virtual wxGraphicsPath CreatePath();
-
-    // Matrix
-
-    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
-        wxDouble tx=0.0, wxDouble ty=0.0);
-
-
-    virtual wxGraphicsPen CreatePen(const wxPen& pen) ;
-
-    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ;
-
-    virtual wxGraphicsBrush
-    CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                              wxDouble x2, wxDouble y2,
-                              const wxGraphicsGradientStops& stops);
-
-    virtual wxGraphicsBrush
-    CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                              wxDouble xc, wxDouble yc,
-                              wxDouble radius,
-                              const wxGraphicsGradientStops& stops);
-
-    // create a native bitmap representation
-    virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap );
-#if wxUSE_IMAGE
-    virtual wxGraphicsBitmap CreateBitmapFromImage(const wxImage& image);
-    virtual wxImage CreateImageFromBitmap(const wxGraphicsBitmap& bmp);
-#endif // wxUSE_IMAGE
-
-    virtual wxGraphicsFont CreateFont( const wxFont& font,
-                                       const wxColour& col);
-
-    virtual wxGraphicsFont CreateFont(double size,
-                                      const wxString& facename,
-                                      int flags = wxFONTFLAG_DEFAULT,
-                                      const wxColour& col = *wxBLACK);
-
-    // create a graphics bitmap from a native bitmap
-    virtual wxGraphicsBitmap CreateBitmapFromNativeBitmap( void* bitmap );
-
-    // create a subimage from a native image representation
-    virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  );
-
-protected :
-    bool EnsureIsLoaded();
-    void Load();
-    void Unload();
-    friend class wxGDIPlusRendererModule;
-
-private :
-    int m_loaded;
-    ULONG_PTR m_gditoken;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusMeasuringContext)
 } ;
 
 //-----------------------------------------------------------------------------
@@ -596,7 +396,8 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p
     if (m_width <= 0.0)
         m_width = 0.1;
 
-    m_pen = new Pen(wxColourToColor(pen.GetColour()), m_width );
+    m_pen = new Pen(Color( pen.GetColour().Alpha() , pen.GetColour().Red() ,
+        pen.GetColour().Green() , pen.GetColour().Blue() ), m_width );
 
     LineCap cap;
     switch ( pen.GetCap() )
@@ -646,25 +447,25 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p
     DashStyle dashStyle = DashStyleSolid;
     switch ( pen.GetStyle() )
     {
-    case wxPENSTYLE_SOLID :
+    case wxSOLID :
         break;
 
-    case wxPENSTYLE_DOT :
+    case wxDOT :
         dashStyle = DashStyleDot;
         break;
 
-    case wxPENSTYLE_LONG_DASH :
+    case wxLONG_DASH :
         dashStyle = DashStyleDash; // TODO verify
         break;
 
-    case wxPENSTYLE_SHORT_DASH :
+    case wxSHORT_DASH :
         dashStyle = DashStyleDash;
         break;
 
-    case wxPENSTYLE_DOT_DASH :
+    case wxDOT_DASH :
         dashStyle = DashStyleDashDot;
         break;
-    case wxPENSTYLE_USER_DASH :
+    case wxUSER_DASH :
         {
             dashStyle = DashStyleCustom;
             wxDash *dashes;
@@ -681,18 +482,12 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p
             }
         }
         break;
-    case wxPENSTYLE_STIPPLE :
+    case wxSTIPPLE :
         {
             wxBitmap* bmp = pen.GetStipple();
-            if ( bmp && bmp->IsOk() )
+            if ( bmp && bmp->Ok() )
             {
-                m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),
-#if wxUSE_PALETTE
-                    (HPALETTE)bmp->GetPalette()->GetHPALETTE()
-#else
-                    NULL
-#endif
-                );
+                m_penImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
                 m_penBrush = new TextureBrush(m_penImage);
                 m_pen->SetBrush( m_penBrush );
             }
@@ -700,39 +495,33 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p
         }
         break;
     default :
-        if ( pen.GetStyle() >= wxPENSTYLE_FIRST_HATCH &&
-             pen.GetStyle() <= wxPENSTYLE_LAST_HATCH )
+        if ( pen.GetStyle() >= wxFIRST_HATCH && pen.GetStyle() <= wxLAST_HATCH )
         {
-            HatchStyle style;
+            HatchStyle style = HatchStyleHorizontal;
             switch( pen.GetStyle() )
             {
-            case wxPENSTYLE_BDIAGONAL_HATCH :
+            case wxBDIAGONAL_HATCH :
                 style = HatchStyleBackwardDiagonal;
                 break ;
-            case wxPENSTYLE_CROSSDIAG_HATCH :
+            case wxCROSSDIAG_HATCH :
                 style = HatchStyleDiagonalCross;
                 break ;
-            case wxPENSTYLE_FDIAGONAL_HATCH :
+            case wxFDIAGONAL_HATCH :
                 style = HatchStyleForwardDiagonal;
                 break ;
-            case wxPENSTYLE_CROSS_HATCH :
+            case wxCROSS_HATCH :
                 style = HatchStyleCross;
                 break ;
-            case wxPENSTYLE_HORIZONTAL_HATCH :
+            case wxHORIZONTAL_HATCH :
                 style = HatchStyleHorizontal;
                 break ;
-            case wxPENSTYLE_VERTICAL_HATCH :
+            case wxVERTICAL_HATCH :
                 style = HatchStyleVertical;
                 break ;
-            default:
-                style = HatchStyleHorizontal;
+
             }
-            m_penBrush = new HatchBrush
-                             (
-                                style,
-                                wxColourToColor(pen.GetColour()),
-                                Color::Transparent
-                             );
+            m_penBrush = new HatchBrush(style,Color( pen.GetColour().Alpha() , pen.GetColour().Red() ,
+                pen.GetColour().Green() , pen.GetColour().Blue() ), Color::Transparent );
             m_pen->SetBrush( m_penBrush );
         }
         break;
@@ -757,54 +546,44 @@ wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer , const wxB
     Init();
     if ( brush.GetStyle() == wxSOLID)
     {
-        m_brush = new SolidBrush(wxColourToColor( brush.GetColour()));
+        m_brush = new SolidBrush( Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
+            brush.GetColour().Green() , brush.GetColour().Blue() ) );
     }
     else if ( brush.IsHatch() )
     {
-        HatchStyle style;
+        HatchStyle style = HatchStyleHorizontal;
         switch( brush.GetStyle() )
         {
-        case wxBRUSHSTYLE_BDIAGONAL_HATCH :
+        case wxBDIAGONAL_HATCH :
             style = HatchStyleBackwardDiagonal;
             break ;
-        case wxBRUSHSTYLE_CROSSDIAG_HATCH :
+        case wxCROSSDIAG_HATCH :
             style = HatchStyleDiagonalCross;
             break ;
-        case wxBRUSHSTYLE_FDIAGONAL_HATCH :
+        case wxFDIAGONAL_HATCH :
             style = HatchStyleForwardDiagonal;
             break ;
-        case wxBRUSHSTYLE_CROSS_HATCH :
+        case wxCROSS_HATCH :
             style = HatchStyleCross;
             break ;
-        case wxBRUSHSTYLE_HORIZONTAL_HATCH :
+        case wxHORIZONTAL_HATCH :
             style = HatchStyleHorizontal;
             break ;
-        case wxBRUSHSTYLE_VERTICAL_HATCH :
+        case wxVERTICAL_HATCH :
             style = HatchStyleVertical;
             break ;
-        default:
-            style = HatchStyleHorizontal;
+
         }
-        m_brush = new HatchBrush
-                      (
-                        style,
-                        wxColourToColor(brush.GetColour()),
-                        Color::Transparent
-                      );
+        m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
+            brush.GetColour().Green() , brush.GetColour().Blue() ), Color::Transparent );
     }
     else
     {
         wxBitmap* bmp = brush.GetStipple();
-        if ( bmp && bmp->IsOk() )
+        if ( bmp && bmp->Ok() )
         {
             wxDELETE( m_brushImage );
-            m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),
-#if wxUSE_PALETTE
-                (HPALETTE)bmp->GetPalette()->GetHPALETTE()
-#else
-                NULL
-#endif
-            );
+            m_brushImage = Bitmap::FromHBITMAP((HBITMAP)bmp->GetHBITMAP(),(HPALETTE)bmp->GetPalette()->GetHPALETTE());
             m_brush = new TextureBrush(m_brushImage);
         }
     }
@@ -824,148 +603,39 @@ void wxGDIPlusBrushData::Init()
     m_brushPath= NULL;
 }
 
-template <typename T>
-void
-wxGDIPlusBrushData::SetGradientStops(T *brush,
-        const wxGraphicsGradientStops& stops)
+void wxGDIPlusBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2)
 {
-    const unsigned numStops = stops.GetCount();
-    if ( numStops <= 2 )
-    {
-        // initial and final colours are set during the brush creation, nothing
-        // more to do
-        return;
-    }
-
-    wxVector<Color> colors(numStops);
-    wxVector<REAL> positions(numStops);
-
-    for ( unsigned i = 0; i < numStops; i++ )
-    {
-        wxGraphicsGradientStop stop = stops.Item(i);
-
-        colors[i] = wxColourToColor(stop.GetColour());
-        positions[i] = stop.GetPosition();
-    }
-
-    brush->SetInterpolationColors(&colors[0], &positions[0], numStops);
+    m_brush = new LinearGradientBrush( PointF( x1,y1) , PointF( x2,y2),
+        Color( c1.Alpha(), c1.Red(),c1.Green() , c1.Blue() ),
+        Color( c2.Alpha(), c2.Red(),c2.Green() , c2.Blue() ));
 }
 
-void
-wxGDIPlusBrushData::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                                              wxDouble x2, wxDouble y2,
-                                              const wxGraphicsGradientStops& stops)
-{
-    LinearGradientBrush * const
-        brush = new LinearGradientBrush(PointF(x1, y1) , PointF(x2, y2),
-                                        wxColourToColor(stops.GetStartColour()),
-                                        wxColourToColor(stops.GetEndColour()));
-    m_brush =  brush;
-
-    SetGradientStops(brush, stops);
-}
-
-void
-wxGDIPlusBrushData::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                                              wxDouble xc, wxDouble yc,
-                                              wxDouble radius,
-                                              const wxGraphicsGradientStops& stops)
+void wxGDIPlusBrushData::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+                                               const wxColour &oColor, const wxColour &cColor)
 {
+    // Create a path that consists of a single circle.
     m_brushPath = new GraphicsPath();
-    m_brushPath->AddEllipse( (REAL)(xc-radius), (REAL)(yc-radius),
-                             (REAL)(2*radius), (REAL)(2*radius));
+    m_brushPath->AddEllipse( (REAL)(xc-radius), (REAL)(yc-radius), (REAL)(2*radius), (REAL)(2*radius));
 
-    PathGradientBrush * const brush = new PathGradientBrush(m_brushPath);
-    m_brush = brush;
-    brush->SetCenterPoint(PointF(xo, yo));
-    brush->SetCenterColor(wxColourToColor(stops.GetStartColour()));
+    PathGradientBrush *b = new PathGradientBrush(m_brushPath);
+    m_brush = b;
+    b->SetCenterPoint( PointF(xo,yo));
+    b->SetCenterColor(Color( oColor.Alpha(), oColor.Red(),oColor.Green() , oColor.Blue() ));
 
-    const Color col(wxColourToColor(stops.GetEndColour()));
+    Color colors[] = {Color( cColor.Alpha(), cColor.Red(),cColor.Green() , cColor.Blue() )};
     int count = 1;
-    brush->SetSurroundColors(&col, &count);
-
-    SetGradientStops(brush, stops);
+    b->SetSurroundColors(colors, &count);
 }
 
-//-----------------------------------------------------------------------------
-// wxGDIPlusFont implementation
-//-----------------------------------------------------------------------------
-
-void
-wxGDIPlusFontData::Init(const wxString& name,
-                        REAL size,
-                        int style,
-                        const wxColour& col,
-                        Unit fontUnit)
-{
-    m_font = new Font(name.wc_str(), size, style, fontUnit);
-
-    m_textBrush = new SolidBrush(wxColourToColor(col));
-}
-
-wxGDIPlusFontData::wxGDIPlusFontData( wxGraphicsRenderer* renderer,
-                                      const wxFont &font,
-                                      const wxColour& col )
-    : wxGraphicsObjectRefData( renderer )
-{
-    int style = FontStyleRegular;
-    if ( font.GetStyle() == wxFONTSTYLE_ITALIC )
-        style |= FontStyleItalic;
-    if ( font.GetUnderlined() )
-        style |= FontStyleUnderline;
-    if ( font.GetWeight() == wxFONTWEIGHT_BOLD )
-        style |= FontStyleBold;
-
-    Init(font.GetFaceName(), font.GetPointSize(), style, col, UnitPoint);
-}
-
-wxGDIPlusFontData::wxGDIPlusFontData(wxGraphicsRenderer* renderer,
-                                     const wxString& name,
-                                     REAL sizeInPixels,
-                                     int style,
-                                     const wxColour& col) :
-    wxGraphicsObjectRefData(renderer)
-{
-    Init(name, sizeInPixels, style, col, UnitPixel);
-}
-
-wxGDIPlusFontData::~wxGDIPlusFontData()
-{
-    delete m_textBrush;
-    delete m_font;
-}
-
-// the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the
-// premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied
-// bytes as parameter, since there is no real copying of the data going in, only references are stored
-// m_helper has to be kept alive as well
-
-//-----------------------------------------------------------------------------
-// wxGDIPlusBitmapData implementation
-//-----------------------------------------------------------------------------
-
-wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap ) :
-    wxGraphicsBitmapData( renderer ), m_bitmap( bitmap )
-{
-    m_helper = NULL;
-}
-
-wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer,
-                        const wxBitmap &bmp) : wxGraphicsBitmapData( renderer )
+wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, 
+                        const wxBitmap &bmp) : wxGraphicsObjectRefData( renderer )
 {
     m_bitmap = NULL;
     m_helper = NULL;
-
     Bitmap* image = NULL;
     if ( bmp.GetMask() )
     {
-        Bitmap interim((HBITMAP)bmp.GetHBITMAP(),
-#if wxUSE_PALETTE
-            (HPALETTE)bmp.GetPalette()->GetHPALETTE()
-#else
-            NULL
-#endif
-        );
+        Bitmap interim((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()) ;
 
         size_t width = interim.GetWidth();
         size_t height = interim.GetHeight();
@@ -1021,13 +691,7 @@ wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer,
     }
     else
     {
-        image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),
-#if wxUSE_PALETTE
-            (HPALETTE)bmp.GetPalette()->GetHPALETTE()
-#else
-            NULL
-#endif
-        );
+        image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE());
         if ( bmp.HasAlpha() && GetPixelFormatSize(image->GetPixelFormat()) == 32 )
         {
             size_t width = image->GetWidth();
@@ -1050,34 +714,42 @@ wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer,
         m_bitmap = image;
 }
 
-#if wxUSE_IMAGE
-
-wxImage wxGDIPlusBitmapData::ConvertToImage() const
-{
-    // We could use Bitmap::LockBits() and convert to wxImage directly but
-    // passing by wxBitmap is easier. It would be nice to measure performance
-    // of the two methods but for this the second one would need to be written
-    // first...
-    HBITMAP hbmp;
-    if ( m_bitmap->GetHBITMAP(Color(0xffffffff), &hbmp) != Gdiplus::Ok )
-        return wxNullImage;
-
-    wxBitmap bmp;
-    bmp.SetWidth(m_bitmap->GetWidth());
-    bmp.SetHeight(m_bitmap->GetHeight());
-    bmp.SetHBITMAP(hbmp);
-    bmp.SetDepth(IsAlphaPixelFormat(m_bitmap->GetPixelFormat()) ? 32 : 24);
-    return bmp.ConvertToImage();
-}
-
-#endif // wxUSE_IMAGE
-
 wxGDIPlusBitmapData::~wxGDIPlusBitmapData()
 {
     delete m_bitmap;
     delete m_helper;
 }
 
+//-----------------------------------------------------------------------------
+// wxGDIPlusFont implementation
+//-----------------------------------------------------------------------------
+
+wxGDIPlusFontData::wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font,
+                             const wxColour& col ) : wxGraphicsObjectRefData( renderer )
+{
+    m_textBrush = NULL;
+    m_font = NULL;
+
+    wxWCharBuffer s = font.GetFaceName().wc_str( *wxConvUI );
+    int size = font.GetPointSize();
+    int style = FontStyleRegular;
+    if ( font.GetStyle() == wxFONTSTYLE_ITALIC )
+        style |= FontStyleItalic;
+    if ( font.GetUnderlined() )
+        style |= FontStyleUnderline;
+    if ( font.GetWeight() == wxFONTWEIGHT_BOLD )
+        style |= FontStyleBold;
+    m_font = new Font( s , size , style );
+    m_textBrush = new SolidBrush( Color( col.Alpha() , col.Red() ,
+        col.Green() , col.Blue() ));
+}
+
+wxGDIPlusFontData::~wxGDIPlusFontData()
+{
+    delete m_textBrush;
+    delete m_font;
+}
+
 //-----------------------------------------------------------------------------
 // wxGDIPlusPath implementation
 //-----------------------------------------------------------------------------
@@ -1191,7 +863,7 @@ void wxGDIPlusPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *
     *h = bounds.Height;
 }
 
-bool wxGDIPlusPathData::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const
+bool wxGDIPlusPathData::Contains( wxDouble x, wxDouble y, int fillStyle ) const
 {
     m_path->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
     return m_path->IsVisible( (FLOAT) x,(FLOAT) y) == TRUE ;
@@ -1284,7 +956,7 @@ void wxGDIPlusMatrixData::Scale( wxDouble xScale , wxDouble yScale )
 // add the rotation to this matrix (radians)
 void wxGDIPlusMatrixData::Rotate( wxDouble angle )
 {
-    m_matrix->Rotate( RadToDeg(angle) );
+    m_matrix->Rotate( angle );
 }
 
 //
@@ -1319,6 +991,9 @@ void * wxGDIPlusMatrixData::GetNativeMatrix() const
 // wxGDIPlusContext implementation
 //-----------------------------------------------------------------------------
 
+IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext)
+IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusMeasuringContext,wxGDIPlusContext)
+
 class wxGDIPlusOffsetHelper
 {
 public :
@@ -1339,57 +1014,47 @@ public :
     bool m_offset;
 } ;
 
-wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc, wxDouble width, wxDouble height   )
+wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc  )
     : wxGraphicsContext(renderer)
 {
-    Init(new Graphics(hdc), width, height);
-}
-
-wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, const wxDC& dc )
-    : wxGraphicsContext(renderer)
-{
-    wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl );
-    HDC hdc = (HDC) msw->GetHDC();
-    wxSize sz = dc.GetSize();
-
-    Init(new Graphics(hdc), sz.x, sz.y);
+    Init();
+    m_context = new Graphics( hdc);
+    SetDefaults();
 }
 
 wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HWND hwnd  )
     : wxGraphicsContext(renderer)
 {
-    RECT rect = wxGetWindowRect(hwnd);
-    Init(new Graphics(hwnd), rect.right - rect.left, rect.bottom - rect.top);
-    m_enableOffset = true;
+    Init();
+    m_context = new Graphics( hwnd);
+    SetDefaults();
 }
 
 wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, Graphics* gr  )
     : wxGraphicsContext(renderer)
 {
-    Init(gr, 0, 0);
+    Init();
+    m_context = gr;
+    SetDefaults();
 }
 
-wxGDIPlusContext::wxGDIPlusContext(wxGraphicsRenderer* renderer)
-    : wxGraphicsContext(renderer)
+wxGDIPlusContext::wxGDIPlusContext() : wxGraphicsContext(NULL)
+{
+    Init();
+}
+
+void wxGDIPlusContext::Init()
 {
-    // Derived class must call Init() later but just set m_context to NULL for
-    // safety to avoid crashing in our dtor if Init() ends up not being called.
     m_context = NULL;
+    m_state1 = 0;
+    m_state2= 0;
 }
 
-void wxGDIPlusContext::Init(Graphics* graphics, int width, int height)
+void wxGDIPlusContext::SetDefaults()
 {
-    m_context = graphics;
-    m_state1 = 0;
-    m_state2 = 0;
-    m_width = width;
-    m_height = height;
-    m_fontScaleRatio = 1.0;
-
     m_context->SetTextRenderingHint(TextRenderingHintSystemDefault);
     m_context->SetPixelOffsetMode(PixelOffsetModeHalf);
     m_context->SetSmoothingMode(SmoothingModeHighQuality);
-    m_context->SetInterpolationMode(InterpolationModeHighQuality);
     m_state1 = m_context->Save();
     m_state2 = m_context->Save();
 }
@@ -1421,56 +1086,25 @@ void wxGDIPlusContext::ResetClip()
     m_context->ResetClip();
 }
 
-void wxGDIPlusContext::DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
-{
-    if (m_composition == wxCOMPOSITION_DEST)
-        return;
-
-    wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
-    Brush *brush = m_brush.IsNull() ? NULL : ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush();
-    Pen *pen = m_pen.IsNull() ? NULL : ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen();
-
-    if ( brush )
-    {
-        // the offset is used to fill only the inside of the rectangle and not paint underneath
-        // its border which may influence a transparent Pen
-        REAL offset = 0;
-        if ( pen )
-             offset = pen->GetWidth();
-        m_context->FillRectangle( brush, (REAL)x + offset/2, (REAL)y + offset/2, (REAL)w - offset, (REAL)h - offset);
-    }
-
-    if ( pen )
-    {
-        m_context->DrawRectangle( pen, (REAL)x, (REAL)y, (REAL)w, (REAL)h );
-    }
-}
-
 void wxGDIPlusContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
 {
-   if (m_composition == wxCOMPOSITION_DEST)
-        return;
+    if ( !m_pen.IsNull() )
+    {
+        wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
+        Point *cpoints = new Point[n];
+        for (size_t i = 0; i < n; i++)
+        {
+            cpoints[i].X = (int)(points[i].m_x );
+            cpoints[i].Y = (int)(points[i].m_y );
 
-   if ( !m_pen.IsNull() )
-   {
-       wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
-       Point *cpoints = new Point[n];
-       for (size_t i = 0; i < n; i++)
-       {
-           cpoints[i].X = (int)(points[i].m_x );
-           cpoints[i].Y = (int)(points[i].m_y );
-
-       } // for (size_t i = 0; i < n; i++)
-       m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ;
-       delete[] cpoints;
-   }
+        } // for (size_t i = 0; i < n; i++)
+        m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ;
+        delete[] cpoints;
+    }
 }
 
-void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode WXUNUSED(fillStyle) )
+void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, int WXUNUSED(fillStyle) )
 {
-   if (m_composition == wxCOMPOSITION_DEST)
-        return;
-
     wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
     Point *cpoints = new Point[n];
     for (size_t i = 0; i < n; i++)
@@ -1488,9 +1122,6 @@ void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPol
 
 void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path )
 {
-   if (m_composition == wxCOMPOSITION_DEST)
-        return;
-
     if ( !m_pen.IsNull() )
     {
         wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
@@ -1498,11 +1129,8 @@ void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path )
     }
 }
 
-void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , wxPolygonFillMode fillStyle )
+void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , int fillStyle )
 {
-   if (m_composition == wxCOMPOSITION_DEST)
-        return;
-
     if ( !m_brush.IsNull() )
     {
         wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
@@ -1512,106 +1140,6 @@ void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , wxPolygonFillMode
     }
 }
 
-bool wxGDIPlusContext::SetAntialiasMode(wxAntialiasMode antialias)
-{
-    if (m_antialias == antialias)
-        return true;
-
-    m_antialias = antialias;
-
-    SmoothingMode antialiasMode;
-    switch (antialias)
-    {
-        case wxANTIALIAS_DEFAULT:
-            antialiasMode = SmoothingModeHighQuality;
-            break;
-        case wxANTIALIAS_NONE:
-            antialiasMode = SmoothingModeNone;
-            break;
-        default:
-            return false;
-    }
-    m_context->SetSmoothingMode(antialiasMode);
-    return true;
-}
-
-bool wxGDIPlusContext::SetInterpolationQuality(wxInterpolationQuality interpolation)
-{
-    if (m_interpolation == interpolation)
-        return true;
-
-    InterpolationMode interpolationMode = InterpolationModeDefault;
-    switch (interpolation)
-    {
-        case wxINTERPOLATION_DEFAULT:
-            interpolationMode = InterpolationModeDefault;
-            break;
-
-        case wxINTERPOLATION_NONE:
-            interpolationMode = InterpolationModeNearestNeighbor;
-            break;
-
-        case wxINTERPOLATION_FAST:
-            interpolationMode = InterpolationModeLowQuality;
-            break;
-
-        case wxINTERPOLATION_GOOD:
-            interpolationMode = InterpolationModeHighQuality;
-            break;
-
-        case wxINTERPOLATION_BEST:
-            interpolationMode = InterpolationModeHighQualityBicubic;
-            break;
-
-        default:
-            return false;
-    }
-
-    if ( m_context->SetInterpolationMode(interpolationMode) != Gdiplus::Ok )
-        return false;
-
-    m_interpolation = interpolation;
-
-    return true;
-}
-
-bool wxGDIPlusContext::SetCompositionMode(wxCompositionMode op)
-{
-    if ( m_composition == op )
-        return true;
-
-    m_composition = op;
-
-    if (m_composition == wxCOMPOSITION_DEST)
-        return true;
-
-    CompositingMode cop;
-    switch (op)
-    {
-        case wxCOMPOSITION_SOURCE:
-            cop = CompositingModeSourceCopy;
-            break;
-        case wxCOMPOSITION_OVER:
-            cop = CompositingModeSourceOver;
-            break;
-        default:
-            return false;
-    }
-
-    m_context->SetCompositingMode(cop);
-    return true;
-}
-
-void wxGDIPlusContext::BeginLayer(wxDouble /* opacity */)
-{
-    // TODO
-}
-
-void wxGDIPlusContext::EndLayer()
-{
-    // TODO
-}
-
 void wxGDIPlusContext::Rotate( wxDouble angle )
 {
     m_context->RotateTransform( RadToDeg(angle) );
@@ -1630,23 +1158,27 @@ void wxGDIPlusContext::Scale( wxDouble xScale , wxDouble yScale )
 void wxGDIPlusContext::PushState()
 {
     GraphicsState state = m_context->Save();
-    m_stateStack.push(state);
+    m_stateStack.push_back(state);
 }
 
 void wxGDIPlusContext::PopState()
 {
-    wxCHECK_RET( !m_stateStack.empty(), wxT("No state to pop") );
-
-    GraphicsState state = m_stateStack.top();
-    m_stateStack.pop();
+    GraphicsState state = m_stateStack.back();
+    m_stateStack.pop_back();
     m_context->Restore(state);
 }
 
-void wxGDIPlusContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
-{
-   if (m_composition == wxCOMPOSITION_DEST)
-        return;
+// the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the
+// premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied
+// bytes as parameter
 
+void wxGraphicsContext::DrawGraphicsBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
+    static_cast<wxGDIPlusContext*>(this)->DrawGraphicsBitmapInternal(bmp, x, y, w, h);
+}
+
+void wxGDIPlusContext::DrawGraphicsBitmapInternal( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
     Bitmap* image = static_cast<wxGDIPlusBitmapData*>(bmp.GetRefData())->GetGDIPlusBitmap();
     if ( image )
     {
@@ -1654,7 +1186,7 @@ void wxGDIPlusContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDo
         {
             Rect drawRect((REAL) x, (REAL)y, (REAL)w, (REAL)h);
             m_context->SetPixelOffsetMode( PixelOffsetModeNone );
-            m_context->DrawImage(image, drawRect, 0 , 0 , image->GetWidth(), image->GetHeight(), UnitPixel ) ;
+            m_context->DrawImage(image, drawRect, 0 , 0 , image->GetWidth()-1, image->GetHeight()-1, UnitPixel ) ;
             m_context->SetPixelOffsetMode( PixelOffsetModeHalf );
         }
         else
@@ -1665,14 +1197,11 @@ void wxGDIPlusContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDo
 void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
     wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp);
-    DrawBitmap(bitmap, x, y, w, h);
+    DrawGraphicsBitmapInternal(bitmap, x, y, w, h);
 }
 
 void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
-   if (m_composition == wxCOMPOSITION_DEST)
-        return;
-
     // the built-in conversion fails when there is alpha in the HICON (eg XP style icons), we can only
     // find out by looking at the bitmap data whether there really was alpha in it
     HICON hIcon = (HICON)icon.GetHICON();
@@ -1700,7 +1229,7 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD
 
         interim.LockBits(&bounds, ImageLockModeRead,
             interim.GetPixelFormat(),&data);
-
+        
         bool hasAlpha = false;
         for ( size_t y = 0 ; y < height && !hasAlpha ; ++y)
         {
@@ -1714,8 +1243,8 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD
 
         if ( hasAlpha )
         {
-        image = new Bitmap(data.Width, data.Height, data.Stride,
-            PixelFormat32bppARGB , (BYTE*) data.Scan0);
+            image = new Bitmap(data.Width, data.Height, data.Stride,
+                PixelFormat32bppARGB , (BYTE*) data.Scan0);
         }
         else
         {
@@ -1732,30 +1261,16 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD
     DeleteObject(iconInfo.hbmMask);
 }
 
-void wxGDIPlusContext::DoDrawText(const wxString& str,
-                                        wxDouble x, wxDouble y )
+void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
 {
-   if (m_composition == wxCOMPOSITION_DEST)
-        return;
-
-    wxCHECK_RET( !m_font.IsNull(),
-                 wxT("wxGDIPlusContext::DrawText - no valid font set") );
+    wxCHECK_RET( !m_font.IsNull(), wxT("wxGDIPlusContext::DrawText - no valid font set") );
 
     if ( str.IsEmpty())
         return ;
 
-    wxGDIPlusFontData * const
-        fontData = (wxGDIPlusFontData *)m_font.GetRefData();
- 
-    m_context->DrawString
-               (
-                    str.wc_str(*wxConvUI),  // string to draw, always Unicode
-                    -1,                     // length: string is NUL-terminated
-                    fontData->GetGDIPlusFont(),
-                    PointF(x, y),
-                    StringFormat::GenericTypographic(),
-                    fontData->GetGDIPlusBrush()
-               );
+    wxWCharBuffer s = str.wc_str( *wxConvUI );
+    m_context->DrawString( s , -1 , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont() ,
+            PointF( x , y ) , StringFormat::GenericTypographic() , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() );
 }
 
 void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
@@ -1769,16 +1284,14 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
 
     f->GetFamily(&ffamily) ;
 
-    REAL factorY = m_fontScaleRatio;
+    REAL factorY = m_context->GetDpiY() / 72.0 ;
 
-    // Notice that we must use the real font style or the results would be
-    // incorrect for italic/bold fonts.
-    const INT style = f->GetStyle();
-    const REAL size = f->GetSize();
-    const REAL emHeight = ffamily.GetEmHeight(style);
-    REAL rDescent = ffamily.GetCellDescent(style) * size / emHeight;
-    REAL rAscent = ffamily.GetCellAscent(style) * size / emHeight;
-    REAL rHeight = ffamily.GetLineSpacing(style) * size / emHeight;
+    REAL rDescent = ffamily.GetCellDescent(FontStyleRegular) *
+        f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
+    REAL rAscent = ffamily.GetCellAscent(FontStyleRegular) *
+        f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
+    REAL rHeight = ffamily.GetLineSpacing(FontStyleRegular) *
+        f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
 
     if ( height )
         *height = rHeight * factorY;
@@ -1796,14 +1309,12 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
     {
         RectF layoutRect(0,0, 100000.0f, 100000.0f);
         StringFormat strFormat( StringFormat::GenericTypographic() );
-        strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() );
+        strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); 
 
         RectF bounds ;
         m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, &strFormat, &bounds ) ;
         if ( width )
             *width = bounds.Width;
-        if ( height )
-            *height = bounds.Height;
     }
 }
 
@@ -1825,44 +1336,27 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
     RectF layoutRect(0,0, 100000.0f, 100000.0f);
     StringFormat strFormat( StringFormat::GenericTypographic() );
 
-    size_t startPosition = 0;
-    size_t remainder = len;
-    const size_t maxSpan = 32;
-    CharacterRange* ranges = new CharacterRange[maxSpan] ;
-    Region* regions = new Region[maxSpan];
-
-    while( remainder > 0 )
+    CharacterRange* ranges = new CharacterRange[len] ;
+    Region* regions = new Region[len];
+    for( size_t i = 0 ; i < len ; ++i)
     {
-        size_t span = wxMin( maxSpan, remainder );
-
-        for( size_t i = 0 ; i < span ; ++i)
-        {
-            ranges[i].First = 0 ;
-            ranges[i].Length = startPosition+i+1 ;
-        }
-        strFormat.SetMeasurableCharacterRanges(span,ranges);
-        strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() );
-        m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,span,regions) ;
-
-        RectF bbox ;
-        for ( size_t i = 0 ; i < span ; ++i)
-        {
-            regions[i].GetBounds(&bbox,m_context);
-            widths[startPosition+i] = bbox.Width;
-        }
-        remainder -= span;
-        startPosition += span;
+        ranges[i].First = i ;
+        ranges[i].Length = 1 ;
     }
+    strFormat.SetMeasurableCharacterRanges(len,ranges);
+    strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); 
+    m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,1,regions) ;
 
-    delete[] ranges;
-    delete[] regions;
+    RectF bbox ;
+    for ( size_t i = 0 ; i < len ; ++i)
+    {
+        regions[i].GetBounds(&bbox,m_context);
+        widths[i] = bbox.GetRight()-bbox.GetLeft();
+    }
 }
 
 bool wxGDIPlusContext::ShouldOffset() const
-{
-    if ( !m_enableOffset )
-        return false;
-    
+{     
     int penwidth = 0 ;
     if ( !m_pen.IsNull() )
     {
@@ -1897,38 +1391,80 @@ wxGraphicsMatrix wxGDIPlusContext::GetTransform() const
     m_context->GetTransform((Matrix*) matrix.GetNativeMatrix());
     return matrix;
 }
-
-void wxGDIPlusContext::GetSize( wxDouble* width, wxDouble *height )
-{
-    *width = m_width;
-    *height = m_height;
-}
-
 //-----------------------------------------------------------------------------
-// wxGDIPlusPrintingContext implementation
+// wxGDIPlusRenderer declaration
 //-----------------------------------------------------------------------------
 
-wxGDIPlusPrintingContext::wxGDIPlusPrintingContext( wxGraphicsRenderer* renderer,
-                                                    const wxDC& dc )
-    : wxGDIPlusContext(renderer, dc)
+class WXDLLIMPEXP_CORE wxGDIPlusRenderer : public wxGraphicsRenderer
 {
-    Graphics* context = GetGraphics();
+public :
+    wxGDIPlusRenderer()
+    {
+        m_loaded = -1;
+        m_gditoken = 0;
+    }
 
-    //m_context->SetPageUnit(UnitDocument);
+    virtual ~wxGDIPlusRenderer()
+    {
+        if ( m_loaded == 1 )
+        {
+            Unload();
+        }
+    }
 
-    // Setup page scale, based on DPI ratio.
-    // Antecedent should be 100dpi when the default page unit
-    // (UnitDisplay) is used. Page unit UnitDocument would require 300dpi
-    // instead. Note that calling SetPageScale() does not have effect on
-    // non-printing DCs (that is, any other than wxPrinterDC or
-    // wxEnhMetaFileDC).
-    REAL dpiRatio = 100.0 / context->GetDpiY();
-    context->SetPageScale(dpiRatio);
+    // Context
 
-    // We use this modifier when measuring fonts. It is needed because the
-    // page scale is modified above.
-    m_fontScaleRatio = context->GetDpiY() / 72.0;
-}
+    virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
+
+    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
+
+    virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
+
+    virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
+
+    virtual wxGraphicsContext * CreateContext( wxWindow* window );
+
+    virtual wxGraphicsContext * CreateMeasuringContext();
+
+    // Path
+
+    virtual wxGraphicsPath CreatePath();
+
+    // Matrix
+
+    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
+        wxDouble tx=0.0, wxDouble ty=0.0);
+
+
+    virtual wxGraphicsPen CreatePen(const wxPen& pen) ;
+
+    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ;
+
+    // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+    virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+        const wxColour&c1, const wxColour&c2) ;
+
+    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc)
+    // with radius r and color cColor
+    virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor) ;
+
+    // sets the font
+    virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
+    
+    wxGraphicsBitmap CreateBitmap( const wxBitmap &bmp ) ;
+protected :
+    bool EnsureIsLoaded();
+    void Load();
+    void Unload();
+    friend class wxGDIPlusRendererModule;
+
+private :
+    int m_loaded;
+    ULONG_PTR m_gditoken;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer)
+} ;
 
 //-----------------------------------------------------------------------------
 // wxGDIPlusRenderer implementation
@@ -1969,12 +1505,12 @@ void wxGDIPlusRenderer::Load()
     GdiplusStartupOutput output;
     if ( GdiplusStartup(&m_gditoken,&input,&output) == Gdiplus::Ok )
     {
-        wxLogTrace("gdiplus", "successfully initialized GDI+");
+        wxLogTrace(wxT("gdiplus"), wxT("successfully initialized GDI+"));
         m_loaded = 1;
     }
     else
     {
-        wxLogTrace("gdiplus", "failed to initialize GDI+, missing gdiplus.dll?");
+        wxLogTrace(wxT("gdiplus"), wxT("failed to initialize GDI+, missing gdiplus.dll?"));
         m_loaded = 0;
     }
 }
@@ -1984,7 +1520,7 @@ void wxGDIPlusRenderer::Unload()
     if ( m_gditoken )
     {
         GdiplusShutdown(m_gditoken);
-        m_gditoken = 0;
+        m_gditoken = NULL;
     }
     m_loaded = -1; // next Load() will try again
 }
@@ -1992,48 +1528,15 @@ void wxGDIPlusRenderer::Unload()
 wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxWindowDC& dc)
 {
     ENSURE_LOADED_OR_RETURN(NULL);
-    wxGDIPlusContext* context = new wxGDIPlusContext(this, dc);
-    context->EnableOffset(true);
-    return context;
+    return new wxGDIPlusContext(this,(HDC) dc.GetHDC());
 }
 
-#if wxUSE_PRINTING_ARCHITECTURE
-wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxPrinterDC& dc)
-{
-    ENSURE_LOADED_OR_RETURN(NULL);
-    wxGDIPlusContext* context = new wxGDIPlusPrintingContext(this, dc);
-    return context;
-}
-#endif
-
-#if wxUSE_ENH_METAFILE
-wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxEnhMetaFileDC& dc)
-{
-    ENSURE_LOADED_OR_RETURN(NULL);
-    wxGDIPlusContext* context = new wxGDIPlusPrintingContext(this, dc);
-    return context;
-}
-#endif
-
 wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxMemoryDC& dc)
 {
     ENSURE_LOADED_OR_RETURN(NULL);
-    wxGDIPlusContext* context = new wxGDIPlusContext(this, dc);
-    context->EnableOffset(true);
-    return context;
+    return new wxGDIPlusContext(this,(HDC) dc.GetHDC());
 }
 
-#if wxUSE_IMAGE
-wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromImage(wxImage& image)
-{
-    ENSURE_LOADED_OR_RETURN(NULL);
-    wxGDIPlusContext* context = new wxGDIPlusImageContext(this, image);
-    context->EnableOffset(true);
-    return context;
-}
-
-#endif // wxUSE_IMAGE
-
 wxGraphicsContext * wxGDIPlusRenderer::CreateMeasuringContext()
 {
     ENSURE_LOADED_OR_RETURN(NULL);
@@ -2087,7 +1590,7 @@ wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDoub
 wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen)
 {
     ENSURE_LOADED_OR_RETURN(wxNullGraphicsPen);
-    if ( !pen.IsOk() || pen.GetStyle() == wxTRANSPARENT )
+    if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
         return wxNullGraphicsPen;
     else
     {
@@ -2100,7 +1603,7 @@ wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen)
 wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush )
 {
     ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
-    if ( !brush.IsOk() || brush.GetStyle() == wxTRANSPARENT )
+    if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
         return wxNullGraphicsBrush;
     else
     {
@@ -2110,141 +1613,51 @@ wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush )
     }
 }
 
-wxGraphicsBrush
-wxGDIPlusRenderer::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
-                                             wxDouble x2, wxDouble y2,
-                                             const wxGraphicsGradientStops& stops)
+// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+wxGraphicsBrush wxGDIPlusRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+                                                                      const wxColour&c1, const wxColour&c2)
 {
     ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
     wxGraphicsBrush p;
     wxGDIPlusBrushData* d = new wxGDIPlusBrushData( this );
-    d->CreateLinearGradientBrush(x1, y1, x2, y2, stops);
+    d->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2);
     p.SetRefData(d);
     return p;
  }
 
-wxGraphicsBrush
-wxGDIPlusRenderer::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
-                                             wxDouble xc, wxDouble yc,
-                                             wxDouble radius,
-                                             const wxGraphicsGradientStops& stops)
+// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc)
+// with radius r and color cColor
+wxGraphicsBrush wxGDIPlusRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+                                                                      const wxColour &oColor, const wxColour &cColor)
 {
     ENSURE_LOADED_OR_RETURN(wxNullGraphicsBrush);
     wxGraphicsBrush p;
     wxGDIPlusBrushData* d = new wxGDIPlusBrushData( this );
-    d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,stops);
+    d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
     p.SetRefData(d);
     return p;
 }
 
-wxGraphicsFont
-wxGDIPlusRenderer::CreateFont( const wxFont &font,
-                               const wxColour &col )
+// sets the font
+wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColour &col )
 {
     ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont);
-    if ( font.IsOk() )
+    if ( font.Ok() )
     {
         wxGraphicsFont p;
-        p.SetRefData(new wxGDIPlusFontData( this, font, col ));
+        p.SetRefData(new wxGDIPlusFontData( this , font, col ));
         return p;
     }
     else
         return wxNullGraphicsFont;
 }
 
-wxGraphicsFont
-wxGDIPlusRenderer::CreateFont(double size,
-                              const wxString& facename,
-                              int flags,
-                              const wxColour& col)
+wxGraphicsBitmap wxGraphicsRenderer::CreateBitmap( const wxBitmap& bmp )
 {
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsFont);
-
-    // Convert wxFont flags to GDI+ style:
-    int style = FontStyleRegular;
-    if ( flags & wxFONTFLAG_ITALIC )
-        style |= FontStyleItalic;
-    if ( flags & wxFONTFLAG_UNDERLINED )
-        style |= FontStyleUnderline;
-    if ( flags & wxFONTFLAG_BOLD )
-        style |= FontStyleBold;
-    if ( flags & wxFONTFLAG_STRIKETHROUGH )
-        style |= FontStyleStrikeout;
-
-
-    wxGraphicsFont f;
-    f.SetRefData(new wxGDIPlusFontData(this, facename, size, style, col));
-    return f;
-}
-
-wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap &bitmap )
-{
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
-    if ( bitmap.IsOk() )
+    if ( bmp.Ok() )
     {
         wxGraphicsBitmap p;
-        p.SetRefData(new wxGDIPlusBitmapData( this , bitmap ));
-        return p;
-    }
-    else
-        return wxNullGraphicsBitmap;
-}
-
-#if wxUSE_IMAGE
-
-wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmapFromImage(const wxImage& image)
-{
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
-    if ( image.IsOk() )
-    {
-        // Notice that we rely on conversion from wxImage to wxBitmap here but
-        // we could probably do it more efficiently by converting from wxImage
-        // to GDI+ Bitmap directly, i.e. copying wxImage pixels to the buffer
-        // returned by Bitmap::LockBits(). However this would require writing
-        // code specific for this task while like this we can reuse existing
-        // code (see also wxGDIPlusBitmapData::ConvertToImage()).
-        wxGraphicsBitmap gb;
-        gb.SetRefData(new wxGDIPlusBitmapData(this, image));
-        return gb;
-    }
-    else
-        return wxNullGraphicsBitmap;
-}
-
-
-wxImage wxGDIPlusRenderer::CreateImageFromBitmap(const wxGraphicsBitmap& bmp)
-{
-    ENSURE_LOADED_OR_RETURN(wxNullImage);
-    const wxGDIPlusBitmapData* const
-        data = static_cast<wxGDIPlusBitmapData*>(bmp.GetGraphicsData());
-
-    return data ? data->ConvertToImage() : wxNullImage;
-}
-
-#endif // wxUSE_IMAGE
-
-
-wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmapFromNativeBitmap( void *bitmap )
-{
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
-    if ( bitmap != NULL )
-    {
-        wxGraphicsBitmap p;
-        p.SetRefData(new wxGDIPlusBitmapData( this , (Bitmap*) bitmap ));
-        return p;
-    }
-    else
-        return wxNullGraphicsBitmap;
-}
-
-wxGraphicsBitmap wxGDIPlusRenderer::CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  )
-{
-    ENSURE_LOADED_OR_RETURN(wxNullGraphicsBitmap);
-    Bitmap* image = static_cast<wxGDIPlusBitmapData*>(bitmap.GetRefData())->GetGDIPlusBitmap();
-    if ( image )
-    {
-        wxGraphicsBitmap p;
-        p.SetRefData(new wxGDIPlusBitmapData( this , image->Clone( (REAL) x , (REAL) y , (REAL) w , (REAL) h , PixelFormat32bppPARGB) ));
+        p.SetRefData(new wxGDIPlusBitmapData( this , bmp ));
         return p;
     }
     else
@@ -2264,48 +1677,4 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusRendererModule, wxModule)
 
-// ----------------------------------------------------------------------------
-// wxMSW-specific parts of wxGCDC
-// ----------------------------------------------------------------------------
-
-WXHDC wxGCDC::AcquireHDC()
-{
-    wxGraphicsContext * const gc = GetGraphicsContext();
-    if ( !gc )
-        return NULL;
-
-#if wxUSE_CAIRO
-    // we can't get the HDC if it is not a GDI+ context
-    wxGraphicsRenderer* r1 = gc->GetRenderer();
-    wxGraphicsRenderer* r2 = wxGraphicsRenderer::GetCairoRenderer();
-    if (r1 == r2)
-        return NULL;
-#endif
-
-    Graphics * const g = static_cast<Graphics *>(gc->GetNativeContext());
-    return g ? g->GetHDC() : NULL;
-}
-
-void wxGCDC::ReleaseHDC(WXHDC hdc)
-{
-    if ( !hdc )
-        return;
-
-    wxGraphicsContext * const gc = GetGraphicsContext();
-    wxCHECK_RET( gc, "can't release HDC because there is no wxGraphicsContext" );
-
-#if wxUSE_CAIRO
-    // we can't get the HDC if it is not a GDI+ context
-    wxGraphicsRenderer* r1 = gc->GetRenderer();
-    wxGraphicsRenderer* r2 = wxGraphicsRenderer::GetCairoRenderer();
-    if (r1 == r2)
-        return;
-#endif
-
-    Graphics * const g = static_cast<Graphics *>(gc->GetNativeContext());
-    wxCHECK_RET( g, "can't release HDC because there is no Graphics" );
-
-    g->ReleaseHDC((HDC)hdc);
-}
-
 #endif  // wxUSE_GRAPHICS_CONTEXT
diff --git a/Source/3rd Party/wx/src/msw/gsockmsw.cpp b/Source/3rd Party/wx/src/msw/gsockmsw.cpp
new file mode 100644
index 000000000..6b185351f
--- /dev/null
+++ b/Source/3rd Party/wx/src/msw/gsockmsw.cpp	
@@ -0,0 +1,487 @@
+/* -------------------------------------------------------------------------
+ * Project:     GSocket (Generic Socket)
+ * Name:        src/msw/gsockmsw.cpp
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Author:      Guillermo Rodriguez Garcia <guille@iies.es>
+ * Purpose:     GSocket GUI-specific MSW code
+ * CVSID:       $Id: gsockmsw.cpp 50893 2007-12-22 14:05:25Z VZ $
+ * -------------------------------------------------------------------------
+ */
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+/*
+ * DONE: for WinCE we need to replace WSAAsyncSelect
+ * (Windows message-based notification of network events for a socket)
+ * with another mechanism.
+ * As WSAAsyncSelect is not present on WinCE, it now uses
+ * WSACreateEvent, WSAEventSelect, WSAWaitForMultipleEvents and WSAEnumNetworkEvents.
+ * When enabling eventhandling for a socket a new thread it created that keeps track of the events
+ * and posts a messageto the hidden window to use the standard message loop.
+ */
+
+/* including rasasync.h (included from windows.h itself included from
+ * wx/setup.h and/or winsock.h results in this warning for
+ * RPCNOTIFICATION_ROUTINE
+ */
+#ifdef _MSC_VER
+#   pragma warning(disable:4115) /* named type definition in parentheses */
+#endif
+
+/* This needs to be before the wx/defs/h inclusion
+ * for some reason
+ */
+
+#ifdef __WXWINCE__
+    /* windows.h results in tons of warnings at max warning level */
+#   ifdef _MSC_VER
+#       pragma warning(push, 1)
+#   endif
+#   include <windows.h>
+#   ifdef _MSC_VER
+#       pragma warning(pop)
+#       pragma warning(disable:4514)
+#   endif
+#endif
+
+#ifndef __GSOCKET_STANDALONE__
+#   include "wx/platform.h"
+#endif
+
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+
+#ifndef __GSOCKET_STANDALONE__
+
+#include "wx/msw/gsockmsw.h"
+#include "wx/gsocket.h"
+
+extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
+#define INSTANCE wxGetInstance()
+
+#else /* __GSOCKET_STANDALONE__ */
+
+#include "gsockmsw.h"
+#include "gsocket.h"
+
+/* If not using wxWidgets, a global var called hInst must
+ * be available and it must contain the app's instance
+ * handle.
+ */
+extern HINSTANCE hInst;
+#define INSTANCE hInst
+
+#endif /* !__GSOCKET_STANDALONE__/__GSOCKET_STANDALONE__ */
+
+#ifndef __WXWINCE__
+#include <assert.h>
+#else
+#define assert(x)
+#include <winsock.h>
+#include "wx/msw/wince/net.h"
+#include "wx/hashmap.h"
+WX_DECLARE_HASH_MAP(int,bool,wxIntegerHash,wxIntegerEqual,SocketHash);
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <ctype.h>
+
+#include <winsock.h>
+
+#ifdef _MSC_VER
+#  pragma warning(default:4115) /* named type definition in parentheses */
+#endif
+
+#define CLASSNAME  TEXT("_GSocket_Internal_Window_Class")
+
+/* implemented in utils.cpp */
+extern "C" WXDLLIMPEXP_BASE HWND
+wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
+
+/* Maximum number of different GSocket objects at a given time.
+ * This value can be modified at will, but it CANNOT be greater
+ * than (0x7FFF - WM_USER + 1)
+ */
+#define MAXSOCKETS 1024
+
+#if (MAXSOCKETS > (0x7FFF - WM_USER + 1))
+#error "MAXSOCKETS is too big!"
+#endif
+
+#ifndef __WXWINCE__
+typedef int (PASCAL *WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long);
+#else
+/* Typedef the needed function prototypes and the WSANETWORKEVENTS structure
+*/
+typedef struct _WSANETWORKEVENTS {
+       long lNetworkEvents;
+       int iErrorCode[10];
+} WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS;
+typedef HANDLE (PASCAL *WSACreateEventFunc)(void);
+typedef int (PASCAL *WSAEventSelectFunc)(SOCKET,HANDLE,long);
+typedef int (PASCAL *WSAWaitForMultipleEventsFunc)(long,HANDLE,BOOL,long,BOOL);
+typedef int (PASCAL *WSAEnumNetworkEventsFunc)(SOCKET,HANDLE,LPWSANETWORKEVENTS);
+#endif //__WXWINCE__
+
+LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
+
+/* Global variables */
+
+static HWND hWin;
+static CRITICAL_SECTION critical;
+static GSocket* socketList[MAXSOCKETS];
+static int firstAvailable;
+
+#ifndef __WXWINCE__
+static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL;
+#else
+static SocketHash socketHash;
+static unsigned int currSocket;
+HANDLE hThread[MAXSOCKETS];
+static WSACreateEventFunc gs_WSACreateEvent = NULL;
+static WSAEventSelectFunc gs_WSAEventSelect = NULL;
+static WSAWaitForMultipleEventsFunc gs_WSAWaitForMultipleEvents = NULL;
+static WSAEnumNetworkEventsFunc gs_WSAEnumNetworkEvents = NULL;
+/* This structure will be used to pass data on to the thread that handles socket events.
+*/
+typedef struct thread_data{
+    HWND hEvtWin;
+    unsigned long msgnumber;
+    unsigned long fd;
+    unsigned long lEvent;
+}thread_data;
+#endif
+
+static HMODULE gs_wsock32dll = 0;
+
+
+#ifdef __WXWINCE__
+/* This thread handles socket events on WinCE using WSAEventSelect() as WSAAsyncSelect is not supported.
+*  When an event occures for the socket, it is checked what kind of event happend and the correct message gets posted
+*  so that the hidden window can handle it as it would in other MSW builds.
+*/
+DWORD WINAPI SocketThread(LPVOID data)
+{
+    WSANETWORKEVENTS NetworkEvents;
+    thread_data* d = (thread_data *)data;
+
+    HANDLE NetworkEvent = gs_WSACreateEvent();
+    gs_WSAEventSelect(d->fd, NetworkEvent, d->lEvent);
+
+    while(socketHash[d->fd] == true)
+    {
+        if ((gs_WSAWaitForMultipleEvents(1, &NetworkEvent, FALSE,INFINITE, FALSE)) == WAIT_FAILED)
+        {
+            printf("WSAWaitForMultipleEvents failed with error %d\n", WSAGetLastError());
+            return 0;
+        }
+        if (gs_WSAEnumNetworkEvents(d->fd ,NetworkEvent, &NetworkEvents) == SOCKET_ERROR)
+        {
+            printf("WSAEnumNetworkEvents failed with error %d\n", WSAGetLastError());
+            return 0;
+        }
+
+        long flags = NetworkEvents.lNetworkEvents;
+        if (flags & FD_READ)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_READ);
+        if (flags & FD_WRITE)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_WRITE);
+        if (flags & FD_OOB)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_OOB);
+        if (flags & FD_ACCEPT)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_ACCEPT);
+        if (flags & FD_CONNECT)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_CONNECT);
+        if (flags & FD_CLOSE)
+            ::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_CLOSE);
+
+    }
+    gs_WSAEventSelect(d->fd, NetworkEvent, 0);
+    ExitThread(0);
+    return 0;
+}
+#endif
+
+
+bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
+{
+    return true;
+}
+
+/* Global initializers */
+
+bool GSocketGUIFunctionsTableConcrete::OnInit()
+{
+  static LPCTSTR pclassname = NULL;
+  int i;
+
+  /* Create internal window for event notifications */
+  hWin = wxCreateHiddenWindow(&pclassname, CLASSNAME, _GSocket_Internal_WinProc);
+  if (!hWin)
+      return false;
+
+  /* Initialize socket list */
+  InitializeCriticalSection(&critical);
+
+  for (i = 0; i < MAXSOCKETS; i++)
+  {
+    socketList[i] = NULL;
+  }
+  firstAvailable = 0;
+
+  /* Load WSAAsyncSelect from wsock32.dll (we don't link against it
+     statically to avoid dependency on wsock32.dll for apps that don't use
+     sockets): */
+#ifndef __WXWINCE__
+  gs_wsock32dll = LoadLibrary(wxT("wsock32.dll"));
+  if (!gs_wsock32dll)
+      return false;
+  gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,
+                                                        "WSAAsyncSelect");
+  if (!gs_WSAAsyncSelect)
+      return false;
+#else
+/*  On WinCE we load ws2.dll which will provide the needed functions.
+*/
+  gs_wsock32dll = LoadLibrary(wxT("ws2.dll"));
+  if (!gs_wsock32dll)
+      return false;
+  gs_WSAEventSelect =(WSAEventSelectFunc)GetProcAddress(gs_wsock32dll,
+                                                        wxT("WSAEventSelect"));
+  if (!gs_WSAEventSelect)
+      return false;
+
+  gs_WSACreateEvent =(WSACreateEventFunc)GetProcAddress(gs_wsock32dll,
+                                                        wxT("WSACreateEvent"));
+  if (!gs_WSACreateEvent)
+      return false;
+
+  gs_WSAWaitForMultipleEvents =(WSAWaitForMultipleEventsFunc)GetProcAddress(gs_wsock32dll,
+                                                                            wxT("WSAWaitForMultipleEvents"));
+  if (!gs_WSAWaitForMultipleEvents)
+      return false;
+
+  gs_WSAEnumNetworkEvents =(WSAEnumNetworkEventsFunc)GetProcAddress(gs_wsock32dll,
+                                                                    wxT("WSAEnumNetworkEvents"));
+  if (!gs_WSAEnumNetworkEvents)
+      return false;
+
+  currSocket = 0;
+#endif
+
+  return true;
+}
+
+void GSocketGUIFunctionsTableConcrete::OnExit()
+{
+#ifdef __WXWINCE__
+/* Delete the threads here */
+    for(unsigned int i=0; i < currSocket; i++)
+        CloseHandle(hThread[i]);
+#endif
+  /* Destroy internal window */
+  DestroyWindow(hWin);
+  UnregisterClass(CLASSNAME, INSTANCE);
+
+  /* Unlock wsock32.dll */
+  if (gs_wsock32dll)
+  {
+      FreeLibrary(gs_wsock32dll);
+      gs_wsock32dll = 0;
+  }
+
+  /* Delete critical section */
+  DeleteCriticalSection(&critical);
+}
+
+/* Per-socket GUI initialization / cleanup */
+
+bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
+{
+  int i;
+
+  /* Allocate a new message number for this socket */
+  EnterCriticalSection(&critical);
+
+  i = firstAvailable;
+  while (socketList[i] != NULL)
+  {
+    i = (i + 1) % MAXSOCKETS;
+
+    if (i == firstAvailable)    /* abort! */
+    {
+      LeaveCriticalSection(&critical);
+      return false;
+    }
+  }
+  socketList[i] = socket;
+  firstAvailable = (i + 1) % MAXSOCKETS;
+  socket->m_msgnumber = (i + WM_USER);
+
+  LeaveCriticalSection(&critical);
+
+  return true;
+}
+
+void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)
+{
+  /* Remove the socket from the list */
+  EnterCriticalSection(&critical);
+  if ( socket->IsOk() )
+  {
+      const int msgnum = socket->m_msgnumber;
+
+      // we need to remove any pending messages for this socket to avoid having
+      // them sent to a new socket which could reuse the same message number as
+      // soon as we destroy this one
+      MSG msg;
+      while ( ::PeekMessage(&msg, hWin, msgnum, msgnum, PM_REMOVE) )
+          ;
+
+      socketList[msgnum - WM_USER] = NULL;
+  }
+
+  LeaveCriticalSection(&critical);
+}
+
+/* Windows proc for asynchronous event handling */
+
+LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
+                                           UINT uMsg,
+                                           WPARAM wParam,
+                                           LPARAM lParam)
+{
+  GSocket *socket;
+  GSocketEvent event;
+  GSocketCallback cback;
+  char *data;
+
+  if (uMsg >= WM_USER && uMsg <= (WM_USER + MAXSOCKETS - 1))
+  {
+    EnterCriticalSection(&critical);
+    socket = socketList[(uMsg - WM_USER)];
+    event = (GSocketEvent) -1;
+    cback = NULL;
+    data = NULL;
+
+    /* Check that the socket still exists (it has not been
+     * destroyed) and for safety, check that the m_fd field
+     * is what we expect it to be.
+     */
+    if ((socket != NULL) && (socket->m_fd == wParam))
+    {
+      switch WSAGETSELECTEVENT(lParam)
+      {
+        case FD_READ:    event = GSOCK_INPUT; break;
+        case FD_WRITE:   event = GSOCK_OUTPUT; break;
+        case FD_ACCEPT:  event = GSOCK_CONNECTION; break;
+        case FD_CONNECT:
+        {
+          if (WSAGETSELECTERROR(lParam) != 0)
+            event = GSOCK_LOST;
+          else
+            event = GSOCK_CONNECTION;
+          break;
+        }
+        case FD_CLOSE:   event = GSOCK_LOST; break;
+      }
+
+      if (event != -1)
+      {
+        cback = socket->m_cbacks[event];
+        data = socket->m_data[event];
+
+        if (event == GSOCK_LOST)
+          socket->m_detected = GSOCK_LOST_FLAG;
+        else
+          socket->m_detected |= (1 << event);
+      }
+    }
+
+    /* OK, we can now leave the critical section because we have
+     * already obtained the callback address (we make no further
+     * accesses to socket->whatever). However, the app should
+     * be prepared to handle events from a socket that has just
+     * been closed!
+     */
+    LeaveCriticalSection(&critical);
+
+    if (cback != NULL)
+      (cback)(socket, event, data);
+
+    return (LRESULT) 0;
+  }
+  else
+    return DefWindowProc(hWnd, uMsg, wParam, lParam);
+}
+
+/* _GSocket_Enable_Events:
+ *  Enable all event notifications; we need to be notified of all
+ *  events for internal processing, but we will only notify users
+ *  when an appropiate callback function has been installed.
+ */
+void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
+{
+  assert (socket != NULL);
+
+  if (socket->m_fd != INVALID_SOCKET)
+  {
+    /* We could probably just subscribe to all events regardless
+     * of the socket type, but MS recommends to do it this way.
+     */
+    long lEvent = socket->m_server?
+                  FD_ACCEPT : (FD_READ | FD_WRITE | FD_CONNECT | FD_CLOSE);
+#ifndef __WXWINCE__
+    gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, lEvent);
+#else
+/*
+*  WinCE creates a thread for socket event handling.
+*  All needed parameters get passed through the thread_data structure.
+*/
+
+    thread_data* d = new thread_data;
+    d->lEvent = lEvent;
+    d->hEvtWin = hWin;
+    d->msgnumber = socket->m_msgnumber;
+    d->fd = socket->m_fd;
+    socketHash[socket->m_fd] = true;
+    hThread[currSocket++] = CreateThread(NULL, 0, &SocketThread,(LPVOID)d, 0, NULL);
+#endif
+  }
+}
+
+/* _GSocket_Disable_Events:
+ *  Disable event notifications (when shutdowning the socket)
+ */
+void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)
+{
+  assert (socket != NULL);
+
+  if (socket->m_fd != INVALID_SOCKET)
+  {
+#ifndef __WXWINCE__
+    gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, 0);
+#else
+    //Destroy the thread
+    socketHash[socket->m_fd] = false;
+#endif
+  }
+}
+
+#else /* !wxUSE_SOCKETS */
+
+/*
+ * Translation unit shouldn't be empty, so include this typedef to make the
+ * compiler (VC++ 6.0, for example) happy
+ */
+typedef void (*wxDummy)();
+
+#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
diff --git a/Source/3rd Party/wx/src/msw/headerctrl.cpp b/Source/3rd Party/wx/src/msw/headerctrl.cpp
deleted file mode 100644
index 6e65b262d..000000000
--- a/Source/3rd Party/wx/src/msw/headerctrl.cpp	
+++ /dev/null
@@ -1,696 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/headerctrl.cpp
-// Purpose:     implementation of wxHeaderCtrl for wxMSW
-// Author:      Vadim Zeitlin
-// Created:     2008-12-01
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_HEADERCTRL
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/log.h"
-#endif // WX_PRECOMP
-
-#include "wx/headerctrl.h"
-
-#ifndef wxHAS_GENERIC_HEADERCTRL
-
-#include "wx/imaglist.h"
-
-#include "wx/msw/wrapcctl.h"
-#include "wx/msw/private.h"
-
-#ifndef HDM_SETBITMAPMARGIN
-    #define HDM_SETBITMAPMARGIN 0x1234
-#endif
-
-#ifndef Header_SetBitmapMargin
-    #define Header_SetBitmapMargin(hwnd, margin) \
-            ::SendMessage((hwnd), HDM_SETBITMAPMARGIN, (WPARAM)(margin), 0)
-#endif
-
-// from src/msw/listctrl.cpp
-extern int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick);
-
-// ============================================================================
-// wxHeaderCtrl implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl construction/destruction
-// ----------------------------------------------------------------------------
-
-void wxHeaderCtrl::Init()
-{
-    m_numColumns = 0;
-    m_imageList = NULL;
-    m_scrollOffset = 0;
-}
-
-bool wxHeaderCtrl::Create(wxWindow *parent,
-                          wxWindowID id,
-                          const wxPoint& pos,
-                          const wxSize& size,
-                          long style,
-                          const wxString& name)
-{
-    // notice that we don't need InitCommonControlsEx(ICC_LISTVIEW_CLASSES)
-    // here as we already call InitCommonControls() in wxApp initialization
-    // code which covers this
-
-    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return false;
-
-    if ( !MSWCreateControl(WC_HEADER, wxT(""), pos, size) )
-        return false;
-
-    // special hack for margins when using comctl32.dll v6 or later: the
-    // default margin is too big and results in label truncation when the
-    // column width is just about right to show it together with the sort
-    // indicator, so reduce it to a smaller value (in principle we could even
-    // use 0 here but this starts to look ugly)
-    if ( wxApp::GetComCtl32Version() >= 600 )
-    {
-        Header_SetBitmapMargin(GetHwnd(), ::GetSystemMetrics(SM_CXEDGE));
-    }
-
-    return true;
-}
-
-WXDWORD wxHeaderCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
-
-    if ( style & wxHD_ALLOW_REORDER )
-        msStyle |= HDS_DRAGDROP;
-
-    // the control looks nicer with these styles and there doesn't seem to be
-    // any reason to not use them so we always do (as for HDS_HORZ it is 0
-    // anyhow but include it for clarity)
-    // NOTE: don't use however HDS_FLAT because it makes the control look
-    //       non-native when running WinXP in classic mode
-    msStyle |= HDS_HORZ | HDS_BUTTONS | HDS_FULLDRAG | HDS_HOTTRACK;
-
-    return msStyle;
-}
-
-wxHeaderCtrl::~wxHeaderCtrl()
-{
-    delete m_imageList;
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl scrolling
-// ----------------------------------------------------------------------------
-
-void wxHeaderCtrl::DoSetSize(int x, int y,
-                             int w, int h,
-                             int sizeFlags)
-{
-    wxHeaderCtrlBase::DoSetSize(x + m_scrollOffset, y, w - m_scrollOffset, h,
-                                sizeFlags);
-}
-
-void wxHeaderCtrl::DoScrollHorz(int dx)
-{
-    // as the native control doesn't support offsetting its contents, we use a
-    // hack here to make it appear correctly when the parent is scrolled:
-    // instead of scrolling or repainting we simply move the control window
-    // itself: to be precise, offset it by the scroll increment to the left and
-    // increment its width to still extend to the right boundary to compensate
-    // for it (notice that dx is negative when scrolling to the right)
-    m_scrollOffset += dx;
-
-    wxHeaderCtrlBase::DoSetSize(GetPosition().x + dx, -1,
-                                GetSize().x - dx, -1,
-                                wxSIZE_USE_EXISTING);
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl geometry calculation
-// ----------------------------------------------------------------------------
-
-wxSize wxHeaderCtrl::DoGetBestSize() const
-{
-    RECT rc = wxGetClientRect(GetHwndOf(GetParent()));
-    WINDOWPOS wpos;
-    HDLAYOUT layout = { &rc, &wpos };
-    if ( !Header_Layout(GetHwnd(), &layout) )
-    {
-        wxLogLastError(wxT("Header_Layout"));
-        return wxControl::DoGetBestSize();
-    }
-
-    return wxSize(wpos.cx, wpos.cy);
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl columns managements
-// ----------------------------------------------------------------------------
-
-unsigned int wxHeaderCtrl::DoGetCount() const
-{
-    // we can't use Header_GetItemCount() here because it doesn't take the
-    // hidden columns into account and we can't find the hidden columns after
-    // the last shown one in MSWFromNativeIdx() without knowing where to stop
-    // so we have to store the columns count internally
-    return m_numColumns;
-}
-
-int wxHeaderCtrl::GetShownColumnsCount() const
-{
-    const int numItems = Header_GetItemCount(GetHwnd());
-
-    wxASSERT_MSG( numItems >= 0 && (unsigned)numItems <= m_numColumns,
-                  "unexpected number of items in the native control" );
-
-    return numItems;
-}
-
-void wxHeaderCtrl::DoSetCount(unsigned int count)
-{
-    unsigned n;
-
-    // first delete all old columns
-    const unsigned countOld = GetShownColumnsCount();
-    for ( n = 0; n < countOld; n++ )
-    {
-        if ( !Header_DeleteItem(GetHwnd(), 0) )
-        {
-            wxLogLastError(wxT("Header_DeleteItem"));
-        }
-    }
-
-    // update the column indices order array before changing m_numColumns
-    DoResizeColumnIndices(m_colIndices, count);
-
-    // and add the new ones
-    m_numColumns = count;
-    m_isHidden.resize(m_numColumns);
-    for ( n = 0; n < count; n++ )
-    {
-        const wxHeaderColumn& col = GetColumn(n);
-        if ( col.IsShown() )
-        {
-            m_isHidden[n] = false;
-
-            DoInsertItem(col, n);
-        }
-        else // hidden initially
-        {
-            m_isHidden[n] = true;
-        }
-    }
-}
-
-void wxHeaderCtrl::DoUpdate(unsigned int idx)
-{
-    // the native control does provide Header_SetItem() but it's inconvenient
-    // to use it because it sends HDN_ITEMCHANGING messages and we'd have to
-    // arrange not to block setting the width from there and the logic would be
-    // more complicated as we'd have to reset the old values as well as setting
-    // the new ones -- so instead just recreate the column
-
-    const wxHeaderColumn& col = GetColumn(idx);
-    if ( col.IsHidden() )
-    {
-        // column is hidden now
-        if ( !m_isHidden[idx] )
-        {
-            // but it wasn't hidden before, so remove it
-            Header_DeleteItem(GetHwnd(), MSWToNativeIdx(idx));
-
-            m_isHidden[idx] = true;
-        }
-        //else: nothing to do, updating hidden column doesn't have any effect
-    }
-    else // column is shown now
-    {
-        if ( m_isHidden[idx] )
-        {
-            m_isHidden[idx] = false;
-        }
-        else // and it was shown before as well
-        {
-            // we need to remove the old column
-            Header_DeleteItem(GetHwnd(), MSWToNativeIdx(idx));
-        }
-
-        DoInsertItem(col, idx);
-    }
-}
-
-void wxHeaderCtrl::DoInsertItem(const wxHeaderColumn& col, unsigned int idx)
-{
-    wxASSERT_MSG( !col.IsHidden(), "should only be called for shown columns" );
-
-    wxHDITEM hdi;
-
-    // notice that we need to store the string we use the pointer to until we
-    // pass it to the control
-    hdi.mask |= HDI_TEXT;
-    wxWxCharBuffer buf = col.GetTitle().t_str();
-    hdi.pszText = buf.data();
-    hdi.cchTextMax = wxStrlen(buf);
-
-    const wxBitmap bmp = col.GetBitmap();
-    if ( bmp.IsOk() )
-    {
-        hdi.mask |= HDI_IMAGE;
-
-        if ( bmp.IsOk() )
-        {
-            const int bmpWidth = bmp.GetWidth(),
-                      bmpHeight = bmp.GetHeight();
-
-            if ( !m_imageList )
-            {
-                m_imageList = new wxImageList(bmpWidth, bmpHeight);
-                (void) // suppress mingw32 warning about unused computed value
-                Header_SetImageList(GetHwnd(), GetHimagelistOf(m_imageList));
-            }
-            else // already have an image list
-            {
-                // check that all bitmaps we use have the same size
-                int imageWidth,
-                    imageHeight;
-                m_imageList->GetSize(0, imageWidth, imageHeight);
-
-                wxASSERT_MSG( imageWidth == bmpWidth && imageHeight == bmpHeight,
-                              "all column bitmaps must have the same size" );
-            }
-
-            m_imageList->Add(bmp);
-            hdi.iImage = m_imageList->GetImageCount() - 1;
-        }
-        else // no bitmap but we still need to update the item
-        {
-            hdi.iImage = I_IMAGENONE;
-        }
-    }
-
-    if ( col.GetAlignment() != wxALIGN_NOT )
-    {
-        hdi.mask |= HDI_FORMAT | HDF_LEFT;
-        switch ( col.GetAlignment() )
-        {
-            case wxALIGN_LEFT:
-                hdi.fmt |= HDF_LEFT;
-                break;
-
-            case wxALIGN_CENTER:
-            case wxALIGN_CENTER_HORIZONTAL:
-                hdi.fmt |= HDF_CENTER;
-                break;
-
-            case wxALIGN_RIGHT:
-                hdi.fmt |= HDF_RIGHT;
-                break;
-
-            default:
-                wxFAIL_MSG( "invalid column header alignment" );
-        }
-    }
-
-    if ( col.IsSortKey() )
-    {
-        hdi.mask |= HDI_FORMAT;
-        hdi.fmt |= col.IsSortOrderAscending() ? HDF_SORTUP : HDF_SORTDOWN;
-    }
-
-    if ( col.GetWidth() != wxCOL_WIDTH_DEFAULT )
-    {
-        hdi.mask |= HDI_WIDTH;
-        hdi.cxy = col.GetWidth();
-    }
-
-    hdi.mask |= HDI_ORDER;
-    hdi.iOrder = MSWToNativeOrder(m_colIndices.Index(idx));
-
-    if ( ::SendMessage(GetHwnd(), HDM_INSERTITEM,
-                       MSWToNativeIdx(idx), (LPARAM)&hdi) == -1 )
-    {
-        wxLogLastError(wxT("Header_InsertItem()"));
-    }
-}
-
-void wxHeaderCtrl::DoSetColumnsOrder(const wxArrayInt& order)
-{
-    wxArrayInt orderShown;
-    orderShown.reserve(m_numColumns);
-
-    for ( unsigned n = 0; n < m_numColumns; n++ )
-    {
-        const int idx = order[n];
-        if ( GetColumn(idx).IsShown() )
-            orderShown.push_back(MSWToNativeIdx(idx));
-    }
-
-    if ( !Header_SetOrderArray(GetHwnd(), orderShown.size(), &orderShown[0]) )
-    {
-        wxLogLastError(wxT("Header_GetOrderArray"));
-    }
-
-    m_colIndices = order;
-}
-
-wxArrayInt wxHeaderCtrl::DoGetColumnsOrder() const
-{
-    // we don't use Header_GetOrderArray() here because it doesn't return
-    // information about the hidden columns, instead we just save the columns
-    // order array in DoSetColumnsOrder() and update it when they're reordered
-    return m_colIndices;
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl indexes and positions translation
-// ----------------------------------------------------------------------------
-
-int wxHeaderCtrl::MSWToNativeIdx(int idx)
-{
-    // don't check for GetColumn(idx).IsShown() as it could have just became
-    // false and we may be called from DoUpdate() to delete the old column
-    wxASSERT_MSG( !m_isHidden[idx],
-                  "column must be visible to have an "
-                  "index in the native control" );
-
-    int item = idx;
-    for ( int i = 0; i < idx; i++ )
-    {
-        if ( GetColumn(i).IsHidden() )
-            item--; // one less column the native control knows about
-    }
-
-    wxASSERT_MSG( item >= 0 && item <= GetShownColumnsCount(), "logic error" );
-
-    return item;
-}
-
-int wxHeaderCtrl::MSWFromNativeIdx(int item)
-{
-    wxASSERT_MSG( item >= 0 && item < GetShownColumnsCount(),
-                  "column index out of range" );
-
-    // reverse the above function
-
-    unsigned idx = item;
-    for ( unsigned n = 0; n < m_numColumns; n++ )
-    {
-        if ( n > idx )
-            break;
-
-        if ( GetColumn(n).IsHidden() )
-            idx++;
-    }
-
-    wxASSERT_MSG( MSWToNativeIdx(idx) == item, "logic error" );
-
-    return idx;
-}
-
-int wxHeaderCtrl::MSWToNativeOrder(int pos)
-{
-    wxASSERT_MSG( pos >= 0 && static_cast<unsigned>(pos) < m_numColumns,
-                  "column position out of range" );
-
-    int order = pos;
-    for ( int n = 0; n < pos; n++ )
-    {
-        if ( GetColumn(m_colIndices[n]).IsHidden() )
-            order--;
-    }
-
-    wxASSERT_MSG( order >= 0 && order <= GetShownColumnsCount(), "logic error" );
-
-    return order;
-}
-
-int wxHeaderCtrl::MSWFromNativeOrder(int order)
-{
-    wxASSERT_MSG( order >= 0 && order < GetShownColumnsCount(),
-                  "native column position out of range" );
-
-    unsigned pos = order;
-    for ( unsigned n = 0; n < m_numColumns; n++ )
-    {
-        if ( n > pos )
-            break;
-
-        if ( GetColumn(m_colIndices[n]).IsHidden() )
-            pos++;
-    }
-
-    wxASSERT_MSG( MSWToNativeOrder(pos) == order, "logic error" );
-
-    return pos;
-}
-
-// ----------------------------------------------------------------------------
-// wxHeaderCtrl events
-// ----------------------------------------------------------------------------
-
-wxEventType wxHeaderCtrl::GetClickEventType(bool dblclk, int button)
-{
-    wxEventType evtType;
-    switch ( button )
-    {
-        case 0:
-            evtType = dblclk ? wxEVT_COMMAND_HEADER_DCLICK
-                             : wxEVT_COMMAND_HEADER_CLICK;
-            break;
-
-        case 1:
-            evtType = dblclk ? wxEVT_COMMAND_HEADER_RIGHT_DCLICK
-                             : wxEVT_COMMAND_HEADER_RIGHT_CLICK;
-            break;
-
-        case 2:
-            evtType = dblclk ? wxEVT_COMMAND_HEADER_MIDDLE_DCLICK
-                             : wxEVT_COMMAND_HEADER_MIDDLE_CLICK;
-            break;
-
-        default:
-            wxFAIL_MSG( wxS("unexpected event type") );
-            evtType = wxEVT_NULL;
-    }
-
-    return evtType;
-}
-
-bool wxHeaderCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
-{
-    NMHEADER * const nmhdr = (NMHEADER *)lParam;
-
-    wxEventType evtType = wxEVT_NULL;
-    int width = 0;
-    int order = -1;
-    bool veto = false;
-    const UINT code = nmhdr->hdr.code;
-
-    // we don't have the index for all events, e.g. not for NM_RELEASEDCAPTURE
-    // so only access for header control events (and yes, the direction of
-    // comparisons with FIRST/LAST is correct even if it seems inverted)
-    int idx = code <= HDN_FIRST && code > HDN_LAST ? nmhdr->iItem : -1;
-    if ( idx != -1 )
-    {
-        // we also get bogus HDN_BEGINDRAG with -1 index so don't call
-        // MSWFromNativeIdx() unconditionally for nmhdr->iItem
-        idx = MSWFromNativeIdx(idx);
-    }
-
-    switch ( code )
-    {
-        // click events
-        // ------------
-
-        case HDN_ITEMCLICK:
-        case HDN_ITEMDBLCLICK:
-            evtType = GetClickEventType(code == HDN_ITEMDBLCLICK, nmhdr->iButton);
-            break;
-
-            // although we should get the notifications about the right clicks
-            // via HDN_ITEM[DBL]CLICK too according to MSDN this simply doesn't
-            // happen in practice on any Windows system up to 2003
-        case NM_RCLICK:
-        case NM_RDBLCLK:
-            {
-                POINT pt;
-                idx = wxMSWGetColumnClicked(&nmhdr->hdr, &pt);
-                if ( idx != wxNOT_FOUND )
-                {
-                    idx = MSWFromNativeIdx(idx);
-
-                    // due to a bug in mingw32 headers NM_RDBLCLK is signed
-                    // there so we need a cast to avoid warnings about signed/
-                    // unsigned comparison
-                    evtType = GetClickEventType(
-                                code == static_cast<UINT>(NM_RDBLCLK), 1);
-                }
-                //else: ignore clicks outside any column
-            }
-            break;
-
-        case HDN_DIVIDERDBLCLICK:
-            evtType = wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK;
-            break;
-
-
-        // column resizing events
-        // ----------------------
-
-        // see comments in wxListCtrl::MSWOnNotify() for why we catch both
-        // ASCII and Unicode versions of this message
-        case HDN_BEGINTRACKA:
-        case HDN_BEGINTRACKW:
-            // non-resizable columns can't be resized no matter what, don't
-            // even generate any events for them
-            if ( !GetColumn(idx).IsResizeable() )
-            {
-                veto = true;
-                break;
-            }
-
-            evtType = wxEVT_COMMAND_HEADER_BEGIN_RESIZE;
-            // fall through
-
-        case HDN_ENDTRACKA:
-        case HDN_ENDTRACKW:
-            width = nmhdr->pitem->cxy;
-
-            if ( evtType == wxEVT_NULL )
-            {
-                evtType = wxEVT_COMMAND_HEADER_END_RESIZE;
-
-                // don't generate events with invalid width
-                const int minWidth = GetColumn(idx).GetMinWidth();
-                if ( width < minWidth )
-                    width = minWidth;
-            }
-            break;
-
-        case HDN_ITEMCHANGING:
-            if ( nmhdr->pitem && (nmhdr->pitem->mask & HDI_WIDTH) )
-            {
-                // prevent the column from being shrunk beneath its min width
-                width = nmhdr->pitem->cxy;
-                if ( width < GetColumn(idx).GetMinWidth() )
-                {
-                    // don't generate any events and prevent the change from
-                    // happening
-                    veto = true;
-                }
-                else // width is acceptable
-                {
-                    // generate the resizing event from here as we don't seem
-                    // to be getting HDN_TRACK events at all, at least with
-                    // comctl32.dll v6
-                    evtType = wxEVT_COMMAND_HEADER_RESIZING;
-                }
-            }
-            break;
-
-
-        // column reordering events
-        // ------------------------
-
-        case HDN_BEGINDRAG:
-            // Windows sometimes sends us events with invalid column indices
-            if ( nmhdr->iItem == -1 )
-                break;
-
-            // column must have the appropriate flag to be draggable
-            if ( !GetColumn(idx).IsReorderable() )
-            {
-                veto = true;
-                break;
-            }
-
-            evtType = wxEVT_COMMAND_HEADER_BEGIN_REORDER;
-            break;
-
-        case HDN_ENDDRAG:
-            wxASSERT_MSG( nmhdr->pitem->mask & HDI_ORDER, "should have order" );
-            order = nmhdr->pitem->iOrder;
-
-            // we also get messages with invalid order when column reordering
-            // is cancelled (e.g. by pressing Esc)
-            if ( order == -1 )
-                break;
-
-            order = MSWFromNativeOrder(order);
-
-            evtType = wxEVT_COMMAND_HEADER_END_REORDER;
-            break;
-
-        case NM_RELEASEDCAPTURE:
-            evtType = wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED;
-            break;
-    }
-
-
-    // do generate the corresponding wx event
-    if ( evtType != wxEVT_NULL )
-    {
-        wxHeaderCtrlEvent event(evtType, GetId());
-        event.SetEventObject(this);
-        event.SetColumn(idx);
-        event.SetWidth(width);
-        if ( order != -1 )
-            event.SetNewOrder(order);
-
-        const bool processed = GetEventHandler()->ProcessEvent(event);
-
-        if ( processed && !event.IsAllowed() )
-            veto = true;
-
-        if ( !veto )
-        {
-            // special post-processing for HDN_ENDDRAG: we need to update the
-            // internal column indices array if this is allowed to go ahead as
-            // the native control is going to reorder its columns now
-            if ( evtType == wxEVT_COMMAND_HEADER_END_REORDER )
-                MoveColumnInOrderArray(m_colIndices, idx, order);
-
-            if ( processed )
-            {
-                // skip default processing below
-                return true;
-            }
-        }
-    }
-
-    if ( veto )
-    {
-        // all of HDN_BEGIN{DRAG,TRACK}, HDN_TRACK and HDN_ITEMCHANGING
-        // interpret TRUE return value as meaning to stop the control
-        // default handling of the message
-        *result = TRUE;
-
-        return true;
-    }
-
-    return wxHeaderCtrlBase::MSWOnNotify(idCtrl, lParam, result);
-}
-
-#endif // wxHAS_GENERIC_HEADERCTRL
-
-#endif // wxUSE_HEADERCTRL
diff --git a/Source/3rd Party/wx/src/msw/helpchm.cpp b/Source/3rd Party/wx/src/msw/helpchm.cpp
index a29fec549..11691c477 100644
--- a/Source/3rd Party/wx/src/msw/helpchm.cpp	
+++ b/Source/3rd Party/wx/src/msw/helpchm.cpp	
@@ -2,9 +2,9 @@
 // Name:        src/msw/helpchm.cpp
 // Purpose:     Help system: MS HTML Help implementation
 // Author:      Julian Smart
-// Modified by: Vadim Zeitlin at 2008-03-01: refactoring, simplification
+// Modified by:
 // Created:     16/04/2000
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: helpchm.cpp 60697 2009-05-20 13:15:24Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,7 @@
 
 #if wxUSE_HELP && wxUSE_MS_HTML_HELP
 
-#include "wx/filename.h"
+#include "wx/filefn.h"
 #include "wx/msw/helpchm.h"
 
 #include "wx/dynload.h"
@@ -50,7 +50,7 @@ HTMLHELP GetHtmlHelpFunction()
 
     if ( !s_htmlHelp )
     {
-        static wxDynamicLibrary s_dllHtmlHelp(wxT("HHCTRL.OCX"), wxDL_VERBATIM);
+        static wxDynamicLibrary s_dllHtmlHelp(_T("HHCTRL.OCX"), wxDL_VERBATIM);
 
         if ( !s_dllHtmlHelp.IsLoaded() )
         {
@@ -79,6 +79,17 @@ static HWND GetSuitableHWND(wxWindow *win)
     return win ? GetHwndOf(win) : ::GetDesktopWindow();
 }
 
+// wrap the real HtmlHelp() but just return false (and not crash) if it
+// couldn't be loaded
+//
+// it also takes a wxWindow instead of HWND
+static bool
+CallHtmlHelpFunction(wxWindow *win, const wxChar *str, UINT uint, DWORD dword)
+{
+    HTMLHELP htmlHelp = GetHtmlHelpFunction();
+
+    return htmlHelp && htmlHelp(GetSuitableHWND(win), str, uint, dword);
+}
 
 IMPLEMENT_DYNAMIC_CLASS(wxCHMHelpController, wxHelpControllerBase)
 
@@ -98,23 +109,14 @@ bool wxCHMHelpController::LoadFile(const wxString& file)
     return true;
 }
 
-/* static */ bool
-wxCHMHelpController::CallHtmlHelp(wxWindow *win,
-                                  const wxChar *str,
-                                  unsigned cmd,
-                                  WXWPARAM param)
-{
-    HTMLHELP htmlHelp = GetHtmlHelpFunction();
-
-    return htmlHelp && htmlHelp(GetSuitableHWND(win), str, cmd, param);
-}
-
 bool wxCHMHelpController::DisplayContents()
 {
     if (m_helpFile.IsEmpty())
         return false;
 
-    return CallHtmlHelp(HH_DISPLAY_TOPIC);
+    wxString str = GetValidFilename(m_helpFile);
+
+    return CallHtmlHelpFunction(GetParentWindow(), str, HH_DISPLAY_TOPIC, 0L);
 }
 
 // Use topic or HTML filename
@@ -123,11 +125,14 @@ bool wxCHMHelpController::DisplaySection(const wxString& section)
     if (m_helpFile.IsEmpty())
         return false;
 
+    wxString str = GetValidFilename(m_helpFile);
+
     // Is this an HTML file or a keyword?
     if ( section.Find(wxT(".htm")) != wxNOT_FOUND )
     {
         // interpret as a file name
-        return CallHtmlHelp(HH_DISPLAY_TOPIC, wxMSW_CONV_LPCTSTR(section));
+        return CallHtmlHelpFunction(GetParentWindow(), str, HH_DISPLAY_TOPIC,
+                                    wxPtrToUInt(section.c_str()));
     }
 
     return KeywordSearch(section);
@@ -139,38 +144,35 @@ bool wxCHMHelpController::DisplaySection(int section)
     if (m_helpFile.IsEmpty())
         return false;
 
-    return CallHtmlHelp(HH_HELP_CONTEXT, section);
-}
+    wxString str = GetValidFilename(m_helpFile);
 
-/* static */
-bool
-wxCHMHelpController::DoDisplayTextPopup(const wxChar *text,
-                                        const wxPoint& pos,
-                                        int contextId,
-                                        wxWindow *window)
-{
-    HH_POPUP popup;
-    popup.cbStruct = sizeof(popup);
-    popup.hinst = (HINSTANCE) wxGetInstance();
-    popup.idString = contextId;
-    popup.pszText = text;
-    popup.pt.x = pos.x;
-    popup.pt.y = pos.y;
-    popup.clrForeground = ::GetSysColor(COLOR_INFOTEXT);
-    popup.clrBackground = ::GetSysColor(COLOR_INFOBK);
-    popup.rcMargins.top =
-    popup.rcMargins.left =
-    popup.rcMargins.right =
-    popup.rcMargins.bottom = -1;
-    popup.pszFont = NULL;
-
-    return CallHtmlHelp(window, NULL, HH_DISPLAY_TEXT_POPUP, &popup);
+    return CallHtmlHelpFunction(GetParentWindow(), str, HH_HELP_CONTEXT,
+                                (DWORD)section);
 }
 
 bool wxCHMHelpController::DisplayContextPopup(int contextId)
 {
-    return DoDisplayTextPopup(NULL, wxGetMousePosition(), contextId,
-                              GetParentWindow());
+    if (m_helpFile.IsEmpty()) return false;
+
+    wxString str = GetValidFilename(m_helpFile);
+
+    // We also have to specify the popups file (default is cshelp.txt).
+    // str += wxT("::/cshelp.txt");
+
+    HH_POPUP popup;
+    popup.cbStruct = sizeof(popup);
+    popup.hinst = (HINSTANCE) wxGetInstance();
+    popup.idString = contextId ;
+
+    GetCursorPos(& popup.pt);
+    popup.clrForeground = ::GetSysColor(COLOR_INFOTEXT);
+    popup.clrBackground = ::GetSysColor(COLOR_INFOBK);
+    popup.rcMargins.top = popup.rcMargins.left = popup.rcMargins.right = popup.rcMargins.bottom = -1;
+    popup.pszFont = NULL;
+    popup.pszText = NULL;
+
+    return CallHtmlHelpFunction(GetParentWindow(), str, HH_DISPLAY_TEXT_POPUP,
+                                wxPtrToUInt(&popup));
 }
 
 bool
@@ -184,7 +186,19 @@ bool wxCHMHelpController::ShowContextHelpPopup(const wxString& text,
                                                const wxPoint& pos,
                                                wxWindow *window)
 {
-    return DoDisplayTextPopup(text.t_str(), pos, 0, window);
+    HH_POPUP popup;
+    popup.cbStruct = sizeof(popup);
+    popup.hinst = (HINSTANCE) wxGetInstance();
+    popup.idString = 0 ;
+    popup.pt.x = pos.x; popup.pt.y = pos.y;
+    popup.clrForeground = (COLORREF)-1;
+    popup.clrBackground = (COLORREF)-1;
+    popup.rcMargins.top = popup.rcMargins.left = popup.rcMargins.right = popup.rcMargins.bottom = -1;
+    popup.pszFont = NULL;
+    popup.pszText = (const wxChar*) text;
+
+    return CallHtmlHelpFunction(window, NULL, HH_DISPLAY_TEXT_POPUP,
+                                wxPtrToUInt(&popup));
 }
 
 bool wxCHMHelpController::DisplayBlock(long block)
@@ -198,28 +212,32 @@ bool wxCHMHelpController::KeywordSearch(const wxString& k,
     if (m_helpFile.IsEmpty())
         return false;
 
-    HH_AKLINK link;
-    link.cbStruct =     sizeof(HH_AKLINK);
-    link.fReserved =    FALSE;
-    link.pszKeywords =  k.t_str();
-    link.pszUrl =       NULL;
-    link.pszMsgText =   NULL;
-    link.pszMsgTitle =  NULL;
-    link.pszWindow =    NULL;
-    link.fIndexOnFail = TRUE;
+    wxString str = GetValidFilename(m_helpFile);
 
-    return CallHtmlHelp(HH_KEYWORD_LOOKUP, &link);
+    HH_AKLINK link;
+    link.cbStruct =     sizeof(HH_AKLINK) ;
+    link.fReserved =    FALSE ;
+    link.pszKeywords =  k.c_str() ;
+    link.pszUrl =       NULL ;
+    link.pszMsgText =   NULL ;
+    link.pszMsgTitle =  NULL ;
+    link.pszWindow =    NULL ;
+    link.fIndexOnFail = TRUE ;
+
+    return CallHtmlHelpFunction(GetParentWindow(), str, HH_KEYWORD_LOOKUP,
+                                wxPtrToUInt(&link));
 }
 
 bool wxCHMHelpController::Quit()
 {
-    return CallHtmlHelp(NULL, NULL, HH_CLOSE_ALL);
+    return CallHtmlHelpFunction(GetParentWindow(), NULL, HH_CLOSE_ALL, 0L);
 }
 
-wxString wxCHMHelpController::GetValidFilename() const
+// Append extension if necessary.
+wxString wxCHMHelpController::GetValidFilename(const wxString& file) const
 {
     wxString path, name, ext;
-    wxFileName::SplitPath(m_helpFile, &path, &name, &ext);
+    wxSplitPath(file, & path, & name, & ext);
 
     wxString fullName;
     if (path.IsEmpty())
diff --git a/Source/3rd Party/wx/src/msw/helpwin.cpp b/Source/3rd Party/wx/src/msw/helpwin.cpp
index 1ec55a043..00637910e 100644
--- a/Source/3rd Party/wx/src/msw/helpwin.cpp	
+++ b/Source/3rd Party/wx/src/msw/helpwin.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: helpwin.cpp 38791 2006-04-18 09:56:17Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,7 +21,7 @@
 #ifndef WX_PRECOMP
 #endif
 
-#include "wx/filename.h"
+#include "wx/filefn.h"
 #include "wx/msw/helpwin.h"
 
 #include <time.h>
@@ -63,7 +63,7 @@ bool wxWinHelpController::DisplayContents(void)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_FINDER, 0L) != 0);
+    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_FINDER, 0L) != 0);
 }
 
 bool wxWinHelpController::DisplaySection(int section)
@@ -73,7 +73,7 @@ bool wxWinHelpController::DisplaySection(int section)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_CONTEXT, (DWORD)section) != 0);
+    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_CONTEXT, (DWORD)section) != 0);
 }
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
@@ -82,7 +82,7 @@ bool wxWinHelpController::DisplayContextPopup(int contextId)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);
+    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);
 }
 
 bool wxWinHelpController::DisplayBlock(long block)
@@ -98,21 +98,20 @@ bool wxWinHelpController::KeywordSearch(const wxString& k,
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return WinHelp(GetSuitableHWND(this), str.t_str(), HELP_PARTIALKEY,
-                   (ULONG_PTR)wxMSW_CONV_LPCTSTR(k)) != 0;
+    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k) != 0);
 }
 
 // Can't close the help window explicitly in WinHelp
 bool wxWinHelpController::Quit(void)
 {
-    return WinHelp(GetSuitableHWND(this), 0, HELP_QUIT, 0) != 0;
+    return (WinHelp(GetSuitableHWND(this), 0, HELP_QUIT, 0L) != 0);
 }
 
 // Append extension if necessary.
 wxString wxWinHelpController::GetValidFilename(const wxString& file) const
 {
     wxString path, name, ext;
-    wxFileName::SplitPath(file, & path, & name, & ext);
+    wxSplitPath(file, & path, & name, & ext);
 
     wxString fullName;
     if (path.empty())
diff --git a/Source/3rd Party/wx/src/msw/icon.cpp b/Source/3rd Party/wx/src/msw/icon.cpp
index 4fa2fcf4b..098f625de 100644
--- a/Source/3rd Party/wx/src/msw/icon.cpp	
+++ b/Source/3rd Party/wx/src/msw/icon.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: icon.cpp 39551 2006-06-04 15:51:39Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -72,12 +72,12 @@ wxIcon::wxIcon(const char bits[], int width, int height)
 }
 
 wxIcon::wxIcon(const wxString& iconfile,
-               wxBitmapType type,
+               long flags,
                int desiredWidth,
                int desiredHeight)
 
 {
-    LoadFile(iconfile, type, desiredWidth, desiredHeight);
+    LoadFile(iconfile, flags, desiredWidth, desiredHeight);
 }
 
 wxIcon::wxIcon(const wxIconLocation& loc)
@@ -86,7 +86,7 @@ wxIcon::wxIcon(const wxIconLocation& loc)
     wxString fullname = loc.GetFileName();
     if ( loc.GetIndex() )
     {
-        fullname << wxT(';') << loc.GetIndex();
+        fullname << _T(';') << loc.GetIndex();
     }
     //else: 0 is default
 
@@ -100,7 +100,7 @@ wxIcon::~wxIcon()
 wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
 {
     const wxIconRefData *
-        data = static_cast<const wxIconRefData *>(dataOrig);
+        data = wx_static_cast(const wxIconRefData *, dataOrig);
     if ( !data )
         return NULL;
 
@@ -128,14 +128,14 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 #endif // __WXMICROWIN__
 }
 
-void wxIcon::CreateIconFromXpm(const char* const* data)
+void wxIcon::CreateIconFromXpm(const char **data)
 {
     wxBitmap bmp(data);
     CopyFromBitmap(bmp);
 }
 
 bool wxIcon::LoadFile(const wxString& filename,
-                      wxBitmapType type,
+                      long type,
                       int desiredWidth, int desiredHeight)
 {
     UnRef();
diff --git a/Source/3rd Party/wx/src/msw/imaglist.cpp b/Source/3rd Party/wx/src/msw/imaglist.cpp
index 6150498e0..f6bc800e9 100644
--- a/Source/3rd Party/wx/src/msw/imaglist.cpp	
+++ b/Source/3rd Party/wx/src/msw/imaglist.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: imaglist.cpp 43786 2006-12-04 02:09:59Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -38,9 +38,6 @@
 #endif
 
 #include "wx/imaglist.h"
-#include "wx/dc.h"
-#include "wx/msw/dc.h"
-#include "wx/msw/dib.h"
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------
@@ -77,15 +74,17 @@ bool wxImageList::Create(int width, int height, bool mask, int initial)
 {
     UINT flags = 0;
 
-    // as we want to be able to use 32bpp bitmaps in the image lists, we always
-    // use ILC_COLOR32, even if the display resolution is less -- the system
-    // will make the best effort to show the bitmap if we do this resulting in
-    // quite acceptable display while using a lower depth ILC_COLOR constant
-    // (e.g. ILC_COLOR16) shows completely broken bitmaps
+    // set appropriate color depth
 #ifdef __WXWINCE__
     flags |= ILC_COLOR;
 #else
-    flags |= ILC_COLOR32;
+    int dd = wxDisplayDepth();
+
+    if (dd <= 4)       flags |= ILC_COLOR;   // 16 color
+    else if (dd <= 8)  flags |= ILC_COLOR8;  // 256 color
+    else if (dd <= 16) flags |= ILC_COLOR16; // 64k hi-color
+    else if (dd <= 24) flags |= ILC_COLOR24; // 16m truecolor
+    else if (dd <= 32) flags |= ILC_COLOR32; // 16m truecolor
 #endif
 
     if ( mask )
@@ -118,7 +117,7 @@ wxImageList::~wxImageList()
 // Returns the number of images in the image list.
 int wxImageList::GetImageCount() const
 {
-    wxASSERT_MSG( m_hImageList, wxT("invalid image list") );
+    wxASSERT_MSG( m_hImageList, _T("invalid image list") );
 
     return ImageList_GetImageCount(GetHImageList());
 }
@@ -126,7 +125,7 @@ int wxImageList::GetImageCount() const
 // Returns the size (same for all images) of the images in the list
 bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
 {
-    wxASSERT_MSG( m_hImageList, wxT("invalid image list") );
+    wxASSERT_MSG( m_hImageList, _T("invalid image list") );
 
     return ImageList_GetIconSize(GetHImageList(), &width, &height) != 0;
 }
@@ -140,33 +139,16 @@ bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
 // 'bitmap' and 'mask'.
 int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
 {
-    HBITMAP hbmp;
+    HBITMAP hbmpMask = GetMaskForImage(bitmap, mask);
 
-#if wxUSE_WXDIB && wxUSE_IMAGE
-    // wxBitmap normally stores alpha in pre-multiplied format but
-    // ImageList_Draw() does pre-multiplication internally so we need to undo
-    // the pre-multiplication here. Converting back and forth like this is, of
-    // course, very inefficient but it's better than wrong appearance so we do
-    // this for now until a better way can be found.
-    AutoHBITMAP hbmpRelease;
-    if ( bitmap.HasAlpha() )
-    {
-        hbmp = wxDIB(bitmap.ConvertToImage(),
-                     wxDIB::PixelFormat_NotPreMultiplied).Detach();
-        hbmpRelease.Init(hbmp);
-    }
-    else
-#endif // wxUSE_WXDIB && wxUSE_IMAGE
-        hbmp = GetHbitmapOf(bitmap);
-
-    AutoHBITMAP hbmpMask(GetMaskForImage(bitmap, mask));
-
-    int index = ImageList_Add(GetHImageList(), hbmp, hbmpMask);
+    int index = ImageList_Add(GetHImageList(), GetHbitmapOf(bitmap), hbmpMask);
     if ( index == -1 )
     {
         wxLogError(_("Couldn't add an image to the image list."));
     }
 
+    ::DeleteObject(hbmpMask);
+
     return index;
 }
 
@@ -175,23 +157,8 @@ int wxImageList::Add(const wxBitmap& bitmap, const wxBitmap& mask)
 // 'bitmap'.
 int wxImageList::Add(const wxBitmap& bitmap, const wxColour& maskColour)
 {
-    HBITMAP hbmp;
-
-#if wxUSE_WXDIB && wxUSE_IMAGE
-    // See the comment in overloaded Add() above.
-    AutoHBITMAP hbmpRelease;
-    if ( bitmap.HasAlpha() )
-    {
-        hbmp = wxDIB(bitmap.ConvertToImage(),
-                     wxDIB::PixelFormat_NotPreMultiplied).Detach();
-        hbmpRelease.Init(hbmp);
-    }
-    else
-#endif // wxUSE_WXDIB && wxUSE_IMAGE
-        hbmp = GetHbitmapOf(bitmap);
-
     int index = ImageList_AddMasked(GetHImageList(),
-                                    hbmp,
+                                    GetHbitmapOf(bitmap),
                                     wxColourToRGB(maskColour));
     if ( index == -1 )
     {
@@ -217,33 +184,20 @@ int wxImageList::Add(const wxIcon& icon)
 // Note that wxImageList creates new bitmaps, so you may delete
 // 'bitmap' and 'mask'.
 bool wxImageList::Replace(int index,
-                          const wxBitmap& bitmap,
-                          const wxBitmap& mask)
+                          const wxBitmap& bitmap, const wxBitmap& mask)
 {
-    HBITMAP hbmp;
+    HBITMAP hbmpMask = GetMaskForImage(bitmap, mask);
 
-#if wxUSE_WXDIB && wxUSE_IMAGE
-    // See the comment in Add() above.
-    AutoHBITMAP hbmpRelease;
-    if ( bitmap.HasAlpha() )
-    {
-        hbmp = wxDIB(bitmap.ConvertToImage(),
-                     wxDIB::PixelFormat_NotPreMultiplied).Detach();
-        hbmpRelease.Init(hbmp);
-    }
-    else
-#endif // wxUSE_WXDIB && wxUSE_IMAGE
-        hbmp = GetHbitmapOf(bitmap);
-
-    AutoHBITMAP hbmpMask(GetMaskForImage(bitmap, mask));
-
-    if ( !ImageList_Replace(GetHImageList(), index, hbmp, hbmpMask) )
+    bool ok = ImageList_Replace(GetHImageList(), index,
+                                GetHbitmapOf(bitmap), hbmpMask) != 0;
+    if ( !ok )
     {
         wxLogLastError(wxT("ImageList_Replace()"));
-        return false;
     }
 
-    return true;
+    ::DeleteObject(hbmpMask);
+
+    return ok;
 }
 
 // Replaces a bitmap and mask from an icon.
@@ -287,19 +241,14 @@ bool wxImageList::Draw(int index,
                        int flags,
                        bool solidBackground)
 {
-    wxDCImpl *impl = dc.GetImpl();
-    wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
-    if (!msw_impl)
-       return false;
-
-    HDC hDC = GetHdcOf(*msw_impl);
-    wxCHECK_MSG( hDC, false, wxT("invalid wxDC in wxImageList::Draw") );
+    HDC hDC = GetHdcOf(dc);
+    wxCHECK_MSG( hDC, false, _T("invalid wxDC in wxImageList::Draw") );
 
     COLORREF clr = CLR_NONE;    // transparent by default
     if ( solidBackground )
     {
         const wxBrush& brush = dc.GetBackground();
-        if ( brush.IsOk() )
+        if ( brush.Ok() )
         {
             clr = wxColourToRGB(brush.GetColour());
         }
@@ -329,7 +278,7 @@ bool wxImageList::Draw(int index,
 // Get the bitmap
 wxBitmap wxImageList::GetBitmap(int index) const
 {
-#if wxUSE_WXDIB && wxUSE_IMAGE
+#if wxUSE_WXDIB
     int bmp_width = 0, bmp_height = 0;
     GetSize(index, bmp_width, bmp_height);
 
@@ -399,7 +348,7 @@ static HBITMAP GetMaskForImage(const wxBitmap& bitmap, const wxBitmap& mask)
     wxMask *pMask;
     bool deleteMask = false;
 
-    if ( mask.IsOk() )
+    if ( mask.Ok() )
     {
         hbmpMask = GetHbitmapOf(mask);
         pMask = NULL;
diff --git a/Source/3rd Party/wx/src/msw/iniconf.cpp b/Source/3rd Party/wx/src/msw/iniconf.cpp
index 6969e33c6..f00d2b511 100644
--- a/Source/3rd Party/wx/src/msw/iniconf.cpp	
+++ b/Source/3rd Party/wx/src/msw/iniconf.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.07.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: iniconf.cpp 41054 2006-09-07 19:01:45Z ABX $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,9 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_INICONF
+// Doesn't yet compile in Unicode mode
+
+#if wxUSE_CONFIG && !wxUSE_UNICODE
 
 #ifndef   WX_PRECOMP
     #include "wx/msw/wrapwin.h"
@@ -48,7 +50,6 @@
 // ----------------------------------------------------------------------------
 // ctor & dtor
 // ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxIniConfig, wxConfigBase)
 
 wxIniConfig::wxIniConfig(const wxString& strAppName,
                          const wxString& strVendor,
@@ -152,7 +153,7 @@ const wxString& wxIniConfig::GetPath() const
     s_str << m_strGroup;
     if ( !m_strPath.empty() )
       s_str << wxCONFIG_PATH_SEPARATOR;
-    for ( const wxStringCharType *p = m_strPath.wx_str(); *p != '\0'; p++ ) {
+    for ( const char *p = m_strPath; *p != '\0'; p++ ) {
       s_str << (*p == PATH_SEP_REPLACE ? wxCONFIG_PATH_SEPARATOR : *p);
     }
   }
@@ -255,16 +256,15 @@ bool wxIniConfig::HasEntry(const wxString& WXUNUSED(strName)) const
 // is current group empty?
 bool wxIniConfig::IsEmpty() const
 {
-    wxChar szBuf[1024];
+    char szBuf[1024];
 
-    GetPrivateProfileString(m_strGroup.t_str(), NULL, wxT(""),
-                            szBuf, WXSIZEOF(szBuf),
-                            m_strLocalFilename.t_str());
-    if ( !wxIsEmpty(szBuf) )
+    GetPrivateProfileString(m_strGroup, NULL, "",
+                            szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
+    if ( !::IsEmpty(szBuf) )
         return false;
 
-    GetProfileString(m_strGroup.t_str(), NULL, wxT(""), szBuf, WXSIZEOF(szBuf));
-    if ( !wxIsEmpty(szBuf) )
+    GetProfileString(m_strGroup, NULL, "", szBuf, WXSIZEOF(szBuf));
+    if ( !::IsEmpty(szBuf) )
         return false;
 
     return true;
@@ -279,22 +279,20 @@ bool wxIniConfig::DoReadString(const wxString& szKey, wxString *pstr) const
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 
-  wxChar szBuf[1024]; // FIXME: should dynamically allocate memory...
+  char szBuf[1024]; // @@ should dynamically allocate memory...
 
   // first look in the private INI file
 
   // NB: the lpDefault param to GetPrivateProfileString can't be NULL
-  GetPrivateProfileString(m_strGroup.t_str(), strKey.t_str(), wxT(""),
-                          szBuf, WXSIZEOF(szBuf),
-                          m_strLocalFilename.t_str());
-  if ( wxIsEmpty(szBuf) ) {
+  GetPrivateProfileString(m_strGroup, strKey, "",
+                          szBuf, WXSIZEOF(szBuf), m_strLocalFilename);
+  if ( ::IsEmpty(szBuf) ) {
     // now look in win.ini
     wxString strKey = GetKeyName(path.Name());
-    GetProfileString(m_strGroup.t_str(), strKey.t_str(),
-                     wxT(""), szBuf, WXSIZEOF(szBuf));
+    GetProfileString(m_strGroup, strKey, "", szBuf, WXSIZEOF(szBuf));
   }
 
-  if ( wxIsEmpty(szBuf) )
+  if ( ::IsEmpty(szBuf) )
     return false;
 
   *pstr = szBuf;
@@ -311,8 +309,7 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
 
   static const int nMagic  = 17; // 17 is some "rare" number
   static const int nMagic2 = 28; // arbitrary number != nMagic
-  long lVal = GetPrivateProfileInt(m_strGroup.t_str(), strKey.t_str(),
-                                   nMagic, m_strLocalFilename.t_str());
+  long lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic, m_strLocalFilename);
   if ( lVal != nMagic ) {
     // the value was read from the file
     *pl = lVal;
@@ -320,8 +317,7 @@ bool wxIniConfig::DoReadLong(const wxString& szKey, long *pl) const
   }
 
   // is it really nMagic?
-  lVal = GetPrivateProfileInt(m_strGroup.t_str(), strKey.t_str(),
-                              nMagic2, m_strLocalFilename.t_str());
+  lVal = GetPrivateProfileInt(m_strGroup, strKey, nMagic2, m_strLocalFilename);
   if ( lVal != nMagic2 ) {
     // the nMagic it returned was indeed read from the file
     *pl = lVal;
@@ -345,44 +341,28 @@ bool wxIniConfig::DoWriteString(const wxString& szKey, const wxString& szValue)
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 
-  bool bOk = WritePrivateProfileString(m_strGroup.t_str(), strKey.t_str(),
-                                       szValue.t_str(),
-                                       m_strLocalFilename.t_str()) != 0;
+  bool bOk = WritePrivateProfileString(m_strGroup, strKey,
+                                       szValue, m_strLocalFilename) != 0;
 
   if ( !bOk )
-  {
     wxLogLastError(wxT("WritePrivateProfileString"));
-  }
 
   return bOk;
 }
 
 bool wxIniConfig::DoWriteLong(const wxString& szKey, long lValue)
 {
-  return Write(szKey, wxString::Format(wxT("%ld"), lValue));
-}
+  // ltoa() is not ANSI :-(
+  char szBuf[40];   // should be good for sizeof(long) <= 16 (128 bits)
+  sprintf(szBuf, "%ld", lValue);
 
-bool wxIniConfig::DoReadBinary(const wxString& WXUNUSED(key),
-                               wxMemoryBuffer * WXUNUSED(buf)) const
-{
-    wxFAIL_MSG("not implemented");
-
-    return false;
-}
-
-bool wxIniConfig::DoWriteBinary(const wxString& WXUNUSED(key),
-                                const wxMemoryBuffer& WXUNUSED(buf))
-{
-    wxFAIL_MSG("not implemented");
-
-    return false;
+  return Write(szKey, szBuf);
 }
 
 bool wxIniConfig::Flush(bool /* bCurrentOnly */)
 {
   // this is just the way it works
-  return WritePrivateProfileString(NULL, NULL, NULL,
-                                   m_strLocalFilename.t_str()) != 0;
+  return WritePrivateProfileString(NULL, NULL, NULL, m_strLocalFilename) != 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -395,21 +375,19 @@ bool wxIniConfig::DeleteEntry(const wxString& szKey, bool bGroupIfEmptyAlso)
   wxConfigPathChanger path(this, szKey);
   wxString strKey = GetPrivateKeyName(path.Name());
 
-  if (WritePrivateProfileString(m_strGroup.t_str(), strKey.t_str(),
-                                NULL, m_strLocalFilename.t_str()) == 0)
+  if (WritePrivateProfileString(m_strGroup, strKey,
+                                         (const char*) NULL, m_strLocalFilename) == 0)
     return false;
 
   if ( !bGroupIfEmptyAlso || !IsEmpty() )
     return true;
 
   // delete the current group too
-  bool bOk = WritePrivateProfileString(m_strGroup.t_str(), NULL,
-                                       NULL, m_strLocalFilename.t_str()) != 0;
+  bool bOk = WritePrivateProfileString(m_strGroup, NULL,
+                                       NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )
-  {
     wxLogLastError(wxT("WritePrivateProfileString"));
-  }
 
   return bOk;
 }
@@ -420,13 +398,11 @@ bool wxIniConfig::DeleteGroup(const wxString& szKey)
 
   // passing NULL as section name to WritePrivateProfileString deletes the
   // whole section according to the docs
-  bool bOk = WritePrivateProfileString(path.Name().t_str(), NULL,
-                                       NULL, m_strLocalFilename.t_str()) != 0;
+  bool bOk = WritePrivateProfileString(path.Name(), NULL,
+                                       NULL, m_strLocalFilename) != 0;
 
   if ( !bOk )
-  {
     wxLogLastError(wxT("WritePrivateProfileString"));
-  }
 
   return bOk;
 }
@@ -438,10 +414,10 @@ bool wxIniConfig::DeleteGroup(const wxString& szKey)
 bool wxIniConfig::DeleteAll()
 {
   // first delete our group in win.ini
-  WriteProfileString(GetVendorName().t_str(), NULL, NULL);
+  WriteProfileString(GetVendorName(), NULL, NULL);
 
   // then delete our own ini file
-  wxChar szBuf[MAX_PATH];
+  char szBuf[MAX_PATH];
   size_t nRc = GetWindowsDirectory(szBuf, WXSIZEOF(szBuf));
   if ( nRc == 0 )
   {
@@ -477,4 +453,5 @@ bool wxIniConfig::RenameGroup(const wxString& WXUNUSED(oldName),
     return false;
 }
 
-#endif // wxUSE_INICONF
+#endif
+    // wxUSE_CONFIG && wxUSE_UNICODE
diff --git a/Source/3rd Party/wx/src/msw/listbox.cpp b/Source/3rd Party/wx/src/msw/listbox.cpp
index 7abde26ae..604404270 100644
--- a/Source/3rd Party/wx/src/msw/listbox.cpp	
+++ b/Source/3rd Party/wx/src/msw/listbox.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (owner drawn stuff)
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listbox.cpp 66941 2011-02-17 11:01:22Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -32,7 +32,6 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/dc.h"
 
 #include <windowsx.h>
 
@@ -40,6 +39,74 @@
     #include  "wx/ownerdrw.h"
 #endif
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxListBoxStyle )
+
+wxBEGIN_FLAGS( wxListBoxStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxLB_SINGLE)
+    wxFLAGS_MEMBER(wxLB_MULTIPLE)
+    wxFLAGS_MEMBER(wxLB_EXTENDED)
+    wxFLAGS_MEMBER(wxLB_HSCROLL)
+    wxFLAGS_MEMBER(wxLB_ALWAYS_SB)
+    wxFLAGS_MEMBER(wxLB_NEEDED_SB)
+    wxFLAGS_MEMBER(wxLB_SORT)
+
+wxEND_FLAGS( wxListBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxListBox, wxControl,"wx/listbox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxListBox)
+    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_LISTBOX_SELECTED , wxCommandEvent )
+    wxEVENT_PROPERTY( DoubleClick , wxEVT_COMMAND_LISTBOX_DOUBLECLICKED , wxCommandEvent )
+
+    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY_FLAGS( WindowStyle , wxListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxListBox)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+#endif
+
+/*
+TODO PROPERTIES
+    selection
+    content
+        item
+*/
+
 // ============================================================================
 // list box item declaration and implementation
 // ============================================================================
@@ -49,25 +116,18 @@
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:
-    wxListBoxItem(wxListBox *parent)
-        { m_parent = parent; }
-
-    wxListBox *GetParent() const
-        { return m_parent; }
-
-    int GetIndex() const
-        { return m_parent->GetItemIndex(const_cast<wxListBoxItem*>(this)); }
-
-    wxString GetName() const
-        { return m_parent->GetString(GetIndex()); }
-
-private:
-    wxListBox *m_parent;
+    wxListBoxItem(const wxString& str = wxEmptyString);
 };
 
+wxListBoxItem::wxListBoxItem(const wxString& str) : wxOwnerDrawn(str, false)
+{
+    // no bitmaps/checkmarks
+    SetMarginWidth(0);
+}
+
 wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n))
 {
-    return new wxListBoxItem(this);
+    return new wxListBoxItem();
 }
 
 #endif  //USE_OWNER_DRAWN
@@ -80,11 +140,14 @@ wxOwnerDrawn *wxListBox::CreateLboxItem(size_t WXUNUSED(n))
 // creation
 // ----------------------------------------------------------------------------
 
-void wxListBox::Init()
+// Listbox item
+wxListBox::wxListBox()
 {
     m_noItems = 0;
-    m_updateHorizontalExtent = false;
+    m_selected = 0;
+#if wxUSE_LISTBOX_SELECTION_FIX
     m_selectedByKeyboard = false;
+#endif
 }
 
 bool wxListBox::Create(wxWindow *parent,
@@ -96,12 +159,15 @@ bool wxListBox::Create(wxWindow *parent,
                        const wxValidator& validator,
                        const wxString& name)
 {
+    m_noItems = 0;
+    m_selected = 0;
+
     // initialize base class fields
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
     // create the native control
-    if ( !MSWCreateControl(wxT("LISTBOX"), wxEmptyString, pos, size) )
+    if ( !MSWCreateControl(_T("LISTBOX"), wxEmptyString, pos, size) )
     {
         // control creation failed
         return false;
@@ -113,7 +179,7 @@ bool wxListBox::Create(wxWindow *parent,
         Append(choices[i]);
     }
 
-    // now we can compute our best size correctly, so do it again
+    // now we can compute our best size correctly, so do it if necessary
     SetInitialSize(size);
 
     return true;
@@ -135,13 +201,17 @@ bool wxListBox::Create(wxWindow *parent,
 
 wxListBox::~wxListBox()
 {
-    Clear();
+    Free();
 }
 
 WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 
+    // always show the vertical scrollbar if necessary -- otherwise it is
+    // impossible to use the control with the mouse
+    msStyle |= WS_VSCROLL;
+
     // we always want to get the notifications
     msStyle |= LBS_NOTIFY;
 
@@ -150,23 +220,15 @@ WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     msStyle |= LBS_NOINTEGRALHEIGHT;
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
-                  wxT("only one of listbox selection modes can be specified") );
+                  _T("only one of listbox selection modes can be specified") );
 
     if ( style & wxLB_MULTIPLE )
         msStyle |= LBS_MULTIPLESEL;
     else if ( style & wxLB_EXTENDED )
         msStyle |= LBS_EXTENDEDSEL;
 
-    wxASSERT_MSG( !(style & wxLB_ALWAYS_SB) || !(style & wxLB_NO_SB),
-                  wxT( "Conflicting styles wxLB_ALWAYS_SB and wxLB_NO_SB." ) );
-
-    if ( !(style & wxLB_NO_SB) )
-    {
-        msStyle |= WS_VSCROLL;
-        if ( style & wxLB_ALWAYS_SB )
-            msStyle |= LBS_DISABLENOSCROLL;
-    }
-
+    if ( m_windowStyle & wxLB_ALWAYS_SB )
+        msStyle |= LBS_DISABLENOSCROLL;
     if ( m_windowStyle & wxLB_HSCROLL )
         msStyle |= WS_HSCROLL;
     if ( m_windowStyle & wxLB_SORT )
@@ -185,33 +247,6 @@ WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     return msStyle;
 }
 
-void wxListBox::OnInternalIdle()
-{
-    wxWindow::OnInternalIdle();
-
-    if (m_updateHorizontalExtent)
-    {
-        SetHorizontalExtent(wxEmptyString);
-        m_updateHorizontalExtent = false;
-    }
-}
-
-void wxListBox::MSWOnItemsChanged()
-{
-    // we need to do two things when items change: update their max horizontal
-    // extent so that horizontal scrollbar could be shown or hidden as
-    // appropriate and also invlaidate the best size
-    //
-    // updating the max extent is slow (it's an O(N) operation) and so we defer
-    // it until the idle time but the best size should be invalidated
-    // immediately doing it in idle time is too late -- layout using incorrect
-    // old best size will have been already done by then
-
-    m_updateHorizontalExtent = true;
-
-    InvalidateBestSize();
-}
-
 // ----------------------------------------------------------------------------
 // implementation of wxListBoxBase methods
 // ----------------------------------------------------------------------------
@@ -224,25 +259,91 @@ void wxListBox::DoSetFirstItem(int N)
     SendMessage(GetHwnd(), LB_SETTOPINDEX, (WPARAM)N, (LPARAM)0);
 }
 
-void wxListBox::DoDeleteOneItem(unsigned int n)
+void wxListBox::Delete(unsigned int n)
 {
     wxCHECK_RET( IsValid(n),
                  wxT("invalid index in wxListBox::Delete") );
 
-#if wxUSE_OWNER_DRAWN
-    if ( HasFlag(wxLB_OWNERDRAW) )
-    {
-        delete m_aItems[n];
-        m_aItems.RemoveAt(n);
-    }
-#endif // wxUSE_OWNER_DRAWN
+    // for owner drawn objects, the data is used for storing wxOwnerDrawn
+    // pointers and we shouldn't touch it
+#if !wxUSE_OWNER_DRAWN
+    if ( !(m_windowStyle & wxLB_OWNERDRAW) )
+#endif // !wxUSE_OWNER_DRAWN
+        if ( HasClientObjectData() )
+        {
+            delete GetClientObject(n);
+        }
 
     SendMessage(GetHwnd(), LB_DELETESTRING, n, 0);
     m_noItems--;
 
-    MSWOnItemsChanged();
+    SetHorizontalExtent(wxEmptyString);
+}
 
-    UpdateOldSelections();
+int wxListBox::DoAppend(const wxString& item)
+{
+    int index = ListBox_AddString(GetHwnd(), item);
+    m_noItems++;
+
+#if wxUSE_OWNER_DRAWN
+    if ( m_windowStyle & wxLB_OWNERDRAW ) {
+        wxOwnerDrawn *pNewItem = CreateLboxItem(index); // dummy argument
+        pNewItem->SetName(item);
+        m_aItems.Insert(pNewItem, index);
+        ListBox_SetItemData(GetHwnd(), index, pNewItem);
+        pNewItem->SetFont(GetFont());
+    }
+#endif // wxUSE_OWNER_DRAWN
+
+    SetHorizontalExtent(item);
+
+    return index;
+}
+
+void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
+{
+    // avoid flicker - but don't need to do this for a hidden listbox
+    bool hideAndShow = IsShown();
+    if ( hideAndShow )
+    {
+        ShowWindow(GetHwnd(), SW_HIDE);
+    }
+
+    ListBox_ResetContent(GetHwnd());
+
+    m_noItems = choices.GetCount();
+    unsigned int i;
+    for (i = 0; i < m_noItems; i++)
+    {
+        ListBox_AddString(GetHwnd(), choices[i]);
+        if ( clientData )
+        {
+            SetClientData(i, clientData[i]);
+        }
+    }
+
+#if wxUSE_OWNER_DRAWN
+    if ( m_windowStyle & wxLB_OWNERDRAW ) {
+        // first delete old items
+        WX_CLEAR_ARRAY(m_aItems);
+
+        // then create new ones
+        for ( unsigned int ui = 0; ui < m_noItems; ui++ ) {
+            wxOwnerDrawn *pNewItem = CreateLboxItem(ui);
+            pNewItem->SetName(choices[ui]);
+            m_aItems.Add(pNewItem);
+            ListBox_SetItemData(GetHwnd(), ui, pNewItem);
+        }
+    }
+#endif // wxUSE_OWNER_DRAWN
+
+    SetHorizontalExtent();
+
+    if ( hideAndShow )
+    {
+        // show the listbox back if we hid it
+        ShowWindow(GetHwnd(), SW_SHOW);
+    }
 }
 
 int wxListBox::FindString(const wxString& s, bool bCase) const
@@ -251,28 +352,39 @@ int wxListBox::FindString(const wxString& s, bool bCase) const
     if (bCase)
        return wxItemContainerImmutable::FindString( s, bCase );
 
-    int pos = ListBox_FindStringExact(GetHwnd(), -1, s.t_str());
+    int pos = ListBox_FindStringExact(GetHwnd(), -1, s);
     if (pos == LB_ERR)
         return wxNOT_FOUND;
     else
         return pos;
 }
 
-void wxListBox::DoClear()
+void wxListBox::Clear()
 {
-#if wxUSE_OWNER_DRAWN
-    if ( HasFlag(wxLB_OWNERDRAW) )
-    {
-        WX_CLEAR_ARRAY(m_aItems);
-    }
-#endif // wxUSE_OWNER_DRAWN
+    Free();
 
     ListBox_ResetContent(GetHwnd());
 
     m_noItems = 0;
-    MSWOnItemsChanged();
+    SetHorizontalExtent();
+}
 
-    UpdateOldSelections();
+void wxListBox::Free()
+{
+#if wxUSE_OWNER_DRAWN
+    if ( m_windowStyle & wxLB_OWNERDRAW )
+    {
+        WX_CLEAR_ARRAY(m_aItems);
+    }
+    else
+#endif // wxUSE_OWNER_DRAWN
+    if ( HasClientObjectData() )
+    {
+        for ( unsigned int n = 0; n < m_noItems; n++ )
+        {
+            delete GetClientObject(n);
+        }
+    }
 }
 
 void wxListBox::DoSetSelection(int N, bool select)
@@ -282,18 +394,12 @@ void wxListBox::DoSetSelection(int N, bool select)
 
     if ( HasMultipleSelection() )
     {
-        // Setting selection to -1 should deselect everything.
-        const bool deselectAll = N == wxNOT_FOUND;
-        SendMessage(GetHwnd(), LB_SETSEL,
-                    deselectAll ? FALSE : select,
-                    deselectAll ? -1 : N);
+        SendMessage(GetHwnd(), LB_SETSEL, select, N);
     }
     else
     {
         SendMessage(GetHwnd(), LB_SETCURSEL, select ? N : -1, 0);
     }
-
-    UpdateOldSelections();
 }
 
 bool wxListBox::IsSelected(int N) const
@@ -304,25 +410,40 @@ bool wxListBox::IsSelected(int N) const
     return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? false : true;
 }
 
+wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const
+{
+    return (wxClientData *)DoGetItemClientData(n);
+}
+
 void *wxListBox::DoGetItemClientData(unsigned int n) const
 {
-    LPARAM rc = SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
-    if ( rc == LB_ERR && GetLastError() != ERROR_SUCCESS )
-    {
-        wxLogLastError(wxT("LB_GETITEMDATA"));
+    wxCHECK_MSG( IsValid(n), NULL,
+                 wxT("invalid index in wxListBox::GetClientData") );
 
-        return NULL;
-    }
+    return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, n, 0);
+}
 
-    return (void *)rc;
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
+{
+    DoSetItemClientData(n, clientData);
 }
 
 void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
 {
-    if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )
+    wxCHECK_RET( IsValid(n),
+                 wxT("invalid index in wxListBox::SetClientData") );
+
+#if wxUSE_OWNER_DRAWN
+    if ( m_windowStyle & wxLB_OWNERDRAW )
     {
-        wxLogDebug(wxT("LB_SETITEMDATA failed"));
+        // client data must be pointer to wxOwnerDrawn, otherwise we would crash
+        // in OnMeasure/OnDraw.
+        wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));
     }
+#endif // wxUSE_OWNER_DRAWN
+
+    if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )
+        wxLogDebug(wxT("LB_SETITEMDATA failed"));
 }
 
 // Return number of selections and an array of selected integers
@@ -335,7 +456,7 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
         int countSel = ListBox_GetSelCount(GetHwnd());
         if ( countSel == LB_ERR )
         {
-            wxLogDebug(wxT("ListBox_GetSelCount failed"));
+            wxLogDebug(_T("ListBox_GetSelCount failed"));
         }
         else if ( countSel != 0 )
         {
@@ -393,55 +514,38 @@ wxString wxListBox::GetString(unsigned int n) const
     return result;
 }
 
-int wxListBox::DoInsertItems(const wxArrayStringsAdapter & items,
-                             unsigned int pos,
-                             void **clientData,
-                             wxClientDataType type)
+void
+wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
 {
-    MSWAllocStorage(items, LB_INITSTORAGE);
+    wxCHECK_RET( IsValidInsert(pos),
+                 wxT("invalid index in wxListBox::InsertItems") );
 
-    const bool append = pos == GetCount();
-
-    // we must use CB_ADDSTRING when appending as only it works correctly for
-    // the sorted controls
-    const unsigned msg = append ? LB_ADDSTRING : LB_INSERTSTRING;
-
-    if ( append )
-        pos = 0;
-
-    int n = wxNOT_FOUND;
-
-    const unsigned int numItems = items.GetCount();
-    for ( unsigned int i = 0; i < numItems; i++ )
+    unsigned int nItems = items.GetCount();
+    for ( unsigned int i = 0; i < nItems; i++ )
     {
-        n = MSWInsertOrAppendItem(pos, items[i], msg);
-        if ( n == wxNOT_FOUND )
-            return n;
-
-        if ( !append )
-            pos++;
-
-        ++m_noItems;
+        int idx = ListBox_InsertString(GetHwnd(), i + pos, items[i]);
 
 #if wxUSE_OWNER_DRAWN
-        if ( HasFlag(wxLB_OWNERDRAW) )
+        if ( m_windowStyle & wxLB_OWNERDRAW )
         {
-            wxOwnerDrawn *pNewItem = CreateLboxItem(n);
+            wxOwnerDrawn *pNewItem = CreateLboxItem(idx);
+            pNewItem->SetName(items[i]);
             pNewItem->SetFont(GetFont());
-            m_aItems.Insert(pNewItem, n);
+            m_aItems.Insert(pNewItem, idx);
+
+            ListBox_SetItemData(GetHwnd(), idx, pNewItem);
         }
+#else
+        wxUnusedVar(idx);
 #endif // wxUSE_OWNER_DRAWN
-        AssignNewItemClientData(n, clientData, i, type);
     }
 
-    MSWOnItemsChanged();
+    m_noItems += nItems;
 
-    UpdateOldSelections();
-
-    return n;
+    SetHorizontalExtent();
 }
 
-int wxListBox::DoHitTestList(const wxPoint& point) const
+int wxListBox::DoListHitTest(const wxPoint& point) const
 {
     LRESULT lRes = ::SendMessage(GetHwnd(), LB_ITEMFROMPOINT,
                                  0, MAKELPARAM(point.x, point.y));
@@ -461,9 +565,9 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
 
     void *oldData = NULL;
     wxClientData *oldObjData = NULL;
-    if ( HasClientUntypedData() )
+    if ( m_clientDataItemsType == wxClientData_Void )
         oldData = GetClientData(n);
-    else if ( HasClientObjectData() )
+    else if ( m_clientDataItemsType == wxClientData_Object )
         oldObjData = GetClientObject(n);
 
     // delete and recreate it
@@ -473,7 +577,7 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
     if ( n == (m_noItems - 1) )
         newN = -1;
 
-    ListBox_InsertString(GetHwnd(), newN, s.t_str());
+    ListBox_InsertString(GetHwnd(), newN, s);
 
     // restore the client data
     if ( oldData )
@@ -481,11 +585,22 @@ void wxListBox::SetString(unsigned int n, const wxString& s)
     else if ( oldObjData )
         SetClientObject(n, oldObjData);
 
+#if wxUSE_OWNER_DRAWN
+    if ( m_windowStyle & wxLB_OWNERDRAW )
+    {
+        // update item's text
+        m_aItems[n]->SetName(s);
+
+        // reassign the item's data
+        ListBox_SetItemData(GetHwnd(), n, m_aItems[n]);
+    }
+#endif  //USE_OWNER_DRAWN
+
     // we may have lost the selection
     if ( wasSelected )
         Select(n);
 
-    MSWOnItemsChanged();
+    SetHorizontalExtent();
 }
 
 unsigned int wxListBox::GetCount() const
@@ -499,6 +614,9 @@ unsigned int wxListBox::GetCount() const
 
 void wxListBox::SetHorizontalExtent(const wxString& s)
 {
+    // in any case, our best size could have changed
+    InvalidateBestSize();
+
     // the rest is only necessary if we want a horizontal scrollbar
     if ( !HasFlag(wxHSCROLL) )
         return;
@@ -543,7 +661,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
     //else: it shouldn't change
 }
 
-wxSize wxListBox::DoGetBestClientSize() const
+wxSize wxListBox::DoGetBestSize() const
 {
     // find the widest string
     int wLine;
@@ -562,17 +680,22 @@ wxSize wxListBox::DoGetBestClientSize() const
         wListbox = 100;
 
     // the listbox should be slightly larger than the widest string
-    wListbox += 3*GetCharWidth();
+    int cx, cy;
+    wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
-    // add room for the scrollbar
+    wListbox += 3*cx;
+
+    // Add room for the scrollbar
     wListbox += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
 
     // don't make the listbox too tall (limit height to 10 items) but don't
     // make it too small neither
-    int hListbox = SendMessage(GetHwnd(), LB_GETITEMHEIGHT, 0, 0)*
+    int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*
                     wxMin(wxMax(m_noItems, 3), 10);
 
-    return wxSize(wListbox, hListbox);
+    wxSize best(wListbox, hListbox);
+    CacheBestSize(best);
+    return best;
 }
 
 // ----------------------------------------------------------------------------
@@ -583,13 +706,11 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
     wxEventType evtType;
     int n = wxNOT_FOUND;
+
+#if wxUSE_LISTBOX_SELECTION_FIX
     if ( param == LBN_SELCHANGE )
     {
-        if ( HasMultipleSelection() )
-            return CalcAndSendEvent();
-
         evtType = wxEVT_COMMAND_LISTBOX_SELECTED;
-
         if ( m_selectedByKeyboard )
         {
             // We shouldn't use the mouse position to find the item as mouse
@@ -601,10 +722,13 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0);
         }
         //else: n will be determined below from the mouse position
+
+        // NB: conveniently enough, LB_ERR is the same as wxNOT_FOUND
     }
     else if ( param == LBN_DBLCLK )
     {
         evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+        n = HitTest(ScreenToClient(wxGetMousePosition()));
     }
     else
     {
@@ -620,22 +744,46 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         const wxPoint pt(GET_X_LPARAM(pos), GET_Y_LPARAM(pos));
         n = HitTest(ScreenToClient(wxPoint(pt)));
     }
-
-    // We get events even when mouse is clicked outside of any valid item from
-    // Windows, just ignore them.
-    if ( n == wxNOT_FOUND )
-       return false;
-
+#else
     if ( param == LBN_SELCHANGE )
     {
-        if ( !DoChangeSingleSelection(n) )
-            return false;
-    }
+        evtType = wxEVT_COMMAND_LISTBOX_SELECTED;
+        n = SendMessage(GetHwnd(), LB_GETCARETINDEX, 0, 0);
 
-    // Do generate an event otherwise.
-    return SendEvent(evtType, n, true /* selection */);
+        // NB: conveniently enough, LB_ERR is the same as wxNOT_FOUND
+    }
+    else if ( param == LBN_DBLCLK )
+    {
+        evtType = wxEVT_COMMAND_LISTBOX_DOUBLECLICKED;
+        n = HitTest(ScreenToClient(wxGetMousePosition()));
+    }
+    else
+    {
+        // some event we're not interested in
+        return false;
+    }
+#endif
+
+    // retrieve the affected item
+    if ( n == wxNOT_FOUND )
+        return false;
+
+    wxCommandEvent event(evtType, m_windowId);
+    event.SetEventObject(this);
+
+    if ( HasClientObjectData() )
+        event.SetClientObject( GetClientObject(n) );
+    else if ( HasClientUntypedData() )
+        event.SetClientData( GetClientData(n) );
+
+    event.SetString(GetString(n));
+    event.SetInt(n);
+    event.SetExtraLong( HasMultipleSelection() ? IsSelected(n) : true );
+
+    return GetEventHandler()->ProcessEvent(event);
 }
 
+#if wxUSE_LISTBOX_SELECTION_FIX
 WXLRESULT
 wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
@@ -649,71 +797,20 @@ wxListBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 
     return wxListBoxBase::MSWWindowProc(nMsg, wParam, lParam);
 }
+#endif
 
 // ----------------------------------------------------------------------------
-// owner-drawn list boxes support
+// wxCheckListBox support
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OWNER_DRAWN
 
-// misc overloaded methods
-// -----------------------
-
-bool wxListBox::SetFont(const wxFont &font)
-{
-    if ( HasFlag(wxLB_OWNERDRAW) )
-    {
-        const unsigned count = m_aItems.GetCount();
-        for ( unsigned i = 0; i < count; i++ )
-            m_aItems[i]->SetFont(font);
-    }
-
-    wxListBoxBase::SetFont(font);
-
-    return true;
-}
-
-bool wxListBox::GetItemRect(size_t n, wxRect& rect) const
-{
-    wxCHECK_MSG( IsValid(n), false,
-                 wxT("invalid index in wxListBox::GetItemRect") );
-
-    RECT rc;
-
-    if ( ListBox_GetItemRect(GetHwnd(), n, &rc) != LB_ERR )
-    {
-        rect = wxRectFromRECT(rc);
-        return true;
-    }
-    else
-    {
-        // couldn't retrieve rect: for example, item isn't visible
-        return false;
-    }
-}
-
-bool wxListBox::RefreshItem(size_t n)
-{
-    wxRect rect;
-    if ( !GetItemRect(n, rect) )
-        return false;
-
-    RECT rc;
-    wxCopyRectToRECT(rect, rc);
-
-    return ::InvalidateRect((HWND)GetHWND(), &rc, FALSE) == TRUE;
-}
-
-
 // drawing
 // -------
 
-namespace
-{
-    // space beneath/above each row in pixels
-    static const int LISTBOX_EXTRA_SPACE = 1;
-
-} // anonymous namespace
+// space beneath/above each row in pixels
+// "standard" checklistbox use 1 here, some might prefer 2. 0 is ugly.
+#define OWNER_DRAWN_LISTBOX_EXTRA_SPACE    (1)
 
 // the height is the same for all items
 // TODO should be changed for LBS_OWNERDRAWVARIABLE style listboxes
@@ -723,7 +820,7 @@ namespace
 bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 {
     // only owner-drawn control should receive this message
-    wxCHECK( HasFlag(wxLB_OWNERDRAW), false );
+    wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), false );
 
     MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 
@@ -737,7 +834,7 @@ bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
         wxDCTemp dc((WXHDC)hdc);
         dc.SetFont(GetFont());
 
-        pStruct->itemHeight = dc.GetCharHeight() + 2 * LISTBOX_EXTRA_SPACE;
+        pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
         pStruct->itemWidth  = dc.GetCharWidth();
     }
 
@@ -754,21 +851,26 @@ bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 bool wxListBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
     // only owner-drawn control should receive this message
-    wxCHECK( HasFlag(wxLB_OWNERDRAW), false );
+    wxCHECK( ((m_windowStyle & wxLB_OWNERDRAW) == wxLB_OWNERDRAW), false );
 
     DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
+    UINT itemID = pStruct->itemID;
 
     // the item may be -1 for an empty listbox
-    if ( pStruct->itemID == (UINT)-1 )
+    if ( itemID == (UINT)-1 )
         return false;
 
-    wxListBoxItem *pItem = (wxListBoxItem *)m_aItems[pStruct->itemID];
+    LRESULT data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);
+
+    wxCHECK( data && (data != LB_ERR), false );
+
+    wxListBoxItem *pItem = (wxListBoxItem *)data;
 
     wxDCTemp dc((WXHDC)pStruct->hDC);
 
     return pItem->OnDrawItem(dc, wxRectFromRECT(pStruct->rcItem),
                              (wxOwnerDrawn::wxODAction)pStruct->itemAction,
-                             (wxOwnerDrawn::wxODStatus)(pStruct->itemState | wxOwnerDrawn::wxODHidePrefix));
+                             (wxOwnerDrawn::wxODStatus)pStruct->itemState);
 }
 
 #endif // wxUSE_OWNER_DRAWN
diff --git a/Source/3rd Party/wx/src/msw/listctrl.cpp b/Source/3rd Party/wx/src/msw/listctrl.cpp
index bdbcbb624..1285f4bc2 100644
--- a/Source/3rd Party/wx/src/msw/listctrl.cpp	
+++ b/Source/3rd Party/wx/src/msw/listctrl.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Agron Selimaj
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: listctrl.cpp 57021 2008-11-29 13:43:32Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,16 +34,13 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/settings.h"
-    #include "wx/stopwatch.h"
     #include "wx/dcclient.h"
     #include "wx/textctrl.h"
 #endif
 
 #include "wx/imaglist.h"
-#include "wx/vector.h"
 
 #include "wx/msw/private.h"
-#include "wx/msw/private/keyboard.h"
 
 #if defined(__WXWINCE__) && !defined(__HANDHELDPC__)
   #include <ole2.h>
@@ -85,33 +82,6 @@ static void wxConvertToMSWListCol(HWND hwndList,
                                   const wxListItem& item,
                                   LV_COLUMN& lvCol);
 
-namespace
-{
-
-// replacement for ListView_GetSubItemRect() which provokes warnings like
-// "the address of 'rc' will always evaluate as 'true'" when used with mingw32
-// 4.3+
-//
-// this function does no error checking on item and subitem parameters, notice
-// that subitem 0 means the whole item so there is no way to retrieve the
-// rectangle of the first subitem using this function, in particular notice
-// that the index is *not* 1-based, in spite of what MSDN says
-inline bool
-wxGetListCtrlSubItemRect(HWND hwnd, int item, int subitem, int flags, RECT& rect)
-{
-    rect.top = subitem;
-    rect.left = flags;
-    return ::SendMessage(hwnd, LVM_GETSUBITEMRECT, item, (LPARAM)&rect) != 0;
-}
-
-inline bool
-wxGetListCtrlItemRect(HWND hwnd, int item, int flags, RECT& rect)
-{
-    return wxGetListCtrlSubItemRect(hwnd, item, 0, flags, rect);
-}
-
-} // anonymous namespace
-
 // ----------------------------------------------------------------------------
 // private helper classes
 // ----------------------------------------------------------------------------
@@ -144,7 +114,7 @@ public:
     // init without conversion
     void Init(LV_ITEM_NATIVE& item)
     {
-        wxASSERT_MSG( !m_pItem, wxT("Init() called twice?") );
+        wxASSERT_MSG( !m_pItem, _T("Init() called twice?") );
 
         m_pItem = &item;
     }
@@ -189,7 +159,7 @@ private:
     LV_ITEM_NATIVE *m_pItem;
     LV_ITEM_NATIVE m_item;
 
-    wxDECLARE_NO_COPY_CLASS(wxLV_ITEM);
+    DECLARE_NO_COPY_CLASS(wxLV_ITEM)
 };
 
 ///////////////////////////////////////////////////////
@@ -197,7 +167,7 @@ private:
 // The MSW version had problems with SetTextColour() et
 // al as the wxListItemAttr's were stored keyed on the
 // item index. If a item was inserted anywhere but the end
-// of the list the text attributes (colour etc) for
+// of the list the the text attributes (colour etc) for
 // the following items were out of sync.
 //
 // Solution:
@@ -209,26 +179,119 @@ private:
 //
 // However what we can do is store a pointer to a
 // structure which contains the attributes we want *and*
-// a lParam -- and this is what wxMSWListItemData does.
+// a lParam for the users data, e.g.
 //
-// To conserve memory, a wxMSWListItemData is
+// class wxListItemInternalData
+// {
+// public:
+//   wxListItemAttr *attr;
+//   long lParam; // user data
+// };
+//
+// To conserve memory, a wxListItemInternalData is
 // only allocated for a LV_ITEM if text attributes or
 // user data(lparam) are being set.
-class wxMSWListItemData
+
+
+// class wxListItemInternalData
+class wxListItemInternalData
 {
 public:
-   wxMSWListItemData() : attr(NULL), lParam(0) {}
-   ~wxMSWListItemData() { delete attr; }
+   wxListItemAttr *attr;
+   LPARAM lParam; // user data
 
-    wxListItemAttr *attr;
-    LPARAM lParam; // real user data
+   wxListItemInternalData() : attr(NULL), lParam(0) {}
+   ~wxListItemInternalData()
+   {
+       if (attr)
+           delete attr;
+   }
 
-    wxDECLARE_NO_COPY_CLASS(wxMSWListItemData);
+    DECLARE_NO_COPY_CLASS(wxListItemInternalData)
 };
 
-BEGIN_EVENT_TABLE(wxListCtrl, wxListCtrlBase)
+// Get the internal data structure
+static wxListItemInternalData *wxGetInternalData(HWND hwnd, long itemId);
+static wxListItemInternalData *wxGetInternalData(const wxListCtrl *ctl, long itemId);
+static wxListItemAttr *wxGetInternalDataAttr(const wxListCtrl *ctl, long itemId);
+static void wxDeleteInternalData(wxListCtrl* ctl, long itemId);
+
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxListCtrlStyle )
+
+wxBEGIN_FLAGS( wxListCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxLC_LIST)
+    wxFLAGS_MEMBER(wxLC_REPORT)
+    wxFLAGS_MEMBER(wxLC_ICON)
+    wxFLAGS_MEMBER(wxLC_SMALL_ICON)
+    wxFLAGS_MEMBER(wxLC_ALIGN_TOP)
+    wxFLAGS_MEMBER(wxLC_ALIGN_LEFT)
+    wxFLAGS_MEMBER(wxLC_AUTOARRANGE)
+    wxFLAGS_MEMBER(wxLC_USER_TEXT)
+    wxFLAGS_MEMBER(wxLC_EDIT_LABELS)
+    wxFLAGS_MEMBER(wxLC_NO_HEADER)
+    wxFLAGS_MEMBER(wxLC_SINGLE_SEL)
+    wxFLAGS_MEMBER(wxLC_SORT_ASCENDING)
+    wxFLAGS_MEMBER(wxLC_SORT_DESCENDING)
+    wxFLAGS_MEMBER(wxLC_VIRTUAL)
+
+wxEND_FLAGS( wxListCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxListCtrl, wxControl,"wx/listctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxListCtrl)
+    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
+
+    wxPROPERTY_FLAGS( WindowStyle , wxListCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxListCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxListCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+
+/*
+ TODO : Expose more information of a list's layout etc. via appropriate objects (a la NotebookPageInfo)
+*/
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
+IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
+
+IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
+
+BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
     EVT_PAINT(wxListCtrl::OnPaint)
-    EVT_CHAR_HOOK(wxListCtrl::OnCharHook)
 END_EVENT_TABLE()
 
 // ============================================================================
@@ -241,17 +304,15 @@ END_EVENT_TABLE()
 
 void wxListCtrl::Init()
 {
-    m_imageListNormal =
-    m_imageListSmall =
+    m_imageListNormal = NULL;
+    m_imageListSmall = NULL;
     m_imageListState = NULL;
-    m_ownsImageListNormal =
-    m_ownsImageListSmall =
-    m_ownsImageListState = false;
-
+    m_ownsImageListNormal = m_ownsImageListSmall = m_ownsImageListState = false;
     m_colCount = 0;
     m_count = 0;
+    m_ignoreChangeMessages = false;
     m_textCtrl = NULL;
-
+    m_AnyInternalData = false;
     m_hasAnyAttr = false;
 }
 
@@ -289,39 +350,26 @@ void wxListCtrl::MSWSetExListStyles()
     // styles because it's prettier (and also because wxGTK does it like this)
     if ( wxApp::GetComCtl32Version() >= 470 )
     {
-        ::SendMessage
-        (
-            GetHwnd(), LVM_SETEXTENDEDLISTVIEWSTYLE, 0,
-            // LVS_EX_LABELTIP shouldn't be used under Windows CE where it's
-            // not defined in the SDK headers
-#ifdef LVS_EX_LABELTIP
-            LVS_EX_LABELTIP |
-#endif
-            LVS_EX_FULLROWSELECT |
-            LVS_EX_SUBITEMIMAGES |
-            // normally this should be governed by a style as it's probably not
-            // always appropriate, but we don't have any free styles left and
-            // it seems better to enable it by default than disable
-            LVS_EX_HEADERDRAGDROP
-        );
+        ::SendMessage(GetHwnd(), LVM_SETEXTENDEDLISTVIEWSTYLE,
+                      0, LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT | LVS_EX_SUBITEMIMAGES);
     }
 }
 
 WXDWORD wxListCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
-    WXDWORD wstyle = wxListCtrlBase::MSWGetStyle(style, exstyle);
+    WXDWORD wstyle = wxControl::MSWGetStyle(style, exstyle);
 
     wstyle |= LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS;
 
-#if wxDEBUG_LEVEL
+#ifdef __WXDEBUG__
     size_t nModes = 0;
 
     #define MAP_MODE_STYLE(wx, ms)                                            \
         if ( style & (wx) ) { wstyle |= (ms); nModes++; }
-#else // !wxDEBUG_LEVEL
+#else // !__WXDEBUG__
     #define MAP_MODE_STYLE(wx, ms)                                            \
         if ( style & (wx) ) wstyle |= (ms);
-#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
+#endif // __WXDEBUG__
 
     MAP_MODE_STYLE(wxLC_ICON, LVS_ICON)
     MAP_MODE_STYLE(wxLC_SMALL_ICON, LVS_SMALLICON)
@@ -329,7 +377,7 @@ WXDWORD wxListCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
     MAP_MODE_STYLE(wxLC_REPORT, LVS_REPORT)
 
     wxASSERT_MSG( nModes == 1,
-                  wxT("wxListCtrl style should have exactly one mode bit set") );
+                  _T("wxListCtrl style should have exactly one mode bit set") );
 
 #undef MAP_MODE_STYLE
 
@@ -359,7 +407,7 @@ WXDWORD wxListCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
         wstyle |= LVS_SORTASCENDING;
 
         wxASSERT_MSG( !(style & wxLC_SORT_DESCENDING),
-                      wxT("can't sort in ascending and descending orders at once") );
+                      _T("can't sort in ascending and descending orders at once") );
     }
     else if ( style & wxLC_SORT_DESCENDING )
         wstyle |= LVS_SORTDESCENDING;
@@ -414,11 +462,17 @@ void wxListCtrl::UpdateStyle()
 
 void wxListCtrl::FreeAllInternalData()
 {
-    const unsigned count = m_internalData.size();
-    for ( unsigned n = 0; n < count; n++ )
-        delete m_internalData[n];
+    if (m_AnyInternalData)
+    {
+        int n = GetItemCount();
 
-    m_internalData.clear();
+        m_ignoreChangeMessages = true;
+        for (int i = 0; i < n; i++)
+            wxDeleteInternalData(this, i);
+        m_ignoreChangeMessages = false;
+
+        m_AnyInternalData = false;
+    }
 }
 
 void wxListCtrl::DeleteEditControl()
@@ -427,7 +481,8 @@ void wxListCtrl::DeleteEditControl()
     {
         m_textCtrl->UnsubclassWin();
         m_textCtrl->SetHWND(0);
-        wxDELETE(m_textCtrl);
+        delete m_textCtrl;
+        m_textCtrl = NULL;
     }
 }
 
@@ -478,7 +533,7 @@ void wxListCtrl::SetWindowStyleFlag(long flag)
 {
     if ( flag != m_windowStyle )
     {
-        wxListCtrlBase::SetWindowStyleFlag(flag);
+        wxControl::SetWindowStyleFlag(flag);
 
         UpdateStyle();
 
@@ -624,67 +679,6 @@ bool wxListCtrl::SetColumnWidth(int col, int width)
     return ListView_SetColumnWidth(GetHwnd(), col, width) != 0;
 }
 
-// ----------------------------------------------------------------------------
-// columns order
-// ----------------------------------------------------------------------------
-
-int wxListCtrl::GetColumnIndexFromOrder(int order) const
-{
-    const int numCols = GetColumnCount();
-    wxCHECK_MSG( order >= 0 && order < numCols, -1,
-                wxT("Column position out of bounds") );
-
-    wxArrayInt indexArray(numCols);
-    if ( !ListView_GetColumnOrderArray(GetHwnd(), numCols, &indexArray[0]) )
-        return -1;
-
-    return indexArray[order];
-}
-
-int wxListCtrl::GetColumnOrder(int col) const
-{
-    const int numCols = GetColumnCount();
-    wxASSERT_MSG( col >= 0 && col < numCols, wxT("Column index out of bounds") );
-
-    wxArrayInt indexArray(numCols);
-    if ( !ListView_GetColumnOrderArray(GetHwnd(), numCols, &indexArray[0]) )
-        return -1;
-
-    for ( int pos = 0; pos < numCols; pos++ )
-    {
-        if ( indexArray[pos] == col )
-            return pos;
-    }
-
-    wxFAIL_MSG( wxT("no column with with given order?") );
-
-    return -1;
-}
-
-// Gets the column order for all columns
-wxArrayInt wxListCtrl::GetColumnsOrder() const
-{
-    const int numCols = GetColumnCount();
-
-    wxArrayInt orders(numCols);
-    if ( !ListView_GetColumnOrderArray(GetHwnd(), numCols, &orders[0]) )
-        orders.clear();
-
-    return orders;
-}
-
-// Sets the column order for all columns
-bool wxListCtrl::SetColumnsOrder(const wxArrayInt& orders)
-{
-    const int numCols = GetColumnCount();
-
-    wxCHECK_MSG( orders.size() == (size_t)numCols, false,
-                    wxT("wrong number of elements in column orders array") );
-
-    return ListView_SetColumnOrderArray(GetHwnd(), numCols, &orders[0]) != 0;
-}
-
-
 // Gets the number of items that can fit vertically in the
 // visible area of the list control (list or report view)
 // or the total number of items in the list control (icon
@@ -708,7 +702,7 @@ wxTextCtrl* wxListCtrl::GetEditControl() const
         HWND hwndEdit = ListView_GetEditControl(GetHwnd());
         if ( hwndEdit )
         {
-            wxListCtrl * const self = const_cast<wxListCtrl *>(this);
+            wxListCtrl * const self = wx_const_cast(wxListCtrl *, this);
 
             if ( !m_textCtrl )
                 self->m_textCtrl = new wxTextCtrl;
@@ -774,33 +768,34 @@ bool wxListCtrl::SetItem(wxListItem& info)
 {
     const long id = info.GetId();
     wxCHECK_MSG( id >= 0 && id < GetItemCount(), false,
-                 wxT("invalid item index in SetItem") );
+                 _T("invalid item index in SetItem") );
 
     LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);
 
     // we never update the lParam if it contains our pointer
-    // to the wxMSWListItemData structure
+    // to the wxListItemInternalData structure
     item.mask &= ~LVIF_PARAM;
 
     // check if setting attributes or lParam
-    if ( info.HasAttributes() || (info.m_mask & wxLIST_MASK_DATA) )
+    if (info.HasAttributes() || (info.m_mask  & wxLIST_MASK_DATA))
     {
         // get internal item data
-        wxMSWListItemData *data = MSWGetItemData(id);
+        // perhaps a cache here ?
+        wxListItemInternalData *data = wxGetInternalData(this, id);
 
-        if ( !data )
+        if (! data)
         {
-            // need to allocate the internal data object
-            data = new wxMSWListItemData;
-            m_internalData.push_back(data);
+            // need to set it
+            m_AnyInternalData = true;
+            data = new wxListItemInternalData();
             item.lParam = (LPARAM) data;
             item.mask |= LVIF_PARAM;
-        }
+        };
 
 
         // user data
-        if ( info.m_mask & wxLIST_MASK_DATA )
+        if (info.m_mask  & wxLIST_MASK_DATA)
             data->lParam = info.m_data;
 
         // attributes
@@ -813,17 +808,18 @@ bool wxListCtrl::SetItem(wxListItem& info)
                 data->attr->AssignFrom(attrNew);
             else
                 data->attr = new wxListItemAttr(attrNew);
-        }
-    }
+        };
+    };
 
 
     // we could be changing only the attribute in which case we don't need to
     // call ListView_SetItem() at all
     if ( item.mask )
     {
+        item.cchTextMax = 0;
         if ( !ListView_SetItem(GetHwnd(), &item) )
         {
-            wxLogDebug(wxT("ListView_SetItem() failed"));
+            wxLogDebug(_T("ListView_SetItem() failed"));
 
             return false;
         }
@@ -891,15 +887,14 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
 
     wxConvertToMSWFlags(state, stateMask, lvItem);
 
-    const bool changingFocus = (stateMask & wxLIST_STATE_FOCUSED) &&
-                                    (state & wxLIST_STATE_FOCUSED);
-
     // for the virtual list controls we need to refresh the previously focused
     // item manually when changing focus without changing selection
     // programmatically because otherwise it keeps its focus rectangle until
     // next repaint (yet another comctl32 bug)
     long focusOld;
-    if ( IsVirtual() && changingFocus )
+    if ( IsVirtual() &&
+         (stateMask & wxLIST_STATE_FOCUSED) &&
+         (state & wxLIST_STATE_FOCUSED) )
     {
         focusOld = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
     }
@@ -911,7 +906,7 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
     if ( !::SendMessage(GetHwnd(), LVM_SETITEMSTATE,
                         (WPARAM)item, (LPARAM)&lvItem) )
     {
-        wxLogLastError(wxT("ListView_SetItemState"));
+        wxLogLastError(_T("ListView_SetItemState"));
 
         return false;
     }
@@ -927,16 +922,6 @@ bool wxListCtrl::SetItemState(long item, long state, long stateMask)
         }
     }
 
-    // we expect the selection anchor, i.e. the item from which multiple
-    // selection (such as performed with e.g. Shift-arrows) starts, to be the
-    // same as the currently focused item but the native control doesn't update
-    // it when we change focus and leaves at the last item it set itself focus
-    // to, so do it explicitly
-    if ( changingFocus && !HasFlag(wxLC_SINGLE_SEL) )
-    {
-        ListView_SetSelectionMark(GetHwnd(), item);
-    }
-
     return true;
 }
 
@@ -960,13 +945,12 @@ bool wxListCtrl::SetItemColumnImage(long item, long column, int image)
 }
 
 // Gets the item text
-wxString wxListCtrl::GetItemText(long item, int col) const
+wxString wxListCtrl::GetItemText(long item) const
 {
     wxListItem info;
 
     info.m_mask = wxLIST_MASK_TEXT;
     info.m_itemId = item;
-    info.m_col = col;
 
     if (!GetItem(info))
         return wxEmptyString;
@@ -985,19 +969,6 @@ void wxListCtrl::SetItemText(long item, const wxString& str)
     SetItem(info);
 }
 
-// Gets the internal item data
-wxMSWListItemData *wxListCtrl::MSWGetItemData(long itemId) const
-{
-    LV_ITEM it;
-    it.mask = LVIF_PARAM;
-    it.iItem = itemId;
-
-    if ( !ListView_GetItem(GetHwnd(), &it) )
-        return NULL;
-
-    return (wxMSWListItemData *) it.lParam;
-}
-
 // Gets the item data
 wxUIntPtr wxListCtrl::GetItemData(long item) const
 {
@@ -1023,42 +994,26 @@ bool wxListCtrl::SetItemPtrData(long item, wxUIntPtr data)
     return SetItem(info);
 }
 
+bool wxListCtrl::SetItemData(long item, long data)
+{
+    return SetItemPtrData(item, data);
+}
+
 wxRect wxListCtrl::GetViewRect() const
 {
+    wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST),
+                    _T("wxListCtrl::GetViewRect() only works in icon mode") );
+
+    RECT rc;
+    if ( !ListView_GetViewRect(GetHwnd(), &rc) )
+    {
+        wxLogDebug(_T("ListView_GetViewRect() failed."));
+
+        wxZeroMemory(rc);
+    }
+
     wxRect rect;
-
-    // ListView_GetViewRect() can only be used in icon and small icon views
-    // (this is documented in MSDN and, indeed, it returns bogus results in
-    // report view, at least with comctl32.dll v6 under Windows 2003)
-    if ( HasFlag(wxLC_ICON | wxLC_SMALL_ICON) )
-    {
-        RECT rc;
-        if ( !ListView_GetViewRect(GetHwnd(), &rc) )
-        {
-            wxLogDebug(wxT("ListView_GetViewRect() failed."));
-
-            wxZeroMemory(rc);
-        }
-
-        wxCopyRECTToRect(rc, rect);
-    }
-    else if ( HasFlag(wxLC_REPORT) )
-    {
-        const long count = GetItemCount();
-        if ( count )
-        {
-            GetItemRect(wxMin(GetTopItem() + GetCountPerPage(), count - 1), rect);
-
-            // extend the rectangle to start at the top (we include the column
-            // headers, if any, for compatibility with the generic version)
-            rect.height += rect.y;
-            rect.y = 0;
-        }
-    }
-    else
-    {
-        wxFAIL_MSG( wxT("not implemented in this mode") );
-    }
+    wxCopyRECTToRect(rc, rect);
 
     return rect;
 }
@@ -1069,18 +1024,22 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
     return GetSubItemRect( item, wxLIST_GETSUBITEMRECT_WHOLEITEM, rect, code) ;
 }
 
+/*!
+ * Retrieve coordinates and size of a specified subitem of a listview control.
+ * This function only works if the listview control is in the report mode.
+ *
+ * @param item : Item number
+ * @param subItem : Subitem or column number, use -1 for the whole row including
+ *                  all columns or subitems
+ * @param rect : A pointer to an allocated wxRect object
+ * @param code : Specify the part of the subitem coordinates you need. Choices are
+ *               wxLIST_RECT_BOUNDS, wxLIST_RECT_ICON, wxLIST_RECT_LABEL
+ *
+ * @return bool  : True if successful.
+ */
 bool wxListCtrl::GetSubItemRect(long item, long subItem, wxRect& rect, int code) const
 {
-    // ListView_GetSubItemRect() doesn't do subItem error checking and returns
-    // true even for the out of range values of it (even if the results are
-    // completely bogus in this case), so we check item validity ourselves
-    wxCHECK_MSG( subItem == wxLIST_GETSUBITEMRECT_WHOLEITEM ||
-                    (subItem >= 0 && subItem < GetColumnCount()),
-                 false, wxT("invalid sub item index") );
-
-    // use wxCHECK_MSG against "item" too, for coherency with the generic implementation:
-    wxCHECK_MSG( item >= 0 && item < GetItemCount(), false,
-                 wxT("invalid item in GetSubItemRect") );
+    RECT rectWin;
 
     int codeWin;
     if ( code == wxLIST_RECT_BOUNDS )
@@ -1091,32 +1050,31 @@ bool wxListCtrl::GetSubItemRect(long item, long subItem, wxRect& rect, int code)
         codeWin = LVIR_LABEL;
     else
     {
-        wxFAIL_MSG( wxT("incorrect code in GetItemRect() / GetSubItemRect()") );
+        wxFAIL_MSG( _T("incorrect code in GetItemRect() / GetSubItemRect()") );
         codeWin = LVIR_BOUNDS;
     }
 
-    RECT rectWin;
-    if ( !wxGetListCtrlSubItemRect
-          (
-            GetHwnd(),
-            item,
-            subItem == wxLIST_GETSUBITEMRECT_WHOLEITEM ? 0 : subItem,
-            codeWin,
-            rectWin
-          ) )
+    bool success;
+    if( subItem == wxLIST_GETSUBITEMRECT_WHOLEITEM)
     {
-        return false;
+      success = ListView_GetItemRect(GetHwnd(), (int) item, &rectWin, codeWin) != 0;
+    }
+    else if( subItem >= 0)
+    {
+      success = ListView_GetSubItemRect( GetHwnd(), (int) item, (int) subItem, codeWin, &rectWin) != 0;
+    }
+    else
+    {
+      wxFAIL_MSG( _T("incorrect subItem number in GetSubItemRect()") );
+      return false;
     }
 
-    wxCopyRECTToRect(rectWin, rect);
+    rect.x = rectWin.left;
+    rect.y = rectWin.top;
+    rect.width = rectWin.right - rectWin.left;
+    rect.height = rectWin.bottom - rectWin.top;
 
-    // there is no way to retrieve the first sub item bounding rectangle using
-    // wxGetListCtrlSubItemRect() as 0 means the whole item, so we need to
-    // truncate it at first column ourselves
-    if ( subItem == 0 && code == wxLIST_RECT_BOUNDS )
-        rect.width = GetColumnWidth(0);
-
-    return true;
+    return success;
 }
 
 
@@ -1172,7 +1130,7 @@ void wxListCtrl::SetItemTextColour( long item, const wxColour &col )
 wxColour wxListCtrl::GetItemTextColour( long item ) const
 {
     wxColour col;
-    wxMSWListItemData *data = MSWGetItemData(item);
+    wxListItemInternalData *data = wxGetInternalData(this, item);
     if ( data && data->attr )
         col = data->attr->GetTextColour();
 
@@ -1190,7 +1148,7 @@ void wxListCtrl::SetItemBackgroundColour( long item, const wxColour &col )
 wxColour wxListCtrl::GetItemBackgroundColour( long item ) const
 {
     wxColour col;
-    wxMSWListItemData *data = MSWGetItemData(item);
+    wxListItemInternalData *data = wxGetInternalData(this, item);
     if ( data && data->attr )
         col = data->attr->GetBackgroundColour();
 
@@ -1208,7 +1166,7 @@ void wxListCtrl::SetItemFont( long item, const wxFont &f )
 wxFont wxListCtrl::GetItemFont( long item ) const
 {
     wxFont f;
-    wxMSWListItemData *data = MSWGetItemData(item);
+    wxListItemInternalData *data = wxGetInternalData(this, item);
     if ( data && data->attr )
         f = data->attr->GetFont();
 
@@ -1333,29 +1291,6 @@ void wxListCtrl::AssignImageList(wxImageList *imageList, int which)
         m_ownsImageListState = true;
 }
 
-// ----------------------------------------------------------------------------
-// Geometry
-// ----------------------------------------------------------------------------
-
-wxSize wxListCtrl::MSWGetBestViewRect(int x, int y) const
-{
-    const DWORD rc = ListView_ApproximateViewRect(GetHwnd(), x, y, -1);
-
-    wxSize size(LOWORD(rc), HIWORD(rc));
-
-    // We have to add space for the scrollbars ourselves, they're not taken
-    // into account by ListView_ApproximateViewRect(), at least not with
-    // commctrl32.dll v6.
-    const DWORD mswStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
-
-    if ( mswStyle & WS_HSCROLL )
-        size.y += wxSystemSettings::GetMetric(wxSYS_HSCROLL_Y);
-    if ( mswStyle & WS_VSCROLL )
-        size.x += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-
-    return size;
-}
-
 // ----------------------------------------------------------------------------
 // Operations
 // ----------------------------------------------------------------------------
@@ -1381,7 +1316,7 @@ bool wxListCtrl::DeleteItem(long item)
 {
     if ( !ListView_DeleteItem(GetHwnd(), (int) item) )
     {
-        wxLogLastError(wxT("ListView_DeleteItem"));
+        wxLogLastError(_T("ListView_DeleteItem"));
         return false;
     }
 
@@ -1417,9 +1352,7 @@ bool wxListCtrl::DeleteItem(long item)
 // Deletes all items
 bool wxListCtrl::DeleteAllItems()
 {
-    // Calling ListView_DeleteAllItems() will always generate an event but we
-    // shouldn't do it if the control is empty
-    return !GetItemCount() || ListView_DeleteAllItems(GetHwnd()) != 0;
+    return ListView_DeleteAllItems(GetHwnd()) != 0;
 }
 
 // Deletes all items
@@ -1466,7 +1399,7 @@ void wxListCtrl::InitEditControl(WXHWND hWnd)
     m_textCtrl->SubclassWin(hWnd);
     m_textCtrl->SetParent(this);
 
-    // we must disallow TABbing away from the control while the edit control is
+    // we must disallow TABbing away from the control while the edit contol is
     // shown because this leaves it in some strange state (just try removing
     // this line and then pressing TAB while editing an item in  listctrl
     // inside a panel)
@@ -1475,8 +1408,8 @@ void wxListCtrl::InitEditControl(WXHWND hWnd)
 
 wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
 {
-    wxCHECK_MSG( textControlClass->IsKindOf(wxCLASSINFO(wxTextCtrl)), NULL,
-                  "control used for label editing must be a wxTextCtrl" );
+    wxCHECK_MSG( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)), NULL,
+                  wxT("control used for label editing must be a wxTextCtrl") );
 
     // ListView_EditLabel requires that the list has focus.
     SetFocus();
@@ -1493,7 +1426,8 @@ wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
     if ( !hWnd )
     {
         // failed to start editing
-        wxDELETE(m_textCtrl);
+        delete m_textCtrl;
+        m_textCtrl = NULL;
 
         return NULL;
     }
@@ -1514,15 +1448,14 @@ bool wxListCtrl::EndEditLabel(bool cancel)
     if ( !hwnd )
         return false;
 
-    // Newer versions of Windows have a special ListView_CancelEditLabel()
-    // message for cancelling editing but it, rather counter-intuitively, keeps
-    // the last text entered in the dialog while cancelling as we do it below
-    // restores the original text which is the more expected behaviour.
+    if ( cancel )
+        ::SetWindowText(hwnd, wxEmptyString); // dubious but better than nothing
 
-    // We shouldn't destroy the control ourselves according to MSDN, which
-    // proposes WM_CANCELMODE to do this, but it doesn't seem to work so
-    // emulate the corresponding user action instead.
-    ::SendMessage(hwnd, WM_KEYDOWN, cancel ? VK_ESCAPE : VK_RETURN, 0);
+    // we shouldn't destroy the control ourselves according to MSDN, which
+    // proposes WM_CANCELMODE to do this, but it doesn't seem to work
+    //
+    // posting WM_CLOSE to it does seem to work without any side effects
+    ::PostMessage(hwnd, WM_CLOSE, 0, 0);
 
     return true;
 }
@@ -1542,53 +1475,34 @@ long wxListCtrl::FindItem(long start, const wxString& str, bool partial)
     findInfo.flags = LVFI_STRING;
     if ( partial )
         findInfo.flags |= LVFI_PARTIAL;
-    findInfo.psz = str.t_str();
+    findInfo.psz = str;
 
     // ListView_FindItem() excludes the first item from search and to look
     // through all the items you need to start from -1 which is unnatural and
     // inconsistent with the generic version - so we adjust the index
     if (start != -1)
         start --;
-    return ListView_FindItem(GetHwnd(), start, &findInfo);
+    return ListView_FindItem(GetHwnd(), (int) start, &findInfo);
 }
 
-// Find an item whose data matches this data, starting from the item after
-// 'start' or the beginning if 'start' is -1.
+// Find an item whose data matches this data, starting from the item after 'start'
+// or the beginning if 'start' is -1.
+// NOTE : Lindsay Mathieson - 14-July-2002
+//        No longer use ListView_FindItem as the data attribute is now stored
+//        in a wxListItemInternalData structure refernced by the actual lParam
 long wxListCtrl::FindItem(long start, wxUIntPtr data)
 {
-    // we can't use ListView_FindItem() directly as we don't store the data
-    // pointer itself in the control but rather our own internal data, so first
-    // we need to find the right value to search for (and there can be several
-    // of them)
-    int idx = wxNOT_FOUND;
-    const unsigned count = m_internalData.size();
-    for ( unsigned n = 0; n < count; n++ )
+    long  idx = start + 1;
+    long count = GetItemCount();
+
+    while (idx < count)
     {
-        if ( m_internalData[n]->lParam == (LPARAM)data )
-        {
-            LV_FINDINFO findInfo;
-            findInfo.flags = LVFI_PARAM;
-            findInfo.lParam = (LPARAM)wxPtrToUInt(m_internalData[n]);
+        if (GetItemData(idx) == data)
+            return idx;
+        idx++;
+    };
 
-            int rc = ListView_FindItem(GetHwnd(), start, &findInfo);
-            if ( rc != -1 )
-            {
-                if ( idx == wxNOT_FOUND || rc < idx )
-                {
-                    idx = rc;
-                    if ( idx == start + 1 )
-                    {
-                        // we can stop here, we don't risk finding a closer
-                        // match
-                        break;
-                    }
-                }
-                //else: this item is after the previously found one
-            }
-        }
-    }
-
-    return idx;
+    return -1;
 }
 
 // Find an item nearest this position in the specified direction, starting from
@@ -1611,7 +1525,7 @@ long wxListCtrl::FindItem(long start, const wxPoint& pt, int direction)
     else if ( direction == wxLIST_FIND_RIGHT )
         findInfo.vkDirection = VK_RIGHT;
 
-    return ListView_FindItem(GetHwnd(), start, &findInfo);
+    return ListView_FindItem(GetHwnd(), (int) start, & findInfo);
 }
 
 // Determines which item (if any) is at the specified point,
@@ -1677,30 +1591,24 @@ wxListCtrl::HitTest(const wxPoint& point, int& flags, long *ptrSubItem) const
 // -1 otherwise.
 long wxListCtrl::InsertItem(const wxListItem& info)
 {
-    wxASSERT_MSG( !IsVirtual(), wxT("can't be used with virtual controls") );
-
-    // In 2.8 it was possible to succeed inserting an item without initializing
-    // its ID as it defaulted to 0. This was however never supported and in 2.9
-    // the ID is -1 by default and inserting it simply fails, but it might be
-    // not obvious why does it happen, so check it proactively.
-    wxASSERT_MSG( info.m_itemId != -1, wxS("Item ID must be set.") );
+    wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual controls") );
 
     LV_ITEM item;
     wxConvertToMSWListItem(this, info, item);
     item.mask &= ~LVIF_PARAM;
 
-    // check whether we need to allocate our internal data
-    bool needInternalData = (info.m_mask & wxLIST_MASK_DATA) ||
-                                info.HasAttributes();
-    if ( needInternalData )
+    // check wether we need to allocate our internal data
+    bool needInternalData = ((info.m_mask & wxLIST_MASK_DATA) || info.HasAttributes());
+    if (needInternalData)
     {
+        m_AnyInternalData = true;
         item.mask |= LVIF_PARAM;
 
-        wxMSWListItemData * const data = new wxMSWListItemData;
-        m_internalData.push_back(data);
-        item.lParam = (LPARAM)data;
+        // internal stucture that manages data
+        wxListItemInternalData *data = new wxListItemInternalData();
+        item.lParam = (LPARAM) data;
 
-        if ( info.m_mask & wxLIST_MASK_DATA )
+        if (info.m_mask & wxLIST_MASK_DATA)
             data->lParam = info.m_data;
 
         // check whether it has any custom attributes
@@ -1712,12 +1620,9 @@ long wxListCtrl::InsertItem(const wxListItem& info)
             // and remember that we have some now...
             m_hasAnyAttr = true;
         }
-    }
+    };
 
-    const long rv = ListView_InsertItem(GetHwnd(), & item);
-
-    // failing to insert the item is really unexpected
-    wxCHECK_MSG( rv != -1, rv, "failed to insert an item in wxListCtrl" );
+    long rv = ListView_InsertItem(GetHwnd(), & item);
 
     m_count++;
     wxASSERT_MSG( m_count == ListView_GetItemCount(GetHwnd()),
@@ -1751,27 +1656,18 @@ long wxListCtrl::InsertItem(long index, const wxString& label, int imageIndex)
     wxListItem info;
     info.m_image = imageIndex;
     info.m_text = label;
-    info.m_mask = wxLIST_MASK_TEXT;
-    if (imageIndex > -1)
-        info.m_mask |= wxLIST_MASK_IMAGE;
+    info.m_mask = wxLIST_MASK_IMAGE | wxLIST_MASK_TEXT;
     info.m_itemId = index;
     return InsertItem(info);
 }
 
 // For list view mode (only), inserts a column.
-long wxListCtrl::DoInsertColumn(long col, const wxListItem& item)
+long wxListCtrl::InsertColumn(long col, const wxListItem& item)
 {
     LV_COLUMN lvCol;
     wxConvertToMSWListCol(GetHwnd(), col, item, lvCol);
 
-    // LVSCW_AUTOSIZE_USEHEADER is not supported when inserting new column,
-    // we'll deal with it below instead. Plain LVSCW_AUTOSIZE is not supported
-    // neither but it doesn't need any special handling as we use fixed value
-    // for it here, both because we can't do anything else (there are no items
-    // with values in this column to compute the size from yet) and for
-    // compatibility as wxLIST_AUTOSIZE == -1 and -1 as InsertColumn() width
-    // parameter used to mean "arbitrary fixed width".
-    if ( !(lvCol.mask & LVCF_WIDTH) || lvCol.cx < 0 )
+    if ( !(lvCol.mask & LVCF_WIDTH) )
     {
         // always give some width to the new column: this one is compatible
         // with the generic version
@@ -1780,32 +1676,44 @@ long wxListCtrl::DoInsertColumn(long col, const wxListItem& item)
     }
 
     long n = ListView_InsertColumn(GetHwnd(), col, &lvCol);
-    if ( n == -1 )
+    if ( n != -1 )
+    {
+        m_colCount++;
+    }
+    else // failed to insert?
     {
         wxLogDebug(wxT("Failed to insert the column '%s' into listview!"),
                    lvCol.pszText);
-        return -1;
-    }
-
-    m_colCount++;
-
-    // Now adjust the new column size.
-    if ( (item.GetMask() & wxLIST_MASK_WIDTH) &&
-            (item.GetWidth() == wxLIST_AUTOSIZE_USEHEADER) )
-    {
-        SetColumnWidth(n, wxLIST_AUTOSIZE_USEHEADER);
     }
 
     return n;
 }
 
+long wxListCtrl::InsertColumn(long col,
+                              const wxString& heading,
+                              int format,
+                              int width)
+{
+    wxListItem item;
+    item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
+    item.m_text = heading;
+    if ( width > -1 )
+    {
+        item.m_mask |= wxLIST_MASK_WIDTH;
+        item.m_width = width;
+    }
+    item.m_format = format;
+
+    return InsertColumn(col, item);
+}
+
 // scroll the control by the given number of pixels (exception: in list view,
 // dx is interpreted as number of columns)
 bool wxListCtrl::ScrollList(int dx, int dy)
 {
     if ( !ListView_Scroll(GetHwnd(), dx, dy) )
     {
-        wxLogDebug(wxT("ListView_Scroll(%d, %d) failed"), dx, dy);
+        wxLogDebug(_T("ListView_Scroll(%d, %d) failed"), dx, dy);
 
         return false;
     }
@@ -1832,26 +1740,26 @@ bool wxListCtrl::ScrollList(int dx, int dy)
 struct wxInternalDataSort
 {
     wxListCtrlCompare user_fn;
-    wxIntPtr data;
+    long data;
 };
 
 int CALLBACK wxInternalDataCompareFunc(LPARAM lParam1, LPARAM lParam2,  LPARAM lParamSort)
 {
-    wxInternalDataSort * const internalData = (wxInternalDataSort *) lParamSort;
+    struct wxInternalDataSort *internalData = (struct wxInternalDataSort *) lParamSort;
 
-    wxMSWListItemData *data1 = (wxMSWListItemData *) lParam1;
-    wxMSWListItemData *data2 = (wxMSWListItemData *) lParam2;
+    wxListItemInternalData *data1 = (wxListItemInternalData *) lParam1;
+    wxListItemInternalData *data2 = (wxListItemInternalData *) lParam2;
 
-    wxIntPtr d1 = (data1 == NULL ? 0 : data1->lParam);
-    wxIntPtr d2 = (data2 == NULL ? 0 : data2->lParam);
+    long d1 = (data1 == NULL ? 0 : data1->lParam);
+    long d2 = (data2 == NULL ? 0 : data2->lParam);
 
     return internalData->user_fn(d1, d2, internalData->data);
 
 }
 
-bool wxListCtrl::SortItems(wxListCtrlCompare fn, wxIntPtr data)
+bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
 {
-    wxInternalDataSort internalData;
+    struct wxInternalDataSort internalData;
     internalData.user_fn = fn;
     internalData.data = data;
 
@@ -1860,7 +1768,7 @@ bool wxListCtrl::SortItems(wxListCtrlCompare fn, wxIntPtr data)
                              wxInternalDataCompareFunc,
                              (WPARAM) &internalData) )
     {
-        wxLogDebug(wxT("ListView_SortItems() failed"));
+        wxLogDebug(_T("ListView_SortItems() failed"));
 
         return false;
     }
@@ -1878,20 +1786,22 @@ bool wxListCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
 {
     if ( msg->message == WM_KEYDOWN )
     {
-        // Only eat VK_RETURN if not being used by the application in
-        // conjunction with modifiers
-        if ( msg->wParam == VK_RETURN && !wxIsAnyModifierDown() )
+        if ( msg->wParam == VK_RETURN )
         {
-            // we need VK_RETURN to generate wxEVT_COMMAND_LIST_ITEM_ACTIVATED
+            // We need VK_RETURN to generate wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
+            // but only if none of the modifiers is down.  We'll let normal
+            // accelerators handle those.
+            if ( !wxIsCtrlDown() && !wxIsShiftDown() &&
+                 !((HIWORD(msg->lParam) & KF_ALTDOWN) == KF_ALTDOWN))
             return false;
         }
     }
-    return wxListCtrlBase::MSWShouldPreProcessMessage(msg);
+
+    return wxControl::MSWShouldPreProcessMessage(msg);
 }
 
-bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
+bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id)
 {
-    const int id = (signed short)id_;
     if (cmd == EN_UPDATE)
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
@@ -1910,54 +1820,6 @@ bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
         return false;
 }
 
-// utility used by wxListCtrl::MSWOnNotify and by wxDataViewHeaderWindowMSW::MSWOnNotify
-int WXDLLIMPEXP_CORE wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick)
-{
-    // find the column clicked: we have to search for it ourselves as the
-    // notification message doesn't provide this info
-
-    // where did the click occur?
-#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
-    if ( nmhdr->code == GN_CONTEXTMENU )
-    {
-        *ptClick = ((NMRGINFO*)nmhdr)->ptAction;
-    }
-    else
-#endif //__WXWINCE__
-    {
-       wxGetCursorPosMSW(ptClick);
-    }
-
-    // we need to use listctrl coordinates for the event point so this is what
-    // we return in ptClick, but for comparison with Header_GetItemRect()
-    // result below we need to use header window coordinates
-    POINT ptClickHeader = *ptClick;
-    if ( !::ScreenToClient(nmhdr->hwndFrom, &ptClickHeader) )
-    {
-        wxLogLastError(wxT("ScreenToClient(listctrl header)"));
-    }
-
-    if ( !::ScreenToClient(::GetParent(nmhdr->hwndFrom), ptClick) )
-    {
-        wxLogLastError(wxT("ScreenToClient(listctrl)"));
-    }
-
-    const int colCount = Header_GetItemCount(nmhdr->hwndFrom);
-    for ( int col = 0; col < colCount; col++ )
-    {
-        RECT rect;
-        if ( Header_GetItemRect(nmhdr->hwndFrom, col, &rect) )
-        {
-            if ( ::PtInRect(&rect, ptClickHeader) )
-            {
-                return col;
-            }
-        }
-    }
-
-    return wxNOT_FOUND;
-}
-
 bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
 
@@ -1986,50 +1848,29 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         event.m_itemIndex = -1;
 
-        bool ignore = false;
         switch ( nmhdr->code )
         {
             // yet another comctl32.dll bug: under NT/W2K it sends Unicode
             // TRACK messages even to ANSI programs: on my system I get
-            // HDN_BEGINTRACKW and HDN_ENDTRACKA!
+            // HDN_BEGINTRACKW and HDN_ENDTRACKA and no HDN_TRACK at all!
             //
             // work around is to simply catch both versions and hope that it
             // works (why should this message exist in ANSI and Unicode is
             // beyond me as it doesn't deal with strings at all...)
             //
-            // another problem is that HDN_TRACK is not sent at all by header
-            // with HDS_FULLDRAG style which is used by default by wxListCtrl
-            // under recent Windows versions (starting from at least XP) so we
-            // need to use HDN_ITEMCHANGING instead of it
+            // note that fr HDN_TRACK another possibility could be to use
+            // HDN_ITEMCHANGING but it is sent even after HDN_ENDTRACK and when
+            // something other than the item width changes so we'd have to
+            // filter out the unwanted events then
             case HDN_BEGINTRACKA:
             case HDN_BEGINTRACKW:
                 eventType = wxEVT_COMMAND_LIST_COL_BEGIN_DRAG;
                 // fall through
 
-            case HDN_ITEMCHANGING:
+            case HDN_TRACKA:
+            case HDN_TRACKW:
                 if ( eventType == wxEVT_NULL )
-                {
-                    if ( !nmHDR->pitem || !(nmHDR->pitem->mask & HDI_WIDTH) )
-                    {
-                        // something other than the width is being changed,
-                        // ignore it
-                        ignore = true;
-                        break;
-                    }
-
-                    // also ignore the events sent when the width didn't really
-                    // change: this is not just an optimization but also gets
-                    // rid of a useless and unexpected DRAGGING event which
-                    // would otherwise be sent after the END_DRAG one as we get
-                    // an HDN_ITEMCHANGING after HDN_ENDTRACK for some reason
-                    if ( nmHDR->pitem->cxy == GetColumnWidth(nmHDR->iItem) )
-                    {
-                        ignore = true;
-                        break;
-                    }
-
                     eventType = wxEVT_COMMAND_LIST_COL_DRAGGING;
-                }
                 // fall through
 
             case HDN_ENDTRACKA:
@@ -2046,12 +1887,59 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #endif //__WXWINCE__
             case NM_RCLICK:
                 {
-                    POINT ptClick;
-
                     eventType = wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;
-                    event.m_col = wxMSWGetColumnClicked(nmhdr, &ptClick);
-                    event.m_pointDrag.x = ptClick.x;
-                    event.m_pointDrag.y = ptClick.y;
+                    event.m_col = -1;
+
+                    // find the column clicked: we have to search for it
+                    // ourselves as the notification message doesn't provide
+                    // this info
+
+                    // where did the click occur?
+                    POINT ptClick;
+#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
+                    if ( nmhdr->code == GN_CONTEXTMENU )
+                    {
+                        ptClick = ((NMRGINFO*)nmhdr)->ptAction;
+                    }
+                    else
+#endif //__WXWINCE__
+                    if ( !::GetCursorPos(&ptClick) )
+                    {
+                        wxLogLastError(_T("GetCursorPos"));
+                    }
+
+                    // we need to use listctrl coordinates for the event point
+                    // but for comparison with Header_GetItemRect() result
+                    // below we need to use header window coordinates
+                    POINT ptClickList = ptClick;
+                    if ( ::ScreenToClient(GetHwnd(), &ptClickList) )
+                    {
+                        event.m_pointDrag.x = ptClickList.x;
+                        event.m_pointDrag.y = ptClickList.y;
+                    }
+                    else
+                    {
+                        wxLogLastError(_T("ScreenToClient(listctrl)"));
+                    }
+
+                    if ( !::ScreenToClient(hwndHdr, &ptClick) )
+                    {
+                        wxLogLastError(_T("ScreenToClient(listctrl header)"));
+                    }
+
+                    const int colCount = Header_GetItemCount(hwndHdr);
+                    for ( int col = 0; col < colCount; col++ )
+                    {
+                        RECT rect;
+                        if ( Header_GetItemRect(hwndHdr, col, &rect) )
+                        {
+                            if ( ::PtInRect(&rect, ptClick) )
+                            {
+                                event.m_col = col;
+                                break;
+                            }
+                        }
+                    }
                 }
                 break;
 
@@ -2061,17 +1949,14 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 // parameters
                 //
                 // I have no idea what is the real cause of the bug (which is,
-                // just to make things interesting, impossible to reproduce
+                // just to make things interesting, is impossible to reproduce
                 // reliably) but ignoring all these messages does fix it and
                 // doesn't seem to have any negative consequences
                 return true;
 
             default:
-                ignore = true;
+                return wxControl::MSWOnNotify(idCtrl, lParam, result);
         }
-
-        if ( ignore )
-            return wxListCtrlBase::MSWOnNotify(idCtrl, lParam, result);
     }
     else
 #endif // defined(HDN_BEGINTRACKA)
@@ -2083,12 +1968,23 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         const int iItem = nmLV->iItem;
 
 
+        // FreeAllInternalData will cause LVN_ITEMCHANG* messages, which can be
+        // ignored for efficiency.  It is done here because the internal data is in the
+        // process of being deleted so we don't want to try and access it below.
+        if ( m_ignoreChangeMessages &&
+             ( (nmLV->hdr.code == LVN_ITEMCHANGED) ||
+               (nmLV->hdr.code == LVN_ITEMCHANGING)) )
+        {
+            return true;
+        }
+
+
         // If we have a valid item then check if there is a data value
         // associated with it and put it in the event.
         if ( iItem >= 0 && iItem < GetItemCount() )
         {
-            wxMSWListItemData *internaldata =
-                MSWGetItemData(iItem);
+            wxListItemInternalData *internaldata =
+                wxGetInternalData(GetHwnd(), iItem);
 
             if ( internaldata )
                 event.m_item.m_data = internaldata->lParam;
@@ -2151,9 +2047,16 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     const LV_ITEM& lvi = (LV_ITEM)item;
                     if ( !lvi.pszText || lvi.iItem == -1 )
                     {
-                        // EDIT control will be deleted by the list control
-                        // itself so prevent us from deleting it as well
-                        DeleteEditControl();
+                        // don't keep a stale wxTextCtrl around
+                        if ( m_textCtrl )
+                        {
+                            // EDIT control will be deleted by the list control itself so
+                            // prevent us from deleting it as well
+                            m_textCtrl->UnsubclassWin();
+                            m_textCtrl->SetHWND(0);
+                            delete m_textCtrl;
+                            m_textCtrl = NULL;
+                        }
 
                         event.SetEditCanceled(true);
                     }
@@ -2185,9 +2088,20 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                 eventType = wxEVT_COMMAND_LIST_DELETE_ITEM;
                 event.m_itemIndex = iItem;
-
+                // delete the assoicated internal data
+                wxDeleteInternalData(this, iItem);
                 break;
 
+#if WXWIN_COMPATIBILITY_2_4
+            case LVN_SETDISPINFO:
+                {
+                    eventType = wxEVT_COMMAND_LIST_SET_INFO;
+                    LV_DISPINFO *info = (LV_DISPINFO *)lParam;
+                    wxConvertFromMSWListItem(GetHwnd(), event.m_item, info->item);
+                }
+                break;
+#endif
+
             case LVN_INSERTITEM:
                 eventType = wxEVT_COMMAND_LIST_INSERT_ITEM;
                 event.m_itemIndex = iItem;
@@ -2227,7 +2141,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                             // focus event from here and the selection one
                             // below
                             event.SetEventType(eventType);
-                            (void)HandleWindowEvent(event);
+                            (void)GetEventHandler()->ProcessEvent(event);
                         }
                         else // no focus event to send
                         {
@@ -2261,11 +2175,12 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                                              wxLIST_STATE_SELECTED);
 
                     // <Enter> or <Space> activate the selected item if any (but
-                    // not with any modifiers as they have a predefined meaning
-                    // then)
+                    // not with modified keys pressed as they have a predefined
+                    // meaning for the list view then)
                     if ( lItem != -1 &&
                          (wVKey == VK_RETURN || wVKey == VK_SPACE) &&
-                         !wxIsAnyModifierDown() )
+                         !(wxIsShiftDown() || wxIsCtrlDown() ||
+                             (GetKeyState(VK_MENU) < 0)) )
                     {
                         eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
                     }
@@ -2273,15 +2188,10 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     {
                         eventType = wxEVT_COMMAND_LIST_KEY_DOWN;
 
-                        event.m_code = wxMSWKeyboard::VKToWX(wVKey);
-
-                        if ( event.m_code == WXK_NONE )
-                        {
-                            // We can't translate this to a standard key code,
-                            // until support for Unicode key codes is added to
-                            // wxListEvent we just ignore them.
-                            return false;
-                        }
+                        // wxCharCodeMSWToWX() returns 0 if the key is an ASCII
+                        // value which should be used as is
+                        int code = wxCharCodeMSWToWX(wVKey);
+                        event.m_code = code ? code : wVKey;
                     }
 
                     event.m_itemIndex =
@@ -2299,7 +2209,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             case NM_DBLCLK:
                 // if the user processes it in wxEVT_COMMAND_LEFT_CLICK(), don't do
                 // anything else
-                if ( wxListCtrlBase::MSWOnNotify(idCtrl, lParam, result) )
+                if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
                 {
                     return true;
                 }
@@ -2324,7 +2234,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             case NM_RCLICK:
                 // if the user processes it in wxEVT_COMMAND_RIGHT_CLICK(),
                 // don't do anything else
-                if ( wxListCtrlBase::MSWOnNotify(idCtrl, lParam, result) )
+                if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
                 {
                     return true;
                 }
@@ -2334,18 +2244,13 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 wxZeroMemory(lvhti);
 
 #if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
-                if ( nmhdr->code == GN_CONTEXTMENU )
-                {
-                    lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction;
-                }
-                else
+              if(nmhdr->code == GN_CONTEXTMENU) {
+                  lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction;
+              } else
 #endif //__WXWINCE__
-                {
-                    wxGetCursorPosMSW(&(lvhti.pt));
-                }
-
-                ::ScreenToClient(GetHwnd(), &lvhti.pt);
-                if ( ListView_HitTest(GetHwnd(), &lvhti) != -1 )
+                ::GetCursorPos(&(lvhti.pt));
+                ::ScreenToClient(GetHwnd(),&(lvhti.pt));
+                if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
                 {
                     if ( lvhti.flags & LVHT_ONITEM )
                     {
@@ -2387,8 +2292,12 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
 #ifdef HAVE_NMLVFINDITEM
             case LVN_ODFINDITEM:
-                // Find an item in a (necessarily virtual) list control.
-                if ( IsVirtual() )
+                // this message is only used with the virtual list control but
+                // even there we don't want to always use it: in a control with
+                // sufficiently big number of items (defined as > 1000 here),
+                // accidentally pressing a key could result in hanging an
+                // application waiting while it performs linear search
+                if ( IsVirtual() && GetItemCount() <= 1000 )
                 {
                     NMLVFINDITEM* pFindInfo = (NMLVFINDITEM*)lParam;
 
@@ -2408,34 +2317,22 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                     // this is the first item we should examine, search from it
                     // wrapping if necessary
-                    int startPos = pFindInfo->iStart;
+                    const int startPos = pFindInfo->iStart;
                     const int maxPos = GetItemCount();
+                    wxCHECK_MSG( startPos <= maxPos, false,
+                                 _T("bad starting position in LVN_ODFINDITEM") );
 
-                    // Check that the index is valid to ensure that our loop
-                    // below always terminates.
-                    if ( startPos < 0 || startPos >= maxPos )
+                    int currentPos = startPos;
+                    do
                     {
-                        // When the last item in the control is selected,
-                        // iStart is really set to (invalid) maxPos index so
-                        // accept this silently.
-                        if ( startPos != maxPos )
+                        // wrap to the beginning if necessary
+                        if ( currentPos == maxPos )
                         {
-                            wxLogDebug(wxT("Ignoring invalid search start ")
-                                       wxT("position %d in list control with ")
-                                       wxT("%d items."), startPos, maxPos);
+                            // somewhat surprizingly, LVFI_WRAP isn't set in
+                            // flags but we still should wrap
+                            currentPos = 0;
                         }
 
-                        startPos = 0;
-                    }
-
-                    // Linear search in a control with a lot of items can take
-                    // a long time so we limit the total time of the search to
-                    // ensure that the program doesn't appear to hang.
-#if wxUSE_STOPWATCH
-                    wxStopWatch sw;
-#endif // wxUSE_STOPWATCH
-                    for ( int currentPos = startPos; ; )
-                    {
                         // does this item begin with searchstr?
                         if ( wxStrnicmp(searchstr,
                                             GetItemText(currentPos), len) == 0 )
@@ -2443,46 +2340,13 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                             *result = currentPos;
                             break;
                         }
+                    }
+                    while ( ++currentPos != startPos );
 
-                        // Go to next item with wrapping if necessary.
-                        if ( ++currentPos == maxPos )
-                        {
-                            // Surprisingly, LVFI_WRAP seems to be never set in
-                            // the flags so wrap regardless of it.
-                            currentPos = 0;
-                        }
-
-                        if ( currentPos == startPos )
-                        {
-                            // We examined all items without finding anything.
-                            //
-                            // Notice that we still return true as we did
-                            // perform the search, if we didn't do this the
-                            // message would have been considered unhandled and
-                            // the control seems to always select the first
-                            // item by default in this case.
-                            return true;
-                        }
-
-#if wxUSE_STOPWATCH
-                        // Check the time elapsed only every thousand
-                        // iterations for performance reasons: if we did it
-                        // more often calling wxStopWatch::Time() could take
-                        // noticeable time on its own.
-                        if ( !((currentPos - startPos)%1000) )
-                        {
-                            // We use half a second to limit the search time
-                            // which is about as long as we can take without
-                            // annoying the user.
-                            if ( sw.Time() > 500 )
-                            {
-                                // As above, return true to prevent the control
-                                // from selecting the first item by default.
-                                return true;
-                            }
-                        }
-#endif // wxUSE_STOPWATCH
-
+                    if ( *result == -1 )
+                    {
+                        // not found
+                        return false;
                     }
 
                     SetItemState(*result,
@@ -2509,7 +2373,8 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     if ( lvi.mask & LVIF_TEXT )
                     {
                         wxString text = OnGetItemText(item, lvi.iSubItem);
-                        wxStrlcpy(lvi.pszText, text.c_str(), lvi.cchTextMax);
+                        wxStrncpy(lvi.pszText, text, lvi.cchTextMax - 1);
+                        lvi.pszText[lvi.cchTextMax - 1] = _T('\0');
                     }
 
                     // see comment at the end of wxListCtrl::GetColumn()
@@ -2537,7 +2402,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         }
 
         if ( !processed )
-            return wxListCtrlBase::MSWOnNotify(idCtrl, lParam, result);
+            return wxControl::MSWOnNotify(idCtrl, lParam, result);
     }
     else
     {
@@ -2550,22 +2415,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
     event.SetEventType(eventType);
 
-    // fill in the item before passing it to the event handler if we do have a
-    // valid item index and haven't filled it yet (e.g. for LVN_ITEMCHANGED)
-    // and we're not using a virtual control as in this case the program
-    // already has the data anyhow and we don't want to call GetItem() for
-    // potentially many items
-    if ( event.m_itemIndex != -1 && !event.m_item.GetMask()
-            && !IsVirtual() )
-    {
-        wxListItem& item = event.m_item;
-
-        item.SetId(event.m_itemIndex);
-        item.SetMask(wxLIST_MASK_TEXT | wxLIST_MASK_IMAGE | wxLIST_MASK_DATA);
-        GetItem(item);
-    }
-
-    bool processed = HandleWindowEvent(event);
+    bool processed = GetEventHandler()->ProcessEvent(event);
 
     // post processing
     // ---------------
@@ -2586,35 +2436,21 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             m_count = 0;
             return true;
 
-        case LVN_DELETEITEM:
-            // Delete the associated internal data. Notice that this can be
-            // done only after the event has been handled as the data could be
-            // accessed during the handling of the event.
-            if ( wxMSWListItemData *data = MSWGetItemData(event.m_itemIndex) )
-            {
-                const unsigned count = m_internalData.size();
-                for ( unsigned n = 0; n < count; n++ )
-                {
-                    if ( m_internalData[n] == data )
-                    {
-                        m_internalData.erase(m_internalData.begin() + n);
-                        wxDELETE(data);
-                        break;
-                    }
-                }
-
-                wxASSERT_MSG( !data, "invalid internal data pointer?" );
-            }
-            break;
-
         case LVN_ENDLABELEDITA:
         case LVN_ENDLABELEDITW:
             // logic here is inverted compared to all the other messages
             *result = event.IsAllowed();
 
-            // EDIT control will be deleted by the list control itself so
-            // prevent us from deleting it as well
-            DeleteEditControl();
+            // don't keep a stale wxTextCtrl around
+            if ( m_textCtrl )
+            {
+                // EDIT control will be deleted by the list control itself so
+                // prevent us from deleting it as well
+                m_textCtrl->UnsubclassWin();
+                m_textCtrl->SetHWND(0);
+                delete m_textCtrl;
+                m_textCtrl = NULL;
+            }
 
             return true;
     }
@@ -2632,13 +2468,19 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 // see comment at the end of wxListCtrl::GetColumn()
 #ifdef NM_CUSTOMDRAW // _WIN32_IE >= 0x0300
 
+#if defined(__VISUALC__) && __VISUALC__ >= 1400 && __VISUALC__ < 1500
+// Turn off optimizations for this function to avoid an ICE in the MSVC8
+// 64-bit compiler, observed with the compiler included with the PDSK-2003.
+// If there is a better way to test for this please do.
+#pragma optimize( "", off )
+#endif
 static RECT GetCustomDrawnItemRect(const NMCUSTOMDRAW& nmcd)
 {
     RECT rc;
-    wxGetListCtrlItemRect(nmcd.hdr.hwndFrom, nmcd.dwItemSpec, LVIR_BOUNDS, rc);
+    ListView_GetItemRect(nmcd.hdr.hwndFrom, nmcd.dwItemSpec, &rc, LVIR_BOUNDS);
 
     RECT rcIcon;
-    wxGetListCtrlItemRect(nmcd.hdr.hwndFrom, nmcd.dwItemSpec, LVIR_ICON, rcIcon);
+    ListView_GetItemRect(nmcd.hdr.hwndFrom, nmcd.dwItemSpec, &rcIcon, LVIR_ICON);
 
     // exclude the icon part, neither the selection background nor focus rect
     // should cover it
@@ -2647,6 +2489,12 @@ static RECT GetCustomDrawnItemRect(const NMCUSTOMDRAW& nmcd)
     return rc;
 }
 
+#if defined(__VISUALC__) && __VISUALC__ >= 1400 && __VISUALC__ < 1500
+// Reset optimizations to their former setting
+#pragma optimize( "", on )
+#endif
+
+
 static
 bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont, int colCount)
 {
@@ -2661,10 +2509,22 @@ bool HandleSubItemPrepaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont, int colCount)
     SelectInHDC selFont(hdc, hfont);
 
     // get the rectangle to paint
-    int subitem = colCount ? col + 1 : col;
     RECT rc;
-    wxGetListCtrlSubItemRect(hwndList, item, subitem, LVIR_BOUNDS, rc);
-    rc.left += 6;
+    ListView_GetSubItemRect(hwndList, item, col, LVIR_BOUNDS, &rc);
+    if ( !col && colCount > 1 )
+    {
+        // broken ListView_GetSubItemRect() returns the entire item rect for
+        // 0th subitem while we really need just the part for this column
+        RECT rc2;
+        ListView_GetSubItemRect(hwndList, item, 1, LVIR_BOUNDS, &rc2);
+
+        rc.right = rc2.left;
+        rc.left += 4;
+    }
+    else // not first subitem
+    {
+        rc.left += 6;
+    }
 
     // get the image and text to draw
     wxChar text[512];
@@ -2777,12 +2637,8 @@ static void HandleItemPaint(LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
     }
 
     // same thing for CDIS_FOCUS (except simpler as there is only one of them)
-    //
-    // NB: cast is needed to work around the bug in mingw32 headers which don't
-    //     have it inside ListView_GetNextItem() itself (unlike SDK ones)
     if ( ::GetFocus() == hwndList &&
-            ListView_GetNextItem(
-                hwndList, static_cast<WPARAM>(-1), LVNI_FOCUSED) == item )
+            ListView_GetNextItem(hwndList, (WPARAM)-1, LVNI_FOCUSED) == item )
     {
         nmcd.uItemState |= CDIS_FOCUS;
     }
@@ -2889,22 +2745,14 @@ WXLPARAM wxListCtrl::OnCustomDraw(WXLPARAM lParam)
             break;
 
         case CDDS_ITEMPREPAINT:
-            // get a message for each subitem
-            return CDRF_NOTIFYITEMDRAW;
-
-        case CDDS_SUBITEM | CDDS_ITEMPREPAINT:
             const int item = nmcd.dwItemSpec;
-            const int column = pLVCD->iSubItem;
 
             // we get this message with item == 0 for an empty control, we
             // must ignore it as calling OnGetItemAttr() would be wrong
             if ( item < 0 || item >= GetItemCount() )
                 break;
-            // same for columns
-            if ( column < 0 || column >= GetColumnCount() )
-                break;
 
-            return HandleItemPrepaint(this, pLVCD, DoGetItemColumnAttr(item, column));
+            return HandleItemPrepaint(this, pLVCD, DoGetItemAttr(item));
     }
 
     return CDRF_DODEFAULT;
@@ -2915,11 +2763,10 @@ WXLPARAM wxListCtrl::OnCustomDraw(WXLPARAM lParam)
 // Necessary for drawing hrules and vrules, if specified
 void wxListCtrl::OnPaint(wxPaintEvent& event)
 {
-    const int itemCount = GetItemCount();
-    const bool drawHRules = HasFlag(wxLC_HRULES);
-    const bool drawVRules = HasFlag(wxLC_VRULES);
+    bool drawHRules = HasFlag(wxLC_HRULES);
+    bool drawVRules = HasFlag(wxLC_VRULES);
 
-    if (!InReportView() || !(drawHRules || drawVRules) || !itemCount)
+    if (!InReportView() || !drawHRules && !drawVRules)
     {
         event.Skip();
         return;
@@ -2927,22 +2774,24 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
 
     wxPaintDC dc(this);
 
-    wxListCtrlBase::OnPaint(event);
+    wxControl::OnPaint(event);
 
     // Reset the device origin since it may have been set
     dc.SetDeviceOrigin(0, 0);
 
-    wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT));
+    wxPen pen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT), 1, wxSOLID);
     dc.SetPen(pen);
     dc.SetBrush(* wxTRANSPARENT_BRUSH);
 
     wxSize clientSize = GetClientSize();
     wxRect itemRect;
 
+    int itemCount = GetItemCount();
+    int i;
     if (drawHRules)
     {
-        const long top = GetTopItem();
-        for ( int i = top; i < top + GetCountPerPage() + 1; i++ )
+        long top = GetTopItem();
+        for (i = top; i < top + GetCountPerPage() + 1; i++)
         {
             if (GetItemRect(i, itemRect))
             {
@@ -2956,18 +2805,17 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
                 {
                     cy = itemRect.GetBottom();
                     dc.DrawLine(0, cy, clientSize.x, cy);
-                    break;
                 }
             }
         }
     }
-
-    if (drawVRules)
+    i = itemCount - 1;
+    if (drawVRules && (i > -1))
     {
         wxRect firstItemRect;
         GetItemRect(0, firstItemRect);
 
-        if (GetItemRect(itemCount - 1, itemRect))
+        if (GetItemRect(i, itemRect))
         {
             // this is a fix for bug 673394: erase the pixels which we would
             // otherwise leave on the screen
@@ -2979,21 +2827,10 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
 
             dc.SetPen(pen);
             dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-            const int numCols = GetColumnCount();
-            wxVector<int> indexArray(numCols);
-            if ( !ListView_GetColumnOrderArray(GetHwnd(),
-                                               numCols,
-                                               &indexArray[0]) )
-            {
-                wxFAIL_MSG( wxT("invalid column index array in OnPaint()") );
-                return;
-            }
-
             int x = itemRect.GetX();
-            for (int col = 0; col < numCols; col++)
+            for (int col = 0; col < GetColumnCount(); col++)
             {
-                int colWidth = GetColumnWidth(indexArray[col]);
+                int colWidth = GetColumnWidth(col);
                 x += colWidth ;
                 dc.DrawLine(x-1, firstItemRect.GetY() - gap,
                             x-1, itemRect.GetBottom());
@@ -3002,27 +2839,6 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
     }
 }
 
-void wxListCtrl::OnCharHook(wxKeyEvent& event)
-{
-    if ( GetEditControl() )
-    {
-        // We need to ensure that Escape is not stolen from the in-place editor
-        // by the containing dialog.
-        //
-        // Notice that we don't have to care about Enter key here as we return
-        // false from MSWShouldPreProcessMessage() for it.
-        if ( event.GetKeyCode() == WXK_ESCAPE )
-        {
-            EndEditLabel(true /* cancel */);
-
-            // Don't call Skip() below.
-            return;
-        }
-    }
-
-    event.Skip();
-}
-
 WXLRESULT
 wxListCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
@@ -3046,7 +2862,7 @@ wxListCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             //else: break
     }
 
-    return wxListCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
 
 // ----------------------------------------------------------------------------
@@ -3057,7 +2873,7 @@ wxString wxListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) cons
 {
     // this is a pure virtual function, in fact - which is not really pure
     // because the controls which are not virtual don't need to implement it
-    wxFAIL_MSG( wxT("wxListCtrl::OnGetItemText not supposed to be called") );
+    wxFAIL_MSG( _T("wxListCtrl::OnGetItemText not supposed to be called") );
 
     return wxEmptyString;
 }
@@ -3081,29 +2897,26 @@ int wxListCtrl::OnGetItemColumnImage(long item, long column) const
 wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),
-                  wxT("invalid item index in OnGetItemAttr()") );
+                  _T("invalid item index in OnGetItemAttr()") );
 
     // no attributes by default
     return NULL;
 }
 
-wxListItemAttr *wxListCtrl::DoGetItemColumnAttr(long item, long column) const
+wxListItemAttr *wxListCtrl::DoGetItemAttr(long item) const
 {
-    if ( IsVirtual() )
-        return OnGetItemColumnAttr(item, column);
-
-    wxMSWListItemData * const data = MSWGetItemData(item);
-    return data ? data->attr : NULL;
+    return IsVirtual() ? OnGetItemAttr(item)
+                       : wxGetInternalDataAttr(this, item);
 }
 
 void wxListCtrl::SetItemCount(long count)
 {
-    wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") );
+    wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
 
     if ( !::SendMessage(GetHwnd(), LVM_SETITEMCOUNT, (WPARAM)count,
                         LVSICF_NOSCROLL | LVSICF_NOINVALIDATEALL) )
     {
-        wxLogLastError(wxT("ListView_SetItemCount"));
+        wxLogLastError(_T("ListView_SetItemCount"));
     }
     m_count = count;
     wxASSERT_MSG( m_count == ListView_GetItemCount(GetHwnd()),
@@ -3112,12 +2925,75 @@ void wxListCtrl::SetItemCount(long count)
 
 void wxListCtrl::RefreshItem(long item)
 {
-    RefreshItems(item, item);
+    // strangely enough, ListView_Update() results in much more flicker here
+    // than a dumb Refresh() -- why?
+#if 0
+    if ( !ListView_Update(GetHwnd(), item) )
+    {
+        wxLogLastError(_T("ListView_Update"));
+    }
+#else // 1
+    wxRect rect;
+    GetItemRect(item, rect);
+    RefreshRect(rect);
+#endif // 0/1
 }
 
 void wxListCtrl::RefreshItems(long itemFrom, long itemTo)
 {
-    ListView_RedrawItems(GetHwnd(), itemFrom, itemTo);
+    wxRect rect1, rect2;
+    GetItemRect(itemFrom, rect1);
+    GetItemRect(itemTo, rect2);
+
+    wxRect rect = rect1;
+    rect.height = rect2.GetBottom() - rect1.GetTop();
+
+    RefreshRect(rect);
+}
+
+// ----------------------------------------------------------------------------
+// internal data stuff
+// ----------------------------------------------------------------------------
+
+static wxListItemInternalData *wxGetInternalData(HWND hwnd, long itemId)
+{
+    LV_ITEM it;
+    it.mask = LVIF_PARAM;
+    it.iItem = itemId;
+
+    if ( !ListView_GetItem(hwnd, &it) )
+        return NULL;
+
+    return (wxListItemInternalData *) it.lParam;
+}
+
+static
+wxListItemInternalData *wxGetInternalData(const wxListCtrl *ctl, long itemId)
+{
+    return wxGetInternalData(GetHwndOf(ctl), itemId);
+}
+
+static
+wxListItemAttr *wxGetInternalDataAttr(const wxListCtrl *ctl, long itemId)
+{
+    wxListItemInternalData *data = wxGetInternalData(ctl, itemId);
+
+    return data ? data->attr : NULL;
+}
+
+static void wxDeleteInternalData(wxListCtrl* ctl, long itemId)
+{
+    wxListItemInternalData *data = wxGetInternalData(ctl, itemId);
+    if (data)
+    {
+        LV_ITEM item;
+        memset(&item, 0, sizeof(item));
+        item.iItem = itemId;
+        item.mask = LVIF_PARAM;
+        item.lParam = (LPARAM) 0;
+        ListView_SetItem((HWND)ctl->GetHWND(), &item);
+        delete data;
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -3128,8 +3004,8 @@ static void wxConvertFromMSWListItem(HWND hwndListCtrl,
                                      wxListItem& info,
                                      LV_ITEM& lvItem)
 {
-    wxMSWListItemData *internaldata =
-        (wxMSWListItemData *) lvItem.lParam;
+    wxListItemInternalData *internaldata =
+        (wxListItemInternalData *) lvItem.lParam;
 
     if (internaldata)
         info.m_data = internaldata->lParam;
@@ -3244,16 +3120,6 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
                                    const wxListItem& info,
                                    LV_ITEM& lvItem)
 {
-    if ( ctrl->InReportView() )
-    {
-        wxASSERT_MSG( 0 <= info.m_col && info.m_col < ctrl->GetColumnCount(),
-                      "wxListCtrl column index out of bounds" );
-    }
-    else // not in report view
-    {
-        wxASSERT_MSG( info.m_col == 0, "columns only exist in report view" );
-    }
-
     lvItem.iItem = (int) info.m_itemId;
 
     lvItem.iImage = info.m_image;
@@ -3279,7 +3145,7 @@ static void wxConvertToMSWListItem(const wxListCtrl *ctrl,
         else
         {
             // pszText is not const, hence the cast
-            lvItem.pszText = wxMSW_CONV_LPTSTR(info.m_text);
+            lvItem.pszText = (wxChar *)info.m_text.c_str();
             if ( lvItem.pszText )
                 lvItem.cchTextMax = info.m_text.length();
             else
@@ -3300,7 +3166,7 @@ static void wxConvertToMSWListCol(HWND hwndList,
     if ( item.m_mask & wxLIST_MASK_TEXT )
     {
         lvCol.mask |= LVCF_TEXT;
-        lvCol.pszText = wxMSW_CONV_LPTSTR(item.m_text);
+        lvCol.pszText = (wxChar *)item.m_text.c_str(); // cast is safe
     }
 
     if ( item.m_mask & wxLIST_MASK_FORMAT )
diff --git a/Source/3rd Party/wx/src/msw/main.cpp b/Source/3rd Party/wx/src/msw/main.cpp
index 1d58f865b..5d40d56bf 100644
--- a/Source/3rd Party/wx/src/msw/main.cpp	
+++ b/Source/3rd Party/wx/src/msw/main.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: main.cpp 44727 2007-03-10 17:24:09Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -31,7 +31,6 @@
 #endif //WX_PRECOMP
 
 #include "wx/cmdline.h"
-#include "wx/dynlib.h"
 #include "wx/scopeguard.h"
 
 #include "wx/msw/private.h"
@@ -62,7 +61,6 @@
 
 // defined in common/init.cpp
 extern int wxEntryReal(int& argc, wxChar **argv);
-extern int wxEntryCleanupReal(int& argc, wxChar **argv);
 
 // ============================================================================
 // implementation: various entry points
@@ -70,6 +68,28 @@ extern int wxEntryCleanupReal(int& argc, wxChar **argv);
 
 #if wxUSE_BASE
 
+#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) && !defined(__WXWINCE__)
+    // VC++ (at least from 4.0 up to version 7.1) is incredibly broken in that
+    // a "catch ( ... )" will *always* catch SEH exceptions in it even though
+    // it should have never been the case... to prevent such catches from
+    // stealing the exceptions from our wxGlobalSEHandler which is only called
+    // if the exception is not handled elsewhere, we have to also call it from
+    // a special SEH translator function which is called by VC CRT when a Win32
+    // exception occurs
+
+    // this warns that /EHa (async exceptions) should be used when using
+    // _set_se_translator but, in fact, this doesn't seem to change anything
+    // with VC++ up to 8.0
+    #if _MSC_VER <= 1400
+        #pragma warning(disable:4535)
+    #endif
+
+    // note that the SE translator must be called wxSETranslator!
+    #define DisableAutomaticSETranslator() _set_se_translator(wxSETranslator)
+#else // !__VISUALC__
+    #define DisableAutomaticSETranslator()
+#endif // __VISUALC__/!__VISUALC__
+
 // ----------------------------------------------------------------------------
 // wrapper wxEntry catching all Win32 exceptions occurring in a wx program
 // ----------------------------------------------------------------------------
@@ -121,7 +141,7 @@ void wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS *ep)
     switch ( wxGlobalSEHandler(ep) )
     {
         default:
-            wxFAIL_MSG( wxT("unexpected wxGlobalSEHandler() return value") );
+            wxFAIL_MSG( _T("unexpected wxGlobalSEHandler() return value") );
             // fall through
 
         case EXCEPTION_EXECUTE_HANDLER:
@@ -155,19 +175,19 @@ bool wxHandleFatalExceptions(bool doit)
         wxChar fullname[MAX_PATH];
         if ( !::GetTempPath(WXSIZEOF(fullname), fullname) )
         {
-            wxLogLastError(wxT("GetTempPath"));
+            wxLogLastError(_T("GetTempPath"));
 
             // when all else fails...
-            wxStrcpy(fullname, wxT("c:\\"));
+            wxStrcpy(fullname, _T("c:\\"));
         }
 
         // use PID and date to make the report file name more unique
         wxString name = wxString::Format
                         (
-                            wxT("%s_%s_%lu.dmp"),
-                            wxTheApp ? (const wxChar*)wxTheApp->GetAppDisplayName().c_str()
-                                     : wxT("wxwindows"),
-                            wxDateTime::Now().Format(wxT("%Y%m%dT%H%M%S")).c_str(),
+                            _T("%s_%s_%lu.dmp"),
+                            wxTheApp ? wxTheApp->GetAppName().c_str()
+                                     : _T("wxwindows"),
+                            wxDateTime::Now().Format(_T("%Y%m%dT%H%M%S")).c_str(),
                             ::GetCurrentProcessId()
                         );
 
@@ -193,8 +213,21 @@ int wxEntry(int& argc, wxChar **argv)
 
 #else // !wxUSE_ON_FATAL_EXCEPTION
 
+#if defined(__VISUALC__) && !defined(__WXWINCE__)
+
+static void
+wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
+{
+    // see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above
+    throw;
+}
+
+#endif // __VISUALC__
+
 int wxEntry(int& argc, wxChar **argv)
 {
+    DisableAutomaticSETranslator();
+
     return wxEntryReal(argc, argv);
 }
 
@@ -202,10 +235,7 @@ int wxEntry(int& argc, wxChar **argv)
 
 #endif // wxUSE_BASE
 
-#if wxUSE_GUI
-
-namespace
-{
+#if wxUSE_GUI && defined(__WXMSW__)
 
 #if wxUSE_UNICODE && !defined(__WXWINCE__)
     #define NEED_UNICODE_CHECK
@@ -214,7 +244,7 @@ namespace
 #ifdef NEED_UNICODE_CHECK
 
 // check whether Unicode is available
-bool wxIsUnicodeAvailable()
+static bool wxIsUnicodeAvailable()
 {
     static const wchar_t *ERROR_STRING = L"wxWidgets Fatal Error";
 
@@ -285,82 +315,41 @@ bool wxIsUnicodeAvailable()
 
 #endif // NEED_UNICODE_CHECK
 
-void wxSetProcessDPIAware()
-{
-#if wxUSE_DYNLIB_CLASS
-    typedef BOOL (WINAPI *SetProcessDPIAware_t)(void);
-    wxDynamicLibrary dllUser32(wxT("user32.dll"));
-    SetProcessDPIAware_t pfnSetProcessDPIAware =
-        (SetProcessDPIAware_t)dllUser32.RawGetSymbol(wxT("SetProcessDPIAware"));
-
-    if ( pfnSetProcessDPIAware )
-        pfnSetProcessDPIAware();
-#endif // wxUSE_DYNLIB_CLASS
-}
-
-} //anonymous namespace
-
 // ----------------------------------------------------------------------------
 // Windows-specific wxEntry
 // ----------------------------------------------------------------------------
 
-struct wxMSWCommandLineArguments
+// helper function used to clean up in wxEntry() just below
+//
+// notice that argv elements are supposed to be allocated using malloc() while
+// argv array itself is allocated with new
+static void wxFreeArgs(int argc, wxChar **argv)
 {
-    wxMSWCommandLineArguments() { argc = 0; argv = NULL; }
-
-    void Init(const wxArrayString& args)
+    for ( int i = 0; i < argc; i++ )
     {
-        argc = args.size();
-
-        // +1 here for the terminating NULL
-        argv = new wxChar *[argc + 1];
-        for ( int i = 0; i < argc; i++ )
-        {
-            argv[i] = wxStrdup(args[i].t_str());
-        }
-
-        // argv[] must be NULL-terminated
-        argv[argc] = NULL;
+        free(argv[i]);
     }
 
-    void Free()
-    {
-        if ( !argc )
-            return;
+    delete [] argv;
+}
 
-        for ( int i = 0; i < argc; i++ )
-        {
-            free(argv[i]);
-        }
-
-        wxDELETEA(argv);
-        argc = 0;
-    }
-
-    int argc;
-    wxChar **argv;
-};
-
-static wxMSWCommandLineArguments wxArgs;
-
-// common part of wxMSW-specific wxEntryStart() and wxEntry() overloads
-static bool
-wxMSWEntryCommon(HINSTANCE hInstance, int nCmdShow)
+WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
+                        HINSTANCE WXUNUSED(hPrevInstance),
+                        wxCmdLineArgType WXUNUSED(pCmdLine),
+                        int nCmdShow)
 {
     // the first thing to do is to check if we're trying to run an Unicode
     // program under Win9x w/o MSLU emulation layer - if so, abort right now
     // as it has no chance to work and has all chances to crash
 #ifdef NEED_UNICODE_CHECK
     if ( !wxIsUnicodeAvailable() )
-        return false;
+        return -1;
 #endif // NEED_UNICODE_CHECK
 
 
     // remember the parameters Windows gave us
     wxSetInstance(hInstance);
-#ifdef __WXMSW__
     wxApp::m_nCmdShow = nCmdShow;
-#endif
 
     // parse the command line: we can't use pCmdLine in Unicode build so it is
     // simpler to never use it at all (this also results in a more correct
@@ -380,43 +369,24 @@ wxMSWEntryCommon(HINSTANCE hInstance, int nCmdShow)
     args.Insert(wxGetFullModuleName(), 0);
 #endif
 
-    wxArgs.Init(args);
+    int argc = args.GetCount();
 
-    return true;
+    // +1 here for the terminating NULL
+    wxChar **argv = new wxChar *[argc + 1];
+    for ( int i = 0; i < argc; i++ )
+    {
+        argv[i] = wxStrdup(args[i]);
+    }
+
+    // argv[] must be NULL-terminated
+    argv[argc] = NULL;
+
+    wxON_BLOCK_EXIT2(wxFreeArgs, argc, argv);
+
+    return wxEntry(argc, argv);
 }
 
-WXDLLEXPORT bool wxEntryStart(HINSTANCE hInstance,
-                              HINSTANCE WXUNUSED(hPrevInstance),
-                              wxCmdLineArgType WXUNUSED(pCmdLine),
-                              int nCmdShow)
-{
-    if ( !wxMSWEntryCommon(hInstance, nCmdShow) )
-       return false;
-
-    return wxEntryStart(wxArgs.argc, wxArgs.argv);
-}
-
-WXDLLEXPORT int wxEntry(HINSTANCE hInstance,
-                        HINSTANCE WXUNUSED(hPrevInstance),
-                        wxCmdLineArgType WXUNUSED(pCmdLine),
-                        int nCmdShow)
-{
-    // wxWidgets library doesn't have problems with non-default DPI settings,
-    // so we can mark the app as "DPI aware" for Vista/Win7 (see
-    // http://msdn.microsoft.com/en-us/library/dd464659%28VS.85%29.aspx).
-    // Note that we intentionally do it here and not in wxApp, so that it
-    // doesn't happen if wx code is hosted in another app (e.g. a plugin).
-    wxSetProcessDPIAware();
-
-    if ( !wxMSWEntryCommon(hInstance, nCmdShow) )
-        return -1;
-
-    wxON_BLOCK_EXIT_OBJ0(wxArgs, wxMSWCommandLineArguments::Free);
-
-    return wxEntry(wxArgs.argc, wxArgs.argv);
-}
-
-#endif // wxUSE_GUI
+#endif // wxUSE_GUI && __WXMSW__
 
 // ----------------------------------------------------------------------------
 // global HINSTANCE
diff --git a/Source/3rd Party/wx/src/msw/mdi.cpp b/Source/3rd Party/wx/src/msw/mdi.cpp
index 3ad87cd84..aa84c7128 100644
--- a/Source/3rd Party/wx/src/msw/mdi.cpp	
+++ b/Source/3rd Party/wx/src/msw/mdi.cpp	
@@ -2,11 +2,10 @@
 // Name:        src/msw/mdi.cpp
 // Purpose:     MDI classes for wxMSW
 // Author:      Julian Smart
-// Modified by: Vadim Zeitlin on 2008-11-04 to use the base classes
+// Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Julian Smart
-//              (c) 2008-2009 Vadim Zeitlin
+// RCS-ID:      $Id: mdi.cpp 46112 2007-05-18 16:33:45Z VZ $
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -45,6 +44,10 @@
 #include "wx/stockitem.h"
 #include "wx/msw/private.h"
 
+#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
+    #include "wx/msw/statbr95.h"
+#endif
+
 #include <string.h>
 
 // ---------------------------------------------------------------------------
@@ -53,21 +56,25 @@
 
 extern wxMenu *wxCurrentPopupMenu;
 
+extern const wxChar *wxMDIFrameClassName;   // from app.cpp
+extern const wxChar *wxMDIChildFrameClassName;
+extern const wxChar *wxMDIChildFrameClassNameNoRedraw;
 extern void wxRemoveHandleAssociation(wxWindow *win);
 
-namespace
-{
-
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 
-// This range gives a maximum of 500 MDI children. Should be enough :-)
-const int wxFIRST_MDI_CHILD = 4100;
-const int wxLAST_MDI_CHILD = 4600;
+static const int IDM_WINDOWTILEHOR  = 4001;
+static const int IDM_WINDOWCASCADE = 4002;
+static const int IDM_WINDOWICONS = 4003;
+static const int IDM_WINDOWNEXT = 4004;
+static const int IDM_WINDOWTILEVERT = 4005;
+static const int IDM_WINDOWPREV = 4006;
 
-// The MDI "Window" menu label
-const char *WINDOW_MENU_LABEL = gettext_noop("&Window");
+// This range gives a maximum of 500 MDI children. Should be enough :-)
+static const int wxFIRST_MDI_CHILD = 4100;
+static const int wxLAST_MDI_CHILD = 4600;
 
 // ---------------------------------------------------------------------------
 // private functions
@@ -75,31 +82,32 @@ const char *WINDOW_MENU_LABEL = gettext_noop("&Window");
 
 // set the MDI menus (by sending the WM_MDISETMENU message) and update the menu
 // of the parent of win (which is supposed to be the MDI client window)
-void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow);
+static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow);
 
 // insert the window menu (subMenu) into menu just before "Help" submenu or at
 // the very end if not found
-void MDIInsertWindowMenu(wxWindow *win, WXHMENU hMenu, HMENU subMenu);
+static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu);
 
 // Remove the window menu
-void MDIRemoveWindowMenu(wxWindow *win, WXHMENU hMenu);
+static void RemoveWindowMenu(wxWindow *win, WXHMENU menu);
+
+// is this an id of an MDI child?
+inline bool IsMdiCommandId(int id)
+{
+    return (id >= wxFIRST_MDI_CHILD) && (id <= wxLAST_MDI_CHILD);
+}
 
 // unpack the parameters of WM_MDIACTIVATE message
-void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
-                       WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact);
+static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
+                              WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact);
 
 // return the HMENU of the MDI menu
-//
-// this function works correctly even when we don't have a window menu and just
-// returns 0 then
-inline HMENU GetMDIWindowMenu(wxMDIParentFrame *frame)
+static inline HMENU GetMDIWindowMenu(wxMDIParentFrame *frame)
 {
     wxMenu *menu = frame->GetWindowMenu();
     return menu ? GetHmenuOf(menu) : 0;
 }
 
-} // anonymous namespace
-
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -116,13 +124,6 @@ BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_SIZE(wxMDIParentFrame::OnSize)
     EVT_ICONIZE(wxMDIParentFrame::OnIconized)
     EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
-
-#if wxUSE_MENUS
-    EVT_MENU_RANGE(wxFIRST_MDI_CHILD, wxLAST_MDI_CHILD,
-                   wxMDIParentFrame::OnMDIChild)
-    EVT_MENU_RANGE(wxID_MDI_WINDOW_FIRST, wxID_MDI_WINDOW_LAST,
-                   wxMDIParentFrame::OnMDICommand)
-#endif // wxUSE_MENUS
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIChildFrame, wxFrame)
@@ -138,12 +139,12 @@ END_EVENT_TABLE()
 // the children
 // ===========================================================================
 
-void wxMDIParentFrame::Init()
+wxMDIParentFrame::wxMDIParentFrame()
 {
-#if wxUSE_MENUS && wxUSE_ACCEL
-  // the default menu doesn't have any accelerators (even if we have it)
-  m_accelWindowMenu = NULL;
-#endif // wxUSE_MENUS && wxUSE_ACCEL
+    m_clientWindow = NULL;
+    m_currentChild = NULL;
+    m_windowMenu = (wxMenu*) NULL;
+    m_parentFrameActive = true;
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
@@ -154,22 +155,30 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
                               long style,
                               const wxString& name)
 {
+  m_clientWindow = NULL;
+  m_currentChild = NULL;
+
   // this style can be used to prevent a window from having the standard MDI
   // "Window" menu
-  if ( !(style & wxFRAME_NO_WINDOW_MENU) )
+  if ( style & wxFRAME_NO_WINDOW_MENU )
+  {
+      m_windowMenu = (wxMenu *)NULL;
+  }
+  else // normal case: we have the window menu, so construct it
   {
-      // normal case: we have the window menu, so construct it
       m_windowMenu = new wxMenu;
 
-      m_windowMenu->Append(wxID_MDI_WINDOW_CASCADE, _("&Cascade"));
-      m_windowMenu->Append(wxID_MDI_WINDOW_TILE_HORZ, _("Tile &Horizontally"));
-      m_windowMenu->Append(wxID_MDI_WINDOW_TILE_VERT, _("Tile &Vertically"));
+      m_windowMenu->Append(IDM_WINDOWCASCADE, _("&Cascade"));
+      m_windowMenu->Append(IDM_WINDOWTILEHOR, _("Tile &Horizontally"));
+      m_windowMenu->Append(IDM_WINDOWTILEVERT, _("Tile &Vertically"));
       m_windowMenu->AppendSeparator();
-      m_windowMenu->Append(wxID_MDI_WINDOW_ARRANGE_ICONS, _("&Arrange Icons"));
-      m_windowMenu->Append(wxID_MDI_WINDOW_NEXT, _("&Next"));
-      m_windowMenu->Append(wxID_MDI_WINDOW_PREV, _("&Previous"));
+      m_windowMenu->Append(IDM_WINDOWICONS, _("&Arrange Icons"));
+      m_windowMenu->Append(IDM_WINDOWNEXT, _("&Next"));
+      m_windowMenu->Append(IDM_WINDOWPREV, _("&Previous"));
   }
 
+  m_parentFrameActive = true;
+
   if (!parent)
     wxTopLevelWindows.Append(this);
 
@@ -189,8 +198,8 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   msflags &= ~WS_VSCROLL;
   msflags &= ~WS_HSCROLL;
 
-  if ( !wxWindow::MSWCreate(wxApp::GetRegisteredClassName(wxT("wxMDIFrame")),
-                            title.t_str(),
+  if ( !wxWindow::MSWCreate(wxMDIFrameClassName,
+                            title,
                             pos, size,
                             msflags,
                             exflags) )
@@ -216,16 +225,21 @@ wxMDIParentFrame::~wxMDIParentFrame()
     m_frameStatusBar = NULL;
 #endif // wxUSE_STATUSBAR
 
-#if wxUSE_MENUS && wxUSE_ACCEL
-    delete m_accelWindowMenu;
-#endif // wxUSE_MENUS && wxUSE_ACCEL
-
     DestroyChildren();
 
+    if (m_windowMenu)
+    {
+        delete m_windowMenu;
+        m_windowMenu = (wxMenu*) NULL;
+    }
+
     // the MDI frame menubar is not automatically deleted by Windows unlike for
     // the normal frames
     if ( m_hMenu )
+    {
         ::DestroyMenu((HMENU)m_hMenu);
+        m_hMenu = (WXHMENU)NULL;
+    }
 
     if ( m_clientWindow )
     {
@@ -237,159 +251,42 @@ wxMDIParentFrame::~wxMDIParentFrame()
     }
 }
 
-// ----------------------------------------------------------------------------
-// wxMDIParentFrame child management
-// ----------------------------------------------------------------------------
-
-wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
-{
-    HWND hWnd = (HWND)::SendMessage(GetWinHwnd(GetClientWindow()),
-                                    WM_MDIGETACTIVE, 0, 0L);
-    if ( !hWnd )
-        return NULL;
-
-    return static_cast<wxMDIChildFrame *>(wxFindWinFromHandle(hWnd));
-}
-
-int wxMDIParentFrame::GetChildFramesCount() const
-{
-    int count = 0;
-    for ( wxWindowList::const_iterator i = GetChildren().begin();
-          i != GetChildren().end();
-          ++i )
-    {
-        if ( wxDynamicCast(*i, wxMDIChildFrame) )
-            count++;
-    }
-
-    return count;
-}
-
-#if wxUSE_MENUS
-
-void wxMDIParentFrame::AddMDIChild(wxMDIChildFrame * WXUNUSED(child))
-{
-    switch ( GetChildFramesCount() )
-    {
-        case 1:
-            // first MDI child was just added, we need to insert the window
-            // menu now if we have it
-            AddWindowMenu();
-
-            // and disable the items which can't be used until we have more
-            // than one child
-            UpdateWindowMenu(false);
-            break;
-
-        case 2:
-            // second MDI child was added, enable the menu items which were
-            // disabled because they didn't make sense for a single window
-            UpdateWindowMenu(true);
-            break;
-    }
-}
-
-void wxMDIParentFrame::RemoveMDIChild(wxMDIChildFrame * WXUNUSED(child))
-{
-    switch ( GetChildFramesCount() )
-    {
-        case 1:
-            // last MDI child is being removed, remove the now unnecessary
-            // window menu too
-            RemoveWindowMenu();
-
-            // there is no need to call UpdateWindowMenu(true) here so this is
-            // not quite symmetric to AddMDIChild() above
-            break;
-
-        case 2:
-            // only one MDI child is going to remain, disable the menu commands
-            // which don't make sense for a single child window
-            UpdateWindowMenu(false);
-            break;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxMDIParentFrame window menu handling
-// ----------------------------------------------------------------------------
-
-void wxMDIParentFrame::AddWindowMenu()
-{
-    if ( m_windowMenu )
-    {
-        // For correct handling of the events from this menu we also must
-        // attach it to the menu bar.
-        m_windowMenu->Attach(GetMenuBar());
-
-        MDIInsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));
-    }
-}
-
-void wxMDIParentFrame::RemoveWindowMenu()
-{
-    if ( m_windowMenu )
-    {
-        MDIRemoveWindowMenu(GetClientWindow(), m_hMenu);
-
-        m_windowMenu->Detach();
-    }
-}
-
-void wxMDIParentFrame::UpdateWindowMenu(bool enable)
-{
-    if ( m_windowMenu )
-    {
-        m_windowMenu->Enable(wxID_MDI_WINDOW_NEXT, enable);
-        m_windowMenu->Enable(wxID_MDI_WINDOW_PREV, enable);
-    }
-}
-
 #if wxUSE_MENUS_NATIVE
 
 void wxMDIParentFrame::InternalSetMenuBar()
 {
-    if ( GetActiveChild() )
-    {
-        AddWindowMenu();
-    }
-    else // we don't have any MDI children yet
-    {
-        // wait until we do to add the window menu but do set the main menu for
-        // now (this is done by AddWindowMenu() as a side effect)
-        MDISetMenu(GetClientWindow(), (HMENU)m_hMenu, NULL);
-    }
+    m_parentFrameActive = true;
+
+    InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));
 }
 
 #endif // wxUSE_MENUS_NATIVE
 
 void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
 {
-    if ( menu != m_windowMenu )
+    if (m_windowMenu)
     {
-        // notice that Remove/AddWindowMenu() are safe to call even when
-        // m_windowMenu is NULL
-        RemoveWindowMenu();
+        if (GetMenuBar())
+        {
+            // Remove old window menu
+            RemoveWindowMenu(GetClientWindow(), m_hMenu);
+        }
 
         delete m_windowMenu;
-
-        m_windowMenu = menu;
-
-        AddWindowMenu();
+        m_windowMenu = (wxMenu*) NULL;
     }
 
-#if wxUSE_ACCEL
-    wxDELETE(m_accelWindowMenu);
-
-    if ( menu && menu->HasAccels() )
-        m_accelWindowMenu = menu->CreateAccelTable();
-#endif // wxUSE_ACCEL
+    if (menu)
+    {
+        m_windowMenu = menu;
+        if (GetMenuBar())
+        {
+            InsertWindowMenu(GetClientWindow(), m_hMenu,
+                             GetHmenuOf(m_windowMenu));
+        }
+    }
 }
 
-// ----------------------------------------------------------------------------
-// wxMDIParentFrame other menu-related stuff
-// ----------------------------------------------------------------------------
-
 void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu)
 {
     wxMDIChildFrame *child = GetActiveChild();
@@ -418,39 +315,6 @@ void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu)
     }
 }
 
-wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const
-{
-    wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId);
-    if ( !item && GetActiveChild() )
-    {
-        item = GetActiveChild()->FindItemInMenuBar(menuId);
-    }
-
-    if ( !item && m_windowMenu )
-        item = m_windowMenu->FindItem(menuId);
-
-    return item;
-}
-
-WXHMENU wxMDIParentFrame::MSWGetActiveMenu() const
-{
-    wxMDIChildFrame * const child  = GetActiveChild();
-    if ( child )
-    {
-        const WXHMENU hmenu = child->MSWGetActiveMenu();
-        if ( hmenu )
-            return hmenu;
-    }
-
-    return wxFrame::MSWGetActiveMenu();
-}
-
-#endif // wxUSE_MENUS
-
-// ----------------------------------------------------------------------------
-// wxMDIParentFrame event handling
-// ----------------------------------------------------------------------------
-
 void wxMDIParentFrame::UpdateClientSize()
 {
     if ( GetClientWindow() )
@@ -473,8 +337,28 @@ void wxMDIParentFrame::OnIconized(wxIconizeEvent& event)
 {
     event.Skip();
 
-    if ( !event.IsIconized() )
+    if ( !event.Iconized() )
+    {
         UpdateClientSize();
+    }
+}
+
+// Returns the active MDI child window
+wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
+{
+    HWND hWnd = (HWND)::SendMessage(GetWinHwnd(GetClientWindow()),
+                                    WM_MDIGETACTIVE, 0, 0L);
+    if ( hWnd == 0 )
+        return NULL;
+    else
+        return (wxMDIChildFrame *)wxFindWinFromHandle((WXHWND) hWnd);
+}
+
+// Create the client window class (don't Create the window, just return a new
+// class)
+wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
+{
+    return new wxMDIClientWindow;
 }
 
 // Responds to colour changes, and passes event on to children.
@@ -507,7 +391,7 @@ void wxMDIParentFrame::Cascade()
 void wxMDIParentFrame::Tile(wxOrientation orient)
 {
     wxASSERT_MSG( orient == wxHORIZONTAL || orient == wxVERTICAL,
-                  wxT("invalid orientation value") );
+                  _T("invalid orientation value") );
 
     ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE,
                   orient == wxHORIZONTAL ? MDITILE_HORIZONTAL
@@ -534,8 +418,8 @@ void wxMDIParentFrame::ActivatePrevious()
 // ---------------------------------------------------------------------------
 
 WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,
-                                          WXWPARAM wParam,
-                                          WXLPARAM lParam)
+                                     WXWPARAM wParam,
+                                     WXLPARAM lParam)
 {
     WXLRESULT rc = 0;
     bool processed = false;
@@ -553,22 +437,22 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,
             break;
 
         case WM_COMMAND:
-            // system messages such as SC_CLOSE are sent as WM_COMMANDs to the
-            // parent MDI frame and we must let the DefFrameProc() have them
-            // for these commands to work (without it, closing the maximized
-            // MDI children doesn't work, for example)
             {
                 WXWORD id, cmd;
                 WXHWND hwnd;
                 UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
 
-                if ( cmd == 0 /* menu */ &&
-                        id >= SC_SIZE /* first system menu command */ )
-                {
-                    MSWDefWindowProc(message, wParam, lParam);
-                    processed = true;
-                }
+                (void)HandleCommand(id, cmd, hwnd);
+
+                // even if the frame didn't process it, there is no need to try it
+                // once again (i.e. call wxFrame::HandleCommand()) - we just did it,
+                // so pretend we processed the message anyhow
+                processed = true;
             }
+
+            // always pass this message DefFrameProc(), otherwise MDI menu
+            // commands (and sys commands - more surprisingly!) won't work
+            MSWDefWindowProc(message, wParam, lParam);
             break;
 
         case WM_CREATE:
@@ -583,6 +467,36 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,
 
             processed = true;
             break;
+
+        case WM_ERASEBKGND:
+            processed = true;
+
+            // we erase background ourselves
+            rc = true;
+            break;
+
+        case WM_MENUSELECT:
+            {
+                WXWORD item, flags;
+                WXHMENU hmenu;
+                UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
+
+                if ( m_parentFrameActive )
+                {
+                    processed = HandleMenuSelect(item, flags, hmenu);
+                }
+                else if (m_currentChild)
+                {
+                    processed = m_currentChild->
+                        HandleMenuSelect(item, flags, hmenu);
+                }
+            }
+            break;
+
+        case WM_SIZE:
+            // though we don't (usually) resize the MDI client to exactly fit the
+            // client area we need to pass this one to DefFrameProc to allow the children to show
+            break;
     }
 
     if ( !processed )
@@ -603,103 +517,125 @@ bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate
 
     // If this window is an MDI parent, we must also send an OnActivate message
     // to the current child.
-    if ( GetActiveChild() &&
+    if ( (m_currentChild != NULL) &&
          ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)) )
     {
-        wxActivateEvent event(wxEVT_ACTIVATE, true, GetActiveChild()->GetId());
-        event.SetEventObject( GetActiveChild() );
-        if ( GetActiveChild()->HandleWindowEvent(event) )
+        wxActivateEvent event(wxEVT_ACTIVATE, true, m_currentChild->GetId());
+        event.SetEventObject( m_currentChild );
+        if ( m_currentChild->GetEventHandler()->ProcessEvent(event) )
             processed = true;
     }
 
     return processed;
 }
 
-#if wxUSE_MENUS
-
-void wxMDIParentFrame::OnMDIChild(wxCommandEvent& event)
+bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
 {
-    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-    while ( node )
+    // In case it's e.g. a toolbar.
+    if ( hwnd )
     {
-        wxWindow *child = node->GetData();
-        if ( child->GetHWND() )
-        {
-            int childId = wxGetWindowId(child->GetHWND());
-            if ( childId == event.GetId() )
-            {
-                ::SendMessage( GetWinHwnd(GetClientWindow()),
-                        WM_MDIACTIVATE,
-                        (WPARAM)child->GetHWND(), 0);
-                return;
-            }
-        }
-
-        node = node->GetNext();
+        wxWindow *win = wxFindWinFromHandle(hwnd);
+        if ( win )
+            return win->MSWCommand(cmd, id);
     }
 
-    wxFAIL_MSG( "unknown MDI child selected?" );
-}
+    if (wxCurrentPopupMenu)
+    {
+        wxMenu *popupMenu = wxCurrentPopupMenu;
+        wxCurrentPopupMenu = NULL;
+        if (popupMenu->MSWCommand(cmd, id))
+            return true;
+    }
 
-void wxMDIParentFrame::OnMDICommand(wxCommandEvent& event)
-{
+    // is it one of standard MDI commands?
     WXWPARAM wParam = 0;
     WXLPARAM lParam = 0;
     int msg;
-    switch ( event.GetId() )
+    switch ( id )
     {
-        case wxID_MDI_WINDOW_CASCADE:
+        case IDM_WINDOWCASCADE:
             msg = WM_MDICASCADE;
             wParam = MDITILE_SKIPDISABLED;
             break;
 
-        case wxID_MDI_WINDOW_TILE_HORZ:
+        case IDM_WINDOWTILEHOR:
             wParam |= MDITILE_HORIZONTAL;
             // fall through
 
-        case wxID_MDI_WINDOW_TILE_VERT:
+        case IDM_WINDOWTILEVERT:
             if ( !wParam )
                 wParam = MDITILE_VERTICAL;
             msg = WM_MDITILE;
             wParam |= MDITILE_SKIPDISABLED;
             break;
 
-        case wxID_MDI_WINDOW_ARRANGE_ICONS:
+        case IDM_WINDOWICONS:
             msg = WM_MDIICONARRANGE;
             break;
 
-        case wxID_MDI_WINDOW_NEXT:
+        case IDM_WINDOWNEXT:
             msg = WM_MDINEXT;
             lParam = 0;         // next child
             break;
 
-        case wxID_MDI_WINDOW_PREV:
+        case IDM_WINDOWPREV:
             msg = WM_MDINEXT;
             lParam = 1;         // previous child
             break;
 
         default:
-            wxFAIL_MSG( "unknown MDI command" );
-            return;
+            msg = 0;
     }
 
-    ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam);
-}
-
-#endif // wxUSE_MENUS
-
-bool wxMDIParentFrame::TryBefore(wxEvent& event)
-{
-    // menu (and toolbar) events should be sent to the active child frame
-    // first, if any
-    if ( event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED )
+    if ( msg )
     {
-        wxMDIChildFrame * const child = GetActiveChild();
-        if ( child && child->ProcessWindowEventLocally(event) )
-            return true;
+        ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam);
+
+        return true;
     }
 
-    return wxMDIParentFrameBase::TryBefore(event);
+    // FIXME VZ: what does this test do??
+    if (id >= 0xF000)
+    {
+        return false; // Get WndProc to call default proc
+    }
+
+    if ( IsMdiCommandId(id) )
+    {
+        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+        while ( node )
+        {
+            wxWindow *child = node->GetData();
+            if ( child->GetHWND() )
+            {
+                long childId = wxGetWindowId(child->GetHWND());
+                if (childId == (long)id)
+                {
+                    ::SendMessage( GetWinHwnd(GetClientWindow()),
+                                   WM_MDIACTIVATE,
+                                   (WPARAM)child->GetHWND(), 0);
+                    return true;
+                }
+            }
+            node = node->GetNext();
+        }
+    }
+    else if ( m_parentFrameActive )
+    {
+        return ProcessCommand(id);
+    }
+    else if ( m_currentChild )
+    {
+        return m_currentChild->HandleCommand(id, cmd, hwnd);
+    }
+    else
+    {
+        // this shouldn't happen because it means that our messages are being
+        // lost (they're not sent to the parent frame nor to the children)
+        wxFAIL_MSG(wxT("MDI parent frame is not active, yet there is no active MDI child?"));
+    }
+
+    return false;
 }
 
 WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message,
@@ -720,28 +656,19 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
     MSG *pMsg = (MSG *)msg;
 
     // first let the current child get it
-    wxMDIChildFrame * const child = GetActiveChild();
-    if ( child && child->MSWTranslateMessage(msg) )
+    if ( m_currentChild && m_currentChild->GetHWND() &&
+         m_currentChild->MSWTranslateMessage(msg) )
     {
         return true;
     }
 
-    // then try out accelerator table (will also check the accelerators for the
-    // normal menu items)
+    // then try out accel table (will also check the menu accels)
     if ( wxFrame::MSWTranslateMessage(msg) )
     {
         return true;
     }
 
-#if wxUSE_MENUS && wxUSE_ACCEL
-    // but it doesn't check for the (custom) accelerators of the window menu
-    // items as it's not part of the menu bar as it's handled by Windows itself
-    // so we need to do this explicitly
-    if ( m_accelWindowMenu && m_accelWindowMenu->Translate(this, msg) )
-        return true;
-#endif // wxUSE_MENUS && wxUSE_ACCEL
-
-    // finally, check for MDI specific built-in accelerators
+    // finally, check for MDI specific built in accel keys
     if ( pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN )
     {
         if ( ::TranslateMDISysAccel(GetWinHwnd(GetClientWindow()), pMsg))
@@ -769,14 +696,12 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
                              long style,
                              const wxString& name)
 {
-    m_mdiParent = parent;
-
   SetName(name);
 
   if ( id != wxID_ANY )
     m_windowId = id;
   else
-    m_windowId = NewControlId();
+    m_windowId = (int)NewControlId();
 
   if ( parent )
   {
@@ -790,13 +715,10 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   MDICREATESTRUCT mcs;
 
-  wxString className =
-      wxApp::GetRegisteredClassName(wxT("wxMDIChildFrame"), COLOR_WINDOW);
-  if ( !(style & wxFULL_REPAINT_ON_RESIZE) )
-      className += wxApp::GetNoRedrawClassSuffix();
-
-  mcs.szClass = className.t_str();
-  mcs.szTitle = title.t_str();
+  mcs.szClass = style & wxFULL_REPAINT_ON_RESIZE
+                    ? wxMDIChildFrameClassName
+                    : wxMDIChildFrameClassNameNoRedraw;
+  mcs.szTitle = title;
   mcs.hOwner = wxGetInstance();
   if (x != wxDefaultCoord)
       mcs.x = x;
@@ -841,18 +763,16 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   wxWindowCreationHook hook(this);
 
   m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),
-                                 WM_MDICREATE, 0, (LPARAM)&mcs);
+                                 WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
 
   if ( !m_hWnd )
   {
-      wxLogLastError(wxT("WM_MDICREATE"));
+      wxLogLastError(_T("WM_MDICREATE"));
       return false;
   }
 
   SubclassWin(m_hWnd);
 
-  parent->AddMDIChild(this);
-
   return true;
 }
 
@@ -862,8 +782,6 @@ wxMDIChildFrame::~wxMDIChildFrame()
     if ( !m_hWnd )
         return;
 
-    GetMDIParent()->RemoveMDIChild(this);
-
     // will be destroyed by DestroyChildren() but reset them before calling it
     // to avoid using dangling pointers if a callback comes in the meanwhile
 #if wxUSE_TOOLBAR
@@ -875,7 +793,7 @@ wxMDIChildFrame::~wxMDIChildFrame()
 
     DestroyChildren();
 
-    MDIRemoveWindowMenu(NULL, m_hMenu);
+    RemoveWindowMenu(NULL, m_hMenu);
 
     MSWDestroyWindow();
 }
@@ -895,20 +813,12 @@ bool wxMDIChildFrame::Show(bool show)
 
     // we need to refresh the MDI frame window menu to include (or exclude if
     // we've been hidden) this frame
-    wxMDIParentFrame * const parent = GetMDIParent();
+    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     MDISetMenu(parent->GetClientWindow(), NULL, NULL);
 
     return true;
 }
 
-void
-wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // we need to disable client area origin adjustments used for the child
-    // windows for the frame itself
-    wxMDIChildFrameBase::DoSetSize(x, y, width, height, sizeFlags);
-}
-
 // Set the client size (i.e. leave the calculation of borders etc.
 // to wxWidgets)
 void wxMDIChildFrame::DoSetClientSize(int width, int height)
@@ -942,15 +852,15 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
 
   // If there's an MDI parent, must subtract the parent's top left corner
   // since MoveWindow moves relative to the parent
-  wxMDIParentFrame * const mdiParent = GetMDIParent();
-  ::ScreenToClient(GetHwndOf(mdiParent->GetClientWindow()), &point);
+  wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
+  ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)true);
 
   wxSize size(width, height);
   wxSizeEvent event(size, m_windowId);
   event.SetEventObject( this );
-  HandleWindowEvent(event);
+  GetEventHandler()->ProcessEvent(event);
 }
 
 // Unlike other wxTopLevelWindowBase, the mdi child's "GetPosition" is not the
@@ -978,8 +888,8 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 
   // Since we now have the absolute screen coords,
   // if there's a parent we must subtract its top left corner
-  wxMDIParentFrame * const mdiParent = GetMDIParent();
-  ::ScreenToClient(GetHwndOf(mdiParent->GetClientWindow()), &point);
+  wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
+  ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   if (x)
       *x = point.x;
@@ -989,15 +899,17 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 
 void wxMDIChildFrame::InternalSetMenuBar()
 {
-    wxMDIParentFrame * const parent = GetMDIParent();
+    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
-    MDIInsertWindowMenu(parent->GetClientWindow(),
+    InsertWindowMenu(parent->GetClientWindow(),
                      m_hMenu, GetMDIWindowMenu(parent));
+
+    parent->m_parentFrameActive = false;
 }
 
 void wxMDIChildFrame::DetachMenuBar()
 {
-    MDIRemoveWindowMenu(NULL, m_hMenu);
+    RemoveWindowMenu(NULL, m_hMenu);
     wxFrame::DetachMenuBar();
 }
 
@@ -1013,7 +925,7 @@ WXHICON wxMDIChildFrame::GetDefaultIcon() const
 
 void wxMDIChildFrame::Maximize(bool maximize)
 {
-    wxMDIParentFrame * const parent = GetMDIParent();
+    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()),
@@ -1024,7 +936,7 @@ void wxMDIChildFrame::Maximize(bool maximize)
 
 void wxMDIChildFrame::Restore()
 {
-    wxMDIParentFrame * const parent = GetMDIParent();
+    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE,
@@ -1034,7 +946,7 @@ void wxMDIChildFrame::Restore()
 
 void wxMDIChildFrame::Activate()
 {
-    wxMDIParentFrame * const parent = GetMDIParent();
+    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE,
@@ -1047,14 +959,25 @@ void wxMDIChildFrame::Activate()
 // ---------------------------------------------------------------------------
 
 WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message,
-                                         WXWPARAM wParam,
-                                         WXLPARAM lParam)
+                                    WXWPARAM wParam,
+                                    WXLPARAM lParam)
 {
     WXLRESULT rc = 0;
     bool processed = false;
 
     switch ( message )
     {
+        case WM_COMMAND:
+            {
+                WORD id, cmd;
+                WXHWND hwnd;
+                UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
+                              &id, &hwnd, &cmd);
+
+                processed = HandleCommand(id, cmd, (WXHWND)hwnd);
+            }
+            break;
+
         case WM_GETMINMAXINFO:
             processed = HandleGetMinMaxInfo((MINMAXINFO *)lParam);
             break;
@@ -1081,6 +1004,11 @@ WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message,
             MSWDefWindowProc(message, wParam, lParam);
             break;
 
+        case WM_SYSCOMMAND:
+            // DefMDIChildProc handles SC_{NEXT/PREV}WINDOW here, so pass it
+            // the message (the base class version does not)
+            return MSWDefWindowProc(message, wParam, lParam);
+
         case WM_WINDOWPOSCHANGING:
             processed = HandleWindowPosChanging((LPWINDOWPOS)lParam);
             break;
@@ -1092,39 +1020,78 @@ WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message,
     return rc;
 }
 
+bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
+{
+    // In case it's e.g. a toolbar.
+    if ( hwnd )
+    {
+        wxWindow *win = wxFindWinFromHandle(hwnd);
+        if (win)
+            return win->MSWCommand(cmd, id);
+    }
+
+    if (wxCurrentPopupMenu)
+    {
+        wxMenu *popupMenu = wxCurrentPopupMenu;
+        wxCurrentPopupMenu = NULL;
+        if (popupMenu->MSWCommand(cmd, id))
+            return true;
+    }
+
+    bool processed;
+    if (GetMenuBar() && GetMenuBar()->FindItem(id))
+    {
+        processed = ProcessCommand(id);
+    }
+    else
+    {
+        processed = false;
+    }
+
+    return processed;
+}
+
 bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
                                         WXHWND hwndAct,
                                         WXHWND hwndDeact)
 {
-    wxMDIParentFrame * const parent = GetMDIParent();
+    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
-    WXHMENU hMenuToSet = 0;
+    HMENU menuToSet = 0;
 
     bool activated;
 
     if ( m_hWnd == hwndAct )
     {
         activated = true;
-        parent->SetActiveChild(this);
+        parent->m_currentChild = this;
 
-        WXHMENU hMenuChild = m_hMenu;
-        if ( hMenuChild )
-            hMenuToSet = hMenuChild;
+        HMENU child_menu = (HMENU)GetWinMenu();
+        if ( child_menu )
+        {
+            parent->m_parentFrameActive = false;
+
+            menuToSet = child_menu;
+        }
     }
     else if ( m_hWnd == hwndDeact )
     {
-        wxASSERT_MSG( parent->GetActiveChild() == this,
+        wxASSERT_MSG( parent->m_currentChild == this,
                       wxT("can't deactivate MDI child which wasn't active!") );
 
         activated = false;
-        parent->SetActiveChild(NULL);
+        parent->m_currentChild = NULL;
 
-        WXHMENU hMenuParent = parent->m_hMenu;
+        HMENU parent_menu = (HMENU)parent->GetWinMenu();
 
-        // activate the parent menu only when there is no other child
+        // activate the the parent menu only when there is no other child
         // that has been activated
-        if ( hMenuParent && !hwndAct )
-            hMenuToSet = hMenuParent;
+        if ( parent_menu && !hwndAct )
+        {
+            parent->m_parentFrameActive = true;
+
+            menuToSet = parent_menu;
+        }
     }
     else
     {
@@ -1132,18 +1099,18 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
         return false;
     }
 
-    if ( hMenuToSet )
+    if ( menuToSet )
     {
         MDISetMenu(parent->GetClientWindow(),
-                   (HMENU)hMenuToSet, GetMDIWindowMenu(parent));
+                   menuToSet, GetMDIWindowMenu(parent));
     }
 
     wxActivateEvent event(wxEVT_ACTIVATE, activated, m_windowId);
     event.SetEventObject( this );
 
-    ResetWindowStyle(NULL);
+    ResetWindowStyle((void *)NULL);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
@@ -1212,7 +1179,7 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 {
     // we must pass the parent frame to ::TranslateAccelerator(), otherwise it
     // doesn't do its job correctly for MDI child menus
-    return MSWDoTranslateMessage(GetMDIParent(), msg);
+    return MSWDoTranslateMessage((wxMDIChildFrame *)GetParent(), msg);
 }
 
 // ---------------------------------------------------------------------------
@@ -1221,7 +1188,7 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {
-    wxMDIParentFrame * const parent = GetMDIParent();
+    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
     // Must make sure this handle is invalidated (set to NULL) since all sorts
     // of things could happen after the child client is destroyed, but before
@@ -1231,8 +1198,8 @@ void wxMDIChildFrame::MSWDestroyWindow()
     SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIDESTROY,
                 (WPARAM)oldHandle, 0);
 
-    if (parent->GetActiveChild() == NULL)
-        ResetWindowStyle(NULL);
+    if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL)
+        ResetWindowStyle((void*) NULL);
 
     if (m_hMenu)
     {
@@ -1248,7 +1215,7 @@ void wxMDIChildFrame::MSWDestroyWindow()
 bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
 {
     RECT *rect = (RECT *)vrect;
-    wxMDIParentFrame * const pFrameWnd = GetMDIParent();
+    wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
 
     if (!pChild || (pChild == this))
@@ -1374,7 +1341,7 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF
             while (node)
             {
                 wxWindow *child = node->GetData();
-                if (wxDynamicCast(child, wxMDIChildFrame))
+                if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
                 {
                    ::RedrawWindow(GetHwndOf(child),
                                   NULL,
@@ -1416,13 +1383,10 @@ void wxMDIChildFrame::OnIdle(wxIdleEvent& event)
 }
 
 // ---------------------------------------------------------------------------
-// private helper functions
+// non member functions
 // ---------------------------------------------------------------------------
 
-namespace
-{
-
-void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
+static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
 {
     if ( hmenuFrame || hmenuWindow )
     {
@@ -1431,11 +1395,7 @@ void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
                             (WPARAM)hmenuFrame,
                             (LPARAM)hmenuWindow) )
         {
-            DWORD err = ::GetLastError();
-            if ( err )
-            {
-                wxLogApiError(wxT("SendMessage(WM_MDISETMENU)"), err);
-            }
+            wxLogLastError(_T("SendMessage(WM_MDISETMENU)"));
         }
     }
 
@@ -1448,62 +1408,60 @@ void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
     ::DrawMenuBar(GetWinHwnd(parent));
 }
 
-void MDIInsertWindowMenu(wxWindow *win, WXHMENU hMenu, HMENU menuWin)
+static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
 {
-    HMENU hmenu = (HMENU)hMenu;
+    // Try to insert Window menu in front of Help, otherwise append it.
+    HMENU hmenu = (HMENU)menu;
 
-    if ( menuWin )
+    if (subMenu)
     {
-        // Try to insert Window menu in front of Help, otherwise append it.
         int N = GetMenuItemCount(hmenu);
-        bool inserted = false;
+        bool success = false;
         for ( int i = 0; i < N; i++ )
         {
             wxChar buf[256];
-            if ( !::GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) )
+            int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
+            if ( chars == 0 )
             {
                 wxLogLastError(wxT("GetMenuString"));
 
                 continue;
             }
 
-            const wxString label = wxStripMenuCodes(buf);
-            if ( label == wxGetStockLabel(wxID_HELP, wxSTOCK_NOFLAGS) )
+            wxString strBuf(buf);
+            if ( wxStripMenuCodes(strBuf) == wxGetStockLabel(wxID_HELP,false) )
             {
-                inserted = true;
+                success = true;
                 ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
-                             (UINT_PTR)menuWin,
-                             wxString(wxGetTranslation(WINDOW_MENU_LABEL)).t_str());
+                             (UINT)subMenu, _("&Window"));
                 break;
             }
         }
 
-        if ( !inserted )
+        if ( !success )
         {
-            ::AppendMenu(hmenu, MF_POPUP,
-                         (UINT_PTR)menuWin,
-                         wxString(wxGetTranslation(WINDOW_MENU_LABEL)).t_str());
+            ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window"));
         }
     }
 
-    MDISetMenu(win, hmenu, menuWin);
+    MDISetMenu(win, hmenu, subMenu);
 }
 
-void MDIRemoveWindowMenu(wxWindow *win, WXHMENU hMenu)
+static void RemoveWindowMenu(wxWindow *win, WXHMENU menu)
 {
-    HMENU hmenu = (HMENU)hMenu;
+    HMENU hMenu = (HMENU)menu;
 
-    if ( hmenu )
+    if ( hMenu )
     {
         wxChar buf[1024];
 
-        int N = ::GetMenuItemCount(hmenu);
+        int N = ::GetMenuItemCount(hMenu);
         for ( int i = 0; i < N; i++ )
         {
-            if ( !::GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) )
+            if ( !::GetMenuString(hMenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) )
             {
                 // Ignore successful read of menu string with length 0 which
-                // occurs, for example, for a maximized MDI child system menu
+                // occurs, for example, for a maximized MDI childs system menu
                 if ( ::GetLastError() != 0 )
                 {
                     wxLogLastError(wxT("GetMenuString"));
@@ -1512,9 +1470,9 @@ void MDIRemoveWindowMenu(wxWindow *win, WXHMENU hMenu)
                 continue;
             }
 
-            if ( wxStrcmp(buf, wxGetTranslation(WINDOW_MENU_LABEL)) == 0 )
+            if ( wxStrcmp(buf, _("&Window")) == 0 )
             {
-                if ( !::RemoveMenu(hmenu, i, MF_BYPOSITION) )
+                if ( !::RemoveMenu(hMenu, i, MF_BYPOSITION) )
                 {
                     wxLogLastError(wxT("RemoveMenu"));
                 }
@@ -1527,11 +1485,11 @@ void MDIRemoveWindowMenu(wxWindow *win, WXHMENU hMenu)
     if ( win )
     {
         // we don't change the windows menu, but we update the main one
-        MDISetMenu(win, hmenu, NULL);
+        MDISetMenu(win, hMenu, NULL);
     }
 }
 
-void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
+static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
                               WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact)
 {
     *activate = true;
@@ -1539,6 +1497,4 @@ void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
     *hwndDeact = (WXHWND)wParam;
 }
 
-} // anonymous namespace
-
 #endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)
diff --git a/Source/3rd Party/wx/src/msw/menu.cpp b/Source/3rd Party/wx/src/msw/menu.cpp
index 3541b3e04..907b6c0b9 100644
--- a/Source/3rd Party/wx/src/msw/menu.cpp	
+++ b/Source/3rd Party/wx/src/msw/menu.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: menu.cpp 54478 2008-07-03 15:42:18Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,22 +29,18 @@
 #include "wx/menu.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
-    #include "wx/image.h"
 #endif
 
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
 #endif
 
-#include "wx/scopedarray.h"
-#include "wx/vector.h"
-
 #include "wx/msw/private.h"
-#include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
 
 #ifdef __WXWINCE__
 #include <windows.h>
@@ -63,7 +59,7 @@
 // other standard headers
 #include <string.h>
 
-#if wxUSE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN && defined(MIIM_BITMAP)
     #include "wx/dynlib.h"
 #endif
 
@@ -83,114 +79,20 @@
 // ----------------------------------------------------------------------------
 
 // the (popup) menu title has this special id
-static const int idMenuTitle = wxID_NONE;
+static const int idMenuTitle = -3;
 
 // ----------------------------------------------------------------------------
-// private helper classes and functions
+// private functions
 // ----------------------------------------------------------------------------
 
-// Contains the data about the radio items groups in the given menu.
-class wxMenuRadioItemsData
-{
-public:
-    wxMenuRadioItemsData() { }
-
-    // Default copy ctor, assignment operator and dtor are all ok.
-
-    // Find the start and end of the group containing the given position or
-    // return false if it's not inside any range.
-    bool GetGroupRange(int pos, int *start, int *end) const
-    {
-        // We use a simple linear search here because there are not that many
-        // items in a menu and hence even fewer radio items ranges anyhow, so
-        // normally there is no need to do anything fancy (like keeping the
-        // array sorted and using binary search).
-        for ( Ranges::const_iterator it = m_ranges.begin();
-              it != m_ranges.end();
-              ++it )
-        {
-            const Range& r = *it;
-
-            if ( r.start <= pos && pos <= r.end )
-            {
-                if ( start )
-                    *start = r.start;
-                if ( end )
-                    *end = r.end;
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    // Take into account the new radio item about to be added at the given
-    // position.
-    //
-    // Returns true if this item starts a new radio group, false if it extends
-    // an existing one.
-    bool UpdateOnInsert(int pos)
-    {
-        bool inExistingGroup = false;
-
-        for ( Ranges::iterator it = m_ranges.begin();
-              it != m_ranges.end();
-              ++it )
-        {
-            Range& r = *it;
-
-            if ( pos < r.start )
-            {
-                // Item is inserted before this range, update its indices.
-                r.start++;
-                r.end++;
-            }
-            else if ( pos <= r.end + 1 )
-            {
-                // Item is inserted in the middle of this range or immediately
-                // after it in which case it extends this range so make it span
-                // one more item in any case.
-                r.end++;
-
-                inExistingGroup = true;
-            }
-            //else: Item is inserted after this range, nothing to do for it.
-        }
-
-        if ( inExistingGroup )
-            return false;
-
-        // Make a new range for the group this item will belong to.
-        Range r;
-        r.start = pos;
-        r.end = pos;
-        m_ranges.push_back(r);
-
-        return true;
-    }
-
-private:
-    // Contains the inclusive positions of the range start and end.
-    struct Range
-    {
-        int start;
-        int end;
-    };
-
-    typedef wxVector<Range> Ranges;
-    Ranges m_ranges;
-};
-
-namespace
-{
-
 // make the given menu item default
-void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
-                        UINT WXUNUSED_IN_WINCE(id))
+static void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
+                               UINT WXUNUSED_IN_WINCE(id))
 {
 #ifndef __WXWINCE__
-    WinStruct<MENUITEMINFO> mii;
+    MENUITEMINFO mii;
+    wxZeroMemory(mii);
+    mii.cbSize = sizeof(MENUITEMINFO);
     mii.fMask = MIIM_STATE;
     mii.fState = MFS_DEFAULT;
 
@@ -198,77 +100,130 @@ void SetDefaultMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
     {
         wxLogLastError(wxT("SetMenuItemInfo"));
     }
-#endif // !__WXWINCE__
-}
-
-// make the given menu item owner-drawn
-void SetOwnerDrawnMenuItem(HMENU WXUNUSED_IN_WINCE(hmenu),
-                           UINT WXUNUSED_IN_WINCE(id),
-                           ULONG_PTR WXUNUSED_IN_WINCE(data),
-                           BOOL WXUNUSED_IN_WINCE(byPositon = FALSE))
-{
-#ifndef __WXWINCE__
-    WinStruct<MENUITEMINFO> mii;
-    mii.fMask = MIIM_FTYPE | MIIM_DATA;
-    mii.fType = MFT_OWNERDRAW;
-    mii.dwItemData = data;
-
-    if ( reinterpret_cast<wxMenuItem*>(data)->IsSeparator() )
-        mii.fType |= MFT_SEPARATOR;
-
-    if ( !::SetMenuItemInfo(hmenu, id, byPositon, &mii) )
-    {
-        wxLogLastError(wxT("SetMenuItemInfo"));
-    }
-#endif // !__WXWINCE__
+#endif
 }
 
 #ifdef __WXWINCE__
 UINT GetMenuState(HMENU hMenu, UINT id, UINT flags)
 {
-    WinStruct<MENUITEMINFO> info;
+    MENUITEMINFO info;
+    wxZeroMemory(info);
+    info.cbSize = sizeof(info);
     info.fMask = MIIM_STATE;
     // MF_BYCOMMAND is zero so test MF_BYPOSITION
     if ( !::GetMenuItemInfo(hMenu, id, flags & MF_BYPOSITION ? TRUE : FALSE , & info) )
-    {
         wxLogLastError(wxT("GetMenuItemInfo"));
-    }
     return info.fState;
 }
-#endif // __WXWINCE__
-
-inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
-{
-    return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) ||
-            bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK);
-}
-
-} // anonymous namespace
+#endif
 
 // ============================================================================
 // implementation
 // ============================================================================
 
+#include "wx/listimpl.cpp"
+
+WX_DEFINE_LIST( wxMenuInfoList )
+
+#if wxUSE_EXTENDED_RTTI
+
+WX_DEFINE_FLAGS( wxMenuStyle )
+
+wxBEGIN_FLAGS( wxMenuStyle )
+    wxFLAGS_MEMBER(wxMENU_TEAROFF)
+wxEND_FLAGS( wxMenuStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler,"wx/menu.h")
+
+wxCOLLECTION_TYPE_INFO( wxMenuItem * , wxMenuItemList ) ;
+
+template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxxVariantArray &value)
+{
+    wxListCollectionToVariantArray<wxMenuItemList::compatibility_iterator>( theList , value ) ;
+}
+
+wxBEGIN_PROPERTIES_TABLE(wxMenu)
+    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_MENU_SELECTED , wxCommandEvent)
+    wxPROPERTY( Title, wxString , SetTitle, GetTitle, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxREADONLY_PROPERTY_FLAGS( MenuStyle , wxMenuStyle , long , GetStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY_COLLECTION( MenuItems , wxMenuItemList , wxMenuItem* , Append , GetMenuItems , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxMenu)
+wxEND_HANDLERS_TABLE()
+
+wxDIRECT_CONSTRUCTOR_2( wxMenu , wxString , Title , long , MenuStyle  )
+
+WX_DEFINE_FLAGS( wxMenuBarStyle )
+
+wxBEGIN_FLAGS( wxMenuBarStyle )
+    wxFLAGS_MEMBER(wxMB_DOCKABLE)
+wxEND_FLAGS( wxMenuBarStyle )
+
+// the negative id would lead the window (its superclass !) to vetoe streaming out otherwise
+bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxWriter * , wxPersister * , wxxVariantArray & )
+{
+    return true ;
+}
+
+IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow ,"wx/menu.h",wxMenuBarStreamingCallback)
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxMenuInfo, wxObject , "wx/menu.h" )
+
+wxBEGIN_PROPERTIES_TABLE(wxMenuInfo)
+    wxREADONLY_PROPERTY( Menu , wxMenu* , GetMenu , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxREADONLY_PROPERTY( Title , wxString , GetTitle , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxMenuInfo)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_2( wxMenuInfo , wxMenu* , Menu , wxString , Title )
+
+wxCOLLECTION_TYPE_INFO( wxMenuInfo * , wxMenuInfoList ) ;
+
+template<> void wxCollectionToVariantArray( wxMenuInfoList const &theList, wxxVariantArray &value)
+{
+    wxListCollectionToVariantArray<wxMenuInfoList::compatibility_iterator>( theList , value ) ;
+}
+
+wxBEGIN_PROPERTIES_TABLE(wxMenuBar)
+    wxPROPERTY_COLLECTION( MenuInfos , wxMenuInfoList , wxMenuInfo* , Append , GetMenuInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxMenuBar)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_DUMMY( wxMenuBar )
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuInfo, wxObject)
+#endif
+
+const wxMenuInfoList& wxMenuBar::GetMenuInfos() const
+{
+    wxMenuInfoList* list = const_cast< wxMenuInfoList* >( &m_menuInfos ) ;
+    WX_CLEAR_LIST( wxMenuInfoList , *list ) ;
+    for( size_t i = 0 ; i < GetMenuCount() ; ++i )
+    {
+        wxMenuInfo* info = new wxMenuInfo() ;
+        info->Create( const_cast<wxMenuBar*>(this)->GetMenu(i) , GetLabelTop(i) ) ;
+        list->Append( info ) ;
+    }
+    return m_menuInfos ;
+}
+
 // ---------------------------------------------------------------------------
 // wxMenu construction, adding and removing menu items
 // ---------------------------------------------------------------------------
 
 // Construct a menu with optional title (then use append)
-void wxMenu::InitNoCreate()
-{
-    m_radioData = NULL;
-    m_doBreak = false;
-
-#if wxUSE_OWNER_DRAWN
-    m_ownerDrawn = false;
-    m_maxBitmapWidth = 0;
-    m_maxAccelWidth = -1;
-#endif // wxUSE_OWNER_DRAWN
-}
-
 void wxMenu::Init()
 {
-    InitNoCreate();
+    m_doBreak = false;
+    m_startRadioGroup = -1;
 
     // create the menu
     m_hMenu = (WXHMENU)CreatePopupMenu();
@@ -280,27 +235,8 @@ void wxMenu::Init()
     // if we have a title, insert it in the beginning of the menu
     if ( !m_title.empty() )
     {
-        const wxString title = m_title;
-        m_title.clear(); // so that SetTitle() knows there was no title before
-        SetTitle(title);
-    }
-}
-
-wxMenu::wxMenu(WXHMENU hMenu)
-{
-    InitNoCreate();
-
-    m_hMenu = hMenu;
-
-    // Ensure that our internal idea of how many items we have corresponds to
-    // the real number of items in the menu.
-    //
-    // We could also retrieve the real labels of the items here but it doesn't
-    // seem to be worth the trouble.
-    const int numExistingItems = ::GetMenuItemCount(m_hMenu);
-    for ( int n = 0; n < numExistingItems; n++ )
-    {
-        wxMenuBase::DoAppend(wxMenuItem::New(this, wxID_SEPARATOR));
+        Append(idMenuTitle, m_title);
+        AppendSeparator();
     }
 }
 
@@ -322,8 +258,6 @@ wxMenu::~wxMenu()
     // delete accels
     WX_CLEAR_ARRAY(m_accels);
 #endif // wxUSE_ACCEL
-
-    delete m_radioData;
 }
 
 void wxMenu::Break()
@@ -332,6 +266,13 @@ void wxMenu::Break()
     m_doBreak = true;
 }
 
+void wxMenu::Attach(wxMenuBarBase *menubar)
+{
+    wxMenuBase::Attach(menubar);
+
+    EndRadioGroup();
+}
+
 #if wxUSE_ACCEL
 
 int wxMenu::FindAccel(int id) const
@@ -372,7 +313,7 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
         }
 
         // find the (new) accel for this item
-        wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetItemLabel());
+        wxAcceleratorEntry *accel = wxAcceleratorEntry::Create(item->GetText());
         if ( accel )
             accel->m_command = item->GetId();
 
@@ -400,69 +341,12 @@ void wxMenu::UpdateAccel(wxMenuItem *item)
         {
             GetMenuBar()->RebuildAccelTable();
         }
-
-#if wxUSE_OWNER_DRAWN
-        ResetMaxAccelWidth();
-#endif
     }
     //else: it is a separator, they can't have accels, nothing to do
 }
 
 #endif // wxUSE_ACCEL
 
-namespace
-{
-
-// helper of DoInsertOrAppend(): returns the HBITMAP to use in MENUITEMINFO
-HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true)
-{
-    // Under versions of Windows older than Vista we can't pass HBITMAP
-    // directly as hbmpItem for 2 reasons:
-    //  1. We can't draw it with transparency then (this is not
-    //     very important now but would be with themed menu bg)
-    //  2. Worse, Windows inverts the bitmap for the selected
-    //     item and this looks downright ugly
-    //
-    // So we prefer to instead draw it ourselves in MSWOnDrawItem().by using
-    // HBMMENU_CALLBACK when inserting it
-    //
-    // However under Vista using HBMMENU_CALLBACK causes the entire menu to be
-    // drawn using the classic theme instead of the current one and it does
-    // handle transparency just fine so do use the real bitmap there
-#if wxUSE_IMAGE
-    if ( wxGetWinVersion() >= wxWinVersion_Vista )
-    {
-#if wxUSE_OWNER_DRAWN
-        wxBitmap bmp = pItem->GetBitmap(checked);
-        if ( bmp.IsOk() )
-        {
-            // we must use PARGB DIB for the menu bitmaps so ensure that we do
-            wxImage img(bmp.ConvertToImage());
-            if ( !img.HasAlpha() )
-            {
-                img.InitAlpha();
-                pItem->SetBitmap(img, checked);
-            }
-
-            return GetHbitmapOf(pItem->GetBitmap(checked));
-        }
-#endif // wxUSE_OWNER_DRAWN
-        //else: bitmap is not set
-
-        return NULL;
-    }
-#endif // wxUSE_IMAGE
-
-    return HBMMENU_CALLBACK;
-}
-
-} // anonymous namespace
-
-bool wxMenu::MSWGetRadioGroupRange(int pos, int *start, int *end) const
-{
-    return m_radioData && m_radioData->GetGroupRange(pos, start, end);
-}
-
 // append a new item or submenu to the menu
 bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 {
@@ -486,24 +370,24 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
 
     // id is the numeric id for normal menu items and HMENU for submenus as
     // required by ::AppendMenu() API
-    UINT_PTR id;
+    UINT id;
     wxMenu *submenu = pItem->GetSubMenu();
     if ( submenu != NULL ) {
         wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") );
 
         submenu->SetParent(this);
 
-        id = (UINT_PTR)submenu->GetHMenu();
+        id = (UINT)submenu->GetHMenu();
 
         flags |= MF_POPUP;
     }
     else {
-        id = pItem->GetMSWId();
+        id = pItem->GetId();
     }
 
 
     // prepare to insert the item in the menu
-    wxString itemText = pItem->GetItemLabel();
+    wxString itemText = pItem->GetText();
     LPCTSTR pData = NULL;
     if ( pos == (size_t)-1 )
     {
@@ -512,92 +396,68 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         pos = GetMenuItemCount() - 1;
     }
 
-    // Update radio groups data if we're inserting a new radio item.
-    //
-    // NB: If we supported inserting non-radio items in the middle of existing
-    //     radio groups to break them into two subgroups, we'd need to update
-    //     m_radioData in this case too but currently this is not supported.
-    bool checkInitially = false;
-    if ( pItem->GetKind() == wxITEM_RADIO )
-    {
-        if ( !m_radioData )
-            m_radioData = new wxMenuRadioItemsData;
-
-        if ( m_radioData->UpdateOnInsert(pos) )
-            checkInitially = true;
-    }
-
-    // adjust position to account for the title of a popup menu, if any
-    if ( !GetMenuBar() && !m_title.empty() )
+    // adjust position to account for the title, if any
+    if ( !m_title.empty() )
         pos += 2; // for the title itself and its separator
 
     BOOL ok = false;
 
 #if wxUSE_OWNER_DRAWN
-    // Under older systems mixing owner-drawn and non-owner-drawn items results
-    // in inconsistent margins, so we force this one to be owner-drawn if any
-    // other items already are.
-    if ( m_ownerDrawn )
-        pItem->SetOwnerDrawn(true);
-#endif // wxUSE_OWNER_DRAWN
+    // Currently, mixing owner-drawn and non-owner-drawn items results in
+    // inconsistent margins, so we force this to be owner-drawn if any other
+    // items already are. Later we might want to use a boolean in the wxMenu
+    // to avoid search. Also we might make this fix unnecessary by getting the correct
+    // margin using NONCLIENTMETRICS.
+    if ( !pItem->IsOwnerDrawn() && !pItem->IsSeparator() )
+    {
+        // Check if any other items are ownerdrawn, and make ownerdrawn if so
+        wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
+        while (node)
+        {
+            if (node->GetData()->IsOwnerDrawn())
+            {
+                pItem->SetOwnerDrawn(true);
+                break;
+            }
+            node = node->GetNext();
+        }
+    }
+#endif
 
     // check if we have something more than a simple text item
 #if wxUSE_OWNER_DRAWN
     if ( pItem->IsOwnerDrawn() )
     {
-#ifndef __DMC__
-
-        if ( !m_ownerDrawn && !pItem->IsSeparator() )
+        // is the item owner-drawn just because of the [checked] bitmap?
+        if ( (pItem->GetBitmap(false).Ok() || pItem->GetBitmap(true).Ok()) &&
+                !pItem->GetTextColour().Ok() &&
+                    !pItem->GetBackgroundColour().Ok() &&
+                        !pItem->GetFont().Ok() )
         {
-            // MIIM_BITMAP only works under WinME/2000+ so we always use owner
-            // drawn item under the previous versions and we also have to use
-            // them in any case if the item has custom colours or font
-            static const wxWinVersion winver = wxGetWinVersion();
-            bool mustUseOwnerDrawn = winver < wxWinVersion_98 ||
-                                     pItem->GetTextColour().IsOk() ||
-                                     pItem->GetBackgroundColour().IsOk() ||
-                                     pItem->GetFont().IsOk();
+            // try to use InsertMenuItem() as it's guaranteed to look correct
+            // while our owner-drawn code is not
 
-            if ( !mustUseOwnerDrawn )
+            // first compile-time check
+            // MIIM_BITMAP only works under Win98/2000+
+#if defined(MIIM_BITMAP) && (_WIN32_WINNT >= 0x0500)
+            WinStruct<wxMENUITEMINFO_> mii;
+            if ( wxGetWinVersion() >= wxWinVersion_98 )
             {
-                const wxBitmap& bmpUnchecked = pItem->GetBitmap(false),
-                                bmpChecked   = pItem->GetBitmap(true);
-
-                if ( (bmpUnchecked.IsOk() && IsGreaterThanStdSize(bmpUnchecked)) ||
-                     (bmpChecked.IsOk()   && IsGreaterThanStdSize(bmpChecked)) )
-                {
-                    mustUseOwnerDrawn = true;
-                }
-            }
-
-            // use InsertMenuItem() if possible as it's guaranteed to look
-            // correct while our owner-drawn code is not
-            if ( !mustUseOwnerDrawn )
-            {
-                WinStruct<MENUITEMINFO> mii;
-                mii.fMask = MIIM_STRING | MIIM_DATA;
-
-                // don't set hbmpItem for the checkable items as it would
-                // be used for both checked and unchecked state
+                mii.fMask = MIIM_STRING | MIIM_DATA | MIIM_BITMAP;
                 if ( pItem->IsCheckable() )
                 {
+                    // need to set checked/unchecked bitmaps as otherwise our
+                    // MSWOnDrawItem() item is not called
                     mii.fMask |= MIIM_CHECKMARKS;
-                    mii.hbmpChecked = GetHBitmapForMenu(pItem, true);
-                    mii.hbmpUnchecked = GetHBitmapForMenu(pItem, false);
-                }
-                else if ( pItem->GetBitmap().IsOk() )
-                {
-                    mii.fMask |= MIIM_BITMAP;
-                    mii.hbmpItem = GetHBitmapForMenu(pItem);
                 }
 
                 mii.cch = itemText.length();
-                mii.dwTypeData = wxMSW_CONV_LPTSTR(itemText);
+                mii.dwTypeData = wx_const_cast(wxChar *, itemText.c_str());
 
-                if ( flags & MF_POPUP )
+                if (flags & MF_POPUP)
                 {
                     mii.fMask |= MIIM_SUBMENU;
-                    mii.hSubMenu = GetHmenuOf(pItem->GetSubMenu());
+                    mii.hSubMenu = (HMENU)pItem->GetSubMenu()->GetHMenu();
                 }
                 else
                 {
@@ -605,9 +465,23 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                     mii.wID = id;
                 }
 
-                mii.dwItemData = reinterpret_cast<ULONG_PTR>(pItem);
+                // we can't pass HBITMAP directly as hbmpItem for 2 reasons:
+                //  1. we can't draw it with transparency then (this is not
+                //     very important now but would be with themed menu bg)
+                //  2. worse, Windows inverts the bitmap for the selected
+                //     item and this looks downright ugly
+                //
+                // so instead draw it ourselves in MSWOnDrawItem()
+                mii.dwItemData = wx_reinterpret_cast(ULONG_PTR, pItem);
+                if ( pItem->IsCheckable() )
+                {
+                    mii.hbmpChecked =
+                    mii.hbmpUnchecked = HBMMENU_CALLBACK;
+                }
+                mii.hbmpItem = HBMMENU_CALLBACK;
 
-                ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */, &mii);
+                ok = ::InsertMenuItem(GetHmenu(), pos, TRUE /* by pos */,
+                                      (MENUITEMINFO*)&mii);
                 if ( !ok )
                 {
                     wxLogLastError(wxT("InsertMenuItem()"));
@@ -624,85 +498,29 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                     // the app from starting up under Windows 95/NT 4
                     typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *);
 
-                    wxDynamicLibrary dllUser(wxT("user32"));
+                    wxDynamicLibrary dllUser(_T("user32"));
                     wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser);
                     if ( pfnSetMenuInfo )
                     {
                         mi.fMask = MIM_STYLE;
                         mi.dwStyle = MNS_CHECKORBMP;
                         if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )
-                        {
-                            wxLogLastError(wxT("SetMenuInfo(MNS_NOCHECK)"));
-                        }
+                            wxLogLastError(_T("SetMenuInfo(MNS_NOCHECK)"));
                     }
 
                     // tell the item that it's not really owner-drawn but only
                     // needs to draw its bitmap, the rest is done by Windows
-                    pItem->SetOwnerDrawn(false);
+                    pItem->ResetOwnerDrawn();
                 }
             }
+#endif // defined(MIIM_BITMAP) && (_WIN32_WINNT >= 0x0500)
         }
-#endif // __DMC__
 
         if ( !ok )
         {
             // item draws itself, pass pointer to it in data parameter
             flags |= MF_OWNERDRAW;
             pData = (LPCTSTR)pItem;
-
-            bool updateAllMargins = false;
-
-            // get size of bitmap always return valid value (0 for invalid bitmap),
-            // so we don't needed check if bitmap is valid ;)
-            int uncheckedW = pItem->GetBitmap(false).GetWidth();
-            int checkedW   = pItem->GetBitmap(true).GetWidth();
-
-            if ( m_maxBitmapWidth < uncheckedW )
-            {
-                m_maxBitmapWidth = uncheckedW;
-                updateAllMargins = true;
-            }
-
-            if ( m_maxBitmapWidth < checkedW )
-            {
-                m_maxBitmapWidth = checkedW;
-                updateAllMargins = true;
-            }
-
-            // make other item ownerdrawn and update margin width for equals alignment
-            if ( !m_ownerDrawn || updateAllMargins )
-            {
-                // we must use position in SetOwnerDrawnMenuItem because
-                // all separators have the same id
-                int pos = 0;
-                wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
-                while (node)
-                {
-                    wxMenuItem* item = node->GetData();
-
-                    if ( !item->IsOwnerDrawn())
-                    {
-                        item->SetOwnerDrawn(true);
-                        SetOwnerDrawnMenuItem(GetHmenu(), pos,
-                                              reinterpret_cast<ULONG_PTR>(item), TRUE);
-                    }
-
-                    item->SetMarginWidth(m_maxBitmapWidth);
-
-                    node = node->GetNext();
-                    pos++;
-                }
-
-                // set menu as ownerdrawn
-                m_ownerDrawn = true;
-
-                ResetMaxAccelWidth();
-            }
-            // only update our margin for equals alignment to other item
-            else if ( !updateAllMargins )
-            {
-                pItem->SetMarginWidth(m_maxBitmapWidth);
-            }
         }
     }
     else
@@ -712,10 +530,10 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
         flags |= MF_STRING;
 
 #ifdef __WXWINCE__
-        itemText = wxMenuItem::GetLabelText(itemText);
+        itemText = wxMenuItem::GetLabelFromText(itemText);
 #endif
 
-        pData = itemText.t_str();
+        pData = (wxChar*)itemText.c_str();
     }
 
     // item might have already been inserted by InsertMenuItem() above
@@ -730,12 +548,8 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     }
 
 
-    // Check the item if it should be initially checked.
-    if ( checkInitially )
-        pItem->Check(true);
-
     // if we just appended the title, highlight it
-    if ( id == (UINT_PTR)idMenuTitle )
+    if ( (int)id == idMenuTitle )
     {
         // visually select the menu title
         SetDefaultMenuItem(GetHmenu(), id);
@@ -750,9 +564,67 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
     return true;
 }
 
+void wxMenu::EndRadioGroup()
+{
+    // we're not inside a radio group any longer
+    m_startRadioGroup = -1;
+}
+
 wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
 {
-    return wxMenuBase::DoAppend(item) && DoInsertOrAppend(item) ? item : NULL;
+    wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
+
+    bool check = false;
+
+    if ( item->GetKind() == wxITEM_RADIO )
+    {
+        int count = GetMenuItemCount();
+
+        if ( m_startRadioGroup == -1 )
+        {
+            // start a new radio group
+            m_startRadioGroup = count;
+
+            // for now it has just one element
+            item->SetAsRadioGroupStart();
+            item->SetRadioGroupEnd(m_startRadioGroup);
+
+            // ensure that we have a checked item in the radio group
+            check = true;
+        }
+        else // extend the current radio group
+        {
+            // we need to update its end item
+            item->SetRadioGroupStart(m_startRadioGroup);
+            wxMenuItemList::compatibility_iterator node = GetMenuItems().Item(m_startRadioGroup);
+
+            if ( node )
+            {
+                node->GetData()->SetRadioGroupEnd(count);
+            }
+            else
+            {
+                wxFAIL_MSG( _T("where is the radio group start item?") );
+            }
+        }
+    }
+    else // not a radio item
+    {
+        EndRadioGroup();
+    }
+
+    if ( !wxMenuBase::DoAppend(item) || !DoInsertOrAppend(item) )
+    {
+        return NULL;
+    }
+
+    if ( check )
+    {
+        // check the item initially
+        item->Check(true);
+    }
+
+    return item;
 }
 
 wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
@@ -787,10 +659,6 @@ wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)
         delete m_accels[n];
 
         m_accels.RemoveAt(n);
-
-#if wxUSE_OWNER_DRAWN
-        ResetMaxAccelWidth();
-#endif
     }
     //else: this item doesn't have an accel, nothing to do
 #endif // wxUSE_ACCEL
@@ -830,45 +698,8 @@ size_t wxMenu::CopyAccels(wxAcceleratorEntry *accels) const
     return count;
 }
 
-wxAcceleratorTable *wxMenu::CreateAccelTable() const
-{
-    const size_t count = m_accels.size();
-    wxScopedArray<wxAcceleratorEntry> accels(new wxAcceleratorEntry[count]);
-    CopyAccels(accels.get());
-
-    return new wxAcceleratorTable(count, accels.get());
-}
-
 #endif // wxUSE_ACCEL
 
-// ---------------------------------------------------------------------------
-// ownerdrawn helpers
-// ---------------------------------------------------------------------------
-
-#if wxUSE_OWNER_DRAWN
-
-void wxMenu::CalculateMaxAccelWidth()
-{
-    wxASSERT_MSG( m_maxAccelWidth == -1, wxT("it's really needed?") );
-
-    wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();
-    while (node)
-    {
-        wxMenuItem* item = node->GetData();
-
-        if ( item->IsOwnerDrawn() )
-        {
-            int width = item->MeasureAccelWidth();
-            if (width > m_maxAccelWidth )
-                m_maxAccelWidth = width;
-        }
-
-        node = node->GetNext();
-    }
-}
-
-#endif // wxUSE_OWNER_DRAWN
-
 // ---------------------------------------------------------------------------
 // set wxMenu title
 // ---------------------------------------------------------------------------
@@ -885,7 +716,7 @@ void wxMenu::SetTitle(const wxString& label)
         if ( !label.empty() )
         {
             if ( !::InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
-                               (UINT_PTR)idMenuTitle, m_title.t_str()) ||
+                               (unsigned)idMenuTitle, m_title) ||
                  !::InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )
             {
                 wxLogLastError(wxT("InsertMenu"));
@@ -907,11 +738,13 @@ void wxMenu::SetTitle(const wxString& label)
         {
             // modify the title
 #ifdef __WXWINCE__
-            WinStruct<MENUITEMINFO> info;
+            MENUITEMINFO info;
+            wxZeroMemory(info);
+            info.cbSize = sizeof(info);
             info.fMask = MIIM_TYPE;
             info.fType = MFT_STRING;
             info.cch = m_title.length();
-            info.dwTypeData = wxMSW_CONV_LPTSTR(m_title);
+            info.dwTypeData = (LPTSTR) m_title.c_str();
             if ( !SetMenuItemInfo(hMenu, 0, TRUE, & info) )
             {
                 wxLogLastError(wxT("SetMenuItemInfo"));
@@ -919,7 +752,7 @@ void wxMenu::SetTitle(const wxString& label)
 #else
             if ( !ModifyMenu(hMenu, 0u,
                              MF_BYPOSITION | MF_STRING,
-                             (UINT_PTR)idMenuTitle, m_title.t_str()) )
+                             (unsigned)idMenuTitle, m_title) )
             {
                 wxLogLastError(wxT("ModifyMenu"));
             }
@@ -940,62 +773,38 @@ void wxMenu::SetTitle(const wxString& label)
 // event processing
 // ---------------------------------------------------------------------------
 
-bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id_)
+bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
 {
-    const int id = (signed short)id_;
-
     // ignore commands from the menu title
-    if ( id != idMenuTitle )
+    if ( id != (WXWORD)idMenuTitle )
     {
-        // Default value for uncheckable items.
-        int checked = -1;
-
         // update the check item when it's clicked
         wxMenuItem * const item = FindItem(id);
         if ( item && item->IsCheckable() )
-        {
             item->Toggle();
 
-            // Get the status of the menu item: note that it has been just changed
-            // by Toggle() above so here we already get the new state of the item.
-            //
-            // Also notice that we must pass unsigned id_ and not sign-extended id
-            // to ::GetMenuState() as this is what it expects.
-            UINT menuState = ::GetMenuState(GetHmenu(), id_, MF_BYCOMMAND);
-            checked = (menuState & MF_CHECKED) != 0;
-        }
-
-        SendEvent(id, checked);
+        // get the status of the menu item: note that it has been just changed
+        // by Toggle() above so here we already get the new state of the item
+        UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND);
+        SendEvent(id, menuState & MF_CHECKED);
     }
 
     return true;
 }
 
-// get the menu with given handle (recursively)
-#if wxUSE_OWNER_DRAWN
-wxMenu* wxMenu::MSWGetMenu(WXHMENU hMenu)
+// ---------------------------------------------------------------------------
+// other
+// ---------------------------------------------------------------------------
+
+wxWindow *wxMenu::GetWindow() const
 {
-    // check self
-    if ( GetHMenu() == hMenu )
-        return this;
+    if ( m_invokingWindow != NULL )
+        return m_invokingWindow;
+    else if ( GetMenuBar() != NULL)
+        return GetMenuBar()->GetFrame();
 
-    // recursively query submenus
-    for ( size_t n = 0 ; n < GetMenuItemCount(); ++n )
-    {
-        wxMenuItem* item = FindItemByPosition(n);
-        wxMenu* submenu = item->GetSubMenu();
-        if ( submenu )
-        {
-            submenu = submenu->MSWGetMenu(hMenu);
-            if (submenu)
-                return submenu;
-        }
-    }
-
-    // unknown hMenu
     return NULL;
 }
-#endif // wxUSE_OWNER_DRAWN
 
 // ---------------------------------------------------------------------------
 // Menu Bar
@@ -1031,13 +840,12 @@ wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], lon
 {
     Init();
 
+    m_titles.Alloc(count);
+
     for ( size_t i = 0; i < count; i++ )
     {
-        // We just want to store the menu title in the menu itself, not to
-        // show it as a dummy item in the menu itself as we do with the popup
-        // menu titles in overridden wxMenu::SetTitle().
-        menus[i]->wxMenuBase::SetTitle(titles[i]);
         m_menus.Append(menus[i]);
+        m_titles.Add(titles[i]);
 
         menus[i]->Attach(this);
     }
@@ -1104,41 +912,41 @@ WXHMENU wxMenuBar::Create()
     if ( m_hMenu != 0 )
         return m_hMenu;
 
-    wxToolMenuBar * const bar = static_cast<wxToolMenuBar *>(GetToolBar());
-    if ( !bar )
-        return NULL;
+    if (!GetToolBar())
+        return 0;
 
-    HWND hCommandBar = GetHwndOf(bar);
+    HWND hCommandBar = (HWND) GetToolBar()->GetHWND();
+    HMENU hMenu = (HMENU)::SendMessage(hCommandBar, SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0);
 
-    // notify comctl32.dll about the version of the headers we use before using
-    // any other TB_XXX messages
-    SendMessage(hCommandBar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
-
-    TBBUTTON tbButton;
-    wxZeroMemory(tbButton);
-    tbButton.iBitmap = I_IMAGENONE;
-    tbButton.fsState = TBSTATE_ENABLED;
-    tbButton.fsStyle = TBSTYLE_DROPDOWN |
-                       TBSTYLE_NO_DROPDOWN_ARROW |
-                       TBSTYLE_AUTOSIZE;
-
-    for ( unsigned i = 0; i < GetMenuCount(); i++ )
+    // hMenu may be zero on Windows Mobile 5. So add the menus anyway.
+    if (1) // (hMenu)
     {
-        HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu();
-        tbButton.dwData = (DWORD)hPopupMenu;
-        wxString label = wxStripMenuCodes(GetMenuLabel(i));
-        tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label);
+        TBBUTTON tbButton;
+        memset(&tbButton, 0, sizeof(TBBUTTON));
+        tbButton.iBitmap = I_IMAGENONE;
+        tbButton.fsState = TBSTATE_ENABLED;
+        tbButton.fsStyle = TBSTYLE_DROPDOWN | TBSTYLE_NO_DROPDOWN_ARROW | TBSTYLE_AUTOSIZE;
 
-        tbButton.idCommand = NewControlId();
-        if ( !::SendMessage(hCommandBar, TB_INSERTBUTTON, i, (LPARAM)&tbButton) )
+        size_t i;
+        for (i = 0; i < GetMenuCount(); i++)
         {
-            wxLogLastError(wxT("TB_INSERTBUTTON"));
+            HMENU hPopupMenu = (HMENU) GetMenu(i)->GetHMenu() ;
+            tbButton.dwData = (DWORD)hPopupMenu;
+            wxString label = wxStripMenuCodes(GetLabelTop(i));
+            tbButton.iString = (int) label.c_str();
+
+            int position = i;
+
+            tbButton.idCommand = NewControlId();
+            if (!::SendMessage(hCommandBar, TB_INSERTBUTTON, position, (LPARAM)&tbButton))
+            {
+                wxLogLastError(wxT("TB_INSERTBUTTON"));
+            }
         }
     }
-
-    m_hMenu = bar->GetHMenu();
+    m_hMenu = (WXHMENU) hMenu;
     return m_hMenu;
-#else // !__WXWINCE__
+#else
     if ( m_hMenu != 0 )
         return m_hMenu;
 
@@ -1150,13 +958,13 @@ WXHMENU wxMenuBar::Create()
     }
     else
     {
-        for ( wxMenuList::iterator it = m_menus.begin();
-              it != m_menus.end();
-              ++it )
+        size_t count = GetMenuCount(), i;
+        wxMenuList::iterator it;
+        for ( i = 0, it = m_menus.begin(); i < count; i++, it++ )
         {
             if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING,
-                               (UINT_PTR)(*it)->GetHMenu(),
-                               (*it)->GetTitle().t_str()) )
+                               (UINT)(*it)->GetHMenu(),
+                               m_titles[i]) )
             {
                 wxLogLastError(wxT("AppendMenu"));
             }
@@ -1164,7 +972,7 @@ WXHMENU wxMenuBar::Create()
     }
 
     return m_hMenu;
-#endif // __WXWINCE__/!__WXWINCE__
+#endif
 }
 
 int wxMenuBar::MSWPositionForWxMenu(wxMenu *menu, int wxpos)
@@ -1213,24 +1021,11 @@ void wxMenuBar::EnableTop(size_t pos, bool enable)
     Refresh();
 }
 
-bool wxMenuBar::IsEnabledTop(size_t pos) const
-{
-    wxCHECK_MSG( pos < GetMenuCount(), false, wxS("invalid menu index") );
-    WinStruct<MENUITEMINFO> mii;
-    mii.fMask = MIIM_STATE;
-    if ( !::GetMenuItemInfo(GetHmenu(), pos, TRUE, &mii) )
-    {
-        wxLogLastError(wxS("GetMenuItemInfo(menubar)"));
-    }
-
-    return !(mii.fState & MFS_GRAYED);
-}
-
-void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
+void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
 {
     wxCHECK_RET( pos < GetMenuCount(), wxT("invalid menu index") );
 
-    m_menus[pos]->wxMenuBase::SetTitle(label);
+    m_titles[pos] = label;
 
     if ( !IsAttached() )
     {
@@ -1240,7 +1035,7 @@ void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
 
     int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos);
 
-    UINT_PTR id;
+    UINT id;
     UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION);
     if ( flagsOld == 0xFFFFFFFF )
     {
@@ -1253,7 +1048,7 @@ void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
     {
         // HIBYTE contains the number of items in the submenu in this case
         flagsOld &= 0xff;
-        id = (UINT_PTR)::GetSubMenu((HMENU)m_hMenu, mswpos);
+        id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos);
     }
     else
     {
@@ -1261,19 +1056,21 @@ void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
     }
 
 #ifdef __WXWINCE__
-    WinStruct<MENUITEMINFO> info;
+    MENUITEMINFO info;
+    wxZeroMemory(info);
+    info.cbSize = sizeof(info);
     info.fMask = MIIM_TYPE;
     info.fType = MFT_STRING;
     info.cch = label.length();
-    info.dwTypeData = wxMSW_CONV_LPTSTR(label);
-    if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, &info) )
+    info.dwTypeData = (LPTSTR) label.c_str();
+    if ( !SetMenuItemInfo(GetHmenu(), id, TRUE, & info) )
     {
         wxLogLastError(wxT("SetMenuItemInfo"));
     }
 
 #else
     if ( ::ModifyMenu(GetHmenu(), mswpos, MF_BYPOSITION | MF_STRING | flagsOld,
-                      id, label.t_str()) == (int)0xFFFFFFFF )
+        id, label) == (int)0xFFFFFFFF )
     {
         wxLogLastError(wxT("ModifyMenu"));
     }
@@ -1282,12 +1079,21 @@ void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
     Refresh();
 }
 
+wxString wxMenuBar::GetLabelTop(size_t pos) const
+{
+    wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
+                 wxT("invalid menu index in wxMenuBar::GetLabelTop") );
+
+    return wxMenuItem::GetLabelFromText(m_titles[pos]);
+}
+
+// Gets the original label at the top-level of the menubar
 wxString wxMenuBar::GetMenuLabel(size_t pos) const
 {
     wxCHECK_MSG( pos < GetMenuCount(), wxEmptyString,
                  wxT("invalid menu index in wxMenuBar::GetMenuLabel") );
 
-    return m_menus[pos]->GetTitle();
+    return m_titles[pos];
 }
 
 // ---------------------------------------------------------------------------
@@ -1300,7 +1106,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
     if ( !menuOld )
         return NULL;
 
-    menu->wxMenuBase::SetTitle(title);
+    m_titles[pos] = title;
 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     if (IsAttached())
@@ -1318,7 +1124,7 @@ wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 
         if ( !::InsertMenu(GetHmenu(), (UINT)mswpos,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
-                           (UINT_PTR)GetHmenuOf(menu), title.t_str()) )
+                           (UINT)GetHmenuOf(menu), title) )
         {
             wxLogLastError(wxT("InsertMenu"));
         }
@@ -1357,7 +1163,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return false;
 
-    menu->wxMenuBase::SetTitle(title);
+    m_titles.Insert(title, pos);
 
     if ( isAttached )
     {
@@ -1373,7 +1179,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
         tbButton.dwData = (DWORD)hPopupMenu;
         wxString label = wxStripMenuCodes(title);
-        tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label);
+        tbButton.iString = (int) label.c_str();
 
         tbButton.idCommand = NewControlId();
         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
@@ -1385,7 +1191,7 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 #else
         if ( !::InsertMenu(GetHmenu(), mswpos,
                            MF_BYPOSITION | MF_POPUP | MF_STRING,
-                           (UINT_PTR)GetHmenuOf(menu), title.t_str()) )
+                           (UINT)GetHmenuOf(menu), title) )
         {
             wxLogLastError(wxT("InsertMenu"));
         }
@@ -1413,7 +1219,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Append(menu, title) )
         return false;
 
-    menu->wxMenuBase::SetTitle(title);
+    m_titles.Add(title);
 
 #if defined(WINCE_WITHOUT_COMMANDBAR)
     if (IsAttached())
@@ -1434,7 +1240,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
         HMENU hPopupMenu = (HMENU) menu->GetHMenu() ;
         tbButton.dwData = (DWORD)hPopupMenu;
         wxString label = wxStripMenuCodes(title);
-        tbButton.iString = (int) wxMSW_CONV_LPCTSTR(label);
+        tbButton.iString = (int) label.c_str();
 
         tbButton.idCommand = NewControlId();
         if (!::SendMessage((HWND) GetToolBar()->GetHWND(), TB_INSERTBUTTON, pos, (LPARAM)&tbButton))
@@ -1444,7 +1250,7 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
         }
 #else
         if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING,
-                           (UINT_PTR)submenu, title.t_str()) )
+                           (UINT)submenu, title) )
         {
             wxLogLastError(wxT("AppendMenu"));
         }
@@ -1504,6 +1310,8 @@ wxMenu *wxMenuBar::Remove(size_t pos)
             Refresh();
     }
 
+    m_titles.RemoveAt(pos);
+
     return menu;
 }
 
@@ -1530,7 +1338,7 @@ void wxMenuBar::RebuildAccelTable()
             nAccelCount += (*it)->CopyAccels(&accelEntries[nAccelCount]);
         }
 
-        SetAcceleratorTable(wxAcceleratorTable(nAccelCount, accelEntries));
+        m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
 
         delete [] accelEntries;
     }
@@ -1573,13 +1381,9 @@ bool wxMenuBar::AddAdornments(long style)
     if (style & wxCLOSE_BOX)
     {
         if (!CommandBar_AddAdornments((HWND) m_commandBar, 0, 0))
-        {
             wxLogLastError(wxT("CommandBar_AddAdornments"));
-        }
         else
-        {
             return true;
-        }
     }
     return false;
 }
@@ -1590,24 +1394,4 @@ void wxMenuBar::Detach()
     wxMenuBarBase::Detach();
 }
 
-// get the menu with given handle (recursively)
-wxMenu* wxMenuBar::MSWGetMenu(WXHMENU hMenu)
-{
-    wxCHECK_MSG( GetHMenu() != hMenu, NULL,
-                 wxT("wxMenuBar::MSWGetMenu(): menu handle is wxMenuBar, not wxMenu") );
-
-#if wxUSE_OWNER_DRAWN
-    // query all menus
-    for ( size_t n = 0 ; n < GetMenuCount(); ++n )
-    {
-        wxMenu* menu = GetMenu(n)->MSWGetMenu(hMenu);
-        if ( menu )
-            return menu;
-    }
-#endif
-
-    // unknown hMenu
-    return NULL;
-}
-
 #endif // wxUSE_MENUS
diff --git a/Source/3rd Party/wx/src/msw/menuitem.cpp b/Source/3rd Party/wx/src/msw/menuitem.cpp
index aa759f77c..9e60e7d94 100644
--- a/Source/3rd Party/wx/src/msw/menuitem.cpp	
+++ b/Source/3rd Party/wx/src/msw/menuitem.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.11.97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: menuitem.cpp 41021 2006-09-05 21:00:55Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,8 +30,6 @@
 #include "wx/stockitem.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/dcmemory.h"
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
@@ -47,17 +45,12 @@
 #endif // wxUSE_ACCEL
 
 #include "wx/msw/private.h"
-#include "wx/msw/dc.h"
 
 #ifdef __WXWINCE__
 // Implemented in menu.cpp
 UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) ;
 #endif
 
-#if wxUSE_UXTHEME
-    #include "wx/msw/uxtheme.h"
-#endif
-
 // ---------------------------------------------------------------------------
 // macro
 // ---------------------------------------------------------------------------
@@ -65,405 +58,68 @@ UINT GetMenuState(HMENU hMenu, UINT id, UINT flags) ;
 // hide the ugly cast
 #define GetHMenuOf(menu)    ((HMENU)menu->GetHMenu())
 
-// ----------------------------------------------------------------------------
-// helper classes for temporarily changing HDC parameters
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// This class just stores an HDC.
-class HDCHandler
-{
-protected:
-    HDCHandler(HDC hdc) : m_hdc(hdc) { }
-
-    const HDC m_hdc;
-};
-
-class HDCTextColChanger : HDCHandler
-{
-public:
-    HDCTextColChanger(HDC hdc, COLORREF col)
-        : HDCHandler(hdc),
-          m_colOld(::SetTextColor(hdc, col))
-    {
-    }
-
-    ~HDCTextColChanger()
-    {
-        ::SetTextColor(m_hdc, m_colOld);
-    }
-
-private:
-    COLORREF m_colOld;
-};
-
-class HDCBgColChanger : HDCHandler
-{
-public:
-    HDCBgColChanger(HDC hdc, COLORREF col)
-        : HDCHandler(hdc),
-          m_colOld(::SetBkColor(hdc, col))
-    {
-    }
-
-    ~HDCBgColChanger()
-    {
-        ::SetBkColor(m_hdc, m_colOld);
-    }
-
-private:
-    COLORREF m_colOld;
-};
-
-class HDCBgModeChanger : HDCHandler
-{
-public:
-    HDCBgModeChanger(HDC hdc, int mode)
-        : HDCHandler(hdc),
-          m_modeOld(::SetBkMode(hdc, mode))
-    {
-    }
-
-    ~HDCBgModeChanger()
-    {
-        ::SetBkMode(m_hdc, m_modeOld);
-    }
-
-private:
-    int m_modeOld;
-};
-
-} // anonymous namespace
+// conditional compilation
+#if wxUSE_OWNER_DRAWN
+    #define OWNER_DRAWN_ONLY( code ) if ( IsOwnerDrawn() ) code
+#else // !wxUSE_OWNER_DRAWN
+    #define OWNER_DRAWN_ONLY( code )
+#endif // wxUSE_OWNER_DRAWN/!wxUSE_OWNER_DRAWN
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-#if wxUSE_OWNER_DRAWN
-
-#include "wx/fontutil.h"
-#include "wx/msw/private/metrics.h"
-
-#ifndef SPI_GETKEYBOARDCUES
-#define SPI_GETKEYBOARDCUES 0x100A
-#endif
-
-#ifndef DSS_HIDEPREFIX
-#define DSS_HIDEPREFIX  0x0200
-#endif
-
-#if wxUSE_UXTHEME
-
-enum MENUPARTS
-{
-    MENU_MENUITEM_TMSCHEMA = 1,
-    MENU_SEPARATOR_TMSCHEMA = 6,
-    MENU_POPUPBACKGROUND = 9,
-    MENU_POPUPBORDERS = 10,
-    MENU_POPUPCHECK = 11,
-    MENU_POPUPCHECKBACKGROUND = 12,
-    MENU_POPUPGUTTER = 13,
-    MENU_POPUPITEM = 14,
-    MENU_POPUPSEPARATOR = 15,
-    MENU_POPUPSUBMENU = 16,
-};
-
-
-enum POPUPITEMSTATES
-{
-    MPI_NORMAL = 1,
-    MPI_HOT = 2,
-    MPI_DISABLED = 3,
-    MPI_DISABLEDHOT = 4,
-};
-
-enum POPUPCHECKBACKGROUNDSTATES
-{
-    MCB_DISABLED = 1,
-    MCB_NORMAL = 2,
-    MCB_BITMAP = 3,
-};
-
-enum POPUPCHECKSTATES
-{
-    MC_CHECKMARKNORMAL = 1,
-    MC_CHECKMARKDISABLED = 2,
-    MC_BULLETNORMAL = 3,
-    MC_BULLETDISABLED = 4,
-};
-
-const int TMT_MENUFONT       = 803;
-const int TMT_BORDERSIZE     = 2403;
-const int TMT_CONTENTMARGINS = 3602;
-const int TMT_SIZINGMARGINS  = 3601;
-
-#endif // wxUSE_UXTHEME
-
-#endif // wxUSE_OWNER_DRAWN
-
 // ----------------------------------------------------------------------------
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
+#if wxUSE_EXTENDED_RTTI
+
+bool wxMenuItemStreamingCallback( const wxObject *object, wxWriter * , wxPersister * , wxxVariantArray & )
+{
+    const wxMenuItem * mitem = dynamic_cast<const wxMenuItem*>(object) ;
+    if ( mitem->GetMenu() && !mitem->GetMenu()->GetTitle().empty() )
+    {
+        // we don't stream out the first two items for menus with a title, they will be reconstructed
+        if ( mitem->GetMenu()->FindItemByPosition(0) == mitem || mitem->GetMenu()->FindItemByPosition(1) == mitem )
+            return false ;
+    }
+    return true ;
+}
+
+wxBEGIN_ENUM( wxItemKind )
+    wxENUM_MEMBER( wxITEM_SEPARATOR )
+    wxENUM_MEMBER( wxITEM_NORMAL )
+    wxENUM_MEMBER( wxITEM_CHECK )
+    wxENUM_MEMBER( wxITEM_RADIO )
+wxEND_ENUM( wxItemKind )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuItem, wxObject,"wx/menuitem.h",wxMenuItemStreamingCallback)
+
+wxBEGIN_PROPERTIES_TABLE(wxMenuItem)
+    wxPROPERTY( Parent,wxMenu*, SetMenu, GetMenu, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Id,int, SetId, GetId, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Text, wxString , SetText, GetText, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Help, wxString , SetHelp, GetHelp, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxREADONLY_PROPERTY( Kind, wxItemKind , GetKind , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( SubMenu,wxMenu*, SetSubMenu, GetSubMenu, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Checked , bool , Check , IsChecked , wxxVariant((bool)false) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Checkable , bool , SetCheckable , IsCheckable , wxxVariant((bool)false) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxMenuItem)
+wxEND_HANDLERS_TABLE()
+
+wxDIRECT_CONSTRUCTOR_6( wxMenuItem , wxMenu* , Parent , int , Id , wxString , Text , wxString , Help , wxItemKind , Kind , wxMenu* , SubMenu  )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
+#endif
+
 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------
 
-#if wxUSE_OWNER_DRAWN
-
-namespace
-{
-
-// helper class to keep information about metrics and other stuff
-// needed for measuring and drawing menu item
-class MenuDrawData
-{
-public:
-    // Wrapper around standard MARGINS structure providing some helper
-    // functions and automatically initializing the margin fields to 0.
-    struct Margins : MARGINS
-    {
-        Margins()
-        {
-            cxLeftWidth =
-            cxRightWidth =
-            cyTopHeight =
-            cyBottomHeight = 0;
-        }
-
-        int GetTotalX() const { return cxLeftWidth + cxRightWidth; }
-        int GetTotalY() const { return cyTopHeight + cyBottomHeight; }
-
-        void ApplyTo(RECT& rect) const
-        {
-            rect.top += cyTopHeight;
-            rect.left += cxLeftWidth;
-            rect.right -= cyTopHeight;
-            rect.bottom -= cyBottomHeight;
-        }
-
-        void UnapplyFrom(RECT& rect) const
-        {
-            rect.top -= cyTopHeight;
-            rect.left -= cxLeftWidth;
-            rect.right += cyTopHeight;
-            rect.bottom += cyBottomHeight;
-        }
-    };
-
-    Margins ItemMargin;         // popup item margins
-
-    Margins CheckMargin;        // popup check margins
-    Margins CheckBgMargin;      // popup check background margins
-
-    Margins ArrowMargin;        // popup submenu arrow margins
-
-    Margins SeparatorMargin;    // popup separator margins
-
-    SIZE CheckSize;             // popup check size metric
-    SIZE ArrowSize;             // popup submenu arrow size metric
-    SIZE SeparatorSize;         // popup separator size metric
-
-    int TextBorder;             // popup border space between
-                                // item text and gutter
-
-    int AccelBorder;            // popup border space between
-                                // item text and accelerator
-
-    int ArrowBorder;            // popup border space between
-                                // item accelerator and submenu arrow
-
-    int Offset;                 // system added space at the end of the menu,
-                                // add this offset for remove the extra space
-
-    wxFont Font;                // default menu font
-
-    bool AlwaysShowCues;        // must keyboard cues always be shown?
-
-    bool Theme;                 // is data initialized for FullTheme?
-
-    static const MenuDrawData* Get()
-    {
-        // notice that s_menuData can't be created as a global variable because
-        // it needs a window to initialize and no windows exist at the time of
-        // globals initialization yet
-        if ( !ms_instance )
-        {
-            static MenuDrawData s_menuData;
-            ms_instance = &s_menuData;
-        }
-
-    #if wxUSE_UXTHEME
-        bool theme = MenuLayout() == FullTheme;
-        if ( ms_instance->Theme != theme )
-            ms_instance->Init();
-    #endif // wxUSE_UXTHEME
-        return ms_instance;
-    }
-
-    MenuDrawData()
-    {
-        Init();
-    }
-
-
-    // get the theme engine or NULL if themes
-    // are not available or not supported on menu
-    static wxUxThemeEngine *GetUxThemeEngine()
-    {
-    #if wxUSE_UXTHEME
-        if ( MenuLayout() == FullTheme )
-            return wxUxThemeEngine::GetIfActive();
-    #endif // wxUSE_UXTHEME
-        return NULL;
-    }
-
-
-    enum MenuLayoutType
-    {
-        FullTheme,      // full menu themes (Vista or new)
-        PseudoTheme,    // pseudo menu themes (on XP)
-        Classic
-    };
-
-    static MenuLayoutType MenuLayout()
-    {
-        MenuLayoutType menu = Classic;
-    #if wxUSE_UXTHEME
-        if ( wxUxThemeEngine::GetIfActive() != NULL )
-        {
-            static wxWinVersion ver = wxGetWinVersion();
-            if ( ver >= wxWinVersion_Vista )
-                menu = FullTheme;
-            else if ( ver == wxWinVersion_XP )
-                menu = PseudoTheme;
-        }
-    #endif // wxUSE_UXTHEME
-        return menu;
-    }
-
-private:
-    void Init();
-
-    static MenuDrawData* ms_instance;
-};
-
-MenuDrawData* MenuDrawData::ms_instance = NULL;
-
-void MenuDrawData::Init()
-{
-#if wxUSE_UXTHEME
-    wxUxThemeEngine* theme = GetUxThemeEngine();
-    if ( theme )
-    {
-        wxWindow* window = static_cast<wxApp*>(wxApp::GetInstance())->GetTopWindow();
-        wxUxThemeHandle hTheme(window, L"MENU");
-
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPITEM, 0,
-                               TMT_CONTENTMARGINS, NULL,
-                               &ItemMargin);
-
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPCHECK, 0,
-                               TMT_CONTENTMARGINS, NULL,
-                               &CheckMargin);
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPCHECKBACKGROUND, 0,
-                               TMT_CONTENTMARGINS, NULL,
-                               &CheckBgMargin);
-
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPSUBMENU, 0,
-                               TMT_CONTENTMARGINS, NULL,
-                               &ArrowMargin);
-
-        theme->GetThemeMargins(hTheme, NULL, MENU_POPUPSEPARATOR, 0,
-                               TMT_SIZINGMARGINS, NULL,
-                               &SeparatorMargin);
-
-        theme->GetThemePartSize(hTheme, NULL, MENU_POPUPCHECK, 0,
-                                NULL, TS_TRUE, &CheckSize);
-
-        theme->GetThemePartSize(hTheme, NULL, MENU_POPUPSUBMENU, 0,
-                                NULL, TS_TRUE, &ArrowSize);
-
-        theme->GetThemePartSize(hTheme, NULL, MENU_POPUPSEPARATOR, 0,
-                                NULL, TS_TRUE, &SeparatorSize);
-
-        theme->GetThemeInt(hTheme, MENU_POPUPBACKGROUND, 0, TMT_BORDERSIZE, &TextBorder);
-
-        AccelBorder = 34;
-        ArrowBorder = 0;
-
-        Offset = -14;
-
-        wxUxThemeFont themeFont;
-        theme->GetThemeSysFont(hTheme, TMT_MENUFONT, themeFont.GetPtr());
-        Font = wxFont(themeFont.GetLOGFONT());
-
-        Theme = true;
-
-        // native menu doesn't uses the vertical margins
-        ItemMargin.cyTopHeight =
-        ItemMargin.cyBottomHeight = 0;
-
-        // native menu uses small top margin for separator
-        if ( SeparatorMargin.cyTopHeight >= 2 )
-            SeparatorMargin.cyTopHeight -= 2;
-    }
-    else
-#endif // wxUSE_UXTHEME
-    {
-        const NONCLIENTMETRICS& metrics = wxMSWImpl::GetNonClientMetrics();
-
-        CheckMargin.cxLeftWidth =
-        CheckMargin.cxRightWidth  = ::GetSystemMetrics(SM_CXEDGE);
-        CheckMargin.cyTopHeight =
-        CheckMargin.cyBottomHeight = ::GetSystemMetrics(SM_CYEDGE);
-
-        CheckSize.cx = ::GetSystemMetrics(SM_CXMENUCHECK);
-        CheckSize.cy = ::GetSystemMetrics(SM_CYMENUCHECK);
-
-        ArrowSize = CheckSize;
-
-        // separator height with margins
-        int sepFullSize = metrics.iMenuHeight / 2;
-
-        SeparatorMargin.cxLeftWidth =
-        SeparatorMargin.cxRightWidth = 1;
-        SeparatorMargin.cyTopHeight =
-        SeparatorMargin.cyBottomHeight = sepFullSize / 2 - 1;
-
-        SeparatorSize.cx = 1;
-        SeparatorSize.cy = sepFullSize - SeparatorMargin.GetTotalY();
-
-        TextBorder = 0;
-        AccelBorder = 8;
-        ArrowBorder = 6;
-
-        Offset = -12;
-
-        Font = wxFont(wxNativeFontInfo(metrics.lfMenuFont));
-
-        Theme = false;
-    }
-
-    int value;
-    if ( ::SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &value, 0) == 0 )
-    {
-        // if it's not supported, we must be on an old Windows version
-        // which always shows them
-        value = 1;
-    }
-
-    AlwaysShowCues = value == 1;
-
-}
-
-} // anonymous namespace
-
-#endif // wxUSE_OWNER_DRAWN
-
-
 // ctor & dtor
 // -----------
 
@@ -474,11 +130,13 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        wxItemKind kind,
                        wxMenu *pSubMenu)
           : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
+#if wxUSE_OWNER_DRAWN
+            , wxOwnerDrawn(text, kind == wxITEM_CHECK, true)
+#endif // owner drawn
 {
     Init();
 }
 
-#if WXWIN_COMPATIBILITY_2_8
 wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        int id,
                        const wxString& text,
@@ -487,13 +145,18 @@ wxMenuItem::wxMenuItem(wxMenu *parentMenu,
                        wxMenu *subMenu)
           : wxMenuItemBase(parentMenu, id, text, help,
                            isCheckable ? wxITEM_CHECK : wxITEM_NORMAL, subMenu)
+#if wxUSE_OWNER_DRAWN
+           , wxOwnerDrawn(text, isCheckable, true)
+#endif // owner drawn
 {
     Init();
 }
-#endif
 
 void wxMenuItem::Init()
 {
+    m_radioGroup.start = -1;
+    m_isRadioGroupStart = false;
+
 #if  wxUSE_OWNER_DRAWN
 
     // when the color is not valid, wxOwnerDraw takes the default ones.
@@ -504,12 +167,14 @@ void wxMenuItem::Init()
     SetBackgroundColour(wxNullColour);
 
     // setting default colors switched ownerdraw on: switch it off again
-    SetOwnerDrawn(false);
+    ResetOwnerDrawn();
 
     //  switch ownerdraw back on if using a non default margin
-    if ( !IsSeparator() )
+    if ( GetId() != wxID_SEPARATOR )
         SetMarginWidth(GetMarginWidth());
 
+    // tell the owner drawing code to show the accel string as well
+    SetAccelString(m_text.AfterFirst(_T('\t')));
 #endif // wxUSE_OWNER_DRAWN
 }
 
@@ -521,14 +186,9 @@ wxMenuItem::~wxMenuItem()
 // ----
 
 // return the id for calling Win32 API functions
-WXWPARAM wxMenuItem::GetMSWId() const
+int wxMenuItem::GetRealId() const
 {
-    // we must use ids in unsigned short range with Windows functions, if we
-    // pass ids > USHRT_MAX to them they get very confused (e.g. start
-    // generating WM_COMMAND messages with negative high word of wParam), so
-    // use the cast to ensure the id is in range
-    return m_subMenu ? wxPtrToUInt(m_subMenu->GetHMenu())
-                     : static_cast<unsigned short>(GetId());
+    return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId();
 }
 
 // get item state
@@ -536,24 +196,46 @@ WXWPARAM wxMenuItem::GetMSWId() const
 
 bool wxMenuItem::IsChecked() const
 {
-    // fix that RTTI is always getting the correct state (separators cannot be
-    // checked, but the Windows call below returns true
-    if ( IsSeparator() )
-        return false;
+    // fix that RTTI is always getting the correct state (separators cannot be checked, but the call below
+    // returns true
+    if ( GetId() == wxID_SEPARATOR )
+        return false ;
 
-    // the item might not be attached to a menu yet
-    //
-    // TODO: shouldn't we just always call the base class version? It seems
-    //       like it ought to always be in sync
-    if ( !m_parentMenu )
-        return wxMenuItemBase::IsChecked();
-
-    HMENU hmenu = GetHMenuOf(m_parentMenu);
-    int flag = ::GetMenuState(hmenu, GetMSWId(), MF_BYCOMMAND);
+    int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND);
 
     return (flag & MF_CHECKED) != 0;
 }
 
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+{
+    return wxStripMenuCodes(text);
+}
+
+// radio group stuff
+// -----------------
+
+void wxMenuItem::SetAsRadioGroupStart()
+{
+    m_isRadioGroupStart = true;
+}
+
+void wxMenuItem::SetRadioGroupStart(int start)
+{
+    wxASSERT_MSG( !m_isRadioGroupStart,
+                  _T("should only be called for the next radio items") );
+
+    m_radioGroup.start = start;
+}
+
+void wxMenuItem::SetRadioGroupEnd(int end)
+{
+    wxASSERT_MSG( m_isRadioGroupStart,
+                  _T("should only be called for the first radio item") );
+
+    m_radioGroup.end = end;
+}
+
 // change item state
 // -----------------
 
@@ -562,17 +244,13 @@ void wxMenuItem::Enable(bool enable)
     if ( m_isEnabled == enable )
         return;
 
-    if ( m_parentMenu )
-    {
-        long rc = EnableMenuItem(GetHMenuOf(m_parentMenu),
-                                 GetMSWId(),
-                                 MF_BYCOMMAND |
-                                 (enable ? MF_ENABLED : MF_GRAYED));
+    long rc = EnableMenuItem(GetHMenuOf(m_parentMenu),
+                             GetRealId(),
+                             MF_BYCOMMAND |
+                             (enable ? MF_ENABLED : MF_GRAYED));
 
-        if ( rc == -1 )
-        {
-            wxLogLastError(wxT("EnableMenuItem"));
-        }
+    if ( rc == -1 ) {
+        wxLogLastError(wxT("EnableMenuItem"));
     }
 
     wxMenuItemBase::Enable(enable);
@@ -585,78 +263,81 @@ void wxMenuItem::Check(bool check)
     if ( m_isChecked == check )
         return;
 
-    if ( m_parentMenu )
+    int flags = check ? MF_CHECKED : MF_UNCHECKED;
+    HMENU hmenu = GetHMenuOf(m_parentMenu);
+
+    if ( GetKind() == wxITEM_RADIO )
     {
-        int flags = check ? MF_CHECKED : MF_UNCHECKED;
-        HMENU hmenu = GetHMenuOf(m_parentMenu);
+        // it doesn't make sense to uncheck a radio item - what would this do?
+        if ( !check )
+            return;
 
-        if ( GetKind() == wxITEM_RADIO )
+        // get the index of this item in the menu
+        const wxMenuItemList& items = m_parentMenu->GetMenuItems();
+        int pos = items.IndexOf(this);
+        wxCHECK_RET( pos != wxNOT_FOUND,
+                     _T("menuitem not found in the menu items list?") );
+
+        // get the radio group range
+        int start,
+            end;
+
+        if ( m_isRadioGroupStart )
         {
-            // it doesn't make sense to uncheck a radio item -- what would this
-            // do?
-            if ( !check )
-                return;
-
-            // get the index of this item in the menu
-            const wxMenuItemList& items = m_parentMenu->GetMenuItems();
-            int pos = items.IndexOf(this);
-            wxCHECK_RET( pos != wxNOT_FOUND,
-                         wxT("menuitem not found in the menu items list?") );
-
-            // get the radio group range
-            int start,
-                end;
-
-            if ( !m_parentMenu->MSWGetRadioGroupRange(pos, &start, &end) )
-            {
-                wxFAIL_MSG( wxT("Menu radio item not part of radio group?") );
-                return;
-            }
+            // we already have all information we need
+            start = pos;
+            end = m_radioGroup.end;
+        }
+        else // next radio group item
+        {
+            // get the radio group end from the start item
+            start = m_radioGroup.start;
+            end = items.Item(start)->GetData()->m_radioGroup.end;
+        }
 
 #ifdef __WIN32__
-            // calling CheckMenuRadioItem() with such parameters hangs my system
-            // (NT4 SP6) and I suspect this could happen to the others as well,
-            // so don't do it!
-            wxCHECK_RET( start != -1 && end != -1,
-                         wxT("invalid ::CheckMenuRadioItem() parameter(s)") );
+        // calling CheckMenuRadioItem() with such parameters hangs my system
+        // (NT4 SP6) and I suspect this could happen to the others as well - so
+        // don't do it!
+        wxCHECK_RET( start != -1 && end != -1,
+                     _T("invalid ::CheckMenuRadioItem() parameter(s)") );
 
-            if ( !::CheckMenuRadioItem(hmenu,
-                                       start,   // the first radio group item
-                                       end,     // the last one
-                                       pos,     // the one to check
-                                       MF_BYPOSITION) )
-            {
-                wxLogLastError(wxT("CheckMenuRadioItem"));
-            }
+        if ( !::CheckMenuRadioItem(hmenu,
+                                   start,   // the first radio group item
+                                   end,     // the last one
+                                   pos,     // the one to check
+                                   MF_BYPOSITION) )
+        {
+            wxLogLastError(_T("CheckMenuRadioItem"));
+        }
 #endif // __WIN32__
 
-            // also uncheck all the other items in this radio group
-            wxMenuItemList::compatibility_iterator node = items.Item(start);
-            for ( int n = start; n <= end && node; n++ )
-            {
-                if ( n != pos )
-                {
-                    node->GetData()->m_isChecked = false;
-                }
-
-                node = node->GetNext();
-            }
-        }
-        else // check item
+        // also uncheck all the other items in this radio group
+        wxMenuItemList::compatibility_iterator node = items.Item(start);
+        for ( int n = start; n <= end && node; n++ )
         {
-            if ( ::CheckMenuItem(hmenu,
-                                 GetMSWId(),
-                                 MF_BYCOMMAND | flags) == (DWORD)-1 )
+            if ( n != pos )
             {
-                wxFAIL_MSG(wxT("CheckMenuItem() failed, item not in the menu?"));
+                node->GetData()->m_isChecked = false;
             }
+
+            node = node->GetNext();
+        }
+    }
+    else // check item
+    {
+        if ( ::CheckMenuItem(hmenu,
+                             GetRealId(),
+                             MF_BYCOMMAND | flags) == (DWORD)-1 )
+        {
+            wxFAIL_MSG( _T("CheckMenuItem() failed, item not in the menu?") );
         }
     }
 
     wxMenuItemBase::Check(check);
 }
 
-void wxMenuItem::SetItemLabel(const wxString& txt)
+void wxMenuItem::SetText(const wxString& txt)
 {
     wxString text = txt;
 
@@ -665,583 +346,89 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
         return;
 
     // wxMenuItemBase will do stock ID checks
-    wxMenuItemBase::SetItemLabel(text);
+    wxMenuItemBase::SetText(text);
 
-    // the item can be not attached to any menu yet and SetItemLabel() is still
-    // valid to call in this case and should do nothing else
-    if ( !m_parentMenu )
-        return;
+    // m_text could now be different from 'text' if we are a stock menu item,
+    // so use only m_text below
+
+    OWNER_DRAWN_ONLY( wxOwnerDrawn::SetName(m_text) );
+#if wxUSE_OWNER_DRAWN
+    // tell the owner drawing code to to show the accel string as well
+    SetAccelString(m_text.AfterFirst(_T('\t')));
+#endif
+
+    HMENU hMenu = GetHMenuOf(m_parentMenu);
+    wxCHECK_RET( hMenu, wxT("menuitem without menu") );
 
 #if wxUSE_ACCEL
     m_parentMenu->UpdateAccel(this);
 #endif // wxUSE_ACCEL
 
-    const UINT id = GetMSWId();
-    HMENU hMenu = GetHMenuOf(m_parentMenu);
-    if ( !hMenu || ::GetMenuState(hMenu, id, MF_BYCOMMAND) == (UINT)-1 )
-        return;
-
-#if wxUSE_OWNER_DRAWN
-    if ( IsOwnerDrawn() )
+    UINT id = GetRealId();
+    UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
+    if ( flagsOld == 0xFFFFFFFF )
     {
-        // we don't need to do anything for owner drawn items, they will redraw
-        // themselves using the new text the next time they're displayed
-        return;
+        // It's not an error, it means that the menu item doesn't exist
+        //wxLogLastError(wxT("GetMenuState"));
     }
-#endif // owner drawn
-
-    // update the text of the native menu item
-    WinStruct<MENUITEMINFO> info;
-
-    // surprisingly, calling SetMenuItemInfo() with just MIIM_STRING doesn't
-    // work as it resets the menu bitmap, so we need to first get the old item
-    // state and then modify it
-    const bool isLaterThanWin95 = wxGetWinVersion() > wxWinVersion_95;
-    info.fMask = MIIM_STATE |
-                 MIIM_ID |
-                 MIIM_SUBMENU |
-                 MIIM_CHECKMARKS |
-                 MIIM_DATA;
-    if ( isLaterThanWin95 )
-        info.fMask |= MIIM_BITMAP | MIIM_FTYPE;
     else
-        info.fMask |= MIIM_TYPE;
-    if ( !::GetMenuItemInfo(hMenu, id, FALSE, &info) )
     {
-        wxLogLastError(wxT("GetMenuItemInfo"));
-        return;
-    }
-
-    if ( isLaterThanWin95 )
-        info.fMask |= MIIM_STRING;
-    //else: MIIM_TYPE already specified
-    info.dwTypeData = wxMSW_CONV_LPTSTR(m_text);
-    info.cch = m_text.length();
-    if ( !::SetMenuItemInfo(hMenu, id, FALSE, &info) )
-    {
-        wxLogLastError(wxT("SetMenuItemInfo"));
-    }
-}
-
-#if wxUSE_OWNER_DRAWN
-
-int wxMenuItem::MeasureAccelWidth() const
-{
-    wxString accel = GetItemLabel().AfterFirst(wxT('\t'));
-
-    wxMemoryDC dc;
-    wxFont font;
-    GetFontToUse(font);
-    dc.SetFont(font);
-
-    wxCoord w;
-    dc.GetTextExtent(accel, &w, NULL);
-
-    return w;
-}
-
-wxString wxMenuItem::GetName() const
-{
-    return GetItemLabelText();
-}
-
-bool wxMenuItem::OnMeasureItem(size_t *width, size_t *height)
-{
-    const MenuDrawData* data = MenuDrawData::Get();
-
-    if ( IsOwnerDrawn() )
-    {
-        *width  = data->ItemMargin.GetTotalX();
-        *height = data->ItemMargin.GetTotalY();
-
-        if ( IsSeparator() )
+        if ( IsSubMenu() )
         {
-            *width  += data->SeparatorSize.cx
-                     + data->SeparatorMargin.GetTotalX();
-            *height += data->SeparatorSize.cy
-                     + data->SeparatorMargin.GetTotalY();
-            return true;
+            // high byte contains the number of items in a submenu for submenus
+            flagsOld &= 0xFF;
+            flagsOld |= MF_POPUP;
         }
 
-        wxString str = GetName();
-
-        wxMemoryDC dc;
-        wxFont font;
-        GetFontToUse(font);
-        dc.SetFont(font);
-
-        wxCoord w, h;
-        dc.GetTextExtent(str, &w, &h);
-
-        *width = data->TextBorder + w + data->AccelBorder;
-        *height = h;
-
-        w = m_parentMenu->GetMaxAccelWidth();
-        if ( w > 0 )
-            *width += w + data->ArrowBorder;
-
-        *width += data->Offset;
-        *width += data->ArrowMargin.GetTotalX() + data->ArrowSize.cx;
-    }
-    else // don't draw the text, just the bitmap (if any)
-    {
-        *width = 0;
-        *height = 0;
-    }
-
-    // bitmap
-
-    if ( IsOwnerDrawn() )
-    {
-        // width of menu icon with margins in ownerdrawn menu
-        // if any bitmap is not set, the width of space reserved for icon
-        // image is equal to the width of std check mark,
-        // if bitmap is set, then the width is set to the width of the widest
-        // bitmap in menu (GetMarginWidth()) unless std check mark is wider,
-        // then it's is set to std mark's width
-        int imgWidth = wxMax(GetMarginWidth(), data->CheckSize.cx)
-                     + data->CheckMargin.GetTotalX();
-
-        *width += imgWidth + data->CheckBgMargin.GetTotalX();
-    }
-
-    if ( m_bmpChecked.IsOk() || m_bmpUnchecked.IsOk() )
-    {
-        // get size of bitmap always return valid value (0 for invalid bitmap),
-        // so we don't needed check if bitmap is valid ;)
-        size_t heightBmp = wxMax(m_bmpChecked.GetHeight(), m_bmpUnchecked.GetHeight());
-        size_t widthBmp = wxMax(m_bmpChecked.GetWidth(),  m_bmpUnchecked.GetWidth());
+        LPCTSTR data;
 
+#if wxUSE_OWNER_DRAWN
         if ( IsOwnerDrawn() )
         {
-            heightBmp += data->CheckMargin.GetTotalY();
+            flagsOld |= MF_OWNERDRAW;
+            data = (LPCTSTR)this;
         }
         else
+#endif  //owner drawn
         {
-            // we must allocate enough space for the bitmap
-            *width += widthBmp;
+            flagsOld |= MF_STRING;
+            data = (wxChar*) m_text.c_str();
         }
 
-        // Is BMP height larger than text height?
-        if ( *height < heightBmp )
-            *height = heightBmp;
-    }
-
-    // make sure that this item is at least as tall as the system menu height
-    const size_t menuHeight = data->CheckMargin.GetTotalY()
-                            + data->CheckSize.cy;
-    if (*height < menuHeight)
-        *height = menuHeight;
-
-    return true;
-}
-
-bool wxMenuItem::OnDrawItem(wxDC& dc, const wxRect& rc,
-                            wxODAction WXUNUSED(act), wxODStatus stat)
-{
-    const MenuDrawData* data = MenuDrawData::Get();
-
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
-    HDC hdc = GetHdcOf(*impl);
-
-    RECT rect;
-    wxCopyRectToRECT(rc, rect);
-
-    int imgWidth = wxMax(GetMarginWidth(), data->CheckSize.cx);
-
-    if ( IsOwnerDrawn() )
-    {
-        // font and colors to use
-        wxFont font;
-        GetFontToUse(font);
-
-        wxColour colText, colBack;
-        GetColourToUse(stat, colText, colBack);
-
-        // calculate metrics of item parts
-        RECT rcSelection = rect;
-        data->ItemMargin.ApplyTo(rcSelection);
-
-        RECT rcSeparator = rcSelection;
-        data->SeparatorMargin.ApplyTo(rcSeparator);
-
-        RECT rcGutter = rcSelection;
-        rcGutter.right = data->ItemMargin.cxLeftWidth
-                       + data->CheckBgMargin.cxLeftWidth
-                       + data->CheckMargin.cxLeftWidth
-                       + imgWidth
-                       + data->CheckMargin.cxRightWidth
-                       + data->CheckBgMargin.cxRightWidth;
-
-        RECT rcText = rcSelection;
-        rcText.left = rcGutter.right + data->TextBorder;
-
-        // we draw the text label vertically centered, but this results in it
-        // being 1px too low compared to native menus for some reason, fix it
-        if ( data->MenuLayout() != MenuDrawData::FullTheme )
-            rcText.top--;
-
-#if wxUSE_UXTHEME
-        // If a custom background colour is explicitly specified, we should use
-        // it instead of the default theme background.
-        wxUxThemeEngine* const theme = GetBackgroundColour().IsOk()
-                                        ? NULL
-                                        : MenuDrawData::GetUxThemeEngine();
-        if ( theme )
+#ifdef __WXWINCE__
+        // FIXME: complete this, applying the old
+        // flags.
+        // However, the WinCE doc for SetMenuItemInfo
+        // says that you can't use it to set the menu
+        // item state; only data, id and type.
+        MENUITEMINFO info;
+        wxZeroMemory(info);
+        info.cbSize = sizeof(info);
+        info.fMask = MIIM_TYPE;
+        info.fType = MFT_STRING;
+        info.cch = m_text.length();
+        info.dwTypeData = (LPTSTR) data ;
+        if ( !::SetMenuItemInfo(hMenu, id, FALSE, & info) )
         {
-            POPUPITEMSTATES state;
-            if ( stat & wxODDisabled )
-            {
-                state = (stat & wxODSelected) ? MPI_DISABLEDHOT
-                                              : MPI_DISABLED;
-            }
-            else if ( stat & wxODSelected )
-            {
-                state = MPI_HOT;
-            }
-            else
-            {
-                state = MPI_NORMAL;
-            }
-
-            wxUxThemeHandle hTheme(GetMenu()->GetWindow(), L"MENU");
-
-            if ( theme->IsThemeBackgroundPartiallyTransparent(hTheme,
-                    MENU_POPUPITEM, state) )
-            {
-                theme->DrawThemeBackground(hTheme, hdc,
-                                           MENU_POPUPBACKGROUND,
-                                           0, &rect, NULL);
-            }
-
-            theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPGUTTER,
-                                       0, &rcGutter, NULL);
-
-            if ( IsSeparator() )
-            {
-                rcSeparator.left = rcGutter.right;
-                theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPSEPARATOR,
-                                           0, &rcSeparator, NULL);
-                return true;
-            }
-
-            theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPITEM,
-                                       state, &rcSelection, NULL);
-
+            wxLogLastError(wxT("SetMenuItemInfo"));
         }
-        else
-#endif // wxUSE_UXTHEME
+#else
+        if ( ::ModifyMenu(hMenu, id,
+                          MF_BYCOMMAND | flagsOld,
+                          id, data) == (int)0xFFFFFFFF )
         {
-            if ( IsSeparator() )
-            {
-                DrawEdge(hdc, &rcSeparator, EDGE_ETCHED, BF_TOP);
-                return true;
-            }
-
-            AutoHBRUSH hbr(colBack.GetPixel());
-            SelectInHDC selBrush(hdc, hbr);
-            ::FillRect(hdc, &rcSelection, hbr);
+            wxLogLastError(wxT("ModifyMenu"));
         }
-
-
-        // draw text label
-        // using native API because it recognizes '&'
-
-        HDCTextColChanger changeTextCol(hdc, colText.GetPixel());
-        HDCBgColChanger changeBgCol(hdc, colBack.GetPixel());
-        HDCBgModeChanger changeBgMode(hdc, TRANSPARENT);
-
-        SelectInHDC selFont(hdc, GetHfontOf(font));
-
-
-        // item text name without mnemonic for calculating size
-        wxString text = GetName();
-
-        SIZE textSize;
-        ::GetTextExtentPoint32(hdc, text.c_str(), text.length(), &textSize);
-
-        // item text name with mnemonic
-        text = GetItemLabel().BeforeFirst('\t');
-
-        int flags = DST_PREFIXTEXT;
-        // themes menu is using specified color for disabled labels
-        if ( data->MenuLayout() == MenuDrawData::Classic &&
-             (stat & wxODDisabled) && !(stat & wxODSelected) )
-            flags |= DSS_DISABLED;
-
-        if ( (stat & wxODHidePrefix) && !data->AlwaysShowCues )
-            flags |= DSS_HIDEPREFIX;
-
-        int x = rcText.left;
-        int y = rcText.top + (rcText.bottom - rcText.top - textSize.cy) / 2;
-
-        ::DrawState(hdc, NULL, NULL, wxMSW_CONV_LPARAM(text),
-                    text.length(), x, y, 0, 0, flags);
-
-        // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO
-        // as the last parameter in DrawState() (at least with Windows98). So we have
-        // to take care of right alignment ourselves.
-        wxString accel = GetItemLabel().AfterFirst(wxT('\t'));
-        if ( !accel.empty() )
-        {
-            SIZE accelSize;
-            ::GetTextExtentPoint32(hdc, accel.c_str(), accel.length(), &accelSize);
-
-            int flags = DST_TEXT;
-            // themes menu is using specified color for disabled labels
-            if ( data->MenuLayout() == MenuDrawData::Classic &&
-                 (stat & wxODDisabled) && !(stat & wxODSelected) )
-                flags |= DSS_DISABLED;
-
-            int x = rcText.right - data->ArrowMargin.GetTotalX()
-                                 - data->ArrowSize.cx
-                                 - data->ArrowBorder;
-
-            // right align accel on FullTheme menu, left otherwise
-            if ( data->MenuLayout() == MenuDrawData::FullTheme)
-                x -= accelSize.cx;
-            else
-                x -= m_parentMenu->GetMaxAccelWidth();
-
-            int y = rcText.top + (rcText.bottom - rcText.top - accelSize.cy) / 2;
-
-            ::DrawState(hdc, NULL, NULL, wxMSW_CONV_LPARAM(accel),
-                        accel.length(), x, y, 0, 0, flags);
-        }
-    }
-
-
-    // draw the bitmap
-
-    RECT rcImg;
-    SetRect(&rcImg,
-            rect.left   + data->ItemMargin.cxLeftWidth
-                        + data->CheckBgMargin.cxLeftWidth
-                        + data->CheckMargin.cxLeftWidth,
-            rect.top    + data->ItemMargin.cyTopHeight
-                        + data->CheckBgMargin.cyTopHeight
-                        + data->CheckMargin.cyTopHeight,
-            rect.left   + data->ItemMargin.cxLeftWidth
-                        + data->CheckBgMargin.cxLeftWidth
-                        + data->CheckMargin.cxLeftWidth
-                        + imgWidth,
-            rect.bottom - data->ItemMargin.cyBottomHeight
-                        - data->CheckBgMargin.cyBottomHeight
-                        - data->CheckMargin.cyBottomHeight);
-
-    if ( IsCheckable() && !m_bmpChecked.IsOk() )
-    {
-        if ( stat & wxODChecked )
-        {
-            DrawStdCheckMark((WXHDC)hdc, &rcImg, stat);
-        }
-    }
-    else
-    {
-        wxBitmap bmp;
-
-        if ( stat & wxODDisabled )
-        {
-            bmp = GetDisabledBitmap();
-        }
-
-        if ( !bmp.IsOk() )
-        {
-            // for not checkable bitmaps we should always use unchecked one
-            // because their checked bitmap is not set
-            bmp = GetBitmap(!IsCheckable() || (stat & wxODChecked));
-
-#if wxUSE_IMAGE
-            if ( bmp.IsOk() && stat & wxODDisabled )
-            {
-                // we need to grey out the bitmap as we don't have any specific
-                // disabled bitmap
-                wxImage imgGrey = bmp.ConvertToImage().ConvertToGreyscale();
-                if ( imgGrey.IsOk() )
-                    bmp = wxBitmap(imgGrey);
-            }
-#endif // wxUSE_IMAGE
-        }
-
-        if ( bmp.IsOk() )
-        {
-            wxMemoryDC dcMem(&dc);
-            dcMem.SelectObjectAsSource(bmp);
-
-            // center bitmap
-            int nBmpWidth  = bmp.GetWidth(),
-                nBmpHeight = bmp.GetHeight();
-
-            int x = rcImg.left + (imgWidth - nBmpWidth) / 2;
-            int y = rcImg.top  + (rcImg.bottom - rcImg.top - nBmpHeight) / 2;
-            dc.Blit(x, y, nBmpWidth, nBmpHeight, &dcMem, 0, 0, wxCOPY, true);
-        }
-    }
-
-    return true;
-
-}
-
-namespace
-{
-
-// helper function for draw coloured check mark
-void DrawColorCheckMark(HDC hdc, int x, int y, int cx, int cy, HDC hdcCheckMask, int idxColor)
-{
-    const COLORREF colBlack = RGB(0, 0, 0);
-    const COLORREF colWhite = RGB(255, 255, 255);
-
-    HDCTextColChanger changeTextCol(hdc, colBlack);
-    HDCBgColChanger changeBgCol(hdc, colWhite);
-    HDCBgModeChanger changeBgMode(hdc, TRANSPARENT);
-
-    // memory DC for color bitmap
-    MemoryHDC hdcMem(hdc);
-    CompatibleBitmap hbmpMem(hdc, cx, cy);
-    SelectInHDC selMem(hdcMem, hbmpMem);
-
-    RECT rect = { 0, 0, cx, cy };
-    ::FillRect(hdcMem, &rect, ::GetSysColorBrush(idxColor));
-
-    const COLORREF colCheck = ::GetSysColor(idxColor);
-    if ( colCheck == colWhite )
-    {
-        ::BitBlt(hdc, x, y, cx, cy, hdcCheckMask, 0, 0, MERGEPAINT);
-        ::BitBlt(hdc, x, y, cx, cy, hdcMem, 0, 0, SRCAND);
-    }
-    else
-    {
-        if ( colCheck != colBlack )
-        {
-            const DWORD ROP_DSna = 0x00220326;  // dest = (NOT src) AND dest
-            ::BitBlt(hdcMem, 0, 0, cx, cy, hdcCheckMask, 0, 0, ROP_DSna);
-        }
-
-        ::BitBlt(hdc, x, y, cx, cy, hdcCheckMask, 0, 0, SRCAND);
-        ::BitBlt(hdc, x, y, cx, cy, hdcMem, 0, 0, SRCPAINT);
+#endif
     }
 }
 
-} // anonymous namespace
-
-void wxMenuItem::DrawStdCheckMark(WXHDC hdc_, const RECT* rc, wxODStatus stat)
+void wxMenuItem::SetCheckable(bool checkable)
 {
-    HDC hdc = (HDC)hdc_;
-
-#if wxUSE_UXTHEME
-    wxUxThemeEngine* theme = MenuDrawData::GetUxThemeEngine();
-    if ( theme )
-    {
-        wxUxThemeHandle hTheme(GetMenu()->GetWindow(), L"MENU");
-
-        const MenuDrawData* data = MenuDrawData::Get();
-
-        // rect for background must be without check margins
-        RECT rcBg = *rc;
-        data->CheckMargin.UnapplyFrom(rcBg);
-
-        POPUPCHECKBACKGROUNDSTATES stateCheckBg = (stat & wxODDisabled)
-                                                    ? MCB_DISABLED
-                                                    : MCB_NORMAL;
-
-        theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECKBACKGROUND,
-                                   stateCheckBg, &rcBg, NULL);
-
-        POPUPCHECKSTATES stateCheck;
-        if ( GetKind() == wxITEM_CHECK )
-        {
-            stateCheck = (stat & wxODDisabled) ? MC_CHECKMARKDISABLED
-                                               : MC_CHECKMARKNORMAL;
-        }
-        else
-        {
-            stateCheck = (stat & wxODDisabled) ? MC_BULLETDISABLED
-                                               : MC_BULLETNORMAL;
-        }
-
-        theme->DrawThemeBackground(hTheme, hdc, MENU_POPUPCHECK,
-                                   stateCheck, rc, NULL);
-    }
-    else
-#endif // wxUSE_UXTHEME
-    {
-        int cx = rc->right - rc->left;
-        int cy = rc->bottom - rc->top;
-
-        // first create mask of check mark
-        MemoryHDC hdcMask(hdc);
-        MonoBitmap hbmpMask(cx, cy);
-        SelectInHDC selMask(hdcMask,hbmpMask);
-
-        // then draw a check mark into it
-        UINT stateCheck = (GetKind() == wxITEM_CHECK) ? DFCS_MENUCHECK
-                                                      : DFCS_MENUBULLET;
-        RECT rect = { 0, 0, cx, cy };
-        ::DrawFrameControl(hdcMask, &rect, DFC_MENU, stateCheck);
-
-        // first draw shadow if disabled
-        if ( (stat & wxODDisabled) && !(stat & wxODSelected) )
-        {
-            DrawColorCheckMark(hdc, rc->left + 1, rc->top + 1,
-                               cx, cy, hdcMask, COLOR_3DHILIGHT);
-        }
-
-        // then draw a check mark
-        int color = COLOR_MENUTEXT;
-        if ( stat & wxODDisabled )
-            color = COLOR_BTNSHADOW;
-        else if ( stat & wxODSelected )
-            color = COLOR_HIGHLIGHTTEXT;
-
-        DrawColorCheckMark(hdc, rc->left, rc->top, cx, cy, hdcMask, color);
-    }
+    wxMenuItemBase::SetCheckable(checkable);
+    OWNER_DRAWN_ONLY( wxOwnerDrawn::SetCheckable(checkable) );
 }
 
-void wxMenuItem::GetFontToUse(wxFont& font) const
-{
-    font = GetFont();
-    if ( !font.IsOk() )
-        font = MenuDrawData::Get()->Font;
-}
-
-void wxMenuItem::GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const
-{
-#if wxUSE_UXTHEME
-    wxUxThemeEngine* theme = MenuDrawData::GetUxThemeEngine();
-    if ( theme )
-    {
-        wxUxThemeHandle hTheme(GetMenu()->GetWindow(), L"MENU");
-
-        if ( stat & wxODDisabled)
-        {
-            wxRGBToColour(colText, theme->GetThemeSysColor(hTheme, COLOR_GRAYTEXT));
-        }
-        else
-        {
-            colText = GetTextColour();
-            if ( !colText.IsOk() )
-                wxRGBToColour(colText, theme->GetThemeSysColor(hTheme, COLOR_MENUTEXT));
-        }
-
-        if ( stat & wxODSelected )
-        {
-            wxRGBToColour(colBack, theme->GetThemeSysColor(hTheme, COLOR_HIGHLIGHT));
-        }
-        else
-        {
-            colBack = GetBackgroundColour();
-            if ( !colBack.IsOk() )
-                wxRGBToColour(colBack, theme->GetThemeSysColor(hTheme, COLOR_MENU));
-        }
-    }
-    else
-#endif // wxUSE_UXTHEME
-    {
-        wxOwnerDrawn::GetColourToUse(stat, colText, colBack);
-    }
-}
-#endif // wxUSE_OWNER_DRAWN
-
 // ----------------------------------------------------------------------------
 // wxMenuItemBase
 // ----------------------------------------------------------------------------
diff --git a/Source/3rd Party/wx/src/msw/metafile.cpp b/Source/3rd Party/wx/src/msw/metafile.cpp
index 2b8c2cf9f..66739b9a5 100644
--- a/Source/3rd Party/wx/src/msw/metafile.cpp	
+++ b/Source/3rd Party/wx/src/msw/metafile.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: metafile.cpp 46103 2007-05-18 15:14:44Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,6 @@
 #endif
 
 #include "wx/metafile.h"
-#include "wx/filename.h"
 
 #if wxUSE_METAFILE && !defined(wxMETAFILE_IS_ENH)
 
@@ -64,7 +63,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
 wxMetafileRefData::wxMetafileRefData()
 {
     m_metafile = 0;
-    m_windowsMappingMode = MM_ANISOTROPIC;
+    m_windowsMappingMode = wxMM_ANISOTROPIC;
     m_width = m_height = 0;
 }
 
@@ -85,7 +84,7 @@ wxMetafile::wxMetafile(const wxString& file)
 {
     m_refData = new wxMetafileRefData;
 
-    M_METAFILEDATA->m_windowsMappingMode = MM_ANISOTROPIC;
+    M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
     M_METAFILEDATA->m_metafile = 0;
     if (!file.empty())
         M_METAFILEDATA->m_metafile = (WXHANDLE) GetMetaFile(file);
@@ -95,16 +94,6 @@ wxMetafile::~wxMetafile()
 {
 }
 
-wxGDIRefData *wxMetafile::CreateGDIRefData() const
-{
-    return new wxMetafileRefData;
-}
-
-wxGDIRefData *wxMetafile::CloneGDIRefData(const wxGDIRefData *data) const
-{
-    return new wxMetafileRefData(*static_cast<const wxMetafileRefData *>(data));
-}
-
 bool wxMetafile::SetClipboard(int width, int height)
 {
 #if !wxUSE_CLIPBOARD
@@ -138,7 +127,7 @@ bool wxMetafile::Play(wxDC *dc)
         if ( !::PlayMetaFile(GetHdcOf(*dc), (HMETAFILE)
                              M_METAFILEDATA->m_metafile) )
         {
-            wxLogLastError(wxT("PlayMetaFile"));
+            wxLogLastError(_T("PlayMetaFile"));
         }
     }
 
@@ -167,8 +156,7 @@ void wxMetafile::SetWindowsMappingMode(int mm)
 
 // Original constructor that does not takes origin and extent. If you use this,
 // *DO* give origin/extent arguments to wxMakeMetafilePlaceable.
-wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file)
-    : wxMSWDCImpl(owner)
+wxMetafileDC::wxMetafileDC(const wxString& file)
 {
     m_metaFile = NULL;
     m_minX = 10000;
@@ -177,13 +165,13 @@ wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file)
     m_maxY = -10000;
     //  m_title = NULL;
 
-    if ( wxFileExists(file) )
+    if (!file.IsNull() && wxFileExists(file))
         wxRemoveFile(file);
 
-    if ( file.empty() )
-        m_hDC = (WXHDC) CreateMetaFile(NULL);
-    else
+    if (!file.IsNull() && (file != wxEmptyString))
         m_hDC = (WXHDC) CreateMetaFile(file);
+    else
+        m_hDC = (WXHDC) CreateMetaFile(NULL);
 
     m_ok = (m_hDC != (WXHDC) 0) ;
 
@@ -195,9 +183,7 @@ wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file)
 
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetafilePlaceable.
-wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file,
-                                   int xext, int yext, int xorg, int yorg)
-    : wxMSWDCImpl(owner)
+wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
 {
     m_minX = 10000;
     m_minY = 10000;
@@ -205,7 +191,7 @@ wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file,
     m_maxY = -10000;
     if ( !file.empty() && wxFileExists(file) )
         wxRemoveFile(file);
-    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : wxMSW_CONV_LPCTSTR(file));
+    m_hDC = (WXHDC) CreateMetaFile(file.empty() ? NULL : file.c_str());
 
     m_ok = true;
 
@@ -213,20 +199,21 @@ wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file,
     ::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);
 
     // Actual Windows mapping mode, for future reference.
-    m_windowsMappingMode = MM_ANISOTROPIC;
+    m_windowsMappingMode = wxMM_ANISOTROPIC;
 
     SetMapMode(wxMM_TEXT); // NOTE: does not set HDC mapmode (this is correct)
 }
 
-wxMetafileDCImpl::~wxMetafileDCImpl()
+wxMetafileDC::~wxMetafileDC()
 {
     m_hDC = 0;
 }
 
-void wxMetafileDCImpl::DoGetTextExtent(const wxString& string,
-                                       wxCoord *x, wxCoord *y,
-                                       wxCoord *descent, wxCoord *externalLeading,
-                                       const wxFont *theFont) const
+void wxMetafileDC::DoGetTextExtent(const wxString& string,
+                                   wxCoord *x, wxCoord *y,
+                                   wxCoord *descent,
+                                   wxCoord *externalLeading,
+                                   const wxFont *theFont) const
 {
     const wxFont *fontToUse = theFont;
     if (!fontToUse)
@@ -237,7 +224,7 @@ void wxMetafileDCImpl::DoGetTextExtent(const wxString& string,
 
     SIZE sizeRect;
     TEXTMETRIC tm;
-    ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
+    ::GetTextExtentPoint32(dc, string, string.length(), &sizeRect);
     ::GetTextMetrics(dc, &tm);
 
     if ( x )
@@ -250,9 +237,25 @@ void wxMetafileDCImpl::DoGetTextExtent(const wxString& string,
         *externalLeading = tm.tmExternalLeading;
 }
 
-void wxMetafileDCImpl::DoGetSize(int *width, int *height) const
+void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
+                                 long *descent, long *externalLeading, wxFont *theFont, bool WXUNUSED(use16bit)) const
 {
-    wxCHECK_RET( m_refData, wxT("invalid wxMetafileDC") );
+    wxCoord xc, yc, dc, elc;
+    DoGetTextExtent(string, &xc, &yc, &dc, &elc, theFont);
+
+    if ( x )
+        *x = xc;
+    if ( y )
+        *y = yc;
+    if ( descent )
+        *descent = dc;
+    if ( externalLeading )
+        *externalLeading = elc;
+}
+
+void wxMetafileDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_refData, _T("invalid wxMetafileDC") );
 
     if ( width )
         *width = M_METAFILEDATA->m_width;
@@ -260,7 +263,7 @@ void wxMetafileDCImpl::DoGetSize(int *width, int *height) const
         *height = M_METAFILEDATA->m_height;
 }
 
-wxMetafile *wxMetafileDCImpl::Close()
+wxMetafile *wxMetafileDC::Close()
 {
     SelectOldObjects(m_hDC);
     HANDLE mf = CloseMetaFile((HDC) m_hDC);
@@ -275,7 +278,7 @@ wxMetafile *wxMetafileDCImpl::Close()
     return NULL;
 }
 
-void wxMetafileDCImpl::SetMapMode(wxMappingMode mode)
+void wxMetafileDC::SetMapMode(int mode)
 {
     m_mappingMode = mode;
 
@@ -390,14 +393,12 @@ bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, i
             p < (WORD *)&pMFHead ->checksum; ++p)
         pMFHead ->checksum ^= *p;
 
-    FILE *fd = wxFopen(filename.fn_str(), wxT("rb"));
+    FILE *fd = wxFopen(filename.fn_str(), _T("rb"));
     if (!fd) return false;
 
-    wxString tempFileBuf = wxFileName::CreateTempFileName(wxT("mf"));
-    if (tempFileBuf.empty())
-        return false;
-
-    FILE *fHandle = wxFopen(tempFileBuf.fn_str(), wxT("wb"));
+    wxChar tempFileBuf[256];
+    wxGetTempFileName(wxT("mf"), tempFileBuf);
+    FILE *fHandle = wxFopen(wxFNCONV(tempFileBuf), _T("wb"));
     if (!fHandle)
         return false;
     fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
@@ -484,7 +485,7 @@ bool wxMetafileDataObject::GetDataHere(void *buf) const
     METAFILEPICT *mfpict = (METAFILEPICT *)buf;
     const wxMetafile& mf = GetMetafile();
 
-    wxCHECK_MSG( mf.GetHMETAFILE(), false, wxT("copying invalid metafile") );
+    wxCHECK_MSG( mf.GetHMETAFILE(), false, _T("copying invalid metafile") );
 
     // doesn't seem to work with any other mapping mode...
     mfpict->mm   = MM_ANISOTROPIC; //mf.GetWindowsMappingMode();
@@ -520,7 +521,7 @@ bool wxMetafileDataObject::SetData(size_t WXUNUSED(len), const void *buf)
     mf.SetHeight(h);
     mf.SetHMETAFILE((WXHANDLE)mfpict->hMF);
 
-    wxCHECK_MSG( mfpict->hMF, false, wxT("pasting invalid metafile") );
+    wxCHECK_MSG( mfpict->hMF, false, _T("pasting invalid metafile") );
 
     SetMetafile(mf);
 
diff --git a/Source/3rd Party/wx/src/msw/mimetype.cpp b/Source/3rd Party/wx/src/msw/mimetype.cpp
index 9b2b5d332..a173daa99 100644
--- a/Source/3rd Party/wx/src/msw/mimetype.cpp	
+++ b/Source/3rd Party/wx/src/msw/mimetype.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     23.09.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: mimetype.cpp 52153 2008-02-27 18:07:23Z JS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence (part of wxExtra library)
 /////////////////////////////////////////////////////////////////////////////
@@ -25,7 +25,6 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
-    #include "wx/crt.h"
     #if wxUSE_GUI
         #include "wx/icon.h"
         #include "wx/msgdlg.h"
@@ -36,7 +35,7 @@
 #include "wx/iconloc.h"
 #include "wx/confbase.h"
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
     #include "wx/msw/registry.h"
     #include "wx/msw/private.h"
 #endif // OS
@@ -95,22 +94,13 @@ static bool CanonicalizeParams(wxString& command)
         }
     }
 
-    if ( foundFilename )
-    {
-        // Some values also contain an addition %* expansion string which is
-        // presumably supposed to be replaced with the names of the other files
-        // accepted by the command. As we don't support more than one file
-        // anyhow, simply ignore it.
-        command.Replace(" %*", "");
-    }
-
     return foundFilename;
 }
 
 void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 {
     // VZ: does it? (FIXME)
-    wxCHECK_RET( !ext.empty(), wxT("needs an extension") );
+    wxCHECK_RET( !ext.empty(), _T("needs an extension") );
 
     if ( ext[0u] != wxT('.') ) {
         m_ext = wxT('.');
@@ -119,14 +109,14 @@ void wxFileTypeImpl::Init(const wxString& strFileType, const wxString& ext)
 
     m_strFileType = strFileType;
     if ( !strFileType ) {
-        m_strFileType = m_ext.AfterFirst('.') + wxT("_auto_file");
+        m_strFileType = m_ext.AfterFirst('.') + _T("_auto_file");
     }
 }
 
 wxString wxFileTypeImpl::GetVerbPath(const wxString& verb) const
 {
     wxString path;
-    path << m_strFileType << wxT("\\shell\\") << verb << wxT("\\command");
+    path << m_strFileType << _T("\\shell\\") << verb << _T("\\command");
     return path;
 }
 
@@ -134,7 +124,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
                                       wxArrayString *commands,
                                       const wxFileType::MessageParameters& params) const
 {
-    wxCHECK_MSG( !m_ext.empty(), 0, wxT("GetAllCommands() needs an extension") );
+    wxCHECK_MSG( !m_ext.empty(), 0, _T("GetAllCommands() needs an extension") );
 
     if ( m_strFileType.empty() )
     {
@@ -143,7 +133,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
         wxRegKey rkey(wxRegKey::HKCR, m_ext);
         if ( !rkey.Exists() || !rkey.QueryValue(wxEmptyString, self->m_strFileType) )
         {
-            wxLogDebug(wxT("Can't get the filetype for extension '%s'."),
+            wxLogDebug(_T("Can't get the filetype for extension '%s'."),
                        m_ext.c_str());
 
             return 0;
@@ -152,7 +142,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
 
     // enum all subkeys of HKCR\filetype\shell
     size_t count = 0;
-    wxRegKey rkey(wxRegKey::HKCR, m_strFileType  + wxT("\\shell"));
+    wxRegKey rkey(wxRegKey::HKCR, m_strFileType  + _T("\\shell"));
     long dummy;
     wxString verb;
     bool ok = rkey.GetFirstKey(verb, dummy);
@@ -162,7 +152,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs,
 
         // we want the open bverb to eb always the first
 
-        if ( verb.CmpNoCase(wxT("open")) == 0 )
+        if ( verb.CmpNoCase(_T("open")) == 0 )
         {
             if ( verbs )
                 verbs->Insert(verb, 0);
@@ -221,7 +211,7 @@ static wxString wxFileTypeImplGetCurVer(const wxString& progId)
     return progId;
 }
 
-wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
+wxString wxFileTypeImpl::GetCommand(const wxChar *verb) const
 {
     // suppress possible error messages
     wxLogNull nolog;
@@ -241,13 +231,13 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
         }
     }
 
-    if (!strKey && wxRegKey(wxRegKey::HKCR, m_ext + wxT("\\shell")).Exists())
+    if (!strKey && wxRegKey(wxRegKey::HKCR, m_ext + _T("\\shell")).Exists())
         strKey = m_ext;
 
     if ( !strKey && !m_strFileType.empty())
     {
         wxString fileType = wxFileTypeImplGetCurVer(m_strFileType);
-        if (wxRegKey(wxRegKey::HKCR, fileType + wxT("\\shell")).Exists())
+        if (wxRegKey(wxRegKey::HKCR, fileType + _T("\\shell")).Exists())
             strKey = fileType;
     }
 
@@ -258,7 +248,7 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
     }
 
     strKey << wxT("\\shell\\") << verb;
-    wxRegKey key(wxRegKey::HKCR, strKey + wxT("\\command"));
+    wxRegKey key(wxRegKey::HKCR, strKey + _T("\\command"));
     wxString command;
     if ( key.Open(wxRegKey::Read) ) {
         // it's the default value of the key
@@ -268,16 +258,16 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
 #if wxUSE_IPC
             // look whether we must issue some DDE requests to the application
             // (and not just launch it)
-            strKey += wxT("\\DDEExec");
+            strKey += _T("\\DDEExec");
             wxRegKey keyDDE(wxRegKey::HKCR, strKey);
             if ( keyDDE.Open(wxRegKey::Read) ) {
                 wxString ddeCommand, ddeServer, ddeTopic;
                 keyDDE.QueryValue(wxEmptyString, ddeCommand);
-                ddeCommand.Replace(wxT("%1"), wxT("%s"));
+                ddeCommand.Replace(_T("%1"), _T("%s"));
 
-                wxRegKey keyServer(wxRegKey::HKCR, strKey + wxT("\\Application"));
+                wxRegKey keyServer(wxRegKey::HKCR, strKey + _T("\\Application"));
                 keyServer.QueryValue(wxEmptyString, ddeServer);
-                wxRegKey keyTopic(wxRegKey::HKCR, strKey + wxT("\\Topic"));
+                wxRegKey keyTopic(wxRegKey::HKCR, strKey + _T("\\Topic"));
                 keyTopic.QueryValue(wxEmptyString, ddeTopic);
 
                 if (ddeTopic.empty())
@@ -286,10 +276,10 @@ wxString wxFileTypeImpl::GetCommand(const wxString& verb) const
                 // HACK: we use a special feature of wxExecute which exists
                 //       just because we need it here: it will establish DDE
                 //       conversation with the program it just launched
-                command.Prepend(wxT("WX_DDE#"));
-                command << wxT('#') << ddeServer
-                        << wxT('#') << ddeTopic
-                        << wxT('#') << ddeCommand;
+                command.Prepend(_T("WX_DDE#"));
+                command << _T('#') << ddeServer
+                        << _T('#') << ddeTopic
+                        << _T('#') << ddeCommand;
             }
             else
 #endif // wxUSE_IPC
@@ -547,7 +537,7 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
 wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 {
     wxCHECK_MSG( !ftInfo.GetExtensions().empty(), NULL,
-                 wxT("Associate() needs extension") );
+                 _T("Associate() needs extension") );
 
     bool ok;
     size_t iExtCount = 0;
@@ -557,10 +547,10 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     wxString ext = ftInfo.GetExtensions()[iExtCount];
 
     wxCHECK_MSG( !ext.empty(), NULL,
-                 wxT("Associate() needs non empty extension") );
+                 _T("Associate() needs non empty extension") );
 
-    if ( ext[0u] != wxT('.') )
-        extWithDot = wxT('.');
+    if ( ext[0u] != _T('.') )
+        extWithDot = _T('.');
     extWithDot += ext;
 
     // start by setting the HKCR\\.ext entries
@@ -578,7 +568,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
             if ( filetypeOrig.empty() )
             {
                 // make it up from the extension
-                filetype << extWithDot.c_str() + 1 << wxT("_file");
+                filetype << extWithDot.c_str() + 1 << _T("_file");
             }
             else
             {
@@ -608,7 +598,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     if ( !mimetype.empty() )
     {
         // set the MIME type
-        ok = key.SetValue(wxT("Content Type"), mimetype);
+        ok = key.SetValue(_T("Content Type"), mimetype);
 
         if ( ok )
         {
@@ -621,7 +611,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
             if ( ok )
             {
                 // and provide a back link to the extension
-                keyMIME.SetValue(wxT("Extension"), extWithDot);
+                keyMIME.SetValue(_T("Extension"), extWithDot);
             }
         }
     }
@@ -632,8 +622,8 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
     for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ )
     {
         ext = ftInfo.GetExtensions()[iExtCount];
-        if ( ext[0u] != wxT('.') )
-           extWithDot = wxT('.');
+        if ( ext[0u] != _T('.') )
+           extWithDot = _T('.');
         extWithDot += ext;
 
         wxRegKey key(wxRegKey::HKCR, extWithDot);
@@ -645,7 +635,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
         if ( !mimetype.empty() )
         {
             // set the MIME type
-            ok = key.SetValue(wxT("Content Type"), mimetype);
+            ok = key.SetValue(_T("Content Type"), mimetype);
 
             if ( ok )
             {
@@ -658,7 +648,7 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
                 if ( ok )
                 {
                     // and provide a back link to the extension
-                    keyMIME.SetValue(wxT("Extension"), extWithDot);
+                    keyMIME.SetValue(_T("Extension"), extWithDot);
                 }
             }
         }
@@ -690,7 +680,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
                                 bool WXUNUSED(overwriteprompt))
 {
     wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,
-                 wxT("SetCommand() needs an extension and a verb") );
+                 _T("SetCommand() needs an extension and a verb") );
 
     if ( !EnsureExtKeyExists() )
         return false;
@@ -725,13 +715,13 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd,
     // TODO:
     // 1. translate '%s' to '%1' instead of always adding it
     // 2. create DDEExec value if needed (undo GetCommand)
-    return rkey.Create() && rkey.SetValue(wxEmptyString, cmd + wxT(" \"%1\"") );
+    return rkey.Create() && rkey.SetValue(wxEmptyString, cmd + _T(" \"%1\"") );
 }
 
 /* // no longer used
 bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
 {
-    wxCHECK_MSG( !m_ext.empty(), false, wxT("SetMimeType() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false, _T("SetMimeType() needs extension") );
 
     if ( !EnsureExtKeyExists() )
         return false;
@@ -742,8 +732,8 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
     {
         // make up a default value for it
         wxString cmd;
-        wxFileName::SplitPath(GetCommand(wxT("open")), NULL, &cmd, NULL);
-        mimeType << wxT("application/x-") << cmd;
+        wxSplitPath(GetCommand(_T("open")), NULL, &cmd, NULL);
+        mimeType << _T("application/x-") << cmd;
     }
     else
     {
@@ -751,31 +741,31 @@ bool wxFileTypeImpl::SetMimeType(const wxString& mimeTypeOrig)
     }
 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
-    return rkey.Create() && rkey.SetValue(wxT("Content Type"), mimeType);
+    return rkey.Create() && rkey.SetValue(_T("Content Type"), mimeType);
 }
 */
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& cmd, int index)
 {
-    wxCHECK_MSG( !m_ext.empty(), false, wxT("SetDefaultIcon() needs extension") );
-    wxCHECK_MSG( !m_strFileType.empty(), false, wxT("File key not found") );
+    wxCHECK_MSG( !m_ext.empty(), false, _T("SetDefaultIcon() needs extension") );
+    wxCHECK_MSG( !m_strFileType.empty(), false, _T("File key not found") );
 //    the next line fails on a SMBshare, I think because it is case mangled
-//    wxCHECK_MSG( !wxFileExists(cmd), false, wxT("Icon file not found.") );
+//    wxCHECK_MSG( !wxFileExists(cmd), false, _T("Icon file not found.") );
 
     if ( !EnsureExtKeyExists() )
         return false;
 
-    wxRegKey rkey(wxRegKey::HKCR, m_strFileType + wxT("\\DefaultIcon"));
+    wxRegKey rkey(wxRegKey::HKCR, m_strFileType + _T("\\DefaultIcon"));
 
     return rkey.Create() &&
            rkey.SetValue(wxEmptyString,
-                         wxString::Format(wxT("%s,%d"), cmd.c_str(), index));
+                         wxString::Format(_T("%s,%d"), cmd.c_str(), index));
 }
 
 bool wxFileTypeImpl::SetDescription (const wxString& desc)
 {
-    wxCHECK_MSG( !m_strFileType.empty(), false, wxT("File key not found") );
-    wxCHECK_MSG( !desc.empty(), false, wxT("No file description supplied") );
+    wxCHECK_MSG( !m_strFileType.empty(), false, _T("File key not found") );
+    wxCHECK_MSG( !desc.empty(), false, _T("No file description supplied") );
 
     if ( !EnsureExtKeyExists() )
         return false;
@@ -817,13 +807,13 @@ bool wxFileTypeImpl::Unassociate()
 
 bool wxFileTypeImpl::RemoveOpenCommand()
 {
-   return RemoveCommand(wxT("open"));
+   return RemoveCommand(_T("open"));
 }
 
 bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 {
     wxCHECK_MSG( !m_ext.empty() && !verb.empty(), false,
-                 wxT("RemoveCommand() needs an extension and a verb") );
+                 _T("RemoveCommand() needs an extension and a verb") );
 
     wxRegKey rkey(wxRegKey::HKCR, GetVerbPath(verb));
 
@@ -833,7 +823,7 @@ bool wxFileTypeImpl::RemoveCommand(const wxString& verb)
 
 bool wxFileTypeImpl::RemoveMimeType()
 {
-    wxCHECK_MSG( !m_ext.empty(), false, wxT("RemoveMimeType() needs extension") );
+    wxCHECK_MSG( !m_ext.empty(), false, _T("RemoveMimeType() needs extension") );
 
     wxRegKey rkey(wxRegKey::HKCR, m_ext);
     return !rkey.Exists() || rkey.DeleteSelf();
@@ -842,16 +832,16 @@ bool wxFileTypeImpl::RemoveMimeType()
 bool wxFileTypeImpl::RemoveDefaultIcon()
 {
     wxCHECK_MSG( !m_ext.empty(), false,
-                 wxT("RemoveDefaultIcon() needs extension") );
+                 _T("RemoveDefaultIcon() needs extension") );
 
-    wxRegKey rkey (wxRegKey::HKCR, m_strFileType  + wxT("\\DefaultIcon"));
+    wxRegKey rkey (wxRegKey::HKCR, m_strFileType  + _T("\\DefaultIcon"));
     return !rkey.Exists() || rkey.DeleteSelf();
 }
 
 bool wxFileTypeImpl::RemoveDescription()
 {
     wxCHECK_MSG( !m_ext.empty(), false,
-                 wxT("RemoveDescription() needs extension") );
+                 _T("RemoveDescription() needs extension") );
 
     wxRegKey rkey (wxRegKey::HKCR, m_strFileType );
     return !rkey.Exists() || rkey.DeleteSelf();
diff --git a/Source/3rd Party/wx/src/msw/minifram.cpp b/Source/3rd Party/wx/src/msw/minifram.cpp
index f5b9d7693..298b2d596 100644
--- a/Source/3rd Party/wx/src/msw/minifram.cpp	
+++ b/Source/3rd Party/wx/src/msw/minifram.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/minifram.cpp
+// Name:        minifram.cpp
 // Purpose:     wxMiniFrame
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: minifram.cpp 49299 2007-10-21 18:07:29Z PC $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Source/3rd Party/wx/src/msw/msgdlg.cpp b/Source/3rd Party/wx/src/msw/msgdlg.cpp
index 908a52b4a..901a9ed47 100644
--- a/Source/3rd Party/wx/src/msw/msgdlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/msgdlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: msgdlg.cpp 50855 2007-12-20 10:51:33Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,432 +16,36 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_MSGDLG
-
-// there is no hook support under CE so we can't use the code for message box
-// positioning there
-#ifndef __WXWINCE__
-    #define wxUSE_MSGBOX_HOOK 1
-#else
-    #define wxUSE_MSGBOX_HOOK 0
-#endif
+#include "wx/msgdlg.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/msgdlg.h"
     #include "wx/app.h"
-    #include "wx/intl.h"
     #include "wx/utils.h"
-    #include "wx/msw/private.h"
-    #if wxUSE_MSGBOX_HOOK
-        #include "wx/hashmap.h"
-    #endif
+    #include "wx/dialog.h"
 #endif
 
-#include "wx/ptr_scpd.h"
-#include "wx/dynlib.h"
-#include "wx/msw/private/button.h"
-#include "wx/msw/private/metrics.h"
-#include "wx/msw/private/msgdlg.h"
-
-#if wxUSE_MSGBOX_HOOK
-    #include "wx/fontutil.h"
-    #include "wx/textbuf.h"
-    #include "wx/display.h"
-#endif
+#include "wx/msw/private.h"
 
 // For MB_TASKMODAL
 #ifdef __WXWINCE__
-    #include "wx/msw/wince/missing.h"
+#include "wx/msw/wince/missing.h"
 #endif
 
-// Interestingly, this symbol currently seems to be absent from Platform SDK
-// headers but it is documented at MSDN.
-#ifndef TDF_SIZE_TO_CONTENT
-    #define TDF_SIZE_TO_CONTENT 0x1000000
-#endif
-
-using namespace wxMSWMessageDialog;
-
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
-#if wxUSE_MSGBOX_HOOK
-
-// there can potentially be one message box per thread so we use a hash map
-// with thread ids as keys and (currently shown) message boxes as values
-//
-// TODO: replace this with wxTLS once it's available
-WX_DECLARE_HASH_MAP(unsigned long, wxMessageDialog *,
-                    wxIntegerHash, wxIntegerEqual,
-                    wxMessageDialogMap);
-
-// the order in this array is the one in which buttons appear in the
-// message box
-const wxMessageDialog::ButtonAccessors wxMessageDialog::ms_buttons[] =
+wxMessageDialog::wxMessageDialog(wxWindow *parent,
+                                 const wxString& message,
+                                 const wxString& caption,
+                                 long style,
+                                 const wxPoint& WXUNUSED(pos))
 {
-    { IDYES,    &wxMessageDialog::GetYesLabel    },
-    { IDNO,     &wxMessageDialog::GetNoLabel     },
-    { IDOK,     &wxMessageDialog::GetOKLabel     },
-    { IDCANCEL, &wxMessageDialog::GetCancelLabel },
-};
-
-namespace
-{
-
-wxMessageDialogMap& HookMap()
-{
-    static wxMessageDialogMap s_Map;
-
-    return s_Map;
+    m_caption = caption;
+    m_message = message;
+    m_parent = parent;
+    SetMessageDialogStyle(style);
 }
 
-/*
-    All this code is used for adjusting the message box layout when we mess
-    with its contents. It's rather complicated because we try hard to avoid
-    assuming much about the standard layout details and so, instead of just
-    laying out everything ourselves (which would have been so much simpler!)
-    we try to only modify the existing controls positions by offsetting them
-    from their default ones in the hope that this will continue to work with
-    the future Windows versions.
- */
-
-// convert the given RECT from screen to client coordinates in place
-void ScreenRectToClient(HWND hwnd, RECT& rc)
-{
-    // map from desktop (i.e. screen) coordinates to ones of this window
-    //
-    // notice that a RECT is laid out as 2 consecutive POINTs so the cast is
-    // valid
-    ::MapWindowPoints(HWND_DESKTOP, hwnd, reinterpret_cast<POINT *>(&rc), 2);
-}
-
-// set window position to the given rect
-inline void SetWindowRect(HWND hwnd, const RECT& rc)
-{
-    ::MoveWindow(hwnd,
-                 rc.left, rc.top,
-                 rc.right - rc.left, rc.bottom - rc.top,
-                 FALSE);
-}
-
-// set window position expressed in screen coordinates, whether the window is
-// child or top level
-void MoveWindowToScreenRect(HWND hwnd, RECT rc)
-{
-    ScreenRectToClient(::GetParent(hwnd), rc);
-
-    SetWindowRect(hwnd, rc);
-}
-
-// helper of AdjustButtonLabels(): move the given window by dx
-//
-// works for both child and top level windows
-void OffsetWindow(HWND hwnd, int dx)
-{
-    RECT rc = wxGetWindowRect(hwnd);
-
-    rc.left += dx;
-    rc.right += dx;
-
-    MoveWindowToScreenRect(hwnd, rc);
-}
-
-} // anonymous namespace
-
-/* static */
-WXLRESULT wxCALLBACK
-wxMessageDialog::HookFunction(int code, WXWPARAM wParam, WXLPARAM lParam)
-{
-    // Find the thread-local instance of wxMessageDialog
-    const DWORD tid = ::GetCurrentThreadId();
-    wxMessageDialogMap::iterator node = HookMap().find(tid);
-    wxCHECK_MSG( node != HookMap().end(), false,
-                    wxT("bogus thread id in wxMessageDialog::Hook") );
-
-    wxMessageDialog *  const wnd = node->second;
-
-    const HHOOK hhook = (HHOOK)wnd->m_hook;
-    const LRESULT rc = ::CallNextHookEx(hhook, code, wParam, lParam);
-
-    if ( code == HCBT_ACTIVATE )
-    {
-        // we won't need this hook any longer
-        ::UnhookWindowsHookEx(hhook);
-        wnd->m_hook = NULL;
-        HookMap().erase(tid);
-
-        wnd->SetHWND((HWND)wParam);
-
-        // replace the static text with an edit control if the message box is
-        // too big to fit the display
-        wnd->ReplaceStaticWithEdit();
-
-        // update the labels if necessary: we need to do it before centering
-        // the dialog as this can change its size
-        if ( wnd->HasCustomLabels() )
-            wnd->AdjustButtonLabels();
-
-        // centre the message box on its parent if requested
-        if ( wnd->GetMessageDialogStyle() & wxCENTER )
-            wnd->Center(); // center on parent
-        //else: default behaviour, center on screen
-
-        // there seems to be no reason to leave it set
-        wnd->SetHWND(NULL);
-    }
-
-    return rc;
-}
-
-void wxMessageDialog::ReplaceStaticWithEdit()
-{
-    // check if the message box fits the display
-    int nDisplay = wxDisplay::GetFromWindow(this);
-    if ( nDisplay == wxNOT_FOUND )
-        nDisplay = 0;
-    const wxRect rectDisplay = wxDisplay(nDisplay).GetClientArea();
-
-    if ( rectDisplay.Contains(GetRect()) )
-    {
-        // nothing to do
-        return;
-    }
-
-
-    // find the static control to replace: normally there are two of them, the
-    // icon and the text itself so search for all of them and ignore the icon
-    // ones
-    HWND hwndStatic = ::FindWindowEx(GetHwnd(), NULL, wxT("STATIC"), NULL);
-    if ( ::GetWindowLong(hwndStatic, GWL_STYLE) & SS_ICON )
-        hwndStatic = ::FindWindowEx(GetHwnd(), hwndStatic, wxT("STATIC"), NULL);
-
-    if ( !hwndStatic )
-    {
-        wxLogDebug("Failed to find the static text control in message box.");
-        return;
-    }
-
-    // set the right font for GetCharHeight() call below
-    wxWindowBase::SetFont(GetMessageFont());
-
-    // put the new edit control at the same place
-    RECT rc = wxGetWindowRect(hwndStatic);
-    ScreenRectToClient(GetHwnd(), rc);
-
-    // but make it less tall so that the message box fits on the screen: we try
-    // to make the message box take no more than 7/8 of the screen to leave
-    // some space above and below it
-    const int hText = (7*rectDisplay.height)/8 -
-                      (
-                         2*::GetSystemMetrics(SM_CYFIXEDFRAME) +
-                         ::GetSystemMetrics(SM_CYCAPTION) +
-                         5*GetCharHeight() // buttons + margins
-                      );
-    const int dh = (rc.bottom - rc.top) - hText; // vertical space we save
-    rc.bottom -= dh;
-
-    // and it also must be wider as it needs a vertical scrollbar (in order
-    // to preserve the word wrap, otherwise the number of lines would change
-    // and we want the control to look as similar as possible to the original)
-    //
-    // NB: you would have thought that 2*SM_CXEDGE would be enough but it
-    //     isn't, somehow, and the text control breaks lines differently from
-    //     the static one so fudge by adding some extra space
-    const int dw = ::GetSystemMetrics(SM_CXVSCROLL) +
-                        4*::GetSystemMetrics(SM_CXEDGE);
-    rc.right += dw;
-
-
-    // chop of the trailing new line(s) from the message box text, they are
-    // ignored by the static control but result in extra lines and hence extra
-    // scrollbar position in the edit one
-    wxString text(wxGetWindowText(hwndStatic));
-    for ( wxString::reverse_iterator i = text.rbegin(); i != text.rend(); ++i )
-    {
-        if ( *i != '\n' )
-        {
-            // found last non-newline char, remove anything after it if
-            // necessary and stop in any case
-            if ( i != text.rbegin() )
-                text.erase(i.base() + 1, text.end());
-            break;
-        }
-    }
-
-    // do create the new control
-    HWND hwndEdit = ::CreateWindow
-                      (
-                        wxT("EDIT"),
-                        wxTextBuffer::Translate(text).t_str(),
-                        WS_CHILD | WS_VSCROLL | WS_VISIBLE |
-                        ES_MULTILINE | ES_READONLY | ES_AUTOVSCROLL,
-                        rc.left, rc.top,
-                        rc.right - rc.left, rc.bottom - rc.top,
-                        GetHwnd(),
-                        NULL,
-                        wxGetInstance(),
-                        NULL
-                      );
-
-    if ( !hwndEdit )
-    {
-        wxLogDebug("Creation of replacement edit control failed in message box");
-        return;
-    }
-
-    // copy the font from the original control
-    LRESULT hfont = ::SendMessage(hwndStatic, WM_GETFONT, 0, 0);
-    ::SendMessage(hwndEdit, WM_SETFONT, hfont, 0);
-
-    // and get rid of it
-    ::DestroyWindow(hwndStatic);
-
-
-    // shrink and centre the message box vertically and widen it box to account
-    // for the extra scrollbar
-    RECT rcBox = wxGetWindowRect(GetHwnd());
-    const int hMsgBox = rcBox.bottom - rcBox.top - dh;
-    rcBox.top = (rectDisplay.height - hMsgBox)/2;
-    rcBox.bottom = rcBox.top + hMsgBox + (rectDisplay.height - hMsgBox)%2;
-    rcBox.left -= dw/2;
-    rcBox.right += dw - dw/2;
-    SetWindowRect(GetHwnd(), rcBox);
-
-    // and adjust all the buttons positions
-    for ( unsigned n = 0; n < WXSIZEOF(ms_buttons); n++ )
-    {
-        const HWND hwndBtn = ::GetDlgItem(GetHwnd(), ms_buttons[n].id);
-        if ( !hwndBtn )
-            continue;   // it's ok, not all buttons are always present
-
-        RECT rc = wxGetWindowRect(hwndBtn);
-        rc.top -= dh;
-        rc.bottom -= dh;
-        rc.left += dw/2;
-        rc.right += dw/2;
-        MoveWindowToScreenRect(hwndBtn, rc);
-    }
-}
-
-void wxMessageDialog::AdjustButtonLabels()
-{
-    // changing the button labels is the easy part but we also need to ensure
-    // that the buttons are big enough for the label strings and increase their
-    // size (and maybe the size of the message box itself) if they are not
-
-    // TODO-RTL: check whether this works correctly in RTL
-
-    // we want to use this font in GetTextExtent() calls below but we don't
-    // want to send WM_SETFONT to the message box, who knows how is it going to
-    // react to it (right now it doesn't seem to do anything but what if this
-    // changes)
-    wxWindowBase::SetFont(GetMessageFont());
-
-    // first iteration: find the widest button and update the buttons labels
-    int wBtnOld = 0,            // current buttons width
-        wBtnNew = 0;            // required new buttons width
-    RECT rcBtn;                 // stores the button height and y positions
-    unsigned numButtons = 0;    // total number of buttons in the message box
-    unsigned n;
-    for ( n = 0; n < WXSIZEOF(ms_buttons); n++ )
-    {
-        const HWND hwndBtn = ::GetDlgItem(GetHwnd(), ms_buttons[n].id);
-        if ( !hwndBtn )
-            continue;   // it's ok, not all buttons are always present
-
-        numButtons++;
-
-        const wxString label = (this->*ms_buttons[n].getter)();
-        const wxSize sizeLabel = wxWindowBase::GetTextExtent(label);
-
-        // check if the button is big enough for this label
-        const RECT rc = wxGetWindowRect(hwndBtn);
-        if ( !wBtnOld )
-        {
-            // initialize wBtnOld using the first button width, all the other
-            // ones should have the same one
-            wBtnOld = rc.right - rc.left;
-
-            rcBtn = rc; // remember for use below when we reposition the buttons
-        }
-        else
-        {
-            wxASSERT_MSG( wBtnOld == rc.right - rc.left,
-                          "all buttons are supposed to be of same width" );
-        }
-
-        const int widthNeeded = wxMSWButton::GetFittingSize(this, sizeLabel).x;
-        if ( widthNeeded > wBtnNew )
-            wBtnNew = widthNeeded;
-
-        ::SetWindowText(hwndBtn, label.t_str());
-    }
-
-    if ( wBtnNew <= wBtnOld )
-    {
-        // all buttons fit, nothing else to do
-        return;
-    }
-
-    // resize the message box to be wider if needed
-    const int wBoxOld = wxGetClientRect(GetHwnd()).right;
-
-    const int CHAR_WIDTH = GetCharWidth();
-    const int MARGIN_OUTER = 2*CHAR_WIDTH;  // margin between box and buttons
-    const int MARGIN_INNER = CHAR_WIDTH;    // margin between buttons
-
-    RECT rcBox = wxGetWindowRect(GetHwnd());
-
-    const int wAllButtons = numButtons*(wBtnNew + MARGIN_INNER) - MARGIN_INNER;
-    int wBoxNew = 2*MARGIN_OUTER + wAllButtons;
-    if ( wBoxNew > wBoxOld )
-    {
-        const int dw = wBoxNew - wBoxOld;
-        rcBox.left -= dw/2;
-        rcBox.right += dw - dw/2;
-
-        SetWindowRect(GetHwnd(), rcBox);
-
-        // surprisingly, we don't need to resize the static text control, it
-        // seems to adjust itself to the new size, at least under Windows 2003
-        // (TODO: test if this happens on older Windows versions)
-    }
-    else // the current width is big enough
-    {
-        wBoxNew = wBoxOld;
-    }
-
-
-    // finally position all buttons
-
-    // notice that we have to take into account the difference between window
-    // and client width
-    rcBtn.left = (rcBox.left + rcBox.right - wxGetClientRect(GetHwnd()).right +
-                  wBoxNew - wAllButtons) / 2;
-    rcBtn.right = rcBtn.left + wBtnNew;
-
-    for ( n = 0; n < WXSIZEOF(ms_buttons); n++ )
-    {
-        const HWND hwndBtn = ::GetDlgItem(GetHwnd(), ms_buttons[n].id);
-        if ( !hwndBtn )
-            continue;
-
-        MoveWindowToScreenRect(hwndBtn, rcBtn);
-
-        rcBtn.left += wBtnNew + MARGIN_INNER;
-        rcBtn.right += wBtnNew + MARGIN_INNER;
-    }
-}
-
-#endif // wxUSE_MSGBOX_HOOK
-
-/* static */
-wxFont wxMessageDialog::GetMessageFont()
-{
-    const NONCLIENTMETRICS& ncm = wxMSWImpl::GetNonClientMetrics();
-    return wxNativeFontInfo(ncm.lfMessageFont);
-}
-
-int wxMessageDialog::ShowMessageBox()
+int wxMessageDialog::ShowModal()
 {
     if ( !wxTheApp->GetTopWindow() )
     {
@@ -454,46 +58,14 @@ int wxMessageDialog::ShowMessageBox()
     }
 
     // use the top level window as parent if none specified
-    m_parent = GetParentForModalDialog();
+    if ( !m_parent )
+        m_parent = FindSuitableParent();
     HWND hWnd = m_parent ? GetHwndOf(m_parent) : NULL;
 
-#if wxUSE_INTL
-    // native message box always uses the current user locale but the program
-    // may be using a different one and in this case we need to manually
-    // translate the default button labels (if they're non default we have no
-    // way to translate them and so we must assume they were already
-    // translated) to avoid mismatch between the language of the message box
-    // text and its buttons
-    wxLocale * const loc = wxGetLocale();
-    if ( loc && loc->GetLanguage() != wxLocale::GetSystemLanguage() )
-    {
-        if ( m_dialogStyle & wxYES_NO &&
-                (GetCustomYesLabel().empty() && GetCustomNoLabel().empty()) )
-
-        {
-            // use the strings with mnemonics here as the native message box
-            // does
-            SetYesNoLabels(_("&Yes"), _("&No"));
-        }
-
-        // we may or not have the Ok/Cancel buttons but either we do have them
-        // or we already made the labels custom because we called
-        // SetYesNoLabels() above so doing this does no harm -- and is
-        // necessary in wxYES_NO | wxCANCEL case
-        //
-        // note that we don't use mnemonics here for consistency with the
-        // native message box (which probably doesn't use them because
-        // Enter/Esc keys can be already used to dismiss the message box
-        // using keyboard)
-        if ( GetCustomOKLabel().empty() && GetCustomCancelLabel().empty() )
-            SetOKCancelLabels(_("OK"), _("Cancel"));
-    }
-#endif // wxUSE_INTL
-
     // translate wx style in MSW
-    unsigned int msStyle;
+    unsigned int msStyle = MB_OK;
     const long wxStyle = GetMessageDialogStyle();
-    if ( wxStyle & wxYES_NO )
+    if (wxStyle & wxYES_NO)
     {
 #if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
         if (wxStyle & wxCANCEL)
@@ -502,49 +74,32 @@ int wxMessageDialog::ShowMessageBox()
 #endif // !(__SMARTPHONE__ && __WXWINCE__)
             msStyle = MB_YESNO;
 
-        if ( wxStyle & wxNO_DEFAULT )
+        if (wxStyle & wxNO_DEFAULT)
             msStyle |= MB_DEFBUTTON2;
-        else if ( wxStyle & wxCANCEL_DEFAULT )
-            msStyle |= MB_DEFBUTTON3;
     }
-    else // without Yes/No we're going to have an OK button
+
+    if (wxStyle & wxOK)
     {
-        if ( wxStyle & wxCANCEL )
-        {
+        if (wxStyle & wxCANCEL)
             msStyle = MB_OKCANCEL;
-
-            if ( wxStyle & wxCANCEL_DEFAULT )
-                msStyle |= MB_DEFBUTTON2;
-        }
-        else // just "OK"
-        {
+        else
             msStyle = MB_OK;
-        }
     }
-
-    if ( wxStyle & wxHELP )
+    if (wxStyle & wxICON_EXCLAMATION)
+        msStyle |= MB_ICONEXCLAMATION;
+    else if (wxStyle & wxICON_HAND)
+        msStyle |= MB_ICONHAND;
+    else if (wxStyle & wxICON_INFORMATION)
+        msStyle |= MB_ICONINFORMATION;
+    else if (wxStyle & wxICON_QUESTION)
+        msStyle |= MB_ICONQUESTION;
+    else
     {
-        msStyle |= MB_HELP;
-    }
+        int majorVersion, minorVersion;
+        wxGetOsVersion(& majorVersion, & minorVersion);
 
-    // set the icon style
-    switch ( GetEffectiveIcon() )
-    {
-        case wxICON_ERROR:
-            msStyle |= MB_ICONHAND;
-            break;
-
-        case wxICON_WARNING:
-            msStyle |= MB_ICONEXCLAMATION;
-            break;
-
-        case wxICON_QUESTION:
-            msStyle |= MB_ICONQUESTION;
-            break;
-
-        case wxICON_INFORMATION:
+        if ( majorVersion >= 6 )
             msStyle |= MB_ICONINFORMATION;
-            break;
     }
 
     if ( wxStyle & wxSTAY_ON_TOP )
@@ -563,7 +118,7 @@ int wxMessageDialog::ShowMessageBox()
     // per MSDN documentation for MessageBox() we can prefix the message with 2
     // right-to-left mark characters to tell the function to use RTL layout
     // (unfortunately this only works in Unicode builds)
-    wxString message = GetFullMessage();
+    wxString message = m_message;
 #if wxUSE_UNICODE
     if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
     {
@@ -573,296 +128,13 @@ int wxMessageDialog::ShowMessageBox()
     }
 #endif // wxUSE_UNICODE
 
-#if wxUSE_MSGBOX_HOOK
-    // install the hook in any case as we don't know in advance if the message
-    // box is not going to be too big (requiring the replacement of the static
-    // control with an edit one)
-    const DWORD tid = ::GetCurrentThreadId();
-    m_hook = ::SetWindowsHookEx(WH_CBT,
-                                &wxMessageDialog::HookFunction, NULL, tid);
-    HookMap()[tid] = this;
-#endif // wxUSE_MSGBOX_HOOK
-
     // do show the dialog
-    int msAns = MessageBox(hWnd, message.t_str(), m_caption.t_str(), msStyle);
-
-    return MSWTranslateReturnCode(msAns);
-}
-
-int wxMessageDialog::ShowModal()
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        TaskDialogIndirect_t taskDialogIndirect = GetTaskDialogIndirectFunc();
-        wxCHECK_MSG( taskDialogIndirect, wxID_CANCEL, wxS("no task dialog?") );
-
-        WinStruct<TASKDIALOGCONFIG> tdc;
-        wxMSWTaskDialogConfig wxTdc( *this );
-        wxTdc.MSWCommonTaskDialogInit( tdc );
-
-        int msAns;
-        HRESULT hr = taskDialogIndirect( &tdc, &msAns, NULL, NULL );
-        if ( FAILED(hr) )
-        {
-            wxLogApiError( "TaskDialogIndirect", hr );
-            return wxID_CANCEL;
-        }
-
-        // In case only an "OK" button was specified we actually created a
-        // "Cancel" button (see comment in MSWCommonTaskDialogInit). This
-        // results in msAns being IDCANCEL while we want IDOK (just like
-        // how the native MessageBox function does with only an "OK" button).
-        if ( (msAns == IDCANCEL)
-            && !(GetMessageDialogStyle() & (wxYES_NO|wxCANCEL)) )
-        {
-            msAns = IDOK;
-        }
-
-        return MSWTranslateReturnCode( msAns );
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return ShowMessageBox();
-}
-
-void wxMessageDialog::DoCentre(int dir)
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    // Task dialog is always centered on its parent window and trying to center
-    // it manually doesn't work because its HWND is not created yet so don't
-    // even try as this would only result in (debug) error messages.
-    if ( HasNativeTaskDialog() )
-        return;
-#endif // wxHAS_MSW_TASKDIALOG
-
-    wxMessageDialogBase::DoCentre(dir);
-}
-
-// ----------------------------------------------------------------------------
-// Helpers of the wxMSWMessageDialog namespace
-// ----------------------------------------------------------------------------
-
-#ifdef wxHAS_MSW_TASKDIALOG
-
-wxMSWTaskDialogConfig::wxMSWTaskDialogConfig(const wxMessageDialogBase& dlg)
-                     : buttons(new TASKDIALOG_BUTTON[MAX_BUTTONS])
-{
-    parent = dlg.GetParentForModalDialog();
-    caption = dlg.GetCaption();
-    message = dlg.GetMessage();
-    extendedMessage = dlg.GetExtendedMessage();
-
-    // Before wxMessageDialog added support for extended message it was common
-    // practice to have long multiline texts in the message box with the first
-    // line playing the role of the main message and the rest of the extended
-    // one. Try to detect such usage automatically here by synthesizing the
-    // extended message on our own if it wasn't given.
-    if ( extendedMessage.empty() )
-    {
-        // Check if there is a blank separating line after the first line (this
-        // is not the same as searching for "\n\n" as we want the automatically
-        // recognized main message be single line to avoid embarrassing false
-        // positives).
-        const size_t posNL = message.find('\n');
-        if ( posNL != wxString::npos &&
-                posNL < message.length() - 1 &&
-                    message[posNL + 1 ] == '\n' )
-        {
-            extendedMessage.assign(message, posNL + 2, wxString::npos);
-            message.erase(posNL);
-        }
-    }
-
-    iconId = dlg.GetEffectiveIcon();
-    style = dlg.GetMessageDialogStyle();
-    useCustomLabels = dlg.HasCustomLabels();
-    btnYesLabel = dlg.GetYesLabel();
-    btnNoLabel = dlg.GetNoLabel();
-    btnOKLabel = dlg.GetOKLabel();
-    btnCancelLabel = dlg.GetCancelLabel();
-    btnHelpLabel = dlg.GetHelpLabel();
-}
-
-void wxMSWTaskDialogConfig::MSWCommonTaskDialogInit(TASKDIALOGCONFIG &tdc)
-{
-    // Use TDF_SIZE_TO_CONTENT to try to prevent Windows from truncating or
-    // ellipsizing the message text. This doesn't always work as Windows will
-    // still do it if the message contains too long "words" (i.e. runs of the
-    // text without spaces) but at least it ensures that the message text is
-    // fully shown for reasonably-sized words whereas without it using almost
-    // any file system path in a message box would result in truncation.
-    tdc.dwFlags = TDF_EXPAND_FOOTER_AREA |
-                  TDF_POSITION_RELATIVE_TO_WINDOW |
-                  TDF_SIZE_TO_CONTENT;
-    tdc.hInstance = wxGetInstance();
-    tdc.pszWindowTitle = caption.t_str();
-
-    // use the top level window as parent if none specified
-    tdc.hwndParent = parent ? GetHwndOf(parent) : NULL;
-
-    if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
-        tdc.dwFlags |= TDF_RTL_LAYOUT;
-
-    // If we have both the main and extended messages, just use them as
-    // intended. However if only one message is given we normally use it as the
-    // content and not as the main instruction because the latter is supposed
-    // to stand out compared to the former and doesn't look good if there is
-    // nothing for it to contrast with. Finally, notice that the extended
-    // message we use here might be automatically extracted from the main
-    // message in our ctor, see comment there.
-    if ( !extendedMessage.empty() )
-    {
-        tdc.pszMainInstruction = message.t_str();
-        tdc.pszContent = extendedMessage.t_str();
-    }
-    else
-    {
-        tdc.pszContent = message.t_str();
-    }
-
-    // set an icon to be used, if possible
-    switch ( iconId )
-    {
-        case wxICON_ERROR:
-            tdc.pszMainIcon = TD_ERROR_ICON;
-            break;
-
-        case wxICON_WARNING:
-            tdc.pszMainIcon = TD_WARNING_ICON;
-            break;
-
-        case wxICON_INFORMATION:
-            tdc.pszMainIcon = TD_INFORMATION_ICON;
-            break;
-    }
-
-    // custom label button array that can hold all buttons in use
-    tdc.pButtons = buttons.get();
-
-    if ( style & wxYES_NO )
-    {
-        AddTaskDialogButton(tdc, IDYES, TDCBF_YES_BUTTON, btnYesLabel);
-        AddTaskDialogButton(tdc, IDNO,  TDCBF_NO_BUTTON,  btnNoLabel);
-
-        if (style & wxCANCEL)
-            AddTaskDialogButton(tdc, IDCANCEL,
-                                TDCBF_CANCEL_BUTTON, btnCancelLabel);
-
-        if ( style & wxNO_DEFAULT )
-            tdc.nDefaultButton = IDNO;
-        else if ( style & wxCANCEL_DEFAULT )
-            tdc.nDefaultButton = IDCANCEL;
-    }
-    else // without Yes/No we're going to have an OK button
-    {
-        if ( style & wxCANCEL )
-        {
-            AddTaskDialogButton(tdc, IDOK, TDCBF_OK_BUTTON, btnOKLabel);
-            AddTaskDialogButton(tdc, IDCANCEL,
-                                TDCBF_CANCEL_BUTTON, btnCancelLabel);
-
-            if ( style & wxCANCEL_DEFAULT )
-                tdc.nDefaultButton = IDCANCEL;
-        }
-        else // Only "OK"
-        {
-            // We actually create a "Cancel" button instead because we want to
-            // allow closing the dialog box with Escape (and also Alt-F4 or
-            // clicking the close button in the title bar) which wouldn't work
-            // without a Cancel button.
-            if ( !useCustomLabels )
-            {
-                useCustomLabels = true;
-                btnOKLabel = _("OK");
-            }
-
-            AddTaskDialogButton(tdc, IDCANCEL, TDCBF_CANCEL_BUTTON, btnOKLabel);
-        }
-    }
-
-    if ( style & wxHELP )
-    {
-        // There is no support for "Help" button in the task dialog, it can
-        // only show "Retry" or "Close" ones.
-        useCustomLabels = true;
-
-        AddTaskDialogButton(tdc, IDHELP, 0 /* not used */, btnHelpLabel);
-    }
-}
-
-void wxMSWTaskDialogConfig::AddTaskDialogButton(TASKDIALOGCONFIG &tdc,
-                                                int btnCustomId,
-                                                int btnCommonId,
-                                                const wxString& customLabel)
-{
-    if ( useCustomLabels )
-    {
-        // use custom buttons to implement custom labels
-        TASKDIALOG_BUTTON &tdBtn = buttons[tdc.cButtons];
-
-        tdBtn.nButtonID = btnCustomId;
-        tdBtn.pszButtonText = customLabel.t_str();
-        tdc.cButtons++;
-
-        // We should never have more than 4 buttons currently as this is the
-        // maximal number of buttons supported by the message dialog.
-        wxASSERT_MSG( tdc.cButtons <= MAX_BUTTONS, wxT("Too many buttons") );
-    }
-    else
-    {
-        tdc.dwCommonButtons |= btnCommonId;
-    }
-}
-
-// Task dialog can be used from different threads (and wxProgressDialog always
-// uses it from another thread in fact) so protect access to the static
-// variable below with a critical section.
-wxCRIT_SECT_DECLARE(gs_csTaskDialogIndirect);
-
-TaskDialogIndirect_t wxMSWMessageDialog::GetTaskDialogIndirectFunc()
-{
-    // Initialize the function pointer to an invalid value different from NULL
-    // to avoid reloading comctl32.dll and trying to resolve it every time
-    // we're called if task dialog is not available (notice that this may
-    // happen even under Vista+ if we don't use comctl32.dll v6).
-    static const TaskDialogIndirect_t
-        INVALID_TASKDIALOG_FUNC = reinterpret_cast<TaskDialogIndirect_t>(-1);
-    static TaskDialogIndirect_t s_TaskDialogIndirect = INVALID_TASKDIALOG_FUNC;
-
-    wxCRIT_SECT_LOCKER(lock, gs_csTaskDialogIndirect);
-
-    if ( s_TaskDialogIndirect == INVALID_TASKDIALOG_FUNC )
-    {
-        wxLoadedDLL dllComCtl32("comctl32.dll");
-        wxDL_INIT_FUNC(s_, TaskDialogIndirect, dllComCtl32);
-    }
-
-    return s_TaskDialogIndirect;
-}
-
-#endif // wxHAS_MSW_TASKDIALOG
-
-bool wxMSWMessageDialog::HasNativeTaskDialog()
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( wxGetWinVersion() >= wxWinVersion_6 )
-    {
-        if ( wxMSWMessageDialog::GetTaskDialogIndirectFunc() )
-            return true;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return false;
-}
-
-int wxMSWMessageDialog::MSWTranslateReturnCode(int msAns)
-{
+    int msAns = MessageBox(hWnd, message, m_caption, msStyle);
     int ans;
     switch (msAns)
     {
         default:
-            wxFAIL_MSG(wxT("unexpected return code"));
+            wxFAIL_MSG(_T("unexpected ::MessageBox() return code"));
             // fall through
 
         case IDCANCEL:
@@ -877,12 +149,6 @@ int wxMSWMessageDialog::MSWTranslateReturnCode(int msAns)
         case IDNO:
             ans = wxID_NO;
             break;
-        case IDHELP:
-            ans = wxID_HELP;
-            break;
     }
-
     return ans;
 }
-
-#endif // wxUSE_MSGDLG
diff --git a/Source/3rd Party/wx/src/msw/mslu.cpp b/Source/3rd Party/wx/src/msw/mslu.cpp
index ead0dc1ed..89832ffca 100644
--- a/Source/3rd Party/wx/src/msw/mslu.cpp	
+++ b/Source/3rd Party/wx/src/msw/mslu.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2002/02/17
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: mslu.cpp 42462 2006-10-26 19:06:51Z VZ $
 // Copyright:   (c) 2002 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -21,8 +21,6 @@
     #include "wx/utils.h"
 #endif
 
-#define wxHAS_HUGE_FILES
-
 //------------------------------------------------------------------------
 // Check for use of MSLU
 //------------------------------------------------------------------------
@@ -149,80 +147,101 @@ WXDLLEXPORT int wxMSLU_GetSaveFileNameW(void *ofn)
 
 #if wxUSE_BASE
 
-WXDLLIMPEXP_BASE int wxMSLU__wrename(const wchar_t *oldname,
-                                     const wchar_t *newname)
+WXDLLIMPEXP_BASE int wxMSLU__trename(const wxChar *oldname,
+                                     const wxChar *newname)
 {
     if ( wxUsingUnicowsDll() )
         return rename(wxConvFile.cWX2MB(oldname), wxConvFile.cWX2MB(newname));
     else
-        return _wrename(oldname, newname);
+        return _trename(oldname, newname);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__wremove(const wchar_t *name)
+WXDLLIMPEXP_BASE int wxMSLU__tremove(const wxChar *name)
 {
     if ( wxUsingUnicowsDll() )
         return remove(wxConvFile.cWX2MB(name));
     else
-        return _wremove(name);
+        return _tremove(name);
 }
 
-WXDLLIMPEXP_BASE FILE* wxMSLU__wfopen(const wchar_t *name,const wchar_t* mode)
+WXDLLIMPEXP_BASE FILE* wxMSLU__tfopen(const wxChar *name,const wxChar* mode)
 {
     if ( wxUsingUnicowsDll() )
         return fopen(wxConvFile.cWX2MB(name),wxConvFile.cWX2MB(mode));
     else
-        return _wfopen(name,mode);
+        return _tfopen(name,mode);
 }
 
-WXDLLIMPEXP_BASE FILE* wxMSLU__wfreopen(const wchar_t *name,
-                                        const wchar_t* mode,
-                                        FILE *stream)
+#if defined( __VISUALC__ ) \
+    || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) ) \
+    || ( defined(__BORLANDC__) && (__BORLANDC__ > 0x460) )
+
+WXDLLIMPEXP_BASE int wxMSLU__wopen(const wxChar *name, int flags, int mode)
 {
     if ( wxUsingUnicowsDll() )
-        return freopen(wxConvFile.cWX2MB(name), wxConvFile.cWX2MB(mode), stream);
+#ifdef __BORLANDC__
+        return open(wxConvFile.cWX2MB(name), flags, mode);
+#else
+        return _open(wxConvFile.cWX2MB(name), flags, mode);
+#endif
     else
-        return _wfreopen(name, mode, stream);
+        return _wopen(name, flags, mode);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__wopen(const wchar_t *name, int flags, int mode)
+WXDLLIMPEXP_BASE int wxMSLU__waccess(const wxChar *name, int mode)
 {
     if ( wxUsingUnicowsDll() )
-        return wxCRT_OpenA(wxConvFile.cWX2MB(name), flags, mode);
+        return _access(wxConvFile.cWX2MB(name), mode);
     else
-        return wxCRT_OpenW(name, flags, mode);
+        return _waccess(name, mode);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__waccess(const wchar_t *name, int mode)
+WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wxChar *name)
 {
     if ( wxUsingUnicowsDll() )
-        return wxCRT_AccessA(wxConvFile.cWX2MB(name), mode);
+        return _mkdir(wxConvFile.cWX2MB(name));
     else
-        return wxCRT_AccessW(name, mode);
+        return _wmkdir(name);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__wmkdir(const wchar_t *name)
+WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wxChar *name)
 {
     if ( wxUsingUnicowsDll() )
-        return wxCRT_MkDirA(wxConvFile.cWX2MB(name));
+        return _rmdir(wxConvFile.cWX2MB(name));
     else
-        return wxCRT_MkDirW(name);
+        return _wrmdir(name);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__wrmdir(const wchar_t *name)
+WXDLLIMPEXP_BASE int wxMSLU__wstat(const wxChar *name, struct _stat *buffer)
 {
     if ( wxUsingUnicowsDll() )
-        return wxCRT_RmDirA(wxConvFile.cWX2MB(name));
+        return _stat((const char*)wxConvFile.cWX2MB(name), buffer);
     else
-        return wxCRT_RmDirW(name);
+        return _wstat(name, buffer);
 }
 
-WXDLLIMPEXP_BASE int wxMSLU__wstat(const wchar_t *name, wxStructStat *buffer)
+#ifdef __BORLANDC__
+//here _stati64 is defined as stati64, see wx/filefn.h
+#undef _stati64
+WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer)
+ {
+     if ( wxUsingUnicowsDll() )
+        return _stati64((const char*)wxConvFile.cWX2MB(name), (stati64 *) buffer);
+    else
+        return _wstati64(name, (stati64 *) buffer);
+}
+#else
+WXDLLIMPEXP_BASE int wxMSLU__wstati64(const wxChar *name, struct _stati64 *buffer)
 {
     if ( wxUsingUnicowsDll() )
-        return wxCRT_StatA((const char*)wxConvFile.cWX2MB(name), buffer);
+        return _stati64((const char*)wxConvFile.cWX2MB(name), buffer);
     else
-        return wxCRT_StatW(name, buffer);
+        return _wstati64(name, buffer);
 }
+#endif //__BORLANDC__
+
+#endif // compilers having wopen() &c
 
 #endif // wxUSE_BASE
 
diff --git a/Source/3rd Party/wx/src/msw/nativdlg.cpp b/Source/3rd Party/wx/src/msw/nativdlg.cpp
index 7f4f9ad6b..c036529c8 100644
--- a/Source/3rd Party/wx/src/msw/nativdlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/nativdlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: nativdlg.cpp 39720 2006-06-14 15:55:43Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -162,8 +162,6 @@ wxWindow* wxWindow::GetWindowChild(wxWindowID id)
 
 wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 {
-    wxCHECK_MSG( parent, NULL, wxT("must have valid parent for a control") );
-
     wxString str(wxGetWindowClass(hWnd));
     str.UpperCase();
 
@@ -308,6 +306,9 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
     if (win)
     {
         parent->AddChild(win);
+        win->SetEventHandler(win);
+        win->SetHWND(hWnd);
+        win->SetId(id);
         win->SubclassWin(hWnd);
         win->AdoptAttributesFromHWND();
         win->SetupColours();
@@ -317,11 +318,10 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)
-void wxWindow::AdoptAttributesFromHWND()
+void wxWindow::AdoptAttributesFromHWND(void)
 {
-    SetId(wxGetWindowId(m_hWnd));
-
-    long style = GetWindowLong(GetHwnd(), GWL_STYLE);
+    HWND hWnd = (HWND) GetHWND();
+    long style = GetWindowLong((HWND) hWnd, GWL_STYLE);
 
     if (style & WS_VSCROLL)
         m_windowStyle |= wxVSCROLL;
diff --git a/Source/3rd Party/wx/src/msw/nativewin.cpp b/Source/3rd Party/wx/src/msw/nativewin.cpp
deleted file mode 100644
index 9945a42b0..000000000
--- a/Source/3rd Party/wx/src/msw/nativewin.cpp	
+++ /dev/null
@@ -1,89 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/nativewin.cpp
-// Purpose:     wxNativeWindow implementation
-// Author:      Vadim Zeitlin
-// Created:     2008-03-05
-// RCS-ID:      $Id$
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
-#include "wx/nativewin.h"
-#include "wx/msw/private.h"
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle hwnd)
-{
-    if ( !::IsWindow(hwnd) )
-    {
-        // strictly speaking, the fact that IsWindow() returns true doesn't
-        // mean that the window handle is valid -- it could be being deleted
-        // right now, for example
-        //
-        // but if it returns false, the handle is definitely invalid
-        return false;
-    }
-
-    // make this HWND really a wxWindow
-    SubclassWin(hwnd);
-
-    // inherit the other attributes we can from the native HWND
-    AdoptAttributesFromHWND();
-
-    return true;
-}
-
-bool wxNativeContainerWindow::IsShown() const
-{
-    return (IsWindowVisible(static_cast<HWND>(m_hWnd)) != 0);
-}
-
-void wxNativeContainerWindow::OnNativeDestroyed()
-{
-    // don't use Close() or even Destroy() here, we really don't want to keep
-    // an object using a no more existing HWND around for longer than necessary
-    delete this;
-}
-
-WXLRESULT wxNativeContainerWindow::MSWWindowProc(WXUINT nMsg,
-                                                 WXWPARAM wParam,
-                                                 WXLPARAM lParam)
-{
-    if ( nMsg == WM_DESTROY )
-    {
-        OnNativeDestroyed();
-
-        return 0;
-    }
-
-    return wxTopLevelWindow::MSWWindowProc(nMsg, wParam, lParam);
-}
-
-wxNativeContainerWindow::~wxNativeContainerWindow()
-{
-    // prevent the base class dtor from destroying the window, it doesn't
-    // belong to us so we should leave it alive
-    DissociateHandle();
-}
-
diff --git a/Source/3rd Party/wx/src/msw/nonownedwnd.cpp b/Source/3rd Party/wx/src/msw/nonownedwnd.cpp
deleted file mode 100644
index 878f5cbff..000000000
--- a/Source/3rd Party/wx/src/msw/nonownedwnd.cpp	
+++ /dev/null
@@ -1,185 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/nonownedwnd.cpp
-// Purpose:     wxNonOwnedWindow implementation for MSW.
-// Author:      Vadim Zeitlin
-// Created:     2011-10-09 (extracted from src/msw/toplevel.cpp)
-// RCS-ID:      $Id: $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#undef WIN32_LEAN_AND_MEAN
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// This class can't be implemented and hence is not used under Win CE.
-#ifndef __WXWINCE__
-
-#ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
-    #include "wx/frame.h"       // Only for wxFRAME_SHAPED.
-    #include "wx/region.h"
-    #include "wx/msw/private.h"
-#endif // WX_PRECOMP
-
-#include "wx/nonownedwnd.h"
-
-#if wxUSE_GRAPHICS_CONTEXT
-    #include "wx/msw/wrapgdip.h"
-    #include "wx/graphics.h"
-#endif // wxUSE_GRAPHICS_CONTEXT
-
-#include "wx/scopedptr.h"
-
-// ============================================================================
-// wxNonOwnedWindow implementation
-// ============================================================================
-
-bool wxNonOwnedWindow::DoClearShape()
-{
-    if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0)
-    {
-        wxLogLastError(wxT("SetWindowRgn"));
-        return false;
-    }
-
-    return true;
-}
-
-bool wxNonOwnedWindow::DoSetRegionShape(const wxRegion& region)
-{
-    // Windows takes ownership of the region, so
-    // we'll have to make a copy of the region to give to it.
-    DWORD noBytes = ::GetRegionData(GetHrgnOf(region), 0, NULL);
-    RGNDATA *rgnData = (RGNDATA*) new char[noBytes];
-    ::GetRegionData(GetHrgnOf(region), noBytes, rgnData);
-    HRGN hrgn = ::ExtCreateRegion(NULL, noBytes, rgnData);
-    delete[] (char*) rgnData;
-
-    // SetWindowRgn expects the region to be in coordinates
-    // relative to the window, not the client area.
-    const wxPoint clientOrigin = GetClientAreaOrigin();
-    ::OffsetRgn(hrgn, -clientOrigin.x, -clientOrigin.y);
-
-    // Now call the shape API with the new region.
-    if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0)
-    {
-        wxLogLastError(wxT("SetWindowRgn"));
-        return false;
-    }
-    return true;
-}
-
-#if wxUSE_GRAPHICS_CONTEXT
-
-#include "wx/msw/wrapgdip.h"
-
-// This class contains data used only when SetPath(wxGraphicsPath) is called.
-//
-// Notice that it derives from wxEvtHandler solely to allow Connect()-ing its
-// OnPaint() method to the window, we could get rid of this inheritance once
-// Bind() can be used in wx sources.
-class wxNonOwnedWindowShapeImpl : public wxEvtHandler
-{
-public:
-    wxNonOwnedWindowShapeImpl(wxNonOwnedWindow* win, const wxGraphicsPath& path) :
-        m_win(win),
-        m_path(path)
-    {
-        // Create the region corresponding to this path and set it as windows
-        // shape.
-        wxScopedPtr<wxGraphicsContext> context(wxGraphicsContext::Create(win));
-        Region gr(static_cast<GraphicsPath*>(m_path.GetNativePath()));
-        win->SetShape(
-            wxRegion(
-                gr.GetHRGN(static_cast<Graphics*>(context->GetNativeContext()))
-            )
-        );
-
-
-        // Connect to the paint event to draw the border.
-        //
-        // TODO: Do this only optionally?
-        m_win->Connect
-               (
-                wxEVT_PAINT,
-                wxPaintEventHandler(wxNonOwnedWindowShapeImpl::OnPaint),
-                NULL,
-                this
-               );
-    }
-
-    virtual ~wxNonOwnedWindowShapeImpl()
-    {
-        m_win->Disconnect
-               (
-                wxEVT_PAINT,
-                wxPaintEventHandler(wxNonOwnedWindowShapeImpl::OnPaint),
-                NULL,
-                this
-               );
-    }
-
-private:
-    void OnPaint(wxPaintEvent& event)
-    {
-        event.Skip();
-
-        wxPaintDC dc(m_win);
-        wxScopedPtr<wxGraphicsContext> context(wxGraphicsContext::Create(dc));
-        context->SetPen(wxPen(*wxLIGHT_GREY, 2));
-        context->StrokePath(m_path);
-    }
-
-    wxNonOwnedWindow* const m_win;
-    wxGraphicsPath m_path;
-
-    wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindowShapeImpl);
-};
-
-wxNonOwnedWindow::wxNonOwnedWindow()
-{
-    m_shapeImpl = NULL;
-}
-
-wxNonOwnedWindow::~wxNonOwnedWindow()
-{
-    delete m_shapeImpl;
-}
-
-bool wxNonOwnedWindow::DoSetPathShape(const wxGraphicsPath& path)
-{
-    delete m_shapeImpl;
-    m_shapeImpl = new wxNonOwnedWindowShapeImpl(this, path);
-
-    return true;
-}
-
-#else // !wxUSE_GRAPHICS_CONTEXT
-
-// Trivial ctor and dtor as we don't have anything to do when wxGraphicsContext
-// is not used but still define them here to avoid adding even more #if checks
-// to the header, it it doesn't do any harm even though it's not needed.
-wxNonOwnedWindow::wxNonOwnedWindow()
-{
-}
-
-wxNonOwnedWindow::~wxNonOwnedWindow()
-{
-}
-
-#endif // wxUSE_GRAPHICS_CONTEXT/!wxUSE_GRAPHICS_CONTEXT
-
-#endif // !__WXWINCE__
diff --git a/Source/3rd Party/wx/src/msw/notebook.cpp b/Source/3rd Party/wx/src/msw/notebook.cpp
index 97a4ec495..73bd9b590 100644
--- a/Source/3rd Party/wx/src/msw/notebook.cpp	
+++ b/Source/3rd Party/wx/src/msw/notebook.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     11.06.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: notebook.cpp 59897 2009-03-27 22:37:22Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,14 +30,12 @@
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/control.h"
-    #include "wx/panel.h"
 #endif  // WX_PRECOMP
 
 #include "wx/imaglist.h"
 #include "wx/sysopt.h"
 
 #include "wx/msw/private.h"
-#include "wx/msw/dc.h"
 
 #include <windowsx.h>
 #include "wx/msw/winundef.h"
@@ -117,7 +115,15 @@ static bool HasTroubleWithNonTopTabs()
 // event table
 // ----------------------------------------------------------------------------
 
-BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
+#include "wx/listimpl.cpp"
+
+WX_DEFINE_LIST( wxNotebookPageInfoList )
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
+
+BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
     EVT_SIZE(wxNotebook::OnSize)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 
@@ -127,6 +133,90 @@ BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
 #endif // USE_NOTEBOOK_ANTIFLICKER
 END_EVENT_TABLE()
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxNotebookStyle )
+
+wxBEGIN_FLAGS( wxNotebookStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxNB_FIXEDWIDTH)
+    wxFLAGS_MEMBER(wxBK_DEFAULT)
+    wxFLAGS_MEMBER(wxBK_TOP)
+    wxFLAGS_MEMBER(wxBK_LEFT)
+    wxFLAGS_MEMBER(wxBK_RIGHT)
+    wxFLAGS_MEMBER(wxBK_BOTTOM)
+    wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
+    wxFLAGS_MEMBER(wxNB_FLAT)
+
+wxEND_FLAGS( wxNotebookStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase,"wx/notebook.h")
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject , "wx/notebook.h" )
+
+wxCOLLECTION_TYPE_INFO( wxNotebookPageInfo * , wxNotebookPageInfoList ) ;
+
+template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList, wxxVariantArray &value)
+{
+    wxListCollectionToVariantArray<wxNotebookPageInfoList::compatibility_iterator>( theList , value ) ;
+}
+
+wxBEGIN_PROPERTIES_TABLE(wxNotebook)
+    wxEVENT_PROPERTY( PageChanging , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING , wxNotebookEvent )
+    wxEVENT_PROPERTY( PageChanged , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED , wxNotebookEvent )
+
+    wxPROPERTY_COLLECTION( PageInfos , wxNotebookPageInfoList , wxNotebookPageInfo* , AddPageInfo , GetPageInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxNotebookStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxNotebook)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle)
+
+
+wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo)
+    wxREADONLY_PROPERTY( Page , wxNotebookPage* , GetPage , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxREADONLY_PROPERTY( Text , wxString , GetText , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxREADONLY_PROPERTY( Selected , bool , GetSelected , false, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxREADONLY_PROPERTY( ImageId , int , GetImageId , -1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxNotebookPageInfo)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId )
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebookPageInfo, wxObject )
+#endif
+IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -135,16 +225,31 @@ END_EVENT_TABLE()
 // wxNotebook construction
 // ----------------------------------------------------------------------------
 
+const wxNotebookPageInfoList& wxNotebook::GetPageInfos() const
+{
+    wxNotebookPageInfoList* list = const_cast< wxNotebookPageInfoList* >( &m_pageInfos ) ;
+    WX_CLEAR_LIST( wxNotebookPageInfoList , *list ) ;
+    for( size_t i = 0 ; i < GetPageCount() ; ++i )
+    {
+        wxNotebookPageInfo *info = new wxNotebookPageInfo() ;
+        info->Create( const_cast<wxNotebook*>(this)->GetPage(i) , GetPageText(i) , GetSelection() == int(i) , GetPageImage(i) ) ;
+        list->Append( info ) ;
+    }
+    return m_pageInfos ;
+}
+
 // common part of all ctors
 void wxNotebook::Init()
 {
+    m_imageList = NULL;
+    m_nSelection = wxNOT_FOUND;
+
 #if wxUSE_UXTHEME
     m_hbrBackground = NULL;
 #endif // wxUSE_UXTHEME
 
 #if USE_NOTEBOOK_ANTIFLICKER
     m_hasSubclassedUpdown = false;
-    m_doneUpdateHack = false;
 #endif // USE_NOTEBOOK_ANTIFLICKER
 }
 
@@ -223,7 +328,7 @@ bool wxNotebook::Create(wxWindow *parent,
             if ( ::GetClassInfo(NULL, WC_TABCONTROL, &wc) )
             {
                 gs_wndprocNotebook =
-                    reinterpret_cast<WXFARPROC>(wc.lpfnWndProc);
+                    wx_reinterpret_cast(WXFARPROC, wc.lpfnWndProc);
                 wc.lpszClassName = wxT("_wx_SysTabCtl32");
                 wc.style &= ~(CS_HREDRAW | CS_VREDRAW);
                 wc.hInstance = wxGetInstance();
@@ -232,7 +337,7 @@ bool wxNotebook::Create(wxWindow *parent,
             }
             else
             {
-                wxLogLastError(wxT("GetClassInfoEx(SysTabCtl32)"));
+                wxLogLastError(_T("GetClassInfoEx(SysTabCtl32)"));
             }
         }
 
@@ -316,6 +421,13 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const
     else if ( style & wxBK_RIGHT )
         tabStyle |= TCS_VERTICAL | TCS_RIGHT;
 
+    if ( exstyle )
+    {
+        // note that we never want to have the default WS_EX_CLIENTEDGE style
+        // as it looks too ugly for the notebooks
+        *exstyle &= ~WS_EX_CLIENTEDGE;
+    }
+
     return tabStyle;
 }
 
@@ -348,28 +460,24 @@ int wxNotebook::SetSelection(size_t nPage)
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") );
 
-    if ( m_selection == wxNOT_FOUND || nPage != (size_t)m_selection )
+    if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection )
     {
         if ( SendPageChangingEvent(nPage) )
         {
             // program allows the page change
-            const int selectionOld = m_selection;
-
-            UpdateSelection(nPage);
+            SendPageChangedEvent(m_nSelection, nPage);
 
             TabCtrl_SetCurSel(GetHwnd(), nPage);
-
-            SendPageChangedEvent(selectionOld, nPage);
         }
     }
 
-    return m_selection;
+    return m_nSelection;
 }
 
 void wxNotebook::UpdateSelection(int selNew)
 {
-    if ( m_selection != wxNOT_FOUND )
-        m_pages[m_selection]->Show(false);
+    if ( m_nSelection != wxNOT_FOUND )
+        m_pages[m_nSelection]->Show(false);
 
     if ( selNew != wxNOT_FOUND )
     {
@@ -387,23 +495,21 @@ void wxNotebook::UpdateSelection(int selNew)
     if ( ::IsWindowVisible(GetHwnd()) )
         SetFocus();
 
-    m_selection = selNew;
+    m_nSelection = selNew;
 }
 
 int wxNotebook::ChangeSelection(size_t nPage)
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") );
 
-    const int selOld = m_selection;
-
-    if ( m_selection == wxNOT_FOUND || nPage != (size_t)m_selection )
+    if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection )
     {
         TabCtrl_SetCurSel(GetHwnd(), nPage);
 
         UpdateSelection(nPage);
     }
 
-    return selOld;
+    return m_nSelection;
 }
 
 bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
@@ -412,7 +518,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 
     TC_ITEM tcItem;
     tcItem.mask = TCIF_TEXT;
-    tcItem.pszText = wxMSW_CONV_LPTSTR(strText);
+    tcItem.pszText = (wxChar *)strText.c_str();
 
     if ( !HasFlag(wxNB_MULTILINE) )
         return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0;
@@ -569,7 +675,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
 
 void wxNotebook::AdjustPageSize(wxNotebookPage *page)
 {
-    wxCHECK_RET( page, wxT("NULL page in wxNotebook::AdjustPageSize") );
+    wxCHECK_RET( page, _T("NULL page in wxNotebook::AdjustPageSize") );
 
     const wxRect r = GetPageSize();
     if ( !r.IsEmpty() )
@@ -589,16 +695,12 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
     if ( !pageRemoved )
         return NULL;
 
-    // hide the removed page to maintain the invariant that only the
-    // selected page is visible and others are hidden:
-    pageRemoved->Show(false);
-
     TabCtrl_DeleteItem(GetHwnd(), nPage);
 
     if ( m_pages.IsEmpty() )
     {
         // no selection any more, the notebook becamse empty
-        m_selection = wxNOT_FOUND;
+        m_nSelection = wxNOT_FOUND;
     }
     else // notebook still not empty
     {
@@ -609,22 +711,22 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
             // Because it could be that the slection index changed
             // we need to update it.
             // Note: this does not mean the selection it self changed.
-            m_selection = selNew;
-            m_pages[m_selection]->Refresh();
+            m_nSelection = selNew;
+            m_pages[m_nSelection]->Refresh();
         }
-        else if (int(nPage) == m_selection)
+        else if (int(nPage) == m_nSelection)
         {
             // The selection was deleted.
 
             // Determine new selection.
-            if (m_selection == int(GetPageCount()))
-                selNew = m_selection - 1;
+            if (m_nSelection == int(GetPageCount()))
+                selNew = m_nSelection - 1;
             else
-                selNew = m_selection;
+                selNew = m_nSelection;
 
-            // m_selection must be always valid so reset it before calling
+            // m_nSelection must be always valid so reset it before calling
             // SetSelection()
-            m_selection = wxNOT_FOUND;
+            m_nSelection = wxNOT_FOUND;
             SetSelection(selNew);
         }
         else
@@ -648,7 +750,7 @@ bool wxNotebook::DeleteAllPages()
 
     TabCtrl_DeleteAllItems(GetHwnd());
 
-    m_selection = wxNOT_FOUND;
+    m_nSelection = wxNOT_FOUND;
 
     InvalidateBestSize();
     return true;
@@ -661,12 +763,12 @@ bool wxNotebook::InsertPage(size_t nPage,
                             bool bSelect,
                             int imageId)
 {
-    wxCHECK_MSG( pPage != NULL, false, wxT("NULL page in wxNotebook::InsertPage") );
+    wxCHECK_MSG( pPage != NULL, false, _T("NULL page in wxNotebook::InsertPage") );
     wxCHECK_MSG( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false,
-                 wxT("invalid index in wxNotebook::InsertPage") );
+                 _T("invalid index in wxNotebook::InsertPage") );
 
     wxASSERT_MSG( pPage->GetParent() == this,
-                    wxT("notebook pages must have notebook as parent") );
+                    _T("notebook pages must have notebook as parent") );
 
     // add a new tab to the control
     // ----------------------------
@@ -686,7 +788,7 @@ bool wxNotebook::InsertPage(size_t nPage,
     if ( !strText.empty() )
     {
         tcItem.mask |= TCIF_TEXT;
-        tcItem.pszText = wxMSW_CONV_LPTSTR(strText);
+        tcItem.pszText = (wxChar *)strText.c_str(); // const_cast
     }
 
     // hide the page: unless it is selected, it shouldn't be shown (and if it
@@ -738,13 +840,22 @@ bool wxNotebook::InsertPage(size_t nPage,
 
     // if the inserted page is before the selected one, we must update the
     // index of the selected page
-    if ( int(nPage) <= m_selection )
+    if ( int(nPage) <= m_nSelection )
     {
         // one extra page added
-        m_selection++;
+        m_nSelection++;
     }
 
-    DoSetSelectionAfterInsertion(nPage, bSelect);
+    // some page should be selected: either this one or the first one if there
+    // is still no selection
+    int selNew = wxNOT_FOUND;
+    if ( bSelect )
+        selNew = nPage;
+    else if ( m_nSelection == wxNOT_FOUND )
+        selNew = 0;
+
+    if ( selNew != wxNOT_FOUND )
+        SetSelection(selNew);
 
     InvalidateBestSize();
 
@@ -835,11 +946,9 @@ void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event))
         hbr = GetHbrushOf(brush);
     }
 
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) memdc.GetImpl();
+    ::FillRect(GetHdcOf(memdc), &rc, hbr);
 
-    ::FillRect(GetHdcOf(*impl), &rc, hbr);
-
-    MSWDefWindowProc(WM_PAINT, (WPARAM)(impl->GetHDC()), 0);
+    MSWDefWindowProc(WM_PAINT, (WPARAM)memdc.GetHDC(), 0);
 
     // For some reason in RTL mode, source offset has to be -1, otherwise the
     // right border (physical) remains unpainted.
@@ -979,26 +1088,23 @@ void wxNotebook::OnSize(wxSizeEvent& event)
             }
         }
     }
-
-    // Probably because of the games we play above to avoid flicker sometimes
-    // the text controls inside notebook pages are not shown correctly (they
-    // don't have their borders) when the notebook is shown for the first time.
-    // It's not really clear why does this happen and maybe the bug is in
-    // wxTextCtrl itself and not here but updating the page when it's about to
-    // be shown doesn't cost much and works around the problem so do it here
-    // for now.
-    if ( !m_doneUpdateHack && IsShownOnScreen() )
-    {
-        m_doneUpdateHack = true;
-        wxWindow* const page = GetCurrentPage();
-        if ( page )
-            page->Update();
-    }
 #endif // USE_NOTEBOOK_ANTIFLICKER
 
     event.Skip();
 }
 
+void wxNotebook::OnSelChange(wxNotebookEvent& event)
+{
+    // is it our tab control?
+    if ( event.GetEventObject() == this )
+    {
+        UpdateSelection(event.GetSelection());
+    }
+
+    // we want to give others a chance to process this message as well
+    event.Skip();
+}
+
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {
     if ( event.IsWindowChange() ) {
@@ -1029,30 +1135,20 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         // the wxObject* casts are required to avoid MinGW GCC 2.95.3 ICE
         const bool isFromParent = event.GetEventObject() == (wxObject*) parent;
         const bool isFromSelf = event.GetEventObject() == (wxObject*) this;
-        const bool isForward = event.GetDirection();
 
-        if ( isFromSelf && !isForward )
-        {
-            // focus is currently on notebook tab and should leave
-            // it backwards (Shift-TAB)
-            event.SetCurrentFocus(this);
-            parent->HandleWindowEvent(event);
-        }
-        else if ( isFromParent || isFromSelf )
+        if ( isFromParent || isFromSelf )
         {
             // no, it doesn't come from child, case (b) or (c): forward to a
-            // page but only if entering notebook page (i.e. direction is
-            // backwards (Shift-TAB) comething from out-of-notebook, or
-            // direction is forward (TAB) from ourselves),
-            if ( m_selection != wxNOT_FOUND &&
+            // page but only if direction is backwards (TAB) or from ourselves,
+            if ( m_nSelection != wxNOT_FOUND &&
                     (!event.GetDirection() || isFromSelf) )
             {
                 // so that the page knows that the event comes from it's parent
                 // and is being propagated downwards
                 event.SetEventObject(this);
 
-                wxWindow *page = m_pages[m_selection];
-                if ( !page->HandleWindowEvent(event) )
+                wxWindow *page = m_pages[m_nSelection];
+                if ( !page->GetEventHandler()->ProcessEvent(event) )
                 {
                     page->SetFocus();
                 }
@@ -1069,14 +1165,14 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
             // if the direction is forwards. Otherwise set the focus to the
             // notebook itself. The notebook is always the 'first' control of a
             // page.
-            if ( !isForward )
+            if ( !event.GetDirection() )
             {
                 SetFocus();
             }
             else if ( parent )
             {
                 event.SetCurrentFocus(this);
-                parent->HandleWindowEvent(event);
+                parent->GetEventHandler()->ProcessEvent(event);
             }
         }
     }
@@ -1160,6 +1256,28 @@ void wxNotebook::UpdateBgBrush()
     }
 }
 
+WXHBRUSH wxNotebook::MSWGetBgBrushForChild(WXHDC hDC, WXHWND hWnd)
+{
+    if ( m_hbrBackground )
+    {
+        // before drawing with the background brush, we need to position it
+        // correctly
+        RECT rc;
+        ::GetWindowRect((HWND)hWnd, &rc);
+
+        ::MapWindowPoints(NULL, GetHwnd(), (POINT *)&rc, 1);
+
+        if ( !::SetBrushOrgEx((HDC)hDC, -rc.left, -rc.top, NULL) )
+        {
+            wxLogLastError(_T("SetBrushOrgEx(notebook bg brush)"));
+        }
+
+        return m_hbrBackground;
+    }
+
+    return wxNotebookBase::MSWGetBgBrushForChild(hDC, hWnd);
+}
+
 bool wxNotebook::MSWPrintChild(WXHDC hDC, wxWindow *child)
 {
     // solid background colour overrides themed background drawing
@@ -1307,7 +1425,7 @@ bool wxNotebook::MSWOnScroll(int orientation, WXWORD nSBCode,
 
 bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
 {
-  wxBookCtrlEvent event(wxEVT_NULL, m_windowId);
+  wxNotebookEvent event(wxEVT_NULL, m_windowId);
 
   NMHDR* hdr = (NMHDR *)lParam;
   switch ( hdr->code ) {
@@ -1324,16 +1442,11 @@ bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
   }
 
   event.SetSelection(TabCtrl_GetCurSel(GetHwnd()));
-  event.SetOldSelection(m_selection);
+  event.SetOldSelection(m_nSelection);
   event.SetEventObject(this);
   event.SetInt(idCtrl);
 
-  // Change the selection before generating the event as its handler should
-  // already see the new page selected.
-  if ( hdr->code == TCN_SELCHANGE )
-      UpdateSelection(event.GetSelection());
-
-  bool processed = HandleWindowEvent(event);
+  bool processed = GetEventHandler()->ProcessEvent(event);
   *result = !event.IsAllowed();
   return processed;
 }
diff --git a/Source/3rd Party/wx/src/msw/ole/access.cpp b/Source/3rd Party/wx/src/msw/ole/access.cpp
index 25fa7f086..b5ea38e67 100644
--- a/Source/3rd Party/wx/src/msw/ole/access.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/access.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-02-12
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: access.cpp 62067 2009-09-24 10:15:06Z JS $
 // Copyright:   (c) 2003 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ private:
     wxVariant m_variant;  // List of further variants
     int       m_nCurrent; // Current enum position
 
-    wxDECLARE_NO_COPY_CLASS(wxIEnumVARIANT);
+    DECLARE_NO_COPY_CLASS(wxIEnumVARIANT)
 };
 
 // ----------------------------------------------------------------------------
@@ -339,7 +339,7 @@ private:
     wxAccessible *m_pAccessible;      // pointer to C++ class we belong to
     bool m_bQuiescing;                // Object is to be deleted
 
-    wxDECLARE_NO_COPY_CLASS(wxIAccessible);
+    DECLARE_NO_COPY_CLASS(wxIAccessible)
 };
 
 // ============================================================================
diff --git a/Source/3rd Party/wx/src/msw/ole/activex.cpp b/Source/3rd Party/wx/src/msw/ole/activex.cpp
index f4b8e2c59..4f4437dff 100644
--- a/Source/3rd Party/wx/src/msw/ole/activex.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/activex.cpp	
@@ -4,7 +4,7 @@
 // Author:      Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???>
 // Modified by:
 // Created:     11/07/04
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: activex.cpp 42688 2006-10-29 23:38:37Z VZ $
 // Copyright:   (c) 2003 Lindsay Mathieson, (c) 2005 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#undef WIN32_LEAN_AND_MEAN
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -31,22 +30,22 @@
     #include "wx/math.h"
 #endif
 
-#include "wx/msw/dc.h"
+#ifdef __WXMSW__
+#include <OleIdl.h>
+#endif
 
 #include "wx/msw/ole/activex.h"
-#include "wx/msw/private.h" // for wxCopyRectToRECT
-
 // autointerfaces that we only use here
-typedef wxAutoOleInterface<IOleInPlaceSite> wxAutoIOleInPlaceSite;
-typedef wxAutoOleInterface<IOleDocument> wxAutoIOleDocument;
-typedef wxAutoOleInterface<IPersistStreamInit> wxAutoIPersistStreamInit;
-typedef wxAutoOleInterface<IAdviseSink> wxAutoIAdviseSink;
-typedef wxAutoOleInterface<IProvideClassInfo> wxAutoIProvideClassInfo;
-typedef wxAutoOleInterface<ITypeInfo> wxAutoITypeInfo;
-typedef wxAutoOleInterface<IConnectionPoint> wxAutoIConnectionPoint;
-typedef wxAutoOleInterface<IConnectionPointContainer> wxAutoIConnectionPointContainer;
+WX_DECLARE_AUTOOLE(wxAutoIOleInPlaceSite, IOleInPlaceSite)
+WX_DECLARE_AUTOOLE(wxAutoIOleDocument, IOleDocument)
+WX_DECLARE_AUTOOLE(wxAutoIPersistStreamInit, IPersistStreamInit)
+WX_DECLARE_AUTOOLE(wxAutoIAdviseSink, IAdviseSink)
+WX_DECLARE_AUTOOLE(wxAutoIProvideClassInfo, IProvideClassInfo)
+WX_DECLARE_AUTOOLE(wxAutoITypeInfo, ITypeInfo)
+WX_DECLARE_AUTOOLE(wxAutoIConnectionPoint, IConnectionPoint)
+WX_DECLARE_AUTOOLE(wxAutoIConnectionPointContainer, IConnectionPointContainer)
 
-wxDEFINE_EVENT( wxEVT_ACTIVEX, wxActiveXEvent );
+DEFINE_EVENT_TYPE(wxEVT_ACTIVEX)
 
 // Ole class helpers (sort of MFC-like) from wxActiveX
 #define DECLARE_OLE_UNKNOWN(cls)\
@@ -55,7 +54,7 @@ wxDEFINE_EVENT( wxEVT_ACTIVEX, wxActiveXEvent );
     {\
         public:\
         LONG l;\
-        TAutoInitInt() : l(1) {}\
+        TAutoInitInt() : l(0) {}\
     };\
     TAutoInitInt refCount, lockCount;\
     static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\
@@ -355,7 +354,7 @@ public:
     HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD)
     {
         // TODO: send an event with this id
-        if (m_window->m_oleInPlaceActiveObject.IsOk())
+        if (m_window->m_oleInPlaceActiveObject.Ok())
             m_window->m_oleInPlaceActiveObject->TranslateAccelerator(lpmsg);
         return S_FALSE;
     }
@@ -426,7 +425,7 @@ public:
     HRESULT STDMETHODCALLTYPE DeactivateAndUndo(){return S_OK; }
     HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect)
     {
-        if (m_window->m_oleInPlaceObject.IsOk() && lprcPosRect)
+        if (m_window->m_oleInPlaceObject.Ok() && lprcPosRect)
         {
            //
            // Result of several hours and days of bug hunting -
@@ -533,7 +532,7 @@ public:
     #elif defined(_UNICODE)
     GetObjectW
     #else
-    GetObjectA
+    GetObject
     #endif
     (LPOLESTR pszItem, DWORD, IBindCtx *, REFIID, void ** ppvObject)
     {
@@ -607,7 +606,7 @@ public:
     {
         wxAutoIOleInPlaceSite inPlaceSite(
             IID_IOleInPlaceSite, (IDispatch *) this);
-        if (!inPlaceSite.IsOk())
+        if (!inPlaceSite.Ok())
             return E_FAIL;
 
         if (pViewToActivate)
@@ -619,7 +618,7 @@ public:
         {
             wxAutoIOleDocument oleDoc(
                 IID_IOleDocument, m_window->m_oleObject);
-            if (! oleDoc.IsOk())
+            if (! oleDoc.Ok())
                 return E_FAIL;
 
             HRESULT hr = oleDoc->CreateView(inPlaceSite, NULL,
@@ -634,10 +633,6 @@ public:
         return S_OK;
     }
 
-    friend bool QueryClientSiteInterface(FrameSite *self, REFIID iid, void **_interface, const char *&desc)
-    {
-        return self->m_window->QueryClientSiteInterface(iid,_interface,desc);
-    }
 
 protected:
     wxActiveXContainer * m_window;
@@ -675,7 +670,6 @@ DEFINE_OLE_TABLE(FrameSite)
     OLE_IINTERFACE(IOleDocumentSite)
     OLE_IINTERFACE(IAdviseSink)
     OLE_IINTERFACE(IOleControlSite)
-    OLE_INTERFACE_CUSTOM(QueryClientSiteInterface)
 END_OLE_TABLE
 
 
@@ -700,13 +694,6 @@ private:
     friend bool wxActiveXEventsInterface(wxActiveXEvents *self, REFIID iid, void **_interface, const char *&desc);
 
 public:
-
-    // a pointer to this static variable is used as an 'invalid_entry_marker'
-    // wxVariants containing a void* to this variables are 'empty' in the sense
-    // that the actual ActiveX OLE parameter has not been converted and inserted
-    // into m_params.
-    static wxVariant ms_invalidEntryMarker;
-
     wxActiveXEvents(wxActiveXContainer *ax) : m_activeX(ax), m_haveCustomId(false) {}
     wxActiveXEvents(wxActiveXContainer *ax, REFIID iid) : m_activeX(ax), m_customId(iid), m_haveCustomId(true) {}
     virtual ~wxActiveXEvents()
@@ -730,11 +717,11 @@ public:
     }
 
 
-    STDMETHODIMP Invoke(DISPID dispIdMember, REFIID riid,
-                        LCID lcid,
+    STDMETHODIMP Invoke(DISPID dispIdMember, REFIID WXUNUSED(riid),
+                        LCID WXUNUSED(lcid),
                           WORD wFlags, DISPPARAMS * pDispParams,
-                          VARIANT * pVarResult, EXCEPINFO * pExcepInfo,
-                          unsigned int * puArgErr)
+                          VARIANT * WXUNUSED(pVarResult), EXCEPINFO * WXUNUSED(pExcepInfo),
+                          unsigned int * WXUNUSED(puArgErr))
     {
         if (wFlags & (DISPATCH_PROPERTYGET | DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF))
             return E_NOTIMPL;
@@ -746,37 +733,31 @@ public:
         // Dispatch Event
         wxActiveXEvent  event;
         event.SetEventType(wxEVT_ACTIVEX);
-        // Create an empty list of Variants
-        // Note that the event parameters use lazy evaluation
-        // They are not actually created until wxActiveXEvent::operator[] is called
         event.m_params.NullList();
         event.m_dispid = dispIdMember;
 
-        // save the native (MSW) event parameters for event handlers that need to access them
-        // this can be done on the stack since wxActiveXEvent is also allocated on the stack
-        wxActiveXEventNativeMSW eventParameters(dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
-        event.SetClientData(&eventParameters);
+        // arguments
+        if (pDispParams)
+        {
+            for (DWORD i = pDispParams->cArgs; i > 0; i--)
+            {
+                VARIANTARG& va = pDispParams->rgvarg[i-1];
+                wxVariant vx;
 
-        // The event parameters are not copied to event.m_params until they are actually
-        // referenced in wxActiveXEvent::operator[]
-        // This increases performance and avoids error messages and/or crashes
-        // when the event has parameters that are not (yet or never) supported
-        // by wxConvertOleToVariant
+//                        vx.SetName(px.name);
+                wxConvertOleToVariant(va, vx);
+                event.m_params.Append(vx);
+            }
+        }
 
         // process the events from the activex method
-        m_activeX->ProcessEvent(event);
+           m_activeX->ProcessEvent(event);
         for (DWORD i = 0; i < pDispParams->cArgs; i++)
         {
-            size_t params_index = pDispParams->cArgs - i - 1;
-            if (params_index < event.m_params.GetCount()) {
-                wxVariant &vx = event.m_params[params_index];
-                // copy the result back to pDispParams only if the event has been accessed
-                //  i.e.  if vx != ms_invalidEntryMarker
-                if (!vx.IsType(wxActiveXEvents::ms_invalidEntryMarker.GetType()) || vx!=ms_invalidEntryMarker) {
-                    VARIANTARG& va = pDispParams->rgvarg[i];
-                    wxConvertVariantToOle(vx, va);
-                }
-            }
+            VARIANTARG& va = pDispParams->rgvarg[i];
+            wxVariant& vx =
+                event.m_params[pDispParams->cArgs - i - 1];
+            wxConvertVariantToOle(vx, va);
         }
 
         if(event.GetSkipped())
@@ -786,61 +767,11 @@ public:
     }
 };
 
-namespace
-{
-// just a unique global variable
-const int invalid_entry_marker = 0;
-}
-
-wxVariant wxActiveXEvents::ms_invalidEntryMarker((void*)&invalid_entry_marker);
-
-size_t wxActiveXEvent::ParamCount() const
-{
-    wxActiveXEventNativeMSW *native=GetNativeParameters();
-    // 'native' will always be != if the event has been created
-    // for an actual active X event.
-    // But it may be zero if the event has been created by wx program code.
-    if (native)
-        return native->pDispParams ? native->pDispParams->cArgs : 0;
-
-    return m_params.GetCount();
-}
-
-wxVariant &wxActiveXEvent::operator [](size_t idx)
-{
-    wxASSERT(idx < ParamCount());
-    wxActiveXEventNativeMSW *native=GetNativeParameters();
-    // 'native' will always be != if the event has been created
-    // for an actual active X event.
-    // But it may be zero if the event has been created by wx program code.
-    if (native)
-    {
-        while ( m_params.GetCount()<=idx )
-        {
-            m_params.Append(wxActiveXEvents::ms_invalidEntryMarker);
-        }
-
-        wxVariant& vx = m_params[idx];
-        if ( vx.IsType(wxActiveXEvents::ms_invalidEntryMarker.GetType()) &&
-                vx == wxActiveXEvents::ms_invalidEntryMarker)
-        {
-            // copy the _real_ parameter into this one
-            // NOTE: m_params stores the parameters in *reverse* order.
-            // Whyever, but this was the case in the original implementation of
-            // wxActiveXEvents::Invoke
-            // Keep this convention.
-            VARIANTARG& va = native->pDispParams->rgvarg[ native->pDispParams->cArgs - idx - 1 ];
-            wxConvertOleToVariant(va, vx);
-        }
-        return vx;
-    }
-    return m_params[idx];
-}
-
 bool wxActiveXEventsInterface(wxActiveXEvents *self, REFIID iid, void **_interface, const char *&desc)
 {
     if (self->m_haveCustomId && IsEqualIID(iid, self->m_customId))
     {
+//        WXOLE_TRACE("Found Custom Dispatch Interface");
         *_interface = (IUnknown *) (IDispatch *) self;
         desc = "Custom Dispatch Interface";
         return true;
@@ -884,13 +815,13 @@ wxActiveXContainer::wxActiveXContainer(wxWindow * parent,
 wxActiveXContainer::~wxActiveXContainer()
 {
     // disconnect connection points
-    if (m_oleInPlaceObject.IsOk())
+    if (m_oleInPlaceObject.Ok())
     {
         m_oleInPlaceObject->InPlaceDeactivate();
         m_oleInPlaceObject->UIDeactivate();
     }
 
-    if (m_oleObject.IsOk())
+    if (m_oleObject.Ok())
     {
         if (m_docAdviseCookie != 0)
             m_oleObject->Unadvise(m_docAdviseCookie);
@@ -900,24 +831,8 @@ wxActiveXContainer::~wxActiveXContainer()
         m_oleObject->Close(OLECLOSE_NOSAVE);
         m_oleObject->SetClientSite(NULL);
     }
-
-    // m_clientSite uses m_frameSite so destroy it first
-    m_clientSite.Free();
-    delete m_frameSite;
-
-    // our window doesn't belong to us, don't destroy it
-    m_hWnd = NULL;
 }
 
-// VZ: we might want to really report an error instead of just asserting here
-#if wxDEBUG_LEVEL
-    #define CHECK_HR(hr) \
-        wxASSERT_LEVEL_2_MSG( SUCCEEDED(hr), \
-                wxString::Format("HRESULT = %X", (unsigned)(hr)) )
-#else
-    #define CHECK_HR(hr) wxUnusedVar(hr)
-#endif
-
 //---------------------------------------------------------------------------
 // wxActiveXContainer::CreateActiveX
 //
@@ -930,21 +845,20 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 {
     HRESULT hret;
     hret = m_ActiveX.QueryInterface(iid, pUnk);
-    CHECK_HR(hret);
+    wxASSERT(SUCCEEDED(hret));
 
     // FrameSite
-    m_frameSite = new FrameSite(m_realparent, this);
+    FrameSite *frame = new FrameSite(m_realparent, this);
     // oleClientSite
     hret = m_clientSite.QueryInterface(
-        IID_IOleClientSite, (IDispatch *) m_frameSite);
-    CHECK_HR(hret);
+        IID_IOleClientSite, (IDispatch *) frame);
+    wxASSERT(SUCCEEDED(hret));
     // adviseSink
-    wxAutoIAdviseSink adviseSink(IID_IAdviseSink, (IDispatch *) m_frameSite);
-    wxASSERT(adviseSink.IsOk());
+    wxAutoIAdviseSink adviseSink(IID_IAdviseSink, (IDispatch *) frame);
+    wxASSERT(adviseSink.Ok());
 
     // Get Dispatch interface
     hret = m_Dispatch.QueryInterface(IID_IDispatch, m_ActiveX);
-    CHECK_HR(hret);
 
     //
     // SETUP TYPEINFO AND ACTIVEX EVENTS
@@ -952,18 +866,17 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
     // get type info via class info
     wxAutoIProvideClassInfo classInfo(IID_IProvideClassInfo, m_ActiveX);
-    wxASSERT(classInfo.IsOk());
+    wxASSERT(classInfo.Ok());
 
     // type info
     wxAutoITypeInfo typeInfo;
     hret = classInfo->GetClassInfo(typeInfo.GetRef());
-    CHECK_HR(hret);
-    wxASSERT(typeInfo.IsOk());
+    wxASSERT(typeInfo.Ok());
 
     // TYPEATTR
     TYPEATTR *ta = NULL;
     hret = typeInfo->GetTypeAttr(&ta);
-    CHECK_HR(hret);
+    wxASSERT(ta);
 
     // this should be a TKIND_COCLASS
     wxASSERT(ta->typekind == TKIND_COCLASS);
@@ -981,11 +894,9 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
         // get dispatch type info interface
         wxAutoITypeInfo  ti;
         hret = typeInfo->GetRefTypeInfo(rt, ti.GetRef());
-        if (! ti.IsOk())
+        if (! ti.Ok())
             continue;
 
-        CHECK_HR(hret);
-
         // check if default event sink
         bool defEventSink = false;
         int impTypeFlags = 0;
@@ -1011,7 +922,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
         // TYPEATTR
         TYPEATTR *ta = NULL;
         hret = ti->GetTypeAttr(&ta);
-        CHECK_HR(hret);
+        wxASSERT(ta);
 
         if (ta->typekind == TKIND_DISPATCH)
         {
@@ -1022,31 +933,19 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
                 DWORD                    adviseCookie = 0;
 
                 wxAutoIConnectionPointContainer cpContainer(IID_IConnectionPointContainer, m_ActiveX);
-                wxASSERT( cpContainer.IsOk());
+                wxASSERT( cpContainer.Ok());
 
                 HRESULT hret =
                     cpContainer->FindConnectionPoint(ta->guid, cp.GetRef());
+                wxASSERT ( SUCCEEDED(hret));
 
-                // Notice that the return value of CONNECT_E_NOCONNECTION is
-                // expected if the interface doesn't support connection points.
-                if ( hret != CONNECT_E_NOCONNECTION )
-                {
-                    CHECK_HR(hret);
-                }
-
-                if ( cp )
-                {
-                    wxActiveXEvents * const
-                        events = new wxActiveXEvents(this, ta->guid);
-                    hret = cp->Advise(events, &adviseCookie);
-
-                    // We don't need this object any more and cp will keep a
-                    // reference to it if it needs it, i.e. if Advise()
-                    // succeeded.
-                    events->Release();
-
-                    CHECK_HR(hret);
-                }
+                IDispatch* disp;
+                frame->QueryInterface(IID_IDispatch, (void**)&disp);
+                hret = cp->Advise(new wxActiveXEvents(this, ta->guid),
+                                  &adviseCookie);
+                wxASSERT_MSG( SUCCEEDED(hret),
+                    wxString::Format(wxT("Cannot connect!\nHRESULT:%X"), (unsigned int)hret)
+                            );
             }
         }
 
@@ -1062,17 +961,15 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
     // Get IOleObject interface
     hret = m_oleObject.QueryInterface(IID_IOleObject, m_ActiveX);
-    CHECK_HR(hret);
+    wxASSERT(SUCCEEDED(hret));
 
     // get IViewObject Interface
     hret = m_viewObject.QueryInterface(IID_IViewObject, m_ActiveX);
-    CHECK_HR(hret);
+    wxASSERT(SUCCEEDED(hret));
 
     // document advise
     m_docAdviseCookie = 0;
     hret = m_oleObject->Advise(adviseSink, &m_docAdviseCookie);
-    CHECK_HR(hret);
-
     // TODO:Needed?
 //    hret = m_viewObject->SetAdvise(DVASPECT_CONTENT, 0, adviseSink);
     m_oleObject->SetHostNames(L"wxActiveXContainer", NULL);
@@ -1083,12 +980,12 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
     // Get IOleInPlaceObject interface
     hret = m_oleInPlaceObject.QueryInterface(
         IID_IOleInPlaceObject, m_ActiveX);
-    CHECK_HR(hret);
+    wxASSERT(SUCCEEDED(hret));
 
     // status
     DWORD dwMiscStatus;
     m_oleObject->GetMiscStatus(DVASPECT_CONTENT, &dwMiscStatus);
-    CHECK_HR(hret);
+    wxASSERT(SUCCEEDED(hret));
 
     // set client site first ?
     if (dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST)
@@ -1099,19 +996,21 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
     wxAutoIPersistStreamInit
         pPersistStreamInit(IID_IPersistStreamInit, m_oleObject);
 
-    if (pPersistStreamInit.IsOk())
+    if (pPersistStreamInit.Ok())
     {
         hret = pPersistStreamInit->InitNew();
-        CHECK_HR(hret);
     }
 
     if (! (dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST))
         m_oleObject->SetClientSite(m_clientSite);
 
 
+    RECT posRect;
+    ::GetClientRect((HWND)m_realparent->GetHWND(), &posRect);
+
     m_oleObjectHWND = 0;
 
-    if (m_oleInPlaceObject.IsOk())
+    if (m_oleInPlaceObject.Ok())
     {
         hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);
         if (SUCCEEDED(hret))
@@ -1121,28 +1020,19 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
     if (! (dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME))
     {
-        RECT posRect;
-        wxCopyRectToRECT(m_realparent->GetClientSize(), posRect);
-
         if (posRect.right > 0 && posRect.bottom > 0 &&
-            m_oleInPlaceObject.IsOk())
-        {
-            m_oleInPlaceObject->SetObjectRects(&posRect, &posRect);
-        }
+            m_oleInPlaceObject.Ok())
+                m_oleInPlaceObject->SetObjectRects(&posRect, &posRect);
 
         hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL,
             m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect);
-        CHECK_HR(hret);
-
         hret = m_oleObject->DoVerb(OLEIVERB_SHOW, 0, m_clientSite, 0,
             (HWND)m_realparent->GetHWND(), &posRect);
-        CHECK_HR(hret);
     }
 
-    if (! m_oleObjectHWND && m_oleInPlaceObject.IsOk())
+    if (! m_oleObjectHWND && m_oleInPlaceObject.Ok())
     {
         hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);
-        CHECK_HR(hret);
     }
 
     if (m_oleObjectHWND)
@@ -1184,12 +1074,14 @@ void wxActiveXContainer::OnSize(wxSizeEvent& event)
     posRect.right = w;
     posRect.bottom = h;
 
-    if (w <= 0 || h <= 0)
+    if (w <= 0 && h <= 0)
         return;
 
     // extents are in HIMETRIC units
-    if (m_oleObject.IsOk())
+    if (m_oleObject.Ok())
     {
+        m_oleObject->DoVerb(OLEIVERB_HIDE, 0, m_clientSite, 0,
+            (HWND)m_realparent->GetHWND(), &posRect);
 
         SIZEL sz = {w, h};
         PixelsToHimetric(sz);
@@ -1200,9 +1092,11 @@ void wxActiveXContainer::OnSize(wxSizeEvent& event)
         if (sz2.cx !=  sz.cx || sz.cy != sz2.cy)
             m_oleObject->SetExtent(DVASPECT_CONTENT, &sz);
 
+        m_oleObject->DoVerb(OLEIVERB_SHOW, 0, m_clientSite, 0,
+            (HWND)m_realparent->GetHWND(), &posRect);
     }
 
-    if (m_oleInPlaceObject.IsOk())
+    if (m_oleInPlaceObject.Ok())
         m_oleInPlaceObject->SetObjectRects(&posRect, &posRect);
 
     event.Skip();
@@ -1233,9 +1127,8 @@ void wxActiveXContainer::OnPaint(wxPaintEvent& WXUNUSED(event))
         ::InvalidateRect(m_oleObjectHWND, NULL, false);
 #endif
         RECTL *prcBounds = (RECTL *) &posRect;
-        wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl );
         m_viewObject->Draw(DVASPECT_CONTENT, -1, NULL, NULL, NULL,
-            (HDC)msw->GetHDC(), prcBounds, NULL, NULL, 0);
+            (HDC)dc.GetHDC(), prcBounds, NULL, NULL, 0);
     }
 }
 
@@ -1246,7 +1139,7 @@ void wxActiveXContainer::OnPaint(wxPaintEvent& WXUNUSED(event))
 //---------------------------------------------------------------------------
 void wxActiveXContainer::OnSetFocus(wxFocusEvent& event)
 {
-    if (m_oleInPlaceActiveObject.IsOk())
+    if (m_oleInPlaceActiveObject.Ok())
         m_oleInPlaceActiveObject->OnFrameWindowActivate(TRUE);
 
     event.Skip();
@@ -1260,39 +1153,10 @@ void wxActiveXContainer::OnSetFocus(wxFocusEvent& event)
 //---------------------------------------------------------------------------
 void wxActiveXContainer::OnKillFocus(wxFocusEvent& event)
 {
-    if (m_oleInPlaceActiveObject.IsOk())
+    if (m_oleInPlaceActiveObject.Ok())
         m_oleInPlaceActiveObject->OnFrameWindowActivate(FALSE);
 
     event.Skip();
 }
 
-//---------------------------------------------------------------------------
-// wxActiveXContainer::MSWTranslateMessage
-//
-// Called for every message that needs to be translated.
-// Some controls might need more keyboard keys to process (CTRL-C, CTRL-A ect),
-// In that case TranslateAccelerator should always be called first.
-//---------------------------------------------------------------------------
-bool wxActiveXContainer::MSWTranslateMessage(WXMSG* pMsg)
-{
-    if(m_oleInPlaceActiveObject.IsOk() && m_oleInPlaceActiveObject->TranslateAccelerator(pMsg) == S_OK)
-    {
-        return true;
-    }
-    return wxWindow::MSWTranslateMessage(pMsg);
-}
-
-//---------------------------------------------------------------------------
-// wxActiveXContainer::QueryClientSiteInterface
-//
-// Called in the host's site's query method for other interfaces.
-//---------------------------------------------------------------------------
-bool wxActiveXContainer::QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc)
-{
-    wxUnusedVar(iid);
-    wxUnusedVar(_interface);
-    wxUnusedVar(desc);
-    return false;
-}
-
 #endif // wxUSE_ACTIVEX
diff --git a/Source/3rd Party/wx/src/msw/ole/automtn.cpp b/Source/3rd Party/wx/src/msw/ole/automtn.cpp
index 6829c0803..83d9a3fb6 100644
--- a/Source/3rd Party/wx/src/msw/ole/automtn.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/automtn.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     11/6/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: automtn.cpp 66913 2011-02-16 21:40:07Z JS $
 // Copyright:   (c) 1998, Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -22,6 +22,8 @@
     #define wxUSE_OLE_AUTOMATION 0
 #endif
 
+#if wxUSE_OLE_AUTOMATION
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/math.h"
@@ -52,20 +54,15 @@
 
 #if wxUSE_DATETIME
 #include "wx/datetime.h"
-#endif // wxUSE_DATETIME
+#endif // wxUSE_TIMEDATE
 
-#if wxUSE_OLE_AUTOMATION
+static void ClearVariant(VARIANTARG *pvarg) ;
+static void ReleaseVariant(VARIANTARG *pvarg) ;
+// static void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned int uiArgErr);
 
-#include <wx/vector.h>
-
-// Report an OLE error when calling the specified method to the user via wxLog.
-static void
-ShowException(const wxString& member,
-              HRESULT hr,
-              EXCEPINFO *pexcep = NULL,
-              unsigned int uiArgErr = 0);
-
-// wxAutomationObject
+/*
+ * wxAutomationObject
+ */
 
 wxAutomationObject::wxAutomationObject(WXIDISPATCH* dispatchPtr)
 {
@@ -81,59 +78,47 @@ wxAutomationObject::~wxAutomationObject()
     }
 }
 
-namespace
-{
-
-// A simple helper that ensures that VARIANT is destroyed on scope exit.
-struct wxOleVariantArg : VARIANTARG
-{
-    wxOleVariantArg()  { VariantInit(this);  }
-    ~wxOleVariantArg() { VariantClear(this); }
-};
-
-} // anonymous namespace
-
-
 #define INVOKEARG(i) (args ? args[i] : *(ptrArgs[i]))
 
 // For Put/Get, no named arguments are allowed.
-// WARNING: if args contain IDispatches, their reference count will be decreased
-// by one after Invoke() returns!
 bool wxAutomationObject::Invoke(const wxString& member, int action,
         wxVariant& retValue, int noArgs, wxVariant args[], const wxVariant* ptrArgs[]) const
 {
     if (!m_dispatchPtr)
         return false;
 
-    int ch = member.Find('.');
+    // nonConstMember is necessary because the wxString class doesn't have enough consts...
+    wxString nonConstMember(member);
+
+    int ch = nonConstMember.Find('.');
     if (ch != -1)
     {
         // Use dot notation to get the next object
-        wxString member2(member.Left((size_t) ch));
-        wxString rest(member.Right(member.length() - ch - 1));
+        wxString member2(nonConstMember.Left((size_t) ch));
+        wxString rest(nonConstMember.Right(nonConstMember.length() - ch - 1));
         wxAutomationObject obj;
         if (!GetObject(obj, member2))
             return false;
         return obj.Invoke(rest, action, retValue, noArgs, args, ptrArgs);
     }
 
-    wxOleVariantArg vReturn;
-    wxOleVariantArg* vReturnPtr = & vReturn;
+    VARIANTARG vReturn;
+    ClearVariant(& vReturn);
+
+    VARIANTARG* vReturnPtr = & vReturn;
 
     // Find number of names args
     int namedArgCount = 0;
     int i;
     for (i = 0; i < noArgs; i++)
-    {
-        if ( !INVOKEARG(i).GetName().empty() )
+        if (!INVOKEARG(i).GetName().IsNull())
         {
             namedArgCount ++;
         }
-    }
 
     int namedArgStringCount = namedArgCount + 1;
-    wxVector<wxBasicString> argNames(namedArgStringCount, wxString());
-    argNames[0] = member;
+    BSTR* argNames = new BSTR[namedArgStringCount];
+    argNames[0] = wxConvertStringToOle(member);
 
     // Note that arguments are specified in reverse order
     // (all totally logical; hey, we're dealing with OLE here.)
@@ -141,30 +126,30 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
     int j = 0;
     for (i = 0; i < namedArgCount; i++)
     {
-        if ( !INVOKEARG(i).GetName().empty() )
+        if (!INVOKEARG(i).GetName().IsNull())
         {
-            argNames[(namedArgCount-j)] = INVOKEARG(i).GetName();
+            argNames[(namedArgCount-j)] = wxConvertStringToOle(INVOKEARG(i).GetName());
             j ++;
         }
     }
 
     // + 1 for the member name, + 1 again in case we're a 'put'
-    wxVector<DISPID> dispIds(namedArgCount + 2);
+    DISPID* dispIds = new DISPID[namedArgCount + 2];
 
     HRESULT hr;
     DISPPARAMS dispparams;
     unsigned int uiArgErr;
+    EXCEPINFO excep;
 
     // Get the IDs for the member and its arguments.  GetIDsOfNames expects the
     // member name as the first name, followed by argument names (if any).
-    hr = ((IDispatch*)m_dispatchPtr)->GetIDsOfNames(IID_NULL,
-                                // We rely on the fact that wxBasicString is
-                                // just BSTR with some methods here.
-                                reinterpret_cast<BSTR *>(&argNames[0]),
-                                1 + namedArgCount, LOCALE_SYSTEM_DEFAULT, &dispIds[0]);
+    hr = ((IDispatch*)m_dispatchPtr)->GetIDsOfNames(IID_NULL, argNames,
+                                1 + namedArgCount, LOCALE_SYSTEM_DEFAULT, dispIds);
     if (FAILED(hr))
     {
-        ShowException(member, hr);
+//        ShowException(szMember, hr, NULL, 0);
+        delete[] argNames;
+        delete[] dispIds;
         return false;
     }
 
@@ -174,39 +159,56 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
     {
         namedArgCount = 1;
         dispIds[1] = DISPID_PROPERTYPUT;
-        vReturnPtr = NULL;
+        vReturnPtr = (VARIANTARG*) NULL;
     }
 
     // Convert the wxVariants to VARIANTARGs
-    wxVector<wxOleVariantArg> oleArgs(noArgs);
+    VARIANTARG* oleArgs = new VARIANTARG[noArgs];
     for (i = 0; i < noArgs; i++)
     {
         // Again, reverse args
         if (!wxConvertVariantToOle(INVOKEARG((noArgs-1) - i), oleArgs[i]))
+        {
+            delete[] argNames;
+            delete[] dispIds;
+            delete[] oleArgs;
             return false;
+        }
     }
 
-    dispparams.rgdispidNamedArgs = &dispIds[0] + 1;
-    dispparams.rgvarg = oleArgs.empty() ? NULL : &oleArgs[0];
+    dispparams.rgdispidNamedArgs = dispIds + 1;
+    dispparams.rgvarg = oleArgs;
     dispparams.cArgs = noArgs;
     dispparams.cNamedArgs = namedArgCount;
 
-    EXCEPINFO excep;
-    wxZeroMemory(excep);
+    excep.pfnDeferredFillIn = NULL;
 
     hr = ((IDispatch*)m_dispatchPtr)->Invoke(dispIds[0], IID_NULL, LOCALE_SYSTEM_DEFAULT,
                         (WORD)action, &dispparams, vReturnPtr, &excep, &uiArgErr);
 
+    for (i = 0; i < namedArgStringCount; i++)
+    {
+        SysFreeString(argNames[i]);
+    }
+    delete[] argNames;
+    delete[] dispIds;
+
+    for (i = 0; i < noArgs; i++)
+        ReleaseVariant(& oleArgs[i]) ;
+    delete[] oleArgs;
+
     if (FAILED(hr))
     {
         // display the exception information if appropriate:
-        ShowException(member, hr, &excep, uiArgErr);
+//        ShowException((const char*) member, hr, &excep, uiArgErr);
 
         // free exception structure information
         SysFreeString(excep.bstrSource);
         SysFreeString(excep.bstrDescription);
         SysFreeString(excep.bstrHelpFile);
 
+        if (vReturnPtr)
+            ReleaseVariant(vReturnPtr);
         return false;
     }
     else
@@ -214,13 +216,13 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
         if (vReturnPtr)
         {
             // Convert result to wxVariant form
-            if (!wxConvertOleToVariant(vReturn, retValue))
-                return false;
+            wxConvertOleToVariant(vReturn, retValue);
             // Mustn't release the dispatch pointer
             if (vReturn.vt == VT_DISPATCH)
             {
-                vReturn.pdispVal = NULL;
+                vReturn.pdispVal = (IDispatch*) NULL;
             }
+            ReleaseVariant(& vReturn);
         }
     }
     return true;
@@ -438,7 +440,7 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
         }
     }
 
-    return NULL;
+    return (WXIDISPATCH*) NULL;
 }
 
 // Uses DISPATCH_PROPERTYGET
@@ -456,7 +458,7 @@ WXIDISPATCH* wxAutomationObject::GetDispatchProperty(const wxString& property, i
         }
     }
 
-    return NULL;
+    return (WXIDISPATCH*) NULL;
 }
 
 
@@ -486,85 +488,33 @@ bool wxAutomationObject::GetObject(wxAutomationObject& obj, const wxString& prop
         return false;
 }
 
-namespace
-{
-
-HRESULT wxCLSIDFromProgID(const wxString& progId, CLSID& clsId)
-{
-    HRESULT hr = CLSIDFromProgID(wxBasicString(progId), &clsId);
-    if ( FAILED(hr) )
-    {
-        wxLogSysError(hr, _("Failed to find CLSID of \"%s\""), progId);
-    }
-    return hr;
-}
-
-void *DoCreateInstance(const wxString& progId, const CLSID& clsId)
-{
-    // get the server IDispatch interface
-    //
-    // NB: using CLSCTX_INPROC_HANDLER results in failure when getting
-    //     Automation interface for Microsoft Office applications so don't use
-    //     CLSCTX_ALL which includes it
-    void *pDispatch = NULL;
-    HRESULT hr = CoCreateInstance(clsId, NULL, CLSCTX_SERVER,
-                                  IID_IDispatch, &pDispatch);
-    if (FAILED(hr))
-    {
-        wxLogSysError(hr, _("Failed to create an instance of \"%s\""), progId);
-        return NULL;
-    }
-
-    return pDispatch;
-}
-
-} // anonymous namespace
-
 // Get a dispatch pointer from the current object associated
-// with a ProgID
-bool wxAutomationObject::GetInstance(const wxString& progId, int flags) const
+// with a class id
+bool wxAutomationObject::GetInstance(const wxString& classId) const
 {
     if (m_dispatchPtr)
         return false;
 
     CLSID clsId;
-    HRESULT hr = wxCLSIDFromProgID(progId, clsId);
-    if (FAILED(hr))
-        return false;
+    IUnknown * pUnk = NULL;
 
-    IUnknown *pUnk = NULL;
-    hr = GetActiveObject(clsId, NULL, &pUnk);
-    if (FAILED(hr))
+    wxBasicString unicodeName(classId.mb_str());
+
+    if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
     {
-        if ( flags & wxAutomationInstance_CreateIfNeeded )
-        {
-            const_cast<wxAutomationObject *>(this)->
-                m_dispatchPtr = DoCreateInstance(progId, clsId);
-            if ( m_dispatchPtr )
-                return true;
-        }
-        else
-        {
-            // Log an error except if we're supposed to fail silently when the
-            // error is that no current instance exists.
-            if ( hr != MK_E_UNAVAILABLE ||
-                    !(flags & wxAutomationInstance_SilentIfNone) )
-            {
-                wxLogSysError(hr,
-                              _("Cannot get an active instance of \"%s\""),
-                              progId);
-            }
-        }
-
+        wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
         return false;
     }
 
-    hr = pUnk->QueryInterface(IID_IDispatch, (LPVOID*) &m_dispatchPtr);
-    if (FAILED(hr))
+    if (FAILED(GetActiveObject(clsId, NULL, &pUnk)))
     {
-        wxLogSysError(hr,
-                      _("Failed to get OLE automation interface for \"%s\""),
-                      progId);
+        wxLogWarning(wxT("Cannot find an active object"));
+        return false;
+    }
+
+    if (pUnk->QueryInterface(IID_IDispatch, (LPVOID*) &m_dispatchPtr) != S_OK)
+    {
+        wxLogWarning(wxT("Cannot find IDispatch interface"));
         return false;
     }
 
@@ -572,95 +522,448 @@ bool wxAutomationObject::GetInstance(const wxString& progId, int flags) const
 }
 
 // Get a dispatch pointer from a new object associated
-// with the given ProgID
-bool wxAutomationObject::CreateInstance(const wxString& progId) const
+// with the given class id
+bool wxAutomationObject::CreateInstance(const wxString& classId) const
 {
     if (m_dispatchPtr)
         return false;
 
     CLSID clsId;
-    HRESULT hr = wxCLSIDFromProgID(progId, clsId);
-    if (FAILED(hr))
+
+    wxBasicString unicodeName(classId.mb_str());
+
+    if (FAILED(CLSIDFromProgID((BSTR) unicodeName, &clsId)))
+    {
+        wxLogWarning(wxT("Cannot obtain CLSID from ProgID"));
         return false;
+    }
 
-    const_cast<wxAutomationObject *>(this)->
-        m_dispatchPtr = DoCreateInstance(progId, clsId);
+    // get the server IDispatch interface
+    //
+    // NB: using CLSCTX_INPROC_HANDLER results in failure when getting
+    //     Automation interface for Microsoft Office applications so don't use
+    //     CLSCTX_ALL which includes it
+    if (FAILED(CoCreateInstance(clsId, NULL, CLSCTX_SERVER, IID_IDispatch,
+                                (void**)&m_dispatchPtr)))
+    {
+        wxLogWarning(wxT("Cannot start an instance of this class."));
+        return false;
+    }
 
-    return m_dispatchPtr != NULL;
+    return true;
 }
 
-static void
-ShowException(const wxString& member,
-              HRESULT hr,
-              EXCEPINFO *pexcep,
-              unsigned int uiArgErr)
+
+WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
 {
-    wxString message;
+    ClearVariant(&oleVariant);
+    if (variant.IsNull())
+    {
+        oleVariant.vt = VT_NULL;
+        return true;
+    }
+
+    wxString type(variant.GetType());
+
+
+    if (type == wxT("long"))
+    {
+        oleVariant.vt = VT_I4;
+        oleVariant.lVal = variant.GetLong() ;
+    }
+    // cVal not always present
+#ifndef __GNUWIN32__
+    else if (type == wxT("char"))
+    {
+        oleVariant.vt=VT_I1;            // Signed Char
+        oleVariant.cVal=variant.GetChar();
+    }
+#endif
+    else if (type == wxT("double"))
+    {
+        oleVariant.vt = VT_R8;
+        oleVariant.dblVal = variant.GetDouble();
+    }
+    else if (type == wxT("bool"))
+    {
+        oleVariant.vt = VT_BOOL;
+        // 'bool' required for VC++ 4 apparently
+#if (defined(__VISUALC__) && (__VISUALC__ <= 1000))
+        oleVariant.bool = variant.GetBool();
+#else
+        oleVariant.boolVal = variant.GetBool();
+#endif
+    }
+    else if (type == wxT("string"))
+    {
+        wxString str( variant.GetString() );
+        oleVariant.vt = VT_BSTR;
+        oleVariant.bstrVal = wxConvertStringToOle(str);
+    }
+#if wxUSE_DATETIME
+    else if (type == wxT("datetime"))
+    {
+        wxDateTime date( variant.GetDateTime() );
+        oleVariant.vt = VT_DATE;
+
+        // we ought to use SystemTimeToVariantTime() here but this code is
+        // untested and hence currently disabled, please let us know if it
+        // works for you and we'll enable it
+#if 0
+        const wxDateTime::Tm tm(date.GetTm());
+
+        SYSTEMTIME st;
+        st.wYear = (WXWORD)tm.year;
+        st.wMonth = (WXWORD)(tm.mon - wxDateTime::Jan + 1);
+        st.wDay = tm.mday;
+
+        st.wDayOfWeek = 0;
+        st.wHour = tm.hour;
+        st.wMinute = tm.min;
+        st.wSecond = tm.sec;
+        st.wMilliseconds = tm.msec;
+
+        SystemTimeToVariantTime(&st, &oleVariant.date);
+#else
+        long dosDateTime = date.GetAsDOS();
+        short dosDate = short((dosDateTime & 0xFFFF0000) >> 16);
+        short dosTime = short(dosDateTime & 0xFFFF);
+
+        DosDateTimeToVariantTime(dosDate, dosTime, & oleVariant.date);
+#endif
+    }
+#endif
+    else if (type == wxT("void*"))
+    {
+        oleVariant.vt = VT_DISPATCH;
+        oleVariant.pdispVal = (IDispatch*) variant.GetVoidPtr();
+    }
+    else if (type == wxT("list") || type == wxT("stringlist"))
+    {
+        oleVariant.vt = VT_VARIANT | VT_ARRAY;
+
+        SAFEARRAY *psa;
+        SAFEARRAYBOUND saBound;
+        VARIANTARG *pvargBase;
+        VARIANTARG *pvarg;
+        int i, j;
+
+        int iCount = variant.GetCount();
+
+        saBound.lLbound = 0;
+        saBound.cElements = iCount;
+
+        psa = SafeArrayCreate(VT_VARIANT, 1, &saBound);
+        if (psa == NULL)
+            return false;
+
+        SafeArrayAccessData(psa, (void**)&pvargBase);
+
+        pvarg = pvargBase;
+        for (i = 0; i < iCount; i++)
+        {
+            // copy each string in the list of strings
+            wxVariant eachVariant(variant[i]);
+            if (!wxConvertVariantToOle(eachVariant, * pvarg))
+            {
+                // memory failure:  back out and free strings alloc'ed up to
+                // now, and then the array itself.
+                pvarg = pvargBase;
+                for (j = 0; j < i; j++)
+                {
+                    SysFreeString(pvarg->bstrVal);
+                    pvarg++;
+                }
+                SafeArrayDestroy(psa);
+                return false;
+            }
+            pvarg++;
+        }
+
+        SafeArrayUnaccessData(psa);
+
+        oleVariant.parray = psa;
+    }
+    else
+    {
+        oleVariant.vt = VT_NULL;
+        return false;
+    }
+    return true;
+}
+
+#ifndef VT_TYPEMASK
+#define VT_TYPEMASK 0xfff
+#endif
+
+WXDLLEXPORT bool wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
+{
+    switch (oleVariant.vt & VT_TYPEMASK)
+    {
+    case VT_BSTR:
+        {
+            wxString str(wxConvertStringFromOle(oleVariant.bstrVal));
+            variant = str;
+            break;
+        }
+    case VT_DATE:
+        {
+#if wxUSE_DATETIME
+            SYSTEMTIME st;
+            VariantTimeToSystemTime(oleVariant.date, &st);
+
+            wxDateTime date;
+            date.Set(st.wDay,
+                     (wxDateTime::Month)(wxDateTime::Jan + st.wMonth - 1),
+                     st.wYear,
+                     st.wHour,
+                     st.wMinute,
+                     st.wSecond);
+            variant = date;
+#endif
+            break;
+        }
+    case VT_I4:
+        {
+            variant = (long) oleVariant.lVal;
+            break;
+        }
+    case VT_I2:
+        {
+            variant = (long) oleVariant.iVal;
+            break;
+        }
+
+    case VT_BOOL:
+        {
+#if (defined(_MSC_VER) && (_MSC_VER <= 1000) && !defined(__MWERKS__) ) //GC
+#ifndef HAVE_BOOL // Can't use bool operator if no native bool type
+            variant = (long) (oleVariant.bool != 0);
+#else
+            variant = (bool) (oleVariant.bool != 0);
+#endif
+#else
+#ifndef HAVE_BOOL // Can't use bool operator if no native bool type
+            variant = (long) (oleVariant.boolVal != 0);
+#else
+            variant = (bool) (oleVariant.boolVal != 0);
+#endif
+#endif
+            break;
+        }
+    case VT_R8:
+        {
+            variant = oleVariant.dblVal;
+            break;
+        }
+    case VT_VARIANT:
+    // case VT_ARRAY: // This is masked out by VT_TYPEMASK
+        {
+            variant.ClearList();
+
+            int cDims, cElements, i;
+            VARIANTARG* pvdata;
+
+            // Iterate the dimensions: number of elements is x*y*z
+            for (cDims = 0, cElements = 1;
+                cDims < oleVariant.parray->cDims; cDims ++)
+                    cElements *= oleVariant.parray->rgsabound[cDims].cElements;
+
+            // Get a pointer to the data
+            HRESULT hr = SafeArrayAccessData(oleVariant.parray, (void HUGEP* FAR*) & pvdata);
+            if (hr != NOERROR)
+                return false;
+            // Iterate the data.
+            for (i = 0; i < cElements; i++)
+            {
+                VARIANTARG& oleElement = pvdata[i];
+                wxVariant vElement;
+                if (!wxConvertOleToVariant(oleElement, vElement))
+                    return false;
+
+                variant.Append(vElement);
+            }
+            SafeArrayUnaccessData(oleVariant.parray);
+            break;
+        }
+    case VT_DISPATCH:
+        {
+            variant = (void*) oleVariant.pdispVal;
+            break;
+        }
+    case VT_NULL:
+        {
+            variant.MakeNull();
+            break;
+        }
+    case VT_EMPTY:
+        {
+            break;    // Ignore Empty Variant, used only during destruction of objects
+        }
+    default:
+        {
+            wxLogError(wxT("wxAutomationObject::ConvertOleToVariant: Unknown variant value type"));
+            return false;
+        }
+    }
+    return true;
+}
+
+/*
+ *  ClearVariant
+ *
+ *  Zeros a variant structure without regard to current contents
+ */
+static void ClearVariant(VARIANTARG *pvarg)
+{
+    pvarg->vt = VT_EMPTY;
+    pvarg->wReserved1 = 0;
+    pvarg->wReserved2 = 0;
+    pvarg->wReserved3 = 0;
+    pvarg->lVal = 0;
+}
+
+/*
+ *  ReleaseVariant
+ *
+ *  Clears a particular variant structure and releases any external objects
+ *  or memory contained in the variant.  Supports the data types listed above.
+ */
+static void ReleaseVariant(VARIANTARG *pvarg)
+{
+    VARTYPE vt;
+    VARIANTARG _huge *pvargArray;
+    LONG lLBound, lUBound, l;
+
+    vt = (VARTYPE)(pvarg->vt & 0xfff);        // mask off flags
+
+    // check if an array.  If so, free its contents, then the array itself.
+    if (V_ISARRAY(pvarg))
+    {
+        // variant arrays are all this routine currently knows about.  Since a
+        // variant can contain anything (even other arrays), call ourselves
+        // recursively.
+        if (vt == VT_VARIANT)
+        {
+            SafeArrayGetLBound(pvarg->parray, 1, &lLBound);
+            SafeArrayGetUBound(pvarg->parray, 1, &lUBound);
+
+            if (lUBound > lLBound)
+            {
+                lUBound -= lLBound;
+
+                SafeArrayAccessData(pvarg->parray, (void**)&pvargArray);
+
+                for (l = 0; l < lUBound; l++)
+                {
+                    ReleaseVariant(pvargArray);
+                    pvargArray++;
+                }
+
+                SafeArrayUnaccessData(pvarg->parray);
+            }
+        }
+        else
+        {
+            wxLogWarning(wxT("ReleaseVariant: Array contains non-variant type"));
+        }
+
+        // Free the array itself.
+        SafeArrayDestroy(pvarg->parray);
+    }
+    else
+    {
+        switch (vt)
+        {
+            case VT_DISPATCH:
+                if (pvarg->pdispVal)
+                    pvarg->pdispVal->Release();
+                break;
+
+            case VT_BSTR:
+                SysFreeString(pvarg->bstrVal);
+                break;
+
+            case VT_I2:
+            case VT_I4:
+            case VT_BOOL:
+            case VT_R8:
+            case VT_ERROR:        // to avoid erroring on an error return from Excel
+            case VT_EMPTY:
+            case VT_DATE:
+                // no work for these types
+                break;
+
+            default:
+                wxLogWarning(wxT("ReleaseVariant: Unknown type"));
+                break;
+        }
+    }
+
+    ClearVariant(pvarg);
+}
+
+#if 0
+
+void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned int uiArgErr)
+{
+    TCHAR szBuf[512];
+
     switch (GetScode(hr))
     {
         case DISP_E_UNKNOWNNAME:
-            message = _("Unknown name or named argument.");
+            wsprintf(szBuf, L"%s: Unknown name or named argument.", szMember);
             break;
 
         case DISP_E_BADPARAMCOUNT:
-            message = _("Incorrect number of arguments.");
+            wsprintf(szBuf, L"%s: Incorrect number of arguments.", szMember);
             break;
 
         case DISP_E_EXCEPTION:
-            if ( pexcep )
-            {
-                if ( pexcep->bstrDescription )
-                    message << pexcep->bstrDescription << wxS(" ");
-                message += wxString::Format(wxS("error code %u"), pexcep->wCode);
-            }
+            wsprintf(szBuf, L"%s: Error %d: ", szMember, pexcep->wCode);
+            if (pexcep->bstrDescription != NULL)
+                lstrcat(szBuf, pexcep->bstrDescription);
             else
-            {
-                message = _("Unknown exception");
-            }
+                lstrcat(szBuf, L"<<No Description>>");
             break;
 
         case DISP_E_MEMBERNOTFOUND:
-            message = _("Method or property not found.");
+            wsprintf(szBuf, L"%s: method or property not found.", szMember);
             break;
 
         case DISP_E_OVERFLOW:
-            message = _("Overflow while coercing argument values.");
+            wsprintf(szBuf, L"%s: Overflow while coercing argument values.", szMember);
             break;
 
         case DISP_E_NONAMEDARGS:
-            message = _("Object implementation does not support named arguments.");
+            wsprintf(szBuf, L"%s: Object implementation does not support named arguments.",
+                        szMember);
             break;
 
         case DISP_E_UNKNOWNLCID:
-            message = _("The locale ID is unknown.");
+            wsprintf(szBuf, L"%s: The locale ID is unknown.", szMember);
             break;
 
         case DISP_E_PARAMNOTOPTIONAL:
-            message = _("Missing a required parameter.");
+            wsprintf(szBuf, L"%s: Missing a required parameter.", szMember);
             break;
 
         case DISP_E_PARAMNOTFOUND:
-            message.Printf(_("Argument %u not found."), uiArgErr);
+            wsprintf(szBuf, L"%s: Argument not found, argument %d.", szMember, uiArgErr);
             break;
 
         case DISP_E_TYPEMISMATCH:
-            message.Printf(_("Type mismatch in argument %u."), uiArgErr);
-            break;
-
-        case ERROR_FILE_NOT_FOUND:
-            message = _("The system cannot find the file specified.");
-            break;
-
-        case REGDB_E_CLASSNOTREG:
-            message = _("Class not registered.");
+            wsprintf(szBuf, L"%s: Type mismatch, argument %d.", szMember, uiArgErr);
             break;
 
         default:
-            message.Printf(_("Unknown error %08x"), hr);
+            wsprintf(szBuf, L"%s: Unknown error occurred.", szMember);
             break;
     }
 
-    wxLogError(_("OLE Automation error in %s: %s"), member, message);
+    wxLogWarning(szBuf);
 }
 
+#endif
+
 #endif // wxUSE_OLE_AUTOMATION
diff --git a/Source/3rd Party/wx/src/msw/ole/dataobj.cpp b/Source/3rd Party/wx/src/msw/ole/dataobj.cpp
index 5f589542c..91b770b87 100644
--- a/Source/3rd Party/wx/src/msw/ole/dataobj.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/dataobj.cpp	
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/ole/dataobj.cpp
+// Name:        msw/ole/dataobj.cpp
 // Purpose:     implementation of wx[I]DataObject class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.05.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dataobj.cpp 61835 2009-09-05 12:39:26Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,6 @@
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx.h".
-#undef WIN32_LEAN_AND_MEAN
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
@@ -29,7 +28,6 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
-    #include "wx/wxcrtvararg.h"
 #endif
 
 #include "wx/dataobj.h"
@@ -47,6 +45,11 @@
   #include <ole2.h>
 #endif
 
+#ifdef __WXMSW__
+#include <Rpc.h>
+#include <shellapi.h> // needed for SHELLEXECUTEINFO
+#endif
+
 #include <oleauto.h>
 #include <shlobj.h>
 
@@ -55,33 +58,18 @@
 #include "wx/msw/dib.h"
 
 #ifndef CFSTR_SHELLURL
-#define CFSTR_SHELLURL wxT("UniformResourceLocator")
+#define CFSTR_SHELLURL _T("UniformResourceLocator")
 #endif
 
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------
 
-#if wxDEBUG_LEVEL
+#ifdef __WXDEBUG__
     static const wxChar *GetTymedName(DWORD tymed);
-#else // !wxDEBUG_LEVEL
+#else // !Debug
     #define GetTymedName(tymed) wxEmptyString
-#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
-
-wxDataFormat HtmlFormatFixup(wxDataFormat format)
-{
-    // Since the HTML format is dynamically registered, the wxDF_HTML
-    // format does not match the native constant in the way other formats do,
-    // so for the format checks below to work, we must change the native
-    // id to the wxDF_HTML constant.
-    wxChar s_szBuf[256];
-    if (::GetClipboardFormatName(format, s_szBuf, WXSIZEOF(s_szBuf)))
-    {
-        if (s_szBuf == wxString("HTML Format"))
-            format = wxDF_HTML;
-    }
-    return format;
-}
+#endif // Debug/!Debug
 
 // ----------------------------------------------------------------------------
 // wxIEnumFORMATETC interface implementation
@@ -106,7 +94,7 @@ private:
     ULONG       m_nCount,   // number of formats we support
                 m_nCurrent; // current enum position
 
-    wxDECLARE_NO_COPY_CLASS(wxIEnumFORMATETC);
+    DECLARE_NO_COPY_CLASS(wxIEnumFORMATETC)
 };
 
 // ----------------------------------------------------------------------------
@@ -142,7 +130,7 @@ private:
 
     bool m_mustDelete;
 
-    wxDECLARE_NO_COPY_CLASS(wxIDataObject);
+    DECLARE_NO_COPY_CLASS(wxIDataObject)
 };
 
 // ============================================================================
@@ -153,9 +141,9 @@ private:
 // wxDataFormat
 // ----------------------------------------------------------------------------
 
-void wxDataFormat::SetId(const wxString& format)
+void wxDataFormat::SetId(const wxChar *format)
 {
-    m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format.t_str());
+    m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format);
     if ( !m_format )
     {
         wxLogError(_("Couldn't register clipboard format '%s'."), format);
@@ -199,10 +187,7 @@ wxIEnumFORMATETC::wxIEnumFORMATETC(const wxDataFormat *formats, ULONG nCount)
     m_nCount = nCount;
     m_formats = new CLIPFORMAT[nCount];
     for ( ULONG n = 0; n < nCount; n++ ) {
-        if (formats[n].GetFormatId() != wxDF_HTML)
-            m_formats[n] = formats[n].GetFormatId();
-        else
-            m_formats[n] = ::RegisterClipboardFormat(wxT("HTML Format"));
+        m_formats[n] = formats[n].GetFormatId();
     }
 }
 
@@ -309,7 +294,6 @@ STDMETHODIMP wxIDataObject::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium)
     // for the bitmaps and metafiles we use the handles instead of global memory
     // to pass the data
     wxDataFormat format = (wxDataFormat::NativeFormat)pformatetcIn->cfFormat;
-    format = HtmlFormatFixup(format);
 
     switch ( format )
     {
@@ -452,8 +436,6 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
             {
                 wxDataFormat format = pformatetc->cfFormat;
 
-                format = HtmlFormatFixup(format);
-
                 // this is quite weird, but for file drag and drop, explorer
                 // calls our SetData() with the formats we do *not* support!
                 //
@@ -481,14 +463,14 @@ STDMETHODIMP wxIDataObject::SetData(FORMATETC *pformatetc,
                 size_t size;
                 switch ( format )
                 {
-                    case wxDF_HTML:
                     case CF_TEXT:
                     case CF_OEMTEXT:
                         size = strlen((const char *)pBuf);
                         break;
 #if !(defined(__BORLANDC__) && (__BORLANDC__ < 0x500))
                     case CF_UNICODETEXT:
-#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) )
+#if ( defined(__BORLANDC__) && (__BORLANDC__ > 0x530) ) \
+    || ( defined(__MWERKS__) && defined(__WXMSW__) )
                         size = std::wcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
 #else
                         size = wxWcslen((const wchar_t *)pBuf) * sizeof(wchar_t);
@@ -590,8 +572,6 @@ STDMETHODIMP wxIDataObject::QueryGetData(FORMATETC *pformatetc)
 
     // and now check the type of data requested
     wxDataFormat format = pformatetc->cfFormat;
-    format = HtmlFormatFixup(format);
-
     if ( m_pDataObject->IsSupportedFormat(format) ) {
         wxLogTrace(wxTRACE_OleCalls, wxT("wxIDataObject::QueryGetData: %s ok"),
                    wxGetFormatName(format));
@@ -712,12 +692,12 @@ size_t wxDataObject::GetBufferOffset(const wxDataFormat& format )
 
 const void *wxDataObject::GetSizeFromBuffer(const void *buffer,
                                             size_t *size,
-                                            const wxDataFormat& WXUNUSED(format))
+                                            const wxDataFormat& format)
 {
     // hack: the third parameter is declared non-const in Wine's headers so
     // cast away the const
     const size_t realsz = ::HeapSize(::GetProcessHeap(), 0,
-                                     const_cast<void*>(buffer));
+                                     wx_const_cast(void*, buffer));
     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error
@@ -727,7 +707,22 @@ const void *wxDataObject::GetSizeFromBuffer(const void *buffer,
 
     *size = realsz;
 
-    return buffer;
+    // check if this data has its size prepended (as it was by default for wx
+    // programs prior 2.6.3): notice that we may still mistakenly interpret the
+    // start of the real data as size (e.g. suppose the object contains 2 ints
+    // and the first of them is 8...) but there is no way around it as long as
+    // we want to keep this compatibility hack (it won't be there any more in
+    // the next major wx version)
+    DWORD *p = (DWORD *)buffer;
+    if ( *p == realsz && realsz > sizeof(DWORD) )
+    {
+        if ( NeedsVerbatimData(format) )
+            wxLogDebug(wxT("Apparent data format mismatch: size not needed"));
+
+        p++; // this data has its size prepended; skip first DWORD
+    }
+
+    return p;
 }
 
 void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
@@ -743,7 +738,7 @@ void* wxDataObject::SetSizeInBuffer( void* buffer, size_t size,
     return p;
 }
 
-#if wxDEBUG_LEVEL
+#ifdef __WXDEBUG__
 
 const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
 {
@@ -788,7 +783,7 @@ const wxChar *wxDataObject::GetFormatName(wxDataFormat format)
     #endif // VC++
 }
 
-#endif // wxDEBUG_LEVEL
+#endif // Debug
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject supports CF_DIB format
@@ -876,7 +871,7 @@ bool wxBitmapDataObject2::SetData(size_t WXUNUSED(len), const void *pBuf)
     wxBitmap bitmap(bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes);
     bitmap.SetHBITMAP((WXHBITMAP)hbmp);
 
-    if ( !bitmap.IsOk() ) {
+    if ( !bitmap.Ok() ) {
         wxFAIL_MSG(wxT("pasting/dropping invalid bitmap"));
 
         return false;
@@ -922,7 +917,7 @@ size_t wxBitmapDataObject::GetDataSize(const wxDataFormat& format) const
 bool wxBitmapDataObject::GetDataHere(const wxDataFormat& format,
                                      void *pBuf) const
 {
-    wxASSERT_MSG( m_bitmap.IsOk(), wxT("copying invalid bitmap") );
+    wxASSERT_MSG( m_bitmap.Ok(), wxT("copying invalid bitmap") );
 
     HBITMAP hbmp = (HBITMAP)m_bitmap.GetHBITMAP();
     if ( format.GetFormatId() == CF_DIB )
@@ -1001,7 +996,7 @@ bool wxBitmapDataObject::SetData(const wxDataFormat& format,
 
     m_bitmap.SetHBITMAP((WXHBITMAP)hbmp);
 
-    wxASSERT_MSG( m_bitmap.IsOk(), wxT("pasting invalid bitmap") );
+    wxASSERT_MSG( m_bitmap.Ok(), wxT("pasting invalid bitmap") );
 
     return true;
 }
@@ -1096,7 +1091,7 @@ size_t wxFileDataObject::GetDataSize() const
         size_t len;
 #if wxUSE_UNICODE_MSLU
         if ( sizeOfChar == sizeof(char) )
-            len = strlen(m_filenames[i].mb_str(*wxConvFileName));
+            len = strlen(wxConvFileName->cWC2MB(m_filenames[i]));
         else
 #endif // wxUSE_UNICODE_MSLU
             len = m_filenames[i].length();
@@ -1145,7 +1140,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
 #if wxUSE_UNICODE_MSLU
         if ( sizeOfChar == sizeof(char) )
         {
-            wxCharBuffer buf(m_filenames[i].mb_str(*wxConvFileName));
+            wxCharBuffer buf(wxConvFileName->cWC2MB(m_filenames[i]));
             len = strlen(buf);
             memcpy(pbuf, buf, len*sizeOfChar);
         }
@@ -1153,7 +1148,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
 #endif // wxUSE_UNICODE_MSLU
         {
             len = m_filenames[i].length();
-            memcpy(pbuf, m_filenames[i].t_str(), len*sizeOfChar);
+            memcpy(pbuf, m_filenames[i].c_str(), len*sizeOfChar);
         }
 
         pbuf += len*sizeOfChar;
@@ -1178,7 +1173,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
 // Work around bug in Wine headers
 #if defined(__WINE__) && defined(CFSTR_SHELLURL) && wxUSE_UNICODE
 #undef CFSTR_SHELLURL
-#define CFSTR_SHELLURL wxT("CFSTR_SHELLURL")
+#define CFSTR_SHELLURL _T("CFSTR_SHELLURL")
 #endif
 
 class CFSTR_SHELLURLDataObject : public wxCustomDataObject
@@ -1206,16 +1201,16 @@ public:
         return buffer;
     }
 
-    wxDECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject);
+    DECLARE_NO_COPY_CLASS(CFSTR_SHELLURLDataObject)
 };
 
 
 
 wxURLDataObject::wxURLDataObject(const wxString& url)
 {
-    // we support CF_TEXT and CFSTR_SHELLURL formats which are basically the
-    // same but it seems that some browsers only provide one of them so we have
-    // to support both
+    // we support CF_TEXT and CFSTR_SHELLURL formats which are basicly the same
+    // but it seems that some browsers only provide one of them so we have to
+    // support both
     Add(new wxTextDataObject);
     Add(new CFSTR_SHELLURLDataObject());
 
@@ -1255,7 +1250,7 @@ wxString wxURLDataObject::GetURL() const
         wxCharBuffer buf(len);
 
         if ( m_dataObjectLast->GetDataHere(buf.data()) )
-            url = buf;
+            url = wxString(buf, wxConvLibc);
 #else // !wxUSE_UNICODE
         // in ANSI build no conversion is necessary
         m_dataObjectLast->GetDataHere(wxStringBuffer(url, len));
@@ -1271,7 +1266,8 @@ wxString wxURLDataObject::GetURL() const
 
 void wxURLDataObject::SetURL(const wxString& url)
 {
-    wxCharBuffer urlMB(url.mb_str());
+    // CFSTR_SHELLURL is always supposed to be ANSI...
+    wxWX2MBbuf urlMB = (wxWX2MBbuf)url.mbc_str();
     if ( urlMB )
     {
         const size_t len = strlen(urlMB);
@@ -1297,7 +1293,7 @@ void wxURLDataObject::SetURL(const wxString& url)
 // private functions
 // ----------------------------------------------------------------------------
 
-#if wxDEBUG_LEVEL
+#ifdef __WXDEBUG__
 
 static const wxChar *GetTymedName(DWORD tymed)
 {
@@ -1338,10 +1334,12 @@ void wxDataObject::SetAutoDelete()
 {
 }
 
+#ifdef __WXDEBUG__
 const wxChar *wxDataObject::GetFormatName(wxDataFormat WXUNUSED(format))
 {
     return NULL;
 }
+#endif // __WXDEBUG__
 
 #endif // wxUSE_DATAOBJ
 
diff --git a/Source/3rd Party/wx/src/msw/ole/dropsrc.cpp b/Source/3rd Party/wx/src/msw/ole/dropsrc.cpp
index 3a61c0e56..4e2b4990f 100644
--- a/Source/3rd Party/wx/src/msw/ole/dropsrc.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/dropsrc.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.05.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: dropsrc.cpp 38920 2006-04-26 08:21:31Z ABX $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -64,7 +64,7 @@ private:
   DWORD         m_grfInitKeyState;  // button which started the d&d operation
   wxDropSource *m_pDropSource;      // pointer to C++ class we belong to
 
-  wxDECLARE_NO_COPY_CLASS(wxIDropSource);
+  DECLARE_NO_COPY_CLASS(wxIDropSource)
 };
 
 // ============================================================================
@@ -233,7 +233,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
 bool wxDropSource::GiveFeedback(wxDragResult effect)
 {
     const wxCursor& cursor = GetCursor(effect);
-    if ( cursor.IsOk() )
+    if ( cursor.Ok() )
     {
         ::SetCursor((HCURSOR)cursor.GetHCURSOR());
 
diff --git a/Source/3rd Party/wx/src/msw/ole/droptgt.cpp b/Source/3rd Party/wx/src/msw/ole/droptgt.cpp
index 8ce59f1fc..4d5c16ee1 100644
--- a/Source/3rd Party/wx/src/msw/ole/droptgt.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/droptgt.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: droptgt.cpp 54398 2008-06-28 01:40:42Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -82,7 +82,7 @@ protected:
     // get default drop effect for given keyboard flags
     static DWORD GetDropEffect(DWORD flags, wxDragResult defaultAction, DWORD pdwEffect);
 
-    wxDECLARE_NO_COPY_CLASS(wxIDropTarget);
+    DECLARE_NO_COPY_CLASS(wxIDropTarget)
 };
 
 // ----------------------------------------------------------------------------
@@ -99,11 +99,8 @@ static DWORD ConvertDragResultToEffect(wxDragResult result);
 // Name    : static wxIDropTarget::GetDropEffect
 // Purpose : determine the drop operation from keyboard/mouse state.
 // Returns : DWORD combined from DROPEFFECT_xxx constants
-// Params  : [in] DWORD flags                 kbd & mouse flags as passed to
-//                                            IDropTarget methods
-//           [in] wxDragResult defaultAction  the default action of the drop target
-//           [in] DWORD pdwEffect             the supported actions of the drop
-//                                            source passed to IDropTarget methods
+// Params  : [in] DWORD flags       kbd & mouse flags as passed to
+//                                  IDropTarget methods
 // Notes   : We do "move" normally and "copy" if <Ctrl> is pressed,
 //           which is the standard behaviour (currently there is no
 //           way to redefine it)
@@ -154,12 +151,10 @@ IMPLEMENT_IUNKNOWN_METHODS(wxIDropTarget)
 // Name    : wxIDropTarget::DragEnter
 // Purpose : Called when the mouse enters the window (dragging something)
 // Returns : S_OK
-// Params  : [in]    IDataObject *pIDataSource : source data
-//           [in]    DWORD        grfKeyState  : kbd & mouse state
-//           [in]    POINTL       pt           : mouse coordinates
-//           [in/out]DWORD       *pdwEffect    : effect flag
-//                                               In:  Supported effects
-//                                               Out: Resulting effect
+// Params  : [in] IDataObject *pIDataSource : source data
+//           [in] DWORD        grfKeyState  : kbd & mouse state
+//           [in] POINTL       pt           : mouse coordinates
+//           [out]DWORD       *pdwEffect    : effect flag
 // Notes   :
 STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
                                       DWORD        grfKeyState,
@@ -169,7 +164,7 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
     wxLogTrace(wxTRACE_OleCalls, wxT("IDropTarget::DragEnter"));
 
     wxASSERT_MSG( m_pIDataObject == NULL,
-                  wxT("drop target must have data object") );
+                  _T("drop target must have data object") );
 
     // show the list of formats supported by the source data object for the
     // debugging purposes, this is quite useful sometimes - please don't remove
@@ -180,7 +175,7 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
         FORMATETC fmt;
         while ( penumFmt->Next(1, &fmt, NULL) == S_OK )
         {
-            wxLogDebug(wxT("Drop source supports format %s"),
+            wxLogDebug(_T("Drop source supports format %s"),
                        wxDataObject::GetFormatName(fmt.cfFormat));
         }
 
@@ -188,20 +183,17 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
     }
     else
     {
-        wxLogLastError(wxT("IDataObject::EnumFormatEtc"));
+        wxLogLastError(_T("IDataObject::EnumFormatEtc"));
     }
 #endif // 0
 
-    if ( !m_pTarget->MSWIsAcceptedData(pIDataSource) ) {
+    if ( !m_pTarget->IsAcceptedData(pIDataSource) ) {
         // we don't accept this kind of data
         *pdwEffect = DROPEFFECT_NONE;
 
         return S_OK;
     }
 
-    // for use in OnEnter and OnDrag calls
-    m_pTarget->MSWSetDataSource(pIDataSource);
-
     // get hold of the data object
     m_pIDataObject = pIDataSource;
     m_pIDataObject->AddRef();
@@ -226,9 +218,9 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
 // Purpose : Indicates that the mouse was moved inside the window represented
 //           by this drop target.
 // Returns : S_OK
-// Params  : [in]    DWORD   grfKeyState     kbd & mouse state
-//           [in]    POINTL  pt              mouse coordinates
-//           [in/out]LPDWORD pdwEffect       current effect flag
+// Params  : [in] DWORD   grfKeyState     kbd & mouse state
+//           [in] POINTL  pt              mouse coordinates
+//           [out]LPDWORD pdwEffect       effect flag
 // Notes   : We're called on every WM_MOUSEMOVE, so this function should be
 //           very efficient.
 STDMETHODIMP wxIDropTarget::DragOver(DWORD   grfKeyState,
@@ -286,10 +278,10 @@ STDMETHODIMP wxIDropTarget::DragLeave()
 // Purpose : Instructs the drop target to paste data that was just now
 //           dropped on it.
 // Returns : S_OK
-// Params  : [in]    IDataObject *pIDataSource     the data to paste
-//           [in]    DWORD        grfKeyState      kbd & mouse state
-//           [in]    POINTL       pt               where the drop occurred?
-//           [in/out]DWORD       *pdwEffect        operation effect
+// Params  : [in] IDataObject *pIDataSource     the data to paste
+//           [in] DWORD        grfKeyState      kbd & mouse state
+//           [in] POINTL       pt               where the drop occurred?
+//           [ouy]DWORD       *pdwEffect        operation effect
 // Notes   :
 STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
                                  DWORD        grfKeyState,
@@ -311,7 +303,7 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
     // first ask the drop target if it wants data
     if ( m_pTarget->OnDrop(pt.x, pt.y) ) {
         // it does, so give it the data source
-        m_pTarget->MSWSetDataSource(pIDataSource);
+        m_pTarget->SetDataSource(pIDataSource);
 
         // and now it has the data
         wxDragResult rc = ConvertDragEffectToResult(
@@ -435,7 +427,7 @@ bool wxDropTarget::OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 // copy the data from the data source to the target data object
 bool wxDropTarget::GetData()
 {
-    wxDataFormat format = MSWGetSupportedFormat(m_pIDataSource);
+    wxDataFormat format = GetSupportedFormat(m_pIDataSource);
     if ( format == wxDF_INVALID ) {
         // this is strange because IsAcceptedData() succeeded previously!
         wxFAIL_MSG(wxT("strange - did supported formats list change?"));
@@ -477,27 +469,22 @@ bool wxDropTarget::GetData()
 // ----------------------------------------------------------------------------
 
 // we need a data source, so wxIDropTarget gives it to us using this function
-void wxDropTarget::MSWSetDataSource(IDataObject *pIDataSource)
+void wxDropTarget::SetDataSource(IDataObject *pIDataSource)
 {
     m_pIDataSource = pIDataSource;
 }
 
 // determine if we accept data of this type
-bool wxDropTarget::MSWIsAcceptedData(IDataObject *pIDataSource) const
+bool wxDropTarget::IsAcceptedData(IDataObject *pIDataSource) const
 {
-    return MSWGetSupportedFormat(pIDataSource) != wxDF_INVALID;
+    return GetSupportedFormat(pIDataSource) != wxDF_INVALID;
 }
 
 // ----------------------------------------------------------------------------
 // helper functions
 // ----------------------------------------------------------------------------
 
-wxDataFormat wxDropTarget::GetMatchingPair()
-{
-    return MSWGetSupportedFormat( m_pIDataSource );
-}
-
-wxDataFormat wxDropTarget::MSWGetSupportedFormat(IDataObject *pIDataSource) const
+wxDataFormat wxDropTarget::GetSupportedFormat(IDataObject *pIDataSource) const
 {
     // this strucutre describes a data of any type (first field will be
     // changing) being passed through global memory block.
diff --git a/Source/3rd Party/wx/src/msw/ole/oleutils.cpp b/Source/3rd Party/wx/src/msw/ole/oleutils.cpp
index 86c20c706..7fd2e5af1 100644
--- a/Source/3rd Party/wx/src/msw/ole/oleutils.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/oleutils.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.02.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: oleutils.cpp 59208 2009-02-28 19:34:30Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,6 @@
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx.h".
-#undef WIN32_LEAN_AND_MEAN
 #include "wx/wxprec.h"
 
 #if defined(__BORLANDC__)
@@ -43,6 +42,10 @@
     #define UUID_DEFINED
 #endif
 
+#ifdef __WXMSW__
+#include <Rpc.h>
+#endif
+
 // OLE
 #ifndef __WXWINCE__
 #include  "wx/msw/ole/uuid.h"
@@ -59,7 +62,7 @@
 // ============================================================================
 
 // return true if the iid is in the array
-WXDLLEXPORT bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
+bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
 {
   for ( size_t i = 0; i < nCount; i++ ) {
     if ( riid == *aIids[i] )
@@ -71,7 +74,16 @@ WXDLLEXPORT bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
 
 WXDLLEXPORT BSTR wxConvertStringToOle(const wxString& str)
 {
-    return wxBasicString(str).Get();
+/*
+    unsigned int len = strlen((const char*) str);
+    unsigned short* s = new unsigned short[len*2+2];
+    unsigned int i;
+    memset(s, 0, len*2+2);
+    for (i=0; i < len; i++)
+        s[i*2] = str[i];
+*/
+    wxBasicString bstr(str.mb_str());
+    return bstr.Get();
 }
 
 WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
@@ -104,401 +116,59 @@ WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
 // wxBasicString
 // ----------------------------------------------------------------------------
 
+// ctor takes an ANSI string and transforms it to Unicode
+wxBasicString::wxBasicString(const char *sz)
+{
+    Init(sz);
+}
+
+// ctor takes an ANSI or Unicode string and transforms it to Unicode
 wxBasicString::wxBasicString(const wxString& str)
 {
-    m_bstrBuf = SysAllocString(str.wc_str(*wxConvCurrent));
+#if wxUSE_UNICODE
+    m_wzBuf = new OLECHAR[str.length() + 1];
+    memcpy(m_wzBuf, str.c_str(), str.length()*2);
+    m_wzBuf[str.length()] = L'\0';
+#else
+    Init(str.c_str());
+#endif
 }
 
-wxBasicString::wxBasicString(const wxBasicString& src)
+// Takes an ANSI string and transforms it to Unicode
+void wxBasicString::Init(const char *sz)
 {
-    m_bstrBuf = src.Get();
-}
-
-wxBasicString& wxBasicString::operator=(const wxBasicString& src)
-{
-    SysReAllocString(&m_bstrBuf, src);
-    return *this;
+    // get the size of required buffer: MetroWerks and Cygwin crash if NULL is
+    // passed to mbstowcs()
+    UINT lenAnsi = strlen(sz);
+#if defined(__MWERKS__) || defined(__CYGWIN__)
+    UINT lenWide = lenAnsi * 2 ;
+#else
+    UINT lenWide = mbstowcs(NULL, sz, lenAnsi);
+#endif
+
+    if ( lenWide > 0 ) {
+        m_wzBuf = new OLECHAR[lenWide + 1];
+        mbstowcs(m_wzBuf, sz, lenAnsi);
+        m_wzBuf[lenWide] = L'\0';
+    }
+    else {
+        m_wzBuf = NULL;
+    }
 }
 
+// dtor frees memory
 wxBasicString::~wxBasicString()
 {
-    SysFreeString(m_bstrBuf);
+  delete [] m_wzBuf;
 }
 
-
-// ----------------------------------------------------------------------------
-// Convert variants
-// ----------------------------------------------------------------------------
-
-#if wxUSE_VARIANT
-
-namespace
-{
-
-// Helper class for creating and filling SAFEARRAY. To use it, call Create()
-// first, then SetElement() for each element and finally Detach() the SAFEARRAY
-// from it if you don't want it to be deleted when this class is.
-class wxSafeArrayHelper
-{
-public:
-    wxSafeArrayHelper();
-    ~wxSafeArrayHelper();
-
-    bool Create(VARTYPE vt, long count); // creates and locks the array
-
-    bool SetElement(size_t index, const wxVariant& variant);
-    bool SetElement(size_t index, const wxString& str);
-
-    SAFEARRAY* Detach(); // unlocks the array and gives up its ownership
-
-private:
-    void Unlock();
-
-    SAFEARRAY* m_array;
-};
-
-wxSafeArrayHelper::wxSafeArrayHelper()
-{
-    m_array = NULL;
-}
-
-wxSafeArrayHelper::~wxSafeArrayHelper()
-{
-    if ( m_array )
-    {
-        Unlock();
-        SafeArrayDestroy(m_array);
-    }
-}
-
-bool wxSafeArrayHelper::Create(VARTYPE vt, long count)
-{
-    SAFEARRAYBOUND saBound;
-
-    saBound.lLbound = 0;
-    saBound.cElements = count;
-    m_array = SafeArrayCreate(vt, 1, &saBound);
-    if ( !m_array )
-        return false;
-    return SUCCEEDED( SafeArrayLock(m_array) );
-}
-
-bool wxSafeArrayHelper::SetElement(size_t index, const wxVariant& variant)
-{
-    VARIANT* data = (VARIANT*)m_array->pvData;
-    return wxConvertVariantToOle(variant, data[index]);
-}
-
-bool wxSafeArrayHelper::SetElement(size_t index, const wxString& str)
-{
-    BSTR bstr = wxConvertStringToOle(str);
-
-    if ( !bstr && !str.empty() )
-    {
-        // BSTR can be NULL for empty strings but if the string was
-        // not empty, it means we failed to allocate memory for it.
-        return false;
-    }
-
-    BSTR* data = (BSTR*)m_array->pvData;
-    data[index] = bstr;
-    return true;
-}
-
-SAFEARRAY* wxSafeArrayHelper::Detach()
-{
-    Unlock();
-    SAFEARRAY* result = m_array;
-    m_array = NULL;
-    return result;
-}
-
-void wxSafeArrayHelper::Unlock()
-{
-    if ( m_array )
-        SafeArrayUnlock(m_array);
-}
-
-} // unnamed namespace
-
-
-WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
-{
-    VariantInit(&oleVariant);
-    if (variant.IsNull())
-    {
-        oleVariant.vt = VT_NULL;
-        return true;
-    }
-
-    wxString type(variant.GetType());
-
-
-    if (type == wxT("long"))
-    {
-        oleVariant.vt = VT_I4;
-        oleVariant.lVal = variant.GetLong() ;
-    }
-    // Original VC6 came with SDK too old to contain VARIANT::llVal declaration
-    // and there doesn't seem to be any way to test for it as Microsoft simply
-    // added it to the later version of oaidl.h without changing anything else.
-    // So assume it's not present for VC6, even though it might be if an
-    // updated SDK is used. In this case the user would need to disable this
-    // check himself.
-#if wxUSE_LONGLONG && !defined(__VISUALC6__)
-    else if (type == wxT("longlong"))
-    {
-        oleVariant.vt = VT_I8;
-        oleVariant.llVal = variant.GetLongLong().GetValue();
-    }
-#endif
-    else if (type == wxT("char"))
-    {
-        oleVariant.vt=VT_I1;            // Signed Char
-        oleVariant.cVal=variant.GetChar();
-    }
-    else if (type == wxT("double"))
-    {
-        oleVariant.vt = VT_R8;
-        oleVariant.dblVal = variant.GetDouble();
-    }
-    else if (type == wxT("bool"))
-    {
-        oleVariant.vt = VT_BOOL;
-        oleVariant.boolVal = variant.GetBool() ? VARIANT_TRUE : VARIANT_FALSE;
-    }
-    else if (type == wxT("string"))
-    {
-        wxString str( variant.GetString() );
-        oleVariant.vt = VT_BSTR;
-        oleVariant.bstrVal = wxConvertStringToOle(str);
-    }
-#if wxUSE_DATETIME
-    else if (type == wxT("datetime"))
-    {
-        wxDateTime date( variant.GetDateTime() );
-        oleVariant.vt = VT_DATE;
-
-        SYSTEMTIME st;
-        date.GetAsMSWSysTime(&st);
-
-        SystemTimeToVariantTime(&st, &oleVariant.date);
-    }
-#endif
-    else if (type == wxT("void*"))
-    {
-        oleVariant.vt = VT_DISPATCH;
-        oleVariant.pdispVal = (IDispatch*) variant.GetVoidPtr();
-    }
-    else if (type == wxT("list"))
-    {
-        wxSafeArrayHelper sah;
-
-        if (!sah.Create(VT_VARIANT, variant.GetCount()))
-            return false;
-
-        for (size_t i = 0; i < variant.GetCount(); i++)
-        {
-            if (!sah.SetElement(i, variant[i]))
-                return false;
-        }
-
-        oleVariant.vt = VT_VARIANT | VT_ARRAY;
-        oleVariant.parray = sah.Detach();
-    }
-    else if (type == wxT("arrstring"))
-    {
-        wxArrayString strings(variant.GetArrayString());
-        wxSafeArrayHelper sah;
-
-        if (!sah.Create(VT_BSTR, strings.GetCount()))
-            return false;
-
-        for (size_t i = 0; i < strings.GetCount(); i++)
-        {
-            if (!sah.SetElement(i, strings[i]))
-                return false;
-        }
-
-        oleVariant.vt = VT_BSTR | VT_ARRAY;
-        oleVariant.parray = sah.Detach();
-    }
-    else
-    {
-        oleVariant.vt = VT_NULL;
-        return false;
-    }
-    return true;
-}
-
-#ifndef VT_TYPEMASK
-#define VT_TYPEMASK 0xfff
-#endif
-
-WXDLLEXPORT bool
-wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant)
-{
-    bool ok = true;
-    if ( oleVariant.vt & VT_ARRAY )
-    {
-
-        // Compute the total number of elements in all array dimensions
-        int cElements = 1;
-        for ( int cDims = 0; cDims < oleVariant.parray->cDims; cDims++ )
-            cElements *= oleVariant.parray->rgsabound[cDims].cElements;
-
-        // Get a pointer to the data
-        void* pvdata;
-        HRESULT hr = SafeArrayAccessData(oleVariant.parray, &pvdata);
-        if ( FAILED(hr) )
-            return false;
-
-        switch (oleVariant.vt & VT_TYPEMASK)
-        {
-            case VT_VARIANT:
-                {
-                    variant.ClearList();
-                    VARIANTARG *variant_data=(VARIANTARG*)pvdata;
-                    for ( int i = 0; i < cElements; i++ )
-                    {
-                        VARIANTARG& oleElement = variant_data[i];
-                        wxVariant vElement;
-                        if ( !wxConvertOleToVariant(oleElement, vElement) )
-                        {
-                            ok = false;
-                            variant.ClearList();
-                            break;
-                        }
-
-                        variant.Append(vElement);
-                    }
-                }
-                break;
-
-            case VT_BSTR:
-                {
-                    wxArrayString strings;
-                    BSTR *string_val=(BSTR*)pvdata;
-                    for ( int i = 0; i < cElements; ++i )
-                    {
-                        wxString str=wxConvertStringFromOle(*string_val);
-                        strings.Add(str);
-                        ++string_val;
-                    }
-                    variant=strings;
-                }
-                break;
-
-            default:
-                wxLogDebug(wxT("unhandled VT_ARRAY type %x in wxConvertOleToVariant"),
-                           oleVariant.vt & VT_TYPEMASK);
-                variant = wxVariant();
-                ok = false;
-                break;
-        }
-
-        SafeArrayUnaccessData(oleVariant.parray);
-    }
-    else if ( oleVariant.vt & VT_BYREF )
-    {
-        switch ( oleVariant.vt & VT_TYPEMASK )
-        {
-            case VT_VARIANT:
-                {
-                    VARIANTARG& oleReference = *((LPVARIANT)oleVariant.byref);
-                    if (!wxConvertOleToVariant(oleReference,variant))
-                        return false;
-                    break;
-                }
-
-            default:
-                wxLogError(wxT("wxAutomationObject::ConvertOleToVariant: [as yet] unhandled reference %X"),
-                            oleVariant.vt);
-                return false;
-        }
-    }
-    else // simply type (not array or reference)
-    {
-        switch ( oleVariant.vt & VT_TYPEMASK )
-        {
-            case VT_BSTR:
-                {
-                    wxString str(wxConvertStringFromOle(oleVariant.bstrVal));
-                    variant = str;
-                }
-                break;
-
-            case VT_DATE:
-#if wxUSE_DATETIME
-                {
-                    SYSTEMTIME st;
-                    VariantTimeToSystemTime(oleVariant.date, &st);
-
-                    wxDateTime date;
-                    date.SetFromMSWSysTime(st);
-                    variant = date;
-                }
-#endif // wxUSE_DATETIME
-                break;
-
-                // See the comment before the __VISUALC6__ test above.
-#if wxUSE_LONGLONG && !defined(__VISUALC6__)
-            case VT_I8:
-                variant = wxLongLong(oleVariant.llVal);
-                break;
-#endif // wxUSE_LONGLONG
-
-            case VT_I4:
-                variant = (long) oleVariant.lVal;
-                break;
-
-            case VT_I2:
-                variant = (long) oleVariant.iVal;
-                break;
-
-            case VT_BOOL:
-                variant = oleVariant.boolVal != 0;
-                break;
-
-            case VT_R4:
-                variant = oleVariant.fltVal;
-                break;
-
-            case VT_R8:
-                variant = oleVariant.dblVal;
-                break;
-
-            case VT_DISPATCH:
-                variant = (void*) oleVariant.pdispVal;
-                break;
-
-            case VT_NULL:
-                variant.MakeNull();
-                break;
-
-            case VT_EMPTY:
-                break;    // Ignore Empty Variant, used only during destruction of objects
-
-            default:
-                wxLogError(wxT("wxAutomationObject::ConvertOleToVariant: Unknown variant value type %X -> %X"),
-                           oleVariant.vt,oleVariant.vt&VT_TYPEMASK);
-                return false;
-        }
-    }
-
-    return ok;
-}
-
-#endif // wxUSE_VARIANT
-
+#if wxUSE_DATAOBJ
 
 // ----------------------------------------------------------------------------
 // Debug support
 // ----------------------------------------------------------------------------
 
-#if wxUSE_DATAOBJ
-
-#if wxDEBUG_LEVEL && (( defined(__VISUALC__) && (__VISUALC__ > 1000) ))
+#if defined(__WXDEBUG__) && ( ( defined(__VISUALC__) && (__VISUALC__ > 1000) ) || defined(__MWERKS__) )
 static wxString GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID
@@ -508,14 +178,14 @@ static wxString GetIidName(REFIID riid)
   };
 
   // construct the table containing all known interfaces
-  #define ADD_KNOWN_IID(name) { &IID_I##name, wxT(#name) }
+  #define ADD_KNOWN_IID(name) { &IID_I##name, _T(#name) }
 
   static const KNOWN_IID aKnownIids[] = {
     ADD_KNOWN_IID(AdviseSink),
     ADD_KNOWN_IID(AdviseSink2),
     ADD_KNOWN_IID(BindCtx),
     ADD_KNOWN_IID(ClassFactory),
-#if ( !defined( __VISUALC__) || (__VISUALC__!=1010) )
+#if ( !defined( __VISUALC__) || (__VISUALC__!=1010) ) && !defined(__MWERKS__)
     ADD_KNOWN_IID(ContinueCallback),
     ADD_KNOWN_IID(EnumOleDocumentViews),
     ADD_KNOWN_IID(OleCommandTarget),
@@ -610,26 +280,47 @@ static wxString GetIidName(REFIID riid)
 #endif
 }
 
-WXDLLEXPORT void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)
+void wxLogQueryInterface(const wxChar *szInterface, REFIID riid)
 {
   wxLogTrace(wxTRACE_OleCalls, wxT("%s::QueryInterface (iid = %s)"),
              szInterface, GetIidName(riid).c_str());
 }
 
-WXDLLEXPORT void wxLogAddRef(const wxChar *szInterface, ULONG cRef)
+void wxLogAddRef(const wxChar *szInterface, ULONG cRef)
 {
   wxLogTrace(wxTRACE_OleCalls, wxT("After %s::AddRef: m_cRef = %d"), szInterface, cRef + 1);
 }
 
-WXDLLEXPORT void wxLogRelease(const wxChar *szInterface, ULONG cRef)
+void wxLogRelease(const wxChar *szInterface, ULONG cRef)
 {
   wxLogTrace(wxTRACE_OleCalls, wxT("After %s::Release: m_cRef = %d"), szInterface, cRef - 1);
 }
 
-#endif  // wxDEBUG_LEVEL
+#elif defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ <= 1000)
 
-#endif // wxUSE_DATAOBJ
+// For VC++ 4
+void wxLogQueryInterface(const char *szInterface, REFIID riid)
+{
+  wxLogTrace("%s::QueryInterface", szInterface);
+}
 
-#endif // __CYGWIN10__
+void wxLogAddRef(const char *szInterface, ULONG cRef)
+{
+  wxLogTrace("After %s::AddRef: m_cRef = %d", szInterface, cRef + 1);
+}
 
-#endif // wxUSE_OLE
+void wxLogRelease(const char *szInterface, ULONG cRef)
+{
+  wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1);
+}
+
+#endif  // __WXDEBUG__
+
+#endif
+  // wxUSE_DRAG_AND_DROP
+
+#endif
+  // __CYGWIN10__
+
+#endif
+  // wxUSE_OLE
diff --git a/Source/3rd Party/wx/src/msw/ole/uuid.cpp b/Source/3rd Party/wx/src/msw/ole/uuid.cpp
index c148cf403..516a543cb 100644
--- a/Source/3rd Party/wx/src/msw/ole/uuid.cpp	
+++ b/Source/3rd Party/wx/src/msw/ole/uuid.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.96
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: uuid.cpp 55125 2008-08-18 20:04:58Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -20,7 +20,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_OLE && (wxUSE_DRAG_AND_DROP || wxUSE_DATAOBJ)
+#if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapwin.h"
@@ -86,7 +86,12 @@ bool Uuid::operator==(const Uuid& uuid) const
 {
     // IsEqualGUID() returns BOOL and not bool so use an explicit comparison to
     // avoid MSVC warnings about int->bool conversion
-    return IsEqualGUID(m_uuid, uuid.m_uuid) != 0;
+    return IsEqualGUID(m_uuid, uuid.m_uuid) == TRUE;
+}
+
+bool Uuid::operator!=(const Uuid& uuid) const
+{
+    return !(*this == uuid);
 }
 
 // dtor
diff --git a/Source/3rd Party/wx/src/msw/ownerdrw.cpp b/Source/3rd Party/wx/src/msw/ownerdrw.cpp
index a087c7755..a51be09d8 100644
--- a/Source/3rd Party/wx/src/msw/ownerdrw.cpp	
+++ b/Source/3rd Party/wx/src/msw/ownerdrw.cpp	
@@ -2,9 +2,9 @@
 // Name:        src/msw/ownerdrw.cpp
 // Purpose:     implementation of wxOwnerDrawn class
 // Author:      Vadim Zeitlin
-// Modified by: Marcin Malich
+// Modified by:
 // Created:     13.11.97
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: ownerdrw.cpp 60531 2009-05-06 16:04:20Z PC $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,135 +16,472 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_OWNER_DRAWN
-
-#include "wx/ownerdrw.h"
-#include "wx/msw/dc.h"
-#include "wx/msw/private.h"
-#include "wx/msw/private/dc.h"
-#include "wx/msw/wrapcctl.h"            // for HIMAGELIST
-
-#ifndef DSS_HIDEPREFIX
-#define DSS_HIDEPREFIX  0x0200
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/msw/private.h"
+    #include "wx/font.h"
+    #include "wx/bitmap.h"
+    #include "wx/image.h"
+    #include "wx/dcmemory.h"
+    #include "wx/menu.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/menuitem.h"
+    #include "wx/module.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// constants for base class
-// ----------------------------------------------------------------------------
+#include "wx/ownerdrw.h"
+#include "wx/fontutil.h"
 
-int wxOwnerDrawnBase::ms_defaultMargin = 3;
+#if wxUSE_OWNER_DRAWN
+
+#ifndef SPI_GETKEYBOARDCUES
+#define SPI_GETKEYBOARDCUES 0x100A
+#endif
+
+class wxMSWSystemMenuFontModule : public wxModule
+{
+public:
+
+    virtual bool OnInit()
+    {
+        ms_systemMenuFont = new wxFont;
+
+#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK)
+        NONCLIENTMETRICS nm;
+        nm.cbSize = sizeof(NONCLIENTMETRICS);
+        if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS,0,&nm,0) )
+        {
+#if WINVER >= 0x0600
+            // a new field has been added to NONCLIENTMETRICS under Vista, so
+            // the call to SystemParametersInfo() fails if we use the struct
+            // size incorporating this new value on an older system -- retry
+            // without it
+            nm.cbSize -= sizeof(int);
+            if ( !::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &nm, 0) )
+#endif // WINVER >= 0x0600
+            {
+                // maybe we should initialize the struct with some defaults?
+                wxLogLastError(_T("SystemParametersInfo(SPI_GETNONCLIENTMETRICS)"));
+            }
+        }
+
+        ms_systemMenuButtonWidth = nm.iMenuHeight;
+        ms_systemMenuHeight = nm.iMenuHeight;
+
+        // create menu font
+        wxNativeFontInfo info;
+        memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT));
+        ms_systemMenuFont->Create(info);
+
+        if (SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &ms_showCues, 0) == 0)
+            ms_showCues = true;
+#endif
+
+        return true;
+    }
+
+    virtual void OnExit()
+    {
+        delete ms_systemMenuFont;
+        ms_systemMenuFont = NULL;
+    }
+
+    static wxFont* ms_systemMenuFont;
+    static int ms_systemMenuButtonWidth;   // windows clean install default
+    static int ms_systemMenuHeight;        // windows clean install default
+    static bool ms_showCues;
+private:
+    DECLARE_DYNAMIC_CLASS(wxMSWSystemMenuFontModule)
+};
+
+// these static variables are from the wxMSWSystemMenuFontModule object
+// and reflect the system settings returned by the Win32 API's
+// SystemParametersInfo() call.
+
+wxFont* wxMSWSystemMenuFontModule::ms_systemMenuFont = NULL;
+int wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth = 18;   // windows clean install default
+int wxMSWSystemMenuFontModule::ms_systemMenuHeight = 18;        // windows clean install default
+bool wxMSWSystemMenuFontModule::ms_showCues = true;
+
+IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
+
+
+// VC++ 6 gives a warning here:
+//
+//      return type for 'OwnerDrawnSet_wxImplementation_HashTable::iterator::
+//      operator ->' is 'class wxOwnerDrawn ** ' (ie; not a UDT or reference to
+//      a UDT.  Will produce errors if applied using infix notation.
+//
+// shut it down
+#if defined __VISUALC__ && __VISUALC__ <= 1300
+    #if __VISUALC__ >= 1200
+        #pragma warning(push)
+        #define POP_WARNINGS
+    #endif
+    #pragma warning(disable: 4284)
+#endif
+
+#include "wx/hashset.h"
+WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet);
+
+#ifdef POP_WARNINGS
+    #pragma warning(pop)
+#endif
 
 // ============================================================================
 // implementation of wxOwnerDrawn class
 // ============================================================================
 
-// draw the item
-bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc,
-                              wxODAction, wxODStatus stat)
+// ctor
+// ----
+wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
+                           bool bCheckable,
+                           bool bMenuItem)
+            : m_strName(str)
 {
-    // we do nothing if item isn't ownerdrawn
-    if ( !IsOwnerDrawn() )
-        return true;
-
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
-    HDC hdc = GetHdcOf(*impl);
-
-    RECT rect;
-    wxCopyRectToRECT(rc, rect);
-
+    if ( ms_nDefaultMarginWidth == 0 )
     {
-        // set the font and colors
-        wxFont font;
-        GetFontToUse(font);
+       ms_nDefaultMarginWidth = ::GetSystemMetrics(SM_CXMENUCHECK) +
+                                wxSystemSettings::GetMetric(wxSYS_EDGE_X);
+       ms_nLastMarginWidth = ms_nDefaultMarginWidth;
+    }
 
-        wxColour colText, colBack;
-        GetColourToUse(stat, colText, colBack);
+    m_bCheckable   = bCheckable;
+    m_bOwnerDrawn  = false;
+    m_isMenuItem   = bMenuItem;
+    m_nHeight      = 0;
+    m_nMarginWidth = ms_nLastMarginWidth;
+    m_nMinHeight   = wxMSWSystemMenuFontModule::ms_systemMenuHeight;
+}
 
-        SelectInHDC selFont(hdc, GetHfontOf(font));
+wxOwnerDrawn::~wxOwnerDrawn()
+{
+}
 
-        wxMSWImpl::wxTextColoursChanger textCol(hdc, colText, colBack);
-        wxMSWImpl::wxBkModeChanger bkMode(hdc, wxBRUSHSTYLE_TRANSPARENT);
+bool wxOwnerDrawn::IsMenuItem() const
+{
+    return m_isMenuItem;
+}
 
 
-        AutoHBRUSH hbr(wxColourToPalRGB(colBack));
-        SelectInHDC selBrush(hdc, hbr);
+// these items will be set during the first invocation of the c'tor,
+// because the values will be determined by checking the system settings,
+// which is a chunk of code
+size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 0;
+size_t wxOwnerDrawn::ms_nLastMarginWidth = 0;
 
-        ::FillRect(hdc, &rect, hbr);
 
-        // using native API because it recognizes '&'
+// drawing
+// -------
 
-        wxString text = GetName();
+wxFont wxOwnerDrawn::GetFontToUse() const
+{
+    wxFont font = m_font;
+    if ( !font.Ok() )
+    {
+        if ( IsMenuItem() )
+            font = *wxMSWSystemMenuFontModule::ms_systemMenuFont;
 
-        SIZE sizeRect;
-        ::GetTextExtentPoint32(hdc, text.c_str(), text.length(), &sizeRect);
+        if ( !font.Ok() )
+            font = *wxNORMAL_FONT;
+    }
 
-        int flags = DST_PREFIXTEXT;
-        if ( (stat & wxODDisabled) && !(stat & wxODSelected) )
-            flags |= DSS_DISABLED;
+    return font;
+}
 
-        if ( (stat & wxODHidePrefix) )
-            flags |= DSS_HIDEPREFIX;
+// get size of the item
+// The item size includes the menu string, the accel string,
+// the bitmap and size for a submenu expansion arrow...
+bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
+{
+    if ( IsOwnerDrawn() )
+    {
+        wxMemoryDC dc;
 
-        int x = rc.x + GetMarginWidth();
-        int y = rc.y + (rc.GetHeight() - sizeRect.cy) / 2;
-        int cx = rc.GetWidth() - GetMarginWidth();
-        int cy = sizeRect.cy;
+        wxString str = wxStripMenuCodes(m_strName);
 
-        ::DrawState(hdc, NULL, NULL, wxMSW_CONV_LPARAM(text),
-                    text.length(), x, y, cx, cy, flags);
+        // if we have a valid accel string, then pad out
+        // the menu string so that the menu and accel string are not
+        // placed on top of each other.
+        if ( !m_strAccel.empty() )
+        {
+            str.Pad(str.length()%8);
+            str += m_strAccel;
+        }
 
-    } // reset to default the font, colors and brush
+        dc.SetFont(GetFontToUse());
 
-    if (stat & wxODHasFocus)
-        ::DrawFocusRect(hdc, &rect);
+        dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
+
+        // add space at the end of the menu for the submenu expansion arrow
+        // this will also allow offsetting the accel string from the right edge
+        *pwidth += GetMarginWidth() + 16;
+    }
+    else // don't draw the text, just the bitmap (if any)
+    {
+        *pwidth =
+        *pheight = 0;
+    }
+
+    // increase size to accommodate bigger bitmaps if necessary
+    if (m_bmpChecked.Ok())
+    {
+        // Is BMP height larger then text height?
+        size_t adjustedHeight = m_bmpChecked.GetHeight() +
+                                  2*wxSystemSettings::GetMetric(wxSYS_EDGE_Y);
+        if (*pheight < adjustedHeight)
+            *pheight = adjustedHeight;
+
+        const size_t widthBmp = m_bmpChecked.GetWidth();
+        if ( IsOwnerDrawn() )
+        {
+            // widen the margin to fit the bitmap if necessary
+            if ((size_t)GetMarginWidth() < widthBmp)
+                SetMarginWidth(widthBmp);
+        }
+        else // we must allocate enough space for the bitmap
+        {
+            *pwidth += widthBmp;
+        }
+    }
+
+    // add a 4-pixel separator, otherwise menus look cluttered
+    *pwidth += 4;
+
+    // make sure that this item is at least as tall as the system menu height
+    if ( *pheight < m_nMinHeight )
+      *pheight = m_nMinHeight;
+
+    // remember height for use in OnDrawItem
+    m_nHeight = *pheight;
 
     return true;
 }
 
-// ----------------------------------------------------------------------------
-// global helper functions implemented here
-// ----------------------------------------------------------------------------
-
-BOOL wxDrawStateBitmap(HDC hDC, HBITMAP hBitmap, int x, int y, UINT uState)
+// draw the item
+bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
+                              const wxRect& rc,
+                              wxODAction,
+                              wxODStatus st)
 {
-    // determine size of bitmap image
-    BITMAP bmp;
-    if ( !::GetObject(hBitmap, sizeof(BITMAP), &bmp) )
-        return FALSE;
+    // this flag determines whether or not an edge will
+    // be drawn around the bitmap. In most "windows classic"
+    // applications, a 1-pixel highlight edge is drawn around
+    // the bitmap of an item when it is selected.  However,
+    // with the new "luna" theme, no edge is drawn around
+    // the bitmap because the background is white (this applies
+    // only to "non-XP style" menus w/ bitmaps --
+    // see IE 6 menus for an example)
 
-    BOOL result;
+    bool draw_bitmap_edge = true;
 
-    switch ( uState )
+    // set the colors
+    // --------------
+    DWORD colBack, colText;
+    if ( st & wxODSelected )
     {
-        case wxDSB_NORMAL:
-        case wxDSB_SELECTED:
-            {
-                // uses image list functions to draw
-                //  - normal bitmap with support transparency
-                //    (image list internally create mask etc.)
-                //  - blend bitmap with the background colour
-                //    (like default selected items)
-                HIMAGELIST hIml = ::ImageList_Create(bmp.bmWidth, bmp.bmHeight,
-                                                     ILC_COLOR32 | ILC_MASK, 1, 1);
-                ::ImageList_Add(hIml, hBitmap, NULL);
-                UINT fStyle = uState == wxDSB_SELECTED ? ILD_SELECTED : ILD_NORMAL;
-                result = ::ImageList_Draw(hIml, 0, hDC, x, y, fStyle);
-                ::ImageList_Destroy(hIml);
-            }
-            break;
-
-        case wxDSB_DISABLED:
-            result = ::DrawState(hDC, NULL, NULL, (LPARAM)hBitmap, 0, x, y,
-                                 bmp.bmWidth, bmp.bmHeight,
-                                 DST_BITMAP | DSS_DISABLED);
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("DrawStateBitmap: unknown wxDSBStates value") );
-            result = FALSE;
+        colBack = GetSysColor(COLOR_HIGHLIGHT);
+        if (!(st & wxODDisabled))
+        {
+            colText = GetSysColor(COLOR_HIGHLIGHTTEXT);
+        }
+        else
+        {
+            colText = GetSysColor(COLOR_GRAYTEXT);
+        }
+    }
+    else
+    {
+        // fall back to default colors if none explicitly specified
+        colBack = m_colBack.Ok() ? wxColourToPalRGB(m_colBack)
+                                 : GetSysColor(COLOR_MENU);
+        colText = m_colText.Ok() ? wxColourToPalRGB(m_colText)
+                                 : GetSysColor(COLOR_MENUTEXT);
     }
 
-    return result;
+    if ( IsOwnerDrawn() )
+    {
+        // don't draw an edge around the bitmap, if background is white ...
+        DWORD menu_bg_color = GetSysColor(COLOR_MENU);
+        if (    ( GetRValue( menu_bg_color ) >= 0xf0 &&
+                  GetGValue( menu_bg_color ) >= 0xf0 &&
+                  GetBValue( menu_bg_color ) >= 0xf0 )
+          )
+        {
+            draw_bitmap_edge = false;
+        }
+    }
+    else // edge doesn't look well with default Windows drawing
+    {
+        draw_bitmap_edge = false;
+    }
+
+
+    HDC hdc = GetHdcOf(dc);
+    COLORREF colOldText = ::SetTextColor(hdc, colText),
+             colOldBack = ::SetBkColor(hdc, colBack);
+
+    // *2, as in wxSYS_EDGE_Y
+    int margin = GetMarginWidth() + 2 * wxSystemSettings::GetMetric(wxSYS_EDGE_X);
+
+    // select the font and draw the text
+    // ---------------------------------
+
+
+    // determine where to draw and leave space for a check-mark.
+    // + 1 pixel to separate the edge from the highlight rectangle
+    int xText = rc.x + margin + 1;
+
+
+    // using native API because it recognizes '&'
+    if ( IsOwnerDrawn() )
+    {
+        int nPrevMode = SetBkMode(hdc, TRANSPARENT);
+        AutoHBRUSH hbr(colBack);
+        SelectInHDC selBrush(hdc, hbr);
+
+        RECT rectFill = { rc.GetLeft(), rc.GetTop(),
+                            rc.GetRight() + 1, rc.GetBottom() + 1 };
+
+        if ( (st & wxODSelected) && m_bmpChecked.Ok() && draw_bitmap_edge )
+        {
+            // only draw the highlight under the text, not under
+            // the bitmap or checkmark
+            rectFill.left = xText;
+        }
+
+        FillRect(hdc, &rectFill, hbr);
+
+        // use default font if no font set
+        wxFont fontToUse = GetFontToUse();
+        SelectInHDC selFont(hdc, GetHfontOf(fontToUse));
+
+        wxString strMenuText = m_strName.BeforeFirst('\t');
+
+        xText += 3; // separate text from the highlight rectangle
+
+        SIZE sizeRect;
+        ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.length(), &sizeRect);
+        ::DrawState(hdc, NULL, NULL,
+                    (LPARAM)strMenuText.c_str(), strMenuText.length(),
+                    xText, rc.y + (int) ((rc.GetHeight()-sizeRect.cy)/2.0), // centre text vertically
+                    rc.GetWidth()-margin, sizeRect.cy,
+                    DST_PREFIXTEXT |
+                    (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0) |
+                    (((st & wxODHidePrefix) && !wxMSWSystemMenuFontModule::ms_showCues) ? 512 : 0)); // 512 == DSS_HIDEPREFIX
+
+        // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO
+        // as the last parameter in DrawState() (at least with Windows98). So we have
+        // to take care of right alignment ourselves.
+        if ( !m_strAccel.empty() )
+        {
+            int accel_width, accel_height;
+            dc.GetTextExtent(m_strAccel, &accel_width, &accel_height);
+            // right align accel string with right edge of menu ( offset by the
+            // margin width )
+            ::DrawState(hdc, NULL, NULL,
+                    (LPARAM)m_strAccel.c_str(), m_strAccel.length(),
+                    rc.GetWidth()-16-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
+                    0, 0,
+                    DST_TEXT |
+                    (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
+        }
+
+        (void)SetBkMode(hdc, nPrevMode);
+    }
+
+
+    // draw the bitmap
+    // ---------------
+    if ( IsCheckable() && !m_bmpChecked.Ok() )
+    {
+        if ( st & wxODChecked )
+        {
+            // what goes on: DrawFrameControl creates a b/w mask,
+            // then we copy it to screen to have right colors
+
+            // first create a monochrome bitmap in a memory DC
+            HDC hdcMem = CreateCompatibleDC(hdc);
+            HBITMAP hbmpCheck = CreateBitmap(margin, m_nHeight, 1, 1, 0);
+            SelectObject(hdcMem, hbmpCheck);
+
+            // then draw a check mark into it
+            RECT rect = { 0, 0, margin, m_nHeight };
+            if ( m_nHeight > 0 )
+            {
+                ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
+            }
+
+            // finally copy it to screen DC and clean up
+            BitBlt(hdc, rc.x, rc.y, margin, m_nHeight, hdcMem, 0, 0, SRCCOPY);
+
+            DeleteDC(hdcMem);
+            DeleteObject(hbmpCheck);
+        }
+    }
+    else
+    {
+        wxBitmap bmp;
+
+        if ( st & wxODDisabled )
+        {
+            bmp = GetDisabledBitmap();
+        }
+
+        if ( !bmp.Ok() )
+        {
+            // for not checkable bitmaps we should always use unchecked one
+            // because their checked bitmap is not set
+            bmp = GetBitmap(!IsCheckable() || (st & wxODChecked));
+
+#if wxUSE_IMAGE
+            if ( bmp.Ok() && st & wxODDisabled )
+            {
+                // we need to grey out the bitmap as we don't have any specific
+                // disabled bitmap
+                wxImage imgGrey = bmp.ConvertToImage().ConvertToGreyscale();
+                if ( imgGrey.Ok() )
+                    bmp = wxBitmap(imgGrey);
+            }
+#endif // wxUSE_IMAGE
+        }
+
+        if ( bmp.Ok() )
+        {
+            wxMemoryDC dcMem(&dc);
+            dcMem.SelectObjectAsSource(bmp);
+
+            // center bitmap
+            int nBmpWidth = bmp.GetWidth(),
+                nBmpHeight = bmp.GetHeight();
+
+            // there should be enough space!
+            wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
+
+            int heightDiff = m_nHeight - nBmpHeight;
+            dc.Blit(rc.x + (margin - nBmpWidth) / 2,
+                    rc.y + heightDiff / 2,
+                    nBmpWidth, nBmpHeight,
+                    &dcMem, 0, 0, wxCOPY, true /* use mask */);
+
+            if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge )
+            {
+                RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
+                                 rc.GetLeft() + margin,
+                                 rc.GetTop() + m_nHeight };
+                SetBkColor(hdc, colBack);
+
+                DrawEdge(hdc, &rectBmp, BDR_RAISEDINNER, BF_RECT);
+            }
+        }
+    }
+
+    ::SetTextColor(hdc, colOldText);
+    ::SetBkColor(hdc, colOldBack);
+
+    return true;
 }
 
+
 #endif // wxUSE_OWNER_DRAWN
diff --git a/Source/3rd Party/wx/src/msw/palette.cpp b/Source/3rd Party/wx/src/msw/palette.cpp
index dca3e995c..b509835d8 100644
--- a/Source/3rd Party/wx/src/msw/palette.cpp	
+++ b/Source/3rd Party/wx/src/msw/palette.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: palette.cpp 67095 2011-03-01 00:02:52Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -20,143 +20,120 @@
 
 #include "wx/palette.h"
 
+#ifndef WX_PRECOMP
+#endif
+
 #include "wx/msw/private.h"
 
-// ============================================================================
-// wxPaletteRefData
-// ============================================================================
-
-class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
-{
-public:
-    wxPaletteRefData() { Init(); }
-
-    wxPaletteRefData(int n,
-                     const unsigned char *red,
-                     const unsigned char *green,
-                     const unsigned char *blue)
-    {
-        Init();
-
-        LOGPALETTE *pPal = Alloc(n);
-        if ( !pPal )
-            return;
-
-        for ( int i = 0; i < n; i++ )
-        {
-            pPal->palPalEntry[i].peRed = red[i];
-            pPal->palPalEntry[i].peGreen = green[i];
-            pPal->palPalEntry[i].peBlue = blue[i];
-            pPal->palPalEntry[i].peFlags = 0;
-        }
-
-        m_hPalette = ::CreatePalette(pPal);
-        free(pPal);
-    }
-
-    wxPaletteRefData(const wxPaletteRefData& data)
-        : wxGDIRefData()
-    {
-        Init();
-
-        const UINT n = data.GetEntries();
-        if ( !n )
-            return;
-
-        LOGPALETTE *pPal = Alloc(n);
-        if ( !pPal )
-            return;
-
-        if ( ::GetPaletteEntries(data.m_hPalette, 0, n, pPal->palPalEntry) )
-            m_hPalette = ::CreatePalette(pPal);
-
-        free(pPal);
-    }
-
-    virtual ~wxPaletteRefData()
-    {
-        if ( m_hPalette )
-            ::DeleteObject(m_hPalette);
-    }
-
-    virtual bool IsOk() const { return m_hPalette != 0; }
-
-    UINT GetEntries() const
-    {
-        return ::GetPaletteEntries(m_hPalette, 0, 0, NULL);
-    }
-
-private:
-    // caller must free() the pointer
-    static LOGPALETTE *Alloc(UINT numEntries)
-    {
-        LOGPALETTE *pPal = (LOGPALETTE *)
-            malloc(sizeof(LOGPALETTE) + numEntries*sizeof(PALETTEENTRY));
-        if ( pPal )
-        {
-            pPal->palVersion = 0x300;
-            pPal->palNumEntries = numEntries;
-        }
-
-        return pPal;
-    }
-
-    void Init() { m_hPalette = 0; }
-
-    HPALETTE m_hPalette;
-
-    friend class WXDLLIMPEXP_FWD_CORE wxPalette;
-};
-
-// ============================================================================
-// wxPalette
-// ============================================================================
-
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 
-#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
+/*
+ * Palette
+ *
+ */
 
-bool wxPalette::Create(int n,
-                       const unsigned char *red,
-                       const unsigned char *green,
-                       const unsigned char *blue)
+wxPaletteRefData::wxPaletteRefData(void)
 {
-    m_refData = new wxPaletteRefData(n, red, green, blue);
-
-    return IsOk();
+    m_hPalette = 0;
 }
 
-wxGDIRefData *wxPalette::CreateGDIRefData() const
+wxPaletteRefData::~wxPaletteRefData(void)
 {
-    return new wxPaletteRefData;
+    if ( m_hPalette )
+        ::DeleteObject((HPALETTE) m_hPalette);
 }
 
-wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *data) const
+wxPalette::wxPalette()
 {
-    return new wxPaletteRefData(*static_cast<const wxPaletteRefData *>(data));
+}
+
+wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
+{
+    Create(n, red, green, blue);
+}
+
+wxPalette::~wxPalette(void)
+{
+//    FreeResource(true);
+}
+
+bool wxPalette::FreeResource(bool WXUNUSED(force))
+{
+    if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
+    {
+        DeleteObject((HPALETTE)M_PALETTEDATA->m_hPalette);
+    }
+    
+    return true;
 }
 
 int wxPalette::GetColoursCount() const
 {
-    return IsOk() ? M_PALETTEDATA->GetEntries() : 0;
+    if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
+    {
+        return ::GetPaletteEntries((HPALETTE) M_PALETTEDATA->m_hPalette, 0, 0, NULL );
+    }
+    
+    return 0;
 }
 
-int wxPalette::GetPixel(unsigned char red,
-                        unsigned char green,
-                        unsigned char blue) const
+bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
+    // The number of colours in LOGPALETTE is a WORD so we can't create
+    // palettes with more entries than USHRT_MAX.
+    if ( n < 0 || n > 65535 )
+        return false;
+
+    UnRef();
+
+#if defined(__WXMICROWIN__)
+
+    return false;
+
+#else
+
+    m_refData = new wxPaletteRefData;
+
+    NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
+                          (WORD)n * sizeof(PALETTEENTRY));
+    if (!npPal)
+        return false;
+
+    npPal->palVersion = 0x300;
+    npPal->palNumEntries = (WORD)n;
+
+    int i;
+    for (i = 0; i < n; i ++)
+    {
+        npPal->palPalEntry[i].peRed = red[i];
+        npPal->palPalEntry[i].peGreen = green[i];
+        npPal->palPalEntry[i].peBlue = blue[i];
+        npPal->palPalEntry[i].peFlags = 0;
+    }
+    M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
+    LocalFree((HANDLE)npPal);
+    return true;
+
+#endif
+}
+
+int wxPalette::GetPixel(unsigned char red, unsigned char green, unsigned char blue) const
+{
+#ifdef __WXMICROWIN__
+    return wxNOT_FOUND;
+#else
     if ( !m_refData )
         return wxNOT_FOUND;
 
-    return ::GetNearestPaletteIndex(M_PALETTEDATA->m_hPalette,
-                                    PALETTERGB(red, green, blue));
+    return ::GetNearestPaletteIndex((HPALETTE) M_PALETTEDATA->m_hPalette, PALETTERGB(red, green, blue));
+#endif
 }
 
-bool wxPalette::GetRGB(int index,
-                       unsigned char *red,
-                       unsigned char *green,
-                       unsigned char *blue) const
+bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const
 {
+#ifdef __WXMICROWIN__
+    return false;
+#else
     if ( !m_refData )
         return false;
 
@@ -164,26 +141,24 @@ bool wxPalette::GetRGB(int index,
         return false;
 
     PALETTEENTRY entry;
-    if ( !::GetPaletteEntries(M_PALETTEDATA->m_hPalette, index, 1, &entry) )
+    if (::GetPaletteEntries((HPALETTE) M_PALETTEDATA->m_hPalette, index, 1, &entry))
+    {
+        *red = entry.peRed;
+        *green = entry.peGreen;
+        *blue = entry.peBlue;
+        return true;
+    }
+    else
         return false;
-
-    *red = entry.peRed;
-    *green = entry.peGreen;
-    *blue = entry.peBlue;
-
-    return true;
-}
-
-WXHPALETTE wxPalette::GetHPALETTE() const
-{
-    return M_PALETTEDATA ? (WXHPALETTE)M_PALETTEDATA->m_hPalette : 0;
+#endif
 }
 
 void wxPalette::SetHPALETTE(WXHPALETTE pal)
 {
-    AllocExclusive();
+    if ( !m_refData )
+        m_refData = new wxPaletteRefData;
 
-    M_PALETTEDATA->m_hPalette = (HPALETTE)pal;
+    M_PALETTEDATA->m_hPalette = pal;
 }
 
 #endif // wxUSE_PALETTE
diff --git a/Source/3rd Party/wx/src/msw/panel.cpp b/Source/3rd Party/wx/src/msw/panel.cpp
deleted file mode 100644
index 750ebc10d..000000000
--- a/Source/3rd Party/wx/src/msw/panel.cpp	
+++ /dev/null
@@ -1,47 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/panel.cpp
-// Purpose:     Implementation of wxMSW-specific wxPanel class.
-// Author:      Vadim Zeitlin
-// Created:     2011-03-18
-// RCS-ID:      $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/panel.h"
-#endif // WX_PRECOMP
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-bool wxPanel::HasTransparentBackground()
-{
-    for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
-    {
-        if ( win->MSWHasInheritableBackground() )
-            return true;
-
-        if ( win->IsTopLevel() )
-            break;
-    }
-
-    return false;
-}
-
diff --git a/Source/3rd Party/wx/src/msw/pen.cpp b/Source/3rd Party/wx/src/msw/pen.cpp
index 3817963a6..657a3edde 100644
--- a/Source/3rd Party/wx/src/msw/pen.cpp	
+++ b/Source/3rd Party/wx/src/msw/pen.cpp	
@@ -2,21 +2,13 @@
 // Name:        src/msw/pen.cpp
 // Purpose:     wxPen
 // Author:      Julian Smart
-// Modified by: Vadim Zeitlin: refactored wxPen code to wxPenRefData
+// Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: pen.cpp 44818 2007-03-15 09:40:24Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -27,140 +19,27 @@
 #include "wx/pen.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/bitmap.h"
+    #include <stdio.h>
+    #include "wx/list.h"
     #include "wx/utils.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/msw/private.h"
 
-#define M_PENDATA ((wxPenRefData*)m_refData)
+static int wx2msPenStyle(int wx_style);
 
-// Win32 has ExtCreatePen() but WinCE doesn't
-#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-    #define wxHAVE_EXT_CREATE_PEN
-#endif
-
-// ----------------------------------------------------------------------------
-// wxPenRefData: contains information about an HPEN and its handle
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxPenRefData : public wxGDIRefData
-{
-public:
-    // ctors and dtor
-    // --------------
-
-    wxPenRefData();
-    wxPenRefData(const wxPenRefData& data);
-    wxPenRefData(const wxColour& col, int width, wxPenStyle style);
-    wxPenRefData(const wxBitmap& stipple, int width);
-    virtual ~wxPenRefData();
-
-    bool operator==(const wxPenRefData& data) const
-    {
-        // we intentionally don't compare m_hPen fields here
-        return m_style == data.m_style &&
-               m_width == data.m_width &&
-               m_join == data.m_join &&
-               m_cap == data.m_cap &&
-               m_colour == data.m_colour &&
-               (m_style != wxPENSTYLE_STIPPLE || m_stipple.IsSameAs(data.m_stipple)) &&
-               (m_style != wxPENSTYLE_USER_DASH ||
-                (m_nbDash == data.m_nbDash &&
-                    memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
-    }
-
-
-    // accessors and setters
-    // ---------------------
-
-    wxColour& GetColour() const { return const_cast<wxColour&>(m_colour); }
-    int GetWidth() const { return m_width; }
-    wxPenStyle GetStyle() const { return m_style; }
-    wxPenJoin GetJoin() const { return m_join; }
-    wxPenCap GetCap() const { return m_cap; }
-    wxDash* GetDash() const { return m_dash; }
-    int GetDashCount() const { return m_nbDash; }
-    wxBitmap* GetStipple() const { return const_cast<wxBitmap *>(&m_stipple); }
-
-    void SetColour(const wxColour& col) { Free(); m_colour = col; }
-    void SetWidth(int width) { Free(); m_width = width; }
-    void SetStyle(wxPenStyle style) { Free(); m_style = style; }
-    void SetStipple(const wxBitmap& stipple)
-    {
-        Free();
-
-        m_style = wxPENSTYLE_STIPPLE;
-        m_stipple = stipple;
-    }
-
-    void SetDashes(int nb_dashes, const wxDash *dash)
-    {
-        Free();
-
-        m_nbDash = nb_dashes;
-        m_dash = const_cast<wxDash *>(dash);
-    }
-
-    void SetJoin(wxPenJoin join) { Free(); m_join = join; }
-    void SetCap(wxPenCap cap) { Free(); m_cap = cap; }
-
-
-    // HPEN management
-    // ---------------
-
-    // create the HPEN if we don't have it yet
-    bool Alloc();
-
-    // get the HPEN creating it on demand
-    WXHPEN GetHPEN() const;
-
-    // return true if we have a valid HPEN
-    bool HasHPEN() const { return m_hPen != 0; }
-
-    // return true if we had a valid handle before, false otherwise
-    bool Free();
-
-private:
-    // initialize the fields which have reasonable default values
-    //
-    // doesn't initialize m_width and m_style which must be initialize in ctor
-    void Init()
-    {
-        m_join = wxJOIN_ROUND;
-        m_cap = wxCAP_ROUND;
-        m_nbDash = 0;
-        m_dash = NULL;
-        m_hPen = 0;
-    }
-
-    int           m_width;
-    wxPenStyle    m_style;
-    wxPenJoin     m_join;
-    wxPenCap      m_cap;
-    wxBitmap      m_stipple;
-    int           m_nbDash;
-    wxDash *      m_dash;
-    wxColour      m_colour;
-    HPEN          m_hPen;
-
-    wxDECLARE_NO_ASSIGN_CLASS(wxPenRefData);
-};
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxPenRefData ctors/dtor
-// ----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 wxPenRefData::wxPenRefData()
 {
-    Init();
-
-    m_style = wxPENSTYLE_SOLID;
-    m_width = 1;
+  m_style = wxSOLID;
+  m_width = 1;
+  m_join = wxJOIN_ROUND ;
+  m_cap = wxCAP_ROUND ;
+  m_nbDash = 0 ;
+  m_dash = (wxDash*)NULL;
+  m_hPen = 0;
 }
 
 wxPenRefData::wxPenRefData(const wxPenRefData& data)
@@ -176,428 +55,333 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data)
     m_hPen = 0;
 }
 
-wxPenRefData::wxPenRefData(const wxColour& col, int width, wxPenStyle style)
-{
-    Init();
-
-    m_style = style;
-    m_width = width;
-
-    m_colour = col;
-}
-
-wxPenRefData::wxPenRefData(const wxBitmap& stipple, int width)
-{
-    Init();
-
-    m_style = wxPENSTYLE_STIPPLE;
-    m_width = width;
-
-    m_stipple = stipple;
-}
-
 wxPenRefData::~wxPenRefData()
 {
     if ( m_hPen )
-        ::DeleteObject(m_hPen);
+        ::DeleteObject((HPEN) m_hPen);
 }
 
-// ----------------------------------------------------------------------------
-// wxPenRefData HPEN management
-// ----------------------------------------------------------------------------
+// Pens
 
-static int ConvertPenStyle(wxPenStyle style)
+wxPen::wxPen()
 {
-    switch ( style )
-    {
-        case wxPENSTYLE_SHORT_DASH:
-        case wxPENSTYLE_LONG_DASH:
-            return PS_DASH;
-
-        case wxPENSTYLE_TRANSPARENT:
-            return PS_NULL;
-
-        default:
-            wxFAIL_MSG( wxT("unknown pen style") );
-            // fall through
-
-#ifdef wxHAVE_EXT_CREATE_PEN
-        case wxPENSTYLE_DOT:
-            return PS_DOT;
-
-        case wxPENSTYLE_DOT_DASH:
-            return PS_DASHDOT;
-
-        case wxPENSTYLE_USER_DASH:
-            return PS_USERSTYLE;
-
-        case wxPENSTYLE_STIPPLE:
-        case wxPENSTYLE_BDIAGONAL_HATCH:
-        case wxPENSTYLE_CROSSDIAG_HATCH:
-        case wxPENSTYLE_FDIAGONAL_HATCH:
-        case wxPENSTYLE_CROSS_HATCH:
-        case wxPENSTYLE_HORIZONTAL_HATCH:
-        case wxPENSTYLE_VERTICAL_HATCH:
-        case wxPENSTYLE_SOLID:
-#endif // wxHAVE_EXT_CREATE_PEN
-
-            return PS_SOLID;
-    }
 }
 
-#ifdef wxHAVE_EXT_CREATE_PEN
-
-static int ConvertJoinStyle(wxPenJoin join)
+wxPen::~wxPen()
 {
-    switch( join )
-    {
-        case wxJOIN_BEVEL:
-            return PS_JOIN_BEVEL;
-
-        case wxJOIN_MITER:
-            return PS_JOIN_MITER;
-
-        default:
-            wxFAIL_MSG( wxT("unknown pen join style") );
-            // fall through
-
-        case wxJOIN_ROUND:
-            return PS_JOIN_ROUND;
-    }
 }
 
-static int ConvertCapStyle(wxPenCap cap)
+// Should implement Create
+wxPen::wxPen(const wxColour& col, int Width, int Style)
 {
-    switch ( cap )
-    {
-        case wxCAP_PROJECTING:
-            return PS_ENDCAP_SQUARE;
+  m_refData = new wxPenRefData;
 
-        case wxCAP_BUTT:
-            return PS_ENDCAP_FLAT;
+  M_PENDATA->m_colour = col;
+//  M_PENDATA->m_stipple = NULL;
+  M_PENDATA->m_width = Width;
+  M_PENDATA->m_style = Style;
+  M_PENDATA->m_join = wxJOIN_ROUND ;
+  M_PENDATA->m_cap = wxCAP_ROUND ;
+  M_PENDATA->m_nbDash = 0 ;
+  M_PENDATA->m_dash = (wxDash*)NULL;
+  M_PENDATA->m_hPen = 0 ;
 
-        default:
-            wxFAIL_MSG( wxT("unknown pen cap style") );
-            // fall through
-
-        case wxCAP_ROUND:
-            return PS_ENDCAP_ROUND;
-    }
+  RealizeResource();
 }
 
-#endif // wxHAVE_EXT_CREATE_PEN
-
-bool wxPenRefData::Alloc()
+wxPen::wxPen(const wxBitmap& stipple, int Width)
 {
-   if ( m_hPen )
-       return false;
+    m_refData = new wxPenRefData;
 
-   if ( m_style == wxPENSTYLE_TRANSPARENT )
-   {
-       m_hPen = (HPEN)::GetStockObject(NULL_PEN);
-       return true;
-   }
+//  M_PENDATA->m_colour = col;
+    M_PENDATA->m_stipple = stipple;
+    M_PENDATA->m_width = Width;
+    M_PENDATA->m_style = wxSTIPPLE;
+    M_PENDATA->m_join = wxJOIN_ROUND ;
+    M_PENDATA->m_cap = wxCAP_ROUND ;
+    M_PENDATA->m_nbDash = 0 ;
+    M_PENDATA->m_dash = (wxDash*)NULL;
+    M_PENDATA->m_hPen = 0 ;
 
-   const COLORREF col = m_colour.GetPixel();
-
-#ifdef wxHAVE_EXT_CREATE_PEN
-   // Only NT can display dashed or dotted lines with width > 1
-   static const int os = wxGetOsVersion();
-   if ( os != wxOS_WINDOWS_NT &&
-           (m_style == wxPENSTYLE_DOT ||
-            m_style == wxPENSTYLE_LONG_DASH ||
-            m_style == wxPENSTYLE_SHORT_DASH ||
-            m_style == wxPENSTYLE_DOT_DASH ||
-            m_style == wxPENSTYLE_USER_DASH) &&
-            m_width > 1 )
-   {
-       m_width = 1;
-   }
-
-   // check if it's a standard kind of pen which can be created with just
-   // CreatePen()
-   if ( m_join == wxJOIN_ROUND &&
-            m_cap == wxCAP_ROUND &&
-                m_style != wxPENSTYLE_USER_DASH &&
-                    m_style != wxPENSTYLE_STIPPLE &&
-                        (m_width <= 1 || m_style == wxPENSTYLE_SOLID) )
-#endif // !wxHAVE_EXT_CREATE_PEN
-   {
-       m_hPen = ::CreatePen(ConvertPenStyle(m_style), m_width, col);
-   }
-#ifdef wxHAVE_EXT_CREATE_PEN
-   else // need to use ExtCreatePen()
-   {
-       DWORD styleMSW = PS_GEOMETRIC |
-                        ConvertPenStyle(m_style) |
-                        ConvertJoinStyle(m_join) |
-                        ConvertCapStyle(m_cap);
-
-       LOGBRUSH lb;
-       switch( m_style )
-       {
-           case wxPENSTYLE_STIPPLE:
-               lb.lbStyle = BS_PATTERN;
-               lb.lbHatch = wxPtrToUInt(m_stipple.GetHBITMAP());
-               break;
-
-           case wxPENSTYLE_BDIAGONAL_HATCH:
-               lb.lbStyle = BS_HATCHED;
-               lb.lbHatch = HS_BDIAGONAL;
-               break;
-
-           case wxPENSTYLE_CROSSDIAG_HATCH:
-               lb.lbStyle = BS_HATCHED;
-               lb.lbHatch = HS_DIAGCROSS;
-               break;
-
-           case wxPENSTYLE_FDIAGONAL_HATCH:
-               lb.lbStyle = BS_HATCHED;
-               lb.lbHatch = HS_FDIAGONAL;
-               break;
-
-           case wxPENSTYLE_CROSS_HATCH:
-               lb.lbStyle = BS_HATCHED;
-               lb.lbHatch = HS_CROSS;
-               break;
-
-           case wxPENSTYLE_HORIZONTAL_HATCH:
-               lb.lbStyle = BS_HATCHED;
-               lb.lbHatch = HS_HORIZONTAL;
-               break;
-
-           case wxPENSTYLE_VERTICAL_HATCH:
-               lb.lbStyle = BS_HATCHED;
-               lb.lbHatch = HS_VERTICAL;
-               break;
-
-           default:
-               lb.lbStyle = BS_SOLID;
-               // this should be unnecessary (it's unused) but suppresses the
-               // Purify messages about uninitialized memory read
-               lb.lbHatch = 0;
-               break;
-       }
-
-       lb.lbColor = col;
-
-       DWORD *dash;
-       if ( m_style == wxPENSTYLE_USER_DASH && m_nbDash && m_dash )
-       {
-           dash = new DWORD[m_nbDash];
-           int rw = m_width > 1 ? m_width : 1;
-           for ( int i = 0; i < m_nbDash; i++ )
-               dash[i] = m_dash[i] * rw;
-       }
-       else
-       {
-           dash = NULL;
-       }
-
-       m_hPen = ::ExtCreatePen(styleMSW, m_width, &lb, m_nbDash, (LPDWORD)dash);
-
-       delete [] dash;
-   }
-#endif // wxHAVE_EXT_CREATE_PEN
-
-   return m_hPen != 0;
-}
-
-bool wxPenRefData::Free()
-{
-    if ( !m_hPen )
-        return false;
-
-    ::DeleteObject(m_hPen);
-    m_hPen = 0;
-
-    return true;
-}
-
-WXHPEN wxPenRefData::GetHPEN() const
-{
-    if ( !m_hPen )
-        const_cast<wxPenRefData *>(this)->Alloc();
-
-    return (WXHPEN)m_hPen;
-}
-
-// ----------------------------------------------------------------------------
-// wxPen
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
-
-wxPen::wxPen(const wxColour& col, int width, wxPenStyle style)
-{
-    m_refData = new wxPenRefData(col, width, style);
-}
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-wxPen::wxPen(const wxColour& colour, int width, int style)
-{
-    m_refData = new wxPenRefData(colour, width, (wxPenStyle)style);
-}
-#endif
-
-wxPen::wxPen(const wxBitmap& stipple, int width)
-{
-    m_refData = new wxPenRefData(stipple, width);
-}
-
-bool wxPen::operator==(const wxPen& pen) const
-{
-    const wxPenRefData *
-        penData = static_cast<const wxPenRefData *>(pen.m_refData);
-
-    // an invalid pen is only equal to another invalid pen
-    return m_refData ? penData && *M_PENDATA == *penData : !penData;
+    RealizeResource();
 }
 
 bool wxPen::RealizeResource()
 {
-    return M_PENDATA && M_PENDATA->Alloc();
+   if ( !M_PENDATA || M_PENDATA->m_hPen )
+       return false;
+
+   if (M_PENDATA->m_style==wxTRANSPARENT)
+   {
+       M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN);
+       return true;
+   }
+
+   static const int os = wxGetOsVersion();
+   COLORREF ms_colour = M_PENDATA->m_colour.GetPixel();
+
+   // Join style, Cap style, Pen Stippling
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+   // Only NT can display dashed or dotted lines with width > 1
+   if ( os != wxOS_WINDOWS_NT &&
+           (M_PENDATA->m_style == wxDOT ||
+            M_PENDATA->m_style == wxLONG_DASH ||
+            M_PENDATA->m_style == wxSHORT_DASH ||
+            M_PENDATA->m_style == wxDOT_DASH ||
+            M_PENDATA->m_style == wxUSER_DASH) &&
+            M_PENDATA->m_width > 1 )
+   {
+       M_PENDATA->m_width = 1;
+   }
+
+   if (M_PENDATA->m_join==wxJOIN_ROUND        &&
+       M_PENDATA->m_cap==wxCAP_ROUND          &&
+       M_PENDATA->m_style!=wxUSER_DASH        &&
+       M_PENDATA->m_style!=wxSTIPPLE          &&
+       M_PENDATA->m_width <= 1)
+   {
+       M_PENDATA->m_hPen =
+         (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
+                             M_PENDATA->m_width,
+                             ms_colour );
+   }
+   else
+   {
+       DWORD ms_style = PS_GEOMETRIC | wx2msPenStyle(M_PENDATA->m_style);
+
+       switch(M_PENDATA->m_join)
+       {
+           case wxJOIN_BEVEL: ms_style |= PS_JOIN_BEVEL; break;
+           case wxJOIN_MITER: ms_style |= PS_JOIN_MITER; break;
+           default:
+           case wxJOIN_ROUND: ms_style |= PS_JOIN_ROUND; break;
+       }
+
+       switch(M_PENDATA->m_cap)
+       {
+           case wxCAP_PROJECTING: ms_style |= PS_ENDCAP_SQUARE;  break;
+           case wxCAP_BUTT:       ms_style |= PS_ENDCAP_FLAT;    break;
+           default:
+           case wxCAP_ROUND:      ms_style |= PS_ENDCAP_ROUND;   break;
+       }
+
+       LOGBRUSH logb;
+
+       switch(M_PENDATA->m_style)
+       {
+           case wxSTIPPLE:
+               logb.lbStyle = BS_PATTERN ;
+               if (M_PENDATA->m_stipple.Ok())
+                   logb.lbHatch = (LONG)M_PENDATA->m_stipple.GetHBITMAP();
+               else
+                   logb.lbHatch = (LONG)0;
+               break;
+           case wxBDIAGONAL_HATCH:
+               logb.lbStyle = BS_HATCHED;
+               logb.lbHatch = HS_BDIAGONAL;
+               break;
+           case wxCROSSDIAG_HATCH:
+               logb.lbStyle = BS_HATCHED;
+               logb.lbHatch = HS_DIAGCROSS;
+               break;
+           case wxFDIAGONAL_HATCH:
+               logb.lbStyle = BS_HATCHED;
+               logb.lbHatch = HS_FDIAGONAL;
+               break;
+           case wxCROSS_HATCH:
+               logb.lbStyle = BS_HATCHED;
+               logb.lbHatch = HS_CROSS;
+               break;
+           case wxHORIZONTAL_HATCH:
+               logb.lbStyle = BS_HATCHED;
+               logb.lbHatch = HS_HORIZONTAL;
+               break;
+           case wxVERTICAL_HATCH:
+               logb.lbStyle = BS_HATCHED;
+               logb.lbHatch = HS_VERTICAL;
+               break;
+           default:
+               logb.lbStyle = BS_SOLID;
+#ifdef __WXDEBUG__
+               // this should be unnecessary (it's unused) but suppresses the Purify
+               // messages about uninitialized memory read
+               logb.lbHatch = 0;
+#endif
+               break;
+       }
+
+       logb.lbColor = ms_colour;
+
+       wxMSWDash *real_dash;
+       if (M_PENDATA->m_style==wxUSER_DASH && M_PENDATA->m_nbDash && M_PENDATA->m_dash)
+       {
+           real_dash = new wxMSWDash[M_PENDATA->m_nbDash];
+           int rw = M_PENDATA->m_width > 1 ? M_PENDATA->m_width : 1;
+           for ( int i = 0; i < M_PENDATA->m_nbDash; i++ )
+               real_dash[i] = M_PENDATA->m_dash[i] * rw;
+       }
+       else
+       {
+           real_dash = (wxMSWDash*)NULL;
+       }
+
+       M_PENDATA->m_hPen =
+         (WXHPEN) ExtCreatePen( ms_style,
+                                M_PENDATA->m_width,
+                                &logb,
+                                M_PENDATA->m_style == wxUSER_DASH
+                                  ? M_PENDATA->m_nbDash
+                                  : 0,
+                                (LPDWORD)real_dash );
+
+       delete [] real_dash;
+   }
+#else // WinCE
+   M_PENDATA->m_hPen =
+     (WXHPEN) CreatePen( wx2msPenStyle(M_PENDATA->m_style),
+                         M_PENDATA->m_width,
+                         ms_colour );
+#endif // !WinCE/WinCE
+
+   return true;
 }
 
 WXHANDLE wxPen::GetResourceHandle() const
 {
-    return M_PENDATA ? M_PENDATA->GetHPEN() : 0;
+    if ( !M_PENDATA )
+        return 0;
+    else
+        return (WXHANDLE)M_PENDATA->m_hPen;
 }
 
 bool wxPen::FreeResource(bool WXUNUSED(force))
 {
-    return M_PENDATA && M_PENDATA->Free();
+    if (M_PENDATA && (M_PENDATA->m_hPen != 0))
+    {
+        DeleteObject((HPEN) M_PENDATA->m_hPen);
+        M_PENDATA->m_hPen = 0;
+        return true;
+    }
+    else return false;
 }
 
 bool wxPen::IsFree() const
 {
-    return M_PENDATA && !M_PENDATA->HasHPEN();
+    return (M_PENDATA && M_PENDATA->m_hPen == 0);
 }
 
-wxGDIRefData* wxPen::CreateGDIRefData() const
+void wxPen::Unshare()
 {
-    return new wxPenRefData;
-}
-
-wxGDIRefData* wxPen::CloneGDIRefData(const wxGDIRefData* data) const
-{
-    return new wxPenRefData(*static_cast<const wxPenRefData*>(data));
+    // Don't change shared data
+    if (!m_refData)
+    {
+        m_refData = new wxPenRefData();
+    }
+    else
+    {
+        wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
+        UnRef();
+        m_refData = ref;
+    }
 }
 
 void wxPen::SetColour(const wxColour& col)
 {
-    AllocExclusive();
+    Unshare();
 
-    M_PENDATA->SetColour(col);
+    M_PENDATA->m_colour = col;
+
+    RealizeResource();
 }
 
 void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
 {
-    SetColour(wxColour(r, g, b));
+    Unshare();
+
+    M_PENDATA->m_colour.Set(r, g, b);
+
+    RealizeResource();
 }
 
-void wxPen::SetWidth(int width)
+void wxPen::SetWidth(int Width)
 {
-    AllocExclusive();
+    Unshare();
 
-    M_PENDATA->SetWidth(width);
+    M_PENDATA->m_width = Width;
+
+    RealizeResource();
 }
 
-void wxPen::SetStyle(wxPenStyle style)
+void wxPen::SetStyle(int Style)
 {
-    AllocExclusive();
+    Unshare();
 
-    M_PENDATA->SetStyle(style);
+    M_PENDATA->m_style = Style;
+
+    RealizeResource();
 }
 
-void wxPen::SetStipple(const wxBitmap& stipple)
+void wxPen::SetStipple(const wxBitmap& Stipple)
 {
-    AllocExclusive();
+    Unshare();
 
-    M_PENDATA->SetStipple(stipple);
+    M_PENDATA->m_stipple = Stipple;
+    M_PENDATA->m_style = wxSTIPPLE;
+
+    RealizeResource();
 }
 
-void wxPen::SetDashes(int nb_dashes, const wxDash *dash)
+void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
 {
-    AllocExclusive();
+    Unshare();
 
-    M_PENDATA->SetDashes(nb_dashes, dash);
+    M_PENDATA->m_nbDash = nb_dashes;
+    M_PENDATA->m_dash = (wxDash *)Dash;
+
+    RealizeResource();
 }
 
-void wxPen::SetJoin(wxPenJoin join)
+void wxPen::SetJoin(int Join)
 {
-    AllocExclusive();
+    Unshare();
 
-    M_PENDATA->SetJoin(join);
+    M_PENDATA->m_join = Join;
+
+    RealizeResource();
 }
 
-void wxPen::SetCap(wxPenCap cap)
+void wxPen::SetCap(int Cap)
 {
-    AllocExclusive();
+    Unshare();
 
-    M_PENDATA->SetCap(cap);
+    M_PENDATA->m_cap = Cap;
+
+    RealizeResource();
 }
 
-wxColour wxPen::GetColour() const
+int wx2msPenStyle(int wx_style)
 {
-    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+    switch (wx_style)
+    {
+        case wxDOT:
+            return PS_DOT;
 
-    return M_PENDATA->GetColour();
-}
-
-int wxPen::GetWidth() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
-
-    return M_PENDATA->GetWidth();
-}
-
-wxPenStyle wxPen::GetStyle() const
-{
-    wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") );
-
-    return M_PENDATA->GetStyle();
-}
-
-wxPenJoin wxPen::GetJoin() const
-{
-    wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") );
-
-    return M_PENDATA->GetJoin();
-}
-
-wxPenCap wxPen::GetCap() const
-{
-    wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") );
-
-    return M_PENDATA->GetCap();
-}
-
-int wxPen::GetDashes(wxDash** ptr) const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
-
-    *ptr = M_PENDATA->GetDash();
-    return M_PENDATA->GetDashCount();
-}
-
-wxDash* wxPen::GetDash() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
-
-    return m_refData ? M_PENDATA->GetDash() : NULL;
-}
-
-int wxPen::GetDashCount() const
-{
-    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );
-
-    return m_refData ? M_PENDATA->GetDashCount() : 0;
-}
-
-wxBitmap* wxPen::GetStipple() const
-{
-    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );
-
-    return m_refData ? M_PENDATA->GetStipple() : NULL;
+        case wxDOT_DASH:
+            return PS_DASHDOT;
+
+        case wxSHORT_DASH:
+        case wxLONG_DASH:
+            return PS_DASH;
+
+        case wxTRANSPARENT:
+            return PS_NULL;
+
+        case wxUSER_DASH:
+            return PS_USERSTYLE;
+    }
+#else
+    wxUnusedVar(wx_style);
+#endif
+    return PS_SOLID;
 }
diff --git a/Source/3rd Party/wx/src/msw/popupwin.cpp b/Source/3rd Party/wx/src/msw/popupwin.cpp
index ad8433835..7cc3e5fb4 100644
--- a/Source/3rd Party/wx/src/msw/popupwin.cpp	
+++ b/Source/3rd Party/wx/src/msw/popupwin.cpp	
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.05.02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: popupwin.cpp 38791 2006-04-18 09:56:17Z ABX $
 // Copyright:   (c) 2002 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -100,7 +100,7 @@ bool wxPopupWindow::Show(bool show)
         // raise to top of z order
         if (!::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
         {
-            wxLogLastError(wxT("SetWindowPos"));
+            wxLogLastError(_T("SetWindowPos"));
         }
 
         // and set it as the foreground window so the mouse can be captured
diff --git a/Source/3rd Party/wx/src/msw/power.cpp b/Source/3rd Party/wx/src/msw/power.cpp
index 4dc20b914..df3f5ba3b 100644
--- a/Source/3rd Party/wx/src/msw/power.cpp	
+++ b/Source/3rd Party/wx/src/msw/power.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2006-05-27
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: power.cpp 48517 2007-09-02 20:24:14Z JS $
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -48,7 +48,7 @@ static inline bool wxGetPowerStatus(SYSTEM_POWER_STATUS *sps)
 {
     if ( !::GetSystemPowerStatus(sps) )
     {
-        wxLogLastError(wxT("GetSystemPowerStatus()"));
+        wxLogLastError(_T("GetSystemPowerStatus()"));
         return false;
     }
 
@@ -76,7 +76,7 @@ wxPowerType wxGetPowerType()
                 return wxPOWER_SOCKET;
 
             default:
-                wxLogDebug(wxT("Unknown ACLineStatus=%u"), sps.ACLineStatus);
+                wxLogDebug(_T("Unknown ACLineStatus=%u"), sps.ACLineStatus);
             case 255:
                 break;
         }
diff --git a/Source/3rd Party/wx/src/msw/printdlg.cpp b/Source/3rd Party/wx/src/msw/printdlg.cpp
index c48b34e98..af2a5fe90 100644
--- a/Source/3rd Party/wx/src/msw/printdlg.cpp	
+++ b/Source/3rd Party/wx/src/msw/printdlg.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: printdlg.cpp 62959 2009-12-21 10:04:31Z CE $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,7 +18,6 @@
 // ---------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx.h".
-#undef WIN32_LEAN_AND_MEAN
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -36,13 +35,22 @@
     #include "wx/cmndata.h"
 #endif
 
+#ifdef __WXMSW__
+#include <WinSpool.h>
+#include <CdErr.h>
+#endif
+
 #include "wx/printdlg.h"
 #include "wx/msw/printdlg.h"
-#include "wx/msw/dcprint.h"
 #include "wx/paper.h"
+#include "wx/msgdlg.h"
 
 #include <stdlib.h>
 
+#ifndef __WIN32__
+    #include <print.h>
+#endif
+
 // smart pointer like class using OpenPrinter and ClosePrinter
 class WinPrinter
 {
@@ -66,7 +74,7 @@ public:
     BOOL Open( const wxString& printerName, LPPRINTER_DEFAULTS pDefault=(LPPRINTER_DEFAULTS)NULL )
     {
         Close();
-        return OpenPrinter( wxMSW_CONV_LPTSTR(printerName), &m_hPrinter, pDefault );
+        return OpenPrinter( (LPTSTR)printerName.wx_str(), &m_hPrinter, pDefault );
     }
 
     BOOL Close()
@@ -86,16 +94,14 @@ public:
 private:
     HANDLE m_hPrinter;
 
-    wxDECLARE_NO_COPY_CLASS(WinPrinter);
+    DECLARE_NO_COPY_CLASS(WinPrinter)
 };
 
-
 //----------------------------------------------------------------------------
 // wxWindowsPrintNativeData
 //----------------------------------------------------------------------------
 
-#if wxDEBUG_LEVEL
-
+#ifdef __WXDEBUG__
 static wxString wxGetPrintDlgError()
 {
     DWORD err = CommDlgExtendedError();
@@ -128,14 +134,9 @@ static wxString wxGetPrintDlgError()
     }
     return msg;
 }
+#endif
 
-#endif // wxDEBUG_LEVEL
-
-
-static HGLOBAL
-wxCreateDevNames(const wxString& driverName,
-                 const wxString& printerName,
-                 const wxString& portName)
+static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
 {
     HGLOBAL hDev = NULL;
     // if (!driverName.empty() && !printerName.empty() && !portName.empty())
@@ -172,18 +173,19 @@ IMPLEMENT_CLASS(wxWindowsPrintNativeData, wxPrintNativeDataBase)
 
 wxWindowsPrintNativeData::wxWindowsPrintNativeData()
 {
-    m_devMode = NULL;
-    m_devNames = NULL;
+    m_devMode = (void*) NULL;
+    m_devNames = (void*) NULL;
     m_customWindowsPaperId = 0;
 }
 
 wxWindowsPrintNativeData::~wxWindowsPrintNativeData()
 {
-    if ( m_devMode )
-        ::GlobalFree(static_cast<HGLOBAL>(m_devMode));
-
-    if ( m_devNames )
-        ::GlobalFree(static_cast<HGLOBAL>(m_devNames));
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    if ( hDevMode )
+        GlobalFree(hDevMode);
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+    if ( hDevNames )
+        GlobalFree(hDevNames);
 }
 
 bool wxWindowsPrintNativeData::IsOk() const
@@ -193,222 +195,232 @@ bool wxWindowsPrintNativeData::IsOk() const
 
 bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
 {
-    if ( !m_devMode )
-        InitializeDevMode();
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
 
-    if ( !m_devMode )
+    if (!hDevMode)
+    {
         return false;
-
-    GlobalPtrLock lockDevMode(m_devMode);
-
-    LPDEVMODE devMode = static_cast<LPDEVMODE>(lockDevMode.Get());
-
-    //// Orientation
-    if (devMode->dmFields & DM_ORIENTATION)
-        data.SetOrientation( (wxPrintOrientation)devMode->dmOrientation );
-
-    //// Collation
-    if (devMode->dmFields & DM_COLLATE)
-    {
-        if (devMode->dmCollate == DMCOLLATE_TRUE)
-            data.SetCollate( true );
-        else
-            data.SetCollate( false );
     }
+    else
+    {
+        LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
 
-    //// Number of copies
-    if (devMode->dmFields & DM_COPIES)
-        data.SetNoCopies( devMode->dmCopies );
+        //// Orientation
+        if (devMode->dmFields & DM_ORIENTATION)
+            data.SetOrientation( devMode->dmOrientation );
 
-    //// Bin
-    if (devMode->dmFields & DM_DEFAULTSOURCE) {
-        switch (devMode->dmDefaultSource) {
-            case DMBIN_ONLYONE        : data.SetBin(wxPRINTBIN_ONLYONE       ); break;
-            case DMBIN_LOWER          : data.SetBin(wxPRINTBIN_LOWER         ); break;
-            case DMBIN_MIDDLE         : data.SetBin(wxPRINTBIN_MIDDLE        ); break;
-            case DMBIN_MANUAL         : data.SetBin(wxPRINTBIN_MANUAL        ); break;
-            case DMBIN_ENVELOPE       : data.SetBin(wxPRINTBIN_ENVELOPE      ); break;
-            case DMBIN_ENVMANUAL      : data.SetBin(wxPRINTBIN_ENVMANUAL     ); break;
-            case DMBIN_AUTO           : data.SetBin(wxPRINTBIN_AUTO          ); break;
-            case DMBIN_TRACTOR        : data.SetBin(wxPRINTBIN_TRACTOR       ); break;
-            case DMBIN_SMALLFMT       : data.SetBin(wxPRINTBIN_SMALLFMT      ); break;
-            case DMBIN_LARGEFMT       : data.SetBin(wxPRINTBIN_LARGEFMT      ); break;
-            case DMBIN_LARGECAPACITY  : data.SetBin(wxPRINTBIN_LARGECAPACITY ); break;
-            case DMBIN_CASSETTE       : data.SetBin(wxPRINTBIN_CASSETTE      ); break;
-            case DMBIN_FORMSOURCE     : data.SetBin(wxPRINTBIN_FORMSOURCE    ); break;
-            default:
-                if (devMode->dmDefaultSource >= DMBIN_USER)
-                    data.SetBin((wxPrintBin)((devMode->dmDefaultSource)-DMBIN_USER+(int)wxPRINTBIN_USER));
-                else
-                    data.SetBin(wxPRINTBIN_DEFAULT);
+        //// Collation
+        if (devMode->dmFields & DM_COLLATE)
+        {
+            if (devMode->dmCollate == DMCOLLATE_TRUE)
+                data.SetCollate( true );
+            else
+                data.SetCollate( false );
         }
-    } else {
-        data.SetBin(wxPRINTBIN_DEFAULT);
-    }
-    if (devMode->dmFields & DM_MEDIATYPE)
-    {
-        wxASSERT( (int)devMode->dmMediaType != wxPRINTMEDIA_DEFAULT );
-        data.SetMedia(devMode->dmMediaType);
-    }
-    //// Printer name
-    if (devMode->dmDeviceName[0] != 0)
-        // This syntax fixes a crash when using VS 7.1
-        data.SetPrinterName( wxString(devMode->dmDeviceName, CCHDEVICENAME) );
 
-    //// Colour
-    if (devMode->dmFields & DM_COLOR)
-    {
-        if (devMode->dmColor == DMCOLOR_COLOR)
+        //// Number of copies
+        if (devMode->dmFields & DM_COPIES)
+            data.SetNoCopies( devMode->dmCopies );
+
+        //// Bin
+        if (devMode->dmFields & DM_DEFAULTSOURCE) {
+            switch (devMode->dmDefaultSource) {
+                case DMBIN_ONLYONE        : data.SetBin(wxPRINTBIN_ONLYONE       ); break;
+                case DMBIN_LOWER          : data.SetBin(wxPRINTBIN_LOWER         ); break;
+                case DMBIN_MIDDLE         : data.SetBin(wxPRINTBIN_MIDDLE        ); break;
+                case DMBIN_MANUAL         : data.SetBin(wxPRINTBIN_MANUAL        ); break;
+                case DMBIN_ENVELOPE       : data.SetBin(wxPRINTBIN_ENVELOPE      ); break;
+                case DMBIN_ENVMANUAL      : data.SetBin(wxPRINTBIN_ENVMANUAL     ); break;
+                case DMBIN_AUTO           : data.SetBin(wxPRINTBIN_AUTO          ); break;
+                case DMBIN_TRACTOR        : data.SetBin(wxPRINTBIN_TRACTOR       ); break;
+                case DMBIN_SMALLFMT       : data.SetBin(wxPRINTBIN_SMALLFMT      ); break;
+                case DMBIN_LARGEFMT       : data.SetBin(wxPRINTBIN_LARGEFMT      ); break;
+                case DMBIN_LARGECAPACITY  : data.SetBin(wxPRINTBIN_LARGECAPACITY ); break;
+                case DMBIN_CASSETTE       : data.SetBin(wxPRINTBIN_CASSETTE      ); break;
+                case DMBIN_FORMSOURCE     : data.SetBin(wxPRINTBIN_FORMSOURCE    ); break;
+                default:
+                    if (devMode->dmDefaultSource>=DMBIN_USER) {
+                        data.SetBin((wxPrintBin)((devMode->dmDefaultSource)-DMBIN_USER+(int)wxPRINTBIN_USER));
+                    } else {
+                        data.SetBin(wxPRINTBIN_DEFAULT);
+                    }
+                    break;
+            }
+        } else {
+            data.SetBin(wxPRINTBIN_DEFAULT);
+        }
+        if (devMode->dmFields & DM_MEDIATYPE)
+        {
+            wxASSERT( (int)devMode->dmMediaType != wxPRINTMEDIA_DEFAULT );
+            data.SetMedia(devMode->dmMediaType);
+        }
+        //// Printer name
+        if (devMode->dmDeviceName[0] != 0)
+            // This syntax fixes a crash when using VS 7.1
+            data.SetPrinterName( wxString(devMode->dmDeviceName, CCHDEVICENAME) );
+
+        //// Colour
+        if (devMode->dmFields & DM_COLOR)
+        {
+            if (devMode->dmColor == DMCOLOR_COLOR)
+                data.SetColour( true );
+            else
+                data.SetColour( false );
+        }
+        else
             data.SetColour( true );
-        else
-            data.SetColour( false );
-    }
-    else
-        data.SetColour( true );
 
-    //// Paper size
+        //// Paper size
+        // We don't know size of user defined paper and some buggy drivers
+        // set both DM_PAPERSIZE and DM_PAPERWIDTH & DM_PAPERLENGTH. Since
+        // dmPaperSize >= DMPAPER_USER wouldn't be in wxWin's database, this
+        // code wouldn't set m_paperSize correctly.
 
-    // We don't know size of user defined paper and some buggy drivers
-    // set both DM_PAPERSIZE and DM_PAPERWIDTH & DM_PAPERLENGTH. Since
-    // dmPaperSize >= DMPAPER_USER wouldn't be in wxWin's database, this
-    // code wouldn't set m_paperSize correctly.
-
-    bool foundPaperSize = false;
-    if ((devMode->dmFields & DM_PAPERSIZE) && (devMode->dmPaperSize < DMPAPER_USER))
-    {
-        if (wxThePrintPaperDatabase)
+        bool foundPaperSize = false;
+        if ((devMode->dmFields & DM_PAPERSIZE) && (devMode->dmPaperSize < DMPAPER_USER))
         {
-            wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperTypeByPlatformId(devMode->dmPaperSize);
-            if (paper)
+            if (wxThePrintPaperDatabase)
             {
-                data.SetPaperId( paper->GetId() );
-                data.SetPaperSize( wxSize(paper->GetWidth() / 10,paper->GetHeight() / 10) );
+                wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperTypeByPlatformId(devMode->dmPaperSize);
+                if (paper)
+                {
+                    data.SetPaperId( paper->GetId() );
+                    data.SetPaperSize( wxSize(paper->GetWidth() / 10,paper->GetHeight() / 10) );
+                    m_customWindowsPaperId = 0;
+                    foundPaperSize = true;
+                }
+            }
+            else
+            {
+                // Shouldn't really get here
+                wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
+                data.SetPaperId( wxPAPER_NONE );
+                data.SetPaperSize( wxSize(0,0) );
                 m_customWindowsPaperId = 0;
-                foundPaperSize = true;
+
+                GlobalUnlock(hDevMode);
+                return false;
             }
         }
-        else
+
+        if (!foundPaperSize)
         {
-            // Shouldn't really get here
-            wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
-            data.SetPaperId( wxPAPER_NONE );
-            data.SetPaperSize( wxSize(0,0) );
-            m_customWindowsPaperId = 0;
-
-            return false;
-        }
-    }
-
-    if (!foundPaperSize) {
-        if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
-        {
-            // DEVMODE is in tenths of a millimeter
-            data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) );
-            data.SetPaperId( wxPAPER_NONE );
-            m_customWindowsPaperId = devMode->dmPaperSize;
-        }
-        else
-        {
-            // Often will reach this for non-standard paper sizes (sizes which
-            // wouldn't be in wxWidget's paper database). Setting
-            // m_customWindowsPaperId to devMode->dmPaperSize should be enough
-            // to get this paper size working.
-            data.SetPaperSize( wxSize(0,0) );
-            data.SetPaperId( wxPAPER_NONE );
-            m_customWindowsPaperId = devMode->dmPaperSize;
-        }
-    }
-
-    //// Duplex
-
-    if (devMode->dmFields & DM_DUPLEX)
-    {
-        switch (devMode->dmDuplex)
-        {
-            case DMDUP_HORIZONTAL:   data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
-            case DMDUP_VERTICAL:     data.SetDuplex( wxDUPLEX_VERTICAL ); break;
-            default:
-            case DMDUP_SIMPLEX:      data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
-        }
-    }
-    else
-        data.SetDuplex( wxDUPLEX_SIMPLEX );
-
-    //// Quality
-
-    if (devMode->dmFields & DM_PRINTQUALITY)
-    {
-        switch (devMode->dmPrintQuality)
-        {
-            case DMRES_MEDIUM:  data.SetQuality( wxPRINT_QUALITY_MEDIUM ); break;
-            case DMRES_LOW:     data.SetQuality( wxPRINT_QUALITY_LOW ); break;
-            case DMRES_DRAFT:   data.SetQuality( wxPRINT_QUALITY_DRAFT ); break;
-            case DMRES_HIGH:    data.SetQuality( wxPRINT_QUALITY_HIGH ); break;
-            default:
+            if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
             {
-                // TODO: if the printer fills in the resolution in DPI, how
-                // will the application know if it's high, low, draft etc.??
-                //                    wxFAIL_MSG("Warning: DM_PRINTQUALITY was not one of the standard values.");
-                data.SetQuality( devMode->dmPrintQuality );
-                break;
-
+                // DEVMODE is in tenths of a millimeter
+                data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) );
+                data.SetPaperId( wxPAPER_NONE );
+                m_customWindowsPaperId = devMode->dmPaperSize;
+            }
+            else
+            {
+                // Often will reach this for non-standard paper sizes (sizes which
+                // wouldn't be in wxWidget's paper database). Setting
+                // m_customWindowsPaperId to devMode->dmPaperSize should be enough
+                // to get this paper size working.
+                data.SetPaperSize( wxSize(0,0) );
+                data.SetPaperId( wxPAPER_NONE );
+                m_customWindowsPaperId = devMode->dmPaperSize;
             }
         }
+
+        //// Duplex
+
+        if (devMode->dmFields & DM_DUPLEX)
+        {
+            switch (devMode->dmDuplex)
+            {
+                case DMDUP_HORIZONTAL:   data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
+                case DMDUP_VERTICAL:     data.SetDuplex( wxDUPLEX_VERTICAL ); break;
+                default:
+                case DMDUP_SIMPLEX:      data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
+            }
+        }
+        else
+            data.SetDuplex( wxDUPLEX_SIMPLEX );
+
+        //// Quality
+
+        if (devMode->dmFields & DM_PRINTQUALITY)
+        {
+            switch (devMode->dmPrintQuality)
+            {
+                case DMRES_MEDIUM:  data.SetQuality( wxPRINT_QUALITY_MEDIUM ); break;
+                case DMRES_LOW:     data.SetQuality( wxPRINT_QUALITY_LOW ); break;
+                case DMRES_DRAFT:   data.SetQuality( wxPRINT_QUALITY_DRAFT ); break;
+                case DMRES_HIGH:    data.SetQuality( wxPRINT_QUALITY_HIGH ); break;
+                default:
+                {
+                    // TODO: if the printer fills in the resolution in DPI, how
+                    // will the application know if it's high, low, draft etc.??
+                    //                    wxFAIL_MSG("Warning: DM_PRINTQUALITY was not one of the standard values.");
+                    data.SetQuality( devMode->dmPrintQuality );
+                    break;
+
+                }
+            }
+        }
+        else
+            data.SetQuality( wxPRINT_QUALITY_HIGH );
+
+        if (devMode->dmDriverExtra > 0)
+            data.SetPrivData( (char *)devMode+devMode->dmSize, devMode->dmDriverExtra );
+        else
+            data.SetPrivData( NULL, 0 );
+
+        GlobalUnlock(hDevMode);
     }
-    else
-        data.SetQuality( wxPRINT_QUALITY_HIGH );
 
-    if (devMode->dmDriverExtra > 0)
-        data.SetPrivData( (char *)devMode+devMode->dmSize, devMode->dmDriverExtra );
-    else
-        data.SetPrivData( NULL, 0 );
-
-    if ( m_devNames )
+    if (hDevNames)
     {
-        GlobalPtrLock lockDevNames(m_devNames);
-        LPDEVNAMES lpDevNames = static_cast<LPDEVNAMES>(lockDevNames.Get());
+        LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(hDevNames);
+        if (lpDevNames)
+        {
+            // TODO: Unicode-ification
 
-        // TODO: Unicode-ification
+            // Get the port name
+            // port is obsolete in WIN32
+            // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
 
-        // Get the port name
-        // port is obsolete in WIN32
-        // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
+            // Get the printer name
+            wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
 
-        // Get the printer name
-        wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
-
-        // Not sure if we should check for this mismatch
+            // Not sure if we should check for this mismatch
 //            wxASSERT_MSG( (m_printerName.empty() || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
 
-        if (!printerName.empty())
-            data.SetPrinterName( printerName );
+            if (!printerName.empty())
+                data.SetPrinterName( printerName );
+
+            GlobalUnlock(hDevNames);
+        }
     }
 
     return true;
 }
 
-void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, WinPrinter* printer)
+bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
 {
-    if (m_devMode)
-        return;
-
-    LPTSTR szPrinterName = wxMSW_CONV_LPTSTR(printerName);
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+    WinPrinter printer;
+    LPTSTR szPrinterName = (LPTSTR)data.GetPrinterName().wx_str();
 
     // From MSDN: How To Modify Printer Settings with the DocumentProperties() Function
     // The purpose of this is to fill the DEVMODE with privdata from printer driver.
     // If we have a printer name and OpenPrinter sucessfully returns
     // this replaces the PrintDlg function which creates the DEVMODE filled only with data from default printer.
-    if ( !m_devMode && !printerName.IsEmpty() )
+    if ( !m_devMode && !data.GetPrinterName().IsEmpty() )
     {
         // Open printer
-        if ( printer && printer->Open( printerName ) == TRUE )
+        if ( printer.Open( data.GetPrinterName() ) == TRUE )
         {
             DWORD dwNeeded, dwRet;
 
             // Step 1:
             // Allocate a buffer of the correct size.
             dwNeeded = DocumentProperties( NULL,
-                *printer,        // Handle to our printer.
+                printer,         // Handle to our printer.
                 szPrinterName,   // Name of the printer.
                 NULL,            // Asking for size, so
                 NULL,            // these are not used.
@@ -419,7 +431,7 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
             // Step 2:
             // Get the default DevMode for the printer
             dwRet = DocumentProperties( NULL,
-                *printer,
+                printer,
                 szPrinterName,
                 tempDevMode,     // The address of the buffer to fill.
                 NULL,            // Not using the input buffer.
@@ -429,31 +441,39 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
             {
                 // If failure, cleanup
                 GlobalFree( tempDevMode );
-                printer->Close();
+                printer.Close();
             }
             else
             {
-                m_devMode = tempDevMode;
+                hDevMode = tempDevMode;
+                m_devMode = hDevMode;
                 tempDevMode = NULL;
             }
         }
     }
 
-    if ( !m_devMode )
+    if (!hDevMode)
     {
         // Use PRINTDLG as a way of creating a DEVMODE object
         PRINTDLG pd;
 
+        // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
+#ifdef __GNUWIN32__
+        memset(&pd, 0, 66);
+        pd.lStructSize    = 66;
+#else
         memset(&pd, 0, sizeof(PRINTDLG));
 #ifdef __WXWINCE__
         pd.cbStruct    = sizeof(PRINTDLG);
 #else
         pd.lStructSize    = sizeof(PRINTDLG);
+#endif
 #endif
 
-        pd.hwndOwner      = NULL;
+        pd.hwndOwner      = (HWND)NULL;
         pd.hDevMode       = NULL; // Will be created by PrintDlg
         pd.hDevNames      = NULL; // Ditto
+        //pd.hInstance      = (HINSTANCE) wxGetInstance();
 
         pd.Flags          = PD_RETURNDEFAULT;
         pd.nCopies        = 1;
@@ -469,13 +489,16 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
             pd.hDevMode = NULL;
             pd.hDevNames = NULL;
 
-#if wxDEBUG_LEVEL
-            wxLogDebug(wxT("Printing error: ") + wxGetPrintDlgError());
-#endif // wxDEBUG_LEVEL
+#if defined(__WXDEBUG__) && defined(__WIN32__)
+            wxString str(wxT("Printing error: "));
+            str += wxGetPrintDlgError();
+            wxLogDebug(str);
+#endif
         }
         else
         {
-            m_devMode = pd.hDevMode;
+            hDevMode = pd.hDevMode;
+            m_devMode = (void*)(long) hDevMode;
             pd.hDevMode = NULL;
 
             // We'll create a new DEVNAMEs structure below.
@@ -490,22 +513,9 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
         }
     }
 
-}
-
-bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
-{
-    WinPrinter printer;
-    LPTSTR szPrinterName = wxMSW_CONV_LPTSTR(data.GetPrinterName());
-
-    if (!m_devMode)
-        InitializeDevMode(data.GetPrinterName(), &printer);
-
-    HGLOBAL hDevMode = static_cast<HGLOBAL>(m_devMode);
-
     if ( hDevMode )
     {
-        GlobalPtrLock lockDevMode(hDevMode);
-        DEVMODE * const devMode = static_cast<DEVMODE *>(lockDevMode.Get());
+        LPDEVMODE devMode = (LPDEVMODE) GlobalLock(hDevMode);
 
         //// Orientation
         devMode->dmOrientation = (short)data.GetOrientation();
@@ -522,11 +532,9 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
         wxString name = data.GetPrinterName();
         if (!name.empty())
         {
-            // NB: the cast is needed in the ANSI build, strangely enough
-            //     dmDeviceName is BYTE[] and not char[] there
-            wxStrlcpy(reinterpret_cast<wxChar *>(devMode->dmDeviceName),
-                      name.t_str(),
-                      WXSIZEOF(devMode->dmDeviceName));
+            //int len = wxMin(31, m_printerName.Len());
+            wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);
+            devMode->dmDeviceName[31] = wxT('\0');
         }
 
         //// Colour
@@ -662,7 +670,6 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
             devMode->dmMediaType = data.GetMedia();
             devMode->dmFields |= DM_MEDIATYPE;
         }
-
         if( printer )
         {
             // Step 3:
@@ -677,15 +684,16 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
                 DM_IN_BUFFER |       // Commands to Merge our changes and
                 DM_OUT_BUFFER );     // write the result.
         }
+        GlobalUnlock(hDevMode);
     }
 
-    if ( m_devNames )
+    if ( hDevNames )
     {
-        ::GlobalFree(static_cast<HGLOBAL>(m_devNames));
+        GlobalFree(hDevNames);
     }
 
     // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
-    m_devNames = wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString);
+    m_devNames = (void*) (long) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString);
 
     return true;
 }
@@ -756,7 +764,7 @@ int wxWindowsPrintDialog::ShowModal()
 
     if ( ret && (pd->hDC) )
     {
-        wxPrinterDC *pdc = new wxPrinterDCFromHDC( (WXHDC) pd->hDC );
+        wxPrinterDC *pdc = new wxPrinterDC( (WXHDC) pd->hDC );
         m_printerDC = pdc;
         ConvertFromNative( m_printDialogData );
         return wxID_OK;
@@ -775,7 +783,7 @@ wxDC *wxWindowsPrintDialog::GetPrintDC()
         return m_printerDC;
     }
     else
-        return NULL;
+        return (wxPrinterDC*) NULL;
 }
 
 bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
@@ -794,8 +802,13 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;
 
+    // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
+#ifdef __GNUWIN32__
+    pd->lStructSize    = 66;
+#else
     pd->lStructSize    = sizeof(PRINTDLG);
-    pd->hwndOwner      = NULL;
+#endif
+    pd->hwndOwner      = (HWND)NULL;
     pd->hDevMode       = NULL; // Will be created by PrintDlg
     pd->hDevNames      = NULL; // Ditto
 
@@ -812,17 +825,17 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     if (pd->hDevNames)
         GlobalFree(pd->hDevNames);
 
-    pd->hDevMode = static_cast<HGLOBAL>(native_data->GetDevMode());
-    native_data->SetDevMode(NULL);
+    pd->hDevMode = (HGLOBAL)(DWORD) native_data->GetDevMode();
+    native_data->SetDevMode( (void*) NULL);
 
     // Shouldn't assert; we should be able to test Ok-ness at a higher level
     //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
 
-    pd->hDevNames = static_cast<HGLOBAL>(native_data->GetDevNames());
-    native_data->SetDevNames(NULL);
+    pd->hDevNames = (HGLOBAL)(DWORD) native_data->GetDevNames();
+    native_data->SetDevNames( (void*) NULL);
 
 
-    pd->hDC = NULL;
+    pd->hDC = (HDC) NULL;
     pd->nFromPage = (WORD)data.GetFromPage();
     pd->nToPage = (WORD)data.GetToPage();
     pd->nMinPage = (WORD)data.GetMinPage();
@@ -830,17 +843,23 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     pd->nCopies = (WORD)data.GetNoCopies();
 
     pd->Flags = PD_RETURNDC;
-    pd->lStructSize = sizeof( PRINTDLG );
 
-    pd->hwndOwner = NULL;
-    pd->hInstance = NULL;
-    pd->lCustData = 0;
+#ifdef __GNUWIN32__
+    pd->lStructSize = 66;
+#else
+    pd->lStructSize = sizeof( PRINTDLG );
+#endif
+
+    pd->hwndOwner=(HWND)NULL;
+//    pd->hDevNames=(HANDLE)NULL;
+    pd->hInstance=(HINSTANCE)NULL;
+    pd->lCustData = (LPARAM) NULL;
     pd->lpfnPrintHook = NULL;
     pd->lpfnSetupHook = NULL;
     pd->lpPrintTemplateName = NULL;
     pd->lpSetupTemplateName = NULL;
-    pd->hPrintTemplate = NULL;
-    pd->hSetupTemplate = NULL;
+    pd->hPrintTemplate = (HGLOBAL) NULL;
+    pd->hSetupTemplate = (HGLOBAL) NULL;
 
     if ( data.GetAllPages() )
         pd->Flags |= PD_ALLPAGES;
@@ -860,6 +879,10 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
         pd->Flags |= PD_PAGENUMS;
     if ( data.GetEnableHelp() )
         pd->Flags |= PD_SHOWHELP;
+#if WXWIN_COMPATIBILITY_2_4
+    if ( data.GetSetupDialog() )
+        pd->Flags |= PD_PRINTSETUP;
+#endif
 
     return true;
 }
@@ -878,9 +901,10 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
     {
         if (native_data->GetDevMode())
         {
-            ::GlobalFree(static_cast<HGLOBAL>(native_data->GetDevMode()));
+            // Make sure we don't leak memory
+            GlobalFree( (HGLOBAL)(DWORD) native_data->GetDevMode() );
         }
-        native_data->SetDevMode(pd->hDevMode);
+        native_data->SetDevMode( (void*)(long) pd->hDevMode );
         pd->hDevMode = NULL;
     }
 
@@ -889,9 +913,10 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
     {
         if (native_data->GetDevNames())
         {
-            ::GlobalFree(static_cast<HGLOBAL>(native_data->GetDevNames()));
+            // Make sure we don't leak memory
+            GlobalFree((HGLOBAL)(DWORD) native_data->GetDevNames());
         }
-        native_data->SetDevNames(pd->hDevNames);
+        native_data->SetDevNames((void*)(long) pd->hDevNames);
         pd->hDevNames = NULL;
     }
 
@@ -913,6 +938,9 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
     data.EnableSelection( ((pd->Flags & PD_NOSELECTION) != PD_NOSELECTION) );
     data.EnablePageNumbers( ((pd->Flags & PD_NOPAGENUMS) != PD_NOPAGENUMS) );
     data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) );
+#if WXWIN_COMPATIBILITY_2_4
+    data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) );
+#endif
 
     return true;
 }
@@ -967,15 +995,18 @@ int wxWindowsPageSetupDialog::ShowModal()
         pd->hwndOwner = (HWND) wxTheApp->GetTopWindow()->GetHWND();
     else
         pd->hwndOwner = 0;
+
     BOOL retVal = PageSetupDlg( pd ) ;
     pd->hwndOwner = 0;
+
     if (retVal)
     {
         ConvertFromNative( m_pageSetupData );
+
         return wxID_OK;
     }
-    else
-        return wxID_CANCEL;
+
+    return wxID_CANCEL;
 }
 
 bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
@@ -991,34 +1022,38 @@ bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
         return false;
 
     pd = new PAGESETUPDLG;
+    pd->hDevMode = NULL;
+    pd->hDevNames = NULL;
     m_pageDlg = (void *)pd;
 
-    // We must not set hDevMode and hDevNames when using PSD_RETURNDEFAULT,
-    // otherwise the call to PageSetupDlg() would fail.
-    if ( data.GetDefaultInfo() )
+    // Pass the devmode data (created in m_printData.ConvertToNative)
+    // to the PRINTDLG structure, since it'll
+    // be needed when PrintDlg is called.
+
+    if (pd->hDevMode)
     {
+        GlobalFree(pd->hDevMode);
         pd->hDevMode = NULL;
+    }
+    pd->hDevMode = (HGLOBAL) native_data->GetDevMode();
+    native_data->SetDevMode( (void*) NULL );
+
+    // Shouldn't assert; we should be able to test Ok-ness at a higher level
+    //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+
+    // Pass the devnames data (created in m_printData.ConvertToNative)
+    // to the PRINTDLG structure, since it'll
+    // be needed when PrintDlg is called.
+
+    if (pd->hDevNames)
+    {
+        GlobalFree(pd->hDevNames);
         pd->hDevNames = NULL;
     }
-    else
-    {
-        // Pass the devmode data (created in m_printData.ConvertToNative)
-        // to the PRINTDLG structure, since it'll
-        // be needed when PrintDlg is called.
+    pd->hDevNames = (HGLOBAL) native_data->GetDevNames();
+    native_data->SetDevNames((void*) NULL);
 
-        pd->hDevMode = (HGLOBAL) native_data->GetDevMode();
-        native_data->SetDevMode(NULL);
-
-        // Shouldn't assert; we should be able to test Ok-ness at a higher level
-        //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
-
-        // Pass the devnames data (created in m_printData.ConvertToNative)
-        // to the PRINTDLG structure, since it'll
-        // be needed when PrintDlg is called.
-
-        pd->hDevNames = (HGLOBAL) native_data->GetDevNames();
-        native_data->SetDevNames(NULL);
-    }
+//        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
 
     pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
 
@@ -1041,8 +1076,9 @@ bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
     pd->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
 
     pd->lStructSize = sizeof( PAGESETUPDLG );
-    pd->hwndOwner = NULL;
-    pd->hInstance = NULL;
+    pd->hwndOwner=(HWND)NULL;
+//    pd->hDevNames=(HWND)NULL;
+    pd->hInstance=(HINSTANCE)NULL;
     //   PAGESETUPDLG is in hundreds of a mm
     pd->ptPaperSize.x = data.GetPaperSize().x * 100;
     pd->ptPaperSize.y = data.GetPaperSize().y * 100;
@@ -1063,6 +1099,17 @@ bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
     pd->hPageSetupTemplate = NULL;
     pd->lpPageSetupTemplateName = NULL;
 
+/*
+    if ( pd->hDevMode )
+    {
+        DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode);
+        memset(devMode, 0, sizeof(DEVMODE));
+        devMode->dmSize = sizeof(DEVMODE);
+        devMode->dmOrientation = m_orientation;
+        devMode->dmFields = DM_ORIENTATION;
+        GlobalUnlock(pd->hDevMode);
+    }
+*/
     return true;
 }
 
diff --git a/Source/3rd Party/wx/src/msw/printwin.cpp b/Source/3rd Party/wx/src/msw/printwin.cpp
index d0ab979e3..684dfd24c 100644
--- a/Source/3rd Party/wx/src/msw/printwin.cpp	
+++ b/Source/3rd Party/wx/src/msw/printwin.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: printwin.cpp 42522 2006-10-27 13:07:40Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -39,26 +39,23 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dcprint.h"
-    #include "wx/dcmemory.h"
-    #include "wx/image.h"
 #endif
 
-#include "wx/msw/dib.h"
-#include "wx/msw/dcmemory.h"
 #include "wx/msw/printwin.h"
-#include "wx/msw/printdlg.h"
+#include "wx/msw/printdlg.h"	// RJL used Windows dialog?s
 #include "wx/msw/private.h"
-#include "wx/msw/dcprint.h"
-#if wxUSE_ENH_METAFILE
-    #include "wx/msw/enhmeta.h"
-#endif
+
 #include <stdlib.h>
 
+#ifndef __WIN32__
+    #include <print.h>
+#endif
+
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 
-BOOL CALLBACK wxAbortProc(HDC hdc, int error);
+LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
 
 // ---------------------------------------------------------------------------
 // wxWin macros
@@ -78,6 +75,16 @@ BOOL CALLBACK wxAbortProc(HDC hdc, int error);
 wxWindowsPrinter::wxWindowsPrinter(wxPrintDialogData *data)
                 : wxPrinterBase(data)
 {
+    m_lpAbortProc = (WXFARPROC) MakeProcInstance((FARPROC) wxAbortProc, wxGetInstance());
+}
+
+wxWindowsPrinter::~wxWindowsPrinter()
+{
+    // avoids warning about statement with no effect (FreeProcInstance
+    // doesn't do anything under Win32)
+#if !defined(__WIN32__) && !defined(__NT__)
+    FreeProcInstance((FARPROC) m_lpAbortProc);
+#endif
 }
 
 bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt)
@@ -91,6 +98,8 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
         return false;
     }
 
+    printout->SetIsPreview(false);
+
     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)
@@ -110,21 +119,19 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     }
 
     // May have pressed cancel.
-    if (!dc || !dc->IsOk())
+    if (!dc || !dc->Ok())
     {
         if (dc) delete dc;
         return false;
     }
 
-    wxPrinterDCImpl *impl = (wxPrinterDCImpl*) dc->GetImpl();
-
     HDC hdc = ::GetDC(NULL);
     int logPPIScreenX = ::GetDeviceCaps(hdc, LOGPIXELSX);
     int logPPIScreenY = ::GetDeviceCaps(hdc, LOGPIXELSY);
     ::ReleaseDC(NULL, hdc);
 
-    int logPPIPrinterX = ::GetDeviceCaps((HDC) impl->GetHDC(), LOGPIXELSX);
-    int logPPIPrinterY = ::GetDeviceCaps((HDC) impl->GetHDC(), LOGPIXELSY);
+    int logPPIPrinterX = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSX);
+    int logPPIPrinterY = ::GetDeviceCaps((HDC) dc->GetHDC(), LOGPIXELSY);
     if (logPPIPrinterX == 0 || logPPIPrinterY == 0)
     {
         delete dc;
@@ -170,7 +177,24 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     wxWindow *win = CreateAbortWindow(parent, printout);
     wxYield();
 
-    ::SetAbortProc(GetHdcOf(*impl), wxAbortProc);
+#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__GNUWIN32__) || defined(__SALFORDC__) || !defined(__WIN32__)
+#ifdef STRICT
+    ::SetAbortProc((HDC) dc->GetHDC(), (ABORTPROC) m_lpAbortProc);
+#else
+    ::SetAbortProc((HDC) dc->GetHDC(), (FARPROC) m_lpAbortProc);
+#endif
+#else
+    ::SetAbortProc((HDC) dc->GetHDC(), (int (_stdcall *)
+        // cast it to right type only if required
+        // FIXME it's really cdecl and we're casting it to stdcall - either there is
+        //       something I don't understand or it will crash at first usage
+#ifdef STRICT
+        (HDC, int)
+#else
+        ()
+#endif
+        )m_lpAbortProc);
+#endif
 
     if (!win)
     {
@@ -244,7 +268,8 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
     if (sm_abortWindow)
     {
         sm_abortWindow->Show(false);
-        wxDELETE(sm_abortWindow);
+        delete sm_abortWindow;
+        sm_abortWindow = NULL;
     }
 
     delete dc;
@@ -254,7 +279,7 @@ bool wxWindowsPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt
 
 wxDC *wxWindowsPrinter::PrintDialog(wxWindow *parent)
 {
-    wxDC *dc = NULL;
+    wxDC *dc = (wxPrinterDC*) NULL;
 
     wxWindowsPrintDialog dialog(parent, & m_printDialogData);
     int ret = dialog.ShowModal();
@@ -343,12 +368,11 @@ void wxWindowsPrintPreview::DetermineScaling()
     int logPPIPrinterX;
     int logPPIPrinterY;
 
-    wxRect paperRect;
+	wxRect paperRect;
 
-    if ( printerDC.IsOk() )
+    if ( printerDC.Ok() )
     {
-        wxPrinterDCImpl *impl = (wxPrinterDCImpl*) printerDC.GetImpl();
-        HDC dc = GetHdcOf(*impl);
+        HDC dc = GetHdcOf(printerDC);
         printerWidthMM = ::GetDeviceCaps(dc, HORZSIZE);
         printerHeightMM = ::GetDeviceCaps(dc, VERTSIZE);
         printerXRes = ::GetDeviceCaps(dc, HORZRES);
@@ -356,7 +380,7 @@ void wxWindowsPrintPreview::DetermineScaling()
         logPPIPrinterX = ::GetDeviceCaps(dc, LOGPIXELSX);
         logPPIPrinterY = ::GetDeviceCaps(dc, LOGPIXELSY);
 
-        paperRect = printerDC.GetPaperRect();
+		paperRect = printerDC.GetPaperRect();
 
         if ( logPPIPrinterX == 0 ||
                 logPPIPrinterY == 0 ||
@@ -376,7 +400,7 @@ void wxWindowsPrintPreview::DetermineScaling()
         logPPIPrinterX = 600;
         logPPIPrinterY = 600;
 
-        paperRect = wxRect(0, 0, printerXRes, printerYRes);
+		paperRect = wxRect(0, 0, printerXRes, printerYRes);
         m_isOk = false;
     }
     m_pageWidth = printerXRes;
@@ -391,55 +415,15 @@ void wxWindowsPrintPreview::DetermineScaling()
     m_previewScaleY = float(logPPIScreenY) / logPPIPrinterY;
 }
 
-#if wxUSE_ENH_METAFILE
-bool wxWindowsPrintPreview::RenderPageIntoBitmap(wxBitmap& bmp, int pageNum)
-{
-    // The preview, as implemented in wxPrintPreviewBase (and as used prior to
-    // wx3) is inexact: it uses screen DC, which has much lower resolution and
-    // has other properties different from printer DC, so the preview is not
-    // quite right.
-    //
-    // To make matters worse, if the application depends heavily on
-    // GetTextExtent() or does text layout itself, the output in preview and on
-    // paper can be very different. In particular, wxHtmlEasyPrinting is
-    // affected and the preview can be easily off by several pages.
-    //
-    // To fix this, we render the preview into high-resolution enhanced
-    // metafile with properties identical to the printer DC. This guarantees
-    // metrics correctness while still being fast.
+/****************************************************************************
 
+  FUNCTION: wxAbortProc()
 
-    // print the preview into a metafile:
-    wxPrinterDC printerDC(m_printDialogData.GetPrintData());
-    wxEnhMetaFileDC metaDC(printerDC,
-                           wxEmptyString,
-                           printerDC.GetSize().x, printerDC.GetSize().y);
+    PURPOSE:  Processes messages for the Abort Dialog box
 
-    if ( !RenderPageIntoDC(metaDC, pageNum) )
-        return false;
+****************************************************************************/
 
-    wxEnhMetaFile *metafile = metaDC.Close();
-    if ( !metafile )
-        return false;
-
-    // now render the metafile:
-    wxMemoryDC bmpDC;
-    bmpDC.SelectObject(bmp);
-    bmpDC.Clear();
-
-    wxRect outRect(0, 0, bmp.GetWidth(), bmp.GetHeight());
-    metafile->Play(&bmpDC, &outRect);
-
-
-    delete metafile;
-
-    // TODO: we should keep the metafile and reuse it when changing zoom level
-
-    return true;
-}
-#endif // wxUSE_ENH_METAFILE
-
-BOOL CALLBACK wxAbortProc(HDC WXUNUSED(hdc), int WXUNUSED(error))
+LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code))
 {
     MSG msg;
 
diff --git a/Source/3rd Party/wx/src/msw/progdlg.cpp b/Source/3rd Party/wx/src/msw/progdlg.cpp
deleted file mode 100644
index 73fc22498..000000000
--- a/Source/3rd Party/wx/src/msw/progdlg.cpp	
+++ /dev/null
@@ -1,957 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/progdlg.cpp
-// Purpose:     wxProgressDialog
-// Author:      Rickard Westerlund
-// Created:     2010-07-22
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// Declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// Headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PROGRESSDLG && wxUSE_THREADS
-
-#include "wx/progdlg.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/msgdlg.h"
-    #include "wx/stopwatch.h"
-    #include "wx/msw/private.h"
-#endif
-
-#include "wx/msw/private/msgdlg.h"
-#include "wx/evtloop.h"
-
-using namespace wxMSWMessageDialog;
-
-#ifdef wxHAS_MSW_TASKDIALOG
-
-// ----------------------------------------------------------------------------
-// Constants
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// Notification values of wxProgressDialogSharedData::m_notifications
-const int wxSPDD_VALUE_CHANGED     = 0x0001;
-const int wxSPDD_RANGE_CHANGED     = 0x0002;
-const int wxSPDD_PBMARQUEE_CHANGED = 0x0004;
-const int wxSPDD_TITLE_CHANGED     = 0x0008;
-const int wxSPDD_MESSAGE_CHANGED   = 0x0010;
-const int wxSPDD_EXPINFO_CHANGED   = 0x0020;
-const int wxSPDD_ENABLE_SKIP       = 0x0040;
-const int wxSPDD_ENABLE_ABORT      = 0x0080;
-const int wxSPDD_DISABLE_SKIP      = 0x0100;
-const int wxSPDD_DISABLE_ABORT     = 0x0200;
-const int wxSPDD_FINISHED          = 0x0400;
-const int wxSPDD_DESTROYED         = 0x0800;
-
-const int Id_SkipBtn = wxID_HIGHEST + 1;
-
-} // anonymous namespace
-
-// ============================================================================
-// Helper classes
-// ============================================================================
-
-// Class used to share data between the main thread and the task dialog runner.
-class wxProgressDialogSharedData
-{
-public:
-    wxProgressDialogSharedData()
-    {
-        m_hwnd = 0;
-        m_value = 0;
-        m_progressBarMarquee = false;
-        m_skipped = false;
-        m_notifications = 0;
-        m_parent = NULL;
-    }
-
-    wxCriticalSection m_cs;
-
-    wxWindow *m_parent;     // Parent window only used to center us over it.
-    HWND m_hwnd;            // Task dialog handler
-    long m_style;           // wxProgressDialog style
-    int m_value;
-    int m_range;
-    wxString m_title;
-    wxString m_message;
-    wxString m_expandedInformation;
-    wxString m_labelCancel; // Privately used by callback.
-    unsigned long m_timeStop;
-
-    wxProgressDialog::State m_state;
-    bool m_progressBarMarquee;
-    bool m_skipped;
-
-    // Bit field that indicates fields that have been modified by the
-    // main thread so the task dialog runner knows what to update.
-    int m_notifications;
-};
-
-// Runner thread that takes care of displaying and updating the
-// task dialog.
-class wxProgressDialogTaskRunner : public wxThread
-{
-public:
-    wxProgressDialogTaskRunner()
-        : wxThread(wxTHREAD_JOINABLE)
-        { }
-
-    wxProgressDialogSharedData* GetSharedDataObject()
-        { return &m_sharedData; }
-
-private:
-    wxProgressDialogSharedData m_sharedData;
-
-    virtual void* Entry();
-
-    static HRESULT CALLBACK TaskDialogCallbackProc(HWND hwnd,
-                                                   UINT uNotification,
-                                                   WPARAM wParam,
-                                                   LPARAM lParam,
-                                                   LONG_PTR dwRefData);
-};
-
-namespace
-{
-
-// A custom event loop which runs until the state of the dialog becomes
-// "Dismissed".
-class wxProgressDialogModalLoop : public wxEventLoop
-{
-public:
-    wxProgressDialogModalLoop(wxProgressDialogSharedData& data)
-        : m_data(data)
-    {
-    }
-
-protected:
-    virtual void OnNextIteration()
-    {
-        wxCriticalSectionLocker locker(m_data.m_cs);
-
-        if ( m_data.m_state == wxProgressDialog::Dismissed )
-            Exit();
-    }
-
-    wxProgressDialogSharedData& m_data;
-
-    wxDECLARE_NO_COPY_CLASS(wxProgressDialogModalLoop);
-};
-
-// ============================================================================
-// Helper functions
-// ============================================================================
-
-BOOL CALLBACK DisplayCloseButton(HWND hwnd, LPARAM lParam)
-{
-    wxProgressDialogSharedData *sharedData =
-        (wxProgressDialogSharedData *) lParam;
-
-    if ( wxGetWindowText( hwnd ) == sharedData->m_labelCancel )
-    {
-        sharedData->m_labelCancel = _("Close");
-        SendMessage( hwnd, WM_SETTEXT, 0,
-                     wxMSW_CONV_LPARAM(sharedData->m_labelCancel) );
-
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-void PerformNotificationUpdates(HWND hwnd,
-                                wxProgressDialogSharedData *sharedData)
-{
-    // Update the appropriate dialog fields.
-    if ( sharedData->m_notifications & wxSPDD_RANGE_CHANGED )
-    {
-        ::SendMessage( hwnd,
-                       TDM_SET_PROGRESS_BAR_RANGE,
-                       0,
-                       MAKELPARAM(0, sharedData->m_range) );
-    }
-
-    if ( sharedData->m_notifications & wxSPDD_VALUE_CHANGED )
-    {
-        ::SendMessage( hwnd,
-                       TDM_SET_PROGRESS_BAR_POS,
-                       sharedData->m_value,
-                       0 );
-    }
-
-    if ( sharedData->m_notifications & wxSPDD_PBMARQUEE_CHANGED )
-    {
-        BOOL val = sharedData->m_progressBarMarquee ? TRUE : FALSE;
-        ::SendMessage( hwnd,
-                       TDM_SET_MARQUEE_PROGRESS_BAR,
-                       val,
-                       0 );
-        ::SendMessage( hwnd,
-                       TDM_SET_PROGRESS_BAR_MARQUEE,
-                       val,
-                       0 );
-    }
-
-    if ( sharedData->m_notifications & wxSPDD_TITLE_CHANGED )
-        ::SetWindowText( hwnd, sharedData->m_title.t_str() );
-
-    if ( sharedData->m_notifications & wxSPDD_MESSAGE_CHANGED )
-    {
-        // Split the message in the title string and the rest if it has
-        // multiple lines.
-        wxString
-            title = sharedData->m_message,
-            body;
-
-        const size_t posNL = title.find('\n');
-        if ( posNL != wxString::npos )
-        {
-            // There can an extra new line between the first and subsequent
-            // lines to separate them as it looks better with the generic
-            // version -- but in this one, they're already separated by the use
-            // of different dialog elements, so suppress the extra new line.
-            int numNLs = 1;
-            if ( posNL < title.length() - 1 && title[posNL + 1] == '\n' )
-                numNLs++;
-
-            body.assign(title, posNL + numNLs, wxString::npos);
-            title.erase(posNL);
-        }
-        else // A single line
-        {
-            // Don't use title without the body, this doesn't make sense.
-            title.swap(body);
-        }
-
-        ::SendMessage( hwnd,
-                       TDM_SET_ELEMENT_TEXT,
-                       TDE_MAIN_INSTRUCTION,
-                       wxMSW_CONV_LPARAM(title) );
-
-        ::SendMessage( hwnd,
-                       TDM_SET_ELEMENT_TEXT,
-                       TDE_CONTENT,
-                       wxMSW_CONV_LPARAM(body) );
-    }
-
-    if ( sharedData->m_notifications & wxSPDD_EXPINFO_CHANGED )
-    {
-        const wxString& expandedInformation =
-            sharedData->m_expandedInformation;
-        if ( !expandedInformation.empty() )
-        {
-            ::SendMessage( hwnd,
-                           TDM_SET_ELEMENT_TEXT,
-                           TDE_EXPANDED_INFORMATION,
-                           wxMSW_CONV_LPARAM(expandedInformation) );
-        }
-    }
-
-    if ( sharedData->m_notifications & wxSPDD_ENABLE_SKIP )
-        ::SendMessage( hwnd, TDM_ENABLE_BUTTON, Id_SkipBtn, TRUE );
-
-    if ( sharedData->m_notifications & wxSPDD_ENABLE_ABORT )
-        ::SendMessage( hwnd, TDM_ENABLE_BUTTON, IDCANCEL, TRUE );
-
-    if ( sharedData->m_notifications & wxSPDD_DISABLE_SKIP )
-        ::SendMessage( hwnd, TDM_ENABLE_BUTTON, Id_SkipBtn, FALSE );
-
-    if ( sharedData->m_notifications & wxSPDD_DISABLE_ABORT )
-        ::SendMessage( hwnd, TDM_ENABLE_BUTTON, IDCANCEL, FALSE );
-
-    // Is the progress finished?
-    if ( sharedData->m_notifications & wxSPDD_FINISHED )
-    {
-        sharedData->m_state = wxProgressDialog::Finished;
-
-        if ( !(sharedData->m_style & wxPD_AUTO_HIDE) )
-        {
-            // Change Cancel into Close and activate the button.
-            ::SendMessage( hwnd, TDM_ENABLE_BUTTON, Id_SkipBtn, FALSE );
-            ::SendMessage( hwnd, TDM_ENABLE_BUTTON, IDCANCEL, TRUE );
-            ::EnumChildWindows( hwnd, DisplayCloseButton,
-                                (LPARAM) sharedData );
-        }
-    }
-}
-
-} // anonymous namespace
-
-#endif // wxHAS_MSW_TASKDIALOG
-
-// ============================================================================
-// wxProgressDialog implementation
-// ============================================================================
-
-wxProgressDialog::wxProgressDialog( const wxString& title,
-                                    const wxString& message,
-                                    int maximum,
-                                    wxWindow *parent,
-                                    int style )
-    : wxGenericProgressDialog(),
-      m_taskDialogRunner(NULL),
-      m_sharedData(NULL),
-      m_message(message),
-      m_title(title)
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        SetTopParent(parent);
-        SetPDStyle(style);
-        SetMaximum(maximum);
-
-        Show();
-        DisableOtherWindows();
-
-        return;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    Create(title, message, maximum, parent, style);
-}
-
-wxProgressDialog::~wxProgressDialog()
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( !m_taskDialogRunner )
-        return;
-
-    if ( m_sharedData )
-    {
-        wxCriticalSectionLocker locker(m_sharedData->m_cs);
-        m_sharedData->m_notifications |= wxSPDD_DESTROYED;
-    }
-
-    m_taskDialogRunner->Wait();
-
-    delete m_taskDialogRunner;
-
-    ReenableOtherWindows();
-
-    if ( GetTopParent() )
-        GetTopParent()->Raise();
-#endif // wxHAS_MSW_TASKDIALOG
-}
-
-bool wxProgressDialog::Update(int value, const wxString& newmsg, bool *skip)
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        {
-            wxCriticalSectionLocker locker(m_sharedData->m_cs);
-
-            // Do nothing in canceled state.
-            if ( !DoNativeBeforeUpdate(skip) )
-                return false;
-
-            value /= m_factor;
-
-            wxASSERT_MSG( value <= m_maximum, wxT("invalid progress value") );
-
-            m_sharedData->m_value = value;
-            m_sharedData->m_notifications |= wxSPDD_VALUE_CHANGED;
-
-            if ( !newmsg.empty() )
-            {
-                m_message = newmsg;
-                m_sharedData->m_message = newmsg;
-                m_sharedData->m_notifications |= wxSPDD_MESSAGE_CHANGED;
-            }
-
-            if ( m_sharedData->m_progressBarMarquee )
-            {
-                m_sharedData->m_progressBarMarquee = false;
-                m_sharedData->m_notifications |= wxSPDD_PBMARQUEE_CHANGED;
-            }
-
-            UpdateExpandedInformation( value );
-
-            // If we didn't just reach the finish, all we have to do is to
-            // return true if the dialog wasn't cancelled and false otherwise.
-            if ( value != m_maximum || m_state == Finished )
-                return m_sharedData->m_state != Canceled;
-
-
-            // On finishing, the dialog without wxPD_AUTO_HIDE style becomes a
-            // modal one meaning that we must block here until the user
-            // dismisses it.
-            m_state = Finished;
-            m_sharedData->m_state = Finished;
-            m_sharedData->m_notifications |= wxSPDD_FINISHED;
-            if ( HasPDFlag(wxPD_AUTO_HIDE) )
-                return true;
-
-            if ( newmsg.empty() )
-            {
-                // Provide the finishing message if the application didn't.
-                m_message = _("Done.");
-                m_sharedData->m_message = m_message;
-                m_sharedData->m_notifications |= wxSPDD_MESSAGE_CHANGED;
-            }
-        } // unlock m_sharedData->m_cs
-
-        // We only get here when we need to wait for the dialog to terminate so
-        // do just this by running a custom event loop until the dialog is
-        // dismissed.
-        wxProgressDialogModalLoop loop(*m_sharedData);
-        loop.Run();
-        return true;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return wxGenericProgressDialog::Update( value, newmsg, skip );
-}
-
-bool wxProgressDialog::Pulse(const wxString& newmsg, bool *skip)
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        wxCriticalSectionLocker locker(m_sharedData->m_cs);
-
-        // Do nothing in canceled state.
-        if ( !DoNativeBeforeUpdate(skip) )
-            return false;
-
-        if ( !m_sharedData->m_progressBarMarquee )
-        {
-            m_sharedData->m_progressBarMarquee = true;
-            m_sharedData->m_notifications |= wxSPDD_PBMARQUEE_CHANGED;
-        }
-
-        if ( !newmsg.empty() )
-        {
-            m_message = newmsg;
-            m_sharedData->m_message = newmsg;
-            m_sharedData->m_notifications |= wxSPDD_MESSAGE_CHANGED;
-        }
-
-        // The value passed here doesn't matter, only elapsed time makes sense
-        // in indeterminate mode anyhow.
-        UpdateExpandedInformation(0);
-
-        return m_sharedData->m_state != Canceled;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return wxGenericProgressDialog::Pulse( newmsg, skip );
-}
-
-bool wxProgressDialog::DoNativeBeforeUpdate(bool *skip)
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        if ( m_sharedData->m_skipped  )
-        {
-            if ( skip && !*skip )
-            {
-                *skip = true;
-                m_sharedData->m_skipped = false;
-                m_sharedData->m_notifications |= wxSPDD_ENABLE_SKIP;
-            }
-        }
-
-        if ( m_sharedData->m_state == Canceled )
-            m_timeStop = m_sharedData->m_timeStop;
-
-        return m_sharedData->m_state != Canceled;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    wxUnusedVar(skip);
-    wxFAIL_MSG( "unreachable" );
-
-    return false;
-}
-
-void wxProgressDialog::Resume()
-{
-    wxGenericProgressDialog::Resume();
-
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        HWND hwnd;
-
-        {
-            wxCriticalSectionLocker locker(m_sharedData->m_cs);
-            m_sharedData->m_state = m_state;
-
-            // "Skip" was disabled when "Cancel" had been clicked, so re-enable
-            // it now.
-            m_sharedData->m_notifications |= wxSPDD_ENABLE_SKIP;
-
-            // Also re-enable "Cancel" itself
-            if ( HasPDFlag(wxPD_CAN_ABORT) )
-                m_sharedData->m_notifications |= wxSPDD_ENABLE_ABORT;
-
-            hwnd = m_sharedData->m_hwnd;
-        } // Unlock m_cs, we can't call any function operating on a dialog with
-          // it locked as it can result in a deadlock if the dialog callback is
-          // called by Windows.
-
-        // After resuming we need to bring the window on top of the Z-order as
-        // it could be hidden by another window shown from the main thread,
-        // e.g. a confirmation dialog asking whether the user really wants to
-        // abort.
-        //
-        // Notice that this must be done from the main thread as it owns the
-        // currently active window and attempts to do this from the task dialog
-        // thread would simply fail.
-        ::BringWindowToTop(hwnd);
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-}
-
-WXWidget wxProgressDialog::GetHandle() const 
-{ 
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        HWND hwnd;
-        {
-            wxCriticalSectionLocker locker(m_sharedData->m_cs);
-            m_sharedData->m_state = m_state;
-            hwnd = m_sharedData->m_hwnd;
-        }
-        return hwnd;
-    }
-#endif
-    return wxGenericProgressDialog::GetHandle();
-}
-
-int wxProgressDialog::GetValue() const
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        wxCriticalSectionLocker locker(m_sharedData->m_cs);
-        return m_sharedData->m_value;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return wxGenericProgressDialog::GetValue();
-}
-
-wxString wxProgressDialog::GetMessage() const
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-        return m_message;
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return wxGenericProgressDialog::GetMessage();
-}
-
-void wxProgressDialog::SetRange(int maximum)
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        SetMaximum(maximum);
-
-        wxCriticalSectionLocker locker(m_sharedData->m_cs);
-
-        m_sharedData->m_range = maximum;
-        m_sharedData->m_notifications |= wxSPDD_RANGE_CHANGED;
-
-        return;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    wxGenericProgressDialog::SetRange( maximum );
-}
-
-bool wxProgressDialog::WasSkipped() const
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        if ( !m_sharedData )
-        {
-            // Couldn't be skipped before being shown.
-            return false;
-        }
-
-        wxCriticalSectionLocker locker(m_sharedData->m_cs);
-        return m_sharedData->m_skipped;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return wxGenericProgressDialog::WasSkipped();
-}
-
-bool wxProgressDialog::WasCancelled() const
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        wxCriticalSectionLocker locker(m_sharedData->m_cs);
-        return m_sharedData->m_state == Canceled;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return wxGenericProgressDialog::WasCancelled();
-}
-
-void wxProgressDialog::SetTitle(const wxString& title)
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        m_title = title;
-
-        if ( m_sharedData )
-        {
-            wxCriticalSectionLocker locker(m_sharedData->m_cs);
-            m_sharedData->m_title = title;
-            m_sharedData->m_notifications = wxSPDD_TITLE_CHANGED;
-        }
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    wxGenericProgressDialog::SetTitle(title);
-}
-
-wxString wxProgressDialog::GetTitle() const
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-        return m_title;
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return wxGenericProgressDialog::GetTitle();
-}
-
-bool wxProgressDialog::Show(bool show)
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    if ( HasNativeTaskDialog() )
-    {
-        // The dialog can't be hidden at all and showing it again after it had
-        // been shown before doesn't do anything.
-        if ( !show || m_taskDialogRunner )
-            return false;
-
-        // We're showing the dialog for the first time, create the thread that
-        // will manage it.
-        m_taskDialogRunner = new wxProgressDialogTaskRunner;
-        m_sharedData = m_taskDialogRunner->GetSharedDataObject();
-
-        // Initialize shared data.
-        m_sharedData->m_title = m_title;
-        m_sharedData->m_message = m_message;
-        m_sharedData->m_range = m_maximum;
-        m_sharedData->m_state = Uncancelable;
-        m_sharedData->m_style = GetPDStyle();
-        m_sharedData->m_parent = GetTopParent();
-
-        if ( HasPDFlag(wxPD_CAN_ABORT) )
-        {
-            m_sharedData->m_state = Continue;
-            m_sharedData->m_labelCancel = _("Cancel");
-        }
-        else // Dialog can't be cancelled.
-        {
-            // We still must have at least a single button in the dialog so
-            // just don't call it "Cancel" in this case.
-            m_sharedData->m_labelCancel = _("Close");
-        }
-
-        if ( HasPDFlag(wxPD_ELAPSED_TIME |
-                         wxPD_ESTIMATED_TIME |
-                            wxPD_REMAINING_TIME) )
-        {
-            // Use a non-empty string just to have the collapsible pane shown.
-            m_sharedData->m_expandedInformation = " ";
-        }
-
-        // Do launch the thread.
-        if ( m_taskDialogRunner->Create() != wxTHREAD_NO_ERROR )
-        {
-            wxLogError( "Unable to create thread!" );
-            return false;
-        }
-
-        if ( m_taskDialogRunner->Run() != wxTHREAD_NO_ERROR )
-        {
-            wxLogError( "Unable to start thread!" );
-            return false;
-        }
-
-        // Do not show the underlying dialog.
-        return false;
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    return wxGenericProgressDialog::Show( show );
-}
-
-void wxProgressDialog::UpdateExpandedInformation(int value)
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    unsigned long elapsedTime;
-    unsigned long estimatedTime;
-    unsigned long remainingTime;
-    UpdateTimeEstimates(value, elapsedTime, estimatedTime, remainingTime);
-
-    int realEstimatedTime = estimatedTime,
-        realRemainingTime = remainingTime;
-    if ( m_sharedData->m_progressBarMarquee )
-    {
-        // In indeterminate mode we don't have any estimation neither for the
-        // remaining nor for estimated time.
-        realEstimatedTime =
-        realRemainingTime = -1;
-    }
-
-    wxString expandedInformation;
-
-    // Calculate the three different timing values.
-    if ( HasPDFlag(wxPD_ELAPSED_TIME) )
-    {
-        expandedInformation << GetElapsedLabel()
-                            << " "
-                            << GetFormattedTime(elapsedTime);
-    }
-
-    if ( HasPDFlag(wxPD_ESTIMATED_TIME) )
-    {
-        if ( !expandedInformation.empty() )
-            expandedInformation += "\n";
-
-        expandedInformation << GetEstimatedLabel()
-                            << " "
-                            << GetFormattedTime(realEstimatedTime);
-    }
-
-    if ( HasPDFlag(wxPD_REMAINING_TIME) )
-    {
-        if ( !expandedInformation.empty() )
-            expandedInformation += "\n";
-
-        expandedInformation << GetRemainingLabel()
-                            << " "
-                            << GetFormattedTime(realRemainingTime);
-    }
-
-    // Update with new timing information.
-    if ( expandedInformation != m_sharedData->m_expandedInformation )
-    {
-        m_sharedData->m_expandedInformation = expandedInformation;
-        m_sharedData->m_notifications |= wxSPDD_EXPINFO_CHANGED;
-    }
-#else // !wxHAS_MSW_TASKDIALOG
-    wxUnusedVar(value);
-#endif // wxHAS_MSW_TASKDIALOG/!wxHAS_MSW_TASKDIALOG
-}
-
-// ----------------------------------------------------------------------------
-// wxProgressDialogTaskRunner and related methods
-// ----------------------------------------------------------------------------
-
-#ifdef wxHAS_MSW_TASKDIALOG
-
-void* wxProgressDialogTaskRunner::Entry()
-{
-    WinStruct<TASKDIALOGCONFIG> tdc;
-    wxMSWTaskDialogConfig wxTdc;
-
-    {
-        wxCriticalSectionLocker locker(m_sharedData.m_cs);
-
-        wxTdc.caption = m_sharedData.m_title.wx_str();
-        wxTdc.message = m_sharedData.m_message.wx_str();
-
-        // MSWCommonTaskDialogInit() will add an IDCANCEL button but we need to
-        // give it the correct label.
-        wxTdc.btnOKLabel = m_sharedData.m_labelCancel;
-        wxTdc.useCustomLabels = true;
-
-        wxTdc.MSWCommonTaskDialogInit( tdc );
-        tdc.pfCallback = TaskDialogCallbackProc;
-        tdc.lpCallbackData = (LONG_PTR) &m_sharedData;
-
-        // Undo some of the effects of MSWCommonTaskDialogInit().
-        tdc.dwFlags &= ~TDF_EXPAND_FOOTER_AREA; // Expand in content area.
-        tdc.dwCommonButtons = 0; // Don't use common buttons.
-
-        if ( m_sharedData.m_style & wxPD_CAN_SKIP )
-            wxTdc.AddTaskDialogButton( tdc, Id_SkipBtn, 0, _("Skip") );
-
-        tdc.dwFlags |= TDF_CALLBACK_TIMER | TDF_SHOW_PROGRESS_BAR;
-
-        if ( !m_sharedData.m_expandedInformation.empty() )
-        {
-            tdc.pszExpandedInformation =
-                m_sharedData.m_expandedInformation.t_str();
-        }
-    }
-
-    TaskDialogIndirect_t taskDialogIndirect = GetTaskDialogIndirectFunc();
-    if ( !taskDialogIndirect )
-        return NULL;
-
-    int msAns;
-    HRESULT hr = taskDialogIndirect(&tdc, &msAns, NULL, NULL);
-    if ( FAILED(hr) )
-        wxLogApiError( "TaskDialogIndirect", hr );
-
-    // If the main thread is waiting for us to exit inside the event loop in
-    // Update(), wake it up so that it checks our status again.
-    wxWakeUpIdle();
-
-    return NULL;
-}
-
-// static
-HRESULT CALLBACK
-wxProgressDialogTaskRunner::TaskDialogCallbackProc
-                            (
-                                HWND hwnd,
-                                UINT uNotification,
-                                WPARAM wParam,
-                                LPARAM WXUNUSED(lParam),
-                                LONG_PTR dwRefData
-                            )
-{
-    wxProgressDialogSharedData * const sharedData =
-        (wxProgressDialogSharedData *) dwRefData;
-
-    wxCriticalSectionLocker locker(sharedData->m_cs);
-
-    switch ( uNotification )
-    {
-        case TDN_CREATED:
-            // Store the HWND for the main thread use.
-            sharedData->m_hwnd = hwnd;
-
-            // Set the maximum value and disable Close button.
-            ::SendMessage( hwnd,
-                           TDM_SET_PROGRESS_BAR_RANGE,
-                           0,
-                           MAKELPARAM(0, sharedData->m_range) );
-
-            // We always create this task dialog with NULL parent because our
-            // parent in wx sense is a window created from a different thread
-            // and so can't be used as our real parent. However we still center
-            // this window on the parent one as the task dialogs do with their
-            // real parent usually.
-            if ( sharedData->m_parent )
-            {
-                wxRect rect(wxRectFromRECT(wxGetWindowRect(hwnd)));
-                rect = rect.CentreIn(sharedData->m_parent->GetRect());
-                ::SetWindowPos(hwnd,
-                               NULL,
-                               rect.x,
-                               rect.y,
-                               -1,
-                               -1,
-                               SWP_NOACTIVATE |
-                               SWP_NOOWNERZORDER |
-                               SWP_NOSIZE |
-                               SWP_NOZORDER);
-            }
-
-            // If we can't be aborted, the "Close" button will only be enabled
-            // when the progress ends (and not even then with wxPD_AUTO_HIDE).
-            if ( !(sharedData->m_style & wxPD_CAN_ABORT) )
-                ::SendMessage( hwnd, TDM_ENABLE_BUTTON, IDCANCEL, FALSE );
-            break;
-
-        case TDN_BUTTON_CLICKED:
-            switch ( wParam )
-            {
-                case Id_SkipBtn:
-                    ::SendMessage(hwnd, TDM_ENABLE_BUTTON, Id_SkipBtn, FALSE);
-                    sharedData->m_skipped = true;
-                    return TRUE;
-
-                case IDCANCEL:
-                    if ( sharedData->m_state == wxProgressDialog::Finished )
-                    {
-                        // If the main thread is waiting for us, tell it that
-                        // we're gone (and if it doesn't wait, it's harmless).
-                        sharedData->m_state = wxProgressDialog::Dismissed;
-
-                        // Let Windows close the dialog.
-                        return FALSE;
-                    }
-
-                    // Close button on the window triggers an IDCANCEL press,
-                    // don't allow it when it should only be possible to close
-                    // a finished dialog.
-                    if ( sharedData->m_style & wxPD_CAN_ABORT )
-                    {
-                        wxCHECK_MSG
-                        (
-                            sharedData->m_state == wxProgressDialog::Continue,
-                            TRUE,
-                            "Dialog not in a cancelable state!"
-                        );
-
-                        ::SendMessage(hwnd, TDM_ENABLE_BUTTON, Id_SkipBtn, FALSE);
-                        ::SendMessage(hwnd, TDM_ENABLE_BUTTON, IDCANCEL, FALSE);
-
-                        sharedData->m_timeStop = wxGetCurrentTime();
-                        sharedData->m_state = wxProgressDialog::Canceled;
-                    }
-
-                    return TRUE;
-            }
-            break;
-
-        case TDN_TIMER:
-            PerformNotificationUpdates(hwnd, sharedData);
-
-            /*
-                Decide whether we should end the dialog. This is done if either
-                the dialog object itself was destroyed or if the progress
-                finished and we were configured to hide automatically without
-                waiting for the user to dismiss us.
-
-                Notice that we do not close the dialog if it was cancelled
-                because it's up to the user code in the main thread to decide
-                whether it really wants to cancel the dialog.
-             */
-            if ( (sharedData->m_notifications & wxSPDD_DESTROYED) ||
-                    (sharedData->m_state == wxProgressDialog::Finished &&
-                        sharedData->m_style & wxPD_AUTO_HIDE) )
-            {
-                ::EndDialog( hwnd, IDCLOSE );
-            }
-
-            sharedData->m_notifications = 0;
-
-            return TRUE;
-    }
-
-    // Return anything.
-    return 0;
-}
-
-#endif // wxHAS_MSW_TASKDIALOG
-
-#endif // wxUSE_PROGRESSDLG && wxUSE_THREADS
diff --git a/Source/3rd Party/wx/src/msw/radiobox.cpp b/Source/3rd Party/wx/src/msw/radiobox.cpp
index d04e27b6d..381ef69d4 100644
--- a/Source/3rd Party/wx/src/msw/radiobox.cpp	
+++ b/Source/3rd Party/wx/src/msw/radiobox.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: radiobox.cpp 54927 2008-08-02 15:59:13Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,7 +29,6 @@
 #include "wx/radiobox.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/hashmap.h"
     #include "wx/bitmap.h"
     #include "wx/brush.h"
     #include "wx/settings.h"
@@ -75,7 +74,10 @@ wxBEGIN_FLAGS( wxRadioBoxStyle )
     wxFLAGS_MEMBER(wxHSCROLL)
 
     wxFLAGS_MEMBER(wxRA_SPECIFY_COLS)
+    wxFLAGS_MEMBER(wxRA_HORIZONTAL)
     wxFLAGS_MEMBER(wxRA_SPECIFY_ROWS)
+    wxFLAGS_MEMBER(wxRA_VERTICAL)
+
 wxEND_FLAGS( wxRadioBoxStyle )
 
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioBox, wxControl,"wx/radiobox.h")
@@ -111,34 +113,13 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
 // global vars
 // ---------------------------------------------------------------------------
 
-namespace
-{
-
 // the pointer to standard radio button wnd proc
-WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
-
-// Hash allowing to find wxRadioBox containing the given radio button by its
-// HWND. This is used by (subclassed) radio button window proc to find the
-// radio box it belongs to.
-WX_DECLARE_HASH_MAP(HWND, wxRadioBox *,
-                    wxPointerHash, wxPointerEqual,
-                    RadioBoxFromButton);
-
-RadioBoxFromButton gs_boxFromButton;
-
-} // anonymous namespace
+static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
 
 // ===========================================================================
 // implementation
 // ===========================================================================
 
-/* static */
-wxRadioBox* wxRadioBox::GetFromRadioButtonHWND(WXHWND hwnd)
-{
-    const RadioBoxFromButton::const_iterator it = gs_boxFromButton.find(hwnd);
-    return it == gs_boxFromButton.end() ? NULL : it->second;
-}
-
 // ---------------------------------------------------------------------------
 // wxRadioBox creation
 // ---------------------------------------------------------------------------
@@ -148,7 +129,6 @@ void wxRadioBox::Init()
 {
     m_selectedButton = wxNOT_FOUND;
     m_radioButtons = NULL;
-    m_dummyHwnd = NULL;
     m_radioWidth = NULL;
     m_radioHeight = NULL;
 }
@@ -180,15 +160,7 @@ bool wxRadioBox::Create(wxWindow *parent,
     wxUnusedVar(val);
 #endif // wxUSE_VALIDATORS/!wxUSE_VALIDATORS
 
-    // We need an extra one to keep track of the 'dummy' item we
-    // create to end the radio group, so it will be destroyed and
-    // it's id will be released.  But we want it separate from the
-    // other buttons since the wxSubwindows will operate on it as
-    // well and we just want to ignore it until destroying it.
-    // For instance, we don't want the bounding box of the radio
-    // buttons to include the dummy button
     m_radioButtons = new wxSubwindows(n);
-
     m_radioWidth = new int[n];
     m_radioHeight = new int[n];
 
@@ -200,14 +172,14 @@ bool wxRadioBox::Create(wxWindow *parent,
         if ( i == 0 )
             styleBtn |= WS_GROUP;
 
-        wxWindowIDRef subid = NewControlId();
+        long newId = NewControlId();
 
-        HWND hwndBtn = ::CreateWindow(wxT("BUTTON"),
-                                      choices[i].t_str(),
+        HWND hwndBtn = ::CreateWindow(_T("BUTTON"),
+                                      choices[i],
                                       styleBtn,
                                       0, 0, 0, 0,   // will be set in SetSize()
                                       GetHwndOf(parent),
-                                      (HMENU)wxUIntToPtr(subid.GetValue()),
+                                      (HMENU)newId,
                                       wxGetInstance(),
                                       NULL);
 
@@ -218,25 +190,19 @@ bool wxRadioBox::Create(wxWindow *parent,
             return false;
         }
 
-        // Keep track of the subwindow
-        m_radioButtons->Set(i, hwndBtn, subid);
+        (*m_radioButtons)[i] = hwndBtn;
 
         SubclassRadioButton((WXHWND)hwndBtn);
 
-        // Also, make it a subcontrol of this control
-        m_subControls.Add(subid);
+        m_subControls.Add(newId);
     }
 
     // Create a dummy radio control to end the group.
-    m_dummyId = NewControlId();
-
-    m_dummyHwnd = (WXHWND)::CreateWindow(wxT("BUTTON"),
+    (void)::CreateWindow(_T("BUTTON"),
                          wxEmptyString,
                          WS_GROUP | BS_AUTORADIOBUTTON | WS_CHILD,
                          0, 0, 0, 0, GetHwndOf(parent),
-                         (HMENU)wxUIntToPtr(m_dummyId.GetValue()),
-                         wxGetInstance(), NULL);
-
+                         (HMENU)NewControlId(), wxGetInstance(), NULL);
 
     m_radioButtons->SetFont(GetFont());
 
@@ -252,10 +218,6 @@ bool wxRadioBox::Create(wxWindow *parent,
     // Now that we have items determine what is the best size and set it.
     SetInitialSize(size);
 
-    // And update all the buttons positions to match it.
-    const wxSize actualSize = GetSize();
-    PositionAllButtons(pos.x, pos.y, actualSize.x, actualSize.y);
-
     return true;
 }
 
@@ -277,25 +239,9 @@ bool wxRadioBox::Create(wxWindow *parent,
 
 wxRadioBox::~wxRadioBox()
 {
-    SendDestroyEvent();
-
-    // Unsubclass all the radio buttons and remove their soon-to-be-invalid
-    // HWNDs from the global map. Notice that we need to unsubclass because
-    // otherwise we'd need the entries in gs_boxFromButton for the buttons
-    // being deleted to handle the messages generated during their destruction.
-    for ( size_t item = 0; item < m_radioButtons->GetCount(); item++ )
-    {
-        HWND hwnd = m_radioButtons->Get(item);
-
-        wxSetWindowProc(hwnd, reinterpret_cast<WNDPROC>(s_wndprocRadioBtn));
-        gs_boxFromButton.erase(hwnd);
-    }
+    m_isBeingDeleted = true;
 
     delete m_radioButtons;
-
-    if ( m_dummyHwnd )
-        DestroyWindow((HWND)m_dummyHwnd);
-
     delete[] m_radioWidth;
     delete[] m_radioHeight;
 }
@@ -310,18 +256,15 @@ void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
         s_wndprocRadioBtn = (WXFARPROC)wxGetWindowProc(hwndBtn);
 
     wxSetWindowProc(hwndBtn, wxRadioBtnWndProc);
-
-    gs_boxFromButton[hwndBtn] = this;
+    wxSetWindowUserData(hwndBtn, this);
 }
 
 // ----------------------------------------------------------------------------
 // events generation
 // ----------------------------------------------------------------------------
 
-bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id_)
+bool wxRadioBox::MSWCommand(WXUINT cmd, WXWORD id)
 {
-    const int id = (signed short)id_;
-
     if ( cmd == BN_CLICKED )
     {
         if (id == GetId())
@@ -444,7 +387,7 @@ bool wxRadioBox::Enable(unsigned int item, bool enable)
     wxCHECK_MSG( IsValid(item), false,
                  wxT("invalid item in wxRadioBox::Enable()") );
 
-    BOOL ret = MSWEnableHWND((*m_radioButtons)[item], enable);
+    BOOL ret = ::EnableWindow((*m_radioButtons)[item], enable);
 
     return (ret == 0) != enable;
 }
@@ -498,11 +441,9 @@ void wxRadioBox::DoSetItemToolTip(unsigned int item, wxToolTip *tooltip)
     // we have already checked for the item to be valid in wxRadioBoxBase
     const HWND hwndRbtn = (*m_radioButtons)[item];
     if ( tooltip != NULL )
-        tooltip->AddOtherWindow(hwndRbtn);
+        tooltip->Add(hwndRbtn);
     else // unset the tooltip
-        wxToolTip::Remove(hwndRbtn, 0, wxRect(0,0,0,0));
-        // the second parameter can be zero since it's ignored by Remove()
-        // as we pass a rect for which wxRect::IsEmpty()==true...
+        wxToolTip::Remove(hwndRbtn);
 }
 
 #endif // wxUSE_TOOLTIPS
@@ -605,40 +546,57 @@ wxSize wxRadioBox::DoGetBestSize() const
     return best;
 }
 
+// Restored old code.
 void wxRadioBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
-    if ( (width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH)) ||
-            (height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT)) )
-    {
-        // Attempt to have a look coherent with other platforms: We compute the
-        // biggest toggle dim, then we align all items according this value.
-        const wxSize totSize = GetTotalButtonSize(GetMaxButtonSize());
+    int currentX, currentY;
+    GetPosition(&currentX, &currentY);
+    int widthOld, heightOld;
+    GetSize(&widthOld, &heightOld);
 
-        // only change our width/height if asked for
-        if ( width == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_WIDTH) )
-            width = totSize.x;
+    int xx = x;
+    int yy = y;
 
-        if ( height == wxDefaultCoord && (sizeFlags & wxSIZE_AUTO_HEIGHT) )
-            height = totSize.y;
-    }
+    if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        xx = currentX;
+    if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+        yy = currentY;
 
-    wxStaticBox::DoSetSize(x, y, width, height);
-}
+    int y_offset = yy;
+    int x_offset = xx;
 
-void wxRadioBox::DoMoveWindow(int x, int y, int width, int height)
-{
-    wxStaticBox::DoMoveWindow(x, y, width, height);
+    int cx1, cy1;
+    wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
 
-    PositionAllButtons(x, y, width, height);
-}
-
-void
-wxRadioBox::PositionAllButtons(int x, int y, int width, int WXUNUSED(height))
-{
+    // Attempt to have a look coherent with other platforms: We compute the
+    // biggest toggle dim, then we align all items according this value.
     wxSize maxSize = GetMaxButtonSize();
     int maxWidth = maxSize.x,
         maxHeight = maxSize.y;
 
+    wxSize totSize = GetTotalButtonSize(maxSize);
+    int totWidth = totSize.x,
+        totHeight = totSize.y;
+
+    // only change our width/height if asked for
+    if ( width == wxDefaultCoord )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+            width = totWidth;
+        else
+            width = widthOld;
+    }
+
+    if ( height == wxDefaultCoord )
+    {
+        if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+            height = totHeight;
+        else
+            height = heightOld;
+    }
+
+    DoMoveWindow(xx, yy, width, height);
+
     // Now position all the buttons: the current button will be put at
     // wxPoint(x_offset, y_offset) and the new row/column will start at
     // startX/startY. The size of all buttons will be the same wxSize(maxWidth,
@@ -650,11 +608,8 @@ wxRadioBox::PositionAllButtons(int x, int y, int width, int WXUNUSED(height))
     // wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and
     // GetMajorDim() is the number of rows.
 
-    int cx1, cy1;
-    wxGetCharSize(m_hWnd, &cx1, &cy1, GetFont());
-
-    int x_offset = x + cx1;
-    int y_offset = y + cy1;
+    x_offset += cx1;
+    y_offset += cy1;
 
     // Add extra space under the label, if it exists.
     if (!wxControl::GetLabel().empty())
@@ -792,10 +747,6 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
                                            WPARAM wParam,
                                            LPARAM lParam)
 {
-
-    wxRadioBox * const radiobox = wxRadioBox::GetFromRadioButtonHWND(hwnd);
-    wxCHECK_MSG( radiobox, 0, wxT("Should have the associated radio box") );
-
     switch ( message )
     {
         case WM_GETDLGCODE:
@@ -811,6 +762,10 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
 
         case WM_KEYDOWN:
             {
+                wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
+
+                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+
                 bool processed = true;
 
                 wxDirection dir;
@@ -866,6 +821,10 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
         case WM_SETFOCUS:
         case WM_KILLFOCUS:
             {
+                wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
+
+                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+
                 // if we don't do this, no focus events are generated for the
                 // radiobox and, besides, we need to notify the parent about
                 // the focus change, otherwise the focus handling logic in
@@ -880,6 +839,10 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
 #ifndef __WXWINCE__
         case WM_HELP:
             {
+                wxRadioBox *radiobox = (wxRadioBox *)wxGetWindowUserData(hwnd);
+
+                wxCHECK_MSG( radiobox, 0, wxT("radio button without radio box?") );
+
                 bool processed = false;
 
                 wxEvtHandler * const handler = radiobox->GetEventHandler();
diff --git a/Source/3rd Party/wx/src/msw/radiobut.cpp b/Source/3rd Party/wx/src/msw/radiobut.cpp
index 715662ebf..48b6d6b80 100644
--- a/Source/3rd Party/wx/src/msw/radiobut.cpp	
+++ b/Source/3rd Party/wx/src/msw/radiobut.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: radiobut.cpp 58752 2009-02-08 10:17:47Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -44,6 +44,62 @@
 // wxRadioButton creation
 // ----------------------------------------------------------------------------
 
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxRadioButtonStyle )
+
+wxBEGIN_FLAGS( wxRadioButtonStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxRB_GROUP)
+
+wxEND_FLAGS( wxRadioButtonStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl,"wx/radiobut.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxRadioButton)
+    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_RADIOBUTTON_SELECTED , wxCommandEvent )
+    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString(), 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Value ,bool, SetValue, GetValue, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY_FLAGS( WindowStyle , wxRadioButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxRadioButton)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxRadioButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
+#endif
+
+
 void wxRadioButton::Init()
 {
     m_isChecked = false;
@@ -79,7 +135,7 @@ bool wxRadioButton::Create(wxWindow *parent,
     if ( HasFlag(wxALIGN_RIGHT) )
         msStyle |= BS_LEFTTEXT | BS_RIGHT;
 
-    if ( !MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0) )
+    if ( !MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, 0) )
         return false;
 
     // for compatibility with wxGTK, the first radio button in a group is
@@ -116,12 +172,12 @@ void wxRadioButton::SetValue(bool value)
     wxWindow * const focus = FindFocus();
     wxTopLevelWindow * const
         tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
-    wxCHECK_RET( tlw, wxT("radio button outside of TLW?") );
+    wxCHECK_RET( tlw, _T("radio button outside of TLW?") );
     wxWindow * const focusInTLW = tlw->GetLastFocus();
 
     const wxWindowList& siblings = GetParent()->GetChildren();
     wxWindowList::compatibility_iterator nodeThis = siblings.Find(this);
-    wxCHECK_RET( nodeThis, wxT("radio button not a child of its parent?") );
+    wxCHECK_RET( nodeThis, _T("radio button not a child of its parent?") );
 
     // this will be set to true in the code below if the focus is in our TLW
     // and belongs to one of the other buttons in the same group
@@ -206,7 +262,7 @@ bool wxRadioButton::GetValue() const
 {
     wxASSERT_MSG( m_isChecked ==
                     (::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0L) != 0),
-                  wxT("wxRadioButton::m_isChecked is out of sync?") );
+                  _T("wxRadioButton::m_isChecked is out of sync?") );
 
     return m_isChecked;
 }
@@ -256,13 +312,6 @@ wxSize wxRadioButton::DoGetBestSize() const
         dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
         s_radioSize = dc.GetCharHeight();
-
-        // radio button bitmap size under CE is bigger than the font height,
-        // adding just one pixel seems to work fine for the default font but it
-        // would be nice to find some better way to find the correct height
-#ifdef __WXWINCE__
-        s_radioSize++;
-#endif // __WXWINCE__
     }
 
     wxString str = GetLabel();
diff --git a/Source/3rd Party/wx/src/msw/regconf.cpp b/Source/3rd Party/wx/src/msw/regconf.cpp
index e225d975d..c9f9a6f46 100644
--- a/Source/3rd Party/wx/src/msw/regconf.cpp	
+++ b/Source/3rd Party/wx/src/msw/regconf.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     27.04.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: regconf.cpp 44126 2007-01-07 16:36:54Z VZ $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_CONFIG && wxUSE_REGKEY
+#if wxUSE_CONFIG
 
 #include "wx/config.h"
 
@@ -53,11 +53,6 @@ bool TryGetValue(const wxRegKey& key, const wxString& str, long *plVal)
   return key.IsOpened() && key.HasValue(str) && key.QueryValue(str, plVal);
 }
 
-bool TryGetValue(const wxRegKey& key, const wxString& str, wxMemoryBuffer &plVal)
-{
-  return key.IsOpened() && key.HasValue(str) && key.QueryValue(str, plVal);
-}
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -65,7 +60,6 @@ bool TryGetValue(const wxRegKey& key, const wxString& str, wxMemoryBuffer &plVal
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxRegConfig, wxConfigBase)
 
 // create the config object which stores its data under HKCU\vendor\app and, if
 // style & wxCONFIG_USE_GLOBAL_FILE, under HKLM\vendor\app
@@ -79,7 +73,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
   bool bDoUseGlobal = (style & wxCONFIG_USE_GLOBAL_FILE) != 0;
 
   // the convention is to put the programs keys under <vendor>\<appname>
-  // (but it can be overridden by specifying the pathes explicitly in strLocal
+  // (but it can be overriden by specifying the pathes explicitly in strLocal
   // and/or strGlobal)
   if ( strLocal.empty() || (strGlobal.empty() && bDoUseGlobal) )
   {
@@ -251,7 +245,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
                 // note that we don't have to check for src < end here as
                 // *end == 0 so can't be '.'
-                if ( src[1] == wxT('.') && src[2] == wxT('.') &&
+                if ( src[1] == _T('.') && src[2] == _T('.') &&
                      (src + 3 == end || src[3] == wxCONFIG_PATH_SEPARATOR) )
                 {
                     if ( !totalSlashes )
@@ -286,7 +280,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
 
                         // we must have found a slash one way or another!
                         wxASSERT_MSG( *dst == wxCONFIG_PATH_SEPARATOR,
-                                      wxT("error in wxRegConfig::SetPath") );
+                                      _T("error in wxRegConfig::SetPath") );
 
                         // stay at the same position
                         dst--;
@@ -331,7 +325,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
             dst--;
         }
 
-        *dst = wxT('\0');
+        *dst = _T('\0');
         buf.SetLength(dst - start);
     }
 
@@ -356,7 +350,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
         for ( ; src < end; src++, dst++ )
         {
             if ( *src == wxCONFIG_PATH_SEPARATOR )
-                *dst = wxT('\\');
+                *dst = _T('\\');
             else
                 *dst = *src;
         }
@@ -556,14 +550,14 @@ wxConfigBase::EntryType wxRegConfig::GetEntryType(const wxString& key) const
 
 bool wxRegConfig::DoReadString(const wxString& key, wxString *pStr) const
 {
-    wxCHECK_MSG( pStr, false, wxT("wxRegConfig::Read(): NULL param") );
+    wxCHECK_MSG( pStr, false, _T("wxRegConfig::Read(): NULL param") );
 
   wxConfigPathChanger path(this, key);
 
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not
-  // overridden by the local key with the same name
+  // overriden by the local key with the same name
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), *pStr) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
@@ -593,14 +587,14 @@ bool wxRegConfig::DoReadString(const wxString& key, wxString *pStr) const
 
 bool wxRegConfig::DoReadLong(const wxString& key, long *plResult) const
 {
-    wxCHECK_MSG( plResult, false, wxT("wxRegConfig::Read(): NULL param") );
+    wxCHECK_MSG( plResult, false, _T("wxRegConfig::Read(): NULL param") );
 
   wxConfigPathChanger path(this, key);
 
   bool bQueryGlobal = true;
 
   // if immutable key exists in global key we must check that it's not
-  // overridden by the local key with the same name
+  // overriden by the local key with the same name
   if ( IsImmutable(path.Name()) ) {
     if ( TryGetValue(m_keyGlobal, path.Name(), plResult) ) {
       if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
@@ -625,40 +619,6 @@ bool wxRegConfig::DoReadLong(const wxString& key, long *plResult) const
   return false;
 }
 
-bool wxRegConfig::DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const
-{
-    wxCHECK_MSG( buf, false, wxT("wxRegConfig::Read(): NULL param") );
-
-  wxConfigPathChanger path(this, key);
-
-  bool bQueryGlobal = true;
-
-  // if immutable key exists in global key we must check that it's not
-  // overridden by the local key with the same name
-  if ( IsImmutable(path.Name()) ) {
-    if ( TryGetValue(m_keyGlobal, path.Name(), *buf) ) {
-      if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
-        wxLogWarning(wxT("User value for immutable key '%s' ignored."),
-                   path.Name().c_str());
-      }
-
-      return true;
-    }
-    else {
-      // don't waste time - it's not there anyhow
-      bQueryGlobal = false;
-    }
-  }
-
-  // first try local key
-  if ( (m_keyLocal.Exists() && TryGetValue(LocalKey(), path.Name(), *buf)) ||
-       (bQueryGlobal && TryGetValue(m_keyGlobal, path.Name(), *buf)) ) {
-    return true;
-  }
-
-  return false;
-}
-
 bool wxRegConfig::DoWriteString(const wxString& key, const wxString& szValue)
 {
   wxConfigPathChanger path(this, key);
@@ -683,18 +643,6 @@ bool wxRegConfig::DoWriteLong(const wxString& key, long lValue)
   return LocalKey().SetValue(path.Name(), lValue);
 }
 
-bool wxRegConfig::DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf)
-{
-  wxConfigPathChanger path(this, key);
-
-  if ( IsImmutable(path.Name()) ) {
-    wxLogError(wxT("Can't change immutable entry '%s'."), path.Name().c_str());
-    return false;
-  }
-
-  return LocalKey().SetValue(path.Name(), buf);
-}
-
 // ----------------------------------------------------------------------------
 // renaming
 // ----------------------------------------------------------------------------
@@ -739,7 +687,7 @@ bool wxRegConfig::DeleteEntry(const wxString& value, bool bGroupIfEmptyAlso)
 
     if ( bGroupIfEmptyAlso && m_keyLocal.IsEmpty() ) {
       wxString strKey = GetPath().AfterLast(wxCONFIG_PATH_SEPARATOR);
-      SetPath(wxT(".."));  // changes m_keyLocal
+      SetPath(_T(".."));  // changes m_keyLocal
       return LocalKey().DeleteKey(strKey);
     }
   }
@@ -780,4 +728,4 @@ bool wxRegConfig::DeleteAll()
   return bOk;
 }
 
-#endif // wxUSE_CONFIG && wxUSE_REGKEY
+#endif // wxUSE_CONFIG
diff --git a/Source/3rd Party/wx/src/msw/region.cpp b/Source/3rd Party/wx/src/msw/region.cpp
index f0963013e..66794f594 100644
--- a/Source/3rd Party/wx/src/msw/region.cpp	
+++ b/Source/3rd Party/wx/src/msw/region.cpp	
@@ -4,7 +4,7 @@
 // Author:    Vadim Zeitlin
 // Modified by:
 // Created:   Fri Oct 24 10:46:34 MET 1997
-// RCS-ID:    $Id$
+// RCS-ID:    $Id: region.cpp 41429 2006-09-25 11:47:23Z VZ $
 // Copyright: (c) 1997-2002 wxWidgets team
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -72,7 +72,7 @@ public:
 
 private:
 // Cannot use
-//  wxDECLARE_NO_COPY_CLASS(wxRegionRefData);
+//  DECLARE_NO_COPY_CLASS(wxRegionRefData)
 // because copy constructor is explicitly declared above;
 // but no copy assignment operator is defined, so declare
 // it private to prevent the compiler from defining it:
@@ -92,7 +92,7 @@ private:
 
 wxRegion::wxRegion()
 {
-    m_refData = NULL;
+    m_refData = (wxRegionRefData *)NULL;
 }
 
 wxRegion::wxRegion(WXHRGN hRegion)
@@ -119,7 +119,7 @@ wxRegion::wxRegion(const wxRect& rect)
     M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 }
 
-wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)
+wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
 {
 #if defined(__WXMICROWIN__) || defined(__WXWINCE__)
     wxUnusedVar(n);
@@ -143,12 +143,12 @@ wxRegion::~wxRegion()
     // m_refData unrefed in ~wxObject
 }
 
-wxGDIRefData *wxRegion::CreateGDIRefData() const
+wxObjectRefData *wxRegion::CreateRefData() const
 {
     return new wxRegionRefData;
 }
 
-wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
+wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
 {
     return new wxRegionRefData(*(wxRegionRefData *)data);
 }
@@ -165,8 +165,7 @@ void wxRegion::Clear()
 
 bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 {
-    const HRGN hrgn = GetHrgn();
-    wxCHECK_MSG( hrgn, false, wxT("invalid wxRegion") );
+    wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") );
 
     if ( !x && !y )
     {
@@ -176,9 +175,9 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 
     AllocExclusive();
 
-    if ( ::OffsetRgn(hrgn, x, y) == ERROR )
+    if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR )
     {
-        wxLogLastError(wxT("OffsetRgn"));
+        wxLogLastError(_T("OffsetRgn"));
 
         return false;
     }
@@ -203,7 +202,7 @@ bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op)
                 break;
 
             default:
-                wxFAIL_MSG( wxT("unknown region operation") );
+                wxFAIL_MSG( _T("unknown region operation") );
                 // fall through
 
             case wxRGN_AND:
@@ -236,7 +235,7 @@ bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op)
                 break;
 
             default:
-                wxFAIL_MSG( wxT("unknown region operation") );
+                wxFAIL_MSG( _T("unknown region operation") );
                 // fall through
 
             case wxRGN_COPY:
@@ -246,7 +245,7 @@ bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op)
 
         if ( ::CombineRgn(M_REGION, M_REGION, M_REGION_OF(rgn), mode) == ERROR )
         {
-            wxLogLastError(wxT("CombineRgn"));
+            wxLogLastError(_T("CombineRgn"));
 
             return false;
         }
@@ -385,7 +384,12 @@ void wxRegionIterator::Reset(const wxRegion& region)
     m_current = 0;
     m_region = region;
 
-    wxDELETEA(m_rects);
+    if (m_rects)
+    {
+        delete[] m_rects;
+
+        m_rects = NULL;
+    }
 
     if (m_region.Empty())
         m_numRects = 0;
@@ -437,28 +441,28 @@ wxRegionIterator wxRegionIterator::operator ++ (int)
 
 wxCoord wxRegionIterator::GetX() const
 {
-    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
 
     return m_rects[m_current].x;
 }
 
 wxCoord wxRegionIterator::GetY() const
 {
-    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
 
     return m_rects[m_current].y;
 }
 
 wxCoord wxRegionIterator::GetW() const
 {
-    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
 
     return m_rects[m_current].width;
 }
 
 wxCoord wxRegionIterator::GetH() const
 {
-    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
 
     return m_rects[m_current].height;
 }
diff --git a/Source/3rd Party/wx/src/msw/registry.cpp b/Source/3rd Party/wx/src/msw/registry.cpp
index 72abb0a20..7cbb8644e 100644
--- a/Source/3rd Party/wx/src/msw/registry.cpp	
+++ b/Source/3rd Party/wx/src/msw/registry.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     03.04.98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: registry.cpp 47482 2007-07-15 14:12:08Z VS $
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 // TODO:        - parsing of registry key names
@@ -19,24 +19,19 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_REGKEY
-
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapwin.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
-    #include "wx/crt.h"
-    #include "wx/utils.h"
 #endif
 
-#include "wx/dynlib.h"
 #include "wx/file.h"
 #include "wx/wfstream.h"
-#include "wx/msw/private.h"
 
 // Windows headers
 #ifdef __WXWINCE__
+#include "wx/msw/private.h"
 #include <winbase.h>
 #include <winreg.h>
 #endif
@@ -68,10 +63,6 @@ typedef BYTE* RegBinary;
     #define HKEY_DYN_DATA ((HKEY)0x80000006)
 #endif
 
-#ifndef KEY_WOW64_64KEY
-    #define KEY_WOW64_64KEY 0x0100
-#endif
-
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -120,28 +111,16 @@ aStdKeys[] =
 static inline void RemoveTrailingSeparator(wxString& str);
 
 // returns true if given registry key exists
-static bool KeyExists(
-    WXHKEY hRootKey,
-    const wxString& szKey,
-    wxRegKey::WOW64ViewMode viewMode = wxRegKey::WOW64ViewMode_Default);
+static bool KeyExists(WXHKEY hRootKey, const wxChar *szKey);
 
-// return the WOW64 registry view flag which can be used with MSW registry
-// functions for opening the key in the specified view
-static long GetMSWViewFlags(wxRegKey::WOW64ViewMode viewMode);
+// combines value and key name (uses static buffer!)
+static const wxChar *GetFullName(const wxRegKey *pKey,
+                               const wxChar *szValue = NULL);
 
-// return the access rights which can be used with MSW registry functions for
-// opening the key in the specified mode
-static long
-GetMSWAccessFlags(wxRegKey::AccessMode mode, wxRegKey::WOW64ViewMode viewMode);
-
-// combines value and key name
-static wxString GetFullName(const wxRegKey *pKey);
-static wxString GetFullName(const wxRegKey *pKey, const wxString& szValue);
-
-// returns "value" argument of wxRegKey methods converted into a value that can
-// be passed to win32 registry functions; specifically, converts empty string
-// to NULL
-static inline const wxChar *RegValueStr(const wxString& szValue);
+static inline const wxChar *RegValueStr(const wxChar *szValue)
+{
+    return wxIsEmpty(szValue) ? NULL : szValue;
+}
 
 // ============================================================================
 // implementation of wxRegKey class
@@ -213,15 +192,14 @@ wxRegKey::StdKey wxRegKey::GetStdKeyFromHkey(WXHKEY hkey)
 // ctors and dtor
 // ----------------------------------------------------------------------------
 
-wxRegKey::wxRegKey(WOW64ViewMode viewMode) : m_viewMode(viewMode)
+wxRegKey::wxRegKey()
 {
   m_hRootKey = (WXHKEY) aStdKeys[HKCR].hkey;
 
   Init();
 }
 
-wxRegKey::wxRegKey(const wxString& strKey, WOW64ViewMode viewMode)
-    : m_strKey(strKey), m_viewMode(viewMode)
+wxRegKey::wxRegKey(const wxString& strKey) : m_strKey(strKey)
 {
   m_hRootKey  = (WXHKEY) aStdKeys[ExtractKeyName(m_strKey)].hkey;
 
@@ -229,10 +207,7 @@ wxRegKey::wxRegKey(const wxString& strKey, WOW64ViewMode viewMode)
 }
 
 // parent is a predefined (and preopened) key
-wxRegKey::wxRegKey(StdKey keyParent,
-                   const wxString& strKey,
-                   WOW64ViewMode viewMode)
-    : m_strKey(strKey), m_viewMode(viewMode)
+wxRegKey::wxRegKey(StdKey keyParent, const wxString& strKey) : m_strKey(strKey)
 {
   RemoveTrailingSeparator(m_strKey);
   m_hRootKey  = (WXHKEY) aStdKeys[keyParent].hkey;
@@ -242,7 +217,7 @@ wxRegKey::wxRegKey(StdKey keyParent,
 
 // parent is a normal regkey
 wxRegKey::wxRegKey(const wxRegKey& keyParent, const wxString& strKey)
-    : m_strKey(keyParent.m_strKey), m_viewMode(keyParent.GetView())
+        : m_strKey(keyParent.m_strKey)
 {
   // combine our name with parent's to get the full name
   if ( !m_strKey.empty() &&
@@ -316,18 +291,6 @@ void wxRegKey::SetHkey(WXHKEY hKey)
   Close();
 
   m_hKey = hKey;
-
-  // we don't know the parent of this key, assume HKLM by default
-  m_hRootKey = HKEY_LOCAL_MACHINE;
-
-  // we don't know in which mode was this key opened but we can't reopen it
-  // anyhow because we don't know its name, so the only thing we can is to hope
-  // that it allows all the operations which we're going to perform on it
-  m_mode = Write;
-
-  // reset old data
-  m_strKey.clear();
-  m_dwLastError = 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -338,9 +301,7 @@ void wxRegKey::SetHkey(WXHKEY hKey)
 bool wxRegKey::Exists() const
 {
   // opened key has to exist, try to open it if not done yet
-  return IsOpened()
-      ? true
-      : KeyExists(m_hRootKey, m_strKey, m_viewMode);
+  return IsOpened() ? true : KeyExists(m_hRootKey, m_strKey);
 }
 
 // returns the full name of the key (prefix is abbreviated if bShortPrefix)
@@ -350,7 +311,7 @@ wxString wxRegKey::GetName(bool bShortPrefix) const
   wxString str = bShortPrefix ? aStdKeys[key].szShortName
                               : aStdKeys[key].szName;
   if ( !m_strKey.empty() )
-    str << wxT("\\") << m_strKey;
+    str << _T("\\") << m_strKey;
 
   return str;
 }
@@ -360,57 +321,36 @@ bool wxRegKey::GetKeyInfo(size_t *pnSubKeys,
                           size_t *pnValues,
                           size_t *pnMaxValueLen) const
 {
-  // it might be unexpected to some that this function doesn't open the key
-  wxASSERT_MSG( IsOpened(), wxT("key should be opened in GetKeyInfo") );
-
-  // We need to use intermediate variables in 64 bit build as the function
-  // parameters must be 32 bit DWORDs and not 64 bit size_t values.
-#ifdef __WIN64__
-  DWORD dwSubKeys = 0,
-        dwMaxKeyLen = 0,
-        dwValues = 0,
-        dwMaxValueLen = 0;
-
-  #define REG_PARAM(name) &dw##name
-#else // Win32
-  // Old gcc headers incorrectly prototype RegQueryInfoKey() as taking
-  // size_t but normally we need a cast, even when sizeof(size_t) is the same
-  // as sizeof(DWORD).
-  #if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
-    #define REG_PARAM(name) pn##name
-  #else
-    #define REG_PARAM(name)   (LPDWORD)(pn##name)
-  #endif
+    // old gcc headers incorrectly prototype RegQueryInfoKey()
+#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
+    #define REG_PARAM   (size_t *)
+#else
+    #define REG_PARAM   (LPDWORD)
 #endif
 
+  // it might be unexpected to some that this function doesn't open the key
+  wxASSERT_MSG( IsOpened(), _T("key should be opened in GetKeyInfo") );
 
   m_dwLastError = ::RegQueryInfoKey
                   (
                     (HKEY) m_hKey,
-                    NULL,                   // class name
-                    NULL,                   // (ptr to) size of class name buffer
+                    NULL,           // class name
+                    NULL,           // (ptr to) size of class name buffer
                     RESERVED,
-                    REG_PARAM(SubKeys),     // [out] number of subkeys
-                    REG_PARAM(MaxKeyLen),   // [out] max length of a subkey name
-                    NULL,                   // longest subkey class name
-                    REG_PARAM(Values),      // [out] number of values
-                    REG_PARAM(MaxValueLen), // [out] max length of a value name
-                    NULL,                   // longest value data
-                    NULL,                   // security descriptor
-                    NULL                    // time of last modification
+                    REG_PARAM
+                    pnSubKeys,      // [out] number of subkeys
+                    REG_PARAM
+                    pnMaxKeyLen,    // [out] max length of a subkey name
+                    NULL,           // longest subkey class name
+                    REG_PARAM
+                    pnValues,       // [out] number of values
+                    REG_PARAM
+                    pnMaxValueLen,  // [out] max length of a value name
+                    NULL,           // longest value data
+                    NULL,           // security descriptor
+                    NULL            // time of last modification
                   );
 
-#ifdef __WIN64__
-  if ( pnSubKeys )
-    *pnSubKeys = dwSubKeys;
-  if ( pnMaxKeyLen )
-    *pnMaxKeyLen = dwMaxKeyLen;
-  if ( pnValues )
-    *pnValues = dwValues;
-  if ( pnMaxValueLen )
-    *pnMaxValueLen = dwMaxValueLen;
-#endif // __WIN64__
-
 #undef REG_PARAM
 
   if ( m_dwLastError != ERROR_SUCCESS ) {
@@ -442,9 +382,9 @@ bool wxRegKey::Open(AccessMode mode)
     m_dwLastError = ::RegOpenKeyEx
                     (
                         (HKEY) m_hRootKey,
-                        m_strKey.t_str(),
+                        m_strKey,
                         RESERVED,
-                        GetMSWAccessFlags(mode, m_viewMode),
+                        mode == Read ? KEY_READ : KEY_ALL_ACCESS,
                         &tmpKey
                     );
 
@@ -472,17 +412,19 @@ bool wxRegKey::Create(bool bOkIfExists)
     return true;
 
   HKEY tmpKey;
+#ifdef __WXWINCE__
   DWORD disposition;
-  // Minimum supported OS for RegCreateKeyEx: Win 95, Win NT 3.1, Win CE 1.0
-  m_dwLastError = RegCreateKeyEx((HKEY) m_hRootKey, m_strKey.t_str(),
-      0,    // reserved and must be 0
-      NULL, // The user-defined class type of this key.
-      REG_OPTION_NON_VOLATILE, // supports other values as well; see MS docs
-      GetMSWAccessFlags(wxRegKey::Write, m_viewMode),
-      NULL, // pointer to a SECURITY_ATTRIBUTES structure
+  m_dwLastError = RegCreateKeyEx((HKEY) m_hRootKey, m_strKey,
+      NULL, // reserved
+      NULL, // class string
+      0,
+      0,
+      NULL,
       &tmpKey,
       &disposition);
-
+#else
+  m_dwLastError = RegCreateKey((HKEY) m_hRootKey, m_strKey, &tmpKey);
+#endif
   if ( m_dwLastError != ERROR_SUCCESS ) {
     wxLogSysError(m_dwLastError, _("Can't create registry key '%s'"),
                   GetName().c_str());
@@ -513,8 +455,7 @@ bool wxRegKey::Close()
   return true;
 }
 
-bool
-wxRegKey::RenameValue(const wxString& szValueOld, const wxString& szValueNew)
+bool wxRegKey::RenameValue(const wxChar *szValueOld, const wxChar *szValueNew)
 {
     bool ok = true;
     if ( HasValue(szValueNew) ) {
@@ -535,14 +476,13 @@ wxRegKey::RenameValue(const wxString& szValueOld, const wxString& szValueNew)
     return true;
 }
 
-bool wxRegKey::CopyValue(const wxString& szValue,
+bool wxRegKey::CopyValue(const wxChar *szValue,
                          wxRegKey& keyDst,
-                         const wxString& szValueNew)
+                         const wxChar *szValueNew)
 {
-    wxString valueNew(szValueNew);
-    if ( valueNew.empty() ) {
+    if ( wxIsEmpty(szValueNew) ) {
         // by default, use the same name
-        valueNew = szValue;
+        szValueNew = szValue;
     }
 
     switch ( GetValueType(szValue) ) {
@@ -550,7 +490,7 @@ bool wxRegKey::CopyValue(const wxString& szValue,
             {
                 wxString strVal;
                 return QueryValue(szValue, strVal) &&
-                       keyDst.SetValue(valueNew, strVal);
+                       keyDst.SetValue(szValueNew, strVal);
             }
 
         case Type_Dword:
@@ -558,14 +498,14 @@ bool wxRegKey::CopyValue(const wxString& szValue,
             {
                 long dwVal;
                 return QueryValue(szValue, &dwVal) &&
-                       keyDst.SetValue(valueNew, dwVal);
+                       keyDst.SetValue(szValueNew, dwVal);
             }
 
         case Type_Binary:
         {
             wxMemoryBuffer buf;
             return QueryValue(szValue,buf) &&
-                   keyDst.SetValue(valueNew,buf);
+                   keyDst.SetValue(szValueNew,buf);
         }
 
         // these types are unsupported because I am not sure about how
@@ -587,9 +527,9 @@ bool wxRegKey::CopyValue(const wxString& szValue,
     }
 }
 
-bool wxRegKey::Rename(const wxString& szNewName)
+bool wxRegKey::Rename(const wxChar *szNewName)
 {
-    wxCHECK_MSG( !m_strKey.empty(), false, wxT("registry hives can't be renamed") );
+    wxCHECK_MSG( !m_strKey.empty(), false, _T("registry hives can't be renamed") );
 
     if ( !Exists() ) {
         wxLogError(_("Registry key '%s' does not exist, cannot rename it."),
@@ -642,7 +582,7 @@ bool wxRegKey::Rename(const wxString& szNewName)
     return ok;
 }
 
-bool wxRegKey::Copy(const wxString& szNewName)
+bool wxRegKey::Copy(const wxChar *szNewName)
 {
     // create the new key first
     wxRegKey keyDst(szNewName);
@@ -671,7 +611,7 @@ bool wxRegKey::Copy(wxRegKey& keyDst)
         wxRegKey key(*this, strKey);
         wxString keyName;
         keyName << GetFullName(&keyDst) << REG_SEPARATOR << strKey;
-        ok = key.Copy(keyName);
+        ok = key.Copy((const wxChar*) keyName);
 
         if ( ok )
             bCont = GetNextKey(strKey, lIndex);
@@ -753,25 +693,8 @@ bool wxRegKey::DeleteSelf()
   // now delete this key itself
   Close();
 
+  m_dwLastError = RegDeleteKey((HKEY) m_hRootKey, m_strKey);
   // deleting a key which doesn't exist is not considered an error
-#if wxUSE_DYNLIB_CLASS
-  wxDynamicLibrary dllAdvapi32(wxT("advapi32"));
-  // Minimum supported OS for RegDeleteKeyEx: Vista, XP Pro x64, Win Server 2008, Win Server 2003 SP1
-  if(dllAdvapi32.HasSymbol(wxT("RegDeleteKeyEx")))
-  {
-    typedef LONG (WINAPI *RegDeleteKeyEx_t)(HKEY, LPCTSTR, REGSAM, DWORD);
-    wxDYNLIB_FUNCTION(RegDeleteKeyEx_t, RegDeleteKeyEx, dllAdvapi32);
-
-    m_dwLastError = (*pfnRegDeleteKeyEx)((HKEY) m_hRootKey, m_strKey.t_str(),
-        GetMSWViewFlags(m_viewMode),
-        0);    // This parameter is reserved and must be zero.
-  }
-  else
-#endif // wxUSE_DYNLIB_CLASS
-  {
-    m_dwLastError = RegDeleteKey((HKEY) m_hRootKey, m_strKey.t_str());
-  }
-
   if ( m_dwLastError != ERROR_SUCCESS &&
           m_dwLastError != ERROR_FILE_NOT_FOUND ) {
     wxLogSysError(m_dwLastError, _("Can't delete key '%s'"),
@@ -782,7 +705,7 @@ bool wxRegKey::DeleteSelf()
   return true;
 }
 
-bool wxRegKey::DeleteKey(const wxString& szKey)
+bool wxRegKey::DeleteKey(const wxChar *szKey)
 {
   if ( !Open() )
     return false;
@@ -791,7 +714,7 @@ bool wxRegKey::DeleteKey(const wxString& szKey)
   return key.DeleteSelf();
 }
 
-bool wxRegKey::DeleteValue(const wxString& szValue)
+bool wxRegKey::DeleteValue(const wxChar *szValue)
 {
     if ( !Open() )
         return false;
@@ -815,7 +738,7 @@ bool wxRegKey::DeleteValue(const wxString& szValue)
 // ----------------------------------------------------------------------------
 
 // return true if value exists
-bool wxRegKey::HasValue(const wxString& szValue) const
+bool wxRegKey::HasValue(const wxChar *szValue) const
 {
     // this function should be silent, so suppress possible messages from Open()
     wxLogNull nolog;
@@ -855,7 +778,7 @@ bool wxRegKey::HasSubkeys() const
 }
 
 // returns true if given subkey exists
-bool wxRegKey::HasSubKey(const wxString& szKey) const
+bool wxRegKey::HasSubKey(const wxChar *szKey) const
 {
   // this function should be silent, so suppress possible messages from Open()
   wxLogNull nolog;
@@ -863,10 +786,10 @@ bool wxRegKey::HasSubKey(const wxString& szKey) const
   if ( !CONST_CAST Open(Read) )
     return false;
 
-  return KeyExists(m_hKey, szKey, m_viewMode);
+  return KeyExists(m_hKey, szKey);
 }
 
-wxRegKey::ValueType wxRegKey::GetValueType(const wxString& szValue) const
+wxRegKey::ValueType wxRegKey::GetValueType(const wxChar *szValue) const
 {
     if ( ! CONST_CAST Open(Read) )
       return Type_None;
@@ -883,11 +806,10 @@ wxRegKey::ValueType wxRegKey::GetValueType(const wxString& szValue) const
     return (ValueType)dwType;
 }
 
-bool wxRegKey::SetValue(const wxString& szValue, long lValue)
+bool wxRegKey::SetValue(const wxChar *szValue, long lValue)
 {
   if ( CONST_CAST Open() ) {
-    m_dwLastError = RegSetValueEx((HKEY) m_hKey, RegValueStr(szValue),
-                                  (DWORD) RESERVED, REG_DWORD,
+    m_dwLastError = RegSetValueEx((HKEY) m_hKey, RegValueStr(szValue), (DWORD) RESERVED, REG_DWORD,
                                   (RegString)&lValue, sizeof(lValue));
     if ( m_dwLastError == ERROR_SUCCESS )
       return true;
@@ -898,13 +820,12 @@ bool wxRegKey::SetValue(const wxString& szValue, long lValue)
   return false;
 }
 
-bool wxRegKey::QueryValue(const wxString& szValue, long *plValue) const
+bool wxRegKey::QueryValue(const wxChar *szValue, long *plValue) const
 {
   if ( CONST_CAST Open(Read) ) {
     DWORD dwType, dwSize = sizeof(DWORD);
     RegString pBuf = (RegString)plValue;
-    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, RegValueStr(szValue),
-                                    RESERVED,
+    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, RegValueStr(szValue), RESERVED,
                                     &dwType, pBuf, &dwSize);
     if ( m_dwLastError != ERROR_SUCCESS ) {
       wxLogSysError(m_dwLastError, _("Can't read value of key '%s'"),
@@ -923,15 +844,14 @@ bool wxRegKey::QueryValue(const wxString& szValue, long *plValue) const
     return false;
 }
 
-bool wxRegKey::SetValue(const wxString& szValue, const wxMemoryBuffer& buffer)
+bool wxRegKey::SetValue(const wxChar *szValue,const wxMemoryBuffer& buffer)
 {
 #ifdef __TWIN32__
   wxFAIL_MSG("RegSetValueEx not implemented by TWIN32");
   return false;
 #else
   if ( CONST_CAST Open() ) {
-    m_dwLastError = RegSetValueEx((HKEY) m_hKey, RegValueStr(szValue),
-                                  (DWORD) RESERVED, REG_BINARY,
+    m_dwLastError = RegSetValueEx((HKEY) m_hKey, RegValueStr(szValue), (DWORD) RESERVED, REG_BINARY,
                                   (RegBinary)buffer.GetData(),buffer.GetDataLen());
     if ( m_dwLastError == ERROR_SUCCESS )
       return true;
@@ -943,14 +863,13 @@ bool wxRegKey::SetValue(const wxString& szValue, const wxMemoryBuffer& buffer)
 #endif
 }
 
-bool wxRegKey::QueryValue(const wxString& szValue, wxMemoryBuffer& buffer) const
+bool wxRegKey::QueryValue(const wxChar *szValue, wxMemoryBuffer& buffer) const
 {
   if ( CONST_CAST Open(Read) ) {
     // first get the type and size of the data
     DWORD dwType, dwSize;
-    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, RegValueStr(szValue),
-                                    RESERVED,
-                                    &dwType, NULL, &dwSize);
+    m_dwLastError = RegQueryValueEx((HKEY) m_hKey, RegValueStr(szValue), RESERVED,
+                                      &dwType, NULL, &dwSize);
 
     if ( m_dwLastError == ERROR_SUCCESS ) {
         if ( dwSize ) {
@@ -980,7 +899,7 @@ bool wxRegKey::QueryValue(const wxString& szValue, wxMemoryBuffer& buffer) const
 
 
 
-bool wxRegKey::QueryValue(const wxString& szValue,
+bool wxRegKey::QueryValue(const wxChar *szValue,
                           wxString& strValue,
                           bool WXUNUSED_IN_WINCE(raw)) const
 {
@@ -1014,12 +933,12 @@ bool wxRegKey::QueryValue(const wxString& szValue,
 #ifndef __WXWINCE__
                 if ( (dwType == REG_EXPAND_SZ) && !raw )
                 {
-                    DWORD dwExpSize = ::ExpandEnvironmentStrings(strValue.t_str(), NULL, 0);
+                    DWORD dwExpSize = ::ExpandEnvironmentStrings(strValue, NULL, 0);
                     bool ok = dwExpSize != 0;
                     if ( ok )
                     {
                         wxString strExpValue;
-                        ok = ::ExpandEnvironmentStrings(strValue.t_str(),
+                        ok = ::ExpandEnvironmentStrings(strValue,
                                                         wxStringBuffer(strExpValue, dwExpSize),
                                                         dwExpSize
                                                         ) != 0;
@@ -1028,7 +947,7 @@ bool wxRegKey::QueryValue(const wxString& szValue,
 
                     if ( !ok )
                     {
-                        wxLogLastError(wxT("ExpandEnvironmentStrings"));
+                        wxLogLastError(_T("ExpandEnvironmentStrings"));
                     }
                 }
 #endif
@@ -1051,13 +970,12 @@ bool wxRegKey::QueryValue(const wxString& szValue,
     return false;
 }
 
-bool wxRegKey::SetValue(const wxString& szValue, const wxString& strValue)
+bool wxRegKey::SetValue(const wxChar *szValue, const wxString& strValue)
 {
   if ( CONST_CAST Open() ) {
-      m_dwLastError = RegSetValueEx((HKEY) m_hKey,
-                                    RegValueStr(szValue),
+      m_dwLastError = RegSetValueEx((HKEY) m_hKey, RegValueStr(szValue),
                                     (DWORD) RESERVED, REG_SZ,
-                                    (RegString)wxMSW_CONV_LPCTSTR(strValue),
+                                    (RegString)strValue.c_str(),
                                     (strValue.Len() + 1)*sizeof(wxChar));
       if ( m_dwLastError == ERROR_SUCCESS )
         return true;
@@ -1071,7 +989,7 @@ bool wxRegKey::SetValue(const wxString& szValue, const wxString& strValue)
 wxString wxRegKey::QueryDefaultValue() const
 {
   wxString str;
-  QueryValue(wxEmptyString, str, false);
+  QueryValue(NULL, str);
   return str;
 }
 
@@ -1171,7 +1089,7 @@ bool wxRegKey::GetNextKey(wxString& strKeyName, long& lIndex) const
 }
 
 // returns true if the value contains a number (else it's some string)
-bool wxRegKey::IsNumericValue(const wxString& szValue) const
+bool wxRegKey::IsNumericValue(const wxChar *szValue) const
 {
     ValueType type = GetValueType(szValue);
     switch ( type ) {
@@ -1215,7 +1133,7 @@ static inline bool WriteAsciiString(wxOutputStream& ostr, const wxString& s)
     wxCharBuffer name(s.mb_str());
     ostr.Write(name, strlen(name));
 #else
-    ostr.Write(s.mb_str(), s.length());
+    ostr.Write(s, s.length());
 #endif
 
     return ostr.IsOk();
@@ -1233,9 +1151,9 @@ bool wxRegKey::Export(const wxString& filename) const
         return false;
     }
 
-    wxFFileOutputStream ostr(filename, wxT("w"));
+    wxFFileOutputStream ostr(filename, _T("w"));
 
-    return ostr.IsOk() && Export(ostr);
+    return ostr.Ok() && Export(ostr);
 #else
     wxUnusedVar(filename);
     return false;
@@ -1259,26 +1177,26 @@ FormatAsHex(const void *data,
             size_t size,
             wxRegKey::ValueType type = wxRegKey::Type_Binary)
 {
-    wxString value(wxT("hex"));
+    wxString value(_T("hex"));
 
     // binary values use just "hex:" prefix while the other ones must indicate
     // the real type
     if ( type != wxRegKey::Type_Binary )
-        value << wxT('(') << type << wxT(')');
-    value << wxT(':');
+        value << _T('(') << type << _T(')');
+    value << _T(':');
 
     // write all the rest as comma-separated bytes
     value.reserve(3*size + 10);
-    const char * const p = static_cast<const char *>(data);
+    const char * const p = wx_static_cast(const char *, data);
     for ( size_t n = 0; n < size; n++ )
     {
         // TODO: line wrapping: although not required by regedit, this makes
         //       the generated files easier to read and compare with the files
         //       produced by regedit
         if ( n )
-            value << wxT(',');
+            value << _T(',');
 
-        value << wxString::Format(wxT("%02x"), (unsigned char)p[n]);
+        value << wxString::Format(_T("%02x"), (unsigned char)p[n]);
     }
 
     return value;
@@ -1305,24 +1223,23 @@ wxString wxRegKey::FormatValue(const wxString& name) const
                 // quotes and backslashes must be quoted, linefeeds are not
                 // allowed in string values
                 rhs.reserve(value.length() + 2);
-                rhs = wxT('"');
+                rhs = _T('"');
 
                 // there can be no NULs here
                 bool useHex = false;
-                for ( wxString::const_iterator p = value.begin();
-                      p != value.end() && !useHex; ++p )
+                for ( const wxChar *p = value.c_str(); *p && !useHex; p++ )
                 {
-                    switch ( (*p).GetValue() )
+                    switch ( *p )
                     {
-                        case wxT('\n'):
+                        case _T('\n'):
                             // we can only represent this string in hex
                             useHex = true;
                             break;
 
-                        case wxT('"'):
-                        case wxT('\\'):
+                        case _T('"'):
+                        case _T('\\'):
                             // escape special symbol
-                            rhs += wxT('\\');
+                            rhs += _T('\\');
                             // fall through
 
                         default:
@@ -1333,7 +1250,7 @@ wxString wxRegKey::FormatValue(const wxString& name) const
                 if ( useHex )
                     rhs = FormatAsHex(value, Type_String);
                 else
-                    rhs += wxT('"');
+                    rhs += _T('"');
             }
             break;
 
@@ -1344,7 +1261,7 @@ wxString wxRegKey::FormatValue(const wxString& name) const
                 if ( !QueryValue(name, &value) )
                     break;
 
-                rhs.Printf(wxT("dword:%08x"), (unsigned int)value);
+                rhs.Printf(_T("dword:%08x"), (unsigned int)value);
             }
             break;
 
@@ -1436,7 +1353,7 @@ bool wxRegKey::DoExport(wxOutputStream& ostr) const
     // dump all our values
     long dummy;
     wxString name;
-    wxRegKey& self = const_cast<wxRegKey&>(*this);
+    wxRegKey& self = wx_const_cast(wxRegKey&, *this);
     bool cont = self.GetFirstValue(name, dummy);
     while ( cont )
     {
@@ -1470,22 +1387,19 @@ bool wxRegKey::DoExport(wxOutputStream& ostr) const
 // implementation of global private functions
 // ============================================================================
 
-bool KeyExists(WXHKEY hRootKey,
-               const wxString& szKey,
-               wxRegKey::WOW64ViewMode viewMode)
+bool KeyExists(WXHKEY hRootKey, const wxChar *szKey)
 {
     // don't close this key itself for the case of empty szKey!
-    if ( szKey.empty() )
+    if ( wxIsEmpty(szKey) )
         return true;
 
     HKEY hkeyDummy;
     if ( ::RegOpenKeyEx
          (
             (HKEY)hRootKey,
-            szKey.t_str(),
+            szKey,
             RESERVED,
-            // we might not have enough rights for rw access
-            GetMSWAccessFlags(wxRegKey::Read, viewMode),
+            KEY_READ,        // we might not have enough rights for rw access
             &hkeyDummy
          ) == ERROR_SUCCESS )
     {
@@ -1497,61 +1411,14 @@ bool KeyExists(WXHKEY hRootKey,
     return false;
 }
 
-long GetMSWViewFlags(wxRegKey::WOW64ViewMode viewMode)
+const wxChar *GetFullName(const wxRegKey *pKey, const wxChar *szValue)
 {
-    long samWOW64ViewMode = 0;
+  static wxString s_str;
+  s_str = pKey->GetName();
+  if ( !wxIsEmpty(szValue) )
+    s_str << wxT("\\") << szValue;
 
-    switch ( viewMode )
-    {
-        case wxRegKey::WOW64ViewMode_32:
-#ifdef __WIN64__    // the flag is only needed by 64 bit apps
-            samWOW64ViewMode = KEY_WOW64_32KEY;
-#endif // Win64
-            break;
-
-        case wxRegKey::WOW64ViewMode_64:
-#ifndef __WIN64__   // the flag is only needed by 32 bit apps
-            // 64 bit registry can only be accessed under 64 bit platforms
-            if ( wxIsPlatform64Bit() )
-                samWOW64ViewMode = KEY_WOW64_64KEY;
-#endif // Win32
-            break;
-
-        default:
-            wxFAIL_MSG("Unknown registry view.");
-            // fall through
-
-        case wxRegKey::WOW64ViewMode_Default:
-            // Use default registry view for the current application,
-            // i.e. 32 bits for 32 bit ones and 64 bits for 64 bit apps
-            ;
-    }
-
-    return samWOW64ViewMode;
-}
-
-long GetMSWAccessFlags(wxRegKey::AccessMode mode,
-    wxRegKey::WOW64ViewMode viewMode)
-{
-    long sam = mode == wxRegKey::Read ? KEY_READ : KEY_ALL_ACCESS;
-
-    sam |= GetMSWViewFlags(viewMode);
-
-    return sam;
-}
-
-wxString GetFullName(const wxRegKey *pKey, const wxString& szValue)
-{
-  wxString str(pKey->GetName());
-  if ( !szValue.empty() )
-    str << wxT("\\") << szValue;
-
-  return str;
-}
-
-wxString GetFullName(const wxRegKey *pKey)
-{
-  return pKey->GetName();
+  return s_str.c_str();
 }
 
 inline void RemoveTrailingSeparator(wxString& str)
@@ -1559,10 +1426,3 @@ inline void RemoveTrailingSeparator(wxString& str)
   if ( !str.empty() && str.Last() == REG_SEPARATOR )
     str.Truncate(str.Len() - 1);
 }
-
-inline const wxChar *RegValueStr(const wxString& szValue)
-{
-    return szValue.empty() ? (const wxChar*)NULL : szValue.t_str();
-}
-
-#endif // wxUSE_REGKEY
diff --git a/Source/3rd Party/wx/src/msw/renderer.cpp b/Source/3rd Party/wx/src/msw/renderer.cpp
index c3737f263..172b59c9d 100644
--- a/Source/3rd Party/wx/src/msw/renderer.cpp	
+++ b/Source/3rd Party/wx/src/msw/renderer.cpp	
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.07.2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: renderer.cpp 53524 2008-05-10 00:05:20Z RD $
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -31,13 +31,25 @@
     #include "wx/settings.h"
 #endif //WX_PRECOMP
 
-#include "wx/dcgraph.h"
-#include "wx/scopeguard.h"
 #include "wx/splitter.h"
 #include "wx/renderer.h"
 #include "wx/msw/private.h"
 #include "wx/msw/uxtheme.h"
 
+#if wxUSE_GRAPHICS_CONTEXT
+// TODO remove this dependency (gdiplus needs the macros)
+#ifndef max
+#define max(a,b)            (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef min
+#define min(a,b)            (((a) < (b)) ? (a) : (b))
+#endif
+
+#include "gdiplus.h"
+using namespace Gdiplus;
+#endif
+
 // tmschema.h is in Win32 Platform SDK and might not be available with earlier
 // compilers
 #ifndef CP_DROPDOWNBUTTON
@@ -93,74 +105,56 @@
     #define TMT_TEXTCOLOR       3803
     #define TMT_BORDERCOLOR     3801
     #define TMT_EDGEFILLCOLOR   3808
-
-    #define WP_MINBUTTON 15
-    #define WP_MAXBUTTON 17
-    #define WP_CLOSEBUTTON 18
-    #define WP_RESTOREBUTTON 21
-    #define WP_HELPBUTTON 23
 #endif
 
-#if defined(__WXWINCE__)
-    #ifndef DFCS_FLAT
-        #define DFCS_FLAT 0
-    #endif
-    #ifndef DFCS_MONO
-        #define DFCS_MONO 0
-    #endif
+#if defined(__WXWINCE__) && !defined(DFCS_FLAT)
+    #define DFCS_FLAT 0
 #endif
 
-#ifndef DFCS_HOT
-    #define DFCS_HOT 0x1000
-#endif
 
 // ----------------------------------------------------------------------------
-// methods common to wxRendererMSW and wxRendererXP
-// ----------------------------------------------------------------------------
+// If the DC is a wxGCDC then pull out the HDC from the GraphicsContext when
+// it is needed, and handle the Release when done.
 
-class wxRendererMSWBase : public wxDelegateRendererNative
+class GraphicsHDC
 {
 public:
-    wxRendererMSWBase() { }
-    wxRendererMSWBase(wxRendererNative& rendererNative)
-        : wxDelegateRendererNative(rendererNative) { }
+    GraphicsHDC(wxDC* dc)
+    {
+#if wxUSE_GRAPHICS_CONTEXT
+        m_graphics = NULL;
+        wxGCDC* gcdc = wxDynamicCast(dc, wxGCDC);
+        if (gcdc) {
+            m_graphics = (Graphics*)gcdc->GetGraphicsContext()->GetNativeContext();
+            m_hdc = m_graphics->GetHDC();
+        }
+        else
+#endif
+            m_hdc = GetHdcOf(*dc);
+    }
 
-    void DrawFocusRect(wxWindow * win,
-                        wxDC& dc,
-                        const wxRect& rect,
-                        int flags = 0);
+    ~GraphicsHDC()
+    {
+#if wxUSE_GRAPHICS_CONTEXT
+        if (m_graphics)
+            m_graphics->ReleaseHDC(m_hdc);
+#endif
+    }
+    
+    operator HDC() const { return m_hdc; }
 
-    void DrawItemSelectionRect(wxWindow *win,
-                                wxDC& dc,
-                                const wxRect& rect,
-                                int flags = 0);
-
-    void DrawChoice(wxWindow* win,
-                     wxDC& dc,
-                     const wxRect& rect,
-                     int flags = 0);
-
-    void DrawComboBox(wxWindow* win,
-                       wxDC& dc,
-                       const wxRect& rect,
-                       int flags = 0);
-
-    virtual void DrawComboBoxDropButton(wxWindow *win,
-                                         wxDC& dc,
-                                         const wxRect& rect,
-                                         int flags = 0) = 0;
-
-    virtual void DrawTextCtrl(wxWindow* win,
-                               wxDC& dc,
-                               const wxRect& rect,
-                               int flags = 0) = 0;
+private:
+    HDC         m_hdc;
+#if wxUSE_GRAPHICS_CONTEXT
+    Graphics*   m_graphics;
+#endif
 };
 
 // ----------------------------------------------------------------------------
 // wxRendererMSW: wxRendererNative implementation for "old" Win32 systems
 // ----------------------------------------------------------------------------
 
-class wxRendererMSW : public wxRendererMSWBase
+class WXDLLEXPORT wxRendererMSW : public wxDelegateRendererNative
 {
 public:
     wxRendererMSW() { }
@@ -172,65 +166,13 @@ public:
                                         const wxRect& rect,
                                         int flags = 0);
 
-    virtual void DrawCheckBox(wxWindow *win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags = 0)
-    {
-        DoDrawButton(DFCS_BUTTONCHECK, win, dc, rect, flags);
-    }
-
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
                                 int flags = 0);
 
-    virtual void DrawTextCtrl(wxWindow* win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags = 0);
-
-    virtual void DrawRadioBitmap(wxWindow* win,
-                                 wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags = 0)
-    {
-        DoDrawButton(DFCS_BUTTONRADIO, win, dc, rect, flags);
-    }
-
-    virtual void DrawTitleBarBitmap(wxWindow *win,
-                                    wxDC& dc,
-                                    const wxRect& rect,
-                                    wxTitleBarButton button,
-                                    int flags = 0);
-
-    virtual wxSize GetCheckBoxSize(wxWindow *win);
-
-    virtual int GetHeaderButtonHeight(wxWindow *win);
-
-    virtual int GetHeaderButtonMargin(wxWindow *win);
-
 private:
-    // wrapper of DrawFrameControl()
-    void DoDrawFrameControl(UINT type,
-                            UINT kind,
-                            wxWindow *win,
-                            wxDC& dc,
-                            const wxRect& rect,
-                            int flags);
-
-    // common part of Draw{PushButton,CheckBox,RadioBitmap}(): wraps
-    // DrawFrameControl(DFC_BUTTON)
-    void DoDrawButton(UINT kind,
-                      wxWindow *win,
-                      wxDC& dc,
-                      const wxRect& rect,
-                      int flags)
-    {
-        DoDrawFrameControl(DFC_BUTTON, kind, win, dc, rect, flags);
-    }
-
-    wxDECLARE_NO_COPY_CLASS(wxRendererMSW);
+    DECLARE_NO_COPY_CLASS(wxRendererMSW)
 };
 
 // ----------------------------------------------------------------------------
@@ -239,10 +181,10 @@ private:
 
 #if wxUSE_UXTHEME
 
-class wxRendererXP : public wxRendererMSWBase
+class WXDLLEXPORT wxRendererXP : public wxDelegateRendererNative
 {
 public:
-    wxRendererXP() : wxRendererMSWBase(wxRendererMSW::Get()) { }
+    wxRendererXP() : wxDelegateRendererNative(wxRendererMSW::Get()) { }
 
     static wxRendererNative& Get();
 
@@ -252,7 +194,8 @@ public:
                                   int flags = 0,
                                   wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
                                   wxHeaderButtonParams* params = NULL);
-
+    virtual int GetHeaderButtonHeight(wxWindow *win);
+    
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
@@ -274,137 +217,20 @@ public:
     virtual void DrawCheckBox(wxWindow *win,
                               wxDC& dc,
                               const wxRect& rect,
-                              int flags = 0)
-    {
-        if ( !DoDrawXPButton(BP_CHECKBOX, win, dc, rect, flags) )
-            m_rendererNative.DrawCheckBox(win, dc, rect, flags);
-    }
+                              int flags = 0);
 
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
-                                int flags = 0)
-    {
-        if ( !DoDrawXPButton(BP_PUSHBUTTON, win, dc, rect, flags) )
-            m_rendererNative.DrawPushButton(win, dc, rect, flags);
-    }
-
-    virtual void DrawTextCtrl(wxWindow* win,
-                              wxDC& dc,
-                              const wxRect& rect,
-                              int flags = 0);
-
-    virtual void DrawRadioBitmap(wxWindow *win,
-                                 wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags = 0)
-    {
-        if ( !DoDrawXPButton(BP_RADIOBUTTON, win, dc, rect, flags) )
-            m_rendererNative.DrawRadioBitmap(win, dc, rect, flags);
-    }
-
-    virtual void DrawTitleBarBitmap(wxWindow *win,
-                                    wxDC& dc,
-                                    const wxRect& rect,
-                                    wxTitleBarButton button,
-                                    int flags = 0);
+                                int flags = 0);
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
-
 private:
-    // wrapper around DrawThemeBackground() translating flags to NORMAL/HOT/
-    // PUSHED/DISABLED states (and so suitable for drawing anything
-    // button-like)
-    void DoDrawButtonLike(HTHEME htheme,
-                          int part,
-                          wxDC& dc,
-                          const wxRect& rect,
-                          int flags);
-
-    // common part of DrawCheckBox(), DrawPushButton() and DrawRadioBitmap()
-    bool DoDrawXPButton(int kind,
-                        wxWindow *win,
-                        wxDC& dc,
-                        const wxRect& rect,
-                        int flags);
-
-    wxDECLARE_NO_COPY_CLASS(wxRendererXP);
+    DECLARE_NO_COPY_CLASS(wxRendererXP)
 };
 
 #endif // wxUSE_UXTHEME
 
-
-// ============================================================================
-// wxRendererMSWBase implementation
-// ============================================================================
-
-void wxRendererMSWBase::DrawFocusRect(wxWindow * WXUNUSED(win),
-                                      wxDC& dc,
-                                      const wxRect& rect,
-                                      int WXUNUSED(flags))
-{
-    RECT rc;
-    wxCopyRectToRECT(rect, rc);
-
-    ::DrawFocusRect(GetHdcOf(dc.GetTempHDC()), &rc);
-}
-
-void wxRendererMSWBase::DrawItemSelectionRect(wxWindow *win,
-                                              wxDC& dc,
-                                              const wxRect& rect,
-                                              int flags)
-{
-    wxBrush brush;
-    if ( flags & wxCONTROL_SELECTED )
-    {
-        if ( flags & wxCONTROL_FOCUSED )
-        {
-            brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
-        }
-        else // !focused
-        {
-            brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
-        }
-    }
-    else // !selected
-    {
-        brush = *wxTRANSPARENT_BRUSH;
-    }
-
-    dc.SetBrush(brush);
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.DrawRectangle( rect );
-
-    if ((flags & wxCONTROL_FOCUSED) && (flags & wxCONTROL_CURRENT))
-        DrawFocusRect( win, dc, rect, flags );
-}
-
-void wxRendererMSWBase::DrawChoice(wxWindow* win,
-                                   wxDC& dc,
-                                   const wxRect& rect,
-                                   int flags)
-{
-    DrawComboBox(win, dc, rect, flags);
-}
-
-void wxRendererMSWBase::DrawComboBox(wxWindow* win,
-                                     wxDC& dc,
-                                     const wxRect& rect,
-                                     int flags)
-{
-    // Draw the main part of the control same as TextCtrl
-    DrawTextCtrl(win, dc, rect, flags);
-
-    // Draw the button inside the border, on the right side
-    wxRect br(rect);
-    br.height -= 2;
-    br.x += br.width - br.height - 1;
-    br.width = br.height;
-    br.y += 1;
-
-    DrawComboBoxDropButton(win, dc, br, flags);
-}
-
 // ============================================================================
 // wxRendererNative and wxRendererMSW implementation
 // ============================================================================
@@ -435,12 +261,11 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
                                       const wxRect& rect,
                                       int flags)
 {
-    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
-
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-    
     RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    r.left = rect.GetLeft();
+    r.top = rect.GetTop();
+    r.bottom = rect.y + rect.height;
+    r.right = rect.x + rect.width;
 
     int style = DFCS_SCROLLCOMBOBOX;
     if ( flags & wxCONTROL_DISABLED )
@@ -448,51 +273,22 @@ wxRendererMSW::DrawComboBoxDropButton(wxWindow * WXUNUSED(win),
     if ( flags & wxCONTROL_PRESSED )
         style |= DFCS_PUSHED | DFCS_FLAT;
 
-    ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, DFC_SCROLL, style);
+    ::DrawFrameControl(GraphicsHDC(&dc), &r, DFC_SCROLL, style);
 }
 
 void
-wxRendererMSW::DoDrawFrameControl(UINT type,
-                                  UINT kind,
-                                  wxWindow * WXUNUSED(win),
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int flags)
-{
-    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
-
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
-    RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
-
-    int style = kind;
-    if ( flags & wxCONTROL_CHECKED )
-        style |= DFCS_CHECKED;
-    if ( flags & wxCONTROL_DISABLED )
-        style |= DFCS_INACTIVE;
-    if ( flags & wxCONTROL_FLAT )
-        style |= DFCS_MONO;
-    if ( flags & wxCONTROL_PRESSED )
-        style |= DFCS_PUSHED;
-    if ( flags & wxCONTROL_CURRENT )
-        style |= DFCS_HOT;
-    if ( flags & wxCONTROL_UNDETERMINED )
-        // Using DFCS_BUTTON3STATE here doesn't work (as might be expected),
-        // use the following two styles to get the same look of a check box
-        // in the undetermined state.
-        style |= DFCS_INACTIVE | DFCS_CHECKED;
-
-    ::DrawFrameControl(GetHdcOf(dc.GetTempHDC()), &r, type, style);
-}
-
-void
-wxRendererMSW::DrawPushButton(wxWindow *win,
+wxRendererMSW::DrawPushButton(wxWindow * WXUNUSED(win),
                               wxDC& dc,
                               const wxRect& rectOrig,
                               int flags)
 {
     wxRect rect(rectOrig);
+
+    int style = DFCS_BUTTONPUSH;
+    if ( flags & wxCONTROL_DISABLED )
+        style |= DFCS_INACTIVE;
+    if ( flags & wxCONTROL_PRESSED )
+        style |= DFCS_PUSHED | DFCS_FLAT;
     if ( flags & wxCONTROL_ISDEFAULT )
     {
         // DrawFrameControl() doesn't seem to support default buttons so we
@@ -503,100 +299,12 @@ wxRendererMSW::DrawPushButton(wxWindow *win,
         rect.Deflate(1);
     }
 
-    DoDrawButton(DFCS_BUTTONPUSH, win, dc, rect, flags);
+    RECT rc;
+    wxCopyRectToRECT(rect, rc);
+
+    ::DrawFrameControl(GraphicsHDC(&dc), &rc, DFC_BUTTON, style);
 }
 
-void
-wxRendererMSW::DrawTitleBarBitmap(wxWindow *win,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  wxTitleBarButton button,
-                                  int flags)
-{
-    UINT kind;
-    switch ( button )
-    {
-        case wxTITLEBAR_BUTTON_CLOSE:
-            kind = DFCS_CAPTIONCLOSE;
-            break;
-
-        case wxTITLEBAR_BUTTON_MAXIMIZE:
-            kind = DFCS_CAPTIONMAX;
-            break;
-
-        case wxTITLEBAR_BUTTON_ICONIZE:
-            kind = DFCS_CAPTIONMIN;
-            break;
-
-        case wxTITLEBAR_BUTTON_RESTORE:
-            kind = DFCS_CAPTIONRESTORE;
-            break;
-
-        case wxTITLEBAR_BUTTON_HELP:
-            kind = DFCS_CAPTIONHELP;
-            break;
-
-        default:
-            wxFAIL_MSG( "unsupported title bar button" );
-            return;
-    }
-
-    DoDrawFrameControl(DFC_CAPTION, kind, win, dc, rect, flags);
-}
-
-wxSize wxRendererMSW::GetCheckBoxSize(wxWindow * WXUNUSED(win))
-{
-    return wxSize(::GetSystemMetrics(SM_CXMENUCHECK),
-                  ::GetSystemMetrics(SM_CYMENUCHECK));
-}
-
-int wxRendererMSW::GetHeaderButtonHeight(wxWindow * WXUNUSED(win))
-{
-    // some "reasonable" value returned in case of error, it doesn't really
-    // correspond to anything but it's better than returning 0
-    static const int DEFAULT_HEIGHT = 20;
-
-
-    // create a temporary header window just to get its geometry
-    HWND hwndHeader = ::CreateWindow(WC_HEADER, NULL, 0,
-                                     0, 0, 0, 0, NULL, NULL, NULL, NULL);
-    if ( !hwndHeader )
-        return DEFAULT_HEIGHT;
-
-    wxON_BLOCK_EXIT1( ::DestroyWindow, hwndHeader );
-
-    // initialize the struct filled with the values by Header_Layout()
-    RECT parentRect = { 0, 0, 100, 100 };
-    WINDOWPOS wp = { 0, 0, 0, 0, 0, 0, 0 };
-    HDLAYOUT hdl = { &parentRect, &wp };
-
-    return Header_Layout(hwndHeader, &hdl) ? wp.cy : DEFAULT_HEIGHT;
-}
-
-int wxRendererMSW::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
-{
-    return 10;
-}
-
-// Uses the theme to draw the border and fill for something like a wxTextCtrl
-void wxRendererMSW::DrawTextCtrl(wxWindow* WXUNUSED(win),
-                                 wxDC& dc,
-                                 const wxRect& rect,
-                                 int WXUNUSED(flags))
-{
-    wxColour fill;
-    wxColour bdr;
-    {
-        fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
-        bdr = *wxBLACK;
-    }
-
-    dc.SetPen(bdr);
-    dc.SetBrush(fill);
-    dc.DrawRectangle(rect);
-}
-
-
 // ============================================================================
 // wxRendererXP implementation
 // ============================================================================
@@ -627,12 +335,8 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
         return;
     }
 
-    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
-
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
     RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    wxCopyRectToRECT(rect, r);
 
     int state;
     if ( flags & wxCONTROL_PRESSED )
@@ -647,7 +351,7 @@ wxRendererXP::DrawComboBoxDropButton(wxWindow * win,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
-                                GetHdcOf(dc.GetTempHDC()),
+                                GraphicsHDC(&dc),
                                 CP_DROPDOWNBUTTON,
                                 state,
                                 &r,
@@ -670,12 +374,8 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
         return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params);
     }
 
-    wxCHECK_MSG( dc.GetImpl(), -1, wxT("Invalid wxDC") );
-
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
     RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    wxCopyRectToRECT(rect, r);
 
     int state;
     if ( flags & wxCONTROL_PRESSED )
@@ -687,7 +387,7 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
-                                GetHdcOf(dc.GetTempHDC()),
+                                GraphicsHDC(&dc),
                                 HP_HEADERITEM,
                                 state,
                                 &r,
@@ -697,12 +397,37 @@ wxRendererXP::DrawHeaderButton(wxWindow *win,
     // NOTE: Using the theme to draw HP_HEADERSORTARROW doesn't do anything.
     // Why?  If this can be fixed then draw the sort arrows using the theme
     // and then clear those flags before calling DrawHeaderButtonContents.
-
+    
     // Add any extras that are specified in flags and params
     return DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params);
 }
 
 
+int
+wxRendererXP::GetHeaderButtonHeight(wxWindow *win)
+{
+    wxUxThemeHandle hTheme(win, L"HEADER");
+    if ( !hTheme )
+    {
+        return m_rendererNative.GetHeaderButtonHeight(win);
+    }
+    
+    HRESULT hr;
+    int value = -1;
+    
+    hr = wxUxThemeEngine::Get()->GetThemeMetric( hTheme,
+                                                 NULL,
+                                                 HP_HEADERITEM,
+                                                 HIS_NORMAL,
+                                                 TMT_HEIGHT,
+                                                 &value );
+    if ( hr == S_OK )
+        return value;
+    else
+        return 20;
+}
+
+
 void
 wxRendererXP::DrawTreeItemButton(wxWindow *win,
                                  wxDC& dc,
@@ -716,18 +441,14 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
         return;
     }
 
-    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
-
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
-
     RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    wxCopyRectToRECT(rect, r);
 
     int state = flags & wxCONTROL_EXPANDED ? GLPS_OPENED : GLPS_CLOSED;
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
                                 hTheme,
-                                GetHdcOf(dc.GetTempHDC()),
+                                GraphicsHDC(&dc),
                                 TVP_GLYPH,
                                 state,
                                 &r,
@@ -735,158 +456,88 @@ wxRendererXP::DrawTreeItemButton(wxWindow *win,
                             );
 }
 
-bool
-wxRendererXP::DoDrawXPButton(int kind,
-                             wxWindow *win,
-                             wxDC& dc,
-                             const wxRect& rect,
-                             int flags)
+void
+wxRendererXP::DrawCheckBox(wxWindow *win,
+                           wxDC& dc,
+                           const wxRect& rect,
+                           int flags)
 {
     wxUxThemeHandle hTheme(win, L"BUTTON");
     if ( !hTheme )
-        return false;
-
-    DoDrawButtonLike(hTheme, kind, dc, rect, flags);
-
-    return true;
-}
-
-void
-wxRendererXP::DoDrawButtonLike(HTHEME htheme,
-                               int part,
-                               wxDC& dc,
-                               const wxRect& rect,
-                               int flags)
-{
-    wxCHECK_RET( dc.GetImpl(), wxT("Invalid wxDC") );
-
-    wxRect adjustedRect = dc.GetImpl()->MSWApplyGDIPlusTransform(rect);
+    {
+        m_rendererNative.DrawCheckBox(win, dc, rect, flags);
+        return;
+    }
 
     RECT r;
-    wxCopyRectToRECT(adjustedRect, r);
+    wxCopyRectToRECT(rect, r);
 
-    // the base state is always 1, whether it is PBS_NORMAL,
-    // {CBS,RBS}_UNCHECKEDNORMAL or CBS_NORMAL
-    int state = 1;
-
-    // XBS_XXX is followed by XBX_XXXHOT, then XBS_XXXPRESSED and DISABLED
-    enum
-    {
-        NORMAL_OFFSET,
-        HOT_OFFSET,
-        PRESSED_OFFSET,
-        DISABLED_OFFSET,
-        STATES_COUNT
-    };
-
-    // in both RBS_ and CBS_ enums CHECKED elements are offset by 4 from base
-    // (UNCHECKED) ones and MIXED are offset by 4 again as there are all states
-    // from the above enum in between them
+    int state;
     if ( flags & wxCONTROL_CHECKED )
-        state += STATES_COUNT;
+        state = CBS_CHECKEDNORMAL;
     else if ( flags & wxCONTROL_UNDETERMINED )
-        state += 2*STATES_COUNT;
+        state = CBS_MIXEDNORMAL;
+    else
+        state = CBS_UNCHECKEDNORMAL;
 
-    if ( flags & wxCONTROL_DISABLED )
-        state += DISABLED_OFFSET;
+    // CBS_XXX is followed by CBX_XXXGOT, then CBS_XXXPRESSED and DISABLED
+    if ( flags & wxCONTROL_CURRENT )
+        state += 1;
     else if ( flags & wxCONTROL_PRESSED )
-        state += PRESSED_OFFSET;
-    else if ( flags & wxCONTROL_CURRENT )
-        state += HOT_OFFSET;
-    // wxCONTROL_ISDEFAULT flag is only valid for push buttons
-    else if ( part == BP_PUSHBUTTON && (flags & wxCONTROL_ISDEFAULT) )
-        state = PBS_DEFAULTED;
+        state += 2;
+    else if ( flags & wxCONTROL_DISABLED )
+        state += 3;
 
     wxUxThemeEngine::Get()->DrawThemeBackground
                             (
-                                htheme,
-                                GetHdcOf(dc.GetTempHDC()),
-                                part,
+                                hTheme,
+                                GraphicsHDC(&dc),
+                                BP_CHECKBOX,
                                 state,
                                 &r,
                                 NULL
                             );
 }
 
+
+
 void
-wxRendererXP::DrawTitleBarBitmap(wxWindow *win,
-                                 wxDC& dc,
-                                 const wxRect& rect,
-                                 wxTitleBarButton button,
-                                 int flags)
+wxRendererXP::DrawPushButton(wxWindow * win,
+                             wxDC& dc,
+                             const wxRect& rect,
+                             int flags)
 {
-    wxUxThemeHandle hTheme(win, L"WINDOW");
+    wxUxThemeHandle hTheme(win, L"BUTTON");
     if ( !hTheme )
     {
-        m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags);
+        m_rendererNative.DrawPushButton(win, dc, rect, flags);
         return;
     }
 
-    int part;
-    switch ( button )
-    {
-        case wxTITLEBAR_BUTTON_CLOSE:
-            part = WP_CLOSEBUTTON;
-            break;
+    RECT r;
+    wxCopyRectToRECT(rect, r);
 
-        case wxTITLEBAR_BUTTON_MAXIMIZE:
-            part = WP_MAXBUTTON;
-            break;
-
-        case wxTITLEBAR_BUTTON_ICONIZE:
-            part = WP_MINBUTTON;
-            break;
-
-        case wxTITLEBAR_BUTTON_RESTORE:
-            part = WP_RESTOREBUTTON;
-            break;
-
-        case wxTITLEBAR_BUTTON_HELP:
-            part = WP_HELPBUTTON;
-            break;
-
-        default:
-            wxFAIL_MSG( "unsupported title bar button" );
-            return;
-    }
-
-    DoDrawButtonLike(hTheme, part, dc, rect, flags);
-}
-
-// Uses the theme to draw the border and fill for something like a wxTextCtrl
-void wxRendererXP::DrawTextCtrl(wxWindow* win,
-                                wxDC& dc,
-                                const wxRect& rect,
-                                int flags)
-{
-    wxUxThemeHandle hTheme(win, L"EDIT");
-    if ( !hTheme )
-    {
-        m_rendererNative.DrawTextCtrl(win,dc,rect,flags);
-        return;
-    }
-
-    wxColour fill;
-    wxColour bdr;
-    COLORREF cref;
-
-    wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
-                                          ETS_NORMAL, TMT_FILLCOLOR, &cref);
-    fill = wxRGBToColour(cref);
-
-    int etsState;
-    if ( flags & wxCONTROL_DISABLED )
-        etsState = ETS_DISABLED;
+    int state;
+    if ( flags & wxCONTROL_PRESSED )
+        state = PBS_PRESSED;
+    else if ( flags & wxCONTROL_CURRENT )
+        state = PBS_HOT;
+    else if ( flags & wxCONTROL_DISABLED )
+        state = PBS_DISABLED;
+    else if ( flags & wxCONTROL_ISDEFAULT )
+        state = PBS_DEFAULTED;
     else
-        etsState = ETS_NORMAL;
+        state = PBS_NORMAL;
 
-    wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
-                                              etsState, TMT_BORDERCOLOR, &cref);
-    bdr = wxRGBToColour(cref);
-
-    dc.SetPen( bdr );
-    dc.SetBrush( fill );
-    dc.DrawRectangle(rect);
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                            (
+                                hTheme,
+                                GraphicsHDC(&dc),
+                                BP_PUSHBUTTON,
+                                state,
+                                &r,
+                                NULL
+                            );
 }
 
 // ----------------------------------------------------------------------------
@@ -944,4 +595,115 @@ wxRendererXP::DrawSplitterSash(wxWindow *win,
     m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags);
 }
 
+// ----------------------------------------------------------------------------
+// Other renderer functions to be merged in to wxRenderer class in 2.9, but
+// they are standalone functions here to protect the ABI.
+// ----------------------------------------------------------------------------
+
+// Uses the theme to draw the border and fill for something like a wxTextCtrl
+void wxRenderer_DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    wxColour fill;
+    wxColour bdr;
+    COLORREF cref;
+    
+#if wxUSE_UXTHEME
+    wxUxThemeHandle hTheme(win, L"EDIT");
+    if (hTheme)
+    {
+        wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
+                                              ETS_NORMAL, TMT_FILLCOLOR, &cref);
+        fill = wxRGBToColour(cref);
+
+        int etsState;
+        if ( flags & wxCONTROL_DISABLED )
+            etsState = ETS_DISABLED;
+        else
+            etsState = ETS_NORMAL;
+        
+        wxUxThemeEngine::Get()->GetThemeColor(hTheme, EP_EDITTEXT,
+                                              etsState, TMT_BORDERCOLOR, &cref);
+        bdr = wxRGBToColour(cref);        
+    }
+    else
+#endif
+    {
+        fill = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+        bdr = *wxBLACK;
+    }
+    
+    dc.SetPen( bdr );
+    dc.SetBrush( fill );
+    dc.DrawRectangle(rect);
+}
+
+
+// Draw the equivallent of a wxComboBox
+void wxRenderer_DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    // Draw the main part of the control same as TextCtrl
+    wxRenderer_DrawTextCtrl(win, dc, rect, flags);    
+    
+    // Draw the button inside the border, on the right side
+    wxRect br(rect);
+    br.height -= 2;
+    br.x += br.width - br.height - 1;
+    br.width = br.height;
+    br.y += 1;
+
+    wxRendererNative::Get().DrawComboBoxDropButton(win, dc, br, flags);
+}
+
+
+void wxRenderer_DrawChoice(wxWindow* win, wxDC& dc,
+                           const wxRect& rect, int flags)
+{
+    wxRenderer_DrawComboBox(win, dc, rect, flags);
+}
+
+    
+// Draw a themed radio button
+void wxRenderer_DrawRadioButton(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+#if wxUSE_UXTHEME
+    wxUxThemeHandle hTheme(win, L"BUTTON");
+    if ( !hTheme )
+#endif
+    {
+        // ??? m_rendererNative.DrawRadioButton(win, dc, rect, flags);
+        return;
+    }
+
+#if wxUSE_UXTHEME
+    RECT r;
+    wxCopyRectToRECT(rect, r);
+
+    int state;
+    if ( flags & wxCONTROL_CHECKED )
+        state = RBS_CHECKEDNORMAL;
+    else if ( flags & wxCONTROL_UNDETERMINED )
+        state = RBS_MIXEDNORMAL;
+    else
+        state = RBS_UNCHECKEDNORMAL;
+
+    // RBS_XXX is followed by RBX_XXXGOT, then RBS_XXXPRESSED and DISABLED
+    if ( flags & wxCONTROL_CURRENT )
+        state += 1;
+    else if ( flags & wxCONTROL_PRESSED )
+        state += 2;
+    else if ( flags & wxCONTROL_DISABLED )
+        state += 3;
+
+    wxUxThemeEngine::Get()->DrawThemeBackground
+                            (
+                                hTheme,
+                                GraphicsHDC(&dc),
+                                BP_RADIOBUTTON,
+                                state,
+                                &r,
+                                NULL
+                            );
+#endif
+}
+
 #endif // wxUSE_UXTHEME
diff --git a/Source/3rd Party/wx/src/msw/richmsgdlg.cpp b/Source/3rd Party/wx/src/msw/richmsgdlg.cpp
deleted file mode 100644
index 5dc4812a9..000000000
--- a/Source/3rd Party/wx/src/msw/richmsgdlg.cpp	
+++ /dev/null
@@ -1,83 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/richmsgdlg.cpp
-// Purpose:     wxRichMessageDialog
-// Author:      Rickard Westerlund
-// Created:     2010-07-04
-// RCS-ID:      $Id$
-// Copyright:   (c) 2010 wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if wxUSE_RICHMSGDLG
-
-#include "wx/richmsgdlg.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/msw/private.h"
-#endif
-
-// This will define wxHAS_MSW_TASKDIALOG if we have support for it in the
-// headers we use.
-#include "wx/msw/private/msgdlg.h"
-
-// ----------------------------------------------------------------------------
-// wxRichMessageDialog
-// ----------------------------------------------------------------------------
-
-int wxRichMessageDialog::ShowModal()
-{
-#ifdef wxHAS_MSW_TASKDIALOG
-    using namespace wxMSWMessageDialog;
-
-    if ( HasNativeTaskDialog() )
-    {
-        // create a task dialog
-        WinStruct<TASKDIALOGCONFIG> tdc;
-        wxMSWTaskDialogConfig wxTdc(*this);
-
-        wxTdc.MSWCommonTaskDialogInit( tdc );
-
-        // add a checkbox
-        if ( !m_checkBoxText.empty() )
-        {
-            tdc.pszVerificationText = m_checkBoxText.t_str();
-            if ( m_checkBoxValue )
-                tdc.dwFlags |= TDF_VERIFICATION_FLAG_CHECKED;
-        }
-
-        // add collapsible footer
-        if ( !m_detailedText.empty() )
-            tdc.pszExpandedInformation = m_detailedText.t_str();
-
-        TaskDialogIndirect_t taskDialogIndirect = GetTaskDialogIndirectFunc();
-        if ( !taskDialogIndirect )
-            return wxID_CANCEL;
-
-        // create the task dialog, process the answer and return it.
-        BOOL checkBoxChecked;
-        int msAns;
-        HRESULT hr = taskDialogIndirect( &tdc, &msAns, NULL, &checkBoxChecked );
-        if ( FAILED(hr) )
-        {
-            wxLogApiError( "TaskDialogIndirect", hr );
-            return wxID_CANCEL;
-        }
-        m_checkBoxValue = checkBoxChecked != FALSE;
-
-        return MSWTranslateReturnCode( msAns );
-    }
-#endif // wxHAS_MSW_TASKDIALOG
-
-    // use the generic version when task dialog is't available at either
-    // compile or run-time.
-    return wxGenericRichMessageDialog::ShowModal();
-}
-
-#endif // wxUSE_RICHMSGDLG
diff --git a/Source/3rd Party/wx/src/msw/scrolbar.cpp b/Source/3rd Party/wx/src/msw/scrolbar.cpp
index d69d829ec..7b4d77a6c 100644
--- a/Source/3rd Party/wx/src/msw/scrolbar.cpp	
+++ b/Source/3rd Party/wx/src/msw/scrolbar.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: scrolbar.cpp 39476 2006-05-30 13:43:18Z ABX $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,6 +27,62 @@
 
 #include "wx/msw/private.h"
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxScrollBarStyle )
+
+wxBEGIN_FLAGS( wxScrollBarStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxSB_HORIZONTAL)
+    wxFLAGS_MEMBER(wxSB_VERTICAL)
+
+wxEND_FLAGS( wxScrollBarStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxScrollBar, wxControl,"wx/scrolbar.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxScrollBar)
+    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )
+
+    wxPROPERTY( ThumbPosition , int , SetThumbPosition, GetThumbPosition, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( ThumbSize , int , SetThumbSize, GetThumbSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( PageSize , int , SetPageSize, GetPageSize, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxScrollBarStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxScrollBar)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxScrollBar , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
+#endif
+
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
@@ -50,20 +106,46 @@ wxScrollBar::~wxScrollBar(void)
 }
 
 bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
-                              WXWORD WXUNUSED(pos), WXHWND WXUNUSED(control))
+                              WXWORD pos, WXHWND WXUNUSED(control))
 {
-    // don't use pos parameter because it is limited to 16 bits, get the full
-    // 32 bit position from the control itself instead
-    WinStruct<SCROLLINFO> scrollInfo;
-    scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_TRACKPOS;
+    // current and max positions
+    int position,
+        maxPos, trackPos = pos;
 
-    if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
+    wxUnusedVar(trackPos);
+
+    // when we're dragging the scrollbar we can't use pos parameter because it
+    // is limited to 16 bits
+    // JACS: now always using GetScrollInfo, since there's no reason
+    // not to
+//    if ( wParam == SB_THUMBPOSITION || wParam == SB_THUMBTRACK )
     {
-        wxLogLastError(wxT("GetScrollInfo"));
-        return false;
-    }
+        SCROLLINFO scrollInfo;
+        wxZeroMemory(scrollInfo);
+        scrollInfo.cbSize = sizeof(SCROLLINFO);
 
-    int maxPos = scrollInfo.nMax;
+        // also get the range if we call GetScrollInfo() anyhow -- this is less
+        // expensive than call it once here and then call GetScrollRange()
+        // below
+        scrollInfo.fMask = SIF_RANGE | SIF_POS | SIF_TRACKPOS;
+
+        if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
+        {
+            wxLogLastError(_T("GetScrollInfo"));
+        }
+
+        trackPos = scrollInfo.nTrackPos;
+        position = scrollInfo.nPos;
+        maxPos = scrollInfo.nMax;
+    }
+#if 0
+    else
+    {
+        position = ::GetScrollPos((HWND) control, SB_CTL);
+        int minPos;
+        ::GetScrollRange((HWND) control, SB_CTL, &minPos, &maxPos);
+    }
+#endif
 
     // A page size greater than one has the effect of reducing the effective
     // range, therefore the range has already been boosted artificially - so
@@ -71,54 +153,64 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     if ( m_pageSize > 1 )
         maxPos -= (m_pageSize - 1);
 
-    int position = scrollInfo.nPos;
     wxEventType scrollEvent = wxEVT_NULL;
+
+    int nScrollInc;
     switch ( wParam )
     {
         case SB_TOP:
-            position = 0;
+            nScrollInc = maxPos - position;
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
         case SB_BOTTOM:
-            position = maxPos;
+            nScrollInc = -position;
             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 
         case SB_LINEUP:
-            position--;
+            nScrollInc = -1;
             scrollEvent = wxEVT_SCROLL_LINEUP;
             break;
 
         case SB_LINEDOWN:
-            position++;
+            nScrollInc = 1;
             scrollEvent = wxEVT_SCROLL_LINEDOWN;
             break;
 
         case SB_PAGEUP:
-            position -= GetPageSize();
+            nScrollInc = -GetPageSize();
             scrollEvent = wxEVT_SCROLL_PAGEUP;
             break;
 
         case SB_PAGEDOWN:
-            position += GetPageSize();
+            nScrollInc = GetPageSize();
             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 
         case SB_THUMBPOSITION:
+            nScrollInc = trackPos - position;
+            scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+            break;
+
         case SB_THUMBTRACK:
-            position = scrollInfo.nTrackPos;
-            scrollEvent = wParam == SB_THUMBPOSITION ? wxEVT_SCROLL_THUMBRELEASE
-                                                     : wxEVT_SCROLL_THUMBTRACK;
+            nScrollInc = trackPos - position;
+            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
             break;
 
         case SB_ENDSCROLL:
+            nScrollInc = 0;
             scrollEvent = wxEVT_SCROLL_CHANGED;
             break;
+
+        default:
+            nScrollInc = 0;
     }
 
-    if ( position != scrollInfo.nPos )
+    if ( nScrollInc )
     {
+        position += nScrollInc;
+
         if ( position < 0 )
             position = 0;
         if ( position > maxPos )
@@ -139,7 +231,7 @@ bool wxScrollBar::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     event.SetPosition(position);
     event.SetEventObject( this );
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 void wxScrollBar::SetThumbPosition(int viewStart)
@@ -156,14 +248,17 @@ void wxScrollBar::SetThumbPosition(int viewStart)
 
 int wxScrollBar::GetThumbPosition(void) const
 {
-    WinStruct<SCROLLINFO> scrollInfo;
+    SCROLLINFO scrollInfo;
+    wxZeroMemory(scrollInfo);
+    scrollInfo.cbSize = sizeof(SCROLLINFO);
     scrollInfo.fMask = SIF_POS;
 
     if ( !::GetScrollInfo(GetHwnd(), SB_CTL, &scrollInfo) )
     {
-        wxLogLastError(wxT("GetScrollInfo"));
+        wxLogLastError(_T("GetScrollInfo"));
     }
     return scrollInfo.nPos;
+//    return ::GetScrollPos((HWND)m_hWnd, SB_CTL);
 }
 
 void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageSize,
diff --git a/Source/3rd Party/wx/src/msw/settings.cpp b/Source/3rd Party/wx/src/msw/settings.cpp
index 7804632b9..142d61681 100644
--- a/Source/3rd Party/wx/src/msw/settings.cpp	
+++ b/Source/3rd Party/wx/src/msw/settings.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: settings.cpp 67017 2011-02-25 09:37:28Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -34,14 +34,12 @@
 
 #include "wx/msw/private.h"
 #include "wx/msw/missing.h" // for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC
-#include "wx/msw/private/metrics.h"
 
 #ifndef SPI_GETFLATMENU
 #define SPI_GETFLATMENU                     0x1022
 #endif
 
 #include "wx/fontutil.h"
-#include "wx/fontenum.h"
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -91,7 +89,8 @@ bool wxSystemSettingsModule::OnInit()
 
 void wxSystemSettingsModule::OnExit()
 {
-    wxDELETE(gs_fontDefault);
+    delete gs_fontDefault;
+    gs_fontDefault = NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -197,7 +196,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
                 unsigned int n = index - wxSYS_COLOUR_BTNHIGHLIGHT;
 
                 wxASSERT_MSG( n < WXSIZEOF(s_defaultSysColors),
-                              wxT("forgot tp update the default colours array") );
+                              _T("forgot tp update the default colours array") );
 
                 colSys = s_defaultSysColors[n];
                 hasCol = true;
@@ -214,9 +213,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 #endif
     }
 
-    wxColour ret = wxRGBToColour(colSys);
-    wxASSERT(ret.IsOk());
-    return ret;
+    return wxRGBToColour(colSys);
 }
 
 // ----------------------------------------------------------------------------
@@ -235,6 +232,13 @@ wxFont wxCreateFontFromStockObject(int index)
         {
             wxNativeFontInfo info;
             info.lf = lf;
+#ifndef __WXWINCE__
+            // We want Windows 2000 or later to have new fonts even MS Shell Dlg
+            // is returned as default GUI font for compatibility
+            int verMaj;
+            if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)
+                wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
+#endif
             // Under MicroWindows we pass the HFONT as well
             // because it's hard to convert HFONT -> LOGFONT -> HFONT
             // It's OK to delete stock objects, the delete will be ignored.
@@ -246,12 +250,12 @@ wxFont wxCreateFontFromStockObject(int index)
         }
         else
         {
-            wxFAIL_MSG( wxT("failed to get LOGFONT") );
+            wxFAIL_MSG( _T("failed to get LOGFONT") );
         }
     }
     else // GetStockObject() failed
     {
-        wxFAIL_MSG( wxT("stock font not found") );
+        wxFAIL_MSG( _T("stock font not found") );
     }
 
     return font;
@@ -268,39 +272,24 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         gs_fontDefault = new wxFont(wxCreateFontFromStockObject(SYSTEM_FONT));
     }
 
-    wxASSERT(gs_fontDefault->IsOk() &&
-             wxFontEnumerator::IsValidFacename(gs_fontDefault->GetFaceName()));
     return *gs_fontDefault;
 #else // !__WXWINCE__
     // wxWindow ctor calls GetFont(wxSYS_DEFAULT_GUI_FONT) so we're
     // called fairly often -- this is why we cache this particular font
-    if ( index == wxSYS_DEFAULT_GUI_FONT )
+    const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
+    if ( isDefaultRequested )
     {
-        if ( !gs_fontDefault )
-        {
-            // http://blogs.msdn.com/oldnewthing/archive/2005/07/07/436435.aspx
-            // explains why neither SYSTEM_FONT nor DEFAULT_GUI_FONT should be
-            // used here
-            //
-            // the message box font seems to be the one which should be used
-            // for most (simple) controls, e.g. buttons and such but other
-            // controls may prefer to use lfStatusFont or lfCaptionFont if it
-            // is more appropriate for them
-            wxNativeFontInfo info;
-            info.lf = wxMSWImpl::GetNonClientMetrics().lfMessageFont;
-            gs_fontDefault = new wxFont(info);
-        }
-
-        return *gs_fontDefault;
+        if ( gs_fontDefault )
+            return *gs_fontDefault;
     }
 
     wxFont font = wxCreateFontFromStockObject(index);
 
-    wxASSERT(font.IsOk());
-
-#if wxUSE_FONTENUM
-    wxASSERT(wxFontEnumerator::IsValidFacename(font.GetFaceName()));
-#endif // wxUSE_FONTENUM
+    if ( isDefaultRequested )
+    {
+        // if we got here it means we hadn't cached it yet - do now
+        gs_fontDefault = new wxFont(font);
+    }
 
     return font;
 #endif // __WXWINCE__/!__WXWINCE__
@@ -398,14 +387,11 @@ static const int gs_metricsMap[] =
 #else
     -1,
 #endif
-    // SM_SWAPBUTTON is not available under CE and it doesn't make sense to ask
-    // for it there
 #ifdef SM_SWAPBUTTON
     SM_SWAPBUTTON,
 #else
-    -1,
+    -1
 #endif
-    -1   // wxSYS_DCLICK_MSEC - not available as system metric
 };
 
 // Get a system metric, e.g. scrollbar size
@@ -416,13 +402,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
     return 0;
 #else // !__WXMICROWIN__
     wxCHECK_MSG( index > 0 && (size_t)index < WXSIZEOF(gs_metricsMap), 0,
-                 wxT("invalid metric") );
-
-    if ( index == wxSYS_DCLICK_MSEC )
-    {
-        // This one is not a Win32 system metric
-        return ::GetDoubleClickTime();
-    }
+                 _T("invalid metric") );
 
     int indexMSW = gs_metricsMap[index];
     if ( indexMSW == -1 )
@@ -454,7 +434,7 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
             return ::GetSystemMetrics(SM_TABLETPC) != 0;
 
         default:
-            wxFAIL_MSG( wxT("unknown system feature") );
+            wxFAIL_MSG( _T("unknown system feature") );
 
             return false;
     }
@@ -506,7 +486,7 @@ extern wxFont wxGetCCDefaultFont()
         }
         else
         {
-            wxLogLastError(wxT("SystemParametersInfo(SPI_GETICONTITLELOGFONT"));
+            wxLogLastError(_T("SystemParametersInfo(SPI_GETICONTITLELOGFONT"));
         }
     }
 #endif // __WXWINCE__
diff --git a/Source/3rd Party/wx/src/msw/slider.cpp b/Source/3rd Party/wx/src/msw/slider95.cpp
similarity index 63%
rename from Source/3rd Party/wx/src/msw/slider.cpp
rename to Source/3rd Party/wx/src/msw/slider95.cpp
index 65d996929..19565b1c3 100644
--- a/Source/3rd Party/wx/src/msw/slider.cpp	
+++ b/Source/3rd Party/wx/src/msw/slider95.cpp	
@@ -1,711 +1,686 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/slider.cpp
-// Purpose:     wxSlider, using the Win95 (and later) trackbar control
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart 1998
-//                  Vadim Zeitlin 2004
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_SLIDER
-
-#include "wx/slider.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
-    #include "wx/brush.h"
-#endif
-
-#include "wx/msw/subwin.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// indices of labels in wxSlider::m_labels
-enum
-{
-    SliderLabel_Min,
-    SliderLabel_Max,
-    SliderLabel_Value,
-    SliderLabel_Last
-};
-
-// the gaps between the slider and the labels, in pixels
-const int HGAP = 5;
-const int VGAP = 4;
-// the width of the borders including white space
-const int BORDERPAD = 8;
-// these 2 values are arbitrary:
-const int THUMB = 24;
-const int TICK = 8;
-
-} // anonymous namespace
-
-// ============================================================================
-// wxSlider implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// construction
-// ----------------------------------------------------------------------------
-
-void wxSlider::Init()
-{
-    m_labels = NULL;
-
-    m_pageSize = 1;
-    m_lineSize = 1;
-    m_rangeMax = 0;
-    m_rangeMin = 0;
-    m_tickFreq = 0;
-
-    m_isDragging = false;
-}
-
-bool wxSlider::Create(wxWindow *parent,
-                      wxWindowID id,
-                      int value,
-                      int minValue,
-                      int maxValue,
-                      const wxPoint& pos,
-                      const wxSize& size,
-                      long style,
-                      const wxValidator& validator,
-                      const wxString& name)
-{
-    wxCHECK_MSG( minValue < maxValue, false,
-        wxT("Slider minimum must be strictly less than the maximum.") );
-
-    // our styles are redundant: wxSL_LEFT/RIGHT imply wxSL_VERTICAL and
-    // wxSL_TOP/BOTTOM imply wxSL_HORIZONTAL, but for backwards compatibility
-    // reasons we can't really change it, instead try to infer the orientation
-    // from the flags given to us here
-    switch ( style & (wxSL_LEFT | wxSL_RIGHT | wxSL_TOP | wxSL_BOTTOM) )
-    {
-        case wxSL_LEFT:
-        case wxSL_RIGHT:
-            style |= wxSL_VERTICAL;
-            break;
-
-        case wxSL_TOP:
-        case wxSL_BOTTOM:
-            style |= wxSL_HORIZONTAL;
-            break;
-
-        case 0:
-            // no specific direction, do we have at least the orientation?
-            if ( !(style & (wxSL_HORIZONTAL | wxSL_VERTICAL)) )
-            {
-                // no, choose default
-                style |= wxSL_BOTTOM | wxSL_HORIZONTAL;
-            }
-    };
-
-    wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL),
-                    wxT("incompatible slider direction and orientation") );
-
-
-    // initialize everything
-    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
-        return false;
-
-    // ensure that we have correct values for GetLabelsSize()
-    m_rangeMin = minValue;
-    m_rangeMax = maxValue;
-
-    // create the labels first, so that our DoGetBestSize() could take them
-    // into account
-    //
-    // note that we could simply create 3 wxStaticTexts here but it could
-    // result in some observable side effects at wx level (e.g. the parent of
-    // wxSlider would have 3 more children than expected) and so we prefer not
-    // to do it like this
-    if ( m_windowStyle & wxSL_LABELS )
-    {
-        m_labels = new wxSubwindows(SliderLabel_Last);
-
-        HWND hwndParent = GetHwndOf(parent);
-        for ( size_t n = 0; n < SliderLabel_Last; n++ )
-        {
-            wxWindowIDRef lblid = NewControlId();
-
-            HWND wnd = ::CreateWindow
-                         (
-                            wxT("STATIC"),
-                            NULL,
-                            WS_CHILD | WS_VISIBLE | SS_CENTER,
-                            0, 0, 0, 0,
-                            hwndParent,
-                            (HMENU)wxUIntToPtr(lblid.GetValue()),
-                            wxGetInstance(),
-                            NULL
-                         );
-
-            m_labels->Set(n, wnd, lblid);
-        }
-        m_labels->SetFont(GetFont());
-    }
-
-    // now create the main control too
-    if ( !MSWCreateControl(TRACKBAR_CLASS, wxEmptyString, pos, size) )
-        return false;
-
-    // and initialize everything
-    SetRange(minValue, maxValue);
-    SetValue(value);
-    SetPageSize( wxMax(1, (maxValue - minValue)/10) );
-
-    // we need to position the labels correctly if we have them and if
-    // SetSize() hadn't been called before (when best size was determined by
-    // MSWCreateControl()) as in this case they haven't been put in place yet
-    if ( m_labels && size.x != wxDefaultCoord && size.y != wxDefaultCoord )
-    {
-        SetSize(size);
-    }
-
-    return true;
-}
-
-WXDWORD wxSlider::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
-
-    // TBS_HORZ, TBS_RIGHT and TBS_BOTTOM are 0 but do include them for clarity
-    msStyle |= style & wxSL_VERTICAL ? TBS_VERT : TBS_HORZ;
-
-    if ( style & wxSL_BOTH )
-    {
-        // this fully specifies the style combined with TBS_VERT/HORZ above
-        msStyle |= TBS_BOTH;
-    }
-    else // choose one direction
-    {
-        if ( style & wxSL_LEFT )
-            msStyle |= TBS_LEFT;
-        else if ( style & wxSL_RIGHT )
-            msStyle |= TBS_RIGHT;
-        else if ( style & wxSL_TOP )
-            msStyle |= TBS_TOP;
-        else if ( style & wxSL_BOTTOM )
-            msStyle |= TBS_BOTTOM;
-    }
-
-    if ( style & wxSL_AUTOTICKS )
-        msStyle |= TBS_AUTOTICKS;
-    else
-        msStyle |= TBS_NOTICKS;
-
-    if ( style & wxSL_SELRANGE )
-        msStyle |= TBS_ENABLESELRANGE;
-
-    return msStyle;
-}
-
-wxSlider::~wxSlider()
-{
-    delete m_labels;
-}
-
-// ----------------------------------------------------------------------------
-// event handling
-// ----------------------------------------------------------------------------
-
-bool wxSlider::MSWOnScroll(int WXUNUSED(orientation),
-                           WXWORD wParam,
-                           WXWORD WXUNUSED(pos),
-                           WXHWND control)
-{
-    wxEventType scrollEvent;
-    switch ( wParam )
-    {
-        case SB_TOP:
-            scrollEvent = wxEVT_SCROLL_TOP;
-            break;
-
-        case SB_BOTTOM:
-            scrollEvent = wxEVT_SCROLL_BOTTOM;
-            break;
-
-        case SB_LINEUP:
-            scrollEvent = wxEVT_SCROLL_LINEUP;
-            break;
-
-        case SB_LINEDOWN:
-            scrollEvent = wxEVT_SCROLL_LINEDOWN;
-            break;
-
-        case SB_PAGEUP:
-            scrollEvent = wxEVT_SCROLL_PAGEUP;
-            break;
-
-        case SB_PAGEDOWN:
-            scrollEvent = wxEVT_SCROLL_PAGEDOWN;
-            break;
-
-        case SB_THUMBTRACK:
-            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
-            m_isDragging = true;
-            break;
-
-        case SB_THUMBPOSITION:
-            if ( m_isDragging )
-            {
-                scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
-                m_isDragging = false;
-            }
-            else
-            {
-                // this seems to only happen when the mouse wheel is used: in
-                // this case, as it might be unexpected to get THUMBRELEASE
-                // without preceding THUMBTRACKs, we don't generate it at all
-                // but generate CHANGED event because the control itself does
-                // not send us SB_ENDSCROLL for whatever reason when mouse
-                // wheel is used
-                scrollEvent = wxEVT_SCROLL_CHANGED;
-            }
-            break;
-
-        case SB_ENDSCROLL:
-            scrollEvent = wxEVT_SCROLL_CHANGED;
-            break;
-
-        default:
-            // unknown scroll event?
-            return false;
-    }
-
-    int newPos = ValueInvertOrNot((int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0));
-    if ( (newPos < GetMin()) || (newPos > GetMax()) )
-    {
-        // out of range - but we did process it
-        return true;
-    }
-
-    SetValue(newPos);
-
-    wxScrollEvent event(scrollEvent, m_windowId);
-    event.SetPosition(newPos);
-    event.SetEventObject( this );
-    HandleWindowEvent(event);
-
-    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
-    cevent.SetInt( newPos );
-    cevent.SetEventObject( this );
-
-    return HandleWindowEvent( cevent );
-}
-
-void wxSlider::Command (wxCommandEvent & event)
-{
-    SetValue (event.GetInt());
-    ProcessCommand (event);
-}
-
-// ----------------------------------------------------------------------------
-// geometry stuff
-// ----------------------------------------------------------------------------
-
-wxRect wxSlider::GetBoundingBox() const
-{
-    // take care not to call our own functions which would call us recursively
-    int x, y, w, h;
-    wxSliderBase::DoGetPosition(&x, &y);
-    wxSliderBase::DoGetSize(&w, &h);
-
-    wxRect rect(x, y, w, h);
-    if ( m_labels )
-    {
-        wxRect lrect = m_labels->GetBoundingBox();
-        GetParent()->ScreenToClient(&lrect.x, &lrect.y);
-        rect.Union(lrect);
-    }
-
-    return rect;
-}
-
-void wxSlider::DoGetSize(int *width, int *height) const
-{
-    wxRect rect = GetBoundingBox();
-
-    if ( width )
-        *width = rect.width;
-    if ( height )
-        *height = rect.height;
-}
-
-void wxSlider::DoGetPosition(int *x, int *y) const
-{
-    wxRect rect = GetBoundingBox();
-
-    if ( x )
-        *x = rect.x;
-    if ( y )
-        *y = rect.y;
-}
-
-int wxSlider::GetLabelsSize(int *widthMin, int *widthMax) const
-{
-    if ( widthMin && widthMax )
-    {
-        *widthMin = GetTextExtent(Format(m_rangeMin)).x;
-        *widthMax = GetTextExtent(Format(m_rangeMax)).x;
-
-        if ( HasFlag(wxSL_INVERSE) )
-        {
-            wxSwap(*widthMin, *widthMax);
-        }
-    }
-
-    return HasFlag(wxSL_LABELS) ? GetCharHeight() : 0;
-}
-
-void wxSlider::DoMoveWindow(int x, int y, int width, int height)
-{
-    // all complications below are because we need to position the labels,
-    // without them everything is easy
-    if ( !m_labels )
-    {
-        wxSliderBase::DoMoveWindow(x, y, width, height);
-        return;
-    }
-
-    int minLabelWidth,
-        maxLabelWidth;
-    const int labelHeight = GetLabelsSize(&minLabelWidth, &maxLabelWidth);
-    const int longestLabelWidth = wxMax(minLabelWidth, maxLabelWidth);
-    if ( !HasFlag(wxSL_MIN_MAX_LABELS) )
-    {
-        minLabelWidth =
-        maxLabelWidth = 0;
-    }
-
-    int tickOffset = 0;
-    if ( HasFlag(wxSL_TICKS))
-       tickOffset = TICK;
-    if ( HasFlag(wxSL_BOTH))
-       tickOffset *= 2;
-
-    // be careful to position the slider itself after moving the labels as
-    // otherwise our GetBoundingBox(), which is called from WM_SIZE handler,
-    // would return a wrong result and wrong size would be cached internally
-    if ( HasFlag(wxSL_VERTICAL) )
-    {
-        int labelOffset =  0;
-        int holdTopX;
-        int holdBottomX;
-        int xLabel = (wxMax((THUMB + (BORDERPAD * 2)), longestLabelWidth) / 2) -
-            (longestLabelWidth / 2) + x;
-        if ( HasFlag(wxSL_LEFT) )
-        {
-            holdTopX = xLabel;
-            holdBottomX = xLabel - (abs(maxLabelWidth - minLabelWidth) / 2);
-        }
-        else // wxSL_RIGHT
-        {
-            holdTopX = xLabel + longestLabelWidth + (abs(maxLabelWidth - minLabelWidth) / 2);
-            holdBottomX = xLabel + longestLabelWidth;
-
-            labelOffset = longestLabelWidth + HGAP;
-        }
-
-        if ( HasFlag(wxSL_MIN_MAX_LABELS) )
-        {
-            if ( HasFlag(wxSL_INVERSE) )
-            {
-                wxSwap(holdTopX, holdBottomX);
-            }
-
-            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
-                holdTopX,
-                y,
-                minLabelWidth, labelHeight);
-            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
-                holdBottomX,
-                y + height - labelHeight,
-                maxLabelWidth, labelHeight);
-        }
-
-        if ( HasFlag(wxSL_VALUE_LABEL) )
-        {
-            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
-                x + ( HasFlag(wxSL_LEFT) ? THUMB + tickOffset + HGAP : 0 ),
-                y + (height - labelHeight)/2,
-                longestLabelWidth, labelHeight);
-        }
-
-        // position the slider itself along the left/right edge
-        wxSliderBase::DoMoveWindow(
-            x + labelOffset,
-            y + labelHeight,
-            THUMB + tickOffset + HGAP,
-            height - (labelHeight * 2));
-    }
-    else // horizontal
-    {
-        int yLabelMinMax =
-            (y + ((THUMB + tickOffset) / 2)) - (labelHeight / 2);
-        int xLabelValue =
-            x + minLabelWidth +
-            ((width  - (minLabelWidth + maxLabelWidth)) / 2) -
-            (longestLabelWidth / 2);
-
-        int ySlider = y;
-
-        if ( HasFlag(wxSL_VALUE_LABEL) )
-        {
-            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
-                xLabelValue,
-                y + (HasFlag(wxSL_BOTTOM) ? 0 : THUMB + tickOffset),
-                longestLabelWidth, labelHeight);
-
-            if ( HasFlag(wxSL_BOTTOM) )
-            {
-                ySlider += labelHeight;
-                yLabelMinMax += labelHeight;
-            }
-        }
-
-        if ( HasFlag(wxSL_MIN_MAX_LABELS) )
-        {
-            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
-                x,
-                yLabelMinMax,
-                minLabelWidth, labelHeight);
-            DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
-                x + width - maxLabelWidth,
-                yLabelMinMax,
-                maxLabelWidth, labelHeight);
-        }
-
-        // position the slider itself along the top/bottom edge
-        wxSliderBase::DoMoveWindow(
-            x + minLabelWidth + VGAP,
-            ySlider,
-            width  - (minLabelWidth + maxLabelWidth  + (VGAP*2)),
-            THUMB + tickOffset);
-    }
-}
-
-wxSize wxSlider::DoGetBestSize() const
-{
-    // this value is arbitrary:
-    static const int length = 100;
-
-    int *width;
-    wxSize size;
-    if ( HasFlag(wxSL_VERTICAL) )
-    {
-        size.x = THUMB;
-        size.y = length;
-        width = &size.x;
-
-        if ( m_labels )
-        {
-            int widthMin,
-                widthMax;
-            int hLabel = GetLabelsSize(&widthMin, &widthMax);
-
-            // account for the labels
-            if ( HasFlag(wxSL_MIN_MAX_LABELS) )
-                size.x += HGAP + wxMax(widthMin, widthMax);
-
-            // labels are indented relative to the slider itself
-            size.y += hLabel;
-        }
-    }
-    else // horizontal
-    {
-        size.x = length;
-        size.y = THUMB;
-        width = &size.y;
-
-        if ( m_labels )
-        {
-            int labelSize = GetLabelsSize();
-
-            // Min/max labels are compensated by the ticks so we don't need
-            // extra space for them if we're also showing ticks.
-            if ( HasFlag(wxSL_MIN_MAX_LABELS) && !HasFlag(wxSL_TICKS) )
-                size.y += labelSize;
-
-            // The value label is always on top of the control and so does need
-            // extra space in any case.
-            if ( HasFlag(wxSL_VALUE_LABEL) )
-                size.y += labelSize;
-        }
-    }
-
-    // need extra space to show ticks
-    if ( HasFlag(wxSL_TICKS) )
-    {
-        *width += TICK;
-        // and maybe twice as much if we show them on both sides
-        if ( HasFlag(wxSL_BOTH) )
-            *width += TICK;
-    }
-    return size;
-}
-
-// ----------------------------------------------------------------------------
-// slider-specific methods
-// ----------------------------------------------------------------------------
-
-int wxSlider::GetValue() const
-{
-    return ValueInvertOrNot(::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0));
-}
-
-void wxSlider::SetValue(int value)
-{
-    ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(value));
-
-    if ( m_labels )
-    {
-        ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value).t_str());
-    }
-}
-
-void wxSlider::SetRange(int minValue, int maxValue)
-{
-    // Remember the old logical value if we need to update the physical control
-    // value after changing its range in wxSL_INVERSE case (and avoid an
-    // unnecessary call to GetValue() otherwise as it's just not needed).
-    const int valueOld = HasFlag(wxSL_INVERSE) ? GetValue() : 0;
-
-    m_rangeMin = minValue;
-    m_rangeMax = maxValue;
-
-    ::SendMessage(GetHwnd(), TBM_SETRANGEMIN, TRUE, m_rangeMin);
-    ::SendMessage(GetHwnd(), TBM_SETRANGEMAX, TRUE, m_rangeMax);
-
-    if ( m_labels )
-    {
-        ::SetWindowText((*m_labels)[SliderLabel_Min],
-                        Format(ValueInvertOrNot(m_rangeMin)).t_str());
-        ::SetWindowText((*m_labels)[SliderLabel_Max],
-                        Format(ValueInvertOrNot(m_rangeMax)).t_str());
-    }
-
-    // When emulating wxSL_INVERSE style in wxWidgets, we need to update the
-    // value after changing the range to ensure that the value seen by the user
-    // code, i.e. the one returned by GetValue(), does not change.
-    if ( HasFlag(wxSL_INVERSE) )
-    {
-        ::SendMessage(GetHwnd(), TBM_SETPOS, TRUE, ValueInvertOrNot(valueOld));
-    }
-}
-
-void wxSlider::DoSetTickFreq(int n)
-{
-    m_tickFreq = n;
-    ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) 0 );
-}
-
-void wxSlider::SetPageSize(int pageSize)
-{
-    ::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
-    m_pageSize = pageSize;
-}
-
-int wxSlider::GetPageSize() const
-{
-    return m_pageSize;
-}
-
-void wxSlider::ClearSel()
-{
-    ::SendMessage(GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0);
-}
-
-void wxSlider::ClearTicks()
-{
-    ::SendMessage(GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0);
-}
-
-void wxSlider::SetLineSize(int lineSize)
-{
-    m_lineSize = lineSize;
-    ::SendMessage(GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize);
-}
-
-int wxSlider::GetLineSize() const
-{
-    return (int)::SendMessage(GetHwnd(), TBM_GETLINESIZE, 0, 0);
-}
-
-int wxSlider::GetSelEnd() const
-{
-    return (int)::SendMessage(GetHwnd(), TBM_GETSELEND, 0, 0);
-}
-
-int wxSlider::GetSelStart() const
-{
-    return (int)::SendMessage(GetHwnd(), TBM_GETSELSTART, 0, 0);
-}
-
-void wxSlider::SetSelection(int minPos, int maxPos)
-{
-    ::SendMessage(GetHwnd(), TBM_SETSEL,
-                  (WPARAM) TRUE /* redraw */,
-                  (LPARAM) MAKELONG( minPos, maxPos) );
-}
-
-void wxSlider::SetThumbLength(int len)
-{
-    ::SendMessage(GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0);
-}
-
-int wxSlider::GetThumbLength() const
-{
-    return (int)::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, 0, 0);
-}
-
-void wxSlider::SetTick(int tickPos)
-{
-    ::SendMessage( GetHwnd(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );
-}
-
-// ----------------------------------------------------------------------------
-// composite control methods
-// ----------------------------------------------------------------------------
-
-WXHWND wxSlider::GetStaticMin() const
-{
-    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Min] : NULL;
-}
-
-WXHWND wxSlider::GetStaticMax() const
-{
-    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Max] : NULL;
-}
-
-WXHWND wxSlider::GetEditValue() const
-{
-    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL;
-}
-
-WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxSlider, wxSliderBase, m_labels)
-
-#endif // wxUSE_SLIDER
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/slider.cpp
+// Purpose:     wxSlider, using the Win95 (and later) trackbar control
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: slider95.cpp 41054 2006-09-07 19:01:45Z ABX $
+// Copyright:   (c) Julian Smart 1998
+//                  Vadim Zeitlin 2004
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_SLIDER
+
+#include "wx/slider.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/brush.h"
+#endif
+
+#include "wx/msw/subwin.h"
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// indices of labels in wxSlider::m_labels
+enum
+{
+    SliderLabel_Min,
+    SliderLabel_Max,
+    SliderLabel_Value,
+    SliderLabel_Last
+};
+
+// the gap between the slider and the labels, in pixels
+static const int HGAP = 5;
+
+// ----------------------------------------------------------------------------
+// XTI
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxSliderStyle )
+
+wxBEGIN_FLAGS( wxSliderStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxSL_HORIZONTAL)
+    wxFLAGS_MEMBER(wxSL_VERTICAL)
+    wxFLAGS_MEMBER(wxSL_AUTOTICKS)
+    wxFLAGS_MEMBER(wxSL_LABELS)
+    wxFLAGS_MEMBER(wxSL_LEFT)
+    wxFLAGS_MEMBER(wxSL_TOP)
+    wxFLAGS_MEMBER(wxSL_RIGHT)
+    wxFLAGS_MEMBER(wxSL_BOTTOM)
+    wxFLAGS_MEMBER(wxSL_BOTH)
+    wxFLAGS_MEMBER(wxSL_SELRANGE)
+    wxFLAGS_MEMBER(wxSL_INVERSE)
+
+wxEND_FLAGS( wxSliderStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider, wxControl,"wx/slider.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSlider)
+    wxEVENT_RANGE_PROPERTY( Scroll , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxScrollEvent )
+    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
+
+    wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxSlider)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_8( wxSlider , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
+#endif
+
+// ============================================================================
+// wxSlider implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// construction
+// ----------------------------------------------------------------------------
+
+void wxSlider::Init()
+{
+    m_labels = NULL;
+
+    m_pageSize = 1;
+    m_lineSize = 1;
+    m_rangeMax = 0;
+    m_rangeMin = 0;
+    m_tickFreq = 0;
+
+    m_isDragging = false;
+}
+
+bool
+wxSlider::Create(wxWindow *parent,
+                 wxWindowID id,
+                 int value,
+                 int minValue,
+                 int maxValue,
+                 const wxPoint& pos,
+                 const wxSize& size,
+                 long style,
+                 const wxValidator& validator,
+                 const wxString& name)
+{
+    // our styles are redundant: wxSL_LEFT/RIGHT imply wxSL_VERTICAL and
+    // wxSL_TOP/BOTTOM imply wxSL_HORIZONTAL, but for backwards compatibility
+    // reasons we can't really change it, instead try to infer the orientation
+    // from the flags given to us here
+    switch ( style & (wxSL_LEFT | wxSL_RIGHT | wxSL_TOP | wxSL_BOTTOM) )
+    {
+        case wxSL_LEFT:
+        case wxSL_RIGHT:
+            style |= wxSL_VERTICAL;
+            break;
+
+        case wxSL_TOP:
+        case wxSL_BOTTOM:
+            style |= wxSL_HORIZONTAL;
+            break;
+
+        case 0:
+            // no specific direction, do we have at least the orientation?
+            if ( !(style & (wxSL_HORIZONTAL | wxSL_VERTICAL)) )
+            {
+                // no, choose default
+                style |= wxSL_BOTTOM | wxSL_HORIZONTAL;
+            }
+    };
+
+    wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL),
+                    _T("incompatible slider direction and orientation") );
+
+
+    // initialize everything
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    // ensure that we have correct values for GetLabelsSize()
+    m_rangeMin = minValue;
+    m_rangeMax = maxValue;
+
+    // create the labels first, so that our DoGetBestSize() could take them
+    // into account
+    //
+    // note that we could simply create 3 wxStaticTexts here but it could
+    // result in some observable side effects at wx level (e.g. the parent of
+    // wxSlider would have 3 more children than expected) and so we prefer not
+    // to do it like this
+    if ( m_windowStyle & wxSL_LABELS )
+    {
+        m_labels = new wxSubwindows(SliderLabel_Last);
+
+        HWND hwndParent = GetHwndOf(parent);
+        for ( size_t n = 0; n < SliderLabel_Last; n++ )
+        {
+            (*m_labels)[n] = ::CreateWindow
+                               (
+                                    wxT("STATIC"),
+                                    NULL,
+                                    WS_CHILD | WS_VISIBLE | SS_CENTER,
+                                    0, 0, 0, 0,
+                                    hwndParent,
+                                    (HMENU)NewControlId(),
+                                    wxGetInstance(),
+                                    NULL
+                               );
+        }
+
+        m_labels->SetFont(GetFont());
+    }
+
+    // now create the main control too
+    if ( !MSWCreateControl(TRACKBAR_CLASS, wxEmptyString, pos, size) )
+        return false;
+
+    // and initialize everything
+    SetRange(minValue, maxValue);
+    SetValue(value);
+    SetPageSize((maxValue - minValue)/10);
+
+    // we need to position the labels correctly if we have them and if
+    // SetSize() hadn't been called before (when best size was determined by
+    // MSWCreateControl()) as in this case they haven't been put in place yet
+    if ( m_labels && size.x != wxDefaultCoord && size.y != wxDefaultCoord )
+    {
+        SetSize(size);
+    }
+
+    return true;
+}
+
+WXDWORD wxSlider::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
+
+    // TBS_HORZ, TBS_RIGHT and TBS_BOTTOM are 0 but do include them for clarity
+    msStyle |= style & wxSL_VERTICAL ? TBS_VERT : TBS_HORZ;
+
+    if ( style & wxSL_BOTH )
+    {
+        // this fully specifies the style combined with TBS_VERT/HORZ above
+        msStyle |= TBS_BOTH;
+    }
+    else // choose one direction
+    {
+        if ( style & wxSL_LEFT )
+            msStyle |= TBS_LEFT;
+        else if ( style & wxSL_RIGHT )
+            msStyle |= TBS_RIGHT;
+        else if ( style & wxSL_TOP )
+            msStyle |= TBS_TOP;
+        else if ( style & wxSL_BOTTOM )
+            msStyle |= TBS_BOTTOM;
+    }
+
+    if ( style & wxSL_AUTOTICKS )
+        msStyle |= TBS_AUTOTICKS;
+    else
+        msStyle |= TBS_NOTICKS;
+
+    if ( style & wxSL_SELRANGE )
+        msStyle |= TBS_ENABLESELRANGE;
+
+    return msStyle;
+}
+
+wxSlider::~wxSlider()
+{
+    delete m_labels;
+}
+
+// ----------------------------------------------------------------------------
+// event handling
+// ----------------------------------------------------------------------------
+
+bool wxSlider::MSWOnScroll(int WXUNUSED(orientation),
+                           WXWORD wParam,
+                           WXWORD WXUNUSED(pos),
+                           WXHWND control)
+{
+    wxEventType scrollEvent;
+    switch ( wParam )
+    {
+        case SB_TOP:
+            scrollEvent = wxEVT_SCROLL_TOP;
+            break;
+
+        case SB_BOTTOM:
+            scrollEvent = wxEVT_SCROLL_BOTTOM;
+            break;
+
+        case SB_LINEUP:
+            scrollEvent = wxEVT_SCROLL_LINEUP;
+            break;
+
+        case SB_LINEDOWN:
+            scrollEvent = wxEVT_SCROLL_LINEDOWN;
+            break;
+
+        case SB_PAGEUP:
+            scrollEvent = wxEVT_SCROLL_PAGEUP;
+            break;
+
+        case SB_PAGEDOWN:
+            scrollEvent = wxEVT_SCROLL_PAGEDOWN;
+            break;
+
+        case SB_THUMBTRACK:
+            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+            m_isDragging = true;
+            break;
+
+        case SB_THUMBPOSITION:
+            if ( m_isDragging )
+            {
+                scrollEvent = wxEVT_SCROLL_THUMBRELEASE;
+                m_isDragging = false;
+            }
+            else
+            {
+                // this seems to only happen when the mouse wheel is used: in
+                // this case, as it might be unexpected to get THUMBRELEASE
+                // without preceding THUMBTRACKs, we don't generate it at all
+                // but generate CHANGED event because the control itself does
+                // not send us SB_ENDSCROLL for whatever reason when mouse
+                // wheel is used
+                scrollEvent = wxEVT_SCROLL_CHANGED;
+            }
+            break;
+
+        case SB_ENDSCROLL:
+            scrollEvent = wxEVT_SCROLL_CHANGED;
+            break;
+
+        default:
+            // unknown scroll event?
+            return false;
+    }
+
+    int newPos = ValueInvertOrNot((int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0));
+    if ( (newPos < GetMin()) || (newPos > GetMax()) )
+    {
+        // out of range - but we did process it
+        return true;
+    }
+
+    SetValue(newPos);
+
+    wxScrollEvent event(scrollEvent, m_windowId);
+    event.SetPosition(newPos);
+    event.SetEventObject( this );
+    GetEventHandler()->ProcessEvent(event);
+
+    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
+    cevent.SetInt( newPos );
+    cevent.SetEventObject( this );
+
+    return GetEventHandler()->ProcessEvent( cevent );
+}
+
+void wxSlider::Command (wxCommandEvent & event)
+{
+    SetValue (event.GetInt());
+    ProcessCommand (event);
+}
+
+// ----------------------------------------------------------------------------
+// geometry stuff
+// ----------------------------------------------------------------------------
+
+wxRect wxSlider::GetBoundingBox() const
+{
+    // take care not to call our own functions which would call us recursively
+    int x, y, w, h;
+    wxSliderBase::DoGetPosition(&x, &y);
+    wxSliderBase::DoGetSize(&w, &h);
+
+    wxRect rect(x, y, w, h);
+    if ( m_labels )
+    {
+        wxRect lrect = m_labels->GetBoundingBox();
+        GetParent()->ScreenToClient(&lrect.x, &lrect.y);
+        rect.Union(lrect);
+    }
+
+    return rect;
+}
+
+void wxSlider::DoGetSize(int *width, int *height) const
+{
+    wxRect rect = GetBoundingBox();
+
+    if ( width )
+        *width = rect.width;
+    if ( height )
+        *height = rect.height;
+}
+
+void wxSlider::DoGetPosition(int *x, int *y) const
+{
+    wxRect rect = GetBoundingBox();
+
+    if ( x )
+        *x = rect.x;
+    if ( y )
+        *y = rect.y;
+}
+
+int wxSlider::GetLabelsSize(int *width) const
+{
+    int cy;
+
+    if ( width )
+    {
+        // find the max label width
+        int wLabelMin, wLabelMax;
+        GetTextExtent(Format(m_rangeMin), &wLabelMin, &cy);
+        GetTextExtent(Format(m_rangeMax), &wLabelMax, &cy);
+
+        *width = wxMax(wLabelMin, wLabelMax);
+    }
+    else
+    {
+        cy = GetCharHeight();
+    }
+
+    return EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
+}
+
+void wxSlider::DoMoveWindow(int x, int y, int width, int height)
+{
+    // all complications below are because we need to position the labels,
+    // without them everything is easy
+    if ( !m_labels )
+    {
+        wxSliderBase::DoMoveWindow(x, y, width, height);
+        return;
+    }
+
+    // be careful to position the slider itself after moving the labels as
+    // otherwise our GetBoundingBox(), which is called from WM_SIZE handler,
+    // would return a wrong result and wrong size would be cached internally
+    if ( HasFlag(wxSL_VERTICAL) )
+    {
+        int wLabel;
+        int hLabel = GetLabelsSize(&wLabel);
+
+        int xLabel = HasFlag(wxSL_LEFT) ? x + width - wLabel : x;
+
+        // position all labels: min at the top, value in the middle and max at
+        // the bottom
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
+                     xLabel, y, wLabel, hLabel);
+
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
+                     xLabel, y + (height - hLabel)/2, wLabel, hLabel);
+
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
+                      xLabel, y + height - hLabel, wLabel, hLabel);
+
+        // position the slider itself along the left/right edge
+        wxSliderBase::DoMoveWindow(HasFlag(wxSL_LEFT) ? x : x + wLabel + HGAP,
+                                   y + hLabel/2,
+                                   width - wLabel - HGAP,
+                                   height - hLabel);
+    }
+    else // horizontal
+    {
+        int wLabel;
+        int hLabel = GetLabelsSize(&wLabel);
+
+        int yLabel = HasFlag(wxSL_TOP) ? y + height - hLabel : y;
+
+        // position all labels: min on the left, value in the middle and max to
+        // the right
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Min],
+                      x, yLabel, wLabel, hLabel);
+
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Value],
+                      x + (width - wLabel)/2, yLabel, wLabel, hLabel);
+
+        DoMoveSibling((HWND)(*m_labels)[SliderLabel_Max],
+                      x + width - wLabel, yLabel, wLabel, hLabel);
+
+        // position the slider itself along the top/bottom edge
+        wxSliderBase::DoMoveWindow(x,
+                                   HasFlag(wxSL_TOP) ? y : y + hLabel,
+                                   width,
+                                   height - hLabel);
+    }
+}
+
+wxSize wxSlider::DoGetBestSize() const
+{
+    // these values are arbitrary
+    static const int length = 100;
+    static const int thumb = 24;
+    static const int ticks = 8;
+
+    int *width;
+    wxSize size;
+    if ( HasFlag(wxSL_VERTICAL) )
+    {
+        size.x = thumb;
+        size.y = length;
+        width = &size.x;
+
+        if ( m_labels )
+        {
+            int wLabel;
+            int hLabel = GetLabelsSize(&wLabel);
+
+            // account for the labels
+            size.x += HGAP + wLabel;
+
+            // labels are indented relative to the slider itself
+            size.y += hLabel;
+        }
+    }
+    else // horizontal
+    {
+        size.x = length;
+        size.y = thumb;
+        width = &size.y;
+
+        if ( m_labels )
+        {
+            // labels add extra height
+            size.y += GetLabelsSize();
+        }
+    }
+
+    // need extra space to show ticks
+    if ( HasFlag(wxSL_TICKS) )
+    {
+        *width += ticks;
+
+        // and maybe twice as much if we show them on both sides
+        if ( HasFlag(wxSL_BOTH) )
+            *width += ticks;
+    }
+
+    return size;
+}
+
+// ----------------------------------------------------------------------------
+// slider-specific methods
+// ----------------------------------------------------------------------------
+
+int wxSlider::GetValue() const
+{
+    return ValueInvertOrNot(::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0));
+}
+
+void wxSlider::SetValue(int value)
+{
+    ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)ValueInvertOrNot(value));
+
+    if ( m_labels )
+    {
+        ::SetWindowText((*m_labels)[SliderLabel_Value], Format(value));
+    }
+}
+
+void wxSlider::SetRange(int minValue, int maxValue)
+{
+    m_rangeMin = minValue;
+    m_rangeMax = maxValue;
+
+    ::SendMessage(GetHwnd(), TBM_SETRANGEMIN, TRUE, m_rangeMin);
+    ::SendMessage(GetHwnd(), TBM_SETRANGEMAX, TRUE, m_rangeMax);
+
+    if ( m_labels )
+    {
+        ::SetWindowText((*m_labels)[SliderLabel_Min], Format(ValueInvertOrNot(m_rangeMin)));
+        ::SetWindowText((*m_labels)[SliderLabel_Max], Format(ValueInvertOrNot(m_rangeMax)));
+    }
+}
+
+void wxSlider::SetTickFreq(int n, int pos)
+{
+    m_tickFreq = n;
+    ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );
+}
+
+void wxSlider::SetPageSize(int pageSize)
+{
+    ::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
+    m_pageSize = pageSize;
+}
+
+int wxSlider::GetPageSize() const
+{
+    return m_pageSize;
+}
+
+void wxSlider::ClearSel()
+{
+    ::SendMessage(GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0);
+}
+
+void wxSlider::ClearTicks()
+{
+    ::SendMessage(GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0);
+}
+
+void wxSlider::SetLineSize(int lineSize)
+{
+    m_lineSize = lineSize;
+    ::SendMessage(GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize);
+}
+
+int wxSlider::GetLineSize() const
+{
+    return (int)::SendMessage(GetHwnd(), TBM_GETLINESIZE, 0, 0);
+}
+
+int wxSlider::GetSelEnd() const
+{
+    return (int)::SendMessage(GetHwnd(), TBM_GETSELEND, 0, 0);
+}
+
+int wxSlider::GetSelStart() const
+{
+    return (int)::SendMessage(GetHwnd(), TBM_GETSELSTART, 0, 0);
+}
+
+void wxSlider::SetSelection(int minPos, int maxPos)
+{
+    ::SendMessage(GetHwnd(), TBM_SETSEL,
+                  (WPARAM) TRUE /* redraw */,
+                  (LPARAM) MAKELONG( minPos, maxPos) );
+}
+
+void wxSlider::SetThumbLength(int len)
+{
+    ::SendMessage(GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0);
+}
+
+int wxSlider::GetThumbLength() const
+{
+    return (int)::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, 0, 0);
+}
+
+void wxSlider::SetTick(int tickPos)
+{
+    ::SendMessage( GetHwnd(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );
+}
+
+// ----------------------------------------------------------------------------
+// composite control methods
+// ----------------------------------------------------------------------------
+
+WXHWND wxSlider::GetStaticMin() const
+{
+    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Min] : NULL;
+}
+
+WXHWND wxSlider::GetStaticMax() const
+{
+    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Max] : NULL;
+}
+
+WXHWND wxSlider::GetEditValue() const
+{
+    return m_labels ? (WXHWND)(*m_labels)[SliderLabel_Value] : NULL;
+}
+
+WX_FORWARD_STD_METHODS_TO_SUBWINDOWS(wxSlider, wxSliderBase, m_labels)
+
+#endif // wxUSE_SLIDER
diff --git a/Source/3rd Party/wx/src/msw/snglinst.cpp b/Source/3rd Party/wx/src/msw/snglinst.cpp
index 95ad8fa56..308a2460b 100644
--- a/Source/3rd Party/wx/src/msw/snglinst.cpp	
+++ b/Source/3rd Party/wx/src/msw/snglinst.cpp	
@@ -1,13 +1,13 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/snglinst.cpp
+// Name:        msw/snglinst.cpp
 // Purpose:     implements wxSingleInstanceChecker class for Win32 using
 //              named mutexes
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: snglinst.cpp 35650 2005-09-23 12:56:45Z MR $
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -40,7 +40,7 @@
 // wxSingleInstanceCheckerImpl: the real implementation class
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxSingleInstanceCheckerImpl
+class WXDLLEXPORT wxSingleInstanceCheckerImpl
 {
 public:
     wxSingleInstanceCheckerImpl()
@@ -52,10 +52,10 @@ public:
 
     bool Create(const wxString& name)
     {
-        m_hMutex = ::CreateMutex(NULL, FALSE, name.t_str());
+        m_hMutex = ::CreateMutex(NULL, FALSE, name);
         if ( !m_hMutex )
         {
-            wxLogLastError(wxT("CreateMutex"));
+            wxLogLastError(_T("CreateMutex"));
 
             return false;
         }
@@ -69,7 +69,7 @@ public:
     bool WasOpened() const
     {
         wxCHECK_MSG( m_hMutex, false,
-                     wxT("can't be called if mutex creation failed") );
+                     _T("can't be called if mutex creation failed") );
 
         return m_wasOpened;
     }
@@ -80,7 +80,7 @@ public:
         {
             if ( !::CloseHandle(m_hMutex) )
             {
-                wxLogLastError(wxT("CloseHandle(mutex)"));
+                wxLogLastError(_T("CloseHandle(mutex)"));
             }
         }
     }
@@ -92,7 +92,7 @@ private:
     // the mutex handle, may be NULL
     HANDLE m_hMutex;
 
-    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl);
+    DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)
 };
 
 // ============================================================================
@@ -103,19 +103,19 @@ bool wxSingleInstanceChecker::Create(const wxString& name,
                                      const wxString& WXUNUSED(path))
 {
     wxASSERT_MSG( !m_impl,
-                  wxT("calling wxSingleInstanceChecker::Create() twice?") );
+                  _T("calling wxSingleInstanceChecker::Create() twice?") );
 
     // creating unnamed mutex doesn't have the same semantics!
-    wxASSERT_MSG( !name.empty(), wxT("mutex name can't be empty") );
+    wxASSERT_MSG( !name.empty(), _T("mutex name can't be empty") );
 
     m_impl = new wxSingleInstanceCheckerImpl;
 
     return m_impl->Create(name);
 }
 
-bool wxSingleInstanceChecker::DoIsAnotherRunning() const
+bool wxSingleInstanceChecker::IsAnotherRunning() const
 {
-    wxCHECK_MSG( m_impl, false, wxT("must call Create() first") );
+    wxCHECK_MSG( m_impl, false, _T("must call Create() first") );
 
     // if the mutex had been opened, another instance is running - otherwise we
     // would have created it
diff --git a/Source/3rd Party/wx/src/msw/spinbutt.cpp b/Source/3rd Party/wx/src/msw/spinbutt.cpp
index ccd4f12fe..7361a4f2d 100644
--- a/Source/3rd Party/wx/src/msw/spinbutt.cpp	
+++ b/Source/3rd Party/wx/src/msw/spinbutt.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: spinbutt.cpp 42816 2006-10-31 08:50:17Z RD $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,6 +33,8 @@
 
 #include "wx/spinbutt.h"
 
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
+
 #include "wx/msw/private.h"
 
 #ifndef UDM_SETRANGE32
@@ -52,6 +54,66 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxSpinButtonStyle )
+
+wxBEGIN_FLAGS( wxSpinButtonStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxSP_HORIZONTAL)
+    wxFLAGS_MEMBER(wxSP_VERTICAL)
+    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
+    wxFLAGS_MEMBER(wxSP_WRAP)
+
+wxEND_FLAGS( wxSpinButtonStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl,"wx/spinbut.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSpinButton)
+    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxSpinEvent )
+
+    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Min , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxSpinButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxSpinButton)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+#endif
+
+
+
 // ----------------------------------------------------------------------------
 // wxSpinButton
 // ----------------------------------------------------------------------------
@@ -195,7 +257,7 @@ void wxSpinButton::SetValue(int val)
 }
 
 void wxSpinButton::NormalizeValue()
-{
+{ 
     SetValue( GetValue() );
 }
 
@@ -246,7 +308,7 @@ bool wxSpinButton::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     event.SetPosition((short)pos);    // cast is important for negative values!
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result)
@@ -262,7 +324,7 @@ bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *
     event.SetPosition(lpnmud->iPos + lpnmud->iDelta);
     event.SetEventObject(this);
 
-    bool processed = HandleWindowEvent(event);
+    bool processed = GetEventHandler()->ProcessEvent(event);
 
     *result = event.IsAllowed() ? 0 : 1;
 
diff --git a/Source/3rd Party/wx/src/msw/spinctrl.cpp b/Source/3rd Party/wx/src/msw/spinctrl.cpp
index aaa50bb41..4aba7a04d 100644
--- a/Source/3rd Party/wx/src/msw/spinctrl.cpp	
+++ b/Source/3rd Party/wx/src/msw/spinctrl.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     22.07.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: spinctrl.cpp 55622 2008-09-14 19:56:14Z VZ $
 // Copyright:   (c) 1999-2005 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,11 +29,9 @@
 #include "wx/spinctrl.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/hashmap.h"
     #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/event.h"
     #include "wx/textctrl.h"
-    #include "wx/wxcrtvararg.h"
 #endif
 
 #include "wx/msw/private.h"
@@ -48,10 +46,77 @@
 // macros
 // ----------------------------------------------------------------------------
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxSpinCtrlStyle )
+
+wxBEGIN_FLAGS( wxSpinCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxSP_HORIZONTAL)
+    wxFLAGS_MEMBER(wxSP_VERTICAL)
+    wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
+    wxFLAGS_MEMBER(wxSP_WRAP)
+
+wxEND_FLAGS( wxSpinCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinCtrl, wxControl,"wx/spinbut.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxSpinCtrl)
+    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxSpinEvent )
+    wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SPINCTRL_UPDATED , wxCommandEvent )
+    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
+    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
+
+    wxPROPERTY( ValueString , wxString , SetValue , GetValue , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) ;
+    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Min , int , SetMin, GetMin, 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxSpinCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+/*
+    TODO PROPERTIES
+        style wxSP_ARROW_KEYS
+*/
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxSpinCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxSpinCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , ValueString , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
+#endif
+
 BEGIN_EVENT_TABLE(wxSpinCtrl, wxSpinButton)
     EVT_CHAR(wxSpinCtrl::OnChar)
+
     EVT_SET_FOCUS(wxSpinCtrl::OnSetFocus)
     EVT_KILL_FOCUS(wxSpinCtrl::OnKillFocus)
+    EVT_SPIN(wxID_ANY, wxSpinCtrl::OnSpinChange)
 END_EVENT_TABLE()
 
 #define GetBuddyHwnd()      (HWND)(m_hwndBuddy)
@@ -65,28 +130,12 @@ END_EVENT_TABLE()
 // font size?)
 static const int MARGIN_BETWEEN = 1;
 
-
-// ---------------------------------------------------------------------------
-// global vars
-// ---------------------------------------------------------------------------
-
-namespace
-{
-
-// Global hash used to find the spin control corresponding to the given buddy
-// text control HWND.
-WX_DECLARE_HASH_MAP(HWND, wxSpinCtrl *,
-                    wxPointerHash, wxPointerEqual,
-                    SpinForTextCtrl);
-
-SpinForTextCtrl gs_spinForTextCtrl;
-
-} // anonymous namespace
-
 // ============================================================================
 // implementation
 // ============================================================================
 
+wxArraySpins wxSpinCtrl::ms_allSpins;
+
 // ----------------------------------------------------------------------------
 // wnd proc for the buddy text ctrl
 // ----------------------------------------------------------------------------
@@ -96,7 +145,7 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
                                             WPARAM wParam,
                                             LPARAM lParam)
 {
-    wxSpinCtrl * const spin = wxSpinCtrl::GetSpinForTextCtrl(hwnd);
+    wxSpinCtrl *spin = (wxSpinCtrl *)wxGetWindowUserData(hwnd);
 
     // forward some messages (mostly the key and focus ones) to the spin ctrl
     switch ( message )
@@ -119,21 +168,11 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
         // is clicked with the "?" cursor
         case WM_HELP:
 #endif
-            {
-                WXLRESULT result;
-                if ( spin->MSWHandleMessage(&result, message, wParam, lParam) )
-                {
-                    // Do not let the message be processed by the window proc
-                    // of the text control if it had been already handled at wx
-                    // level, this is consistent with what happens for normal,
-                    // non-composite controls.
-                    return 0;
-                }
+            spin->MSWWindowProc(message, wParam, lParam);
 
-                // The control may have been deleted at this point, so check.
-                if ( !::IsWindow(hwnd) )
-                    return 0;
-            }
+            // The control may have been deleted at this point, so check.
+            if ( !::IsWindow(hwnd) || wxGetWindowUserData(hwnd) != spin )
+                return 0;
             break;
 
         case WM_GETDLGCODE:
@@ -160,16 +199,16 @@ LRESULT APIENTRY _EXPORT wxBuddyTextWndProc(HWND hwnd,
 /* static */
 wxSpinCtrl *wxSpinCtrl::GetSpinForTextCtrl(WXHWND hwndBuddy)
 {
-    const SpinForTextCtrl::const_iterator
-        it = gs_spinForTextCtrl.find(hwndBuddy);
-    if ( it == gs_spinForTextCtrl.end() )
-        return NULL;
+    wxSpinCtrl *spin = (wxSpinCtrl *)wxGetWindowUserData((HWND)hwndBuddy);
 
-    wxSpinCtrl * const spin = it->second;
+    int i = ms_allSpins.Index(spin);
+
+    if ( i == wxNOT_FOUND )
+        return NULL;
 
     // sanity check
     wxASSERT_MSG( spin->m_hwndBuddy == hwndBuddy,
-                  wxT("wxSpinCtrl has incorrect buddy HWND!") );
+                  _T("wxSpinCtrl has incorrect buddy HWND!") );
 
     return spin;
 }
@@ -177,14 +216,14 @@ wxSpinCtrl *wxSpinCtrl::GetSpinForTextCtrl(WXHWND hwndBuddy)
 // process a WM_COMMAND generated by the buddy text control
 bool wxSpinCtrl::ProcessTextCommand(WXWORD cmd, WXWORD WXUNUSED(id))
 {
-    if ( (cmd == EN_CHANGE) && (!m_blockEvent ))
+    if ( cmd == EN_CHANGE )
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
         event.SetEventObject(this);
         wxString val = wxGetWindowText(m_hwndBuddy);
         event.SetString(val);
         event.SetInt(GetValue());
-        return HandleWindowEvent(event);
+        return GetEventHandler()->ProcessEvent(event);
     }
 
     // not processed
@@ -202,7 +241,7 @@ void wxSpinCtrl::OnChar(wxKeyEvent& event)
                 wxString val = wxGetWindowText(m_hwndBuddy);
                 event.SetString(val);
                 event.SetInt(GetValue());
-                if ( HandleWindowEvent(event) )
+                if ( GetEventHandler()->ProcessEvent(event) )
                     return;
                 break;
             }
@@ -218,7 +257,7 @@ void wxSpinCtrl::OnChar(wxKeyEvent& event)
                 eventNav.SetWindowChange(event.ControlDown());
                 eventNav.SetEventObject(this);
 
-                if ( GetParent()->HandleWindowEvent(eventNav) )
+                if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) )
                     return;
             }
             break;
@@ -264,14 +303,6 @@ void wxSpinCtrl::NormalizeValue()
 // construction
 // ----------------------------------------------------------------------------
 
-void wxSpinCtrl::Init()
-{
-    m_blockEvent = false;
-    m_hwndBuddy = NULL;
-    m_wndProcBuddy = NULL;
-    m_oldValue = INT_MIN;
-}
-
 bool wxSpinCtrl::Create(wxWindow *parent,
                         wxWindowID id,
                         const wxString& value,
@@ -281,6 +312,11 @@ bool wxSpinCtrl::Create(wxWindow *parent,
                         int min, int max, int initial,
                         const wxString& name)
 {
+    // this should be in ctor/init function but I don't want to add one to 2.8
+    // to avoid problems with default ctor which can be inlined in the user
+    // code and so might not get this fix without recompilation
+    m_oldValue = INT_MIN;
+
     // before using DoGetBestSize(), have to set style to let the base class
     // know whether this is a horizontal or vertical control (we're always
     // vertical)
@@ -298,17 +334,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     WXDWORD exStyle = 0;
     WXDWORD msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;
 
-    // Scroll text automatically if there is not enough space to show all of
-    // it, this is better than not allowing to enter more digits at all.
-    msStyle |= ES_AUTOHSCROLL;
-
-    // propagate text alignment style to text ctrl
-    if ( style & wxALIGN_RIGHT )
-        msStyle |= ES_RIGHT;
-    else if ( style & wxALIGN_CENTER )
-        msStyle |= ES_CENTER;
-
-    // calculate the sizes: the size given is the total size for both controls
+    // calculate the sizes: the size given is the toal size for both controls
     // and we need to fit them both in the given width (height is the same)
     wxSize sizeText(size), sizeBtn(size);
     sizeBtn.x = wxSpinButton::DoGetBestSize().x;
@@ -321,7 +347,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     sizeText.x -= sizeBtn.x + MARGIN_BETWEEN;
     if ( sizeText.x <= 0 )
     {
-        wxLogDebug(wxT("not enough space for wxSpinCtrl!"));
+        wxLogDebug(_T("not enough space for wxSpinCtrl!"));
     }
 
     wxPoint posBtn(pos);
@@ -338,7 +364,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     m_hwndBuddy = (WXHWND)::CreateWindowEx
                     (
                      exStyle,                // sunken border
-                     wxT("EDIT"),             // window class
+                     _T("EDIT"),             // window class
                      NULL,                   // no window title
                      msStyle,                // style (will be shown later)
                      pos.x, pos.y,           // position
@@ -366,8 +392,7 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     wxSpinButtonBase::SetRange(min, max);
 
     // subclass the text ctrl to be able to intercept some events
-    gs_spinForTextCtrl[GetBuddyHwnd()] = this;
-
+    wxSetWindowUserData(GetBuddyHwnd(), this);
     m_wndProcBuddy = (WXFARPROC)wxSetWindowProc(GetBuddyHwnd(),
                                                 wxBuddyTextWndProc);
 
@@ -393,36 +418,40 @@ bool wxSpinCtrl::Create(wxWindow *parent,
     // associate the text window with the spin button
     (void)::SendMessage(GetHwnd(), UDM_SETBUDDY, (WPARAM)m_hwndBuddy, 0);
 
-    // If the initial text value is actually a number, it overrides the
-    // "initial" argument specified later.
-    long initialFromText;
-    if ( value.ToLong(&initialFromText) )
-        initial = initialFromText;
-
     SetValue(initial);
 
-    m_oldValue = initial;
-
     // Set the range in the native control
     SetRange(min, max);
 
-    // Also set the text part of the control if it was specified independently
-    // but don't generate an event for this, it would be unexpected.
-    m_blockEvent = true;
     if ( !value.empty() )
+    {
         SetValue(value);
-    m_blockEvent = false;
+        m_oldValue = (int) wxAtol(value);
+    }
+    else
+    {
+        SetValue(wxString::Format(wxT("%d"), initial));
+        m_oldValue = initial;
+    }
+
+    // do it after finishing with m_hwndBuddy creation to avoid generating
+    // initial wxEVT_COMMAND_TEXT_UPDATED message
+    ms_allSpins.Add(this);
 
     return true;
 }
 
 wxSpinCtrl::~wxSpinCtrl()
 {
+    ms_allSpins.Remove(this);
+
+    // This removes spurious memory leak reporting
+    if (ms_allSpins.GetCount() == 0)
+        ms_allSpins.Clear();
+
     // destroy the buddy window because this pointer which wxBuddyTextWndProc
     // uses will not soon be valid any more
-    ::DestroyWindow( GetBuddyHwnd() );
-
-    gs_spinForTextCtrl.erase(GetBuddyHwnd());
+    ::DestroyWindow(GetBuddyHwnd());
 }
 
 // ----------------------------------------------------------------------------
@@ -439,8 +468,6 @@ void wxSpinCtrl::SetValue(const wxString& text)
 
 void  wxSpinCtrl::SetValue(int val)
 {
-    m_blockEvent = true;
-
     wxSpinButton::SetValue(val);
 
     // normally setting the value of the spin button is enough as it updates
@@ -451,13 +478,10 @@ void  wxSpinCtrl::SetValue(int val)
         // text control is currently empty, the spin button seems to be happy
         // to leave it like this, while we really want to always show the
         // current value in the control, so do it manually
-        ::SetWindowText(GetBuddyHwnd(),
-                        wxString::Format(wxT("%d"), val).t_str());
+        ::SetWindowText(GetBuddyHwnd(), wxString::Format(_T("%d"), val));
     }
 
     m_oldValue = GetValue();
-
-    m_blockEvent = false;
 }
 
 int wxSpinCtrl::GetValue() const
@@ -488,28 +512,6 @@ void wxSpinCtrl::SetSelection(long from, long to)
     ::SendMessage(GetBuddyHwnd(), EM_SETSEL, (WPARAM)from, (LPARAM)to);
 }
 
-// ----------------------------------------------------------------------------
-// wxSpinButton methods
-// ----------------------------------------------------------------------------
-
-void wxSpinCtrl::SetRange(int minVal, int maxVal)
-{
-    wxSpinButton::SetRange(minVal, maxVal);
-
-    // this control is used for numeric entry so restrict the input to numeric
-    // keys only -- but only if we don't need to be able to enter "-" in it as
-    // otherwise this would become impossible
-    const DWORD styleOld = ::GetWindowLong(GetBuddyHwnd(), GWL_STYLE);
-    DWORD styleNew;
-    if ( minVal < 0 )
-        styleNew = styleOld & ~ES_NUMBER;
-    else
-        styleNew = styleOld | ES_NUMBER;
-
-    if ( styleNew != styleOld )
-        ::SetWindowLong(GetBuddyHwnd(), GWL_STYLE, styleNew);
-}
-
 // ----------------------------------------------------------------------------
 // forward some methods to subcontrols
 // ----------------------------------------------------------------------------
@@ -548,37 +550,30 @@ bool wxSpinCtrl::Reparent(wxWindowBase *newParent)
     // window normally, but we recreate the updown control and reassign its
     // buddy.
 
-    // Get the position before changing the parent as it would be offset after
-    // changing it.
-    const wxRect rect = GetRect();
-
     if ( !wxWindowBase::Reparent(newParent) )
         return false;
 
     newParent->GetChildren().DeleteObject(this);
 
-    // destroy the old spin button after detaching it from this wxWindow object
-    // (notice that m_hWnd will be reset by UnsubclassWin() so save it first)
-    const HWND hwndOld = GetHwnd();
+    // preserve the old values
+    const wxSize size = GetSize();
+    int value = GetValue();
+    const wxRect btnRect = wxRectFromRECT(wxGetWindowRect(GetHwnd()));
+
+    // destroy the old spin button
     UnsubclassWin();
-    if ( !::DestroyWindow(hwndOld) )
-    {
+    if ( !::DestroyWindow(GetHwnd()) )
         wxLogLastError(wxT("DestroyWindow"));
-    }
 
     // create and initialize the new one
     if ( !wxSpinButton::Create(GetParent(), GetId(),
-                               rect.GetPosition(), rect.GetSize(),
+                               btnRect.GetPosition(), btnRect.GetSize(),
                                GetWindowStyle(), GetName()) )
         return false;
 
-    // reapply our values to wxSpinButton
-    wxSpinButton::SetValue(GetValue());
+    SetValue(value);
     SetRange(m_min, m_max);
-
-    // also set the size again with wxSIZE_ALLOW_MINUS_ONE flag: this is
-    // necessary if our original position used -1 for either x or y
-    SetSize(rect, wxSIZE_ALLOW_MINUS_ONE);
+    SetInitialSize(size);
 
     // associate it with the buddy control again
     ::SetParent(GetBuddyHwnd(), GetHwndOf(GetParent()));
@@ -594,7 +589,7 @@ bool wxSpinCtrl::Enable(bool enable)
         return false;
     }
 
-    MSWEnableHWND(GetBuddyHwnd(), enable);
+    ::EnableWindow(GetBuddyHwnd(), enable);
 
     return true;
 }
@@ -611,7 +606,7 @@ void wxSpinCtrl::DoSetToolTip(wxToolTip *tip)
     wxSpinButton::DoSetToolTip(tip);
 
     if ( tip )
-        tip->AddOtherWindow(m_hwndBuddy);
+        tip->Add(m_hwndBuddy);
 }
 
 #endif // wxUSE_TOOLTIPS
@@ -626,42 +621,20 @@ void wxSpinCtrl::SendSpinUpdate(int value)
     event.SetEventObject(this);
     event.SetInt(value);
 
-    (void)HandleWindowEvent(event);
+    (void)GetEventHandler()->ProcessEvent(event);
 
     m_oldValue = value;
 }
 
-bool wxSpinCtrl::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
-                               WXWORD pos, WXHWND control)
+void wxSpinCtrl::OnSpinChange(wxSpinEvent& eventSpin)
 {
-    wxCHECK_MSG( control, false, wxT("scrolling what?") );
-
-    if ( wParam != SB_THUMBPOSITION )
+    const int value = eventSpin.GetPosition();
+    if ( value != m_oldValue )
     {
-        // probable SB_ENDSCROLL - we don't react to it
-        return false;
+        SendSpinUpdate(value);
     }
-
-    int new_value = (short) pos;
-    if (m_oldValue != new_value)
-       SendSpinUpdate( new_value );
-
-    return TRUE;
 }
 
-bool wxSpinCtrl::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result)
-{
-    NM_UPDOWN *lpnmud = (NM_UPDOWN *)lParam;
-
-    if (lpnmud->hdr.hwndFrom != GetHwnd()) // make sure it is the right control
-        return false;
-
-    *result = 0;  // never reject UP and DOWN events
-
-    return TRUE;
-}
-
-
 // ----------------------------------------------------------------------------
 // size calculations
 // ----------------------------------------------------------------------------
@@ -695,7 +668,7 @@ void wxSpinCtrl::DoMoveWindow(int x, int y, int width, int height)
     int widthText = width - widthBtn - MARGIN_BETWEEN;
     if ( widthText <= 0 )
     {
-        wxLogDebug(wxT("not enough space for wxSpinCtrl!"));
+        wxLogDebug(_T("not enough space for wxSpinCtrl!"));
     }
 
     // 1) The buddy window
diff --git a/Source/3rd Party/wx/src/msw/stackwalk.cpp b/Source/3rd Party/wx/src/msw/stackwalk.cpp
index 176edbafa..4e6f2288f 100644
--- a/Source/3rd Party/wx/src/msw/stackwalk.cpp	
+++ b/Source/3rd Party/wx/src/msw/stackwalk.cpp	
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/stackwalk.cpp
+// Name:        msw/stackwalk.cpp
 // Purpose:     wxStackWalker implementation for Win32
 // Author:      Vadim Zeitlin
-// Modified by: Artur Bac 2010-10-01 AMD64 Port
+// Modified by:
 // Created:     2005-01-08
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stackwalk.cpp 61341 2009-07-07 09:35:56Z VZ $
 // Copyright:   (c) 2003-2005 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -68,7 +68,7 @@ void wxStackFrame::OnGetName()
                             pSymbol
                         ) )
     {
-        wxDbgHelpDLL::LogError(wxT("SymFromAddr"));
+        wxDbgHelpDLL::LogError(_T("SymFromAddr"));
         return;
     }
 
@@ -96,7 +96,7 @@ void wxStackFrame::OnGetLocation()
     {
         // it is normal that we don't have source info for some symbols,
         // notably all the ones from the system DLLs...
-        //wxDbgHelpDLL::LogError(wxT("SymGetLineFromAddr"));
+        //wxDbgHelpDLL::LogError(_T("SymGetLineFromAddr"));
         return;
     }
 
@@ -161,7 +161,7 @@ void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
 BOOL CALLBACK
 EnumSymbolsProc(PSYMBOL_INFO pSymInfo, ULONG WXUNUSED(SymSize), PVOID data)
 {
-    wxStackFrame *frame = static_cast<wxStackFrame *>(data);
+    wxStackFrame *frame = wx_static_cast(wxStackFrame *, data);
 
     // we're only interested in parameters
     if ( pSymInfo->Flags & IMAGEHLP_SYMBOL_INFO_PARAMETER )
@@ -190,7 +190,7 @@ void wxStackFrame::OnGetParam()
         // address, this is not a real error
         if ( ::GetLastError() != ERROR_INVALID_ADDRESS )
         {
-            wxDbgHelpDLL::LogError(wxT("SymSetContext"));
+            wxDbgHelpDLL::LogError(_T("SymSetContext"));
         }
 
         return;
@@ -205,7 +205,7 @@ void wxStackFrame::OnGetParam()
                             this                // data to pass to it
                         ) )
     {
-        wxDbgHelpDLL::LogError(wxT("SymEnumSymbols"));
+        wxDbgHelpDLL::LogError(_T("SymEnumSymbols"));
     }
 }
 
@@ -214,14 +214,14 @@ void wxStackFrame::OnGetParam()
 // wxStackWalker
 // ----------------------------------------------------------------------------
 
-void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
+void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip)
 {
     if ( !wxDbgHelpDLL::Init() )
     {
         // don't log a user-visible error message here because the stack trace
         // is only needed for debugging/diagnostics anyhow and we shouldn't
         // confuse the user by complaining that we couldn't generate it
-        wxLogDebug(wxT("Failed to get stack backtrace: %s"),
+        wxLogDebug(_T("Failed to get stack backtrace: %s"),
                    wxDbgHelpDLL::GetErrorMessage().c_str());
         return;
     }
@@ -240,7 +240,7 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
                             TRUE    // load symbols for all loaded modules
                         ) )
     {
-        wxDbgHelpDLL::LogError(wxT("SymInitialize"));
+        wxDbgHelpDLL::LogError(_T("SymInitialize"));
 
         return;
     }
@@ -253,16 +253,7 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
     STACKFRAME sf;
     wxZeroMemory(sf);
 
-#if defined(_M_AMD64)
-    sf.AddrPC.Offset       = ctx.Rip;
-    sf.AddrPC.Mode         = AddrModeFlat;
-    sf.AddrStack.Offset    = ctx.Rsp;
-    sf.AddrStack.Mode      = AddrModeFlat;
-    sf.AddrFrame.Offset    = ctx.Rbp;
-    sf.AddrFrame.Mode      = AddrModeFlat;
-
-    dwMachineType = IMAGE_FILE_MACHINE_AMD64;
-#elif  defined(_M_IX86)
+#ifdef _M_IX86
     sf.AddrPC.Offset       = ctx.Eip;
     sf.AddrPC.Mode         = AddrModeFlat;
     sf.AddrStack.Offset    = ctx.Esp;
@@ -275,8 +266,9 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
     #error "Need to initialize STACKFRAME on non x86"
 #endif // _M_IX86
 
-    // iterate over all stack frames
-    for ( size_t nLevel = 0; nLevel < maxDepth; nLevel++ )
+    // iterate over all stack frames (but stop after 200 to avoid entering
+    // infinite loop if the stack is corrupted)
+    for ( size_t nLevel = 0; nLevel < 200; nLevel++ )
     {
         // get the next stack frame
         if ( !wxDbgHelpDLL::StackWalk
@@ -293,7 +285,7 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
                             ) )
         {
             if ( ::GetLastError() )
-                wxDbgHelpDLL::LogError(wxT("StackWalk"));
+                wxDbgHelpDLL::LogError(_T("StackWalk"));
 
             break;
         }
@@ -302,38 +294,41 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip, size_t maxDepth)
         if ( nLevel >= skip )
         {
             wxStackFrame frame(nLevel - skip,
-                               wxUIntToPtr(sf.AddrPC.Offset),
+                               (void *)sf.AddrPC.Offset,
                                sf.AddrFrame.Offset);
 
             OnStackFrame(frame);
         }
     }
 
+    // this results in crashes inside ntdll.dll when called from
+    // exception handler ...
+#if 0
     if ( !wxDbgHelpDLL::SymCleanup(hProcess) )
     {
-        wxDbgHelpDLL::LogError(wxT("SymCleanup"));
+        wxDbgHelpDLL::LogError(_T("SymCleanup"));
     }
+#endif
 }
 
-void wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip, size_t maxDepth)
+void wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS *ep, size_t skip)
 {
-    WalkFrom(ep->ContextRecord, skip, maxDepth);
+    WalkFrom(ep->ContextRecord, skip);
 }
 
+void wxStackWalker::WalkFromException()
+{
+    // wxGlobalSEInformation is unavailable if wxUSE_ON_FATAL_EXCEPTION==0
 #if wxUSE_ON_FATAL_EXCEPTION
-
-void wxStackWalker::WalkFromException(size_t maxDepth)
-{
     extern EXCEPTION_POINTERS *wxGlobalSEInformation;
 
     wxCHECK_RET( wxGlobalSEInformation,
-                 wxT("wxStackWalker::WalkFromException() can only be called from wxApp::OnFatalException()") );
+                 _T("wxStackWalker::WalkFromException() can only be called from wxApp::OnFatalException()") );
 
     // don't skip any frames, the first one is where we crashed
-    WalkFrom(wxGlobalSEInformation, 0, maxDepth);
-}
-
+    WalkFrom(wxGlobalSEInformation, 0);
 #endif // wxUSE_ON_FATAL_EXCEPTION
+}
 
 void wxStackWalker::Walk(size_t skip, size_t WXUNUSED(maxDepth))
 {
@@ -341,7 +336,7 @@ void wxStackWalker::Walk(size_t skip, size_t WXUNUSED(maxDepth))
     // get EXCEPTION_POINTERS from it
     //
     // note:
-    //  1. we additionally skip RaiseException() and WalkFrom() frames
+    //  1. we additionally skip RaiseException() and WalkFromException() frames
     //  2. explicit cast to EXCEPTION_POINTERS is needed with VC7.1 even if it
     //     shouldn't have been according to the docs
     __try
@@ -351,8 +346,7 @@ void wxStackWalker::Walk(size_t skip, size_t WXUNUSED(maxDepth))
     __except( WalkFrom((EXCEPTION_POINTERS *)GetExceptionInformation(),
                        skip + 2), EXCEPTION_CONTINUE_EXECUTION )
     {
-        // never executed because the above expression always evaluates to
-        // EXCEPTION_CONTINUE_EXECUTION
+        // never executed because of WalkFromException() return value
     }
 }
 
@@ -396,24 +390,19 @@ void wxStackFrame::OnGetParam()
 // ----------------------------------------------------------------------------
 
 void
-wxStackWalker::WalkFrom(const CONTEXT * WXUNUSED(pCtx),
-                        size_t WXUNUSED(skip),
-                        size_t WXUNUSED(maxDepth))
+wxStackWalker::WalkFrom(const CONTEXT * WXUNUSED(pCtx), size_t WXUNUSED(skip))
 {
 }
 
 void
 wxStackWalker::WalkFrom(const _EXCEPTION_POINTERS * WXUNUSED(ep),
-                        size_t WXUNUSED(skip),
-                        size_t WXUNUSED(maxDepth))
+                        size_t WXUNUSED(skip))
 {
 }
 
-#if wxUSE_ON_FATAL_EXCEPTION
-void wxStackWalker::WalkFromException(size_t WXUNUSED(maxDepth))
+void wxStackWalker::WalkFromException()
 {
 }
-#endif // wxUSE_ON_FATAL_EXCEPTION
 
 void wxStackWalker::Walk(size_t WXUNUSED(skip), size_t WXUNUSED(maxDepth))
 {
diff --git a/Source/3rd Party/wx/src/msw/statbmp.cpp b/Source/3rd Party/wx/src/msw/statbmp.cpp
index a2dd9bc02..3aeb57410 100644
--- a/Source/3rd Party/wx/src/msw/statbmp.cpp	
+++ b/Source/3rd Party/wx/src/msw/statbmp.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: statbmp.cpp 56532 2008-10-27 18:15:19Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -45,6 +45,59 @@
 // macors
 // ---------------------------------------------------------------------------
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxStaticBitmapStyle )
+
+wxBEGIN_FLAGS( wxStaticBitmapStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxStaticBitmapStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBitmap, wxControl,"wx/statbmp.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxStaticBitmap)
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticBitmapStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxStaticBitmap)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow* , Parent , wxWindowID , Id , wxBitmap, Bitmap, wxPoint , Position , wxSize , Size )
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+#endif
+
+/*
+    TODO PROPERTIES :
+        bitmap
+*/
+
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -61,12 +114,12 @@
 
 static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
 {
-    bool isIcon = bitmap.IsKindOf( wxCLASSINFO(wxIcon) );
+    bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) );
 
     if( !isIcon )
     {
         wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap),
-                      wxT("not an icon and not a bitmap?") );
+                      _T("not an icon and not a bitmap?") );
 
         const wxBitmap& bmp = (const wxBitmap&)bitmap;
         wxMask *mask = bmp.GetMask();
@@ -99,13 +152,13 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     // we may have either bitmap or icon: if a bitmap with mask is passed, we
     // will transform it to an icon ourselves because otherwise the mask will
     // be ignored by Windows
-    m_isIcon = bitmap.IsKindOf(wxCLASSINFO(wxIcon));
+    m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
 
     wxGDIImage *image = ConvertImage( bitmap );
-    m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
 
     // create the native control
-    if ( !MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size) )
+    if ( !MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size) )
     {
         // control creation failed
         return false;
@@ -135,6 +188,11 @@ bool wxStaticBitmap::Create(wxWindow *parent,
     return true;
 }
 
+wxBorder wxStaticBitmap::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
+}
+
 WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
@@ -153,15 +211,15 @@ WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 bool wxStaticBitmap::ImageIsOk() const
 {
-    return m_image && m_image->IsOk();
+    return m_image && m_image->Ok();
 }
 
 wxIcon wxStaticBitmap::GetIcon() const
 {
-    wxCHECK_MSG( m_image, wxIcon(), wxT("no image in wxStaticBitmap") );
+    wxCHECK_MSG( m_image, wxIcon(), _T("no image in wxStaticBitmap") );
 
     // we can't ask for an icon if all we have is a bitmap
-    wxCHECK_MSG( m_isIcon, wxIcon(), wxT("no icon in this wxStaticBitmap") );
+    wxCHECK_MSG( m_isIcon, wxIcon(), _T("no icon in this wxStaticBitmap") );
 
     return *(wxIcon *)m_image;
 }
@@ -178,7 +236,7 @@ wxBitmap wxStaticBitmap::GetBitmap() const
     }
     else // we have a bitmap
     {
-        wxCHECK_MSG( m_image, wxBitmap(), wxT("no image in wxStaticBitmap") );
+        wxCHECK_MSG( m_image, wxBitmap(), _T("no image in wxStaticBitmap") );
 
         return *(wxBitmap *)m_image;
     }
@@ -186,28 +244,24 @@ wxBitmap wxStaticBitmap::GetBitmap() const
 
 void wxStaticBitmap::Free()
 {
-    wxDELETE(m_image);
+    delete m_image;
+
+    m_image = NULL;
 }
 
-wxSize wxStaticBitmap::DoGetBestClientSize() const
+wxSize wxStaticBitmap::DoGetBestSize() const
 {
-    wxSize size;
     if ( ImageIsOk() )
     {
-        size = m_image->GetSize();
-    }
-    else // No image yet
-    {
-        // this is completely arbitrary
-        size.x =
-        size.y = 16;
+        wxSize best(m_image->GetWidth(), m_image->GetHeight());
+        CacheBestSize(best);
+        return best;
     }
 
-    return size;
+    // this is completely arbitrary
+    return wxSize(16, 16);
 }
 
-#ifndef __WXWINCE__
-
 void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
 {
     wxPaintDC dc(this);
@@ -230,20 +284,18 @@ void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
                   true /* use mask */);
 }
 
-#endif // !__WXWINCE__
-
 void wxStaticBitmap::SetImage( const wxGDIImage* image )
 {
     wxGDIImage* convertedImage = ConvertImage( *image );
     SetImageNoCopy( convertedImage );
+    InvalidateBestSize();
 }
 
 void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
 {
     Free();
-    InvalidateBestSize();
 
-    m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
     // the image has already been copied
     m_image = image;
 
diff --git a/Source/3rd Party/wx/src/msw/statbox.cpp b/Source/3rd Party/wx/src/msw/statbox.cpp
index 6d7c8ad27..1cd01ab7f 100644
--- a/Source/3rd Party/wx/src/msw/statbox.cpp	
+++ b/Source/3rd Party/wx/src/msw/statbox.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: statbox.cpp 52851 2008-03-27 13:03:02Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -33,7 +33,6 @@
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/image.h"
-    #include "wx/sizer.h"
 #endif
 
 #include "wx/notebook.h"
@@ -42,7 +41,6 @@
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
 #include "wx/msw/missing.h"
-#include "wx/msw/dc.h"
 
 // the values coincide with those in tmschema.h
 #define BP_GROUPBOX 4
@@ -55,6 +53,58 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxStaticBoxStyle )
+
+wxBEGIN_FLAGS( wxStaticBoxStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxStaticBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticBox, wxControl,"wx/statbox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxStaticBox)
+    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+/*
+    TODO PROPERTIES :
+        label
+*/
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxStaticBox)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxStaticBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
+#endif
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -88,6 +138,11 @@ bool wxStaticBox::Create(wxWindow *parent,
     return true;
 }
 
+wxBorder wxStaticBox::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
+}
+
 WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long styleWin = wxStaticBoxBase::MSWGetStyle(style, exstyle);
@@ -119,9 +174,6 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxStaticBox::DoGetBestSize() const
 {
-    wxSize best;
-
-    // Calculate the size needed by the label
     int cx, cy;
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
@@ -131,19 +183,8 @@ wxSize wxStaticBox::DoGetBestSize() const
     wBox += 3*cx;
     int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
 
-    // If there is a sizer then the base best size is the sizer's minimum
-    if (GetSizer() != NULL)
-    {
-        wxSize cm(GetSizer()->CalcMin());
-        best = ClientToWindowSize(cm);
-        // adjust for a long label if needed
-        best.x = wxMax(best.x, wBox);
-    }
-    // otherwise the best size falls back to the label size
-    else
-    {
-        best = wxSize(wBox, hBox);
-    }
+    wxSize best(wBox, hBox);
+    CacheBestSize(best);
     return best;
 }
 
@@ -200,24 +241,6 @@ WXLRESULT wxStaticBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPar
         return 0;
     }
 
-    if ( nMsg == WM_UPDATEUISTATE )
-    {
-        // DefWindowProc() redraws just the static box text when it gets this
-        // message and it does it using the standard (blue in standard theme)
-        // colour and not our own label colour that we use in PaintForeground()
-        // resulting in the label mysteriously changing the colour when e.g.
-        // "Alt" is pressed anywhere in the window, see #12497.
-        //
-        // To avoid this we simply refresh the window forcing our own code
-        // redrawing the label in the correct colour to be called. This is
-        // inefficient but there doesn't seem to be anything else we can do.
-        //
-        // Notice that the problem is XP-specific and doesn't arise under later
-        // systems.
-        if ( m_hasFgCol && wxGetWinVersion() == wxWinVersion_XP )
-            Refresh();
-    }
-
     return wxControl::MSWWindowProc(nMsg, wParam, lParam);
 }
 
@@ -240,7 +263,7 @@ SubtractRectFromRgn(HRGN hrgn, int left, int top, int right, int bottom)
     AutoHRGN hrgnRect(::CreateRectRgn(left, top, right, bottom));
     if ( !hrgnRect )
     {
-        wxLogLastError(wxT("CreateRectRgn()"));
+        wxLogLastError(_T("CreateRectRgn()"));
         return;
     }
 
@@ -344,25 +367,24 @@ void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc)
     //     we did it
     //  3. this is backwards compatible behaviour and some people rely on it,
     //     see http://groups.google.com/groups?selm=4252E932.3080801%40able.es
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
-    HBRUSH hbr = MSWGetBgBrush(impl->GetHDC());
+    wxWindow *parent = GetParent();
+    HBRUSH hbr = (HBRUSH)parent->MSWGetBgBrush(dc.GetHDC(), GetHWND());
 
     // if there is no special brush for painting this control, just use the
     // solid background colour
     wxBrush brush;
     if ( !hbr )
     {
-        brush = wxBrush(GetParent()->GetBackgroundColour());
+        brush = wxBrush(parent->GetBackgroundColour());
         hbr = GetHbrushOf(brush);
     }
 
-    ::FillRect(GetHdcOf(*impl), &rc, hbr);
+    ::FillRect(GetHdcOf(dc), &rc, hbr);
 }
 
 void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
 {
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
-    MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(*impl), 0);
+    MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(dc), 0);
 
     // when using XP themes, neither setting the text colour nor transparent
     // background mode doesn't change anything: the static box def window proc
@@ -371,7 +393,7 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
     if ( m_hasFgCol && wxUxThemeEngine::GetIfActive() )
     {
         // draw over the text in default colour in our colour
-        HDC hdc = GetHdcOf(*impl);
+        HDC hdc = GetHdcOf(dc);
         ::SetTextColor(hdc, GetForegroundColour().GetPixel());
 
         const bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft;
@@ -393,7 +415,11 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
             wxUxThemeHandle hTheme(this, L"BUTTON");
             if ( hTheme )
             {
-                wxUxThemeFont themeFont;
+                // GetThemeFont() expects its parameter to be LOGFONTW and not
+                // LOGFONTA even in ANSI programs and will happily corrupt
+                // memory after the struct end if we pass a LOGFONTA (which is
+                // smaller) to it!
+                LOGFONTW lfw;
                 if ( wxUxThemeEngine::Get()->GetThemeFont
                                              (
                                                 hTheme,
@@ -401,10 +427,24 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
                                                 BP_GROUPBOX,
                                                 GBS_NORMAL,
                                                 TMT_FONT,
-                                                themeFont.GetPtr()
+                                                (LOGFONT *)&lfw
                                              ) == S_OK )
                 {
-                    font.Init(themeFont.GetLOGFONT());
+#if wxUSE_UNICODE
+                    // ok, no conversion necessary
+                    const LOGFONT& lf = lfw;
+#else // !wxUSE_UNICODE
+                    // most of the fields are the same in LOGFONTA and LOGFONTW
+                    LOGFONT lf;
+                    memcpy(&lf, &lfw, sizeof(lf));
+
+                    // but the face name must be converted
+                    WideCharToMultiByte(CP_ACP, 0, lfw.lfFaceName, -1,
+                                        lf.lfFaceName, sizeof(lf.lfFaceName),
+                                        NULL, NULL);
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+
+                    font.Init(lf);
                     if ( font )
                         selFont.Init(hdc, font);
                 }
@@ -449,40 +489,25 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
             // the label: this is consistent with the behaviour under pre-XP
             // systems (i.e. without visual themes) and generally makes sense
             wxBrush brush = wxBrush(GetBackgroundColour());
-            wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
-            ::FillRect(GetHdcOf(*impl), &dimensions, GetHbrushOf(brush));
+            ::FillRect(GetHdcOf(dc), &dimensions, GetHbrushOf(brush));
         }
         else // paint parent background
         {
             PaintBackground(dc, dimensions);
         }
 
-        UINT drawTextFlags = DT_SINGLELINE | DT_VCENTER;
-
-        // determine the state of UI queues to draw the text correctly under XP
-        // and later systems
-        static const bool isXPorLater = wxGetWinVersion() >= wxWinVersion_XP;
-        if ( isXPorLater )
-        {
-            if ( ::SendMessage(GetHwnd(), WM_QUERYUISTATE, 0, 0) &
-                    UISF_HIDEACCEL )
-            {
-                drawTextFlags |= DT_HIDEPREFIX;
-            }
-        }
-
         // now draw the text
         if ( !rtl )
         {
             RECT rc2 = { x, 0, x + width, y };
-            ::DrawText(hdc, label.t_str(), label.length(), &rc2,
-                       drawTextFlags);
+            ::DrawText(hdc, label, label.length(), &rc2,
+                       DT_SINGLELINE | DT_VCENTER);
         }
         else // RTL
         {
             RECT rc2 = { x, 0, x - width, y };
-            ::DrawText(hdc, label.t_str(), label.length(), &rc2,
-                       drawTextFlags | DT_RTLREADING);
+            ::DrawText(hdc, label, label.length(), &rc2,
+                       DT_SINGLELINE | DT_VCENTER | DT_RTLREADING);
         }
     }
 }
@@ -534,8 +559,7 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
 
     // and also the box itself
     MSWGetRegionWithoutSelf((WXHRGN) hrgn, rc.right, rc.bottom);
-    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
-    HDCClipper clipToBg(GetHdcOf(*impl), hrgn);
+    HDCClipper clipToBg(GetHdcOf(dc), hrgn);
 
     // paint the inside of the box (excluding box itself and child controls)
     PaintBackground(dc, rc);
diff --git a/Source/3rd Party/wx/src/msw/statbr95.cpp b/Source/3rd Party/wx/src/msw/statbr95.cpp
new file mode 100644
index 000000000..4288885f0
--- /dev/null
+++ b/Source/3rd Party/wx/src/msw/statbr95.cpp	
@@ -0,0 +1,417 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/statbr95.cpp
+// Purpose:     native implementation of wxStatusBar
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     04.04.98
+// RCS-ID:      $Id: statbr95.cpp 48670 2007-09-14 07:15:51Z JS $
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
+
+#include "wx/statusbr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/frame.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/msw/private.h"
+#include <windowsx.h>
+
+#if wxUSE_UXTHEME
+    #include "wx/msw/uxtheme.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// windowsx.h and commctrl.h don't define those, so we do it here
+#define StatusBar_SetParts(h, n, w) SendMessage(h, SB_SETPARTS, (WPARAM)n, (LPARAM)w)
+#define StatusBar_SetText(h, n, t)  SendMessage(h, SB_SETTEXT, (WPARAM)n, (LPARAM)(LPCTSTR)t)
+#define StatusBar_GetTextLen(h, n)  LOWORD(SendMessage(h, SB_GETTEXTLENGTH, (WPARAM)n, 0))
+#define StatusBar_GetText(h, n, s)  LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPTSTR)s))
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxStatusBar95 class
+// ----------------------------------------------------------------------------
+
+wxStatusBar95::wxStatusBar95()
+{
+    SetParent(NULL);
+    m_hWnd = 0;
+    m_windowId = 0;
+}
+
+bool wxStatusBar95::Create(wxWindow *parent,
+                           wxWindowID id,
+                           long style,
+                           const wxString& name)
+{
+    wxCHECK_MSG( parent, false, wxT("status bar must have a parent") );
+
+    // Avoid giving the status bar a themed window
+    style = (style & ~wxBORDER_MASK) | wxBORDER_NONE;
+
+    SetName(name);
+    SetWindowStyleFlag(style);
+    SetParent(parent);
+
+    parent->AddChild(this);
+
+    m_windowId = id == wxID_ANY ? NewControlId() : id;
+
+    DWORD wstyle = WS_CHILD | WS_VISIBLE;
+
+    if ( style & wxCLIP_SIBLINGS )
+        wstyle |= WS_CLIPSIBLINGS;
+
+    // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
+    // (at least in the version of comctl32.dll I'm using), and the only way to
+    // turn it off is to use CCS_TOP style - as we position the status bar
+    // manually anyhow (see DoMoveWindow), use CCS_TOP style if wxST_SIZEGRIP
+    // is not given
+    if ( !(style & wxST_SIZEGRIP) )
+    {
+        wstyle |= CCS_TOP;
+    }
+    else
+    {
+#ifndef __WXWINCE__
+        // may be some versions of comctl32.dll do need it - anyhow, it won't
+        // do any harm
+        wstyle |= SBARS_SIZEGRIP;
+#endif
+    }
+
+    m_hWnd = (WXHWND)CreateStatusWindow(wstyle,
+                                        wxEmptyString,
+                                        GetHwndOf(parent),
+                                        m_windowId);
+    if ( m_hWnd == 0 )
+    {
+        wxLogSysError(_("Failed to create a status bar."));
+
+        return false;
+    }
+
+    SetFieldsCount(1);
+    SubclassWin(m_hWnd);
+    InheritAttributes();
+
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
+
+    // we must refresh the frame size when the statusbar is created, because
+    // its client area might change
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame )
+    {
+        frame->SendSizeEvent();
+    }
+
+    return true;
+}
+
+wxStatusBar95::~wxStatusBar95()
+{
+    // we must refresh the frame size when the statusbar is deleted but the
+    // frame is not - otherwise statusbar leaves a hole in the place it used to
+    // occupy
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && !frame->IsBeingDeleted() )
+    {
+        frame->SendSizeEvent();
+    }
+}
+
+void wxStatusBar95::SetFieldsCount(int nFields, const int *widths)
+{
+    // this is a Windows limitation
+    wxASSERT_MSG( (nFields > 0) && (nFields < 255), _T("too many fields") );
+
+    wxStatusBarBase::SetFieldsCount(nFields, widths);
+
+    SetFieldsWidth();
+}
+
+void wxStatusBar95::SetStatusWidths(int n, const int widths[])
+{
+    wxStatusBarBase::SetStatusWidths(n, widths);
+
+    SetFieldsWidth();
+}
+
+void wxStatusBar95::SetFieldsWidth()
+{
+    if ( !m_nFields )
+        return;
+
+    int aBorders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
+
+    int extraWidth = aBorders[2]; // space between fields
+
+    wxArrayInt widthsAbs =
+        CalculateAbsWidths(GetClientSize().x - extraWidth*(m_nFields - 1));
+
+    int *pWidths = new int[m_nFields];
+
+    int nCurPos = 0;
+    for ( int i = 0; i < m_nFields; i++ ) {
+        nCurPos += widthsAbs[i] + extraWidth;
+        pWidths[i] = nCurPos;
+    }
+
+    if ( !StatusBar_SetParts(GetHwnd(), m_nFields, pWidths) ) {
+        wxLogLastError(wxT("StatusBar_SetParts"));
+    }
+
+    delete [] pWidths;
+}
+
+void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
+{
+    wxCHECK_RET( (nField >= 0) && (nField < m_nFields),
+                 _T("invalid statusbar field index") );
+
+    if ( strText == GetStatusText(nField) )
+    {
+       // don't call StatusBar_SetText() to avoid flicker
+       return;
+    }
+
+    // Get field style, if any
+    int style;
+    if (m_statusStyles)
+    {
+        switch(m_statusStyles[nField])
+        {
+        case wxSB_RAISED:
+            style = SBT_POPOUT;
+            break;
+        case wxSB_FLAT:
+            style = SBT_NOBORDERS;
+            break;
+        case wxSB_NORMAL:
+        default:
+            style = 0;
+            break;
+        }
+    }
+    else
+        style = 0;
+
+    // Pass both field number and style. MSDN library doesn't mention
+    // that nField and style have to be 'ORed'
+    if ( !StatusBar_SetText(GetHwnd(), nField | style, strText) )
+    {
+        wxLogLastError(wxT("StatusBar_SetText"));
+    }
+}
+
+wxString wxStatusBar95::GetStatusText(int nField) const
+{
+    wxCHECK_MSG( (nField >= 0) && (nField < m_nFields), wxEmptyString,
+                 _T("invalid statusbar field index") );
+
+    wxString str;
+    int len = StatusBar_GetTextLen(GetHwnd(), nField);
+    if ( len > 0 )
+    {
+        StatusBar_GetText(GetHwnd(), nField, wxStringBuffer(str, len));
+    }
+
+    return str;
+}
+
+int wxStatusBar95::GetBorderX() const
+{
+    int aBorders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
+
+    return aBorders[0];
+}
+
+int wxStatusBar95::GetBorderY() const
+{
+    int aBorders[3];
+    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
+
+    return aBorders[1];
+}
+
+void wxStatusBar95::SetMinHeight(int height)
+{
+    SendMessage(GetHwnd(), SB_SETMINHEIGHT, height + 2*GetBorderY(), 0);
+
+    // have to send a (dummy) WM_SIZE to redraw it now
+    SendMessage(GetHwnd(), WM_SIZE, 0, 0);
+}
+
+bool wxStatusBar95::GetFieldRect(int i, wxRect& rect) const
+{
+    wxCHECK_MSG( (i >= 0) && (i < m_nFields), false,
+                 _T("invalid statusbar field index") );
+
+    RECT r;
+    if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) )
+    {
+        wxLogLastError(wxT("SendMessage(SB_GETRECT)"));
+    }
+
+#if wxUSE_UXTHEME
+    wxUxThemeHandle theme((wxStatusBar95 *)this, L"Status"); // const_cast
+    if ( theme )
+    {
+        // by default Windows has a 2 pixel border to the right of the left
+        // divider (or it could be a bug) but it looks wrong so remove it
+        if ( i != 0 )
+        {
+            r.left -= 2;
+        }
+
+        wxUxThemeEngine::Get()->GetThemeBackgroundContentRect(theme, NULL,
+                                                              1 /* SP_PANE */, 0,
+                                                              &r, &r);
+    }
+#endif
+
+    wxCopyRECTToRect(r, rect);
+
+    return true;
+}
+
+void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
+{
+    if ( GetParent()->IsSizeDeferred() )
+    {
+        wxWindowMSW::DoMoveWindow(x, y, width, height);
+    }
+    else
+    {
+        // parent pos/size isn't deferred so do it now but don't send
+        // WM_WINDOWPOSCHANGING since we don't want to change pos/size later
+        // we must use SWP_NOCOPYBITS here otherwise it paints incorrectly
+        // if other windows are size deferred
+        ::SetWindowPos(GetHwnd(), NULL, x, y, width, height,
+                       SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE
+#ifndef __WXWINCE__
+                       | SWP_NOCOPYBITS | SWP_NOSENDCHANGING
+#endif
+                       );
+    }
+
+    // adjust fields widths to the new size
+    SetFieldsWidth();
+
+    // we have to trigger wxSizeEvent if there are children window in status
+    // bar because GetFieldRect returned incorrect (not updated) values up to
+    // here, which almost certainly resulted in incorrectly redrawn statusbar
+    if ( m_children.GetCount() > 0 )
+    {
+        wxSizeEvent event(GetClientSize(), m_windowId);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }
+}
+
+void wxStatusBar95::SetStatusStyles(int n, const int styles[])
+{
+    wxStatusBarBase::SetStatusStyles(n, styles);
+
+    if (n != m_nFields)
+        return;
+
+    for (int i = 0; i < n; i++)
+    {
+        int style;
+        switch(styles[i])
+        {
+        case wxSB_RAISED:
+            style = SBT_POPOUT;
+            break;
+        case wxSB_FLAT:
+            style = SBT_NOBORDERS;
+            break;
+        case wxSB_NORMAL:
+        default:
+            style = 0;
+            break;
+        }
+        // The SB_SETTEXT message is both used to set the field's text as well as
+        // the fields' styles. MSDN library doesn't mention
+        // that nField and style have to be 'ORed'
+        wxString text = GetStatusText(i);
+        if (!StatusBar_SetText(GetHwnd(), style | i, text))
+        {
+            wxLogLastError(wxT("StatusBar_SetText"));
+        }
+    }
+}
+
+WXLRESULT
+wxStatusBar95::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+#ifndef __WXWINCE__
+    if ( nMsg == WM_WINDOWPOSCHANGING )
+    {
+        WINDOWPOS *lpPos = (WINDOWPOS *)lParam;
+        int x, y, w, h;
+        GetPosition(&x, &y);
+        GetSize(&w, &h);
+
+        // we need real window coords and not wx client coords
+        AdjustForParentClientOrigin(x, y);
+
+        lpPos->x  = x;
+        lpPos->y  = y;
+        lpPos->cx = w;
+        lpPos->cy = h;
+
+        return 0;
+    }
+
+    if ( nMsg == WM_NCLBUTTONDOWN )
+    {
+        // if hit-test is on gripper then send message to TLW to begin
+        // resizing. It is possible to send this message to any window.
+        if ( wParam == HTBOTTOMRIGHT )
+        {
+            wxWindow *win;
+
+            for ( win = GetParent(); win; win = win->GetParent() )
+            {
+                if ( win->IsTopLevel() )
+                {
+                    SendMessage(GetHwndOf(win), WM_NCLBUTTONDOWN,
+                                wParam, lParam);
+
+                    return 0;
+                }
+            }
+        }
+    }
+#endif
+
+    return wxStatusBarBase::MSWWindowProc(nMsg, wParam, lParam);
+}
+
+#endif // wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
diff --git a/Source/3rd Party/wx/src/msw/statline.cpp b/Source/3rd Party/wx/src/msw/statline.cpp
index d8d5a7bfd..c05ca4970 100644
--- a/Source/3rd Party/wx/src/msw/statline.cpp	
+++ b/Source/3rd Party/wx/src/msw/statline.cpp	
@@ -3,7 +3,7 @@
 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
-// Version:     $Id$
+// Version:     $Id: statline.cpp 41054 2006-09-07 19:01:45Z ABX $
 // Copyright:   (c) 1998 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -36,6 +36,62 @@
 // implementation
 // ============================================================================
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxStaticLineStyle )
+
+wxBEGIN_FLAGS( wxStaticLineStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxLI_HORIZONTAL)
+    wxFLAGS_MEMBER(wxLI_VERTICAL)
+
+wxEND_FLAGS( wxStaticLineStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl,"wx/statline.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxStaticLine)
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticLineStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxStaticLine)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxStaticLine, wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle)
+
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
+#endif
+
+/*
+    TODO PROPERTIES :
+        style (wxLI_HORIZONTAL)
+*/
+
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
@@ -52,7 +108,7 @@ bool wxStaticLine::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 
-    return MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size);
+    return MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size);
 }
 
 WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const
diff --git a/Source/3rd Party/wx/src/msw/stattext.cpp b/Source/3rd Party/wx/src/msw/stattext.cpp
index 9f31f669b..9acac94e5 100644
--- a/Source/3rd Party/wx/src/msw/stattext.cpp	
+++ b/Source/3rd Party/wx/src/msw/stattext.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stattext.cpp 40331 2006-07-25 18:47:39Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,6 +30,59 @@
 
 #include "wx/msw/private.h"
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxStaticTextStyle )
+
+wxBEGIN_FLAGS( wxStaticTextStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxST_NO_AUTORESIZE)
+    wxFLAGS_MEMBER(wxALIGN_LEFT)
+    wxFLAGS_MEMBER(wxALIGN_RIGHT)
+    wxFLAGS_MEMBER(wxALIGN_CENTRE)
+
+wxEND_FLAGS( wxStaticTextStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticText, wxControl,"wx/stattext.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxStaticText)
+    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxStaticTextStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxStaticText)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxStaticText , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
+#endif
+
 bool wxStaticText::Create(wxWindow *parent,
                           wxWindowID id,
                           const wxString& label,
@@ -41,26 +94,17 @@ bool wxStaticText::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return false;
 
-    if ( !MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size) )
+    if ( !MSWCreateControl(wxT("STATIC"), label, pos, size) )
         return false;
 
-    // we set the label here and not through MSWCreateControl() because we
-    // need to do many operation on it for ellipsization&markup support
-    SetLabel(label);
-
-    // as we didn't pass the correct label to MSWCreateControl(), it didn't set
-    // the initial size correctly -- do it now
-    InvalidateBestSize();
-    SetInitialSize(size);
-
-    // NOTE: if the label contains ampersand characters which are interpreted as
-    //       accelerators, they will be rendered (at least on WinXP) only if the
-    //       static text is placed inside a window class which correctly handles
-    //       focusing by TAB traversal (e.g. wxPanel).
-
     return true;
 }
 
+wxBorder wxStaticText::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
+}
+
 WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
@@ -76,29 +120,17 @@ WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
     else
         msStyle |= SS_LEFT;
 
-#ifdef SS_ENDELLIPSIS
     // this style is necessary to receive mouse events
-    // Win NT and later have the SS_ENDELLIPSIS style which is useful to us:
-    if (wxGetOsVersion() == wxOS_WINDOWS_NT)
-    {
-        // for now, add the SS_ENDELLIPSIS style if wxST_ELLIPSIZE_END is given;
-        // we may need to remove it later in ::SetLabel() if the given label
-        // has newlines
-        if ( style & wxST_ELLIPSIZE_END )
-            msStyle |= SS_ENDELLIPSIS;
-    }
-#endif // SS_ENDELLIPSIS
-
     msStyle |= SS_NOTIFY;
 
     return msStyle;
 }
 
-wxSize wxStaticText::DoGetBestClientSize() const
+wxSize wxStaticText::DoGetBestSize() const
 {
-    wxClientDC dc(const_cast<wxStaticText *>(this));
+    wxClientDC dc(wx_const_cast(wxStaticText *, this));
     wxFont font(GetFont());
-    if (!font.IsOk())
+    if (!font.Ok())
         font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
     dc.SetFont(font);
@@ -111,90 +143,58 @@ wxSize wxStaticText::DoGetBestClientSize() const
         widthTextMax += 2;
 #endif // __WXWINCE__
 
-    // It looks like the static control needs "slightly" more vertical space
-    // than the character height and while the text isn't actually truncated if
-    // we use just the minimal height, it is positioned differently than when
-    // the control has enough space and this result in the text in edit and
-    // static controls not being aligned when the controls themselves are. As
-    // this is something you really should be able to count on, increase the
-    // space allocated for the control so that the base lines do align
-    // correctly. Notice that while the above is true at least for the single
-    // line controls, there doesn't seem to do any harm to allocate two extra
-    // pixels in multi-line case neither so do it always for consistency.
+    // border takes extra space
     //
-    // I still have no idea why exactly is this needed nor why should we use 2
-    // and not something else. This seems to work in all the configurations
-    // though (small/large fonts, different OS versions, ...) so just hard code
-    // it for now. If we need something better later it might be worth looking
-    // at the height of the text control returned by ::GetComboBoxInfo() as it
-    // seems to be the "minimal acceptable" height.
-    heightTextTotal += 2;
+    // TODO: this is probably not wxStaticText-specific and should be moved
+    wxCoord border;
+    switch ( GetBorder() )
+    {
+        case wxBORDER_STATIC:
+        case wxBORDER_SIMPLE:
+            border = 1;
+            break;
 
-    return wxSize(widthTextMax, heightTextTotal);
+        case wxBORDER_SUNKEN:
+            border = 2;
+            break;
+
+        case wxBORDER_RAISED:
+        case wxBORDER_DOUBLE:
+            border = 3;
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown border style") );
+            // fall through
+
+        case wxBORDER_NONE:
+            border = 0;
+    }
+
+    widthTextMax += 2*border;
+    heightTextTotal += 2*border;
+
+    wxSize best(widthTextMax, heightTextTotal);
+    CacheBestSize(best);
+    return best;
 }
 
 void wxStaticText::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 {
-    // note: we first need to set the size and _then_ call UpdateLabel
-    wxStaticTextBase::DoSetSize(x, y, w, h, sizeFlags);
-
-#ifdef SS_ENDELLIPSIS
-    // do we need to ellipsize the contents?
-    long styleReal = ::GetWindowLong(GetHwnd(), GWL_STYLE);
-    if ( !(styleReal & SS_ENDELLIPSIS) )
-    {
-        // we don't have SS_ENDELLIPSIS style:
-        // we need to (eventually) do ellipsization ourselves
-        UpdateLabel();
-    }
-    //else: we don't or the OS will do it for us
-#endif // SS_ENDELLIPSIS
-
     // we need to refresh the window after changing its size as the standard
     // control doesn't always update itself properly
+    wxStaticTextBase::DoSetSize(x, y, w, h, sizeFlags);
+
     Refresh();
 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {
-#ifdef SS_ENDELLIPSIS
-    long styleReal = ::GetWindowLong(GetHwnd(), GWL_STYLE);
-    if ( HasFlag(wxST_ELLIPSIZE_END) &&
-          wxGetOsVersion() == wxOS_WINDOWS_NT )
-    {
-        // adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct
-        // newline handling in static texts: the newlines in the labels are
-        // shown as square. Thus we don't use it even on newer OS when
-        // the static label contains a newline.
-        if ( label.Contains(wxT('\n')) )
-            styleReal &= ~SS_ENDELLIPSIS;
-        else
-            styleReal |= SS_ENDELLIPSIS;
-
-        ::SetWindowLong(GetHwnd(), GWL_STYLE, styleReal);
-    }
-    else // style not supported natively
-    {
-        styleReal &= ~SS_ENDELLIPSIS;
-        ::SetWindowLong(GetHwnd(), GWL_STYLE, styleReal);
-    }
-#endif // SS_ENDELLIPSIS
-
-    // save the label in m_labelOrig with both the markup (if any) and
-    // the mnemonics characters (if any)
-    m_labelOrig = label;
-
-#ifdef SS_ENDELLIPSIS
-    if ( styleReal & SS_ENDELLIPSIS )
-        DoSetLabel(GetLabel());
-    else
-#endif // SS_ENDELLIPSIS
-        DoSetLabel(GetEllipsizedLabel());
+    wxStaticTextBase::SetLabel(label);
 
     // adjust the size of the window to fit to the label unless autoresizing is
     // disabled
-    if ( !HasFlag(wxST_NO_AUTORESIZE) &&
-         !IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     {
         InvalidateBestSize();
         DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,
@@ -202,13 +202,14 @@ void wxStaticText::SetLabel(const wxString& label)
     }
 }
 
+
 bool wxStaticText::SetFont(const wxFont& font)
 {
     bool ret = wxControl::SetFont(font);
 
     // adjust the size of the window to fit to the label unless autoresizing is
     // disabled
-    if ( !HasFlag(wxST_NO_AUTORESIZE) )
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     {
         InvalidateBestSize();
         DoSetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord,
@@ -218,17 +219,4 @@ bool wxStaticText::SetFont(const wxFont& font)
     return ret;
 }
 
-// for wxST_ELLIPSIZE_* support:
-
-wxString wxStaticText::DoGetLabel() const
-{
-    return wxGetWindowText(GetHwnd());
-}
-
-void wxStaticText::DoSetLabel(const wxString& str)
-{
-    SetWindowText(GetHwnd(), str.c_str());
-}
-
-
 #endif // wxUSE_STATTEXT
diff --git a/Source/3rd Party/wx/src/msw/statusbar.cpp b/Source/3rd Party/wx/src/msw/statusbar.cpp
deleted file mode 100644
index fe16aea94..000000000
--- a/Source/3rd Party/wx/src/msw/statusbar.cpp	
+++ /dev/null
@@ -1,680 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/statusbar.cpp
-// Purpose:     native implementation of wxStatusBar
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     04.04.98
-// RCS-ID:      $Id$
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-  #pragma hdrstop
-#endif
-
-#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
-
-#include "wx/statusbr.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
-    #include "wx/frame.h"
-    #include "wx/settings.h"
-    #include "wx/dcclient.h"
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/control.h"
-#endif
-
-#include "wx/msw/private.h"
-#include "wx/tooltip.h"
-#include <windowsx.h>
-
-#if wxUSE_UXTHEME
-    #include "wx/msw/uxtheme.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-// no idea for a default width, just choose something
-static const int DEFAULT_FIELD_WIDTH = 25;
-
-} // anonymous namespace
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// windowsx.h and commctrl.h don't define those, so we do it here
-#define StatusBar_SetParts(h, n, w) SendMessage(h, SB_SETPARTS, (WPARAM)n, (LPARAM)w)
-#define StatusBar_SetText(h, n, t)  SendMessage(h, SB_SETTEXT, (WPARAM)n, (LPARAM)(LPCTSTR)t)
-#define StatusBar_GetTextLen(h, n)  LOWORD(SendMessage(h, SB_GETTEXTLENGTH, (WPARAM)n, 0))
-#define StatusBar_GetText(h, n, s)  LOWORD(SendMessage(h, SB_GETTEXT, (WPARAM)n, (LPARAM)(LPTSTR)s))
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxStatusBar class
-// ----------------------------------------------------------------------------
-
-wxStatusBar::wxStatusBar()
-{
-    SetParent(NULL);
-    m_hWnd = 0;
-    m_windowId = 0;
-    m_pDC = NULL;
-}
-
-WXDWORD wxStatusBar::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    WXDWORD msStyle = wxStatusBarBase::MSWGetStyle(style, exstyle);
-
-    // wxSTB_SIZEGRIP is part of our default style but it doesn't make sense to
-    // show size grip if this is the status bar of a non-resizable TLW so turn
-    // it off in such case
-    wxWindow * const parent = GetParent();
-    wxCHECK_MSG( parent, msStyle, wxS("Status bar must have a parent") );
-    if ( parent->IsTopLevel() && !parent->HasFlag(wxRESIZE_BORDER) )
-        style &= ~wxSTB_SIZEGRIP;
-
-    // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default
-    // (at least in the version of comctl32.dll I'm using), and the only way to
-    // turn it off is to use CCS_TOP style - as we position the status bar
-    // manually anyhow (see DoMoveWindow), use CCS_TOP style if wxSTB_SIZEGRIP
-    // is not given
-    if ( !(style & wxSTB_SIZEGRIP) )
-    {
-        msStyle |= CCS_TOP;
-    }
-    else
-    {
-#ifndef __WXWINCE__
-        // may be some versions of comctl32.dll do need it - anyhow, it won't
-        // do any harm
-       msStyle |= SBARS_SIZEGRIP;
-#endif
-    }
-
-    return msStyle;
-}
-
-bool wxStatusBar::Create(wxWindow *parent,
-                         wxWindowID id,
-                         long style,
-                         const wxString& name)
-{
-    if ( !CreateControl(parent, id, wxDefaultPosition, wxDefaultSize,
-                        style, wxDefaultValidator, name) )
-        return false;
-
-    if ( !MSWCreateControl(STATUSCLASSNAME, wxString(),
-                           wxDefaultPosition, wxDefaultSize) )
-        return false;
-
-    SetFieldsCount(1);
-
-    // cache the DC instance used by DoUpdateStatusText:
-    m_pDC = new wxClientDC(this);
-
-    // we must refresh the frame size when the statusbar is created, because
-    // its client area might change
-    //
-    // notice that we must post the event, not send it, as the frame doesn't
-    // know that we're its status bar yet so laying it out right now wouldn't
-    // work correctly, we need to wait until we return to the main loop
-    PostSizeEventToParent();
-
-    return true;
-}
-
-wxStatusBar::~wxStatusBar()
-{
-    // we must refresh the frame size when the statusbar is deleted but the
-    // frame is not - otherwise statusbar leaves a hole in the place it used to
-    // occupy
-    PostSizeEventToParent();
-
-#if wxUSE_TOOLTIPS
-    // delete existing tooltips
-    for (size_t i=0; i<m_tooltips.size(); i++)
-    {
-        wxDELETE(m_tooltips[i]);
-    }
-#endif // wxUSE_TOOLTIPS
-
-    wxDELETE(m_pDC);
-}
-
-bool wxStatusBar::SetFont(const wxFont& font)
-{
-    if (!wxWindow::SetFont(font))
-        return false;
-
-    if (m_pDC) m_pDC->SetFont(font);
-    return true;
-}
-
-void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
-{
-    // this is a Windows limitation
-    wxASSERT_MSG( (nFields > 0) && (nFields < 255), "too many fields" );
-
-    // keep in synch also our m_tooltips array
-
-#if wxUSE_TOOLTIPS
-    // reset all current tooltips
-    for (size_t i=0; i<m_tooltips.size(); i++)
-    {
-        wxDELETE(m_tooltips[i]);
-    }
-
-    // shrink/expand the array:
-    m_tooltips.resize(nFields, NULL);
-#endif // wxUSE_TOOLTIPS
-
-    wxStatusBarBase::SetFieldsCount(nFields, widths);
-
-    MSWUpdateFieldsWidths();
-}
-
-void wxStatusBar::SetStatusWidths(int n, const int widths[])
-{
-    wxStatusBarBase::SetStatusWidths(n, widths);
-
-    MSWUpdateFieldsWidths();
-}
-
-void wxStatusBar::MSWUpdateFieldsWidths()
-{
-    if ( m_panes.IsEmpty() )
-        return;
-
-    const int count = m_panes.GetCount();
-
-    const int extraWidth = MSWGetBorderWidth() + MSWGetMetrics().textMargin;
-
-    // compute the effectively available amount of space:
-    int widthAvailable = GetClientSize().x;     // start with the entire width
-    widthAvailable -= extraWidth*(count - 1);   // extra space between fields
-    widthAvailable -= MSWGetMetrics().textMargin;   // and for the last field
-
-    // Deal with the grip: we shouldn't overflow onto the space occupied by it
-    // so the effectively available space is smaller.
-    const int gripWidth = HasFlag(wxSTB_SIZEGRIP) ? MSWGetMetrics().gripWidth
-                                                  : 0;
-    widthAvailable -= gripWidth;
-
-    // distribute the available space (client width) among the various fields:
-
-    wxArrayInt widthsAbs = CalculateAbsWidths(widthAvailable);
-
-
-    // update the field widths in the native control:
-
-    int *pWidths = new int[count];
-
-    int nCurPos = 0;
-    int i;
-    for ( i = 0; i < count; i++ )
-    {
-        nCurPos += widthsAbs[i] + extraWidth;
-        pWidths[i] = nCurPos;
-    }
-
-    // The total width of the panes passed to Windows must be equal to the
-    // total width available, including the grip. Otherwise we get an extra
-    // separator line just before it.
-    pWidths[count - 1] += gripWidth;
-
-    if ( !StatusBar_SetParts(GetHwnd(), count, pWidths) )
-    {
-        wxLogLastError("StatusBar_SetParts");
-    }
-
-    // Now that all parts have been created, set their text.
-    for ( i = 0; i < count; i++ )
-    {
-        DoUpdateStatusText(i);
-    }
-
-    delete [] pWidths;
-}
-
-void wxStatusBar::DoUpdateStatusText(int nField)
-{
-    if (!m_pDC)
-        return;
-
-    // Get field style, if any
-    int style;
-    switch(m_panes[nField].GetStyle())
-    {
-    case wxSB_RAISED:
-        style = SBT_POPOUT;
-        break;
-    case wxSB_FLAT:
-        style = SBT_NOBORDERS;
-        break;
-
-    case wxSB_NORMAL:
-    default:
-        style = 0;
-        break;
-    }
-
-    wxRect rc;
-    GetFieldRect(nField, rc);
-
-    const int maxWidth = rc.GetWidth() - MSWGetMetrics().textMargin;
-
-    wxString text = GetStatusText(nField);
-
-    // do we need to ellipsize this string?
-    wxEllipsizeMode ellmode = (wxEllipsizeMode)-1;
-    if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START;
-    else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE;
-    else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END;
-
-    if (ellmode == (wxEllipsizeMode)-1)
-    {
-        // if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if
-        // we don't ellipsize the text but just truncate it
-        if (HasFlag(wxSTB_SHOW_TIPS))
-            SetEllipsizedFlag(nField, m_pDC->GetTextExtent(text).GetWidth() > maxWidth);
-    }
-    else
-    {
-        text = wxControl::Ellipsize(text,
-                                     *m_pDC,
-                                     ellmode,
-                                     maxWidth,
-                                     wxELLIPSIZE_FLAGS_EXPAND_TABS);
-
-        // update the ellipsization status for this pane; this is used later to
-        // decide whether a tooltip should be shown or not for this pane
-        // (if we have wxSTB_SHOW_TIPS)
-        SetEllipsizedFlag(nField, text != GetStatusText(nField));
-    }
-
-    // Set the status text in the native control passing both field number and style.
-    // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'
-    if ( !StatusBar_SetText(GetHwnd(), nField | style, text.t_str()) )
-    {
-        wxLogLastError("StatusBar_SetText");
-    }
-
-#if wxUSE_TOOLTIPS
-    if (HasFlag(wxSTB_SHOW_TIPS))
-    {
-        wxASSERT(m_tooltips.size() == m_panes.GetCount());
-
-        if (m_tooltips[nField])
-        {
-            if (GetField(nField).IsEllipsized())
-            {
-                // update the rect of this tooltip:
-                m_tooltips[nField]->SetRect(rc);
-
-                // update also the text:
-                m_tooltips[nField]->SetTip(GetStatusText(nField));
-            }
-            else
-            {
-                // delete the tooltip associated with this pane; it's not needed anymore
-                wxDELETE(m_tooltips[nField]);
-            }
-        }
-        else
-        {
-            // create a new tooltip for this pane if needed
-            if (GetField(nField).IsEllipsized())
-                m_tooltips[nField] = new wxToolTip(this, nField, GetStatusText(nField), rc);
-            //else: leave m_tooltips[nField]==NULL
-        }
-    }
-#endif // wxUSE_TOOLTIPS
-}
-
-wxStatusBar::MSWBorders wxStatusBar::MSWGetBorders() const
-{
-    int aBorders[3];
-    SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders);
-
-    MSWBorders borders;
-    borders.horz = aBorders[0];
-    borders.vert = aBorders[1];
-    borders.between = aBorders[2];
-    return borders;
-}
-
-int wxStatusBar::GetBorderX() const
-{
-    return MSWGetBorders().horz;
-}
-
-int wxStatusBar::GetBorderY() const
-{
-    return MSWGetBorders().vert;
-}
-
-int wxStatusBar::MSWGetBorderWidth() const
-{
-    return MSWGetBorders().between;
-}
-
-/* static */
-const wxStatusBar::MSWMetrics& wxStatusBar::MSWGetMetrics()
-{
-    static MSWMetrics s_metrics = { 0, 0 };
-    if ( !s_metrics.textMargin )
-    {
-        // Grip size should be self explanatory (the only problem with it is
-        // that it's hard coded as we don't know how to find its size using
-        // API) but the margin might merit an explanation: Windows offsets the
-        // text drawn in status bar panes so we need to take this extra margin
-        // into account to make sure the text drawn by user fits inside the
-        // pane. Notice that it's not the value returned by SB_GETBORDERS
-        // which, at least on this Windows 2003 system, returns {0, 2, 2}
-#if wxUSE_UXTHEME
-        if ( wxUxThemeEngine::GetIfActive() )
-        {
-            s_metrics.gripWidth = 20;
-            s_metrics.textMargin = 8;
-        }
-        else // classic/unthemed look
-#endif // wxUSE_UXTHEME
-        {
-            s_metrics.gripWidth = 18;
-            s_metrics.textMargin = 4;
-        }
-    }
-
-    return s_metrics;
-}
-
-void wxStatusBar::SetMinHeight(int height)
-{
-    // It looks like we need to count the border twice to really make the
-    // controls taking exactly height pixels fully fit in the status bar:
-    // at least under Windows 7 the checkbox in the custom status bar of the
-    // statbar sample gets truncated otherwise.
-    height += 4*GetBorderY();
-
-    // We need to set the size and not the size to reflect the height because
-    // wxFrame uses our size and not the minimal size as it assumes that the
-    // size of a status bar never changes anyhow.
-    SetSize(-1, height);
-
-    SendMessage(GetHwnd(), SB_SETMINHEIGHT, height, 0);
-
-    // we have to send a (dummy) WM_SIZE to redraw it now
-    SendMessage(GetHwnd(), WM_SIZE, 0, 0);
-}
-
-bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const
-{
-    wxCHECK_MSG( (i >= 0) && ((size_t)i < m_panes.GetCount()), false,
-                 "invalid statusbar field index" );
-
-    RECT r;
-    if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) )
-    {
-        wxLogLastError("SendMessage(SB_GETRECT)");
-    }
-
-#if wxUSE_UXTHEME
-    wxUxThemeHandle theme(const_cast<wxStatusBar*>(this), L"Status");
-    if ( theme )
-    {
-        // by default Windows has a 2 pixel border to the right of the left
-        // divider (or it could be a bug) but it looks wrong so remove it
-        if ( i != 0 )
-        {
-            r.left -= 2;
-        }
-
-        wxUxThemeEngine::Get()->GetThemeBackgroundContentRect(theme, NULL,
-                                                              1 /* SP_PANE */, 0,
-                                                              &r, &r);
-    }
-#endif
-
-    wxCopyRECTToRect(r, rect);
-
-    return true;
-}
-
-wxSize wxStatusBar::DoGetBestSize() const
-{
-    const MSWBorders borders = MSWGetBorders();
-
-    // calculate width
-    int width = 0;
-    for ( size_t i = 0; i < m_panes.GetCount(); ++i )
-    {
-        int widthField =
-            m_bSameWidthForAllPanes ? DEFAULT_FIELD_WIDTH : m_panes[i].GetWidth();
-        if ( widthField >= 0 )
-        {
-            width += widthField;
-        }
-        else
-        {
-            // variable width field, its width is really a proportion
-            // related to the other fields
-            width += -widthField*DEFAULT_FIELD_WIDTH;
-        }
-
-        // add the space between fields
-        width += borders.between;
-    }
-
-    if ( !width )
-    {
-        // still need something even for an empty status bar
-        width = 2*DEFAULT_FIELD_WIDTH;
-    }
-
-    // calculate height: by default it should be just big enough to show text
-    // (see SetMinHeight() for the explanation of 4 factor)
-    int height = GetCharHeight();
-    height += 4*borders.vert;
-
-    wxSize best(width, height);
-    CacheBestSize(best);
-    return best;
-}
-
-void wxStatusBar::DoMoveWindow(int x, int y, int width, int height)
-{
-    if ( GetParent()->IsSizeDeferred() )
-    {
-        wxWindowMSW::DoMoveWindow(x, y, width, height);
-    }
-    else
-    {
-        // parent pos/size isn't deferred so do it now but don't send
-        // WM_WINDOWPOSCHANGING since we don't want to change pos/size later
-        // we must use SWP_NOCOPYBITS here otherwise it paints incorrectly
-        // if other windows are size deferred
-        ::SetWindowPos(GetHwnd(), NULL, x, y, width, height,
-                       SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE
-#ifndef __WXWINCE__
-                       | SWP_NOCOPYBITS | SWP_NOSENDCHANGING
-#endif
-                       );
-    }
-
-    // we have to trigger wxSizeEvent if there are children window in status
-    // bar because GetFieldRect returned incorrect (not updated) values up to
-    // here, which almost certainly resulted in incorrectly redrawn statusbar
-    if ( m_children.GetCount() > 0 )
-    {
-        wxSizeEvent event(GetClientSize(), m_windowId);
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
-    }
-}
-
-void wxStatusBar::SetStatusStyles(int n, const int styles[])
-{
-    wxStatusBarBase::SetStatusStyles(n, styles);
-
-    if (n != (int)m_panes.GetCount())
-        return;
-
-    for (int i = 0; i < n; i++)
-    {
-        int style;
-        switch(styles[i])
-        {
-        case wxSB_RAISED:
-            style = SBT_POPOUT;
-            break;
-        case wxSB_FLAT:
-            style = SBT_NOBORDERS;
-            break;
-        case wxSB_NORMAL:
-        default:
-            style = 0;
-            break;
-        }
-
-        // The SB_SETTEXT message is both used to set the field's text as well as
-        // the fields' styles.
-        // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed'
-        wxString text = GetStatusText(i);
-        if (!StatusBar_SetText(GetHwnd(), style | i, text.t_str()))
-        {
-            wxLogLastError("StatusBar_SetText");
-        }
-    }
-}
-
-WXLRESULT
-wxStatusBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-#ifndef __WXWINCE__
-    if ( nMsg == WM_WINDOWPOSCHANGING )
-    {
-        WINDOWPOS *lpPos = (WINDOWPOS *)lParam;
-        int x, y, w, h;
-        GetPosition(&x, &y);
-        GetSize(&w, &h);
-
-        // we need real window coords and not wx client coords
-        AdjustForParentClientOrigin(x, y);
-
-        lpPos->x  = x;
-        lpPos->y  = y;
-        lpPos->cx = w;
-        lpPos->cy = h;
-
-        return 0;
-    }
-
-    if ( nMsg == WM_NCLBUTTONDOWN )
-    {
-        // if hit-test is on gripper then send message to TLW to begin
-        // resizing. It is possible to send this message to any window.
-        if ( wParam == HTBOTTOMRIGHT )
-        {
-            wxWindow *win;
-
-            for ( win = GetParent(); win; win = win->GetParent() )
-            {
-                if ( win->IsTopLevel() )
-                {
-                    SendMessage(GetHwndOf(win), WM_NCLBUTTONDOWN,
-                                wParam, lParam);
-
-                    return 0;
-                }
-            }
-        }
-    }
-#endif
-
-    if ( nMsg == WM_SIZE )
-    {
-        MSWUpdateFieldsWidths();
-
-        if ( HasFlag(wxSTB_ELLIPSIZE_START) ||
-                HasFlag(wxSTB_ELLIPSIZE_MIDDLE) ||
-                    HasFlag(wxSTB_ELLIPSIZE_END) )
-        {
-            for (int i=0; i<GetFieldsCount(); i++)
-            {
-                // re-set the field text, in case we need to ellipsize
-                // (or de-ellipsize) some parts of it
-                DoUpdateStatusText(i);
-            }
-        }
-    }
-
-    return wxStatusBarBase::MSWWindowProc(nMsg, wParam, lParam);
-}
-
-#if wxUSE_TOOLTIPS
-bool wxStatusBar::MSWProcessMessage(WXMSG* pMsg)
-{
-    if ( HasFlag(wxSTB_SHOW_TIPS) )
-    {
-        // for a tooltip to be shown, we need to relay mouse events to it;
-        // this is typically done by wxWindowMSW::MSWProcessMessage but only
-        // if wxWindow::m_tooltip pointer is non-NULL.
-        // Since wxStatusBar has multiple tooltips for a single HWND, it keeps
-        // wxWindow::m_tooltip == NULL and then relays mouse events here:
-        MSG *msg = (MSG *)pMsg;
-        if ( msg->message == WM_MOUSEMOVE )
-            wxToolTip::RelayEvent(pMsg);
-    }
-
-    return wxWindow::MSWProcessMessage(pMsg);
-}
-
-bool wxStatusBar::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM* WXUNUSED(result))
-{
-    if ( HasFlag(wxSTB_SHOW_TIPS) )
-    {
-        // see comment in wxStatusBar::MSWProcessMessage for more info;
-        // basically we need to override wxWindow::MSWOnNotify because
-        // we have wxWindow::m_tooltip always NULL but we still use tooltips...
-
-        NMHDR* hdr = (NMHDR *)lParam;
-
-        wxString str;
-        if (hdr->idFrom < m_tooltips.size() && m_tooltips[hdr->idFrom])
-            str = m_tooltips[hdr->idFrom]->GetTip();
-
-        if ( HandleTooltipNotify(hdr->code, lParam, str))
-        {
-            // processed
-            return true;
-        }
-    }
-
-    return false;
-}
-#endif // wxUSE_TOOLTIPS
-
-#endif // wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
diff --git a/Source/3rd Party/wx/src/msw/stdpaths.cpp b/Source/3rd Party/wx/src/msw/stdpaths.cpp
index b5eec68aa..d167ff841 100644
--- a/Source/3rd Party/wx/src/msw/stdpaths.cpp	
+++ b/Source/3rd Party/wx/src/msw/stdpaths.cpp	
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/stdpaths.cpp
+// Name:        msw/stdpaths.cpp
 // Purpose:     wxStandardPaths implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     2004-10-19
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: stdpaths.cpp 51807 2008-02-15 13:14:49Z VZ $
 // Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
+// License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -50,7 +50,7 @@ typedef HRESULT (WINAPI *SHGetSpecialFolderPath_t)(HWND, LPTSTR, int, BOOL);
 // ----------------------------------------------------------------------------
 
 // used in our wxLogTrace messages
-#define TRACE_MASK wxT("stdpaths")
+#define TRACE_MASK _T("stdpaths")
 
 #ifndef CSIDL_APPDATA
     #define CSIDL_APPDATA         0x001a
@@ -79,14 +79,10 @@ typedef HRESULT (WINAPI *SHGetSpecialFolderPath_t)(HWND, LPTSTR, int, BOOL);
 #ifndef SHGFP_TYPE_DEFAULT
     #define SHGFP_TYPE_DEFAULT 1
 #endif
-
 // ----------------------------------------------------------------------------
 // module globals
 // ----------------------------------------------------------------------------
 
-namespace
-{
-
 struct ShellFunctions
 {
     ShellFunctions()
@@ -105,28 +101,28 @@ struct ShellFunctions
 // in spite of using a static variable, this is MT-safe as in the worst case it
 // results in initializing the function pointer several times -- but this is
 // harmless
-ShellFunctions gs_shellFuncs;
+static ShellFunctions gs_shellFuncs;
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
-void ResolveShellFunctions()
+static void ResolveShellFunctions()
 {
 #if wxUSE_DYNLIB_CLASS
 
     // start with the newest functions, fall back to the oldest ones
 #ifdef __WXWINCE__
-    wxString shellDllName(wxT("coredll"));
+    wxString shellDllName(_T("coredll"));
 #else
     // first check for SHGetFolderPath (shell32.dll 5.0)
-    wxString shellDllName(wxT("shell32"));
+    wxString shellDllName(_T("shell32"));
 #endif
 
     wxDynamicLibrary dllShellFunctions( shellDllName );
     if ( !dllShellFunctions.IsLoaded() )
     {
-        wxLogTrace(TRACE_MASK, wxT("Failed to load %s.dll"), shellDllName.c_str() );
+        wxLogTrace(TRACE_MASK, _T("Failed to load %s.dll"), shellDllName.c_str() );
     }
 
     // don't give errors if the functions are unavailable, we're ready to deal
@@ -143,14 +139,14 @@ void ResolveShellFunctions()
     static const char UNICODE_SUFFIX = 'A';
 #endif // Unicode/!Unicode
 
-    wxString funcname(wxT("SHGetFolderPath"));
+    wxString funcname(_T("SHGetFolderPath"));
     gs_shellFuncs.pSHGetFolderPath =
         (SHGetFolderPath_t)dllShellFunctions.GetSymbol(funcname + UNICODE_SUFFIX);
 
     // then for SHGetSpecialFolderPath (shell32.dll 4.71)
     if ( !gs_shellFuncs.pSHGetFolderPath )
     {
-        funcname = wxT("SHGetSpecialFolderPath");
+        funcname = _T("SHGetSpecialFolderPath");
         gs_shellFuncs.pSHGetSpecialFolderPath = (SHGetSpecialFolderPath_t)
             dllShellFunctions.GetSymbol(funcname + UNICODE_SUFFIX);
     }
@@ -165,8 +161,6 @@ void ResolveShellFunctions()
 #endif
 }
 
-} // anonymous namespace
-
 // ============================================================================
 // wxStandardPaths implementation
 // ============================================================================
@@ -251,14 +245,24 @@ wxString wxStandardPaths::DoGetDirectory(int csidl)
     return dir;
 }
 
-wxString wxStandardPaths::GetAppDir() const
+/* static */
+wxString wxStandardPaths::GetAppDir()
 {
-    if ( m_appDir.empty() )
-    {
-        m_appDir = wxFileName(wxGetFullModuleName()).GetPath();
-    }
+    wxFileName fn(wxGetFullModuleName());
 
-    return m_appDir;
+    // allow running the apps directly from build directory in debug builds
+#ifdef __WXDEBUG__
+    wxString lastdir;
+    if ( fn.GetDirCount() )
+    {
+        lastdir = fn.GetDirs().Last();
+        lastdir.MakeLower();
+        if ( lastdir.Matches(_T("debug*")) || lastdir.Matches(_T("vc_msw*")) )
+            fn.RemoveLastDir();
+    }
+#endif // __WXDEBUG__
+
+    return fn.GetPath();
 }
 
 wxString wxStandardPaths::GetDocumentsDir() const
@@ -266,77 +270,10 @@ wxString wxStandardPaths::GetDocumentsDir() const
     return DoGetDirectory(CSIDL_PERSONAL);
 }
 
-// ----------------------------------------------------------------------------
-// MSW-specific functions
-// ----------------------------------------------------------------------------
-
-void wxStandardPaths::IgnoreAppSubDir(const wxString& subdirPattern)
-{
-    wxFileName fn = wxFileName::DirName(GetAppDir());
-
-    if ( !fn.GetDirCount() )
-    {
-        // no last directory to ignore anyhow
-        return;
-    }
-
-    const wxString lastdir = fn.GetDirs().Last().Lower();
-    if ( lastdir.Matches(subdirPattern.Lower()) )
-    {
-        fn.RemoveLastDir();
-
-        // store the cached value so that subsequent calls to GetAppDir() will
-        // reuse it instead of using just the program binary directory
-        m_appDir = fn.GetPath();
-    }
-}
-
-void wxStandardPaths::IgnoreAppBuildSubDirs()
-{
-    IgnoreAppSubDir("debug");
-    IgnoreAppSubDir("release");
-
-    wxString compilerPrefix;
-#ifdef __VISUALC__
-    compilerPrefix = "vc";
-#elif defined(__GNUG__)
-    compilerPrefix = "gcc";
-#elif defined(__BORLANDC__)
-    compilerPrefix = "bcc";
-#elif defined(__DIGITALMARS__)
-    compilerPrefix = "dmc";
-#elif defined(__WATCOMC__)
-    compilerPrefix = "wat";
-#else
-    return;
-#endif
-
-    IgnoreAppSubDir(compilerPrefix + "_msw*");
-}
-
-void wxStandardPaths::DontIgnoreAppSubDir()
-{
-    // this will force the next call to GetAppDir() to use the program binary
-    // path as the application directory
-    m_appDir.clear();
-}
-
-/* static */
-wxString wxStandardPaths::MSWGetShellDir(int csidl)
-{
-    return DoGetDirectory(csidl);
-}
-
 // ----------------------------------------------------------------------------
 // public functions
 // ----------------------------------------------------------------------------
 
-wxStandardPaths::wxStandardPaths()
-{
-    // make it possible to run uninstalled application from the build directory
-    IgnoreAppBuildSubDirs();
-}
-
 wxString wxStandardPaths::GetExecutablePath() const
 {
     return wxGetFullModuleName();
@@ -344,7 +281,7 @@ wxString wxStandardPaths::GetExecutablePath() const
 
 wxString wxStandardPaths::GetConfigDir() const
 {
-    return AppendAppInfo(DoGetDirectory(CSIDL_COMMON_APPDATA));
+    return AppendAppName(DoGetDirectory(CSIDL_COMMON_APPDATA));
 }
 
 wxString wxStandardPaths::GetUserConfigDir() const
@@ -361,12 +298,12 @@ wxString wxStandardPaths::GetDataDir() const
 
 wxString wxStandardPaths::GetUserDataDir() const
 {
-    return AppendAppInfo(GetUserConfigDir());
+    return AppendAppName(GetUserConfigDir());
 }
 
 wxString wxStandardPaths::GetUserLocalDataDir() const
 {
-    return AppendAppInfo(DoGetDirectory(CSIDL_LOCAL_APPDATA));
+    return AppendAppName(DoGetDirectory(CSIDL_LOCAL_APPDATA));
 }
 
 wxString wxStandardPaths::GetPluginsDir() const
@@ -388,7 +325,7 @@ wxString wxStandardPathsWin16::GetConfigDir() const
 #ifndef __WXWINCE__
     if ( !::GetWindowsDirectory(wxStringBuffer(dir, MAX_PATH), MAX_PATH) )
     {
-        wxLogLastError(wxT("GetWindowsDirectory"));
+        wxLogLastError(_T("GetWindowsDirectory"));
     }
 #else
     // TODO: use CSIDL_WINDOWS (eVC4, possibly not eVC3)
diff --git a/Source/3rd Party/wx/src/msw/toolbar.cpp b/Source/3rd Party/wx/src/msw/tbar95.cpp
similarity index 63%
rename from Source/3rd Party/wx/src/msw/toolbar.cpp
rename to Source/3rd Party/wx/src/msw/tbar95.cpp
index 901e13c8e..71042510f 100644
--- a/Source/3rd Party/wx/src/msw/toolbar.cpp	
+++ b/Source/3rd Party/wx/src/msw/tbar95.cpp	
@@ -1,2001 +1,1848 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/toolbar.cpp
-// Purpose:     wxToolBar
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
-
-#include "wx/toolbar.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
-    #include "wx/dynarray.h"
-    #include "wx/frame.h"
-    #include "wx/log.h"
-    #include "wx/intl.h"
-    #include "wx/settings.h"
-    #include "wx/bitmap.h"
-    #include "wx/region.h"
-    #include "wx/dcmemory.h"
-    #include "wx/control.h"
-    #include "wx/app.h"         // for GetComCtl32Version
-    #include "wx/image.h"
-    #include "wx/stattext.h"
-#endif
-
-#include "wx/artprov.h"
-#include "wx/sysopt.h"
-#include "wx/dcclient.h"
-#include "wx/scopedarray.h"
-
-#include "wx/msw/private.h"
-#include "wx/msw/dc.h"
-
-#if wxUSE_UXTHEME
-#include "wx/msw/uxtheme.h"
-#endif
-
-// this define controls whether the code for button colours remapping (only
-// useful for 16 or 256 colour images) is active at all, it's always turned off
-// for CE where it doesn't compile (and is probably not needed anyhow) and may
-// also be turned off for other systems if you always use 24bpp images and so
-// never need it
-#ifndef __WXWINCE__
-    #define wxREMAP_BUTTON_COLOURS
-#endif // !__WXWINCE__
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// these standard constants are not always defined in compilers headers
-
-// Styles
-#ifndef TBSTYLE_FLAT
-    #define TBSTYLE_LIST            0x1000
-    #define TBSTYLE_FLAT            0x0800
-#endif
-
-#ifndef TBSTYLE_TRANSPARENT
-    #define TBSTYLE_TRANSPARENT     0x8000
-#endif
-
-#ifndef TBSTYLE_TOOLTIPS
-    #define TBSTYLE_TOOLTIPS        0x0100
-#endif
-
-// Messages
-#ifndef TB_GETSTYLE
-    #define TB_SETSTYLE             (WM_USER + 56)
-    #define TB_GETSTYLE             (WM_USER + 57)
-#endif
-
-#ifndef TB_HITTEST
-    #define TB_HITTEST              (WM_USER + 69)
-#endif
-
-#ifndef TB_GETMAXSIZE
-    #define TB_GETMAXSIZE           (WM_USER + 83)
-#endif
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
-
-/*
-    TOOLBAR PROPERTIES
-        tool
-            bitmap
-            bitmap2
-            tooltip
-            longhelp
-            radio (bool)
-            toggle (bool)
-        separator
-        style ( wxNO_BORDER | wxTB_HORIZONTAL)
-        bitmapsize
-        margins
-        packing
-        separation
-
-        dontattachtoframe
-*/
-
-BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
-    EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
-    EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
-    EVT_ERASE_BACKGROUND(wxToolBar::OnEraseBackground)
-END_EVENT_TABLE()
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class wxToolBarTool : public wxToolBarToolBase
-{
-public:
-    wxToolBarTool(wxToolBar *tbar,
-                  int id,
-                  const wxString& label,
-                  const wxBitmap& bmpNormal,
-                  const wxBitmap& bmpDisabled,
-                  wxItemKind kind,
-                  wxObject *clientData,
-                  const wxString& shortHelp,
-                  const wxString& longHelp)
-        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
-                            clientData, shortHelp, longHelp)
-    {
-        m_nSepCount = 0;
-        m_staticText = NULL;
-    }
-
-    wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
-        : wxToolBarToolBase(tbar, control, label)
-    {
-        if ( IsControl() && !m_label.empty() )
-        {
-            // create a control to render the control's label
-            m_staticText = new wxStaticText
-                               (
-                                 m_tbar,
-                                 wxID_ANY,
-                                 m_label,
-                                 wxDefaultPosition,
-                                 wxDefaultSize,
-                                 wxALIGN_CENTRE | wxST_NO_AUTORESIZE
-                               );
-        }
-        else // no label
-        {
-            m_staticText = NULL;
-        }
-
-        m_nSepCount = 1;
-    }
-
-    virtual ~wxToolBarTool()
-    {
-        delete m_staticText;
-    }
-
-    virtual void SetLabel(const wxString& label)
-    {
-        if ( label == m_label )
-            return;
-
-        wxToolBarToolBase::SetLabel(label);
-
-        if ( m_staticText )
-            m_staticText->SetLabel(label);
-
-        // we need to update the label shown in the toolbar because it has a
-        // pointer to the internal buffer of the old label
-        //
-        // TODO: use TB_SETBUTTONINFO
-    }
-
-    wxStaticText* GetStaticText()
-    {
-        wxASSERT_MSG( IsControl(),
-                      wxT("only makes sense for embedded control tools") );
-
-        return m_staticText;
-    }
-
-    // set/get the number of separators which we use to cover the space used by
-    // a control in the toolbar
-    void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
-    size_t GetSeparatorsCount() const { return m_nSepCount; }
-
-    // we need ids for the spacers which we want to modify later on, this
-    // function will allocate a valid/unique id for a spacer if not done yet
-    void AllocSpacerId()
-    {
-        if ( m_id == wxID_SEPARATOR )
-            m_id = wxWindow::NewControlId();
-    }
-
-    // this method is used for controls only and offsets the control by the
-    // given amount (in pixels) in horizontal direction
-    void MoveBy(int offset)
-    {
-        wxControl * const control = GetControl();
-
-        control->Move(control->GetPosition().x + offset, wxDefaultCoord);
-
-        if ( m_staticText )
-        {
-            m_staticText->Move(m_staticText->GetPosition().x + offset,
-                               wxDefaultCoord);
-        }
-    }
-
-private:
-    size_t m_nSepCount;
-    wxStaticText *m_staticText;
-
-    wxDECLARE_NO_COPY_CLASS(wxToolBarTool);
-};
-
-// ----------------------------------------------------------------------------
-// helper functions
-// ----------------------------------------------------------------------------
-
-// return the rectangle of the item at the given index
-//
-// returns an empty (0, 0, 0, 0) rectangle if fails so the caller may compare
-// r.right or r.bottom with 0 to check for this
-static RECT wxGetTBItemRect(HWND hwnd, int index)
-{
-    RECT r;
-
-    // note that we use TB_GETITEMRECT and not TB_GETRECT because the latter
-    // only appeared in v4.70 of comctl32.dll
-    if ( !::SendMessage(hwnd, TB_GETITEMRECT, index, (LPARAM)&r) )
-    {
-        wxLogLastError(wxT("TB_GETITEMRECT"));
-
-        r.top =
-        r.left =
-        r.right =
-        r.bottom = 0;
-    }
-
-    return r;
-}
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxToolBarTool
-// ----------------------------------------------------------------------------
-
-wxToolBarToolBase *wxToolBar::CreateTool(int id,
-                                         const wxString& label,
-                                         const wxBitmap& bmpNormal,
-                                         const wxBitmap& bmpDisabled,
-                                         wxItemKind kind,
-                                         wxObject *clientData,
-                                         const wxString& shortHelp,
-                                         const wxString& longHelp)
-{
-    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
-                             clientData, shortHelp, longHelp);
-}
-
-wxToolBarToolBase *
-wxToolBar::CreateTool(wxControl *control, const wxString& label)
-{
-    return new wxToolBarTool(this, control, label);
-}
-
-// ----------------------------------------------------------------------------
-// wxToolBar construction
-// ----------------------------------------------------------------------------
-
-void wxToolBar::Init()
-{
-    m_hBitmap = 0;
-    m_disabledImgList = NULL;
-
-    m_nButtons = 0;
-    m_totalFixedSize = 0;
-
-    // even though modern Windows applications typically use 24*24 (or even
-    // 32*32) size for their bitmaps, the native control itself still uses the
-    // old 16*15 default size (see TB_SETBITMAPSIZE documentation in MSDN), so
-    // default to it so that we don't call SetToolBitmapSize() unnecessarily in
-    // wxToolBarBase::AdjustToolBitmapSize()
-    m_defaultWidth = 16;
-    m_defaultHeight = 15;
-
-    m_pInTool = NULL;
-}
-
-bool wxToolBar::Create(wxWindow *parent,
-                       wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       long style,
-                       const wxString& name)
-{
-    // common initialisation
-    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
-        return false;
-
-    FixupStyle();
-
-    // MSW-specific initialisation
-    if ( !MSWCreateToolbar(pos, size) )
-        return false;
-
-    wxSetCCUnicodeFormat(GetHwnd());
-
-    // we always erase our background on WM_PAINT so there is no need to do it
-    // in WM_ERASEBKGND too (by default this won't be done but if the toolbar
-    // has a non default background colour, then it would be used in both
-    // places resulting in flicker)
-    if (wxApp::GetComCtl32Version() >= 600)
-    {
-        SetBackgroundStyle(wxBG_STYLE_PAINT);
-    }
-
-    return true;
-}
-
-bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
-{
-    if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )
-        return false;
-
-    // toolbar-specific post initialisation
-    ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
-
-#ifdef TB_SETEXTENDEDSTYLE
-    if ( wxApp::GetComCtl32Version() >= 471 )
-        ::SendMessage(GetHwnd(), TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_DRAWDDARROWS);
-#endif
-
-    return true;
-}
-
-void wxToolBar::Recreate()
-{
-    const HWND hwndOld = GetHwnd();
-    if ( !hwndOld )
-    {
-        // we haven't been created yet, no need to recreate
-        return;
-    }
-
-    // get the position and size before unsubclassing the old toolbar
-    const wxPoint pos = GetPosition();
-    const wxSize size = GetSize();
-
-    UnsubclassWin();
-
-    if ( !MSWCreateToolbar(pos, size) )
-    {
-        // what can we do?
-        wxFAIL_MSG( wxT("recreating the toolbar failed") );
-
-        return;
-    }
-
-    // reparent all our children under the new toolbar
-    for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindow *win = node->GetData();
-        if ( !win->IsTopLevel() )
-            ::SetParent(GetHwndOf(win), GetHwnd());
-    }
-
-    // only destroy the old toolbar now --
-    // after all the children had been reparented
-    ::DestroyWindow(hwndOld);
-
-    // it is for the old bitmap control and can't be used with the new one
-    if ( m_hBitmap )
-    {
-        ::DeleteObject((HBITMAP) m_hBitmap);
-        m_hBitmap = 0;
-    }
-
-    wxDELETE(m_disabledImgList);
-
-    Realize();
-}
-
-wxToolBar::~wxToolBar()
-{
-    // we must refresh the frame size when the toolbar is deleted but the frame
-    // is not - otherwise toolbar leaves a hole in the place it used to occupy
-    SendSizeEventToParent();
-
-    if ( m_hBitmap )
-        ::DeleteObject((HBITMAP) m_hBitmap);
-
-    delete m_disabledImgList;
-}
-
-wxSize wxToolBar::DoGetBestSize() const
-{
-    wxSize sizeBest;
-
-    SIZE size;
-    if ( !::SendMessage(GetHwnd(), TB_GETMAXSIZE, 0, (LPARAM)&size) )
-    {
-        // maybe an old (< 0x400) Windows version? try to approximate the
-        // toolbar size ourselves
-        sizeBest = GetToolSize();
-        sizeBest.y += 2 * ::GetSystemMetrics(SM_CYBORDER); // Add borders
-        sizeBest.x *= GetToolsCount();
-
-        // reverse horz and vertical components if necessary
-        if ( IsVertical() )
-        {
-            int t = sizeBest.x;
-            sizeBest.x = sizeBest.y;
-            sizeBest.y = t;
-        }
-    }
-    else // TB_GETMAXSIZE succeeded
-    {
-        // but it could still return an incorrect result due to what appears to
-        // be a bug in old comctl32.dll versions which don't handle controls in
-        // the toolbar correctly, so work around it (see SF patch 1902358)
-        if ( !IsVertical() && wxApp::GetComCtl32Version() < 600 )
-        {
-            // calculate the toolbar width in alternative way
-            const RECT rcFirst = wxGetTBItemRect(GetHwnd(), 0);
-            const RECT rcLast = wxGetTBItemRect(GetHwnd(), GetToolsCount() - 1);
-
-            const int widthAlt = rcLast.right - rcFirst.left;
-            if ( widthAlt > size.cx )
-                size.cx = widthAlt;
-        }
-
-        sizeBest.x = size.cx;
-        sizeBest.y = size.cy;
-    }
-
-    if ( !IsVertical() )
-    {
-        // Without the extra height, DoGetBestSize can report a size that's
-        // smaller than the actual window, causing windows to overlap slightly
-        // in some circumstances, leading to missing borders (especially noticeable
-        // in AUI layouts).
-        if (!(GetWindowStyle() & wxTB_NODIVIDER))
-            sizeBest.y += 2;
-        sizeBest.y ++;
-    }
-
-    CacheBestSize(sizeBest);
-
-    return sizeBest;
-}
-
-WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    // toolbars never have border, giving one to them results in broken
-    // appearance
-    WXDWORD msStyle = wxControl::MSWGetStyle
-                      (
-                        (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
-                      );
-
-    if ( !(style & wxTB_NO_TOOLTIPS) )
-        msStyle |= TBSTYLE_TOOLTIPS;
-
-    if ( style & wxTB_FLAT && wxApp::GetComCtl32Version() > 400 )
-        msStyle |= TBSTYLE_FLAT;
-
-    if ( style & wxTB_HORZ_LAYOUT && wxApp::GetComCtl32Version() >= 470 )
-        msStyle |= TBSTYLE_LIST;
-
-    if ( style & wxTB_NODIVIDER )
-        msStyle |= CCS_NODIVIDER;
-
-    if ( style & wxTB_NOALIGN )
-        msStyle |= CCS_NOPARENTALIGN;
-
-    if ( style & wxTB_VERTICAL )
-        msStyle |= CCS_VERT;
-
-    if( style & wxTB_BOTTOM )
-        msStyle |= CCS_BOTTOM;
-
-    if ( style & wxTB_RIGHT )
-        msStyle |= CCS_RIGHT;
-
-    // always use TBSTYLE_TRANSPARENT because the background is not drawn
-    // correctly without it in all themes and, for whatever reason, the control
-    // also flickers horribly when it is resized if this style is not used
-    //
-    // note that this is implicitly enabled by the native toolbar itself when
-    // TBSTYLE_FLAT is used (i.e. it's impossible to use TBSTYLE_FLAT without
-    // TBSTYLE_TRANSPARENT) but turn it on explicitly in any case
-    msStyle |= TBSTYLE_TRANSPARENT;
-
-    return msStyle;
-}
-
-// ----------------------------------------------------------------------------
-// adding/removing tools
-// ----------------------------------------------------------------------------
-
-bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
-                             wxToolBarToolBase * WXUNUSED(tool))
-{
-    // nothing special to do here - we really create the toolbar buttons in
-    // Realize() later
-    InvalidateBestSize();
-    return true;
-}
-
-bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
-{
-    // the main difficulty we have here is with the controls in the toolbars:
-    // as we (sometimes) use several separators to cover up the space used by
-    // them, the indices are not the same for us and the toolbar
-
-    // first determine the position of the first button to delete: it may be
-    // different from pos if we use several separators to cover the space used
-    // by a control
-    wxToolBarToolsList::compatibility_iterator node;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        wxToolBarToolBase *tool2 = node->GetData();
-        if ( tool2 == tool )
-        {
-            // let node point to the next node in the list
-            node = node->GetNext();
-
-            break;
-        }
-
-        if ( tool2->IsControl() )
-            pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
-    }
-
-    // now determine the number of buttons to delete and the area taken by them
-    size_t nButtonsToDelete = 1;
-
-    // get the size of the button we're going to delete
-    const RECT r = wxGetTBItemRect(GetHwnd(), pos);
-
-    int delta = IsVertical() ? r.bottom - r.top : r.right - r.left;
-
-    if ( tool->IsControl() )
-    {
-        nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
-
-        if ( !IsVertical() )
-            delta *= nButtonsToDelete;
-    }
-
-    m_totalFixedSize -= delta;
-
-    // do delete all buttons
-    m_nButtons -= nButtonsToDelete;
-    while ( nButtonsToDelete-- > 0 )
-    {
-        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, pos, 0) )
-        {
-            wxLogLastError(wxT("TB_DELETEBUTTON"));
-
-            return false;
-        }
-    }
-
-    // and finally rearrange the tools
-
-    // search for any stretch spacers before the removed tool
-    bool hasPrecedingStrechables = false;
-    for ( wxToolBarToolsList::compatibility_iterator nodeStch = m_tools.GetFirst();
-                                 nodeStch != node; nodeStch = nodeStch->GetNext() )
-    {
-        if ( ((wxToolBarTool*)nodeStch->GetData())->IsStretchable() )
-        {
-            hasPrecedingStrechables = true;
-            break;
-        }
-    }
-
-    if ( hasPrecedingStrechables )
-    {
-        // if the removed tool is preceded by stretch spacers
-        // just redistribute the space
-        UpdateStretchableSpacersSize();
-    }
-    else
-    {
-        // reposition all the controls after this button but before any
-        // stretch spacer (the toolbar takes care of all normal items)
-        for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
-        {
-            wxToolBarTool *tool2 = (wxToolBarTool*)node->GetData();
-
-            if ( tool2->IsControl() )
-            {
-                tool2->MoveBy(-delta);
-            }
-
-            // if a stretch spacer is found just redistribute the available space
-            else if ( tool2->IsStretchable() )
-            {
-                UpdateStretchableSpacersSize();
-                break;
-            }
-        }
-    }
-
-    InvalidateBestSize();
-
-    return true;
-}
-
-void wxToolBar::CreateDisabledImageList()
-{
-    wxDELETE(m_disabledImgList);
-
-    // as we can't use disabled image list with older versions of comctl32.dll,
-    // don't even bother creating it
-    if ( wxApp::GetComCtl32Version() >= 470 )
-    {
-        // search for the first disabled button img in the toolbar, if any
-        for ( wxToolBarToolsList::compatibility_iterator
-                node = m_tools.GetFirst(); node; node = node->GetNext() )
-        {
-            wxToolBarToolBase *tool = node->GetData();
-            wxBitmap bmpDisabled = tool->GetDisabledBitmap();
-            if ( bmpDisabled.IsOk() )
-            {
-                const wxSize sizeBitmap = bmpDisabled.GetSize();
-                m_disabledImgList = new wxImageList
-                                        (
-                                            sizeBitmap.x,
-                                            sizeBitmap.y,
-                                            bmpDisabled.GetMask() != NULL,
-                                            GetToolsCount()
-                                        );
-                break;
-            }
-        }
-
-        // we don't have any disabled bitmaps
-    }
-}
-
-bool wxToolBar::Realize()
-{
-    if ( !wxToolBarBase::Realize() )
-        return false;
-
-    const size_t nTools = GetToolsCount();
-
-#ifdef wxREMAP_BUTTON_COLOURS
-    // don't change the values of these constants, they can be set from the
-    // user code via wxSystemOptions
-    enum
-    {
-        Remap_None = -1,
-        Remap_Bg,
-        Remap_Buttons,
-        Remap_TransparentBg
-    };
-
-    // the user-specified option overrides anything, but if it wasn't set, only
-    // remap the buttons on 8bpp displays as otherwise the bitmaps usually look
-    // much worse after remapping
-    static const wxChar *remapOption = wxT("msw.remap");
-    const int remapValue = wxSystemOptions::HasOption(remapOption)
-                                ? wxSystemOptions::GetOptionInt(remapOption)
-                                : wxDisplayDepth() <= 8 ? Remap_Buttons
-                                                        : Remap_None;
-
-#endif // wxREMAP_BUTTON_COLOURS
-
-    // delete all old buttons, if any
-    for ( size_t pos = 0; pos < m_nButtons; pos++ )
-    {
-        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
-        {
-            wxLogDebug(wxT("TB_DELETEBUTTON failed"));
-        }
-    }
-
-    // First, add the bitmap: we use one bitmap for all toolbar buttons
-    // ----------------------------------------------------------------
-
-    wxToolBarToolsList::compatibility_iterator node;
-    int bitmapId = 0;
-
-    if ( !HasFlag(wxTB_NOICONS) )
-    {
-        // if we already have a bitmap, we'll replace the existing one --
-        // otherwise we'll install a new one
-        HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;
-
-        const wxCoord totalBitmapWidth  = m_defaultWidth *
-                                          wx_truncate_cast(wxCoord, nTools),
-                      totalBitmapHeight = m_defaultHeight;
-
-        // Create a bitmap and copy all the tool bitmaps into it
-        wxMemoryDC dcAllButtons;
-        wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
-        dcAllButtons.SelectObject(bitmap);
-
-#ifdef wxREMAP_BUTTON_COLOURS
-        if ( remapValue != Remap_TransparentBg )
-#endif // wxREMAP_BUTTON_COLOURS
-        {
-            // VZ: why do we hardcode grey colour for CE?
-            dcAllButtons.SetBackground(wxBrush(
-#ifdef __WXWINCE__
-                                        wxColour(0xc0, 0xc0, 0xc0)
-#else // !__WXWINCE__
-                                        GetBackgroundColour()
-#endif // __WXWINCE__/!__WXWINCE__
-                                       ));
-            dcAllButtons.Clear();
-        }
-
-        m_hBitmap = bitmap.GetHBITMAP();
-        HBITMAP hBitmap = (HBITMAP)m_hBitmap;
-
-#ifdef wxREMAP_BUTTON_COLOURS
-        if ( remapValue == Remap_Bg )
-        {
-            dcAllButtons.SelectObject(wxNullBitmap);
-
-            // Even if we're not remapping the bitmap
-            // content, we still have to remap the background.
-            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
-                totalBitmapWidth, totalBitmapHeight);
-
-            dcAllButtons.SelectObject(bitmap);
-        }
-#endif // wxREMAP_BUTTON_COLOURS
-
-        // the button position
-        wxCoord x = 0;
-
-        // the number of buttons (not separators)
-        int nButtons = 0;
-
-        CreateDisabledImageList();
-        for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-        {
-            wxToolBarToolBase *tool = node->GetData();
-            if ( tool->IsButton() )
-            {
-                const wxBitmap& bmp = tool->GetNormalBitmap();
-
-                const int w = bmp.GetWidth();
-                const int h = bmp.GetHeight();
-
-                if ( bmp.IsOk() )
-                {
-                    int xOffset = wxMax(0, (m_defaultWidth - w)/2);
-                    int yOffset = wxMax(0, (m_defaultHeight - h)/2);
-
-                    // notice the last parameter: do use mask
-                    dcAllButtons.DrawBitmap(bmp, x + xOffset, yOffset, true);
-                }
-                else
-                {
-                    wxFAIL_MSG( wxT("invalid tool button bitmap") );
-                }
-
-                // also deal with disabled bitmap if we want to use them
-                if ( m_disabledImgList )
-                {
-                    wxBitmap bmpDisabled = tool->GetDisabledBitmap();
-#if wxUSE_IMAGE && wxUSE_WXDIB
-                    if ( !bmpDisabled.IsOk() )
-                    {
-                        // no disabled bitmap specified but we still need to
-                        // fill the space in the image list with something, so
-                        // we grey out the normal bitmap
-                        wxImage
-                          imgGreyed = bmp.ConvertToImage().ConvertToGreyscale();
-
-#ifdef wxREMAP_BUTTON_COLOURS
-                        if ( remapValue == Remap_Buttons )
-                        {
-                            // we need to have light grey background colour for
-                            // MapBitmap() to work correctly
-                            for ( int y = 0; y < h; y++ )
-                            {
-                                for ( int x = 0; x < w; x++ )
-                                {
-                                    if ( imgGreyed.IsTransparent(x, y) )
-                                        imgGreyed.SetRGB(x, y,
-                                                         wxLIGHT_GREY->Red(),
-                                                         wxLIGHT_GREY->Green(),
-                                                         wxLIGHT_GREY->Blue());
-                                }
-                            }
-                        }
-#endif // wxREMAP_BUTTON_COLOURS
-
-                        bmpDisabled = wxBitmap(imgGreyed);
-                    }
-#endif // wxUSE_IMAGE
-
-#ifdef wxREMAP_BUTTON_COLOURS
-                    if ( remapValue == Remap_Buttons )
-                        MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
-#endif // wxREMAP_BUTTON_COLOURS
-
-                    m_disabledImgList->Add(bmpDisabled);
-                }
-
-                // still inc width and number of buttons because otherwise the
-                // subsequent buttons will all be shifted which is rather confusing
-                // (and like this you'd see immediately which bitmap was bad)
-                x += m_defaultWidth;
-                nButtons++;
-            }
-        }
-
-        dcAllButtons.SelectObject(wxNullBitmap);
-
-        // don't delete this HBITMAP!
-        bitmap.SetHBITMAP(0);
-
-#ifdef wxREMAP_BUTTON_COLOURS
-        if ( remapValue == Remap_Buttons )
-        {
-            // Map to system colours
-            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
-                                         totalBitmapWidth, totalBitmapHeight);
-        }
-#endif // wxREMAP_BUTTON_COLOURS
-
-        bool addBitmap = true;
-
-        if ( oldToolBarBitmap )
-        {
-#ifdef TB_REPLACEBITMAP
-            if ( wxApp::GetComCtl32Version() >= 400 )
-            {
-                TBREPLACEBITMAP replaceBitmap;
-                replaceBitmap.hInstOld = NULL;
-                replaceBitmap.hInstNew = NULL;
-                replaceBitmap.nIDOld = (UINT_PTR)oldToolBarBitmap;
-                replaceBitmap.nIDNew = (UINT_PTR)hBitmap;
-                replaceBitmap.nButtons = nButtons;
-                if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
-                                    0, (LPARAM) &replaceBitmap) )
-                {
-                    wxFAIL_MSG(wxT("Could not replace the old bitmap"));
-                }
-
-                ::DeleteObject(oldToolBarBitmap);
-
-                // already done
-                addBitmap = false;
-            }
-            else
-#endif // TB_REPLACEBITMAP
-            {
-                // we can't replace the old bitmap, so we will add another one
-                // (awfully inefficient, but what else to do?) and shift the bitmap
-                // indices accordingly
-                addBitmap = true;
-
-                bitmapId = m_nButtons;
-            }
-        }
-
-        if ( addBitmap ) // no old bitmap or we can't replace it
-        {
-            TBADDBITMAP addBitmap;
-            addBitmap.hInst = 0;
-            addBitmap.nID = (UINT_PTR)hBitmap;
-            if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
-                               (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )
-            {
-                wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
-            }
-        }
-
-        // disable image lists are only supported in comctl32.dll 4.70+
-        if ( wxApp::GetComCtl32Version() >= 470 )
-        {
-            HIMAGELIST hil = m_disabledImgList
-                                ? GetHimagelistOf(m_disabledImgList)
-                                : 0;
-
-            // notice that we set the image list even if don't have one right
-            // now as we could have it before and need to reset it in this case
-            HIMAGELIST oldImageList = (HIMAGELIST)
-              ::SendMessage(GetHwnd(), TB_SETDISABLEDIMAGELIST, 0, (LPARAM)hil);
-
-            // delete previous image list if any
-            if ( oldImageList )
-                ::DeleteObject(oldImageList);
-        }
-    }
-
-
-    // Next add the buttons and separators
-    // -----------------------------------
-
-    wxScopedArray<TBBUTTON> buttons(new TBBUTTON[nTools]);
-
-    // this array will hold the indices of all controls in the toolbar
-    wxArrayInt controlIds;
-
-    bool lastWasRadio = false;
-    int i = 0;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        wxToolBarTool *tool = static_cast<wxToolBarTool *>(node->GetData());
-
-        // don't add separators to the vertical toolbar with old comctl32.dll
-        // versions as they didn't handle this properly
-        if ( IsVertical() && tool->IsSeparator() &&
-                wxApp::GetComCtl32Version() <= 472 )
-        {
-            continue;
-        }
-
-        TBBUTTON& button = buttons[i];
-
-        wxZeroMemory(button);
-
-        bool isRadio = false;
-        switch ( tool->GetStyle() )
-        {
-            case wxTOOL_STYLE_CONTROL:
-            case wxTOOL_STYLE_SEPARATOR:
-                if ( tool->IsStretchableSpace() )
-                {
-                    // we're going to modify the size of this button later and
-                    // so we need a valid id for it and not wxID_SEPARATOR
-                    // which is used by spacers by default
-                    tool->AllocSpacerId();
-
-                    // also set the number of separators so that the logic in
-                    // HandlePaint() works correctly
-                    tool->SetSeparatorsCount(1);
-                }
-
-                button.idCommand = tool->GetId();
-                button.fsState = TBSTATE_ENABLED;
-                button.fsStyle = TBSTYLE_SEP;
-                break;
-
-            case wxTOOL_STYLE_BUTTON:
-                if ( !HasFlag(wxTB_NOICONS) )
-                    button.iBitmap = bitmapId;
-
-                if ( HasFlag(wxTB_TEXT) )
-                {
-                    const wxString& label = tool->GetLabel();
-                    if ( !label.empty() )
-                        button.iString = (INT_PTR) wxMSW_CONV_LPCTSTR(label);
-                }
-
-                button.idCommand = tool->GetId();
-
-                if ( tool->IsEnabled() )
-                    button.fsState |= TBSTATE_ENABLED;
-                if ( tool->IsToggled() )
-                    button.fsState |= TBSTATE_CHECKED;
-
-                switch ( tool->GetKind() )
-                {
-                    case wxITEM_RADIO:
-                        button.fsStyle = TBSTYLE_CHECKGROUP;
-
-                        if ( !lastWasRadio )
-                        {
-                            // the first item in the radio group is checked by
-                            // default to be consistent with wxGTK and the menu
-                            // radio items
-                            button.fsState |= TBSTATE_CHECKED;
-
-                            if (tool->Toggle(true))
-                            {
-                                DoToggleTool(tool, true);
-                            }
-                        }
-                        else if ( tool->IsToggled() )
-                        {
-                            wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
-                            int prevIndex = i - 1;
-                            while ( nodePrev )
-                            {
-                                TBBUTTON& prevButton = buttons[prevIndex];
-                                wxToolBarToolBase *tool = nodePrev->GetData();
-                                if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
-                                    break;
-
-                                if ( tool->Toggle(false) )
-                                    DoToggleTool(tool, false);
-
-                                prevButton.fsState &= ~TBSTATE_CHECKED;
-                                nodePrev = nodePrev->GetPrevious();
-                                prevIndex--;
-                            }
-                        }
-
-                        isRadio = true;
-                        break;
-
-                    case wxITEM_CHECK:
-                        button.fsStyle = TBSTYLE_CHECK;
-                        break;
-
-                    case wxITEM_NORMAL:
-                        button.fsStyle = TBSTYLE_BUTTON;
-                        break;
-
-                   case wxITEM_DROPDOWN:
-                        button.fsStyle = TBSTYLE_DROPDOWN;
-                        break;
-
-                    default:
-                        wxFAIL_MSG( wxT("unexpected toolbar button kind") );
-                        button.fsStyle = TBSTYLE_BUTTON;
-                        break;
-                }
-
-                bitmapId++;
-                break;
-        }
-
-        lastWasRadio = isRadio;
-
-        i++;
-    }
-
-    if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, i, (LPARAM)buttons.get()) )
-    {
-        wxLogLastError(wxT("TB_ADDBUTTONS"));
-    }
-
-
-    // Adjust controls and stretchable spaces
-    // --------------------------------------
-
-    // adjust the controls size to fit nicely in the toolbar and compute its
-    // total size while doing it
-    m_totalFixedSize = 0;
-    int toolIndex = 0;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext(), toolIndex++ )
-    {
-        wxToolBarTool * const tool = (wxToolBarTool*)node->GetData();
-
-        const RECT r = wxGetTBItemRect(GetHwnd(), toolIndex);
-
-        if ( !tool->IsControl() )
-        {
-            if ( IsVertical() )
-                m_totalFixedSize += r.bottom - r.top;
-            else
-                m_totalFixedSize += r.right - r.left;
-
-            continue;
-        }
-
-        if ( IsVertical() )
-        {
-            // don't embed controls in the vertical toolbar, this doesn't look
-            // good and wxGTK doesn't do it neither (and the code below can't
-            // deal with this case)
-            continue;
-        }
-
-        wxControl * const control = tool->GetControl();
-        wxStaticText * const staticText = tool->GetStaticText();
-
-        wxSize size = control->GetSize();
-        wxSize staticTextSize;
-        if ( staticText )
-        {
-            staticTextSize = staticText->GetSize();
-            staticTextSize.y += 3; // margin between control and its label
-        }
-
-        // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+
-#ifdef TB_SETBUTTONINFO
-        // available in headers, now check whether it is available now
-        // (during run-time)
-        if ( wxApp::GetComCtl32Version() >= 471 )
-        {
-            // set the (underlying) separators width to be that of the
-            // control
-            TBBUTTONINFO tbbi;
-            tbbi.cbSize = sizeof(tbbi);
-            tbbi.dwMask = TBIF_SIZE;
-            tbbi.cx = (WORD)size.x;
-            if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO,
-                                tool->GetId(), (LPARAM)&tbbi) )
-            {
-                // the id is probably invalid?
-                wxLogLastError(wxT("TB_SETBUTTONINFO"));
-            }
-        }
-        else
-#endif // comctl32.dll 4.71
-        // TB_SETBUTTONINFO unavailable
-        {
-            // try adding several separators to fit the controls width
-            int widthSep = r.right - r.left;
-
-            TBBUTTON tbb;
-            wxZeroMemory(tbb);
-            tbb.idCommand = 0;
-            tbb.fsState = TBSTATE_ENABLED;
-            tbb.fsStyle = TBSTYLE_SEP;
-
-            size_t nSeparators = size.x / widthSep;
-            for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
-            {
-                if ( !::SendMessage(GetHwnd(), TB_INSERTBUTTON,
-                                    toolIndex, (LPARAM)&tbb) )
-                {
-                    wxLogLastError(wxT("TB_INSERTBUTTON"));
-                }
-
-                toolIndex++;
-            }
-
-            // remember the number of separators we used - we'd have to
-            // delete all of them later
-            tool->SetSeparatorsCount(nSeparators);
-
-            // adjust the controls width to exactly cover the separators
-            size.x = (nSeparators + 1)*widthSep;
-            control->SetSize(size.x, wxDefaultCoord);
-        }
-
-        // position the control itself correctly vertically centering it on the
-        // icon area of the toolbar
-        int height = r.bottom - r.top - staticTextSize.y;
-
-        int diff = height - size.y;
-        if ( diff < 0 || !HasFlag(wxTB_TEXT) )
-        {
-            // not enough room for the static text
-            if ( staticText )
-                staticText->Hide();
-
-            // recalculate height & diff without the staticText control
-            height = r.bottom - r.top;
-            diff = height - size.y;
-            if ( diff < 0 )
-            {
-                // the control is too high, resize to fit
-                control->SetSize(wxDefaultCoord, height - 2);
-
-                diff = 2;
-            }
-        }
-        else // enough space for both the control and the label
-        {
-            if ( staticText )
-                staticText->Show();
-        }
-
-        control->Move(r.left, r.top + (diff + 1) / 2);
-        if ( staticText )
-        {
-            staticText->Move(r.left + (size.x - staticTextSize.x)/2,
-                             r.bottom - staticTextSize.y);
-        }
-
-        m_totalFixedSize += size.x;
-    }
-
-    // the max index is the "real" number of buttons - i.e. counting even the
-    // separators which we added just for aligning the controls
-    m_nButtons = toolIndex;
-
-    if ( !IsVertical() )
-    {
-        if ( m_maxRows == 0 )
-            // if not set yet, only one row
-            SetRows(1);
-    }
-    else if ( m_nButtons > 0 ) // vertical non empty toolbar
-    {
-        // if not set yet, have one column
-        m_maxRows = 1;
-        SetRows(m_nButtons);
-    }
-
-    InvalidateBestSize();
-    UpdateSize();
-
-    return true;
-}
-
-void wxToolBar::UpdateStretchableSpacersSize()
-{
-#ifdef TB_SETBUTTONINFO
-    // we can't resize the spacers if TB_SETBUTTONINFO is not supported (we
-    // could try to do it with multiple separators as for the controls but this
-    // is too painful and it just doesn't seem to be worth doing for the
-    // ancient systems)
-    if ( wxApp::GetComCtl32Version() < 471 )
-        return;
-
-    // check if we have any stretchable spacers in the first place
-    unsigned numSpaces = 0;
-    wxToolBarToolsList::compatibility_iterator node;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
-    {
-        wxToolBarTool * const tool = (wxToolBarTool*)node->GetData();
-        if ( tool->IsStretchableSpace() )
-            numSpaces++;
-    }
-
-    if ( !numSpaces )
-        return;
-
-    // we do, adjust their size: either distribute the extra size among them or
-    // reduce their size if there is not enough place for all tools
-    const int totalSize = IsVertical() ? GetClientSize().y : GetClientSize().x;
-    const int extraSize = totalSize - m_totalFixedSize;
-    const int sizeSpacer = extraSize > 0 ? extraSize / numSpaces : 1;
-
-    // the last spacer should consume all remaining space if we have too much
-    // of it (which can be greater than sizeSpacer because of the rounding)
-    const int sizeLastSpacer = extraSize > 0
-                                ? extraSize - (numSpaces - 1)*sizeSpacer
-                                : 1;
-
-    // cumulated offset by which we need to move all the following controls to
-    // the right: while the toolbar takes care of the normal items, we must
-    // move the controls manually ourselves to ensure they remain at the
-    // correct place
-    int offset = 0;
-    int toolIndex = 0;
-    for ( node = m_tools.GetFirst(); node; node = node->GetNext(), toolIndex++ )
-    {
-        wxToolBarTool * const tool = (wxToolBarTool*)node->GetData();
-
-        if ( tool->IsControl() && offset )
-        {
-            tool->MoveBy(offset);
-
-            continue;
-        }
-
-        if ( !tool->IsStretchableSpace() )
-            continue;
-
-        const RECT rcOld = wxGetTBItemRect(GetHwnd(), toolIndex);
-
-        WinStruct<TBBUTTONINFO> tbbi;
-        tbbi.dwMask = TBIF_SIZE;
-        tbbi.cx = --numSpaces ? sizeSpacer : sizeLastSpacer;
-
-        if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO,
-                            tool->GetId(), (LPARAM)&tbbi) )
-        {
-            wxLogLastError(wxT("TB_SETBUTTONINFO"));
-        }
-        else
-        {
-            // we successfully resized this one, move all the controls after it
-            // by the corresponding amount (may be positive or negative)
-            offset += tbbi.cx - (rcOld.right - rcOld.left);
-        }
-    }
-#endif // TB_SETBUTTONINFO
-}
-
-// ----------------------------------------------------------------------------
-// message handlers
-// ----------------------------------------------------------------------------
-
-bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
-{
-    // cast to signed is important as we compare this id with (signed) ints in
-    // FindById() and without the cast we'd get a positive int from a
-    // "negative" (i.e. > 32767) WORD
-    const int id = (signed short)id_;
-
-    wxToolBarToolBase *tool = FindById(id);
-    if ( !tool )
-        return false;
-
-    bool toggled = false; // just to suppress warnings
-
-    LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);
-
-    if ( tool->CanBeToggled() )
-    {
-        toggled = (state & TBSTATE_CHECKED) != 0;
-
-        // ignore the event when a radio button is released, as this doesn't
-        // seem to happen at all, and is handled otherwise
-        if ( tool->GetKind() == wxITEM_RADIO && !toggled )
-            return true;
-
-        tool->Toggle(toggled);
-        UnToggleRadioGroup(tool);
-    }
-
-    // Without the two lines of code below, if the toolbar was repainted during
-    // OnLeftClick(), then it could end up without the tool bitmap temporarily
-    // (see http://lists.nongnu.org/archive/html/lmi/2008-10/msg00014.html).
-    // The Update() call below ensures that this won't happen, by repainting
-    // invalidated areas of the toolbar immediately.
-    //
-    // To complicate matters, the tool would be drawn in depressed state (this
-    // code is called when mouse button is released, not pressed). That's not
-    // ideal, having the tool pressed for the duration of OnLeftClick()
-    // provides the user with useful visual clue that the app is busy reacting
-    // to the event. So we manually put the tool into pressed state, handle the
-    // event and then finally restore tool's original state.
-    ::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state | TBSTATE_PRESSED, 0));
-    Update();
-
-    bool allowLeftClick = OnLeftClick(id, toggled);
-
-    // Restore the unpressed state. Enabled/toggled state might have been
-    // changed since so take care of it.
-    if (tool->IsEnabled())
-        state |= TBSTATE_ENABLED;
-    else
-        state &= ~TBSTATE_ENABLED;
-    if (tool->IsToggled())
-        state |= TBSTATE_CHECKED;
-    else
-        state &= ~TBSTATE_CHECKED;
-    ::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state, 0));
-
-    // OnLeftClick() can veto the button state change - for buttons which
-    // may be toggled only, of course.
-    if ( !allowLeftClick && tool->CanBeToggled() )
-    {
-        // revert back
-        tool->Toggle(!toggled);
-
-        ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(!toggled, 0));
-    }
-
-    return true;
-}
-
-bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
-                            WXLPARAM lParam,
-                            WXLPARAM *WXUNUSED(result))
-{
-    LPNMHDR hdr = (LPNMHDR)lParam;
-    if ( hdr->code == TBN_DROPDOWN )
-    {
-        LPNMTOOLBAR tbhdr = (LPNMTOOLBAR)lParam;
-
-        wxCommandEvent evt(wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, tbhdr->iItem);
-        if ( HandleWindowEvent(evt) )
-        {
-            // Event got handled, don't display default popup menu
-            return false;
-        }
-
-        const wxToolBarToolBase * const tool = FindById(tbhdr->iItem);
-        wxCHECK_MSG( tool, false, wxT("drop down message for unknown tool") );
-
-        wxMenu * const menu = tool->GetDropdownMenu();
-        if ( !menu )
-            return false;
-
-        // Display popup menu below button
-        const RECT r = wxGetTBItemRect(GetHwnd(), GetToolPos(tbhdr->iItem));
-        if ( r.right )
-            PopupMenu(menu, r.left, r.bottom);
-
-        return true;
-    }
-
-
-    if( !HasFlag(wxTB_NO_TOOLTIPS) )
-    {
-#if wxUSE_TOOLTIPS
-        // First check if this applies to us
-
-        // the tooltips control created by the toolbar is sometimes Unicode, even
-        // in an ANSI application - this seems to be a bug in comctl32.dll v5
-        UINT code = hdr->code;
-        if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )
-            return false;
-
-        HWND toolTipWnd = (HWND)::SendMessage(GetHwnd(), TB_GETTOOLTIPS, 0, 0);
-        if ( toolTipWnd != hdr->hwndFrom )
-            return false;
-
-        LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
-        int id = (int)ttText->hdr.idFrom;
-
-        wxToolBarToolBase *tool = FindById(id);
-        if ( tool )
-            return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
-#else
-        wxUnusedVar(lParam);
-#endif
-    }
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// toolbar geometry
-// ----------------------------------------------------------------------------
-
-void wxToolBar::SetToolBitmapSize(const wxSize& size)
-{
-    wxToolBarBase::SetToolBitmapSize(size);
-
-    ::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, MAKELONG(size.x, size.y));
-}
-
-void wxToolBar::SetRows(int nRows)
-{
-    if ( nRows == m_maxRows )
-    {
-        // avoid resizing the frame uselessly
-        return;
-    }
-
-    // TRUE in wParam means to create at least as many rows, FALSE -
-    // at most as many
-    RECT rect;
-    ::SendMessage(GetHwnd(), TB_SETROWS,
-                  MAKEWPARAM(nRows, !(GetWindowStyle() & wxTB_VERTICAL)),
-                  (LPARAM) &rect);
-
-    m_maxRows = nRows;
-
-    UpdateSize();
-}
-
-// The button size is bigger than the bitmap size
-wxSize wxToolBar::GetToolSize() const
-{
-    // TB_GETBUTTONSIZE is supported from version 4.70
-#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
-    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
-    && !defined (__DIGITALMARS__)
-    if ( wxApp::GetComCtl32Version() >= 470 )
-    {
-        DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
-
-        return wxSize(LOWORD(dw), HIWORD(dw));
-    }
-    else
-#endif // comctl32.dll 4.70+
-    {
-        // defaults
-        return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
-    }
-}
-
-static
-wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
-                                               size_t index )
-{
-    wxToolBarToolsList::compatibility_iterator current = tools.GetFirst();
-
-    for ( ; current ; current = current->GetNext() )
-    {
-        if ( index == 0 )
-            return current->GetData();
-
-        wxToolBarTool *tool = (wxToolBarTool *)current->GetData();
-        size_t separators = tool->GetSeparatorsCount();
-
-        // if it is a normal button, sepcount == 0, so skip 1 item (the button)
-        // otherwise, skip as many items as the separator count, plus the
-        // control itself
-        index -= separators ? separators + 1 : 1;
-    }
-
-    return 0;
-}
-
-wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
-{
-    POINT pt;
-    pt.x = x;
-    pt.y = y;
-    int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
-
-    // MBN: when the point ( x, y ) is close to the toolbar border
-    //      TB_HITTEST returns m_nButtons ( not -1 )
-    if ( index < 0 || (size_t)index >= m_nButtons )
-        // it's a separator or there is no tool at all there
-        return NULL;
-
-    // when TB_SETBUTTONINFO is available (both during compile- and run-time),
-    // we don't use the dummy separators hack
-#ifdef TB_SETBUTTONINFO
-    if ( wxApp::GetComCtl32Version() >= 471 )
-    {
-        return m_tools.Item((size_t)index)->GetData();
-    }
-    else
-#endif // TB_SETBUTTONINFO
-    {
-        return GetItemSkippingDummySpacers( m_tools, (size_t) index );
-    }
-}
-
-void wxToolBar::UpdateSize()
-{
-    wxPoint pos = GetPosition();
-    ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
-    if (pos != GetPosition())
-        Move(pos);
-
-    // In case Realize is called after the initial display (IOW the programmer
-    // may have rebuilt the toolbar) give the frame the option of resizing the
-    // toolbar to full width again, but only if the parent is a frame and the
-    // toolbar is managed by the frame.  Otherwise assume that some other
-    // layout mechanism is controlling the toolbar size and leave it alone.
-    SendSizeEventToParent();
-}
-
-// ----------------------------------------------------------------------------
-// toolbar styles
-// ---------------------------------------------------------------------------
-
-// get the TBSTYLE of the given toolbar window
-long wxToolBar::GetMSWToolbarStyle() const
-{
-    return ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
-}
-
-void wxToolBar::SetWindowStyleFlag(long style)
-{
-    // the style bits whose changes force us to recreate the toolbar
-    static const long MASK_NEEDS_RECREATE = wxTB_TEXT | wxTB_NOICONS;
-
-    const long styleOld = GetWindowStyle();
-
-    wxToolBarBase::SetWindowStyleFlag(style);
-
-    // don't recreate an empty toolbar: not only this is unnecessary, but it is
-    // also fatal as we'd then try to recreate the toolbar when it's just being
-    // created
-    if ( GetToolsCount() &&
-            (style & MASK_NEEDS_RECREATE) != (styleOld & MASK_NEEDS_RECREATE) )
-    {
-        // to remove the text labels, simply re-realizing the toolbar is enough
-        // but I don't know of any way to add the text to an existing toolbar
-        // other than by recreating it entirely
-        Recreate();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// tool state
-// ----------------------------------------------------------------------------
-
-void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable)
-{
-    ::SendMessage(GetHwnd(), TB_ENABLEBUTTON,
-                  (WPARAM)tool->GetId(), (LPARAM)MAKELONG(enable, 0));
-}
-
-void wxToolBar::DoToggleTool(wxToolBarToolBase *tool, bool toggle)
-{
-    ::SendMessage(GetHwnd(), TB_CHECKBUTTON,
-                  (WPARAM)tool->GetId(), (LPARAM)MAKELONG(toggle, 0));
-}
-
-void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
-{
-    // VZ: AFAIK, the button has to be created either with TBSTYLE_CHECK or
-    //     without, so we really need to delete the button and recreate it here
-    wxFAIL_MSG( wxT("not implemented") );
-}
-
-void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
-{
-    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
-    if ( tool )
-    {
-        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
-
-        tool->SetNormalBitmap(bitmap);
-        Realize();
-    }
-}
-
-void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
-{
-    wxToolBarTool* tool = static_cast<wxToolBarTool*>(FindById(id));
-    if ( tool )
-    {
-        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
-
-        tool->SetDisabledBitmap(bitmap);
-        Realize();
-    }
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-// Responds to colour changes, and passes event on to children.
-void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-    wxRGBToColour(m_backgroundColour, ::GetSysColor(COLOR_BTNFACE));
-
-    // Remap the buttons
-    Realize();
-
-    // Relayout the toolbar
-    int nrows = m_maxRows;
-    m_maxRows = 0;      // otherwise SetRows() wouldn't do anything
-    SetRows(nrows);
-
-    Refresh();
-
-    // let the event propagate further
-    event.Skip();
-}
-
-void wxToolBar::OnMouseEvent(wxMouseEvent& event)
-{
-    if ( event.Leaving() )
-    {
-        if ( m_pInTool )
-        {
-            OnMouseEnter(wxID_ANY);
-            m_pInTool = NULL;
-        }
-
-        event.Skip();
-        return;
-    }
-
-    if ( event.RightDown() )
-    {
-        // find the tool under the mouse
-        wxCoord x = 0, y = 0;
-        event.GetPosition(&x, &y);
-
-        wxToolBarToolBase *tool = FindToolForPosition(x, y);
-        OnRightClick(tool ? tool->GetId() : -1, x, y);
-    }
-    else
-    {
-        event.Skip();
-    }
-}
-
-// This handler is needed to fix problems with painting the background of
-// toolbar icons with comctl32.dll < 6.0.
-void wxToolBar::OnEraseBackground(wxEraseEvent& event)
-{
-    MSWDoEraseBackground(event.GetDC()->GetHDC());
-}
-
-bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
-{
-    // wait until we have some tools
-    if ( !GetToolsCount() )
-        return false;
-
-    // calculate our minor dimension ourselves - we're confusing the standard
-    // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
-    const RECT r = wxGetTBItemRect(GetHwnd(), 0);
-    if ( !r.right )
-        return false;
-
-    int w, h;
-
-    if ( IsVertical() )
-    {
-        w = r.right - r.left;
-        if ( m_maxRows )
-        {
-            w *= (m_nButtons + m_maxRows - 1)/m_maxRows;
-        }
-        h = HIWORD(lParam);
-    }
-    else
-    {
-        w = LOWORD(lParam);
-        if (HasFlag( wxTB_FLAT ))
-            h = r.bottom - r.top - 3;
-        else
-            h = r.bottom - r.top;
-        if ( m_maxRows )
-        {
-            // FIXME: hardcoded separator line height...
-            h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
-            h *= m_maxRows;
-        }
-    }
-
-    if ( MAKELPARAM(w, h) != lParam )
-    {
-        // size really changed
-        SetSize(w, h);
-    }
-
-    UpdateStretchableSpacersSize();
-
-    // message processed
-    return true;
-}
-
-#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
-
-bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
-{
-    // we must prevent the dummy separators corresponding to controls or
-    // stretchable spaces from being seen: we used to do it by painting over
-    // them but this, unsurprisingly, resulted in a lot of flicker so now we
-    // prevent the toolbar from painting them at all
-
-    // compute the region containing all dummy separators which we don't want
-    // to be seen
-    wxRegion rgnDummySeps;
-    const wxRect rectTotal = GetClientRect();
-    int toolIndex = 0;
-    for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxToolBarTool * const
-            tool = static_cast<wxToolBarTool *>(node->GetData());
-
-        if ( tool->IsControl() || tool->IsStretchableSpace() )
-        {
-            const size_t numSeps = tool->GetSeparatorsCount();
-            for ( size_t n = 0; n < numSeps; n++, toolIndex++ )
-            {
-                // for some reason TB_GETITEMRECT returns a rectangle 1 pixel
-                // shorter than the full window size (at least under Windows 7)
-                // but we need to erase the full width/height below
-                RECT rcItem = wxGetTBItemRect(GetHwnd(), toolIndex);
-                if ( IsVertical() )
-                {
-                    rcItem.left = 0;
-                    rcItem.right = rectTotal.width;
-                }
-                else
-                {
-                    rcItem.top = 0;
-                    rcItem.bottom = rectTotal.height;
-                }
-
-                rgnDummySeps.Union(wxRectFromRECT(rcItem));
-            }
-        }
-        else
-        {
-            // normal tools never correspond to more than one native button
-            toolIndex++;
-        }
-    }
-
-    if ( rgnDummySeps.IsOk() )
-    {
-        // exclude the area occupied by the controls and stretchable spaces
-        // from the update region to prevent the toolbar from drawing
-        // separators in it
-        if ( !::ValidateRgn(GetHwnd(), GetHrgnOf(rgnDummySeps)) )
-        {
-            wxLogLastError(wxT("ValidateRgn()"));
-        }
-    }
-
-    // still let the native control draw everything else normally but set up a
-    // hook to be able to process the next WM_ERASEBKGND sent to our parent
-    // because toolbar will ask it to erase its background from its WM_PAINT
-    // handler (when using TBSTYLE_TRANSPARENT which we do always use)
-    //
-    // installing hook is not completely trivial as all kinds of strange
-    // situations are possible: sometimes we can be called recursively from
-    // inside the native toolbar WM_PAINT handler so the hook might already be
-    // installed and sometimes the native toolbar might not send WM_ERASEBKGND
-    // to the parent at all for whatever reason, so deal with all these cases
-    wxWindow * const parent = GetParent();
-    const bool hadHook = parent->MSWHasEraseBgHook();
-    if ( !hadHook )
-        GetParent()->MSWSetEraseBgHook(this);
-
-    MSWDefWindowProc(WM_PAINT, wParam, lParam);
-
-    if ( !hadHook )
-        GetParent()->MSWSetEraseBgHook(NULL);
-
-
-    if ( rgnDummySeps.IsOk() )
-    {
-        // erase the dummy separators region ourselves now as nobody painted
-        // over them
-        WindowHDC hdc(GetHwnd());
-        ::SelectClipRgn(hdc, GetHrgnOf(rgnDummySeps));
-        MSWDoEraseBackground(hdc);
-    }
-
-    return true;
-}
-
-WXHBRUSH wxToolBar::MSWGetToolbarBgBrush()
-{
-    // we conservatively use a solid brush here but we could also use a themed
-    // brush by using DrawThemeBackground() to create a bitmap brush (it'd need
-    // to be invalidated whenever the toolbar is resized and, also, correctly
-    // aligned using SetBrushOrgEx() before each use -- there is code for doing
-    // this in wxNotebook already so it'd need to be refactored into wxWindow)
-    //
-    // however inasmuch as there is a default background for the toolbar at all
-    // (and this is not a trivial question as different applications use very
-    // different colours), it seems to be a solid one and using REBAR
-    // background brush as we used to do before doesn't look good at all under
-    // Windows 7 (and probably Vista too), so for now we just keep it simple
-    wxColour const
-        colBg = m_hasBgCol ? GetBackgroundColour()
-                           : wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
-    wxBrush * const
-        brush = wxTheBrushList->FindOrCreateBrush(colBg);
-
-    return brush ? static_cast<WXHBRUSH>(brush->GetResourceHandle()) : 0;
-}
-
-WXHBRUSH wxToolBar::MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child)
-{
-    WXHBRUSH hbr = wxToolBarBase::MSWGetBgBrushForChild(hDC, child);
-    if ( hbr )
-        return hbr;
-
-    // the base class version only returns a brush for erasing children
-    // background if we have a non-default background colour but as the toolbar
-    // doesn't erase its own background by default, we need to always do it for
-    // (semi-)transparent children
-    if ( child->GetParent() == this && child->HasTransparentBackground() )
-        return MSWGetToolbarBgBrush();
-
-    return 0;
-}
-
-void wxToolBar::MSWDoEraseBackground(WXHDC hDC)
-{
-    wxFillRect(GetHwnd(), (HDC)hDC, (HBRUSH)MSWGetToolbarBgBrush());
-}
-
-bool wxToolBar::MSWEraseBgHook(WXHDC hDC)
-{
-    // toolbar WM_PAINT handler offsets the DC origin before sending
-    // WM_ERASEBKGND to the parent but as we handle it in the toolbar itself,
-    // we need to reset it back
-    HDC hdc = (HDC)hDC;
-    POINT ptOldOrg;
-    if ( !::SetWindowOrgEx(hdc, 0, 0, &ptOldOrg) )
-    {
-        wxLogLastError(wxT("SetWindowOrgEx(tbar-bg-hdc)"));
-        return false;
-    }
-
-    MSWDoEraseBackground(hDC);
-
-    ::SetWindowOrgEx(hdc, ptOldOrg.x, ptOldOrg.y, NULL);
-
-    return true;
-}
-
-#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
-
-void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
-{
-    wxCoord x = GET_X_LPARAM(lParam),
-            y = GET_Y_LPARAM(lParam);
-    wxToolBarToolBase* tool = FindToolForPosition( x, y );
-
-    // has the current tool changed?
-    if ( tool != m_pInTool )
-    {
-        m_pInTool = tool;
-        OnMouseEnter(tool ? tool->GetId() : wxID_ANY);
-    }
-}
-
-WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    switch ( nMsg )
-    {
-        case WM_MOUSEMOVE:
-            // we don't handle mouse moves, so always pass the message to
-            // wxControl::MSWWindowProc (HandleMouseMove just calls OnMouseEnter)
-            HandleMouseMove(wParam, lParam);
-            break;
-
-        case WM_SIZE:
-            if ( HandleSize(wParam, lParam) )
-                return 0;
-            break;
-
-#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
-        case WM_PAINT:
-            // refreshing the controls in the toolbar inside a composite window
-            // results in an endless stream of WM_PAINT messages -- and seems
-            // to be unnecessary anyhow as everything works just fine without
-            // any special workarounds in this case
-            if ( !IsDoubleBuffered() && HandlePaint(wParam, lParam) )
-                return 0;
-            break;
-#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
-    }
-
-    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
-}
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-#ifdef wxREMAP_BUTTON_COLOURS
-
-WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
-{
-    MemoryHDC hdcMem;
-
-    if ( !hdcMem )
-    {
-        wxLogLastError(wxT("CreateCompatibleDC"));
-
-        return bitmap;
-    }
-
-    SelectInHDC bmpInHDC(hdcMem, (HBITMAP)bitmap);
-
-    if ( !bmpInHDC )
-    {
-        wxLogLastError(wxT("SelectObject"));
-
-        return bitmap;
-    }
-
-    wxCOLORMAP *cmap = wxGetStdColourMap();
-
-    for ( int i = 0; i < width; i++ )
-    {
-        for ( int j = 0; j < height; j++ )
-        {
-            COLORREF pixel = ::GetPixel(hdcMem, i, j);
-
-            for ( size_t k = 0; k < wxSTD_COL_MAX; k++ )
-            {
-                COLORREF col = cmap[k].from;
-                if ( abs(GetRValue(pixel) - GetRValue(col)) < 10 &&
-                     abs(GetGValue(pixel) - GetGValue(col)) < 10 &&
-                     abs(GetBValue(pixel) - GetBValue(col)) < 10 )
-                {
-                    if ( cmap[k].to != pixel )
-                        ::SetPixel(hdcMem, i, j, cmap[k].to);
-                    break;
-                }
-            }
-        }
-    }
-
-    return bitmap;
-}
-
-#endif // wxREMAP_BUTTON_COLOURS
-
-#endif // wxUSE_TOOLBAR
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/msw/tbar95.cpp
+// Purpose:     wxToolBar
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id: tbar95.cpp 58446 2009-01-26 23:32:16Z VS $
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE && !defined(__SMARTPHONE__)
+
+#include "wx/toolbar.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/dynarray.h"
+    #include "wx/frame.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/settings.h"
+    #include "wx/bitmap.h"
+    #include "wx/dcmemory.h"
+    #include "wx/control.h"
+    #include "wx/app.h"         // for GetComCtl32Version
+    #include "wx/image.h"
+#endif
+
+#include "wx/sysopt.h"
+
+#include "wx/msw/private.h"
+
+#if wxUSE_UXTHEME
+#include "wx/msw/uxtheme.h"
+#endif
+
+// this define controls whether the code for button colours remapping (only
+// useful for 16 or 256 colour images) is active at all, it's always turned off
+// for CE where it doesn't compile (and is probably not needed anyhow) and may
+// also be turned off for other systems if you always use 24bpp images and so
+// never need it
+#ifndef __WXWINCE__
+    #define wxREMAP_BUTTON_COLOURS
+#endif // !__WXWINCE__
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// these standard constants are not always defined in compilers headers
+
+// Styles
+#ifndef TBSTYLE_FLAT
+    #define TBSTYLE_LIST            0x1000
+    #define TBSTYLE_FLAT            0x0800
+#endif
+
+#ifndef TBSTYLE_TRANSPARENT
+    #define TBSTYLE_TRANSPARENT     0x8000
+#endif
+
+#ifndef TBSTYLE_TOOLTIPS
+    #define TBSTYLE_TOOLTIPS        0x0100
+#endif
+
+// Messages
+#ifndef TB_GETSTYLE
+    #define TB_SETSTYLE             (WM_USER + 56)
+    #define TB_GETSTYLE             (WM_USER + 57)
+#endif
+
+#ifndef TB_HITTEST
+    #define TB_HITTEST              (WM_USER + 69)
+#endif
+
+#ifndef TB_GETMAXSIZE
+    #define TB_GETMAXSIZE           (WM_USER + 83)
+#endif
+
+// these values correspond to those used by comctl32.dll
+#define DEFAULTBITMAPX   16
+#define DEFAULTBITMAPY   15
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl)
+
+/*
+    TOOLBAR PROPERTIES
+        tool
+            bitmap
+            bitmap2
+            tooltip
+            longhelp
+            radio (bool)
+            toggle (bool)
+        separator
+        style ( wxNO_BORDER | wxTB_HORIZONTAL)
+        bitmapsize
+        margins
+        packing
+        separation
+
+        dontattachtoframe
+*/
+
+BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
+    EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
+    EVT_SYS_COLOUR_CHANGED(wxToolBar::OnSysColourChanged)
+    EVT_ERASE_BACKGROUND(wxToolBar::OnEraseBackground)
+END_EVENT_TABLE()
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxToolBarTool : public wxToolBarToolBase
+{
+public:
+    wxToolBarTool(wxToolBar *tbar,
+                  int id,
+                  const wxString& label,
+                  const wxBitmap& bmpNormal,
+                  const wxBitmap& bmpDisabled,
+                  wxItemKind kind,
+                  wxObject *clientData,
+                  const wxString& shortHelp,
+                  const wxString& longHelp)
+        : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+                            clientData, shortHelp, longHelp)
+    {
+        m_nSepCount = 0;
+    }
+
+    wxToolBarTool(wxToolBar *tbar, wxControl *control)
+        : wxToolBarToolBase(tbar, control)
+    {
+        m_nSepCount = 1;
+    }
+
+    virtual void SetLabel(const wxString& label)
+    {
+        if ( label == m_label )
+            return;
+
+        wxToolBarToolBase::SetLabel(label);
+
+        // we need to update the label shown in the toolbar because it has a
+        // pointer to the internal buffer of the old label
+        //
+        // TODO: use TB_SETBUTTONINFO
+    }
+
+    // set/get the number of separators which we use to cover the space used by
+    // a control in the toolbar
+    void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
+    size_t GetSeparatorsCount() const { return m_nSepCount; }
+
+private:
+    size_t m_nSepCount;
+
+    DECLARE_NO_COPY_CLASS(wxToolBarTool)
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------
+
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+                                         const wxString& label,
+                                         const wxBitmap& bmpNormal,
+                                         const wxBitmap& bmpDisabled,
+                                         wxItemKind kind,
+                                         wxObject *clientData,
+                                         const wxString& shortHelp,
+                                         const wxString& longHelp)
+{
+    return new wxToolBarTool(this, id, label, bmpNormal, bmpDisabled, kind,
+                             clientData, shortHelp, longHelp);
+}
+
+wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+{
+    return new wxToolBarTool(this, control);
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBar construction
+// ----------------------------------------------------------------------------
+
+void wxToolBar::Init()
+{
+    m_hBitmap = 0;
+    m_disabledImgList = NULL;
+
+    m_nButtons = 0;
+
+    m_defaultWidth = DEFAULTBITMAPX;
+    m_defaultHeight = DEFAULTBITMAPY;
+
+    m_pInTool = 0;
+}
+
+bool wxToolBar::Create(wxWindow *parent,
+                       wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxString& name)
+{
+    // common initialisation
+    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
+        return false;
+
+    FixupStyle();
+
+    // MSW-specific initialisation
+    if ( !MSWCreateToolbar(pos, size) )
+        return false;
+
+    wxSetCCUnicodeFormat(GetHwnd());
+
+    // workaround for flat toolbar on Windows XP classic style: we have to set
+    // the style after creating the control; doing it at creation time doesn't work
+#if wxUSE_UXTHEME
+    if ( style & wxTB_FLAT )
+    {
+        LRESULT style = GetMSWToolbarStyle();
+
+        if ( !(style & TBSTYLE_FLAT) )
+            ::SendMessage(GetHwnd(), TB_SETSTYLE, 0, style | TBSTYLE_FLAT);
+    }
+#endif // wxUSE_UXTHEME
+
+    return true;
+}
+
+bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size)
+{
+    if ( !MSWCreateControl(TOOLBARCLASSNAME, wxEmptyString, pos, size) )
+        return false;
+
+    // toolbar-specific post initialisation
+    ::SendMessage(GetHwnd(), TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
+
+    // Fix a bug on e.g. the Silver theme on WinXP where control backgrounds
+    // are incorrectly drawn, by forcing the background to a specific colour.
+    int majorVersion, minorVersion;
+    wxGetOsVersion(& majorVersion, & minorVersion);
+    if (majorVersion < 6)
+        SetBackgroundColour(GetBackgroundColour());
+
+    return true;
+}
+
+void wxToolBar::Recreate()
+{
+    const HWND hwndOld = GetHwnd();
+    if ( !hwndOld )
+    {
+        // we haven't been created yet, no need to recreate
+        return;
+    }
+
+    // get the position and size before unsubclassing the old toolbar
+    const wxPoint pos = GetPosition();
+    const wxSize size = GetSize();
+
+    UnsubclassWin();
+
+    if ( !MSWCreateToolbar(pos, size) )
+    {
+        // what can we do?
+        wxFAIL_MSG( _T("recreating the toolbar failed") );
+
+        return;
+    }
+
+    // reparent all our children under the new toolbar
+    for ( wxWindowList::compatibility_iterator node = m_children.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+        if ( !win->IsTopLevel() )
+            ::SetParent(GetHwndOf(win), GetHwnd());
+    }
+
+    // only destroy the old toolbar now --
+    // after all the children had been reparented
+    ::DestroyWindow(hwndOld);
+
+    // it is for the old bitmap control and can't be used with the new one
+    if ( m_hBitmap )
+    {
+        ::DeleteObject((HBITMAP) m_hBitmap);
+        m_hBitmap = 0;
+    }
+
+    if ( m_disabledImgList )
+    {
+        delete m_disabledImgList;
+        m_disabledImgList = NULL;
+    }
+
+    Realize();
+}
+
+wxToolBar::~wxToolBar()
+{
+    // we must refresh the frame size when the toolbar is deleted but the frame
+    // is not - otherwise toolbar leaves a hole in the place it used to occupy
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && !frame->IsBeingDeleted() )
+        frame->SendSizeEvent();
+
+    if ( m_hBitmap )
+        ::DeleteObject((HBITMAP) m_hBitmap);
+
+    delete m_disabledImgList;
+}
+
+wxSize wxToolBar::DoGetBestSize() const
+{
+    wxSize sizeBest;
+
+    SIZE size;
+    if ( !::SendMessage(GetHwnd(), TB_GETMAXSIZE, 0, (LPARAM)&size) )
+    {
+        // maybe an old (< 0x400) Windows version? try to approximate the
+        // toolbar size ourselves
+        sizeBest = GetToolSize();
+        sizeBest.y += 2 * ::GetSystemMetrics(SM_CYBORDER); // Add borders
+        sizeBest.x *= GetToolsCount();
+
+        // reverse horz and vertical components if necessary
+        if ( IsVertical() )
+        {
+            int t = sizeBest.x;
+            sizeBest.x = sizeBest.y;
+            sizeBest.y = t;
+        }
+    }
+    else // TB_GETMAXSIZE succeeded
+    {
+        // but it could still return an incorrect result due to what appears to
+        // be a bug in old comctl32.dll versions which don't handle controls in
+        // the toolbar correctly, so work around it (see SF patch 1902358)
+        if ( !IsVertical() && wxApp::GetComCtl32Version() < 600 )
+        {
+            // calculate the toolbar width in alternative way
+            RECT rcFirst, rcLast;
+            if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&rcFirst)
+                    && ::SendMessage(GetHwnd(), TB_GETITEMRECT,
+                                     GetToolsCount() - 1, (LPARAM)&rcLast) )
+            {
+                const int widthAlt = rcLast.right - rcFirst.left;
+                if ( widthAlt > size.cx )
+                    size.cx = widthAlt;
+            }
+        }
+
+        sizeBest.x = size.cx;
+        sizeBest.y = size.cy;
+    }
+
+    if (!IsVertical())
+    {
+        // Without the extra height, DoGetBestSize can report a size that's
+        // smaller than the actual window, causing windows to overlap slightly
+        // in some circumstances, leading to missing borders (especially noticeable
+        // in AUI layouts).
+        if (!(GetWindowStyle() & wxTB_NODIVIDER))
+            sizeBest.y += 2;
+        sizeBest.y ++;
+    }
+
+    CacheBestSize(sizeBest);
+
+    return sizeBest;
+}
+
+WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    // toolbars never have border, giving one to them results in broken
+    // appearance
+    WXDWORD msStyle = wxControl::MSWGetStyle
+                      (
+                        (style & ~wxBORDER_MASK) | wxBORDER_NONE, exstyle
+                      );
+
+    if ( !(style & wxTB_NO_TOOLTIPS) )
+        msStyle |= TBSTYLE_TOOLTIPS;
+
+    if ( style & (wxTB_FLAT | wxTB_HORZ_LAYOUT) )
+    {
+        // static as it doesn't change during the program lifetime
+        static const int s_verComCtl = wxApp::GetComCtl32Version();
+
+        // comctl32.dll 4.00 doesn't support the flat toolbars and using this
+        // style with 6.00 (part of Windows XP) leads to the toolbar with
+        // incorrect background colour - and not using it still results in the
+        // correct (flat) toolbar, so don't use it there
+        if ( s_verComCtl > 400 && s_verComCtl < 600 )
+            msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
+
+        if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
+            msStyle |= TBSTYLE_LIST;
+    }
+
+    if ( style & wxTB_NODIVIDER )
+        msStyle |= CCS_NODIVIDER;
+
+    if ( style & wxTB_NOALIGN )
+        msStyle |= CCS_NOPARENTALIGN;
+
+    if ( style & wxTB_VERTICAL )
+        msStyle |= CCS_VERT;
+
+    if( style & wxTB_BOTTOM )
+        msStyle |= CCS_BOTTOM;
+
+    if ( style & wxTB_RIGHT )
+        msStyle |= CCS_RIGHT;
+
+    return msStyle;
+}
+
+// ----------------------------------------------------------------------------
+// adding/removing tools
+// ----------------------------------------------------------------------------
+
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool)
+{
+    // nothing special to do here - we really create the toolbar buttons in
+    // Realize() later
+    tool->Attach(this);
+
+    InvalidateBestSize();
+    return true;
+}
+
+bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+{
+    // the main difficulty we have here is with the controls in the toolbars:
+    // as we (sometimes) use several separators to cover up the space used by
+    // them, the indices are not the same for us and the toolbar
+
+    // first determine the position of the first button to delete: it may be
+    // different from pos if we use several separators to cover the space used
+    // by a control
+    wxToolBarToolsList::compatibility_iterator node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarToolBase *tool2 = node->GetData();
+        if ( tool2 == tool )
+        {
+            // let node point to the next node in the list
+            node = node->GetNext();
+
+            break;
+        }
+
+        if ( tool2->IsControl() )
+            pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
+    }
+
+    // now determine the number of buttons to delete and the area taken by them
+    size_t nButtonsToDelete = 1;
+
+    // get the size of the button we're going to delete
+    RECT r;
+    if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT, pos, (LPARAM)&r) )
+    {
+        wxLogLastError(_T("TB_GETITEMRECT"));
+    }
+
+    int width = r.right - r.left;
+
+    if ( tool->IsControl() )
+    {
+        nButtonsToDelete = ((wxToolBarTool *)tool)->GetSeparatorsCount();
+        width *= nButtonsToDelete;
+        tool->GetControl()->Destroy();
+    }
+
+    // do delete all buttons
+    m_nButtons -= nButtonsToDelete;
+    while ( nButtonsToDelete-- > 0 )
+    {
+        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, pos, 0) )
+        {
+            wxLogLastError(wxT("TB_DELETEBUTTON"));
+
+            return false;
+        }
+    }
+
+    tool->Detach();
+
+    // and finally reposition all the controls after this button (the toolbar
+    // takes care of all normal items)
+    for ( /* node -> first after deleted */ ; node; node = node->GetNext() )
+    {
+        wxToolBarToolBase *tool2 = node->GetData();
+        if ( tool2->IsControl() )
+        {
+            int x;
+            wxControl *control = tool2->GetControl();
+            control->GetPosition(&x, NULL);
+            control->Move(x - width, wxDefaultCoord);
+        }
+    }
+
+    InvalidateBestSize();
+
+    return true;
+}
+
+void wxToolBar::CreateDisabledImageList()
+{
+    if (m_disabledImgList != NULL)
+    {
+        delete m_disabledImgList;
+        m_disabledImgList = NULL;
+    }
+
+    // as we can't use disabled image list with older versions of comctl32.dll,
+    // don't even bother creating it
+    if ( wxApp::GetComCtl32Version() >= 470 )
+    {
+        // search for the first disabled button img in the toolbar, if any
+        for ( wxToolBarToolsList::compatibility_iterator
+                node = m_tools.GetFirst(); node; node = node->GetNext() )
+        {
+            wxToolBarToolBase *tool = node->GetData();
+            wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+            if ( bmpDisabled.Ok() )
+            {
+                m_disabledImgList = new wxImageList
+                                        (
+                                            m_defaultWidth,
+                                            m_defaultHeight,
+                                            bmpDisabled.GetMask() != NULL,
+                                            GetToolsCount()
+                                        );
+                break;
+            }
+        }
+
+        // we don't have any disabled bitmaps
+    }
+}
+
+void wxToolBar::AdjustToolBitmapSize()
+{
+    wxSize s(m_defaultWidth, m_defaultHeight);
+    const wxSize orig_s(s);
+
+    for ( wxToolBarToolsList::const_iterator i = m_tools.begin();
+          i != m_tools.end();
+          ++i )
+    {
+        const wxBitmap& bmp = (*i)->GetNormalBitmap();
+        s.IncTo(wxSize(bmp.GetWidth(), bmp.GetHeight()));
+    }
+
+    if ( s != orig_s )
+        SetToolBitmapSize(s);
+}
+
+bool wxToolBar::Realize()
+{
+    const size_t nTools = GetToolsCount();
+    if ( nTools == 0 )
+        // nothing to do
+        return true;
+
+    // make sure tool size is larger enough for all all bitmaps to fit in
+    // (this is consistent with what other ports do):
+    AdjustToolBitmapSize();
+
+#ifdef wxREMAP_BUTTON_COLOURS
+    // don't change the values of these constants, they can be set from the
+    // user code via wxSystemOptions
+    enum
+    {
+        Remap_None = -1,
+        Remap_Bg,
+        Remap_Buttons,
+        Remap_TransparentBg
+    };
+
+    // the user-specified option overrides anything, but if it wasn't set, only
+    // remap the buttons on 8bpp displays as otherwise the bitmaps usually look
+    // much worse after remapping
+    static const wxChar *remapOption = wxT("msw.remap");
+    const int remapValue = wxSystemOptions::HasOption(remapOption)
+                                ? wxSystemOptions::GetOptionInt(remapOption)
+                                : wxDisplayDepth() <= 8 ? Remap_Buttons
+                                                        : Remap_None;
+
+#endif // wxREMAP_BUTTON_COLOURS
+
+    // delete all old buttons, if any
+    for ( size_t pos = 0; pos < m_nButtons; pos++ )
+    {
+        if ( !::SendMessage(GetHwnd(), TB_DELETEBUTTON, 0, 0) )
+        {
+            wxLogDebug(wxT("TB_DELETEBUTTON failed"));
+        }
+    }
+
+    // First, add the bitmap: we use one bitmap for all toolbar buttons
+    // ----------------------------------------------------------------
+
+    wxToolBarToolsList::compatibility_iterator node;
+    int bitmapId = 0;
+
+    wxSize sizeBmp;
+    if ( HasFlag(wxTB_NOICONS) )
+    {
+        // no icons, don't leave space for them
+        sizeBmp.x =
+        sizeBmp.y = 0;
+    }
+    else // do show icons
+    {
+        // if we already have a bitmap, we'll replace the existing one --
+        // otherwise we'll install a new one
+        HBITMAP oldToolBarBitmap = (HBITMAP)m_hBitmap;
+
+        sizeBmp.x = m_defaultWidth;
+        sizeBmp.y = m_defaultHeight;
+
+        const wxCoord totalBitmapWidth  = m_defaultWidth *
+                                          wx_truncate_cast(wxCoord, nTools),
+                      totalBitmapHeight = m_defaultHeight;
+
+        // Create a bitmap and copy all the tool bitmaps into it
+        wxMemoryDC dcAllButtons;
+        wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
+        dcAllButtons.SelectObject(bitmap);
+
+#ifdef wxREMAP_BUTTON_COLOURS
+        if ( remapValue != Remap_TransparentBg )
+#endif // wxREMAP_BUTTON_COLOURS
+        {
+            // VZ: why do we hardcode grey colour for CE?
+            dcAllButtons.SetBackground(wxBrush(
+#ifdef __WXWINCE__
+                                        wxColour(0xc0, 0xc0, 0xc0)
+#else // !__WXWINCE__
+                                        GetBackgroundColour()
+#endif // __WXWINCE__/!__WXWINCE__
+                                       ));
+            dcAllButtons.Clear();
+        }
+
+        m_hBitmap = bitmap.GetHBITMAP();
+        HBITMAP hBitmap = (HBITMAP)m_hBitmap;
+
+#ifdef wxREMAP_BUTTON_COLOURS
+        if ( remapValue == Remap_Bg )
+        {
+            dcAllButtons.SelectObject(wxNullBitmap);
+
+            // Even if we're not remapping the bitmap
+            // content, we still have to remap the background.
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                totalBitmapWidth, totalBitmapHeight);
+
+            dcAllButtons.SelectObject(bitmap);
+        }
+#endif // wxREMAP_BUTTON_COLOURS
+
+        // the button position
+        wxCoord x = 0;
+
+        // the number of buttons (not separators)
+        int nButtons = 0;
+
+        CreateDisabledImageList();
+        for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+        {
+            wxToolBarToolBase *tool = node->GetData();
+            if ( tool->IsButton() )
+            {
+                const wxBitmap& bmp = tool->GetNormalBitmap();
+
+                const int w = bmp.GetWidth();
+                const int h = bmp.GetHeight();
+
+                if ( bmp.Ok() )
+                {
+                    int xOffset = wxMax(0, (m_defaultWidth - w)/2);
+                    int yOffset = wxMax(0, (m_defaultHeight - h)/2);
+
+                    // notice the last parameter: do use mask
+                    dcAllButtons.DrawBitmap(bmp, x + xOffset, yOffset, true);
+                }
+                else
+                {
+                    wxFAIL_MSG( _T("invalid tool button bitmap") );
+                }
+
+                // also deal with disabled bitmap if we want to use them
+                if ( m_disabledImgList )
+                {
+                    wxBitmap bmpDisabled = tool->GetDisabledBitmap();
+#if wxUSE_IMAGE && wxUSE_WXDIB
+                    if ( !bmpDisabled.Ok() )
+                    {
+                        // no disabled bitmap specified but we still need to
+                        // fill the space in the image list with something, so
+                        // we grey out the normal bitmap
+                        wxImage imgGreyed;
+                        wxCreateGreyedImage(bmp.ConvertToImage(), imgGreyed);
+
+#ifdef wxREMAP_BUTTON_COLOURS
+                        if ( remapValue == Remap_Buttons )
+                        {
+                            // we need to have light grey background colour for
+                            // MapBitmap() to work correctly
+                            for ( int y = 0; y < h; y++ )
+                            {
+                                for ( int x = 0; x < w; x++ )
+                                {
+                                    if ( imgGreyed.IsTransparent(x, y) )
+                                        imgGreyed.SetRGB(x, y,
+                                                         wxLIGHT_GREY->Red(),
+                                                         wxLIGHT_GREY->Green(),
+                                                         wxLIGHT_GREY->Blue());
+                                }
+                            }
+                        }
+#endif // wxREMAP_BUTTON_COLOURS
+
+                        bmpDisabled = wxBitmap(imgGreyed);
+                    }
+#endif // wxUSE_IMAGE
+
+#ifdef wxREMAP_BUTTON_COLOURS
+                    if ( remapValue == Remap_Buttons )
+                        MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
+#endif // wxREMAP_BUTTON_COLOURS
+
+                    m_disabledImgList->Add(bmpDisabled);
+                }
+
+                // still inc width and number of buttons because otherwise the
+                // subsequent buttons will all be shifted which is rather confusing
+                // (and like this you'd see immediately which bitmap was bad)
+                x += m_defaultWidth;
+                nButtons++;
+            }
+        }
+
+        dcAllButtons.SelectObject(wxNullBitmap);
+
+        // don't delete this HBITMAP!
+        bitmap.SetHBITMAP(0);
+
+#ifdef wxREMAP_BUTTON_COLOURS
+        if ( remapValue == Remap_Buttons )
+        {
+            // Map to system colours
+            hBitmap = (HBITMAP)MapBitmap((WXHBITMAP) hBitmap,
+                                         totalBitmapWidth, totalBitmapHeight);
+        }
+#endif // wxREMAP_BUTTON_COLOURS
+
+        bool addBitmap = true;
+
+        if ( oldToolBarBitmap )
+        {
+#ifdef TB_REPLACEBITMAP
+            if ( wxApp::GetComCtl32Version() >= 400 )
+            {
+                TBREPLACEBITMAP replaceBitmap;
+                replaceBitmap.hInstOld = NULL;
+                replaceBitmap.hInstNew = NULL;
+                replaceBitmap.nIDOld = (UINT) oldToolBarBitmap;
+                replaceBitmap.nIDNew = (UINT) hBitmap;
+                replaceBitmap.nButtons = nButtons;
+                if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP,
+                                    0, (LPARAM) &replaceBitmap) )
+                {
+                    wxFAIL_MSG(wxT("Could not replace the old bitmap"));
+                }
+
+                ::DeleteObject(oldToolBarBitmap);
+
+                // already done
+                addBitmap = false;
+            }
+            else
+#endif // TB_REPLACEBITMAP
+            {
+                // we can't replace the old bitmap, so we will add another one
+                // (awfully inefficient, but what else to do?) and shift the bitmap
+                // indices accordingly
+                addBitmap = true;
+
+                bitmapId = m_nButtons;
+            }
+        }
+
+        if ( addBitmap ) // no old bitmap or we can't replace it
+        {
+            TBADDBITMAP addBitmap;
+            addBitmap.hInst = 0;
+            addBitmap.nID = (UINT) hBitmap;
+            if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP,
+                               (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 )
+            {
+                wxFAIL_MSG(wxT("Could not add bitmap to toolbar"));
+            }
+        }
+
+        // disable image lists are only supported in comctl32.dll 4.70+
+        if ( wxApp::GetComCtl32Version() >= 470 )
+        {
+            HIMAGELIST hil = m_disabledImgList
+                                ? GetHimagelistOf(m_disabledImgList)
+                                : 0;
+
+            // notice that we set the image list even if don't have one right
+            // now as we could have it before and need to reset it in this case
+            HIMAGELIST oldImageList = (HIMAGELIST)
+              ::SendMessage(GetHwnd(), TB_SETDISABLEDIMAGELIST, 0, (LPARAM)hil);
+
+            // delete previous image list if any
+            if ( oldImageList )
+                ::DeleteObject(oldImageList);
+        }
+    }
+
+    // don't call SetToolBitmapSize() as we don't want to change the values of
+    // m_defaultWidth/Height
+    if ( !::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0,
+                        MAKELONG(sizeBmp.x, sizeBmp.y)) )
+    {
+        wxLogLastError(_T("TB_SETBITMAPSIZE"));
+    }
+
+    // Next add the buttons and separators
+    // -----------------------------------
+
+    TBBUTTON *buttons = new TBBUTTON[nTools];
+
+    // this array will hold the indices of all controls in the toolbar
+    wxArrayInt controlIds;
+
+    bool lastWasRadio = false;
+    int i = 0;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarToolBase *tool = node->GetData();
+
+        // don't add separators to the vertical toolbar with old comctl32.dll
+        // versions as they didn't handle this properly
+        if ( IsVertical() && tool->IsSeparator() &&
+                wxApp::GetComCtl32Version() <= 472 )
+        {
+            continue;
+        }
+
+        TBBUTTON& button = buttons[i];
+
+        wxZeroMemory(button);
+
+        bool isRadio = false;
+        switch ( tool->GetStyle() )
+        {
+            case wxTOOL_STYLE_CONTROL:
+                button.idCommand = tool->GetId();
+                // fall through: create just a separator too
+
+            case wxTOOL_STYLE_SEPARATOR:
+                button.fsState = TBSTATE_ENABLED;
+                button.fsStyle = TBSTYLE_SEP;
+                break;
+
+            case wxTOOL_STYLE_BUTTON:
+                if ( !HasFlag(wxTB_NOICONS) )
+                    button.iBitmap = bitmapId;
+
+                if ( HasFlag(wxTB_TEXT) )
+                {
+                    const wxString& label = tool->GetLabel();
+                    if ( !label.empty() )
+                        button.iString = (int)label.c_str();
+                }
+
+                button.idCommand = tool->GetId();
+
+                if ( tool->IsEnabled() )
+                    button.fsState |= TBSTATE_ENABLED;
+                if ( tool->IsToggled() )
+                    button.fsState |= TBSTATE_CHECKED;
+
+                switch ( tool->GetKind() )
+                {
+                    case wxITEM_RADIO:
+                        button.fsStyle = TBSTYLE_CHECKGROUP;
+
+                        if ( !lastWasRadio )
+                        {
+                            // the first item in the radio group is checked by
+                            // default to be consistent with wxGTK and the menu
+                            // radio items
+                            button.fsState |= TBSTATE_CHECKED;
+
+                            if (tool->Toggle(true))
+                            {
+                                DoToggleTool(tool, true);
+                            }
+                        }
+                        else if ( tool->IsToggled() )
+                        {
+                            wxToolBarToolsList::compatibility_iterator nodePrev = node->GetPrevious();
+                            int prevIndex = i - 1;
+                            while ( nodePrev )
+                            {
+                                TBBUTTON& prevButton = buttons[prevIndex];
+                                wxToolBarToolBase *tool = nodePrev->GetData();
+                                if ( !tool->IsButton() || tool->GetKind() != wxITEM_RADIO )
+                                    break;
+
+                                if ( tool->Toggle(false) )
+                                    DoToggleTool(tool, false);
+
+                                prevButton.fsState &= ~TBSTATE_CHECKED;
+                                nodePrev = nodePrev->GetPrevious();
+                                prevIndex--;
+                            }
+                        }
+
+                        isRadio = true;
+                        break;
+
+                    case wxITEM_CHECK:
+                        button.fsStyle = TBSTYLE_CHECK;
+                        break;
+
+                    case wxITEM_NORMAL:
+                        button.fsStyle = TBSTYLE_BUTTON;
+                        break;
+
+                    default:
+                        wxFAIL_MSG( _T("unexpected toolbar button kind") );
+                        button.fsStyle = TBSTYLE_BUTTON;
+                        break;
+                }
+
+                bitmapId++;
+                break;
+        }
+
+        lastWasRadio = isRadio;
+
+        i++;
+    }
+
+    if ( !::SendMessage(GetHwnd(), TB_ADDBUTTONS, (WPARAM)i, (LPARAM)buttons) )
+    {
+        wxLogLastError(wxT("TB_ADDBUTTONS"));
+    }
+
+    delete [] buttons;
+
+    // Deal with the controls finally
+    // ------------------------------
+
+    // adjust the controls size to fit nicely in the toolbar
+    int y = 0;
+    size_t index = 0;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext(), index++ )
+    {
+        wxToolBarToolBase *tool = node->GetData();
+
+        // we calculate the running y coord for vertical toolbars so we need to
+        // get the items size for all items but for the horizontal ones we
+        // don't need to deal with the non controls
+        bool isControl = tool->IsControl();
+        if ( !isControl && !IsVertical() )
+            continue;
+
+        // note that we use TB_GETITEMRECT and not TB_GETRECT because the
+        // latter only appeared in v4.70 of comctl32.dll
+        RECT r;
+        if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
+                            index, (LPARAM)(LPRECT)&r) )
+        {
+            wxLogLastError(wxT("TB_GETITEMRECT"));
+        }
+
+        if ( !isControl )
+        {
+            // can only be control if isVertical
+            y += r.bottom - r.top;
+
+            continue;
+        }
+
+        wxControl *control = tool->GetControl();
+        wxSize size = control->GetSize();
+
+        // the position of the leftmost controls corner
+        int left = wxDefaultCoord;
+
+        // TB_SETBUTTONINFO message is only supported by comctl32.dll 4.71+
+#ifdef TB_SETBUTTONINFO
+        // available in headers, now check whether it is available now
+        // (during run-time)
+        if ( wxApp::GetComCtl32Version() >= 471 )
+        {
+            // set the (underlying) separators width to be that of the
+            // control
+            TBBUTTONINFO tbbi;
+            tbbi.cbSize = sizeof(tbbi);
+            tbbi.dwMask = TBIF_SIZE;
+            tbbi.cx = (WORD)size.x;
+            if ( !::SendMessage(GetHwnd(), TB_SETBUTTONINFO,
+                                tool->GetId(), (LPARAM)&tbbi) )
+            {
+                // the id is probably invalid?
+                wxLogLastError(wxT("TB_SETBUTTONINFO"));
+            }
+        }
+        else
+#endif // comctl32.dll 4.71
+        // TB_SETBUTTONINFO unavailable
+        {
+            // try adding several separators to fit the controls width
+            int widthSep = r.right - r.left;
+            left = r.left;
+
+            TBBUTTON tbb;
+            wxZeroMemory(tbb);
+            tbb.idCommand = 0;
+            tbb.fsState = TBSTATE_ENABLED;
+            tbb.fsStyle = TBSTYLE_SEP;
+
+            size_t nSeparators = size.x / widthSep;
+            for ( size_t nSep = 0; nSep < nSeparators; nSep++ )
+            {
+                if ( !::SendMessage(GetHwnd(), TB_INSERTBUTTON,
+                                    index, (LPARAM)&tbb) )
+                {
+                    wxLogLastError(wxT("TB_INSERTBUTTON"));
+                }
+
+                index++;
+            }
+
+            // remember the number of separators we used - we'd have to
+            // delete all of them later
+            ((wxToolBarTool *)tool)->SetSeparatorsCount(nSeparators);
+
+            // adjust the controls width to exactly cover the separators
+            control->SetSize((nSeparators + 1)*widthSep, wxDefaultCoord);
+        }
+
+        // position the control itself correctly vertically
+        int height = r.bottom - r.top;
+        int diff = height - size.y;
+        if ( diff < 0 )
+        {
+            // the control is too high, resize to fit
+            control->SetSize(wxDefaultCoord, height - 2);
+
+            diff = 2;
+        }
+
+        int top;
+        if ( IsVertical() )
+        {
+            left = 0;
+            top = y;
+
+            y += height + 2 * GetMargins().y;
+        }
+        else // horizontal toolbar
+        {
+            if ( left == wxDefaultCoord )
+                left = r.left;
+
+            top = r.top;
+        }
+
+        control->Move(left, top + (diff + 1) / 2);
+    }
+
+    // the max index is the "real" number of buttons - i.e. counting even the
+    // separators which we added just for aligning the controls
+    m_nButtons = index;
+
+    if ( !IsVertical() )
+    {
+        if ( m_maxRows == 0 )
+            // if not set yet, only one row
+            SetRows(1);
+    }
+    else if ( m_nButtons > 0 ) // vertical non empty toolbar
+    {
+        // if not set yet, have one column
+        m_maxRows = 1;
+        SetRows(m_nButtons);
+    }
+
+    InvalidateBestSize();
+    UpdateSize();
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// message handlers
+// ----------------------------------------------------------------------------
+
+bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id)
+{
+    wxToolBarToolBase *tool = FindById((int)id);
+    if ( !tool )
+        return false;
+
+    bool toggled = false; // just to suppress warnings
+
+    LRESULT state = ::SendMessage(GetHwnd(), TB_GETSTATE, id, 0);
+
+    if ( tool->CanBeToggled() )
+    {
+        toggled = (state & TBSTATE_CHECKED) != 0;
+
+        // ignore the event when a radio button is released, as this doesn't
+        // seem to happen at all, and is handled otherwise
+        if ( tool->GetKind() == wxITEM_RADIO && !toggled )
+            return true;
+
+        tool->Toggle(toggled);
+        UnToggleRadioGroup(tool);
+    }
+
+    // Without the two lines of code below, if the toolbar was repainted during
+    // OnLeftClick(), then it could end up without the tool bitmap temporarily
+    // (see http://lists.nongnu.org/archive/html/lmi/2008-10/msg00014.html).
+    // The Update() call bellow ensures that this won't happen, by repainting
+    // invalidated areas of the toolbar immediately.
+    //
+    // To complicate matters, the tool would be drawn in depressed state (this
+    // code is called when mouse button is released, not pressed). That's not
+    // ideal, having the tool pressed for the duration of OnLeftClick()
+    // provides the user with useful visual clue that the app is busy reacting
+    // to the event. So we manually put the tool into pressed state, handle the
+    // event and then finally restore tool's original state.
+    ::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state | TBSTATE_PRESSED, 0));
+    Update();
+
+    bool allowLeftClick = OnLeftClick((int)id, toggled);
+
+    // Restore the unpressed state. Enabled/toggled state might have been
+    // changed since so take care of it.
+    if (tool->IsEnabled())
+        state |= TBSTATE_ENABLED;
+    else
+        state &= ~TBSTATE_ENABLED;
+    if (tool->IsToggled())
+        state |= TBSTATE_CHECKED;
+    else
+        state &= ~TBSTATE_CHECKED;
+    ::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state, 0));
+
+    // OnLeftClick() can veto the button state change - for buttons which
+    // may be toggled only, of couse
+    if ( !allowLeftClick && tool->CanBeToggled() )
+    {
+        // revert back
+        tool->Toggle(!toggled);
+
+        ::SendMessage(GetHwnd(), TB_CHECKBUTTON, id, MAKELONG(!toggled, 0));
+    }
+
+    return true;
+}
+
+bool wxToolBar::MSWOnNotify(int WXUNUSED(idCtrl),
+                            WXLPARAM lParam,
+                            WXLPARAM *WXUNUSED(result))
+{
+    if( !HasFlag(wxTB_NO_TOOLTIPS) )
+    {
+#if wxUSE_TOOLTIPS
+        // First check if this applies to us
+        NMHDR *hdr = (NMHDR *)lParam;
+
+        // the tooltips control created by the toolbar is sometimes Unicode, even
+        // in an ANSI application - this seems to be a bug in comctl32.dll v5
+        UINT code = hdr->code;
+        if ( (code != (UINT) TTN_NEEDTEXTA) && (code != (UINT) TTN_NEEDTEXTW) )
+            return false;
+
+        HWND toolTipWnd = (HWND)::SendMessage(GetHwnd(), TB_GETTOOLTIPS, 0, 0);
+        if ( toolTipWnd != hdr->hwndFrom )
+            return false;
+
+        LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
+        int id = (int)ttText->hdr.idFrom;
+
+        wxToolBarToolBase *tool = FindById(id);
+        if ( tool )
+            return HandleTooltipNotify(code, lParam, tool->GetShortHelp());
+#else
+        wxUnusedVar(lParam);
+#endif
+    }
+
+    return false;
+}
+
+// ----------------------------------------------------------------------------
+// toolbar geometry
+// ----------------------------------------------------------------------------
+
+void wxToolBar::SetToolBitmapSize(const wxSize& size)
+{
+    wxToolBarBase::SetToolBitmapSize(size);
+
+    ::SendMessage(GetHwnd(), TB_SETBITMAPSIZE, 0, MAKELONG(size.x, size.y));
+}
+
+void wxToolBar::SetRows(int nRows)
+{
+    if ( nRows == m_maxRows )
+    {
+        // avoid resizing the frame uselessly
+        return;
+    }
+
+    // TRUE in wParam means to create at least as many rows, FALSE -
+    // at most as many
+    RECT rect;
+    ::SendMessage(GetHwnd(), TB_SETROWS,
+                  MAKEWPARAM(nRows, !(GetWindowStyle() & wxTB_VERTICAL)),
+                  (LPARAM) &rect);
+
+    m_maxRows = nRows;
+
+    UpdateSize();
+}
+
+// The button size is bigger than the bitmap size
+wxSize wxToolBar::GetToolSize() const
+{
+    // TB_GETBUTTONSIZE is supported from version 4.70
+#if defined(_WIN32_IE) && (_WIN32_IE >= 0x300 ) \
+    && !( defined(__GNUWIN32__) && !wxCHECK_W32API_VERSION( 1, 0 ) ) \
+    && !defined (__DIGITALMARS__)
+    if ( wxApp::GetComCtl32Version() >= 470 )
+    {
+        DWORD dw = ::SendMessage(GetHwnd(), TB_GETBUTTONSIZE, 0, 0);
+
+        return wxSize(LOWORD(dw), HIWORD(dw));
+    }
+    else
+#endif // comctl32.dll 4.70+
+    {
+        // defaults
+        return wxSize(m_defaultWidth + 8, m_defaultHeight + 7);
+    }
+}
+
+static
+wxToolBarToolBase *GetItemSkippingDummySpacers(const wxToolBarToolsList& tools,
+                                               size_t index )
+{
+    wxToolBarToolsList::compatibility_iterator current = tools.GetFirst();
+
+    for ( ; current ; current = current->GetNext() )
+    {
+        if ( index == 0 )
+            return current->GetData();
+
+        wxToolBarTool *tool = (wxToolBarTool *)current->GetData();
+        size_t separators = tool->GetSeparatorsCount();
+
+        // if it is a normal button, sepcount == 0, so skip 1 item (the button)
+        // otherwise, skip as many items as the separator count, plus the
+        // control itself
+        index -= separators ? separators + 1 : 1;
+    }
+
+    return 0;
+}
+
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
+{
+    POINT pt;
+    pt.x = x;
+    pt.y = y;
+    int index = (int)::SendMessage(GetHwnd(), TB_HITTEST, 0, (LPARAM)&pt);
+
+    // MBN: when the point ( x, y ) is close to the toolbar border
+    //      TB_HITTEST returns m_nButtons ( not -1 )
+    if ( index < 0 || (size_t)index >= m_nButtons )
+        // it's a separator or there is no tool at all there
+        return (wxToolBarToolBase *)NULL;
+
+    // when TB_SETBUTTONINFO is available (both during compile- and run-time),
+    // we don't use the dummy separators hack
+#ifdef TB_SETBUTTONINFO
+    if ( wxApp::GetComCtl32Version() >= 471 )
+    {
+        return m_tools.Item((size_t)index)->GetData();
+    }
+    else
+#endif // TB_SETBUTTONINFO
+    {
+        return GetItemSkippingDummySpacers( m_tools, (size_t) index );
+    }
+}
+
+void wxToolBar::UpdateSize()
+{
+    wxPoint pos = GetPosition();
+    ::SendMessage(GetHwnd(), TB_AUTOSIZE, 0, 0);
+    if (pos != GetPosition())
+        Move(pos);
+
+    // In case Realize is called after the initial display (IOW the programmer
+    // may have rebuilt the toolbar) give the frame the option of resizing the
+    // toolbar to full width again, but only if the parent is a frame and the
+    // toolbar is managed by the frame.  Otherwise assume that some other
+    // layout mechanism is controlling the toolbar size and leave it alone.
+    wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
+    if ( frame && frame->GetToolBar() == this )
+    {
+        frame->SendSizeEvent();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// toolbar styles
+// ---------------------------------------------------------------------------
+
+// get the TBSTYLE of the given toolbar window
+long wxToolBar::GetMSWToolbarStyle() const
+{
+    return ::SendMessage(GetHwnd(), TB_GETSTYLE, 0, 0L);
+}
+
+void wxToolBar::SetWindowStyleFlag(long style)
+{
+    // the style bits whose changes force us to recreate the toolbar
+    static const long MASK_NEEDS_RECREATE = wxTB_TEXT | wxTB_NOICONS;
+
+    const long styleOld = GetWindowStyle();
+
+    wxToolBarBase::SetWindowStyleFlag(style);
+
+    // don't recreate an empty toolbar: not only this is unnecessary, but it is
+    // also fatal as we'd then try to recreate the toolbar when it's just being
+    // created
+    if ( GetToolsCount() &&
+            (style & MASK_NEEDS_RECREATE) != (styleOld & MASK_NEEDS_RECREATE) )
+    {
+        // to remove the text labels, simply re-realizing the toolbar is enough
+        // but I don't know of any way to add the text to an existing toolbar
+        // other than by recreating it entirely
+        Recreate();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// tool state
+// ----------------------------------------------------------------------------
+
+void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable)
+{
+    ::SendMessage(GetHwnd(), TB_ENABLEBUTTON,
+                  (WPARAM)tool->GetId(), (LPARAM)MAKELONG(enable, 0));
+}
+
+void wxToolBar::DoToggleTool(wxToolBarToolBase *tool, bool toggle)
+{
+    ::SendMessage(GetHwnd(), TB_CHECKBUTTON,
+                  (WPARAM)tool->GetId(), (LPARAM)MAKELONG(toggle, 0));
+}
+
+void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(toggle))
+{
+    // VZ: AFAIK, the button has to be created either with TBSTYLE_CHECK or
+    //     without, so we really need to delete the button and recreate it here
+    wxFAIL_MSG( _T("not implemented") );
+}
+
+void wxToolBar::SetToolNormalBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetNormalBitmap(bitmap);
+        Realize();
+    }
+}
+
+void wxToolBar::SetToolDisabledBitmap( int id, const wxBitmap& bitmap )
+{
+    wxToolBarTool* tool = wx_static_cast(wxToolBarTool*, FindById(id));
+    if ( tool )
+    {
+        wxCHECK_RET( tool->IsButton(), wxT("Can only set bitmap on button tools."));
+
+        tool->SetDisabledBitmap(bitmap);
+        Realize();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+// Responds to colour changes, and passes event on to children.
+void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
+{
+    wxRGBToColour(m_backgroundColour, ::GetSysColor(COLOR_BTNFACE));
+
+    // Remap the buttons
+    Realize();
+
+    // Relayout the toolbar
+    int nrows = m_maxRows;
+    m_maxRows = 0;      // otherwise SetRows() wouldn't do anything
+    SetRows(nrows);
+
+    Refresh();
+
+    // let the event propagate further
+    event.Skip();
+}
+
+void wxToolBar::OnMouseEvent(wxMouseEvent& event)
+{
+    if (event.Leaving() && m_pInTool)
+    {
+        OnMouseEnter( -1 );
+        event.Skip();
+        return;
+    }
+
+    if ( event.RightDown() )
+    {
+        // find the tool under the mouse
+        wxCoord x = 0, y = 0;
+        event.GetPosition(&x, &y);
+
+        wxToolBarToolBase *tool = FindToolForPosition(x, y);
+        OnRightClick(tool ? tool->GetId() : -1, x, y);
+    }
+    else
+    {
+        event.Skip();
+    }
+}
+
+// This handler is required to allow the toolbar to be set to a non-default
+// colour: for example, when it must blend in with a notebook page.
+void wxToolBar::OnEraseBackground(wxEraseEvent& event)
+{
+    RECT rect = wxGetClientRect(GetHwnd());
+    HDC hdc = GetHdcOf((*event.GetDC()));
+
+    int majorVersion, minorVersion;
+    wxGetOsVersion(& majorVersion, & minorVersion);
+
+#if wxUSE_UXTHEME
+    // we may need to draw themed colour so that we appear correctly on
+    // e.g. notebook page under XP with themes but only do it if the parent
+    // draws themed background itself
+    if ( !UseBgCol() && !GetParent()->UseBgCol() )
+    {
+        wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+        if ( theme )
+        {
+            HRESULT
+                hr = theme->DrawThemeParentBackground(GetHwnd(), hdc, &rect);
+            if ( hr == S_OK )
+                return;
+
+            // it can also return S_FALSE which seems to simply say that it
+            // didn't draw anything but no error really occurred
+            if ( FAILED(hr) )
+                wxLogApiError(_T("DrawThemeParentBackground(toolbar)"), hr);
+        }
+    }
+
+    // Only draw a rebar theme on Vista, since it doesn't jive so well with XP
+    if ( !UseBgCol() && majorVersion >= 6 )
+    {
+        wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+        if ( theme )
+        {
+            wxUxThemeHandle hTheme(this, L"REBAR");
+
+            RECT r;
+            wxRect rect = GetClientRect();
+            wxCopyRectToRECT(rect, r);
+
+            HRESULT hr = theme->DrawThemeBackground(hTheme, hdc, 0, 0, & r, NULL);
+            if ( hr == S_OK )
+                return;
+
+            // it can also return S_FALSE which seems to simply say that it
+            // didn't draw anything but no error really occurred
+            if ( FAILED(hr) )
+                wxLogApiError(_T("DrawThemeBackground(toolbar)"), hr);
+        }
+    }
+
+#endif // wxUSE_UXTHEME
+
+    if ( UseBgCol() || (GetMSWToolbarStyle() & TBSTYLE_TRANSPARENT) )
+    {
+        // do draw our background
+        //
+        // notice that this 'dumb' implementation may cause flicker for some of
+        // the controls in which case they should intercept wxEraseEvent and
+        // process it themselves somehow
+        AutoHBRUSH hBrush(wxColourToRGB(GetBackgroundColour()));
+
+        wxCHANGE_HDC_MAP_MODE(hdc, MM_TEXT);
+        ::FillRect(hdc, &rect, hBrush);
+    }
+    else // we have no non default background colour
+    {
+        // let the system do it for us
+        event.Skip();
+    }
+}
+
+bool wxToolBar::HandleSize(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
+{
+    // calculate our minor dimension ourselves - we're confusing the standard
+    // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
+    RECT r;
+    if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )
+    {
+        int w, h;
+
+        if ( IsVertical() )
+        {
+            w = r.right - r.left;
+            if ( m_maxRows )
+            {
+                w *= (m_nButtons + m_maxRows - 1)/m_maxRows;
+            }
+            h = HIWORD(lParam);
+        }
+        else
+        {
+            w = LOWORD(lParam);
+            if (HasFlag( wxTB_FLAT ))
+                h = r.bottom - r.top - 3;
+            else
+                h = r.bottom - r.top;
+            if ( m_maxRows )
+            {
+                // FIXME: hardcoded separator line height...
+                h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
+                h *= m_maxRows;
+            }
+        }
+
+        if ( MAKELPARAM(w, h) != lParam )
+        {
+            // size really changed
+            SetSize(w, h);
+        }
+
+        // message processed
+        return true;
+    }
+
+    return false;
+}
+
+bool wxToolBar::HandlePaint(WXWPARAM wParam, WXLPARAM lParam)
+{
+    // erase any dummy separators which were used
+    // for aligning the controls if any here
+
+    // first of all, are there any controls at all?
+    wxToolBarToolsList::compatibility_iterator node;
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        if ( node->GetData()->IsControl() )
+            break;
+    }
+
+    if ( !node )
+        // no controls, nothing to erase
+        return false;
+
+    wxSize clientSize = GetClientSize();
+    int majorVersion, minorVersion;
+    wxGetOsVersion(& majorVersion, & minorVersion);
+
+    // prepare the DC on which we'll be drawing
+    // prepare the DC on which we'll be drawing
+    wxClientDC dc(this);
+    dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
+    dc.SetPen(*wxTRANSPARENT_PEN);
+
+    RECT r;
+    if ( !::GetUpdateRect(GetHwnd(), &r, FALSE) )
+        // nothing to redraw anyhow
+        return false;
+
+    wxRect rectUpdate;
+    wxCopyRECTToRect(r, rectUpdate);
+
+    dc.SetClippingRegion(rectUpdate);
+
+    // draw the toolbar tools, separators &c normally
+    wxControl::MSWWindowProc(WM_PAINT, wParam, lParam);
+
+    // for each control in the toolbar find all the separators intersecting it
+    // and erase them
+    //
+    // NB: this is really the only way to do it as we don't know if a separator
+    //     corresponds to a control (i.e. is a dummy one) or a real one
+    //     otherwise
+    for ( node = m_tools.GetFirst(); node; node = node->GetNext() )
+    {
+        wxToolBarToolBase *tool = node->GetData();
+        if ( tool->IsControl() )
+        {
+            // get the control rect in our client coords
+            wxControl *control = tool->GetControl();
+            wxRect rectCtrl = control->GetRect();
+
+            // iterate over all buttons
+            TBBUTTON tbb;
+            int count = ::SendMessage(GetHwnd(), TB_BUTTONCOUNT, 0, 0);
+            for ( int n = 0; n < count; n++ )
+            {
+                // is it a separator?
+                if ( !::SendMessage(GetHwnd(), TB_GETBUTTON,
+                                    n, (LPARAM)&tbb) )
+                {
+                    wxLogDebug(_T("TB_GETBUTTON failed?"));
+
+                    continue;
+                }
+
+                if ( tbb.fsStyle != TBSTYLE_SEP )
+                    continue;
+
+                // get the bounding rect of the separator
+                RECT r;
+                if ( !::SendMessage(GetHwnd(), TB_GETITEMRECT,
+                                    n, (LPARAM)&r) )
+                {
+                    wxLogDebug(_T("TB_GETITEMRECT failed?"));
+
+                    continue;
+                }
+
+                // does it intersect the control?
+                wxRect rectItem;
+                wxCopyRECTToRect(r, rectItem);
+                if ( rectCtrl.Intersects(rectItem) )
+                {
+                    // yes, do erase it!
+
+                    bool haveRefreshed = false;
+
+#if wxUSE_UXTHEME
+                    if ( !UseBgCol() && !GetParent()->UseBgCol() )
+                    {
+                        // Don't use DrawThemeBackground
+                    }
+                    else if (!UseBgCol() && majorVersion >= 6 )
+                    {
+                        wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive();
+                        if ( theme )
+                        {
+                            wxUxThemeHandle hTheme(this, L"REBAR");
+
+                            RECT clipRect = r;
+
+                            // Draw the whole background since the pattern may be position sensitive;
+                            // but clip it to the area of interest.
+                            r.left = 0;
+                            r.right = clientSize.x;
+                            r.top = 0;
+                            r.bottom = clientSize.y;
+
+                            HRESULT hr = theme->DrawThemeBackground(hTheme, (HDC) dc.GetHDC(), 0, 0, & r, & clipRect);
+                            if ( hr == S_OK )
+                                haveRefreshed = true;
+                        }
+                    }
+#endif
+
+                    if (!haveRefreshed)
+                        dc.DrawRectangle(rectItem);
+
+                    // Necessary in case we use a no-paint-on-size
+                    // style in the parent: the controls can disappear
+                    control->Refresh(false);
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
+void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
+{
+    wxCoord x = GET_X_LPARAM(lParam),
+            y = GET_Y_LPARAM(lParam);
+    wxToolBarToolBase* tool = FindToolForPosition( x, y );
+
+    // cursor left current tool
+    if ( tool != m_pInTool && !tool )
+    {
+        m_pInTool = 0;
+        OnMouseEnter( -1 );
+    }
+
+    // cursor entered a tool
+    if ( tool != m_pInTool && tool )
+    {
+        m_pInTool = tool;
+        OnMouseEnter( tool->GetId() );
+    }
+}
+
+WXLRESULT wxToolBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    switch ( nMsg )
+    {
+        case WM_MOUSEMOVE:
+            // we don't handle mouse moves, so always pass the message to
+            // wxControl::MSWWindowProc (HandleMouseMove just calls OnMouseEnter)
+            HandleMouseMove(wParam, lParam);
+            break;
+
+        case WM_SIZE:
+            if ( HandleSize(wParam, lParam) )
+                return 0;
+            break;
+
+#ifndef __WXWINCE__
+        case WM_PAINT:
+            if ( HandlePaint(wParam, lParam) )
+                return 0;
+#endif
+
+        default:
+            break;
+    }
+
+    return wxControl::MSWWindowProc(nMsg, wParam, lParam);
+}
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+#ifdef wxREMAP_BUTTON_COLOURS
+
+WXHBITMAP wxToolBar::MapBitmap(WXHBITMAP bitmap, int width, int height)
+{
+    MemoryHDC hdcMem;
+
+    if ( !hdcMem )
+    {
+        wxLogLastError(_T("CreateCompatibleDC"));
+
+        return bitmap;
+    }
+
+    SelectInHDC bmpInHDC(hdcMem, (HBITMAP)bitmap);
+
+    if ( !bmpInHDC )
+    {
+        wxLogLastError(_T("SelectObject"));
+
+        return bitmap;
+    }
+
+    wxCOLORMAP *cmap = wxGetStdColourMap();
+
+    for ( int i = 0; i < width; i++ )
+    {
+        for ( int j = 0; j < height; j++ )
+        {
+            COLORREF pixel = ::GetPixel(hdcMem, i, j);
+
+            for ( size_t k = 0; k < wxSTD_COL_MAX; k++ )
+            {
+                COLORREF col = cmap[k].from;
+                if ( abs(GetRValue(pixel) - GetRValue(col)) < 10 &&
+                     abs(GetGValue(pixel) - GetGValue(col)) < 10 &&
+                     abs(GetBValue(pixel) - GetBValue(col)) < 10 )
+                {
+                    if ( cmap[k].to != pixel )
+                        ::SetPixel(hdcMem, i, j, cmap[k].to);
+                    break;
+                }
+            }
+        }
+    }
+
+    return bitmap;
+}
+
+#endif // wxREMAP_BUTTON_COLOURS
+
+#endif // wxUSE_TOOLBAR
diff --git a/Source/3rd Party/wx/src/msw/textctrl.cpp b/Source/3rd Party/wx/src/msw/textctrl.cpp
index a50a116ca..981cab89b 100644
--- a/Source/3rd Party/wx/src/msw/textctrl.cpp	
+++ b/Source/3rd Party/wx/src/msw/textctrl.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: textctrl.cpp 60394 2009-04-26 18:41:02Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -19,7 +19,6 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
-#include <Ole2.h>
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -31,7 +30,6 @@
     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
-    #include "wx/dcclient.h"
     #include "wx/utils.h"
     #include "wx/intl.h"
     #include "wx/log.h"
@@ -39,7 +37,6 @@
     #include "wx/menu.h"
     #include "wx/math.h"
     #include "wx/module.h"
-    #include "wx/wxcrtvararg.h"
 #endif
 
 #include "wx/sysopt.h"
@@ -79,15 +76,6 @@
 
 #include "wx/msw/missing.h"
 
-#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
-
-// dummy value used for m_dropTarget, different from any valid pointer value
-// (which are all even under Windows) and NULL
-static wxDropTarget *
-    wxRICHTEXT_DEFAULT_DROPTARGET = reinterpret_cast<wxDropTarget *>(1);
-
-#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -149,7 +137,7 @@ public:
         : m_count(count)
     {
         wxASSERT_MSG( m_count == -1 || m_count == -2,
-                      wxT("wrong initial m_updatesCount value") );
+                      _T("wrong initial m_updatesCount value") );
 
         if (m_count != -2)
             m_count = 0;
@@ -171,13 +159,83 @@ public:
 private:
     int& m_count;
 
-    wxDECLARE_NO_COPY_CLASS(UpdatesCountFilter);
+    DECLARE_NO_COPY_CLASS(UpdatesCountFilter)
 };
 
 // ----------------------------------------------------------------------------
 // event tables and other macros
 // ----------------------------------------------------------------------------
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxTextCtrlStyle )
+
+wxBEGIN_FLAGS( wxTextCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxTE_PROCESS_ENTER)
+    wxFLAGS_MEMBER(wxTE_PROCESS_TAB)
+    wxFLAGS_MEMBER(wxTE_MULTILINE)
+    wxFLAGS_MEMBER(wxTE_PASSWORD)
+    wxFLAGS_MEMBER(wxTE_READONLY)
+    wxFLAGS_MEMBER(wxHSCROLL)
+    wxFLAGS_MEMBER(wxTE_RICH)
+    wxFLAGS_MEMBER(wxTE_RICH2)
+    wxFLAGS_MEMBER(wxTE_AUTO_URL)
+    wxFLAGS_MEMBER(wxTE_NOHIDESEL)
+    wxFLAGS_MEMBER(wxTE_LEFT)
+    wxFLAGS_MEMBER(wxTE_CENTRE)
+    wxFLAGS_MEMBER(wxTE_RIGHT)
+    wxFLAGS_MEMBER(wxTE_DONTWRAP)
+    wxFLAGS_MEMBER(wxTE_CHARWRAP)
+    wxFLAGS_MEMBER(wxTE_WORDWRAP)
+
+wxEND_FLAGS( wxTextCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
+    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
+    wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
+
+    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Value , wxString , SetValue, GetValue, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxTextCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxTextCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle)
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
+#endif
+
+
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_KEY_DOWN(wxTextCtrl::OnKeyDown)
@@ -231,14 +289,6 @@ void wxTextCtrl::Init()
 
 wxTextCtrl::~wxTextCtrl()
 {
-#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
-    if ( m_dropTarget == wxRICHTEXT_DEFAULT_DROPTARGET )
-    {
-        // don't try to destroy this dummy pointer in the base class dtor
-        m_dropTarget = NULL;
-    }
-#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
-
     delete m_privateContextMenu;
 }
 
@@ -251,6 +301,15 @@ bool wxTextCtrl::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString& name)
 {
+#ifdef __WXWINCE__
+    if ((style & wxBORDER_MASK) == 0)
+        style |= wxBORDER_SIMPLE;
+#else
+    // Standard text control already handles theming
+    if ((style & (wxTE_RICH|wxTE_RICH2)) && ((style & wxBORDER_MASK) == wxBORDER_DEFAULT))
+        style |= wxBORDER_THEME;
+#endif
+
     // base initialization
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
@@ -258,34 +317,9 @@ bool wxTextCtrl::Create(wxWindow *parent,
     if ( !MSWCreateText(value, pos, size) )
         return false;
 
-#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
-    if ( IsRich() )
-    {
-        // rich text controls have a default associated drop target which
-        // allows them to receive (rich) text dropped on them, which is nice,
-        // but prevents us from associating a user-defined drop target with
-        // them as we need to unregister the old one first
-        //
-        // to make it work, we set m_dropTarget to this special value initially
-        // and check for it in our SetDropTarget()
-        m_dropTarget = wxRICHTEXT_DEFAULT_DROPTARGET;
-    }
-#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
-
     return true;
 }
 
-// returns true if the platform should explicitly apply a theme border
-bool wxTextCtrl::CanApplyThemeBorder() const
-{
-#ifdef __WXWINCE__
-    return false;
-#else
-    // Standard text control already handles theming
-    return ((GetWindowStyle() & (wxTE_RICH|wxTE_RICH2)) != 0);
-#endif
-}
-
 bool wxTextCtrl::MSWCreateText(const wxString& value,
                                const wxPoint& pos,
                                const wxSize& size)
@@ -356,26 +390,22 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
         }
 #endif
 
-#if wxUSE_INKEDIT
         if (!IsInkEdit())
-#endif // wxUSE_INKEDIT
         {
             if ( m_verRichEdit == 2 )
             {
                 if ( wxRichEditModule::Load(wxRichEditModule::Version_41) )
                 {
                     // yes, class name for version 4.1 really is 5.0
-                    windowClass = wxT("RICHEDIT50W");
-
-                    m_verRichEdit = 4;
+                    windowClass = _T("RICHEDIT50W");
                 }
                 else if ( wxRichEditModule::Load(wxRichEditModule::Version_2or3) )
                 {
-                    windowClass = wxT("RichEdit20")
+                    windowClass = _T("RichEdit20")
 #if wxUSE_UNICODE
-                                wxT("W");
+                                _T("W");
 #else // ANSI
-                                wxT("A");
+                                _T("A");
 #endif // Unicode/ANSI
                 }
                 else // failed to load msftedit.dll and riched20.dll
@@ -388,7 +418,7 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
             {
                 if ( wxRichEditModule::Load(wxRichEditModule::Version_1) )
                 {
-                    windowClass = wxT("RICHEDIT");
+                    windowClass = _T("RICHEDIT");
                 }
                 else // failed to load any richedit control DLL
                 {
@@ -420,19 +450,9 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
         valueWin = value;
     }
 
-    // suppress events sent during control creation: we're called either from
-    // the ctor and then we shouldn't generate any events for compatibility
-    // with the other ports, or from SetWindowStyleFlag() and then we shouldn't
-    // generate the events because our text doesn't really change, the fact
-    // that we (sometimes) need to recreate the control is just an
-    // implementation detail
-    m_updatesCount = -2;
-
-    if ( !MSWCreateControl(windowClass.t_str(), msStyle, pos, size, valueWin) )
+    if ( !MSWCreateControl(windowClass, msStyle, pos, size, valueWin) )
         return false;
 
-    m_updatesCount = -1;
-
 #if wxUSE_RICHEDIT
     if (IsRich())
     {
@@ -478,20 +498,7 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
 
         ::SendMessage(GetHwnd(), EM_SETEVENTMASK, 0, mask);
     }
-    else
 #endif // wxUSE_RICHEDIT
-    if ( HasFlag(wxTE_MULTILINE) && HasFlag(wxTE_READONLY) )
-    {
-        // non-rich read-only multiline controls have grey background by
-        // default under MSW but this is not always appropriate, so forcefully
-        // reset the background colour to normal default
-        //
-        // this is not ideal but, after a long discussion on wx-dev (see
-        // http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/116360/) it
-        // was finally deemed to be the best behaviour by default (and ideally
-        // we'd have a way to change this, see #11521)
-        SetBackgroundColour(GetClassDefaultAttributes().colBg);
-    }
 
 #ifndef __WXWINCE__
     // Without this, if we pass the size in the constructor and then don't change it,
@@ -516,16 +523,16 @@ void wxTextCtrl::AdoptAttributesFromHWND()
 #if wxUSE_RICHEDIT
     wxString classname = wxGetWindowClass(GetHWND());
 
-    if ( classname.IsSameAs(wxT("EDIT"), false /* no case */) )
+    if ( classname.IsSameAs(_T("EDIT"), false /* no case */) )
     {
         m_verRichEdit = 0;
     }
     else // rich edit?
     {
         wxChar c;
-        if ( wxSscanf(classname, wxT("RichEdit%d0%c"), &m_verRichEdit, &c) != 2 )
+        if ( wxSscanf(classname, _T("RichEdit%d0%c"), &m_verRichEdit, &c) != 2 )
         {
-            wxLogDebug(wxT("Unknown edit control '%s'."), classname.c_str());
+            wxLogDebug(_T("Unknown edit control '%s'."), classname.c_str());
 
             m_verRichEdit = 0;
         }
@@ -550,7 +557,7 @@ WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     long msStyle = wxControl::MSWGetStyle(style, exstyle);
 
-    // styles which we always add by default
+    // styles which we alaways add by default
     if ( style & wxTE_MULTILINE )
     {
         msStyle |= ES_MULTILINE | ES_WANTRETURN;
@@ -736,10 +743,10 @@ wxString wxTextCtrl::GetRange(long from, long to) const
                 wxFontEncoding encoding = wxFONTENCODING_SYSTEM;
 
                 wxFont font = m_defaultStyle.GetFont();
-                if ( !font.IsOk() )
+                if ( !font.Ok() )
                     font = GetFont();
 
-                if ( font.IsOk() )
+                if ( font.Ok() )
                 {
                    encoding = font.GetEncoding();
                 }
@@ -790,8 +797,8 @@ wxString wxTextCtrl::GetRange(long from, long to) const
                     // style - convert it to something reasonable
                     for ( ; *p; p++ )
                     {
-                        if ( *p == wxT('\r') )
-                            *p = wxT('\n');
+                        if ( *p == _T('\r') )
+                            *p = _T('\n');
                     }
                 }
             }
@@ -807,9 +814,8 @@ wxString wxTextCtrl::GetRange(long from, long to) const
     else
 #endif // wxUSE_RICHEDIT
     {
-        // retrieve all text: wxTextEntry method works even for multiline
-        // controls and must be used for single line ones to account for hints
-        str = wxTextEntry::GetValue();
+        // retrieve all text
+        str = wxGetWindowText(GetHWND());
 
         // need only a range?
         if ( from < to )
@@ -832,7 +838,7 @@ void wxTextCtrl::DoSetValue(const wxString& value, int flags)
     // comparing it with the old one (chances are that it will be different
     // anyhow, this comparison is there to avoid flicker for small single-line
     // edit controls mostly)
-    if ( (value.length() > 0x400) || (value != DoGetValue()) )
+    if ( (value.length() > 0x400) || (value != GetValue()) )
     {
         DoWriteText(value, flags /* doesn't include SelectionOnly here */);
 
@@ -862,7 +868,7 @@ void wxTextCtrl::DoSetValue(const wxString& value, int flags)
 // TODO: using memcpy() would improve performance a lot for big amounts of text
 
 DWORD CALLBACK
-wxRichEditStreamIn(DWORD_PTR dwCookie, BYTE *buf, LONG cb, LONG *pcb)
+wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb)
 {
     *pcb = 0;
 
@@ -935,21 +941,26 @@ wxTextCtrl::StreamIn(const wxString& value,
 #else // !wxUSE_UNICODE_MSLU
     wxCSConv conv(encoding);
 
-    const size_t len = conv.MB2WC(NULL, value.mb_str(), value.length());
+    const size_t len = conv.MB2WC(NULL, value, value.length());
 
     if (len == wxCONV_FAILED)
         return false;
 
+#if wxUSE_WCHAR_T
     wxWCharBuffer wchBuf(len); // allocates one extra character
     wchar_t *wpc = wchBuf.data();
+#else
+    wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t));
+    wchar_t *wpc = wchBuf;
+#endif
 
-    conv.MB2WC(wpc, value.mb_str(), len + 1);
+    conv.MB2WC(wpc, value, len + 1);
 #endif // wxUSE_UNICODE_MSLU
 
     // finally, stream it in the control
     EDITSTREAM eds;
     wxZeroMemory(eds);
-    eds.dwCookie = (DWORD_PTR)&wpc;
+    eds.dwCookie = (DWORD)&wpc;
     // the cast below is needed for broken (very) old mingw32 headers
     eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn;
 
@@ -965,13 +976,17 @@ wxTextCtrl::StreamIn(const wxString& value,
     // It's okay for EN_UPDATE to not be sent if the selection is empty and
     // the text is empty, otherwise warn the programmer about it.
     wxASSERT_MSG( ucf.GotUpdate() || ( !HasSelection() && value.empty() ),
-                  wxT("EM_STREAMIN didn't send EN_UPDATE?") );
+                  _T("EM_STREAMIN didn't send EN_UPDATE?") );
 
     if ( eds.dwError )
     {
-        wxLogLastError(wxT("EM_STREAMIN"));
+        wxLogLastError(_T("EM_STREAMIN"));
     }
 
+#if !wxUSE_WCHAR_T
+    free(wchBuf);
+#endif // !wxUSE_WCHAR_T
+
     return true;
 }
 
@@ -984,8 +999,13 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
 
     const int len = GetWindowTextLength(GetHwnd());
 
+#if wxUSE_WCHAR_T
     wxWCharBuffer wchBuf(len);
     wchar_t *wpc = wchBuf.data();
+#else
+    wchar_t *wchBuf = (wchar_t *)malloc((len + 1)*sizeof(wchar_t));
+    wchar_t *wpc = wchBuf;
+#endif
 
     wxStreamOutData data;
     data.wpc = wpc;
@@ -1006,7 +1026,7 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
 
     if ( eds.dwError )
     {
-        wxLogLastError(wxT("EM_STREAMOUT"));
+        wxLogLastError(_T("EM_STREAMOUT"));
     }
     else // streamed out ok
     {
@@ -1025,6 +1045,10 @@ wxTextCtrl::StreamOut(wxFontEncoding encoding, bool selectionOnly) const
         }
     }
 
+#if !wxUSE_WCHAR_T
+    free(wchBuf);
+#endif // !wxUSE_WCHAR_T
+
     return out;
 }
 
@@ -1074,10 +1098,10 @@ void wxTextCtrl::DoWriteText(const wxString& value, int flags)
         if ( GetRichVersion() > 1 )
         {
             wxFont font = m_defaultStyle.GetFont();
-            if ( !font.IsOk() )
+            if ( !font.Ok() )
                 font = GetFont();
 
-            if ( font.IsOk() )
+            if ( font.Ok() )
             {
                wxFontEncoding encoding = font.GetEncoding();
                if ( encoding != wxFONTENCODING_SYSTEM )
@@ -1110,7 +1134,7 @@ void wxTextCtrl::DoWriteText(const wxString& value, int flags)
 
         ::SendMessage(GetHwnd(), selectionOnly ? EM_REPLACESEL : WM_SETTEXT,
                       // EM_REPLACESEL takes 1 to indicate the operation should be redoable
-                      selectionOnly ? 1 : 0, wxMSW_CONV_LPARAM(valueDos));
+                      selectionOnly ? 1 : 0, (LPARAM)valueDos.c_str());
 
         if ( !ucf.GotUpdate() && (flags & SetValue_SendEvent) )
         {
@@ -1121,13 +1145,17 @@ void wxTextCtrl::DoWriteText(const wxString& value, int flags)
 
 void wxTextCtrl::AppendText(const wxString& text)
 {
-    wxTextEntry::AppendText(text);
+    SetInsertionPointEnd();
+
+    WriteText(text);
 
 #if wxUSE_RICHEDIT
     // don't do this if we're frozen, saves some time
     if ( !IsFrozen() && IsMultiLine() && GetRichVersion() > 1 )
     {
-        ::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, (LPARAM)NULL);
+        // setting the caret to the end and showing it simply doesn't work for
+        // RichEdit 2.0 -- force it to still do what we want
+        ::SendMessage(GetHwnd(), EM_LINESCROLL, 0, GetNumberOfLines());
     }
 #endif // wxUSE_RICHEDIT
 }
@@ -1136,12 +1164,18 @@ void wxTextCtrl::Clear()
 {
     ::SetWindowText(GetHwnd(), wxEmptyString);
 
-    if ( IsMultiLine() && !IsRich() )
+#if wxUSE_RICHEDIT
+    if ( !IsRich() )
+#endif // wxUSE_RICHEDIT
     {
         // rich edit controls send EN_UPDATE from WM_SETTEXT handler themselves
         // but the normal ones don't -- make Clear() behaviour consistent by
         // always sending this event
-        SendUpdateEvent();
+
+        // Windows already sends an update event for single-line
+        // controls.
+        if ( m_windowStyle & wxTE_MULTILINE )
+            SendUpdateEvent();
     }
 }
 
@@ -1164,10 +1198,91 @@ bool wxTextCtrl::EmulateKeyPress(const wxKeyEvent& event)
 
 #endif // __WIN32__
 
+// ----------------------------------------------------------------------------
+// Clipboard operations
+// ----------------------------------------------------------------------------
+
+void wxTextCtrl::Copy()
+{
+    if (CanCopy())
+    {
+        ::SendMessage(GetHwnd(), WM_COPY, 0, 0L);
+    }
+}
+
+void wxTextCtrl::Cut()
+{
+    if (CanCut())
+    {
+        ::SendMessage(GetHwnd(), WM_CUT, 0, 0L);
+    }
+}
+
+void wxTextCtrl::Paste()
+{
+    if (CanPaste())
+    {
+        ::SendMessage(GetHwnd(), WM_PASTE, 0, 0L);
+    }
+}
+
+bool wxTextCtrl::HasSelection() const
+{
+    long from, to;
+    GetSelection(&from, &to);
+    return from != to;
+}
+
+bool wxTextCtrl::CanCopy() const
+{
+    // Can copy if there's a selection
+    return HasSelection();
+}
+
+bool wxTextCtrl::CanCut() const
+{
+    return CanCopy() && IsEditable();
+}
+
+bool wxTextCtrl::CanPaste() const
+{
+    if ( !IsEditable() )
+        return false;
+
+#if wxUSE_RICHEDIT
+    if ( IsRich() )
+    {
+        UINT cf = 0; // 0 == any format
+
+        return ::SendMessage(GetHwnd(), EM_CANPASTE, cf, 0) != 0;
+    }
+#endif // wxUSE_RICHEDIT
+
+    // Standard edit control: check for straight text on clipboard
+    if ( !::OpenClipboard(GetHwndOf(wxTheApp->GetTopWindow())) )
+        return false;
+
+    bool isTextAvailable = ::IsClipboardFormatAvailable(CF_TEXT) != 0;
+    ::CloseClipboard();
+
+    return isTextAvailable;
+}
+
 // ----------------------------------------------------------------------------
 // Accessors
 // ----------------------------------------------------------------------------
 
+void wxTextCtrl::SetEditable(bool editable)
+{
+    HWND hWnd = GetHwnd();
+    ::SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
+}
+
+void wxTextCtrl::SetInsertionPoint(long pos)
+{
+    DoSetSelection(pos, pos);
+}
+
 void wxTextCtrl::SetInsertionPointEnd()
 {
     // we must not do anything if the caret is already there because calling
@@ -1181,7 +1296,21 @@ void wxTextCtrl::SetInsertionPointEnd()
         return;
     }
 
-    SetInsertionPoint(lastPosition);
+    long pos;
+
+#if wxUSE_RICHEDIT
+    if ( m_verRichEdit == 1 )
+    {
+        // we don't have to waste time calling GetLastPosition() in this case
+        pos = -1;
+    }
+    else // !RichEdit 1.0
+#endif // wxUSE_RICHEDIT
+    {
+        pos = lastPosition;
+    }
+
+    SetInsertionPoint(pos);
 }
 
 long wxTextCtrl::GetInsertionPoint() const
@@ -1197,27 +1326,23 @@ long wxTextCtrl::GetInsertionPoint() const
     }
 #endif // wxUSE_RICHEDIT
 
-    return wxTextEntry::GetInsertionPoint();
+    DWORD Pos = (DWORD)::SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);
+    return Pos & 0xFFFF;
 }
 
 wxTextPos wxTextCtrl::GetLastPosition() const
 {
-    if ( IsMultiLine() )
-    {
-        int numLines = GetNumberOfLines();
-        long posStartLastLine = XYToPosition(0, numLines - 1);
+    int numLines = GetNumberOfLines();
+    long posStartLastLine = XYToPosition(0, numLines - 1);
 
-        long lenLastLine = GetLengthOfLineContainingPos(posStartLastLine);
+    long lenLastLine = GetLengthOfLineContainingPos(posStartLastLine);
 
-        return posStartLastLine + lenLastLine;
-    }
-
-    return wxTextEntry::GetLastPosition();
+    return posStartLastLine + lenLastLine;
 }
 
 // If the return values from and to are the same, there is no
 // selection.
-void wxTextCtrl::GetSelection(long *from, long *to) const
+void wxTextCtrl::GetSelection(long* from, long* to) const
 {
 #if wxUSE_RICHEDIT
     if ( IsRich() )
@@ -1231,40 +1356,63 @@ void wxTextCtrl::GetSelection(long *from, long *to) const
     else
 #endif // !wxUSE_RICHEDIT
     {
-        wxTextEntry::GetSelection(from, to);
+        DWORD dwStart, dwEnd;
+        ::SendMessage(GetHwnd(), EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd);
+
+        *from = dwStart;
+        *to = dwEnd;
     }
 }
 
+bool wxTextCtrl::IsEditable() const
+{
+    // strangely enough, we may be called before the control is created: our
+    // own Create() calls MSWGetStyle() which calls AcceptsFocus() which calls
+    // us
+    if ( !m_hWnd )
+        return true;
+
+    long style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+
+    return (style & ES_READONLY) == 0;
+}
+
 // ----------------------------------------------------------------------------
 // selection
 // ----------------------------------------------------------------------------
 
-void wxTextCtrl::DoSetSelection(long from, long to, int flags)
+void wxTextCtrl::SetSelection(long from, long to)
+{
+    // if from and to are both -1, it means (in wxWidgets) that all text should
+    // be selected - translate into Windows convention
+    if ( (from == -1) && (to == -1) )
+    {
+        from = 0;
+        to = -1;
+    }
+
+    DoSetSelection(from, to);
+}
+
+void wxTextCtrl::DoSetSelection(long from, long to, bool scrollCaret)
 {
     HWND hWnd = GetHwnd();
 
 #if wxUSE_RICHEDIT
     if ( IsRich() )
     {
-        // if from and to are both -1, it means (in wxWidgets) that all text
-        // should be selected, translate this into Windows convention
-        if ( (from == -1) && (to == -1) )
-        {
-            from = 0;
-        }
-
         CHARRANGE range;
         range.cpMin = from;
         range.cpMax = to;
-        ::SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM)&range);
+        ::SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM) &range);
     }
     else
 #endif // wxUSE_RICHEDIT
     {
-        wxTextEntry::DoSetSelection(from, to, flags);
+        ::SendMessage(hWnd, EM_SETSEL, (WPARAM)from, (LPARAM)to);
     }
 
-    if ( (flags & SetSel_Scroll) && !IsFrozen() )
+    if ( scrollCaret && !IsFrozen() )
     {
 #if wxUSE_RICHEDIT
         // richedit 3.0 (i.e. the version living in riched20.dll distributed
@@ -1298,7 +1446,7 @@ void wxTextCtrl::DoSetSelection(long from, long to, int flags)
         }
 #endif // wxUSE_RICHEDIT
 
-        ::SendMessage(hWnd, EM_SCROLLCARET, 0, (LPARAM)0);
+        ::SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
 
 #if wxUSE_RICHEDIT
         // restore ECO_NOHIDESEL if we changed it
@@ -1331,9 +1479,22 @@ bool wxTextCtrl::DoLoadFile(const wxString& file, int fileType)
 }
 
 // ----------------------------------------------------------------------------
-// dirty status
+// Editing
 // ----------------------------------------------------------------------------
 
+void wxTextCtrl::Replace(long from, long to, const wxString& value)
+{
+    // Set selection and remove it
+    DoSetSelection(from, to, false /* don't scroll caret into view */);
+
+    DoWriteText(value);
+}
+
+void wxTextCtrl::Remove(long from, long to)
+{
+    Replace(from, to, wxEmptyString);
+}
+
 bool wxTextCtrl::IsModified() const
 {
     return ::SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0;
@@ -1341,27 +1502,27 @@ bool wxTextCtrl::IsModified() const
 
 void wxTextCtrl::MarkDirty()
 {
-    ::SendMessage(GetHwnd(), EM_SETMODIFY, TRUE, 0);
+    ::SendMessage(GetHwnd(), EM_SETMODIFY, TRUE, 0L);
 }
 
 void wxTextCtrl::DiscardEdits()
 {
-    ::SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0);
+    ::SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);
+}
+
+int wxTextCtrl::GetNumberOfLines() const
+{
+    return (int)::SendMessage(GetHwnd(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
 }
 
 // ----------------------------------------------------------------------------
 // Positions <-> coords
 // ----------------------------------------------------------------------------
 
-int wxTextCtrl::GetNumberOfLines() const
-{
-    return (int)::SendMessage(GetHwnd(), EM_GETLINECOUNT, 0, 0);
-}
-
 long wxTextCtrl::XYToPosition(long x, long y) const
 {
     // This gets the char index for the _beginning_ of this line
-    long charIndex = ::SendMessage(GetHwnd(), EM_LINEINDEX, y, 0);
+    long charIndex = ::SendMessage(GetHwnd(), EM_LINEINDEX, (WPARAM)y, (LPARAM)0);
 
     return charIndex + x;
 }
@@ -1375,12 +1536,12 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 #if wxUSE_RICHEDIT
     if ( IsRich() )
     {
-        lineNo = ::SendMessage(hWnd, EM_EXLINEFROMCHAR, 0, pos);
+        lineNo = ::SendMessage(hWnd, EM_EXLINEFROMCHAR, 0, (LPARAM)pos);
     }
     else
 #endif // wxUSE_RICHEDIT
     {
-        lineNo = ::SendMessage(hWnd, EM_LINEFROMCHAR, pos, 0);
+        lineNo = ::SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, 0);
     }
 
     if ( lineNo == -1 )
@@ -1390,7 +1551,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
     }
 
     // This gets the char index for the _beginning_ of this line
-    long charIndex = ::SendMessage(hWnd, EM_LINEINDEX, lineNo, 0);
+    long charIndex = ::SendMessage(hWnd, EM_LINEINDEX, (WPARAM)lineNo, (LPARAM)0);
     if ( charIndex == -1 )
     {
         return false;
@@ -1491,93 +1652,6 @@ wxTextCtrl::HitTest(const wxPoint& pt, long *posOut) const
     return rc;
 }
 
-wxPoint wxTextCtrl::DoPositionToCoords(long pos) const
-{
-    // FIXME: This code is broken for rich edit version 2.0 as it uses the same
-    // API as plain edit i.e. the coordinates are returned directly instead of
-    // filling the POINT passed as WPARAM with them but we can't distinguish
-    // between 2.0 and 3.0 unfortunately (see also the use of EM_POSFROMCHAR
-    // above).
-#if wxUSE_RICHEDIT
-    if ( IsRich() )
-    {
-        POINT pt;
-        LRESULT rc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, (WPARAM)&pt, pos);
-        if ( rc != -1 )
-            return wxPoint(pt.x, pt.y);
-    }
-    else
-#endif // wxUSE_RICHEDIT
-    {
-        LRESULT rc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, pos, 0);
-        if ( rc == -1 )
-        {
-            // Finding coordinates for the last position of the control fails
-            // in plain EDIT control, try to compensate for it by finding it
-            // ourselves from the position of the previous character.
-            if ( pos < GetLastPosition() )
-            {
-                // It's not the expected correctable failure case so just fail.
-                return wxDefaultPosition;
-            }
-
-            if ( pos == 0 )
-            {
-                // We're being asked the coordinates of the first (and last and
-                // only) position in an empty control. There is no way to get
-                // it directly with EM_POSFROMCHAR but EM_GETMARGINS returns
-                // the correct value for at least the horizontal offset.
-                rc = ::SendMessage(GetHwnd(), EM_GETMARGINS, 0, 0);
-
-                // Text control seems to effectively add 1 to margin.
-                return wxPoint(LOWORD(rc) + 1, 1);
-            }
-
-            // We do have a previous character, try to get its coordinates.
-            rc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, pos - 1, 0);
-            if ( rc == -1 )
-            {
-                // If getting coordinates of the previous character failed as
-                // well, just give up.
-                return wxDefaultPosition;
-            }
-
-            wxString prevChar = GetRange(pos - 1, pos);
-            wxSize prevCharSize = GetTextExtent(prevChar);
-
-            if ( prevChar == wxT("\n" ))
-            {
-                // 'pos' is at the beginning of a new line so its X coordinate
-                // should be the same as X coordinate of the first character of
-                // any other line while its Y coordinate will be approximately
-                // (but we can't compute it exactly...) one character height
-                // more than that of the previous character.
-                LRESULT coords0 = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, 0, 0);
-                if ( coords0 == -1 )
-                    return wxDefaultPosition;
-
-                rc = MAKELPARAM(LOWORD(coords0), HIWORD(rc) + prevCharSize.y);
-            }
-            else
-            {
-                // Simple case: previous character is in the same line so this
-                // one is just after it.
-                rc += MAKELPARAM(prevCharSize.x, 0);
-            }
-        }
-
-        // Notice that {LO,HI}WORD macros return WORDs, i.e. unsigned shorts,
-        // while we want to have signed values here (the y coordinate of any
-        // position above the first currently visible line is negative, for
-        // example), hence the need for casts.
-        return wxPoint(static_cast<short>(LOWORD(rc)),
-                        static_cast<short>(HIWORD(rc)));
-    }
-
-    return wxDefaultPosition;
-}
-
-
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
@@ -1595,21 +1669,21 @@ void wxTextCtrl::ShowPosition(long pos)
 
     // Is this where scrolling is relative to - the line containing the caret?
     // Or is the first visible line??? Try first visible line.
-//    int currentLineLineNo1 = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, -1, 0L);
+//    int currentLineLineNo1 = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0L);
 
-    int currentLineLineNo = (int)::SendMessage(hWnd, EM_GETFIRSTVISIBLELINE, 0, 0);
+    int currentLineLineNo = (int)::SendMessage(hWnd, EM_GETFIRSTVISIBLELINE, (WPARAM)0, (LPARAM)0L);
 
-    int specifiedLineLineNo = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, pos, 0);
+    int specifiedLineLineNo = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0L);
 
     int linesToScroll = specifiedLineLineNo - currentLineLineNo;
 
     if (linesToScroll != 0)
-      ::SendMessage(hWnd, EM_LINESCROLL, 0, linesToScroll);
+      (void)::SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)linesToScroll);
 }
 
 long wxTextCtrl::GetLengthOfLineContainingPos(long pos) const
 {
-    return ::SendMessage(GetHwnd(), EM_LINELENGTH, pos, 0);
+    return ::SendMessage(GetHwnd(), EM_LINELENGTH, (WPARAM)pos, 0);
 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
@@ -1640,24 +1714,24 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
         {
             // remove the '\r' returned by the rich edit control, the user code
             // should never see it
-            if ( buf[len - 2] == wxT('\r') && buf[len - 1] == wxT('\n') )
+            if ( buf[len - 2] == _T('\r') && buf[len - 1] == _T('\n') )
             {
                 // richedit 1.0 uses "\r\n" as line terminator, so remove "\r"
                 // here and "\n" below
-                buf[len - 2] = wxT('\n');
+                buf[len - 2] = _T('\n');
                 len--;
             }
-            else if ( buf[len - 1] == wxT('\r') )
+            else if ( buf[len - 1] == _T('\r') )
             {
                 // richedit 2.0+ uses only "\r", replace it with "\n"
-                buf[len - 1] = wxT('\n');
+                buf[len - 1] = _T('\n');
             }
         }
 #endif // wxUSE_RICHEDIT
 
         // remove the '\n' at the end, if any (this is how this function is
         // supposed to work according to the docs)
-        if ( buf[len - 1] == wxT('\n') )
+        if ( buf[len - 1] == _T('\n') )
         {
             len--;
         }
@@ -1679,7 +1753,14 @@ void wxTextCtrl::SetMaxLength(unsigned long len)
     else
 #endif // wxUSE_RICHEDIT
     {
-        wxTextEntry::SetMaxLength(len);
+        if ( len >= 0xffff )
+        {
+            // this will set it to a platform-dependent maximum (much more
+            // than 64Kb under NT)
+            len = 0;
+        }
+
+        ::SendMessage(GetHwnd(), EM_LIMITTEXT, len, 0);
     }
 }
 
@@ -1687,27 +1768,41 @@ void wxTextCtrl::SetMaxLength(unsigned long len)
 // Undo/redo
 // ----------------------------------------------------------------------------
 
+void wxTextCtrl::Undo()
+{
+    if (CanUndo())
+    {
+        ::SendMessage(GetHwnd(), EM_UNDO, 0, 0);
+    }
+}
+
 void wxTextCtrl::Redo()
 {
-#if wxUSE_RICHEDIT
-    if ( GetRichVersion() > 1 )
+    if (CanRedo())
     {
-        ::SendMessage(GetHwnd(), EM_REDO, 0, 0);
-        return;
+#if wxUSE_RICHEDIT
+        if (GetRichVersion() > 1)
+            ::SendMessage(GetHwnd(), EM_REDO, 0, 0);
+        else
+#endif
+        // Same as Undo, since Undo undoes the undo, i.e. a redo.
+        ::SendMessage(GetHwnd(), EM_UNDO, 0, 0);
     }
-#endif // wxUSE_RICHEDIT
+}
 
-    wxTextEntry::Redo();
+bool wxTextCtrl::CanUndo() const
+{
+    return ::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
 #if wxUSE_RICHEDIT
-    if ( GetRichVersion() > 1 )
+    if (GetRichVersion() > 1)
         return ::SendMessage(GetHwnd(), EM_CANREDO, 0, 0) != 0;
-#endif // wxUSE_RICHEDIT
-
-    return wxTextEntry::CanRedo();
+    else
+#endif
+    return ::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -1721,7 +1816,7 @@ bool wxTextCtrl::ShowNativeCaret(bool show)
         if ( !(show ? ::ShowCaret(GetHwnd()) : ::HideCaret(GetHwnd())) )
         {
             // not an error, may simply indicate that it's not shown/hidden
-            // yet (i.e. it had been hidden/shown 2 times before)
+            // yet (i.e. it had been hidden/showh 2 times before)
             return false;
         }
 
@@ -1732,7 +1827,7 @@ bool wxTextCtrl::ShowNativeCaret(bool show)
 }
 
 // ----------------------------------------------------------------------------
-// implementation details
+// implemenation details
 // ----------------------------------------------------------------------------
 
 void wxTextCtrl::Command(wxCommandEvent & event)
@@ -1778,23 +1873,12 @@ bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
             switch ( ctrl + shift )
             {
                 default:
-                    wxFAIL_MSG( wxT("how many modifiers have we got?") );
+                    wxFAIL_MSG( _T("how many modifiers have we got?") );
                     // fall through
 
                 case 0:
-                    switch ( vkey )
-                    {
-                        case VK_RETURN:
-                            // This one is only special for multi line controls.
-                            if ( !IsMultiLine() )
-                                break;
-                            // fall through
-
-                        case VK_DELETE:
-                        case VK_HOME:
-                        case VK_END:
-                            return false;
-                    }
+                    if ( IsMultiLine() && vkey == VK_RETURN )
+                        return false;
                     // fall through
                 case 2:
                     break;
@@ -1836,7 +1920,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
                 InitCommandEvent(event);
                 event.SetString(GetValue());
-                if ( HandleWindowEvent(event) )
+                if ( GetEventHandler()->ProcessEvent(event) )
                 if ( !HasFlag(wxTE_MULTILINE) )
                     return;
                 //else: multiline controls need Enter for themselves
@@ -1910,20 +1994,25 @@ void wxTextCtrl::OnKeyDown(wxKeyEvent& event)
         }
     }
 
-    // Default window procedure of multiline edit controls posts WM_CLOSE to
-    // the parent window when it gets Escape key press for some reason, prevent
-    // it from doing this as this resulted in dialog boxes being closed on
-    // Escape even when they shouldn't be (we do handle Escape ourselves
-    // correctly in the situations when it should close them).
-    if ( event.GetKeyCode() == WXK_ESCAPE && IsMultiLine() )
-        return;
-
     // no, we didn't process it
     event.Skip();
 }
 
 WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
+    // we must handle clipboard events before calling MSWWindowProc, otherwise
+    // the event would be handled twice if there's a handler for it in user
+    // code:
+    switch ( nMsg )
+    {
+        case WM_CUT:
+        case WM_COPY:
+        case WM_PASTE:
+            if ( HandleClipboardEvent(nMsg) )
+                return 0;
+            break;
+    }
+
     WXLRESULT lRc = wxTextCtrlBase::MSWWindowProc(nMsg, wParam, lParam);
 
     switch ( nMsg )
@@ -1958,32 +2047,14 @@ WXLRESULT wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
                 else // !editable
                 {
                     // NB: use "=", not "|=" as the base class version returns
-                    //     the same flags in the disabled state as usual (i.e.
+                    //     the same flags is this state as usual (i.e.
                     //     including DLGC_WANTMESSAGE). This is strange (how
                     //     does it work in the native Win32 apps?) but for now
                     //     live with it.
                     lRc = lDlgCode;
                 }
-                if (IsMultiLine())
-                    // Clear the DLGC_HASSETSEL bit from the return value
-                    lRc &= ~DLGC_HASSETSEL;
             }
             break;
-
-#if wxUSE_MENUS
-        case WM_SETCURSOR:
-            // rich text controls seem to have a bug and don't change the
-            // cursor to the standard arrow one from the I-beam cursor usually
-            // used by them even when a popup menu is shown (this works fine
-            // for plain EDIT controls though), so explicitly work around this
-            if ( IsRich() )
-            {
-                extern wxMenu *wxCurrentPopupMenu;
-                if ( wxCurrentPopupMenu &&
-                        wxCurrentPopupMenu->GetInvokingWindow() == this )
-                    ::SetCursor(GetHcursorOf(*wxSTANDARD_CURSOR));
-            }
-#endif // wxUSE_MENUS
     }
 
     return lRc;
@@ -2007,7 +2078,7 @@ bool wxTextCtrl::SendUpdateEvent()
             return false;
 
         default:
-            wxFAIL_MSG( wxT("unexpected wxTextCtrl::m_updatesCount value") );
+            wxFAIL_MSG( _T("unexpected wxTextCtrl::m_updatesCount value") );
             // fall through
 
         case -1:
@@ -2021,13 +2092,27 @@ bool wxTextCtrl::SendUpdateEvent()
             return false;
     }
 
-    return SendTextUpdatedEvent();
+    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+    InitCommandEvent(event);
+
+    return ProcessCommand(event);
 }
 
 bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
     switch ( param )
     {
+        case EN_SETFOCUS:
+        case EN_KILLFOCUS:
+            {
+                wxFocusEvent event(param == EN_KILLFOCUS ? wxEVT_KILL_FOCUS
+                                                         : wxEVT_SET_FOCUS,
+                                   m_windowId);
+                event.SetEventObject(this);
+                GetEventHandler()->ProcessEvent(event);
+            }
+            break;
+
         case EN_CHANGE:
             SendUpdateEvent();
             break;
@@ -2043,9 +2128,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             }
             break;
 
-            // the other edit notification messages are not processed (or, in
-            // the case of EN_{SET/KILL}FOCUS were already handled at WM_SET/
-            // KILLFOCUS level)
+            // the other edit notification messages are not processed
         default:
             return false;
     }
@@ -2056,7 +2139,7 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 
 WXHBRUSH wxTextCtrl::MSWControlColor(WXHDC hDC, WXHWND hWnd)
 {
-    if ( !IsThisEnabled() && !HasFlag(wxTE_MULTILINE) )
+    if ( !IsEnabled() && !HasFlag(wxTE_MULTILINE) )
         return MSWControlColorDisabled(hDC);
 
     return wxTextCtrlBase::MSWControlColor(hDC, hWnd);
@@ -2098,7 +2181,7 @@ bool wxTextCtrl::AdjustSpaceLimit()
     return true;
 }
 
-bool wxTextCtrl::AcceptsFocusFromKeyboard() const
+bool wxTextCtrl::AcceptsFocus() const
 {
     // we don't want focus if we can't be edited unless we're a multiline
     // control because then it might be still nice to get focus from keyboard
@@ -2120,17 +2203,9 @@ wxSize wxTextCtrl::DoGetBestSize() const
     }
     //else: for single line control everything is ok
 
-    // Text controls without border are special and have the same height as
-    // static labels (they also have the same appearance when they're disable
-    // and are often used as a sort of copyable to the clipboard label so it's
-    // important that they have the same height as the normal labels to not
-    // stand out).
-    if ( !HasFlag(wxBORDER_NONE) )
-    {
-        // we have to add the adjustments for the control height only once, not
-        // once per line, so do it after multiplication above
-        hText += EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) - cy;
-    }
+    // we have to add the adjustments for the control height only once, not
+    // once per line, so do it after multiplication above
+    hText += EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) - cy;
 
     return wxSize(wText, hText);
 }
@@ -2166,12 +2241,15 @@ void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))
 
 void wxTextCtrl::OnDelete(wxCommandEvent& WXUNUSED(event))
 {
-    RemoveSelection();
+    long from, to;
+    GetSelection(& from, & to);
+    if (from != -1 && to != -1)
+        Remove(from, to);
 }
 
 void wxTextCtrl::OnSelectAll(wxCommandEvent& WXUNUSED(event))
 {
-    SelectAll();
+    SetSelection(-1, -1);
 }
 
 void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event)
@@ -2201,12 +2279,14 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 
 void wxTextCtrl::OnUpdateDelete(wxUpdateUIEvent& event)
 {
-    event.Enable( HasSelection() && IsEditable() );
+    long from, to;
+    GetSelection(& from, & to);
+    event.Enable(from != -1 && to != -1 && from != to && IsEditable()) ;
 }
 
 void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
 {
-    event.Enable( !IsEmpty() );
+    event.Enable(GetLastPosition() > 0);
 }
 
 void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
@@ -2246,6 +2326,23 @@ void wxTextCtrl::OnSetFocus(wxFocusEvent& event)
     event.Skip();
 }
 
+// ----------------------------------------------------------------------------
+// Default colors for MSW text control
+//
+// Set default background color to the native white instead of
+// the default wxSYS_COLOUR_BTNFACE (is triggered with wxNullColour).
+// ----------------------------------------------------------------------------
+
+wxVisualAttributes wxTextCtrl::GetDefaultAttributes() const
+{
+    wxVisualAttributes attrs;
+    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); //white
+
+    return attrs;
+}
+
 // the rest of the file only deals with the rich edit controls
 #if wxUSE_RICHEDIT
 
@@ -2349,22 +2446,6 @@ bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     return wxTextCtrlBase::MSWOnNotify(idCtrl, lParam, result);
 }
 
-#if wxUSE_DRAG_AND_DROP
-
-void wxTextCtrl::SetDropTarget(wxDropTarget *dropTarget)
-{
-    if ( m_dropTarget == wxRICHTEXT_DEFAULT_DROPTARGET )
-    {
-        // get rid of the built-in drop target
-        ::RevokeDragDrop(GetHwnd());
-        m_dropTarget = NULL;
-    }
-
-    wxTextCtrlBase::SetDropTarget(dropTarget);
-}
-
-#endif // wxUSE_DRAG_AND_DROP
-
 // ----------------------------------------------------------------------------
 // colour setting for the rich edit controls
 // ----------------------------------------------------------------------------
@@ -2398,7 +2479,9 @@ bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
     if ( IsRich() )
     {
         // change the colour of everything
-        WinStruct<CHARFORMAT> cf;
+        CHARFORMAT cf;
+        wxZeroMemory(cf);
+        cf.cbSize = sizeof(cf);
         cf.dwMask = CFM_COLOR;
         cf.crTextColor = wxColourToRGB(colour);
         ::SendMessage(GetHwnd(), EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);
@@ -2407,31 +2490,52 @@ bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
     return true;
 }
 
-bool wxTextCtrl::SetFont(const wxFont& font)
-{
-    if ( !wxTextCtrlBase::SetFont(font) )
-        return false;
-
-    if ( GetRichVersion() >= 4 )
-    {
-        // Using WM_SETFONT is not enough with RichEdit 4.1: it does work but
-        // for ASCII characters only and inserting a non-ASCII one into it
-        // later reverts to the default font so use EM_SETCHARFORMAT to change
-        // the default font for it.
-        wxTextAttr attr;
-        attr.SetFont(font);
-        SetStyle(-1, -1, attr);
-    }
-
-    return true;
-}
-
 // ----------------------------------------------------------------------------
 // styling support for rich edit controls
 // ----------------------------------------------------------------------------
 
-bool wxTextCtrl::MSWSetCharFormat(const wxTextAttr& style, long start, long end)
+#if wxUSE_RICHEDIT
+
+bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
 {
+    if ( !IsRich() )
+    {
+        // can't do it with normal text control
+        return false;
+    }
+
+    // the richedit 1.0 doesn't handle setting background colour, so don't
+    // even try to do anything if it's the only thing we want to change
+    if ( m_verRichEdit == 1 && !style.HasFont() && !style.HasTextColour() &&
+        !style.HasLeftIndent() && !style.HasRightIndent() && !style.HasAlignment() &&
+        !style.HasTabs() )
+    {
+        // nothing to do: return true if there was really nothing to do and
+        // false if we failed to set bg colour
+        return !style.HasBackgroundColour();
+    }
+
+    // order the range if needed
+    if ( start > end )
+    {
+        long tmp = start;
+        start = end;
+        end = tmp;
+    }
+
+    // we can only change the format of the selection, so select the range we
+    // want and restore the old selection later
+    long startOld, endOld;
+    GetSelection(&startOld, &endOld);
+
+    // but do we really have to change the selection?
+    bool changeSel = start != startOld || end != endOld;
+
+    if ( changeSel )
+    {
+        DoSetSelection(start, end, false /* don't scroll caret into view */);
+    }
+
     // initialize CHARFORMAT struct
 #if wxUSE_RICHEDIT2
     CHARFORMAT2 cf;
@@ -2468,15 +2572,12 @@ bool wxTextCtrl::MSWSetCharFormat(const wxTextAttr& style, long start, long end)
         // the real height in twips and not the negative number which
         // wxFillLogFont() returns (this is correct in general and works with
         // the Windows font mapper, but not here)
-
-        wxFont font(style.GetFont());
-
         LOGFONT lf;
-        wxFillLogFont(&lf, &font);
-        cf.yHeight = 20*font.GetPointSize(); // 1 pt = 20 twips
+        wxFillLogFont(&lf, &style.GetFont());
+        cf.yHeight = 20*style.GetFont().GetPointSize(); // 1 pt = 20 twips
         cf.bCharSet = lf.lfCharSet;
         cf.bPitchAndFamily = lf.lfPitchAndFamily;
-        wxStrlcpy(cf.szFaceName, lf.lfFaceName, WXSIZEOF(cf.szFaceName));
+        wxStrncpy( cf.szFaceName, lf.lfFaceName, WXSIZEOF(cf.szFaceName) );
 
         // also deal with underline/italic/bold attributes: note that we must
         // always set CFM_ITALIC &c bits in dwMask, even if we don't set the
@@ -2513,37 +2614,17 @@ bool wxTextCtrl::MSWSetCharFormat(const wxTextAttr& style, long start, long end)
     }
 #endif // wxUSE_RICHEDIT2
 
-    // Apply the style either to the selection or to the entire control.
-    WPARAM selMode;
-    if ( start != -1 || end != -1 )
+    // do format the selection
+    bool ok = ::SendMessage(GetHwnd(), EM_SETCHARFORMAT,
+                            SCF_SELECTION, (LPARAM)&cf) != 0;
+    if ( !ok )
     {
-        DoSetSelection(start, end, SetSel_NoScroll);
-        selMode = SCF_SELECTION;
-    }
-    else
-    {
-        selMode = SCF_ALL;
+        wxLogDebug(_T("SendMessage(EM_SETCHARFORMAT, SCF_SELECTION) failed"));
     }
 
-    if ( !::SendMessage(GetHwnd(), EM_SETCHARFORMAT, selMode, (LPARAM)&cf) )
-    {
-        wxLogLastError(wxT("SendMessage(EM_SETCHARFORMAT)"));
-        return false;
-    }
-
-    return true;
-}
-
-bool wxTextCtrl::MSWSetParaFormat(const wxTextAttr& style, long start, long end)
-{
-#if wxUSE_RICHEDIT2
+    // now do the paragraph formatting
     PARAFORMAT2 pf;
-#else
-    PARAFORMAT pf;
-#endif
-
     wxZeroMemory(pf);
-
     // we can't use PARAFORMAT2 with RichEdit 1.0, so pretend it is a simple
     // PARAFORMAT in that case
 #if wxUSE_RICHEDIT2
@@ -2618,57 +2699,19 @@ bool wxTextCtrl::MSWSetParaFormat(const wxTextAttr& style, long start, long end)
 
     if ( pf.dwMask )
     {
-        // Do format the selection.
-        DoSetSelection(start, end, SetSel_NoScroll);
-
-        if ( !::SendMessage(GetHwnd(), EM_SETPARAFORMAT, 0, (LPARAM) &pf) )
+        // do format the selection
+        bool ok = ::SendMessage(GetHwnd(), EM_SETPARAFORMAT,
+                                0, (LPARAM) &pf) != 0;
+        if ( !ok )
         {
-            wxLogLastError(wxT("SendMessage(EM_SETPARAFORMAT)"));
-
-            return false;
+            wxLogDebug(_T("SendMessage(EM_SETPARAFORMAT, 0) failed"));
         }
     }
 
-    return true;
-}
-
-bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
-{
-    if ( !IsRich() )
-    {
-        // can't do it with normal text control
-        return false;
-    }
-
-    // the richedit 1.0 doesn't handle setting background colour, so don't
-    // even try to do anything if it's the only thing we want to change
-    if ( m_verRichEdit == 1 && !style.HasFont() && !style.HasTextColour() &&
-        !style.HasLeftIndent() && !style.HasRightIndent() && !style.HasAlignment() &&
-        !style.HasTabs() )
-    {
-        // nothing to do: return true if there was really nothing to do and
-        // false if we failed to set bg colour
-        return !style.HasBackgroundColour();
-    }
-
-    // order the range if needed
-    if ( start > end )
-        wxSwap(start, end);
-
-    // we can only change the format of the selection, so select the range we
-    // want and restore the old selection later, after MSWSetXXXFormat()
-    // functions (possibly) change it.
-    long startOld, endOld;
-    GetSelection(&startOld, &endOld);
-
-    bool ok = MSWSetCharFormat(style, start, end);
-    if ( !MSWSetParaFormat(style, start, end) )
-        ok = false;
-
-    if ( start != startOld || end != endOld )
+    if ( changeSel )
     {
         // restore the original selection
-        DoSetSelection(startOld, endOld, SetSel_NoScroll);
+        DoSetSelection(startOld, endOld, false);
     }
 
     return ok;
@@ -2731,7 +2774,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
 
     if ( changeSel )
     {
-        DoSetSelection(position, position + 1, SetSel_NoScroll);
+        DoSetSelection(position, position+1, false /* don't scroll caret into view */);
     }
 
     // get the selection formatting
@@ -2740,10 +2783,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
 
 
     LOGFONT lf;
-    // Convert the height from the units of 1/20th of the point in which
-    // CHARFORMAT stores it to pixel-based units used by LOGFONT.
-    const wxCoord ppi = wxClientDC(this).GetPPI().y;
-    lf.lfHeight = -MulDiv(cf.yHeight/20, ppi, 72);
+    lf.lfHeight = cf.yHeight;
     lf.lfWidth = 0;
     lf.lfCharSet = ANSI_CHARSET; // FIXME: how to get correct charset?
     lf.lfClipPrecision = 0;
@@ -2777,7 +2817,7 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
         lf.lfWeight = FW_NORMAL;
 
     wxFont font = wxCreateFontFromLogFont(& lf);
-    if (font.IsOk())
+    if (font.Ok())
     {
         style.SetFont(font);
     }
@@ -2834,12 +2874,14 @@ bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
     if ( changeSel )
     {
         // restore the original selection
-        DoSetSelection(startOld, endOld, SetSel_NoScroll);
+        DoSetSelection(startOld, endOld, false);
     }
 
     return true;
 }
 
+#endif
+
 // ----------------------------------------------------------------------------
 // wxRichEditModule
 // ----------------------------------------------------------------------------
@@ -2883,11 +2925,11 @@ bool wxRichEditModule::Load(Version version)
         return true;
     }
 
-    static const wxChar *const dllnames[] =
+    static const wxChar *dllnames[] =
     {
-        wxT("riched32"),
-        wxT("riched20"),
-        wxT("msftedit"),
+        _T("riched32"),
+        _T("riched20"),
+        _T("msftedit"),
     };
 
     wxCOMPILE_TIME_ASSERT( WXSIZEOF(dllnames) == Version_Max,
@@ -2917,7 +2959,7 @@ bool wxRichEditModule::LoadInkEdit()
     wxLogNull logNull;
     return ms_inkEditLib.Load(wxT("inked"));
 }
-#endif // wxUSE_INKEDIT
+#endif
 
 
 #endif // wxUSE_RICHEDIT
diff --git a/Source/3rd Party/wx/src/msw/textentry.cpp b/Source/3rd Party/wx/src/msw/textentry.cpp
deleted file mode 100644
index 236170e7a..000000000
--- a/Source/3rd Party/wx/src/msw/textentry.cpp	
+++ /dev/null
@@ -1,984 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/textentry.cpp
-// Purpose:     wxTextEntry implementation for wxMSW
-// Author:      Vadim Zeitlin
-// Created:     2007-09-26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/arrstr.h"
-    #include "wx/string.h"
-#endif // WX_PRECOMP
-
-#if wxUSE_TEXTCTRL || wxUSE_COMBOBOX
-
-#include "wx/textentry.h"
-#include "wx/textcompleter.h"
-#include "wx/dynlib.h"
-
-#include <initguid.h>
-
-#include "wx/msw/private.h"
-
-#if wxUSE_UXTHEME
-    #include "wx/msw/uxtheme.h"
-#endif
-
-#define GetEditHwnd() ((HWND)(GetEditHWND()))
-
-// ----------------------------------------------------------------------------
-// Classes used by auto-completion implementation.
-// ----------------------------------------------------------------------------
-
-// standard VC6 SDK (WINVER == 0x0400) does not know about IAutoComplete
-#if wxUSE_OLE && (WINVER >= 0x0500)
-    #define HAS_AUTOCOMPLETE
-#endif
-
-#ifdef HAS_AUTOCOMPLETE
-
-#include "wx/msw/ole/oleutils.h"
-#include <shldisp.h>
-
-#if defined(__MINGW32__) || defined (__WATCOMC__) || defined(__CYGWIN__)
-    // needed for IID_IAutoComplete, IID_IAutoComplete2 and ACO_AUTOSUGGEST
-    #include <shlguid.h>
-
-    #ifndef ACO_AUTOAPPEND
-        #define ACO_AUTOAPPEND 0x02
-    #endif
-#endif
-
-#ifndef ACO_UPDOWNKEYDROPSLIST
-    #define ACO_UPDOWNKEYDROPSLIST 0x20
-#endif
-
-#ifndef SHACF_FILESYS_ONLY
-    #define SHACF_FILESYS_ONLY 0x00000010
-#endif
-
-#ifndef SHACF_FILESYS_DIRS
-    #define SHACF_FILESYS_DIRS 0x00000020
-#endif
-
-namespace
-{
-
-// Normally this interface and its IID are defined in shobjidl.h header file
-// included in the platform SDK but MinGW and Cygwin don't have it so redefine
-// the interface ourselves and, as long as we do it all, do it for all
-// compilers to ensure we have the same behaviour for all of them and to avoid
-// the need to check for concrete compilers and maybe even their versions.
-class IAutoCompleteDropDown : public IUnknown
-{
-public:
-    virtual HRESULT wxSTDCALL GetDropDownStatus(DWORD *, LPWSTR *) = 0;
-    virtual HRESULT wxSTDCALL ResetEnumerator() = 0;
-};
-
-DEFINE_GUID(wxIID_IAutoCompleteDropDown,
-    0x3cd141f4, 0x3c6a, 0x11d2, 0xbc, 0xaa, 0x00, 0xc0, 0x4f, 0xd9, 0x29, 0xdb);
-
-DEFINE_GUID(wxCLSID_AutoComplete,
-    0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62);
-
-// Small helper class which can be used to ensure thread safety even when
-// wxUSE_THREADS==0 (and hence wxCriticalSection does nothing).
-class CSLock
-{
-public:
-    CSLock(CRITICAL_SECTION& cs) : m_cs(&cs)
-    {
-        ::EnterCriticalSection(m_cs);
-    }
-
-    ~CSLock()
-    {
-        ::LeaveCriticalSection(m_cs);
-    }
-
-private:
-    CRITICAL_SECTION * const m_cs;
-
-    wxDECLARE_NO_COPY_CLASS(CSLock);
-};
-
-} // anonymity namespace
-
-// Implementation of string enumerator used by wxTextAutoCompleteData. This
-// class simply forwards to wxTextCompleter associated with it.
-//
-// Notice that Next() method of this class is called by IAutoComplete
-// background thread and so we must care about thread safety here.
-class wxIEnumString : public IEnumString
-{
-public:
-    wxIEnumString()
-    {
-        Init();
-    }
-
-    void ChangeCompleter(wxTextCompleter *completer)
-    {
-        // Indicate to Next() that it should bail out as soon as possible.
-        {
-            CSLock lock(m_csRestart);
-
-            m_restart = TRUE;
-        }
-
-        // Now try to enter this critical section to ensure that Next() doesn't
-        // use the old pointer any more before changing it (this is vital as
-        // the old pointer will be destroyed after we return).
-        CSLock lock(m_csCompleter);
-
-        m_completer = completer;
-    }
-
-    void UpdatePrefix(const wxString& prefix)
-    {
-        CSLock lock(m_csRestart);
-
-        // We simply store the prefix here and will really update during the
-        // next call to our Next() method as we want to call Start() from the
-        // worker thread to prevent the main UI thread from blocking while the
-        // completions are generated.
-        m_prefix = prefix;
-        m_restart = TRUE;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE Next(ULONG celt,
-                                           LPOLESTR *rgelt,
-                                           ULONG *pceltFetched)
-    {
-        if ( !rgelt || (!pceltFetched && celt > 1) )
-            return E_POINTER;
-
-        ULONG pceltFetchedDummy;
-        if ( !pceltFetched )
-            pceltFetched = &pceltFetchedDummy;
-
-        *pceltFetched = 0;
-
-        CSLock lock(m_csCompleter);
-
-        if ( !RestartIfNeeded() )
-            return S_FALSE;
-
-        while ( celt-- )
-        {
-            // Stop iterating if we need to update completions anyhow.
-            if ( m_restart )
-                return S_FALSE;
-
-            const wxString s = m_completer->GetNext();
-            if ( s.empty() )
-                return S_FALSE;
-
-            const wxWX2WCbuf wcbuf = s.wc_str();
-            const size_t size = (wcslen(wcbuf) + 1)*sizeof(wchar_t);
-            void *olestr = CoTaskMemAlloc(size);
-            if ( !olestr )
-                return E_OUTOFMEMORY;
-
-            memcpy(olestr, wcbuf, size);
-
-            *rgelt++ = static_cast<LPOLESTR>(olestr);
-
-            ++(*pceltFetched);
-        }
-
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE Skip(ULONG celt)
-    {
-        if ( !celt )
-            return E_INVALIDARG;
-
-        CSLock lock(m_csCompleter);
-
-        if ( !RestartIfNeeded() )
-            return S_FALSE;
-
-        while ( celt-- )
-        {
-            if ( m_restart )
-                return S_FALSE;
-
-            if ( m_completer->GetNext().empty() )
-                return S_FALSE;
-        }
-
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE Reset()
-    {
-        CSLock lock(m_csRestart);
-
-        m_restart = TRUE;
-
-        return S_OK;
-    }
-
-    virtual HRESULT STDMETHODCALLTYPE Clone(IEnumString **ppEnum)
-    {
-        if ( !ppEnum )
-            return E_POINTER;
-
-        CSLock lock(m_csCompleter);
-
-        wxIEnumString * const e = new wxIEnumString;
-        e->AddRef();
-
-        e->ChangeCompleter(m_completer);
-
-        *ppEnum = e;
-
-        return S_OK;
-    }
-
-    DECLARE_IUNKNOWN_METHODS;
-
-private:
-    // dtor doesn't have to be virtual as we're only ever deleted from our own
-    // Release() and are not meant to be derived form anyhow, but making it
-    // virtual silences gcc warnings; making it private makes it impossible to
-    // (mistakenly) delete us directly instead of calling Release()
-    virtual ~wxIEnumString()
-    {
-        ::DeleteCriticalSection(&m_csRestart);
-        ::DeleteCriticalSection(&m_csCompleter);
-    }
-
-    // Common part of all ctors.
-    void Init()
-    {
-        ::InitializeCriticalSection(&m_csCompleter);
-        ::InitializeCriticalSection(&m_csRestart);
-
-        m_completer = NULL;
-        m_restart = FALSE;
-    }
-
-    // Restart completions generation if needed. Should be only called from
-    // inside m_csCompleter.
-    //
-    // If false is returned, it means that there are no completions and that
-    // wxTextCompleter::GetNext() shouldn't be called at all.
-    bool RestartIfNeeded()
-    {
-        bool rc = true;
-        for ( ;; )
-        {
-            wxString prefix;
-            LONG restart;
-            {
-                CSLock lock(m_csRestart);
-
-                prefix = m_prefix;
-                restart = m_restart;
-
-                m_restart = FALSE;
-            } // Release m_csRestart before calling Start() to avoid blocking
-              // the main thread in UpdatePrefix() during its execution.
-
-            if ( !restart )
-                break;
-
-            rc = m_completer->Start(prefix);
-        }
-
-        return rc;
-    }
-
-
-    // Critical section protecting m_completer itself. It must be entered when
-    // using the pointer to ensure that we don't continue using a dangling one
-    // after it is destroyed.
-    CRITICAL_SECTION m_csCompleter;
-
-    // The completer we delegate to for the completions generation. It is never
-    // NULL after the initial ChangeCompleter() call.
-    wxTextCompleter *m_completer;
-
-
-    // Critical section m_prefix and m_restart. It should be only entered for
-    // short periods of time, i.e. we shouldn't call any wxTextCompleter
-    // methods from inside, to prevent the main thread from blocking on it in
-    // UpdatePrefix().
-    CRITICAL_SECTION m_csRestart;
-
-    // If m_restart is true, we need to call wxTextCompleter::Start() with the
-    // given prefix to restart generating the completions.
-    wxString m_prefix;
-
-    // Notice that we use LONG and not bool here to ensure that reading this
-    // value is atomic (32 bit reads are atomic operations under all Windows
-    // versions but reading bool isn't necessarily).
-    LONG m_restart;
-
-
-    wxDECLARE_NO_COPY_CLASS(wxIEnumString);
-};
-
-BEGIN_IID_TABLE(wxIEnumString)
-    ADD_IID(Unknown)
-    ADD_IID(EnumString)
-END_IID_TABLE;
-
-IMPLEMENT_IUNKNOWN_METHODS(wxIEnumString)
-
-
-// This class gathers the all auto-complete-related stuff we use. It is
-// allocated on demand by wxTextEntry when AutoComplete() is called.
-class wxTextAutoCompleteData wxBIND_OR_CONNECT_HACK_ONLY_BASE_CLASS
-{
-public:
-    // The constructor associates us with the given text entry.
-    wxTextAutoCompleteData(wxTextEntry *entry)
-        : m_entry(entry),
-          m_win(entry->GetEditableWindow())
-    {
-        m_autoComplete = NULL;
-        m_autoCompleteDropDown = NULL;
-        m_enumStrings = NULL;
-
-        m_fixedCompleter = NULL;
-        m_customCompleter = NULL;
-
-        m_connectedCharEvent = false;
-
-        // Create an object exposing IAutoComplete interface which we'll later
-        // use to get IAutoComplete2 as the latter can't be created directly,
-        // apparently.
-        HRESULT hr = CoCreateInstance
-                     (
-                        wxCLSID_AutoComplete,
-                        NULL,
-                        CLSCTX_INPROC_SERVER,
-                        IID_IAutoComplete,
-                        reinterpret_cast<void **>(&m_autoComplete)
-                     );
-        if ( FAILED(hr) )
-        {
-            wxLogApiError(wxT("CoCreateInstance(CLSID_AutoComplete)"), hr);
-            return;
-        }
-
-        // Create a string enumerator and initialize the completer with it.
-        m_enumStrings = new wxIEnumString;
-        m_enumStrings->AddRef();
-        hr = m_autoComplete->Init(m_entry->GetEditHWND(), m_enumStrings,
-                                  NULL, NULL);
-        if ( FAILED(hr) )
-        {
-            wxLogApiError(wxT("IAutoComplete::Init"), hr);
-
-            m_enumStrings->Release();
-            m_enumStrings = NULL;
-
-            return;
-        }
-
-        // As explained in DoRefresh(), we need to call IAutoCompleteDropDown::
-        // ResetEnumerator() if we want to be able to change the completions on
-        // the fly. In principle we could live without it, i.e. return true
-        // from IsOk() even if this QueryInterface() fails, but it doesn't look
-        // like this is ever going to have in practice anyhow as the shell-
-        // provided IAutoComplete always implements IAutoCompleteDropDown too.
-        hr = m_autoComplete->QueryInterface
-                             (
-                               wxIID_IAutoCompleteDropDown,
-                               reinterpret_cast<void **>(&m_autoCompleteDropDown)
-                             );
-        if ( FAILED(hr) )
-        {
-            wxLogApiError(wxT("IAutoComplete::QI(IAutoCompleteDropDown)"), hr);
-            return;
-        }
-
-        // Finally set the completion options using IAutoComplete2.
-        IAutoComplete2 *pAutoComplete2 = NULL;
-        hr = m_autoComplete->QueryInterface
-                             (
-                               IID_IAutoComplete2,
-                               reinterpret_cast<void **>(&pAutoComplete2)
-                             );
-        if ( SUCCEEDED(hr) )
-        {
-            pAutoComplete2->SetOptions(ACO_AUTOSUGGEST |
-                                       ACO_AUTOAPPEND |
-                                       ACO_UPDOWNKEYDROPSLIST);
-            pAutoComplete2->Release();
-        }
-    }
-
-    ~wxTextAutoCompleteData()
-    {
-        delete m_customCompleter;
-        delete m_fixedCompleter;
-
-        if ( m_enumStrings )
-            m_enumStrings->Release();
-        if ( m_autoCompleteDropDown )
-            m_autoCompleteDropDown->Release();
-        if ( m_autoComplete )
-            m_autoComplete->Release();
-    }
-
-    // Must be called after creating this object to verify if initializing it
-    // succeeded.
-    bool IsOk() const
-    {
-        return m_autoComplete && m_autoCompleteDropDown && m_enumStrings;
-    }
-
-    void ChangeStrings(const wxArrayString& strings)
-    {
-        if ( !m_fixedCompleter )
-            m_fixedCompleter = new wxTextCompleterFixed;
-
-        m_fixedCompleter->SetCompletions(strings);
-
-        m_enumStrings->ChangeCompleter(m_fixedCompleter);
-
-        DoRefresh();
-    }
-
-    // Takes ownership of the pointer if it is non-NULL.
-    bool ChangeCustomCompleter(wxTextCompleter *completer)
-    {
-        // Ensure that the old completer is not used any more before deleting
-        // it.
-        m_enumStrings->ChangeCompleter(completer);
-
-        delete m_customCompleter;
-        m_customCompleter = completer;
-
-        if ( m_customCompleter )
-        {
-            // We postpone connecting to this event until we really need to do
-            // it (however we don't disconnect from it when we don't need it
-            // any more because we don't have wxUNBIND_OR_DISCONNECT_HACK...).
-            if ( !m_connectedCharEvent )
-            {
-                m_connectedCharEvent = true;
-
-                // Use the special wxEVT_AFTER_CHAR and not the usual
-                // wxEVT_CHAR here because we need to have the updated value of
-                // the text control in this handler in order to provide
-                // completions for the correct prefix and unfortunately we
-                // don't have any way to let DefWindowProc() run from our
-                // wxEVT_CHAR handler (as we must also let the other handlers
-                // defined at wx level run first).
-                //
-                // Notice that we can't use wxEVT_COMMAND_TEXT_UPDATED here
-                // neither as, due to our use of ACO_AUTOAPPEND, we get
-                // EN_CHANGE notifications from the control every time
-                // IAutoComplete auto-appends something to it.
-                wxBIND_OR_CONNECT_HACK(m_win, wxEVT_AFTER_CHAR,
-                                        wxKeyEventHandler,
-                                        wxTextAutoCompleteData::OnAfterChar,
-                                        this);
-            }
-
-            UpdateStringsFromCustomCompleter();
-        }
-
-        return true;
-    }
-
-    void DisableCompletion()
-    {
-        // We currently simply reset the list of possible strings as this seems
-        // to effectively disable auto-completion just fine. We could (and
-        // probably should) use IAutoComplete::Enable(FALSE) for this too but
-        // then we'd need to call Enable(TRUE) to turn it on back again later.
-        ChangeStrings(wxArrayString());
-    }
-
-private:
-    // Must be called after changing the values to be returned by wxIEnumString
-    // to really make the changes stick.
-    void DoRefresh()
-    {
-        m_enumStrings->Reset();
-
-        // This is completely and utterly not documented and in fact the
-        // current MSDN seems to try to discourage us from using it by saying
-        // that "there is no reason to use this method unless the drop-down
-        // list is currently visible" but actually we absolutely must call it
-        // to force the auto-completer (and not just its drop-down!) to refresh
-        // the list of completions which could have changed now. Without this
-        // call the new choices returned by GetCompletions() that hadn't been
-        // returned by it before are simply silently ignored.
-        m_autoCompleteDropDown->ResetEnumerator();
-    }
-
-    // Update the strings returned by our string enumerator to correspond to
-    // the currently valid choices according to the custom completer.
-    void UpdateStringsFromCustomCompleter()
-    {
-        // As we use ACO_AUTOAPPEND, the selected part of the text is usually
-        // the one appended by us so don't consider it as part of the
-        // user-entered prefix.
-        long from, to;
-        m_entry->GetSelection(&from, &to);
-
-        if ( to == from )
-            from = m_entry->GetLastPosition(); // Take all if no selection.
-
-        const wxString prefix = m_entry->GetRange(0, from);
-
-        m_enumStrings->UpdatePrefix(prefix);
-
-        DoRefresh();
-    }
-
-    void OnAfterChar(wxKeyEvent& event)
-    {
-        // Notice that we must not refresh the completions when the user
-        // presses Backspace as this would result in adding back the just
-        // erased character(s) because of ACO_AUTOAPPEND option we use.
-        if ( m_customCompleter && event.GetKeyCode() != WXK_BACK )
-            UpdateStringsFromCustomCompleter();
-
-        event.Skip();
-    }
-
-
-    // The text entry we're associated with.
-    wxTextEntry * const m_entry;
-
-    // The window of this text entry.
-    wxWindow * const m_win;
-
-    // The auto-completer object itself.
-    IAutoComplete *m_autoComplete;
-
-    // Its IAutoCompleteDropDown interface needed for ResetEnumerator() call.
-    IAutoCompleteDropDown *m_autoCompleteDropDown;
-
-    // Enumerator for strings currently used for auto-completion.
-    wxIEnumString *m_enumStrings;
-
-    // Fixed string completer or NULL if none.
-    wxTextCompleterFixed *m_fixedCompleter;
-
-    // Custom completer or NULL if none.
-    wxTextCompleter *m_customCompleter;
-
-    // Initially false, set to true after connecting OnTextChanged() handler.
-    bool m_connectedCharEvent;
-
-
-    wxDECLARE_NO_COPY_CLASS(wxTextAutoCompleteData);
-};
-
-#endif // HAS_AUTOCOMPLETE
-
-// ============================================================================
-// wxTextEntry implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// initialization and destruction
-// ----------------------------------------------------------------------------
-
-wxTextEntry::wxTextEntry()
-{
-#ifdef HAS_AUTOCOMPLETE
-    m_autoCompleteData = NULL;
-#endif // HAS_AUTOCOMPLETE
-}
-
-wxTextEntry::~wxTextEntry()
-{
-#ifdef HAS_AUTOCOMPLETE
-    delete m_autoCompleteData;
-#endif // HAS_AUTOCOMPLETE
-}
-
-// ----------------------------------------------------------------------------
-// operations on text
-// ----------------------------------------------------------------------------
-
-void wxTextEntry::WriteText(const wxString& text)
-{
-    ::SendMessage(GetEditHwnd(), EM_REPLACESEL, 0, wxMSW_CONV_LPARAM(text));
-}
-
-wxString wxTextEntry::DoGetValue() const
-{
-    return wxGetWindowText(GetEditHWND());
-}
-
-void wxTextEntry::Remove(long from, long to)
-{
-    DoSetSelection(from, to, SetSel_NoScroll);
-    WriteText(wxString());
-}
-
-// ----------------------------------------------------------------------------
-// clipboard operations
-// ----------------------------------------------------------------------------
-
-void wxTextEntry::Copy()
-{
-    ::SendMessage(GetEditHwnd(), WM_COPY, 0, 0);
-}
-
-void wxTextEntry::Cut()
-{
-    ::SendMessage(GetEditHwnd(), WM_CUT, 0, 0);
-}
-
-void wxTextEntry::Paste()
-{
-    ::SendMessage(GetEditHwnd(), WM_PASTE, 0, 0);
-}
-
-// ----------------------------------------------------------------------------
-// undo/redo
-// ----------------------------------------------------------------------------
-
-void wxTextEntry::Undo()
-{
-    ::SendMessage(GetEditHwnd(), EM_UNDO, 0, 0);
-}
-
-void wxTextEntry::Redo()
-{
-    // same as Undo, since Undo undoes the undo
-    Undo();
-    return;
-}
-
-bool wxTextEntry::CanUndo() const
-{
-    return ::SendMessage(GetEditHwnd(), EM_CANUNDO, 0, 0) != 0;
-}
-
-bool wxTextEntry::CanRedo() const
-{
-    // see comment in Redo()
-    return CanUndo();
-}
-
-// ----------------------------------------------------------------------------
-// insertion point and selection
-// ----------------------------------------------------------------------------
-
-void wxTextEntry::SetInsertionPoint(long pos)
-{
-    // calling DoSetSelection(-1, -1) would select everything which is not what
-    // we want here
-    if ( pos == -1 )
-        pos = GetLastPosition();
-
-    // be careful to call DoSetSelection() which is overridden in wxTextCtrl
-    // and not just SetSelection() here
-    DoSetSelection(pos, pos);
-}
-
-long wxTextEntry::GetInsertionPoint() const
-{
-    long from;
-    GetSelection(&from, NULL);
-    return from;
-}
-
-long wxTextEntry::GetLastPosition() const
-{
-    return ::SendMessage(GetEditHwnd(), EM_LINELENGTH, 0, 0);
-}
-
-void wxTextEntry::DoSetSelection(long from, long to, int WXUNUSED(flags))
-{
-    // if from and to are both -1, it means (in wxWidgets) that all text should
-    // be selected, translate this into Windows convention
-    if ( (from == -1) && (to == -1) )
-    {
-        from = 0;
-    }
-
-    ::SendMessage(GetEditHwnd(), EM_SETSEL, from, to);
-}
-
-void wxTextEntry::GetSelection(long *from, long *to) const
-{
-    DWORD dwStart, dwEnd;
-    ::SendMessage(GetEditHwnd(), EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd);
-
-    if ( from )
-        *from = dwStart;
-    if ( to )
-        *to = dwEnd;
-}
-
-// ----------------------------------------------------------------------------
-// auto-completion
-// ----------------------------------------------------------------------------
-
-#if wxUSE_OLE
-
-#ifdef HAS_AUTOCOMPLETE
-
-bool wxTextEntry::DoAutoCompleteFileNames(int flags)
-{
-    typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD);
-    static SHAutoComplete_t s_pfnSHAutoComplete = (SHAutoComplete_t)-1;
-    static wxDynamicLibrary s_dllShlwapi;
-    if ( s_pfnSHAutoComplete == (SHAutoComplete_t)-1 )
-    {
-        if ( !s_dllShlwapi.Load(wxT("shlwapi.dll"), wxDL_VERBATIM | wxDL_QUIET) )
-        {
-            s_pfnSHAutoComplete = NULL;
-        }
-        else
-        {
-            wxDL_INIT_FUNC(s_pfn, SHAutoComplete, s_dllShlwapi);
-        }
-    }
-
-    if ( !s_pfnSHAutoComplete )
-        return false;
-
-    DWORD dwFlags = 0;
-    if ( flags & wxFILE )
-        dwFlags |= SHACF_FILESYS_ONLY;
-    else if ( flags & wxDIR )
-        dwFlags |= SHACF_FILESYS_DIRS;
-    else
-    {
-        wxFAIL_MSG(wxS("No flags for file name auto completion?"));
-        return false;
-    }
-
-    HRESULT hr = (*s_pfnSHAutoComplete)(GetEditHwnd(), dwFlags);
-    if ( FAILED(hr) )
-    {
-        wxLogApiError(wxT("SHAutoComplete()"), hr);
-
-        return false;
-    }
-
-    // Disable the other kinds of completion now that we use the built-in file
-    // names completion.
-    if ( m_autoCompleteData )
-        m_autoCompleteData->DisableCompletion();
-
-    return true;
-}
-
-wxTextAutoCompleteData *wxTextEntry::GetOrCreateCompleter()
-{
-    if ( !m_autoCompleteData )
-    {
-        wxTextAutoCompleteData * const ac = new wxTextAutoCompleteData(this);
-        if ( ac->IsOk() )
-            m_autoCompleteData = ac;
-        else
-            delete ac;
-    }
-
-    return m_autoCompleteData;
-}
-
-bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
-{
-    wxTextAutoCompleteData * const ac = GetOrCreateCompleter();
-    if ( !ac )
-        return false;
-
-    ac->ChangeStrings(choices);
-
-    return true;
-}
-
-bool wxTextEntry::DoAutoCompleteCustom(wxTextCompleter *completer)
-{
-    // First deal with the case when we just want to disable auto-completion.
-    if ( !completer )
-    {
-        if ( m_autoCompleteData )
-            m_autoCompleteData->DisableCompletion();
-        //else: Nothing to do, we hadn't used auto-completion even before.
-    }
-    else // Have a valid completer.
-    {
-        wxTextAutoCompleteData * const ac = GetOrCreateCompleter();
-        if ( !ac )
-        {
-            // Delete the custom completer for consistency with the case when
-            // we succeed to avoid memory leaks in user code.
-            delete completer;
-            return false;
-        }
-
-        // This gives ownership of the custom completer to m_autoCompleteData.
-        if ( !ac->ChangeCustomCompleter(completer) )
-            return false;
-    }
-
-    return true;
-}
-
-#else // !HAS_AUTOCOMPLETE
-
-// We still need to define stubs as we declared these overrides in the header.
-
-bool wxTextEntry::DoAutoCompleteFileNames(int flags)
-{
-    return wxTextEntryBase::DoAutoCompleteFileNames(flags);
-}
-
-bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
-{
-    return wxTextEntryBase::DoAutoCompleteStrings(choices);
-}
-
-bool wxTextEntry::DoAutoCompleteCustom(wxTextCompleter *completer)
-{
-    return wxTextEntryBase::DoAutoCompleteCustom(completer);
-}
-
-#endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
-
-#endif // wxUSE_OLE
-
-// ----------------------------------------------------------------------------
-// editable state
-// ----------------------------------------------------------------------------
-
-bool wxTextEntry::IsEditable() const
-{
-    return !(::GetWindowLong(GetEditHwnd(), GWL_STYLE) & ES_READONLY);
-}
-
-void wxTextEntry::SetEditable(bool editable)
-{
-    ::SendMessage(GetEditHwnd(), EM_SETREADONLY, !editable, 0);
-}
-
-// ----------------------------------------------------------------------------
-// max length
-// ----------------------------------------------------------------------------
-
-void wxTextEntry::SetMaxLength(unsigned long len)
-{
-    if ( len >= 0xffff )
-    {
-        // this will set it to a platform-dependent maximum (much more
-        // than 64Kb under NT)
-        len = 0;
-    }
-
-    ::SendMessage(GetEditHwnd(), EM_LIMITTEXT, len, 0);
-}
-
-// ----------------------------------------------------------------------------
-// hints
-// ----------------------------------------------------------------------------
-
-#if wxUSE_UXTHEME
-
-#ifndef EM_SETCUEBANNER
-    #define EM_SETCUEBANNER 0x1501
-    #define EM_GETCUEBANNER 0x1502
-#endif
-
-bool wxTextEntry::SetHint(const wxString& hint)
-{
-    if ( wxUxThemeEngine::GetIfActive() )
-    {
-        // notice that this message always works with Unicode strings
-        //
-        // we always use TRUE for wParam to show the hint even when the window
-        // has focus, otherwise there would be no way to show the hint for the
-        // initially focused window
-        if ( ::SendMessage(GetEditHwnd(), EM_SETCUEBANNER,
-                             TRUE, (LPARAM)(const wchar_t *)hint.wc_str()) )
-            return true;
-    }
-
-    return wxTextEntryBase::SetHint(hint);
-}
-
-wxString wxTextEntry::GetHint() const
-{
-    if ( wxUxThemeEngine::GetIfActive() )
-    {
-        wchar_t buf[256];
-        if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER,
-                            (WPARAM)buf, WXSIZEOF(buf)) )
-            return wxString(buf);
-    }
-
-    return wxTextEntryBase::GetHint();
-}
-
-
-#endif // wxUSE_UXTHEME
-
-// ----------------------------------------------------------------------------
-// margins support
-// ----------------------------------------------------------------------------
-
-bool wxTextEntry::DoSetMargins(const wxPoint& margins)
-{
-#if !defined(__WXWINCE__)
-    bool res = true;
-
-    if ( margins.x != -1 )
-    {
-        // left margin
-        ::SendMessage(GetEditHwnd(), EM_SETMARGINS,
-                      EC_LEFTMARGIN, MAKELONG(margins.x, 0));
-    }
-
-    if ( margins.y != -1 )
-    {
-        res = false;
-    }
-
-    return res;
-#else
-    return false;
-#endif
-}
-
-wxPoint wxTextEntry::DoGetMargins() const
-{
-#if !defined(__WXWINCE__)
-    LRESULT lResult = ::SendMessage(GetEditHwnd(), EM_GETMARGINS,
-                                    0, 0);
-    int left = LOWORD(lResult);
-    int top = -1;
-    return wxPoint(left, top);
-#else
-    return wxPoint(-1, -1);
-#endif
-}
-
-#endif // wxUSE_TEXTCTRL || wxUSE_COMBOBOX
diff --git a/Source/3rd Party/wx/src/msw/tglbtn.cpp b/Source/3rd Party/wx/src/msw/tglbtn.cpp
index 678f96b06..cb6daf3ac 100644
--- a/Source/3rd Party/wx/src/msw/tglbtn.cpp	
+++ b/Source/3rd Party/wx/src/msw/tglbtn.cpp	
@@ -6,9 +6,9 @@
 //              and William Gallafent.
 // Modified by:
 // Created:     08.02.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tglbtn.cpp 41632 2006-10-04 23:02:13Z VZ $
 // Copyright:   (c) 2000 Johnny C. Norris II
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -39,159 +39,132 @@
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
-#include "wx/msw/private/button.h"
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
-wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );
+IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
+
+#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-//-----------------------------------------------------------------------------
-// wxBitmapToggleButton
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapToggleButton, wxToggleButton)
-
-bool wxBitmapToggleButton::Create( wxWindow *parent, wxWindowID id,
-                const wxBitmap& label,const wxPoint& pos, const wxSize& size, long style,
-                const wxValidator& validator, const wxString& name )
-{
-    if (!wxToggleButton::Create( parent, id, wxEmptyString, pos, size, style, validator, name ))
-        return false;
-
-    SetBitmap(label);
-
-    if (size.x == -1 || size.y == -1)
-    {
-        wxSize new_size = GetBestSize();
-        if (size.x != -1)
-            new_size.x = size.x;
-        if (size.y != -1)
-            new_size.y = size.y;
-        SetSize( new_size );
-    }
-
-    return true;
-}
-
-
 // ----------------------------------------------------------------------------
 // wxToggleButton
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
-
-void wxToggleButton::Init()
+bool wxToggleButton::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
 {
-    m_state = false;
+   wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
+   event.SetInt(GetValue());
+   event.SetEventObject(this);
+   ProcessCommand(event);
+   return true;
 }
 
 // Single check box item
-bool wxToggleButton::Create(wxWindow *parent,
-                            wxWindowID id,
+bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxString& label,
                             const wxPoint& pos,
                             const wxSize& size, long style,
                             const wxValidator& validator,
                             const wxString& name)
 {
-    Init();
-
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
-    // if the label contains several lines we must explicitly tell the button
-    // about it or it wouldn't draw it correctly ("\n"s would just appear as
-    // black boxes)
-    //
-    // NB: we do it here and not in MSWGetStyle() because we need the label
-    //     value and the label is not set yet when MSWGetStyle() is called
-    WXDWORD exstyle;
-    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
-    msStyle |= wxMSWButton::GetMultilineStyle(label);
+    if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
+      return false;
 
-    return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, exstyle);
+    return true;
+}
+
+wxBorder wxToggleButton::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
 }
 
 WXDWORD wxToggleButton::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 
+#ifndef BS_PUSHLIKE
+#define BS_PUSHLIKE 0x00001000L
+#endif
+
     msStyle |= BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP;
 
-    if ( style & wxBU_LEFT )
+    if(style & wxBU_LEFT)
       msStyle |= BS_LEFT;
-    if ( style & wxBU_RIGHT )
+    if(style & wxBU_RIGHT)
       msStyle |= BS_RIGHT;
-    if ( style & wxBU_TOP )
+    if(style & wxBU_TOP)
       msStyle |= BS_TOP;
-    if ( style & wxBU_BOTTOM )
+    if(style & wxBU_BOTTOM)
       msStyle |= BS_BOTTOM;
 
     return msStyle;
 }
 
+wxSize wxToggleButton::DoGetBestSize() const
+{
+   wxString label = wxGetWindowText(GetHWND());
+   int wBtn;
+   GetTextExtent(GetLabelText(label), &wBtn, NULL);
+
+   int wChar, hChar;
+   wxGetCharSize(GetHWND(), &wChar, &hChar, GetFont());
+
+   // add a margin - the button is wider than just its label
+   wBtn += 3*wChar;
+
+   // the button height is proportional to the height of the font used
+   int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
+
+#if wxUSE_BUTTON
+   // make all buttons of at least standard size unless wxBU_EXACTFIT is given
+   if ( !HasFlag(wxBU_EXACTFIT) )
+   {
+       const wxSize szMin = wxButton::GetDefaultSize();
+       if ( wBtn < szMin.x )
+           wBtn = szMin.x;
+       if ( hBtn < szMin.y )
+           hBtn = szMin.y;
+   }
+#endif // wxUSE_BUTTON
+
+   wxSize sz(wBtn, hBtn);
+
+   CacheBestSize(sz);
+   return sz;
+}
+
 void wxToggleButton::SetValue(bool val)
 {
-    m_state = val;
-    if ( IsOwnerDrawn() )
-    {
-        Refresh();
-    }
-    else
-    {
-        ::SendMessage(GetHwnd(), BM_SETCHECK, val, 0);
-    }
+   ::SendMessage(GetHwnd(), BM_SETCHECK, val, 0);
 }
 
+#ifndef BST_CHECKED
+#define BST_CHECKED 0x0001
+#endif
+
 bool wxToggleButton::GetValue() const
 {
-    if ( IsOwnerDrawn() )
-    {
-        return m_state;
-    }
-    else
-    {
-        return ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED;
-    }
+#ifdef __WIN32__
+   return (::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED);
+#else
+   return ((0x001 & ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0)) == 0x001);
+#endif
 }
 
-void wxToggleButton::Command(wxCommandEvent& event)
+void wxToggleButton::Command(wxCommandEvent & event)
 {
-    SetValue(event.GetInt() != 0);
-    ProcessCommand(event);
-}
-
-bool wxToggleButton::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
-{
-    if ( param != BN_CLICKED && param != BN_DBLCLK )
-        return false;
-
-    // first update the value so that user event handler gets the new
-    // toggle button value
-
-    // ownerdrawn buttons don't manage their state themselves unlike usual
-    // auto checkboxes so do it ourselves in any case
-    m_state = !m_state;
-
-    wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
-    event.SetInt(GetValue());
-    event.SetEventObject(this);
-    ProcessCommand(event);
-    return true;
-}
-
-wxAnyButton::State wxToggleButton::GetNormalState() const
-{
-    if ( GetValue() )
-        return State_Pressed;
-    else
-        return State_Normal;
+   SetValue((event.GetInt() != 0));
+   ProcessCommand(event);
 }
 
 #endif // wxUSE_TOGGLEBTN
diff --git a/Source/3rd Party/wx/src/msw/thread.cpp b/Source/3rd Party/wx/src/msw/thread.cpp
index 6bd79c96f..ad1e914be 100644
--- a/Source/3rd Party/wx/src/msw/thread.cpp	
+++ b/Source/3rd Party/wx/src/msw/thread.cpp	
@@ -4,7 +4,7 @@
 // Author:      Original from Wolfram Gloger/Guilhem Lavaux
 // Modified by: Vadim Zeitlin to make it work :-)
 // Created:     04/22/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: thread.cpp 57100 2008-12-04 00:22:04Z VZ $
 // Copyright:   (c) Wolfram Gloger (1996, 1997), Guilhem Lavaux (1998);
 //                  Vadim Zeitlin (1999-2002)
 // Licence:     wxWindows licence
@@ -26,6 +26,7 @@
 #include "wx/thread.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/module.h"
@@ -35,13 +36,10 @@
 #include "wx/scopeguard.h"
 
 #include "wx/msw/private.h"
-#include "wx/msw/missing.h"
 #include "wx/msw/seh.h"
 
 #include "wx/except.h"
 
-#include "wx/dynlib.h"
-
 // must have this symbol defined to get _beginthread/_endthread declarations
 #ifndef _MT
     #define _MT
@@ -64,7 +62,7 @@
 #if defined(__VISUALC__) || \
     (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500)) || \
     (defined(__GNUG__) && defined(__MSVCRT__)) || \
-    defined(__WATCOMC__)
+    defined(__WATCOMC__) || defined(__MWERKS__)
 
 #ifndef __WXWINCE__
     #undef wxUSE_BEGIN_THREAD
@@ -77,8 +75,7 @@
     // this is where _beginthreadex() is declared
     #include <process.h>
 
-    // the return type of the thread function entry point: notice that this
-    // type can't hold a pointer under Win64
+    // the return type of the thread function entry point
     typedef unsigned THREAD_RETVAL;
 
     // the calling convention of the thread function entry point
@@ -89,7 +86,15 @@
     #define THREAD_CALLCONV WINAPI
 #endif
 
-static const THREAD_RETVAL THREAD_ERROR_EXIT = (THREAD_RETVAL)-1;
+// this is a hack to allow the code here to know whether wxEventLoop is
+// currently running: as wxBase doesn't have event loop at all, we can't simple
+// use "wxEventLoop::GetActive() != NULL" test, so instead wxEventLoop uses
+// this variable to indicate whether it is active
+//
+// the proper solution is to use wxAppTraits to abstract the base/GUI-dependent
+// operation of waiting for the thread to terminate and is already implemented
+// in cvs HEAD, this is just a backwards compatible hack for 2.8
+WXDLLIMPEXP_DATA_BASE(int) wxRunningEventLoopCount = 0;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -115,7 +120,7 @@ static DWORD gs_tlsThisThread = 0xFFFFFFFF;
 
 // id of the main thread - the one which can call GUI functions without first
 // calling wxMutexGuiEnter()
-wxThreadIdType wxThread::ms_idMainThread = 0;
+static DWORD gs_idMainThread = 0;
 
 // if it's false, some secondary thread is holding the GUI lock
 static bool gs_bGuiOwnedByMainThread = true;
@@ -147,7 +152,7 @@ static bool gs_waitingForThread = false;
 // wxCriticalSection
 // ----------------------------------------------------------------------------
 
-wxCriticalSection::wxCriticalSection( wxCriticalSectionType WXUNUSED(critSecType) )
+wxCriticalSection::wxCriticalSection()
 {
     wxCOMPILE_TIME_ASSERT( sizeof(CRITICAL_SECTION) <= sizeof(wxCritSectBuffer),
                            wxCriticalSectionBufferTooSmall );
@@ -165,25 +170,6 @@ void wxCriticalSection::Enter()
     ::EnterCriticalSection((CRITICAL_SECTION *)m_buffer);
 }
 
-bool wxCriticalSection::TryEnter()
-{
-#if wxUSE_DYNLIB_CLASS
-    typedef BOOL
-      (WINAPI *TryEnterCriticalSection_t)(LPCRITICAL_SECTION lpCriticalSection);
-
-    static TryEnterCriticalSection_t
-        pfnTryEnterCriticalSection = (TryEnterCriticalSection_t)
-            wxDynamicLibrary(wxT("kernel32.dll")).
-                GetSymbol(wxT("TryEnterCriticalSection"));
-
-    return pfnTryEnterCriticalSection
-            ? (*pfnTryEnterCriticalSection)((CRITICAL_SECTION *)m_buffer) != 0
-            : false;
-#else
-    return false;
-#endif
-}
-
 void wxCriticalSection::Leave()
 {
     ::LeaveCriticalSection((CRITICAL_SECTION *)m_buffer);
@@ -202,8 +188,7 @@ public:
     bool IsOk() const { return m_mutex != NULL; }
 
     wxMutexError Lock() { return LockTimeout(INFINITE); }
-    wxMutexError Lock(unsigned long ms) { return LockTimeout(ms); }
-    wxMutexError TryLock();
+    wxMutexError TryLock() { return LockTimeout(0); }
     wxMutexError Unlock();
 
 private:
@@ -211,31 +196,24 @@ private:
 
     HANDLE m_mutex;
 
-    unsigned long m_owningThread;
-    wxMutexType m_type;
-
-    wxDECLARE_NO_COPY_CLASS(wxMutexInternal);
+    DECLARE_NO_COPY_CLASS(wxMutexInternal)
 };
 
 // all mutexes are recursive under Win32 so we don't use mutexType
-wxMutexInternal::wxMutexInternal(wxMutexType mutexType)
+wxMutexInternal::wxMutexInternal(wxMutexType WXUNUSED(mutexType))
 {
     // create a nameless (hence intra process and always private) mutex
     m_mutex = ::CreateMutex
                 (
                     NULL,       // default secutiry attributes
-                    FALSE,      // not initially locked
+                    false,      // not initially locked
                     NULL        // no name
                 );
 
-    m_type = mutexType;
-    m_owningThread = 0;
-
     if ( !m_mutex )
     {
-        wxLogLastError(wxT("CreateMutex()"));
+        wxLogLastError(_T("CreateMutex()"));
     }
-
 }
 
 wxMutexInternal::~wxMutexInternal()
@@ -244,38 +222,20 @@ wxMutexInternal::~wxMutexInternal()
     {
         if ( !::CloseHandle(m_mutex) )
         {
-            wxLogLastError(wxT("CloseHandle(mutex)"));
+            wxLogLastError(_T("CloseHandle(mutex)"));
         }
     }
 }
 
-wxMutexError wxMutexInternal::TryLock()
-{
-    const wxMutexError rc = LockTimeout(0);
-
-    // we have a special return code for timeout in this case
-    return rc == wxMUTEX_TIMEOUT ? wxMUTEX_BUSY : rc;
-}
-
 wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
 {
-    if (m_type == wxMUTEX_DEFAULT)
-    {
-        // Don't allow recursive
-        if (m_owningThread != 0)
-        {
-            if (m_owningThread == wxThread::GetCurrentId())
-                return wxMUTEX_DEAD_LOCK;
-        }
-    }
-
     DWORD rc = ::WaitForSingleObject(m_mutex, milliseconds);
     switch ( rc )
     {
         case WAIT_ABANDONED:
             // the previous caller died without releasing the mutex, so even
             // though we did get it, log a message about this
-            wxLogDebug(wxT("WaitForSingleObject() returned WAIT_ABANDONED"));
+            wxLogDebug(_T("WaitForSingleObject() returned WAIT_ABANDONED"));
             // fall through
 
         case WAIT_OBJECT_0:
@@ -283,34 +243,25 @@ wxMutexError wxMutexInternal::LockTimeout(DWORD milliseconds)
             break;
 
         case WAIT_TIMEOUT:
-            return wxMUTEX_TIMEOUT;
+            return wxMUTEX_BUSY;
 
         default:
             wxFAIL_MSG(wxT("impossible return value in wxMutex::Lock"));
             // fall through
 
         case WAIT_FAILED:
-            wxLogLastError(wxT("WaitForSingleObject(mutex)"));
+            wxLogLastError(_T("WaitForSingleObject(mutex)"));
             return wxMUTEX_MISC_ERROR;
     }
 
-    if (m_type == wxMUTEX_DEFAULT)
-    {
-        // required for checking recursiveness
-        m_owningThread = wxThread::GetCurrentId();
-    }
-
     return wxMUTEX_NO_ERROR;
 }
 
 wxMutexError wxMutexInternal::Unlock()
 {
-    // required for checking recursiveness
-    m_owningThread = 0;
-
     if ( !::ReleaseMutex(m_mutex) )
     {
-        wxLogLastError(wxT("ReleaseMutex()"));
+        wxLogLastError(_T("ReleaseMutex()"));
 
         return wxMUTEX_MISC_ERROR;
     }
@@ -349,7 +300,7 @@ public:
 private:
     HANDLE m_semaphore;
 
-    wxDECLARE_NO_COPY_CLASS(wxSemaphoreInternal);
+    DECLARE_NO_COPY_CLASS(wxSemaphoreInternal)
 };
 
 wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
@@ -371,7 +322,7 @@ wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
 #endif
     if ( !m_semaphore )
     {
-        wxLogLastError(wxT("CreateSemaphore()"));
+        wxLogLastError(_T("CreateSemaphore()"));
     }
 }
 
@@ -381,7 +332,7 @@ wxSemaphoreInternal::~wxSemaphoreInternal()
     {
         if ( !::CloseHandle(m_semaphore) )
         {
-            wxLogLastError(wxT("CloseHandle(semaphore)"));
+            wxLogLastError(_T("CloseHandle(semaphore)"));
         }
     }
 }
@@ -399,7 +350,7 @@ wxSemaError wxSemaphoreInternal::WaitTimeout(unsigned long milliseconds)
            return wxSEMA_TIMEOUT;
 
         default:
-            wxLogLastError(wxT("WaitForSingleObject(semaphore)"));
+            wxLogLastError(_T("WaitForSingleObject(semaphore)"));
     }
 
     return wxSEMA_MISC_ERROR;
@@ -416,7 +367,7 @@ wxSemaError wxSemaphoreInternal::Post()
         }
         else
         {
-            wxLogLastError(wxT("ReleaseSemaphore"));
+            wxLogLastError(_T("ReleaseSemaphore"));
             return wxSEMA_MISC_ERROR;
         }
     }
@@ -471,7 +422,6 @@ public:
     // (politely, this is not Kill()!) to do it
     wxThreadError WaitForTerminate(wxCriticalSection& cs,
                                    wxThread::ExitCode *pRc,
-                                   wxThreadWait waitMode,
                                    wxThread *threadToDelete = NULL);
 
     // kill the thread unconditionally
@@ -529,7 +479,7 @@ private:
     // reaches 0 we kill the owning wxThread -- and die ourselves with it
     LONG m_nRef;
 
-    wxDECLARE_NO_COPY_CLASS(wxThreadInternal);
+    DECLARE_NO_COPY_CLASS(wxThreadInternal)
 };
 
 // small class which keeps a thread alive during its lifetime
@@ -560,19 +510,19 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
 {
     wxON_BLOCK_EXIT1(DoThreadOnExit, thread);
 
-    THREAD_RETVAL rc = THREAD_ERROR_EXIT;
+    THREAD_RETVAL rc = (THREAD_RETVAL)-1;
 
     wxTRY
     {
         // store the thread object in the TLS
         if ( !::TlsSetValue(gs_tlsThisThread, thread) )
         {
-            wxLogSysError(_("Cannot start thread: error writing TLS."));
+            wxLogSysError(_("Can not start thread: error writing TLS."));
 
-            return THREAD_ERROR_EXIT;
+            return (THREAD_RETVAL)-1;
         }
 
-        rc = wxPtrToUInt(thread->Entry());
+        rc = (THREAD_RETVAL)thread->Entry();
     }
     wxCATCH_ALL( wxTheApp->OnUnhandledException(); )
 
@@ -582,7 +532,7 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
 /* static */
 THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
 {
-    THREAD_RETVAL rc = THREAD_ERROR_EXIT;
+    THREAD_RETVAL rc = (THREAD_RETVAL)-1;
 
     wxThread * const thread = (wxThread *)param;
 
@@ -601,7 +551,7 @@ THREAD_RETVAL THREAD_CALLCONV wxThreadInternal::WinThreadStart(void *param)
         else
             rc = DoThreadStart(thread);
     }
-    wxSEH_HANDLE(THREAD_ERROR_EXIT)
+    wxSEH_HANDLE((THREAD_RETVAL)-1)
 
 
     // save IsDetached because thread object can be deleted by joinable
@@ -656,7 +606,7 @@ void wxThreadInternal::SetPriority(unsigned int priority)
 bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 {
     wxASSERT_MSG( m_state == STATE_NEW && !m_hThread,
-                    wxT("Create()ing thread twice?") );
+                    _T("Create()ing thread twice?") );
 
     // for compilers which have it, we should use C RTL function for thread
     // creation instead of Win32 API one because otherwise we will have memory
@@ -708,9 +658,7 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
 
 wxThreadError wxThreadInternal::Kill()
 {
-    m_thread->OnKill();
-
-    if ( !::TerminateThread(m_hThread, THREAD_ERROR_EXIT) )
+    if ( !::TerminateThread(m_hThread, (DWORD)-1) )
     {
         wxLogSysError(_("Couldn't terminate thread"));
 
@@ -725,7 +673,6 @@ wxThreadError wxThreadInternal::Kill()
 wxThreadError
 wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
                                    wxThread::ExitCode *pRc,
-                                   wxThreadWait waitMode,
                                    wxThread *threadToDelete)
 {
     // prevent the thread C++ object from disappearing as long as we are using
@@ -737,7 +684,7 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
     // from Wait()) or ask it to terminate (when called from Delete())
     bool shouldDelete = threadToDelete != NULL;
 
-    DWORD rc = 0;
+    wxThread::ExitCode rc = 0;
 
     // we might need to resume the thread if it's currently stopped
     bool shouldResume = false;
@@ -784,8 +731,6 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
         Cancel();
     }
 
-    if ( threadToDelete )
-        threadToDelete->OnDelete();
 
     // now wait for thread to finish
     if ( wxThread::IsMain() )
@@ -812,22 +757,35 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
             }
         }
 
-        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-        if ( traits )
+#if !defined(QS_ALLPOSTMESSAGE)
+#define QS_ALLPOSTMESSAGE 0
+#endif
+        if ( !wxRunningEventLoopCount )
         {
-            result = traits->WaitForThread(m_hThread, waitMode);
+            // don't ask for Windows messages if we don't have a running event
+            // loop to process them as otherwise we'd enter an infinite loop
+            // with MsgWaitForMultipleObjects() always returning WAIT_OBJECT_0
+            // + 1 because the message would remain forever in the queue
+            result = ::WaitForSingleObject(m_hThread, INFINITE);
         }
-        else // can't wait for the thread
+        else // wait for thread termination without blocking the GUI
         {
-            // so kill it below
-            result = 0xFFFFFFFF;
+            result = ::MsgWaitForMultipleObjects
+                     (
+                       1,              // number of objects to wait for
+                       &m_hThread,     // the objects
+                       false,          // don't wait for all objects
+                       INFINITE,       // no timeout
+                       QS_ALLINPUT |   // return as soon as there are any events
+                       QS_ALLPOSTMESSAGE
+                     );
         }
 
         switch ( result )
         {
             case 0xFFFFFFFF:
                 // error
-                wxLogSysError(_("Cannot wait for thread termination"));
+                wxLogSysError(_("Can not wait for thread termination"));
                 Kill();
                 return wxTHREAD_KILLED;
 
@@ -846,6 +804,9 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
                 //     the system might dead lock then
                 if ( wxThread::IsMain() )
                 {
+                    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits()
+                                                   : NULL;
+
                     if ( traits && !traits->DoMessageFromThreadWait() )
                     {
                         // WM_QUIT received: kill the thread
@@ -872,16 +833,16 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
     // terminated if the "if" above hadn't been taken
     for ( ;; )
     {
-        if ( !::GetExitCodeThread(m_hThread, &rc) )
+        if ( !::GetExitCodeThread(m_hThread, (LPDWORD)&rc) )
         {
             wxLogLastError(wxT("GetExitCodeThread"));
 
-            rc = THREAD_ERROR_EXIT;
+            rc = (wxThread::ExitCode)-1;
 
             break;
         }
 
-        if ( rc != STILL_ACTIVE )
+        if ( (DWORD)rc != STILL_ACTIVE )
             break;
 
         // give the other thread some time to terminate, otherwise we may be
@@ -890,13 +851,14 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
     }
 
     if ( pRc )
-        *pRc = wxUIntToPtr(rc);
+        *pRc = rc;
 
     // we don't need the thread handle any more in any case
     Free();
 
 
-    return rc == THREAD_ERROR_EXIT ? wxTHREAD_MISC_ERROR : wxTHREAD_NO_ERROR;
+    return rc == (wxThread::ExitCode)-1 ? wxTHREAD_MISC_ERROR
+                                        : wxTHREAD_NO_ERROR;
 }
 
 bool wxThreadInternal::Suspend()
@@ -904,7 +866,7 @@ bool wxThreadInternal::Suspend()
     DWORD nSuspendCount = ::SuspendThread(m_hThread);
     if ( nSuspendCount == (DWORD)-1 )
     {
-        wxLogSysError(_("Cannot suspend thread %x"), m_hThread);
+        wxLogSysError(_("Can not suspend thread %x"), m_hThread);
 
         return false;
     }
@@ -919,7 +881,7 @@ bool wxThreadInternal::Resume()
     DWORD nSuspendCount = ::ResumeThread(m_hThread);
     if ( nSuspendCount == (DWORD)-1 )
     {
-        wxLogSysError(_("Cannot resume thread %x"), m_hThread);
+        wxLogSysError(_("Can not resume thread %x"), m_hThread);
 
         return false;
     }
@@ -953,6 +915,11 @@ wxThread *wxThread::This()
     return thread;
 }
 
+bool wxThread::IsMain()
+{
+    return ::GetCurrentThreadId() == gs_idMainThread || gs_idMainThread == 0;
+}
+
 void wxThread::Yield()
 {
     // 0 argument to Sleep() is special and means to just give away the rest of
@@ -960,6 +927,11 @@ void wxThread::Yield()
     ::Sleep(0);
 }
 
+void wxThread::Sleep(unsigned long milliseconds)
+{
+    ::Sleep(milliseconds);
+}
+
 int wxThread::GetCPUCount()
 {
     SYSTEM_INFO si;
@@ -978,7 +950,7 @@ bool wxThread::SetConcurrency(size_t WXUNUSED_IN_WINCE(level))
 #ifdef __WXWINCE__
     return false;
 #else
-    wxASSERT_MSG( IsMain(), wxT("should only be called from the main thread") );
+    wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );
 
     // ok only for the default one
     if ( level == 0 )
@@ -989,7 +961,7 @@ bool wxThread::SetConcurrency(size_t WXUNUSED_IN_WINCE(level))
     DWORD_PTR dwProcMask, dwSysMask;
     if ( ::GetProcessAffinityMask(hProcess, &dwProcMask, &dwSysMask) == 0 )
     {
-        wxLogLastError(wxT("GetProcessAffinityMask"));
+        wxLogLastError(_T("GetProcessAffinityMask"));
 
         return false;
     }
@@ -1028,7 +1000,7 @@ bool wxThread::SetConcurrency(size_t WXUNUSED_IN_WINCE(level))
     // could we set all bits?
     if ( level != 0 )
     {
-        wxLogDebug(wxT("bad level %u in wxThread::SetConcurrency()"), level);
+        wxLogDebug(_T("bad level %u in wxThread::SetConcurrency()"), level);
 
         return false;
     }
@@ -1043,7 +1015,7 @@ bool wxThread::SetConcurrency(size_t WXUNUSED_IN_WINCE(level))
 
     if ( !pfnSetProcessAffinityMask )
     {
-        HMODULE hModKernel = ::LoadLibrary(wxT("kernel32"));
+        HMODULE hModKernel = ::LoadLibrary(_T("kernel32"));
         if ( hModKernel )
         {
             pfnSetProcessAffinityMask = (SETPROCESSAFFINITYMASK)
@@ -1052,7 +1024,7 @@ bool wxThread::SetConcurrency(size_t WXUNUSED_IN_WINCE(level))
 
         // we've discovered a MT version of Win9x!
         wxASSERT_MSG( pfnSetProcessAffinityMask,
-                      wxT("this system has several CPUs but no SetProcessAffinityMask function?") );
+                      _T("this system has several CPUs but no SetProcessAffinityMask function?") );
     }
 
     if ( !pfnSetProcessAffinityMask )
@@ -1063,7 +1035,7 @@ bool wxThread::SetConcurrency(size_t WXUNUSED_IN_WINCE(level))
 
     if ( pfnSetProcessAffinityMask(hProcess, dwProcMask) == 0 )
     {
-        wxLogLastError(wxT("SetProcessAffinityMask"));
+        wxLogLastError(_T("SetProcessAffinityMask"));
 
         return false;
     }
@@ -1104,8 +1076,11 @@ wxThreadError wxThread::Run()
 {
     wxCriticalSectionLocker lock(m_critsect);
 
-    wxCHECK_MSG( m_internal->GetState() == STATE_NEW, wxTHREAD_RUNNING,
-             wxT("thread may only be started once after Create()") );
+    if ( m_internal->GetState() != STATE_NEW )
+    {
+        // actually, it may be almost any state at all, not only STATE_RUNNING
+        return wxTHREAD_RUNNING;
+    }
 
     // the thread has just been created and is still suspended - let it run
     return Resume();
@@ -1131,23 +1106,23 @@ wxThreadError wxThread::Resume()
 // stopping thread
 // ---------------
 
-wxThread::ExitCode wxThread::Wait(wxThreadWait waitMode)
+wxThread::ExitCode wxThread::Wait()
 {
-    ExitCode rc = wxUIntToPtr(THREAD_ERROR_EXIT);
-
     // although under Windows we can wait for any thread, it's an error to
     // wait for a detached one in wxWin API
-    wxCHECK_MSG( !IsDetached(), rc,
-                 wxT("wxThread::Wait(): can't wait for detached thread") );
+    wxCHECK_MSG( !IsDetached(), (ExitCode)-1,
+                 _T("wxThread::Wait(): can't wait for detached thread") );
 
-    (void)m_internal->WaitForTerminate(m_critsect, &rc, waitMode);
+    ExitCode rc = (ExitCode)-1;
+
+    (void)m_internal->WaitForTerminate(m_critsect, &rc);
 
     return rc;
 }
 
-wxThreadError wxThread::Delete(ExitCode *pRc, wxThreadWait waitMode)
+wxThreadError wxThread::Delete(ExitCode *pRc)
 {
-    return m_internal->WaitForTerminate(m_critsect, pRc, waitMode, this);
+    return m_internal->WaitForTerminate(m_critsect, pRc, this);
 }
 
 wxThreadError wxThread::Kill()
@@ -1173,8 +1148,6 @@ wxThreadError wxThread::Kill()
 
 void wxThread::Exit(ExitCode status)
 {
-    wxThreadInternal::DoThreadOnExit(this);
-
     m_internal->Free();
 
     if ( IsDetached() )
@@ -1189,7 +1162,7 @@ void wxThread::Exit(ExitCode status)
     }
 
 #ifdef wxUSE_BEGIN_THREAD
-    _endthreadex(wxPtrToUInt(status));
+    _endthreadex((unsigned)status);
 #else // !VC++
     ::ExitThread((DWORD)status);
 #endif // VC++/!VC++
@@ -1209,28 +1182,28 @@ void wxThread::SetPriority(unsigned int prio)
 
 unsigned int wxThread::GetPriority() const
 {
-    wxCriticalSectionLocker lock(const_cast<wxCriticalSection &>(m_critsect));
+    wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); // const_cast
 
     return m_internal->GetPriority();
 }
 
 unsigned long wxThread::GetId() const
 {
-    wxCriticalSectionLocker lock(const_cast<wxCriticalSection &>(m_critsect));
+    wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); // const_cast
 
     return (unsigned long)m_internal->GetId();
 }
 
 bool wxThread::IsRunning() const
 {
-    wxCriticalSectionLocker lock(const_cast<wxCriticalSection &>(m_critsect));
+    wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); // const_cast
 
     return m_internal->GetState() == STATE_RUNNING;
 }
 
 bool wxThread::IsAlive() const
 {
-    wxCriticalSectionLocker lock(const_cast<wxCriticalSection &>(m_critsect));
+    wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); // const_cast
 
     return (m_internal->GetState() == STATE_RUNNING) ||
            (m_internal->GetState() == STATE_PAUSED);
@@ -1238,14 +1211,14 @@ bool wxThread::IsAlive() const
 
 bool wxThread::IsPaused() const
 {
-    wxCriticalSectionLocker lock(const_cast<wxCriticalSection &>(m_critsect));
+    wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); // const_cast
 
     return m_internal->GetState() == STATE_PAUSED;
 }
 
 bool wxThread::TestDestroy()
 {
-    wxCriticalSectionLocker lock(const_cast<wxCriticalSection &>(m_critsect));
+    wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect); // const_cast
 
     return m_internal->GetState() == STATE_CANCELED;
 }
@@ -1287,7 +1260,7 @@ bool wxThreadModule::OnInit()
         ::TlsFree(gs_tlsThisThread);
         gs_tlsThisThread = 0xFFFFFFFF;
 
-        wxLogSysError(_("Thread module initialization failed: cannot store value in thread local storage"));
+        wxLogSysError(_("Thread module initialization failed: can not store value in thread local storage"));
 
         return false;
     }
@@ -1299,7 +1272,8 @@ bool wxThreadModule::OnInit()
 
     gs_critsectThreadDelete = new wxCriticalSection;
 
-    wxThread::ms_idMainThread = wxThread::GetCurrentId();
+    // no error return for GetCurrentThreadId()
+    gs_idMainThread = ::GetCurrentThreadId();
 
     return true;
 }
@@ -1311,15 +1285,18 @@ void wxThreadModule::OnExit()
         wxLogLastError(wxT("TlsFree failed."));
     }
 
-    wxDELETE(gs_critsectThreadDelete);
+    delete gs_critsectThreadDelete;
+    gs_critsectThreadDelete = NULL;
 
     if ( gs_critsectGui )
     {
         gs_critsectGui->Leave();
-        wxDELETE(gs_critsectGui);
+        delete gs_critsectGui;
+        gs_critsectGui = NULL;
     }
 
-    wxDELETE(gs_critsectWaitingForGui);
+    delete gs_critsectWaitingForGui;
+    gs_critsectWaitingForGui = NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -1327,7 +1304,7 @@ void wxThreadModule::OnExit()
 // not a mutex, so the names are a bit confusing
 // ----------------------------------------------------------------------------
 
-void wxMutexGuiEnterImpl()
+void WXDLLIMPEXP_BASE wxMutexGuiEnter()
 {
     // this would dead lock everything...
     wxASSERT_MSG( !wxThread::IsMain(),
@@ -1349,7 +1326,7 @@ void wxMutexGuiEnterImpl()
     gs_critsectGui->Enter();
 }
 
-void wxMutexGuiLeaveImpl()
+void WXDLLIMPEXP_BASE wxMutexGuiLeave()
 {
     wxCriticalSectionLocker enter(*gs_critsectWaitingForGui);
 
@@ -1410,7 +1387,7 @@ bool WXDLLIMPEXP_BASE wxGuiOwnedByMainThread()
 void WXDLLIMPEXP_BASE wxWakeUpMainThread()
 {
     // sending any message would do - hopefully WM_NULL is harmless enough
-    if ( !::PostThreadMessage(wxThread::GetMainId(), WM_NULL, 0, 0) )
+    if ( !::PostThreadMessage(gs_idMainThread, WM_NULL, 0, 0) )
     {
         // should never happen
         wxLogLastError(wxT("PostThreadMessage(WM_NULL)"));
diff --git a/Source/3rd Party/wx/src/msw/timer.cpp b/Source/3rd Party/wx/src/msw/timer.cpp
index 8e75b355a..492ff3f99 100644
--- a/Source/3rd Party/wx/src/msw/timer.cpp	
+++ b/Source/3rd Party/wx/src/msw/timer.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: timer.cpp 63485 2010-02-15 17:30:58Z RD $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,10 +18,11 @@
 
 #if wxUSE_TIMER
 
-#include "wx/msw/private/timer.h"
+#include "wx/timer.h"
 
 #ifndef WX_PRECOMP
     #include "wx/list.h"
+    #include "wx/window.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.h"
@@ -31,7 +32,6 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/private/hiddenwin.h"
 
 // ----------------------------------------------------------------------------
 // private globals
@@ -39,7 +39,7 @@
 
 // define a hash containing all the timers: it is indexed by timer id and
 // contains the corresponding timer
-WX_DECLARE_HASH_MAP(WPARAM, wxMSWTimerImpl *, wxIntegerHash, wxIntegerEqual,
+WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual,
                     wxTimerMap);
 
 // instead of using a global here, wrap it in a static function as otherwise it
@@ -53,7 +53,7 @@ static wxTimerMap& TimerMap()
 }
 
 // This gets a unique, non-zero timer ID and creates an entry in the TimerMap
-UINT_PTR GetNewTimerId(wxMSWTimerImpl *t)
+UINT_PTR GetNewTimerId(wxTimer *t)
 {
     static UINT_PTR lastTimerId = 0;
 
@@ -77,6 +77,11 @@ UINT_PTR GetNewTimerId(wxMSWTimerImpl *t)
 LRESULT APIENTRY _EXPORT wxTimerWndProc(HWND hWnd, UINT message,
                                         WPARAM wParam, LPARAM lParam);
 
+// implemented in utils.cpp
+extern "C" WXDLLIMPEXP_BASE HWND
+wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
+
+
 // ----------------------------------------------------------------------------
 // wxTimerHiddenWindowModule: used to manage the hidden window used for
 // catching timer messages (we need a module to ensure that the window is
@@ -105,21 +110,39 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxTimerHiddenWindowModule, wxModule)
 
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
+
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 // ----------------------------------------------------------------------------
-// wxMSWTimerImpl class
+// wxTimer class
 // ----------------------------------------------------------------------------
 
-bool wxMSWTimerImpl::Start(int milliseconds, bool oneShot)
+void wxTimer::Init()
 {
-    if ( !wxTimerImpl::Start(milliseconds, oneShot) )
+    m_id = 0;
+}
+
+wxTimer::~wxTimer()
+{
+    wxTimer::Stop();
+}
+
+bool wxTimer::Start(int milliseconds, bool oneShot)
+{
+    if ( !wxTimerBase::Start(milliseconds, oneShot) )
         return false;
 
     m_id = GetNewTimerId(this);
+
     // SetTimer() normally returns just idTimer but this might change in the
     // future so use its return value to be safe
     UINT_PTR ret = ::SetTimer
@@ -130,7 +153,7 @@ bool wxMSWTimerImpl::Start(int milliseconds, bool oneShot)
               NULL                                   // timer proc (unused)
              );
 
-    if ( ret == 0 )
+    if ( !ret )
     {
         wxLogSysError(_("Couldn't create a timer"));
 
@@ -140,20 +163,23 @@ bool wxMSWTimerImpl::Start(int milliseconds, bool oneShot)
     return true;
 }
 
-void wxMSWTimerImpl::Stop()
+void wxTimer::Stop()
 {
-    ::KillTimer(wxTimerHiddenWindowModule::GetHWND(), m_id);
-    TimerMap().erase(m_id);
-    m_id = 0;
+    if ( m_id )
+    {
+        ::KillTimer(wxTimerHiddenWindowModule::GetHWND(), m_id);
+        TimerMap().erase(m_id);
+        m_id = 0;
+    }
 }
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
-void wxProcessTimer(wxMSWTimerImpl& timer)
+void wxProcessTimer(wxTimer& timer)
 {
-    wxASSERT_MSG( timer.IsRunning(), wxT("bogus timer id") );
+    wxASSERT_MSG( timer.m_id != 0, _T("bogus timer id") );
 
     if ( timer.IsOneShot() )
         timer.Stop();
@@ -167,19 +193,17 @@ LRESULT APIENTRY _EXPORT wxTimerWndProc(HWND hWnd, UINT message,
 {
     if ( message == WM_TIMER )
     {
-        wxTimerMap::iterator node = TimerMap().find(wParam);
+        wxTimerMap::iterator node = TimerMap().find((unsigned long)wParam);
 
-        if ( node != TimerMap().end() )
-        {
-            wxProcessTimer(*(node->second));
+        wxCHECK_MSG( node != TimerMap().end(), 0, wxT("bogus timer id in wxTimerProc") );
 
-            return 0;
-        }
-        //else: Unknown timer, probably one of our timers that had fired just
-        //      before being removed from the timers map by Stop().
+        wxProcessTimer(*(node->second));
     }
-
-    return ::DefWindowProc(hWnd, message, wParam, lParam);
+    else
+    {
+        return ::DefWindowProc(hWnd, message, wParam, lParam);
+    }
+    return 0;
 }
 
 // ----------------------------------------------------------------------------
@@ -193,10 +217,8 @@ const wxChar *wxTimerHiddenWindowModule::ms_className = NULL;
 
 bool wxTimerHiddenWindowModule::OnInit()
 {
-    // do not initialize ms_hwnd to ms_className to NULL here: it may happen
-    // that our GetHWND() is called before the modules are initialized if a
-    // timer is created from wxApp-derived class ctor and in this case we
-    // shouldn't overwrite it
+    ms_hwnd = NULL;
+    ms_className = NULL;
 
     return true;
 }
@@ -207,7 +229,7 @@ void wxTimerHiddenWindowModule::OnExit()
     {
         if ( !::DestroyWindow(ms_hwnd) )
         {
-            wxLogLastError(wxT("DestroyWindow(wxTimerHiddenWindow)"));
+            wxLogLastError(_T("DestroyWindow(wxTimerHiddenWindow)"));
         }
 
         ms_hwnd = NULL;
@@ -217,7 +239,7 @@ void wxTimerHiddenWindowModule::OnExit()
     {
         if ( !::UnregisterClass(ms_className, wxGetInstance()) )
         {
-            wxLogLastError(wxT("UnregisterClass(\"wxTimerHiddenWindow\")"));
+            wxLogLastError(_T("UnregisterClass(\"wxTimerHiddenWindow\")"));
         }
 
         ms_className = NULL;
@@ -227,7 +249,7 @@ void wxTimerHiddenWindowModule::OnExit()
 /* static */
 HWND wxTimerHiddenWindowModule::GetHWND()
 {
-    static const wxChar *HIDDEN_WINDOW_CLASS = wxT("wxTimerHiddenWindow");
+    static const wxChar *HIDDEN_WINDOW_CLASS = _T("wxTimerHiddenWindow");
     if ( !ms_hwnd )
     {
         ms_hwnd = wxCreateHiddenWindow(&ms_className, HIDDEN_WINDOW_CLASS,
diff --git a/Source/3rd Party/wx/src/msw/tooltip.cpp b/Source/3rd Party/wx/src/msw/tooltip.cpp
index 9c51d237d..f68dc01ba 100644
--- a/Source/3rd Party/wx/src/msw/tooltip.cpp	
+++ b/Source/3rd Party/wx/src/msw/tooltip.cpp	
@@ -4,7 +4,7 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.01.99
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: tooltip.cpp 62542 2009-11-03 14:11:01Z VZ $
 // Copyright:   (c) 1999 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -31,10 +31,10 @@
     #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/app.h"
     #include "wx/control.h"
+    #include "wx/combobox.h"
 #endif
 
 #include "wx/tokenzr.h"
-#include "wx/vector.h"
 #include "wx/msw/private.h"
 
 #ifndef TTTOOLINFO_V1_SIZE
@@ -62,9 +62,6 @@
 // the tooltip parent window
 WXHWND wxToolTip::ms_hwndTT = (WXHWND)NULL;
 
-// new tooltip maximum width, default value is set on first call to wxToolTip::Add()
-int wxToolTip::ms_maxWidth = 0;
-
 #if wxUSE_TTM_WINDOWFROMPOINT
 
 // the tooltip window proc
@@ -76,12 +73,6 @@ static WNDPROC gs_wndprocToolTip = (WNDPROC)NULL;
 // private classes
 // ----------------------------------------------------------------------------
 
-// This is simply a wrapper for vector<HWND> but defined as a class to hide the
-// details from the public header.
-class wxToolTipOtherWindows : public wxVector<WXHWND>
-{
-};
-
 // a wrapper around TOOLINFO Win32 structure
 #ifdef __VISUALC__
     #pragma warning( disable : 4097 ) // we inherit from a typedef - so what?
@@ -90,7 +81,7 @@ class wxToolTipOtherWindows : public wxVector<WXHWND>
 class wxToolInfo : public TOOLINFO
 {
 public:
-    wxToolInfo(HWND hwndOwner, unsigned int id, const wxRect& rc)
+    wxToolInfo(HWND hwndOwner)
     {
         // initialize all members
         ::ZeroMemory(this, sizeof(TOOLINFO));
@@ -102,27 +93,7 @@ public:
         cbSize = TTTOOLINFO_V1_SIZE;
 
         hwnd = hwndOwner;
-
-        if (rc.IsEmpty())
-        {
-            uFlags = TTF_IDISHWND;
-            uId = (UINT_PTR)hwndOwner;
-        }
-        else
-        {
-            // this tooltip must be shown only if the mouse hovers a specific rect
-            // of the hwnd parameter!
-            rect.left = rc.GetLeft();
-            rect.right = rc.GetRight();
-            rect.top = rc.GetTop();
-            rect.bottom = rc.GetBottom();
-
-            // note that not setting TTF_IDISHWND from the uFlags member means that the
-            // ti.uId field should not contain the HWND but rather as MSDN says an
-            // "Application-defined identifier of the tool"; this is used internally by
-            // Windows to distinguish the different tooltips attached to the same window
-            uId = id;
-        }
+        uFlags = TTF_IDISHWND;
 
         // we use TTF_TRANSPARENT to fix a problem which arises at least with
         // the text controls but may presumably happen with other controls
@@ -134,6 +105,8 @@ public:
         {
             uFlags |= TTF_TRANSPARENT;
         }
+
+        uId = (UINT)hwndOwner;
     }
 };
 
@@ -237,25 +210,6 @@ void wxToolTip::SetDelay(long milliseconds)
                             TTDT_INITIAL, milliseconds);
 }
 
-void wxToolTip::SetAutoPop(long milliseconds)
-{
-    SendTooltipMessageToAll(ms_hwndTT, TTM_SETDELAYTIME,
-                            TTDT_AUTOPOP, milliseconds);
-}
-
-void wxToolTip::SetReshow(long milliseconds)
-{
-    SendTooltipMessageToAll(ms_hwndTT, TTM_SETDELAYTIME,
-                            TTDT_RESHOW, milliseconds);
-}
-
-void wxToolTip::SetMaxWidth(int width)
-{
-    wxASSERT_MSG( width == -1 || width >= 0, wxT("invalid width value") );
-
-    ms_maxWidth = width;
-}
-
 // ---------------------------------------------------------------------------
 // implementation helpers
 // ---------------------------------------------------------------------------
@@ -315,23 +269,6 @@ wxToolTip::wxToolTip(const wxString &tip)
          : m_text(tip)
 {
     m_window = NULL;
-    m_others = NULL;
-
-    // make sure m_rect.IsEmpty() == true
-    m_rect.SetWidth(0);
-    m_rect.SetHeight(0);
-
-    // since m_rect is not valid, m_id is ignored by wxToolInfo ctor...
-    m_id = 0;
-}
-
-wxToolTip::wxToolTip(wxWindow* win, unsigned int id, const wxString &tip, const wxRect& rc)
-         : m_text(tip), m_rect(rc), m_id(id)
-{
-    m_window = NULL;
-    m_others = NULL;
-
-    SetWindow(win);
 }
 
 wxToolTip::~wxToolTip()
@@ -339,56 +276,32 @@ wxToolTip::~wxToolTip()
     // the tooltip has to be removed before deleting. Otherwise, if it is visible
     // while being deleted, there will be a delay before it goes away.
     Remove();
-
-    delete m_others;
 }
 
 // ----------------------------------------------------------------------------
 // others
 // ----------------------------------------------------------------------------
 
-/* static */
-void wxToolTip::Remove(WXHWND hWnd, unsigned int id, const wxRect& rc)
+void wxToolTip::Remove(WXHWND hWnd)
 {
-    wxToolInfo ti((HWND)hWnd, id, rc);
-
+    wxToolInfo ti((HWND)hWnd);
     (void)SendTooltipMessage(GetToolTipCtrl(), TTM_DELTOOL, &ti);
 }
 
-void wxToolTip::DoRemove(WXHWND hWnd)
-{
-    if ( m_window && hWnd == m_window->GetHWND() )
-    {
-        // Remove the tooltip from the main window.
-        Remove(hWnd, m_id, m_rect);
-    }
-    else
-    {
-        // Not really sure what to pass to remove in this case...
-        Remove(hWnd, 0, wxRect());
-    }
-}
-
 void wxToolTip::Remove()
 {
-    DoForAllWindows(&wxToolTip::DoRemove);
+    // remove this tool from the tooltip control
+    if ( m_window )
+    {
+        Remove(m_window->GetHWND());
+    }
 }
 
-void wxToolTip::AddOtherWindow(WXHWND hWnd)
-{
-    if ( !m_others )
-        m_others = new wxToolTipOtherWindows;
-
-    m_others->push_back(hWnd);
-
-    DoAddHWND(hWnd);
-}
-
-void wxToolTip::DoAddHWND(WXHWND hWnd)
+void wxToolTip::Add(WXHWND hWnd)
 {
     HWND hwnd = (HWND)hWnd;
 
-    wxToolInfo ti(hwnd, m_id, m_rect);
+    wxToolInfo ti(hwnd);
 
     // another possibility would be to specify LPSTR_TEXTCALLBACK here as we
     // store the tooltip text ourselves anyhow, and provide it in response to
@@ -397,98 +310,82 @@ void wxToolTip::DoAddHWND(WXHWND hWnd)
     // NMTTDISPINFO struct -- and setting the tooltip here we can have tooltips
     // of any length
     ti.hwnd = hwnd;
-    ti.lpszText = wxMSW_CONV_LPTSTR(m_text);
+    ti.lpszText = (wxChar *)m_text.c_str(); // const_cast
 
     if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, &ti) )
     {
-        wxLogDebug(wxT("Failed to create the tooltip '%s'"), m_text.c_str());
-
-        return;
-    }
-
-#ifdef TTM_SETMAXTIPWIDTH
-    if ( wxApp::GetComCtl32Version() >= 470 )
-    {
-        // use TTM_SETMAXTIPWIDTH to make tooltip multiline using the
-        // extent of its first line as max value
-        HFONT hfont = (HFONT)
-            SendTooltipMessage(GetToolTipCtrl(), WM_GETFONT, 0);
-
-        if ( !hfont )
-        {
-            hfont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
-            if ( !hfont )
-            {
-                wxLogLastError(wxT("GetStockObject(DEFAULT_GUI_FONT)"));
-            }
-        }
-
-        MemoryHDC hdc;
-        if ( !hdc )
-        {
-            wxLogLastError(wxT("CreateCompatibleDC(NULL)"));
-        }
-
-        if ( !SelectObject(hdc, hfont) )
-        {
-            wxLogLastError(wxT("SelectObject(hfont)"));
-        }
-
-        // find the width of the widest line
-        int maxWidth = 0;
-        wxStringTokenizer tokenizer(m_text, wxT("\n"));
-        while ( tokenizer.HasMoreTokens() )
-        {
-            const wxString token = tokenizer.GetNextToken();
-
-            SIZE sz;
-            if ( !::GetTextExtentPoint32(hdc, token.t_str(),
-                                         token.length(), &sz) )
-            {
-                wxLogLastError(wxT("GetTextExtentPoint32"));
-            }
-
-            if ( sz.cx > maxWidth )
-                maxWidth = sz.cx;
-        }
-
-        // limit size to ms_maxWidth, if set
-        if ( ms_maxWidth == 0 )
-        {
-            // this is more or less arbitrary but seems to work well
-            static const int DEFAULT_MAX_WIDTH = 400;
-
-            ms_maxWidth = wxGetClientDisplayRect().width / 2;
-
-            if ( ms_maxWidth > DEFAULT_MAX_WIDTH )
-                ms_maxWidth = DEFAULT_MAX_WIDTH;
-        }
-
-        if ( ms_maxWidth != -1 && maxWidth > ms_maxWidth )
-            maxWidth = ms_maxWidth;
-
-        // only set a new width if it is bigger than the current setting:
-        // otherwise adding a tooltip with shorter line(s) than a previous
-        // one would result in breaking the longer lines unnecessarily as
-        // all our tooltips share the same maximal width
-        if ( maxWidth > SendTooltipMessage(GetToolTipCtrl(),
-                                           TTM_GETMAXTIPWIDTH, 0) )
-        {
-            SendTooltipMessage(GetToolTipCtrl(), TTM_SETMAXTIPWIDTH,
-                               wxUIntToPtr(maxWidth));
-        }
+        wxLogDebug(_T("Failed to create the tooltip '%s'"), m_text.c_str());
     }
     else
-#endif // TTM_SETMAXTIPWIDTH
     {
-        // replace the '\n's with spaces because otherwise they appear as
-        // unprintable characters in the tooltip string
-        m_text.Replace(wxT("\n"), wxT(" "));
-        ti.lpszText = wxMSW_CONV_LPTSTR(m_text);
+        // check for multiline toopltip
+        int index = m_text.Find(_T('\n'));
 
-        if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, &ti) )
+        if ( index != wxNOT_FOUND )
         {
-            wxLogDebug(wxT("Failed to create the tooltip '%s'"), m_text.c_str());
+#ifdef TTM_SETMAXTIPWIDTH
+            if ( wxApp::GetComCtl32Version() >= 470 )
+            {
+                // use TTM_SETMAXTIPWIDTH to make tooltip multiline using the
+                // extent of its first line as max value
+                HFONT hfont = (HFONT)
+                    SendTooltipMessage(GetToolTipCtrl(), WM_GETFONT, 0);
+
+                if ( !hfont )
+                {
+                    hfont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
+                    if ( !hfont )
+                    {
+                        wxLogLastError(wxT("GetStockObject(DEFAULT_GUI_FONT)"));
+                    }
+                }
+
+                MemoryHDC hdc;
+                if ( !hdc )
+                {
+                    wxLogLastError(wxT("CreateCompatibleDC(NULL)"));
+                }
+
+                if ( !SelectObject(hdc, hfont) )
+                {
+                    wxLogLastError(wxT("SelectObject(hfont)"));
+                }
+
+                // find the width of the widest line
+                int max = 0;
+                wxStringTokenizer tokenizer(m_text, _T("\n"));
+                wxString token = tokenizer.GetNextToken();
+                while (token.length())
+                {
+                    SIZE sz;
+                    if ( !::GetTextExtentPoint32(hdc, token, token.length(), &sz) )
+                    {
+                        wxLogLastError(wxT("GetTextExtentPoint32"));
+                    }
+                    if ( sz.cx > max )
+                        max = sz.cx;
+
+                    token = tokenizer.GetNextToken();
+                }
+
+                // only set a new width if it is bigger than the current setting
+                if (max > SendTooltipMessage(GetToolTipCtrl(), TTM_GETMAXTIPWIDTH, 0))
+                    SendTooltipMessage(GetToolTipCtrl(), TTM_SETMAXTIPWIDTH,
+                                       (void *)max);
+            }
+            else
+#endif // comctl32.dll >= 4.70
+            {
+                // replace the '\n's with spaces because otherwise they appear as
+                // unprintable characters in the tooltip string
+                m_text.Replace(_T("\n"), _T(" "));
+                ti.lpszText = (wxChar *)m_text.c_str(); // const_cast
+
+                if ( !SendTooltipMessage(GetToolTipCtrl(), TTM_ADDTOOL, &ti) )
+                {
+                    wxLogDebug(_T("Failed to create the tooltip '%s'"), m_text.c_str());
+                }
+            }
         }
     }
 }
@@ -502,10 +399,10 @@ void wxToolTip::SetWindow(wxWindow *win)
     // add the window itself
     if ( m_window )
     {
-        DoAddHWND(m_window->GetHWND());
+        Add(m_window->GetHWND());
     }
 #if !defined(__WXUNIVERSAL__)
-    // and all of its subcontrols (e.g. radio buttons in a radiobox) as well
+    // and all of its subcontrols (e.g. radiobuttons in a radiobox) as well
     wxControl *control = wxDynamicCast(m_window, wxControl);
     if ( control )
     {
@@ -517,69 +414,50 @@ void wxToolTip::SetWindow(wxWindow *win)
             HWND hwnd = GetDlgItem(GetHwndOf(m_window), id);
             if ( !hwnd )
             {
-                // maybe it's a child of parent of the control, in fact?
+                // may be it's a child of parent of the control, in fact?
                 // (radiobuttons are subcontrols, i.e. children of the radiobox
                 // for wxWidgets but are its siblings at Windows level)
                 hwnd = GetDlgItem(GetHwndOf(m_window->GetParent()), id);
             }
 
             // must have it by now!
-            wxASSERT_MSG( hwnd, wxT("no hwnd for subcontrol?") );
+            wxASSERT_MSG( hwnd, _T("no hwnd for subcontrol?") );
 
-            AddOtherWindow((WXHWND)hwnd);
+            Add((WXHWND)hwnd);
+        }
+    }
+
+    // VZ: it's ugly to do it here, but I don't want any major changes right
+    //     now, later we will probably want to have wxWindow::OnGotToolTip() or
+    //     something like this where the derived class can do such things
+    //     itself instead of wxToolTip "knowing" about them all
+    wxComboBox *combo = wxDynamicCast(control, wxComboBox);
+    if ( combo )
+    {
+        WXHWND hwndComboEdit = combo->GetWindowStyle() & wxCB_READONLY
+                                ? combo->GetHWND()
+                                : combo->GetEditHWND();
+        if ( hwndComboEdit )
+        {
+            Add(hwndComboEdit);
         }
     }
 #endif // !defined(__WXUNIVERSAL__)
 }
 
-void wxToolTip::SetRect(const wxRect& rc)
-{
-    m_rect = rc;
-
-    if ( m_window )
-    {
-        wxToolInfo ti(GetHwndOf(m_window), m_id, m_rect);
-        (void)SendTooltipMessage(GetToolTipCtrl(), TTM_NEWTOOLRECT, &ti);
-    }
-}
-
 void wxToolTip::SetTip(const wxString& tip)
 {
     m_text = tip;
 
-    DoForAllWindows(&wxToolTip::DoSetTip);
-}
-
-void wxToolTip::DoSetTip(WXHWND hWnd)
-{
-    // update the tip text shown by the control
-    wxToolInfo ti((HWND)hWnd, m_id, m_rect);
-
-    // for some reason, changing the tooltip text directly results in
-    // repaint of the controls under it, see #10520 -- but this doesn't
-    // happen if we reset it first
-    ti.lpszText = const_cast<wxChar *>(wxT(""));
-    (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
-
-    ti.lpszText = wxMSW_CONV_LPTSTR(m_text);
-    (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
-}
-
-void wxToolTip::DoForAllWindows(void (wxToolTip::*func)(WXHWND))
-{
     if ( m_window )
     {
-        (this->*func)(m_window->GetHWND());
-    }
+        // update the tip text shown by the control
+        wxToolInfo ti(GetHwndOf(m_window));
+        ti.lpszText = (wxChar *)wxT("");
+        (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
 
-    if ( m_others )
-    {
-        for ( wxToolTipOtherWindows::const_iterator it = m_others->begin();
-              it != m_others->end();
-              ++it )
-        {
-            (this->*func)(*it);
-        }
+        ti.lpszText = (wxChar *)m_text.c_str();
+        (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, &ti);
     }
 }
 
diff --git a/Source/3rd Party/wx/src/msw/toplevel.cpp b/Source/3rd Party/wx/src/msw/toplevel.cpp
index 7b0111250..51db6f383 100644
--- a/Source/3rd Party/wx/src/msw/toplevel.cpp	
+++ b/Source/3rd Party/wx/src/msw/toplevel.cpp	
@@ -4,9 +4,9 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     24.09.01
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: toplevel.cpp 60894 2009-06-04 22:24:13Z VZ $
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -27,13 +27,13 @@
 #include "wx/toplevel.h"
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"
     #include "wx/app.h"
     #include "wx/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
-    #include "wx/menu.h"
     #include "wx/containr.h"        // wxSetFocusToChild()
     #include "wx/module.h"
 #endif //WX_PRECOMP
@@ -48,10 +48,10 @@
     #if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__)
         #include <aygshell.h>
     #endif
+    #include "wx/msw/wince/missing.h"
 #endif
 
 #include "wx/msw/winundef.h"
-#include "wx/msw/missing.h"
 
 #include "wx/display.h"
 
@@ -79,6 +79,17 @@ static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return false; }
 LONG APIENTRY _EXPORT
 wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+// the name of the default wxWidgets class
+#ifdef __WXWINCE__
+extern       wxChar *wxCanvasClassName;
+#else
+extern const wxChar *wxCanvasClassName;
+#endif
+
 // ----------------------------------------------------------------------------
 // wxTLWHiddenParentModule: used to manage the hidden parent window (we need a
 // module to ensure that the window is always deleted)
@@ -129,7 +140,7 @@ void wxTopLevelWindowMSW::Init()
     m_fsIsMaximized = false;
     m_fsIsShowing = false;
 
-    m_winLastFocused = NULL;
+    m_winLastFocused = (wxWindow *)NULL;
 
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
     m_MenuBarHWND = 0;
@@ -142,8 +153,6 @@ void wxTopLevelWindowMSW::Init()
 
     m_activateInfo = (void*) info;
 #endif
-
-    m_menuSystem = NULL;
 }
 
 WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
@@ -213,11 +222,9 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
     }
 
 #ifndef __WXWINCE__
-    // notice that if wxCLOSE_BOX is specified we need to use WS_SYSMENU too as
-    // otherwise the close box doesn't appear
-    if ( style & (wxSYSTEM_MENU | wxCLOSE_BOX) )
+    if ( style & wxSYSTEM_MENU )
         msflags |= WS_SYSMENU;
-#endif // !__WXWINCE__
+#endif
 
     // NB: under CE these 2 styles are not supported currently, we should
     //     call Minimize()/Maximize() "manually" if we want to support them
@@ -228,7 +235,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         msflags |= WS_MAXIMIZE;
 
     // Keep this here because it saves recoding this function in wxTinyFrame
-    if ( style & wxTINY_CAPTION )
+    if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )
         msflags |= WS_CAPTION;
 
     if ( exflags )
@@ -291,7 +298,7 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const
         if ( !parent )
         {
             // this flag doesn't make sense then and will be ignored
-            wxFAIL_MSG( wxT("wxFRAME_FLOAT_ON_PARENT but no parent?") );
+            wxFAIL_MSG( _T("wxFRAME_FLOAT_ON_PARENT but no parent?") );
         }
         else
         {
@@ -329,9 +336,9 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
     WXLRESULT rc = 0;
     bool processed = false;
 
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     switch ( message )
     {
-#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
         case WM_ACTIVATE:
         {
             SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
@@ -358,63 +365,8 @@ WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WX
             }
             break;
         }
-#endif // __SMARTPHONE__ || __POCKETPC__
-
-        case WM_SYSCOMMAND:
-            {
-                // From MSDN:
-                //
-                //      ... the four low-order bits of the wParam parameter are
-                //      used internally by the system. To obtain the correct
-                //      result when testing the value of wParam, an application
-                //      must combine the value 0xFFF0 with the wParam value by
-                //      using the bitwise AND operator.
-                unsigned id = wParam & 0xfff0;
-
-                // Preserve the focus when minimizing/restoring the window: we
-                // need to do it manually as DefWindowProc() doesn't appear to
-                // do this for us for some reason (perhaps because we don't use
-                // WM_NEXTDLGCTL for setting focus?). Moreover, our code in
-                // OnActivate() doesn't work in this case as we receive the
-                // deactivation event too late when the window is being
-                // minimized and the focus is already NULL by then. Similarly,
-                // we receive the activation event too early and restoring
-                // focus in it fails because the window is still minimized. So
-                // we need to do it here.
-                if ( id == SC_MINIMIZE )
-                {
-                    // For minimization, it's simple enough: just save the
-                    // focus as usual. The important thing is that we're not
-                    // minimized yet, so this works correctly.
-                    DoSaveLastFocus();
-                }
-                else if ( id == SC_RESTORE )
-                {
-                    // For restoring, it's trickier as DefWindowProc() sets
-                    // focus to the window itself. So run it first and restore
-                    // our saved focus only afterwards.
-                    processed = true;
-                    rc = wxTopLevelWindowBase::MSWWindowProc(message,
-                                                             wParam, lParam);
-
-                    DoRestoreLastFocus();
-                }
-
-#ifndef __WXUNIVERSAL__
-                // We need to generate events for the custom items added to the
-                // system menu if it had been created (and presumably modified).
-                // As SC_SIZE is the first of the system-defined commands, we
-                // only do this for the custom commands before it and leave
-                // SC_SIZE and everything after it to DefWindowProc().
-                if ( m_menuSystem && id < SC_SIZE )
-                {
-                    if ( m_menuSystem->MSWCommand(0 /* unused anyhow */, id) )
-                        processed = true;
-                }
-#endif // #ifndef __WXUNIVERSAL__
-            }
-            break;
     }
+#endif
 
     if ( !processed )
         rc = wxTopLevelWindowBase::MSWWindowProc(message, wParam, lParam);
@@ -431,9 +383,29 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
     // no dialogs support under MicroWin yet
     return CreateFrame(title, pos, size);
 #else // !__WXMICROWIN__
-    // static cast is valid as we're only ever called for dialogs
-    wxWindow * const
-        parent = static_cast<wxDialog *>(this)->GetParentForModalDialog();
+    wxWindow *parent = GetParent();
+
+    // for the dialogs without wxDIALOG_NO_PARENT style, use the top level
+    // app window as parent - this avoids creating modal dialogs without
+    // parent
+    if ( !parent && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
+    {
+        parent = wxTheApp->GetTopWindow();
+
+        if ( parent )
+        {
+            // don't use transient windows as parents, this is dangerous as it
+            // can lead to a crash if the parent is destroyed before the child
+            //
+            // also don't use the window which is currently hidden as then the
+            // dialog would be hidden as well
+            if ( (parent->GetExtraStyle() & wxWS_EX_TRANSIENT) ||
+                    !parent->IsShown() )
+            {
+                parent = NULL;
+            }
+        }
+    }
 
     m_hWnd = (WXHWND)::CreateDialogIndirect
                        (
@@ -452,16 +424,31 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
         return false;
     }
 
+    WXDWORD exflags;
+    (void)MSWGetCreateWindowFlags(&exflags);
+
+    if ( exflags )
+    {
+        ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exflags);
+        ::SetWindowPos(GetHwnd(),
+                       exflags & WS_EX_TOPMOST ? HWND_TOPMOST : 0,
+                       0, 0, 0, 0,
+                       SWP_NOSIZE |
+                       SWP_NOMOVE |
+                       (exflags & WS_EX_TOPMOST ? 0 : SWP_NOZORDER) |
+                       SWP_NOACTIVATE);
+    }
+
 #if !defined(__WXWINCE__)
     // For some reason, the system menu is activated when we use the
     // WS_EX_CONTEXTHELP style, so let's set a reasonable icon
-    if ( HasExtraStyle(wxWS_EX_CONTEXTHELP) )
+    if ( exflags & WS_EX_CONTEXTHELP )
     {
         wxFrame *winTop = wxDynamicCast(wxTheApp->GetTopWindow(), wxFrame);
         if ( winTop )
         {
             wxIcon icon = winTop->GetIcon();
-            if ( icon.IsOk() )
+            if ( icon.Ok() )
             {
                 ::SendMessage(GetHwnd(), WM_SETICON,
                               (WPARAM)TRUE,
@@ -469,35 +456,34 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
             }
         }
     }
-#endif // !__WXWINCE__
+#endif
 
-    if ( !title.empty() )
-    {
-        ::SetWindowText(GetHwnd(), title.t_str());
-    }
-
-    SubclassWin(m_hWnd);
-
-#if !defined(__WXWINCE__) || defined(__WINCE_STANDARDSDK__)
     // move the dialog to its initial position without forcing repainting
     int x, y, w, h;
     (void)MSWGetCreateWindowCoords(pos, size, x, y, w, h);
 
     if ( x == (int)CW_USEDEFAULT )
     {
-        // Let the system position the window, just set its size.
-        ::SetWindowPos(GetHwnd(), 0,
-                       0, 0, w, h,
-                       SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+        // centre it on the screen - what else can we do?
+        wxSize sizeDpy = wxGetDisplaySize();
+
+        x = (sizeDpy.x - w) / 2;
+        y = (sizeDpy.y - h) / 2;
     }
-    else // Move the window to the desired location and set its size too.
+
+#if !defined(__WXWINCE__) || defined(__WINCE_STANDARDSDK__)
+    if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
     {
-        if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
-        {
-            wxLogLastError(wxT("MoveWindow"));
-        }
+        wxLogLastError(wxT("MoveWindow"));
     }
-#endif // !__WXWINCE__
+#endif
+
+    if ( !title.empty() )
+    {
+        ::SetWindowText(GetHwnd(), title);
+    }
+
+    SubclassWin(m_hWnd);
 
 #ifdef __SMARTPHONE__
     // Work around title non-display glitch
@@ -522,8 +508,7 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
         exflags |= WS_EX_LAYOUTRTL;
 #endif
 
-    return MSWCreate(MSWGetRegisteredClassName(),
-                     title.t_str(), pos, sz, flags, exflags);
+    return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
 }
 
 bool wxTopLevelWindowMSW::Create(wxWindow *parent,
@@ -534,20 +519,21 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
                                  long style,
                                  const wxString& name)
 {
+    bool ret wxDUMMY_INITIALIZE(false);
+
     wxSize sizeReal = size;
     if ( !sizeReal.IsFullySpecified() )
     {
         sizeReal.SetDefaults(GetDefaultSize());
     }
 
-    // notice that we should append this window to wxTopLevelWindows list
-    // before calling CreateBase() as it behaves differently for TLW and
-    // non-TLW windows
-    wxTopLevelWindows.Append(this);
+    m_windowStyle = style;
 
-    bool ret = CreateBase(parent, id, pos, sizeReal, style, name);
-    if ( !ret )
-        return false;
+    SetName(name);
+
+    m_windowId = id == wxID_ANY ? NewControlId() : id;
+
+    wxTopLevelWindows.Append(this);
 
     if ( parent )
         parent->AddChild(this);
@@ -555,8 +541,8 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
     if ( GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
     {
         // we have different dialog templates to allows creation of dialogs
-        // with & without captions under MSWindows, resizable or not (but a
-        // resizable dialog always has caption - otherwise it would look too
+        // with & without captions under MSWindows, resizeable or not (but a
+        // resizeable dialog always has caption - otherwise it would look too
         // strange)
 
         // we need 3 additional WORDs for dialog menu, class and title (as we
@@ -573,13 +559,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
 
         // reuse the code in MSWGetStyle() but correct the results slightly for
         // the dialog
-        //
-        // NB: we need a temporary variable as we can't pass pointer to
-        //     dwExtendedStyle directly, it's not aligned correctly for 64 bit
-        //     architectures
-        WXDWORD dwExtendedStyle;
-        dlgTemplate->style = MSWGetStyle(style, &dwExtendedStyle);
-        dlgTemplate->dwExtendedStyle = dwExtendedStyle;
+        dlgTemplate->style = MSWGetStyle(style, NULL);
 
         // all dialogs are popups
         dlgTemplate->style |= WS_POPUP;
@@ -637,10 +617,6 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
 
 wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
 {
-    delete m_menuSystem;
-
-    SendDestroyEvent();
-
 #if defined(__SMARTPHONE__) || defined(__POCKETPC__)
     SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo;
     delete info;
@@ -669,21 +645,7 @@ void wxTopLevelWindowMSW::DoShowWindow(int nShowCmd)
 {
     ::ShowWindow(GetHwnd(), nShowCmd);
 
-    // Hiding the window doesn't change its iconized state.
-    if ( nShowCmd != SW_HIDE )
-    {
-        // Otherwise restoring, maximizing or showing the window normally also
-        // makes it not iconized and only minimizing it does make it iconized.
-        m_iconized = nShowCmd == SW_MINIMIZE;
-    }
-}
-
-void wxTopLevelWindowMSW::ShowWithoutActivating()
-{
-    if ( !wxWindowBase::Show(true) )
-        return;
-
-    DoShowWindow(SW_SHOWNA);
+    m_iconized = nShowCmd == SW_MINIMIZE;
 }
 
 bool wxTopLevelWindowMSW::Show(bool show)
@@ -707,11 +669,6 @@ bool wxTopLevelWindowMSW::Show(bool show)
 
             m_maximizeOnShow = false;
         }
-        else if ( m_iconized )
-        {
-            // iconize and show
-            nShowCmd = SW_MINIMIZE;
-        }
         else // just show
         {
             // we shouldn't use SW_SHOW which also activates the window for
@@ -729,18 +686,6 @@ bool wxTopLevelWindowMSW::Show(bool show)
         nShowCmd = SW_HIDE;
     }
 
-#if wxUSE_DEFERRED_SIZING
-    // we only set pending size if we're maximized before being shown, now that
-    // we're shown we don't need it any more (it is reset in size event handler
-    // for child windows but we have to do it ourselves for this parent window)
-    //
-    // make sure to reset it before actually showing the window as this will
-    // generate WM_SIZE events and we want to use the correct client size from
-    // them, not the size returned by WM_NCCALCSIZE in DoGetClientSize() which
-    // turns out to be wrong for maximized windows (see #11762)
-    m_pendingSize = wxDefaultSize;
-#endif // wxUSE_DEFERRED_SIZING
-
     DoShowWindow(nShowCmd);
 
 #if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__))
@@ -750,12 +695,12 @@ bool wxTopLevelWindowMSW::Show(bool show)
         frame->GetMenuBar()->AddAdornments(GetWindowStyleFlag());
 #endif
 
-    return true;
-}
+    // we only set pending size if we're maximized before being shown, now that
+    // we're shown we don't need it any more (it is reset in size event handler
+    // for child windows but we have to do it ourselves for this parent window)
+    m_pendingSize = wxDefaultSize;
 
-void wxTopLevelWindowMSW::Raise()
-{
-    ::SetForegroundWindow(GetHwnd());
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -775,7 +720,6 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
         // so just remember that we should do it later in this case
         m_maximizeOnShow = maximize;
 
-#if wxUSE_DEFERRED_SIZING
         // after calling Maximize() the client code expects to get the frame
         // "real" size and doesn't want to know that, because of implementation
         // details, the frame isn't really maximized yet but will be only once
@@ -793,7 +737,6 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
             m_pendingSize = wxGetClientDisplayRect().GetSize();
         }
         //else: can't do anything in this case, we don't have the old size
-#endif // wxUSE_DEFERRED_SIZING
     }
 }
 
@@ -801,7 +744,6 @@ bool wxTopLevelWindowMSW::IsMaximized() const
 {
     return IsAlwaysMaximized() ||
 #if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) && !defined(__WINCE_STANDARDSDK__)
-
            (::IsZoomed(GetHwnd()) != 0) ||
 #endif
            m_maximizeOnShow;
@@ -809,24 +751,7 @@ bool wxTopLevelWindowMSW::IsMaximized() const
 
 void wxTopLevelWindowMSW::Iconize(bool iconize)
 {
-    if ( iconize == m_iconized )
-    {
-        // Do nothing, in particular don't restore non-iconized windows when
-        // Iconize(false) is called as this would wrongly un-maximize them.
-        return;
-    }
-
-    if ( IsShown() )
-    {
-        // change the window state immediately
-        DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);
-    }
-    else // hidden
-    {
-        // iconizing the window shouldn't show it so just remember that we need
-        // to become iconized when shown later
-        m_iconized = true;
-    }
+    DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE);
 }
 
 bool wxTopLevelWindowMSW::IsIconized() const
@@ -834,9 +759,6 @@ bool wxTopLevelWindowMSW::IsIconized() const
 #ifdef __WXWINCE__
     return false;
 #else
-    if ( !IsShown() )
-        return m_iconized;
-
     // don't use m_iconized, it may be briefly out of sync with the real state
     // as it's only modified when we receive a WM_SIZE and we could be called
     // from an event handler from one of the messages we receive before it,
@@ -859,145 +781,6 @@ void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
         wxTopLevelWindowBase::SetLayoutDirection(dir);
 }
 
-// ----------------------------------------------------------------------------
-// wxTopLevelWindowMSW geometry
-// ----------------------------------------------------------------------------
-
-#ifndef __WXWINCE__
-
-void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
-{
-    if ( IsIconized() )
-    {
-        WINDOWPLACEMENT wp;
-        wp.length = sizeof(WINDOWPLACEMENT);
-        if ( ::GetWindowPlacement(GetHwnd(), &wp) )
-        {
-            RECT& rc = wp.rcNormalPosition;
-
-            // the position returned by GetWindowPlacement() is in workspace
-            // coordinates except for windows with WS_EX_TOOLWINDOW style
-            if ( !HasFlag(wxFRAME_TOOL_WINDOW) )
-            {
-                // we must use the correct display for the translation as the
-                // task bar might be shown on one display but not the other one
-                int n = wxDisplay::GetFromWindow(this);
-                wxDisplay dpy(n == wxNOT_FOUND ? 0 : n);
-                const wxPoint ptOfs = dpy.GetClientArea().GetPosition() -
-                                      dpy.GetGeometry().GetPosition();
-
-                rc.left += ptOfs.x;
-                rc.top += ptOfs.y;
-            }
-
-            if ( x )
-                *x = rc.left;
-            if ( y )
-                *y = rc.top;
-
-            return;
-        }
-
-        wxLogLastError(wxT("GetWindowPlacement"));
-    }
-    //else: normal case
-
-    wxTopLevelWindowBase::DoGetPosition(x, y);
-}
-
-void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
-{
-    if ( IsIconized() )
-    {
-        WINDOWPLACEMENT wp;
-        wp.length = sizeof(WINDOWPLACEMENT);
-        if ( ::GetWindowPlacement(GetHwnd(), &wp) )
-        {
-            const RECT& rc = wp.rcNormalPosition;
-
-            if ( width )
-                *width = rc.right - rc.left;
-            if ( height )
-                *height = rc.bottom - rc.top;
-
-            return;
-        }
-
-        wxLogLastError(wxT("GetWindowPlacement"));
-    }
-    //else: normal case
-
-    wxTopLevelWindowBase::DoGetSize(width, height);
-}
-
-#endif // __WXWINCE__
-
-void
-wxTopLevelWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
-                                              const wxSize& size,
-                                              int& x, int& y,
-                                              int& w, int& h) const
-{
-    // let the system position the window if no explicit position was specified
-    if ( pos.x == wxDefaultCoord )
-    {
-        // if x is set to CW_USEDEFAULT, y parameter is ignored anyhow so we
-        // can just as well set it to CW_USEDEFAULT as well
-        x =
-        y = CW_USEDEFAULT;
-    }
-    else
-    {
-        // OTOH, if x is not set to CW_USEDEFAULT, y shouldn't be set to it
-        // neither because it is not handled as a special value by Windows then
-        // and so we have to choose some default value for it, even if a
-        // completely arbitrary one
-        static const int DEFAULT_Y = 200;
-
-        x = pos.x;
-        y = pos.y == wxDefaultCoord ? DEFAULT_Y : pos.y;
-    }
-
-    if ( size.x == wxDefaultCoord || size.y == wxDefaultCoord )
-    {
-        // We don't use CW_USEDEFAULT here for several reasons:
-        //
-        //  1. It results in huge frames on modern screens (1000*800 is not
-        //     uncommon on my 1280*1024 screen) which is way too big for a half
-        //     empty frame of most of wxWidgets samples for example)
-        //
-        //  2. It is buggy for frames with wxFRAME_TOOL_WINDOW style for which
-        //     the default is for whatever reason 8*8 which breaks client <->
-        //     window size calculations (it would be nice if it didn't, but it
-        //     does and the simplest way to fix it seemed to change the broken
-        //     default size anyhow)
-        //
-        //  3. There is just no advantage in doing it: with x and y it is
-        //     possible that [future versions of] Windows position the new top
-        //     level window in some smart way which we can't do, but we can
-        //     guess a reasonably good size for a new window just as well
-        //     ourselves
-        //
-        // The only exception is for the Windows CE platform where the system
-        // does know better than we how should the windows be sized
-#ifdef _WIN32_WCE
-        w =
-        h = CW_USEDEFAULT;
-#else // !_WIN32_WCE
-        wxSize sizeReal = size;
-        sizeReal.SetDefaults(GetDefaultSize());
-
-        w = sizeReal.x;
-        h = sizeReal.y;
-#endif // _WIN32_WCE/!_WIN32_WCE
-    }
-    else
-    {
-        w = size.x;
-        h = size.y;
-    }
-}
-
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW fullscreen
 // ----------------------------------------------------------------------------
@@ -1093,8 +876,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
 
         // finally send an event allowing the window to relayout itself &c
         wxSizeEvent event(rect.GetSize(), GetId());
-        event.SetEventObject(this);
-        HandleWindowEvent(event);
+        GetEventHandler()->ProcessEvent(event);
     }
     else // stop showing full screen
     {
@@ -1124,34 +906,29 @@ wxString wxTopLevelWindowMSW::GetTitle() const
     return GetLabel();
 }
 
-bool wxTopLevelWindowMSW::DoSelectAndSetIcon(const wxIconBundle& icons,
+void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon)
+{
+    SetIcons( wxIconBundle( icon ) );
+}
+
+void wxTopLevelWindowMSW::DoSelectAndSetIcon(const wxIconBundle& icons,
                                              int smX,
                                              int smY,
                                              int i)
 {
     const wxSize size(::GetSystemMetrics(smX), ::GetSystemMetrics(smY));
 
-    wxIcon icon = icons.GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER);
-
-    if ( !icon.IsOk() )
-        return false;
-
-    ::SendMessage(GetHwnd(), WM_SETICON, i, (LPARAM)GetHiconOf(icon));
-    return true;
+    const wxIcon icon = icons.GetIcon(size);
+    if ( icon.Ok() && icon.GetWidth() == size.x && icon.GetHeight() == size.y )
+    {
+        ::SendMessage(GetHwnd(), WM_SETICON, i, (LPARAM)GetHiconOf(icon));
+    }
 }
 
 void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons)
 {
     wxTopLevelWindowBase::SetIcons(icons);
 
-    if ( icons.IsEmpty() )
-    {
-        // FIXME: SetIcons(wxNullIconBundle) should unset existing icons,
-        //        but we currently don't do that
-        wxASSERT_MSG( m_icons.IsEmpty(), "unsetting icons doesn't work" );
-        return;
-    }
-
     DoSelectAndSetIcon(icons, SM_CXSMICON, SM_CYSMICON, ICON_SMALL);
     DoSelectAndSetIcon(icons, SM_CXICON, SM_CYICON, ICON_BIG);
 }
@@ -1174,7 +951,7 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
                           MF_BYCOMMAND |
                           (enable ? MF_ENABLED : MF_GRAYED)) == -1 )
     {
-        wxLogLastError(wxT("EnableMenuItem(SC_CLOSE)"));
+        wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
 
         return false;
     }
@@ -1182,7 +959,7 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
     // update appearance immediately
     if ( !::DrawMenuBar(GetHwnd()) )
     {
-        wxLogLastError(wxT("DrawMenuBar"));
+        wxLogLastError(_T("DrawMenuBar"));
     }
 #endif
 #endif // !__WXMICROWIN__
@@ -1190,6 +967,54 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
     return true;
 }
 
+#ifndef __WXWINCE__
+
+bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
+{
+    wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
+                 _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+
+    // The empty region signifies that the shape should be removed from the
+    // window.
+    if ( region.IsEmpty() )
+    {
+        if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0)
+        {
+            wxLogLastError(_T("SetWindowRgn"));
+            return false;
+        }
+        return true;
+    }
+
+    // Windows takes ownership of the region, so
+    // we'll have to make a copy of the region to give to it.
+    DWORD noBytes = ::GetRegionData(GetHrgnOf(region), 0, NULL);
+    RGNDATA *rgnData = (RGNDATA*) new char[noBytes];
+    ::GetRegionData(GetHrgnOf(region), noBytes, rgnData);
+    HRGN hrgn = ::ExtCreateRegion(NULL, noBytes, rgnData);
+    delete[] (char*) rgnData;
+
+    // SetWindowRgn expects the region to be in coordinants
+    // relative to the window, not the client area.  Figure
+    // out the offset, if any.
+    RECT rect;
+    DWORD dwStyle =   ::GetWindowLong(GetHwnd(), GWL_STYLE);
+    DWORD dwExStyle = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE);
+    ::GetClientRect(GetHwnd(), &rect);
+    ::AdjustWindowRectEx(&rect, dwStyle, ::GetMenu(GetHwnd()) != NULL, dwExStyle);
+    ::OffsetRgn(hrgn, -rect.left, -rect.top);
+
+    // Now call the shape API with the new region.
+    if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0)
+    {
+        wxLogLastError(_T("SetWindowRgn"));
+        return false;
+    }
+    return true;
+}
+
+#endif // !__WXWINCE__
+
 void wxTopLevelWindowMSW::RequestUserAttention(int flags)
 {
     // check if we can use FlashWindowEx(): unfortunately a simple test for
@@ -1197,15 +1022,15 @@ void wxTopLevelWindowMSW::RequestUserAttention(int flags)
     // provide FlashWindowEx() declaration, so try to detect whether we have
     // real headers for WINVER 0x0500 by checking for existence of a symbol not
     // declated in MSVC6 header
-#if defined(FLASHW_STOP) && defined(VK_XBUTTON1) && wxUSE_DYNLIB_CLASS
+#if defined(FLASHW_STOP) && defined(VK_XBUTTON1)
     // available in the headers, check if it is supported by the system
     typedef BOOL (WINAPI *FlashWindowEx_t)(FLASHWINFO *pfwi);
     static FlashWindowEx_t s_pfnFlashWindowEx = NULL;
     if ( !s_pfnFlashWindowEx )
     {
-        wxDynamicLibrary dllUser32(wxT("user32.dll"));
+        wxDynamicLibrary dllUser32(_T("user32.dll"));
         s_pfnFlashWindowEx = (FlashWindowEx_t)
-                                dllUser32.GetSymbol(wxT("FlashWindowEx"));
+                                dllUser32.GetSymbol(_T("FlashWindowEx"));
 
         // we can safely unload user32.dll here, it's going to remain loaded as
         // long as the program is running anyhow
@@ -1239,66 +1064,21 @@ void wxTopLevelWindowMSW::RequestUserAttention(int flags)
     }
 }
 
-wxMenu *wxTopLevelWindowMSW::MSWGetSystemMenu() const
-{
-#ifndef __WXUNIVERSAL__
-    if ( !m_menuSystem )
-    {
-        HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE);
-        if ( !hmenu )
-        {
-            wxLogLastError(wxT("GetSystemMenu()"));
-            return NULL;
-        }
-
-        wxTopLevelWindowMSW * const
-            self = const_cast<wxTopLevelWindowMSW *>(this);
-
-        self->m_menuSystem = wxMenu::MSWNewFromHMENU(hmenu);
-
-        // We need to somehow associate this menu with this window to ensure
-        // that we get events from it. A natural idea would be to pretend that
-        // it's attached to our menu bar but this wouldn't work if we don't
-        // have any menu bar which is a common case for applications using
-        // custom items in the system menu (they mostly do it exactly because
-        // they don't have any other menus).
-        //
-        // So reuse the invoking window pointer instead, this is not exactly
-        // correct but doesn't seem to have any serious drawbacks.
-        m_menuSystem->SetInvokingWindow(self);
-    }
-#endif // #ifndef __WXUNIVERSAL__
-
-    return m_menuSystem;
-}
-
-// ----------------------------------------------------------------------------
-// Transparency support
 // ---------------------------------------------------------------------------
 
 bool wxTopLevelWindowMSW::SetTransparent(wxByte alpha)
 {
-#if wxUSE_DYNLIB_CLASS
     typedef DWORD (WINAPI *PSETLAYEREDWINDOWATTR)(HWND, DWORD, BYTE, DWORD);
-    static PSETLAYEREDWINDOWATTR
-        pSetLayeredWindowAttributes = (PSETLAYEREDWINDOWATTR)-1;
+    static PSETLAYEREDWINDOWATTR pSetLayeredWindowAttributes = NULL;
 
-    if ( pSetLayeredWindowAttributes == (PSETLAYEREDWINDOWATTR)-1 )
+    if ( pSetLayeredWindowAttributes == NULL )
     {
-        wxDynamicLibrary dllUser32(wxT("user32.dll"));
-
-        // use RawGetSymbol() and not GetSymbol() to avoid error messages under
-        // Windows 95: there is nothing the user can do about this anyhow
+        wxDynamicLibrary dllUser32(_T("user32.dll"));
         pSetLayeredWindowAttributes = (PSETLAYEREDWINDOWATTR)
-            dllUser32.RawGetSymbol(wxT("SetLayeredWindowAttributes"));
-
-        // it's ok to destroy dllUser32 here, we link statically to user32.dll
-        // anyhow so it won't be unloaded
+            dllUser32.GetSymbol(wxT("SetLayeredWindowAttributes"));
     }
-
-    if ( !pSetLayeredWindowAttributes )
+    if ( pSetLayeredWindowAttributes == NULL )
         return false;
-#endif // wxUSE_DYNLIB_CLASS
 
     LONG exstyle = GetWindowLong(GetHwnd(), GWL_EXSTYLE);
 
@@ -1310,16 +1090,11 @@ bool wxTopLevelWindowMSW::SetTransparent(wxByte alpha)
         return true;
     }
 
-#if wxUSE_DYNLIB_CLASS
     // Otherwise, set the layered style if needed and set the alpha value
     if ((exstyle & WS_EX_LAYERED) == 0 )
         SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyle | WS_EX_LAYERED);
 
-    if ( pSetLayeredWindowAttributes(GetHwnd(), 0, (BYTE)alpha, LWA_ALPHA) )
-        return true;
-#endif // wxUSE_DYNLIB_CLASS
-
-    return false;
+    return pSetLayeredWindowAttributes(GetHwnd(), 0, (BYTE)alpha, LWA_ALPHA) != 0;
 }
 
 bool wxTopLevelWindowMSW::CanSetTransparent()
@@ -1335,82 +1110,57 @@ bool wxTopLevelWindowMSW::CanSetTransparent()
     return (os_type == wxOS_WINDOWS_NT && ver_major >= 5);
 }
 
-void wxTopLevelWindowMSW::DoFreeze()
-{
-    // do nothing: freezing toplevel window causes paint and mouse events
-    // to go through it any TLWs under it, so the best we can do is to freeze
-    // all children -- and wxWindowBase::Freeze() does that
-}
-
-void wxTopLevelWindowMSW::DoThaw()
-{
-    // intentionally empty -- see DoFreeze()
-}
-
-
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow event handling
 // ----------------------------------------------------------------------------
 
-void wxTopLevelWindowMSW::DoSaveLastFocus()
-{
-    if ( m_iconized )
-        return;
-
-    // remember the last focused child if it is our child
-    m_winLastFocused = FindFocus();
-
-    if ( m_winLastFocused )
-    {
-        // and don't remember it if it's a child from some other frame
-        if ( wxGetTopLevelParent(m_winLastFocused) != this )
-        {
-            m_winLastFocused = NULL;
-        }
-    }
-}
-
-void wxTopLevelWindowMSW::DoRestoreLastFocus()
-{
-    wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
-                                        : NULL;
-    if ( !parent )
-    {
-        parent = this;
-    }
-
-    wxSetFocusToChild(parent, &m_winLastFocused);
-}
-
+// Default activation behaviour - set the focus for the first child
+// subwindow found.
 void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event)
 {
     if ( event.GetActive() )
     {
-        // We get WM_ACTIVATE before being restored from iconized state, so we
-        // can be still iconized here. In this case, avoid restoring the focus
-        // as it doesn't work anyhow and we will do when we're really restored.
-        if ( m_iconized )
-        {
-            event.Skip();
-            return;
-        }
-
         // restore focus to the child which was last focused unless we already
         // have it
-        wxLogTrace(wxT("focus"), wxT("wxTLW %p activated."), m_hWnd);
+        wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd);
 
         wxWindow *winFocus = FindFocus();
         if ( !winFocus || wxGetTopLevelParent(winFocus) != this )
-            DoRestoreLastFocus();
+        {
+            wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+                                                : NULL;
+            if ( !parent )
+            {
+                parent = this;
+            }
+
+            wxSetFocusToChild(parent, &m_winLastFocused);
+        }
     }
     else // deactivating
     {
-        DoSaveLastFocus();
+        // remember the last focused child if it is our child
+        m_winLastFocused = FindFocus();
 
-        wxLogTrace(wxT("focus"),
-                   wxT("wxTLW %p deactivated, last focused: %p."),
-                   m_hWnd,
-                   m_winLastFocused ? GetHwndOf(m_winLastFocused) : NULL);
+        if ( m_winLastFocused )
+        {
+            // let it know that it doesn't have focus any more
+            // But this will already be done via WM_KILLFOCUS, so we'll get two kill
+            // focus events if we call it explicitly.
+            // m_winLastFocused->HandleKillFocus((WXHWND)NULL);
+
+            // and don't remember it if it's a child from some other frame
+            if ( wxGetTopLevelParent(m_winLastFocused) != this )
+            {
+                m_winLastFocused = NULL;
+            }
+        }
+
+        wxLogTrace(_T("focus"),
+                   _T("wxTLW %08x deactivated, last focused: %08x."),
+                   (int) m_hWnd,
+                   (int) (m_winLastFocused ? GetHwndOf(m_winLastFocused)
+                                           : NULL));
 
         event.Skip();
     }
@@ -1482,7 +1232,7 @@ void wxTLWHiddenParentModule::OnExit()
     {
         if ( !::DestroyWindow(ms_hwnd) )
         {
-            wxLogLastError(wxT("DestroyWindow(hidden TLW parent)"));
+            wxLogLastError(_T("DestroyWindow(hidden TLW parent)"));
         }
 
         ms_hwnd = NULL;
@@ -1492,7 +1242,7 @@ void wxTLWHiddenParentModule::OnExit()
     {
         if ( !::UnregisterClass(ms_className, wxGetInstance()) )
         {
-            wxLogLastError(wxT("UnregisterClass(\"wxTLWHiddenParent\")"));
+            wxLogLastError(_T("UnregisterClass(\"wxTLWHiddenParent\")"));
         }
 
         ms_className = NULL;
@@ -1506,7 +1256,7 @@ HWND wxTLWHiddenParentModule::GetHWND()
     {
         if ( !ms_className )
         {
-            static const wxChar *HIDDEN_PARENT_CLASS = wxT("wxTLWHiddenParent");
+            static const wxChar *HIDDEN_PARENT_CLASS = _T("wxTLWHiddenParent");
 
             WNDCLASS wndclass;
             wxZeroMemory(wndclass);
@@ -1517,7 +1267,7 @@ HWND wxTLWHiddenParentModule::GetHWND()
 
             if ( !::RegisterClass(&wndclass) )
             {
-                wxLogLastError(wxT("RegisterClass(\"wxTLWHiddenParent\")"));
+                wxLogLastError(_T("RegisterClass(\"wxTLWHiddenParent\")"));
             }
             else
             {
@@ -1529,7 +1279,7 @@ HWND wxTLWHiddenParentModule::GetHWND()
                                  (HMENU)NULL, wxGetInstance(), NULL);
         if ( !ms_hwnd )
         {
-            wxLogLastError(wxT("CreateWindow(hidden TLW parent)"));
+            wxLogLastError(_T("CreateWindow(hidden TLW parent)"));
         }
     }
 
diff --git a/Source/3rd Party/wx/src/msw/treectrl.cpp b/Source/3rd Party/wx/src/msw/treectrl.cpp
index d75a8eb5d..98536a82d 100644
--- a/Source/3rd Party/wx/src/msw/treectrl.cpp	
+++ b/Source/3rd Party/wx/src/msw/treectrl.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
 // Created:     1997
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: treectrl.cpp 61830 2009-09-04 19:10:46Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -37,12 +37,14 @@
     #include "wx/settings.h"
 #endif
 
-#include "wx/dynlib.h"
 #include "wx/msw/private.h"
 
+// Set this to 1 to be _absolutely_ sure that repainting will work for all
+// comctl32.dll versions
+#define wxUSE_COMCTL32_SAFELY 0
+
 #include "wx/imaglist.h"
 #include "wx/msw/dragimag.h"
-#include "wx/msw/uxtheme.h"
 
 // macros to hide the cast ugliness
 // --------------------------------
@@ -77,28 +79,20 @@ typedef struct tagNMTVITEMCHANGE
 // The vista tree control includes some new code that originally broke the
 // multi-selection tree, causing seemingly spurious item selection state changes
 // during Shift or Ctrl-click item selection. (To witness the original broken
-// behaviour, simply make IsLocked() below always return false). This problem was
+// behavior, simply make IsLocked() below always return false). This problem was
 // solved by using the following class to 'unlock' an item's selection state.
 
 class TreeItemUnlocker
 {
 public:
     // unlock a single item
-    TreeItemUnlocker(HTREEITEM item)
-    {
-        m_oldUnlockedItem = ms_unlockedItem;
-        ms_unlockedItem = item;
-    }
+    TreeItemUnlocker(HTREEITEM item) { ms_unlockedItem = item; }
 
     // unlock all items, don't use unless absolutely necessary
-    TreeItemUnlocker()
-    {
-        m_oldUnlockedItem = ms_unlockedItem;
-        ms_unlockedItem = (HTREEITEM)-1;
-    }
+    TreeItemUnlocker() { ms_unlockedItem = (HTREEITEM)-1; }
 
     // lock everything back
-    ~TreeItemUnlocker() { ms_unlockedItem = m_oldUnlockedItem; }
+    ~TreeItemUnlocker() { ms_unlockedItem = NULL; }
 
 
     // check if the item state is currently locked
@@ -107,70 +101,18 @@ public:
 
 private:
     static HTREEITEM ms_unlockedItem;
-    HTREEITEM m_oldUnlockedItem;
-
-    wxDECLARE_NO_COPY_CLASS(TreeItemUnlocker);
 };
 
 HTREEITEM TreeItemUnlocker::ms_unlockedItem = NULL;
 
-// another helper class: set the variable to true during its lifetime and reset
-// it to false when it is destroyed
-//
-// it is currently always used with wxTreeCtrl::m_changingSelection
-class TempSetter
-{
-public:
-    TempSetter(bool& var) : m_var(var)
-    {
-        wxASSERT_MSG( !m_var, "variable shouldn't be already set" );
-        m_var = true;
-    }
-
-    ~TempSetter()
-    {
-        m_var = false;
-    }
-
-private:
-    bool& m_var;
-
-    wxDECLARE_NO_COPY_CLASS(TempSetter);
-};
-
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
-namespace
-{
-
-// Work around a problem with TreeView_GetItemRect() when using MinGW/Cygwin:
-// it results in warnings about breaking strict aliasing rules because HITEM is
-// passed via a RECT pointer, so use a union to avoid them and define our own
-// version of the standard macro using it.
-union TVGetItemRectParam
-{
-    RECT rect;
-    HTREEITEM hItem;
-};
-
-inline bool
-wxTreeView_GetItemRect(HWND hwnd,
-                       HTREEITEM hItem,
-                       TVGetItemRectParam& param,
-                       BOOL fItemRect)
-{
-    param.hItem = hItem;
-    return ::SendMessage(hwnd, TVM_GETITEMRECT, fItemRect,
-                        (LPARAM)&param) == TRUE;
-}
-
-} // anonymous namespace
-
 // wrappers for TreeView_GetItem/TreeView_SetItem
 static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
 {
+
     TV_ITEM tvi;
     tvi.mask = TVIF_STATE | TVIF_HANDLE;
     tvi.stateMask = TVIS_SELECTED;
@@ -216,54 +158,31 @@ static inline void ToggleItemSelection(HWND hwndTV, HTREEITEM htItem)
 }
 
 // helper function which selects all items in a range and, optionally,
-// deselects all the other ones
-//
-// returns true if the selection changed at all or false if nothing changed
-
-// flags for SelectRange()
-enum
-{
-    SR_SIMULATE = 1,        // don't do anything, just return true or false
-    SR_UNSELECT_OTHERS = 2  // deselect the items not in range
-};
-
-static bool SelectRange(HWND hwndTV,
+// unselects all others
+static void SelectRange(HWND hwndTV,
                         HTREEITEM htFirst,
                         HTREEITEM htLast,
-                        int flags)
+                        bool unselectOthers = true)
 {
     // find the first (or last) item and select it
-    bool changed = false;
     bool cont = true;
     HTREEITEM htItem = (HTREEITEM)TreeView_GetRoot(hwndTV);
-
     while ( htItem && cont )
     {
         if ( (htItem == htFirst) || (htItem == htLast) )
         {
             if ( !IsItemSelected(hwndTV, htItem) )
             {
-                if ( !(flags & SR_SIMULATE) )
-                {
-                    SelectItem(hwndTV, htItem);
-                }
-
-                changed = true;
+                SelectItem(hwndTV, htItem);
             }
 
             cont = false;
         }
-        else // not first or last
+        else
         {
-            if ( flags & SR_UNSELECT_OTHERS )
+            if ( unselectOthers && IsItemSelected(hwndTV, htItem) )
             {
-                if ( IsItemSelected(hwndTV, htItem) )
-                {
-                    if ( !(flags & SR_SIMULATE) )
-                        UnselectItem(hwndTV, htItem);
-
-                    changed = true;
-                }
+                UnselectItem(hwndTV, htItem);
             }
         }
 
@@ -276,12 +195,7 @@ static bool SelectRange(HWND hwndTV,
     {
         if ( !IsItemSelected(hwndTV, htItem) )
         {
-            if ( !(flags & SR_SIMULATE) )
-            {
-                SelectItem(hwndTV, htItem);
-            }
-
-            changed = true;
+            SelectItem(hwndTV, htItem);
         }
 
         cont = (htItem != htFirst) && (htItem != htLast);
@@ -289,19 +203,14 @@ static bool SelectRange(HWND hwndTV,
         htItem = (HTREEITEM)TreeView_GetNextVisible(hwndTV, htItem);
     }
 
-    // optionally deselect the rest
-    if ( flags & SR_UNSELECT_OTHERS )
+    // unselect the rest
+    if ( unselectOthers )
     {
         while ( htItem )
         {
             if ( IsItemSelected(hwndTV, htItem) )
             {
-                if ( !(flags & SR_SIMULATE) )
-                {
-                    UnselectItem(hwndTV, htItem);
-                }
-
-                changed = true;
+                UnselectItem(hwndTV, htItem);
             }
 
             htItem = (HTREEITEM)TreeView_GetNextVisible(hwndTV, htItem);
@@ -310,67 +219,63 @@ static bool SelectRange(HWND hwndTV,
 
     // seems to be necessary - otherwise the just selected items don't always
     // appear as selected
-    if ( !(flags & SR_SIMULATE) )
-    {
-        UpdateWindow(hwndTV);
-    }
-
-    return changed;
+    UpdateWindow(hwndTV);
 }
 
 // helper function which tricks the standard control into changing the focused
 // item without changing anything else (if someone knows why Microsoft doesn't
 // allow to do it by just setting TVIS_FOCUSED flag, please tell me!)
-//
-// returns true if the focus was changed, false if the given item was already
-// the focused one
-static bool SetFocus(HWND hwndTV, HTREEITEM htItem)
+static void SetFocus(HWND hwndTV, HTREEITEM htItem)
 {
     // the current focus
     HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(hwndTV);
 
-    if ( htItem == htFocus )
-        return false;
-
     if ( htItem )
     {
-        // remember the selection state of the item
-        bool wasSelected = IsItemSelected(hwndTV, htItem);
-
-        if ( htFocus && IsItemSelected(hwndTV, htFocus) )
+        // set the focus
+        if ( htItem != htFocus )
         {
-            // prevent the tree from unselecting the old focus which it
-            // would do by default (TreeView_SelectItem unselects the
-            // focused item)
-            TreeView_SelectItem(hwndTV, 0);
-            SelectItem(hwndTV, htFocus);
-        }
+            // remember the selection state of the item
+            bool wasSelected = IsItemSelected(hwndTV, htItem);
 
-        TreeView_SelectItem(hwndTV, htItem);
+            if ( htFocus && IsItemSelected(hwndTV, htFocus) )
+            {
+                // prevent the tree from unselecting the old focus which it
+                // would do by default (TreeView_SelectItem unselects the
+                // focused item)
+                TreeView_SelectItem(hwndTV, 0);
+                SelectItem(hwndTV, htFocus);
+            }
 
-        if ( !wasSelected )
-        {
-            // need to clear the selection which TreeView_SelectItem() gave
-            // us
-            UnselectItem(hwndTV, htItem);
+            TreeView_SelectItem(hwndTV, htItem);
+
+            if ( !wasSelected )
+            {
+                // need to clear the selection which TreeView_SelectItem() gave
+                // us
+                UnselectItem(hwndTV, htItem);
+            }
+            //else: was selected, still selected - ok
         }
-        //else: was selected, still selected - ok
+        //else: nothing to do, focus already there
     }
-    else // reset focus
+    else
     {
-        bool wasFocusSelected = IsItemSelected(hwndTV, htFocus);
-
-        // just clear the focus
-        TreeView_SelectItem(hwndTV, 0);
-
-        if ( wasFocusSelected )
+        if ( htFocus )
         {
-            // restore the selection state
-            SelectItem(hwndTV, htFocus);
-        }
-    }
+            bool wasFocusSelected = IsItemSelected(hwndTV, htFocus);
 
-    return true;
+            // just clear the focus
+            TreeView_SelectItem(hwndTV, 0);
+
+            if ( wasFocusSelected )
+            {
+                // restore the selection state
+                SelectItem(hwndTV, htFocus);
+            }
+        }
+        //else: nothing to do, no focus already
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -450,18 +355,14 @@ public:
             switch ( which )
             {
                 case wxTreeItemIcon_SelectedExpanded:
-                    // We consider that expanded icon is more important than
-                    // selected so test for it first.
-                    image = m_images[wxTreeItemIcon_Expanded];
-                    if ( image == -1 )
-                        image = m_images[wxTreeItemIcon_Selected];
+                    image = GetImage(wxTreeItemIcon_Expanded);
                     if ( image != -1 )
                         break;
                     //else: fall through
 
                 case wxTreeItemIcon_Selected:
                 case wxTreeItemIcon_Expanded:
-                    image = m_images[wxTreeItemIcon_Normal];
+                    image = GetImage(wxTreeItemIcon_Normal);
                     break;
 
                 case wxTreeItemIcon_Normal:
@@ -469,7 +370,7 @@ public:
                     break;
 
                 default:
-                    wxFAIL_MSG( wxT("unsupported wxTreeItemIcon value") );
+                    wxFAIL_MSG( _T("unsupported wxTreeItemIcon value") );
             }
         }
 
@@ -493,7 +394,7 @@ protected:
     // the real client data
     wxTreeItemData *m_data;
 
-    wxDECLARE_NO_COPY_CLASS(wxTreeItemParam);
+    DECLARE_NO_COPY_CLASS(wxTreeItemParam)
 };
 
 // wxVirutalNode is used in place of a single root when 'hidden' root is
@@ -518,7 +419,7 @@ public:
 private:
     wxTreeItemParam *m_param;
 
-    wxDECLARE_NO_COPY_CLASS(wxVirtualNode);
+    DECLARE_NO_COPY_CLASS(wxVirtualNode)
 };
 
 #ifdef __VISUALC__
@@ -563,7 +464,7 @@ private:
 
     const wxTreeCtrl *m_tree;
 
-    wxDECLARE_NO_COPY_CLASS(wxTreeTraversal);
+    DECLARE_NO_COPY_CLASS(wxTreeTraversal)
 };
 
 // internal class for getting the selected items
@@ -603,7 +504,7 @@ public:
 private:
     wxArrayTreeItemIds& m_selections;
 
-    wxDECLARE_NO_COPY_CLASS(TraverseSelections);
+    DECLARE_NO_COPY_CLASS(TraverseSelections)
 };
 
 // internal class for counting tree items
@@ -632,13 +533,77 @@ public:
 private:
     size_t m_count;
 
-    wxDECLARE_NO_COPY_CLASS(TraverseCounter);
+    DECLARE_NO_COPY_CLASS(TraverseCounter)
 };
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxTreeCtrlStyle )
+
+wxBEGIN_FLAGS( wxTreeCtrlStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxTR_EDIT_LABELS)
+    wxFLAGS_MEMBER(wxTR_NO_BUTTONS)
+    wxFLAGS_MEMBER(wxTR_HAS_BUTTONS)
+    wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS)
+    wxFLAGS_MEMBER(wxTR_NO_LINES)
+    wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT)
+    wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT)
+    wxFLAGS_MEMBER(wxTR_HIDE_ROOT)
+    wxFLAGS_MEMBER(wxTR_ROW_LINES)
+    wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT)
+    wxFLAGS_MEMBER(wxTR_SINGLE)
+    wxFLAGS_MEMBER(wxTR_MULTIPLE)
+    wxFLAGS_MEMBER(wxTR_EXTENDED)
+    wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
+
+wxEND_FLAGS( wxTreeCtrlStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
+    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
+    wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent )
+    wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxTreeCtrl)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
+#endif
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -718,11 +683,6 @@ void wxTreeCtrl::Init()
     m_dragImage = NULL;
 #endif
     m_pVirtualRoot = NULL;
-    m_dragStarted = false;
-    m_focusLost = true;
-    m_changingSelection = false;
-    m_triggerStateImageClick = false;
-    m_mouseUpDeselect = false;
 
     // initialize the global array of events now as it can't be done statically
     // with the wxEVT_XXX values being allocated during run-time only
@@ -752,7 +712,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     DWORD wstyle = MSWGetStyle(m_windowStyle, & exStyle);
     wstyle |= WS_TABSTOP | TVS_SHOWSELALWAYS;
 
-    if ( !(m_windowStyle & wxTR_NO_LINES) )
+    if ((m_windowStyle & wxTR_NO_LINES) == 0)
         wstyle |= TVS_HASLINES;
     if ( m_windowStyle & wxTR_HAS_BUTTONS )
         wstyle |= TVS_HASBUTTONS;
@@ -778,32 +738,82 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     if ( !MSWCreateControl(WC_TREEVIEW, wstyle, pos, size) )
         return false;
 
+#if wxUSE_COMCTL32_SAFELY
+    wxWindow::SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+    wxWindow::SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
+#elif 1
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
+#else
+    // This works around a bug in the Windows tree control whereby for some versions
+    // of comctrl32, setting any colour actually draws the background in black.
+    // This will initialise the background to the system colour.
+    // THIS FIX NOW REVERTED since it caused problems on _other_ systems.
+    // Assume the user has an updated comctl32.dll.
+    ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0,-1);
+    wxWindow::SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+    SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
+#endif
+
+
+    // VZ: this is some experimental code which may be used to get the
+    //     TVS_CHECKBOXES style functionality for comctl32.dll < 4.71.
+    //     AFAIK, the standard DLL does about the same thing anyhow.
+#if 0
+    if ( m_windowStyle & wxTR_MULTIPLE )
+    {
+        wxBitmap bmp;
+
+        // create the DC compatible with the current screen
+        HDC hdcMem = CreateCompatibleDC(NULL);
+
+        // create a mono bitmap of the standard size
+        int x = ::GetSystemMetrics(SM_CXMENUCHECK);
+        int y = ::GetSystemMetrics(SM_CYMENUCHECK);
+        wxImageList imagelistCheckboxes(x, y, false, 2);
+        HBITMAP hbmpCheck = CreateBitmap(x, y,   // bitmap size
+                                         1,      // # of color planes
+                                         1,      // # bits needed for one pixel
+                                         0);     // array containing colour data
+        SelectObject(hdcMem, hbmpCheck);
+
+        // then draw a check mark into it
+        RECT rect = { 0, 0, x, y };
+        if ( !::DrawFrameControl(hdcMem, &rect,
+                                 DFC_BUTTON,
+                                 DFCS_BUTTONCHECK | DFCS_CHECKED) )
+        {
+            wxLogLastError(wxT("DrawFrameControl(check)"));
+        }
+
+        bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
+        imagelistCheckboxes.Add(bmp);
+
+        if ( !::DrawFrameControl(hdcMem, &rect,
+                                 DFC_BUTTON,
+                                 DFCS_BUTTONCHECK) )
+        {
+            wxLogLastError(wxT("DrawFrameControl(uncheck)"));
+        }
+
+        bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
+        imagelistCheckboxes.Add(bmp);
+
+        // clean up
+        ::DeleteDC(hdcMem);
+
+        // set the imagelist
+        SetStateImageList(&imagelistCheckboxes);
+    }
+#endif // 0
 
     wxSetCCUnicodeFormat(GetHwnd());
 
-    if ( m_windowStyle & wxTR_TWIST_BUTTONS )
-    {
-        // Under Vista and later Explorer uses rotating ("twist") buttons
-        // instead of the default "+/-" ones so apply its theme to the tree
-        // control to implement this style.
-        if ( wxGetWinVersion() >= wxWinVersion_Vista )
-        {
-            if ( wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive() )
-            {
-                theme->SetWindowTheme(GetHwnd(), L"EXPLORER", NULL);
-            }
-        }
-    }
-
     return true;
 }
 
 wxTreeCtrl::~wxTreeCtrl()
 {
-    m_isBeingDeleted = true;
-
     // delete any attributes
     if ( m_hasAnyAttr )
     {
@@ -841,7 +851,7 @@ wxTreeCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 bool wxTreeCtrl::DoGetItem(wxTreeViewItem *tvItem) const
 {
     wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false,
-                 wxT("can't retrieve virtual root item") );
+                 _T("can't retrieve virtual root item") );
 
     if ( !TreeView_GetItem(GetHwnd(), tvItem) )
     {
@@ -917,20 +927,24 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
 
 bool wxTreeCtrl::SetBackgroundColour(const wxColour &colour)
 {
+#if !wxUSE_COMCTL32_SAFELY
     if ( !wxWindowBase::SetBackgroundColour(colour) )
         return false;
 
     ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());
+#endif
 
     return true;
 }
 
 bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
 {
+#if !wxUSE_COMCTL32_SAFELY
     if ( !wxWindowBase::SetForegroundColour(colour) )
         return false;
 
     ::SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());
+#endif
 
     return true;
 }
@@ -970,7 +984,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
         return;
 
     wxTreeViewItem tvItem(item, TVIF_TEXT);
-    tvItem.pszText = wxMSW_CONV_LPTSTR(text);
+    tvItem.pszText = (wxChar *)text.c_str();  // conversion is ok
     DoSetItem(&tvItem);
 
     // when setting the text of the item being edited, the text control should
@@ -983,7 +997,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
     {
         if ( item == m_idEdited )
         {
-            ::SetWindowText(hwndEdit, text.t_str());
+            ::SetWindowText(hwndEdit, text);
         }
     }
 }
@@ -1049,16 +1063,6 @@ wxTreeItemParam *wxTreeCtrl::GetItemParam(const wxTreeItemId& item) const
     return (wxTreeItemParam *)tvItem.lParam;
 }
 
-bool wxTreeCtrl::HandleTreeEvent(wxTreeEvent& event) const
-{
-    if ( event.m_item.IsOk() )
-    {
-        event.SetClientObject(GetItemData(event.m_item));
-    }
-
-    return HandleWindowEvent(event);
-}
-
 wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 {
     wxTreeItemParam *data = GetItemParam(item);
@@ -1241,10 +1245,14 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
     }
 
     // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect
-    TVGetItemRectParam param;
+    RECT rect;
+
+    // this ugliness comes directly from MSDN - it *is* the correct way to pass
+    // the HTREEITEM with TVM_GETITEMRECT
+    *(HTREEITEM *)&rect = HITEM(item);
 
     // true means to get rect for just the text, not the whole line
-    if ( !wxTreeView_GetItemRect(GetHwnd(), HITEM(item), param, TRUE) )
+    if ( !::SendMessage(GetHwnd(), TVM_GETITEMRECT, true, (LPARAM)&rect) )
     {
         // if TVM_GETITEMRECT returned false, then the item is definitely not
         // visible (because its parent is not expanded)
@@ -1254,7 +1262,7 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
     // however if it returned true, the item might still be outside the
     // currently visible part of the tree, test for it (notice that partly
     // visible means visible here)
-    return param.rect.bottom > 0 && param.rect.top < GetClientSize().y;
+    return rect.bottom > 0 && rect.top < GetClientSize().y;
 }
 
 bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
@@ -1318,14 +1326,9 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {
-    wxCHECK_MSG( !HasFlag(wxTR_MULTIPLE), wxTreeItemId(),
+    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxTreeItemId(),
                  wxT("this only works with single selection controls") );
 
-    return GetFocusedItem();
-}
-
-wxTreeItemId wxTreeCtrl::GetFocusedItem() const
-{
     return wxTreeItemId(TreeView_GetSelection(GetHwnd()));
 }
 
@@ -1380,6 +1383,36 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
     return item;
 }
 
+#if WXWIN_COMPATIBILITY_2_4
+
+wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
+                                       long& cookie) const
+{
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
+    cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item));
+
+    return wxTreeItemId((void *)cookie);
+}
+
+wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
+                                      long& cookie) const
+{
+    wxTreeItemId fromCookie((void *)cookie);
+
+    HTREEITEM hitem = HITEM(fromCookie);
+
+    hitem = TreeView_GetNextSibling(GetHwnd(), hitem);
+
+    wxTreeItemId item(hitem);
+
+    cookie = (long)item.m_pItem;
+
+    return item;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
 wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 {
     wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
@@ -1420,15 +1453,7 @@ wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
     wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
     wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() for must be visible itself!"));
 
-    wxTreeItemId next(TreeView_GetNextVisible(GetHwnd(), HITEM(item)));
-    if ( next.IsOk() && !IsVisible(next) )
-    {
-        // Win32 considers that any non-collapsed item is visible while we want
-        // to return only really visible items
-        next.Unset();
-    }
-
-    return next;
+    return wxTreeItemId(TreeView_GetNextVisible(GetHwnd(), HITEM(item)));
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
@@ -1436,21 +1461,40 @@ wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
     wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
     wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() for must be visible itself!"));
 
-    wxTreeItemId prev(TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));
-    if ( prev.IsOk() && !IsVisible(prev) )
-    {
-        // just as above, Win32 function will happily return the previous item
-        // in the tree for the first visible item too
-        prev.Unset();
-    }
-
-    return prev;
+    return wxTreeItemId(TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));
 }
 
 // ----------------------------------------------------------------------------
 // multiple selections emulation
 // ----------------------------------------------------------------------------
 
+bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
+{
+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
+    // receive the desired information.
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
+    DoGetItem(&tvItem);
+
+    // state image indices are 1 based
+    return ((tvItem.state >> 12) - 1) == 1;
+}
+
+void wxTreeCtrl::SetItemCheck(const wxTreeItemId& item, bool check)
+{
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+    // receive the desired information.
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
+
+    DoGetItem(&tvItem);
+
+    // state images are one-based
+    tvItem.state = (check ? 2 : 1) << 12;
+
+    DoSetItem(&tvItem);
+}
+
 size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const
 {
     TraverseSelections selector(this, selections);
@@ -1470,7 +1514,7 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
 {
     wxCHECK_MSG( parent.IsOk() || !TreeView_GetRoot(GetHwnd()),
                  wxTreeItemId(),
-                 wxT("can't have more than one root in the tree") );
+                 _T("can't have more than one root in the tree") );
 
     TV_INSERTSTRUCT tvIns;
     tvIns.hParent = HITEM(parent);
@@ -1487,7 +1531,7 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
     if ( !text.empty() )
     {
         mask |= TVIF_TEXT;
-        tvIns.item.pszText = wxMSW_CONV_LPTSTR(text);
+        tvIns.item.pszText = (wxChar *)text.c_str();  // cast is ok
     }
     else
     {
@@ -1527,10 +1571,9 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
     // need this to make the "[+]" appear
     if ( firstChild )
     {
-        TVGetItemRectParam param;
-
-        wxTreeView_GetItemRect(GetHwnd(), HITEM(parent), param, FALSE);
-        ::InvalidateRect(GetHwnd(), &param.rect, FALSE);
+        RECT rect;
+        TreeView_GetItemRect(GetHwnd(), HITEM(parent), &rect, FALSE);
+        ::InvalidateRect(GetHwnd(), &rect, FALSE);
     }
 
     // associate the application tree item with Win32 tree item handle
@@ -1546,14 +1589,33 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
     return wxTreeItemId(id);
 }
 
+// for compatibility only
+#if WXWIN_COMPATIBILITY_2_4
+
+void wxTreeCtrl::SetImageList(wxImageList *imageList, int)
+{
+    SetImageList(imageList);
+}
+
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+    return GetItemImage(item, wxTreeItemIcon_Selected);
+}
+
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
+{
+    SetItemImage(item, image, wxTreeItemIcon_Selected);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+
 wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
                                  int image, int selectedImage,
                                  wxTreeItemData *data)
 {
+
     if ( HasFlag(wxTR_HIDE_ROOT) )
     {
-        wxASSERT_MSG( !m_pVirtualRoot, wxT("tree can have only a single root") );
-
         // create a virtual root item, the parent for all the others
         wxTreeItemParam *param = new wxTreeItemParam;
         param->SetData(data);
@@ -1593,7 +1655,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
 
         // assert, not check: if the index is invalid, we will append the item
         // to the end
-        wxASSERT_MSG( index == 0, wxT("bad index in wxTreeCtrl::InsertItem") );
+        wxASSERT_MSG( index == 0, _T("bad index in wxTreeCtrl::InsertItem") );
     }
 
     return DoInsertAfter(parent, idPrev, text, image, selectedImage, data);
@@ -1605,63 +1667,9 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
     // tree ctrl will eventually crash after item deletion
     TreeItemUnlocker unlock_all;
 
-    if ( HasFlag(wxTR_MULTIPLE) )
+    if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
     {
-        bool selected = IsSelected(item);
-        wxTreeItemId next;
-
-        if ( selected )
-        {
-            next = TreeView_GetNextVisible(GetHwnd(), HITEM(item));
-
-            if ( !next.IsOk() )
-            {
-                next = TreeView_GetPrevVisible(GetHwnd(), HITEM(item));
-            }
-        }
-
-        {
-            TempSetter set(m_changingSelection);
-            if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
-            {
-                wxLogLastError(wxT("TreeView_DeleteItem"));
-                return;
-            }
-        }
-
-        if ( !selected )
-        {
-            return;
-        }
-
-        if ( item == m_htSelStart )
-            m_htSelStart.Unset();
-
-        if ( item == m_htClickedItem )
-            m_htClickedItem.Unset();
-
-        if ( next.IsOk() )
-        {
-            wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
-
-            if ( IsTreeEventAllowed(changingEvent) )
-            {
-                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
-                (void)HandleTreeEvent(changedEvent);
-            }
-            else
-            {
-                DoUnselectItem(next);
-                ClearFocusedItem();
-            }
-        }
-    }
-    else
-    {
-        if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
-        {
-            wxLogLastError(wxT("TreeView_DeleteItem"));
-        }
+        wxLogLastError(wxT("TreeView_DeleteItem"));
     }
 }
 
@@ -1685,7 +1693,10 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
     size_t nCount = children.Count();
     for ( size_t n = 0; n < nCount; n++ )
     {
-        Delete(children[n]);
+        if ( !TreeView_DeleteItem(GetHwnd(), HITEM(children[n])) )
+        {
+            wxLogLastError(wxT("TreeView_DeleteItem"));
+        }
     }
 }
 
@@ -1694,10 +1705,6 @@ void wxTreeCtrl::DeleteAllItems()
     // unlock tree selections on vista for the duration of this call
     TreeItemUnlocker unlock_all;
 
-    // invalidate all the items we store as they're going to become invalid
-    m_htSelStart =
-    m_htClickedItem = wxTreeItemId();
-
     // delete the "virtual" root item.
     if ( GET_VIRTUAL_ROOT() )
     {
@@ -1737,22 +1744,15 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
     tvItem.state = 0;
     DoSetItem(&tvItem);
 
-    if ( IsExpanded(item) )
+    if ( TreeView_Expand(GetHwnd(), HITEM(item), flag) != 0 )
     {
-        wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
-                          this, wxTreeItemId(item));
-
-        if ( !IsTreeEventAllowed(event) )
-            return;
-    }
-
-    if ( TreeView_Expand(GetHwnd(), HITEM(item), flag) )
-    {
-        if ( IsExpanded(item) )
-            return;
-
-        wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, this, item);
-        (void)HandleTreeEvent(event);
+        // note that the {EXPAND|COLLAPS}ING event is sent by TreeView_Expand()
+        // itself
+        wxTreeEvent event(gs_expandEvents[IsExpanded(item) ? IDX_EXPAND
+                                                           : IDX_COLLAPSE]
+                                         [IDX_DONE],
+                           this, item);
+        (void)GetEventHandler()->ProcessEvent(event);
     }
     //else: change didn't took place, so do nothing at all
 }
@@ -1777,186 +1777,72 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
     DoExpand(item, TVE_TOGGLE);
 }
 
-void wxTreeCtrl::Unselect()
+#if WXWIN_COMPATIBILITY_2_4
+
+void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
-    wxASSERT_MSG( !HasFlag(wxTR_MULTIPLE),
-                  wxT("doesn't make sense, may be you want UnselectAll()?") );
-
-    // the current focus
-    HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
-
-    if ( !htFocus )
-    {
-        return;
-    }
-
-    if ( HasFlag(wxTR_MULTIPLE) )
-    {
-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                  this, wxTreeItemId());
-        changingEvent.m_itemOld = htFocus;
-
-        if ( IsTreeEventAllowed(changingEvent) )
-        {
-            ClearFocusedItem();
-
-            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                     this, wxTreeItemId());
-            changedEvent.m_itemOld = htFocus;
-            (void)HandleTreeEvent(changedEvent);
-        }
-    }
-    else
-    {
-        ClearFocusedItem();
-    }
+    DoExpand(item, action);
 }
 
-void wxTreeCtrl::DoUnselectAll()
+#endif
+
+void wxTreeCtrl::Unselect()
 {
-    wxArrayTreeItemIds selections;
-    size_t count = GetSelections(selections);
+    wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),
+                  wxT("doesn't make sense, may be you want UnselectAll()?") );
 
-    for ( size_t n = 0; n < count; n++ )
-    {
-        DoUnselectItem(selections[n]);
-    }
-
-    m_htSelStart.Unset();
+    // just remove the selection
+    SelectItem(wxTreeItemId());
 }
 
 void wxTreeCtrl::UnselectAll()
 {
-    if ( HasFlag(wxTR_MULTIPLE) )
+    if ( m_windowStyle & wxTR_MULTIPLE )
     {
-        HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
-        if ( !htFocus ) return;
-
-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this);
-        changingEvent.m_itemOld = htFocus;
-
-        if ( IsTreeEventAllowed(changingEvent) )
+        wxArrayTreeItemIds selections;
+        size_t count = GetSelections(selections);
+        for ( size_t n = 0; n < count; n++ )
         {
-            DoUnselectAll();
-
-            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
-            changedEvent.m_itemOld = htFocus;
-            (void)HandleTreeEvent(changedEvent);
+            ::UnselectItem(GetHwnd(), HITEM(selections[n]));
         }
+
+        m_htSelStart.Unset();
     }
     else
     {
+        // just remove the selection
         Unselect();
     }
 }
 
-void wxTreeCtrl::DoSelectChildren(const wxTreeItemId& parent)
-{
-    DoUnselectAll();
-
-    wxTreeItemIdValue cookie;
-    wxTreeItemId child = GetFirstChild(parent, cookie);
-    while ( child.IsOk() )
-    {
-        DoSelectItem(child, true);
-        child = GetNextChild(child, cookie);
-    }
-}
-
-void wxTreeCtrl::SelectChildren(const wxTreeItemId& parent)
-{
-    wxCHECK_RET( HasFlag(wxTR_MULTIPLE),
-                 "this only works with multiple selection controls" );
-
-    HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
-
-    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this);
-    changingEvent.m_itemOld = htFocus;
-
-    if ( IsTreeEventAllowed(changingEvent) )
-    {
-        DoSelectChildren(parent);
-
-        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
-        changedEvent.m_itemOld = htFocus;
-        (void)HandleTreeEvent(changedEvent);
-    }
-}
-
-void wxTreeCtrl::DoSelectItem(const wxTreeItemId& item, bool select)
-{
-    TempSetter set(m_changingSelection);
-
-    ::SelectItem(GetHwnd(), HITEM(item), select);
-}
-
 void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
 {
-    wxCHECK_RET( !IsHiddenRoot(item), wxT("can't select hidden root item") );
+    wxCHECK_RET( !IsHiddenRoot(item), _T("can't select hidden root item") );
 
-    if ( select == IsSelected(item) )
+    if ( m_windowStyle & wxTR_MULTIPLE )
     {
-        // nothing to do, the item is already in the requested state
-        return;
+        ::SelectItem(GetHwnd(), HITEM(item), select);
     }
-
-    if ( HasFlag(wxTR_MULTIPLE) )
+    else
     {
-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
+        wxASSERT_MSG( select,
+                      _T("SelectItem(false) works only for multiselect") );
 
-        if ( IsTreeEventAllowed(changingEvent) )
+        // inspite of the docs (MSDN Jan 99 edition), we don't seem to receive
+        // the notification from the control (i.e. TVN_SELCHANG{ED|ING}), so
+        // send them ourselves
+
+        wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
+        if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
         {
-            HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
-            DoSelectItem(item, select);
-
-            if ( !htFocus )
-            {
-                SetFocusedItem(item);
-            }
-
-            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                     this, item);
-            (void)HandleTreeEvent(changedEvent);
-        }
-    }
-    else // single selection
-    {
-        wxTreeItemId itemOld, itemNew;
-        if ( select )
-        {
-            itemOld = GetSelection();
-            itemNew = item;
-        }
-        else // deselecting the currently selected item
-        {
-            itemOld = item;
-            // leave itemNew invalid
-        }
-
-        // Recent versions of comctl32.dll send TVN_SELCHANG{ED,ING} events
-        // when we call TreeView_SelectItem() but apparently some old ones did
-        // not so send the events ourselves and ignore those generated by
-        // TreeView_SelectItem() if m_changingSelection is set.
-        wxTreeEvent
-            changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, itemNew);
-        changingEvent.SetOldItem(itemOld);
-
-        if ( IsTreeEventAllowed(changingEvent) )
-        {
-            TempSetter set(m_changingSelection);
-
-            if ( !TreeView_SelectItem(GetHwnd(), HITEM(itemNew)) )
+            if ( !TreeView_SelectItem(GetHwnd(), HITEM(item)) )
             {
                 wxLogLastError(wxT("TreeView_SelectItem"));
             }
             else // ok
             {
-                ::SetFocus(GetHwnd(), HITEM(item));
-
-                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                         this, itemNew);
-                changedEvent.SetOldItem(itemOld);
-                (void)HandleTreeEvent(changedEvent);
+                event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
+                (void)GetEventHandler()->ProcessEvent(event);
             }
         }
         //else: program vetoed the change
@@ -1965,7 +1851,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
 
 void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {
-    wxCHECK_RET( !IsHiddenRoot(item), wxT("can't show hidden root item") );
+    wxCHECK_RET( !IsHiddenRoot(item), _T("can't show hidden root item") );
 
     // no error return
     TreeView_EnsureVisible(GetHwnd(), HITEM(item));
@@ -1998,7 +1884,8 @@ void wxTreeCtrl::DeleteTextCtrl()
 
         m_textCtrl->UnsubclassWin();
         m_textCtrl->SetHWND(0);
-        wxDELETE(m_textCtrl);
+        delete m_textCtrl;
+        m_textCtrl = NULL;
 
         m_idEdited.Unset();
     }
@@ -2007,7 +1894,7 @@ void wxTreeCtrl::DeleteTextCtrl()
 wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item,
                                   wxClassInfo *textControlClass)
 {
-    wxASSERT( textControlClass->IsKindOf(wxCLASSINFO(wxTextCtrl)) );
+    wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) );
 
     DeleteTextCtrl();
 
@@ -2019,7 +1906,8 @@ wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item,
     // returned false
     if ( !hWnd )
     {
-        wxDELETE(m_textCtrl);
+        delete m_textCtrl;
+        m_textCtrl = NULL;
         return NULL;
     }
 
@@ -2070,18 +1958,18 @@ bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
                                  wxRect& rect,
                                  bool textOnly) const
 {
+    RECT rc;
+
     // Virtual root items have no bounding rectangle
     if ( IS_VIRTUAL_ROOT(item) )
     {
         return false;
     }
 
-    TVGetItemRectParam param;
-
-    if ( wxTreeView_GetItemRect(GetHwnd(), HITEM(item), param, textOnly) )
+    if ( TreeView_GetItemRect(GetHwnd(), HITEM(item),
+                              &rc, textOnly) )
     {
-        rect = wxRect(wxPoint(param.rect.left, param.rect.top),
-                      wxPoint(param.rect.right, param.rect.bottom));
+        rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom));
 
         return true;
     }
@@ -2092,39 +1980,6 @@ bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
     }
 }
 
-void wxTreeCtrl::ClearFocusedItem()
-{
-    TempSetter set(m_changingSelection);
-
-    if ( !TreeView_SelectItem(GetHwnd(), 0) )
-    {
-        wxLogLastError(wxT("TreeView_SelectItem"));
-    }
-}
-
-void wxTreeCtrl::SetFocusedItem(const wxTreeItemId& item)
-{
-    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
-
-    TempSetter set(m_changingSelection);
-
-    ::SetFocus(GetHwnd(), HITEM(item));
-}
-
-void wxTreeCtrl::DoUnselectItem(const wxTreeItemId& item)
-{
-    TempSetter set(m_changingSelection);
-
-    ::UnselectItem(GetHwnd(), HITEM(item));
-}
-
-void wxTreeCtrl::DoToggleItemSelection(const wxTreeItemId& item)
-{
-    TempSetter set(m_changingSelection);
-
-    ::ToggleItemSelection(GetHwnd(), HITEM(item));
-}
-
 // ----------------------------------------------------------------------------
 // sorting stuff
 // ----------------------------------------------------------------------------
@@ -2167,7 +2022,7 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
     //     may be why as if you don't use the DECLARE_CLASS/IMPLEMENT_CLASS
     //     combo for your derived wxTreeCtrl if will sort without
     //     OnCompareItems
-    if ( GetClassInfo() == wxCLASSINFO(wxTreeCtrl) )
+    if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) )
     {
         TreeView_SortChildren(GetHwnd(), HITEM(item), 0);
     }
@@ -2189,9 +2044,11 @@ bool wxTreeCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
 {
     if ( msg->message == WM_KEYDOWN )
     {
-        // Only eat VK_RETURN if not being used by the application in
-        // conjunction with modifiers
-        if ( (msg->wParam == VK_RETURN) && !wxIsAnyModifierDown() )
+        const bool isAltDown = ::GetKeyState(VK_MENU) < 0;
+
+        // Only eat VK_RETURN if not being used by the application in conjunction with
+        // modifiers
+        if ( msg->wParam == VK_RETURN && !wxIsCtrlDown() && !wxIsShiftDown() && !isAltDown)
         {
             // we need VK_RETURN to generate wxEVT_COMMAND_TREE_ITEM_ACTIVATED
             return false;
@@ -2201,10 +2058,8 @@ bool wxTreeCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
     return wxTreeCtrlBase::MSWShouldPreProcessMessage(msg);
 }
 
-bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
+bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
 {
-    const int id = (signed short)id_;
-
     if ( cmd == EN_UPDATE )
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
@@ -2227,434 +2082,17 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
     return true;
 }
 
-bool wxTreeCtrl::MSWIsOnItem(unsigned flags) const
-{
-    unsigned mask = TVHT_ONITEM;
-    if ( HasFlag(wxTR_FULL_ROW_HIGHLIGHT) )
-        mask |= TVHT_ONITEMINDENT | TVHT_ONITEMRIGHT;
-
-    return (flags & mask) != 0;
-}
-
-bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
-{
-    const bool bCtrl = wxIsCtrlDown();
-    const bool bShift = wxIsShiftDown();
-    const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
-
-    switch ( vkey )
-    {
-        case VK_RETURN:
-        case VK_SPACE:
-            if ( !htSel )
-                break;
-
-            if ( vkey != VK_RETURN && bCtrl )
-            {
-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                          this, htSel);
-                changingEvent.m_itemOld = htSel;
-
-                if ( IsTreeEventAllowed(changingEvent) )
-                {
-                    DoToggleItemSelection(wxTreeItemId(htSel));
-
-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                             this, htSel);
-                    changedEvent.m_itemOld = htSel;
-                    (void)HandleTreeEvent(changedEvent);
-                }
-            }
-            else
-            {
-                wxArrayTreeItemIds selections;
-                size_t count = GetSelections(selections);
-
-                if ( count != 1 || HITEM(selections[0]) != htSel )
-                {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                              this, htSel);
-                    changingEvent.m_itemOld = htSel;
-
-                    if ( IsTreeEventAllowed(changingEvent) )
-                    {
-                        DoUnselectAll();
-                        DoSelectItem(wxTreeItemId(htSel));
-
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                                 this, htSel);
-                        changedEvent.m_itemOld = htSel;
-                        (void)HandleTreeEvent(changedEvent);
-                    }
-                }
-            }
-            break;
-
-        case VK_UP:
-        case VK_DOWN:
-            if ( !bCtrl && !bShift )
-            {
-                wxArrayTreeItemIds selections;
-                wxTreeItemId next;
-
-                if ( htSel )
-                {
-                    next = vkey == VK_UP
-                            ? TreeView_GetPrevVisible(GetHwnd(), htSel)
-                            : TreeView_GetNextVisible(GetHwnd(), htSel);
-                }
-                else
-                {
-                    next = GetRootItem();
-
-                    if ( IsHiddenRoot(next) )
-                        next = TreeView_GetChild(GetHwnd(), HITEM(next));
-                }
-
-                if ( !next.IsOk() )
-                {
-                    break;
-                }
-
-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                          this, next);
-                changingEvent.m_itemOld = htSel;
-
-                if ( IsTreeEventAllowed(changingEvent) )
-                {
-                    DoUnselectAll();
-                    DoSelectItem(next);
-                    SetFocusedItem(next);
-
-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                             this, next);
-                    changedEvent.m_itemOld = htSel;
-                    (void)HandleTreeEvent(changedEvent);
-                }
-            }
-            else if ( htSel )
-            {
-                wxTreeItemId next = vkey == VK_UP
-                    ? TreeView_GetPrevVisible(GetHwnd(), htSel)
-                    : TreeView_GetNextVisible(GetHwnd(), htSel);
-
-                if ( !next.IsOk() )
-                {
-                    break;
-                }
-
-                if ( !m_htSelStart )
-                {
-                    m_htSelStart = htSel;
-                }
-
-                if ( bShift && SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
-                     SR_UNSELECT_OTHERS | SR_SIMULATE) )
-                {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
-                    changingEvent.m_itemOld = htSel;
-
-                    if ( IsTreeEventAllowed(changingEvent) )
-                    {
-                        SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
-                                    SR_UNSELECT_OTHERS);
-
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
-                        changedEvent.m_itemOld = htSel;
-                        (void)HandleTreeEvent(changedEvent);
-                    }
-                }
-
-                SetFocusedItem(next);
-            }
-            break;
-
-        case VK_LEFT:
-            if ( HasChildren(htSel) && IsExpanded(htSel) )
-            {
-                Collapse(htSel);
-            }
-            else
-            {
-                wxTreeItemId next = GetItemParent(htSel);
-
-                if ( next.IsOk() && !IsHiddenRoot(next) )
-                {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                              this, next);
-                    changingEvent.m_itemOld = htSel;
-
-                    if ( IsTreeEventAllowed(changingEvent) )
-                    {
-                        DoUnselectAll();
-                        DoSelectItem(next);
-                        SetFocusedItem(next);
-
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                                 this, next);
-                        changedEvent.m_itemOld = htSel;
-                        (void)HandleTreeEvent(changedEvent);
-                    }
-                }
-            }
-            break;
-
-        case VK_RIGHT:
-            if ( !IsVisible(htSel) )
-            {
-                EnsureVisible(htSel);
-            }
-
-            if ( !HasChildren(htSel) )
-                break;
-
-            if ( !IsExpanded(htSel) )
-            {
-                Expand(htSel);
-            }
-            else
-            {
-                wxTreeItemId next = TreeView_GetChild(GetHwnd(), htSel);
-
-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, next);
-                changingEvent.m_itemOld = htSel;
-
-                if ( IsTreeEventAllowed(changingEvent) )
-                {
-                    DoUnselectAll();
-                    DoSelectItem(next);
-                    SetFocusedItem(next);
-
-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
-                    changedEvent.m_itemOld = htSel;
-                    (void)HandleTreeEvent(changedEvent);
-                }
-            }
-            break;
-
-        case VK_HOME:
-        case VK_END:
-            {
-                wxTreeItemId next = GetRootItem();
-
-                if ( IsHiddenRoot(next) )
-                {
-                    next = TreeView_GetChild(GetHwnd(), HITEM(next));
-                }
-
-                if ( !next.IsOk() )
-                    break;
-
-                if ( vkey == VK_END )
-                {
-                    for ( ;; )
-                    {
-                        wxTreeItemId nextTemp = TreeView_GetNextVisible(
-                                                    GetHwnd(), HITEM(next));
-
-                        if ( !nextTemp.IsOk() )
-                            break;
-
-                        next = nextTemp;
-                    }
-                }
-
-                if ( htSel == HITEM(next) )
-                    break;
-
-                if ( bShift )
-                {
-                    if ( !m_htSelStart )
-                    {
-                        m_htSelStart = htSel;
-                    }
-
-                    if ( SelectRange(GetHwnd(),
-                                     HITEM(m_htSelStart), HITEM(next),
-                                     SR_UNSELECT_OTHERS | SR_SIMULATE) )
-                    {
-                        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                                  this, next);
-                        changingEvent.m_itemOld = htSel;
-
-                        if ( IsTreeEventAllowed(changingEvent) )
-                        {
-                            SelectRange(GetHwnd(),
-                                        HITEM(m_htSelStart), HITEM(next),
-                                        SR_UNSELECT_OTHERS);
-                            SetFocusedItem(next);
-
-                            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                                     this, next);
-                            changedEvent.m_itemOld = htSel;
-                            (void)HandleTreeEvent(changedEvent);
-                        }
-                    }
-                }
-                else // no Shift
-                {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                              this, next);
-                    changingEvent.m_itemOld = htSel;
-
-                    if ( IsTreeEventAllowed(changingEvent) )
-                    {
-                        DoUnselectAll();
-                        DoSelectItem(next);
-                        SetFocusedItem(next);
-
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                                 this, next);
-                        changedEvent.m_itemOld = htSel;
-                        (void)HandleTreeEvent(changedEvent);
-                    }
-                }
-            }
-            break;
-
-        case VK_PRIOR:
-        case VK_NEXT:
-            if ( bCtrl )
-            {
-                wxTreeItemId firstVisible = GetFirstVisibleItem();
-                size_t visibleCount = TreeView_GetVisibleCount(GetHwnd());
-                wxTreeItemId nextAdjacent = (vkey == VK_PRIOR) ?
-                    TreeView_GetPrevVisible(GetHwnd(), HITEM(firstVisible)) :
-                    TreeView_GetNextVisible(GetHwnd(), HITEM(firstVisible));
-
-                if ( !nextAdjacent )
-                {
-                    break;
-                }
-
-                wxTreeItemId nextStart = firstVisible;
-
-                for ( size_t n = 1; n < visibleCount; n++ )
-                {
-                    wxTreeItemId nextTemp = (vkey == VK_PRIOR) ?
-                        TreeView_GetPrevVisible(GetHwnd(), HITEM(nextStart)) :
-                        TreeView_GetNextVisible(GetHwnd(), HITEM(nextStart));
-
-                    if ( nextTemp.IsOk() )
-                    {
-                        nextStart = nextTemp;
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-
-                EnsureVisible(nextStart);
-
-                if ( vkey == VK_NEXT )
-                {
-                    wxTreeItemId nextEnd = nextStart;
-
-                    for ( size_t n = 1; n < visibleCount; n++ )
-                    {
-                        wxTreeItemId nextTemp =
-                            TreeView_GetNextVisible(GetHwnd(), HITEM(nextEnd));
-
-                        if ( nextTemp.IsOk() )
-                        {
-                            nextEnd = nextTemp;
-                        }
-                        else
-                        {
-                            break;
-                        }
-                    }
-
-                    EnsureVisible(nextEnd);
-                }
-            }
-            else // no Ctrl
-            {
-                size_t visibleCount = TreeView_GetVisibleCount(GetHwnd());
-                wxTreeItemId nextAdjacent = (vkey == VK_PRIOR) ?
-                    TreeView_GetPrevVisible(GetHwnd(), htSel) :
-                    TreeView_GetNextVisible(GetHwnd(), htSel);
-
-                if ( !nextAdjacent )
-                {
-                    break;
-                }
-
-                wxTreeItemId next(htSel);
-
-                for ( size_t n = 1; n < visibleCount; n++ )
-                {
-                    wxTreeItemId nextTemp = vkey == VK_PRIOR ?
-                        TreeView_GetPrevVisible(GetHwnd(), HITEM(next)) :
-                        TreeView_GetNextVisible(GetHwnd(), HITEM(next));
-
-                    if ( !nextTemp.IsOk() )
-                        break;
-
-                    next = nextTemp;
-                }
-
-                wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                          this, next);
-                changingEvent.m_itemOld = htSel;
-
-                if ( IsTreeEventAllowed(changingEvent) )
-                {
-                    DoUnselectAll();
-                    m_htSelStart.Unset();
-                    DoSelectItem(next);
-                    SetFocusedItem(next);
-
-                    wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                             this, next);
-                    changedEvent.m_itemOld = htSel;
-                    (void)HandleTreeEvent(changedEvent);
-                }
-            }
-            break;
-
-        default:
-            return false;
-    }
-
-    return true;
-}
-
-bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
-{
-    wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this);
-    keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, wParam, lParam);
-
-    bool processed = HandleTreeEvent(keyEvent);
-
-    // generate a separate event for Space/Return
-    if ( !wxIsCtrlDown() && !wxIsShiftDown() && !wxIsAltDown() &&
-         ((wParam == VK_SPACE) || (wParam == VK_RETURN)) )
-    {
-        const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
-        if ( htSel )
-        {
-            wxTreeEvent activatedEvent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
-                                       this, htSel);
-            (void)HandleTreeEvent(activatedEvent);
-        }
-    }
-
-    return processed;
-}
-
 // we hook into WndProc to process WM_MOUSEMOVE/WM_BUTTONUP messages - as we
 // only do it during dragging, minimize wxWin overhead (this is important for
 // WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
 // instead of passing by wxWin events
-WXLRESULT
-wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
     bool processed = false;
     WXLRESULT rc = 0;
     bool isMultiple = HasFlag(wxTR_MULTIPLE);
 
+    // This message is sent after a right-click, or when the "menu" key is pressed
     if ( nMsg == WM_CONTEXTMENU )
     {
         int x = GET_X_LPARAM(lParam),
@@ -2690,22 +2128,18 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             TV_HITTESTINFO tvhti;
             tvhti.pt.x = pt.x;
             tvhti.pt.y = pt.y;
-
             if ( TreeView_HitTest(GetHwnd(), &tvhti) )
                 item = wxTreeItemId(tvhti.hItem);
         }
 
         // create the event
-        if ( item.IsOk() )
-        {
-            wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_MENU, this, item);
+        wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_MENU, this, item);
 
-            event.m_pointDrag = pt;
+        event.m_pointDrag = pt;
 
-            if ( HandleTreeEvent(event) )
-                processed = true;
-            //else: continue with generating wxEVT_CONTEXT_MENU in base class code
-        }
+        if ( GetEventHandler()->ProcessEvent(event) )
+            processed = true;
+        //else: continue with generating wxEVT_CONTEXT_MENU in base class code
     }
     else if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )
     {
@@ -2718,255 +2152,129 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
         tvht.pt.x = x;
         tvht.pt.y = y;
 
-        HTREEITEM htOldItem = TreeView_GetSelection(GetHwnd());
         HTREEITEM htItem = TreeView_HitTest(GetHwnd(), &tvht);
 
         switch ( nMsg )
         {
             case WM_LBUTTONDOWN:
-                if ( !isMultiple )
-                    break;
-
-                m_htClickedItem.Unset();
-
-                if ( !MSWIsOnItem(tvht.flags) )
+                if ( htItem && isMultiple && (tvht.flags & TVHT_ONITEM) != 0 )
                 {
-                    if ( tvht.flags & TVHT_ONITEMBUTTON )
+                    m_htClickedItem = (WXHTREEITEM) htItem;
+                    m_ptClick = wxPoint(x, y);
+
+                    if ( wParam & MK_CONTROL )
                     {
-                        // either it's going to be handled by user code or
-                        // we're going to use it ourselves to toggle the
-                        // branch, in either case don't pass it to the base
-                        // class which would generate another mouse click event
-                        // for it even though it's already handled here
-                        processed = true;
                         SetFocus();
 
-                        if ( !HandleMouseEvent(nMsg, x, y, wParam) )
-                        {
-                            if ( !IsExpanded(htItem) )
-                            {
-                                Expand(htItem);
-                            }
-                            else
-                            {
-                                Collapse(htItem);
-                            }
-                        }
-                    }
-
-                    m_focusLost = false;
-                    break;
-                }
-
-                processed = true;
-                SetFocus();
-                m_htClickedItem = (WXHTREEITEM) htItem;
-                m_ptClick = wxPoint(x, y);
-
-                if ( wParam & MK_CONTROL )
-                {
-                    if ( HandleMouseEvent(nMsg, x, y, wParam) )
-                    {
-                        m_htClickedItem.Unset();
-                        break;
-                    }
-
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                              this, htItem);
-                    changingEvent.m_itemOld = htOldItem;
-
-                    if ( IsTreeEventAllowed(changingEvent) )
-                    {
                         // toggle selected state
-                        DoToggleItemSelection(wxTreeItemId(htItem));
+                        ::ToggleItemSelection(GetHwnd(), htItem);
 
-                        SetFocusedItem(wxTreeItemId(htItem));
+                        ::SetFocus(GetHwnd(), htItem);
 
                         // reset on any click without Shift
                         m_htSelStart.Unset();
 
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                                 this, htItem);
-                        changedEvent.m_itemOld = htOldItem;
-                        (void)HandleTreeEvent(changedEvent);
+                        processed = true;
                     }
-                }
-                else if ( wParam & MK_SHIFT )
-                {
-                    if ( HandleMouseEvent(nMsg, x, y, wParam) )
+                    else if ( wParam & MK_SHIFT )
                     {
-                        m_htClickedItem.Unset();
-                        break;
-                    }
+                        // this selects all items between the starting one and
+                        // the current
 
-                    int srFlags = 0;
-                    bool willChange = true;
-
-                    if ( !(wParam & MK_CONTROL) )
-                    {
-                        srFlags |= SR_UNSELECT_OTHERS;
-                    }
-
-                    if ( !m_htSelStart )
-                    {
-                        // take the focused item
-                        m_htSelStart = htOldItem;
-                    }
-                    else
-                    {
-                        willChange = SelectRange(GetHwnd(), HITEM(m_htSelStart),
-                                                 htItem, srFlags | SR_SIMULATE);
-                    }
-
-                    if ( willChange )
-                    {
-                        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                                  this, htItem);
-                        changingEvent.m_itemOld = htOldItem;
-
-                        if ( IsTreeEventAllowed(changingEvent) )
+                        if ( !m_htSelStart )
                         {
-                            // this selects all items between the starting one
-                            // and the current
-                            if ( m_htSelStart )
-                            {
-                                SelectRange(GetHwnd(), HITEM(m_htSelStart),
-                                            htItem, srFlags);
-                            }
-                            else
-                            {
-                                DoSelectItem(wxTreeItemId(htItem));
-                            }
-
-                            SetFocusedItem(wxTreeItemId(htItem));
-
-                            wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                                     this, htItem);
-                            changedEvent.m_itemOld = htOldItem;
-                            (void)HandleTreeEvent(changedEvent);
+                            // take the focused item
+                            m_htSelStart = TreeView_GetSelection(GetHwnd());
                         }
+
+                        if ( m_htSelStart )
+                            SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
+                                    !(wParam & MK_CONTROL));
+                        else
+                            ::SelectItem(GetHwnd(), htItem);
+
+                        ::SetFocus(GetHwnd(), htItem);
+
+                        processed = true;
                     }
-                }
-                else // normal click
-                {
-                    // avoid doing anything if we click on the only
-                    // currently selected item
-
-                    wxArrayTreeItemIds selections;
-                    size_t count = GetSelections(selections);
-
-                    if ( count == 0 ||
-                         count > 1 ||
-                         HITEM(selections[0]) != htItem )
+                    else // normal click
                     {
-                        if ( HandleMouseEvent(nMsg, x, y, wParam) )
+                        // avoid doing anything if we click on the only
+                        // currently selected item
+
+                        SetFocus();
+
+                        wxArrayTreeItemIds selections;
+                        size_t count = GetSelections(selections);
+                        if ( count == 0 ||
+                             count > 1 ||
+                             HITEM(selections[0]) != htItem )
                         {
+                            // clear the previously selected items, if the
+                            // user clicked outside of the present selection.
+                            // otherwise, perform the deselection on mouse-up.
+                            // this allows multiple drag and drop to work.
+
+                            if (!IsItemSelected(GetHwnd(), htItem))
+                            {
+                                UnselectAll();
+
+                                // prevent the click from starting in-place editing
+                                // which should only happen if we click on the
+                                // already selected item (and nothing else is
+                                // selected)
+
+                                TreeView_SelectItem(GetHwnd(), 0);
+                                ::SelectItem(GetHwnd(), htItem);
+                            }
+                            ::SetFocus(GetHwnd(), htItem);
+                            processed = true;
+                        }
+                        else // click on a single selected item
+                        {
+                            // don't interfere with the default processing in
+                            // WM_MOUSEMOVE handler below as the default window
+                            // proc will start the drag itself if we let have
+                            // WM_LBUTTONDOWN
                             m_htClickedItem.Unset();
-                            break;
                         }
 
-                        // clear the previously selected items, if the user
-                        // clicked outside of the present selection, otherwise,
-                        // perform the deselection on mouse-up, this allows
-                        // multiple drag and drop to work.
-                        if ( !IsItemSelected(GetHwnd(), htItem))
-                        {
-                            wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                                      this, htItem);
-                            changingEvent.m_itemOld = htOldItem;
-
-                            if ( IsTreeEventAllowed(changingEvent) )
-                            {
-                                DoUnselectAll();
-                                DoSelectItem(wxTreeItemId(htItem));
-                                SetFocusedItem(wxTreeItemId(htItem));
-
-                                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                                         this, htItem);
-                                changedEvent.m_itemOld = htOldItem;
-                                (void)HandleTreeEvent(changedEvent);
-                            }
-                        }
-                        else
-                        {
-                            SetFocusedItem(wxTreeItemId(htItem));
-                            m_mouseUpDeselect = true;
-                        }
-                    }
-                    else // click on a single selected item
-                    {
-                        // don't interfere with the default processing in
-                        // WM_MOUSEMOVE handler below as the default window
-                        // proc will start the drag itself if we let have
-                        // WM_LBUTTONDOWN
-                        m_htClickedItem.Unset();
-
-                        // prevent in-place editing from starting if focus lost
-                        // since previous click
-                        if ( m_focusLost )
-                        {
-                            ClearFocusedItem();
-                            DoSelectItem(wxTreeItemId(htItem));
-                            SetFocusedItem(wxTreeItemId(htItem));
-                        }
-                        else
-                        {
-                            processed = false;
-                        }
-                    }
-
-                    // reset on any click without Shift
-                    m_htSelStart.Unset();
-                }
-
-                m_focusLost = false;
-
-                // we consumed the event so we need to trigger state image
-                // click if needed
-                if ( processed )
-                {
-                    if ( tvht.flags & TVHT_ONITEMSTATEICON )
-                    {
-                        m_triggerStateImageClick = true;
+                        // reset on any click without Shift
+                        m_htSelStart.Unset();
                     }
                 }
                 break;
 
             case WM_RBUTTONDOWN:
-                if ( !isMultiple )
-                    break;
-
-                processed = true;
-                SetFocus();
-
-                if ( HandleMouseEvent(nMsg, x, y, wParam) || !htItem )
-                {
-                    break;
-                }
-
                 // default handler removes the highlight from the currently
                 // focused item when right mouse button is pressed on another
                 // one but keeps the remaining items highlighted, which is
-                // confusing, so override this default behaviour
-                if ( !IsItemSelected(GetHwnd(), htItem) )
+                // confusing, so override this default behaviour for tree with
+                // multiple selections
+                if ( isMultiple )
                 {
-                    wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                              this, htItem);
-                    changingEvent.m_itemOld = htOldItem;
-
-                    if ( IsTreeEventAllowed(changingEvent) )
+                    if ( !IsItemSelected(GetHwnd(), htItem) )
                     {
-                        DoUnselectAll();
-                        DoSelectItem(wxTreeItemId(htItem));
-                        SetFocusedItem(wxTreeItemId(htItem));
-
-                        wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                                 this, htItem);
-                        changedEvent.m_itemOld = htOldItem;
-                        (void)HandleTreeEvent(changedEvent);
+                        UnselectAll();
+                        SelectItem(htItem);
+                        ::SetFocus(GetHwnd(), htItem);
                     }
-                }
 
+                    // fire EVT_RIGHT_DOWN
+                    HandleMouseEvent(nMsg, x, y, wParam);
+
+                    // send NM_RCLICK
+                    NMHDR nmhdr;
+                    nmhdr.hwndFrom = GetHwnd();
+                    nmhdr.idFrom = ::GetWindowLong(GetHwnd(), GWL_ID);
+                    nmhdr.code = NM_RCLICK;
+                    ::SendMessage(::GetParent(GetHwnd()), WM_NOTIFY,
+                                  nmhdr.idFrom, (LPARAM)&nmhdr);
+
+                    // prevent tree control default processing, as we've
+                    // already done everything
+                    processed = true;
+                }
                 break;
 
             case WM_MOUSEMOVE:
@@ -3035,52 +2343,23 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                 break;
 
             case WM_LBUTTONUP:
-                if ( isMultiple )
+
+                // facilitates multiple drag-and-drop
+                if (htItem && isMultiple)
                 {
-                    // deselect other items if needed
-                    if ( htItem )
+                    wxArrayTreeItemIds selections;
+                    size_t count = GetSelections(selections);
+
+                    if (count > 1 &&
+                        !(wParam & MK_CONTROL) &&
+                        !(wParam & MK_SHIFT))
                     {
-                        if ( m_mouseUpDeselect )
-                        {
-                            m_mouseUpDeselect = false;
-
-                            wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
-                                                      this, htItem);
-                            changingEvent.m_itemOld = htOldItem;
-
-                            if ( IsTreeEventAllowed(changingEvent) )
-                            {
-                                DoUnselectAll();
-                                DoSelectItem(wxTreeItemId(htItem));
-                                SetFocusedItem(wxTreeItemId(htItem));
-
-                                wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
-                                                         this, htItem);
-                                changedEvent.m_itemOld = htOldItem;
-                                (void)HandleTreeEvent(changedEvent);
-                            }
-                        }
+                        UnselectAll();
+                        TreeView_SelectItem(GetHwnd(), htItem);
+                        ::SelectItem(GetHwnd(), htItem);
+                        ::SetFocus(GetHwnd(), htItem);
                     }
-
                     m_htClickedItem.Unset();
-
-                    if ( m_triggerStateImageClick )
-                    {
-                        if ( tvht.flags & TVHT_ONITEMSTATEICON )
-                        {
-                            wxTreeEvent event(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK,
-                                              this, htItem);
-                            (void)HandleTreeEvent(event);
-
-                            m_triggerStateImageClick = false;
-                            processed = true;
-                        }
-                    }
-
-                    if ( !m_dragStarted && MSWIsOnItem(tvht.flags) )
-                    {
-                        processed = true;
-                    }
                 }
 
                 // fall through
@@ -3090,99 +2369,120 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                 if ( m_dragImage )
                 {
                     m_dragImage->EndDrag();
-                    wxDELETE(m_dragImage);
+                    delete m_dragImage;
+                    m_dragImage = NULL;
 
                     // generate the drag end event
-                    wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG,
-                                      this, htItem);
+                    wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, this, htItem);
                     event.m_pointDrag = wxPoint(x, y);
-                    (void)HandleTreeEvent(event);
+                    (void)GetEventHandler()->ProcessEvent(event);
 
                     // if we don't do it, the tree seems to think that 2 items
                     // are selected simultaneously which is quite weird
                     TreeView_SelectDropTarget(GetHwnd(), 0);
                 }
 #endif // wxUSE_DRAGIMAGE
-
-                if ( isMultiple && nMsg == WM_RBUTTONUP )
-                {
-                    // send NM_RCLICK
-                    NMHDR nmhdr;
-                    nmhdr.hwndFrom = GetHwnd();
-                    nmhdr.idFrom = ::GetWindowLong(GetHwnd(), GWL_ID);
-                    nmhdr.code = NM_RCLICK;
-                    ::SendMessage(::GetParent(GetHwnd()), WM_NOTIFY,
-                                  nmhdr.idFrom, (LPARAM)&nmhdr);
-                    processed = true;
-                }
-
-                m_dragStarted = false;
-
                 break;
         }
     }
-    else if ( (nMsg == WM_SETFOCUS || nMsg == WM_KILLFOCUS) )
+    else if ( (nMsg == WM_SETFOCUS || nMsg == WM_KILLFOCUS) && isMultiple )
     {
-        if ( isMultiple )
+        // the tree control greys out the selected item when it loses focus and
+        // paints it as selected again when it regains it, but it won't do it
+        // for the other items itself - help it
+        wxArrayTreeItemIds selections;
+        size_t count = GetSelections(selections);
+        RECT rect;
+        for ( size_t n = 0; n < count; n++ )
         {
-            // the tree control greys out the selected item when it loses focus
-            // and paints it as selected again when it regains it, but it won't
-            // do it for the other items itself - help it
-            wxArrayTreeItemIds selections;
-            size_t count = GetSelections(selections);
-            TVGetItemRectParam param;
-
-            for ( size_t n = 0; n < count; n++ )
+            // TreeView_GetItemRect() will return false if item is not visible,
+            // which may happen perfectly well
+            if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),
+                                      &rect, TRUE) )
             {
-                // TreeView_GetItemRect() will return false if item is not
-                // visible, which may happen perfectly well
-                if ( wxTreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),
-                                            param, TRUE) )
-                {
-                    ::InvalidateRect(GetHwnd(), &param.rect, FALSE);
-                }
+                ::InvalidateRect(GetHwnd(), &rect, FALSE);
             }
         }
-
-        if ( nMsg == WM_KILLFOCUS )
-        {
-            m_focusLost = true;
-        }
     }
-    else if ( (nMsg == WM_KEYDOWN || nMsg == WM_SYSKEYDOWN) && isMultiple )
+    else if ( nMsg == WM_KEYDOWN && isMultiple )
     {
-        // normally we want to generate wxEVT_KEY_DOWN events from TVN_KEYDOWN
-        // notification but for the keys which can be used to change selection
-        // we need to do it from here so as to not apply the default behaviour
-        // if the events are handled by the user code
+        bool bCtrl = wxIsCtrlDown(),
+             bShift = wxIsShiftDown();
+
+        HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
         switch ( wParam )
         {
-            case VK_RETURN:
             case VK_SPACE:
+                if ( bCtrl )
+                {
+                    ::ToggleItemSelection(GetHwnd(), htSel);
+                }
+                else
+                {
+                    UnselectAll();
+
+                    ::SelectItem(GetHwnd(), htSel);
+                }
+
+                processed = true;
+                break;
+
             case VK_UP:
             case VK_DOWN:
-            case VK_LEFT:
-            case VK_RIGHT:
+                if ( !bCtrl && !bShift )
+                {
+                    // no modifiers, just clear selection and then let the default
+                    // processing to take place
+                    UnselectAll();
+                }
+                else if ( htSel )
+                {
+                    (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
+
+                    HTREEITEM htNext = (HTREEITEM)
+                        TreeView_GetNextItem
+                        (
+                            GetHwnd(),
+                            htSel,
+                            wParam == VK_UP ? TVGN_PREVIOUSVISIBLE
+                                            : TVGN_NEXTVISIBLE
+                        );
+
+                    if ( !htNext )
+                    {
+                        // at the top/bottom
+                        htNext = htSel;
+                    }
+
+                    if ( bShift )
+                    {
+                        if ( !m_htSelStart )
+                            m_htSelStart = htSel;
+
+                        SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext);
+                    }
+                    else // bCtrl
+                    {
+                        // without changing selection
+                        ::SetFocus(GetHwnd(), htNext);
+                    }
+
+                    processed = true;
+                }
+                break;
+
             case VK_HOME:
             case VK_END:
             case VK_PRIOR:
             case VK_NEXT:
-                if ( !HandleKeyDown(wParam, lParam) &&
-                        !MSWHandleTreeKeyDownEvent(wParam, lParam) )
+                // TODO: handle Shift/Ctrl with these keys
+                if ( !bCtrl && !bShift )
                 {
-                    // use the key to update the selection if it was left
-                    // unprocessed
-                    MSWHandleSelectionKey(wParam);
+                    UnselectAll();
+
+                    m_htSelStart.Unset();
                 }
-
-                // pretend that we did process it in any case as we already
-                // generated an event for it
-                processed = true;
-
-            //default: for all the other keys leave processed as false so that
-            //         the tree control generates a TVN_KEYDOWN for us
         }
-
     }
     else if ( nMsg == WM_COMMAND )
     {
@@ -3230,7 +2530,8 @@ wxTreeCtrl::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             if ( m_dragImage )
             {
                 m_dragImage->EndDrag();
-                wxDELETE(m_dragImage);
+                delete m_dragImage;
+                m_dragImage = NULL;
 
                 // if we don't do it, the tree seems to think that 2 items
                 // are selected simultaneously which is quite weird
@@ -3393,14 +2694,44 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_KEYDOWN:
             {
+                eventType = wxEVT_COMMAND_TREE_KEY_DOWN;
                 TV_KEYDOWN *info = (TV_KEYDOWN *)lParam;
 
                 // fabricate the lParam and wParam parameters sufficiently
                 // similar to the ones from a "real" WM_KEYDOWN so that
                 // CreateKeyEvent() works correctly
-                return MSWHandleTreeKeyDownEvent(
-                        info->wVKey, (wxIsAltDown() ? KF_ALTDOWN : 0) << 16);
+                const bool isAltDown = ::GetKeyState(VK_MENU) < 0;
+                WXLPARAM lParam = (isAltDown ? KF_ALTDOWN : 0) << 16;
+
+                WXWPARAM wParam = info->wVKey;
+
+                int keyCode = wxCharCodeMSWToWX(wParam);
+                if ( !keyCode )
+                {
+                    // wxCharCodeMSWToWX() returns 0 to indicate that this is a
+                    // simple ASCII key
+                    keyCode = wParam;
+                }
+
+                event.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN,
+                                                keyCode,
+                                                lParam,
+                                                wParam);
+
+                // a separate event for Space/Return
+                if ( !wxIsCtrlDown() && !wxIsShiftDown() && !isAltDown &&
+                     ((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) )
+                {
+                   wxTreeItemId item;
+                   if ( !HasFlag(wxTR_MULTIPLE) )
+                       item = GetSelection();
+
+                   wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
+                                        this, item);
+                   (void)GetEventHandler()->ProcessEvent(event2);
+                }
             }
+            break;
 
 
         // Vista's tree control has introduced some problems with our
@@ -3408,7 +2739,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         // the wrong items are deselected.
 
         // Fortunately, Vista provides a new notification, TVN_ITEMCHANGING
-        // that can be used to regulate this incorrect behaviour.  The
+        // that can be used to regulate this incorrect behavior.  The
         // following messages will allow only the unlocked item's selection
         // state to change
 
@@ -3438,15 +2769,11 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         //     we have to handle both messages:
         case TVN_SELCHANGEDA:
         case TVN_SELCHANGEDW:
-            if ( !m_changingSelection )
-            {
-                eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
-            }
+            eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
             // fall through
 
         case TVN_SELCHANGINGA:
         case TVN_SELCHANGINGW:
-            if ( !m_changingSelection )
             {
                 if ( eventType == wxEVT_NULL )
                     eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
@@ -3466,25 +2793,11 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                     event.m_itemOld = tv->itemOld.hItem;
                 }
             }
-
-            // we receive this message from WM_LBUTTONDOWN handler inside
-            // comctl32.dll and so before the click is passed to
-            // DefWindowProc() which sets the focus to the window which was
-            // clicked and this can lead to unexpected event sequences: for
-            // example, we may get a "selection change" event from the tree
-            // before getting a "kill focus" event for the text control which
-            // had the focus previously, thus breaking user code doing input
-            // validation
-            //
-            // to avoid such surprises, we force the generation of focus events
-            // now, before we generate the selection change ones
-            if ( !m_changingSelection && !m_isBeingDeleted )
-                SetFocus();
             break;
 
-        // instead of explicitly checking for _WIN32_IE, check if the
-        // required symbols are available in the headers
-#if defined(CDDS_PREPAINT)
+            // instead of explicitly checking for _WIN32_IE, check if the
+            // required symbols are available in the headers
+#if defined(CDDS_PREPAINT) && !wxUSE_COMCTL32_SAFELY
         case NM_CUSTOMDRAW:
             {
                 LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;
@@ -3496,68 +2809,6 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         // notify us before painting each item
                         *result = m_hasAnyAttr ? CDRF_NOTIFYITEMDRAW
                                                : CDRF_DODEFAULT;
-
-                        // windows in TreeCtrl use one-based index for item state images,
-                        // 0 indexed image is not being used, we're using zero-based index,
-                        // so we have to add temp image (of zero index) to state image list
-                        // before we draw any item, then after items are drawn we have to
-                        // delete it (in POSTPAINT notify)
-                        if (m_imageListState && m_imageListState->GetImageCount() > 0)
-                        {
-                            typedef BOOL (wxSTDCALL *ImageList_Copy_t)
-                                (HIMAGELIST, int, HIMAGELIST, int, UINT);
-                            static ImageList_Copy_t s_pfnImageList_Copy = NULL;
-                            static bool loaded = false;
-
-                            if ( !loaded )
-                            {
-                                wxLoadedDLL dllComCtl32(wxT("comctl32.dll"));
-                                if ( dllComCtl32.IsLoaded() )
-                                    wxDL_INIT_FUNC(s_pfn, ImageList_Copy, dllComCtl32);
-                            }
-
-                            if ( !s_pfnImageList_Copy )
-                            {
-                                // this code is broken with ImageList_Copy()
-                                // but I don't care enough about Win95 support
-                                // to write it now -- if anybody does, please
-                                // do it
-                                wxFAIL_MSG("TODO: implement this for Win95");
-                                break;
-                            }
-
-                            const HIMAGELIST
-                                hImageList = GetHimagelistOf(m_imageListState);
-
-                            // add temporary image
-                            int width, height;
-                            m_imageListState->GetSize(0, width, height);
-
-                            HBITMAP hbmpTemp = ::CreateBitmap(width, height, 1, 1, NULL);
-                            int index = ::ImageList_Add(hImageList, hbmpTemp, hbmpTemp);
-                            ::DeleteObject(hbmpTemp);
-
-                            if ( index != -1 )
-                            {
-                                // move images to right
-                                for ( int i = index; i > 0; i-- )
-                                {
-                                    (*s_pfnImageList_Copy)(hImageList, i,
-                                                           hImageList, i-1,
-                                                           ILCF_MOVE);
-                                }
-
-                                // we must remove the image in POSTPAINT notify
-                                *result |= CDRF_NOTIFYPOSTPAINT;
-                            }
-                        }
-                        break;
-
-                    case CDDS_POSTPAINT:
-                        // we are deleting temp image of 0 index, which was
-                        // added before items were drawn (in PREPAINT notify)
-                        if (m_imageListState && m_imageListState->GetImageCount() > 0)
-                            m_imageListState->Remove(0);
                         break;
 
                     case CDDS_ITEMPREPAINT:
@@ -3639,15 +2890,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 point.x = LOWORD(pos);
                 point.y = HIWORD(pos);
                 ::MapWindowPoints(HWND_DESKTOP, GetHwnd(), &point, 1);
-                int htFlags = 0;
-                wxTreeItemId item = HitTest(wxPoint(point.x, point.y), htFlags);
-
-                if ( htFlags & wxTREE_HITTEST_ONITEMSTATEICON )
+                int flags = 0;
+                wxTreeItemId item = HitTest(wxPoint(point.x, point.y), flags);
+                if (flags & wxTREE_HITTEST_ONITEMSTATEICON)
                 {
                     event.m_item = item;
                     eventType = wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK;
                 }
-
                 break;
             }
 
@@ -3655,11 +2904,11 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case NM_RCLICK:
             {
                 TV_HITTESTINFO tvhti;
-                wxGetCursorPosMSW(&tvhti.pt);
+                ::GetCursorPos(&tvhti.pt);
                 ::ScreenToClient(GetHwnd(), &tvhti.pt);
                 if ( TreeView_HitTest(GetHwnd(), &tvhti) )
                 {
-                    if ( MSWIsOnItem(tvhti.flags) )
+                    if ( tvhti.flags & TVHT_ONITEM )
                     {
                         event.m_item = tvhti.hItem;
                         eventType = (int)hdr->code == NM_DBLCLK
@@ -3681,7 +2930,10 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
     event.SetEventType(eventType);
 
-    bool processed = HandleTreeEvent(event);
+    if ( event.m_item.IsOk() )
+        event.SetClientObject(GetItemData(event.m_item));
+
+    bool processed = GetEventHandler()->ProcessEvent(event);
 
     // post processing
     switch ( hdr->code )
@@ -3713,13 +2965,11 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             {
                 // normally this is impossible because the m_dragImage is
                 // deleted once the drag operation is over
-                wxASSERT_MSG( !m_dragImage, wxT("starting to drag once again?") );
+                wxASSERT_MSG( !m_dragImage, _T("starting to drag once again?") );
 
                 m_dragImage = new wxDragImage(*this, event.m_item);
                 m_dragImage->BeginDrag(wxPoint(0,0), this);
                 m_dragImage->Show();
-
-                m_dragStarted = true;
             }
 #endif // wxUSE_DRAGIMAGE
             break;
@@ -3810,40 +3060,17 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             break;
 
         case TVN_ITEMEXPANDED:
+            // the item is not refreshed properly after expansion when it has
+            // an image depending on the expanded/collapsed state - bug in
+            // comctl32.dll or our code?
             {
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
-                const wxTreeItemId id(tv->itemNew.hItem);
+                wxTreeItemId id(tv->itemNew.hItem);
 
-                if ( tv->action == TVE_COLLAPSE )
+                int image = GetItemImage(id, wxTreeItemIcon_Expanded);
+                if ( image != -1 )
                 {
-                    if ( wxApp::GetComCtl32Version() >= 600 )
-                    {
-                        // for some reason the item selection rectangle depends
-                        // on whether it is expanded or collapsed (at least
-                        // with comctl32.dll v6): it is wider (by 3 pixels) in
-                        // the expanded state, so when the item collapses and
-                        // then is deselected the rightmost 3 pixels of the
-                        // previously drawn selection are left on the screen
-                        //
-                        // it's not clear if it's a bug in comctl32.dll or in
-                        // our code (because it does not happen in Explorer but
-                        // OTOH we don't do anything which could result in this
-                        // AFAICS) but we do need to work around it to avoid
-                        // ugly artifacts
-                        RefreshItem(id);
-                    }
-                }
-                else // expand
-                {
-                    // the item is also not refreshed properly after expansion when
-                    // it has an image depending on the expanded/collapsed state:
-                    // again, it's not clear if the bug is in comctl32.dll or our
-                    // code...
-                    int image = GetItemImage(id, wxTreeItemIcon_Expanded);
-                    if ( image != -1 )
-                    {
-                        RefreshItem(id);
-                    }
+                    RefreshItem(id);
                 }
             }
             break;
@@ -3895,29 +3122,40 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 // why do they define INDEXTOSTATEIMAGEMASK but not the inverse?
 #define STATEIMAGEMASKTOINDEX(state) (((state) & TVIS_STATEIMAGEMASK) >> 12)
 
-int wxTreeCtrl::DoGetItemState(const wxTreeItemId& item) const
+void wxTreeCtrl::SetState(const wxTreeItemId& node, int state)
 {
-    wxCHECK_MSG( item.IsOk(), wxTREE_ITEMSTATE_NONE, wxT("invalid tree item") );
+    TV_ITEM tvi;
+    tvi.hItem = (HTREEITEM)node.m_pItem;
+    tvi.mask = TVIF_STATE;
+    tvi.stateMask = TVIS_STATEIMAGEMASK;
 
-    // receive the desired information
-    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
-    DoGetItem(&tvItem);
+    // Select the specified state, or -1 == cycle to the next one.
+    if ( state == -1 )
+    {
+        TreeView_GetItem(GetHwnd(), &tvi);
 
-    // state images are one-based
-    return STATEIMAGEMASKTOINDEX(tvItem.state) - 1;
+        state = STATEIMAGEMASKTOINDEX(tvi.state) + 1;
+        if ( state == m_imageListState->GetImageCount() )
+            state = 1;
+    }
+
+    wxCHECK_RET( state < m_imageListState->GetImageCount(),
+                 _T("wxTreeCtrl::SetState(): item index out of bounds") );
+
+    tvi.state = INDEXTOSTATEIMAGEMASK(state);
+
+    TreeView_SetItem(GetHwnd(), &tvi);
 }
 
-void wxTreeCtrl::DoSetItemState(const wxTreeItemId& item, int state)
+int wxTreeCtrl::GetState(const wxTreeItemId& node)
 {
-    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+    TV_ITEM tvi;
+    tvi.hItem = (HTREEITEM)node.m_pItem;
+    tvi.mask = TVIF_STATE;
+    tvi.stateMask = TVIS_STATEIMAGEMASK;
+    TreeView_GetItem(GetHwnd(), &tvi);
 
-    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
-
-    // state images are one-based
-    // 0 if no state image display (wxTREE_ITEMSTATE_NONE = -1)
-    tvItem.state = INDEXTOSTATEIMAGEMASK(state + 1);
-
-    DoSetItem(&tvItem);
+    return STATEIMAGEMASKTOINDEX(tvi.state);
 }
 
 #endif // wxUSE_TREECTRL
diff --git a/Source/3rd Party/wx/src/msw/uiaction.cpp b/Source/3rd Party/wx/src/msw/uiaction.cpp
deleted file mode 100644
index c695aedf4..000000000
--- a/Source/3rd Party/wx/src/msw/uiaction.cpp	
+++ /dev/null
@@ -1,100 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/uiaction.cpp
-// Purpose:     wxUIActionSimulator implementation
-// Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
-// Modified by:
-// Created:     2010-03-06
-// RCS-ID:      $Id$
-// Copyright:   (c) Kevin Ollivier
-//              (c) 2010 Steven Lamerton
-//              (c) 2010 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#if wxUSE_UIACTIONSIMULATOR
-
-#ifndef WX_PRECOMP
-    #include "wx/msw/private.h"             // For wxGetCursorPosMSW()
-#endif
-
-#include "wx/uiaction.h"
-#include "wx/msw/wrapwin.h"
-
-#include "wx/msw/private/keyboard.h"
-
-#include "wx/math.h"
-
-namespace
-{
-
-DWORD EventTypeForMouseButton(int button, bool isDown)
-{
-    switch (button)
-    {
-        case wxMOUSE_BTN_LEFT:
-            return isDown ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_LEFTUP;
-
-        case wxMOUSE_BTN_RIGHT:
-            return isDown ? MOUSEEVENTF_RIGHTDOWN : MOUSEEVENTF_RIGHTUP;
-
-        case wxMOUSE_BTN_MIDDLE:
-            return isDown ? MOUSEEVENTF_MIDDLEDOWN : MOUSEEVENTF_MIDDLEUP;
-
-        default:
-            wxFAIL_MSG("Unsupported button passed in.");
-            return (DWORD)-1;
-    }
-}
-
-} // anonymous namespace
-
-bool wxUIActionSimulator::MouseDown(int button)
-{
-    POINT p;
-    wxGetCursorPosMSW(&p);
-    mouse_event(EventTypeForMouseButton(button, true), p.x, p.y, 0, 0);
-    return true;
-}
-
-bool wxUIActionSimulator::MouseMove(long x, long y)
-{
-    // Because MOUSEEVENTF_ABSOLUTE takes measurements scaled between 0 & 65535
-    // we need to scale our input too
-    int displayx, displayy;
-    wxDisplaySize(&displayx, &displayy);
-
-    int scaledx = ceil((float)x * 65535.0 / (displayx-1));
-    int scaledy = ceil((float)y * 65535.0 / (displayy-1));
-    mouse_event(MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, scaledx, scaledy, 0, 0);
-
-    return true;
-}
-
-bool wxUIActionSimulator::MouseUp(int button)
-{
-    POINT p;
-    wxGetCursorPosMSW(&p);
-    mouse_event(EventTypeForMouseButton(button, false), p.x, p.y, 0, 0);
-    return true;
-}
-
-bool
-wxUIActionSimulator::DoKey(int keycode, int WXUNUSED(modifiers), bool isDown)
-{
-    bool isExtended;
-    DWORD vkkeycode = wxMSWKeyboard::WXToVK(keycode, &isExtended);
-
-    DWORD flags = 0;
-    if ( isExtended )
-        flags |= KEYEVENTF_EXTENDEDKEY;
-    if ( !isDown )
-        flags |= KEYEVENTF_KEYUP;
-
-    keybd_event(vkkeycode, 0, flags, 0);
-
-    return true;
-}
-
-#endif // wxUSE_UIACTIONSIMULATOR
diff --git a/Source/3rd Party/wx/src/msw/utils.cpp b/Source/3rd Party/wx/src/msw/utils.cpp
index a40598380..4f2ae25b8 100644
--- a/Source/3rd Party/wx/src/msw/utils.cpp	
+++ b/Source/3rd Party/wx/src/msw/utils.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: utils.cpp 53784 2008-05-27 15:48:23Z VZ $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -18,18 +18,23 @@
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx.h".
-#undef WIN32_LEAN_AND_MEAN
 #include "wx/wxprec.h"
 
+#if defined(__WXMSW__)
+#include <winsock.h>
+#endif
+
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/missing.h"     // CHARSET_HANGUL
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/timer.h"
 #endif  //WX_PRECOMP
 
 #include "wx/msw/registry.h"
@@ -37,13 +42,10 @@
 #include "wx/dynlib.h"
 #include "wx/dynload.h"
 #include "wx/scopeguard.h"
-#include "wx/filename.h"
 
 #include "wx/confbase.h"        // for wxExpandEnvVars()
 
 #include "wx/msw/private.h"     // includes <windows.h>
-#include "wx/msw/private/hiddenwin.h"
-#include "wx/msw/missing.h"     // for CHARSET_HANGUL
 
 #if defined(__CYGWIN__)
     //CYGWIN gives annoying warning about runtime stuff if we don't do this
@@ -58,18 +60,18 @@
     #include <winsock.h>
 #endif
 
-#if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
 
-    #include <dos.h>
+    #ifndef __MWERKS__
+        #include <dos.h>
+    #endif
 #endif  //GNUWIN32
 
 #if defined(__CYGWIN__)
     #include <sys/unistd.h>
     #include <sys/stat.h>
-    #include <sys/cygwin.h> // for cygwin_conv_path()
-    // and cygwin_conv_to_full_win32_path()
-    #include <cygwin/version.h>
+    #include <sys/cygwin.h> // for cygwin_conv_to_full_win32_path()
 #endif  //GNUWIN32
 
 #ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
@@ -120,8 +122,6 @@ static const wxChar WX_SECTION[] = wxT("wxWindows");
 static const wxChar eUSERNAME[]  = wxT("UserName");
 #endif
 
-WXDLLIMPEXP_DATA_BASE(const wxChar *) wxUserResourceStr = wxT("TEXT");
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -131,19 +131,13 @@ WXDLLIMPEXP_DATA_BASE(const wxChar *) wxUserResourceStr = wxT("TEXT");
 // ----------------------------------------------------------------------------
 
 // Get hostname only (without domain name)
-bool wxGetHostName(wxChar *buf, int maxSize)
+bool wxGetHostName(wxChar *WXUNUSED_IN_WINCE(buf),
+                   int WXUNUSED_IN_WINCE(maxSize))
 {
 #if defined(__WXWINCE__)
-    // GetComputerName() is not supported but the name seems to be stored in
-    // this location in the registry, at least for PPC2003 and WM5
-    wxString hostName;
-    wxRegKey regKey(wxRegKey::HKLM, wxT("Ident"));
-    if ( !regKey.HasValue(wxT("Name")) ||
-            !regKey.QueryValue(wxT("Name"), hostName) )
-        return false;
-
-    wxStrlcpy(buf, hostName.t_str(), maxSize);
-#else // !__WXWINCE__
+    // TODO-CE
+    return false;
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {
@@ -151,15 +145,25 @@ bool wxGetHostName(wxChar *buf, int maxSize)
 
         return false;
     }
-#endif // __WXWINCE__/!__WXWINCE__
 
     return true;
+#else
+    wxChar *sysname;
+    const wxChar *default_host = wxT("noname");
+
+    if ((sysname = wxGetenv(wxT("SYSTEM_NAME"))) == NULL) {
+        GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1);
+    } else
+        wxStrncpy(buf, sysname, maxSize - 1);
+    buf[maxSize] = wxT('\0');
+    return *buf ? true : false;
+#endif
 }
 
 // get full hostname (with domain name if possible)
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
-#if !defined( __WXMICROWIN__) && wxUSE_DYNLIB_CLASS && wxUSE_SOCKETS
+#if !defined( __WXMICROWIN__) && wxUSE_DYNAMIC_LOADER && wxUSE_SOCKETS
     // TODO should use GetComputerNameEx() when available
 
     // we don't want to always link with Winsock DLL as we might not use it at
@@ -167,7 +171,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
     // missing, we handle this)
     wxLogNull noLog;
 
-    wxDynamicLibrary dllWinsock(wxT("ws2_32.dll"), wxDL_VERBATIM);
+    wxDynamicLibrary dllWinsock(_T("ws2_32.dll"), wxDL_VERBATIM);
     if ( dllWinsock.IsLoaded() )
     {
         typedef int (PASCAL *WSAStartup_t)(WORD, WSADATA *);
@@ -178,7 +182,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 
         #define LOAD_WINSOCK_FUNC(func)                                       \
             func ## _t                                                        \
-                pfn ## func = (func ## _t)dllWinsock.GetSymbol(wxT(#func))
+                pfn ## func = (func ## _t)dllWinsock.GetSymbol(_T(#func))
 
         LOAD_WINSOCK_FUNC(WSAStartup);
 
@@ -229,7 +233,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 
             if ( !host.empty() )
             {
-                wxStrlcpy(buf, host.c_str(), maxSize);
+                wxStrncpy(buf, host, maxSize);
 
                 return true;
             }
@@ -247,7 +251,7 @@ bool wxGetUserId(wxChar *WXUNUSED_IN_WINCE(buf),
 #if defined(__WXWINCE__)
     // TODO-CE
     return false;
-#else
+#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     DWORD nSize = maxSize;
     if ( ::GetUserName(buf, &nSize) == 0 )
     {
@@ -261,6 +265,24 @@ bool wxGetUserId(wxChar *WXUNUSED_IN_WINCE(buf),
     }
 
     return true;
+#else   // __WXMICROWIN__
+    wxChar *user;
+    const wxChar *default_id = wxT("anonymous");
+
+    // Can't assume we have NIS (PC-NFS) or some other ID daemon
+    // So we ...
+    if ( (user = wxGetenv(wxT("USER"))) == NULL &&
+         (user = wxGetenv(wxT("LOGNAME"))) == NULL )
+    {
+        // Use wxWidgets configuration data (comming soon)
+        GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1);
+    }
+    else
+    {
+        wxStrncpy(buf, user, maxSize - 1);
+    }
+
+    return *buf ? true : false;
 #endif
 }
 
@@ -268,8 +290,8 @@ bool wxGetUserId(wxChar *WXUNUSED_IN_WINCE(buf),
 bool wxGetUserName(wxChar *buf, int maxSize)
 {
     wxCHECK_MSG( buf && ( maxSize > 0 ), false,
-                    wxT("empty buffer in wxGetUserName") );
-#if defined(__WXWINCE__) && wxUSE_REGKEY
+                    _T("empty buffer in wxGetUserName") );
+#if defined(__WXWINCE__)
     wxLogNull noLog;
     wxRegKey key(wxRegKey::HKCU, wxT("ControlPanel\\Owner"));
     if(!key.Open(wxRegKey::Read))
@@ -277,7 +299,8 @@ bool wxGetUserName(wxChar *buf, int maxSize)
     wxString name;
     if(!key.QueryValue(wxT("Owner"),name))
         return false;
-    wxStrlcpy(buf, name.c_str(), maxSize);
+    wxStrncpy(buf, name.c_str(), maxSize-1);
+    buf[maxSize-1] = _T('\0');
     return true;
 #elif defined(USE_NET_API)
     CHAR szUserName[256];
@@ -303,7 +326,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
     // Get the computer name of a DC for the domain.
     if ( NetGetDCName( NULL, wszDomain, &ComputerName ) != NERR_Success )
     {
-        wxLogError(wxT("Cannot find domain controller"));
+        wxLogError(wxT("Can not find domain controller"));
 
         goto error;
     }
@@ -356,7 +379,7 @@ error:
 
     if ( !ok )
     {
-        wxStrlcpy(buf, wxT("Unknown User"), maxSize);
+        wxStrncpy(buf, wxT("Unknown User"), maxSize);
     }
 
     return true;
@@ -369,7 +392,7 @@ const wxChar* wxGetHomeDir(wxString *pstr)
 
     // first branch is for Cygwin
 #if defined(__UNIX__) && !defined(__WINE__)
-    const wxChar *szHome = wxGetenv(wxT("HOME"));
+    const wxChar *szHome = wxGetenv("HOME");
     if ( szHome == NULL ) {
       // we're homeless...
       wxLogWarning(_("can't find user's HOME, using current directory."));
@@ -385,11 +408,7 @@ const wxChar* wxGetHomeDir(wxString *pstr)
     #ifdef __CYGWIN__
         // Cygwin returns unix type path but that does not work well
         static wxChar windowsPath[MAX_PATH];
-        #if CYGWIN_VERSION_DLL_MAJOR >= 1007
-            cygwin_conv_path(CCP_POSIX_TO_WIN_W, strDir, windowsPath, MAX_PATH);
-        #else
-            cygwin_conv_to_full_win32_path(strDir, windowsPath);
-        #endif
+        cygwin_conv_to_full_win32_path(strDir, windowsPath);
         strDir = windowsPath;
     #endif
 #elif defined(__WXWINCE__)
@@ -446,21 +465,21 @@ const wxChar* wxGetHomeDir(wxString *pstr)
     else // fall back to the program directory
     {
         // extract the directory component of the program file name
-        wxFileName::SplitPath(wxGetFullModuleName(), &strDir, NULL, NULL);
+        wxSplitPath(wxGetFullModuleName(), &strDir, NULL, NULL);
     }
 #endif  // UNIX/Win
 
     return strDir.c_str();
 }
 
-wxString wxGetUserHome(const wxString& user)
+wxChar *wxGetUserHome(const wxString& WXUNUSED(user))
 {
-    wxString home;
+    // VZ: the old code here never worked for user != "" anyhow! Moreover, it
+    //     returned sometimes a malloc()'d pointer, sometimes a pointer to a
+    //     static buffer and sometimes I don't even know what.
+    static wxString s_home;
 
-    if ( user.empty() || user == wxGetUserId() )
-        wxGetHomeDir(&home);
-
-    return home;
+    return (wxChar *)wxGetHomeDir(&s_home);
 }
 
 bool wxGetDiskSpace(const wxString& WXUNUSED_IN_WINCE(path),
@@ -487,7 +506,7 @@ bool wxGetDiskSpace(const wxString& WXUNUSED_IN_WINCE(path),
     GetDiskFreeSpaceEx_t
         pGetDiskFreeSpaceEx = (GetDiskFreeSpaceEx_t)::GetProcAddress
                               (
-                                ::GetModuleHandle(wxT("kernel32.dll")),
+                                ::GetModuleHandle(_T("kernel32.dll")),
 #if wxUSE_UNICODE
                                 "GetDiskFreeSpaceExW"
 #else
@@ -500,12 +519,12 @@ bool wxGetDiskSpace(const wxString& WXUNUSED_IN_WINCE(path),
         ULARGE_INTEGER bytesFree, bytesTotal;
 
         // may pass the path as is, GetDiskFreeSpaceEx() is smart enough
-        if ( !pGetDiskFreeSpaceEx(path.t_str(),
+        if ( !pGetDiskFreeSpaceEx(path,
                                   &bytesFree,
                                   &bytesTotal,
                                   NULL) )
         {
-            wxLogLastError(wxT("GetDiskFreeSpaceEx"));
+            wxLogLastError(_T("GetDiskFreeSpaceEx"));
 
             return false;
         }
@@ -550,13 +569,13 @@ bool wxGetDiskSpace(const wxString& WXUNUSED_IN_WINCE(path),
 
         // FIXME: this is wrong, we should extract the root drive from path
         //        instead, but this is the job for wxFileName...
-        if ( !::GetDiskFreeSpace(path.t_str(),
+        if ( !::GetDiskFreeSpace(path,
                                  &lSectorsPerCluster,
                                  &lBytesPerSector,
                                  &lNumberOfFreeClusters,
                                  &lTotalNumberOfClusters) )
         {
-            wxLogLastError(wxT("GetDiskFreeSpace"));
+            wxLogLastError(_T("GetDiskFreeSpace"));
 
             return false;
         }
@@ -594,7 +613,7 @@ bool wxGetEnv(const wxString& WXUNUSED_IN_WINCE(var),
     return false;
 #else // Win32
     // first get the size of the buffer
-    DWORD dwRet = ::GetEnvironmentVariable(var.t_str(), NULL, 0);
+    DWORD dwRet = ::GetEnvironmentVariable(var, NULL, 0);
     if ( !dwRet )
     {
         // this means that there is no such variable
@@ -603,8 +622,7 @@ bool wxGetEnv(const wxString& WXUNUSED_IN_WINCE(var),
 
     if ( value )
     {
-        (void)::GetEnvironmentVariable(var.t_str(),
-                                       wxStringBuffer(*value, dwRet),
+        (void)::GetEnvironmentVariable(var, wxStringBuffer(*value, dwRet),
                                        dwRet);
     }
 
@@ -612,53 +630,24 @@ bool wxGetEnv(const wxString& WXUNUSED_IN_WINCE(var),
 #endif // WinCE/32
 }
 
-bool wxDoSetEnv(const wxString& var, const wxChar *value)
+bool wxSetEnv(const wxString& WXUNUSED_IN_WINCE(var),
+              const wxChar *WXUNUSED_IN_WINCE(value))
 {
+    // some compilers have putenv() or _putenv() or _wputenv() but it's better
+    // to always use Win32 function directly instead of dealing with them
 #ifdef __WXWINCE__
     // no environment variables under CE
-    wxUnusedVar(var);
-    wxUnusedVar(value);
     return false;
-#else // !__WXWINCE__
-    // update the CRT environment if possible as people expect getenv() to also
-    // work and it is not affected by Win32 SetEnvironmentVariable() call (OTOH
-    // the CRT does use Win32 call to update the process environment block so
-    // there is no need to call it)
-    //
-    // TODO: add checks for the other compilers (and update wxSetEnv()
-    //       documentation in interface/wx/utils.h accordingly)
-#if defined(__VISUALC__) || defined(__MINGW32__)
-    // notice that Microsoft _putenv() has different semantics from POSIX
-    // function with almost the same name: in particular it makes a copy of the
-    // string instead of using it as part of environment so we can safely call
-    // it here without going through all the troubles with wxSetEnvModule as in
-    // src/unix/utilsunx.cpp
-    wxString envstr = var;
-    envstr += '=';
-    if ( value )
-        envstr += value;
-    _tputenv(envstr.t_str());
-#else // other compiler
-    if ( !::SetEnvironmentVariable(var.t_str(), value) )
+#else
+    if ( !::SetEnvironmentVariable(var, value) )
     {
-        wxLogLastError(wxT("SetEnvironmentVariable"));
+        wxLogLastError(_T("SetEnvironmentVariable"));
 
         return false;
     }
-#endif // compiler
 
     return true;
-#endif // __WXWINCE__/!__WXWINCE__
-}
-
-bool wxSetEnv(const wxString& variable, const wxString& value)
-{
-    return wxDoSetEnv(variable, value.t_str());
-}
-
-bool wxUnsetEnv(const wxString& variable)
-{
-    return wxDoSetEnv(variable, NULL);
+#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -676,7 +665,7 @@ struct wxFindByPidParams
     // the PID we're looking from
     DWORD pid;
 
-    wxDECLARE_NO_COPY_CLASS(wxFindByPidParams);
+    DECLARE_NO_COPY_CLASS(wxFindByPidParams)
 };
 
 // wxKill helper: EnumWindows() callback which is used to find the first (top
@@ -708,11 +697,11 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
         wxKillAllChildren(pid, sig, krc);
 
     // get the process handle to operate on
-    DWORD dwAccess = PROCESS_QUERY_INFORMATION | SYNCHRONIZE;
-    if ( sig == wxSIGKILL )
-        dwAccess |= PROCESS_TERMINATE;
-
-    HANDLE hProcess = ::OpenProcess(dwAccess, FALSE, (DWORD)pid);
+    HANDLE hProcess = ::OpenProcess(SYNCHRONIZE |
+                                    PROCESS_TERMINATE |
+                                    PROCESS_QUERY_INFORMATION,
+                                    FALSE, // not inheritable
+                                    (DWORD)pid);
     if ( hProcess == NULL )
     {
         if ( krc )
@@ -730,12 +719,6 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
 
     wxON_BLOCK_EXIT1(::CloseHandle, hProcess);
 
-    // Default timeout for waiting for the process termination after killing
-    // it. It should be long enough to allow the process to terminate even on a
-    // busy system but short enough to avoid blocking the main thread for too
-    // long.
-    DWORD waitTimeout = 500; // ms
-
     bool ok = true;
     switch ( sig )
     {
@@ -757,14 +740,10 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
             break;
 
         case wxSIGNONE:
-            // Opening the process handle may succeed for a process even if it
-            // doesn't run any more (typically because open handles to it still
-            // exist elsewhere, possibly in this process itself if we're
-            // killing a child process) so we still need check if it hasn't
-            // terminated yet but, unlike when killing it, we don't need to
-            // wait for any time at all.
-            waitTimeout = 0;
-            break;
+            // do nothing, we just want to test for process existence
+            if ( krc )
+                *krc = wxKILL_OK;
+            return 0;
 
         default:
             // any other signal means "terminate"
@@ -788,12 +767,12 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
                         //     can also use SendMesageTimeout(WM_CLOSE)
                         if ( !::PostMessage(params.hwnd, WM_QUIT, 0, 0) )
                         {
-                            wxLogLastError(wxT("PostMessage(WM_QUIT)"));
+                            wxLogLastError(_T("PostMessage(WM_QUIT)"));
                         }
                     }
                     else // it was an error then
                     {
-                        wxLogLastError(wxT("EnumWindows"));
+                        wxLogLastError(_T("EnumWindows"));
 
                         ok = false;
                     }
@@ -809,43 +788,34 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
     }
 
     // the return code
+    DWORD rc wxDUMMY_INITIALIZE(0);
     if ( ok )
     {
         // as we wait for a short time, we can use just WaitForSingleObject()
         // and not MsgWaitForMultipleObjects()
-        switch ( ::WaitForSingleObject(hProcess, waitTimeout) )
+        switch ( ::WaitForSingleObject(hProcess, 500 /* msec */) )
         {
             case WAIT_OBJECT_0:
-                // Process terminated: normally this indicates that we
-                // successfully killed it but when testing for the process
-                // existence, this means failure.
-                if ( sig == wxSIGNONE )
+                // process terminated
+                if ( !::GetExitCodeProcess(hProcess, &rc) )
                 {
-                    if ( krc )
-                        *krc = wxKILL_NO_PROCESS;
-
-                    ok = false;
+                    wxLogLastError(_T("GetExitCodeProcess"));
                 }
                 break;
 
             default:
-                wxFAIL_MSG( wxT("unexpected WaitForSingleObject() return") );
+                wxFAIL_MSG( _T("unexpected WaitForSingleObject() return") );
                 // fall through
 
             case WAIT_FAILED:
-                wxLogLastError(wxT("WaitForSingleObject"));
+                wxLogLastError(_T("WaitForSingleObject"));
                 // fall through
 
             case WAIT_TIMEOUT:
-                // Process didn't terminate: normally this is a failure but not
-                // when we're just testing for its existence.
-                if ( sig != wxSIGNONE )
-                {
-                    if ( krc )
-                        *krc = wxKILL_ERROR;
+                if ( krc )
+                    *krc = wxKILL_ERROR;
 
-                    ok = false;
-                }
+                rc = STILL_ACTIVE;
                 break;
         }
     }
@@ -853,7 +823,7 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc, int flags)
 
     // the return code is the same as from Unix kill(): 0 if killed
     // successfully or -1 on error
-    if ( !ok )
+    if ( !ok || rc == STILL_ACTIVE )
         return -1;
 
     if ( krc )
@@ -883,7 +853,7 @@ static void InitToolHelp32()
 
 #if wxUSE_DYNLIB_CLASS
 
-    wxDynamicLibrary dllKernel(wxT("kernel32.dll"), wxDL_VERBATIM);
+    wxDynamicLibrary dllKernel(_T("kernel32.dll"), wxDL_VERBATIM);
 
     // Get procedure addresses.
     // We are linking to these functions of Kernel32
@@ -892,13 +862,13 @@ static void InitToolHelp32()
     // which does not have the Toolhelp32
     // functions in the Kernel 32.
     lpfCreateToolhelp32Snapshot =
-        (CreateToolhelp32Snapshot_t)dllKernel.RawGetSymbol(wxT("CreateToolhelp32Snapshot"));
+        (CreateToolhelp32Snapshot_t)dllKernel.RawGetSymbol(_T("CreateToolhelp32Snapshot"));
 
     lpfProcess32First =
-        (Process32_t)dllKernel.RawGetSymbol(wxT("Process32First"));
+        (Process32_t)dllKernel.RawGetSymbol(_T("Process32First"));
 
     lpfProcess32Next =
-        (Process32_t)dllKernel.RawGetSymbol(wxT("Process32Next"));
+        (Process32_t)dllKernel.RawGetSymbol(_T("Process32Next"));
 
 #endif // wxUSE_DYNLIB_CLASS
 }
@@ -977,7 +947,7 @@ bool wxShell(const wxString& command)
 }
 
 // Shutdown or reboot the PC
-bool wxShutdown(int WXUNUSED_IN_WINCE(flags))
+bool wxShutdown(wxShutdownFlags WXUNUSED_IN_WINCE(wFlags))
 {
 #ifdef __WXWINCE__
     // TODO-CE
@@ -997,59 +967,44 @@ bool wxShutdown(int WXUNUSED_IN_WINCE(flags))
             TOKEN_PRIVILEGES tkp;
 
             // Get the LUID for the shutdown privilege.
-            bOK = ::LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME,
-                                         &tkp.Privileges[0].Luid) != 0;
+            ::LookupPrivilegeValue(NULL, SE_SHUTDOWN_NAME,
+                                   &tkp.Privileges[0].Luid);
 
-            if ( bOK )
-            {
-                tkp.PrivilegeCount = 1;  // one privilege to set
-                tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+            tkp.PrivilegeCount = 1;  // one privilege to set
+            tkp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
 
-                // Get the shutdown privilege for this process.
-                ::AdjustTokenPrivileges(hToken, FALSE, &tkp, 0,
-                                        (PTOKEN_PRIVILEGES)NULL, 0);
+            // Get the shutdown privilege for this process.
+            ::AdjustTokenPrivileges(hToken, FALSE, &tkp, 0,
+                                    (PTOKEN_PRIVILEGES)NULL, 0);
 
-                // Cannot test the return value of AdjustTokenPrivileges.
-                bOK = ::GetLastError() == ERROR_SUCCESS;
-            }
-
-            ::CloseHandle(hToken);
+            // Cannot test the return value of AdjustTokenPrivileges.
+            bOK = ::GetLastError() == ERROR_SUCCESS;
         }
     }
 
     if ( bOK )
     {
-        UINT wFlags = 0;
-        if ( flags & wxSHUTDOWN_FORCE )
-        {
-            wFlags = EWX_FORCE;
-            flags &= ~wxSHUTDOWN_FORCE;
-        }
-
-        switch ( flags )
+        UINT flags = EWX_SHUTDOWN | EWX_FORCE;
+        switch ( wFlags )
         {
             case wxSHUTDOWN_POWEROFF:
-                wFlags |= EWX_POWEROFF;
+                flags |= EWX_POWEROFF;
                 break;
 
             case wxSHUTDOWN_REBOOT:
-                wFlags |= EWX_REBOOT;
-                break;
-
-            case wxSHUTDOWN_LOGOFF:
-                wFlags |= EWX_LOGOFF;
+                flags |= EWX_REBOOT;
                 break;
 
             default:
-                wxFAIL_MSG( wxT("unknown wxShutdown() flag") );
+                wxFAIL_MSG( _T("unknown wxShutdown() flag") );
                 return false;
         }
 
-        bOK = ::ExitWindowsEx(wFlags, 0) != 0;
+        bOK = ::ExitWindowsEx(flags, 0) != 0;
     }
 
     return bOK;
-#endif // WinCE/!WinCE
+#endif // Win32/16
 }
 
 // ----------------------------------------------------------------------------
@@ -1077,127 +1032,35 @@ unsigned long wxGetProcessId()
     return ::GetCurrentProcessId();
 }
 
+// Emit a beeeeeep
+void wxBell()
+{
+    ::MessageBeep((UINT)-1);        // default sound
+}
+
 bool wxIsDebuggerRunning()
 {
 #if wxUSE_DYNLIB_CLASS
     // IsDebuggerPresent() is not available under Win95, so load it dynamically
-    wxDynamicLibrary dll(wxT("kernel32.dll"), wxDL_VERBATIM);
+    wxDynamicLibrary dll(_T("kernel32.dll"), wxDL_VERBATIM);
 
     typedef BOOL (WINAPI *IsDebuggerPresent_t)();
-    if ( !dll.HasSymbol(wxT("IsDebuggerPresent")) )
+    if ( !dll.HasSymbol(_T("IsDebuggerPresent")) )
     {
         // no way to know, assume no
         return false;
     }
 
-    return (*(IsDebuggerPresent_t)dll.GetSymbol(wxT("IsDebuggerPresent")))() != 0;
+    return (*(IsDebuggerPresent_t)dll.GetSymbol(_T("IsDebuggerPresent")))() != 0;
 #else
     return false;
 #endif
 }
 
-// ----------------------------------------------------------------------------
-// working with MSW resources
-// ----------------------------------------------------------------------------
-
-bool
-wxLoadUserResource(const void **outData,
-                   size_t *outLen,
-                   const wxString& resourceName,
-                   const wxString& resourceType,
-                   WXHINSTANCE instance)
-{
-    wxCHECK_MSG( outData && outLen, false, "output pointers can't be NULL" );
-
-    HRSRC hResource = ::FindResource(instance,
-                                     resourceName.t_str(),
-                                     resourceType.t_str());
-    if ( !hResource )
-        return false;
-
-    HGLOBAL hData = ::LoadResource(instance, hResource);
-    if ( !hData )
-    {
-        wxLogSysError(_("Failed to load resource \"%s\"."), resourceName);
-        return false;
-    }
-
-    *outData = ::LockResource(hData);
-    if ( !*outData )
-    {
-        wxLogSysError(_("Failed to lock resource \"%s\"."), resourceName);
-        return false;
-    }
-
-    *outLen = ::SizeofResource(instance, hResource);
-
-    // Notice that we do not need to call neither UnlockResource() (which is
-    // obsolete in Win32) nor GlobalFree() (resources are freed on process
-    // termination only)
-
-    return true;
-}
-
-char *
-wxLoadUserResource(const wxString& resourceName,
-                   const wxString& resourceType,
-                   int* pLen,
-                   WXHINSTANCE instance)
-{
-    const void *data;
-    size_t len;
-    if ( !wxLoadUserResource(&data, &len, resourceName, resourceType, instance) )
-        return NULL;
-
-    char *s = new char[len + 1];
-    memcpy(s, data, len);
-    s[len] = '\0'; // NUL-terminate in case the resource itself wasn't
-
-    if (pLen)
-      *pLen = len;
-
-    return s;
-}
-
 // ----------------------------------------------------------------------------
 // OS version
 // ----------------------------------------------------------------------------
 
-// check if we're running under a server or workstation Windows system: it
-// returns true or false with obvious meaning as well as -1 if the system type
-// couldn't be determined
-//
-// this function is currently private but we may want to expose it later if
-// it's really useful
-namespace
-{
-
-int wxIsWindowsServer()
-{
-#ifdef VER_NT_WORKSTATION
-    OSVERSIONINFOEX info;
-    wxZeroMemory(info);
-
-    info.dwOSVersionInfoSize = sizeof(info);
-    if ( ::GetVersionEx(reinterpret_cast<OSVERSIONINFO *>(&info)) )
-    {
-        switch ( info.wProductType )
-        {
-            case VER_NT_WORKSTATION:
-                return false;
-
-            case VER_NT_SERVER:
-            case VER_NT_DOMAIN_CONTROLLER:
-                return true;
-        }
-    }
-#endif // VER_NT_WORKSTATION
-
-    return -1;
-}
-
-} // anonymous namespace
-
 wxString wxGetOsDescription()
 {
     wxString str;
@@ -1257,7 +1120,7 @@ wxString wxGetOsDescription()
                 }
                 if ( !wxIsEmpty(info.szCSDVersion) )
                 {
-                    str << wxT(" (") << info.szCSDVersion << wxT(')');
+                    str << _T(" (") << info.szCSDVersion << _T(')');
                 }
                 break;
 
@@ -1268,67 +1131,50 @@ wxString wxGetOsDescription()
                         switch ( info.dwMinorVersion )
                         {
                             case 0:
-                                str = _("Windows 2000");
+                                str.Printf(_("Windows 2000 (build %lu"),
+                                           info.dwBuildNumber);
+                                break;
+
+                            case 1:
+                                str.Printf(_("Windows XP (build %lu"),
+                                           info.dwBuildNumber);
                                 break;
 
                             case 2:
-                                // we can't distinguish between XP 64 and 2003
-                                // as they both are 5.2, so examine the product
-                                // type to resolve this ambiguity
-                                if ( wxIsWindowsServer() == 1 )
-                                {
-                                    str = _("Windows Server 2003");
-                                    break;
-                                }
-                                //else: must be XP, fall through
-
-                            case 1:
-                                str = _("Windows XP");
+                                str.Printf(_("Windows Server 2003 (build %lu"),
+                                           info.dwBuildNumber);
                                 break;
                         }
                         break;
 
                     case 6:
-                        switch ( info.dwMinorVersion )
+                        if ( info.dwMinorVersion == 0 )
                         {
-                            case 0:
-                                str = wxIsWindowsServer() == 1
-                                        ? _("Windows Server 2008")
-                                        : _("Windows Vista");
-                                break;
-
-                            case 1:
-                                str = wxIsWindowsServer() == 1
-                                        ? _("Windows Server 2008 R2")
-                                        : _("Windows 7");
-                                break;
+                            str.Printf(_("Windows Vista (build %lu"),
+                                       info.dwBuildNumber);
                         }
                         break;
                 }
 
                 if ( str.empty() )
                 {
-                    str.Printf(_("Windows NT %lu.%lu"),
-                               info.dwMajorVersion,
-                               info.dwMinorVersion);
+                    str.Printf(_("Windows NT %lu.%lu (build %lu"),
+                           info.dwMajorVersion,
+                           info.dwMinorVersion,
+                           info.dwBuildNumber);
                 }
 
-                str << wxT(" (")
-                    << wxString::Format(_("build %lu"), info.dwBuildNumber);
                 if ( !wxIsEmpty(info.szCSDVersion) )
                 {
-                    str << wxT(", ") << info.szCSDVersion;
+                    str << _T(", ") << info.szCSDVersion;
                 }
-                str << wxT(')');
-
-                if ( wxIsPlatform64Bit() )
-                    str << _(", 64-bit edition");
+                str << _T(')');
                 break;
         }
     }
     else
     {
-        wxFAIL_MSG( wxT("GetVersionEx() failed") ); // should never happen
+        wxFAIL_MSG( _T("GetVersionEx() failed") ); // should never happen
     }
 
     return str;
@@ -1338,13 +1184,13 @@ bool wxIsPlatform64Bit()
 {
 #if defined(_WIN64)
     return true;  // 64-bit programs run only on Win64
-#elif wxUSE_DYNLIB_CLASS // Win32
+#else // Win32
     // 32-bit programs run on both 32-bit and 64-bit Windows so check
     typedef BOOL (WINAPI *IsWow64Process_t)(HANDLE, BOOL *);
 
-    wxDynamicLibrary dllKernel32(wxT("kernel32.dll"));
+    wxDynamicLibrary dllKernel32(_T("kernel32.dll"));
     IsWow64Process_t pfnIsWow64Process =
-        (IsWow64Process_t)dllKernel32.RawGetSymbol(wxT("IsWow64Process"));
+        (IsWow64Process_t)dllKernel32.RawGetSymbol(_T("IsWow64Process"));
 
     BOOL wow64 = FALSE;
     if ( pfnIsWow64Process )
@@ -1354,71 +1200,37 @@ bool wxIsPlatform64Bit()
     //else: running under a system without Win64 support
 
     return wow64 != FALSE;
-#else
-    return false;
 #endif // Win64/Win32
 }
 
 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {
-    static struct
+    OSVERSIONINFO info;
+    wxZeroMemory(info);
+
+    info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    if ( ::GetVersionEx(&info) )
     {
-        // this may be false, true or -1 if we tried to initialize but failed
-        int initialized;
-
-        wxOperatingSystemId os;
-
-        int verMaj,
-            verMin;
-    } s_version;
-
-    // query the OS info only once as it's not supposed to change
-    if ( !s_version.initialized )
-    {
-        OSVERSIONINFO info;
-        wxZeroMemory(info);
-        info.dwOSVersionInfoSize = sizeof(info);
-        if ( ::GetVersionEx(&info) )
-        {
-            s_version.initialized = true;
-
-#if defined(__WXWINCE__)
-            s_version.os = wxOS_WINDOWS_CE;
-#elif defined(__WXMICROWIN__)
-            s_version.os = wxOS_WINDOWS_MICRO;
-#else // "normal" desktop Windows system, use run-time detection
-            switch ( info.dwPlatformId )
-            {
-                case VER_PLATFORM_WIN32_NT:
-                    s_version.os = wxOS_WINDOWS_NT;
-                    break;
-
-                case VER_PLATFORM_WIN32_WINDOWS:
-                    s_version.os = wxOS_WINDOWS_9X;
-                    break;
-            }
-#endif // Windows versions
-
-            s_version.verMaj = info.dwMajorVersion;
-            s_version.verMin = info.dwMinorVersion;
-        }
-        else // GetVersionEx() failed
-        {
-            s_version.initialized = -1;
-        }
+        if (verMaj) *verMaj = info.dwMajorVersion;
+        if (verMin) *verMin = info.dwMinorVersion;
     }
 
-    if ( s_version.initialized == 1 )
+#if defined( __WXWINCE__ )
+    return wxOS_WINDOWS_CE;
+#elif defined( __WXMICROWIN__ )
+    return wxOS_WINDOWS_MICRO;
+#else
+    switch ( info.dwPlatformId )
     {
-        if ( verMaj )
-            *verMaj = s_version.verMaj;
-        if ( verMin )
-            *verMin = s_version.verMin;
+    case VER_PLATFORM_WIN32_NT:
+        return wxOS_WINDOWS_NT;
+
+    case VER_PLATFORM_WIN32_WINDOWS:
+        return wxOS_WINDOWS_9X;
     }
 
-    // this works even if we were not initialized successfully as the initial
-    // values of this field is 0 which is wxOS_UNKNOWN and exactly what we need
-    return s_version.os;
+    return wxOS_UNKNOWN;
+#endif
 }
 
 wxWinVersion wxGetWinVersion()
@@ -1601,10 +1413,8 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding)
         case wxFONTENCODING_ISO8859_13:     ret = 28603; break;
         // case wxFONTENCODING_ISO8859_14:     ret = 28604; break; // no correspondence on Windows
         case wxFONTENCODING_ISO8859_15:     ret = 28605; break;
-
         case wxFONTENCODING_KOI8:           ret = 20866; break;
         case wxFONTENCODING_KOI8_U:         ret = 21866; break;
-
         case wxFONTENCODING_CP437:          ret = 437; break;
         case wxFONTENCODING_CP850:          ret = 850; break;
         case wxFONTENCODING_CP852:          ret = 852; break;
@@ -1623,9 +1433,7 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding)
         case wxFONTENCODING_CP1255:         ret = 1255; break;
         case wxFONTENCODING_CP1256:         ret = 1256; break;
         case wxFONTENCODING_CP1257:         ret = 1257; break;
-
         case wxFONTENCODING_EUC_JP:         ret = 20932; break;
-
         case wxFONTENCODING_MACROMAN:       ret = 10000; break;
         case wxFONTENCODING_MACJAPANESE:    ret = 10001; break;
         case wxFONTENCODING_MACCHINESETRAD: ret = 10002; break;
@@ -1640,12 +1448,8 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding)
         case wxFONTENCODING_MACCROATIAN:    ret = 10082; break;
         case wxFONTENCODING_MACICELANDIC:   ret = 10079; break;
         case wxFONTENCODING_MACROMANIAN:    ret = 10009; break;
-
-        case wxFONTENCODING_ISO2022_JP:     ret = 50222; break;
-
         case wxFONTENCODING_UTF7:           ret = 65000; break;
         case wxFONTENCODING_UTF8:           ret = 65001; break;
-
         default:                            return -1;
     }
 
@@ -1659,7 +1463,7 @@ extern WXDLLIMPEXP_BASE long wxEncodingToCodepage(wxFontEncoding encoding)
     return (long) ret;
 }
 
-extern long wxCharsetToCodepage(const char *name)
+extern long wxCharsetToCodepage(const wxChar *name)
 {
     // first get the font encoding for this charset
     if ( !name )
@@ -1678,14 +1482,13 @@ extern long wxCharsetToCodepage(const char *name)
 #include "wx/msw/registry.h"
 
 // this should work if Internet Exploiter is installed
-extern long wxCharsetToCodepage(const char *name)
+extern long wxCharsetToCodepage(const wxChar *name)
 {
     if (!name)
         return GetACP();
 
     long CP = -1;
 
-#if wxUSE_REGKEY
     wxString path(wxT("MIME\\Database\\Charset\\"));
     wxString cn(name);
 
@@ -1711,18 +1514,29 @@ extern long wxCharsetToCodepage(const char *name)
             !key.QueryValue(wxT("AliasForCharset"), cn))
             break;
     }
-#endif // wxUSE_REGKEY
 
     return CP;
 }
 
 #endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
 
+/*
+  Creates a hidden window with supplied window proc registering the class for
+  it if necesssary (i.e. the first time only). Caller is responsible for
+  destroying the window and unregistering the class (note that this must be
+  done because wxWidgets may be used as a DLL and so may be loaded/unloaded
+  multiple times into/from the same process so we cna't rely on automatic
+  Windows class unregistration).
+
+  pclassname is a pointer to a caller stored classname, which must initially be
+  NULL. classname is the desired wndclass classname. If function successfully
+  registers the class, pclassname will be set to classname.
+ */
 extern "C" WXDLLIMPEXP_BASE HWND
 wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc)
 {
     wxCHECK_MSG( classname && pclassname && wndproc, NULL,
-                    wxT("NULL parameter in wxCreateHiddenWindow") );
+                    _T("NULL parameter in wxCreateHiddenWindow") );
 
     // register the class fi we need to first
     if ( *pclassname == NULL )
diff --git a/Source/3rd Party/wx/src/msw/utilsexc.cpp b/Source/3rd Party/wx/src/msw/utilsexc.cpp
index 20a2e1e4a..65ec3c90c 100644
--- a/Source/3rd Party/wx/src/msw/utilsexc.cpp	
+++ b/Source/3rd Party/wx/src/msw/utilsexc.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: utilsexc.cpp 54695 2008-07-18 22:22:16Z VZ $
 // Copyright:   (c) 1998-2002 wxWidgets dev team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -36,20 +36,20 @@
 #endif
 
 #include "wx/process.h"
-#include "wx/thread.h"
+
 #include "wx/apptrait.h"
-#include "wx/evtloop.h"
-#include "wx/vector.h"
 
 
 #include "wx/msw/private.h"
 
 #include <ctype.h>
 
-#if !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     #include <direct.h>
+#ifndef __MWERKS__
     #include <dos.h>
 #endif
+#endif
 
 #if defined(__GNUWIN32__)
     #include <sys/unistd.h>
@@ -80,7 +80,9 @@
     #include "wx/dde.h"         // for WX_DDE hack in wxExecute
 #endif // wxUSE_IPC
 
-#include "wx/msw/private/hiddenwin.h"
+// implemented in utils.cpp
+extern "C" WXDLLIMPEXP_BASE HWND
+wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
 
 // ----------------------------------------------------------------------------
 // constants
@@ -99,13 +101,6 @@
 static const wxChar *wxMSWEXEC_WNDCLASSNAME = wxT("_wxExecute_Internal_Class");
 static const wxChar *gs_classForHiddenWindow = NULL;
 
-// event used to wake up threads waiting in wxExecuteThread
-static HANDLE gs_heventShutdown = NULL;
-
-// handles of all threads monitoring the execution of asynchronously running
-// processes
-static wxVector<HANDLE> gs_asyncThreads;
-
 // ----------------------------------------------------------------------------
 // private types
 // ----------------------------------------------------------------------------
@@ -136,48 +131,11 @@ public:
     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {
-        if ( gs_heventShutdown )
-        {
-            // stop any threads waiting for the termination of asynchronously
-            // running processes
-            if ( !::SetEvent(gs_heventShutdown) )
-            {
-                wxLogDebug(wxT("Failed to set shutdown event in wxExecuteModule"));
-            }
-
-            ::CloseHandle(gs_heventShutdown);
-            gs_heventShutdown = NULL;
-
-            // now wait until they terminate
-            if ( !gs_asyncThreads.empty() )
-            {
-                const size_t numThreads = gs_asyncThreads.size();
-
-                if ( ::WaitForMultipleObjects
-                       (
-                        numThreads,
-                        &gs_asyncThreads[0],
-                        TRUE,   // wait for all of them to become signalled
-                        3000    // long but finite value
-                       ) == WAIT_TIMEOUT )
-                {
-                    wxLogDebug(wxT("Failed to stop all wxExecute monitor threads"));
-                }
-
-                for ( size_t n = 0; n < numThreads; n++ )
-                {
-                    ::CloseHandle(gs_asyncThreads[n]);
-                }
-
-                gs_asyncThreads.clear();
-            }
-        }
-
-        if ( gs_classForHiddenWindow )
+        if ( *gs_classForHiddenWindow )
         {
             if ( !::UnregisterClass(wxMSWEXEC_WNDCLASSNAME, wxGetInstance()) )
             {
-                wxLogLastError(wxT("UnregisterClass(wxExecClass)"));
+                wxLogLastError(_T("UnregisterClass(wxExecClass)"));
             }
 
             gs_classForHiddenWindow = NULL;
@@ -188,8 +146,6 @@ private:
     DECLARE_DYNAMIC_CLASS(wxExecuteModule)
 };
 
-IMPLEMENT_DYNAMIC_CLASS(wxExecuteModule, wxModule)
-
 #if wxUSE_STREAMS && !defined(__WXWINCE__)
 
 // ----------------------------------------------------------------------------
@@ -214,7 +170,7 @@ protected:
 protected:
     HANDLE m_hInput;
 
-    wxDECLARE_NO_COPY_CLASS(wxPipeInputStream);
+    DECLARE_NO_COPY_CLASS(wxPipeInputStream)
 };
 
 class wxPipeOutputStream: public wxOutputStream
@@ -230,7 +186,7 @@ protected:
 protected:
     HANDLE m_hOutput;
 
-    wxDECLARE_NO_COPY_CLASS(wxPipeOutputStream);
+    DECLARE_NO_COPY_CLASS(wxPipeOutputStream)
 };
 
 // define this to let wxexec.cpp know that we know what we're doing
@@ -325,49 +281,23 @@ static DWORD __stdcall wxExecuteThread(void *arg)
 {
     wxExecuteData * const data = (wxExecuteData *)arg;
 
-    // create the shutdown event if we're the first thread starting to wait
-    if ( !gs_heventShutdown )
+    if ( ::WaitForSingleObject(data->hProcess, INFINITE) != WAIT_OBJECT_0 )
     {
-        // create a manual initially non-signalled event object
-        gs_heventShutdown = ::CreateEvent(NULL, TRUE, FALSE, NULL);
-        if ( !gs_heventShutdown )
-        {
-            wxLogDebug(wxT("CreateEvent() in wxExecuteThread failed"));
-        }
+        wxLogDebug(_T("Waiting for the process termination failed!"));
     }
 
-    HANDLE handles[2] = { data->hProcess, gs_heventShutdown };
-    switch ( ::WaitForMultipleObjects(2, handles, FALSE, INFINITE) )
+    // get the exit code
+    if ( !::GetExitCodeProcess(data->hProcess, &data->dwExitCode) )
     {
-        case WAIT_OBJECT_0:
-            // process terminated, get its exit code
-            if ( !::GetExitCodeProcess(data->hProcess, &data->dwExitCode) )
-            {
-                wxLogLastError(wxT("GetExitCodeProcess"));
-            }
-
-            wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,
-                          wxT("process should have terminated") );
-
-            // send a message indicating process termination to the window
-            ::SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data);
-            break;
-
-        case WAIT_OBJECT_0 + 1:
-            // we're shutting down but the process is still running -- leave it
-            // run but clean up the associated data
-            if ( !data->state )
-            {
-                delete data;
-            }
-            //else: exiting while synchronously executing process is still
-            //      running? this shouldn't happen...
-            break;
-
-        default:
-            wxLogDebug(wxT("Waiting for the process termination failed!"));
+        wxLogLastError(wxT("GetExitCodeProcess"));
     }
 
+    wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,
+                  wxT("process should have terminated") );
+
+    // send a message indicating process termination to the window
+    ::SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data);
+
     return 0;
 }
 
@@ -391,7 +321,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
         {
             // we're executing synchronously, tell the waiting thread
             // that the process finished
-            data->state = false;
+            data->state = 0;
         }
         else
         {
@@ -461,7 +391,7 @@ bool wxPipeInputStream::CanRead() const
         if ( ::GetLastError() != ERROR_BROKEN_PIPE )
         {
             // unexpected error
-            wxLogLastError(wxT("PeekNamedPipe"));
+            wxLogLastError(_T("PeekNamedPipe"));
         }
 
         // don't try to continue reading from a pipe if an error occurred or if
@@ -518,7 +448,7 @@ wxPipeOutputStream::wxPipeOutputStream(HANDLE hOutput)
                 NULL        // timeout (we don't set it neither)
             ) )
     {
-        wxLogLastError(wxT("SetNamedPipeHandleState(PIPE_NOWAIT)"));
+        wxLogLastError(_T("SetNamedPipeHandleState(PIPE_NOWAIT)"));
     }
 }
 
@@ -606,8 +536,7 @@ wxExecuteDDE(const wxString& ddeServer,
 
 #endif // wxUSE_IPC
 
-long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
-               const wxExecuteEnv *env)
+long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 {
     wxCHECK_MSG( !cmd.empty(), 0, wxT("empty command in wxExecute") );
 
@@ -616,7 +545,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     // thread -- this could be fixed, but as Unix versions don't support this
     // neither I don't want to waste time on this now
     wxASSERT_MSG( wxThread::IsMain(),
-                    wxT("wxExecute() can be called only from the main thread") );
+                    _T("wxExecute() can be called only from the main thread") );
 #endif // wxUSE_THREADS
 
     wxString command;
@@ -632,7 +561,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     // case we execute just <command> and process the rest below
     wxString ddeServer, ddeTopic, ddeCommand;
     static const size_t lenDdePrefix = 7;   // strlen("WX_DDE:")
-    if ( cmd.Left(lenDdePrefix) == wxT("WX_DDE#") )
+    if ( cmd.Left(lenDdePrefix) == _T("WX_DDE#") )
     {
         // speed up the concatenations below
         ddeServer.reserve(256);
@@ -640,7 +569,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
         ddeCommand.reserve(256);
 
         const wxChar *p = cmd.c_str() + 7;
-        while ( *p && *p != wxT('#') )
+        while ( *p && *p != _T('#') )
         {
             command += *p++;
         }
@@ -652,10 +581,10 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
         }
         else
         {
-            wxFAIL_MSG(wxT("invalid WX_DDE command in wxExecute"));
+            wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute"));
         }
 
-        while ( *p && *p != wxT('#') )
+        while ( *p && *p != _T('#') )
         {
             ddeServer += *p++;
         }
@@ -667,10 +596,10 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
         }
         else
         {
-            wxFAIL_MSG(wxT("invalid WX_DDE command in wxExecute"));
+            wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute"));
         }
 
-        while ( *p && *p != wxT('#') )
+        while ( *p && *p != _T('#') )
         {
             ddeTopic += *p++;
         }
@@ -682,7 +611,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
         }
         else
         {
-            wxFAIL_MSG(wxT("invalid WX_DDE command in wxExecute"));
+            wxFAIL_MSG(_T("invalid WX_DDE command in wxExecute"));
         }
 
         while ( *p )
@@ -753,6 +682,15 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
         si.hStdOutput = pipeOut[wxPipe::Write];
         si.hStdError = pipeErr[wxPipe::Write];
 
+        // when the std IO is redirected, we don't show the (console) process
+        // window by default, but this can be overridden by the caller by
+        // specifying wxEXEC_NOHIDE flag
+        if ( !(flags & wxEXEC_NOHIDE) )
+        {
+            si.dwFlags |= STARTF_USESHOWWINDOW;
+            si.wShowWindow = SW_HIDE;
+        }
+
         // we must duplicate the handle to the write side of stdin pipe to make
         // it non inheritable: indeed, we must close the writing end of pipeIn
         // before launching the child process as otherwise this handle will be
@@ -770,32 +708,17 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
                     DUPLICATE_SAME_ACCESS   // same access as for src handle
                 ) )
         {
-            wxLogLastError(wxT("DuplicateHandle"));
+            wxLogLastError(_T("DuplicateHandle"));
         }
 
         ::CloseHandle(pipeInWrite);
     }
 #endif // wxUSE_STREAMS
 
-    // The default logic for showing the console is to show it only if the IO
-    // is not redirected however wxEXEC_{SHOW,HIDE}_CONSOLE flags can be
-    // explicitly specified to change it.
-    if ( (flags & wxEXEC_HIDE_CONSOLE) ||
-            (redirect && !(flags & wxEXEC_SHOW_CONSOLE)) )
-    {
-        si.dwFlags |= STARTF_USESHOWWINDOW;
-        si.wShowWindow = SW_HIDE;
-    }
-
-
     PROCESS_INFORMATION pi;
     DWORD dwFlags = CREATE_SUSPENDED;
 
 #ifndef __WXWINCE__
-    if ( (flags & wxEXEC_MAKE_GROUP_LEADER) &&
-            (wxGetOsVersion() == wxOS_WINDOWS_NT) )
-        dwFlags |= CREATE_NEW_PROCESS_GROUP;
-
     dwFlags |= CREATE_DEFAULT_ERROR_MODE ;
 #else
     // we are assuming commands without spaces for now
@@ -803,74 +726,26 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     wxString arguments = command.AfterFirst(wxT(' '));
 #endif
 
-    wxWxCharBuffer envBuffer;
-    bool useCwd = false;
-    if ( env )
-    {
-        useCwd = !env->cwd.empty();
-
-        // Translate environment variable map into NUL-terminated list of
-        // NUL-terminated strings.
-        if ( !env->env.empty() )
-        {
-#if wxUSE_UNICODE
-            // Environment variables can contain non-ASCII characters. We could
-            // check for it and not use this flag if everything is really ASCII
-            // only but there doesn't seem to be any reason to do it so just
-            // assume Unicode by default.
-            dwFlags |= CREATE_UNICODE_ENVIRONMENT;
-#endif // wxUSE_UNICODE
-
-            wxEnvVariableHashMap::const_iterator it;
-
-            size_t envSz = 1; // ending '\0'
-            for ( it = env->env.begin(); it != env->env.end(); ++it )
-            {
-                // Add size of env variable name and value, and '=' char and
-                // ending '\0'
-                envSz += it->first.length() + it->second.length() + 2;
-            }
-
-            envBuffer.extend(envSz);
-
-            wxChar *p = envBuffer.data();
-            for ( it = env->env.begin(); it != env->env.end(); ++it )
-            {
-                const wxString line = it->first + wxS("=") + it->second;
-
-                // Include the trailing NUL which will always terminate the
-                // buffer returned by t_str().
-                const size_t len = line.length() + 1;
-
-                wxTmemcpy(p, line.t_str(), len);
-
-                p += len;
-            }
-
-            // And another NUL to terminate the list of NUL-terminated strings.
-            *p = 0;
-        }
-    }
-
     bool ok = ::CreateProcess
                 (
                     // WinCE requires appname to be non null
                     // Win32 allows for null
 #ifdef __WXWINCE__
-                 moduleName.t_str(), // application name
-                 wxMSW_CONV_LPTSTR(arguments), // arguments
+                 (wxChar *)
+                 moduleName.c_str(), // application name
+                 (wxChar *)
+                 arguments.c_str(),  // arguments
 #else
                  NULL,               // application name (use only cmd line)
-                 wxMSW_CONV_LPTSTR(command), // full command line
+                 (wxChar *)
+                 command.c_str(),    // full command line
 #endif
                  NULL,               // security attributes: defaults for both
                  NULL,               //   the process and its main thread
                  redirect,           // inherit handles if we use pipes
                  dwFlags,            // process creation flags
-                 envBuffer.data(),   // environment (may be NULL which is fine)
-                 useCwd              // initial working directory
-                    ? wxMSW_CONV_LPTSTR(env->cwd)
-                    : NULL,          //     (or use the same)
+                 NULL,               // environment (use the same)
+                 NULL,               // current directory (use the same)
                  &si,                // startup info (unused here)
                  &pi                 // process info
                 ) != 0;
@@ -951,9 +826,6 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     {
         // may be NULL or not
         data->handler = handler;
-
-        if (handler)
-            handler->SetPid(pi.dwProcessId);
     }
 
     DWORD tid;
@@ -974,9 +846,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
 
     // close unneeded handle
     if ( !::CloseHandle(pi.hThread) )
-    {
         wxLogLastError(wxT("CloseHandle(hThread)"));
-    }
 
     if ( !hThread )
     {
@@ -989,7 +859,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
         return pi.dwProcessId;
     }
 
-    gs_asyncThreads.push_back(hThread);
+    ::CloseHandle(hThread);
 
 #if wxUSE_IPC && !defined(__WXWINCE__)
     // second part of DDE hack: now establish the DDE conversation with the
@@ -1006,14 +876,14 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
         switch ( ::WaitForInputIdle(pi.hProcess, 10000 /* 10 seconds */) )
         {
             default:
-                wxFAIL_MSG( wxT("unexpected WaitForInputIdle() return code") );
+                wxFAIL_MSG( _T("unexpected WaitForInputIdle() return code") );
                 // fall through
 
-            case WAIT_FAILED:
-                wxLogLastError(wxT("WaitForInputIdle() in wxExecute"));
+            case -1:
+                wxLogLastError(_T("WaitForInputIdle() in wxExecute"));
 
             case WAIT_TIMEOUT:
-                wxLogDebug(wxT("Timeout too small in WaitForInputIdle"));
+                wxLogDebug(_T("Timeout too small in WaitForInputIdle"));
 
                 ok = false;
                 break;
@@ -1025,7 +895,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
 
         if ( !ok )
         {
-            wxLogDebug(wxT("Failed to send DDE request to the process \"%s\"."),
+            wxLogDebug(_T("Failed to send DDE request to the process \"%s\"."),
                        cmd.c_str());
         }
     }
@@ -1040,7 +910,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     }
 
     wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
-    wxCHECK_MSG( traits, -1, wxT("no wxAppTraits in wxExecute()?") );
+    wxCHECK_MSG( traits, -1, _T("no wxAppTraits in wxExecute()?") );
 
     void *cookie = NULL;
     if ( !(flags & wxEXEC_NODISABLE) )
@@ -1053,27 +923,16 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     while ( data->state )
     {
 #if wxUSE_STREAMS && !defined(__WXWINCE__)
-        if ( !bufOut.Update() && !bufErr.Update() )
+        bufOut.Update();
+        bufErr.Update();
 #endif // wxUSE_STREAMS
-        {
-            // don't eat 100% of the CPU -- ugly but anything else requires
-            // real async IO which we don't have for the moment
-            ::Sleep(50);
-        }
 
-        // we must always process messages for our hidden window or we'd never
-        // get wxWM_PROC_TERMINATED and so this loop would never terminate
-        MSG msg;
-        ::PeekMessage(&msg, data->hWnd, 0, 0, PM_REMOVE);
+        // don't eat 100% of the CPU -- ugly but anything else requires
+        // real async IO which we don't have for the moment
+        ::Sleep(50);
 
-        // we may also need to process messages for all the other application
-        // windows
-        if ( !(flags & wxEXEC_NOEVENTS) )
-        {
-            wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
-            if ( loop )
-                loop->Yield();
-        }
+        // we must process messages or we'd never get wxWM_PROC_TERMINATED
+        traits->AlwaysYield();
     }
 
     if ( !(flags & wxEXEC_NODISABLE) )
@@ -1089,18 +948,21 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     return dwExitCode;
 }
 
-template <typename CharType>
-long wxExecuteImpl(CharType **argv, int flags, wxProcess *handler,
-                   const wxExecuteEnv *env)
+long wxExecute(wxChar **argv, int flags, wxProcess *handler)
 {
     wxString command;
-    command.reserve(1024);
 
     wxString arg;
     for ( ;; )
     {
         arg = *argv++;
 
+        // we didn't quote the arguments properly in the previous wx versions
+        // and while this is the right thing to do, there is a good chance that
+        // people worked around our bug in their code by quoting the arguments
+        // manually before, so, for compatibility sake, keep the argument
+        // unchanged if it's already quoted
+
         bool quote;
         if ( arg.empty() )
         {
@@ -1110,41 +972,32 @@ long wxExecuteImpl(CharType **argv, int flags, wxProcess *handler,
         }
         else // non-empty
         {
-            // escape any quotes present in the string to avoid interfering
-            // with the command line parsing in the child process
-            arg.Replace("\"", "\\\"", true /* replace all */);
+            if ( *arg.begin() != _T('"') || *arg.rbegin() != _T('"') )
+            {
+                // escape any quotes present in the string to avoid interfering
+                // with the command line parsing in the child process
+                arg.Replace(_T("\""), _T("\\\""), true /* replace all */);
 
-            // and quote any arguments containing the spaces to prevent them from
-            // being broken down
-            quote = arg.find_first_of(" \t") != wxString::npos;
+                // and quote any arguments containing the spaces to prevent
+                // them from being broken down
+                quote = arg.find_first_of(_T(" \t")) != wxString::npos;
+            }
+            else // already quoted
+            {
+                quote = false;
+            }
         }
 
         if ( quote )
-            command += '\"' + arg + '\"';
+            command += _T('\"') + arg + _T('\"');
         else
             command += arg;
 
         if ( !*argv )
             break;
 
-        command += ' ';
+        command += _T(' ');
     }
 
-    return wxExecute(command, flags, handler, env);
+    return wxExecute(command, flags, handler);
 }
-
-long wxExecute(char **argv, int flags, wxProcess *handler,
-               const wxExecuteEnv *env)
-{
-    return wxExecuteImpl(argv, flags, handler, env);
-}
-
-#if wxUSE_UNICODE
-
-long wxExecute(wchar_t **argv, int flags, wxProcess *handler,
-               const wxExecuteEnv *env)
-{
-    return wxExecuteImpl(argv, flags, handler, env);
-}
-
-#endif // wxUSE_UNICODE
diff --git a/Source/3rd Party/wx/src/msw/utilsgui.cpp b/Source/3rd Party/wx/src/msw/utilsgui.cpp
index 8072bb1af..8b7ab3286 100644
--- a/Source/3rd Party/wx/src/msw/utilsgui.cpp	
+++ b/Source/3rd Party/wx/src/msw/utilsgui.cpp	
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/utilsgui.cpp
+// Name:        msw/utilsgui.cpp
 // Purpose:     Various utility functions only available in GUI
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     21.06.2003 (extracted from msw/utils.cpp)
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: utilsgui.cpp 40369 2006-07-29 20:33:10Z VZ $
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -33,20 +33,118 @@
 #include "wx/dynlib.h"
 
 #include "wx/msw/private.h"     // includes <windows.h>
-#include "wx/msw/registry.h"
-#include <shellapi.h> // needed for SHELLEXECUTEINFO
-
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-// Emit a beeeeeep
-void wxBell()
+// ----------------------------------------------------------------------------
+// functions to work with .INI files
+// ----------------------------------------------------------------------------
+
+// Reading and writing resources (eg WIN.INI, .Xdefaults)
+#if wxUSE_RESOURCES
+bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
 {
-    ::MessageBeep((UINT)-1);        // default sound
+  if (file != wxEmptyString)
+// Don't know what the correct cast should be, but it doesn't
+// compile in BC++/16-bit without this cast.
+#if !defined(__WIN32__)
+    return (WritePrivateProfileString((const char*) section, (const char*) entry, (const char*) value, (const char*) file) != 0);
+#else
+    return (WritePrivateProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)value, (LPCTSTR)WXSTRINGCAST file) != 0);
+#endif
+  else
+    return (WriteProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)WXSTRINGCAST value) != 0);
 }
 
+bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
+{
+    wxString buf;
+    buf.Printf(wxT("%.4f"), value);
+
+    return wxWriteResource(section, entry, buf, file);
+}
+
+bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
+{
+    wxString buf;
+    buf.Printf(wxT("%ld"), value);
+
+    return wxWriteResource(section, entry, buf, file);
+}
+
+bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
+{
+    wxString buf;
+    buf.Printf(wxT("%d"), value);
+
+    return wxWriteResource(section, entry, buf, file);
+}
+
+bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file)
+{
+    static const wxChar defunkt[] = wxT("$$default");
+
+    wxChar buf[1024];
+    if (file != wxEmptyString)
+    {
+        int n = GetPrivateProfileString(section, entry, defunkt,
+                                        buf, WXSIZEOF(buf), file);
+        if (n == 0 || wxStrcmp(buf, defunkt) == 0)
+            return false;
+    }
+    else
+    {
+        int n = GetProfileString(section, entry, defunkt, buf, WXSIZEOF(buf));
+        if (n == 0 || wxStrcmp(buf, defunkt) == 0)
+            return false;
+    }
+    if (*value) delete[] (*value);
+    *value = wxStrcpy(new wxChar[wxStrlen(buf) + 1], buf);
+    return true;
+}
+
+bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
+{
+    wxChar *s = NULL;
+    bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
+    if (succ)
+    {
+        *value = (float)wxStrtod(s, NULL);
+        delete[] s;
+        return true;
+    }
+    else return false;
+}
+
+bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
+{
+    wxChar *s = NULL;
+    bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
+    if (succ)
+    {
+        *value = wxStrtol(s, NULL, 10);
+        delete[] s;
+        return true;
+    }
+    else return false;
+}
+
+bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
+{
+    wxChar *s = NULL;
+    bool succ = wxGetResource(section, entry, (wxChar **)&s, file);
+    if (succ)
+    {
+        *value = (int)wxStrtol(s, NULL, 10);
+        delete[] s;
+        return true;
+    }
+    else return false;
+}
+#endif // wxUSE_RESOURCES
+
 // ---------------------------------------------------------------------------
 // helper functions for showing a "busy" cursor
 // ---------------------------------------------------------------------------
@@ -110,6 +208,45 @@ bool wxCheckForInterrupt(wxWindow *wnd)
     return true;
 }
 
+// MSW only: get user-defined resource from the .res file.
+// Returns NULL or newly-allocated memory, so use delete[] to clean up.
+
+#ifndef __WXMICROWIN__
+wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType)
+{
+    HRSRC hResource = ::FindResource(wxGetInstance(), resourceName, resourceType);
+    if ( hResource == 0 )
+        return NULL;
+
+    HGLOBAL hData = ::LoadResource(wxGetInstance(), hResource);
+    if ( hData == 0 )
+        return NULL;
+
+    wxChar *theText = (wxChar *)::LockResource(hData);
+    if ( !theText )
+        return NULL;
+
+    // Not all compilers put a zero at the end of the resource (e.g. BC++ doesn't).
+    // so we need to find the length of the resource.
+    int len = ::SizeofResource(wxGetInstance(), hResource);
+    wxChar  *s = new wxChar[len+1];
+    wxStrncpy(s,theText,len);
+    s[len]=0;
+
+    // wxChar *s = copystring(theText);
+
+    // Obsolete in WIN32
+#ifndef __WIN32__
+    UnlockResource(hData);
+#endif
+
+    // No need??
+    //  GlobalFree(hData);
+
+    return s;
+}
+#endif // __WXMICROWIN__
+
 // ----------------------------------------------------------------------------
 // get display info
 // ----------------------------------------------------------------------------
@@ -119,7 +256,7 @@ bool wxCheckForInterrupt(wxWindow *wnd)
 void wxGetMousePosition( int* x, int* y )
 {
     POINT pt;
-    wxGetCursorPosMSW( & pt );
+    GetCursorPos( & pt );
     if ( x ) *x = pt.x;
     if ( y ) *y = pt.y;
 }
@@ -263,17 +400,19 @@ wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd)
     return str;
 }
 
-int WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
+WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
 {
-    return ::GetWindowLong((HWND)hWnd, GWL_ID);
+    return (WXWORD)GetWindowLong((HWND)hWnd, GWL_ID);
 }
 
 // ----------------------------------------------------------------------------
 // Metafile helpers
 // ----------------------------------------------------------------------------
 
-void PixelToHIMETRIC(LONG *x, LONG *y, HDC hdcRef)
+extern void PixelToHIMETRIC(LONG *x, LONG *y)
 {
+    ScreenHDC hdcRef;
+
     int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE),
         iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE),
         iWidthPels = GetDeviceCaps(hdcRef, HORZRES),
@@ -285,8 +424,10 @@ void PixelToHIMETRIC(LONG *x, LONG *y, HDC hdcRef)
     *y /= iHeightPels;
 }
 
-void HIMETRICToPixel(LONG *x, LONG *y, HDC hdcRef)
+extern void HIMETRICToPixel(LONG *x, LONG *y)
 {
+    ScreenHDC hdcRef;
+
     int iWidthMM = GetDeviceCaps(hdcRef, HORZSIZE),
         iHeightMM = GetDeviceCaps(hdcRef, VERTSIZE),
         iWidthPels = GetDeviceCaps(hdcRef, HORZRES),
@@ -298,16 +439,6 @@ void HIMETRICToPixel(LONG *x, LONG *y, HDC hdcRef)
     *y /= (iHeightMM * 100);
 }
 
-void HIMETRICToPixel(LONG *x, LONG *y)
-{
-    HIMETRICToPixel(x, y, ScreenHDC());
-}
-
-void PixelToHIMETRIC(LONG *x, LONG *y)
-{
-    PixelToHIMETRIC(x, y, ScreenHDC());
-}
-
 void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2)
 {
 #ifdef __WXWINCE__
@@ -340,11 +471,11 @@ extern bool wxEnableFileNameAutoComplete(HWND hwnd)
         s_initialized = true;
 
         wxLogNull nolog;
-        wxDynamicLibrary dll(wxT("shlwapi.dll"));
+        wxDynamicLibrary dll(_T("shlwapi.dll"));
         if ( dll.IsLoaded() )
         {
             s_pfnSHAutoComplete =
-                (SHAutoComplete_t)dll.GetSymbol(wxT("SHAutoComplete"));
+                (SHAutoComplete_t)dll.GetSymbol(_T("SHAutoComplete"));
             if ( s_pfnSHAutoComplete )
             {
                 // won't be unloaded until the process termination, no big deal
@@ -359,7 +490,7 @@ extern bool wxEnableFileNameAutoComplete(HWND hwnd)
     HRESULT hr = s_pfnSHAutoComplete(hwnd, 0x10 /* SHACF_FILESYS_ONLY */);
     if ( FAILED(hr) )
     {
-        wxLogApiError(wxT("SHAutoComplete"), hr);
+        wxLogApiError(_T("SHAutoComplete"), hr);
         return false;
     }
 
@@ -370,116 +501,3 @@ extern bool wxEnableFileNameAutoComplete(HWND hwnd)
 #endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
 }
 
-// ----------------------------------------------------------------------------
-// Launch document with default app
-// ----------------------------------------------------------------------------
-
-bool wxLaunchDefaultApplication(const wxString& document, int flags)
-{
-    wxUnusedVar(flags);
-
-    WinStruct<SHELLEXECUTEINFO> sei;
-    sei.lpFile = document.t_str();
-#ifdef __WXWINCE__
-    sei.nShow = SW_SHOWNORMAL; // SW_SHOWDEFAULT not defined under CE (#10216)
-#else
-    sei.nShow = SW_SHOWDEFAULT;
-#endif
-
-    // avoid Windows message box in case of error for consistency with
-    // wxLaunchDefaultBrowser() even if don't show the error ourselves in this
-    // function
-    sei.fMask = SEE_MASK_FLAG_NO_UI;
-
-    if ( ::ShellExecuteEx(&sei) )
-        return true;
-
-    return false;
-}
-
-// ----------------------------------------------------------------------------
-// Launch default browser
-// ----------------------------------------------------------------------------
-
-bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags)
-{
-    wxUnusedVar(flags);
-
-#if wxUSE_IPC
-    if ( flags & wxBROWSER_NEW_WINDOW )
-    {
-        // ShellExecuteEx() opens the URL in an existing window by default so
-        // we can't use it if we need a new window
-        wxRegKey key(wxRegKey::HKCR, scheme + wxT("\\shell\\open"));
-        if ( !key.Exists() )
-        {
-            // try the default browser, it must be registered at least for http URLs
-            key.SetName(wxRegKey::HKCR, wxT("http\\shell\\open"));
-        }
-
-        if ( key.Exists() )
-        {
-            wxRegKey keyDDE(key, wxT("DDEExec"));
-            if ( keyDDE.Exists() )
-            {
-                // we only know the syntax of WWW_OpenURL DDE request for IE,
-                // optimistically assume that all other browsers are compatible
-                // with it
-                static const wxChar *TOPIC_OPEN_URL = wxT("WWW_OpenURL");
-                wxString ddeCmd;
-                wxRegKey keyTopic(keyDDE, wxT("topic"));
-                bool ok = keyTopic.Exists() &&
-                            keyTopic.QueryDefaultValue() == TOPIC_OPEN_URL;
-                if ( ok )
-                {
-                    ddeCmd = keyDDE.QueryDefaultValue();
-                    ok = !ddeCmd.empty();
-                }
-
-                if ( ok )
-                {
-                    // for WWW_OpenURL, the index of the window to open the URL
-                    // in is -1 (meaning "current") by default, replace it with
-                    // 0 which means "new" (see KB article 160957)
-                    ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
-                                        false /* only first occurrence */) == 1;
-                }
-
-                if ( ok )
-                {
-                    // and also replace the parameters: the topic should
-                    // contain a placeholder for the URL
-                    ok = ddeCmd.Replace(wxT("%1"), url, false) == 1;
-                }
-
-                if ( ok )
-                {
-                    // try to send it the DDE request now but ignore the errors
-                    wxLogNull noLog;
-
-                    const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
-                    if ( wxExecuteDDE(ddeServer, TOPIC_OPEN_URL, ddeCmd) )
-                        return true;
-
-                    // this is not necessarily an error: maybe browser is
-                    // simply not running, but no matter, in any case we're
-                    // going to launch it using ShellExecuteEx() below now and
-                    // we shouldn't try to open a new window if we open a new
-                    // browser anyhow
-                }
-            }
-        }
-    }
-#endif // wxUSE_IPC
-
-    WinStruct<SHELLEXECUTEINFO> sei;
-    sei.lpFile = url.c_str();
-    sei.lpVerb = wxT("open");
-    sei.nShow = SW_SHOWNORMAL;
-    sei.fMask = SEE_MASK_FLAG_NO_UI; // we give error message ourselves
-
-    if ( ::ShellExecuteEx(&sei) )
-        return true;
-
-    return false;
-}
diff --git a/Source/3rd Party/wx/src/msw/uxtheme.cpp b/Source/3rd Party/wx/src/msw/uxtheme.cpp
index 23f4c20e3..4426aa78c 100644
--- a/Source/3rd Party/wx/src/msw/uxtheme.cpp	
+++ b/Source/3rd Party/wx/src/msw/uxtheme.cpp	
@@ -4,9 +4,9 @@
 // Author:      John Platts, Vadim Zeitlin
 // Modified by:
 // Created:     2003
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: uxtheme.cpp 40943 2006-08-31 19:31:43Z ABX $
 // Copyright:   (c) 2003 John Platts, Vadim Zeitlin
-// Licence:     wxWindows licence
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -113,11 +113,11 @@ bool wxUxThemeEngine::Initialize()
     // we're prepared to handle the errors
     wxLogNull noLog;
 
-    if ( !m_dllUxTheme.Load(wxT("uxtheme.dll")) )
+    if ( !m_dllUxTheme.Load(_T("uxtheme.dll")) )
         return false;
 
 #define RESOLVE_UXTHEME_FUNCTION(type, funcname)                              \
-    funcname = (type)m_dllUxTheme.GetSymbol(wxT(#funcname));                   \
+    funcname = (type)m_dllUxTheme.GetSymbol(_T(#funcname));                   \
     if ( !funcname )                                                          \
         return false
 
diff --git a/Source/3rd Party/wx/src/msw/volume.cpp b/Source/3rd Party/wx/src/msw/volume.cpp
index 5f1ce331c..7574aca9c 100644
--- a/Source/3rd Party/wx/src/msw/volume.cpp	
+++ b/Source/3rd Party/wx/src/msw/volume.cpp	
@@ -4,7 +4,7 @@
 // Author:      George Policello
 // Modified by:
 // Created:     28 Jan 02
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: volume.cpp 41903 2006-10-10 17:37:02Z PC $
 // Copyright:   (c) 2002 George Policello
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -32,18 +32,13 @@
         #include "wx/icon.h"
     #endif
     #include "wx/intl.h"
-    #include "wx/log.h"
     #include "wx/hashmap.h"
-    #include "wx/filefn.h"
 #endif // WX_PRECOMP
 
 #include "wx/dir.h"
 #include "wx/dynlib.h"
 #include "wx/arrimpl.cpp"
 
-// some compilers require including <windows.h> before <shellapi.h> so do it
-// even if this is not necessary with most of them
-#include "wx/msw/wrapwin.h"
 #include <shellapi.h>
 #include <shlobj.h>
 #include "wx/msw/missing.h"
@@ -156,13 +151,11 @@ static unsigned GetBasicFlags(const wxChar* filename)
     // this information.
     //-----------------------------------------------------------------------
     SHFILEINFO fi;
-    long rc = SHGetFileInfo(filename, 0, &fi, sizeof(fi), SHGFI_ATTRIBUTES);
+    long rc;
+    rc = SHGetFileInfo(filename, 0, &fi, sizeof(fi), SHGFI_ATTRIBUTES );
     if (!rc)
     {
-        // this error is not fatal, so don't show a message to the user about
-        // it, otherwise it would appear every time a generic directory picker
-        // dialog is used and there is a connected network drive
-        wxLogLastError(wxT("SHGetFileInfo"));
+        wxLogError(_("Cannot read typename from '%s'!"), filename);
     }
     else
     {
@@ -269,17 +262,6 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc,
                 {
                     wxString filename(pRes->lpRemoteName);
 
-                    // if the drive is unavailable, FilteredAdd() can hang for
-                    // a long time and, moreover, its failure appears to be not
-                    // cached so this will happen every time we use it, so try
-                    // a much quicker wxDirExists() test (which still hangs but
-                    // for much shorter time) for locally mapped drives first
-                    // to try to avoid this
-                    if ( pRes->lpLocalName &&
-                            *pRes->lpLocalName &&
-                                !wxDirExists(pRes->lpLocalName) )
-                        continue;
-
                     if (!filename.empty())
                     {
                         if (filename.Last() != '\\')
@@ -288,7 +270,7 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc,
                         // The filter function will not know mounted from unmounted, and neither do we unless
                         // we are iterating using RESOURCE_CONNECTED, in which case they all are mounted.
                         // Volumes on disconnected servers, however, will correctly show as unmounted.
-                        FilteredAdd(list, filename.t_str(), flagsSet, flagsUnset&~wxFS_VOL_MOUNTED);
+                        FilteredAdd(list, filename, flagsSet, flagsUnset&~wxFS_VOL_MOUNTED);
                         if (scope == RESOURCE_GLOBALNET)
                             s_fileInfo[filename].m_flags &= ~wxFS_VOL_MOUNTED;
                     }
@@ -399,16 +381,16 @@ wxArrayString wxFSVolumeBase::GetVolumes(int flagsSet, int flagsUnset)
     ::InterlockedExchange(&s_cancelSearch, FALSE);     // reset
 
 #if wxUSE_DYNLIB_CLASS
-    if (!s_mprLib.IsLoaded() && s_mprLib.Load(wxT("mpr.dll")))
+    if (!s_mprLib.IsLoaded() && s_mprLib.Load(_T("mpr.dll")))
     {
 #ifdef UNICODE
-        s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(wxT("WNetOpenEnumW"));
-        s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(wxT("WNetEnumResourceW"));
+        s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(_T("WNetOpenEnumW"));
+        s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(_T("WNetEnumResourceW"));
 #else
-        s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(wxT("WNetOpenEnumA"));
-        s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(wxT("WNetEnumResourceA"));
+        s_pWNetOpenEnum = (WNetOpenEnumPtr)s_mprLib.GetSymbol(_T("WNetOpenEnumA"));
+        s_pWNetEnumResource = (WNetEnumResourcePtr)s_mprLib.GetSymbol(_T("WNetEnumResourceA"));
 #endif
-        s_pWNetCloseEnum = (WNetCloseEnumPtr)s_mprLib.GetSymbol(wxT("WNetCloseEnum"));
+        s_pWNetCloseEnum = (WNetCloseEnumPtr)s_mprLib.GetSymbol(_T("WNetCloseEnum"));
     }
 #endif
 
@@ -502,7 +484,7 @@ bool wxFSVolumeBase::Create(const wxString& name)
 
     // Display name.
     SHFILEINFO fi;
-    long rc = SHGetFileInfo(m_volName.t_str(), 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME);
+    long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), SHGFI_DISPLAYNAME);
     if (!rc)
     {
         wxLogError(_("Cannot read typename from '%s'!"), m_volName.c_str());
@@ -582,9 +564,8 @@ void wxFSVolume::InitIcons()
 wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
 {
     wxCHECK_MSG( type >= 0 && (size_t)type < m_icons.GetCount(), wxNullIcon,
-                 wxT("wxFSIconType::GetIcon(): invalid icon index") );
+                 _T("wxFSIconType::GetIcon(): invalid icon index") );
 
-#ifdef __WXMSW__
     // Load on demand.
     if (m_icons[type].IsNull())
     {
@@ -608,24 +589,18 @@ wxIcon wxFSVolume::GetIcon(wxFSIconType type) const
             break;
 
         case wxFS_VOL_ICO_MAX:
-            wxFAIL_MSG(wxT("wxFS_VOL_ICO_MAX is not valid icon type"));
+            wxFAIL_MSG(_T("wxFS_VOL_ICO_MAX is not valid icon type"));
             break;
         }
 
         SHFILEINFO fi;
-        long rc = SHGetFileInfo(m_volName.t_str(), 0, &fi, sizeof(fi), flags);
+        long rc = SHGetFileInfo(m_volName, 0, &fi, sizeof(fi), flags);
         m_icons[type].SetHICON((WXHICON)fi.hIcon);
         if (!rc || !fi.hIcon)
-        {
             wxLogError(_("Cannot load icon from '%s'."), m_volName.c_str());
-        }
     }
 
     return m_icons[type];
-#else
-    wxFAIL_MSG(wxS("Can't convert HICON to wxIcon in this port."));
-    return wxNullIcon;
-#endif
 } // GetIcon
 
 #endif // wxUSE_GUI
diff --git a/Source/3rd Party/wx/src/msw/window.cpp b/Source/3rd Party/wx/src/msw/window.cpp
index 975cf2d33..daec224a5 100644
--- a/Source/3rd Party/wx/src/msw/window.cpp	
+++ b/Source/3rd Party/wx/src/msw/window.cpp	
@@ -4,7 +4,7 @@
 // Author:      Julian Smart
 // Modified by: VZ on 13.05.99: no more Default(), MSWOnXXX() reorganisation
 // Created:     04/01/98
-// RCS-ID:      $Id$
+// RCS-ID:      $Id: window.cpp 66914 2011-02-16 21:44:15Z JS $
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -57,7 +57,6 @@
     #include "wx/ownerdrw.h"
 #endif
 
-#include "wx/hashmap.h"
 #include "wx/evtloop.h"
 #include "wx/power.h"
 #include "wx/sysopt.h"
@@ -79,8 +78,6 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/msw/private/keyboard.h"
-#include "wx/msw/dcclient.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
@@ -90,10 +87,6 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
-#if wxUSE_RADIOBOX
-    #include "wx/radiobox.h"
-#endif // wxUSE_RADIOBOX
-
 #if wxUSE_SPINCTRL
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
@@ -113,6 +106,10 @@
     #include <windowsx.h>
 #endif
 
+#if !defined __WXWINCE__ && !defined NEED_PBT_H
+    #include <pbt.h>
+#endif
+
 #if defined(__WXWINCE__)
     #include "wx/msw/wince/missing.h"
 #ifdef __POCKETPC__
@@ -135,23 +132,20 @@
     #define ETS_ASSIST          7
 #endif
 
-// define the constants used by AnimateWindow() if our SDK doesn't have them
-#ifndef AW_CENTER
-    #define AW_HOR_POSITIVE 0x00000001
-    #define AW_HOR_NEGATIVE 0x00000002
-    #define AW_VER_POSITIVE 0x00000004
-    #define AW_VER_NEGATIVE 0x00000008
-    #define AW_CENTER       0x00000010
-    #define AW_HIDE         0x00010000
-    #define AW_ACTIVATE     0x00020000
-    #define AW_SLIDE        0x00040000
-    #define AW_BLEND        0x00080000
-#endif
-
 #if defined(TME_LEAVE) && defined(WM_MOUSELEAVE) && wxUSE_DYNLIB_CLASS
     #define HAVE_TRACKMOUSEEVENT
 #endif // everything needed for TrackMouseEvent()
 
+// if this is set to 1, we use deferred window sizing to reduce flicker when
+// resizing complicated window hierarchies, but this can in theory result in
+// different behaviour than the old code so we keep the possibility to use it
+// by setting this to 0 (in the future this should be removed completely)
+#ifdef __WXWINCE__
+#define USE_DEFERRED_SIZING 0
+#else
+#define USE_DEFERRED_SIZING 1
+#endif
+
 // set this to 1 to filter out duplicate mouse events, e.g. mouse move events
 // when mouse position didnd't change
 #ifdef __WXWINCE__
@@ -160,41 +154,27 @@
     #define wxUSE_MOUSEEVENT_HACK 1
 #endif
 
-// not all compilers/platforms have X button related declarations (notably
-// Windows CE doesn't, and probably some old SDKs don't neither)
-#ifdef WM_XBUTTONDOWN
-    #define wxHAS_XBUTTON
-#endif
-
-#ifndef MAPVK_VK_TO_CHAR
-    #define MAPVK_VK_TO_CHAR 2
-#endif
-
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 
 #if wxUSE_MENUS_NATIVE
-extern wxMenu *wxCurrentPopupMenu;
+wxMenu *wxCurrentPopupMenu = NULL;
+#endif // wxUSE_MENUS_NATIVE
+
+#ifdef __WXWINCE__
+extern       wxChar *wxCanvasClassName;
+#else
+extern const wxChar *wxCanvasClassName;
 #endif
 
-#if wxUSE_UXTHEME
-// This is a hack used by the owner-drawn wxButton implementation to ensure
-// that the brush used for erasing its background is correctly aligned with the
-// control.
-wxWindowMSW *wxWindowBeingErased = NULL;
-#endif // wxUSE_UXTHEME
-
-namespace
-{
-
 // true if we had already created the std colour map, used by
 // wxGetStdColourMap() and wxWindow::OnSysColourChanged()           (FIXME-MT)
-bool gs_hasStdCmap = false;
+static bool gs_hasStdCmap = false;
 
 // last mouse event information we need to filter out the duplicates
 #if wxUSE_MOUSEEVENT_HACK
-struct MouseEventInfoDummy
+static struct MouseEventInfoDummy
 {
     // mouse position (in screen coordinates)
     wxPoint pos;
@@ -204,44 +184,6 @@ struct MouseEventInfoDummy
 } gs_lastMouseEvent;
 #endif // wxUSE_MOUSEEVENT_HACK
 
-// hash containing the registered handlers for the custom messages
-WX_DECLARE_HASH_MAP(int, wxWindow::MSWMessageHandler,
-                    wxIntegerHash, wxIntegerEqual,
-                    MSWMessageHandlers);
-
-MSWMessageHandlers gs_messageHandlers;
-
-// hash containing all our windows, it uses HWND keys and wxWindow* values
-WX_DECLARE_HASH_MAP(HWND, wxWindow *,
-                    wxPointerHash, wxPointerEqual,
-                    WindowHandles);
-
-WindowHandles gs_windowHandles;
-
-#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
-
-// temporary override for WM_ERASEBKGND processing: we don't store this in
-// wxWindow itself as we don't need it during most of the time so don't
-// increase the size of all window objects unnecessarily
-WX_DECLARE_HASH_MAP(wxWindow *, wxWindow *,
-                    wxPointerHash, wxPointerEqual,
-                    EraseBgHooks);
-
-EraseBgHooks gs_eraseBgHooks;
-
-#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
-
-// If this variable is strictly positive, EVT_CHAR_HOOK is not generated for
-// Escape key presses as it can't be intercepted because it's needed by some
-// currently shown window, e.g. IME entry.
-//
-// This is currently global as we allow using UI from the main thread only
-// anyhow but could be replaced with a thread-specific value in the future if
-// needed.
-int gs_modalEntryWindowCount = 0;
-
-} // anonymous namespace
-
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
@@ -251,12 +193,13 @@ LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
                                    WPARAM wParam, LPARAM lParam);
 
 
-#if wxDEBUG_LEVEL >= 2
+#ifdef  __WXDEBUG__
     const wxChar *wxGetMessageName(int message);
-#endif  // wxDEBUG_LEVEL >= 2
+#endif  //__WXDEBUG__
 
 void wxRemoveHandleAssociation(wxWindowMSW *win);
 extern void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win);
+wxWindow *wxFindWinFromHandle(WXHWND hWnd);
 
 // get the text metrics for the current font
 static TEXTMETRIC wxGetTextMetrics(const wxWindowMSW *win);
@@ -280,7 +223,7 @@ static inline void wxBringWindowToTop(HWND hwnd)
     // raise top level parent to top of z order
     if (!::SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
     {
-        wxLogLastError(wxT("SetWindowPos"));
+        wxLogLastError(_T("SetWindowPos"));
     }
 }
 
@@ -304,11 +247,12 @@ static void EnsureParentHasControlParentStyle(wxWindow *parent)
      */
     while ( parent && !parent->IsTopLevel() )
     {
-        LONG exStyle = wxGetWindowExStyle(parent);
+        LONG exStyle = ::GetWindowLong(GetHwndOf(parent), GWL_EXSTYLE);
         if ( !(exStyle & WS_EX_CONTROLPARENT) )
         {
             // force the parent to have this style
-            wxSetWindowExStyle(parent, exStyle | WS_EX_CONTROLPARENT);
+            ::SetWindowLong(GetHwndOf(parent), GWL_EXSTYLE,
+                            exStyle | WS_EX_CONTROLPARENT);
         }
 
         parent = parent->GetParent();
@@ -317,22 +261,35 @@ static void EnsureParentHasControlParentStyle(wxWindow *parent)
 
 #endif // !__WXWINCE__
 
-// GetCursorPos can return an error, so use this function
-// instead.
-// Error originally observed with WinCE, but later using Remote Desktop
-// to connect to XP.
-void wxGetCursorPosMSW(POINT* pt)
+#ifdef __WXWINCE__
+// On Windows CE, GetCursorPos can return an error, so use this function
+// instead
+bool GetCursorPosWinCE(POINT* pt)
 {
     if (!GetCursorPos(pt))
     {
-#ifdef __WXWINCE__
-        wxLogLastError(wxT("GetCursorPos"));
-#endif
         DWORD pos = GetMessagePos();
-        // the coordinates may be negative in multi-monitor systems
-        pt->x = GET_X_LPARAM(pos);
-        pt->y = GET_Y_LPARAM(pos);
+        pt->x = LOWORD(pos);
+        pt->y = HIWORD(pos);
     }
+    return true;
+}
+#endif
+
+static wxBorder TranslateBorder(wxBorder border)
+{
+    if ( border == wxBORDER_THEME )
+    {
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+        return wxBORDER_SIMPLE;
+#elif wxUSE_UXTHEME
+        if (wxUxThemeEngine::GetIfActive())
+            return wxBORDER_THEME;
+#endif
+        return wxBORDER_SUNKEN;
+    }
+
+    return border;
 }
 
 // ---------------------------------------------------------------------------
@@ -343,10 +300,119 @@ void wxGetCursorPosMSW(POINT* pt)
 // method
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMSW, wxWindowBase)
-#endif // __WXUNIVERSAL__
+#else // __WXMSW__
+#if wxUSE_EXTENDED_RTTI
+
+// windows that are created from a parent window during its Create method, eg. spin controls in a calendar controls
+// must never been streamed out separately otherwise chaos occurs. Right now easiest is to test for negative ids, as
+// windows with negative ids never can be recreated anyway
+
+bool wxWindowStreamingCallback( const wxObject *object, wxWriter * , wxPersister * , wxxVariantArray & )
+{
+    const wxWindow * win = dynamic_cast<const wxWindow*>(object) ;
+    if ( win && win->GetId() < 0 )
+        return false ;
+    return true ;
+}
+
+IMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxWindow, wxWindowBase,"wx/window.h", wxWindowStreamingCallback)
+
+// make wxWindowList known before the property is used
+
+wxCOLLECTION_TYPE_INFO( wxWindow* , wxWindowList ) ;
+
+template<> void wxCollectionToVariantArray( wxWindowList const &theList, wxxVariantArray &value)
+{
+    wxListCollectionToVariantArray<wxWindowList::compatibility_iterator>( theList , value ) ;
+}
+
+WX_DEFINE_FLAGS( wxWindowStyle )
+
+wxBEGIN_FLAGS( wxWindowStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxWindowStyle )
+
+wxBEGIN_PROPERTIES_TABLE(wxWindow)
+    wxEVENT_PROPERTY( Close , wxEVT_CLOSE_WINDOW , wxCloseEvent)
+    wxEVENT_PROPERTY( Create , wxEVT_CREATE , wxWindowCreateEvent )
+    wxEVENT_PROPERTY( Destroy , wxEVT_DESTROY , wxWindowDestroyEvent )
+    // Always constructor Properties first
+
+    wxREADONLY_PROPERTY( Parent,wxWindow*, GetParent, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Id,wxWindowID, SetId, GetId, -1 /*wxID_ANY*/ , 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
+    wxPROPERTY( Position,wxPoint, SetPosition , GetPosition, wxDefaultPosition , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // pos
+    wxPROPERTY( Size,wxSize, SetSize, GetSize, wxDefaultSize , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // size
+    wxPROPERTY( WindowStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+
+    // Then all relations of the object graph
+
+    wxREADONLY_PROPERTY_COLLECTION( Children , wxWindowList , wxWindowBase* , GetWindowChildren , wxPROP_OBJECT_GRAPH /*flags*/ , wxT("Helpstring") , wxT("group"))
+
+   // and finally all other properties
+
+    wxPROPERTY( ExtraStyle , long , SetExtraStyle , GetExtraStyle , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // extstyle
+    wxPROPERTY( BackgroundColour , wxColour , SetBackgroundColour , GetBackgroundColour , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // bg
+    wxPROPERTY( ForegroundColour , wxColour , SetForegroundColour , GetForegroundColour , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // fg
+    wxPROPERTY( Enabled , bool , Enable , IsEnabled , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+#if 0
+    // possible property candidates (not in xrc) or not valid in all subclasses
+    wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString )
+    wxPROPERTY( Font , wxFont , SetFont , GetWindowFont  , )
+    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )
+    // MaxHeight, Width , MinHeight , Width
+    // TODO switch label to control and title to toplevels
+
+    wxPROPERTY( ThemeEnabled , bool , SetThemeEnabled , GetThemeEnabled , )
+    //wxPROPERTY( Cursor , wxCursor , SetCursor , GetCursor , )
+    // wxPROPERTY( ToolTip , wxString , SetToolTip , GetToolTipText , )
+    wxPROPERTY( AutoLayout , bool , SetAutoLayout , GetAutoLayout , )
+
+
+
+#endif
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxWindow)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_DUMMY(wxWindow)
+
+#else
+    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
+#endif
+#endif // __WXUNIVERSAL__/__WXMSW__
 
 BEGIN_EVENT_TABLE(wxWindowMSW, wxWindowBase)
     EVT_SYS_COLOUR_CHANGED(wxWindowMSW::OnSysColourChanged)
+    EVT_ERASE_BACKGROUND(wxWindowMSW::OnEraseBackground)
 #ifdef __WXWINCE__
     EVT_INIT_DIALOG(wxWindowMSW::OnInitDialog)
 #endif
@@ -409,7 +475,7 @@ wxWindow *wxWindowMSW::FindItemByHWND(WXHWND hWnd, bool controlOnly) const
 
         if ( !controlOnly
 #if wxUSE_CONTROLS
-                || wxDynamicCast(parent, wxControl)
+                || parent->IsKindOf(CLASSINFO(wxControl))
 #endif // wxUSE_CONTROLS
            )
         {
@@ -441,20 +507,22 @@ bool wxWindowMSW::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
 void wxWindowMSW::Init()
 {
     // MSW specific
+    m_isBeingDeleted = false;
     m_oldWndProc = NULL;
     m_mouseInWindow = false;
     m_lastKeydownProcessed = false;
 
+    m_childrenDisabled = NULL;
+    m_frozenness = 0;
+
     m_hWnd = 0;
+    m_hDWP = 0;
 
     m_xThumbSize = 0;
     m_yThumbSize = 0;
 
-#if wxUSE_DEFERRED_SIZING
-    m_hDWP = 0;
     m_pendingPosition = wxDefaultPosition;
     m_pendingSize = wxDefaultSize;
-#endif // wxUSE_DEFERRED_SIZING
 
 #ifdef __POCKETPC__
     m_contextMenuEnabled = false;
@@ -464,7 +532,7 @@ void wxWindowMSW::Init()
 // Destructor
 wxWindowMSW::~wxWindowMSW()
 {
-    SendDestroyEvent();
+    m_isBeingDeleted = true;
 
 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
@@ -498,21 +566,15 @@ wxWindowMSW::~wxWindowMSW()
         //if (::IsWindow(GetHwnd()))
         {
             if ( !::DestroyWindow(GetHwnd()) )
-            {
                 wxLogLastError(wxT("DestroyWindow"));
-            }
         }
 
         // remove hWnd <-> wxWindow association
         wxRemoveHandleAssociation(this);
     }
 
-}
+    delete m_childrenDisabled;
 
-/* static */
-const wxChar *wxWindowMSW::MSWGetRegisteredClassName()
-{
-    return wxApp::GetRegisteredClassName(wxT("wxWindow"), COLOR_BTNFACE);
 }
 
 // real construction (Init() must have been called before!)
@@ -547,8 +609,7 @@ bool wxWindowMSW::Create(wxWindow *parent,
         msflags |= WS_VISIBLE;
     }
 
-    if ( !MSWCreate(MSWGetRegisteredClassName(),
-                    NULL, pos, size, msflags, exstyle) )
+    if ( !MSWCreate(wxCanvasClassName, NULL, pos, size, msflags, exstyle) )
         return false;
 
     InheritAttributes();
@@ -563,14 +624,15 @@ bool wxWindowMSW::Create(wxWindow *parent,
 void wxWindowMSW::SetFocus()
 {
     HWND hWnd = GetHwnd();
-    wxCHECK_RET( hWnd, wxT("can't set focus to invalid window") );
+    wxCHECK_RET( hWnd, _T("can't set focus to invalid window") );
 
-#if !defined(__WXWINCE__)
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     ::SetLastError(0);
 #endif
 
     if ( !::SetFocus(hWnd) )
     {
+#if defined(__WXDEBUG__) && !defined(__WXMICROWIN__)
         // was there really an error?
         DWORD dwRes = ::GetLastError();
         if ( dwRes )
@@ -578,9 +640,10 @@ void wxWindowMSW::SetFocus()
             HWND hwndFocus = ::GetFocus();
             if ( hwndFocus != hWnd )
             {
-                wxLogApiError(wxT("SetFocus"), dwRes);
+                wxLogApiError(_T("SetFocus"), dwRes);
             }
         }
+#endif // Debug
     }
 }
 
@@ -613,23 +676,69 @@ wxWindow *wxWindowBase::DoFindFocus()
     return NULL;
 }
 
-void wxWindowMSW::DoEnable( bool enable )
+bool wxWindowMSW::Enable(bool enable)
 {
-    MSWEnableHWND(GetHwnd(), enable);
-}
-
-bool wxWindowMSW::MSWEnableHWND(WXHWND hWnd, bool enable)
-{
-    if ( !hWnd )
+    if ( !wxWindowBase::Enable(enable) )
         return false;
 
-    // If disabling focused control, we move focus to the next one, as if the
-    // user pressed Tab. That's because we can't keep focus on a disabled
-    // control, Tab-navigation would stop working then.
-    if ( !enable && ::GetFocus() == hWnd )
-        Navigate();
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+        ::EnableWindow(hWnd, (BOOL)enable);
 
-    return ::EnableWindow(hWnd, (BOOL)enable) != 0;
+    // the logic below doesn't apply to the top level windows -- otherwise
+    // showing a modal dialog would result in total greying out (and ungreying
+    // out later) of everything which would be really ugly
+    if ( IsTopLevel() )
+        return true;
+
+    // when the parent is disabled, all of its children should be disabled as
+    // well but when it is enabled back, only those of the children which
+    // hadn't been already disabled in the beginning should be enabled again,
+    // so we have to keep the list of those children
+    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *child = node->GetData();
+        if ( child->IsTopLevel() )
+        {
+            // the logic below doesn't apply to top level children
+            continue;
+        }
+
+        if ( enable )
+        {
+            // re-enable the child unless it had been disabled before us
+            if ( !m_childrenDisabled || !m_childrenDisabled->Find(child) )
+                child->Enable();
+        }
+        else // we're being disabled
+        {
+            if ( child->IsEnabled() )
+            {
+                // disable it as children shouldn't stay enabled while the
+                // parent is not
+                child->Disable();
+            }
+            else // child already disabled, remember it
+            {
+                // have we created the list of disabled children already?
+                if ( !m_childrenDisabled )
+                    m_childrenDisabled = new wxWindowList;
+
+                m_childrenDisabled->Append(child);
+            }
+        }
+    }
+
+    if ( enable && m_childrenDisabled )
+    {
+        // we don't need this list any more, don't keep unused memory
+        delete m_childrenDisabled;
+        m_childrenDisabled = NULL;
+    }
+
+    return true;
 }
 
 bool wxWindowMSW::Show(bool show)
@@ -652,119 +761,6 @@ bool wxWindowMSW::Show(bool show)
         ::ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
     }
 
-    if ( IsFrozen() )
-    {
-        // DoFreeze/DoThaw don't do anything if the window is not shown, so
-        // we have to call them from here now
-        if ( show )
-            DoFreeze();
-        else
-            DoThaw();
-    }
-
-    return true;
-}
-
-bool
-wxWindowMSW::MSWShowWithEffect(bool show,
-                               wxShowEffect effect,
-                               unsigned timeout)
-{
-    if ( effect == wxSHOW_EFFECT_NONE )
-        return Show(show);
-
-    if ( !wxWindowBase::Show(show) )
-        return false;
-
-    typedef BOOL (WINAPI *AnimateWindow_t)(HWND, DWORD, DWORD);
-
-    static AnimateWindow_t s_pfnAnimateWindow = NULL;
-    static bool s_initDone = false;
-    if ( !s_initDone )
-    {
-        wxDynamicLibrary dllUser32(wxT("user32.dll"), wxDL_VERBATIM | wxDL_QUIET);
-        wxDL_INIT_FUNC(s_pfn, AnimateWindow, dllUser32);
-
-        s_initDone = true;
-
-        // notice that it's ok to unload user32.dll here as it won't be really
-        // unloaded, being still in use because we link to it statically too
-    }
-
-    if ( !s_pfnAnimateWindow )
-        return Show(show);
-
-    // Show() has a side effect of sending a WM_SIZE to the window, which helps
-    // ensuring that it's laid out correctly, but AnimateWindow() doesn't do
-    // this so send the event ourselves
-    SendSizeEvent();
-
-    // prepare to use AnimateWindow()
-
-    if ( !timeout )
-        timeout = 200; // this is the default animation timeout, per MSDN
-
-    DWORD dwFlags = show ? 0 : AW_HIDE;
-
-    switch ( effect )
-    {
-        case wxSHOW_EFFECT_ROLL_TO_LEFT:
-            dwFlags |= AW_HOR_NEGATIVE;
-            break;
-
-        case wxSHOW_EFFECT_ROLL_TO_RIGHT:
-            dwFlags |= AW_HOR_POSITIVE;
-            break;
-
-        case wxSHOW_EFFECT_ROLL_TO_TOP:
-            dwFlags |= AW_VER_NEGATIVE;
-            break;
-
-        case wxSHOW_EFFECT_ROLL_TO_BOTTOM:
-            dwFlags |= AW_VER_POSITIVE;
-            break;
-
-        case wxSHOW_EFFECT_SLIDE_TO_LEFT:
-            dwFlags |= AW_SLIDE | AW_HOR_NEGATIVE;
-            break;
-
-        case wxSHOW_EFFECT_SLIDE_TO_RIGHT:
-            dwFlags |= AW_SLIDE | AW_HOR_POSITIVE;
-            break;
-
-        case wxSHOW_EFFECT_SLIDE_TO_TOP:
-            dwFlags |= AW_SLIDE | AW_VER_NEGATIVE;
-            break;
-
-        case wxSHOW_EFFECT_SLIDE_TO_BOTTOM:
-            dwFlags |= AW_SLIDE | AW_VER_POSITIVE;
-            break;
-
-        case wxSHOW_EFFECT_BLEND:
-            dwFlags |= AW_BLEND;
-            break;
-
-        case wxSHOW_EFFECT_EXPAND:
-            dwFlags |= AW_CENTER;
-            break;
-
-
-        case wxSHOW_EFFECT_MAX:
-            wxFAIL_MSG( wxT("invalid window show effect") );
-            return false;
-
-        default:
-            wxFAIL_MSG( wxT("unknown window show effect") );
-            return false;
-    }
-
-    if ( !(*s_pfnAnimateWindow)(GetHwnd(), timeout, dwFlags) )
-    {
-        wxLogLastError(wxT("AnimateWindow"));
-
-        return false;
-    }
-
     return true;
 }
 
@@ -794,14 +790,14 @@ void wxWindowMSW::DoReleaseMouse()
 {
     if ( !::ReleaseCapture() )
     {
-        wxLogLastError(wxT("ReleaseCapture"));
+        wxLogLastError(_T("ReleaseCapture"));
     }
 }
 
 /* static */ wxWindow *wxWindowBase::GetCapture()
 {
     HWND hwnd = ::GetCapture();
-    return hwnd ? wxFindWinFromHandle(hwnd) : NULL;
+    return hwnd ? wxFindWinFromHandle((WXHWND)hwnd) : (wxWindow *)NULL;
 }
 
 bool wxWindowMSW::SetFont(const wxFont& font)
@@ -828,7 +824,6 @@ bool wxWindowMSW::SetFont(const wxFont& font)
 
     return true;
 }
-
 bool wxWindowMSW::SetCursor(const wxCursor& cursor)
 {
     if ( !wxWindowBase::SetCursor(cursor) )
@@ -838,10 +833,7 @@ bool wxWindowMSW::SetCursor(const wxCursor& cursor)
     }
 
     // don't "overwrite" busy cursor
-    if ( wxIsBusy() )
-        return true;
-
-    if ( m_cursor.IsOk() )
+    if ( m_cursor.Ok() && !wxIsBusy() )
     {
         // normally we should change the cursor only if it's over this window
         // but we should do it always if we capture the mouse currently
@@ -851,7 +843,11 @@ bool wxWindowMSW::SetCursor(const wxCursor& cursor)
             HWND hWnd = GetHwnd();
 
             POINT point;
-            ::wxGetCursorPosMSW(&point);
+#ifdef __WXWINCE__
+            ::GetCursorPosWinCE(&point);
+#else
+            ::GetCursorPos(&point);
+#endif
 
             RECT rect = wxGetWindowRect(hWnd);
 
@@ -864,22 +860,6 @@ bool wxWindowMSW::SetCursor(const wxCursor& cursor)
         }
         //else: will be set later when the mouse enters this window
     }
-    else // Invalid cursor: this means reset to the default one.
-    {
-        // To revert to the correct cursor we need to find the window currently
-        // under the cursor and ask it to set its cursor itself as only it
-        // knows what it is.
-        POINT pt;
-        wxGetCursorPosMSW(&pt);
-
-        const wxWindowMSW* win = wxFindWindowAtPoint(wxPoint(pt.x, pt.y));
-        if ( !win )
-            win = this;
-
-        ::SendMessage(GetHwndOf(win), WM_SETCURSOR,
-                      (WPARAM)GetHwndOf(win),
-                      MAKELPARAM(HTCLIENT, WM_MOUSEMOVE));
-    }
 
     return true;
 }
@@ -890,7 +870,7 @@ void wxWindowMSW::WarpPointer(int x, int y)
 
     if ( !::SetCursorPos(x, y) )
     {
-        wxLogLastError(wxT("SetCursorPos"));
+        wxLogLastError(_T("SetCursorPos"));
     }
 }
 
@@ -918,9 +898,6 @@ void wxWindowMSW::MSWUpdateUIState(int action, int state)
 // scrolling stuff
 // ---------------------------------------------------------------------------
 
-namespace
-{
-
 inline int GetScrollPosition(HWND hWnd, int wOrient)
 {
 #ifdef __WXMICROWIN__
@@ -936,19 +913,12 @@ inline int GetScrollPosition(HWND hWnd, int wOrient)
 #endif
 }
 
-inline UINT WXOrientToSB(int orient)
-{
-    return orient == wxHORIZONTAL ? SB_HORZ : SB_VERT;
-}
-
-} // anonymous namespace
-
 int wxWindowMSW::GetScrollPos(int orient) const
 {
     HWND hWnd = GetHwnd();
-    wxCHECK_MSG( hWnd, 0, wxT("no HWND in GetScrollPos") );
+    wxCHECK_MSG( hWnd, 0, _T("no HWND in GetScrollPos") );
 
-    return GetScrollPosition(hWnd, WXOrientToSB(orient));
+    return GetScrollPosition(hWnd, orient == wxHORIZONTAL ? SB_HORZ : SB_VERT);
 }
 
 // This now returns the whole range, not just the number
@@ -959,13 +929,19 @@ int wxWindowMSW::GetScrollRange(int orient) const
     HWND hWnd = GetHwnd();
     if ( !hWnd )
         return 0;
+#if 0
+    ::GetScrollRange(hWnd, orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
+                     &minPos, &maxPos);
+#endif
     WinStruct<SCROLLINFO> scrollInfo;
     scrollInfo.fMask = SIF_RANGE;
-    if ( !::GetScrollInfo(hWnd, WXOrientToSB(orient), &scrollInfo) )
+    if ( !::GetScrollInfo(hWnd,
+                          orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
+                          &scrollInfo) )
     {
         // Most of the time this is not really an error, since the return
         // value can also be zero when there is no scrollbar yet.
-        // wxLogLastError(wxT("GetScrollInfo"));
+        // wxLogLastError(_T("GetScrollInfo"));
     }
     maxPos = scrollInfo.nMax;
 
@@ -981,7 +957,7 @@ int wxWindowMSW::GetScrollThumb(int orient) const
 void wxWindowMSW::SetScrollPos(int orient, int pos, bool refresh)
 {
     HWND hWnd = GetHwnd();
-    wxCHECK_RET( hWnd, wxT("SetScrollPos: no HWND") );
+    wxCHECK_RET( hWnd, _T("SetScrollPos: no HWND") );
 
     WinStruct<SCROLLINFO> info;
     info.nPage = 0;
@@ -994,7 +970,8 @@ void wxWindowMSW::SetScrollPos(int orient, int pos, bool refresh)
         info.fMask |= SIF_DISABLENOSCROLL;
     }
 
-    ::SetScrollInfo(hWnd, WXOrientToSB(orient), &info, refresh);
+    ::SetScrollInfo(hWnd, orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
+                    &info, refresh);
 }
 
 // New function that will replace some of the above.
@@ -1004,41 +981,28 @@ void wxWindowMSW::SetScrollbar(int orient,
                                int range,
                                bool refresh)
 {
-    // We have to set the variables here to make them valid in events
-    // triggered by ::SetScrollInfo()
-    *(orient == wxHORIZONTAL ? &m_xThumbSize : &m_yThumbSize) = pageSize;
-
-    HWND hwnd = GetHwnd();
-    if ( !hwnd )
-        return;
-
     WinStruct<SCROLLINFO> info;
-    if ( range != -1 )
-    {
-        info.nPage = pageSize;
-        info.nMin = 0;              // range is nMax - nMin + 1
-        info.nMax = range - 1;      //  as both nMax and nMax are inclusive
-        info.nPos = pos;
-
-        // We normally also reenable scrollbar in case it had been previously
-        // disabled by specifying SIF_DISABLENOSCROLL below but we should only
-        // do this if it has valid range, otherwise it would be enabled but not
-        // do anything.
-        if ( range >= pageSize )
-        {
-            ::EnableScrollBar(hwnd, WXOrientToSB(orient), ESB_ENABLE_BOTH);
-        }
-    }
-    //else: leave all the fields to be 0
-
+    info.nPage = pageSize;
+    info.nMin = 0;              // range is nMax - nMin + 1
+    info.nMax = range - 1;      //  as both nMax and nMax are inclusive
+    info.nPos = pos;
     info.fMask = SIF_RANGE | SIF_PAGE | SIF_POS;
-    if ( HasFlag(wxALWAYS_SHOW_SB) || range == -1 )
+    if ( HasFlag(wxALWAYS_SHOW_SB) )
     {
         // disable scrollbar instead of removing it then
         info.fMask |= SIF_DISABLENOSCROLL;
     }
 
-    ::SetScrollInfo(hwnd, WXOrientToSB(orient), &info, refresh);
+    HWND hWnd = GetHwnd();
+    if ( hWnd )
+    {
+        // We have to set the variables here to make them valid in events
+        // triggered by ::SetScrollInfo()
+        *(orient == wxHORIZONTAL ? &m_xThumbSize : &m_yThumbSize) = pageSize;
+
+        ::SetScrollInfo(hWnd, orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
+                        &info, refresh);
+    }
 }
 
 void wxWindowMSW::ScrollWindow(int dx, int dy, const wxRect *prect)
@@ -1047,7 +1011,10 @@ void wxWindowMSW::ScrollWindow(int dx, int dy, const wxRect *prect)
     RECT *pr;
     if ( prect )
     {
-        wxCopyRectToRECT(*prect, rect);
+        rect.left = prect->x;
+        rect.top = prect->y;
+        rect.right = prect->x + prect->width;
+        rect.bottom = prect->y + prect->height;
         pr = &rect;
     }
     else
@@ -1113,10 +1080,10 @@ void wxWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
 #ifdef __WXWINCE__
     wxUnusedVar(dir);
 #else
-    wxCHECK_RET( GetHwnd(),
-                 wxT("layout direction must be set after window creation") );
+    const HWND hwnd = GetHwnd();
+    wxCHECK_RET( hwnd, _T("layout direction must be set after window creation") );
 
-    LONG styleOld = wxGetWindowExStyle(this);
+    LONG styleOld = ::GetWindowLong(hwnd, GWL_EXSTYLE);
 
     LONG styleNew = styleOld;
     switch ( dir )
@@ -1130,13 +1097,13 @@ void wxWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
             break;
 
         default:
-            wxFAIL_MSG(wxT("unsupported layout direction"));
+            wxFAIL_MSG(_T("unsupported layout direction"));
             break;
     }
 
     if ( styleNew != styleOld )
     {
-        wxSetWindowExStyle(this, styleNew);
+        ::SetWindowLong(hwnd, GWL_EXSTYLE, styleNew);
     }
 #endif
 }
@@ -1146,10 +1113,12 @@ wxLayoutDirection wxWindowMSW::GetLayoutDirection() const
 #ifdef __WXWINCE__
     return wxLayout_Default;
 #else
-    wxCHECK_MSG( GetHwnd(), wxLayout_Default, wxT("invalid window") );
+    const HWND hwnd = GetHwnd();
+    wxCHECK_MSG( hwnd, wxLayout_Default, _T("invalid window") );
 
-    return wxHasWindowExStyle(this, WS_EX_LAYOUTRTL) ? wxLayout_RightToLeft
-                                                     : wxLayout_LeftToRight;
+    return ::GetWindowLong(hwnd, GWL_EXSTYLE) & WS_EX_LAYOUTRTL
+                ? wxLayout_RightToLeft
+                : wxLayout_LeftToRight;
 #endif
 }
 
@@ -1174,8 +1143,6 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
     HWND hwnd = (HWND)hWnd;
     wxCHECK_RET( ::IsWindow(hwnd), wxT("invalid HWND in SubclassWin") );
 
-    SetHWND(hWnd);
-
     wxAssociateWinWithHandle(hwnd, this);
 
     m_oldWndProc = (WXFARPROC)wxGetWindowProc((HWND)hWnd);
@@ -1197,7 +1164,7 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
 
     // we're officially created now, send the event
     wxWindowCreateEvent event((wxWindow *)this);
-    (void)HandleWindowEvent(event);
+    (void)GetEventHandler()->ProcessEvent(event);
 }
 
 void wxWindowMSW::UnsubclassWin()
@@ -1229,14 +1196,12 @@ void wxWindowMSW::AssociateHandle(WXWidget handle)
     if ( m_hWnd )
     {
       if ( !::DestroyWindow(GetHwnd()) )
-      {
         wxLogLastError(wxT("DestroyWindow"));
-      }
     }
 
     WXHWND wxhwnd = (WXHWND)handle;
 
-    // this also calls SetHWND(wxhwnd)
+    SetHWND(wxhwnd);
     SubclassWin(wxhwnd);
 }
 
@@ -1250,12 +1215,36 @@ void wxWindowMSW::DissociateHandle()
 bool wxCheckWindowWndProc(WXHWND hWnd,
                           WXFARPROC WXUNUSED(wndProc))
 {
-    const wxString str(wxGetWindowClass(hWnd));
+// TODO: This list of window class names should be factored out so they can be
+// managed in one place and then accessed from here and other places, such as
+// wxApp::RegisterWindowClasses() and wxApp::UnregisterWindowClasses()
 
-    // TODO: get rid of wxTLWHiddenParent special case (currently it's not
-    //       registered by wxApp but using ad hoc code in msw/toplevel.cpp);
-    //       there is also a hidden window class used by sockets &c
-    return wxApp::IsRegisteredClassName(str) || str == wxT("wxTLWHiddenParent");
+#ifdef __WXWINCE__
+    extern       wxChar *wxCanvasClassName;
+    extern       wxChar *wxCanvasClassNameNR;
+#else
+    extern const wxChar *wxCanvasClassName;
+    extern const wxChar *wxCanvasClassNameNR;
+#endif
+    extern const wxChar *wxMDIFrameClassName;
+    extern const wxChar *wxMDIFrameClassNameNoRedraw;
+    extern const wxChar *wxMDIChildFrameClassName;
+    extern const wxChar *wxMDIChildFrameClassNameNoRedraw;
+    wxString str(wxGetWindowClass(hWnd));
+    if (str == wxCanvasClassName ||
+        str == wxCanvasClassNameNR ||
+#if wxUSE_GLCANVAS
+        str == _T("wxGLCanvasClass") ||
+        str == _T("wxGLCanvasClassNR") ||
+#endif // wxUSE_GLCANVAS
+        str == wxMDIFrameClassName ||
+        str == wxMDIFrameClassNameNoRedraw ||
+        str == wxMDIChildFrameClassName ||
+        str == wxMDIChildFrameClassNameNoRedraw ||
+        str == _T("wxTLWHiddenParent"))
+        return true; // Effectively means don't subclass
+    else
+        return false;
 }
 
 // ----------------------------------------------------------------------------
@@ -1338,14 +1327,14 @@ void wxWindowMSW::MSWUpdateStyle(long flagsOld, long exflagsOld)
     }
 
     // and the extended style
-    long exstyleReal = wxGetWindowExStyle(this);
+    long exstyleReal = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE);
 
     if ( exstyle != exstyleOld )
     {
         exstyleReal &= ~exstyleOld;
         exstyleReal |= exstyle;
 
-        wxSetWindowExStyle(this, exstyleReal);
+        ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyleReal);
 
         // ex style changes don't take effect without calling SetWindowPos
         callSWP = true;
@@ -1360,51 +1349,13 @@ void wxWindowMSW::MSWUpdateStyle(long flagsOld, long exflagsOld)
                              exstyleReal & WS_EX_TOPMOST ? HWND_TOPMOST
                                                          : HWND_NOTOPMOST,
                              0, 0, 0, 0,
-                             SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |
-                             SWP_FRAMECHANGED) )
+                             SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED) )
         {
-            wxLogLastError(wxT("SetWindowPos"));
+            wxLogLastError(_T("SetWindowPos"));
         }
     }
 }
 
-wxBorder wxWindowMSW::GetDefaultBorderForControl() const
-{
-    return wxBORDER_THEME;
-}
-
-wxBorder wxWindowMSW::GetDefaultBorder() const
-{
-    return wxWindowBase::GetDefaultBorder();
-}
-
-// Translate wxBORDER_THEME (and other border styles if necessary) to the value
-// that makes most sense for this Windows environment
-wxBorder wxWindowMSW::TranslateBorder(wxBorder border) const
-{
-#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
-    if (border == wxBORDER_THEME || border == wxBORDER_SUNKEN || border == wxBORDER_SIMPLE)
-        return wxBORDER_SIMPLE;
-    else
-        return wxBORDER_NONE;
-#else
-#if wxUSE_UXTHEME
-    if (border == wxBORDER_THEME)
-    {
-        if (CanApplyThemeBorder())
-        {
-            wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
-            if (theme)
-                return wxBORDER_THEME;
-        }
-        return wxBORDER_SUNKEN;
-    }
-#endif
-    return border;
-#endif
-}
-
-
 WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 {
     // translate common wxWidgets styles to Windows ones
@@ -1436,9 +1387,6 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 
     const wxBorder border = TranslateBorder(GetBorder(flags));
 
-    // After translation, border is now optimized for the specific version of Windows
-    // and theme engine presence.
-
     // WS_BORDER is only required for wxBORDER_SIMPLE
     if ( border == wxBORDER_SIMPLE )
         style |= WS_BORDER;
@@ -1457,7 +1405,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
         {
             default:
             case wxBORDER_DEFAULT:
-                wxFAIL_MSG( wxT("unknown border style") );
+                wxFAIL_MSG( _T("unknown border style") );
                 // fall through
 
             case wxBORDER_NONE:
@@ -1497,6 +1445,13 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
     return style;
 }
 
+// Helper for getting an appropriate theme style for the application. Unnecessary in
+// 2.9 and above.
+wxBorder wxWindowMSW::GetThemedBorderStyle() const
+{
+    return TranslateBorder(wxBORDER_THEME);
+}
+
 // Setup background and foreground colours correctly
 void wxWindowMSW::SetupColours()
 {
@@ -1508,7 +1463,11 @@ bool wxWindowMSW::IsMouseInWindow() const
 {
     // get the mouse position
     POINT pt;
-    wxGetCursorPosMSW(&pt);
+#ifdef __WXWINCE__
+    ::GetCursorPosWinCE(&pt);
+#else
+    ::GetCursorPos(&pt);
+#endif
 
     // find the window which currently has the cursor and go up the window
     // chain until we find this window - or exhaust it
@@ -1534,7 +1493,8 @@ void wxWindowMSW::OnInternalIdle()
     }
 #endif // !HAVE_TRACKMOUSEEVENT
 
-    wxWindowBase::OnInternalIdle();
+    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
 // Set this window to be the child of 'parent'.
@@ -1549,7 +1509,7 @@ bool wxWindowMSW::Reparent(wxWindowBase *parent)
     ::SetParent(hWndChild, hWndParent);
 
 #ifndef __WXWINCE__
-    if ( wxHasWindowExStyle(this, WS_EX_CONTROLPARENT) )
+    if ( ::GetWindowLong(hWndChild, GWL_EXSTYLE) & WS_EX_CONTROLPARENT )
     {
         EnsureParentHasControlParentStyle(GetParent());
     }
@@ -1565,24 +1525,75 @@ static inline void SendSetRedraw(HWND hwnd, bool on)
 #endif
 }
 
-void wxWindowMSW::DoFreeze()
+void wxWindowMSW::Freeze()
 {
-    if ( !IsShown() )
-        return; // no point in freezing hidden window
-
-    SendSetRedraw(GetHwnd(), false);
+    if ( !m_frozenness++ )
+    {
+        if ( IsShown() )
+        {
+            if ( IsTopLevel() )
+            {
+                // If this is a TLW, then freeze it's non-TLW children
+                // instead.  This is needed because on Windows a frozen TLW
+                // lets window paint and mouse events pass through to other
+                // Windows below this one in z-order.
+                for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+                      node;
+                      node = node->GetNext() )
+                {
+                    wxWindow *child = node->GetData();
+                    if ( child->IsTopLevel() )
+                        continue;
+                    else
+                        child->Freeze();
+                }
+            }
+            else // This is not a TLW, so just freeze it.
+            {
+                SendSetRedraw(GetHwnd(), false);
+            }
+        }
+    }
 }
 
-void wxWindowMSW::DoThaw()
+void wxWindowMSW::Thaw()
 {
-    if ( !IsShown() )
-        return; // hidden windows aren't frozen by DoFreeze
+    wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
 
-    SendSetRedraw(GetHwnd(), true);
+    if ( --m_frozenness == 0 )
+    {
+        if ( IsShown() )
+        {
+            if ( IsTopLevel() )
+            {
+                // If this is a TLW, then Thaw it's non-TLW children
+                // instead.  See Freeze.
+                for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+                      node;
+                      node = node->GetNext() )
+                {
+                    wxWindow *child = node->GetData();
+                    if ( child->IsTopLevel() )
+                        continue;
+                    else
+                    {
+                        // in case the child was added while the TLW was
+                        // frozen, it won't be frozen now so avoid the Thaw.
+                        if ( child->IsFrozen() )
+                            child->Thaw();
+                    }
+                }
+            }
+            else // This is not a TLW, so just thaw it.
+            {
+                SendSetRedraw(GetHwnd(), true);
+            }
 
-    // we need to refresh everything or otherwise the invalidated area
-    // is not going to be repainted
-    Refresh();
+            // we need to refresh everything or otherwise the invalidated area
+            // is not going to be repainted
+            Refresh();
+        }
+    }
 }
 
 void wxWindowMSW::Refresh(bool eraseBack, const wxRect *rect)
@@ -1594,7 +1605,11 @@ void wxWindowMSW::Refresh(bool eraseBack, const wxRect *rect)
         const RECT *pRect;
         if ( rect )
         {
-            wxCopyRectToRECT(*rect, mswRect);
+            mswRect.left = rect->x;
+            mswRect.top = rect->y;
+            mswRect.right = rect->x + rect->width;
+            mswRect.bottom = rect->y + rect->height;
+
             pRect = &mswRect;
         }
         else
@@ -1619,7 +1634,7 @@ void wxWindowMSW::Update()
 {
     if ( !::UpdateWindow(GetHwnd()) )
     {
-        wxLogLastError(wxT("UpdateWindow"));
+        wxLogLastError(_T("UpdateWindow"));
     }
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
@@ -1721,11 +1736,11 @@ void wxWindowMSW::DoSetToolTip(wxToolTip *tooltip)
 
 bool wxWindowMSW::IsSizeDeferred() const
 {
-#if wxUSE_DEFERRED_SIZING
+#if USE_DEFERRED_SIZING
     if ( m_pendingPosition != wxDefaultPosition ||
          m_pendingSize     != wxDefaultSize )
         return true;
-#endif // wxUSE_DEFERRED_SIZING
+#endif // USE_DEFERRED_SIZING
 
     return false;
 }
@@ -1733,7 +1748,7 @@ bool wxWindowMSW::IsSizeDeferred() const
 // Get total size
 void wxWindowMSW::DoGetSize(int *x, int *y) const
 {
-#if wxUSE_DEFERRED_SIZING
+#if USE_DEFERRED_SIZING
     // if SetSize() had been called at wx level but not realized at Windows
     // level yet (i.e. EndDeferWindowPos() not called), we still should return
     // the new and not the old position to the other wx code
@@ -1745,7 +1760,7 @@ void wxWindowMSW::DoGetSize(int *x, int *y) const
             *y = m_pendingSize.y;
     }
     else // use current size
-#endif // wxUSE_DEFERRED_SIZING
+#endif // USE_DEFERRED_SIZING
     {
         RECT rect = wxGetWindowRect(GetHwnd());
 
@@ -1759,22 +1774,10 @@ void wxWindowMSW::DoGetSize(int *x, int *y) const
 // Get size *available for subwindows* i.e. excluding menu bar etc.
 void wxWindowMSW::DoGetClientSize(int *x, int *y) const
 {
-#if wxUSE_DEFERRED_SIZING
+#if USE_DEFERRED_SIZING
     if ( m_pendingSize != wxDefaultSize )
     {
         // we need to calculate the client size corresponding to pending size
-        //
-        // FIXME: Unfortunately this doesn't work correctly for the maximized
-        //        top level windows, the returned values are too small (e.g.
-        //        under Windows 7 on a 1600*1200 screen with task bar on the
-        //        right the pending size for a maximized window is 1538*1200
-        //        and WM_NCCALCSIZE returns 1528*1172 even though the correct
-        //        client size of such window is 1538*1182). No idea how to fix
-        //        it though, setting WS_MAXIMIZE in GWL_STYLE before calling
-        //        WM_NCCALCSIZE doesn't help and AdjustWindowRectEx() doesn't
-        //        work in this direction neither. So we just have to live with
-        //        the slightly wrong results and relayout the window when it
-        //        gets finally shown in its maximized state (see #11762).
         RECT rect;
         rect.left = m_pendingPosition.x;
         rect.top = m_pendingPosition.y;
@@ -1789,7 +1792,7 @@ void wxWindowMSW::DoGetClientSize(int *x, int *y) const
             *y = rect.bottom - rect.top;
     }
     else
-#endif // wxUSE_DEFERRED_SIZING
+#endif // USE_DEFERRED_SIZING
     {
         RECT rect = wxGetClientRect(GetHwnd());
 
@@ -1798,15 +1801,6 @@ void wxWindowMSW::DoGetClientSize(int *x, int *y) const
         if ( y )
             *y = rect.bottom;
     }
-
-    // The size of the client window can't be negative but ::GetClientRect()
-    // can return negative size for an extremely small (1x1) window with
-    // borders so ensure that we correct it here as having negative sizes is
-    // completely unexpected.
-    if ( x && *x < 0 )
-        *x = 0;
-    if ( y && *y < 0 )
-        *y = 0;
 }
 
 void wxWindowMSW::DoGetPosition(int *x, int *y) const
@@ -1814,13 +1808,11 @@ void wxWindowMSW::DoGetPosition(int *x, int *y) const
     wxWindow * const parent = GetParent();
 
     wxPoint pos;
-#if wxUSE_DEFERRED_SIZING
     if ( m_pendingPosition != wxDefaultPosition )
     {
         pos = m_pendingPosition;
     }
     else // use current position
-#endif // wxUSE_DEFERRED_SIZING
     {
         RECT rect = wxGetWindowRect(GetHwnd());
 
@@ -1901,7 +1893,7 @@ void wxWindowMSW::DoClientToScreen(int *x, int *y) const
 bool
 wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
 {
-#if wxUSE_DEFERRED_SIZING
+#if USE_DEFERRED_SIZING
     // if our parent had prepared a defer window handle for us, use it (unless
     // we are a top level window)
     wxWindowMSW * const parent = IsTopLevel() ? NULL : GetParent();
@@ -1913,7 +1905,7 @@ wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
                                 SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOACTIVATE);
         if ( !hdwp )
         {
-            wxLogLastError(wxT("DeferWindowPos"));
+            wxLogLastError(_T("DeferWindowPos"));
         }
     }
 
@@ -1931,13 +1923,13 @@ wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
     }
 
     // otherwise (or if deferring failed) move the window in place immediately
-#endif // wxUSE_DEFERRED_SIZING
+#endif // USE_DEFERRED_SIZING
     if ( !::MoveWindow((HWND)hwnd, x, y, width, height, IsShown()) )
     {
         wxLogLastError(wxT("MoveWindow"));
     }
 
-    // if wxUSE_DEFERRED_SIZING, indicates that we didn't use deferred move,
+    // if USE_DEFERRED_SIZING, indicates that we didn't use deferred move,
     // ignored otherwise
     return false;
 }
@@ -1953,7 +1945,7 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
 
     if ( DoMoveSibling(m_hWnd, x, y, width, height) )
     {
-#if wxUSE_DEFERRED_SIZING
+#if USE_DEFERRED_SIZING
         m_pendingPosition = wxPoint(x, y);
         m_pendingSize = wxSize(width, height);
     }
@@ -1961,7 +1953,7 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
     {
         m_pendingPosition = wxDefaultPosition;
         m_pendingSize = wxDefaultSize;
-#endif // wxUSE_DEFERRED_SIZING
+#endif // USE_DEFERRED_SIZING
     }
 }
 
@@ -1988,12 +1980,6 @@ void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
          width == currentW && height == currentH &&
             !(sizeFlags & wxSIZE_FORCE) )
     {
-        if (sizeFlags & wxSIZE_FORCE_EVENT)
-        {
-            wxSizeEvent event( wxSize(width,height), GetId() );
-            event.SetEventObject( this );
-            HandleWindowEvent( event );
-        }
         return;
     }
 
@@ -2009,7 +1995,7 @@ void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
         {
-            size = GetBestSize();
+            size = DoGetBestSize();
             width = size.x;
         }
         else
@@ -2025,9 +2011,9 @@ void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         {
             if ( size.x == wxDefaultCoord )
             {
-                size = GetBestSize();
+                size = DoGetBestSize();
             }
-            //else: already called GetBestSize() above
+            //else: already called DoGetBestSize() above
 
             height = size.y;
         }
@@ -2099,41 +2085,11 @@ void wxWindowMSW::DoSetClientSize(int width, int height)
                            height + heightWin - rectClient.bottom,
                            TRUE) )
         {
-            wxLogLastError(wxT("MoveWindow"));
+            wxLogLastError(_T("MoveWindow"));
         }
     }
 }
 
-wxSize wxWindowMSW::DoGetBorderSize() const
-{
-    wxCoord border;
-    switch ( GetBorder() )
-    {
-        case wxBORDER_STATIC:
-        case wxBORDER_SIMPLE:
-            border = 1;
-            break;
-
-        case wxBORDER_SUNKEN:
-            border = 2;
-            break;
-
-        case wxBORDER_RAISED:
-        case wxBORDER_DOUBLE:
-            border = 3;
-            break;
-
-        default:
-            wxFAIL_MSG( wxT("unknown border style") );
-            // fall through
-
-        case wxBORDER_NONE:
-            border = 0;
-    }
-
-    return 2*wxSize(border, border);
-}
-
 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
@@ -2154,27 +2110,26 @@ int wxWindowMSW::GetCharWidth() const
 #endif
 }
 
-void wxWindowMSW::DoGetTextExtent(const wxString& string,
-                                  int *x, int *y,
-                                  int *descent,
-                                  int *externalLeading,
-                                  const wxFont *fontToUse) const
+void wxWindowMSW::GetTextExtent(const wxString& string,
+                             int *x, int *y,
+                             int *descent, int *externalLeading,
+                             const wxFont *theFont) const
 {
-    wxASSERT_MSG( !fontToUse || fontToUse->IsOk(),
-                    wxT("invalid font in GetTextExtent()") );
+    wxASSERT_MSG( !theFont || theFont->Ok(),
+                    _T("invalid font in GetTextExtent()") );
 
-    HFONT hfontToUse;
-    if ( fontToUse )
-        hfontToUse = GetHfontOf(*fontToUse);
+    wxFont fontToUse;
+    if (theFont)
+        fontToUse = *theFont;
     else
-        hfontToUse = GetHfontOf(GetFont());
+        fontToUse = GetFont();
 
     WindowHDC hdc(GetHwnd());
-    SelectInHDC selectFont(hdc, hfontToUse);
+    SelectInHDC selectFont(hdc, GetHfontOf(fontToUse));
 
     SIZE sizeRect;
     TEXTMETRIC tm;
-    ::GetTextExtentPoint32(hdc, string.t_str(), string.length(), &sizeRect);
+    ::GetTextExtentPoint32(hdc, string, string.length(), &sizeRect);
     GetTextMetrics(hdc, &tm);
 
     if ( x )
@@ -2222,18 +2177,22 @@ static void wxYieldForCommandsOnly()
 
 bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
 {
+    menu->SetInvokingWindow(this);
     menu->UpdateUI();
 
-    wxPoint pt;
     if ( x == wxDefaultCoord && y == wxDefaultCoord )
     {
-        pt = wxGetMousePosition();
-    }
-    else
-    {
-        pt = ClientToScreen(wxPoint(x, y));
+        wxPoint mouse = ScreenToClient(wxGetMousePosition());
+        x = mouse.x; y = mouse.y;
     }
 
+    HWND hWnd = GetHwnd();
+    HMENU hMenu = GetHmenuOf(menu);
+    POINT point;
+    point.x = x;
+    point.y = y;
+    ::ClientToScreen(hWnd, &point);
+    wxCurrentPopupMenu = menu;
 #if defined(__WXWINCE__)
     static const UINT flags = 0;
 #else // !__WXWINCE__
@@ -2251,7 +2210,7 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
     }
 #endif // __WXWINCE__/!__WXWINCE__
 
-    ::TrackPopupMenu(GetHmenuOf(menu), flags, pt.x, pt.y, 0, GetHwnd(), NULL);
+    ::TrackPopupMenu(hMenu, flags, point.x, point.y, 0, hWnd, NULL);
 
     // we need to do it right now as otherwise the events are never going to be
     // sent to wxCurrentPopupMenu from HandleCommand()
@@ -2262,6 +2221,10 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
     // for example) and so we do need to process the event immediately
     wxYieldForCommandsOnly();
 
+    wxCurrentPopupMenu = NULL;
+
+    menu->SetInvokingWindow(NULL);
+
     return true;
 }
 
@@ -2273,23 +2236,10 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
 
 WXLRESULT wxWindowMSW::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
-    WXLRESULT rc;
     if ( m_oldWndProc )
-        rc = ::CallWindowProc(CASTWNDPROC m_oldWndProc, GetHwnd(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+        return ::CallWindowProc(CASTWNDPROC m_oldWndProc, GetHwnd(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
     else
-        rc = ::DefWindowProc(GetHwnd(), nMsg, wParam, lParam);
-
-    // Special hack used by wxTextEntry auto-completion only: this event is
-    // sent after the normal keyboard processing so that its handler could use
-    // the updated contents of the text control, after taking the key that was
-    // pressed into account.
-    if ( nMsg == WM_CHAR )
-    {
-        wxKeyEvent event(CreateCharEvent(wxEVT_AFTER_CHAR, wParam, lParam));
-        HandleWindowEvent(event);
-    }
-
-    return rc;
+        return ::DefWindowProc(GetHwnd(), nMsg, wParam, lParam);
 }
 
 bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
@@ -2313,7 +2263,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
             // combinations which are always processed)
             LONG lDlgCode = ::SendMessage(msg->hwnd, WM_GETDLGCODE, 0, 0);
 
-            // surprisingly, DLGC_WANTALLKEYS bit mask doesn't contain the
+            // surprizingly, DLGC_WANTALLKEYS bit mask doesn't contain the
             // DLGC_WANTTAB nor DLGC_WANTARROWS bits although, logically,
             // it, of course, implies them
             if ( lDlgCode & DLGC_WANTALLKEYS )
@@ -2374,6 +2324,13 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
 
                 case VK_RETURN:
                     {
+                        if ( (lDlgCode & DLGC_WANTMESSAGE) && !bCtrlDown )
+                        {
+                            // control wants to process Enter itself, don't
+                            // call IsDialogMessage() which would consume it
+                            return false;
+                        }
+
 #if wxUSE_BUTTON
                         // currently active button should get enter press even
                         // if there is a default button elsewhere so check if
@@ -2388,54 +2345,16 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                             if ( (style & BS_OWNERDRAW) == BS_OWNERDRAW )
                             {
                                 // emulate the button click
-                                btn = wxFindWinFromHandle(msg->hwnd);
+                                btn = wxFindWinFromHandle((WXHWND)msg->hwnd);
                             }
+
+                            bProcess = false;
                         }
                         else // not a button itself, do we have default button?
                         {
-                            // check if this window or any of its ancestors
-                            // wants the message for itself (we always reserve
-                            // Ctrl-Enter for dialog navigation though)
-                            wxWindow *win = this;
-                            if ( !bCtrlDown )
-                            {
-                                // this will contain the dialog code of this
-                                // window and all of its parent windows in turn
-                                LONG lDlgCode2 = lDlgCode;
-
-                                while ( win )
-                                {
-                                    if ( lDlgCode2 & DLGC_WANTMESSAGE )
-                                    {
-                                        // as it wants to process Enter itself,
-                                        // don't call IsDialogMessage() which
-                                        // would consume it
-                                        return false;
-                                    }
-
-                                    // don't propagate keyboard messages beyond
-                                    // the first top level window parent
-                                    if ( win->IsTopLevel() )
-                                        break;
-
-                                    win = win->GetParent();
-
-                                    lDlgCode2 = ::SendMessage
-                                                  (
-                                                    GetHwndOf(win),
-                                                    WM_GETDLGCODE,
-                                                    0,
-                                                    0
-                                                  );
-                                }
-                            }
-                            else // bCtrlDown
-                            {
-                                win = wxGetTopLevelParent(win);
-                            }
-
-                            wxTopLevelWindow * const
-                                tlw = wxDynamicCast(win, wxTopLevelWindow);
+                            wxTopLevelWindow *
+                                tlw = wxDynamicCast(wxGetTopLevelParent(this),
+                                                    wxTopLevelWindow);
                             if ( tlw )
                             {
                                 btn = wxDynamicCast(tlw->GetDefaultItem(),
@@ -2449,20 +2368,13 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                             return true;
                         }
 
-                        // This "Return" key press won't be actually used for
-                        // navigation so don't generate wxNavigationKeyEvent
-                        // for it but still pass it to IsDialogMessage() as it
-                        // may handle it in some other way (e.g. by playing the
-                        // default error sound).
-                        bProcess = false;
-
 #endif // wxUSE_BUTTON
 
 #ifdef __WXWINCE__
                         // map Enter presses into button presses on PDAs
                         wxJoystickEvent event(wxEVT_JOY_BUTTON_DOWN);
                         event.SetEventObject(this);
-                        if ( HandleWindowEvent(event) )
+                        if ( GetEventHandler()->ProcessEvent(event) )
                             return true;
 #endif // __WXWINCE__
                     }
@@ -2480,7 +2392,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                 event.SetFromTab(bFromTab);
                 event.SetEventObject(this);
 
-                if ( HandleWindowEvent(event) )
+                if ( GetEventHandler()->ProcessEvent(event) )
                 {
                     // as we don't call IsDialogMessage(), which would take of
                     // this by default, we need to manually send this message
@@ -2570,8 +2482,9 @@ bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg)
               node = node->GetNext() )
         {
             wxWindow * const win = node->GetData();
-            if ( win->CanAcceptFocus() &&
-                    !wxHasWindowExStyle(win, WS_EX_CONTROLPARENT) )
+            if ( win->AcceptsFocus() &&
+                    !(::GetWindowLong(GetHwndOf(win), GWL_EXSTYLE) &
+                        WS_EX_CONTROLPARENT) )
             {
                 // it shouldn't hang...
                 canSafelyCallIsDlgMsg = true;
@@ -2680,20 +2593,14 @@ wxWindowCreationHook::~wxWindowCreationHook()
 // Main window proc
 LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    // trace all messages: useful for the debugging but noticeably slows down
-    // the code so don't do it by default
-#if wxDEBUG_LEVEL >= 2
-    // notice that we cast wParam and lParam to long to avoid mismatch with
-    // format specifiers in 64 bit builds where they are both int64 quantities
-    //
-    // casting like this loses information, of course, but it shouldn't matter
-    // much for this diagnostic code and it keeps the code simple
-    wxLogTrace("winmsg",
-               wxT("Processing %s(hWnd=%p, wParam=%08lx, lParam=%08lx)"),
-               wxGetMessageName(message), hWnd, (long)wParam, (long)lParam);
-#endif // wxDEBUG_LEVEL >= 2
+    // trace all messages - useful for the debugging
+#ifdef __WXDEBUG__
+    wxLogTrace(wxTraceMessages,
+               wxT("Processing %s(hWnd=%08lx, wParam=%8lx, lParam=%8lx)"),
+               wxGetMessageName(message), (long)hWnd, (long)wParam, lParam);
+#endif // __WXDEBUG__
 
-    wxWindowMSW *wnd = wxFindWinFromHandle(hWnd);
+    wxWindowMSW *wnd = wxFindWinFromHandle((WXHWND) hWnd);
 
     // when we get the first message for the HWND we just created, we associate
     // it with wxWindow stored in gs_winBeingCreated
@@ -2707,7 +2614,7 @@ LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM w
 
     LRESULT rc;
 
-    if ( wnd && wxGUIEventLoop::AllowProcessing(wnd) )
+    if ( wnd && wxEventLoop::AllowProcessing(wnd) )
         rc = wnd->MSWWindowProc(message, wParam, lParam);
     else
         rc = ::DefWindowProc(hWnd, message, wParam, lParam);
@@ -2715,11 +2622,7 @@ LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM w
     return rc;
 }
 
-bool
-wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
-                              WXUINT message,
-                              WXWPARAM wParam,
-                              WXLPARAM lParam)
+WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     // did we process the message?
     bool processed = false;
@@ -2784,18 +2687,6 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
             }
             break;
 
-        case WM_ENTERSIZEMOVE:
-            {
-                processed = HandleEnterSizeMove();
-            }
-            break;
-
-        case WM_EXITSIZEMOVE:
-            {
-                processed = HandleExitSizeMove();
-            }
-            break;
-
         case WM_SIZING:
             {
                 LPRECT pRect = (LPRECT)lParam;
@@ -2833,11 +2724,11 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
             break;
 
         case WM_SETFOCUS:
-            processed = HandleSetFocus((WXHWND)wParam);
+            processed = HandleSetFocus((WXHWND)(HWND)wParam);
             break;
 
         case WM_KILLFOCUS:
-            processed = HandleKillFocus((WXHWND)wParam);
+            processed = HandleKillFocus((WXHWND)(HWND)wParam);
             break;
 
         case WM_PRINTCLIENT:
@@ -2898,13 +2789,9 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 
 #if wxUSE_MOUSEWHEEL
         case WM_MOUSEWHEEL:
-            processed = HandleMouseWheel(wxMOUSE_WHEEL_VERTICAL, wParam, lParam);
+            processed = HandleMouseWheel(wParam, lParam);
             break;
-
-        case WM_MOUSEHWHEEL:
-            processed = HandleMouseWheel(wxMOUSE_WHEEL_HORIZONTAL, wParam, lParam);
-            break;
-#endif // wxUSE_MOUSEWHEEL
+#endif
 
         case WM_LBUTTONDOWN:
         case WM_LBUTTONUP:
@@ -2915,11 +2802,6 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
         case WM_MBUTTONDOWN:
         case WM_MBUTTONUP:
         case WM_MBUTTONDBLCLK:
-#ifdef wxHAS_XBUTTON
-        case WM_XBUTTONDOWN:
-        case WM_XBUTTONUP:
-        case WM_XBUTTONDBLCLK:
-#endif // wxHAS_XBUTTON
             {
 #ifdef __WXMICROWIN__
                 // MicroWindows seems to ignore the fact that a window is
@@ -2963,7 +2845,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 
                     // this should never happen
                     wxCHECK_MSG( win, 0,
-                                 wxT("FindWindowForMouseEvent() returned NULL") );
+                                 _T("FindWindowForMouseEvent() returned NULL") );
                 }
 #ifdef __POCKETPC__
                 if (IsContextMenuEnabled() && message == WM_LBUTTONDOWN)
@@ -2986,7 +2868,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                         wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, GetId(), pt);
 
                         evtCtx.SetEventObject(this);
-                        if (HandleWindowEvent(evtCtx))
+                        if (GetEventHandler()->ProcessEvent(evtCtx))
                         {
                             processed = true;
                             return true;
@@ -3010,7 +2892,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                     // problems, so don't do it for them (unnecessary anyhow)
                     if ( !win->IsOfStandardClass() )
                     {
-                        if ( message == WM_LBUTTONDOWN && win->IsFocusable() )
+                        if ( message == WM_LBUTTONDOWN && win->AcceptsFocus() )
                             win->SetFocus();
                     }
                 }
@@ -3027,8 +2909,8 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
         case MM_JOY1BUTTONUP:
         case MM_JOY2BUTTONUP:
             processed = HandleJoystickEvent(message,
-                                            LOWORD(lParam),
-                                            HIWORD(lParam),
+                                            GET_X_LPARAM(lParam),
+                                            GET_Y_LPARAM(lParam),
                                             wParam);
             break;
 #endif // __WXMICROWIN__
@@ -3063,15 +2945,23 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
             // for these messages we must return true if process the message
 #ifdef WM_DRAWITEM
         case WM_DRAWITEM:
-            processed = MSWOnDrawItem(wParam, (WXDRAWITEMSTRUCT *)lParam);
-            if ( processed )
-                rc.result = TRUE;
-            break;
-
         case WM_MEASUREITEM:
-            processed = MSWOnMeasureItem(wParam, (WXMEASUREITEMSTRUCT *)lParam);
-            if ( processed )
-                rc.result = TRUE;
+            {
+                int idCtrl = (UINT)wParam;
+                if ( message == WM_DRAWITEM )
+                {
+                    processed = MSWOnDrawItem(idCtrl,
+                                              (WXDRAWITEMSTRUCT *)lParam);
+                }
+                else
+                {
+                    processed = MSWOnMeasureItem(idCtrl,
+                                                 (WXMEASUREITEMSTRUCT *)lParam);
+                }
+
+                if ( processed )
+                    rc.result = TRUE;
+            }
             break;
 #endif // defined(WM_DRAWITEM)
 
@@ -3096,36 +2986,32 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 
         case WM_SYSKEYDOWN:
         case WM_KEYDOWN:
-            // Generate the key down event in any case.
+            // If this has been processed by an event handler, return 0 now
+            // (we've handled it).
             m_lastKeydownProcessed = HandleKeyDown((WORD) wParam, lParam);
             if ( m_lastKeydownProcessed )
             {
-                // If it was processed by an event handler, we stop here,
-                // notably we intentionally don't generate char event then.
                 processed = true;
             }
-            else // key down event not handled
+
+            if ( !processed )
             {
-                // Examine the event to decide whether we need to generate a
-                // char event for it ourselves or let Windows do it. Window
-                // mostly only does it for the keys which produce printable
-                // characters (although there are exceptions, e.g. VK_ESCAPE or
-                // VK_BACK (but not VK_DELETE)) while we do it for all keys
-                // except the modifier ones (the wisdom of this is debatable
-                // but by now this decision is enshrined forever due to
-                // backwards compatibility).
                 switch ( wParam )
                 {
-                    // No wxEVT_CHAR events are generated for these keys at all.
+                    // we consider these messages "not interesting" to OnChar, so
+                    // just don't do anything more with them
                     case VK_SHIFT:
                     case VK_CONTROL:
                     case VK_MENU:
                     case VK_CAPITAL:
                     case VK_NUMLOCK:
                     case VK_SCROLL:
+                        processed = true;
+                        break;
 
-                    // Windows will send us WM_CHAR for these ones so we'll
-                    // generate wxEVT_CHAR for them later when we get it.
+                    // avoid duplicate messages to OnChar for these ASCII keys:
+                    // they will be translated by TranslateMessage() and received
+                    // in WM_CHAR
                     case VK_ESCAPE:
                     case VK_SPACE:
                     case VK_RETURN:
@@ -3153,11 +3039,14 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                     case VK_OEM_5:
                     case VK_OEM_6:
                     case VK_OEM_7:
-                    case VK_OEM_102:
                     case VK_OEM_PLUS:
                     case VK_OEM_COMMA:
                     case VK_OEM_MINUS:
                     case VK_OEM_PERIOD:
+                        // but set processed to false, not true to still pass them
+                        // to the control's default window proc - otherwise
+                        // built-in keyboard handling won't work
+                        processed = false;
                         break;
 
 #ifdef VK_APPS
@@ -3169,32 +3058,8 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 #endif // VK_APPS
 
                     default:
-                        if ( (wParam >= '0' && wParam <= '9') ||
-                                (wParam >= 'A' && wParam <= 'Z') )
-                        {
-                            // We'll get WM_CHAR for those later too.
-                            break;
-                        }
-
-                        // But for the rest we won't get WM_CHAR later so we do
-                        // need to generate the event right now.
-                        wxKeyEvent event(wxEVT_CHAR);
-                        InitAnyKeyEvent(event, wParam, lParam);
-
-                        // Set the "extended" bit in lParam because we want to
-                        // generate CHAR events with WXK_HOME and not
-                        // WXK_NUMPAD_HOME even if the "Home" key on numpad was
-                        // pressed.
-                        event.m_keyCode = wxMSWKeyboard::VKToWX
-                                          (
-                                            wParam,
-                                            lParam | (KF_EXTENDED << 16)
-                                          );
-
-                        // Don't produce events without any valid character
-                        // code (even if this shouldn't normally happen...).
-                        if ( event.m_keyCode != WXK_NONE )
-                            processed = HandleWindowEvent(event);
+                        // do generate a CHAR event
+                        processed = HandleChar((WORD)wParam, lParam);
                 }
             }
             if (message == WM_SYSKEYDOWN)  // Let Windows still handle the SYSKEYs
@@ -3228,33 +3093,16 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
             }
             else
             {
-                processed = HandleChar((WORD)wParam, lParam);
+                processed = HandleChar((WORD)wParam, lParam, true);
             }
             break;
 
-        case WM_IME_STARTCOMPOSITION:
-            // IME popup needs Escape as it should undo the changes in its
-            // entry window instead of e.g. closing the dialog for which the
-            // IME is used (and losing all the changes in the IME window).
-            gs_modalEntryWindowCount++;
-            break;
-
-        case WM_IME_ENDCOMPOSITION:
-            gs_modalEntryWindowCount--;
-            break;
-
 #if wxUSE_HOTKEY
         case WM_HOTKEY:
             processed = HandleHotKey((WORD)wParam, lParam);
             break;
 #endif // wxUSE_HOTKEY
 
-        case WM_CUT:
-        case WM_COPY:
-        case WM_PASTE:
-            processed = HandleClipboardEvent(message);
-            break;
-
         case WM_HSCROLL:
         case WM_VSCROLL:
             {
@@ -3300,11 +3148,11 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 #endif
 
         case WM_PALETTECHANGED:
-            processed = HandlePaletteChanged((WXHWND)wParam);
+            processed = HandlePaletteChanged((WXHWND) (HWND) wParam);
             break;
 
         case WM_CAPTURECHANGED:
-            processed = HandleCaptureChanged((WXHWND)lParam);
+            processed = HandleCaptureChanged((WXHWND) (HWND) lParam);
             break;
 
         case WM_SETTINGCHANGE:
@@ -3316,17 +3164,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
             break;
 
         case WM_ERASEBKGND:
-            {
-#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
-                // check if an override was configured for this window
-                EraseBgHooks::const_iterator it = gs_eraseBgHooks.find(this);
-                if ( it != gs_eraseBgHooks.end() )
-                    processed = it->second->MSWEraseBgHook((WXHDC)wParam);
-                else
-#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
-                    processed = HandleEraseBkgnd((WXHDC)wParam);
-            }
-
+            processed = HandleEraseBkgnd((WXHDC)(HDC)wParam);
             if ( processed )
             {
                 // we processed the message, i.e. erased the background
@@ -3341,7 +3179,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 #endif
 
         case WM_INITDIALOG:
-            processed = HandleInitDialog((WXHWND)wParam);
+            processed = HandleInitDialog((WXHWND)(HWND)wParam);
 
             if ( processed )
             {
@@ -3365,7 +3203,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 #endif
 
         case WM_SETCURSOR:
-            processed = HandleSetCursor((WXHWND)wParam,
+            processed = HandleSetCursor((WXHWND)(HWND)wParam,
                                         LOWORD(lParam),     // hit test
                                         HIWORD(lParam));    // mouse msg
 
@@ -3419,14 +3257,14 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                                 );
 
                     helpEvent.SetEventObject(this);
-                    HandleWindowEvent(helpEvent);
+                    GetEventHandler()->ProcessEvent(helpEvent);
 #ifndef __WXWINCE__
                 }
                 else if ( info->iContextType == HELPINFO_MENUITEM )
                 {
                     wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId);
                     helpEvent.SetEventObject(this);
-                    HandleWindowEvent(helpEvent);
+                    GetEventHandler()->ProcessEvent(helpEvent);
 
                 }
                 else // unknown help event?
@@ -3450,22 +3288,20 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                 // we could have got an event from our child, reflect it back
                 // to it if this is the case
                 wxWindowMSW *win = NULL;
-                WXHWND hWnd = (WXHWND)wParam;
-                if ( hWnd != m_hWnd )
+                if ( (WXHWND)wParam != m_hWnd )
                 {
-                    win = FindItemByHWND(hWnd);
+                    win = FindItemByHWND((WXHWND)wParam);
                 }
 
                 if ( !win )
                     win = this;
 
                 evtCtx.SetEventObject(win);
-                processed = win->HandleWindowEvent(evtCtx);
+                processed = win->GetEventHandler()->ProcessEvent(evtCtx);
             }
             break;
 #endif
 
-#if wxUSE_MENUS
         case WM_MENUCHAR:
             // we're only interested in our own menus, not MF_SYSMENU
             if ( HIWORD(wParam) == MF_POPUP )
@@ -3479,7 +3315,6 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                 }
             }
             break;
-#endif // wxUSE_MENUS
 
 #ifndef __WXWINCE__
         case WM_POWERBROADCAST:
@@ -3496,50 +3331,40 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
         case WM_NCCALCSIZE:
             {
                 wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
-                const wxBorder border = TranslateBorder(GetBorder());
-                if (theme && border == wxBORDER_THEME)
+                if (theme && TranslateBorder(GetBorder()) == wxBORDER_THEME)
                 {
                     // first ask the widget to calculate the border size
                     rc.result = MSWDefWindowProc(message, wParam, lParam);
                     processed = true;
 
-                    // now alter the client size making room for drawing a
-                    // themed border
-                    RECT *rect;
+                    // now alter the client size making room for drawing a themed border
                     NCCALCSIZE_PARAMS *csparam = NULL;
-                    if ( wParam )
+                    RECT rect;
+                    if (wParam)
                     {
-                        csparam = (NCCALCSIZE_PARAMS *)lParam;
-                        rect = &csparam->rgrc[0];
+                        csparam = (NCCALCSIZE_PARAMS*)lParam;
+                        rect = csparam->rgrc[0];
                     }
                     else
                     {
-                        rect = (RECT *)lParam;
+                        rect = *((RECT*)lParam);
                     }
-
-                    wxUxThemeHandle hTheme((const wxWindow *)this, L"EDIT");
+                    wxUxThemeHandle hTheme((const wxWindow*) this, L"EDIT");
                     RECT rcClient = { 0, 0, 0, 0 };
-                    wxClientDC dc((wxWindow *)this);
-                    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
+                    wxClientDC dc((wxWindow*) this);
 
-                    if ( theme->GetThemeBackgroundContentRect
-                                (
-                                 hTheme,
-                                 GetHdcOf(*impl),
-                                 EP_EDITTEXT,
-                                 ETS_NORMAL,
-                                 rect,
-                                 &rcClient) == S_OK )
+                    if (theme->GetThemeBackgroundContentRect(
+                            hTheme, GetHdcOf(dc), EP_EDITTEXT, ETS_NORMAL,
+                            &rect, &rcClient) == S_OK)
                     {
                         InflateRect(&rcClient, -1, -1);
                         if (wParam)
                             csparam->rgrc[0] = rcClient;
                         else
                             *((RECT*)lParam) = rcClient;
-
                         // WVR_REDRAW triggers a bug whereby child windows are moved up and left,
                         // so don't use.
-                        // rc.result = WVR_REDRAW;
+                        //rc.result = WVR_REDRAW;
                     }
                 }
             }
@@ -3548,16 +3373,14 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
         case WM_NCPAINT:
             {
                 wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
-                const wxBorder border = TranslateBorder(GetBorder());
-                if (theme && border == wxBORDER_THEME)
+                if (theme && TranslateBorder(GetBorder()) == wxBORDER_THEME)
                 {
                     // first ask the widget to paint its non-client area, such as scrollbars, etc.
                     rc.result = MSWDefWindowProc(message, wParam, lParam);
                     processed = true;
 
-                    wxUxThemeHandle hTheme((const wxWindow *)this, L"EDIT");
-                    wxWindowDC dc((wxWindow *)this);
-                    wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
+                    wxUxThemeHandle hTheme((const wxWindow*) this, L"EDIT");
+                    wxWindowDC dc((wxWindow*) this);
 
                     // Clip the DC so that you only draw on the non-client area
                     RECT rcBorder;
@@ -3565,16 +3388,16 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
 
                     RECT rcClient;
                     theme->GetThemeBackgroundContentRect(
-                        hTheme, GetHdcOf(*impl), EP_EDITTEXT, ETS_NORMAL, &rcBorder, &rcClient);
+                        hTheme, GetHdcOf(dc), EP_EDITTEXT, ETS_NORMAL, &rcBorder, &rcClient);
                     InflateRect(&rcClient, -1, -1);
 
-                    ::ExcludeClipRect(GetHdcOf(*impl), rcClient.left, rcClient.top,
+                    ::ExcludeClipRect(GetHdcOf(dc), rcClient.left, rcClient.top,
                                       rcClient.right, rcClient.bottom);
 
                     // Make sure the background is in a proper state
                     if (theme->IsThemeBackgroundPartiallyTransparent(hTheme, EP_EDITTEXT, ETS_NORMAL))
                     {
-                        theme->DrawThemeParentBackground(GetHwnd(), GetHdcOf(*impl), &rcBorder);
+                        theme->DrawThemeParentBackground(GetHwnd(), GetHdcOf(dc), &rcBorder);
                     }
 
                     // Draw the border
@@ -3586,88 +3409,63 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                     //    nState = ETS_READONLY;
                     else
                         nState = ETS_NORMAL;
-                    theme->DrawThemeBackground(hTheme, GetHdcOf(*impl), EP_EDITTEXT, nState, &rcBorder, NULL);
+                    theme->DrawThemeBackground(hTheme, GetHdcOf(dc), EP_EDITTEXT, nState, &rcBorder, NULL);
                 }
             }
             break;
 
 #endif // wxUSE_UXTHEME
 
-        default:
-            // try a custom message handler
-            const MSWMessageHandlers::const_iterator
-                i = gs_messageHandlers.find(message);
-            if ( i != gs_messageHandlers.end() )
-            {
-                processed = (*i->second)(this, message, wParam, lParam);
-            }
     }
 
     if ( !processed )
-        return false;
-
-    *result = rc.result;
-
-    return true;
-}
-
-WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-    WXLRESULT result;
-    if ( !MSWHandleMessage(&result, message, wParam, lParam) )
     {
-#if wxDEBUG_LEVEL >= 2
-        wxLogTrace("winmsg", wxT("Forwarding %s to DefWindowProc."),
+#ifdef __WXDEBUG__
+        wxLogTrace(wxTraceMessages, wxT("Forwarding %s to DefWindowProc."),
                    wxGetMessageName(message));
-#endif // wxDEBUG_LEVEL >= 2
-        result = MSWDefWindowProc(message, wParam, lParam);
+#endif // __WXDEBUG__
+        rc.result = MSWDefWindowProc(message, wParam, lParam);
     }
 
-    return result;
+    return rc.result;
 }
 
 // ----------------------------------------------------------------------------
 // wxWindow <-> HWND map
 // ----------------------------------------------------------------------------
 
-wxWindow *wxFindWinFromHandle(HWND hwnd)
+wxWinHashTable *wxWinHandleHash = NULL;
+
+wxWindow *wxFindWinFromHandle(WXHWND hWnd)
 {
-    WindowHandles::const_iterator i = gs_windowHandles.find(hwnd);
-    return i == gs_windowHandles.end() ? NULL : i->second;
+    return (wxWindow*)wxWinHandleHash->Get((long)hWnd);
 }
 
-void wxAssociateWinWithHandle(HWND hwnd, wxWindowMSW *win)
+void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win)
 {
-    // adding NULL hwnd is (first) surely a result of an error and
+    // adding NULL hWnd is (first) surely a result of an error and
     // (secondly) breaks menu command processing
-    wxCHECK_RET( hwnd != (HWND)NULL,
-                 wxT("attempt to add a NULL hwnd to window list ignored") );
+    wxCHECK_RET( hWnd != (HWND)NULL,
+                 wxT("attempt to add a NULL hWnd to window list ignored") );
 
-#if wxDEBUG_LEVEL
-    WindowHandles::const_iterator i = gs_windowHandles.find(hwnd);
-    if ( i != gs_windowHandles.end() )
+    wxWindow *oldWin = wxFindWinFromHandle((WXHWND) hWnd);
+#ifdef __WXDEBUG__
+    if ( oldWin && (oldWin != win) )
     {
-        if ( i->second != win )
-        {
-            wxFAIL_MSG(
-                wxString::Format(
-                    wxT("HWND %p already associated with another window (%s)"),
-                    hwnd, win->GetClassInfo()->GetClassName()
-                )
-            );
-        }
-        //else: this actually happens currently because we associate the window
-        //      with its HWND during creation (if we create it) and also when
-        //      SubclassWin() is called later, this is ok
+        wxLogDebug(wxT("HWND %X already associated with another window (%s)"),
+                   (int) hWnd, win->GetClassInfo()->GetClassName());
+    }
+    else
+#endif // __WXDEBUG__
+    if (!oldWin)
+    {
+        wxWinHandleHash->Put((long)hWnd, (wxWindow *)win);
     }
-#endif // wxDEBUG_LEVEL
-
-    gs_windowHandles[hwnd] = (wxWindow *)win;
 }
 
 void wxRemoveHandleAssociation(wxWindowMSW *win)
 {
-    gs_windowHandles.erase(GetHwndOf(win));
+    wxWinHandleHash->Delete((long)win->GetHWND());
 }
 
 // ----------------------------------------------------------------------------
@@ -3680,22 +3478,33 @@ void wxWindowMSW::MSWDestroyWindow()
 {
 }
 
-void wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
+bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
                                            const wxSize& size,
                                            int& x, int& y,
                                            int& w, int& h) const
 {
-    // CW_USEDEFAULT can't be used for child windows so just position them at
-    // the origin by default
-    x = pos.x == wxDefaultCoord ? 0 : pos.x;
-    y = pos.y == wxDefaultCoord ? 0 : pos.y;
+    // yes, those are just some arbitrary hardcoded numbers
+    static const int DEFAULT_Y = 200;
 
-    AdjustForParentClientOrigin(x, y);
+    bool nonDefault = false;
 
-    // We don't have any clearly good choice for the size by default neither
-    // but we must use something non-zero.
-    w = WidthDefault(size.x);
-    h = HeightDefault(size.y);
+    if ( pos.x == wxDefaultCoord )
+    {
+        // if x is set to CW_USEDEFAULT, y parameter is ignored anyhow so we
+        // can just as well set it to CW_USEDEFAULT as well
+        x =
+        y = CW_USEDEFAULT;
+    }
+    else
+    {
+        // OTOH, if x is not set to CW_USEDEFAULT, y shouldn't be set to it
+        // neither because it is not handled as a special value by Windows then
+        // and so we have to choose some default value for it
+        x = pos.x;
+        y = pos.y == wxDefaultCoord ? DEFAULT_Y : pos.y;
+
+        nonDefault = true;
+    }
 
     /*
       NB: there used to be some code here which set the initial size of the
@@ -3713,6 +3522,49 @@ void wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
           this and ignore any attempts to change the window size to the size it
           already has - so no WM_SIZE would be sent.
      */
+
+
+    // we don't use CW_USEDEFAULT here for several reasons:
+    //
+    //  1. it results in huge frames on modern screens (1000*800 is not
+    //     uncommon on my 1280*1024 screen) which is way too big for a half
+    //     empty frame of most of wxWidgets samples for example)
+    //
+    //  2. it is buggy for frames with wxFRAME_TOOL_WINDOW style for which
+    //     the default is for whatever reason 8*8 which breaks client <->
+    //     window size calculations (it would be nice if it didn't, but it
+    //     does and the simplest way to fix it seemed to change the broken
+    //     default size anyhow)
+    //
+    //  3. there is just no advantage in doing it: with x and y it is
+    //     possible that [future versions of] Windows position the new top
+    //     level window in some smart way which we can't do, but we can
+    //     guess a reasonably good size for a new window just as well
+    //     ourselves
+
+    // However, on PocketPC devices, we must use the default
+    // size if possible.
+#ifdef _WIN32_WCE
+    if (size.x == wxDefaultCoord)
+        w = CW_USEDEFAULT;
+    else
+        w = size.x;
+    if (size.y == wxDefaultCoord)
+        h = CW_USEDEFAULT;
+    else
+        h = size.y;
+#else
+    if ( size.x == wxDefaultCoord || size.y == wxDefaultCoord)
+    {
+        nonDefault = true;
+    }
+    w = WidthDefault(size.x);
+    h = HeightDefault(size.y);
+#endif
+
+    AdjustForParentClientOrigin(x, y);
+
+    return nonDefault;
 }
 
 WXHWND wxWindowMSW::MSWGetParent() const
@@ -3731,12 +3583,11 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
     // non-default ctor and Create() is called too, we'd create 2 HWND for a
     // single wxWindow object and this results in all sorts of trouble,
     // especially for wxTLWs
-    wxCHECK_MSG( !m_hWnd, true, "window can't be recreated" );
+    wxCHECK_MSG( !m_hWnd, true, wxT("window can't be recreated") );
 
     // this can happen if this function is called using the return value of
     // wxApp::GetRegisteredClassName() which failed
-    wxCHECK_MSG( wclass, false, "failed to register window class?" );
-
+    wxCHECK_MSG( wclass, false, wxT("failed to register window class?") );
 
     // choose the position/size for the new window
     int x, y, w, h;
@@ -3752,7 +3603,7 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
     wxString className(wclass);
     if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) )
     {
-        className += wxApp::GetNoRedrawClassSuffix();
+        className += wxT("NR");
     }
 
     // do create the window
@@ -3761,12 +3612,12 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         extendedStyle,
-                        className.t_str(),
-                        title ? title : m_windowName.t_str(),
+                        className,
+                        title ? title : m_windowName.c_str(),
                         style,
                         x, y, w, h,
                         (HWND)MSWGetParent(),
-                        (HMENU)wxUIntToPtr(controlId),
+                        (HMENU)controlId,
                         wxGetInstance(),
                         NULL                        // no extra data
                        );
@@ -3796,7 +3647,7 @@ bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #ifndef __WXMICROWIN__
     LPNMHDR hdr = (LPNMHDR)lParam;
     HWND hWnd = hdr->hwndFrom;
-    wxWindow *win = wxFindWinFromHandle(hWnd);
+    wxWindow *win = wxFindWinFromHandle((WXHWND)hWnd);
 
     // if the control is one of our windows, let it handle the message itself
     if ( win )
@@ -3882,7 +3733,7 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
                     (
                         CP_ACP,
                         0,                      // no flags
-                        ttip.t_str(),
+                        ttip,
                         tipLength,
                         buf,
                         WXSIZEOF(buf) - 1
@@ -3890,7 +3741,7 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
 
         if ( !len )
         {
-            wxLogLastError(wxT("MultiByteToWideChar()"));
+            wxLogLastError(_T("MultiByteToWideChar()"));
         }
 
         buf[len] = L'\0';
@@ -3903,7 +3754,8 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
         // if we got TTN_NEEDTEXTW in Unicode build: in this case we just have
         // to copy the string we have into the buffer
         static wxChar buf[513];
-        wxStrlcpy(buf, ttip.c_str(), WXSIZEOF(buf));
+        wxStrncpy(buf, ttip.c_str(), WXSIZEOF(buf) - 1);
+        buf[WXSIZEOF(buf) - 1] = _T('\0');
         ttText->lpszText = buf;
     }
 
@@ -4008,13 +3860,16 @@ bool wxWindowMSW::HandleCreate(WXLPCREATESTRUCT WXUNUSED_IN_WINCE(cs),
 
 bool wxWindowMSW::HandleDestroy()
 {
+    SendDestroyEvent();
+
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
     if ( m_dropTarget != NULL )
     {
         m_dropTarget->Revoke(m_hWnd);
 
-        wxDELETE(m_dropTarget);
+        delete m_dropTarget;
+        m_dropTarget = NULL;
     }
 #endif // wxUSE_DRAG_AND_DROP
 
@@ -4035,7 +3890,7 @@ bool wxWindowMSW::HandleActivate(int state,
                           m_windowId);
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleSetFocus(WXHWND hwnd)
@@ -4050,7 +3905,7 @@ bool wxWindowMSW::HandleSetFocus(WXHWND hwnd)
     // notify the parent keeping track of focus for the kbd navigation
     // purposes that we got it
     wxChildFocusEvent eventFocus((wxWindow *)this);
-    (void)HandleWindowEvent(eventFocus);
+    (void)GetEventHandler()->ProcessEvent(eventFocus);
 
 #if wxUSE_CARET
     // Deal with caret
@@ -4060,13 +3915,22 @@ bool wxWindowMSW::HandleSetFocus(WXHWND hwnd)
     }
 #endif // wxUSE_CARET
 
+#if wxUSE_TEXTCTRL
+    // If it's a wxTextCtrl don't send the event as it will be done
+    // after the control gets to process it from EN_FOCUS handler
+    if ( wxDynamicCastThis(wxTextCtrl) )
+    {
+        return false;
+    }
+#endif // wxUSE_TEXTCTRL
+
     wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
     event.SetEventObject(this);
 
     // wxFindWinFromHandle() may return NULL, it is ok
     event.SetWindow(wxFindWinFromHandle(hwnd));
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleKillFocus(WXHWND hwnd)
@@ -4079,6 +3943,16 @@ bool wxWindowMSW::HandleKillFocus(WXHWND hwnd)
     }
 #endif // wxUSE_CARET
 
+#if wxUSE_TEXTCTRL
+    // If it's a wxTextCtrl don't send the event as it will be done
+    // after the control gets to process it.
+    wxTextCtrl *ctrl = wxDynamicCastThis(wxTextCtrl);
+    if ( ctrl )
+    {
+        return false;
+    }
+#endif
+
     // Don't send the event when in the process of being deleted.  This can
     // only cause problems if the event handler tries to access the object.
     if ( m_isBeingDeleted )
@@ -4092,7 +3966,7 @@ bool wxWindowMSW::HandleKillFocus(WXHWND hwnd)
     // wxFindWinFromHandle() may return NULL, it is ok
     event.SetWindow(wxFindWinFromHandle(hwnd));
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 // ---------------------------------------------------------------------------
@@ -4118,7 +3992,7 @@ bool wxWindowMSW::HandleShow(bool show, int WXUNUSED(status))
     wxShowEvent event(GetId(), show);
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleInitDialog(WXHWND WXUNUSED(hWndFocus))
@@ -4126,7 +4000,7 @@ bool wxWindowMSW::HandleInitDialog(WXHWND WXUNUSED(hWndFocus))
     wxInitDialogEvent event(GetId());
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
@@ -4167,7 +4041,7 @@ bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
 
     DragFinish(hFilesInfo);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 #endif
 }
 
@@ -4178,54 +4052,68 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
 {
 #ifndef __WXMICROWIN__
     // the logic is as follows:
-    //  0. if we're busy, set the busy cursor (even for non client elements)
-    //  1. don't set custom cursor for non client area of enabled windows
-    //  2. ask user EVT_SET_CURSOR handler for the cursor
-    //  3. if still no cursor but we're in a TLW, set the global cursor
+    // -1. don't set cursor for non client area, including but not limited to
+    //     the title bar, scrollbars, &c
+    //  0. allow the user to override default behaviour by using EVT_SET_CURSOR
+    //  1. if we have the cursor set it unless wxIsBusy()
+    //  2. if we're a top level window, set some cursor anyhow
+    //  3. if wxIsBusy(), set the busy cursor, otherwise the global one
+
+    if ( nHitTest != HTCLIENT )
+    {
+        return false;
+    }
 
     HCURSOR hcursor = 0;
-    if ( wxIsBusy() )
+
+    // first ask the user code - it may wish to set the cursor in some very
+    // specific way (for example, depending on the current position)
+    POINT pt;
+#ifdef __WXWINCE__
+    if ( !::GetCursorPosWinCE(&pt))
+#else
+    if ( !::GetCursorPos(&pt) )
+#endif
     {
-        hcursor = wxGetCurrentBusyCursor();
+        wxLogLastError(wxT("GetCursorPos"));
     }
-    else // not busy
+
+    int x = pt.x,
+        y = pt.y;
+    ScreenToClient(&x, &y);
+    wxSetCursorEvent event(x, y);
+    event.SetId(GetId());
+    event.SetEventObject(this);
+
+    bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
+    if ( processedEvtSetCursor && event.HasCursor() )
     {
-        if ( nHitTest != HTCLIENT )
-            return false;
+        hcursor = GetHcursorOf(event.GetCursor());
+    }
 
-        // first ask the user code - it may wish to set the cursor in some very
-        // specific way (for example, depending on the current position)
-        POINT pt;
-        wxGetCursorPosMSW(&pt);
+    if ( !hcursor )
+    {
+        bool isBusy = wxIsBusy();
 
-        int x = pt.x,
-            y = pt.y;
-        ScreenToClient(&x, &y);
-        wxSetCursorEvent event(x, y);
-        event.SetId(GetId());
-        event.SetEventObject(this);
-
-        bool processedEvtSetCursor = HandleWindowEvent(event);
-        if ( processedEvtSetCursor && event.HasCursor() )
+        // the test for processedEvtSetCursor is here to prevent using m_cursor
+        // if the user code caught EVT_SET_CURSOR() and returned nothing from
+        // it - this is a way to say that our cursor shouldn't be used for this
+        // point
+        if ( !processedEvtSetCursor && m_cursor.Ok() )
         {
-            hcursor = GetHcursorOf(event.GetCursor());
+            hcursor = GetHcursorOf(m_cursor);
         }
 
-        if ( !hcursor )
+        if ( !GetParent() )
         {
-            // the test for processedEvtSetCursor is here to prevent using
-            // m_cursor if the user code caught EVT_SET_CURSOR() and returned
-            // nothing from it - this is a way to say that our cursor shouldn't
-            // be used for this point
-            if ( !processedEvtSetCursor && m_cursor.IsOk() )
+            if ( isBusy )
             {
-                hcursor = GetHcursorOf(m_cursor);
+                hcursor = wxGetCurrentBusyCursor();
             }
-
-            if ( !hcursor && !GetParent() )
+            else if ( !hcursor )
             {
                 const wxCursor *cursor = wxGetGlobalCursor();
-                if ( cursor && cursor->IsOk() )
+                if ( cursor && cursor->Ok() )
                 {
                     hcursor = GetHcursorOf(*cursor);
                 }
@@ -4233,9 +4121,10 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
         }
     }
 
-
     if ( hcursor )
     {
+//        wxLogDebug("HandleSetCursor: Setting cursor %ld", (long) hcursor);
+
         ::SetCursor(hcursor);
 
         // cursor set, stop here
@@ -4271,11 +4160,14 @@ bool wxWindowMSW::HandlePower(WXWPARAM WXUNUSED_IN_WINCE(wParam),
             break;
 
         case PBT_APMRESUMESUSPEND:
+#ifdef PBT_APMRESUMEAUTOMATIC
+        case PBT_APMRESUMEAUTOMATIC:
+#endif
             evtType = wxEVT_POWER_RESUME;
             break;
 
         default:
-            wxLogDebug(wxT("Unknown WM_POWERBROADCAST(%d) event"), wParam);
+            wxLogDebug(_T("Unknown WM_POWERBROADCAST(%d) event"), wParam);
             // fall through
 
         // these messages are currently not mapped to wx events
@@ -4287,9 +4179,6 @@ bool wxWindowMSW::HandlePower(WXWPARAM WXUNUSED_IN_WINCE(wParam),
         case PBT_APMPOWERSTATUSCHANGE:
         case PBT_APMOEMEVENT:
         case PBT_APMRESUMECRITICAL:
-#ifdef PBT_APMRESUMEAUTOMATIC
-        case PBT_APMRESUMEAUTOMATIC:
-#endif
             evtType = wxEVT_NULL;
             break;
     }
@@ -4301,7 +4190,7 @@ bool wxWindowMSW::HandlePower(WXWPARAM WXUNUSED_IN_WINCE(wParam),
     // TODO: notify about PBTF_APMRESUMEFROMFAILURE in case of resume events?
 
     wxPowerEvent event(evtType);
-    if ( !HandleWindowEvent(event) )
+    if ( !GetEventHandler()->ProcessEvent(event) )
         return false;
 
     *vetoed = event.IsVetoed();
@@ -4312,14 +4201,13 @@ bool wxWindowMSW::HandlePower(WXWPARAM WXUNUSED_IN_WINCE(wParam),
 
 bool wxWindowMSW::IsDoubleBuffered() const
 {
-    for ( const wxWindowMSW *win = this; win; win = win->GetParent() )
-    {
-        if ( wxHasWindowExStyle(win, WS_EX_COMPOSITED) )
+    const wxWindowMSW *wnd = this;
+    do {
+        long style = ::GetWindowLong(GetHwndOf(wnd), GWL_EXSTYLE);
+        if ( (style & WS_EX_COMPOSITED) != 0 )
             return true;
-
-        if ( win->IsTopLevel() )
-            break;
-    }
+        wnd = wnd->GetParent();
+    } while ( wnd && !wnd->IsTopLevel() );
 
     return false;
 }
@@ -4327,7 +4215,7 @@ bool wxWindowMSW::IsDoubleBuffered() const
 void wxWindowMSW::SetDoubleBuffered(bool on)
 {
     // Get the current extended style bits
-    long exstyle = wxGetWindowExStyle(this);
+    long exstyle = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE);
 
     // Twiddle the bit as needed
     if ( on )
@@ -4336,7 +4224,7 @@ void wxWindowMSW::SetDoubleBuffered(bool on)
         exstyle &= ~WS_EX_COMPOSITED;
 
     // put it back
-    wxSetWindowExStyle(this, exstyle);
+    ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyle);
 }
 
 // ---------------------------------------------------------------------------
@@ -4368,7 +4256,7 @@ wxWindowMSW::MSWOnDrawItem(int WXUNUSED_UNLESS_ODRAWN(id),
             return false;
 
         wxCHECK_MSG( wxDynamicCast(pMenuItem, wxMenuItem),
-                         false, wxT("MSWOnDrawItem: bad wxMenuItem pointer") );
+                         false, _T("MSWOnDrawItem: bad wxMenuItem pointer") );
 
         // prepare to call OnDrawItem(): notice using of wxDCTemp to prevent
         // the DC from being released
@@ -4434,7 +4322,7 @@ wxWindowMSW::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct)
             return false;
 
         wxCHECK_MSG( wxDynamicCast(pMenuItem, wxMenuItem),
-                        false, wxT("MSWOnMeasureItem: bad wxMenuItem pointer") );
+                        false, _T("MSWOnMeasureItem: bad wxMenuItem pointer") );
 
         size_t w, h;
         bool rc = pMenuItem->OnMeasureItem(&w, &h);
@@ -4467,7 +4355,7 @@ bool wxWindowMSW::HandleSysColorChange()
     wxSysColourChangedEvent event;
     event.SetEventObject(this);
 
-    (void)HandleWindowEvent(event);
+    (void)GetEventHandler()->ProcessEvent(event);
 
     // always let the system carry on the default processing to allow the
     // native controls to react to the colours update
@@ -4479,7 +4367,7 @@ bool wxWindowMSW::HandleDisplayChange()
     wxDisplayChangedEvent event;
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 #ifndef __WXMICROWIN__
@@ -4543,7 +4431,7 @@ bool wxWindowMSW::HandlePaletteChanged(WXHWND hWndPalChange)
     event.SetEventObject(this);
     event.SetChangedWindow(wxFindWinFromHandle(hWndPalChange));
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleCaptureChanged(WXHWND hWndGainedCapture)
@@ -4555,7 +4443,7 @@ bool wxWindowMSW::HandleCaptureChanged(WXHWND hWndGainedCapture)
     wxWindow *win = wxFindWinFromHandle(hWndGainedCapture);
     wxMouseCaptureChangedEvent event(GetId(), win);
     event.SetEventObject(this);
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam)
@@ -4610,7 +4498,7 @@ bool wxWindowMSW::HandleQueryNewPalette()
     wxQueryNewPaletteEvent event(GetId());
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event) && event.GetPaletteRealized();
+    return GetEventHandler()->ProcessEvent(event) && event.GetPaletteRealized();
 }
 
 // Responds to colour changes: passes event on to children.
@@ -4661,12 +4549,12 @@ extern wxCOLORMAP *wxGetStdColourMap()
             // reference bitmap which can tell us what the RGB values change
             // to.
             wxLogNull logNo; // suppress error if we couldn't load the bitmap
-            wxBitmap stdColourBitmap(wxT("wxBITMAP_STD_COLOURS"));
-            if ( stdColourBitmap.IsOk() )
+            wxBitmap stdColourBitmap(_T("wxBITMAP_STD_COLOURS"));
+            if ( stdColourBitmap.Ok() )
             {
                 // the pixels in the bitmap must correspond to wxSTD_COL_XXX!
                 wxASSERT_MSG( stdColourBitmap.GetWidth() == wxSTD_COL_MAX,
-                              wxT("forgot to update wxBITMAP_STD_COLOURS!") );
+                              _T("forgot to update wxBITMAP_STD_COLOURS!") );
 
                 wxMemoryDC memDC;
                 memDC.SelectObject(stdColourBitmap);
@@ -4709,116 +4597,31 @@ extern wxCOLORMAP *wxGetStdColourMap()
     return s_cmap;
 }
 
-#if wxUSE_UXTHEME && !defined(TMT_FILLCOLOR)
-    #define TMT_FILLCOLOR       3802
-    #define TMT_TEXTCOLOR       3803
-    #define TMT_BORDERCOLOR     3801
-#endif
-
-wxColour wxWindowMSW::MSWGetThemeColour(const wchar_t *themeName,
-                                        int themePart,
-                                        int themeState,
-                                        MSWThemeColour themeColour,
-                                        wxSystemColour fallback) const
-{
-#if wxUSE_UXTHEME
-    const wxUxThemeEngine* theme = wxUxThemeEngine::GetIfActive();
-    if ( theme )
-    {
-        int themeProperty = 0;
-
-        // TODO: Convert this into a table? Sure would be faster.
-        switch ( themeColour )
-        {
-            case ThemeColourBackground:
-                themeProperty = TMT_FILLCOLOR;
-                break;
-            case ThemeColourText:
-                themeProperty = TMT_TEXTCOLOR;
-                break;
-            case ThemeColourBorder:
-                themeProperty = TMT_BORDERCOLOR;
-                break;
-            default:
-                wxFAIL_MSG(wxT("unsupported theme colour"));
-        };
-
-        wxUxThemeHandle hTheme((const wxWindow *)this, themeName);
-        COLORREF col;
-        HRESULT hr = theme->GetThemeColor
-                            (
-                                hTheme,
-                                themePart,
-                                themeState,
-                                themeProperty,
-                                &col
-                            );
-
-        if ( SUCCEEDED(hr) )
-            return wxRGBToColour(col);
-
-        wxLogApiError(
-            wxString::Format(
-                "GetThemeColor(%s, %i, %i, %i)",
-                themeName, themePart, themeState, themeProperty),
-            hr);
-    }
-#else
-    wxUnusedVar(themeName);
-    wxUnusedVar(themePart);
-    wxUnusedVar(themeState);
-    wxUnusedVar(themeColour);
-#endif
-    return wxSystemSettings::GetColour(fallback);
-}
-
 // ---------------------------------------------------------------------------
 // painting
 // ---------------------------------------------------------------------------
 
-// this variable is used to check that a paint event handler which processed
-// the event did create a wxPaintDC inside its code and called BeginPaint() to
-// validate the invalidated window area as otherwise we'd keep getting an
-// endless stream of WM_PAINT messages for this window resulting in a lot of
-// difficult to debug problems (e.g. impossibility to repaint other windows,
-// lack of timer and idle events and so on)
-extern bool wxDidCreatePaintDC;
-bool wxDidCreatePaintDC = false;
-
 bool wxWindowMSW::HandlePaint()
 {
     HRGN hRegion = ::CreateRectRgn(0, 0, 0, 0); // Dummy call to get a handle
     if ( !hRegion )
-    {
         wxLogLastError(wxT("CreateRectRgn"));
-    }
     if ( ::GetUpdateRgn(GetHwnd(), hRegion, FALSE) == ERROR )
-    {
         wxLogLastError(wxT("GetUpdateRgn"));
-    }
 
     m_updateRegion = wxRegion((WXHRGN) hRegion);
 
-    wxDidCreatePaintDC = false;
-
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
 
-    bool processed = HandleWindowEvent(event);
-
-    if ( processed && !wxDidCreatePaintDC )
-    {
-        // do call MSWDefWindowProc() to validate the update region to avoid
-        // the problems mentioned above
-        processed = false;
-    }
+    bool processed = GetEventHandler()->ProcessEvent(event);
 
     // note that we must generate NC event after the normal one as otherwise
     // BeginPaint() will happily overwrite our decorations with the background
     // colour
     wxNcPaintEvent eventNc(m_windowId);
     eventNc.SetEventObject(this);
-    HandleWindowEvent(eventNc);
+    GetEventHandler()->ProcessEvent(eventNc);
 
     // don't keep an HRGN we don't need any longer (GetUpdateRegion() can only
     // be called from inside the event handlers called above)
@@ -4833,7 +4636,7 @@ void wxWindowMSW::OnPaint(wxPaintEvent& event)
 #ifdef __WXUNIVERSAL__
     event.Skip();
 #else
-    HDC hDC = (HDC) wxPaintDCImpl::FindDCInCache((wxWindow*) event.GetEventObject());
+    HDC hDC = (HDC) wxPaintDC::FindDCInCache((wxWindow*) event.GetEventObject());
     if (hDC != 0)
     {
         MSWDefWindowProc(WM_PAINT, (WPARAM) hDC, 0);
@@ -4843,168 +4646,101 @@ void wxWindowMSW::OnPaint(wxPaintEvent& event)
 
 bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc)
 {
-    if ( IsBeingDeleted() )
-    {
-        // We can get WM_ERASEBKGND after starting the destruction of our top
-        // level parent. Handling it in this case is unnecessary and can be
-        // actually harmful as e.g. wxStaticBox::GetClientSize() doesn't work
-        // without a valid TLW parent (because it uses dialog units internally
-        // which use the dialog font), so just don't do anything then.
-        return false;
-    }
+    wxDCTemp dc(hdc, GetClientSize());
 
-    switch ( GetBackgroundStyle() )
-    {
-        case wxBG_STYLE_ERASE:
-        case wxBG_STYLE_COLOUR:
-            // we need to generate an erase background event
-            {
-                wxDCTemp dc(hdc, GetClientSize());
-                wxDCTempImpl *impl = (wxDCTempImpl*) dc.GetImpl();
+    dc.SetHDC(hdc);
+    dc.SetWindow((wxWindow *)this);
 
-                impl->SetHDC(hdc);
-                impl->SetWindow((wxWindow *)this);
+    wxEraseEvent event(m_windowId, &dc);
+    event.SetEventObject(this);
+    bool rc = GetEventHandler()->ProcessEvent(event);
 
-                wxEraseEvent event(m_windowId, &dc);
-                event.SetEventObject(this);
-                bool rc = HandleWindowEvent(event);
+    // must be called manually as ~wxDC doesn't do anything for wxDCTemp
+    dc.SelectOldObjects(hdc);
 
-                // must be called manually as ~wxDC doesn't do anything for
-                // wxDCTemp
-                impl->SelectOldObjects(hdc);
-
-                if ( rc )
-                {
-                    // background erased by the user-defined handler
-                    return true;
-                }
-            }
-            // fall through
-
-        case wxBG_STYLE_SYSTEM:
-            if ( !DoEraseBackground(hdc) )
-            {
-                // let the default processing to take place if we didn't erase
-                // the background ourselves
-                return false;
-            }
-            break;
-
-        case wxBG_STYLE_PAINT:
-        case wxBG_STYLE_TRANSPARENT:
-            // no need to do anything here at all, background will be entirely
-            // redrawn in WM_PAINT handler
-            break;
-
-        default:
-            wxFAIL_MSG( "unknown background style" );
-    }
-
-    return true;
+    return rc;
 }
 
-#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
-
-bool wxWindowMSW::MSWHasEraseBgHook() const
+void wxWindowMSW::OnEraseBackground(wxEraseEvent& event)
 {
-    return gs_eraseBgHooks.find(const_cast<wxWindowMSW *>(this))
-                != gs_eraseBgHooks.end();
-}
-
-void wxWindowMSW::MSWSetEraseBgHook(wxWindow *child)
-{
-    if ( child )
+    // standard non top level controls (i.e. except the dialogs) always erase
+    // their background themselves in HandleCtlColor() or have some control-
+    // specific ways to set the colours (common controls)
+    if ( IsOfStandardClass() && !IsTopLevel() )
     {
-        if ( !gs_eraseBgHooks.insert(
-                EraseBgHooks::value_type(this, child)).second )
-        {
-            wxFAIL_MSG( wxT("Setting erase background hook twice?") );
-        }
+        event.Skip();
+        return;
     }
-    else // reset the hook
+
+    if ( GetBackgroundStyle() == wxBG_STYLE_CUSTOM )
     {
-        if ( gs_eraseBgHooks.erase(this) != 1 )
-        {
-            wxFAIL_MSG( wxT("Resetting erase background which was not set?") );
-        }
+        // don't skip the event here, custom background means that the app
+        // is drawing it itself in its OnPaint(), so don't draw it at all
+        // now to avoid flicker
+        return;
+    }
+
+
+    // do default background painting
+    if ( !DoEraseBackground(GetHdcOf(*event.GetDC())) )
+    {
+        // let the system paint the background
+        event.Skip();
     }
 }
 
-#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
-
 bool wxWindowMSW::DoEraseBackground(WXHDC hDC)
 {
     HBRUSH hbr = (HBRUSH)MSWGetBgBrush(hDC);
     if ( !hbr )
         return false;
 
-    // erase just the client area of the window, this is important for the
-    // frames to avoid drawing over the toolbar part of the window (you might
-    // think using WS_CLIPCHILDREN would prevent this from happening, but it
-    // clearly doesn't)
-    RECT rc;
-    wxCopyRectToRECT(GetClientRect(), rc);
-    ::FillRect((HDC)hDC, &rc, hbr);
+    wxFillRect(GetHwnd(), (HDC)hDC, hbr);
 
     return true;
 }
 
 WXHBRUSH
-wxWindowMSW::MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child)
+wxWindowMSW::MSWGetBgBrushForChild(WXHDC WXUNUSED(hDC), WXHWND hWnd)
 {
-    // Test for the custom background brush first.
-    WXHBRUSH hbrush = MSWGetCustomBgBrush();
-    if ( hbrush )
-    {
-        // We assume that this is either a stipple or hatched brush and not a
-        // solid one as otherwise it would have been enough to set the
-        // background colour and such brushes need to be positioned correctly
-        // in order to align when different windows are painted, so do it here.
-        RECT rc;
-        ::GetWindowRect(GetHwndOf(child), &rc);
-
-        ::MapWindowPoints(NULL, GetHwnd(), (POINT *)&rc, 1);
-
-        if ( !::SetBrushOrgEx((HDC)hDC, -rc.left, -rc.top, NULL) )
-        {
-            wxLogLastError(wxT("SetBrushOrgEx(bg brush)"));
-        }
-
-        return hbrush;
-    }
-
-    // Otherwise see if we have a custom background colour.
     if ( m_hasBgCol )
     {
-        wxBrush *
-            brush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour());
+        // our background colour applies to:
+        //  1. this window itself, always
+        //  2. all children unless the colour is "not inheritable"
+        //  3. even if it is not inheritable, our immediate transparent
+        //     children should still inherit it -- but not any transparent
+        //     children because it would look wrong if a child of non
+        //     transparent child would show our bg colour when the child itself
+        //     does not
+        wxWindow *win = wxFindWinFromHandle(hWnd);
+        if ( win == this ||
+                m_inheritBgCol ||
+                    (win && win->HasTransparentBackground() &&
+                        win->GetParent() == this) )
+        {
+            // draw children with the same colour as the parent
+            wxBrush *
+                brush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour());
 
-        return (WXHBRUSH)GetHbrushOf(*brush);
+            return (WXHBRUSH)GetHbrushOf(*brush);
+        }
     }
 
     return 0;
 }
 
-WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
+WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC, WXHWND hWndToPaint)
 {
-    // Use the special wxWindowBeingErased variable if it is set as the child
-    // being erased.
-    wxWindowMSW * const child =
-#if wxUSE_UXTHEME
-                                wxWindowBeingErased ? wxWindowBeingErased :
-#endif
-                                this;
+    if ( !hWndToPaint )
+        hWndToPaint = GetHWND();
 
     for ( wxWindowMSW *win = this; win; win = win->GetParent() )
     {
-        WXHBRUSH hBrush = win->MSWGetBgBrushForChild(hDC, child);
+        WXHBRUSH hBrush = win->MSWGetBgBrushForChild(hDC, hWndToPaint);
         if ( hBrush )
             return hBrush;
 
-        // don't use the parent background if we're not transparent
-        if ( !win->HasTransparentBackground() )
-            break;
-
         // background is not inherited beyond top level windows
         if ( win->IsTopLevel() )
             break;
@@ -5056,7 +4792,7 @@ bool wxWindowMSW::HandleMinimize()
     wxIconizeEvent event(m_windowId);
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleMaximize()
@@ -5064,7 +4800,7 @@ bool wxWindowMSW::HandleMaximize()
     wxMaximizeEvent event(m_windowId);
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleMove(int x, int y)
@@ -5073,7 +4809,7 @@ bool wxWindowMSW::HandleMove(int x, int y)
     wxMoveEvent event(point, m_windowId);
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleMoving(wxRect& rect)
@@ -5081,33 +4817,15 @@ bool wxWindowMSW::HandleMoving(wxRect& rect)
     wxMoveEvent event(rect, m_windowId);
     event.SetEventObject(this);
 
-    bool rc = HandleWindowEvent(event);
+    bool rc = GetEventHandler()->ProcessEvent(event);
     if (rc)
         rect = event.GetRect();
     return rc;
 }
 
-bool wxWindowMSW::HandleEnterSizeMove()
-{
-    wxMoveEvent event(wxPoint(0,0), m_windowId);
-    event.SetEventType(wxEVT_MOVE_START);
-    event.SetEventObject(this);
-
-    return HandleWindowEvent(event);
-}
-
-bool wxWindowMSW::HandleExitSizeMove()
-{
-    wxMoveEvent event(wxPoint(0,0), m_windowId);
-    event.SetEventType(wxEVT_MOVE_END);
-    event.SetEventObject(this);
-
-    return HandleWindowEvent(event);
-}
-
 bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
 {
-#if wxUSE_DEFERRED_SIZING
+#if USE_DEFERRED_SIZING
     // when we resize this window, its children are probably going to be
     // repositioned as well, prepare to use DeferWindowPos() for them
     int numChildren = 0;
@@ -5128,20 +4846,20 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
             m_hDWP = (WXHANDLE)::BeginDeferWindowPos(numChildren);
             if ( !m_hDWP )
             {
-                wxLogLastError(wxT("BeginDeferWindowPos"));
+                wxLogLastError(_T("BeginDeferWindowPos"));
             }
             if (m_hDWP)
                 useDefer = true;
         }
     }
-#endif // wxUSE_DEFERRED_SIZING
+#endif // USE_DEFERRED_SIZING
 
     // update this window size
     bool processed = false;
     switch ( wParam )
     {
         default:
-            wxFAIL_MSG( wxT("unexpected WM_SIZE parameter") );
+            wxFAIL_MSG( _T("unexpected WM_SIZE parameter") );
             // fall through nevertheless
 
         case SIZE_MAXHIDE:
@@ -5164,10 +4882,10 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
             wxSizeEvent event(GetSize(), m_windowId);
             event.SetEventObject(this);
 
-            processed = HandleWindowEvent(event);
+            processed = GetEventHandler()->ProcessEvent(event);
     }
 
-#if wxUSE_DEFERRED_SIZING
+#if USE_DEFERRED_SIZING
     // and finally change the positions of all child windows at once
     if ( useDefer && m_hDWP )
     {
@@ -5181,7 +4899,7 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
         // do put all child controls in place at once
         if ( !::EndDeferWindowPos(hDWP) )
         {
-            wxLogLastError(wxT("EndDeferWindowPos"));
+            wxLogLastError(_T("EndDeferWindowPos"));
         }
 
         // Reset our children's pending pos/size values.
@@ -5189,11 +4907,12 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
               node;
               node = node->GetNext() )
         {
-            wxWindowMSW * const child = node->GetData();
-            child->MSWEndDeferWindowPos();
+            wxWindowMSW *child = node->GetData();
+            child->m_pendingPosition = wxDefaultPosition;
+            child->m_pendingSize = wxDefaultSize;
         }
     }
-#endif // wxUSE_DEFERRED_SIZING
+#endif // USE_DEFERRED_SIZING
 
     return processed;
 }
@@ -5203,7 +4922,7 @@ bool wxWindowMSW::HandleSizing(wxRect& rect)
     wxSizeEvent event(rect, m_windowId);
     event.SetEventObject(this);
 
-    bool rc = HandleWindowEvent(event);
+    bool rc = GetEventHandler()->ProcessEvent(event);
     if (rc)
         rect = event.GetRect();
     return rc;
@@ -5255,11 +4974,8 @@ bool wxWindowMSW::HandleGetMinMaxInfo(void *WXUNUSED_IN_WINCE(mmInfo))
 // command messages
 // ---------------------------------------------------------------------------
 
-bool wxWindowMSW::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
+bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
 {
-    // sign extend to int from short before comparing with the other int ids
-    int id = (signed short)id_;
-
 #if wxUSE_MENUS_NATIVE
     if ( !cmd && wxCurrentPopupMenu )
     {
@@ -5282,7 +4998,8 @@ bool wxWindowMSW::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
     // try the id
     if ( !win )
     {
-        win = FindItem(id);
+        // must cast to a signed type before comparing with other ids!
+        win = FindItem((signed short)id);
     }
 
     if ( win )
@@ -5296,11 +5013,15 @@ bool wxWindowMSW::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND control)
     // coming from a control to wxEVT_COMMAND_MENU_SELECTED
     if ( !control )
     {
-        wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED, id);
+        // If no child window, it may be an accelerator, e.g. for a popup menu
+        // command
+
+        wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
         event.SetEventObject(this);
+        event.SetId(id);
         event.SetInt(id);
 
-        return HandleWindowEvent(event);
+        return GetEventHandler()->ProcessEvent(event);
     }
     else
     {
@@ -5344,11 +5065,7 @@ void wxWindowMSW::InitMouseEvent(wxMouseEvent& event,
     event.m_leftDown = (flags & MK_LBUTTON) != 0;
     event.m_middleDown = (flags & MK_MBUTTON) != 0;
     event.m_rightDown = (flags & MK_RBUTTON) != 0;
-#ifdef wxHAS_XBUTTON
-    event.m_aux1Down = (flags & MK_XBUTTON1) != 0;
-    event.m_aux2Down = (flags & MK_XBUTTON2) != 0;
-#endif // wxHAS_XBUTTON
-    event.m_altDown = ::wxIsAltDown();
+    event.m_altDown = ::GetKeyState(VK_MENU) < 0;
 
 #ifndef __WXWINCE__
     event.SetTimestamp(::GetMessageTime());
@@ -5376,7 +5093,7 @@ void wxWindowMSW::InitMouseEvent(wxMouseEvent& event,
 // still don't get move, enter nor leave events.
 static wxWindowMSW *FindWindowForMouseEvent(wxWindowMSW *win, int *x, int *y)
 {
-    wxCHECK_MSG( x && y, win, wxT("NULL pointer in FindWindowForMouseEvent") );
+    wxCHECK_MSG( x && y, win, _T("NULL pointer in FindWindowForMouseEvent") );
 
     // first try to find a non transparent child: this allows us to send events
     // to a static text which is inside a static box, for example
@@ -5414,7 +5131,7 @@ static wxWindowMSW *FindWindowForMouseEvent(wxWindowMSW *win, int *x, int *y)
                 ::IsWindowVisible(hwndUnderMouse) &&
                     ::IsWindowEnabled(hwndUnderMouse) )
     {
-        wxWindow *winUnderMouse = wxFindWinFromHandle(hwndUnderMouse);
+        wxWindow *winUnderMouse = wxFindWinFromHandle((WXHWND)hwndUnderMouse);
         if ( winUnderMouse )
         {
             // translate the mouse coords to the other window coords
@@ -5446,33 +5163,13 @@ bool wxWindowMSW::HandleMouseEvent(WXUINT msg, int x, int y, WXUINT flags)
         wxEVT_RIGHT_DCLICK,
         wxEVT_MIDDLE_DOWN,
         wxEVT_MIDDLE_UP,
-        wxEVT_MIDDLE_DCLICK,
-        0, // this one is for wxEVT_MOTION which is not used here
-        wxEVT_AUX1_DOWN,
-        wxEVT_AUX1_UP,
-        wxEVT_AUX1_DCLICK,
-        wxEVT_AUX2_DOWN,
-        wxEVT_AUX2_UP,
-        wxEVT_AUX2_DCLICK
+        wxEVT_MIDDLE_DCLICK
     };
 
-#ifdef wxHAS_XBUTTON
-    // the same messages are used for both auxillary mouse buttons so we need
-    // to adjust the index manually
-    switch ( msg )
-    {
-        case WM_XBUTTONDOWN:
-        case WM_XBUTTONUP:
-        case WM_XBUTTONDBLCLK:
-            if ( flags & MK_XBUTTON2 )
-                msg += wxEVT_AUX2_DOWN - wxEVT_AUX1_DOWN;
-    }
-#endif // wxHAS_XBUTTON
-
     wxMouseEvent event(eventsMouse[msg - WM_MOUSEMOVE]);
     InitMouseEvent(event, x, y, flags);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
@@ -5500,11 +5197,11 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
             {
                 // see comment in wxApp::GetComCtl32Version() explaining the
                 // use of wxLoadedDLL
-                wxLoadedDLL dllComCtl32(wxT("comctl32.dll"));
+                wxLoadedDLL dllComCtl32(_T("comctl32.dll"));
                 if ( dllComCtl32.IsLoaded() )
                 {
                     s_pfn_TrackMouseEvent = (_TrackMouseEvent_t)
-                        dllComCtl32.RawGetSymbol(wxT("_TrackMouseEvent"));
+                        dllComCtl32.GetSymbol(_T("_TrackMouseEvent"));
                 }
 
                 s_initDone = true;
@@ -5525,7 +5222,7 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
             wxMouseEvent event(wxEVT_ENTER_WINDOW);
             InitMouseEvent(event, x, y, flags);
 
-            (void)HandleWindowEvent(event);
+            (void)GetEventHandler()->ProcessEvent(event);
         }
     }
 #ifdef HAVE_TRACKMOUSEEVENT
@@ -5565,9 +5262,7 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
 }
 
 
-bool
-wxWindowMSW::HandleMouseWheel(wxMouseWheelAxis axis,
-                              WXWPARAM wParam, WXLPARAM lParam)
+bool wxWindowMSW::HandleMouseWheel(WXWPARAM wParam, WXLPARAM lParam)
 {
 #if wxUSE_MOUSEWHEEL
     // notice that WM_MOUSEWHEEL position is in screen coords (as it's
@@ -5580,7 +5275,6 @@ wxWindowMSW::HandleMouseWheel(wxMouseWheelAxis axis,
     InitMouseEvent(event, pt.x, pt.y, LOWORD(wParam));
     event.m_wheelRotation = (short)HIWORD(wParam);
     event.m_wheelDelta = WHEEL_DELTA;
-    event.m_wheelAxis = axis;
 
     static int s_linesPerRotation = -1;
     if ( s_linesPerRotation == -1 )
@@ -5589,7 +5283,7 @@ wxWindowMSW::HandleMouseWheel(wxMouseWheelAxis axis,
                                      &s_linesPerRotation, 0))
         {
             // this is not supposed to happen
-            wxLogLastError(wxT("SystemParametersInfo(GETWHEELSCROLLLINES)"));
+            wxLogLastError(_T("SystemParametersInfo(GETWHEELSCROLLLINES)"));
 
             // the default is 3, so use it if SystemParametersInfo() failed
             s_linesPerRotation = 3;
@@ -5597,7 +5291,7 @@ wxWindowMSW::HandleMouseWheel(wxMouseWheelAxis axis,
     }
 
     event.m_linesPerAction = s_linesPerRotation;
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 
 #else // !wxUSE_MOUSEWHEEL
     wxUnusedVar(wParam);
@@ -5626,7 +5320,14 @@ void wxWindowMSW::GenerateMouseLeave()
         state |= MK_RBUTTON;
 
     POINT pt;
-    wxGetCursorPosMSW(&pt);
+#ifdef __WXWINCE__
+    if ( !::GetCursorPosWinCE(&pt) )
+#else
+    if ( !::GetCursorPos(&pt) )
+#endif
+    {
+        wxLogLastError(_T("GetCursorPos"));
+    }
 
     // we need to have client coordinates here for symmetry with
     // wxEVT_ENTER_WINDOW
@@ -5637,135 +5338,80 @@ void wxWindowMSW::GenerateMouseLeave()
     wxMouseEvent event(wxEVT_LEAVE_WINDOW);
     InitMouseEvent(event, pt.x, pt.y, state);
 
-    (void)HandleWindowEvent(event);
+    (void)GetEventHandler()->ProcessEvent(event);
 }
 
 // ---------------------------------------------------------------------------
 // keyboard handling
 // ---------------------------------------------------------------------------
 
-namespace
+// create the key event of the given type for the given key - used by
+// HandleChar and HandleKeyDown/Up
+wxKeyEvent wxWindowMSW::CreateKeyEvent(wxEventType evType,
+                                       int id,
+                                       WXLPARAM lParam,
+                                       WXWPARAM wParam) const
 {
-
-// Implementation of InitAnyKeyEvent() which can also be used when there is no
-// associated window: this can happen for the wxEVT_CHAR_HOOK events created by
-// the global keyboard hook (e.g. the event might have happened in a non-wx
-// window).
-void
-MSWInitAnyKeyEvent(wxKeyEvent& event,
-                   WXWPARAM wParam,
-                   WXLPARAM lParam,
-                   const wxWindowBase *win /* may be NULL */)
-{
-    if ( win )
-    {
-        event.SetId(win->GetId());
-        event.SetEventObject(const_cast<wxWindowBase *>(win));
-    }
-    else // No associated window.
-    {
-        // Use wxID_ANY for compatibility with the old code even if wxID_NONE
-        // would arguably make more sense.
-        event.SetId(wxID_ANY);
-    }
-
+    wxKeyEvent event(evType);
+    event.SetId(GetId());
     event.m_shiftDown = wxIsShiftDown();
     event.m_controlDown = wxIsCtrlDown();
     event.m_altDown = (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN;
 
+    event.SetEventObject((wxWindow *)this); // const_cast
+    event.m_keyCode = id;
+#if wxUSE_UNICODE
+    event.m_uniChar = (wxChar) wParam;
+#endif
     event.m_rawCode = (wxUint32) wParam;
     event.m_rawFlags = (wxUint32) lParam;
 #ifndef __WXWINCE__
     event.SetTimestamp(::GetMessageTime());
 #endif
 
-    // Event coordinates must be in window client coordinates system which
-    // doesn't make sense if there is no window.
-    //
-    // We could use screen coordinates for such events but this would make the
-    // logic of the event handlers more complicated: you'd need to test for the
-    // event object and interpret the coordinates differently according to
-    // whether it's NULL or not so unless somebody really asks for this let's
-    // just avoid the issue.
-    if ( win )
-    {
-        const wxPoint mousePos = win->ScreenToClient(wxGetMousePosition());
-        event.m_x = mousePos.x;
-        event.m_y = mousePos.y;
-    }
-}
+    // translate the position to client coords
+    POINT pt;
+#ifdef __WXWINCE__
+    GetCursorPosWinCE(&pt);
+#else
+    GetCursorPos(&pt);
+#endif
+    RECT rect;
+    GetWindowRect(GetHwnd(),&rect);
+    pt.x -= rect.left;
+    pt.y -= rect.top;
 
-} // anonymous namespace
-
-void
-wxWindowMSW::InitAnyKeyEvent(wxKeyEvent& event,
-                             WXWPARAM wParam,
-                             WXLPARAM lParam) const
-{
-    MSWInitAnyKeyEvent(event, wParam, lParam, this);
-}
-
-wxKeyEvent
-wxWindowMSW::CreateKeyEvent(wxEventType evType,
-                            WXWPARAM wParam,
-                            WXLPARAM lParam) const
-{
-    // Catch any attempts to use this with WM_CHAR, it wouldn't work because
-    // wParam is supposed to be a virtual key and not a character here.
-    wxASSERT_MSG( evType != wxEVT_CHAR && evType != wxEVT_CHAR_HOOK,
-                    "CreateKeyEvent() can't be used for char events" );
-
-    wxKeyEvent event(evType);
-    InitAnyKeyEvent(event, wParam, lParam);
-
-    event.m_keyCode = wxMSWKeyboard::VKToWX
-                                     (
-                                        wParam,
-                                        lParam
-#if wxUSE_UNICODE
-                                        , &event.m_uniChar
-#endif // wxUSE_UNICODE
-                                     );
+    event.m_x = pt.x;
+    event.m_y = pt.y;
 
     return event;
 }
 
-wxKeyEvent
-wxWindowMSW::CreateCharEvent(wxEventType evType,
-                             WXWPARAM wParam,
-                             WXLPARAM lParam) const
+// isASCII is true only when we're called from WM_CHAR handler and not from
+// WM_KEYDOWN one
+bool wxWindowMSW::HandleChar(WXWPARAM wParam, WXLPARAM lParam, bool isASCII)
 {
-    wxKeyEvent event(evType);
-    InitAnyKeyEvent(event, wParam, lParam);
-
-#if wxUSE_UNICODE
-    // TODO: wParam uses UTF-16 so this is incorrect for characters outside of
-    //       the BMP, we should use WM_UNICHAR to handle them.
-    event.m_uniChar = wParam;
-#endif // wxUSE_UNICODE
-
-    // Set non-Unicode key code too for compatibility if possible.
-    if ( wParam < 0x80 )
+    int id;
+    if ( isASCII )
     {
-        // It's an ASCII character, no need to translate it.
-        event.m_keyCode = wParam;
+        id = wParam;
     }
-    else
+    else // we're called from WM_KEYDOWN
     {
-        // Check if this key can be represented (as a single character) in the
-        // current locale.
-        const wchar_t wc = wParam;
-        char ch;
-        if ( wxConvLibc.FromWChar(&ch, 1, &wc, 1) != wxCONV_FAILED )
+        // don't pass lParam to wxCharCodeMSWToWX() here because we don't want
+        // to get numpad key codes: CHAR events should use the logical keys
+        // such as WXK_HOME instead of WXK_NUMPAD_HOME which is for KEY events
+        id = wxCharCodeMSWToWX(wParam);
+        if ( id == 0 )
         {
-            // For compatibility continue to provide the key code in this field
-            // even though using GetUnicodeKey() is recommended now.
-            event.m_keyCode = static_cast<unsigned char>(ch);
+            // it's ASCII and will be processed here only when called from
+            // WM_CHAR (i.e. when isASCII = true), don't process it now
+            return false;
         }
-        //else: Key can't be represented in the current locale, leave m_keyCode
-        //      as WXK_NONE and use GetUnicodeKey() to access the character.
     }
 
+    wxKeyEvent event(CreateKeyEvent(wxEVT_CHAR, id, lParam, wParam));
+
     // the alphanumeric keys produced by pressing AltGr+something on European
     // keyboards have both Ctrl and Alt modifiers which may confuse the user
     // code as, normally, keys with Ctrl and/or Alt don't result in anything
@@ -5773,36 +5419,43 @@ wxWindowMSW::CreateCharEvent(wxEventType evType,
     // KEY_DOWN event would still have the correct modifiers if they're really
     // needed)
     if ( event.m_controlDown && event.m_altDown &&
-            (event.m_keyCode >= 32 && event.m_keyCode < 256) )
+            (id >= 32 && id < 256) )
     {
         event.m_controlDown =
         event.m_altDown = false;
     }
 
-    return event;
-}
-
-// isASCII is true only when we're called from WM_CHAR handler and not from
-// WM_KEYDOWN one
-bool wxWindowMSW::HandleChar(WXWPARAM wParam, WXLPARAM lParam)
-{
-    wxKeyEvent event(CreateCharEvent(wxEVT_CHAR, wParam, lParam));
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam)
 {
-    wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_DOWN, wParam, lParam));
-    return HandleWindowEvent(event);
+    int id = wxCharCodeMSWToWX(wParam, lParam);
+
+    if ( !id )
+    {
+        // normal ASCII char
+        id = wParam;
+    }
+
+    wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_DOWN, id, lParam, wParam));
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 bool wxWindowMSW::HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam)
 {
-    wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_UP, wParam, lParam));
-    return HandleWindowEvent(event);
+    int id = wxCharCodeMSWToWX(wParam, lParam);
+
+    if ( !id )
+    {
+        // normal ASCII char
+        id = wParam;
+    }
+
+    wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_UP, id, lParam, wParam));
+    return GetEventHandler()->ProcessEvent(event);
 }
 
-#if wxUSE_MENUS
 int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
                                 WXLPARAM WXUNUSED_IN_WINCE(lParam))
 {
@@ -5811,7 +5464,9 @@ int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
 #ifndef __WXWINCE__
     const HMENU hmenu = (HMENU)lParam;
 
-    WinStruct<MENUITEMINFO> mii;
+    MENUITEMINFO mii;
+    wxZeroMemory(mii);
+    mii.cbSize = sizeof(MENUITEMINFO);
 
     // we could use MIIM_FTYPE here as we only need to know if the item is
     // ownerdrawn or not and not dwTypeData which MIIM_TYPE also returns, but
@@ -5835,14 +5490,13 @@ int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
                 //  menu creation code
                 wxMenuItem *item = (wxMenuItem*)mii.dwItemData;
 
-                const wxString label(item->GetItemLabel());
-                const wxChar *p = wxStrchr(label.t_str(), wxT('&'));
+                const wxChar *p = wxStrchr(item->GetText(), _T('&'));
                 while ( p++ )
                 {
-                    if ( *p == wxT('&') )
+                    if ( *p == _T('&') )
                     {
                         // this is not the accel char, find the real one
-                        p = wxStrchr(p + 1, wxT('&'));
+                        p = wxStrchr(p + 1, _T('&'));
                     }
                     else // got the accel char
                     {
@@ -5865,25 +5519,23 @@ int wxWindowMSW::HandleMenuChar(int WXUNUSED_IN_WINCE(chAccel),
         else // failed to get the menu text?
         {
             // it's not fatal, so don't show error, but still log it
-            wxLogLastError(wxT("GetMenuItemInfo"));
+            wxLogLastError(_T("GetMenuItemInfo"));
         }
     }
 #endif
     return wxNOT_FOUND;
 }
 
-#endif // wxUSE_MENUS
-
-bool wxWindowMSW::HandleClipboardEvent(WXUINT nMsg)
+bool wxWindowMSW::HandleClipboardEvent( WXUINT nMsg )
 {
-    const wxEventType type = nMsg == WM_CUT       ? wxEVT_COMMAND_TEXT_CUT
-                           : nMsg == WM_COPY      ? wxEVT_COMMAND_TEXT_COPY
-                           : /* nMsg == WM_PASTE */ wxEVT_COMMAND_TEXT_PASTE;
+    const wxEventType type = ( nMsg == WM_CUT ) ? wxEVT_COMMAND_TEXT_CUT :
+                             ( nMsg == WM_COPY ) ? wxEVT_COMMAND_TEXT_COPY :
+                           /*( nMsg == WM_PASTE ) ? */ wxEVT_COMMAND_TEXT_PASTE;
     wxClipboardTextEvent evt(type, GetId());
 
     evt.SetEventObject(this);
 
-    return HandleWindowEvent(evt);
+    return GetEventHandler()->ProcessEvent(evt);
 }
 
 // ---------------------------------------------------------------------------
@@ -5965,13 +5617,10 @@ bool wxWindowMSW::HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags)
     }
 
     wxJoystickEvent event(eventType, buttons, joystick, change);
-    if ( eventType == wxEVT_JOY_ZMOVE )
-        event.SetZPosition(x);
-    else
-        event.SetPosition(wxPoint(x, y));
+    event.SetPosition(wxPoint(x, y));
     event.SetEventObject(this);
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 #else
     wxUnusedVar(msg);
     wxUnusedVar(x);
@@ -6038,11 +5687,12 @@ bool wxWindowMSW::MSWOnScroll(int orientation, WXWORD wParam,
             scrollInfo.fMask = SIF_TRACKPOS;
 
             if ( !::GetScrollInfo(GetHwnd(),
-                                  WXOrientToSB(orientation),
+                                  orientation == wxHORIZONTAL ? SB_HORZ
+                                                              : SB_VERT,
                                   &scrollInfo) )
             {
                 // Not necessarily an error, if there are no scrollbars yet.
-                // wxLogLastError(wxT("GetScrollInfo"));
+                // wxLogLastError(_T("GetScrollInfo"));
             }
 
             event.SetPosition(scrollInfo.nTrackPos);
@@ -6057,31 +5707,7 @@ bool wxWindowMSW::MSWOnScroll(int orientation, WXWORD wParam,
         return false;
     }
 
-    return HandleWindowEvent(event);
-}
-
-// ----------------------------------------------------------------------------
-// custom message handlers
-// ----------------------------------------------------------------------------
-
-/* static */ bool
-wxWindowMSW::MSWRegisterMessageHandler(int msg, MSWMessageHandler handler)
-{
-    wxCHECK_MSG( gs_messageHandlers.find(msg) == gs_messageHandlers.end(),
-                 false, wxT("registering handler for the same message twice") );
-
-    gs_messageHandlers[msg] = handler;
-    return true;
-}
-
-/* static */ void
-wxWindowMSW::MSWUnregisterMessageHandler(int msg, MSWMessageHandler handler)
-{
-    const MSWMessageHandlers::iterator i = gs_messageHandlers.find(msg);
-    wxCHECK_RET( i != gs_messageHandlers.end() && i->second == handler,
-                 wxT("unregistering non-registered handler?") );
-
-    gs_messageHandlers.erase(i);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 // ===========================================================================
@@ -6115,34 +5741,24 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font)
     //   the_font.ReleaseResource();
 }
 
-// ----------------------------------------------------------------------------
-// keyboard codes
-// ----------------------------------------------------------------------------
-
-namespace wxMSWKeyboard
-{
-
-namespace
-{
-
-// use the "extended" bit of lParam to distinguish extended keys from normal
-// keys as the same virtual key code is sent for both by Windows
-inline
+// use the "extended" bit (24) of lParam to distinguish extended keys
+// from normal keys as the same key is sent
+static inline
 int ChooseNormalOrExtended(int lParam, int keyNormal, int keyExtended)
 {
     // except that if lParam is 0, it means we don't have real lParam from
     // WM_KEYDOWN but are just translating just a VK constant (e.g. done from
     // msw/treectrl.cpp when processing TVN_KEYDOWN) -- then assume this is a
     // non-numpad (hence extended) key as this is a more common case
-    return !lParam || (HIWORD(lParam) & KF_EXTENDED) ? keyExtended : keyNormal;
+    return !lParam || (lParam & (1 << 24)) ? keyExtended : keyNormal;
 }
 
 // this array contains the Windows virtual key codes which map one to one to
-// WXK_xxx constants and is used in wxMSWKeyboard::VKToWX/WXToVK() below
+// WXK_xxx constants and is used in wxCharCodeMSWToWX/WXToMSW() below
 //
 // note that keys having a normal and numpad version (e.g. WXK_HOME and
 // WXK_NUMPAD_HOME) are not included in this table as the mapping is not 1-to-1
-const struct wxKeyMapping
+static const struct wxKeyMapping
 {
     int vk;
     wxKeyCode wxk;
@@ -6216,76 +5832,34 @@ const struct wxKeyMapping
 #endif // VK_APPS defined
 };
 
-} // anonymous namespace
-
-int VKToWX(WXWORD vk, WXLPARAM lParam, wchar_t *uc)
+// Returns 0 if was a normal ASCII value, not a special key. This indicates that
+// the key should be ignored by WM_KEYDOWN and processed by WM_CHAR instead.
+int wxCharCodeMSWToWX(int vk, WXLPARAM lParam)
 {
-    int wxk;
-
     // check the table first
     for ( size_t n = 0; n < WXSIZEOF(gs_specialKeys); n++ )
     {
         if ( gs_specialKeys[n].vk == vk )
-        {
-            wxk = gs_specialKeys[n].wxk;
-            if ( wxk < WXK_START )
-            {
-                // Unicode code for this key is the same as its ASCII code.
-                if ( uc )
-                    *uc = wxk;
-            }
-
-            return wxk;
-        }
+            return gs_specialKeys[n].wxk;
     }
 
     // keys requiring special handling
+    int wxk;
     switch ( vk )
     {
-        case VK_OEM_1:
-        case VK_OEM_PLUS:
-        case VK_OEM_COMMA:
-        case VK_OEM_MINUS:
-        case VK_OEM_PERIOD:
-        case VK_OEM_2:
-        case VK_OEM_3:
-        case VK_OEM_4:
-        case VK_OEM_5:
-        case VK_OEM_6:
-        case VK_OEM_7:
-        case VK_OEM_102:
-            // MapVirtualKey() returns 0 if it fails to convert the virtual
-            // key which nicely corresponds to our WXK_NONE.
-            wxk = ::MapVirtualKey(vk, MAPVK_VK_TO_CHAR);
-
-            if ( HIWORD(wxk) & 0x8000 )
-            {
-                // It's a dead key and we don't return anything at all for them
-                // as we simply don't have any way to indicate the difference
-                // between e.g. a normal "'" and "'" as a dead key -- and
-                // generating the same events for them just doesn't seem like a
-                // good idea.
-                wxk = WXK_NONE;
-            }
-
-            // In any case return this as a Unicode character value.
-            if ( uc )
-                *uc = wxk;
-
-            // For compatibility with the old non-Unicode code we continue
-            // returning key codes for Latin-1 characters directly
-            // (normally it would really only make sense to do it for the
-            // ASCII characters, not Latin-1 ones).
-            if ( wxk > 255 )
-            {
-                // But for anything beyond this we can only return the key
-                // value as a real Unicode character, not a wxKeyCode
-                // because this enum values clash with Unicode characters
-                // (e.g. WXK_LBUTTON also happens to be U+012C a.k.a.
-                // "LATIN CAPITAL LETTER I WITH BREVE").
-                wxk = WXK_NONE;
-            }
-            break;
+        // the mapping for these keys may be incorrect on non-US keyboards so
+        // maybe we shouldn't map them to ASCII values at all
+        case VK_OEM_1:      wxk = ';'; break;
+        case VK_OEM_PLUS:   wxk = '+'; break;
+        case VK_OEM_COMMA:  wxk = ','; break;
+        case VK_OEM_MINUS:  wxk = '-'; break;
+        case VK_OEM_PERIOD: wxk = '.'; break;
+        case VK_OEM_2:      wxk = '/'; break;
+        case VK_OEM_3:      wxk = '~'; break;
+        case VK_OEM_4:      wxk = '['; break;
+        case VK_OEM_5:      wxk = '\\'; break;
+        case VK_OEM_6:      wxk = ']'; break;
+        case VK_OEM_7:      wxk = '\''; break;
 
         // handle extended keys
         case VK_PRIOR:
@@ -6331,116 +5905,83 @@ int VKToWX(WXWORD vk, WXLPARAM lParam, wchar_t *uc)
         case VK_RETURN:
             // don't use ChooseNormalOrExtended() here as the keys are reversed
             // here: numpad enter is the extended one
-            wxk = HIWORD(lParam) & KF_EXTENDED ? WXK_NUMPAD_ENTER : WXK_RETURN;
-
-            if ( uc )
-                *uc = WXK_RETURN;
+            wxk = lParam && (lParam & (1 << 24)) ? WXK_NUMPAD_ENTER : WXK_RETURN;
             break;
 
         default:
-            if ( (vk >= '0' && vk <= '9') || (vk >= 'A' && vk <= 'Z') )
-            {
-                // A simple alphanumeric key and the values of them coincide in
-                // Windows and wx for both ASCII and Unicode codes.
-                wxk = vk;
-            }
-            else // Something we simply don't know about at all.
-            {
-                wxk = WXK_NONE;
-            }
-
-            if ( uc )
-                *uc = vk;
+            wxk = 0;
     }
 
     return wxk;
 }
 
-WXWORD WXToVK(int wxk, bool *isExtended)
+WXWORD wxCharCodeWXToMSW(int wxk, bool *isVirtual)
 {
+    if ( isVirtual )
+        *isVirtual = true;
+
     // check the table first
     for ( size_t n = 0; n < WXSIZEOF(gs_specialKeys); n++ )
     {
         if ( gs_specialKeys[n].wxk == wxk )
-        {
-            // All extended keys (i.e. non-numpad versions of the keys that
-            // exist both in the numpad and outside of it) are dealt with
-            // below.
-            if ( isExtended )
-                *isExtended = false;
-
             return gs_specialKeys[n].vk;
-        }
     }
 
     // and then check for special keys not included in the table
-    bool extended = false;
     WXWORD vk;
     switch ( wxk )
     {
         case WXK_PAGEUP:
-            extended = true;
         case WXK_NUMPAD_PAGEUP:
             vk = VK_PRIOR;
             break;
 
         case WXK_PAGEDOWN:
-            extended = true;
         case WXK_NUMPAD_PAGEDOWN:
             vk = VK_NEXT;
             break;
 
         case WXK_END:
-            extended = true;
         case WXK_NUMPAD_END:
             vk = VK_END;
             break;
 
         case WXK_HOME:
-            extended = true;
         case WXK_NUMPAD_HOME:
             vk = VK_HOME;
             break;
 
         case WXK_LEFT:
-            extended = true;
         case WXK_NUMPAD_LEFT:
             vk = VK_LEFT;
             break;
 
         case WXK_UP:
-            extended = true;
         case WXK_NUMPAD_UP:
             vk = VK_UP;
             break;
 
         case WXK_RIGHT:
-            extended = true;
         case WXK_NUMPAD_RIGHT:
             vk = VK_RIGHT;
             break;
 
         case WXK_DOWN:
-            extended = true;
         case WXK_NUMPAD_DOWN:
             vk = VK_DOWN;
             break;
 
         case WXK_INSERT:
-            extended = true;
         case WXK_NUMPAD_INSERT:
             vk = VK_INSERT;
             break;
 
         case WXK_DELETE:
-            extended = true;
         case WXK_NUMPAD_DELETE:
             vk = VK_DELETE;
             break;
 
         default:
-            // no VkKeyScan() under CE unfortunately, we need to test how does
-            // it handle OEM keys
 #ifndef __WXWINCE__
             // check to see if its one of the OEM key codes.
             BYTE vks = LOBYTE(VkKeyScan(wxk));
@@ -6449,37 +5990,33 @@ WXWORD WXToVK(int wxk, bool *isExtended)
                 vk = vks;
             }
             else
-#endif // !__WXWINCE__
+#endif
             {
+                if ( isVirtual )
+                    *isVirtual = false;
                 vk = (WXWORD)wxk;
             }
     }
 
-    if ( isExtended )
-        *isExtended = extended;
-
     return vk;
 }
 
-} // namespace wxMSWKeyboard
+#ifndef SM_SWAPBUTTON
+    #define SM_SWAPBUTTON 23
+#endif
 
 // small helper for wxGetKeyState() and wxGetMouseState()
 static inline bool wxIsKeyDown(WXWORD vk)
 {
-    // SM_SWAPBUTTON is not available under CE, so don't swap buttons there
-#ifdef SM_SWAPBUTTON
-    if ( vk == VK_LBUTTON || vk == VK_RBUTTON )
+    switch (vk)
     {
-        if ( ::GetSystemMetrics(SM_SWAPBUTTON) )
-        {
-            if ( vk == VK_LBUTTON )
-                vk = VK_RBUTTON;
-            else // vk == VK_RBUTTON
-                vk = VK_LBUTTON;
-        }
+        case VK_LBUTTON:
+            if (GetSystemMetrics(SM_SWAPBUTTON)) vk = VK_RBUTTON;
+            break;
+        case VK_RBUTTON:
+            if (GetSystemMetrics(SM_SWAPBUTTON)) vk = VK_LBUTTON;
+            break;
     }
-#endif // SM_SWAPBUTTON
-
     // the low order bit indicates whether the key was pressed since the last
     // call and the high order one indicates whether it is down right now and
     // we only want that one
@@ -6495,7 +6032,7 @@ bool wxGetKeyState(wxKeyCode key)
                         key != VK_MBUTTON,
                     wxT("can't use wxGetKeyState() for mouse buttons") );
 
-    const WXWORD vk = wxMSWKeyboard::WXToVK(key);
+    const WXWORD vk = wxCharCodeWXToMSW(key);
 
     // if the requested key is a LED key, return true if the led is pressed
     if ( key == WXK_NUMLOCK || key == WXK_CAPITAL || key == WXK_SCROLL )
@@ -6517,21 +6054,17 @@ wxMouseState wxGetMouseState()
 {
     wxMouseState ms;
     POINT pt;
-    wxGetCursorPosMSW(&pt);
+    GetCursorPos( &pt );
 
     ms.SetX(pt.x);
     ms.SetY(pt.y);
     ms.SetLeftDown(wxIsKeyDown(VK_LBUTTON));
     ms.SetMiddleDown(wxIsKeyDown(VK_MBUTTON));
     ms.SetRightDown(wxIsKeyDown(VK_RBUTTON));
-#ifdef wxHAS_XBUTTON
-    ms.SetAux1Down(wxIsKeyDown(VK_XBUTTON1));
-    ms.SetAux2Down(wxIsKeyDown(VK_XBUTTON2));
-#endif // wxHAS_XBUTTON
 
-    ms.SetControlDown(wxIsCtrlDown ());
-    ms.SetShiftDown  (wxIsShiftDown());
-    ms.SetAltDown    (wxIsAltDown  ());
+    ms.SetControlDown(wxIsKeyDown(VK_CONTROL));
+    ms.SetShiftDown(wxIsKeyDown(VK_SHIFT));
+    ms.SetAltDown(wxIsKeyDown(VK_MENU));
 //    ms.SetMetaDown();
 
     return ms;
@@ -6543,7 +6076,7 @@ wxWindow *wxGetActiveWindow()
     HWND hWnd = GetActiveWindow();
     if ( hWnd != 0 )
     {
-        return wxFindWinFromHandle(hWnd);
+        return wxFindWinFromHandle((WXHWND) hWnd);
     }
     return NULL;
 }
@@ -6555,19 +6088,19 @@ extern wxWindow *wxGetWindowFromHWND(WXHWND hWnd)
     // For a radiobutton, we get the radiobox from GWL_USERDATA (which is set
     // by code in msw/radiobox.cpp), for all the others we just search up the
     // window hierarchy
-    wxWindow *win = NULL;
+    wxWindow *win = (wxWindow *)NULL;
     if ( hwnd )
     {
-        win = wxFindWinFromHandle(hwnd);
+        win = wxFindWinFromHandle((WXHWND)hwnd);
         if ( !win )
         {
-#if wxUSE_RADIOBOX && !defined(__WXUNIVERSAL__)
+#if wxUSE_RADIOBOX
             // native radiobuttons return DLGC_RADIOBUTTON here and for any
             // wxWindow class which overrides WM_GETDLGCODE processing to
             // do it as well, win would be already non NULL
             if ( ::SendMessage(hwnd, WM_GETDLGCODE, 0, 0) & DLGC_RADIOBUTTON )
             {
-                win = wxRadioBox::GetFromRadioButtonHWND(hwnd);
+                win = (wxWindow *)wxGetWindowUserData(hwnd);
             }
             //else: it's a wxRadioButton, not a radiobutton from wxRadioBox
 #endif // wxUSE_RADIOBOX
@@ -6602,7 +6135,7 @@ extern wxWindow *wxGetWindowFromHWND(WXHWND hWnd)
 #endif
 
         hwnd = ::GetParent(hwnd);
-        win = wxFindWinFromHandle(hwnd);
+        win = wxFindWinFromHandle((WXHWND)hwnd);
     }
 
     return win;
@@ -6620,54 +6153,37 @@ wxKeyboardHook(int nCode, WORD wParam, DWORD lParam)
     DWORD hiWord = HIWORD(lParam);
     if ( nCode != HC_NOREMOVE && ((hiWord & KF_UP) == 0) )
     {
-        wchar_t uc;
-        int id = wxMSWKeyboard::VKToWX(wParam, lParam, &uc);
-
-        // Don't intercept keyboard entry (notably Escape) if a modal window
-        // (not managed by wx, e.g. IME one) is currently opened as more often
-        // than not it needs all the keys for itself.
-        //
-        // Also don't catch it if a window currently captures the mouse as
-        // Escape is normally used to release the mouse capture and if you
-        // really need to catch all the keys in the window that has mouse
-        // capture it can be easily done in its own EVT_CHAR handler as it is
-        // certain to have focus while it has the capture.
-        if ( !gs_modalEntryWindowCount && !::GetCapture() )
+        int id = wxCharCodeMSWToWX(wParam, lParam);
+        if ( id != 0 )
         {
-            if ( id != WXK_NONE
-#if wxUSE_UNICODE
-                    || static_cast<int>(uc) != WXK_NONE
-#endif // wxUSE_UNICODE
-                    )
+            wxKeyEvent event(wxEVT_CHAR_HOOK);
+            if ( (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN )
+                event.m_altDown = true;
+
+            event.SetEventObject(NULL);
+            event.m_keyCode = id;
+            event.m_shiftDown = wxIsShiftDown();
+            event.m_controlDown = wxIsCtrlDown();
+#ifndef __WXWINCE__
+            event.SetTimestamp(::GetMessageTime());
+#endif
+            wxWindow *win = wxGetActiveWindow();
+            wxEvtHandler *handler;
+            if ( win )
             {
-                wxWindow const* win = wxWindow::DoFindFocus();
-                if ( !win )
-                {
-                    // Even if the focus got lost somehow, still send the event
-                    // to the top level parent to allow a wxDialog to always
-                    // close on Escape.
-                    win = wxGetActiveWindow();
-                }
+                handler = win->GetEventHandler();
+                event.SetId(win->GetId());
+            }
+            else
+            {
+                handler = wxTheApp;
+                event.SetId(wxID_ANY);
+            }
 
-                wxKeyEvent event(wxEVT_CHAR_HOOK);
-                MSWInitAnyKeyEvent(event, wParam, lParam, win);
-
-                event.m_keyCode = id;
-#if wxUSE_UNICODE
-                event.m_uniChar = uc;
-#endif // wxUSE_UNICODE
-
-                wxEvtHandler * const handler = win ? win->GetEventHandler()
-                                                   : wxTheApp;
-
-                if ( handler && handler->ProcessEvent(event) )
-                {
-                    if ( !event.IsNextEventAllowed() )
-                    {
-                        // Stop processing of this event.
-                        return 1;
-                    }
-                }
+            if ( handler && handler->ProcessEvent(event) )
+            {
+                // processed
+                return 1;
             }
         }
     }
@@ -6688,7 +6204,7 @@ void wxSetKeyboardHook(bool doIt)
                               );
         if ( !wxTheKeyboardHook )
         {
-            wxLogLastError(wxT("SetWindowsHookEx(wxKeyboardHook)"));
+            wxLogLastError(_T("SetWindowsHookEx(wxKeyboardHook)"));
         }
     }
     else // uninstall
@@ -6700,7 +6216,7 @@ void wxSetKeyboardHook(bool doIt)
 
 #endif // !__WXMICROWIN__
 
-#if wxDEBUG_LEVEL >= 2
+#ifdef __WXDEBUG__
 const wxChar *wxGetMessageName(int message)
 {
     switch ( message )
@@ -6792,46 +6308,6 @@ const wxChar *wxGetMessageName(int message)
         case 0x00A7: return wxT("WM_NCMBUTTONDOWN");
         case 0x00A8: return wxT("WM_NCMBUTTONUP");
         case 0x00A9: return wxT("WM_NCMBUTTONDBLCLK");
-
-        case 0x00B0: return wxT("EM_GETSEL");
-        case 0x00B1: return wxT("EM_SETSEL");
-        case 0x00B2: return wxT("EM_GETRECT");
-        case 0x00B3: return wxT("EM_SETRECT");
-        case 0x00B4: return wxT("EM_SETRECTNP");
-        case 0x00B5: return wxT("EM_SCROLL");
-        case 0x00B6: return wxT("EM_LINESCROLL");
-        case 0x00B7: return wxT("EM_SCROLLCARET");
-        case 0x00B8: return wxT("EM_GETMODIFY");
-        case 0x00B9: return wxT("EM_SETMODIFY");
-        case 0x00BA: return wxT("EM_GETLINECOUNT");
-        case 0x00BB: return wxT("EM_LINEINDEX");
-        case 0x00BC: return wxT("EM_SETHANDLE");
-        case 0x00BD: return wxT("EM_GETHANDLE");
-        case 0x00BE: return wxT("EM_GETTHUMB");
-        case 0x00C1: return wxT("EM_LINELENGTH");
-        case 0x00C2: return wxT("EM_REPLACESEL");
-        case 0x00C4: return wxT("EM_GETLINE");
-        case 0x00C5: return wxT("EM_LIMITTEXT/EM_SETLIMITTEXT"); /* ;win40 Name change */
-        case 0x00C6: return wxT("EM_CANUNDO");
-        case 0x00C7: return wxT("EM_UNDO");
-        case 0x00C8: return wxT("EM_FMTLINES");
-        case 0x00C9: return wxT("EM_LINEFROMCHAR");
-        case 0x00CB: return wxT("EM_SETTABSTOPS");
-        case 0x00CC: return wxT("EM_SETPASSWORDCHAR");
-        case 0x00CD: return wxT("EM_EMPTYUNDOBUFFER");
-        case 0x00CE: return wxT("EM_GETFIRSTVISIBLELINE");
-        case 0x00CF: return wxT("EM_SETREADONLY");
-        case 0x00D0: return wxT("EM_SETWORDBREAKPROC");
-        case 0x00D1: return wxT("EM_GETWORDBREAKPROC");
-        case 0x00D2: return wxT("EM_GETPASSWORDCHAR");
-        case 0x00D3: return wxT("EM_SETMARGINS");
-        case 0x00D4: return wxT("EM_GETMARGINS");
-        case 0x00D5: return wxT("EM_GETLIMITTEXT");
-        case 0x00D6: return wxT("EM_POSFROMCHAR");
-        case 0x00D7: return wxT("EM_CHARFROMPOS");
-        case 0x00D8: return wxT("EM_SETIMESTATUS");
-        case 0x00D9: return wxT("EM_GETIMESTATUS");
-
         case 0x0100: return wxT("WM_KEYDOWN");
         case 0x0101: return wxT("WM_KEYUP");
         case 0x0102: return wxT("WM_CHAR");
@@ -6869,6 +6345,7 @@ const wxChar *wxGetMessageName(int message)
         case 0x0136: return wxT("WM_CTLCOLORDLG");
         case 0x0137: return wxT("WM_CTLCOLORSCROLLBAR");
         case 0x0138: return wxT("WM_CTLCOLORSTATIC");
+
         case 0x01E1: return wxT("MN_GETHMENU");
 
         case 0x0200: return wxT("WM_MOUSEMOVE");
@@ -6882,9 +6359,6 @@ const wxChar *wxGetMessageName(int message)
         case 0x0208: return wxT("WM_MBUTTONUP");
         case 0x0209: return wxT("WM_MBUTTONDBLCLK");
         case 0x020A: return wxT("WM_MOUSEWHEEL");
-        case 0x020B: return wxT("WM_XBUTTONDOWN");
-        case 0x020C: return wxT("WM_XBUTTONUP");
-        case 0x020D: return wxT("WM_XBUTTONDBLCLK");
         case 0x0210: return wxT("WM_PARENTNOTIFY");
         case 0x0211: return wxT("WM_ENTERMENULOOP");
         case 0x0212: return wxT("WM_EXITMENULOOP");
@@ -6918,11 +6392,6 @@ const wxChar *wxGetMessageName(int message)
         case 0x0290: return wxT("WM_IME_KEYDOWN");
         case 0x0291: return wxT("WM_IME_KEYUP");
 
-        case 0x02A0: return wxT("WM_NCMOUSEHOVER");
-        case 0x02A1: return wxT("WM_MOUSEHOVER");
-        case 0x02A2: return wxT("WM_NCMOUSELEAVE");
-        case 0x02A3: return wxT("WM_MOUSELEAVE");
-
         case 0x0300: return wxT("WM_CUT");
         case 0x0301: return wxT("WM_COPY");
         case 0x0302: return wxT("WM_PASTE");
@@ -6941,10 +6410,9 @@ const wxChar *wxGetMessageName(int message)
         case 0x030F: return wxT("WM_QUERYNEWPALETTE");
         case 0x0310: return wxT("WM_PALETTEISCHANGING");
         case 0x0311: return wxT("WM_PALETTECHANGED");
+#if wxUSE_HOTKEY
         case 0x0312: return wxT("WM_HOTKEY");
-
-        case 0x0317: return wxT("WM_PRINT");
-        case 0x0318: return wxT("WM_PRINTCLIENT");
+#endif
 
         // common controls messages - although they're not strictly speaking
         // standard, it's nice to decode them nevertheless
@@ -7173,7 +6641,7 @@ const wxChar *wxGetMessageName(int message)
             return s_szBuf.c_str();
     }
 }
-#endif // wxDEBUG_LEVEL >= 2
+#endif //__WXDEBUG__
 
 static TEXTMETRIC wxGetTextMetrics(const wxWindowMSW *win)
 {
@@ -7222,14 +6690,6 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     pt2.y = pt.y;
 
     HWND hWnd = ::WindowFromPoint(pt2);
-    if ( hWnd )
-    {
-        // WindowFromPoint() ignores the disabled children but we're supposed
-        // to take them into account, so check if we have a child at this
-        // coordinate.
-        ::ScreenToClient(hWnd, &pt2);
-        hWnd = ::ChildWindowFromPointEx(hWnd, pt2, CWP_SKIPINVISIBLE);
-    }
 
     return wxGetWindowFromHWND((WXHWND)hWnd);
 }
@@ -7238,7 +6698,11 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 wxPoint wxGetMousePosition()
 {
     POINT pt;
-    wxGetCursorPosMSW(&pt);
+#ifdef __WXWINCE__
+    GetCursorPosWinCE(&pt);
+#else
+    GetCursorPos( & pt );
+#endif
 
     return wxPoint(pt.x, pt.y);
 }
@@ -7253,10 +6717,10 @@ static void WinCEUnregisterHotKey(int modifiers, int id)
     typedef BOOL (WINAPI *UnregisterFunc1Proc)(UINT, UINT);
 
     UnregisterFunc1Proc procUnregisterFunc;
-    hCoreDll = LoadLibrary(wxT("coredll.dll"));
+    hCoreDll = LoadLibrary(_T("coredll.dll"));
     if (hCoreDll)
     {
-        procUnregisterFunc = (UnregisterFunc1Proc)GetProcAddress(hCoreDll, wxT("UnregisterFunc1"));
+        procUnregisterFunc = (UnregisterFunc1Proc)GetProcAddress(hCoreDll, _T("UnregisterFunc1"));
         if (procUnregisterFunc)
             procUnregisterFunc(modifiers, id);
         FreeLibrary(hCoreDll);
@@ -7284,7 +6748,7 @@ bool wxWindowMSW::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
 
     if ( !::RegisterHotKey(GetHwnd(), hotkeyId, win_modifiers, keycode) )
     {
-        wxLogLastError(wxT("RegisterHotKey"));
+        wxLogLastError(_T("RegisterHotKey"));
 
         return false;
     }
@@ -7300,7 +6764,7 @@ bool wxWindowMSW::UnregisterHotKey(int hotkeyId)
 
     if ( !::UnregisterHotKey(GetHwnd(), hotkeyId) )
     {
-        wxLogLastError(wxT("UnregisterHotKey"));
+        wxLogLastError(_T("UnregisterHotKey"));
 
         return false;
     }
@@ -7312,16 +6776,18 @@ bool wxWindowMSW::UnregisterHotKey(int hotkeyId)
 
 bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
 {
+    int hotkeyId = wParam;
+    int virtualKey = HIWORD(lParam);
     int win_modifiers = LOWORD(lParam);
 
-    wxKeyEvent event(CreateKeyEvent(wxEVT_HOTKEY, HIWORD(lParam)));
-    event.SetId(wParam);
+    wxKeyEvent event(CreateKeyEvent(wxEVT_HOTKEY, virtualKey, wParam, lParam));
+    event.SetId(hotkeyId);
     event.m_shiftDown = (win_modifiers & MOD_SHIFT) != 0;
     event.m_controlDown = (win_modifiers & MOD_CONTROL) != 0;
     event.m_altDown = (win_modifiers & MOD_ALT) != 0;
     event.m_metaDown = (win_modifiers & MOD_WIN) != 0;
 
-    return HandleWindowEvent(event);
+    return GetEventHandler()->ProcessEvent(event);
 }
 
 #endif // wxUSE_ACCEL
@@ -7351,7 +6817,7 @@ public:
 
         if ( !ms_hMsgHookProc )
         {
-            wxLogLastError(wxT("SetWindowsHookEx(WH_GETMESSAGE)"));
+            wxLogLastError(_T("SetWindowsHookEx(WH_GETMESSAGE)"));
 
             return false;
         }
@@ -7396,7 +6862,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIdleWakeUpModule, wxModule)
 #if wxUSE_STATBOX
 static void wxAdjustZOrder(wxWindow* parent)
 {
-    if (wxDynamicCast(parent, wxStaticBox))
+    if (parent->IsKindOf(CLASSINFO(wxStaticBox)))
     {
         // Set the z-order correctly
         SetWindowPos((HWND) parent->GetHWND(), HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
diff --git a/Source/3rd Party/wx/src/png/CHANGES b/Source/3rd Party/wx/src/png/CHANGES
new file mode 100644
index 000000000..b34597fc5
--- /dev/null
+++ b/Source/3rd Party/wx/src/png/CHANGES	
@@ -0,0 +1,1373 @@
+
+CHANGES - changes for libpng
+
+version 0.2
+  added reader into png.h
+  fixed small problems in stub file
+
+version 0.3
+  added pull reader
+  split up pngwrite.c to several files
+  added pnglib.txt
+  added example.c
+  cleaned up writer, adding a few new tranformations
+  fixed some bugs in writer
+  interfaced with zlib 0.5
+  added K&R support
+  added check for 64 KB blocks for 16 bit machines
+
+version 0.4
+  cleaned up code and commented code
+  simplified time handling into png_time
+  created png_color_16 and png_color_8 to handle color needs
+  cleaned up color type defines
+  fixed various bugs
+  made various names more consistant
+  interfaced with zlib 0.71
+  cleaned up zTXt reader and writer (using zlib's Reset functions)
+  split transformations into pngrtran.c and pngwtran.c
+
+version 0.5
+  interfaced with zlib 0.8
+  fixed many reading and writing bugs
+  saved using 3 spaces instead of tabs
+
+version 0.6
+  added png_large_malloc() and png_large_free()
+  added png_size_t
+  cleaned up some compiler warnings
+  added png_start_read_image()
+
+version 0.7
+  cleaned up lots of bugs
+  finished dithering and other stuff
+  added test program
+  changed name from pnglib to libpng
+
+version 0.71 [June, 1995]
+  changed pngtest.png for zlib 0.93
+  fixed error in libpng.txt and example.c
+
+version 0.8
+  cleaned up some bugs
+  added png_set_filler()
+  split up pngstub.c into pngmem.c, pngio.c, and pngerror.c
+  added #define's to remove unwanted code
+  moved png_info_init() to png.c
+  added old_size into png_realloc()
+  added functions to manually set filtering and compression info
+  changed compression parameters based on image type
+  optimized filter selection code
+  added version info
+  changed external functions passing floats to doubles (k&r problems?)
+  put all the configurable stuff in pngconf.h
+  enabled png_set_shift to work with paletted images on read
+  added png_read_update_info() - updates info structure with
+     transformations
+
+version 0.81 [August, 1995]
+  incorporated Tim Wegner's medium model code (thanks, Tim)
+
+version 0.82 [September, 1995]
+  [unspecified changes]
+
+version 0.85 [December, 1995]
+  added more medium model code (almost everything's a far)
+  added i/o, error, and memory callback functions
+  fixed some bugs (16 bit, 4 bit interlaced, etc.)
+  added first run progressive reader (barely tested)
+
+version 0.86 [January, 1996]
+  fixed bugs
+  improved documentation
+
+version 0.87 [January, 1996]
+  fixed medium model bugs
+  fixed other bugs introduced in 0.85 and 0.86
+  added some minor documentation
+
+version 0.88 [January, 1996]
+  fixed progressive bugs
+  replaced tabs with spaces
+  cleaned up documentation
+  added callbacks for read/write and warning/error functions
+
+version 0.89 [July, 1996]
+  added new initialization API to make libpng work better with shared libs
+     we now have png_create_read_struct(), png_create_write_struct(),
+     png_create_info_struct(), png_destroy_read_struct(), and
+     png_destroy_write_struct() instead of the separate calls to
+     malloc and png_read_init(), png_info_init(), and png_write_init()
+  changed warning/error callback functions to fix bug - this means you
+     should use the new initialization API if you were using the old
+     png_set_message_fn() calls, and that the old API no longer exists
+     so that people are aware that they need to change their code
+  changed filter selection API to allow selection of multiple filters
+     since it didn't work in previous versions of libpng anyways
+  optimized filter selection code
+  fixed png_set_background() to allow using an arbitrary RGB color for
+     paletted images
+  fixed gamma and background correction for paletted images, so
+     png_correct_palette is not needed unless you are correcting an
+     external palette (you will need to #define PNG_CORRECT_PALETTE_SUPPORTED
+     in pngconf.h) - if nobody uses this, it may disappear in the future.
+  fixed bug with Borland 64K memory allocation (Alexander Lehmann)
+  fixed bug in interlace handling (Smarasderagd, I think)
+  added more error checking for writing and image to reduce invalid files
+  separated read and write functions so that they won't both be linked
+     into a binary when only reading or writing functionality is used
+  new pngtest image also has interlacing and zTXt
+  updated documentation to reflect new API
+
+version 0.90 [January, 1997]
+  made CRC errors/warnings on critical and ancillary chunks configurable
+  libpng will use the zlib CRC routines by (compile-time) default
+  changed DOS small/medium model memory support - needs zlib 1.04 (Tim Wegner)
+  added external C++ wrapper statements to png.h (Gilles Dauphin)
+  allow PNG file to be read when some or all of file signature has already
+     been read from the beginning of the stream.  ****This affects the size
+     of info_struct and invalidates all programs that use a shared libpng****
+  fixed png_filler() declarations
+  fixed? background color conversions
+  fixed order of error function pointers to match documentation
+  current chunk name is now available in png_struct to reduce the number
+     of nearly identical error messages (will simplify multi-lingual
+     support when available)
+  try to get ready for unknown-chunk callback functions:
+     - previously read critical chunks are flagged, so the chunk handling
+       routines can determine if the chunk is in the right place
+     - all chunk handling routines have the same prototypes, so we will
+       be able to handle all chunks via a callback mechanism
+  try to fix Linux "setjmp" buffer size problems
+  removed png_large_malloc, png_large_free, and png_realloc functions.
+
+version 0.95 [March, 1997]
+  fixed bug in pngwutil.c allocating "up_row" twice and "avg_row" never
+  fixed bug in PNG file signature compares when start != 0
+  changed parameter type of png_set_filler(...filler...) from png_byte
+     to png_uint_32
+  added test for MACOS to ensure that both math.h and fp.h are not #included
+  added macros for libpng to be compiled as a Windows DLL (Andreas Kupries)
+  added "packswap" transformation, which changes the endianness of
+     packed-pixel bytes (Kevin Bracey)
+  added "strip_alpha" transformation, which removes the alpha channel of
+     input images without using it (not neccesarily a good idea)
+  added "swap_alpha" transformation, which puts the alpha channel in front
+     of the color bytes instead of after
+  removed all implicit variable tests which assume NULL == 0 (I think)
+  changed several variables to "png_size_t" to show 16/32-bit limitations
+  added new pCAL chunk read/write support
+  added experimental filter selection weighting (Greg Roelofs)
+  removed old png_set_rgbx() and png_set_xrgb() functions that have been
+     obsolete for about 2 years now (use png_set_filler() instead)
+  added macros to read 16- and 32-bit ints directly from buffer, to be
+     used only on those systems that support it (namely PowerPC and 680x0)
+     With some testing, this may become the default for MACOS/PPC systems.
+  only calculate CRC on data if we are going to use it
+  added macros for zTXt compression type PNG_zTXt_COMPRESSION_???
+  added macros for simple libpng debugging output selectable at compile time
+  removed PNG_READ_END_MODE in progressive reader (Smarasderagd)
+  more description of info_struct in libpng.txt and png.h
+  more instructions in example.c
+  more chunk types tested in pngtest.c
+  renamed pngrcb.c to pngset.c, and all png_read_<chunk> functions to be
+     png_set_<chunk>.  We now have corresponding png_get_<chunk>
+     functions in pngget.c to get infomation in info_ptr.  This isolates
+     the application from the internal organization of png_info_struct
+     (good for shared library implementations).
+
+version 0.96 [May, 1997]
+  fixed serious bug with < 8bpp images introduced in 0.95
+  fixed 256-color transparency bug (Greg Roelofs)
+  fixed up documentation (Greg Roelofs, Laszlo Nyul)
+  fixed "error" in pngconf.h for Linux setjmp() behaviour
+  fixed DOS medium model support (Tim Wegner)
+  fixed png_check_keyword() for case with error in static string text
+  added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul)
+  added typecasts to quiet compiler errors
+  added more debugging info
+
+version 0.97 [January, 1998]
+  removed PNG_USE_OWN_CRC capability
+  relocated png_set_crc_action from pngrutil.c to pngrtran.c
+  fixed typecasts of "new_key", etc. (Andreas Dilger)
+  added RFC 1152 [sic] date support
+  fixed bug in gamma handling of 4-bit grayscale
+  added 2-bit grayscale gamma handling (Glenn R-P)
+  added more typecasts. 65536L becomes (png_uint_32)65536L, etc. (Glenn R-P)
+  minor corrections in libpng.txt
+  added simple sRGB support (Glenn R-P)
+  easier conditional compiling, e.g. define PNG_READ/WRITE_NOT_FULLY_SUPPORTED;
+     all configurable options can be selected from command-line instead
+     of having to edit pngconf.h (Glenn R-P)
+  fixed memory leak in pngwrite.c (free info_ptr->text) (Glenn R-P)
+  added more conditions for png_do_background, to avoid changing
+     black pixels to background when a background is supplied and
+     no pixels are transparent
+  repaired PNG_NO_STDIO behaviour
+  tested NODIV support and made it default behaviour (Greg Roelofs)
+  added "-m" option and PNGTEST_DEBUG_MEMORY to pngtest (John Bowler)
+  regularized version numbering scheme and bumped shared-library major
+     version number to 2 to avoid problems with libpng 0.89 apps (Greg Roelofs)
+
+version 0.98 [January, 1998]
+  cleaned up some typos in libpng.txt and in code documentation
+  fixed memory leaks in pCAL chunk processing (Glenn R-P and John Bowler)
+  cosmetic change "display_gamma" to "screen_gamma" in pngrtran.c
+  changed recommendation about file_gamma for PC images to .51 from .45,
+     in example.c and libpng.txt, added comments to distinguish between
+     screen_gamma, viewing_gamma, and display_gamma.
+  changed all references to RFC1152 to read RFC1123 and changed the
+     PNG_TIME_RFC1152_SUPPORTED macro to PNG_TIME_RFC1123_SUPPORTED
+  added png_invert_alpha capability (Glenn R-P -- suggestion by Jon Vincent)
+  changed srgb_intent from png_byte to int to avoid compiler bugs
+
+version 0.99 [January 30, 1998]
+  free info_ptr->text instead of end_info_ptr->text in pngread.c (John Bowler)
+  fixed a longstanding "packswap" bug in pngtrans.c
+  fixed some inconsistencies in pngconf.h that prevented compiling with
+     PNG_READ_GAMMA_SUPPORTED and PNG_READ_hIST_SUPPORTED undefined
+  fixed some typos and made other minor rearrangement of libpng.txt (Andreas)
+  changed recommendation about file_gamma for PC images to .50 from .51 in
+     example.c and libpng.txt, and changed file_gamma for sRGB images to .45
+  added a number of functions to access information from the png structure
+     png_get_image_height(), etc. (Glenn R-P, suggestion by Brad Pettit)
+  added TARGET_MACOS similar to zlib-1.0.8
+  define PNG_ALWAYS_EXTERN when __MWERKS__ && WIN32 are defined
+  added type casting to all png_malloc() function calls
+version 0.99a [January 31, 1998]
+  Added type casts and parentheses to all returns that return a value.(Tim W.)
+version 0.99b [February 4, 1998]
+  Added type cast png_uint_32 on malloc function calls where needed.
+  Changed type of num_hist from png_uint_32 to int (same as num_palette).
+  Added checks for rowbytes overflow, in case png_size_t is less than 32 bits.
+  Renamed makefile.elf to makefile.lnx.
+version 0.99c [February 7, 1998]
+  More type casting.  Removed erroneous overflow test in pngmem.c.
+  Added png_buffered_memcpy() and png_buffered_memset(), apply them to rowbytes.
+  Added UNIX manual pages libpng.3 (incorporating libpng.txt) and  png.5.
+version 0.99d [February 11, 1998]
+  Renamed "far_to_near()" "png_far_to_near()"
+  Revised libpng.3
+  Version 99c "buffered" operations didn't work as intended.  Replaced them
+    with png_memcpy_check() and png_memset_check().
+  Added many "if (png_ptr == NULL) return" to quell compiler warnings about
+    unused png_ptr, mostly in pngget.c and pngset.c.
+  Check for overlength tRNS chunk present when indexed-color PLTE is read.
+  Cleaned up spelling errors in libpng.3/libpng.txt
+  Corrected a problem with png_get_tRNS() which returned undefined trans array
+version 0.99e [February 28, 1998]
+  Corrected png_get_tRNS() again.
+  Add parentheses for easier reading of pngget.c, fixed "||" should be "&&".
+  Touched up example.c to make more of it compileable, although the entire
+    file still can't be compiled (Willem van Schaik)
+  Fixed a bug in png_do_shift() (Bryan Tsai)
+  Added a space in png.h prototype for png_write_chunk_start()
+  Replaced pngtest.png with one created with zlib 1.1.1
+  Changed pngtest to report PASS even when file size is different (Jean-loup G.)
+  Corrected some logic errors in png_do_invert_alpha() (Chris Patterson)
+version 0.99f [March 5, 1998]
+  Corrected a bug in pngpread() introduced in version 99c (Kevin Bracey)
+  Moved makefiles into a "scripts" directory, and added INSTALL instruction file
+  Added makefile.os2 and pngos2.def (A. Zabolotny) and makefile.s2x (W. Sebok)
+  Added pointers to "note on libpng versions" in makefile.lnx and README
+  Added row callback feature when reading and writing nonprogressive rows
+     and added a test of this feature in pngtest.c
+  Added user transform callbacks, with test of the feature in pngtest.c
+version 0.99g [March 6, 1998, morning]
+  Minor changes to pngtest.c to suppress compiler warnings.
+  Removed "beta" language from documentation.
+version 0.99h [March 6, 1998, evening]
+  Minor changes to previous minor changes to pngtest.c
+  Changed PNG_READ_NOT_FULLY_SUPPORTED to PNG_READ_TRANSFORMS_NOT_SUPPORTED
+  and added PNG_PROGRESSIVE_READ_NOT_SUPPORTED macro
+  Added user transform capability
+
+version 1.00 [March 7, 1998]
+  Changed several typedefs in pngrutil.c
+  Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik)
+  replaced "while(1)" with "for(;;)"
+  added PNGARG() to prototypes in pngtest.c and removed some prototypes
+  updated some of the makefiles (Tom Lane)
+  changed some typedefs (s_start, etc.) in pngrutil.c
+  fixed dimensions of "short_months" array in pngwrite.c
+  Replaced ansi2knr.c with the one from jpeg-v6
+
+version 1.0.0 [March 8, 1998]
+  Changed name from 1.00 to 1.0.0 (Adam Costello)
+  Added smakefile.ppc (with SCOPTIONS.ppc) for Amiga PPC (Andreas Kleinert)
+version 1.0.0a [March 9, 1998]
+  Fixed three bugs in pngrtran.c to make gamma+background handling consistent
+  (Greg Roelofs)
+  Changed format of the PNG_LIBPNG_VER integer to xyyzz instead of xyz
+  for major, minor, and bugfix releases.  This is 10001. (Adam Costello,
+  Tom Lane)
+  Make months range from 1-12 in png_convert_to_rfc1123
+version 1.0.0b [March 13, 1998]
+  Quieted compiler complaints about two empty "for" loops in pngrutil.c
+  Minor changes to makefile.s2x
+  Removed #ifdef/#endif around a png_free() in pngread.c
+
+version 1.0.1 [March 14, 1998]
+  Changed makefile.s2x to reduce security risk of using a relative pathname
+  Fixed some typos in the documentation (Greg).
+  Fixed a problem with value of "channels" returned by png_read_update_info()
+version 1.0.1a [April 21, 1998]
+  Optimized Paeth calculations by replacing abs() function calls with intrinsics
+  plus other loop optimizations. Improves avg decoding speed by about 20%.
+  Commented out i386istic "align" compiler flags in makefile.lnx.
+  Reduced the default warning level in some makefiles, to make them consistent.
+  Removed references to IJG and JPEG in the ansi2knr.c copyright statement.
+  Fixed a bug in png_do_strip_filler with XXRRGGBB => RRGGBB transformation.
+  Added grayscale and 16-bit capability to png_do_read_filler().
+  Fixed a bug in pngset.c, introduced in version 0.99c, that sets rowbytes
+    too large when writing an image with bit_depth < 8 (Bob Dellaca).
+  Corrected some bugs in the experimental weighted filtering heuristics.
+  Moved a misplaced pngrutil code block that truncates tRNS if it has more
+    than num_palette entries -- test was done before num_palette was defined.
+  Fixed a png_convert_to_rfc1123() bug that converts day 31 to 0 (Steve Eddins).
+  Changed compiler flags in makefile.wat for better optimization (Pawel Mrochen).
+version 1.0.1b [May 2, 1998]
+  Relocated png_do_gray_to_rgb() within png_do_read_transformations() (Greg).
+  Relocated the png_composite macros from pngrtran.c to png.h (Greg).
+  Added makefile.sco (contributed by Mike Hopkirk).
+  Fixed two bugs (missing definitions of "istop") introduced in libpng-1.0.1a.
+  Fixed a bug in pngrtran.c that would set channels=5 under some circumstances.
+  More work on the Paeth-filtering, achieving imperceptible speedup (A Kleinert).
+  More work on loop optimization which may help when compiled with C++ compilers.
+  Added warnings when people try to use transforms they've defined out.
+  Collapsed 4 "i" and "c" loops into single "i" loops in pngrtran and pngwtran.
+  Revised paragraph about png_set_expand() in libpng.txt and libpng.3 (Greg)
+version 1.0.1c [May 11, 1998]
+  Fixed a bug in pngrtran.c (introduced in libpng-1.0.1a) where the masks for
+    filler bytes should have been 0xff instead of 0xf.
+  Added max_pixel_depth=32 in pngrutil.c when using FILLER with palette images.
+  Moved PNG_WRITE_WEIGHTED_FILTER_SUPPORTED and PNG_WRITE_FLUSH_SUPPORTED
+    out of the PNG_WRITE_TRANSFORMS_NOT_SUPPORTED block of pngconf.h
+  Added "PNG_NO_WRITE_TRANSFORMS" etc., as alternatives for *_NOT_SUPPORTED,
+    for consistency, in pngconf.h
+  Added individual "ifndef PNG_NO_[CAPABILITY]" in pngconf.h to make it easier
+    to remove unwanted capabilities via the compile line
+  Made some corrections to grammar (which, it's) in documentation (Greg).
+  Corrected example.c, use of row_pointers in png_write_image().
+version 1.0.1d [May 24, 1998]
+  Corrected several statements that used side effects illegally in pngrutil.c
+    and pngtrans.c, that were introduced in version 1.0.1b
+  Revised png_read_rows() to avoid repeated if-testing for NULL (A Kleinert)
+  More corrections to example.c, use of row_pointers in png_write_image()
+    and png_read_rows().
+  Added pngdll.mak and pngdef.pas to scripts directory, contributed by
+    Bob Dellaca, to make a png32bd.dll with Borland C++ 4.5
+  Fixed error in example.c with png_set_text: num_text is 3, not 2 (Guido V.)
+  Changed several loops from count-down to count-up, for consistency.
+version 1.0.1e [June 6, 1998]
+  Revised libpng.txt and libpng.3 description of png_set_read|write_fn(), and
+    added warnings when people try to set png_read_fn and png_write_fn in
+    the same structure.
+  Added a test such that png_do_gamma will be done when num_trans==0
+    for truecolor images that have defined a background.  This corrects an
+    error that was introduced in libpng-0.90 that can cause gamma processing
+    to be skipped.
+  Added tests in png.h to include "trans" and "trans_values" in structures
+    when PNG_READ_BACKGROUND_SUPPORTED or PNG_READ_EXPAND_SUPPORTED is defined.
+  Add png_free(png_ptr->time_buffer) in png_destroy_read_struct()
+  Moved png_convert_to_rfc_1123() from pngwrite.c to png.c
+  Added capability for user-provided malloc_fn() and free_fn() functions,
+    and revised pngtest.c to demonstrate their use, replacing the
+    PNGTEST_DEBUG_MEM feature.
+  Added makefile.w32, for Microsoft C++ 4.0 and later (Tim Wegner).
+
+version 1.0.2 [June 14, 1998]
+  Fixed two bugs in makefile.bor .
+version 1.0.2a [December 30, 1998]
+  Replaced and extended code that was removed from png_set_filler() in 1.0.1a.
+  Fixed a bug in png_do_filler() that made it fail to write filler bytes in
+    the left-most pixel of each row (Kevin Bracey).
+  Changed "static pngcharp tIME_string" to "static char tIME_string[30]"
+    in pngtest.c (Duncan Simpson).
+  Fixed a bug in pngtest.c that caused pngtest to try to write a tIME chunk
+    even when no tIME chunk was present in the source file.
+  Fixed a problem in pngrutil.c: gray_to_rgb didn't always work with 16-bit.
+  Fixed a problem in png_read_push_finish_row(), which would not skip some
+    passes that it should skip, for images that are less than 3 pixels high.
+  Interchanged the order of calls to png_do_swap() and png_do_shift()
+    in pngwtran.c (John Cromer).
+  Added #ifdef PNG_DEBUG/#endif surrounding use of PNG_DEBUG in png.h .
+  Changed "bad adaptive filter type" from error to warning in pngrutil.c .
+  Fixed a documentation error about default filtering with 8-bit indexed-color.
+  Separated the PNG_NO_STDIO macro into PNG_NO_STDIO and PNG_NO_CONSOLE_IO
+    (L. Peter Deutsch).
+  Added png_set_rgb_to_gray() and png_get_rgb_to_gray_status() functions.
+  Added png_get_copyright() and png_get_header_version() functions.
+  Revised comments on png_set_progressive_read_fn() in libpng.txt and example.c
+  Added information about debugging in libpng.txt and libpng.3 .
+  Changed "ln -sf" to "ln -s -f" in makefile.s2x, makefile.lnx, and makefile.sco.
+  Removed lines after Dynamic Dependencies" in makefile.aco .
+  Revised makefile.dec to make a shared library (Jeremie Petit).
+  Removed trailing blanks from all files.
+version 1.0.2a [January 6, 1999]
+  Removed misplaced #endif and #ifdef PNG_NO_EXTERN near the end of png.h
+  Added "if" tests to silence complaints about unused png_ptr in png.h and png.c
+  Changed "check_if_png" function in example.c to return true (nonzero) if PNG.
+  Changed libpng.txt to demonstrate png_sig_cmp() instead of png_check_sig()
+    which is obsolete.
+
+version 1.0.3 [January 14, 1999]
+  Added makefile.hux, for Hewlett Packard HPUX 10.20 and 11.00 (Jim Rice)
+  Added a statement of Y2K compliance in png.h, libpng.3, and Y2KINFO.
+version 1.0.3a [August 12, 1999]
+  Added check for PNG_READ_INTERLACE_SUPPORTED in pngread.c; issue a warning
+     if an attempt is made to read an interlaced image when it's not supported.
+  Added check if png_ptr->trans is defined before freeing it in pngread.c
+  Modified the Y2K statement to include versions back to version 0.71
+  Fixed a bug in the check for valid IHDR bit_depth/color_types in pngrutil.c
+  Modified makefile.wat (added -zp8 flag, ".symbolic", changed some comments)
+  Replaced leading blanks with tab characters in makefile.hux
+  Changed "dworkin.wustl.edu" to "ccrc.wustl.edu" in various documents.
+  Changed (float)red and (float)green to (double)red, (double)green
+     in png_set_rgb_to_gray() to avoid "promotion" problems in AIX.
+  Fixed a bug in pngconf.h that omitted <stdio.h> when PNG_DEBUG==0 (K Bracey).
+  Reformatted libpng.3 and libpngpf.3 with proper fonts (script by J. vanZandt).
+  Updated documentation to refer to the PNG-1.2 specification.
+  Removed ansi2knr.c and left pointers to the latest source for ansi2knr.c
+    in makefile.knr, INSTALL, and README (L. Peter Deutsch)
+  Fixed bugs in calculation of the length of rowbytes when adding alpha
+    channels to 16-bit images, in pngrtran.c (Chris Nokleberg)
+  Added function png_set_user_transform_info() to store user_transform_ptr,
+    user_depth, and user_channels into the png_struct, and a function
+    png_get_user_transform_ptr() to retrieve the pointer (Chris Nokleberg)
+  Added function png_set_empty_plte_permitted() to make libpng useable
+    in MNG applications.
+  Corrected the typedef for png_free_ptr in png.h (Jesse Jones).
+  Correct gamma with srgb is 45455 instead of 45000 in pngrutil.c, to be
+    consistent with PNG-1.2, and allow variance of 500 before complaining.
+  Added assembler code contributed by Intel in file pngvcrd.c and modified
+    makefile.w32 to use it (Nirav Chhatrapati, INTEL Corporation, Gilles Vollant)
+  Changed "ln -s -f" to "ln -f -s" in the makefiles to make Solaris happy.
+  Added some aliases for png_set_expand() in pngrtran.c, namely
+    png_set_expand_PLTE(), png_set_expand_depth(), and png_set_expand_tRNS()
+    (Greg Roelofs, in "PNG: The Definitive Guide").
+  Added makefile.beo for BEOS on X86, contributed by Sander Stok.
+version 1.0.3b [August 26, 1999]
+  Replaced 2147483647L several places with PNG_MAX_UINT macro, defined in png.h
+  Changed leading blanks to tabs in all makefiles.
+  Define PNG_USE_PNGVCRD in makefile.w32, to get MMX assembler code.
+  Made alternate versions of  png_set_expand() in pngrtran.c, namely
+    png_set_gray_1_2_4_to_8, png_set_palette_to_rgb, and png_set_tRNS_to_alpha
+    (Greg Roelofs, in "PNG: The Definitive Guide").  Deleted the 1.0.3a aliases.
+  Relocated start of 'extern "C"' block in png.h so it doesn't include pngconf.h
+  Revised calculation of num_blocks in pngmem.c to avoid a potentially
+    negative shift distance, whose results are undefined in the C language.
+  Added a check in pngset.c to prevent writing multiple tIME chunks.
+  Added a check in pngwrite.c to detect invalid small window_bits sizes.
+version 1.0.3d [September 4, 1999]
+  Fixed type casting of igamma in pngrutil.c
+  Added new png_expand functions to scripts/pngdef.pas and pngos2.def
+  Added a demo read_user_transform_fn that examines the row filters in pngtest.c
+
+version 1.0.4 [September 24, 1999]
+  Define PNG_ALWAYS_EXTERN in pngconf.h if __STDC__ is defined
+  Delete #define PNG_INTERNAL and include "png.h" from pngasmrd.h
+  Made several minor corrections to pngtest.c
+  Renamed the makefiles with longer but more user friendly extensions.
+  Copied the PNG copyright and license to a separate LICENSE file.
+  Revised documentation, png.h, and example.c to remove reference to
+    "viewing_gamma" which no longer appears in the PNG specification.
+  Revised pngvcrd.c to use MMX code for interlacing only on the final pass.
+  Updated pngvcrd.c to use the faster C filter algorithms from libpng-1.0.1a
+  Split makefile.win32vc into two versions, makefile.vcawin32 (uses MMX
+    assembler code) and makefile.vcwin32 (doesn't).
+  Added a CPU timing report to pngtest.c (enabled by defining PNGTEST_TIMING)
+  Added a copy of pngnow.png to the distribution.
+version 1.0.4a [September 25, 1999]
+  Increase max_pixel_depth in pngrutil.c if a user transform needs it.
+  Changed several division operations to right-shifts in pngvcrd.c
+version 1.0.4b [September 30, 1999]
+  Added parentheses in line 3732 of pngvcrd.c
+  Added a comment in makefile.linux warning about buggy -O3 in pgcc 2.95.1
+version 1.0.4c [October 1, 1999]
+  Added a "png_check_version" function in png.c and pngtest.c that will generate
+    a helpful compiler error if an old png.h is found in the search path.
+  Changed type of png_user_transform_depth|channels from int to png_byte.
+version 1.0.4d [October 6, 1999]
+  Changed 0.45 to 0.45455 in png_set_sRGB()
+  Removed unused PLTE entries from pngnow.png
+  Re-enabled some parts of pngvcrd.c (png_combine_row) that work properly.
+version 1.0.4e [October 10, 1999]
+  Fixed sign error in pngvcrd.c (Greg Roelofs)
+  Replaced some instances of memcpy with simple assignments in pngvcrd (GR-P)
+version 1.0.4f [October 15, 1999]
+  Surrounded example.c code with #if 0 .. #endif to prevent people from
+    inadvertently trying to compile it.
+  Changed png_get_header_version() from a function to a macro in png.h
+  Added type casting mostly in pngrtran.c and pngwtran.c
+  Removed some pointless "ptr = NULL" in pngmem.c
+  Added a "contrib" directory containing the source code from Greg's book.
+
+version 1.0.5 [October 15, 1999]
+  Minor editing of the INSTALL and README files.
+version 1.0.5a [October 23, 1999]
+  Added contrib/pngsuite and contrib/pngminus (Willem van Schaik)
+  Fixed a typo in the png_set_sRGB() function call in example.c (Jan Nijtmans)
+  Further optimization and bugfix of pngvcrd.c
+  Revised pngset.c so that it does not allocate or free memory in the user's
+    text_ptr structure.  Instead, it makes its own copy.
+  Created separate write_end_info_struct in pngtest.c for a more severe test.
+  Added code in pngwrite.c to free info_ptr->text[i].key to stop a memory leak.
+version 1.0.5b [November 23, 1999]
+  Moved PNG_FLAG_HAVE_CHUNK_HEADER, PNG_FLAG_BACKGROUND_IS_GRAY and
+    PNG_FLAG_WROTE_tIME from flags to mode.
+  Added png_write_info_before_PLTE() function.
+  Fixed some typecasting in contrib/gregbook/*.c
+  Updated scripts/makevms.com and added makevms.com to contrib/gregbook
+    and contrib/pngminus (Martin Zinser)
+version 1.0.5c [November 26, 1999]
+  Moved png_get_header_version from png.h to png.c, to accomodate ansi2knr.
+  Removed all global arrays (according to PNG_NO_GLOBAL_ARRAYS macro), to
+    accomodate making DLL's: Moved usr_png_ver from global variable to function
+    png_get_header_ver() in png.c.  Moved png_sig to png_sig_bytes in png.c and
+    eliminated use of png_sig in pngwutil.c.  Moved the various png_CHNK arrays
+    into pngtypes.h.  Eliminated use of global png_pass arrays.  Declared the
+    png_CHNK and png_pass arrays to be "const".  Made the global arrays
+    available to applications (although none are used in libpng itself) when
+    PNG_NO_GLOBAL_ARRAYS is not defined or when PNG_GLOBAL_ARRAYS is defined.
+  Removed some extraneous "-I" from contrib/pngminus/makefile.std
+  Changed the PNG_sRGB_INTENT macros in png.h to be consistent with PNG-1.2.
+  Change PNG_SRGB_INTENT to PNG_sRGB_INTENT in libpng.txt and libpng.3
+version 1.0.5d [November 29, 1999]
+  Add type cast (png_const_charp) two places in png.c
+  Eliminated pngtypes.h; use macros instead to declare PNG_CHNK arrays.
+  Renamed "PNG_GLOBAL_ARRAYS" to "PNG_USE_GLOBAL_ARRAYS" and made available
+    to applications a macro "PNG_USE_LOCAL_ARRAYS".
+  #ifdef out all the new declarations when PNG_USE_GLOBAL_ARRAYS is defined.
+  Added PNG_EXPORT_VAR macro to accommodate making DLL's.
+version 1.0.5e [November 30, 1999]
+  Added iCCP, iTXt, and sPLT support; added "lang" member to the png_text
+    structure; refactored the inflate/deflate support to make adding new chunks
+    with trailing compressed parts easier in the future, and added new functions
+    png_free_iCCP, png_free_pCAL, png_free_sPLT, png_free_text, png_get_iCCP,
+    png_get_spalettes, png_set_iCCP, png_set_spalettes (Eric S. Raymond).
+  NOTE: Applications that write text chunks MUST define png_text->lang
+    before calling png_set_text(). It must be set to NULL if you want to
+    write tEXt or zTXt chunks.  If you want your application to be able to
+    run with older versions of libpng, use
+
+      #ifdef PNG_iTXt_SUPPORTED
+         png_text[i].lang = NULL;
+      #endif
+
+  Changed png_get_oFFs() and png_set_oFFs() to use signed rather than unsigned
+    offsets (Eric S. Raymond).
+  Combined PNG_READ_cHNK_SUPPORTED and PNG_WRITE_cHNK_SUPPORTED macros into
+    PNG_cHNK_SUPPORTED and combined the three types of PNG_text_SUPPORTED
+    macros, leaving the separate macros also available.
+  Removed comments on #endifs at the end of many short, non-nested #if-blocks.
+version 1.0.5f [December 6, 1999]
+  Changed makefile.solaris to issue a warning about potential problems when
+    the ucb "ld" is in the path ahead of the ccs "ld".
+  Removed "- [date]" from the "synopsis" line in libpng.3 and libpngpf.3.
+  Added sCAL chunk support (Eric S. Raymond).
+version 1.0.5g [December 7, 1999]
+  Fixed "png_free_spallettes" typo in png.h
+  Added code to handle new chunks in pngpread.c
+  Moved PNG_CHNK string macro definitions outside of PNG_NO_EXTERN block
+  Added "translated_key" to png_text structure and png_write_iTXt().
+  Added code in pngwrite.c to work around a newly discovered zlib bug.
+version 1.0.5h [December 10, 1999]
+  NOTE: regarding the note for version 1.0.5e, the following must also
+    be included in your code:
+        png_text[i].translated_key = NULL;
+  Unknown chunk handling is now supported.
+  Option to eliminate all floating point support was added.  Some new
+    fixed-point functions such as png_set_gAMA_fixed() were added.
+  Expanded tabs and removed trailing blanks in source files.
+version 1.0.5i [December 13, 1999]
+  Added some type casts to silence compiler warnings.
+  Renamed "png_free_spalette" to "png_free_spalettes" for consistency.
+  Removed leading blanks from a #define in pngvcrd.c
+  Added some parameters to the new png_set_keep_unknown_chunks() function.
+  Added a test for up->location != 0 in the first instance of writing
+    unknown chunks in pngwrite.c
+  Changed "num" to "i" in png_free_spalettes() and png_free_unknowns() to
+    prevent recursion.
+  Added png_free_hIST() function.
+  Various patches to fix bugs in the sCAL and integer cHRM processing,
+    and to add some convenience macros for use with sCAL.
+version 1.0.5j [December 21, 1999]
+  Changed "unit" parameter of png_write_sCAL from png_byte to int, to work
+    around buggy compilers.
+  Added new type "png_fixed_point" for integers that hold float*100000 values
+  Restored backward compatibility of tEXt/zTXt chunk processing:
+    Restored the first four members of png_text to the same order as v.1.0.5d.
+    Added members "lang_key" and "itxt_length" to png_text struct.  Set
+    text_length=0 when "text" contains iTXt data.  Use the "compression"
+    member to distinguish among tEXt/zTXt/iTXt types.  Added
+    PNG_ITXT_COMPRESSION_NONE (1) and PNG_ITXT_COMPRESSION_zTXt(2) macros.
+    The "Note" above, about backward incompatibility of libpng-1.0.5e, no
+    longer applies.
+  Fixed png_read|write_iTXt() to read|write parameters in the right order,
+    and to write the iTXt chunk after IDAT if it appears in the end_ptr.
+  Added pnggccrd.c, version of pngvcrd.c Intel assembler for gcc (Greg Roelofs)
+  Reversed the order of trying to write floating-point and fixed-point gAMA.
+version 1.0.5k [December 27, 1999]
+  Added many parentheses, e.g., "if (a && b & c)" becomes "if (a && (b & c))"
+  Added png_handle_as_unknown() function (Glenn)
+  Added png_free_chunk_list() function and chunk_list and num_chunk_list members
+    of png_ptr.
+  Eliminated erroneous warnings about multiple sPLT chunks and sPLT-after-PLTE.
+  Fixed a libpng-1.0.5h bug in pngrutil.c that was issuing erroneous warnings
+    about ignoring incorrect gAMA with sRGB (gAMA was in fact not ignored)
+  Added png_free_tRNS(); png_set_tRNS() now malloc's its own trans array (ESR).
+  Define png_get_int_32 when oFFs chunk is supported as well as when pCAL is.
+  Changed type of proflen from png_int_32 to png_uint_32 in png_get_iCCP().
+version 1.0.5l [January 1, 2000]
+  Added functions png_set_read_user_chunk_fn() and png_get_user_chunk_ptr()
+    for setting a callback function to handle unknown chunks and for
+    retrieving the associated user pointer (Glenn).
+version 1.0.5m [January 7, 2000]
+  Added high-level functions png_read_png(), png_write_png(), png_free_pixels().
+version 1.0.5n [January 9, 2000]
+  Added png_free_PLTE() function, and modified png_set_PLTE() to malloc its
+    own memory for info_ptr->palette.  This makes it safe for the calling
+    application to free its copy of the palette any time after it calls
+    png_set_PLTE().
+version 1.0.5o [January 20, 2000]
+  Cosmetic changes only (removed some trailing blanks and TABs)
+version 1.0.5p [January 31, 2000]
+  Renamed pngdll.mak to makefile.bd32
+  Cosmetic changes in pngtest.c
+version 1.0.5q [February 5, 2000]
+  Relocated the makefile.solaris warning about PATH problems.
+  Fixed pngvcrd.c bug by pushing/popping registers in mmxsupport (Bruce Oberg)
+  Revised makefile.gcmmx
+  Added PNG_SETJMP_SUPPORTED, PNG_SETJMP_NOT_SUPPORTED, and PNG_ABORT() macros
+version 1.0.5r [February 7, 2000]
+  Removed superfluous prototype for png_get_itxt from png.h
+  Fixed a bug in pngrtran.c that improperly expanded the background color.
+  Return *num_text=0 from png_get_text() when appropriate, and fix documentation
+    of png_get_text() in libpng.txt/libpng.3.
+version 1.0.5s [February 18, 2000]
+  Added "png_jmp_env()" macro to pngconf.h, to help people migrate to the
+    new error handler that's planned for the next libpng release, and changed
+    example.c, pngtest.c, and contrib programs to use this macro.
+  Revised some of the DLL-export macros in pngconf.h (Greg Roelofs)
+  Fixed a bug in png_read_png() that caused it to fail to expand some images
+    that it should have expanded.
+  Fixed some mistakes in the unused and undocumented INCH_CONVERSIONS functions
+    in pngget.c
+  Changed the allocation of palette, history, and trans arrays back to
+    the version 1.0.5 method (linking instead of copying) which restores
+    backward compatibility with version 1.0.5.  Added some remarks about
+    that in example.c.  Added "free_me" member to info_ptr and png_ptr
+    and added png_free_data() function.
+  Updated makefile.linux and makefile.gccmmx to make directories conditionally.
+  Made cosmetic changes to pngasmrd.h
+  Added png_set_rows() and png_get_rows(), for use with png_read|write_png().
+  Modified png_read_png() to allocate info_ptr->row_pointers only if it
+    hasn't already been allocated.
+version 1.0.5t [March 4, 2000]
+  Changed png_jmp_env() migration aiding macro to png_jmpbuf().
+  Fixed "interlace" typo (should be "interlaced") in contrib/gregbook/read2-x.c
+  Fixed bug with use of PNG_BEFORE_IHDR bit in png_ptr->mode, introduced when
+    PNG_FLAG_HAVE_CHUNK_HEADER was moved into png_ptr->mode in version 1.0.5b
+  Files in contrib/gregbook were revised to use png_jmpbuf() and to select
+    a 24-bit visual if one is available, and to allow abbreviated options.
+  Files in contrib/pngminus were revised to use the png_jmpbuf() macro.
+  Removed spaces in makefile.linux and makefile.gcmmx, introduced in 1.0.5s
+version 1.0.5u [March 5, 2000]
+  Simplified the code that detects old png.h in png.c and pngtest.c
+  Renamed png_spalette (_p, _pp) to png_sPLT_t (_tp, _tpp)
+  Increased precision of rgb_to_gray calculations from 8 to 15 bits and
+    added png_set_rgb_to_gray_fixed() function.
+  Added makefile.bc32 (32-bit Borland C++, C mode)
+version 1.0.5v [March 11, 2000]
+  Added some parentheses to the png_jmpbuf macro definition.
+  Updated references to the zlib home page, which has moved to freesoftware.com.
+  Corrected bugs in documentation regarding png_read_row() and png_write_row().
+  Updated documentation of png_rgb_to_gray calculations in libpng.3/libpng.txt.
+  Renamed makefile.borland,turboc3 back to makefile.bor,tc3 as in version 1.0.3,
+    revised borland makefiles; added makefile.ibmvac3 and makefile.gcc (Cosmin)
+
+version 1.0.6 [March 20, 2000]
+  Minor revisions of makefile.bor, libpng.txt, and gregbook/rpng2-win.c
+  Added makefile.sggcc (SGI IRIX with gcc)
+version 1.0.6d [April 7, 2000]
+  Changed sprintf() to strcpy() in png_write_sCAL_s() to work without STDIO
+  Added data_length parameter to png_decompress_chunk() function
+  Revised documentation to remove reference to abandoned png_free_chnk functions
+  Fixed an error in png_rgb_to_gray_fixed()
+  Revised example.c, usage of png_destroy_write_struct().
+  Renamed makefile.ibmvac3 to makefile.ibmc, added libpng.icc IBM project file
+  Added a check for info_ptr->free_me&PNG_FREE_TEXT when freeing text in png.c
+  Simplify png_sig_bytes() function to remove use of non-ISO-C strdup().
+version 1.0.6e [April 9, 2000]
+  Added png_data_freer() function.
+  In the code that checks for over-length tRNS chunks, added check of
+    info_ptr->num_trans as well as png_ptr->num_trans (Matthias Benckmann)
+  Minor revisions of libpng.txt/libpng.3.
+  Check for existing data and free it if the free_me flag is set, in png_set_*()
+    and png_handle_*().
+  Only define PNG_WEIGHTED_FILTERS_SUPPORTED when PNG_FLOATING_POINT_SUPPORTED
+    is defined.
+  Changed several instances of PNG_NO_CONSOLE_ID to PNG_NO_STDIO in pngrutil.c
+    and mentioned the purposes of the two macros in libpng.txt/libpng.3.
+version 1.0.6f [April 14, 2000]
+  Revised png_set_iCCP() and png_set_rows() to avoid prematurely freeing data.
+  Add checks in png_set_text() for NULL members of the input text structure.
+  Revised libpng.txt/libpng.3.
+  Removed superfluous prototype for png_set_itxt from png.h
+  Removed "else" from pngread.c, after png_error(), and changed "0" to "length".
+  Changed several png_errors about malformed ancillary chunks to png_warnings.
+version 1.0.6g [April 24, 2000]
+  Added png_pass-* arrays to pnggccrd.c when PNG_USE_LOCAL_ARRAYS is defined.
+  Relocated paragraph about png_set_background() in libpng.3/libpng.txt
+    and other revisions (Matthias Benckmann)
+  Relocated info_ptr->free_me, png_ptr->free_me, and other info_ptr and
+    png_ptr members to restore binary compatibility with libpng-1.0.5
+    (breaks compatibility with libpng-1.0.6).
+version 1.0.6h [April 24, 2000]
+  Changed shared library so-number pattern from 2.x.y.z to xy.z (this builds
+    libpng.so.10 & libpng.so.10.6h instead of libpng.so.2 & libpng.so.2.1.0.6h)
+    This is a temporary change for test purposes.
+version 1.0.6i [May 2, 2000]
+  Rearranged some members at the end of png_info and png_struct, to put
+    unknown_chunks_num and free_me within the original size of the png_structs
+    and free_me, png_read_user_fn, and png_free_fn within the original png_info,
+    because some old applications allocate the structs directly instead of
+    using png_create_*().
+  Added documentation of user memory functions in libpng.txt/libpng.3
+  Modified png_read_png so that it will use user_allocated row_pointers
+    if present, unless free_me directs that it be freed, and added description
+    of the use of png_set_rows() and png_get_rows() in libpng.txt/libpng.3.
+  Added PNG_LEGACY_SUPPORTED macro, and #ifdef out all new (since version
+    1.00) members of png_struct and png_info, to regain binary compatibility
+    when you define this macro.  Capabilities lost in this event
+    are user transforms (new in version 1.0.0),the user transform pointer
+    (new in version 1.0.2), rgb_to_gray (new in 1.0.5), iCCP, sCAL, sPLT,
+    the high-level interface, and unknown chunks support (all new in 1.0.6).
+    This was necessary because of old applications that allocate the structs
+    directly as authors were instructed to do in libpng-0.88 and earlier,
+    instead of using png_create_*().
+  Added modes PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT which
+    can be used to detect codes that directly allocate the structs, and
+    code to check these modes in png_read_init() and png_write_init() and
+    generate a libpng error if the modes aren't set and PNG_LEGACY_SUPPORTED
+    was not defined.
+  Added makefile.intel and updated makefile.watcom (Pawel Mrochen)
+version 1.0.6j [May 3, 2000]
+  Overloaded png_read_init() and png_write_init() with macros that convert
+    calls to png_read_init_2() or png_write_init_2() that check the version
+    and structure sizes.
+version 1.0.7beta11 [May 7, 2000]
+  Removed the new PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT modes
+    which are no longer used.
+  Eliminated the three new members of png_text when PNG_LEGACY_SUPPORTED is
+    defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXT_SUPPORTED
+    is defined.
+  Made PNG_NO_READ|WRITE_iTXt the default setting, to avoid memory
+    overrun when old applications fill the info_ptr->text structure directly.
+  Added PNGAPI macro, and added it to the definitions of all exported functions.
+  Relocated version macro definitions ahead of the includes of zlib.h and
+    pngconf.h in png.h.
+version 1.0.7beta12 [May 12, 2000]
+  Revised pngset.c to avoid a problem with expanding the png_debug macro.
+  Deleted some extraneous defines from pngconf.h
+  Made PNG_NO_CONSOLE_IO the default condition when PNG_BUILD_DLL is defined.
+  Use MSC _RPTn debugging instead of fprintf if _MSC_VER is defined.
+  Added png_access_version_number() function.
+  Check for mask&PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data().
+  Expanded libpng.3/libpng.txt information about png_data_freer().
+version 1.0.7beta14 [May 17, 2000] (beta13 was not published)
+  Changed pnggccrd.c and pngvcrd.c to handle bad adaptive filter types as
+    warnings instead of errors, as pngrutil.c does.
+  Set the PNG_INFO_IDAT valid flag in png_set_rows() so png_write_png()
+    will actually write IDATs.
+  Made the default PNG_USE_LOCAL_ARRAYS depend on PNG_DLL instead of WIN32.
+  Make png_free_data() ignore its final parameter except when freeing data
+    that can have multiple instances (text, sPLT, unknowns).
+  Fixed a new bug in png_set_rows().
+  Removed info_ptr->valid tests from png_free_data(), as in version 1.0.5.
+  Added png_set_invalid() function.
+  Fixed incorrect illustrations of png_destroy_write_struct() in example.c.
+version 1.0.7beta15 [May 30, 2000]
+  Revised the deliberately erroneous Linux setjmp code in pngconf.h to produce
+    fewer error messages.
+  Rearranged checks for Z_OK to check the most likely path first in pngpread.c
+    and pngwutil.c.
+  Added checks in pngtest.c for png_create_*() returning NULL, and mentioned
+    in libpng.txt/libpng.3 the need for applications to check this.
+  Changed names of png_default_*() functions in pngtest to pngtest_*().
+  Changed return type of png_get_x|y_offset_*() from png_uint_32 to png_int_32.
+  Fixed some bugs in the unused PNG_INCH_CONVERSIONS functions in pngget.c
+  Set each pointer to NULL after freeing it in png_free_data().
+  Worked around a problem in pngconf.h; AIX's strings.h defines an "index"
+    macro that conflicts with libpng's png_color_16.index. (Dimitri Papadapoulos)
+  Added "msvc" directory with MSVC++ project files (Simon-Pierre Cadieux).
+version 1.0.7beta16 [June 4, 2000]
+  Revised the workaround of AIX string.h "index" bug.
+  Added a check for overlength PLTE chunk in pngrutil.c.
+  Added PNG_NO_POINTER_INDEXING macro to use array-indexing instead of pointer
+    indexing in pngrutil.c and pngwutil.c to accommodate a buggy compiler.
+  Added a warning in png_decompress_chunk() when it runs out of data, e.g.
+    when it tries to read an erroneous PhotoShop iCCP chunk.
+  Added PNG_USE_DLL macro.
+  Revised the copyright/disclaimer/license notice.
+  Added contrib/msvctest directory
+version 1.0.7rc1 [June 9, 2000]
+  Corrected the definition of PNG_TRANSFORM_INVERT_ALPHA  (0x0400 not 0x0200)
+  Added contrib/visupng directory (Willem van Schaik)
+version 1.0.7beta18 [June 23, 2000]
+  Revised PNGAPI definition, and pngvcrd.c to work with __GCC__
+    and do not redefine PNGAPI if it is passed in via a compiler directive.
+  Revised visupng/PngFile.c to remove returns from within the Try block.
+  Removed leading underscores from "_PNG_H" and "_PNG_SAVE_BSD_SOURCE" macros.
+  Updated contrib/visupng/cexcept.h to version 1.0.0.
+  Fixed bugs in pngwrite.c and pngwutil.c that prevented writing iCCP chunks.
+version 1.0.7rc2 [June 28, 2000]
+  Updated license to include disclaimers required by UCITA.
+  Fixed "DJBPP" typo in pnggccrd.c introduced in beta18.
+
+version 1.0.7 [July 1, 2000]
+  Revised the definition of "trans_values" in libpng.3/libpng.txt
+version 1.0.8beta1 [July 8, 2000]
+  Added png_free(png_ptr, key) two places in pngpread.c to stop memory leaks.
+  Changed PNG_NO_STDIO to PNG_NO_CONSOLE_IO, several places in pngrutil.c and
+     pngwutil.c.
+  Changed PNG_EXPORT_VAR to use PNG_IMPEXP, in pngconf.h.
+  Removed unused "#include <assert.h>" from png.c
+  Added WindowsCE support.
+  Revised pnggccrd.c to work with gcc-2.95.2 and in the Cygwin environment.
+version 1.0.8beta2 [July 10, 2000]
+  Added project files to the wince directory and made further revisions
+     of pngtest.c, pngrio.c, and pngwio.c in support of WindowsCE.
+version 1.0.8beta3 [July 11, 2000]
+  Only set the PNG_FLAG_FREE_TRNS or PNG_FREE_TRNS flag in png_handle_tRNS()
+     for indexed-color input files to avoid potential double-freeing trans array
+     under some unusual conditions; problem was introduced in version 1.0.6f.
+  Further revisions to pngtest.c and files in the wince subdirectory.
+version 1.0.8beta4 [July 14, 2000]
+  Added the files pngbar.png and pngbar.jpg to the distribution.
+  Added makefile.cygwin, and cygwin support in pngconf.h
+  Added PNG_NO_ZALLOC_ZERO macro (makes png_zalloc skip zeroing memory)
+version 1.0.8rc1 [July 16, 2000]
+  Revised png_debug() macros and statements to eliminate compiler warnings.
+
+version 1.0.8 [July 24, 2000]
+  Added png_flush() in pngwrite.c, after png_write_IEND().
+  Updated makefile.hpux to build a shared library.
+version 1.0.9beta1 [November 10, 2000]
+  Fixed typo in scripts/makefile.hpux
+  Updated makevms.com in scripts and contrib/* and contrib/* (Martin Zinser)
+  Fixed seqence-point bug in contrib/pngminus/png2pnm (Martin Zinser)
+  Changed "cdrom.com" in documentation to "libpng.org"
+  Revised pnggccrd.c to get it all working, and updated makefile.gcmmx (Greg).
+  Changed type of "params" from voidp to png_voidp in png_read|write_png().
+  Make sure PNGAPI and PNG_IMPEXP are defined in pngconf.h.
+  Revised the 3 instances of WRITEFILE in pngtest.c.
+  Relocated "msvc" and "wince" project subdirectories into "dll" subdirectory.
+  Updated png.rc in dll/msvc project
+  Revised makefile.dec to define and use LIBPATH and INCPATH
+  Increased size of global png_libpng_ver[] array from 12 to 18 chars.
+  Made global png_libpng_ver[], png_sig[] and png_pass_*[] arrays const.
+  Removed duplicate png_crc_finish() from png_handle_bKGD() function.
+  Added a warning when application calls png_read_update_info() multiple times.
+  Revised makefile.cygwin
+  Fixed bugs in iCCP support in pngrutil.c and pngwutil.c.
+  Replaced png_set_empty_plte_permitted() with png_permit_mng_features().
+version 1.0.9beta2 [November 19, 2000]
+  Renamed the "dll" subdirectory "projects".
+  Added borland project files to "projects" subdirectory.
+  Set VS_FF_PRERELEASE and VS_FF_PATCHED flags in msvc/png.rc when appropriate.
+  Add error message in png_set_compression_buffer_size() when malloc fails.
+version 1.0.9beta3 [November 23, 2000]
+  Revised PNG_LIBPNG_BUILD_TYPE macro in png.h, used in the msvc project.
+  Removed the png_flush() in pngwrite.c that crashes some applications
+    that don't set png_output_flush_fn.
+  Added makefile.macosx and makefile.aix to scripts directory.
+version 1.0.9beta4 [December 1, 2000]
+  Change png_chunk_warning to png_warning in png_check_keyword().
+  Increased the first part of msg buffer from 16 to 18 in png_chunk_error().
+version 1.0.9beta5 [December 15, 2000]
+  Added support for filter method 64 (for PNG datastreams embedded in MNG).
+version 1.0.9beta6 [December 18, 2000]
+  Revised png_set_filter() to accept filter method 64 when appropriate.
+  Added new PNG_HAVE_PNG_SIGNATURE bit to png_ptr->mode and use it to
+    help prevent applications from using MNG features in PNG datastreams.
+  Added png_permit_mng_features() function.
+  Revised libpng.3/libpng.txt.  Changed "filter type" to "filter method".
+version 1.0.9rc1 [December 23, 2000]
+  Revised test for PNG_HAVE_PNG_SIGNATURE in pngrutil.c
+  Fixed error handling of unknown compression type in png_decompress_chunk().
+  In pngconf.h, define __cdecl when _MSC_VER is defined.
+version 1.0.9beta7 [December 28, 2000]
+  Changed PNG_TEXT_COMPRESSION_zTXt to PNG_COMPRESSION_TYPE_BASE several places.
+  Revised memory management in png_set_hIST and png_handle_hIST in a backward
+    compatible manner.  PLTE and tRNS were revised similarly.
+  Revised the iCCP chunk reader to ignore trailing garbage.
+version 1.0.9beta8 [January 12, 2001]
+  Moved pngasmrd.h into pngconf.h.
+  Improved handling of out-of-spec garbage iCCP chunks generated by PhotoShop.
+version 1.0.9beta9 [January 15, 2001]
+  Added png_set_invalid, png_permit_mng_features, and png_mmx_supported to
+    wince and msvc project module definition files.
+  Minor revision of makefile.cygwin.
+  Fixed bug with progressive reading of narrow interlaced images in pngpread.c
+version 1.0.9beta10 [January 16, 2001]
+  Do not typedef png_FILE_p in pngconf.h when PNG_NO_STDIO is defined.
+  Fixed "png_mmx_supported" typo in project definition files.
+version 1.0.9beta11 [January 19, 2001]
+  Updated makefile.sgi to make shared library.
+  Removed png_mmx_support() function and disabled PNG_MNG_FEATURES_SUPPORTED
+    by default, for the benefit of DLL forward compatibility.  These will
+    be re-enabled in version 1.2.0.
+version 1.0.9rc2 [January 22, 2001]
+  Revised cygwin support.
+
+version 1.0.9 [January 31, 2001]
+  Added check of cygwin's ALL_STATIC in pngconf.h
+  Added "-nommx" parameter to contrib/gregbook/rpng2-win and rpng2-x demos.
+version 1.0.10beta1 [March 14, 2001]
+  Revised makefile.dec, makefile.sgi, and makefile.sggcc; added makefile.hpgcc.
+  Reformatted libpng.3 to eliminate bad line breaks.
+  Added checks for _mmx_supported in the read_filter_row function of pnggccrd.c
+  Added prototype for png_mmx_support() near the top of pnggccrd.c
+  Moved some error checking from png_handle_IHDR to png_set_IHDR.
+  Added PNG_NO_READ_SUPPORTED and PNG_NO_WRITE_SUPPORTED macros.
+  Revised png_mmx_support() function in pnggccrd.c
+  Restored version 1.0.8 PNG_WRITE_EMPTY_PLTE_SUPPORTED behavior in pngwutil.c
+  Fixed memory leak in contrib/visupng/PngFile.c
+  Fixed bugs in png_combine_row() in pnggccrd.c and pngvcrd.c (C version)
+  Added warnings when retrieving or setting gamma=0.
+  Increased the first part of msg buffer from 16 to 18 in png_chunk_warning().
+version 1.0.10rc1 [March 23, 2001]
+  Changed all instances of memcpy, strcpy, and strlen to png_memcpy, png_strcpy,
+    and png_strlen.
+  Revised png_mmx_supported() function in pnggccrd.c to return proper value.
+  Fixed bug in progressive reading (pngpread.c) with small images (height < 8).
+
+version 1.0.10 [March 30, 2001]
+  Deleted extraneous space (introduced in 1.0.9) from line 42 of makefile.cygwin
+  Added beos project files (Chris Herborth)
+version 1.0.11beta1 [April 3, 2001]
+  Added type casts on several png_malloc() calls (Dimitri Papadapoulos).
+  Removed a no-longer needed AIX work-around from pngconf.h
+  Changed several "//" single-line comments to C-style in pnggccrd.c
+version 1.0.11beta2 [April 11, 2001]
+  Removed PNGAPI from several functions whose prototypes did not have PNGAPI.
+  Updated scripts/pngos2.def
+version 1.0.11beta3 [April 14, 2001]
+  Added checking the results of many instances of png_malloc() for NULL
+version 1.0.11beta4 [April 20, 2001]
+  Undid the changes from version 1.0.11beta3.  Added a check for NULL return
+    from user's malloc_fn().
+  Removed some useless type casts of the NULL pointer.
+  Added makefile.netbsd
+
+version 1.0.11 [April 27, 2001]
+  Revised makefile.netbsd
+version 1.0.12beta1 [May 14, 2001]
+  Test for Windows platform in pngconf.h when including malloc.h (Emmanuel Blot)
+  Updated makefile.cygwin and handling of Cygwin's ALL_STATIC in pngconf.h
+  Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings.
+  Eliminated the png_error about apps using png_read|write_init().  Instead,
+    libpng will reallocate the png_struct and info_struct if they are too small.
+    This retains future binary compatibility for old applications written for
+    libpng-0.88 and earlier.
+version 1.2.0beta1 [May 6, 2001]
+  Bumped DLLNUM to 2.
+  Re-enabled PNG_MNG_FEATURES_SUPPORTED and enabled PNG_ASSEMBLER_CODE_SUPPORTED
+    by default.
+  Added runtime selection of MMX features.
+  Added png_set_strip_error_numbers function and related macros.
+version 1.2.0beta2 [May 7, 2001]
+  Finished merging 1.2.0beta1 with version 1.0.11
+  Added a check for attempts to read or write PLTE in grayscale PNG datastreams.
+version 1.2.0beta3 [May 17, 2001]
+  Enabled user memory function by default.
+  Modified png_create_struct so it passes user mem_ptr to user memory allocator.
+  Increased png_mng_features flag from png_byte to png_uint_32.
+  Bumped shared-library (so-number) and dll-number to 3.
+version 1.2.0beta4 [June 23, 2001]
+  Check for missing profile length field in iCCP chunk and free chunk_data
+     in case of truncated iCCP chunk.
+  Bumped shared-library number to 3 in makefile.sgi and makefile.sggcc
+  Bumped dll-number from 2 to 3 in makefile.cygwin
+  Revised contrib/gregbook/rpng*-x.c to avoid a memory leak and to exit cleanly
+     if user attempts to run it on an 8-bit display.
+  Updated contrib/gregbook
+  Use png_malloc instead of png_zalloc to allocate palette in pngset.c
+  Updated makefile.ibmc
+  Added some typecasts to eliminate gcc 3.0 warnings.  Changed prototypes
+     of png_write_oFFS width and height from png_uint_32 to png_int_32.
+  Updated example.c
+  Revised prototypes for png_debug_malloc and png_debug_free in pngtest.c
+version 1.2.0beta5 [August 8, 2001]
+  Revised contrib/gregbook
+  Revised makefile.gcmmx
+  Revised pnggccrd.c to conditionally compile some thread-unsafe code only
+     when PNG_THREAD_UNSAFE_OK is defined.
+  Added tests to prevent pngwutil.c from writing a bKGD or tRNS chunk with
+     value exceeding 2^bit_depth-1
+  Revised makefile.sgi and makefile.sggcc
+  Replaced calls to fprintf(stderr,...) with png_warning() in pnggccrd.c
+  Removed restriction that do_invert_mono only operate on 1-bit opaque files
+
+version 1.2.0 [September 1, 2001]
+  Changed a png_warning() to png_debug() in pnggccrd.c
+  Fixed contrib/gregbook/rpng-x.c, rpng2-x.c to avoid crash with XFreeGC().
+version 1.2.1beta1 [October 19, 2001]
+  Revised makefile.std in contrib/pngminus
+  Include background_1 in png_struct regardless of gamma support.
+  Revised makefile.netbsd and makefile.macosx, added makefile.darwin.
+  Revised example.c to provide more details about using row_callback().
+version 1.2.1beta2 [October 25, 2001]
+  Added type cast to each NULL appearing in a function call, except for
+    WINCE functions.
+  Added makefile.so9.
+version 1.2.1beta3 [October 27, 2001]
+  Removed type casts from all NULLs.
+  Simplified png_create_struct_2().
+version 1.2.1beta4 [November 7, 2001]
+  Revised png_create_info_struct() and png_creat_struct_2().
+  Added error message if png_write_info() was omitted.
+  Type cast NULLs appearing in function calls when _NO_PROTO or
+    PNG_TYPECAST_NULL is defined.
+version 1.2.1rc1 [November 24, 2001]
+  Type cast NULLs appearing in function calls except when PNG_NO_TYPECAST_NULL
+    is defined.
+  Changed typecast of "size" argument to png_size_t in pngmem.c calls to
+    the user malloc_fn, to agree with the prototype in png.h
+  Added a pop/push operation to pnggccrd.c, to preserve Eflag (Maxim Sobolev)
+  Updated makefile.sgi to recognize LIBPATH and INCPATH.
+  Updated various makefiles so "make clean" does not remove previous major
+    version of the shared library.
+version 1.2.1rc2 [December 4, 2001]
+  Always allocate 256-entry internal palette, hist, and trans arrays, to
+    avoid out-of-bounds memory reference caused by invalid PNG datastreams.
+  Added a check for prefix_length > data_length in iCCP chunk handler.
+
+version 1.2.1 [December 7, 2001]
+  None.
+version 1.2.2beta1 [February 22, 2002]
+  Fixed a bug with reading the length of iCCP profiles (Larry Reeves).
+  Revised makefile.linux, makefile.gcmmx, and makefile.sgi to generate
+    libpng.a, libpng12.so (not libpng.so.3), and libpng12/png.h
+  Revised makefile.darwin to remove "-undefined suppress" option.
+  Added checks for gamma and chromaticity values over 21474.83, which exceed
+    the limit for PNG unsigned 32-bit integers when encoded.
+  Revised calls to png_create_read_struct() and png_create_write_struct()
+    for simpler debugging.
+  Revised png_zalloc() so zlib handles errors (uses PNG_FLAG_MALLOC_NULL_MEM_OK)
+version 1.2.2beta2 [February 23, 2002]
+  Check chunk_length and idat_size for invalid (over PNG_MAX_UINT) lengths.
+  Check for invalid image dimensions in png_get_IHDR.
+  Added missing "fi;" in the install target of the SGI makefiles.
+  Added install-static to all makefiles that make shared libraries.
+  Always do gamma compensation when image is partially transparent.
+version 1.2.2beta3 [March 7, 2002]
+  Compute background.gray and background_1.gray even when color_type is RGB
+    in case image gets reduced to gray later.
+  Modified shared-library makefiles to install pkgconfig/libpngNN.pc.
+  Export (with PNGAPI) png_zalloc, png_zfree, and png_handle_as_unknown
+  Removed unused png_write_destroy_info prototype from png.h
+  Eliminated incorrect use of width_mmx from pnggccrd.c in pixel_bytes == 8 case
+  Added install-shared target to all makefiles that make shared libraries.
+  Stopped a double free of palette, hist, and trans when not using free_me.
+  Added makefile.32sunu for Sun Ultra 32 and makefile.64sunu for Sun Ultra 64.
+version 1.2.2beta4 [March 8, 2002]
+  Compute background.gray and background_1.gray even when color_type is RGB
+    in case image gets reduced to gray later (Jason Summers).
+  Relocated a misplaced /bin/rm in the "install-shared" makefile targets
+  Added PNG_1_0_X macro which can be used to build a 1.0.x-compatible library.
+version 1.2.2beta5 [March 26, 2002]
+  Added missing PNGAPI to several function definitions.
+  Check for invalid bit_depth or color_type in png_get_IHDR(), and
+    check for missing PLTE or IHDR in png_push_read_chunk() (Matthias Clasen).
+  Revised iTXt support to accept NULL for lang and lang_key.
+  Compute gamma for color components of background even when color_type is gray.
+  Changed "()" to "{}" in scripts/libpng.pc.in.
+  Revised makefiles to put png.h and pngconf.h only in $prefix/include/libpngNN
+  Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so
+version 1.2.2beta6 [March 31, 2002]
+version 1.0.13beta1 [March 31, 2002]
+  Prevent png_zalloc() from trying to memset memory that it failed to acquire.
+  Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate).
+  Ensure that the right function (user or default) is used to free the
+    png_struct after an error in png_create_read_struct_2().
+version 1.2.2rc1 [April 7, 2002]
+version 1.0.13rc1 [April 7, 2002]
+  Save the ebx register in pnggccrd.c (Sami Farin)
+  Add "mem_ptr = png_ptr->mem_ptr" in png_destroy_write_struct() (Paul Gardner).
+  Updated makefiles to put headers in include/libpng and remove old include/*.h.
+
+version 1.2.2 [April 15, 2002]
+version 1.0.13 [April 15, 2002]
+  Revised description of png_set_filter() in libpng.3/libpng.txt.
+  Revised makefile.netbsd and added makefile.neNNbsd and makefile.freebsd
+version 1.0.13patch01 [April 17, 2002]
+version 1.2.2patch01 [April 17, 2002]
+  Changed ${PNGMAJ}.${PNGVER} bug to ${PNGVER} in makefile.sgi and makefile.sggcc
+  Fixed VER -> PNGVER typo in makefile.macosx and added install-static to install
+  Added install: target to makefile.32sunu and makefile.64sunu
+version 1.0.13patch03 [April 18, 2002]
+version 1.2.2patch03 [April 18, 2002]
+  Revised 15 makefiles to link libpng.a to libpngNN.a and the include libpng
+  subdirectory to libpngNN subdirectory without the full pathname.
+  Moved generation of libpng.pc from "install" to "all" in 15 makefiles.
+version 1.2.3rc1 [April 28, 2002]
+  Added install-man target to 15 makefiles (Dimitri Papadopolous-Orfanos).
+  Added $(DESTDIR) feature to 24 makefiles (Tim Mooney)
+  Fixed bug with $prefix, should be $(prefix) in makefile.hpux.
+  Updated cygwin-specific portion of pngconf.h and revised makefile.cygwin
+  Added a link from libpngNN.pc to libpng.pc in 15 makefiles.
+  Added links from include/libpngNN/*.h to include/*.h in 24 makefiles.
+  Revised makefile.darwin to make relative links without full pathname.
+  Added setjmp() at the end of png_create_*_struct_2() in case user forgets
+    to put one in their application.
+  Restored png_zalloc() and png_zfree() prototypes to version 1.2.1 and
+    removed them from module definition files.
+version 1.2.3rc2 [May 1, 2002]
+  Fixed bug in reporting number of channels in pngget.c and pngset.c,
+    that was introduced in version 1.2.2beta5.
+  Exported png_zalloc(), png_zfree(), png_default_read(), png_default_write(),
+    png_default_flush(), and png_push_fill_buffer() and included them in
+    module definition files.
+  Added "libpng.pc" dependency to the "install-shared" target in 15 makefiles.
+version 1.2.3rc3 [May 1, 2002]
+  Revised prototype for png_default_flush()
+  Remove old libpng.pc and libpngNN.pc before installing new ones.
+version 1.2.3rc4 [May 2, 2002]
+  Typos in *.def files (png_default_read|write -> png_default_read|write_data)
+  In makefiles, changed rm libpng.NN.pc to rm libpngNN.pc
+  Added libpng-config and libpngNN-config and modified makefiles to install them.
+  Changed $(MANPATH) to $(DESTDIR)$(MANPATH) in makefiles
+  Added "Win32 DLL VB" configuration to projects/msvc/libpng.dsp
+version 1.2.3rc5 [May 11, 2002]
+  Changed "error" and "message" in prototypes to "error_message" and
+    "warning_message" to avoid namespace conflict.
+  Revised 15 makefiles to build libpng-config from libpng-config-*.in
+  Once more restored png_zalloc and png_zfree to regular nonexported form.
+  Restored png_default_read|write_data, png_default_flush, png_read_fill_buffer
+    to nonexported form, but with PNGAPI, and removed them from module def files.
+version 1.2.3rc6 [May 14, 2002]
+  Removed "PNGAPI" from png_zalloc() and png_zfree() in png.c
+  Changed "Gz" to "Gd" in projects/msvc/libpng.dsp and zlib.dsp.
+  Removed leftover libpng-config "sed" script from four makefiles.
+  Revised libpng-config creating script in 16 makefiles.
+
+version 1.2.3 [May 22, 2002]
+  Revised libpng-config target in makefile.cygwin.
+  Removed description of png_set_mem_fn() from documentation.
+  Revised makefile.freebsd.
+  Minor cosmetic changes to 15 makefiles, e.g., $(DI) = $(DESTDIR)/$(INCDIR).
+  Revised projects/msvc/README.txt
+  Changed -lpng to -lpngNN in LDFLAGS in several makefiles.
+version 1.2.4beta1 [May 24, 2002]
+  Added libpng.pc and libpng-config to "all:" target in 16 makefiles.
+  Fixed bug in 16 makefiles: $(DESTDIR)/$(LIBPATH) to $(DESTDIR)$(LIBPATH)
+  Added missing "\" before closing double quote in makefile.gcmmx.
+  Plugged various memory leaks; added png_malloc_warn() and png_set_text_2()
+    functions.
+version 1.2.4beta2 [June 25, 2002]
+  Plugged memory leak of png_ptr->current_text (Matt Holgate).
+  Check for buffer overflow before reading CRC in pngpread.c (Warwick Allison)
+  Added -soname to the loader flags in makefile.dec, makefile.sgi, and
+    makefile.sggcc.
+  Added "test-installed" target to makefile.linux, makefile.gcmmx,
+    makefile.sgi, and makefile.sggcc.
+version 1.2.4beta3 [June 28, 2002]
+  Plugged memory leak of row_buf in pngtest.c when there is a png_error().
+  Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data.
+  Added "test-installed" target to makefile.32sunu, makefile.64sunu,
+    makefile.beos, makefile.darwin, makefile.dec, makefile.macosx, 
+    makefile.solaris, makefile.hpux, makefile.hpgcc, and makefile.so9.
+version 1.2.4rc1 and 1.0.14rc1 [July 2, 2002]
+  Added "test-installed" target to makefile.cygwin and makefile.sco.
+  Revised pnggccrd.c to be able to back out version 1.0.x via PNG_1_0_X macro.
+
+version 1.2.4 and 1.0.14 [July 8, 2002]
+  Changed png_warning() to png_error() when width is too large to process.
+version 1.2.4patch01 [July 20, 2002]
+  Revised makefile.cygwin to use DLL number 12 instead of 13.
+version 1.2.5beta1 [August 6, 2002]
+  Added code to contrib/gregbook/readpng2.c to ignore unused chunks.
+  Replaced toucan.png in contrib/gregbook (it has been corrupt since 1.0.11)
+  Removed some stray *.o files from contrib/gregbook.
+  Changed png_error() to png_warning() about "Too much data" in pngpread.c
+    and about "Extra compressed data" in pngrutil.c.
+  Prevent png_ptr->pass from exceeding 7 in png_push_finish_row().
+  Updated makefile.hpgcc
+  Updated png.c and pnggccrd.c handling of return from png_mmx_support()
+version 1.2.5beta2 [August 15, 2002]
+  Only issue png_warning() about "Too much data" in pngpread.c when avail_in
+    is nonzero.
+  Updated makefiles to install a separate libpng.so.3 with its own rpath.
+version 1.2.5rc1 and 1.0.15rc1 [August 24, 2002]
+  Revised makefiles to not remove previous minor versions of shared libraries.
+version 1.2.5rc2 and 1.0.15rc2 [September 16, 2002]
+  Revised 13 makefiles to remove "-lz" and "-L$(ZLIBLIB)", etc., from shared
+    library loader directive.
+  Added missing "$OBJSDLL" line to makefile.gcmmx.
+  Added missing "; fi" to makefile.32sunu.
+version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002]
+  Revised libpng-config script.
+
+version 1.2.5 and 1.0.15 [October 3, 2002]
+  Revised makefile.macosx, makefile.darwin, makefile.hpgcc, and makefile.hpux,
+    and makefile.aix.
+  Relocated two misplaced PNGAPI lines in pngtest.c
+version 1.2.6beta1 [October 22, 2002]
+  Commented out warning about uninitialized mmx_support in pnggccrd.c.
+  Changed "IBMCPP__" flag to "__IBMCPP__" in pngconf.h.
+  Relocated two more misplaced PNGAPI lines in pngtest.c
+  Fixed memory overrun bug in png_do_read_filler() with 16-bit datastreams,
+    introduced in version 1.0.2.
+  Revised makefile.macosx, makefile.dec, makefile.aix, and makefile.32sunu.
+version 1.2.6beta2 [November 1, 2002]
+  Added libpng-config "--ldopts" output.
+  Added "AR=ar" and "ARFLAGS=rc" and changed "ar rc" to "$(AR) $(ARFLAGS)"
+    in makefiles.
+version 1.2.6beta3 [July 18, 2004]
+  Reverted makefile changes from version 1.2.6beta2 and some of the changes
+    from version 1.2.6beta1; these will be postponed until version 1.2.7.
+    Version 1.2.6 is going to be a simple bugfix release.
+  Changed the one instance of "ln -sf" to "ln -f -s" in each Sun makefile.
+  Fixed potential overrun in pngerror.c by using strncpy instead of memcpy.
+  Added "#!/bin/sh" at the top of configure, for recognition of the
+    'x' flag under Cygwin (Cosmin).
+  Optimized vacuous tests that silence compiler warnings, in png.c (Cosmin).
+  Added support for PNG_USER_CONFIG, in pngconf.h (Cosmin).
+  Fixed the special memory handler for Borland C under DOS, in pngmem.c
+    (Cosmin).
+  Removed some spurious assignments in pngrutil.c (Cosmin).
+  Replaced 65536 with 65536L, and 0xffff with 0xffffL, to silence warnings
+    on 16-bit platforms (Cosmin).
+  Enclosed shift op expressions in parentheses, to silence warnings (Cosmin).
+  Used proper type png_fixed_point, to avoid problems on 16-bit platforms,
+    in png_handle_sRGB() (Cosmin).
+  Added compression_type to png_struct, and optimized the window size
+    inside the deflate stream (Cosmin).
+  Fixed definition of isnonalpha(), in pngerror.c and pngrutil.c (Cosmin).
+  Fixed handling of unknown chunks that come after IDAT (Cosmin).
+  Allowed png_error() and png_warning() to work even if png_ptr == NULL
+    (Cosmin).
+  Replaced row_info->rowbytes with row_bytes in png_write_find_filter()
+    (Cosmin).
+  Fixed definition of PNG_LIBPNG_VER_DLLNUM (Simon-Pierre).
+  Used PNG_LIBPNG_VER and PNG_LIBPNG_VER_STRING instead of the hardcoded
+    values in png.c (Simon-Pierre, Cosmin).
+  Initialized png_libpng_ver[] with PNG_LIBPNG_VER_STRING (Simon-Pierre).
+  Replaced PNG_LIBPNG_VER_MAJOR with PNG_LIBPNG_VER_DLLNUM in png.rc
+    (Simon-Pierre).
+  Moved the definition of PNG_HEADER_VERSION_STRING near the definitions
+    of the other PNG_LIBPNG_VER_... symbols in png.h (Cosmin).
+  Relocated #ifndef PNGAPI guards in pngconf.h (Simon-Pierre, Cosmin).
+  Updated scripts/makefile.vc(a)win32 (Cosmin).
+  Updated the MSVC project (Simon-Pierre, Cosmin).
+  Updated the Borland C++ Builder project (Cosmin).
+  Avoided access to asm_flags in pngvcrd.c, if PNG_1_0_X is defined (Cosmin).
+  Commented out warning about uninitialized mmx_support in pngvcrd.c (Cosmin).
+  Removed scripts/makefile.bd32 and scripts/pngdef.pas (Cosmin).
+  Added extra guard around inclusion of Turbo C memory headers, in pngconf.h
+    (Cosmin).
+  Renamed projects/msvc/ to projects/visualc6/, and projects/borland/ to
+    projects/cbuilder5/ (Cosmin).
+  Moved projects/visualc6/png32ms.def to scripts/pngw32.def,
+    and projects/visualc6/png.rc to scripts/pngw32.rc (Cosmin).
+  Added projects/visualc6/pngtest.dsp; removed contrib/msvctest/ (Cosmin).
+  Changed line endings to DOS style in cbuilder5 and visualc6 files, even
+    in the tar.* distributions (Cosmin).
+  Updated contrib/visupng/VisualPng.dsp (Cosmin).
+  Updated contrib/visupng/cexcept.h to version 2.0.0 (Cosmin).
+  Added a separate distribution with "configure" and supporting files (Junichi).
+version 1.2.6beta4 [July 28, 2004]
+  Added user ability to change png_size_t via a PNG_SIZE_T macro.
+  Added png_sizeof() and png_convert_size() functions.
+  Added PNG_SIZE_MAX (maximum value of a png_size_t variable.
+  Added check in png_malloc_default() for (size_t)size != (png_uint_32)size
+    which would indicate an overflow.
+  Changed sPLT failure action from png_error to png_warning and abandon chunk.
+  Changed sCAL and iCCP failures from png_error to png_warning and abandon.
+  Added png_get_uint_31(png_ptr, buf) function.
+  Added PNG_UINT_32_MAX macro.
+  Renamed PNG_MAX_UINT to PNG_UINT_31_MAX.
+  Made png_zalloc() issue a png_warning and return NULL on potential
+    overflow.
+  Turn on PNG_NO_ZALLOC_ZERO by default in version 1.2.x
+  Revised "clobber list" in pnggccrd.c so it will compile under gcc-3.4.
+  Revised Borland portion of png_malloc() to return NULL or issue
+    png_error() according to setting of PNG_FLAG_MALLOC_NULL_MEM_OK.
+  Added PNG_NO_SEQUENTIAL_READ_SUPPORTED macro to conditionally remove
+    sequential read support.
+  Added some "#if PNG_WRITE_SUPPORTED" blocks.
+  #ifdef'ed out some redundancy in png_malloc_default().
+  Use png_malloc instead of png_zalloc to allocate the pallete.
+version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]
+  Fixed buffer overflow vulnerability in png_handle_tRNS()
+  Fixed integer arithmetic overflow vulnerability in png_read_png().
+  Fixed some harmless bugs in png_handle_sBIT, etc, that would cause
+    duplicate chunk types to go undetected.
+  Fixed some timestamps in the -config version
+  Rearranged order of processing of color types in png_handle_tRNS().
+  Added ROWBYTES macro to calculate rowbytes without integer overflow.
+  Updated makefile.darwin and removed makefile.macosx from scripts directory.
+  Imposed default one million column, one-million row limits on the image
+    dimensions, and added png_set_user_limits() function to override them.
+  Revised use of PNG_SET_USER_LIMITS_SUPPORTED macro.
+  Fixed wrong cast of returns from png_get_user_width|height_max().
+  Changed some "keep the compiler happy" from empty statements to returns,
+  Revised libpng.txt to remove 1.2.x stuff from the 1.0.x distribution
+version 1.0.16rc2 and 1.2.6rc2 [August 7, 2004]
+  Revised makefile.darwin and makefile.solaris.  Removed makefile.macosx.
+  Revised pngtest's png_debug_malloc() to use png_malloc() instead of
+    png_malloc_default() which is not supposed to be exported.
+  Fixed off-by-one error in one of the conversions to PNG_ROWBYTES() in
+    pngpread.c.  Bug was introduced in 1.2.6rc1.
+  Fixed bug in RGB to RGBX transformation introduced in 1.2.6rc1.
+  Fixed old bug in RGB to Gray transformation.
+  Fixed problem with 64-bit compilers by casting arguments to abs()
+    to png_int_32.
+  Changed "ln -sf" to "ln -f -s" in three makefiles (solaris, sco, so9).
+  Changed "HANDLE_CHUNK_*" to "PNG_HANDLE_CHUNK_*" (Cosmin)
+  Added "-@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)" to 15 *NIX makefiles.
+  Added code to update the row_info->colortype in png_do_read_filler() (MSB).
+version 1.0.16rc3 and 1.2.6rc3 [August 9, 2004]
+  Eliminated use of "abs()" in testing cHRM and gAMA values, to avoid
+    trouble with some 64-bit compilers.  Created PNG_OUT_OF_RANGE() macro.
+  Revised documentation of png_set_keep_unknown_chunks().
+  Check handle_as_unknown status in pngpread.c, as in pngread.c previously.
+  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_INTERNAL section of png.h
+  Added "rim" definitions for CONST4 and CONST6 in pnggccrd.c
+version 1.0.16rc4 and 1.2.6rc4 [August 10, 2004]
+  Fixed mistake in pngtest.c introduced in 1.2.6rc2 (declaration of
+    "pinfo" was out of place).
+version 1.0.16rc5 and 1.2.6rc5 [August 10, 2004]
+  Moved  "PNG_HANDLE_CHUNK_*" macros out of PNG_ASSEMBLER_CODE_SUPPORTED
+     section of png.h where they were inadvertently placed in version rc3.
+
+version 1.0.16 and 1.2.6 [August 15, 2004]
+  Revised pngtest so memory allocation testing is only done when PNG_DEBUG==1.
+version 1.2.7beta1 [August 26, 2004]
+  Removed unused pngasmrd.h file.
+  Removed references to uu.net for archived files.  Added references to
+    PNG Spec (second edition) and the PNG ISO/IEC Standard.
+  Added "test-dd" target in 15 makefiles, to run pngtest in DESTDIR.
+  Fixed bug with "optimized window size" in the IDAT datastream, that
+    causes libpng to write PNG files with incorrect zlib header bytes.
+version 1.2.7beta2 [August 28, 2004]
+  Fixed bug with sCAL chunk and big-endian machines (David Munro).
+  Undid new code added in 1.2.6rc2 to update the color_type in
+    png_set_filler().
+  Added png_set_add_alpha() that updates color type.
+version 1.0.17rc1 and 1.2.7rc1 [September 4, 2004]
+  Revised png_set_strip_filler() to not remove alpha if color_type has alpha.
+version 1.0.17 and 1.2.7 [September 12, 2004]
+  Added makefile.hp64
+  Changed projects/msvc/png32ms.def to scripts/png32ms.def in makefile.cygwin
+
+Send comments/corrections/commendations to
+png-implement@ccrc.wustl.edu (subscription required; write to
+majordomo@ccrc.wustl.edu with "subscribe png-implement" in the message)
+or to glennrp@users.sourceforge.net
+
+Glenn R-P
diff --git a/Source/3rd Party/wx/src/png/README b/Source/3rd Party/wx/src/png/README
new file mode 100644
index 000000000..7109660f1
--- /dev/null
+++ b/Source/3rd Party/wx/src/png/README	
@@ -0,0 +1,260 @@
+README for libpng version 1.2.7 - September 12, 2004 (shared library 12.0)
+See the note about version numbers near the top of png.h
+
+See INSTALL for instructions on how to install libpng.
+
+Libpng comes in several distribution formats.  Get libpng-*.tar.gz
+or libpng-*.tar.bz2 if you want UNIX-style line endings in the text
+files, or lpng*.zip if you want DOS-style line endings.
+
+Version 0.89 was the first official release of libpng.  Don't let the
+fact that it's the first release fool you.  The libpng library has been in
+extensive use and testing since mid-1995.  By late 1997 it had
+finally gotten to the stage where there hadn't been significant
+changes to the API in some time, and people have a bad feeling about
+libraries with versions < 1.0.  Version 1.0.0 was released in
+March 1998.
+
+****
+Note that some of the changes to the png_info structure render this
+version of the library binary incompatible with libpng-0.89 or
+earlier versions if you are using a shared library.  The type of the
+"filler" parameter for png_set_filler() has changed from png_byte to
+png_uint_32, which will affect shared-library applications that use
+this function.
+
+To avoid problems with changes to the internals of png_info_struct,
+new APIs have been made available in 0.95 to avoid direct application
+access to info_ptr.  These functions are the png_set_<chunk> and
+png_get_<chunk> functions.  These functions should be used when
+accessing/storing the info_struct data, rather than manipulating it
+directly, to avoid such problems in the future.
+
+It is important to note that the APIs do not make current programs
+that access the info struct directly incompatible with the new
+library.  However, it is strongly suggested that new programs use
+the new APIs (as shown in example.c and pngtest.c), and older programs
+be converted to the new format, to facilitate upgrades in the future.
+****
+
+Additions since 0.90 include the ability to compile libpng as a
+Windows DLL, and new APIs for accessing data in the info struct.
+Experimental functions include the ability to set weighting and cost
+factors for row filter selection, direct reads of integers from buffers
+on big-endian processors that support misaligned data access, faster
+methods of doing alpha composition, and more accurate 16->8 bit color
+conversion.
+
+The additions since 0.89 include the ability to read from a PNG stream
+which has had some (or all) of the signature bytes read by the calling
+application.  This also allows the reading of embedded PNG streams that
+do not have the PNG file signature.  As well, it is now possible to set
+the library action on the detection of chunk CRC errors.  It is possible
+to set different actions based on whether the CRC error occurred in a
+critical or an ancillary chunk.
+
+The changes made to the library, and bugs fixed are based on discussions
+on the PNG-implement mailing list
+and not on material submitted privately to Guy, Andreas, or Glenn.  They will
+forward any good suggestions to the list.
+
+For a detailed description on using libpng, read libpng.txt.  For
+examples of libpng in a program, see example.c and pngtest.c.  For usage
+information and restrictions (what little they are) on libpng, see
+png.h.  For a description on using zlib (the compression library used by
+libpng) and zlib's restrictions, see zlib.h
+
+I have included a general makefile, as well as several machine and
+compiler specific ones, but you may have to modify one for your own needs.
+
+You should use zlib 1.0.4 or later to run this, but it MAY work with
+versions as old as zlib 0.95.  Even so, there are bugs in older zlib
+versions which can cause the output of invalid compression streams for
+some images.  You will definitely need zlib 1.0.4 or later if you are
+taking advantage of the MS-DOS "far" structure allocation for the small
+and medium memory models.  You should also note that zlib is a
+compression library that is useful for more things than just PNG files.
+You can use zlib as a drop-in replacement for fread() and fwrite() if
+you are so inclined.
+
+zlib should be available at the same place that libpng is, or at.
+ftp://ftp.info-zip.org/pub/infozip/zlib
+
+You may also want a copy of the PNG specification.  It is available
+as an RFC, a W3C Recommendation, and an ISO/IEC Standard.  You can find
+these at http://www.libpng.org/pub/png/documents/
+
+This code is currently being archived at libpng.sf.net in the
+[DOWNLOAD] area, and on CompuServe, Lib 20 (PNG SUPPORT)
+at GO GRAPHSUP.  If you can't find it in any of those places,
+e-mail me, and I'll help you find it.
+
+If you have any code changes, requests, problems, etc., please e-mail
+them to me.  Also, I'd appreciate any make files or project files,
+and any modifications you needed to make to get libpng to compile,
+along with a #define variable to tell what compiler/system you are on.
+If you needed to add transformations to libpng, or wish libpng would
+provide the image in a different way, drop me a note (and code, if
+possible), so I can consider supporting the transformation.
+Finally, if you get any warning messages when compiling libpng
+(note: not zlib), and they are easy to fix, I'd appreciate the
+fix.  Please mention "libpng" somewhere in the subject line.  Thanks.
+
+This release was created and will be supported by myself (of course
+based in a large way on Guy's and Andreas' earlier work), and the PNG group.
+
+glennrp@users.sourceforge.net
+png-implement@ccrc.wustl.edu (subscription required; write to
+majordomo@ccrc.wustl.edu with "subscribe png-implement" in the message).
+
+You can't reach Guy, the original libpng author, at the addresses
+given in previous versions of this document.  He and Andreas will read mail
+addressed to the png-implement list, however.
+
+Please do not send general questions about PNG.  Send them to
+the (png-list@ccrc.wustl.edu, subscription required, write to
+majordomo@ccrc.wustl.edu with "subscribe png-list" in your message).
+On the other hand,
+please do not send libpng questions to that address, send them to me
+or to the png-implement list.  I'll
+get them in the end anyway.  If you have a question about something
+in the PNG specification that is related to using libpng, send it
+to me.  Send me any questions that start with "I was using libpng,
+and ...".  If in doubt, send questions to me.  I'll bounce them
+to others, if necessary.
+
+Please do not send suggestions on how to change PNG.  We have
+been discussing PNG for nine years now, and it is official and
+finished.  If you have suggestions for libpng, however, I'll
+gladly listen.  Even if your suggestion is not used immediately,
+it may be used later.
+
+Files in this distribution:
+
+      ANNOUNCE      =>  Announcement of this version, with recent changes
+      CHANGES       =>  Description of changes between libpng versions
+      KNOWNBUG      =>  List of known bugs and deficiencies
+      LICENSE       =>  License to use and redistribute libpng
+      README        =>  This file
+      TODO          =>  Things not implemented in the current library
+      Y2KINFO       =>  Statement of Y2K compliance
+      example.c     =>  Example code for using libpng functions
+      libpng.3      =>  manual page for libpng (includes libpng.txt)
+      libpng.txt    =>  Description of libpng and its functions
+      libpngpf.3    =>  manual page for libpng's private functions
+      png.5         =>  manual page for the PNG format
+      png.c         =>  Basic interface functions common to library
+      png.h         =>  Library function and interface declarations
+      pngconf.h     =>  System specific library configuration
+      pngasmrd.h    =>  Header file for assembler-coded functions
+      pngerror.c    =>  Error/warning message I/O functions
+      pngget.c      =>  Functions for retrieving info from struct
+      pngmem.c      =>  Memory handling functions
+      pngbar.png    =>  PNG logo, 88x31
+      pngnow.png    =>  PNG logo, 98x31
+      pngpread.c    =>  Progressive reading functions
+      pngread.c     =>  Read data/helper high-level functions
+      pngrio.c      =>  Lowest-level data read I/O functions
+      pngrtran.c    =>  Read data transformation functions
+      pngrutil.c    =>  Read data utility functions
+      pngset.c      =>  Functions for storing data into the info_struct
+      pngtest.c     =>  Library test program
+      pngtest.png   =>  Library test sample image
+      pngtrans.c    =>  Common data transformation functions
+      pngwio.c      =>  Lowest-level write I/O functions
+      pngwrite.c    =>  High-level write functions
+      pngwtran.c    =>  Write data transformations
+      pngwutil.c    =>  Write utility functions
+      contrib       =>  Contributions
+       gregbook         =>  source code for PNG reading and writing, from
+                            Greg Roelofs' "PNG: The Definitive Guide",
+                            O'Reilly, 1999
+       msvctest     =>  Builds and runs pngtest using a MSVC workspace
+       pngminus     =>  Simple pnm2png and png2pnm programs
+       pngsuite     =>  Test images
+       visupng      =>  Contains a MSVC workspace for VisualPng
+      projects      =>  Contains project files and workspaces for building DLL
+       beos             =>  Contains a Beos workspace for building libpng
+       c5builder        =>  Contains a Borland workspace for building libpng
+                            and zlib
+       visualc6         =>  Contains a Microsoft Visual C++ (MSVC) workspace
+                            for building libpng and zlib
+       netware.txt      =>  Contains instructions for downloading a set of
+                            project files for building libpng and zlib on
+                            Netware.
+       wince.txt        =>  Contains instructions for downloading a Microsoft
+                            Visual C++ (Windows CD Toolkit) workspace for
+                            building libpng and zlib on WindowsCE
+      scripts       =>  Directory containing scripts for building libpng:
+       descrip.mms      =>  VMS makefile for MMS or MMK
+       makefile.std     =>  Generic UNIX makefile (cc, creates static libpng.a)
+       makefile.linux   =>  Linux/ELF makefile
+                            (gcc, creates libpng12.so.0.1.2.7)
+       makefile.gcmmx   =>  Linux/ELF makefile
+                            (gcc, creates libpng12.so.0.1.2.7,
+                            uses assembler code tuned for Intel MMX platform)
+       makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
+       makefile.knr     =>  Archaic UNIX Makefile that converts files with
+                            ansi2knr (Requires ansi2knr.c from
+                            ftp://ftp.cs.wisc.edu/ghost)
+       makefile.aix     =>  AIX makefile
+       makefile.cygwin  =>  Cygwin/gcc makefile
+       makefile.darwin  =>  Darwin makefile
+       makefile.dec     =>  DEC Alpha UNIX makefile
+       makefile.freebsd =>  FreeBSD makefile
+       makefile.hpgcc   =>  HPUX makefile using gcc
+       makefile.hpux    =>  HPUX (10.20 and 11.00) makefile
+       makefile.hp64    =>  HPUX (10.20 and 11.00) makefile, 64 bit
+       makefile.ibmc    =>  IBM C/C++ version 3.x for Win32 and OS/2 (static)
+       makefile.intel   =>  Intel C/C++ version 4.0 and later
+       libpng.icc       =>  Project file, IBM VisualAge/C++ 4.0 or later
+       makefile.netbsd  =>  NetBSD/cc makefile, PNGGCCRD, makes libpng.so.
+       makefile.ne12bsd  =>  NetBSD/cc makefile, PNGGCCRD, makes libpng12.so
+       makefile.openbsd =>  OpenBSD makefile
+       makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
+       makefile.sggcc   =>  Silicon Graphics
+                            (gcc, creates libpng12.so.0.1.2.7)
+       makefile.sunos   =>  Sun makefile
+       makefile.solaris =>  Solaris 2.X makefile
+                            (gcc, creates libpng12.so.0.1.2.7)
+       makefile.so9     =>  Solaris 9 makefile
+                            (gcc, creates libpng12.so.0.1.2.7)
+       makefile.32sunu  =>  Sun Ultra 32-bit makefile
+       makefile.64sunu  =>  Sun Ultra 64-bit makefile
+       makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
+       makefile.mips    =>  MIPS makefile
+       makefile.acorn   =>  Acorn makefile
+       makefile.amiga   =>  Amiga makefile
+       smakefile.ppc    =>  AMIGA smakefile for SAS C V6.58/7.00 PPC
+                            compiler (Requires SCOPTIONS, copied from
+                            scripts/SCOPTIONS.ppc)
+       makefile.atari   =>  Atari makefile
+       makefile.beos    =>  BEOS makefile for X86
+       makefile.bor     =>  Borland makefile (uses bcc)
+       makefile.bc32    =>  32-bit Borland C++ (all modules compiled in C mode)
+       makefile.tc3     =>  Turbo C 3.0 makefile
+       makefile.dj2     =>  DJGPP 2 makefile
+       makefile.msc     =>  Microsoft C makefile
+       makefile.vcawin32=>  makefile for Microsoft Visual C++ 5.0 and
+                            later (uses assembler code tuned for Intel MMX
+                            platform)
+       makefile.vcwin32 =>  makefile for Microsoft Visual C++ 4.0 and
+                            later (does not use assembler code)
+       makefile.os2     =>  OS/2 Makefile (gcc and emx, requires pngos2.def)
+       pngos2.def       =>  OS/2 module definition file used by makefile.os2
+       makefile.watcom  =>  Watcom 10a+ Makefile, 32-bit flat memory model
+       makevms.com      =>  VMS build script
+       SCOPTIONS.ppc    =>  Used with smakefile.ppc
+
+Good luck, and happy coding.
+
+-Glenn Randers-Pehrson (current maintainer)
+ Internet: glennrp@users.sourceforge.net
+
+-Andreas Eric Dilger (former maintainer, 1996-1997)
+ Internet: adilger@enel.ucalgary.ca
+ Web: http://www-mddsp.enel.ucalgary.ca/People/adilger/
+
+-Guy Eric Schalnat (original author and former maintainer, 1995-1996)
+ (formerly of Group 42, Inc)
+ Internet: gschal@infinet.com
diff --git a/Source/3rd Party/wx/src/png/TODO b/Source/3rd Party/wx/src/png/TODO
new file mode 100644
index 000000000..a5f639577
--- /dev/null
+++ b/Source/3rd Party/wx/src/png/TODO	
@@ -0,0 +1,24 @@
+TODO - list of things to do for libpng:
+
+Final bug fixes.
+Improve API by hiding the png_struct and png_info structs.
+Finish work on the no-floating-point version (including gamma compensation)
+Better C++ wrapper/full C++ implementation?
+Fix problem with C++ and EXTERN "C".
+cHRM transformation.
+Improve setjmp/longjmp usage or remove it in favor of returning error codes.
+Add "grayscale->palette" transformation and "palette->grayscale" detection.
+Improved dithering.
+Multi-lingual error and warning message support.
+Complete sRGB transformation (presently it simply uses gamma=0.45455).
+Man pages for function calls.
+Better documentation.
+Better filter selection
+   (counting huffman bits/precompression?  filter inertia?  filter costs?).
+Histogram creation.
+Text conversion between different code pages (Latin-1 -> Mac and DOS).
+Should we always malloc 2^bit_depth PLTE/tRNS/hIST entries for safety?
+Build gamma tables using fixed point (and do away with floating point entirely).
+Use greater precision when changing to linear gamma for compositing against
+  background and doing rgb-to-gray transformation.
+Investigate pre-incremented loop counters and other loop constructions.
diff --git a/Source/3rd Party/wx/src/png/ansi2knr.c b/Source/3rd Party/wx/src/png/ansi2knr.c
new file mode 100644
index 000000000..dfb29a244
--- /dev/null
+++ b/Source/3rd Party/wx/src/png/ansi2knr.c	
@@ -0,0 +1,695 @@
+/* ansi2knr.c */
+
+/* Convert ANSI C function definitions to K&R ("traditional C") syntax
+Copyright (C) 1989 Aladdin Enterprises.  All rights reserved.
+Copyright (C) 1988 Richard M. Stallman
+
+ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY.  No author or distributor accepts responsibility to anyone for the
+consequences of using it or for whether it serves any particular purpose or
+works at all, unless he says so in writing.  Refer to the GNU General Public
+License (the "GPL") for full details.
+
+Everyone is granted permission to copy, modify and redistribute ansi2knr,
+but only under the conditions described in the GPL.  A copy of this license
+is supposed to have been given to you along with ansi2knr so you can know
+your rights and responsibilities.  It should be in a file named COPYLEFT.
+[In the LIBPNG distribution, the GPL appears below, not in a separate file.]
+Among other things, the copyright notice and this notice must be preserved
+on all copies.
+
+We explicitly state here what we believe is already implied by the GPL: if
+the ansi2knr program is distributed as a separate source file and a
+separate executable file which are aggregated on a storage medium together
+with another program, this in itself does not bring the other program under
+the GPL, nor does the mere fact that such a program or the procedures for
+constructing it invoke the ansi2knr executable bring any other part of the
+program under the GPL.
+*/
+
+/*
+---------- Here is the GNU GPL file COPYLEFT, referred to above ----------
+----- These terms do NOT apply to the LIBPNG software itself; see README ------
+
+		    GHOSTSCRIPT GENERAL PUBLIC LICENSE
+		    (Clarified 11 Feb 1988)
+
+ Copyright (C) 1988 Richard M. Stallman
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license, but changing it is not allowed.  You can also use this wording
+ to make the terms for other programs.
+
+  The license agreements of most software companies keep you at the
+mercy of those companies.  By contrast, our general public license is
+intended to give everyone the right to share Ghostscript.  To make sure
+that you get the rights we want you to have, we need to make
+restrictions that forbid anyone to deny you these rights or to ask you
+to surrender the rights.  Hence this license agreement.
+
+  Specifically, we want to make sure that you have the right to give
+away copies of Ghostscript, that you receive source code or else can get
+it if you want it, that you can change Ghostscript or use pieces of it
+in new free programs, and that you know you can do these things.
+
+  To make sure that everyone has such rights, we have to forbid you to
+deprive anyone else of these rights.  For example, if you distribute
+copies of Ghostscript, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must tell them their rights.
+
+  Also, for our own protection, we must make certain that everyone finds
+out that there is no warranty for Ghostscript.  If Ghostscript is
+modified by someone else and passed on, we want its recipients to know
+that what they have is not what we distributed, so that any problems
+introduced by others will not reflect on our reputation.
+
+  Therefore we (Richard M. Stallman and the Free Software Foundation,
+Inc.) make the following terms which say what you must do to be allowed
+to distribute or change Ghostscript.
+
+
+			COPYING POLICIES
+
+  1. You may copy and distribute verbatim copies of Ghostscript source
+code as you receive it, in any medium, provided that you conspicuously
+and appropriately publish on each copy a valid copyright and license
+notice "Copyright (C) 1989 Aladdin Enterprises.  All rights reserved.
+Distributed by Free Software Foundation, Inc." (or with whatever year is
+appropriate); keep intact the notices on all files that refer to this
+License Agreement and to the absence of any warranty; and give any other
+recipients of the Ghostscript program a copy of this License Agreement
+along with the program.  You may charge a distribution fee for the
+physical act of transferring a copy.
+
+  2. You may modify your copy or copies of Ghostscript or any portion of
+it, and copy and distribute such modifications under the terms of
+Paragraph 1 above, provided that you also do the following:
+
+    a) cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change; and
+
+    b) cause the whole of any work that you distribute or publish,
+    that in whole or in part contains or is a derivative of Ghostscript
+    or any part thereof, to be licensed at no charge to all third
+    parties on terms identical to those contained in this License
+    Agreement (except that you may choose to grant more extensive
+    warranty protection to some or all third parties, at your option).
+
+    c) You may charge a distribution fee for the physical act of
+    transferring a copy, and you may at your option offer warranty
+    protection in exchange for a fee.
+
+Mere aggregation of another unrelated program with this program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other program under the scope of these terms.
+
+  3. You may copy and distribute Ghostscript (or a portion or derivative
+of it, under Paragraph 2) in object code or executable form under the
+terms of Paragraphs 1 and 2 above provided that you also do one of the
+following:
+
+    a) accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    b) accompany it with a written offer, valid for at least three
+    years, to give any third party free (except for a nominal
+    shipping charge) a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    c) accompany it with the information you received as to where the
+    corresponding source code may be obtained.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form alone.)
+
+For an executable file, complete source code means all the source code for
+all modules it contains; but, as a special exception, it need not include
+source code for modules which are standard libraries that accompany the
+operating system on which the executable file runs.
+
+  4. You may not copy, sublicense, distribute or transfer Ghostscript
+except as expressly provided under this License Agreement.  Any attempt
+otherwise to copy, sublicense, distribute or transfer Ghostscript is
+void and your rights to use the program under this License agreement
+shall be automatically terminated.  However, parties who have received
+computer software programs from you with this License Agreement will not
+have their licenses terminated so long as such parties remain in full
+compliance.
+
+  5. If you wish to incorporate parts of Ghostscript into other free
+programs whose distribution conditions are different, write to the Free
+Software Foundation at 675 Mass Ave, Cambridge, MA 02139.  We have not
+yet worked out a simple rule that can be stated here, but we will often
+permit this.  We will be guided by the two goals of preserving the free
+status of all derivatives of our free software and of promoting the
+sharing and reuse of software.
+
+Your comments and suggestions about our licensing policies and our
+software are welcome!  Please contact the Free Software Foundation,
+Inc., 675 Mass Ave, Cambridge, MA 02139, or call (617) 876-3296.
+
+		       NO WARRANTY
+
+  BECAUSE GHOSTSCRIPT IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY
+NO WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW.  EXCEPT
+WHEN OTHERWISE STATED IN WRITING, FREE SOFTWARE FOUNDATION, INC, RICHARD
+M. STALLMAN, ALADDIN ENTERPRISES, L. PETER DEUTSCH, AND/OR OTHER PARTIES
+PROVIDE GHOSTSCRIPT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE
+ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF GHOSTSCRIPT IS WITH
+YOU.  SHOULD GHOSTSCRIPT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL RICHARD M.
+STALLMAN, THE FREE SOFTWARE FOUNDATION, INC., L. PETER DEUTSCH, ALADDIN
+ENTERPRISES, AND/OR ANY OTHER PARTY WHO MAY MODIFY AND REDISTRIBUTE
+GHOSTSCRIPT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
+ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) GHOSTSCRIPT, EVEN IF YOU
+HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM
+BY ANY OTHER PARTY.
+
+-------------------- End of file COPYLEFT ------------------------------
+*/
+
+/*
+ * Usage:
+	ansi2knr input_file [output_file]
+ * If no output_file is supplied, output goes to stdout.
+ * There are no error messages.
+ *
+ * ansi2knr recognizes function definitions by seeing a non-keyword
+ * identifier at the left margin, followed by a left parenthesis,
+ * with a right parenthesis as the last character on the line,
+ * and with a left brace as the first token on the following line
+ * (ignoring possible intervening comments).
+ * It will recognize a multi-line header provided that no intervening
+ * line ends with a left or right brace or a semicolon.
+ * These algorithms ignore whitespace and comments, except that
+ * the function name must be the first thing on the line.
+ * The following constructs will confuse it:
+ *	- Any other construct that starts at the left margin and
+ *	    follows the above syntax (such as a macro or function call).
+ *	- Some macros that tinker with the syntax of the function header.
+ */
+
+/*
+ * The original and principal author of ansi2knr is L. Peter Deutsch
+ * <ghost@aladdin.com>.  Other authors are noted in the change history
+ * that follows (in reverse chronological order):
+	lpd 96-01-21 added code to cope with not HAVE_CONFIG_H and with
+		compilers that don't understand void, as suggested by
+		Tom Lane
+	lpd 96-01-15 changed to require that the first non-comment token
+		on the line following a function header be a left brace,
+		to reduce sensitivity to macros, as suggested by Tom Lane
+		<tgl@sss.pgh.pa.us>
+	lpd 95-06-22 removed #ifndefs whose sole purpose was to define
+		undefined preprocessor symbols as 0; changed all #ifdefs
+		for configuration symbols to #ifs
+	lpd 95-04-05 changed copyright notice to make it clear that
+		including ansi2knr in a program does not bring the entire
+		program under the GPL
+	lpd 94-12-18 added conditionals for systems where ctype macros
+		don't handle 8-bit characters properly, suggested by
+		Francois Pinard <pinard@iro.umontreal.ca>;
+		removed --varargs switch (this is now the default)
+	lpd 94-10-10 removed CONFIG_BROKETS conditional
+	lpd 94-07-16 added some conditionals to help GNU `configure',
+		suggested by Francois Pinard <pinard@iro.umontreal.ca>;
+		properly erase prototype args in function parameters,
+		contributed by Jim Avera <jima@netcom.com>;
+		correct error in writeblanks (it shouldn't erase EOLs)
+	lpd 89-xx-xx original version
+ */
+
+/* Most of the conditionals here are to make ansi2knr work with */
+/* or without the GNU configure machinery. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+
+#if HAVE_CONFIG_H
+
+/*
+   For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
+   This will define HAVE_CONFIG_H and so, activate the following lines.
+ */
+
+# if STDC_HEADERS || HAVE_STRING_H
+#  include <string.h>
+# else
+#  include <strings.h>
+# endif
+
+#else /* not HAVE_CONFIG_H */
+
+/* Otherwise do it the hard way */
+
+# ifdef BSD
+#  include <strings.h>
+# else
+#  ifdef VMS
+    extern int strlen(), strncmp();
+#  else
+#   include <string.h>
+#  endif
+# endif
+
+#endif /* not HAVE_CONFIG_H */
+
+#if STDC_HEADERS
+# include <stdlib.h>
+#else
+/*
+   malloc and free should be declared in stdlib.h,
+   but if you've got a K&R compiler, they probably aren't.
+ */
+# ifdef MSDOS
+#  include <malloc.h>
+# else
+#  ifdef VMS
+     extern char *malloc();
+     extern void free();
+#  else
+     extern char *malloc();
+     extern int free();
+#  endif
+# endif
+
+#endif
+
+/*
+ * The ctype macros don't always handle 8-bit characters correctly.
+ * Compensate for this here.
+ */
+#ifdef isascii
+#  undef HAVE_ISASCII		/* just in case */
+#  define HAVE_ISASCII 1
+#else
+#endif
+#if STDC_HEADERS || !HAVE_ISASCII
+#  define is_ascii(c) 1
+#else
+#  define is_ascii(c) isascii(c)
+#endif
+
+#define is_space(c) (is_ascii(c) && isspace(c))
+#define is_alpha(c) (is_ascii(c) && isalpha(c))
+#define is_alnum(c) (is_ascii(c) && isalnum(c))
+
+/* Scanning macros */
+#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
+#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
+
+/* Forward references */
+char *skipspace();
+int writeblanks();
+int test1();
+int convert1();
+
+/* The main program */
+int
+main(argc, argv)
+    int argc;
+    char *argv[];
+{	FILE *in, *out;
+#define bufsize 5000			/* arbitrary size */
+	char *buf;
+	char *line;
+	char *more;
+	/*
+	 * In previous versions, ansi2knr recognized a --varargs switch.
+	 * If this switch was supplied, ansi2knr would attempt to convert
+	 * a ... argument to va_alist and va_dcl; if this switch was not
+	 * supplied, ansi2knr would simply drop any such arguments.
+	 * Now, ansi2knr always does this conversion, and we only
+	 * check for this switch for backward compatibility.
+	 */
+	int convert_varargs = 1;
+
+	if ( argc > 1 && argv[1][0] == '-' )
+	  {	if ( !strcmp(argv[1], "--varargs") )
+		  {	convert_varargs = 1;
+			argc--;
+			argv++;
+		  }
+		else
+		  {	fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
+			exit(1);
+		  }
+	  }
+	switch ( argc )
+	   {
+	default:
+		printf("Usage: ansi2knr input_file [output_file]\n");
+		exit(0);
+	case 2:
+		out = stdout;
+		break;
+	case 3:
+		out = fopen(argv[2], "w");
+		if ( out == NULL )
+		   {	fprintf(stderr, "Cannot open output file %s\n", argv[2]);
+			exit(1);
+		   }
+	   }
+	in = fopen(argv[1], "r");
+	if ( in == NULL )
+	   {	fprintf(stderr, "Cannot open input file %s\n", argv[1]);
+		exit(1);
+	   }
+	fprintf(out, "#line 1 \"%s\"\n", argv[1]);
+	buf = malloc(bufsize);
+	line = buf;
+	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
+	   {
+test:		line += strlen(line);
+		switch ( test1(buf) )
+		   {
+		case 2:			/* a function header */
+			convert1(buf, out, 1, convert_varargs);
+			break;
+		case 1:			/* a function */
+			/* Check for a { at the start of the next line. */
+			more = ++line;
+f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
+			  goto wl;
+			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
+			  goto wl;
+			switch ( *skipspace(more, 1) )
+			  {
+			  case '{':
+			    /* Definitely a function header. */
+			    convert1(buf, out, 0, convert_varargs);
+			    fputs(more, out);
+			    break;
+			  case 0:
+			    /* The next line was blank or a comment: */
+			    /* keep scanning for a non-comment. */
+			    line += strlen(line);
+			    goto f;
+			  default:
+			    /* buf isn't a function header, but */
+			    /* more might be. */
+			    fputs(buf, out);
+			    strcpy(buf, more);
+			    line = buf;
+			    goto test;
+			  }
+			break;
+		case -1:		/* maybe the start of a function */
+			if ( line != buf + (bufsize - 1) ) /* overflow check */
+			  continue;
+			/* falls through */
+		default:		/* not a function */
+wl:			fputs(buf, out);
+			break;
+		   }
+		line = buf;
+	   }
+	if ( line != buf )
+	  fputs(buf, out);
+	free(buf);
+	fclose(out);
+	fclose(in);
+	return 0;
+}
+
+/* Skip over space and comments, in either direction. */
+char *
+skipspace(p, dir)
+    register char *p;
+    register int dir;			/* 1 for forward, -1 for backward */
+{	for ( ; ; )
+	   {	while ( is_space(*p) )
+		  p += dir;
+		if ( !(*p == '/' && p[dir] == '*') )
+		  break;
+		p += dir;  p += dir;
+		while ( !(*p == '*' && p[dir] == '/') )
+		   {	if ( *p == 0 )
+			  return p;	/* multi-line comment?? */
+			p += dir;
+		   }
+		p += dir;  p += dir;
+	   }
+	return p;
+}
+
+/*
+ * Write blanks over part of a string.
+ * Don't overwrite end-of-line characters.
+ */
+int
+writeblanks(start, end)
+    char *start;
+    char *end;
+{	char *p;
+	for ( p = start; p < end; p++ )
+	  if ( *p != '\r' && *p != '\n' )
+	    *p = ' ';
+	return 0;
+}
+
+/*
+ * Test whether the string in buf is a function definition.
+ * The string may contain and/or end with a newline.
+ * Return as follows:
+ *	0 - definitely not a function definition;
+ *	1 - definitely a function definition;
+ *	2 - definitely a function prototype (NOT USED);
+ *	-1 - may be the beginning of a function definition,
+ *		append another line and look again.
+ * The reason we don't attempt to convert function prototypes is that
+ * Ghostscript's declaration-generating macros look too much like
+ * prototypes, and confuse the algorithms.
+ */
+int
+test1(buf)
+    char *buf;
+{	register char *p = buf;
+	char *bend;
+	char *endfn;
+	int contin;
+
+	if ( !isidfirstchar(*p) )
+	  return 0;		/* no name at left margin */
+	bend = skipspace(buf + strlen(buf) - 1, -1);
+	switch ( *bend )
+	   {
+	   case ';': contin = 0 /*2*/; break;
+	   case ')': contin = 1; break;
+	   case '{': return 0;		/* not a function */
+	   case '}': return 0;		/* not a function */
+	   default: contin = -1;
+	   }
+	while ( isidchar(*p) )
+	  p++;
+	endfn = p;
+	p = skipspace(p, 1);
+	if ( *p++ != '(' )
+	  return 0;		/* not a function */
+	p = skipspace(p, 1);
+	if ( *p == ')' )
+	  return 0;		/* no parameters */
+	/* Check that the apparent function name isn't a keyword. */
+	/* We only need to check for keywords that could be followed */
+	/* by a left parenthesis (which, unfortunately, is most of them). */
+	   {	static char *words[] =
+		   {	"asm", "auto", "case", "char", "const", "double",
+			"extern", "float", "for", "if", "int", "long",
+			"register", "return", "short", "signed", "sizeof",
+			"static", "switch", "typedef", "unsigned",
+			"void", "volatile", "while", 0
+		   };
+		char **key = words;
+		char *kp;
+		int len = endfn - buf;
+
+		while ( (kp = *key) != 0 )
+		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
+			  return 0;	/* name is a keyword */
+			key++;
+		   }
+	   }
+	return contin;
+}
+
+/* Convert a recognized function definition or header to K&R syntax. */
+int
+convert1(buf, out, header, convert_varargs)
+    char *buf;
+    FILE *out;
+    int header;			/* Boolean */
+    int convert_varargs;	/* Boolean */
+{	char *endfn;
+	register char *p;
+	char **breaks;
+	unsigned num_breaks = 2;	/* for testing */
+	char **btop;
+	char **bp;
+	char **ap;
+	char *vararg = 0;
+
+	/* Pre-ANSI implementations don't agree on whether strchr */
+	/* is called strchr or index, so we open-code it here. */
+	for ( endfn = buf; *(endfn++) != '('; )
+	  ;
+top:	p = endfn;
+	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
+	if ( breaks == 0 )
+	   {	/* Couldn't allocate break table, give up */
+		fprintf(stderr, "Unable to allocate break table!\n");
+		fputs(buf, out);
+		return -1;
+	   }
+	btop = breaks + num_breaks * 2 - 2;
+	bp = breaks;
+	/* Parse the argument list */
+	do
+	   {	int level = 0;
+		char *lp = NULL;
+		char *rp;
+		char *end = NULL;
+
+		if ( bp >= btop )
+		   {	/* Filled up break table. */
+			/* Allocate a bigger one and start over. */
+			free((char *)breaks);
+			num_breaks <<= 1;
+			goto top;
+		   }
+		*bp++ = p;
+		/* Find the end of the argument */
+		for ( ; end == NULL; p++ )
+		   {	switch(*p)
+			   {
+			   case ',':
+				if ( !level ) end = p;
+				break;
+			   case '(':
+				if ( !level ) lp = p;
+				level++;
+				break;
+			   case ')':
+				if ( --level < 0 ) end = p;
+				else rp = p;
+				break;
+			   case '/':
+				p = skipspace(p, 1) - 1;
+				break;
+			   default:
+				;
+			   }
+		   }
+		/* Erase any embedded prototype parameters. */
+		if ( lp )
+		  writeblanks(lp + 1, rp);
+		p--;			/* back up over terminator */
+		/* Find the name being declared. */
+		/* This is complicated because of procedure and */
+		/* array modifiers. */
+		for ( ; ; )
+		   {	p = skipspace(p - 1, -1);
+			switch ( *p )
+			   {
+			   case ']':	/* skip array dimension(s) */
+			   case ')':	/* skip procedure args OR name */
+			   {	int level = 1;
+				while ( level )
+				 switch ( *--p )
+				   {
+				   case ']': case ')': level++; break;
+				   case '[': case '(': level--; break;
+				   case '/': p = skipspace(p, -1) + 1; break;
+				   default: ;
+				   }
+			   }
+				if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
+				   {	/* We found the name being declared */
+					while ( !isidfirstchar(*p) )
+					  p = skipspace(p, 1) + 1;
+					goto found;
+				   }
+				break;
+			   default:
+				goto found;
+			   }
+		   }
+found:		if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
+		  {	if ( convert_varargs )
+			  {	*bp++ = "va_alist";
+				vararg = p-2;
+			  }
+			else
+			  {	p++;
+				if ( bp == breaks + 1 )	/* sole argument */
+				  writeblanks(breaks[0], p);
+				else
+				  writeblanks(bp[-1] - 1, p);
+				bp--;
+			  }
+		   }
+		else
+		   {	while ( isidchar(*p) ) p--;
+			*bp++ = p+1;
+		   }
+		p = end;
+	   }
+	while ( *p++ == ',' );
+	*bp = p;
+	/* Make a special check for 'void' arglist */
+	if ( bp == breaks+2 )
+	   {	p = skipspace(breaks[0], 1);
+		if ( !strncmp(p, "void", 4) )
+		   {	p = skipspace(p+4, 1);
+			if ( p == breaks[2] - 1 )
+			   {	bp = breaks;	/* yup, pretend arglist is empty */
+				writeblanks(breaks[0], p + 1);
+			   }
+		   }
+	   }
+	/* Put out the function name and left parenthesis. */
+	p = buf;
+	while ( p != endfn ) putc(*p, out), p++;
+	/* Put out the declaration. */
+	if ( header )
+	  {	fputs(");", out);
+		for ( p = breaks[0]; *p; p++ )
+		  if ( *p == '\r' || *p == '\n' )
+		    putc(*p, out);
+	  }
+	else
+	  {	for ( ap = breaks+1; ap < bp; ap += 2 )
+		  {	p = *ap;
+			while ( isidchar(*p) )
+			  putc(*p, out), p++;
+			if ( ap < bp - 1 )
+			  fputs(", ", out);
+		  }
+		fputs(")  ", out);
+		/* Put out the argument declarations */
+		for ( ap = breaks+2; ap <= bp; ap += 2 )
+		  (*ap)[-1] = ';';
+		if ( vararg != 0 )
+		  {	*vararg = 0;
+			fputs(breaks[0], out);		/* any prior args */
+			fputs("va_dcl", out);		/* the final arg */
+			fputs(bp[0], out);
+		  }
+		else
+		  fputs(breaks[0], out);
+	  }
+	free((char *)breaks);
+	return 0;
+}
diff --git a/Source/3rd Party/wx/src/png/png.c b/Source/3rd Party/wx/src/png/png.c
index b8cfca73e..a0332b9ab 100644
--- a/Source/3rd Party/wx/src/png/png.c	
+++ b/Source/3rd Party/wx/src/png/png.c	
@@ -1,2870 +1,826 @@
-
-/* png.c - location for general purpose libpng functions
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_5_7 Your_png_h_is_not_version_1_5_7;
-
-/* Tells libpng that we have already handled the first "num_bytes" bytes
- * of the PNG file signature.  If the PNG data is embedded into another
- * stream we can set num_bytes = 8 so that libpng will not attempt to read
- * or write any of the magic bytes before it starts on the IHDR.
- */
-
-#ifdef PNG_READ_SUPPORTED
-void PNGAPI
-png_set_sig_bytes(png_structp png_ptr, int num_bytes)
-{
-   png_debug(1, "in png_set_sig_bytes");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (num_bytes > 8)
-      png_error(png_ptr, "Too many bytes for PNG signature");
-
-   png_ptr->sig_bytes = (png_byte)(num_bytes < 0 ? 0 : num_bytes);
-}
-
-/* Checks whether the supplied bytes match the PNG signature.  We allow
- * checking less than the full 8-byte signature so that those apps that
- * already read the first few bytes of a file to determine the file type
- * can simply check the remaining bytes for extra assurance.  Returns
- * an integer less than, equal to, or greater than zero if sig is found,
- * respectively, to be less than, to match, or be greater than the correct
- * PNG signature (this is the same behavior as strcmp, memcmp, etc).
- */
-int PNGAPI
-png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check)
-{
-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-
-   if (num_to_check > 8)
-      num_to_check = 8;
-
-   else if (num_to_check < 1)
-      return (-1);
-
-   if (start > 7)
-      return (-1);
-
-   if (start + num_to_check > 8)
-      num_to_check = 8 - start;
-
-   return ((int)(png_memcmp(&sig[start], &png_signature[start], num_to_check)));
-}
-
-#endif /* PNG_READ_SUPPORTED */
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-/* Function to allocate memory for zlib */
-PNG_FUNCTION(voidpf /* PRIVATE */,
-png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED)
-{
-   png_voidp ptr;
-   png_structp p=(png_structp)png_ptr;
-   png_uint_32 save_flags=p->flags;
-   png_alloc_size_t num_bytes;
-
-   if (png_ptr == NULL)
-      return (NULL);
-
-   if (items > PNG_UINT_32_MAX/size)
-   {
-     png_warning (p, "Potential overflow in png_zalloc()");
-     return (NULL);
-   }
-   num_bytes = (png_alloc_size_t)items * size;
-
-   p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
-   ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
-   p->flags=save_flags;
-
-   return ((voidpf)ptr);
-}
-
-/* Function to free memory for zlib */
-void /* PRIVATE */
-png_zfree(voidpf png_ptr, voidpf ptr)
-{
-   png_free((png_structp)png_ptr, (png_voidp)ptr);
-}
-
-/* Reset the CRC variable to 32 bits of 1's.  Care must be taken
- * in case CRC is > 32 bits to leave the top bits 0.
- */
-void /* PRIVATE */
-png_reset_crc(png_structp png_ptr)
-{
-   /* The cast is safe because the crc is a 32 bit value. */
-   png_ptr->crc = (png_uint_32)crc32(0, Z_NULL, 0);
-}
-
-/* Calculate the CRC over a section of data.  We can only pass as
- * much data to this routine as the largest single buffer size.  We
- * also check that this data will actually be used before going to the
- * trouble of calculating it.
- */
-void /* PRIVATE */
-png_calculate_crc(png_structp png_ptr, png_const_bytep ptr, png_size_t length)
-{
-   int need_crc = 1;
-
-   if (PNG_CHUNK_ANCILLIARY(png_ptr->chunk_name))
-   {
-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
-          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
-         need_crc = 0;
-   }
-
-   else /* critical */
-   {
-      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
-         need_crc = 0;
-   }
-
-   /* 'uLong' is defined as unsigned long, this means that on some systems it is
-    * a 64 bit value.  crc32, however, returns 32 bits so the following cast is
-    * safe.  'uInt' may be no more than 16 bits, so it is necessary to perform a
-    * loop here.
-    */
-   if (need_crc && length > 0)
-   {
-      uLong crc = png_ptr->crc; /* Should never issue a warning */
-
-      do
-      {
-         uInt safeLength = (uInt)length;
-         if (safeLength == 0)
-            safeLength = (uInt)-1; /* evil, but safe */
-
-         crc = crc32(crc, ptr, safeLength);
-
-         /* The following should never issue compiler warnings, if they do the
-          * target system has characteristics that will probably violate other
-          * assumptions within the libpng code.
-          */
-         ptr += safeLength;
-         length -= safeLength;
-      }
-      while (length > 0);
-
-      /* And the following is always safe because the crc is only 32 bits. */
-      png_ptr->crc = (png_uint_32)crc;
-   }
-}
-
-/* Check a user supplied version number, called from both read and write
- * functions that create a png_struct
- */
-int
-png_user_version_check(png_structp png_ptr, png_const_charp user_png_ver)
-{
-   if (user_png_ver)
-   {
-      int i = 0;
-
-      do
-      {
-         if (user_png_ver[i] != png_libpng_ver[i])
-            png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-      } while (png_libpng_ver[i++]);
-   }
-
-   else
-      png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-
-   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
-   {
-     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
-      * we must recompile any applications that use any older library version.
-      * For versions after libpng 1.0, we will be compatible, so we need
-      * only check the first digit.
-      */
-      if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
-          (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
-          (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
-      {
-#ifdef PNG_WARNINGS_SUPPORTED
-         size_t pos = 0;
-         char m[128];
-
-         pos = png_safecat(m, sizeof m, pos, "Application built with libpng-");
-         pos = png_safecat(m, sizeof m, pos, user_png_ver);
-         pos = png_safecat(m, sizeof m, pos, " but running with ");
-         pos = png_safecat(m, sizeof m, pos, png_libpng_ver);
-
-         png_warning(png_ptr, m);
-#endif
-
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-         png_ptr->flags = 0;
-#endif
-
-         return 0;
-      }
-   }
-
-   /* Success return. */
-   return 1;
-}
-
-/* Allocate the memory for an info_struct for the application.  We don't
- * really need the png_ptr, but it could potentially be useful in the
- * future.  This should be used in favour of malloc(png_sizeof(png_info))
- * and png_info_init() so that applications that want to use a shared
- * libpng don't have to be recompiled if png_info changes size.
- */
-PNG_FUNCTION(png_infop,PNGAPI
-png_create_info_struct,(png_structp png_ptr),PNG_ALLOCATED)
-{
-   png_infop info_ptr;
-
-   png_debug(1, "in png_create_info_struct");
-
-   if (png_ptr == NULL)
-      return (NULL);
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
-      png_ptr->malloc_fn, png_ptr->mem_ptr);
-#else
-   info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
-#endif
-   if (info_ptr != NULL)
-      png_info_init_3(&info_ptr, png_sizeof(png_info));
-
-   return (info_ptr);
-}
-
-/* This function frees the memory associated with a single info struct.
- * Normally, one would use either png_destroy_read_struct() or
- * png_destroy_write_struct() to free an info struct, but this may be
- * useful for some applications.
- */
-void PNGAPI
-png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
-{
-   png_infop info_ptr = NULL;
-
-   png_debug(1, "in png_destroy_info_struct");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (info_ptr_ptr != NULL)
-      info_ptr = *info_ptr_ptr;
-
-   if (info_ptr != NULL)
-   {
-      png_info_destroy(png_ptr, info_ptr);
-
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn,
-          png_ptr->mem_ptr);
-#else
-      png_destroy_struct((png_voidp)info_ptr);
-#endif
-      *info_ptr_ptr = NULL;
-   }
-}
-
-/* Initialize the info structure.  This is now an internal function (0.89)
- * and applications using it are urged to use png_create_info_struct()
- * instead.
- */
-
-void PNGAPI
-png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
-{
-   png_infop info_ptr = *ptr_ptr;
-
-   png_debug(1, "in png_info_init_3");
-
-   if (info_ptr == NULL)
-      return;
-
-   if (png_sizeof(png_info) > png_info_struct_size)
-   {
-      png_destroy_struct(info_ptr);
-      info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
-      *ptr_ptr = info_ptr;
-   }
-
-   /* Set everything to 0 */
-   png_memset(info_ptr, 0, png_sizeof(png_info));
-}
-
-void PNGAPI
-png_data_freer(png_structp png_ptr, png_infop info_ptr,
-   int freer, png_uint_32 mask)
-{
-   png_debug(1, "in png_data_freer");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (freer == PNG_DESTROY_WILL_FREE_DATA)
-      info_ptr->free_me |= mask;
-
-   else if (freer == PNG_USER_WILL_FREE_DATA)
-      info_ptr->free_me &= ~mask;
-
-   else
-      png_warning(png_ptr,
-         "Unknown freer parameter in png_data_freer");
-}
-
-void PNGAPI
-png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
-   int num)
-{
-   png_debug(1, "in png_free_data");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-#ifdef PNG_TEXT_SUPPORTED
-   /* Free text item num or (if num == -1) all text items */
-   if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
-   {
-      if (num != -1)
-      {
-         if (info_ptr->text && info_ptr->text[num].key)
-         {
-            png_free(png_ptr, info_ptr->text[num].key);
-            info_ptr->text[num].key = NULL;
-         }
-      }
-
-      else
-      {
-         int i;
-         for (i = 0; i < info_ptr->num_text; i++)
-             png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i);
-         png_free(png_ptr, info_ptr->text);
-         info_ptr->text = NULL;
-         info_ptr->num_text=0;
-      }
-   }
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-   /* Free any tRNS entry */
-   if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
-   {
-      png_free(png_ptr, info_ptr->trans_alpha);
-      info_ptr->trans_alpha = NULL;
-      info_ptr->valid &= ~PNG_INFO_tRNS;
-   }
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-   /* Free any sCAL entry */
-   if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
-   {
-      png_free(png_ptr, info_ptr->scal_s_width);
-      png_free(png_ptr, info_ptr->scal_s_height);
-      info_ptr->scal_s_width = NULL;
-      info_ptr->scal_s_height = NULL;
-      info_ptr->valid &= ~PNG_INFO_sCAL;
-   }
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-   /* Free any pCAL entry */
-   if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
-   {
-      png_free(png_ptr, info_ptr->pcal_purpose);
-      png_free(png_ptr, info_ptr->pcal_units);
-      info_ptr->pcal_purpose = NULL;
-      info_ptr->pcal_units = NULL;
-      if (info_ptr->pcal_params != NULL)
-         {
-            int i;
-            for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
-            {
-               png_free(png_ptr, info_ptr->pcal_params[i]);
-               info_ptr->pcal_params[i] = NULL;
-            }
-            png_free(png_ptr, info_ptr->pcal_params);
-            info_ptr->pcal_params = NULL;
-         }
-      info_ptr->valid &= ~PNG_INFO_pCAL;
-   }
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-   /* Free any iCCP entry */
-   if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
-   {
-      png_free(png_ptr, info_ptr->iccp_name);
-      png_free(png_ptr, info_ptr->iccp_profile);
-      info_ptr->iccp_name = NULL;
-      info_ptr->iccp_profile = NULL;
-      info_ptr->valid &= ~PNG_INFO_iCCP;
-   }
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-   /* Free a given sPLT entry, or (if num == -1) all sPLT entries */
-   if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
-   {
-      if (num != -1)
-      {
-         if (info_ptr->splt_palettes)
-         {
-            png_free(png_ptr, info_ptr->splt_palettes[num].name);
-            png_free(png_ptr, info_ptr->splt_palettes[num].entries);
-            info_ptr->splt_palettes[num].name = NULL;
-            info_ptr->splt_palettes[num].entries = NULL;
-         }
-      }
-
-      else
-      {
-         if (info_ptr->splt_palettes_num)
-         {
-            int i;
-            for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
-               png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, i);
-
-            png_free(png_ptr, info_ptr->splt_palettes);
-            info_ptr->splt_palettes = NULL;
-            info_ptr->splt_palettes_num = 0;
-         }
-         info_ptr->valid &= ~PNG_INFO_sPLT;
-      }
-   }
-#endif
-
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-   if (png_ptr->unknown_chunk.data)
-   {
-      png_free(png_ptr, png_ptr->unknown_chunk.data);
-      png_ptr->unknown_chunk.data = NULL;
-   }
-
-   if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
-   {
-      if (num != -1)
-      {
-          if (info_ptr->unknown_chunks)
-          {
-             png_free(png_ptr, info_ptr->unknown_chunks[num].data);
-             info_ptr->unknown_chunks[num].data = NULL;
-          }
-      }
-
-      else
-      {
-         int i;
-
-         if (info_ptr->unknown_chunks_num)
-         {
-            for (i = 0; i < info_ptr->unknown_chunks_num; i++)
-               png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, i);
-
-            png_free(png_ptr, info_ptr->unknown_chunks);
-            info_ptr->unknown_chunks = NULL;
-            info_ptr->unknown_chunks_num = 0;
-         }
-      }
-   }
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-   /* Free any hIST entry */
-   if ((mask & PNG_FREE_HIST)  & info_ptr->free_me)
-   {
-      png_free(png_ptr, info_ptr->hist);
-      info_ptr->hist = NULL;
-      info_ptr->valid &= ~PNG_INFO_hIST;
-   }
-#endif
-
-   /* Free any PLTE entry that was internally allocated */
-   if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
-   {
-      png_zfree(png_ptr, info_ptr->palette);
-      info_ptr->palette = NULL;
-      info_ptr->valid &= ~PNG_INFO_PLTE;
-      info_ptr->num_palette = 0;
-   }
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-   /* Free any image bits attached to the info structure */
-   if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
-   {
-      if (info_ptr->row_pointers)
-      {
-         int row;
-         for (row = 0; row < (int)info_ptr->height; row++)
-         {
-            png_free(png_ptr, info_ptr->row_pointers[row]);
-            info_ptr->row_pointers[row] = NULL;
-         }
-         png_free(png_ptr, info_ptr->row_pointers);
-         info_ptr->row_pointers = NULL;
-      }
-      info_ptr->valid &= ~PNG_INFO_IDAT;
-   }
-#endif
-
-   if (num != -1)
-      mask &= ~PNG_FREE_MUL;
-
-   info_ptr->free_me &= ~mask;
-}
-
-/* This is an internal routine to free any memory that the info struct is
- * pointing to before re-using it or freeing the struct itself.  Recall
- * that png_free() checks for NULL pointers for us.
- */
-void /* PRIVATE */
-png_info_destroy(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_info_destroy");
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   if (png_ptr->num_chunk_list)
-   {
-      png_free(png_ptr, png_ptr->chunk_list);
-      png_ptr->chunk_list = NULL;
-      png_ptr->num_chunk_list = 0;
-   }
-#endif
-
-   png_info_init_3(&info_ptr, png_sizeof(png_info));
-}
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
-
-/* This function returns a pointer to the io_ptr associated with the user
- * functions.  The application should free any memory associated with this
- * pointer before png_write_destroy() or png_read_destroy() are called.
- */
-png_voidp PNGAPI
-png_get_io_ptr(png_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return (png_ptr->io_ptr);
-}
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-#  ifdef PNG_STDIO_SUPPORTED
-/* Initialize the default input/output functions for the PNG file.  If you
- * use your own read or write routines, you can call either png_set_read_fn()
- * or png_set_write_fn() instead of png_init_io().  If you have defined
- * PNG_NO_STDIO or otherwise disabled PNG_STDIO_SUPPORTED, you must use a
- * function of your own because "FILE *" isn't necessarily available.
- */
-void PNGAPI
-png_init_io(png_structp png_ptr, png_FILE_p fp)
-{
-   png_debug(1, "in png_init_io");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->io_ptr = (png_voidp)fp;
-}
-#  endif
-
-#  ifdef PNG_TIME_RFC1123_SUPPORTED
-/* Convert the supplied time into an RFC 1123 string suitable for use in
- * a "Creation Time" or other text-based time string.
- */
-png_const_charp PNGAPI
-png_convert_to_rfc1123(png_structp png_ptr, png_const_timep ptime)
-{
-   static PNG_CONST char short_months[12][4] =
-        {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
-
-   if (png_ptr == NULL)
-      return (NULL);
-
-   if (ptime->year > 9999 /* RFC1123 limitation */ ||
-       ptime->month == 0    ||  ptime->month > 12  ||
-       ptime->day   == 0    ||  ptime->day   > 31  ||
-       ptime->hour  > 23    ||  ptime->minute > 59 ||
-       ptime->second > 60)
-   {
-      png_warning(png_ptr, "Ignoring invalid time value");
-      return (NULL);
-   }
-
-   {
-      size_t pos = 0;
-      char number_buf[5]; /* enough for a four-digit year */
-
-#     define APPEND_STRING(string)\
-         pos = png_safecat(png_ptr->time_buffer, sizeof png_ptr->time_buffer,\
-            pos, (string))
-#     define APPEND_NUMBER(format, value)\
-         APPEND_STRING(PNG_FORMAT_NUMBER(number_buf, format, (value)))
-#     define APPEND(ch)\
-         if (pos < (sizeof png_ptr->time_buffer)-1)\
-            png_ptr->time_buffer[pos++] = (ch)
-
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_u, (unsigned)ptime->day);
-      APPEND(' ');
-      APPEND_STRING(short_months[(ptime->month - 1)]);
-      APPEND(' ');
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_u, ptime->year);
-      APPEND(' ');
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->hour);
-      APPEND(':');
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->minute);
-      APPEND(':');
-      APPEND_NUMBER(PNG_NUMBER_FORMAT_02u, (unsigned)ptime->second);
-      APPEND_STRING(" +0000"); /* This reliably terminates the buffer */
-
-#     undef APPEND
-#     undef APPEND_NUMBER
-#     undef APPEND_STRING
-   }
-
-   return png_ptr->time_buffer;
-}
-#  endif /* PNG_TIME_RFC1123_SUPPORTED */
-
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
-
-png_const_charp PNGAPI
-png_get_copyright(png_const_structp png_ptr)
-{
-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
-#ifdef PNG_STRING_COPYRIGHT
-   return PNG_STRING_COPYRIGHT
-#else
-#  ifdef __STDC__
-   return PNG_STRING_NEWLINE \
-     "libpng version 1.5.7 - December 15, 2011" PNG_STRING_NEWLINE \
-     "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
-     "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
-     "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
-     PNG_STRING_NEWLINE;
-#  else
-      return "libpng version 1.5.7 - December 15, 2011\
-      Copyright (c) 1998-2011 Glenn Randers-Pehrson\
-      Copyright (c) 1996-1997 Andreas Dilger\
-      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
-#  endif
-#endif
-}
-
-/* The following return the library version as a short string in the
- * format 1.0.0 through 99.99.99zz.  To get the version of *.h files
- * used with your application, print out PNG_LIBPNG_VER_STRING, which
- * is defined in png.h.
- * Note: now there is no difference between png_get_libpng_ver() and
- * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,
- * it is guaranteed that png.c uses the correct version of png.h.
- */
-png_const_charp PNGAPI
-png_get_libpng_ver(png_const_structp png_ptr)
-{
-   /* Version of *.c files used when building libpng */
-   return png_get_header_ver(png_ptr);
-}
-
-png_const_charp PNGAPI
-png_get_header_ver(png_const_structp png_ptr)
-{
-   /* Version of *.h files used when building libpng */
-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
-   return PNG_LIBPNG_VER_STRING;
-}
-
-png_const_charp PNGAPI
-png_get_header_version(png_const_structp png_ptr)
-{
-   /* Returns longer string containing both version and date */
-   PNG_UNUSED(png_ptr)  /* Silence compiler warning about unused png_ptr */
-#ifdef __STDC__
-   return PNG_HEADER_VERSION_STRING
-#  ifndef PNG_READ_SUPPORTED
-   "     (NO READ SUPPORT)"
-#  endif
-   PNG_STRING_NEWLINE;
-#else
-   return PNG_HEADER_VERSION_STRING;
-#endif
-}
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-int PNGAPI
-png_handle_as_unknown(png_structp png_ptr, png_const_bytep chunk_name)
-{
-   /* Check chunk_name and return "keep" value if it's on the list, else 0 */
-   png_const_bytep p, p_end;
-
-   if (png_ptr == NULL || chunk_name == NULL || png_ptr->num_chunk_list <= 0)
-      return PNG_HANDLE_CHUNK_AS_DEFAULT;
-
-   p_end = png_ptr->chunk_list;
-   p = p_end + png_ptr->num_chunk_list*5; /* beyond end */
-
-   /* The code is the fifth byte after each four byte string.  Historically this
-    * code was always searched from the end of the list, so it should continue
-    * to do so in case there are duplicated entries.
-    */
-   do /* num_chunk_list > 0, so at least one */
-   {
-      p -= 5;
-      if (!png_memcmp(chunk_name, p, 4))
-         return p[4];
-   }
-   while (p > p_end);
-
-   return PNG_HANDLE_CHUNK_AS_DEFAULT;
-}
-
-int /* PRIVATE */
-png_chunk_unknown_handling(png_structp png_ptr, png_uint_32 chunk_name)
-{
-   png_byte chunk_string[5];
-
-   PNG_CSTRING_FROM_CHUNK(chunk_string, chunk_name);
-   return png_handle_as_unknown(png_ptr, chunk_string);
-}
-#endif
-
-#ifdef PNG_READ_SUPPORTED
-/* This function, added to libpng-1.0.6g, is untested. */
-int PNGAPI
-png_reset_zstream(png_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return Z_STREAM_ERROR;
-
-   return (inflateReset(&png_ptr->zstream));
-}
-#endif /* PNG_READ_SUPPORTED */
-
-/* This function was added to libpng-1.0.7 */
-png_uint_32 PNGAPI
-png_access_version_number(void)
-{
-   /* Version of *.c files used when building libpng */
-   return((png_uint_32)PNG_LIBPNG_VER);
-}
-
-
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-/* png_convert_size: a PNGAPI but no longer in png.h, so deleted
- * at libpng 1.5.5!
- */
-
-/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
-#  ifdef PNG_CHECK_cHRM_SUPPORTED
-
-int /* PRIVATE */
-png_check_cHRM_fixed(png_structp png_ptr,
-   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
-   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
-   png_fixed_point blue_x, png_fixed_point blue_y)
-{
-   int ret = 1;
-   unsigned long xy_hi,xy_lo,yx_hi,yx_lo;
-
-   png_debug(1, "in function png_check_cHRM_fixed");
-
-   if (png_ptr == NULL)
-      return 0;
-
-   /* (x,y,z) values are first limited to 0..100000 (PNG_FP_1), the white
-    * y must also be greater than 0.  To test for the upper limit calculate
-    * (PNG_FP_1-y) - x must be <= to this for z to be >= 0 (and the expression
-    * cannot overflow.)  At this point we know x and y are >= 0 and (x+y) is
-    * <= PNG_FP_1.  The previous test on PNG_MAX_UINT_31 is removed because it
-    * pointless (and it produces compiler warnings!)
-    */
-   if (white_x < 0 || white_y <= 0 ||
-         red_x < 0 ||   red_y <  0 ||
-       green_x < 0 || green_y <  0 ||
-        blue_x < 0 ||  blue_y <  0)
-   {
-      png_warning(png_ptr,
-        "Ignoring attempt to set negative chromaticity value");
-      ret = 0;
-   }
-   /* And (x+y) must be <= PNG_FP_1 (so z is >= 0) */
-   if (white_x > PNG_FP_1 - white_y)
-   {
-      png_warning(png_ptr, "Invalid cHRM white point");
-      ret = 0;
-   }
-
-   if (red_x > PNG_FP_1 - red_y)
-   {
-      png_warning(png_ptr, "Invalid cHRM red point");
-      ret = 0;
-   }
-
-   if (green_x > PNG_FP_1 - green_y)
-   {
-      png_warning(png_ptr, "Invalid cHRM green point");
-      ret = 0;
-   }
-
-   if (blue_x > PNG_FP_1 - blue_y)
-   {
-      png_warning(png_ptr, "Invalid cHRM blue point");
-      ret = 0;
-   }
-
-   png_64bit_product(green_x - red_x, blue_y - red_y, &xy_hi, &xy_lo);
-   png_64bit_product(green_y - red_y, blue_x - red_x, &yx_hi, &yx_lo);
-
-   if (xy_hi == yx_hi && xy_lo == yx_lo)
-   {
-      png_warning(png_ptr,
-         "Ignoring attempt to set cHRM RGB triangle with zero area");
-      ret = 0;
-   }
-
-   return ret;
-}
-#  endif /* PNG_CHECK_cHRM_SUPPORTED */
-
-#ifdef PNG_cHRM_SUPPORTED
-/* Added at libpng-1.5.5 to support read and write of true CIEXYZ values for
- * cHRM, as opposed to using chromaticities.  These internal APIs return
- * non-zero on a parameter error.  The X, Y and Z values are required to be
- * positive and less than 1.0.
- */
-int png_xy_from_XYZ(png_xy *xy, png_XYZ XYZ)
-{
-   png_int_32 d, dwhite, whiteX, whiteY;
-
-   d = XYZ.redX + XYZ.redY + XYZ.redZ;
-   if (!png_muldiv(&xy->redx, XYZ.redX, PNG_FP_1, d)) return 1;
-   if (!png_muldiv(&xy->redy, XYZ.redY, PNG_FP_1, d)) return 1;
-   dwhite = d;
-   whiteX = XYZ.redX;
-   whiteY = XYZ.redY;
-
-   d = XYZ.greenX + XYZ.greenY + XYZ.greenZ;
-   if (!png_muldiv(&xy->greenx, XYZ.greenX, PNG_FP_1, d)) return 1;
-   if (!png_muldiv(&xy->greeny, XYZ.greenY, PNG_FP_1, d)) return 1;
-   dwhite += d;
-   whiteX += XYZ.greenX;
-   whiteY += XYZ.greenY;
-
-   d = XYZ.blueX + XYZ.blueY + XYZ.blueZ;
-   if (!png_muldiv(&xy->bluex, XYZ.blueX, PNG_FP_1, d)) return 1;
-   if (!png_muldiv(&xy->bluey, XYZ.blueY, PNG_FP_1, d)) return 1;
-   dwhite += d;
-   whiteX += XYZ.blueX;
-   whiteY += XYZ.blueY;
-
-   /* The reference white is simply the same of the end-point (X,Y,Z) vectors,
-    * thus:
-    */
-   if (!png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite)) return 1;
-   if (!png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite)) return 1;
-
-   return 0;
-}
-
-int png_XYZ_from_xy(png_XYZ *XYZ, png_xy xy)
-{
-   png_fixed_point red_inverse, green_inverse, blue_scale;
-   png_fixed_point left, right, denominator;
-
-   /* Check xy and, implicitly, z.  Note that wide gamut color spaces typically
-    * have end points with 0 tristimulus values (these are impossible end
-    * points, but they are used to cover the possible colors.)
-    */
-   if (xy.redx < 0 || xy.redx > PNG_FP_1) return 1;
-   if (xy.redy < 0 || xy.redy > PNG_FP_1-xy.redx) return 1;
-   if (xy.greenx < 0 || xy.greenx > PNG_FP_1) return 1;
-   if (xy.greeny < 0 || xy.greeny > PNG_FP_1-xy.greenx) return 1;
-   if (xy.bluex < 0 || xy.bluex > PNG_FP_1) return 1;
-   if (xy.bluey < 0 || xy.bluey > PNG_FP_1-xy.bluex) return 1;
-   if (xy.whitex < 0 || xy.whitex > PNG_FP_1) return 1;
-   if (xy.whitey < 0 || xy.whitey > PNG_FP_1-xy.whitex) return 1;
-
-   /* The reverse calculation is more difficult because the original tristimulus
-    * value had 9 independent values (red,green,blue)x(X,Y,Z) however only 8
-    * derived values were recorded in the cHRM chunk;
-    * (red,green,blue,white)x(x,y).  This loses one degree of freedom and
-    * therefore an arbitrary ninth value has to be introduced to undo the
-    * original transformations.
-    *
-    * Think of the original end-points as points in (X,Y,Z) space.  The
-    * chromaticity values (c) have the property:
-    *
-    *           C
-    *   c = ---------
-    *       X + Y + Z
-    *
-    * For each c (x,y,z) from the corresponding original C (X,Y,Z).  Thus the
-    * three chromaticity values (x,y,z) for each end-point obey the
-    * relationship:
-    *
-    *   x + y + z = 1
-    *
-    * This describes the plane in (X,Y,Z) space that intersects each axis at the
-    * value 1.0; call this the chromaticity plane.  Thus the chromaticity
-    * calculation has scaled each end-point so that it is on the x+y+z=1 plane
-    * and chromaticity is the intersection of the vector from the origin to the
-    * (X,Y,Z) value with the chromaticity plane.
-    *
-    * To fully invert the chromaticity calculation we would need the three
-    * end-point scale factors, (red-scale, green-scale, blue-scale), but these
-    * were not recorded.  Instead we calculated the reference white (X,Y,Z) and
-    * recorded the chromaticity of this.  The reference white (X,Y,Z) would have
-    * given all three of the scale factors since:
-    *
-    *    color-C = color-c * color-scale
-    *    white-C = red-C + green-C + blue-C
-    *            = red-c*red-scale + green-c*green-scale + blue-c*blue-scale
-    *
-    * But cHRM records only white-x and white-y, so we have lost the white scale
-    * factor:
-    *
-    *    white-C = white-c*white-scale
-    *
-    * To handle this the inverse transformation makes an arbitrary assumption
-    * about white-scale:
-    *
-    *    Assume: white-Y = 1.0
-    *    Hence:  white-scale = 1/white-y
-    *    Or:     red-Y + green-Y + blue-Y = 1.0
-    *
-    * Notice the last statement of the assumption gives an equation in three of
-    * the nine values we want to calculate.  8 more equations come from the
-    * above routine as summarised at the top above (the chromaticity
-    * calculation):
-    *
-    *    Given: color-x = color-X / (color-X + color-Y + color-Z)
-    *    Hence: (color-x - 1)*color-X + color.x*color-Y + color.x*color-Z = 0
-    *
-    * This is 9 simultaneous equations in the 9 variables "color-C" and can be
-    * solved by Cramer's rule.  Cramer's rule requires calculating 10 9x9 matrix
-    * determinants, however this is not as bad as it seems because only 28 of
-    * the total of 90 terms in the various matrices are non-zero.  Nevertheless
-    * Cramer's rule is notoriously numerically unstable because the determinant
-    * calculation involves the difference of large, but similar, numbers.  It is
-    * difficult to be sure that the calculation is stable for real world values
-    * and it is certain that it becomes unstable where the end points are close
-    * together.
-    *
-    * So this code uses the perhaps slighly less optimal but more understandable
-    * and totally obvious approach of calculating color-scale.
-    *
-    * This algorithm depends on the precision in white-scale and that is
-    * (1/white-y), so we can immediately see that as white-y approaches 0 the
-    * accuracy inherent in the cHRM chunk drops off substantially.
-    *
-    * libpng arithmetic: a simple invertion of the above equations
-    * ------------------------------------------------------------
-    *
-    *    white_scale = 1/white-y
-    *    white-X = white-x * white-scale
-    *    white-Y = 1.0
-    *    white-Z = (1 - white-x - white-y) * white_scale
-    *
-    *    white-C = red-C + green-C + blue-C
-    *            = red-c*red-scale + green-c*green-scale + blue-c*blue-scale
-    *
-    * This gives us three equations in (red-scale,green-scale,blue-scale) where
-    * all the coefficients are now known:
-    *
-    *    red-x*red-scale + green-x*green-scale + blue-x*blue-scale
-    *       = white-x/white-y
-    *    red-y*red-scale + green-y*green-scale + blue-y*blue-scale = 1
-    *    red-z*red-scale + green-z*green-scale + blue-z*blue-scale
-    *       = (1 - white-x - white-y)/white-y
-    *
-    * In the last equation color-z is (1 - color-x - color-y) so we can add all
-    * three equations together to get an alternative third:
-    *
-    *    red-scale + green-scale + blue-scale = 1/white-y = white-scale
-    *
-    * So now we have a Cramer's rule solution where the determinants are just
-    * 3x3 - far more tractible.  Unfortunately 3x3 determinants still involve
-    * multiplication of three coefficients so we can't guarantee to avoid
-    * overflow in the libpng fixed point representation.  Using Cramer's rule in
-    * floating point is probably a good choice here, but it's not an option for
-    * fixed point.  Instead proceed to simplify the first two equations by
-    * eliminating what is likely to be the largest value, blue-scale:
-    *
-    *    blue-scale = white-scale - red-scale - green-scale
-    *
-    * Hence:
-    *
-    *    (red-x - blue-x)*red-scale + (green-x - blue-x)*green-scale =
-    *                (white-x - blue-x)*white-scale
-    *
-    *    (red-y - blue-y)*red-scale + (green-y - blue-y)*green-scale =
-    *                1 - blue-y*white-scale
-    *
-    * And now we can trivially solve for (red-scale,green-scale):
-    *
-    *    green-scale =
-    *                (white-x - blue-x)*white-scale - (red-x - blue-x)*red-scale
-    *                -----------------------------------------------------------
-    *                                  green-x - blue-x
-    *
-    *    red-scale =
-    *                1 - blue-y*white-scale - (green-y - blue-y) * green-scale
-    *                ---------------------------------------------------------
-    *                                  red-y - blue-y
-    *
-    * Hence:
-    *
-    *    red-scale =
-    *          ( (green-x - blue-x) * (white-y - blue-y) -
-    *            (green-y - blue-y) * (white-x - blue-x) ) / white-y
-    * -------------------------------------------------------------------------
-    *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)
-    *
-    *    green-scale =
-    *          ( (red-y - blue-y) * (white-x - blue-x) -
-    *            (red-x - blue-x) * (white-y - blue-y) ) / white-y
-    * -------------------------------------------------------------------------
-    *  (green-x - blue-x)*(red-y - blue-y)-(green-y - blue-y)*(red-x - blue-x)
-    *
-    * Accuracy:
-    * The input values have 5 decimal digits of accuracy.  The values are all in
-    * the range 0 < value < 1, so simple products are in the same range but may
-    * need up to 10 decimal digits to preserve the original precision and avoid
-    * underflow.  Because we are using a 32-bit signed representation we cannot
-    * match this; the best is a little over 9 decimal digits, less than 10.
-    *
-    * The approach used here is to preserve the maximum precision within the
-    * signed representation.  Because the red-scale calculation above uses the
-    * difference between two products of values that must be in the range -1..+1
-    * it is sufficient to divide the product by 7; ceil(100,000/32767*2).  The
-    * factor is irrelevant in the calculation because it is applied to both
-    * numerator and denominator.
-    *
-    * Note that the values of the differences of the products of the
-    * chromaticities in the above equations tend to be small, for example for
-    * the sRGB chromaticities they are:
-    *
-    * red numerator:    -0.04751
-    * green numerator:  -0.08788
-    * denominator:      -0.2241 (without white-y multiplication)
-    *
-    *  The resultant Y coefficients from the chromaticities of some widely used
-    *  color space definitions are (to 15 decimal places):
-    *
-    *  sRGB
-    *    0.212639005871510 0.715168678767756 0.072192315360734
-    *  Kodak ProPhoto
-    *    0.288071128229293 0.711843217810102 0.000085653960605
-    *  Adobe RGB
-    *    0.297344975250536 0.627363566255466 0.075291458493998
-    *  Adobe Wide Gamut RGB
-    *    0.258728243040113 0.724682314948566 0.016589442011321
-    */
-   /* By the argument, above overflow should be impossible here. The return
-    * value of 2 indicates an internal error to the caller.
-    */
-   if (!png_muldiv(&left, xy.greenx-xy.bluex, xy.redy - xy.bluey, 7)) return 2;
-   if (!png_muldiv(&right, xy.greeny-xy.bluey, xy.redx - xy.bluex, 7)) return 2;
-   denominator = left - right;
-
-   /* Now find the red numerator. */
-   if (!png_muldiv(&left, xy.greenx-xy.bluex, xy.whitey-xy.bluey, 7)) return 2;
-   if (!png_muldiv(&right, xy.greeny-xy.bluey, xy.whitex-xy.bluex, 7)) return 2;
-
-   /* Overflow is possible here and it indicates an extreme set of PNG cHRM
-    * chunk values.  This calculation actually returns the reciprocal of the
-    * scale value because this allows us to delay the multiplication of white-y
-    * into the denominator, which tends to produce a small number.
-    */
-   if (!png_muldiv(&red_inverse, xy.whitey, denominator, left-right) ||
-       red_inverse <= xy.whitey /* r+g+b scales = white scale */)
-      return 1;
-
-   /* Similarly for green_inverse: */
-   if (!png_muldiv(&left, xy.redy-xy.bluey, xy.whitex-xy.bluex, 7)) return 2;
-   if (!png_muldiv(&right, xy.redx-xy.bluex, xy.whitey-xy.bluey, 7)) return 2;
-   if (!png_muldiv(&green_inverse, xy.whitey, denominator, left-right) ||
-       green_inverse <= xy.whitey)
-      return 1;
-
-   /* And the blue scale, the checks above guarantee this can't overflow but it
-    * can still produce 0 for extreme cHRM values.
-    */
-   blue_scale = png_reciprocal(xy.whitey) - png_reciprocal(red_inverse) -
-      png_reciprocal(green_inverse);
-   if (blue_scale <= 0) return 1;
-
-
-   /* And fill in the png_XYZ: */
-   if (!png_muldiv(&XYZ->redX, xy.redx, PNG_FP_1, red_inverse)) return 1;
-   if (!png_muldiv(&XYZ->redY, xy.redy, PNG_FP_1, red_inverse)) return 1;
-   if (!png_muldiv(&XYZ->redZ, PNG_FP_1 - xy.redx - xy.redy, PNG_FP_1,
-      red_inverse))
-      return 1;
-
-   if (!png_muldiv(&XYZ->greenX, xy.greenx, PNG_FP_1, green_inverse)) return 1;
-   if (!png_muldiv(&XYZ->greenY, xy.greeny, PNG_FP_1, green_inverse)) return 1;
-   if (!png_muldiv(&XYZ->greenZ, PNG_FP_1 - xy.greenx - xy.greeny, PNG_FP_1,
-      green_inverse))
-      return 1;
-
-   if (!png_muldiv(&XYZ->blueX, xy.bluex, blue_scale, PNG_FP_1)) return 1;
-   if (!png_muldiv(&XYZ->blueY, xy.bluey, blue_scale, PNG_FP_1)) return 1;
-   if (!png_muldiv(&XYZ->blueZ, PNG_FP_1 - xy.bluex - xy.bluey, blue_scale,
-      PNG_FP_1))
-      return 1;
-
-   return 0; /*success*/
-}
-
-int png_XYZ_from_xy_checked(png_structp png_ptr, png_XYZ *XYZ, png_xy xy)
-{
-   switch (png_XYZ_from_xy(XYZ, xy))
-   {
-      case 0: /* success */
-         return 1;
-
-      case 1:
-         /* The chunk may be technically valid, but we got png_fixed_point
-          * overflow while trying to get XYZ values out of it.  This is
-          * entirely benign - the cHRM chunk is pretty extreme.
-          */
-         png_warning(png_ptr,
-            "extreme cHRM chunk cannot be converted to tristimulus values");
-         break;
-
-      default:
-         /* libpng is broken; this should be a warning but if it happens we
-          * want error reports so for the moment it is an error.
-          */
-         png_error(png_ptr, "internal error in png_XYZ_from_xy");
-         break;
-   }
-
-   /* ERROR RETURN */
-   return 0;
-}
-#endif
-
-void /* PRIVATE */
-png_check_IHDR(png_structp png_ptr,
-   png_uint_32 width, png_uint_32 height, int bit_depth,
-   int color_type, int interlace_type, int compression_type,
-   int filter_type)
-{
-   int error = 0;
-
-   /* Check for width and height valid values */
-   if (width == 0)
-   {
-      png_warning(png_ptr, "Image width is zero in IHDR");
-      error = 1;
-   }
-
-   if (height == 0)
-   {
-      png_warning(png_ptr, "Image height is zero in IHDR");
-      error = 1;
-   }
-
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (width > png_ptr->user_width_max)
-
-#  else
-   if (width > PNG_USER_WIDTH_MAX)
-#  endif
-   {
-      png_warning(png_ptr, "Image width exceeds user limit in IHDR");
-      error = 1;
-   }
-
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (height > png_ptr->user_height_max)
-#  else
-   if (height > PNG_USER_HEIGHT_MAX)
-#  endif
-   {
-      png_warning(png_ptr, "Image height exceeds user limit in IHDR");
-      error = 1;
-   }
-
-   if (width > PNG_UINT_31_MAX)
-   {
-      png_warning(png_ptr, "Invalid image width in IHDR");
-      error = 1;
-   }
-
-   if (height > PNG_UINT_31_MAX)
-   {
-      png_warning(png_ptr, "Invalid image height in IHDR");
-      error = 1;
-   }
-
-   if (width > (PNG_UINT_32_MAX
-                 >> 3)      /* 8-byte RGBA pixels */
-                 - 48       /* bigrowbuf hack */
-                 - 1        /* filter byte */
-                 - 7*8      /* rounding of width to multiple of 8 pixels */
-                 - 8)       /* extra max_pixel_depth pad */
-      png_warning(png_ptr, "Width is too large for libpng to process pixels");
-
-   /* Check other values */
-   if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
-       bit_depth != 8 && bit_depth != 16)
-   {
-      png_warning(png_ptr, "Invalid bit depth in IHDR");
-      error = 1;
-   }
-
-   if (color_type < 0 || color_type == 1 ||
-       color_type == 5 || color_type > 6)
-   {
-      png_warning(png_ptr, "Invalid color type in IHDR");
-      error = 1;
-   }
-
-   if (((color_type == PNG_COLOR_TYPE_PALETTE) && bit_depth > 8) ||
-       ((color_type == PNG_COLOR_TYPE_RGB ||
-         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
-         color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
-   {
-      png_warning(png_ptr, "Invalid color type/bit depth combination in IHDR");
-      error = 1;
-   }
-
-   if (interlace_type >= PNG_INTERLACE_LAST)
-   {
-      png_warning(png_ptr, "Unknown interlace method in IHDR");
-      error = 1;
-   }
-
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Unknown compression method in IHDR");
-      error = 1;
-   }
-
-#  ifdef PNG_MNG_FEATURES_SUPPORTED
-   /* Accept filter_method 64 (intrapixel differencing) only if
-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-    * 2. Libpng did not read a PNG signature (this filter_method is only
-    *    used in PNG datastreams that are embedded in MNG datastreams) and
-    * 3. The application called png_permit_mng_features with a mask that
-    *    included PNG_FLAG_MNG_FILTER_64 and
-    * 4. The filter_method is 64 and
-    * 5. The color_type is RGB or RGBA
-    */
-   if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) &&
-       png_ptr->mng_features_permitted)
-      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
-
-   if (filter_type != PNG_FILTER_TYPE_BASE)
-   {
-      if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-          (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
-          ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
-          (color_type == PNG_COLOR_TYPE_RGB ||
-          color_type == PNG_COLOR_TYPE_RGB_ALPHA)))
-      {
-         png_warning(png_ptr, "Unknown filter method in IHDR");
-         error = 1;
-      }
-
-      if (png_ptr->mode & PNG_HAVE_PNG_SIGNATURE)
-      {
-         png_warning(png_ptr, "Invalid filter method in IHDR");
-         error = 1;
-      }
-   }
-
-#  else
-   if (filter_type != PNG_FILTER_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Unknown filter method in IHDR");
-      error = 1;
-   }
-#  endif
-
-   if (error == 1)
-      png_error(png_ptr, "Invalid IHDR data");
-}
-
-#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
-/* ASCII to fp functions */
-/* Check an ASCII formated floating point value, see the more detailed
- * comments in pngpriv.h
- */
-/* The following is used internally to preserve the sticky flags */
-#define png_fp_add(state, flags) ((state) |= (flags))
-#define png_fp_set(state, value) ((state) = (value) | ((state) & PNG_FP_STICKY))
-
-int /* PRIVATE */
-png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
-   png_size_tp whereami)
-{
-   int state = *statep;
-   png_size_t i = *whereami;
-
-   while (i < size)
-   {
-      int type;
-      /* First find the type of the next character */
-      switch (string[i])
-      {
-      case 43:  type = PNG_FP_SAW_SIGN;                   break;
-      case 45:  type = PNG_FP_SAW_SIGN + PNG_FP_NEGATIVE; break;
-      case 46:  type = PNG_FP_SAW_DOT;                    break;
-      case 48:  type = PNG_FP_SAW_DIGIT;                  break;
-      case 49: case 50: case 51: case 52:
-      case 53: case 54: case 55: case 56:
-      case 57:  type = PNG_FP_SAW_DIGIT + PNG_FP_NONZERO; break;
-      case 69:
-      case 101: type = PNG_FP_SAW_E;                      break;
-      default:  goto PNG_FP_End;
-      }
-
-      /* Now deal with this type according to the current
-       * state, the type is arranged to not overlap the
-       * bits of the PNG_FP_STATE.
-       */
-      switch ((state & PNG_FP_STATE) + (type & PNG_FP_SAW_ANY))
-      {
-      case PNG_FP_INTEGER + PNG_FP_SAW_SIGN:
-         if (state & PNG_FP_SAW_ANY)
-            goto PNG_FP_End; /* not a part of the number */
-
-         png_fp_add(state, type);
-         break;
-
-      case PNG_FP_INTEGER + PNG_FP_SAW_DOT:
-         /* Ok as trailer, ok as lead of fraction. */
-         if (state & PNG_FP_SAW_DOT) /* two dots */
-            goto PNG_FP_End;
-
-         else if (state & PNG_FP_SAW_DIGIT) /* trailing dot? */
-            png_fp_add(state, type);
-
-         else
-            png_fp_set(state, PNG_FP_FRACTION | type);
-
-         break;
-
-      case PNG_FP_INTEGER + PNG_FP_SAW_DIGIT:
-         if (state & PNG_FP_SAW_DOT) /* delayed fraction */
-            png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);
-
-         png_fp_add(state, type | PNG_FP_WAS_VALID);
-
-         break;
-
-      case PNG_FP_INTEGER + PNG_FP_SAW_E:
-         if ((state & PNG_FP_SAW_DIGIT) == 0)
-            goto PNG_FP_End;
-
-         png_fp_set(state, PNG_FP_EXPONENT);
-
-         break;
-
-   /* case PNG_FP_FRACTION + PNG_FP_SAW_SIGN:
-         goto PNG_FP_End; ** no sign in fraction */
-
-   /* case PNG_FP_FRACTION + PNG_FP_SAW_DOT:
-         goto PNG_FP_End; ** Because SAW_DOT is always set */
-
-      case PNG_FP_FRACTION + PNG_FP_SAW_DIGIT:
-         png_fp_add(state, type | PNG_FP_WAS_VALID);
-         break;
-
-      case PNG_FP_FRACTION + PNG_FP_SAW_E:
-         /* This is correct because the trailing '.' on an
-          * integer is handled above - so we can only get here
-          * with the sequence ".E" (with no preceding digits).
-          */
-         if ((state & PNG_FP_SAW_DIGIT) == 0)
-            goto PNG_FP_End;
-
-         png_fp_set(state, PNG_FP_EXPONENT);
-
-         break;
-
-      case PNG_FP_EXPONENT + PNG_FP_SAW_SIGN:
-         if (state & PNG_FP_SAW_ANY)
-            goto PNG_FP_End; /* not a part of the number */
-
-         png_fp_add(state, PNG_FP_SAW_SIGN);
-
-         break;
-
-   /* case PNG_FP_EXPONENT + PNG_FP_SAW_DOT:
-         goto PNG_FP_End; */
-
-      case PNG_FP_EXPONENT + PNG_FP_SAW_DIGIT:
-         png_fp_add(state, PNG_FP_SAW_DIGIT | PNG_FP_WAS_VALID);
-
-         break;
-
-   /* case PNG_FP_EXPONEXT + PNG_FP_SAW_E:
-         goto PNG_FP_End; */
-
-      default: goto PNG_FP_End; /* I.e. break 2 */
-      }
-
-      /* The character seems ok, continue. */
-      ++i;
-   }
-
-PNG_FP_End:
-   /* Here at the end, update the state and return the correct
-    * return code.
-    */
-   *statep = state;
-   *whereami = i;
-
-   return (state & PNG_FP_SAW_DIGIT) != 0;
-}
-
-
-/* The same but for a complete string. */
-int
-png_check_fp_string(png_const_charp string, png_size_t size)
-{
-   int        state=0;
-   png_size_t char_index=0;
-
-   if (png_check_fp_number(string, size, &state, &char_index) &&
-      (char_index == size || string[char_index] == 0))
-      return state /* must be non-zero - see above */;
-
-   return 0; /* i.e. fail */
-}
-#endif /* pCAL or sCAL */
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-/* Utility used below - a simple accurate power of ten from an integral
- * exponent.
- */
-static double
-png_pow10(int power)
-{
-   int recip = 0;
-   double d = 1;
-
-   /* Handle negative exponent with a reciprocal at the end because
-    * 10 is exact whereas .1 is inexact in base 2
-    */
-   if (power < 0)
-   {
-      if (power < DBL_MIN_10_EXP) return 0;
-      recip = 1, power = -power;
-   }
-
-   if (power > 0)
-   {
-      /* Decompose power bitwise. */
-      double mult = 10;
-      do
-      {
-         if (power & 1) d *= mult;
-         mult *= mult;
-         power >>= 1;
-      }
-      while (power > 0);
-
-      if (recip) d = 1/d;
-   }
-   /* else power is 0 and d is 1 */
-
-   return d;
-}
-
-/* Function to format a floating point value in ASCII with a given
- * precision.
- */
-void /* PRIVATE */
-png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size,
-    double fp, unsigned int precision)
-{
-   /* We use standard functions from math.h, but not printf because
-    * that would require stdio.  The caller must supply a buffer of
-    * sufficient size or we will png_error.  The tests on size and
-    * the space in ascii[] consumed are indicated below.
-    */
-   if (precision < 1)
-      precision = DBL_DIG;
-
-   /* Enforce the limit of the implementation precision too. */
-   if (precision > DBL_DIG+1)
-      precision = DBL_DIG+1;
-
-   /* Basic sanity checks */
-   if (size >= precision+5) /* See the requirements below. */
-   {
-      if (fp < 0)
-      {
-         fp = -fp;
-         *ascii++ = 45; /* '-'  PLUS 1 TOTAL 1 */
-         --size;
-      }
-
-      if (fp >= DBL_MIN && fp <= DBL_MAX)
-      {
-         int exp_b10;       /* A base 10 exponent */
-         double base;   /* 10^exp_b10 */
-
-         /* First extract a base 10 exponent of the number,
-          * the calculation below rounds down when converting
-          * from base 2 to base 10 (multiply by log10(2) -
-          * 0.3010, but 77/256 is 0.3008, so exp_b10 needs to
-          * be increased.  Note that the arithmetic shift
-          * performs a floor() unlike C arithmetic - using a
-          * C multiply would break the following for negative
-          * exponents.
-          */
-         (void)frexp(fp, &exp_b10); /* exponent to base 2 */
-
-         exp_b10 = (exp_b10 * 77) >> 8; /* <= exponent to base 10 */
-
-         /* Avoid underflow here. */
-         base = png_pow10(exp_b10); /* May underflow */
-
-         while (base < DBL_MIN || base < fp)
-         {
-            /* And this may overflow. */
-            double test = png_pow10(exp_b10+1);
-
-            if (test <= DBL_MAX)
-               ++exp_b10, base = test;
-
-            else
-               break;
-         }
-
-         /* Normalize fp and correct exp_b10, after this fp is in the
-          * range [.1,1) and exp_b10 is both the exponent and the digit
-          * *before* which the decimal point should be inserted
-          * (starting with 0 for the first digit).  Note that this
-          * works even if 10^exp_b10 is out of range because of the
-          * test on DBL_MAX above.
-          */
-         fp /= base;
-         while (fp >= 1) fp /= 10, ++exp_b10;
-
-         /* Because of the code above fp may, at this point, be
-          * less than .1, this is ok because the code below can
-          * handle the leading zeros this generates, so no attempt
-          * is made to correct that here.
-          */
-
-         {
-            int czero, clead, cdigits;
-            char exponent[10];
-
-            /* Allow up to two leading zeros - this will not lengthen
-             * the number compared to using E-n.
-             */
-            if (exp_b10 < 0 && exp_b10 > -3) /* PLUS 3 TOTAL 4 */
-            {
-               czero = -exp_b10; /* PLUS 2 digits: TOTAL 3 */
-               exp_b10 = 0;      /* Dot added below before first output. */
-            }
-            else
-               czero = 0;    /* No zeros to add */
-
-            /* Generate the digit list, stripping trailing zeros and
-             * inserting a '.' before a digit if the exponent is 0.
-             */
-            clead = czero; /* Count of leading zeros */
-            cdigits = 0;   /* Count of digits in list. */
-
-            do
-            {
-               double d;
-
-               fp *= 10;
-               /* Use modf here, not floor and subtract, so that
-                * the separation is done in one step.  At the end
-                * of the loop don't break the number into parts so
-                * that the final digit is rounded.
-                */
-               if (cdigits+czero-clead+1 < (int)precision)
-                  fp = modf(fp, &d);
-
-               else
-               {
-                  d = floor(fp + .5);
-
-                  if (d > 9)
-                  {
-                     /* Rounding up to 10, handle that here. */
-                     if (czero > 0)
-                     {
-                        --czero, d = 1;
-                        if (cdigits == 0) --clead;
-                     }
-                     else
-                     {
-                        while (cdigits > 0 && d > 9)
-                        {
-                           int ch = *--ascii;
-
-                           if (exp_b10 != (-1))
-                              ++exp_b10;
-
-                           else if (ch == 46)
-                           {
-                              ch = *--ascii, ++size;
-                              /* Advance exp_b10 to '1', so that the
-                               * decimal point happens after the
-                               * previous digit.
-                               */
-                              exp_b10 = 1;
-                           }
-
-                           --cdigits;
-                           d = ch - 47;  /* I.e. 1+(ch-48) */
-                        }
-
-                        /* Did we reach the beginning? If so adjust the
-                         * exponent but take into account the leading
-                         * decimal point.
-                         */
-                        if (d > 9)  /* cdigits == 0 */
-                        {
-                           if (exp_b10 == (-1))
-                           {
-                              /* Leading decimal point (plus zeros?), if
-                               * we lose the decimal point here it must
-                               * be reentered below.
-                               */
-                              int ch = *--ascii;
-
-                              if (ch == 46)
-                                 ++size, exp_b10 = 1;
-
-                              /* Else lost a leading zero, so 'exp_b10' is
-                               * still ok at (-1)
-                               */
-                           }
-                           else
-                              ++exp_b10;
-
-                           /* In all cases we output a '1' */
-                           d = 1;
-                        }
-                     }
-                  }
-                  fp = 0; /* Guarantees termination below. */
-               }
-
-               if (d == 0)
-               {
-                  ++czero;
-                  if (cdigits == 0) ++clead;
-               }
-               else
-               {
-                  /* Included embedded zeros in the digit count. */
-                  cdigits += czero - clead;
-                  clead = 0;
-
-                  while (czero > 0)
-                  {
-                     /* exp_b10 == (-1) means we just output the decimal
-                      * place - after the DP don't adjust 'exp_b10' any
-                      * more!
-                      */
-                     if (exp_b10 != (-1))
-                     {
-                        if (exp_b10 == 0) *ascii++ = 46, --size;
-                        /* PLUS 1: TOTAL 4 */
-                        --exp_b10;
-                     }
-                     *ascii++ = 48, --czero;
-                  }
-
-                  if (exp_b10 != (-1))
-                  {
-                     if (exp_b10 == 0) *ascii++ = 46, --size; /* counted
-                                                                 above */
-                     --exp_b10;
-                  }
-                  *ascii++ = (char)(48 + (int)d), ++cdigits;
-               }
-            }
-            while (cdigits+czero-clead < (int)precision && fp > DBL_MIN);
-
-            /* The total output count (max) is now 4+precision */
-
-            /* Check for an exponent, if we don't need one we are
-             * done and just need to terminate the string.  At
-             * this point exp_b10==(-1) is effectively if flag - it got
-             * to '-1' because of the decrement after outputing
-             * the decimal point above (the exponent required is
-             * *not* -1!)
-             */
-            if (exp_b10 >= (-1) && exp_b10 <= 2)
-            {
-               /* The following only happens if we didn't output the
-                * leading zeros above for negative exponent, so this
-                * doest add to the digit requirement.  Note that the
-                * two zeros here can only be output if the two leading
-                * zeros were *not* output, so this doesn't increase
-                * the output count.
-                */
-               while (--exp_b10 >= 0) *ascii++ = 48;
-
-               *ascii = 0;
-
-               /* Total buffer requirement (including the '\0') is
-                * 5+precision - see check at the start.
-                */
-               return;
-            }
-
-            /* Here if an exponent is required, adjust size for
-             * the digits we output but did not count.  The total
-             * digit output here so far is at most 1+precision - no
-             * decimal point and no leading or trailing zeros have
-             * been output.
-             */
-            size -= cdigits;
-
-            *ascii++ = 69, --size;    /* 'E': PLUS 1 TOTAL 2+precision */
-
-            /* The following use of an unsigned temporary avoids ambiguities in
-             * the signed arithmetic on exp_b10 and permits GCC at least to do
-             * better optimization.
-             */
-            {
-               unsigned int uexp_b10;
-
-               if (exp_b10 < 0)
-               {
-                  *ascii++ = 45, --size; /* '-': PLUS 1 TOTAL 3+precision */
-                  uexp_b10 = -exp_b10;
-               }
-
-               else
-                  uexp_b10 = exp_b10;
-
-               cdigits = 0;
-
-               while (uexp_b10 > 0)
-               {
-                  exponent[cdigits++] = (char)(48 + uexp_b10 % 10);
-                  uexp_b10 /= 10;
-               }
-            }
-
-            /* Need another size check here for the exponent digits, so
-             * this need not be considered above.
-             */
-            if ((int)size > cdigits)
-            {
-               while (cdigits > 0) *ascii++ = exponent[--cdigits];
-
-               *ascii = 0;
-
-               return;
-            }
-         }
-      }
-      else if (!(fp >= DBL_MIN))
-      {
-         *ascii++ = 48; /* '0' */
-         *ascii = 0;
-         return;
-      }
-      else
-      {
-         *ascii++ = 105; /* 'i' */
-         *ascii++ = 110; /* 'n' */
-         *ascii++ = 102; /* 'f' */
-         *ascii = 0;
-         return;
-      }
-   }
-
-   /* Here on buffer too small. */
-   png_error(png_ptr, "ASCII conversion buffer too small");
-}
-
-#  endif /* FLOATING_POINT */
-
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-/* Function to format a fixed point value in ASCII.
- */
-void /* PRIVATE */
-png_ascii_from_fixed(png_structp png_ptr, png_charp ascii, png_size_t size,
-    png_fixed_point fp)
-{
-   /* Require space for 10 decimal digits, a decimal point, a minus sign and a
-    * trailing \0, 13 characters:
-    */
-   if (size > 12)
-   {
-      png_uint_32 num;
-
-      /* Avoid overflow here on the minimum integer. */
-      if (fp < 0)
-         *ascii++ = 45, --size, num = -fp;
-      else
-         num = fp;
-
-      if (num <= 0x80000000) /* else overflowed */
-      {
-         unsigned int ndigits = 0, first = 16 /* flag value */;
-         char digits[10];
-
-         while (num)
-         {
-            /* Split the low digit off num: */
-            unsigned int tmp = num/10;
-            num -= tmp*10;
-            digits[ndigits++] = (char)(48 + num);
-            /* Record the first non-zero digit, note that this is a number
-             * starting at 1, it's not actually the array index.
-             */
-            if (first == 16 && num > 0)
-               first = ndigits;
-            num = tmp;
-         }
-
-         if (ndigits > 0)
-         {
-            while (ndigits > 5) *ascii++ = digits[--ndigits];
-            /* The remaining digits are fractional digits, ndigits is '5' or
-             * smaller at this point.  It is certainly not zero.  Check for a
-             * non-zero fractional digit:
-             */
-            if (first <= 5)
-            {
-               unsigned int i;
-               *ascii++ = 46; /* decimal point */
-               /* ndigits may be <5 for small numbers, output leading zeros
-                * then ndigits digits to first:
-                */
-               i = 5;
-               while (ndigits < i) *ascii++ = 48, --i;
-               while (ndigits >= first) *ascii++ = digits[--ndigits];
-               /* Don't output the trailing zeros! */
-            }
-         }
-         else
-            *ascii++ = 48;
-
-         /* And null terminate the string: */
-         *ascii = 0;
-         return;
-      }
-   }
-
-   /* Here on buffer too small. */
-   png_error(png_ptr, "ASCII conversion buffer too small");
-}
-#   endif /* FIXED_POINT */
-#endif /* READ_SCAL */
-
-#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
-   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED)
-png_fixed_point
-png_fixed(png_structp png_ptr, double fp, png_const_charp text)
-{
-   double r = floor(100000 * fp + .5);
-
-   if (r > 2147483647. || r < -2147483648.)
-      png_fixed_error(png_ptr, text);
-
-   return (png_fixed_point)r;
-}
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || \
-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG__READ_pHYs_SUPPORTED)
-/* muldiv functions */
-/* This API takes signed arguments and rounds the result to the nearest
- * integer (or, for a fixed point number - the standard argument - to
- * the nearest .00001).  Overflow and divide by zero are signalled in
- * the result, a boolean - true on success, false on overflow.
- */
-int
-png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
-    png_int_32 divisor)
-{
-   /* Return a * times / divisor, rounded. */
-   if (divisor != 0)
-   {
-      if (a == 0 || times == 0)
-      {
-         *res = 0;
-         return 1;
-      }
-      else
-      {
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = a;
-         r *= times;
-         r /= divisor;
-         r = floor(r+.5);
-
-         /* A png_fixed_point is a 32-bit integer. */
-         if (r <= 2147483647. && r >= -2147483648.)
-         {
-            *res = (png_fixed_point)r;
-            return 1;
-         }
-#else
-         int negative = 0;
-         png_uint_32 A, T, D;
-         png_uint_32 s16, s32, s00;
-
-         if (a < 0)
-            negative = 1, A = -a;
-         else
-            A = a;
-
-         if (times < 0)
-            negative = !negative, T = -times;
-         else
-            T = times;
-
-         if (divisor < 0)
-            negative = !negative, D = -divisor;
-         else
-            D = divisor;
-
-         /* Following can't overflow because the arguments only
-          * have 31 bits each, however the result may be 32 bits.
-          */
-         s16 = (A >> 16) * (T & 0xffff) +
-                           (A & 0xffff) * (T >> 16);
-         /* Can't overflow because the a*times bit is only 30
-          * bits at most.
-          */
-         s32 = (A >> 16) * (T >> 16) + (s16 >> 16);
-         s00 = (A & 0xffff) * (T & 0xffff);
-
-         s16 = (s16 & 0xffff) << 16;
-         s00 += s16;
-
-         if (s00 < s16)
-            ++s32; /* carry */
-
-         if (s32 < D) /* else overflow */
-         {
-            /* s32.s00 is now the 64-bit product, do a standard
-             * division, we know that s32 < D, so the maximum
-             * required shift is 31.
-             */
-            int bitshift = 32;
-            png_fixed_point result = 0; /* NOTE: signed */
-
-            while (--bitshift >= 0)
-            {
-               png_uint_32 d32, d00;
-
-               if (bitshift > 0)
-                  d32 = D >> (32-bitshift), d00 = D << bitshift;
-
-               else
-                  d32 = 0, d00 = D;
-
-               if (s32 > d32)
-               {
-                  if (s00 < d00) --s32; /* carry */
-                  s32 -= d32, s00 -= d00, result += 1<<bitshift;
-               }
-
-               else
-                  if (s32 == d32 && s00 >= d00)
-                     s32 = 0, s00 -= d00, result += 1<<bitshift;
-            }
-
-            /* Handle the rounding. */
-            if (s00 >= (D >> 1))
-               ++result;
-
-            if (negative)
-               result = -result;
-
-            /* Check for overflow. */
-            if ((negative && result <= 0) || (!negative && result >= 0))
-            {
-               *res = result;
-               return 1;
-            }
-         }
-#endif
-      }
-   }
-
-   return 0;
-}
-#endif /* READ_GAMMA || INCH_CONVERSIONS */
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-/* The following is for when the caller doesn't much care about the
- * result.
- */
-png_fixed_point
-png_muldiv_warn(png_structp png_ptr, png_fixed_point a, png_int_32 times,
-    png_int_32 divisor)
-{
-   png_fixed_point result;
-
-   if (png_muldiv(&result, a, times, divisor))
-      return result;
-
-   png_warning(png_ptr, "fixed point overflow ignored");
-   return 0;
-}
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED /* more fixed point functions for gammma */
-/* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
-png_fixed_point
-png_reciprocal(png_fixed_point a)
-{
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   double r = floor(1E10/a+.5);
-
-   if (r <= 2147483647. && r >= -2147483648.)
-      return (png_fixed_point)r;
-#else
-   png_fixed_point res;
-
-   if (png_muldiv(&res, 100000, 100000, a))
-      return res;
-#endif
-
-   return 0; /* error/overflow */
-}
-
-/* A local convenience routine. */
-static png_fixed_point
-png_product2(png_fixed_point a, png_fixed_point b)
-{
-   /* The required result is 1/a * 1/b; the following preserves accuracy. */
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   double r = a * 1E-5;
-   r *= b;
-   r = floor(r+.5);
-
-   if (r <= 2147483647. && r >= -2147483648.)
-      return (png_fixed_point)r;
-#else
-   png_fixed_point res;
-
-   if (png_muldiv(&res, a, b, 100000))
-      return res;
-#endif
-
-   return 0; /* overflow */
-}
-
-/* The inverse of the above. */
-png_fixed_point
-png_reciprocal2(png_fixed_point a, png_fixed_point b)
-{
-   /* The required result is 1/a * 1/b; the following preserves accuracy. */
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-   double r = 1E15/a;
-   r /= b;
-   r = floor(r+.5);
-
-   if (r <= 2147483647. && r >= -2147483648.)
-      return (png_fixed_point)r;
-#else
-   /* This may overflow because the range of png_fixed_point isn't symmetric,
-    * but this API is only used for the product of file and screen gamma so it
-    * doesn't matter that the smallest number it can produce is 1/21474, not
-    * 1/100000
-    */
-   png_fixed_point res = png_product2(a, b);
-
-   if (res != 0)
-      return png_reciprocal(res);
-#endif
-
-   return 0; /* overflow */
-}
-#endif /* READ_GAMMA */
-
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-/* Added at libpng version 1.2.34 (Dec 8, 2008) and 1.4.0 (Jan 2,
- * 2010: moved from pngset.c) */
-/*
- *    Multiply two 32-bit numbers, V1 and V2, using 32-bit
- *    arithmetic, to produce a 64-bit result in the HI/LO words.
- *
- *                  A B
- *                x C D
- *               ------
- *              AD || BD
- *        AC || CB || 0
- *
- *    where A and B are the high and low 16-bit words of V1,
- *    C and D are the 16-bit words of V2, AD is the product of
- *    A and D, and X || Y is (X << 16) + Y.
-*/
-
-void /* PRIVATE */
-png_64bit_product (long v1, long v2, unsigned long *hi_product,
-    unsigned long *lo_product)
-{
-   int a, b, c, d;
-   long lo, hi, x, y;
-
-   a = (v1 >> 16) & 0xffff;
-   b = v1 & 0xffff;
-   c = (v2 >> 16) & 0xffff;
-   d = v2 & 0xffff;
-
-   lo = b * d;                   /* BD */
-   x = a * d + c * b;            /* AD + CB */
-   y = ((lo >> 16) & 0xffff) + x;
-
-   lo = (lo & 0xffff) | ((y & 0xffff) << 16);
-   hi = (y >> 16) & 0xffff;
-
-   hi += a * c;                  /* AC */
-
-   *hi_product = (unsigned long)hi;
-   *lo_product = (unsigned long)lo;
-}
-#endif /* CHECK_cHRM */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED /* gamma table code */
-#ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED
-/* Fixed point gamma.
- *
- * To calculate gamma this code implements fast log() and exp() calls using only
- * fixed point arithmetic.  This code has sufficient precision for either 8-bit
- * or 16-bit sample values.
- *
- * The tables used here were calculated using simple 'bc' programs, but C double
- * precision floating point arithmetic would work fine.  The programs are given
- * at the head of each table.
- *
- * 8-bit log table
- *   This is a table of -log(value/255)/log(2) for 'value' in the range 128 to
- *   255, so it's the base 2 logarithm of a normalized 8-bit floating point
- *   mantissa.  The numbers are 32-bit fractions.
- */
-static png_uint_32
-png_8bit_l2[128] =
-{
-#  ifdef PNG_DO_BC
-      for (i=128;i<256;++i) { .5 - l(i/255)/l(2)*65536*65536; }
-#  else
-   4270715492U, 4222494797U, 4174646467U, 4127164793U, 4080044201U, 4033279239U,
-   3986864580U, 3940795015U, 3895065449U, 3849670902U, 3804606499U, 3759867474U,
-   3715449162U, 3671346997U, 3627556511U, 3584073329U, 3540893168U, 3498011834U,
-   3455425220U, 3413129301U, 3371120137U, 3329393864U, 3287946700U, 3246774933U,
-   3205874930U, 3165243125U, 3124876025U, 3084770202U, 3044922296U, 3005329011U,
-   2965987113U, 2926893432U, 2888044853U, 2849438323U, 2811070844U, 2772939474U,
-   2735041326U, 2697373562U, 2659933400U, 2622718104U, 2585724991U, 2548951424U,
-   2512394810U, 2476052606U, 2439922311U, 2404001468U, 2368287663U, 2332778523U,
-   2297471715U, 2262364947U, 2227455964U, 2192742551U, 2158222529U, 2123893754U,
-   2089754119U, 2055801552U, 2022034013U, 1988449497U, 1955046031U, 1921821672U,
-   1888774511U, 1855902668U, 1823204291U, 1790677560U, 1758320682U, 1726131893U,
-   1694109454U, 1662251657U, 1630556815U, 1599023271U, 1567649391U, 1536433567U,
-   1505374214U, 1474469770U, 1443718700U, 1413119487U, 1382670639U, 1352370686U,
-   1322218179U, 1292211689U, 1262349810U, 1232631153U, 1203054352U, 1173618059U,
-   1144320946U, 1115161701U, 1086139034U, 1057251672U, 1028498358U, 999877854U,
-   971388940U, 943030410U, 914801076U, 886699767U, 858725327U, 830876614U,
-   803152505U, 775551890U, 748073672U, 720716771U, 693480120U, 666362667U,
-   639363374U, 612481215U, 585715177U, 559064263U, 532527486U, 506103872U,
-   479792461U, 453592303U, 427502463U, 401522014U, 375650043U, 349885648U,
-   324227938U, 298676034U, 273229066U, 247886176U, 222646516U, 197509248U,
-   172473545U, 147538590U, 122703574U, 97967701U, 73330182U, 48790236U,
-   24347096U, 0U
-#  endif
-
-#if 0
-   /* The following are the values for 16-bit tables - these work fine for the
-    * 8-bit conversions but produce very slightly larger errors in the 16-bit
-    * log (about 1.2 as opposed to 0.7 absolute error in the final value).  To
-    * use these all the shifts below must be adjusted appropriately.
-    */
-   65166, 64430, 63700, 62976, 62257, 61543, 60835, 60132, 59434, 58741, 58054,
-   57371, 56693, 56020, 55352, 54689, 54030, 53375, 52726, 52080, 51439, 50803,
-   50170, 49542, 48918, 48298, 47682, 47070, 46462, 45858, 45257, 44661, 44068,
-   43479, 42894, 42312, 41733, 41159, 40587, 40020, 39455, 38894, 38336, 37782,
-   37230, 36682, 36137, 35595, 35057, 34521, 33988, 33459, 32932, 32408, 31887,
-   31369, 30854, 30341, 29832, 29325, 28820, 28319, 27820, 27324, 26830, 26339,
-   25850, 25364, 24880, 24399, 23920, 23444, 22970, 22499, 22029, 21562, 21098,
-   20636, 20175, 19718, 19262, 18808, 18357, 17908, 17461, 17016, 16573, 16132,
-   15694, 15257, 14822, 14390, 13959, 13530, 13103, 12678, 12255, 11834, 11415,
-   10997, 10582, 10168, 9756, 9346, 8937, 8531, 8126, 7723, 7321, 6921, 6523,
-   6127, 5732, 5339, 4947, 4557, 4169, 3782, 3397, 3014, 2632, 2251, 1872, 1495,
-   1119, 744, 372
-#endif
-};
-
-PNG_STATIC png_int_32
-png_log8bit(unsigned int x)
-{
-   unsigned int lg2 = 0;
-   /* Each time 'x' is multiplied by 2, 1 must be subtracted off the final log,
-    * because the log is actually negate that means adding 1.  The final
-    * returned value thus has the range 0 (for 255 input) to 7.994 (for 1
-    * input), return 7.99998 for the overflow (log 0) case - so the result is
-    * always at most 19 bits.
-    */
-   if ((x &= 0xff) == 0)
-      return 0xffffffff;
-
-   if ((x & 0xf0) == 0)
-      lg2  = 4, x <<= 4;
-
-   if ((x & 0xc0) == 0)
-      lg2 += 2, x <<= 2;
-
-   if ((x & 0x80) == 0)
-      lg2 += 1, x <<= 1;
-
-   /* result is at most 19 bits, so this cast is safe: */
-   return (png_int_32)((lg2 << 16) + ((png_8bit_l2[x-128]+32768)>>16));
-}
-
-/* The above gives exact (to 16 binary places) log2 values for 8-bit images,
- * for 16-bit images we use the most significant 8 bits of the 16-bit value to
- * get an approximation then multiply the approximation by a correction factor
- * determined by the remaining up to 8 bits.  This requires an additional step
- * in the 16-bit case.
- *
- * We want log2(value/65535), we have log2(v'/255), where:
- *
- *    value = v' * 256 + v''
- *          = v' * f
- *
- * So f is value/v', which is equal to (256+v''/v') since v' is in the range 128
- * to 255 and v'' is in the range 0 to 255 f will be in the range 256 to less
- * than 258.  The final factor also needs to correct for the fact that our 8-bit
- * value is scaled by 255, whereas the 16-bit values must be scaled by 65535.
- *
- * This gives a final formula using a calculated value 'x' which is value/v' and
- * scaling by 65536 to match the above table:
- *
- *   log2(x/257) * 65536
- *
- * Since these numbers are so close to '1' we can use simple linear
- * interpolation between the two end values 256/257 (result -368.61) and 258/257
- * (result 367.179).  The values used below are scaled by a further 64 to give
- * 16-bit precision in the interpolation:
- *
- * Start (256): -23591
- * Zero  (257):      0
- * End   (258):  23499
- */
-PNG_STATIC png_int_32
-png_log16bit(png_uint_32 x)
-{
-   unsigned int lg2 = 0;
-
-   /* As above, but now the input has 16 bits. */
-   if ((x &= 0xffff) == 0)
-      return 0xffffffff;
-
-   if ((x & 0xff00) == 0)
-      lg2  = 8, x <<= 8;
-
-   if ((x & 0xf000) == 0)
-      lg2 += 4, x <<= 4;
-
-   if ((x & 0xc000) == 0)
-      lg2 += 2, x <<= 2;
-
-   if ((x & 0x8000) == 0)
-      lg2 += 1, x <<= 1;
-
-   /* Calculate the base logarithm from the top 8 bits as a 28-bit fractional
-    * value.
-    */
-   lg2 <<= 28;
-   lg2 += (png_8bit_l2[(x>>8)-128]+8) >> 4;
-
-   /* Now we need to interpolate the factor, this requires a division by the top
-    * 8 bits.  Do this with maximum precision.
-    */
-   x = ((x << 16) + (x >> 9)) / (x >> 8);
-
-   /* Since we divided by the top 8 bits of 'x' there will be a '1' at 1<<24,
-    * the value at 1<<16 (ignoring this) will be 0 or 1; this gives us exactly
-    * 16 bits to interpolate to get the low bits of the result.  Round the
-    * answer.  Note that the end point values are scaled by 64 to retain overall
-    * precision and that 'lg2' is current scaled by an extra 12 bits, so adjust
-    * the overall scaling by 6-12.  Round at every step.
-    */
-   x -= 1U << 24;
-
-   if (x <= 65536U) /* <= '257' */
-      lg2 += ((23591U * (65536U-x)) + (1U << (16+6-12-1))) >> (16+6-12);
-
-   else
-      lg2 -= ((23499U * (x-65536U)) + (1U << (16+6-12-1))) >> (16+6-12);
-
-   /* Safe, because the result can't have more than 20 bits: */
-   return (png_int_32)((lg2 + 2048) >> 12);
-}
-
-/* The 'exp()' case must invert the above, taking a 20-bit fixed point
- * logarithmic value and returning a 16 or 8-bit number as appropriate.  In
- * each case only the low 16 bits are relevant - the fraction - since the
- * integer bits (the top 4) simply determine a shift.
- *
- * The worst case is the 16-bit distinction between 65535 and 65534, this
- * requires perhaps spurious accuracy in the decoding of the logarithm to
- * distinguish log2(65535/65534.5) - 10^-5 or 17 bits.  There is little chance
- * of getting this accuracy in practice.
- *
- * To deal with this the following exp() function works out the exponent of the
- * frational part of the logarithm by using an accurate 32-bit value from the
- * top four fractional bits then multiplying in the remaining bits.
- */
-static png_uint_32
-png_32bit_exp[16] =
-{
-#  ifdef PNG_DO_BC
-      for (i=0;i<16;++i) { .5 + e(-i/16*l(2))*2^32; }
-#  else
-   /* NOTE: the first entry is deliberately set to the maximum 32-bit value. */
-   4294967295U, 4112874773U, 3938502376U, 3771522796U, 3611622603U, 3458501653U,
-   3311872529U, 3171459999U, 3037000500U, 2908241642U, 2784941738U, 2666869345U,
-   2553802834U, 2445529972U, 2341847524U, 2242560872U
-#  endif
-};
-
-/* Adjustment table; provided to explain the numbers in the code below. */
-#ifdef PNG_DO_BC
-for (i=11;i>=0;--i){ print i, " ", (1 - e(-(2^i)/65536*l(2))) * 2^(32-i), "\n"}
-   11 44937.64284865548751208448
-   10 45180.98734845585101160448
-    9 45303.31936980687359311872
-    8 45364.65110595323018870784
-    7 45395.35850361789624614912
-    6 45410.72259715102037508096
-    5 45418.40724413220722311168
-    4 45422.25021786898173001728
-    3 45424.17186732298419044352
-    2 45425.13273269940811464704
-    1 45425.61317555035558641664
-    0 45425.85339951654943850496
-#endif
-
-PNG_STATIC png_uint_32
-png_exp(png_fixed_point x)
-{
-   if (x > 0 && x <= 0xfffff) /* Else overflow or zero (underflow) */
-   {
-      /* Obtain a 4-bit approximation */
-      png_uint_32 e = png_32bit_exp[(x >> 12) & 0xf];
-
-      /* Incorporate the low 12 bits - these decrease the returned value by
-       * multiplying by a number less than 1 if the bit is set.  The multiplier
-       * is determined by the above table and the shift. Notice that the values
-       * converge on 45426 and this is used to allow linear interpolation of the
-       * low bits.
-       */
-      if (x & 0x800)
-         e -= (((e >> 16) * 44938U) +  16U) >> 5;
-
-      if (x & 0x400)
-         e -= (((e >> 16) * 45181U) +  32U) >> 6;
-
-      if (x & 0x200)
-         e -= (((e >> 16) * 45303U) +  64U) >> 7;
-
-      if (x & 0x100)
-         e -= (((e >> 16) * 45365U) + 128U) >> 8;
-
-      if (x & 0x080)
-         e -= (((e >> 16) * 45395U) + 256U) >> 9;
-
-      if (x & 0x040)
-         e -= (((e >> 16) * 45410U) + 512U) >> 10;
-
-      /* And handle the low 6 bits in a single block. */
-      e -= (((e >> 16) * 355U * (x & 0x3fU)) + 256U) >> 9;
-
-      /* Handle the upper bits of x. */
-      e >>= x >> 16;
-      return e;
-   }
-
-   /* Check for overflow */
-   if (x <= 0)
-      return png_32bit_exp[0];
-
-   /* Else underflow */
-   return 0;
-}
-
-PNG_STATIC png_byte
-png_exp8bit(png_fixed_point lg2)
-{
-   /* Get a 32-bit value: */
-   png_uint_32 x = png_exp(lg2);
-
-   /* Convert the 32-bit value to 0..255 by multiplying by 256-1, note that the
-    * second, rounding, step can't overflow because of the first, subtraction,
-    * step.
-    */
-   x -= x >> 8;
-   return (png_byte)((x + 0x7fffffU) >> 24);
-}
-
-PNG_STATIC png_uint_16
-png_exp16bit(png_fixed_point lg2)
-{
-   /* Get a 32-bit value: */
-   png_uint_32 x = png_exp(lg2);
-
-   /* Convert the 32-bit value to 0..65535 by multiplying by 65536-1: */
-   x -= x >> 16;
-   return (png_uint_16)((x + 32767U) >> 16);
-}
-#endif /* FLOATING_ARITHMETIC */
-
-png_byte
-png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
-{
-   if (value > 0 && value < 255)
-   {
-#     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = floor(255*pow(value/255.,gamma_val*.00001)+.5);
-         return (png_byte)r;
-#     else
-         png_int_32 lg2 = png_log8bit(value);
-         png_fixed_point res;
-
-         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
-            return png_exp8bit(res);
-
-         /* Overflow. */
-         value = 0;
-#     endif
-   }
-
-   return (png_byte)value;
-}
-
-png_uint_16
-png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
-{
-   if (value > 0 && value < 65535)
-   {
-#     ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-         double r = floor(65535*pow(value/65535.,gamma_val*.00001)+.5);
-         return (png_uint_16)r;
-#     else
-         png_int_32 lg2 = png_log16bit(value);
-         png_fixed_point res;
-
-         if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
-            return png_exp16bit(res);
-
-         /* Overflow. */
-         value = 0;
-#     endif
-   }
-
-   return (png_uint_16)value;
-}
-
-/* This does the right thing based on the bit_depth field of the
- * png_struct, interpreting values as 8-bit or 16-bit.  While the result
- * is nominally a 16-bit value if bit depth is 8 then the result is
- * 8-bit (as are the arguments.)
- */
-png_uint_16 /* PRIVATE */
-png_gamma_correct(png_structp png_ptr, unsigned int value,
-    png_fixed_point gamma_val)
-{
-   if (png_ptr->bit_depth == 8)
-      return png_gamma_8bit_correct(value, gamma_val);
-
-   else
-      return png_gamma_16bit_correct(value, gamma_val);
-}
-
-/* This is the shared test on whether a gamma value is 'significant' - whether
- * it is worth doing gamma correction.
- */
-int /* PRIVATE */
-png_gamma_significant(png_fixed_point gamma_val)
-{
-   return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
-       gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
-}
-
-/* Internal function to build a single 16-bit table - the table consists of
- * 'num' 256-entry subtables, where 'num' is determined by 'shift' - the amount
- * to shift the input values right (or 16-number_of_signifiant_bits).
- *
- * The caller is responsible for ensuring that the table gets cleaned up on
- * png_error (i.e. if one of the mallocs below fails) - i.e. the *table argument
- * should be somewhere that will be cleaned.
- */
-static void
-png_build_16bit_table(png_structp png_ptr, png_uint_16pp *ptable,
-   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
-{
-   /* Various values derived from 'shift': */
-   PNG_CONST unsigned int num = 1U << (8U - shift);
-   PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
-   PNG_CONST unsigned int max_by_2 = 1U << (15U-shift);
-   unsigned int i;
-
-   png_uint_16pp table = *ptable =
-       (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));
-
-   for (i = 0; i < num; i++)
-   {
-      png_uint_16p sub_table = table[i] =
-          (png_uint_16p)png_malloc(png_ptr, 256 * png_sizeof(png_uint_16));
-
-      /* The 'threshold' test is repeated here because it can arise for one of
-       * the 16-bit tables even if the others don't hit it.
-       */
-      if (png_gamma_significant(gamma_val))
-      {
-         /* The old code would overflow at the end and this would cause the
-          * 'pow' function to return a result >1, resulting in an
-          * arithmetic error.  This code follows the spec exactly; ig is
-          * the recovered input sample, it always has 8-16 bits.
-          *
-          * We want input * 65535/max, rounded, the arithmetic fits in 32
-          * bits (unsigned) so long as max <= 32767.
-          */
-         unsigned int j;
-         for (j = 0; j < 256; j++)
-         {
-            png_uint_32 ig = (j << (8-shift)) + i;
-#           ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-               /* Inline the 'max' scaling operation: */
-               double d = floor(65535*pow(ig/(double)max, gamma_val*.00001)+.5);
-               sub_table[j] = (png_uint_16)d;
-#           else
-               if (shift)
-                  ig = (ig * 65535U + max_by_2)/max;
-
-               sub_table[j] = png_gamma_16bit_correct(ig, gamma_val);
-#           endif
-         }
-      }
-      else
-      {
-         /* We must still build a table, but do it the fast way. */
-         unsigned int j;
-
-         for (j = 0; j < 256; j++)
-         {
-            png_uint_32 ig = (j << (8-shift)) + i;
-
-            if (shift)
-               ig = (ig * 65535U + max_by_2)/max;
-
-            sub_table[j] = (png_uint_16)ig;
-         }
-      }
-   }
-}
-
-/* NOTE: this function expects the *inverse* of the overall gamma transformation
- * required.
- */
-static void
-png_build_16to8_table(png_structp png_ptr, png_uint_16pp *ptable,
-   PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val)
-{
-   PNG_CONST unsigned int num = 1U << (8U - shift);
-   PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
-   unsigned int i;
-   png_uint_32 last;
-
-   png_uint_16pp table = *ptable =
-       (png_uint_16pp)png_calloc(png_ptr, num * png_sizeof(png_uint_16p));
-
-   /* 'num' is the number of tables and also the number of low bits of the
-    * input 16-bit value used to select a table.  Each table is itself indexed
-    * by the high 8 bits of the value.
-    */
-   for (i = 0; i < num; i++)
-      table[i] = (png_uint_16p)png_malloc(png_ptr,
-          256 * png_sizeof(png_uint_16));
-
-   /* 'gamma_val' is set to the reciprocal of the value calculated above, so
-    * pow(out,g) is an *input* value.  'last' is the last input value set.
-    *
-    * In the loop 'i' is used to find output values.  Since the output is
-    * 8-bit there are only 256 possible values.  The tables are set up to
-    * select the closest possible output value for each input by finding
-    * the input value at the boundary between each pair of output values
-    * and filling the table up to that boundary with the lower output
-    * value.
-    *
-    * The boundary values are 0.5,1.5..253.5,254.5.  Since these are 9-bit
-    * values the code below uses a 16-bit value in i; the values start at
-    * 128.5 (for 0.5) and step by 257, for a total of 254 values (the last
-    * entries are filled with 255).  Start i at 128 and fill all 'last'
-    * table entries <= 'max'
-    */
-   last = 0;
-   for (i = 0; i < 255; ++i) /* 8-bit output value */
-   {
-      /* Find the corresponding maximum input value */
-      png_uint_16 out = (png_uint_16)(i * 257U); /* 16-bit output value */
-
-      /* Find the boundary value in 16 bits: */
-      png_uint_32 bound = png_gamma_16bit_correct(out+128U, gamma_val);
-
-      /* Adjust (round) to (16-shift) bits: */
-      bound = (bound * max + 32768U)/65535U + 1U;
-
-      while (last < bound)
-      {
-         table[last & (0xffU >> shift)][last >> (8U - shift)] = out;
-         last++;
-      }
-   }
-
-   /* And fill in the final entries. */
-   while (last < (num << 8))
-   {
-      table[last & (0xff >> shift)][last >> (8U - shift)] = 65535U;
-      last++;
-   }
-}
-
-/* Build a single 8-bit table: same as the 16-bit case but much simpler (and
- * typically much faster).  Note that libpng currently does no sBIT processing
- * (apparently contrary to the spec) so a 256-entry table is always generated.
- */
-static void
-png_build_8bit_table(png_structp png_ptr, png_bytepp ptable,
-   PNG_CONST png_fixed_point gamma_val)
-{
-   unsigned int i;
-   png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
-
-   if (png_gamma_significant(gamma_val)) for (i=0; i<256; i++)
-      table[i] = png_gamma_8bit_correct(i, gamma_val);
-
-   else for (i=0; i<256; ++i)
-      table[i] = (png_byte)i;
-}
-
-/* Used from png_read_destroy and below to release the memory used by the gamma
- * tables.
- */
-void /* PRIVATE */
-png_destroy_gamma_table(png_structp png_ptr)
-{
-   png_free(png_ptr, png_ptr->gamma_table);
-   png_ptr->gamma_table = NULL;
-
-   if (png_ptr->gamma_16_table != NULL)
-   {
-      int i;
-      int istop = (1 << (8 - png_ptr->gamma_shift));
-      for (i = 0; i < istop; i++)
-      {
-         png_free(png_ptr, png_ptr->gamma_16_table[i]);
-      }
-   png_free(png_ptr, png_ptr->gamma_16_table);
-   png_ptr->gamma_16_table = NULL;
-   }
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-   png_free(png_ptr, png_ptr->gamma_from_1);
-   png_ptr->gamma_from_1 = NULL;
-   png_free(png_ptr, png_ptr->gamma_to_1);
-   png_ptr->gamma_to_1 = NULL;
-
-   if (png_ptr->gamma_16_from_1 != NULL)
-   {
-      int i;
-      int istop = (1 << (8 - png_ptr->gamma_shift));
-      for (i = 0; i < istop; i++)
-      {
-         png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
-      }
-   png_free(png_ptr, png_ptr->gamma_16_from_1);
-   png_ptr->gamma_16_from_1 = NULL;
-   }
-   if (png_ptr->gamma_16_to_1 != NULL)
-   {
-      int i;
-      int istop = (1 << (8 - png_ptr->gamma_shift));
-      for (i = 0; i < istop; i++)
-      {
-         png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
-      }
-   png_free(png_ptr, png_ptr->gamma_16_to_1);
-   png_ptr->gamma_16_to_1 = NULL;
-   }
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-}
-
-/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit
- * tables, we don't make a full table if we are reducing to 8-bit in
- * the future.  Note also how the gamma_16 tables are segmented so that
- * we don't need to allocate > 64K chunks for a full 16-bit table.
- */
-void /* PRIVATE */
-png_build_gamma_table(png_structp png_ptr, int bit_depth)
-{
-  png_debug(1, "in png_build_gamma_table");
-
-  /* Remove any existing table; this copes with multiple calls to
-   * png_read_update_info.  The warning is because building the gamma tables
-   * multiple times is a performance hit - it's harmless but the ability to call
-   * png_read_update_info() multiple times is new in 1.5.6 so it seems sensible
-   * to warn if the app introduces such a hit.
-   */
-  if (png_ptr->gamma_table != NULL || png_ptr->gamma_16_table != NULL)
-  {
-    png_warning(png_ptr, "gamma table being rebuilt");
-    png_destroy_gamma_table(png_ptr);
-  }
-
-  if (bit_depth <= 8)
-  {
-     png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
-         png_ptr->screen_gamma > 0 ?  png_reciprocal2(png_ptr->gamma,
-         png_ptr->screen_gamma) : PNG_FP_1);
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-     if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY))
-     {
-        png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
-            png_reciprocal(png_ptr->gamma));
-
-        png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
-            png_ptr->screen_gamma > 0 ?  png_reciprocal(png_ptr->screen_gamma) :
-            png_ptr->gamma/* Probably doing rgb_to_gray */);
-     }
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-  }
-  else
-  {
-     png_byte shift, sig_bit;
-
-     if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
-     {
-        sig_bit = png_ptr->sig_bit.red;
-
-        if (png_ptr->sig_bit.green > sig_bit)
-           sig_bit = png_ptr->sig_bit.green;
-
-        if (png_ptr->sig_bit.blue > sig_bit)
-           sig_bit = png_ptr->sig_bit.blue;
-     }
-     else
-        sig_bit = png_ptr->sig_bit.gray;
-
-     /* 16-bit gamma code uses this equation:
-      *
-      *   ov = table[(iv & 0xff) >> gamma_shift][iv >> 8]
-      *
-      * Where 'iv' is the input color value and 'ov' is the output value -
-      * pow(iv, gamma).
-      *
-      * Thus the gamma table consists of up to 256 256-entry tables.  The table
-      * is selected by the (8-gamma_shift) most significant of the low 8 bits of
-      * the color value then indexed by the upper 8 bits:
-      *
-      *   table[low bits][high 8 bits]
-      *
-      * So the table 'n' corresponds to all those 'iv' of:
-      *
-      *   <all high 8-bit values><n << gamma_shift>..<(n+1 << gamma_shift)-1>
-      *
-      */
-     if (sig_bit > 0 && sig_bit < 16U)
-        shift = (png_byte)(16U - sig_bit); /* shift == insignificant bits */
-
-     else
-        shift = 0; /* keep all 16 bits */
-
-     if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8))
-     {
-        /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively
-         * the significant bits in the *input* when the output will
-         * eventually be 8 bits.  By default it is 11.
-         */
-        if (shift < (16U - PNG_MAX_GAMMA_8))
-           shift = (16U - PNG_MAX_GAMMA_8);
-     }
-
-     if (shift > 8U)
-        shift = 8U; /* Guarantees at least one table! */
-
-     png_ptr->gamma_shift = shift;
-
-#ifdef PNG_16BIT_SUPPORTED
-     /* NOTE: prior to 1.5.4 this test used to include PNG_BACKGROUND (now
-      * PNG_COMPOSE).  This effectively smashed the background calculation for
-      * 16-bit output because the 8-bit table assumes the result will be reduced
-      * to 8 bits.
-      */
-     if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8))
-#endif
-         png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
-         png_ptr->screen_gamma > 0 ? png_product2(png_ptr->gamma,
-         png_ptr->screen_gamma) : PNG_FP_1);
-
-#ifdef PNG_16BIT_SUPPORTED
-     else
-         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
-         png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->gamma,
-         png_ptr->screen_gamma) : PNG_FP_1);
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-     if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY))
-     {
-        png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
-            png_reciprocal(png_ptr->gamma));
-
-        /* Notice that the '16 from 1' table should be full precision, however
-         * the lookup on this table still uses gamma_shift, so it can't be.
-         * TODO: fix this.
-         */
-        png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
-            png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
-            png_ptr->gamma/* Probably doing rgb_to_gray */);
-     }
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-  }
-}
-#endif /* READ_GAMMA */
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+
+/* png.c - location for general purpose libpng functions
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#define PNG_NO_EXTERN
+#include "png.h"
+
+/* Generate a compiler error if there is an old png.h in the search path. */
+typedef version_1_2_7 Your_png_h_is_not_version_1_2_7;
+
+/* Version information for C files.  This had better match the version
+ * string defined in png.h.  */
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+/* png_libpng_ver was changed to a function in version 1.0.5c */
+const char png_libpng_ver[18] = PNG_LIBPNG_VER_STRING;
+
+/* png_sig was changed to a function in version 1.0.5c */
+/* Place to hold the signature string for a PNG file. */
+const png_byte FARDATA png_sig[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+
+/* Invoke global declarations for constant strings for known chunk types */
+PNG_IHDR;
+PNG_IDAT;
+PNG_IEND;
+PNG_PLTE;
+PNG_bKGD;
+PNG_cHRM;
+PNG_gAMA;
+PNG_hIST;
+PNG_iCCP;
+PNG_iTXt;
+PNG_oFFs;
+PNG_pCAL;
+PNG_sCAL;
+PNG_pHYs;
+PNG_sBIT;
+PNG_sPLT;
+PNG_sRGB;
+PNG_tEXt;
+PNG_tIME;
+PNG_tRNS;
+PNG_zTXt;
+
+/* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+/* start of interlace block */
+const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
+/* offset to next interlace block */
+const int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+
+/* start of interlace block in the y direction */
+const int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+
+/* offset to next interlace block in the y direction */
+const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+
+/* width of interlace block (used in assembler routines only) */
+#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW
+const int FARDATA png_pass_width[] = {8, 4, 4, 2, 2, 1, 1};
+#endif
+
+/* Height of interlace block.  This is not currently used - if you need
+ * it, uncomment it here and in png.h
+const int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+*/
+
+/* Mask to determine which pixels are valid in a pass */
+const int FARDATA png_pass_mask[] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+
+/* Mask to determine which pixels to overwrite while displaying */
+const int FARDATA png_pass_dsp_mask[]
+   = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+
+#endif
+
+/* Tells libpng that we have already handled the first "num_bytes" bytes
+ * of the PNG file signature.  If the PNG data is embedded into another
+ * stream we can set num_bytes = 8 so that libpng will not attempt to read
+ * or write any of the magic bytes before it starts on the IHDR.
+ */
+
+void PNGAPI
+png_set_sig_bytes(png_structp png_ptr, int num_bytes)
+{
+   png_debug(1, "in png_set_sig_bytes\n");
+   if (num_bytes > 8)
+      png_error(png_ptr, "Too many bytes for PNG signature.");
+
+   png_ptr->sig_bytes = (png_byte)(num_bytes < 0 ? 0 : num_bytes);
+}
+
+/* Checks whether the supplied bytes match the PNG signature.  We allow
+ * checking less than the full 8-byte signature so that those apps that
+ * already read the first few bytes of a file to determine the file type
+ * can simply check the remaining bytes for extra assurance.  Returns
+ * an integer less than, equal to, or greater than zero if sig is found,
+ * respectively, to be less than, to match, or be greater than the correct
+ * PNG signature (this is the same behaviour as strcmp, memcmp, etc).
+ */
+int PNGAPI
+png_sig_cmp(png_bytep sig, png_size_t start, png_size_t num_to_check)
+{
+   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+   if (num_to_check > 8)
+      num_to_check = 8;
+   else if (num_to_check < 1)
+      return (0);
+
+   if (start > 7)
+      return (0);
+
+   if (start + num_to_check > 8)
+      num_to_check = 8 - start;
+
+   return ((int)(png_memcmp(&sig[start], &png_signature[start], num_to_check)));
+}
+
+/* (Obsolete) function to check signature bytes.  It does not allow one
+ * to check a partial signature.  This function might be removed in the
+ * future - use png_sig_cmp().  Returns true (nonzero) if the file is a PNG.
+ */
+int PNGAPI
+png_check_sig(png_bytep sig, int num)
+{
+  return ((int)!png_sig_cmp(sig, (png_size_t)0, (png_size_t)num));
+}
+
+/* Function to allocate memory for zlib and clear it to 0. */
+#ifdef PNG_1_0_X
+voidpf PNGAPI
+#else
+voidpf /* private */
+#endif
+png_zalloc(voidpf png_ptr, uInt items, uInt size)
+{
+   png_voidp ptr;
+   png_structp p=(png_struct*)png_ptr;
+   png_uint_32 save_flags=p->flags;
+   png_uint_32 num_bytes;
+
+   if (items > PNG_UINT_32_MAX/size)
+   {
+     png_warning (png_ptr, "Potential overflow in png_zalloc()");
+     return (NULL);
+   }
+   num_bytes = (png_uint_32)items * size;
+
+   p->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
+   ptr = (png_voidp)png_malloc((png_structp)png_ptr, num_bytes);
+   p->flags=save_flags;
+
+#if defined(PNG_1_0_X) && !defined(PNG_NO_ZALLOC_ZERO)
+   if (ptr == NULL)
+       return ((voidpf)ptr);
+
+   if (num_bytes > (png_uint_32)0x8000L)
+   {
+      png_memset(ptr, 0, (png_size_t)0x8000L);
+      png_memset((png_bytep)ptr + (png_size_t)0x8000L, 0,
+         (png_size_t)(num_bytes - (png_uint_32)0x8000L));
+   }
+   else
+   {
+      png_memset(ptr, 0, (png_size_t)num_bytes);
+   }
+#endif
+   return ((voidpf)ptr);
+}
+
+/* function to free memory for zlib */
+#ifdef PNG_1_0_X
+void PNGAPI
+#else
+void /* private */
+#endif
+png_zfree(voidpf png_ptr, voidpf ptr)
+{
+   png_free((png_structp)png_ptr, (png_voidp)ptr);
+}
+
+/* Reset the CRC variable to 32 bits of 1's.  Care must be taken
+ * in case CRC is > 32 bits to leave the top bits 0.
+ */
+void /* PRIVATE */
+png_reset_crc(png_structp png_ptr)
+{
+   png_ptr->crc = crc32(0, Z_NULL, 0);
+}
+
+/* Calculate the CRC over a section of data.  We can only pass as
+ * much data to this routine as the largest single buffer size.  We
+ * also check that this data will actually be used before going to the
+ * trouble of calculating it.
+ */
+void /* PRIVATE */
+png_calculate_crc(png_structp png_ptr, png_bytep ptr, png_size_t length)
+{
+   int need_crc = 1;
+
+   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
+   {
+      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+         need_crc = 0;
+   }
+   else                                                    /* critical */
+   {
+      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+         need_crc = 0;
+   }
+
+   if (need_crc)
+      png_ptr->crc = crc32(png_ptr->crc, ptr, (uInt)length);
+}
+
+/* Allocate the memory for an info_struct for the application.  We don't
+ * really need the png_ptr, but it could potentially be useful in the
+ * future.  This should be used in favour of malloc(png_sizeof(png_info))
+ * and png_info_init() so that applications that want to use a shared
+ * libpng don't have to be recompiled if png_info changes size.
+ */
+png_infop PNGAPI
+png_create_info_struct(png_structp png_ptr)
+{
+   png_infop info_ptr;
+
+   png_debug(1, "in png_create_info_struct\n");
+   if(png_ptr == NULL) return (NULL);
+#ifdef PNG_USER_MEM_SUPPORTED
+   info_ptr = (png_infop)png_create_struct_2(PNG_STRUCT_INFO,
+      png_ptr->malloc_fn, png_ptr->mem_ptr);
+#else
+   info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
+#endif
+   if (info_ptr != NULL)
+      png_info_init_3(&info_ptr, png_sizeof(png_info));
+
+   return (info_ptr);
+}
+
+/* This function frees the memory associated with a single info struct.
+ * Normally, one would use either png_destroy_read_struct() or
+ * png_destroy_write_struct() to free an info struct, but this may be
+ * useful for some applications.
+ */
+void PNGAPI
+png_destroy_info_struct(png_structp png_ptr, png_infopp info_ptr_ptr)
+{
+   png_infop info_ptr = NULL;
+
+   png_debug(1, "in png_destroy_info_struct\n");
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (info_ptr != NULL)
+   {
+      png_info_destroy(png_ptr, info_ptr);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, png_ptr->free_fn,
+          png_ptr->mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+}
+
+/* Initialize the info structure.  This is now an internal function (0.89)
+ * and applications using it are urged to use png_create_info_struct()
+ * instead.
+ */
+#undef png_info_init
+void PNGAPI
+png_info_init(png_infop info_ptr)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+   png_info_init_3(&info_ptr, 0);
+}
+
+void PNGAPI
+png_info_init_3(png_infopp ptr_ptr, png_size_t png_info_struct_size)
+{
+   png_infop info_ptr = *ptr_ptr;
+
+   png_debug(1, "in png_info_init_3\n");
+
+   if(png_sizeof(png_info) > png_info_struct_size)
+     {
+       png_destroy_struct(info_ptr);
+       info_ptr = (png_infop)png_create_struct(PNG_STRUCT_INFO);
+       *ptr_ptr = info_ptr;
+     }
+
+   /* set everything to 0 */
+   png_memset(info_ptr, 0, png_sizeof (png_info));
+}
+
+#ifdef PNG_FREE_ME_SUPPORTED
+void PNGAPI
+png_data_freer(png_structp png_ptr, png_infop info_ptr,
+   int freer, png_uint_32 mask)
+{
+   png_debug(1, "in png_data_freer\n");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+   if(freer == PNG_DESTROY_WILL_FREE_DATA)
+      info_ptr->free_me |= mask;
+   else if(freer == PNG_USER_WILL_FREE_DATA)
+      info_ptr->free_me &= ~mask;
+   else
+      png_warning(png_ptr,
+         "Unknown freer parameter in png_data_freer.");
+}
+#endif
+
+void PNGAPI
+png_free_data(png_structp png_ptr, png_infop info_ptr, png_uint_32 mask,
+   int num)
+{
+   png_debug(1, "in png_free_data\n");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+#if defined(PNG_TEXT_SUPPORTED)
+/* free text item num or (if num == -1) all text items */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_TEXT)
+#endif
+{
+   if (num != -1)
+   {
+     if (info_ptr->text && info_ptr->text[num].key)
+     {
+         png_free(png_ptr, info_ptr->text[num].key);
+         info_ptr->text[num].key = NULL;
+     }
+   }
+   else
+   {
+       int i;
+       for (i = 0; i < info_ptr->num_text; i++)
+           png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i);
+       png_free(png_ptr, info_ptr->text);
+       info_ptr->text = NULL;
+       info_ptr->num_text=0;
+   }
+}
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+/* free any tRNS entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
+#else
+if ((mask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS))
+#endif
+{
+    png_free(png_ptr, info_ptr->trans);
+    info_ptr->valid &= ~PNG_INFO_tRNS;
+#ifndef PNG_FREE_ME_SUPPORTED
+    png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
+#endif
+    info_ptr->trans = NULL;
+}
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+/* free any sCAL entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_SCAL)
+#endif
+{
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+    png_free(png_ptr, info_ptr->scal_s_width);
+    png_free(png_ptr, info_ptr->scal_s_height);
+    info_ptr->scal_s_width = NULL;
+    info_ptr->scal_s_height = NULL;
+#endif
+    info_ptr->valid &= ~PNG_INFO_sCAL;
+}
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+/* free any pCAL entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_PCAL)
+#endif
+{
+    png_free(png_ptr, info_ptr->pcal_purpose);
+    png_free(png_ptr, info_ptr->pcal_units);
+    info_ptr->pcal_purpose = NULL;
+    info_ptr->pcal_units = NULL;
+    if (info_ptr->pcal_params != NULL)
+    {
+        int i;
+        for (i = 0; i < (int)info_ptr->pcal_nparams; i++)
+        {
+          png_free(png_ptr, info_ptr->pcal_params[i]);
+          info_ptr->pcal_params[i]=NULL;
+        }
+        png_free(png_ptr, info_ptr->pcal_params);
+        info_ptr->pcal_params = NULL;
+    }
+    info_ptr->valid &= ~PNG_INFO_pCAL;
+}
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+/* free any iCCP entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_ICCP)
+#endif
+{
+    png_free(png_ptr, info_ptr->iccp_name);
+    png_free(png_ptr, info_ptr->iccp_profile);
+    info_ptr->iccp_name = NULL;
+    info_ptr->iccp_profile = NULL;
+    info_ptr->valid &= ~PNG_INFO_iCCP;
+}
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+/* free a given sPLT entry, or (if num == -1) all sPLT entries */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_SPLT)
+#endif
+{
+   if (num != -1)
+   {
+      if(info_ptr->splt_palettes)
+      {
+          png_free(png_ptr, info_ptr->splt_palettes[num].name);
+          png_free(png_ptr, info_ptr->splt_palettes[num].entries);
+          info_ptr->splt_palettes[num].name = NULL;
+          info_ptr->splt_palettes[num].entries = NULL;
+      }
+   }
+   else
+   {
+       if(info_ptr->splt_palettes_num)
+       {
+         int i;
+         for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
+            png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, i);
+
+         png_free(png_ptr, info_ptr->splt_palettes);
+         info_ptr->splt_palettes = NULL;
+         info_ptr->splt_palettes_num = 0;
+       }
+       info_ptr->valid &= ~PNG_INFO_sPLT;
+   }
+}
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_UNKN)
+#endif
+{
+   if (num != -1)
+   {
+       if(info_ptr->unknown_chunks)
+       {
+          png_free(png_ptr, info_ptr->unknown_chunks[num].data);
+          info_ptr->unknown_chunks[num].data = NULL;
+       }
+   }
+   else
+   {
+       int i;
+
+       if(info_ptr->unknown_chunks_num)
+       {
+         for (i = 0; i < (int)info_ptr->unknown_chunks_num; i++)
+            png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, i);
+
+         png_free(png_ptr, info_ptr->unknown_chunks);
+         info_ptr->unknown_chunks = NULL;
+         info_ptr->unknown_chunks_num = 0;
+       }
+   }
+}
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+/* free any hIST entry */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_HIST)  & info_ptr->free_me)
+#else
+if ((mask & PNG_FREE_HIST) && (png_ptr->flags & PNG_FLAG_FREE_HIST))
+#endif
+{
+    png_free(png_ptr, info_ptr->hist);
+    info_ptr->hist = NULL;
+    info_ptr->valid &= ~PNG_INFO_hIST;
+#ifndef PNG_FREE_ME_SUPPORTED
+    png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
+#endif
+}
+#endif
+
+/* free any PLTE entry that was internally allocated */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
+#else
+if ((mask & PNG_FREE_PLTE) && (png_ptr->flags & PNG_FLAG_FREE_PLTE))
+#endif
+{
+    png_zfree(png_ptr, info_ptr->palette);
+    info_ptr->palette = NULL;
+    info_ptr->valid &= ~PNG_INFO_PLTE;
+#ifndef PNG_FREE_ME_SUPPORTED
+    png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
+#endif
+    info_ptr->num_palette = 0;
+}
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+/* free any image bits attached to the info structure */
+#ifdef PNG_FREE_ME_SUPPORTED
+if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
+#else
+if (mask & PNG_FREE_ROWS)
+#endif
+{
+    if(info_ptr->row_pointers)
+    {
+       int row;
+       for (row = 0; row < (int)info_ptr->height; row++)
+       {
+          png_free(png_ptr, info_ptr->row_pointers[row]);
+          info_ptr->row_pointers[row]=NULL;
+       }
+       png_free(png_ptr, info_ptr->row_pointers);
+       info_ptr->row_pointers=NULL;
+    }
+    info_ptr->valid &= ~PNG_INFO_IDAT;
+}
+#endif
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   if(num == -1)
+     info_ptr->free_me &= ~mask;
+   else
+     info_ptr->free_me &= ~(mask & ~PNG_FREE_MUL);
+#endif
+}
+
+/* This is an internal routine to free any memory that the info struct is
+ * pointing to before re-using it or freeing the struct itself.  Recall
+ * that png_free() checks for NULL pointers for us.
+ */
+void /* PRIVATE */
+png_info_destroy(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_info_destroy\n");
+
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   if (png_ptr->num_chunk_list)
+   {
+       png_free(png_ptr, png_ptr->chunk_list);
+       png_ptr->chunk_list=NULL;
+       png_ptr->num_chunk_list=0;
+   }
+#endif
+
+   png_info_init_3(&info_ptr, png_sizeof(png_info));
+}
+
+/* This function returns a pointer to the io_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy() or png_read_destroy() are called.
+ */
+png_voidp PNGAPI
+png_get_io_ptr(png_structp png_ptr)
+{
+   return (png_ptr->io_ptr);
+}
+
+#if !defined(PNG_NO_STDIO)
+/* Initialize the default input/output functions for the PNG file.  If you
+ * use your own read or write routines, you can call either png_set_read_fn()
+ * or png_set_write_fn() instead of png_init_io().  If you have defined
+ * PNG_NO_STDIO, you must use a function of your own because "FILE *" isn't
+ * necessarily available.
+ */
+void PNGAPI
+png_init_io(png_structp png_ptr, png_FILE_p fp)
+{
+   png_debug(1, "in png_init_io\n");
+   png_ptr->io_ptr = (png_voidp)fp;
+}
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+/* Convert the supplied time into an RFC 1123 string suitable for use in
+ * a "Creation Time" or other text-based time string.
+ */
+png_charp PNGAPI
+png_convert_to_rfc1123(png_structp png_ptr, png_timep ptime)
+{
+   static PNG_CONST char short_months[12][4] =
+        {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+
+   if (png_ptr->time_buffer == NULL)
+   {
+      png_ptr->time_buffer = (png_charp)png_malloc(png_ptr, (png_uint_32)(29*
+         png_sizeof(char)));
+   }
+
+#if defined(_WIN32_WCE)
+   {
+      wchar_t time_buf[29];
+      wsprintf(time_buf, TEXT("%d %S %d %02d:%02d:%02d +0000"),
+          ptime->day % 32, short_months[(ptime->month - 1) % 12],
+        ptime->year, ptime->hour % 24, ptime->minute % 60,
+          ptime->second % 61);
+      WideCharToMultiByte(CP_ACP, 0, time_buf, -1, png_ptr->time_buffer, 29,
+          NULL, NULL);
+   }
+#else
+#ifdef USE_FAR_KEYWORD
+   {
+      char near_time_buf[29];
+      sprintf(near_time_buf, "%d %s %d %02d:%02d:%02d +0000",
+          ptime->day % 32, short_months[(ptime->month - 1) % 12],
+          ptime->year, ptime->hour % 24, ptime->minute % 60,
+          ptime->second % 61);
+      png_memcpy(png_ptr->time_buffer, near_time_buf,
+          29*png_sizeof(char));
+   }
+#else
+   sprintf(png_ptr->time_buffer, "%d %s %d %02d:%02d:%02d +0000",
+       ptime->day % 32, short_months[(ptime->month - 1) % 12],
+       ptime->year, ptime->hour % 24, ptime->minute % 60,
+       ptime->second % 61);
+#endif
+#endif /* _WIN32_WCE */
+   return ((png_charp)png_ptr->time_buffer);
+}
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+
+#if 0
+/* Signature string for a PNG file. */
+png_bytep PNGAPI
+png_sig_bytes(void)
+{
+   return ((png_bytep)"\211\120\116\107\015\012\032\012");
+}
+#endif
+
+png_charp PNGAPI
+png_get_copyright(png_structp png_ptr)
+{
+   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
+   return ((png_charp) "\n libpng version 1.2.7 - September 12, 2004\n\
+   Copyright (c) 1998-2004 Glenn Randers-Pehrson\n\
+   Copyright (c) 1996-1997 Andreas Dilger\n\
+   Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
+   return ((png_charp) "");
+}
+
+/* The following return the library version as a short string in the
+ * format 1.0.0 through 99.99.99zz.  To get the version of *.h files
+ * used with your application, print out PNG_LIBPNG_VER_STRING, which
+ * is defined in png.h.
+ * Note: now there is no difference between png_get_libpng_ver() and
+ * png_get_header_ver().  Due to the version_nn_nn_nn typedef guard,
+ * it is guaranteed that png.c uses the correct version of png.h.
+ */
+png_charp PNGAPI
+png_get_libpng_ver(png_structp png_ptr)
+{
+   /* Version of *.c files used when building libpng */
+   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
+      return ((png_charp) PNG_LIBPNG_VER_STRING);
+   return ((png_charp) "");
+}
+
+png_charp PNGAPI
+png_get_header_ver(png_structp png_ptr)
+{
+   /* Version of *.h files used when building libpng */
+   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
+      return ((png_charp) PNG_LIBPNG_VER_STRING);
+   return ((png_charp) "");
+}
+
+png_charp PNGAPI
+png_get_header_version(png_structp png_ptr)
+{
+   /* Returns longer string containing both version and date */
+   if (&png_ptr != NULL)  /* silence compiler warning about unused png_ptr */
+      return ((png_charp) PNG_HEADER_VERSION_STRING);
+   return ((png_charp) "");
+}
+
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+int PNGAPI
+png_handle_as_unknown(png_structp png_ptr, png_bytep chunk_name)
+{
+   /* check chunk_name and return "keep" value if it's on the list, else 0 */
+   int i;
+   png_bytep p;
+   if((png_ptr == NULL && chunk_name == NULL) || png_ptr->num_chunk_list<=0)
+      return 0;
+   p=png_ptr->chunk_list+png_ptr->num_chunk_list*5-5;
+   for (i = png_ptr->num_chunk_list; i; i--, p-=5)
+      if (!png_memcmp(chunk_name, p, 4))
+        return ((int)*(p+4));
+   return 0;
+}
+#endif
+
+/* This function, added to libpng-1.0.6g, is untested. */
+int PNGAPI
+png_reset_zstream(png_structp png_ptr)
+{
+   return (inflateReset(&png_ptr->zstream));
+}
+
+/* This function was added to libpng-1.0.7 */
+png_uint_32 PNGAPI
+png_access_version_number(void)
+{
+   /* Version of *.c files used when building libpng */
+   return((png_uint_32) PNG_LIBPNG_VER);
+}
+
+
+#if !defined(PNG_1_0_X)
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+    /* GRR:  could add this:   && defined(PNG_MMX_CODE_SUPPORTED) */
+/* this INTERNAL function was added to libpng 1.2.0 */
+void /* PRIVATE */
+png_init_mmx_flags (png_structp png_ptr)
+{
+    png_ptr->mmx_rowbytes_threshold = 0;
+    png_ptr->mmx_bitdepth_threshold = 0;
+
+#  if (defined(PNG_USE_PNGVCRD) || defined(PNG_USE_PNGGCCRD))
+
+    png_ptr->asm_flags |= PNG_ASM_FLAG_MMX_SUPPORT_COMPILED;
+
+    if (png_mmx_support() > 0) {
+        png_ptr->asm_flags |= PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU
+#    ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW
+                              | PNG_ASM_FLAG_MMX_READ_COMBINE_ROW
+#    endif
+#    ifdef PNG_HAVE_ASSEMBLER_READ_INTERLACE
+                              | PNG_ASM_FLAG_MMX_READ_INTERLACE
+#    endif
+#    ifndef PNG_HAVE_ASSEMBLER_READ_FILTER_ROW
+                              ;
+#    else
+                              | PNG_ASM_FLAG_MMX_READ_FILTER_SUB
+                              | PNG_ASM_FLAG_MMX_READ_FILTER_UP
+                              | PNG_ASM_FLAG_MMX_READ_FILTER_AVG
+                              | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ;
+
+        png_ptr->mmx_rowbytes_threshold = PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT;
+        png_ptr->mmx_bitdepth_threshold = PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT;
+#    endif
+    } else {
+        png_ptr->asm_flags &= ~( PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU
+                               | PNG_MMX_READ_FLAGS
+                               | PNG_MMX_WRITE_FLAGS );
+    }
+
+#  else /* !((PNGVCRD || PNGGCCRD) && PNG_ASSEMBLER_CODE_SUPPORTED)) */
+
+    /* clear all MMX flags; no support is compiled in */
+    png_ptr->asm_flags &= ~( PNG_MMX_FLAGS );
+
+#  endif /* ?(PNGVCRD || PNGGCCRD) */
+}
+
+#endif /* !(PNG_ASSEMBLER_CODE_SUPPORTED) */
+
+/* this function was added to libpng 1.2.0 */
+#if !defined(PNG_USE_PNGGCCRD) && \
+    !(defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_USE_PNGVCRD))
+int PNGAPI
+png_mmx_support(void)
+{
+    return -1;
+}
+#endif
+#endif /* PNG_1_0_X */
+
+#ifdef PNG_SIZE_T
+/* Added at libpng version 1.2.6 */
+   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
+png_size_t PNGAPI
+png_convert_size(size_t size)
+{
+  if (size > (png_size_t)-1)
+     PNG_ABORT();  /* We haven't got access to png_ptr, so no png_error() */
+  return ((png_size_t)size);
+}
+#endif /* PNG_SIZE_T */
diff --git a/Source/3rd Party/wx/src/png/png.h b/Source/3rd Party/wx/src/png/png.h
index 657aa5a48..b57acb414 100644
--- a/Source/3rd Party/wx/src/png/png.h	
+++ b/Source/3rd Party/wx/src/png/png.h	
@@ -1,2652 +1,3364 @@
-
-/* png.h - header file for PNG reference library
- *
- * libpng version 1.5.7 - December 15, 2011
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license (See LICENSE, below)
- *
- * Authors and maintainers:
- *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
- *   libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.5.7 - December 15, 2011: Glenn
- *   See also "Contributing Authors", below.
- *
- * Note about libpng version numbers:
- *
- *   Due to various miscommunications, unforeseen code incompatibilities
- *   and occasional factors outside the authors' control, version numbering
- *   on the library has not always been consistent and straightforward.
- *   The following table summarizes matters since version 0.89c, which was
- *   the first widely used release:
- *
- *    source                 png.h  png.h  shared-lib
- *    version                string   int  version
- *    -------                ------ -----  ----------
- *    0.89c "1.0 beta 3"     0.89      89  1.0.89
- *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]
- *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]
- *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]
- *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]
- *    0.97c                  0.97      97  2.0.97
- *    0.98                   0.98      98  2.0.98
- *    0.99                   0.99      98  2.0.99
- *    0.99a-m                0.99      99  2.0.99
- *    1.00                   1.00     100  2.1.0 [100 should be 10000]
- *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]
- *    1.0.1       png.h string is   10001  2.1.0
- *    1.0.1a-e    identical to the  10002  from here on, the shared library
- *    1.0.2       source version)   10002  is 2.V where V is the source code
- *    1.0.2a-b                      10003  version, except as noted.
- *    1.0.3                         10003
- *    1.0.3a-d                      10004
- *    1.0.4                         10004
- *    1.0.4a-f                      10005
- *    1.0.5 (+ 2 patches)           10005
- *    1.0.5a-d                      10006
- *    1.0.5e-r                      10100 (not source compatible)
- *    1.0.5s-v                      10006 (not binary compatible)
- *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
- *    1.0.6d-f                      10007 (still binary incompatible)
- *    1.0.6g                        10007
- *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
- *    1.0.6i                        10007  10.6i
- *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
- *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
- *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
- *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
- *    1.0.7                    1    10007  (still compatible)
- *    1.0.8beta1-4             1    10008  2.1.0.8beta1-4
- *    1.0.8rc1                 1    10008  2.1.0.8rc1
- *    1.0.8                    1    10008  2.1.0.8
- *    1.0.9beta1-6             1    10009  2.1.0.9beta1-6
- *    1.0.9rc1                 1    10009  2.1.0.9rc1
- *    1.0.9beta7-10            1    10009  2.1.0.9beta7-10
- *    1.0.9rc2                 1    10009  2.1.0.9rc2
- *    1.0.9                    1    10009  2.1.0.9
- *    1.0.10beta1              1    10010  2.1.0.10beta1
- *    1.0.10rc1                1    10010  2.1.0.10rc1
- *    1.0.10                   1    10010  2.1.0.10
- *    1.0.11beta1-3            1    10011  2.1.0.11beta1-3
- *    1.0.11rc1                1    10011  2.1.0.11rc1
- *    1.0.11                   1    10011  2.1.0.11
- *    1.0.12beta1-2            2    10012  2.1.0.12beta1-2
- *    1.0.12rc1                2    10012  2.1.0.12rc1
- *    1.0.12                   2    10012  2.1.0.12
- *    1.1.0a-f                 -    10100  2.1.1.0a-f (branch abandoned)
- *    1.2.0beta1-2             2    10200  2.1.2.0beta1-2
- *    1.2.0beta3-5             3    10200  3.1.2.0beta3-5
- *    1.2.0rc1                 3    10200  3.1.2.0rc1
- *    1.2.0                    3    10200  3.1.2.0
- *    1.2.1beta1-4             3    10201  3.1.2.1beta1-4
- *    1.2.1rc1-2               3    10201  3.1.2.1rc1-2
- *    1.2.1                    3    10201  3.1.2.1
- *    1.2.2beta1-6            12    10202  12.so.0.1.2.2beta1-6
- *    1.0.13beta1             10    10013  10.so.0.1.0.13beta1
- *    1.0.13rc1               10    10013  10.so.0.1.0.13rc1
- *    1.2.2rc1                12    10202  12.so.0.1.2.2rc1
- *    1.0.13                  10    10013  10.so.0.1.0.13
- *    1.2.2                   12    10202  12.so.0.1.2.2
- *    1.2.3rc1-6              12    10203  12.so.0.1.2.3rc1-6
- *    1.2.3                   12    10203  12.so.0.1.2.3
- *    1.2.4beta1-3            13    10204  12.so.0.1.2.4beta1-3
- *    1.0.14rc1               13    10014  10.so.0.1.0.14rc1
- *    1.2.4rc1                13    10204  12.so.0.1.2.4rc1
- *    1.0.14                  10    10014  10.so.0.1.0.14
- *    1.2.4                   13    10204  12.so.0.1.2.4
- *    1.2.5beta1-2            13    10205  12.so.0.1.2.5beta1-2
- *    1.0.15rc1-3             10    10015  10.so.0.1.0.15rc1-3
- *    1.2.5rc1-3              13    10205  12.so.0.1.2.5rc1-3
- *    1.0.15                  10    10015  10.so.0.1.0.15
- *    1.2.5                   13    10205  12.so.0.1.2.5
- *    1.2.6beta1-4            13    10206  12.so.0.1.2.6beta1-4
- *    1.0.16                  10    10016  10.so.0.1.0.16
- *    1.2.6                   13    10206  12.so.0.1.2.6
- *    1.2.7beta1-2            13    10207  12.so.0.1.2.7beta1-2
- *    1.0.17rc1               10    10017  12.so.0.1.0.17rc1
- *    1.2.7rc1                13    10207  12.so.0.1.2.7rc1
- *    1.0.17                  10    10017  12.so.0.1.0.17
- *    1.2.7                   13    10207  12.so.0.1.2.7
- *    1.2.8beta1-5            13    10208  12.so.0.1.2.8beta1-5
- *    1.0.18rc1-5             10    10018  12.so.0.1.0.18rc1-5
- *    1.2.8rc1-5              13    10208  12.so.0.1.2.8rc1-5
- *    1.0.18                  10    10018  12.so.0.1.0.18
- *    1.2.8                   13    10208  12.so.0.1.2.8
- *    1.2.9beta1-3            13    10209  12.so.0.1.2.9beta1-3
- *    1.2.9beta4-11           13    10209  12.so.0.9[.0]
- *    1.2.9rc1                13    10209  12.so.0.9[.0]
- *    1.2.9                   13    10209  12.so.0.9[.0]
- *    1.2.10beta1-7           13    10210  12.so.0.10[.0]
- *    1.2.10rc1-2             13    10210  12.so.0.10[.0]
- *    1.2.10                  13    10210  12.so.0.10[.0]
- *    1.4.0beta1-5            14    10400  14.so.0.0[.0]
- *    1.2.11beta1-4           13    10211  12.so.0.11[.0]
- *    1.4.0beta7-8            14    10400  14.so.0.0[.0]
- *    1.2.11                  13    10211  12.so.0.11[.0]
- *    1.2.12                  13    10212  12.so.0.12[.0]
- *    1.4.0beta9-14           14    10400  14.so.0.0[.0]
- *    1.2.13                  13    10213  12.so.0.13[.0]
- *    1.4.0beta15-36          14    10400  14.so.0.0[.0]
- *    1.4.0beta37-87          14    10400  14.so.14.0[.0]
- *    1.4.0rc01               14    10400  14.so.14.0[.0]
- *    1.4.0beta88-109         14    10400  14.so.14.0[.0]
- *    1.4.0rc02-08            14    10400  14.so.14.0[.0]
- *    1.4.0                   14    10400  14.so.14.0[.0]
- *    1.4.1beta01-03          14    10401  14.so.14.1[.0]
- *    1.4.1rc01               14    10401  14.so.14.1[.0]
- *    1.4.1beta04-12          14    10401  14.so.14.1[.0]
- *    1.4.1                   14    10401  14.so.14.1[.0]
- *    1.4.2                   14    10402  14.so.14.2[.0]
- *    1.4.3                   14    10403  14.so.14.3[.0]
- *    1.4.4                   14    10404  14.so.14.4[.0]
- *    1.5.0beta01-58          15    10500  15.so.15.0[.0]
- *    1.5.0rc01-07            15    10500  15.so.15.0[.0]
- *    1.5.0                   15    10500  15.so.15.0[.0]
- *    1.5.1beta01-11          15    10501  15.so.15.1[.0]
- *    1.5.1rc01-02            15    10501  15.so.15.1[.0]
- *    1.5.1                   15    10501  15.so.15.1[.0]
- *    1.5.2beta01-03          15    10502  15.so.15.2[.0]
- *    1.5.2rc01-03            15    10502  15.so.15.2[.0]
- *    1.5.2                   15    10502  15.so.15.2[.0]
- *    1.5.3beta01-10          15    10503  15.so.15.3[.0]
- *    1.5.3rc01-02            15    10503  15.so.15.3[.0]
- *    1.5.3beta11             15    10503  15.so.15.3[.0]
- *    1.5.3 [omitted]
- *    1.5.4beta01-08          15    10504  15.so.15.4[.0]
- *    1.5.4rc01               15    10504  15.so.15.4[.0]
- *    1.5.4                   15    10504  15.so.15.4[.0]
- *    1.5.5beta01-08          15    10505  15.so.15.5[.0]
- *    1.5.5rc01               15    10505  15.so.15.5[.0]
- *    1.5.5                   15    10505  15.so.15.5[.0]
- *    1.5.6beta01-07          15    10506  15.so.15.6[.0]
- *    1.5.6rc01-03            15    10506  15.so.15.6[.0]
- *    1.5.6                   15    10506  15.so.15.6[.0]
- *    1.5.7beta01-05          15    10507  15.so.15.7[.0]
- *    1.5.7rc01-03            15    10507  15.so.15.7[.0]
- *    1.5.7                   15    10507  15.so.15.7[.0]
- *
- *   Henceforth the source version will match the shared-library major
- *   and minor numbers; the shared-library major version number will be
- *   used for changes in backward compatibility, as it is intended.  The
- *   PNG_LIBPNG_VER macro, which is not used within libpng but is available
- *   for applications, is an unsigned integer of the form xyyzz corresponding
- *   to the source version x.y.z (leading zeros in y and z).  Beta versions
- *   were given the previous public release number plus a letter, until
- *   version 1.0.6j; from then on they were given the upcoming public
- *   release number plus "betaNN" or "rcN".
- *
- *   Binary incompatibility exists only when applications make direct access
- *   to the info_ptr or png_ptr members through png.h, and the compiled
- *   application is loaded with a different version of the library.
- *
- *   DLLNUM will change each time there are forward or backward changes
- *   in binary compatibility (e.g., when a new feature is added).
- *
- * See libpng-manual.txt or libpng.3 for more information.  The PNG
- * specification is available as a W3C Recommendation and as an ISO
- * Specification, <http://www.w3.org/TR/2003/REC-PNG-20031110/
- */
-
-/*
- * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
- *
- * If you modify libpng you may insert additional notices immediately following
- * this sentence.
- *
- * This code is released under the libpng license.
- *
- * libpng versions 1.2.6, August 15, 2004, through 1.5.7, December 15, 2011, are
- * Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-1.2.5
- * with the following individual added to the list of Contributing Authors:
- *
- *    Cosmin Truta
- *
- * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
- * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-1.0.6
- * with the following individuals added to the list of Contributing Authors:
- *
- *    Simon-Pierre Cadieux
- *    Eric S. Raymond
- *    Gilles Vollant
- *
- * and with the following additions to the disclaimer:
- *
- *    There is no warranty against interference with your enjoyment of the
- *    library or against infringement.  There is no warranty that our
- *    efforts or the library will fulfill any of your particular purposes
- *    or needs.  This library is provided with all faults, and the entire
- *    risk of satisfactory quality, performance, accuracy, and effort is with
- *    the user.
- *
- * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
- * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
- * distributed according to the same disclaimer and license as libpng-0.96,
- * with the following individuals added to the list of Contributing Authors:
- *
- *    Tom Lane
- *    Glenn Randers-Pehrson
- *    Willem van Schaik
- *
- * libpng versions 0.89, June 1996, through 0.96, May 1997, are
- * Copyright (c) 1996, 1997 Andreas Dilger
- * Distributed according to the same disclaimer and license as libpng-0.88,
- * with the following individuals added to the list of Contributing Authors:
- *
- *    John Bowler
- *    Kevin Bracey
- *    Sam Bushell
- *    Magnus Holmgren
- *    Greg Roelofs
- *    Tom Tanner
- *
- * libpng versions 0.5, May 1995, through 0.88, January 1996, are
- * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
- *
- * For the purposes of this copyright and license, "Contributing Authors"
- * is defined as the following set of individuals:
- *
- *    Andreas Dilger
- *    Dave Martindale
- *    Guy Eric Schalnat
- *    Paul Schmidt
- *    Tim Wegner
- *
- * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
- * and Group 42, Inc. disclaim all warranties, expressed or implied,
- * including, without limitation, the warranties of merchantability and of
- * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
- * assume no liability for direct, indirect, incidental, special, exemplary,
- * or consequential damages, which may result from the use of the PNG
- * Reference Library, even if advised of the possibility of such damage.
- *
- * Permission is hereby granted to use, copy, modify, and distribute this
- * source code, or portions hereof, for any purpose, without fee, subject
- * to the following restrictions:
- *
- *   1. The origin of this source code must not be misrepresented.
- *
- *   2. Altered versions must be plainly marked as such and must not
- *      be misrepresented as being the original source.
- *
- *   3. This Copyright notice may not be removed or altered from
- *      any source or altered source distribution.
- *
- * The Contributing Authors and Group 42, Inc. specifically permit, without
- * fee, and encourage the use of this source code as a component to
- * supporting the PNG file format in commercial products.  If you use this
- * source code in a product, acknowledgment is not required but would be
- * appreciated.
- */
-
-/*
- * A "png_get_copyright" function is available, for convenient use in "about"
- * boxes and the like:
- *
- *     printf("%s", png_get_copyright(NULL));
- *
- * Also, the PNG logo (in PNG format, of course) is supplied in the
- * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
- */
-
-/*
- * Libpng is OSI Certified Open Source Software.  OSI Certified is a
- * certification mark of the Open Source Initiative.
- */
-
-/*
- * The contributing authors would like to thank all those who helped
- * with testing, bug fixes, and patience.  This wouldn't have been
- * possible without all of you.
- *
- * Thanks to Frank J. T. Wojcik for helping with the documentation.
- */
-
-/*
- * Y2K compliance in libpng:
- * =========================
- *
- *    December 15, 2011
- *
- *    Since the PNG Development group is an ad-hoc body, we can't make
- *    an official declaration.
- *
- *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.5.7 are Y2K compliant.  It is my belief that
- *    earlier versions were also Y2K compliant.
- *
- *    Libpng only has two year fields.  One is a 2-byte unsigned integer
- *    that will hold years up to 65535.  The other holds the date in text
- *    format, and will hold years up to 9999.
- *
- *    The integer is
- *        "png_uint_16 year" in png_time_struct.
- *
- *    The string is
- *        "png_char time_buffer" in png_struct
- *
- *    There are seven time-related functions:
- *        png.c: png_convert_to_rfc_1123() in png.c
- *          (formerly png_convert_to_rfc_1152() in error)
- *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
- *        png_convert_from_time_t() in pngwrite.c
- *        png_get_tIME() in pngget.c
- *        png_handle_tIME() in pngrutil.c, called in pngread.c
- *        png_set_tIME() in pngset.c
- *        png_write_tIME() in pngwutil.c, called in pngwrite.c
- *
- *    All handle dates properly in a Y2K environment.  The
- *    png_convert_from_time_t() function calls gmtime() to convert from system
- *    clock time, which returns (year - 1900), which we properly convert to
- *    the full 4-digit year.  There is a possibility that applications using
- *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
- *    function, or that they are incorrectly passing only a 2-digit year
- *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
- *    but this is not under our control.  The libpng documentation has always
- *    stated that it works with 4-digit years, and the APIs have been
- *    documented as such.
- *
- *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
- *    integer to hold the year, and can hold years as large as 65535.
- *
- *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
- *    no date-related code.
- *
- *       Glenn Randers-Pehrson
- *       libpng maintainer
- *       PNG Development Group
- */
-
-#ifndef PNG_H
-#define PNG_H
-
-/* This is not the place to learn how to use libpng. The file libpng-manual.txt
- * describes how to use libpng, and the file example.c summarizes it
- * with some code on which to build.  This file is useful for looking
- * at the actual function definitions and structure components.
- *
- * If you just need to read a PNG file and don't want to read the documentation
- * skip to the end of this file and read the section entitled 'simplified API'.
- */
-
-/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.7"
-#define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.7 - December 15, 2011\n"
-
-#define PNG_LIBPNG_VER_SONUM   15
-#define PNG_LIBPNG_VER_DLLNUM  15
-
-/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
-#define PNG_LIBPNG_VER_MAJOR   1
-#define PNG_LIBPNG_VER_MINOR   5
-#define PNG_LIBPNG_VER_RELEASE 7
-
-/* This should match the numeric part of the final component of
- * PNG_LIBPNG_VER_STRING, omitting any leading zero:
- */
-
-#define PNG_LIBPNG_VER_BUILD  0
-
-/* Release Status */
-#define PNG_LIBPNG_BUILD_ALPHA    1
-#define PNG_LIBPNG_BUILD_BETA     2
-#define PNG_LIBPNG_BUILD_RC       3
-#define PNG_LIBPNG_BUILD_STABLE   4
-#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
-
-/* Release-Specific Flags */
-#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with
-                                       PNG_LIBPNG_BUILD_STABLE only */
-#define PNG_LIBPNG_BUILD_PRIVATE 16 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_SPECIAL */
-#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
-                                       PNG_LIBPNG_BUILD_PRIVATE */
-
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
-
-/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
- * We must not include leading zeros.
- * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
- * version 1.0.0 was mis-numbered 100 instead of 10000).  From
- * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
- */
-#define PNG_LIBPNG_VER 10507 /* 1.5.7 */
-
-/* Library configuration: these options cannot be changed after
- * the library has been built.
- */
-#ifndef PNGLCONF_H
-    /* If pnglibconf.h is missing, you can
-     * copy scripts/pnglibconf.h.prebuilt to pnglibconf.h
-     */
-#   include "pnglibconf.h"
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-#  ifndef PNG_BUILDING_SYMBOL_TABLE
-  /*
-   *   Standard header files (not needed for the version info or while
-   *   building symbol table -- see scripts/pnglibconf.dfa)
-   */
-#    ifdef PNG_SETJMP_SUPPORTED
-#      include <setjmp.h>
-#    endif
-
-    /* Need the time information for converting tIME chunks, it
-     * defines struct tm:
-     */
-#    ifdef PNG_CONVERT_tIME_SUPPORTED
-       /* "time.h" functions are not supported on all operating systems */
-#      include <time.h>
-#    endif
-#  endif
-
-/* Machine specific configuration. */
-#  include "pngconf.h"
-#endif
-
-/*
- * Added at libpng-1.2.8
- *
- * Ref MSDN: Private as priority over Special
- * VS_FF_PRIVATEBUILD File *was not* built using standard release
- * procedures. If this value is given, the StringFileInfo block must
- * contain a PrivateBuild string.
- *
- * VS_FF_SPECIALBUILD File *was* built by the original company using
- * standard release procedures but is a variation of the standard
- * file of the same version number. If this value is given, the
- * StringFileInfo block must contain a SpecialBuild string.
- */
-
-#ifdef PNG_USER_PRIVATEBUILD /* From pnglibconf.h */
-#  define PNG_LIBPNG_BUILD_TYPE \
-       (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_PRIVATE)
-#else
-#  ifdef PNG_LIBPNG_SPECIALBUILD
-#    define PNG_LIBPNG_BUILD_TYPE \
-         (PNG_LIBPNG_BUILD_BASE_TYPE | PNG_LIBPNG_BUILD_SPECIAL)
-#  else
-#    define PNG_LIBPNG_BUILD_TYPE (PNG_LIBPNG_BUILD_BASE_TYPE)
-#  endif
-#endif
-
-#ifndef PNG_VERSION_INFO_ONLY
-
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Version information for C files, stored in png.c.  This had better match
- * the version above.
- */
-#define png_libpng_ver png_get_header_ver(NULL)
-
-/* This file is arranged in several sections:
- *
- * 1. Any configuration options that can be specified by for the application
- *    code when it is built.  (Build time configuration is in pnglibconf.h)
- * 2. Type definitions (base types are defined in pngconf.h), structure
- *    definitions.
- * 3. Exported library functions.
- *
- * The library source code has additional files (principally pngpriv.h) that
- * allow configuration of the library.
- */
-/* Section 1: run time configuration
- * See pnglibconf.h for build time configuration
- *
- * Run time configuration allows the application to choose between
- * implementations of certain arithmetic APIs.  The default is set
- * at build time and recorded in pnglibconf.h, but it is safe to
- * override these (and only these) settings.  Note that this won't
- * change what the library does, only application code, and the
- * settings can (and probably should) be made on a per-file basis
- * by setting the #defines before including png.h
- *
- * Use macros to read integers from PNG data or use the exported
- * functions?
- *   PNG_USE_READ_MACROS: use the macros (see below)  Note that
- *     the macros evaluate their argument multiple times.
- *   PNG_NO_USE_READ_MACROS: call the relevant library function.
- *
- * Use the alternative algorithm for compositing alpha samples that
- * does not use division?
- *   PNG_READ_COMPOSITE_NODIV_SUPPORTED: use the 'no division'
- *      algorithm.
- *   PNG_NO_READ_COMPOSITE_NODIV: use the 'division' algorithm.
- *
- * How to handle benign errors if PNG_ALLOW_BENIGN_ERRORS is
- * false?
- *   PNG_ALLOW_BENIGN_ERRORS: map calls to the benign error
- *      APIs to png_warning.
- * Otherwise the calls are mapped to png_error.
- */
-
-/* Section 2: type definitions, including structures and compile time
- * constants.
- * See pngconf.h for base types that vary by machine/system
- */
-
-/* This triggers a compiler error in png.c, if png.c and png.h
- * do not agree upon the version number.
- */
-typedef char* png_libpng_version_1_5_7;
-
-/* Three color definitions.  The order of the red, green, and blue, (and the
- * exact size) is not important, although the size of the fields need to
- * be png_byte or png_uint_16 (as defined below).
- */
-typedef struct png_color_struct
-{
-   png_byte red;
-   png_byte green;
-   png_byte blue;
-} png_color;
-typedef png_color FAR * png_colorp;
-typedef PNG_CONST png_color FAR * png_const_colorp;
-typedef png_color FAR * FAR * png_colorpp;
-
-typedef struct png_color_16_struct
-{
-   png_byte index;    /* used for palette files */
-   png_uint_16 red;   /* for use in red green blue files */
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 gray;  /* for use in grayscale files */
-} png_color_16;
-typedef png_color_16 FAR * png_color_16p;
-typedef PNG_CONST png_color_16 FAR * png_const_color_16p;
-typedef png_color_16 FAR * FAR * png_color_16pp;
-
-typedef struct png_color_8_struct
-{
-   png_byte red;   /* for use in red green blue files */
-   png_byte green;
-   png_byte blue;
-   png_byte gray;  /* for use in grayscale files */
-   png_byte alpha; /* for alpha channel files */
-} png_color_8;
-typedef png_color_8 FAR * png_color_8p;
-typedef PNG_CONST png_color_8 FAR * png_const_color_8p;
-typedef png_color_8 FAR * FAR * png_color_8pp;
-
-/*
- * The following two structures are used for the in-core representation
- * of sPLT chunks.
- */
-typedef struct png_sPLT_entry_struct
-{
-   png_uint_16 red;
-   png_uint_16 green;
-   png_uint_16 blue;
-   png_uint_16 alpha;
-   png_uint_16 frequency;
-} png_sPLT_entry;
-typedef png_sPLT_entry FAR * png_sPLT_entryp;
-typedef PNG_CONST png_sPLT_entry FAR * png_const_sPLT_entryp;
-typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;
-
-/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
- *  occupy the LSB of their respective members, and the MSB of each member
- *  is zero-filled.  The frequency member always occupies the full 16 bits.
- */
-
-typedef struct png_sPLT_struct
-{
-   png_charp name;           /* palette name */
-   png_byte depth;           /* depth of palette samples */
-   png_sPLT_entryp entries;  /* palette entries */
-   png_int_32 nentries;      /* number of palette entries */
-} png_sPLT_t;
-typedef png_sPLT_t FAR * png_sPLT_tp;
-typedef PNG_CONST png_sPLT_t FAR * png_const_sPLT_tp;
-typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
- * and whether that contents is compressed or not.  The "key" field
- * points to a regular zero-terminated C string.  The "text" fields can be a
- * regular C string, an empty string, or a NULL pointer.
- * However, the structure returned by png_get_text() will always contain
- * the "text" field as a regular zero-terminated C string (possibly
- * empty), never a NULL pointer, so it can be safely used in printf() and
- * other string-handling functions.  Note that the "itxt_length", "lang", and
- * "lang_key" members of the structure only exist when the library is built
- * with iTXt chunk support.  Prior to libpng-1.4.0 the library was built by
- * default without iTXt support. Also note that when iTXt *is* supported,
- * the "lang" and "lang_key" fields contain NULL pointers when the
- * "compression" field contains * PNG_TEXT_COMPRESSION_NONE or
- * PNG_TEXT_COMPRESSION_zTXt. Note that the "compression value" is not the
- * same as what appears in the PNG tEXt/zTXt/iTXt chunk's "compression flag"
- * which is always 0 or 1, or its "compression method" which is always 0.
- */
-typedef struct png_text_struct
-{
-   int  compression;       /* compression value:
-                             -1: tEXt, none
-                              0: zTXt, deflate
-                              1: iTXt, none
-                              2: iTXt, deflate  */
-   png_charp key;          /* keyword, 1-79 character description of "text" */
-   png_charp text;         /* comment, may be an empty string (ie "")
-                              or a NULL pointer */
-   png_size_t text_length; /* length of the text string */
-   png_size_t itxt_length; /* length of the itxt string */
-   png_charp lang;         /* language code, 0-79 characters
-                              or a NULL pointer */
-   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
-                              chars or a NULL pointer */
-} png_text;
-typedef png_text FAR * png_textp;
-typedef PNG_CONST png_text FAR * png_const_textp;
-typedef png_text FAR * FAR * png_textpp;
-#endif
-
-/* Supported compression types for text in PNG files (tEXt, and zTXt).
- * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
-#define PNG_TEXT_COMPRESSION_NONE_WR -3
-#define PNG_TEXT_COMPRESSION_zTXt_WR -2
-#define PNG_TEXT_COMPRESSION_NONE    -1
-#define PNG_TEXT_COMPRESSION_zTXt     0
-#define PNG_ITXT_COMPRESSION_NONE     1
-#define PNG_ITXT_COMPRESSION_zTXt     2
-#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
-
-/* png_time is a way to hold the time in an machine independent way.
- * Two conversions are provided, both from time_t and struct tm.  There
- * is no portable way to convert to either of these structures, as far
- * as I know.  If you know of a portable way, send it to me.  As a side
- * note - PNG has always been Year 2000 compliant!
- */
-typedef struct png_time_struct
-{
-   png_uint_16 year; /* full year, as in, 1995 */
-   png_byte month;   /* month of year, 1 - 12 */
-   png_byte day;     /* day of month, 1 - 31 */
-   png_byte hour;    /* hour of day, 0 - 23 */
-   png_byte minute;  /* minute of hour, 0 - 59 */
-   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
-} png_time;
-typedef png_time FAR * png_timep;
-typedef PNG_CONST png_time FAR * png_const_timep;
-typedef png_time FAR * FAR * png_timepp;
-
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
-    defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-/* png_unknown_chunk is a structure to hold queued chunks for which there is
- * no specific support.  The idea is that we can use this to queue
- * up private chunks for output even though the library doesn't actually
- * know about their semantics.
- */
-typedef struct png_unknown_chunk_t
-{
-    png_byte name[5];
-    png_byte *data;
-    png_size_t size;
-
-    /* libpng-using applications should NOT directly modify this byte. */
-    png_byte location; /* mode of operation at read time */
-}
-
-
-png_unknown_chunk;
-typedef png_unknown_chunk FAR * png_unknown_chunkp;
-typedef PNG_CONST png_unknown_chunk FAR * png_const_unknown_chunkp;
-typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
-#endif
-
-/* Values for the unknown chunk location byte */
-
-#define PNG_HAVE_IHDR  0x01
-#define PNG_HAVE_PLTE  0x02
-#define PNG_AFTER_IDAT 0x08
-
-/* The complete definition of png_info has, as of libpng-1.5.0,
- * been moved into a separate header file that is not accessible to
- * applications.  Read libpng-manual.txt or libpng.3 for more info.
- */
-typedef struct png_info_def png_info;
-typedef png_info FAR * png_infop;
-typedef PNG_CONST png_info FAR * png_const_infop;
-typedef png_info FAR * FAR * png_infopp;
-
-/* Maximum positive integer used in PNG is (2^31)-1 */
-#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
-#define PNG_UINT_32_MAX ((png_uint_32)(-1))
-#define PNG_SIZE_MAX ((png_size_t)(-1))
-
-/* These are constants for fixed point values encoded in the
- * PNG specification manner (x100000)
- */
-#define PNG_FP_1    100000
-#define PNG_FP_HALF  50000
-#define PNG_FP_MAX  ((png_fixed_point)0x7fffffffL)
-#define PNG_FP_MIN  (-PNG_FP_MAX)
-
-/* These describe the color_type field in png_info. */
-/* color type masks */
-#define PNG_COLOR_MASK_PALETTE    1
-#define PNG_COLOR_MASK_COLOR      2
-#define PNG_COLOR_MASK_ALPHA      4
-
-/* color types.  Note that not all combinations are legal */
-#define PNG_COLOR_TYPE_GRAY 0
-#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
-#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
-#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
-#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
-/* aliases */
-#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
-#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
-
-/* This is for compression type. PNG 1.0-1.2 only define the single type. */
-#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
-#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
-
-/* This is for filter type. PNG 1.0-1.2 only define the single type. */
-#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
-#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
-#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
-
-/* These are for the interlacing type.  These values should NOT be changed. */
-#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
-#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
-#define PNG_INTERLACE_LAST        2 /* Not a valid value */
-
-/* These are for the oFFs chunk.  These values should NOT be changed. */
-#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
-#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
-#define PNG_OFFSET_LAST           2 /* Not a valid value */
-
-/* These are for the pCAL chunk.  These values should NOT be changed. */
-#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
-#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
-#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
-#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
-#define PNG_EQUATION_LAST         4 /* Not a valid value */
-
-/* These are for the sCAL chunk.  These values should NOT be changed. */
-#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
-#define PNG_SCALE_METER           1 /* meters per pixel */
-#define PNG_SCALE_RADIAN          2 /* radians per pixel */
-#define PNG_SCALE_LAST            3 /* Not a valid value */
-
-/* These are for the pHYs chunk.  These values should NOT be changed. */
-#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
-#define PNG_RESOLUTION_METER      1 /* pixels/meter */
-#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
-
-/* These are for the sRGB chunk.  These values should NOT be changed. */
-#define PNG_sRGB_INTENT_PERCEPTUAL 0
-#define PNG_sRGB_INTENT_RELATIVE   1
-#define PNG_sRGB_INTENT_SATURATION 2
-#define PNG_sRGB_INTENT_ABSOLUTE   3
-#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
-
-/* This is for text chunks */
-#define PNG_KEYWORD_MAX_LENGTH     79
-
-/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
-#define PNG_MAX_PALETTE_LENGTH    256
-
-/* These determine if an ancillary chunk's data has been successfully read
- * from the PNG header, or if the application has filled in the corresponding
- * data in the info_struct to be written into the output file.  The values
- * of the PNG_INFO_<chunk> defines should NOT be changed.
- */
-#define PNG_INFO_gAMA 0x0001
-#define PNG_INFO_sBIT 0x0002
-#define PNG_INFO_cHRM 0x0004
-#define PNG_INFO_PLTE 0x0008
-#define PNG_INFO_tRNS 0x0010
-#define PNG_INFO_bKGD 0x0020
-#define PNG_INFO_hIST 0x0040
-#define PNG_INFO_pHYs 0x0080
-#define PNG_INFO_oFFs 0x0100
-#define PNG_INFO_tIME 0x0200
-#define PNG_INFO_pCAL 0x0400
-#define PNG_INFO_sRGB 0x0800   /* GR-P, 0.96a */
-#define PNG_INFO_iCCP 0x1000   /* ESR, 1.0.6 */
-#define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
-#define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
-#define PNG_INFO_IDAT 0x8000   /* ESR, 1.0.6 */
-
-/* This is used for the transformation routines, as some of them
- * change these values for the row.  It also should enable using
- * the routines for other purposes.
- */
-typedef struct png_row_info_struct
-{
-   png_uint_32 width;    /* width of row */
-   png_size_t rowbytes;  /* number of bytes in row */
-   png_byte color_type;  /* color type of row */
-   png_byte bit_depth;   /* bit depth of row */
-   png_byte channels;    /* number of channels (1, 2, 3, or 4) */
-   png_byte pixel_depth; /* bits per pixel (depth * channels) */
-} png_row_info;
-
-typedef png_row_info FAR * png_row_infop;
-typedef png_row_info FAR * FAR * png_row_infopp;
-
-/* The complete definition of png_struct has, as of libpng-1.5.0,
- * been moved into a separate header file that is not accessible to
- * applications.  Read libpng-manual.txt or libpng.3 for more info.
- */
-typedef struct png_struct_def png_struct;
-typedef PNG_CONST png_struct FAR * png_const_structp;
-typedef png_struct FAR * png_structp;
-
-/* These are the function types for the I/O functions and for the functions
- * that allow the user to override the default I/O functions with his or her
- * own.  The png_error_ptr type should match that of user-supplied warning
- * and error functions, while the png_rw_ptr type should match that of the
- * user read/write data functions.  Note that the 'write' function must not
- * modify the buffer it is passed. The 'read' function, on the other hand, is
- * expected to return the read data in the buffer.
- */
-typedef PNG_CALLBACK(void, *png_error_ptr, (png_structp, png_const_charp));
-typedef PNG_CALLBACK(void, *png_rw_ptr, (png_structp, png_bytep, png_size_t));
-typedef PNG_CALLBACK(void, *png_flush_ptr, (png_structp));
-typedef PNG_CALLBACK(void, *png_read_status_ptr, (png_structp, png_uint_32,
-    int));
-typedef PNG_CALLBACK(void, *png_write_status_ptr, (png_structp, png_uint_32,
-    int));
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
-typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
-
-/* The following callback receives png_uint_32 row_number, int pass for the
- * png_bytep data of the row.  When transforming an interlaced image the
- * row number is the row number within the sub-image of the interlace pass, so
- * the value will increase to the height of the sub-image (not the full image)
- * then reset to 0 for the next pass.
- *
- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to
- * find the output pixel (x,y) given an interlaced sub-image pixel
- * (row,col,pass).  (See below for these macros.)
- */
-typedef PNG_CALLBACK(void, *png_progressive_row_ptr, (png_structp, png_bytep,
-    png_uint_32, int));
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-typedef PNG_CALLBACK(void, *png_user_transform_ptr, (png_structp, png_row_infop,
-    png_bytep));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
-    png_unknown_chunkp));
-#endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-typedef PNG_CALLBACK(void, *png_unknown_chunk_ptr, (png_structp));
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* This must match the function definition in <setjmp.h>, and the application
- * must include this before png.h to obtain the definition of jmp_buf.  The
- * function is required to be PNG_NORETURN, but this is not checked.  If the
- * function does return the application will crash via an abort() or similar
- * system level call.
- *
- * If you get a warning here while building the library you may need to make
- * changes to ensure that pnglibconf.h records the calling convention used by
- * your compiler.  This may be very difficult - try using a different compiler
- * to build the library!
- */
-PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
-#endif
-
-/* Transform masks for the high-level interface */
-#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
-#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
-#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
-#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
-#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
-#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
-#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
-#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
-#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
-#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
-#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
-#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
-#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* write only */
-/* Added to libpng-1.2.34 */
-#define PNG_TRANSFORM_STRIP_FILLER_BEFORE PNG_TRANSFORM_STRIP_FILLER
-#define PNG_TRANSFORM_STRIP_FILLER_AFTER 0x1000 /* write only */
-/* Added to libpng-1.4.0 */
-#define PNG_TRANSFORM_GRAY_TO_RGB   0x2000      /* read only */
-/* Added to libpng-1.5.4 */
-#define PNG_TRANSFORM_EXPAND_16     0x4000      /* read only */
-#define PNG_TRANSFORM_SCALE_16      0x8000      /* read only */
-
-/* Flags for MNG supported features */
-#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
-#define PNG_FLAG_MNG_FILTER_64      0x04
-#define PNG_ALL_MNG_FEATURES        0x05
-
-/* NOTE: prior to 1.5 these functions had no 'API' style declaration,
- * this allowed the zlib default functions to be used on Windows
- * platforms.  In 1.5 the zlib default malloc (which just calls malloc and
- * ignores the first argument) should be completely compatible with the
- * following.
- */
-typedef PNG_CALLBACK(png_voidp, *png_malloc_ptr, (png_structp,
-    png_alloc_size_t));
-typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp));
-
-typedef png_struct FAR * FAR * png_structpp;
-
-/* Section 3: exported functions
- * Here are the function definitions most commonly used.  This is not
- * the place to find out how to use libpng.  See libpng-manual.txt for the
- * full explanation, see example.c for the summary.  This just provides
- * a simple one line description of the use of each function.
- *
- * The PNG_EXPORT() and PNG_EXPORTA() macros used below are defined in
- * pngconf.h and in the *.dfn files in the scripts directory.
- *
- *   PNG_EXPORT(ordinal, type, name, (args));
- *
- *       ordinal:    ordinal that is used while building
- *                   *.def files. The ordinal value is only
- *                   relevant when preprocessing png.h with
- *                   the *.dfn files for building symbol table
- *                   entries, and are removed by pngconf.h.
- *       type:       return type of the function
- *       name:       function name
- *       args:       function arguments, with types
- *
- * When we wish to append attributes to a function prototype we use
- * the PNG_EXPORTA() macro instead.
- *
- *   PNG_EXPORTA(ordinal, type, name, (args), attributes);
- *
- *       ordinal, type, name, and args: same as in PNG_EXPORT().
- *       attributes: function attributes
- */
-
-/* Returns the version number of the library */
-PNG_EXPORT(1, png_uint_32, png_access_version_number, (void));
-
-/* Tell lib we have already handled the first <num_bytes> magic bytes.
- * Handling more than 8 bytes from the beginning of the file is an error.
- */
-PNG_EXPORT(2, void, png_set_sig_bytes, (png_structp png_ptr, int num_bytes));
-
-/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
- * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
- * signature, and non-zero otherwise.  Having num_to_check == 0 or
- * start > 7 will always fail (ie return non-zero).
- */
-PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, png_size_t start,
-    png_size_t num_to_check));
-
-/* Simple signature checking function.  This is the same as calling
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
- */
-#define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))
-
-/* Allocate and initialize png_ptr struct for reading, and any other memory. */
-PNG_EXPORTA(4, png_structp, png_create_read_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),
-    PNG_ALLOCATED);
-
-/* Allocate and initialize png_ptr struct for writing, and any other memory */
-PNG_EXPORTA(5, png_structp, png_create_write_struct,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn),
-    PNG_ALLOCATED);
-
-PNG_EXPORT(6, png_size_t, png_get_compression_buffer_size,
-    (png_const_structp png_ptr));
-
-PNG_EXPORT(7, void, png_set_compression_buffer_size, (png_structp png_ptr,
-    png_size_t size));
-
-/* Moved from pngconf.h in 1.4.0 and modified to ensure setjmp/longjmp
- * match up.
- */
-#ifdef PNG_SETJMP_SUPPORTED
-/* This function returns the jmp_buf built in to *png_ptr.  It must be
- * supplied with an appropriate 'longjmp' function to use on that jmp_buf
- * unless the default error function is overridden in which case NULL is
- * acceptable.  The size of the jmp_buf is checked against the actual size
- * allocated by the library - the call will return NULL on a mismatch
- * indicating an ABI mismatch.
- */
-PNG_EXPORT(8, jmp_buf*, png_set_longjmp_fn, (png_structp png_ptr,
-    png_longjmp_ptr longjmp_fn, size_t jmp_buf_size));
-#  define png_jmpbuf(png_ptr) \
-      (*png_set_longjmp_fn((png_ptr), longjmp, sizeof (jmp_buf)))
-#else
-#  define png_jmpbuf(png_ptr) \
-      (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)
-#endif
-/* This function should be used by libpng applications in place of
- * longjmp(png_ptr->jmpbuf, val).  If longjmp_fn() has been set, it
- * will use it; otherwise it will call PNG_ABORT().  This function was
- * added in libpng-1.5.0.
- */
-PNG_EXPORTA(9, void, png_longjmp, (png_structp png_ptr, int val),
-    PNG_NORETURN);
-
-#ifdef PNG_READ_SUPPORTED
-/* Reset the compression stream */
-PNG_EXPORT(10, int, png_reset_zstream, (png_structp png_ptr));
-#endif
-
-/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(11, png_structp, png_create_read_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
-PNG_EXPORTA(12, png_structp, png_create_write_struct_2,
-    (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn,
-    png_error_ptr warn_fn,
-    png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),
-    PNG_ALLOCATED);
-#endif
-
-/* Write the PNG file signature. */
-PNG_EXPORT(13, void, png_write_sig, (png_structp png_ptr));
-
-/* Write a PNG chunk - size, type, (optional) data, CRC. */
-PNG_EXPORT(14, void, png_write_chunk, (png_structp png_ptr, png_const_bytep
-    chunk_name, png_const_bytep data, png_size_t length));
-
-/* Write the start of a PNG chunk - length and chunk name. */
-PNG_EXPORT(15, void, png_write_chunk_start, (png_structp png_ptr,
-    png_const_bytep chunk_name, png_uint_32 length));
-
-/* Write the data of a PNG chunk started with png_write_chunk_start(). */
-PNG_EXPORT(16, void, png_write_chunk_data, (png_structp png_ptr,
-    png_const_bytep data, png_size_t length));
-
-/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
-PNG_EXPORT(17, void, png_write_chunk_end, (png_structp png_ptr));
-
-/* Allocate and initialize the info structure */
-PNG_EXPORTA(18, png_infop, png_create_info_struct, (png_structp png_ptr),
-    PNG_ALLOCATED);
-
-PNG_EXPORT(19, void, png_info_init_3, (png_infopp info_ptr,
-    png_size_t png_info_struct_size));
-
-/* Writes all the PNG information before the image. */
-PNG_EXPORT(20, void, png_write_info_before_PLTE,
-    (png_structp png_ptr, png_infop info_ptr));
-PNG_EXPORT(21, void, png_write_info,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data. */
-PNG_EXPORT(22, void, png_read_info,
-    (png_structp png_ptr, png_infop info_ptr));
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-PNG_EXPORT(23, png_const_charp, png_convert_to_rfc1123,
-    (png_structp png_ptr,
-    png_const_timep ptime));
-#endif
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-/* Convert from a struct tm to png_time */
-PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
-    PNG_CONST struct tm FAR * ttime));
-
-/* Convert from time_t to png_time.  Uses gmtime() */
-PNG_EXPORT(25, void, png_convert_from_time_t,
-    (png_timep ptime, time_t ttime));
-#endif /* PNG_CONVERT_tIME_SUPPORTED */
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
-PNG_EXPORT(26, void, png_set_expand, (png_structp png_ptr));
-PNG_EXPORT(27, void, png_set_expand_gray_1_2_4_to_8, (png_structp png_ptr));
-PNG_EXPORT(28, void, png_set_palette_to_rgb, (png_structp png_ptr));
-PNG_EXPORT(29, void, png_set_tRNS_to_alpha, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-/* Expand to 16-bit channels, forces conversion of palette to RGB and expansion
- * of a tRNS chunk if present.
- */
-PNG_EXPORT(221, void, png_set_expand_16, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Use blue, green, red order for pixels. */
-PNG_EXPORT(30, void, png_set_bgr, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-/* Expand the grayscale to 24-bit RGB if necessary. */
-PNG_EXPORT(31, void, png_set_gray_to_rgb, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB to grayscale. */
-#define PNG_ERROR_ACTION_NONE  1
-#define PNG_ERROR_ACTION_WARN  2
-#define PNG_ERROR_ACTION_ERROR 3
-#define PNG_RGB_TO_GRAY_DEFAULT (-1)/*for red/green coefficients*/
-
-PNG_FP_EXPORT(32, void, png_set_rgb_to_gray, (png_structp png_ptr,
-    int error_action, double red, double green));
-PNG_FIXED_EXPORT(33, void, png_set_rgb_to_gray_fixed, (png_structp png_ptr,
-    int error_action, png_fixed_point red, png_fixed_point green));
-
-PNG_EXPORT(34, png_byte, png_get_rgb_to_gray_status, (png_const_structp
-    png_ptr));
-#endif
-
-#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth,
-    png_colorp palette));
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-/* How the alpha channel is interpreted - this affects how the color channels of
- * a PNG file are returned when an alpha channel, or tRNS chunk in a palette
- * file, is present.
- *
- * This has no effect on the way pixels are written into a PNG output
- * datastream. The color samples in a PNG datastream are never premultiplied
- * with the alpha samples.
- *
- * The default is to return data according to the PNG specification: the alpha
- * channel is a linear measure of the contribution of the pixel to the
- * corresponding composited pixel.  The gamma encoded color channels must be
- * scaled according to the contribution and to do this it is necessary to undo
- * the encoding, scale the color values, perform the composition and reencode
- * the values.  This is the 'PNG' mode.
- *
- * The alternative is to 'associate' the alpha with the color information by
- * storing color channel values that have been scaled by the alpha.  The
- * advantage is that the color channels can be resampled (the image can be
- * scaled) in this form.  The disadvantage is that normal practice is to store
- * linear, not (gamma) encoded, values and this requires 16-bit channels for
- * still images rather than the 8-bit channels that are just about sufficient if
- * gamma encoding is used.  In addition all non-transparent pixel values,
- * including completely opaque ones, must be gamma encoded to produce the final
- * image.  This is the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' mode (the
- * latter being the two common names for associated alpha color channels.)
- *
- * Since it is not necessary to perform arithmetic on opaque color values so
- * long as they are not to be resampled and are in the final color space it is
- * possible to optimize the handling of alpha by storing the opaque pixels in
- * the PNG format (adjusted for the output color space) while storing partially
- * opaque pixels in the standard, linear, format.  The accuracy required for
- * standard alpha composition is relatively low, because the pixels are
- * isolated, therefore typically the accuracy loss in storing 8-bit linear
- * values is acceptable.  (This is not true if the alpha channel is used to
- * simulate transparency over large areas - use 16 bits or the PNG mode in
- * this case!)  This is the 'OPTIMIZED' mode.  For this mode a pixel is
- * treated as opaque only if the alpha value is equal to the maximum value.
- *
- * The final choice is to gamma encode the alpha channel as well.  This is
- * broken because, in practice, no implementation that uses this choice
- * correctly undoes the encoding before handling alpha composition.  Use this
- * choice only if other serious errors in the software or hardware you use
- * mandate it; the typical serious error is for dark halos to appear around
- * opaque areas of the composited PNG image because of arithmetic overflow.
- *
- * The API function png_set_alpha_mode specifies which of these choices to use
- * with an enumerated 'mode' value and the gamma of the required output:
- */
-#define PNG_ALPHA_PNG           0 /* according to the PNG standard */
-#define PNG_ALPHA_STANDARD      1 /* according to Porter/Duff */
-#define PNG_ALPHA_ASSOCIATED    1 /* as above; this is the normal practice */
-#define PNG_ALPHA_PREMULTIPLIED 1 /* as above */
-#define PNG_ALPHA_OPTIMIZED     2 /* 'PNG' for opaque pixels, else 'STANDARD' */
-#define PNG_ALPHA_BROKEN        3 /* the alpha channel is gamma encoded */
-
-PNG_FP_EXPORT(227, void, png_set_alpha_mode, (png_structp png_ptr, int mode,
-    double output_gamma));
-PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structp png_ptr,
-    int mode, png_fixed_point output_gamma));
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-/* The output_gamma value is a screen gamma in libpng terminology: it expresses
- * how to decode the output values, not how they are encoded.  The values used
- * correspond to the normal numbers used to describe the overall gamma of a
- * computer display system; for example 2.2 for an sRGB conformant system.  The
- * values are scaled by 100000 in the _fixed version of the API (so 220000 for
- * sRGB.)
- *
- * The inverse of the value is always used to provide a default for the PNG file
- * encoding if it has no gAMA chunk and if png_set_gamma() has not been called
- * to override the PNG gamma information.
- *
- * When the ALPHA_OPTIMIZED mode is selected the output gamma is used to encode
- * opaque pixels however pixels with lower alpha values are not encoded,
- * regardless of the output gamma setting.
- *
- * When the standard Porter Duff handling is requested with mode 1 the output
- * encoding is set to be linear and the output_gamma value is only relevant
- * as a default for input data that has no gamma information.  The linear output
- * encoding will be overridden if png_set_gamma() is called - the results may be
- * highly unexpected!
- *
- * The following numbers are derived from the sRGB standard and the research
- * behind it.  sRGB is defined to be approximated by a PNG gAMA chunk value of
- * 0.45455 (1/2.2) for PNG.  The value implicitly includes any viewing
- * correction required to take account of any differences in the color
- * environment of the original scene and the intended display environment; the
- * value expresses how to *decode* the image for display, not how the original
- * data was *encoded*.
- *
- * sRGB provides a peg for the PNG standard by defining a viewing environment.
- * sRGB itself, and earlier TV standards, actually use a more complex transform
- * (a linear portion then a gamma 2.4 power law) than PNG can express.  (PNG is
- * limited to simple power laws.)  By saying that an image for direct display on
- * an sRGB conformant system should be stored with a gAMA chunk value of 45455
- * (11.3.3.2 and 11.3.3.5 of the ISO PNG specification) the PNG specification
- * makes it possible to derive values for other display systems and
- * environments.
- *
- * The Mac value is deduced from the sRGB based on an assumption that the actual
- * extra viewing correction used in early Mac display systems was implemented as
- * a power 1.45 lookup table.
- *
- * Any system where a programmable lookup table is used or where the behavior of
- * the final display device characteristics can be changed requires system
- * specific code to obtain the current characteristic.  However this can be
- * difficult and most PNG gamma correction only requires an approximate value.
- *
- * By default, if png_set_alpha_mode() is not called, libpng assumes that all
- * values are unencoded, linear, values and that the output device also has a
- * linear characteristic.  This is only very rarely correct - it is invariably
- * better to call png_set_alpha_mode() with PNG_DEFAULT_sRGB than rely on the
- * default if you don't know what the right answer is!
- *
- * The special value PNG_GAMMA_MAC_18 indicates an older Mac system (pre Mac OS
- * 10.6) which used a correction table to implement a somewhat lower gamma on an
- * otherwise sRGB system.
- *
- * Both these values are reserved (not simple gamma values) in order to allow
- * more precise correction internally in the future.
- *
- * NOTE: the following values can be passed to either the fixed or floating
- * point APIs, but the floating point API will also accept floating point
- * values.
- */
-#define PNG_DEFAULT_sRGB -1       /* sRGB gamma and color space */
-#define PNG_GAMMA_MAC_18 -2       /* Old Mac '1.8' gamma and color space */
-#define PNG_GAMMA_sRGB   220000   /* Television standards--matches sRGB gamma */
-#define PNG_GAMMA_LINEAR PNG_FP_1 /* Linear */
-#endif
-
-/* The following are examples of calls to png_set_alpha_mode to achieve the
- * required overall gamma correction and, where necessary, alpha
- * premultiplication.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);
- *    This is the default libpng handling of the alpha channel - it is not
- *    pre-multiplied into the color components.  In addition the call states
- *    that the output is for a sRGB system and causes all PNG files without gAMA
- *    chunks to be assumed to be encoded using sRGB.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
- *    In this case the output is assumed to be something like an sRGB conformant
- *    display preceeded by a power-law lookup table of power 1.45.  This is how
- *    early Mac systems behaved.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR);
- *    This is the classic Jim Blinn approach and will work in academic
- *    environments where everything is done by the book.  It has the shortcoming
- *    of assuming that input PNG data with no gamma information is linear - this
- *    is unlikely to be correct unless the PNG files where generated locally.
- *    Most of the time the output precision will be so low as to show
- *    significant banding in dark areas of the image.
- *
- * png_set_expand_16(pp);
- * png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB);
- *    This is a somewhat more realistic Jim Blinn inspired approach.  PNG files
- *    are assumed to have the sRGB encoding if not marked with a gamma value and
- *    the output is always 16 bits per component.  This permits accurate scaling
- *    and processing of the data.  If you know that your input PNG files were
- *    generated locally you might need to replace PNG_DEFAULT_sRGB with the
- *    correct value for your system.
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_OPTIMIZED, PNG_DEFAULT_sRGB);
- *    If you just need to composite the PNG image onto an existing background
- *    and if you control the code that does this you can use the optimization
- *    setting.  In this case you just copy completely opaque pixels to the
- *    output.  For pixels that are not completely transparent (you just skip
- *    those) you do the composition math using png_composite or png_composite_16
- *    below then encode the resultant 8-bit or 16-bit values to match the output
- *    encoding.
- *
- * Other cases
- *    If neither the PNG nor the standard linear encoding work for you because
- *    of the software or hardware you use then you have a big problem.  The PNG
- *    case will probably result in halos around the image.  The linear encoding
- *    will probably result in a washed out, too bright, image (it's actually too
- *    contrasty.)  Try the ALPHA_OPTIMIZED mode above - this will probably
- *    substantially reduce the halos.  Alternatively try:
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_BROKEN, PNG_DEFAULT_sRGB);
- *    This option will also reduce the halos, but there will be slight dark
- *    halos round the opaque parts of the image where the background is light.
- *    In the OPTIMIZED mode the halos will be light halos where the background
- *    is dark.  Take your pick - the halos are unavoidable unless you can get
- *    your hardware/software fixed!  (The OPTIMIZED approach is slightly
- *    faster.)
- *
- * When the default gamma of PNG files doesn't match the output gamma.
- *    If you have PNG files with no gamma information png_set_alpha_mode allows
- *    you to provide a default gamma, but it also sets the ouput gamma to the
- *    matching value.  If you know your PNG files have a gamma that doesn't
- *    match the output you can take advantage of the fact that
- *    png_set_alpha_mode always sets the output gamma but only sets the PNG
- *    default if it is not already set:
- *
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB);
- * png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC);
- *    The first call sets both the default and the output gamma values, the
- *    second call overrides the output gamma without changing the default.  This
- *    is easier than achieving the same effect with png_set_gamma.  You must use
- *    PNG_ALPHA_PNG for the first call - internal checking in png_set_alpha will
- *    fire if more than one call to png_set_alpha_mode and png_set_background is
- *    made in the same read operation, however multiple calls with PNG_ALPHA_PNG
- *    are ignored.
- */
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-PNG_EXPORT(36, void, png_set_strip_alpha, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-PNG_EXPORT(37, void, png_set_swap_alpha, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-PNG_EXPORT(38, void, png_set_invert_alpha, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
-PNG_EXPORT(39, void, png_set_filler, (png_structp png_ptr, png_uint_32 filler,
-    int flags));
-/* The values of the PNG_FILLER_ defines should NOT be changed */
-#  define PNG_FILLER_BEFORE 0
-#  define PNG_FILLER_AFTER 1
-/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
-PNG_EXPORT(40, void, png_set_add_alpha,
-    (png_structp png_ptr, png_uint_32 filler,
-    int flags));
-#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swap bytes in 16-bit depth files. */
-PNG_EXPORT(41, void, png_set_swap, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
-PNG_EXPORT(42, void, png_set_packing, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
-    defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-/* Swap packing order of pixels in bytes. */
-PNG_EXPORT(43, void, png_set_packswap, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-/* Converts files to legal bit depths. */
-PNG_EXPORT(44, void, png_set_shift, (png_structp png_ptr, png_const_color_8p
-    true_bits));
-#endif
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-    defined(PNG_WRITE_INTERLACING_SUPPORTED)
-/* Have the code handle the interlacing.  Returns the number of passes.
- * MUST be called before png_read_update_info or png_start_read_image,
- * otherwise it will not have the desired effect.  Note that it is still
- * necessary to call png_read_row or png_read_rows png_get_image_height
- * times for each pass.
-*/
-PNG_EXPORT(45, int, png_set_interlace_handling, (png_structp png_ptr));
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-/* Invert monochrome files */
-PNG_EXPORT(46, void, png_set_invert_mono, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS by replacing with a background color.  Prior to
- * libpng-1.5.4 this API must not be called before the PNG file header has been
- * read.  Doing so will result in unexpected behavior and possible warnings or
- * errors if the PNG file contains a bKGD chunk.
- */
-PNG_FP_EXPORT(47, void, png_set_background, (png_structp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, double background_gamma));
-PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, png_fixed_point background_gamma));
-#endif
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-#  define PNG_BACKGROUND_GAMMA_UNKNOWN 0
-#  define PNG_BACKGROUND_GAMMA_SCREEN  1
-#  define PNG_BACKGROUND_GAMMA_FILE    2
-#  define PNG_BACKGROUND_GAMMA_UNIQUE  3
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-/* Scale a 16-bit depth file down to 8-bit, accurately. */
-PNG_EXPORT(229, void, png_set_scale_16, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_16_TO_8 SUPPORTED /* Name prior to 1.5.4 */
-/* Strip the second byte of information from a 16-bit depth file. */
-PNG_EXPORT(48, void, png_set_strip_16, (png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* Turn on quantizing, and reduce the palette to the number of colors
- * available.
- */
-PNG_EXPORT(49, void, png_set_quantize,
-    (png_structp png_ptr, png_colorp palette,
-    int num_palette, int maximum_colors, png_const_uint_16p histogram,
-    int full_quantize));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* The threshold on gamma processing is configurable but hard-wired into the
- * library.  The following is the floating point variant.
- */
-#define PNG_GAMMA_THRESHOLD (PNG_GAMMA_THRESHOLD_FIXED*.00001)
-
-/* Handle gamma correction. Screen_gamma=(display_exponent).
- * NOTE: this API simply sets the screen and file gamma values. It will
- * therefore override the value for gamma in a PNG file if it is called after
- * the file header has been read - use with care  - call before reading the PNG
- * file for best results!
- *
- * These routines accept the same gamma values as png_set_alpha_mode (described
- * above).  The PNG_GAMMA_ defines and PNG_DEFAULT_sRGB can be passed to either
- * API (floating point or fixed.)  Notice, however, that the 'file_gamma' value
- * is the inverse of a 'screen gamma' value.
- */
-PNG_FP_EXPORT(50, void, png_set_gamma,
-    (png_structp png_ptr, double screen_gamma,
-    double override_file_gamma));
-PNG_FIXED_EXPORT(208, void, png_set_gamma_fixed, (png_structp png_ptr,
-    png_fixed_point screen_gamma, png_fixed_point override_file_gamma));
-#endif
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-/* Set how many lines between output flushes - 0 for no flushing */
-PNG_EXPORT(51, void, png_set_flush, (png_structp png_ptr, int nrows));
-/* Flush the current PNG output buffer */
-PNG_EXPORT(52, void, png_write_flush, (png_structp png_ptr));
-#endif
-
-/* Optional update palette with requested transformations */
-PNG_EXPORT(53, void, png_start_read_image, (png_structp png_ptr));
-
-/* Optional call to update the users info structure */
-PNG_EXPORT(54, void, png_read_update_info,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data. */
-PNG_EXPORT(55, void, png_read_rows, (png_structp png_ptr, png_bytepp row,
-    png_bytepp display_row, png_uint_32 num_rows));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read a row of data. */
-PNG_EXPORT(56, void, png_read_row, (png_structp png_ptr, png_bytep row,
-    png_bytep display_row));
-#endif
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the whole image into memory at once. */
-PNG_EXPORT(57, void, png_read_image, (png_structp png_ptr, png_bytepp image));
-#endif
-
-/* Write a row of image data */
-PNG_EXPORT(58, void, png_write_row,
-    (png_structp png_ptr, png_const_bytep row));
-
-/* Write a few rows of image data: (*row) is not written; however, the type
- * is declared as writeable to maintain compatibility with previous versions
- * of libpng and to allow the 'display_row' array from read_rows to be passed
- * unchanged to write_rows.
- */
-PNG_EXPORT(59, void, png_write_rows, (png_structp png_ptr, png_bytepp row,
-    png_uint_32 num_rows));
-
-/* Write the image data */
-PNG_EXPORT(60, void, png_write_image,
-    (png_structp png_ptr, png_bytepp image));
-
-/* Write the end of the PNG file. */
-PNG_EXPORT(61, void, png_write_end,
-    (png_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file. */
-PNG_EXPORT(62, void, png_read_end, (png_structp png_ptr, png_infop info_ptr));
-#endif
-
-/* Free any memory associated with the png_info_struct */
-PNG_EXPORT(63, void, png_destroy_info_struct, (png_structp png_ptr,
-    png_infopp info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(64, void, png_destroy_read_struct, (png_structpp png_ptr_ptr,
-    png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
-
-/* Free any memory associated with the png_struct and the png_info_structs */
-PNG_EXPORT(65, void, png_destroy_write_struct, (png_structpp png_ptr_ptr,
-    png_infopp info_ptr_ptr));
-
-/* Set the libpng method of handling chunk CRC errors */
-PNG_EXPORT(66, void, png_set_crc_action,
-    (png_structp png_ptr, int crit_action, int ancil_action));
-
-/* Values for png_set_crc_action() say how to handle CRC errors in
- * ancillary and critical chunks, and whether to use the data contained
- * therein.  Note that it is impossible to "discard" data in a critical
- * chunk.  For versions prior to 0.90, the action was always error/quit,
- * whereas in version 0.90 and later, the action for CRC errors in ancillary
- * chunks is warn/discard.  These values should NOT be changed.
- *
- *      value                       action:critical     action:ancillary
- */
-#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
-#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
-#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
-#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
-#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
-#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
-
-/* These functions give the user control over the scan-line filtering in
- * libpng and the compression methods used by zlib.  These functions are
- * mainly useful for testing, as the defaults should work with most users.
- * Those users who are tight on memory or want faster performance at the
- * expense of compression can modify them.  See the compression library
- * header file (zlib.h) for an explination of the compression functions.
- */
-
-/* Set the filtering method(s) used by libpng.  Currently, the only valid
- * value for "method" is 0.
- */
-PNG_EXPORT(67, void, png_set_filter,
-    (png_structp png_ptr, int method, int filters));
-
-/* Flags for png_set_filter() to say which filters to use.  The flags
- * are chosen so that they don't conflict with real filter types
- * below, in case they are supplied instead of the #defined constants.
- * These values should NOT be changed.
- */
-#define PNG_NO_FILTERS     0x00
-#define PNG_FILTER_NONE    0x08
-#define PNG_FILTER_SUB     0x10
-#define PNG_FILTER_UP      0x20
-#define PNG_FILTER_AVG     0x40
-#define PNG_FILTER_PAETH   0x80
-#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
-                         PNG_FILTER_AVG | PNG_FILTER_PAETH)
-
-/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
- * These defines should NOT be changed.
- */
-#define PNG_FILTER_VALUE_NONE  0
-#define PNG_FILTER_VALUE_SUB   1
-#define PNG_FILTER_VALUE_UP    2
-#define PNG_FILTER_VALUE_AVG   3
-#define PNG_FILTER_VALUE_PAETH 4
-#define PNG_FILTER_VALUE_LAST  5
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* EXPERIMENTAL */
-/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_
- * defines, either the default (minimum-sum-of-absolute-differences), or
- * the experimental method (weighted-minimum-sum-of-absolute-differences).
- *
- * Weights are factors >= 1.0, indicating how important it is to keep the
- * filter type consistent between rows.  Larger numbers mean the current
- * filter is that many times as likely to be the same as the "num_weights"
- * previous filters.  This is cumulative for each previous row with a weight.
- * There needs to be "num_weights" values in "filter_weights", or it can be
- * NULL if the weights aren't being specified.  Weights have no influence on
- * the selection of the first row filter.  Well chosen weights can (in theory)
- * improve the compression for a given image.
- *
- * Costs are factors >= 1.0 indicating the relative decoding costs of a
- * filter type.  Higher costs indicate more decoding expense, and are
- * therefore less likely to be selected over a filter with lower computational
- * costs.  There needs to be a value in "filter_costs" for each valid filter
- * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't
- * setting the costs.  Costs try to improve the speed of decompression without
- * unduly increasing the compressed image size.
- *
- * A negative weight or cost indicates the default value is to be used, and
- * values in the range [0.0, 1.0) indicate the value is to remain unchanged.
- * The default values for both weights and costs are currently 1.0, but may
- * change if good general weighting/cost heuristics can be found.  If both
- * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
- * to the UNWEIGHTED method, but with added encoding time/computation.
- */
-PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structp png_ptr,
-    int heuristic_method, int num_weights, png_const_doublep filter_weights,
-    png_const_doublep filter_costs));
-PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
-    (png_structp png_ptr,
-    int heuristic_method, int num_weights, png_const_fixed_point_p
-    filter_weights, png_const_fixed_point_p filter_costs));
-#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
-
-/* Heuristic used for row filter selection.  These defines should NOT be
- * changed.
- */
-#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
-#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
-#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
-#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
-
-#ifdef PNG_WRITE_SUPPORTED
-/* Set the library compression level.  Currently, valid values range from
- * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
- * (0 - no compression, 9 - "maximal" compression).  Note that tests have
- * shown that zlib compression levels 3-6 usually perform as well as level 9
- * for PNG images, and do considerably fewer caclulations.  In the future,
- * these values may not correspond directly to the zlib compression levels.
- */
-PNG_EXPORT(69, void, png_set_compression_level,
-    (png_structp png_ptr, int level));
-
-PNG_EXPORT(70, void, png_set_compression_mem_level, (png_structp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(71, void, png_set_compression_strategy, (png_structp png_ptr,
-    int strategy));
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structp png_ptr,
-    int window_bits));
-
-PNG_EXPORT(73, void, png_set_compression_method, (png_structp png_ptr,
-    int method));
-#endif
-
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-/* Also set zlib parameters for compressing non-IDAT chunks */
-PNG_EXPORT(222, void, png_set_text_compression_level,
-    (png_structp png_ptr, int level));
-
-PNG_EXPORT(223, void, png_set_text_compression_mem_level, (png_structp png_ptr,
-    int mem_level));
-
-PNG_EXPORT(224, void, png_set_text_compression_strategy, (png_structp png_ptr,
-    int strategy));
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-PNG_EXPORT(225, void, png_set_text_compression_window_bits, (png_structp
-    png_ptr, int window_bits));
-
-PNG_EXPORT(226, void, png_set_text_compression_method, (png_structp png_ptr,
-    int method));
-#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
-
-/* These next functions are called for input/output, memory, and error
- * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,
- * and call standard C I/O routines such as fread(), fwrite(), and
- * fprintf().  These functions can be made to use other I/O routines
- * at run time for those applications that need to handle I/O in a
- * different manner by calling png_set_???_fn().  See libpng-manual.txt for
- * more information.
- */
-
-#ifdef PNG_STDIO_SUPPORTED
-/* Initialize the input/output for the PNG file to the default functions. */
-PNG_EXPORT(74, void, png_init_io, (png_structp png_ptr, png_FILE_p fp));
-#endif
-
-/* Replace the (error and abort), and warning functions with user
- * supplied functions.  If no messages are to be printed you must still
- * write and use replacement functions. The replacement error_fn should
- * still do a longjmp to the last setjmp location if you are using this
- * method of error handling.  If error_fn or warning_fn is NULL, the
- * default function will be used.
- */
-
-PNG_EXPORT(75, void, png_set_error_fn,
-    (png_structp png_ptr, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warning_fn));
-
-/* Return the user pointer associated with the error functions */
-PNG_EXPORT(76, png_voidp, png_get_error_ptr, (png_const_structp png_ptr));
-
-/* Replace the default data output functions with a user supplied one(s).
- * If buffered output is not used, then output_flush_fn can be set to NULL.
- * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
- * output_flush_fn will be ignored (and thus can be NULL).
- * It is probably a mistake to use NULL for output_flush_fn if
- * write_data_fn is not also NULL unless you have built libpng with
- * PNG_WRITE_FLUSH_SUPPORTED undefined, because in this case libpng's
- * default flush function, which uses the standard *FILE structure, will
- * be used.
- */
-PNG_EXPORT(77, void, png_set_write_fn, (png_structp png_ptr, png_voidp io_ptr,
-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
-
-/* Replace the default data input function with a user supplied one. */
-PNG_EXPORT(78, void, png_set_read_fn, (png_structp png_ptr, png_voidp io_ptr,
-    png_rw_ptr read_data_fn));
-
-/* Return the user pointer associated with the I/O functions */
-PNG_EXPORT(79, png_voidp, png_get_io_ptr, (png_structp png_ptr));
-
-PNG_EXPORT(80, void, png_set_read_status_fn, (png_structp png_ptr,
-    png_read_status_ptr read_row_fn));
-
-PNG_EXPORT(81, void, png_set_write_status_fn, (png_structp png_ptr,
-    png_write_status_ptr write_row_fn));
-
-#ifdef PNG_USER_MEM_SUPPORTED
-/* Replace the default memory allocation functions with user supplied one(s). */
-PNG_EXPORT(82, void, png_set_mem_fn, (png_structp png_ptr, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn));
-/* Return the user pointer associated with the memory functions */
-PNG_EXPORT(83, png_voidp, png_get_mem_ptr, (png_const_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(84, void, png_set_read_user_transform_fn, (png_structp png_ptr,
-    png_user_transform_ptr read_user_transform_fn));
-#endif
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-PNG_EXPORT(85, void, png_set_write_user_transform_fn, (png_structp png_ptr,
-    png_user_transform_ptr write_user_transform_fn));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-PNG_EXPORT(86, void, png_set_user_transform_info, (png_structp png_ptr,
-    png_voidp user_transform_ptr, int user_transform_depth,
-    int user_transform_channels));
-/* Return the user pointer associated with the user transform functions */
-PNG_EXPORT(87, png_voidp, png_get_user_transform_ptr,
-    (png_const_structp png_ptr));
-#endif
-
-#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
-/* Return information about the row currently being processed.  Note that these
- * APIs do not fail but will return unexpected results if called outside a user
- * transform callback.  Also note that when transforming an interlaced image the
- * row number is the row number within the sub-image of the interlace pass, so
- * the value will increase to the height of the sub-image (not the full image)
- * then reset to 0 for the next pass.
- *
- * Use PNG_ROW_FROM_PASS_ROW(row, pass) and PNG_COL_FROM_PASS_COL(col, pass) to
- * find the output pixel (x,y) given an interlaced sub-image pixel
- * (row,col,pass).  (See below for these macros.)
- */
-PNG_EXPORT(217, png_uint_32, png_get_current_row_number, (png_const_structp));
-PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structp));
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-PNG_EXPORT(88, void, png_set_read_user_chunk_fn, (png_structp png_ptr,
-    png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
-PNG_EXPORT(89, png_voidp, png_get_user_chunk_ptr, (png_const_structp png_ptr));
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-/* Sets the function callbacks for the push reader, and a pointer to a
- * user-defined structure available to the callback functions.
- */
-PNG_EXPORT(90, void, png_set_progressive_read_fn, (png_structp png_ptr,
-    png_voidp progressive_ptr, png_progressive_info_ptr info_fn,
-    png_progressive_row_ptr row_fn, png_progressive_end_ptr end_fn));
-
-/* Returns the user pointer associated with the push read functions */
-PNG_EXPORT(91, png_voidp, png_get_progressive_ptr, (png_const_structp png_ptr));
-
-/* Function to be called when data becomes available */
-PNG_EXPORT(92, void, png_process_data,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_bytep buffer, png_size_t buffer_size));
-
-/* A function which may be called *only* within png_process_data to stop the
- * processing of any more data.  The function returns the number of bytes
- * remaining, excluding any that libpng has cached internally.  A subsequent
- * call to png_process_data must supply these bytes again.  If the argument
- * 'save' is set to true the routine will first save all the pending data and
- * will always return 0.
- */
-PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structp, int save));
-
-/* A function which may be called *only* outside (after) a call to
- * png_process_data.  It returns the number of bytes of data to skip in the
- * input.  Normally it will return 0, but if it returns a non-zero value the
- * application must skip than number of bytes of input data and pass the
- * following data to the next call to png_process_data.
- */
-PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structp));
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-/* Function that combines rows.  'new_row' is a flag that should come from
- * the callback and be non-NULL if anything needs to be done; the library
- * stores its own version of the new data internally and ignores the passed
- * in value.
- */
-PNG_EXPORT(93, void, png_progressive_combine_row, (png_structp png_ptr,
-    png_bytep old_row, png_const_bytep new_row));
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-PNG_EXPORTA(94, png_voidp, png_malloc,
-    (png_structp png_ptr, png_alloc_size_t size),
-    PNG_ALLOCATED);
-/* Added at libpng version 1.4.0 */
-PNG_EXPORTA(95, png_voidp, png_calloc,
-    (png_structp png_ptr, png_alloc_size_t size),
-    PNG_ALLOCATED);
-
-/* Added at libpng version 1.2.4 */
-PNG_EXPORTA(96, png_voidp, png_malloc_warn, (png_structp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-
-/* Frees a pointer allocated by png_malloc() */
-PNG_EXPORT(97, void, png_free, (png_structp png_ptr, png_voidp ptr));
-
-/* Free data that was allocated internally */
-PNG_EXPORT(98, void, png_free_data,
-    (png_structp png_ptr, png_infop info_ptr, png_uint_32 free_me, int num));
-
-/* Reassign responsibility for freeing existing data, whether allocated
- * by libpng or by the application */
-PNG_EXPORT(99, void, png_data_freer,
-    (png_structp png_ptr, png_infop info_ptr, int freer, png_uint_32 mask));
-
-/* Assignments for png_data_freer */
-#define PNG_DESTROY_WILL_FREE_DATA 1
-#define PNG_SET_WILL_FREE_DATA 1
-#define PNG_USER_WILL_FREE_DATA 2
-/* Flags for png_ptr->free_me and info_ptr->free_me */
-#define PNG_FREE_HIST 0x0008
-#define PNG_FREE_ICCP 0x0010
-#define PNG_FREE_SPLT 0x0020
-#define PNG_FREE_ROWS 0x0040
-#define PNG_FREE_PCAL 0x0080
-#define PNG_FREE_SCAL 0x0100
-#define PNG_FREE_UNKN 0x0200
-#define PNG_FREE_LIST 0x0400
-#define PNG_FREE_PLTE 0x1000
-#define PNG_FREE_TRNS 0x2000
-#define PNG_FREE_TEXT 0x4000
-#define PNG_FREE_ALL  0x7fff
-#define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
-
-#ifdef PNG_USER_MEM_SUPPORTED
-PNG_EXPORTA(100, png_voidp, png_malloc_default, (png_structp png_ptr,
-    png_alloc_size_t size), PNG_ALLOCATED);
-PNG_EXPORT(101, void, png_free_default, (png_structp png_ptr, png_voidp ptr));
-#endif
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(102, void, png_error,
-    (png_structp png_ptr, png_const_charp error_message),
-    PNG_NORETURN);
-
-/* The same, but the chunk name is prepended to the error string. */
-PNG_EXPORTA(103, void, png_chunk_error, (png_structp png_ptr,
-    png_const_charp error_message), PNG_NORETURN);
-
-#else
-/* Fatal error in PNG image of libpng - can't continue */
-PNG_EXPORTA(104, void, png_err, (png_structp png_ptr), PNG_NORETURN);
-#endif
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* Non-fatal error in libpng.  Can continue, but may have a problem. */
-PNG_EXPORT(105, void, png_warning, (png_structp png_ptr,
-    png_const_charp warning_message));
-
-/* Non-fatal error in libpng, chunk name is prepended to message. */
-PNG_EXPORT(106, void, png_chunk_warning, (png_structp png_ptr,
-    png_const_charp warning_message));
-#endif
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-/* Benign error in libpng.  Can continue, but may have a problem.
- * User can choose whether to handle as a fatal error or as a warning. */
-#  undef png_benign_error
-PNG_EXPORT(107, void, png_benign_error, (png_structp png_ptr,
-    png_const_charp warning_message));
-
-/* Same, chunk name is prepended to message. */
-#  undef png_chunk_benign_error
-PNG_EXPORT(108, void, png_chunk_benign_error, (png_structp png_ptr,
-    png_const_charp warning_message));
-
-PNG_EXPORT(109, void, png_set_benign_errors,
-    (png_structp png_ptr, int allowed));
-#else
-#  ifdef PNG_ALLOW_BENIGN_ERRORS
-#    define png_benign_error png_warning
-#    define png_chunk_benign_error png_chunk_warning
-#  else
-#    define png_benign_error png_error
-#    define png_chunk_benign_error png_chunk_error
-#  endif
-#endif
-
-/* The png_set_<chunk> functions are for storing values in the png_info_struct.
- * Similarly, the png_get_<chunk> calls are used to read values from the
- * png_info_struct, either storing the parameters in the passed variables, or
- * setting pointers into the png_info_struct where the data is stored.  The
- * png_get_<chunk> functions return a non-zero value if the data was available
- * in info_ptr, or return zero and do not change any of the parameters if the
- * data was not available.
- *
- * These functions should be used instead of directly accessing png_info
- * to avoid problems with future changes in the size and internal layout of
- * png_info_struct.
- */
-/* Returns "flag" if chunk data is valid in info_ptr. */
-PNG_EXPORT(110, png_uint_32, png_get_valid,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 flag));
-
-/* Returns number of bytes needed to hold a transformed row. */
-PNG_EXPORT(111, png_size_t, png_get_rowbytes, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* Returns row_pointers, which is an array of pointers to scanlines that was
- * returned from png_read_png().
- */
-PNG_EXPORT(112, png_bytepp, png_get_rows,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-/* Set row_pointers, which is an array of pointers to scanlines for use
- * by png_write_png().
- */
-PNG_EXPORT(113, void, png_set_rows, (png_structp png_ptr,
-    png_infop info_ptr, png_bytepp row_pointers));
-#endif
-
-/* Returns number of color channels in image. */
-PNG_EXPORT(114, png_byte, png_get_channels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Returns image width in pixels. */
-PNG_EXPORT(115, png_uint_32, png_get_image_width, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image height in pixels. */
-PNG_EXPORT(116, png_uint_32, png_get_image_height, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image bit_depth. */
-PNG_EXPORT(117, png_byte, png_get_bit_depth,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns image color_type. */
-PNG_EXPORT(118, png_byte, png_get_color_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image filter_type. */
-PNG_EXPORT(119, png_byte, png_get_filter_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image interlace_type. */
-PNG_EXPORT(120, png_byte, png_get_interlace_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image compression_type. */
-PNG_EXPORT(121, png_byte, png_get_compression_type, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-
-/* Returns image resolution in pixels per meter, from pHYs chunk data. */
-PNG_EXPORT(122, png_uint_32, png_get_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(123, png_uint_32, png_get_x_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(124, png_uint_32, png_get_y_pixels_per_meter,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
-PNG_FP_EXPORT(125, float, png_get_pixel_aspect_ratio,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_FIXED_EXPORT(210, png_fixed_point, png_get_pixel_aspect_ratio_fixed,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
-PNG_EXPORT(126, png_int_32, png_get_x_offset_pixels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(127, png_int_32, png_get_y_offset_pixels,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-#endif /* PNG_EASY_ACCESS_SUPPORTED */
-
-/* Returns pointer to signature string read from PNG header */
-PNG_EXPORT(130, png_const_bytep, png_get_signature,
-    (png_const_structp png_ptr, png_infop info_ptr));
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(131, png_uint_32, png_get_bKGD,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_color_16p *background));
-#endif
-
-#ifdef PNG_bKGD_SUPPORTED
-PNG_EXPORT(132, void, png_set_bKGD, (png_structp png_ptr, png_infop info_ptr,
-    png_const_color_16p background));
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(133, png_uint_32, png_get_cHRM, (png_const_structp png_ptr,
-   png_const_infop info_ptr, double *white_x, double *white_y, double *red_x,
-    double *red_y, double *green_x, double *green_y, double *blue_x,
-    double *blue_y));
-PNG_FP_EXPORT(230, png_uint_32, png_get_cHRM_XYZ, (png_structp png_ptr,
-    png_const_infop info_ptr, double *red_X, double *red_Y, double *red_Z,
-    double *green_X, double *green_Y, double *green_Z, double *blue_X,
-    double *blue_Y, double *blue_Z));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* Otherwise not implemented */
-PNG_FIXED_EXPORT(134, png_uint_32, png_get_cHRM_fixed,
-    (png_const_structp png_ptr,
-    png_const_infop info_ptr, png_fixed_point *int_white_x,
-    png_fixed_point *int_white_y, png_fixed_point *int_red_x,
-    png_fixed_point *int_red_y, png_fixed_point *int_green_x,
-    png_fixed_point *int_green_y, png_fixed_point *int_blue_x,
-    png_fixed_point *int_blue_y));
-#endif
-PNG_FIXED_EXPORT(231, png_uint_32, png_get_cHRM_XYZ_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-    png_fixed_point *int_blue_Z));
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-PNG_FP_EXPORT(135, void, png_set_cHRM,
-    (png_structp png_ptr, png_infop info_ptr,
-    double white_x, double white_y, double red_x, double red_y, double green_x,
-    double green_y, double blue_x, double blue_y));
-PNG_FP_EXPORT(232, void, png_set_cHRM_XYZ, (png_structp png_ptr,
-    png_infop info_ptr, double red_X, double red_Y, double red_Z,
-    double green_X, double green_Y, double green_Z, double blue_X,
-    double blue_Y, double blue_Z));
-PNG_FIXED_EXPORT(136, void, png_set_cHRM_fixed, (png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_white_x,
-    png_fixed_point int_white_y, png_fixed_point int_red_x,
-    png_fixed_point int_red_y, png_fixed_point int_green_x,
-    png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y));
-PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_red_X, png_fixed_point int_red_Y,
-    png_fixed_point int_red_Z, png_fixed_point int_green_X,
-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-    png_fixed_point int_blue_Z));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(137, png_uint_32, png_get_gAMA,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    double *file_gamma));
-PNG_FIXED_EXPORT(138, png_uint_32, png_get_gAMA_fixed,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_file_gamma));
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-PNG_FP_EXPORT(139, void, png_set_gAMA, (png_structp png_ptr,
-    png_infop info_ptr, double file_gamma));
-PNG_FIXED_EXPORT(140, void, png_set_gAMA_fixed, (png_structp png_ptr,
-    png_infop info_ptr, png_fixed_point int_file_gamma));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(141, png_uint_32, png_get_hIST,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_16p *hist));
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-PNG_EXPORT(142, void, png_set_hIST, (png_structp png_ptr,
-    png_infop info_ptr, png_const_uint_16p hist));
-#endif
-
-PNG_EXPORT(143, png_uint_32, png_get_IHDR,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type,
-    int *interlace_method, int *compression_method, int *filter_method));
-
-PNG_EXPORT(144, void, png_set_IHDR,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 width, png_uint_32 height, int bit_depth, int color_type,
-    int interlace_method, int compression_method, int filter_method));
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(145, png_uint_32, png_get_oFFs,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type));
-#endif
-
-#ifdef PNG_oFFs_SUPPORTED
-PNG_EXPORT(146, void, png_set_oFFs,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_int_32 offset_x, png_int_32 offset_y, int unit_type));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(147, png_uint_32, png_get_pCAL,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type,
-    int *nparams,
-    png_charp *units, png_charpp *params));
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-PNG_EXPORT(148, void, png_set_pCAL, (png_structp png_ptr,
-    png_infop info_ptr,
-    png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,
-    int nparams, png_const_charp units, png_charpp params));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(149, png_uint_32, png_get_pHYs,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(150, void, png_set_pHYs,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 res_x, png_uint_32 res_y, int unit_type));
-#endif
-
-PNG_EXPORT(151, png_uint_32, png_get_PLTE,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_colorp *palette, int *num_palette));
-
-PNG_EXPORT(152, void, png_set_PLTE,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_colorp palette, int num_palette));
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(153, png_uint_32, png_get_sBIT,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_color_8p *sig_bit));
-#endif
-
-#ifdef PNG_sBIT_SUPPORTED
-PNG_EXPORT(154, void, png_set_sBIT,
-    (png_structp png_ptr, png_infop info_ptr, png_const_color_8p sig_bit));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(155, png_uint_32, png_get_sRGB, (png_const_structp png_ptr,
-    png_const_infop info_ptr, int *file_srgb_intent));
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_EXPORT(156, void, png_set_sRGB,
-    (png_structp png_ptr, png_infop info_ptr, int srgb_intent));
-PNG_EXPORT(157, void, png_set_sRGB_gAMA_and_cHRM, (png_structp png_ptr,
-    png_infop info_ptr, int srgb_intent));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(158, png_uint_32, png_get_iCCP,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_charpp name, int *compression_type, png_bytepp profile,
-    png_uint_32 *proflen));
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-PNG_EXPORT(159, void, png_set_iCCP,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_charp name, int compression_type, png_const_bytep profile,
-    png_uint_32 proflen));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(160, png_uint_32, png_get_sPLT,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_sPLT_tpp entries));
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-PNG_EXPORT(161, void, png_set_sPLT,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_sPLT_tp entries, int nentries));
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-/* png_get_text also returns the number of text chunks in *num_text */
-PNG_EXPORT(162, png_uint_32, png_get_text,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    png_textp *text_ptr, int *num_text));
-#endif
-
-/* Note while png_set_text() will accept a structure whose text,
- * language, and  translated keywords are NULL pointers, the structure
- * returned by png_get_text will always contain regular
- * zero-terminated C strings.  They might be empty strings but
- * they will never be NULL pointers.
- */
-
-#ifdef PNG_TEXT_SUPPORTED
-PNG_EXPORT(163, void, png_set_text,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_textp text_ptr, int num_text));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(164, png_uint_32, png_get_tIME,
-    (png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time));
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-PNG_EXPORT(165, void, png_set_tIME,
-    (png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(166, png_uint_32, png_get_tRNS,
-    (png_const_structp png_ptr, png_infop info_ptr,
-    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color));
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-PNG_EXPORT(167, void, png_set_tRNS,
-    (png_structp png_ptr, png_infop info_ptr,
-    png_const_bytep trans_alpha, int num_trans,
-    png_const_color_16p trans_color));
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-PNG_FP_EXPORT(168, png_uint_32, png_get_sCAL,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    int *unit, double *width, double *height));
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-/* NOTE: this API is currently implemented using floating point arithmetic,
- * consequently it can only be used on systems with floating point support.
- * In any case the range of values supported by png_fixed_point is small and it
- * is highly recommended that png_get_sCAL_s be used instead.
- */
-PNG_FIXED_EXPORT(214, png_uint_32, png_get_sCAL_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr, int *unit,
-    png_fixed_point *width,
-    png_fixed_point *height));
-#endif
-PNG_EXPORT(169, png_uint_32, png_get_sCAL_s,
-    (png_const_structp png_ptr, png_const_infop info_ptr,
-    int *unit, png_charpp swidth, png_charpp sheight));
-
-PNG_FP_EXPORT(170, void, png_set_sCAL,
-    (png_structp png_ptr, png_infop info_ptr,
-    int unit, double width, double height));
-PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_structp png_ptr,
-   png_infop info_ptr, int unit, png_fixed_point width,
-   png_fixed_point height));
-PNG_EXPORT(171, void, png_set_sCAL_s,
-    (png_structp png_ptr, png_infop info_ptr,
-    int unit, png_const_charp swidth, png_const_charp sheight));
-#endif /* PNG_sCAL_SUPPORTED */
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-/* Provide a list of chunks and how they are to be handled, if the built-in
-   handling or default unknown chunk handling is not desired.  Any chunks not
-   listed will be handled in the default manner.  The IHDR and IEND chunks
-   must not be listed.  Because this turns off the default handling for chunks
-   that would otherwise be recognized the behavior of libpng transformations may
-   well become incorrect!
-      keep = 0: PNG_HANDLE_CHUNK_AS_DEFAULT: follow default behavior
-           = 1: PNG_HANDLE_CHUNK_NEVER:      do not keep
-           = 2: PNG_HANDLE_CHUNK_IF_SAFE:    keep only if safe-to-copy
-           = 3: PNG_HANDLE_CHUNK_ALWAYS:     keep even if unsafe-to-copy
-*/
-PNG_EXPORT(172, void, png_set_keep_unknown_chunks,
-    (png_structp png_ptr, int keep,
-    png_const_bytep chunk_list, int num_chunks));
-
-/* The handling code is returned; the result is therefore true (non-zero) if
- * special handling is required, false for the default handling.
- */
-PNG_EXPORT(173, int, png_handle_as_unknown, (png_structp png_ptr,
-    png_const_bytep chunk_name));
-#endif
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-PNG_EXPORT(174, void, png_set_unknown_chunks, (png_structp png_ptr,
-    png_infop info_ptr, png_const_unknown_chunkp unknowns,
-    int num_unknowns));
-PNG_EXPORT(175, void, png_set_unknown_chunk_location,
-    (png_structp png_ptr, png_infop info_ptr, int chunk, int location));
-PNG_EXPORT(176, int, png_get_unknown_chunks, (png_const_structp png_ptr,
-    png_const_infop info_ptr, png_unknown_chunkpp entries));
-#endif
-
-/* Png_free_data() will turn off the "valid" flag for anything it frees.
- * If you need to turn it off for a chunk that your application has freed,
- * you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK);
- */
-PNG_EXPORT(177, void, png_set_invalid,
-    (png_structp png_ptr, png_infop info_ptr, int mask));
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-/* The "params" pointer is currently not used and is for future expansion. */
-PNG_EXPORT(178, void, png_read_png, (png_structp png_ptr, png_infop info_ptr,
-    int transforms, png_voidp params));
-PNG_EXPORT(179, void, png_write_png, (png_structp png_ptr, png_infop info_ptr,
-    int transforms, png_voidp params));
-#endif
-
-PNG_EXPORT(180, png_const_charp, png_get_copyright,
-    (png_const_structp png_ptr));
-PNG_EXPORT(181, png_const_charp, png_get_header_ver,
-    (png_const_structp png_ptr));
-PNG_EXPORT(182, png_const_charp, png_get_header_version,
-    (png_const_structp png_ptr));
-PNG_EXPORT(183, png_const_charp, png_get_libpng_ver,
-    (png_const_structp png_ptr));
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXPORT(184, png_uint_32, png_permit_mng_features, (png_structp png_ptr,
-    png_uint_32 mng_features_permitted));
-#endif
-
-/* For use in png_set_keep_unknown, added to version 1.2.6 */
-#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
-#define PNG_HANDLE_CHUNK_NEVER        1
-#define PNG_HANDLE_CHUNK_IF_SAFE      2
-#define PNG_HANDLE_CHUNK_ALWAYS       3
-
-/* Strip the prepended error numbers ("#nnn ") from error and warning
- * messages before passing them to the error or warning handler.
- */
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-PNG_EXPORT(185, void, png_set_strip_error_numbers,
-    (png_structp png_ptr,
-    png_uint_32 strip_mode));
-#endif
-
-/* Added in libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-PNG_EXPORT(186, void, png_set_user_limits, (png_structp png_ptr,
-    png_uint_32 user_width_max, png_uint_32 user_height_max));
-PNG_EXPORT(187, png_uint_32, png_get_user_width_max,
-    (png_const_structp png_ptr));
-PNG_EXPORT(188, png_uint_32, png_get_user_height_max,
-    (png_const_structp png_ptr));
-/* Added in libpng-1.4.0 */
-PNG_EXPORT(189, void, png_set_chunk_cache_max, (png_structp png_ptr,
-    png_uint_32 user_chunk_cache_max));
-PNG_EXPORT(190, png_uint_32, png_get_chunk_cache_max,
-    (png_const_structp png_ptr));
-/* Added in libpng-1.4.1 */
-PNG_EXPORT(191, void, png_set_chunk_malloc_max, (png_structp png_ptr,
-    png_alloc_size_t user_chunk_cache_max));
-PNG_EXPORT(192, png_alloc_size_t, png_get_chunk_malloc_max,
-    (png_const_structp png_ptr));
-#endif
-
-#if defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-PNG_EXPORT(193, png_uint_32, png_get_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_EXPORT(194, png_uint_32, png_get_x_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_EXPORT(195, png_uint_32, png_get_y_pixels_per_inch,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-
-PNG_FP_EXPORT(196, float, png_get_x_offset_inches,
-    (png_const_structp png_ptr, png_const_infop info_ptr));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(211, png_fixed_point, png_get_x_offset_inches_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr));
-#endif
-
-PNG_FP_EXPORT(197, float, png_get_y_offset_inches, (png_const_structp png_ptr,
-    png_const_infop info_ptr));
-#ifdef PNG_FIXED_POINT_SUPPORTED /* otherwise not implemented. */
-PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
-    (png_structp png_ptr, png_const_infop info_ptr));
-#endif
-
-#  ifdef PNG_pHYs_SUPPORTED
-PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structp png_ptr,
-    png_const_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
-    int *unit_type));
-#  endif /* PNG_pHYs_SUPPORTED */
-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */
-
-/* Added in libpng-1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-PNG_EXPORT(199, png_uint_32, png_get_io_state, (png_structp png_ptr));
-
-PNG_EXPORTA(200, png_const_bytep, png_get_io_chunk_name,
-    (png_structp png_ptr), PNG_DEPRECATED);
-PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
-    (png_const_structp png_ptr));
-
-/* The flags returned by png_get_io_state() are the following: */
-#  define PNG_IO_NONE        0x0000   /* no I/O at this moment */
-#  define PNG_IO_READING     0x0001   /* currently reading */
-#  define PNG_IO_WRITING     0x0002   /* currently writing */
-#  define PNG_IO_SIGNATURE   0x0010   /* currently at the file signature */
-#  define PNG_IO_CHUNK_HDR   0x0020   /* currently at the chunk header */
-#  define PNG_IO_CHUNK_DATA  0x0040   /* currently at the chunk data */
-#  define PNG_IO_CHUNK_CRC   0x0080   /* currently at the chunk crc */
-#  define PNG_IO_MASK_OP     0x000f   /* current operation: reading/writing */
-#  define PNG_IO_MASK_LOC    0x00f0   /* current location: sig/hdr/data/crc */
-#endif /* ?PNG_IO_STATE_SUPPORTED */
-
-/* Interlace support.  The following macros are always defined so that if
- * libpng interlace handling is turned off the macros may be used to handle
- * interlaced images within the application.
- */
-#define PNG_INTERLACE_ADAM7_PASSES 7
-
-/* Two macros to return the first row and first column of the original,
- * full, image which appears in a given pass.  'pass' is in the range 0
- * to 6 and the result is in the range 0 to 7.
- */
-#define PNG_PASS_START_ROW(pass) (((1&~(pass))<<(3-((pass)>>1)))&7)
-#define PNG_PASS_START_COL(pass) (((1& (pass))<<(3-(((pass)+1)>>1)))&7)
-
-/* A macro to return the offset between pixels in the output row for a pair of
- * pixels in the input - effectively the inverse of the 'COL_SHIFT' macro that
- * follows.  Note that ROW_OFFSET is the offset from one row to the next whereas
- * COL_OFFSET is from one column to the next, within a row.
- */
-#define PNG_PASS_ROW_OFFSET(pass) ((pass)>2?(8>>(((pass)-1)>>1)):8)
-#define PNG_PASS_COL_OFFSET(pass) (1<<((7-(pass))>>1))
-
-/* Two macros to help evaluate the number of rows or columns in each
- * pass.  This is expressed as a shift - effectively log2 of the number or
- * rows or columns in each 8x8 tile of the original image.
- */
-#define PNG_PASS_ROW_SHIFT(pass) ((pass)>2?(8-(pass))>>1:3)
-#define PNG_PASS_COL_SHIFT(pass) ((pass)>1?(7-(pass))>>1:3)
-
-/* Hence two macros to determine the number of rows or columns in a given
- * pass of an image given its height or width.  In fact these macros may
- * return non-zero even though the sub-image is empty, because the other
- * dimension may be empty for a small image.
- */
-#define PNG_PASS_ROWS(height, pass) (((height)+(((1<<PNG_PASS_ROW_SHIFT(pass))\
-   -1)-PNG_PASS_START_ROW(pass)))>>PNG_PASS_ROW_SHIFT(pass))
-#define PNG_PASS_COLS(width, pass) (((width)+(((1<<PNG_PASS_COL_SHIFT(pass))\
-   -1)-PNG_PASS_START_COL(pass)))>>PNG_PASS_COL_SHIFT(pass))
-
-/* For the reader row callbacks (both progressive and sequential) it is
- * necessary to find the row in the output image given a row in an interlaced
- * image, so two more macros:
- */
-#define PNG_ROW_FROM_PASS_ROW(yIn, pass) \
-   (((yIn)<<PNG_PASS_ROW_SHIFT(pass))+PNG_PASS_START_ROW(pass))
-#define PNG_COL_FROM_PASS_COL(xIn, pass) \
-   (((xIn)<<PNG_PASS_COL_SHIFT(pass))+PNG_PASS_START_COL(pass))
-
-/* Two macros which return a boolean (0 or 1) saying whether the given row
- * or column is in a particular pass.  These use a common utility macro that
- * returns a mask for a given pass - the offset 'off' selects the row or
- * column version.  The mask has the appropriate bit set for each column in
- * the tile.
- */
-#define PNG_PASS_MASK(pass,off) ( \
-   ((0x110145AF>>(((7-(off))-(pass))<<2)) & 0xF) | \
-   ((0x01145AF0>>(((7-(off))-(pass))<<2)) & 0xF0))
-
-#define PNG_ROW_IN_INTERLACE_PASS(y, pass) \
-   ((PNG_PASS_MASK(pass,0) >> ((y)&7)) & 1)
-#define PNG_COL_IN_INTERLACE_PASS(x, pass) \
-   ((PNG_PASS_MASK(pass,1) >> ((x)&7)) & 1)
-
-#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
-/* With these routines we avoid an integer divide, which will be slower on
- * most machines.  However, it does take more operations than the corresponding
- * divide method, so it may be slower on a few RISC systems.  There are two
- * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
- *
- * Note that the rounding factors are NOT supposed to be the same!  128 and
- * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
- * standard method.
- *
- * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
- */
-
- /* fg and bg should be in `gamma 1.0' space; alpha is the opacity */
-
-#  define png_composite(composite, fg, alpha, bg)         \
-     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) \
-           * (png_uint_16)(alpha)                         \
-           + (png_uint_16)(bg)*(png_uint_16)(255          \
-           - (png_uint_16)(alpha)) + 128);                \
-       (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
-
-#  define png_composite_16(composite, fg, alpha, bg)       \
-     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg)  \
-           * (png_uint_32)(alpha)                          \
-           + (png_uint_32)(bg)*(65535                      \
-           - (png_uint_32)(alpha)) + 32768);               \
-       (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
-
-#else  /* Standard method using integer division */
-
-#  define png_composite(composite, fg, alpha, bg)                          \
-     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +  \
-     (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \
-     127) / 255)
-
-#  define png_composite_16(composite, fg, alpha, bg)                         \
-     (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
-     (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) +         \
-     32767) / 65535)
-#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
-
-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
-PNG_EXPORT(202, png_uint_16, png_get_uint_16, (png_const_bytep buf));
-PNG_EXPORT(203, png_int_32, png_get_int_32, (png_const_bytep buf));
-#endif
-
-PNG_EXPORT(204, png_uint_32, png_get_uint_31, (png_structp png_ptr,
-    png_const_bytep buf));
-/* No png_get_int_16 -- may be added if there's a real need for it. */
-
-/* Place a 32-bit number into a buffer in PNG byte order (big-endian). */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(205, void, png_save_uint_32, (png_bytep buf, png_uint_32 i));
-#endif
-#ifdef PNG_SAVE_INT_32_SUPPORTED
-PNG_EXPORT(206, void, png_save_int_32, (png_bytep buf, png_int_32 i));
-#endif
-
-/* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16,
- * just to avoid potential problems on pre-ANSI C compilers.
- */
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
-/* No png_save_int_16 -- may be added if there's a real need for it. */
-#endif
-
-#ifdef PNG_USE_READ_MACROS
-/* Inline macros to do direct reads of bytes from the input buffer.
- * The png_get_int_32() routine assumes we are using two's complement
- * format for negative values, which is almost certainly true.
- */
-#  define png_get_uint_32(buf) \
-     (((png_uint_32)(*(buf)) << 24) + \
-      ((png_uint_32)(*((buf) + 1)) << 16) + \
-      ((png_uint_32)(*((buf) + 2)) << 8) + \
-      ((png_uint_32)(*((buf) + 3))))
-
-   /* From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the
-    * function) incorrectly returned a value of type png_uint_32.
-    */
-#  define png_get_uint_16(buf) \
-     ((png_uint_16) \
-      (((unsigned int)(*(buf)) << 8) + \
-       ((unsigned int)(*((buf) + 1)))))
-
-#  define png_get_int_32(buf) \
-     ((png_int_32)((*(buf) & 0x80) \
-      ? -((png_int_32)((png_get_uint_32(buf) ^ 0xffffffffL) + 1)) \
-      : (png_int_32)png_get_uint_32(buf)))
-#endif
-
-/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
- * defs
- */
-
-/* The last ordinal number (this is the *last* one already used; the next
- * one to use is one more than this.)  Maintainer, remember to add an entry to
- * scripts/symbols.def as well.
- */
-#ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(233);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNG_VERSION_INFO_ONLY */
-/* Do not put anything past this line */
-#endif /* PNG_H */
+/* png.h - header file for PNG reference library
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * Authors and maintainers:
+ *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
+ *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
+ *  libpng versions 0.97, January 1998, through 1.2.7 - September 12, 2004: Glenn
+ *  See also "Contributing Authors", below.
+ *
+ * Note about libpng version numbers:
+ *
+ *    Due to various miscommunications, unforeseen code incompatibilities
+ *    and occasional factors outside the authors' control, version numbering
+ *    on the library has not always been consistent and straightforward.
+ *    The following table summarizes matters since version 0.89c, which was
+ *    the first widely used release:
+ *
+ *    source                 png.h  png.h  shared-lib
+ *    version                string   int  version
+ *    -------                ------ -----  ----------
+ *    0.89c "1.0 beta 3"     0.89      89  1.0.89
+ *    0.90  "1.0 beta 4"     0.90      90  0.90  [should have been 2.0.90]
+ *    0.95  "1.0 beta 5"     0.95      95  0.95  [should have been 2.0.95]
+ *    0.96  "1.0 beta 6"     0.96      96  0.96  [should have been 2.0.96]
+ *    0.97b "1.00.97 beta 7" 1.00.97   97  1.0.1 [should have been 2.0.97]
+ *    0.97c                  0.97      97  2.0.97
+ *    0.98                   0.98      98  2.0.98
+ *    0.99                   0.99      98  2.0.99
+ *    0.99a-m                0.99      99  2.0.99
+ *    1.00                   1.00     100  2.1.0 [100 should be 10000]
+ *    1.0.0      (from here on, the   100  2.1.0 [100 should be 10000]
+ *    1.0.1       png.h string is   10001  2.1.0
+ *    1.0.1a-e    identical to the  10002  from here on, the shared library
+ *    1.0.2       source version)   10002  is 2.V where V is the source code
+ *    1.0.2a-b                      10003  version, except as noted.
+ *    1.0.3                         10003
+ *    1.0.3a-d                      10004
+ *    1.0.4                         10004
+ *    1.0.4a-f                      10005
+ *    1.0.5 (+ 2 patches)           10005
+ *    1.0.5a-d                      10006
+ *    1.0.5e-r                      10100 (not source compatible)
+ *    1.0.5s-v                      10006 (not binary compatible)
+ *    1.0.6 (+ 3 patches)           10006 (still binary incompatible)
+ *    1.0.6d-f                      10007 (still binary incompatible)
+ *    1.0.6g                        10007
+ *    1.0.6h                        10007  10.6h (testing xy.z so-numbering)
+ *    1.0.6i                        10007  10.6i
+ *    1.0.6j                        10007  2.1.0.6j (incompatible with 1.0.0)
+ *    1.0.7beta11-14        DLLNUM  10007  2.1.0.7beta11-14 (binary compatible)
+ *    1.0.7beta15-18           1    10007  2.1.0.7beta15-18 (binary compatible)
+ *    1.0.7rc1-2               1    10007  2.1.0.7rc1-2 (binary compatible)
+ *    1.0.7                    1    10007  (still compatible)
+ *    1.0.8beta1-4             1    10008  2.1.0.8beta1-4
+ *    1.0.8rc1                 1    10008  2.1.0.8rc1
+ *    1.0.8                    1    10008  2.1.0.8
+ *    1.0.9beta1-6             1    10009  2.1.0.9beta1-6
+ *    1.0.9rc1                 1    10009  2.1.0.9rc1
+ *    1.0.9beta7-10            1    10009  2.1.0.9beta7-10
+ *    1.0.9rc2                 1    10009  2.1.0.9rc2
+ *    1.0.9                    1    10009  2.1.0.9
+ *    1.0.10beta1              1    10010  2.1.0.10beta1
+ *    1.0.10rc1                1    10010  2.1.0.10rc1
+ *    1.0.10                   1    10010  2.1.0.10
+ *    1.0.11beta1-3            1    10011  2.1.0.11beta1-3
+ *    1.0.11rc1                1    10011  2.1.0.11rc1
+ *    1.0.11                   1    10011  2.1.0.11
+ *    1.0.12beta1-2            2    10012  2.1.0.12beta1-2
+ *    1.0.12rc1                2    10012  2.1.0.12rc1
+ *    1.0.12                   2    10012  2.1.0.12
+ *    1.1.0a-f                 -    10100  2.1.1.0a-f (branch abandoned)
+ *    1.2.0beta1-2             2    10200  2.1.2.0beta1-2
+ *    1.2.0beta3-5             3    10200  3.1.2.0beta3-5
+ *    1.2.0rc1                 3    10200  3.1.2.0rc1
+ *    1.2.0                    3    10200  3.1.2.0
+ *    1.2.1beta1-4             3    10201  3.1.2.1beta1-4
+ *    1.2.1rc1-2               3    10201  3.1.2.1rc1-2
+ *    1.2.1                    3    10201  3.1.2.1
+ *    1.2.2beta1-6            12    10202  12.so.0.1.2.2beta1-6
+ *    1.0.13beta1             10    10013  10.so.0.1.0.13beta1
+ *    1.0.13rc1               10    10013  10.so.0.1.0.13rc1
+ *    1.2.2rc1                12    10202  12.so.0.1.2.2rc1
+ *    1.0.13                  10    10013  10.so.0.1.0.13
+ *    1.2.2                   12    10202  12.so.0.1.2.2
+ *    1.2.3rc1-6              12    10203  12.so.0.1.2.3rc1-6
+ *    1.2.3                   12    10203  12.so.0.1.2.3
+ *    1.2.4beta1-3            13    10204  12.so.0.1.2.4beta1-3
+ *    1.0.14rc1               13    10014  10.so.0.1.0.14rc1
+ *    1.2.4rc1                13    10204  12.so.0.1.2.4rc1
+ *    1.0.14                  10    10014  10.so.0.1.0.14
+ *    1.2.4                   13    10204  12.so.0.1.2.4
+ *    1.2.5beta1-2            13    10205  12.so.0.1.2.5beta1-2
+ *    1.0.15rc1-3             10    10015  10.so.0.1.0.15rc1-3
+ *    1.2.5rc1-3              13    10205  12.so.0.1.2.5rc1-3
+ *    1.0.15                  10    10015  10.so.0.1.0.15
+ *    1.2.5                   13    10205  12.so.0.1.2.5
+ *    1.2.6beta1-4            13    10206  12.so.0.1.2.6beta1-4
+ *    1.0.16                  10    10016  10.so.0.1.0.16
+ *    1.2.6                   13    10206  12.so.0.1.2.6
+ *    1.2.7beta1-2            13    10207  12.so.0.1.2.7beta1-2
+ *    1.0.17rc1               10    10017  12.so.0.1.0.17rc1
+ *    1.2.7rc1                13    10207  12.so.0.1.2.7rc1
+ *    1.0.17                  10    10017  12.so.0.1.0.17
+ *    1.2.7                   13    10207  12.so.0.1.2.7
+ *
+ *    Henceforth the source version will match the shared-library major
+ *    and minor numbers; the shared-library major version number will be
+ *    used for changes in backward compatibility, as it is intended.  The
+ *    PNG_LIBPNG_VER macro, which is not used within libpng but is available
+ *    for applications, is an unsigned integer of the form xyyzz corresponding
+ *    to the source version x.y.z (leading zeros in y and z).  Beta versions
+ *    were given the previous public release number plus a letter, until
+ *    version 1.0.6j; from then on they were given the upcoming public
+ *    release number plus "betaNN" or "rcN".
+ *
+ *    Binary incompatibility exists only when applications make direct access
+ *    to the info_ptr or png_ptr members through png.h, and the compiled
+ *    application is loaded with a different version of the library.
+ *
+ *    DLLNUM will change each time there are forward or backward changes
+ *    in binary compatibility (e.g., when a new feature is added).
+ *
+ * See libpng.txt or libpng.3 for more information.  The PNG specification
+ * is available as a W3C Recommendation and as an ISO Specification,
+ * <http://www.w3.org/TR/2003/REC-PNG-20031110/
+ */
+
+/*
+ * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
+ *
+ * If you modify libpng you may insert additional notices immediately following
+ * this sentence.
+ *
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.7, September 12, 2004, are
+ * Copyright (c) 2004 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-1.2.5
+ * with the following individual added to the list of Contributing Authors:
+ *
+ *    Cosmin Truta
+ *
+ * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
+ * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-1.0.6
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    Simon-Pierre Cadieux
+ *    Eric S. Raymond
+ *    Gilles Vollant
+ *
+ * and with the following additions to the disclaimer:
+ *
+ *    There is no warranty against interference with your enjoyment of the
+ *    library or against infringement.  There is no warranty that our
+ *    efforts or the library will fulfill any of your particular purposes
+ *    or needs.  This library is provided with all faults, and the entire
+ *    risk of satisfactory quality, performance, accuracy, and effort is with
+ *    the user.
+ *
+ * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+ * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
+ * distributed according to the same disclaimer and license as libpng-0.96,
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    Tom Lane
+ *    Glenn Randers-Pehrson
+ *    Willem van Schaik
+ *
+ * libpng versions 0.89, June 1996, through 0.96, May 1997, are
+ * Copyright (c) 1996, 1997 Andreas Dilger
+ * Distributed according to the same disclaimer and license as libpng-0.88,
+ * with the following individuals added to the list of Contributing Authors:
+ *
+ *    John Bowler
+ *    Kevin Bracey
+ *    Sam Bushell
+ *    Magnus Holmgren
+ *    Greg Roelofs
+ *    Tom Tanner
+ *
+ * libpng versions 0.5, May 1995, through 0.88, January 1996, are
+ * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+ *
+ * For the purposes of this copyright and license, "Contributing Authors"
+ * is defined as the following set of individuals:
+ *
+ *    Andreas Dilger
+ *    Dave Martindale
+ *    Guy Eric Schalnat
+ *    Paul Schmidt
+ *    Tim Wegner
+ *
+ * The PNG Reference Library is supplied "AS IS".  The Contributing Authors
+ * and Group 42, Inc. disclaim all warranties, expressed or implied,
+ * including, without limitation, the warranties of merchantability and of
+ * fitness for any purpose.  The Contributing Authors and Group 42, Inc.
+ * assume no liability for direct, indirect, incidental, special, exemplary,
+ * or consequential damages, which may result from the use of the PNG
+ * Reference Library, even if advised of the possibility of such damage.
+ *
+ * Permission is hereby granted to use, copy, modify, and distribute this
+ * source code, or portions hereof, for any purpose, without fee, subject
+ * to the following restrictions:
+ *
+ * 1. The origin of this source code must not be misrepresented.
+ *
+ * 2. Altered versions must be plainly marked as such and
+ * must not be misrepresented as being the original source.
+ *
+ * 3. This Copyright notice may not be removed or altered from
+ *    any source or altered source distribution.
+ *
+ * The Contributing Authors and Group 42, Inc. specifically permit, without
+ * fee, and encourage the use of this source code as a component to
+ * supporting the PNG file format in commercial products.  If you use this
+ * source code in a product, acknowledgment is not required but would be
+ * appreciated.
+ */
+
+/*
+ * A "png_get_copyright" function is available, for convenient use in "about"
+ * boxes and the like:
+ *
+ * printf("%s",png_get_copyright(NULL));
+ *
+ * Also, the PNG logo (in PNG format, of course) is supplied in the
+ * files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
+ */
+
+/*
+ * Libpng is OSI Certified Open Source Software.  OSI Certified is a
+ * certification mark of the Open Source Initiative.
+ */
+
+/*
+ * The contributing authors would like to thank all those who helped
+ * with testing, bug fixes, and patience.  This wouldn't have been
+ * possible without all of you.
+ *
+ * Thanks to Frank J. T. Wojcik for helping with the documentation.
+ */
+
+/*
+ * Y2K compliance in libpng:
+ * =========================
+ *
+ *    September 12, 2004
+ *
+ *    Since the PNG Development group is an ad-hoc body, we can't make
+ *    an official declaration.
+ *
+ *    This is your unofficial assurance that libpng from version 0.71 and
+ *    upward through 1.2.7 are Y2K compliant.  It is my belief that earlier
+ *    versions were also Y2K compliant.
+ *
+ *    Libpng only has three year fields.  One is a 2-byte unsigned integer
+ *    that will hold years up to 65535.  The other two hold the date in text
+ *    format, and will hold years up to 9999.
+ *
+ *    The integer is
+ *        "png_uint_16 year" in png_time_struct.
+ *
+ *    The strings are
+ *        "png_charp time_buffer" in png_struct and
+ *        "near_time_buffer", which is a local character string in png.c.
+ *
+ *    There are seven time-related functions:
+ *        png.c: png_convert_to_rfc_1123() in png.c
+ *          (formerly png_convert_to_rfc_1152() in error)
+ *        png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c
+ *        png_convert_from_time_t() in pngwrite.c
+ *        png_get_tIME() in pngget.c
+ *        png_handle_tIME() in pngrutil.c, called in pngread.c
+ *        png_set_tIME() in pngset.c
+ *        png_write_tIME() in pngwutil.c, called in pngwrite.c
+ *
+ *    All handle dates properly in a Y2K environment.  The
+ *    png_convert_from_time_t() function calls gmtime() to convert from system
+ *    clock time, which returns (year - 1900), which we properly convert to
+ *    the full 4-digit year.  There is a possibility that applications using
+ *    libpng are not passing 4-digit years into the png_convert_to_rfc_1123()
+ *    function, or that they are incorrectly passing only a 2-digit year
+ *    instead of "year - 1900" into the png_convert_from_struct_tm() function,
+ *    but this is not under our control.  The libpng documentation has always
+ *    stated that it works with 4-digit years, and the APIs have been
+ *    documented as such.
+ *
+ *    The tIME chunk itself is also Y2K compliant.  It uses a 2-byte unsigned
+ *    integer to hold the year, and can hold years as large as 65535.
+ *
+ *    zlib, upon which libpng depends, is also Y2K compliant.  It contains
+ *    no date-related code.
+ *
+ *       Glenn Randers-Pehrson
+ *       libpng maintainer
+ *       PNG Development Group
+ */
+
+#ifndef PNG_H
+#define PNG_H
+
+/* This is not the place to learn how to use libpng.  The file libpng.txt
+ * describes how to use libpng, and the file example.c summarizes it
+ * with some code on which to build.  This file is useful for looking
+ * at the actual function definitions and structure components.
+ */
+
+/* Version information for png.h - this should match the version in png.c */
+#define PNG_LIBPNG_VER_STRING "1.2.7"
+#define PNG_HEADER_VERSION_STRING \
+   " libpng version 1.2.7 - September 12, 2004 (header)\n"
+
+#define PNG_LIBPNG_VER_SONUM   0
+#define PNG_LIBPNG_VER_DLLNUM  %DLLNUM%
+
+/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
+#define PNG_LIBPNG_VER_MAJOR   1
+#define PNG_LIBPNG_VER_MINOR   2
+#define PNG_LIBPNG_VER_RELEASE 7
+/* This should match the numeric part of the final component of
+ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
+
+#define PNG_LIBPNG_VER_BUILD  3
+
+#define PNG_LIBPNG_BUILD_ALPHA    1
+#define PNG_LIBPNG_BUILD_BETA     2
+#define PNG_LIBPNG_BUILD_RC       3
+#define PNG_LIBPNG_BUILD_STABLE   4
+#define PNG_LIBPNG_BUILD_TYPEMASK 7
+#define PNG_LIBPNG_BUILD_PATCH    8 /* Can be OR'ed with STABLE only */
+#define PNG_LIBPNG_BUILD_TYPE 3
+
+/* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
+ * We must not include leading zeros.
+ * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
+ * version 1.0.0 was mis-numbered 100 instead of 10000).  From
+ * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release */
+#define PNG_LIBPNG_VER 10207 /* 1.2.7 */
+
+#ifndef PNG_VERSION_INFO_ONLY
+
+/* include the compression library's header */
+#include "zlib.h"
+
+/* include all user configurable info, including optional assembler routines */
+#include "pngconf.h"
+
+/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* This file is arranged in several sections.  The first section contains
+ * structure and type definitions.  The second section contains the external
+ * library functions, while the third has the internal library functions,
+ * which applications aren't expected to use directly.
+ */
+
+#ifndef PNG_NO_TYPECAST_NULL
+#define int_p_NULL                (int *)NULL
+#define png_bytep_NULL            (png_bytep)NULL
+#define png_bytepp_NULL           (png_bytepp)NULL
+#define png_doublep_NULL          (png_doublep)NULL
+#define png_error_ptr_NULL        (png_error_ptr)NULL
+#define png_flush_ptr_NULL        (png_flush_ptr)NULL
+#define png_free_ptr_NULL         (png_free_ptr)NULL
+#define png_infopp_NULL           (png_infopp)NULL
+#define png_malloc_ptr_NULL       (png_malloc_ptr)NULL
+#define png_read_status_ptr_NULL  (png_read_status_ptr)NULL
+#define png_rw_ptr_NULL           (png_rw_ptr)NULL
+#define png_structp_NULL          (png_structp)NULL
+#define png_uint_16p_NULL         (png_uint_16p)NULL
+#define png_voidp_NULL            (png_voidp)NULL
+#define png_write_status_ptr_NULL (png_write_status_ptr)NULL
+#else
+#define int_p_NULL                NULL
+#define png_bytep_NULL            NULL
+#define png_bytepp_NULL           NULL
+#define png_doublep_NULL          NULL
+#define png_error_ptr_NULL        NULL
+#define png_flush_ptr_NULL        NULL
+#define png_free_ptr_NULL         NULL
+#define png_infopp_NULL           NULL
+#define png_malloc_ptr_NULL       NULL
+#define png_read_status_ptr_NULL  NULL
+#define png_rw_ptr_NULL           NULL
+#define png_structp_NULL          NULL
+#define png_uint_16p_NULL         NULL
+#define png_voidp_NULL            NULL
+#define png_write_status_ptr_NULL NULL
+#endif
+
+/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* Version information for C files, stored in png.c.  This had better match
+ * the version above.
+ */
+#ifdef PNG_USE_GLOBAL_ARRAYS
+PNG_EXPORT_VAR (const char) png_libpng_ver[18];
+  /* need room for 99.99.99beta99z */
+#else
+#define png_libpng_ver png_get_header_ver(NULL)
+#endif
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+/* This was removed in version 1.0.5c */
+/* Structures to facilitate easy interlacing.  See png.c for more details */
+PNG_EXPORT_VAR (const int FARDATA) png_pass_start[7];
+PNG_EXPORT_VAR (const int FARDATA) png_pass_inc[7];
+PNG_EXPORT_VAR (const int FARDATA) png_pass_ystart[7];
+PNG_EXPORT_VAR (const int FARDATA) png_pass_yinc[7];
+PNG_EXPORT_VAR (const int FARDATA) png_pass_mask[7];
+PNG_EXPORT_VAR (const int FARDATA) png_pass_dsp_mask[7];
+#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW
+PNG_EXPORT_VAR (const int FARDATA) png_pass_width[7];
+#endif
+/* This isn't currently used.  If you need it, see png.c for more details.
+PNG_EXPORT_VAR (const int FARDATA) png_pass_height[7];
+*/
+#endif
+
+#endif /* PNG_NO_EXTERN */
+
+/* Three color definitions.  The order of the red, green, and blue, (and the
+ * exact size) is not important, although the size of the fields need to
+ * be png_byte or png_uint_16 (as defined below).
+ */
+typedef struct png_color_struct
+{
+   png_byte red;
+   png_byte green;
+   png_byte blue;
+} png_color;
+typedef png_color FAR * png_colorp;
+typedef png_color FAR * FAR * png_colorpp;
+
+typedef struct png_color_16_struct
+{
+   png_byte index;    /* used for palette files */
+   png_uint_16 red;   /* for use in red green blue files */
+   png_uint_16 green;
+   png_uint_16 blue;
+   png_uint_16 gray;  /* for use in grayscale files */
+} png_color_16;
+typedef png_color_16 FAR * png_color_16p;
+typedef png_color_16 FAR * FAR * png_color_16pp;
+
+typedef struct png_color_8_struct
+{
+   png_byte red;   /* for use in red green blue files */
+   png_byte green;
+   png_byte blue;
+   png_byte gray;  /* for use in grayscale files */
+   png_byte alpha; /* for alpha channel files */
+} png_color_8;
+typedef png_color_8 FAR * png_color_8p;
+typedef png_color_8 FAR * FAR * png_color_8pp;
+
+/*
+ * The following two structures are used for the in-core representation
+ * of sPLT chunks.
+ */
+typedef struct png_sPLT_entry_struct
+{
+   png_uint_16 red;
+   png_uint_16 green;
+   png_uint_16 blue;
+   png_uint_16 alpha;
+   png_uint_16 frequency;
+} png_sPLT_entry;
+typedef png_sPLT_entry FAR * png_sPLT_entryp;
+typedef png_sPLT_entry FAR * FAR * png_sPLT_entrypp;
+
+/*  When the depth of the sPLT palette is 8 bits, the color and alpha samples
+ *  occupy the LSB of their respective members, and the MSB of each member
+ *  is zero-filled.  The frequency member always occupies the full 16 bits.
+ */
+
+typedef struct png_sPLT_struct
+{
+   png_charp name;           /* palette name */
+   png_byte depth;           /* depth of palette samples */
+   png_sPLT_entryp entries;  /* palette entries */
+   png_int_32 nentries;      /* number of palette entries */
+} png_sPLT_t;
+typedef png_sPLT_t FAR * png_sPLT_tp;
+typedef png_sPLT_t FAR * FAR * png_sPLT_tpp;
+
+#ifdef PNG_TEXT_SUPPORTED
+/* png_text holds the contents of a text/ztxt/itxt chunk in a PNG file,
+ * and whether that contents is compressed or not.  The "key" field
+ * points to a regular zero-terminated C string.  The "text", "lang", and
+ * "lang_key" fields can be regular C strings, empty strings, or NULL pointers.
+ * However, the * structure returned by png_get_text() will always contain
+ * regular zero-terminated C strings (possibly empty), never NULL pointers,
+ * so they can be safely used in printf() and other string-handling functions.
+ */
+typedef struct png_text_struct
+{
+   int  compression;       /* compression value:
+                             -1: tEXt, none
+                              0: zTXt, deflate
+                              1: iTXt, none
+                              2: iTXt, deflate  */
+   png_charp key;          /* keyword, 1-79 character description of "text" */
+   png_charp text;         /* comment, may be an empty string (ie "")
+                              or a NULL pointer */
+   png_size_t text_length; /* length of the text string */
+#ifdef PNG_iTXt_SUPPORTED
+   png_size_t itxt_length; /* length of the itxt string */
+   png_charp lang;         /* language code, 0-79 characters
+                              or a NULL pointer */
+   png_charp lang_key;     /* keyword translated UTF-8 string, 0 or more
+                              chars or a NULL pointer */
+#endif
+} png_text;
+typedef png_text FAR * png_textp;
+typedef png_text FAR * FAR * png_textpp;
+#endif
+
+/* Supported compression types for text in PNG files (tEXt, and zTXt).
+ * The values of the PNG_TEXT_COMPRESSION_ defines should NOT be changed. */
+#define PNG_TEXT_COMPRESSION_NONE_WR -3
+#define PNG_TEXT_COMPRESSION_zTXt_WR -2
+#define PNG_TEXT_COMPRESSION_NONE    -1
+#define PNG_TEXT_COMPRESSION_zTXt     0
+#define PNG_ITXT_COMPRESSION_NONE     1
+#define PNG_ITXT_COMPRESSION_zTXt     2
+#define PNG_TEXT_COMPRESSION_LAST     3  /* Not a valid value */
+
+/* png_time is a way to hold the time in an machine independent way.
+ * Two conversions are provided, both from time_t and struct tm.  There
+ * is no portable way to convert to either of these structures, as far
+ * as I know.  If you know of a portable way, send it to me.  As a side
+ * note - PNG has always been Year 2000 compliant!
+ */
+typedef struct png_time_struct
+{
+   png_uint_16 year; /* full year, as in, 1995 */
+   png_byte month;   /* month of year, 1 - 12 */
+   png_byte day;     /* day of month, 1 - 31 */
+   png_byte hour;    /* hour of day, 0 - 23 */
+   png_byte minute;  /* minute of hour, 0 - 59 */
+   png_byte second;  /* second of minute, 0 - 60 (for leap seconds) */
+} png_time;
+typedef png_time FAR * png_timep;
+typedef png_time FAR * FAR * png_timepp;
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+/* png_unknown_chunk is a structure to hold queued chunks for which there is
+ * no specific support.  The idea is that we can use this to queue
+ * up private chunks for output even though the library doesn't actually
+ * know about their semantics.
+ */
+typedef struct png_unknown_chunk_t
+{
+    png_byte name[5];
+    png_byte *data;
+    png_size_t size;
+
+    /* libpng-using applications should NOT directly modify this byte. */
+    png_byte location; /* mode of operation at read time */
+}
+png_unknown_chunk;
+typedef png_unknown_chunk FAR * png_unknown_chunkp;
+typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp;
+#endif
+
+/* png_info is a structure that holds the information in a PNG file so
+ * that the application can find out the characteristics of the image.
+ * If you are reading the file, this structure will tell you what is
+ * in the PNG file.  If you are writing the file, fill in the information
+ * you want to put into the PNG file, then call png_write_info().
+ * The names chosen should be very close to the PNG specification, so
+ * consult that document for information about the meaning of each field.
+ *
+ * With libpng < 0.95, it was only possible to directly set and read the
+ * the values in the png_info_struct, which meant that the contents and
+ * order of the values had to remain fixed.  With libpng 0.95 and later,
+ * however, there are now functions that abstract the contents of
+ * png_info_struct from the application, so this makes it easier to use
+ * libpng with dynamic libraries, and even makes it possible to use
+ * libraries that don't have all of the libpng ancillary chunk-handing
+ * functionality.
+ *
+ * In any case, the order of the parameters in png_info_struct should NOT
+ * be changed for as long as possible to keep compatibility with applications
+ * that use the old direct-access method with png_info_struct.
+ *
+ * The following members may have allocated storage attached that should be
+ * cleaned up before the structure is discarded: palette, trans, text,
+ * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,
+ * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these
+ * are automatically freed when the info structure is deallocated, if they were
+ * allocated internally by libpng.  This behavior can be changed by means
+ * of the png_data_freer() function.
+ *
+ * More allocation details: all the chunk-reading functions that
+ * change these members go through the corresponding png_set_*
+ * functions.  A function to clear these members is available: see
+ * png_free_data().  The png_set_* functions do not depend on being
+ * able to point info structure members to any of the storage they are
+ * passed (they make their own copies), EXCEPT that the png_set_text
+ * functions use the same storage passed to them in the text_ptr or
+ * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
+ * functions do not make their own copies.
+ */
+typedef struct png_info_struct
+{
+   /* the following are necessary for every PNG file */
+   png_uint_32 width;       /* width of image in pixels (from IHDR) */
+   png_uint_32 height;      /* height of image in pixels (from IHDR) */
+   png_uint_32 valid;       /* valid chunk data (see PNG_INFO_ below) */
+   png_uint_32 rowbytes;    /* bytes needed to hold an untransformed row */
+   png_colorp palette;      /* array of color values (valid & PNG_INFO_PLTE) */
+   png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */
+   png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */
+   png_byte bit_depth;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */
+   png_byte color_type;     /* see PNG_COLOR_TYPE_ below (from IHDR) */
+   /* The following three should have been named *_method not *_type */
+   png_byte compression_type; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */
+   png_byte filter_type;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
+   png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+
+   /* The following is informational only on read, and not used on writes. */
+   png_byte channels;       /* number of data channels per pixel (1, 2, 3, 4) */
+   png_byte pixel_depth;    /* number of bits per pixel */
+   png_byte spare_byte;     /* to align the data, and for future use */
+   png_byte signature[8];   /* magic bytes read by libpng from start of file */
+
+   /* The rest of the data is optional.  If you are reading, check the
+    * valid field to see if the information in these are valid.  If you
+    * are writing, set the valid field to those chunks you want written,
+    * and initialize the appropriate fields below.
+    */
+
+#if defined(PNG_gAMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+   /* The gAMA chunk describes the gamma characteristics of the system
+    * on which the image was created, normally in the range [1.0, 2.5].
+    * Data is valid if (valid & PNG_INFO_gAMA) is non-zero.
+    */
+   float gamma; /* gamma value of image, if (valid & PNG_INFO_gAMA) */
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+    /* GR-P, 0.96a */
+    /* Data valid if (valid & PNG_INFO_sRGB) non-zero. */
+   png_byte srgb_intent; /* sRGB rendering intent [0, 1, 2, or 3] */
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+   /* The tEXt, and zTXt chunks contain human-readable textual data in
+    * uncompressed, compressed, and optionally compressed forms, respectively.
+    * The data in "text" is an array of pointers to uncompressed,
+    * null-terminated C strings. Each chunk has a keyword that describes the
+    * textual data contained in that chunk.  Keywords are not required to be
+    * unique, and the text string may be empty.  Any number of text chunks may
+    * be in an image.
+    */
+   int num_text; /* number of comments read/to write */
+   int max_text; /* current size of text array */
+   png_textp text; /* array of comments read/to write */
+#endif /* PNG_TEXT_SUPPORTED */
+
+#if defined(PNG_tIME_SUPPORTED)
+   /* The tIME chunk holds the last time the displayed image data was
+    * modified.  See the png_time struct for the contents of this struct.
+    */
+   png_time mod_time;
+#endif
+
+#if defined(PNG_sBIT_SUPPORTED)
+   /* The sBIT chunk specifies the number of significant high-order bits
+    * in the pixel data.  Values are in the range [1, bit_depth], and are
+    * only specified for the channels in the pixel data.  The contents of
+    * the low-order bits is not specified.  Data is valid if
+    * (valid & PNG_INFO_sBIT) is non-zero.
+    */
+   png_color_8 sig_bit; /* significant bits in color channels */
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \
+defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* The tRNS chunk supplies transparency data for paletted images and
+    * other image types that don't need a full alpha channel.  There are
+    * "num_trans" transparency values for a paletted image, stored in the
+    * same order as the palette colors, starting from index 0.  Values
+    * for the data are in the range [0, 255], ranging from fully transparent
+    * to fully opaque, respectively.  For non-paletted images, there is a
+    * single color specified that should be treated as fully transparent.
+    * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.
+    */
+   png_bytep trans; /* transparent values for paletted image */
+   png_color_16 trans_values; /* transparent color for non-palette image */
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* The bKGD chunk gives the suggested image background color if the
+    * display program does not have its own background color and the image
+    * is needs to composited onto a background before display.  The colors
+    * in "background" are normally in the same color space/depth as the
+    * pixel data.  Data is valid if (valid & PNG_INFO_bKGD) is non-zero.
+    */
+   png_color_16 background;
+#endif
+
+#if defined(PNG_oFFs_SUPPORTED)
+   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards
+    * and downwards from the top-left corner of the display, page, or other
+    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines
+    * below for the unit types.  Valid if (valid & PNG_INFO_oFFs) non-zero.
+    */
+   png_int_32 x_offset; /* x offset on page */
+   png_int_32 y_offset; /* y offset on page */
+   png_byte offset_unit_type; /* offset units type */
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+   /* The pHYs chunk gives the physical pixel density of the image for
+    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_
+    * defines below).  Data is valid if (valid & PNG_INFO_pHYs) is non-zero.
+    */
+   png_uint_32 x_pixels_per_unit; /* horizontal pixel density */
+   png_uint_32 y_pixels_per_unit; /* vertical pixel density */
+   png_byte phys_unit_type; /* resolution type (see PNG_RESOLUTION_ below) */
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+   /* The hIST chunk contains the relative frequency or importance of the
+    * various palette entries, so that a viewer can intelligently select a
+    * reduced-color palette, if required.  Data is an array of "num_palette"
+    * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST)
+    * is non-zero.
+    */
+   png_uint_16p hist;
+#endif
+
+#ifdef PNG_cHRM_SUPPORTED
+   /* The cHRM chunk describes the CIE color characteristics of the monitor
+    * on which the PNG was created.  This data allows the viewer to do gamut
+    * mapping of the input image to ensure that the viewer sees the same
+    * colors in the image as the creator.  Values are in the range
+    * [0.0, 0.8].  Data valid if (valid & PNG_INFO_cHRM) non-zero.
+    */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float x_white;
+   float y_white;
+   float x_red;
+   float y_red;
+   float x_green;
+   float y_green;
+   float x_blue;
+   float y_blue;
+#endif
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+   /* The pCAL chunk describes a transformation between the stored pixel
+    * values and original physical data values used to create the image.
+    * The integer range [0, 2^bit_depth - 1] maps to the floating-point
+    * range given by [pcal_X0, pcal_X1], and are further transformed by a
+    * (possibly non-linear) transformation function given by "pcal_type"
+    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_
+    * defines below, and the PNG-Group's PNG extensions document for a
+    * complete description of the transformations and how they should be
+    * implemented, and for a description of the ASCII parameter strings.
+    * Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
+    */
+   png_charp pcal_purpose;  /* pCAL chunk description string */
+   png_int_32 pcal_X0;      /* minimum value */
+   png_int_32 pcal_X1;      /* maximum value */
+   png_charp pcal_units;    /* Latin-1 string giving physical units */
+   png_charpp pcal_params;  /* ASCII strings containing parameter values */
+   png_byte pcal_type;      /* equation type (see PNG_EQUATION_ below) */
+   png_byte pcal_nparams;   /* number of parameters given in pcal_params */
+#endif
+
+/* New members added in libpng-1.0.6 */
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_uint_32 free_me;     /* flags items libpng is responsible for freeing */
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   /* storage for unknown chunks that the library doesn't recognize. */
+   png_unknown_chunkp unknown_chunks;
+   png_size_t unknown_chunks_num;
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+   /* iCCP chunk data. */
+   png_charp iccp_name;     /* profile name */
+   png_charp iccp_profile;  /* International Color Consortium profile data */
+                            /* Note to maintainer: should be png_bytep */
+   png_uint_32 iccp_proflen;  /* ICC profile data length */
+   png_byte iccp_compression; /* Always zero */
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+   /* data on sPLT chunks (there may be more than one). */
+   png_sPLT_tp splt_palettes;
+   png_uint_32 splt_palettes_num;
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+   /* The sCAL chunk describes the actual physical dimensions of the
+    * subject matter of the graphic.  The chunk contains a unit specification
+    * a byte value, and two ASCII strings representing floating-point
+    * values.  The values are width and height corresponsing to one pixel
+    * in the image.  This external representation is converted to double
+    * here.  Data values are valid if (valid & PNG_INFO_sCAL) is non-zero.
+    */
+   png_byte scal_unit;         /* unit of physical scale */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   double scal_pixel_width;    /* width of one pixel */
+   double scal_pixel_height;   /* height of one pixel */
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_charp scal_s_width;     /* string containing height */
+   png_charp scal_s_height;    /* string containing width */
+#endif
+#endif
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+   /* Memory has been allocated if (valid & PNG_ALLOCATED_INFO_ROWS) non-zero */
+   /* Data valid if (valid & PNG_INFO_IDAT) non-zero */
+   png_bytepp row_pointers;        /* the image bits */
+#endif
+
+#if defined(PNG_FIXED_POINT_SUPPORTED) && defined(PNG_gAMA_SUPPORTED)
+   png_fixed_point int_gamma; /* gamma of image, if (valid & PNG_INFO_gAMA) */
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED) && defined(PNG_FIXED_POINT_SUPPORTED)
+   png_fixed_point int_x_white;
+   png_fixed_point int_y_white;
+   png_fixed_point int_x_red;
+   png_fixed_point int_y_red;
+   png_fixed_point int_x_green;
+   png_fixed_point int_y_green;
+   png_fixed_point int_x_blue;
+   png_fixed_point int_y_blue;
+#endif
+
+} png_info;
+
+typedef png_info FAR * png_infop;
+typedef png_info FAR * FAR * png_infopp;
+
+/* Maximum positive integer used in PNG is (2^31)-1 */
+#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
+#define PNG_UINT_32_MAX (~((png_uint_32)0))
+#define PNG_SIZE_MAX (~((png_size_t)0))
+/* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
+#define PNG_MAX_UINT PNG_UINT_31_MAX
+
+/* These describe the color_type field in png_info. */
+/* color type masks */
+#define PNG_COLOR_MASK_PALETTE    1
+#define PNG_COLOR_MASK_COLOR      2
+#define PNG_COLOR_MASK_ALPHA      4
+
+/* color types.  Note that not all combinations are legal */
+#define PNG_COLOR_TYPE_GRAY 0
+#define PNG_COLOR_TYPE_PALETTE  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
+#define PNG_COLOR_TYPE_RGB        (PNG_COLOR_MASK_COLOR)
+#define PNG_COLOR_TYPE_RGB_ALPHA  (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
+#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
+/* aliases */
+#define PNG_COLOR_TYPE_RGBA  PNG_COLOR_TYPE_RGB_ALPHA
+#define PNG_COLOR_TYPE_GA  PNG_COLOR_TYPE_GRAY_ALPHA
+
+/* This is for compression type. PNG 1.0-1.2 only define the single type. */
+#define PNG_COMPRESSION_TYPE_BASE 0 /* Deflate method 8, 32K window */
+#define PNG_COMPRESSION_TYPE_DEFAULT PNG_COMPRESSION_TYPE_BASE
+
+/* This is for filter type. PNG 1.0-1.2 only define the single type. */
+#define PNG_FILTER_TYPE_BASE      0 /* Single row per-byte filtering */
+#define PNG_INTRAPIXEL_DIFFERENCING 64 /* Used only in MNG datastreams */
+#define PNG_FILTER_TYPE_DEFAULT   PNG_FILTER_TYPE_BASE
+
+/* These are for the interlacing type.  These values should NOT be changed. */
+#define PNG_INTERLACE_NONE        0 /* Non-interlaced image */
+#define PNG_INTERLACE_ADAM7       1 /* Adam7 interlacing */
+#define PNG_INTERLACE_LAST        2 /* Not a valid value */
+
+/* These are for the oFFs chunk.  These values should NOT be changed. */
+#define PNG_OFFSET_PIXEL          0 /* Offset in pixels */
+#define PNG_OFFSET_MICROMETER     1 /* Offset in micrometers (1/10^6 meter) */
+#define PNG_OFFSET_LAST           2 /* Not a valid value */
+
+/* These are for the pCAL chunk.  These values should NOT be changed. */
+#define PNG_EQUATION_LINEAR       0 /* Linear transformation */
+#define PNG_EQUATION_BASE_E       1 /* Exponential base e transform */
+#define PNG_EQUATION_ARBITRARY    2 /* Arbitrary base exponential transform */
+#define PNG_EQUATION_HYPERBOLIC   3 /* Hyperbolic sine transformation */
+#define PNG_EQUATION_LAST         4 /* Not a valid value */
+
+/* These are for the sCAL chunk.  These values should NOT be changed. */
+#define PNG_SCALE_UNKNOWN         0 /* unknown unit (image scale) */
+#define PNG_SCALE_METER           1 /* meters per pixel */
+#define PNG_SCALE_RADIAN          2 /* radians per pixel */
+#define PNG_SCALE_LAST            3 /* Not a valid value */
+
+/* These are for the pHYs chunk.  These values should NOT be changed. */
+#define PNG_RESOLUTION_UNKNOWN    0 /* pixels/unknown unit (aspect ratio) */
+#define PNG_RESOLUTION_METER      1 /* pixels/meter */
+#define PNG_RESOLUTION_LAST       2 /* Not a valid value */
+
+/* These are for the sRGB chunk.  These values should NOT be changed. */
+#define PNG_sRGB_INTENT_PERCEPTUAL 0
+#define PNG_sRGB_INTENT_RELATIVE   1
+#define PNG_sRGB_INTENT_SATURATION 2
+#define PNG_sRGB_INTENT_ABSOLUTE   3
+#define PNG_sRGB_INTENT_LAST       4 /* Not a valid value */
+
+/* This is for text chunks */
+#define PNG_KEYWORD_MAX_LENGTH     79
+
+/* Maximum number of entries in PLTE/sPLT/tRNS arrays */
+#define PNG_MAX_PALETTE_LENGTH    256
+
+/* These determine if an ancillary chunk's data has been successfully read
+ * from the PNG header, or if the application has filled in the corresponding
+ * data in the info_struct to be written into the output file.  The values
+ * of the PNG_INFO_<chunk> defines should NOT be changed.
+ */
+#define PNG_INFO_gAMA 0x0001
+#define PNG_INFO_sBIT 0x0002
+#define PNG_INFO_cHRM 0x0004
+#define PNG_INFO_PLTE 0x0008
+#define PNG_INFO_tRNS 0x0010
+#define PNG_INFO_bKGD 0x0020
+#define PNG_INFO_hIST 0x0040
+#define PNG_INFO_pHYs 0x0080
+#define PNG_INFO_oFFs 0x0100
+#define PNG_INFO_tIME 0x0200
+#define PNG_INFO_pCAL 0x0400
+#define PNG_INFO_sRGB 0x0800   /* GR-P, 0.96a */
+#define PNG_INFO_iCCP 0x1000   /* ESR, 1.0.6 */
+#define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
+#define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
+#define PNG_INFO_IDAT 0x8000L  /* ESR, 1.0.6 */
+
+/* This is used for the transformation routines, as some of them
+ * change these values for the row.  It also should enable using
+ * the routines for other purposes.
+ */
+typedef struct png_row_info_struct
+{
+   png_uint_32 width; /* width of row */
+   png_uint_32 rowbytes; /* number of bytes in row */
+   png_byte color_type; /* color type of row */
+   png_byte bit_depth; /* bit depth of row */
+   png_byte channels; /* number of channels (1, 2, 3, or 4) */
+   png_byte pixel_depth; /* bits per pixel (depth * channels) */
+} png_row_info;
+
+typedef png_row_info FAR * png_row_infop;
+typedef png_row_info FAR * FAR * png_row_infopp;
+
+/* These are the function types for the I/O functions and for the functions
+ * that allow the user to override the default I/O functions with his or her
+ * own.  The png_error_ptr type should match that of user-supplied warning
+ * and error functions, while the png_rw_ptr type should match that of the
+ * user read/write data functions.
+ */
+typedef struct png_struct_def png_struct;
+typedef png_struct FAR * png_structp;
+
+typedef void (PNGAPI *png_error_ptr) PNGARG((png_structp, png_const_charp));
+typedef void (PNGAPI *png_rw_ptr) PNGARG((png_structp, png_bytep, png_size_t));
+typedef void (PNGAPI *png_flush_ptr) PNGARG((png_structp));
+typedef void (PNGAPI *png_read_status_ptr) PNGARG((png_structp, png_uint_32,
+   int));
+typedef void (PNGAPI *png_write_status_ptr) PNGARG((png_structp, png_uint_32,
+   int));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+typedef void (PNGAPI *png_progressive_info_ptr) PNGARG((png_structp, png_infop));
+typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
+typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
+   png_uint_32, int));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+typedef void (PNGAPI *png_user_transform_ptr) PNGARG((png_structp,
+    png_row_infop, png_bytep));
+#endif
+
+#if defined(PNG_USER_CHUNKS_SUPPORTED)
+typedef int (PNGAPI *png_user_chunk_ptr) PNGARG((png_structp, png_unknown_chunkp));
+#endif
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+typedef void (PNGAPI *png_unknown_chunk_ptr) PNGARG((png_structp));
+#endif
+
+/* Transform masks for the high-level interface */
+#define PNG_TRANSFORM_IDENTITY       0x0000    /* read and write */
+#define PNG_TRANSFORM_STRIP_16       0x0001    /* read only */
+#define PNG_TRANSFORM_STRIP_ALPHA    0x0002    /* read only */
+#define PNG_TRANSFORM_PACKING        0x0004    /* read and write */
+#define PNG_TRANSFORM_PACKSWAP       0x0008    /* read and write */
+#define PNG_TRANSFORM_EXPAND         0x0010    /* read only */
+#define PNG_TRANSFORM_INVERT_MONO    0x0020    /* read and write */
+#define PNG_TRANSFORM_SHIFT          0x0040    /* read and write */
+#define PNG_TRANSFORM_BGR            0x0080    /* read and write */
+#define PNG_TRANSFORM_SWAP_ALPHA     0x0100    /* read and write */
+#define PNG_TRANSFORM_SWAP_ENDIAN    0x0200    /* read and write */
+#define PNG_TRANSFORM_INVERT_ALPHA   0x0400    /* read and write */
+#define PNG_TRANSFORM_STRIP_FILLER   0x0800    /* WRITE only */
+
+/* Flags for MNG supported features */
+#define PNG_FLAG_MNG_EMPTY_PLTE     0x01
+#define PNG_FLAG_MNG_FILTER_64      0x04
+#define PNG_ALL_MNG_FEATURES        0x05
+
+typedef png_voidp (*png_malloc_ptr) PNGARG((png_structp, png_size_t));
+typedef void (*png_free_ptr) PNGARG((png_structp, png_voidp));
+
+/* The structure that holds the information to read and write PNG files.
+ * The only people who need to care about what is inside of this are the
+ * people who will be modifying the library for their own special needs.
+ * It should NOT be accessed directly by an application, except to store
+ * the jmp_buf.
+ */
+
+struct png_struct_def
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf jmpbuf;            /* used in png_error */
+#endif
+   png_error_ptr error_fn;    /* function for printing errors and aborting */
+   png_error_ptr warning_fn;  /* function for printing warnings */
+   png_voidp error_ptr;       /* user supplied struct for error functions */
+   png_rw_ptr write_data_fn;  /* function for writing output data */
+   png_rw_ptr read_data_fn;   /* function for reading input data */
+   png_voidp io_ptr;          /* ptr to application struct for I/O functions */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   png_user_transform_ptr read_user_transform_fn; /* user read transform */
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   png_user_transform_ptr write_user_transform_fn; /* user write transform */
+#endif
+
+/* These were added in libpng-1.0.2 */
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   png_voidp user_transform_ptr; /* user supplied struct for user transform */
+   png_byte user_transform_depth;    /* bit depth of user transformed pixels */
+   png_byte user_transform_channels; /* channels in user transformed pixels */
+#endif
+#endif
+
+   png_uint_32 mode;          /* tells us where we are in the PNG file */
+   png_uint_32 flags;         /* flags indicating various things to libpng */
+   png_uint_32 transformations; /* which transformations to perform */
+
+   z_stream zstream;          /* pointer to decompression structure (below) */
+   png_bytep zbuf;            /* buffer for zlib */
+   png_size_t zbuf_size;      /* size of zbuf */
+   int zlib_level;            /* holds zlib compression level */
+   int zlib_method;           /* holds zlib compression method */
+   int zlib_window_bits;      /* holds zlib compression window bits */
+   int zlib_mem_level;        /* holds zlib compression memory level */
+   int zlib_strategy;         /* holds zlib compression strategy */
+
+   png_uint_32 width;         /* width of image in pixels */
+   png_uint_32 height;        /* height of image in pixels */
+   png_uint_32 num_rows;      /* number of rows in current pass */
+   png_uint_32 usr_width;     /* width of row at start of write */
+   png_uint_32 rowbytes;      /* size of row in bytes */
+   png_uint_32 irowbytes;     /* size of current interlaced row in bytes */
+   png_uint_32 iwidth;        /* width of current interlaced row in pixels */
+   png_uint_32 row_number;    /* current row in interlace pass */
+   png_bytep prev_row;        /* buffer to save previous (unfiltered) row */
+   png_bytep row_buf;         /* buffer to save current (unfiltered) row */
+   png_bytep sub_row;         /* buffer to save "sub" row when filtering */
+   png_bytep up_row;          /* buffer to save "up" row when filtering */
+   png_bytep avg_row;         /* buffer to save "avg" row when filtering */
+   png_bytep paeth_row;       /* buffer to save "Paeth" row when filtering */
+   png_row_info row_info;     /* used for transformation routines */
+
+   png_uint_32 idat_size;     /* current IDAT size for read */
+   png_uint_32 crc;           /* current chunk CRC value */
+   png_colorp palette;        /* palette from the input file */
+   png_uint_16 num_palette;   /* number of color entries in palette */
+   png_uint_16 num_trans;     /* number of transparency values */
+   png_byte chunk_name[5];    /* null-terminated name of current chunk */
+   png_byte compression;      /* file compression type (always 0) */
+   png_byte filter;           /* file filter type (always 0) */
+   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
+   png_byte pass;             /* current interlace pass (0 - 6) */
+   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ below ) */
+   png_byte color_type;       /* color type of file */
+   png_byte bit_depth;        /* bit depth of file */
+   png_byte usr_bit_depth;    /* bit depth of users row */
+   png_byte pixel_depth;      /* number of bits per pixel */
+   png_byte channels;         /* number of channels in file */
+   png_byte usr_channels;     /* channels at start of write */
+   png_byte sig_bytes;        /* magic bytes read/written from start of file */
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+#ifdef PNG_LEGACY_SUPPORTED
+   png_byte filler;           /* filler byte for pixel expansion */
+#else
+   png_uint_16 filler;           /* filler bytes for pixel expansion */
+#endif
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED)
+   png_byte background_gamma_type;
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+   float background_gamma;
+#  endif
+   png_color_16 background;   /* background color in screen gamma space */
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   png_color_16 background_1; /* background normalized to gamma 1.0 */
+#endif
+#endif /* PNG_bKGD_SUPPORTED */
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+   png_flush_ptr output_flush_fn;/* Function for flushing output */
+   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */
+   png_uint_32 flush_rows;    /* number of rows written since last flush */
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   int gamma_shift;      /* number of "insignificant" bits 16-bit gamma */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float gamma;          /* file gamma value */
+   float screen_gamma;   /* screen gamma value (display_exponent) */
+#endif
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_bytep gamma_table;     /* gamma table for 8-bit depth files */
+   png_bytep gamma_from_1;    /* converts from 1.0 to screen */
+   png_bytep gamma_to_1;      /* converts from file to 1.0 */
+   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
+   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
+   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
+   png_color_8 sig_bit;       /* significant bits in each available channel */
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+   png_color_8 shift;         /* shift for significant bit tranformation */
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \
+ || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_bytep trans;           /* transparency values for paletted files */
+   png_color_16 trans_values; /* transparency values for non-paletted files */
+#endif
+
+   png_read_status_ptr read_row_fn;   /* called after each row is decoded */
+   png_write_status_ptr write_row_fn; /* called after each row is encoded */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+   png_progressive_info_ptr info_fn; /* called after header data fully read */
+   png_progressive_row_ptr row_fn;   /* called after each prog. row is decoded */
+   png_progressive_end_ptr end_fn;   /* called after image is complete */
+   png_bytep save_buffer_ptr;        /* current location in save_buffer */
+   png_bytep save_buffer;            /* buffer for previously read data */
+   png_bytep current_buffer_ptr;     /* current location in current_buffer */
+   png_bytep current_buffer;         /* buffer for recently used data */
+   png_uint_32 push_length;          /* size of current input chunk */
+   png_uint_32 skip_length;          /* bytes to skip in input data */
+   png_size_t save_buffer_size;      /* amount of data now in save_buffer */
+   png_size_t save_buffer_max;       /* total size of save_buffer */
+   png_size_t buffer_size;           /* total amount of available input data */
+   png_size_t current_buffer_size;   /* amount of data now in current_buffer */
+   int process_mode;                 /* what push library is currently doing */
+   int cur_palette;                  /* current push library palette index */
+
+#  if defined(PNG_TEXT_SUPPORTED)
+     png_size_t current_text_size;   /* current size of text input data */
+     png_size_t current_text_left;   /* how much text left to read in input */
+     png_charp current_text;         /* current text chunk buffer */
+     png_charp current_text_ptr;     /* current location in current_text */
+#  endif /* PNG_PROGRESSIVE_READ_SUPPORTED && PNG_TEXT_SUPPORTED */
+
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* for the Borland special 64K segment handler */
+   png_bytepp offset_table_ptr;
+   png_bytep offset_table;
+   png_uint_16 offset_table_number;
+   png_uint_16 offset_table_count;
+   png_uint_16 offset_table_count_free;
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   png_bytep palette_lookup;         /* lookup table for dithering */
+   png_bytep dither_index;           /* index translation for palette files */
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED) || defined(PNG_hIST_SUPPORTED)
+   png_uint_16p hist;                /* histogram */
+#endif
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_byte heuristic_method;        /* heuristic for row filter selection */
+   png_byte num_prev_filters;        /* number of weights for previous rows */
+   png_bytep prev_filters;           /* filter type(s) of previous row(s) */
+   png_uint_16p filter_weights;      /* weight(s) for previous line(s) */
+   png_uint_16p inv_filter_weights;  /* 1/weight(s) for previous line(s) */
+   png_uint_16p filter_costs;        /* relative filter calculation cost */
+   png_uint_16p inv_filter_costs;    /* 1/relative filter calculation cost */
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+   png_charp time_buffer;            /* String to hold RFC 1123 time text */
+#endif
+
+/* New members added in libpng-1.0.6 */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_uint_32 free_me;       /* flags items libpng is responsible for freeing */
+#endif
+
+#if defined(PNG_USER_CHUNKS_SUPPORTED)
+   png_voidp user_chunk_ptr;
+   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+   int num_chunk_list;
+   png_bytep chunk_list;
+#endif
+
+/* New members added in libpng-1.0.3 */
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+   png_byte rgb_to_gray_status;
+   /* These were changed from png_byte in libpng-1.0.6 */
+   png_uint_16 rgb_to_gray_red_coeff;
+   png_uint_16 rgb_to_gray_green_coeff;
+   png_uint_16 rgb_to_gray_blue_coeff;
+#endif
+
+/* New member added in libpng-1.0.4 (renamed in 1.0.9) */
+#if defined(PNG_MNG_FEATURES_SUPPORTED) || \
+    defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+/* changed from png_byte to png_uint_32 at version 1.2.0 */
+#ifdef PNG_1_0_X
+   png_byte mng_features_permitted;
+#else
+   png_uint_32 mng_features_permitted;
+#endif /* PNG_1_0_X */
+#endif
+
+/* New member added in libpng-1.0.7 */
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_fixed_point int_gamma;
+#endif
+
+/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   png_byte filter_type;
+#endif
+
+#if defined(PNG_1_0_X) || (defined(PNG_DEBUG) && defined(PNG_USE_PNGGCCRD))
+/* New member added in libpng-1.0.10, ifdef'ed out in 1.2.0 */
+   png_uint_32 row_buf_size;
+#endif
+
+/* New members added in libpng-1.2.0 */
+#if !defined(PNG_1_0_X) && defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+   png_byte     mmx_bitdepth_threshold;
+   png_uint_32  mmx_rowbytes_threshold;
+   png_uint_32  asm_flags;
+#endif
+
+/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_voidp mem_ptr;                /* user supplied struct for mem functions */
+   png_malloc_ptr malloc_fn;         /* function for allocating memory */
+   png_free_ptr free_fn;             /* function for freeing memory */
+#endif
+
+/* New member added in libpng-1.0.13 and 1.2.0 */
+   png_bytep big_row_buf;         /* buffer to save current (unfiltered) row */
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* The following three members were added at version 1.0.14 and 1.2.4 */
+   png_bytep dither_sort;            /* working sort array */
+   png_bytep index_to_palette;       /* where the original index currently is */
+                                     /* in the palette */
+   png_bytep palette_to_index;       /* which original index points to this */
+                                     /* palette color */
+#endif
+
+/* New members added in libpng-1.0.16 and 1.2.6 */
+   png_byte compression_type;
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_uint_32 user_width_max;
+   png_uint_32 user_height_max;
+#endif
+
+};
+
+
+/* This triggers a compiler error in png.c, if png.c and png.h
+ * do not agree upon the version number.
+ */
+typedef png_structp version_1_2_7;
+
+typedef png_struct FAR * FAR * png_structpp;
+
+/* Here are the function definitions most commonly used.  This is not
+ * the place to find out how to use libpng.  See libpng.txt for the
+ * full explanation, see example.c for the summary.  This just provides
+ * a simple one line description of the use of each function.
+ */
+
+/* Returns the version number of the library */
+extern PNG_EXPORT(png_uint_32,png_access_version_number) PNGARG((void));
+
+/* Tell lib we have already handled the first <num_bytes> magic bytes.
+ * Handling more than 8 bytes from the beginning of the file is an error.
+ */
+extern PNG_EXPORT(void,png_set_sig_bytes) PNGARG((png_structp png_ptr,
+   int num_bytes));
+
+/* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
+ * PNG file.  Returns zero if the supplied bytes match the 8-byte PNG
+ * signature, and non-zero otherwise.  Having num_to_check == 0 or
+ * start > 7 will always fail (ie return non-zero).
+ */
+extern PNG_EXPORT(int,png_sig_cmp) PNGARG((png_bytep sig, png_size_t start,
+   png_size_t num_to_check));
+
+/* Simple signature checking function.  This is the same as calling
+ * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
+ */
+extern PNG_EXPORT(int,png_check_sig) PNGARG((png_bytep sig, int num));
+
+/* Allocate and initialize png_ptr struct for reading, and any other memory. */
+extern PNG_EXPORT(png_structp,png_create_read_struct)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn));
+
+/* Allocate and initialize png_ptr struct for writing, and any other memory */
+extern PNG_EXPORT(png_structp,png_create_write_struct)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn));
+
+#ifdef PNG_WRITE_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_compression_buffer_size)
+   PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+extern PNG_EXPORT(void,png_set_compression_buffer_size)
+   PNGARG((png_structp png_ptr, png_uint_32 size));
+#endif
+
+/* Reset the compression stream */
+extern PNG_EXPORT(int,png_reset_zstream) PNGARG((png_structp png_ptr));
+
+/* New functions added in libpng-1.0.2 (not enabled by default until 1.2.0) */
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_structp,png_create_read_struct_2)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+extern PNG_EXPORT(png_structp,png_create_write_struct_2)
+   PNGARG((png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+#endif
+
+/* Write a PNG chunk - size, type, (optional) data, CRC. */
+extern PNG_EXPORT(void,png_write_chunk) PNGARG((png_structp png_ptr,
+   png_bytep chunk_name, png_bytep data, png_size_t length));
+
+/* Write the start of a PNG chunk - length and chunk name. */
+extern PNG_EXPORT(void,png_write_chunk_start) PNGARG((png_structp png_ptr,
+   png_bytep chunk_name, png_uint_32 length));
+
+/* Write the data of a PNG chunk started with png_write_chunk_start(). */
+extern PNG_EXPORT(void,png_write_chunk_data) PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+/* Finish a chunk started with png_write_chunk_start() (includes CRC). */
+extern PNG_EXPORT(void,png_write_chunk_end) PNGARG((png_structp png_ptr));
+
+/* Allocate and initialize the info structure */
+extern PNG_EXPORT(png_infop,png_create_info_struct)
+   PNGARG((png_structp png_ptr));
+
+/* Initialize the info structure (old interface - DEPRECATED) */
+extern PNG_EXPORT(void,png_info_init) PNGARG((png_infop info_ptr));
+#undef png_info_init
+#define png_info_init(info_ptr) png_info_init_3(&info_ptr,\
+    png_sizeof(png_info));
+extern PNG_EXPORT(void,png_info_init_3) PNGARG((png_infopp info_ptr,
+    png_size_t png_info_struct_size));
+
+/* Writes all the PNG information before the image. */
+extern PNG_EXPORT(void,png_write_info_before_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+extern PNG_EXPORT(void,png_write_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read the information before the actual image data. */
+extern PNG_EXPORT(void,png_read_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+extern PNG_EXPORT(png_charp,png_convert_to_rfc1123)
+   PNGARG((png_structp png_ptr, png_timep ptime));
+#endif
+
+#if !defined(_WIN32_WCE)
+/* "time.h" functions are not supported on WindowsCE */
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+/* convert from a struct tm to png_time */
+extern PNG_EXPORT(void,png_convert_from_struct_tm) PNGARG((png_timep ptime,
+   struct tm FAR * ttime));
+
+/* convert from time_t to png_time.  Uses gmtime() */
+extern PNG_EXPORT(void,png_convert_from_time_t) PNGARG((png_timep ptime,
+   time_t ttime));
+#endif /* PNG_WRITE_tIME_SUPPORTED */
+#endif /* _WIN32_WCE */
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
+extern PNG_EXPORT(void,png_set_expand) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(void,png_set_gray_1_2_4_to_8) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(void,png_set_palette_to_rgb) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(void,png_set_tRNS_to_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* Use blue, green, red order for pixels. */
+extern PNG_EXPORT(void,png_set_bgr) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+/* Expand the grayscale to 24-bit RGB if necessary. */
+extern PNG_EXPORT(void,png_set_gray_to_rgb) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+/* Reduce RGB to grayscale. */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_rgb_to_gray) PNGARG((png_structp png_ptr,
+   int error_action, double red, double green ));
+#endif
+extern PNG_EXPORT(void,png_set_rgb_to_gray_fixed) PNGARG((png_structp png_ptr,
+   int error_action, png_fixed_point red, png_fixed_point green ));
+extern PNG_EXPORT(png_byte,png_get_rgb_to_gray_status) PNGARG((png_structp
+   png_ptr));
+#endif
+
+extern PNG_EXPORT(void,png_build_grayscale_palette) PNGARG((int bit_depth,
+   png_colorp palette));
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_strip_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_swap_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+extern PNG_EXPORT(void,png_set_invert_alpha) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte to 8-bit Gray or 24-bit RGB images. */
+extern PNG_EXPORT(void,png_set_filler) PNGARG((png_structp png_ptr,
+   png_uint_32 filler, int flags));
+/* The values of the PNG_FILLER_ defines should NOT be changed */
+#define PNG_FILLER_BEFORE 0
+#define PNG_FILLER_AFTER 1
+/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
+#if !defined(PNG_1_0_X)
+extern PNG_EXPORT(void,png_set_add_alpha) PNGARG((png_structp png_ptr,
+   png_uint_32 filler, int flags));
+#endif
+#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* Swap bytes in 16-bit depth files. */
+extern PNG_EXPORT(void,png_set_swap) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* Use 1 byte per pixel in 1, 2, or 4-bit depth files. */
+extern PNG_EXPORT(void,png_set_packing) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* Swap packing order of pixels in bytes. */
+extern PNG_EXPORT(void,png_set_packswap) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+/* Converts files to legal bit depths. */
+extern PNG_EXPORT(void,png_set_shift) PNGARG((png_structp png_ptr,
+   png_color_8p true_bits));
+#endif
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+    defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* Have the code handle the interlacing.  Returns the number of passes. */
+extern PNG_EXPORT(int,png_set_interlace_handling) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+/* Invert monochrome files */
+extern PNG_EXPORT(void,png_set_invert_mono) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+/* Handle alpha and tRNS by replacing with a background color. */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr,
+   png_color_16p background_color, int background_gamma_code,
+   int need_expand, double background_gamma));
+#endif
+#define PNG_BACKGROUND_GAMMA_UNKNOWN 0
+#define PNG_BACKGROUND_GAMMA_SCREEN  1
+#define PNG_BACKGROUND_GAMMA_FILE    2
+#define PNG_BACKGROUND_GAMMA_UNIQUE  3
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* strip the second byte of information from a 16-bit depth file. */
+extern PNG_EXPORT(void,png_set_strip_16) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* Turn on dithering, and reduce the palette to the number of colors available. */
+extern PNG_EXPORT(void,png_set_dither) PNGARG((png_structp png_ptr,
+   png_colorp palette, int num_palette, int maximum_colors,
+   png_uint_16p histogram, int full_dither));
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+/* Handle gamma correction. Screen_gamma=(display_exponent) */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_gamma) PNGARG((png_structp png_ptr,
+   double screen_gamma, double default_file_gamma));
+#endif
+#endif
+
+#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+/* Permit or disallow empty PLTE (0: not permitted, 1: permitted) */
+/* Deprecated and will be removed.  Use png_permit_mng_features() instead. */
+extern PNG_EXPORT(void,png_permit_empty_plte) PNGARG((png_structp png_ptr,
+   int empty_plte_permitted));
+#endif
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+/* Set how many lines between output flushes - 0 for no flushing */
+extern PNG_EXPORT(void,png_set_flush) PNGARG((png_structp png_ptr, int nrows));
+/* Flush the current PNG output buffer */
+extern PNG_EXPORT(void,png_write_flush) PNGARG((png_structp png_ptr));
+#endif
+
+/* optional update palette with requested transformations */
+extern PNG_EXPORT(void,png_start_read_image) PNGARG((png_structp png_ptr));
+
+/* optional call to update the users info structure */
+extern PNG_EXPORT(void,png_read_update_info) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read one or more rows of image data. */
+extern PNG_EXPORT(void,png_read_rows) PNGARG((png_structp png_ptr,
+   png_bytepp row, png_bytepp display_row, png_uint_32 num_rows));
+#endif
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read a row of data. */
+extern PNG_EXPORT(void,png_read_row) PNGARG((png_structp png_ptr,
+   png_bytep row,
+   png_bytep display_row));
+#endif
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read the whole image into memory at once. */
+extern PNG_EXPORT(void,png_read_image) PNGARG((png_structp png_ptr,
+   png_bytepp image));
+#endif
+
+/* write a row of image data */
+extern PNG_EXPORT(void,png_write_row) PNGARG((png_structp png_ptr,
+   png_bytep row));
+
+/* write a few rows of image data */
+extern PNG_EXPORT(void,png_write_rows) PNGARG((png_structp png_ptr,
+   png_bytepp row, png_uint_32 num_rows));
+
+/* write the image data */
+extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
+   png_bytepp image));
+
+/* writes the end of the PNG file. */
+extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* read the end of the PNG file. */
+extern PNG_EXPORT(void,png_read_end) PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+/* free any memory associated with the png_info_struct */
+extern PNG_EXPORT(void,png_destroy_info_struct) PNGARG((png_structp png_ptr,
+   png_infopp info_ptr_ptr));
+
+/* free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
+   png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
+
+/* free all memory used by the read (old method - NOT DLL EXPORTED) */
+extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_infop end_info_ptr));
+
+/* free any memory associated with the png_struct and the png_info_structs */
+extern PNG_EXPORT(void,png_destroy_write_struct)
+   PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
+
+/* free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
+extern void png_write_destroy PNGARG((png_structp png_ptr));
+
+/* set the libpng method of handling chunk CRC errors */
+extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
+   int crit_action, int ancil_action));
+
+/* Values for png_set_crc_action() to say how to handle CRC errors in
+ * ancillary and critical chunks, and whether to use the data contained
+ * therein.  Note that it is impossible to "discard" data in a critical
+ * chunk.  For versions prior to 0.90, the action was always error/quit,
+ * whereas in version 0.90 and later, the action for CRC errors in ancillary
+ * chunks is warn/discard.  These values should NOT be changed.
+ *
+ *      value                       action:critical     action:ancillary
+ */
+#define PNG_CRC_DEFAULT       0  /* error/quit          warn/discard data */
+#define PNG_CRC_ERROR_QUIT    1  /* error/quit          error/quit        */
+#define PNG_CRC_WARN_DISCARD  2  /* (INVALID)           warn/discard data */
+#define PNG_CRC_WARN_USE      3  /* warn/use data       warn/use data     */
+#define PNG_CRC_QUIET_USE     4  /* quiet/use data      quiet/use data    */
+#define PNG_CRC_NO_CHANGE     5  /* use current value   use current value */
+
+/* These functions give the user control over the scan-line filtering in
+ * libpng and the compression methods used by zlib.  These functions are
+ * mainly useful for testing, as the defaults should work with most users.
+ * Those users who are tight on memory or want faster performance at the
+ * expense of compression can modify them.  See the compression library
+ * header file (zlib.h) for an explination of the compression functions.
+ */
+
+/* set the filtering method(s) used by libpng.  Currently, the only valid
+ * value for "method" is 0.
+ */
+extern PNG_EXPORT(void,png_set_filter) PNGARG((png_structp png_ptr, int method,
+   int filters));
+
+/* Flags for png_set_filter() to say which filters to use.  The flags
+ * are chosen so that they don't conflict with real filter types
+ * below, in case they are supplied instead of the #defined constants.
+ * These values should NOT be changed.
+ */
+#define PNG_NO_FILTERS     0x00
+#define PNG_FILTER_NONE    0x08
+#define PNG_FILTER_SUB     0x10
+#define PNG_FILTER_UP      0x20
+#define PNG_FILTER_AVG     0x40
+#define PNG_FILTER_PAETH   0x80
+#define PNG_ALL_FILTERS (PNG_FILTER_NONE | PNG_FILTER_SUB | PNG_FILTER_UP | \
+                         PNG_FILTER_AVG | PNG_FILTER_PAETH)
+
+/* Filter values (not flags) - used in pngwrite.c, pngwutil.c for now.
+ * These defines should NOT be changed.
+ */
+#define PNG_FILTER_VALUE_NONE  0
+#define PNG_FILTER_VALUE_SUB   1
+#define PNG_FILTER_VALUE_UP    2
+#define PNG_FILTER_VALUE_AVG   3
+#define PNG_FILTER_VALUE_PAETH 4
+#define PNG_FILTER_VALUE_LAST  5
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) /* EXPERIMENTAL */
+/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_
+ * defines, either the default (minimum-sum-of-absolute-differences), or
+ * the experimental method (weighted-minimum-sum-of-absolute-differences).
+ *
+ * Weights are factors >= 1.0, indicating how important it is to keep the
+ * filter type consistent between rows.  Larger numbers mean the current
+ * filter is that many times as likely to be the same as the "num_weights"
+ * previous filters.  This is cumulative for each previous row with a weight.
+ * There needs to be "num_weights" values in "filter_weights", or it can be
+ * NULL if the weights aren't being specified.  Weights have no influence on
+ * the selection of the first row filter.  Well chosen weights can (in theory)
+ * improve the compression for a given image.
+ *
+ * Costs are factors >= 1.0 indicating the relative decoding costs of a
+ * filter type.  Higher costs indicate more decoding expense, and are
+ * therefore less likely to be selected over a filter with lower computational
+ * costs.  There needs to be a value in "filter_costs" for each valid filter
+ * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't
+ * setting the costs.  Costs try to improve the speed of decompression without
+ * unduly increasing the compressed image size.
+ *
+ * A negative weight or cost indicates the default value is to be used, and
+ * values in the range [0.0, 1.0) indicate the value is to remain unchanged.
+ * The default values for both weights and costs are currently 1.0, but may
+ * change if good general weighting/cost heuristics can be found.  If both
+ * the weights and costs are set to 1.0, this degenerates the WEIGHTED method
+ * to the UNWEIGHTED method, but with added encoding time/computation.
+ */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_filter_heuristics) PNGARG((png_structp png_ptr,
+   int heuristic_method, int num_weights, png_doublep filter_weights,
+   png_doublep filter_costs));
+#endif
+#endif /*  PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+/* Heuristic used for row filter selection.  These defines should NOT be
+ * changed.
+ */
+#define PNG_FILTER_HEURISTIC_DEFAULT    0  /* Currently "UNWEIGHTED" */
+#define PNG_FILTER_HEURISTIC_UNWEIGHTED 1  /* Used by libpng < 0.95 */
+#define PNG_FILTER_HEURISTIC_WEIGHTED   2  /* Experimental feature */
+#define PNG_FILTER_HEURISTIC_LAST       3  /* Not a valid value */
+
+/* Set the library compression level.  Currently, valid values range from
+ * 0 - 9, corresponding directly to the zlib compression levels 0 - 9
+ * (0 - no compression, 9 - "maximal" compression).  Note that tests have
+ * shown that zlib compression levels 3-6 usually perform as well as level 9
+ * for PNG images, and do considerably fewer caclulations.  In the future,
+ * these values may not correspond directly to the zlib compression levels.
+ */
+extern PNG_EXPORT(void,png_set_compression_level) PNGARG((png_structp png_ptr,
+   int level));
+
+extern PNG_EXPORT(void,png_set_compression_mem_level)
+   PNGARG((png_structp png_ptr, int mem_level));
+
+extern PNG_EXPORT(void,png_set_compression_strategy)
+   PNGARG((png_structp png_ptr, int strategy));
+
+extern PNG_EXPORT(void,png_set_compression_window_bits)
+   PNGARG((png_structp png_ptr, int window_bits));
+
+extern PNG_EXPORT(void,png_set_compression_method) PNGARG((png_structp png_ptr,
+   int method));
+
+/* These next functions are called for input/output, memory, and error
+ * handling.  They are in the file pngrio.c, pngwio.c, and pngerror.c,
+ * and call standard C I/O routines such as fread(), fwrite(), and
+ * fprintf().  These functions can be made to use other I/O routines
+ * at run time for those applications that need to handle I/O in a
+ * different manner by calling png_set_???_fn().  See libpng.txt for
+ * more information.
+ */
+
+#if !defined(PNG_NO_STDIO)
+/* Initialize the input/output for the PNG file to the default functions. */
+extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, png_FILE_p fp));
+#endif
+
+/* Replace the (error and abort), and warning functions with user
+ * supplied functions.  If no messages are to be printed you must still
+ * write and use replacement functions. The replacement error_fn should
+ * still do a longjmp to the last setjmp location if you are using this
+ * method of error handling.  If error_fn or warning_fn is NULL, the
+ * default function will be used.
+ */
+
+extern PNG_EXPORT(void,png_set_error_fn) PNGARG((png_structp png_ptr,
+   png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn));
+
+/* Return the user pointer associated with the error functions */
+extern PNG_EXPORT(png_voidp,png_get_error_ptr) PNGARG((png_structp png_ptr));
+
+/* Replace the default data output functions with a user supplied one(s).
+ * If buffered output is not used, then output_flush_fn can be set to NULL.
+ * If PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile time
+ * output_flush_fn will be ignored (and thus can be NULL).
+ */
+extern PNG_EXPORT(void,png_set_write_fn) PNGARG((png_structp png_ptr,
+   png_voidp io_ptr, png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn));
+
+/* Replace the default data input function with a user supplied one. */
+extern PNG_EXPORT(void,png_set_read_fn) PNGARG((png_structp png_ptr,
+   png_voidp io_ptr, png_rw_ptr read_data_fn));
+
+/* Return the user pointer associated with the I/O functions */
+extern PNG_EXPORT(png_voidp,png_get_io_ptr) PNGARG((png_structp png_ptr));
+
+extern PNG_EXPORT(void,png_set_read_status_fn) PNGARG((png_structp png_ptr,
+   png_read_status_ptr read_row_fn));
+
+extern PNG_EXPORT(void,png_set_write_status_fn) PNGARG((png_structp png_ptr,
+   png_write_status_ptr write_row_fn));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* Replace the default memory allocation functions with user supplied one(s). */
+extern PNG_EXPORT(void,png_set_mem_fn) PNGARG((png_structp png_ptr,
+   png_voidp mem_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn));
+/* Return the user pointer associated with the memory functions */
+extern PNG_EXPORT(png_voidp,png_get_mem_ptr) PNGARG((png_structp png_ptr));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_read_user_transform_fn) PNGARG((png_structp
+   png_ptr, png_user_transform_ptr read_user_transform_fn));
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_write_user_transform_fn) PNGARG((png_structp
+   png_ptr, png_user_transform_ptr write_user_transform_fn));
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+extern PNG_EXPORT(void,png_set_user_transform_info) PNGARG((png_structp
+   png_ptr, png_voidp user_transform_ptr, int user_transform_depth,
+   int user_transform_channels));
+/* Return the user pointer associated with the user transform functions */
+extern PNG_EXPORT(png_voidp,png_get_user_transform_ptr)
+   PNGARG((png_structp png_ptr));
+#endif
+
+#ifdef PNG_USER_CHUNKS_SUPPORTED
+extern PNG_EXPORT(void,png_set_read_user_chunk_fn) PNGARG((png_structp png_ptr,
+   png_voidp user_chunk_ptr, png_user_chunk_ptr read_user_chunk_fn));
+extern PNG_EXPORT(png_voidp,png_get_user_chunk_ptr) PNGARG((png_structp
+   png_ptr));
+#endif
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+/* Sets the function callbacks for the push reader, and a pointer to a
+ * user-defined structure available to the callback functions.
+ */
+extern PNG_EXPORT(void,png_set_progressive_read_fn) PNGARG((png_structp png_ptr,
+   png_voidp progressive_ptr,
+   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+   png_progressive_end_ptr end_fn));
+
+/* returns the user pointer associated with the push read functions */
+extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
+   PNGARG((png_structp png_ptr));
+
+/* function to be called when data becomes available */
+extern PNG_EXPORT(void,png_process_data) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep buffer, png_size_t buffer_size));
+
+/* function that combines rows.  Not very much different than the
+ * png_combine_row() call.  Is this even used?????
+ */
+extern PNG_EXPORT(void,png_progressive_combine_row) PNGARG((png_structp png_ptr,
+   png_bytep old_row, png_bytep new_row));
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+extern PNG_EXPORT(png_voidp,png_malloc) PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+
+#if defined(PNG_1_0_X)
+#  define png_malloc_warn png_malloc
+#else
+/* Added at libpng version 1.2.4 */
+extern PNG_EXPORT(png_voidp,png_malloc_warn) PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+#endif
+
+/* frees a pointer allocated by png_malloc() */
+extern PNG_EXPORT(void,png_free) PNGARG((png_structp png_ptr, png_voidp ptr));
+
+#if defined(PNG_1_0_X)
+/* Function to allocate memory for zlib. */
+extern PNG_EXPORT(voidpf,png_zalloc) PNGARG((voidpf png_ptr, uInt items,
+   uInt size));
+
+/* Function to free memory for zlib */
+extern PNG_EXPORT(void,png_zfree) PNGARG((voidpf png_ptr, voidpf ptr));
+#endif
+
+/* Free data that was allocated internally */
+extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 free_me, int num));
+#ifdef PNG_FREE_ME_SUPPORTED
+/* Reassign responsibility for freeing existing data, whether allocated
+ * by libpng or by the application */
+extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int freer, png_uint_32 mask));
+#endif
+/* assignments for png_data_freer */
+#define PNG_DESTROY_WILL_FREE_DATA 1
+#define PNG_SET_WILL_FREE_DATA 1
+#define PNG_USER_WILL_FREE_DATA 2
+/* Flags for png_ptr->free_me and info_ptr->free_me */
+#define PNG_FREE_HIST 0x0008
+#define PNG_FREE_ICCP 0x0010
+#define PNG_FREE_SPLT 0x0020
+#define PNG_FREE_ROWS 0x0040
+#define PNG_FREE_PCAL 0x0080
+#define PNG_FREE_SCAL 0x0100
+#define PNG_FREE_UNKN 0x0200
+#define PNG_FREE_LIST 0x0400
+#define PNG_FREE_PLTE 0x1000
+#define PNG_FREE_TRNS 0x2000
+#define PNG_FREE_TEXT 0x4000
+#define PNG_FREE_ALL  0x7fff
+#define PNG_FREE_MUL  0x4220 /* PNG_FREE_SPLT|PNG_FREE_TEXT|PNG_FREE_UNKN */
+
+#ifdef PNG_USER_MEM_SUPPORTED
+extern PNG_EXPORT(png_voidp,png_malloc_default) PNGARG((png_structp png_ptr,
+   png_uint_32 size));
+extern PNG_EXPORT(void,png_free_default) PNGARG((png_structp png_ptr,
+   png_voidp ptr));
+#endif
+
+extern PNG_EXPORT(png_voidp,png_memcpy_check) PNGARG((png_structp png_ptr,
+   png_voidp s1, png_voidp s2, png_uint_32 size));
+
+extern PNG_EXPORT(png_voidp,png_memset_check) PNGARG((png_structp png_ptr,
+   png_voidp s1, int value, png_uint_32 size));
+
+#if defined(USE_FAR_KEYWORD)  /* memory model conversion function */
+extern void *png_far_to_near PNGARG((png_structp png_ptr,png_voidp ptr,
+   int check));
+#endif /* USE_FAR_KEYWORD */
+
+/* Fatal error in PNG image of libpng - can't continue */
+extern PNG_EXPORT(void,png_error) PNGARG((png_structp png_ptr,
+   png_const_charp error_message));
+
+/* The same, but the chunk name is prepended to the error string. */
+extern PNG_EXPORT(void,png_chunk_error) PNGARG((png_structp png_ptr,
+   png_const_charp error_message));
+
+/* Non-fatal error in libpng.  Can continue, but may have a problem. */
+extern PNG_EXPORT(void,png_warning) PNGARG((png_structp png_ptr,
+   png_const_charp warning_message));
+
+/* Non-fatal error in libpng, chunk name is prepended to message. */
+extern PNG_EXPORT(void,png_chunk_warning) PNGARG((png_structp png_ptr,
+   png_const_charp warning_message));
+
+/* The png_set_<chunk> functions are for storing values in the png_info_struct.
+ * Similarly, the png_get_<chunk> calls are used to read values from the
+ * png_info_struct, either storing the parameters in the passed variables, or
+ * setting pointers into the png_info_struct where the data is stored.  The
+ * png_get_<chunk> functions return a non-zero value if the data was available
+ * in info_ptr, or return zero and do not change any of the parameters if the
+ * data was not available.
+ *
+ * These functions should be used instead of directly accessing png_info
+ * to avoid problems with future changes in the size and internal layout of
+ * png_info_struct.
+ */
+/* Returns "flag" if chunk data is valid in info_ptr. */
+extern PNG_EXPORT(png_uint_32,png_get_valid) PNGARG((png_structp png_ptr,
+png_infop info_ptr, png_uint_32 flag));
+
+/* Returns number of bytes needed to hold a transformed row. */
+extern PNG_EXPORT(png_uint_32,png_get_rowbytes) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+/* Returns row_pointers, which is an array of pointers to scanlines that was
+returned from png_read_png(). */
+extern PNG_EXPORT(png_bytepp,png_get_rows) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+/* Set row_pointers, which is an array of pointers to scanlines for use
+by png_write_png(). */
+extern PNG_EXPORT(void,png_set_rows) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytepp row_pointers));
+#endif
+
+/* Returns number of color channels in image. */
+extern PNG_EXPORT(png_byte,png_get_channels) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* Returns image width in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_width) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image height in pixels. */
+extern PNG_EXPORT(png_uint_32, png_get_image_height) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image bit_depth. */
+extern PNG_EXPORT(png_byte, png_get_bit_depth) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image color_type. */
+extern PNG_EXPORT(png_byte, png_get_color_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image filter_type. */
+extern PNG_EXPORT(png_byte, png_get_filter_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image interlace_type. */
+extern PNG_EXPORT(png_byte, png_get_interlace_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image compression_type. */
+extern PNG_EXPORT(png_byte, png_get_compression_type) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns image resolution in pixels per meter, from pHYs chunk data. */
+extern PNG_EXPORT(png_uint_32, png_get_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_x_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_uint_32, png_get_y_pixels_per_meter) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+/* Returns pixel aspect ratio, computed from pHYs chunk data.  */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(float, png_get_pixel_aspect_ratio) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+#endif
+
+/* Returns image x, y offset in pixels or microns, from oFFs chunk data. */
+extern PNG_EXPORT(png_int_32, png_get_x_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_y_offset_pixels) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_x_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+extern PNG_EXPORT(png_int_32, png_get_y_offset_microns) PNGARG((png_structp
+png_ptr, png_infop info_ptr));
+
+#endif /* PNG_EASY_ACCESS_SUPPORTED */
+
+/* Returns pointer to signature string read from PNG header */
+extern PNG_EXPORT(png_bytep,png_get_signature) PNGARG((png_structp png_ptr,
+png_infop info_ptr));
+
+#if defined(PNG_bKGD_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_bKGD) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_16p *background));
+#endif
+
+#if defined(PNG_bKGD_SUPPORTED)
+extern PNG_EXPORT(void,png_set_bKGD) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_16p background));
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double *white_x, double *white_y, double *red_x,
+   double *red_y, double *green_x, double *green_y, double *blue_x,
+   double *blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point
+   *int_white_y, png_fixed_point *int_red_x, png_fixed_point *int_red_y,
+   png_fixed_point *int_green_x, png_fixed_point *int_green_y, png_fixed_point
+   *int_blue_x, png_fixed_point *int_blue_y));
+#endif
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double white_x, double white_y, double red_x,
+   double red_y, double green_x, double green_y, double blue_x, double blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y));
+#endif
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_gAMA) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double *file_gamma));
+#endif
+extern PNG_EXPORT(png_uint_32,png_get_gAMA_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point *int_file_gamma));
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_gAMA) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, double file_gamma));
+#endif
+extern PNG_EXPORT(void,png_set_gAMA_fixed) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_fixed_point int_file_gamma));
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_hIST) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_16p *hist));
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+extern PNG_EXPORT(void,png_set_hIST) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_16p hist));
+#endif
+
+extern PNG_EXPORT(png_uint_32,png_get_IHDR) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 *width, png_uint_32 *height,
+   int *bit_depth, int *color_type, int *interlace_method,
+   int *compression_method, int *filter_method));
+
+extern PNG_EXPORT(void,png_set_IHDR) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_method, int compression_method,
+   int filter_method));
+
+#if defined(PNG_oFFs_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_oFFs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
+   int *unit_type));
+#endif
+
+#if defined(PNG_oFFs_SUPPORTED)
+extern PNG_EXPORT(void,png_set_oFFs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_int_32 offset_x, png_int_32 offset_y,
+   int unit_type));
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_pCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp *purpose, png_int_32 *X0, png_int_32 *X1,
+   int *type, int *nparams, png_charp *units, png_charpp *params));
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+extern PNG_EXPORT(void,png_set_pCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp purpose, png_int_32 X0, png_int_32 X1,
+   int type, int nparams, png_charp units, png_charpp params));
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_pHYs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type));
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+extern PNG_EXPORT(void,png_set_pHYs) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 res_x, png_uint_32 res_y, int unit_type));
+#endif
+
+extern PNG_EXPORT(png_uint_32,png_get_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_colorp *palette, int *num_palette));
+
+extern PNG_EXPORT(void,png_set_PLTE) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_colorp palette, int num_palette));
+
+#if defined(PNG_sBIT_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sBIT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_8p *sig_bit));
+#endif
+
+#if defined(PNG_sBIT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sBIT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_color_8p sig_bit));
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sRGB) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *intent));
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sRGB) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int intent));
+extern PNG_EXPORT(void,png_set_sRGB_gAMA_and_cHRM) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int intent));
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_iCCP) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charpp name, int *compression_type,
+   png_charpp profile, png_uint_32 *proflen));
+   /* Note to maintainer: profile should be png_bytepp */
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+extern PNG_EXPORT(void,png_set_iCCP) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_charp name, int compression_type,
+   png_charp profile, png_uint_32 proflen));
+   /* Note to maintainer: profile should be png_bytep */
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_sPLT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_sPLT_tpp entries));
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_sPLT) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_sPLT_tp entries, int nentries));
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+/* png_get_text also returns the number of text chunks in *num_text */
+extern PNG_EXPORT(png_uint_32,png_get_text) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp *text_ptr, int *num_text));
+#endif
+
+/*
+ *  Note while png_set_text() will accept a structure whose text,
+ *  language, and  translated keywords are NULL pointers, the structure
+ *  returned by png_get_text will always contain regular
+ *  zero-terminated C strings.  They might be empty strings but
+ *  they will never be NULL pointers.
+ */
+
+#if defined(PNG_TEXT_SUPPORTED)
+extern PNG_EXPORT(void,png_set_text) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp text_ptr, int num_text));
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_tIME) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_timep *mod_time));
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+extern PNG_EXPORT(void,png_set_tIME) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_timep mod_time));
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+extern PNG_EXPORT(png_uint_32,png_get_tRNS) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep *trans, int *num_trans,
+   png_color_16p *trans_values));
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+extern PNG_EXPORT(void,png_set_tRNS) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_bytep trans, int num_trans,
+   png_color_16p trans_values));
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *unit, double *width, double *height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_get_sCAL_s) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int *unit, png_charpp swidth, png_charpp sheight));
+#endif
+#endif
+#endif /* PNG_sCAL_SUPPORTED */
+
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sCAL) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int unit, double width, double height));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int unit, png_charp swidth, png_charp sheight));
+#endif
+#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+/* provide a list of chunks and how they are to be handled, if the built-in
+   handling or default unknown chunk handling is not desired.  Any chunks not
+   listed will be handled in the default manner.  The IHDR and IEND chunks
+   must not be listed.
+      keep = 0: follow default behavour
+           = 1: do not keep
+           = 2: keep only if safe-to-copy
+           = 3: keep even if unsafe-to-copy
+*/
+extern PNG_EXPORT(void, png_set_keep_unknown_chunks) PNGARG((png_structp
+   png_ptr, int keep, png_bytep chunk_list, int num_chunks));
+extern PNG_EXPORT(void, png_set_unknown_chunks) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns));
+extern PNG_EXPORT(void, png_set_unknown_chunk_location)
+   PNGARG((png_structp png_ptr, png_infop info_ptr, int chunk, int location));
+extern PNG_EXPORT(png_uint_32,png_get_unknown_chunks) PNGARG((png_structp
+   png_ptr, png_infop info_ptr, png_unknown_chunkpp entries));
+#endif
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+PNG_EXPORT(int,png_handle_as_unknown) PNGARG((png_structp png_ptr, png_bytep
+   chunk_name));
+#endif
+
+/* Png_free_data() will turn off the "valid" flag for anything it frees.
+   If you need to turn it off for a chunk that your application has freed,
+   you can use png_set_invalid(png_ptr, info_ptr, PNG_INFO_CHNK); */
+extern PNG_EXPORT(void, png_set_invalid) PNGARG((png_structp png_ptr,
+   png_infop info_ptr, int mask));
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+/* The "params" pointer is currently not used and is for future expansion. */
+extern PNG_EXPORT(void, png_read_png) PNGARG((png_structp png_ptr,
+                        png_infop info_ptr,
+                        int transforms,
+                        png_voidp params));
+extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
+                        png_infop info_ptr,
+                        int transforms,
+                        png_voidp params));
+#endif
+
+/* Define PNG_DEBUG at compile time for debugging information.  Higher
+ * numbers for PNG_DEBUG mean more debugging information.  This has
+ * only been added since version 0.95 so it is not implemented throughout
+ * libpng yet, but more support will be added as needed.
+ */
+#ifdef PNG_DEBUG
+#if (PNG_DEBUG > 0)
+#if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)
+#include <crtdbg.h>
+#if (PNG_DEBUG > 1)
+#define png_debug(l,m)  _RPT0(_CRT_WARN,m)
+#define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m,p1)
+#define png_debug2(l,m,p1,p2) _RPT2(_CRT_WARN,m,p1,p2)
+#endif
+#else /* PNG_DEBUG_FILE || !_MSC_VER */
+#ifndef PNG_DEBUG_FILE
+#define PNG_DEBUG_FILE stderr
+#endif /* PNG_DEBUG_FILE */
+#if (PNG_DEBUG > 1)
+#define png_debug(l,m) \
+{ \
+     int num_tabs=l; \
+     fprintf(PNG_DEBUG_FILE,"%s"m,(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \
+}
+#define png_debug1(l,m,p1) \
+{ \
+     int num_tabs=l; \
+     fprintf(PNG_DEBUG_FILE,"%s"m,(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \
+}
+#define png_debug2(l,m,p1,p2) \
+{ \
+     int num_tabs=l; \
+     fprintf(PNG_DEBUG_FILE,"%s"m,(num_tabs==1 ? "\t" : \
+       (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \
+}
+#endif /* (PNG_DEBUG > 1) */
+#endif /* _MSC_VER */
+#endif /* (PNG_DEBUG > 0) */
+#endif /* PNG_DEBUG */
+#ifndef png_debug
+#define png_debug(l, m)
+#endif
+#ifndef png_debug1
+#define png_debug1(l, m, p1)
+#endif
+#ifndef png_debug2
+#define png_debug2(l, m, p1, p2)
+#endif
+
+extern PNG_EXPORT(png_bytep,png_sig_bytes) PNGARG((void));
+
+extern PNG_EXPORT(png_charp,png_get_copyright) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_header_ver) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr));
+extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+extern PNG_EXPORT(png_uint_32,png_permit_mng_features) PNGARG((png_structp
+   png_ptr, png_uint_32 mng_features_permitted));
+#endif
+
+/* For use in png_set_keep_unknown, added to version 1.2.6 */
+#define PNG_HANDLE_CHUNK_AS_DEFAULT   0
+#define PNG_HANDLE_CHUNK_NEVER        1
+#define PNG_HANDLE_CHUNK_IF_SAFE      2
+#define PNG_HANDLE_CHUNK_ALWAYS       3
+
+/* Added to version 1.2.0 */
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#define PNG_ASM_FLAG_MMX_SUPPORT_COMPILED  0x01  /* not user-settable */
+#define PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU    0x02  /* not user-settable */
+#define PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  0x04
+#define PNG_ASM_FLAG_MMX_READ_INTERLACE    0x08
+#define PNG_ASM_FLAG_MMX_READ_FILTER_SUB   0x10
+#define PNG_ASM_FLAG_MMX_READ_FILTER_UP    0x20
+#define PNG_ASM_FLAG_MMX_READ_FILTER_AVG   0x40
+#define PNG_ASM_FLAG_MMX_READ_FILTER_PAETH 0x80
+#define PNG_ASM_FLAGS_INITIALIZED          0x80000000  /* not user-settable */
+
+#define PNG_MMX_READ_FLAGS ( PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  \
+                           | PNG_ASM_FLAG_MMX_READ_INTERLACE    \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_UP    \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
+                           | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH )
+#define PNG_MMX_WRITE_FLAGS ( 0 )
+
+#define PNG_MMX_FLAGS ( PNG_ASM_FLAG_MMX_SUPPORT_COMPILED \
+                      | PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU   \
+                      | PNG_MMX_READ_FLAGS                \
+                      | PNG_MMX_WRITE_FLAGS )
+
+#define PNG_SELECT_READ   1
+#define PNG_SELECT_WRITE  2
+
+#if !defined(PNG_1_0_X)
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_mmx_flagmask)
+   PNGARG((int flag_select, int *compilerID));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_asm_flagmask)
+   PNGARG((int flag_select));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_asm_flags)
+   PNGARG((png_structp png_ptr));
+
+/* pngget.c */
+extern PNG_EXPORT(png_byte,png_get_mmx_bitdepth_threshold)
+   PNGARG((png_structp png_ptr));
+
+/* pngget.c */
+extern PNG_EXPORT(png_uint_32,png_get_mmx_rowbytes_threshold)
+   PNGARG((png_structp png_ptr));
+
+/* pngset.c */
+extern PNG_EXPORT(void,png_set_asm_flags)
+   PNGARG((png_structp png_ptr, png_uint_32 asm_flags));
+
+/* pngset.c */
+extern PNG_EXPORT(void,png_set_mmx_thresholds)
+   PNGARG((png_structp png_ptr, png_byte mmx_bitdepth_threshold,
+   png_uint_32 mmx_rowbytes_threshold));
+
+#endif /* PNG_1_0_X */
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#if !defined(PNG_1_0_X)
+/* png.c, pnggccrd.c, or pngvcrd.c */
+extern PNG_EXPORT(int,png_mmx_support) PNGARG((void));
+
+/* Strip the prepended error numbers ("#nnn ") from error and warning
+ * messages before passing them to the error or warning handler. */
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp
+   png_ptr, png_uint_32 strip_mode));
+#endif
+
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+extern PNG_EXPORT(void,png_set_user_limits) PNGARG((png_structp
+   png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max));
+extern PNG_EXPORT(png_uint_32,png_get_user_width_max) PNGARG((png_structp
+   png_ptr));
+extern PNG_EXPORT(png_uint_32,png_get_user_height_max) PNGARG((png_structp
+   png_ptr));
+#endif
+
+/* Maintainer: Put new public prototypes here ^, in libpng.3, and project defs */
+
+#ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
+/* With these routines we avoid an integer divide, which will be slower on
+ * most machines.  However, it does take more operations than the corresponding
+ * divide method, so it may be slower on a few RISC systems.  There are two
+ * shifts (by 8 or 16 bits) and an addition, versus a single integer divide.
+ *
+ * Note that the rounding factors are NOT supposed to be the same!  128 and
+ * 32768 are correct for the NODIV code; 127 and 32767 are correct for the
+ * standard method.
+ *
+ * [Optimized code by Greg Roelofs and Mark Adler...blame us for bugs. :-) ]
+ */
+
+ /* fg and bg should be in `gamma 1.0' space; alpha is the opacity          */
+
+#  define png_composite(composite, fg, alpha, bg)                            \
+     { png_uint_16 temp = (png_uint_16)((png_uint_16)(fg) * (png_uint_16)(alpha) \
+                        +        (png_uint_16)(bg)*(png_uint_16)(255 -       \
+                        (png_uint_16)(alpha)) + (png_uint_16)128);           \
+       (composite) = (png_byte)((temp + (temp >> 8)) >> 8); }
+
+#  define png_composite_16(composite, fg, alpha, bg)                         \
+     { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) * (png_uint_32)(alpha) \
+                        + (png_uint_32)(bg)*(png_uint_32)(65535L -           \
+                        (png_uint_32)(alpha)) + (png_uint_32)32768L);        \
+       (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); }
+
+#else  /* standard method using integer division */
+
+#  define png_composite(composite, fg, alpha, bg)                            \
+     (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) +    \
+       (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) +       \
+       (png_uint_16)127) / 255)
+
+#  define png_composite_16(composite, fg, alpha, bg)                         \
+     (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
+       (png_uint_32)(bg)*(png_uint_32)(65535L - (png_uint_32)(alpha)) +      \
+       (png_uint_32)32767) / (png_uint_32)65535L)
+
+#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
+
+/* These next functions are used internally in the code.  They generally
+ * shouldn't be used unless you are writing code to add or replace some
+ * functionality in libpng.  More information about most functions can
+ * be found in the files where the functions are located.
+ */
+
+#if defined(PNG_INTERNAL)
+
+/* Various modes of operation.  Note that after an init, mode is set to
+ * zero automatically when the structure is created.
+ */
+#define PNG_HAVE_IHDR               0x01
+#define PNG_HAVE_PLTE               0x02
+#define PNG_HAVE_IDAT               0x04
+#define PNG_AFTER_IDAT              0x08
+#define PNG_HAVE_IEND               0x10
+#define PNG_HAVE_gAMA               0x20
+#define PNG_HAVE_cHRM               0x40
+#define PNG_HAVE_sRGB               0x80
+#define PNG_HAVE_CHUNK_HEADER      0x100
+#define PNG_WROTE_tIME             0x200
+#define PNG_WROTE_INFO_BEFORE_PLTE 0x400
+#define PNG_BACKGROUND_IS_GRAY     0x800
+#define PNG_HAVE_PNG_SIGNATURE    0x1000
+
+/* flags for the transformations the PNG library does on the image data */
+#define PNG_BGR                0x0001
+#define PNG_INTERLACE          0x0002
+#define PNG_PACK               0x0004
+#define PNG_SHIFT              0x0008
+#define PNG_SWAP_BYTES         0x0010
+#define PNG_INVERT_MONO        0x0020
+#define PNG_DITHER             0x0040
+#define PNG_BACKGROUND         0x0080
+#define PNG_BACKGROUND_EXPAND  0x0100
+                          /*   0x0200 unused */
+#define PNG_16_TO_8            0x0400
+#define PNG_RGBA               0x0800
+#define PNG_EXPAND             0x1000
+#define PNG_GAMMA              0x2000
+#define PNG_GRAY_TO_RGB        0x4000
+#define PNG_FILLER             0x8000L
+#define PNG_PACKSWAP          0x10000L
+#define PNG_SWAP_ALPHA        0x20000L
+#define PNG_STRIP_ALPHA       0x40000L
+#define PNG_INVERT_ALPHA      0x80000L
+#define PNG_USER_TRANSFORM   0x100000L
+#define PNG_RGB_TO_GRAY_ERR  0x200000L
+#define PNG_RGB_TO_GRAY_WARN 0x400000L
+#define PNG_RGB_TO_GRAY      0x600000L  /* two bits, RGB_TO_GRAY_ERR|WARN */
+#define PNG_ADD_ALPHA       0x1000000L  /* Added to libpng-1.2.7 */
+
+/* flags for png_create_struct */
+#define PNG_STRUCT_PNG   0x0001
+#define PNG_STRUCT_INFO  0x0002
+
+/* Scaling factor for filter heuristic weighting calculations */
+#define PNG_WEIGHT_SHIFT 8
+#define PNG_WEIGHT_FACTOR (1<<(PNG_WEIGHT_SHIFT))
+#define PNG_COST_SHIFT 3
+#define PNG_COST_FACTOR (1<<(PNG_COST_SHIFT))
+
+/* flags for the png_ptr->flags rather than declaring a byte for each one */
+#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY     0x0001
+#define PNG_FLAG_ZLIB_CUSTOM_LEVEL        0x0002
+#define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL    0x0004
+#define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS  0x0008
+#define PNG_FLAG_ZLIB_CUSTOM_METHOD       0x0010
+#define PNG_FLAG_ZLIB_FINISHED            0x0020
+#define PNG_FLAG_ROW_INIT                 0x0040
+#define PNG_FLAG_FILLER_AFTER             0x0080
+#define PNG_FLAG_CRC_ANCILLARY_USE        0x0100
+#define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200
+#define PNG_FLAG_CRC_CRITICAL_USE         0x0400
+#define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800
+#define PNG_FLAG_FREE_PLTE                0x1000
+#define PNG_FLAG_FREE_TRNS                0x2000
+#define PNG_FLAG_FREE_HIST                0x4000
+#define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000L
+#define PNG_FLAG_KEEP_UNSAFE_CHUNKS       0x10000L
+#define PNG_FLAG_LIBRARY_MISMATCH         0x20000L
+#define PNG_FLAG_STRIP_ERROR_NUMBERS      0x40000L
+#define PNG_FLAG_STRIP_ERROR_TEXT         0x80000L
+#define PNG_FLAG_MALLOC_NULL_MEM_OK       0x100000L
+
+#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
+                                     PNG_FLAG_CRC_ANCILLARY_NOWARN)
+
+#define PNG_FLAG_CRC_CRITICAL_MASK  (PNG_FLAG_CRC_CRITICAL_USE | \
+                                     PNG_FLAG_CRC_CRITICAL_IGNORE)
+
+#define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \
+                                     PNG_FLAG_CRC_CRITICAL_MASK)
+
+/* save typing and make code easier to understand */
+
+#define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
+   abs((int)((c1).green) - (int)((c2).green)) + \
+   abs((int)((c1).blue) - (int)((c2).blue)))
+
+/* Added to libpng-1.2.6 JB */
+#define PNG_ROWBYTES(pixel_bits, width) \
+    ((pixel_bits) >= 8 ? \
+    ((width) * (((png_uint_32)(pixel_bits)) >> 3)) : \
+    (( ((width) * ((png_uint_32)(pixel_bits))) + 7) >> 3) )
+
+/* PNG_OUT_OF_RANGE returns true if value is outside the range
+   ideal-delta..ideal+delta.  Each argument is evaluated twice.
+   "ideal" and "delta" should be constants, normally simple
+   integers, "value" a variable. Added to libpng-1.2.6 JB */
+#define PNG_OUT_OF_RANGE(value, ideal, delta) \
+        ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) )
+
+/* variables declared in png.c - only it needs to define PNG_NO_EXTERN */
+#if !defined(PNG_NO_EXTERN) || defined(PNG_ALWAYS_EXTERN)
+/* place to hold the signature string for a PNG file. */
+#ifdef PNG_USE_GLOBAL_ARRAYS
+   PNG_EXPORT_VAR (const png_byte FARDATA) png_sig[8];
+#else
+#define png_sig png_sig_bytes(NULL)
+#endif
+#endif /* PNG_NO_EXTERN */
+
+/* Constant strings for known chunk types.  If you need to add a chunk,
+ * define the name here, and add an invocation of the macro in png.c and
+ * wherever it's needed.
+ */
+#define PNG_IHDR const png_byte png_IHDR[5] = { 73,  72,  68,  82, '\0'}
+#define PNG_IDAT const png_byte png_IDAT[5] = { 73,  68,  65,  84, '\0'}
+#define PNG_IEND const png_byte png_IEND[5] = { 73,  69,  78,  68, '\0'}
+#define PNG_PLTE const png_byte png_PLTE[5] = { 80,  76,  84,  69, '\0'}
+#define PNG_bKGD const png_byte png_bKGD[5] = { 98,  75,  71,  68, '\0'}
+#define PNG_cHRM const png_byte png_cHRM[5] = { 99,  72,  82,  77, '\0'}
+#define PNG_gAMA const png_byte png_gAMA[5] = {103,  65,  77,  65, '\0'}
+#define PNG_hIST const png_byte png_hIST[5] = {104,  73,  83,  84, '\0'}
+#define PNG_iCCP const png_byte png_iCCP[5] = {105,  67,  67,  80, '\0'}
+#define PNG_iTXt const png_byte png_iTXt[5] = {105,  84,  88, 116, '\0'}
+#define PNG_oFFs const png_byte png_oFFs[5] = {111,  70,  70, 115, '\0'}
+#define PNG_pCAL const png_byte png_pCAL[5] = {112,  67,  65,  76, '\0'}
+#define PNG_sCAL const png_byte png_sCAL[5] = {115,  67,  65,  76, '\0'}
+#define PNG_pHYs const png_byte png_pHYs[5] = {112,  72,  89, 115, '\0'}
+#define PNG_sBIT const png_byte png_sBIT[5] = {115,  66,  73,  84, '\0'}
+#define PNG_sPLT const png_byte png_sPLT[5] = {115,  80,  76,  84, '\0'}
+#define PNG_sRGB const png_byte png_sRGB[5] = {115,  82,  71,  66, '\0'}
+#define PNG_tEXt const png_byte png_tEXt[5] = {116,  69,  88, 116, '\0'}
+#define PNG_tIME const png_byte png_tIME[5] = {116,  73,  77,  69, '\0'}
+#define PNG_tRNS const png_byte png_tRNS[5] = {116,  82,  78,  83, '\0'}
+#define PNG_zTXt const png_byte png_zTXt[5] = {122,  84,  88, 116, '\0'}
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+PNG_EXPORT_VAR (const png_byte FARDATA) png_IHDR[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_IDAT[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_IEND[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_PLTE[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_bKGD[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_cHRM[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_gAMA[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_hIST[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_iCCP[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_iTXt[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_oFFs[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_pCAL[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_sCAL[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_pHYs[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_sBIT[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_sPLT[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_sRGB[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_tEXt[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_tIME[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_tRNS[5];
+PNG_EXPORT_VAR (const png_byte FARDATA) png_zTXt[5];
+#endif /* PNG_USE_GLOBAL_ARRAYS */
+
+
+/* Inline macros to do direct reads of bytes from the input buffer.  These
+ * require that you are using an architecture that uses PNG byte ordering
+ * (MSB first) and supports unaligned data storage.  I think that PowerPC
+ * in big-endian mode and 680x0 are the only ones that will support this.
+ * The x86 line of processors definitely do not.  The png_get_int_32()
+ * routine also assumes we are using two's complement format for negative
+ * values, which is almost certainly true.
+ */
+#if defined(PNG_READ_BIG_ENDIAN_SUPPORTED)
+#  if defined(PNG_pCAL_SUPPORTED) || defined(PNG_oFFs_SUPPORTED)
+#    define png_get_int_32(buf) ( *((png_int_32p) (buf)))
+#  endif
+#  define png_get_uint_32(buf) ( *((png_uint_32p) (buf)))
+#  define png_get_uint_16(buf) ( *((png_uint_16p) (buf)))
+#else
+#  if defined(PNG_pCAL_SUPPORTED) || defined(PNG_oFFs_SUPPORTED)
+PNG_EXTERN png_int_32 png_get_int_32 PNGARG((png_bytep buf));
+#  endif
+PNG_EXTERN png_uint_32 png_get_uint_32 PNGARG((png_bytep buf));
+PNG_EXTERN png_uint_16 png_get_uint_16 PNGARG((png_bytep buf));
+#endif /* !PNG_READ_BIG_ENDIAN_SUPPORTED */
+/* RN: This define is blatent hack to get png to (hopefully) 
+   link on OSX 10.2 and earlier versions of 10.3 due to an 
+   Apple linking bug introduced in 10.2 */
+#define png_get_uint_31 wxpng_get_uint_31
+PNG_EXTERN png_uint_32 png_get_uint_31 PNGARG((png_structp png_ptr,
+  png_bytep buf));
+/* Initialize png_ptr struct for reading, and allocate any other memory.
+ * (old interface - DEPRECATED - use png_create_read_struct instead).
+ */
+extern PNG_EXPORT(void,png_read_init) PNGARG((png_structp png_ptr));
+#undef png_read_init
+#define png_read_init(png_ptr) png_read_init_3(&png_ptr, \
+    PNG_LIBPNG_VER_STRING,  png_sizeof(png_struct));
+extern PNG_EXPORT(void,png_read_init_3) PNGARG((png_structpp ptr_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size));
+extern PNG_EXPORT(void,png_read_init_2) PNGARG((png_structp png_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
+    png_info_size));
+
+/* Initialize png_ptr struct for writing, and allocate any other memory.
+ * (old interface - DEPRECATED - use png_create_write_struct instead).
+ */
+extern PNG_EXPORT(void,png_write_init) PNGARG((png_structp png_ptr));
+#undef png_write_init
+#define png_write_init(png_ptr) png_write_init_3(&png_ptr, \
+    PNG_LIBPNG_VER_STRING, png_sizeof(png_struct));
+extern PNG_EXPORT(void,png_write_init_3) PNGARG((png_structpp ptr_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size));
+extern PNG_EXPORT(void,png_write_init_2) PNGARG((png_structp png_ptr,
+    png_const_charp user_png_ver, png_size_t png_struct_size, png_size_t
+    png_info_size));
+
+/* Allocate memory for an internal libpng struct */
+PNG_EXTERN png_voidp png_create_struct PNGARG((int type));
+
+/* Free memory from internal libpng struct */
+PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr));
+
+PNG_EXTERN png_voidp png_create_struct_2 PNGARG((int type, png_malloc_ptr
+  malloc_fn, png_voidp mem_ptr));
+PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
+   png_free_ptr free_fn, png_voidp mem_ptr));
+
+/* Free any memory that info_ptr points to and reset struct. */
+PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+#ifndef PNG_1_0_X
+/* Function to allocate memory for zlib. */
+PNG_EXTERN voidpf png_zalloc PNGARG((voidpf png_ptr, uInt items, uInt size));
+
+/* Function to free memory for zlib */
+PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));
+
+#ifdef PNG_SIZE_T
+/* Function to convert a sizeof an item to png_sizeof item */
+   PNG_EXTERN png_size_t PNGAPI png_convert_size PNGARG((size_t size));
+#endif
+
+/* Next four functions are used internally as callbacks.  PNGAPI is required
+ * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3. */
+
+PNG_EXTERN void PNGAPI png_default_read_data PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void PNGAPI png_push_fill_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t length));
+#endif
+
+PNG_EXTERN void PNGAPI png_default_write_data PNGARG((png_structp png_ptr,
+   png_bytep data, png_size_t length));
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+#if !defined(PNG_NO_STDIO)
+PNG_EXTERN void PNGAPI png_default_flush PNGARG((png_structp png_ptr));
+#endif
+#endif
+#else /* PNG_1_0_X */
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_fill_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t length));
+#endif
+#endif /* PNG_1_0_X */
+
+/* Reset the CRC variable */
+PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
+
+/* Write the "data" buffer to whatever output you are using. */
+PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length));
+
+/* Read data from whatever input you are using into the "data" buffer */
+PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length));
+
+/* Read bytes into buf, and update png_ptr->crc */
+PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,
+   png_size_t length));
+
+/* Decompress data in a chunk that uses compression */
+#if defined(PNG_zTXt_SUPPORTED) || defined(PNG_iTXt_SUPPORTED) || \
+    defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED)
+PNG_EXTERN png_charp png_decompress_chunk PNGARG((png_structp png_ptr,
+   int comp_type, png_charp chunkdata, png_size_t chunklength,
+   png_size_t prefix_length, png_size_t *data_length));
+#endif
+
+/* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
+PNG_EXTERN int png_crc_finish PNGARG((png_structp png_ptr, png_uint_32 skip));
+
+/* Read the CRC from the file and compare it to the libpng calculated CRC */
+PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr));
+
+/* Calculate the CRC over a section of data.  Note that we are only
+ * passing a maximum of 64K on systems that have this as a memory limit,
+ * since this is the maximum buffer size we can specify.
+ */
+PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr, png_bytep ptr,
+   png_size_t length));
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));
+#endif
+
+
+/* Place a 32-bit number into a buffer in PNG byte order (big-endian).
+ * The only currently known PNG chunks that use signed numbers are
+ * the ancillary extension chunks, oFFs and pCAL.
+ */
+PNG_EXTERN void png_save_uint_32 PNGARG((png_bytep buf, png_uint_32 i));
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED) || defined(PNG_WRITE_oFFs_SUPPORTED)
+PNG_EXTERN void png_save_int_32 PNGARG((png_bytep buf, png_int_32 i));
+#endif
+
+/* Place a 16-bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+PNG_EXTERN void png_save_uint_16 PNGARG((png_bytep buf, unsigned int i));
+
+/* simple function to write the signature */
+PNG_EXTERN void png_write_sig PNGARG((png_structp png_ptr));
+
+/* write various chunks */
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information.
+ */
+PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,
+   png_uint_32 height,
+   int bit_depth, int color_type, int compression_method, int filter_method,
+   int interlace_method));
+
+PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr, png_colorp palette,
+   png_uint_32 num_pal));
+
+PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,
+   png_size_t length));
+
+PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));
+
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr, png_fixed_point
+    file_gamma));
+#endif
+#endif
+
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr, png_color_8p sbit,
+   int color_type));
+#endif
+
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
+   double white_x, double white_y,
+   double red_x, double red_y, double green_x, double green_y,
+   double blue_x, double blue_y));
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
+   png_fixed_point int_white_x, png_fixed_point int_white_y,
+   png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
+   int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
+   png_fixed_point int_blue_y));
+#endif
+#endif
+
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
+   int intent));
+#endif
+
+#if defined(PNG_WRITE_iCCP_SUPPORTED)
+PNG_EXTERN void png_write_iCCP PNGARG((png_structp png_ptr,
+   png_charp name, int compression_type,
+   png_charp profile, int proflen));
+   /* Note to maintainer: profile should be png_bytep */
+#endif
+
+#if defined(PNG_WRITE_sPLT_SUPPORTED)
+PNG_EXTERN void png_write_sPLT PNGARG((png_structp png_ptr,
+   png_sPLT_tp palette));
+#endif
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr, png_bytep trans,
+   png_color_16p values, int number, int color_type));
+#endif
+
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,
+   png_color_16p values, int color_type));
+#endif
+
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr, png_uint_16p hist,
+   int num_hist));
+#endif
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
+    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr,
+   png_charp key, png_charpp new_key));
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_charp key,
+   png_charp text, png_size_t text_len));
+#endif
+
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_charp key,
+   png_charp text, png_size_t text_len, int compression));
+#endif
+
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,
+   int compression, png_charp key, png_charp lang, png_charp lang_key,
+   png_charp text));
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)  /* Added at version 1.0.14 and 1.2.4 */
+PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_textp text_ptr, int num_text));
+#endif
+
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,
+   png_int_32 x_offset, png_int_32 y_offset, int unit_type));
+#endif
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,
+   png_int_32 X0, png_int_32 X1, int type, int nparams,
+   png_charp units, png_charpp params));
+#endif
+
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,
+   png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
+   int unit_type));
+#endif
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,
+   png_timep mod_time));
+#endif
+
+#if defined(PNG_WRITE_sCAL_SUPPORTED)
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+PNG_EXTERN void png_write_sCAL PNGARG((png_structp png_ptr,
+   int unit, double width, double height));
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,
+   int unit, png_charp width, png_charp height));
+#endif
+#endif
+#endif
+
+/* Called when finished processing a row of data */
+PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
+
+/* Internal use only.   Called before first row of data */
+PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr));
+#endif
+
+/* combine a row of data, dealing with alpha, etc. if requested */
+PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
+   int mask));
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+/* expand an interlaced row */
+/* OLD pre-1.0.9 interface:
+PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
+   png_bytep row, int pass, png_uint_32 transformations));
+ */
+PNG_EXTERN void png_do_read_interlace PNGARG((png_structp png_ptr));
+#endif
+
+/* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* grab pixels out of a row for an interlaced pass */
+PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
+   png_bytep row, int pass));
+#endif
+
+/* unfilter a row */
+PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr,
+   png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter));
+
+/* Choose the best filter to use and filter the row data */
+PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,
+   png_row_infop row_info));
+
+/* Write out the filtered row. */
+PNG_EXTERN void png_write_filtered_row PNGARG((png_structp png_ptr,
+   png_bytep filtered_row));
+/* finish a row while reading, dealing with interlacing passes, etc. */
+PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));
+
+/* initialize the row buffers, etc. */
+PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr));
+/* optional call to update the users info structure */
+PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+
+/* these are the functions that do the transformations */
+#if defined(PNG_READ_FILLER_SUPPORTED)
+PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 filler, png_uint_32 flags));
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 flags));
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED) || defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr, png_row_infop
+   row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_8p sig_bits));
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+PNG_EXTERN void png_do_dither PNGARG((png_row_infop row_info,
+   png_bytep row, png_bytep palette_lookup, png_bytep dither_lookup));
+
+#  if defined(PNG_CORRECT_PALETTE_SUPPORTED)
+PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,
+   png_colorp palette, int num_palette));
+#  endif
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info, png_bytep row));
+#endif
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,
+   png_bytep row, png_uint_32 bit_depth));
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_8p bit_depth));
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background,
+   png_color_16p background_1,
+   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+   png_uint_16pp gamma_16_to_1, int gamma_shift));
+#else
+PNG_EXTERN void png_do_background PNGARG((png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background));
+#endif
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info, png_bytep row,
+   png_bytep gamma_table, png_uint_16pp gamma_16_table,
+   int gamma_shift));
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,
+   png_bytep row, png_colorp palette, png_bytep trans, int num_trans));
+PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,
+   png_bytep row, png_color_16p trans_value));
+#endif
+
+/* The following decodes the appropriate chunks, and does error correction,
+ * then calls the appropriate callback for the chunk if it is valid.
+ */
+
+/* decode the IHDR chunk */
+PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_iCCP_SUPPORTED)
+extern void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif /* PNG_READ_iCCP_SUPPORTED */
+
+#if defined(PNG_READ_iTXt_SUPPORTED)
+PNG_EXTERN void png_handle_iTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED)
+PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_sPLT_SUPPORTED)
+extern void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif /* PNG_READ_sPLT_SUPPORTED */
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 length));
+#endif
+
+PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+
+PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
+   png_bytep chunk_name));
+
+/* handle the transformations for reading and writing */
+PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_do_write_transformations PNGARG((png_structp png_ptr));
+
+PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr));
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,
+   png_uint_32 length));
+PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t buffer_length));
+PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,
+   png_bytep buffer, png_size_t buffer_length));
+PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr));
+PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_have_info PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr, png_bytep row));
+PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+PNG_EXTERN void png_read_push_finish_row PNGARG((png_structp png_ptr));
+#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+PNG_EXTERN void png_push_handle_iTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr, png_uint_32 length));
+PNG_EXTERN void png_push_read_iTXt PNGARG((png_structp png_ptr,
+   png_infop info_ptr));
+#endif
+
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+#ifdef PNG_MNG_FEATURES_SUPPORTED
+PNG_EXTERN void png_do_read_intrapixel PNGARG((png_row_infop row_info,
+   png_bytep row));
+PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,
+   png_bytep row));
+#endif
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+/* png.c */ /* PRIVATE */
+PNG_EXTERN void png_init_mmx_flags PNGARG((png_structp png_ptr));
+#endif
+/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
+
+#endif /* PNG_INTERNAL */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PNG_VERSION_INFO_ONLY */
+/* do not put anything past this line */
+#endif /* PNG_H */
diff --git a/Source/3rd Party/wx/src/png/pngasmrd.h b/Source/3rd Party/wx/src/png/pngasmrd.h
new file mode 100644
index 000000000..050525826
--- /dev/null
+++ b/Source/3rd Party/wx/src/png/pngasmrd.h	
@@ -0,0 +1,11 @@
+/* pngasmrd.h - assembler version of utilities to read a PNG file
+ *
+ * libpng 1.2.6 - August 15, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 2002-2004 Glenn Randers-Pehrson
+ *
+ */
+
+/* This file is obsolete in libpng-1.0.9 and later; its contents now appear
+ * at the end of pngconf.h.
+ */
diff --git a/Source/3rd Party/wx/src/png/pngconf.h b/Source/3rd Party/wx/src/png/pngconf.h
index f52b6bbd7..867e0a866 100644
--- a/Source/3rd Party/wx/src/png/pngconf.h	
+++ b/Source/3rd Party/wx/src/png/pngconf.h	
@@ -1,600 +1,1394 @@
-
-/* pngconf.h - machine configurable file for libpng
- *
- * libpng version 1.5.7 - December 15, 2011
- *
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- */
-
-/* Any machine specific code is near the front of this file, so if you
- * are configuring libpng for a machine, you may want to read the section
- * starting here down to where it starts to typedef png_color, png_text,
- * and png_info.
- */
-
-#ifndef PNGCONF_H
-#define PNGCONF_H
-
-#ifdef __DMC__
-#define PNG_NO_SNPRINTF
-#endif
-
-#ifndef PNG_BUILDING_SYMBOL_TABLE
-/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C
- * definition file for  machine specific limits, this may impact the
- * correctness of the definitons below (see uses of INT_MAX).
- */
-#  ifndef PNG_NO_LIMITS_H
-#    include <limits.h>
-#  endif
-
-/* For the memory copy APIs (i.e. the standard definitions of these),
- * because this file defines png_memcpy and so on the base APIs must
- * be defined here.
- */
-#  ifdef BSD
-#    include <strings.h>
-#  else
-#    include <string.h>
-#  endif
-
-/* For png_FILE_p - this provides the standard definition of a
- * FILE
- */
-#  ifdef PNG_STDIO_SUPPORTED
-#    include <stdio.h>
-#  endif
-#endif
-
-/* This controls optimization of the reading of 16 and 32 bit values
- * from PNG files.  It can be set on a per-app-file basis - it
- * just changes whether a macro is used to the function is called.
- * The library builder sets the default, if read functions are not
- * built into the library the macro implementation is forced on.
- */
-#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
-#  define PNG_USE_READ_MACROS
-#endif
-#if !defined(PNG_NO_USE_READ_MACROS) && !defined(PNG_USE_READ_MACROS)
-#  if PNG_DEFAULT_READ_MACROS
-#    define PNG_USE_READ_MACROS
-#  endif
-#endif
-
-/* COMPILER SPECIFIC OPTIONS.
- *
- * These options are provided so that a variety of difficult compilers
- * can be used.  Some are fixed at build time (e.g. PNG_API_RULE
- * below) but still have compiler specific implementations, others
- * may be changed on a per-file basis when compiling against libpng.
- */
-
-/* The PNGARG macro protects us against machines that don't have function
- * prototypes (ie K&R style headers).  If your compiler does not handle
- * function prototypes, define this macro and use the included ansi2knr.
- * I've always been able to use _NO_PROTO as the indicator, but you may
- * need to drag the empty declaration out in front of here, or change the
- * ifdef to suit your own needs.
- */
-#ifndef PNGARG
-
-#  ifdef OF /* zlib prototype munger */
-#    define PNGARG(arglist) OF(arglist)
-#  else
-
-#    ifdef _NO_PROTO
-#      define PNGARG(arglist) ()
-#    else
-#      define PNGARG(arglist) arglist
-#    endif /* _NO_PROTO */
-
-#  endif /* OF */
-
-#endif /* PNGARG */
-
-/* Function calling conventions.
- * =============================
- * Normally it is not necessary to specify to the compiler how to call
- * a function - it just does it - however on x86 systems derived from
- * Microsoft and Borland C compilers ('IBM PC', 'DOS', 'Windows' systems
- * and some others) there are multiple ways to call a function and the
- * default can be changed on the compiler command line.  For this reason
- * libpng specifies the calling convention of every exported function and
- * every function called via a user supplied function pointer.  This is
- * done in this file by defining the following macros:
- *
- * PNGAPI    Calling convention for exported functions.
- * PNGCBAPI  Calling convention for user provided (callback) functions.
- * PNGCAPI   Calling convention used by the ANSI-C library (required
- *           for longjmp callbacks and sometimes used internally to
- *           specify the calling convention for zlib).
- *
- * These macros should never be overridden.  If it is necessary to
- * change calling convention in a private build this can be done
- * by setting PNG_API_RULE (which defaults to 0) to one of the values
- * below to select the correct 'API' variants.
- *
- * PNG_API_RULE=0 Use PNGCAPI - the 'C' calling convention - throughout.
- *                This is correct in every known environment.
- * PNG_API_RULE=1 Use the operating system convention for PNGAPI and
- *                the 'C' calling convention (from PNGCAPI) for
- *                callbacks (PNGCBAPI).  This is no longer required
- *                in any known environment - if it has to be used
- *                please post an explanation of the problem to the
- *                libpng mailing list.
- *
- * These cases only differ if the operating system does not use the C
- * calling convention, at present this just means the above cases
- * (x86 DOS/Windows sytems) and, even then, this does not apply to
- * Cygwin running on those systems.
- *
- * Note that the value must be defined in pnglibconf.h so that what
- * the application uses to call the library matches the conventions
- * set when building the library.
- */
-
-/* Symbol export
- * =============
- * When building a shared library it is almost always necessary to tell
- * the compiler which symbols to export.  The png.h macro 'PNG_EXPORT'
- * is used to mark the symbols.  On some systems these symbols can be
- * extracted at link time and need no special processing by the compiler,
- * on other systems the symbols are flagged by the compiler and just
- * the declaration requires a special tag applied (unfortunately) in a
- * compiler dependent way.  Some systems can do either.
- *
- * A small number of older systems also require a symbol from a DLL to
- * be flagged to the program that calls it.  This is a problem because
- * we do not know in the header file included by application code that
- * the symbol will come from a shared library, as opposed to a statically
- * linked one.  For this reason the application must tell us by setting
- * the magic flag PNG_USE_DLL to turn on the special processing before
- * it includes png.h.
- *
- * Four additional macros are used to make this happen:
- *
- * PNG_IMPEXP The magic (if any) to cause a symbol to be exported from
- *            the build or imported if PNG_USE_DLL is set - compiler
- *            and system specific.
- *
- * PNG_EXPORT_TYPE(type) A macro that pre or appends PNG_IMPEXP to
- *                       'type', compiler specific.
- *
- * PNG_DLL_EXPORT Set to the magic to use during a libpng build to
- *                make a symbol exported from the DLL.  Not used in the
- *                public header files; see pngpriv.h for how it is used
- *                in the libpng build.
- *
- * PNG_DLL_IMPORT Set to the magic to force the libpng symbols to come
- *                from a DLL - used to define PNG_IMPEXP when
- *                PNG_USE_DLL is set.
- */
-
-/* System specific discovery.
- * ==========================
- * This code is used at build time to find PNG_IMPEXP, the API settings
- * and PNG_EXPORT_TYPE(), it may also set a macro to indicate the DLL
- * import processing is possible.  On Windows/x86 systems it also sets
- * compiler-specific macros to the values required to change the calling
- * conventions of the various functions.
- */
-#if ( defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
-      defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) ) &&\
-    ( defined(_X86_) || defined(_X64_) || defined(_M_IX86) ||\
-      defined(_M_X64) || defined(_M_IA64) )
-  /* Windows system (DOS doesn't support DLLs) running on x86/x64.  Includes
-   * builds under Cygwin or MinGW.  Also includes Watcom builds but these need
-   * special treatment because they are not compatible with GCC or Visual C
-   * because of different calling conventions.
-   */
-#  if PNG_API_RULE == 2
-    /* If this line results in an error, either because __watcall is not
-     * understood or because of a redefine just below you cannot use *this*
-     * build of the library with the compiler you are using.  *This* build was
-     * build using Watcom and applications must also be built using Watcom!
-     */
-#    define PNGCAPI __watcall
-#  endif
-
-#  if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
-#    define PNGCAPI __cdecl
-#    if PNG_API_RULE == 1
-#      define PNGAPI __stdcall
-#    endif
-#  else
-    /* An older compiler, or one not detected (erroneously) above,
-     * if necessary override on the command line to get the correct
-     * variants for the compiler.
-     */
-#    ifndef PNGCAPI
-#      define PNGCAPI _cdecl
-#    endif
-#    if PNG_API_RULE == 1 && !defined(PNGAPI)
-#      define PNGAPI _stdcall
-#    endif
-#  endif /* compiler/api */
-  /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
-
-#  if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
-   ERROR: PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed
-#  endif
-
-#  if (defined(_MSC_VER) && _MSC_VER < 800) ||\
-      (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
-    /* older Borland and MSC
-     * compilers used '__export' and required this to be after
-     * the type.
-     */
-#    ifndef PNG_EXPORT_TYPE
-#      define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
-#    endif
-#    define PNG_DLL_EXPORT __export
-#  else /* newer compiler */
-#    define PNG_DLL_EXPORT __declspec(dllexport)
-#    ifndef PNG_DLL_IMPORT
-#      define PNG_DLL_IMPORT __declspec(dllimport)
-#    endif
-#  endif /* compiler */
-
-#else /* !Windows/x86 */
-#  if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
-#    define PNGAPI _System
-#  else /* !Windows/x86 && !OS/2 */
-    /* Use the defaults, or define PNG*API on the command line (but
-     * this will have to be done for every compile!)
-     */
-#  endif /* other system, !OS/2 */
-#endif /* !Windows/x86 */
-
-/* Now do all the defaulting . */
-#ifndef PNGCAPI
-#  define PNGCAPI
-#endif
-#ifndef PNGCBAPI
-#  define PNGCBAPI PNGCAPI
-#endif
-#ifndef PNGAPI
-#  define PNGAPI PNGCAPI
-#endif
-
-/* PNG_IMPEXP may be set on the compilation system command line or (if not set)
- * then in an internal header file when building the library, otherwise (when
- * using the library) it is set here.
- */
-#ifndef PNG_IMPEXP
-#  if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
-     /* This forces use of a DLL, disallowing static linking */
-#    define PNG_IMPEXP PNG_DLL_IMPORT
-#  endif
-
-#  ifndef PNG_IMPEXP
-#    define PNG_IMPEXP
-#  endif
-#endif
-
-/* In 1.5.2 the definition of PNG_FUNCTION has been changed to always treat
- * 'attributes' as a storage class - the attributes go at the start of the
- * function definition, and attributes are always appended regardless of the
- * compiler.  This considerably simplifies these macros but may cause problems
- * if any compilers both need function attributes and fail to handle them as
- * a storage class (this is unlikely.)
- */
-#ifndef PNG_FUNCTION
-#  define PNG_FUNCTION(type, name, args, attributes) attributes type name args
-#endif
-
-#ifndef PNG_EXPORT_TYPE
-#  define PNG_EXPORT_TYPE(type) PNG_IMPEXP type
-#endif
-
-   /* The ordinal value is only relevant when preprocessing png.h for symbol
-    * table entries, so we discard it here.  See the .dfn files in the
-    * scripts directory.
-    */
-#ifndef PNG_EXPORTA
-
-#  define PNG_EXPORTA(ordinal, type, name, args, attributes)\
-      PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args), \
-        extern attributes)
-#endif
-
-/* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,
- * so make something non-empty to satisfy the requirement:
- */
-#define PNG_EMPTY /*empty list*/
-
-#define PNG_EXPORT(ordinal, type, name, args)\
-   PNG_EXPORTA(ordinal, type, name, args, PNG_EMPTY)
-
-/* Use PNG_REMOVED to comment out a removed interface. */
-#ifndef PNG_REMOVED
-#  define PNG_REMOVED(ordinal, type, name, args, attributes)
-#endif
-
-#ifndef PNG_CALLBACK
-#  define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
-#endif
-
-/* Support for compiler specific function attributes.  These are used
- * so that where compiler support is available incorrect use of API
- * functions in png.h will generate compiler warnings.
- *
- * Added at libpng-1.2.41.
- */
-
-#ifndef PNG_NO_PEDANTIC_WARNINGS
-#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
-#    define PNG_PEDANTIC_WARNINGS_SUPPORTED
-#  endif
-#endif
-
-#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
-  /* Support for compiler specific function attributes.  These are used
-   * so that where compiler support is available incorrect use of API
-   * functions in png.h will generate compiler warnings.  Added at libpng
-   * version 1.2.41.
-   */
-#  if defined(__GNUC__)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN   __attribute__((__noreturn__))
-#    endif
-#    ifndef PNG_ALLOCATED
-#      define PNG_ALLOCATED  __attribute__((__malloc__))
-#    endif
-#    ifndef PNG_DEPRECATED
-#      define PNG_DEPRECATED __attribute__((__deprecated__))
-#    endif
-#    ifndef PNG_PRIVATE
-#      if 0 /* Doesn't work so we use deprecated instead*/
-#        define PNG_PRIVATE \
-          __attribute__((warning("This function is not exported by libpng.")))
-#      else
-#        define PNG_PRIVATE \
-          __attribute__((__deprecated__))
-#      endif
-#    endif
-#  endif /* __GNUC__ */
-
-#  if defined(_MSC_VER)  && (_MSC_VER >= 1300)
-#    ifndef PNG_USE_RESULT
-#      define PNG_USE_RESULT /* not supported */
-#    endif
-#    ifndef PNG_NORETURN
-#      define PNG_NORETURN __declspec(noreturn)
-#    endif
-#    ifndef PNG_ALLOCATED
-#      if (_MSC_VER >= 1400)
-#        define PNG_ALLOCATED __declspec(restrict)
-#      endif
-#    endif
-#    ifndef PNG_DEPRECATED
-#      define PNG_DEPRECATED __declspec(deprecated)
-#    endif
-#    ifndef PNG_PRIVATE
-#      define PNG_PRIVATE __declspec(deprecated)
-#    endif
-#  endif /* _MSC_VER */
-#endif /* PNG_PEDANTIC_WARNINGS */
-
-#ifndef PNG_DEPRECATED
-#  define PNG_DEPRECATED  /* Use of this function is deprecated */
-#endif
-#ifndef PNG_USE_RESULT
-#  define PNG_USE_RESULT  /* The result of this function must be checked */
-#endif
-#ifndef PNG_NORETURN
-#  define PNG_NORETURN    /* This function does not return */
-#endif
-#ifndef PNG_ALLOCATED
-#  define PNG_ALLOCATED   /* The result of the function is new memory */
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE     /* This is a private libpng function */
-#endif
-#ifndef PNG_FP_EXPORT     /* A floating point API. */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-#     define PNG_FP_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args)
-#  else                   /* No floating point APIs */
-#     define PNG_FP_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-#ifndef PNG_FIXED_EXPORT  /* A fixed point API. */
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)\
-         PNG_EXPORT(ordinal, type, name, args)
-#  else                   /* No fixed point APIs */
-#     define PNG_FIXED_EXPORT(ordinal, type, name, args)
-#  endif
-#endif
-
-/* The following uses const char * instead of char * for error
- * and warning message functions, so some compilers won't complain.
- * If you do not want to use const, define PNG_NO_CONST here.
- *
- * This should not change how the APIs are called, so it can be done
- * on a per-file basis in the application.
- */
-#ifndef PNG_CONST
-#  ifndef PNG_NO_CONST
-#    define PNG_CONST const
-#  else
-#    define PNG_CONST
-#  endif
-#endif
-
-/* Some typedefs to get us started.  These should be safe on most of the
- * common platforms.  The typedefs should be at least as large as the
- * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
- * don't have to be exactly that size.  Some compilers dislike passing
- * unsigned shorts as function parameters, so you may be better off using
- * unsigned int for png_uint_16.
- */
-
-#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
-typedef unsigned int png_uint_32;
-typedef int png_int_32;
-#else
-typedef unsigned long png_uint_32;
-typedef long png_int_32;
-#endif
-typedef unsigned short png_uint_16;
-typedef short png_int_16;
-typedef unsigned char png_byte;
-
-#ifdef PNG_NO_SIZE_T
-typedef unsigned int png_size_t;
-#else
-typedef size_t png_size_t;
-#endif
-#define png_sizeof(x) (sizeof (x))
-
-/* The following is needed for medium model support.  It cannot be in the
- * pngpriv.h header.  Needs modification for other compilers besides
- * MSC.  Model independent support declares all arrays and pointers to be
- * large using the far keyword.  The zlib version used must also support
- * model independent data.  As of version zlib 1.0.4, the necessary changes
- * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
- * changes that are needed. (Tim Wegner)
- */
-
-/* Separate compiler dependencies (problem here is that zlib.h always
- * defines FAR. (SJT)
- */
-#ifdef __BORLANDC__
-#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
-#    define LDATA 1
-#  else
-#    define LDATA 0
-#  endif
-  /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
-#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
-#    define PNG_MAX_MALLOC_64K /* only used in build */
-#    if (LDATA != 1)
-#      ifndef FAR
-#        define FAR __far
-#      endif
-#      define USE_FAR_KEYWORD
-#    endif   /* LDATA != 1 */
-         /* Possibly useful for moving data out of default segment.
-          * Uncomment it if you want. Could also define FARDATA as
-          * const if your compiler supports it. (SJT)
-#        define FARDATA FAR
-          */
-#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
-#endif   /* __BORLANDC__ */
-
-
-/* Suggest testing for specific compiler first before testing for
- * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
- * making reliance oncertain keywords suspect. (SJT)
- */
-
-/* MSC Medium model */
-#ifdef FAR
-#  ifdef M_I86MM
-#    define USE_FAR_KEYWORD
-#    define FARDATA FAR
-#    include <dos.h>
-#  endif
-#endif
-
-/* SJT: default case */
-#ifndef FAR
-#  define FAR
-#endif
-
-/* At this point FAR is always defined */
-#ifndef FARDATA
-#  define FARDATA
-#endif
-
-/* Typedef for floating-point numbers that are converted
- * to fixed-point with a multiple of 100,000, e.g., gamma
- */
-typedef png_int_32 png_fixed_point;
-
-/* Add typedefs for pointers */
-typedef void                      FAR * png_voidp;
-typedef PNG_CONST void            FAR * png_const_voidp;
-typedef png_byte                  FAR * png_bytep;
-typedef PNG_CONST png_byte        FAR * png_const_bytep;
-typedef png_uint_32               FAR * png_uint_32p;
-typedef PNG_CONST png_uint_32     FAR * png_const_uint_32p;
-typedef png_int_32                FAR * png_int_32p;
-typedef PNG_CONST png_int_32      FAR * png_const_int_32p;
-typedef png_uint_16               FAR * png_uint_16p;
-typedef PNG_CONST png_uint_16     FAR * png_const_uint_16p;
-typedef png_int_16                FAR * png_int_16p;
-typedef PNG_CONST png_int_16      FAR * png_const_int_16p;
-typedef char                      FAR * png_charp;
-typedef PNG_CONST char            FAR * png_const_charp;
-typedef png_fixed_point           FAR * png_fixed_point_p;
-typedef PNG_CONST png_fixed_point FAR * png_const_fixed_point_p;
-typedef png_size_t                FAR * png_size_tp;
-typedef PNG_CONST png_size_t      FAR * png_const_size_tp;
-
-#ifdef PNG_STDIO_SUPPORTED
-typedef FILE            * png_FILE_p;
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double           FAR * png_doublep;
-typedef PNG_CONST double FAR * png_const_doublep;
-#endif
-
-/* Pointers to pointers; i.e. arrays */
-typedef png_byte        FAR * FAR * png_bytepp;
-typedef png_uint_32     FAR * FAR * png_uint_32pp;
-typedef png_int_32      FAR * FAR * png_int_32pp;
-typedef png_uint_16     FAR * FAR * png_uint_16pp;
-typedef png_int_16      FAR * FAR * png_int_16pp;
-typedef PNG_CONST char  FAR * FAR * png_const_charpp;
-typedef char            FAR * FAR * png_charpp;
-typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-typedef double          FAR * FAR * png_doublepp;
-#endif
-
-/* Pointers to pointers to pointers; i.e., pointer to array */
-typedef char            FAR * FAR * FAR * png_charppp;
-
-/* png_alloc_size_t is guaranteed to be no smaller than png_size_t,
- * and no smaller than png_uint_32.  Casts from png_size_t or png_uint_32
- * to png_alloc_size_t are not necessary; in fact, it is recommended
- * not to use them at all so that the compiler can complain when something
- * turns out to be problematic.
- * Casts in the other direction (from png_alloc_size_t to png_size_t or
- * png_uint_32) should be explicitly applied; however, we do not expect
- * to encounter practical situations that require such conversions.
- */
-#if defined(__TURBOC__) && !defined(__FLAT__)
-   typedef unsigned long png_alloc_size_t;
-#else
-#  if defined(_MSC_VER) && defined(MAXSEG_64K)
-     typedef unsigned long    png_alloc_size_t;
-#  else
-     /* This is an attempt to detect an old Windows system where (int) is
-      * actually 16 bits, in that case png_malloc must have an argument with a
-      * bigger size to accomodate the requirements of the library.
-      */
-#    if (defined(_Windows) || defined(_WINDOWS) || defined(_WINDOWS_)) && \
-        (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
-       typedef DWORD         png_alloc_size_t;
-#    else
-       typedef png_size_t    png_alloc_size_t;
-#    endif
-#  endif
-#endif
-
-#endif /* PNGCONF_H */
+
+/* pngconf.h - machine configurable file for libpng
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+/* Any machine specific code is near the front of this file, so if you
+ * are configuring libpng for a machine, you may want to read the section
+ * starting here down to where it starts to typedef png_color, png_text,
+ * and png_info.
+ */
+
+#ifndef PNGCONF_H
+#define PNGCONF_H
+
+#ifdef PNG_USER_CONFIG
+#include "pngusr.h"
+#endif
+
+/* This is the size of the compression buffer, and thus the size of
+ * an IDAT chunk.  Make this whatever size you feel is best for your
+ * machine.  One of these will be allocated per png_struct.  When this
+ * is full, it writes the data to the disk, and does some other
+ * calculations.  Making this an extremely small size will slow
+ * the library down, but you may want to experiment to determine
+ * where it becomes significant, if you are concerned with memory
+ * usage.  Note that zlib allocates at least 32Kb also.  For readers,
+ * this describes the size of the buffer available to read the data in.
+ * Unless this gets smaller than the size of a row (compressed),
+ * it should not make much difference how big this is.
+ */
+
+#ifndef PNG_ZBUF_SIZE
+#  define PNG_ZBUF_SIZE 8192
+#endif
+
+/* Enable if you want a write-only libpng */
+
+#ifndef PNG_NO_READ_SUPPORTED
+#  define PNG_READ_SUPPORTED
+#endif
+
+/* Enable if you want a read-only libpng */
+
+#ifndef PNG_NO_WRITE_SUPPORTED
+#  define PNG_WRITE_SUPPORTED
+#endif
+
+/* Enabled by default in 1.2.0.  You can disable this if you don't need to
+   support PNGs that are embedded in MNG datastreams */
+#if !defined(PNG_1_0_X) && !defined(PNG_NO_MNG_FEATURES)
+#  ifndef PNG_MNG_FEATURES_SUPPORTED
+#    define PNG_MNG_FEATURES_SUPPORTED
+#  endif
+#endif
+
+#ifndef PNG_NO_FLOATING_POINT_SUPPORTED
+#  ifndef PNG_FLOATING_POINT_SUPPORTED
+#    define PNG_FLOATING_POINT_SUPPORTED
+#  endif
+#endif
+
+/* If you are running on a machine where you cannot allocate more
+ * than 64K of memory at once, uncomment this.  While libpng will not
+ * normally need that much memory in a chunk (unless you load up a very
+ * large file), zlib needs to know how big of a chunk it can use, and
+ * libpng thus makes sure to check any memory allocation to verify it
+ * will fit into memory.
+#define PNG_MAX_MALLOC_64K
+ */
+#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
+#  define PNG_MAX_MALLOC_64K
+#endif
+
+/* Special munging to support doing things the 'cygwin' way:
+ * 'Normal' png-on-win32 defines/defaults:
+ *   PNG_BUILD_DLL -- building dll
+ *   PNG_USE_DLL   -- building an application, linking to dll
+ *   (no define)   -- building static library, or building an
+ *                    application and linking to the static lib
+ * 'Cygwin' defines/defaults:
+ *   PNG_BUILD_DLL -- (ignored) building the dll
+ *   (no define)   -- (ignored) building an application, linking to the dll
+ *   PNG_STATIC    -- (ignored) building the static lib, or building an
+ *                    application that links to the static lib.
+ *   ALL_STATIC    -- (ignored) building various static libs, or building an
+ *                    application that links to the static libs.
+ * Thus,
+ * a cygwin user should define either PNG_BUILD_DLL or PNG_STATIC, and
+ * this bit of #ifdefs will define the 'correct' config variables based on
+ * that. If a cygwin user *wants* to define 'PNG_USE_DLL' that's okay, but
+ * unnecessary.
+ *
+ * Also, the precedence order is:
+ *   ALL_STATIC (since we can't #undef something outside our namespace)
+ *   PNG_BUILD_DLL
+ *   PNG_STATIC
+ *   (nothing) == PNG_USE_DLL
+ *
+ * CYGWIN (2002-01-20): The preceding is now obsolete. With the advent
+ *   of auto-import in binutils, we no longer need to worry about
+ *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,
+ *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
+ *   to __declspec() stuff.  However, we DO need to worry about
+ *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults
+ *   such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
+ */
+#if defined(__CYGWIN__)
+#  if defined(ALL_STATIC)
+#    if defined(PNG_BUILD_DLL)
+#      undef PNG_BUILD_DLL
+#    endif
+#    if defined(PNG_USE_DLL)
+#      undef PNG_USE_DLL
+#    endif
+#    if defined(PNG_DLL)
+#      undef PNG_DLL
+#    endif
+#    if !defined(PNG_STATIC)
+#      define PNG_STATIC
+#    endif
+#  else
+#    if defined (PNG_BUILD_DLL)
+#      if defined(PNG_STATIC)
+#        undef PNG_STATIC
+#      endif
+#      if defined(PNG_USE_DLL)
+#        undef PNG_USE_DLL
+#      endif
+#      if !defined(PNG_DLL)
+#        define PNG_DLL
+#      endif
+#    else
+#      if defined(PNG_STATIC)
+#        if defined(PNG_USE_DLL)
+#          undef PNG_USE_DLL
+#        endif
+#        if defined(PNG_DLL)
+#          undef PNG_DLL
+#        endif
+#      else
+#        if !defined(PNG_USE_DLL)
+#          define PNG_USE_DLL
+#        endif
+#        if !defined(PNG_DLL)
+#          define PNG_DLL
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* This protects us against compilers that run on a windowing system
+ * and thus don't have or would rather us not use the stdio types:
+ * stdin, stdout, and stderr.  The only one currently used is stderr
+ * in png_error() and png_warning().  #defining PNG_NO_CONSOLE_IO will
+ * prevent these from being compiled and used. #defining PNG_NO_STDIO
+ * will also prevent these, plus will prevent the entire set of stdio
+ * macros and functions (FILE *, printf, etc.) from being compiled and used,
+ * unless (PNG_DEBUG > 0) has been #defined.
+ *
+ * #define PNG_NO_CONSOLE_IO
+ * #define PNG_NO_STDIO
+ */
+
+#if defined(_WIN32_WCE)
+#  include <windows.h>
+   /* Console I/O functions are not supported on WindowsCE */
+#  define PNG_NO_CONSOLE_IO
+#  ifdef PNG_DEBUG
+#    undef PNG_DEBUG
+#  endif
+#endif
+
+#ifdef PNG_BUILD_DLL
+#  ifndef PNG_CONSOLE_IO_SUPPORTED
+#    ifndef PNG_NO_CONSOLE_IO
+#      define PNG_NO_CONSOLE_IO
+#    endif
+#  endif
+#endif
+
+#  ifdef PNG_NO_STDIO
+#    ifndef PNG_NO_CONSOLE_IO
+#      define PNG_NO_CONSOLE_IO
+#    endif
+#    ifdef PNG_DEBUG
+#      if (PNG_DEBUG > 0)
+#        include <stdio.h>
+#      endif
+#    endif
+#  else
+#    if !defined(_WIN32_WCE)
+/* "stdio.h" functions are not supported on WindowsCE */
+#      include <stdio.h>
+#    endif
+#  endif
+
+/* This macro protects us against machines that don't have function
+ * prototypes (ie K&R style headers).  If your compiler does not handle
+ * function prototypes, define this macro and use the included ansi2knr.
+ * I've always been able to use _NO_PROTO as the indicator, but you may
+ * need to drag the empty declaration out in front of here, or change the
+ * ifdef to suit your own needs.
+ */
+#ifndef PNGARG
+
+#ifdef OF /* zlib prototype munger */
+#  define PNGARG(arglist) OF(arglist)
+#else
+
+#ifdef _NO_PROTO
+#  define PNGARG(arglist) ()
+#  ifndef PNG_TYPECAST_NULL
+#     define PNG_TYPECAST_NULL
+#  endif
+#else
+#  define PNGARG(arglist) arglist
+#endif /* _NO_PROTO */
+
+#endif /* OF */
+
+#endif /* PNGARG */
+
+/* Try to determine if we are compiling on a Mac.  Note that testing for
+ * just __MWERKS__ is not good enough, because the Codewarrior is now used
+ * on non-Mac platforms.
+ */
+#ifndef MACOS
+#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
+      defined(THINK_C) || (defined(__SC__) && !defined(__DMC__))|| defined(TARGET_OS_MAC)
+#    define MACOS
+#  endif
+#endif
+
+/* enough people need this for various reasons to include it here */
+#if !defined(MACOS) && !defined(RISCOS) && !defined(_WIN32_WCE)
+#  include <sys/types.h>
+#endif
+
+#if !defined(PNG_SETJMP_NOT_SUPPORTED) && !defined(PNG_NO_SETJMP_SUPPORTED)
+#  define PNG_SETJMP_SUPPORTED
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* This is an attempt to force a single setjmp behaviour on Linux.  If
+ * the X config stuff didn't define _BSD_SOURCE we wouldn't need this.
+ */
+
+#  ifdef __linux__
+#    ifdef _BSD_SOURCE
+#      define PNG_SAVE_BSD_SOURCE
+#      undef _BSD_SOURCE
+#    endif
+#    ifdef _SETJMP_H
+     /* If you encounter a compiler error here, see the explanation
+      * near the end of INSTALL.
+      */
+         __png.h__ already includes setjmp.h;
+         __dont__ include it again.;
+#    endif
+#  endif /* __linux__ */
+
+   /* include setjmp.h for error handling */
+#  include <setjmp.h>
+
+#  ifdef __linux__
+#    ifdef PNG_SAVE_BSD_SOURCE
+#      define _BSD_SOURCE
+#      undef PNG_SAVE_BSD_SOURCE
+#    endif
+#  endif /* __linux__ */
+#endif /* PNG_SETJMP_SUPPORTED */
+
+#ifdef BSD
+#  include <strings.h>
+#else
+#  include <string.h>
+#endif
+
+/* Other defines for things like memory and the like can go here.  */
+#ifdef PNG_INTERNAL
+
+#include <stdlib.h>
+
+/* The functions exported by PNG_EXTERN are PNG_INTERNAL functions, which
+ * aren't usually used outside the library (as far as I know), so it is
+ * debatable if they should be exported at all.  In the future, when it is
+ * possible to have run-time registry of chunk-handling functions, some of
+ * these will be made available again.
+#define PNG_EXTERN extern
+ */
+#define PNG_EXTERN
+
+/* Other defines specific to compilers can go here.  Try to keep
+ * them inside an appropriate ifdef/endif pair for portability.
+ */
+
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+#  if defined(MACOS)
+     /* We need to check that <math.h> hasn't already been included earlier
+      * as it seems it doesn't agree with <fp.h>, yet we should really use
+      * <fp.h> if possible.
+      */
+#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
+#      include <fp.h>
+#    endif
+#  else
+#    include <math.h>
+#  endif
+#  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
+     /* Amiga SAS/C: We must include builtin FPU functions when compiling using
+      * MATH=68881
+      */
+#    include <m68881.h>
+#  endif
+#endif
+
+/* Codewarrior on NT has linking problems without this. */
+#if (defined(__MWERKS__) && defined(WIN32)) || defined(__STDC__)
+#  define PNG_ALWAYS_EXTERN
+#endif
+
+/* This provides the non-ANSI (far) memory allocation routines. */
+#if defined(__TURBOC__) && defined(__MSDOS__)
+#  include <mem.h>
+#  include <alloc.h>
+#endif
+
+/* I have no idea why is this necessary... */
+#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
+    defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
+#  include <malloc.h>
+#endif
+
+/* This controls how fine the dithering gets.  As this allocates
+ * a largish chunk of memory (32K), those who are not as concerned
+ * with dithering quality can decrease some or all of these.
+ */
+#ifndef PNG_DITHER_RED_BITS
+#  define PNG_DITHER_RED_BITS 5
+#endif
+#ifndef PNG_DITHER_GREEN_BITS
+#  define PNG_DITHER_GREEN_BITS 5
+#endif
+#ifndef PNG_DITHER_BLUE_BITS
+#  define PNG_DITHER_BLUE_BITS 5
+#endif
+
+/* This controls how fine the gamma correction becomes when you
+ * are only interested in 8 bits anyway.  Increasing this value
+ * results in more memory being used, and more pow() functions
+ * being called to fill in the gamma tables.  Don't set this value
+ * less then 8, and even that may not work (I haven't tested it).
+ */
+
+#ifndef PNG_MAX_GAMMA_8
+#  define PNG_MAX_GAMMA_8 11
+#endif
+
+/* This controls how much a difference in gamma we can tolerate before
+ * we actually start doing gamma conversion.
+ */
+#ifndef PNG_GAMMA_THRESHOLD
+#  define PNG_GAMMA_THRESHOLD 0.05
+#endif
+
+#endif /* PNG_INTERNAL */
+
+/* The following uses const char * instead of char * for error
+ * and warning message functions, so some compilers won't complain.
+ * If you do not want to use const, define PNG_NO_CONST here.
+ */
+
+#ifndef PNG_NO_CONST
+#  define PNG_CONST const
+#else
+#  define PNG_CONST
+#endif
+
+/* The following defines give you the ability to remove code from the
+ * library that you will not be using.  I wish I could figure out how to
+ * automate this, but I can't do that without making it seriously hard
+ * on the users.  So if you are not using an ability, change the #define
+ * to and #undef, and that part of the library will not be compiled.  If
+ * your linker can't find a function, you may want to make sure the
+ * ability is defined here.  Some of these depend upon some others being
+ * defined.  I haven't figured out all the interactions here, so you may
+ * have to experiment awhile to get everything to compile.  If you are
+ * creating or using a shared library, you probably shouldn't touch this,
+ * as it will affect the size of the structures, and this will cause bad
+ * things to happen if the library and/or application ever change.
+ */
+
+/* Any features you will not be using can be undef'ed here */
+
+/* GR-P, 0.96a: Set "*TRANSFORMS_SUPPORTED as default but allow user
+ * to turn it off with "*TRANSFORMS_NOT_SUPPORTED" or *PNG_NO_*_TRANSFORMS
+ * on the compile line, then pick and choose which ones to define without
+ * having to edit this file. It is safe to use the *TRANSFORMS_NOT_SUPPORTED
+ * if you only want to have a png-compliant reader/writer but don't need
+ * any of the extra transformations.  This saves about 80 kbytes in a
+ * typical installation of the library. (PNG_NO_* form added in version
+ * 1.0.1c, for consistency)
+ */
+
+/* The size of the png_text structure changed in libpng-1.0.6 when
+ * iTXt is supported.  It is turned off by default, to support old apps
+ * that malloc the png_text structure instead of calling png_set_text()
+ * and letting libpng malloc it.  It will be turned on by default in
+ * libpng-1.3.0.
+ */
+
+#ifndef PNG_iTXt_SUPPORTED
+#  if !defined(PNG_READ_iTXt_SUPPORTED) && !defined(PNG_NO_READ_iTXt)
+#    define PNG_NO_READ_iTXt
+#  endif
+#  if !defined(PNG_WRITE_iTXt_SUPPORTED) && !defined(PNG_NO_WRITE_iTXt)
+#    define PNG_NO_WRITE_iTXt
+#  endif
+#endif
+
+/* The following support, added after version 1.0.0, can be turned off here en
+ * masse by defining PNG_LEGACY_SUPPORTED in case you need binary compatibility
+ * with old applications that require the length of png_struct and png_info
+ * to remain unchanged.
+ */
+
+#ifdef PNG_LEGACY_SUPPORTED
+#  define PNG_NO_FREE_ME
+#  define PNG_NO_READ_UNKNOWN_CHUNKS
+#  define PNG_NO_WRITE_UNKNOWN_CHUNKS
+#  define PNG_NO_READ_USER_CHUNKS
+#  define PNG_NO_READ_iCCP
+#  define PNG_NO_WRITE_iCCP
+#  define PNG_NO_READ_iTXt
+#  define PNG_NO_WRITE_iTXt
+#  define PNG_NO_READ_sCAL
+#  define PNG_NO_WRITE_sCAL
+#  define PNG_NO_READ_sPLT
+#  define PNG_NO_WRITE_sPLT
+#  define PNG_NO_INFO_IMAGE
+#  define PNG_NO_READ_RGB_TO_GRAY
+#  define PNG_NO_READ_USER_TRANSFORM
+#  define PNG_NO_WRITE_USER_TRANSFORM
+#  define PNG_NO_USER_MEM
+#  define PNG_NO_READ_EMPTY_PLTE
+#  define PNG_NO_MNG_FEATURES
+#  define PNG_NO_FIXED_POINT_SUPPORTED
+#endif
+
+/* Ignore attempt to turn off both floating and fixed point support */
+#if !defined(PNG_FLOATING_POINT_SUPPORTED) || \
+    !defined(PNG_NO_FIXED_POINT_SUPPORTED)
+#  define PNG_FIXED_POINT_SUPPORTED
+#endif
+
+#ifndef PNG_NO_FREE_ME
+#  define PNG_FREE_ME_SUPPORTED
+#endif
+
+#if defined(PNG_READ_SUPPORTED)
+
+#if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) && \
+      !defined(PNG_NO_READ_TRANSFORMS)
+#  define PNG_READ_TRANSFORMS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_TRANSFORMS_SUPPORTED
+#  ifndef PNG_NO_READ_EXPAND
+#    define PNG_READ_EXPAND_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SHIFT
+#    define PNG_READ_SHIFT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_PACK
+#    define PNG_READ_PACK_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_BGR
+#    define PNG_READ_BGR_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SWAP
+#    define PNG_READ_SWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_PACKSWAP
+#    define PNG_READ_PACKSWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_INVERT
+#    define PNG_READ_INVERT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_DITHER
+#    define PNG_READ_DITHER_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_BACKGROUND
+#    define PNG_READ_BACKGROUND_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_16_TO_8
+#    define PNG_READ_16_TO_8_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_FILLER
+#    define PNG_READ_FILLER_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_GAMMA
+#    define PNG_READ_GAMMA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_GRAY_TO_RGB
+#    define PNG_READ_GRAY_TO_RGB_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_SWAP_ALPHA
+#    define PNG_READ_SWAP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_INVERT_ALPHA
+#    define PNG_READ_INVERT_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_STRIP_ALPHA
+#    define PNG_READ_STRIP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_USER_TRANSFORM
+#    define PNG_READ_USER_TRANSFORM_SUPPORTED
+#  endif
+#  ifndef PNG_NO_READ_RGB_TO_GRAY
+#    define PNG_READ_RGB_TO_GRAY_SUPPORTED
+#  endif
+#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
+
+#if !defined(PNG_NO_PROGRESSIVE_READ) && \
+ !defined(PNG_PROGRESSIVE_READ_NOT_SUPPORTED)  /* if you don't do progressive */
+#  define PNG_PROGRESSIVE_READ_SUPPORTED     /* reading.  This is not talking */
+#endif                               /* about interlacing capability!  You'll */
+              /* still have interlacing unless you change the following line: */
+
+#define PNG_READ_INTERLACING_SUPPORTED /* required for PNG-compliant decoders */
+
+#ifndef PNG_NO_READ_COMPOSITE_NODIV
+#  ifndef PNG_NO_READ_COMPOSITED_NODIV  /* libpng-1.0.x misspelling */
+#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED   /* well tested on Intel, SGI */
+#  endif
+#endif
+
+/* Deprecated, will be removed from version 2.0.0.
+   Use PNG_MNG_FEATURES_SUPPORTED instead. */
+#ifndef PNG_NO_READ_EMPTY_PLTE
+#  define PNG_READ_EMPTY_PLTE_SUPPORTED
+#endif
+
+#endif /* PNG_READ_SUPPORTED */
+
+#if defined(PNG_WRITE_SUPPORTED)
+
+# if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_WRITE_TRANSFORMS)
+#  define PNG_WRITE_TRANSFORMS_SUPPORTED
+#endif
+
+#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
+#  ifndef PNG_NO_WRITE_SHIFT
+#    define PNG_WRITE_SHIFT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_PACK
+#    define PNG_WRITE_PACK_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_BGR
+#    define PNG_WRITE_BGR_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_SWAP
+#    define PNG_WRITE_SWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_PACKSWAP
+#    define PNG_WRITE_PACKSWAP_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_INVERT
+#    define PNG_WRITE_INVERT_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_FILLER
+#    define PNG_WRITE_FILLER_SUPPORTED   /* same as WRITE_STRIP_ALPHA */
+#  endif
+#  ifndef PNG_NO_WRITE_SWAP_ALPHA
+#    define PNG_WRITE_SWAP_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_INVERT_ALPHA
+#    define PNG_WRITE_INVERT_ALPHA_SUPPORTED
+#  endif
+#  ifndef PNG_NO_WRITE_USER_TRANSFORM
+#    define PNG_WRITE_USER_TRANSFORM_SUPPORTED
+#  endif
+#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
+
+#define PNG_WRITE_INTERLACING_SUPPORTED  /* not required for PNG-compliant
+                                            encoders, but can cause trouble
+                                            if left undefined */
+
+#if !defined(PNG_NO_WRITE_WEIGHTED_FILTER) && \
+     defined(PNG_FLOATING_POINT_SUPPORTED)
+#  define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
+#endif
+
+#ifndef PNG_NO_WRITE_FLUSH
+#  define PNG_WRITE_FLUSH_SUPPORTED
+#endif
+
+/* Deprecated, see PNG_MNG_FEATURES_SUPPORTED, above */
+#ifndef PNG_NO_WRITE_EMPTY_PLTE
+#  define PNG_WRITE_EMPTY_PLTE_SUPPORTED
+#endif
+
+#endif /* PNG_WRITE_SUPPORTED */
+
+#ifndef PNG_1_0_X
+#  ifndef PNG_NO_ERROR_NUMBERS
+#    define PNG_ERROR_NUMBERS_SUPPORTED
+#  endif
+#endif /* PNG_1_0_X */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+#  ifndef PNG_NO_USER_TRANSFORM_PTR
+#    define PNG_USER_TRANSFORM_PTR_SUPPORTED
+#  endif
+#endif
+
+#ifndef PNG_NO_STDIO
+#  define PNG_TIME_RFC1123_SUPPORTED
+#endif
+
+/* This adds extra functions in pngget.c for accessing data from the
+ * info pointer (added in version 0.99)
+ * png_get_image_width()
+ * png_get_image_height()
+ * png_get_bit_depth()
+ * png_get_color_type()
+ * png_get_compression_type()
+ * png_get_filter_type()
+ * png_get_interlace_type()
+ * png_get_pixel_aspect_ratio()
+ * png_get_pixels_per_meter()
+ * png_get_x_offset_pixels()
+ * png_get_y_offset_pixels()
+ * png_get_x_offset_microns()
+ * png_get_y_offset_microns()
+ */
+#if !defined(PNG_NO_EASY_ACCESS) && !defined(PNG_EASY_ACCESS_SUPPORTED)
+#  define PNG_EASY_ACCESS_SUPPORTED
+#endif
+
+/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
+   even when PNG_USE_PNGVCRD or PNG_USE_PNGGCCRD is not defined */
+#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
+#  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
+#    define PNG_ASSEMBLER_CODE_SUPPORTED
+#  endif
+#  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
+#    define PNG_MMX_CODE_SUPPORTED
+#  endif
+#endif
+
+/* If you are sure that you don't need thread safety and you are compiling
+   with PNG_USE_PNGCCRD for an MMX application, you can define this for
+   faster execution.  See pnggccrd.c.
+#define PNG_THREAD_UNSAFE_OK
+*/
+
+#if !defined(PNG_1_0_X)
+#if !defined(PNG_NO_USER_MEM) && !defined(PNG_USER_MEM_SUPPORTED)
+#  define PNG_USER_MEM_SUPPORTED
+#endif
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.2.6 */
+#if !defined(PNG_1_0_X)
+#ifndef PNG_SET_USER_LIMITS_SUPPORTED
+#if !defined(PNG_NO_SET_USER_LIMITS) && !defined(PNG_SET_USER_LIMITS_SUPPORTED)
+#  define PNG_SET_USER_LIMITS_SUPPORTED
+#endif
+#endif
+#endif /* PNG_1_0_X */
+
+/* Added at libpng-1.0.16 and 1.2.6.  To accept all valid PNGS no matter
+ * how large, set these limits to 0x7fffffffL
+ */
+#ifndef PNG_USER_WIDTH_MAX
+#  define PNG_USER_WIDTH_MAX 1000000L
+#endif
+#ifndef PNG_USER_HEIGHT_MAX
+#  define PNG_USER_HEIGHT_MAX 1000000L
+#endif
+
+/* These are currently experimental features, define them if you want */
+
+/* very little testing */
+/*
+#ifdef PNG_READ_SUPPORTED
+#  ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#    define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
+#  endif
+#endif
+*/
+
+/* This is only for PowerPC big-endian and 680x0 systems */
+/* some testing */
+/*
+#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
+#  define PNG_READ_BIG_ENDIAN_SUPPORTED
+#endif
+*/
+
+/* Buggy compilers (e.g., gcc 2.7.2.2) need this */
+/*
+#define PNG_NO_POINTER_INDEXING
+*/
+
+/* These functions are turned off by default, as they will be phased out. */
+/*
+#define  PNG_USELESS_TESTS_SUPPORTED
+#define  PNG_CORRECT_PALETTE_SUPPORTED
+*/
+
+/* Any chunks you are not interested in, you can undef here.  The
+ * ones that allocate memory may be expecially important (hIST,
+ * tEXt, zTXt, tRNS, pCAL).  Others will just save time and make png_info
+ * a bit smaller.
+ */
+
+#if defined(PNG_READ_SUPPORTED) && \
+    !defined(PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_READ_ANCILLARY_CHUNKS)
+#  define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+
+#if defined(PNG_WRITE_SUPPORTED) && \
+    !defined(PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
+    !defined(PNG_NO_WRITE_ANCILLARY_CHUNKS)
+#  define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+#endif
+
+#ifdef PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
+
+#ifdef PNG_NO_READ_TEXT
+#  define PNG_NO_READ_iTXt
+#  define PNG_NO_READ_tEXt
+#  define PNG_NO_READ_zTXt
+#endif
+#ifndef PNG_NO_READ_bKGD
+#  define PNG_READ_bKGD_SUPPORTED
+#  define PNG_bKGD_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_cHRM
+#  define PNG_READ_cHRM_SUPPORTED
+#  define PNG_cHRM_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_gAMA
+#  define PNG_READ_gAMA_SUPPORTED
+#  define PNG_gAMA_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_hIST
+#  define PNG_READ_hIST_SUPPORTED
+#  define PNG_hIST_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_iCCP
+#  define PNG_READ_iCCP_SUPPORTED
+#  define PNG_iCCP_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_iTXt
+#  ifndef PNG_READ_iTXt_SUPPORTED
+#    define PNG_READ_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_iTXt_SUPPORTED
+#    define PNG_iTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_READ_oFFs
+#  define PNG_READ_oFFs_SUPPORTED
+#  define PNG_oFFs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pCAL
+#  define PNG_READ_pCAL_SUPPORTED
+#  define PNG_pCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sCAL
+#  define PNG_READ_sCAL_SUPPORTED
+#  define PNG_sCAL_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_pHYs
+#  define PNG_READ_pHYs_SUPPORTED
+#  define PNG_pHYs_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sBIT
+#  define PNG_READ_sBIT_SUPPORTED
+#  define PNG_sBIT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sPLT
+#  define PNG_READ_sPLT_SUPPORTED
+#  define PNG_sPLT_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_sRGB
+#  define PNG_READ_sRGB_SUPPORTED
+#  define PNG_sRGB_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tEXt
+#  define PNG_READ_tEXt_SUPPORTED
+#  define PNG_tEXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tIME
+#  define PNG_READ_tIME_SUPPORTED
+#  define PNG_tIME_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_tRNS
+#  define PNG_READ_tRNS_SUPPORTED
+#  define PNG_tRNS_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_zTXt
+#  define PNG_READ_zTXt_SUPPORTED
+#  define PNG_zTXt_SUPPORTED
+#endif
+#ifndef PNG_NO_READ_UNKNOWN_CHUNKS
+#  define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
+#  endif
+#  ifndef PNG_NO_HANDLE_AS_UNKNOWN
+#    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#  endif
+#endif
+#if !defined(PNG_NO_READ_USER_CHUNKS) && \
+     defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#  define PNG_READ_USER_CHUNKS_SUPPORTED
+#  define PNG_USER_CHUNKS_SUPPORTED
+#  ifdef PNG_NO_READ_UNKNOWN_CHUNKS
+#    undef PNG_NO_READ_UNKNOWN_CHUNKS
+#  endif
+#  ifdef PNG_NO_HANDLE_AS_UNKNOWN
+#    undef PNG_NO_HANDLE_AS_UNKNOWN
+#  endif
+#endif
+#ifndef PNG_NO_READ_OPT_PLTE
+#  define PNG_READ_OPT_PLTE_SUPPORTED /* only affects support of the */
+#endif                      /* optional PLTE chunk in RGB and RGBA images */
+#if defined(PNG_READ_iTXt_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) || \
+    defined(PNG_READ_zTXt_SUPPORTED)
+#  define PNG_READ_TEXT_SUPPORTED
+#  define PNG_TEXT_SUPPORTED
+#endif
+
+#endif /* PNG_READ_ANCILLARY_CHUNKS_SUPPORTED */
+
+#ifdef PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
+
+#ifdef PNG_NO_WRITE_TEXT
+#  define PNG_NO_WRITE_iTXt
+#  define PNG_NO_WRITE_tEXt
+#  define PNG_NO_WRITE_zTXt
+#endif
+#ifndef PNG_NO_WRITE_bKGD
+#  define PNG_WRITE_bKGD_SUPPORTED
+#  ifndef PNG_bKGD_SUPPORTED
+#    define PNG_bKGD_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_cHRM
+#  define PNG_WRITE_cHRM_SUPPORTED
+#  ifndef PNG_cHRM_SUPPORTED
+#    define PNG_cHRM_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_gAMA
+#  define PNG_WRITE_gAMA_SUPPORTED
+#  ifndef PNG_gAMA_SUPPORTED
+#    define PNG_gAMA_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_hIST
+#  define PNG_WRITE_hIST_SUPPORTED
+#  ifndef PNG_hIST_SUPPORTED
+#    define PNG_hIST_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_iCCP
+#  define PNG_WRITE_iCCP_SUPPORTED
+#  ifndef PNG_iCCP_SUPPORTED
+#    define PNG_iCCP_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_iTXt
+#  ifndef PNG_WRITE_iTXt_SUPPORTED
+#    define PNG_WRITE_iTXt_SUPPORTED
+#  endif
+#  ifndef PNG_iTXt_SUPPORTED
+#    define PNG_iTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_oFFs
+#  define PNG_WRITE_oFFs_SUPPORTED
+#  ifndef PNG_oFFs_SUPPORTED
+#    define PNG_oFFs_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_pCAL
+#  define PNG_WRITE_pCAL_SUPPORTED
+#  ifndef PNG_pCAL_SUPPORTED
+#    define PNG_pCAL_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sCAL
+#  define PNG_WRITE_sCAL_SUPPORTED
+#  ifndef PNG_sCAL_SUPPORTED
+#    define PNG_sCAL_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_pHYs
+#  define PNG_WRITE_pHYs_SUPPORTED
+#  ifndef PNG_pHYs_SUPPORTED
+#    define PNG_pHYs_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sBIT
+#  define PNG_WRITE_sBIT_SUPPORTED
+#  ifndef PNG_sBIT_SUPPORTED
+#    define PNG_sBIT_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sPLT
+#  define PNG_WRITE_sPLT_SUPPORTED
+#  ifndef PNG_sPLT_SUPPORTED
+#    define PNG_sPLT_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_sRGB
+#  define PNG_WRITE_sRGB_SUPPORTED
+#  ifndef PNG_sRGB_SUPPORTED
+#    define PNG_sRGB_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tEXt
+#  define PNG_WRITE_tEXt_SUPPORTED
+#  ifndef PNG_tEXt_SUPPORTED
+#    define PNG_tEXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tIME
+#  define PNG_WRITE_tIME_SUPPORTED
+#  ifndef PNG_tIME_SUPPORTED
+#    define PNG_tIME_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_tRNS
+#  define PNG_WRITE_tRNS_SUPPORTED
+#  ifndef PNG_tRNS_SUPPORTED
+#    define PNG_tRNS_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_zTXt
+#  define PNG_WRITE_zTXt_SUPPORTED
+#  ifndef PNG_zTXt_SUPPORTED
+#    define PNG_zTXt_SUPPORTED
+#  endif
+#endif
+#ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS
+#  define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+#  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+#    define PNG_UNKNOWN_CHUNKS_SUPPORTED
+#  endif
+#  ifndef PNG_NO_HANDLE_AS_UNKNOWN
+#     ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#       define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+#     endif
+#  endif
+#endif
+#if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
+    defined(PNG_WRITE_zTXt_SUPPORTED)
+#  define PNG_WRITE_TEXT_SUPPORTED
+#  ifndef PNG_TEXT_SUPPORTED
+#    define PNG_TEXT_SUPPORTED
+#  endif
+#endif
+
+#endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
+
+/* Turn this off to disable png_read_png() and
+ * png_write_png() and leave the row_pointers member
+ * out of the info structure.
+ */
+#ifndef PNG_NO_INFO_IMAGE
+#  define PNG_INFO_IMAGE_SUPPORTED
+#endif
+
+/* need the time information for reading tIME chunks */
+#if defined(PNG_tIME_SUPPORTED)
+#  if !defined(_WIN32_WCE)
+     /* "time.h" functions are not supported on WindowsCE */
+#    include <time.h>
+#  endif
+#endif
+
+/* Some typedefs to get us started.  These should be safe on most of the
+ * common platforms.  The typedefs should be at least as large as the
+ * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
+ * don't have to be exactly that size.  Some compilers dislike passing
+ * unsigned shorts as function parameters, so you may be better off using
+ * unsigned int for png_uint_16.  Likewise, for 64-bit systems, you may
+ * want to have unsigned int for png_uint_32 instead of unsigned long.
+ */
+
+typedef unsigned long png_uint_32;
+typedef long png_int_32;
+typedef unsigned short png_uint_16;
+typedef short png_int_16;
+typedef unsigned char png_byte;
+
+/* This is usually size_t.  It is typedef'ed just in case you need it to
+   change (I'm not sure if you will or not, so I thought I'd be safe) */
+#ifdef PNG_SIZE_T
+   typedef PNG_SIZE_T png_size_t;
+#  define png_sizeof(x) png_convert_size(sizeof (x))
+#else
+   typedef size_t png_size_t;
+#  define png_sizeof(x) sizeof (x)
+#endif
+
+/* The following is needed for medium model support.  It cannot be in the
+ * PNG_INTERNAL section.  Needs modification for other compilers besides
+ * MSC.  Model independent support declares all arrays and pointers to be
+ * large using the far keyword.  The zlib version used must also support
+ * model independent data.  As of version zlib 1.0.4, the necessary changes
+ * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
+ * changes that are needed. (Tim Wegner)
+ */
+
+/* Separate compiler dependencies (problem here is that zlib.h always
+   defines FAR. (SJT) */
+#ifdef __BORLANDC__
+#  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
+#    define LDATA 1
+#  else
+#    define LDATA 0
+#  endif
+   /* GRR:  why is Cygwin in here?  Cygwin is not Borland C... */
+#  if !defined(__WIN32__) && !defined(__FLAT__) && !defined(__CYGWIN__)
+#    define PNG_MAX_MALLOC_64K
+#    if (LDATA != 1)
+#      ifndef FAR
+#        define FAR __far
+#      endif
+#      define USE_FAR_KEYWORD
+#    endif   /* LDATA != 1 */
+     /* Possibly useful for moving data out of default segment.
+      * Uncomment it if you want. Could also define FARDATA as
+      * const if your compiler supports it. (SJT)
+#    define FARDATA FAR
+      */
+#  endif  /* __WIN32__, __FLAT__, __CYGWIN__ */
+#endif   /* __BORLANDC__ */
+
+
+/* Suggest testing for specific compiler first before testing for
+ * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
+ * making reliance oncertain keywords suspect. (SJT)
+ */
+
+/* MSC Medium model */
+#if defined(FAR)
+#  if defined(M_I86MM)
+#    define USE_FAR_KEYWORD
+#    define FARDATA FAR
+#    include <dos.h>
+#  endif
+#endif
+
+/* SJT: default case */
+#ifndef FAR
+#  define FAR
+#endif
+
+/* At this point FAR is always defined */
+#ifndef FARDATA
+#  define FARDATA
+#endif
+
+/* Typedef for floating-point numbers that are converted
+   to fixed-point with a multiple of 100,000, e.g., int_gamma */
+typedef png_int_32 png_fixed_point;
+
+/* Add typedefs for pointers */
+typedef void            FAR * png_voidp;
+typedef png_byte        FAR * png_bytep;
+typedef png_uint_32     FAR * png_uint_32p;
+typedef png_int_32      FAR * png_int_32p;
+typedef png_uint_16     FAR * png_uint_16p;
+typedef png_int_16      FAR * png_int_16p;
+typedef PNG_CONST char  FAR * png_const_charp;
+typedef char            FAR * png_charp;
+typedef png_fixed_point FAR * png_fixed_point_p;
+
+#ifndef PNG_NO_STDIO
+#if defined(_WIN32_WCE)
+typedef HANDLE                png_FILE_p;
+#else
+typedef FILE                * png_FILE_p;
+#endif
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+typedef double          FAR * png_doublep;
+#endif
+
+/* Pointers to pointers; i.e. arrays */
+typedef png_byte        FAR * FAR * png_bytepp;
+typedef png_uint_32     FAR * FAR * png_uint_32pp;
+typedef png_int_32      FAR * FAR * png_int_32pp;
+typedef png_uint_16     FAR * FAR * png_uint_16pp;
+typedef png_int_16      FAR * FAR * png_int_16pp;
+typedef PNG_CONST char  FAR * FAR * png_const_charpp;
+typedef char            FAR * FAR * png_charpp;
+typedef png_fixed_point FAR * FAR * png_fixed_point_pp;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+typedef double          FAR * FAR * png_doublepp;
+#endif
+
+/* Pointers to pointers to pointers; i.e., pointer to array */
+typedef char            FAR * FAR * FAR * png_charppp;
+
+/* libpng typedefs for types in zlib. If zlib changes
+ * or another compression library is used, then change these.
+ * Eliminates need to change all the source files.
+ */
+typedef charf *         png_zcharp;
+typedef charf * FAR *   png_zcharpp;
+typedef z_stream FAR *  png_zstreamp;
+
+/*
+ * Define PNG_BUILD_DLL if the module being built is a Windows
+ * LIBPNG DLL.
+ *
+ * Define PNG_USE_DLL if you want to *link* to the Windows LIBPNG DLL.
+ * It is equivalent to Microsoft predefined macro _DLL that is
+ * automatically defined when you compile using the share
+ * version of the CRT (C Run-Time library)
+ *
+ * The cygwin mods make this behavior a little different:
+ * Define PNG_BUILD_DLL if you are building a dll for use with cygwin
+ * Define PNG_STATIC if you are building a static library for use with cygwin,
+ *   -or- if you are building an application that you want to link to the
+ *   static library.
+ * PNG_USE_DLL is defined by default (no user action needed) unless one of
+ *   the other flags is defined.
+ */
+
+#if !defined(PNG_DLL) && (defined(PNG_BUILD_DLL) || defined(PNG_USE_DLL))
+#  define PNG_DLL
+#endif
+/* If CYGWIN, then disallow GLOBAL ARRAYS unless building a static lib.
+ * When building a static lib, default to no GLOBAL ARRAYS, but allow
+ * command-line override
+ */
+#if defined(__CYGWIN__)
+#  if !defined(PNG_STATIC)
+#    if defined(PNG_USE_GLOBAL_ARRAYS)
+#      undef PNG_USE_GLOBAL_ARRAYS
+#    endif
+#    if !defined(PNG_USE_LOCAL_ARRAYS)
+#      define PNG_USE_LOCAL_ARRAYS
+#    endif
+#  else
+#    if defined(PNG_USE_LOCAL_ARRAYS) || defined(PNG_NO_GLOBAL_ARRAYS)
+#      if defined(PNG_USE_GLOBAL_ARRAYS)
+#        undef PNG_USE_GLOBAL_ARRAYS
+#      endif
+#    endif
+#  endif
+#  if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
+#    define PNG_USE_LOCAL_ARRAYS
+#  endif
+#endif
+
+/* Do not use global arrays (helps with building DLL's)
+ * They are no longer used in libpng itself, since version 1.0.5c,
+ * but might be required for some pre-1.0.5c applications.
+ */
+#if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
+#  if defined(PNG_NO_GLOBAL_ARRAYS) || (defined(__GNUC__) && defined(PNG_DLL))
+#    define PNG_USE_LOCAL_ARRAYS
+#  else
+#    define PNG_USE_GLOBAL_ARRAYS
+#  endif
+#endif
+
+#if defined(__CYGWIN__) || defined(__WINE__)
+#  undef PNGAPI
+#  if defined(__WINE__)
+#    define PNGAPI
+#  else
+#    define PNGAPI __cdecl
+#  endif
+#  undef PNG_IMPEXP
+#  define PNG_IMPEXP
+#endif
+
+/* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
+ * you may get warnings regarding the linkage of png_zalloc and png_zfree.
+ * Don't ignore those warnings; you must also reset the default calling
+ * convention in your compiler to match your PNGAPI, and you must build
+ * zlib and your applications the same way you build libpng.
+ */
+
+#if defined(__MINGW32__) && !defined(PNG_MODULEDEF)
+#  ifndef PNG_NO_MODULEDEF
+#    define PNG_NO_MODULEDEF
+#  endif
+#endif
+
+#if !defined(PNG_IMPEXP) && defined(PNG_BUILD_DLL) && !defined(PNG_NO_MODULEDEF)
+#  define PNG_IMPEXP
+#endif
+
+#if defined(PNG_DLL) || defined(_DLL) || defined(__DLL__ ) || \
+    (( defined(_Windows) || defined(_WINDOWS) || \
+       defined(WIN32) || defined(_WIN32) || defined(__WIN32__) ))
+
+#  ifndef PNGAPI
+#     if defined(__GNUC__) || (defined (_MSC_VER) && (_MSC_VER >= 800))
+#        define PNGAPI __cdecl
+#     else
+#        define PNGAPI _cdecl
+#     endif
+#  endif
+
+#  if !defined(PNG_IMPEXP) && (!defined(PNG_DLL) || \
+       0 /* WINCOMPILER_WITH_NO_SUPPORT_FOR_DECLIMPEXP */)
+#     define PNG_IMPEXP
+#  endif
+
+#  if !defined(PNG_IMPEXP)
+
+#     define PNG_EXPORT_TYPE1(type,symbol)  PNG_IMPEXP type PNGAPI symbol
+#     define PNG_EXPORT_TYPE2(type,symbol)  type PNG_IMPEXP PNGAPI symbol
+
+      /* Borland/Microsoft */
+#     if defined(_MSC_VER) || defined(__BORLANDC__)
+#        if (_MSC_VER >= 800) || (__BORLANDC__ >= 0x500)
+#           define PNG_EXPORT PNG_EXPORT_TYPE1
+#        else
+#           define PNG_EXPORT PNG_EXPORT_TYPE2
+#           if defined(PNG_BUILD_DLL)
+#              define PNG_IMPEXP __export
+#           else
+#              define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in
+                                                 VC++ */
+#           endif                             /* Exists in Borland C++ for
+                                                 C++ classes (== huge) */
+#        endif
+#     endif
+
+#     if !defined(PNG_IMPEXP)
+#        if defined(PNG_BUILD_DLL)
+#           define PNG_IMPEXP __declspec(dllexport)
+#        else
+#           define PNG_IMPEXP __declspec(dllimport)
+#        endif
+#     endif
+#  endif  /* PNG_IMPEXP */
+#else /* !(DLL || non-cygwin WINDOWS) */
+#   if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
+#      ifndef PNGAPI
+#         define PNGAPI _System
+#      endif
+#   else
+#      if 0 /* ... other platforms, with other meanings */
+#      endif
+#    endif
+#endif
+
+#if defined(__VISAGECPP__)
+/* I don't compile with this _System linkage for wxWidgets */
+#  ifdef PNGAPI
+#    undef PNGAPI
+#  endif
+#  define PNGAPI _Optlink
+#  define PNG_IMPEXP
+#  define PNG_USE_LOCAL_ARRAYS
+#  ifdef PNG_USE_GLOBAL_ARRAYS
+#    undef PNG_USE_GLOBAL_ARRAYS
+#  endif
+extern const char png_libpng_ver[18];
+#endif
+
+#ifndef PNGAPI
+#  define PNGAPI
+#endif
+#ifndef PNG_IMPEXP
+#  define PNG_IMPEXP
+#endif
+
+#ifndef PNG_EXPORT
+#  define PNG_EXPORT(type,symbol) PNG_IMPEXP type PNGAPI symbol
+#endif
+
+#ifdef PNG_USE_GLOBAL_ARRAYS
+#  ifndef PNG_EXPORT_VAR
+#    define PNG_EXPORT_VAR(type) extern PNG_IMPEXP type
+#  endif
+#endif
+
+/* User may want to use these so they are not in PNG_INTERNAL. Any library
+ * functions that are passed far data must be model independent.
+ */
+
+#ifndef PNG_ABORT
+#  define PNG_ABORT() abort()
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#else
+#  define png_jmpbuf(png_ptr) \
+   (LIBPNG_WAS_COMPILED_WITH__PNG_SETJMP_NOT_SUPPORTED)
+#endif
+
+#if defined(USE_FAR_KEYWORD)  /* memory model independent fns */
+/* use this to make far-to-near assignments */
+#  define CHECK   1
+#  define NOCHECK 0
+#  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
+#  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
+#  define png_strcpy  _fstrcpy
+#  define png_strncpy _fstrncpy   /* Added to v 1.2.6 */
+#  define png_strlen  _fstrlen
+#  define png_memcmp  _fmemcmp    /* SJT: added */
+#  define png_memcpy  _fmemcpy
+#  define png_memset  _fmemset
+#else /* use the usual functions */
+#  define CVT_PTR(ptr)         (ptr)
+#  define CVT_PTR_NOCHECK(ptr) (ptr)
+#  define png_strcpy  strcpy
+#  define png_strncpy strncpy     /* Added to v 1.2.6 */
+#  define png_strlen  strlen
+#  define png_memcmp  memcmp      /* SJT: added */
+#  define png_memcpy  memcpy
+#  define png_memset  memset
+#endif
+/* End of memory model independent support */
+
+/* Just a little check that someone hasn't tried to define something
+ * contradictory.
+ */
+#if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)
+#  undef PNG_ZBUF_SIZE
+#  define PNG_ZBUF_SIZE 65536L
+#endif
+
+#ifdef PNG_READ_SUPPORTED
+/* Prior to libpng-1.0.9, this block was in pngasmrd.h */
+#if defined(PNG_INTERNAL)
+
+/* These are the default thresholds before the MMX code kicks in; if either
+ * rowbytes or bitdepth is below the threshold, plain C code is used.  These
+ * can be overridden at runtime via the png_set_mmx_thresholds() call in
+ * libpng 1.2.0 and later.  The values below were chosen by Intel.
+ */
+
+#ifndef PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT
+#  define PNG_MMX_ROWBYTES_THRESHOLD_DEFAULT  128  /*  >=  */
+#endif
+#ifndef PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT
+#  define PNG_MMX_BITDEPTH_THRESHOLD_DEFAULT  9    /*  >=  */
+#endif
+
+/* Set this in the makefile for VC++ on Pentium, not here. */
+/* Platform must be Pentium.  Makefile must assemble and load pngvcrd.c .
+ * MMX will be detected at run time and used if present.
+ */
+#ifdef PNG_USE_PNGVCRD
+#  define PNG_HAVE_ASSEMBLER_COMBINE_ROW
+#  define PNG_HAVE_ASSEMBLER_READ_INTERLACE
+#  define PNG_HAVE_ASSEMBLER_READ_FILTER_ROW
+#endif
+
+/* Set this in the makefile for gcc/as on Pentium, not here. */
+/* Platform must be Pentium.  Makefile must assemble and load pnggccrd.c .
+ * MMX will be detected at run time and used if present.
+ */
+#ifdef PNG_USE_PNGGCCRD
+#  define PNG_HAVE_ASSEMBLER_COMBINE_ROW
+#  define PNG_HAVE_ASSEMBLER_READ_INTERLACE
+#  define PNG_HAVE_ASSEMBLER_READ_FILTER_ROW
+#endif
+/* - see pnggccrd.c for info about what is currently enabled */
+
+#endif /* PNG_INTERNAL */
+#endif /* PNG_READ_SUPPORTED */
+
+#endif /* PNGCONF_H */
+
diff --git a/Source/3rd Party/wx/src/png/pngdebug.h b/Source/3rd Party/wx/src/png/pngdebug.h
deleted file mode 100644
index 96c1ea42b..000000000
--- a/Source/3rd Party/wx/src/png/pngdebug.h	
+++ /dev/null
@@ -1,157 +0,0 @@
-
-/* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
- *
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* Define PNG_DEBUG at compile time for debugging information.  Higher
- * numbers for PNG_DEBUG mean more debugging information.  This has
- * only been added since version 0.95 so it is not implemented throughout
- * libpng yet, but more support will be added as needed.
- *
- * png_debug[1-2]?(level, message ,arg{0-2})
- *   Expands to a statement (either a simple expression or a compound
- *   do..while(0) statement) that outputs a message with parameter
- *   substitution if PNG_DEBUG is defined to 2 or more.  If PNG_DEBUG
- *   is undefined, 0 or 1 every png_debug expands to a simple expression
- *   (actually ((void)0)).
- *
- *   level: level of detail of message, starting at 0.  A level 'n'
- *          message is preceded by 'n' tab characters (not implemented
- *          on Microsoft compilers unless PNG_DEBUG_FILE is also
- *          defined, to allow debug DLL compilation with no standard IO).
- *   message: a printf(3) style text string.  A trailing '\n' is added
- *            to the message.
- *   arg: 0 to 2 arguments for printf(3) style substitution in message.
- */
-#ifndef PNGDEBUG_H
-#define PNGDEBUG_H
-/* These settings control the formatting of messages in png.c and pngerror.c */
-/* Moved to pngdebug.h at 1.5.0 */
-#  ifndef PNG_LITERAL_SHARP
-#    define PNG_LITERAL_SHARP 0x23
-#  endif
-#  ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
-#    define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b
-#  endif
-#  ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET
-#    define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d
-#  endif
-#  ifndef PNG_STRING_NEWLINE
-#    define PNG_STRING_NEWLINE "\n"
-#  endif
-
-#ifdef PNG_DEBUG
-#  if (PNG_DEBUG > 0)
-#    if !defined(PNG_DEBUG_FILE) && defined(_MSC_VER)
-#      include <crtdbg.h>
-#      if (PNG_DEBUG > 1)
-#        ifndef _DEBUG
-#          define _DEBUG
-#        endif
-#        ifndef png_debug
-#          define png_debug(l,m)  _RPT0(_CRT_WARN,m PNG_STRING_NEWLINE)
-#        endif
-#        ifndef png_debug1
-#          define png_debug1(l,m,p1)  _RPT1(_CRT_WARN,m PNG_STRING_NEWLINE,p1)
-#        endif
-#        ifndef png_debug2
-#          define png_debug2(l,m,p1,p2) \
-             _RPT2(_CRT_WARN,m PNG_STRING_NEWLINE,p1,p2)
-#        endif
-#      endif
-#    else /* PNG_DEBUG_FILE || !_MSC_VER */
-#      ifndef PNG_STDIO_SUPPORTED
-#        include <stdio.h> /* not included yet */
-#      endif
-#      ifndef PNG_DEBUG_FILE
-#        define PNG_DEBUG_FILE stderr
-#      endif /* PNG_DEBUG_FILE */
-
-#      if (PNG_DEBUG > 1)
-/* Note: ["%s"m PNG_STRING_NEWLINE] probably does not work on
- * non-ISO compilers
- */
-#        ifdef __STDC__
-#          ifndef png_debug
-#            define png_debug(l,m) \
-       do { \
-       int num_tabs=l; \
-       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \
-       } while (0)
-#          endif
-#          ifndef png_debug1
-#            define png_debug1(l,m,p1) \
-       do { \
-       int num_tabs=l; \
-       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \
-       } while (0)
-#          endif
-#          ifndef png_debug2
-#            define png_debug2(l,m,p1,p2) \
-       do { \
-       int num_tabs=l; \
-       fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \
-       } while (0)
-#          endif
-#        else /* __STDC __ */
-#          ifndef png_debug
-#            define png_debug(l,m) \
-       do { \
-       int num_tabs=l; \
-       char format[256]; \
-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
-         m,PNG_STRING_NEWLINE); \
-       fprintf(PNG_DEBUG_FILE,format); \
-       } while (0)
-#          endif
-#          ifndef png_debug1
-#            define png_debug1(l,m,p1) \
-       do { \
-       int num_tabs=l; \
-       char format[256]; \
-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
-         m,PNG_STRING_NEWLINE); \
-       fprintf(PNG_DEBUG_FILE,format,p1); \
-       } while (0)
-#          endif
-#          ifndef png_debug2
-#            define png_debug2(l,m,p1,p2) \
-       do { \
-       int num_tabs=l; \
-       char format[256]; \
-       snprintf(format,256,"%s%s%s",(num_tabs==1 ? "\t" : \
-         (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))), \
-         m,PNG_STRING_NEWLINE); \
-       fprintf(PNG_DEBUG_FILE,format,p1,p2); \
-       } while (0)
-#          endif
-#        endif /* __STDC __ */
-#      endif /* (PNG_DEBUG > 1) */
-
-#    endif /* _MSC_VER */
-#  endif /* (PNG_DEBUG > 0) */
-#endif /* PNG_DEBUG */
-#ifndef png_debug
-#  define png_debug(l, m) ((void)0)
-#endif
-#ifndef png_debug1
-#  define png_debug1(l, m, p1) ((void)0)
-#endif
-#ifndef png_debug2
-#  define png_debug2(l, m, p1, p2) ((void)0)
-#endif
-#endif /* PNGDEBUG_H */
diff --git a/Source/3rd Party/wx/src/png/pngerror.c b/Source/3rd Party/wx/src/png/pngerror.c
index 6494a0cc7..fda078ef5 100644
--- a/Source/3rd Party/wx/src/png/pngerror.c	
+++ b/Source/3rd Party/wx/src/png/pngerror.c	
@@ -1,676 +1,295 @@
-
-/* pngerror.c - stub functions for i/o and memory allocation
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all error handling.  Users who
- * need special error handling are expected to write replacement functions
- * and use png_set_error_fn() to use those functions.  See the instructions
- * at each function.
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-static PNG_FUNCTION(void, png_default_error,PNGARG((png_structp png_ptr,
-    png_const_charp error_message)),PNG_NORETURN);
-
-#ifdef PNG_WARNINGS_SUPPORTED
-static void /* PRIVATE */
-png_default_warning PNGARG((png_structp png_ptr,
-   png_const_charp warning_message));
-#endif /* PNG_WARNINGS_SUPPORTED */
-
-/* This function is called whenever there is a fatal error.  This function
- * should not be changed.  If there is a need to handle errors differently,
- * you should supply a replacement error function and use png_set_error_fn()
- * to replace the error function at run-time.
- */
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-PNG_FUNCTION(void,PNGAPI
-png_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN)
-{
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   char msg[16];
-   if (png_ptr != NULL)
-   {
-      if (png_ptr->flags&
-         (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
-      {
-         if (*error_message == PNG_LITERAL_SHARP)
-         {
-            /* Strip "#nnnn " from beginning of error message. */
-            int offset;
-            for (offset = 1; offset<15; offset++)
-               if (error_message[offset] == ' ')
-                  break;
-
-            if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-            {
-               int i;
-               for (i = 0; i < offset - 1; i++)
-                  msg[i] = error_message[i + 1];
-               msg[i - 1] = '\0';
-               error_message = msg;
-            }
-
-            else
-               error_message += offset;
-      }
-
-      else
-      {
-         if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
-         {
-            msg[0] = '0';
-            msg[1] = '\0';
-            error_message = msg;
-         }
-       }
-     }
-   }
-#endif
-   if (png_ptr != NULL && png_ptr->error_fn != NULL)
-      (*(png_ptr->error_fn))(png_ptr, error_message);
-
-   /* If the custom handler doesn't exist, or if it returns,
-      use the default handler, which will not return. */
-   png_default_error(png_ptr, error_message);
-}
-#else
-PNG_FUNCTION(void,PNGAPI
-png_err,(png_structp png_ptr),PNG_NORETURN)
-{
-   /* Prior to 1.5.2 the error_fn received a NULL pointer, expressed
-    * erroneously as '\0', instead of the empty string "".  This was
-    * apparently an error, introduced in libpng-1.2.20, and png_default_error
-    * will crash in this case.
-    */
-   if (png_ptr != NULL && png_ptr->error_fn != NULL)
-      (*(png_ptr->error_fn))(png_ptr, "");
-
-   /* If the custom handler doesn't exist, or if it returns,
-      use the default handler, which will not return. */
-   png_default_error(png_ptr, "");
-}
-#endif /* PNG_ERROR_TEXT_SUPPORTED */
-
-/* Utility to safely appends strings to a buffer.  This never errors out so
- * error checking is not required in the caller.
- */
-size_t
-png_safecat(png_charp buffer, size_t bufsize, size_t pos,
-   png_const_charp string)
-{
-   if (buffer != NULL && pos < bufsize)
-   {
-      if (string != NULL)
-         while (*string != '\0' && pos < bufsize-1)
-           buffer[pos++] = *string++;
-
-      buffer[pos] = '\0';
-   }
-
-   return pos;
-}
-
-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_TIME_RFC1123_SUPPORTED)
-/* Utility to dump an unsigned value into a buffer, given a start pointer and
- * and end pointer (which should point just *beyond* the end of the buffer!)
- * Returns the pointer to the start of the formatted string.
- */
-png_charp
-png_format_number(png_const_charp start, png_charp end, int format,
-   png_alloc_size_t number)
-{
-   int count = 0;    /* number of digits output */
-   int mincount = 1; /* minimum number required */
-   int output = 0;   /* digit output (for the fixed point format) */
-
-   *--end = '\0';
-
-   /* This is written so that the loop always runs at least once, even with
-    * number zero.
-    */
-   while (end > start && (number != 0 || count < mincount))
-   {
-
-      static const char digits[] = "0123456789ABCDEF";
-
-      switch (format)
-      {
-         case PNG_NUMBER_FORMAT_fixed:
-            /* Needs five digits (the fraction) */
-            mincount = 5;
-            if (output || number % 10 != 0)
-            {
-               *--end = digits[number % 10];
-               output = 1;
-            }
-            number /= 10;
-            break;
-
-         case PNG_NUMBER_FORMAT_02u:
-            /* Expects at least 2 digits. */
-            mincount = 2;
-            /* fall through */
-
-         case PNG_NUMBER_FORMAT_u:
-            *--end = digits[number % 10];
-            number /= 10;
-            break;
-
-         case PNG_NUMBER_FORMAT_02x:
-            /* This format expects at least two digits */
-            mincount = 2;
-            /* fall through */
-
-         case PNG_NUMBER_FORMAT_x:
-            *--end = digits[number & 0xf];
-            number >>= 4;
-            break;
-
-         default: /* an error */
-            number = 0;
-            break;
-      }
-
-      /* Keep track of the number of digits added */
-      ++count;
-
-      /* Float a fixed number here: */
-      if (format == PNG_NUMBER_FORMAT_fixed) if (count == 5) if (end > start)
-      {
-         /* End of the fraction, but maybe nothing was output?  In that case
-          * drop the decimal point.  If the number is a true zero handle that
-          * here.
-          */
-         if (output)
-            *--end = '.';
-         else if (number == 0) /* and !output */
-            *--end = '0';
-      }
-   }
-
-   return end;
-}
-#endif
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* This function is called whenever there is a non-fatal error.  This function
- * should not be changed.  If there is a need to handle warnings differently,
- * you should supply a replacement warning function and use
- * png_set_error_fn() to replace the warning function at run-time.
- */
-void PNGAPI
-png_warning(png_structp png_ptr, png_const_charp warning_message)
-{
-   int offset = 0;
-   if (png_ptr != NULL)
-   {
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (png_ptr->flags&
-       (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
-#endif
-      {
-         if (*warning_message == PNG_LITERAL_SHARP)
-         {
-            for (offset = 1; offset < 15; offset++)
-               if (warning_message[offset] == ' ')
-                  break;
-         }
-      }
-   }
-   if (png_ptr != NULL && png_ptr->warning_fn != NULL)
-      (*(png_ptr->warning_fn))(png_ptr, warning_message + offset);
-   else
-      png_default_warning(png_ptr, warning_message + offset);
-}
-
-/* These functions support 'formatted' warning messages with up to
- * PNG_WARNING_PARAMETER_COUNT parameters.  In the format string the parameter
- * is introduced by @<number>, where 'number' starts at 1.  This follows the
- * standard established by X/Open for internationalizable error messages.
- */
-void
-png_warning_parameter(png_warning_parameters p, int number,
-   png_const_charp string)
-{
-   if (number > 0 && number <= PNG_WARNING_PARAMETER_COUNT)
-      (void)png_safecat(p[number-1], (sizeof p[number-1]), 0, string);
-}
-
-void
-png_warning_parameter_unsigned(png_warning_parameters p, int number, int format,
-   png_alloc_size_t value)
-{
-   char buffer[PNG_NUMBER_BUFFER_SIZE];
-   png_warning_parameter(p, number, PNG_FORMAT_NUMBER(buffer, format, value));
-}
-
-void
-png_warning_parameter_signed(png_warning_parameters p, int number, int format,
-   png_int_32 value)
-{
-   png_alloc_size_t u;
-   png_charp str;
-   char buffer[PNG_NUMBER_BUFFER_SIZE];
-
-   /* Avoid overflow by doing the negate in a png_alloc_size_t: */
-   u = (png_alloc_size_t)value;
-   if (value < 0)
-      u = ~u + 1;
-
-   str = PNG_FORMAT_NUMBER(buffer, format, u);
-
-   if (value < 0 && str > buffer)
-      *--str = '-';
-
-   png_warning_parameter(p, number, str);
-}
-
-void
-png_formatted_warning(png_structp png_ptr, png_warning_parameters p,
-   png_const_charp message)
-{
-   /* The internal buffer is just 128 bytes - enough for all our messages,
-    * overflow doesn't happen because this code checks!
-    */
-   size_t i;
-   char msg[128];
-
-   for (i=0; i<(sizeof msg)-1 && *message != '\0'; ++i)
-   {
-      if (*message == '@')
-      {
-         int parameter = -1;
-         switch (*++message)
-         {
-            case '1':
-               parameter = 0;
-               break;
-
-            case '2':
-               parameter = 1;
-               break;
-
-            case '\0':
-               continue; /* To break out of the for loop above. */
-
-            default:
-               break;
-         }
-
-         if (parameter >= 0 && parameter < PNG_WARNING_PARAMETER_COUNT)
-         {
-            /* Append this parameter */
-            png_const_charp parm = p[parameter];
-            png_const_charp pend = p[parameter] + (sizeof p[parameter]);
-
-            /* No need to copy the trailing '\0' here, but there is no guarantee
-             * that parm[] has been initialized, so there is no guarantee of a
-             * trailing '\0':
-             */
-            for (; i<(sizeof msg)-1 && parm != '\0' && parm < pend; ++i)
-               msg[i] = *parm++;
-
-            ++message;
-            continue;
-         }
-
-         /* else not a parameter and there is a character after the @ sign; just
-          * copy that.
-          */
-      }
-
-      /* At this point *message can't be '\0', even in the bad parameter case
-       * above where there is a lone '@' at the end of the message string.
-       */
-      msg[i] = *message++;
-   }
-
-   /* i is always less than (sizeof msg), so: */
-   msg[i] = '\0';
-
-   /* And this is the formatted message: */
-   png_warning(png_ptr, msg);
-}
-#endif /* PNG_WARNINGS_SUPPORTED */
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-void PNGAPI
-png_benign_error(png_structp png_ptr, png_const_charp error_message)
-{
-  if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
-     png_warning(png_ptr, error_message);
-  else
-     png_error(png_ptr, error_message);
-}
-#endif
-
-/* These utilities are used internally to build an error message that relates
- * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
- * this is used to prefix the message.  The message is limited in length
- * to 63 bytes, the name characters are output as hex digits wrapped in []
- * if the character is invalid.
- */
-#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
-static PNG_CONST char png_digit[16] = {
-   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-   'A', 'B', 'C', 'D', 'E', 'F'
-};
-
-#define PNG_MAX_ERROR_TEXT 64
-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
-static void /* PRIVATE */
-png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
-    error_message)
-{
-   png_uint_32 chunk_name = png_ptr->chunk_name;
-   int iout = 0, ishift = 24;
-
-   while (ishift >= 0)
-   {
-      int c = (int)(chunk_name >> ishift) & 0xff;
-
-      ishift -= 8;
-      if (isnonalpha(c))
-      {
-         buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
-         buffer[iout++] = png_digit[(c & 0xf0) >> 4];
-         buffer[iout++] = png_digit[c & 0x0f];
-         buffer[iout++] = PNG_LITERAL_RIGHT_SQUARE_BRACKET;
-      }
-
-      else
-      {
-         buffer[iout++] = (char)c;
-      }
-   }
-
-   if (error_message == NULL)
-      buffer[iout] = '\0';
-
-   else
-   {
-      int iin = 0;
-
-      buffer[iout++] = ':';
-      buffer[iout++] = ' ';
-
-      while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
-         buffer[iout++] = error_message[iin++];
-
-      /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
-      buffer[iout] = '\0';
-   }
-}
-#endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */
-
-#if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
-PNG_FUNCTION(void,PNGAPI
-png_chunk_error,(png_structp png_ptr, png_const_charp error_message),
-   PNG_NORETURN)
-{
-   char msg[18+PNG_MAX_ERROR_TEXT];
-   if (png_ptr == NULL)
-      png_error(png_ptr, error_message);
-
-   else
-   {
-      png_format_buffer(png_ptr, msg, error_message);
-      png_error(png_ptr, msg);
-   }
-}
-#endif /* PNG_READ_SUPPORTED && PNG_ERROR_TEXT_SUPPORTED */
-
-#ifdef PNG_WARNINGS_SUPPORTED
-void PNGAPI
-png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
-{
-   char msg[18+PNG_MAX_ERROR_TEXT];
-   if (png_ptr == NULL)
-      png_warning(png_ptr, warning_message);
-
-   else
-   {
-      png_format_buffer(png_ptr, msg, warning_message);
-      png_warning(png_ptr, msg);
-   }
-}
-#endif /* PNG_WARNINGS_SUPPORTED */
-
-#ifdef PNG_READ_SUPPORTED
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-void PNGAPI
-png_chunk_benign_error(png_structp png_ptr, png_const_charp error_message)
-{
-   if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
-      png_chunk_warning(png_ptr, error_message);
-
-   else
-      png_chunk_error(png_ptr, error_message);
-}
-#endif
-#endif /* PNG_READ_SUPPORTED */
-
-#ifdef PNG_ERROR_TEXT_SUPPORTED
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_FUNCTION(void,
-png_fixed_error,(png_structp png_ptr, png_const_charp name),PNG_NORETURN)
-{
-#  define fixed_message "fixed point overflow in "
-#  define fixed_message_ln ((sizeof fixed_message)-1)
-   int  iin;
-   char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];
-   png_memcpy(msg, fixed_message, fixed_message_ln);
-   iin = 0;
-   if (name != NULL) while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
-   {
-      msg[fixed_message_ln + iin] = name[iin];
-      ++iin;
-   }
-   msg[fixed_message_ln + iin] = 0;
-   png_error(png_ptr, msg);
-}
-#endif
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* This API only exists if ANSI-C style error handling is used,
- * otherwise it is necessary for png_default_error to be overridden.
- */
-jmp_buf* PNGAPI
-png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,
-    size_t jmp_buf_size)
-{
-   if (png_ptr == NULL || jmp_buf_size != png_sizeof(jmp_buf))
-      return NULL;
-
-   png_ptr->longjmp_fn = longjmp_fn;
-   return &png_ptr->longjmp_buffer;
-}
-#endif
-
-/* This is the default error handling function.  Note that replacements for
- * this function MUST NOT RETURN, or the program will likely crash.  This
- * function is used by default, or if the program supplies NULL for the
- * error function pointer in png_set_error_fn().
- */
-static PNG_FUNCTION(void /* PRIVATE */,
-png_default_error,(png_structp png_ptr, png_const_charp error_message),
-   PNG_NORETURN)
-{
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   /* Check on NULL only added in 1.5.4 */
-   if (error_message != NULL && *error_message == PNG_LITERAL_SHARP)
-   {
-      /* Strip "#nnnn " from beginning of error message. */
-      int offset;
-      char error_number[16];
-      for (offset = 0; offset<15; offset++)
-      {
-         error_number[offset] = error_message[offset + 1];
-         if (error_message[offset] == ' ')
-            break;
-      }
-
-      if ((offset > 1) && (offset < 15))
-      {
-         error_number[offset - 1] = '\0';
-         fprintf(stderr, "libpng error no. %s: %s",
-             error_number, error_message + offset + 1);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-
-      else
-      {
-         fprintf(stderr, "libpng error: %s, offset=%d",
-             error_message, offset);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-   }
-   else
-#endif
-   {
-      fprintf(stderr, "libpng error: %s", error_message ? error_message :
-         "undefined");
-      fprintf(stderr, PNG_STRING_NEWLINE);
-   }
-#else
-   PNG_UNUSED(error_message) /* Make compiler happy */
-#endif
-   png_longjmp(png_ptr, 1);
-}
-
-PNG_FUNCTION(void,PNGAPI
-png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN)
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   if (png_ptr && png_ptr->longjmp_fn)
-   {
-#  ifdef USE_FAR_KEYWORD
-      {
-         jmp_buf tmp_jmpbuf;
-         png_memcpy(tmp_jmpbuf, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
-         png_ptr->longjmp_fn(tmp_jmpbuf, val);
-      }
-
-#  else
-   png_ptr->longjmp_fn(png_ptr->longjmp_buffer, val);
-#  endif
-   }
-#endif
-   /* Here if not setjmp support or if png_ptr is null. */
-   PNG_ABORT();
-}
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* This function is called when there is a warning, but the library thinks
- * it can continue anyway.  Replacement functions don't have to do anything
- * here if you don't want them to.  In the default configuration, png_ptr is
- * not used, but it is passed in case it may be useful.
- */
-static void /* PRIVATE */
-png_default_warning(png_structp png_ptr, png_const_charp warning_message)
-{
-#ifdef PNG_CONSOLE_IO_SUPPORTED
-#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
-   if (*warning_message == PNG_LITERAL_SHARP)
-   {
-      int offset;
-      char warning_number[16];
-      for (offset = 0; offset < 15; offset++)
-      {
-         warning_number[offset] = warning_message[offset + 1];
-         if (warning_message[offset] == ' ')
-            break;
-      }
-
-      if ((offset > 1) && (offset < 15))
-      {
-         warning_number[offset + 1] = '\0';
-         fprintf(stderr, "libpng warning no. %s: %s",
-             warning_number, warning_message + offset);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-
-      else
-      {
-         fprintf(stderr, "libpng warning: %s",
-             warning_message);
-         fprintf(stderr, PNG_STRING_NEWLINE);
-      }
-   }
-   else
-#  endif
-
-   {
-      fprintf(stderr, "libpng warning: %s", warning_message);
-      fprintf(stderr, PNG_STRING_NEWLINE);
-   }
-#else
-   PNG_UNUSED(warning_message) /* Make compiler happy */
-#endif
-   PNG_UNUSED(png_ptr) /* Make compiler happy */
-}
-#endif /* PNG_WARNINGS_SUPPORTED */
-
-/* This function is called when the application wants to use another method
- * of handling errors and warnings.  Note that the error function MUST NOT
- * return to the calling routine or serious problems will occur.  The return
- * method used in the default routine calls longjmp(png_ptr->longjmp_buffer, 1)
- */
-void PNGAPI
-png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warning_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->error_ptr = error_ptr;
-   png_ptr->error_fn = error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_ptr->warning_fn = warning_fn;
-#else
-   PNG_UNUSED(warning_fn)
-#endif
-}
-
-
-/* This function returns a pointer to the error_ptr associated with the user
- * functions.  The application should free any memory associated with this
- * pointer before png_write_destroy and png_read_destroy are called.
- */
-png_voidp PNGAPI
-png_get_error_ptr(png_const_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return NULL;
-
-   return ((png_voidp)png_ptr->error_ptr);
-}
-
-
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-void PNGAPI
-png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
-{
-   if (png_ptr != NULL)
-   {
-      png_ptr->flags &=
-         ((~(PNG_FLAG_STRIP_ERROR_NUMBERS |
-         PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
-   }
-}
-#endif
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngerror.c - stub functions for i/o and memory allocation
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all error handling.  Users who
+ * need special error handling are expected to write replacement functions
+ * and use png_set_error_fn() to use those functions.  See the instructions
+ * at each function.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+static void /* PRIVATE */
+png_default_error PNGARG((png_structp png_ptr,
+  png_const_charp error_message));
+static void /* PRIVATE */
+png_default_warning PNGARG((png_structp png_ptr,
+  png_const_charp warning_message));
+
+/* This function is called whenever there is a fatal error.  This function
+ * should not be changed.  If there is a need to handle errors differently,
+ * you should supply a replacement error function and use png_set_error_fn()
+ * to replace the error function at run-time.
+ */
+void PNGAPI
+png_error(png_structp png_ptr, png_const_charp error_message)
+{
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   char msg[16];
+   if (png_ptr->flags&(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+   {
+     if (*error_message == '#')
+     {
+         int offset;
+         for (offset=1; offset<15; offset++)
+            if (*(error_message+offset) == ' ')
+                break;
+         if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+         {
+            int i;
+            for (i=0; i<offset-1; i++)
+               msg[i]=error_message[i+1];
+            msg[i]='\0';
+            error_message=msg;
+         }
+         else
+            error_message+=offset;
+     }
+     else
+     {
+         if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+         {
+            msg[0]='0';        
+            msg[1]='\0';
+            error_message=msg;
+         }
+     }
+   }
+#endif
+   if (png_ptr != NULL && png_ptr->error_fn != NULL)
+      (*(png_ptr->error_fn))(png_ptr, error_message);
+
+   /* If the custom handler doesn't exist, or if it returns,
+      use the default handler, which will not return. */
+   png_default_error(png_ptr, error_message);
+}
+
+/* This function is called whenever there is a non-fatal error.  This function
+ * should not be changed.  If there is a need to handle warnings differently,
+ * you should supply a replacement warning function and use
+ * png_set_error_fn() to replace the warning function at run-time.
+ */
+void PNGAPI
+png_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+   int offset = 0;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (png_ptr->flags&(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+#endif
+   {
+     if (*warning_message == '#')
+     {
+         for (offset=1; offset<15; offset++)
+            if (*(warning_message+offset) == ' ')
+                break;
+     }
+   }
+   if (png_ptr != NULL && png_ptr->warning_fn != NULL)
+      (*(png_ptr->warning_fn))(png_ptr, warning_message+offset);
+   else
+      png_default_warning(png_ptr, warning_message+offset);
+}
+
+/* These utilities are used internally to build an error message that relates
+ * to the current chunk.  The chunk name comes from png_ptr->chunk_name,
+ * this is used to prefix the message.  The message is limited in length
+ * to 63 bytes, the name characters are output as hex digits wrapped in []
+ * if the character is invalid.
+ */
+#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+static PNG_CONST char png_digit[16] = {
+   '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+   'A', 'B', 'C', 'D', 'E', 'F'
+};
+
+static void /* PRIVATE */
+png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp
+   error_message)
+{
+   int iout = 0, iin = 0;
+
+   while (iin < 4)
+   {
+      int c = png_ptr->chunk_name[iin++]; 
+      if (isnonalpha(c))
+      {
+         buffer[iout++] = '[';
+         buffer[iout++] = png_digit[(c & 0xf0) >> 4];
+         buffer[iout++] = png_digit[c & 0x0f];
+         buffer[iout++] = ']';
+      }
+      else
+      {
+         buffer[iout++] = (png_byte)c;
+      }
+   }
+
+   if (error_message == NULL)
+      buffer[iout] = 0;
+   else
+   {
+      buffer[iout++] = ':';
+      buffer[iout++] = ' ';
+      png_strncpy(buffer+iout, error_message, 63);
+      buffer[iout+63] = 0;
+   }
+}
+
+void PNGAPI
+png_chunk_error(png_structp png_ptr, png_const_charp error_message)
+{
+   char msg[18+64];
+   png_format_buffer(png_ptr, msg, error_message);
+   png_error(png_ptr, msg);
+}
+
+void PNGAPI
+png_chunk_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+   char msg[18+64];
+   png_format_buffer(png_ptr, msg, warning_message);
+   png_warning(png_ptr, msg);
+}
+
+/* This is the default error handling function.  Note that replacements for
+ * this function MUST NOT RETURN, or the program will likely crash.  This
+ * function is used by default, or if the program supplies NULL for the
+ * error function pointer in png_set_error_fn().
+ */
+static void /* PRIVATE */
+png_default_error(png_structp png_ptr, png_const_charp error_message)
+{
+#ifndef PNG_NO_CONSOLE_IO
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (*error_message == '#')
+   {
+     int offset;
+     char error_number[16];
+     for (offset=0; offset<15; offset++)
+     {
+         error_number[offset] = *(error_message+offset+1);
+         if (*(error_message+offset) == ' ')
+             break;
+     }
+     if((offset > 1) && (offset < 15))
+     {
+       error_number[offset-1]='\0';
+       fprintf(stderr, "libpng error no. %s: %s\n", error_number,
+          error_message+offset);
+     }
+     else
+       fprintf(stderr, "libpng error: %s, offset=%d\n", error_message,offset);
+   }
+   else
+#endif
+   fprintf(stderr, "libpng error: %s\n", error_message);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#  ifdef USE_FAR_KEYWORD
+   {
+      jmp_buf jmpbuf;
+      png_memcpy(jmpbuf,png_ptr->jmpbuf,png_sizeof(jmp_buf));
+      longjmp(jmpbuf, 1);
+   }
+#  else
+   longjmp(png_ptr->jmpbuf, 1);
+# endif
+#else
+   /* make compiler happy */ ;
+   if (png_ptr)
+   PNG_ABORT();
+#endif
+#ifdef PNG_NO_CONSOLE_IO
+   /* make compiler happy */ ;
+   if (&error_message != NULL)
+      return;
+#endif
+}
+
+/* This function is called when there is a warning, but the library thinks
+ * it can continue anyway.  Replacement functions don't have to do anything
+ * here if you don't want them to.  In the default configuration, png_ptr is
+ * not used, but it is passed in case it may be useful.
+ */
+static void /* PRIVATE */
+png_default_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+#ifndef PNG_NO_CONSOLE_IO
+#  ifdef PNG_ERROR_NUMBERS_SUPPORTED
+   if (*warning_message == '#')
+   {
+     int offset;
+     char warning_number[16];
+     for (offset=0; offset<15; offset++)
+     {
+        warning_number[offset]=*(warning_message+offset+1);
+        if (*(warning_message+offset) == ' ')
+            break;
+     }
+     if((offset > 1) && (offset < 15))
+     {
+       warning_number[offset-1]='\0';
+       fprintf(stderr, "libpng warning no. %s: %s\n", warning_number,
+          warning_message+offset);
+     }
+     else
+       fprintf(stderr, "libpng warning: %s\n", warning_message);
+   }
+   else
+#  endif
+     fprintf(stderr, "libpng warning: %s\n", warning_message);
+#else
+   /* make compiler happy */ ;
+   if (warning_message)
+     return;
+#endif
+   /* make compiler happy */ ;
+   if (png_ptr)
+      return;
+}
+
+/* This function is called when the application wants to use another method
+ * of handling errors and warnings.  Note that the error function MUST NOT
+ * return to the calling routine or serious problems will occur.  The return
+ * method used in the default routine calls longjmp(png_ptr->jmpbuf, 1)
+ */
+void PNGAPI
+png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warning_fn)
+{
+   png_ptr->error_ptr = error_ptr;
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+}
+
+
+/* This function returns a pointer to the error_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp PNGAPI
+png_get_error_ptr(png_structp png_ptr)
+{
+   return ((png_voidp)png_ptr->error_ptr);
+}
+
+
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+void PNGAPI
+png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode)
+{
+   if(png_ptr != NULL)
+   {
+     png_ptr->flags &=
+       ((~(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))&strip_mode);
+   }
+}
+#endif
diff --git a/Source/3rd Party/wx/src/png/pnggccrd.c b/Source/3rd Party/wx/src/png/pnggccrd.c
new file mode 100644
index 000000000..27c716a2c
--- /dev/null
+++ b/Source/3rd Party/wx/src/png/pnggccrd.c	
@@ -0,0 +1,5408 @@
+/* pnggccrd.c - mixed C/assembler version of utilities to read a PNG file
+ *
+ * For Intel x86 CPU (Pentium-MMX or later) and GNU C compiler.
+ *
+ *     See http://www.intel.com/drg/pentiumII/appnotes/916/916.htm
+ *     and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm
+ *     for Intel's performance analysis of the MMX vs. non-MMX code.
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * Copyright (c) 1998, Intel Corporation
+ *
+ * Based on MSVC code contributed by Nirav Chhatrapati, Intel Corp., 1998.
+ * Interface to libpng contributed by Gilles Vollant, 1999.
+ * GNU C port by Greg Roelofs, 1999-2001.
+ *
+ * Lines 2350-4300 converted in place with intel2gas 1.3.1:
+ *
+ *   intel2gas -mdI pnggccrd.c.partially-msvc -o pnggccrd.c
+ *
+ * and then cleaned up by hand.  See http://hermes.terminal.at/intel2gas/ .
+ *
+ * NOTE:  A sufficiently recent version of GNU as (or as.exe under DOS/Windows)
+ *        is required to assemble the newer MMX instructions such as movq.
+ *        For djgpp, see
+ *
+ *           ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/bnu281b.zip
+ *
+ *        (or a later version in the same directory).  For Linux, check your
+ *        distribution's web site(s) or try these links:
+ *
+ *           http://rufus.w3.org/linux/RPM/binutils.html
+ *           http://www.debian.org/Packages/stable/devel/binutils.html
+ *           ftp://ftp.slackware.com/pub/linux/slackware/slackware/slakware/d1/
+ *             binutils.tgz
+ *
+ *        For other platforms, see the main GNU site:
+ *
+ *           ftp://ftp.gnu.org/pub/gnu/binutils/
+ *
+ *        Version 2.5.2l.15 is definitely too old...
+ */
+
+/*
+ * TEMPORARY PORTING NOTES AND CHANGELOG (mostly by Greg Roelofs)
+ * =====================================
+ *
+ * 19991006:
+ *  - fixed sign error in post-MMX cleanup code (16- & 32-bit cases)
+ *
+ * 19991007:
+ *  - additional optimizations (possible or definite):
+ *     x [DONE] write MMX code for 64-bit case (pixel_bytes == 8) [not tested]
+ *     - write MMX code for 48-bit case (pixel_bytes == 6)
+ *     - figure out what's up with 24-bit case (pixel_bytes == 3):
+ *        why subtract 8 from width_mmx in the pass 4/5 case?
+ *        (only width_mmx case) (near line 1606)
+ *     x [DONE] replace pixel_bytes within each block with the true
+ *        constant value (or are compilers smart enough to do that?)
+ *     - rewrite all MMX interlacing code so it's aligned with
+ *        the *beginning* of the row buffer, not the end.  This
+ *        would not only allow one to eliminate half of the memory
+ *        writes for odd passes (that is, pass == odd), it may also
+ *        eliminate some unaligned-data-access exceptions (assuming
+ *        there's a penalty for not aligning 64-bit accesses on
+ *        64-bit boundaries).  The only catch is that the "leftover"
+ *        pixel(s) at the end of the row would have to be saved,
+ *        but there are enough unused MMX registers in every case,
+ *        so this is not a problem.  A further benefit is that the
+ *        post-MMX cleanup code (C code) in at least some of the
+ *        cases could be done within the assembler block.
+ *  x [DONE] the "v3 v2 v1 v0 v7 v6 v5 v4" comments are confusing,
+ *     inconsistent, and don't match the MMX Programmer's Reference
+ *     Manual conventions anyway.  They should be changed to
+ *     "b7 b6 b5 b4 b3 b2 b1 b0," where b0 indicates the byte that
+ *     was lowest in memory (e.g., corresponding to a left pixel)
+ *     and b7 is the byte that was highest (e.g., a right pixel).
+ *
+ * 19991016:
+ *  - Brennan's Guide notwithstanding, gcc under Linux does *not*
+ *     want globals prefixed by underscores when referencing them--
+ *     i.e., if the variable is const4, then refer to it as const4,
+ *     not _const4.  This seems to be a djgpp-specific requirement.
+ *     Also, such variables apparently *must* be declared outside
+ *     of functions; neither static nor automatic variables work if
+ *     defined within the scope of a single function, but both
+ *     static and truly global (multi-module) variables work fine.
+ *
+ * 19991023:
+ *  - fixed png_combine_row() non-MMX replication bug (odd passes only?)
+ *  - switched from string-concatenation-with-macros to cleaner method of
+ *     renaming global variables for djgpp--i.e., always use prefixes in
+ *     inlined assembler code (== strings) and conditionally rename the
+ *     variables, not the other way around.  Hence _const4, _mask8_0, etc.
+ *
+ * 19991024:
+ *  - fixed mmxsupport()/png_do_read_interlace() first-row bug
+ *     This one was severely weird:  even though mmxsupport() doesn't touch
+ *     ebx (where "row" pointer was stored), it nevertheless managed to zero
+ *     the register (even in static/non-fPIC code--see below), which in turn
+ *     caused png_do_read_interlace() to return prematurely on the first row of
+ *     interlaced images (i.e., without expanding the interlaced pixels).
+ *     Inspection of the generated assembly code didn't turn up any clues,
+ *     although it did point at a minor optimization (i.e., get rid of
+ *     mmx_supported_local variable and just use eax).  Possibly the CPUID
+ *     instruction is more destructive than it looks?  (Not yet checked.)
+ *  - "info gcc" was next to useless, so compared fPIC and non-fPIC assembly
+ *     listings...  Apparently register spillage has to do with ebx, since
+ *     it's used to index the global offset table.  Commenting it out of the
+ *     input-reg lists in png_combine_row() eliminated compiler barfage, so
+ *     ifdef'd with __PIC__ macro:  if defined, use a global for unmask
+ *
+ * 19991107:
+ *  - verified CPUID clobberage:  12-char string constant ("GenuineIntel",
+ *     "AuthenticAMD", etc.) placed in ebx:ecx:edx.  Still need to polish.
+ *
+ * 19991120:
+ *  - made "diff" variable (now "_dif") global to simplify conversion of
+ *     filtering routines (running out of regs, sigh).  "diff" is still used
+ *     in interlacing routines, however.
+ *  - fixed up both versions of mmxsupport() (ORIG_THAT_USED_TO_CLOBBER_EBX
+ *     macro determines which is used); original not yet tested.
+ *
+ * 20000213:
+ *  - when compiling with gcc, be sure to use  -fomit-frame-pointer
+ *
+ * 20000319:
+ *  - fixed a register-name typo in png_do_read_interlace(), default (MMX) case,
+ *     pass == 4 or 5, that caused visible corruption of interlaced images
+ *
+ * 20000623:
+ *  - Various problems were reported with gcc 2.95.2 in the Cygwin environment,
+ *     many of the form "forbidden register 0 (ax) was spilled for class AREG."
+ *     This is explained at http://gcc.gnu.org/fom_serv/cache/23.html, and
+ *     Chuck Wilson supplied a patch involving dummy output registers.  See
+ *     http://sourceforge.net/bugs/?func=detailbug&bug_id=108741&group_id=5624
+ *     for the original (anonymous) SourceForge bug report.
+ *
+ * 20000706:
+ *  - Chuck Wilson passed along these remaining gcc 2.95.2 errors:
+ *       pnggccrd.c: In function `png_combine_row':
+ *       pnggccrd.c:525: more than 10 operands in `asm'
+ *       pnggccrd.c:669: more than 10 operands in `asm'
+ *       pnggccrd.c:828: more than 10 operands in `asm'
+ *       pnggccrd.c:994: more than 10 operands in `asm'
+ *       pnggccrd.c:1177: more than 10 operands in `asm'
+ *     They are all the same problem and can be worked around by using the
+ *     global _unmask variable unconditionally, not just in the -fPIC case.
+ *     Reportedly earlier versions of gcc also have the problem with more than
+ *     10 operands; they just don't report it.  Much strangeness ensues, etc.
+ *
+ * 20000729:
+ *  - enabled png_read_filter_row_mmx_up() (shortest remaining unconverted
+ *     MMX routine); began converting png_read_filter_row_mmx_sub()
+ *  - to finish remaining sections:
+ *     - clean up indentation and comments
+ *     - preload local variables
+ *     - add output and input regs (order of former determines numerical
+ *        mapping of latter)
+ *     - avoid all usage of ebx (including bx, bh, bl) register [20000823]
+ *     - remove "$" from addressing of Shift and Mask variables [20000823]
+ *
+ * 20000731:
+ *  - global union vars causing segfaults in png_read_filter_row_mmx_sub()?
+ *
+ * 20000822:
+ *  - ARGH, stupid png_read_filter_row_mmx_sub() segfault only happens with
+ *     shared-library (-fPIC) version!  Code works just fine as part of static
+ *     library.  Damn damn damn damn damn, should have tested that sooner.
+ *     ebx is getting clobbered again (explicitly this time); need to save it
+ *     on stack or rewrite asm code to avoid using it altogether.  Blargh!
+ *
+ * 20000823:
+ *  - first section was trickiest; all remaining sections have ebx -> edx now.
+ *     (-fPIC works again.)  Also added missing underscores to various Shift*
+ *     and *Mask* globals and got rid of leading "$" signs.
+ *
+ * 20000826:
+ *  - added visual separators to help navigate microscopic printed copies
+ *     (http://pobox.com/~newt/code/gpr-latest.zip, mode 10); started working
+ *     on png_read_filter_row_mmx_avg()
+ *
+ * 20000828:
+ *  - finished png_read_filter_row_mmx_avg():  only Paeth left! (930 lines...)
+ *     What the hell, did png_read_filter_row_mmx_paeth(), too.  Comments not
+ *     cleaned up/shortened in either routine, but functionality is complete
+ *     and seems to be working fine.
+ *
+ * 20000829:
+ *  - ahhh, figured out last(?) bit of gcc/gas asm-fu:  if register is listed
+ *     as an input reg (with dummy output variables, etc.), then it *cannot*
+ *     also appear in the clobber list or gcc 2.95.2 will barf.  The solution
+ *     is simple enough...
+ *
+ * 20000914:
+ *  - bug in png_read_filter_row_mmx_avg():  16-bit grayscale not handled
+ *     correctly (but 48-bit RGB just fine)
+ *
+ * 20000916:
+ *  - fixed bug in png_read_filter_row_mmx_avg(), bpp == 2 case; three errors:
+ *     - "_ShiftBpp.use = 24;"      should have been   "_ShiftBpp.use = 16;"
+ *     - "_ShiftRem.use = 40;"      should have been   "_ShiftRem.use = 48;"
+ *     - "psllq _ShiftRem, %%mm2"   should have been   "psrlq _ShiftRem, %%mm2"
+ *
+ * 20010101:
+ *  - added new png_init_mmx_flags() function (here only because it needs to
+ *     call mmxsupport(), which should probably become global png_mmxsupport());
+ *     modified other MMX routines to run conditionally (png_ptr->asm_flags)
+ *
+ * 20010103:
+ *  - renamed mmxsupport() to png_mmx_support(), with auto-set of mmx_supported,
+ *     and made it public; moved png_init_mmx_flags() to png.c as internal func
+ *
+ * 20010104:
+ *  - removed dependency on png_read_filter_row_c() (C code already duplicated
+ *     within MMX version of png_read_filter_row()) so no longer necessary to
+ *     compile it into pngrutil.o
+ *
+ * 20010310:
+ *  - fixed buffer-overrun bug in png_combine_row() C code (non-MMX)
+ *
+ * 20020304:
+ *  - eliminated incorrect use of width_mmx in pixel_bytes == 8 case
+ *
+ * 20040724:
+ *   - more tinkering with clobber list at lines 4529 and 5033, to get
+ *     it to compile on gcc-3.4.
+ *
+ * STILL TO DO:
+ *     - test png_do_read_interlace() 64-bit case (pixel_bytes == 8)
+ *     - write MMX code for 48-bit case (pixel_bytes == 6)
+ *     - figure out what's up with 24-bit case (pixel_bytes == 3):
+ *        why subtract 8 from width_mmx in the pass 4/5 case?
+ *        (only width_mmx case) (near line 1606)
+ *     - rewrite all MMX interlacing code so it's aligned with beginning
+ *        of the row buffer, not the end (see 19991007 for details)
+ *     x pick one version of mmxsupport() and get rid of the other
+ *     - add error messages to any remaining bogus default cases
+ *     - enable pixel_depth == 8 cases in png_read_filter_row()? (test speed)
+ *     x add support for runtime enable/disable/query of various MMX routines
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_USE_PNGGCCRD)
+
+int PNGAPI png_mmx_support(void);
+
+#ifdef PNG_USE_LOCAL_ARRAYS
+static const int FARDATA png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+static const int FARDATA png_pass_inc[7]   = {8, 8, 4, 4, 2, 2, 1};
+static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1};
+#endif
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+/* djgpp, Win32, and Cygwin add their own underscores to global variables,
+ * so define them without: */
+#if defined(__DJGPP__) || defined(WIN32) || defined(__CYGWIN__)
+#  define _mmx_supported  mmx_supported
+#  define _const4         const4
+#  define _const6         const6
+#  define _mask8_0        mask8_0
+#  define _mask16_1       mask16_1
+#  define _mask16_0       mask16_0
+#  define _mask24_2       mask24_2
+#  define _mask24_1       mask24_1
+#  define _mask24_0       mask24_0
+#  define _mask32_3       mask32_3
+#  define _mask32_2       mask32_2
+#  define _mask32_1       mask32_1
+#  define _mask32_0       mask32_0
+#  define _mask48_5       mask48_5
+#  define _mask48_4       mask48_4
+#  define _mask48_3       mask48_3
+#  define _mask48_2       mask48_2
+#  define _mask48_1       mask48_1
+#  define _mask48_0       mask48_0
+#  define _LBCarryMask    LBCarryMask
+#  define _HBClearMask    HBClearMask
+#  define _ActiveMask     ActiveMask
+#  define _ActiveMask2    ActiveMask2
+#  define _ActiveMaskEnd  ActiveMaskEnd
+#  define _ShiftBpp       ShiftBpp
+#  define _ShiftRem       ShiftRem
+#ifdef PNG_THREAD_UNSAFE_OK
+#  define _unmask         unmask
+#  define _FullLength     FullLength
+#  define _MMXLength      MMXLength
+#  define _dif            dif
+#  define _patemp         patemp
+#  define _pbtemp         pbtemp
+#  define _pctemp         pctemp
+#endif
+#endif
+
+
+/* These constants are used in the inlined MMX assembly code.
+   Ignore gcc's "At top level: defined but not used" warnings. */
+
+/* GRR 20000706:  originally _unmask was needed only when compiling with -fPIC,
+ *  since that case uses the %ebx register for indexing the Global Offset Table
+ *  and there were no other registers available.  But gcc 2.95 and later emit
+ *  "more than 10 operands in `asm'" errors when %ebx is used to preload unmask
+ *  in the non-PIC case, so we'll just use the global unconditionally now.
+ */
+#ifdef PNG_THREAD_UNSAFE_OK
+static int _unmask;
+#endif
+
+static unsigned long long _mask8_0  = 0x0102040810204080LL;
+
+static unsigned long long _mask16_1 = 0x0101020204040808LL;
+static unsigned long long _mask16_0 = 0x1010202040408080LL;
+
+static unsigned long long _mask24_2 = 0x0101010202020404LL;
+static unsigned long long _mask24_1 = 0x0408080810101020LL;
+static unsigned long long _mask24_0 = 0x2020404040808080LL;
+
+static unsigned long long _mask32_3 = 0x0101010102020202LL;
+static unsigned long long _mask32_2 = 0x0404040408080808LL;
+static unsigned long long _mask32_1 = 0x1010101020202020LL;
+static unsigned long long _mask32_0 = 0x4040404080808080LL;
+
+static unsigned long long _mask48_5 = 0x0101010101010202LL;
+static unsigned long long _mask48_4 = 0x0202020204040404LL;
+static unsigned long long _mask48_3 = 0x0404080808080808LL;
+static unsigned long long _mask48_2 = 0x1010101010102020LL;
+static unsigned long long _mask48_1 = 0x2020202040404040LL;
+static unsigned long long _mask48_0 = 0x4040808080808080LL;
+
+static unsigned long long _const4   = 0x0000000000FFFFFFLL;
+/* static unsigned long long _const5 = 0x000000FFFFFF0000LL; */  /* NOT USED */
+static unsigned long long _const6   = 0x00000000000000FFLL;
+
+/* These are used in the row-filter routines and should/would be local */
+/*  variables if not for gcc addressing limitations. */
+/* WARNING: Their presence probably defeats the thread safety of libpng. */
+
+#ifdef PNG_THREAD_UNSAFE_OK
+static png_uint_32  _FullLength;
+static png_uint_32  _MMXLength;
+static int          _dif;
+static int          _patemp; /* temp variables for Paeth routine */
+static int          _pbtemp;
+static int          _pctemp;
+#endif
+
+void /* PRIVATE */
+png_squelch_warnings(void)
+{
+#ifdef PNG_THREAD_UNSAFE_OK
+   _dif = _dif;
+   _patemp = _patemp;
+   _pbtemp = _pbtemp;
+   _pctemp = _pctemp;
+   _MMXLength = _MMXLength;
+#endif
+   _const4  = _const4;
+   _const6  = _const6;
+   _mask8_0  = _mask8_0;
+   _mask16_1 = _mask16_1;
+   _mask16_0 = _mask16_0;
+   _mask24_2 = _mask24_2;
+   _mask24_1 = _mask24_1;
+   _mask24_0 = _mask24_0;
+   _mask32_3 = _mask32_3;
+   _mask32_2 = _mask32_2;
+   _mask32_1 = _mask32_1;
+   _mask32_0 = _mask32_0;
+   _mask48_5 = _mask48_5;
+   _mask48_4 = _mask48_4;
+   _mask48_3 = _mask48_3;
+   _mask48_2 = _mask48_2;
+   _mask48_1 = _mask48_1;
+   _mask48_0 = _mask48_0;
+}
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+
+
+static int _mmx_supported = 2;
+
+/*===========================================================================*/
+/*                                                                           */
+/*                       P N G _ C O M B I N E _ R O W                       */
+/*                                                                           */
+/*===========================================================================*/
+
+#if defined(PNG_HAVE_ASSEMBLER_COMBINE_ROW)
+
+#define BPP2  2
+#define BPP3  3 /* bytes per pixel (a.k.a. pixel_bytes) */
+#define BPP4  4
+#define BPP6  6 /* (defined only to help avoid cut-and-paste errors) */
+#define BPP8  8
+
+/* Combines the row recently read in with the previous row.
+   This routine takes care of alpha and transparency if requested.
+   This routine also handles the two methods of progressive display
+   of interlaced images, depending on the mask value.
+   The mask value describes which pixels are to be combined with
+   the row.  The pattern always repeats every 8 pixels, so just 8
+   bits are needed.  A one indicates the pixel is to be combined; a
+   zero indicates the pixel is to be skipped.  This is in addition
+   to any alpha or transparency value associated with the pixel.
+   If you want all pixels to be combined, pass 0xff (255) in mask. */
+
+/* Use this routine for the x86 platform - it uses a faster MMX routine
+   if the machine supports MMX. */
+
+void /* PRIVATE */
+png_combine_row(png_structp png_ptr, png_bytep row, int mask)
+{
+   png_debug(1, "in png_combine_row (pnggccrd.c)\n");
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+   if (_mmx_supported == 2) {
+#if !defined(PNG_1_0_X)
+       /* this should have happened in png_init_mmx_flags() already */
+       png_warning(png_ptr, "asm_flags may not have been initialized");
+#endif
+       png_mmx_support();
+   }
+#endif
+
+   if (mask == 0xff)
+   {
+      png_debug(2,"mask == 0xff:  doing single png_memcpy()\n");
+      png_memcpy(row, png_ptr->row_buf + 1,
+       (png_size_t)PNG_ROWBYTES(png_ptr->row_info.pixel_depth,png_ptr->width));
+   }
+   else   /* (png_combine_row() is never called with mask == 0) */
+   {
+      switch (png_ptr->row_info.pixel_depth)
+      {
+         case 1:        /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int s_inc, s_start, s_end;
+            int m;
+            int shift;
+            png_uint_32 i;
+
+            sp = png_ptr->row_buf + 1;
+            dp = row;
+            m = 0x80;
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+            else
+#endif
+            {
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < png_ptr->width; i++)
+            {
+               if (m & mask)
+               {
+                  int value;
+
+                  value = (*sp >> shift) & 0x1;
+                  *dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+
+         case 2:        /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int s_start, s_end, s_inc;
+            int m;
+            int shift;
+            png_uint_32 i;
+            int value;
+
+            sp = png_ptr->row_buf + 1;
+            dp = row;
+            m = 0x80;
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+            else
+#endif
+            {
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < png_ptr->width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0x3;
+                  *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+
+         case 4:        /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int s_start, s_end, s_inc;
+            int m;
+            int shift;
+            png_uint_32 i;
+            int value;
+
+            sp = png_ptr->row_buf + 1;
+            dp = row;
+            m = 0x80;
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+            else
+#endif
+            {
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            shift = s_start;
+
+            for (i = 0; i < png_ptr->width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0xf;
+                  *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+
+         case 8:        /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && _mmx_supported */ )
+#else
+            if (_mmx_supported)
+#endif
+            {
+               png_uint_32 len;
+               int diff;
+               int dummy_value_a;   /* fix 'forbidden register spilled' error */
+               int dummy_value_d;
+               int dummy_value_c;
+               int dummy_value_S;
+               int dummy_value_D;
+               _unmask = ~mask;            /* global variable for -fPIC version */
+               srcptr = png_ptr->row_buf + 1;
+               dstptr = row;
+               len  = png_ptr->width &~7;  /* reduce to multiple of 8 */
+               diff = (int) (png_ptr->width & 7);  /* amount lost */
+
+               __asm__ __volatile__ (
+                  "movd      _unmask, %%mm7  \n\t" /* load bit pattern */
+                  "psubb     %%mm6, %%mm6    \n\t" /* zero mm6 */
+                  "punpcklbw %%mm7, %%mm7    \n\t"
+                  "punpcklwd %%mm7, %%mm7    \n\t"
+                  "punpckldq %%mm7, %%mm7    \n\t" /* fill reg with 8 masks */
+
+                  "movq      _mask8_0, %%mm0 \n\t"
+                  "pand      %%mm7, %%mm0    \n\t" /* nonzero if keep byte */
+                  "pcmpeqb   %%mm6, %%mm0    \n\t" /* zeros->1s, v versa */
+
+/* preload        "movl      len, %%ecx      \n\t" // load length of line */
+/* preload        "movl      srcptr, %%esi   \n\t" // load source */
+/* preload        "movl      dstptr, %%edi   \n\t" // load dest */
+
+                  "cmpl      $0, %%ecx       \n\t" /* len == 0 ? */
+                  "je        mainloop8end    \n\t"
+
+                "mainloop8:                  \n\t"
+                  "movq      (%%esi), %%mm4  \n\t" /* *srcptr */
+                  "pand      %%mm0, %%mm4    \n\t"
+                  "movq      %%mm0, %%mm6    \n\t"
+                  "pandn     (%%edi), %%mm6  \n\t" /* *dstptr */
+                  "por       %%mm6, %%mm4    \n\t"
+                  "movq      %%mm4, (%%edi)  \n\t"
+                  "addl      $8, %%esi       \n\t" /* inc by 8 bytes processed */
+                  "addl      $8, %%edi       \n\t"
+                  "subl      $8, %%ecx       \n\t" /* dec by 8 pixels processed */
+                  "ja        mainloop8       \n\t"
+
+                "mainloop8end:               \n\t"
+/* preload        "movl      diff, %%ecx     \n\t" // (diff is in eax) */
+                  "movl      %%eax, %%ecx    \n\t"
+                  "cmpl      $0, %%ecx       \n\t"
+                  "jz        end8            \n\t"
+/* preload        "movl      mask, %%edx     \n\t" */
+                  "sall      $24, %%edx      \n\t" /* make low byte, high byte */
+
+                "secondloop8:                \n\t"
+                  "sall      %%edx           \n\t" /* move high bit to CF */
+                  "jnc       skip8           \n\t" /* if CF = 0 */
+                  "movb      (%%esi), %%al   \n\t"
+                  "movb      %%al, (%%edi)   \n\t"
+
+                "skip8:                      \n\t"
+                  "incl      %%esi           \n\t"
+                  "incl      %%edi           \n\t"
+                  "decl      %%ecx           \n\t"
+                  "jnz       secondloop8     \n\t"
+
+                "end8:                       \n\t"
+                  "EMMS                      \n\t"  /* DONE */
+
+                  : "=a" (dummy_value_a),           /* output regs (dummy) */
+                    "=d" (dummy_value_d),
+                    "=c" (dummy_value_c),
+                    "=S" (dummy_value_S),
+                    "=D" (dummy_value_D)
+
+                  : "3" (srcptr),      /* esi       // input regs */
+                    "4" (dstptr),      /* edi */
+                    "0" (diff),        /* eax */
+/* was (unmask)     "b"    RESERVED    // ebx       // Global Offset Table idx */
+                    "2" (len),         /* ecx */
+                    "1" (mask)         /* edx */
+
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+                  : "%mm0", "%mm4", "%mm6", "%mm7"  /* clobber list */
+#endif
+               );
+            }
+            else /* mmx _not supported - Use modified C routine */
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+            {
+               register png_uint_32 i;
+               png_uint_32 initial_val = png_pass_start[png_ptr->pass];
+                 /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
+               register int stride = png_pass_inc[png_ptr->pass];
+                 /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
+               register int rep_bytes = png_pass_width[png_ptr->pass];
+                 /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
+               png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
+               int diff = (int) (png_ptr->width & 7); /* amount lost */
+               register png_uint_32 final_val = len;  /* GRR bugfix */
+
+               srcptr = png_ptr->row_buf + 1 + initial_val;
+               dstptr = row + initial_val;
+
+               for (i = initial_val; i < final_val; i += stride)
+               {
+                  png_memcpy(dstptr, srcptr, rep_bytes);
+                  srcptr += stride;
+                  dstptr += stride;
+               }
+               if (diff)  /* number of leftover pixels:  3 for pngtest */
+               {
+                  final_val+=diff /* *BPP1 */ ;
+                  for (; i < final_val; i += stride)
+                  {
+                     if (rep_bytes > (int)(final_val-i))
+                        rep_bytes = (int)(final_val-i);
+                     png_memcpy(dstptr, srcptr, rep_bytes);
+                     srcptr += stride;
+                     dstptr += stride;
+                  }
+               }
+
+            } /* end of else (_mmx_supported) */
+
+            break;
+         }       /* end 8 bpp */
+
+         case 16:       /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && _mmx_supported */ )
+#else
+            if (_mmx_supported)
+#endif
+            {
+               png_uint_32 len;
+               int diff;
+               int dummy_value_a;   /* fix 'forbidden register spilled' error */
+               int dummy_value_d;
+               int dummy_value_c;
+               int dummy_value_S;
+               int dummy_value_D;
+               _unmask = ~mask;            /* global variable for -fPIC version */
+               srcptr = png_ptr->row_buf + 1;
+               dstptr = row;
+               len  = png_ptr->width &~7;  /* reduce to multiple of 8 */
+               diff = (int) (png_ptr->width & 7); /* amount lost // */
+
+               __asm__ __volatile__ (
+                  "movd      _unmask, %%mm7   \n\t" /* load bit pattern */
+                  "psubb     %%mm6, %%mm6     \n\t" /* zero mm6 */
+                  "punpcklbw %%mm7, %%mm7     \n\t"
+                  "punpcklwd %%mm7, %%mm7     \n\t"
+                  "punpckldq %%mm7, %%mm7     \n\t" /* fill reg with 8 masks */
+
+                  "movq      _mask16_0, %%mm0 \n\t"
+                  "movq      _mask16_1, %%mm1 \n\t"
+
+                  "pand      %%mm7, %%mm0     \n\t"
+                  "pand      %%mm7, %%mm1     \n\t"
+
+                  "pcmpeqb   %%mm6, %%mm0     \n\t"
+                  "pcmpeqb   %%mm6, %%mm1     \n\t"
+
+/* preload        "movl      len, %%ecx       \n\t" // load length of line */
+/* preload        "movl      srcptr, %%esi    \n\t" // load source */
+/* preload        "movl      dstptr, %%edi    \n\t" // load dest */
+
+                  "cmpl      $0, %%ecx        \n\t"
+                  "jz        mainloop16end    \n\t"
+
+                "mainloop16:                  \n\t"
+                  "movq      (%%esi), %%mm4   \n\t"
+                  "pand      %%mm0, %%mm4     \n\t"
+                  "movq      %%mm0, %%mm6     \n\t"
+                  "movq      (%%edi), %%mm7   \n\t"
+                  "pandn     %%mm7, %%mm6     \n\t"
+                  "por       %%mm6, %%mm4     \n\t"
+                  "movq      %%mm4, (%%edi)   \n\t"
+
+                  "movq      8(%%esi), %%mm5  \n\t"
+                  "pand      %%mm1, %%mm5     \n\t"
+                  "movq      %%mm1, %%mm7     \n\t"
+                  "movq      8(%%edi), %%mm6  \n\t"
+                  "pandn     %%mm6, %%mm7     \n\t"
+                  "por       %%mm7, %%mm5     \n\t"
+                  "movq      %%mm5, 8(%%edi)  \n\t"
+
+                  "addl      $16, %%esi       \n\t" /* inc by 16 bytes processed */
+                  "addl      $16, %%edi       \n\t"
+                  "subl      $8, %%ecx        \n\t" /* dec by 8 pixels processed */
+                  "ja        mainloop16       \n\t"
+
+                "mainloop16end:               \n\t"
+/* preload        "movl      diff, %%ecx      \n\t" // (diff is in eax) */
+                  "movl      %%eax, %%ecx     \n\t"
+                  "cmpl      $0, %%ecx        \n\t"
+                  "jz        end16            \n\t"
+/* preload        "movl      mask, %%edx      \n\t" */
+                  "sall      $24, %%edx       \n\t" /* make low byte, high byte */
+
+                "secondloop16:                \n\t"
+                  "sall      %%edx            \n\t" /* move high bit to CF */
+                  "jnc       skip16           \n\t" /* if CF = 0 */
+                  "movw      (%%esi), %%ax    \n\t"
+                  "movw      %%ax, (%%edi)    \n\t"
+
+                "skip16:                      \n\t"
+                  "addl      $2, %%esi        \n\t"
+                  "addl      $2, %%edi        \n\t"
+                  "decl      %%ecx            \n\t"
+                  "jnz       secondloop16     \n\t"
+
+                "end16:                       \n\t"
+                  "EMMS                       \n\t" /* DONE */
+
+                  : "=a" (dummy_value_a),           /* output regs (dummy) */
+                    "=c" (dummy_value_c),
+                    "=d" (dummy_value_d),
+                    "=S" (dummy_value_S),
+                    "=D" (dummy_value_D)
+
+                  : "0" (diff),        /* eax       // input regs */
+/* was (unmask)     " "    RESERVED    // ebx       // Global Offset Table idx */
+                    "1" (len),         /* ecx */
+                    "2" (mask),        /* edx */
+                    "3" (srcptr),      /* esi */
+                    "4" (dstptr)       /* edi */
+
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+                  : "%mm0", "%mm1", "%mm4"          /* clobber list */
+                  , "%mm5", "%mm6", "%mm7"
+#endif
+               );
+            }
+            else /* mmx _not supported - Use modified C routine */
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+            {
+               register png_uint_32 i;
+               png_uint_32 initial_val = BPP2 * png_pass_start[png_ptr->pass];
+                 /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
+               register int stride = BPP2 * png_pass_inc[png_ptr->pass];
+                 /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
+               register int rep_bytes = BPP2 * png_pass_width[png_ptr->pass];
+                 /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
+               png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
+               int diff = (int) (png_ptr->width & 7); /* amount lost */
+               register png_uint_32 final_val = BPP2 * len;   /* GRR bugfix */
+
+               srcptr = png_ptr->row_buf + 1 + initial_val;
+               dstptr = row + initial_val;
+
+               for (i = initial_val; i < final_val; i += stride)
+               {
+                  png_memcpy(dstptr, srcptr, rep_bytes);
+                  srcptr += stride;
+                  dstptr += stride;
+               }
+               if (diff)  /* number of leftover pixels:  3 for pngtest */
+               {
+                  final_val+=diff*BPP2;
+                  for (; i < final_val; i += stride)
+                  {
+                     if (rep_bytes > (int)(final_val-i))
+                        rep_bytes = (int)(final_val-i);
+                     png_memcpy(dstptr, srcptr, rep_bytes);
+                     srcptr += stride;
+                     dstptr += stride;
+                  }
+               }
+            } /* end of else (_mmx_supported) */
+
+            break;
+         }       /* end 16 bpp */
+
+         case 24:       /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && _mmx_supported */ )
+#else
+            if (_mmx_supported)
+#endif
+            {
+               png_uint_32 len;
+               int diff;
+               int dummy_value_a;   /* fix 'forbidden register spilled' error */
+               int dummy_value_d;
+               int dummy_value_c;
+               int dummy_value_S;
+               int dummy_value_D;
+               _unmask = ~mask;            /* global variable for -fPIC version */
+               srcptr = png_ptr->row_buf + 1;
+               dstptr = row;
+               len  = png_ptr->width &~7;  /* reduce to multiple of 8 */
+               diff = (int) (png_ptr->width & 7); /* amount lost // */
+
+               __asm__ __volatile__ (
+                  "movd      _unmask, %%mm7   \n\t" /* load bit pattern */
+                  "psubb     %%mm6, %%mm6     \n\t" /* zero mm6 */
+                  "punpcklbw %%mm7, %%mm7     \n\t"
+                  "punpcklwd %%mm7, %%mm7     \n\t"
+                  "punpckldq %%mm7, %%mm7     \n\t" /* fill reg with 8 masks */
+
+                  "movq      _mask24_0, %%mm0 \n\t"
+                  "movq      _mask24_1, %%mm1 \n\t"
+                  "movq      _mask24_2, %%mm2 \n\t"
+
+                  "pand      %%mm7, %%mm0     \n\t"
+                  "pand      %%mm7, %%mm1     \n\t"
+                  "pand      %%mm7, %%mm2     \n\t"
+
+                  "pcmpeqb   %%mm6, %%mm0     \n\t"
+                  "pcmpeqb   %%mm6, %%mm1     \n\t"
+                  "pcmpeqb   %%mm6, %%mm2     \n\t"
+
+/* preload        "movl      len, %%ecx       \n\t" // load length of line */
+/* preload        "movl      srcptr, %%esi    \n\t" // load source */
+/* preload        "movl      dstptr, %%edi    \n\t" // load dest */
+
+                  "cmpl      $0, %%ecx        \n\t"
+                  "jz        mainloop24end    \n\t"
+
+                "mainloop24:                  \n\t"
+                  "movq      (%%esi), %%mm4   \n\t"
+                  "pand      %%mm0, %%mm4     \n\t"
+                  "movq      %%mm0, %%mm6     \n\t"
+                  "movq      (%%edi), %%mm7   \n\t"
+                  "pandn     %%mm7, %%mm6     \n\t"
+                  "por       %%mm6, %%mm4     \n\t"
+                  "movq      %%mm4, (%%edi)   \n\t"
+
+                  "movq      8(%%esi), %%mm5  \n\t"
+                  "pand      %%mm1, %%mm5     \n\t"
+                  "movq      %%mm1, %%mm7     \n\t"
+                  "movq      8(%%edi), %%mm6  \n\t"
+                  "pandn     %%mm6, %%mm7     \n\t"
+                  "por       %%mm7, %%mm5     \n\t"
+                  "movq      %%mm5, 8(%%edi)  \n\t"
+
+                  "movq      16(%%esi), %%mm6 \n\t"
+                  "pand      %%mm2, %%mm6     \n\t"
+                  "movq      %%mm2, %%mm4     \n\t"
+                  "movq      16(%%edi), %%mm7 \n\t"
+                  "pandn     %%mm7, %%mm4     \n\t"
+                  "por       %%mm4, %%mm6     \n\t"
+                  "movq      %%mm6, 16(%%edi) \n\t"
+
+                  "addl      $24, %%esi       \n\t" /* inc by 24 bytes processed */
+                  "addl      $24, %%edi       \n\t"
+                  "subl      $8, %%ecx        \n\t" /* dec by 8 pixels processed */
+
+                  "ja        mainloop24       \n\t"
+
+                "mainloop24end:               \n\t"
+/* preload        "movl      diff, %%ecx      \n\t" // (diff is in eax) */
+                  "movl      %%eax, %%ecx     \n\t"
+                  "cmpl      $0, %%ecx        \n\t"
+                  "jz        end24            \n\t"
+/* preload        "movl      mask, %%edx      \n\t" */
+                  "sall      $24, %%edx       \n\t" /* make low byte, high byte */
+
+                "secondloop24:                \n\t"
+                  "sall      %%edx            \n\t" /* move high bit to CF */
+                  "jnc       skip24           \n\t" /* if CF = 0 */
+                  "movw      (%%esi), %%ax    \n\t"
+                  "movw      %%ax, (%%edi)    \n\t"
+                  "xorl      %%eax, %%eax     \n\t"
+                  "movb      2(%%esi), %%al   \n\t"
+                  "movb      %%al, 2(%%edi)   \n\t"
+
+                "skip24:                      \n\t"
+                  "addl      $3, %%esi        \n\t"
+                  "addl      $3, %%edi        \n\t"
+                  "decl      %%ecx            \n\t"
+                  "jnz       secondloop24     \n\t"
+
+                "end24:                       \n\t"
+                  "EMMS                       \n\t" /* DONE */
+
+                  : "=a" (dummy_value_a),           /* output regs (dummy) */
+                    "=d" (dummy_value_d),
+                    "=c" (dummy_value_c),
+                    "=S" (dummy_value_S),
+                    "=D" (dummy_value_D)
+
+                  : "3" (srcptr),      /* esi       // input regs */
+                    "4" (dstptr),      /* edi */
+                    "0" (diff),        /* eax */
+/* was (unmask)     "b"    RESERVED    // ebx       // Global Offset Table idx */
+                    "2" (len),         /* ecx */
+                    "1" (mask)         /* edx */
+
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+                  : "%mm0", "%mm1", "%mm2"          /* clobber list */
+                  , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+               );
+            }
+            else /* mmx _not supported - Use modified C routine */
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+            {
+               register png_uint_32 i;
+               png_uint_32 initial_val = BPP3 * png_pass_start[png_ptr->pass];
+                 /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
+               register int stride = BPP3 * png_pass_inc[png_ptr->pass];
+                 /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
+               register int rep_bytes = BPP3 * png_pass_width[png_ptr->pass];
+                 /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
+               png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
+               int diff = (int) (png_ptr->width & 7); /* amount lost */
+               register png_uint_32 final_val = BPP3 * len;   /* GRR bugfix */
+
+               srcptr = png_ptr->row_buf + 1 + initial_val;
+               dstptr = row + initial_val;
+
+               for (i = initial_val; i < final_val; i += stride)
+               {
+                  png_memcpy(dstptr, srcptr, rep_bytes);
+                  srcptr += stride;
+                  dstptr += stride;
+               }
+               if (diff)  /* number of leftover pixels:  3 for pngtest */
+               {
+                  final_val+=diff*BPP3;
+                  for (; i < final_val; i += stride)
+                  {
+                     if (rep_bytes > (int)(final_val-i))
+                        rep_bytes = (int)(final_val-i);
+                     png_memcpy(dstptr, srcptr, rep_bytes);
+                     srcptr += stride;
+                     dstptr += stride;
+                  }
+               }
+            } /* end of else (_mmx_supported) */
+
+            break;
+         }       /* end 24 bpp */
+
+         case 32:       /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && _mmx_supported */ )
+#else
+            if (_mmx_supported)
+#endif
+            {
+               png_uint_32 len;
+               int diff;
+               int dummy_value_a;   /* fix 'forbidden register spilled' error */
+               int dummy_value_d;
+               int dummy_value_c;
+               int dummy_value_S;
+               int dummy_value_D;
+               _unmask = ~mask;            /* global variable for -fPIC version */
+               srcptr = png_ptr->row_buf + 1;
+               dstptr = row;
+               len  = png_ptr->width &~7;  /* reduce to multiple of 8 */
+               diff = (int) (png_ptr->width & 7); /* amount lost // */
+
+               __asm__ __volatile__ (
+                  "movd      _unmask, %%mm7   \n\t" /* load bit pattern */
+                  "psubb     %%mm6, %%mm6     \n\t" /* zero mm6 */
+                  "punpcklbw %%mm7, %%mm7     \n\t"
+                  "punpcklwd %%mm7, %%mm7     \n\t"
+                  "punpckldq %%mm7, %%mm7     \n\t" /* fill reg with 8 masks */
+
+                  "movq      _mask32_0, %%mm0 \n\t"
+                  "movq      _mask32_1, %%mm1 \n\t"
+                  "movq      _mask32_2, %%mm2 \n\t"
+                  "movq      _mask32_3, %%mm3 \n\t"
+
+                  "pand      %%mm7, %%mm0     \n\t"
+                  "pand      %%mm7, %%mm1     \n\t"
+                  "pand      %%mm7, %%mm2     \n\t"
+                  "pand      %%mm7, %%mm3     \n\t"
+
+                  "pcmpeqb   %%mm6, %%mm0     \n\t"
+                  "pcmpeqb   %%mm6, %%mm1     \n\t"
+                  "pcmpeqb   %%mm6, %%mm2     \n\t"
+                  "pcmpeqb   %%mm6, %%mm3     \n\t"
+
+/* preload        "movl      len, %%ecx       \n\t" // load length of line */
+/* preload        "movl      srcptr, %%esi    \n\t" // load source */
+/* preload        "movl      dstptr, %%edi    \n\t" // load dest */
+
+                  "cmpl      $0, %%ecx        \n\t" /* lcr */
+                  "jz        mainloop32end    \n\t"
+
+                "mainloop32:                  \n\t"
+                  "movq      (%%esi), %%mm4   \n\t"
+                  "pand      %%mm0, %%mm4     \n\t"
+                  "movq      %%mm0, %%mm6     \n\t"
+                  "movq      (%%edi), %%mm7   \n\t"
+                  "pandn     %%mm7, %%mm6     \n\t"
+                  "por       %%mm6, %%mm4     \n\t"
+                  "movq      %%mm4, (%%edi)   \n\t"
+
+                  "movq      8(%%esi), %%mm5  \n\t"
+                  "pand      %%mm1, %%mm5     \n\t"
+                  "movq      %%mm1, %%mm7     \n\t"
+                  "movq      8(%%edi), %%mm6  \n\t"
+                  "pandn     %%mm6, %%mm7     \n\t"
+                  "por       %%mm7, %%mm5     \n\t"
+                  "movq      %%mm5, 8(%%edi)  \n\t"
+
+                  "movq      16(%%esi), %%mm6 \n\t"
+                  "pand      %%mm2, %%mm6     \n\t"
+                  "movq      %%mm2, %%mm4     \n\t"
+                  "movq      16(%%edi), %%mm7 \n\t"
+                  "pandn     %%mm7, %%mm4     \n\t"
+                  "por       %%mm4, %%mm6     \n\t"
+                  "movq      %%mm6, 16(%%edi) \n\t"
+
+                  "movq      24(%%esi), %%mm7 \n\t"
+                  "pand      %%mm3, %%mm7     \n\t"
+                  "movq      %%mm3, %%mm5     \n\t"
+                  "movq      24(%%edi), %%mm4 \n\t"
+                  "pandn     %%mm4, %%mm5     \n\t"
+                  "por       %%mm5, %%mm7     \n\t"
+                  "movq      %%mm7, 24(%%edi) \n\t"
+
+                  "addl      $32, %%esi       \n\t" /* inc by 32 bytes processed */
+                  "addl      $32, %%edi       \n\t"
+                  "subl      $8, %%ecx        \n\t" /* dec by 8 pixels processed */
+                  "ja        mainloop32       \n\t"
+
+                "mainloop32end:               \n\t"
+/* preload        "movl      diff, %%ecx      \n\t" // (diff is in eax) */
+                  "movl      %%eax, %%ecx     \n\t"
+                  "cmpl      $0, %%ecx        \n\t"
+                  "jz        end32            \n\t"
+/* preload        "movl      mask, %%edx      \n\t" */
+                  "sall      $24, %%edx       \n\t" /* low byte => high byte */
+
+                "secondloop32:                \n\t"
+                  "sall      %%edx            \n\t" /* move high bit to CF */
+                  "jnc       skip32           \n\t" /* if CF = 0 */
+                  "movl      (%%esi), %%eax   \n\t"
+                  "movl      %%eax, (%%edi)   \n\t"
+
+                "skip32:                      \n\t"
+                  "addl      $4, %%esi        \n\t"
+                  "addl      $4, %%edi        \n\t"
+                  "decl      %%ecx            \n\t"
+                  "jnz       secondloop32     \n\t"
+
+                "end32:                       \n\t"
+                  "EMMS                       \n\t" /* DONE */
+
+                  : "=a" (dummy_value_a),           /* output regs (dummy) */
+                    "=d" (dummy_value_d),
+                    "=c" (dummy_value_c),
+                    "=S" (dummy_value_S),
+                    "=D" (dummy_value_D)
+
+                  : "3" (srcptr),      /* esi       // input regs */
+                    "4" (dstptr),      /* edi */
+                    "0" (diff),        /* eax */
+/* was (unmask)     "b"    RESERVED    // ebx       // Global Offset Table idx */
+                    "2" (len),         /* ecx */
+                    "1" (mask)         /* edx */
+
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+                  : "%mm0", "%mm1", "%mm2", "%mm3"  /* clobber list */
+                  , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+               );
+            }
+            else /* mmx _not supported - Use modified C routine */
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+            {
+               register png_uint_32 i;
+               png_uint_32 initial_val = BPP4 * png_pass_start[png_ptr->pass];
+                 /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
+               register int stride = BPP4 * png_pass_inc[png_ptr->pass];
+                 /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
+               register int rep_bytes = BPP4 * png_pass_width[png_ptr->pass];
+                 /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
+               png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
+               int diff = (int) (png_ptr->width & 7); /* amount lost */
+               register png_uint_32 final_val = BPP4 * len;   /* GRR bugfix */
+
+               srcptr = png_ptr->row_buf + 1 + initial_val;
+               dstptr = row + initial_val;
+
+               for (i = initial_val; i < final_val; i += stride)
+               {
+                  png_memcpy(dstptr, srcptr, rep_bytes);
+                  srcptr += stride;
+                  dstptr += stride;
+               }
+               if (diff)  /* number of leftover pixels:  3 for pngtest */
+               {
+                  final_val+=diff*BPP4;
+                  for (; i < final_val; i += stride)
+                  {
+                     if (rep_bytes > (int)(final_val-i))
+                        rep_bytes = (int)(final_val-i);
+                     png_memcpy(dstptr, srcptr, rep_bytes);
+                     srcptr += stride;
+                     dstptr += stride;
+                  }
+               }
+            } /* end of else (_mmx_supported) */
+
+            break;
+         }       /* end 32 bpp */
+
+         case 48:       /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && _mmx_supported */ )
+#else
+            if (_mmx_supported)
+#endif
+            {
+               png_uint_32 len;
+               int diff;
+               int dummy_value_a;   /* fix 'forbidden register spilled' error */
+               int dummy_value_d;
+               int dummy_value_c;
+               int dummy_value_S;
+               int dummy_value_D;
+               _unmask = ~mask;            /* global variable for -fPIC version */
+               srcptr = png_ptr->row_buf + 1;
+               dstptr = row;
+               len  = png_ptr->width &~7;  /* reduce to multiple of 8 */
+               diff = (int) (png_ptr->width & 7); /* amount lost // */
+
+               __asm__ __volatile__ (
+                  "movd      _unmask, %%mm7   \n\t" /* load bit pattern */
+                  "psubb     %%mm6, %%mm6     \n\t" /* zero mm6 */
+                  "punpcklbw %%mm7, %%mm7     \n\t"
+                  "punpcklwd %%mm7, %%mm7     \n\t"
+                  "punpckldq %%mm7, %%mm7     \n\t" /* fill reg with 8 masks */
+
+                  "movq      _mask48_0, %%mm0 \n\t"
+                  "movq      _mask48_1, %%mm1 \n\t"
+                  "movq      _mask48_2, %%mm2 \n\t"
+                  "movq      _mask48_3, %%mm3 \n\t"
+                  "movq      _mask48_4, %%mm4 \n\t"
+                  "movq      _mask48_5, %%mm5 \n\t"
+
+                  "pand      %%mm7, %%mm0     \n\t"
+                  "pand      %%mm7, %%mm1     \n\t"
+                  "pand      %%mm7, %%mm2     \n\t"
+                  "pand      %%mm7, %%mm3     \n\t"
+                  "pand      %%mm7, %%mm4     \n\t"
+                  "pand      %%mm7, %%mm5     \n\t"
+
+                  "pcmpeqb   %%mm6, %%mm0     \n\t"
+                  "pcmpeqb   %%mm6, %%mm1     \n\t"
+                  "pcmpeqb   %%mm6, %%mm2     \n\t"
+                  "pcmpeqb   %%mm6, %%mm3     \n\t"
+                  "pcmpeqb   %%mm6, %%mm4     \n\t"
+                  "pcmpeqb   %%mm6, %%mm5     \n\t"
+
+/* preload        "movl      len, %%ecx       \n\t" // load length of line */
+/* preload        "movl      srcptr, %%esi    \n\t" // load source */
+/* preload        "movl      dstptr, %%edi    \n\t" // load dest */
+
+                  "cmpl      $0, %%ecx        \n\t"
+                  "jz        mainloop48end    \n\t"
+
+                "mainloop48:                  \n\t"
+                  "movq      (%%esi), %%mm7   \n\t"
+                  "pand      %%mm0, %%mm7     \n\t"
+                  "movq      %%mm0, %%mm6     \n\t"
+                  "pandn     (%%edi), %%mm6   \n\t"
+                  "por       %%mm6, %%mm7     \n\t"
+                  "movq      %%mm7, (%%edi)   \n\t"
+
+                  "movq      8(%%esi), %%mm6  \n\t"
+                  "pand      %%mm1, %%mm6     \n\t"
+                  "movq      %%mm1, %%mm7     \n\t"
+                  "pandn     8(%%edi), %%mm7  \n\t"
+                  "por       %%mm7, %%mm6     \n\t"
+                  "movq      %%mm6, 8(%%edi)  \n\t"
+
+                  "movq      16(%%esi), %%mm6 \n\t"
+                  "pand      %%mm2, %%mm6     \n\t"
+                  "movq      %%mm2, %%mm7     \n\t"
+                  "pandn     16(%%edi), %%mm7 \n\t"
+                  "por       %%mm7, %%mm6     \n\t"
+                  "movq      %%mm6, 16(%%edi) \n\t"
+
+                  "movq      24(%%esi), %%mm7 \n\t"
+                  "pand      %%mm3, %%mm7     \n\t"
+                  "movq      %%mm3, %%mm6     \n\t"
+                  "pandn     24(%%edi), %%mm6 \n\t"
+                  "por       %%mm6, %%mm7     \n\t"
+                  "movq      %%mm7, 24(%%edi) \n\t"
+
+                  "movq      32(%%esi), %%mm6 \n\t"
+                  "pand      %%mm4, %%mm6     \n\t"
+                  "movq      %%mm4, %%mm7     \n\t"
+                  "pandn     32(%%edi), %%mm7 \n\t"
+                  "por       %%mm7, %%mm6     \n\t"
+                  "movq      %%mm6, 32(%%edi) \n\t"
+
+                  "movq      40(%%esi), %%mm7 \n\t"
+                  "pand      %%mm5, %%mm7     \n\t"
+                  "movq      %%mm5, %%mm6     \n\t"
+                  "pandn     40(%%edi), %%mm6 \n\t"
+                  "por       %%mm6, %%mm7     \n\t"
+                  "movq      %%mm7, 40(%%edi) \n\t"
+
+                  "addl      $48, %%esi       \n\t" /* inc by 48 bytes processed */
+                  "addl      $48, %%edi       \n\t"
+                  "subl      $8, %%ecx        \n\t" /* dec by 8 pixels processed */
+
+                  "ja        mainloop48       \n\t"
+
+                "mainloop48end:               \n\t"
+/* preload        "movl      diff, %%ecx      \n\t" // (diff is in eax) */
+                  "movl      %%eax, %%ecx     \n\t"
+                  "cmpl      $0, %%ecx        \n\t"
+                  "jz        end48            \n\t"
+/* preload        "movl      mask, %%edx      \n\t" */
+                  "sall      $24, %%edx       \n\t" /* make low byte, high byte */
+
+                "secondloop48:                \n\t"
+                  "sall      %%edx            \n\t" /* move high bit to CF */
+                  "jnc       skip48           \n\t" /* if CF = 0 */
+                  "movl      (%%esi), %%eax   \n\t"
+                  "movl      %%eax, (%%edi)   \n\t"
+
+                "skip48:                      \n\t"
+                  "addl      $4, %%esi        \n\t"
+                  "addl      $4, %%edi        \n\t"
+                  "decl      %%ecx            \n\t"
+                  "jnz       secondloop48     \n\t"
+
+                "end48:                       \n\t"
+                  "EMMS                       \n\t" /* DONE */
+
+                  : "=a" (dummy_value_a),           /* output regs (dummy) */
+                    "=d" (dummy_value_d),
+                    "=c" (dummy_value_c),
+                    "=S" (dummy_value_S),
+                    "=D" (dummy_value_D)
+
+                  : "3" (srcptr),      /* esi       // input regs */
+                    "4" (dstptr),      /* edi */
+                    "0" (diff),        /* eax */
+/* was (unmask)     "b"    RESERVED    // ebx       // Global Offset Table idx */
+                    "2" (len),         /* ecx */
+                    "1" (mask)         /* edx */
+
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+                  : "%mm0", "%mm1", "%mm2", "%mm3"  /* clobber list */
+                  , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+               );
+            }
+            else /* mmx _not supported - Use modified C routine */
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+            {
+               register png_uint_32 i;
+               png_uint_32 initial_val = BPP6 * png_pass_start[png_ptr->pass];
+                 /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
+               register int stride = BPP6 * png_pass_inc[png_ptr->pass];
+                 /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
+               register int rep_bytes = BPP6 * png_pass_width[png_ptr->pass];
+                 /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
+               png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
+               int diff = (int) (png_ptr->width & 7); /* amount lost */
+               register png_uint_32 final_val = BPP6 * len;   /* GRR bugfix */
+
+               srcptr = png_ptr->row_buf + 1 + initial_val;
+               dstptr = row + initial_val;
+
+               for (i = initial_val; i < final_val; i += stride)
+               {
+                  png_memcpy(dstptr, srcptr, rep_bytes);
+                  srcptr += stride;
+                  dstptr += stride;
+               }
+               if (diff)  /* number of leftover pixels:  3 for pngtest */
+               {
+                  final_val+=diff*BPP6;
+                  for (; i < final_val; i += stride)
+                  {
+                     if (rep_bytes > (int)(final_val-i))
+                        rep_bytes = (int)(final_val-i);
+                     png_memcpy(dstptr, srcptr, rep_bytes);
+                     srcptr += stride;
+                     dstptr += stride;
+                  }
+               }
+            } /* end of else (_mmx_supported) */
+
+            break;
+         }       /* end 48 bpp */
+
+         case 64:       /* png_ptr->row_info.pixel_depth */
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+            register png_uint_32 i;
+            png_uint_32 initial_val = BPP8 * png_pass_start[png_ptr->pass];
+              /* png.c:  png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; */
+            register int stride = BPP8 * png_pass_inc[png_ptr->pass];
+              /* png.c:  png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
+            register int rep_bytes = BPP8 * png_pass_width[png_ptr->pass];
+              /* png.c:  png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; */
+            png_uint_32 len = png_ptr->width &~7;  /* reduce to mult. of 8 */
+            int diff = (int) (png_ptr->width & 7); /* amount lost */
+            register png_uint_32 final_val = BPP8 * len;   /* GRR bugfix */
+
+            srcptr = png_ptr->row_buf + 1 + initial_val;
+            dstptr = row + initial_val;
+
+            for (i = initial_val; i < final_val; i += stride)
+            {
+               png_memcpy(dstptr, srcptr, rep_bytes);
+               srcptr += stride;
+               dstptr += stride;
+            }
+            if (diff)  /* number of leftover pixels:  3 for pngtest */
+            {
+               final_val+=diff*BPP8;
+               for (; i < final_val; i += stride)
+               {
+                  if (rep_bytes > (int)(final_val-i))
+                     rep_bytes = (int)(final_val-i);
+                  png_memcpy(dstptr, srcptr, rep_bytes);
+                  srcptr += stride;
+                  dstptr += stride;
+               }
+            }
+
+            break;
+         }       /* end 64 bpp */
+
+         default: /* png_ptr->row_info.pixel_depth != 1,2,4,8,16,24,32,48,64 */
+         {
+            /* this should never happen */
+            png_warning(png_ptr, "Invalid row_info.pixel_depth in pnggccrd");
+            break;
+         }
+      } /* end switch (png_ptr->row_info.pixel_depth) */
+
+   } /* end if (non-trivial mask) */
+
+} /* end png_combine_row() */
+
+#endif /* PNG_HAVE_ASSEMBLER_COMBINE_ROW */
+
+
+
+
+/*===========================================================================*/
+/*                                                                           */
+/*                 P N G _ D O _ R E A D _ I N T E R L A C E                 */
+/*                                                                           */
+/*===========================================================================*/
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+#if defined(PNG_HAVE_ASSEMBLER_READ_INTERLACE)
+
+/* png_do_read_interlace() is called after any 16-bit to 8-bit conversion
+ * has taken place.  [GRR: what other steps come before and/or after?]
+ */
+
+void /* PRIVATE */
+png_do_read_interlace(png_structp png_ptr)
+{
+   png_row_infop row_info = &(png_ptr->row_info);
+   png_bytep row = png_ptr->row_buf + 1;
+   int pass = png_ptr->pass;
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+   png_uint_32 transformations = png_ptr->transformations;
+#endif
+
+   png_debug(1, "in png_do_read_interlace (pnggccrd.c)\n");
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+   if (_mmx_supported == 2) {
+#if !defined(PNG_1_0_X)
+       /* this should have happened in png_init_mmx_flags() already */
+       png_warning(png_ptr, "asm_flags may not have been initialized");
+#endif
+       png_mmx_support();
+   }
+#endif
+
+   if (row != NULL && row_info != NULL)
+   {
+      png_uint_32 final_width;
+
+      final_width = row_info->width * png_pass_inc[pass];
+
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp, dp;
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_byte v;
+            png_uint_32 i;
+            int j;
+
+            sp = row + (png_size_t)((row_info->width - 1) >> 3);
+            dp = row + (png_size_t)((final_width - 1) >> 3);
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)((row_info->width + 7) & 7);
+               dshift = (int)((final_width + 7) & 7);
+               s_start = 7;
+               s_end = 0;
+               s_inc = -1;
+            }
+            else
+#endif
+            {
+               sshift = 7 - (int)((row_info->width + 7) & 7);
+               dshift = 7 - (int)((final_width + 7) & 7);
+               s_start = 0;
+               s_end = 7;
+               s_inc = 1;
+            }
+
+            for (i = row_info->width; i; i--)
+            {
+               v = (png_byte)((*sp >> sshift) & 0x1);
+               for (j = 0; j < png_pass_inc[pass]; j++)
+               {
+                  *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+
+         case 2:
+         {
+            png_bytep sp, dp;
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_uint_32 i;
+
+            sp = row + (png_size_t)((row_info->width - 1) >> 2);
+            dp = row + (png_size_t)((final_width - 1) >> 2);
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (png_size_t)(((row_info->width + 3) & 3) << 1);
+               dshift = (png_size_t)(((final_width + 3) & 3) << 1);
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+            else
+#endif
+            {
+               sshift = (png_size_t)((3 - ((row_info->width + 3) & 3)) << 1);
+               dshift = (png_size_t)((3 - ((final_width + 3) & 3)) << 1);
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+
+            for (i = row_info->width; i; i--)
+            {
+               png_byte v;
+               int j;
+
+               v = (png_byte)((*sp >> sshift) & 0x3);
+               for (j = 0; j < png_pass_inc[pass]; j++)
+               {
+                  *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+
+         case 4:
+         {
+            png_bytep sp, dp;
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_uint_32 i;
+
+            sp = row + (png_size_t)((row_info->width - 1) >> 1);
+            dp = row + (png_size_t)((final_width - 1) >> 1);
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (png_size_t)(((row_info->width + 1) & 1) << 2);
+               dshift = (png_size_t)(((final_width + 1) & 1) << 2);
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            else
+#endif
+            {
+               sshift = (png_size_t)((1 - ((row_info->width + 1) & 1)) << 2);
+               dshift = (png_size_t)((1 - ((final_width + 1) & 1)) << 2);
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+
+            for (i = row_info->width; i; i--)
+            {
+               png_byte v;
+               int j;
+
+               v = (png_byte)((*sp >> sshift) & 0xf);
+               for (j = 0; j < png_pass_inc[pass]; j++)
+               {
+                  *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+
+       /*====================================================================*/
+
+         default: /* 8-bit or larger (this is where the routine is modified) */
+         {
+#if 0
+/*          static unsigned long long _const4 = 0x0000000000FFFFFFLL;  no good */
+/*          static unsigned long long const4 = 0x0000000000FFFFFFLL;   no good */
+/*          unsigned long long _const4 = 0x0000000000FFFFFFLL;         no good */
+/*          unsigned long long const4 = 0x0000000000FFFFFFLL;          no good */
+#endif
+            png_bytep sptr, dp;
+            png_uint_32 i;
+            png_size_t pixel_bytes;
+            int width = (int)row_info->width;
+
+            pixel_bytes = (row_info->pixel_depth >> 3);
+
+            /* point sptr at the last pixel in the pre-expanded row: */
+            sptr = row + (width - 1) * pixel_bytes;
+
+            /* point dp at the last pixel position in the expanded row: */
+            dp = row + (final_width - 1) * pixel_bytes;
+
+            /* New code by Nirav Chhatrapati - Intel Corporation */
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_INTERLACE)
+                /* && _mmx_supported */ )
+#else
+            if (_mmx_supported)
+#endif
+            {
+               //--------------------------------------------------------------
+               if (pixel_bytes == 3)
+               {
+                  if (((pass == 0) || (pass == 1)) && width)
+                  {
+                     int dummy_value_c;   /* fix 'forbidden register spilled' */
+                     int dummy_value_S;
+                     int dummy_value_D;
+
+                     __asm__ __volatile__ (
+                        "subl $21, %%edi         \n\t"
+                                     /* (png_pass_inc[pass] - 1)*pixel_bytes */
+
+                     ".loop3_pass0:              \n\t"
+                        "movd (%%esi), %%mm0     \n\t" /* x x x x x 2 1 0 */
+                        "pand _const4, %%mm0     \n\t" /* z z z z z 2 1 0 */
+                        "movq %%mm0, %%mm1       \n\t" /* z z z z z 2 1 0 */
+                        "psllq $16, %%mm0        \n\t" /* z z z 2 1 0 z z */
+                        "movq %%mm0, %%mm2       \n\t" /* z z z 2 1 0 z z */
+                        "psllq $24, %%mm0        \n\t" /* 2 1 0 z z z z z */
+                        "psrlq $8, %%mm1         \n\t" /* z z z z z z 2 1 */
+                        "por %%mm2, %%mm0        \n\t" /* 2 1 0 2 1 0 z z */
+                        "por %%mm1, %%mm0        \n\t" /* 2 1 0 2 1 0 2 1 */
+                        "movq %%mm0, %%mm3       \n\t" /* 2 1 0 2 1 0 2 1 */
+                        "psllq $16, %%mm0        \n\t" /* 0 2 1 0 2 1 z z */
+                        "movq %%mm3, %%mm4       \n\t" /* 2 1 0 2 1 0 2 1 */
+                        "punpckhdq %%mm0, %%mm3  \n\t" /* 0 2 1 0 2 1 0 2 */
+                        "movq %%mm4, 16(%%edi)   \n\t"
+                        "psrlq $32, %%mm0        \n\t" /* z z z z 0 2 1 0 */
+                        "movq %%mm3, 8(%%edi)    \n\t"
+                        "punpckldq %%mm4, %%mm0  \n\t" /* 1 0 2 1 0 2 1 0 */
+                        "subl $3, %%esi          \n\t"
+                        "movq %%mm0, (%%edi)     \n\t"
+                        "subl $24, %%edi         \n\t"
+                        "decl %%ecx              \n\t"
+                        "jnz .loop3_pass0        \n\t"
+                        "EMMS                    \n\t" /* DONE */
+
+                        : "=c" (dummy_value_c),        /* output regs (dummy) */
+                          "=S" (dummy_value_S),
+                          "=D" (dummy_value_D)
+
+                        : "1" (sptr),      // esi      // input regs
+                          "2" (dp),        // edi
+                          "0" (width),     // ecx
+                          "rim" (_const4)  // %1(?)  (0x0000000000FFFFFFLL)
+
+#if 0  /* %mm0, ..., %mm4 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                        : "%mm0", "%mm1", "%mm2"       /* clobber list */
+                        , "%mm3", "%mm4"
+#endif
+                     );
+                  }
+                  else if (((pass == 2) || (pass == 3)) && width)
+                  {
+                     int dummy_value_c;   /* fix 'forbidden register spilled' */
+                     int dummy_value_S;
+                     int dummy_value_D;
+
+                     __asm__ __volatile__ (
+                        "subl $9, %%edi          \n\t"
+                                     /* (png_pass_inc[pass] - 1)*pixel_bytes */
+
+                     ".loop3_pass2:              \n\t"
+                        "movd (%%esi), %%mm0     \n\t" /* x x x x x 2 1 0 */
+                        "pand _const4, %%mm0     \n\t" /* z z z z z 2 1 0 */
+                        "movq %%mm0, %%mm1       \n\t" /* z z z z z 2 1 0 */
+                        "psllq $16, %%mm0        \n\t" /* z z z 2 1 0 z z */
+                        "movq %%mm0, %%mm2       \n\t" /* z z z 2 1 0 z z */
+                        "psllq $24, %%mm0        \n\t" /* 2 1 0 z z z z z */
+                        "psrlq $8, %%mm1         \n\t" /* z z z z z z 2 1 */
+                        "por %%mm2, %%mm0        \n\t" /* 2 1 0 2 1 0 z z */
+                        "por %%mm1, %%mm0        \n\t" /* 2 1 0 2 1 0 2 1 */
+                        "movq %%mm0, 4(%%edi)    \n\t"
+                        "psrlq $16, %%mm0        \n\t" /* z z 2 1 0 2 1 0 */
+                        "subl $3, %%esi          \n\t"
+                        "movd %%mm0, (%%edi)     \n\t"
+                        "subl $12, %%edi         \n\t"
+                        "decl %%ecx              \n\t"
+                        "jnz .loop3_pass2        \n\t"
+                        "EMMS                    \n\t" /* DONE */
+
+                        : "=c" (dummy_value_c),        /* output regs (dummy) */
+                          "=S" (dummy_value_S),
+                          "=D" (dummy_value_D)
+
+                        : "1" (sptr),      // esi      // input regs
+                          "2" (dp),        // edi
+                          "0" (width),     // ecx
+                          "rim" (_const4)  // (0x0000000000FFFFFFLL)
+
+#if 0  /* %mm0, ..., %mm2 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                        : "%mm0", "%mm1", "%mm2"       /* clobber list */
+#endif
+                     );
+                  }
+                  else if (width) /* && ((pass == 4) || (pass == 5)) */
+                  {
+                     int width_mmx = ((width >> 1) << 1) - 8;   /* GRR:  huh? */
+                     if (width_mmx < 0)
+                         width_mmx = 0;
+                     width -= width_mmx;        /* 8 or 9 pix, 24 or 27 bytes */
+                     if (width_mmx)
+                     {
+                        /* png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; */
+                        /* sptr points at last pixel in pre-expanded row */
+                        /* dp points at last pixel position in expanded row */
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $3, %%esi          \n\t"
+                           "subl $9, %%edi          \n\t"
+                                        /* (png_pass_inc[pass] + 1)*pixel_bytes */
+
+                        ".loop3_pass4:              \n\t"
+                           "movq (%%esi), %%mm0     \n\t" /* x x 5 4 3 2 1 0 */
+                           "movq %%mm0, %%mm1       \n\t" /* x x 5 4 3 2 1 0 */
+                           "movq %%mm0, %%mm2       \n\t" /* x x 5 4 3 2 1 0 */
+                           "psllq $24, %%mm0        \n\t" /* 4 3 2 1 0 z z z */
+                           "pand _const4, %%mm1     \n\t" /* z z z z z 2 1 0 */
+                           "psrlq $24, %%mm2        \n\t" /* z z z x x 5 4 3 */
+                           "por %%mm1, %%mm0        \n\t" /* 4 3 2 1 0 2 1 0 */
+                           "movq %%mm2, %%mm3       \n\t" /* z z z x x 5 4 3 */
+                           "psllq $8, %%mm2         \n\t" /* z z x x 5 4 3 z */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "psrlq $16, %%mm3        \n\t" /* z z z z z x x 5 */
+                           "pand _const6, %%mm3     \n\t" /* z z z z z z z 5 */
+                           "por %%mm3, %%mm2        \n\t" /* z z x x 5 4 3 5 */
+                           "subl $6, %%esi          \n\t"
+                           "movd %%mm2, 8(%%edi)    \n\t"
+                           "subl $12, %%edi         \n\t"
+                           "subl $2, %%ecx          \n\t"
+                           "jnz .loop3_pass4        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      // esi      // input regs
+                             "2" (dp),        // edi
+                             "0" (width_mmx), // ecx
+                             "rim" (_const4), // 0x0000000000FFFFFFLL
+                             "rim" (_const6)  // 0x00000000000000FFLL
+
+#if 0  /* %mm0, ..., %mm3 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0", "%mm1"               /* clobber list */
+                           , "%mm2", "%mm3"
+#endif
+                        );
+                     }
+
+                     sptr -= width_mmx*3;
+                     dp -= width_mmx*6;
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+
+                        png_memcpy(v, sptr, 3);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           png_memcpy(dp, v, 3);
+                           dp -= 3;
+                        }
+                        sptr -= 3;
+                     }
+                  }
+               } /* end of pixel_bytes == 3 */
+
+               //--------------------------------------------------------------
+               else if (pixel_bytes == 1)
+               {
+                  if (((pass == 0) || (pass == 1)) && width)
+                  {
+                     int width_mmx = ((width >> 2) << 2);
+                     width -= width_mmx;        /* 0-3 pixels => 0-3 bytes */
+                     if (width_mmx)
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $3, %%esi          \n\t"
+                           "subl $31, %%edi         \n\t"
+
+                        ".loop1_pass0:              \n\t"
+                           "movd (%%esi), %%mm0     \n\t" /* x x x x 3 2 1 0 */
+                           "movq %%mm0, %%mm1       \n\t" /* x x x x 3 2 1 0 */
+                           "punpcklbw %%mm0, %%mm0  \n\t" /* 3 3 2 2 1 1 0 0 */
+                           "movq %%mm0, %%mm2       \n\t" /* 3 3 2 2 1 1 0 0 */
+                           "punpcklwd %%mm0, %%mm0  \n\t" /* 1 1 1 1 0 0 0 0 */
+                           "movq %%mm0, %%mm3       \n\t" /* 1 1 1 1 0 0 0 0 */
+                           "punpckldq %%mm0, %%mm0  \n\t" /* 0 0 0 0 0 0 0 0 */
+                           "punpckhdq %%mm3, %%mm3  \n\t" /* 1 1 1 1 1 1 1 1 */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "punpckhwd %%mm2, %%mm2  \n\t" /* 3 3 3 3 2 2 2 2 */
+                           "movq %%mm3, 8(%%edi)    \n\t"
+                           "movq %%mm2, %%mm4       \n\t" /* 3 3 3 3 2 2 2 2 */
+                           "punpckldq %%mm2, %%mm2  \n\t" /* 2 2 2 2 2 2 2 2 */
+                           "punpckhdq %%mm4, %%mm4  \n\t" /* 3 3 3 3 3 3 3 3 */
+                           "movq %%mm2, 16(%%edi)   \n\t"
+                           "subl $4, %%esi          \n\t"
+                           "movq %%mm4, 24(%%edi)   \n\t"
+                           "subl $32, %%edi         \n\t"
+                           "subl $4, %%ecx          \n\t"
+                           "jnz .loop1_pass0        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width_mmx)  /* ecx */
+
+#if 0  /* %mm0, ..., %mm4 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0", "%mm1", "%mm2"       /* clobber list */
+                           , "%mm3", "%mm4"
+#endif
+                        );
+                     }
+
+                     sptr -= width_mmx;
+                     dp -= width_mmx*8;
+                     for (i = width; i; i--)
+                     {
+                        int j;
+
+                       /* I simplified this part in version 1.0.4e
+                        * here and in several other instances where
+                        * pixel_bytes == 1  -- GR-P
+                        *
+                        * Original code:
+                        *
+                        * png_byte v[8];
+                        * png_memcpy(v, sptr, pixel_bytes);
+                        * for (j = 0; j < png_pass_inc[pass]; j++)
+                        * {
+                        *    png_memcpy(dp, v, pixel_bytes);
+                        *    dp -= pixel_bytes;
+                        * }
+                        * sptr -= pixel_bytes;
+                        *
+                        * Replacement code is in the next three lines:
+                        */
+
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           *dp-- = *sptr;
+                        }
+                        --sptr;
+                     }
+                  }
+                  else if (((pass == 2) || (pass == 3)) && width)
+                  {
+                     int width_mmx = ((width >> 2) << 2);
+                     width -= width_mmx;        /* 0-3 pixels => 0-3 bytes */
+                     if (width_mmx)
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $3, %%esi          \n\t"
+                           "subl $15, %%edi         \n\t"
+
+                        ".loop1_pass2:              \n\t"
+                           "movd (%%esi), %%mm0     \n\t" /* x x x x 3 2 1 0 */
+                           "punpcklbw %%mm0, %%mm0  \n\t" /* 3 3 2 2 1 1 0 0 */
+                           "movq %%mm0, %%mm1       \n\t" /* 3 3 2 2 1 1 0 0 */
+                           "punpcklwd %%mm0, %%mm0  \n\t" /* 1 1 1 1 0 0 0 0 */
+                           "punpckhwd %%mm1, %%mm1  \n\t" /* 3 3 3 3 2 2 2 2 */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "subl $4, %%esi          \n\t"
+                           "movq %%mm1, 8(%%edi)    \n\t"
+                           "subl $16, %%edi         \n\t"
+                           "subl $4, %%ecx          \n\t"
+                           "jnz .loop1_pass2        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width_mmx)  /* ecx */
+
+#if 0  /* %mm0, %mm1 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0", "%mm1"               /* clobber list */
+#endif
+                        );
+                     }
+
+                     sptr -= width_mmx;
+                     dp -= width_mmx*4;
+                     for (i = width; i; i--)
+                     {
+                        int j;
+
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           *dp-- = *sptr;
+                        }
+                        --sptr;
+                     }
+                  }
+                  else if (width)  /* && ((pass == 4) || (pass == 5)) */
+                  {
+                     int width_mmx = ((width >> 3) << 3);
+                     width -= width_mmx;        /* 0-3 pixels => 0-3 bytes */
+                     if (width_mmx)
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $7, %%esi          \n\t"
+                           "subl $15, %%edi         \n\t"
+
+                        ".loop1_pass4:              \n\t"
+                           "movq (%%esi), %%mm0     \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "movq %%mm0, %%mm1       \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "punpcklbw %%mm0, %%mm0  \n\t" /* 3 3 2 2 1 1 0 0 */
+                           "punpckhbw %%mm1, %%mm1  \n\t" /* 7 7 6 6 5 5 4 4 */
+                           "movq %%mm1, 8(%%edi)    \n\t"
+                           "subl $8, %%esi          \n\t"
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "subl $16, %%edi         \n\t"
+                           "subl $8, %%ecx          \n\t"
+                           "jnz .loop1_pass4        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (none) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width_mmx)  /* ecx */
+
+#if 0  /* %mm0, %mm1 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0", "%mm1"               /* clobber list */
+#endif
+                        );
+                     }
+
+                     sptr -= width_mmx;
+                     dp -= width_mmx*2;
+                     for (i = width; i; i--)
+                     {
+                        int j;
+
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           *dp-- = *sptr;
+                        }
+                        --sptr;
+                     }
+                  }
+               } /* end of pixel_bytes == 1 */
+
+               //--------------------------------------------------------------
+               else if (pixel_bytes == 2)
+               {
+                  if (((pass == 0) || (pass == 1)) && width)
+                  {
+                     int width_mmx = ((width >> 1) << 1);
+                     width -= width_mmx;        /* 0,1 pixels => 0,2 bytes */
+                     if (width_mmx)
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $2, %%esi          \n\t"
+                           "subl $30, %%edi         \n\t"
+
+                        ".loop2_pass0:              \n\t"
+                           "movd (%%esi), %%mm0     \n\t" /* x x x x 3 2 1 0 */
+                           "punpcklwd %%mm0, %%mm0  \n\t" /* 3 2 3 2 1 0 1 0 */
+                           "movq %%mm0, %%mm1       \n\t" /* 3 2 3 2 1 0 1 0 */
+                           "punpckldq %%mm0, %%mm0  \n\t" /* 1 0 1 0 1 0 1 0 */
+                           "punpckhdq %%mm1, %%mm1  \n\t" /* 3 2 3 2 3 2 3 2 */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "movq %%mm0, 8(%%edi)    \n\t"
+                           "movq %%mm1, 16(%%edi)   \n\t"
+                           "subl $4, %%esi          \n\t"
+                           "movq %%mm1, 24(%%edi)   \n\t"
+                           "subl $32, %%edi         \n\t"
+                           "subl $2, %%ecx          \n\t"
+                           "jnz .loop2_pass0        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width_mmx)  /* ecx */
+
+#if 0  /* %mm0, %mm1 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0", "%mm1"               /* clobber list */
+#endif
+                        );
+                     }
+
+                     sptr -= (width_mmx*2 - 2); /* sign fixed */
+                     dp -= (width_mmx*16 - 2);  /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 2;
+                        png_memcpy(v, sptr, 2);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 2;
+                           png_memcpy(dp, v, 2);
+                        }
+                     }
+                  }
+                  else if (((pass == 2) || (pass == 3)) && width)
+                  {
+                     int width_mmx = ((width >> 1) << 1) ;
+                     width -= width_mmx;        /* 0,1 pixels => 0,2 bytes */
+                     if (width_mmx)
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $2, %%esi          \n\t"
+                           "subl $14, %%edi         \n\t"
+
+                        ".loop2_pass2:              \n\t"
+                           "movd (%%esi), %%mm0     \n\t" /* x x x x 3 2 1 0 */
+                           "punpcklwd %%mm0, %%mm0  \n\t" /* 3 2 3 2 1 0 1 0 */
+                           "movq %%mm0, %%mm1       \n\t" /* 3 2 3 2 1 0 1 0 */
+                           "punpckldq %%mm0, %%mm0  \n\t" /* 1 0 1 0 1 0 1 0 */
+                           "punpckhdq %%mm1, %%mm1  \n\t" /* 3 2 3 2 3 2 3 2 */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "subl $4, %%esi          \n\t"
+                           "movq %%mm1, 8(%%edi)    \n\t"
+                           "subl $16, %%edi         \n\t"
+                           "subl $2, %%ecx          \n\t"
+                           "jnz .loop2_pass2        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width_mmx)  /* ecx */
+
+#if 0  /* %mm0, %mm1 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0", "%mm1"               /* clobber list */
+#endif
+                        );
+                     }
+
+                     sptr -= (width_mmx*2 - 2); /* sign fixed */
+                     dp -= (width_mmx*8 - 2);   /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 2;
+                        png_memcpy(v, sptr, 2);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 2;
+                           png_memcpy(dp, v, 2);
+                        }
+                     }
+                  }
+                  else if (width)  /* pass == 4 or 5 */
+                  {
+                     int width_mmx = ((width >> 1) << 1) ;
+                     width -= width_mmx;        /* 0,1 pixels => 0,2 bytes */
+                     if (width_mmx)
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $2, %%esi          \n\t"
+                           "subl $6, %%edi          \n\t"
+
+                        ".loop2_pass4:              \n\t"
+                           "movd (%%esi), %%mm0     \n\t" /* x x x x 3 2 1 0 */
+                           "punpcklwd %%mm0, %%mm0  \n\t" /* 3 2 3 2 1 0 1 0 */
+                           "subl $4, %%esi          \n\t"
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "subl $8, %%edi          \n\t"
+                           "subl $2, %%ecx          \n\t"
+                           "jnz .loop2_pass4        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width_mmx)  /* ecx */
+
+#if 0  /* %mm0 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0"                       /* clobber list */
+#endif
+                        );
+                     }
+
+                     sptr -= (width_mmx*2 - 2); /* sign fixed */
+                     dp -= (width_mmx*4 - 2);   /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 2;
+                        png_memcpy(v, sptr, 2);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 2;
+                           png_memcpy(dp, v, 2);
+                        }
+                     }
+                  }
+               } /* end of pixel_bytes == 2 */
+
+               //--------------------------------------------------------------
+               else if (pixel_bytes == 4)
+               {
+                  if (((pass == 0) || (pass == 1)) && width)
+                  {
+                     int width_mmx = ((width >> 1) << 1);
+                     width -= width_mmx;        /* 0,1 pixels => 0,4 bytes */
+                     if (width_mmx)
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $4, %%esi          \n\t"
+                           "subl $60, %%edi         \n\t"
+
+                        ".loop4_pass0:              \n\t"
+                           "movq (%%esi), %%mm0     \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "movq %%mm0, %%mm1       \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "punpckldq %%mm0, %%mm0  \n\t" /* 3 2 1 0 3 2 1 0 */
+                           "punpckhdq %%mm1, %%mm1  \n\t" /* 7 6 5 4 7 6 5 4 */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "movq %%mm0, 8(%%edi)    \n\t"
+                           "movq %%mm0, 16(%%edi)   \n\t"
+                           "movq %%mm0, 24(%%edi)   \n\t"
+                           "movq %%mm1, 32(%%edi)   \n\t"
+                           "movq %%mm1, 40(%%edi)   \n\t"
+                           "movq %%mm1, 48(%%edi)   \n\t"
+                           "subl $8, %%esi          \n\t"
+                           "movq %%mm1, 56(%%edi)   \n\t"
+                           "subl $64, %%edi         \n\t"
+                           "subl $2, %%ecx          \n\t"
+                           "jnz .loop4_pass0        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width_mmx)  /* ecx */
+
+#if 0  /* %mm0, %mm1 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0", "%mm1"               /* clobber list */
+#endif
+                        );
+                     }
+
+                     sptr -= (width_mmx*4 - 4); /* sign fixed */
+                     dp -= (width_mmx*32 - 4);  /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 4;
+                        png_memcpy(v, sptr, 4);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 4;
+                           png_memcpy(dp, v, 4);
+                        }
+                     }
+                  }
+                  else if (((pass == 2) || (pass == 3)) && width)
+                  {
+                     int width_mmx = ((width >> 1) << 1);
+                     width -= width_mmx;        /* 0,1 pixels => 0,4 bytes */
+                     if (width_mmx)
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $4, %%esi          \n\t"
+                           "subl $28, %%edi         \n\t"
+
+                        ".loop4_pass2:              \n\t"
+                           "movq (%%esi), %%mm0     \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "movq %%mm0, %%mm1       \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "punpckldq %%mm0, %%mm0  \n\t" /* 3 2 1 0 3 2 1 0 */
+                           "punpckhdq %%mm1, %%mm1  \n\t" /* 7 6 5 4 7 6 5 4 */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "movq %%mm0, 8(%%edi)    \n\t"
+                           "movq %%mm1, 16(%%edi)   \n\t"
+                           "movq %%mm1, 24(%%edi)   \n\t"
+                           "subl $8, %%esi          \n\t"
+                           "subl $32, %%edi         \n\t"
+                           "subl $2, %%ecx          \n\t"
+                           "jnz .loop4_pass2        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width_mmx)  /* ecx */
+
+#if 0  /* %mm0, %mm1 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0", "%mm1"               /* clobber list */
+#endif
+                        );
+                     }
+
+                     sptr -= (width_mmx*4 - 4); /* sign fixed */
+                     dp -= (width_mmx*16 - 4);  /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 4;
+                        png_memcpy(v, sptr, 4);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 4;
+                           png_memcpy(dp, v, 4);
+                        }
+                     }
+                  }
+                  else if (width)  /* pass == 4 or 5 */
+                  {
+                     int width_mmx = ((width >> 1) << 1) ;
+                     width -= width_mmx;        /* 0,1 pixels => 0,4 bytes */
+                     if (width_mmx)
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $4, %%esi          \n\t"
+                           "subl $12, %%edi         \n\t"
+
+                        ".loop4_pass4:              \n\t"
+                           "movq (%%esi), %%mm0     \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "movq %%mm0, %%mm1       \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "punpckldq %%mm0, %%mm0  \n\t" /* 3 2 1 0 3 2 1 0 */
+                           "punpckhdq %%mm1, %%mm1  \n\t" /* 7 6 5 4 7 6 5 4 */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "subl $8, %%esi          \n\t"
+                           "movq %%mm1, 8(%%edi)    \n\t"
+                           "subl $16, %%edi         \n\t"
+                           "subl $2, %%ecx          \n\t"
+                           "jnz .loop4_pass4        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width_mmx)  /* ecx */
+
+#if 0  /* %mm0, %mm1 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0", "%mm1"               /* clobber list */
+#endif
+                        );
+                     }
+
+                     sptr -= (width_mmx*4 - 4); /* sign fixed */
+                     dp -= (width_mmx*8 - 4);   /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 4;
+                        png_memcpy(v, sptr, 4);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 4;
+                           png_memcpy(dp, v, 4);
+                        }
+                     }
+                  }
+               } /* end of pixel_bytes == 4 */
+
+               //--------------------------------------------------------------
+               else if (pixel_bytes == 8)
+               {
+/* GRR TEST:  should work, but needs testing (special 64-bit version of rpng2?) */
+                  /* GRR NOTE:  no need to combine passes here! */
+                  if (((pass == 0) || (pass == 1)) && width)
+                  {
+                     int dummy_value_c;  /* fix 'forbidden register spilled' */
+                     int dummy_value_S;
+                     int dummy_value_D;
+
+                     /* source is 8-byte RRGGBBAA */
+                     /* dest is 64-byte RRGGBBAA RRGGBBAA RRGGBBAA RRGGBBAA ... */
+                     __asm__ __volatile__ (
+                        "subl $56, %%edi         \n\t" /* start of last block */
+
+                     ".loop8_pass0:              \n\t"
+                        "movq (%%esi), %%mm0     \n\t" /* 7 6 5 4 3 2 1 0 */
+                        "movq %%mm0, (%%edi)     \n\t"
+                        "movq %%mm0, 8(%%edi)    \n\t"
+                        "movq %%mm0, 16(%%edi)   \n\t"
+                        "movq %%mm0, 24(%%edi)   \n\t"
+                        "movq %%mm0, 32(%%edi)   \n\t"
+                        "movq %%mm0, 40(%%edi)   \n\t"
+                        "movq %%mm0, 48(%%edi)   \n\t"
+                        "subl $8, %%esi          \n\t"
+                        "movq %%mm0, 56(%%edi)   \n\t"
+                        "subl $64, %%edi         \n\t"
+                        "decl %%ecx              \n\t"
+                        "jnz .loop8_pass0        \n\t"
+                        "EMMS                    \n\t" /* DONE */
+
+                        : "=c" (dummy_value_c),        /* output regs (dummy) */
+                          "=S" (dummy_value_S),
+                          "=D" (dummy_value_D)
+
+                        : "1" (sptr),      /* esi      // input regs */
+                          "2" (dp),        /* edi */
+                          "0" (width)      /* ecx */
+
+#if 0  /* %mm0 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                        : "%mm0"                       /* clobber list */
+#endif
+                     );
+                  }
+                  else if (((pass == 2) || (pass == 3)) && width)
+                  {
+                     /* source is 8-byte RRGGBBAA */
+                     /* dest is 32-byte RRGGBBAA RRGGBBAA RRGGBBAA RRGGBBAA */
+                     /* (recall that expansion is _in place_:  sptr and dp */
+                     /*  both point at locations within same row buffer) */
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $24, %%edi         \n\t" /* start of last block */
+
+                        ".loop8_pass2:              \n\t"
+                           "movq (%%esi), %%mm0     \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "movq %%mm0, 8(%%edi)    \n\t"
+                           "movq %%mm0, 16(%%edi)   \n\t"
+                           "subl $8, %%esi          \n\t"
+                           "movq %%mm0, 24(%%edi)   \n\t"
+                           "subl $32, %%edi         \n\t"
+                           "decl %%ecx              \n\t"
+                           "jnz .loop8_pass2        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width)      /* ecx */
+
+#if 0  /* %mm0 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0"                       /* clobber list */
+#endif
+                        );
+                     }
+                  }
+                  else if (width)  /* pass == 4 or 5 */
+                  {
+                     /* source is 8-byte RRGGBBAA */
+                     /* dest is 16-byte RRGGBBAA RRGGBBAA */
+                     {
+                        int dummy_value_c;  /* fix 'forbidden register spilled' */
+                        int dummy_value_S;
+                        int dummy_value_D;
+
+                        __asm__ __volatile__ (
+                           "subl $8, %%edi          \n\t" /* start of last block */
+
+                        ".loop8_pass4:              \n\t"
+                           "movq (%%esi), %%mm0     \n\t" /* 7 6 5 4 3 2 1 0 */
+                           "movq %%mm0, (%%edi)     \n\t"
+                           "subl $8, %%esi          \n\t"
+                           "movq %%mm0, 8(%%edi)    \n\t"
+                           "subl $16, %%edi         \n\t"
+                           "decl %%ecx              \n\t"
+                           "jnz .loop8_pass4        \n\t"
+                           "EMMS                    \n\t" /* DONE */
+
+                           : "=c" (dummy_value_c),        /* output regs (dummy) */
+                             "=S" (dummy_value_S),
+                             "=D" (dummy_value_D)
+
+                           : "1" (sptr),      /* esi      // input regs */
+                             "2" (dp),        /* edi */
+                             "0" (width)      /* ecx */
+
+#if 0  /* %mm0 not supported by gcc 2.7.2.3 or egcs 1.1 */
+                           : "%mm0"                       /* clobber list */
+#endif
+                        );
+                     }
+                  }
+
+               } /* end of pixel_bytes == 8 */
+
+               //--------------------------------------------------------------
+               else if (pixel_bytes == 6)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, 6);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, 6);
+                        dp -= 6;
+                     }
+                     sptr -= 6;
+                  }
+               } /* end of pixel_bytes == 6 */
+
+               //--------------------------------------------------------------
+               else
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, pixel_bytes);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, pixel_bytes);
+                        dp -= pixel_bytes;
+                     }
+                     sptr-= pixel_bytes;
+                  }
+               }
+            } /* end of _mmx_supported ======================================== */
+
+            else /* MMX not supported:  use modified C code - takes advantage
+                  *   of inlining of png_memcpy for a constant */
+                 /* GRR 19991007:  does it?  or should pixel_bytes in each
+                  *   block be replaced with immediate value (e.g., 1)? */
+                 /* GRR 19991017:  replaced with constants in each case */
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+            {
+               if (pixel_bytes == 1)
+               {
+                  for (i = width; i; i--)
+                  {
+                     int j;
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        *dp-- = *sptr;
+                     }
+                     --sptr;
+                  }
+               }
+               else if (pixel_bytes == 3)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, 3);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, 3);
+                        dp -= 3;
+                     }
+                     sptr -= 3;
+                  }
+               }
+               else if (pixel_bytes == 2)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, 2);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, 2);
+                        dp -= 2;
+                     }
+                     sptr -= 2;
+                  }
+               }
+               else if (pixel_bytes == 4)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, 4);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+#ifdef PNG_DEBUG
+                        if (dp < row || dp+3 > row+png_ptr->row_buf_size)
+                        {
+                           printf("dp out of bounds: row=%d, dp=%d, rp=%d\n",
+                             row, dp, row+png_ptr->row_buf_size);
+                           printf("row_buf=%d\n",png_ptr->row_buf_size);
+                        }
+#endif
+                        png_memcpy(dp, v, 4);
+                        dp -= 4;
+                     }
+                     sptr -= 4;
+                  }
+               }
+               else if (pixel_bytes == 6)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, 6);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, 6);
+                        dp -= 6;
+                     }
+                     sptr -= 6;
+                  }
+               }
+               else if (pixel_bytes == 8)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, 8);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, 8);
+                        dp -= 8;
+                     }
+                     sptr -= 8;
+                  }
+               }
+               else     /* GRR:  should never be reached */
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, pixel_bytes);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, pixel_bytes);
+                        dp -= pixel_bytes;
+                     }
+                     sptr -= pixel_bytes;
+                  }
+               }
+
+            } /* end if (MMX not supported) */
+            break;
+         }
+      } /* end switch (row_info->pixel_depth) */
+
+      row_info->width = final_width;
+
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,final_width);
+   }
+
+} /* end png_do_read_interlace() */
+
+#endif /* PNG_HAVE_ASSEMBLER_READ_INTERLACE */
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+
+
+
+#if defined(PNG_HAVE_ASSEMBLER_READ_FILTER_ROW)
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+
+/* These variables are utilized in the functions below.  They are declared */
+/* globally here to ensure alignment on 8-byte boundaries. */
+
+union uAll {
+   long long use;
+   double  align;
+} _LBCarryMask = {0x0101010101010101LL},
+  _HBClearMask = {0x7f7f7f7f7f7f7f7fLL},
+  _ActiveMask, _ActiveMask2, _ActiveMaskEnd, _ShiftBpp, _ShiftRem;
+
+#ifdef PNG_THREAD_UNSAFE_OK
+/*===========================================================================*/
+/*                                                                           */
+/*           P N G _ R E A D _ F I L T E R _ R O W _ M M X _ A V G           */
+/*                                                                           */
+/*===========================================================================*/
+
+/* Optimized code for PNG Average filter decoder */
+
+static void /* PRIVATE */
+png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row,
+                            png_bytep prev_row)
+{
+   int bpp;
+   int dummy_value_c;   /* fix 'forbidden register 2 (cx) was spilled' error */
+   int dummy_value_S;
+   int dummy_value_D;
+
+   bpp = (row_info->pixel_depth + 7) >> 3;  /* get # bytes per pixel */
+   _FullLength  = row_info->rowbytes;       /* # of bytes to filter */
+
+   __asm__ __volatile__ (
+      /* initialize address pointers and offset */
+#ifdef __PIC__
+      "pushl %%ebx                 \n\t" /* save index to Global Offset Table */
+#endif
+/*pre "movl row, %%edi             \n\t" */ /* edi:  Avg(x) */
+      "xorl %%ebx, %%ebx           \n\t" /* ebx:  x */
+      "movl %%edi, %%edx           \n\t"
+/*pre "movl prev_row, %%esi        \n\t" */ /* esi:  Prior(x) */
+/*pre "subl bpp, %%edx             \n\t" */ /* (bpp is preloaded into ecx) */
+      "subl %%ecx, %%edx           \n\t" /* edx:  Raw(x-bpp) */
+
+      "xorl %%eax,%%eax            \n\t"
+
+      /* Compute the Raw value for the first bpp bytes */
+      /*    Raw(x) = Avg(x) + (Prior(x)/2) */
+   "avg_rlp:                       \n\t"
+      "movb (%%esi,%%ebx,),%%al    \n\t" /* load al with Prior(x) */
+      "incl %%ebx                  \n\t"
+      "shrb %%al                   \n\t" /* divide by 2 */
+      "addb -1(%%edi,%%ebx,),%%al  \n\t" /* add Avg(x); -1 to offset inc ebx */
+/* pre "cmpl bpp, %%ebx             \n\t" */ /* (bpp is preloaded into ecx) */
+      "cmpl %%ecx, %%ebx           \n\t"
+      "movb %%al,-1(%%edi,%%ebx,)  \n\t" /* write Raw(x); -1 to offset inc ebx */
+      "jb avg_rlp                  \n\t" /* mov does not affect flags */
+
+      /* get # of bytes to alignment */
+      "movl %%edi, _dif            \n\t" /* take start of row */
+      "addl %%ebx, _dif            \n\t" /* add bpp */
+      "addl $0xf, _dif             \n\t" /* add 7+8 to incr past alignment bdry */
+      "andl $0xfffffff8, _dif      \n\t" /* mask to alignment boundary */
+      "subl %%edi, _dif            \n\t" /* subtract from start => value ebx at */
+      "jz avg_go                   \n\t" /*  alignment */
+
+      /* fix alignment */
+      /* Compute the Raw value for the bytes up to the alignment boundary */
+      /*    Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2) */
+      "xorl %%ecx, %%ecx           \n\t"
+
+   "avg_lp1:                       \n\t"
+      "xorl %%eax, %%eax           \n\t"
+      "movb (%%esi,%%ebx,), %%cl   \n\t" /* load cl with Prior(x) */
+      "movb (%%edx,%%ebx,), %%al   \n\t" /* load al with Raw(x-bpp) */
+      "addw %%cx, %%ax             \n\t"
+      "incl %%ebx                  \n\t"
+      "shrw %%ax                   \n\t" /* divide by 2 */
+      "addb -1(%%edi,%%ebx,), %%al \n\t" /* add Avg(x); -1 to offset inc ebx */
+      "cmpl _dif, %%ebx            \n\t" /* check if at alignment boundary */
+      "movb %%al, -1(%%edi,%%ebx,) \n\t" /* write Raw(x); -1 to offset inc ebx */
+      "jb avg_lp1                  \n\t" /* repeat until at alignment boundary */
+
+   "avg_go:                        \n\t"
+      "movl _FullLength, %%eax     \n\t"
+      "movl %%eax, %%ecx           \n\t"
+      "subl %%ebx, %%eax           \n\t" /* subtract alignment fix */
+      "andl $0x00000007, %%eax     \n\t" /* calc bytes over mult of 8 */
+      "subl %%eax, %%ecx           \n\t" /* drop over bytes from original length */
+      "movl %%ecx, _MMXLength      \n\t"
+#ifdef __PIC__
+      "popl %%ebx                  \n\t" /* restore index to Global Offset Table */
+#endif
+
+      : "=c" (dummy_value_c),            /* output regs (dummy) */
+        "=S" (dummy_value_S),
+        "=D" (dummy_value_D)
+
+      : "0" (bpp),       /* ecx          // input regs */
+        "1" (prev_row),  /* esi */
+        "2" (row)        /* edi */
+
+      : "%eax", "%edx"                   /* clobber list */
+#ifndef __PIC__
+      , "%ebx"
+#endif
+      /* GRR: INCLUDE "memory" as clobbered? (_dif, _MMXLength) */
+      /* (seems to work fine without...) */
+   );
+
+   /* now do the math for the rest of the row */
+   switch (bpp)
+   {
+      case 3:
+      {
+         _ActiveMask.use  = 0x0000000000ffffffLL;
+         _ShiftBpp.use = 24;    /* == 3 * 8 */
+         _ShiftRem.use = 40;    /* == 64 - 24 */
+
+         __asm__ __volatile__ (
+            /* re-init address pointers and offset */
+            "movq _ActiveMask, %%mm7      \n\t"
+            "movl _dif, %%ecx             \n\t" /* ecx:  x = offset to */
+            "movq _LBCarryMask, %%mm5     \n\t" /*  alignment boundary */
+/* preload  "movl row, %%edi              \n\t" // edi:  Avg(x) */
+            "movq _HBClearMask, %%mm4     \n\t"
+/* preload  "movl prev_row, %%esi         \n\t" // esi:  Prior(x) */
+
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%ecx,), %%mm2 \n\t" /* load previous aligned 8 bytes */
+                                                /* (correct pos. in loop below) */
+         "avg_3lp:                        \n\t"
+            "movq (%%edi,%%ecx,), %%mm0   \n\t" /* load mm0 with Avg(x) */
+            "movq %%mm5, %%mm3            \n\t"
+            "psrlq _ShiftRem, %%mm2       \n\t" /* correct position Raw(x-bpp) */
+                                                /* data */
+            "movq (%%esi,%%ecx,), %%mm1   \n\t" /* load mm1 with Prior(x) */
+            "movq %%mm7, %%mm6            \n\t"
+            "pand %%mm1, %%mm3            \n\t" /* get lsb for each prev_row byte */
+            "psrlq $1, %%mm1              \n\t" /* divide prev_row bytes by 2 */
+            "pand  %%mm4, %%mm1           \n\t" /* clear invalid bit 7 of each */
+                                                /* byte */
+            "paddb %%mm1, %%mm0           \n\t" /* add (Prev_row/2) to Avg for */
+                                                /* each byte */
+            /* add 1st active group (Raw(x-bpp)/2) to average with LBCarry */
+            "movq %%mm3, %%mm1            \n\t" /* now use mm1 for getting */
+                                                /* LBCarrys */
+            "pand %%mm2, %%mm1            \n\t" /* get LBCarrys for each byte */
+                                                /* where both */
+                               /* lsb's were == 1 (only valid for active group) */
+            "psrlq $1, %%mm2              \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm2           \n\t" /* clear invalid bit 7 of each */
+                                                /* byte */
+            "paddb %%mm1, %%mm2           \n\t" /* add LBCarrys to (Raw(x-bpp)/2) */
+                                                /* for each byte */
+            "pand %%mm6, %%mm2            \n\t" /* leave only Active Group 1 */
+                                                /* bytes to add to Avg */
+            "paddb %%mm2, %%mm0           \n\t" /* add (Raw/2) + LBCarrys to */
+                                                /* Avg for each Active */
+                               /*  byte */
+            /* add 2nd active group (Raw(x-bpp)/2) to average with _LBCarry */
+            "psllq _ShiftBpp, %%mm6       \n\t" /* shift the mm6 mask to cover */
+                                                /* bytes 3-5 */
+            "movq %%mm0, %%mm2            \n\t" /* mov updated Raws to mm2 */
+            "psllq _ShiftBpp, %%mm2       \n\t" /* shift data to pos. correctly */
+            "movq %%mm3, %%mm1            \n\t" /* now use mm1 for getting */
+                                                /* LBCarrys */
+            "pand %%mm2, %%mm1            \n\t" /* get LBCarrys for each byte */
+                                                /* where both */
+                               /* lsb's were == 1 (only valid for active group) */
+            "psrlq $1, %%mm2              \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm2           \n\t" /* clear invalid bit 7 of each */
+                                                /* byte */
+            "paddb %%mm1, %%mm2           \n\t" /* add LBCarrys to (Raw(x-bpp)/2) */
+                                                /* for each byte */
+            "pand %%mm6, %%mm2            \n\t" /* leave only Active Group 2 */
+                                                /* bytes to add to Avg */
+            "paddb %%mm2, %%mm0           \n\t" /* add (Raw/2) + LBCarrys to */
+                                                /* Avg for each Active */
+                               /*  byte */
+
+            /* add 3rd active group (Raw(x-bpp)/2) to average with _LBCarry */
+            "psllq _ShiftBpp, %%mm6       \n\t" /* shift mm6 mask to cover last */
+                                                /* two */
+                                 /* bytes */
+            "movq %%mm0, %%mm2            \n\t" /* mov updated Raws to mm2 */
+            "psllq _ShiftBpp, %%mm2       \n\t" /* shift data to pos. correctly */
+                              /* Data only needs to be shifted once here to */
+                              /* get the correct x-bpp offset. */
+            "movq %%mm3, %%mm1            \n\t" /* now use mm1 for getting */
+                                                /* LBCarrys */
+            "pand %%mm2, %%mm1            \n\t" /* get LBCarrys for each byte */
+                                                /* where both */
+                              /* lsb's were == 1 (only valid for active group) */
+            "psrlq $1, %%mm2              \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm2           \n\t" /* clear invalid bit 7 of each */
+                                                /* byte */
+            "paddb %%mm1, %%mm2           \n\t" /* add LBCarrys to (Raw(x-bpp)/2) */
+                                                /* for each byte */
+            "pand %%mm6, %%mm2            \n\t" /* leave only Active Group 2 */
+                                                /* bytes to add to Avg */
+            "addl $8, %%ecx               \n\t"
+            "paddb %%mm2, %%mm0           \n\t" /* add (Raw/2) + LBCarrys to */
+                                                /* Avg for each Active */
+                                                /* byte */
+            /* now ready to write back to memory */
+            "movq %%mm0, -8(%%edi,%%ecx,) \n\t"
+            /* move updated Raw(x) to use as Raw(x-bpp) for next loop */
+            "cmpl _MMXLength, %%ecx       \n\t"
+            "movq %%mm0, %%mm2            \n\t" /* mov updated Raw(x) to mm2 */
+            "jb avg_3lp                   \n\t"
+
+            : "=S" (dummy_value_S),             /* output regs (dummy) */
+              "=D" (dummy_value_D)
+
+            : "0" (prev_row),  /* esi           // input regs */
+              "1" (row)        /* edi */
+
+            : "%ecx"                            /* clobber list */
+#if 0  /* %mm0, ..., %mm7 not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm2", "%mm3"
+            , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;  /* end 3 bpp */
+
+      case 6:
+      case 4:
+      //case 7:   /* who wrote this?  PNG doesn't support 5 or 7 bytes/pixel */
+      //case 5:   /* GRR BOGUS */
+      {
+         _ActiveMask.use  = 0xffffffffffffffffLL; /* use shift below to clear */
+                                                  /* appropriate inactive bytes */
+         _ShiftBpp.use = bpp << 3;
+         _ShiftRem.use = 64 - _ShiftBpp.use;
+
+         __asm__ __volatile__ (
+            "movq _HBClearMask, %%mm4    \n\t"
+
+            /* re-init address pointers and offset */
+            "movl _dif, %%ecx            \n\t" /* ecx:  x = offset to */
+                                               /* alignment boundary */
+
+            /* load _ActiveMask and clear all bytes except for 1st active group */
+            "movq _ActiveMask, %%mm7     \n\t"
+/* preload  "movl row, %%edi             \n\t" // edi:  Avg(x) */
+            "psrlq _ShiftRem, %%mm7      \n\t"
+/* preload  "movl prev_row, %%esi        \n\t" // esi:  Prior(x) */
+            "movq %%mm7, %%mm6           \n\t"
+            "movq _LBCarryMask, %%mm5    \n\t"
+            "psllq _ShiftBpp, %%mm6      \n\t" /* create mask for 2nd active */
+                                               /* group */
+
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%ecx,), %%mm2 \n\t" /* load previous aligned 8 bytes */
+                                          /* (we correct pos. in loop below) */
+         "avg_4lp:                       \n\t"
+            "movq (%%edi,%%ecx,), %%mm0  \n\t"
+            "psrlq _ShiftRem, %%mm2      \n\t" /* shift data to pos. correctly */
+            "movq (%%esi,%%ecx,), %%mm1  \n\t"
+            /* add (Prev_row/2) to average */
+            "movq %%mm5, %%mm3           \n\t"
+            "pand %%mm1, %%mm3           \n\t" /* get lsb for each prev_row byte */
+            "psrlq $1, %%mm1             \n\t" /* divide prev_row bytes by 2 */
+            "pand  %%mm4, %%mm1          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "paddb %%mm1, %%mm0          \n\t" /* add (Prev_row/2) to Avg for */
+                                               /* each byte */
+            /* add 1st active group (Raw(x-bpp)/2) to average with _LBCarry */
+            "movq %%mm3, %%mm1           \n\t" /* now use mm1 for getting */
+                                               /* LBCarrys */
+            "pand %%mm2, %%mm1           \n\t" /* get LBCarrys for each byte */
+                                               /* where both */
+                              /* lsb's were == 1 (only valid for active group) */
+            "psrlq $1, %%mm2             \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm2          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "paddb %%mm1, %%mm2          \n\t" /* add LBCarrys to (Raw(x-bpp)/2) */
+                                               /* for each byte */
+            "pand %%mm7, %%mm2           \n\t" /* leave only Active Group 1 */
+                                               /* bytes to add to Avg */
+            "paddb %%mm2, %%mm0          \n\t" /* add (Raw/2) + LBCarrys to Avg */
+                                               /* for each Active */
+                              /* byte */
+            /* add 2nd active group (Raw(x-bpp)/2) to average with _LBCarry */
+            "movq %%mm0, %%mm2           \n\t" /* mov updated Raws to mm2 */
+            "psllq _ShiftBpp, %%mm2      \n\t" /* shift data to pos. correctly */
+            "addl $8, %%ecx              \n\t"
+            "movq %%mm3, %%mm1           \n\t" /* now use mm1 for getting */
+                                               /* LBCarrys */
+            "pand %%mm2, %%mm1           \n\t" /* get LBCarrys for each byte */
+                                               /* where both */
+                              /* lsb's were == 1 (only valid for active group) */
+            "psrlq $1, %%mm2             \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm2          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "paddb %%mm1, %%mm2          \n\t" /* add LBCarrys to (Raw(x-bpp)/2) */
+                                               /* for each byte */
+            "pand %%mm6, %%mm2           \n\t" /* leave only Active Group 2 */
+                                               /* bytes to add to Avg */
+            "paddb %%mm2, %%mm0          \n\t" /* add (Raw/2) + LBCarrys to */
+                                               /* Avg for each Active */
+                              /* byte */
+            "cmpl _MMXLength, %%ecx      \n\t"
+            /* now ready to write back to memory */
+            "movq %%mm0, -8(%%edi,%%ecx,) \n\t"
+            /* prep Raw(x-bpp) for next loop */
+            "movq %%mm0, %%mm2           \n\t" /* mov updated Raws to mm2 */
+            "jb avg_4lp                  \n\t"
+
+            : "=S" (dummy_value_S),            /* output regs (dummy) */
+              "=D" (dummy_value_D)
+
+            : "0" (prev_row),  /* esi          // input regs */
+              "1" (row)        /* edi */
+
+            : "%ecx"                           /* clobber list */
+#if 0  /* %mm0, ..., %mm7 not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm2", "%mm3"
+            , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;  /* end 4,6 bpp */
+
+      case 2:
+      {
+         _ActiveMask.use  = 0x000000000000ffffLL;
+         _ShiftBpp.use = 16;   /* == 2 * 8 */
+         _ShiftRem.use = 48;   /* == 64 - 16 */
+
+         __asm__ __volatile__ (
+            /* load _ActiveMask */
+            "movq _ActiveMask, %%mm7     \n\t"
+            /* re-init address pointers and offset */
+            "movl _dif, %%ecx            \n\t" /* ecx:  x = offset to alignment */
+                                               /* boundary */
+            "movq _LBCarryMask, %%mm5    \n\t"
+/* preload  "movl row, %%edi             \n\t" // edi:  Avg(x) */
+            "movq _HBClearMask, %%mm4    \n\t"
+/* preload  "movl prev_row, %%esi        \n\t" // esi:  Prior(x) */
+
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%ecx,), %%mm2 \n\t" /* load previous aligned 8 bytes */
+                              /* (we correct pos. in loop below) */
+         "avg_2lp:                       \n\t"
+            "movq (%%edi,%%ecx,), %%mm0  \n\t"
+            "psrlq _ShiftRem, %%mm2      \n\t" /* shift data to pos. correctly */
+            "movq (%%esi,%%ecx,), %%mm1  \n\t" /*  (GRR BUGFIX:  was psllq) */
+            /* add (Prev_row/2) to average */
+            "movq %%mm5, %%mm3           \n\t"
+            "pand %%mm1, %%mm3           \n\t" /* get lsb for each prev_row byte */
+            "psrlq $1, %%mm1             \n\t" /* divide prev_row bytes by 2 */
+            "pand  %%mm4, %%mm1          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "movq %%mm7, %%mm6           \n\t"
+            "paddb %%mm1, %%mm0          \n\t" /* add (Prev_row/2) to Avg for */
+                                               /* each byte */
+
+            /* add 1st active group (Raw(x-bpp)/2) to average with _LBCarry */
+            "movq %%mm3, %%mm1           \n\t" /* now use mm1 for getting */
+                                               /* LBCarrys */
+            "pand %%mm2, %%mm1           \n\t" /* get LBCarrys for each byte */
+                                               /* where both */
+                                               /* lsb's were == 1 (only valid */
+                                               /* for active group) */
+            "psrlq $1, %%mm2             \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm2          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "paddb %%mm1, %%mm2          \n\t" /* add LBCarrys to (Raw(x-bpp)/2) */
+                                               /* for each byte */
+            "pand %%mm6, %%mm2           \n\t" /* leave only Active Group 1 */
+                                               /* bytes to add to Avg */
+            "paddb %%mm2, %%mm0          \n\t" /* add (Raw/2) + LBCarrys to Avg */
+                                               /* for each Active byte */
+
+            /* add 2nd active group (Raw(x-bpp)/2) to average with _LBCarry */
+            "psllq _ShiftBpp, %%mm6      \n\t" /* shift the mm6 mask to cover */
+                                               /* bytes 2 & 3 */
+            "movq %%mm0, %%mm2           \n\t" /* mov updated Raws to mm2 */
+            "psllq _ShiftBpp, %%mm2      \n\t" /* shift data to pos. correctly */
+            "movq %%mm3, %%mm1           \n\t" /* now use mm1 for getting */
+                                               /* LBCarrys */
+            "pand %%mm2, %%mm1           \n\t" /* get LBCarrys for each byte */
+                                               /* where both */
+                                               /* lsb's were == 1 (only valid */
+                                               /* for active group) */
+            "psrlq $1, %%mm2             \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm2          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "paddb %%mm1, %%mm2          \n\t" /* add LBCarrys to (Raw(x-bpp)/2) */
+                                               /* for each byte */
+            "pand %%mm6, %%mm2           \n\t" /* leave only Active Group 2 */
+                                               /* bytes to add to Avg */
+            "paddb %%mm2, %%mm0          \n\t" /* add (Raw/2) + LBCarrys to */
+                                               /* Avg for each Active byte */
+
+            /* add 3rd active group (Raw(x-bpp)/2) to average with _LBCarry */
+            "psllq _ShiftBpp, %%mm6      \n\t" /* shift the mm6 mask to cover */
+                                               /* bytes 4 & 5 */
+            "movq %%mm0, %%mm2           \n\t" /* mov updated Raws to mm2 */
+            "psllq _ShiftBpp, %%mm2      \n\t" /* shift data to pos. correctly */
+            "movq %%mm3, %%mm1           \n\t" /* now use mm1 for getting */
+                                               /* LBCarrys */
+            "pand %%mm2, %%mm1           \n\t" /* get LBCarrys for each byte */
+                                               /* where both lsb's were == 1 */
+                                               /* (only valid for active group) */
+            "psrlq $1, %%mm2             \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm2          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "paddb %%mm1, %%mm2          \n\t" /* add LBCarrys to (Raw(x-bpp)/2) */
+                                               /* for each byte */
+            "pand %%mm6, %%mm2           \n\t" /* leave only Active Group 2 */
+                                               /* bytes to add to Avg */
+            "paddb %%mm2, %%mm0          \n\t" /* add (Raw/2) + LBCarrys to */
+                                               /* Avg for each Active byte */
+
+            /* add 4th active group (Raw(x-bpp)/2) to average with _LBCarry */
+            "psllq _ShiftBpp, %%mm6      \n\t" /* shift the mm6 mask to cover */
+                                               /* bytes 6 & 7 */
+            "movq %%mm0, %%mm2           \n\t" /* mov updated Raws to mm2 */
+            "psllq _ShiftBpp, %%mm2      \n\t" /* shift data to pos. correctly */
+            "addl $8, %%ecx              \n\t"
+            "movq %%mm3, %%mm1           \n\t" /* now use mm1 for getting */
+                                               /* LBCarrys */
+            "pand %%mm2, %%mm1           \n\t" /* get LBCarrys for each byte */
+                                               /* where both */
+                                               /* lsb's were == 1 (only valid */
+                                               /* for active group) */
+            "psrlq $1, %%mm2             \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm2          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "paddb %%mm1, %%mm2          \n\t" /* add LBCarrys to (Raw(x-bpp)/2) */
+                                               /* for each byte */
+            "pand %%mm6, %%mm2           \n\t" /* leave only Active Group 2 */
+                                               /* bytes to add to Avg */
+            "paddb %%mm2, %%mm0          \n\t" /* add (Raw/2) + LBCarrys to */
+                                               /* Avg for each Active byte */
+
+            "cmpl _MMXLength, %%ecx      \n\t"
+            /* now ready to write back to memory */
+            "movq %%mm0, -8(%%edi,%%ecx,) \n\t"
+            /* prep Raw(x-bpp) for next loop */
+            "movq %%mm0, %%mm2           \n\t" /* mov updated Raws to mm2 */
+            "jb avg_2lp                  \n\t"
+
+            : "=S" (dummy_value_S),            /* output regs (dummy) */
+              "=D" (dummy_value_D)
+
+            : "0" (prev_row),  /* esi          // input regs */
+              "1" (row)        /* edi */
+
+            : "%ecx"                           /* clobber list */
+#if 0  /* %mm0, ..., %mm7 not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm2", "%mm3"
+            , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;  /* end 2 bpp */
+
+      case 1:
+      {
+         __asm__ __volatile__ (
+            /* re-init address pointers and offset */
+#ifdef __PIC__
+            "pushl %%ebx                 \n\t" /* save Global Offset Table index */
+#endif
+            "movl _dif, %%ebx            \n\t" /* ebx:  x = offset to alignment */
+                                               /* boundary */
+/* preload  "movl row, %%edi             \n\t" // edi:  Avg(x) */
+            "cmpl _FullLength, %%ebx     \n\t" /* test if offset at end of array */
+            "jnb avg_1end                \n\t"
+            /* do Paeth decode for remaining bytes */
+/* preload  "movl prev_row, %%esi        \n\t" // esi:  Prior(x) */
+            "movl %%edi, %%edx           \n\t"
+/* preload  "subl bpp, %%edx             \n\t" // (bpp is preloaded into ecx) */
+            "subl %%ecx, %%edx           \n\t" /* edx:  Raw(x-bpp) */
+            "xorl %%ecx, %%ecx           \n\t" /* zero ecx before using cl & cx */
+                                               /*  in loop below */
+         "avg_1lp:                       \n\t"
+            /* Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2) */
+            "xorl %%eax, %%eax           \n\t"
+            "movb (%%esi,%%ebx,), %%cl   \n\t" /* load cl with Prior(x) */
+            "movb (%%edx,%%ebx,), %%al   \n\t" /* load al with Raw(x-bpp) */
+            "addw %%cx, %%ax             \n\t"
+            "incl %%ebx                  \n\t"
+            "shrw %%ax                   \n\t" /* divide by 2 */
+            "addb -1(%%edi,%%ebx,), %%al \n\t" /* add Avg(x); -1 to offset */
+                                               /* inc ebx */
+            "cmpl _FullLength, %%ebx     \n\t" /* check if at end of array */
+            "movb %%al, -1(%%edi,%%ebx,) \n\t" /* write back Raw(x); */
+                         /* mov does not affect flags; -1 to offset inc ebx */
+            "jb avg_1lp                  \n\t"
+
+         "avg_1end:                      \n\t"
+#ifdef __PIC__
+            "popl %%ebx                  \n\t" /* Global Offset Table index */
+#endif
+
+            : "=c" (dummy_value_c),            /* output regs (dummy) */
+              "=S" (dummy_value_S),
+              "=D" (dummy_value_D)
+
+            : "0" (bpp),       /* ecx          // input regs */
+              "1" (prev_row),  /* esi */
+              "2" (row)        /* edi */
+
+            : "%eax", "%edx"                   /* clobber list */
+#ifndef __PIC__
+            , "%ebx"
+#endif
+         );
+      }
+      return;  /* end 1 bpp */
+
+      case 8:
+      {
+         __asm__ __volatile__ (
+            /* re-init address pointers and offset */
+            "movl _dif, %%ecx            \n\t" /* ecx:  x == offset to alignment */
+            "movq _LBCarryMask, %%mm5    \n\t" /*            boundary */
+/* preload  "movl row, %%edi             \n\t" // edi:  Avg(x) */
+            "movq _HBClearMask, %%mm4    \n\t"
+/* preload  "movl prev_row, %%esi        \n\t" // esi:  Prior(x) */
+
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%ecx,), %%mm2 \n\t" /* load previous aligned 8 bytes */
+                                      /* (NO NEED to correct pos. in loop below) */
+
+         "avg_8lp:                       \n\t"
+            "movq (%%edi,%%ecx,), %%mm0  \n\t"
+            "movq %%mm5, %%mm3           \n\t"
+            "movq (%%esi,%%ecx,), %%mm1  \n\t"
+            "addl $8, %%ecx              \n\t"
+            "pand %%mm1, %%mm3           \n\t" /* get lsb for each prev_row byte */
+            "psrlq $1, %%mm1             \n\t" /* divide prev_row bytes by 2 */
+            "pand %%mm2, %%mm3           \n\t" /* get LBCarrys for each byte */
+                                               /*  where both lsb's were == 1 */
+            "psrlq $1, %%mm2             \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm1          \n\t" /* clear invalid bit 7, each byte */
+            "paddb %%mm3, %%mm0          \n\t" /* add LBCarrys to Avg, each byte */
+            "pand  %%mm4, %%mm2          \n\t" /* clear invalid bit 7, each byte */
+            "paddb %%mm1, %%mm0          \n\t" /* add (Prev_row/2) to Avg, each */
+            "paddb %%mm2, %%mm0          \n\t" /* add (Raw/2) to Avg for each */
+            "cmpl _MMXLength, %%ecx      \n\t"
+            "movq %%mm0, -8(%%edi,%%ecx,) \n\t"
+            "movq %%mm0, %%mm2           \n\t" /* reuse as Raw(x-bpp) */
+            "jb avg_8lp                  \n\t"
+
+            : "=S" (dummy_value_S),            /* output regs (dummy) */
+              "=D" (dummy_value_D)
+
+            : "0" (prev_row),  /* esi          // input regs */
+              "1" (row)        /* edi */
+
+            : "%ecx"                           /* clobber list */
+#if 0  /* %mm0, ..., %mm5 not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm2"
+            , "%mm3", "%mm4", "%mm5"
+#endif
+         );
+      }
+      break;  /* end 8 bpp */
+
+      default:                  /* bpp greater than 8 (!= 1,2,3,4,[5],6,[7],8) */
+      {
+
+#ifdef PNG_DEBUG
+         /* GRR:  PRINT ERROR HERE:  SHOULD NEVER BE REACHED */
+        png_debug(1,
+        "Internal logic error in pnggccrd (png_read_filter_row_mmx_avg())\n");
+#endif
+
+#if 0
+        __asm__ __volatile__ (
+            "movq _LBCarryMask, %%mm5    \n\t"
+            /* re-init address pointers and offset */
+            "movl _dif, %%ebx            \n\t" /* ebx:  x = offset to */
+                                               /* alignment boundary */
+            "movl row, %%edi             \n\t" /* edi:  Avg(x) */
+            "movq _HBClearMask, %%mm4    \n\t"
+            "movl %%edi, %%edx           \n\t"
+            "movl prev_row, %%esi        \n\t" /* esi:  Prior(x) */
+            "subl bpp, %%edx             \n\t" /* edx:  Raw(x-bpp) */
+         "avg_Alp:                       \n\t"
+            "movq (%%edi,%%ebx,), %%mm0  \n\t"
+            "movq %%mm5, %%mm3           \n\t"
+            "movq (%%esi,%%ebx,), %%mm1  \n\t"
+            "pand %%mm1, %%mm3           \n\t" /* get lsb for each prev_row byte */
+            "movq (%%edx,%%ebx,), %%mm2  \n\t"
+            "psrlq $1, %%mm1             \n\t" /* divide prev_row bytes by 2 */
+            "pand %%mm2, %%mm3           \n\t" /* get LBCarrys for each byte */
+                                               /* where both lsb's were == 1 */
+            "psrlq $1, %%mm2             \n\t" /* divide raw bytes by 2 */
+            "pand  %%mm4, %%mm1          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "paddb %%mm3, %%mm0          \n\t" /* add LBCarrys to Avg for each */
+                                               /* byte */
+            "pand  %%mm4, %%mm2          \n\t" /* clear invalid bit 7 of each */
+                                               /* byte */
+            "paddb %%mm1, %%mm0          \n\t" /* add (Prev_row/2) to Avg for */
+                                               /* each byte */
+            "addl $8, %%ebx              \n\t"
+            "paddb %%mm2, %%mm0          \n\t" /* add (Raw/2) to Avg for each */
+                                               /* byte */
+            "cmpl _MMXLength, %%ebx      \n\t"
+            "movq %%mm0, -8(%%edi,%%ebx,) \n\t"
+            "jb avg_Alp                  \n\t"
+
+            : /* FIXASM: output regs/vars go here, e.g.:  "=m" (memory_var) */
+
+            : /* FIXASM: input regs, e.g.:  "c" (count), "S" (src), "D" (dest) */
+
+            : "%ebx", "%edx", "%edi", "%esi" /* CHECKASM: clobber list */
+         );
+#endif /* 0 - NEVER REACHED */
+      }
+      break;
+
+   } /* end switch (bpp) */
+
+   __asm__ __volatile__ (
+      /* MMX acceleration complete; now do clean-up */
+      /* check if any remaining bytes left to decode */
+#ifdef __PIC__
+      "pushl %%ebx                 \n\t" /* save index to Global Offset Table */
+#endif
+      "movl _MMXLength, %%ebx      \n\t" /* ebx:  x == offset bytes after MMX */
+/* pre "movl row, %%edi             \n\t" */ /* edi:  Avg(x) */
+      "cmpl _FullLength, %%ebx     \n\t" /* test if offset at end of array */
+      "jnb avg_end                 \n\t"
+
+      /* do Avg decode for remaining bytes */
+/*pre "movl prev_row, %%esi        \n\t" */ /* esi:  Prior(x) */
+      "movl %%edi, %%edx           \n\t"
+/*pre "subl bpp, %%edx             \n\t" */ /* (bpp is preloaded into ecx) */
+      "subl %%ecx, %%edx           \n\t" /* edx:  Raw(x-bpp) */
+      "xorl %%ecx, %%ecx           \n\t" /* zero ecx before using cl & cx below */
+
+   "avg_lp2:                       \n\t"
+      /* Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2) */
+      "xorl %%eax, %%eax           \n\t"
+      "movb (%%esi,%%ebx,), %%cl   \n\t" /* load cl with Prior(x) */
+      "movb (%%edx,%%ebx,), %%al   \n\t" /* load al with Raw(x-bpp) */
+      "addw %%cx, %%ax             \n\t"
+      "incl %%ebx                  \n\t"
+      "shrw %%ax                   \n\t" /* divide by 2 */
+      "addb -1(%%edi,%%ebx,), %%al \n\t" /* add Avg(x); -1 to offset inc ebx */
+      "cmpl _FullLength, %%ebx     \n\t" /* check if at end of array */
+      "movb %%al, -1(%%edi,%%ebx,) \n\t" /* write back Raw(x) [mov does not */
+      "jb avg_lp2                  \n\t" /*  affect flags; -1 to offset inc ebx] */
+
+   "avg_end:                       \n\t"
+      "EMMS                        \n\t" /* end MMX; prep for poss. FP instrs. */
+#ifdef __PIC__
+      "popl %%ebx                  \n\t" /* restore index to Global Offset Table */
+#endif
+
+      : "=c" (dummy_value_c),            /* output regs (dummy) */
+        "=S" (dummy_value_S),
+        "=D" (dummy_value_D)
+
+      : "0" (bpp),       /* ecx          // input regs */
+        "1" (prev_row),  /* esi */
+        "2" (row)        /* edi */
+
+      : "%eax", "%edx"                   /* clobber list */
+#ifndef __PIC__
+      , "%ebx"
+#endif
+   );
+
+} /* end png_read_filter_row_mmx_avg() */
+#endif
+
+
+
+#ifdef PNG_THREAD_UNSAFE_OK
+/*===========================================================================*/
+/*                                                                           */
+/*         P N G _ R E A D _ F I L T E R _ R O W _ M M X _ P A E T H         */
+/*                                                                           */
+/*===========================================================================*/
+
+/* Optimized code for PNG Paeth filter decoder */
+
+static void /* PRIVATE */
+png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row,
+                              png_bytep prev_row)
+{
+   int bpp;
+   int dummy_value_c;   /* fix 'forbidden register 2 (cx) was spilled' error */
+   int dummy_value_S;
+   int dummy_value_D;
+
+   bpp = (row_info->pixel_depth + 7) >> 3; /* Get # bytes per pixel */
+   _FullLength  = row_info->rowbytes; /* # of bytes to filter */
+
+   __asm__ __volatile__ (
+#ifdef __PIC__
+      "pushl %%ebx                 \n\t" /* save index to Global Offset Table */
+#endif
+      "xorl %%ebx, %%ebx           \n\t" /* ebx:  x offset */
+/*pre "movl row, %%edi             \n\t" */
+      "xorl %%edx, %%edx           \n\t" /* edx:  x-bpp offset */
+/*pre "movl prev_row, %%esi        \n\t" */
+      "xorl %%eax, %%eax           \n\t"
+
+      /* Compute the Raw value for the first bpp bytes */
+      /* Note: the formula works out to be always */
+      /*   Paeth(x) = Raw(x) + Prior(x)      where x < bpp */
+   "paeth_rlp:                     \n\t"
+      "movb (%%edi,%%ebx,), %%al   \n\t"
+      "addb (%%esi,%%ebx,), %%al   \n\t"
+      "incl %%ebx                  \n\t"
+/*pre "cmpl bpp, %%ebx             \n\t" (bpp is preloaded into ecx) */
+      "cmpl %%ecx, %%ebx           \n\t"
+      "movb %%al, -1(%%edi,%%ebx,) \n\t"
+      "jb paeth_rlp                \n\t"
+      /* get # of bytes to alignment */
+      "movl %%edi, _dif            \n\t" /* take start of row */
+      "addl %%ebx, _dif            \n\t" /* add bpp */
+      "xorl %%ecx, %%ecx           \n\t"
+      "addl $0xf, _dif             \n\t" /* add 7 + 8 to incr past alignment */
+                                         /* boundary */
+      "andl $0xfffffff8, _dif      \n\t" /* mask to alignment boundary */
+      "subl %%edi, _dif            \n\t" /* subtract from start ==> value ebx */
+                                         /* at alignment */
+      "jz paeth_go                 \n\t"
+      /* fix alignment */
+
+   "paeth_lp1:                     \n\t"
+      "xorl %%eax, %%eax           \n\t"
+      /* pav = p - a = (a + b - c) - a = b - c */
+      "movb (%%esi,%%ebx,), %%al   \n\t" /* load Prior(x) into al */
+      "movb (%%esi,%%edx,), %%cl   \n\t" /* load Prior(x-bpp) into cl */
+      "subl %%ecx, %%eax           \n\t" /* subtract Prior(x-bpp) */
+      "movl %%eax, _patemp         \n\t" /* Save pav for later use */
+      "xorl %%eax, %%eax           \n\t"
+      /* pbv = p - b = (a + b - c) - b = a - c */
+      "movb (%%edi,%%edx,), %%al   \n\t" /* load Raw(x-bpp) into al */
+      "subl %%ecx, %%eax           \n\t" /* subtract Prior(x-bpp) */
+      "movl %%eax, %%ecx           \n\t"
+      /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+      "addl _patemp, %%eax         \n\t" /* pcv = pav + pbv */
+      /* pc = abs(pcv) */
+      "testl $0x80000000, %%eax    \n\t"
+      "jz paeth_pca                \n\t"
+      "negl %%eax                  \n\t" /* reverse sign of neg values */
+
+   "paeth_pca:                     \n\t"
+      "movl %%eax, _pctemp         \n\t" /* save pc for later use */
+      /* pb = abs(pbv) */
+      "testl $0x80000000, %%ecx    \n\t"
+      "jz paeth_pba                \n\t"
+      "negl %%ecx                  \n\t" /* reverse sign of neg values */
+
+   "paeth_pba:                     \n\t"
+      "movl %%ecx, _pbtemp         \n\t" /* save pb for later use */
+      /* pa = abs(pav) */
+      "movl _patemp, %%eax         \n\t"
+      "testl $0x80000000, %%eax    \n\t"
+      "jz paeth_paa                \n\t"
+      "negl %%eax                  \n\t" /* reverse sign of neg values */
+
+   "paeth_paa:                     \n\t"
+      "movl %%eax, _patemp         \n\t" /* save pa for later use */
+      /* test if pa <= pb */
+      "cmpl %%ecx, %%eax           \n\t"
+      "jna paeth_abb               \n\t"
+      /* pa > pb; now test if pb <= pc */
+      "cmpl _pctemp, %%ecx         \n\t"
+      "jna paeth_bbc               \n\t"
+      /* pb > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+      "movb (%%esi,%%edx,), %%cl   \n\t" /* load Prior(x-bpp) into cl */
+      "jmp paeth_paeth             \n\t"
+
+   "paeth_bbc:                     \n\t"
+      /* pb <= pc; Raw(x) = Paeth(x) + Prior(x) */
+      "movb (%%esi,%%ebx,), %%cl   \n\t" /* load Prior(x) into cl */
+      "jmp paeth_paeth             \n\t"
+
+   "paeth_abb:                     \n\t"
+      /* pa <= pb; now test if pa <= pc */
+      "cmpl _pctemp, %%eax         \n\t"
+      "jna paeth_abc               \n\t"
+      /* pa > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+      "movb (%%esi,%%edx,), %%cl   \n\t" /* load Prior(x-bpp) into cl */
+      "jmp paeth_paeth             \n\t"
+
+   "paeth_abc:                     \n\t"
+      /* pa <= pc; Raw(x) = Paeth(x) + Raw(x-bpp) */
+      "movb (%%edi,%%edx,), %%cl   \n\t" /* load Raw(x-bpp) into cl */
+
+   "paeth_paeth:                   \n\t"
+      "incl %%ebx                  \n\t"
+      "incl %%edx                  \n\t"
+      /* Raw(x) = (Paeth(x) + Paeth_Predictor( a, b, c )) mod 256 */
+      "addb %%cl, -1(%%edi,%%ebx,) \n\t"
+      "cmpl _dif, %%ebx            \n\t"
+      "jb paeth_lp1                \n\t"
+
+   "paeth_go:                      \n\t"
+      "movl _FullLength, %%ecx     \n\t"
+      "movl %%ecx, %%eax           \n\t"
+      "subl %%ebx, %%eax           \n\t" /* subtract alignment fix */
+      "andl $0x00000007, %%eax     \n\t" /* calc bytes over mult of 8 */
+      "subl %%eax, %%ecx           \n\t" /* drop over bytes from original length */
+      "movl %%ecx, _MMXLength      \n\t"
+#ifdef __PIC__
+      "popl %%ebx                  \n\t" /* restore index to Global Offset Table */
+#endif
+
+      : "=c" (dummy_value_c),            /* output regs (dummy) */
+        "=S" (dummy_value_S),
+        "=D" (dummy_value_D)
+
+      : "0" (bpp),       /* ecx          // input regs */
+        "1" (prev_row),  /* esi */
+        "2" (row)        /* edi */
+
+      : "%eax", "%edx"                   /* clobber list */
+#ifndef __PIC__
+      , "%ebx"
+#endif
+   );
+
+   /* now do the math for the rest of the row */
+   switch (bpp)
+   {
+      case 3:
+      {
+         _ActiveMask.use = 0x0000000000ffffffLL;
+         _ActiveMaskEnd.use = 0xffff000000000000LL;
+         _ShiftBpp.use = 24;    /* == bpp(3) * 8 */
+         _ShiftRem.use = 40;    /* == 64 - 24 */
+
+         __asm__ __volatile__ (
+            "movl _dif, %%ecx            \n\t"
+/* preload  "movl row, %%edi             \n\t" */
+/* preload  "movl prev_row, %%esi        \n\t" */
+            "pxor %%mm0, %%mm0           \n\t"
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%ecx,), %%mm1 \n\t"
+         "paeth_3lp:                     \n\t"
+            "psrlq _ShiftRem, %%mm1      \n\t" /* shift last 3 bytes to 1st */
+                                               /* 3 bytes */
+            "movq (%%esi,%%ecx,), %%mm2  \n\t" /* load b=Prior(x) */
+            "punpcklbw %%mm0, %%mm1      \n\t" /* unpack High bytes of a */
+            "movq -8(%%esi,%%ecx,), %%mm3 \n\t" /* prep c=Prior(x-bpp) bytes */
+            "punpcklbw %%mm0, %%mm2      \n\t" /* unpack High bytes of b */
+            "psrlq _ShiftRem, %%mm3      \n\t" /* shift last 3 bytes to 1st */
+                                               /* 3 bytes */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            "movq %%mm2, %%mm4           \n\t"
+            "punpcklbw %%mm0, %%mm3      \n\t" /* unpack High bytes of c */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movq %%mm1, %%mm5           \n\t"
+            "psubw %%mm3, %%mm4          \n\t"
+            "pxor %%mm7, %%mm7           \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            "movq %%mm4, %%mm6           \n\t"
+            "psubw %%mm3, %%mm5          \n\t"
+
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            "pcmpgtw %%mm4, %%mm0        \n\t" /* create mask pav bytes < 0 */
+            "paddw %%mm5, %%mm6          \n\t"
+            "pand %%mm4, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* create mask pbv bytes < 0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "pand %%mm5, %%mm7           \n\t" /* only pbv bytes < 0 in mm0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "psubw %%mm7, %%mm5          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "pcmpgtw %%mm6, %%mm0        \n\t" /* create mask pcv bytes < 0 */
+            "pand %%mm6, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm7, %%mm5          \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            /*  test pa <= pb */
+            "movq %%mm4, %%mm7           \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* pa > pb? */
+            "movq %%mm7, %%mm0           \n\t"
+            /* use mm7 mask to merge pa & pb */
+            "pand %%mm7, %%mm5           \n\t"
+            /* use mm0 mask copy to merge a & b */
+            "pand %%mm0, %%mm2           \n\t"
+            "pandn %%mm4, %%mm7          \n\t"
+            "pandn %%mm1, %%mm0          \n\t"
+            "paddw %%mm5, %%mm7          \n\t"
+            "paddw %%mm2, %%mm0          \n\t"
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            "pcmpgtw %%mm6, %%mm7        \n\t" /* pab > pc? */
+            "pxor %%mm1, %%mm1           \n\t"
+            "pand %%mm7, %%mm3           \n\t"
+            "pandn %%mm0, %%mm7          \n\t"
+            "paddw %%mm3, %%mm7          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "packuswb %%mm1, %%mm7       \n\t"
+            "movq (%%esi,%%ecx,), %%mm3  \n\t" /* load c=Prior(x-bpp) */
+            "pand _ActiveMask, %%mm7     \n\t"
+            "movq %%mm3, %%mm2           \n\t" /* load b=Prior(x) step 1 */
+            "paddb (%%edi,%%ecx,), %%mm7 \n\t" /* add Paeth predictor with Raw(x) */
+            "punpcklbw %%mm0, %%mm3      \n\t" /* unpack High bytes of c */
+            "movq %%mm7, (%%edi,%%ecx,)  \n\t" /* write back updated value */
+            "movq %%mm7, %%mm1           \n\t" /* now mm1 will be used as */
+                                               /* Raw(x-bpp) */
+            /* now do Paeth for 2nd set of bytes (3-5) */
+            "psrlq _ShiftBpp, %%mm2      \n\t" /* load b=Prior(x) step 2 */
+            "punpcklbw %%mm0, %%mm1      \n\t" /* unpack High bytes of a */
+            "pxor %%mm7, %%mm7           \n\t"
+            "punpcklbw %%mm0, %%mm2      \n\t" /* unpack High bytes of b */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movq %%mm1, %%mm5           \n\t"
+            /* pav = p - a = (a + b - c) - a = b - c */
+            "movq %%mm2, %%mm4           \n\t"
+            "psubw %%mm3, %%mm5          \n\t"
+            "psubw %%mm3, %%mm4          \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = */
+            /*       pav + pbv = pbv + pav */
+            "movq %%mm5, %%mm6           \n\t"
+            "paddw %%mm4, %%mm6          \n\t"
+
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            "pcmpgtw %%mm5, %%mm0        \n\t" /* create mask pbv bytes < 0 */
+            "pcmpgtw %%mm4, %%mm7        \n\t" /* create mask pav bytes < 0 */
+            "pand %%mm5, %%mm0           \n\t" /* only pbv bytes < 0 in mm0 */
+            "pand %%mm4, %%mm7           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm0, %%mm5          \n\t"
+            "psubw %%mm7, %%mm4          \n\t"
+            "psubw %%mm0, %%mm5          \n\t"
+            "psubw %%mm7, %%mm4          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "pcmpgtw %%mm6, %%mm0        \n\t" /* create mask pcv bytes < 0 */
+            "pand %%mm6, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm0, %%mm6          \n\t"
+            /*  test pa <= pb */
+            "movq %%mm4, %%mm7           \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* pa > pb? */
+            "movq %%mm7, %%mm0           \n\t"
+            /* use mm7 mask to merge pa & pb */
+            "pand %%mm7, %%mm5           \n\t"
+            /* use mm0 mask copy to merge a & b */
+            "pand %%mm0, %%mm2           \n\t"
+            "pandn %%mm4, %%mm7          \n\t"
+            "pandn %%mm1, %%mm0          \n\t"
+            "paddw %%mm5, %%mm7          \n\t"
+            "paddw %%mm2, %%mm0          \n\t"
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            "pcmpgtw %%mm6, %%mm7        \n\t" /* pab > pc? */
+            "movq (%%esi,%%ecx,), %%mm2  \n\t" /* load b=Prior(x) */
+            "pand %%mm7, %%mm3           \n\t"
+            "pandn %%mm0, %%mm7          \n\t"
+            "pxor %%mm1, %%mm1           \n\t"
+            "paddw %%mm3, %%mm7          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "packuswb %%mm1, %%mm7       \n\t"
+            "movq %%mm2, %%mm3           \n\t" /* load c=Prior(x-bpp) step 1 */
+            "pand _ActiveMask, %%mm7     \n\t"
+            "punpckhbw %%mm0, %%mm2      \n\t" /* unpack High bytes of b */
+            "psllq _ShiftBpp, %%mm7      \n\t" /* shift bytes to 2nd group of */
+                                               /* 3 bytes */
+             /* pav = p - a = (a + b - c) - a = b - c */
+            "movq %%mm2, %%mm4           \n\t"
+            "paddb (%%edi,%%ecx,), %%mm7 \n\t" /* add Paeth predictor with Raw(x) */
+            "psllq _ShiftBpp, %%mm3      \n\t" /* load c=Prior(x-bpp) step 2 */
+            "movq %%mm7, (%%edi,%%ecx,)  \n\t" /* write back updated value */
+            "movq %%mm7, %%mm1           \n\t"
+            "punpckhbw %%mm0, %%mm3      \n\t" /* unpack High bytes of c */
+            "psllq _ShiftBpp, %%mm1      \n\t" /* shift bytes */
+                                    /* now mm1 will be used as Raw(x-bpp) */
+            /* now do Paeth for 3rd, and final, set of bytes (6-7) */
+            "pxor %%mm7, %%mm7           \n\t"
+            "punpckhbw %%mm0, %%mm1      \n\t" /* unpack High bytes of a */
+            "psubw %%mm3, %%mm4          \n\t"
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movq %%mm1, %%mm5           \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            "movq %%mm4, %%mm6           \n\t"
+            "psubw %%mm3, %%mm5          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "paddw %%mm5, %%mm6          \n\t"
+
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            "pcmpgtw %%mm4, %%mm0        \n\t" /* create mask pav bytes < 0 */
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* create mask pbv bytes < 0 */
+            "pand %%mm4, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "pand %%mm5, %%mm7           \n\t" /* only pbv bytes < 0 in mm0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "psubw %%mm7, %%mm5          \n\t"
+            "psubw %%mm0, %%mm4          \n\t"
+            "psubw %%mm7, %%mm5          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "pcmpgtw %%mm6, %%mm0        \n\t" /* create mask pcv bytes < 0 */
+            "pand %%mm6, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm0, %%mm6          \n\t"
+            /*  test pa <= pb */
+            "movq %%mm4, %%mm7           \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* pa > pb? */
+            "movq %%mm7, %%mm0           \n\t"
+            /* use mm0 mask copy to merge a & b */
+            "pand %%mm0, %%mm2           \n\t"
+            /* use mm7 mask to merge pa & pb */
+            "pand %%mm7, %%mm5           \n\t"
+            "pandn %%mm1, %%mm0          \n\t"
+            "pandn %%mm4, %%mm7          \n\t"
+            "paddw %%mm2, %%mm0          \n\t"
+            "paddw %%mm5, %%mm7          \n\t"
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            "pcmpgtw %%mm6, %%mm7        \n\t" /* pab > pc? */
+            "pand %%mm7, %%mm3           \n\t"
+            "pandn %%mm0, %%mm7          \n\t"
+            "paddw %%mm3, %%mm7          \n\t"
+            "pxor %%mm1, %%mm1           \n\t"
+            "packuswb %%mm7, %%mm1       \n\t"
+            /* step ecx to next set of 8 bytes and repeat loop til done */
+            "addl $8, %%ecx              \n\t"
+            "pand _ActiveMaskEnd, %%mm1  \n\t"
+            "paddb -8(%%edi,%%ecx,), %%mm1 \n\t" /* add Paeth predictor with */
+                                                 /* Raw(x) */
+
+            "cmpl _MMXLength, %%ecx      \n\t"
+            "pxor %%mm0, %%mm0           \n\t" /* pxor does not affect flags */
+            "movq %%mm1, -8(%%edi,%%ecx,) \n\t" /* write back updated value */
+                                 /* mm1 will be used as Raw(x-bpp) next loop */
+                           /* mm3 ready to be used as Prior(x-bpp) next loop */
+            "jb paeth_3lp                \n\t"
+
+            : "=S" (dummy_value_S),             /* output regs (dummy) */
+              "=D" (dummy_value_D)
+
+            : "0" (prev_row),  /* esi           // input regs */
+              "1" (row)        /* edi */
+
+            : "%ecx"                            /* clobber list */
+#if 0  /* %mm0, ..., %mm7 not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm2", "%mm3"
+            , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;  /* end 3 bpp */
+
+      case 6:
+      //case 7:   /* GRR BOGUS */
+      //case 5:   /* GRR BOGUS */
+      {
+         _ActiveMask.use  = 0x00000000ffffffffLL;
+         _ActiveMask2.use = 0xffffffff00000000LL;
+         _ShiftBpp.use = bpp << 3;    /* == bpp * 8 */
+         _ShiftRem.use = 64 - _ShiftBpp.use;
+
+         __asm__ __volatile__ (
+            "movl _dif, %%ecx            \n\t"
+/* preload  "movl row, %%edi             \n\t" */
+/* preload  "movl prev_row, %%esi        \n\t" */
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%ecx,), %%mm1 \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+
+         "paeth_6lp:                     \n\t"
+            /* must shift to position Raw(x-bpp) data */
+            "psrlq _ShiftRem, %%mm1      \n\t"
+            /* do first set of 4 bytes */
+            "movq -8(%%esi,%%ecx,), %%mm3 \n\t" /* read c=Prior(x-bpp) bytes */
+            "punpcklbw %%mm0, %%mm1      \n\t" /* unpack Low bytes of a */
+            "movq (%%esi,%%ecx,), %%mm2  \n\t" /* load b=Prior(x) */
+            "punpcklbw %%mm0, %%mm2      \n\t" /* unpack Low bytes of b */
+            /* must shift to position Prior(x-bpp) data */
+            "psrlq _ShiftRem, %%mm3      \n\t"
+            /* pav = p - a = (a + b - c) - a = b - c */
+            "movq %%mm2, %%mm4           \n\t"
+            "punpcklbw %%mm0, %%mm3      \n\t" /* unpack Low bytes of c */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movq %%mm1, %%mm5           \n\t"
+            "psubw %%mm3, %%mm4          \n\t"
+            "pxor %%mm7, %%mm7           \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            "movq %%mm4, %%mm6           \n\t"
+            "psubw %%mm3, %%mm5          \n\t"
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            "pcmpgtw %%mm4, %%mm0        \n\t" /* create mask pav bytes < 0 */
+            "paddw %%mm5, %%mm6          \n\t"
+            "pand %%mm4, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* create mask pbv bytes < 0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "pand %%mm5, %%mm7           \n\t" /* only pbv bytes < 0 in mm0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "psubw %%mm7, %%mm5          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "pcmpgtw %%mm6, %%mm0        \n\t" /* create mask pcv bytes < 0 */
+            "pand %%mm6, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm7, %%mm5          \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            /*  test pa <= pb */
+            "movq %%mm4, %%mm7           \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* pa > pb? */
+            "movq %%mm7, %%mm0           \n\t"
+            /* use mm7 mask to merge pa & pb */
+            "pand %%mm7, %%mm5           \n\t"
+            /* use mm0 mask copy to merge a & b */
+            "pand %%mm0, %%mm2           \n\t"
+            "pandn %%mm4, %%mm7          \n\t"
+            "pandn %%mm1, %%mm0          \n\t"
+            "paddw %%mm5, %%mm7          \n\t"
+            "paddw %%mm2, %%mm0          \n\t"
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            "pcmpgtw %%mm6, %%mm7        \n\t" /* pab > pc? */
+            "pxor %%mm1, %%mm1           \n\t"
+            "pand %%mm7, %%mm3           \n\t"
+            "pandn %%mm0, %%mm7          \n\t"
+            "paddw %%mm3, %%mm7          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "packuswb %%mm1, %%mm7       \n\t"
+            "movq -8(%%esi,%%ecx,), %%mm3 \n\t" /* load c=Prior(x-bpp) */
+            "pand _ActiveMask, %%mm7     \n\t"
+            "psrlq _ShiftRem, %%mm3      \n\t"
+            "movq (%%esi,%%ecx,), %%mm2  \n\t" /* load b=Prior(x) step 1 */
+            "paddb (%%edi,%%ecx,), %%mm7 \n\t" /* add Paeth predictor and Raw(x) */
+            "movq %%mm2, %%mm6           \n\t"
+            "movq %%mm7, (%%edi,%%ecx,)  \n\t" /* write back updated value */
+            "movq -8(%%edi,%%ecx,), %%mm1 \n\t"
+            "psllq _ShiftBpp, %%mm6      \n\t"
+            "movq %%mm7, %%mm5           \n\t"
+            "psrlq _ShiftRem, %%mm1      \n\t"
+            "por %%mm6, %%mm3            \n\t"
+            "psllq _ShiftBpp, %%mm5      \n\t"
+            "punpckhbw %%mm0, %%mm3      \n\t" /* unpack High bytes of c */
+            "por %%mm5, %%mm1            \n\t"
+            /* do second set of 4 bytes */
+            "punpckhbw %%mm0, %%mm2      \n\t" /* unpack High bytes of b */
+            "punpckhbw %%mm0, %%mm1      \n\t" /* unpack High bytes of a */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            "movq %%mm2, %%mm4           \n\t"
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movq %%mm1, %%mm5           \n\t"
+            "psubw %%mm3, %%mm4          \n\t"
+            "pxor %%mm7, %%mm7           \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            "movq %%mm4, %%mm6           \n\t"
+            "psubw %%mm3, %%mm5          \n\t"
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            "pcmpgtw %%mm4, %%mm0        \n\t" /* create mask pav bytes < 0 */
+            "paddw %%mm5, %%mm6          \n\t"
+            "pand %%mm4, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* create mask pbv bytes < 0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "pand %%mm5, %%mm7           \n\t" /* only pbv bytes < 0 in mm0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "psubw %%mm7, %%mm5          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "pcmpgtw %%mm6, %%mm0        \n\t" /* create mask pcv bytes < 0 */
+            "pand %%mm6, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm7, %%mm5          \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            /*  test pa <= pb */
+            "movq %%mm4, %%mm7           \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* pa > pb? */
+            "movq %%mm7, %%mm0           \n\t"
+            /* use mm7 mask to merge pa & pb */
+            "pand %%mm7, %%mm5           \n\t"
+            /* use mm0 mask copy to merge a & b */
+            "pand %%mm0, %%mm2           \n\t"
+            "pandn %%mm4, %%mm7          \n\t"
+            "pandn %%mm1, %%mm0          \n\t"
+            "paddw %%mm5, %%mm7          \n\t"
+            "paddw %%mm2, %%mm0          \n\t"
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            "pcmpgtw %%mm6, %%mm7        \n\t" /* pab > pc? */
+            "pxor %%mm1, %%mm1           \n\t"
+            "pand %%mm7, %%mm3           \n\t"
+            "pandn %%mm0, %%mm7          \n\t"
+            "pxor %%mm1, %%mm1           \n\t"
+            "paddw %%mm3, %%mm7          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            /* step ecx to next set of 8 bytes and repeat loop til done */
+            "addl $8, %%ecx              \n\t"
+            "packuswb %%mm7, %%mm1       \n\t"
+            "paddb -8(%%edi,%%ecx,), %%mm1 \n\t" /* add Paeth predictor with Raw(x) */
+            "cmpl _MMXLength, %%ecx      \n\t"
+            "movq %%mm1, -8(%%edi,%%ecx,) \n\t" /* write back updated value */
+                                /* mm1 will be used as Raw(x-bpp) next loop */
+            "jb paeth_6lp                \n\t"
+
+            : "=S" (dummy_value_S),             /* output regs (dummy) */
+              "=D" (dummy_value_D)
+
+            : "0" (prev_row),  /* esi           // input regs */
+              "1" (row)        /* edi */
+
+            : "%ecx"                            /* clobber list */
+#if 0  /* %mm0, ..., %mm7 not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm2", "%mm3"
+            , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;  /* end 6 bpp */
+
+      case 4:
+      {
+         _ActiveMask.use  = 0x00000000ffffffffLL;
+
+         __asm__ __volatile__ (
+            "movl _dif, %%ecx            \n\t"
+/* preload  "movl row, %%edi             \n\t" */
+/* preload  "movl prev_row, %%esi        \n\t" */
+            "pxor %%mm0, %%mm0           \n\t"
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%ecx,), %%mm1 \n\t" /* only time should need to read */
+                                     /*  a=Raw(x-bpp) bytes */
+         "paeth_4lp:                     \n\t"
+            /* do first set of 4 bytes */
+            "movq -8(%%esi,%%ecx,), %%mm3 \n\t" /* read c=Prior(x-bpp) bytes */
+            "punpckhbw %%mm0, %%mm1      \n\t" /* unpack Low bytes of a */
+            "movq (%%esi,%%ecx,), %%mm2  \n\t" /* load b=Prior(x) */
+            "punpcklbw %%mm0, %%mm2      \n\t" /* unpack High bytes of b */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            "movq %%mm2, %%mm4           \n\t"
+            "punpckhbw %%mm0, %%mm3      \n\t" /* unpack High bytes of c */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movq %%mm1, %%mm5           \n\t"
+            "psubw %%mm3, %%mm4          \n\t"
+            "pxor %%mm7, %%mm7           \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            "movq %%mm4, %%mm6           \n\t"
+            "psubw %%mm3, %%mm5          \n\t"
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            "pcmpgtw %%mm4, %%mm0        \n\t" /* create mask pav bytes < 0 */
+            "paddw %%mm5, %%mm6          \n\t"
+            "pand %%mm4, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* create mask pbv bytes < 0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "pand %%mm5, %%mm7           \n\t" /* only pbv bytes < 0 in mm0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "psubw %%mm7, %%mm5          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "pcmpgtw %%mm6, %%mm0        \n\t" /* create mask pcv bytes < 0 */
+            "pand %%mm6, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm7, %%mm5          \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            /*  test pa <= pb */
+            "movq %%mm4, %%mm7           \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* pa > pb? */
+            "movq %%mm7, %%mm0           \n\t"
+            /* use mm7 mask to merge pa & pb */
+            "pand %%mm7, %%mm5           \n\t"
+            /* use mm0 mask copy to merge a & b */
+            "pand %%mm0, %%mm2           \n\t"
+            "pandn %%mm4, %%mm7          \n\t"
+            "pandn %%mm1, %%mm0          \n\t"
+            "paddw %%mm5, %%mm7          \n\t"
+            "paddw %%mm2, %%mm0          \n\t"
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            "pcmpgtw %%mm6, %%mm7        \n\t" /* pab > pc? */
+            "pxor %%mm1, %%mm1           \n\t"
+            "pand %%mm7, %%mm3           \n\t"
+            "pandn %%mm0, %%mm7          \n\t"
+            "paddw %%mm3, %%mm7          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "packuswb %%mm1, %%mm7       \n\t"
+            "movq (%%esi,%%ecx,), %%mm3  \n\t" /* load c=Prior(x-bpp) */
+            "pand _ActiveMask, %%mm7     \n\t"
+            "movq %%mm3, %%mm2           \n\t" /* load b=Prior(x) step 1 */
+            "paddb (%%edi,%%ecx,), %%mm7 \n\t" /* add Paeth predictor with Raw(x) */
+            "punpcklbw %%mm0, %%mm3      \n\t" /* unpack High bytes of c */
+            "movq %%mm7, (%%edi,%%ecx,)  \n\t" /* write back updated value */
+            "movq %%mm7, %%mm1           \n\t" /* now mm1 will be used as Raw(x-bpp) */
+            /* do second set of 4 bytes */
+            "punpckhbw %%mm0, %%mm2      \n\t" /* unpack Low bytes of b */
+            "punpcklbw %%mm0, %%mm1      \n\t" /* unpack Low bytes of a */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            "movq %%mm2, %%mm4           \n\t"
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movq %%mm1, %%mm5           \n\t"
+            "psubw %%mm3, %%mm4          \n\t"
+            "pxor %%mm7, %%mm7           \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            "movq %%mm4, %%mm6           \n\t"
+            "psubw %%mm3, %%mm5          \n\t"
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            "pcmpgtw %%mm4, %%mm0        \n\t" /* create mask pav bytes < 0 */
+            "paddw %%mm5, %%mm6          \n\t"
+            "pand %%mm4, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* create mask pbv bytes < 0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "pand %%mm5, %%mm7           \n\t" /* only pbv bytes < 0 in mm0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "psubw %%mm7, %%mm5          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "pcmpgtw %%mm6, %%mm0        \n\t" /* create mask pcv bytes < 0 */
+            "pand %%mm6, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm7, %%mm5          \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            /*  test pa <= pb */
+            "movq %%mm4, %%mm7           \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* pa > pb? */
+            "movq %%mm7, %%mm0           \n\t"
+            /* use mm7 mask to merge pa & pb */
+            "pand %%mm7, %%mm5           \n\t"
+            /* use mm0 mask copy to merge a & b */
+            "pand %%mm0, %%mm2           \n\t"
+            "pandn %%mm4, %%mm7          \n\t"
+            "pandn %%mm1, %%mm0          \n\t"
+            "paddw %%mm5, %%mm7          \n\t"
+            "paddw %%mm2, %%mm0          \n\t"
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            "pcmpgtw %%mm6, %%mm7        \n\t" /* pab > pc? */
+            "pxor %%mm1, %%mm1           \n\t"
+            "pand %%mm7, %%mm3           \n\t"
+            "pandn %%mm0, %%mm7          \n\t"
+            "pxor %%mm1, %%mm1           \n\t"
+            "paddw %%mm3, %%mm7          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            /* step ecx to next set of 8 bytes and repeat loop til done */
+            "addl $8, %%ecx              \n\t"
+            "packuswb %%mm7, %%mm1       \n\t"
+            "paddb -8(%%edi,%%ecx,), %%mm1 \n\t" /* add predictor with Raw(x) */
+            "cmpl _MMXLength, %%ecx      \n\t"
+            "movq %%mm1, -8(%%edi,%%ecx,) \n\t" /* write back updated value */
+                                /* mm1 will be used as Raw(x-bpp) next loop */
+            "jb paeth_4lp                \n\t"
+
+            : "=S" (dummy_value_S),             /* output regs (dummy) */
+              "=D" (dummy_value_D)
+
+            : "0" (prev_row),  /* esi           // input regs */
+              "1" (row)        /* edi */
+
+            : "%ecx"                            /* clobber list */
+#if 0  /* %mm0, ..., %mm7 not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm2", "%mm3"
+            , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;  /* end 4 bpp */
+
+      case 8:                          /* bpp == 8 */
+      {
+         _ActiveMask.use  = 0x00000000ffffffffLL;
+
+         __asm__ __volatile__ (
+            "movl _dif, %%ecx            \n\t"
+/* preload  "movl row, %%edi             \n\t" */
+/* preload  "movl prev_row, %%esi        \n\t" */
+            "pxor %%mm0, %%mm0           \n\t"
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%ecx,), %%mm1 \n\t" /* only time should need to read */
+                                       /*  a=Raw(x-bpp) bytes */
+         "paeth_8lp:                     \n\t"
+            /* do first set of 4 bytes */
+            "movq -8(%%esi,%%ecx,), %%mm3 \n\t" /* read c=Prior(x-bpp) bytes */
+            "punpcklbw %%mm0, %%mm1      \n\t" /* unpack Low bytes of a */
+            "movq (%%esi,%%ecx,), %%mm2  \n\t" /* load b=Prior(x) */
+            "punpcklbw %%mm0, %%mm2      \n\t" /* unpack Low bytes of b */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            "movq %%mm2, %%mm4           \n\t"
+            "punpcklbw %%mm0, %%mm3      \n\t" /* unpack Low bytes of c */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movq %%mm1, %%mm5           \n\t"
+            "psubw %%mm3, %%mm4          \n\t"
+            "pxor %%mm7, %%mm7           \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            "movq %%mm4, %%mm6           \n\t"
+            "psubw %%mm3, %%mm5          \n\t"
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            "pcmpgtw %%mm4, %%mm0        \n\t" /* create mask pav bytes < 0 */
+            "paddw %%mm5, %%mm6          \n\t"
+            "pand %%mm4, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* create mask pbv bytes < 0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "pand %%mm5, %%mm7           \n\t" /* only pbv bytes < 0 in mm0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "psubw %%mm7, %%mm5          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "pcmpgtw %%mm6, %%mm0        \n\t" /* create mask pcv bytes < 0 */
+            "pand %%mm6, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm7, %%mm5          \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            /*  test pa <= pb */
+            "movq %%mm4, %%mm7           \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* pa > pb? */
+            "movq %%mm7, %%mm0           \n\t"
+            /* use mm7 mask to merge pa & pb */
+            "pand %%mm7, %%mm5           \n\t"
+            /* use mm0 mask copy to merge a & b */
+            "pand %%mm0, %%mm2           \n\t"
+            "pandn %%mm4, %%mm7          \n\t"
+            "pandn %%mm1, %%mm0          \n\t"
+            "paddw %%mm5, %%mm7          \n\t"
+            "paddw %%mm2, %%mm0          \n\t"
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            "pcmpgtw %%mm6, %%mm7        \n\t" /* pab > pc? */
+            "pxor %%mm1, %%mm1           \n\t"
+            "pand %%mm7, %%mm3           \n\t"
+            "pandn %%mm0, %%mm7          \n\t"
+            "paddw %%mm3, %%mm7          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "packuswb %%mm1, %%mm7       \n\t"
+            "movq -8(%%esi,%%ecx,), %%mm3 \n\t" /* read c=Prior(x-bpp) bytes */
+            "pand _ActiveMask, %%mm7     \n\t"
+            "movq (%%esi,%%ecx,), %%mm2  \n\t" /* load b=Prior(x) */
+            "paddb (%%edi,%%ecx,), %%mm7 \n\t" /* add Paeth predictor with Raw(x) */
+            "punpckhbw %%mm0, %%mm3      \n\t" /* unpack High bytes of c */
+            "movq %%mm7, (%%edi,%%ecx,)  \n\t" /* write back updated value */
+            "movq -8(%%edi,%%ecx,), %%mm1 \n\t" /* read a=Raw(x-bpp) bytes */
+
+            /* do second set of 4 bytes */
+            "punpckhbw %%mm0, %%mm2      \n\t" /* unpack High bytes of b */
+            "punpckhbw %%mm0, %%mm1      \n\t" /* unpack High bytes of a */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            "movq %%mm2, %%mm4           \n\t"
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movq %%mm1, %%mm5           \n\t"
+            "psubw %%mm3, %%mm4          \n\t"
+            "pxor %%mm7, %%mm7           \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            "movq %%mm4, %%mm6           \n\t"
+            "psubw %%mm3, %%mm5          \n\t"
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            "pcmpgtw %%mm4, %%mm0        \n\t" /* create mask pav bytes < 0 */
+            "paddw %%mm5, %%mm6          \n\t"
+            "pand %%mm4, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* create mask pbv bytes < 0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "pand %%mm5, %%mm7           \n\t" /* only pbv bytes < 0 in mm0 */
+            "psubw %%mm0, %%mm4          \n\t"
+            "psubw %%mm7, %%mm5          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            "pcmpgtw %%mm6, %%mm0        \n\t" /* create mask pcv bytes < 0 */
+            "pand %%mm6, %%mm0           \n\t" /* only pav bytes < 0 in mm7 */
+            "psubw %%mm7, %%mm5          \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            /*  test pa <= pb */
+            "movq %%mm4, %%mm7           \n\t"
+            "psubw %%mm0, %%mm6          \n\t"
+            "pcmpgtw %%mm5, %%mm7        \n\t" /* pa > pb? */
+            "movq %%mm7, %%mm0           \n\t"
+            /* use mm7 mask to merge pa & pb */
+            "pand %%mm7, %%mm5           \n\t"
+            /* use mm0 mask copy to merge a & b */
+            "pand %%mm0, %%mm2           \n\t"
+            "pandn %%mm4, %%mm7          \n\t"
+            "pandn %%mm1, %%mm0          \n\t"
+            "paddw %%mm5, %%mm7          \n\t"
+            "paddw %%mm2, %%mm0          \n\t"
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            "pcmpgtw %%mm6, %%mm7        \n\t" /* pab > pc? */
+            "pxor %%mm1, %%mm1           \n\t"
+            "pand %%mm7, %%mm3           \n\t"
+            "pandn %%mm0, %%mm7          \n\t"
+            "pxor %%mm1, %%mm1           \n\t"
+            "paddw %%mm3, %%mm7          \n\t"
+            "pxor %%mm0, %%mm0           \n\t"
+            /* step ecx to next set of 8 bytes and repeat loop til done */
+            "addl $8, %%ecx              \n\t"
+            "packuswb %%mm7, %%mm1       \n\t"
+            "paddb -8(%%edi,%%ecx,), %%mm1 \n\t" /* add Paeth predictor with Raw(x) */
+            "cmpl _MMXLength, %%ecx      \n\t"
+            "movq %%mm1, -8(%%edi,%%ecx,) \n\t" /* write back updated value */
+                            /* mm1 will be used as Raw(x-bpp) next loop */
+            "jb paeth_8lp                \n\t"
+
+            : "=S" (dummy_value_S),             /* output regs (dummy) */
+              "=D" (dummy_value_D)
+
+            : "0" (prev_row),  /* esi           // input regs */
+              "1" (row)        /* edi */
+
+            : "%ecx"                            /* clobber list */
+#if 0  /* %mm0, ..., %mm7 not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm2", "%mm3"
+            , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;  /* end 8 bpp */
+
+      case 1:                /* bpp = 1 */
+      case 2:                /* bpp = 2 */
+      default:               /* bpp > 8 */
+      {
+         __asm__ __volatile__ (
+#ifdef __PIC__
+            "pushl %%ebx                 \n\t" /* save Global Offset Table index */
+#endif
+            "movl _dif, %%ebx            \n\t"
+            "cmpl _FullLength, %%ebx     \n\t"
+            "jnb paeth_dend              \n\t"
+
+/* preload  "movl row, %%edi             \n\t" */
+/* preload  "movl prev_row, %%esi        \n\t" */
+            /* do Paeth decode for remaining bytes */
+            "movl %%ebx, %%edx           \n\t"
+/* preload  "subl bpp, %%edx             \n\t" // (bpp is preloaded into ecx) */
+            "subl %%ecx, %%edx           \n\t" /* edx = ebx - bpp */
+            "xorl %%ecx, %%ecx           \n\t" /* zero ecx before using cl & cx */
+
+         "paeth_dlp:                     \n\t"
+            "xorl %%eax, %%eax           \n\t"
+            /* pav = p - a = (a + b - c) - a = b - c */
+            "movb (%%esi,%%ebx,), %%al   \n\t" /* load Prior(x) into al */
+            "movb (%%esi,%%edx,), %%cl   \n\t" /* load Prior(x-bpp) into cl */
+            "subl %%ecx, %%eax           \n\t" /* subtract Prior(x-bpp) */
+            "movl %%eax, _patemp         \n\t" /* Save pav for later use */
+            "xorl %%eax, %%eax           \n\t"
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            "movb (%%edi,%%edx,), %%al   \n\t" /* load Raw(x-bpp) into al */
+            "subl %%ecx, %%eax           \n\t" /* subtract Prior(x-bpp) */
+            "movl %%eax, %%ecx           \n\t"
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            "addl _patemp, %%eax         \n\t" /* pcv = pav + pbv */
+            /* pc = abs(pcv) */
+            "testl $0x80000000, %%eax    \n\t"
+            "jz paeth_dpca               \n\t"
+            "negl %%eax                  \n\t" /* reverse sign of neg values */
+
+         "paeth_dpca:                    \n\t"
+            "movl %%eax, _pctemp         \n\t" /* save pc for later use */
+            /* pb = abs(pbv) */
+            "testl $0x80000000, %%ecx    \n\t"
+            "jz paeth_dpba               \n\t"
+            "negl %%ecx                  \n\t" /* reverse sign of neg values */
+
+         "paeth_dpba:                    \n\t"
+            "movl %%ecx, _pbtemp         \n\t" /* save pb for later use */
+            /* pa = abs(pav) */
+            "movl _patemp, %%eax         \n\t"
+            "testl $0x80000000, %%eax    \n\t"
+            "jz paeth_dpaa               \n\t"
+            "negl %%eax                  \n\t" /* reverse sign of neg values */
+
+         "paeth_dpaa:                    \n\t"
+            "movl %%eax, _patemp         \n\t" /* save pa for later use */
+            /* test if pa <= pb */
+            "cmpl %%ecx, %%eax           \n\t"
+            "jna paeth_dabb              \n\t"
+            /* pa > pb; now test if pb <= pc */
+            "cmpl _pctemp, %%ecx         \n\t"
+            "jna paeth_dbbc              \n\t"
+            /* pb > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+            "movb (%%esi,%%edx,), %%cl   \n\t" /* load Prior(x-bpp) into cl */
+            "jmp paeth_dpaeth            \n\t"
+
+         "paeth_dbbc:                    \n\t"
+            /* pb <= pc; Raw(x) = Paeth(x) + Prior(x) */
+            "movb (%%esi,%%ebx,), %%cl   \n\t" /* load Prior(x) into cl */
+            "jmp paeth_dpaeth            \n\t"
+
+         "paeth_dabb:                    \n\t"
+            /* pa <= pb; now test if pa <= pc */
+            "cmpl _pctemp, %%eax         \n\t"
+            "jna paeth_dabc              \n\t"
+            /* pa > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+            "movb (%%esi,%%edx,), %%cl   \n\t" /* load Prior(x-bpp) into cl */
+            "jmp paeth_dpaeth            \n\t"
+
+         "paeth_dabc:                    \n\t"
+            /* pa <= pc; Raw(x) = Paeth(x) + Raw(x-bpp) */
+            "movb (%%edi,%%edx,), %%cl   \n\t" /* load Raw(x-bpp) into cl */
+
+         "paeth_dpaeth:                  \n\t"
+            "incl %%ebx                  \n\t"
+            "incl %%edx                  \n\t"
+            /* Raw(x) = (Paeth(x) + Paeth_Predictor( a, b, c )) mod 256 */
+            "addb %%cl, -1(%%edi,%%ebx,) \n\t"
+            "cmpl _FullLength, %%ebx     \n\t"
+            "jb paeth_dlp                \n\t"
+
+         "paeth_dend:                    \n\t"
+#ifdef __PIC__
+            "popl %%ebx                  \n\t" /* index to Global Offset Table */
+#endif
+
+            : "=c" (dummy_value_c),            /* output regs (dummy) */
+              "=S" (dummy_value_S),
+              "=D" (dummy_value_D)
+
+            : "0" (bpp),       /* ecx          // input regs */
+              "1" (prev_row),  /* esi */
+              "2" (row)        /* edi */
+
+            : "%eax", "%edx"                   /* clobber list */
+#ifndef __PIC__
+            , "%ebx"
+#endif
+         );
+      }
+      return;                   /* No need to go further with this one */
+
+   } /* end switch (bpp) */
+
+   __asm__ __volatile__ (
+      /* MMX acceleration complete; now do clean-up */
+      /* check if any remaining bytes left to decode */
+#ifdef __PIC__
+      "pushl %%ebx                 \n\t" /* save index to Global Offset Table */
+#endif
+      "movl _MMXLength, %%ebx      \n\t"
+      "cmpl _FullLength, %%ebx     \n\t"
+      "jnb paeth_end               \n\t"
+/*pre "movl row, %%edi             \n\t" */
+/*pre "movl prev_row, %%esi        \n\t" */
+      /* do Paeth decode for remaining bytes */
+      "movl %%ebx, %%edx           \n\t"
+/*pre "subl bpp, %%edx             \n\t" */ /* (bpp is preloaded into ecx) */
+      "subl %%ecx, %%edx           \n\t" /* edx = ebx - bpp */
+      "xorl %%ecx, %%ecx           \n\t" /* zero ecx before using cl & cx below */
+
+   "paeth_lp2:                     \n\t"
+      "xorl %%eax, %%eax           \n\t"
+      /* pav = p - a = (a + b - c) - a = b - c */
+      "movb (%%esi,%%ebx,), %%al   \n\t" /* load Prior(x) into al */
+      "movb (%%esi,%%edx,), %%cl   \n\t" /* load Prior(x-bpp) into cl */
+      "subl %%ecx, %%eax           \n\t" /* subtract Prior(x-bpp) */
+      "movl %%eax, _patemp         \n\t" /* Save pav for later use */
+      "xorl %%eax, %%eax           \n\t"
+      /* pbv = p - b = (a + b - c) - b = a - c */
+      "movb (%%edi,%%edx,), %%al   \n\t" /* load Raw(x-bpp) into al */
+      "subl %%ecx, %%eax           \n\t" /* subtract Prior(x-bpp) */
+      "movl %%eax, %%ecx           \n\t"
+      /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+      "addl _patemp, %%eax         \n\t" /* pcv = pav + pbv */
+      /* pc = abs(pcv) */
+      "testl $0x80000000, %%eax    \n\t"
+      "jz paeth_pca2               \n\t"
+      "negl %%eax                  \n\t" /* reverse sign of neg values */
+
+   "paeth_pca2:                    \n\t"
+      "movl %%eax, _pctemp         \n\t" /* save pc for later use */
+      /* pb = abs(pbv) */
+      "testl $0x80000000, %%ecx    \n\t"
+      "jz paeth_pba2               \n\t"
+      "negl %%ecx                  \n\t" /* reverse sign of neg values */
+
+   "paeth_pba2:                    \n\t"
+      "movl %%ecx, _pbtemp         \n\t" /* save pb for later use */
+      /* pa = abs(pav) */
+      "movl _patemp, %%eax         \n\t"
+      "testl $0x80000000, %%eax    \n\t"
+      "jz paeth_paa2               \n\t"
+      "negl %%eax                  \n\t" /* reverse sign of neg values */
+
+   "paeth_paa2:                    \n\t"
+      "movl %%eax, _patemp         \n\t" /* save pa for later use */
+      /* test if pa <= pb */
+      "cmpl %%ecx, %%eax           \n\t"
+      "jna paeth_abb2              \n\t"
+      /* pa > pb; now test if pb <= pc */
+      "cmpl _pctemp, %%ecx         \n\t"
+      "jna paeth_bbc2              \n\t"
+      /* pb > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+      "movb (%%esi,%%edx,), %%cl   \n\t" /* load Prior(x-bpp) into cl */
+      "jmp paeth_paeth2            \n\t"
+
+   "paeth_bbc2:                    \n\t"
+      /* pb <= pc; Raw(x) = Paeth(x) + Prior(x) */
+      "movb (%%esi,%%ebx,), %%cl   \n\t" /* load Prior(x) into cl */
+      "jmp paeth_paeth2            \n\t"
+
+   "paeth_abb2:                    \n\t"
+      /* pa <= pb; now test if pa <= pc */
+      "cmpl _pctemp, %%eax         \n\t"
+      "jna paeth_abc2              \n\t"
+      /* pa > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+      "movb (%%esi,%%edx,), %%cl   \n\t" /* load Prior(x-bpp) into cl */
+      "jmp paeth_paeth2            \n\t"
+
+   "paeth_abc2:                    \n\t"
+      /* pa <= pc; Raw(x) = Paeth(x) + Raw(x-bpp) */
+      "movb (%%edi,%%edx,), %%cl   \n\t" /* load Raw(x-bpp) into cl */
+
+   "paeth_paeth2:                  \n\t"
+      "incl %%ebx                  \n\t"
+      "incl %%edx                  \n\t"
+      /* Raw(x) = (Paeth(x) + Paeth_Predictor( a, b, c )) mod 256 */
+      "addb %%cl, -1(%%edi,%%ebx,) \n\t"
+      "cmpl _FullLength, %%ebx     \n\t"
+      "jb paeth_lp2                \n\t"
+
+   "paeth_end:                     \n\t"
+      "EMMS                        \n\t" /* end MMX; prep for poss. FP instrs. */
+#ifdef __PIC__
+      "popl %%ebx                  \n\t" /* restore index to Global Offset Table */
+#endif
+
+      : "=c" (dummy_value_c),            /* output regs (dummy) */
+        "=S" (dummy_value_S),
+        "=D" (dummy_value_D)
+
+      : "0" (bpp),       /* ecx          // input regs */
+        "1" (prev_row),  /* esi */
+        "2" (row)        /* edi */
+
+      : "%eax", "%edx"                   /* clobber list (no input regs!) */
+#ifndef __PIC__
+      , "%ebx"
+#endif
+   );
+
+} /* end png_read_filter_row_mmx_paeth() */
+#endif
+
+
+
+
+#ifdef PNG_THREAD_UNSAFE_OK
+/*===========================================================================*/
+/*                                                                           */
+/*           P N G _ R E A D _ F I L T E R _ R O W _ M M X _ S U B           */
+/*                                                                           */
+/*===========================================================================*/
+
+/* Optimized code for PNG Sub filter decoder */
+
+static void /* PRIVATE */
+png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row)
+{
+   int bpp;
+   int dummy_value_a;
+   int dummy_value_D;
+
+   bpp = (row_info->pixel_depth + 7) >> 3;   /* calc number of bytes per pixel */
+   _FullLength = row_info->rowbytes - bpp;   /* number of bytes to filter */
+
+   __asm__ __volatile__ (
+/*pre "movl row, %%edi             \n\t" */
+      "movl %%edi, %%esi           \n\t" /* lp = row */
+/*pre "movl bpp, %%eax             \n\t" */
+      "addl %%eax, %%edi           \n\t" /* rp = row + bpp */
+/*irr "xorl %%eax, %%eax           \n\t" */
+      /* get # of bytes to alignment */
+      "movl %%edi, _dif            \n\t" /* take start of row */
+      "addl $0xf, _dif             \n\t" /* add 7 + 8 to incr past */
+                                         /*  alignment boundary */
+      "xorl %%ecx, %%ecx           \n\t"
+      "andl $0xfffffff8, _dif      \n\t" /* mask to alignment boundary */
+      "subl %%edi, _dif            \n\t" /* subtract from start ==> value */
+      "jz sub_go                   \n\t" /*  ecx at alignment */
+
+   "sub_lp1:                       \n\t" /* fix alignment */
+      "movb (%%esi,%%ecx,), %%al   \n\t"
+      "addb %%al, (%%edi,%%ecx,)   \n\t"
+      "incl %%ecx                  \n\t"
+      "cmpl _dif, %%ecx            \n\t"
+      "jb sub_lp1                  \n\t"
+
+   "sub_go:                        \n\t"
+      "movl _FullLength, %%eax     \n\t"
+      "movl %%eax, %%edx           \n\t"
+      "subl %%ecx, %%edx           \n\t" /* subtract alignment fix */
+      "andl $0x00000007, %%edx     \n\t" /* calc bytes over mult of 8 */
+      "subl %%edx, %%eax           \n\t" /* drop over bytes from length */
+      "movl %%eax, _MMXLength      \n\t"
+
+      : "=a" (dummy_value_a),   /* 0      // output regs (dummy) */
+        "=D" (dummy_value_D)    /* 1 */
+
+      : "0" (bpp),              /* eax    // input regs */
+        "1" (row)               /* edi */
+
+      : "%esi", "%ecx", "%edx"            // clobber list
+
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+      , "%mm0", "%mm1", "%mm2", "%mm3"
+      , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+   );
+
+   /* now do the math for the rest of the row */
+   switch (bpp)
+   {
+      case 3:
+      {
+         _ActiveMask.use  = 0x0000ffffff000000LL;
+         _ShiftBpp.use = 24;       /* == 3 * 8 */
+         _ShiftRem.use  = 40;      /* == 64 - 24 */
+
+         __asm__ __volatile__ (
+/* preload  "movl row, %%edi              \n\t" */
+            "movq _ActiveMask, %%mm7       \n\t" /* load _ActiveMask for 2nd */
+                                                /*  active byte group */
+            "movl %%edi, %%esi            \n\t" /* lp = row */
+/* preload  "movl bpp, %%eax              \n\t" */
+            "addl %%eax, %%edi            \n\t" /* rp = row + bpp */
+            "movq %%mm7, %%mm6            \n\t"
+            "movl _dif, %%edx             \n\t"
+            "psllq _ShiftBpp, %%mm6       \n\t" /* move mask in mm6 to cover */
+                                                /*  3rd active byte group */
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%edx,), %%mm1 \n\t"
+
+         "sub_3lp:                        \n\t" /* shift data for adding first */
+            "psrlq _ShiftRem, %%mm1       \n\t" /*  bpp bytes (no need for mask; */
+                                                /*  shift clears inactive bytes) */
+            /* add 1st active group */
+            "movq (%%edi,%%edx,), %%mm0   \n\t"
+            "paddb %%mm1, %%mm0           \n\t"
+
+            /* add 2nd active group */
+            "movq %%mm0, %%mm1            \n\t" /* mov updated Raws to mm1 */
+            "psllq _ShiftBpp, %%mm1       \n\t" /* shift data to pos. correctly */
+            "pand %%mm7, %%mm1            \n\t" /* mask to use 2nd active group */
+            "paddb %%mm1, %%mm0           \n\t"
+
+            /* add 3rd active group */
+            "movq %%mm0, %%mm1            \n\t" /* mov updated Raws to mm1 */
+            "psllq _ShiftBpp, %%mm1       \n\t" /* shift data to pos. correctly */
+            "pand %%mm6, %%mm1            \n\t" /* mask to use 3rd active group */
+            "addl $8, %%edx               \n\t"
+            "paddb %%mm1, %%mm0           \n\t"
+
+            "cmpl _MMXLength, %%edx       \n\t"
+            "movq %%mm0, -8(%%edi,%%edx,) \n\t" /* write updated Raws to array */
+            "movq %%mm0, %%mm1            \n\t" /* prep 1st add at top of loop */
+            "jb sub_3lp                   \n\t"
+
+            : "=a" (dummy_value_a),   /* 0      // output regs (dummy) */
+              "=D" (dummy_value_D)    /* 1 */
+
+            : "0" (bpp),              /* eax    // input regs */
+              "1" (row)               /* edi */
+
+            : "%edx", "%esi"                    /* clobber list */
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;
+
+      case 1:
+      {
+         __asm__ __volatile__ (
+            "movl _dif, %%edx            \n\t"
+/* preload  "movl row, %%edi             \n\t" */
+            "cmpl _FullLength, %%edx     \n\t"
+            "jnb sub_1end                \n\t"
+            "movl %%edi, %%esi           \n\t" /* lp = row */
+            "xorl %%eax, %%eax           \n\t"
+/* preload  "movl bpp, %%eax             \n\t" */
+            "addl %%eax, %%edi           \n\t" /* rp = row + bpp */
+
+         "sub_1lp:                       \n\t"
+            "movb (%%esi,%%edx,), %%al   \n\t"
+            "addb %%al, (%%edi,%%edx,)   \n\t"
+            "incl %%edx                  \n\t"
+            "cmpl _FullLength, %%edx     \n\t"
+            "jb sub_1lp                  \n\t"
+
+         "sub_1end:                      \n\t"
+
+            : "=a" (dummy_value_a),   /* 0      // output regs (dummy) */
+              "=D" (dummy_value_D)    /* 1 */
+
+            : "0" (bpp),              /* eax    // input regs */
+              "1" (row)               /* edi */
+
+            : "%edx", "%esi"                    /* clobber list */
+         );
+      }
+      return;
+
+      case 6:
+      case 4:
+      //case 7:   /* GRR BOGUS */
+      //case 5:   /* GRR BOGUS */
+      {
+         _ShiftBpp.use = bpp << 3;
+         _ShiftRem.use = 64 - _ShiftBpp.use;
+
+         __asm__ __volatile__ (
+/* preload  "movl row, %%edi              \n\t" */
+            "movl _dif, %%edx             \n\t"
+            "movl %%edi, %%esi            \n\t" /* lp = row */
+/* preload  "movl bpp, %%eax              \n\t" */
+            "addl %%eax, %%edi            \n\t" /* rp = row + bpp */
+
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%edx,), %%mm1 \n\t"
+
+         "sub_4lp:                        \n\t" /* shift data for adding first */
+            "psrlq _ShiftRem, %%mm1       \n\t" /*  bpp bytes (no need for mask; */
+                                                /*  shift clears inactive bytes) */
+            "movq (%%edi,%%edx,), %%mm0   \n\t"
+            "paddb %%mm1, %%mm0           \n\t"
+
+            /* add 2nd active group */
+            "movq %%mm0, %%mm1            \n\t" /* mov updated Raws to mm1 */
+            "psllq _ShiftBpp, %%mm1       \n\t" /* shift data to pos. correctly */
+            "addl $8, %%edx               \n\t"
+            "paddb %%mm1, %%mm0           \n\t"
+
+            "cmpl _MMXLength, %%edx       \n\t"
+            "movq %%mm0, -8(%%edi,%%edx,) \n\t"
+            "movq %%mm0, %%mm1            \n\t" /* prep 1st add at top of loop */
+            "jb sub_4lp                   \n\t"
+
+            : "=a" (dummy_value_a),   /* 0      // output regs (dummy) */
+              "=D" (dummy_value_D)    /* 1 */
+
+            : "0" (bpp),              /* eax    // input regs */
+              "1" (row)               /* edi */
+
+            : "%edx", "%esi"                    /* clobber list */
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1"
+#endif
+         );
+      }
+      break;
+
+      case 2:
+      {
+         _ActiveMask.use = 0x00000000ffff0000LL;
+         _ShiftBpp.use = 16;       /* == 2 * 8 */
+         _ShiftRem.use = 48;       /* == 64 - 16 */
+
+         __asm__ __volatile__ (
+            "movq _ActiveMask, %%mm7      \n\t" /* load _ActiveMask for 2nd */
+                                                /*  active byte group */
+            "movl _dif, %%edx             \n\t"
+            "movq %%mm7, %%mm6            \n\t"
+/* preload  "movl row, %%edi              \n\t" */
+            "psllq _ShiftBpp, %%mm6       \n\t" /* move mask in mm6 to cover */
+                                                /*  3rd active byte group */
+            "movl %%edi, %%esi            \n\t" /* lp = row */
+            "movq %%mm6, %%mm5            \n\t"
+/* preload  "movl bpp, %%eax              \n\t" */
+            "addl %%eax, %%edi            \n\t" /* rp = row + bpp */
+            "psllq _ShiftBpp, %%mm5       \n\t" /* move mask in mm5 to cover */
+                                                /*  4th active byte group */
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%edx,), %%mm1 \n\t"
+
+         "sub_2lp:                        \n\t" /* shift data for adding first */
+            "psrlq _ShiftRem, %%mm1       \n\t" /*  bpp bytes (no need for mask; */
+                                                /*  shift clears inactive bytes) */
+            /* add 1st active group */
+            "movq (%%edi,%%edx,), %%mm0   \n\t"
+            "paddb %%mm1, %%mm0           \n\t"
+
+            /* add 2nd active group */
+            "movq %%mm0, %%mm1            \n\t" /* mov updated Raws to mm1 */
+            "psllq _ShiftBpp, %%mm1       \n\t" /* shift data to pos. correctly */
+            "pand %%mm7, %%mm1            \n\t" /* mask to use 2nd active group */
+            "paddb %%mm1, %%mm0           \n\t"
+
+            /* add 3rd active group */
+            "movq %%mm0, %%mm1            \n\t" /* mov updated Raws to mm1 */
+            "psllq _ShiftBpp, %%mm1       \n\t" /* shift data to pos. correctly */
+            "pand %%mm6, %%mm1            \n\t" /* mask to use 3rd active group */
+            "paddb %%mm1, %%mm0           \n\t"
+
+            /* add 4th active group */
+            "movq %%mm0, %%mm1            \n\t" /* mov updated Raws to mm1 */
+            "psllq _ShiftBpp, %%mm1       \n\t" /* shift data to pos. correctly */
+            "pand %%mm5, %%mm1            \n\t" /* mask to use 4th active group */
+            "addl $8, %%edx               \n\t"
+            "paddb %%mm1, %%mm0           \n\t"
+            "cmpl _MMXLength, %%edx       \n\t"
+            "movq %%mm0, -8(%%edi,%%edx,) \n\t" /* write updated Raws to array */
+            "movq %%mm0, %%mm1            \n\t" /* prep 1st add at top of loop */
+            "jb sub_2lp                   \n\t"
+
+            : "=a" (dummy_value_a),   /* 0      // output regs (dummy) */
+              "=D" (dummy_value_D)    /* 1 */
+
+            : "0" (bpp),              /* eax    // input regs */
+              "1" (row)               /* edi */
+
+            : "%edx", "%esi"                    /* clobber list */
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm5", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;
+
+      case 8:
+      {
+         __asm__ __volatile__ (
+/* preload  "movl row, %%edi              \n\t" */
+            "movl _dif, %%edx             \n\t"
+            "movl %%edi, %%esi            \n\t" /* lp = row */
+/* preload  "movl bpp, %%eax              \n\t" */
+            "addl %%eax, %%edi            \n\t" /* rp = row + bpp */
+            "movl _MMXLength, %%ecx       \n\t"
+
+            /* prime the pump:  load the first Raw(x-bpp) data set */
+            "movq -8(%%edi,%%edx,), %%mm7 \n\t"
+            "andl $0x0000003f, %%ecx      \n\t" /* calc bytes over mult of 64 */
+
+         "sub_8lp:                        \n\t"
+            "movq (%%edi,%%edx,), %%mm0   \n\t" /* load Sub(x) for 1st 8 bytes */
+            "paddb %%mm7, %%mm0           \n\t"
+            "movq 8(%%edi,%%edx,), %%mm1  \n\t" /* load Sub(x) for 2nd 8 bytes */
+            "movq %%mm0, (%%edi,%%edx,)   \n\t" /* write Raw(x) for 1st 8 bytes */
+
+            /* Now mm0 will be used as Raw(x-bpp) for the 2nd group of 8 bytes. */
+            /* This will be repeated for each group of 8 bytes with the 8th */
+            /* group being used as the Raw(x-bpp) for the 1st group of the */
+            /* next loop. */
+
+            "paddb %%mm0, %%mm1           \n\t"
+            "movq 16(%%edi,%%edx,), %%mm2 \n\t" /* load Sub(x) for 3rd 8 bytes */
+            "movq %%mm1, 8(%%edi,%%edx,)  \n\t" /* write Raw(x) for 2nd 8 bytes */
+            "paddb %%mm1, %%mm2           \n\t"
+            "movq 24(%%edi,%%edx,), %%mm3 \n\t" /* load Sub(x) for 4th 8 bytes */
+            "movq %%mm2, 16(%%edi,%%edx,) \n\t" /* write Raw(x) for 3rd 8 bytes */
+            "paddb %%mm2, %%mm3           \n\t"
+            "movq 32(%%edi,%%edx,), %%mm4 \n\t" /* load Sub(x) for 5th 8 bytes */
+            "movq %%mm3, 24(%%edi,%%edx,) \n\t" /* write Raw(x) for 4th 8 bytes */
+            "paddb %%mm3, %%mm4           \n\t"
+            "movq 40(%%edi,%%edx,), %%mm5 \n\t" /* load Sub(x) for 6th 8 bytes */
+            "movq %%mm4, 32(%%edi,%%edx,) \n\t" /* write Raw(x) for 5th 8 bytes */
+            "paddb %%mm4, %%mm5           \n\t"
+            "movq 48(%%edi,%%edx,), %%mm6 \n\t" /* load Sub(x) for 7th 8 bytes */
+            "movq %%mm5, 40(%%edi,%%edx,) \n\t" /* write Raw(x) for 6th 8 bytes */
+            "paddb %%mm5, %%mm6           \n\t"
+            "movq 56(%%edi,%%edx,), %%mm7 \n\t" /* load Sub(x) for 8th 8 bytes */
+            "movq %%mm6, 48(%%edi,%%edx,) \n\t" /* write Raw(x) for 7th 8 bytes */
+            "addl $64, %%edx              \n\t"
+            "paddb %%mm6, %%mm7           \n\t"
+            "cmpl %%ecx, %%edx            \n\t"
+            "movq %%mm7, -8(%%edi,%%edx,) \n\t" /* write Raw(x) for 8th 8 bytes */
+            "jb sub_8lp                   \n\t"
+
+            "cmpl _MMXLength, %%edx       \n\t"
+            "jnb sub_8lt8                 \n\t"
+
+         "sub_8lpA:                       \n\t"
+            "movq (%%edi,%%edx,), %%mm0   \n\t"
+            "addl $8, %%edx               \n\t"
+            "paddb %%mm7, %%mm0           \n\t"
+            "cmpl _MMXLength, %%edx       \n\t"
+            "movq %%mm0, -8(%%edi,%%edx,) \n\t" /* -8 to offset early addl edx */
+            "movq %%mm0, %%mm7            \n\t" /* move calculated Raw(x) data */
+                                                /*  to mm1 to be new Raw(x-bpp) */
+                                                /*  for next loop */
+            "jb sub_8lpA                  \n\t"
+
+         "sub_8lt8:                       \n\t"
+
+            : "=a" (dummy_value_a),   /* 0      // output regs (dummy) */
+              "=D" (dummy_value_D)    /* 1 */
+
+            : "0" (bpp),              /* eax    // input regs */
+              "1" (row)               /* edi */
+
+            : "%ecx", "%edx", "%esi"            /* clobber list */
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1", "%mm2", "%mm3", "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+         );
+      }
+      break;
+
+      default:                /* bpp greater than 8 bytes   GRR BOGUS */
+      {
+         __asm__ __volatile__ (
+            "movl _dif, %%edx             \n\t"
+/* preload  "movl row, %%edi              \n\t" */
+            "movl %%edi, %%esi            \n\t" /* lp = row */
+/* preload  "movl bpp, %%eax              \n\t" */
+            "addl %%eax, %%edi            \n\t" /* rp = row + bpp */
+
+         "sub_Alp:                        \n\t"
+            "movq (%%edi,%%edx,), %%mm0   \n\t"
+            "movq (%%esi,%%edx,), %%mm1   \n\t"
+            "addl $8, %%edx               \n\t"
+            "paddb %%mm1, %%mm0           \n\t"
+            "cmpl _MMXLength, %%edx       \n\t"
+            "movq %%mm0, -8(%%edi,%%edx,) \n\t" /* mov does not affect flags; */
+                                                /*  -8 to offset addl edx */
+            "jb sub_Alp                   \n\t"
+
+            : "=a" (dummy_value_a),   /* 0      // output regs (dummy) */
+              "=D" (dummy_value_D)    /* 1 */
+
+            : "0" (bpp),              /* eax    // input regs */
+              "1" (row)               /* edi */
+
+            : "%edx", "%esi"                    /* clobber list */
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+            , "%mm0", "%mm1"
+#endif
+         );
+      }
+      break;
+
+   } /* end switch (bpp) */
+
+   __asm__ __volatile__ (
+      "movl _MMXLength, %%edx       \n\t"
+/* pre "movl row, %%edi              \n\t" */
+      "cmpl _FullLength, %%edx      \n\t"
+      "jnb sub_end                  \n\t"
+
+      "movl %%edi, %%esi            \n\t" /* lp = row */
+/* pre "movl bpp, %%eax              \n\t" */
+      "addl %%eax, %%edi            \n\t" /* rp = row + bpp */
+      "xorl %%eax, %%eax            \n\t"
+
+   "sub_lp2:                        \n\t"
+      "movb (%%esi,%%edx,), %%al    \n\t"
+      "addb %%al, (%%edi,%%edx,)    \n\t"
+      "incl %%edx                   \n\t"
+      "cmpl _FullLength, %%edx      \n\t"
+      "jb sub_lp2                   \n\t"
+
+   "sub_end:                        \n\t"
+      "EMMS                         \n\t" /* end MMX instructions */
+
+      : "=a" (dummy_value_a),   /* 0      // output regs (dummy) */
+        "=D" (dummy_value_D)    /* 1 */
+
+      : "0" (bpp),              /* eax    // input regs */
+        "1" (row)               /* edi */
+
+      : "%edx", "%esi"                    /* clobber list */
+   );
+
+} /* end of png_read_filter_row_mmx_sub() */
+#endif
+
+
+
+
+/*===========================================================================*/
+/*                                                                           */
+/*            P N G _ R E A D _ F I L T E R _ R O W _ M M X _ U P            */
+/*                                                                           */
+/*===========================================================================*/
+
+/* Optimized code for PNG Up filter decoder */
+
+static void /* PRIVATE */
+png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row,
+                           png_bytep prev_row)
+{
+   png_uint_32 len;
+   int dummy_value_d;   /* fix 'forbidden register 3 (dx) was spilled' error */
+   int dummy_value_S;
+   int dummy_value_D;
+
+   len = row_info->rowbytes;              /* number of bytes to filter */
+
+   __asm__ __volatile__ (
+/* pre "movl row, %%edi              \n\t" */
+      /* get # of bytes to alignment */
+#ifdef __PIC__
+      "pushl %%ebx                  \n\t"
+#endif
+      "movl %%edi, %%ecx            \n\t"
+      "xorl %%ebx, %%ebx            \n\t"
+      "addl $0x7, %%ecx             \n\t"
+      "xorl %%eax, %%eax            \n\t"
+      "andl $0xfffffff8, %%ecx      \n\t"
+/* pre "movl prev_row, %%esi         \n\t" */
+      "subl %%edi, %%ecx            \n\t"
+      "jz up_go                     \n\t"
+
+   "up_lp1:                         \n\t" /* fix alignment */
+      "movb (%%edi,%%ebx,), %%al    \n\t"
+      "addb (%%esi,%%ebx,), %%al    \n\t"
+      "incl %%ebx                   \n\t"
+      "cmpl %%ecx, %%ebx            \n\t"
+      "movb %%al, -1(%%edi,%%ebx,)  \n\t" /* mov does not affect flags; -1 to */
+      "jb up_lp1                    \n\t" /*  offset incl ebx */
+
+   "up_go:                          \n\t"
+/* pre "movl len, %%edx              \n\t" */
+      "movl %%edx, %%ecx            \n\t"
+      "subl %%ebx, %%edx            \n\t" /* subtract alignment fix */
+      "andl $0x0000003f, %%edx      \n\t" /* calc bytes over mult of 64 */
+      "subl %%edx, %%ecx            \n\t" /* drop over bytes from length */
+
+      /* unrolled loop - use all MMX registers and interleave to reduce */
+      /* number of branch instructions (loops) and reduce partial stalls */
+   "up_loop:                        \n\t"
+      "movq (%%esi,%%ebx,), %%mm1   \n\t"
+      "movq (%%edi,%%ebx,), %%mm0   \n\t"
+      "movq 8(%%esi,%%ebx,), %%mm3  \n\t"
+      "paddb %%mm1, %%mm0           \n\t"
+      "movq 8(%%edi,%%ebx,), %%mm2  \n\t"
+      "movq %%mm0, (%%edi,%%ebx,)   \n\t"
+      "paddb %%mm3, %%mm2           \n\t"
+      "movq 16(%%esi,%%ebx,), %%mm5 \n\t"
+      "movq %%mm2, 8(%%edi,%%ebx,)  \n\t"
+      "movq 16(%%edi,%%ebx,), %%mm4 \n\t"
+      "movq 24(%%esi,%%ebx,), %%mm7 \n\t"
+      "paddb %%mm5, %%mm4           \n\t"
+      "movq 24(%%edi,%%ebx,), %%mm6 \n\t"
+      "movq %%mm4, 16(%%edi,%%ebx,) \n\t"
+      "paddb %%mm7, %%mm6           \n\t"
+      "movq 32(%%esi,%%ebx,), %%mm1 \n\t"
+      "movq %%mm6, 24(%%edi,%%ebx,) \n\t"
+      "movq 32(%%edi,%%ebx,), %%mm0 \n\t"
+      "movq 40(%%esi,%%ebx,), %%mm3 \n\t"
+      "paddb %%mm1, %%mm0           \n\t"
+      "movq 40(%%edi,%%ebx,), %%mm2 \n\t"
+      "movq %%mm0, 32(%%edi,%%ebx,) \n\t"
+      "paddb %%mm3, %%mm2           \n\t"
+      "movq 48(%%esi,%%ebx,), %%mm5 \n\t"
+      "movq %%mm2, 40(%%edi,%%ebx,) \n\t"
+      "movq 48(%%edi,%%ebx,), %%mm4 \n\t"
+      "movq 56(%%esi,%%ebx,), %%mm7 \n\t"
+      "paddb %%mm5, %%mm4           \n\t"
+      "movq 56(%%edi,%%ebx,), %%mm6 \n\t"
+      "movq %%mm4, 48(%%edi,%%ebx,) \n\t"
+      "addl $64, %%ebx              \n\t"
+      "paddb %%mm7, %%mm6           \n\t"
+      "cmpl %%ecx, %%ebx            \n\t"
+      "movq %%mm6, -8(%%edi,%%ebx,) \n\t" /* (+56)movq does not affect flags; */
+      "jb up_loop                   \n\t" /*  -8 to offset addl ebx */
+
+      "cmpl $0, %%edx               \n\t" /* test for bytes over mult of 64 */
+      "jz up_end                    \n\t"
+
+      "cmpl $8, %%edx               \n\t" /* test for less than 8 bytes */
+      "jb up_lt8                    \n\t" /*  [added by lcreeve@netins.net] */
+
+      "addl %%edx, %%ecx            \n\t"
+      "andl $0x00000007, %%edx      \n\t" /* calc bytes over mult of 8 */
+      "subl %%edx, %%ecx            \n\t" /* drop over bytes from length */
+      "jz up_lt8                    \n\t"
+
+   "up_lpA:                         \n\t" /* use MMX regs to update 8 bytes sim. */
+      "movq (%%esi,%%ebx,), %%mm1   \n\t"
+      "movq (%%edi,%%ebx,), %%mm0   \n\t"
+      "addl $8, %%ebx               \n\t"
+      "paddb %%mm1, %%mm0           \n\t"
+      "cmpl %%ecx, %%ebx            \n\t"
+      "movq %%mm0, -8(%%edi,%%ebx,) \n\t" /* movq does not affect flags; -8 to */
+      "jb up_lpA                    \n\t" /*  offset add ebx */
+      "cmpl $0, %%edx               \n\t" /* test for bytes over mult of 8 */
+      "jz up_end                    \n\t"
+
+   "up_lt8:                         \n\t"
+      "xorl %%eax, %%eax            \n\t"
+      "addl %%edx, %%ecx            \n\t" /* move over byte count into counter */
+
+   "up_lp2:                         \n\t" /* use x86 regs for remaining bytes */
+      "movb (%%edi,%%ebx,), %%al    \n\t"
+      "addb (%%esi,%%ebx,), %%al    \n\t"
+      "incl %%ebx                   \n\t"
+      "cmpl %%ecx, %%ebx            \n\t"
+      "movb %%al, -1(%%edi,%%ebx,)  \n\t" /* mov does not affect flags; -1 to */
+      "jb up_lp2                    \n\t" /*  offset inc ebx */
+
+   "up_end:                         \n\t"
+      "EMMS                         \n\t" /* conversion of filtered row complete */
+#ifdef __PIC__
+      "popl %%ebx                   \n\t"
+#endif
+
+      : "=d" (dummy_value_d),   /* 0      // output regs (dummy) */
+        "=S" (dummy_value_S),   /* 1 */
+        "=D" (dummy_value_D)    /* 2 */
+
+      : "0" (len),              /* edx    // input regs */
+        "1" (prev_row),         /* esi */
+        "2" (row)               /* edi */
+
+      : "%eax", "%ecx"            // clobber list (no input regs!)
+#ifndef __PIC__
+      , "%ebx"
+#endif
+
+#if 0  /* MMX regs (%mm0, etc.) not supported by gcc 2.7.2.3 or egcs 1.1 */
+      , "%mm0", "%mm1", "%mm2", "%mm3"
+      , "%mm4", "%mm5", "%mm6", "%mm7"
+#endif
+   );
+
+} /* end of png_read_filter_row_mmx_up() */
+
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+
+
+
+
+/*===========================================================================*/
+/*                                                                           */
+/*                   P N G _ R E A D _ F I L T E R _ R O W                   */
+/*                                                                           */
+/*===========================================================================*/
+
+
+/* Optimized png_read_filter_row routines */
+
+void /* PRIVATE */
+png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
+   row, png_bytep prev_row, int filter)
+{
+#ifdef PNG_DEBUG
+   char filnm[10];
+#endif
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+/* GRR:  these are superseded by png_ptr->asm_flags: */
+#define UseMMX_sub    1   /* GRR:  converted 20000730 */
+#define UseMMX_up     1   /* GRR:  converted 20000729 */
+#define UseMMX_avg    1   /* GRR:  converted 20000828 (+ 16-bit bugfix 20000916) */
+#define UseMMX_paeth  1   /* GRR:  converted 20000828 */
+
+   if (_mmx_supported == 2) {
+       /* this should have happened in png_init_mmx_flags() already */
+#if !defined(PNG_1_0_X)
+       png_warning(png_ptr, "asm_flags may not have been initialized");
+#endif
+       png_mmx_support();
+   }
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_DEBUG
+   png_debug(1, "in png_read_filter_row (pnggccrd.c)\n");
+   switch (filter)
+   {
+      case 0: sprintf(filnm, "none");
+         break;
+      case 1: sprintf(filnm, "sub-%s",
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+        (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB)? "MMX" : 
+#endif
+#endif
+"x86");
+         break;
+      case 2: sprintf(filnm, "up-%s",
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+#if !defined(PNG_1_0_X)
+        (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP)? "MMX" :
+#endif
+#endif
+ "x86");
+         break;
+      case 3: sprintf(filnm, "avg-%s",
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+        (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG)? "MMX" :
+#endif
+#endif
+ "x86");
+         break;
+      case 4: sprintf(filnm, "Paeth-%s",
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+        (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH)? "MMX":
+#endif
+#endif
+"x86");
+         break;
+      default: sprintf(filnm, "unknw");
+         break;
+   }
+   png_debug2(0, "row_number=%5ld, %5s, ", png_ptr->row_number, filnm);
+   png_debug1(0, "row=0x%08lx, ", (unsigned long)row);
+   png_debug2(0, "pixdepth=%2d, bytes=%d, ", (int)row_info->pixel_depth,
+      (int)((row_info->pixel_depth + 7) >> 3));
+   png_debug1(0,"rowbytes=%8ld\n", row_info->rowbytes);
+#endif /* PNG_DEBUG */
+
+   switch (filter)
+   {
+      case PNG_FILTER_VALUE_NONE:
+         break;
+
+      case PNG_FILTER_VALUE_SUB:
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+         if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB) &&
+             (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
+             (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+         if (_mmx_supported)
+#endif
+         {
+            png_read_filter_row_mmx_sub(row_info, row);
+         }
+         else
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+         {
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+            png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+            png_bytep rp = row + bpp;
+            png_bytep lp = row;
+
+            for (i = bpp; i < istop; i++)
+            {
+               *rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
+               rp++;
+            }
+         }  /* end !UseMMX_sub */
+         break;
+
+      case PNG_FILTER_VALUE_UP:
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+#if !defined(PNG_1_0_X)
+         if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP) &&
+             (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
+             (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+         if (_mmx_supported)
+#endif
+         {
+            png_read_filter_row_mmx_up(row_info, row, prev_row);
+         }
+          else
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+         {
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+            png_bytep rp = row;
+            png_bytep pp = prev_row;
+
+            for (i = 0; i < istop; ++i)
+            {
+               *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+               rp++;
+            }
+         }  /* end !UseMMX_up */
+         break;
+
+      case PNG_FILTER_VALUE_AVG:
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+         if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG) &&
+             (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
+             (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+         if (_mmx_supported)
+#endif
+         {
+            png_read_filter_row_mmx_avg(row_info, row, prev_row);
+         }
+         else
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+         {
+            png_uint_32 i;
+            png_bytep rp = row;
+            png_bytep pp = prev_row;
+            png_bytep lp = row;
+            png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+            png_uint_32 istop = row_info->rowbytes - bpp;
+
+            for (i = 0; i < bpp; i++)
+            {
+               *rp = (png_byte)(((int)(*rp) +
+                  ((int)(*pp++) >> 1)) & 0xff);
+               rp++;
+            }
+
+            for (i = 0; i < istop; i++)
+            {
+               *rp = (png_byte)(((int)(*rp) +
+                  ((int)(*pp++ + *lp++) >> 1)) & 0xff);
+               rp++;
+            }
+         }  /* end !UseMMX_avg */
+         break;
+
+      case PNG_FILTER_VALUE_PAETH:
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_THREAD_UNSAFE_OK)
+#if !defined(PNG_1_0_X)
+         if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH) &&
+             (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
+             (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+         if (_mmx_supported)
+#endif
+         {
+            png_read_filter_row_mmx_paeth(row_info, row, prev_row);
+         }
+         else
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+         {
+            png_uint_32 i;
+            png_bytep rp = row;
+            png_bytep pp = prev_row;
+            png_bytep lp = row;
+            png_bytep cp = prev_row;
+            png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+            png_uint_32 istop = row_info->rowbytes - bpp;
+
+            for (i = 0; i < bpp; i++)
+            {
+               *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+               rp++;
+            }
+
+            for (i = 0; i < istop; i++)   /* use leftover rp,pp */
+            {
+               int a, b, c, pa, pb, pc, p;
+
+               a = *lp++;
+               b = *pp++;
+               c = *cp++;
+
+               p = b - c;
+               pc = a - c;
+
+#ifdef PNG_USE_ABS
+               pa = abs(p);
+               pb = abs(pc);
+               pc = abs(p + pc);
+#else
+               pa = p < 0 ? -p : p;
+               pb = pc < 0 ? -pc : pc;
+               pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+               /*
+                  if (pa <= pb && pa <= pc)
+                     p = a;
+                  else if (pb <= pc)
+                     p = b;
+                  else
+                     p = c;
+                */
+
+               p = (pa <= pb && pa <= pc) ? a : (pb <= pc) ? b : c;
+
+               *rp = (png_byte)(((int)(*rp) + p) & 0xff);
+               rp++;
+            }
+         }  /* end !UseMMX_paeth */
+         break;
+
+      default:
+         png_warning(png_ptr, "Ignoring bad row-filter type");
+         *row=0;
+         break;
+   }
+}
+
+#endif /* PNG_HAVE_ASSEMBLER_READ_FILTER_ROW */
+
+
+/*===========================================================================*/
+/*                                                                           */
+/*                      P N G _ M M X _ S U P P O R T                        */
+/*                                                                           */
+/*===========================================================================*/
+
+/* GRR NOTES:  (1) the following code assumes 386 or better (pushfl/popfl)
+ *             (2) all instructions compile with gcc 2.7.2.3 and later
+ *             (3) the function is moved down here to prevent gcc from
+ *                  inlining it in multiple places and then barfing be-
+ *                  cause the ".NOT_SUPPORTED" label is multiply defined
+ *             [is there a way to signal that a *single* function should
+ *              not be inlined?  is there a way to modify the label for
+ *              each inlined instance, e.g., by appending _1, _2, etc.?
+ *              maybe if don't use leading "." in label name? (nope...sigh)]
+ */
+
+int PNGAPI
+png_mmx_support(void)
+{
+#if defined(PNG_MMX_CODE_SUPPORTED)
+    __asm__ __volatile__ (
+        "pushl %%ebx          \n\t"  // ebx gets clobbered by CPUID instruction
+        "pushl %%ecx          \n\t"  // so does ecx...
+        "pushl %%edx          \n\t"  // ...and edx (but ecx & edx safe on Linux)
+//      ".byte  0x66          \n\t"  // convert 16-bit pushf to 32-bit pushfd
+//      "pushf                \n\t"  // 16-bit pushf
+        "pushfl               \n\t"  // save Eflag to stack
+        "popl %%eax           \n\t"  // get Eflag from stack into eax
+        "movl %%eax, %%ecx    \n\t"  // make another copy of Eflag in ecx
+        "xorl $0x200000, %%eax \n\t" // toggle ID bit in Eflag (i.e., bit 21)
+        "pushl %%eax          \n\t"  // save modified Eflag back to stack
+//      ".byte  0x66          \n\t"  // convert 16-bit popf to 32-bit popfd
+//      "popf                 \n\t"  // 16-bit popf
+        "popfl                \n\t"  // restore modified value to Eflag reg
+        "pushfl               \n\t"  // save Eflag to stack
+        "popl %%eax           \n\t"  // get Eflag from stack
+        "pushl %%ecx          \n\t"  // save original Eflag to stack
+        "popfl                \n\t"  // restore original Eflag
+        "xorl %%ecx, %%eax    \n\t"  // compare new Eflag with original Eflag
+        "jz 0f                \n\t"  // if same, CPUID instr. is not supported
+
+        "xorl %%eax, %%eax    \n\t"  // set eax to zero
+//      ".byte  0x0f, 0xa2    \n\t"  // CPUID instruction (two-byte opcode)
+        "cpuid                \n\t"  // get the CPU identification info
+        "cmpl $1, %%eax       \n\t"  // make sure eax return non-zero value
+        "jl 0f                \n\t"  // if eax is zero, MMX is not supported
+
+        "xorl %%eax, %%eax    \n\t"  // set eax to zero and...
+        "incl %%eax           \n\t"  // ...increment eax to 1.  This pair is
+                                     // faster than the instruction "mov eax, 1"
+        "cpuid                \n\t"  // get the CPU identification info again
+        "andl $0x800000, %%edx \n\t" // mask out all bits but MMX bit (23)
+        "cmpl $0, %%edx       \n\t"  // 0 = MMX not supported
+        "jz 0f                \n\t"  // non-zero = yes, MMX IS supported
+
+        "movl $1, %%eax       \n\t"  // set return value to 1
+        "jmp  1f              \n\t"  // DONE:  have MMX support
+
+    "0:                       \n\t"  // .NOT_SUPPORTED: target label for jump instructions
+        "movl $0, %%eax       \n\t"  // set return value to 0
+    "1:                       \n\t"  // .RETURN: target label for jump instructions
+        "movl %%eax, _mmx_supported \n\t" // save in global static variable, too
+        "popl %%edx           \n\t"  // restore edx
+        "popl %%ecx           \n\t"  // restore ecx
+        "popl %%ebx           \n\t"  // restore ebx
+
+//      "ret                  \n\t"  // DONE:  no MMX support
+                                     // (fall through to standard C "ret")
+
+        :                            // output list (none)
+
+        :                            // any variables used on input (none)
+
+        : "%eax"                     // clobber list
+//      , "%ebx", "%ecx", "%edx"     // GRR:  we handle these manually
+//      , "memory"   // if write to a variable gcc thought was in a reg
+//      , "cc"       // "condition codes" (flag bits)
+    );
+#else     
+    _mmx_supported = 0;
+#endif /* PNG_MMX_CODE_SUPPORTED */
+
+    return _mmx_supported;
+}
+
+
+#endif /* PNG_USE_PNGGCCRD */
diff --git a/Source/3rd Party/wx/src/png/pngget.c b/Source/3rd Party/wx/src/png/pngget.c
index 1889e9903..1d1cc218b 100644
--- a/Source/3rd Party/wx/src/png/pngget.c	
+++ b/Source/3rd Party/wx/src/png/pngget.c	
@@ -1,1124 +1,934 @@
-
-/* pngget.c - retrieval of values from info struct
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-png_uint_32 PNGAPI
-png_get_valid(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 flag)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->valid & flag);
-
-   return(0);
-}
-
-png_size_t PNGAPI
-png_get_rowbytes(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->rowbytes);
-
-   return(0);
-}
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-png_bytepp PNGAPI
-png_get_rows(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->row_pointers);
-
-   return(0);
-}
-#endif
-
-#ifdef PNG_EASY_ACCESS_SUPPORTED
-/* Easy access to info, added in libpng-0.99 */
-png_uint_32 PNGAPI
-png_get_image_width(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->width;
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_image_height(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->height;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_bit_depth(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->bit_depth;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_color_type(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->color_type;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_filter_type(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->filter_type;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_interlace_type(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->interlace_type;
-
-   return (0);
-}
-
-png_byte PNGAPI
-png_get_compression_type(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return info_ptr->compression_type;
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_x_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-      {
-         png_debug1(1, "in %s retrieval function",
-             "png_get_x_pixels_per_meter");
-
-         if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-            return (info_ptr->x_pixels_per_unit);
-      }
-#endif
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_y_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_debug1(1, "in %s retrieval function",
-          "png_get_y_pixels_per_meter");
-
-      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER)
-         return (info_ptr->y_pixels_per_unit);
-   }
-#endif
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_pixels_per_meter(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
-
-      if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER &&
-          info_ptr->x_pixels_per_unit == info_ptr->y_pixels_per_unit)
-         return (info_ptr->x_pixels_per_unit);
-   }
-#endif
-
-   return (0);
-}
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-float PNGAPI
-png_get_pixel_aspect_ratio(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_READ_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
-
-      if (info_ptr->x_pixels_per_unit != 0)
-         return ((float)((float)info_ptr->y_pixels_per_unit
-             /(float)info_ptr->x_pixels_per_unit));
-   }
-#endif
-
-   return ((float)0.0);
-}
-#endif
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-png_fixed_point PNGAPI
-png_get_pixel_aspect_ratio_fixed(png_const_structp png_ptr,
-    png_const_infop info_ptr)
-{
-#ifdef PNG_READ_pHYs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)
-       && info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0
-       && info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX
-       && info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)
-   {
-      png_fixed_point res;
-
-      png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio_fixed");
-
-      /* The following casts work because a PNG 4 byte integer only has a valid
-       * range of 0..2^31-1; otherwise the cast might overflow.
-       */
-      if (png_muldiv(&res, (png_int_32)info_ptr->y_pixels_per_unit, PNG_FP_1,
-          (png_int_32)info_ptr->x_pixels_per_unit))
-         return res;
-   }
-#endif
-
-   return 0;
-}
-#endif
-
-png_int_32 PNGAPI
-png_get_x_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->x_offset);
-   }
-#endif
-
-   return (0);
-}
-
-png_int_32 PNGAPI
-png_get_y_offset_microns(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER)
-         return (info_ptr->y_offset);
-   }
-#endif
-
-   return (0);
-}
-
-png_int_32 PNGAPI
-png_get_x_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->x_offset);
-   }
-#endif
-
-   return (0);
-}
-
-png_int_32 PNGAPI
-png_get_y_offset_pixels(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-#ifdef PNG_oFFs_SUPPORTED
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");
-
-      if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL)
-         return (info_ptr->y_offset);
-   }
-#endif
-
-   return (0);
-}
-
-#ifdef PNG_INCH_CONVERSIONS_SUPPORTED
-static png_uint_32
-ppi_from_ppm(png_uint_32 ppm)
-{
-#if 0
-   /* The conversion is *(2.54/100), in binary (32 digits):
-    * .00000110100000001001110101001001
-    */
-   png_uint_32 t1001, t1101;
-   ppm >>= 1;                  /* .1 */
-   t1001 = ppm + (ppm >> 3);   /* .1001 */
-   t1101 = t1001 + (ppm >> 1); /* .1101 */
-   ppm >>= 20;                 /* .000000000000000000001 */
-   t1101 += t1101 >> 15;       /* .1101000000000001101 */
-   t1001 >>= 11;               /* .000000000001001 */
-   t1001 += t1001 >> 12;       /* .000000000001001000000001001 */
-   ppm += t1001;               /* .000000000001001000001001001 */
-   ppm += t1101;               /* .110100000001001110101001001 */
-   return (ppm + 16) >> 5;/* .00000110100000001001110101001001 */
-#else
-   /* The argument is a PNG unsigned integer, so it is not permitted
-    * to be bigger than 2^31.
-    */
-   png_fixed_point result;
-   if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127,
-       5000))
-      return result;
-
-   /* Overflow. */
-   return 0;
-#endif
-}
-
-png_uint_32 PNGAPI
-png_get_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   return ppi_from_ppm(png_get_pixels_per_meter(png_ptr, info_ptr));
-}
-
-png_uint_32 PNGAPI
-png_get_x_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   return ppi_from_ppm(png_get_x_pixels_per_meter(png_ptr, info_ptr));
-}
-
-png_uint_32 PNGAPI
-png_get_y_pixels_per_inch(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   return ppi_from_ppm(png_get_y_pixels_per_meter(png_ptr, info_ptr));
-}
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-static png_fixed_point
-png_fixed_inches_from_microns(png_structp png_ptr, png_int_32 microns)
-{
-   /* Convert from metres * 1,000,000 to inches * 100,000, meters to
-    * inches is simply *(100/2.54), so we want *(10/2.54) == 500/127.
-    * Notice that this can overflow - a warning is output and 0 is
-    * returned.
-    */
-   return png_muldiv_warn(png_ptr, microns, 500, 127);
-}
-
-png_fixed_point PNGAPI
-png_get_x_offset_inches_fixed(png_structp png_ptr,
-    png_const_infop info_ptr)
-{
-   return png_fixed_inches_from_microns(png_ptr,
-       png_get_x_offset_microns(png_ptr, info_ptr));
-}
-#endif
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-png_fixed_point PNGAPI
-png_get_y_offset_inches_fixed(png_structp png_ptr,
-    png_const_infop info_ptr)
-{
-   return png_fixed_inches_from_microns(png_ptr,
-       png_get_y_offset_microns(png_ptr, info_ptr));
-}
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-float PNGAPI
-png_get_x_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   /* To avoid the overflow do the conversion directly in floating
-    * point.
-    */
-   return (float)(png_get_x_offset_microns(png_ptr, info_ptr) * .00003937);
-}
-#endif
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-float PNGAPI
-png_get_y_offset_inches(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   /* To avoid the overflow do the conversion directly in floating
-    * point.
-    */
-   return (float)(png_get_y_offset_microns(png_ptr, info_ptr) * .00003937);
-}
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-png_uint_32 PNGAPI
-png_get_pHYs_dpi(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
-{
-   png_uint_32 retval = 0;
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_debug1(1, "in %s retrieval function", "pHYs");
-
-      if (res_x != NULL)
-      {
-         *res_x = info_ptr->x_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (res_y != NULL)
-      {
-         *res_y = info_ptr->y_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (unit_type != NULL)
-      {
-         *unit_type = (int)info_ptr->phys_unit_type;
-         retval |= PNG_INFO_pHYs;
-
-         if (*unit_type == 1)
-         {
-            if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);
-            if (res_y != NULL) *res_y = (png_uint_32)(*res_y * .0254 + .50);
-         }
-      }
-   }
-
-   return (retval);
-}
-#endif /* PNG_pHYs_SUPPORTED */
-#endif  /* PNG_INCH_CONVERSIONS_SUPPORTED */
-
-/* png_get_channels really belongs in here, too, but it's been around longer */
-
-#endif  /* PNG_EASY_ACCESS_SUPPORTED */
-
-png_byte PNGAPI
-png_get_channels(png_const_structp png_ptr, png_const_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->channels);
-
-   return (0);
-}
-
-png_const_bytep PNGAPI
-png_get_signature(png_const_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr != NULL && info_ptr != NULL)
-      return(info_ptr->signature);
-
-   return (NULL);
-}
-
-#ifdef PNG_bKGD_SUPPORTED
-png_uint_32 PNGAPI
-png_get_bKGD(png_const_structp png_ptr, png_infop info_ptr,
-   png_color_16p *background)
-{
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
-       && background != NULL)
-   {
-      png_debug1(1, "in %s retrieval function", "bKGD");
-
-      *background = &(info_ptr->background);
-      return (PNG_INFO_bKGD);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-/* The XYZ APIs were added in 1.5.5 to take advantage of the code added at the
- * same time to correct the rgb grayscale coefficient defaults obtained from the
- * cHRM chunk in 1.5.4
- */
-png_uint_32 PNGFAPI
-png_get_cHRM_XYZ_fixed(png_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *int_red_X, png_fixed_point *int_red_Y,
-    png_fixed_point *int_red_Z, png_fixed_point *int_green_X,
-    png_fixed_point *int_green_Y, png_fixed_point *int_green_Z,
-    png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
-    png_fixed_point *int_blue_Z)
-{
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-   {
-      png_xy xy;
-      png_XYZ XYZ;
-
-      png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
-
-      xy.whitex = info_ptr->x_white;
-      xy.whitey = info_ptr->y_white;
-      xy.redx = info_ptr->x_red;
-      xy.redy = info_ptr->y_red;
-      xy.greenx = info_ptr->x_green;
-      xy.greeny = info_ptr->y_green;
-      xy.bluex = info_ptr->x_blue;
-      xy.bluey = info_ptr->y_blue;
-
-      /* The *_checked function handles error reporting, so just return 0 if
-       * there is a failure here.
-       */
-      if (png_XYZ_from_xy_checked(png_ptr, &XYZ, xy))
-      {
-         if (int_red_X != NULL)
-            *int_red_X = XYZ.redX;
-         if (int_red_Y != NULL)
-            *int_red_Y = XYZ.redY;
-         if (int_red_Z != NULL)
-            *int_red_Z = XYZ.redZ;
-         if (int_green_X != NULL)
-            *int_green_X = XYZ.greenX;
-         if (int_green_Y != NULL)
-            *int_green_Y = XYZ.greenY;
-         if (int_green_Z != NULL)
-            *int_green_Z = XYZ.greenZ;
-         if (int_blue_X != NULL)
-            *int_blue_X = XYZ.blueX;
-         if (int_blue_Y != NULL)
-            *int_blue_Y = XYZ.blueY;
-         if (int_blue_Z != NULL)
-            *int_blue_Z = XYZ.blueZ;
-
-         return (PNG_INFO_cHRM);
-      }
-   }
-
-   return (0);
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_cHRM(png_const_structp png_ptr, png_const_infop info_ptr,
-    double *white_x, double *white_y, double *red_x, double *red_y,
-    double *green_x, double *green_y, double *blue_x, double *blue_y)
-{
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-   {
-      png_debug1(1, "in %s retrieval function", "cHRM");
-
-      if (white_x != NULL)
-         *white_x = png_float(png_ptr, info_ptr->x_white, "cHRM white X");
-      if (white_y != NULL)
-         *white_y = png_float(png_ptr, info_ptr->y_white, "cHRM white Y");
-      if (red_x != NULL)
-         *red_x = png_float(png_ptr, info_ptr->x_red, "cHRM red X");
-      if (red_y != NULL)
-         *red_y = png_float(png_ptr, info_ptr->y_red, "cHRM red Y");
-      if (green_x != NULL)
-         *green_x = png_float(png_ptr, info_ptr->x_green, "cHRM green X");
-      if (green_y != NULL)
-         *green_y = png_float(png_ptr, info_ptr->y_green, "cHRM green Y");
-      if (blue_x != NULL)
-         *blue_x = png_float(png_ptr, info_ptr->x_blue, "cHRM blue X");
-      if (blue_y != NULL)
-         *blue_y = png_float(png_ptr, info_ptr->y_blue, "cHRM blue Y");
-      return (PNG_INFO_cHRM);
-   }
-
-   return (0);
-}
-
-png_uint_32 PNGAPI
-png_get_cHRM_XYZ(png_structp png_ptr, png_const_infop info_ptr,
-   double *red_X, double *red_Y, double *red_Z, double *green_X,
-   double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
-   double *blue_Z)
-{
-   png_XYZ XYZ;
-
-   if (png_get_cHRM_XYZ_fixed(png_ptr, info_ptr,
-      &XYZ.redX, &XYZ.redY, &XYZ.redZ, &XYZ.greenX, &XYZ.greenY, &XYZ.greenZ,
-      &XYZ.blueX, &XYZ.blueY, &XYZ.blueZ) & PNG_INFO_cHRM)
-   {
-      if (red_X != NULL)
-         *red_X = png_float(png_ptr, XYZ.redX, "cHRM red X");
-      if (red_Y != NULL)
-         *red_Y = png_float(png_ptr, XYZ.redY, "cHRM red Y");
-      if (red_Z != NULL)
-         *red_Z = png_float(png_ptr, XYZ.redZ, "cHRM red Z");
-      if (green_X != NULL)
-         *green_X = png_float(png_ptr, XYZ.greenX, "cHRM green X");
-      if (green_Y != NULL)
-         *green_Y = png_float(png_ptr, XYZ.greenY, "cHRM green Y");
-      if (green_Z != NULL)
-         *green_Z = png_float(png_ptr, XYZ.greenZ, "cHRM green Z");
-      if (blue_X != NULL)
-         *blue_X = png_float(png_ptr, XYZ.blueX, "cHRM blue X");
-      if (blue_Y != NULL)
-         *blue_Y = png_float(png_ptr, XYZ.blueY, "cHRM blue Y");
-      if (blue_Z != NULL)
-         *blue_Z = png_float(png_ptr, XYZ.blueZ, "cHRM blue Z");
-      return (PNG_INFO_cHRM);
-   }
-
-   return (0);
-}
-#  endif
-
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_cHRM_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
-    png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
-    png_fixed_point *blue_x, png_fixed_point *blue_y)
-{
-   png_debug1(1, "in %s retrieval function", "cHRM");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-   {
-      if (white_x != NULL)
-         *white_x = info_ptr->x_white;
-      if (white_y != NULL)
-         *white_y = info_ptr->y_white;
-      if (red_x != NULL)
-         *red_x = info_ptr->x_red;
-      if (red_y != NULL)
-         *red_y = info_ptr->y_red;
-      if (green_x != NULL)
-         *green_x = info_ptr->x_green;
-      if (green_y != NULL)
-         *green_y = info_ptr->y_green;
-      if (blue_x != NULL)
-         *blue_x = info_ptr->x_blue;
-      if (blue_y != NULL)
-         *blue_y = info_ptr->y_blue;
-      return (PNG_INFO_cHRM);
-   }
-
-   return (0);
-}
-#  endif
-#endif
-
-#ifdef PNG_gAMA_SUPPORTED
-png_uint_32 PNGFAPI
-png_get_gAMA_fixed(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_fixed_point *file_gamma)
-{
-   png_debug1(1, "in %s retrieval function", "gAMA");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
-       && file_gamma != NULL)
-   {
-      *file_gamma = info_ptr->gamma;
-      return (PNG_INFO_gAMA);
-   }
-
-   return (0);
-}
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_gAMA(png_const_structp png_ptr, png_const_infop info_ptr,
-    double *file_gamma)
-{
-   png_fixed_point igamma;
-   png_uint_32 ok = png_get_gAMA_fixed(png_ptr, info_ptr, &igamma);
-
-   if (ok)
-      *file_gamma = png_float(png_ptr, igamma, "png_get_gAMA");
-
-   return ok;
-}
-
-#  endif
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sRGB(png_const_structp png_ptr, png_const_infop info_ptr,
-    int *file_srgb_intent)
-{
-   png_debug1(1, "in %s retrieval function", "sRGB");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
-       && file_srgb_intent != NULL)
-   {
-      *file_srgb_intent = (int)info_ptr->srgb_intent;
-      return (PNG_INFO_sRGB);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-png_uint_32 PNGAPI
-png_get_iCCP(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_charpp name, int *compression_type,
-    png_bytepp profile, png_uint_32 *proflen)
-{
-   png_debug1(1, "in %s retrieval function", "iCCP");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
-       && name != NULL && compression_type != NULL && profile != NULL &&
-		 proflen != NULL)
-   {
-      *name = info_ptr->iccp_name;
-      *profile = info_ptr->iccp_profile;
-      /* Compression_type is a dummy so the API won't have to change
-       * if we introduce multiple compression types later.
-       */
-      *proflen = info_ptr->iccp_proflen;
-      *compression_type = info_ptr->iccp_compression;
-      return (PNG_INFO_iCCP);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sPLT(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_sPLT_tpp spalettes)
-{
-   if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
-   {
-      *spalettes = info_ptr->splt_palettes;
-      return ((png_uint_32)info_ptr->splt_palettes_num);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-png_uint_32 PNGAPI
-png_get_hIST(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_16p *hist)
-{
-   png_debug1(1, "in %s retrieval function", "hIST");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
-       && hist != NULL)
-   {
-      *hist = info_ptr->hist;
-      return (PNG_INFO_hIST);
-   }
-
-   return (0);
-}
-#endif
-
-png_uint_32 PNGAPI
-png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 *width, png_uint_32 *height, int *bit_depth,
-    int *color_type, int *interlace_type, int *compression_type,
-    int *filter_type)
-
-{
-   png_debug1(1, "in %s retrieval function", "IHDR");
-
-   if (png_ptr == NULL || info_ptr == NULL || width == NULL ||
-       height == NULL || bit_depth == NULL || color_type == NULL)
-      return (0);
-
-   *width = info_ptr->width;
-   *height = info_ptr->height;
-   *bit_depth = info_ptr->bit_depth;
-   *color_type = info_ptr->color_type;
-
-   if (compression_type != NULL)
-      *compression_type = info_ptr->compression_type;
-
-   if (filter_type != NULL)
-      *filter_type = info_ptr->filter_type;
-
-   if (interlace_type != NULL)
-      *interlace_type = info_ptr->interlace_type;
-
-   /* This is redundant if we can be sure that the info_ptr values were all
-    * assigned in png_set_IHDR().  We do the check anyhow in case an
-    * application has ignored our advice not to mess with the members
-    * of info_ptr directly.
-    */
-   png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,
-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
-       info_ptr->compression_type, info_ptr->filter_type);
-
-   return (1);
-}
-
-#ifdef PNG_oFFs_SUPPORTED
-png_uint_32 PNGAPI
-png_get_oFFs(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
-{
-   png_debug1(1, "in %s retrieval function", "oFFs");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
-       && offset_x != NULL && offset_y != NULL && unit_type != NULL)
-   {
-      *offset_x = info_ptr->x_offset;
-      *offset_y = info_ptr->y_offset;
-      *unit_type = (int)info_ptr->offset_unit_type;
-      return (PNG_INFO_oFFs);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-png_uint_32 PNGAPI
-png_get_pCAL(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
-    png_charp *units, png_charpp *params)
-{
-   png_debug1(1, "in %s retrieval function", "pCAL");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
-       && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
-       nparams != NULL && units != NULL && params != NULL)
-   {
-      *purpose = info_ptr->pcal_purpose;
-      *X0 = info_ptr->pcal_X0;
-      *X1 = info_ptr->pcal_X1;
-      *type = (int)info_ptr->pcal_type;
-      *nparams = (int)info_ptr->pcal_nparams;
-      *units = info_ptr->pcal_units;
-      *params = info_ptr->pcal_params;
-      return (PNG_INFO_pCAL);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-#    ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sCAL_fixed(png_structp png_ptr, png_const_infop info_ptr,
-    int *unit, png_fixed_point *width, png_fixed_point *height)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL))
-   {
-      *unit = info_ptr->scal_unit;
-      /*TODO: make this work without FP support */
-      *width = png_fixed(png_ptr, atof(info_ptr->scal_s_width), "sCAL width");
-      *height = png_fixed(png_ptr, atof(info_ptr->scal_s_height),
-         "sCAL height");
-      return (PNG_INFO_sCAL);
-   }
-
-   return(0);
-}
-#    endif /* FLOATING_ARITHMETIC */
-#  endif /* FIXED_POINT */
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sCAL(png_const_structp png_ptr, png_const_infop info_ptr,
-    int *unit, double *width, double *height)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL))
-   {
-      *unit = info_ptr->scal_unit;
-      *width = atof(info_ptr->scal_s_width);
-      *height = atof(info_ptr->scal_s_height);
-      return (PNG_INFO_sCAL);
-   }
-
-   return(0);
-}
-#  endif /* FLOATING POINT */
-png_uint_32 PNGAPI
-png_get_sCAL_s(png_const_structp png_ptr, png_const_infop info_ptr,
-    int *unit, png_charpp width, png_charpp height)
-{
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_sCAL))
-   {
-      *unit = info_ptr->scal_unit;
-      *width = info_ptr->scal_s_width;
-      *height = info_ptr->scal_s_height;
-      return (PNG_INFO_sCAL);
-   }
-
-   return(0);
-}
-#endif /* sCAL */
-
-#ifdef PNG_pHYs_SUPPORTED
-png_uint_32 PNGAPI
-png_get_pHYs(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
-{
-   png_uint_32 retval = 0;
-
-   png_debug1(1, "in %s retrieval function", "pHYs");
-
-   if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      if (res_x != NULL)
-      {
-         *res_x = info_ptr->x_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (res_y != NULL)
-      {
-         *res_y = info_ptr->y_pixels_per_unit;
-         retval |= PNG_INFO_pHYs;
-      }
-
-      if (unit_type != NULL)
-      {
-         *unit_type = (int)info_ptr->phys_unit_type;
-         retval |= PNG_INFO_pHYs;
-      }
-   }
-
-   return (retval);
-}
-#endif /* pHYs */
-
-png_uint_32 PNGAPI
-png_get_PLTE(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_colorp *palette, int *num_palette)
-{
-   png_debug1(1, "in %s retrieval function", "PLTE");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
-       && palette != NULL)
-   {
-      *palette = info_ptr->palette;
-      *num_palette = info_ptr->num_palette;
-      png_debug1(3, "num_palette = %d", *num_palette);
-      return (PNG_INFO_PLTE);
-   }
-
-   return (0);
-}
-
-#ifdef PNG_sBIT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_sBIT(png_const_structp png_ptr, png_infop info_ptr,
-    png_color_8p *sig_bit)
-{
-   png_debug1(1, "in %s retrieval function", "sBIT");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
-       && sig_bit != NULL)
-   {
-      *sig_bit = &(info_ptr->sig_bit);
-      return (PNG_INFO_sBIT);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-png_uint_32 PNGAPI
-png_get_text(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_textp *text_ptr, int *num_text)
-{
-   if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
-   {
-      png_debug1(1, "in 0x%lx retrieval function",
-         (unsigned long)png_ptr->chunk_name);
-
-      if (text_ptr != NULL)
-         *text_ptr = info_ptr->text;
-
-      if (num_text != NULL)
-         *num_text = info_ptr->num_text;
-
-      return ((png_uint_32)info_ptr->num_text);
-   }
-
-   if (num_text != NULL)
-      *num_text = 0;
-
-   return(0);
-}
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-png_uint_32 PNGAPI
-png_get_tIME(png_const_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
-{
-   png_debug1(1, "in %s retrieval function", "tIME");
-
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
-       && mod_time != NULL)
-   {
-      *mod_time = &(info_ptr->mod_time);
-      return (PNG_INFO_tIME);
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-png_uint_32 PNGAPI
-png_get_tRNS(png_const_structp png_ptr, png_infop info_ptr,
-    png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
-{
-   png_uint_32 retval = 0;
-   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-   {
-      png_debug1(1, "in %s retrieval function", "tRNS");
-
-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         if (trans_alpha != NULL)
-         {
-            *trans_alpha = info_ptr->trans_alpha;
-            retval |= PNG_INFO_tRNS;
-         }
-
-         if (trans_color != NULL)
-            *trans_color = &(info_ptr->trans_color);
-      }
-
-      else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */
-      {
-         if (trans_color != NULL)
-         {
-            *trans_color = &(info_ptr->trans_color);
-            retval |= PNG_INFO_tRNS;
-         }
-
-         if (trans_alpha != NULL)
-            *trans_alpha = NULL;
-      }
-
-      if (num_trans != NULL)
-      {
-         *num_trans = info_ptr->num_trans;
-         retval |= PNG_INFO_tRNS;
-      }
-   }
-
-   return (retval);
-}
-#endif
-
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-int PNGAPI
-png_get_unknown_chunks(png_const_structp png_ptr, png_const_infop info_ptr,
-    png_unknown_chunkpp unknowns)
-{
-   if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
-   {
-      *unknowns = info_ptr->unknown_chunks;
-      return info_ptr->unknown_chunks_num;
-   }
-
-   return (0);
-}
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-png_byte PNGAPI
-png_get_rgb_to_gray_status (png_const_structp png_ptr)
-{
-   return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0);
-}
-#endif
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-png_voidp PNGAPI
-png_get_user_chunk_ptr(png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_chunk_ptr : NULL);
-}
-#endif
-
-png_size_t PNGAPI
-png_get_compression_buffer_size(png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->zbuf_size : 0);
-}
-
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-/* These functions were added to libpng 1.2.6 and were enabled
- * by default in libpng-1.4.0 */
-png_uint_32 PNGAPI
-png_get_user_width_max (png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_width_max : 0);
-}
-
-png_uint_32 PNGAPI
-png_get_user_height_max (png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_height_max : 0);
-}
-
-/* This function was added to libpng 1.4.0 */
-png_uint_32 PNGAPI
-png_get_chunk_cache_max (png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_chunk_cache_max : 0);
-}
-
-/* This function was added to libpng 1.4.1 */
-png_alloc_size_t PNGAPI
-png_get_chunk_malloc_max (png_const_structp png_ptr)
-{
-   return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);
-}
-#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
-
-/* These functions were added to libpng 1.4.0 */
-#ifdef PNG_IO_STATE_SUPPORTED
-png_uint_32 PNGAPI
-png_get_io_state (png_structp png_ptr)
-{
-   return png_ptr->io_state;
-}
-
-png_uint_32 PNGAPI
-png_get_io_chunk_type (png_const_structp png_ptr)
-{
-   return png_ptr->chunk_name;
-}
-
-png_const_bytep PNGAPI
-png_get_io_chunk_name (png_structp png_ptr)
-{
-   PNG_CSTRING_FROM_CHUNK(png_ptr->io_chunk_string, png_ptr->chunk_name);
-   return png_ptr->io_chunk_string;
-}
-#endif /* ?PNG_IO_STATE_SUPPORTED */
-
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngget.c - retrieval of values from info struct
+ *
+ * libpng 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+png_uint_32 PNGAPI
+png_get_valid(png_structp png_ptr, png_infop info_ptr, png_uint_32 flag)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->valid & flag);
+   else
+      return(0);
+}
+
+png_uint_32 PNGAPI
+png_get_rowbytes(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->rowbytes);
+   else
+      return(0);
+}
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+png_bytepp PNGAPI
+png_get_rows(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->row_pointers);
+   else
+      return(0);
+}
+#endif
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+/* easy access to info, added in libpng-0.99 */
+png_uint_32 PNGAPI
+png_get_image_width(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->width;
+   }
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_image_height(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->height;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_bit_depth(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->bit_depth;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_color_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->color_type;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_filter_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->filter_type;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_interlace_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->interlace_type;
+   }
+   return (0);
+}
+
+png_byte PNGAPI
+png_get_compression_type(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+   {
+      return info_ptr->compression_type;
+   }
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_x_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_x_pixels_per_meter");
+      if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+          return (0);
+      else return (info_ptr->x_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_y_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_y_pixels_per_meter");
+      if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER)
+          return (0);
+      else return (info_ptr->y_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_uint_32 PNGAPI
+png_get_pixels_per_meter(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_pixels_per_meter");
+      if(info_ptr->phys_unit_type != PNG_RESOLUTION_METER ||
+         info_ptr->x_pixels_per_unit != info_ptr->y_pixels_per_unit)
+          return (0);
+      else return (info_ptr->x_pixels_per_unit);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+float PNGAPI
+png_get_pixel_aspect_ratio(png_structp png_ptr, png_infop info_ptr)
+   {
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_aspect_ratio");
+      if (info_ptr->x_pixels_per_unit == 0)
+         return ((float)0.0);
+      else
+         return ((float)((float)info_ptr->y_pixels_per_unit
+            /(float)info_ptr->x_pixels_per_unit));
+   }
+#else
+   return (0.0);
+#endif
+   return ((float)0.0);
+}
+#endif
+
+png_int_32 PNGAPI
+png_get_x_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_x_offset_microns");
+      if(info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+          return (0);
+      else return (info_ptr->x_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_y_offset_microns(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_y_offset_microns");
+      if(info_ptr->offset_unit_type != PNG_OFFSET_MICROMETER)
+          return (0);
+      else return (info_ptr->y_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_x_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_x_offset_microns");
+      if(info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+          return (0);
+      else return (info_ptr->x_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+png_int_32 PNGAPI
+png_get_y_offset_pixels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+#if defined(PNG_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+   {
+      png_debug1(1, "in %s retrieval function\n", "png_get_y_offset_microns");
+      if(info_ptr->offset_unit_type != PNG_OFFSET_PIXEL)
+          return (0);
+      else return (info_ptr->y_offset);
+   }
+#else
+   return (0);
+#endif
+   return (0);
+}
+
+#if defined(PNG_INCH_CONVERSIONS) && defined(PNG_FLOATING_POINT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+png_uint_32 PNGAPI
+png_get_x_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_x_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+png_uint_32 PNGAPI
+png_get_y_pixels_per_inch(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((png_uint_32)((float)png_get_y_pixels_per_meter(png_ptr, info_ptr)
+     *.0254 +.5));
+}
+
+float PNGAPI
+png_get_x_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((float)png_get_x_offset_microns(png_ptr, info_ptr)
+     *.00003937);
+}
+
+float PNGAPI
+png_get_y_offset_inches(png_structp png_ptr, png_infop info_ptr)
+{
+   return ((float)png_get_y_offset_microns(png_ptr, info_ptr)
+     *.00003937);
+}
+
+#if defined(PNG_pHYs_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+   png_uint_32 retval = 0;
+
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_debug1(1, "in %s retrieval function\n", "pHYs");
+      if (res_x != NULL)
+      {
+         *res_x = info_ptr->x_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (res_y != NULL)
+      {
+         *res_y = info_ptr->y_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (unit_type != NULL)
+      {
+         *unit_type = (int)info_ptr->phys_unit_type;
+         retval |= PNG_INFO_pHYs;
+         if(*unit_type == 1)
+         {
+            if (res_x != NULL) *res_x = (png_uint_32)(*res_x * .0254 + .50);
+            if (res_y != NULL) *res_y = (png_uint_32)(*res_y * .0254 + .50);
+         }
+      }
+   }
+   return (retval);
+}
+#endif /* PNG_pHYs_SUPPORTED */
+#endif  /* PNG_INCH_CONVERSIONS && PNG_FLOATING_POINT_SUPPORTED */
+
+/* png_get_channels really belongs in here, too, but it's been around longer */
+
+#endif  /* PNG_EASY_ACCESS_SUPPORTED */
+
+png_byte PNGAPI
+png_get_channels(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->channels);
+   else
+      return (0);
+}
+
+png_bytep PNGAPI
+png_get_signature(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr != NULL && info_ptr != NULL)
+      return(info_ptr->signature);
+   else
+      return (NULL);
+}
+
+#if defined(PNG_bKGD_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_bKGD(png_structp png_ptr, png_infop info_ptr,
+   png_color_16p *background)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
+      && background != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "bKGD");
+      *background = &(info_ptr->background);
+      return (PNG_INFO_bKGD);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cHRM(png_structp png_ptr, png_infop info_ptr,
+   double *white_x, double *white_y, double *red_x, double *red_y,
+   double *green_x, double *green_y, double *blue_x, double *blue_y)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   {
+      png_debug1(1, "in %s retrieval function\n", "cHRM");
+      if (white_x != NULL)
+         *white_x = (double)info_ptr->x_white;
+      if (white_y != NULL)
+         *white_y = (double)info_ptr->y_white;
+      if (red_x != NULL)
+         *red_x = (double)info_ptr->x_red;
+      if (red_y != NULL)
+         *red_y = (double)info_ptr->y_red;
+      if (green_x != NULL)
+         *green_x = (double)info_ptr->x_green;
+      if (green_y != NULL)
+         *green_y = (double)info_ptr->y_green;
+      if (blue_x != NULL)
+         *blue_x = (double)info_ptr->x_blue;
+      if (blue_y != NULL)
+         *blue_y = (double)info_ptr->y_blue;
+      return (PNG_INFO_cHRM);
+   }
+   return (0);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+   png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
+   png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
+   png_fixed_point *blue_x, png_fixed_point *blue_y)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
+   {
+      png_debug1(1, "in %s retrieval function\n", "cHRM");
+      if (white_x != NULL)
+         *white_x = info_ptr->int_x_white;
+      if (white_y != NULL)
+         *white_y = info_ptr->int_y_white;
+      if (red_x != NULL)
+         *red_x = info_ptr->int_x_red;
+      if (red_y != NULL)
+         *red_y = info_ptr->int_y_red;
+      if (green_x != NULL)
+         *green_x = info_ptr->int_x_green;
+      if (green_y != NULL)
+         *green_y = info_ptr->int_y_green;
+      if (blue_x != NULL)
+         *blue_x = info_ptr->int_x_blue;
+      if (blue_y != NULL)
+         *blue_y = info_ptr->int_y_blue;
+      return (PNG_INFO_cHRM);
+   }
+   return (0);
+}
+#endif
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_gAMA(png_structp png_ptr, png_infop info_ptr, double *file_gamma)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+      && file_gamma != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "gAMA");
+      *file_gamma = (double)info_ptr->gamma;
+      return (PNG_INFO_gAMA);
+   }
+   return (0);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_gAMA_fixed(png_structp png_ptr, png_infop info_ptr,
+    png_fixed_point *int_file_gamma)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+      && int_file_gamma != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "gAMA");
+      *int_file_gamma = info_ptr->int_gamma;
+      return (PNG_INFO_gAMA);
+   }
+   return (0);
+}
+#endif
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_sRGB(png_structp png_ptr, png_infop info_ptr, int *file_srgb_intent)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
+      && file_srgb_intent != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "sRGB");
+      *file_srgb_intent = (int)info_ptr->srgb_intent;
+      return (PNG_INFO_sRGB);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_iCCP_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_iCCP(png_structp png_ptr, png_infop info_ptr,
+             png_charpp name, int *compression_type,
+             png_charpp profile, png_uint_32 *proflen)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
+      && name != NULL && profile != NULL && proflen != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "iCCP");
+      *name = info_ptr->iccp_name;
+      *profile = info_ptr->iccp_profile;
+      /* compression_type is a dummy so the API won't have to change
+         if we introduce multiple compression types later. */
+      *proflen = (int)info_ptr->iccp_proflen;
+      *compression_type = (int)info_ptr->iccp_compression;
+      return (PNG_INFO_iCCP);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_sPLT(png_structp png_ptr, png_infop info_ptr,
+             png_sPLT_tpp spalettes)
+{
+   if (png_ptr != NULL && info_ptr != NULL && spalettes != NULL)
+     *spalettes = info_ptr->splt_palettes;
+   return ((png_uint_32)info_ptr->splt_palettes_num);
+}
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p *hist)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
+      && hist != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "hIST");
+      *hist = info_ptr->hist;
+      return (PNG_INFO_hIST);
+   }
+   return (0);
+}
+#endif
+
+png_uint_32 PNGAPI
+png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *width, png_uint_32 *height, int *bit_depth,
+   int *color_type, int *interlace_type, int *compression_type,
+   int *filter_type)
+
+{
+   if (png_ptr != NULL && info_ptr != NULL && width != NULL && height != NULL &&
+      bit_depth != NULL && color_type != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "IHDR");
+      *width = info_ptr->width;
+      *height = info_ptr->height;
+      *bit_depth = info_ptr->bit_depth;
+      if (info_ptr->bit_depth < 1 || info_ptr->bit_depth > 16)
+        png_error(png_ptr, "Invalid bit depth");
+      *color_type = info_ptr->color_type;
+      if (info_ptr->color_type > 6)
+        png_error(png_ptr, "Invalid color type");
+      if (compression_type != NULL)
+         *compression_type = info_ptr->compression_type;
+      if (filter_type != NULL)
+         *filter_type = info_ptr->filter_type;
+      if (interlace_type != NULL)
+         *interlace_type = info_ptr->interlace_type;
+
+      /* check for potential overflow of rowbytes */
+      if (width == 0 || *width > PNG_UINT_31_MAX)
+        png_error(png_ptr, "Invalid image width");
+      if (height == 0 || *height > PNG_UINT_31_MAX)
+        png_error(png_ptr, "Invalid image height");
+      if (info_ptr->width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      {
+         png_warning(png_ptr,
+            "Width too large for libpng to process image data.");
+      }
+      return (1);
+   }
+   return (0);
+}
+
+#if defined(PNG_oFFs_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_oFFs(png_structp png_ptr, png_infop info_ptr,
+   png_int_32 *offset_x, png_int_32 *offset_y, int *unit_type)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
+      && offset_x != NULL && offset_y != NULL && unit_type != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "oFFs");
+      *offset_x = info_ptr->x_offset;
+      *offset_y = info_ptr->y_offset;
+      *unit_type = (int)info_ptr->offset_unit_type;
+      return (PNG_INFO_oFFs);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pCAL(png_structp png_ptr, png_infop info_ptr,
+   png_charp *purpose, png_int_32 *X0, png_int_32 *X1, int *type, int *nparams,
+   png_charp *units, png_charpp *params)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
+      && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
+      nparams != NULL && units != NULL && params != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "pCAL");
+      *purpose = info_ptr->pcal_purpose;
+      *X0 = info_ptr->pcal_X0;
+      *X1 = info_ptr->pcal_X1;
+      *type = (int)info_ptr->pcal_type;
+      *nparams = (int)info_ptr->pcal_nparams;
+      *units = info_ptr->pcal_units;
+      *params = info_ptr->pcal_params;
+      return (PNG_INFO_pCAL);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sCAL(png_structp png_ptr, png_infop info_ptr,
+             int *unit, double *width, double *height)
+{
+    if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_sCAL))
+    {
+        *unit = info_ptr->scal_unit;
+        *width = info_ptr->scal_pixel_width;
+        *height = info_ptr->scal_pixel_height;
+        return (PNG_INFO_sCAL);
+    }
+    return(0);
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+             int *unit, png_charpp width, png_charpp height)
+{
+    if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_sCAL))
+    {
+        *unit = info_ptr->scal_unit;
+        *width = info_ptr->scal_s_width;
+        *height = info_ptr->scal_s_height;
+        return (PNG_INFO_sCAL);
+    }
+    return(0);
+}
+#endif
+#endif
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_pHYs(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)
+{
+   png_uint_32 retval = 0;
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+      (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_debug1(1, "in %s retrieval function\n", "pHYs");
+      if (res_x != NULL)
+      {
+         *res_x = info_ptr->x_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (res_y != NULL)
+      {
+         *res_y = info_ptr->y_pixels_per_unit;
+         retval |= PNG_INFO_pHYs;
+      }
+      if (unit_type != NULL)
+      {
+         *unit_type = (int)info_ptr->phys_unit_type;
+         retval |= PNG_INFO_pHYs;
+      }
+   }
+   return (retval);
+}
+#endif
+
+png_uint_32 PNGAPI
+png_get_PLTE(png_structp png_ptr, png_infop info_ptr, png_colorp *palette,
+   int *num_palette)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
+       && palette != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "PLTE");
+      *palette = info_ptr->palette;
+      *num_palette = info_ptr->num_palette;
+      png_debug1(3, "num_palette = %d\n", *num_palette);
+      return (PNG_INFO_PLTE);
+   }
+   return (0);
+}
+
+#if defined(PNG_sBIT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_sBIT(png_structp png_ptr, png_infop info_ptr, png_color_8p *sig_bit)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
+      && sig_bit != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "sBIT");
+      *sig_bit = &(info_ptr->sig_bit);
+      return (PNG_INFO_sBIT);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_text(png_structp png_ptr, png_infop info_ptr, png_textp *text_ptr,
+   int *num_text)
+{
+   if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0)
+   {
+      png_debug1(1, "in %s retrieval function\n",
+         (png_ptr->chunk_name[0] == '\0' ? "text"
+             : (png_const_charp)png_ptr->chunk_name));
+      if (text_ptr != NULL)
+         *text_ptr = info_ptr->text;
+      if (num_text != NULL)
+         *num_text = info_ptr->num_text;
+      return ((png_uint_32)info_ptr->num_text);
+   }
+   if (num_text != NULL)
+     *num_text = 0;
+   return(0);
+}
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_tIME(png_structp png_ptr, png_infop info_ptr, png_timep *mod_time)
+{
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
+       && mod_time != NULL)
+   {
+      png_debug1(1, "in %s retrieval function\n", "tIME");
+      *mod_time = &(info_ptr->mod_time);
+      return (PNG_INFO_tIME);
+   }
+   return (0);
+}
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
+   png_bytep *trans, int *num_trans, png_color_16p *trans_values)
+{
+   png_uint_32 retval = 0;
+   if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   {
+      png_debug1(1, "in %s retrieval function\n", "tRNS");
+      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+          if (trans != NULL)
+          {
+             *trans = info_ptr->trans;
+             retval |= PNG_INFO_tRNS;
+          }
+          if (trans_values != NULL)
+             *trans_values = &(info_ptr->trans_values);
+      }
+      else /* if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) */
+      {
+          if (trans_values != NULL)
+          {
+             *trans_values = &(info_ptr->trans_values);
+             retval |= PNG_INFO_tRNS;
+          }
+          if(trans != NULL)
+             *trans = NULL;
+      }
+      if(num_trans != NULL)
+      {
+         *num_trans = info_ptr->num_trans;
+         retval |= PNG_INFO_tRNS;
+      }
+   }
+   return (retval);
+}
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+png_uint_32 PNGAPI
+png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
+             png_unknown_chunkpp unknowns)
+{
+   if (png_ptr != NULL && info_ptr != NULL && unknowns != NULL)
+     *unknowns = info_ptr->unknown_chunks;
+   return ((png_uint_32)info_ptr->unknown_chunks_num);
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+png_byte PNGAPI
+png_get_rgb_to_gray_status (png_structp png_ptr)
+{
+   return (png_byte)(png_ptr? png_ptr->rgb_to_gray_status : 0);
+}
+#endif
+
+#if defined(PNG_USER_CHUNKS_SUPPORTED)
+png_voidp PNGAPI
+png_get_user_chunk_ptr(png_structp png_ptr)
+{
+   return (png_ptr? png_ptr->user_chunk_ptr : NULL);
+}
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+png_uint_32 PNGAPI
+png_get_compression_buffer_size(png_structp png_ptr)
+{
+   return (png_uint_32)(png_ptr? png_ptr->zbuf_size : 0L);
+}
+#endif
+
+#ifndef PNG_1_0_X
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+/* this function was added to libpng 1.2.0 and should exist by default */
+png_uint_32 PNGAPI
+png_get_asm_flags (png_structp png_ptr)
+{
+    return (png_uint_32)(png_ptr? png_ptr->asm_flags : 0L);
+}
+
+/* this function was added to libpng 1.2.0 and should exist by default */
+png_uint_32 PNGAPI
+png_get_asm_flagmask (int flag_select)
+{
+    png_uint_32 settable_asm_flags = 0;
+
+    if (flag_select & PNG_SELECT_READ)
+        settable_asm_flags |=
+          PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  |
+          PNG_ASM_FLAG_MMX_READ_INTERLACE    |
+          PNG_ASM_FLAG_MMX_READ_FILTER_SUB   |
+          PNG_ASM_FLAG_MMX_READ_FILTER_UP    |
+          PNG_ASM_FLAG_MMX_READ_FILTER_AVG   |
+          PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ;
+          /* no non-MMX flags yet */
+
+#if 0
+    /* GRR:  no write-flags yet, either, but someday... */
+    if (flag_select & PNG_SELECT_WRITE)
+        settable_asm_flags |=
+          PNG_ASM_FLAG_MMX_WRITE_ [whatever] ;
+#endif /* 0 */
+
+    return settable_asm_flags;  /* _theoretically_ settable capabilities only */
+}
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED */
+
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED)
+    /* GRR:  could add this:   && defined(PNG_MMX_CODE_SUPPORTED) */
+/* this function was added to libpng 1.2.0 */
+png_uint_32 PNGAPI
+png_get_mmx_flagmask (int flag_select, int *compilerID)
+{
+    png_uint_32 settable_mmx_flags = 0;
+
+    if (flag_select & PNG_SELECT_READ)
+        settable_mmx_flags |=
+          PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  |
+          PNG_ASM_FLAG_MMX_READ_INTERLACE    |
+          PNG_ASM_FLAG_MMX_READ_FILTER_SUB   |
+          PNG_ASM_FLAG_MMX_READ_FILTER_UP    |
+          PNG_ASM_FLAG_MMX_READ_FILTER_AVG   |
+          PNG_ASM_FLAG_MMX_READ_FILTER_PAETH ;
+#if 0
+    /* GRR:  no MMX write support yet, but someday... */
+    if (flag_select & PNG_SELECT_WRITE)
+        settable_mmx_flags |=
+          PNG_ASM_FLAG_MMX_WRITE_ [whatever] ;
+#endif /* 0 */
+
+    if (compilerID != NULL) {
+#ifdef PNG_USE_PNGVCRD
+        *compilerID = 1;    /* MSVC */
+#else
+#ifdef PNG_USE_PNGGCCRD
+        *compilerID = 2;    /* gcc/gas */
+#else
+        *compilerID = -1;   /* unknown (i.e., no asm/MMX code compiled) */
+#endif
+#endif
+    }
+
+    return settable_mmx_flags;  /* _theoretically_ settable capabilities only */
+}
+
+/* this function was added to libpng 1.2.0 */
+png_byte PNGAPI
+png_get_mmx_bitdepth_threshold (png_structp png_ptr)
+{
+    return (png_byte)(png_ptr? png_ptr->mmx_bitdepth_threshold : 0);
+}
+
+/* this function was added to libpng 1.2.0 */
+png_uint_32 PNGAPI
+png_get_mmx_rowbytes_threshold (png_structp png_ptr)
+{
+    return (png_uint_32)(png_ptr? png_ptr->mmx_rowbytes_threshold : 0L);
+}
+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+/* these functions were added to libpng 1.2.6 */
+png_uint_32 PNGAPI
+png_get_user_width_max (png_structp png_ptr)
+{
+    return (png_ptr? png_ptr->user_width_max : 0);
+}
+png_uint_32 PNGAPI
+png_get_user_height_max (png_structp png_ptr)
+{
+    return (png_ptr? png_ptr->user_height_max : 0);
+}
+#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+
+#endif /* ?PNG_1_0_X */
diff --git a/Source/3rd Party/wx/src/png/pnginfo.h b/Source/3rd Party/wx/src/png/pnginfo.h
deleted file mode 100644
index bbfb105aa..000000000
--- a/Source/3rd Party/wx/src/png/pnginfo.h	
+++ /dev/null
@@ -1,269 +0,0 @@
-
-/* pnginfo.h - header file for PNG reference library
- *
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
- /* png_info is a structure that holds the information in a PNG file so
- * that the application can find out the characteristics of the image.
- * If you are reading the file, this structure will tell you what is
- * in the PNG file.  If you are writing the file, fill in the information
- * you want to put into the PNG file, using png_set_*() functions, then
- * call png_write_info().
- *
- * The names chosen should be very close to the PNG specification, so
- * consult that document for information about the meaning of each field.
- *
- * With libpng < 0.95, it was only possible to directly set and read the
- * the values in the png_info_struct, which meant that the contents and
- * order of the values had to remain fixed.  With libpng 0.95 and later,
- * however, there are now functions that abstract the contents of
- * png_info_struct from the application, so this makes it easier to use
- * libpng with dynamic libraries, and even makes it possible to use
- * libraries that don't have all of the libpng ancillary chunk-handing
- * functionality.  In libpng-1.5.0 this was moved into a separate private
- * file that is not visible to applications.
- *
- * The following members may have allocated storage attached that should be
- * cleaned up before the structure is discarded: palette, trans, text,
- * pcal_purpose, pcal_units, pcal_params, hist, iccp_name, iccp_profile,
- * splt_palettes, scal_unit, row_pointers, and unknowns.   By default, these
- * are automatically freed when the info structure is deallocated, if they were
- * allocated internally by libpng.  This behavior can be changed by means
- * of the png_data_freer() function.
- *
- * More allocation details: all the chunk-reading functions that
- * change these members go through the corresponding png_set_*
- * functions.  A function to clear these members is available: see
- * png_free_data().  The png_set_* functions do not depend on being
- * able to point info structure members to any of the storage they are
- * passed (they make their own copies), EXCEPT that the png_set_text
- * functions use the same storage passed to them in the text_ptr or
- * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
- * functions do not make their own copies.
- */
-#ifndef PNGINFO_H
-#define PNGINFO_H
-
-struct png_info_def
-{
-   /* the following are necessary for every PNG file */
-   png_uint_32 width;  /* width of image in pixels (from IHDR) */
-   png_uint_32 height; /* height of image in pixels (from IHDR) */
-   png_uint_32 valid;  /* valid chunk data (see PNG_INFO_ below) */
-   png_size_t rowbytes; /* bytes needed to hold an untransformed row */
-   png_colorp palette;      /* array of color values (valid & PNG_INFO_PLTE) */
-   png_uint_16 num_palette; /* number of color entries in "palette" (PLTE) */
-   png_uint_16 num_trans;   /* number of transparent palette color (tRNS) */
-   png_byte bit_depth;      /* 1, 2, 4, 8, or 16 bits/channel (from IHDR) */
-   png_byte color_type;     /* see PNG_COLOR_TYPE_ below (from IHDR) */
-   /* The following three should have been named *_method not *_type */
-   png_byte compression_type; /* must be PNG_COMPRESSION_TYPE_BASE (IHDR) */
-   png_byte filter_type;    /* must be PNG_FILTER_TYPE_BASE (from IHDR) */
-   png_byte interlace_type; /* One of PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
-
-   /* The following is informational only on read, and not used on writes. */
-   png_byte channels;       /* number of data channels per pixel (1, 2, 3, 4) */
-   png_byte pixel_depth;    /* number of bits per pixel */
-   png_byte spare_byte;     /* to align the data, and for future use */
-   png_byte signature[8];   /* magic bytes read by libpng from start of file */
-
-   /* The rest of the data is optional.  If you are reading, check the
-    * valid field to see if the information in these are valid.  If you
-    * are writing, set the valid field to those chunks you want written,
-    * and initialize the appropriate fields below.
-    */
-
-#if defined(PNG_gAMA_SUPPORTED)
-   /* The gAMA chunk describes the gamma characteristics of the system
-    * on which the image was created, normally in the range [1.0, 2.5].
-    * Data is valid if (valid & PNG_INFO_gAMA) is non-zero.
-    */
-   png_fixed_point gamma;
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-    /* GR-P, 0.96a */
-    /* Data valid if (valid & PNG_INFO_sRGB) non-zero. */
-   png_byte srgb_intent; /* sRGB rendering intent [0, 1, 2, or 3] */
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-   /* The tEXt, and zTXt chunks contain human-readable textual data in
-    * uncompressed, compressed, and optionally compressed forms, respectively.
-    * The data in "text" is an array of pointers to uncompressed,
-    * null-terminated C strings. Each chunk has a keyword that describes the
-    * textual data contained in that chunk.  Keywords are not required to be
-    * unique, and the text string may be empty.  Any number of text chunks may
-    * be in an image.
-    */
-   int num_text; /* number of comments read or comments to write */
-   int max_text; /* current size of text array */
-   png_textp text; /* array of comments read or comments to write */
-#endif /* PNG_TEXT_SUPPORTED */
-
-#ifdef PNG_tIME_SUPPORTED
-   /* The tIME chunk holds the last time the displayed image data was
-    * modified.  See the png_time struct for the contents of this struct.
-    */
-   png_time mod_time;
-#endif
-
-#ifdef PNG_sBIT_SUPPORTED
-   /* The sBIT chunk specifies the number of significant high-order bits
-    * in the pixel data.  Values are in the range [1, bit_depth], and are
-    * only specified for the channels in the pixel data.  The contents of
-    * the low-order bits is not specified.  Data is valid if
-    * (valid & PNG_INFO_sBIT) is non-zero.
-    */
-   png_color_8 sig_bit; /* significant bits in color channels */
-#endif
-
-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_EXPAND_SUPPORTED) || \
-defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* The tRNS chunk supplies transparency data for paletted images and
-    * other image types that don't need a full alpha channel.  There are
-    * "num_trans" transparency values for a paletted image, stored in the
-    * same order as the palette colors, starting from index 0.  Values
-    * for the data are in the range [0, 255], ranging from fully transparent
-    * to fully opaque, respectively.  For non-paletted images, there is a
-    * single color specified that should be treated as fully transparent.
-    * Data is valid if (valid & PNG_INFO_tRNS) is non-zero.
-    */
-   png_bytep trans_alpha;    /* alpha values for paletted image */
-   png_color_16 trans_color; /* transparent color for non-palette image */
-#endif
-
-#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* The bKGD chunk gives the suggested image background color if the
-    * display program does not have its own background color and the image
-    * is needs to composited onto a background before display.  The colors
-    * in "background" are normally in the same color space/depth as the
-    * pixel data.  Data is valid if (valid & PNG_INFO_bKGD) is non-zero.
-    */
-   png_color_16 background;
-#endif
-
-#ifdef PNG_oFFs_SUPPORTED
-   /* The oFFs chunk gives the offset in "offset_unit_type" units rightwards
-    * and downwards from the top-left corner of the display, page, or other
-    * application-specific co-ordinate space.  See the PNG_OFFSET_ defines
-    * below for the unit types.  Valid if (valid & PNG_INFO_oFFs) non-zero.
-    */
-   png_int_32 x_offset; /* x offset on page */
-   png_int_32 y_offset; /* y offset on page */
-   png_byte offset_unit_type; /* offset units type */
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-   /* The pHYs chunk gives the physical pixel density of the image for
-    * display or printing in "phys_unit_type" units (see PNG_RESOLUTION_
-    * defines below).  Data is valid if (valid & PNG_INFO_pHYs) is non-zero.
-    */
-   png_uint_32 x_pixels_per_unit; /* horizontal pixel density */
-   png_uint_32 y_pixels_per_unit; /* vertical pixel density */
-   png_byte phys_unit_type; /* resolution type (see PNG_RESOLUTION_ below) */
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-   /* The hIST chunk contains the relative frequency or importance of the
-    * various palette entries, so that a viewer can intelligently select a
-    * reduced-color palette, if required.  Data is an array of "num_palette"
-    * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST)
-    * is non-zero.
-    */
-   png_uint_16p hist;
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-   /* The cHRM chunk describes the CIE color characteristics of the monitor
-    * on which the PNG was created.  This data allows the viewer to do gamut
-    * mapping of the input image to ensure that the viewer sees the same
-    * colors in the image as the creator.  Values are in the range
-    * [0.0, 0.8].  Data valid if (valid & PNG_INFO_cHRM) non-zero.
-    */
-   png_fixed_point x_white;
-   png_fixed_point y_white;
-   png_fixed_point x_red;
-   png_fixed_point y_red;
-   png_fixed_point x_green;
-   png_fixed_point y_green;
-   png_fixed_point x_blue;
-   png_fixed_point y_blue;
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-   /* The pCAL chunk describes a transformation between the stored pixel
-    * values and original physical data values used to create the image.
-    * The integer range [0, 2^bit_depth - 1] maps to the floating-point
-    * range given by [pcal_X0, pcal_X1], and are further transformed by a
-    * (possibly non-linear) transformation function given by "pcal_type"
-    * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_
-    * defines below, and the PNG-Group's PNG extensions document for a
-    * complete description of the transformations and how they should be
-    * implemented, and for a description of the ASCII parameter strings.
-    * Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
-    */
-   png_charp pcal_purpose;  /* pCAL chunk description string */
-   png_int_32 pcal_X0;      /* minimum value */
-   png_int_32 pcal_X1;      /* maximum value */
-   png_charp pcal_units;    /* Latin-1 string giving physical units */
-   png_charpp pcal_params;  /* ASCII strings containing parameter values */
-   png_byte pcal_type;      /* equation type (see PNG_EQUATION_ below) */
-   png_byte pcal_nparams;   /* number of parameters given in pcal_params */
-#endif
-
-/* New members added in libpng-1.0.6 */
-   png_uint_32 free_me;     /* flags items libpng is responsible for freeing */
-
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
- defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
-   /* Storage for unknown chunks that the library doesn't recognize. */
-   png_unknown_chunkp unknown_chunks;
-   int unknown_chunks_num;
-#endif
-
-#ifdef PNG_iCCP_SUPPORTED
-   /* iCCP chunk data. */
-   png_charp iccp_name;     /* profile name */
-   png_bytep iccp_profile;  /* International Color Consortium profile data */
-   png_uint_32 iccp_proflen;  /* ICC profile data length */
-   png_byte iccp_compression; /* Always zero */
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-   /* Data on sPLT chunks (there may be more than one). */
-   png_sPLT_tp splt_palettes;
-   png_uint_32 splt_palettes_num;
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-   /* The sCAL chunk describes the actual physical dimensions of the
-    * subject matter of the graphic.  The chunk contains a unit specification
-    * a byte value, and two ASCII strings representing floating-point
-    * values.  The values are width and height corresponsing to one pixel
-    * in the image.  Data values are valid if (valid & PNG_INFO_sCAL) is
-    * non-zero.
-    */
-   png_byte scal_unit;         /* unit of physical scale */
-   png_charp scal_s_width;     /* string containing height */
-   png_charp scal_s_height;    /* string containing width */
-#endif
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-   /* Memory has been allocated if (valid & PNG_ALLOCATED_INFO_ROWS)
-      non-zero */
-   /* Data valid if (valid & PNG_INFO_IDAT) non-zero */
-   png_bytepp row_pointers;        /* the image bits */
-#endif
-
-};
-#endif /* PNGINFO_H */
diff --git a/Source/3rd Party/wx/src/png/pnglibconf.h b/Source/3rd Party/wx/src/png/pnglibconf.h
deleted file mode 100644
index d2072327f..000000000
--- a/Source/3rd Party/wx/src/png/pnglibconf.h	
+++ /dev/null
@@ -1,187 +0,0 @@
-
-/* libpng STANDARD API DEFINITION */
-
-/* pnglibconf.h - library build configuration */
-
-/* libpng version 1.5.4 - last changed on June 22, 2011 */
-
-/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
-
-/* This code is released under the libpng license. */
-/* For conditions of distribution and use, see the disclaimer */
-/* and license in png.h */
-
-/* pnglibconf.h */
-/* Derived from: scripts/pnglibconf.dfa */
-/* If you edit this file by hand you must obey the rules expressed in */
-/* pnglibconf.dfa with respect to the dependencies between the following */
-/* symbols.  It is much better to generate a new file using */
-/* scripts/libpngconf.mak */
-
-#ifndef PNGLCONF_H
-#define PNGLCONF_H
-/* settings */
-#define PNG_API_RULE 0
-#define PNG_CALLOC_SUPPORTED
-#define PNG_COST_SHIFT 3
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-#define PNG_MAX_GAMMA_8 11
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_sCAL_PRECISION 5
-#define PNG_USER_CHUNK_CACHE_MAX 0
-#define PNG_USER_CHUNK_MALLOC_MAX 0
-#define PNG_USER_HEIGHT_MAX 1000000
-#define PNG_USER_WIDTH_MAX 1000000
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_ZBUF_SIZE 8192
-/* end of settings */
-/* options */
-#define PNG_16BIT_SUPPORTED
-#define PNG_ALIGN_MEMORY_SUPPORTED
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-#define PNG_CHECK_cHRM_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_ALPHA_MODE_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_SCALE_16_TO_8_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-/* end of options */
-#endif /* PNGLCONF_H */
diff --git a/Source/3rd Party/wx/src/png/pngmem.c b/Source/3rd Party/wx/src/png/pngmem.c
index 25b5c7354..2682394ab 100644
--- a/Source/3rd Party/wx/src/png/pngmem.c	
+++ b/Source/3rd Party/wx/src/png/pngmem.c	
@@ -1,667 +1,595 @@
-
-/* pngmem.c - stub functions for memory allocation
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all memory allocation.  Users who
- * need special memory handling are expected to supply replacement
- * functions for png_malloc() and png_free(), and to use
- * png_create_read_struct_2() and png_create_write_struct_2() to
- * identify the replacement functions.
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-/* Borland DOS special memory handler */
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* If you change this, be sure to change the one in png.h also */
-
-/* Allocate memory for a png_struct.  The malloc and memset can be replaced
-   by a single call to calloc() if this is thought to improve performance. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct,(int type),PNG_ALLOCATED)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_struct_2(type, NULL, NULL));
-}
-
-/* Alternate version of png_create_struct, for use with user-defined malloc. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),
-   PNG_ALLOCATED)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   png_size_t size;
-   png_voidp struct_ptr;
-
-   if (type == PNG_STRUCT_INFO)
-      size = png_sizeof(png_info);
-
-   else if (type == PNG_STRUCT_PNG)
-      size = png_sizeof(png_struct);
-
-   else
-      return (png_get_copyright(NULL));
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (malloc_fn != NULL)
-   {
-      png_struct dummy_struct;
-      memset(&dummy_struct, 0, sizeof dummy_struct);
-      dummy_struct.mem_ptr=mem_ptr;
-      struct_ptr = (*(malloc_fn))(&dummy_struct, (png_alloc_size_t)size);
-   }
-
-   else
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   struct_ptr = (png_voidp)farmalloc(size);
-   if (struct_ptr != NULL)
-      png_memset(struct_ptr, 0, size);
-
-   return (struct_ptr);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct(png_voidp struct_ptr)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   png_destroy_struct_2(struct_ptr, NULL, NULL);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
-    png_voidp mem_ptr)
-{
-#  endif
-   if (struct_ptr != NULL)
-   {
-#  ifdef PNG_USER_MEM_SUPPORTED
-      if (free_fn != NULL)
-      {
-         png_struct dummy_struct;
-         memset(&dummy_struct, 0, sizeof dummy_struct);
-         dummy_struct.mem_ptr=mem_ptr;
-         (*(free_fn))(&dummy_struct, struct_ptr);
-         return;
-      }
-
-#  endif /* PNG_USER_MEM_SUPPORTED */
-      farfree (struct_ptr);
-   }
-}
-
-/* Allocate memory.  For reasonable files, size should never exceed
- * 64K.  However, zlib may allocate more then 64K if you don't tell
- * it not to.  See zconf.h and png.h for more information. zlib does
- * need to allocate exactly 64K, so whatever you call here must
- * have the ability to do that.
- *
- * Borland seems to have a problem in DOS mode for exactly 64K.
- * It gives you a segment with an offset of 8 (perhaps to store its
- * memory stuff).  zlib doesn't like this at all, so we have to
- * detect and deal with it.  This code should not be needed in
- * Windows or OS/2 modes, and only in 16 bit mode.  This code has
- * been updated by Alexander Lehmann for version 0.89 to waste less
- * memory.
- *
- * Note that we can't use png_size_t for the "size" declaration,
- * since on some systems a png_size_t is a 16-bit quantity, and as a
- * result, we would be truncating potentially larger memory requests
- * (which should cause a fatal error) and introducing major problems.
- */
-PNG_FUNCTION(png_voidp,PNGAPI
-png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-   ret = (png_malloc(png_ptr, size));
-
-   if (ret != NULL)
-      png_memset(ret,0,(png_size_t)size);
-
-   return (ret);
-}
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->malloc_fn != NULL)
-      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, size));
-
-   else
-      ret = (png_malloc_default(png_ptr, size));
-
-   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-       png_error(png_ptr, "Out of memory");
-
-   return (ret);
-}
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#  ifdef PNG_MAX_MALLOC_64K
-   if (size > (png_uint_32)65536L)
-   {
-      png_warning(png_ptr, "Cannot Allocate > 64K");
-      ret = NULL;
-   }
-
-   else
-#  endif
-
-   if (size != (size_t)size)
-      ret = NULL;
-
-   else if (size == (png_uint_32)65536L)
-   {
-      if (png_ptr->offset_table == NULL)
-      {
-         /* Try to see if we need to do any of this fancy stuff */
-         ret = farmalloc(size);
-         if (ret == NULL || ((png_size_t)ret & 0xffff))
-         {
-            int num_blocks;
-            png_uint_32 total_size;
-            png_bytep table;
-            int i, mem_level, window_bits;
-            png_byte huge * hptr;
-            int window_bits
-
-            if (ret != NULL)
-            {
-               farfree(ret);
-               ret = NULL;
-            }
-
-            window_bits =
-                png_ptr->zlib_window_bits >= png_ptr->zlib_text_window_bits ?
-                png_ptr->zlib_window_bits : png_ptr->zlib_text_window_bits;
-
-            if (window_bits > 14)
-               num_blocks = (int)(1 << (window_bits - 14));
-
-            else
-               num_blocks = 1;
-
-            mem_level =
-                png_ptr->zlib_mem_level >= png_ptr->zlib_text_mem_level ?
-                png_ptr->zlib_mem_level : png_ptr->zlib_text_mem_level;
-
-            if (mem_level >= 7)
-               num_blocks += (int)(1 << (mem_level - 7));
-
-            else
-               num_blocks++;
-
-            total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
-
-            table = farmalloc(total_size);
-
-            if (table == NULL)
-            {
-#  ifndef PNG_USER_MEM_SUPPORTED
-               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of Memory"); /* Note "O", "M" */
-
-               else
-                  png_warning(png_ptr, "Out Of Memory");
-#  endif
-               return (NULL);
-            }
-
-            if ((png_size_t)table & 0xfff0)
-            {
-#  ifndef PNG_USER_MEM_SUPPORTED
-               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr,
-                    "Farmalloc didn't return normalized pointer");
-
-               else
-                  png_warning(png_ptr,
-                    "Farmalloc didn't return normalized pointer");
-#  endif
-               return (NULL);
-            }
-
-            png_ptr->offset_table = table;
-            png_ptr->offset_table_ptr = farmalloc(num_blocks *
-               png_sizeof(png_bytep));
-
-            if (png_ptr->offset_table_ptr == NULL)
-            {
-#  ifndef PNG_USER_MEM_SUPPORTED
-               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-                  png_error(png_ptr, "Out Of memory"); /* Note "O", "m" */
-
-               else
-                  png_warning(png_ptr, "Out Of memory");
-#  endif
-               return (NULL);
-            }
-
-            hptr = (png_byte huge *)table;
-            if ((png_size_t)hptr & 0xf)
-            {
-               hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
-               hptr = hptr + 16L;  /* "hptr += 16L" fails on Turbo C++ 3.0 */
-            }
-
-            for (i = 0; i < num_blocks; i++)
-            {
-               png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
-               hptr = hptr + (png_uint_32)65536L;  /* "+=" fails on TC++3.0 */
-            }
-
-            png_ptr->offset_table_number = num_blocks;
-            png_ptr->offset_table_count = 0;
-            png_ptr->offset_table_count_free = 0;
-         }
-      }
-
-      if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
-      {
-#  ifndef PNG_USER_MEM_SUPPORTED
-         if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-            png_error(png_ptr, "Out of Memory"); /* Note "O" and "M" */
-
-         else
-            png_warning(png_ptr, "Out of Memory");
-#  endif
-         return (NULL);
-      }
-
-      ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
-   }
-
-   else
-      ret = farmalloc(size);
-
-#  ifndef PNG_USER_MEM_SUPPORTED
-   if (ret == NULL)
-   {
-      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-         png_error(png_ptr, "Out of memory"); /* Note "o" and "m" */
-
-      else
-         png_warning(png_ptr, "Out of memory"); /* Note "o" and "m" */
-   }
-#  endif
-
-   return (ret);
-}
-
-/* Free a pointer allocated by png_malloc().  In the default
- * configuration, png_ptr is not used, but is passed in case it
- * is needed.  If ptr is NULL, return without taking any action.
- */
-void PNGAPI
-png_free(png_structp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->free_fn != NULL)
-   {
-      (*(png_ptr->free_fn))(png_ptr, ptr);
-      return;
-   }
-
-   else
-      png_free_default(png_ptr, ptr);
-}
-
-void PNGAPI
-png_free_default(png_structp png_ptr, png_voidp ptr)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-   if (png_ptr->offset_table != NULL)
-   {
-      int i;
-
-      for (i = 0; i < png_ptr->offset_table_count; i++)
-      {
-         if (ptr == png_ptr->offset_table_ptr[i])
-         {
-            ptr = NULL;
-            png_ptr->offset_table_count_free++;
-            break;
-         }
-      }
-      if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
-      {
-         farfree(png_ptr->offset_table);
-         farfree(png_ptr->offset_table_ptr);
-         png_ptr->offset_table = NULL;
-         png_ptr->offset_table_ptr = NULL;
-      }
-   }
-
-   if (ptr != NULL)
-      farfree(ptr);
-}
-
-#else /* Not the Borland DOS special memory handler */
-
-/* Allocate memory for a png_struct or a png_info.  The malloc and
-   memset can be replaced by a single call to calloc() if this is thought
-   to improve performance noticably. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct,(int type),PNG_ALLOCATED)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_struct_2(type, NULL, NULL));
-}
-
-/* Allocate memory for a png_struct or a png_info.  The malloc and
-   memset can be replaced by a single call to calloc() if this is thought
-   to improve performance noticably. */
-PNG_FUNCTION(png_voidp /* PRIVATE */,
-png_create_struct_2,(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr),
-   PNG_ALLOCATED)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   png_size_t size;
-   png_voidp struct_ptr;
-
-   if (type == PNG_STRUCT_INFO)
-      size = png_sizeof(png_info);
-
-   else if (type == PNG_STRUCT_PNG)
-      size = png_sizeof(png_struct);
-
-   else
-      return (NULL);
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (malloc_fn != NULL)
-   {
-      png_struct dummy_struct;
-      png_structp png_ptr = &dummy_struct;
-      png_ptr->mem_ptr=mem_ptr;
-      struct_ptr = (*(malloc_fn))(png_ptr, size);
-
-      if (struct_ptr != NULL)
-         png_memset(struct_ptr, 0, size);
-
-      return (struct_ptr);
-   }
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-   struct_ptr = (png_voidp)farmalloc(size);
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-   struct_ptr = (png_voidp)halloc(size, 1);
-#    else
-   struct_ptr = (png_voidp)malloc(size);
-#    endif
-#  endif
-
-   if (struct_ptr != NULL)
-      png_memset(struct_ptr, 0, size);
-
-   return (struct_ptr);
-}
-
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct(png_voidp struct_ptr)
-{
-#  ifdef PNG_USER_MEM_SUPPORTED
-   png_destroy_struct_2(struct_ptr, NULL, NULL);
-}
-
-/* Free memory allocated by a png_create_struct() call */
-void /* PRIVATE */
-png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
-    png_voidp mem_ptr)
-{
-#  endif /* PNG_USER_MEM_SUPPORTED */
-   if (struct_ptr != NULL)
-   {
-#  ifdef PNG_USER_MEM_SUPPORTED
-      if (free_fn != NULL)
-      {
-         png_struct dummy_struct;
-         png_structp png_ptr = &dummy_struct;
-         png_ptr->mem_ptr=mem_ptr;
-         (*(free_fn))(png_ptr, struct_ptr);
-         return;
-      }
-#  endif /* PNG_USER_MEM_SUPPORTED */
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-      farfree(struct_ptr);
-
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-      hfree(struct_ptr);
-
-#    else
-      free(struct_ptr);
-
-#    endif
-#  endif
-   }
-}
-
-/* Allocate memory.  For reasonable files, size should never exceed
- * 64K.  However, zlib may allocate more then 64K if you don't tell
- * it not to.  See zconf.h and png.h for more information.  zlib does
- * need to allocate exactly 64K, so whatever you call here must
- * have the ability to do that.
- */
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_calloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-   ret = (png_malloc(png_ptr, size));
-
-   if (ret != NULL)
-      png_memset(ret,0,(png_size_t)size);
-
-   return (ret);
-}
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-   if (png_ptr->malloc_fn != NULL)
-      ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
-
-   else
-      ret = (png_malloc_default(png_ptr, size));
-
-   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-       png_error(png_ptr, "Out of Memory");
-
-   return (ret);
-}
-
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_default,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ret;
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-   if (png_ptr == NULL || size == 0)
-      return (NULL);
-
-#  ifdef PNG_MAX_MALLOC_64K
-   if (size > (png_uint_32)65536L)
-   {
-#    ifndef PNG_USER_MEM_SUPPORTED
-      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-         png_error(png_ptr, "Cannot Allocate > 64K");
-
-      else
-#    endif
-         return NULL;
-   }
-#  endif
-
-   /* Check for overflow */
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-
-   if (size != (unsigned long)size)
-      ret = NULL;
-
-   else
-      ret = farmalloc(size);
-
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-   if (size != (unsigned long)size)
-      ret = NULL;
-
-   else
-      ret = halloc(size, 1);
-
-#    else
-   if (size != (size_t)size)
-      ret = NULL;
-
-   else
-      ret = malloc((size_t)size);
-#    endif
-#  endif
-
-#  ifndef PNG_USER_MEM_SUPPORTED
-   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
-      png_error(png_ptr, "Out of Memory");
-#  endif
-
-   return (ret);
-}
-
-/* Free a pointer allocated by png_malloc().  If ptr is NULL, return
- * without taking any action.
- */
-void PNGAPI
-png_free(png_structp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-#  ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr->free_fn != NULL)
-   {
-      (*(png_ptr->free_fn))(png_ptr, ptr);
-      return;
-   }
-
-   else
-      png_free_default(png_ptr, ptr);
-}
-
-void PNGAPI
-png_free_default(png_structp png_ptr, png_voidp ptr)
-{
-   if (png_ptr == NULL || ptr == NULL)
-      return;
-
-#  endif /* PNG_USER_MEM_SUPPORTED */
-
-#  if defined(__TURBOC__) && !defined(__FLAT__)
-   farfree(ptr);
-
-#  else
-#    if defined(_MSC_VER) && defined(MAXSEG_64K)
-   hfree(ptr);
-
-#    else
-   free(ptr);
-
-#    endif
-#  endif
-}
-#endif /* Not Borland DOS special memory handler */
-
-/* This function was added at libpng version 1.2.3.  The png_malloc_warn()
- * function will set up png_malloc() to issue a png_warning and return NULL
- * instead of issuing a png_error, if it fails to allocate the requested
- * memory.
- */
-PNG_FUNCTION(png_voidp,PNGAPI
-png_malloc_warn,(png_structp png_ptr, png_alloc_size_t size),PNG_ALLOCATED)
-{
-   png_voidp ptr;
-   png_uint_32 save_flags;
-   if (png_ptr == NULL)
-      return (NULL);
-
-   save_flags = png_ptr->flags;
-   png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
-   ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
-   png_ptr->flags=save_flags;
-   return(ptr);
-}
-
-
-#ifdef PNG_USER_MEM_SUPPORTED
-/* This function is called when the application wants to use another method
- * of allocating and freeing memory.
- */
-void PNGAPI
-png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
-  malloc_fn, png_free_ptr free_fn)
-{
-   if (png_ptr != NULL)
-   {
-      png_ptr->mem_ptr = mem_ptr;
-      png_ptr->malloc_fn = malloc_fn;
-      png_ptr->free_fn = free_fn;
-   }
-}
-
-/* This function returns a pointer to the mem_ptr associated with the user
- * functions.  The application should free any memory associated with this
- * pointer before png_write_destroy and png_read_destroy are called.
- */
-png_voidp PNGAPI
-png_get_mem_ptr(png_const_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return ((png_voidp)png_ptr->mem_ptr);
-}
-#endif /* PNG_USER_MEM_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngmem.c - stub functions for memory allocation
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all memory allocation.  Users who
+ * need special memory handling are expected to supply replacement
+ * functions for png_malloc() and png_free(), and to use
+ * png_create_read_struct_2() and png_create_write_struct_2() to
+ * identify the replacement functions.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Borland DOS special memory handler */
+#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
+/* if you change this, be sure to change the one in png.h also */
+
+/* Allocate memory for a png_struct.  The malloc and memset can be replaced
+   by a single call to calloc() if this is thought to improve performance. */
+png_voidp /* PRIVATE */
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+}
+
+/* Alternate version of png_create_struct, for use with user-defined malloc. */
+png_voidp /* PRIVATE */
+png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_size_t size;
+   png_voidp struct_ptr;
+
+   if (type == PNG_STRUCT_INFO)
+     size = png_sizeof(png_info);
+   else if (type == PNG_STRUCT_PNG)
+     size = png_sizeof(png_struct);
+   else
+     return (png_get_copyright(NULL));
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if(malloc_fn != NULL)
+   {
+      png_struct dummy_struct;
+      png_structp png_ptr = &dummy_struct;
+      png_ptr->mem_ptr=mem_ptr;
+      struct_ptr = (*(malloc_fn))(png_ptr, (png_uint_32)size);
+   }
+   else
+#endif /* PNG_USER_MEM_SUPPORTED */
+      struct_ptr = (png_voidp)farmalloc(size);
+   if (struct_ptr != NULL)
+      png_memset(struct_ptr, 0, size);
+   return (struct_ptr);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
+    png_voidp mem_ptr)
+{
+#endif
+   if (struct_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      if(free_fn != NULL)
+      {
+         png_struct dummy_struct;
+         png_structp png_ptr = &dummy_struct;
+         png_ptr->mem_ptr=mem_ptr;
+         (*(free_fn))(png_ptr, struct_ptr);
+         return;
+      }
+#endif /* PNG_USER_MEM_SUPPORTED */
+      farfree (struct_ptr);
+   }
+}
+
+/* Allocate memory.  For reasonable files, size should never exceed
+ * 64K.  However, zlib may allocate more then 64K if you don't tell
+ * it not to.  See zconf.h and png.h for more information. zlib does
+ * need to allocate exactly 64K, so whatever you call here must
+ * have the ability to do that.
+ *
+ * Borland seems to have a problem in DOS mode for exactly 64K.
+ * It gives you a segment with an offset of 8 (perhaps to store its
+ * memory stuff).  zlib doesn't like this at all, so we have to
+ * detect and deal with it.  This code should not be needed in
+ * Windows or OS/2 modes, and only in 16 bit mode.  This code has
+ * been updated by Alexander Lehmann for version 0.89 to waste less
+ * memory.
+ *
+ * Note that we can't use png_size_t for the "size" declaration,
+ * since on some systems a png_size_t is a 16-bit quantity, and as a
+ * result, we would be truncating potentially larger memory requests
+ * (which should cause a fatal error) and introducing major problems.
+ */
+
+png_voidp PNGAPI
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if(png_ptr->malloc_fn != NULL)
+       ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
+   else
+       ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of memory!");
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (size > (png_uint_32)65536L)
+   {
+      png_warning(png_ptr, "Cannot Allocate > 64K");
+      ret = NULL;
+   }
+   else
+#endif
+
+   if (size != (size_t)size)
+     ret = NULL;
+   else if (size == (png_uint_32)65536L)
+   {
+      if (png_ptr->offset_table == NULL)
+      {
+         /* try to see if we need to do any of this fancy stuff */
+         ret = farmalloc(size);
+         if (ret == NULL || ((png_size_t)ret & 0xffff))
+         {
+            int num_blocks;
+            png_uint_32 total_size;
+            png_bytep table;
+            int i;
+            png_byte huge * hptr;
+
+            if (ret != NULL)
+            {
+               farfree(ret);
+               ret = NULL;
+            }
+
+            if(png_ptr->zlib_window_bits > 14)
+               num_blocks = (int)(1 << (png_ptr->zlib_window_bits - 14));
+            else
+               num_blocks = 1;
+            if (png_ptr->zlib_mem_level >= 7)
+               num_blocks += (int)(1 << (png_ptr->zlib_mem_level - 7));
+            else
+               num_blocks++;
+
+            total_size = ((png_uint_32)65536L) * (png_uint_32)num_blocks+16;
+
+            table = farmalloc(total_size);
+
+            if (table == NULL)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of Memory."); /* Note "O" and "M" */
+               else
+                  png_warning(png_ptr, "Out Of Memory.");
+#endif
+               return (NULL);
+            }
+
+            if ((png_size_t)table & 0xfff0)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr,
+                    "Farmalloc didn't return normalized pointer");
+               else
+                  png_warning(png_ptr,
+                    "Farmalloc didn't return normalized pointer");
+#endif
+               return (NULL);
+            }
+
+            png_ptr->offset_table = table;
+            png_ptr->offset_table_ptr = farmalloc(num_blocks *
+               png_sizeof (png_bytep));
+
+            if (png_ptr->offset_table_ptr == NULL)
+            {
+#ifndef PNG_USER_MEM_SUPPORTED
+               if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+                  png_error(png_ptr, "Out Of memory."); /* Note "O" and "M" */
+               else
+                  png_warning(png_ptr, "Out Of memory.");
+#endif
+               return (NULL);
+            }
+
+            hptr = (png_byte huge *)table;
+            if ((png_size_t)hptr & 0xf)
+            {
+               hptr = (png_byte huge *)((long)(hptr) & 0xfffffff0L);
+               hptr = hptr + 16L;  /* "hptr += 16L" fails on Turbo C++ 3.0 */
+            }
+            for (i = 0; i < num_blocks; i++)
+            {
+               png_ptr->offset_table_ptr[i] = (png_bytep)hptr;
+               hptr = hptr + (png_uint_32)65536L;  /* "+=" fails on TC++3.0 */
+            }
+
+            png_ptr->offset_table_number = num_blocks;
+            png_ptr->offset_table_count = 0;
+            png_ptr->offset_table_count_free = 0;
+         }
+      }
+
+      if (png_ptr->offset_table_count >= png_ptr->offset_table_number)
+      {
+#ifndef PNG_USER_MEM_SUPPORTED
+         if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+            png_error(png_ptr, "Out of Memory."); /* Note "o" and "M" */
+         else
+            png_warning(png_ptr, "Out of Memory.");
+#endif
+         return (NULL);
+      }
+
+      ret = png_ptr->offset_table_ptr[png_ptr->offset_table_count++];
+   }
+   else
+      ret = farmalloc(size);
+
+#ifndef PNG_USER_MEM_SUPPORTED
+   if (ret == NULL)
+   {
+      if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+         png_error(png_ptr, "Out of memory."); /* Note "o" and "m" */
+      else
+         png_warning(png_ptr, "Out of memory."); /* Note "o" and "m" */
+   }
+#endif
+
+   return (ret);
+}
+
+/* free a pointer allocated by png_malloc().  In the default
+   configuration, png_ptr is not used, but is passed in case it
+   is needed.  If ptr is NULL, return without taking any action. */
+void PNGAPI
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->free_fn != NULL)
+   {
+      (*(png_ptr->free_fn))(png_ptr, ptr);
+      return;
+   }
+   else png_free_default(png_ptr, ptr);
+}
+
+void PNGAPI
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr->offset_table != NULL)
+   {
+      int i;
+
+      for (i = 0; i < png_ptr->offset_table_count; i++)
+      {
+         if (ptr == png_ptr->offset_table_ptr[i])
+         {
+            ptr = NULL;
+            png_ptr->offset_table_count_free++;
+            break;
+         }
+      }
+      if (png_ptr->offset_table_count_free == png_ptr->offset_table_count)
+      {
+         farfree(png_ptr->offset_table);
+         farfree(png_ptr->offset_table_ptr);
+         png_ptr->offset_table = NULL;
+         png_ptr->offset_table_ptr = NULL;
+      }
+   }
+
+   if (ptr != NULL)
+   {
+      farfree(ptr);
+   }
+}
+
+#else /* Not the Borland DOS special memory handler */
+
+/* Allocate memory for a png_struct or a png_info.  The malloc and
+   memset can be replaced by a single call to calloc() if this is thought
+   to improve performance noticably. */
+png_voidp /* PRIVATE */
+png_create_struct(int type)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_struct_2(type, png_malloc_ptr_NULL, png_voidp_NULL));
+}
+
+/* Allocate memory for a png_struct or a png_info.  The malloc and
+   memset can be replaced by a single call to calloc() if this is thought
+   to improve performance noticably. */
+png_voidp /* PRIVATE */
+png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_size_t size;
+   png_voidp struct_ptr;
+
+   if (type == PNG_STRUCT_INFO)
+      size = png_sizeof(png_info);
+   else if (type == PNG_STRUCT_PNG)
+      size = png_sizeof(png_struct);
+   else
+      return (NULL);
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if(malloc_fn != NULL)
+   {
+      png_struct dummy_struct;
+      png_structp png_ptr = &dummy_struct;
+      png_ptr->mem_ptr=mem_ptr;
+      struct_ptr = (*(malloc_fn))(png_ptr, size);
+      if (struct_ptr != NULL)
+         png_memset(struct_ptr, 0, size);
+      return (struct_ptr);
+   }
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+   struct_ptr = (png_voidp)farmalloc(size);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+   struct_ptr = (png_voidp)halloc(size,1);
+# else
+   struct_ptr = (png_voidp)malloc(size);
+# endif
+#endif
+   if (struct_ptr != NULL)
+      png_memset(struct_ptr, 0, size);
+
+   return (struct_ptr);
+}
+
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct(png_voidp struct_ptr)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_destroy_struct_2(struct_ptr, png_free_ptr_NULL, png_voidp_NULL);
+}
+
+/* Free memory allocated by a png_create_struct() call */
+void /* PRIVATE */
+png_destroy_struct_2(png_voidp struct_ptr, png_free_ptr free_fn,
+    png_voidp mem_ptr)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   if (struct_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      if(free_fn != NULL)
+      {
+         png_struct dummy_struct;
+         png_structp png_ptr = &dummy_struct;
+         png_ptr->mem_ptr=mem_ptr;
+         (*(free_fn))(png_ptr, struct_ptr);
+         return;
+      }
+#endif /* PNG_USER_MEM_SUPPORTED */
+#if defined(__TURBOC__) && !defined(__FLAT__)
+      farfree(struct_ptr);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+      hfree(struct_ptr);
+# else
+      free(struct_ptr);
+# endif
+#endif
+   }
+}
+
+/* Allocate memory.  For reasonable files, size should never exceed
+   64K.  However, zlib may allocate more then 64K if you don't tell
+   it not to.  See zconf.h and png.h for more information.  zlib does
+   need to allocate exactly 64K, so whatever you call here must
+   have the ability to do that. */
+
+png_voidp PNGAPI
+png_malloc(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+   if(png_ptr->malloc_fn != NULL)
+       ret = ((png_voidp)(*(png_ptr->malloc_fn))(png_ptr, (png_size_t)size));
+   else
+       ret = (png_malloc_default(png_ptr, size));
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+       png_error(png_ptr, "Out of Memory!");
+   return (ret);
+}
+
+png_voidp PNGAPI
+png_malloc_default(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ret;
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   if (png_ptr == NULL || size == 0)
+      return (NULL);
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (size > (png_uint_32)65536L)
+   {
+#ifndef PNG_USER_MEM_SUPPORTED
+      if(png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+         png_error(png_ptr, "Cannot Allocate > 64K");
+      else
+#endif
+         return NULL;
+   }
+#endif
+
+ /* Check for overflow */
+#if defined(__TURBOC__) && !defined(__FLAT__)
+ if (size != (unsigned long)size)
+   ret = NULL;
+ else
+   ret = farmalloc(size);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+ if (size != (unsigned long)size)
+   ret = NULL;
+ else
+   ret = halloc(size, 1);
+# else
+ if (size != (size_t)size)
+   ret = NULL;
+ else
+   ret = malloc((size_t)size);
+# endif
+#endif
+
+#ifndef PNG_USER_MEM_SUPPORTED
+   if (ret == NULL && (png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0)
+      png_error(png_ptr, "Out of Memory");
+#endif
+
+   return (ret);
+}
+
+/* Free a pointer allocated by png_malloc().  If ptr is NULL, return
+   without taking any action. */
+void PNGAPI
+png_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   if (png_ptr->free_fn != NULL)
+   {
+      (*(png_ptr->free_fn))(png_ptr, ptr);
+      return;
+   }
+   else png_free_default(png_ptr, ptr);
+}
+void PNGAPI
+png_free_default(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL || ptr == NULL)
+      return;
+
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+#if defined(__TURBOC__) && !defined(__FLAT__)
+   farfree(ptr);
+#else
+# if defined(_MSC_VER) && defined(MAXSEG_64K)
+   hfree(ptr);
+# else
+   free(ptr);
+# endif
+#endif
+}
+
+#endif /* Not Borland DOS special memory handler */
+
+#if defined(PNG_1_0_X)
+#  define png_malloc_warn png_malloc
+#else
+/* This function was added at libpng version 1.2.3.  The png_malloc_warn()
+ * function will set up png_malloc() to issue a png_warning and return NULL
+ * instead of issuing a png_error, if it fails to allocate the requested
+ * memory.
+ */
+png_voidp PNGAPI
+png_malloc_warn(png_structp png_ptr, png_uint_32 size)
+{
+   png_voidp ptr;
+   png_uint_32 save_flags=png_ptr->flags;
+
+   png_ptr->flags|=PNG_FLAG_MALLOC_NULL_MEM_OK;
+   ptr = (png_voidp)png_malloc((png_structp)png_ptr, size);
+   png_ptr->flags=save_flags;
+   return(ptr);
+}
+#endif
+
+png_voidp PNGAPI
+png_memcpy_check (png_structp png_ptr, png_voidp s1, png_voidp s2,
+   png_uint_32 length)
+{
+   png_size_t size;
+
+   size = (png_size_t)length;
+   if ((png_uint_32)size != length)
+      png_error(png_ptr,"Overflow in png_memcpy_check.");
+
+   return(png_memcpy (s1, s2, size));
+}
+
+png_voidp PNGAPI
+png_memset_check (png_structp png_ptr, png_voidp s1, int value,
+   png_uint_32 length)
+{
+   png_size_t size;
+
+   size = (png_size_t)length;
+   if ((png_uint_32)size != length)
+      png_error(png_ptr,"Overflow in png_memset_check.");
+
+   return (png_memset (s1, value, size));
+
+}
+
+#ifdef PNG_USER_MEM_SUPPORTED
+/* This function is called when the application wants to use another method
+ * of allocating and freeing memory.
+ */
+void PNGAPI
+png_set_mem_fn(png_structp png_ptr, png_voidp mem_ptr, png_malloc_ptr
+  malloc_fn, png_free_ptr free_fn)
+{
+   png_ptr->mem_ptr = mem_ptr;
+   png_ptr->malloc_fn = malloc_fn;
+   png_ptr->free_fn = free_fn;
+}
+
+/* This function returns a pointer to the mem_ptr associated with the user
+ * functions.  The application should free any memory associated with this
+ * pointer before png_write_destroy and png_read_destroy are called.
+ */
+png_voidp PNGAPI
+png_get_mem_ptr(png_structp png_ptr)
+{
+   return ((png_voidp)png_ptr->mem_ptr);
+}
+#endif /* PNG_USER_MEM_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/png/pngpread.c b/Source/3rd Party/wx/src/png/pngpread.c
index ca7607a66..bbf2e14ad 100644
--- a/Source/3rd Party/wx/src/png/pngpread.c	
+++ b/Source/3rd Party/wx/src/png/pngpread.c	
@@ -1,1846 +1,1573 @@
-
-/* pngpread.c - read a png file in push mode
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-
-/* Push model modes */
-#define PNG_READ_SIG_MODE   0
-#define PNG_READ_CHUNK_MODE 1
-#define PNG_READ_IDAT_MODE  2
-#define PNG_SKIP_MODE       3
-#define PNG_READ_tEXt_MODE  4
-#define PNG_READ_zTXt_MODE  5
-#define PNG_READ_DONE_MODE  6
-#define PNG_READ_iTXt_MODE  7
-#define PNG_ERROR_MODE      8
-
-void PNGAPI
-png_process_data(png_structp png_ptr, png_infop info_ptr,
-    png_bytep buffer, png_size_t buffer_size)
-{
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_push_restore_buffer(png_ptr, buffer, buffer_size);
-
-   while (png_ptr->buffer_size)
-   {
-      png_process_some_data(png_ptr, info_ptr);
-   }
-}
-
-png_size_t PNGAPI
-png_process_data_pause(png_structp png_ptr, int save)
-{
-   if (png_ptr != NULL)
-   {
-      /* It's easiest for the caller if we do the save, then the caller doesn't
-       * have to supply the same data again:
-       */
-      if (save)
-         png_push_save_buffer(png_ptr);
-      else
-      {
-         /* This includes any pending saved bytes: */
-         png_size_t remaining = png_ptr->buffer_size;
-         png_ptr->buffer_size = 0;
-
-         /* So subtract the saved buffer size, unless all the data
-          * is actually 'saved', in which case we just return 0
-          */
-         if (png_ptr->save_buffer_size < remaining)
-            return remaining - png_ptr->save_buffer_size;
-      }
-   }
-
-   return 0;
-}
-
-png_uint_32 PNGAPI
-png_process_data_skip(png_structp png_ptr)
-{
-   png_uint_32 remaining = 0;
-
-   if (png_ptr != NULL && png_ptr->process_mode == PNG_SKIP_MODE &&
-      png_ptr->skip_length > 0)
-   {
-      /* At the end of png_process_data the buffer size must be 0 (see the loop
-       * above) so we can detect a broken call here:
-       */
-      if (png_ptr->buffer_size != 0)
-         png_error(png_ptr,
-            "png_process_data_skip called inside png_process_data");
-
-      /* If is impossible for there to be a saved buffer at this point -
-       * otherwise we could not be in SKIP mode.  This will also happen if
-       * png_process_skip is called inside png_process_data (but only very
-       * rarely.)
-       */
-      if (png_ptr->save_buffer_size != 0)
-         png_error(png_ptr, "png_process_data_skip called with saved data");
-
-      remaining = png_ptr->skip_length;
-      png_ptr->skip_length = 0;
-      png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-   }
-
-   return remaining;
-}
-
-/* What we do with the incoming data depends on what we were previously
- * doing before we ran out of data...
- */
-void /* PRIVATE */
-png_process_some_data(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr == NULL)
-      return;
-
-   switch (png_ptr->process_mode)
-   {
-      case PNG_READ_SIG_MODE:
-      {
-         png_push_read_sig(png_ptr, info_ptr);
-         break;
-      }
-
-      case PNG_READ_CHUNK_MODE:
-      {
-         png_push_read_chunk(png_ptr, info_ptr);
-         break;
-      }
-
-      case PNG_READ_IDAT_MODE:
-      {
-         png_push_read_IDAT(png_ptr);
-         break;
-      }
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      case PNG_READ_tEXt_MODE:
-      {
-         png_push_read_tEXt(png_ptr, info_ptr);
-         break;
-      }
-
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-      case PNG_READ_zTXt_MODE:
-      {
-         png_push_read_zTXt(png_ptr, info_ptr);
-         break;
-      }
-
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-      case PNG_READ_iTXt_MODE:
-      {
-         png_push_read_iTXt(png_ptr, info_ptr);
-         break;
-      }
-
-#endif
-      case PNG_SKIP_MODE:
-      {
-         png_push_crc_finish(png_ptr);
-         break;
-      }
-
-      default:
-      {
-         png_ptr->buffer_size = 0;
-         break;
-      }
-   }
-}
-
-/* Read any remaining signature bytes from the stream and compare them with
- * the correct PNG signature.  It is possible that this routine is called
- * with bytes already read from the signature, either because they have been
- * checked by the calling application, or because of multiple calls to this
- * routine.
- */
-void /* PRIVATE */
-png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
-{
-   png_size_t num_checked = png_ptr->sig_bytes,
-             num_to_check = 8 - num_checked;
-
-   if (png_ptr->buffer_size < num_to_check)
-   {
-      num_to_check = png_ptr->buffer_size;
-   }
-
-   png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
-       num_to_check);
-   png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes + num_to_check);
-
-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
-   {
-      if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
-         png_error(png_ptr, "Not a PNG file");
-
-      else
-         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
-   }
-   else
-   {
-      if (png_ptr->sig_bytes >= 8)
-      {
-         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-      }
-   }
-}
-
-void /* PRIVATE */
-png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
-{
-   png_uint_32 chunk_name;
-
-   /* First we make sure we have enough data for the 4 byte chunk name
-    * and the 4 byte chunk length before proceeding with decoding the
-    * chunk data.  To fully decode each of these chunks, we also make
-    * sure we have enough data in the buffer for the 4 byte CRC at the
-    * end of every chunk (except IDAT, which is handled separately).
-    */
-   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
-   {
-      png_byte chunk_length[4];
-      png_byte chunk_tag[4];
-
-      if (png_ptr->buffer_size < 8)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_fill_buffer(png_ptr, chunk_length, 4);
-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
-      png_reset_crc(png_ptr);
-      png_crc_read(png_ptr, chunk_tag, 4);
-      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
-      png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-   }
-
-   chunk_name = png_ptr->chunk_name;
-
-   if (chunk_name == png_IDAT)
-   {
-      /* This is here above the if/else case statement below because if the
-       * unknown handling marks 'IDAT' as unknown then the IDAT handling case is
-       * completely skipped.
-       *
-       * TODO: there must be a better way of doing this.
-       */
-      if (png_ptr->mode & PNG_AFTER_IDAT)
-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-   }
-
-   if (chunk_name == png_IHDR)
-   {
-      if (png_ptr->push_length != 13)
-         png_error(png_ptr, "Invalid IHDR length");
-
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-   else if (chunk_name == png_IEND)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
-
-      png_ptr->process_mode = PNG_READ_DONE_MODE;
-      png_push_have_end(png_ptr, info_ptr);
-   }
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   else if (png_chunk_unknown_handling(png_ptr, chunk_name))
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      if (chunk_name == png_IDAT)
-         png_ptr->mode |= PNG_HAVE_IDAT;
-
-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
-
-      if (chunk_name == png_PLTE)
-         png_ptr->mode |= PNG_HAVE_PLTE;
-
-      else if (chunk_name == png_IDAT)
-      {
-         if (!(png_ptr->mode & PNG_HAVE_IHDR))
-            png_error(png_ptr, "Missing IHDR before IDAT");
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-             !(png_ptr->mode & PNG_HAVE_PLTE))
-            png_error(png_ptr, "Missing PLTE before IDAT");
-      }
-   }
-
-#endif
-   else if (chunk_name == png_PLTE)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-   else if (chunk_name == png_IDAT)
-   {
-      /* If we reach an IDAT chunk, this means we have read all of the
-       * header chunks, and we can start reading the image (or if this
-       * is called after the image has been read - we have an error).
-       */
-
-      if (!(png_ptr->mode & PNG_HAVE_IHDR))
-         png_error(png_ptr, "Missing IHDR before IDAT");
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-          !(png_ptr->mode & PNG_HAVE_PLTE))
-         png_error(png_ptr, "Missing PLTE before IDAT");
-
-      if (png_ptr->mode & PNG_HAVE_IDAT)
-      {
-         if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-            if (png_ptr->push_length == 0)
-               return;
-
-         if (png_ptr->mode & PNG_AFTER_IDAT)
-            png_benign_error(png_ptr, "Too many IDATs found");
-      }
-
-      png_ptr->idat_size = png_ptr->push_length;
-      png_ptr->mode |= PNG_HAVE_IDAT;
-      png_ptr->process_mode = PNG_READ_IDAT_MODE;
-      png_push_have_info(png_ptr, info_ptr);
-      png_ptr->zstream.avail_out =
-          (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
-          png_ptr->iwidth) + 1;
-      png_ptr->zstream.next_out = png_ptr->row_buf;
-      return;
-   }
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-   else if (png_ptr->chunk_name == png_gAMA)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sBIT_SUPPORTED
-   else if (png_ptr->chunk_name == png_sBIT)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_cHRM_SUPPORTED
-   else if (png_ptr->chunk_name == png_cHRM)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sRGB_SUPPORTED
-   else if (chunk_name == png_sRGB)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iCCP_SUPPORTED
-   else if (png_ptr->chunk_name == png_iCCP)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sPLT_SUPPORTED
-   else if (chunk_name == png_sPLT)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tRNS_SUPPORTED
-   else if (chunk_name == png_tRNS)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_bKGD_SUPPORTED
-   else if (chunk_name == png_bKGD)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_hIST_SUPPORTED
-   else if (chunk_name == png_hIST)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_pHYs_SUPPORTED
-   else if (chunk_name == png_pHYs)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_oFFs_SUPPORTED
-   else if (chunk_name == png_oFFs)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-   else if (chunk_name == png_pCAL)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sCAL_SUPPORTED
-   else if (chunk_name == png_sCAL)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tIME_SUPPORTED
-   else if (chunk_name == png_tIME)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tEXt_SUPPORTED
-   else if (chunk_name == png_tEXt)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-   else if (chunk_name == png_zTXt)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-   else if (chunk_name == png_iTXt)
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-   else
-   {
-      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-      png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-   png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-}
-
-void /* PRIVATE */
-png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)
-{
-   png_ptr->process_mode = PNG_SKIP_MODE;
-   png_ptr->skip_length = skip;
-}
-
-void /* PRIVATE */
-png_push_crc_finish(png_structp png_ptr)
-{
-   if (png_ptr->skip_length && png_ptr->save_buffer_size)
-   {
-      png_size_t save_size = png_ptr->save_buffer_size;
-      png_uint_32 skip_length = png_ptr->skip_length;
-
-      /* We want the smaller of 'skip_length' and 'save_buffer_size', but
-       * they are of different types and we don't know which variable has the
-       * fewest bits.  Carefully select the smaller and cast it to the type of
-       * the larger - this cannot overflow.  Do not cast in the following test
-       * - it will break on either 16 or 64 bit platforms.
-       */
-      if (skip_length < save_size)
-         save_size = (png_size_t)skip_length;
-
-      else
-         skip_length = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
-
-      png_ptr->skip_length -= skip_length;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->save_buffer_size -= save_size;
-      png_ptr->save_buffer_ptr += save_size;
-   }
-   if (png_ptr->skip_length && png_ptr->current_buffer_size)
-   {
-      png_size_t save_size = png_ptr->current_buffer_size;
-      png_uint_32 skip_length = png_ptr->skip_length;
-
-      /* We want the smaller of 'skip_length' and 'current_buffer_size', here,
-       * the same problem exists as above and the same solution.
-       */
-      if (skip_length < save_size)
-         save_size = (png_size_t)skip_length;
-
-      else
-         skip_length = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
-
-      png_ptr->skip_length -= skip_length;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->current_buffer_size -= save_size;
-      png_ptr->current_buffer_ptr += save_size;
-   }
-   if (!png_ptr->skip_length)
-   {
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_crc_finish(png_ptr, 0);
-      png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-   }
-}
-
-void PNGCBAPI
-png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
-{
-   png_bytep ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   ptr = buffer;
-   if (png_ptr->save_buffer_size)
-   {
-      png_size_t save_size;
-
-      if (length < png_ptr->save_buffer_size)
-         save_size = length;
-
-      else
-         save_size = png_ptr->save_buffer_size;
-
-      png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
-      length -= save_size;
-      ptr += save_size;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->save_buffer_size -= save_size;
-      png_ptr->save_buffer_ptr += save_size;
-   }
-   if (length && png_ptr->current_buffer_size)
-   {
-      png_size_t save_size;
-
-      if (length < png_ptr->current_buffer_size)
-         save_size = length;
-
-      else
-         save_size = png_ptr->current_buffer_size;
-
-      png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
-      png_ptr->buffer_size -= save_size;
-      png_ptr->current_buffer_size -= save_size;
-      png_ptr->current_buffer_ptr += save_size;
-   }
-}
-
-void /* PRIVATE */
-png_push_save_buffer(png_structp png_ptr)
-{
-   if (png_ptr->save_buffer_size)
-   {
-      if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
-      {
-         png_size_t i, istop;
-         png_bytep sp;
-         png_bytep dp;
-
-         istop = png_ptr->save_buffer_size;
-         for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
-             i < istop; i++, sp++, dp++)
-         {
-            *dp = *sp;
-         }
-      }
-   }
-   if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
-       png_ptr->save_buffer_max)
-   {
-      png_size_t new_max;
-      png_bytep old_buffer;
-
-      if (png_ptr->save_buffer_size > PNG_SIZE_MAX -
-          (png_ptr->current_buffer_size + 256))
-      {
-         png_error(png_ptr, "Potential overflow of save_buffer");
-      }
-
-      new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
-      old_buffer = png_ptr->save_buffer;
-      png_ptr->save_buffer = (png_bytep)png_malloc_warn(png_ptr,
-          (png_size_t)new_max);
-
-      if (png_ptr->save_buffer == NULL)
-      {
-         png_free(png_ptr, old_buffer);
-         png_error(png_ptr, "Insufficient memory for save_buffer");
-      }
-
-      png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
-      png_free(png_ptr, old_buffer);
-      png_ptr->save_buffer_max = new_max;
-   }
-   if (png_ptr->current_buffer_size)
-   {
-      png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
-         png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
-      png_ptr->save_buffer_size += png_ptr->current_buffer_size;
-      png_ptr->current_buffer_size = 0;
-   }
-   png_ptr->save_buffer_ptr = png_ptr->save_buffer;
-   png_ptr->buffer_size = 0;
-}
-
-void /* PRIVATE */
-png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
-   png_size_t buffer_length)
-{
-   png_ptr->current_buffer = buffer;
-   png_ptr->current_buffer_size = buffer_length;
-   png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
-   png_ptr->current_buffer_ptr = png_ptr->current_buffer;
-}
-
-void /* PRIVATE */
-png_push_read_IDAT(png_structp png_ptr)
-{
-   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
-   {
-      png_byte chunk_length[4];
-      png_byte chunk_tag[4];
-
-      /* TODO: this code can be commoned up with the same code in push_read */
-      if (png_ptr->buffer_size < 8)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_fill_buffer(png_ptr, chunk_length, 4);
-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
-      png_reset_crc(png_ptr);
-      png_crc_read(png_ptr, chunk_tag, 4);
-      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
-      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-
-      if (png_ptr->chunk_name != png_IDAT)
-      {
-         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-
-         if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-            png_error(png_ptr, "Not enough compressed data");
-
-         return;
-      }
-
-      png_ptr->idat_size = png_ptr->push_length;
-   }
-
-   if (png_ptr->idat_size && png_ptr->save_buffer_size)
-   {
-      png_size_t save_size = png_ptr->save_buffer_size;
-      png_uint_32 idat_size = png_ptr->idat_size;
-
-      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
-       * are of different types and we don't know which variable has the fewest
-       * bits.  Carefully select the smaller and cast it to the type of the
-       * larger - this cannot overflow.  Do not cast in the following test - it
-       * will break on either 16 or 64 bit platforms.
-       */
-      if (idat_size < save_size)
-         save_size = (png_size_t)idat_size;
-
-      else
-         idat_size = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
-
-      png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
-
-      png_ptr->idat_size -= idat_size;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->save_buffer_size -= save_size;
-      png_ptr->save_buffer_ptr += save_size;
-   }
-
-   if (png_ptr->idat_size && png_ptr->current_buffer_size)
-   {
-      png_size_t save_size = png_ptr->current_buffer_size;
-      png_uint_32 idat_size = png_ptr->idat_size;
-
-      /* We want the smaller of 'idat_size' and 'current_buffer_size', but they
-       * are of different types and we don't know which variable has the fewest
-       * bits.  Carefully select the smaller and cast it to the type of the
-       * larger - this cannot overflow.
-       */
-      if (idat_size < save_size)
-         save_size = (png_size_t)idat_size;
-
-      else
-         idat_size = (png_uint_32)save_size;
-
-      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
-
-      png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
-
-      png_ptr->idat_size -= idat_size;
-      png_ptr->buffer_size -= save_size;
-      png_ptr->current_buffer_size -= save_size;
-      png_ptr->current_buffer_ptr += save_size;
-   }
-   if (!png_ptr->idat_size)
-   {
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_crc_finish(png_ptr, 0);
-      png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-      png_ptr->mode |= PNG_AFTER_IDAT;
-   }
-}
-
-void /* PRIVATE */
-png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
-   png_size_t buffer_length)
-{
-   /* The caller checks for a non-zero buffer length. */
-   if (!(buffer_length > 0) || buffer == NULL)
-      png_error(png_ptr, "No IDAT data (internal error)");
-
-   /* This routine must process all the data it has been given
-    * before returning, calling the row callback as required to
-    * handle the uncompressed results.
-    */
-   png_ptr->zstream.next_in = buffer;
-   png_ptr->zstream.avail_in = (uInt)buffer_length;
-
-   /* Keep going until the decompressed data is all processed
-    * or the stream marked as finished.
-    */
-   while (png_ptr->zstream.avail_in > 0 &&
-          !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-   {
-      int ret;
-
-      /* We have data for zlib, but we must check that zlib
-       * has someplace to put the results.  It doesn't matter
-       * if we don't expect any results -- it may be the input
-       * data is just the LZ end code.
-       */
-      if (!(png_ptr->zstream.avail_out > 0))
-      {
-         png_ptr->zstream.avail_out =
-             (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
-             png_ptr->iwidth) + 1;
-
-         png_ptr->zstream.next_out = png_ptr->row_buf;
-      }
-
-      /* Using Z_SYNC_FLUSH here means that an unterminated
-       * LZ stream (a stream with a missing end code) can still
-       * be handled, otherwise (Z_NO_FLUSH) a future zlib
-       * implementation might defer output and therefore
-       * change the current behavior (see comments in inflate.c
-       * for why this doesn't happen at present with zlib 1.2.5).
-       */
-      ret = inflate(&png_ptr->zstream, Z_SYNC_FLUSH);
-
-      /* Check for any failure before proceeding. */
-      if (ret != Z_OK && ret != Z_STREAM_END)
-      {
-         /* Terminate the decompression. */
-         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-
-         /* This may be a truncated stream (missing or
-          * damaged end code).  Treat that as a warning.
-          */
-         if (png_ptr->row_number >= png_ptr->num_rows ||
-             png_ptr->pass > 6)
-            png_warning(png_ptr, "Truncated compressed data in IDAT");
-
-         else
-            png_error(png_ptr, "Decompression error in IDAT");
-
-         /* Skip the check on unprocessed input */
-         return;
-      }
-
-      /* Did inflate output any data? */
-      if (png_ptr->zstream.next_out != png_ptr->row_buf)
-      {
-         /* Is this unexpected data after the last row?
-          * If it is, artificially terminate the LZ output
-          * here.
-          */
-         if (png_ptr->row_number >= png_ptr->num_rows ||
-             png_ptr->pass > 6)
-         {
-            /* Extra data. */
-            png_warning(png_ptr, "Extra compressed data in IDAT");
-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-
-            /* Do no more processing; skip the unprocessed
-             * input check below.
-             */
-            return;
-         }
-
-         /* Do we have a complete row? */
-         if (png_ptr->zstream.avail_out == 0)
-            png_push_process_row(png_ptr);
-      }
-
-      /* And check for the end of the stream. */
-      if (ret == Z_STREAM_END)
-         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-   }
-
-   /* All the data should have been processed, if anything
-    * is left at this point we have bytes of IDAT data
-    * after the zlib end code.
-    */
-   if (png_ptr->zstream.avail_in > 0)
-      png_warning(png_ptr, "Extra compression data in IDAT");
-}
-
-void /* PRIVATE */
-png_push_process_row(png_structp png_ptr)
-{
-   /* 1.5.6: row_info moved out of png_struct to a local here. */
-   png_row_info row_info;
-
-   row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */
-   row_info.color_type = png_ptr->color_type;
-   row_info.bit_depth = png_ptr->bit_depth;
-   row_info.channels = png_ptr->channels;
-   row_info.pixel_depth = png_ptr->pixel_depth;
-   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
-
-   if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
-   {
-      if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)
-         png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,
-            png_ptr->prev_row + 1, png_ptr->row_buf[0]);
-      else
-         png_error(png_ptr, "bad adaptive filter value");
-   }
-
-   /* libpng 1.5.6: the following line was copying png_ptr->rowbytes before
-    * 1.5.6, while the buffer really is this big in current versions of libpng
-    * it may not be in the future, so this was changed just to copy the
-    * interlaced row count:
-    */
-   png_memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   if (png_ptr->transformations)
-      png_do_read_transformations(png_ptr, &row_info);
-#endif
-
-   /* The transformed pixel depth should match the depth now in row_info. */
-   if (png_ptr->transformed_pixel_depth == 0)
-   {
-      png_ptr->transformed_pixel_depth = row_info.pixel_depth;
-      if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)
-         png_error(png_ptr, "progressive row overflow");
-   }
-
-   else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)
-      png_error(png_ptr, "internal progressive row size calculation error");
-
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Blow up interlaced rows to full size */
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
-   {
-      if (png_ptr->pass < 6)
-         png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
-            png_ptr->transformations);
-
-    switch (png_ptr->pass)
-    {
-         case 0:
-         {
-            int i;
-            for (i = 0; i < 8 && png_ptr->pass == 0; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr); /* Updates png_ptr->pass */
-            }
-
-            if (png_ptr->pass == 2) /* Pass 1 might be empty */
-            {
-               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            if (png_ptr->pass == 4 && png_ptr->height <= 4)
-            {
-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            if (png_ptr->pass == 6 && png_ptr->height <= 4)
-            {
-                png_push_have_row(png_ptr, NULL);
-                png_read_push_finish_row(png_ptr);
-            }
-
-            break;
-         }
-
-         case 1:
-         {
-            int i;
-            for (i = 0; i < 8 && png_ptr->pass == 1; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 2) /* Skip top 4 generated rows */
-            {
-               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            break;
-         }
-
-         case 2:
-         {
-            int i;
-
-            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 4) /* Pass 3 might be empty */
-            {
-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            break;
-         }
-
-         case 3:
-         {
-            int i;
-
-            for (i = 0; i < 4 && png_ptr->pass == 3; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 4) /* Skip top two generated rows */
-            {
-               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-               {
-                  png_push_have_row(png_ptr, NULL);
-                  png_read_push_finish_row(png_ptr);
-               }
-            }
-
-            break;
-         }
-
-         case 4:
-         {
-            int i;
-
-            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 6) /* Pass 5 might be empty */
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            break;
-         }
-
-         case 5:
-         {
-            int i;
-
-            for (i = 0; i < 2 && png_ptr->pass == 5; i++)
-            {
-               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            if (png_ptr->pass == 6) /* Skip top generated row */
-            {
-               png_push_have_row(png_ptr, NULL);
-               png_read_push_finish_row(png_ptr);
-            }
-
-            break;
-         }
-
-         default:
-         case 6:
-         {
-            png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-            png_read_push_finish_row(png_ptr);
-
-            if (png_ptr->pass != 6)
-               break;
-
-            png_push_have_row(png_ptr, NULL);
-            png_read_push_finish_row(png_ptr);
-         }
-      }
-   }
-   else
-#endif
-   {
-      png_push_have_row(png_ptr, png_ptr->row_buf + 1);
-      png_read_push_finish_row(png_ptr);
-   }
-}
-
-void /* PRIVATE */
-png_read_push_finish_row(png_structp png_ptr)
-{
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-
-   /* Height of interlace block.  This is not currently used - if you need
-    * it, uncomment it here and in png.h
-   static PNG_CONST png_byte FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
-   */
-
-   png_ptr->row_number++;
-   if (png_ptr->row_number < png_ptr->num_rows)
-      return;
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced)
-   {
-      png_ptr->row_number = 0;
-      png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
-      do
-      {
-         png_ptr->pass++;
-         if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
-             (png_ptr->pass == 3 && png_ptr->width < 3) ||
-             (png_ptr->pass == 5 && png_ptr->width < 2))
-            png_ptr->pass++;
-
-         if (png_ptr->pass > 7)
-            png_ptr->pass--;
-
-         if (png_ptr->pass >= 7)
-            break;
-
-         png_ptr->iwidth = (png_ptr->width +
-             png_pass_inc[png_ptr->pass] - 1 -
-             png_pass_start[png_ptr->pass]) /
-             png_pass_inc[png_ptr->pass];
-
-         if (png_ptr->transformations & PNG_INTERLACE)
-            break;
-
-         png_ptr->num_rows = (png_ptr->height +
-             png_pass_yinc[png_ptr->pass] - 1 -
-             png_pass_ystart[png_ptr->pass]) /
-             png_pass_yinc[png_ptr->pass];
-
-      } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
-   }
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-}
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-void /* PRIVATE */
-png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
-    length)
-{
-   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
-      {
-         PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-         png_error(png_ptr, "Out of place tEXt");
-         /* NOT REACHED */
-      }
-
-#ifdef PNG_MAX_MALLOC_64K
-   png_ptr->skip_length = 0;  /* This may not be necessary */
-
-   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
-   {
-      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
-      png_ptr->skip_length = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
-       (png_size_t)(length + 1));
-   png_ptr->current_text[length] = '\0';
-   png_ptr->current_text_ptr = png_ptr->current_text;
-   png_ptr->current_text_size = (png_size_t)length;
-   png_ptr->current_text_left = (png_size_t)length;
-   png_ptr->process_mode = PNG_READ_tEXt_MODE;
-}
-
-void /* PRIVATE */
-png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr->buffer_size && png_ptr->current_text_left)
-   {
-      png_size_t text_size;
-
-      if (png_ptr->buffer_size < png_ptr->current_text_left)
-         text_size = png_ptr->buffer_size;
-
-      else
-         text_size = png_ptr->current_text_left;
-
-      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
-      png_ptr->current_text_left -= text_size;
-      png_ptr->current_text_ptr += text_size;
-   }
-   if (!(png_ptr->current_text_left))
-   {
-      png_textp text_ptr;
-      png_charp text;
-      png_charp key;
-      int ret;
-
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_crc_finish(png_ptr);
-
-#ifdef PNG_MAX_MALLOC_64K
-      if (png_ptr->skip_length)
-         return;
-#endif
-
-      key = png_ptr->current_text;
-
-      for (text = key; *text; text++)
-         /* Empty loop */ ;
-
-      if (text < key + png_ptr->current_text_size)
-         text++;
-
-      text_ptr = (png_textp)png_malloc(png_ptr, png_sizeof(png_text));
-      text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
-      text_ptr->key = key;
-      text_ptr->itxt_length = 0;
-      text_ptr->lang = NULL;
-      text_ptr->lang_key = NULL;
-      text_ptr->text = text;
-
-      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-      png_free(png_ptr, key);
-      png_free(png_ptr, text_ptr);
-      png_ptr->current_text = NULL;
-
-      if (ret)
-         png_warning(png_ptr, "Insufficient memory to store text chunk");
-   }
-}
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-void /* PRIVATE */
-png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
-   length)
-{
-   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
-   {
-      PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-      png_error(png_ptr, "Out of place zTXt");
-      /* NOT REACHED */
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   /* We can't handle zTXt chunks > 64K, since we don't have enough space
-    * to be able to store the uncompressed data.  Actually, the threshold
-    * is probably around 32K, but it isn't as definite as 64K is.
-    */
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "zTXt chunk too large to fit in memory");
-      png_push_crc_skip(png_ptr, length);
-      return;
-   }
-#endif
-
-   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
-       (png_size_t)(length + 1));
-   png_ptr->current_text[length] = '\0';
-   png_ptr->current_text_ptr = png_ptr->current_text;
-   png_ptr->current_text_size = (png_size_t)length;
-   png_ptr->current_text_left = (png_size_t)length;
-   png_ptr->process_mode = PNG_READ_zTXt_MODE;
-}
-
-void /* PRIVATE */
-png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr->buffer_size && png_ptr->current_text_left)
-   {
-      png_size_t text_size;
-
-      if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
-         text_size = png_ptr->buffer_size;
-
-      else
-         text_size = png_ptr->current_text_left;
-
-      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
-      png_ptr->current_text_left -= text_size;
-      png_ptr->current_text_ptr += text_size;
-   }
-   if (!(png_ptr->current_text_left))
-   {
-      png_textp text_ptr;
-      png_charp text;
-      png_charp key;
-      int ret;
-      png_size_t text_size, key_size;
-
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_crc_finish(png_ptr);
-
-      key = png_ptr->current_text;
-
-      for (text = key; *text; text++)
-         /* Empty loop */ ;
-
-      /* zTXt can't have zero text */
-      if (text >= key + png_ptr->current_text_size)
-      {
-         png_ptr->current_text = NULL;
-         png_free(png_ptr, key);
-         return;
-      }
-
-      text++;
-
-      if (*text != PNG_TEXT_COMPRESSION_zTXt) /* Check compression byte */
-      {
-         png_ptr->current_text = NULL;
-         png_free(png_ptr, key);
-         return;
-      }
-
-      text++;
-
-      png_ptr->zstream.next_in = (png_bytep)text;
-      png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
-          (text - key));
-      png_ptr->zstream.next_out = png_ptr->zbuf;
-      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-
-      key_size = text - key;
-      text_size = 0;
-      text = NULL;
-      ret = Z_STREAM_END;
-
-      while (png_ptr->zstream.avail_in)
-      {
-         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
-         if (ret != Z_OK && ret != Z_STREAM_END)
-         {
-            inflateReset(&png_ptr->zstream);
-            png_ptr->zstream.avail_in = 0;
-            png_ptr->current_text = NULL;
-            png_free(png_ptr, key);
-            png_free(png_ptr, text);
-            return;
-         }
-
-         if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
-         {
-            if (text == NULL)
-            {
-               text = (png_charp)png_malloc(png_ptr,
-                   (png_ptr->zbuf_size
-                   - png_ptr->zstream.avail_out + key_size + 1));
-
-               png_memcpy(text + key_size, png_ptr->zbuf,
-                   png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-
-               png_memcpy(text, key, key_size);
-
-               text_size = key_size + png_ptr->zbuf_size -
-                   png_ptr->zstream.avail_out;
-
-               *(text + text_size) = '\0';
-            }
-
-            else
-            {
-               png_charp tmp;
-
-               tmp = text;
-               text = (png_charp)png_malloc(png_ptr, text_size +
-                   (png_ptr->zbuf_size
-                   - png_ptr->zstream.avail_out + 1));
-
-               png_memcpy(text, tmp, text_size);
-               png_free(png_ptr, tmp);
-
-               png_memcpy(text + text_size, png_ptr->zbuf,
-                   png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-
-               text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
-               *(text + text_size) = '\0';
-            }
-
-            if (ret != Z_STREAM_END)
-            {
-               png_ptr->zstream.next_out = png_ptr->zbuf;
-               png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-            }
-         }
-         else
-         {
-            break;
-         }
-
-         if (ret == Z_STREAM_END)
-            break;
-      }
-
-      inflateReset(&png_ptr->zstream);
-      png_ptr->zstream.avail_in = 0;
-
-      if (ret != Z_STREAM_END)
-      {
-         png_ptr->current_text = NULL;
-         png_free(png_ptr, key);
-         png_free(png_ptr, text);
-         return;
-      }
-
-      png_ptr->current_text = NULL;
-      png_free(png_ptr, key);
-      key = text;
-      text += key_size;
-
-      text_ptr = (png_textp)png_malloc(png_ptr,
-          png_sizeof(png_text));
-      text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
-      text_ptr->key = key;
-      text_ptr->itxt_length = 0;
-      text_ptr->lang = NULL;
-      text_ptr->lang_key = NULL;
-      text_ptr->text = text;
-
-      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-      png_free(png_ptr, key);
-      png_free(png_ptr, text_ptr);
-
-      if (ret)
-         png_warning(png_ptr, "Insufficient memory to store text chunk");
-   }
-}
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-void /* PRIVATE */
-png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
-    length)
-{
-   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
-   {
-      PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-      png_error(png_ptr, "Out of place iTXt");
-      /* NOT REACHED */
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   png_ptr->skip_length = 0;  /* This may not be necessary */
-
-   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
-   {
-      png_warning(png_ptr, "iTXt chunk too large to fit in memory");
-      png_ptr->skip_length = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
-       (png_size_t)(length + 1));
-   png_ptr->current_text[length] = '\0';
-   png_ptr->current_text_ptr = png_ptr->current_text;
-   png_ptr->current_text_size = (png_size_t)length;
-   png_ptr->current_text_left = (png_size_t)length;
-   png_ptr->process_mode = PNG_READ_iTXt_MODE;
-}
-
-void /* PRIVATE */
-png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)
-{
-
-   if (png_ptr->buffer_size && png_ptr->current_text_left)
-   {
-      png_size_t text_size;
-
-      if (png_ptr->buffer_size < png_ptr->current_text_left)
-         text_size = png_ptr->buffer_size;
-
-      else
-         text_size = png_ptr->current_text_left;
-
-      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
-      png_ptr->current_text_left -= text_size;
-      png_ptr->current_text_ptr += text_size;
-   }
-
-   if (!(png_ptr->current_text_left))
-   {
-      png_textp text_ptr;
-      png_charp key;
-      int comp_flag;
-      png_charp lang;
-      png_charp lang_key;
-      png_charp text;
-      int ret;
-
-      if (png_ptr->buffer_size < 4)
-      {
-         png_push_save_buffer(png_ptr);
-         return;
-      }
-
-      png_push_crc_finish(png_ptr);
-
-#ifdef PNG_MAX_MALLOC_64K
-      if (png_ptr->skip_length)
-         return;
-#endif
-
-      key = png_ptr->current_text;
-
-      for (lang = key; *lang; lang++)
-         /* Empty loop */ ;
-
-      if (lang < key + png_ptr->current_text_size - 3)
-         lang++;
-
-      comp_flag = *lang++;
-      lang++;     /* Skip comp_type, always zero */
-
-      for (lang_key = lang; *lang_key; lang_key++)
-         /* Empty loop */ ;
-
-      lang_key++;        /* Skip NUL separator */
-
-      text=lang_key;
-
-      if (lang_key < key + png_ptr->current_text_size - 1)
-      {
-         for (; *text; text++)
-            /* Empty loop */ ;
-      }
-
-      if (text < key + png_ptr->current_text_size)
-         text++;
-
-      text_ptr = (png_textp)png_malloc(png_ptr,
-          png_sizeof(png_text));
-
-      text_ptr->compression = comp_flag + 2;
-      text_ptr->key = key;
-      text_ptr->lang = lang;
-      text_ptr->lang_key = lang_key;
-      text_ptr->text = text;
-      text_ptr->text_length = 0;
-      text_ptr->itxt_length = png_strlen(text);
-
-      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-      png_ptr->current_text = NULL;
-
-      png_free(png_ptr, text_ptr);
-      if (ret)
-         png_warning(png_ptr, "Insufficient memory to store iTXt chunk");
-   }
-}
-#endif
-
-/* This function is called when we haven't found a handler for this
- * chunk.  If there isn't a problem with the chunk itself (ie a bad chunk
- * name or a critical chunk), the chunk is (currently) silently ignored.
- */
-void /* PRIVATE */
-png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
-    length)
-{
-   png_uint_32 skip = 0;
-   png_uint_32 chunk_name = png_ptr->chunk_name;
-
-   if (PNG_CHUNK_CRITICAL(chunk_name))
-   {
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-      if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
-          PNG_HANDLE_CHUNK_ALWAYS
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-          && png_ptr->read_user_chunk_fn == NULL
-#endif
-          )
-#endif
-         png_chunk_error(png_ptr, "unknown critical chunk");
-
-      PNG_UNUSED(info_ptr) /* To quiet some compiler warnings */
-   }
-
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-   /* TODO: the code below is apparently just using the
-    * png_struct::unknown_chunk member as a temporarily variable, it should be
-    * possible to eliminate both it and the temporary buffer.
-    */
-   if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
-   {
-#ifdef PNG_MAX_MALLOC_64K
-      if (length > 65535)
-      {
-         png_warning(png_ptr, "unknown chunk too large to fit in memory");
-         skip = length - 65535;
-         length = 65535;
-      }
-#endif
-      /* This is just a record for the user; libpng doesn't use the character
-       * form of the name.
-       */
-      PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
-
-      /* The following cast should be safe because of the check above. */
-      png_ptr->unknown_chunk.size = (png_size_t)length;
-
-      if (length == 0)
-         png_ptr->unknown_chunk.data = NULL;
-
-      else
-      {
-         png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr,
-            png_ptr->unknown_chunk.size);
-         png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data,
-            png_ptr->unknown_chunk.size);
-      }
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-      if (png_ptr->read_user_chunk_fn != NULL)
-      {
-         /* Callback to user unknown chunk handler */
-         int ret;
-         ret = (*(png_ptr->read_user_chunk_fn))
-             (png_ptr, &png_ptr->unknown_chunk);
-
-         if (ret < 0)
-            png_chunk_error(png_ptr, "error in user chunk");
-
-         if (ret == 0)
-         {
-            if (PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
-               if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
-                   PNG_HANDLE_CHUNK_ALWAYS)
-                  png_chunk_error(png_ptr, "unknown critical chunk");
-            png_set_unknown_chunks(png_ptr, info_ptr,
-                &png_ptr->unknown_chunk, 1);
-         }
-      }
-
-      else
-#endif
-         png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
-      png_free(png_ptr, png_ptr->unknown_chunk.data);
-      png_ptr->unknown_chunk.data = NULL;
-   }
-
-   else
-#endif
-      skip=length;
-   png_push_crc_skip(png_ptr, skip);
-}
-
-void /* PRIVATE */
-png_push_have_info(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr->info_fn != NULL)
-      (*(png_ptr->info_fn))(png_ptr, info_ptr);
-}
-
-void /* PRIVATE */
-png_push_have_end(png_structp png_ptr, png_infop info_ptr)
-{
-   if (png_ptr->end_fn != NULL)
-      (*(png_ptr->end_fn))(png_ptr, info_ptr);
-}
-
-void /* PRIVATE */
-png_push_have_row(png_structp png_ptr, png_bytep row)
-{
-   if (png_ptr->row_fn != NULL)
-      (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
-         (int)png_ptr->pass);
-}
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-void PNGAPI
-png_progressive_combine_row (png_structp png_ptr, png_bytep old_row,
-    png_const_bytep new_row)
-{
-   if (png_ptr == NULL)
-      return;
-
-   /* new_row is a flag here - if it is NULL then the app callback was called
-    * from an empty row (see the calls to png_struct::row_fn below), otherwise
-    * it must be png_ptr->row_buf+1
-    */
-   if (new_row != NULL)
-      png_combine_row(png_ptr, old_row, 1/*display*/);
-}
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-
-void PNGAPI
-png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
-    png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
-    png_progressive_end_ptr end_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->info_fn = info_fn;
-   png_ptr->row_fn = row_fn;
-   png_ptr->end_fn = end_fn;
-
-   png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
-}
-
-png_voidp PNGAPI
-png_get_progressive_ptr(png_const_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return png_ptr->io_ptr;
-}
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+/* pngpread.c - read a png file in push mode
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+
+/* push model modes */
+#define PNG_READ_SIG_MODE   0
+#define PNG_READ_CHUNK_MODE 1
+#define PNG_READ_IDAT_MODE  2
+#define PNG_SKIP_MODE       3
+#define PNG_READ_tEXt_MODE  4
+#define PNG_READ_zTXt_MODE  5
+#define PNG_READ_DONE_MODE  6
+#define PNG_READ_iTXt_MODE  7
+#define PNG_ERROR_MODE      8
+
+void PNGAPI
+png_process_data(png_structp png_ptr, png_infop info_ptr,
+   png_bytep buffer, png_size_t buffer_size)
+{
+   png_push_restore_buffer(png_ptr, buffer, buffer_size);
+
+   while (png_ptr->buffer_size)
+   {
+      png_process_some_data(png_ptr, info_ptr);
+   }
+}
+
+/* What we do with the incoming data depends on what we were previously
+ * doing before we ran out of data...
+ */
+void /* PRIVATE */
+png_process_some_data(png_structp png_ptr, png_infop info_ptr)
+{
+   switch (png_ptr->process_mode)
+   {
+      case PNG_READ_SIG_MODE:
+      {
+         png_push_read_sig(png_ptr, info_ptr);
+         break;
+      }
+      case PNG_READ_CHUNK_MODE:
+      {
+         png_push_read_chunk(png_ptr, info_ptr);
+         break;
+      }
+      case PNG_READ_IDAT_MODE:
+      {
+         png_push_read_IDAT(png_ptr);
+         break;
+      }
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      case PNG_READ_tEXt_MODE:
+      {
+         png_push_read_tEXt(png_ptr, info_ptr);
+         break;
+      }
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      case PNG_READ_zTXt_MODE:
+      {
+         png_push_read_zTXt(png_ptr, info_ptr);
+         break;
+      }
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      case PNG_READ_iTXt_MODE:
+      {
+         png_push_read_iTXt(png_ptr, info_ptr);
+         break;
+      }
+#endif
+      case PNG_SKIP_MODE:
+      {
+         png_push_crc_finish(png_ptr);
+         break;
+      }
+      default:
+      {
+         png_ptr->buffer_size = 0;
+         break;
+      }
+   }
+}
+
+/* Read any remaining signature bytes from the stream and compare them with
+ * the correct PNG signature.  It is possible that this routine is called
+ * with bytes already read from the signature, either because they have been
+ * checked by the calling application, or because of multiple calls to this
+ * routine.
+ */
+void /* PRIVATE */
+png_push_read_sig(png_structp png_ptr, png_infop info_ptr)
+{
+   png_size_t num_checked = png_ptr->sig_bytes,
+             num_to_check = 8 - num_checked;
+
+   if (png_ptr->buffer_size < num_to_check)
+   {
+      num_to_check = png_ptr->buffer_size;
+   }
+
+   png_push_fill_buffer(png_ptr, &(info_ptr->signature[num_checked]),
+      num_to_check);
+   png_ptr->sig_bytes = (png_byte)(png_ptr->sig_bytes+num_to_check);
+
+   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+   {
+      if (num_checked < 4 &&
+          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+         png_error(png_ptr, "Not a PNG file");
+      else
+         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+   }
+   else
+   {
+      if (png_ptr->sig_bytes >= 8)
+      {
+         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+      }
+   }
+}
+
+void /* PRIVATE */
+png_push_read_chunk(png_structp png_ptr, png_infop info_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_IHDR;
+      PNG_IDAT;
+      PNG_IEND;
+      PNG_PLTE;
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      PNG_bKGD;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      PNG_cHRM;
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      PNG_gAMA;
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      PNG_hIST;
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      PNG_iCCP;
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      PNG_iTXt;
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      PNG_oFFs;
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      PNG_pCAL;
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      PNG_pHYs;
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      PNG_sBIT;
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      PNG_sCAL;
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      PNG_sRGB;
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      PNG_sPLT;
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      PNG_tEXt;
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      PNG_tIME;
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      PNG_tRNS;
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      PNG_zTXt;
+#endif
+#endif /* PNG_USE_LOCAL_ARRAYS */
+   /* First we make sure we have enough data for the 4 byte chunk name
+    * and the 4 byte chunk length before proceeding with decoding the
+    * chunk data.  To fully decode each of these chunks, we also make
+    * sure we have enough data in the buffer for the 4 byte CRC at the
+    * end of every chunk (except IDAT, which is handled separately).
+    */
+   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   {
+      png_byte chunk_length[4];
+
+      if (png_ptr->buffer_size < 8)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_fill_buffer(png_ptr, chunk_length, 4);
+      png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+   }
+
+   if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
+   }
+   else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
+
+      png_ptr->process_mode = PNG_READ_DONE_MODE;
+      png_push_have_end(png_ptr, info_ptr);
+   }
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+   else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+         png_ptr->mode |= PNG_HAVE_IDAT;
+      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+      if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+         png_ptr->mode |= PNG_HAVE_PLTE;
+      else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         if (!(png_ptr->mode & PNG_HAVE_IHDR))
+            png_error(png_ptr, "Missing IHDR before IDAT");
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                  !(png_ptr->mode & PNG_HAVE_PLTE))
+            png_error(png_ptr, "Missing PLTE before IDAT");
+      }
+   }
+#endif
+   else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
+   }
+   else if (!png_memcmp(png_ptr->chunk_name, (png_bytep)png_IDAT, 4))
+   {
+      /* If we reach an IDAT chunk, this means we have read all of the
+       * header chunks, and we can start reading the image (or if this
+       * is called after the image has been read - we have an error).
+       */
+     if (!(png_ptr->mode & PNG_HAVE_IHDR))
+       png_error(png_ptr, "Missing IHDR before IDAT");
+     else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+         !(png_ptr->mode & PNG_HAVE_PLTE))
+       png_error(png_ptr, "Missing PLTE before IDAT");
+
+      if (png_ptr->mode & PNG_HAVE_IDAT)
+      {
+         if (png_ptr->push_length == 0)
+            return;
+
+         if (png_ptr->mode & PNG_AFTER_IDAT)
+            png_error(png_ptr, "Too many IDAT's found");
+      }
+
+      png_ptr->idat_size = png_ptr->push_length;
+      png_ptr->mode |= PNG_HAVE_IDAT;
+      png_ptr->process_mode = PNG_READ_IDAT_MODE;
+      png_push_have_info(png_ptr, info_ptr);
+      png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+      png_ptr->zstream.next_out = png_ptr->row_buf;
+      return;
+   }
+#if defined(PNG_READ_gAMA_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_bKGD_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+   else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
+   }
+#endif
+   else
+   {
+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+      png_push_handle_unknown(png_ptr, info_ptr, png_ptr->push_length);
+   }
+
+   png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
+}
+
+void /* PRIVATE */
+png_push_crc_skip(png_structp png_ptr, png_uint_32 skip)
+{
+   png_ptr->process_mode = PNG_SKIP_MODE;
+   png_ptr->skip_length = skip;
+}
+
+void /* PRIVATE */
+png_push_crc_finish(png_structp png_ptr)
+{
+   if (png_ptr->skip_length && png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->skip_length < (png_uint_32)png_ptr->save_buffer_size)
+         save_size = (png_size_t)png_ptr->skip_length;
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+
+      png_ptr->skip_length -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (png_ptr->skip_length && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->skip_length < (png_uint_32)png_ptr->current_buffer_size)
+         save_size = (png_size_t)png_ptr->skip_length;
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+      png_ptr->skip_length -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+   if (!png_ptr->skip_length)
+   {
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_crc_finish(png_ptr, 0);
+      png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+   }
+}
+
+void PNGAPI
+png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
+{
+   png_bytep ptr;
+
+   ptr = buffer;
+   if (png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (length < png_ptr->save_buffer_size)
+         save_size = length;
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_memcpy(ptr, png_ptr->save_buffer_ptr, save_size);
+      length -= save_size;
+      ptr += save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (length && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (length < png_ptr->current_buffer_size)
+         save_size = length;
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_memcpy(ptr, png_ptr->current_buffer_ptr, save_size);
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+}
+
+void /* PRIVATE */
+png_push_save_buffer(png_structp png_ptr)
+{
+   if (png_ptr->save_buffer_size)
+   {
+      if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
+      {
+         png_size_t i,istop;
+         png_bytep sp;
+         png_bytep dp;
+
+         istop = png_ptr->save_buffer_size;
+         for (i = 0, sp = png_ptr->save_buffer_ptr, dp = png_ptr->save_buffer;
+            i < istop; i++, sp++, dp++)
+         {
+            *dp = *sp;
+         }
+      }
+   }
+   if (png_ptr->save_buffer_size + png_ptr->current_buffer_size >
+      png_ptr->save_buffer_max)
+   {
+      png_size_t new_max;
+      png_bytep old_buffer;
+
+      if (png_ptr->save_buffer_size > PNG_SIZE_MAX - 
+         (png_ptr->current_buffer_size + 256))
+      {
+        png_error(png_ptr, "Potential overflow of save_buffer");
+      }
+      new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
+      old_buffer = png_ptr->save_buffer;
+      png_ptr->save_buffer = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)new_max);
+      png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+      png_free(png_ptr, old_buffer);
+      png_ptr->save_buffer_max = new_max;
+   }
+   if (png_ptr->current_buffer_size)
+   {
+      png_memcpy(png_ptr->save_buffer + png_ptr->save_buffer_size,
+         png_ptr->current_buffer_ptr, png_ptr->current_buffer_size);
+      png_ptr->save_buffer_size += png_ptr->current_buffer_size;
+      png_ptr->current_buffer_size = 0;
+   }
+   png_ptr->save_buffer_ptr = png_ptr->save_buffer;
+   png_ptr->buffer_size = 0;
+}
+
+void /* PRIVATE */
+png_push_restore_buffer(png_structp png_ptr, png_bytep buffer,
+   png_size_t buffer_length)
+{
+   png_ptr->current_buffer = buffer;
+   png_ptr->current_buffer_size = buffer_length;
+   png_ptr->buffer_size = buffer_length + png_ptr->save_buffer_size;
+   png_ptr->current_buffer_ptr = png_ptr->current_buffer;
+}
+
+void /* PRIVATE */
+png_push_read_IDAT(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IDAT;
+#endif
+   if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+   {
+      png_byte chunk_length[4];
+
+      if (png_ptr->buffer_size < 8)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_fill_buffer(png_ptr, chunk_length, 4);
+      png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+      png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+
+      if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_IDAT, 4))
+      {
+         png_ptr->process_mode = PNG_READ_CHUNK_MODE;
+         if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+            png_error(png_ptr, "Not enough compressed data");
+         return;
+      }
+
+      png_ptr->idat_size = png_ptr->push_length;
+   }
+   if (png_ptr->idat_size && png_ptr->save_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->idat_size < (png_uint_32)png_ptr->save_buffer_size)
+      {
+         save_size = (png_size_t)png_ptr->idat_size;
+         /* check for overflow */
+         if((png_uint_32)save_size != png_ptr->idat_size)
+            png_error(png_ptr, "save_size overflowed in pngpread");
+      }
+      else
+         save_size = png_ptr->save_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);
+      if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+         png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);
+      png_ptr->idat_size -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->save_buffer_size -= save_size;
+      png_ptr->save_buffer_ptr += save_size;
+   }
+   if (png_ptr->idat_size && png_ptr->current_buffer_size)
+   {
+      png_size_t save_size;
+
+      if (png_ptr->idat_size < (png_uint_32)png_ptr->current_buffer_size)
+      {
+         save_size = (png_size_t)png_ptr->idat_size;
+         /* check for overflow */
+         if((png_uint_32)save_size != png_ptr->idat_size)
+            png_error(png_ptr, "save_size overflowed in pngpread");
+      }
+      else
+         save_size = png_ptr->current_buffer_size;
+
+      png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);
+      if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+        png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);
+
+      png_ptr->idat_size -= save_size;
+      png_ptr->buffer_size -= save_size;
+      png_ptr->current_buffer_size -= save_size;
+      png_ptr->current_buffer_ptr += save_size;
+   }
+   if (!png_ptr->idat_size)
+   {
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_crc_finish(png_ptr, 0);
+      png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
+      png_ptr->mode |= PNG_AFTER_IDAT;
+   }
+}
+
+void /* PRIVATE */
+png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
+   png_size_t buffer_length)
+{
+   int ret;
+
+   if ((png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) && buffer_length)
+      png_error(png_ptr, "Extra compression data");
+
+   png_ptr->zstream.next_in = buffer;
+   png_ptr->zstream.avail_in = (uInt)buffer_length;
+   for(;;)
+   {
+      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+      if (ret != Z_OK)
+      {
+         if (ret == Z_STREAM_END)
+         {
+            if (png_ptr->zstream.avail_in)
+               png_error(png_ptr, "Extra compressed data");
+            if (!(png_ptr->zstream.avail_out))
+            {
+               png_push_process_row(png_ptr);
+            }
+
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+         else if (ret == Z_BUF_ERROR)
+            break;
+         else
+            png_error(png_ptr, "Decompression Error");
+      }
+      if (!(png_ptr->zstream.avail_out))
+      {
+         if ((
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+             png_ptr->interlaced && png_ptr->pass > 6) ||
+             (!png_ptr->interlaced &&
+#endif
+             png_ptr->row_number == png_ptr->num_rows))
+         {
+           if (png_ptr->zstream.avail_in)
+             png_warning(png_ptr, "Too much data in IDAT chunks");
+           png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+           break;
+         }
+         png_push_process_row(png_ptr);
+         png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+         png_ptr->zstream.next_out = png_ptr->row_buf;
+      }
+      else
+         break;
+   }
+}
+
+void /* PRIVATE */
+png_push_process_row(png_structp png_ptr)
+{
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->iwidth;
+   png_ptr->row_info.channels = png_ptr->channels;
+   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+       png_ptr->row_info.width);
+
+   png_read_filter_row(png_ptr, &(png_ptr->row_info),
+      png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+      (int)(png_ptr->row_buf[0]));
+
+   png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+      png_ptr->rowbytes + 1);
+
+   if (png_ptr->transformations)
+      png_do_read_transformations(png_ptr);
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+   /* blow up interlaced rows to full size */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      if (png_ptr->pass < 6)
+/*       old interface (pre-1.0.9):
+         png_do_read_interlace(&(png_ptr->row_info),
+            png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+ */
+         png_do_read_interlace(png_ptr);
+
+    switch (png_ptr->pass)
+    {
+         case 0:
+         {
+            int i;
+            for (i = 0; i < 8 && png_ptr->pass == 0; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr); /* updates png_ptr->pass */
+            }
+            if (png_ptr->pass == 2) /* pass 1 might be empty */
+            {
+               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            if (png_ptr->pass == 4 && png_ptr->height <= 4)
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            if (png_ptr->pass == 6 && png_ptr->height <= 4)
+            {
+                png_push_have_row(png_ptr, png_bytep_NULL);
+                png_read_push_finish_row(png_ptr);
+            }
+            break;
+         }
+         case 1:
+         {
+            int i;
+            for (i = 0; i < 8 && png_ptr->pass == 1; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 2) /* skip top 4 generated rows */
+            {
+               for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            break;
+         }
+         case 2:
+         {
+            int i;
+            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            for (i = 0; i < 4 && png_ptr->pass == 2; i++)
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 4) /* pass 3 might be empty */
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            break;
+         }
+         case 3:
+         {
+            int i;
+            for (i = 0; i < 4 && png_ptr->pass == 3; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 4) /* skip top two generated rows */
+            {
+               for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+               {
+                  png_push_have_row(png_ptr, png_bytep_NULL);
+                  png_read_push_finish_row(png_ptr);
+               }
+            }
+            break;
+         }
+         case 4:
+         {
+            int i;
+            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            for (i = 0; i < 2 && png_ptr->pass == 4; i++)
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 6) /* pass 5 might be empty */
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            break;
+         }
+         case 5:
+         {
+            int i;
+            for (i = 0; i < 2 && png_ptr->pass == 5; i++)
+            {
+               png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+               png_read_push_finish_row(png_ptr);
+            }
+            if (png_ptr->pass == 6) /* skip top generated row */
+            {
+               png_push_have_row(png_ptr, png_bytep_NULL);
+               png_read_push_finish_row(png_ptr);
+            }
+            break;
+         }
+         case 6:
+         {
+            png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+            png_read_push_finish_row(png_ptr);
+            if (png_ptr->pass != 6)
+               break;
+            png_push_have_row(png_ptr, png_bytep_NULL);
+            png_read_push_finish_row(png_ptr);
+         }
+      }
+   }
+   else
+#endif
+   {
+      png_push_have_row(png_ptr, png_ptr->row_buf + 1);
+      png_read_push_finish_row(png_ptr);
+   }
+}
+
+void /* PRIVATE */
+png_read_push_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   const int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   const int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
+
+   /* Width of interlace block.  This is not currently used - if you need
+    * it, uncomment it here and in png.h
+   const int FARDATA png_pass_width[] = {8, 4, 4, 2, 2, 1, 1};
+   */
+
+   /* Height of interlace block.  This is not currently used - if you need
+    * it, uncomment it here and in png.h
+   const int FARDATA png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
+   */
+#endif
+
+   png_ptr->row_number++;
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      png_memset_check(png_ptr, png_ptr->prev_row, 0,
+         png_ptr->rowbytes + 1);
+      do
+      {
+         png_ptr->pass++;
+         if ((png_ptr->pass == 1 && png_ptr->width < 5) ||
+             (png_ptr->pass == 3 && png_ptr->width < 3) ||
+             (png_ptr->pass == 5 && png_ptr->width < 2))
+           png_ptr->pass++;
+
+         if (png_ptr->pass > 7)
+            png_ptr->pass--;
+         if (png_ptr->pass >= 7)
+            break;
+
+         png_ptr->iwidth = (png_ptr->width +
+            png_pass_inc[png_ptr->pass] - 1 -
+            png_pass_start[png_ptr->pass]) /
+            png_pass_inc[png_ptr->pass];
+
+         png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,
+            png_ptr->iwidth) + 1;
+
+         if (png_ptr->transformations & PNG_INTERLACE)
+            break;
+
+         png_ptr->num_rows = (png_ptr->height +
+            png_pass_yinc[png_ptr->pass] - 1 -
+            png_pass_ystart[png_ptr->pass]) /
+            png_pass_yinc[png_ptr->pass];
+
+      } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0);
+   }
+}
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+void /* PRIVATE */
+png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
+      {
+         png_error(png_ptr, "Out of place tEXt");
+         /* to quiet some compiler warnings */
+         if(info_ptr == NULL) return;
+      }
+
+#ifdef PNG_MAX_MALLOC_64K
+   png_ptr->skip_length = 0;  /* This may not be necessary */
+
+   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
+   {
+      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
+      png_ptr->skip_length = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+         (png_uint_32)(length+1));
+   png_ptr->current_text[length] = '\0';
+   png_ptr->current_text_ptr = png_ptr->current_text;
+   png_ptr->current_text_size = (png_size_t)length;
+   png_ptr->current_text_left = (png_size_t)length;
+   png_ptr->process_mode = PNG_READ_tEXt_MODE;
+}
+
+void /* PRIVATE */
+png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->buffer_size && png_ptr->current_text_left)
+   {
+      png_size_t text_size;
+
+      if (png_ptr->buffer_size < png_ptr->current_text_left)
+         text_size = png_ptr->buffer_size;
+      else
+         text_size = png_ptr->current_text_left;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+      png_ptr->current_text_left -= text_size;
+      png_ptr->current_text_ptr += text_size;
+   }
+   if (!(png_ptr->current_text_left))
+   {
+      png_textp text_ptr;
+      png_charp text;
+      png_charp key;
+      int ret;
+
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_crc_finish(png_ptr);
+
+#if defined(PNG_MAX_MALLOC_64K)
+      if (png_ptr->skip_length)
+         return;
+#endif
+
+      key = png_ptr->current_text;
+
+      for (text = key; *text; text++)
+         /* empty loop */ ;
+
+      if (text != key + png_ptr->current_text_size)
+         text++;
+
+      text_ptr = (png_textp)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof(png_text));
+      text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
+      text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+      text_ptr->lang = NULL;
+      text_ptr->lang_key = NULL;
+#endif
+      text_ptr->text = text;
+
+      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+      png_free(png_ptr, key);
+      png_free(png_ptr, text_ptr);
+      png_ptr->current_text = NULL;
+
+      if (ret)
+        png_warning(png_ptr, "Insufficient memory to store text chunk.");
+   }
+}
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+void /* PRIVATE */
+png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
+      {
+         png_error(png_ptr, "Out of place zTXt");
+         /* to quiet some compiler warnings */
+         if(info_ptr == NULL) return;
+      }
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We can't handle zTXt chunks > 64K, since we don't have enough space
+    * to be able to store the uncompressed data.  Actually, the threshold
+    * is probably around 32K, but it isn't as definite as 64K is.
+    */
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "zTXt chunk too large to fit in memory");
+      png_push_crc_skip(png_ptr, length);
+      return;
+   }
+#endif
+
+   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+       (png_uint_32)(length+1));
+   png_ptr->current_text[length] = '\0';
+   png_ptr->current_text_ptr = png_ptr->current_text;
+   png_ptr->current_text_size = (png_size_t)length;
+   png_ptr->current_text_left = (png_size_t)length;
+   png_ptr->process_mode = PNG_READ_zTXt_MODE;
+}
+
+void /* PRIVATE */
+png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->buffer_size && png_ptr->current_text_left)
+   {
+      png_size_t text_size;
+
+      if (png_ptr->buffer_size < (png_uint_32)png_ptr->current_text_left)
+         text_size = png_ptr->buffer_size;
+      else
+         text_size = png_ptr->current_text_left;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+      png_ptr->current_text_left -= text_size;
+      png_ptr->current_text_ptr += text_size;
+   }
+   if (!(png_ptr->current_text_left))
+   {
+      png_textp text_ptr;
+      png_charp text;
+      png_charp key;
+      int ret;
+      png_size_t text_size, key_size;
+
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_crc_finish(png_ptr);
+
+      key = png_ptr->current_text;
+
+      for (text = key; *text; text++)
+         /* empty loop */ ;
+
+      /* zTXt can't have zero text */
+      if (text == key + png_ptr->current_text_size)
+      {
+         png_ptr->current_text = NULL;
+         png_free(png_ptr, key);
+         return;
+      }
+
+      text++;
+
+      if (*text != PNG_TEXT_COMPRESSION_zTXt) /* check compression byte */
+      {
+         png_ptr->current_text = NULL;
+         png_free(png_ptr, key);
+         return;
+      }
+
+      text++;
+
+      png_ptr->zstream.next_in = (png_bytep )text;
+      png_ptr->zstream.avail_in = (uInt)(png_ptr->current_text_size -
+         (text - key));
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+      key_size = text - key;
+      text_size = 0;
+      text = NULL;
+      ret = Z_STREAM_END;
+
+      while (png_ptr->zstream.avail_in)
+      {
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret != Z_OK && ret != Z_STREAM_END)
+         {
+            inflateReset(&png_ptr->zstream);
+            png_ptr->zstream.avail_in = 0;
+            png_ptr->current_text = NULL;
+            png_free(png_ptr, key);
+            png_free(png_ptr, text);
+            return;
+         }
+         if (!(png_ptr->zstream.avail_out) || ret == Z_STREAM_END)
+         {
+            if (text == NULL)
+            {
+               text = (png_charp)png_malloc(png_ptr,
+                  (png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out
+                     + key_size + 1));
+               png_memcpy(text + key_size, png_ptr->zbuf,
+                  png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+               png_memcpy(text, key, key_size);
+               text_size = key_size + png_ptr->zbuf_size -
+                  png_ptr->zstream.avail_out;
+               *(text + text_size) = '\0';
+            }
+            else
+            {
+               png_charp tmp;
+
+               tmp = text;
+               text = (png_charp)png_malloc(png_ptr, text_size +
+                  (png_uint_32)(png_ptr->zbuf_size - png_ptr->zstream.avail_out
+                   + 1));
+               png_memcpy(text, tmp, text_size);
+               png_free(png_ptr, tmp);
+               png_memcpy(text + text_size, png_ptr->zbuf,
+                  png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+               text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+               *(text + text_size) = '\0';
+            }
+            if (ret != Z_STREAM_END)
+            {
+               png_ptr->zstream.next_out = png_ptr->zbuf;
+               png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            }
+         }
+         else
+         {
+            break;
+         }
+
+         if (ret == Z_STREAM_END)
+            break;
+      }
+
+      inflateReset(&png_ptr->zstream);
+      png_ptr->zstream.avail_in = 0;
+
+      if (ret != Z_STREAM_END)
+      {
+         png_ptr->current_text = NULL;
+         png_free(png_ptr, key);
+         png_free(png_ptr, text);
+         return;
+      }
+
+      png_ptr->current_text = NULL;
+      png_free(png_ptr, key);
+      key = text;
+      text += key_size;
+
+      text_ptr = (png_textp)png_malloc(png_ptr,
+          (png_uint_32)png_sizeof(png_text));
+      text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt;
+      text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+      text_ptr->lang = NULL;
+      text_ptr->lang_key = NULL;
+#endif
+      text_ptr->text = text;
+
+      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+      png_free(png_ptr, key);
+      png_free(png_ptr, text_ptr);
+
+      if (ret)
+        png_warning(png_ptr, "Insufficient memory to store text chunk.");
+   }
+}
+#endif
+
+#if defined(PNG_READ_iTXt_SUPPORTED)
+void /* PRIVATE */
+png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND))
+      {
+         png_error(png_ptr, "Out of place iTXt");
+         /* to quiet some compiler warnings */
+         if(info_ptr == NULL) return;
+      }
+
+#ifdef PNG_MAX_MALLOC_64K
+   png_ptr->skip_length = 0;  /* This may not be necessary */
+
+   if (length > (png_uint_32)65535L) /* Can't hold entire string in memory */
+   {
+      png_warning(png_ptr, "iTXt chunk too large to fit in memory");
+      png_ptr->skip_length = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   png_ptr->current_text = (png_charp)png_malloc(png_ptr,
+         (png_uint_32)(length+1));
+   png_ptr->current_text[length] = '\0';
+   png_ptr->current_text_ptr = png_ptr->current_text;
+   png_ptr->current_text_size = (png_size_t)length;
+   png_ptr->current_text_left = (png_size_t)length;
+   png_ptr->process_mode = PNG_READ_iTXt_MODE;
+}
+
+void /* PRIVATE */
+png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr)
+{
+
+   if (png_ptr->buffer_size && png_ptr->current_text_left)
+   {
+      png_size_t text_size;
+
+      if (png_ptr->buffer_size < png_ptr->current_text_left)
+         text_size = png_ptr->buffer_size;
+      else
+         text_size = png_ptr->current_text_left;
+      png_crc_read(png_ptr, (png_bytep)png_ptr->current_text_ptr, text_size);
+      png_ptr->current_text_left -= text_size;
+      png_ptr->current_text_ptr += text_size;
+   }
+   if (!(png_ptr->current_text_left))
+   {
+      png_textp text_ptr;
+      png_charp key;
+      int comp_flag;
+      png_charp lang;
+      png_charp lang_key;
+      png_charp text;
+      int ret;
+
+      if (png_ptr->buffer_size < 4)
+      {
+         png_push_save_buffer(png_ptr);
+         return;
+      }
+
+      png_push_crc_finish(png_ptr);
+
+#if defined(PNG_MAX_MALLOC_64K)
+      if (png_ptr->skip_length)
+         return;
+#endif
+
+      key = png_ptr->current_text;
+
+      for (lang = key; *lang; lang++)
+         /* empty loop */ ;
+
+      if (lang != key + png_ptr->current_text_size)
+         lang++;
+
+      comp_flag = *lang++;
+      lang++;     /* skip comp_type, always zero */
+
+      for (lang_key = lang; *lang_key; lang_key++)
+         /* empty loop */ ;
+      lang_key++;        /* skip NUL separator */
+
+      for (text = lang_key; *text; text++)
+         /* empty loop */ ;
+
+      if (text != key + png_ptr->current_text_size)
+         text++;
+
+      text_ptr = (png_textp)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof(png_text));
+      text_ptr->compression = comp_flag + 2;
+      text_ptr->key = key;
+      text_ptr->lang = lang;
+      text_ptr->lang_key = lang_key;
+      text_ptr->text = text;
+      text_ptr->text_length = 0;
+      text_ptr->itxt_length = png_strlen(text);
+
+      ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+      png_ptr->current_text = NULL;
+
+      png_free(png_ptr, text_ptr);
+      if (ret)
+        png_warning(png_ptr, "Insufficient memory to store iTXt chunk.");
+   }
+}
+#endif
+
+/* This function is called when we haven't found a handler for this
+ * chunk.  If there isn't a problem with the chunk itself (ie a bad chunk
+ * name or a critical chunk), the chunk is (currently) silently ignored.
+ */
+void /* PRIVATE */
+png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
+   length)
+{
+   png_uint_32 skip=0;
+   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+
+   if (!(png_ptr->chunk_name[0] & 0x20))
+   {
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+      if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+           PNG_HANDLE_CHUNK_ALWAYS
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+           && png_ptr->read_user_chunk_fn == NULL
+#endif
+         )
+#endif
+         png_chunk_error(png_ptr, "unknown critical chunk");
+
+      /* to quiet compiler warnings about unused info_ptr */
+      if (info_ptr == NULL)
+         return;
+   }
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
+   {
+       png_unknown_chunk chunk;
+
+#ifdef PNG_MAX_MALLOC_64K
+       if (length > (png_uint_32)65535L)
+       {
+           png_warning(png_ptr, "unknown chunk too large to fit in memory");
+           skip = length - (png_uint_32)65535L;
+           length = (png_uint_32)65535L;
+       }
+#endif
+
+       png_strcpy((png_charp)chunk.name, (png_charp)png_ptr->chunk_name);
+       chunk.data = (png_bytep)png_malloc(png_ptr, length);
+       png_crc_read(png_ptr, chunk.data, length);
+       chunk.size = length;
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+       if(png_ptr->read_user_chunk_fn != NULL)
+       {
+          /* callback to user unknown chunk handler */
+          if ((*(png_ptr->read_user_chunk_fn)) (png_ptr, &chunk) <= 0)
+          {
+             if (!(png_ptr->chunk_name[0] & 0x20))
+                if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+                     PNG_HANDLE_CHUNK_ALWAYS)
+                   png_chunk_error(png_ptr, "unknown critical chunk");
+          }
+             png_set_unknown_chunks(png_ptr, info_ptr, &chunk, 1);
+       }
+       else
+#endif
+          png_set_unknown_chunks(png_ptr, info_ptr, &chunk, 1);
+       png_free(png_ptr, chunk.data);
+   }
+   else
+#endif
+      skip=length;
+   png_push_crc_skip(png_ptr, skip);
+}
+
+void /* PRIVATE */
+png_push_have_info(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->info_fn != NULL)
+      (*(png_ptr->info_fn))(png_ptr, info_ptr);
+}
+
+void /* PRIVATE */
+png_push_have_end(png_structp png_ptr, png_infop info_ptr)
+{
+   if (png_ptr->end_fn != NULL)
+      (*(png_ptr->end_fn))(png_ptr, info_ptr);
+}
+
+void /* PRIVATE */
+png_push_have_row(png_structp png_ptr, png_bytep row)
+{
+   if (png_ptr->row_fn != NULL)
+      (*(png_ptr->row_fn))(png_ptr, row, png_ptr->row_number,
+         (int)png_ptr->pass);
+}
+
+void PNGAPI
+png_progressive_combine_row (png_structp png_ptr,
+   png_bytep old_row, png_bytep new_row)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   const int FARDATA png_pass_dsp_mask[7] =
+      {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+#endif
+   if (new_row != NULL)    /* new_row must == png_ptr->row_buf here. */
+      png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]);
+}
+
+void PNGAPI
+png_set_progressive_read_fn(png_structp png_ptr, png_voidp progressive_ptr,
+   png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
+   png_progressive_end_ptr end_fn)
+{
+   png_ptr->info_fn = info_fn;
+   png_ptr->row_fn = row_fn;
+   png_ptr->end_fn = end_fn;
+
+   png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
+}
+
+png_voidp PNGAPI
+png_get_progressive_ptr(png_structp png_ptr)
+{
+   return png_ptr->io_ptr;
+}
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/png/pngpriv.h b/Source/3rd Party/wx/src/png/pngpriv.h
deleted file mode 100644
index 05a7a0091..000000000
--- a/Source/3rd Party/wx/src/png/pngpriv.h	
+++ /dev/null
@@ -1,1628 +0,0 @@
-/* pngpriv.h - private declarations for use inside libpng
- *
- * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* The symbols declared in this file (including the functions declared
- * as PNG_EXTERN) are PRIVATE.  They are not part of the libpng public
- * interface, and are not recommended for use by regular applications.
- * Some of them may become public in the future; others may stay private,
- * change in an incompatible way, or even disappear.
- * Although the libpng users are not forbidden to include this header,
- * they should be well aware of the issues that may arise from doing so.
- */
-
-#ifndef PNGPRIV_H
-#define PNGPRIV_H
-
-/* Feature Test Macros.  The following are defined here to ensure that correctly
- * implemented libraries reveal the APIs libpng needs to build and hide those
- * that are not needed and potentially damaging to the compilation.
- *
- * Feature Test Macros must be defined before any system header is included (see
- * POSIX 1003.1 2.8.2 "POSIX Symbols."
- *
- * These macros only have an effect if the operating system supports either
- * POSIX 1003.1 or C99, or both.  On other operating systems (particularly
- * Windows/Visual Studio) there is no effect; the OS specific tests below are
- * still required (as of 2011-05-02.)
- */
-#define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */
-
-/* This is required for the definition of abort(), used as a last ditch
- * error handler when all else fails.
- */
-#include <stdlib.h>
-
-/* This is used to find 'offsetof', used below for alignment tests. */
-#include <stddef.h>
-
-#define PNGLIB_BUILD /*libpng is being built, not used*/
-
-#ifdef PNG_USER_CONFIG
-#  include "pngusr.h"
-   /* These should have been defined in pngusr.h */
-#  ifndef PNG_USER_PRIVATEBUILD
-#    define PNG_USER_PRIVATEBUILD "Custom libpng build"
-#  endif
-#  ifndef PNG_USER_DLLFNAME_POSTFIX
-#    define PNG_USER_DLLFNAME_POSTFIX "Cb"
-#  endif
-#endif
-
-/* Is this a build of a DLL where compilation of the object modules requires
- * different preprocessor settings to those required for a simple library?  If
- * so PNG_BUILD_DLL must be set.
- *
- * If libpng is used inside a DLL but that DLL does not export the libpng APIs
- * PNG_BUILD_DLL must not be set.  To avoid the code below kicking in build a
- * static library of libpng then link the DLL against that.
- */
-#ifndef PNG_BUILD_DLL
-#  ifdef DLL_EXPORT
-      /* This is set by libtool when files are compiled for a DLL; libtool
-       * always compiles twice, even on systems where it isn't necessary.  Set
-       * PNG_BUILD_DLL in case it is necessary:
-       */
-#     define PNG_BUILD_DLL
-#  else
-#     ifdef _WINDLL
-         /* This is set by the Microsoft Visual Studio IDE in projects that
-          * build a DLL.  It can't easily be removed from those projects (it
-          * isn't visible in the Visual Studio UI) so it is a fairly reliable
-          * indication that PNG_IMPEXP needs to be set to the DLL export
-          * attributes.
-          */
-#        define PNG_BUILD_DLL
-#     else
-#        ifdef __DLL__
-            /* This is set by the Borland C system when compiling for a DLL
-             * (as above.)
-             */
-#           define PNG_BUILD_DLL
-#        else
-            /* Add additional compiler cases here. */
-#        endif
-#     endif
-#  endif
-#endif /* Setting PNG_BUILD_DLL if required */
-
-/* See pngconf.h for more details: the builder of the library may set this on
- * the command line to the right thing for the specific compilation system or it
- * may be automagically set above (at present we know of no system where it does
- * need to be set on the command line.)
- *
- * PNG_IMPEXP must be set here when building the library to prevent pngconf.h
- * setting it to the "import" setting for a DLL build.
- */
-#ifndef PNG_IMPEXP
-#  ifdef PNG_BUILD_DLL
-#     define PNG_IMPEXP PNG_DLL_EXPORT
-#  else
-      /* Not building a DLL, or the DLL doesn't require specific export
-       * definitions.
-       */
-#     define PNG_IMPEXP
-#  endif
-#endif
-
-/* No warnings for private or deprecated functions in the build: */
-#ifndef PNG_DEPRECATED
-#  define PNG_DEPRECATED
-#endif
-#ifndef PNG_PRIVATE
-#  define PNG_PRIVATE
-#endif
-
-#include "png.h"
-#include "pnginfo.h"
-#include "pngstruct.h"
-
-/* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */
-#ifndef PNG_DLL_EXPORT
-#  define PNG_DLL_EXPORT
-#endif
-
-/* This is used for 16 bit gamma tables - only the top level pointers are const,
- * this could be changed:
- */
-typedef PNG_CONST png_uint_16p FAR * png_const_uint_16pp;
-
-/* Added at libpng-1.2.9 */
-/* Moved to pngpriv.h at libpng-1.5.0 */
-
-/* config.h is created by and PNG_CONFIGURE_LIBPNG is set by the "configure"
- * script.  We may need it here to get the correct configuration on things
- * like limits.
- */
-#ifdef PNG_CONFIGURE_LIBPNG
-#  ifdef HAVE_CONFIG_H
-#    include "config.h"
-#  endif
-#endif
-
-/* Moved to pngpriv.h at libpng-1.5.0 */
-/* NOTE: some of these may have been used in external applications as
- * these definitions were exposed in pngconf.h prior to 1.5.
- */
-
-/* If you are running on a machine where you cannot allocate more
- * than 64K of memory at once, uncomment this.  While libpng will not
- * normally need that much memory in a chunk (unless you load up a very
- * large file), zlib needs to know how big of a chunk it can use, and
- * libpng thus makes sure to check any memory allocation to verify it
- * will fit into memory.
- *
- * zlib provides 'MAXSEG_64K' which, if defined, indicates the
- * same limit and pngconf.h (already included) sets the limit
- * if certain operating systems are detected.
- */
-#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
-#  define PNG_MAX_MALLOC_64K
-#endif
-
-#ifndef PNG_UNUSED
-/* Unused formal parameter warnings are silenced using the following macro
- * which is expected to have no bad effects on performance (optimizing
- * compilers will probably remove it entirely).  Note that if you replace
- * it with something other than whitespace, you must include the terminating
- * semicolon.
- */
-#  define PNG_UNUSED(param) (void)param;
-#endif
-
-/* Just a little check that someone hasn't tried to define something
- * contradictory.
- */
-#if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)
-#  undef PNG_ZBUF_SIZE
-#  define PNG_ZBUF_SIZE 65536L
-#endif
-
-/* PNG_STATIC is used to mark internal file scope functions if they need to be
- * accessed for implementation tests (see the code in tests/?*).
- */
-#ifndef PNG_STATIC
-#   define PNG_STATIC static
-#endif
-
-/* C99 restrict is used where possible, to do this 'restrict' is defined as
- * empty if we can't be sure it is supported.  configure builds have already
- * done this work.
- */
-#ifdef PNG_CONFIGURE_LIBPNG
-#  define PNG_RESTRICT restrict
-#else
-   /* Modern compilers support restrict, but assume not for anything not
-    * recognized here:
-    */
-#  if defined __GNUC__ || defined _MSC_VER || defined __WATCOMC__
-#     define PNG_RESTRICT restrict
-#  else
-#     define PNG_RESTRICT
-#  endif
-#endif
-
-/* If warnings or errors are turned off the code is disabled or redirected here.
- * From 1.5.4 functions have been added to allow very limited formatting of
- * error and warning messages - this code will also be disabled here.
- */
-#ifdef PNG_WARNINGS_SUPPORTED
-#  define PNG_WARNING_PARAMETERS(p) png_warning_parameters p;
-#else
-#  define png_warning(s1,s2) ((void)(s1))
-#  define png_chunk_warning(s1,s2) ((void)(s1))
-#  define png_warning_parameter(p,number,string) ((void)0)
-#  define png_warning_parameter_unsigned(p,number,format,value) ((void)0)
-#  define png_warning_parameter_signed(p,number,format,value) ((void)0)
-#  define png_formatted_warning(pp,p,message) ((void)(pp))
-#  define PNG_WARNING_PARAMETERS(p)
-#endif
-#ifndef PNG_ERROR_TEXT_SUPPORTED
-#  define png_error(s1,s2) png_err(s1)
-#  define png_chunk_error(s1,s2) png_err(s1)
-#  define png_fixed_error(s1,s2) png_err(s1)
-#endif
-
-/* C allows up-casts from (void*) to any pointer and (const void*) to any
- * pointer to a const object.  C++ regards this as a type error and requires an
- * explicit, static, cast and provides the static_cast<> rune to ensure that
- * const is not cast away.
- */
-#ifdef __cplusplus
-#  define png_voidcast(type, value) static_cast<type>(value)
-#else
-#  define png_voidcast(type, value) (value)
-#endif /* __cplusplus */
-
-#ifndef PNG_EXTERN
-/* The functions exported by PNG_EXTERN are internal functions, which
- * aren't usually used outside the library (as far as I know), so it is
- * debatable if they should be exported at all.  In the future, when it
- * is possible to have run-time registry of chunk-handling functions,
- * some of these might be made available again.
- *
- * 1.5.7: turned the use of 'extern' back on, since it is localized to pngpriv.h
- * it should be safe now (it is unclear why it was turned off.)
- */
-#  define PNG_EXTERN extern
-#endif
-
-/* Some fixed point APIs are still required even if not exported because
- * they get used by the corresponding floating point APIs.  This magic
- * deals with this:
- */
-#ifdef PNG_FIXED_POINT_SUPPORTED
-#  define PNGFAPI PNGAPI
-#else
-#  define PNGFAPI /* PRIVATE */
-#endif
-
-/* Other defines specific to compilers can go here.  Try to keep
- * them inside an appropriate ifdef/endif pair for portability.
- */
-#if defined(PNG_FLOATING_POINT_SUPPORTED) ||\
-    defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
-   /* png.c requires the following ANSI-C constants if the conversion of
-    * floating point to ASCII is implemented therein:
-    *
-    *  DBL_DIG  Maximum number of decimal digits (can be set to any constant)
-    *  DBL_MIN  Smallest normalized fp number (can be set to an arbitrary value)
-    *  DBL_MAX  Maximum floating point number (can be set to an arbitrary value)
-    */
-#  include <float.h>
-
-#  if ( ( (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
-    defined(THINK_C) || defined(TARGET_OS_MAC) ) && !wxOSX_USE_IPHONE ) || defined(__SC__)
-     /* We need to check that <math.h> hasn't already been included earlier
-      * as it seems it doesn't agree with <fp.h>, yet we should really use
-      * <fp.h> if possible.
-      */
-#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
-#      include <fp.h>
-#    endif
-#  else
-#    include <math.h>
-#  endif
-#  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
-     /* Amiga SAS/C: We must include builtin FPU functions when compiling using
-      * MATH=68881
-      */
-#    include <m68881.h>
-#  endif
-#endif
-
-/* This provides the non-ANSI (far) memory allocation routines. */
-#if defined(__TURBOC__) && defined(__MSDOS__)
-#  include <mem.h>
-#  include <alloc.h>
-#endif
-
-#if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \
-    defined(_WIN32) || defined(__WIN32__)
-#  include <windows.h>  /* defines _WINDOWS_ macro */
-#endif
-
-/* Moved here around 1.5.0beta36 from pngconf.h */
-/* Users may want to use these so they are not private.  Any library
- * functions that are passed far data must be model-independent.
- */
-
-/* Memory model/platform independent fns */
-#ifndef PNG_ABORT
-#  ifdef _WINDOWS_
-#    define PNG_ABORT() ExitProcess(0)
-#  else
-#    define PNG_ABORT() abort()
-#  endif
-#endif
-
-#ifdef USE_FAR_KEYWORD
-/* Use this to make far-to-near assignments */
-#  define CHECK   1
-#  define NOCHECK 0
-#  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
-#  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
-#  define png_strlen  _fstrlen
-#  define png_memcmp  _fmemcmp    /* SJT: added */
-#  define png_memcpy  _fmemcpy
-#  define png_memset  _fmemset
-#else
-#  ifdef _WINDOWS_  /* Favor Windows over C runtime fns */
-#    define CVT_PTR(ptr)         (ptr)
-#    define CVT_PTR_NOCHECK(ptr) (ptr)
-#    define png_strlen  lstrlenA
-#    define png_memcmp  memcmp
-#    define png_memcpy  CopyMemory
-#    define png_memset  memset
-#  else
-#    define CVT_PTR(ptr)         (ptr)
-#    define CVT_PTR_NOCHECK(ptr) (ptr)
-#    define png_strlen  strlen
-#    define png_memcmp  memcmp      /* SJT: added */
-#    define png_memcpy  memcpy
-#    define png_memset  memset
-#  endif
-#endif
-
-/* These macros may need to be architecture dependent. */
-#define PNG_ALIGN_NONE   0 /* do not use data alignment */
-#define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */
-#ifdef offsetof
-#  define PNG_ALIGN_OFFSET 2 /* use offsetof to determine alignment */
-#else
-#  define PNG_ALIGN_OFFSET -1 /* prevent the use of this */
-#endif
-#define PNG_ALIGN_SIZE   3 /* use sizeof to determine alignment */
-
-#ifndef PNG_ALIGN_TYPE
-   /* Default to using aligned access optimizations and requiring alignment to a
-    * multiple of the data type size.  Override in a compiler specific fashion
-    * if necessary by inserting tests here:
-    */
-#  define PNG_ALIGN_TYPE PNG_ALIGN_SIZE
-#endif
-
-#if PNG_ALIGN_TYPE == PNG_ALIGN_SIZE
-   /* This is used because in some compiler implementations non-aligned
-    * structure members are supported, so the offsetof approach below fails.
-    * Set PNG_ALIGN_TO_SIZE=0 for compiler combinations where unaligned access
-    * is good for performance.  Do not do this unless you have tested the result
-    * and understand it.
-    */
-#  define png_alignof(type) (sizeof (type))
-#else
-#  if PNG_ALIGN_TYPE == PNG_ALIGN_OFFSET
-#     define png_alignof(type) offsetof(struct{char c; type t;}, t)
-#  else
-#     if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS
-#        define png_alignof(type) (1)
-#     endif
-      /* Else leave png_alignof undefined to prevent use thereof */
-#  endif
-#endif
-
-/* This implicitly assumes alignment is always to a power of 2. */
-#ifdef png_alignof
-#  define png_isaligned(ptr, type)\
-   ((((const char*)ptr-(const char*)0) & (png_alignof(type)-1)) == 0)
-#else
-#  define png_isaligned(ptr, type) 0
-#endif
-
-/* End of memory model/platform independent support */
-/* End of 1.5.0beta36 move from pngconf.h */
-
-/* CONSTANTS and UTILITY MACROS
- * These are used internally by libpng and not exposed in the API
- */
-
-/* Various modes of operation.  Note that after an init, mode is set to
- * zero automatically when the structure is created.  Three of these
- * are defined in png.h because they need to be visible to applications
- * that call png_set_unknown_chunk().
- */
-/* #define PNG_HAVE_IHDR            0x01 (defined in png.h) */
-/* #define PNG_HAVE_PLTE            0x02 (defined in png.h) */
-#define PNG_HAVE_IDAT               0x04
-/* #define PNG_AFTER_IDAT           0x08 (defined in png.h) */
-#define PNG_HAVE_IEND               0x10
-#define PNG_HAVE_gAMA               0x20
-#define PNG_HAVE_cHRM               0x40
-#define PNG_HAVE_sRGB               0x80
-#define PNG_HAVE_CHUNK_HEADER      0x100
-#define PNG_WROTE_tIME             0x200
-#define PNG_WROTE_INFO_BEFORE_PLTE 0x400
-#define PNG_BACKGROUND_IS_GRAY     0x800
-#define PNG_HAVE_PNG_SIGNATURE    0x1000
-#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
-
-/* Flags for the transformations the PNG library does on the image data */
-#define PNG_BGR                 0x0001
-#define PNG_INTERLACE           0x0002
-#define PNG_PACK                0x0004
-#define PNG_SHIFT               0x0008
-#define PNG_SWAP_BYTES          0x0010
-#define PNG_INVERT_MONO         0x0020
-#define PNG_QUANTIZE            0x0040
-#define PNG_COMPOSE             0x0080     /* Was PNG_BACKGROUND */
-#define PNG_BACKGROUND_EXPAND   0x0100
-#define PNG_EXPAND_16           0x0200     /* Added to libpng 1.5.2 */
-#define PNG_16_TO_8             0x0400     /* Becomes 'chop' in 1.5.4 */
-#define PNG_RGBA                0x0800
-#define PNG_EXPAND              0x1000
-#define PNG_GAMMA               0x2000
-#define PNG_GRAY_TO_RGB         0x4000
-#define PNG_FILLER              0x8000
-#define PNG_PACKSWAP           0x10000
-#define PNG_SWAP_ALPHA         0x20000
-#define PNG_STRIP_ALPHA        0x40000
-#define PNG_INVERT_ALPHA       0x80000
-#define PNG_USER_TRANSFORM    0x100000
-#define PNG_RGB_TO_GRAY_ERR   0x200000
-#define PNG_RGB_TO_GRAY_WARN  0x400000
-#define PNG_RGB_TO_GRAY       0x600000 /* two bits, RGB_TO_GRAY_ERR|WARN */
-#define PNG_ENCODE_ALPHA      0x800000 /* Added to libpng-1.5.4 */
-#define PNG_ADD_ALPHA         0x1000000 /* Added to libpng-1.2.7 */
-#define PNG_EXPAND_tRNS       0x2000000 /* Added to libpng-1.2.9 */
-#define PNG_SCALE_16_TO_8     0x4000000 /* Added to libpng-1.5.4 */
-                       /*   0x8000000 unused */
-                       /*  0x10000000 unused */
-                       /*  0x20000000 unused */
-                       /*  0x40000000 unused */
-/* Flags for png_create_struct */
-#define PNG_STRUCT_PNG   0x0001
-#define PNG_STRUCT_INFO  0x0002
-
-/* Scaling factor for filter heuristic weighting calculations */
-#define PNG_WEIGHT_FACTOR (1<<(PNG_WEIGHT_SHIFT))
-#define PNG_COST_FACTOR (1<<(PNG_COST_SHIFT))
-
-/* Flags for the png_ptr->flags rather than declaring a byte for each one */
-#define PNG_FLAG_ZLIB_CUSTOM_STRATEGY     0x0001
-#define PNG_FLAG_ZLIB_CUSTOM_LEVEL        0x0002
-#define PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL    0x0004
-#define PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS  0x0008
-#define PNG_FLAG_ZLIB_CUSTOM_METHOD       0x0010
-#define PNG_FLAG_ZLIB_FINISHED            0x0020
-#define PNG_FLAG_ROW_INIT                 0x0040
-#define PNG_FLAG_FILLER_AFTER             0x0080
-#define PNG_FLAG_CRC_ANCILLARY_USE        0x0100
-#define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200
-#define PNG_FLAG_CRC_CRITICAL_USE         0x0400
-#define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800
-#define PNG_FLAG_ASSUME_sRGB              0x1000  /* Added to libpng-1.5.4 */
-#define PNG_FLAG_OPTIMIZE_ALPHA           0x2000  /* Added to libpng-1.5.4 */
-#define PNG_FLAG_DETECT_UNINITIALIZED     0x4000  /* Added to libpng-1.5.4 */
-#define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000
-#define PNG_FLAG_KEEP_UNSAFE_CHUNKS       0x10000
-#define PNG_FLAG_LIBRARY_MISMATCH         0x20000
-#define PNG_FLAG_STRIP_ERROR_NUMBERS      0x40000
-#define PNG_FLAG_STRIP_ERROR_TEXT         0x80000
-#define PNG_FLAG_MALLOC_NULL_MEM_OK       0x100000
-                                  /*      0x200000  unused */
-                                  /*      0x400000  unused */
-#define PNG_FLAG_BENIGN_ERRORS_WARN       0x800000  /* Added to libpng-1.4.0 */
-#define PNG_FLAG_ZTXT_CUSTOM_STRATEGY    0x1000000  /* 5 lines added */
-#define PNG_FLAG_ZTXT_CUSTOM_LEVEL       0x2000000  /* to libpng-1.5.4 */
-#define PNG_FLAG_ZTXT_CUSTOM_MEM_LEVEL   0x4000000
-#define PNG_FLAG_ZTXT_CUSTOM_WINDOW_BITS 0x8000000
-#define PNG_FLAG_ZTXT_CUSTOM_METHOD      0x10000000
-                                  /*     0x20000000  unused */
-                                  /*     0x40000000  unused */
-
-#define PNG_FLAG_CRC_ANCILLARY_MASK (PNG_FLAG_CRC_ANCILLARY_USE | \
-                                     PNG_FLAG_CRC_ANCILLARY_NOWARN)
-
-#define PNG_FLAG_CRC_CRITICAL_MASK  (PNG_FLAG_CRC_CRITICAL_USE | \
-                                     PNG_FLAG_CRC_CRITICAL_IGNORE)
-
-#define PNG_FLAG_CRC_MASK           (PNG_FLAG_CRC_ANCILLARY_MASK | \
-                                     PNG_FLAG_CRC_CRITICAL_MASK)
-
-/* zlib.h declares a magic type 'uInt' that limits the amount of data that zlib
- * can handle at once.  This type need be no larger than 16 bits (so maximum of
- * 65535), this define allows us to discover how big it is, but limited by the
- * maximuum for png_size_t.  The value can be overriden in a library build
- * (pngusr.h, or set it in CPPFLAGS) and it works to set it to a considerably
- * lower value (e.g. 255 works).  A lower value may help memory usage (slightly)
- * and may even improve performance on some systems (and degrade it on others.)
- */
-#ifndef ZLIB_IO_MAX
-#  define ZLIB_IO_MAX ((uInt)-1)
-#endif
-
-/* Save typing and make code easier to understand */
-
-#define PNG_COLOR_DIST(c1, c2) (abs((int)((c1).red) - (int)((c2).red)) + \
-   abs((int)((c1).green) - (int)((c2).green)) + \
-   abs((int)((c1).blue) - (int)((c2).blue)))
-
-/* Added to libpng-1.2.6 JB */
-#define PNG_ROWBYTES(pixel_bits, width) \
-    ((pixel_bits) >= 8 ? \
-    ((png_size_t)(width) * (((png_size_t)(pixel_bits)) >> 3)) : \
-    (( ((png_size_t)(width) * ((png_size_t)(pixel_bits))) + 7) >> 3) )
-
-/* PNG_OUT_OF_RANGE returns true if value is outside the range
- * ideal-delta..ideal+delta.  Each argument is evaluated twice.
- * "ideal" and "delta" should be constants, normally simple
- * integers, "value" a variable. Added to libpng-1.2.6 JB
- */
-#define PNG_OUT_OF_RANGE(value, ideal, delta) \
-   ( (value) < (ideal)-(delta) || (value) > (ideal)+(delta) )
-
-/* Conversions between fixed and floating point, only defined if
- * required (to make sure the code doesn't accidentally use float
- * when it is supposedly disabled.)
- */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-/* The floating point conversion can't overflow, though it can and
- * does lose accuracy relative to the original fixed point value.
- * In practice this doesn't matter because png_fixed_point only
- * stores numbers with very low precision.  The png_ptr and s
- * arguments are unused by default but are there in case error
- * checking becomes a requirement.
- */
-#define png_float(png_ptr, fixed, s) (.00001 * (fixed))
-
-/* The fixed point conversion performs range checking and evaluates
- * its argument multiple times, so must be used with care.  The
- * range checking uses the PNG specification values for a signed
- * 32 bit fixed point value except that the values are deliberately
- * rounded-to-zero to an integral value - 21474 (21474.83 is roughly
- * (2^31-1) * 100000). 's' is a string that describes the value being
- * converted.
- *
- * NOTE: this macro will raise a png_error if the range check fails,
- * therefore it is normally only appropriate to use this on values
- * that come from API calls or other sources where an out of range
- * error indicates a programming error, not a data error!
- *
- * NOTE: by default this is off - the macro is not used - because the
- * function call saves a lot of code.
- */
-#ifdef PNG_FIXED_POINT_MACRO_SUPPORTED
-#define png_fixed(png_ptr, fp, s) ((fp) <= 21474 && (fp) >= -21474 ?\
-    ((png_fixed_point)(100000 * (fp))) : (png_fixed_error(png_ptr, s),0))
-#else
-PNG_EXTERN png_fixed_point png_fixed PNGARG((png_structp png_ptr, double fp,
-   png_const_charp text));
-#endif
-#endif
-
-/* Constants for known chunk types.  If you need to add a chunk, define the name
- * here.  For historical reasons these constants have the form png_<name>; i.e.
- * the prefix is lower case.  Please use decimal values as the parameters to
- * match the ISO PNG specification and to avoid relying on the C locale
- * interpretation of character values.
- *
- * Prior to 1.5.6 these constants were strings, as of 1.5.6 png_uint_32 values
- * are computed and a new macro (PNG_STRING_FROM_CHUNK) added to allow a string
- * to be generated if required.
- *
- * PNG_32b correctly produces a value shifted by up to 24 bits, even on
- * architectures where (int) is only 16 bits.
- */
-#define PNG_32b(b,s) ((png_uint_32)(b) << (s))
-#define PNG_CHUNK(b1,b2,b3,b4) \
-   (PNG_32b(b1,24) | PNG_32b(b2,16) | PNG_32b(b3,8) | PNG_32b(b4,0))
-
-#define png_IHDR PNG_CHUNK( 73,  72,  68,  82)
-#define png_IDAT PNG_CHUNK( 73,  68,  65,  84)
-#define png_IEND PNG_CHUNK( 73,  69,  78,  68)
-#define png_PLTE PNG_CHUNK( 80,  76,  84,  69)
-#define png_bKGD PNG_CHUNK( 98,  75,  71,  68)
-#define png_cHRM PNG_CHUNK( 99,  72,  82,  77)
-#define png_gAMA PNG_CHUNK(103,  65,  77,  65)
-#define png_hIST PNG_CHUNK(104,  73,  83,  84)
-#define png_iCCP PNG_CHUNK(105,  67,  67,  80)
-#define png_iTXt PNG_CHUNK(105,  84,  88, 116)
-#define png_oFFs PNG_CHUNK(111,  70,  70, 115)
-#define png_pCAL PNG_CHUNK(112,  67,  65,  76)
-#define png_sCAL PNG_CHUNK(115,  67,  65,  76)
-#define png_pHYs PNG_CHUNK(112,  72,  89, 115)
-#define png_sBIT PNG_CHUNK(115,  66,  73,  84)
-#define png_sPLT PNG_CHUNK(115,  80,  76,  84)
-#define png_sRGB PNG_CHUNK(115,  82,  71,  66)
-#define png_sTER PNG_CHUNK(115,  84,  69,  82)
-#define png_tEXt PNG_CHUNK(116,  69,  88, 116)
-#define png_tIME PNG_CHUNK(116,  73,  77,  69)
-#define png_tRNS PNG_CHUNK(116,  82,  78,  83)
-#define png_zTXt PNG_CHUNK(122,  84,  88, 116)
-
-/* The following will work on (signed char*) strings, whereas the get_uint_32
- * macro will fail on top-bit-set values because of the sign extension.
- */
-#define PNG_CHUNK_FROM_STRING(s)\
-   PNG_CHUNK(0xff&(s)[0], 0xff&(s)[1], 0xff&(s)[2], 0xff&(s)[3])
-
-/* This uses (char), not (png_byte) to avoid warnings on systems where (char) is
- * signed and the argument is a (char[])  This macro will fail miserably on
- * systems where (char) is more than 8 bits.
- */
-#define PNG_STRING_FROM_CHUNK(s,c)\
-   (void)(((char*)(s))[0]=(char)((c)>>24), ((char*)(s))[1]=(char)((c)>>16),\
-   ((char*)(s))[2]=(char)((c)>>8), ((char*)(s))[3]=(char)((c)))
-
-/* Do the same but terminate with a null character. */
-#define PNG_CSTRING_FROM_CHUNK(s,c)\
-   (void)(PNG_STRING_FROM_CHUNK(s,c), ((char*)(s))[4] = 0)
-
-/* Test on flag values as defined in the spec (section 5.4): */
-#define PNG_CHUNK_ANCILLIARY(c)   (1 & ((c) >> 29))
-#define PNG_CHUNK_CRITICAL(c)     (!PNG_CHUNK_ANCILLIARY(c))
-#define PNG_CHUNK_PRIVATE(c)      (1 & ((c) >> 21))
-#define PNG_CHUNK_RESERVED(c)     (1 & ((c) >> 13))
-#define PNG_CHUNK_SAFE_TO_COPY(c) (1 & ((c) >>  5))
-
-/* Gamma values (new at libpng-1.5.4): */
-#define PNG_GAMMA_MAC_OLD 151724  /* Assume '1.8' is really 2.2/1.45! */
-#define PNG_GAMMA_MAC_INVERSE 65909
-#define PNG_GAMMA_sRGB_INVERSE 45455
-
-
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* These functions are used internally in the code.  They generally
- * shouldn't be used unless you are writing code to add or replace some
- * functionality in libpng.  More information about most functions can
- * be found in the files where the functions are located.
- */
-
-/* Check the user version string for compatibility, returns false if the version
- * numbers aren't compatible.
- */
-PNG_EXTERN int png_user_version_check(png_structp png_ptr,
-   png_const_charp user_png_ver);
-
-/* Allocate memory for an internal libpng struct */
-PNG_EXTERN PNG_FUNCTION(png_voidp,png_create_struct,PNGARG((int type)),
-   PNG_ALLOCATED);
-
-/* Free memory from internal libpng struct */
-PNG_EXTERN void png_destroy_struct PNGARG((png_voidp struct_ptr));
-
-PNG_EXTERN PNG_FUNCTION(png_voidp,png_create_struct_2,
-   PNGARG((int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr)),
-   PNG_ALLOCATED);
-PNG_EXTERN void png_destroy_struct_2 PNGARG((png_voidp struct_ptr,
-    png_free_ptr free_fn, png_voidp mem_ptr));
-
-/* Free any memory that info_ptr points to and reset struct. */
-PNG_EXTERN void png_info_destroy PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-
-/* Function to allocate memory for zlib.  PNGAPI is disallowed. */
-PNG_EXTERN PNG_FUNCTION(voidpf,png_zalloc,PNGARG((voidpf png_ptr, uInt items,
-   uInt size)),PNG_ALLOCATED);
-
-/* Function to free memory for zlib.  PNGAPI is disallowed. */
-PNG_EXTERN void png_zfree PNGARG((voidpf png_ptr, voidpf ptr));
-
-/* Next four functions are used internally as callbacks.  PNGCBAPI is required
- * but not PNG_EXPORT.  PNGAPI added at libpng version 1.2.3, changed to
- * PNGCBAPI at 1.5.0
- */
-
-PNG_EXTERN void PNGCBAPI png_default_read_data PNGARG((png_structp png_ptr,
-    png_bytep data, png_size_t length));
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_EXTERN void PNGCBAPI png_push_fill_buffer PNGARG((png_structp png_ptr,
-    png_bytep buffer, png_size_t length));
-#endif
-
-PNG_EXTERN void PNGCBAPI png_default_write_data PNGARG((png_structp png_ptr,
-    png_bytep data, png_size_t length));
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#  ifdef PNG_STDIO_SUPPORTED
-PNG_EXTERN void PNGCBAPI png_default_flush PNGARG((png_structp png_ptr));
-#  endif
-#endif
-
-/* Reset the CRC variable */
-PNG_EXTERN void png_reset_crc PNGARG((png_structp png_ptr));
-
-/* Write the "data" buffer to whatever output you are using */
-PNG_EXTERN void png_write_data PNGARG((png_structp png_ptr,
-    png_const_bytep data, png_size_t length));
-
-/* Read and check the PNG file signature */
-PNG_EXTERN void png_read_sig PNGARG((png_structp png_ptr, png_infop info_ptr));
-
-/* Read the chunk header (length + type name) */
-PNG_EXTERN png_uint_32 png_read_chunk_header PNGARG((png_structp png_ptr));
-
-/* Read data from whatever input you are using into the "data" buffer */
-PNG_EXTERN void png_read_data PNGARG((png_structp png_ptr, png_bytep data,
-    png_size_t length));
-
-/* Read bytes into buf, and update png_ptr->crc */
-PNG_EXTERN void png_crc_read PNGARG((png_structp png_ptr, png_bytep buf,
-    png_size_t length));
-
-/* Decompress data in a chunk that uses compression */
-#if defined(PNG_READ_COMPRESSED_TEXT_SUPPORTED)
-PNG_EXTERN void png_decompress_chunk PNGARG((png_structp png_ptr,
-    int comp_type, png_size_t chunklength, png_size_t prefix_length,
-    png_size_t *data_length));
-#endif
-
-/* Read "skip" bytes, read the file crc, and (optionally) verify png_ptr->crc */
-PNG_EXTERN int png_crc_finish PNGARG((png_structp png_ptr, png_uint_32 skip));
-
-/* Read the CRC from the file and compare it to the libpng calculated CRC */
-PNG_EXTERN int png_crc_error PNGARG((png_structp png_ptr));
-
-/* Calculate the CRC over a section of data.  Note that we are only
- * passing a maximum of 64K on systems that have this as a memory limit,
- * since this is the maximum buffer size we can specify.
- */
-PNG_EXTERN void png_calculate_crc PNGARG((png_structp png_ptr,
-    png_const_bytep ptr, png_size_t length));
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-PNG_EXTERN void png_flush PNGARG((png_structp png_ptr));
-#endif
-
-/* Write various chunks */
-
-/* Write the IHDR chunk, and update the png_struct with the necessary
- * information.
- */
-PNG_EXTERN void png_write_IHDR PNGARG((png_structp png_ptr, png_uint_32 width,
-    png_uint_32 height,
-    int bit_depth, int color_type, int compression_method, int filter_method,
-    int interlace_method));
-
-PNG_EXTERN void png_write_PLTE PNGARG((png_structp png_ptr,
-    png_const_colorp palette, png_uint_32 num_pal));
-
-PNG_EXTERN void png_write_IDAT PNGARG((png_structp png_ptr, png_bytep data,
-    png_size_t length));
-
-PNG_EXTERN void png_write_IEND PNGARG((png_structp png_ptr));
-
-#ifdef PNG_WRITE_gAMA_SUPPORTED
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_EXTERN void png_write_gAMA PNGARG((png_structp png_ptr, double file_gamma));
-#  endif
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-PNG_EXTERN void png_write_gAMA_fixed PNGARG((png_structp png_ptr,
-    png_fixed_point file_gamma));
-#  endif
-#endif
-
-#ifdef PNG_WRITE_sBIT_SUPPORTED
-PNG_EXTERN void png_write_sBIT PNGARG((png_structp png_ptr,
-    png_const_color_8p sbit, int color_type));
-#endif
-
-#ifdef PNG_WRITE_cHRM_SUPPORTED
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_EXTERN void png_write_cHRM PNGARG((png_structp png_ptr,
-    double white_x, double white_y,
-    double red_x, double red_y, double green_x, double green_y,
-    double blue_x, double blue_y));
-#  endif
-PNG_EXTERN void png_write_cHRM_fixed PNGARG((png_structp png_ptr,
-    png_fixed_point int_white_x, png_fixed_point int_white_y,
-    png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
-    int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y));
-#endif
-
-#ifdef PNG_WRITE_sRGB_SUPPORTED
-PNG_EXTERN void png_write_sRGB PNGARG((png_structp png_ptr,
-    int intent));
-#endif
-
-#ifdef PNG_WRITE_iCCP_SUPPORTED
-PNG_EXTERN void png_write_iCCP PNGARG((png_structp png_ptr,
-    png_const_charp name, int compression_type,
-    png_const_charp profile, int proflen));
-   /* Note to maintainer: profile should be png_bytep */
-#endif
-
-#ifdef PNG_WRITE_sPLT_SUPPORTED
-PNG_EXTERN void png_write_sPLT PNGARG((png_structp png_ptr,
-    png_const_sPLT_tp palette));
-#endif
-
-#ifdef PNG_WRITE_tRNS_SUPPORTED
-PNG_EXTERN void png_write_tRNS PNGARG((png_structp png_ptr,
-    png_const_bytep trans, png_const_color_16p values, int number,
-    int color_type));
-#endif
-
-#ifdef PNG_WRITE_bKGD_SUPPORTED
-PNG_EXTERN void png_write_bKGD PNGARG((png_structp png_ptr,
-    png_const_color_16p values, int color_type));
-#endif
-
-#ifdef PNG_WRITE_hIST_SUPPORTED
-PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr,
-    png_const_uint_16p hist, int num_hist));
-#endif
-
-/* Chunks that have keywords */
-#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
-    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
-PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr,
-    png_const_charp key, png_charpp new_key));
-#endif
-
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-PNG_EXTERN void png_write_tEXt PNGARG((png_structp png_ptr, png_const_charp key,
-    png_const_charp text, png_size_t text_len));
-#endif
-
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-PNG_EXTERN void png_write_zTXt PNGARG((png_structp png_ptr, png_const_charp key,
-    png_const_charp text, png_size_t text_len, int compression));
-#endif
-
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-PNG_EXTERN void png_write_iTXt PNGARG((png_structp png_ptr,
-    int compression, png_const_charp key, png_const_charp lang,
-    png_const_charp lang_key, png_const_charp text));
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED  /* Added at version 1.0.14 and 1.2.4 */
-PNG_EXTERN int png_set_text_2 PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_const_textp text_ptr, int num_text));
-#endif
-
-#ifdef PNG_WRITE_oFFs_SUPPORTED
-PNG_EXTERN void png_write_oFFs PNGARG((png_structp png_ptr,
-    png_int_32 x_offset, png_int_32 y_offset, int unit_type));
-#endif
-
-#ifdef PNG_WRITE_pCAL_SUPPORTED
-PNG_EXTERN void png_write_pCAL PNGARG((png_structp png_ptr, png_charp purpose,
-    png_int_32 X0, png_int_32 X1, int type, int nparams,
-    png_const_charp units, png_charpp params));
-#endif
-
-#ifdef PNG_WRITE_pHYs_SUPPORTED
-PNG_EXTERN void png_write_pHYs PNGARG((png_structp png_ptr,
-    png_uint_32 x_pixels_per_unit, png_uint_32 y_pixels_per_unit,
-    int unit_type));
-#endif
-
-#ifdef PNG_WRITE_tIME_SUPPORTED
-PNG_EXTERN void png_write_tIME PNGARG((png_structp png_ptr,
-    png_const_timep mod_time));
-#endif
-
-#ifdef PNG_WRITE_sCAL_SUPPORTED
-PNG_EXTERN void png_write_sCAL_s PNGARG((png_structp png_ptr,
-    int unit, png_const_charp width, png_const_charp height));
-#endif
-
-/* Called when finished processing a row of data */
-PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
-
-/* Internal use only.   Called before first row of data */
-PNG_EXTERN void png_write_start_row PNGARG((png_structp png_ptr));
-
-/* Combine a row of data, dealing with alpha, etc. if requested.  'row' is an
- * array of png_ptr->width pixels.  If the image is not interlaced or this
- * is the final pass this just does a png_memcpy, otherwise the "display" flag
- * is used to determine whether to copy pixels that are not in the current pass.
- *
- * Because 'png_do_read_interlace' (below) replicates pixels this allows this
- * function to achieve the documented 'blocky' appearance during interlaced read
- * if display is 1 and the 'sparkle' appearance, where existing pixels in 'row'
- * are not changed if they are not in the current pass, when display is 0.
- *
- * 'display' must be 0 or 1, otherwise the memcpy will be done regardless.
- *
- * The API always reads from the png_struct row buffer and always assumes that
- * it is full width (png_do_read_interlace has already been called.)
- *
- * This function is only ever used to write to row buffers provided by the
- * caller of the relevant libpng API and the row must have already been
- * transformed by the read transformations.
- *
- * The PNG_USE_COMPILE_TIME_MASKS option causes generation of pre-computed
- * bitmasks for use within the code, otherwise runtime generated masks are used.
- * The default is compile time masks.
- */
-#ifndef PNG_USE_COMPILE_TIME_MASKS
-#  define PNG_USE_COMPILE_TIME_MASKS 1
-#endif
-PNG_EXTERN void png_combine_row PNGARG((png_structp png_ptr, png_bytep row,
-    int display));
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-/* Expand an interlaced row: the 'row_info' describes the pass data that has
- * been read in and must correspond to the pixels in 'row', the pixels are
- * expanded (moved apart) in 'row' to match the final layout, when doing this
- * the pixels are *replicated* to the intervening space.  This is essential for
- * the correct operation of png_combine_row, above.
- */
-PNG_EXTERN void png_do_read_interlace PNGARG((png_row_infop row_info,
-    png_bytep row, int pass, png_uint_32 transformations));
-#endif
-
-/* GRR TO DO (2.0 or whenever):  simplify other internal calling interfaces */
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-/* Grab pixels out of a row for an interlaced pass */
-PNG_EXTERN void png_do_write_interlace PNGARG((png_row_infop row_info,
-    png_bytep row, int pass));
-#endif
-
-/* Unfilter a row: check the filter value before calling this, there is no point
- * calling it for PNG_FILTER_VALUE_NONE.
- */
-PNG_EXTERN void png_read_filter_row PNGARG((png_structp pp, png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row, int filter));
-
-PNG_EXTERN void png_read_filter_row_up_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_sub3_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_sub4_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_avg3_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_avg4_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_paeth3_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-PNG_EXTERN void png_read_filter_row_paeth4_neon PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep prev_row));
-
-/* Choose the best filter to use and filter the row data */
-PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr,
-    png_row_infop row_info));
-
-/* Finish a row while reading, dealing with interlacing passes, etc. */
-PNG_EXTERN void png_read_finish_row PNGARG((png_structp png_ptr));
-
-/* Initialize the row buffers, etc. */
-PNG_EXTERN void png_read_start_row PNGARG((png_structp png_ptr));
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-/* Optional call to update the users info structure */
-PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-#endif
-
-/* These are the functions that do the transformations */
-#ifdef PNG_READ_FILLER_SUPPORTED
-PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
-    png_bytep row, png_uint_32 filler, png_uint_32 flags));
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-PNG_EXTERN void png_do_read_swap_alpha PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-PNG_EXTERN void png_do_write_swap_alpha PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-PNG_EXTERN void png_do_read_invert_alpha PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-PNG_EXTERN void png_do_write_invert_alpha PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
-    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-PNG_EXTERN void png_do_strip_channel PNGARG((png_row_infop row_info,
-    png_bytep row, int at_start));
-#endif
-
-#ifdef PNG_16BIT_SUPPORTED
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-PNG_EXTERN void png_do_swap PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED) || \
-    defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-PNG_EXTERN void png_do_packswap PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-PNG_EXTERN int png_do_rgb_to_gray PNGARG((png_structp png_ptr,
-    png_row_infop row_info, png_bytep row));
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-PNG_EXTERN void png_do_gray_to_rgb PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_PACK_SUPPORTED
-PNG_EXTERN void png_do_unpack PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-PNG_EXTERN void png_do_unshift PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_color_8p sig_bits));
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-PNG_EXTERN void png_do_invert PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-PNG_EXTERN void png_do_scale_16_to_8 PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-PNG_EXTERN void png_do_chop PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-PNG_EXTERN void png_do_quantize PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_bytep palette_lookup,
-    png_const_bytep quantize_lookup));
-
-#  ifdef PNG_CORRECT_PALETTE_SUPPORTED
-PNG_EXTERN void png_correct_palette PNGARG((png_structp png_ptr,
-    png_colorp palette, int num_palette));
-#  endif
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-PNG_EXTERN void png_do_bgr PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-PNG_EXTERN void png_do_pack PNGARG((png_row_infop row_info,
-   png_bytep row, png_uint_32 bit_depth));
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-PNG_EXTERN void png_do_shift PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_color_8p bit_depth));
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-    defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-PNG_EXTERN void png_do_compose PNGARG((png_row_infop row_info,
-    png_bytep row, png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-PNG_EXTERN void png_do_gamma PNGARG((png_row_infop row_info,
-    png_bytep row, png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-PNG_EXTERN void png_do_encode_alpha PNGARG((png_row_infop row_info,
-   png_bytep row, png_structp png_ptr));
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-PNG_EXTERN void png_do_expand_palette PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_colorp palette, png_const_bytep trans,
-    int num_trans));
-PNG_EXTERN void png_do_expand PNGARG((png_row_infop row_info,
-    png_bytep row, png_const_color_16p trans_color));
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-PNG_EXTERN void png_do_expand_16 PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-/* The following decodes the appropriate chunks, and does error correction,
- * then calls the appropriate callback for the chunk if it is valid.
- */
-
-/* Decode the IHDR chunk */
-PNG_EXTERN void png_handle_IHDR PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-PNG_EXTERN void png_handle_PLTE PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-PNG_EXTERN void png_handle_IEND PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-PNG_EXTERN void png_handle_bKGD PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-PNG_EXTERN void png_handle_cHRM PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-PNG_EXTERN void png_handle_gAMA PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-PNG_EXTERN void png_handle_hIST PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-PNG_EXTERN void png_handle_iCCP PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif /* PNG_READ_iCCP_SUPPORTED */
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-PNG_EXTERN void png_handle_iTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-PNG_EXTERN void png_handle_oFFs PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-PNG_EXTERN void png_handle_pCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-PNG_EXTERN void png_handle_pHYs PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-PNG_EXTERN void png_handle_sBIT PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-PNG_EXTERN void png_handle_sCAL PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-PNG_EXTERN void png_handle_sPLT PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif /* PNG_READ_sPLT_SUPPORTED */
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-PNG_EXTERN void png_handle_sRGB PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-PNG_EXTERN void png_handle_tEXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-PNG_EXTERN void png_handle_tIME PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-PNG_EXTERN void png_handle_tRNS PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-PNG_EXTERN void png_handle_zTXt PNGARG((png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 length));
-#endif
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length));
-#endif
-
-PNG_EXTERN void png_check_chunk_name PNGARG((png_structp png_ptr,
-    png_uint_32 chunk_name));
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-/* Exactly as png_handle_as_unknown() except that the argument is a 32-bit chunk
- * name, not a string.
- */
-PNG_EXTERN int png_chunk_unknown_handling PNGARG((png_structp png_ptr,
-    png_uint_32 chunk_name));
-#endif
-
-/* Handle the transformations for reading and writing */
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-PNG_EXTERN void png_do_read_transformations PNGARG((png_structp png_ptr,
-   png_row_infop row_info));
-#endif
-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-PNG_EXTERN void png_do_write_transformations PNGARG((png_structp png_ptr,
-   png_row_infop row_info));
-#endif
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-PNG_EXTERN void png_init_read_transformations PNGARG((png_structp png_ptr));
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-PNG_EXTERN void png_push_read_chunk PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-PNG_EXTERN void png_push_read_sig PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-PNG_EXTERN void png_push_check_crc PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_crc_skip PNGARG((png_structp png_ptr,
-    png_uint_32 length));
-PNG_EXTERN void png_push_crc_finish PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_save_buffer PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_restore_buffer PNGARG((png_structp png_ptr,
-    png_bytep buffer, png_size_t buffer_length));
-PNG_EXTERN void png_push_read_IDAT PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_process_IDAT_data PNGARG((png_structp png_ptr,
-    png_bytep buffer, png_size_t buffer_length));
-PNG_EXTERN void png_push_process_row PNGARG((png_structp png_ptr));
-PNG_EXTERN void png_push_handle_unknown PNGARG((png_structp png_ptr,
-   png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_have_info PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_push_have_end PNGARG((png_structp png_ptr,
-   png_infop info_ptr));
-PNG_EXTERN void png_push_have_row PNGARG((png_structp png_ptr, png_bytep row));
-PNG_EXTERN void png_push_read_end PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-PNG_EXTERN void png_process_some_data PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-PNG_EXTERN void png_read_push_finish_row PNGARG((png_structp png_ptr));
-#  ifdef PNG_READ_tEXt_SUPPORTED
-PNG_EXTERN void png_push_handle_tEXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_read_tEXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-#  endif
-#  ifdef PNG_READ_zTXt_SUPPORTED
-PNG_EXTERN void png_push_handle_zTXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_read_zTXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-#  endif
-#  ifdef PNG_READ_iTXt_SUPPORTED
-PNG_EXTERN void png_push_handle_iTXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length));
-PNG_EXTERN void png_push_read_iTXt PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-#  endif
-
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-PNG_EXTERN void png_do_read_intrapixel PNGARG((png_row_infop row_info,
-    png_bytep row));
-PNG_EXTERN void png_do_write_intrapixel PNGARG((png_row_infop row_info,
-    png_bytep row));
-#endif
-
-/* Added at libpng version 1.4.0 */
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-PNG_EXTERN int png_check_cHRM_fixed PNGARG((png_structp png_ptr,
-    png_fixed_point int_white_x, png_fixed_point int_white_y,
-    png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
-    int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
-    png_fixed_point int_blue_y));
-#endif
-
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-/* Added at libpng version 1.2.34 and 1.4.0 */
-/* Currently only used by png_check_cHRM_fixed */
-PNG_EXTERN void png_64bit_product PNGARG((long v1, long v2,
-    unsigned long *hi_product, unsigned long *lo_product));
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-/* Added at libpng version 1.5.5 */
-typedef struct png_xy
-{
-   png_fixed_point redx, redy;
-   png_fixed_point greenx, greeny;
-   png_fixed_point bluex, bluey;
-   png_fixed_point whitex, whitey;
-} png_xy;
-
-typedef struct png_XYZ
-{
-   png_fixed_point redX, redY, redZ;
-   png_fixed_point greenX, greenY, greenZ;
-   png_fixed_point blueX, blueY, blueZ;
-} png_XYZ;
-
-/* The conversion APIs return 0 on success, non-zero on a parameter error. They
- * allow conversion between the above representations of a color encoding.  When
- * converting from XYZ end points to chromaticities the absolute magnitude of
- * the end points is lost, when converting back the sum of the Y values of the
- * three end points will be 1.0
- */
-PNG_EXTERN int png_xy_from_XYZ PNGARG((png_xy *xy, png_XYZ XYZ));
-PNG_EXTERN int png_XYZ_from_xy PNGARG((png_XYZ *XYZ, png_xy xy));
-PNG_EXTERN int png_XYZ_from_xy_checked PNGARG((png_structp png_ptr,
-   png_XYZ *XYZ, png_xy xy));
-#endif
-
-/* Added at libpng version 1.4.0 */
-PNG_EXTERN void png_check_IHDR PNGARG((png_structp png_ptr,
-    png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_type, int compression_type,
-    int filter_type));
-
-/* Free all memory used by the read (old method - NOT DLL EXPORTED) */
-PNG_EXTERN void png_read_destroy PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_infop end_info_ptr));
-
-/* Free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
-PNG_EXTERN void png_write_destroy PNGARG((png_structp png_ptr));
-
-#ifdef USE_FAR_KEYWORD  /* memory model conversion function */
-PNG_EXTERN void *png_far_to_near PNGARG((png_structp png_ptr, png_voidp ptr,
-    int check));
-#endif /* USE_FAR_KEYWORD */
-
-#if defined(PNG_FLOATING_POINT_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
-PNG_EXTERN PNG_FUNCTION(void, png_fixed_error, (png_structp png_ptr,
-   png_const_charp name),PNG_NORETURN);
-#endif
-
-/* Puts 'string' into 'buffer' at buffer[pos], taking care never to overwrite
- * the end.  Always leaves the buffer nul terminated.  Never errors out (and
- * there is no error code.)
- */
-PNG_EXTERN size_t png_safecat(png_charp buffer, size_t bufsize, size_t pos,
-    png_const_charp string);
-
-/* Various internal functions to handle formatted warning messages, currently
- * only implemented for warnings.
- */
-#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_TIME_RFC1123_SUPPORTED)
-/* Utility to dump an unsigned value into a buffer, given a start pointer and
- * and end pointer (which should point just *beyond* the end of the buffer!)
- * Returns the pointer to the start of the formatted string.  This utility only
- * does unsigned values.
- */
-PNG_EXTERN png_charp png_format_number(png_const_charp start, png_charp end,
-   int format, png_alloc_size_t number);
-
-/* Convenience macro that takes an array: */
-#define PNG_FORMAT_NUMBER(buffer,format,number) \
-   png_format_number(buffer, buffer + (sizeof buffer), format, number)
-
-/* Suggested size for a number buffer (enough for 64 bits and a sign!) */
-#define PNG_NUMBER_BUFFER_SIZE 24
-
-/* These are the integer formats currently supported, the name is formed from
- * the standard printf(3) format string.
- */
-#define PNG_NUMBER_FORMAT_u     1 /* chose unsigned API! */
-#define PNG_NUMBER_FORMAT_02u   2
-#define PNG_NUMBER_FORMAT_d     1 /* chose signed API! */
-#define PNG_NUMBER_FORMAT_02d   2
-#define PNG_NUMBER_FORMAT_x     3
-#define PNG_NUMBER_FORMAT_02x   4
-#define PNG_NUMBER_FORMAT_fixed 5 /* choose the signed API */
-#endif
-
-#ifdef PNG_WARNINGS_SUPPORTED
-/* New defines and members adding in libpng-1.5.4 */
-#  define PNG_WARNING_PARAMETER_SIZE 32
-#  define PNG_WARNING_PARAMETER_COUNT 8
-
-/* An l-value of this type has to be passed to the APIs below to cache the
- * values of the parameters to a formatted warning message.
- */
-typedef char png_warning_parameters[PNG_WARNING_PARAMETER_COUNT][
-   PNG_WARNING_PARAMETER_SIZE];
-
-PNG_EXTERN void png_warning_parameter(png_warning_parameters p, int number,
-    png_const_charp string);
-    /* Parameters are limited in size to PNG_WARNING_PARAMETER_SIZE characters,
-     * including the trailing '\0'.
-     */
-PNG_EXTERN void png_warning_parameter_unsigned(png_warning_parameters p,
-    int number, int format, png_alloc_size_t value);
-    /* Use png_alloc_size_t because it is an unsigned type as big as any we
-     * need to output.  Use the following for a signed value.
-     */
-PNG_EXTERN void png_warning_parameter_signed(png_warning_parameters p,
-    int number, int format, png_int_32 value);
-
-PNG_EXTERN void png_formatted_warning(png_structp png_ptr,
-    png_warning_parameters p, png_const_charp message);
-    /* 'message' follows the X/Open approach of using @1, @2 to insert
-     * parameters previously supplied using the above functions.  Errors in
-     * specifying the paramters will simple result in garbage substitutions.
-     */
-#endif
-
-/* ASCII to FP interfaces, currently only implemented if sCAL
- * support is required.
- */
-#if defined(PNG_READ_sCAL_SUPPORTED)
-/* MAX_DIGITS is actually the maximum number of characters in an sCAL
- * width or height, derived from the precision (number of significant
- * digits - a build time settable option) and assumpitions about the
- * maximum ridiculous exponent.
- */
-#define PNG_sCAL_MAX_DIGITS (PNG_sCAL_PRECISION+1/*.*/+1/*E*/+10/*exponent*/)
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-PNG_EXTERN void png_ascii_from_fp PNGARG((png_structp png_ptr, png_charp ascii,
-    png_size_t size, double fp, unsigned int precision));
-#endif /* FLOATING_POINT */
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-PNG_EXTERN void png_ascii_from_fixed PNGARG((png_structp png_ptr,
-    png_charp ascii, png_size_t size, png_fixed_point fp));
-#endif /* FIXED_POINT */
-#endif /* READ_sCAL */
-
-#if defined(PNG_sCAL_SUPPORTED) || defined(PNG_pCAL_SUPPORTED)
-/* An internal API to validate the format of a floating point number.
- * The result is the index of the next character.  If the number is
- * not valid it will be the index of a character in the supposed number.
- *
- * The format of a number is defined in the PNG extensions specification
- * and this API is strictly conformant to that spec, not anyone elses!
- *
- * The format as a regular expression is:
- *
- * [+-]?[0-9]+.?([Ee][+-]?[0-9]+)?
- *
- * or:
- *
- * [+-]?.[0-9]+(.[0-9]+)?([Ee][+-]?[0-9]+)?
- *
- * The complexity is that either integer or fraction must be present and the
- * fraction is permitted to have no digits only if the integer is present.
- *
- * NOTE: The dangling E problem.
- *   There is a PNG valid floating point number in the following:
- *
- *       PNG floating point numb1.ers are not greedy.
- *
- *   Working this out requires *TWO* character lookahead (because of the
- *   sign), the parser does not do this - it will fail at the 'r' - this
- *   doesn't matter for PNG sCAL chunk values, but it requires more care
- *   if the value were ever to be embedded in something more complex.  Use
- *   ANSI-C strtod if you need the lookahead.
- */
-/* State table for the parser. */
-#define PNG_FP_INTEGER    0  /* before or in integer */
-#define PNG_FP_FRACTION   1  /* before or in fraction */
-#define PNG_FP_EXPONENT   2  /* before or in exponent */
-#define PNG_FP_STATE      3  /* mask for the above */
-#define PNG_FP_SAW_SIGN   4  /* Saw +/- in current state */
-#define PNG_FP_SAW_DIGIT  8  /* Saw a digit in current state */
-#define PNG_FP_SAW_DOT   16  /* Saw a dot in current state */
-#define PNG_FP_SAW_E     32  /* Saw an E (or e) in current state */
-#define PNG_FP_SAW_ANY   60  /* Saw any of the above 4 */
-
-/* These three values don't affect the parser.  They are set but not used.
- */
-#define PNG_FP_WAS_VALID 64  /* Preceding substring is a valid fp number */
-#define PNG_FP_NEGATIVE 128  /* A negative number, including "-0" */
-#define PNG_FP_NONZERO  256  /* A non-zero value */
-#define PNG_FP_STICKY   448  /* The above three flags */
-
-/* This is available for the caller to store in 'state' if required.  Do not
- * call the parser after setting it (the parser sometimes clears it.)
- */
-#define PNG_FP_INVALID  512  /* Available for callers as a distinct value */
-
-/* Result codes for the parser (boolean - true meants ok, false means
- * not ok yet.)
- */
-#define PNG_FP_MAYBE      0  /* The number may be valid in the future */
-#define PNG_FP_OK         1  /* The number is valid */
-
-/* Tests on the sticky non-zero and negative flags.  To pass these checks
- * the state must also indicate that the whole number is valid - this is
- * achieved by testing PNG_FP_SAW_DIGIT (see the implementation for why this
- * is equivalent to PNG_FP_OK above.)
- */
-#define PNG_FP_NZ_MASK (PNG_FP_SAW_DIGIT | PNG_FP_NEGATIVE | PNG_FP_NONZERO)
-   /* NZ_MASK: the string is valid and a non-zero negative value */
-#define PNG_FP_Z_MASK (PNG_FP_SAW_DIGIT | PNG_FP_NONZERO)
-   /* Z MASK: the string is valid and a non-zero value. */
-   /* PNG_FP_SAW_DIGIT: the string is valid. */
-#define PNG_FP_IS_ZERO(state) (((state) & PNG_FP_Z_MASK) == PNG_FP_SAW_DIGIT)
-#define PNG_FP_IS_POSITIVE(state) (((state) & PNG_FP_NZ_MASK) == PNG_FP_Z_MASK)
-#define PNG_FP_IS_NEGATIVE(state) (((state) & PNG_FP_NZ_MASK) == PNG_FP_NZ_MASK)
- 
-/* The actual parser.  This can be called repeatedly, it updates
- * the index into the string and the state variable (which must
- * be initialzed to 0).  It returns a result code, as above.  There
- * is no point calling the parser any more if it fails to advance to
- * the end of the string - it is stuck on an invalid character (or
- * terminated by '\0').
- *
- * Note that the pointer will consume an E or even an E+ then leave
- * a 'maybe' state even though a preceding integer.fraction is valid.
- * The PNG_FP_WAS_VALID flag indicates that a preceding substring was
- * a valid number.  It's possible to recover from this by calling
- * the parser again (from the start, with state 0) but with a string
- * that omits the last character (i.e. set the size to the index of
- * the problem character.)  This has not been tested within libpng.
- */
-PNG_EXTERN int png_check_fp_number PNGARG((png_const_charp string,
-    png_size_t size, int *statep, png_size_tp whereami));
-
-/* This is the same but it checks a complete string and returns true
- * only if it just contains a floating point number.  As of 1.5.4 this
- * function also returns the state at the end of parsing the number if
- * it was valid (otherwise it returns 0.)  This can be used for testing
- * for negative or zero values using the sticky flag.
- */
-PNG_EXTERN int png_check_fp_string PNGARG((png_const_charp string,
-    png_size_t size));
-#endif /* pCAL || sCAL */
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) ||\
-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
-/* Added at libpng version 1.5.0 */
-/* This is a utility to provide a*times/div (rounded) and indicate
- * if there is an overflow.  The result is a boolean - false (0)
- * for overflow, true (1) if no overflow, in which case *res
- * holds the result.
- */
-PNG_EXTERN int png_muldiv PNGARG((png_fixed_point_p res, png_fixed_point a,
-    png_int_32 multiplied_by, png_int_32 divided_by));
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-/* Same deal, but issue a warning on overflow and return 0. */
-PNG_EXTERN png_fixed_point png_muldiv_warn PNGARG((png_structp png_ptr,
-    png_fixed_point a, png_int_32 multiplied_by, png_int_32 divided_by));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* Calculate a reciprocal - used for gamma values.  This returns
- * 0 if the argument is 0 in order to maintain an undefined value,
- * there are no warnings.
- */
-PNG_EXTERN png_fixed_point png_reciprocal PNGARG((png_fixed_point a));
-
-/* The same but gives a reciprocal of the product of two fixed point
- * values.  Accuracy is suitable for gamma calculations but this is
- * not exact - use png_muldiv for that.
- */
-PNG_EXTERN png_fixed_point png_reciprocal2 PNGARG((png_fixed_point a,
-    png_fixed_point b));
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* Internal fixed point gamma correction.  These APIs are called as
- * required to convert single values - they don't need to be fast,
- * they are not used when processing image pixel values.
- *
- * While the input is an 'unsigned' value it must actually be the
- * correct bit value - 0..255 or 0..65535 as required.
- */
-PNG_EXTERN png_uint_16 png_gamma_correct PNGARG((png_structp png_ptr,
-    unsigned int value, png_fixed_point gamma_value));
-PNG_EXTERN int png_gamma_significant PNGARG((png_fixed_point gamma_value));
-PNG_EXTERN png_uint_16 png_gamma_16bit_correct PNGARG((unsigned int value,
-    png_fixed_point gamma_value));
-PNG_EXTERN png_byte png_gamma_8bit_correct PNGARG((unsigned int value,
-    png_fixed_point gamma_value));
-PNG_EXTERN void png_destroy_gamma_table(png_structp png_ptr);
-PNG_EXTERN void png_build_gamma_table PNGARG((png_structp png_ptr,
-    int bit_depth));
-#endif
-
-/* Maintainer: Put new private prototypes here ^ and in libpngpf.3 */
-
-#include "pngdebug.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* PNGPRIV_H */
diff --git a/Source/3rd Party/wx/src/png/pngread.c b/Source/3rd Party/wx/src/png/pngread.c
index e2641d540..22240227d 100644
--- a/Source/3rd Party/wx/src/png/pngread.c	
+++ b/Source/3rd Party/wx/src/png/pngread.c	
@@ -1,1308 +1,1453 @@
-
-/* pngread.c - read a PNG file
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file contains routines that an application calls directly to
- * read a PNG file or stream.
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Create a PNG structure for reading, and allocate any memory needed. */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_read_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
-{
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
-       warn_fn, NULL, NULL, NULL));
-}
-
-/* Alternate create PNG structure for reading, and allocate any memory
- * needed.
- */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
-{
-#endif /* PNG_USER_MEM_SUPPORTED */
-
-#ifdef PNG_SETJMP_SUPPORTED
-   volatile
-#endif
-   png_structp png_ptr;
-   volatile int png_cleanup_needed = 0;
-
-#ifdef PNG_SETJMP_SUPPORTED
-#ifdef USE_FAR_KEYWORD
-   jmp_buf tmp_jmpbuf;
-#endif
-#endif
-
-   png_debug(1, "in png_create_read_struct");
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
-       malloc_fn, mem_ptr);
-#else
-   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
-#endif
-   if (png_ptr == NULL)
-      return (NULL);
-
-   /* Added at libpng-1.2.6 */
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
-   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
-
-#  ifdef PNG_USER_CHUNK_CACHE_MAX
-   /* Added at libpng-1.2.43 and 1.4.0 */
-   png_ptr->user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
-#  endif
-
-#  ifdef PNG_SET_USER_CHUNK_MALLOC_MAX
-   /* Added at libpng-1.2.43 and 1.4.1 */
-   png_ptr->user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
-#  endif
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* Applications that neglect to set up their own setjmp() and then
- * encounter a png_error() will longjmp here.  Since the jmpbuf is
- * then meaningless we abort instead of returning.
- */
-#ifdef USE_FAR_KEYWORD
-   if (setjmp(tmp_jmpbuf))
-#else
-   if (setjmp(png_jmpbuf(png_ptr))) /* Sets longjmp to match setjmp */
-#endif
-      PNG_ABORT();
-#ifdef USE_FAR_KEYWORD
-   png_memcpy(png_jmpbuf(png_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));
-#endif
-#endif /* PNG_SETJMP_SUPPORTED */
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
-#endif
-
-   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
-
-   /* Call the general version checker (shared with read and write code): */
-   if (!png_user_version_check(png_ptr, user_png_ver))
-      png_cleanup_needed = 1;
-
-   if (!png_cleanup_needed)
-   {
-   /* Initialize zbuf - compression buffer */
-   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
-   png_ptr->zbuf = (png_bytep)png_malloc_warn(png_ptr, png_ptr->zbuf_size);
-
-   if (png_ptr->zbuf == NULL)
-      png_cleanup_needed = 1;
-   }
-
-   png_ptr->zstream.zalloc = png_zalloc;
-   png_ptr->zstream.zfree = png_zfree;
-   png_ptr->zstream.opaque = (voidpf)png_ptr;
-
-   if (!png_cleanup_needed)
-   {
-      switch (inflateInit(&png_ptr->zstream))
-      {
-         case Z_OK:
-            break; /* Do nothing */
-
-         case Z_MEM_ERROR:
-            png_warning(png_ptr, "zlib memory error");
-            png_cleanup_needed = 1;
-            break;
-
-         case Z_STREAM_ERROR:
-            png_warning(png_ptr, "zlib stream error");
-            png_cleanup_needed = 1;
-            break;
-
-         case Z_VERSION_ERROR:
-            png_warning(png_ptr, "zlib version error");
-            png_cleanup_needed = 1;
-            break;
-
-         default: png_warning(png_ptr, "Unknown zlib error");
-            png_cleanup_needed = 1;
-      }
-   }
-
-   if (png_cleanup_needed)
-   {
-      /* Clean up PNG structure and deallocate any memory. */
-      png_free(png_ptr, png_ptr->zbuf);
-      png_ptr->zbuf = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)png_ptr,
-          (png_free_ptr)free_fn, (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)png_ptr);
-#endif
-      return (NULL);
-   }
-
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-
-   png_set_read_fn(png_ptr, NULL, NULL);
-
-
-   return (png_ptr);
-}
-
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the information before the actual image data.  This has been
- * changed in v0.90 to allow reading a file that already has the magic
- * bytes read from the stream.  You can tell libpng how many bytes have
- * been read from the beginning of the stream (up to the maximum of 8)
- * via png_set_sig_bytes(), and we will only check the remaining bytes
- * here.  The application can then have access to the signature bytes we
- * read if it is determined that this isn't a valid PNG file.
- */
-void PNGAPI
-png_read_info(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_read_info");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Read and check the PNG file signature. */
-   png_read_sig(png_ptr, info_ptr);
-
-   for (;;)
-   {
-      png_uint_32 length = png_read_chunk_header(png_ptr);
-      png_uint_32 chunk_name = png_ptr->chunk_name;
-
-      /* This should be a binary subdivision search or a hash for
-       * matching the chunk name rather than a linear search.
-       */
-      if (chunk_name == png_IDAT)
-         if (png_ptr->mode & PNG_AFTER_IDAT)
-            png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-
-      if (chunk_name == png_IHDR)
-         png_handle_IHDR(png_ptr, info_ptr, length);
-
-      else if (chunk_name == png_IEND)
-         png_handle_IEND(png_ptr, info_ptr, length);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      else if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
-         PNG_HANDLE_CHUNK_AS_DEFAULT)
-      {
-         if (chunk_name == png_IDAT)
-            png_ptr->mode |= PNG_HAVE_IDAT;
-
-         png_handle_unknown(png_ptr, info_ptr, length);
-
-         if (chunk_name == png_PLTE)
-            png_ptr->mode |= PNG_HAVE_PLTE;
-
-         else if (chunk_name == png_IDAT)
-         {
-            if (!(png_ptr->mode & PNG_HAVE_IHDR))
-               png_error(png_ptr, "Missing IHDR before IDAT");
-
-            else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-                !(png_ptr->mode & PNG_HAVE_PLTE))
-               png_error(png_ptr, "Missing PLTE before IDAT");
-
-            break;
-         }
-      }
-#endif
-      else if (chunk_name == png_PLTE)
-         png_handle_PLTE(png_ptr, info_ptr, length);
-
-      else if (chunk_name == png_IDAT)
-      {
-         if (!(png_ptr->mode & PNG_HAVE_IHDR))
-            png_error(png_ptr, "Missing IHDR before IDAT");
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-             !(png_ptr->mode & PNG_HAVE_PLTE))
-            png_error(png_ptr, "Missing PLTE before IDAT");
-
-         png_ptr->idat_size = length;
-         png_ptr->mode |= PNG_HAVE_IDAT;
-         break;
-      }
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (chunk_name == png_bKGD)
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (chunk_name == png_cHRM)
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (chunk_name == png_gAMA)
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (chunk_name == png_hIST)
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (chunk_name == png_oFFs)
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (chunk_name == png_pCAL)
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (chunk_name == png_sCAL)
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (chunk_name == png_pHYs)
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (chunk_name == png_sBIT)
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (chunk_name == png_sRGB)
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (chunk_name == png_iCCP)
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (chunk_name == png_sPLT)
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (chunk_name == png_tEXt)
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (chunk_name == png_tIME)
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (chunk_name == png_tRNS)
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (chunk_name == png_zTXt)
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (chunk_name == png_iTXt)
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
-
-      else
-         png_handle_unknown(png_ptr, info_ptr, length);
-   }
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-/* Optional call to update the users info_ptr structure */
-void PNGAPI
-png_read_update_info(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_read_update_info");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_read_start_row(png_ptr);
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   png_read_transform_info(png_ptr, info_ptr);
-#else
-   PNG_UNUSED(info_ptr)
-#endif
-}
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Initialize palette, background, etc, after transformations
- * are set, but before any reading takes place.  This allows
- * the user to obtain a gamma-corrected palette, for example.
- * If the user doesn't call this, we will do it ourselves.
- */
-void PNGAPI
-png_start_read_image(png_structp png_ptr)
-{
-   png_debug(1, "in png_start_read_image");
-
-   if (png_ptr != NULL)
-     png_read_start_row(png_ptr);
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-void PNGAPI
-png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
-{
-   int ret;
-
-   png_row_info row_info;
-
-   if (png_ptr == NULL)
-      return;
-
-   png_debug2(1, "in png_read_row (row %lu, pass %d)",
-       (unsigned long)png_ptr->row_number, png_ptr->pass);
-
-   /* png_read_start_row sets the information (in particular iwidth) for this
-    * interlace pass.
-    */
-   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-      png_read_start_row(png_ptr);
-
-   /* 1.5.6: row_info moved out of png_struct to a local here. */
-   row_info.width = png_ptr->iwidth; /* NOTE: width of current interlaced row */
-   row_info.color_type = png_ptr->color_type;
-   row_info.bit_depth = png_ptr->bit_depth;
-   row_info.channels = png_ptr->channels;
-   row_info.pixel_depth = png_ptr->pixel_depth;
-   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
-
-   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
-   {
-   /* Check for transforms that have been set but were defined out */
-#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
-   if (png_ptr->transformations & PNG_INVERT_MONO)
-      png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
-   if (png_ptr->transformations & PNG_FILLER)
-      png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
-    !defined(PNG_READ_PACKSWAP_SUPPORTED)
-   if (png_ptr->transformations & PNG_PACKSWAP)
-      png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
-   if (png_ptr->transformations & PNG_PACK)
-      png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
-   if (png_ptr->transformations & PNG_SHIFT)
-      png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
-   if (png_ptr->transformations & PNG_BGR)
-      png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined");
-#endif
-
-#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
-   if (png_ptr->transformations & PNG_SWAP_BYTES)
-      png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined");
-#endif
-   }
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* If interlaced and we do not need a new row, combine row and return.
-    * Notice that the pixels we have from previous rows have been transformed
-    * already; we can only combine like with like (transformed or
-    * untransformed) and, because of the libpng API for interlaced images, this
-    * means we must transform before de-interlacing.
-    */
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
-   {
-      switch (png_ptr->pass)
-      {
-         case 0:
-            if (png_ptr->row_number & 0x07)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 1:
-            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 2:
-            if ((png_ptr->row_number & 0x07) != 4)
-            {
-               if (dsp_row != NULL && (png_ptr->row_number & 4))
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 3:
-            if ((png_ptr->row_number & 3) || png_ptr->width < 3)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 4:
-            if ((png_ptr->row_number & 3) != 2)
-            {
-               if (dsp_row != NULL && (png_ptr->row_number & 2))
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-         case 5:
-            if ((png_ptr->row_number & 1) || png_ptr->width < 2)
-            {
-               if (dsp_row != NULL)
-                  png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         default:
-         case 6:
-            if (!(png_ptr->row_number & 1))
-            {
-               png_read_finish_row(png_ptr);
-               return;
-            }
-            break;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IDAT))
-      png_error(png_ptr, "Invalid attempt to read row data");
-
-   png_ptr->zstream.next_out = png_ptr->row_buf;
-   png_ptr->zstream.avail_out =
-       (uInt)(PNG_ROWBYTES(png_ptr->pixel_depth,
-       png_ptr->iwidth) + 1);
-
-   do
-   {
-      if (!(png_ptr->zstream.avail_in))
-      {
-         while (!png_ptr->idat_size)
-         {
-            png_crc_finish(png_ptr, 0);
-
-            png_ptr->idat_size = png_read_chunk_header(png_ptr);
-            if (png_ptr->chunk_name != png_IDAT)
-               png_error(png_ptr, "Not enough image data");
-         }
-         png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
-         png_ptr->zstream.next_in = png_ptr->zbuf;
-         if (png_ptr->zbuf_size > png_ptr->idat_size)
-            png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
-         png_crc_read(png_ptr, png_ptr->zbuf,
-             (png_size_t)png_ptr->zstream.avail_in);
-         png_ptr->idat_size -= png_ptr->zstream.avail_in;
-      }
-
-      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
-
-      if (ret == Z_STREAM_END)
-      {
-         if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
-            png_ptr->idat_size)
-            png_benign_error(png_ptr, "Extra compressed data");
-         png_ptr->mode |= PNG_AFTER_IDAT;
-         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-         break;
-      }
-
-      if (ret != Z_OK)
-         png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
-             "Decompression error");
-
-   } while (png_ptr->zstream.avail_out);
-
-   if (png_ptr->row_buf[0] > PNG_FILTER_VALUE_NONE)
-   {
-      if (png_ptr->row_buf[0] < PNG_FILTER_VALUE_LAST)
-         png_read_filter_row(png_ptr, &row_info, png_ptr->row_buf + 1,
-            png_ptr->prev_row + 1, png_ptr->row_buf[0]);
-      else
-         png_error(png_ptr, "bad adaptive filter value");
-   }
-
-   /* libpng 1.5.6: the following line was copying png_ptr->rowbytes before
-    * 1.5.6, while the buffer really is this big in current versions of libpng
-    * it may not be in the future, so this was changed just to copy the
-    * interlaced count:
-    */
-   png_memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-       (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
-   {
-      /* Intrapixel differencing */
-      png_do_read_intrapixel(&row_info, png_ptr->row_buf + 1);
-   }
-#endif
-
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   if (png_ptr->transformations)
-      png_do_read_transformations(png_ptr, &row_info);
-#endif
-
-   /* The transformed pixel depth should match the depth now in row_info. */
-   if (png_ptr->transformed_pixel_depth == 0)
-   {
-      png_ptr->transformed_pixel_depth = row_info.pixel_depth;
-      if (row_info.pixel_depth > png_ptr->maximum_pixel_depth)
-         png_error(png_ptr, "sequential row overflow");
-   }
-
-   else if (png_ptr->transformed_pixel_depth != row_info.pixel_depth)
-      png_error(png_ptr, "internal sequential row size calculation error");
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Blow up interlaced rows to full size */
-   if (png_ptr->interlaced &&
-      (png_ptr->transformations & PNG_INTERLACE))
-   {
-      if (png_ptr->pass < 6)
-         png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
-            png_ptr->transformations);
-
-      if (dsp_row != NULL)
-         png_combine_row(png_ptr, dsp_row, 1/*display*/);
-
-      if (row != NULL)
-         png_combine_row(png_ptr, row, 0/*row*/);
-   }
-
-   else
-#endif
-   {
-      if (row != NULL)
-         png_combine_row(png_ptr, row, -1/*ignored*/);
-
-      if (dsp_row != NULL)
-         png_combine_row(png_ptr, dsp_row, -1/*ignored*/);
-   }
-   png_read_finish_row(png_ptr);
-
-   if (png_ptr->read_row_fn != NULL)
-      (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read one or more rows of image data.  If the image is interlaced,
- * and png_set_interlace_handling() has been called, the rows need to
- * contain the contents of the rows from the previous pass.  If the
- * image has alpha or transparency, and png_handle_alpha()[*] has been
- * called, the rows contents must be initialized to the contents of the
- * screen.
- *
- * "row" holds the actual image, and pixels are placed in it
- * as they arrive.  If the image is displayed after each pass, it will
- * appear to "sparkle" in.  "display_row" can be used to display a
- * "chunky" progressive image, with finer detail added as it becomes
- * available.  If you do not want this "chunky" display, you may pass
- * NULL for display_row.  If you do not want the sparkle display, and
- * you have not called png_handle_alpha(), you may pass NULL for rows.
- * If you have called png_handle_alpha(), and the image has either an
- * alpha channel or a transparency chunk, you must provide a buffer for
- * rows.  In this case, you do not have to provide a display_row buffer
- * also, but you may.  If the image is not interlaced, or if you have
- * not called png_set_interlace_handling(), the display_row buffer will
- * be ignored, so pass NULL to it.
- *
- * [*] png_handle_alpha() does not exist yet, as of this version of libpng
- */
-
-void PNGAPI
-png_read_rows(png_structp png_ptr, png_bytepp row,
-    png_bytepp display_row, png_uint_32 num_rows)
-{
-   png_uint_32 i;
-   png_bytepp rp;
-   png_bytepp dp;
-
-   png_debug(1, "in png_read_rows");
-
-   if (png_ptr == NULL)
-      return;
-
-   rp = row;
-   dp = display_row;
-   if (rp != NULL && dp != NULL)
-      for (i = 0; i < num_rows; i++)
-      {
-         png_bytep rptr = *rp++;
-         png_bytep dptr = *dp++;
-
-         png_read_row(png_ptr, rptr, dptr);
-      }
-
-   else if (rp != NULL)
-      for (i = 0; i < num_rows; i++)
-      {
-         png_bytep rptr = *rp;
-         png_read_row(png_ptr, rptr, NULL);
-         rp++;
-      }
-
-   else if (dp != NULL)
-      for (i = 0; i < num_rows; i++)
-      {
-         png_bytep dptr = *dp;
-         png_read_row(png_ptr, NULL, dptr);
-         dp++;
-      }
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the entire image.  If the image has an alpha channel or a tRNS
- * chunk, and you have called png_handle_alpha()[*], you will need to
- * initialize the image to the current image that PNG will be overlaying.
- * We set the num_rows again here, in case it was incorrectly set in
- * png_read_start_row() by a call to png_read_update_info() or
- * png_start_read_image() if png_set_interlace_handling() wasn't called
- * prior to either of these functions like it should have been.  You can
- * only call this function once.  If you desire to have an image for
- * each pass of a interlaced image, use png_read_rows() instead.
- *
- * [*] png_handle_alpha() does not exist yet, as of this version of libpng
- */
-void PNGAPI
-png_read_image(png_structp png_ptr, png_bytepp image)
-{
-   png_uint_32 i, image_height;
-   int pass, j;
-   png_bytepp rp;
-
-   png_debug(1, "in png_read_image");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
-   {
-      pass = png_set_interlace_handling(png_ptr);
-      /* And make sure transforms are initialized. */
-      png_start_read_image(png_ptr);
-   }
-   else
-   {
-      if (png_ptr->interlaced && !(png_ptr->transformations & PNG_INTERLACE))
-      {
-         /* Caller called png_start_read_image or png_read_update_info without
-          * first turning on the PNG_INTERLACE transform.  We can fix this here,
-          * but the caller should do it!
-          */
-         png_warning(png_ptr, "Interlace handling should be turned on when "
-            "using png_read_image");
-         /* Make sure this is set correctly */
-         png_ptr->num_rows = png_ptr->height;
-      }
-
-      /* Obtain the pass number, which also turns on the PNG_INTERLACE flag in
-       * the above error case.
-       */
-      pass = png_set_interlace_handling(png_ptr);
-   }
-#else
-   if (png_ptr->interlaced)
-      png_error(png_ptr,
-          "Cannot read interlaced image -- interlace handler disabled");
-
-   pass = 1;
-#endif
-
-   image_height=png_ptr->height;
-
-   for (j = 0; j < pass; j++)
-   {
-      rp = image;
-      for (i = 0; i < image_height; i++)
-      {
-         png_read_row(png_ptr, *rp, NULL);
-         rp++;
-      }
-   }
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-/* Read the end of the PNG file.  Will not read past the end of the
- * file, will verify the end is accurate, and will read any comments
- * or time information at the end of the file, if info is not NULL.
- */
-void PNGAPI
-png_read_end(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_read_end");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
-
-   do
-   {
-      png_uint_32 length = png_read_chunk_header(png_ptr);
-      png_uint_32 chunk_name = png_ptr->chunk_name;
-
-      if (chunk_name == png_IHDR)
-         png_handle_IHDR(png_ptr, info_ptr, length);
-
-      else if (chunk_name == png_IEND)
-         png_handle_IEND(png_ptr, info_ptr, length);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      else if (png_chunk_unknown_handling(png_ptr, chunk_name) !=
-         PNG_HANDLE_CHUNK_AS_DEFAULT)
-      {
-         if (chunk_name == png_IDAT)
-         {
-            if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-               png_benign_error(png_ptr, "Too many IDATs found");
-         }
-         png_handle_unknown(png_ptr, info_ptr, length);
-         if (chunk_name == png_PLTE)
-            png_ptr->mode |= PNG_HAVE_PLTE;
-      }
-#endif
-
-      else if (chunk_name == png_IDAT)
-      {
-         /* Zero length IDATs are legal after the last IDAT has been
-          * read, but not after other chunks have been read.
-          */
-         if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-            png_benign_error(png_ptr, "Too many IDATs found");
-
-         png_crc_finish(png_ptr, length);
-      }
-      else if (chunk_name == png_PLTE)
-         png_handle_PLTE(png_ptr, info_ptr, length);
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (chunk_name == png_bKGD)
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (chunk_name == png_cHRM)
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (chunk_name == png_gAMA)
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (chunk_name == png_hIST)
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (chunk_name == png_oFFs)
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (chunk_name == png_pCAL)
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (chunk_name == png_sCAL)
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (chunk_name == png_pHYs)
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (chunk_name == png_sBIT)
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (chunk_name == png_sRGB)
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (chunk_name == png_iCCP)
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (chunk_name == png_sPLT)
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (chunk_name == png_tEXt)
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (chunk_name == png_tIME)
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (chunk_name == png_tRNS)
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (chunk_name == png_zTXt)
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (chunk_name == png_iTXt)
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
-
-      else
-         png_handle_unknown(png_ptr, info_ptr, length);
-   } while (!(png_ptr->mode & PNG_HAVE_IEND));
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-/* Free all memory used by the read */
-void PNGAPI
-png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
-    png_infopp end_info_ptr_ptr)
-{
-   png_structp png_ptr = NULL;
-   png_infop info_ptr = NULL, end_info_ptr = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn = NULL;
-   png_voidp mem_ptr = NULL;
-#endif
-
-   png_debug(1, "in png_destroy_read_struct");
-
-   if (png_ptr_ptr != NULL)
-      png_ptr = *png_ptr_ptr;
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   free_fn = png_ptr->free_fn;
-   mem_ptr = png_ptr->mem_ptr;
-#endif
-
-   if (info_ptr_ptr != NULL)
-      info_ptr = *info_ptr_ptr;
-
-   if (end_info_ptr_ptr != NULL)
-      end_info_ptr = *end_info_ptr_ptr;
-
-   png_read_destroy(png_ptr, info_ptr, end_info_ptr);
-
-   if (info_ptr != NULL)
-   {
-#ifdef PNG_TEXT_SUPPORTED
-      png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, -1);
-#endif
-
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)info_ptr);
-#endif
-      *info_ptr_ptr = NULL;
-   }
-
-   if (end_info_ptr != NULL)
-   {
-#ifdef PNG_READ_TEXT_SUPPORTED
-      png_free_data(png_ptr, end_info_ptr, PNG_FREE_TEXT, -1);
-#endif
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)end_info_ptr);
-#endif
-      *end_info_ptr_ptr = NULL;
-   }
-
-   if (png_ptr != NULL)
-   {
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)png_ptr);
-#endif
-      *png_ptr_ptr = NULL;
-   }
-}
-
-/* Free all memory used by the read (old method) */
-void /* PRIVATE */
-png_read_destroy(png_structp png_ptr, png_infop info_ptr,
-    png_infop end_info_ptr)
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf tmp_jmp;
-#endif
-   png_error_ptr error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_error_ptr warning_fn;
-#endif
-   png_voidp error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn;
-#endif
-
-   png_debug(1, "in png_read_destroy");
-
-   if (info_ptr != NULL)
-      png_info_destroy(png_ptr, info_ptr);
-
-   if (end_info_ptr != NULL)
-      png_info_destroy(png_ptr, end_info_ptr);
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   png_destroy_gamma_table(png_ptr);
-#endif
-
-   png_free(png_ptr, png_ptr->zbuf);
-   png_free(png_ptr, png_ptr->big_row_buf);
-   png_free(png_ptr, png_ptr->big_prev_row);
-   png_free(png_ptr, png_ptr->chunkdata);
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   png_free(png_ptr, png_ptr->palette_lookup);
-   png_free(png_ptr, png_ptr->quantize_index);
-#endif
-
-   if (png_ptr->free_me & PNG_FREE_PLTE)
-      png_zfree(png_ptr, png_ptr->palette);
-   png_ptr->free_me &= ~PNG_FREE_PLTE;
-
-#if defined(PNG_tRNS_SUPPORTED) || \
-    defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   if (png_ptr->free_me & PNG_FREE_TRNS)
-      png_free(png_ptr, png_ptr->trans_alpha);
-   png_ptr->free_me &= ~PNG_FREE_TRNS;
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-   if (png_ptr->free_me & PNG_FREE_HIST)
-      png_free(png_ptr, png_ptr->hist);
-   png_ptr->free_me &= ~PNG_FREE_HIST;
-#endif
-
-   inflateEnd(&png_ptr->zstream);
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-   png_free(png_ptr, png_ptr->save_buffer);
-#endif
-
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-#ifdef PNG_TEXT_SUPPORTED
-   png_free(png_ptr, png_ptr->current_text);
-#endif /* PNG_TEXT_SUPPORTED */
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-   /* Save the important info out of the png_struct, in case it is
-    * being used again.
-    */
-#ifdef PNG_SETJMP_SUPPORTED
-   png_memcpy(tmp_jmp, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
-#endif
-
-   error_fn = png_ptr->error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   warning_fn = png_ptr->warning_fn;
-#endif
-   error_ptr = png_ptr->error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   free_fn = png_ptr->free_fn;
-#endif
-
-   png_memset(png_ptr, 0, png_sizeof(png_struct));
-
-   png_ptr->error_fn = error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_ptr->warning_fn = warning_fn;
-#endif
-   png_ptr->error_ptr = error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr->free_fn = free_fn;
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   png_memcpy(png_ptr->longjmp_buffer, tmp_jmp, png_sizeof(jmp_buf));
-#endif
-
-}
-
-void PNGAPI
-png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->read_row_fn = read_row_fn;
-}
-
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-void PNGAPI
-png_read_png(png_structp png_ptr, png_infop info_ptr,
-                           int transforms,
-                           voidp params)
-{
-   int row;
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* png_read_info() gives us all of the information from the
-    * PNG file before the first IDAT (image data chunk).
-    */
-   png_read_info(png_ptr, info_ptr);
-   if (info_ptr->height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
-      png_error(png_ptr, "Image is too high to process with png_read_png()");
-
-   /* -------------- image transformations start here ------------------- */
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-   /* Tell libpng to strip 16-bit/color files down to 8 bits per color.
-    */
-   if (transforms & PNG_TRANSFORM_SCALE_16)
-   {
-     /* Added at libpng-1.5.4. "strip_16" produces the same result that it
-      * did in earlier versions, while "scale_16" is now more accurate.
-      */
-      png_set_scale_16(png_ptr);
-   }
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-   /* If both SCALE and STRIP are required pngrtran will effectively cancel the
-    * latter by doing SCALE first.  This is ok and allows apps not to check for
-    * which is supported to get the right answer.
-    */
-   if (transforms & PNG_TRANSFORM_STRIP_16)
-      png_set_strip_16(png_ptr);
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   /* Strip alpha bytes from the input data without combining with
-    * the background (not recommended).
-    */
-   if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
-      png_set_strip_alpha(png_ptr);
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) && !defined(PNG_READ_EXPAND_SUPPORTED)
-   /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
-    * byte into separate bytes (useful for paletted and grayscale images).
-    */
-   if (transforms & PNG_TRANSFORM_PACKING)
-      png_set_packing(png_ptr);
-#endif
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-   /* Change the order of packed pixels to least significant bit first
-    * (not useful if you are using png_set_packing).
-    */
-   if (transforms & PNG_TRANSFORM_PACKSWAP)
-      png_set_packswap(png_ptr);
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   /* Expand paletted colors into true RGB triplets
-    * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
-    * Expand paletted or RGB images with transparency to full alpha
-    * channels so the data will be available as RGBA quartets.
-    */
-   if (transforms & PNG_TRANSFORM_EXPAND)
-      if ((png_ptr->bit_depth < 8) ||
-          (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
-          (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
-         png_set_expand(png_ptr);
-#endif
-
-   /* We don't handle background color or gamma transformation or quantizing.
-    */
-
-#ifdef PNG_READ_INVERT_SUPPORTED
-   /* Invert monochrome files to have 0 as white and 1 as black
-    */
-   if (transforms & PNG_TRANSFORM_INVERT_MONO)
-      png_set_invert_mono(png_ptr);
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-   /* If you want to shift the pixel values from the range [0,255] or
-    * [0,65535] to the original [0,7] or [0,31], or whatever range the
-    * colors were originally in:
-    */
-   if ((transforms & PNG_TRANSFORM_SHIFT)
-       && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
-   {
-      png_color_8p sig_bit;
-
-      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-      png_set_shift(png_ptr, sig_bit);
-   }
-#endif
-
-#ifdef PNG_READ_BGR_SUPPORTED
-   /* Flip the RGB pixels to BGR (or RGBA to BGRA) */
-   if (transforms & PNG_TRANSFORM_BGR)
-      png_set_bgr(png_ptr);
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-   /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
-   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
-      png_set_swap_alpha(png_ptr);
-#endif
-
-#ifdef PNG_READ_SWAP_SUPPORTED
-   /* Swap bytes of 16-bit files to least significant byte first */
-   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
-      png_set_swap(png_ptr);
-#endif
-
-/* Added at libpng-1.2.41 */
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-   /* Invert the alpha channel from opacity to transparency */
-   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
-      png_set_invert_alpha(png_ptr);
-#endif
-
-/* Added at libpng-1.2.41 */
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* Expand grayscale image to RGB */
-   if (transforms & PNG_TRANSFORM_GRAY_TO_RGB)
-      png_set_gray_to_rgb(png_ptr);
-#endif
-
-/* Added at libpng-1.5.4 */
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-   if (transforms & PNG_TRANSFORM_EXPAND_16)
-      png_set_expand_16(png_ptr);
-#endif
-
-   /* We don't handle adding filler bytes */
-
-   /* We use png_read_image and rely on that for interlace handling, but we also
-    * call png_read_update_info therefore must turn on interlace handling now:
-    */
-   (void)png_set_interlace_handling(png_ptr);
-
-   /* Optional call to gamma correct and add the background to the palette
-    * and update info structure.  REQUIRED if you are expecting libpng to
-    * update the palette for you (i.e., you selected such a transform above).
-    */
-   png_read_update_info(png_ptr, info_ptr);
-
-   /* -------------- image transformations end here ------------------- */
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
-   if (info_ptr->row_pointers == NULL)
-   {
-      png_uint_32 iptr;
-
-      info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
-          info_ptr->height * png_sizeof(png_bytep));
-      for (iptr=0; iptr<info_ptr->height; iptr++)
-         info_ptr->row_pointers[iptr] = NULL;
-
-      info_ptr->free_me |= PNG_FREE_ROWS;
-
-      for (row = 0; row < (int)info_ptr->height; row++)
-         info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
-            png_get_rowbytes(png_ptr, info_ptr));
-   }
-
-   png_read_image(png_ptr, info_ptr->row_pointers);
-   info_ptr->valid |= PNG_INFO_IDAT;
-
-   /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */
-   png_read_end(png_ptr, info_ptr);
-
-   PNG_UNUSED(transforms)   /* Quiet compiler warnings */
-   PNG_UNUSED(params)
-
-}
-#endif /* PNG_INFO_IMAGE_SUPPORTED */
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED */
+
+/* pngread.c - read a PNG file
+ *
+ * libpng 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file contains routines that an application calls directly to
+ * read a PNG file or stream.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Create a PNG structure for reading, and allocate any memory needed. */
+png_structp PNGAPI
+png_create_read_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
+      warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
+}
+
+/* Alternate create PNG structure for reading, and allocate any memory needed. */
+png_structp PNGAPI
+png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+
+   png_structp png_ptr;
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+
+   int i;
+
+   png_debug(1, "in png_create_read_struct\n");
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+      (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
+#else
+   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+#endif
+   if (png_ptr == NULL)
+      return (NULL);
+
+#if !defined(PNG_1_0_X)
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+   png_init_mmx_flags(png_ptr);   /* 1.2.0 addition */
+#endif
+#endif /* PNG_1_0_X */
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_ptr->jmpbuf))
+#endif
+   {
+      png_free(png_ptr, png_ptr->zbuf);
+      png_ptr->zbuf=NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr, 
+         (png_free_ptr)free_fn, (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      return (NULL);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_ptr->jmpbuf,jmpbuf,png_sizeof(jmp_buf));
+#endif
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif
+
+   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+   i=0;
+   do
+   {
+     if(user_png_ver[i] != png_libpng_ver[i])
+        png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+   } while (png_libpng_ver[i++]);
+
+   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+   {
+     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+      * we must recompile any applications that use any older library version.
+      * For versions after libpng 1.0, we will be compatible, so we need
+      * only check the first digit.
+      */
+     if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+         (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
+         (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+     {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+        char msg[80];
+        if (user_png_ver)
+        {
+          sprintf(msg, "Application was compiled with png.h from libpng-%.20s",
+             user_png_ver);
+          png_warning(png_ptr, msg);
+        }
+        sprintf(msg, "Application  is  running with png.c from libpng-%.20s",
+           png_libpng_ver);
+        png_warning(png_ptr, msg);
+#endif
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+        png_ptr->flags=0;
+#endif
+        png_error(png_ptr,
+           "Incompatible libpng version in application and library");
+     }
+   }
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+   switch (inflateInit(&png_ptr->zstream))
+   {
+     case Z_OK: /* Do nothing */ break;
+     case Z_MEM_ERROR:
+     case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory error"); break;
+     case Z_VERSION_ERROR: png_error(png_ptr, "zlib version error"); break;
+     default: png_error(png_ptr, "Unknown zlib error");
+   }
+
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+   png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* Applications that neglect to set up their own setjmp() and then encounter
+   a png_error() will longjmp here.  Since the jmpbuf is then meaningless we
+   abort instead of returning. */
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+      PNG_ABORT();
+   png_memcpy(png_ptr->jmpbuf,jmpbuf,png_sizeof(jmp_buf));
+#else
+   if (setjmp(png_ptr->jmpbuf))
+      PNG_ABORT();
+#endif
+#endif
+   return (png_ptr);
+}
+
+/* Initialize PNG structure for reading, and allocate any memory needed.
+   This interface is deprecated in favour of the png_create_read_struct(),
+   and it will eventually disappear. */
+#undef png_read_init
+void PNGAPI
+png_read_init(png_structp png_ptr)
+{
+   /* We only come here via pre-1.0.7-compiled applications */
+   png_read_init_2(png_ptr, "1.0.6 or earlier", 0, 0);
+}
+
+void PNGAPI
+png_read_init_2(png_structp png_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size, png_size_t png_info_size)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+   if(png_sizeof(png_struct) > png_struct_size || 
+      png_sizeof(png_info) > png_info_size)
+   {
+      char msg[80];
+      png_ptr->warning_fn=NULL;
+      if (user_png_ver)
+      {
+        sprintf(msg, "Application was compiled with png.h from libpng-%.20s",
+           user_png_ver);
+        png_warning(png_ptr, msg);
+      }
+      sprintf(msg, "Application  is  running with png.c from libpng-%.20s",
+         png_libpng_ver);
+      png_warning(png_ptr, msg);
+   }
+#endif
+   if(png_sizeof(png_struct) > png_struct_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+       "The png struct allocated by the application for reading is too small.");
+     }
+   if(png_sizeof(png_info) > png_info_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+         "The info struct allocated by application for reading is too small.");
+     }
+   png_read_init_3(&png_ptr, user_png_ver, png_struct_size);
+}
+
+void PNGAPI
+png_read_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp;  /* to save current jump buffer */
+#endif
+
+   int i=0;
+
+   png_structp png_ptr=*ptr_ptr;
+
+   do
+   {
+     if(user_png_ver[i] != png_libpng_ver[i])
+     {
+#ifdef PNG_LEGACY_SUPPORTED
+       png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+#else
+       png_ptr->warning_fn=NULL;
+       png_warning(png_ptr,
+        "Application uses deprecated png_read_init() and should be recompiled.");
+       break;
+#endif
+     }
+   } while (png_libpng_ver[i++]);
+
+   png_debug(1, "in png_read_init_3\n");
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* save jump buffer and error functions */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof (jmp_buf));
+#endif
+
+   if(png_sizeof(png_struct) > png_struct_size)
+     {
+       png_destroy_struct(png_ptr);
+       *ptr_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+       png_ptr = *ptr_ptr;
+     }
+
+   /* reset all variables to 0 */
+   png_memset(png_ptr, 0, png_sizeof (png_struct));
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* restore jump buffer */
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof (jmp_buf));
+#endif
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+     (png_uint_32)png_ptr->zbuf_size);
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+
+   switch (inflateInit(&png_ptr->zstream))
+   {
+     case Z_OK: /* Do nothing */ break;
+     case Z_MEM_ERROR:
+     case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory"); break;
+     case Z_VERSION_ERROR: png_error(png_ptr, "zlib version"); break;
+     default: png_error(png_ptr, "Unknown zlib error");
+   }
+
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+   png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
+}
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the information before the actual image data.  This has been
+ * changed in v0.90 to allow reading a file that already has the magic
+ * bytes read from the stream.  You can tell libpng how many bytes have
+ * been read from the beginning of the stream (up to the maximum of 8)
+ * via png_set_sig_bytes(), and we will only check the remaining bytes
+ * here.  The application can then have access to the signature bytes we
+ * read if it is determined that this isn't a valid PNG file.
+ */
+void PNGAPI
+png_read_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_info\n");
+   /* If we haven't checked all of the PNG signature bytes, do so now. */
+   if (png_ptr->sig_bytes < 8)
+   {
+      png_size_t num_checked = png_ptr->sig_bytes,
+                 num_to_check = 8 - num_checked;
+
+      png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
+      png_ptr->sig_bytes = 8;
+
+      if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+      {
+         if (num_checked < 4 &&
+             png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
+            png_error(png_ptr, "Not a PNG file");
+         else
+            png_error(png_ptr, "PNG file corrupted by ASCII conversion");
+      }
+      if (num_checked < 3)
+         png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
+   }
+
+   for(;;)
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_IHDR;
+      PNG_IDAT;
+      PNG_IEND;
+      PNG_PLTE;
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      PNG_bKGD;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      PNG_cHRM;
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      PNG_gAMA;
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      PNG_hIST;
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      PNG_iCCP;
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      PNG_iTXt;
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      PNG_oFFs;
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      PNG_pCAL;
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      PNG_pHYs;
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      PNG_sBIT;
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      PNG_sCAL;
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      PNG_sPLT;
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      PNG_sRGB;
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      PNG_tEXt;
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      PNG_tIME;
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      PNG_tRNS;
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      PNG_zTXt;
+#endif
+#endif /* PNG_GLOBAL_ARRAYS */
+      png_byte chunk_length[4];
+      png_uint_32 length;
+
+      png_read_data(png_ptr, chunk_length, 4);
+      length = png_get_uint_31(png_ptr,chunk_length);
+
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+
+      png_debug2(0, "Reading %s chunk, length=%lu.\n", png_ptr->chunk_name,
+         length);
+
+      /* This should be a binary subdivision search or a hash for
+       * matching the chunk name rather than a linear search.
+       */
+      if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+         png_handle_IHDR(png_ptr, info_ptr, length);
+      else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+         png_handle_IEND(png_ptr, info_ptr, length);
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+      else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
+      {
+         if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+            png_ptr->mode |= PNG_HAVE_IDAT;
+         png_handle_unknown(png_ptr, info_ptr, length);
+         if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+            png_ptr->mode |= PNG_HAVE_PLTE;
+         else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+         {
+            if (!(png_ptr->mode & PNG_HAVE_IHDR))
+               png_error(png_ptr, "Missing IHDR before IDAT");
+            else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                     !(png_ptr->mode & PNG_HAVE_PLTE))
+               png_error(png_ptr, "Missing PLTE before IDAT");
+            break;
+         }
+      }
+#endif
+      else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+         png_handle_PLTE(png_ptr, info_ptr, length);
+      else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         if (!(png_ptr->mode & PNG_HAVE_IHDR))
+            png_error(png_ptr, "Missing IHDR before IDAT");
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+                  !(png_ptr->mode & PNG_HAVE_PLTE))
+            png_error(png_ptr, "Missing PLTE before IDAT");
+
+         png_ptr->idat_size = length;
+         png_ptr->mode |= PNG_HAVE_IDAT;
+         break;
+      }
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+         png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+         png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+         png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+         png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+         png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+         png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
+         png_handle_sCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+         png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+         png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+         png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
+         png_handle_iCCP(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
+         png_handle_sPLT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+         png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+         png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+         png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+         png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
+         png_handle_iTXt(png_ptr, info_ptr, length);
+#endif
+      else
+         png_handle_unknown(png_ptr, info_ptr, length);
+   }
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+/* optional call to update the users info_ptr structure */
+void PNGAPI
+png_read_update_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_update_info\n");
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+   else
+      png_warning(png_ptr,
+      "Ignoring extra png_read_update_info() call; row buffer not reallocated");
+   png_read_transform_info(png_ptr, info_ptr);
+}
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Initialize palette, background, etc, after transformations
+ * are set, but before any reading takes place.  This allows
+ * the user to obtain a gamma-corrected palette, for example.
+ * If the user doesn't call this, we will do it ourselves.
+ */
+void PNGAPI
+png_start_read_image(png_structp png_ptr)
+{
+   png_debug(1, "in png_start_read_image\n");
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+void PNGAPI
+png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IDAT;
+   const int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff};
+   const int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
+#endif
+   int ret;
+   png_debug2(1, "in png_read_row (row %lu, pass %d)\n",
+      png_ptr->row_number, png_ptr->pass);
+   if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+      png_read_start_row(png_ptr);
+   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+   {
+   /* check for transforms that have been set but were defined out */
+#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && !defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined.");
+#endif
+#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined.");
+#endif
+   }
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+   /* if interlaced and we do not need a new row, combine row and return */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      switch (png_ptr->pass)
+      {
+         case 0:
+            if (png_ptr->row_number & 0x07)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 1:
+            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 2:
+            if ((png_ptr->row_number & 0x07) != 4)
+            {
+               if (dsp_row != NULL && (png_ptr->row_number & 4))
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 3:
+            if ((png_ptr->row_number & 3) || png_ptr->width < 3)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 4:
+            if ((png_ptr->row_number & 3) != 2)
+            {
+               if (dsp_row != NULL && (png_ptr->row_number & 2))
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 5:
+            if ((png_ptr->row_number & 1) || png_ptr->width < 2)
+            {
+               if (dsp_row != NULL)
+                  png_combine_row(png_ptr, dsp_row,
+                     png_pass_dsp_mask[png_ptr->pass]);
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 6:
+            if (!(png_ptr->row_number & 1))
+            {
+               png_read_finish_row(png_ptr);
+               return;
+            }
+            break;
+      }
+   }
+#endif
+
+   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+      png_error(png_ptr, "Invalid attempt to read row data");
+
+   png_ptr->zstream.next_out = png_ptr->row_buf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->irowbytes;
+   do
+   {
+      if (!(png_ptr->zstream.avail_in))
+      {
+         while (!png_ptr->idat_size)
+         {
+            png_byte chunk_length[4];
+
+            png_crc_finish(png_ptr, 0);
+
+            png_read_data(png_ptr, chunk_length, 4);
+            png_ptr->idat_size = png_get_uint_31(png_ptr,chunk_length);
+
+            png_reset_crc(png_ptr);
+            png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+            if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+               png_error(png_ptr, "Not enough image data");
+         }
+         png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+         png_ptr->zstream.next_in = png_ptr->zbuf;
+         if (png_ptr->zbuf_size > png_ptr->idat_size)
+            png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+         png_crc_read(png_ptr, png_ptr->zbuf,
+            (png_size_t)png_ptr->zstream.avail_in);
+         png_ptr->idat_size -= png_ptr->zstream.avail_in;
+      }
+      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+      if (ret == Z_STREAM_END)
+      {
+         if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
+            png_ptr->idat_size)
+            png_error(png_ptr, "Extra compressed data");
+         png_ptr->mode |= PNG_AFTER_IDAT;
+         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         break;
+      }
+      if (ret != Z_OK)
+         png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+                   "Decompression error");
+
+   } while (png_ptr->zstream.avail_out);
+
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->iwidth;
+   png_ptr->row_info.channels = png_ptr->channels;
+   png_ptr->row_info.bit_depth = png_ptr->bit_depth;
+   png_ptr->row_info.pixel_depth = png_ptr->pixel_depth;
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+       png_ptr->row_info.width);
+
+   if(png_ptr->row_buf[0])
+   png_read_filter_row(png_ptr, &(png_ptr->row_info),
+      png_ptr->row_buf + 1, png_ptr->prev_row + 1,
+      (int)(png_ptr->row_buf[0]));
+
+   png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+      png_ptr->rowbytes + 1);
+   
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   if((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
+   {
+      /* Intrapixel differencing */
+      png_do_read_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
+   }
+#endif
+
+   if (png_ptr->transformations)
+      png_do_read_transformations(png_ptr);
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+   /* blow up interlaced rows to full size */
+   if (png_ptr->interlaced &&
+      (png_ptr->transformations & PNG_INTERLACE))
+   {
+      if (png_ptr->pass < 6)
+/*       old interface (pre-1.0.9):
+         png_do_read_interlace(&(png_ptr->row_info),
+            png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);
+ */
+         png_do_read_interlace(png_ptr);
+
+      if (dsp_row != NULL)
+         png_combine_row(png_ptr, dsp_row,
+            png_pass_dsp_mask[png_ptr->pass]);
+      if (row != NULL)
+         png_combine_row(png_ptr, row,
+            png_pass_mask[png_ptr->pass]);
+   }
+   else
+#endif
+   {
+      if (row != NULL)
+         png_combine_row(png_ptr, row, 0xff);
+      if (dsp_row != NULL)
+         png_combine_row(png_ptr, dsp_row, 0xff);
+   }
+   png_read_finish_row(png_ptr);
+
+   if (png_ptr->read_row_fn != NULL)
+      (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read one or more rows of image data.  If the image is interlaced,
+ * and png_set_interlace_handling() has been called, the rows need to
+ * contain the contents of the rows from the previous pass.  If the
+ * image has alpha or transparency, and png_handle_alpha()[*] has been
+ * called, the rows contents must be initialized to the contents of the
+ * screen.
+ *
+ * "row" holds the actual image, and pixels are placed in it
+ * as they arrive.  If the image is displayed after each pass, it will
+ * appear to "sparkle" in.  "display_row" can be used to display a
+ * "chunky" progressive image, with finer detail added as it becomes
+ * available.  If you do not want this "chunky" display, you may pass
+ * NULL for display_row.  If you do not want the sparkle display, and
+ * you have not called png_handle_alpha(), you may pass NULL for rows.
+ * If you have called png_handle_alpha(), and the image has either an
+ * alpha channel or a transparency chunk, you must provide a buffer for
+ * rows.  In this case, you do not have to provide a display_row buffer
+ * also, but you may.  If the image is not interlaced, or if you have
+ * not called png_set_interlace_handling(), the display_row buffer will
+ * be ignored, so pass NULL to it.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.7
+ */
+
+void PNGAPI
+png_read_rows(png_structp png_ptr, png_bytepp row,
+   png_bytepp display_row, png_uint_32 num_rows)
+{
+   png_uint_32 i;
+   png_bytepp rp;
+   png_bytepp dp;
+
+   png_debug(1, "in png_read_rows\n");
+   rp = row;
+   dp = display_row;
+   if (rp != NULL && dp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep rptr = *rp++;
+         png_bytep dptr = *dp++;
+
+         png_read_row(png_ptr, rptr, dptr);
+      }
+   else if(rp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep rptr = *rp;
+         png_read_row(png_ptr, rptr, png_bytep_NULL);
+         rp++;
+      }
+   else if(dp != NULL)
+      for (i = 0; i < num_rows; i++)
+      {
+         png_bytep dptr = *dp;
+         png_read_row(png_ptr, png_bytep_NULL, dptr);
+         dp++;
+      }
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the entire image.  If the image has an alpha channel or a tRNS
+ * chunk, and you have called png_handle_alpha()[*], you will need to
+ * initialize the image to the current image that PNG will be overlaying.
+ * We set the num_rows again here, in case it was incorrectly set in
+ * png_read_start_row() by a call to png_read_update_info() or
+ * png_start_read_image() if png_set_interlace_handling() wasn't called
+ * prior to either of these functions like it should have been.  You can
+ * only call this function once.  If you desire to have an image for
+ * each pass of a interlaced image, use png_read_rows() instead.
+ *
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.2.7
+ */
+void PNGAPI
+png_read_image(png_structp png_ptr, png_bytepp image)
+{
+   png_uint_32 i,image_height;
+   int pass, j;
+   png_bytepp rp;
+
+   png_debug(1, "in png_read_image\n");
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+   pass = png_set_interlace_handling(png_ptr);
+#else
+   if (png_ptr->interlaced)
+      png_error(png_ptr,
+        "Cannot read interlaced image -- interlace handler disabled.");
+   pass = 1;
+#endif
+
+
+   image_height=png_ptr->height;
+   png_ptr->num_rows = image_height; /* Make sure this is set correctly */
+
+   for (j = 0; j < pass; j++)
+   {
+      rp = image;
+      for (i = 0; i < image_height; i++)
+      {
+         png_read_row(png_ptr, *rp, png_bytep_NULL);
+         rp++;
+      }
+   }
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+/* Read the end of the PNG file.  Will not read past the end of the
+ * file, will verify the end is accurate, and will read any comments
+ * or time information at the end of the file, if info is not NULL.
+ */
+void PNGAPI
+png_read_end(png_structp png_ptr, png_infop info_ptr)
+{
+   png_byte chunk_length[4];
+   png_uint_32 length;
+
+   png_debug(1, "in png_read_end\n");
+   png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
+
+   do
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_IHDR;
+      PNG_IDAT;
+      PNG_IEND;
+      PNG_PLTE;
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      PNG_bKGD;
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      PNG_cHRM;
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      PNG_gAMA;
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      PNG_hIST;
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      PNG_iCCP;
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      PNG_iTXt;
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      PNG_oFFs;
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      PNG_pCAL;
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      PNG_pHYs;
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      PNG_sBIT;
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      PNG_sCAL;
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      PNG_sPLT;
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      PNG_sRGB;
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      PNG_tEXt;
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      PNG_tIME;
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      PNG_tRNS;
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      PNG_zTXt;
+#endif
+#endif /* PNG_GLOBAL_ARRAYS */
+
+      png_read_data(png_ptr, chunk_length, 4);
+      length = png_get_uint_31(png_ptr,chunk_length);
+
+      png_reset_crc(png_ptr);
+      png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+
+      png_debug1(0, "Reading %s chunk.\n", png_ptr->chunk_name);
+
+      if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
+         png_handle_IHDR(png_ptr, info_ptr, length);
+      else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
+         png_handle_IEND(png_ptr, info_ptr, length);
+#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+      else if (png_handle_as_unknown(png_ptr, png_ptr->chunk_name))
+      {
+         if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+         {
+            if (length > 0 || png_ptr->mode & PNG_AFTER_IDAT)
+               png_error(png_ptr, "Too many IDAT's found");
+         }
+         else
+            png_ptr->mode |= PNG_AFTER_IDAT;
+         png_handle_unknown(png_ptr, info_ptr, length);
+         if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+            png_ptr->mode |= PNG_HAVE_PLTE;
+      }
+#endif
+      else if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+      {
+         /* Zero length IDATs are legal after the last IDAT has been
+          * read, but not after other chunks have been read.
+          */
+         if (length > 0 || png_ptr->mode & PNG_AFTER_IDAT)
+            png_error(png_ptr, "Too many IDAT's found");
+         png_crc_finish(png_ptr, length);
+      }
+      else if (!png_memcmp(png_ptr->chunk_name, png_PLTE, 4))
+         png_handle_PLTE(png_ptr, info_ptr, length);
+#if defined(PNG_READ_bKGD_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_bKGD, 4))
+         png_handle_bKGD(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_cHRM_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_cHRM, 4))
+         png_handle_cHRM(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_gAMA_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_gAMA, 4))
+         png_handle_gAMA(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_hIST, 4))
+         png_handle_hIST(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_oFFs_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_oFFs, 4))
+         png_handle_oFFs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pCAL_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_pCAL, 4))
+         png_handle_pCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sCAL_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sCAL, 4))
+         png_handle_sCAL(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_pHYs_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_pHYs, 4))
+         png_handle_pHYs(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sBIT_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sBIT, 4))
+         png_handle_sBIT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sRGB, 4))
+         png_handle_sRGB(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iCCP_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_iCCP, 4))
+         png_handle_iCCP(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_sPLT_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_sPLT, 4))
+         png_handle_sPLT(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tEXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tEXt, 4))
+         png_handle_tEXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tIME_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tIME, 4))
+         png_handle_tIME(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_tRNS_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_tRNS, 4))
+         png_handle_tRNS(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_zTXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_zTXt, 4))
+         png_handle_zTXt(png_ptr, info_ptr, length);
+#endif
+#if defined(PNG_READ_iTXt_SUPPORTED)
+      else if (!png_memcmp(png_ptr->chunk_name, png_iTXt, 4))
+         png_handle_iTXt(png_ptr, info_ptr, length);
+#endif
+      else
+         png_handle_unknown(png_ptr, info_ptr, length);
+   } while (!(png_ptr->mode & PNG_HAVE_IEND));
+}
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+
+/* free all memory used by the read */
+void PNGAPI
+png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
+   png_infopp end_info_ptr_ptr)
+{
+   png_structp png_ptr = NULL;
+   png_infop info_ptr = NULL, end_info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+   png_voidp mem_ptr;
+#endif
+
+   png_debug(1, "in png_destroy_read_struct\n");
+   if (png_ptr_ptr != NULL)
+      png_ptr = *png_ptr_ptr;
+
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (end_info_ptr_ptr != NULL)
+      end_info_ptr = *end_info_ptr_ptr;
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+   mem_ptr = png_ptr->mem_ptr;
+#endif
+
+   png_read_destroy(png_ptr, info_ptr, end_info_ptr);
+
+   if (info_ptr != NULL)
+   {
+#if defined(PNG_TEXT_SUPPORTED)
+      png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, -1);
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
+          (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+
+   if (end_info_ptr != NULL)
+   {
+#if defined(PNG_READ_TEXT_SUPPORTED)
+      png_free_data(png_ptr, end_info_ptr, PNG_FREE_TEXT, -1);
+#endif
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)end_info_ptr);
+#endif
+      *end_info_ptr_ptr = NULL;
+   }
+
+   if (png_ptr != NULL)
+   {
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
+          (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      *png_ptr_ptr = NULL;
+   }
+}
+
+/* free all memory used by the read (old method) */
+void /* PRIVATE */
+png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp;
+#endif
+   png_error_ptr error_fn;
+   png_error_ptr warning_fn;
+   png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+#endif
+
+   png_debug(1, "in png_read_destroy\n");
+   if (info_ptr != NULL)
+      png_info_destroy(png_ptr, info_ptr);
+
+   if (end_info_ptr != NULL)
+      png_info_destroy(png_ptr, end_info_ptr);
+
+   png_free(png_ptr, png_ptr->zbuf);
+   png_free(png_ptr, png_ptr->big_row_buf);
+   png_free(png_ptr, png_ptr->prev_row);
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   png_free(png_ptr, png_ptr->palette_lookup);
+   png_free(png_ptr, png_ptr->dither_index);
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   png_free(png_ptr, png_ptr->gamma_table);
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   png_free(png_ptr, png_ptr->gamma_from_1);
+   png_free(png_ptr, png_ptr->gamma_to_1);
+#endif
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_PLTE)
+      png_zfree(png_ptr, png_ptr->palette);
+   png_ptr->free_me &= ~PNG_FREE_PLTE;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_PLTE)
+      png_zfree(png_ptr, png_ptr->palette);
+   png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
+#endif
+#if defined(PNG_tRNS_SUPPORTED) || \
+    defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_TRNS)
+      png_free(png_ptr, png_ptr->trans);
+   png_ptr->free_me &= ~PNG_FREE_TRNS;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_TRNS)
+      png_free(png_ptr, png_ptr->trans);
+   png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
+#endif
+#endif
+#if defined(PNG_READ_hIST_SUPPORTED)
+#ifdef PNG_FREE_ME_SUPPORTED
+   if (png_ptr->free_me & PNG_FREE_HIST)
+      png_free(png_ptr, png_ptr->hist);
+   png_ptr->free_me &= ~PNG_FREE_HIST;
+#else
+   if (png_ptr->flags & PNG_FLAG_FREE_HIST)
+      png_free(png_ptr, png_ptr->hist);
+   png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
+#endif
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if (png_ptr->gamma_16_table != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_table[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_table);
+   }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr->gamma_16_from_1 != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_from_1[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_from_1);
+   }
+   if (png_ptr->gamma_16_to_1 != NULL)
+   {
+      int i;
+      int istop = (1 << (8 - png_ptr->gamma_shift));
+      for (i = 0; i < istop; i++)
+      {
+         png_free(png_ptr, png_ptr->gamma_16_to_1[i]);
+      }
+   png_free(png_ptr, png_ptr->gamma_16_to_1);
+   }
+#endif
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+   png_free(png_ptr, png_ptr->time_buffer);
+#endif
+
+   inflateEnd(&png_ptr->zstream);
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+   png_free(png_ptr, png_ptr->save_buffer);
+#endif
+
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+#ifdef PNG_TEXT_SUPPORTED
+   png_free(png_ptr, png_ptr->current_text);
+#endif /* PNG_TEXT_SUPPORTED */
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+
+   /* Save the important info out of the png_struct, in case it is
+    * being used again.
+    */
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof (jmp_buf));
+#endif
+
+   error_fn = png_ptr->error_fn;
+   warning_fn = png_ptr->warning_fn;
+   error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+#endif
+
+   png_memset(png_ptr, 0, png_sizeof (png_struct));
+
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+   png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr->free_fn = free_fn;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof (jmp_buf));
+#endif
+
+}
+
+void PNGAPI
+png_set_read_status_fn(png_structp png_ptr, png_read_status_ptr read_row_fn)
+{
+   png_ptr->read_row_fn = read_row_fn;
+}
+
+
+#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+void PNGAPI
+png_read_png(png_structp png_ptr, png_infop info_ptr,
+                           int transforms,
+                           voidp params)
+{
+   int row;
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+   /* invert the alpha channel from opacity to transparency
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+       png_set_invert_alpha(png_ptr);
+#endif
+
+   /* png_read_info() gives us all of the information from the
+    * PNG file before the first IDAT (image data chunk).
+    */
+   png_read_info(png_ptr, info_ptr);
+   if (info_ptr->height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
+      png_error(png_ptr,"Image is too high to process with png_read_png()");
+
+   /* -------------- image transformations start here ------------------- */
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+   /* tell libpng to strip 16 bit/color files down to 8 bits per color
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_16)
+       png_set_strip_16(png_ptr);
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+   /* Strip alpha bytes from the input data without combining with
+    * the background (not recommended).
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
+       png_set_strip_alpha(png_ptr);
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) && !defined(PNG_READ_EXPAND_SUPPORTED)
+   /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
+    * byte into separate bytes (useful for paletted and grayscale images).
+    */
+   if (transforms & PNG_TRANSFORM_PACKING)
+       png_set_packing(png_ptr);
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+   /* Change the order of packed pixels to least significant bit first
+    * (not useful if you are using png_set_packing).
+    */
+   if (transforms & PNG_TRANSFORM_PACKSWAP)
+       png_set_packswap(png_ptr);
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   /* Expand paletted colors into true RGB triplets
+    * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
+    * Expand paletted or RGB images with transparency to full alpha
+    * channels so the data will be available as RGBA quartets.
+    */
+   if (transforms & PNG_TRANSFORM_EXPAND)
+       if ((png_ptr->bit_depth < 8) ||
+           (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
+           (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+         png_set_expand(png_ptr);
+#endif
+
+   /* We don't handle background color or gamma transformation or dithering.
+    */
+
+#if defined(PNG_READ_INVERT_SUPPORTED)
+   /* invert monochrome files to have 0 as white and 1 as black
+    */
+   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+       png_set_invert_mono(png_ptr);
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+   /* If you want to shift the pixel values from the range [0,255] or
+    * [0,65535] to the original [0,7] or [0,31], or whatever range the
+    * colors were originally in:
+    */
+   if ((transforms & PNG_TRANSFORM_SHIFT)
+       && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
+   {
+      png_color_8p sig_bit;
+
+      png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+      png_set_shift(png_ptr, sig_bit);
+   }
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED)
+   /* flip the RGB pixels to BGR (or RGBA to BGRA)
+    */
+   if (transforms & PNG_TRANSFORM_BGR)
+       png_set_bgr(png_ptr);
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+   /* swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR)
+    */
+   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+       png_set_swap_alpha(png_ptr);
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED)
+   /* swap bytes of 16 bit files to least significant byte first
+    */
+   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+       png_set_swap(png_ptr);
+#endif
+
+   /* We don't handle adding filler bytes */
+
+   /* Optional call to gamma correct and add the background to the palette
+    * and update info structure.  REQUIRED if you are expecting libpng to
+    * update the palette for you (i.e., you selected such a transform above).
+    */
+   png_read_update_info(png_ptr, info_ptr);
+
+   /* -------------- image transformations end here ------------------- */
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
+#endif
+   if(info_ptr->row_pointers == NULL)
+   {
+      info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
+         info_ptr->height * png_sizeof(png_bytep));
+#ifdef PNG_FREE_ME_SUPPORTED
+      info_ptr->free_me |= PNG_FREE_ROWS;
+#endif
+      for (row = 0; row < (int)info_ptr->height; row++)
+      {
+         info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
+            png_get_rowbytes(png_ptr, info_ptr));
+      }
+   }
+
+   png_read_image(png_ptr, info_ptr->row_pointers);
+   info_ptr->valid |= PNG_INFO_IDAT;
+
+   /* read rest of file, and get additional chunks in info_ptr - REQUIRED */
+   png_read_end(png_ptr, info_ptr);
+
+   if(transforms == 0 || params == NULL)
+      /* quiet compiler warnings */ return;
+
+}
+#endif
+#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/png/pngrio.c b/Source/3rd Party/wx/src/png/pngrio.c
index d0d9d8a73..806f79198 100644
--- a/Source/3rd Party/wx/src/png/pngrio.c	
+++ b/Source/3rd Party/wx/src/png/pngrio.c	
@@ -1,176 +1,161 @@
-
-/* pngrio.c - functions for data input
- *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all input.  Users who need
- * special handling are expected to write a function that has the same
- * arguments as this and performs a similar function, but that possibly
- * has a different input method.  Note that you shouldn't change this
- * function, but rather write a replacement function and then make
- * libpng use it at run time with png_set_read_fn(...).
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Read the data from whatever input you are using.  The default routine
- * reads from a file pointer.  Note that this routine sometimes gets called
- * with very small lengths, so you should implement some kind of simple
- * buffering if you are using unbuffered reads.  This should never be asked
- * to read more then 64K on a 16 bit machine.
- */
-void /* PRIVATE */
-png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_debug1(4, "reading %d bytes", (int)length);
-
-   if (png_ptr->read_data_fn != NULL)
-      (*(png_ptr->read_data_fn))(png_ptr, data, length);
-
-   else
-      png_error(png_ptr, "Call to NULL read function");
-}
-
-#ifdef PNG_STDIO_SUPPORTED
-/* This is the function that does the actual reading of data.  If you are
- * not reading from a standard C stream, you should create a replacement
- * read_data function and use it at run time with png_set_read_fn(), rather
- * than changing the library.
- */
-#  ifndef USE_FAR_KEYWORD
-void PNGCBAPI
-png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
-    * instead of an int, which is what fread() actually returns.
-    */
-   check = fread(data, 1, length, (png_FILE_p)png_ptr->io_ptr);
-
-   if (check != length)
-      png_error(png_ptr, "Read Error");
-}
-#  else
-/* This is the model-independent version. Since the standard I/O library
-   can't handle far buffers in the medium and small models, we have to copy
-   the data.
-*/
-
-#define NEAR_BUF_SIZE 1024
-#define MIN(a,b) (a <= b ? a : b)
-
-static void PNGCBAPI
-png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-   png_byte *n_data;
-   png_FILE_p io_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Check if data really is near. If so, use usual code. */
-   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
-
-   if ((png_bytep)n_data == data)
-   {
-      check = fread(n_data, 1, length, io_ptr);
-   }
-
-   else
-   {
-      png_byte buf[NEAR_BUF_SIZE];
-      png_size_t read, remaining, err;
-      check = 0;
-      remaining = length;
-
-      do
-      {
-         read = MIN(NEAR_BUF_SIZE, remaining);
-         err = fread(buf, 1, read, io_ptr);
-         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
-
-         if (err != read)
-            break;
-
-         else
-            check += err;
-
-         data += read;
-         remaining -= read;
-      }
-      while (remaining != 0);
-   }
-
-   if ((png_uint_32)check != (png_uint_32)length)
-      png_error(png_ptr, "read Error");
-}
-#  endif
-#endif
-
-/* This function allows the application to supply a new input function
- * for libpng if standard C streams aren't being used.
- *
- * This function takes as its arguments:
- *
- * png_ptr      - pointer to a png input data structure
- *
- * io_ptr       - pointer to user supplied structure containing info about
- *                the input functions.  May be NULL.
- *
- * read_data_fn - pointer to a new input function that takes as its
- *                arguments a pointer to a png_struct, a pointer to
- *                a location where input data can be stored, and a 32-bit
- *                unsigned int that is the number of bytes to be read.
- *                To exit and output any fatal error messages the new write
- *                function should call png_error(png_ptr, "Error msg").
- *                May be NULL, in which case libpng's default function will
- *                be used.
- */
-void PNGAPI
-png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
-   png_rw_ptr read_data_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->io_ptr = io_ptr;
-
-#ifdef PNG_STDIO_SUPPORTED
-   if (read_data_fn != NULL)
-      png_ptr->read_data_fn = read_data_fn;
-
-   else
-      png_ptr->read_data_fn = png_default_read_data;
-#else
-   png_ptr->read_data_fn = read_data_fn;
-#endif
-
-   /* It is an error to write to a read device */
-   if (png_ptr->write_data_fn != NULL)
-   {
-      png_ptr->write_data_fn = NULL;
-      png_warning(png_ptr,
-          "Can't set both read_data_fn and write_data_fn in the"
-          " same structure");
-   }
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-   png_ptr->output_flush_fn = NULL;
-#endif
-}
-#endif /* PNG_READ_SUPPORTED */
+
+/* pngrio.c - functions for data input
+ *
+ * libpng 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all input.  Users who need
+ * special handling are expected to write a function that has the same
+ * arguments as this and performs a similar function, but that possibly
+ * has a different input method.  Note that you shouldn't change this
+ * function, but rather write a replacement function and then make
+ * libpng use it at run time with png_set_read_fn(...).
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Read the data from whatever input you are using.  The default routine
+   reads from a file pointer.  Note that this routine sometimes gets called
+   with very small lengths, so you should implement some kind of simple
+   buffering if you are using unbuffered reads.  This should never be asked
+   to read more then 64K on a 16 bit machine. */
+void /* PRIVATE */
+png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_debug1(4,"reading %d bytes\n", (int)length);
+   if (png_ptr->read_data_fn != NULL)
+      (*(png_ptr->read_data_fn))(png_ptr, data, length);
+   else
+      png_error(png_ptr, "Call to NULL read function");
+}
+
+#if !defined(PNG_NO_STDIO)
+/* This is the function that does the actual reading of data.  If you are
+   not reading from a standard C stream, you should create a replacement
+   read_data function and use it at run time with png_set_read_fn(), rather
+   than changing the library. */
+#ifndef USE_FAR_KEYWORD
+void PNGAPI
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_size_t check;
+
+   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+    * instead of an int, which is what fread() actually returns.
+    */
+#if defined(_WIN32_WCE)
+   if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+      check = 0;
+#else
+   check = (png_size_t)fread(data, (png_size_t)1, length,
+      (png_FILE_p)png_ptr->io_ptr);
+#endif
+
+   if (check != length)
+      png_error(png_ptr, "Read Error");
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void /* PRIVATE */
+png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   int check;
+   png_byte *n_data;
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)n_data == data)
+   {
+#if defined(_WIN32_WCE)
+      if ( !ReadFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+         check = 0;
+#else
+      check = fread(n_data, 1, length, io_ptr);
+#endif
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t read, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         read = MIN(NEAR_BUF_SIZE, remaining);
+#if defined(_WIN32_WCE)
+         if ( !ReadFile((HANDLE)(io_ptr), buf, read, &err, NULL) )
+            err = 0;
+#else
+         err = fread(buf, (png_size_t)1, read, io_ptr);
+#endif
+         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
+         if(err != read)
+            break;
+         else
+            check += err;
+         data += read;
+         remaining -= read;
+      }
+      while (remaining != 0);
+   }
+   if ((png_uint_32)check != (png_uint_32)length)
+      png_error(png_ptr, "read Error");
+}
+#endif
+#endif
+
+/* This function allows the application to supply a new input function
+   for libpng if standard C streams aren't being used.
+
+   This function takes as its arguments:
+   png_ptr      - pointer to a png input data structure
+   io_ptr       - pointer to user supplied structure containing info about
+                  the input functions.  May be NULL.
+   read_data_fn - pointer to a new input function that takes as its
+                  arguments a pointer to a png_struct, a pointer to
+                  a location where input data can be stored, and a 32-bit
+                  unsigned int that is the number of bytes to be read.
+                  To exit and output any fatal error messages the new write
+                  function should call png_error(png_ptr, "Error msg"). */
+void PNGAPI
+png_set_read_fn(png_structp png_ptr, png_voidp io_ptr,
+   png_rw_ptr read_data_fn)
+{
+   png_ptr->io_ptr = io_ptr;
+
+#if !defined(PNG_NO_STDIO)
+   if (read_data_fn != NULL)
+      png_ptr->read_data_fn = read_data_fn;
+   else
+      png_ptr->read_data_fn = png_default_read_data;
+#else
+   png_ptr->read_data_fn = read_data_fn;
+#endif
+
+   /* It is an error to write to a read device */
+   if (png_ptr->write_data_fn != NULL)
+   {
+      png_ptr->write_data_fn = NULL;
+      png_warning(png_ptr,
+         "It's an error to set both read_data_fn and write_data_fn in the ");
+      png_warning(png_ptr,
+         "same structure.  Resetting write_data_fn to NULL.");
+   }
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+   png_ptr->output_flush_fn = NULL;
+#endif
+}
diff --git a/Source/3rd Party/wx/src/png/pngrtran.c b/Source/3rd Party/wx/src/png/pngrtran.c
index 26083a0dd..b914d0e65 100644
--- a/Source/3rd Party/wx/src/png/pngrtran.c	
+++ b/Source/3rd Party/wx/src/png/pngrtran.c	
@@ -1,5023 +1,4177 @@
-
-/* pngrtran.c - transforms the data in a row for PNG readers
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file contains functions optionally called by an application
- * in order to tell libpng how to handle data when reading a PNG.
- * Transformations that are used in both reading and writing are
- * in pngtrans.c.
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-/* Set the action on getting a CRC error for an ancillary or critical chunk. */
-void PNGAPI
-png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
-{
-   png_debug(1, "in png_set_crc_action");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Tell libpng how we react to CRC errors in critical chunks */
-   switch (crit_action)
-   {
-      case PNG_CRC_NO_CHANGE:                        /* Leave setting as is */
-         break;
-
-      case PNG_CRC_WARN_USE:                               /* Warn/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;
-         break;
-
-      case PNG_CRC_QUIET_USE:                             /* Quiet/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |
-                           PNG_FLAG_CRC_CRITICAL_IGNORE;
-         break;
-
-      case PNG_CRC_WARN_DISCARD:    /* Not a valid action for critical data */
-         png_warning(png_ptr,
-            "Can't discard critical data on CRC error");
-      case PNG_CRC_ERROR_QUIT:                                /* Error/quit */
-
-      case PNG_CRC_DEFAULT:
-      default:
-         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
-         break;
-   }
-
-   /* Tell libpng how we react to CRC errors in ancillary chunks */
-   switch (ancil_action)
-   {
-      case PNG_CRC_NO_CHANGE:                       /* Leave setting as is */
-         break;
-
-      case PNG_CRC_WARN_USE:                              /* Warn/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;
-         break;
-
-      case PNG_CRC_QUIET_USE:                            /* Quiet/use data */
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |
-                           PNG_FLAG_CRC_ANCILLARY_NOWARN;
-         break;
-
-      case PNG_CRC_ERROR_QUIT:                               /* Error/quit */
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN;
-         break;
-
-      case PNG_CRC_WARN_DISCARD:                      /* Warn/discard data */
-
-      case PNG_CRC_DEFAULT:
-      default:
-         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
-         break;
-   }
-}
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-/* Handle alpha and tRNS via a background color */
-void PNGFAPI
-png_set_background_fixed(png_structp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, png_fixed_point background_gamma)
-{
-   png_debug(1, "in png_set_background_fixed");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
-   {
-      png_warning(png_ptr, "Application must supply a known background gamma");
-      return;
-   }
-
-   png_ptr->transformations |= PNG_COMPOSE | PNG_STRIP_ALPHA;
-   png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-   png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-
-   png_memcpy(&(png_ptr->background), background_color,
-      png_sizeof(png_color_16));
-   png_ptr->background_gamma = background_gamma;
-   png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
-   if (need_expand)
-      png_ptr->transformations |= PNG_BACKGROUND_EXPAND;
-   else
-      png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_background(png_structp png_ptr,
-    png_const_color_16p background_color, int background_gamma_code,
-    int need_expand, double background_gamma)
-{
-   png_set_background_fixed(png_ptr, background_color, background_gamma_code,
-      need_expand, png_fixed(png_ptr, background_gamma, "png_set_background"));
-}
-#  endif  /* FLOATING_POINT */
-#endif /* READ_BACKGROUND */
-
-/* Scale 16-bit depth files to 8-bit depth.  If both of these are set then the
- * one that pngrtran does first (scale) happens.  This is necessary to allow the
- * TRANSFORM and API behavior to be somewhat consistent, and it's simpler.
- */
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-void PNGAPI
-png_set_scale_16(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_scale_16");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_SCALE_16_TO_8;
-}
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-/* Chop 16-bit depth files to 8-bit depth */
-void PNGAPI
-png_set_strip_16(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_strip_16");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_16_TO_8;
-}
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-void PNGAPI
-png_set_strip_alpha(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_strip_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_STRIP_ALPHA;
-}
-#endif
-
-#if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED)
-static png_fixed_point
-translate_gamma_flags(png_structp png_ptr, png_fixed_point output_gamma,
-   int is_screen)
-{
-   /* Check for flag values.  The main reason for having the old Mac value as a
-    * flag is that it is pretty near impossible to work out what the correct
-    * value is from Apple documentation - a working Mac system is needed to
-    * discover the value!
-    */
-   if (output_gamma == PNG_DEFAULT_sRGB ||
-      output_gamma == PNG_FP_1 / PNG_DEFAULT_sRGB)
-   {
-      /* If there is no sRGB support this just sets the gamma to the standard
-       * sRGB value.  (This is a side effect of using this function!)
-       */
-#     ifdef PNG_READ_sRGB_SUPPORTED
-         png_ptr->flags |= PNG_FLAG_ASSUME_sRGB;
-#     endif
-      if (is_screen)
-         output_gamma = PNG_GAMMA_sRGB;
-      else
-         output_gamma = PNG_GAMMA_sRGB_INVERSE;
-   }
-
-   else if (output_gamma == PNG_GAMMA_MAC_18 ||
-      output_gamma == PNG_FP_1 / PNG_GAMMA_MAC_18)
-   {
-      if (is_screen)
-         output_gamma = PNG_GAMMA_MAC_OLD;
-      else
-         output_gamma = PNG_GAMMA_MAC_INVERSE;
-   }
-
-   return output_gamma;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-static png_fixed_point
-convert_gamma_value(png_structp png_ptr, double output_gamma)
-{
-   /* The following silently ignores cases where fixed point (times 100,000)
-    * gamma values are passed to the floating point API.  This is safe and it
-    * means the fixed point constants work just fine with the floating point
-    * API.  The alternative would just lead to undetected errors and spurious
-    * bug reports.  Negative values fail inside the _fixed API unless they
-    * correspond to the flag values.
-    */
-   if (output_gamma > 0 && output_gamma < 128)
-      output_gamma *= PNG_FP_1;
-
-   /* This preserves -1 and -2 exactly: */
-   output_gamma = floor(output_gamma + .5);
-
-   if (output_gamma > PNG_FP_MAX || output_gamma < PNG_FP_MIN)
-      png_fixed_error(png_ptr, "gamma value");
-
-   return (png_fixed_point)output_gamma;
-}
-#  endif
-#endif /* READ_ALPHA_MODE || READ_GAMMA */
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-void PNGFAPI
-png_set_alpha_mode_fixed(png_structp png_ptr, int mode,
-   png_fixed_point output_gamma)
-{
-   int compose = 0;
-   png_fixed_point file_gamma;
-
-   png_debug(1, "in png_set_alpha_mode");
-
-   if (png_ptr == NULL)
-      return;
-
-   output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);
-
-   /* Validate the value to ensure it is in a reasonable range. The value
-    * is expected to be 1 or greater, but this range test allows for some
-    * viewing correction values.  The intent is to weed out users of this API
-    * who use the inverse of the gamma value accidentally!  Since some of these
-    * values are reasonable this may have to be changed.
-    */
-   if (output_gamma < 70000 || output_gamma > 300000)
-      png_error(png_ptr, "output gamma out of expected range");
-
-   /* The default file gamma is the inverse of the output gamma; the output
-    * gamma may be changed below so get the file value first:
-    */
-   file_gamma = png_reciprocal(output_gamma);
-
-   /* There are really 8 possibilities here, composed of any combination
-    * of:
-    *
-    *    premultiply the color channels
-    *    do not encode non-opaque pixels
-    *    encode the alpha as well as the color channels
-    *
-    * The differences disappear if the input/output ('screen') gamma is 1.0,
-    * because then the encoding is a no-op and there is only the choice of
-    * premultiplying the color channels or not.
-    *
-    * png_set_alpha_mode and png_set_background interact because both use
-    * png_compose to do the work.  Calling both is only useful when
-    * png_set_alpha_mode is used to set the default mode - PNG_ALPHA_PNG - along
-    * with a default gamma value.  Otherwise PNG_COMPOSE must not be set.
-    */
-   switch (mode)
-   {
-      case PNG_ALPHA_PNG:        /* default: png standard */
-         /* No compose, but it may be set by png_set_background! */
-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-         break;
-
-      case PNG_ALPHA_ASSOCIATED: /* color channels premultiplied */
-         compose = 1;
-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-         /* The output is linear: */
-         output_gamma = PNG_FP_1;
-         break;
-
-      case PNG_ALPHA_OPTIMIZED:  /* associated, non-opaque pixels linear */
-         compose = 1;
-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-         png_ptr->flags |= PNG_FLAG_OPTIMIZE_ALPHA;
-         /* output_gamma records the encoding of opaque pixels! */
-         break;
-
-      case PNG_ALPHA_BROKEN:     /* associated, non-linear, alpha encoded */
-         compose = 1;
-         png_ptr->transformations |= PNG_ENCODE_ALPHA;
-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-         break;
-
-      default:
-         png_error(png_ptr, "invalid alpha mode");
-   }
-
-   /* Only set the default gamma if the file gamma has not been set (this has
-    * the side effect that the gamma in a second call to png_set_alpha_mode will
-    * be ignored.)
-    */
-   if (png_ptr->gamma == 0)
-      png_ptr->gamma = file_gamma;
-
-   /* But always set the output gamma: */
-   png_ptr->screen_gamma = output_gamma;
-
-   /* Finally, if pre-multiplying, set the background fields to achieve the
-    * desired result.
-    */
-   if (compose)
-   {
-      /* And obtain alpha pre-multiplication by composing on black: */
-      png_memset(&png_ptr->background, 0, sizeof png_ptr->background);
-      png_ptr->background_gamma = png_ptr->gamma; /* just in case */
-      png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE;
-      png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
-
-      if (png_ptr->transformations & PNG_COMPOSE)
-         png_error(png_ptr,
-            "conflicting calls to set alpha mode and background");
-
-      png_ptr->transformations |= PNG_COMPOSE;
-   }
-
-   /* New API, make sure apps call the correct initializers: */
-   png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_alpha_mode(png_structp png_ptr, int mode, double output_gamma)
-{
-   png_set_alpha_mode_fixed(png_ptr, mode, convert_gamma_value(png_ptr,
-      output_gamma));
-}
-#  endif
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* Dither file to 8-bit.  Supply a palette, the current number
- * of elements in the palette, the maximum number of elements
- * allowed, and a histogram if possible.  If the current number
- * of colors is greater then the maximum number, the palette will be
- * modified to fit in the maximum number.  "full_quantize" indicates
- * whether we need a quantizing cube set up for RGB images, or if we
- * simply are reducing the number of colors in a paletted image.
- */
-
-typedef struct png_dsort_struct
-{
-   struct png_dsort_struct FAR * next;
-   png_byte left;
-   png_byte right;
-} png_dsort;
-typedef png_dsort FAR *       png_dsortp;
-typedef png_dsort FAR * FAR * png_dsortpp;
-
-void PNGAPI
-png_set_quantize(png_structp png_ptr, png_colorp palette,
-    int num_palette, int maximum_colors, png_const_uint_16p histogram,
-    int full_quantize)
-{
-   png_debug(1, "in png_set_quantize");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_QUANTIZE;
-
-   if (!full_quantize)
-   {
-      int i;
-
-      png_ptr->quantize_index = (png_bytep)png_malloc(png_ptr,
-          (png_uint_32)(num_palette * png_sizeof(png_byte)));
-      for (i = 0; i < num_palette; i++)
-         png_ptr->quantize_index[i] = (png_byte)i;
-   }
-
-   if (num_palette > maximum_colors)
-   {
-      if (histogram != NULL)
-      {
-         /* This is easy enough, just throw out the least used colors.
-          * Perhaps not the best solution, but good enough.
-          */
-
-         int i;
-
-         /* Initialize an array to sort colors */
-         png_ptr->quantize_sort = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(num_palette * png_sizeof(png_byte)));
-
-         /* Initialize the quantize_sort array */
-         for (i = 0; i < num_palette; i++)
-            png_ptr->quantize_sort[i] = (png_byte)i;
-
-         /* Find the least used palette entries by starting a
-          * bubble sort, and running it until we have sorted
-          * out enough colors.  Note that we don't care about
-          * sorting all the colors, just finding which are
-          * least used.
-          */
-
-         for (i = num_palette - 1; i >= maximum_colors; i--)
-         {
-            int done; /* To stop early if the list is pre-sorted */
-            int j;
-
-            done = 1;
-            for (j = 0; j < i; j++)
-            {
-               if (histogram[png_ptr->quantize_sort[j]]
-                   < histogram[png_ptr->quantize_sort[j + 1]])
-               {
-                  png_byte t;
-
-                  t = png_ptr->quantize_sort[j];
-                  png_ptr->quantize_sort[j] = png_ptr->quantize_sort[j + 1];
-                  png_ptr->quantize_sort[j + 1] = t;
-                  done = 0;
-               }
-            }
-
-            if (done)
-               break;
-         }
-
-         /* Swap the palette around, and set up a table, if necessary */
-         if (full_quantize)
-         {
-            int j = num_palette;
-
-            /* Put all the useful colors within the max, but don't
-             * move the others.
-             */
-            for (i = 0; i < maximum_colors; i++)
-            {
-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
-               {
-                  do
-                     j--;
-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
-
-                  palette[i] = palette[j];
-               }
-            }
-         }
-         else
-         {
-            int j = num_palette;
-
-            /* Move all the used colors inside the max limit, and
-             * develop a translation table.
-             */
-            for (i = 0; i < maximum_colors; i++)
-            {
-               /* Only move the colors we need to */
-               if ((int)png_ptr->quantize_sort[i] >= maximum_colors)
-               {
-                  png_color tmp_color;
-
-                  do
-                     j--;
-                  while ((int)png_ptr->quantize_sort[j] >= maximum_colors);
-
-                  tmp_color = palette[j];
-                  palette[j] = palette[i];
-                  palette[i] = tmp_color;
-                  /* Indicate where the color went */
-                  png_ptr->quantize_index[j] = (png_byte)i;
-                  png_ptr->quantize_index[i] = (png_byte)j;
-               }
-            }
-
-            /* Find closest color for those colors we are not using */
-            for (i = 0; i < num_palette; i++)
-            {
-               if ((int)png_ptr->quantize_index[i] >= maximum_colors)
-               {
-                  int min_d, k, min_k, d_index;
-
-                  /* Find the closest color to one we threw out */
-                  d_index = png_ptr->quantize_index[i];
-                  min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);
-                  for (k = 1, min_k = 0; k < maximum_colors; k++)
-                  {
-                     int d;
-
-                     d = PNG_COLOR_DIST(palette[d_index], palette[k]);
-
-                     if (d < min_d)
-                     {
-                        min_d = d;
-                        min_k = k;
-                     }
-                  }
-                  /* Point to closest color */
-                  png_ptr->quantize_index[i] = (png_byte)min_k;
-               }
-            }
-         }
-         png_free(png_ptr, png_ptr->quantize_sort);
-         png_ptr->quantize_sort = NULL;
-      }
-      else
-      {
-         /* This is much harder to do simply (and quickly).  Perhaps
-          * we need to go through a median cut routine, but those
-          * don't always behave themselves with only a few colors
-          * as input.  So we will just find the closest two colors,
-          * and throw out one of them (chosen somewhat randomly).
-          * [We don't understand this at all, so if someone wants to
-          *  work on improving it, be our guest - AED, GRP]
-          */
-         int i;
-         int max_d;
-         int num_new_palette;
-         png_dsortp t;
-         png_dsortpp hash;
-
-         t = NULL;
-
-         /* Initialize palette index arrays */
-         png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(num_palette * png_sizeof(png_byte)));
-         png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(num_palette * png_sizeof(png_byte)));
-
-         /* Initialize the sort array */
-         for (i = 0; i < num_palette; i++)
-         {
-            png_ptr->index_to_palette[i] = (png_byte)i;
-            png_ptr->palette_to_index[i] = (png_byte)i;
-         }
-
-         hash = (png_dsortpp)png_calloc(png_ptr, (png_uint_32)(769 *
-             png_sizeof(png_dsortp)));
-
-         num_new_palette = num_palette;
-
-         /* Initial wild guess at how far apart the farthest pixel
-          * pair we will be eliminating will be.  Larger
-          * numbers mean more areas will be allocated, Smaller
-          * numbers run the risk of not saving enough data, and
-          * having to do this all over again.
-          *
-          * I have not done extensive checking on this number.
-          */
-         max_d = 96;
-
-         while (num_new_palette > maximum_colors)
-         {
-            for (i = 0; i < num_new_palette - 1; i++)
-            {
-               int j;
-
-               for (j = i + 1; j < num_new_palette; j++)
-               {
-                  int d;
-
-                  d = PNG_COLOR_DIST(palette[i], palette[j]);
-
-                  if (d <= max_d)
-                  {
-
-                     t = (png_dsortp)png_malloc_warn(png_ptr,
-                         (png_uint_32)(png_sizeof(png_dsort)));
-
-                     if (t == NULL)
-                         break;
-
-                     t->next = hash[d];
-                     t->left = (png_byte)i;
-                     t->right = (png_byte)j;
-                     hash[d] = t;
-                  }
-               }
-               if (t == NULL)
-                  break;
-            }
-
-            if (t != NULL)
-            for (i = 0; i <= max_d; i++)
-            {
-               if (hash[i] != NULL)
-               {
-                  png_dsortp p;
-
-                  for (p = hash[i]; p; p = p->next)
-                  {
-                     if ((int)png_ptr->index_to_palette[p->left]
-                         < num_new_palette &&
-                         (int)png_ptr->index_to_palette[p->right]
-                         < num_new_palette)
-                     {
-                        int j, next_j;
-
-                        if (num_new_palette & 0x01)
-                        {
-                           j = p->left;
-                           next_j = p->right;
-                        }
-                        else
-                        {
-                           j = p->right;
-                           next_j = p->left;
-                        }
-
-                        num_new_palette--;
-                        palette[png_ptr->index_to_palette[j]]
-                            = palette[num_new_palette];
-                        if (!full_quantize)
-                        {
-                           int k;
-
-                           for (k = 0; k < num_palette; k++)
-                           {
-                              if (png_ptr->quantize_index[k] ==
-                                  png_ptr->index_to_palette[j])
-                                 png_ptr->quantize_index[k] =
-                                     png_ptr->index_to_palette[next_j];
-
-                              if ((int)png_ptr->quantize_index[k] ==
-                                  num_new_palette)
-                                 png_ptr->quantize_index[k] =
-                                     png_ptr->index_to_palette[j];
-                           }
-                        }
-
-                        png_ptr->index_to_palette[png_ptr->palette_to_index
-                            [num_new_palette]] = png_ptr->index_to_palette[j];
-
-                        png_ptr->palette_to_index[png_ptr->index_to_palette[j]]
-                            = png_ptr->palette_to_index[num_new_palette];
-
-                        png_ptr->index_to_palette[j] =
-                            (png_byte)num_new_palette;
-
-                        png_ptr->palette_to_index[num_new_palette] =
-                            (png_byte)j;
-                     }
-                     if (num_new_palette <= maximum_colors)
-                        break;
-                  }
-                  if (num_new_palette <= maximum_colors)
-                     break;
-               }
-            }
-
-            for (i = 0; i < 769; i++)
-            {
-               if (hash[i] != NULL)
-               {
-                  png_dsortp p = hash[i];
-                  while (p)
-                  {
-                     t = p->next;
-                     png_free(png_ptr, p);
-                     p = t;
-                  }
-               }
-               hash[i] = 0;
-            }
-            max_d += 96;
-         }
-         png_free(png_ptr, hash);
-         png_free(png_ptr, png_ptr->palette_to_index);
-         png_free(png_ptr, png_ptr->index_to_palette);
-         png_ptr->palette_to_index = NULL;
-         png_ptr->index_to_palette = NULL;
-      }
-      num_palette = maximum_colors;
-   }
-   if (png_ptr->palette == NULL)
-   {
-      png_ptr->palette = palette;
-   }
-   png_ptr->num_palette = (png_uint_16)num_palette;
-
-   if (full_quantize)
-   {
-      int i;
-      png_bytep distance;
-      int total_bits = PNG_QUANTIZE_RED_BITS + PNG_QUANTIZE_GREEN_BITS +
-          PNG_QUANTIZE_BLUE_BITS;
-      int num_red = (1 << PNG_QUANTIZE_RED_BITS);
-      int num_green = (1 << PNG_QUANTIZE_GREEN_BITS);
-      int num_blue = (1 << PNG_QUANTIZE_BLUE_BITS);
-      png_size_t num_entries = ((png_size_t)1 << total_bits);
-
-      png_ptr->palette_lookup = (png_bytep)png_calloc(png_ptr,
-          (png_uint_32)(num_entries * png_sizeof(png_byte)));
-
-      distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *
-          png_sizeof(png_byte)));
-
-      png_memset(distance, 0xff, num_entries * png_sizeof(png_byte));
-
-      for (i = 0; i < num_palette; i++)
-      {
-         int ir, ig, ib;
-         int r = (palette[i].red >> (8 - PNG_QUANTIZE_RED_BITS));
-         int g = (palette[i].green >> (8 - PNG_QUANTIZE_GREEN_BITS));
-         int b = (palette[i].blue >> (8 - PNG_QUANTIZE_BLUE_BITS));
-
-         for (ir = 0; ir < num_red; ir++)
-         {
-            /* int dr = abs(ir - r); */
-            int dr = ((ir > r) ? ir - r : r - ir);
-            int index_r = (ir << (PNG_QUANTIZE_BLUE_BITS +
-                PNG_QUANTIZE_GREEN_BITS));
-
-            for (ig = 0; ig < num_green; ig++)
-            {
-               /* int dg = abs(ig - g); */
-               int dg = ((ig > g) ? ig - g : g - ig);
-               int dt = dr + dg;
-               int dm = ((dr > dg) ? dr : dg);
-               int index_g = index_r | (ig << PNG_QUANTIZE_BLUE_BITS);
-
-               for (ib = 0; ib < num_blue; ib++)
-               {
-                  int d_index = index_g | ib;
-                  /* int db = abs(ib - b); */
-                  int db = ((ib > b) ? ib - b : b - ib);
-                  int dmax = ((dm > db) ? dm : db);
-                  int d = dmax + dt + db;
-
-                  if (d < (int)distance[d_index])
-                  {
-                     distance[d_index] = (png_byte)d;
-                     png_ptr->palette_lookup[d_index] = (png_byte)i;
-                  }
-               }
-            }
-         }
-      }
-
-      png_free(png_ptr, distance);
-   }
-}
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-void PNGFAPI
-png_set_gamma_fixed(png_structp png_ptr, png_fixed_point scrn_gamma,
-   png_fixed_point file_gamma)
-{
-   png_debug(1, "in png_set_gamma_fixed");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* New in libpng-1.5.4 - reserve particular negative values as flags. */
-   scrn_gamma = translate_gamma_flags(png_ptr, scrn_gamma, 1/*screen*/);
-   file_gamma = translate_gamma_flags(png_ptr, file_gamma, 0/*file*/);
-
-#if PNG_LIBPNG_VER >= 10600
-   /* Checking the gamma values for being >0 was added in 1.5.4 along with the
-    * premultiplied alpha support; this actually hides an undocumented feature
-    * of the previous implementation which allowed gamma processing to be
-    * disabled in background handling.  There is no evidence (so far) that this
-    * was being used; however, png_set_background itself accepted and must still
-    * accept '0' for the gamma value it takes, because it isn't always used.
-    *
-    * Since this is an API change (albeit a very minor one that removes an
-    * undocumented API feature) it will not be made until libpng-1.6.0.
-    */
-   if (file_gamma <= 0)
-      png_error(png_ptr, "invalid file gamma in png_set_gamma");
-
-   if (scrn_gamma <= 0)
-      png_error(png_ptr, "invalid screen gamma in png_set_gamma");
-#endif
-
-   /* Set the gamma values unconditionally - this overrides the value in the PNG
-    * file if a gAMA chunk was present.  png_set_alpha_mode provides a
-    * different, easier, way to default the file gamma.
-    */
-   png_ptr->gamma = file_gamma;
-   png_ptr->screen_gamma = scrn_gamma;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
-{
-   png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma),
-      convert_gamma_value(png_ptr, file_gamma));
-}
-#  endif /* FLOATING_POINT_SUPPORTED */
-#endif /* READ_GAMMA */
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expand paletted images to RGB, expand grayscale images of
- * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
- * to alpha channels.
- */
-void PNGAPI
-png_set_expand(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_expand");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-}
-
-/* GRR 19990627:  the following three functions currently are identical
- *  to png_set_expand().  However, it is entirely reasonable that someone
- *  might wish to expand an indexed image to RGB but *not* expand a single,
- *  fully transparent palette entry to a full alpha channel--perhaps instead
- *  convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace
- *  the transparent color with a particular RGB value, or drop tRNS entirely.
- *  IOW, a future version of the library may make the transformations flag
- *  a bit more fine-grained, with separate bits for each of these three
- *  functions.
- *
- *  More to the point, these functions make it obvious what libpng will be
- *  doing, whereas "expand" can (and does) mean any number of things.
- *
- *  GRP 20060307: In libpng-1.2.9, png_set_gray_1_2_4_to_8() was modified
- *  to expand only the sample depth but not to expand the tRNS to alpha
- *  and its name was changed to png_set_expand_gray_1_2_4_to_8().
- */
-
-/* Expand paletted images to RGB. */
-void PNGAPI
-png_set_palette_to_rgb(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_palette_to_rgb");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-}
-
-/* Expand grayscale images of less than 8-bit depth to 8 bits. */
-void PNGAPI
-png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_expand_gray_1_2_4_to_8");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_EXPAND;
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-}
-
-
-
-/* Expand tRNS chunks to alpha channels. */
-void PNGAPI
-png_set_tRNS_to_alpha(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_tRNS_to_alpha");
-
-   png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-}
-#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-/* Expand to 16-bit channels, expand the tRNS chunk too (because otherwise
- * it may not work correctly.)
- */
-void PNGAPI
-png_set_expand_16(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_expand_16");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= (PNG_EXPAND_16 | PNG_EXPAND | PNG_EXPAND_tRNS);
-   png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-
-   /* New API, make sure apps call the correct initializers: */
-   png_ptr->flags |= PNG_FLAG_DETECT_UNINITIALIZED;
-}
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-void PNGAPI
-png_set_gray_to_rgb(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_gray_to_rgb");
-
-   if (png_ptr != NULL)
-   {
-      /* Because rgb must be 8 bits or more: */
-      png_set_expand_gray_1_2_4_to_8(png_ptr);
-      png_ptr->transformations |= PNG_GRAY_TO_RGB;
-      png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-   }
-}
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-void PNGFAPI
-png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
-    png_fixed_point red, png_fixed_point green)
-{
-   png_debug(1, "in png_set_rgb_to_gray");
-
-   if (png_ptr == NULL)
-      return;
-
-   switch(error_action)
-   {
-      case PNG_ERROR_ACTION_NONE:
-         png_ptr->transformations |= PNG_RGB_TO_GRAY;
-         break;
-
-      case PNG_ERROR_ACTION_WARN:
-         png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;
-         break;
-
-      case PNG_ERROR_ACTION_ERROR:
-         png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
-         break;
-
-      default:
-         png_error(png_ptr, "invalid error action to rgb_to_gray");
-         break;
-   }
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-#ifdef PNG_READ_EXPAND_SUPPORTED
-      png_ptr->transformations |= PNG_EXPAND;
-#else
-   {
-      png_warning(png_ptr,
-        "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED");
-
-      png_ptr->transformations &= ~PNG_RGB_TO_GRAY;
-   }
-#endif
-   {
-      if (red >= 0 && green >= 0 && red + green <= PNG_FP_1)
-      {
-         png_uint_16 red_int, green_int;
-
-         /* NOTE: this calculation does not round, but this behavior is retained
-          * for consistency, the inaccuracy is very small.  The code here always
-          * overwrites the coefficients, regardless of whether they have been
-          * defaulted or set already.
-          */
-         red_int = (png_uint_16)(((png_uint_32)red*32768)/100000);
-         green_int = (png_uint_16)(((png_uint_32)green*32768)/100000);
-
-         png_ptr->rgb_to_gray_red_coeff   = red_int;
-         png_ptr->rgb_to_gray_green_coeff = green_int;
-         png_ptr->rgb_to_gray_coefficients_set = 1;
-      }
-
-      else
-      {
-         if (red >= 0 && green >= 0)
-            png_warning(png_ptr,
-               "ignoring out of range rgb_to_gray coefficients");
-
-         /* Use the defaults, from the cHRM chunk if set, else the historical
-          * values which are close to the sRGB/HDTV/ITU-Rec 709 values.  See
-          * png_do_rgb_to_gray for more discussion of the values.  In this case
-          * the coefficients are not marked as 'set' and are not overwritten if
-          * something has already provided a default.
-          */
-         if (png_ptr->rgb_to_gray_red_coeff == 0 &&
-            png_ptr->rgb_to_gray_green_coeff == 0)
-         {
-            png_ptr->rgb_to_gray_red_coeff   = 6968;
-            png_ptr->rgb_to_gray_green_coeff = 23434;
-            /* png_ptr->rgb_to_gray_blue_coeff  = 2366; */
-         }
-      }
-   }
-}
-
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-/* Convert a RGB image to a grayscale of the same width.  This allows us,
- * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.
- */
-
-void PNGAPI
-png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
-   double green)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_set_rgb_to_gray_fixed(png_ptr, error_action,
-      png_fixed(png_ptr, red, "rgb to gray red coefficient"),
-      png_fixed(png_ptr, green, "rgb to gray green coefficient"));
-}
-#endif /* FLOATING POINT */
-
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-void PNGAPI
-png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
-    read_user_transform_fn)
-{
-   png_debug(1, "in png_set_read_user_transform_fn");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   png_ptr->transformations |= PNG_USER_TRANSFORM;
-   png_ptr->read_user_transform_fn = read_user_transform_fn;
-#endif
-}
-#endif
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* In the case of gamma transformations only do transformations on images where
- * the [file] gamma and screen_gamma are not close reciprocals, otherwise it
- * slows things down slightly, and also needlessly introduces small errors.
- */
-static int /* PRIVATE */
-png_gamma_threshold(png_fixed_point screen_gamma, png_fixed_point file_gamma)
-{
-   /* PNG_GAMMA_THRESHOLD is the threshold for performing gamma
-    * correction as a difference of the overall transform from 1.0
-    *
-    * We want to compare the threshold with s*f - 1, if we get
-    * overflow here it is because of wacky gamma values so we
-    * turn on processing anyway.
-    */
-   png_fixed_point gtest;
-   return !png_muldiv(&gtest, screen_gamma, file_gamma, PNG_FP_1) ||
-       png_gamma_significant(gtest);
-}
-#endif
-
-/* Initialize everything needed for the read.  This includes modifying
- * the palette.
- */
-
-/*For the moment 'png_init_palette_transformations' and
- * 'png_init_rgb_transformations' only do some flag canceling optimizations.
- * The intent is that these two routines should have palette or rgb operations
- * extracted from 'png_init_read_transformations'.
- */
-static void /* PRIVATE */
-png_init_palette_transformations(png_structp png_ptr)
-{
-   /* Called to handle the (input) palette case.  In png_do_read_transformations
-    * the first step is to expand the palette if requested, so this code must
-    * take care to only make changes that are invariant with respect to the
-    * palette expansion, or only do them if there is no expansion.
-    *
-    * STRIP_ALPHA has already been handled in the caller (by setting num_trans
-    * to 0.)
-    */
-   int input_has_alpha = 0;
-   int input_has_transparency = 0;
-
-   if (png_ptr->num_trans > 0)
-   {
-      int i;
-
-      /* Ignore if all the entries are opaque (unlikely!) */
-      for (i=0; i<png_ptr->num_trans; ++i)
-         if (png_ptr->trans_alpha[i] == 255)
-            continue;
-         else if (png_ptr->trans_alpha[i] == 0)
-            input_has_transparency = 1;
-         else
-            input_has_alpha = 1;
-   }
-
-   /* If no alpha we can optimize. */
-   if (!input_has_alpha)
-   {
-      /* Any alpha means background and associative alpha processing is
-       * required, however if the alpha is 0 or 1 throughout OPTIIMIZE_ALPHA
-       * and ENCODE_ALPHA are irrelevant.
-       */
-      png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-      png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-
-      if (!input_has_transparency)
-         png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND);
-   }
-
-#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* png_set_background handling - deals with the complexity of whether the
-    * background color is in the file format or the screen format in the case
-    * where an 'expand' will happen.
-    */
-
-   /* The following code cannot be entered in the alpha pre-multiplication case
-    * because PNG_BACKGROUND_EXPAND is cancelled below.
-    */
-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-       (png_ptr->transformations & PNG_EXPAND))
-   {
-      {
-         png_ptr->background.red   =
-             png_ptr->palette[png_ptr->background.index].red;
-         png_ptr->background.green =
-             png_ptr->palette[png_ptr->background.index].green;
-         png_ptr->background.blue  =
-             png_ptr->palette[png_ptr->background.index].blue;
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-        if (png_ptr->transformations & PNG_INVERT_ALPHA)
-        {
-           if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-           {
-              /* Invert the alpha channel (in tRNS) unless the pixels are
-               * going to be expanded, in which case leave it for later
-               */
-              int i, istop = png_ptr->num_trans;
-
-              for (i=0; i<istop; i++)
-                 png_ptr->trans_alpha[i] = (png_byte)(255 -
-                    png_ptr->trans_alpha[i]);
-           }
-        }
-#endif /* PNG_READ_INVERT_ALPHA_SUPPORTED */
-      }
-   } /* background expand and (therefore) no alpha association. */
-#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */
-}
-
-static void /* PRIVATE */
-png_init_rgb_transformations(png_structp png_ptr)
-{
-   /* Added to libpng-1.5.4: check the color type to determine whether there
-    * is any alpha or transparency in the image and simply cancel the
-    * background and alpha mode stuff if there isn't.
-    */
-   int input_has_alpha = (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0;
-   int input_has_transparency = png_ptr->num_trans > 0;
-
-   /* If no alpha we can optimize. */
-   if (!input_has_alpha)
-   {
-      /* Any alpha means background and associative alpha processing is
-       * required, however if the alpha is 0 or 1 throughout OPTIIMIZE_ALPHA
-       * and ENCODE_ALPHA are irrelevant.
-       */
-#     ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-         png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-         png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-#     endif
-
-      if (!input_has_transparency)
-         png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND);
-   }
-
-#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
-   /* png_set_background handling - deals with the complexity of whether the
-    * background color is in the file format or the screen format in the case
-    * where an 'expand' will happen.
-    */
-
-   /* The following code cannot be entered in the alpha pre-multiplication case
-    * because PNG_BACKGROUND_EXPAND is cancelled below.
-    */
-   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-       (png_ptr->transformations & PNG_EXPAND) &&
-       !(png_ptr->color_type & PNG_COLOR_MASK_COLOR))
-       /* i.e., GRAY or GRAY_ALPHA */
-   {
-      {
-         /* Expand background and tRNS chunks */
-         int gray = png_ptr->background.gray;
-         int trans_gray = png_ptr->trans_color.gray;
-
-         switch (png_ptr->bit_depth)
-         {
-            case 1:
-               gray *= 0xff;
-               trans_gray *= 0xff;
-               break;
-
-            case 2:
-               gray *= 0x55;
-               trans_gray *= 0x55;
-               break;
-
-            case 4:
-               gray *= 0x11;
-               trans_gray *= 0x11;
-               break;
-
-            default:
-
-            case 8:
-               /* Already 8 bits, fall through */
-
-            case 16:
-               /* Already a full 16 bits */
-               break;
-         }
-
-         png_ptr->background.red = png_ptr->background.green =
-            png_ptr->background.blue = (png_uint_16)gray;
-
-         if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
-         {
-            png_ptr->trans_color.red = png_ptr->trans_color.green =
-               png_ptr->trans_color.blue = (png_uint_16)trans_gray;
-         }
-      }
-   } /* background expand and (therefore) no alpha association. */
-#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */
-}
-
-void /* PRIVATE */
-png_init_read_transformations(png_structp png_ptr)
-{
-   png_debug(1, "in png_init_read_transformations");
-
-   /* This internal function is called from png_read_start_row in pngrutil.c
-    * and it is called before the 'rowbytes' calculation is done, so the code
-    * in here can change or update the transformations flags.
-    *
-    * First do updates that do not depend on the details of the PNG image data
-    * being processed.
-    */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   /* Prior to 1.5.4 these tests were performed from png_set_gamma, 1.5.4 adds
-    * png_set_alpha_mode and this is another source for a default file gamma so
-    * the test needs to be performed later - here.  In addition prior to 1.5.4
-    * the tests were repeated for the PALETTE color type here - this is no
-    * longer necessary (and doesn't seem to have been necessary before.)
-    */
-   {
-      /* The following temporary indicates if overall gamma correction is
-       * required.
-       */
-      int gamma_correction = 0;
-
-      if (png_ptr->gamma != 0) /* has been set */
-      {
-         if (png_ptr->screen_gamma != 0) /* screen set too */
-            gamma_correction = png_gamma_threshold(png_ptr->gamma,
-               png_ptr->screen_gamma);
-
-         else
-            /* Assume the output matches the input; a long time default behavior
-             * of libpng, although the standard has nothing to say about this.
-             */
-            png_ptr->screen_gamma = png_reciprocal(png_ptr->gamma);
-      }
-
-      else if (png_ptr->screen_gamma != 0)
-         /* The converse - assume the file matches the screen, note that this
-          * perhaps undesireable default can (from 1.5.4) be changed by calling
-          * png_set_alpha_mode (even if the alpha handling mode isn't required
-          * or isn't changed from the default.)
-          */
-         png_ptr->gamma = png_reciprocal(png_ptr->screen_gamma);
-
-      else /* neither are set */
-         /* Just in case the following prevents any processing - file and screen
-          * are both assumed to be linear and there is no way to introduce a
-          * third gamma value other than png_set_background with 'UNIQUE', and,
-          * prior to 1.5.4
-          */
-         png_ptr->screen_gamma = png_ptr->gamma = PNG_FP_1;
-
-      /* Now turn the gamma transformation on or off as appropriate.  Notice
-       * that PNG_GAMMA just refers to the file->screen correction.  Alpha
-       * composition may independently cause gamma correction because it needs
-       * linear data (e.g. if the file has a gAMA chunk but the screen gamma
-       * hasn't been specified.)  In any case this flag may get turned off in
-       * the code immediately below if the transform can be handled outside the
-       * row loop.
-       */
-      if (gamma_correction)
-         png_ptr->transformations |= PNG_GAMMA;
-
-      else
-         png_ptr->transformations &= ~PNG_GAMMA;
-   }
-#endif
-
-   /* Certain transformations have the effect of preventing other
-    * transformations that happen afterward in png_do_read_transformations,
-    * resolve the interdependencies here.  From the code of
-    * png_do_read_transformations the order is:
-    *
-    *  1) PNG_EXPAND (including PNG_EXPAND_tRNS)
-    *  2) PNG_STRIP_ALPHA (if no compose)
-    *  3) PNG_RGB_TO_GRAY
-    *  4) PNG_GRAY_TO_RGB iff !PNG_BACKGROUND_IS_GRAY
-    *  5) PNG_COMPOSE
-    *  6) PNG_GAMMA
-    *  7) PNG_STRIP_ALPHA (if compose)
-    *  8) PNG_ENCODE_ALPHA
-    *  9) PNG_SCALE_16_TO_8
-    * 10) PNG_16_TO_8
-    * 11) PNG_QUANTIZE (converts to palette)
-    * 12) PNG_EXPAND_16
-    * 13) PNG_GRAY_TO_RGB iff PNG_BACKGROUND_IS_GRAY
-    * 14) PNG_INVERT_MONO
-    * 15) PNG_SHIFT
-    * 16) PNG_PACK
-    * 17) PNG_BGR
-    * 18) PNG_PACKSWAP
-    * 19) PNG_FILLER (includes PNG_ADD_ALPHA)
-    * 20) PNG_INVERT_ALPHA
-    * 21) PNG_SWAP_ALPHA
-    * 22) PNG_SWAP_BYTES
-    * 23) PNG_USER_TRANSFORM [must be last]
-    */
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
-      !(png_ptr->transformations & PNG_COMPOSE))
-   {
-      /* Stripping the alpha channel happens immediately after the 'expand'
-       * transformations, before all other transformation, so it cancels out
-       * the alpha handling.  It has the side effect negating the effect of
-       * PNG_EXPAND_tRNS too:
-       */
-      png_ptr->transformations &= ~(PNG_BACKGROUND_EXPAND | PNG_ENCODE_ALPHA |
-         PNG_EXPAND_tRNS);
-      png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-
-      /* Kill the tRNS chunk itself too.  Prior to 1.5.4 this did not happen
-       * so transparency information would remain just so long as it wasn't
-       * expanded.  This produces unexpected API changes if the set of things
-       * that do PNG_EXPAND_tRNS changes (perfectly possible given the
-       * documentation - which says ask for what you want, accept what you
-       * get.)  This makes the behavior consistent from 1.5.4:
-       */
-      png_ptr->num_trans = 0;
-   }
-#endif /* STRIP_ALPHA supported, no COMPOSE */
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-   /* If the screen gamma is about 1.0 then the OPTIMIZE_ALPHA and ENCODE_ALPHA
-    * settings will have no effect.
-    */
-   if (!png_gamma_significant(png_ptr->screen_gamma))
-   {
-      png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
-      png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
-   }
-#endif
-
-#if defined(PNG_READ_EXPAND_SUPPORTED) && \
-   defined(PNG_READ_BACKGROUND_SUPPORTED) && \
-   defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
-   /* Detect gray background and attempt to enable optimization for
-    * gray --> RGB case.
-    *
-    * Note:  if PNG_BACKGROUND_EXPAND is set and color_type is either RGB or
-    * RGB_ALPHA (in which case need_expand is superfluous anyway), the
-    * background color might actually be gray yet not be flagged as such.
-    * This is not a problem for the current code, which uses
-    * PNG_BACKGROUND_IS_GRAY only to decide when to do the
-    * png_do_gray_to_rgb() transformation.
-    *
-    * TODO: this code needs to be revised to avoid the complexity and
-    * interdependencies.  The color type of the background should be recorded in
-    * png_set_background, along with the bit depth, then the code has a record
-    * of exactly what color space the background is currently in.
-    */
-   if (png_ptr->transformations & PNG_BACKGROUND_EXPAND)
-   {
-      /* PNG_BACKGROUND_EXPAND: the background is in the file color space, so if
-       * the file was grayscale the background value is gray.
-       */
-      if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR))
-         png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
-   }
-
-   else if (png_ptr->transformations & PNG_COMPOSE)
-   {
-      /* PNG_COMPOSE: png_set_background was called with need_expand false,
-       * so the color is in the color space of the output or png_set_alpha_mode
-       * was called and the color is black.  Ignore RGB_TO_GRAY because that
-       * happens before GRAY_TO_RGB.
-       */
-      if (png_ptr->transformations & PNG_GRAY_TO_RGB)
-      {
-         if (png_ptr->background.red == png_ptr->background.green &&
-             png_ptr->background.red == png_ptr->background.blue)
-         {
-            png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
-            png_ptr->background.gray = png_ptr->background.red;
-         }
-      }
-   }
-#endif /* PNG_READ_GRAY_TO_RGB_SUPPORTED (etc) */
-
-   /* For indexed PNG data (PNG_COLOR_TYPE_PALETTE) many of the transformations
-    * can be performed directly on the palette, and some (such as rgb to gray)
-    * can be optimized inside the palette.  This is particularly true of the
-    * composite (background and alpha) stuff, which can be pretty much all done
-    * in the palette even if the result is expanded to RGB or gray afterward.
-    *
-    * NOTE: this is Not Yet Implemented, the code behaves as in 1.5.1 and
-    * earlier and the palette stuff is actually handled on the first row.  This
-    * leads to the reported bug that the palette returned by png_get_PLTE is not
-    * updated.
-    */
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      png_init_palette_transformations(png_ptr);
-
-   else
-      png_init_rgb_transformations(png_ptr);
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
-   defined(PNG_READ_EXPAND_16_SUPPORTED)
-   if ((png_ptr->transformations & PNG_EXPAND_16) &&
-      (png_ptr->transformations & PNG_COMPOSE) &&
-      !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-      png_ptr->bit_depth != 16)
-   {
-      /* TODO: fix this.  Because the expand_16 operation is after the compose
-       * handling the background color must be 8, not 16, bits deep, but the
-       * application will supply a 16-bit value so reduce it here.
-       *
-       * The PNG_BACKGROUND_EXPAND code above does not expand to 16 bits at
-       * present, so that case is ok (until do_expand_16 is moved.)
-       *
-       * NOTE: this discards the low 16 bits of the user supplied background
-       * color, but until expand_16 works properly there is no choice!
-       */
-#     define CHOP(x) (x)=((png_uint_16)(((png_uint_32)(x)*255+32895) >> 16))
-      CHOP(png_ptr->background.red);
-      CHOP(png_ptr->background.green);
-      CHOP(png_ptr->background.blue);
-      CHOP(png_ptr->background.gray);
-#     undef CHOP
-   }
-#endif /* PNG_READ_BACKGROUND_SUPPORTED && PNG_READ_EXPAND_16_SUPPORTED */
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
-   (defined(PNG_READ_SCALE_16_TO_8_SUPPORTED) || \
-   defined(PNG_READ_STRIP_16_TO_8_SUPPORTED))
-   if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) &&
-      (png_ptr->transformations & PNG_COMPOSE) &&
-      !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
-      png_ptr->bit_depth == 16)
-   {
-      /* On the other hand, if a 16-bit file is to be reduced to 8-bits per
-       * component this will also happen after PNG_COMPOSE and so the background
-       * color must be pre-expanded here.
-       *
-       * TODO: fix this too.
-       */
-      png_ptr->background.red = (png_uint_16)(png_ptr->background.red * 257);
-      png_ptr->background.green =
-         (png_uint_16)(png_ptr->background.green * 257);
-      png_ptr->background.blue = (png_uint_16)(png_ptr->background.blue * 257);
-      png_ptr->background.gray = (png_uint_16)(png_ptr->background.gray * 257);
-   }
-#endif
-
-   /* NOTE: below 'PNG_READ_ALPHA_MODE_SUPPORTED' is presumed to also enable the
-    * background support (see the comments in scripts/pnglibconf.dfa), this
-    * allows pre-multiplication of the alpha channel to be implemented as
-    * compositing on black.  This is probably sub-optimal and has been done in
-    * 1.5.4 betas simply to enable external critique and testing (i.e. to
-    * implement the new API quickly, without lots of internal changes.)
-    */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-#  ifdef PNG_READ_BACKGROUND_SUPPORTED
-      /* Includes ALPHA_MODE */
-      png_ptr->background_1 = png_ptr->background;
-#  endif
-
-   /* This needs to change - in the palette image case a whole set of tables are
-    * built when it would be quicker to just calculate the correct value for
-    * each palette entry directly.  Also, the test is too tricky - why check
-    * PNG_RGB_TO_GRAY if PNG_GAMMA is not set?  The answer seems to be that
-    * PNG_GAMMA is cancelled even if the gamma is known?  The test excludes the
-    * PNG_COMPOSE case, so apparently if there is no *overall* gamma correction
-    * the gamma tables will not be built even if composition is required on a
-    * gamma encoded value.
-    *
-    * In 1.5.4 this is addressed below by an additional check on the individual
-    * file gamma - if it is not 1.0 both RGB_TO_GRAY and COMPOSE need the
-    * tables.
-    */
-   if ((png_ptr->transformations & PNG_GAMMA)
-      || ((png_ptr->transformations & PNG_RGB_TO_GRAY)
-         && (png_gamma_significant(png_ptr->gamma) ||
-            png_gamma_significant(png_ptr->screen_gamma)))
-      || ((png_ptr->transformations & PNG_COMPOSE)
-         && (png_gamma_significant(png_ptr->gamma)
-            || png_gamma_significant(png_ptr->screen_gamma)
-#  ifdef PNG_READ_BACKGROUND_SUPPORTED
-            || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE
-               && png_gamma_significant(png_ptr->background_gamma))
-#  endif
-      )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA)
-         && png_gamma_significant(png_ptr->screen_gamma))
-      )
-   {
-      png_build_gamma_table(png_ptr, png_ptr->bit_depth);
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-      if (png_ptr->transformations & PNG_COMPOSE)
-      {
-         /* Issue a warning about this combination: because RGB_TO_GRAY is
-          * optimized to do the gamma transform if present yet do_background has
-          * to do the same thing if both options are set a
-          * double-gamma-correction happens.  This is true in all versions of
-          * libpng to date.
-          */
-         if (png_ptr->transformations & PNG_RGB_TO_GRAY)
-            png_warning(png_ptr,
-               "libpng does not support gamma+background+rgb_to_gray");
-
-         if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-         {
-            /* We don't get to here unless there is a tRNS chunk with non-opaque
-             * entries - see the checking code at the start of this function.
-             */
-            png_color back, back_1;
-            png_colorp palette = png_ptr->palette;
-            int num_palette = png_ptr->num_palette;
-            int i;
-            if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
-            {
-
-               back.red = png_ptr->gamma_table[png_ptr->background.red];
-               back.green = png_ptr->gamma_table[png_ptr->background.green];
-               back.blue = png_ptr->gamma_table[png_ptr->background.blue];
-
-               back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
-               back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
-               back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
-            }
-            else
-            {
-               png_fixed_point g, gs;
-
-               switch (png_ptr->background_gamma_type)
-               {
-                  case PNG_BACKGROUND_GAMMA_SCREEN:
-                     g = (png_ptr->screen_gamma);
-                     gs = PNG_FP_1;
-                     break;
-
-                  case PNG_BACKGROUND_GAMMA_FILE:
-                     g = png_reciprocal(png_ptr->gamma);
-                     gs = png_reciprocal2(png_ptr->gamma,
-                        png_ptr->screen_gamma);
-                     break;
-
-                  case PNG_BACKGROUND_GAMMA_UNIQUE:
-                     g = png_reciprocal(png_ptr->background_gamma);
-                     gs = png_reciprocal2(png_ptr->background_gamma,
-                        png_ptr->screen_gamma);
-                     break;
-                  default:
-                     g = PNG_FP_1;    /* back_1 */
-                     gs = PNG_FP_1;   /* back */
-                     break;
-               }
-
-               if (png_gamma_significant(gs))
-               {
-                  back.red = png_gamma_8bit_correct(png_ptr->background.red,
-                      gs);
-                  back.green = png_gamma_8bit_correct(png_ptr->background.green,
-                      gs);
-                  back.blue = png_gamma_8bit_correct(png_ptr->background.blue,
-                      gs);
-               }
-
-               else
-               {
-                  back.red   = (png_byte)png_ptr->background.red;
-                  back.green = (png_byte)png_ptr->background.green;
-                  back.blue  = (png_byte)png_ptr->background.blue;
-               }
-
-               if (png_gamma_significant(g))
-               {
-                  back_1.red = png_gamma_8bit_correct(png_ptr->background.red,
-                     g);
-                  back_1.green = png_gamma_8bit_correct(
-                     png_ptr->background.green, g);
-                  back_1.blue = png_gamma_8bit_correct(png_ptr->background.blue,
-                     g);
-               }
-
-               else
-               {
-                  back_1.red   = (png_byte)png_ptr->background.red;
-                  back_1.green = (png_byte)png_ptr->background.green;
-                  back_1.blue  = (png_byte)png_ptr->background.blue;
-               }
-            }
-
-            for (i = 0; i < num_palette; i++)
-            {
-               if (i < (int)png_ptr->num_trans &&
-                   png_ptr->trans_alpha[i] != 0xff)
-               {
-                  if (png_ptr->trans_alpha[i] == 0)
-                  {
-                     palette[i] = back;
-                  }
-                  else /* if (png_ptr->trans_alpha[i] != 0xff) */
-                  {
-                     png_byte v, w;
-
-                     v = png_ptr->gamma_to_1[palette[i].red];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.red);
-                     palette[i].red = png_ptr->gamma_from_1[w];
-
-                     v = png_ptr->gamma_to_1[palette[i].green];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.green);
-                     palette[i].green = png_ptr->gamma_from_1[w];
-
-                     v = png_ptr->gamma_to_1[palette[i].blue];
-                     png_composite(w, v, png_ptr->trans_alpha[i], back_1.blue);
-                     palette[i].blue = png_ptr->gamma_from_1[w];
-                  }
-               }
-               else
-               {
-                  palette[i].red = png_ptr->gamma_table[palette[i].red];
-                  palette[i].green = png_ptr->gamma_table[palette[i].green];
-                  palette[i].blue = png_ptr->gamma_table[palette[i].blue];
-               }
-            }
-
-            /* Prevent the transformations being done again.
-             *
-             * NOTE: this is highly dubious; it removes the transformations in
-             * place.  This seems inconsistent with the general treatment of the
-             * transformations elsewhere.
-             */
-            png_ptr->transformations &= ~(PNG_COMPOSE | PNG_GAMMA);
-         } /* color_type == PNG_COLOR_TYPE_PALETTE */
-
-         /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
-         else /* color_type != PNG_COLOR_TYPE_PALETTE */
-         {
-            int gs_sig, g_sig;
-            png_fixed_point g = PNG_FP_1;  /* Correction to linear */
-            png_fixed_point gs = PNG_FP_1; /* Correction to screen */
-
-            switch (png_ptr->background_gamma_type)
-            {
-               case PNG_BACKGROUND_GAMMA_SCREEN:
-                  g = png_ptr->screen_gamma;
-                  /* gs = PNG_FP_1; */
-                  break;
-
-               case PNG_BACKGROUND_GAMMA_FILE:
-                  g = png_reciprocal(png_ptr->gamma);
-                  gs = png_reciprocal2(png_ptr->gamma, png_ptr->screen_gamma);
-                  break;
-
-               case PNG_BACKGROUND_GAMMA_UNIQUE:
-                  g = png_reciprocal(png_ptr->background_gamma);
-                  gs = png_reciprocal2(png_ptr->background_gamma,
-                      png_ptr->screen_gamma);
-                  break;
-
-               default:
-                  png_error(png_ptr, "invalid background gamma type");
-            }
-
-            g_sig = png_gamma_significant(g);
-            gs_sig = png_gamma_significant(gs);
-
-            if (g_sig)
-               png_ptr->background_1.gray = png_gamma_correct(png_ptr,
-                   png_ptr->background.gray, g);
-
-            if (gs_sig)
-               png_ptr->background.gray = png_gamma_correct(png_ptr,
-                   png_ptr->background.gray, gs);
-
-            if ((png_ptr->background.red != png_ptr->background.green) ||
-                (png_ptr->background.red != png_ptr->background.blue) ||
-                (png_ptr->background.red != png_ptr->background.gray))
-            {
-               /* RGB or RGBA with color background */
-               if (g_sig)
-               {
-                  png_ptr->background_1.red = png_gamma_correct(png_ptr,
-                      png_ptr->background.red, g);
-
-                  png_ptr->background_1.green = png_gamma_correct(png_ptr,
-                      png_ptr->background.green, g);
-
-                  png_ptr->background_1.blue = png_gamma_correct(png_ptr,
-                      png_ptr->background.blue, g);
-               }
-
-               if (gs_sig)
-               {
-                  png_ptr->background.red = png_gamma_correct(png_ptr,
-                      png_ptr->background.red, gs);
-
-                  png_ptr->background.green = png_gamma_correct(png_ptr,
-                      png_ptr->background.green, gs);
-
-                  png_ptr->background.blue = png_gamma_correct(png_ptr,
-                      png_ptr->background.blue, gs);
-               }
-            }
-
-            else
-            {
-               /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */
-               png_ptr->background_1.red = png_ptr->background_1.green
-                   = png_ptr->background_1.blue = png_ptr->background_1.gray;
-
-               png_ptr->background.red = png_ptr->background.green
-                   = png_ptr->background.blue = png_ptr->background.gray;
-            }
-
-            /* The background is now in screen gamma: */
-            png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_SCREEN;
-         } /* color_type != PNG_COLOR_TYPE_PALETTE */
-      }/* png_ptr->transformations & PNG_BACKGROUND */
-
-      else
-      /* Transformation does not include PNG_BACKGROUND */
-#endif /* PNG_READ_BACKGROUND_SUPPORTED */
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-         /* RGB_TO_GRAY needs to have non-gamma-corrected values! */
-         && ((png_ptr->transformations & PNG_EXPAND) == 0 ||
-         (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0)
-#endif
-         )
-      {
-         png_colorp palette = png_ptr->palette;
-         int num_palette = png_ptr->num_palette;
-         int i;
-
-         /*NOTE: there are other transformations that should probably be in here
-          * too.
-          */
-         for (i = 0; i < num_palette; i++)
-         {
-            palette[i].red = png_ptr->gamma_table[palette[i].red];
-            palette[i].green = png_ptr->gamma_table[palette[i].green];
-            palette[i].blue = png_ptr->gamma_table[palette[i].blue];
-         }
-
-         /* Done the gamma correction. */
-         png_ptr->transformations &= ~PNG_GAMMA;
-      } /* color_type == PALETTE && !PNG_BACKGROUND transformation */
-   }
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   else
-#endif
-#endif /* PNG_READ_GAMMA_SUPPORTED */
-
-#ifdef PNG_READ_BACKGROUND_SUPPORTED
-   /* No GAMMA transformation (see the hanging else 4 lines above) */
-   if ((png_ptr->transformations & PNG_COMPOSE) &&
-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
-   {
-      int i;
-      int istop = (int)png_ptr->num_trans;
-      png_color back;
-      png_colorp palette = png_ptr->palette;
-
-      back.red   = (png_byte)png_ptr->background.red;
-      back.green = (png_byte)png_ptr->background.green;
-      back.blue  = (png_byte)png_ptr->background.blue;
-
-      for (i = 0; i < istop; i++)
-      {
-         if (png_ptr->trans_alpha[i] == 0)
-         {
-            palette[i] = back;
-         }
-
-         else if (png_ptr->trans_alpha[i] != 0xff)
-         {
-            /* The png_composite() macro is defined in png.h */
-            png_composite(palette[i].red, palette[i].red,
-                png_ptr->trans_alpha[i], back.red);
-
-            png_composite(palette[i].green, palette[i].green,
-                png_ptr->trans_alpha[i], back.green);
-
-            png_composite(palette[i].blue, palette[i].blue,
-                png_ptr->trans_alpha[i], back.blue);
-         }
-      }
-
-      png_ptr->transformations &= ~PNG_COMPOSE;
-   }
-#endif /* PNG_READ_BACKGROUND_SUPPORTED */
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-   if ((png_ptr->transformations & PNG_SHIFT) &&
-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
-   {
-      int i;
-      int istop = png_ptr->num_palette;
-      int shift = 8 - png_ptr->sig_bit.red;
-
-      /* significant bits can be in the range 1 to 7 for a meaninful result, if
-       * the number of significant bits is 0 then no shift is done (this is an
-       * error condition which is silently ignored.)
-       */
-      if (shift > 0 && shift < 8) for (i=0; i<istop; ++i)
-      {
-         int component = png_ptr->palette[i].red;
-
-         component >>= shift;
-         png_ptr->palette[i].red = (png_byte)component;
-      }
-
-      shift = 8 - png_ptr->sig_bit.green;
-      if (shift > 0 && shift < 8) for (i=0; i<istop; ++i)
-      {
-         int component = png_ptr->palette[i].green;
-
-         component >>= shift;
-         png_ptr->palette[i].green = (png_byte)component;
-      }
-
-      shift = 8 - png_ptr->sig_bit.blue;
-      if (shift > 0 && shift < 8) for (i=0; i<istop; ++i)
-      {
-         int component = png_ptr->palette[i].blue;
-
-         component >>= shift;
-         png_ptr->palette[i].blue = (png_byte)component;
-      }
-   }
-#endif  /* PNG_READ_SHIFT_SUPPORTED */
-}
-
-/* Modify the info structure to reflect the transformations.  The
- * info should be updated so a PNG file could be written with it,
- * assuming the transformations result in valid PNG data.
- */
-void /* PRIVATE */
-png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_read_transform_info");
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND)
-   {
-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         /* This check must match what actually happens in
-          * png_do_expand_palette; if it ever checks the tRNS chunk to see if
-          * it is all opaque we must do the same (at present it does not.)
-          */
-         if (png_ptr->num_trans > 0)
-            info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-
-         else
-            info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-
-         info_ptr->bit_depth = 8;
-         info_ptr->num_trans = 0;
-      }
-      else
-      {
-         if (png_ptr->num_trans)
-         {
-            if (png_ptr->transformations & PNG_EXPAND_tRNS)
-               info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
-         }
-         if (info_ptr->bit_depth < 8)
-            info_ptr->bit_depth = 8;
-
-         info_ptr->num_trans = 0;
-      }
-   }
-#endif
-
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-   /* The following is almost certainly wrong unless the background value is in
-    * the screen space!
-    */
-   if (png_ptr->transformations & PNG_COMPOSE)
-      info_ptr->background = png_ptr->background;
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   /* The following used to be conditional on PNG_GAMMA (prior to 1.5.4),
-    * however it seems that the code in png_init_read_transformations, which has
-    * been called before this from png_read_update_info->png_read_start_row
-    * sometimes does the gamma transform and cancels the flag.
-    */
-   info_ptr->gamma = png_ptr->gamma;
-#endif
-
-   if (info_ptr->bit_depth == 16)
-   {
-#  ifdef PNG_READ_16BIT_SUPPORTED
-#     ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-         if (png_ptr->transformations & PNG_SCALE_16_TO_8)
-            info_ptr->bit_depth = 8;
-#     endif
-
-#     ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-         if (png_ptr->transformations & PNG_16_TO_8)
-            info_ptr->bit_depth = 8;
-#     endif
-
-#  else
-      /* No 16 bit support: force chopping 16-bit input down to 8, in this case
-       * the app program can chose if both APIs are available by setting the
-       * correct scaling to use.
-       */
-#     ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-         /* For compatibility with previous versions use the strip method by
-          * default.  This code works because if PNG_SCALE_16_TO_8 is already
-          * set the code below will do that in preference to the chop.
-          */
-         png_ptr->transformations |= PNG_16_TO_8;
-         info_ptr->bit_depth = 8;
-#     else
-
-#        ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-            png_ptr->transformations |= PNG_SCALE_16_TO_8;
-            info_ptr->bit_depth = 8;
-#        else
-
-            CONFIGURATION ERROR: you must enable at least one 16 to 8 method
-#        endif
-#    endif
-#endif /* !READ_16BIT_SUPPORTED */
-   }
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
-      info_ptr->color_type = (png_byte)(info_ptr->color_type |
-         PNG_COLOR_MASK_COLOR);
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
-      info_ptr->color_type = (png_byte)(info_ptr->color_type &
-         ~PNG_COLOR_MASK_COLOR);
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   if (png_ptr->transformations & PNG_QUANTIZE)
-   {
-      if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
-          (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
-          png_ptr->palette_lookup && info_ptr->bit_depth == 8)
-      {
-         info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-      }
-   }
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND_16 && info_ptr->bit_depth == 8 &&
-      info_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      info_ptr->bit_depth = 16;
-   }
-#endif
-
-#ifdef PNG_READ_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8))
-      info_ptr->bit_depth = 8;
-#endif
-
-   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      info_ptr->channels = 1;
-
-   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
-      info_ptr->channels = 3;
-
-   else
-      info_ptr->channels = 1;
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_STRIP_ALPHA)
-   {
-      info_ptr->color_type = (png_byte)(info_ptr->color_type &
-         ~PNG_COLOR_MASK_ALPHA);
-      info_ptr->num_trans = 0;
-   }
-#endif
-
-   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-      info_ptr->channels++;
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   /* STRIP_ALPHA and FILLER allowed:  MASK_ALPHA bit stripped above */
-   if ((png_ptr->transformations & PNG_FILLER) &&
-       ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
-       (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)))
-   {
-      info_ptr->channels++;
-      /* If adding a true alpha channel not just filler */
-      if (png_ptr->transformations & PNG_ADD_ALPHA)
-         info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
-   }
-#endif
-
-#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
-defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-   {
-      if (info_ptr->bit_depth < png_ptr->user_transform_depth)
-         info_ptr->bit_depth = png_ptr->user_transform_depth;
-
-      if (info_ptr->channels < png_ptr->user_transform_channels)
-         info_ptr->channels = png_ptr->user_transform_channels;
-   }
-#endif
-
-   info_ptr->pixel_depth = (png_byte)(info_ptr->channels *
-       info_ptr->bit_depth);
-
-   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, info_ptr->width);
-
-   /* Adding in 1.5.4: cache the above value in png_struct so that we can later
-    * check in png_rowbytes that the user buffer won't get overwritten.  Note
-    * that the field is not always set - if png_read_update_info isn't called
-    * the application has to either not do any transforms or get the calculation
-    * right itself.
-    */
-   png_ptr->info_rowbytes = info_ptr->rowbytes;
-
-#ifndef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr)
-      return;
-#endif
-}
-
-/* Transform the row.  The order of transformations is significant,
- * and is very touchy.  If you add a transformation, take care to
- * decide how it fits in with the other transformations here.
- */
-void /* PRIVATE */
-png_do_read_transformations(png_structp png_ptr, png_row_infop row_info)
-{
-   png_debug(1, "in png_do_read_transformations");
-
-   if (png_ptr->row_buf == NULL)
-   {
-      /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this
-       * error is incredibly rare and incredibly easy to debug without this
-       * information.
-       */
-      png_error(png_ptr, "NULL row buffer");
-   }
-
-   /* The following is debugging; prior to 1.5.4 the code was never compiled in;
-    * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro
-    * PNG_WARN_UNINITIALIZED_ROW removed.  In 1.5 the new flag is set only for
-    * selected new APIs to ensure that there is no API change.
-    */
-   if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 &&
-      !(png_ptr->flags & PNG_FLAG_ROW_INIT))
-   {
-      /* Application has failed to call either png_read_start_image() or
-       * png_read_update_info() after setting transforms that expand pixels.
-       * This check added to libpng-1.2.19 (but not enabled until 1.5.4).
-       */
-      png_error(png_ptr, "Uninitialized row");
-   }
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND)
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         png_do_expand_palette(row_info, png_ptr->row_buf + 1,
-             png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);
-      }
-
-      else
-      {
-         if (png_ptr->num_trans &&
-             (png_ptr->transformations & PNG_EXPAND_tRNS))
-            png_do_expand(row_info, png_ptr->row_buf + 1,
-                &(png_ptr->trans_color));
-
-         else
-            png_do_expand(row_info, png_ptr->row_buf + 1,
-                NULL);
-      }
-   }
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
-      !(png_ptr->transformations & PNG_COMPOSE) &&
-      (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-      row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-         0 /* at_start == false, because SWAP_ALPHA happens later */);
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
-   {
-      int rgb_error =
-          png_do_rgb_to_gray(png_ptr, row_info,
-              png_ptr->row_buf + 1);
-
-      if (rgb_error)
-      {
-         png_ptr->rgb_to_gray_status=1;
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-             PNG_RGB_TO_GRAY_WARN)
-            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-
-         if ((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
-             PNG_RGB_TO_GRAY_ERR)
-            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
-      }
-   }
-#endif
-
-/* From Andreas Dilger e-mail to png-implement, 26 March 1998:
- *
- *   In most cases, the "simple transparency" should be done prior to doing
- *   gray-to-RGB, or you will have to test 3x as many bytes to check if a
- *   pixel is transparent.  You would also need to make sure that the
- *   transparency information is upgraded to RGB.
- *
- *   To summarize, the current flow is:
- *   - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
- *                                   with background "in place" if transparent,
- *                                   convert to RGB if necessary
- *   - Gray + alpha -> composite with gray background and remove alpha bytes,
- *                                   convert to RGB if necessary
- *
- *   To support RGB backgrounds for gray images we need:
- *   - Gray + simple transparency -> convert to RGB + simple transparency,
- *                                   compare 3 or 6 bytes and composite with
- *                                   background "in place" if transparent
- *                                   (3x compare/pixel compared to doing
- *                                   composite with gray bkgrnd)
- *   - Gray + alpha -> convert to RGB + alpha, composite with background and
- *                                   remove alpha bytes (3x float
- *                                   operations/pixel compared with composite
- *                                   on gray background)
- *
- *  Greg's change will do this.  The reason it wasn't done before is for
- *  performance, as this increases the per-pixel operations.  If we would check
- *  in advance if the background was gray or RGB, and position the gray-to-RGB
- *  transform appropriately, then it would save a lot of work/time.
- */
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /* If gray -> RGB, do so now only if background is non-gray; else do later
-    * for performance reasons
-    */
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
-       !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
-      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
-#endif
-
-#if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\
-   (defined PNG_READ_ALPHA_MODE_SUPPORTED)
-   if (png_ptr->transformations & PNG_COMPOSE)
-      png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr);
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   if ((png_ptr->transformations & PNG_GAMMA) &&
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-      /* Because RGB_TO_GRAY does the gamma transform. */
-      !(png_ptr->transformations & PNG_RGB_TO_GRAY) &&
-#endif
-#if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\
-   (defined PNG_READ_ALPHA_MODE_SUPPORTED)
-      /* Because PNG_COMPOSE does the gamma transform if there is something to
-       * do (if there is an alpha channel or transparency.)
-       */
-       !((png_ptr->transformations & PNG_COMPOSE) &&
-       ((png_ptr->num_trans != 0) ||
-       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
-#endif
-      /* Because png_init_read_transformations transforms the palette, unless
-       * RGB_TO_GRAY will do the transform.
-       */
-       (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
-      png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr);
-#endif
-
-#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
-   if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
-      (png_ptr->transformations & PNG_COMPOSE) &&
-      (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
-      row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-         0 /* at_start == false, because SWAP_ALPHA happens later */);
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-   if ((png_ptr->transformations & PNG_ENCODE_ALPHA) &&
-      (row_info->color_type & PNG_COLOR_MASK_ALPHA))
-      png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr);
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-   if (png_ptr->transformations & PNG_SCALE_16_TO_8)
-      png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-   /* There is no harm in doing both of these because only one has any effect,
-    * by putting the 'scale' option first if the app asks for scale (either by
-    * calling the API or in a TRANSFORM flag) this is what happens.
-    */
-   if (png_ptr->transformations & PNG_16_TO_8)
-      png_do_chop(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   if (png_ptr->transformations & PNG_QUANTIZE)
-   {
-      png_do_quantize(row_info, png_ptr->row_buf + 1,
-          png_ptr->palette_lookup, png_ptr->quantize_index);
-
-      if (row_info->rowbytes == 0)
-         png_error(png_ptr, "png_do_quantize returned rowbytes=0");
-   }
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-   /* Do the expansion now, after all the arithmetic has been done.  Notice
-    * that previous transformations can handle the PNG_EXPAND_16 flag if this
-    * is efficient (particularly true in the case of gamma correction, where
-    * better accuracy results faster!)
-    */
-   if (png_ptr->transformations & PNG_EXPAND_16)
-      png_do_expand_16(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   /*NOTE: moved here in 1.5.4 (from much later in this list.) */
-   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
-       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
-      png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_INVERT_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_MONO)
-      png_do_invert(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-   if (png_ptr->transformations & PNG_SHIFT)
-      png_do_unshift(row_info, png_ptr->row_buf + 1,
-          &(png_ptr->shift));
-#endif
-
-#ifdef PNG_READ_PACK_SUPPORTED
-   if (png_ptr->transformations & PNG_PACK)
-      png_do_unpack(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_BGR_SUPPORTED
-   if (png_ptr->transformations & PNG_BGR)
-      png_do_bgr(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_PACKSWAP)
-      png_do_packswap(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   if (png_ptr->transformations & PNG_FILLER)
-      png_do_read_filler(row_info, png_ptr->row_buf + 1,
-          (png_uint_32)png_ptr->filler, png_ptr->flags);
-#endif
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_ALPHA)
-      png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_ALPHA)
-      png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-#ifdef PNG_READ_SWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_BYTES)
-      png_do_swap(row_info, png_ptr->row_buf + 1);
-#endif
-#endif
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-    {
-      if (png_ptr->read_user_transform_fn != NULL)
-         (*(png_ptr->read_user_transform_fn)) /* User read transform function */
-             (png_ptr,     /* png_ptr */
-             row_info,     /* row_info: */
-                /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
-                /*  png_byte color_type;     color type of pixels */
-                /*  png_byte bit_depth;      bit depth of samples */
-                /*  png_byte channels;       number of channels (1-4) */
-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
-             png_ptr->row_buf + 1);    /* start of pixel data for row */
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-      if (png_ptr->user_transform_depth)
-         row_info->bit_depth = png_ptr->user_transform_depth;
-
-      if (png_ptr->user_transform_channels)
-         row_info->channels = png_ptr->user_transform_channels;
-#endif
-      row_info->pixel_depth = (png_byte)(row_info->bit_depth *
-          row_info->channels);
-
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width);
-   }
-#endif
-}
-
-#ifdef PNG_READ_PACK_SUPPORTED
-/* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
- * without changing the actual values.  Thus, if you had a row with
- * a bit depth of 1, you would end up with bytes that only contained
- * the numbers 0 or 1.  If you would rather they contain 0 and 255, use
- * png_do_shift() after this.
- */
-void /* PRIVATE */
-png_do_unpack(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_unpack");
-
-   if (row_info->bit_depth < 8)
-   {
-      png_uint_32 i;
-      png_uint_32 row_width=row_info->width;
-
-      switch (row_info->bit_depth)
-      {
-         case 1:
-         {
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
-            png_bytep dp = row + (png_size_t)row_width - 1;
-            png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07);
-            for (i = 0; i < row_width; i++)
-            {
-               *dp = (png_byte)((*sp >> shift) & 0x01);
-
-               if (shift == 7)
-               {
-                  shift = 0;
-                  sp--;
-               }
-
-               else
-                  shift++;
-
-               dp--;
-            }
-            break;
-         }
-
-         case 2:
-         {
-
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
-            png_bytep dp = row + (png_size_t)row_width - 1;
-            png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-            for (i = 0; i < row_width; i++)
-            {
-               *dp = (png_byte)((*sp >> shift) & 0x03);
-
-               if (shift == 6)
-               {
-                  shift = 0;
-                  sp--;
-               }
-
-               else
-                  shift += 2;
-
-               dp--;
-            }
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
-            png_bytep dp = row + (png_size_t)row_width - 1;
-            png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
-            for (i = 0; i < row_width; i++)
-            {
-               *dp = (png_byte)((*sp >> shift) & 0x0f);
-
-               if (shift == 4)
-               {
-                  shift = 0;
-                  sp--;
-               }
-
-               else
-                  shift = 4;
-
-               dp--;
-            }
-            break;
-         }
-
-         default:
-            break;
-      }
-      row_info->bit_depth = 8;
-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
-      row_info->rowbytes = row_width * row_info->channels;
-   }
-}
-#endif
-
-#ifdef PNG_READ_SHIFT_SUPPORTED
-/* Reverse the effects of png_do_shift.  This routine merely shifts the
- * pixels back to their significant bits values.  Thus, if you have
- * a row of bit depth 8, but only 5 are significant, this will shift
- * the values back to 0 through 31.
- */
-void /* PRIVATE */
-png_do_unshift(png_row_infop row_info, png_bytep row,
-    png_const_color_8p sig_bits)
-{
-   int color_type;
-
-   png_debug(1, "in png_do_unshift");
-
-   /* The palette case has already been handled in the _init routine. */
-   color_type = row_info->color_type;
-
-   if (color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      int shift[4];
-      int channels = 0;
-      int bit_depth = row_info->bit_depth;
-
-      if (color_type & PNG_COLOR_MASK_COLOR)
-      {
-         shift[channels++] = bit_depth - sig_bits->red;
-         shift[channels++] = bit_depth - sig_bits->green;
-         shift[channels++] = bit_depth - sig_bits->blue;
-      }
-
-      else
-      {
-         shift[channels++] = bit_depth - sig_bits->gray;
-      }
-
-      if (color_type & PNG_COLOR_MASK_ALPHA)
-      {
-         shift[channels++] = bit_depth - sig_bits->alpha;
-      }
-
-      {
-         int c, have_shift;
-
-         for (c = have_shift = 0; c < channels; ++c)
-         {
-            /* A shift of more than the bit depth is an error condition but it
-             * gets ignored here.
-             */
-            if (shift[c] <= 0 || shift[c] >= bit_depth)
-               shift[c] = 0;
-
-            else
-               have_shift = 1;
-         }
-
-         if (!have_shift)
-            return;
-      }
-
-      switch (bit_depth)
-      {
-         default:
-         /* Must be 1bpp gray: should not be here! */
-            /* NOTREACHED */
-            break;
-
-         case 2:
-         /* Must be 2bpp gray */
-         /* assert(channels == 1 && shift[0] == 1) */
-         {
-            png_bytep bp = row;
-            png_bytep bp_end = bp + row_info->rowbytes;
-
-            while (bp < bp_end)
-            {
-               int b = (*bp >> 1) & 0x55;
-               *bp++ = (png_byte)b;
-            }
-            break;
-         }
-
-         case 4:
-         /* Must be 4bpp gray */
-         /* assert(channels == 1) */
-         {
-            png_bytep bp = row;
-            png_bytep bp_end = bp + row_info->rowbytes;
-            int gray_shift = shift[0];
-            int mask =  0xf >> gray_shift;
-
-            mask |= mask << 4;
-
-            while (bp < bp_end)
-            {
-               int b = (*bp >> gray_shift) & mask;
-               *bp++ = (png_byte)b;
-            }
-            break;
-         }
-
-         case 8:
-         /* Single byte components, G, GA, RGB, RGBA */
-         {
-            png_bytep bp = row;
-            png_bytep bp_end = bp + row_info->rowbytes;
-            int channel = 0;
-
-            while (bp < bp_end)
-            {
-               int b = *bp >> shift[channel];
-               if (++channel >= channels)
-                  channel = 0;
-               *bp++ = (png_byte)b;
-            }
-            break;
-         }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-         case 16:
-         /* Double byte components, G, GA, RGB, RGBA */
-         {
-            png_bytep bp = row;
-            png_bytep bp_end = bp + row_info->rowbytes;
-            int channel = 0;
-
-            while (bp < bp_end)
-            {
-               int value = (bp[0] << 8) + bp[1];
-
-               value >>= shift[channel];
-               if (++channel >= channels)
-                  channel = 0;
-               *bp++ = (png_byte)(value >> 8);
-               *bp++ = (png_byte)(value & 0xff);
-            }
-            break;
-         }
-#endif
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
-/* Scale rows of bit depth 16 down to 8 accurately */
-void /* PRIVATE */
-png_do_scale_16_to_8(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_scale_16_to_8");
-
-   if (row_info->bit_depth == 16)
-   {
-      png_bytep sp = row; /* source */
-      png_bytep dp = row; /* destination */
-      png_bytep ep = sp + row_info->rowbytes; /* end+1 */
-
-      while (sp < ep)
-      {
-         /* The input is an array of 16 bit components, these must be scaled to
-          * 8 bits each.  For a 16 bit value V the required value (from the PNG
-          * specification) is:
-          *
-          *    (V * 255) / 65535
-          *
-          * This reduces to round(V / 257), or floor((V + 128.5)/257)
-          *
-          * Represent V as the two byte value vhi.vlo.  Make a guess that the
-          * result is the top byte of V, vhi, then the correction to this value
-          * is:
-          *
-          *    error = floor(((V-vhi.vhi) + 128.5) / 257)
-          *          = floor(((vlo-vhi) + 128.5) / 257)
-          *
-          * This can be approximated using integer arithmetic (and a signed
-          * shift):
-          *
-          *    error = (vlo-vhi+128) >> 8;
-          *
-          * The approximate differs from the exact answer only when (vlo-vhi) is
-          * 128; it then gives a correction of +1 when the exact correction is
-          * 0.  This gives 128 errors.  The exact answer (correct for all 16 bit
-          * input values) is:
-          *
-          *    error = (vlo-vhi+128)*65535 >> 24;
-          *
-          * An alternative arithmetic calculation which also gives no errors is:
-          *
-          *    (V * 255 + 32895) >> 16
-          */
-
-         png_int_32 tmp = *sp++; /* must be signed! */
-         tmp += (((int)*sp++ - tmp + 128) * 65535) >> 24;
-         *dp++ = (png_byte)tmp;
-      }
-
-      row_info->bit_depth = 8;
-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
-      row_info->rowbytes = row_info->width * row_info->channels;
-   }
-}
-#endif
-
-#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
-void /* PRIVATE */
-/* Simply discard the low byte.  This was the default behavior prior
- * to libpng-1.5.4.
- */
-png_do_chop(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_chop");
-
-   if (row_info->bit_depth == 16)
-   {
-      png_bytep sp = row; /* source */
-      png_bytep dp = row; /* destination */
-      png_bytep ep = sp + row_info->rowbytes; /* end+1 */
-
-      while (sp < ep)
-      {
-         *dp++ = *sp;
-         sp += 2; /* skip low byte */
-      }
-
-      row_info->bit_depth = 8;
-      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
-      row_info->rowbytes = row_info->width * row_info->channels;
-   }
-}
-#endif
-
-#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
-void /* PRIVATE */
-png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_read_swap_alpha");
-
-   {
-      png_uint_32 row_width = row_info->width;
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         /* This converts from RGBA to ARGB */
-         if (row_info->bit_depth == 8)
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save;
-            }
-         }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-         /* This converts from RRGGBBAA to AARRGGBB */
-         else
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save[2];
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save[0] = *(--sp);
-               save[1] = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save[0];
-               *(--dp) = save[1];
-            }
-         }
-#endif
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         /* This converts from GA to AG */
-         if (row_info->bit_depth == 8)
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save;
-            }
-         }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-         /* This converts from GGAA to AAGG */
-         else
-         {
-            png_bytep sp = row + row_info->rowbytes;
-            png_bytep dp = sp;
-            png_byte save[2];
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               save[0] = *(--sp);
-               save[1] = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = save[0];
-               *(--dp) = save[1];
-            }
-         }
-#endif
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
-void /* PRIVATE */
-png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_uint_32 row_width;
-   png_debug(1, "in png_do_read_invert_alpha");
-
-   row_width = row_info->width;
-   if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         /* This inverts the alpha channel in RGBA */
-         png_bytep sp = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-
-/*          This does nothing:
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            We can replace it with:
-*/
-            sp-=3;
-            dp=sp;
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      /* This inverts the alpha channel in RRGGBBAA */
-      else
-      {
-         png_bytep sp = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-            *(--dp) = (png_byte)(255 - *(--sp));
-
-/*          This does nothing:
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-            We can replace it with:
-*/
-            sp-=6;
-            dp=sp;
-         }
-      }
-#endif
-   }
-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         /* This inverts the alpha channel in GA */
-         png_bytep sp = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-            *(--dp) = *(--sp);
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      else
-      {
-         /* This inverts the alpha channel in GGAA */
-         png_bytep sp  = row + row_info->rowbytes;
-         png_bytep dp = sp;
-         png_uint_32 i;
-
-         for (i = 0; i < row_width; i++)
-         {
-            *(--dp) = (png_byte)(255 - *(--sp));
-            *(--dp) = (png_byte)(255 - *(--sp));
-/*
-            *(--dp) = *(--sp);
-            *(--dp) = *(--sp);
-*/
-            sp-=2;
-            dp=sp;
-         }
-      }
-#endif
-   }
-}
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-/* Add filler channel if we have RGB color */
-void /* PRIVATE */
-png_do_read_filler(png_row_infop row_info, png_bytep row,
-    png_uint_32 filler, png_uint_32 flags)
-{
-   png_uint_32 i;
-   png_uint_32 row_width = row_info->width;
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-   png_byte hi_filler = (png_byte)((filler>>8) & 0xff);
-#endif
-   png_byte lo_filler = (png_byte)(filler & 0xff);
-
-   png_debug(1, "in png_do_read_filler");
-
-   if (
-       row_info->color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if (flags & PNG_FLAG_FILLER_AFTER)
-         {
-            /* This changes the data from G to GX */
-            png_bytep sp = row + (png_size_t)row_width;
-            png_bytep dp =  sp + (png_size_t)row_width;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = lo_filler;
-            row_info->channels = 2;
-            row_info->pixel_depth = 16;
-            row_info->rowbytes = row_width * 2;
-         }
-
-         else
-         {
-            /* This changes the data from G to XG */
-            png_bytep sp = row + (png_size_t)row_width;
-            png_bytep dp = sp  + (png_size_t)row_width;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = lo_filler;
-            }
-            row_info->channels = 2;
-            row_info->pixel_depth = 16;
-            row_info->rowbytes = row_width * 2;
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         if (flags & PNG_FLAG_FILLER_AFTER)
-         {
-            /* This changes the data from GG to GGXX */
-            png_bytep sp = row + (png_size_t)row_width * 2;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = hi_filler;
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = hi_filler;
-            *(--dp) = lo_filler;
-            row_info->channels = 2;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-
-         else
-         {
-            /* This changes the data from GG to XXGG */
-            png_bytep sp = row + (png_size_t)row_width * 2;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = hi_filler;
-               *(--dp) = lo_filler;
-            }
-            row_info->channels = 2;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-      }
-#endif
-   } /* COLOR_TYPE == GRAY */
-   else if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if (flags & PNG_FLAG_FILLER_AFTER)
-         {
-            /* This changes the data from RGB to RGBX */
-            png_bytep sp = row + (png_size_t)row_width * 3;
-            png_bytep dp = sp  + (png_size_t)row_width;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = lo_filler;
-            row_info->channels = 4;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-
-         else
-         {
-            /* This changes the data from RGB to XRGB */
-            png_bytep sp = row + (png_size_t)row_width * 3;
-            png_bytep dp = sp + (png_size_t)row_width;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = lo_filler;
-            }
-            row_info->channels = 4;
-            row_info->pixel_depth = 32;
-            row_info->rowbytes = row_width * 4;
-         }
-      }
-
-#ifdef PNG_READ_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         if (flags & PNG_FLAG_FILLER_AFTER)
-         {
-            /* This changes the data from RRGGBB to RRGGBBXX */
-            png_bytep sp = row + (png_size_t)row_width * 6;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 1; i < row_width; i++)
-            {
-               *(--dp) = hi_filler;
-               *(--dp) = lo_filler;
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-            }
-            *(--dp) = hi_filler;
-            *(--dp) = lo_filler;
-            row_info->channels = 4;
-            row_info->pixel_depth = 64;
-            row_info->rowbytes = row_width * 8;
-         }
-
-         else
-         {
-            /* This changes the data from RRGGBB to XXRRGGBB */
-            png_bytep sp = row + (png_size_t)row_width * 6;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = *(--sp);
-               *(--dp) = hi_filler;
-               *(--dp) = lo_filler;
-            }
-
-            row_info->channels = 4;
-            row_info->pixel_depth = 64;
-            row_info->rowbytes = row_width * 8;
-         }
-      }
-#endif
-   } /* COLOR_TYPE == RGB */
-}
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-/* Expand grayscale files to RGB, with or without alpha */
-void /* PRIVATE */
-png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
-{
-   png_uint_32 i;
-   png_uint_32 row_width = row_info->width;
-
-   png_debug(1, "in png_do_gray_to_rgb");
-
-   if (row_info->bit_depth >= 8 &&
-       !(row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This changes G to RGB */
-            png_bytep sp = row + (png_size_t)row_width - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *sp;
-               *(dp--) = *sp;
-               *(dp--) = *(sp--);
-            }
-         }
-
-         else
-         {
-            /* This changes GG to RRGGBB */
-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 4;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *(sp--);
-               *(dp--) = *(sp--);
-            }
-         }
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This changes GA to RGBA */
-            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 2;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *(sp--);
-               *(dp--) = *sp;
-               *(dp--) = *sp;
-               *(dp--) = *(sp--);
-            }
-         }
-
-         else
-         {
-            /* This changes GGAA to RRGGBBAA */
-            png_bytep sp = row + (png_size_t)row_width * 4 - 1;
-            png_bytep dp = sp  + (png_size_t)row_width * 4;
-            for (i = 0; i < row_width; i++)
-            {
-               *(dp--) = *(sp--);
-               *(dp--) = *(sp--);
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *sp;
-               *(dp--) = *(sp - 1);
-               *(dp--) = *(sp--);
-               *(dp--) = *(sp--);
-            }
-         }
-      }
-      row_info->channels = (png_byte)(row_info->channels + 2);
-      row_info->color_type |= PNG_COLOR_MASK_COLOR;
-      row_info->pixel_depth = (png_byte)(row_info->channels *
-          row_info->bit_depth);
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-   }
-}
-#endif
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-/* Reduce RGB files to grayscale, with or without alpha
- * using the equation given in Poynton's ColorFAQ of 1998-01-04 at
- * <http://www.inforamp.net/~poynton/>  (THIS LINK IS DEAD June 2008 but
- * versions dated 1998 through November 2002 have been archived at
- * http://web.archive.org/web/20000816232553/http://www.inforamp.net/
- * ~poynton/notes/colour_and_gamma/ColorFAQ.txt )
- * Charles Poynton poynton at poynton.com
- *
- *     Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
- *
- *  which can be expressed with integers as
- *
- *     Y = (6969 * R + 23434 * G + 2365 * B)/32768
- *
- * Poynton's current link (as of January 2003 through July 2011):
- * <http://www.poynton.com/notes/colour_and_gamma/>
- * has changed the numbers slightly:
- *
- *     Y = 0.2126*R + 0.7152*G + 0.0722*B
- *
- *  which can be expressed with integers as
- *
- *     Y = (6966 * R + 23436 * G + 2366 * B)/32768
- *
- *  Historically, however, libpng uses numbers derived from the ITU-R Rec 709
- *  end point chromaticities and the D65 white point.  Depending on the
- *  precision used for the D65 white point this produces a variety of different
- *  numbers, however if the four decimal place value used in ITU-R Rec 709 is
- *  used (0.3127,0.3290) the Y calculation would be:
- *
- *     Y = (6968 * R + 23435 * G + 2366 * B)/32768
- *
- *  While this is correct the rounding results in an overflow for white, because
- *  the sum of the rounded coefficients is 32769, not 32768.  Consequently
- *  libpng uses, instead, the closest non-overflowing approximation:
- *
- *     Y = (6968 * R + 23434 * G + 2366 * B)/32768
- *
- *  Starting with libpng-1.5.5, if the image being converted has a cHRM chunk
- *  (including an sRGB chunk) then the chromaticities are used to calculate the
- *  coefficients.  See the chunk handling in pngrutil.c for more information.
- *
- *  In all cases the calculation is to be done in a linear colorspace.  If no
- *  gamma information is available to correct the encoding of the original RGB
- *  values this results in an implicit assumption that the original PNG RGB
- *  values were linear.
- *
- *  Other integer coefficents can be used via png_set_rgb_to_gray().  Because
- *  the API takes just red and green coefficients the blue coefficient is
- *  calculated to make the sum 32768.  This will result in different rounding
- *  to that used above.
- */
-int /* PRIVATE */
-png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
-
-{
-   int rgb_error = 0;
-
-   png_debug(1, "in png_do_rgb_to_gray");
-
-   if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) &&
-       (row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
-      PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
-      PNG_CONST png_uint_32 bc = 32768 - rc - gc;
-      PNG_CONST png_uint_32 row_width = row_info->width;
-      PNG_CONST int have_alpha =
-         (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0;
-
-      if (row_info->bit_depth == 8)
-      {
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-         /* Notice that gamma to/from 1 are not necessarily inverses (if
-          * there is an overall gamma correction).  Prior to 1.5.5 this code
-          * checked the linearized values for equality; this doesn't match
-          * the documentation, the original values must be checked.
-          */
-         if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
-         {
-            png_bytep sp = row;
-            png_bytep dp = row;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte red   = *(sp++);
-               png_byte green = *(sp++);
-               png_byte blue  = *(sp++);
-
-               if (red != green || red != blue)
-               {
-                  red = png_ptr->gamma_to_1[red];
-                  green = png_ptr->gamma_to_1[green];
-                  blue = png_ptr->gamma_to_1[blue];
-
-                  rgb_error |= 1;
-                  *(dp++) = png_ptr->gamma_from_1[
-                      (rc*red + gc*green + bc*blue + 16384)>>15];
-               }
-
-               else
-               {
-                  /* If there is no overall correction the table will not be
-                   * set.
-                   */
-                  if (png_ptr->gamma_table != NULL)
-                     red = png_ptr->gamma_table[red];
-
-                  *(dp++) = red;
-               }
-
-               if (have_alpha)
-                  *(dp++) = *(sp++);
-            }
-         }
-         else
-#endif
-         {
-            png_bytep sp = row;
-            png_bytep dp = row;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte red   = *(sp++);
-               png_byte green = *(sp++);
-               png_byte blue  = *(sp++);
-
-               if (red != green || red != blue)
-               {
-                  rgb_error |= 1;
-                  /*NOTE: this is the historical approach which simply
-                   * truncates the results.
-                   */
-                  *(dp++) = (png_byte)((rc*red + gc*green + bc*blue)>>15);
-               }
-
-               else
-                  *(dp++) = red;
-
-               if (have_alpha)
-                  *(dp++) = *(sp++);
-            }
-         }
-      }
-
-      else /* RGB bit_depth == 16 */
-      {
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-         if (png_ptr->gamma_16_to_1 != NULL && png_ptr->gamma_16_from_1 != NULL)
-         {
-            png_bytep sp = row;
-            png_bytep dp = row;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_uint_16 red, green, blue, w;
-
-               red   = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-               green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-               blue  = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-
-               if (red == green && red == blue)
-               {
-                  if (png_ptr->gamma_16_table != NULL)
-                     w = png_ptr->gamma_16_table[(red&0xff)
-                         >> png_ptr->gamma_shift][red>>8];
-
-                  else
-                     w = red;
-               }
-
-               else
-               {
-                  png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff)
-                      >> png_ptr->gamma_shift][red>>8];
-                  png_uint_16 green_1 =
-                      png_ptr->gamma_16_to_1[(green&0xff) >>
-                      png_ptr->gamma_shift][green>>8];
-                  png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff)
-                      >> png_ptr->gamma_shift][blue>>8];
-                  png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1
-                      + bc*blue_1 + 16384)>>15);
-                  w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
-                      png_ptr->gamma_shift][gray16 >> 8];
-                  rgb_error |= 1;
-               }
-
-               *(dp++) = (png_byte)((w>>8) & 0xff);
-               *(dp++) = (png_byte)(w & 0xff);
-
-               if (have_alpha)
-               {
-                  *(dp++) = *(sp++);
-                  *(dp++) = *(sp++);
-               }
-            }
-         }
-         else
-#endif
-         {
-            png_bytep sp = row;
-            png_bytep dp = row;
-            png_uint_32 i;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_uint_16 red, green, blue, gray16;
-
-               red   = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-               green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-               blue  = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
-
-               if (red != green || red != blue)
-                  rgb_error |= 1;
-
-               /* From 1.5.5 in the 16 bit case do the accurate conversion even
-                * in the 'fast' case - this is because this is where the code
-                * ends up when handling linear 16 bit data.
-                */
-               gray16  = (png_uint_16)((rc*red + gc*green + bc*blue + 16384) >>
-                  15);
-               *(dp++) = (png_byte)((gray16>>8) & 0xff);
-               *(dp++) = (png_byte)(gray16 & 0xff);
-
-               if (have_alpha)
-               {
-                  *(dp++) = *(sp++);
-                  *(dp++) = *(sp++);
-               }
-            }
-         }
-      }
-
-      row_info->channels = (png_byte)(row_info->channels - 2);
-      row_info->color_type = (png_byte)(row_info->color_type &
-          ~PNG_COLOR_MASK_COLOR);
-      row_info->pixel_depth = (png_byte)(row_info->channels *
-          row_info->bit_depth);
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-   }
-   return rgb_error;
-}
-#endif
-#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
-
-#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
- * large of png_color.  This lets grayscale images be treated as
- * paletted.  Most useful for gamma correction and simplification
- * of code.  This API is not used internally.
- */
-void PNGAPI
-png_build_grayscale_palette(int bit_depth, png_colorp palette)
-{
-   int num_palette;
-   int color_inc;
-   int i;
-   int v;
-
-   png_debug(1, "in png_do_build_grayscale_palette");
-
-   if (palette == NULL)
-      return;
-
-   switch (bit_depth)
-   {
-      case 1:
-         num_palette = 2;
-         color_inc = 0xff;
-         break;
-
-      case 2:
-         num_palette = 4;
-         color_inc = 0x55;
-         break;
-
-      case 4:
-         num_palette = 16;
-         color_inc = 0x11;
-         break;
-
-      case 8:
-         num_palette = 256;
-         color_inc = 1;
-         break;
-
-      default:
-         num_palette = 0;
-         color_inc = 0;
-         break;
-   }
-
-   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
-   {
-      palette[i].red = (png_byte)v;
-      palette[i].green = (png_byte)v;
-      palette[i].blue = (png_byte)v;
-   }
-}
-#endif
-
-
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-#if (defined PNG_READ_BACKGROUND_SUPPORTED) ||\
-   (defined PNG_READ_ALPHA_MODE_SUPPORTED)
-/* Replace any alpha or transparency with the supplied background color.
- * "background" is already in the screen gamma, while "background_1" is
- * at a gamma of 1.0.  Paletted files have already been taken care of.
- */
-void /* PRIVATE */
-png_do_compose(png_row_infop row_info, png_bytep row, png_structp png_ptr)
-{
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   png_const_bytep gamma_table = png_ptr->gamma_table;
-   png_const_bytep gamma_from_1 = png_ptr->gamma_from_1;
-   png_const_bytep gamma_to_1 = png_ptr->gamma_to_1;
-   png_const_uint_16pp gamma_16 = png_ptr->gamma_16_table;
-   png_const_uint_16pp gamma_16_from_1 = png_ptr->gamma_16_from_1;
-   png_const_uint_16pp gamma_16_to_1 = png_ptr->gamma_16_to_1;
-   int gamma_shift = png_ptr->gamma_shift;
-#endif
-
-   png_bytep sp;
-   png_uint_32 i;
-   png_uint_32 row_width = row_info->width;
-   int optimize = (png_ptr->flags & PNG_FLAG_OPTIMIZE_ALPHA) != 0;
-   int shift;
-
-   png_debug(1, "in png_do_compose");
-
-   {
-      switch (row_info->color_type)
-      {
-         case PNG_COLOR_TYPE_GRAY:
-         {
-            switch (row_info->bit_depth)
-            {
-               case 1:
-               {
-                  sp = row;
-                  shift = 7;
-                  for (i = 0; i < row_width; i++)
-                  {
-                     if ((png_uint_16)((*sp >> shift) & 0x01)
-                        == png_ptr->trans_color.gray)
-                     {
-                        *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
-                        *sp |= (png_byte)(png_ptr->background.gray << shift);
-                     }
-
-                     if (!shift)
-                     {
-                        shift = 7;
-                        sp++;
-                     }
-
-                     else
-                        shift--;
-                  }
-                  break;
-               }
-
-               case 2:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
-                  {
-                     sp = row;
-                     shift = 6;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x03)
-                            == png_ptr->trans_color.gray)
-                        {
-                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                           *sp |= (png_byte)(png_ptr->background.gray << shift);
-                        }
-
-                        else
-                        {
-                           png_byte p = (png_byte)((*sp >> shift) & 0x03);
-                           png_byte g = (png_byte)((gamma_table [p | (p << 2) |
-                               (p << 4) | (p << 6)] >> 6) & 0x03);
-                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                           *sp |= (png_byte)(g << shift);
-                        }
-
-                        if (!shift)
-                        {
-                           shift = 6;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 2;
-                     }
-                  }
-
-                  else
-#endif
-                  {
-                     sp = row;
-                     shift = 6;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x03)
-                            == png_ptr->trans_color.gray)
-                        {
-                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
-                           *sp |= (png_byte)(png_ptr->background.gray << shift);
-                        }
-
-                        if (!shift)
-                        {
-                           shift = 6;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 2;
-                     }
-                  }
-                  break;
-               }
-
-               case 4:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
-                  {
-                     sp = row;
-                     shift = 4;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x0f)
-                            == png_ptr->trans_color.gray)
-                        {
-                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                           *sp |= (png_byte)(png_ptr->background.gray << shift);
-                        }
-
-                        else
-                        {
-                           png_byte p = (png_byte)((*sp >> shift) & 0x0f);
-                           png_byte g = (png_byte)((gamma_table[p |
-                               (p << 4)] >> 4) & 0x0f);
-                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                           *sp |= (png_byte)(g << shift);
-                        }
-
-                        if (!shift)
-                        {
-                           shift = 4;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 4;
-                     }
-                  }
-
-                  else
-#endif
-                  {
-                     sp = row;
-                     shift = 4;
-                     for (i = 0; i < row_width; i++)
-                     {
-                        if ((png_uint_16)((*sp >> shift) & 0x0f)
-                            == png_ptr->trans_color.gray)
-                        {
-                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
-                           *sp |= (png_byte)(png_ptr->background.gray << shift);
-                        }
-
-                        if (!shift)
-                        {
-                           shift = 4;
-                           sp++;
-                        }
-
-                        else
-                           shift -= 4;
-                     }
-                  }
-                  break;
-               }
-
-               case 8:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_table != NULL)
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp++)
-                     {
-                        if (*sp == png_ptr->trans_color.gray)
-                           *sp = (png_byte)png_ptr->background.gray;
-
-                        else
-                           *sp = gamma_table[*sp];
-                     }
-                  }
-                  else
-#endif
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp++)
-                     {
-                        if (*sp == png_ptr->trans_color.gray)
-                           *sp = (png_byte)png_ptr->background.gray;
-                     }
-                  }
-                  break;
-               }
-
-               case 16:
-               {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-                  if (gamma_16 != NULL)
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp += 2)
-                     {
-                        png_uint_16 v;
-
-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                        if (v == png_ptr->trans_color.gray)
-                        {
-                           /* Background is already in screen gamma */
-                           *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff);
-                           *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-                        }
-
-                        else
-                        {
-                           v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                           *sp = (png_byte)((v >> 8) & 0xff);
-                           *(sp + 1) = (png_byte)(v & 0xff);
-                        }
-                     }
-                  }
-                  else
-#endif
-                  {
-                     sp = row;
-                     for (i = 0; i < row_width; i++, sp += 2)
-                     {
-                        png_uint_16 v;
-
-                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                        if (v == png_ptr->trans_color.gray)
-                        {
-                           *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff);
-                           *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-                        }
-                     }
-                  }
-                  break;
-               }
-
-               default:
-                  break;
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_RGB:
-         {
-            if (row_info->bit_depth == 8)
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_table != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 3)
-                  {
-                     if (*sp == png_ptr->trans_color.red &&
-                         *(sp + 1) == png_ptr->trans_color.green &&
-                         *(sp + 2) == png_ptr->trans_color.blue)
-                     {
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
-
-                     else
-                     {
-                        *sp = gamma_table[*sp];
-                        *(sp + 1) = gamma_table[*(sp + 1)];
-                        *(sp + 2) = gamma_table[*(sp + 2)];
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 3)
-                  {
-                     if (*sp == png_ptr->trans_color.red &&
-                         *(sp + 1) == png_ptr->trans_color.green &&
-                         *(sp + 2) == png_ptr->trans_color.blue)
-                     {
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
-                  }
-               }
-            }
-            else /* if (row_info->bit_depth == 16) */
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 6)
-                  {
-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                         + *(sp + 5));
-
-                     if (r == png_ptr->trans_color.red &&
-                         g == png_ptr->trans_color.green &&
-                         b == png_ptr->trans_color.blue)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
-
-                     else
-                     {
-                        png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
-                     }
-                  }
-               }
-
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 6)
-                  {
-                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-
-                     png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                         + *(sp + 5));
-
-                     if (r == png_ptr->trans_color.red &&
-                         g == png_ptr->trans_color.green &&
-                         b == png_ptr->trans_color.blue)
-                     {
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
-                  }
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_GRAY_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
-                   gamma_table != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 2)
-                  {
-                     png_uint_16 a = *(sp + 1);
-
-                     if (a == 0xff)
-                        *sp = gamma_table[*sp];
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)png_ptr->background.gray;
-                     }
-
-                     else
-                     {
-                        png_byte v, w;
-
-                        v = gamma_to_1[*sp];
-                        png_composite(w, v, a, png_ptr->background_1.gray);
-                        if (!optimize)
-                           w = gamma_from_1[w];
-                        *sp = w;
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 2)
-                  {
-                     png_byte a = *(sp + 1);
-
-                     if (a == 0)
-                        *sp = (png_byte)png_ptr->background.gray;
-
-                     else if (a < 0xff)
-                        png_composite(*sp, *sp, a, png_ptr->background_1.gray);
-                  }
-               }
-            }
-            else /* if (png_ptr->bit_depth == 16) */
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
-                   gamma_16_to_1 != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
-                  {
-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     if (a == (png_uint_16)0xffff)
-                     {
-                        png_uint_16 v;
-
-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-                     }
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-                     }
-
-                     else
-                     {
-                        png_uint_16 g, v, w;
-
-                        g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
-                        png_composite_16(v, g, a, png_ptr->background_1.gray);
-                        if (optimize)
-                           w = v;
-                        else
-                           w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8];
-                        *sp = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(w & 0xff);
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
-                  {
-                     png_uint_16 a = (png_uint_16)(((*(sp + 2)) << 8)
-                         + *(sp + 3));
-
-                     if (a == 0)
-                     {
-                        *sp = (png_byte)((png_ptr->background.gray >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.gray & 0xff);
-                     }
-
-                     else if (a < 0xffff)
-                     {
-                        png_uint_16 g, v;
-
-                        g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-                        png_composite_16(v, g, a, png_ptr->background_1.gray);
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-                     }
-                  }
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_RGB_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
-                   gamma_table != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
-                  {
-                     png_byte a = *(sp + 3);
-
-                     if (a == 0xff)
-                     {
-                        *sp = gamma_table[*sp];
-                        *(sp + 1) = gamma_table[*(sp + 1)];
-                        *(sp + 2) = gamma_table[*(sp + 2)];
-                     }
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
-
-                     else
-                     {
-                        png_byte v, w;
-
-                        v = gamma_to_1[*sp];
-                        png_composite(w, v, a, png_ptr->background_1.red);
-                        if (!optimize) w = gamma_from_1[w];
-                        *sp = w;
-
-                        v = gamma_to_1[*(sp + 1)];
-                        png_composite(w, v, a, png_ptr->background_1.green);
-                        if (!optimize) w = gamma_from_1[w];
-                        *(sp + 1) = w;
-
-                        v = gamma_to_1[*(sp + 2)];
-                        png_composite(w, v, a, png_ptr->background_1.blue);
-                        if (!optimize) w = gamma_from_1[w];
-                        *(sp + 2) = w;
-                     }
-                  }
-               }
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 4)
-                  {
-                     png_byte a = *(sp + 3);
-
-                     if (a == 0)
-                     {
-                        *sp = (png_byte)png_ptr->background.red;
-                        *(sp + 1) = (png_byte)png_ptr->background.green;
-                        *(sp + 2) = (png_byte)png_ptr->background.blue;
-                     }
-
-                     else if (a < 0xff)
-                     {
-                        png_composite(*sp, *sp, a, png_ptr->background.red);
-
-                        png_composite(*(sp + 1), *(sp + 1), a,
-                            png_ptr->background.green);
-
-                        png_composite(*(sp + 2), *(sp + 2), a,
-                            png_ptr->background.blue);
-                     }
-                  }
-               }
-            }
-            else /* if (row_info->bit_depth == 16) */
-            {
-#ifdef PNG_READ_GAMMA_SUPPORTED
-               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
-                   gamma_16_to_1 != NULL)
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 8)
-                  {
-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
-                         << 8) + (png_uint_16)(*(sp + 7)));
-
-                     if (a == (png_uint_16)0xffff)
-                     {
-                        png_uint_16 v;
-
-                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
-
-                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
-                     }
-
-                     else if (a == 0)
-                     {
-                        /* Background is already in screen gamma */
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
-
-                     else
-                     {
-                        png_uint_16 v, w;
-
-                        v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
-                        png_composite_16(w, v, a, png_ptr->background_1.red);
-                        if (!optimize)
-                           w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
-                        *sp = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(w & 0xff);
-
-                        v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
-                        png_composite_16(w, v, a, png_ptr->background_1.green);
-                        if (!optimize)
-                           w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
-
-                        *(sp + 2) = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(w & 0xff);
-
-                        v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
-                        png_composite_16(w, v, a, png_ptr->background_1.blue);
-                        if (!optimize)
-                           w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
-
-                        *(sp + 4) = (png_byte)((w >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(w & 0xff);
-                     }
-                  }
-               }
-
-               else
-#endif
-               {
-                  sp = row;
-                  for (i = 0; i < row_width; i++, sp += 8)
-                  {
-                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
-                         << 8) + (png_uint_16)(*(sp + 7)));
-
-                     if (a == 0)
-                     {
-                        *sp = (png_byte)((png_ptr->background.red >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(png_ptr->background.red & 0xff);
-                        *(sp + 2) = (png_byte)((png_ptr->background.green >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(png_ptr->background.green & 0xff);
-                        *(sp + 4) = (png_byte)((png_ptr->background.blue >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(png_ptr->background.blue & 0xff);
-                     }
-
-                     else if (a < 0xffff)
-                     {
-                        png_uint_16 v;
-
-                        png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
-                        png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
-                            + *(sp + 3));
-                        png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
-                            + *(sp + 5));
-
-                        png_composite_16(v, r, a, png_ptr->background.red);
-                        *sp = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 1) = (png_byte)(v & 0xff);
-
-                        png_composite_16(v, g, a, png_ptr->background.green);
-                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 3) = (png_byte)(v & 0xff);
-
-                        png_composite_16(v, b, a, png_ptr->background.blue);
-                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
-                        *(sp + 5) = (png_byte)(v & 0xff);
-                     }
-                  }
-               }
-            }
-            break;
-         }
-
-         default:
-            break;
-      }
-   }
-}
-#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_READ_ALPHA_MODE_SUPPORTED */
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-/* Gamma correct the image, avoiding the alpha channel.  Make sure
- * you do this after you deal with the transparency issue on grayscale
- * or RGB images. If your bit depth is 8, use gamma_table, if it
- * is 16, use gamma_16_table and gamma_shift.  Build these with
- * build_gamma_table().
- */
-void /* PRIVATE */
-png_do_gamma(png_row_infop row_info, png_bytep row, png_structp png_ptr)
-{
-   png_const_bytep gamma_table = png_ptr->gamma_table;
-   png_const_uint_16pp gamma_16_table = png_ptr->gamma_16_table;
-   int gamma_shift = png_ptr->gamma_shift;
-
-   png_bytep sp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_gamma");
-
-   if (((row_info->bit_depth <= 8 && gamma_table != NULL) ||
-       (row_info->bit_depth == 16 && gamma_16_table != NULL)))
-   {
-      switch (row_info->color_type)
-      {
-         case PNG_COLOR_TYPE_RGB:
-         {
-            if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp++;
-                  *sp = gamma_table[*sp];
-                  sp++;
-                  *sp = gamma_table[*sp];
-                  sp++;
-               }
-            }
-
-            else /* if (row_info->bit_depth == 16) */
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_RGB_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp++;
-
-                  *sp = gamma_table[*sp];
-                  sp++;
-
-                  *sp = gamma_table[*sp];
-                  sp++;
-
-                  sp++;
-               }
-            }
-
-            else /* if (row_info->bit_depth == 16) */
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-
-                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 4;
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_GRAY_ALPHA:
-         {
-            if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp += 2;
-               }
-            }
-
-            else /* if (row_info->bit_depth == 16) */
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 4;
-               }
-            }
-            break;
-         }
-
-         case PNG_COLOR_TYPE_GRAY:
-         {
-            if (row_info->bit_depth == 2)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i += 4)
-               {
-                  int a = *sp & 0xc0;
-                  int b = *sp & 0x30;
-                  int c = *sp & 0x0c;
-                  int d = *sp & 0x03;
-
-                  *sp = (png_byte)(
-                      ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)])   ) & 0xc0)|
-                      ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|
-                      ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|
-                      ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ));
-                  sp++;
-               }
-            }
-
-            if (row_info->bit_depth == 4)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i += 2)
-               {
-                  int msb = *sp & 0xf0;
-                  int lsb = *sp & 0x0f;
-
-                  *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0)
-                      | (((int)gamma_table[(lsb << 4) | lsb]) >> 4));
-                  sp++;
-               }
-            }
-
-            else if (row_info->bit_depth == 8)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  *sp = gamma_table[*sp];
-                  sp++;
-               }
-            }
-
-            else if (row_info->bit_depth == 16)
-            {
-               sp = row;
-               for (i = 0; i < row_width; i++)
-               {
-                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
-                  *sp = (png_byte)((v >> 8) & 0xff);
-                  *(sp + 1) = (png_byte)(v & 0xff);
-                  sp += 2;
-               }
-            }
-            break;
-         }
-
-         default:
-            break;
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
-/* Encode the alpha channel to the output gamma (the input channel is always
- * linear.)  Called only with color types that have an alpha channel.  Needs the
- * from_1 tables.
- */
-void /* PRIVATE */
-png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structp png_ptr)
-{
-   png_uint_32 row_width = row_info->width;
-
-   png_debug(1, "in png_do_encode_alpha");
-
-   if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         PNG_CONST png_bytep table = png_ptr->gamma_from_1;
-
-         if (table != NULL)
-         {
-            PNG_CONST int step =
-               (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 4 : 2;
-
-            /* The alpha channel is the last component: */
-            row += step - 1;
-
-            for (; row_width > 0; --row_width, row += step)
-               *row = table[*row];
-
-            return;
-         }
-      }
-
-      else if (row_info->bit_depth == 16)
-      {
-         PNG_CONST png_uint_16pp table = png_ptr->gamma_16_from_1;
-         PNG_CONST int gamma_shift = png_ptr->gamma_shift;
-
-         if (table != NULL)
-         {
-            PNG_CONST int step =
-               (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 8 : 4;
-
-            /* The alpha channel is the last component: */
-            row += step - 2;
-
-            for (; row_width > 0; --row_width, row += step)
-            {
-               png_uint_16 v;
-
-               v = table[*(row + 1) >> gamma_shift][*row];
-               *row = (png_byte)((v >> 8) & 0xff);
-               *(row + 1) = (png_byte)(v & 0xff);
-            }
-
-            return;
-         }
-      }
-   }
-
-   /* Only get to here if called with a weird row_info; no harm has been done,
-    * so just issue a warning.
-    */
-   png_warning(png_ptr, "png_do_encode_alpha: unexpected call");
-}
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-/* Expands a palette row to an RGB or RGBA row depending
- * upon whether you supply trans and num_trans.
- */
-void /* PRIVATE */
-png_do_expand_palette(png_row_infop row_info, png_bytep row,
-   png_const_colorp palette, png_const_bytep trans_alpha, int num_trans)
-{
-   int shift, value;
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_expand_palette");
-
-   if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (row_info->bit_depth < 8)
-      {
-         switch (row_info->bit_depth)
-         {
-            case 1:
-            {
-               sp = row + (png_size_t)((row_width - 1) >> 3);
-               dp = row + (png_size_t)row_width - 1;
-               shift = 7 - (int)((row_width + 7) & 0x07);
-               for (i = 0; i < row_width; i++)
-               {
-                  if ((*sp >> shift) & 0x01)
-                     *dp = 1;
-
-                  else
-                     *dp = 0;
-
-                  if (shift == 7)
-                  {
-                     shift = 0;
-                     sp--;
-                  }
-
-                  else
-                     shift++;
-
-                  dp--;
-               }
-               break;
-            }
-
-            case 2:
-            {
-               sp = row + (png_size_t)((row_width - 1) >> 2);
-               dp = row + (png_size_t)row_width - 1;
-               shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-               for (i = 0; i < row_width; i++)
-               {
-                  value = (*sp >> shift) & 0x03;
-                  *dp = (png_byte)value;
-                  if (shift == 6)
-                  {
-                     shift = 0;
-                     sp--;
-                  }
-
-                  else
-                     shift += 2;
-
-                  dp--;
-               }
-               break;
-            }
-
-            case 4:
-            {
-               sp = row + (png_size_t)((row_width - 1) >> 1);
-               dp = row + (png_size_t)row_width - 1;
-               shift = (int)((row_width & 0x01) << 2);
-               for (i = 0; i < row_width; i++)
-               {
-                  value = (*sp >> shift) & 0x0f;
-                  *dp = (png_byte)value;
-                  if (shift == 4)
-                  {
-                     shift = 0;
-                     sp--;
-                  }
-
-                  else
-                     shift += 4;
-
-                  dp--;
-               }
-               break;
-            }
-
-            default:
-               break;
-         }
-         row_info->bit_depth = 8;
-         row_info->pixel_depth = 8;
-         row_info->rowbytes = row_width;
-      }
-
-      if (row_info->bit_depth == 8)
-      {
-         {
-            if (num_trans > 0)
-            {
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + (png_size_t)(row_width << 2) - 1;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  if ((int)(*sp) >= num_trans)
-                     *dp-- = 0xff;
-
-                  else
-                     *dp-- = trans_alpha[*sp];
-
-                  *dp-- = palette[*sp].blue;
-                  *dp-- = palette[*sp].green;
-                  *dp-- = palette[*sp].red;
-                  sp--;
-               }
-               row_info->bit_depth = 8;
-               row_info->pixel_depth = 32;
-               row_info->rowbytes = row_width * 4;
-               row_info->color_type = 6;
-               row_info->channels = 4;
-            }
-
-            else
-            {
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + (png_size_t)(row_width * 3) - 1;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  *dp-- = palette[*sp].blue;
-                  *dp-- = palette[*sp].green;
-                  *dp-- = palette[*sp].red;
-                  sp--;
-               }
-
-               row_info->bit_depth = 8;
-               row_info->pixel_depth = 24;
-               row_info->rowbytes = row_width * 3;
-               row_info->color_type = 2;
-               row_info->channels = 3;
-            }
-         }
-      }
-   }
-}
-
-/* If the bit depth < 8, it is expanded to 8.  Also, if the already
- * expanded transparency value is supplied, an alpha channel is built.
- */
-void /* PRIVATE */
-png_do_expand(png_row_infop row_info, png_bytep row,
-    png_const_color_16p trans_color)
-{
-   int shift, value;
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_expand");
-
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         png_uint_16 gray = (png_uint_16)(trans_color ? trans_color->gray : 0);
-
-         if (row_info->bit_depth < 8)
-         {
-            switch (row_info->bit_depth)
-            {
-               case 1:
-               {
-                  gray = (png_uint_16)((gray & 0x01) * 0xff);
-                  sp = row + (png_size_t)((row_width - 1) >> 3);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = 7 - (int)((row_width + 7) & 0x07);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     if ((*sp >> shift) & 0x01)
-                        *dp = 0xff;
-
-                     else
-                        *dp = 0;
-
-                     if (shift == 7)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift++;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               case 2:
-               {
-                  gray = (png_uint_16)((gray & 0x03) * 0x55);
-                  sp = row + (png_size_t)((row_width - 1) >> 2);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     value = (*sp >> shift) & 0x03;
-                     *dp = (png_byte)(value | (value << 2) | (value << 4) |
-                        (value << 6));
-                     if (shift == 6)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift += 2;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               case 4:
-               {
-                  gray = (png_uint_16)((gray & 0x0f) * 0x11);
-                  sp = row + (png_size_t)((row_width - 1) >> 1);
-                  dp = row + (png_size_t)row_width - 1;
-                  shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
-                  for (i = 0; i < row_width; i++)
-                  {
-                     value = (*sp >> shift) & 0x0f;
-                     *dp = (png_byte)(value | (value << 4));
-                     if (shift == 4)
-                     {
-                        shift = 0;
-                        sp--;
-                     }
-
-                     else
-                        shift = 4;
-
-                     dp--;
-                  }
-                  break;
-               }
-
-               default:
-                  break;
-            }
-
-            row_info->bit_depth = 8;
-            row_info->pixel_depth = 8;
-            row_info->rowbytes = row_width;
-         }
-
-         if (trans_color != NULL)
-         {
-            if (row_info->bit_depth == 8)
-            {
-               gray = gray & 0xff;
-               sp = row + (png_size_t)row_width - 1;
-               dp = row + (png_size_t)(row_width << 1) - 1;
-
-               for (i = 0; i < row_width; i++)
-               {
-                  if (*sp == gray)
-                     *dp-- = 0;
-
-                  else
-                     *dp-- = 0xff;
-
-                  *dp-- = *sp--;
-               }
-            }
-
-            else if (row_info->bit_depth == 16)
-            {
-               png_byte gray_high = (png_byte)((gray >> 8) & 0xff);
-               png_byte gray_low = (png_byte)(gray & 0xff);
-               sp = row + row_info->rowbytes - 1;
-               dp = row + (row_info->rowbytes << 1) - 1;
-               for (i = 0; i < row_width; i++)
-               {
-                  if (*(sp - 1) == gray_high && *(sp) == gray_low)
-                  {
-                     *dp-- = 0;
-                     *dp-- = 0;
-                  }
-
-                  else
-                  {
-                     *dp-- = 0xff;
-                     *dp-- = 0xff;
-                  }
-
-                  *dp-- = *sp--;
-                  *dp-- = *sp--;
-               }
-            }
-
-            row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-            row_info->channels = 2;
-            row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
-            row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-               row_width);
-         }
-      }
-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_color)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            png_byte red = (png_byte)(trans_color->red & 0xff);
-            png_byte green = (png_byte)(trans_color->green & 0xff);
-            png_byte blue = (png_byte)(trans_color->blue & 0xff);
-            sp = row + (png_size_t)row_info->rowbytes - 1;
-            dp = row + (png_size_t)(row_width << 2) - 1;
-            for (i = 0; i < row_width; i++)
-            {
-               if (*(sp - 2) == red && *(sp - 1) == green && *(sp) == blue)
-                  *dp-- = 0;
-
-               else
-                  *dp-- = 0xff;
-
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-            }
-         }
-         else if (row_info->bit_depth == 16)
-         {
-            png_byte red_high = (png_byte)((trans_color->red >> 8) & 0xff);
-            png_byte green_high = (png_byte)((trans_color->green >> 8) & 0xff);
-            png_byte blue_high = (png_byte)((trans_color->blue >> 8) & 0xff);
-            png_byte red_low = (png_byte)(trans_color->red & 0xff);
-            png_byte green_low = (png_byte)(trans_color->green & 0xff);
-            png_byte blue_low = (png_byte)(trans_color->blue & 0xff);
-            sp = row + row_info->rowbytes - 1;
-            dp = row + (png_size_t)(row_width << 3) - 1;
-            for (i = 0; i < row_width; i++)
-            {
-               if (*(sp - 5) == red_high &&
-                   *(sp - 4) == red_low &&
-                   *(sp - 3) == green_high &&
-                   *(sp - 2) == green_low &&
-                   *(sp - 1) == blue_high &&
-                   *(sp    ) == blue_low)
-               {
-                  *dp-- = 0;
-                  *dp-- = 0;
-               }
-
-               else
-               {
-                  *dp-- = 0xff;
-                  *dp-- = 0xff;
-               }
-
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-               *dp-- = *sp--;
-            }
-         }
-         row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-         row_info->channels = 4;
-         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-   }
-}
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-/* If the bit depth is 8 and the color type is not a palette type expand the
- * whole row to 16 bits.  Has no effect otherwise.
- */
-void /* PRIVATE */
-png_do_expand_16(png_row_infop row_info, png_bytep row)
-{
-   if (row_info->bit_depth == 8 &&
-      row_info->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      /* The row have a sequence of bytes containing [0..255] and we need
-       * to turn it into another row containing [0..65535], to do this we
-       * calculate:
-       *
-       *  (input / 255) * 65535
-       *
-       *  Which happens to be exactly input * 257 and this can be achieved
-       *  simply by byte replication in place (copying backwards).
-       */
-      png_byte *sp = row + row_info->rowbytes; /* source, last byte + 1 */
-      png_byte *dp = sp + row_info->rowbytes;  /* destination, end + 1 */
-      while (dp > sp)
-         dp[-2] = dp[-1] = *--sp, dp -= 2;
-
-      row_info->rowbytes *= 2;
-      row_info->bit_depth = 16;
-      row_info->pixel_depth = (png_byte)(row_info->channels * 16);
-   }
-}
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-void /* PRIVATE */
-png_do_quantize(png_row_infop row_info, png_bytep row,
-    png_const_bytep palette_lookup, png_const_bytep quantize_lookup)
-{
-   png_bytep sp, dp;
-   png_uint_32 i;
-   png_uint_32 row_width=row_info->width;
-
-   png_debug(1, "in png_do_quantize");
-
-   if (row_info->bit_depth == 8)
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB && palette_lookup)
-      {
-         int r, g, b, p;
-         sp = row;
-         dp = row;
-         for (i = 0; i < row_width; i++)
-         {
-            r = *sp++;
-            g = *sp++;
-            b = *sp++;
-
-            /* This looks real messy, but the compiler will reduce
-             * it down to a reasonable formula.  For example, with
-             * 5 bits per color, we get:
-             * p = (((r >> 3) & 0x1f) << 10) |
-             *    (((g >> 3) & 0x1f) << 5) |
-             *    ((b >> 3) & 0x1f);
-             */
-            p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) &
-                ((1 << PNG_QUANTIZE_RED_BITS) - 1)) <<
-                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |
-                (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) &
-                ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) <<
-                (PNG_QUANTIZE_BLUE_BITS)) |
-                ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) &
-                ((1 << PNG_QUANTIZE_BLUE_BITS) - 1));
-
-            *dp++ = palette_lookup[p];
-         }
-
-         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
-         row_info->channels = 1;
-         row_info->pixel_depth = row_info->bit_depth;
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-         palette_lookup != NULL)
-      {
-         int r, g, b, p;
-         sp = row;
-         dp = row;
-         for (i = 0; i < row_width; i++)
-         {
-            r = *sp++;
-            g = *sp++;
-            b = *sp++;
-            sp++;
-
-            p = (((r >> (8 - PNG_QUANTIZE_RED_BITS)) &
-                ((1 << PNG_QUANTIZE_RED_BITS) - 1)) <<
-                (PNG_QUANTIZE_GREEN_BITS + PNG_QUANTIZE_BLUE_BITS)) |
-                (((g >> (8 - PNG_QUANTIZE_GREEN_BITS)) &
-                ((1 << PNG_QUANTIZE_GREEN_BITS) - 1)) <<
-                (PNG_QUANTIZE_BLUE_BITS)) |
-                ((b >> (8 - PNG_QUANTIZE_BLUE_BITS)) &
-                ((1 << PNG_QUANTIZE_BLUE_BITS) - 1));
-
-            *dp++ = palette_lookup[p];
-         }
-
-         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
-         row_info->channels = 1;
-         row_info->pixel_depth = row_info->bit_depth;
-         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_width);
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
-         quantize_lookup)
-      {
-         sp = row;
-
-         for (i = 0; i < row_width; i++, sp++)
-         {
-            *sp = quantize_lookup[*sp];
-         }
-      }
-   }
-}
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
-#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-/* Undoes intrapixel differencing  */
-void /* PRIVATE */
-png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_read_intrapixel");
-
-   if (
-       (row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      int bytes_per_pixel;
-      png_uint_32 row_width = row_info->width;
-
-      if (row_info->bit_depth == 8)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 3;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 4;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff);
-            *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff);
-         }
-      }
-      else if (row_info->bit_depth == 16)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 6;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 8;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
-            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
-            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
-            png_uint_32 red  = (s0 + s1 + 65536) & 0xffff;
-            png_uint_32 blue = (s2 + s1 + 65536) & 0xffff;
-            *(rp    ) = (png_byte)((red >> 8) & 0xff);
-            *(rp + 1) = (png_byte)(red & 0xff);
-            *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-            *(rp + 5) = (png_byte)(blue & 0xff);
-         }
-      }
-   }
-}
-#endif /* PNG_MNG_FEATURES_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED */
+
+/* pngrtran.c - transforms the data in a row for PNG readers
+ *
+ * libpng version  1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file contains functions optionally called by an application
+ * in order to tell libpng how to handle data when reading a PNG.
+ * Transformations that are used in both reading and writing are
+ * in pngtrans.c.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+/* Set the action on getting a CRC error for an ancillary or critical chunk. */
+void PNGAPI
+png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action)
+{
+   png_debug(1, "in png_set_crc_action\n");
+   /* Tell libpng how we react to CRC errors in critical chunks */
+   switch (crit_action)
+   {
+      case PNG_CRC_NO_CHANGE:                        /* leave setting as is */
+         break;
+      case PNG_CRC_WARN_USE:                               /* warn/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE;
+         break;
+      case PNG_CRC_QUIET_USE:                             /* quiet/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE |
+                           PNG_FLAG_CRC_CRITICAL_IGNORE;
+         break;
+      case PNG_CRC_WARN_DISCARD:    /* not a valid action for critical data */
+         png_warning(png_ptr, "Can't discard critical data on CRC error.");
+      case PNG_CRC_ERROR_QUIT:                                /* error/quit */
+      case PNG_CRC_DEFAULT:
+      default:
+         png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK;
+         break;
+   }
+
+   switch (ancil_action)
+   {
+      case PNG_CRC_NO_CHANGE:                       /* leave setting as is */
+         break;
+      case PNG_CRC_WARN_USE:                              /* warn/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE;
+         break;
+      case PNG_CRC_QUIET_USE:                            /* quiet/use data */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE |
+                           PNG_FLAG_CRC_ANCILLARY_NOWARN;
+         break;
+      case PNG_CRC_ERROR_QUIT:                               /* error/quit */
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_NOWARN;
+         break;
+      case PNG_CRC_WARN_DISCARD:                      /* warn/discard data */
+      case PNG_CRC_DEFAULT:
+      default:
+         png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK;
+         break;
+   }
+}
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
+    defined(PNG_FLOATING_POINT_SUPPORTED)
+/* handle alpha and tRNS via a background color */
+void PNGAPI
+png_set_background(png_structp png_ptr,
+   png_color_16p background_color, int background_gamma_code,
+   int need_expand, double background_gamma)
+{
+   png_debug(1, "in png_set_background\n");
+   if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
+   {
+      png_warning(png_ptr, "Application must supply a known background gamma");
+      return;
+   }
+
+   png_ptr->transformations |= PNG_BACKGROUND;
+   png_memcpy(&(png_ptr->background), background_color,
+      png_sizeof(png_color_16));
+   png_ptr->background_gamma = (float)background_gamma;
+   png_ptr->background_gamma_type = (png_byte)(background_gamma_code);
+   png_ptr->transformations |= (need_expand ? PNG_BACKGROUND_EXPAND : 0);
+
+   /* Note:  if need_expand is set and color_type is either RGB or RGB_ALPHA
+    * (in which case need_expand is superfluous anyway), the background color
+    * might actually be gray yet not be flagged as such. This is not a problem
+    * for the current code, which uses PNG_BACKGROUND_IS_GRAY only to
+    * decide when to do the png_do_gray_to_rgb() transformation.
+    */
+   if ((need_expand && !(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) ||
+       (!need_expand && background_color->red == background_color->green &&
+        background_color->red == background_color->blue))
+      png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
+}
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* strip 16 bit depth files to 8 bit depth */
+void PNGAPI
+png_set_strip_16(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_strip_16\n");
+   png_ptr->transformations |= PNG_16_TO_8;
+}
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_strip_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_strip_alpha\n");
+   png_ptr->transformations |= PNG_STRIP_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+/* Dither file to 8 bit.  Supply a palette, the current number
+ * of elements in the palette, the maximum number of elements
+ * allowed, and a histogram if possible.  If the current number
+ * of colors is greater then the maximum number, the palette will be
+ * modified to fit in the maximum number.  "full_dither" indicates
+ * whether we need a dithering cube set up for RGB images, or if we
+ * simply are reducing the number of colors in a paletted image.
+ */
+
+typedef struct png_dsort_struct
+{
+   struct png_dsort_struct FAR * next;
+   png_byte left;
+   png_byte right;
+} png_dsort;
+typedef png_dsort FAR *       png_dsortp;
+typedef png_dsort FAR * FAR * png_dsortpp;
+
+void PNGAPI
+png_set_dither(png_structp png_ptr, png_colorp palette,
+   int num_palette, int maximum_colors, png_uint_16p histogram,
+   int full_dither)
+{
+   png_debug(1, "in png_set_dither\n");
+   png_ptr->transformations |= PNG_DITHER;
+
+   if (!full_dither)
+   {
+      int i;
+
+      png_ptr->dither_index = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)(num_palette * png_sizeof (png_byte)));
+      for (i = 0; i < num_palette; i++)
+         png_ptr->dither_index[i] = (png_byte)i;
+   }
+
+   if (num_palette > maximum_colors)
+   {
+      if (histogram != NULL)
+      {
+         /* This is easy enough, just throw out the least used colors.
+            Perhaps not the best solution, but good enough. */
+
+         int i;
+
+         /* initialize an array to sort colors */
+         png_ptr->dither_sort = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof (png_byte)));
+
+         /* initialize the dither_sort array */
+         for (i = 0; i < num_palette; i++)
+            png_ptr->dither_sort[i] = (png_byte)i;
+
+         /* Find the least used palette entries by starting a
+            bubble sort, and running it until we have sorted
+            out enough colors.  Note that we don't care about
+            sorting all the colors, just finding which are
+            least used. */
+
+         for (i = num_palette - 1; i >= maximum_colors; i--)
+         {
+            int done; /* to stop early if the list is pre-sorted */
+            int j;
+
+            done = 1;
+            for (j = 0; j < i; j++)
+            {
+               if (histogram[png_ptr->dither_sort[j]]
+                   < histogram[png_ptr->dither_sort[j + 1]])
+               {
+                  png_byte t;
+
+                  t = png_ptr->dither_sort[j];
+                  png_ptr->dither_sort[j] = png_ptr->dither_sort[j + 1];
+                  png_ptr->dither_sort[j + 1] = t;
+                  done = 0;
+               }
+            }
+            if (done)
+               break;
+         }
+
+         /* swap the palette around, and set up a table, if necessary */
+         if (full_dither)
+         {
+            int j = num_palette;
+
+            /* put all the useful colors within the max, but don't
+               move the others */
+            for (i = 0; i < maximum_colors; i++)
+            {
+               if ((int)png_ptr->dither_sort[i] >= maximum_colors)
+               {
+                  do
+                     j--;
+                  while ((int)png_ptr->dither_sort[j] >= maximum_colors);
+                  palette[i] = palette[j];
+               }
+            }
+         }
+         else
+         {
+            int j = num_palette;
+
+            /* move all the used colors inside the max limit, and
+               develop a translation table */
+            for (i = 0; i < maximum_colors; i++)
+            {
+               /* only move the colors we need to */
+               if ((int)png_ptr->dither_sort[i] >= maximum_colors)
+               {
+                  png_color tmp_color;
+
+                  do
+                     j--;
+                  while ((int)png_ptr->dither_sort[j] >= maximum_colors);
+
+                  tmp_color = palette[j];
+                  palette[j] = palette[i];
+                  palette[i] = tmp_color;
+                  /* indicate where the color went */
+                  png_ptr->dither_index[j] = (png_byte)i;
+                  png_ptr->dither_index[i] = (png_byte)j;
+               }
+            }
+
+            /* find closest color for those colors we are not using */
+            for (i = 0; i < num_palette; i++)
+            {
+               if ((int)png_ptr->dither_index[i] >= maximum_colors)
+               {
+                  int min_d, k, min_k, d_index;
+
+                  /* find the closest color to one we threw out */
+                  d_index = png_ptr->dither_index[i];
+                  min_d = PNG_COLOR_DIST(palette[d_index], palette[0]);
+                  for (k = 1, min_k = 0; k < maximum_colors; k++)
+                  {
+                     int d;
+
+                     d = PNG_COLOR_DIST(palette[d_index], palette[k]);
+
+                     if (d < min_d)
+                     {
+                        min_d = d;
+                        min_k = k;
+                     }
+                  }
+                  /* point to closest color */
+                  png_ptr->dither_index[i] = (png_byte)min_k;
+               }
+            }
+         }
+         png_free(png_ptr, png_ptr->dither_sort);
+         png_ptr->dither_sort=NULL;
+      }
+      else
+      {
+         /* This is much harder to do simply (and quickly).  Perhaps
+            we need to go through a median cut routine, but those
+            don't always behave themselves with only a few colors
+            as input.  So we will just find the closest two colors,
+            and throw out one of them (chosen somewhat randomly).
+            [We don't understand this at all, so if someone wants to
+             work on improving it, be our guest - AED, GRP]
+            */
+         int i;
+         int max_d;
+         int num_new_palette;
+         png_dsortp t;
+         png_dsortpp hash;
+
+         t=NULL;
+
+         /* initialize palette index arrays */
+         png_ptr->index_to_palette = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof (png_byte)));
+         png_ptr->palette_to_index = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(num_palette * png_sizeof (png_byte)));
+
+         /* initialize the sort array */
+         for (i = 0; i < num_palette; i++)
+         {
+            png_ptr->index_to_palette[i] = (png_byte)i;
+            png_ptr->palette_to_index[i] = (png_byte)i;
+         }
+
+         hash = (png_dsortpp)png_malloc(png_ptr, (png_uint_32)(769 *
+            png_sizeof (png_dsortp)));
+         for (i = 0; i < 769; i++)
+            hash[i] = NULL;
+/*         png_memset(hash, 0, 769 * png_sizeof (png_dsortp)); */
+
+         num_new_palette = num_palette;
+
+         /* initial wild guess at how far apart the farthest pixel
+            pair we will be eliminating will be.  Larger
+            numbers mean more areas will be allocated, Smaller
+            numbers run the risk of not saving enough data, and
+            having to do this all over again.
+
+            I have not done extensive checking on this number.
+            */
+         max_d = 96;
+
+         while (num_new_palette > maximum_colors)
+         {
+            for (i = 0; i < num_new_palette - 1; i++)
+            {
+               int j;
+
+               for (j = i + 1; j < num_new_palette; j++)
+               {
+                  int d;
+
+                  d = PNG_COLOR_DIST(palette[i], palette[j]);
+
+                  if (d <= max_d)
+                  {
+
+                     t = (png_dsortp)png_malloc_warn(png_ptr,
+                         (png_uint_32)(png_sizeof(png_dsort)));
+                     if (t == NULL)
+                         break;
+                     t->next = hash[d];
+                     t->left = (png_byte)i;
+                     t->right = (png_byte)j;
+                     hash[d] = t;
+                  }
+               }
+               if (t == NULL)
+                  break;
+            }
+
+            if (t != NULL)
+            for (i = 0; i <= max_d; i++)
+            {
+               if (hash[i] != NULL)
+               {
+                  png_dsortp p;
+
+                  for (p = hash[i]; p; p = p->next)
+                  {
+                     if ((int)png_ptr->index_to_palette[p->left]
+                        < num_new_palette &&
+                        (int)png_ptr->index_to_palette[p->right]
+                        < num_new_palette)
+                     {
+                        int j, next_j;
+
+                        if (num_new_palette & 0x01)
+                        {
+                           j = p->left;
+                           next_j = p->right;
+                        }
+                        else
+                        {
+                           j = p->right;
+                           next_j = p->left;
+                        }
+
+                        num_new_palette--;
+                        palette[png_ptr->index_to_palette[j]]
+                          = palette[num_new_palette];
+                        if (!full_dither)
+                        {
+                           int k;
+
+                           for (k = 0; k < num_palette; k++)
+                           {
+                              if (png_ptr->dither_index[k] ==
+                                 png_ptr->index_to_palette[j])
+                                 png_ptr->dither_index[k] =
+                                    png_ptr->index_to_palette[next_j];
+                              if ((int)png_ptr->dither_index[k] ==
+                                 num_new_palette)
+                                 png_ptr->dither_index[k] =
+                                    png_ptr->index_to_palette[j];
+                           }
+                        }
+
+                        png_ptr->index_to_palette[png_ptr->palette_to_index
+                           [num_new_palette]] = png_ptr->index_to_palette[j];
+                        png_ptr->palette_to_index[png_ptr->index_to_palette[j]]
+                           = png_ptr->palette_to_index[num_new_palette];
+
+                        png_ptr->index_to_palette[j] = (png_byte)num_new_palette;
+                        png_ptr->palette_to_index[num_new_palette] = (png_byte)j;
+                     }
+                     if (num_new_palette <= maximum_colors)
+                        break;
+                  }
+                  if (num_new_palette <= maximum_colors)
+                     break;
+               }
+            }
+
+            for (i = 0; i < 769; i++)
+            {
+               if (hash[i] != NULL)
+               {
+                  png_dsortp p = hash[i];
+                  while (p)
+                  {
+                     t = p->next;
+                     png_free(png_ptr, p);
+                     p = t;
+                  }
+               }
+               hash[i] = 0;
+            }
+            max_d += 96;
+         }
+         png_free(png_ptr, hash);
+         png_free(png_ptr, png_ptr->palette_to_index);
+         png_free(png_ptr, png_ptr->index_to_palette);
+         png_ptr->palette_to_index=NULL;
+         png_ptr->index_to_palette=NULL;
+      }
+      num_palette = maximum_colors;
+   }
+   if (png_ptr->palette == NULL)
+   {
+      png_ptr->palette = palette;
+   }
+   png_ptr->num_palette = (png_uint_16)num_palette;
+
+   if (full_dither)
+   {
+      int i;
+      png_bytep distance;
+      int total_bits = PNG_DITHER_RED_BITS + PNG_DITHER_GREEN_BITS +
+         PNG_DITHER_BLUE_BITS;
+      int num_red = (1 << PNG_DITHER_RED_BITS);
+      int num_green = (1 << PNG_DITHER_GREEN_BITS);
+      int num_blue = (1 << PNG_DITHER_BLUE_BITS);
+      png_size_t num_entries = ((png_size_t)1 << total_bits);
+
+      png_ptr->palette_lookup = (png_bytep )png_malloc(png_ptr,
+         (png_uint_32)(num_entries * png_sizeof (png_byte)));
+
+      png_memset(png_ptr->palette_lookup, 0, num_entries *
+         png_sizeof (png_byte));
+
+      distance = (png_bytep)png_malloc(png_ptr, (png_uint_32)(num_entries *
+         png_sizeof(png_byte)));
+
+      png_memset(distance, 0xff, num_entries * png_sizeof(png_byte));
+
+      for (i = 0; i < num_palette; i++)
+      {
+         int ir, ig, ib;
+         int r = (palette[i].red >> (8 - PNG_DITHER_RED_BITS));
+         int g = (palette[i].green >> (8 - PNG_DITHER_GREEN_BITS));
+         int b = (palette[i].blue >> (8 - PNG_DITHER_BLUE_BITS));
+
+         for (ir = 0; ir < num_red; ir++)
+         {
+            /* int dr = abs(ir - r); */
+            int dr = ((ir > r) ? ir - r : r - ir);
+            int index_r = (ir << (PNG_DITHER_BLUE_BITS + PNG_DITHER_GREEN_BITS));
+
+            for (ig = 0; ig < num_green; ig++)
+            {
+               /* int dg = abs(ig - g); */
+               int dg = ((ig > g) ? ig - g : g - ig);
+               int dt = dr + dg;
+               int dm = ((dr > dg) ? dr : dg);
+               int index_g = index_r | (ig << PNG_DITHER_BLUE_BITS);
+
+               for (ib = 0; ib < num_blue; ib++)
+               {
+                  int d_index = index_g | ib;
+                  /* int db = abs(ib - b); */
+                  int db = ((ib > b) ? ib - b : b - ib);
+                  int dmax = ((dm > db) ? dm : db);
+                  int d = dmax + dt + db;
+
+                  if (d < (int)distance[d_index])
+                  {
+                     distance[d_index] = (png_byte)d;
+                     png_ptr->palette_lookup[d_index] = (png_byte)i;
+                  }
+               }
+            }
+         }
+      }
+
+      png_free(png_ptr, distance);
+   }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+/* Transform the image from the file_gamma to the screen_gamma.  We
+ * only do transformations on images where the file_gamma and screen_gamma
+ * are not close reciprocals, otherwise it slows things down slightly, and
+ * also needlessly introduces small errors.
+ *
+ * We will turn off gamma transformation later if no semitransparent entries
+ * are present in the tRNS array for palette images.  We can't do it here
+ * because we don't necessarily have the tRNS chunk yet.
+ */
+void PNGAPI
+png_set_gamma(png_structp png_ptr, double scrn_gamma, double file_gamma)
+{
+   png_debug(1, "in png_set_gamma\n");
+   if ((fabs(scrn_gamma * file_gamma - 1.0) > PNG_GAMMA_THRESHOLD) ||
+       (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) ||
+       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
+     png_ptr->transformations |= PNG_GAMMA;
+   png_ptr->gamma = (float)file_gamma;
+   png_ptr->screen_gamma = (float)scrn_gamma;
+}
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expand paletted images to RGB, expand grayscale images of
+ * less than 8-bit depth to 8-bit depth, and expand tRNS chunks
+ * to alpha channels.
+ */
+void PNGAPI
+png_set_expand(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand\n");
+   png_ptr->transformations |= PNG_EXPAND;
+}
+
+/* GRR 19990627:  the following three functions currently are identical
+ *  to png_set_expand().  However, it is entirely reasonable that someone
+ *  might wish to expand an indexed image to RGB but *not* expand a single,
+ *  fully transparent palette entry to a full alpha channel--perhaps instead
+ *  convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace
+ *  the transparent color with a particular RGB value, or drop tRNS entirely.
+ *  IOW, a future version of the library may make the transformations flag
+ *  a bit more fine-grained, with separate bits for each of these three
+ *  functions.
+ *
+ *  More to the point, these functions make it obvious what libpng will be
+ *  doing, whereas "expand" can (and does) mean any number of things.
+ */
+
+/* Expand paletted images to RGB. */
+void PNGAPI
+png_set_palette_to_rgb(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand\n");
+   png_ptr->transformations |= PNG_EXPAND;
+}
+
+/* Expand grayscale images of less than 8-bit depth to 8 bits. */
+void PNGAPI
+png_set_gray_1_2_4_to_8(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand\n");
+   png_ptr->transformations |= PNG_EXPAND;
+}
+
+/* Expand tRNS chunks to alpha channels. */
+void PNGAPI
+png_set_tRNS_to_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_expand\n");
+   png_ptr->transformations |= PNG_EXPAND;
+}
+#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+void PNGAPI
+png_set_gray_to_rgb(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_gray_to_rgb\n");
+   png_ptr->transformations |= PNG_GRAY_TO_RGB;
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+/* Convert a RGB image to a grayscale of the same width.  This allows us,
+ * for example, to convert a 24 bpp RGB image into an 8 bpp grayscale image.
+ */
+
+void PNGAPI
+png_set_rgb_to_gray(png_structp png_ptr, int error_action, double red,
+   double green)
+{
+      int red_fixed = (int)((float)red*100000.0 + 0.5);
+      int green_fixed = (int)((float)green*100000.0 + 0.5);
+      png_set_rgb_to_gray_fixed(png_ptr, error_action, red_fixed, green_fixed);
+}
+#endif
+
+void PNGAPI
+png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
+   png_fixed_point red, png_fixed_point green)
+{
+   png_debug(1, "in png_set_rgb_to_gray\n");
+   switch(error_action)
+   {
+      case 1: png_ptr->transformations |= PNG_RGB_TO_GRAY;
+              break;
+      case 2: png_ptr->transformations |= PNG_RGB_TO_GRAY_WARN;
+              break;
+      case 3: png_ptr->transformations |= PNG_RGB_TO_GRAY_ERR;
+   }
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+      png_ptr->transformations |= PNG_EXPAND;
+#else
+   {
+      png_warning(png_ptr, "Cannot do RGB_TO_GRAY without EXPAND_SUPPORTED.");
+      png_ptr->transformations &= ~PNG_RGB_TO_GRAY;
+   }
+#endif
+   {
+      png_uint_16 red_int, green_int;
+      if(red < 0 || green < 0)
+      {
+         red_int   =  6968; /* .212671 * 32768 + .5 */
+         green_int = 23434; /* .715160 * 32768 + .5 */
+      }
+      else if(red + green < 100000L)
+      {
+        red_int = (png_uint_16)(((png_uint_32)red*32768L)/100000L);
+        green_int = (png_uint_16)(((png_uint_32)green*32768L)/100000L);
+      }
+      else
+      {
+         png_warning(png_ptr, "ignoring out of range rgb_to_gray coefficients");
+         red_int   =  6968;
+         green_int = 23434;
+      }
+      png_ptr->rgb_to_gray_red_coeff   = red_int;
+      png_ptr->rgb_to_gray_green_coeff = green_int;
+      png_ptr->rgb_to_gray_blue_coeff  = (png_uint_16)(32768-red_int-green_int);
+   }
+}
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+void PNGAPI
+png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+   read_user_transform_fn)
+{
+   png_debug(1, "in png_set_read_user_transform_fn\n");
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   png_ptr->transformations |= PNG_USER_TRANSFORM;
+   png_ptr->read_user_transform_fn = read_user_transform_fn;
+#endif
+#ifdef PNG_LEGACY_SUPPORTED
+   if(read_user_transform_fn)
+      png_warning(png_ptr,
+        "This version of libpng does not support user transforms");
+#endif
+}
+#endif
+
+/* Initialize everything needed for the read.  This includes modifying
+ * the palette.
+ */
+void /* PRIVATE */
+png_init_read_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_init_read_transformations\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if(png_ptr != NULL)
+#endif
+  {
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || defined(PNG_READ_SHIFT_SUPPORTED) \
+ || defined(PNG_READ_GAMMA_SUPPORTED)
+   int color_type = png_ptr->color_type;
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED) && defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
+       (png_ptr->transformations & PNG_EXPAND))
+   {
+      if (!(color_type & PNG_COLOR_MASK_COLOR))  /* i.e., GRAY or GRAY_ALPHA */
+      {
+         /* expand background chunk. */
+         switch (png_ptr->bit_depth)
+         {
+            case 1:
+               png_ptr->background.gray *= (png_uint_16)0xff;
+               png_ptr->background.red = png_ptr->background.green
+                 =  png_ptr->background.blue = png_ptr->background.gray;
+               break;
+            case 2:
+               png_ptr->background.gray *= (png_uint_16)0x55;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               break;
+            case 4:
+               png_ptr->background.gray *= (png_uint_16)0x11;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               break;
+            case 8:
+            case 16:
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+               break;
+         }
+      }
+      else if (color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_ptr->background.red   =
+            png_ptr->palette[png_ptr->background.index].red;
+         png_ptr->background.green =
+            png_ptr->palette[png_ptr->background.index].green;
+         png_ptr->background.blue  =
+            png_ptr->palette[png_ptr->background.index].blue;
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+        if (png_ptr->transformations & PNG_INVERT_ALPHA)
+        {
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+           if (!(png_ptr->transformations & PNG_EXPAND))
+#endif
+           {
+           /* invert the alpha channel (in tRNS) unless the pixels are
+              going to be expanded, in which case leave it for later */
+              int i,istop;
+              istop=(int)png_ptr->num_trans;
+              for (i=0; i<istop; i++)
+                 png_ptr->trans[i] = (png_byte)(255 - png_ptr->trans[i]);
+           }
+        }
+#endif
+
+      }
+   }
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+   png_ptr->background_1 = png_ptr->background;
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+
+   if ((color_type == PNG_COLOR_TYPE_PALETTE && png_ptr->num_trans != 0)
+       && (fabs(png_ptr->screen_gamma * png_ptr->gamma - 1.0)
+         < PNG_GAMMA_THRESHOLD))
+   {
+    int i,k;
+    k=0;
+    for (i=0; i<png_ptr->num_trans; i++)
+    {
+      if (png_ptr->trans[i] != 0 && png_ptr->trans[i] != 0xff)
+        k=1; /* partial transparency is present */
+    }
+    if (k == 0)
+      png_ptr->transformations &= (~PNG_GAMMA);
+   }
+
+   if (png_ptr->transformations & (PNG_GAMMA | PNG_RGB_TO_GRAY))
+   {
+      png_build_gamma_table(png_ptr);
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+      if (png_ptr->transformations & PNG_BACKGROUND)
+      {
+         if (color_type == PNG_COLOR_TYPE_PALETTE)
+         {
+           /* could skip if no transparency and 
+           */
+            png_color back, back_1;
+            png_colorp palette = png_ptr->palette;
+            int num_palette = png_ptr->num_palette;
+            int i;
+            if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+            {
+               back.red = png_ptr->gamma_table[png_ptr->background.red];
+               back.green = png_ptr->gamma_table[png_ptr->background.green];
+               back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+               back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+               back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+               back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+            }
+            else
+            {
+               double g, gs;
+
+               switch (png_ptr->background_gamma_type)
+               {
+                  case PNG_BACKGROUND_GAMMA_SCREEN:
+                     g = (png_ptr->screen_gamma);
+                     gs = 1.0;
+                     break;
+                  case PNG_BACKGROUND_GAMMA_FILE:
+                     g = 1.0 / (png_ptr->gamma);
+                     gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+                     break;
+                  case PNG_BACKGROUND_GAMMA_UNIQUE:
+                     g = 1.0 / (png_ptr->background_gamma);
+                     gs = 1.0 / (png_ptr->background_gamma *
+                                 png_ptr->screen_gamma);
+                     break;
+                  default:
+                     g = 1.0;    /* back_1 */
+                     gs = 1.0;   /* back */
+               }
+
+               if ( fabs(gs - 1.0) < PNG_GAMMA_THRESHOLD)
+               {
+                  back.red   = (png_byte)png_ptr->background.red;
+                  back.green = (png_byte)png_ptr->background.green;
+                  back.blue  = (png_byte)png_ptr->background.blue;
+               }
+               else
+               {
+                  back.red = (png_byte)(pow(
+                     (double)png_ptr->background.red/255, gs) * 255.0 + .5);
+                  back.green = (png_byte)(pow(
+                     (double)png_ptr->background.green/255, gs) * 255.0 + .5);
+                  back.blue = (png_byte)(pow(
+                     (double)png_ptr->background.blue/255, gs) * 255.0 + .5);
+               }
+
+               back_1.red = (png_byte)(pow(
+                  (double)png_ptr->background.red/255, g) * 255.0 + .5);
+               back_1.green = (png_byte)(pow(
+                  (double)png_ptr->background.green/255, g) * 255.0 + .5);
+               back_1.blue = (png_byte)(pow(
+                  (double)png_ptr->background.blue/255, g) * 255.0 + .5);
+            }
+            for (i = 0; i < num_palette; i++)
+            {
+               if (i < (int)png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+               {
+                  if (png_ptr->trans[i] == 0)
+                  {
+                     palette[i] = back;
+                  }
+                  else /* if (png_ptr->trans[i] != 0xff) */
+                  {
+                     png_byte v, w;
+
+                     v = png_ptr->gamma_to_1[palette[i].red];
+                     png_composite(w, v, png_ptr->trans[i], back_1.red);
+                     palette[i].red = png_ptr->gamma_from_1[w];
+
+                     v = png_ptr->gamma_to_1[palette[i].green];
+                     png_composite(w, v, png_ptr->trans[i], back_1.green);
+                     palette[i].green = png_ptr->gamma_from_1[w];
+
+                     v = png_ptr->gamma_to_1[palette[i].blue];
+                     png_composite(w, v, png_ptr->trans[i], back_1.blue);
+                     palette[i].blue = png_ptr->gamma_from_1[w];
+                  }
+               }
+               else
+               {
+                  palette[i].red = png_ptr->gamma_table[palette[i].red];
+                  palette[i].green = png_ptr->gamma_table[palette[i].green];
+                  palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+               }
+            }
+         }
+         /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */
+         else
+         /* color_type != PNG_COLOR_TYPE_PALETTE */
+         {
+            double m = (double)(((png_uint_32)1 << png_ptr->bit_depth) - 1);
+            double g = 1.0;
+            double gs = 1.0;
+
+            switch (png_ptr->background_gamma_type)
+            {
+               case PNG_BACKGROUND_GAMMA_SCREEN:
+                  g = (png_ptr->screen_gamma);
+                  gs = 1.0;
+                  break;
+               case PNG_BACKGROUND_GAMMA_FILE:
+                  g = 1.0 / (png_ptr->gamma);
+                  gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+                  break;
+               case PNG_BACKGROUND_GAMMA_UNIQUE:
+                  g = 1.0 / (png_ptr->background_gamma);
+                  gs = 1.0 / (png_ptr->background_gamma *
+                     png_ptr->screen_gamma);
+                  break;
+            }
+
+            png_ptr->background_1.gray = (png_uint_16)(pow(
+               (double)png_ptr->background.gray / m, g) * m + .5);
+            png_ptr->background.gray = (png_uint_16)(pow(
+               (double)png_ptr->background.gray / m, gs) * m + .5);
+
+            if ((png_ptr->background.red != png_ptr->background.green) ||
+                (png_ptr->background.red != png_ptr->background.blue) ||
+                (png_ptr->background.red != png_ptr->background.gray))
+            {
+               /* RGB or RGBA with color background */
+               png_ptr->background_1.red = (png_uint_16)(pow(
+                  (double)png_ptr->background.red / m, g) * m + .5);
+               png_ptr->background_1.green = (png_uint_16)(pow(
+                  (double)png_ptr->background.green / m, g) * m + .5);
+               png_ptr->background_1.blue = (png_uint_16)(pow(
+                  (double)png_ptr->background.blue / m, g) * m + .5);
+               png_ptr->background.red = (png_uint_16)(pow(
+                  (double)png_ptr->background.red / m, gs) * m + .5);
+               png_ptr->background.green = (png_uint_16)(pow(
+                  (double)png_ptr->background.green / m, gs) * m + .5);
+               png_ptr->background.blue = (png_uint_16)(pow(
+                  (double)png_ptr->background.blue / m, gs) * m + .5);
+            }
+            else
+            {
+               /* GRAY, GRAY ALPHA, RGB, or RGBA with gray background */
+               png_ptr->background_1.red = png_ptr->background_1.green
+                 = png_ptr->background_1.blue = png_ptr->background_1.gray;
+               png_ptr->background.red = png_ptr->background.green
+                 = png_ptr->background.blue = png_ptr->background.gray;
+            }
+         }
+      }
+      else
+      /* transformation does not include PNG_BACKGROUND */
+#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+      if (color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_colorp palette = png_ptr->palette;
+         int num_palette = png_ptr->num_palette;
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            palette[i].red = png_ptr->gamma_table[palette[i].red];
+            palette[i].green = png_ptr->gamma_table[palette[i].green];
+            palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+         }
+      }
+   }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   else
+#endif
+#endif /* PNG_READ_GAMMA_SUPPORTED && PNG_FLOATING_POINT_SUPPORTED */
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   /* No GAMMA transformation */
+   if ((png_ptr->transformations & PNG_BACKGROUND) &&
+       (color_type == PNG_COLOR_TYPE_PALETTE))
+   {
+      int i;
+      int istop = (int)png_ptr->num_trans;
+      png_color back;
+      png_colorp palette = png_ptr->palette;
+
+      back.red   = (png_byte)png_ptr->background.red;
+      back.green = (png_byte)png_ptr->background.green;
+      back.blue  = (png_byte)png_ptr->background.blue;
+
+      for (i = 0; i < istop; i++)
+      {
+         if (png_ptr->trans[i] == 0)
+         {
+            palette[i] = back;
+         }
+         else if (png_ptr->trans[i] != 0xff)
+         {
+            /* The png_composite() macro is defined in png.h */
+            png_composite(palette[i].red, palette[i].red,
+               png_ptr->trans[i], back.red);
+            png_composite(palette[i].green, palette[i].green,
+               png_ptr->trans[i], back.green);
+            png_composite(palette[i].blue, palette[i].blue,
+               png_ptr->trans[i], back.blue);
+         }
+      }
+   }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+   if ((png_ptr->transformations & PNG_SHIFT) &&
+      (color_type == PNG_COLOR_TYPE_PALETTE))
+   {
+      png_uint_16 i;
+      png_uint_16 istop = png_ptr->num_palette;
+      int sr = 8 - png_ptr->sig_bit.red;
+      int sg = 8 - png_ptr->sig_bit.green;
+      int sb = 8 - png_ptr->sig_bit.blue;
+
+      if (sr < 0 || sr > 8)
+         sr = 0;
+      if (sg < 0 || sg > 8)
+         sg = 0;
+      if (sb < 0 || sb > 8)
+         sb = 0;
+      for (i = 0; i < istop; i++)
+      {
+         png_ptr->palette[i].red >>= sr;
+         png_ptr->palette[i].green >>= sg;
+         png_ptr->palette[i].blue >>= sb;
+      }
+   }
+#endif  /* PNG_READ_SHIFT_SUPPORTED */
+ }
+#if !defined(PNG_READ_GAMMA_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED) \
+ && !defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if(png_ptr)
+      return;
+#endif
+}
+
+/* Modify the info structure to reflect the transformations.  The
+ * info should be updated so a PNG file could be written with it,
+ * assuming the transformations result in valid PNG data.
+ */
+void /* PRIVATE */
+png_read_transform_info(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_read_transform_info\n");
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         if (png_ptr->num_trans)
+            info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+         else
+            info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+         info_ptr->bit_depth = 8;
+         info_ptr->num_trans = 0;
+      }
+      else
+      {
+         if (png_ptr->num_trans)
+            info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+         if (info_ptr->bit_depth < 8)
+            info_ptr->bit_depth = 8;
+         info_ptr->num_trans = 0;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr->transformations & PNG_BACKGROUND)
+   {
+      info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+      info_ptr->num_trans = 0;
+      info_ptr->background = png_ptr->background;
+   }
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if (png_ptr->transformations & PNG_GAMMA)
+   {
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      info_ptr->gamma = png_ptr->gamma;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      info_ptr->int_gamma = png_ptr->int_gamma;
+#endif
+   }
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+   if ((png_ptr->transformations & PNG_16_TO_8) && (info_ptr->bit_depth == 16))
+      info_ptr->bit_depth = 8;
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   if (png_ptr->transformations & PNG_DITHER)
+   {
+      if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
+         (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
+         png_ptr->palette_lookup && info_ptr->bit_depth == 8)
+      {
+         info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+   if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8))
+      info_ptr->bit_depth = 8;
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+      info_ptr->color_type |= PNG_COLOR_MASK_COLOR;
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+      info_ptr->color_type &= ~PNG_COLOR_MASK_COLOR;
+#endif
+
+   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      info_ptr->channels = 1;
+   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      info_ptr->channels = 3;
+   else
+      info_ptr->channels = 1;
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_STRIP_ALPHA)
+      info_ptr->color_type &= ~PNG_COLOR_MASK_ALPHA;
+#endif
+
+   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      info_ptr->channels++;
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+   /* STRIP_ALPHA and FILLER allowed:  MASK_ALPHA bit stripped above */
+   if ((png_ptr->transformations & PNG_FILLER) &&
+       ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
+       (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)))
+   {
+      info_ptr->channels++;
+      /* if adding a true alpha channel not just filler */
+#if !defined(PNG_1_0_X)
+      if (png_ptr->transformations & PNG_ADD_ALPHA)
+        info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+#endif
+   }
+#endif
+
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
+defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   if(png_ptr->transformations & PNG_USER_TRANSFORM)
+     {
+       if(info_ptr->bit_depth < png_ptr->user_transform_depth)
+         info_ptr->bit_depth = png_ptr->user_transform_depth;
+       if(info_ptr->channels < png_ptr->user_transform_channels)
+         info_ptr->channels = png_ptr->user_transform_channels;
+     }
+#endif
+
+   info_ptr->pixel_depth = (png_byte)(info_ptr->channels *
+      info_ptr->bit_depth);
+
+   info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth,info_ptr->width);
+
+#if !defined(PNG_READ_EXPAND_SUPPORTED)
+   if(png_ptr)
+      return;
+#endif
+}
+
+/* Transform the row.  The order of transformations is significant,
+ * and is very touchy.  If you add a transformation, take care to
+ * decide how it fits in with the other transformations here.
+ */
+void /* PRIVATE */
+png_do_read_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_do_read_transformations\n");
+#if !defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (png_ptr->row_buf == NULL)
+   {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+      char msg[50];
+
+      sprintf(msg, "NULL row buffer for row %ld, pass %d", png_ptr->row_number,
+         png_ptr->pass);
+      png_error(png_ptr, msg);
+#else
+      png_error(png_ptr, "NULL row buffer");
+#endif
+   }
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1,
+            png_ptr->palette, png_ptr->trans, png_ptr->num_trans);
+      }
+      else
+      {
+         if (png_ptr->num_trans)
+            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+               &(png_ptr->trans_values));
+         else
+            png_do_expand(&(png_ptr->row_info), png_ptr->row_buf + 1,
+               NULL);
+      }
+   }
+#endif
+
+#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_STRIP_ALPHA)
+      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         PNG_FLAG_FILLER_AFTER);
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+   if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+   {
+      int rgb_error =
+         png_do_rgb_to_gray(png_ptr, &(png_ptr->row_info), png_ptr->row_buf + 1);
+      if(rgb_error)
+      {
+         png_ptr->rgb_to_gray_status=1;
+         if(png_ptr->transformations == PNG_RGB_TO_GRAY_WARN)
+            png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+         if(png_ptr->transformations == PNG_RGB_TO_GRAY_ERR)
+            png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+      }
+   }
+#endif
+
+/*
+From Andreas Dilger e-mail to png-implement, 26 March 1998:
+
+  In most cases, the "simple transparency" should be done prior to doing
+  gray-to-RGB, or you will have to test 3x as many bytes to check if a
+  pixel is transparent.  You would also need to make sure that the
+  transparency information is upgraded to RGB.
+
+  To summarize, the current flow is:
+  - Gray + simple transparency -> compare 1 or 2 gray bytes and composite
+                                  with background "in place" if transparent,
+                                  convert to RGB if necessary
+  - Gray + alpha -> composite with gray background and remove alpha bytes,
+                                  convert to RGB if necessary
+
+  To support RGB backgrounds for gray images we need:
+  - Gray + simple transparency -> convert to RGB + simple transparency, compare
+                                  3 or 6 bytes and composite with background
+                                  "in place" if transparent (3x compare/pixel
+                                  compared to doing composite with gray bkgrnd)
+  - Gray + alpha -> convert to RGB + alpha, composite with background and
+                                  remove alpha bytes (3x float operations/pixel
+                                  compared with composite on gray background)
+
+  Greg's change will do this.  The reason it wasn't done before is for
+  performance, as this increases the per-pixel operations.  If we would check
+  in advance if the background was gray or RGB, and position the gray-to-RGB
+  transform appropriately, then it would save a lot of work/time.
+ */
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   /* if gray -> RGB, do so now only if background is non-gray; else do later
+    * for performance reasons */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+       !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if ((png_ptr->transformations & PNG_BACKGROUND) &&
+      ((png_ptr->num_trans != 0 ) ||
+      (png_ptr->color_type & PNG_COLOR_MASK_ALPHA)))
+      png_do_background(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->trans_values), &(png_ptr->background)
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+         , &(png_ptr->background_1),
+         png_ptr->gamma_table, png_ptr->gamma_from_1,
+         png_ptr->gamma_to_1, png_ptr->gamma_16_table,
+         png_ptr->gamma_16_from_1, png_ptr->gamma_16_to_1,
+         png_ptr->gamma_shift
+#endif
+);
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if ((png_ptr->transformations & PNG_GAMMA) &&
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+      !((png_ptr->transformations & PNG_BACKGROUND) &&
+      ((png_ptr->num_trans != 0) ||
+      (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
+#endif
+      (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE))
+      png_do_gamma(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->gamma_table, png_ptr->gamma_16_table,
+         png_ptr->gamma_shift);
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+   if (png_ptr->transformations & PNG_16_TO_8)
+      png_do_chop(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+   if (png_ptr->transformations & PNG_DITHER)
+   {
+      png_do_dither((png_row_infop)&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->palette_lookup, png_ptr->dither_index);
+      if(png_ptr->row_info.rowbytes == (png_uint_32)0)
+         png_error(png_ptr, "png_do_dither returned rowbytes=0");
+   }
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_do_unshift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->shift));
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_do_unpack(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   /* if gray -> RGB, do so now only if we did not do so above */
+   if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
+       (png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+      png_do_gray_to_rgb(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_do_read_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         (png_uint_32)png_ptr->filler, png_ptr->flags);
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_ALPHA)
+      png_do_read_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_ALPHA)
+      png_do_read_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+    {
+      if(png_ptr->read_user_transform_fn != NULL)
+        (*(png_ptr->read_user_transform_fn)) /* user read transform function */
+          (png_ptr,                    /* png_ptr */
+           &(png_ptr->row_info),       /* row_info:     */
+             /*  png_uint_32 width;          width of row */
+             /*  png_uint_32 rowbytes;       number of bytes in row */
+             /*  png_byte color_type;        color type of pixels */
+             /*  png_byte bit_depth;         bit depth of samples */
+             /*  png_byte channels;          number of channels (1-4) */
+             /*  png_byte pixel_depth;       bits per pixel (depth*channels) */
+           png_ptr->row_buf + 1);      /* start of pixel data for row */
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+      if(png_ptr->user_transform_depth)
+         png_ptr->row_info.bit_depth = png_ptr->user_transform_depth;
+      if(png_ptr->user_transform_channels)
+         png_ptr->row_info.channels = png_ptr->user_transform_channels;
+#endif
+      png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
+         png_ptr->row_info.channels);
+      png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+         png_ptr->row_info.width);
+   }
+#endif
+
+}
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+/* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel,
+ * without changing the actual values.  Thus, if you had a row with
+ * a bit depth of 1, you would end up with bytes that only contained
+ * the numbers 0 or 1.  If you would rather they contain 0 and 255, use
+ * png_do_shift() after this.
+ */
+void /* PRIVATE */
+png_do_unpack(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_unpack\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL && row_info->bit_depth < 8)
+#else
+   if (row_info->bit_depth < 8)
+#endif
+   {
+      png_uint_32 i;
+      png_uint_32 row_width=row_info->width;
+
+      switch (row_info->bit_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 3);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = 7 - (int)((row_width + 7) & 0x07);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x01);
+               if (shift == 7)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift++;
+
+               dp--;
+            }
+            break;
+         }
+         case 2:
+         {
+
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 2);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x03);
+               if (shift == 6)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift += 2;
+
+               dp--;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = row + (png_size_t)((row_width - 1) >> 1);
+            png_bytep dp = row + (png_size_t)row_width - 1;
+            png_uint_32 shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
+            for (i = 0; i < row_width; i++)
+            {
+               *dp = (png_byte)((*sp >> shift) & 0x0f);
+               if (shift == 4)
+               {
+                  shift = 0;
+                  sp--;
+               }
+               else
+                  shift = 4;
+
+               dp--;
+            }
+            break;
+         }
+      }
+      row_info->bit_depth = 8;
+      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+      row_info->rowbytes = row_width * row_info->channels;
+   }
+}
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED)
+/* Reverse the effects of png_do_shift.  This routine merely shifts the
+ * pixels back to their significant bits values.  Thus, if you have
+ * a row of bit depth 8, but only 5 are significant, this will shift
+ * the values back to 0 through 31.
+ */
+void /* PRIVATE */
+png_do_unshift(png_row_infop row_info, png_bytep row, png_color_8p sig_bits)
+{
+   png_debug(1, "in png_do_unshift\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL && sig_bits != NULL &&
+#endif
+       row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      int shift[4];
+      int channels = 0;
+      int c;
+      png_uint_16 value = 0;
+      png_uint_32 row_width = row_info->width;
+
+      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->red;
+         shift[channels++] = row_info->bit_depth - sig_bits->green;
+         shift[channels++] = row_info->bit_depth - sig_bits->blue;
+      }
+      else
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->gray;
+      }
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         shift[channels++] = row_info->bit_depth - sig_bits->alpha;
+      }
+
+      for (c = 0; c < channels; c++)
+      {
+         if (shift[c] <= 0)
+            shift[c] = 0;
+         else
+            value = 1;
+      }
+
+      if (!value)
+         return;
+
+      switch (row_info->bit_depth)
+      {
+         case 2:
+         {
+            png_bytep bp;
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+
+            for (bp = row, i = 0; i < istop; i++)
+            {
+               *bp >>= 1;
+               *bp++ &= 0x55;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+            png_byte mask = (png_byte)((((int)0xf0 >> shift[0]) & (int)0xf0) |
+               (png_byte)((int)0xf >> shift[0]));
+
+            for (i = 0; i < istop; i++)
+            {
+               *bp >>= shift[0];
+               *bp++ &= mask;
+            }
+            break;
+         }
+         case 8:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = row_width * channels;
+
+            for (i = 0; i < istop; i++)
+            {
+               *bp++ >>= shift[i%channels];
+            }
+            break;
+         }
+         case 16:
+         {
+            png_bytep bp = row;
+            png_uint_32 i;
+            png_uint_32 istop = channels * row_width;
+
+            for (i = 0; i < istop; i++)
+            {
+               value = (png_uint_16)((*bp << 8) + *(bp + 1));
+               value >>= shift[i%channels];
+               *bp++ = (png_byte)(value >> 8);
+               *bp++ = (png_byte)(value & 0xff);
+            }
+            break;
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_16_TO_8_SUPPORTED)
+/* chop rows of bit depth 16 down to 8 */
+void /* PRIVATE */
+png_do_chop(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_chop\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL && row_info->bit_depth == 16)
+#else
+   if (row_info->bit_depth == 16)
+#endif
+   {
+      png_bytep sp = row;
+      png_bytep dp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->width * row_info->channels;
+
+      for (i = 0; i<istop; i++, sp += 2, dp++)
+      {
+#if defined(PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED)
+      /* This does a more accurate scaling of the 16-bit color
+       * value, rather than a simple low-byte truncation.
+       *
+       * What the ideal calculation should be:
+       *   *dp = (((((png_uint_32)(*sp) << 8) |
+       *          (png_uint_32)(*(sp + 1))) * 255 + 127) / (png_uint_32)65535L;
+       *
+       * GRR: no, I think this is what it really should be:
+       *   *dp = (((((png_uint_32)(*sp) << 8) |
+       *           (png_uint_32)(*(sp + 1))) + 128L) / (png_uint_32)257L;
+       *
+       * GRR: here's the exact calculation with shifts:
+       *   temp = (((png_uint_32)(*sp) << 8) | (png_uint_32)(*(sp + 1))) + 128L;
+       *   *dp = (temp - (temp >> 8)) >> 8;
+       *
+       * Approximate calculation with shift/add instead of multiply/divide:
+       *   *dp = ((((png_uint_32)(*sp) << 8) |
+       *          (png_uint_32)((int)(*(sp + 1)) - *sp)) + 128) >> 8;
+       *
+       * What we actually do to avoid extra shifting and conversion:
+       */
+
+         *dp = *sp + ((((int)(*(sp + 1)) - *sp) > 128) ? 1 : 0);
+#else
+       /* Simply discard the low order byte */
+         *dp = *sp;
+#endif
+      }
+      row_info->bit_depth = 8;
+      row_info->pixel_depth = (png_byte)(8 * row_info->channels);
+      row_info->rowbytes = row_info->width * row_info->channels;
+   }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_read_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_swap_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This converts from RGBA to ARGB */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save;
+            }
+         }
+         /* This converts from RRGGBBAA to AARRGGBB */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save[2];
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save[0] = *(--sp);
+               save[1] = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save[0];
+               *(--dp) = save[1];
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This converts from GA to AG */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save;
+            }
+         }
+         /* This converts from GGAA to AAGG */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_byte save[2];
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               save[0] = *(--sp);
+               save[1] = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = save[0];
+               *(--dp) = save[1];
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_read_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_invert_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This inverts the alpha channel in RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+
+/*             This does nothing:
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               We can replace it with:
+*/
+               sp-=3;
+               dp=sp;
+            }
+         }
+         /* This inverts the alpha channel in RRGGBBAA */
+         else
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = (png_byte)(255 - *(--sp));
+
+/*             This does nothing:
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               We can replace it with:
+*/
+               sp-=6;
+               dp=sp;
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This inverts the alpha channel in GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = *(--sp);
+            }
+         }
+         /* This inverts the alpha channel in GGAA */
+         else
+         {
+            png_bytep sp  = row + row_info->rowbytes;
+            png_bytep dp = sp;
+            png_uint_32 i;
+
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = (png_byte)(255 - *(--sp));
+               *(--dp) = (png_byte)(255 - *(--sp));
+/*
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+*/
+               sp-=2;
+               dp=sp;
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+/* Add filler channel if we have RGB color */
+void /* PRIVATE */
+png_do_read_filler(png_row_infop row_info, png_bytep row,
+   png_uint_32 filler, png_uint_32 flags)
+{
+   png_uint_32 i;
+   png_uint_32 row_width = row_info->width;
+
+   png_byte hi_filler = (png_byte)((filler>>8) & 0xff);
+   png_byte lo_filler = (png_byte)(filler & 0xff);
+
+   png_debug(1, "in png_do_read_filler\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL  && row_info != NULL &&
+#endif
+       row_info->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      if(row_info->bit_depth == 8)
+      {
+         /* This changes the data from G to GX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width;
+            png_bytep dp =  sp + (png_size_t)row_width;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = lo_filler;
+            row_info->channels = 2;
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+      /* This changes the data from G to XG */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width;
+            png_bytep dp = sp  + (png_size_t)row_width;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 2;
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+      }
+      else if(row_info->bit_depth == 16)
+      {
+         /* This changes the data from GG to GGXX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = hi_filler;
+            *(--dp) = lo_filler;
+            row_info->channels = 2;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+         /* This changes the data from GG to XXGG */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 2;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      }
+   } /* COLOR_TYPE == GRAY */
+   else if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      if(row_info->bit_depth == 8)
+      {
+         /* This changes the data from RGB to RGBX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 3;
+            png_bytep dp = sp  + (png_size_t)row_width;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = lo_filler;
+            row_info->channels = 4;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      /* This changes the data from RGB to XRGB */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 3;
+            png_bytep dp = sp + (png_size_t)row_width;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 4;
+            row_info->pixel_depth = 32;
+            row_info->rowbytes = row_width * 4;
+         }
+      }
+      else if(row_info->bit_depth == 16)
+      {
+         /* This changes the data from RRGGBB to RRGGBBXX */
+         if (flags & PNG_FLAG_FILLER_AFTER)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 6;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 1; i < row_width; i++)
+            {
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+            }
+            *(--dp) = hi_filler;
+            *(--dp) = lo_filler;
+            row_info->channels = 4;
+            row_info->pixel_depth = 64;
+            row_info->rowbytes = row_width * 8;
+         }
+         /* This changes the data from RRGGBB to XXRRGGBB */
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 6;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = *(--sp);
+               *(--dp) = hi_filler;
+               *(--dp) = lo_filler;
+            }
+            row_info->channels = 4;
+            row_info->pixel_depth = 64;
+            row_info->rowbytes = row_width * 8;
+         }
+      }
+   } /* COLOR_TYPE == RGB */
+}
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+/* expand grayscale files to RGB, with or without alpha */
+void /* PRIVATE */
+png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
+{
+   png_uint_32 i;
+   png_uint_32 row_width = row_info->width;
+
+   png_debug(1, "in png_do_gray_to_rgb\n");
+   if (row_info->bit_depth >= 8 &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      !(row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + (png_size_t)row_width - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *sp;
+               *(dp--) = *sp;
+               *(dp--) = *(sp--);
+            }
+         }
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp = row + (png_size_t)row_width * 2 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 2;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *(sp--);
+               *(dp--) = *sp;
+               *(dp--) = *sp;
+               *(dp--) = *(sp--);
+            }
+         }
+         else
+         {
+            png_bytep sp = row + (png_size_t)row_width * 4 - 1;
+            png_bytep dp = sp  + (png_size_t)row_width * 4;
+            for (i = 0; i < row_width; i++)
+            {
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *sp;
+               *(dp--) = *(sp - 1);
+               *(dp--) = *(sp--);
+               *(dp--) = *(sp--);
+            }
+         }
+      }
+      row_info->channels += (png_byte)2;
+      row_info->color_type |= PNG_COLOR_MASK_COLOR;
+      row_info->pixel_depth = (png_byte)(row_info->channels *
+         row_info->bit_depth);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+   }
+}
+#endif
+
+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+/* reduce RGB files to grayscale, with or without alpha
+ * using the equation given in Poynton's ColorFAQ at
+ * <http://www.inforamp.net/~poynton/>
+ * Copyright (c) 1998-01-04 Charles Poynton poynton@inforamp.net
+ *
+ *     Y = 0.212671 * R + 0.715160 * G + 0.072169 * B
+ *
+ *  We approximate this with
+ *
+ *     Y = 0.21268 * R    + 0.7151 * G    + 0.07217 * B
+ *
+ *  which can be expressed with integers as
+ *
+ *     Y = (6969 * R + 23434 * G + 2365 * B)/32768
+ *
+ *  The calculation is to be done in a linear colorspace.
+ *
+ *  Other integer coefficents can be used via png_set_rgb_to_gray().
+ */
+int /* PRIVATE */
+png_do_rgb_to_gray(png_structp png_ptr, png_row_infop row_info, png_bytep row)
+
+{
+   png_uint_32 i;
+
+   png_uint_32 row_width = row_info->width;
+   int rgb_error = 0;
+
+   png_debug(1, "in png_do_rgb_to_gray\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
+      png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
+      png_uint_32 bc = png_ptr->rgb_to_gray_blue_coeff;
+
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (row_info->bit_depth == 8)
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
+                  if(red != green || red != blue)
+                  {
+                     rgb_error |= 1;
+                     *(dp++) = png_ptr->gamma_from_1[
+                       (rc*red+gc*green+bc*blue)>>15];
+                  }
+                  else
+                     *(dp++) = *(sp-1);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = *(sp++);
+                  png_byte green = *(sp++);
+                  png_byte blue  = *(sp++);
+                  if(red != green || red != blue)
+                  {
+                     rgb_error |= 1;
+                     *(dp++) = (png_byte)((rc*red+gc*green+bc*blue)>>15);
+                  }
+                  else
+                     *(dp++) = *(sp-1);
+               }
+            }
+         }
+
+         else /* RGB bit_depth == 16 */
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_16_to_1 != NULL &&
+                png_ptr->gamma_16_from_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, w;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if(red == green && red == blue)
+                     w = red;
+                  else
+                  {
+                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff) >>
+                                  png_ptr->gamma_shift][red>>8];
+                     png_uint_16 green_1 = png_ptr->gamma_16_to_1[(green&0xff) >>
+                                  png_ptr->gamma_shift][green>>8];
+                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff) >>
+                                  png_ptr->gamma_shift][blue>>8];
+                     png_uint_16 gray16  = (png_uint_16)((rc*red_1 + gc*green_1
+                                  + bc*blue_1)>>15);
+                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+                         png_ptr->gamma_shift][gray16 >> 8];
+                     rgb_error |= 1;
+                  }
+
+                  *(dp++) = (png_byte)((w>>8) & 0xff);
+                  *(dp++) = (png_byte)(w & 0xff);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, gray16;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if(red != green || red != blue)
+                     rgb_error |= 1;
+                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
+                  *(dp++) = (png_byte)(gray16 & 0xff);
+               }
+            }
+         }
+      }
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         if (row_info->bit_depth == 8)
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_from_1 != NULL && png_ptr->gamma_to_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte green = png_ptr->gamma_to_1[*(sp++)];
+                  png_byte blue  = png_ptr->gamma_to_1[*(sp++)];
+                  if(red != green || red != blue)
+                     rgb_error |= 1;
+                  *(dp++) =  png_ptr->gamma_from_1
+                             [(rc*red + gc*green + bc*blue)>>15];
+                  *(dp++) = *(sp++);  /* alpha */
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_byte red   = *(sp++);
+                  png_byte green = *(sp++);
+                  png_byte blue  = *(sp++);
+                  if(red != green || red != blue)
+                     rgb_error |= 1;
+                  *(dp++) =  (png_byte)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = *(sp++);  /* alpha */
+               }
+            }
+         }
+         else /* RGBA bit_depth == 16 */
+         {
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
+            if (png_ptr->gamma_16_to_1 != NULL &&
+                png_ptr->gamma_16_from_1 != NULL)
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, w;
+
+                  red   = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)(((*(sp))<<8) | *(sp+1)); sp+=2;
+
+                  if(red == green && red == blue)
+                     w = red;
+                  else
+                  {
+                     png_uint_16 red_1   = png_ptr->gamma_16_to_1[(red&0xff) >>
+                                  png_ptr->gamma_shift][red>>8];
+                     png_uint_16 green_1 = png_ptr->gamma_16_to_1[(green&0xff) >>
+                                  png_ptr->gamma_shift][green>>8];
+                     png_uint_16 blue_1  = png_ptr->gamma_16_to_1[(blue&0xff) >>
+                                  png_ptr->gamma_shift][blue>>8];
+                     png_uint_16 gray16  = (png_uint_16)((rc * red_1
+                                  + gc * green_1 + bc * blue_1)>>15);
+                     w = png_ptr->gamma_16_from_1[(gray16&0xff) >>
+                         png_ptr->gamma_shift][gray16 >> 8];
+                     rgb_error |= 1;
+                  }
+
+                  *(dp++) = (png_byte)((w>>8) & 0xff);
+                  *(dp++) = (png_byte)(w & 0xff);
+                  *(dp++) = *(sp++);  /* alpha */
+                  *(dp++) = *(sp++);
+               }
+            }
+            else
+#endif
+            {
+               png_bytep sp = row;
+               png_bytep dp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 red, green, blue, gray16;
+                  red   = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  green = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  blue  = (png_uint_16)((*(sp)<<8) | *(sp+1)); sp+=2;
+                  if(red != green || red != blue)
+                     rgb_error |= 1;
+                  gray16  = (png_uint_16)((rc*red + gc*green + bc*blue)>>15);
+                  *(dp++) = (png_byte)((gray16>>8) & 0xff);
+                  *(dp++) = (png_byte)(gray16 & 0xff);
+                  *(dp++) = *(sp++);  /* alpha */
+                  *(dp++) = *(sp++);
+               }
+            }
+         }
+      }
+   row_info->channels -= (png_byte)2;
+      row_info->color_type &= ~PNG_COLOR_MASK_COLOR;
+      row_info->pixel_depth = (png_byte)(row_info->channels *
+         row_info->bit_depth);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+   }
+   return rgb_error;
+}
+#endif
+
+/* Build a grayscale palette.  Palette is assumed to be 1 << bit_depth
+ * large of png_color.  This lets grayscale images be treated as
+ * paletted.  Most useful for gamma correction and simplification
+ * of code.
+ */
+void PNGAPI
+png_build_grayscale_palette(int bit_depth, png_colorp palette)
+{
+   int num_palette;
+   int color_inc;
+   int i;
+   int v;
+
+   png_debug(1, "in png_do_build_grayscale_palette\n");
+   if (palette == NULL)
+      return;
+
+   switch (bit_depth)
+   {
+      case 1:
+         num_palette = 2;
+         color_inc = 0xff;
+         break;
+      case 2:
+         num_palette = 4;
+         color_inc = 0x55;
+         break;
+      case 4:
+         num_palette = 16;
+         color_inc = 0x11;
+         break;
+      case 8:
+         num_palette = 256;
+         color_inc = 1;
+         break;
+      default:
+         num_palette = 0;
+         color_inc = 0;
+         break;
+   }
+
+   for (i = 0, v = 0; i < num_palette; i++, v += color_inc)
+   {
+      palette[i].red = (png_byte)v;
+      palette[i].green = (png_byte)v;
+      palette[i].blue = (png_byte)v;
+   }
+}
+
+/* This function is currently unused.  Do we really need it? */
+#if defined(PNG_READ_DITHER_SUPPORTED) && defined(PNG_CORRECT_PALETTE_SUPPORTED)
+void /* PRIVATE */
+png_correct_palette(png_structp png_ptr, png_colorp palette,
+   int num_palette)
+{
+   png_debug(1, "in png_correct_palette\n");
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
+    defined(PNG_READ_GAMMA_SUPPORTED) && defined(PNG_FLOATING_POINT_SUPPORTED)
+   if (png_ptr->transformations & (PNG_GAMMA | PNG_BACKGROUND))
+   {
+      png_color back, back_1;
+
+      if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_FILE)
+      {
+         back.red = png_ptr->gamma_table[png_ptr->background.red];
+         back.green = png_ptr->gamma_table[png_ptr->background.green];
+         back.blue = png_ptr->gamma_table[png_ptr->background.blue];
+
+         back_1.red = png_ptr->gamma_to_1[png_ptr->background.red];
+         back_1.green = png_ptr->gamma_to_1[png_ptr->background.green];
+         back_1.blue = png_ptr->gamma_to_1[png_ptr->background.blue];
+      }
+      else
+      {
+         double g;
+
+         g = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma);
+
+         if (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_SCREEN ||
+             fabs(g - 1.0) < PNG_GAMMA_THRESHOLD)
+         {
+            back.red = png_ptr->background.red;
+            back.green = png_ptr->background.green;
+            back.blue = png_ptr->background.blue;
+         }
+         else
+         {
+            back.red =
+               (png_byte)(pow((double)png_ptr->background.red/255, g) *
+                255.0 + 0.5);
+            back.green =
+               (png_byte)(pow((double)png_ptr->background.green/255, g) *
+                255.0 + 0.5);
+            back.blue =
+               (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+                255.0 + 0.5);
+         }
+
+         g = 1.0 / png_ptr->background_gamma;
+
+         back_1.red =
+            (png_byte)(pow((double)png_ptr->background.red/255, g) *
+             255.0 + 0.5);
+         back_1.green =
+            (png_byte)(pow((double)png_ptr->background.green/255, g) *
+             255.0 + 0.5);
+         back_1.blue =
+            (png_byte)(pow((double)png_ptr->background.blue/255, g) *
+             255.0 + 0.5);
+      }
+
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_uint_32 i;
+
+         for (i = 0; i < (png_uint_32)num_palette; i++)
+         {
+            if (i < png_ptr->num_trans && png_ptr->trans[i] == 0)
+            {
+               palette[i] = back;
+            }
+            else if (i < png_ptr->num_trans && png_ptr->trans[i] != 0xff)
+            {
+               png_byte v, w;
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].red];
+               png_composite(w, v, png_ptr->trans[i], back_1.red);
+               palette[i].red = png_ptr->gamma_from_1[w];
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].green];
+               png_composite(w, v, png_ptr->trans[i], back_1.green);
+               palette[i].green = png_ptr->gamma_from_1[w];
+
+               v = png_ptr->gamma_to_1[png_ptr->palette[i].blue];
+               png_composite(w, v, png_ptr->trans[i], back_1.blue);
+               palette[i].blue = png_ptr->gamma_from_1[w];
+            }
+            else
+            {
+               palette[i].red = png_ptr->gamma_table[palette[i].red];
+               palette[i].green = png_ptr->gamma_table[palette[i].green];
+               palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+            }
+         }
+      }
+      else
+      {
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            if (palette[i].red == (png_byte)png_ptr->trans_values.gray)
+            {
+               palette[i] = back;
+            }
+            else
+            {
+               palette[i].red = png_ptr->gamma_table[palette[i].red];
+               palette[i].green = png_ptr->gamma_table[palette[i].green];
+               palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+            }
+         }
+      }
+   }
+   else
+#endif
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   if (png_ptr->transformations & PNG_GAMMA)
+   {
+      int i;
+
+      for (i = 0; i < num_palette; i++)
+      {
+         palette[i].red = png_ptr->gamma_table[palette[i].red];
+         palette[i].green = png_ptr->gamma_table[palette[i].green];
+         palette[i].blue = png_ptr->gamma_table[palette[i].blue];
+      }
+   }
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   else
+#endif
+#endif
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+   if (png_ptr->transformations & PNG_BACKGROUND)
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         png_color back;
+
+         back.red   = (png_byte)png_ptr->background.red;
+         back.green = (png_byte)png_ptr->background.green;
+         back.blue  = (png_byte)png_ptr->background.blue;
+
+         for (i = 0; i < (int)png_ptr->num_trans; i++)
+         {
+            if (png_ptr->trans[i] == 0)
+            {
+               palette[i].red = back.red;
+               palette[i].green = back.green;
+               palette[i].blue = back.blue;
+            }
+            else if (png_ptr->trans[i] != 0xff)
+            {
+               png_composite(palette[i].red, png_ptr->palette[i].red,
+                  png_ptr->trans[i], back.red);
+               png_composite(palette[i].green, png_ptr->palette[i].green,
+                  png_ptr->trans[i], back.green);
+               png_composite(palette[i].blue, png_ptr->palette[i].blue,
+                  png_ptr->trans[i], back.blue);
+            }
+         }
+      }
+      else /* assume grayscale palette (what else could it be?) */
+      {
+         int i;
+
+         for (i = 0; i < num_palette; i++)
+         {
+            if (i == (png_byte)png_ptr->trans_values.gray)
+            {
+               palette[i].red = (png_byte)png_ptr->background.red;
+               palette[i].green = (png_byte)png_ptr->background.green;
+               palette[i].blue = (png_byte)png_ptr->background.blue;
+            }
+         }
+      }
+   }
+#endif
+}
+#endif
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+/* Replace any alpha or transparency with the supplied background color.
+ * "background" is already in the screen gamma, while "background_1" is
+ * at a gamma of 1.0.  Paletted files have already been taken care of.
+ */
+void /* PRIVATE */
+png_do_background(png_row_infop row_info, png_bytep row,
+   png_color_16p trans_values, png_color_16p background
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+   , png_color_16p background_1,
+   png_bytep gamma_table, png_bytep gamma_from_1, png_bytep gamma_to_1,
+   png_uint_16pp gamma_16, png_uint_16pp gamma_16_from_1,
+   png_uint_16pp gamma_16_to_1, int gamma_shift
+#endif
+   )
+{
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+   int shift;
+
+   png_debug(1, "in png_do_background\n");
+   if (background != NULL &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      (!(row_info->color_type & PNG_COLOR_MASK_ALPHA) ||
+      (row_info->color_type != PNG_COLOR_TYPE_PALETTE && trans_values)))
+   {
+      switch (row_info->color_type)
+      {
+         case PNG_COLOR_TYPE_GRAY:
+         {
+            switch (row_info->bit_depth)
+            {
+               case 1:
+               {
+                  sp = row;
+                  shift = 7;
+                  for (i = 0; i < row_width; i++)
+                  {
+                     if ((png_uint_16)((*sp >> shift) & 0x01)
+                        == trans_values->gray)
+                     {
+                        *sp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                        *sp |= (png_byte)(background->gray << shift);
+                     }
+                     if (!shift)
+                     {
+                        shift = 7;
+                        sp++;
+                     }
+                     else
+                        shift--;
+                  }
+                  break;
+               }
+               case 2:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     shift = 6;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x03)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        else
+                        {
+                           png_byte p = (png_byte)((*sp >> shift) & 0x03);
+                           png_byte g = (png_byte)((gamma_table [p | (p << 2) |
+                               (p << 4) | (p << 6)] >> 6) & 0x03);
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(g << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 6;
+                           sp++;
+                        }
+                        else
+                           shift -= 2;
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     shift = 6;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x03)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 6;
+                           sp++;
+                        }
+                        else
+                           shift -= 2;
+                     }
+                  }
+                  break;
+               }
+               case 4:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     shift = 4;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x0f)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        else
+                        {
+                           png_byte p = (png_byte)((*sp >> shift) & 0x0f);
+                           png_byte g = (png_byte)((gamma_table[p |
+                             (p << 4)] >> 4) & 0x0f);
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(g << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 4;
+                           sp++;
+                        }
+                        else
+                           shift -= 4;
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     shift = 4;
+                     for (i = 0; i < row_width; i++)
+                     {
+                        if ((png_uint_16)((*sp >> shift) & 0x0f)
+                            == trans_values->gray)
+                        {
+                           *sp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                           *sp |= (png_byte)(background->gray << shift);
+                        }
+                        if (!shift)
+                        {
+                           shift = 4;
+                           sp++;
+                        }
+                        else
+                           shift -= 4;
+                     }
+                  }
+                  break;
+               }
+               case 8:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_table != NULL)
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp++)
+                     {
+                        if (*sp == trans_values->gray)
+                        {
+                           *sp = (png_byte)background->gray;
+                        }
+                        else
+                        {
+                           *sp = gamma_table[*sp];
+                        }
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp++)
+                     {
+                        if (*sp == trans_values->gray)
+                        {
+                           *sp = (png_byte)background->gray;
+                        }
+                     }
+                  }
+                  break;
+               }
+               case 16:
+               {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                  if (gamma_16 != NULL)
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp += 2)
+                     {
+                        png_uint_16 v;
+
+                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        if (v == trans_values->gray)
+                        {
+                           /* background is already in screen gamma */
+                           *sp = (png_byte)((background->gray >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(background->gray & 0xff);
+                        }
+                        else
+                        {
+                           v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                           *sp = (png_byte)((v >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(v & 0xff);
+                        }
+                     }
+                  }
+                  else
+#endif
+                  {
+                     sp = row;
+                     for (i = 0; i < row_width; i++, sp += 2)
+                     {
+                        png_uint_16 v;
+
+                        v = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        if (v == trans_values->gray)
+                        {
+                           *sp = (png_byte)((background->gray >> 8) & 0xff);
+                           *(sp + 1) = (png_byte)(background->gray & 0xff);
+                        }
+                     }
+                  }
+                  break;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_RGB:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_table != NULL)
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 3)
+                  {
+                     if (*sp == trans_values->red &&
+                        *(sp + 1) == trans_values->green &&
+                        *(sp + 2) == trans_values->blue)
+                     {
+                        *sp = (png_byte)background->red;
+                        *(sp + 1) = (png_byte)background->green;
+                        *(sp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        *sp = gamma_table[*sp];
+                        *(sp + 1) = gamma_table[*(sp + 1)];
+                        *(sp + 2) = gamma_table[*(sp + 2)];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 3)
+                  {
+                     if (*sp == trans_values->red &&
+                        *(sp + 1) == trans_values->green &&
+                        *(sp + 2) == trans_values->blue)
+                     {
+                        *sp = (png_byte)background->red;
+                        *(sp + 1) = (png_byte)background->green;
+                        *(sp + 2) = (png_byte)background->blue;
+                     }
+                  }
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_16 != NULL)
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 6)
+                  {
+                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                     png_uint_16 g = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     png_uint_16 b = (png_uint_16)(((*(sp+4)) << 8) + *(sp+5));
+                     if (r == trans_values->red && g == trans_values->green &&
+                        b == trans_values->blue)
+                     {
+                        /* background is already in screen gamma */
+                        *sp = (png_byte)((background->red >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(background->red & 0xff);
+                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(background->green & 0xff);
+                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *sp = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        *(sp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        *(sp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(v & 0xff);
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  for (i = 0; i < row_width; i++, sp += 6)
+                  {
+                     png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp+1));
+                     png_uint_16 g = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     png_uint_16 b = (png_uint_16)(((*(sp+4)) << 8) + *(sp+5));
+
+                     if (r == trans_values->red && g == trans_values->green &&
+                        b == trans_values->blue)
+                     {
+                        *sp = (png_byte)((background->red >> 8) & 0xff);
+                        *(sp + 1) = (png_byte)(background->red & 0xff);
+                        *(sp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(sp + 3) = (png_byte)(background->green & 0xff);
+                        *(sp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(sp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                  }
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_GRAY_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                   gamma_table != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 2, dp++)
+                  {
+                     png_uint_16 a = *(sp + 1);
+
+                     if (a == 0xff)
+                     {
+                        *dp = gamma_table[*sp];
+                     }
+                     else if (a == 0)
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)background->gray;
+                     }
+                     else
+                     {
+                        png_byte v, w;
+
+                        v = gamma_to_1[*sp];
+                        png_composite(w, v, a, background_1->gray);
+                        *dp = gamma_from_1[w];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 2, dp++)
+                  {
+                     png_byte a = *(sp + 1);
+
+                     if (a == 0xff)
+                     {
+                        *dp = *sp;
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)background->gray;
+                     }
+                     else
+                     {
+                        png_composite(*dp, *sp, a, background_1->gray);
+                     }
+#else
+                     *dp = (png_byte)background->gray;
+#endif
+                  }
+               }
+            }
+            else /* if (png_ptr->bit_depth == 16) */
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                   gamma_16_to_1 != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+                  {
+                     png_uint_16 a = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_uint_16 v;
+
+                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else if (a == 0)
+#else
+                     else
+#endif
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)((background->gray >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->gray & 0xff);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else
+                     {
+                        png_uint_16 g, v, w;
+
+                        g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                        png_composite_16(v, g, a, background_1->gray);
+                        w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8];
+                        *dp = (png_byte)((w >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(w & 0xff);
+                     }
+#endif
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 2)
+                  {
+                     png_uint_16 a = (png_uint_16)(((*(sp+2)) << 8) + *(sp+3));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_memcpy(dp, sp, 2);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else if (a == 0)
+#else
+                     else
+#endif
+                     {
+                        *dp = (png_byte)((background->gray >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->gray & 0xff);
+                     }
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+                     else
+                     {
+                        png_uint_16 g, v;
+
+                        g = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        png_composite_16(v, g, a, background_1->gray);
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                     }
+#endif
+                  }
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_RGB_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_to_1 != NULL && gamma_from_1 != NULL &&
+                   gamma_table != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+                  {
+                     png_byte a = *(sp + 3);
+
+                     if (a == 0xff)
+                     {
+                        *dp = gamma_table[*sp];
+                        *(dp + 1) = gamma_table[*(sp + 1)];
+                        *(dp + 2) = gamma_table[*(sp + 2)];
+                     }
+                     else if (a == 0)
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)background->red;
+                        *(dp + 1) = (png_byte)background->green;
+                        *(dp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        png_byte v, w;
+
+                        v = gamma_to_1[*sp];
+                        png_composite(w, v, a, background_1->red);
+                        *dp = gamma_from_1[w];
+                        v = gamma_to_1[*(sp + 1)];
+                        png_composite(w, v, a, background_1->green);
+                        *(dp + 1) = gamma_from_1[w];
+                        v = gamma_to_1[*(sp + 2)];
+                        png_composite(w, v, a, background_1->blue);
+                        *(dp + 2) = gamma_from_1[w];
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 4, dp += 3)
+                  {
+                     png_byte a = *(sp + 3);
+
+                     if (a == 0xff)
+                     {
+                        *dp = *sp;
+                        *(dp + 1) = *(sp + 1);
+                        *(dp + 2) = *(sp + 2);
+                     }
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)background->red;
+                        *(dp + 1) = (png_byte)background->green;
+                        *(dp + 2) = (png_byte)background->blue;
+                     }
+                     else
+                     {
+                        png_composite(*dp, *sp, a, background->red);
+                        png_composite(*(dp + 1), *(sp + 1), a,
+                           background->green);
+                        png_composite(*(dp + 2), *(sp + 2), a,
+                           background->blue);
+                     }
+                  }
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+               if (gamma_16 != NULL && gamma_16_from_1 != NULL &&
+                   gamma_16_to_1 != NULL)
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+                  {
+                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                         << 8) + (png_uint_16)(*(sp + 7)));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_uint_16 v;
+
+                        v = gamma_16[*(sp + 1) >> gamma_shift][*sp];
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(v & 0xff);
+                        v = gamma_16[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(v & 0xff);
+                     }
+                     else if (a == 0)
+                     {
+                        /* background is already in screen gamma */
+                        *dp = (png_byte)((background->red >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->red & 0xff);
+                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(background->green & 0xff);
+                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v, w, x;
+
+                        v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp];
+                        png_composite_16(w, v, a, background_1->red);
+                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+                        *dp = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(x & 0xff);
+                        v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)];
+                        png_composite_16(w, v, a, background_1->green);
+                        x = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> 8];
+                        *(dp + 2) = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(x & 0xff);
+                        v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)];
+                        png_composite_16(w, v, a, background_1->blue);
+                        x = gamma_16_from_1[(w & 0xff) >> gamma_shift][w >> 8];
+                        *(dp + 4) = (png_byte)((x >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(x & 0xff);
+                     }
+                  }
+               }
+               else
+#endif
+               {
+                  sp = row;
+                  dp = row;
+                  for (i = 0; i < row_width; i++, sp += 8, dp += 6)
+                  {
+                     png_uint_16 a = (png_uint_16)(((png_uint_16)(*(sp + 6))
+                        << 8) + (png_uint_16)(*(sp + 7)));
+                     if (a == (png_uint_16)0xffff)
+                     {
+                        png_memcpy(dp, sp, 6);
+                     }
+                     else if (a == 0)
+                     {
+                        *dp = (png_byte)((background->red >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(background->red & 0xff);
+                        *(dp + 2) = (png_byte)((background->green >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(background->green & 0xff);
+                        *(dp + 4) = (png_byte)((background->blue >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(background->blue & 0xff);
+                     }
+                     else
+                     {
+                        png_uint_16 v;
+
+                        png_uint_16 r = (png_uint_16)(((*sp) << 8) + *(sp + 1));
+                        png_uint_16 g = (png_uint_16)(((*(sp + 2)) << 8)
+                            + *(sp + 3));
+                        png_uint_16 b = (png_uint_16)(((*(sp + 4)) << 8)
+                            + *(sp + 5));
+
+                        png_composite_16(v, r, a, background->red);
+                        *dp = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 1) = (png_byte)(v & 0xff);
+                        png_composite_16(v, g, a, background->green);
+                        *(dp + 2) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 3) = (png_byte)(v & 0xff);
+                        png_composite_16(v, b, a, background->blue);
+                        *(dp + 4) = (png_byte)((v >> 8) & 0xff);
+                        *(dp + 5) = (png_byte)(v & 0xff);
+                     }
+                  }
+               }
+            }
+            break;
+         }
+      }
+
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
+         row_info->channels--;
+         row_info->pixel_depth = (png_byte)(row_info->channels *
+            row_info->bit_depth);
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+/* Gamma correct the image, avoiding the alpha channel.  Make sure
+ * you do this after you deal with the transparency issue on grayscale
+ * or RGB images. If your bit depth is 8, use gamma_table, if it
+ * is 16, use gamma_16_table and gamma_shift.  Build these with
+ * build_gamma_table().
+ */
+void /* PRIVATE */
+png_do_gamma(png_row_infop row_info, png_bytep row,
+   png_bytep gamma_table, png_uint_16pp gamma_16_table,
+   int gamma_shift)
+{
+   png_bytep sp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_gamma\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       ((row_info->bit_depth <= 8 && gamma_table != NULL) ||
+        (row_info->bit_depth == 16 && gamma_16_table != NULL)))
+   {
+      switch (row_info->color_type)
+      {
+         case PNG_COLOR_TYPE_RGB:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v;
+
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_RGB_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  *sp = gamma_table[*sp];
+                  sp++;
+                  sp++;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+                  v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 4;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_GRAY_ALPHA:
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp += 2;
+               }
+            }
+            else /* if (row_info->bit_depth == 16) */
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 4;
+               }
+            }
+            break;
+         }
+         case PNG_COLOR_TYPE_GRAY:
+         {
+            if (row_info->bit_depth == 2)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i += 4)
+               {
+                  int a = *sp & 0xc0;
+                  int b = *sp & 0x30;
+                  int c = *sp & 0x0c;
+                  int d = *sp & 0x03;
+
+                  *sp = (png_byte)(
+                        ((((int)gamma_table[a|(a>>2)|(a>>4)|(a>>6)])   ) & 0xc0)|
+                        ((((int)gamma_table[(b<<2)|b|(b>>2)|(b>>4)])>>2) & 0x30)|
+                        ((((int)gamma_table[(c<<4)|(c<<2)|c|(c>>2)])>>4) & 0x0c)|
+                        ((((int)gamma_table[(d<<6)|(d<<4)|(d<<2)|d])>>6) ));
+                  sp++;
+               }
+            }
+            if (row_info->bit_depth == 4)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i += 2)
+               {
+                  int msb = *sp & 0xf0;
+                  int lsb = *sp & 0x0f;
+
+                  *sp = (png_byte)((((int)gamma_table[msb | (msb >> 4)]) & 0xf0)
+                          | (((int)gamma_table[(lsb << 4) | lsb]) >> 4));
+                  sp++;
+               }
+            }
+            else if (row_info->bit_depth == 8)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  *sp = gamma_table[*sp];
+                  sp++;
+               }
+            }
+            else if (row_info->bit_depth == 16)
+            {
+               sp = row;
+               for (i = 0; i < row_width; i++)
+               {
+                  png_uint_16 v = gamma_16_table[*(sp + 1) >> gamma_shift][*sp];
+                  *sp = (png_byte)((v >> 8) & 0xff);
+                  *(sp + 1) = (png_byte)(v & 0xff);
+                  sp += 2;
+               }
+            }
+            break;
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+/* Expands a palette row to an RGB or RGBA row depending
+ * upon whether you supply trans and num_trans.
+ */
+void /* PRIVATE */
+png_do_expand_palette(png_row_infop row_info, png_bytep row,
+   png_colorp palette, png_bytep trans, int num_trans)
+{
+   int shift, value;
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_expand_palette\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (row_info->bit_depth < 8)
+      {
+         switch (row_info->bit_depth)
+         {
+            case 1:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 3);
+               dp = row + (png_size_t)row_width - 1;
+               shift = 7 - (int)((row_width + 7) & 0x07);
+               for (i = 0; i < row_width; i++)
+               {
+                  if ((*sp >> shift) & 0x01)
+                     *dp = 1;
+                  else
+                     *dp = 0;
+                  if (shift == 7)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift++;
+
+                  dp--;
+               }
+               break;
+            }
+            case 2:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 2);
+               dp = row + (png_size_t)row_width - 1;
+               shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+               for (i = 0; i < row_width; i++)
+               {
+                  value = (*sp >> shift) & 0x03;
+                  *dp = (png_byte)value;
+                  if (shift == 6)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift += 2;
+
+                  dp--;
+               }
+               break;
+            }
+            case 4:
+            {
+               sp = row + (png_size_t)((row_width - 1) >> 1);
+               dp = row + (png_size_t)row_width - 1;
+               shift = (int)((row_width & 0x01) << 2);
+               for (i = 0; i < row_width; i++)
+               {
+                  value = (*sp >> shift) & 0x0f;
+                  *dp = (png_byte)value;
+                  if (shift == 4)
+                  {
+                     shift = 0;
+                     sp--;
+                  }
+                  else
+                     shift += 4;
+
+                  dp--;
+               }
+               break;
+            }
+         }
+         row_info->bit_depth = 8;
+         row_info->pixel_depth = 8;
+         row_info->rowbytes = row_width;
+      }
+      switch (row_info->bit_depth)
+      {
+         case 8:
+         {
+            if (trans != NULL)
+            {
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width << 2) - 1;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  if ((int)(*sp) >= num_trans)
+                     *dp-- = 0xff;
+                  else
+                     *dp-- = trans[*sp];
+                  *dp-- = palette[*sp].blue;
+                  *dp-- = palette[*sp].green;
+                  *dp-- = palette[*sp].red;
+                  sp--;
+               }
+               row_info->bit_depth = 8;
+               row_info->pixel_depth = 32;
+               row_info->rowbytes = row_width * 4;
+               row_info->color_type = 6;
+               row_info->channels = 4;
+            }
+            else
+            {
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width * 3) - 1;
+
+               for (i = 0; i < row_width; i++)
+               {
+                  *dp-- = palette[*sp].blue;
+                  *dp-- = palette[*sp].green;
+                  *dp-- = palette[*sp].red;
+                  sp--;
+               }
+               row_info->bit_depth = 8;
+               row_info->pixel_depth = 24;
+               row_info->rowbytes = row_width * 3;
+               row_info->color_type = 2;
+               row_info->channels = 3;
+            }
+            break;
+         }
+      }
+   }
+}
+
+/* If the bit depth < 8, it is expanded to 8.  Also, if the
+ * transparency value is supplied, an alpha channel is built.
+ */
+void /* PRIVATE */
+png_do_expand(png_row_infop row_info, png_bytep row,
+   png_color_16p trans_value)
+{
+   int shift, value;
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_expand\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         png_uint_16 gray = (png_uint_16)(trans_value ? trans_value->gray : 0);
+
+         if (row_info->bit_depth < 8)
+         {
+            switch (row_info->bit_depth)
+            {
+               case 1:
+               {
+                  gray = (png_uint_16)(gray*0xff);
+                  sp = row + (png_size_t)((row_width - 1) >> 3);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = 7 - (int)((row_width + 7) & 0x07);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     if ((*sp >> shift) & 0x01)
+                        *dp = 0xff;
+                     else
+                        *dp = 0;
+                     if (shift == 7)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift++;
+
+                     dp--;
+                  }
+                  break;
+               }
+               case 2:
+               {
+                  gray = (png_uint_16)(gray*0x55);
+                  sp = row + (png_size_t)((row_width - 1) >> 2);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = (int)((3 - ((row_width + 3) & 0x03)) << 1);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     value = (*sp >> shift) & 0x03;
+                     *dp = (png_byte)(value | (value << 2) | (value << 4) |
+                        (value << 6));
+                     if (shift == 6)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift += 2;
+
+                     dp--;
+                  }
+                  break;
+               }
+               case 4:
+               {
+                  gray = (png_uint_16)(gray*0x11);
+                  sp = row + (png_size_t)((row_width - 1) >> 1);
+                  dp = row + (png_size_t)row_width - 1;
+                  shift = (int)((1 - ((row_width + 1) & 0x01)) << 2);
+                  for (i = 0; i < row_width; i++)
+                  {
+                     value = (*sp >> shift) & 0x0f;
+                     *dp = (png_byte)(value | (value << 4));
+                     if (shift == 4)
+                     {
+                        shift = 0;
+                        sp--;
+                     }
+                     else
+                        shift = 4;
+
+                     dp--;
+                  }
+                  break;
+               }
+            }
+            row_info->bit_depth = 8;
+            row_info->pixel_depth = 8;
+            row_info->rowbytes = row_width;
+         }
+
+         if (trans_value != NULL)
+         {
+            if (row_info->bit_depth == 8)
+            {
+               sp = row + (png_size_t)row_width - 1;
+               dp = row + (png_size_t)(row_width << 1) - 1;
+               for (i = 0; i < row_width; i++)
+               {
+                  if (*sp == gray)
+                     *dp-- = 0;
+                  else
+                     *dp-- = 0xff;
+                  *dp-- = *sp--;
+               }
+            }
+            else if (row_info->bit_depth == 16)
+            {
+               sp = row + row_info->rowbytes - 1;
+               dp = row + (row_info->rowbytes << 1) - 1;
+               for (i = 0; i < row_width; i++)
+               {
+                  if (((png_uint_16)*(sp) |
+                     ((png_uint_16)*(sp - 1) << 8)) == gray)
+                  {
+                     *dp-- = 0;
+                     *dp-- = 0;
+                  }
+                  else
+                  {
+                     *dp-- = 0xff;
+                     *dp-- = 0xff;
+                  }
+                  *dp-- = *sp--;
+                  *dp-- = *sp--;
+               }
+            }
+            row_info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+            row_info->channels = 2;
+            row_info->pixel_depth = (png_byte)(row_info->bit_depth << 1);
+            row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+               row_width);
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_value)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            sp = row + (png_size_t)row_info->rowbytes - 1;
+            dp = row + (png_size_t)(row_width << 2) - 1;
+            for (i = 0; i < row_width; i++)
+            {
+               if (*(sp - 2) == trans_value->red &&
+                  *(sp - 1) == trans_value->green &&
+                  *(sp - 0) == trans_value->blue)
+                  *dp-- = 0;
+               else
+                  *dp-- = 0xff;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+            }
+         }
+         else if (row_info->bit_depth == 16)
+         {
+            sp = row + row_info->rowbytes - 1;
+            dp = row + (png_size_t)(row_width << 3) - 1;
+            for (i = 0; i < row_width; i++)
+            {
+               if ((((png_uint_16)*(sp - 4) |
+                  ((png_uint_16)*(sp - 5) << 8)) == trans_value->red) &&
+                  (((png_uint_16)*(sp - 2) |
+                  ((png_uint_16)*(sp - 3) << 8)) == trans_value->green) &&
+                  (((png_uint_16)*(sp - 0) |
+                  ((png_uint_16)*(sp - 1) << 8)) == trans_value->blue))
+               {
+                  *dp-- = 0;
+                  *dp-- = 0;
+               }
+               else
+               {
+                  *dp-- = 0xff;
+                  *dp-- = 0xff;
+               }
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+               *dp-- = *sp--;
+            }
+         }
+         row_info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+         row_info->channels = 4;
+         row_info->pixel_depth = (png_byte)(row_info->bit_depth << 2);
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_DITHER_SUPPORTED)
+void /* PRIVATE */
+png_do_dither(png_row_infop row_info, png_bytep row,
+    png_bytep palette_lookup, png_bytep dither_lookup)
+{
+   png_bytep sp, dp;
+   png_uint_32 i;
+   png_uint_32 row_width=row_info->width;
+
+   png_debug(1, "in png_do_dither\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
+         palette_lookup && row_info->bit_depth == 8)
+      {
+         int r, g, b, p;
+         sp = row;
+         dp = row;
+         for (i = 0; i < row_width; i++)
+         {
+            r = *sp++;
+            g = *sp++;
+            b = *sp++;
+
+            /* this looks real messy, but the compiler will reduce
+               it down to a reasonable formula.  For example, with
+               5 bits per color, we get:
+               p = (((r >> 3) & 0x1f) << 10) |
+                  (((g >> 3) & 0x1f) << 5) |
+                  ((b >> 3) & 0x1f);
+               */
+            p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+               ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+               (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+               ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+               (PNG_DITHER_BLUE_BITS)) |
+               ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+               ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+            *dp++ = palette_lookup[p];
+         }
+         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+         row_info->channels = 1;
+         row_info->pixel_depth = row_info->bit_depth;
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
+         palette_lookup != NULL && row_info->bit_depth == 8)
+      {
+         int r, g, b, p;
+         sp = row;
+         dp = row;
+         for (i = 0; i < row_width; i++)
+         {
+            r = *sp++;
+            g = *sp++;
+            b = *sp++;
+            sp++;
+
+            p = (((r >> (8 - PNG_DITHER_RED_BITS)) &
+               ((1 << PNG_DITHER_RED_BITS) - 1)) <<
+               (PNG_DITHER_GREEN_BITS + PNG_DITHER_BLUE_BITS)) |
+               (((g >> (8 - PNG_DITHER_GREEN_BITS)) &
+               ((1 << PNG_DITHER_GREEN_BITS) - 1)) <<
+               (PNG_DITHER_BLUE_BITS)) |
+               ((b >> (8 - PNG_DITHER_BLUE_BITS)) &
+               ((1 << PNG_DITHER_BLUE_BITS) - 1));
+
+            *dp++ = palette_lookup[p];
+         }
+         row_info->color_type = PNG_COLOR_TYPE_PALETTE;
+         row_info->channels = 1;
+         row_info->pixel_depth = row_info->bit_depth;
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,row_width);
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_PALETTE &&
+         dither_lookup && row_info->bit_depth == 8)
+      {
+         sp = row;
+         for (i = 0; i < row_width; i++, sp++)
+         {
+            *sp = dither_lookup[*sp];
+         }
+      }
+   }
+}
+#endif
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#if defined(PNG_READ_GAMMA_SUPPORTED)
+static int png_gamma_shift[] =
+   {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0};
+
+/* We build the 8- or 16-bit gamma tables here.  Note that for 16-bit
+ * tables, we don't make a full table if we are reducing to 8-bit in
+ * the future.  Note also how the gamma_16 tables are segmented so that
+ * we don't need to allocate > 64K chunks for a full 16-bit table.
+ */
+void /* PRIVATE */
+png_build_gamma_table(png_structp png_ptr)
+{
+  png_debug(1, "in png_build_gamma_table\n");
+  if(png_ptr->gamma != 0.0)
+  {
+   if (png_ptr->bit_depth <= 8)
+   {
+      int i;
+      double g;
+
+      if (png_ptr->screen_gamma > .000001)
+         g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+      else
+         g = 1.0;
+
+      png_ptr->gamma_table = (png_bytep)png_malloc(png_ptr,
+         (png_uint_32)256);
+
+      for (i = 0; i < 256; i++)
+      {
+         png_ptr->gamma_table[i] = (png_byte)(pow((double)i / 255.0,
+            g) * 255.0 + .5);
+      }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+    defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+      if (png_ptr->transformations & ((PNG_BACKGROUND) | PNG_RGB_TO_GRAY))
+      {
+
+         g = 1.0 / (png_ptr->gamma);
+
+         png_ptr->gamma_to_1 = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)256);
+
+         for (i = 0; i < 256; i++)
+         {
+            png_ptr->gamma_to_1[i] = (png_byte)(pow((double)i / 255.0,
+               g) * 255.0 + .5);
+         }
+
+
+         png_ptr->gamma_from_1 = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)256);
+
+         if(png_ptr->screen_gamma > 0.000001)
+            g = 1.0 / png_ptr->screen_gamma;
+         else
+            g = png_ptr->gamma;   /* probably doing rgb_to_gray */
+
+         for (i = 0; i < 256; i++)
+         {
+            png_ptr->gamma_from_1[i] = (png_byte)(pow((double)i / 255.0,
+               g) * 255.0 + .5);
+
+         }
+      }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+   }
+   else
+   {
+      double g;
+      int i, j, shift, num;
+      int sig_bit;
+      png_uint_32 ig;
+
+      if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      {
+         sig_bit = (int)png_ptr->sig_bit.red;
+         if ((int)png_ptr->sig_bit.green > sig_bit)
+            sig_bit = png_ptr->sig_bit.green;
+         if ((int)png_ptr->sig_bit.blue > sig_bit)
+            sig_bit = png_ptr->sig_bit.blue;
+      }
+      else
+      {
+         sig_bit = (int)png_ptr->sig_bit.gray;
+      }
+
+      if (sig_bit > 0)
+         shift = 16 - sig_bit;
+      else
+         shift = 0;
+
+      if (png_ptr->transformations & PNG_16_TO_8)
+      {
+         if (shift < (16 - PNG_MAX_GAMMA_8))
+            shift = (16 - PNG_MAX_GAMMA_8);
+      }
+
+      if (shift > 8)
+         shift = 8;
+      if (shift < 0)
+         shift = 0;
+
+      png_ptr->gamma_shift = (png_byte)shift;
+
+      num = (1 << (8 - shift));
+
+      if (png_ptr->screen_gamma > .000001)
+         g = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma);
+      else
+         g = 1.0;
+
+      png_ptr->gamma_16_table = (png_uint_16pp)png_malloc(png_ptr,
+         (png_uint_32)(num * png_sizeof (png_uint_16p)));
+
+      if (png_ptr->transformations & (PNG_16_TO_8 | PNG_BACKGROUND))
+      {
+         double fin, fout;
+         png_uint_32 last, max;
+
+         for (i = 0; i < num; i++)
+         {
+            png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+               (png_uint_32)(256 * png_sizeof (png_uint_16)));
+         }
+
+         g = 1.0 / g;
+         last = 0;
+         for (i = 0; i < 256; i++)
+         {
+            fout = ((double)i + 0.5) / 256.0;
+            fin = pow(fout, g);
+            max = (png_uint_32)(fin * (double)((png_uint_32)num << 8));
+            while (last <= max)
+            {
+               png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+                  [(int)(last >> (8 - shift))] = (png_uint_16)(
+                  (png_uint_16)i | ((png_uint_16)i << 8));
+               last++;
+            }
+         }
+         while (last < ((png_uint_32)num << 8))
+         {
+            png_ptr->gamma_16_table[(int)(last & (0xff >> shift))]
+               [(int)(last >> (8 - shift))] = (png_uint_16)65535L;
+            last++;
+         }
+      }
+      else
+      {
+         for (i = 0; i < num; i++)
+         {
+            png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
+               (png_uint_32)(256 * png_sizeof (png_uint_16)));
+
+            ig = (((png_uint_32)i * (png_uint_32)png_gamma_shift[shift]) >> 4);
+            for (j = 0; j < 256; j++)
+            {
+               png_ptr->gamma_16_table[i][j] =
+                  (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                     65535.0, g) * 65535.0 + .5);
+            }
+         }
+      }
+
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+    defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+      if (png_ptr->transformations & (PNG_BACKGROUND | PNG_RGB_TO_GRAY))
+      {
+
+         g = 1.0 / (png_ptr->gamma);
+
+         png_ptr->gamma_16_to_1 = (png_uint_16pp)png_malloc(png_ptr,
+            (png_uint_32)(num * png_sizeof (png_uint_16p )));
+
+         for (i = 0; i < num; i++)
+         {
+            png_ptr->gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr,
+               (png_uint_32)(256 * png_sizeof (png_uint_16)));
+
+            ig = (((png_uint_32)i *
+               (png_uint_32)png_gamma_shift[shift]) >> 4);
+            for (j = 0; j < 256; j++)
+            {
+               png_ptr->gamma_16_to_1[i][j] =
+                  (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                     65535.0, g) * 65535.0 + .5);
+            }
+         }
+
+         if(png_ptr->screen_gamma > 0.000001)
+            g = 1.0 / png_ptr->screen_gamma;
+         else
+            g = png_ptr->gamma;   /* probably doing rgb_to_gray */
+
+         png_ptr->gamma_16_from_1 = (png_uint_16pp)png_malloc(png_ptr,
+            (png_uint_32)(num * png_sizeof (png_uint_16p)));
+
+         for (i = 0; i < num; i++)
+         {
+            png_ptr->gamma_16_from_1[i] = (png_uint_16p)png_malloc(png_ptr,
+               (png_uint_32)(256 * png_sizeof (png_uint_16)));
+
+            ig = (((png_uint_32)i *
+               (png_uint_32)png_gamma_shift[shift]) >> 4);
+            for (j = 0; j < 256; j++)
+            {
+               png_ptr->gamma_16_from_1[i][j] =
+                  (png_uint_16)(pow((double)(ig + ((png_uint_32)j << 8)) /
+                     65535.0, g) * 65535.0 + .5);
+            }
+         }
+      }
+#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_RGB_TO_GRAY_SUPPORTED */
+   }
+ }
+}
+#endif
+/* To do: install integer version of png_build_gamma_table here */
+#endif
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+/* undoes intrapixel differencing  */
+void /* PRIVATE */
+png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_read_intrapixel\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp) = (png_byte)((256 + *rp + *(rp+1))&0xff);
+            *(rp+2) = (png_byte)((256 + *(rp+2) + *(rp+1))&0xff);
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp  ) << 8) | *(rp+1);
+            png_uint_32 s1   = (*(rp+2) << 8) | *(rp+3);
+            png_uint_32 s2   = (*(rp+4) << 8) | *(rp+5);
+            png_uint_32 red  = (png_uint_32)((s0+s1+65536L) & 0xffffL);
+            png_uint_32 blue = (png_uint_32)((s2+s1+65536L) & 0xffffL);
+            *(rp  ) = (png_byte)((red >> 8) & 0xff);
+            *(rp+1) = (png_byte)(red & 0xff);
+            *(rp+4) = (png_byte)((blue >> 8) & 0xff);
+            *(rp+5) = (png_byte)(blue & 0xff);
+         }
+      }
+   }
+}
+#endif /* PNG_MNG_FEATURES_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/png/pngrutil.c b/Source/3rd Party/wx/src/png/pngrutil.c
index 62e963220..b61664aa6 100644
--- a/Source/3rd Party/wx/src/png/pngrutil.c	
+++ b/Source/3rd Party/wx/src/png/pngrutil.c	
@@ -1,4160 +1,3124 @@
-
-/* pngrutil.c - utilities to read a PNG file
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file contains routines that are only called from within
- * libpng itself during the course of reading an image.
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_READ_SUPPORTED
-
-#define png_strtod(p,a,b) strtod(a,b)
-
-png_uint_32 PNGAPI
-png_get_uint_31(png_structp png_ptr, png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-
-   if (uval > PNG_UINT_31_MAX)
-      png_error(png_ptr, "PNG unsigned integer out of range");
-
-   return (uval);
-}
-
-#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)
-/* The following is a variation on the above for use with the fixed
- * point values used for gAMA and cHRM.  Instead of png_error it
- * issues a warning and returns (-1) - an invalid value because both
- * gAMA and cHRM use *unsigned* integers for fixed point values.
- */
-#define PNG_FIXED_ERROR (-1)
-
-static png_fixed_point /* PRIVATE */
-png_get_fixed_point(png_structp png_ptr, png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-
-   if (uval <= PNG_UINT_31_MAX)
-      return (png_fixed_point)uval; /* known to be in range */
-
-   /* The caller can turn off the warning by passing NULL. */
-   if (png_ptr != NULL)
-      png_warning(png_ptr, "PNG fixed point integer out of range");
-
-   return PNG_FIXED_ERROR;
-}
-#endif
-
-#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
-/* NOTE: the read macros will obscure these definitions, so that if
- * PNG_USE_READ_MACROS is set the library will not use them internally,
- * but the APIs will still be available externally.
- *
- * The parentheses around "PNGAPI function_name" in the following three
- * functions are necessary because they allow the macros to co-exist with
- * these (unused but exported) functions.
- */
-
-/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
-png_uint_32 (PNGAPI
-png_get_uint_32)(png_const_bytep buf)
-{
-   png_uint_32 uval =
-       ((png_uint_32)(*(buf    )) << 24) +
-       ((png_uint_32)(*(buf + 1)) << 16) +
-       ((png_uint_32)(*(buf + 2)) <<  8) +
-       ((png_uint_32)(*(buf + 3))      ) ;
-
-   return uval;
-}
-
-/* Grab a signed 32-bit integer from a buffer in big-endian format.  The
- * data is stored in the PNG file in two's complement format and there
- * is no guarantee that a 'png_int_32' is exactly 32 bits, therefore
- * the following code does a two's complement to native conversion.
- */
-png_int_32 (PNGAPI
-png_get_int_32)(png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-   if ((uval & 0x80000000) == 0) /* non-negative */
-      return uval;
-
-   uval = (uval ^ 0xffffffff) + 1;  /* 2's complement: -x = ~x+1 */
-   return -(png_int_32)uval;
-}
-
-/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
-png_uint_16 (PNGAPI
-png_get_uint_16)(png_const_bytep buf)
-{
-   /* ANSI-C requires an int value to accomodate at least 16 bits so this
-    * works and allows the compiler not to worry about possible narrowing
-    * on 32 bit systems.  (Pre-ANSI systems did not make integers smaller
-    * than 16 bits either.)
-    */
-   unsigned int val =
-       ((unsigned int)(*buf) << 8) +
-       ((unsigned int)(*(buf + 1)));
-
-   return (png_uint_16)val;
-}
-
-#endif /* PNG_READ_INT_FUNCTIONS_SUPPORTED */
-
-/* Read and check the PNG file signature */
-void /* PRIVATE */
-png_read_sig(png_structp png_ptr, png_infop info_ptr)
-{
-   png_size_t num_checked, num_to_check;
-
-   /* Exit if the user application does not expect a signature. */
-   if (png_ptr->sig_bytes >= 8)
-      return;
-
-   num_checked = png_ptr->sig_bytes;
-   num_to_check = 8 - num_checked;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_SIGNATURE;
-#endif
-
-   /* The signature must be serialized in a single I/O call. */
-   png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
-   png_ptr->sig_bytes = 8;
-
-   if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
-   {
-      if (num_checked < 4 &&
-          png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
-         png_error(png_ptr, "Not a PNG file");
-      else
-         png_error(png_ptr, "PNG file corrupted by ASCII conversion");
-   }
-   if (num_checked < 3)
-      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
-}
-
-/* Read the chunk header (length + type name).
- * Put the type name into png_ptr->chunk_name, and return the length.
- */
-png_uint_32 /* PRIVATE */
-png_read_chunk_header(png_structp png_ptr)
-{
-   png_byte buf[8];
-   png_uint_32 length;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_HDR;
-#endif
-
-   /* Read the length and the chunk name.
-    * This must be performed in a single I/O call.
-    */
-   png_read_data(png_ptr, buf, 8);
-   length = png_get_uint_31(png_ptr, buf);
-
-   /* Put the chunk name into png_ptr->chunk_name. */
-   png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
-
-   png_debug2(0, "Reading %lx chunk, length = %lu",
-       (unsigned long)png_ptr->chunk_name, (unsigned long)length);
-
-   /* Reset the crc and run it over the chunk name. */
-   png_reset_crc(png_ptr);
-   png_calculate_crc(png_ptr, buf + 4, 4);
-
-   /* Check to see if chunk name is valid. */
-   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;
-#endif
-
-   return length;
-}
-
-/* Read data, and (optionally) run it through the CRC. */
-void /* PRIVATE */
-png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_read_data(png_ptr, buf, length);
-   png_calculate_crc(png_ptr, buf, length);
-}
-
-/* Optionally skip data and then check the CRC.  Depending on whether we
- * are reading a ancillary or critical chunk, and how the program has set
- * things up, we may calculate the CRC on the data and print a message.
- * Returns '1' if there was a CRC error, '0' otherwise.
- */
-int /* PRIVATE */
-png_crc_finish(png_structp png_ptr, png_uint_32 skip)
-{
-   png_size_t i;
-   png_size_t istop = png_ptr->zbuf_size;
-
-   for (i = (png_size_t)skip; i > istop; i -= istop)
-   {
-      png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-   }
-
-   if (i)
-   {
-      png_crc_read(png_ptr, png_ptr->zbuf, i);
-   }
-
-   if (png_crc_error(png_ptr))
-   {
-      if (PNG_CHUNK_ANCILLIARY(png_ptr->chunk_name) ?
-          !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) :
-          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE))
-      {
-         png_chunk_warning(png_ptr, "CRC error");
-      }
-
-      else
-      {
-         png_chunk_benign_error(png_ptr, "CRC error");
-         return (0);
-      }
-
-      return (1);
-   }
-
-   return (0);
-}
-
-/* Compare the CRC stored in the PNG file with that calculated by libpng from
- * the data it has read thus far.
- */
-int /* PRIVATE */
-png_crc_error(png_structp png_ptr)
-{
-   png_byte crc_bytes[4];
-   png_uint_32 crc;
-   int need_crc = 1;
-
-   if (PNG_CHUNK_ANCILLIARY(png_ptr->chunk_name))
-   {
-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
-          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
-         need_crc = 0;
-   }
-
-   else /* critical */
-   {
-      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
-         need_crc = 0;
-   }
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_CRC;
-#endif
-
-   /* The chunk CRC must be serialized in a single I/O call. */
-   png_read_data(png_ptr, crc_bytes, 4);
-
-   if (need_crc)
-   {
-      crc = png_get_uint_32(crc_bytes);
-      return ((int)(crc != png_ptr->crc));
-   }
-
-   else
-      return (0);
-}
-
-#ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED
-static png_size_t
-png_inflate(png_structp png_ptr, png_bytep data, png_size_t size,
-    png_bytep output, png_size_t output_size)
-{
-   png_size_t count = 0;
-
-   /* zlib can't necessarily handle more than 65535 bytes at once (i.e. it can't
-    * even necessarily handle 65536 bytes) because the type uInt is "16 bits or
-    * more".  Consequently it is necessary to chunk the input to zlib.  This
-    * code uses ZLIB_IO_MAX, from pngpriv.h, as the maximum (the maximum value
-    * that can be stored in a uInt.)  It is possible to set ZLIB_IO_MAX to a
-    * lower value in pngpriv.h and this may sometimes have a performance
-    * advantage, because it forces access of the input data to be separated from
-    * at least some of the use by some period of time.
-    */
-   png_ptr->zstream.next_in = data;
-   /* avail_in is set below from 'size' */
-   png_ptr->zstream.avail_in = 0;
-
-   while (1)
-   {
-      int ret, avail;
-
-      /* The setting of 'avail_in' used to be outside the loop; by setting it
-       * inside it is possible to chunk the input to zlib and simply rely on
-       * zlib to advance the 'next_in' pointer.  This allows arbitrary amounts o
-       * data to be passed through zlib at the unavoidable cost of requiring a
-       * window save (memcpy of up to 32768 output bytes) every ZLIB_IO_MAX
-       * input bytes.
-       */
-      if (png_ptr->zstream.avail_in == 0 && size > 0)
-      {
-         if (size <= ZLIB_IO_MAX)
-         {
-            /* The value is less than ZLIB_IO_MAX so the cast is safe: */
-            png_ptr->zstream.avail_in = (uInt)size;
-            size = 0;
-         }
-
-         else
-         {
-            png_ptr->zstream.avail_in = ZLIB_IO_MAX;
-            size -= ZLIB_IO_MAX;
-         }
-      }
-
-      /* Reset the output buffer each time round - we empty it
-       * after every inflate call.
-       */
-      png_ptr->zstream.next_out = png_ptr->zbuf;
-      png_ptr->zstream.avail_out = png_ptr->zbuf_size;
-
-      ret = inflate(&png_ptr->zstream, Z_NO_FLUSH);
-      avail = png_ptr->zbuf_size - png_ptr->zstream.avail_out;
-
-      /* First copy/count any new output - but only if we didn't
-       * get an error code.
-       */
-      if ((ret == Z_OK || ret == Z_STREAM_END) && avail > 0)
-      {
-         png_size_t space = avail; /* > 0, see above */
-
-         if (output != 0 && output_size > count)
-         {
-            png_size_t copy = output_size - count;
-
-            if (space < copy)
-               copy = space;
-
-            png_memcpy(output + count, png_ptr->zbuf, copy);
-         }
-         count += space;
-      }
-
-      if (ret == Z_OK)
-         continue;
-
-      /* Termination conditions - always reset the zstream, it
-       * must be left in inflateInit state.
-       */
-      png_ptr->zstream.avail_in = 0;
-      inflateReset(&png_ptr->zstream);
-
-      if (ret == Z_STREAM_END)
-         return count; /* NOTE: may be zero. */
-
-      /* Now handle the error codes - the API always returns 0
-       * and the error message is dumped into the uncompressed
-       * buffer if available.
-       */
-#     ifdef PNG_WARNINGS_SUPPORTED
-      {
-         png_const_charp msg;
-
-         if (png_ptr->zstream.msg != 0)
-            msg = png_ptr->zstream.msg;
-
-         else switch (ret)
-         {
-            case Z_BUF_ERROR:
-               msg = "Buffer error in compressed datastream";
-               break;
-
-            case Z_DATA_ERROR:
-               msg = "Data error in compressed datastream";
-               break;
-
-            default:
-               msg = "Incomplete compressed datastream";
-               break;
-         }
-
-         png_chunk_warning(png_ptr, msg);
-      }
-#     endif
-
-      /* 0 means an error - notice that this code simply ignores
-       * zero length compressed chunks as a result.
-       */
-      return 0;
-   }
-}
-
-/*
- * Decompress trailing data in a chunk.  The assumption is that chunkdata
- * points at an allocated area holding the contents of a chunk with a
- * trailing compressed part.  What we get back is an allocated area
- * holding the original prefix part and an uncompressed version of the
- * trailing part (the malloc area passed in is freed).
- */
-void /* PRIVATE */
-png_decompress_chunk(png_structp png_ptr, int comp_type,
-    png_size_t chunklength,
-    png_size_t prefix_size, png_size_t *newlength)
-{
-   /* The caller should guarantee this */
-   if (prefix_size > chunklength)
-   {
-      /* The recovery is to delete the chunk. */
-      png_warning(png_ptr, "invalid chunklength");
-      prefix_size = 0; /* To delete everything */
-   }
-
-   else if (comp_type == PNG_COMPRESSION_TYPE_BASE)
-   {
-      png_size_t expanded_size = png_inflate(png_ptr,
-          (png_bytep)(png_ptr->chunkdata + prefix_size),
-          chunklength - prefix_size,
-          0,            /* output */
-          0);           /* output size */
-
-      /* Now check the limits on this chunk - if the limit fails the
-       * compressed data will be removed, the prefix will remain.
-       */
-#ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-      if (png_ptr->user_chunk_malloc_max &&
-          (prefix_size + expanded_size >= png_ptr->user_chunk_malloc_max - 1))
-#else
-#  ifdef PNG_USER_CHUNK_MALLOC_MAX
-      if ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&
-          prefix_size + expanded_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)
-#  endif
-#endif
-         png_warning(png_ptr, "Exceeded size limit while expanding chunk");
-
-      /* If the size is zero either there was an error and a message
-       * has already been output (warning) or the size really is zero
-       * and we have nothing to do - the code will exit through the
-       * error case below.
-       */
-#if defined(PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED) || \
-    defined(PNG_USER_CHUNK_MALLOC_MAX)
-      else if (expanded_size > 0)
-#else
-      if (expanded_size > 0)
-#endif
-      {
-         /* Success (maybe) - really uncompress the chunk. */
-         png_size_t new_size = 0;
-         png_charp text = (png_charp)png_malloc_warn(png_ptr,
-             prefix_size + expanded_size + 1);
-
-         if (text != NULL)
-         {
-            png_memcpy(text, png_ptr->chunkdata, prefix_size);
-            new_size = png_inflate(png_ptr,
-                (png_bytep)(png_ptr->chunkdata + prefix_size),
-                chunklength - prefix_size,
-                (png_bytep)(text + prefix_size), expanded_size);
-            text[prefix_size + expanded_size] = 0; /* just in case */
-
-            if (new_size == expanded_size)
-            {
-               png_free(png_ptr, png_ptr->chunkdata);
-               png_ptr->chunkdata = text;
-               *newlength = prefix_size + expanded_size;
-               return; /* The success return! */
-            }
-
-            png_warning(png_ptr, "png_inflate logic error");
-            png_free(png_ptr, text);
-         }
-
-         else
-            png_warning(png_ptr, "Not enough memory to decompress chunk");
-      }
-   }
-
-   else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */
-   {
-      PNG_WARNING_PARAMETERS(p)
-      png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d, comp_type);
-      png_formatted_warning(png_ptr, p, "Unknown compression type @1");
-
-      /* The recovery is to simply drop the data. */
-   }
-
-   /* Generic error return - leave the prefix, delete the compressed
-    * data, reallocate the chunkdata to remove the potentially large
-    * amount of compressed data.
-    */
-   {
-      png_charp text = (png_charp)png_malloc_warn(png_ptr, prefix_size + 1);
-
-      if (text != NULL)
-      {
-         if (prefix_size > 0)
-            png_memcpy(text, png_ptr->chunkdata, prefix_size);
-
-         png_free(png_ptr, png_ptr->chunkdata);
-         png_ptr->chunkdata = text;
-
-         /* This is an extra zero in the 'uncompressed' part. */
-         *(png_ptr->chunkdata + prefix_size) = 0x00;
-      }
-      /* Ignore a malloc error here - it is safe. */
-   }
-
-   *newlength = prefix_size;
-}
-#endif /* PNG_READ_COMPRESSED_TEXT_SUPPORTED */
-
-/* Read and check the IDHR chunk */
-void /* PRIVATE */
-png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[13];
-   png_uint_32 width, height;
-   int bit_depth, color_type, compression_type, filter_type;
-   int interlace_type;
-
-   png_debug(1, "in png_handle_IHDR");
-
-   if (png_ptr->mode & PNG_HAVE_IHDR)
-      png_error(png_ptr, "Out of place IHDR");
-
-   /* Check the length */
-   if (length != 13)
-      png_error(png_ptr, "Invalid IHDR chunk");
-
-   png_ptr->mode |= PNG_HAVE_IHDR;
-
-   png_crc_read(png_ptr, buf, 13);
-   png_crc_finish(png_ptr, 0);
-
-   width = png_get_uint_31(png_ptr, buf);
-   height = png_get_uint_31(png_ptr, buf + 4);
-   bit_depth = buf[8];
-   color_type = buf[9];
-   compression_type = buf[10];
-   filter_type = buf[11];
-   interlace_type = buf[12];
-
-   /* Set internal variables */
-   png_ptr->width = width;
-   png_ptr->height = height;
-   png_ptr->bit_depth = (png_byte)bit_depth;
-   png_ptr->interlaced = (png_byte)interlace_type;
-   png_ptr->color_type = (png_byte)color_type;
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   png_ptr->filter_type = (png_byte)filter_type;
-#endif
-   png_ptr->compression_type = (png_byte)compression_type;
-
-   /* Find number of channels */
-   switch (png_ptr->color_type)
-   {
-      default: /* invalid, png_set_IHDR calls png_error */
-      case PNG_COLOR_TYPE_GRAY:
-      case PNG_COLOR_TYPE_PALETTE:
-         png_ptr->channels = 1;
-         break;
-
-      case PNG_COLOR_TYPE_RGB:
-         png_ptr->channels = 3;
-         break;
-
-      case PNG_COLOR_TYPE_GRAY_ALPHA:
-         png_ptr->channels = 2;
-         break;
-
-      case PNG_COLOR_TYPE_RGB_ALPHA:
-         png_ptr->channels = 4;
-         break;
-   }
-
-   /* Set up other useful info */
-   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
-   png_ptr->channels);
-   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);
-   png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
-   png_debug1(3, "channels = %d", png_ptr->channels);
-   png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes);
-   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
-       color_type, interlace_type, compression_type, filter_type);
-}
-
-/* Read and check the palette */
-void /* PRIVATE */
-png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_color palette[PNG_MAX_PALETTE_LENGTH];
-   int num, i;
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   png_colorp pal_ptr;
-#endif
-
-   png_debug(1, "in png_handle_PLTE");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before PLTE");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid PLTE after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      png_error(png_ptr, "Duplicate PLTE chunk");
-
-   png_ptr->mode |= PNG_HAVE_PLTE;
-
-   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
-   {
-      png_warning(png_ptr,
-          "Ignoring PLTE chunk in grayscale PNG");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
-   {
-      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-      {
-         png_warning(png_ptr, "Invalid palette chunk");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      else
-      {
-         png_error(png_ptr, "Invalid palette chunk");
-      }
-   }
-
-   num = (int)length / 3;
-
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
-   {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      pal_ptr->red = buf[0];
-      pal_ptr->green = buf[1];
-      pal_ptr->blue = buf[2];
-   }
-#else
-   for (i = 0; i < num; i++)
-   {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      /* Don't depend upon png_color being any order */
-      palette[i].red = buf[0];
-      palette[i].green = buf[1];
-      palette[i].blue = buf[2];
-   }
-#endif
-
-   /* If we actually need the PLTE chunk (ie for a paletted image), we do
-    * whatever the normal CRC configuration tells us.  However, if we
-    * have an RGB image, the PLTE can be considered ancillary, so
-    * we will act as though it is.
-    */
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-#endif
-   {
-      png_crc_finish(png_ptr, 0);
-   }
-
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   else if (png_crc_error(png_ptr))  /* Only if we have a CRC error */
-   {
-      /* If we don't want to use the data from an ancillary chunk,
-       * we have two options: an error abort, or a warning and we
-       * ignore the data in this chunk (which should be OK, since
-       * it's considered ancillary for a RGB or RGBA image).
-       */
-      if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
-      {
-         if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
-         {
-            png_chunk_benign_error(png_ptr, "CRC error");
-         }
-
-         else
-         {
-            png_chunk_warning(png_ptr, "CRC error");
-            return;
-         }
-      }
-
-      /* Otherwise, we (optionally) emit a warning and use the chunk. */
-      else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
-      {
-         png_chunk_warning(png_ptr, "CRC error");
-      }
-   }
-#endif
-
-   png_set_PLTE(png_ptr, info_ptr, palette, num);
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-      {
-         if (png_ptr->num_trans > (png_uint_16)num)
-         {
-            png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
-            png_ptr->num_trans = (png_uint_16)num;
-         }
-
-         if (info_ptr->num_trans > (png_uint_16)num)
-         {
-            png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");
-            info_ptr->num_trans = (png_uint_16)num;
-         }
-      }
-   }
-#endif
-
-}
-
-void /* PRIVATE */
-png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_debug(1, "in png_handle_IEND");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
-   {
-      png_error(png_ptr, "No image in file");
-   }
-
-   png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
-
-   if (length != 0)
-   {
-      png_warning(png_ptr, "Incorrect IEND chunk length");
-   }
-
-   png_crc_finish(png_ptr, length);
-
-   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
-}
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-void /* PRIVATE */
-png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_fixed_point igamma;
-   png_byte buf[4];
-
-   png_debug(1, "in png_handle_gAMA");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before gAMA");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid gAMA after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place gAMA chunk");
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
-#ifdef PNG_READ_sRGB_SUPPORTED
-       && !(info_ptr->valid & PNG_INFO_sRGB)
-#endif
-       )
-   {
-      png_warning(png_ptr, "Duplicate gAMA chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 4)
-   {
-      png_warning(png_ptr, "Incorrect gAMA chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 4);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   igamma = png_get_fixed_point(NULL, buf);
-
-   /* Check for zero gamma or an error. */
-   if (igamma <= 0)
-   {
-      png_warning(png_ptr,
-          "Ignoring gAMA chunk with out of range gamma");
-
-      return;
-   }
-
-#  ifdef PNG_READ_sRGB_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-   {
-      if (PNG_OUT_OF_RANGE(igamma, 45500, 500))
-      {
-         PNG_WARNING_PARAMETERS(p)
-         png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed, igamma);
-         png_formatted_warning(png_ptr, p,
-             "Ignoring incorrect gAMA value @1 when sRGB is also present");
-         return;
-      }
-   }
-#  endif /* PNG_READ_sRGB_SUPPORTED */
-
-#  ifdef PNG_READ_GAMMA_SUPPORTED
-   /* Gamma correction on read is supported. */
-   png_ptr->gamma = igamma;
-#  endif
-   /* And set the 'info' structure members. */
-   png_set_gAMA_fixed(png_ptr, info_ptr, igamma);
-}
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-void /* PRIVATE */
-png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_size_t truelen;
-   png_byte buf[4];
-
-   png_debug(1, "in png_handle_sBIT");
-
-   buf[0] = buf[1] = buf[2] = buf[3] = 0;
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sBIT");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid sBIT after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-   {
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place sBIT chunk");
-   }
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
-   {
-      png_warning(png_ptr, "Duplicate sBIT chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      truelen = 3;
-
-   else
-      truelen = (png_size_t)png_ptr->channels;
-
-   if (length != truelen || length > 4)
-   {
-      png_warning(png_ptr, "Incorrect sBIT chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, truelen);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
-   {
-      png_ptr->sig_bit.red = buf[0];
-      png_ptr->sig_bit.green = buf[1];
-      png_ptr->sig_bit.blue = buf[2];
-      png_ptr->sig_bit.alpha = buf[3];
-   }
-
-   else
-   {
-      png_ptr->sig_bit.gray = buf[0];
-      png_ptr->sig_bit.red = buf[0];
-      png_ptr->sig_bit.green = buf[0];
-      png_ptr->sig_bit.blue = buf[0];
-      png_ptr->sig_bit.alpha = buf[1];
-   }
-
-   png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
-}
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-void /* PRIVATE */
-png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[32];
-   png_fixed_point x_white, y_white, x_red, y_red, x_green, y_green, x_blue,
-      y_blue;
-
-   png_debug(1, "in png_handle_cHRM");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before cHRM");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid cHRM after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place cHRM chunk");
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
-#  ifdef PNG_READ_sRGB_SUPPORTED
-       && !(info_ptr->valid & PNG_INFO_sRGB)
-#  endif
-      )
-   {
-      png_warning(png_ptr, "Duplicate cHRM chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 32)
-   {
-      png_warning(png_ptr, "Incorrect cHRM chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 32);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   x_white = png_get_fixed_point(NULL, buf);
-   y_white = png_get_fixed_point(NULL, buf + 4);
-   x_red   = png_get_fixed_point(NULL, buf + 8);
-   y_red   = png_get_fixed_point(NULL, buf + 12);
-   x_green = png_get_fixed_point(NULL, buf + 16);
-   y_green = png_get_fixed_point(NULL, buf + 20);
-   x_blue  = png_get_fixed_point(NULL, buf + 24);
-   y_blue  = png_get_fixed_point(NULL, buf + 28);
-
-   if (x_white == PNG_FIXED_ERROR ||
-       y_white == PNG_FIXED_ERROR ||
-       x_red   == PNG_FIXED_ERROR ||
-       y_red   == PNG_FIXED_ERROR ||
-       x_green == PNG_FIXED_ERROR ||
-       y_green == PNG_FIXED_ERROR ||
-       x_blue  == PNG_FIXED_ERROR ||
-       y_blue  == PNG_FIXED_ERROR)
-   {
-      png_warning(png_ptr, "Ignoring cHRM chunk with negative chromaticities");
-      return;
-   }
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-   if ((info_ptr != NULL) && (info_ptr->valid & PNG_INFO_sRGB))
-   {
-      if (PNG_OUT_OF_RANGE(x_white, 31270,  1000) ||
-          PNG_OUT_OF_RANGE(y_white, 32900,  1000) ||
-          PNG_OUT_OF_RANGE(x_red,   64000,  1000) ||
-          PNG_OUT_OF_RANGE(y_red,   33000,  1000) ||
-          PNG_OUT_OF_RANGE(x_green, 30000,  1000) ||
-          PNG_OUT_OF_RANGE(y_green, 60000,  1000) ||
-          PNG_OUT_OF_RANGE(x_blue,  15000,  1000) ||
-          PNG_OUT_OF_RANGE(y_blue,   6000,  1000))
-      {
-         PNG_WARNING_PARAMETERS(p)
-
-         png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed, x_white);
-         png_warning_parameter_signed(p, 2, PNG_NUMBER_FORMAT_fixed, y_white);
-         png_warning_parameter_signed(p, 3, PNG_NUMBER_FORMAT_fixed, x_red);
-         png_warning_parameter_signed(p, 4, PNG_NUMBER_FORMAT_fixed, y_red);
-         png_warning_parameter_signed(p, 5, PNG_NUMBER_FORMAT_fixed, x_green);
-         png_warning_parameter_signed(p, 6, PNG_NUMBER_FORMAT_fixed, y_green);
-         png_warning_parameter_signed(p, 7, PNG_NUMBER_FORMAT_fixed, x_blue);
-         png_warning_parameter_signed(p, 8, PNG_NUMBER_FORMAT_fixed, y_blue);
-
-         png_formatted_warning(png_ptr, p,
-             "Ignoring incorrect cHRM white(@1,@2) r(@3,@4)g(@5,@6)b(@7,@8) "
-             "when sRGB is also present");
-      }
-      return;
-   }
-#endif /* PNG_READ_sRGB_SUPPORTED */
-
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   /* Store the _white values as default coefficients for the rgb to gray
-    * operation if it is supported.  Check if the transform is already set to
-    * avoid destroying the transform values.
-    */
-   if (!png_ptr->rgb_to_gray_coefficients_set)
-   {
-      /* png_set_background has not been called and we haven't seen an sRGB
-       * chunk yet.  Find the XYZ of the three end points.
-       */
-      png_XYZ XYZ;
-      png_xy xy;
-
-      xy.redx = x_red;
-      xy.redy = y_red;
-      xy.greenx = x_green;
-      xy.greeny = y_green;
-      xy.bluex = x_blue;
-      xy.bluey = y_blue;
-      xy.whitex = x_white;
-      xy.whitey = y_white;
-
-      if (png_XYZ_from_xy_checked(png_ptr, &XYZ, xy))
-      {
-         /* The success case, because XYZ_from_xy normalises to a reference
-          * white Y of 1.0 we just need to scale the numbers.  This should
-          * always work just fine. It is an internal error if this overflows.
-          */
-         {
-            png_fixed_point r, g, b;
-            if (png_muldiv(&r, XYZ.redY, 32768, PNG_FP_1) &&
-               r >= 0 && r <= 32768 &&
-               png_muldiv(&g, XYZ.greenY, 32768, PNG_FP_1) &&
-               g >= 0 && g <= 32768 &&
-               png_muldiv(&b, XYZ.blueY, 32768, PNG_FP_1) &&
-               b >= 0 && b <= 32768 &&
-               r+g+b <= 32769)
-            {
-               /* We allow 0 coefficients here.  r+g+b may be 32769 if two or
-                * all of the coefficients were rounded up.  Handle this by
-                * reducing the *largest* coefficient by 1; this matches the
-                * approach used for the default coefficients in pngrtran.c
-                */
-               int add = 0;
-
-               if (r+g+b > 32768)
-                  add = -1;
-               else if (r+g+b < 32768)
-                  add = 1;
-
-               if (add != 0)
-               {
-                  if (g >= r && g >= b)
-                     g += add;
-                  else if (r >= g && r >= b)
-                     r += add;
-                  else
-                     b += add;
-               }
-
-               /* Check for an internal error. */
-               if (r+g+b != 32768)
-                  png_error(png_ptr,
-                     "internal error handling cHRM coefficients");
-
-               png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;
-               png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
-            }
-
-            /* This is a png_error at present even though it could be ignored -
-             * it should never happen, but it is important that if it does, the
-             * bug is fixed.
-             */
-            else
-               png_error(png_ptr, "internal error handling cHRM->XYZ");
-         }
-      }
-   }
-#endif
-
-   png_set_cHRM_fixed(png_ptr, info_ptr, x_white, y_white, x_red, y_red,
-      x_green, y_green, x_blue, y_blue);
-}
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-void /* PRIVATE */
-png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   int intent;
-   png_byte buf[1];
-
-   png_debug(1, "in png_handle_sRGB");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sRGB");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid sRGB after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place sRGB chunk");
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-   {
-      png_warning(png_ptr, "Duplicate sRGB chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 1)
-   {
-      png_warning(png_ptr, "Incorrect sRGB chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 1);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   intent = buf[0];
-
-   /* Check for bad intent */
-   if (intent >= PNG_sRGB_INTENT_LAST)
-   {
-      png_warning(png_ptr, "Unknown sRGB intent");
-      return;
-   }
-
-#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA))
-   {
-      if (PNG_OUT_OF_RANGE(info_ptr->gamma, 45500, 500))
-      {
-         PNG_WARNING_PARAMETERS(p)
-
-         png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_fixed,
-            info_ptr->gamma);
-
-         png_formatted_warning(png_ptr, p,
-             "Ignoring incorrect gAMA value @1 when sRGB is also present");
-      }
-   }
-#endif /* PNG_READ_gAMA_SUPPORTED */
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM))
-      if (PNG_OUT_OF_RANGE(info_ptr->x_white, 31270,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_white, 32900,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->x_red,   64000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_red,   33000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->x_green, 30000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_green, 60000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->x_blue,  15000,  1000) ||
-          PNG_OUT_OF_RANGE(info_ptr->y_blue,   6000,  1000))
-      {
-         png_warning(png_ptr,
-             "Ignoring incorrect cHRM value when sRGB is also present");
-      }
-#endif /* PNG_READ_cHRM_SUPPORTED */
-
-   /* This is recorded for use when handling the cHRM chunk above.  An sRGB
-    * chunk unconditionally overwrites the coefficients for grayscale conversion
-    * too.
-    */
-   png_ptr->is_sRGB = 1;
-
-#  ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-      /* Don't overwrite user supplied values: */
-      if (!png_ptr->rgb_to_gray_coefficients_set)
-      {
-         /* These numbers come from the sRGB specification (or, since one has to
-          * pay much money to get a copy, the wikipedia sRGB page) the
-          * chromaticity values quoted have been inverted to get the reverse
-          * transformation from RGB to XYZ and the 'Y' coefficients scaled by
-          * 32768 (then rounded).
-          *
-          * sRGB and ITU Rec-709 both truncate the values for the D65 white
-          * point to four digits and, even though it actually stores five
-          * digits, the PNG spec gives the truncated value.
-          *
-          * This means that when the chromaticities are converted back to XYZ
-          * end points we end up with (6968,23435,2366), which, as described in
-          * pngrtran.c, would overflow.  If the five digit precision and up is
-          * used we get, instead:
-          *
-          *    6968*R + 23435*G + 2365*B
-          *
-          * (Notice that this rounds the blue coefficient down, rather than the
-          * choice used in pngrtran.c which is to round the green one down.)
-          */
-         png_ptr->rgb_to_gray_red_coeff   =  6968; /* 0.212639005871510 */
-         png_ptr->rgb_to_gray_green_coeff = 23434; /* 0.715168678767756 */
-         /* png_ptr->rgb_to_gray_blue_coeff  =  2366; 0.072192315360734	*/
-
-         /* The following keeps the cHRM chunk from destroying the
-          * coefficients again in the event that it follows the sRGB chunk.
-          */
-         png_ptr->rgb_to_gray_coefficients_set = 1;
-      }
-#  endif
-
-   png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
-}
-#endif /* PNG_READ_sRGB_SUPPORTED */
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-void /* PRIVATE */
-png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-/* Note: this does not properly handle chunks that are > 64K under DOS */
-{
-   png_byte compression_type;
-   png_bytep pC;
-   png_charp profile;
-   png_uint_32 skip = 0;
-   png_uint_32 profile_size;
-   png_alloc_size_t profile_length;
-   png_size_t slength, prefix_length, data_length;
-
-   png_debug(1, "in png_handle_iCCP");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before iCCP");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid iCCP after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->mode & PNG_HAVE_PLTE)
-      /* Should be an error, but we can cope with it */
-      png_warning(png_ptr, "Out of place iCCP chunk");
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
-   {
-      png_warning(png_ptr, "Duplicate iCCP chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "iCCP chunk too large to fit in memory");
-      skip = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, skip))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00;
-
-   for (profile = png_ptr->chunkdata; *profile; profile++)
-      /* Empty loop to find end of name */ ;
-
-   ++profile;
-
-   /* There should be at least one zero (the compression type byte)
-    * following the separator, and we should be on it
-    */
-   if (profile >= png_ptr->chunkdata + slength - 1)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "Malformed iCCP chunk");
-      return;
-   }
-
-   /* Compression_type should always be zero */
-   compression_type = *profile++;
-
-   if (compression_type)
-   {
-      png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");
-      compression_type = 0x00;  /* Reset it to zero (libpng-1.0.6 through 1.0.8
-                                 wrote nonzero) */
-   }
-
-   prefix_length = profile - png_ptr->chunkdata;
-   png_decompress_chunk(png_ptr, compression_type,
-       slength, prefix_length, &data_length);
-
-   profile_length = data_length - prefix_length;
-
-   if (prefix_length > data_length || profile_length < 4)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "Profile size field missing from iCCP chunk");
-      return;
-   }
-
-   /* Check the profile_size recorded in the first 32 bits of the ICC profile */
-   pC = (png_bytep)(png_ptr->chunkdata + prefix_length);
-   profile_size = ((*(pC    )) << 24) |
-                  ((*(pC + 1)) << 16) |
-                  ((*(pC + 2)) <<  8) |
-                  ((*(pC + 3))      );
-
-   /* NOTE: the following guarantees that 'profile_length' fits into 32 bits,
-    * because profile_size is a 32 bit value.
-    */
-   if (profile_size < profile_length)
-      profile_length = profile_size;
-
-   /* And the following guarantees that profile_size == profile_length. */
-   if (profile_size > profile_length)
-   {
-      PNG_WARNING_PARAMETERS(p)
-
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-
-      png_warning_parameter_unsigned(p, 1, PNG_NUMBER_FORMAT_u, profile_size);
-      png_warning_parameter_unsigned(p, 2, PNG_NUMBER_FORMAT_u, profile_length);
-      png_formatted_warning(png_ptr, p,
-         "Ignoring iCCP chunk with declared size = @1 and actual length = @2");
-      return;
-   }
-
-   png_set_iCCP(png_ptr, info_ptr, png_ptr->chunkdata,
-       compression_type, (png_bytep)png_ptr->chunkdata + prefix_length,
-       profile_size);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-}
-#endif /* PNG_READ_iCCP_SUPPORTED */
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-void /* PRIVATE */
-png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-/* Note: this does not properly handle chunks that are > 64K under DOS */
-{
-   png_bytep entry_start;
-   png_sPLT_t new_palette;
-   png_sPLT_entryp pp;
-   png_uint_32 data_length;
-   int entry_size, i;
-   png_uint_32 skip = 0;
-   png_size_t slength;
-   png_uint_32 dl;
-   png_size_t max_dl;
-
-   png_debug(1, "in png_handle_sPLT");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for sPLT");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sPLT");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid sPLT after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "sPLT chunk too large to fit in memory");
-      skip = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
-
-   /* WARNING: this may break if size_t is less than 32 bits; it is assumed
-    * that the PNG_MAX_MALLOC_64K test is enabled in this case, but this is a
-    * potential breakage point if the types in pngconf.h aren't exactly right.
-    */
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, skip))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00;
-
-   for (entry_start = (png_bytep)png_ptr->chunkdata; *entry_start;
-       entry_start++)
-      /* Empty loop to find end of name */ ;
-
-   ++entry_start;
-
-   /* A sample depth should follow the separator, and we should be on it  */
-   if (entry_start > (png_bytep)png_ptr->chunkdata + slength - 2)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "malformed sPLT chunk");
-      return;
-   }
-
-   new_palette.depth = *entry_start++;
-   entry_size = (new_palette.depth == 8 ? 6 : 10);
-   /* This must fit in a png_uint_32 because it is derived from the original
-    * chunk data length (and use 'length', not 'slength' here for clarity -
-    * they are guaranteed to be the same, see the tests above.)
-    */
-   data_length = length - (png_uint_32)(entry_start -
-      (png_bytep)png_ptr->chunkdata);
-
-   /* Integrity-check the data length */
-   if (data_length % entry_size)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "sPLT chunk has bad length");
-      return;
-   }
-
-   dl = (png_int_32)(data_length / entry_size);
-   max_dl = PNG_SIZE_MAX / png_sizeof(png_sPLT_entry);
-
-   if (dl > max_dl)
-   {
-       png_warning(png_ptr, "sPLT chunk too long");
-       return;
-   }
-
-   new_palette.nentries = (png_int_32)(data_length / entry_size);
-
-   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
-       png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));
-
-   if (new_palette.entries == NULL)
-   {
-       png_warning(png_ptr, "sPLT chunk requires too much memory");
-       return;
-   }
-
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (i = 0; i < new_palette.nentries; i++)
-   {
-      pp = new_palette.entries + i;
-
-      if (new_palette.depth == 8)
-      {
-         pp->red = *entry_start++;
-         pp->green = *entry_start++;
-         pp->blue = *entry_start++;
-         pp->alpha = *entry_start++;
-      }
-
-      else
-      {
-         pp->red   = png_get_uint_16(entry_start); entry_start += 2;
-         pp->green = png_get_uint_16(entry_start); entry_start += 2;
-         pp->blue  = png_get_uint_16(entry_start); entry_start += 2;
-         pp->alpha = png_get_uint_16(entry_start); entry_start += 2;
-      }
-
-      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
-   }
-#else
-   pp = new_palette.entries;
-
-   for (i = 0; i < new_palette.nentries; i++)
-   {
-
-      if (new_palette.depth == 8)
-      {
-         pp[i].red   = *entry_start++;
-         pp[i].green = *entry_start++;
-         pp[i].blue  = *entry_start++;
-         pp[i].alpha = *entry_start++;
-      }
-
-      else
-      {
-         pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
-      }
-
-      pp[i].frequency = png_get_uint_16(entry_start); entry_start += 2;
-   }
-#endif
-
-   /* Discard all chunk data except the name and stash that */
-   new_palette.name = png_ptr->chunkdata;
-
-   png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-   png_free(png_ptr, new_palette.entries);
-}
-#endif /* PNG_READ_sPLT_SUPPORTED */
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-void /* PRIVATE */
-png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
-
-   png_debug(1, "in png_handle_tRNS");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before tRNS");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid tRNS after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
-   {
-      png_warning(png_ptr, "Duplicate tRNS chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      png_byte buf[2];
-
-      if (length != 2)
-      {
-         png_warning(png_ptr, "Incorrect tRNS chunk length");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      png_crc_read(png_ptr, buf, 2);
-      png_ptr->num_trans = 1;
-      png_ptr->trans_color.gray = png_get_uint_16(buf);
-   }
-
-   else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-   {
-      png_byte buf[6];
-
-      if (length != 6)
-      {
-         png_warning(png_ptr, "Incorrect tRNS chunk length");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      png_crc_read(png_ptr, buf, (png_size_t)length);
-      png_ptr->num_trans = 1;
-      png_ptr->trans_color.red = png_get_uint_16(buf);
-      png_ptr->trans_color.green = png_get_uint_16(buf + 2);
-      png_ptr->trans_color.blue = png_get_uint_16(buf + 4);
-   }
-
-   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (!(png_ptr->mode & PNG_HAVE_PLTE))
-      {
-         /* Should be an error, but we can cope with it. */
-         png_warning(png_ptr, "Missing PLTE before tRNS");
-      }
-
-      if (length > (png_uint_32)png_ptr->num_palette ||
-          length > PNG_MAX_PALETTE_LENGTH)
-      {
-         png_warning(png_ptr, "Incorrect tRNS chunk length");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (length == 0)
-      {
-         png_warning(png_ptr, "Zero length tRNS chunk");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      png_crc_read(png_ptr, readbuf, (png_size_t)length);
-      png_ptr->num_trans = (png_uint_16)length;
-   }
-
-   else
-   {
-      png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_ptr->num_trans = 0;
-      return;
-   }
-
-   png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
-       &(png_ptr->trans_color));
-}
-#endif
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-void /* PRIVATE */
-png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_size_t truelen;
-   png_byte buf[6];
-   png_color_16 background;
-
-   png_debug(1, "in png_handle_bKGD");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before bKGD");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid bKGD after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-       !(png_ptr->mode & PNG_HAVE_PLTE))
-   {
-      png_warning(png_ptr, "Missing PLTE before bKGD");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
-   {
-      png_warning(png_ptr, "Duplicate bKGD chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      truelen = 1;
-
-   else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
-      truelen = 6;
-
-   else
-      truelen = 2;
-
-   if (length != truelen)
-   {
-      png_warning(png_ptr, "Incorrect bKGD chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, truelen);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   /* We convert the index value into RGB components so that we can allow
-    * arbitrary RGB values for background when we have transparency, and
-    * so it is easy to determine the RGB values of the background color
-    * from the info_ptr struct.
-    */
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      background.index = buf[0];
-
-      if (info_ptr && info_ptr->num_palette)
-      {
-         if (buf[0] >= info_ptr->num_palette)
-         {
-            png_warning(png_ptr, "Incorrect bKGD chunk index value");
-            return;
-         }
-
-         background.red = (png_uint_16)png_ptr->palette[buf[0]].red;
-         background.green = (png_uint_16)png_ptr->palette[buf[0]].green;
-         background.blue = (png_uint_16)png_ptr->palette[buf[0]].blue;
-      }
-
-      else
-         background.red = background.green = background.blue = 0;
-
-      background.gray = 0;
-   }
-
-   else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
-   {
-      background.index = 0;
-      background.red =
-      background.green =
-      background.blue =
-      background.gray = png_get_uint_16(buf);
-   }
-
-   else
-   {
-      background.index = 0;
-      background.red = png_get_uint_16(buf);
-      background.green = png_get_uint_16(buf + 2);
-      background.blue = png_get_uint_16(buf + 4);
-      background.gray = 0;
-   }
-
-   png_set_bKGD(png_ptr, info_ptr, &background);
-}
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-void /* PRIVATE */
-png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   unsigned int num, i;
-   png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
-
-   png_debug(1, "in png_handle_hIST");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before hIST");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid hIST after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (!(png_ptr->mode & PNG_HAVE_PLTE))
-   {
-      png_warning(png_ptr, "Missing PLTE before hIST");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
-   {
-      png_warning(png_ptr, "Duplicate hIST chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   num = length / 2 ;
-
-   if (num != (unsigned int)png_ptr->num_palette || num >
-       (unsigned int)PNG_MAX_PALETTE_LENGTH)
-   {
-      png_warning(png_ptr, "Incorrect hIST chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   for (i = 0; i < num; i++)
-   {
-      png_byte buf[2];
-
-      png_crc_read(png_ptr, buf, 2);
-      readbuf[i] = png_get_uint_16(buf);
-   }
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   png_set_hIST(png_ptr, info_ptr, readbuf);
-}
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-void /* PRIVATE */
-png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[9];
-   png_uint_32 res_x, res_y;
-   int unit_type;
-
-   png_debug(1, "in png_handle_pHYs");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before pHYs");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid pHYs after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
-   {
-      png_warning(png_ptr, "Duplicate pHYs chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_warning(png_ptr, "Incorrect pHYs chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 9);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   res_x = png_get_uint_32(buf);
-   res_y = png_get_uint_32(buf + 4);
-   unit_type = buf[8];
-   png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
-}
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-void /* PRIVATE */
-png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[9];
-   png_int_32 offset_x, offset_y;
-   int unit_type;
-
-   png_debug(1, "in png_handle_oFFs");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before oFFs");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid oFFs after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
-   {
-      png_warning(png_ptr, "Duplicate oFFs chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_warning(png_ptr, "Incorrect oFFs chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 9);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   offset_x = png_get_int_32(buf);
-   offset_y = png_get_int_32(buf + 4);
-   unit_type = buf[8];
-   png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
-}
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-/* Read the pCAL chunk (described in the PNG Extensions document) */
-void /* PRIVATE */
-png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_int_32 X0, X1;
-   png_byte type, nparams;
-   png_charp buf, units, endptr;
-   png_charpp params;
-   png_size_t slength;
-   int i;
-
-   png_debug(1, "in png_handle_pCAL");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before pCAL");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid pCAL after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
-   {
-      png_warning(png_ptr, "Duplicate pCAL chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",
-       length + 1);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-      png_warning(png_ptr, "No memory for pCAL purpose");
-      return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
-
-   png_debug(3, "Finding end of pCAL purpose string");
-   for (buf = png_ptr->chunkdata; *buf; buf++)
-      /* Empty loop */ ;
-
-   endptr = png_ptr->chunkdata + slength;
-
-   /* We need to have at least 12 bytes after the purpose string
-    * in order to get the parameter information.
-    */
-   if (endptr <= buf + 12)
-   {
-      png_warning(png_ptr, "Invalid pCAL data");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_debug(3, "Reading pCAL X0, X1, type, nparams, and units");
-   X0 = png_get_int_32((png_bytep)buf+1);
-   X1 = png_get_int_32((png_bytep)buf+5);
-   type = buf[9];
-   nparams = buf[10];
-   units = buf + 11;
-
-   png_debug(3, "Checking pCAL equation type and number of parameters");
-   /* Check that we have the right number of parameters for known
-    * equation types.
-    */
-   if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
-       (type == PNG_EQUATION_BASE_E && nparams != 3) ||
-       (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
-       (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
-   {
-      png_warning(png_ptr, "Invalid pCAL parameters for equation type");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   else if (type >= PNG_EQUATION_LAST)
-   {
-      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
-   }
-
-   for (buf = units; *buf; buf++)
-      /* Empty loop to move past the units string. */ ;
-
-   png_debug(3, "Allocating pCAL parameters array");
-
-   params = (png_charpp)png_malloc_warn(png_ptr,
-       (png_size_t)(nparams * png_sizeof(png_charp)));
-
-   if (params == NULL)
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      png_warning(png_ptr, "No memory for pCAL params");
-      return;
-   }
-
-   /* Get pointers to the start of each parameter string. */
-   for (i = 0; i < (int)nparams; i++)
-   {
-      buf++; /* Skip the null string terminator from previous parameter. */
-
-      png_debug1(3, "Reading pCAL parameter %d", i);
-
-      for (params[i] = buf; buf <= endptr && *buf != 0x00; buf++)
-         /* Empty loop to move past each parameter string */ ;
-
-      /* Make sure we haven't run out of data yet */
-      if (buf > endptr)
-      {
-         png_warning(png_ptr, "Invalid pCAL data");
-         png_free(png_ptr, png_ptr->chunkdata);
-         png_ptr->chunkdata = NULL;
-         png_free(png_ptr, params);
-         return;
-      }
-   }
-
-   png_set_pCAL(png_ptr, info_ptr, png_ptr->chunkdata, X0, X1, type, nparams,
-      units, params);
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-   png_free(png_ptr, params);
-}
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-/* Read the sCAL chunk */
-void /* PRIVATE */
-png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_size_t slength, i;
-   int state;
-
-   png_debug(1, "in png_handle_sCAL");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before sCAL");
-
-   else if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      png_warning(png_ptr, "Invalid sCAL after IDAT");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
-   {
-      png_warning(png_ptr, "Duplicate sCAL chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   /* Need unit type, width, \0, height: minimum 4 bytes */
-   else if (length < 4)
-   {
-      png_warning(png_ptr, "sCAL chunk too short");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
-      length + 1);
-
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-      png_warning(png_ptr, "Out of memory while processing sCAL chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-   png_ptr->chunkdata[slength] = 0x00; /* Null terminate the last string */
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   /* Validate the unit. */
-   if (png_ptr->chunkdata[0] != 1 && png_ptr->chunkdata[0] != 2)
-   {
-      png_warning(png_ptr, "Invalid sCAL ignored: invalid unit");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   /* Validate the ASCII numbers, need two ASCII numbers separated by
-    * a '\0' and they need to fit exactly in the chunk data.
-    */
-   i = 1;
-   state = 0;
-
-   if (!png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
-       i >= slength || png_ptr->chunkdata[i++] != 0)
-      png_warning(png_ptr, "Invalid sCAL chunk ignored: bad width format");
-
-   else if (!PNG_FP_IS_POSITIVE(state))
-      png_warning(png_ptr, "Invalid sCAL chunk ignored: non-positive width");
-
-   else
-   {
-      png_size_t heighti = i;
-
-      state = 0;
-      if (!png_check_fp_number(png_ptr->chunkdata, slength, &state, &i) ||
-          i != slength)
-         png_warning(png_ptr, "Invalid sCAL chunk ignored: bad height format");
-
-      else if (!PNG_FP_IS_POSITIVE(state))
-         png_warning(png_ptr,
-            "Invalid sCAL chunk ignored: non-positive height");
-
-      else
-         /* This is the (only) success case. */
-         png_set_sCAL_s(png_ptr, info_ptr, png_ptr->chunkdata[0],
-            png_ptr->chunkdata+1, png_ptr->chunkdata+heighti);
-   }
-
-   /* Clean up - just free the temporarily allocated buffer. */
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-}
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-void /* PRIVATE */
-png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_byte buf[7];
-   png_time mod_time;
-
-   png_debug(1, "in png_handle_tIME");
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Out of place tIME chunk");
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
-   {
-      png_warning(png_ptr, "Duplicate tIME chunk");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-   if (length != 7)
-   {
-      png_warning(png_ptr, "Incorrect tIME chunk length");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   png_crc_read(png_ptr, buf, 7);
-
-   if (png_crc_finish(png_ptr, 0))
-      return;
-
-   mod_time.second = buf[6];
-   mod_time.minute = buf[5];
-   mod_time.hour = buf[4];
-   mod_time.day = buf[3];
-   mod_time.month = buf[2];
-   mod_time.year = png_get_uint_16(buf);
-
-   png_set_tIME(png_ptr, info_ptr, &mod_time);
-}
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-/* Note: this does not properly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
-png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_textp text_ptr;
-   png_charp key;
-   png_charp text;
-   png_uint_32 skip = 0;
-   png_size_t slength;
-   int ret;
-
-   png_debug(1, "in png_handle_tEXt");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for tEXt");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before tEXt");
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
-      skip = length - (png_uint_32)65535L;
-      length = (png_uint_32)65535L;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-     png_warning(png_ptr, "No memory to process text chunk");
-     return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, skip))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   key = png_ptr->chunkdata;
-
-   key[slength] = 0x00;
-
-   for (text = key; *text; text++)
-      /* Empty loop to find end of key */ ;
-
-   if (text != key + slength)
-      text++;
-
-   text_ptr = (png_textp)png_malloc_warn(png_ptr,
-       png_sizeof(png_text));
-
-   if (text_ptr == NULL)
-   {
-      png_warning(png_ptr, "Not enough memory to process text chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
-   text_ptr->key = key;
-   text_ptr->lang = NULL;
-   text_ptr->lang_key = NULL;
-   text_ptr->itxt_length = 0;
-   text_ptr->text = text;
-   text_ptr->text_length = png_strlen(text);
-
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-   png_free(png_ptr, text_ptr);
-
-   if (ret)
-      png_warning(png_ptr, "Insufficient memory to process text chunk");
-}
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-/* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
-png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_textp text_ptr;
-   png_charp text;
-   int comp_type;
-   int ret;
-   png_size_t slength, prefix_len, data_len;
-
-   png_debug(1, "in png_handle_zTXt");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for zTXt");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before zTXt");
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-#ifdef PNG_MAX_MALLOC_64K
-   /* We will no doubt have problems with chunks even half this size, but
-    * there is no hard and fast rule to tell us where to stop.
-    */
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "zTXt chunk too large to fit in memory");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-      png_warning(png_ptr, "Out of memory processing zTXt chunk");
-      return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00;
-
-   for (text = png_ptr->chunkdata; *text; text++)
-      /* Empty loop */ ;
-
-   /* zTXt must have some text after the chunkdataword */
-   if (text >= png_ptr->chunkdata + slength - 2)
-   {
-      png_warning(png_ptr, "Truncated zTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   else
-   {
-       comp_type = *(++text);
-
-       if (comp_type != PNG_TEXT_COMPRESSION_zTXt)
-       {
-          png_warning(png_ptr, "Unknown compression type in zTXt chunk");
-          comp_type = PNG_TEXT_COMPRESSION_zTXt;
-       }
-
-       text++;        /* Skip the compression_method byte */
-   }
-
-   prefix_len = text - png_ptr->chunkdata;
-
-   png_decompress_chunk(png_ptr, comp_type,
-       (png_size_t)length, prefix_len, &data_len);
-
-   text_ptr = (png_textp)png_malloc_warn(png_ptr,
-       png_sizeof(png_text));
-
-   if (text_ptr == NULL)
-   {
-      png_warning(png_ptr, "Not enough memory to process zTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   text_ptr->compression = comp_type;
-   text_ptr->key = png_ptr->chunkdata;
-   text_ptr->lang = NULL;
-   text_ptr->lang_key = NULL;
-   text_ptr->itxt_length = 0;
-   text_ptr->text = png_ptr->chunkdata + prefix_len;
-   text_ptr->text_length = data_len;
-
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-   png_free(png_ptr, text_ptr);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-
-   if (ret)
-      png_error(png_ptr, "Insufficient memory to store zTXt chunk");
-}
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-/* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
-png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_textp text_ptr;
-   png_charp key, lang, text, lang_key;
-   int comp_flag;
-   int comp_type = 0;
-   int ret;
-   png_size_t slength, prefix_len, data_len;
-
-   png_debug(1, "in png_handle_iTXt");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for iTXt");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (!(png_ptr->mode & PNG_HAVE_IHDR))
-      png_error(png_ptr, "Missing IHDR before iTXt");
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-      png_ptr->mode |= PNG_AFTER_IDAT;
-
-#ifdef PNG_MAX_MALLOC_64K
-   /* We will no doubt have problems with chunks even half this size, but
-    * there is no hard and fast rule to tell us where to stop.
-    */
-   if (length > (png_uint_32)65535L)
-   {
-      png_warning(png_ptr, "iTXt chunk too large to fit in memory");
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
-
-   if (png_ptr->chunkdata == NULL)
-   {
-      png_warning(png_ptr, "No memory to process iTXt chunk");
-      return;
-   }
-
-   slength = (png_size_t)length;
-   png_crc_read(png_ptr, (png_bytep)png_ptr->chunkdata, slength);
-
-   if (png_crc_finish(png_ptr, 0))
-   {
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   png_ptr->chunkdata[slength] = 0x00;
-
-   for (lang = png_ptr->chunkdata; *lang; lang++)
-      /* Empty loop */ ;
-
-   lang++;        /* Skip NUL separator */
-
-   /* iTXt must have a language tag (possibly empty), two compression bytes,
-    * translated keyword (possibly empty), and possibly some text after the
-    * keyword
-    */
-
-   if (lang >= png_ptr->chunkdata + slength - 3)
-   {
-      png_warning(png_ptr, "Truncated iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   else
-   {
-      comp_flag = *lang++;
-      comp_type = *lang++;
-   }
-
-   if (comp_type || (comp_flag && comp_flag != PNG_TEXT_COMPRESSION_zTXt))
-   {
-      png_warning(png_ptr, "Unknown iTXt compression type or method");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   for (lang_key = lang; *lang_key; lang_key++)
-      /* Empty loop */ ;
-
-   lang_key++;        /* Skip NUL separator */
-
-   if (lang_key >= png_ptr->chunkdata + slength)
-   {
-      png_warning(png_ptr, "Truncated iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   for (text = lang_key; *text; text++)
-      /* Empty loop */ ;
-
-   text++;        /* Skip NUL separator */
-
-   if (text >= png_ptr->chunkdata + slength)
-   {
-      png_warning(png_ptr, "Malformed iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   prefix_len = text - png_ptr->chunkdata;
-
-   key=png_ptr->chunkdata;
-
-   if (comp_flag)
-      png_decompress_chunk(png_ptr, comp_type,
-          (size_t)length, prefix_len, &data_len);
-
-   else
-      data_len = png_strlen(png_ptr->chunkdata + prefix_len);
-
-   text_ptr = (png_textp)png_malloc_warn(png_ptr,
-       png_sizeof(png_text));
-
-   if (text_ptr == NULL)
-   {
-      png_warning(png_ptr, "Not enough memory to process iTXt chunk");
-      png_free(png_ptr, png_ptr->chunkdata);
-      png_ptr->chunkdata = NULL;
-      return;
-   }
-
-   text_ptr->compression = (int)comp_flag + 1;
-   text_ptr->lang_key = png_ptr->chunkdata + (lang_key - key);
-   text_ptr->lang = png_ptr->chunkdata + (lang - key);
-   text_ptr->itxt_length = data_len;
-   text_ptr->text_length = 0;
-   text_ptr->key = png_ptr->chunkdata;
-   text_ptr->text = png_ptr->chunkdata + prefix_len;
-
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
-
-   png_free(png_ptr, text_ptr);
-   png_free(png_ptr, png_ptr->chunkdata);
-   png_ptr->chunkdata = NULL;
-
-   if (ret)
-      png_error(png_ptr, "Insufficient memory to store iTXt chunk");
-}
-#endif
-
-/* This function is called when we haven't found a handler for a
- * chunk.  If there isn't a problem with the chunk itself (ie bad
- * chunk name, CRC, or a critical chunk), the chunk is silently ignored
- * -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which
- * case it will be saved away to be written out later.
- */
-void /* PRIVATE */
-png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-{
-   png_uint_32 skip = 0;
-
-   png_debug(1, "in png_handle_unknown");
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_cache_max != 0)
-   {
-      if (png_ptr->user_chunk_cache_max == 1)
-      {
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-
-      if (--png_ptr->user_chunk_cache_max == 1)
-      {
-         png_warning(png_ptr, "No space in chunk cache for unknown chunk");
-         png_crc_finish(png_ptr, length);
-         return;
-      }
-   }
-#endif
-
-   if (png_ptr->mode & PNG_HAVE_IDAT)
-   {
-      if (png_ptr->chunk_name != png_IDAT)
-         png_ptr->mode |= PNG_AFTER_IDAT;
-   }
-
-   if (PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
-   {
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-      if (png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name) !=
-          PNG_HANDLE_CHUNK_ALWAYS
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-          && png_ptr->read_user_chunk_fn == NULL
-#endif
-          )
-#endif
-         png_chunk_error(png_ptr, "unknown critical chunk");
-   }
-
-#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-   if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-       || (png_ptr->read_user_chunk_fn != NULL)
-#endif
-       )
-   {
-#ifdef PNG_MAX_MALLOC_64K
-      if (length > 65535)
-      {
-         png_warning(png_ptr, "unknown chunk too large to fit in memory");
-         skip = length - 65535;
-         length = 65535;
-      }
-#endif
-
-      /* TODO: this code is very close to the unknown handling in pngpread.c,
-       * maybe it can be put into a common utility routine?
-       * png_struct::unknown_chunk is just used as a temporary variable, along
-       * with the data into which the chunk is read.  These can be eliminated.
-       */
-      PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
-      png_ptr->unknown_chunk.size = (png_size_t)length;
-
-      if (length == 0)
-         png_ptr->unknown_chunk.data = NULL;
-
-      else
-      {
-         png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
-         png_crc_read(png_ptr, png_ptr->unknown_chunk.data, length);
-      }
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-      if (png_ptr->read_user_chunk_fn != NULL)
-      {
-         /* Callback to user unknown chunk handler */
-         int ret;
-
-         ret = (*(png_ptr->read_user_chunk_fn))
-             (png_ptr, &png_ptr->unknown_chunk);
-
-         if (ret < 0)
-            png_chunk_error(png_ptr, "error in user chunk");
-
-         if (ret == 0)
-         {
-            if (PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
-            {
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-               if (png_chunk_unknown_handling(png_ptr, png_ptr->chunk_name) !=
-                   PNG_HANDLE_CHUNK_ALWAYS)
-#endif
-                  png_chunk_error(png_ptr, "unknown critical chunk");
-            }
-
-            png_set_unknown_chunks(png_ptr, info_ptr,
-                &png_ptr->unknown_chunk, 1);
-         }
-      }
-
-      else
-#endif
-         png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
-
-      png_free(png_ptr, png_ptr->unknown_chunk.data);
-      png_ptr->unknown_chunk.data = NULL;
-   }
-
-   else
-#endif
-      skip = length;
-
-   png_crc_finish(png_ptr, skip);
-
-#ifndef PNG_READ_USER_CHUNKS_SUPPORTED
-   PNG_UNUSED(info_ptr) /* Quiet compiler warnings about unused info_ptr */
-#endif
-}
-
-/* This function is called to verify that a chunk name is valid.
- * This function can't have the "critical chunk check" incorporated
- * into it, since in the future we will need to be able to call user
- * functions to handle unknown critical chunks after we check that
- * the chunk name itself is valid.
- */
-
-/* Bit hacking: the test for an invalid byte in the 4 byte chunk name is:
- *
- * ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
- */
-
-void /* PRIVATE */
-png_check_chunk_name(png_structp png_ptr, png_uint_32 chunk_name)
-{
-   int i;
-
-   png_debug(1, "in png_check_chunk_name");
-
-   for (i=1; i<=4; ++i)
-   {
-      int c = chunk_name & 0xff;
-
-      if (c < 65 || c > 122 || (c > 90 && c < 97))
-         png_chunk_error(png_ptr, "invalid chunk type");
-
-      chunk_name >>= 8;
-   }
-}
-
-/* Combines the row recently read in with the existing pixels in the row.  This
- * routine takes care of alpha and transparency if requested.  This routine also
- * handles the two methods of progressive display of interlaced images,
- * depending on the 'display' value; if 'display' is true then the whole row
- * (dp) is filled from the start by replicating the available pixels.  If
- * 'display' is false only those pixels present in the pass are filled in.
- */
-void /* PRIVATE */
-png_combine_row(png_structp png_ptr, png_bytep dp, int display)
-{
-   unsigned int pixel_depth = png_ptr->transformed_pixel_depth;
-   png_const_bytep sp = png_ptr->row_buf + 1;
-   png_uint_32 row_width = png_ptr->width;
-   unsigned int pass = png_ptr->pass;
-   png_bytep end_ptr = 0;
-   png_byte end_byte = 0;
-   unsigned int end_mask;
-
-   png_debug(1, "in png_combine_row");
-
-   /* Added in 1.5.6: it should not be possible to enter this routine until at
-    * least one row has been read from the PNG data and transformed.
-    */
-   if (pixel_depth == 0)
-      png_error(png_ptr, "internal row logic error");
-
-   /* Added in 1.5.4: the pixel depth should match the information returned by
-    * any call to png_read_update_info at this point.  Do not continue if we got
-    * this wrong.
-    */
-   if (png_ptr->info_rowbytes != 0 && png_ptr->info_rowbytes !=
-          PNG_ROWBYTES(pixel_depth, row_width))
-      png_error(png_ptr, "internal row size calculation error");
-
-   /* Don't expect this to ever happen: */
-   if (row_width == 0)
-      png_error(png_ptr, "internal row width error");
-
-   /* Preserve the last byte in cases where only part of it will be overwritten,
-    * the multiply below may overflow, we don't care because ANSI-C guarantees
-    * we get the low bits.
-    */
-   end_mask = (pixel_depth * row_width) & 7;
-   if (end_mask != 0)
-   {
-      /* end_ptr == NULL is a flag to say do nothing */
-      end_ptr = dp + PNG_ROWBYTES(pixel_depth, row_width) - 1;
-      end_byte = *end_ptr;
-#     ifdef PNG_READ_PACKSWAP_SUPPORTED
-         if (png_ptr->transformations & PNG_PACKSWAP) /* little-endian byte */
-            end_mask = 0xff << end_mask;
-
-         else /* big-endian byte */
-#     endif
-         end_mask = 0xff >> end_mask;
-      /* end_mask is now the bits to *keep* from the destination row */
-   }
-
-   /* For non-interlaced images this reduces to a png_memcpy(). A png_memcpy()
-    * will also happen if interlacing isn't supported or if the application
-    * does not call png_set_interlace_handling().  In the latter cases the
-    * caller just gets a sequence of the unexpanded rows from each interlace
-    * pass.
-    */
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE) &&
-      pass < 6 && (display == 0 ||
-      /* The following copies everything for 'display' on passes 0, 2 and 4. */
-      (display == 1 && (pass & 1) != 0)))
-   {
-      /* Narrow images may have no bits in a pass; the caller should handle
-       * this, but this test is cheap:
-       */
-      if (row_width <= PNG_PASS_START_COL(pass))
-         return;
-
-      if (pixel_depth < 8)
-      {
-         /* For pixel depths up to 4 bpp the 8-pixel mask can be expanded to fit
-          * into 32 bits, then a single loop over the bytes using the four byte
-          * values in the 32-bit mask can be used.  For the 'display' option the
-          * expanded mask may also not require any masking within a byte.  To
-          * make this work the PACKSWAP option must be taken into account - it
-          * simply requires the pixels to be reversed in each byte.
-          *
-          * The 'regular' case requires a mask for each of the first 6 passes,
-          * the 'display' case does a copy for the even passes in the range
-          * 0..6.  This has already been handled in the test above.
-          *
-          * The masks are arranged as four bytes with the first byte to use in
-          * the lowest bits (little-endian) regardless of the order (PACKSWAP or
-          * not) of the pixels in each byte.
-          *
-          * NOTE: the whole of this logic depends on the caller of this function
-          * only calling it on rows appropriate to the pass.  This function only
-          * understands the 'x' logic; the 'y' logic is handled by the caller.
-          *
-          * The following defines allow generation of compile time constant bit
-          * masks for each pixel depth and each possibility of swapped or not
-          * swapped bytes.  Pass 'p' is in the range 0..6; 'x', a pixel index,
-          * is in the range 0..7; and the result is 1 if the pixel is to be
-          * copied in the pass, 0 if not.  'S' is for the sparkle method, 'B'
-          * for the block method.
-          *
-          * With some compilers a compile time expression of the general form:
-          *
-          *    (shift >= 32) ? (a >> (shift-32)) : (b >> shift)
-          *
-          * Produces warnings with values of 'shift' in the range 33 to 63
-          * because the right hand side of the ?: expression is evaluated by
-          * the compiler even though it isn't used.  Microsoft Visual C (various
-          * versions) and the Intel C compiler are known to do this.  To avoid
-          * this the following macros are used in 1.5.6.  This is a temporary
-          * solution to avoid destabilizing the code during the release process.
-          */
-#        if PNG_USE_COMPILE_TIME_MASKS
-#           define PNG_LSR(x,s) ((x)>>((s) & 0x1f))
-#           define PNG_LSL(x,s) ((x)<<((s) & 0x1f))
-#        else
-#           define PNG_LSR(x,s) ((x)>>(s))
-#           define PNG_LSL(x,s) ((x)<<(s))
-#        endif
-#        define S_COPY(p,x) (((p)<4 ? PNG_LSR(0x80088822,(3-(p))*8+(7-(x))) :\
-           PNG_LSR(0xaa55ff00,(7-(p))*8+(7-(x)))) & 1)
-#        define B_COPY(p,x) (((p)<4 ? PNG_LSR(0xff0fff33,(3-(p))*8+(7-(x))) :\
-           PNG_LSR(0xff55ff00,(7-(p))*8+(7-(x)))) & 1)
-
-         /* Return a mask for pass 'p' pixel 'x' at depth 'd'.  The mask is
-          * little endian - the first pixel is at bit 0 - however the extra
-          * parameter 's' can be set to cause the mask position to be swapped
-          * within each byte, to match the PNG format.  This is done by XOR of
-          * the shift with 7, 6 or 4 for bit depths 1, 2 and 4.
-          */
-#        define PIXEL_MASK(p,x,d,s) \
-            (PNG_LSL(((PNG_LSL(1U,(d)))-1),(((x)*(d))^((s)?8-(d):0))))
-
-         /* Hence generate the appropriate 'block' or 'sparkle' pixel copy mask.
-          */
-#        define S_MASKx(p,x,d,s) (S_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)
-#        define B_MASKx(p,x,d,s) (B_COPY(p,x)?PIXEL_MASK(p,x,d,s):0)
-
-         /* Combine 8 of these to get the full mask.  For the 1-bpp and 2-bpp
-          * cases the result needs replicating, for the 4-bpp case the above
-          * generates a full 32 bits.
-          */
-#        define MASK_EXPAND(m,d) ((m)*((d)==1?0x01010101:((d)==2?0x00010001:1)))
-
-#        define S_MASK(p,d,s) MASK_EXPAND(S_MASKx(p,0,d,s) + S_MASKx(p,1,d,s) +\
-            S_MASKx(p,2,d,s) + S_MASKx(p,3,d,s) + S_MASKx(p,4,d,s) +\
-            S_MASKx(p,5,d,s) + S_MASKx(p,6,d,s) + S_MASKx(p,7,d,s), d)
-
-#        define B_MASK(p,d,s) MASK_EXPAND(B_MASKx(p,0,d,s) + B_MASKx(p,1,d,s) +\
-            B_MASKx(p,2,d,s) + B_MASKx(p,3,d,s) + B_MASKx(p,4,d,s) +\
-            B_MASKx(p,5,d,s) + B_MASKx(p,6,d,s) + B_MASKx(p,7,d,s), d)
-
-#if PNG_USE_COMPILE_TIME_MASKS
-         /* Utility macros to construct all the masks for a depth/swap
-          * combination.  The 's' parameter says whether the format is PNG
-          * (big endian bytes) or not.  Only the three odd-numbered passes are
-          * required for the display/block algorithm.
-          */
-#        define S_MASKS(d,s) { S_MASK(0,d,s), S_MASK(1,d,s), S_MASK(2,d,s),\
-            S_MASK(3,d,s), S_MASK(4,d,s), S_MASK(5,d,s) }
-
-#        define B_MASKS(d,s) { B_MASK(1,d,s), S_MASK(3,d,s), S_MASK(5,d,s) }
-
-#        define DEPTH_INDEX(d) ((d)==1?0:((d)==2?1:2))
-
-         /* Hence the pre-compiled masks indexed by PACKSWAP (or not), depth and
-          * then pass:
-          */
-         static PNG_CONST png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] =
-         {
-            /* Little-endian byte masks for PACKSWAP */
-            { S_MASKS(1,0), S_MASKS(2,0), S_MASKS(4,0) },
-            /* Normal (big-endian byte) masks - PNG format */
-            { S_MASKS(1,1), S_MASKS(2,1), S_MASKS(4,1) }
-         };
-
-         /* display_mask has only three entries for the odd passes, so index by
-          * pass>>1.
-          */
-         static PNG_CONST png_uint_32 display_mask[2][3][3] =
-         {
-            /* Little-endian byte masks for PACKSWAP */
-            { B_MASKS(1,0), B_MASKS(2,0), B_MASKS(4,0) },
-            /* Normal (big-endian byte) masks - PNG format */
-            { B_MASKS(1,1), B_MASKS(2,1), B_MASKS(4,1) }
-         };
-
-#        define MASK(pass,depth,display,png)\
-            ((display)?display_mask[png][DEPTH_INDEX(depth)][pass>>1]:\
-               row_mask[png][DEPTH_INDEX(depth)][pass])
-
-#else /* !PNG_USE_COMPILE_TIME_MASKS */
-         /* This is the runtime alternative: it seems unlikely that this will
-          * ever be either smaller or faster than the compile time approach.
-          */
-#        define MASK(pass,depth,display,png)\
-            ((display)?B_MASK(pass,depth,png):S_MASK(pass,depth,png))
-#endif /* !PNG_USE_COMPILE_TIME_MASKS */
-
-         /* Use the appropriate mask to copy the required bits.  In some cases
-          * the byte mask will be 0 or 0xff, optimize these cases.  row_width is
-          * the number of pixels, but the code copies bytes, so it is necessary
-          * to special case the end.
-          */
-         png_uint_32 pixels_per_byte = 8 / pixel_depth;
-         png_uint_32 mask;
-
-#        ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (png_ptr->transformations & PNG_PACKSWAP)
-               mask = MASK(pass, pixel_depth, display, 0);
-
-            else
-#        endif
-            mask = MASK(pass, pixel_depth, display, 1);
-
-         for (;;)
-         {
-            png_uint_32 m;
-
-            /* It doesn't matter in the following if png_uint_32 has more than
-             * 32 bits because the high bits always match those in m<<24; it is,
-             * however, essential to use OR here, not +, because of this.
-             */
-            m = mask;
-            mask = (m >> 8) | (m << 24); /* rotate right to good compilers */
-            m &= 0xff;
-
-            if (m != 0) /* something to copy */
-            {
-               if (m != 0xff)
-                  *dp = (png_byte)((*dp & ~m) | (*sp & m));
-               else
-                  *dp = *sp;
-            }
-
-            /* NOTE: this may overwrite the last byte with garbage if the image
-             * is not an exact number of bytes wide; libpng has always done
-             * this.
-             */
-            if (row_width <= pixels_per_byte)
-               break; /* May need to restore part of the last byte */
-
-            row_width -= pixels_per_byte;
-            ++dp;
-            ++sp;
-         }
-      }
-
-      else /* pixel_depth >= 8 */
-      {
-         unsigned int bytes_to_copy, bytes_to_jump;
-
-         /* Validate the depth - it must be a multiple of 8 */
-         if (pixel_depth & 7)
-            png_error(png_ptr, "invalid user transform pixel depth");
-
-         pixel_depth >>= 3; /* now in bytes */
-         row_width *= pixel_depth;
-
-         /* Regardless of pass number the Adam 7 interlace always results in a
-          * fixed number of pixels to copy then to skip.  There may be a
-          * different number of pixels to skip at the start though.
-          */
-         {
-            unsigned int offset = PNG_PASS_START_COL(pass) * pixel_depth;
-
-            row_width -= offset;
-            dp += offset;
-            sp += offset;
-         }
-
-         /* Work out the bytes to copy. */
-         if (display)
-         {
-            /* When doing the 'block' algorithm the pixel in the pass gets
-             * replicated to adjacent pixels.  This is why the even (0,2,4,6)
-             * passes are skipped above - the entire expanded row is copied.
-             */
-            bytes_to_copy = (1<<((6-pass)>>1)) * pixel_depth;
-
-            /* But don't allow this number to exceed the actual row width. */
-            if (bytes_to_copy > row_width)
-               bytes_to_copy = row_width;
-         }
-
-         else /* normal row; Adam7 only ever gives us one pixel to copy. */
-            bytes_to_copy = pixel_depth;
-
-         /* In Adam7 there is a constant offset between where the pixels go. */
-         bytes_to_jump = PNG_PASS_COL_OFFSET(pass) * pixel_depth;
-
-         /* And simply copy these bytes.  Some optimization is possible here,
-          * depending on the value of 'bytes_to_copy'.  Special case the low
-          * byte counts, which we know to be frequent.
-          *
-          * Notice that these cases all 'return' rather than 'break' - this
-          * avoids an unnecessary test on whether to restore the last byte
-          * below.
-          */
-         switch (bytes_to_copy)
-         {
-            case 1:
-               for (;;)
-               {
-                  *dp = *sp;
-
-                  if (row_width <= bytes_to_jump)
-                     return;
-
-                  dp += bytes_to_jump;
-                  sp += bytes_to_jump;
-                  row_width -= bytes_to_jump;
-               }
-
-            case 2:
-               /* There is a possibility of a partial copy at the end here; this
-                * slows the code down somewhat.
-                */
-               do
-               {
-                  dp[0] = sp[0], dp[1] = sp[1];
-
-                  if (row_width <= bytes_to_jump)
-                     return;
-
-                  sp += bytes_to_jump;
-                  dp += bytes_to_jump;
-                  row_width -= bytes_to_jump;
-               }
-               while (row_width > 1);
-
-               /* And there can only be one byte left at this point: */
-               *dp = *sp;
-               return;
-
-            case 3:
-               /* This can only be the RGB case, so each copy is exactly one
-                * pixel and it is not necessary to check for a partial copy.
-                */
-               for(;;)
-               {
-                  dp[0] = sp[0], dp[1] = sp[1], dp[2] = sp[2];
-
-                  if (row_width <= bytes_to_jump)
-                     return;
-
-                  sp += bytes_to_jump;
-                  dp += bytes_to_jump;
-                  row_width -= bytes_to_jump;
-               }
-
-            default:
-#if PNG_ALIGN_TYPE != PNG_ALIGN_NONE
-               /* Check for double byte alignment and, if possible, use a
-                * 16-bit copy.  Don't attempt this for narrow images - ones that
-                * are less than an interlace panel wide.  Don't attempt it for
-                * wide bytes_to_copy either - use the png_memcpy there.
-                */
-               if (bytes_to_copy < 16 /*else use png_memcpy*/ &&
-                  png_isaligned(dp, png_uint_16) &&
-                  png_isaligned(sp, png_uint_16) &&
-                  bytes_to_copy % sizeof (png_uint_16) == 0 &&
-                  bytes_to_jump % sizeof (png_uint_16) == 0)
-               {
-                  /* Everything is aligned for png_uint_16 copies, but try for
-                   * png_uint_32 first.
-                   */
-                  if (png_isaligned(dp, png_uint_32) &&
-                     png_isaligned(sp, png_uint_32) &&
-                     bytes_to_copy % sizeof (png_uint_32) == 0 &&
-                     bytes_to_jump % sizeof (png_uint_32) == 0)
-                  {
-                     png_uint_32p dp32 = (png_uint_32p)dp;
-                     png_const_uint_32p sp32 = (png_const_uint_32p)sp;
-                     unsigned int skip = (bytes_to_jump-bytes_to_copy) /
-                        sizeof (png_uint_32);
-
-                     do
-                     {
-                        size_t c = bytes_to_copy;
-                        do
-                        {
-                           *dp32++ = *sp32++;
-                           c -= sizeof (png_uint_32);
-                        }
-                        while (c > 0);
-
-                        if (row_width <= bytes_to_jump)
-                           return;
-
-                        dp32 += skip;
-                        sp32 += skip;
-                        row_width -= bytes_to_jump;
-                     }
-                     while (bytes_to_copy <= row_width);
-
-                     /* Get to here when the row_width truncates the final copy.
-                      * There will be 1-3 bytes left to copy, so don't try the
-                      * 16-bit loop below.
-                      */
-                     dp = (png_bytep)dp32;
-                     sp = (png_const_bytep)sp32;
-                     do
-                        *dp++ = *sp++;
-                     while (--row_width > 0);
-                     return;
-                  }
-
-                  /* Else do it in 16-bit quantities, but only if the size is
-                   * not too large.
-                   */
-                  else
-                  {
-                     png_uint_16p dp16 = (png_uint_16p)dp;
-                     png_const_uint_16p sp16 = (png_const_uint_16p)sp;
-                     unsigned int skip = (bytes_to_jump-bytes_to_copy) /
-                        sizeof (png_uint_16);
-
-                     do
-                     {
-                        size_t c = bytes_to_copy;
-                        do
-                        {
-                           *dp16++ = *sp16++;
-                           c -= sizeof (png_uint_16);
-                        }
-                        while (c > 0);
-
-                        if (row_width <= bytes_to_jump)
-                           return;
-
-                        dp16 += skip;
-                        sp16 += skip;
-                        row_width -= bytes_to_jump;
-                     }
-                     while (bytes_to_copy <= row_width);
-
-                     /* End of row - 1 byte left, bytes_to_copy > row_width: */
-                     dp = (png_bytep)dp16;
-                     sp = (png_const_bytep)sp16;
-                     do
-                        *dp++ = *sp++;
-                     while (--row_width > 0);
-                     return;
-                  }
-               }
-#endif /* PNG_ALIGN_ code */
-
-               /* The true default - use a png_memcpy: */
-               for (;;)
-               {
-                  png_memcpy(dp, sp, bytes_to_copy);
-
-                  if (row_width <= bytes_to_jump)
-                     return;
-
-                  sp += bytes_to_jump;
-                  dp += bytes_to_jump;
-                  row_width -= bytes_to_jump;
-                  if (bytes_to_copy > row_width)
-                     bytes_to_copy = row_width;
-               }
-         }
-
-         /* NOT REACHED*/
-      } /* pixel_depth >= 8 */
-
-      /* Here if pixel_depth < 8 to check 'end_ptr' below. */
-   }
-   else
-#endif
-
-   /* If here then the switch above wasn't used so just png_memcpy the whole row
-    * from the temporary row buffer (notice that this overwrites the end of the
-    * destination row if it is a partial byte.)
-    */
-   png_memcpy(dp, sp, PNG_ROWBYTES(pixel_depth, row_width));
-
-   /* Restore the overwritten bits from the last byte if necessary. */
-   if (end_ptr != NULL)
-      *end_ptr = (png_byte)((end_byte & end_mask) | (*end_ptr & ~end_mask));
-}
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-void /* PRIVATE */
-png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
-   png_uint_32 transformations /* Because these may affect the byte layout */)
-{
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-   /* Offset to next interlace block */
-   static PNG_CONST int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   png_debug(1, "in png_do_read_interlace");
-   if (row != NULL && row_info != NULL)
-   {
-      png_uint_32 final_width;
-
-      final_width = row_info->width * png_pass_inc[pass];
-
-      switch (row_info->pixel_depth)
-      {
-         case 1:
-         {
-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
-            int sshift, dshift;
-            int s_start, s_end, s_inc;
-            int jstop = png_pass_inc[pass];
-            png_byte v;
-            png_uint_32 i;
-            int j;
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (transformations & PNG_PACKSWAP)
-            {
-                sshift = (int)((row_info->width + 7) & 0x07);
-                dshift = (int)((final_width + 7) & 0x07);
-                s_start = 7;
-                s_end = 0;
-                s_inc = -1;
-            }
-
-            else
-#endif
-            {
-                sshift = 7 - (int)((row_info->width + 7) & 0x07);
-                dshift = 7 - (int)((final_width + 7) & 0x07);
-                s_start = 0;
-                s_end = 7;
-                s_inc = 1;
-            }
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               v = (png_byte)((*sp >> sshift) & 0x01);
-               for (j = 0; j < jstop; j++)
-               {
-                  *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
-                  *dp |= (png_byte)(v << dshift);
-
-                  if (dshift == s_end)
-                  {
-                     dshift = s_start;
-                     dp--;
-                  }
-
-                  else
-                     dshift += s_inc;
-               }
-
-               if (sshift == s_end)
-               {
-                  sshift = s_start;
-                  sp--;
-               }
-
-               else
-                  sshift += s_inc;
-            }
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
-            png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
-            int sshift, dshift;
-            int s_start, s_end, s_inc;
-            int jstop = png_pass_inc[pass];
-            png_uint_32 i;
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (transformations & PNG_PACKSWAP)
-            {
-               sshift = (int)(((row_info->width + 3) & 0x03) << 1);
-               dshift = (int)(((final_width + 3) & 0x03) << 1);
-               s_start = 6;
-               s_end = 0;
-               s_inc = -2;
-            }
-
-            else
-#endif
-            {
-               sshift = (int)((3 - ((row_info->width + 3) & 0x03)) << 1);
-               dshift = (int)((3 - ((final_width + 3) & 0x03)) << 1);
-               s_start = 0;
-               s_end = 6;
-               s_inc = 2;
-            }
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               png_byte v;
-               int j;
-
-               v = (png_byte)((*sp >> sshift) & 0x03);
-               for (j = 0; j < jstop; j++)
-               {
-                  *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
-                  *dp |= (png_byte)(v << dshift);
-
-                  if (dshift == s_end)
-                  {
-                     dshift = s_start;
-                     dp--;
-                  }
-
-                  else
-                     dshift += s_inc;
-               }
-
-               if (sshift == s_end)
-               {
-                  sshift = s_start;
-                  sp--;
-               }
-
-               else
-                  sshift += s_inc;
-            }
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
-            png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
-            int sshift, dshift;
-            int s_start, s_end, s_inc;
-            png_uint_32 i;
-            int jstop = png_pass_inc[pass];
-
-#ifdef PNG_READ_PACKSWAP_SUPPORTED
-            if (transformations & PNG_PACKSWAP)
-            {
-               sshift = (int)(((row_info->width + 1) & 0x01) << 2);
-               dshift = (int)(((final_width + 1) & 0x01) << 2);
-               s_start = 4;
-               s_end = 0;
-               s_inc = -4;
-            }
-
-            else
-#endif
-            {
-               sshift = (int)((1 - ((row_info->width + 1) & 0x01)) << 2);
-               dshift = (int)((1 - ((final_width + 1) & 0x01)) << 2);
-               s_start = 0;
-               s_end = 4;
-               s_inc = 4;
-            }
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               png_byte v = (png_byte)((*sp >> sshift) & 0x0f);
-               int j;
-
-               for (j = 0; j < jstop; j++)
-               {
-                  *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
-                  *dp |= (png_byte)(v << dshift);
-
-                  if (dshift == s_end)
-                  {
-                     dshift = s_start;
-                     dp--;
-                  }
-
-                  else
-                     dshift += s_inc;
-               }
-
-               if (sshift == s_end)
-               {
-                  sshift = s_start;
-                  sp--;
-               }
-
-               else
-                  sshift += s_inc;
-            }
-            break;
-         }
-
-         default:
-         {
-            png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
-
-            png_bytep sp = row + (png_size_t)(row_info->width - 1)
-                * pixel_bytes;
-
-            png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
-
-            int jstop = png_pass_inc[pass];
-            png_uint_32 i;
-
-            for (i = 0; i < row_info->width; i++)
-            {
-               png_byte v[8];
-               int j;
-
-               png_memcpy(v, sp, pixel_bytes);
-
-               for (j = 0; j < jstop; j++)
-               {
-                  png_memcpy(dp, v, pixel_bytes);
-                  dp -= pixel_bytes;
-               }
-
-               sp -= pixel_bytes;
-            }
-            break;
-         }
-      }
-
-      row_info->width = final_width;
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, final_width);
-   }
-#ifndef PNG_READ_PACKSWAP_SUPPORTED
-   PNG_UNUSED(transformations)  /* Silence compiler warning */
-#endif
-}
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-
-static void
-png_read_filter_row_sub(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_size_t istop = row_info->rowbytes;
-   unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-   png_bytep rp = row + bpp;
-
-   PNG_UNUSED(prev_row)
-
-   for (i = bpp; i < istop; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) + (int)(*(rp-bpp))) & 0xff);
-      rp++;
-   }
-}
-
-static void
-png_read_filter_row_up(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_size_t istop = row_info->rowbytes;
-   png_bytep rp = row;
-   png_const_bytep pp = prev_row;
-
-   for (i = 0; i < istop; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
-      rp++;
-   }
-}
-
-static void
-png_read_filter_row_avg(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_bytep rp = row;
-   png_const_bytep pp = prev_row;
-   unsigned int bpp = (row_info->pixel_depth + 7) >> 3;
-   png_size_t istop = row_info->rowbytes - bpp;
-
-   for (i = 0; i < bpp; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) +
-         ((int)(*pp++) / 2 )) & 0xff);
-
-      rp++;
-   }
-
-   for (i = 0; i < istop; i++)
-   {
-      *rp = (png_byte)(((int)(*rp) +
-         (int)(*pp++ + *(rp-bpp)) / 2 ) & 0xff);
-
-      rp++;
-   }
-}
-
-static void
-png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   png_bytep rp_end = row + row_info->rowbytes;
-   int a, c;
-
-   /* First pixel/byte */
-   c = *prev_row++;
-   a = *row + c;
-   *row++ = (png_byte)a;
-
-   /* Remainder */
-   while (row < rp_end)
-   {
-      int b, pa, pb, pc, p;
-
-      a &= 0xff; /* From previous iteration or start */
-      b = *prev_row++;
-
-      p = b - c;
-      pc = a - c;
-
-#     ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#     else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#     endif
-
-      /* Find the best predictor, the least of pa, pb, pc favoring the earlier
-       * ones in the case of a tie.
-       */
-      if (pb < pa) pa = pb, a = b;
-      if (pc < pa) a = c;
-
-      /* Calculate the current pixel in a, and move the previous row pixel to c
-       * for the next time round the loop
-       */
-      c = b;
-      a += *row;
-      *row++ = (png_byte)a;
-   }
-}
-
-static void
-png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row)
-{
-   int bpp = (row_info->pixel_depth + 7) >> 3;
-   png_bytep rp_end = row + bpp;
-
-   /* Process the first pixel in the row completely (this is the same as 'up'
-    * because there is only one candidate predictor for the first row).
-    */
-   while (row < rp_end)
-   {
-      int a = *row + *prev_row++;
-      *row++ = (png_byte)a;
-   }
-
-   /* Remainder */
-   rp_end += row_info->rowbytes - bpp;
-
-   while (row < rp_end)
-   {
-      int a, b, c, pa, pb, pc, p;
-
-      c = *(prev_row - bpp);
-      a = *(row - bpp);
-      b = *prev_row++;
-
-      p = b - c;
-      pc = a - c;
-
-#     ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#     else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#     endif
-
-      if (pb < pa) pa = pb, a = b;
-      if (pc < pa) a = c;
-
-      c = b;
-      a += *row;
-      *row++ = (png_byte)a;
-   }
-}
-
-#ifdef PNG_ARM_NEON
-
-#ifdef __linux__
-#include <stdio.h>
-#include <elf.h>
-#include <asm/hwcap.h>
-
-static int png_have_hwcap(unsigned cap)
-{
-   FILE *f = fopen("/proc/self/auxv", "r");
-   Elf32_auxv_t aux;
-   int have_cap = 0;
-
-   if (!f)
-      return 0;
-
-   while (fread(&aux, sizeof(aux), 1, f) > 0)
-   {
-      if (aux.a_type == AT_HWCAP &&
-          aux.a_un.a_val & cap)
-      {
-         have_cap = 1;
-         break;
-      }
-   }
-
-   fclose(f);
-
-   return have_cap;
-}
-#endif /* __linux__ */
-
-static void
-png_init_filter_functions_neon(png_structp pp, unsigned int bpp)
-{
-#ifdef __linux__
-   if (!png_have_hwcap(HWCAP_NEON))
-      return;
-#endif
-
-   pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_neon;
-
-   if (bpp == 3)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_neon;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_neon;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = 
-         png_read_filter_row_paeth3_neon;
-   }
-
-   else if (bpp == 4)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_neon;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_neon;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-          png_read_filter_row_paeth4_neon;
-   }
-}
-#endif /* PNG_ARM_NEON */
-
-static void
-png_init_filter_functions(png_structp pp)
-{
-   unsigned int bpp = (pp->pixel_depth + 7) >> 3;
-
-   pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub;
-   pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up;
-   pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg;
-   if (bpp == 1)
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-         png_read_filter_row_paeth_1byte_pixel;
-   else
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-         png_read_filter_row_paeth_multibyte_pixel;
-
-#ifdef PNG_ARM_NEON
-   png_init_filter_functions_neon(pp, bpp);
-#endif
-}
-
-void /* PRIVATE */
-png_read_filter_row(png_structp pp, png_row_infop row_info, png_bytep row,
-   png_const_bytep prev_row, int filter)
-{
-   if (pp->read_filter[0] == NULL)
-      png_init_filter_functions(pp);
-   if (filter > PNG_FILTER_VALUE_NONE && filter < PNG_FILTER_VALUE_LAST)
-      pp->read_filter[filter-1](row_info, row, prev_row);
-}
-
-#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-void /* PRIVATE */
-png_read_finish_row(png_structp png_ptr)
-{
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-
-   png_debug(1, "in png_read_finish_row");
-   png_ptr->row_number++;
-   if (png_ptr->row_number < png_ptr->num_rows)
-      return;
-
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced)
-   {
-      png_ptr->row_number = 0;
-
-      /* TO DO: don't do this if prev_row isn't needed (requires
-       * read-ahead of the next row's filter byte.
-       */
-      png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
-      do
-      {
-         png_ptr->pass++;
-
-         if (png_ptr->pass >= 7)
-            break;
-
-         png_ptr->iwidth = (png_ptr->width +
-            png_pass_inc[png_ptr->pass] - 1 -
-            png_pass_start[png_ptr->pass]) /
-            png_pass_inc[png_ptr->pass];
-
-         if (!(png_ptr->transformations & PNG_INTERLACE))
-         {
-            png_ptr->num_rows = (png_ptr->height +
-                png_pass_yinc[png_ptr->pass] - 1 -
-                png_pass_ystart[png_ptr->pass]) /
-                png_pass_yinc[png_ptr->pass];
-         }
-
-         else  /* if (png_ptr->transformations & PNG_INTERLACE) */
-            break; /* libpng deinterlacing sees every row */
-
-      } while (png_ptr->num_rows == 0 || png_ptr->iwidth == 0);
-
-      if (png_ptr->pass < 7)
-         return;
-   }
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-   {
-      char extra;
-      int ret;
-
-      png_ptr->zstream.next_out = (Byte *)&extra;
-      png_ptr->zstream.avail_out = (uInt)1;
-
-      for (;;)
-      {
-         if (!(png_ptr->zstream.avail_in))
-         {
-            while (!png_ptr->idat_size)
-            {
-               png_crc_finish(png_ptr, 0);
-               png_ptr->idat_size = png_read_chunk_header(png_ptr);
-               if (png_ptr->chunk_name != png_IDAT)
-                  png_error(png_ptr, "Not enough image data");
-            }
-
-            png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
-            png_ptr->zstream.next_in = png_ptr->zbuf;
-
-            if (png_ptr->zbuf_size > png_ptr->idat_size)
-               png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
-
-            png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
-            png_ptr->idat_size -= png_ptr->zstream.avail_in;
-         }
-
-         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
-
-         if (ret == Z_STREAM_END)
-         {
-            if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
-                png_ptr->idat_size)
-               png_warning(png_ptr, "Extra compressed data");
-
-            png_ptr->mode |= PNG_AFTER_IDAT;
-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-            break;
-         }
-
-         if (ret != Z_OK)
-            png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
-                "Decompression Error");
-
-         if (!(png_ptr->zstream.avail_out))
-         {
-            png_warning(png_ptr, "Extra compressed data");
-            png_ptr->mode |= PNG_AFTER_IDAT;
-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-            break;
-         }
-
-      }
-      png_ptr->zstream.avail_out = 0;
-   }
-
-   if (png_ptr->idat_size || png_ptr->zstream.avail_in)
-      png_warning(png_ptr, "Extra compression data");
-
-   inflateReset(&png_ptr->zstream);
-
-   png_ptr->mode |= PNG_AFTER_IDAT;
-}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-
-void /* PRIVATE */
-png_read_start_row(png_structp png_ptr)
-{
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif
-
-   int max_pixel_depth;
-   png_size_t row_bytes;
-
-   png_debug(1, "in png_read_start_row");
-   png_ptr->zstream.avail_in = 0;
-#ifdef PNG_READ_TRANSFORMS_SUPPORTED
-   png_init_read_transformations(png_ptr);
-#endif
-#ifdef PNG_READ_INTERLACING_SUPPORTED
-   if (png_ptr->interlaced)
-   {
-      if (!(png_ptr->transformations & PNG_INTERLACE))
-         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
-             png_pass_ystart[0]) / png_pass_yinc[0];
-
-      else
-         png_ptr->num_rows = png_ptr->height;
-
-      png_ptr->iwidth = (png_ptr->width +
-          png_pass_inc[png_ptr->pass] - 1 -
-          png_pass_start[png_ptr->pass]) /
-          png_pass_inc[png_ptr->pass];
-   }
-
-   else
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
-   {
-      png_ptr->num_rows = png_ptr->height;
-      png_ptr->iwidth = png_ptr->width;
-   }
-
-   max_pixel_depth = png_ptr->pixel_depth;
-
-   /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpliar set of
-    * calculations to calculate the final pixel depth, then
-    * png_do_read_transforms actually does the transforms.  This means that the
-    * code which effectively calculates this value is actually repeated in three
-    * separate places.  They must all match.  Innocent changes to the order of
-    * transformations can and will break libpng in a way that causes memory
-    * overwrites.
-    *
-    * TODO: fix this.
-    */
-#ifdef PNG_READ_PACK_SUPPORTED
-   if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
-      max_pixel_depth = 8;
-#endif
-
-#ifdef PNG_READ_EXPAND_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND)
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         if (png_ptr->num_trans)
-            max_pixel_depth = 32;
-
-         else
-            max_pixel_depth = 24;
-      }
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         if (max_pixel_depth < 8)
-            max_pixel_depth = 8;
-
-         if (png_ptr->num_trans)
-            max_pixel_depth *= 2;
-      }
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-      {
-         if (png_ptr->num_trans)
-         {
-            max_pixel_depth *= 4;
-            max_pixel_depth /= 3;
-         }
-      }
-   }
-#endif
-
-#ifdef PNG_READ_EXPAND_16_SUPPORTED
-   if (png_ptr->transformations & PNG_EXPAND_16)
-   {
-#     ifdef PNG_READ_EXPAND_SUPPORTED
-         /* In fact it is an error if it isn't supported, but checking is
-          * the safe way.
-          */
-         if (png_ptr->transformations & PNG_EXPAND)
-         {
-            if (png_ptr->bit_depth < 16)
-               max_pixel_depth *= 2;
-         }
-         else
-#     endif
-         png_ptr->transformations &= ~PNG_EXPAND_16;
-   }
-#endif
-
-#ifdef PNG_READ_FILLER_SUPPORTED
-   if (png_ptr->transformations & (PNG_FILLER))
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-      {
-         if (max_pixel_depth <= 8)
-            max_pixel_depth = 16;
-
-         else
-            max_pixel_depth = 32;
-      }
-
-      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB ||
-         png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         if (max_pixel_depth <= 32)
-            max_pixel_depth = 32;
-
-         else
-            max_pixel_depth = 64;
-      }
-   }
-#endif
-
-#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
-   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
-   {
-      if (
-#ifdef PNG_READ_EXPAND_SUPPORTED
-          (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
-#endif
-#ifdef PNG_READ_FILLER_SUPPORTED
-          (png_ptr->transformations & (PNG_FILLER)) ||
-#endif
-          png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (max_pixel_depth <= 16)
-            max_pixel_depth = 32;
-
-         else
-            max_pixel_depth = 64;
-      }
-
-      else
-      {
-         if (max_pixel_depth <= 8)
-         {
-            if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-               max_pixel_depth = 32;
-
-            else
-               max_pixel_depth = 24;
-         }
-
-         else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            max_pixel_depth = 64;
-
-         else
-            max_pixel_depth = 48;
-      }
-   }
-#endif
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
-defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-   {
-      int user_pixel_depth = png_ptr->user_transform_depth *
-         png_ptr->user_transform_channels;
-
-      if (user_pixel_depth > max_pixel_depth)
-         max_pixel_depth = user_pixel_depth;
-   }
-#endif
-
-   /* This value is stored in png_struct and double checked in the row read
-    * code.
-    */
-   png_ptr->maximum_pixel_depth = (png_byte)max_pixel_depth;
-   png_ptr->transformed_pixel_depth = 0; /* calculated on demand */
-
-   /* Align the width on the next larger 8 pixels.  Mainly used
-    * for interlacing
-    */
-   row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
-   /* Calculate the maximum bytes needed, adding a byte and a pixel
-    * for safety's sake
-    */
-   row_bytes = PNG_ROWBYTES(max_pixel_depth, row_bytes) +
-       1 + ((max_pixel_depth + 7) >> 3);
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (row_bytes > (png_uint_32)65536L)
-      png_error(png_ptr, "This image requires a row greater than 64KB");
-#endif
-
-   if (row_bytes + 48 > png_ptr->old_big_row_buf_size)
-   {
-     png_free(png_ptr, png_ptr->big_row_buf);
-     png_free(png_ptr, png_ptr->big_prev_row);
-
-     if (png_ptr->interlaced)
-        png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
-            row_bytes + 48);
-
-     else
-        png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
-
-     png_ptr->big_prev_row = (png_bytep)png_malloc(png_ptr, row_bytes + 48);
-
-#ifdef PNG_ALIGNED_MEMORY_SUPPORTED
-     /* Use 16-byte aligned memory for row_buf with at least 16 bytes
-      * of padding before and after row_buf; treat prev_row similarly.
-      * NOTE: the alignment is to the start of the pixels, one beyond the start
-      * of the buffer, because of the filter byte.  Prior to libpng 1.5.6 this
-      * was incorrect; the filter byte was aligned, which had the exact
-      * opposite effect of that intended.
-      */
-     {
-        png_bytep temp = png_ptr->big_row_buf + 32;
-        int extra = (int)((temp - (png_bytep)0) & 0x0f);
-        png_ptr->row_buf = temp - extra - 1/*filter byte*/;
-
-        temp = png_ptr->big_prev_row + 32;
-        extra = (int)((temp - (png_bytep)0) & 0x0f);
-        png_ptr->prev_row = temp - extra - 1/*filter byte*/;
-     }
-
-#else
-     /* Use 31 bytes of padding before and 17 bytes after row_buf. */
-     png_ptr->row_buf = png_ptr->big_row_buf + 31;
-     png_ptr->prev_row = png_ptr->big_prev_row + 31;
-#endif
-     png_ptr->old_big_row_buf_size = row_bytes + 48;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (png_ptr->rowbytes > 65535)
-      png_error(png_ptr, "This image requires a row greater than 64KB");
-
-#endif
-   if (png_ptr->rowbytes > (PNG_SIZE_MAX - 1))
-      png_error(png_ptr, "Row has too many bytes to allocate in memory");
-
-   png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-
-   png_debug1(3, "width = %u,", png_ptr->width);
-   png_debug1(3, "height = %u,", png_ptr->height);
-   png_debug1(3, "iwidth = %u,", png_ptr->iwidth);
-   png_debug1(3, "num_rows = %u,", png_ptr->num_rows);
-   png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes);
-   png_debug1(3, "irowbytes = %lu",
-       (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1);
-
-   png_ptr->flags |= PNG_FLAG_ROW_INIT;
-}
-#endif /* PNG_READ_SUPPORTED */
+/* pngrutil.c - utilities to read a PNG file
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file contains routines that are only called from within
+ * libpng itself during the course of reading an image.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(_WIN32_WCE)
+/* strtod() function is not supported on WindowsCE */
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+__inline double strtod(const char *nptr, char **endptr)
+{
+   double result = 0;
+   int len;
+   wchar_t *str, *end;
+
+   len = MultiByteToWideChar(CP_ACP, 0, nptr, -1, NULL, 0);
+   str = (wchar_t *)malloc(len * sizeof(wchar_t));
+   if ( NULL != str )
+   {
+      MultiByteToWideChar(CP_ACP, 0, nptr, -1, str, len);
+      result = wcstod(str, &end);
+      len = WideCharToMultiByte(CP_ACP, 0, end, -1, NULL, 0, NULL, NULL);
+      *endptr = (char *)nptr + (png_strlen(nptr) - len + 1);
+      free(str);
+   }
+   return result;
+}
+#  endif
+#endif
+
+png_uint_32 /* PRIVATE */
+png_get_uint_31(png_structp png_ptr, png_bytep buf)
+{
+   png_uint_32 i = png_get_uint_32(buf);
+   if (i > PNG_UINT_31_MAX)
+     png_error(png_ptr, "PNG unsigned integer out of range.\n");
+   return (i);
+}
+#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
+/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
+png_uint_32 /* PRIVATE */
+png_get_uint_32(png_bytep buf)
+{
+   png_uint_32 i = ((png_uint_32)(*buf) << 24) +
+      ((png_uint_32)(*(buf + 1)) << 16) +
+      ((png_uint_32)(*(buf + 2)) << 8) +
+      (png_uint_32)(*(buf + 3));
+
+   return (i);
+}
+
+#if defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_READ_oFFs_SUPPORTED)
+/* Grab a signed 32-bit integer from a buffer in big-endian format.  The
+ * data is stored in the PNG file in two's complement format, and it is
+ * assumed that the machine format for signed integers is the same. */
+png_int_32 /* PRIVATE */
+png_get_int_32(png_bytep buf)
+{
+   png_int_32 i = ((png_int_32)(*buf) << 24) +
+      ((png_int_32)(*(buf + 1)) << 16) +
+      ((png_int_32)(*(buf + 2)) << 8) +
+      (png_int_32)(*(buf + 3));
+
+   return (i);
+}
+#endif /* PNG_READ_pCAL_SUPPORTED */
+
+/* Grab an unsigned 16-bit integer from a buffer in big-endian format. */
+png_uint_16 /* PRIVATE */
+png_get_uint_16(png_bytep buf)
+{
+   png_uint_16 i = (png_uint_16)(((png_uint_16)(*buf) << 8) +
+      (png_uint_16)(*(buf + 1)));
+
+   return (i);
+}
+#endif /* PNG_READ_BIG_ENDIAN_SUPPORTED */
+
+/* Read data, and (optionally) run it through the CRC. */
+void /* PRIVATE */
+png_crc_read(png_structp png_ptr, png_bytep buf, png_size_t length)
+{
+   png_read_data(png_ptr, buf, length);
+   png_calculate_crc(png_ptr, buf, length);
+}
+
+/* Optionally skip data and then check the CRC.  Depending on whether we
+   are reading a ancillary or critical chunk, and how the program has set
+   things up, we may calculate the CRC on the data and print a message.
+   Returns '1' if there was a CRC error, '0' otherwise. */
+int /* PRIVATE */
+png_crc_finish(png_structp png_ptr, png_uint_32 skip)
+{
+   png_size_t i;
+   png_size_t istop = png_ptr->zbuf_size;
+
+   for (i = (png_size_t)skip; i > istop; i -= istop)
+   {
+      png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+   }
+   if (i)
+   {
+      png_crc_read(png_ptr, png_ptr->zbuf, i);
+   }
+
+   if (png_crc_error(png_ptr))
+   {
+      if (((png_ptr->chunk_name[0] & 0x20) &&                /* Ancillary */
+           !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)) ||
+          (!(png_ptr->chunk_name[0] & 0x20) &&             /* Critical  */
+          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE)))
+      {
+         png_chunk_warning(png_ptr, "CRC error");
+      }
+      else
+      {
+         png_chunk_error(png_ptr, "CRC error");
+      }
+      return (1);
+   }
+
+   return (0);
+}
+
+/* Compare the CRC stored in the PNG file with that calculated by libpng from
+   the data it has read thus far. */
+int /* PRIVATE */
+png_crc_error(png_structp png_ptr)
+{
+   png_byte crc_bytes[4];
+   png_uint_32 crc;
+   int need_crc = 1;
+
+   if (png_ptr->chunk_name[0] & 0x20)                     /* ancillary */
+   {
+      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
+          (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
+         need_crc = 0;
+   }
+   else                                                    /* critical */
+   {
+      if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+         need_crc = 0;
+   }
+
+   png_read_data(png_ptr, crc_bytes, 4);
+
+   if (need_crc)
+   {
+      crc = png_get_uint_32(crc_bytes);
+      return ((int)(crc != png_ptr->crc));
+   }
+   else
+      return (0);
+}
+
+#if defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) || \
+    defined(PNG_READ_iCCP_SUPPORTED)
+/*
+ * Decompress trailing data in a chunk.  The assumption is that chunkdata
+ * points at an allocated area holding the contents of a chunk with a
+ * trailing compressed part.  What we get back is an allocated area
+ * holding the original prefix part and an uncompressed version of the
+ * trailing part (the malloc area passed in is freed).
+ */
+png_charp /* PRIVATE */
+png_decompress_chunk(png_structp png_ptr, int comp_type,
+                              png_charp chunkdata, png_size_t chunklength,
+                              png_size_t prefix_size, png_size_t *newlength)
+{
+   static char msg[] = "Error decoding compressed text";
+   png_charp text;
+   png_size_t text_size;
+
+   if (comp_type == PNG_COMPRESSION_TYPE_BASE)
+   {
+      int ret = Z_OK;
+      png_ptr->zstream.next_in = (png_bytep)(chunkdata + prefix_size);
+      png_ptr->zstream.avail_in = (uInt)(chunklength - prefix_size);
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+      text_size = 0;
+      text = NULL;
+
+      while (png_ptr->zstream.avail_in)
+      {
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret != Z_OK && ret != Z_STREAM_END)
+         {
+            if (png_ptr->zstream.msg != NULL)
+               png_warning(png_ptr, png_ptr->zstream.msg);
+            else
+               png_warning(png_ptr, msg);
+            inflateReset(&png_ptr->zstream);
+            png_ptr->zstream.avail_in = 0;
+
+            if (text ==  NULL)
+            {
+               text_size = prefix_size + png_sizeof(msg) + 1;
+               text = (png_charp)png_malloc_warn(png_ptr, text_size);
+               if (text ==  NULL)
+                 {
+                    png_free(png_ptr,chunkdata);
+                    png_error(png_ptr,"Not enough memory to decompress chunk");
+                 }
+               png_memcpy(text, chunkdata, prefix_size);
+            }
+
+            text[text_size - 1] = 0x00;
+
+            /* Copy what we can of the error message into the text chunk */
+            text_size = (png_size_t)(chunklength - (text - chunkdata) - 1);
+            text_size = png_sizeof(msg) > text_size ? text_size :
+               png_sizeof(msg);
+            png_memcpy(text + prefix_size, msg, text_size + 1);
+            break;
+         }
+         if (!png_ptr->zstream.avail_out || ret == Z_STREAM_END)
+         {
+            if (text == NULL)
+            {
+               text_size = prefix_size +
+                   png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+               text = (png_charp)png_malloc_warn(png_ptr, text_size + 1);
+               if (text ==  NULL)
+                 {
+                    png_free(png_ptr,chunkdata);
+                    png_error(png_ptr,"Not enough memory to decompress chunk.");
+                 }
+               png_memcpy(text + prefix_size, png_ptr->zbuf,
+                    text_size - prefix_size);
+               png_memcpy(text, chunkdata, prefix_size);
+               *(text + text_size) = 0x00;
+            }
+            else
+            {
+               png_charp tmp;
+
+               tmp = text;
+               text = (png_charp)png_malloc_warn(png_ptr,
+                  (png_uint_32)(text_size +
+                  png_ptr->zbuf_size - png_ptr->zstream.avail_out + 1));
+               if (text == NULL)
+               {
+                  png_free(png_ptr, tmp);
+                  png_free(png_ptr, chunkdata);
+                  png_error(png_ptr,"Not enough memory to decompress chunk..");
+               }
+               png_memcpy(text, tmp, text_size);
+               png_free(png_ptr, tmp);
+               png_memcpy(text + text_size, png_ptr->zbuf,
+                  (png_ptr->zbuf_size - png_ptr->zstream.avail_out));
+               text_size += png_ptr->zbuf_size - png_ptr->zstream.avail_out;
+               *(text + text_size) = 0x00;
+            }
+            if (ret == Z_STREAM_END)
+               break;
+            else
+            {
+               png_ptr->zstream.next_out = png_ptr->zbuf;
+               png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            }
+         }
+      }
+      if (ret != Z_STREAM_END)
+      {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+         char umsg[50];
+
+         if (ret == Z_BUF_ERROR)
+            sprintf(umsg,"Buffer error in compressed datastream in %s chunk",
+                (char *)png_ptr->chunk_name);
+         else if (ret == Z_DATA_ERROR)
+            sprintf(umsg,"Data error in compressed datastream in %s chunk",
+                (char *)png_ptr->chunk_name);
+         else
+            sprintf(umsg,"Incomplete compressed datastream in %s chunk",
+                (char *)png_ptr->chunk_name);
+         png_warning(png_ptr, umsg);
+#else
+         png_warning(png_ptr,
+            "Incomplete compressed datastream in chunk other than IDAT");
+#endif
+         text_size=prefix_size;
+         if (text ==  NULL)
+         {
+            text = (png_charp)png_malloc_warn(png_ptr, text_size+1);
+            if (text == NULL)
+              {
+                png_free(png_ptr, chunkdata);
+                png_error(png_ptr,"Not enough memory for text.");
+              }
+            png_memcpy(text, chunkdata, prefix_size);
+         }
+         *(text + text_size) = 0x00;
+      }
+
+      inflateReset(&png_ptr->zstream);
+      png_ptr->zstream.avail_in = 0;
+
+      png_free(png_ptr, chunkdata);
+      chunkdata = text;
+      *newlength=text_size;
+   }
+   else /* if (comp_type != PNG_COMPRESSION_TYPE_BASE) */
+   {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+      char umsg[50];
+
+      sprintf(umsg, "Unknown zTXt compression type %d", comp_type);
+      png_warning(png_ptr, umsg);
+#else
+      png_warning(png_ptr, "Unknown zTXt compression type");
+#endif
+
+      *(chunkdata + prefix_size) = 0x00;
+      *newlength=prefix_size;
+   }
+
+   return chunkdata;
+}
+#endif
+
+/* read and check the IDHR chunk */
+void /* PRIVATE */
+png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[13];
+   png_uint_32 width, height;
+   int bit_depth, color_type, compression_type, filter_type;
+   int interlace_type;
+
+   png_debug(1, "in png_handle_IHDR\n");
+
+   if (png_ptr->mode & PNG_HAVE_IHDR)
+      png_error(png_ptr, "Out of place IHDR");
+
+   /* check the length */
+   if (length != 13)
+      png_error(png_ptr, "Invalid IHDR chunk");
+
+   png_ptr->mode |= PNG_HAVE_IHDR;
+
+   png_crc_read(png_ptr, buf, 13);
+   png_crc_finish(png_ptr, 0);
+
+   width = png_get_uint_31(png_ptr, buf);
+   height = png_get_uint_31(png_ptr, buf + 4);
+   bit_depth = buf[8];
+   color_type = buf[9];
+   compression_type = buf[10];
+   filter_type = buf[11];
+   interlace_type = buf[12];
+
+   /* set internal variables */
+   png_ptr->width = width;
+   png_ptr->height = height;
+   png_ptr->bit_depth = (png_byte)bit_depth;
+   png_ptr->interlaced = (png_byte)interlace_type;
+   png_ptr->color_type = (png_byte)color_type;
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   png_ptr->filter_type = (png_byte)filter_type;
+#endif
+   png_ptr->compression_type = (png_byte)compression_type;
+
+   /* find number of channels */
+   switch (png_ptr->color_type)
+   {
+      case PNG_COLOR_TYPE_GRAY:
+      case PNG_COLOR_TYPE_PALETTE:
+         png_ptr->channels = 1;
+         break;
+      case PNG_COLOR_TYPE_RGB:
+         png_ptr->channels = 3;
+         break;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+         png_ptr->channels = 2;
+         break;
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+         png_ptr->channels = 4;
+         break;
+   }
+
+   /* set up other useful info */
+   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *
+   png_ptr->channels);
+   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width);
+   png_debug1(3,"bit_depth = %d\n", png_ptr->bit_depth);
+   png_debug1(3,"channels = %d\n", png_ptr->channels);
+   png_debug1(3,"rowbytes = %lu\n", png_ptr->rowbytes);
+   png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
+      color_type, interlace_type, compression_type, filter_type);
+}
+
+/* read and check the palette */
+void /* PRIVATE */
+png_handle_PLTE(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_color palette[PNG_MAX_PALETTE_LENGTH];
+   int num, i;
+#ifndef PNG_NO_POINTER_INDEXING
+   png_colorp pal_ptr;
+#endif
+
+   png_debug(1, "in png_handle_PLTE\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before PLTE");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid PLTE after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      png_error(png_ptr, "Duplicate PLTE chunk");
+
+   png_ptr->mode |= PNG_HAVE_PLTE;
+
+   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   {
+      png_warning(png_ptr,
+        "Ignoring PLTE chunk in grayscale PNG");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+#endif
+
+   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
+   {
+      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+      {
+         png_warning(png_ptr, "Invalid palette chunk");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      else
+      {
+         png_error(png_ptr, "Invalid palette chunk");
+      }
+   }
+
+   num = (int)length / 3;
+
+#ifndef PNG_NO_POINTER_INDEXING
+   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
+   {
+      png_byte buf[3];
+
+      png_crc_read(png_ptr, buf, 3);
+      pal_ptr->red = buf[0];
+      pal_ptr->green = buf[1];
+      pal_ptr->blue = buf[2];
+   }
+#else
+   for (i = 0; i < num; i++)
+   {
+      png_byte buf[3];
+
+      png_crc_read(png_ptr, buf, 3);
+      /* don't depend upon png_color being any order */
+      palette[i].red = buf[0];
+      palette[i].green = buf[1];
+      palette[i].blue = buf[2];
+   }
+#endif
+
+   /* If we actually NEED the PLTE chunk (ie for a paletted image), we do
+      whatever the normal CRC configuration tells us.  However, if we
+      have an RGB image, the PLTE can be considered ancillary, so
+      we will act as though it is. */
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+#endif
+   {
+      png_crc_finish(png_ptr, 0);
+   }
+#if !defined(PNG_READ_OPT_PLTE_SUPPORTED)
+   else if (png_crc_error(png_ptr))  /* Only if we have a CRC error */
+   {
+      /* If we don't want to use the data from an ancillary chunk,
+         we have two options: an error abort, or a warning and we
+         ignore the data in this chunk (which should be OK, since
+         it's considered ancillary for a RGB or RGBA image). */
+      if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
+      {
+         if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
+         {
+            png_chunk_error(png_ptr, "CRC error");
+         }
+         else
+         {
+            png_chunk_warning(png_ptr, "CRC error");
+            return;
+         }
+      }
+      /* Otherwise, we (optionally) emit a warning and use the chunk. */
+      else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
+      {
+         png_chunk_warning(png_ptr, "CRC error");
+      }
+   }
+#endif
+
+   png_set_PLTE(png_ptr, info_ptr, palette, num);
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+      {
+         if (png_ptr->num_trans > (png_uint_16)num)
+         {
+            png_warning(png_ptr, "Truncating incorrect tRNS chunk length");
+            png_ptr->num_trans = (png_uint_16)num;
+         }
+         if (info_ptr->num_trans > (png_uint_16)num)
+         {
+            png_warning(png_ptr, "Truncating incorrect info tRNS chunk length");
+            info_ptr->num_trans = (png_uint_16)num;
+         }
+      }
+   }
+#endif
+
+}
+
+void /* PRIVATE */
+png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_debug(1, "in png_handle_IEND\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
+   {
+      png_error(png_ptr, "No image in file");
+   }
+
+   png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
+
+   if (length != 0)
+   {
+      png_warning(png_ptr, "Incorrect IEND chunk length");
+   }
+   png_crc_finish(png_ptr, length);
+
+   if (&info_ptr == NULL) /* quiet compiler warnings about unused info_ptr */
+      return;
+}
+
+#if defined(PNG_READ_gAMA_SUPPORTED)
+void /* PRIVATE */
+png_handle_gAMA(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_fixed_point igamma;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float file_gamma;
+#endif
+   png_byte buf[4];
+
+   png_debug(1, "in png_handle_gAMA\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before gAMA");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid gAMA after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place gAMA chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+      )
+   {
+      png_warning(png_ptr, "Duplicate gAMA chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 4)
+   {
+      png_warning(png_ptr, "Incorrect gAMA chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 4);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   igamma = (png_fixed_point)png_get_uint_32(buf);
+   /* check for zero gamma */
+   if (igamma == 0)
+      {
+         png_warning(png_ptr,
+           "Ignoring gAMA chunk with gamma=0");
+         return;
+      }
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sRGB)
+      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
+      {
+         png_warning(png_ptr,
+           "Ignoring incorrect gAMA value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+         fprintf(stderr, "gamma = (%d/100000)\n", (int)igamma);
+#endif
+         return;
+      }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   file_gamma = (float)igamma / (float)100000.0;
+#  ifdef PNG_READ_GAMMA_SUPPORTED
+     png_ptr->gamma = file_gamma;
+#  endif
+     png_set_gAMA(png_ptr, info_ptr, file_gamma);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_gAMA_fixed(png_ptr, info_ptr, igamma);
+#endif
+}
+#endif
+
+#if defined(PNG_READ_sBIT_SUPPORTED)
+void /* PRIVATE */
+png_handle_sBIT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_size_t truelen;
+   png_byte buf[4];
+
+   png_debug(1, "in png_handle_sBIT\n");
+
+   buf[0] = buf[1] = buf[2] = buf[3] = 0;
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sBIT");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sBIT after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+   {
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place sBIT chunk");
+   }
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
+   {
+      png_warning(png_ptr, "Duplicate sBIT chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      truelen = 3;
+   else
+      truelen = (png_size_t)png_ptr->channels;
+
+   if (length != truelen || length > 4)
+   {
+      png_warning(png_ptr, "Incorrect sBIT chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, truelen);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_ptr->sig_bit.red = buf[0];
+      png_ptr->sig_bit.green = buf[1];
+      png_ptr->sig_bit.blue = buf[2];
+      png_ptr->sig_bit.alpha = buf[3];
+   }
+   else
+   {
+      png_ptr->sig_bit.gray = buf[0];
+      png_ptr->sig_bit.red = buf[0];
+      png_ptr->sig_bit.green = buf[0];
+      png_ptr->sig_bit.blue = buf[0];
+      png_ptr->sig_bit.alpha = buf[1];
+   }
+   png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
+}
+#endif
+
+#if defined(PNG_READ_cHRM_SUPPORTED)
+void /* PRIVATE */
+png_handle_cHRM(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[4];
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+#endif
+   png_fixed_point int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,
+      int_y_green, int_x_blue, int_y_blue;
+
+   png_uint_32 uint_x, uint_y;
+
+   png_debug(1, "in png_handle_cHRM\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before cHRM");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid cHRM after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Missing PLTE before cHRM");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
+#if defined(PNG_READ_sRGB_SUPPORTED)
+      && !(info_ptr->valid & PNG_INFO_sRGB)
+#endif
+      )
+   {
+      png_warning(png_ptr, "Duplicate cHRM chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 32)
+   {
+      png_warning(png_ptr, "Incorrect cHRM chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_x = png_get_uint_32(buf);
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_y = png_get_uint_32(buf);
+
+   if (uint_x > 80000L || uint_y > 80000L ||
+      uint_x + uint_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM white point");
+      png_crc_finish(png_ptr, 24);
+      return;
+   }
+   int_x_white = (png_fixed_point)uint_x;
+   int_y_white = (png_fixed_point)uint_y;
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_x = png_get_uint_32(buf);
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_y = png_get_uint_32(buf);
+
+   if (uint_x > 80000L || uint_y > 80000L ||
+      uint_x + uint_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM red point");
+      png_crc_finish(png_ptr, 16);
+      return;
+   }
+   int_x_red = (png_fixed_point)uint_x;
+   int_y_red = (png_fixed_point)uint_y;
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_x = png_get_uint_32(buf);
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_y = png_get_uint_32(buf);
+
+   if (uint_x > 80000L || uint_y > 80000L ||
+      uint_x + uint_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM green point");
+      png_crc_finish(png_ptr, 8);
+      return;
+   }
+   int_x_green = (png_fixed_point)uint_x;
+   int_y_green = (png_fixed_point)uint_y;
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_x = png_get_uint_32(buf);
+
+   png_crc_read(png_ptr, buf, 4);
+   uint_y = png_get_uint_32(buf);
+
+   if (uint_x > 80000L || uint_y > 80000L ||
+      uint_x + uint_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM blue point");
+      png_crc_finish(png_ptr, 0);
+      return;
+   }
+   int_x_blue = (png_fixed_point)uint_x;
+   int_y_blue = (png_fixed_point)uint_y;
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   white_x = (float)int_x_white / (float)100000.0;
+   white_y = (float)int_y_white / (float)100000.0;
+   red_x   = (float)int_x_red   / (float)100000.0;
+   red_y   = (float)int_y_red   / (float)100000.0;
+   green_x = (float)int_x_green / (float)100000.0;
+   green_y = (float)int_y_green / (float)100000.0;
+   blue_x  = (float)int_x_blue  / (float)100000.0;
+   blue_y  = (float)int_y_blue  / (float)100000.0;
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sRGB)
+      {
+      if (PNG_OUT_OF_RANGE(int_x_white, 31270,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_white, 32900,  1000) ||
+          PNG_OUT_OF_RANGE(int_x_red,   64000L, 1000) ||
+          PNG_OUT_OF_RANGE(int_y_red,   33000,  1000) ||
+          PNG_OUT_OF_RANGE(int_x_green, 30000,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_green, 60000L, 1000) ||
+          PNG_OUT_OF_RANGE(int_x_blue,  15000,  1000) ||
+          PNG_OUT_OF_RANGE(int_y_blue,   6000,  1000))
+         {
+
+            png_warning(png_ptr,
+              "Ignoring incorrect cHRM value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+            fprintf(stderr,"wx=%f, wy=%f, rx=%f, ry=%f\n",
+               white_x, white_y, red_x, red_y);
+            fprintf(stderr,"gx=%f, gy=%f, bx=%f, by=%f\n",
+               green_x, green_y, blue_x, blue_y);
+#else
+            fprintf(stderr,"wx=%ld, wy=%ld, rx=%ld, ry=%ld\n",
+               int_x_white, int_y_white, int_x_red, int_y_red);
+            fprintf(stderr,"gx=%ld, gy=%ld, bx=%ld, by=%ld\n",
+               int_x_green, int_y_green, int_x_blue, int_y_blue);
+#endif
+#endif /* PNG_NO_CONSOLE_IO */
+         }
+         png_crc_finish(png_ptr, 0);
+         return;
+      }
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   png_set_cHRM(png_ptr, info_ptr,
+      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_cHRM_fixed(png_ptr, info_ptr,
+      int_x_white, int_y_white, int_x_red, int_y_red, int_x_green,
+      int_y_green, int_x_blue, int_y_blue);
+#endif
+   if (png_crc_finish(png_ptr, 0))
+      return;
+}
+#endif
+
+#if defined(PNG_READ_sRGB_SUPPORTED)
+void /* PRIVATE */
+png_handle_sRGB(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   int intent;
+   png_byte buf[1];
+
+   png_debug(1, "in png_handle_sRGB\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sRGB");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sRGB after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place sRGB chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
+   {
+      png_warning(png_ptr, "Duplicate sRGB chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 1)
+   {
+      png_warning(png_ptr, "Incorrect sRGB chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 1);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   intent = buf[0];
+   /* check for bad intent */
+   if (intent >= PNG_sRGB_INTENT_LAST)
+   {
+      png_warning(png_ptr, "Unknown sRGB intent");
+      return;
+   }
+
+#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_READ_GAMMA_SUPPORTED)
+   if ((info_ptr->valid & PNG_INFO_gAMA))
+   {
+   png_fixed_point igamma;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      igamma=info_ptr->int_gamma;
+#else
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+      igamma=(png_fixed_point)(info_ptr->gamma * 100000.);
+#  endif
+#endif
+      if (PNG_OUT_OF_RANGE(igamma, 45500L, 500))
+      {
+         png_warning(png_ptr,
+           "Ignoring incorrect gAMA value when sRGB is also present");
+#ifndef PNG_NO_CONSOLE_IO
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+         fprintf(stderr,"incorrect gamma=(%d/100000)\n",(int)png_ptr->int_gamma);
+#  else
+#    ifdef PNG_FLOATING_POINT_SUPPORTED
+         fprintf(stderr,"incorrect gamma=%f\n",png_ptr->gamma);
+#    endif
+#  endif
+#endif
+      }
+   }
+#endif /* PNG_READ_gAMA_SUPPORTED */
+
+#ifdef PNG_READ_cHRM_SUPPORTED
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   if (info_ptr->valid & PNG_INFO_cHRM)
+      if (PNG_OUT_OF_RANGE(info_ptr->int_x_white, 31270,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_white, 32900,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_red,   64000L, 1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_red,   33000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_green, 30000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_green, 60000L, 1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_x_blue,  15000,  1000) ||
+          PNG_OUT_OF_RANGE(info_ptr->int_y_blue,   6000,  1000))
+         {
+            png_warning(png_ptr,
+              "Ignoring incorrect cHRM value when sRGB is also present");
+         }
+#endif /* PNG_FIXED_POINT_SUPPORTED */
+#endif /* PNG_READ_cHRM_SUPPORTED */
+
+   png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, intent);
+}
+#endif /* PNG_READ_sRGB_SUPPORTED */
+
+#if defined(PNG_READ_iCCP_SUPPORTED)
+void /* PRIVATE */
+png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+{
+   png_charp chunkdata;
+   png_byte compression_type;
+   png_bytep pC;
+   png_charp profile;
+   png_uint_32 skip = 0;
+   png_uint_32 profile_size, profile_length;
+   png_size_t slength, prefix_length, data_length;
+
+   png_debug(1, "in png_handle_iCCP\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before iCCP");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid iCCP after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->mode & PNG_HAVE_PLTE)
+      /* Should be an error, but we can cope with it */
+      png_warning(png_ptr, "Out of place iCCP chunk");
+
+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
+   {
+      png_warning(png_ptr, "Duplicate iCCP chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "iCCP chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   chunkdata = (png_charp)png_malloc(png_ptr, length + 1);
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   chunkdata[slength] = 0x00;
+
+   for (profile = chunkdata; *profile; profile++)
+      /* empty loop to find end of name */ ;
+
+   ++profile;
+
+   /* there should be at least one zero (the compression type byte)
+      following the separator, and we should be on it  */
+   if ( profile >= chunkdata + slength)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "Malformed iCCP chunk");
+      return;
+   }
+
+   /* compression_type should always be zero */
+   compression_type = *profile++;
+   if (compression_type)
+   {
+      png_warning(png_ptr, "Ignoring nonzero compression type in iCCP chunk");
+      compression_type=0x00;  /* Reset it to zero (libpng-1.0.6 through 1.0.8
+                                 wrote nonzero) */
+   }
+
+   prefix_length = profile - chunkdata;
+   chunkdata = png_decompress_chunk(png_ptr, compression_type, chunkdata,
+                                    slength, prefix_length, &data_length);
+
+   profile_length = data_length - prefix_length;
+
+   if ( prefix_length > data_length || profile_length < 4)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "Profile size field missing from iCCP chunk");
+      return;
+   }
+
+   /* Check the profile_size recorded in the first 32 bits of the ICC profile */
+   pC = (png_bytep)(chunkdata+prefix_length);
+   profile_size = ((*(pC  ))<<24) |
+                  ((*(pC+1))<<16) |
+                  ((*(pC+2))<< 8) |
+                  ((*(pC+3))    );
+
+   if(profile_size < profile_length)
+      profile_length = profile_size;
+
+   if(profile_size > profile_length)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "Ignoring truncated iCCP profile.\n");
+      return;
+   }
+
+   png_set_iCCP(png_ptr, info_ptr, chunkdata, compression_type,
+                chunkdata + prefix_length, profile_length);
+   png_free(png_ptr, chunkdata);
+}
+#endif /* PNG_READ_iCCP_SUPPORTED */
+
+#if defined(PNG_READ_sPLT_SUPPORTED)
+void /* PRIVATE */
+png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+{
+   png_bytep chunkdata;
+   png_bytep entry_start;
+   png_sPLT_t new_palette;
+#ifdef PNG_NO_POINTER_INDEXING
+   png_sPLT_entryp pp;
+#endif
+   int data_length, entry_size, i;
+   png_uint_32 skip = 0;
+   png_size_t slength;
+
+   png_debug(1, "in png_handle_sPLT\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sPLT");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sPLT after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "sPLT chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   chunkdata = (png_bytep)png_malloc(png_ptr, length + 1);
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   chunkdata[slength] = 0x00;
+
+   for (entry_start = chunkdata; *entry_start; entry_start++)
+      /* empty loop to find end of name */ ;
+   ++entry_start;
+
+   /* a sample depth should follow the separator, and we should be on it  */
+   if (entry_start > chunkdata + slength)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "malformed sPLT chunk");
+      return;
+   }
+
+   new_palette.depth = *entry_start++;
+   entry_size = (new_palette.depth == 8 ? 6 : 10);
+   data_length = (slength - (entry_start - chunkdata));
+
+   /* integrity-check the data length */
+   if (data_length % entry_size)
+   {
+      png_free(png_ptr, chunkdata);
+      png_warning(png_ptr, "sPLT chunk has bad length");
+      return;
+   }
+
+   new_palette.nentries = (png_uint_32) (data_length / entry_size);
+   if ((png_uint_32) new_palette.nentries > (png_uint_32) (PNG_SIZE_MAX /
+       png_sizeof(png_sPLT_entry)))
+   {
+       png_warning(png_ptr, "sPLT chunk too long");
+       return;
+   }
+   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
+       png_ptr, new_palette.nentries * png_sizeof(png_sPLT_entry));
+   if (new_palette.entries == NULL)
+   {
+       png_warning(png_ptr, "sPLT chunk requires too much memory");
+       return;
+   }
+
+#ifndef PNG_NO_POINTER_INDEXING
+   for (i = 0; i < new_palette.nentries; i++)
+   {
+      png_sPLT_entryp pp = new_palette.entries + i;
+
+      if (new_palette.depth == 8)
+      {
+          pp->red = *entry_start++;
+          pp->green = *entry_start++;
+          pp->blue = *entry_start++;
+          pp->alpha = *entry_start++;
+      }
+      else
+      {
+          pp->red   = png_get_uint_16(entry_start); entry_start += 2;
+          pp->green = png_get_uint_16(entry_start); entry_start += 2;
+          pp->blue  = png_get_uint_16(entry_start); entry_start += 2;
+          pp->alpha = png_get_uint_16(entry_start); entry_start += 2;
+      }
+      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
+   }
+#else
+   pp = new_palette.entries;
+   for (i = 0; i < new_palette.nentries; i++)
+   {
+
+      if (new_palette.depth == 8)
+      {
+          pp[i].red   = *entry_start++;
+          pp[i].green = *entry_start++;
+          pp[i].blue  = *entry_start++;
+          pp[i].alpha = *entry_start++;
+      }
+      else
+      {
+          pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
+          pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
+      }
+      pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
+   }
+#endif
+
+   /* discard all chunk data except the name and stash that */
+   new_palette.name = (png_charp)chunkdata;
+
+   png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
+
+   png_free(png_ptr, chunkdata);
+   png_free(png_ptr, new_palette.entries);
+}
+#endif /* PNG_READ_sPLT_SUPPORTED */
+
+#if defined(PNG_READ_tRNS_SUPPORTED)
+void /* PRIVATE */
+png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
+
+   png_debug(1, "in png_handle_tRNS\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before tRNS");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid tRNS after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+   {
+      png_warning(png_ptr, "Duplicate tRNS chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      png_byte buf[2];
+
+      if (length != 2)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+
+      png_crc_read(png_ptr, buf, 2);
+      png_ptr->num_trans = 1;
+      png_ptr->trans_values.gray = png_get_uint_16(buf);
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      png_byte buf[6];
+
+      if (length != 6)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      png_crc_read(png_ptr, buf, (png_size_t)length);
+      png_ptr->num_trans = 1;
+      png_ptr->trans_values.red = png_get_uint_16(buf);
+      png_ptr->trans_values.green = png_get_uint_16(buf + 2);
+      png_ptr->trans_values.blue = png_get_uint_16(buf + 4);
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (!(png_ptr->mode & PNG_HAVE_PLTE))
+      {
+         /* Should be an error, but we can cope with it. */
+         png_warning(png_ptr, "Missing PLTE before tRNS");
+      }
+      if (length > (png_uint_32)png_ptr->num_palette ||
+          length > PNG_MAX_PALETTE_LENGTH)
+      {
+         png_warning(png_ptr, "Incorrect tRNS chunk length");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      if (length == 0)
+      {
+         png_warning(png_ptr, "Zero length tRNS chunk");
+         png_crc_finish(png_ptr, length);
+         return;
+      }
+      png_crc_read(png_ptr, readbuf, (png_size_t)length);
+      png_ptr->num_trans = (png_uint_16)length;
+   }
+   else
+   {
+      png_warning(png_ptr, "tRNS chunk not allowed with alpha channel");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
+      &(png_ptr->trans_values));
+}
+#endif
+
+#if defined(PNG_READ_bKGD_SUPPORTED)
+void /* PRIVATE */
+png_handle_bKGD(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_size_t truelen;
+   png_byte buf[6];
+
+   png_debug(1, "in png_handle_bKGD\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before bKGD");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid bKGD after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+            !(png_ptr->mode & PNG_HAVE_PLTE))
+   {
+      png_warning(png_ptr, "Missing PLTE before bKGD");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
+   {
+      png_warning(png_ptr, "Duplicate bKGD chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      truelen = 1;
+   else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      truelen = 6;
+   else
+      truelen = 2;
+
+   if (length != truelen)
+   {
+      png_warning(png_ptr, "Incorrect bKGD chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, truelen);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   /* We convert the index value into RGB components so that we can allow
+    * arbitrary RGB values for background when we have transparency, and
+    * so it is easy to determine the RGB values of the background color
+    * from the info_ptr struct. */
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      png_ptr->background.index = buf[0];
+      if(info_ptr->num_palette)
+      {
+          if(buf[0] > info_ptr->num_palette)
+          {
+             png_warning(png_ptr, "Incorrect bKGD chunk index value");
+             return;
+          }
+          png_ptr->background.red =
+             (png_uint_16)png_ptr->palette[buf[0]].red;
+          png_ptr->background.green =
+             (png_uint_16)png_ptr->palette[buf[0]].green;
+          png_ptr->background.blue =
+             (png_uint_16)png_ptr->palette[buf[0]].blue;
+      }
+   }
+   else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
+   {
+      png_ptr->background.red =
+      png_ptr->background.green =
+      png_ptr->background.blue =
+      png_ptr->background.gray = png_get_uint_16(buf);
+   }
+   else
+   {
+      png_ptr->background.red = png_get_uint_16(buf);
+      png_ptr->background.green = png_get_uint_16(buf + 2);
+      png_ptr->background.blue = png_get_uint_16(buf + 4);
+   }
+
+   png_set_bKGD(png_ptr, info_ptr, &(png_ptr->background));
+}
+#endif
+
+#if defined(PNG_READ_hIST_SUPPORTED)
+void /* PRIVATE */
+png_handle_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   unsigned int num, i;
+   png_uint_16 readbuf[PNG_MAX_PALETTE_LENGTH];
+
+   png_debug(1, "in png_handle_hIST\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before hIST");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid hIST after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (!(png_ptr->mode & PNG_HAVE_PLTE))
+   {
+      png_warning(png_ptr, "Missing PLTE before hIST");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
+   {
+      png_warning(png_ptr, "Duplicate hIST chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   num = length / 2 ;
+   if (num != (unsigned int) png_ptr->num_palette || num >
+      (unsigned int) PNG_MAX_PALETTE_LENGTH)
+   {
+      png_warning(png_ptr, "Incorrect hIST chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   for (i = 0; i < num; i++)
+   {
+      png_byte buf[2];
+
+      png_crc_read(png_ptr, buf, 2);
+      readbuf[i] = png_get_uint_16(buf);
+   }
+
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   png_set_hIST(png_ptr, info_ptr, readbuf);
+}
+#endif
+
+#if defined(PNG_READ_pHYs_SUPPORTED)
+void /* PRIVATE */
+png_handle_pHYs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[9];
+   png_uint_32 res_x, res_y;
+   int unit_type;
+
+   png_debug(1, "in png_handle_pHYs\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before pHYs");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid pHYs after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+   {
+      png_warning(png_ptr, "Duplicate pHYs chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 9)
+   {
+      png_warning(png_ptr, "Incorrect pHYs chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 9);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   res_x = png_get_uint_32(buf);
+   res_y = png_get_uint_32(buf + 4);
+   unit_type = buf[8];
+   png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
+}
+#endif
+
+#if defined(PNG_READ_oFFs_SUPPORTED)
+void /* PRIVATE */
+png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[9];
+   png_int_32 offset_x, offset_y;
+   int unit_type;
+
+   png_debug(1, "in png_handle_oFFs\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before oFFs");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid oFFs after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+   {
+      png_warning(png_ptr, "Duplicate oFFs chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (length != 9)
+   {
+      png_warning(png_ptr, "Incorrect oFFs chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 9);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   offset_x = png_get_int_32(buf);
+   offset_y = png_get_int_32(buf + 4);
+   unit_type = buf[8];
+   png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
+}
+#endif
+
+#if defined(PNG_READ_pCAL_SUPPORTED)
+/* read the pCAL chunk (described in the PNG Extensions document) */
+void /* PRIVATE */
+png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_charp purpose;
+   png_int_32 X0, X1;
+   png_byte type, nparams;
+   png_charp buf, units, endptr;
+   png_charpp params;
+   png_size_t slength;
+   int i;
+
+   png_debug(1, "in png_handle_pCAL\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before pCAL");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid pCAL after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
+   {
+      png_warning(png_ptr, "Duplicate pCAL chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_debug1(2, "Allocating and reading pCAL chunk data (%lu bytes)\n",
+      length + 1);
+   purpose = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (purpose == NULL)
+     {
+       png_warning(png_ptr, "No memory for pCAL purpose.");
+       return;
+     }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)purpose, slength);
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, purpose);
+      return;
+   }
+
+   purpose[slength] = 0x00; /* null terminate the last string */
+
+   png_debug(3, "Finding end of pCAL purpose string\n");
+   for (buf = purpose; *buf; buf++)
+      /* empty loop */ ;
+
+   endptr = purpose + slength;
+
+   /* We need to have at least 12 bytes after the purpose string
+      in order to get the parameter information. */
+   if (endptr <= buf + 12)
+   {
+      png_warning(png_ptr, "Invalid pCAL data");
+      png_free(png_ptr, purpose);
+      return;
+   }
+
+   png_debug(3, "Reading pCAL X0, X1, type, nparams, and units\n");
+   X0 = png_get_int_32((png_bytep)buf+1);
+   X1 = png_get_int_32((png_bytep)buf+5);
+   type = buf[9];
+   nparams = buf[10];
+   units = buf + 11;
+
+   png_debug(3, "Checking pCAL equation type and number of parameters\n");
+   /* Check that we have the right number of parameters for known
+      equation types. */
+   if ((type == PNG_EQUATION_LINEAR && nparams != 2) ||
+       (type == PNG_EQUATION_BASE_E && nparams != 3) ||
+       (type == PNG_EQUATION_ARBITRARY && nparams != 3) ||
+       (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
+   {
+      png_warning(png_ptr, "Invalid pCAL parameters for equation type");
+      png_free(png_ptr, purpose);
+      return;
+   }
+   else if (type >= PNG_EQUATION_LAST)
+   {
+      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+   }
+
+   for (buf = units; *buf; buf++)
+      /* Empty loop to move past the units string. */ ;
+
+   png_debug(3, "Allocating pCAL parameters array\n");
+   params = (png_charpp)png_malloc_warn(png_ptr, (png_uint_32)(nparams
+      *png_sizeof(png_charp))) ;
+   if (params == NULL)
+     {
+       png_free(png_ptr, purpose);
+       png_warning(png_ptr, "No memory for pCAL params.");
+       return;
+     }
+
+   /* Get pointers to the start of each parameter string. */
+   for (i = 0; i < (int)nparams; i++)
+   {
+      buf++; /* Skip the null string terminator from previous parameter. */
+
+      png_debug1(3, "Reading pCAL parameter %d\n", i);
+      for (params[i] = buf; *buf != 0x00 && buf <= endptr; buf++)
+         /* Empty loop to move past each parameter string */ ;
+
+      /* Make sure we haven't run out of data yet */
+      if (buf > endptr)
+      {
+         png_warning(png_ptr, "Invalid pCAL data");
+         png_free(png_ptr, purpose);
+         png_free(png_ptr, params);
+         return;
+      }
+   }
+
+   png_set_pCAL(png_ptr, info_ptr, purpose, X0, X1, type, nparams,
+      units, params);
+
+   png_free(png_ptr, purpose);
+   png_free(png_ptr, params);
+}
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED)
+/* read the sCAL chunk */
+void /* PRIVATE */
+png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_charp buffer, ep;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   double width, height;
+   png_charp vp;
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_charp swidth, sheight;
+#endif
+#endif
+   png_size_t slength;
+
+   png_debug(1, "in png_handle_sCAL\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before sCAL");
+   else if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+      png_warning(png_ptr, "Invalid sCAL after IDAT");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
+   {
+      png_warning(png_ptr, "Duplicate sCAL chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)\n",
+      length + 1);
+   buffer = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (buffer == NULL)
+     {
+       png_warning(png_ptr, "Out of memory while processing sCAL chunk");
+       return;
+     }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)buffer, slength);
+
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, buffer);
+      return;
+   }
+
+   buffer[slength] = 0x00; /* null terminate the last string */
+
+   ep = buffer + 1;        /* skip unit byte */
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   width = strtod(ep, &vp);
+   if (*vp)
+   {
+       png_warning(png_ptr, "malformed width string in sCAL chunk");
+       return;
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   swidth = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);
+   if (swidth == NULL)
+     {
+       png_warning(png_ptr, "Out of memory while processing sCAL chunk width");
+       return;
+     }
+   png_memcpy(swidth, ep, (png_size_t)png_strlen(ep));
+#endif
+#endif
+
+   for (ep = buffer; *ep; ep++)
+      /* empty loop */ ;
+   ep++;
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   height = strtod(ep, &vp);
+   if (*vp)
+   {
+       png_warning(png_ptr, "malformed height string in sCAL chunk");
+       return;
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   sheight = (png_charp)png_malloc_warn(png_ptr, png_strlen(ep) + 1);
+   if (swidth == NULL)
+     {
+       png_warning(png_ptr, "Out of memory while processing sCAL chunk height");
+       return;
+     }
+   png_memcpy(sheight, ep, (png_size_t)png_strlen(ep));
+#endif
+#endif
+
+   if (buffer + slength < ep
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      || width <= 0. || height <= 0.
+#endif
+      )
+   {
+      png_warning(png_ptr, "Invalid sCAL data");
+      png_free(png_ptr, buffer);
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+      png_free(png_ptr, swidth);
+      png_free(png_ptr, sheight);
+#endif
+      return;
+   }
+
+
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   png_set_sCAL(png_ptr, info_ptr, buffer[0], width, height);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_set_sCAL_s(png_ptr, info_ptr, buffer[0], swidth, sheight);
+#endif
+#endif
+
+   png_free(png_ptr, buffer);
+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)
+   png_free(png_ptr, swidth);
+   png_free(png_ptr, sheight);
+#endif
+}
+#endif
+
+#if defined(PNG_READ_tIME_SUPPORTED)
+void /* PRIVATE */
+png_handle_tIME(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_byte buf[7];
+   png_time mod_time;
+
+   png_debug(1, "in png_handle_tIME\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Out of place tIME chunk");
+   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
+   {
+      png_warning(png_ptr, "Duplicate tIME chunk");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+   if (length != 7)
+   {
+      png_warning(png_ptr, "Incorrect tIME chunk length");
+      png_crc_finish(png_ptr, length);
+      return;
+   }
+
+   png_crc_read(png_ptr, buf, 7);
+   if (png_crc_finish(png_ptr, 0))
+      return;
+
+   mod_time.second = buf[6];
+   mod_time.minute = buf[5];
+   mod_time.hour = buf[4];
+   mod_time.day = buf[3];
+   mod_time.month = buf[2];
+   mod_time.year = png_get_uint_16(buf);
+
+   png_set_tIME(png_ptr, info_ptr, &mod_time);
+}
+#endif
+
+#if defined(PNG_READ_tEXt_SUPPORTED)
+/* Note: this does not properly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp key;
+   png_charp text;
+   png_uint_32 skip = 0;
+   png_size_t slength;
+   int ret;
+
+   png_debug(1, "in png_handle_tEXt\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before tEXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   if (length > (png_uint_32)65535L)
+   {
+      png_warning(png_ptr, "tEXt chunk too large to fit in memory");
+      skip = length - (png_uint_32)65535L;
+      length = (png_uint_32)65535L;
+   }
+#endif
+
+   key = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (key == NULL)
+   {
+     png_warning(png_ptr, "No memory to process text chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)key, slength);
+
+   if (png_crc_finish(png_ptr, skip))
+   {
+      png_free(png_ptr, key);
+      return;
+   }
+
+   key[slength] = 0x00;
+
+   for (text = key; *text; text++)
+      /* empty loop to find end of key */ ;
+
+   if (text != key + slength)
+      text++;
+
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr, "Not enough memory to process text chunk.");
+     png_free(png_ptr, key);
+     return;
+   }
+   text_ptr->compression = PNG_TEXT_COMPRESSION_NONE;
+   text_ptr->key = key;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr->lang = NULL;
+   text_ptr->lang_key = NULL;
+   text_ptr->itxt_length = 0;
+#endif
+   text_ptr->text = text;
+   text_ptr->text_length = png_strlen(text);
+
+   ret=png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, key);
+   png_free(png_ptr, text_ptr);
+   if (ret)
+     png_warning(png_ptr, "Insufficient memory to process text chunk.");
+}
+#endif
+
+#if defined(PNG_READ_zTXt_SUPPORTED)
+/* note: this does not correctly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp chunkdata;
+   png_charp text;
+   int comp_type;
+   int ret;
+   png_size_t slength, prefix_len, data_len;
+
+   png_debug(1, "in png_handle_zTXt\n");
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before zTXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We will no doubt have problems with chunks even half this size, but
+      there is no hard and fast rule to tell us where to stop. */
+   if (length > (png_uint_32)65535L)
+   {
+     png_warning(png_ptr,"zTXt chunk too large to fit in memory");
+     png_crc_finish(png_ptr, length);
+     return;
+   }
+#endif
+
+   chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (chunkdata == NULL)
+   {
+     png_warning(png_ptr,"Out of memory processing zTXt chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   chunkdata[slength] = 0x00;
+
+   for (text = chunkdata; *text; text++)
+      /* empty loop */ ;
+
+   /* zTXt must have some text after the chunkdataword */
+   if (text == chunkdata + slength)
+   {
+      comp_type = PNG_TEXT_COMPRESSION_NONE;
+      png_warning(png_ptr, "Zero length zTXt chunk");
+   }
+   else
+   {
+       comp_type = *(++text);
+       if (comp_type != PNG_TEXT_COMPRESSION_zTXt)
+       {
+          png_warning(png_ptr, "Unknown compression type in zTXt chunk");
+          comp_type = PNG_TEXT_COMPRESSION_zTXt;
+       }
+       text++;        /* skip the compression_method byte */
+   }
+   prefix_len = text - chunkdata;
+
+   chunkdata = (png_charp)png_decompress_chunk(png_ptr, comp_type, chunkdata,
+                                    (png_size_t)length, prefix_len, &data_len);
+
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+     (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr,"Not enough memory to process zTXt chunk.");
+     png_free(png_ptr, chunkdata);
+     return;
+   }
+   text_ptr->compression = comp_type;
+   text_ptr->key = chunkdata;
+#ifdef PNG_iTXt_SUPPORTED
+   text_ptr->lang = NULL;
+   text_ptr->lang_key = NULL;
+   text_ptr->itxt_length = 0;
+#endif
+   text_ptr->text = chunkdata + prefix_len;
+   text_ptr->text_length = data_len;
+
+   ret=png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, text_ptr);
+   png_free(png_ptr, chunkdata);
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store zTXt chunk.");
+}
+#endif
+
+#if defined(PNG_READ_iTXt_SUPPORTED)
+/* note: this does not correctly handle chunks that are > 64K under DOS */
+void /* PRIVATE */
+png_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_textp text_ptr;
+   png_charp chunkdata;
+   png_charp key, lang, text, lang_key;
+   int comp_flag;
+   int comp_type = 0;
+   int ret;
+   png_size_t slength, prefix_len, data_len;
+
+   png_debug(1, "in png_handle_iTXt\n");
+
+   if (!(png_ptr->mode & PNG_HAVE_IHDR))
+      png_error(png_ptr, "Missing IHDR before iTXt");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+      png_ptr->mode |= PNG_AFTER_IDAT;
+
+#ifdef PNG_MAX_MALLOC_64K
+   /* We will no doubt have problems with chunks even half this size, but
+      there is no hard and fast rule to tell us where to stop. */
+   if (length > (png_uint_32)65535L)
+   {
+     png_warning(png_ptr,"iTXt chunk too large to fit in memory");
+     png_crc_finish(png_ptr, length);
+     return;
+   }
+#endif
+
+   chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1);
+   if (chunkdata == NULL)
+   {
+     png_warning(png_ptr, "No memory to process iTXt chunk.");
+     return;
+   }
+   slength = (png_size_t)length;
+   png_crc_read(png_ptr, (png_bytep)chunkdata, slength);
+   if (png_crc_finish(png_ptr, 0))
+   {
+      png_free(png_ptr, chunkdata);
+      return;
+   }
+
+   chunkdata[slength] = 0x00;
+
+   for (lang = chunkdata; *lang; lang++)
+      /* empty loop */ ;
+   lang++;        /* skip NUL separator */
+
+   /* iTXt must have a language tag (possibly empty), two compression bytes,
+      translated keyword (possibly empty), and possibly some text after the
+      keyword */
+
+   if (lang >= chunkdata + slength)
+   {
+      comp_flag = PNG_TEXT_COMPRESSION_NONE;
+      png_warning(png_ptr, "Zero length iTXt chunk");
+   }
+   else
+   {
+       comp_flag = *lang++;
+       comp_type = *lang++;
+   }
+
+   for (lang_key = lang; *lang_key; lang_key++)
+      /* empty loop */ ;
+   lang_key++;        /* skip NUL separator */
+
+   for (text = lang_key; *text; text++)
+      /* empty loop */ ;
+   text++;        /* skip NUL separator */
+
+   prefix_len = text - chunkdata;
+
+   key=chunkdata;
+   if (comp_flag)
+       chunkdata = png_decompress_chunk(png_ptr, comp_type, chunkdata,
+          (size_t)length, prefix_len, &data_len);
+   else
+       data_len=png_strlen(chunkdata + prefix_len);
+   text_ptr = (png_textp)png_malloc_warn(png_ptr,
+      (png_uint_32)png_sizeof(png_text));
+   if (text_ptr == NULL)
+   {
+     png_warning(png_ptr,"Not enough memory to process iTXt chunk.");
+     png_free(png_ptr, chunkdata);
+     return;
+   }
+   text_ptr->compression = (int)comp_flag + 1;
+   text_ptr->lang_key = chunkdata+(lang_key-key);
+   text_ptr->lang = chunkdata+(lang-key);
+   text_ptr->itxt_length = data_len;
+   text_ptr->text_length = 0;
+   text_ptr->key = chunkdata;
+   text_ptr->text = chunkdata + prefix_len;
+
+   ret=png_set_text_2(png_ptr, info_ptr, text_ptr, 1);
+
+   png_free(png_ptr, text_ptr);
+   png_free(png_ptr, chunkdata);
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store iTXt chunk.");
+}
+#endif
+
+/* This function is called when we haven't found a handler for a
+   chunk.  If there isn't a problem with the chunk itself (ie bad
+   chunk name, CRC, or a critical chunk), the chunk is silently ignored
+   -- unless the PNG_FLAG_UNKNOWN_CHUNKS_SUPPORTED flag is on in which
+   case it will be saved away to be written out later. */
+void /* PRIVATE */
+png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
+{
+   png_uint_32 skip = 0;
+
+   png_debug(1, "in png_handle_unknown\n");
+
+   if (png_ptr->mode & PNG_HAVE_IDAT)
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_IDAT;
+#endif
+      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))  /* not an IDAT */
+         png_ptr->mode |= PNG_AFTER_IDAT;
+   }
+
+   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+
+   if (!(png_ptr->chunk_name[0] & 0x20))
+   {
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+      if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+           PNG_HANDLE_CHUNK_ALWAYS
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+           && png_ptr->read_user_chunk_fn == NULL
+#endif
+        )
+#endif
+          png_chunk_error(png_ptr, "unknown critical chunk");
+   }
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
+   {
+       png_unknown_chunk chunk;
+
+#ifdef PNG_MAX_MALLOC_64K
+       if (length > (png_uint_32)65535L)
+       {
+           png_warning(png_ptr, "unknown chunk too large to fit in memory");
+           skip = length - (png_uint_32)65535L;
+           length = (png_uint_32)65535L;
+       }
+#endif
+       png_strcpy((png_charp)chunk.name, (png_charp)png_ptr->chunk_name);
+       chunk.data = (png_bytep)png_malloc(png_ptr, length);
+       chunk.size = (png_size_t)length;
+       png_crc_read(png_ptr, (png_bytep)chunk.data, length);
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+       if(png_ptr->read_user_chunk_fn != NULL)
+       {
+          /* callback to user unknown chunk handler */
+          if ((*(png_ptr->read_user_chunk_fn)) (png_ptr, &chunk) <= 0)
+          {
+             if (!(png_ptr->chunk_name[0] & 0x20))
+                if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
+                     PNG_HANDLE_CHUNK_ALWAYS)
+                 {
+                   png_free(png_ptr, chunk.data);
+                   png_chunk_error(png_ptr, "unknown critical chunk");
+                 }
+             png_set_unknown_chunks(png_ptr, info_ptr, &chunk, 1);
+          }
+       }
+       else
+#endif
+          png_set_unknown_chunks(png_ptr, info_ptr, &chunk, 1);
+       png_free(png_ptr, chunk.data);
+   }
+   else
+#endif
+      skip = length;
+
+   png_crc_finish(png_ptr, skip);
+
+#if !defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+   if (&info_ptr == NULL) /* quiet compiler warnings about unused info_ptr */
+      return;
+#endif
+}
+
+/* This function is called to verify that a chunk name is valid.
+   This function can't have the "critical chunk check" incorporated
+   into it, since in the future we will need to be able to call user
+   functions to handle unknown critical chunks after we check that
+   the chunk name itself is valid. */
+
+#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+
+void /* PRIVATE */
+png_check_chunk_name(png_structp png_ptr, png_bytep chunk_name)
+{
+   png_debug(1, "in png_check_chunk_name\n");
+   if (isnonalpha(chunk_name[0]) || isnonalpha(chunk_name[1]) ||
+       isnonalpha(chunk_name[2]) || isnonalpha(chunk_name[3]))
+   {
+      png_chunk_error(png_ptr, "invalid chunk type");
+   }
+}
+
+/* Combines the row recently read in with the existing pixels in the
+   row.  This routine takes care of alpha and transparency if requested.
+   This routine also handles the two methods of progressive display
+   of interlaced images, depending on the mask value.
+   The mask value describes which pixels are to be combined with
+   the row.  The pattern always repeats every 8 pixels, so just 8
+   bits are needed.  A one indicates the pixel is to be combined,
+   a zero indicates the pixel is to be skipped.  This is in addition
+   to any alpha or transparency value associated with the pixel.  If
+   you want all pixels to be combined, pass 0xff (255) in mask.  */
+#ifndef PNG_HAVE_ASSEMBLER_COMBINE_ROW
+void /* PRIVATE */
+png_combine_row(png_structp png_ptr, png_bytep row, int mask)
+{
+   png_debug(1,"in png_combine_row\n");
+   if (mask == 0xff)
+   {
+      png_memcpy(row, png_ptr->row_buf + 1,
+         PNG_ROWBYTES(png_ptr->row_info.pixel_depth, png_ptr->width));
+   }
+   else
+   {
+      switch (png_ptr->row_info.pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_inc, s_start, s_end;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+            else
+#endif
+            {
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  int value;
+
+                  value = (*sp >> shift) & 0x01;
+                  *dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_start, s_end, s_inc;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            int value;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+            else
+#endif
+            {
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0x03;
+                  *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            int s_start, s_end, s_inc;
+            int m = 0x80;
+            int shift;
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            int value;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+            else
+#endif
+            {
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            shift = s_start;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0xf;
+                  *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+         default:
+         {
+            png_bytep sp = png_ptr->row_buf + 1;
+            png_bytep dp = row;
+            png_size_t pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+            png_uint_32 i;
+            png_uint_32 row_width = png_ptr->width;
+            png_byte m = 0x80;
+
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (m & mask)
+               {
+                  png_memcpy(dp, sp, pixel_bytes);
+               }
+
+               sp += pixel_bytes;
+               dp += pixel_bytes;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+      }
+   }
+}
+#endif /* !PNG_HAVE_ASSEMBLER_COMBINE_ROW */
+
+#ifdef PNG_READ_INTERLACING_SUPPORTED
+#ifndef PNG_HAVE_ASSEMBLER_READ_INTERLACE   /* else in pngvcrd.c, pnggccrd.c */
+/* OLD pre-1.0.9 interface:
+void png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
+   png_uint_32 transformations)
+ */
+void /* PRIVATE */
+png_do_read_interlace(png_structp png_ptr)
+{
+   png_row_infop row_info = &(png_ptr->row_info);
+   png_bytep row = png_ptr->row_buf + 1;
+   int pass = png_ptr->pass;
+   png_uint_32 transformations = png_ptr->transformations;
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+   /* offset to next interlace block */
+   const int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+#endif
+
+   png_debug(1,"in png_do_read_interlace (stock C version)\n");
+   if (row != NULL && row_info != NULL)
+   {
+      png_uint_32 final_width;
+
+      final_width = row_info->width * png_pass_inc[pass];
+
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 3);
+            png_bytep dp = row + (png_size_t)((final_width - 1) >> 3);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            int jstop = png_pass_inc[pass];
+            png_byte v;
+            png_uint_32 i;
+            int j;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+                sshift = (int)((row_info->width + 7) & 0x07);
+                dshift = (int)((final_width + 7) & 0x07);
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+            else
+#endif
+            {
+                sshift = 7 - (int)((row_info->width + 7) & 0x07);
+                dshift = 7 - (int)((final_width + 7) & 0x07);
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               v = (png_byte)((*sp >> sshift) & 0x01);
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp = row + (png_uint_32)((row_info->width - 1) >> 2);
+            png_bytep dp = row + (png_uint_32)((final_width - 1) >> 2);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            int jstop = png_pass_inc[pass];
+            png_uint_32 i;
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)(((row_info->width + 3) & 0x03) << 1);
+               dshift = (int)(((final_width + 3) & 0x03) << 1);
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+            else
+#endif
+            {
+               sshift = (int)((3 - ((row_info->width + 3) & 0x03)) << 1);
+               dshift = (int)((3 - ((final_width + 3) & 0x03)) << 1);
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v;
+               int j;
+
+               v = (png_byte)((*sp >> sshift) & 0x03);
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp = row + (png_size_t)((row_info->width - 1) >> 1);
+            png_bytep dp = row + (png_size_t)((final_width - 1) >> 1);
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_uint_32 i;
+            int jstop = png_pass_inc[pass];
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)(((row_info->width + 1) & 0x01) << 2);
+               dshift = (int)(((final_width + 1) & 0x01) << 2);
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            else
+#endif
+            {
+               sshift = (int)((1 - ((row_info->width + 1) & 0x01)) << 2);
+               dshift = (int)((1 - ((final_width + 1) & 0x01)) << 2);
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v = (png_byte)((*sp >> sshift) & 0xf);
+               int j;
+
+               for (j = 0; j < jstop; j++)
+               {
+                  *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+         default:
+         {
+            png_size_t pixel_bytes = (row_info->pixel_depth >> 3);
+            png_bytep sp = row + (png_size_t)(row_info->width - 1) * pixel_bytes;
+            png_bytep dp = row + (png_size_t)(final_width - 1) * pixel_bytes;
+
+            int jstop = png_pass_inc[pass];
+            png_uint_32 i;
+
+            for (i = 0; i < row_info->width; i++)
+            {
+               png_byte v[8];
+               int j;
+
+               png_memcpy(v, sp, pixel_bytes);
+               for (j = 0; j < jstop; j++)
+               {
+                  png_memcpy(dp, v, pixel_bytes);
+                  dp -= pixel_bytes;
+               }
+               sp -= pixel_bytes;
+            }
+            break;
+         }
+      }
+      row_info->width = final_width;
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,final_width);
+   }
+#if !defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (&transformations == NULL) /* silence compiler warning */
+      return;
+#endif
+}
+#endif /* !PNG_HAVE_ASSEMBLER_READ_INTERLACE */
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+
+#ifndef PNG_HAVE_ASSEMBLER_READ_FILTER_ROW
+void /* PRIVATE */
+png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row,
+   png_bytep prev_row, int filter)
+{
+   png_debug(1, "in png_read_filter_row\n");
+   png_debug2(2,"row = %lu, filter = %d\n", png_ptr->row_number, filter);
+   switch (filter)
+   {
+      case PNG_FILTER_VALUE_NONE:
+         break;
+      case PNG_FILTER_VALUE_SUB:
+      {
+         png_uint_32 i;
+         png_uint_32 istop = row_info->rowbytes;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_bytep rp = row + bpp;
+         png_bytep lp = row;
+
+         for (i = bpp; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_UP:
+      {
+         png_uint_32 i;
+         png_uint_32 istop = row_info->rowbytes;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+
+         for (i = 0; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_AVG:
+      {
+         png_uint_32 i;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+         png_bytep lp = row;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_uint_32 istop = row_info->rowbytes - bpp;
+
+         for (i = 0; i < bpp; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) +
+               ((int)(*pp++) / 2 )) & 0xff);
+            rp++;
+         }
+
+         for (i = 0; i < istop; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) +
+               (int)(*pp++ + *lp++) / 2 ) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      case PNG_FILTER_VALUE_PAETH:
+      {
+         png_uint_32 i;
+         png_bytep rp = row;
+         png_bytep pp = prev_row;
+         png_bytep lp = row;
+         png_bytep cp = prev_row;
+         png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+         png_uint_32 istop=row_info->rowbytes - bpp;
+
+         for (i = 0; i < bpp; i++)
+         {
+            *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+            rp++;
+         }
+
+         for (i = 0; i < istop; i++)   /* use leftover rp,pp */
+         {
+            int a, b, c, pa, pb, pc, p;
+
+            a = *lp++;
+            b = *pp++;
+            c = *cp++;
+
+            p = b - c;
+            pc = a - c;
+
+#ifdef PNG_USE_ABS
+            pa = abs(p);
+            pb = abs(pc);
+            pc = abs(p + pc);
+#else
+            pa = p < 0 ? -p : p;
+            pb = pc < 0 ? -pc : pc;
+            pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+            /*
+               if (pa <= pb && pa <= pc)
+                  p = a;
+               else if (pb <= pc)
+                  p = b;
+               else
+                  p = c;
+             */
+
+            p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+            *rp = (png_byte)(((int)(*rp) + p) & 0xff);
+            rp++;
+         }
+         break;
+      }
+      default:
+         png_warning(png_ptr, "Ignoring bad adaptive filter type");
+         *row=0;
+         break;
+   }
+}
+#endif /* !PNG_HAVE_ASSEMBLER_READ_FILTER_ROW */
+
+void /* PRIVATE */
+png_read_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   const int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   const int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   const int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   const int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+
+   png_debug(1, "in png_read_finish_row\n");
+   png_ptr->row_number++;
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
+      do
+      {
+         png_ptr->pass++;
+         if (png_ptr->pass >= 7)
+            break;
+         png_ptr->iwidth = (png_ptr->width +
+            png_pass_inc[png_ptr->pass] - 1 -
+            png_pass_start[png_ptr->pass]) /
+            png_pass_inc[png_ptr->pass];
+
+         png_ptr->irowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,
+            png_ptr->iwidth) + 1;
+
+         if (!(png_ptr->transformations & PNG_INTERLACE))
+         {
+            png_ptr->num_rows = (png_ptr->height +
+               png_pass_yinc[png_ptr->pass] - 1 -
+               png_pass_ystart[png_ptr->pass]) /
+               png_pass_yinc[png_ptr->pass];
+            if (!(png_ptr->num_rows))
+               continue;
+         }
+         else  /* if (png_ptr->transformations & PNG_INTERLACE) */
+            break;
+      } while (png_ptr->iwidth == 0);
+
+      if (png_ptr->pass < 7)
+         return;
+   }
+
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+   {
+#ifdef PNG_USE_LOCAL_ARRAYS
+      PNG_IDAT;
+#endif
+      char extra;
+      int ret;
+
+      png_ptr->zstream.next_out = (Byte *)&extra;
+      png_ptr->zstream.avail_out = (uInt)1;
+      for(;;)
+      {
+         if (!(png_ptr->zstream.avail_in))
+         {
+            while (!png_ptr->idat_size)
+            {
+               png_byte chunk_length[4];
+
+               png_crc_finish(png_ptr, 0);
+
+               png_read_data(png_ptr, chunk_length, 4);
+               png_ptr->idat_size = png_get_uint_31(png_ptr, chunk_length);
+               png_reset_crc(png_ptr);
+               png_crc_read(png_ptr, png_ptr->chunk_name, 4);
+               if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_IDAT, 4))
+                  png_error(png_ptr, "Not enough image data");
+
+            }
+            png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
+            png_ptr->zstream.next_in = png_ptr->zbuf;
+            if (png_ptr->zbuf_size > png_ptr->idat_size)
+               png_ptr->zstream.avail_in = (uInt)png_ptr->idat_size;
+            png_crc_read(png_ptr, png_ptr->zbuf, png_ptr->zstream.avail_in);
+            png_ptr->idat_size -= png_ptr->zstream.avail_in;
+         }
+         ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
+         if (ret == Z_STREAM_END)
+         {
+            if (!(png_ptr->zstream.avail_out) || png_ptr->zstream.avail_in ||
+               png_ptr->idat_size)
+               png_warning(png_ptr, "Extra compressed data");
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+         if (ret != Z_OK)
+            png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+                      "Decompression Error");
+
+         if (!(png_ptr->zstream.avail_out))
+         {
+            png_warning(png_ptr, "Extra compressed data.");
+            png_ptr->mode |= PNG_AFTER_IDAT;
+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+            break;
+         }
+
+      }
+      png_ptr->zstream.avail_out = 0;
+   }
+
+   if (png_ptr->idat_size || png_ptr->zstream.avail_in)
+      png_warning(png_ptr, "Extra compression data");
+
+   inflateReset(&png_ptr->zstream);
+
+   png_ptr->mode |= PNG_AFTER_IDAT;
+}
+
+void /* PRIVATE */
+png_read_start_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   const int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   const int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   const int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   const int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+
+   int max_pixel_depth;
+   png_uint_32 row_bytes;
+
+   png_debug(1, "in png_read_start_row\n");
+   png_ptr->zstream.avail_in = 0;
+   png_init_read_transformations(png_ptr);
+   if (png_ptr->interlaced)
+   {
+      if (!(png_ptr->transformations & PNG_INTERLACE))
+         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+            png_pass_ystart[0]) / png_pass_yinc[0];
+      else
+         png_ptr->num_rows = png_ptr->height;
+
+      png_ptr->iwidth = (png_ptr->width +
+         png_pass_inc[png_ptr->pass] - 1 -
+         png_pass_start[png_ptr->pass]) /
+         png_pass_inc[png_ptr->pass];
+
+         row_bytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->iwidth) + 1;
+
+         png_ptr->irowbytes = (png_size_t)row_bytes;
+         if((png_uint_32)png_ptr->irowbytes != row_bytes)
+            png_error(png_ptr, "Rowbytes overflow in png_read_start_row");
+   }
+   else
+   {
+      png_ptr->num_rows = png_ptr->height;
+      png_ptr->iwidth = png_ptr->width;
+      png_ptr->irowbytes = png_ptr->rowbytes + 1;
+   }
+   max_pixel_depth = png_ptr->pixel_depth;
+
+#if defined(PNG_READ_PACK_SUPPORTED)
+   if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
+      max_pixel_depth = 8;
+#endif
+
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+   if (png_ptr->transformations & PNG_EXPAND)
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      {
+         if (png_ptr->num_trans)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 24;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (max_pixel_depth < 8)
+            max_pixel_depth = 8;
+         if (png_ptr->num_trans)
+            max_pixel_depth *= 2;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (png_ptr->num_trans)
+         {
+            max_pixel_depth *= 4;
+            max_pixel_depth /= 3;
+         }
+      }
+   }
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & (PNG_FILLER))
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         max_pixel_depth = 32;
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+      {
+         if (max_pixel_depth <= 8)
+            max_pixel_depth = 16;
+         else
+            max_pixel_depth = 32;
+      }
+      else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+      {
+         if (max_pixel_depth <= 32)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 64;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_GRAY_TO_RGB_SUPPORTED)
+   if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+   {
+      if (
+#if defined(PNG_READ_EXPAND_SUPPORTED)
+        (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
+#endif
+#if defined(PNG_READ_FILLER_SUPPORTED)
+        (png_ptr->transformations & (PNG_FILLER)) ||
+#endif
+        png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         if (max_pixel_depth <= 16)
+            max_pixel_depth = 32;
+         else
+            max_pixel_depth = 64;
+      }
+      else
+      {
+         if (max_pixel_depth <= 8)
+           {
+             if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+               max_pixel_depth = 32;
+             else
+               max_pixel_depth = 24;
+           }
+         else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            max_pixel_depth = 64;
+         else
+            max_pixel_depth = 48;
+      }
+   }
+#endif
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
+defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   if(png_ptr->transformations & PNG_USER_TRANSFORM)
+     {
+       int user_pixel_depth=png_ptr->user_transform_depth*
+         png_ptr->user_transform_channels;
+       if(user_pixel_depth > max_pixel_depth)
+         max_pixel_depth=user_pixel_depth;
+     }
+#endif
+
+   /* align the width on the next larger 8 pixels.  Mainly used
+      for interlacing */
+   row_bytes = ((png_ptr->width + 7) & ~((png_uint_32)7));
+   /* calculate the maximum bytes needed, adding a byte and a pixel
+      for safety's sake */
+   row_bytes = PNG_ROWBYTES(max_pixel_depth,row_bytes) +
+      1 + ((max_pixel_depth + 7) >> 3);
+#ifdef PNG_MAX_MALLOC_64K
+   if (row_bytes > (png_uint_32)65536L)
+      png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+   png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes+64);
+   png_ptr->row_buf = png_ptr->big_row_buf+32;
+#if defined(PNG_DEBUG) && defined(PNG_USE_PNGGCCRD)
+   png_ptr->row_buf_size = row_bytes;
+#endif
+
+#ifdef PNG_MAX_MALLOC_64K
+   if ((png_uint_32)png_ptr->rowbytes + 1 > (png_uint_32)65536L)
+      png_error(png_ptr, "This image requires a row greater than 64KB");
+#endif
+   if ((png_uint_32)png_ptr->rowbytes + 1 > PNG_SIZE_MAX)
+      png_error(png_ptr, "Row has too many bytes to allocate in memory.");
+   png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)(
+      png_ptr->rowbytes + 1));
+
+   png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
+
+   png_debug1(3, "width = %lu,\n", png_ptr->width);
+   png_debug1(3, "height = %lu,\n", png_ptr->height);
+   png_debug1(3, "iwidth = %lu,\n", png_ptr->iwidth);
+   png_debug1(3, "num_rows = %lu\n", png_ptr->num_rows);
+   png_debug1(3, "rowbytes = %lu,\n", png_ptr->rowbytes);
+   png_debug1(3, "irowbytes = %lu,\n", png_ptr->irowbytes);
+
+   png_ptr->flags |= PNG_FLAG_ROW_INIT;
+}
diff --git a/Source/3rd Party/wx/src/png/pngset.c b/Source/3rd Party/wx/src/png/pngset.c
index e753ca886..b9677a12d 100644
--- a/Source/3rd Party/wx/src/png/pngset.c	
+++ b/Source/3rd Party/wx/src/png/pngset.c	
@@ -1,1284 +1,1219 @@
-
-/* pngset.c - storage of image information into info struct
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * The functions here are used during reads to store data from the file
- * into the info struct, and during writes to store application data
- * into the info struct for writing into the file.  This abstracts the
- * info struct and allows us to change the structure in the future.
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-#ifdef PNG_bKGD_SUPPORTED
-void PNGAPI
-png_set_bKGD(png_structp png_ptr, png_infop info_ptr,
-    png_const_color_16p background)
-{
-   png_debug1(1, "in %s storage function", "bKGD");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));
-   info_ptr->valid |= PNG_INFO_bKGD;
-}
-#endif
-
-#ifdef PNG_cHRM_SUPPORTED
-void PNGFAPI
-png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
-    png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
-    png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
-    png_fixed_point blue_x, png_fixed_point blue_y)
-{
-   png_debug1(1, "in %s storage function", "cHRM fixed");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-#  ifdef PNG_CHECK_cHRM_SUPPORTED
-   if (png_check_cHRM_fixed(png_ptr,
-       white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y))
-#  endif
-   {
-      info_ptr->x_white = white_x;
-      info_ptr->y_white = white_y;
-      info_ptr->x_red   = red_x;
-      info_ptr->y_red   = red_y;
-      info_ptr->x_green = green_x;
-      info_ptr->y_green = green_y;
-      info_ptr->x_blue  = blue_x;
-      info_ptr->y_blue  = blue_y;
-      info_ptr->valid |= PNG_INFO_cHRM;
-   }
-}
-
-void PNGFAPI
-png_set_cHRM_XYZ_fixed(png_structp png_ptr, png_infop info_ptr,
-    png_fixed_point int_red_X, png_fixed_point int_red_Y,
-    png_fixed_point int_red_Z, png_fixed_point int_green_X,
-    png_fixed_point int_green_Y, png_fixed_point int_green_Z,
-    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
-    png_fixed_point int_blue_Z)
-{
-   png_XYZ XYZ;
-   png_xy xy;
-
-   png_debug1(1, "in %s storage function", "cHRM XYZ fixed");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   XYZ.redX = int_red_X;
-   XYZ.redY = int_red_Y;
-   XYZ.redZ = int_red_Z;
-   XYZ.greenX = int_green_X;
-   XYZ.greenY = int_green_Y;
-   XYZ.greenZ = int_green_Z;
-   XYZ.blueX = int_blue_X;
-   XYZ.blueY = int_blue_Y;
-   XYZ.blueZ = int_blue_Z;
-
-   if (png_xy_from_XYZ(&xy, XYZ))
-      png_error(png_ptr, "XYZ values out of representable range");
-
-   png_set_cHRM_fixed(png_ptr, info_ptr, xy.whitex, xy.whitey, xy.redx, xy.redy,
-      xy.greenx, xy.greeny, xy.bluex, xy.bluey);
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
-    double white_x, double white_y, double red_x, double red_y,
-    double green_x, double green_y, double blue_x, double blue_y)
-{
-   png_set_cHRM_fixed(png_ptr, info_ptr,
-      png_fixed(png_ptr, white_x, "cHRM White X"),
-      png_fixed(png_ptr, white_y, "cHRM White Y"),
-      png_fixed(png_ptr, red_x, "cHRM Red X"),
-      png_fixed(png_ptr, red_y, "cHRM Red Y"),
-      png_fixed(png_ptr, green_x, "cHRM Green X"),
-      png_fixed(png_ptr, green_y, "cHRM Green Y"),
-      png_fixed(png_ptr, blue_x, "cHRM Blue X"),
-      png_fixed(png_ptr, blue_y, "cHRM Blue Y"));
-}
-
-void PNGAPI
-png_set_cHRM_XYZ(png_structp png_ptr, png_infop info_ptr, double red_X,
-    double red_Y, double red_Z, double green_X, double green_Y, double green_Z,
-    double blue_X, double blue_Y, double blue_Z)
-{
-   png_set_cHRM_XYZ_fixed(png_ptr, info_ptr,
-      png_fixed(png_ptr, red_X, "cHRM Red X"),
-      png_fixed(png_ptr, red_Y, "cHRM Red Y"),
-      png_fixed(png_ptr, red_Z, "cHRM Red Z"),
-      png_fixed(png_ptr, green_X, "cHRM Red X"),
-      png_fixed(png_ptr, green_Y, "cHRM Red Y"),
-      png_fixed(png_ptr, green_Z, "cHRM Red Z"),
-      png_fixed(png_ptr, blue_X, "cHRM Red X"),
-      png_fixed(png_ptr, blue_Y, "cHRM Red Y"),
-      png_fixed(png_ptr, blue_Z, "cHRM Red Z"));
-}
-#  endif /* PNG_FLOATING_POINT_SUPPORTED */
-
-#endif /* PNG_cHRM_SUPPORTED */
-
-#ifdef PNG_gAMA_SUPPORTED
-void PNGFAPI
-png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
-    file_gamma)
-{
-   png_debug1(1, "in %s storage function", "gAMA");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
-    * occur.  Since the fixed point representation is assymetrical it is
-    * possible for 1/gamma to overflow the limit of 21474 and this means the
-    * gamma value must be at least 5/100000 and hence at most 20000.0.  For
-    * safety the limits here are a little narrower.  The values are 0.00016 to
-    * 6250.0, which are truly ridiculous gammma values (and will produce
-    * displays that are all black or all white.)
-    */
-   if (file_gamma < 16 || file_gamma > 625000000)
-      png_warning(png_ptr, "Out of range gamma value ignored");
-
-   else
-   {
-      info_ptr->gamma = file_gamma;
-      info_ptr->valid |= PNG_INFO_gAMA;
-   }
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
-{
-   png_set_gAMA_fixed(png_ptr, info_ptr, png_fixed(png_ptr, file_gamma,
-       "png_set_gAMA"));
-}
-#  endif
-#endif
-
-#ifdef PNG_hIST_SUPPORTED
-void PNGAPI
-png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_const_uint_16p hist)
-{
-   int i;
-
-   png_debug1(1, "in %s storage function", "hIST");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (info_ptr->num_palette == 0 || info_ptr->num_palette
-       > PNG_MAX_PALETTE_LENGTH)
-   {
-      png_warning(png_ptr,
-          "Invalid palette size, hIST allocation skipped");
-
-      return;
-   }
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);
-
-   /* Changed from info->num_palette to PNG_MAX_PALETTE_LENGTH in
-    * version 1.2.1
-    */
-   png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,
-       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_uint_16));
-
-   if (png_ptr->hist == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for hIST chunk data");
-      return;
-   }
-
-   for (i = 0; i < info_ptr->num_palette; i++)
-      png_ptr->hist[i] = hist[i];
-
-   info_ptr->hist = png_ptr->hist;
-   info_ptr->valid |= PNG_INFO_hIST;
-   info_ptr->free_me |= PNG_FREE_HIST;
-}
-#endif
-
-void PNGAPI
-png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 width, png_uint_32 height, int bit_depth,
-    int color_type, int interlace_type, int compression_type,
-    int filter_type)
-{
-   png_debug1(1, "in %s storage function", "IHDR");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->width = width;
-   info_ptr->height = height;
-   info_ptr->bit_depth = (png_byte)bit_depth;
-   info_ptr->color_type = (png_byte)color_type;
-   info_ptr->compression_type = (png_byte)compression_type;
-   info_ptr->filter_type = (png_byte)filter_type;
-   info_ptr->interlace_type = (png_byte)interlace_type;
-
-   png_check_IHDR (png_ptr, info_ptr->width, info_ptr->height,
-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->interlace_type,
-       info_ptr->compression_type, info_ptr->filter_type);
-
-   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      info_ptr->channels = 1;
-
-   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
-      info_ptr->channels = 3;
-
-   else
-      info_ptr->channels = 1;
-
-   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-      info_ptr->channels++;
-
-   info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
-
-   /* Check for potential overflow */
-   if (width >
-       (PNG_UINT_32_MAX >> 3)      /* 8-byte RRGGBBAA pixels */
-       - 48       /* bigrowbuf hack */
-       - 1        /* filter byte */
-       - 7*8      /* rounding of width to multiple of 8 pixels */
-       - 8)       /* extra max_pixel_depth pad */
-      info_ptr->rowbytes = 0;
-   else
-      info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
-}
-
-#ifdef PNG_oFFs_SUPPORTED
-void PNGAPI
-png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
-    png_int_32 offset_x, png_int_32 offset_y, int unit_type)
-{
-   png_debug1(1, "in %s storage function", "oFFs");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->x_offset = offset_x;
-   info_ptr->y_offset = offset_y;
-   info_ptr->offset_unit_type = (png_byte)unit_type;
-   info_ptr->valid |= PNG_INFO_oFFs;
-}
-#endif
-
-#ifdef PNG_pCAL_SUPPORTED
-void PNGAPI
-png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
-    png_const_charp purpose, png_int_32 X0, png_int_32 X1, int type,
-    int nparams, png_const_charp units, png_charpp params)
-{
-   png_size_t length;
-   int i;
-
-   png_debug1(1, "in %s storage function", "pCAL");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   length = png_strlen(purpose) + 1;
-   png_debug1(3, "allocating purpose for info (%lu bytes)",
-       (unsigned long)length);
-
-   /* TODO: validate format of calibration name and unit name */
-
-   /* Check that the type matches the specification. */
-   if (type < 0 || type > 3)
-      png_error(png_ptr, "Invalid pCAL equation type");
-
-   /* Validate params[nparams] */
-   for (i=0; i<nparams; ++i)
-      if (!png_check_fp_string(params[i], png_strlen(params[i])))
-         png_error(png_ptr, "Invalid format for pCAL parameter");
-
-   info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
-
-   if (info_ptr->pcal_purpose == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for pCAL purpose");
-      return;
-   }
-
-   png_memcpy(info_ptr->pcal_purpose, purpose, length);
-
-   png_debug(3, "storing X0, X1, type, and nparams in info");
-   info_ptr->pcal_X0 = X0;
-   info_ptr->pcal_X1 = X1;
-   info_ptr->pcal_type = (png_byte)type;
-   info_ptr->pcal_nparams = (png_byte)nparams;
-
-   length = png_strlen(units) + 1;
-   png_debug1(3, "allocating units for info (%lu bytes)",
-     (unsigned long)length);
-
-   info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
-
-   if (info_ptr->pcal_units == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for pCAL units");
-      return;
-   }
-
-   png_memcpy(info_ptr->pcal_units, units, length);
-
-   info_ptr->pcal_params = (png_charpp)png_malloc_warn(png_ptr,
-       (png_size_t)((nparams + 1) * png_sizeof(png_charp)));
-
-   if (info_ptr->pcal_params == NULL)
-   {
-      png_warning(png_ptr, "Insufficient memory for pCAL params");
-      return;
-   }
-
-   png_memset(info_ptr->pcal_params, 0, (nparams + 1) * png_sizeof(png_charp));
-
-   for (i = 0; i < nparams; i++)
-   {
-      length = png_strlen(params[i]) + 1;
-      png_debug2(3, "allocating parameter %d for info (%lu bytes)", i,
-          (unsigned long)length);
-
-      info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);
-
-      if (info_ptr->pcal_params[i] == NULL)
-      {
-         png_warning(png_ptr, "Insufficient memory for pCAL parameter");
-         return;
-      }
-
-      png_memcpy(info_ptr->pcal_params[i], params[i], length);
-   }
-
-   info_ptr->valid |= PNG_INFO_pCAL;
-   info_ptr->free_me |= PNG_FREE_PCAL;
-}
-#endif
-
-#ifdef PNG_sCAL_SUPPORTED
-void PNGAPI
-png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
-    int unit, png_const_charp swidth, png_const_charp sheight)
-{
-   png_size_t lengthw = 0, lengthh = 0;
-
-   png_debug1(1, "in %s storage function", "sCAL");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Double check the unit (should never get here with an invalid
-    * unit unless this is an API call.)
-    */
-   if (unit != 1 && unit != 2)
-      png_error(png_ptr, "Invalid sCAL unit");
-
-   if (swidth == NULL || (lengthw = png_strlen(swidth)) == 0 ||
-       swidth[0] == 45 /* '-' */ || !png_check_fp_string(swidth, lengthw))
-      png_error(png_ptr, "Invalid sCAL width");
-
-   if (sheight == NULL || (lengthh = png_strlen(sheight)) == 0 ||
-       sheight[0] == 45 /* '-' */ || !png_check_fp_string(sheight, lengthh))
-      png_error(png_ptr, "Invalid sCAL height");
-
-   info_ptr->scal_unit = (png_byte)unit;
-
-   ++lengthw;
-
-   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthw);
-
-   info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, lengthw);
-
-   if (info_ptr->scal_s_width == NULL)
-   {
-      png_warning(png_ptr, "Memory allocation failed while processing sCAL");
-      return;
-   }
-
-   png_memcpy(info_ptr->scal_s_width, swidth, lengthw);
-
-   ++lengthh;
-
-   png_debug1(3, "allocating unit for info (%u bytes)", (unsigned int)lengthh);
-
-   info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, lengthh);
-
-   if (info_ptr->scal_s_height == NULL)
-   {
-      png_free (png_ptr, info_ptr->scal_s_width);
-      info_ptr->scal_s_width = NULL;
-
-      png_warning(png_ptr, "Memory allocation failed while processing sCAL");
-      return;
-   }
-
-   png_memcpy(info_ptr->scal_s_height, sheight, lengthh);
-
-   info_ptr->valid |= PNG_INFO_sCAL;
-   info_ptr->free_me |= PNG_FREE_SCAL;
-}
-
-#  ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_sCAL(png_structp png_ptr, png_infop info_ptr, int unit, double width,
-    double height)
-{
-   png_debug1(1, "in %s storage function", "sCAL");
-
-   /* Check the arguments. */
-   if (width <= 0)
-      png_warning(png_ptr, "Invalid sCAL width ignored");
-
-   else if (height <= 0)
-      png_warning(png_ptr, "Invalid sCAL height ignored");
-
-   else
-   {
-      /* Convert 'width' and 'height' to ASCII. */
-      char swidth[PNG_sCAL_MAX_DIGITS+1];
-      char sheight[PNG_sCAL_MAX_DIGITS+1];
-
-      png_ascii_from_fp(png_ptr, swidth, sizeof swidth, width,
-         PNG_sCAL_PRECISION);
-      png_ascii_from_fp(png_ptr, sheight, sizeof sheight, height,
-         PNG_sCAL_PRECISION);
-
-      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
-   }
-}
-#  endif
-
-#  ifdef PNG_FIXED_POINT_SUPPORTED
-void PNGAPI
-png_set_sCAL_fixed(png_structp png_ptr, png_infop info_ptr, int unit,
-    png_fixed_point width, png_fixed_point height)
-{
-   png_debug1(1, "in %s storage function", "sCAL");
-
-   /* Check the arguments. */
-   if (width <= 0)
-      png_warning(png_ptr, "Invalid sCAL width ignored");
-
-   else if (height <= 0)
-      png_warning(png_ptr, "Invalid sCAL height ignored");
-
-   else
-   {
-      /* Convert 'width' and 'height' to ASCII. */
-      char swidth[PNG_sCAL_MAX_DIGITS+1];
-      char sheight[PNG_sCAL_MAX_DIGITS+1];
-
-      png_ascii_from_fixed(png_ptr, swidth, sizeof swidth, width);
-      png_ascii_from_fixed(png_ptr, sheight, sizeof sheight, height);
-
-      png_set_sCAL_s(png_ptr, info_ptr, unit, swidth, sheight);
-   }
-}
-#  endif
-#endif
-
-#ifdef PNG_pHYs_SUPPORTED
-void PNGAPI
-png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
-    png_uint_32 res_x, png_uint_32 res_y, int unit_type)
-{
-   png_debug1(1, "in %s storage function", "pHYs");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->x_pixels_per_unit = res_x;
-   info_ptr->y_pixels_per_unit = res_y;
-   info_ptr->phys_unit_type = (png_byte)unit_type;
-   info_ptr->valid |= PNG_INFO_pHYs;
-}
-#endif
-
-void PNGAPI
-png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
-    png_const_colorp palette, int num_palette)
-{
-
-   png_debug1(1, "in %s storage function", "PLTE");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (num_palette < 0 || num_palette > PNG_MAX_PALETTE_LENGTH)
-   {
-      if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-         png_error(png_ptr, "Invalid palette length");
-
-      else
-      {
-         png_warning(png_ptr, "Invalid palette length");
-         return;
-      }
-   }
-
-   /* It may not actually be necessary to set png_ptr->palette here;
-    * we do it for backward compatibility with the way the png_handle_tRNS
-    * function used to do the allocation.
-    */
-   png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
-
-   /* Changed in libpng-1.2.1 to allocate PNG_MAX_PALETTE_LENGTH instead
-    * of num_palette entries, in case of an invalid PNG file that has
-    * too-large sample values.
-    */
-   png_ptr->palette = (png_colorp)png_calloc(png_ptr,
-       PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));
-
-   png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof(png_color));
-   info_ptr->palette = png_ptr->palette;
-   info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
-
-   info_ptr->free_me |= PNG_FREE_PLTE;
-
-   info_ptr->valid |= PNG_INFO_PLTE;
-}
-
-#ifdef PNG_sBIT_SUPPORTED
-void PNGAPI
-png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
-    png_const_color_8p sig_bit)
-{
-   png_debug1(1, "in %s storage function", "sBIT");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof(png_color_8));
-   info_ptr->valid |= PNG_INFO_sBIT;
-}
-#endif
-
-#ifdef PNG_sRGB_SUPPORTED
-void PNGAPI
-png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int srgb_intent)
-{
-   png_debug1(1, "in %s storage function", "sRGB");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   info_ptr->srgb_intent = (png_byte)srgb_intent;
-   info_ptr->valid |= PNG_INFO_sRGB;
-}
-
-void PNGAPI
-png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
-    int srgb_intent)
-{
-   png_debug1(1, "in %s storage function", "sRGB_gAMA_and_cHRM");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_set_sRGB(png_ptr, info_ptr, srgb_intent);
-
-#  ifdef PNG_gAMA_SUPPORTED
-   png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_sRGB_INVERSE);
-#  endif
-
-#  ifdef PNG_cHRM_SUPPORTED
-   png_set_cHRM_fixed(png_ptr, info_ptr,
-      /* color      x       y */
-      /* white */ 31270, 32900,
-      /* red   */ 64000, 33000,
-      /* green */ 30000, 60000,
-      /* blue  */ 15000,  6000
-   );
-#  endif /* cHRM */
-}
-#endif /* sRGB */
-
-
-#ifdef PNG_iCCP_SUPPORTED
-void PNGAPI
-png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
-    png_const_charp name, int compression_type,
-    png_const_bytep profile, png_uint_32 proflen)
-{
-   png_charp new_iccp_name;
-   png_bytep new_iccp_profile;
-   png_size_t length;
-
-   png_debug1(1, "in %s storage function", "iCCP");
-
-   if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
-      return;
-
-   length = png_strlen(name)+1;
-   new_iccp_name = (png_charp)png_malloc_warn(png_ptr, length);
-
-   if (new_iccp_name == NULL)
-   {
-        png_warning(png_ptr, "Insufficient memory to process iCCP chunk");
-      return;
-   }
-
-   png_memcpy(new_iccp_name, name, length);
-   new_iccp_profile = (png_bytep)png_malloc_warn(png_ptr, proflen);
-
-   if (new_iccp_profile == NULL)
-   {
-      png_free (png_ptr, new_iccp_name);
-      png_warning(png_ptr,
-          "Insufficient memory to process iCCP profile");
-      return;
-   }
-
-   png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
-
-   png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
-
-   info_ptr->iccp_proflen = proflen;
-   info_ptr->iccp_name = new_iccp_name;
-   info_ptr->iccp_profile = new_iccp_profile;
-   /* Compression is always zero but is here so the API and info structure
-    * does not have to change if we introduce multiple compression types
-    */
-   info_ptr->iccp_compression = (png_byte)compression_type;
-   info_ptr->free_me |= PNG_FREE_ICCP;
-   info_ptr->valid |= PNG_INFO_iCCP;
-}
-#endif
-
-#ifdef PNG_TEXT_SUPPORTED
-void PNGAPI
-png_set_text(png_structp png_ptr, png_infop info_ptr, png_const_textp text_ptr,
-    int num_text)
-{
-   int ret;
-   ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
-
-   if (ret)
-      png_error(png_ptr, "Insufficient memory to store text");
-}
-
-int /* PRIVATE */
-png_set_text_2(png_structp png_ptr, png_infop info_ptr,
-    png_const_textp text_ptr, int num_text)
-{
-   int i;
-
-   png_debug1(1, "in %lx storage function", png_ptr == NULL ? "unexpected" :
-      (unsigned long)png_ptr->chunk_name);
-
-   if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
-      return(0);
-
-   /* Make sure we have enough space in the "text" array in info_struct
-    * to hold all of the incoming text_ptr objects.
-    */
-   if (info_ptr->num_text + num_text > info_ptr->max_text)
-   {
-      if (info_ptr->text != NULL)
-      {
-         png_textp old_text;
-         int old_max;
-
-         old_max = info_ptr->max_text;
-         info_ptr->max_text = info_ptr->num_text + num_text + 8;
-         old_text = info_ptr->text;
-         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
-            (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
-
-         if (info_ptr->text == NULL)
-         {
-            png_free(png_ptr, old_text);
-            return(1);
-         }
-
-         png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
-             png_sizeof(png_text)));
-         png_free(png_ptr, old_text);
-      }
-
-      else
-      {
-         info_ptr->max_text = num_text + 8;
-         info_ptr->num_text = 0;
-         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
-             (png_size_t)(info_ptr->max_text * png_sizeof(png_text)));
-         if (info_ptr->text == NULL)
-            return(1);
-         info_ptr->free_me |= PNG_FREE_TEXT;
-      }
-
-      png_debug1(3, "allocated %d entries for info_ptr->text",
-          info_ptr->max_text);
-   }
-   for (i = 0; i < num_text; i++)
-   {
-      png_size_t text_length, key_len;
-      png_size_t lang_len, lang_key_len;
-      png_textp textp = &(info_ptr->text[info_ptr->num_text]);
-
-      if (text_ptr[i].key == NULL)
-          continue;
-
-      if (text_ptr[i].compression < PNG_TEXT_COMPRESSION_NONE ||
-          text_ptr[i].compression >= PNG_TEXT_COMPRESSION_LAST)
-      {
-         png_warning(png_ptr, "text compression mode is out of range");
-         continue;
-      }
-
-      key_len = png_strlen(text_ptr[i].key);
-
-      if (text_ptr[i].compression <= 0)
-      {
-         lang_len = 0;
-         lang_key_len = 0;
-      }
-
-      else
-#  ifdef PNG_iTXt_SUPPORTED
-      {
-         /* Set iTXt data */
-
-         if (text_ptr[i].lang != NULL)
-            lang_len = png_strlen(text_ptr[i].lang);
-
-         else
-            lang_len = 0;
-
-         if (text_ptr[i].lang_key != NULL)
-            lang_key_len = png_strlen(text_ptr[i].lang_key);
-
-         else
-            lang_key_len = 0;
-      }
-#  else /* PNG_iTXt_SUPPORTED */
-      {
-         png_warning(png_ptr, "iTXt chunk not supported");
-         continue;
-      }
-#  endif
-
-      if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')
-      {
-         text_length = 0;
-#  ifdef PNG_iTXt_SUPPORTED
-         if (text_ptr[i].compression > 0)
-            textp->compression = PNG_ITXT_COMPRESSION_NONE;
-
-         else
-#  endif
-            textp->compression = PNG_TEXT_COMPRESSION_NONE;
-      }
-
-      else
-      {
-         text_length = png_strlen(text_ptr[i].text);
-         textp->compression = text_ptr[i].compression;
-      }
-
-      textp->key = (png_charp)png_malloc_warn(png_ptr,
-          (png_size_t)
-          (key_len + text_length + lang_len + lang_key_len + 4));
-
-      if (textp->key == NULL)
-         return(1);
-
-      png_debug2(2, "Allocated %lu bytes at %p in png_set_text",
-          (unsigned long)(png_uint_32)
-          (key_len + lang_len + lang_key_len + text_length + 4),
-          textp->key);
-
-      png_memcpy(textp->key, text_ptr[i].key,(png_size_t)(key_len));
-      *(textp->key + key_len) = '\0';
-
-      if (text_ptr[i].compression > 0)
-      {
-         textp->lang = textp->key + key_len + 1;
-         png_memcpy(textp->lang, text_ptr[i].lang, lang_len);
-         *(textp->lang + lang_len) = '\0';
-         textp->lang_key = textp->lang + lang_len + 1;
-         png_memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
-         *(textp->lang_key + lang_key_len) = '\0';
-         textp->text = textp->lang_key + lang_key_len + 1;
-      }
-
-      else
-      {
-         textp->lang=NULL;
-         textp->lang_key=NULL;
-         textp->text = textp->key + key_len + 1;
-      }
-
-      if (text_length)
-         png_memcpy(textp->text, text_ptr[i].text,
-             (png_size_t)(text_length));
-
-      *(textp->text + text_length) = '\0';
-
-#  ifdef PNG_iTXt_SUPPORTED
-      if (textp->compression > 0)
-      {
-         textp->text_length = 0;
-         textp->itxt_length = text_length;
-      }
-
-      else
-#  endif
-      {
-         textp->text_length = text_length;
-         textp->itxt_length = 0;
-      }
-
-      info_ptr->num_text++;
-      png_debug1(3, "transferred text chunk %d", info_ptr->num_text);
-   }
-   return(0);
-}
-#endif
-
-#ifdef PNG_tIME_SUPPORTED
-void PNGAPI
-png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_const_timep mod_time)
-{
-   png_debug1(1, "in %s storage function", "tIME");
-
-   if (png_ptr == NULL || info_ptr == NULL ||
-       (png_ptr->mode & PNG_WROTE_tIME))
-      return;
-
-   if (mod_time->month == 0   || mod_time->month > 12  ||
-       mod_time->day   == 0   || mod_time->day   > 31  ||
-       mod_time->hour  > 23   || mod_time->minute > 59 ||
-       mod_time->second > 60)
-   {
-      png_warning(png_ptr, "Ignoring invalid time value");
-      return;
-   }
-
-   png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof(png_time));
-   info_ptr->valid |= PNG_INFO_tIME;
-}
-#endif
-
-#ifdef PNG_tRNS_SUPPORTED
-void PNGAPI
-png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
-    png_const_bytep trans_alpha, int num_trans, png_const_color_16p trans_color)
-{
-   png_debug1(1, "in %s storage function", "tRNS");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (trans_alpha != NULL)
-   {
-       /* It may not actually be necessary to set png_ptr->trans_alpha here;
-        * we do it for backward compatibility with the way the png_handle_tRNS
-        * function used to do the allocation.
-        */
-
-       png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
-
-       /* Changed from num_trans to PNG_MAX_PALETTE_LENGTH in version 1.2.1 */
-       png_ptr->trans_alpha = info_ptr->trans_alpha =
-           (png_bytep)png_malloc(png_ptr, (png_size_t)PNG_MAX_PALETTE_LENGTH);
-
-       if (num_trans > 0 && num_trans <= PNG_MAX_PALETTE_LENGTH)
-          png_memcpy(info_ptr->trans_alpha, trans_alpha, (png_size_t)num_trans);
-   }
-
-   if (trans_color != NULL)
-   {
-      int sample_max = (1 << info_ptr->bit_depth);
-
-      if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
-          (int)trans_color->gray > sample_max) ||
-          (info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
-          ((int)trans_color->red > sample_max ||
-          (int)trans_color->green > sample_max ||
-          (int)trans_color->blue > sample_max)))
-         png_warning(png_ptr,
-            "tRNS chunk has out-of-range samples for bit_depth");
-
-      png_memcpy(&(info_ptr->trans_color), trans_color,
-         png_sizeof(png_color_16));
-
-      if (num_trans == 0)
-         num_trans = 1;
-   }
-
-   info_ptr->num_trans = (png_uint_16)num_trans;
-
-   if (num_trans != 0)
-   {
-      info_ptr->valid |= PNG_INFO_tRNS;
-      info_ptr->free_me |= PNG_FREE_TRNS;
-   }
-}
-#endif
-
-#ifdef PNG_sPLT_SUPPORTED
-void PNGAPI
-png_set_sPLT(png_structp png_ptr,
-    png_infop info_ptr, png_const_sPLT_tp entries, int nentries)
-/*
- *  entries        - array of png_sPLT_t structures
- *                   to be added to the list of palettes
- *                   in the info structure.
- *
- *  nentries       - number of palette structures to be
- *                   added.
- */
-{
-   png_sPLT_tp np;
-   int i;
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   np = (png_sPLT_tp)png_malloc_warn(png_ptr,
-       (info_ptr->splt_palettes_num + nentries) *
-       (png_size_t)png_sizeof(png_sPLT_t));
-
-   if (np == NULL)
-   {
-      png_warning(png_ptr, "No memory for sPLT palettes");
-      return;
-   }
-
-   png_memcpy(np, info_ptr->splt_palettes,
-       info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
-
-   png_free(png_ptr, info_ptr->splt_palettes);
-   info_ptr->splt_palettes=NULL;
-
-   for (i = 0; i < nentries; i++)
-   {
-      png_sPLT_tp to = np + info_ptr->splt_palettes_num + i;
-      png_const_sPLT_tp from = entries + i;
-      png_size_t length;
-
-      length = png_strlen(from->name) + 1;
-      to->name = (png_charp)png_malloc_warn(png_ptr, length);
-
-      if (to->name == NULL)
-      {
-         png_warning(png_ptr,
-             "Out of memory while processing sPLT chunk");
-         continue;
-      }
-
-      png_memcpy(to->name, from->name, length);
-      to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr,
-          from->nentries * png_sizeof(png_sPLT_entry));
-
-      if (to->entries == NULL)
-      {
-         png_warning(png_ptr,
-             "Out of memory while processing sPLT chunk");
-         png_free(png_ptr, to->name);
-         to->name = NULL;
-         continue;
-      }
-
-      png_memcpy(to->entries, from->entries,
-          from->nentries * png_sizeof(png_sPLT_entry));
-
-      to->nentries = from->nentries;
-      to->depth = from->depth;
-   }
-
-   info_ptr->splt_palettes = np;
-   info_ptr->splt_palettes_num += nentries;
-   info_ptr->valid |= PNG_INFO_sPLT;
-   info_ptr->free_me |= PNG_FREE_SPLT;
-}
-#endif /* PNG_sPLT_SUPPORTED */
-
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-void PNGAPI
-png_set_unknown_chunks(png_structp png_ptr,
-   png_infop info_ptr, png_const_unknown_chunkp unknowns, int num_unknowns)
-{
-   png_unknown_chunkp np;
-   int i;
-
-   if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
-      return;
-
-   np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
-       (png_size_t)(info_ptr->unknown_chunks_num + num_unknowns) *
-       png_sizeof(png_unknown_chunk));
-
-   if (np == NULL)
-   {
-      png_warning(png_ptr,
-          "Out of memory while processing unknown chunk");
-      return;
-   }
-
-   png_memcpy(np, info_ptr->unknown_chunks,
-       (png_size_t)info_ptr->unknown_chunks_num *
-       png_sizeof(png_unknown_chunk));
-
-   png_free(png_ptr, info_ptr->unknown_chunks);
-   info_ptr->unknown_chunks = NULL;
-
-   for (i = 0; i < num_unknowns; i++)
-   {
-      png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
-      png_const_unknown_chunkp from = unknowns + i;
-
-      png_memcpy(to->name, from->name, png_sizeof(from->name));
-      to->name[png_sizeof(to->name)-1] = '\0';
-      to->size = from->size;
-
-      /* Note our location in the read or write sequence */
-      to->location = (png_byte)(png_ptr->mode & 0xff);
-
-      if (from->size == 0)
-         to->data=NULL;
-
-      else
-      {
-         to->data = (png_bytep)png_malloc_warn(png_ptr,
-             (png_size_t)from->size);
-
-         if (to->data == NULL)
-         {
-            png_warning(png_ptr,
-                "Out of memory while processing unknown chunk");
-            to->size = 0;
-         }
-
-         else
-            png_memcpy(to->data, from->data, from->size);
-      }
-   }
-
-   info_ptr->unknown_chunks = np;
-   info_ptr->unknown_chunks_num += num_unknowns;
-   info_ptr->free_me |= PNG_FREE_UNKN;
-}
-
-void PNGAPI
-png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
-    int chunk, int location)
-{
-   if (png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <
-       info_ptr->unknown_chunks_num)
-      info_ptr->unknown_chunks[chunk].location = (png_byte)location;
-}
-#endif
-
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-png_uint_32 PNGAPI
-png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
-{
-   png_debug(1, "in png_permit_mng_features");
-
-   if (png_ptr == NULL)
-      return (png_uint_32)0;
-
-   png_ptr->mng_features_permitted =
-       (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);
-
-   return (png_uint_32)png_ptr->mng_features_permitted;
-}
-#endif
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-void PNGAPI
-png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_const_bytep
-    chunk_list, int num_chunks)
-{
-   png_bytep new_list, p;
-   int i, old_num_chunks;
-   if (png_ptr == NULL)
-      return;
-
-   if (num_chunks == 0)
-   {
-      if (keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
-         png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
-
-      else
-         png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
-
-      if (keep == PNG_HANDLE_CHUNK_ALWAYS)
-         png_ptr->flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;
-
-      else
-         png_ptr->flags &= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;
-
-      return;
-   }
-
-   if (chunk_list == NULL)
-      return;
-
-   old_num_chunks = png_ptr->num_chunk_list;
-   new_list=(png_bytep)png_malloc(png_ptr,
-       (png_size_t)(5*(num_chunks + old_num_chunks)));
-
-   if (png_ptr->chunk_list != NULL)
-   {
-      png_memcpy(new_list, png_ptr->chunk_list,
-          (png_size_t)(5*old_num_chunks));
-      png_free(png_ptr, png_ptr->chunk_list);
-      png_ptr->chunk_list=NULL;
-   }
-
-   png_memcpy(new_list + 5*old_num_chunks, chunk_list,
-       (png_size_t)(5*num_chunks));
-
-   for (p = new_list + 5*old_num_chunks + 4, i = 0; i<num_chunks; i++, p += 5)
-      *p=(png_byte)keep;
-
-   png_ptr->num_chunk_list = old_num_chunks + num_chunks;
-   png_ptr->chunk_list = new_list;
-   png_ptr->free_me |= PNG_FREE_LIST;
-}
-#endif
-
-#ifdef PNG_READ_USER_CHUNKS_SUPPORTED
-void PNGAPI
-png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
-    png_user_chunk_ptr read_user_chunk_fn)
-{
-   png_debug(1, "in png_set_read_user_chunk_fn");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->read_user_chunk_fn = read_user_chunk_fn;
-   png_ptr->user_chunk_ptr = user_chunk_ptr;
-}
-#endif
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-void PNGAPI
-png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
-{
-   png_debug1(1, "in %s storage function", "rows");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))
-      png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
-
-   info_ptr->row_pointers = row_pointers;
-
-   if (row_pointers)
-      info_ptr->valid |= PNG_INFO_IDAT;
-}
-#endif
-
-void PNGAPI
-png_set_compression_buffer_size(png_structp png_ptr, png_size_t size)
-{
-    if (png_ptr == NULL)
-       return;
-
-    png_free(png_ptr, png_ptr->zbuf);
-
-    if (size > ZLIB_IO_MAX)
-    {
-       png_warning(png_ptr, "Attempt to set buffer size beyond max ignored");
-       png_ptr->zbuf_size = ZLIB_IO_MAX;
-       size = ZLIB_IO_MAX; /* must fit */
-    }
-
-    else
-       png_ptr->zbuf_size = (uInt)size;
-
-    png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);
-
-    /* The following ensures a relatively safe failure if this gets called while
-     * the buffer is actually in use.
-     */
-    png_ptr->zstream.next_out = png_ptr->zbuf;
-    png_ptr->zstream.avail_out = 0;
-    png_ptr->zstream.avail_in = 0;
-}
-
-void PNGAPI
-png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
-{
-   if (png_ptr && info_ptr)
-      info_ptr->valid &= ~mask;
-}
-
-
-
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-/* This function was added to libpng 1.2.6 */
-void PNGAPI
-png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
-    png_uint_32 user_height_max)
-{
-   /* Images with dimensions larger than these limits will be
-    * rejected by png_set_IHDR().  To accept any PNG datastream
-    * regardless of dimensions, set both limits to 0x7ffffffL.
-    */
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->user_width_max = user_width_max;
-   png_ptr->user_height_max = user_height_max;
-}
-
-/* This function was added to libpng 1.4.0 */
-void PNGAPI
-png_set_chunk_cache_max (png_structp png_ptr,
-   png_uint_32 user_chunk_cache_max)
-{
-    if (png_ptr)
-       png_ptr->user_chunk_cache_max = user_chunk_cache_max;
-}
-
-/* This function was added to libpng 1.4.1 */
-void PNGAPI
-png_set_chunk_malloc_max (png_structp png_ptr,
-    png_alloc_size_t user_chunk_malloc_max)
-{
-   if (png_ptr)
-      png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
-}
-#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
-
-
-#ifdef PNG_BENIGN_ERRORS_SUPPORTED
-void PNGAPI
-png_set_benign_errors(png_structp png_ptr, int allowed)
-{
-   png_debug(1, "in png_set_benign_errors");
-
-   if (allowed)
-      png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
-
-   else
-      png_ptr->flags &= ~PNG_FLAG_BENIGN_ERRORS_WARN;
-}
-#endif /* PNG_BENIGN_ERRORS_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngset.c - storage of image information into info struct
+ *
+ * libpng 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * The functions here are used during reads to store data from the file
+ * into the info struct, and during writes to store application data
+ * into the info struct for writing into the file.  This abstracts the
+ * info struct and allows us to change the structure in the future.
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_bKGD_SUPPORTED)
+void PNGAPI
+png_set_bKGD(png_structp png_ptr, png_infop info_ptr, png_color_16p background)
+{
+   png_debug1(1, "in %s storage function\n", "bKGD");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_memcpy(&(info_ptr->background), background, png_sizeof(png_color_16));
+   info_ptr->valid |= PNG_INFO_bKGD;
+}
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_cHRM(png_structp png_ptr, png_infop info_ptr,
+   double white_x, double white_y, double red_x, double red_y,
+   double green_x, double green_y, double blue_x, double blue_y)
+{
+   png_debug1(1, "in %s storage function\n", "cHRM");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (white_x < 0.0 || white_y < 0.0 ||
+         red_x < 0.0 ||   red_y < 0.0 ||
+       green_x < 0.0 || green_y < 0.0 ||
+        blue_x < 0.0 ||  blue_y < 0.0)
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set negative chromaticity value");
+      return;
+   }
+   if (white_x > 21474.83 || white_y > 21474.83 ||
+         red_x > 21474.83 ||   red_y > 21474.83 ||
+       green_x > 21474.83 || green_y > 21474.83 ||
+        blue_x > 21474.83 ||  blue_y > 21474.83)
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set chromaticity value exceeding 21474.83");
+      return;
+   }
+
+   info_ptr->x_white = (float)white_x;
+   info_ptr->y_white = (float)white_y;
+   info_ptr->x_red   = (float)red_x;
+   info_ptr->y_red   = (float)red_y;
+   info_ptr->x_green = (float)green_x;
+   info_ptr->y_green = (float)green_y;
+   info_ptr->x_blue  = (float)blue_x;
+   info_ptr->y_blue  = (float)blue_y;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_x_white = (png_fixed_point)(white_x*100000.+0.5);
+   info_ptr->int_y_white = (png_fixed_point)(white_y*100000.+0.5);
+   info_ptr->int_x_red   = (png_fixed_point)(  red_x*100000.+0.5);
+   info_ptr->int_y_red   = (png_fixed_point)(  red_y*100000.+0.5);
+   info_ptr->int_x_green = (png_fixed_point)(green_x*100000.+0.5);
+   info_ptr->int_y_green = (png_fixed_point)(green_y*100000.+0.5);
+   info_ptr->int_x_blue  = (png_fixed_point)( blue_x*100000.+0.5);
+   info_ptr->int_y_blue  = (png_fixed_point)( blue_y*100000.+0.5);
+#endif
+   info_ptr->valid |= PNG_INFO_cHRM;
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void PNGAPI
+png_set_cHRM_fixed(png_structp png_ptr, png_infop info_ptr,
+   png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x,
+   png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
+   png_fixed_point blue_x, png_fixed_point blue_y)
+{
+   png_debug1(1, "in %s storage function\n", "cHRM");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (white_x < 0 || white_y < 0 ||
+         red_x < 0 ||   red_y < 0 ||
+       green_x < 0 || green_y < 0 ||
+        blue_x < 0 ||  blue_y < 0)
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set negative chromaticity value");
+      return;
+   }
+   if (white_x > (double) PNG_UINT_31_MAX ||
+       white_y > (double) PNG_UINT_31_MAX ||
+         red_x > (double) PNG_UINT_31_MAX ||
+         red_y > (double) PNG_UINT_31_MAX ||
+       green_x > (double) PNG_UINT_31_MAX ||
+       green_y > (double) PNG_UINT_31_MAX ||
+        blue_x > (double) PNG_UINT_31_MAX ||
+        blue_y > (double) PNG_UINT_31_MAX)
+   {
+      png_warning(png_ptr,
+        "Ignoring attempt to set chromaticity value exceeding 21474.83");
+      return;
+   }
+   info_ptr->int_x_white = white_x;
+   info_ptr->int_y_white = white_y;
+   info_ptr->int_x_red   = red_x;
+   info_ptr->int_y_red   = red_y;
+   info_ptr->int_x_green = green_x;
+   info_ptr->int_y_green = green_y;
+   info_ptr->int_x_blue  = blue_x;
+   info_ptr->int_y_blue  = blue_y;
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   info_ptr->x_white = (float)(white_x/100000.);
+   info_ptr->y_white = (float)(white_y/100000.);
+   info_ptr->x_red   = (float)(  red_x/100000.);
+   info_ptr->y_red   = (float)(  red_y/100000.);
+   info_ptr->x_green = (float)(green_x/100000.);
+   info_ptr->y_green = (float)(green_y/100000.);
+   info_ptr->x_blue  = (float)( blue_x/100000.);
+   info_ptr->y_blue  = (float)( blue_y/100000.);
+#endif
+   info_ptr->valid |= PNG_INFO_cHRM;
+}
+#endif
+#endif
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_gAMA(png_structp png_ptr, png_infop info_ptr, double file_gamma)
+{
+   double gamma;
+   png_debug1(1, "in %s storage function\n", "gAMA");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* Check for overflow */
+   if (file_gamma > 21474.83)
+   {
+      png_warning(png_ptr, "Limiting gamma to 21474.83");
+      gamma=21474.83;
+   }
+   else
+      gamma=file_gamma;
+   info_ptr->gamma = (float)gamma;
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_gamma = (int)(gamma*100000.+.5);
+#endif
+   info_ptr->valid |= PNG_INFO_gAMA;
+   if(gamma == 0.0)
+      png_warning(png_ptr, "Setting gamma=0");
+}
+#endif
+void PNGAPI
+png_set_gAMA_fixed(png_structp png_ptr, png_infop info_ptr, png_fixed_point
+   int_gamma)
+{
+   png_fixed_point gamma;
+
+   png_debug1(1, "in %s storage function\n", "gAMA");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (int_gamma > (png_fixed_point) PNG_UINT_31_MAX)
+   {
+     png_warning(png_ptr, "Limiting gamma to 21474.83");
+     gamma=PNG_UINT_31_MAX;
+   }
+   else
+   {
+     if (int_gamma < 0)
+     {
+       png_warning(png_ptr, "Setting negative gamma to zero");
+       gamma=0;
+     }
+     else
+       gamma=int_gamma;
+   }
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   info_ptr->gamma = (float)(gamma/100000.);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   info_ptr->int_gamma = gamma;
+#endif
+   info_ptr->valid |= PNG_INFO_gAMA;
+   if(gamma == 0)
+      png_warning(png_ptr, "Setting gamma=0");
+}
+#endif
+
+#if defined(PNG_hIST_SUPPORTED)
+void PNGAPI
+png_set_hIST(png_structp png_ptr, png_infop info_ptr, png_uint_16p hist)
+{
+   int i;
+
+   png_debug1(1, "in %s storage function\n", "hIST");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+   if (info_ptr->num_palette == 0)
+   {
+       png_warning(png_ptr,
+          "Palette size 0, hIST allocation skipped.");
+       return;
+   }
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_HIST, 0);
+#endif
+   /* Changed from info->num_palette to 256 in version 1.2.1 */
+   png_ptr->hist = (png_uint_16p)png_malloc_warn(png_ptr,
+      (png_uint_32)(256 * png_sizeof (png_uint_16)));
+   if (png_ptr->hist == NULL)
+     {
+       png_warning(png_ptr, "Insufficient memory for hIST chunk data.");
+       return;
+     }
+
+   for (i = 0; i < info_ptr->num_palette; i++)
+       png_ptr->hist[i] = hist[i];
+   info_ptr->hist = png_ptr->hist;
+   info_ptr->valid |= PNG_INFO_hIST;
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_HIST;
+#else
+   png_ptr->flags |= PNG_FLAG_FREE_HIST;
+#endif
+}
+#endif
+
+void PNGAPI
+png_set_IHDR(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 width, png_uint_32 height, int bit_depth,
+   int color_type, int interlace_type, int compression_type,
+   int filter_type)
+{
+   png_debug1(1, "in %s storage function\n", "IHDR");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* check for width and height valid values */
+   if (width == 0 || height == 0)
+      png_error(png_ptr, "Image width or height is zero in IHDR");
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   if (width > png_ptr->user_width_max || height > png_ptr->user_height_max)
+      png_error(png_ptr, "image size exceeds user limits in IHDR");
+#else
+   if (width > PNG_USER_WIDTH_MAX || height > PNG_USER_HEIGHT_MAX)
+      png_error(png_ptr, "image size exceeds user limits in IHDR");
+#endif
+   if (width > PNG_UINT_31_MAX || height > PNG_UINT_31_MAX)
+      png_error(png_ptr, "Invalid image size in IHDR");
+   if ( width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      png_warning(png_ptr, "Width is too large for libpng to process pixels");
+
+   /* check other values */
+   if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
+      bit_depth != 8 && bit_depth != 16)
+      png_error(png_ptr, "Invalid bit depth in IHDR");
+
+   if (color_type < 0 || color_type == 1 ||
+      color_type == 5 || color_type > 6)
+      png_error(png_ptr, "Invalid color type in IHDR");
+
+   if (((color_type == PNG_COLOR_TYPE_PALETTE) && bit_depth > 8) ||
+       ((color_type == PNG_COLOR_TYPE_RGB ||
+         color_type == PNG_COLOR_TYPE_GRAY_ALPHA ||
+         color_type == PNG_COLOR_TYPE_RGB_ALPHA) && bit_depth < 8))
+      png_error(png_ptr, "Invalid color type/bit depth combination in IHDR");
+
+   if (interlace_type >= PNG_INTERLACE_LAST)
+      png_error(png_ptr, "Unknown interlace method in IHDR");
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+      png_error(png_ptr, "Unknown compression method in IHDR");
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   /* Accept filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not read a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE)&&png_ptr->mng_features_permitted)
+      png_warning(png_ptr,"MNG features are not allowed in a PNG datastream\n");
+   if(filter_type != PNG_FILTER_TYPE_BASE)
+   {
+     if(!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+        (filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
+        ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
+        (color_type == PNG_COLOR_TYPE_RGB || 
+         color_type == PNG_COLOR_TYPE_RGB_ALPHA)))
+        png_error(png_ptr, "Unknown filter method in IHDR");
+     if(png_ptr->mode&PNG_HAVE_PNG_SIGNATURE)
+        png_warning(png_ptr, "Invalid filter method in IHDR");
+   }
+#else
+   if(filter_type != PNG_FILTER_TYPE_BASE)
+      png_error(png_ptr, "Unknown filter method in IHDR");
+#endif
+
+   info_ptr->width = width;
+   info_ptr->height = height;
+   info_ptr->bit_depth = (png_byte)bit_depth;
+   info_ptr->color_type =(png_byte) color_type;
+   info_ptr->compression_type = (png_byte)compression_type;
+   info_ptr->filter_type = (png_byte)filter_type;
+   info_ptr->interlace_type = (png_byte)interlace_type;
+   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      info_ptr->channels = 1;
+   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+      info_ptr->channels = 3;
+   else
+      info_ptr->channels = 1;
+   if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+      info_ptr->channels++;
+   info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
+
+   /* check for potential overflow */
+   if ( width > (PNG_UINT_32_MAX
+                 >> 3)      /* 8-byte RGBA pixels */
+                 - 64       /* bigrowbuf hack */
+                 - 1        /* filter byte */
+                 - 7*8      /* rounding of width to multiple of 8 pixels */
+                 - 8)       /* extra max_pixel_depth pad */
+      info_ptr->rowbytes = (png_size_t)0;
+   else
+      info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth,width);
+}
+
+#if defined(PNG_oFFs_SUPPORTED)
+void PNGAPI
+png_set_oFFs(png_structp png_ptr, png_infop info_ptr,
+   png_int_32 offset_x, png_int_32 offset_y, int unit_type)
+{
+   png_debug1(1, "in %s storage function\n", "oFFs");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_offset = offset_x;
+   info_ptr->y_offset = offset_y;
+   info_ptr->offset_unit_type = (png_byte)unit_type;
+   info_ptr->valid |= PNG_INFO_oFFs;
+}
+#endif
+
+#if defined(PNG_pCAL_SUPPORTED)
+void PNGAPI
+png_set_pCAL(png_structp png_ptr, png_infop info_ptr,
+   png_charp purpose, png_int_32 X0, png_int_32 X1, int type, int nparams,
+   png_charp units, png_charpp params)
+{
+   png_uint_32 length;
+   int i;
+
+   png_debug1(1, "in %s storage function\n", "pCAL");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   length = png_strlen(purpose) + 1;
+   png_debug1(3, "allocating purpose for info (%lu bytes)\n", length);
+   info_ptr->pcal_purpose = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->pcal_purpose == NULL)
+     {
+       png_warning(png_ptr, "Insufficient memory for pCAL purpose.");
+       return;
+     }
+   png_memcpy(info_ptr->pcal_purpose, purpose, (png_size_t)length);
+
+   png_debug(3, "storing X0, X1, type, and nparams in info\n");
+   info_ptr->pcal_X0 = X0;
+   info_ptr->pcal_X1 = X1;
+   info_ptr->pcal_type = (png_byte)type;
+   info_ptr->pcal_nparams = (png_byte)nparams;
+
+   length = png_strlen(units) + 1;
+   png_debug1(3, "allocating units for info (%lu bytes)\n", length);
+   info_ptr->pcal_units = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->pcal_units == NULL)
+     {
+       png_warning(png_ptr, "Insufficient memory for pCAL units.");
+       return;
+     }
+   png_memcpy(info_ptr->pcal_units, units, (png_size_t)length);
+
+   info_ptr->pcal_params = (png_charpp)png_malloc_warn(png_ptr,
+      (png_uint_32)((nparams + 1) * png_sizeof(png_charp)));
+   if (info_ptr->pcal_params == NULL)
+     {
+       png_warning(png_ptr, "Insufficient memory for pCAL params.");
+       return;
+     }
+
+   info_ptr->pcal_params[nparams] = NULL;
+
+   for (i = 0; i < nparams; i++)
+   {
+      length = png_strlen(params[i]) + 1;
+      png_debug2(3, "allocating parameter %d for info (%lu bytes)\n", i, length);
+      info_ptr->pcal_params[i] = (png_charp)png_malloc_warn(png_ptr, length);
+      if (info_ptr->pcal_params[i] == NULL)
+        {
+          png_warning(png_ptr, "Insufficient memory for pCAL parameter.");
+          return;
+        }
+      png_memcpy(info_ptr->pcal_params[i], params[i], (png_size_t)length);
+   }
+
+   info_ptr->valid |= PNG_INFO_pCAL;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_PCAL;
+#endif
+}
+#endif
+
+#if defined(PNG_READ_sCAL_SUPPORTED) || defined(PNG_WRITE_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_sCAL(png_structp png_ptr, png_infop info_ptr,
+             int unit, double width, double height)
+{
+   png_debug1(1, "in %s storage function\n", "sCAL");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->scal_unit = (png_byte)unit;
+   info_ptr->scal_pixel_width = width;
+   info_ptr->scal_pixel_height = height;
+
+   info_ptr->valid |= PNG_INFO_sCAL;
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void PNGAPI
+png_set_sCAL_s(png_structp png_ptr, png_infop info_ptr,
+             int unit, png_charp swidth, png_charp sheight)
+{
+   png_uint_32 length;
+
+   png_debug1(1, "in %s storage function\n", "sCAL");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->scal_unit = (png_byte)unit;
+
+   length = png_strlen(swidth) + 1;
+   png_debug1(3, "allocating unit for info (%d bytes)\n", length);
+   info_ptr->scal_s_width = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->scal_s_width == NULL)
+   {
+      png_warning(png_ptr, "Memory allocation failed while processing sCAL.");
+   }
+   png_memcpy(info_ptr->scal_s_width, swidth, (png_size_t)length);
+
+   length = png_strlen(sheight) + 1;
+   png_debug1(3, "allocating unit for info (%d bytes)\n", length);
+   info_ptr->scal_s_height = (png_charp)png_malloc_warn(png_ptr, length);
+   if (info_ptr->scal_s_height == NULL)
+   {
+      png_free (png_ptr, info_ptr->scal_s_width);
+      png_warning(png_ptr, "Memory allocation failed while processing sCAL.");
+   }
+   png_memcpy(info_ptr->scal_s_height, sheight, (png_size_t)length);
+
+   info_ptr->valid |= PNG_INFO_sCAL;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_SCAL;
+#endif
+}
+#endif
+#endif
+#endif
+
+#if defined(PNG_pHYs_SUPPORTED)
+void PNGAPI
+png_set_pHYs(png_structp png_ptr, png_infop info_ptr,
+   png_uint_32 res_x, png_uint_32 res_y, int unit_type)
+{
+   png_debug1(1, "in %s storage function\n", "pHYs");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->x_pixels_per_unit = res_x;
+   info_ptr->y_pixels_per_unit = res_y;
+   info_ptr->phys_unit_type = (png_byte)unit_type;
+   info_ptr->valid |= PNG_INFO_pHYs;
+}
+#endif
+
+void PNGAPI
+png_set_PLTE(png_structp png_ptr, png_infop info_ptr,
+   png_colorp palette, int num_palette)
+{
+
+   png_debug1(1, "in %s storage function\n", "PLTE");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /*
+    * It may not actually be necessary to set png_ptr->palette here;
+    * we do it for backward compatibility with the way the png_handle_tRNS
+    * function used to do the allocation.
+    */
+#ifdef PNG_FREE_ME_SUPPORTED
+   png_free_data(png_ptr, info_ptr, PNG_FREE_PLTE, 0);
+#endif
+
+   /* Changed in libpng-1.2.1 to allocate 256 instead of num_palette entries,
+      in case of an invalid PNG file that has too-large sample values. */
+   png_ptr->palette = (png_colorp)png_malloc(png_ptr,
+      256 * png_sizeof(png_color));
+   png_memset(png_ptr->palette, 0, 256 * png_sizeof(png_color));
+   png_memcpy(png_ptr->palette, palette, num_palette * png_sizeof (png_color));
+   info_ptr->palette = png_ptr->palette;
+   info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette;
+
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_PLTE;
+#else
+   png_ptr->flags |= PNG_FLAG_FREE_PLTE;
+#endif
+
+   info_ptr->valid |= PNG_INFO_PLTE;
+}
+
+#if defined(PNG_sBIT_SUPPORTED)
+void PNGAPI
+png_set_sBIT(png_structp png_ptr, png_infop info_ptr,
+   png_color_8p sig_bit)
+{
+   png_debug1(1, "in %s storage function\n", "sBIT");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_memcpy(&(info_ptr->sig_bit), sig_bit, png_sizeof (png_color_8));
+   info_ptr->valid |= PNG_INFO_sBIT;
+}
+#endif
+
+#if defined(PNG_sRGB_SUPPORTED)
+void PNGAPI
+png_set_sRGB(png_structp png_ptr, png_infop info_ptr, int intent)
+{
+   png_debug1(1, "in %s storage function\n", "sRGB");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   info_ptr->srgb_intent = (png_byte)intent;
+   info_ptr->valid |= PNG_INFO_sRGB;
+}
+
+void PNGAPI
+png_set_sRGB_gAMA_and_cHRM(png_structp png_ptr, png_infop info_ptr,
+   int intent)
+{
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float file_gamma;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_fixed_point int_file_gamma;
+#endif
+#endif
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   float white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   png_fixed_point int_white_x, int_white_y, int_red_x, int_red_y, int_green_x,
+      int_green_y, int_blue_x, int_blue_y;
+#endif
+#endif
+   png_debug1(1, "in %s storage function\n", "sRGB_gAMA_and_cHRM");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   png_set_sRGB(png_ptr, info_ptr, intent);
+
+#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   file_gamma = (float).45455;
+   png_set_gAMA(png_ptr, info_ptr, file_gamma);
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   int_file_gamma = 45455L;
+   png_set_gAMA_fixed(png_ptr, info_ptr, int_file_gamma);
+#endif
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   int_white_x = 31270L;
+   int_white_y = 32900L;
+   int_red_x   = 64000L;
+   int_red_y   = 33000L;
+   int_green_x = 30000L;
+   int_green_y = 60000L;
+   int_blue_x  = 15000L;
+   int_blue_y  =  6000L;
+
+   png_set_cHRM_fixed(png_ptr, info_ptr,
+      int_white_x, int_white_y, int_red_x, int_red_y, int_green_x, int_green_y,
+      int_blue_x, int_blue_y);
+#endif
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   white_x = (float).3127;
+   white_y = (float).3290;
+   red_x   = (float).64;
+   red_y   = (float).33;
+   green_x = (float).30;
+   green_y = (float).60;
+   blue_x  = (float).15;
+   blue_y  = (float).06;
+
+   png_set_cHRM(png_ptr, info_ptr,
+      white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y);
+#endif
+#endif
+}
+#endif
+
+
+#if defined(PNG_iCCP_SUPPORTED)
+void PNGAPI
+png_set_iCCP(png_structp png_ptr, png_infop info_ptr,
+             png_charp name, int compression_type,
+             png_charp profile, png_uint_32 proflen)
+{
+   png_charp new_iccp_name;
+   png_charp new_iccp_profile;
+
+   png_debug1(1, "in %s storage function\n", "iCCP");
+   if (png_ptr == NULL || info_ptr == NULL || name == NULL || profile == NULL)
+      return;
+
+   new_iccp_name = (png_charp)png_malloc_warn(png_ptr, png_strlen(name)+1);
+   if (new_iccp_name == NULL)
+   {
+      png_warning(png_ptr, "Insufficient memory to process iCCP chunk.");
+      return;
+   }
+   png_strcpy(new_iccp_name, name);
+   new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen);
+   if (new_iccp_profile == NULL)
+   {
+      png_free (png_ptr, new_iccp_name);
+      png_warning(png_ptr, "Insufficient memory to process iCCP profile.");
+      return;
+   }
+   png_memcpy(new_iccp_profile, profile, (png_size_t)proflen);
+
+   png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, 0);
+
+   info_ptr->iccp_proflen = proflen;
+   info_ptr->iccp_name = new_iccp_name;
+   info_ptr->iccp_profile = new_iccp_profile;
+   /* Compression is always zero but is here so the API and info structure
+    * does not have to change if we introduce multiple compression types */
+   info_ptr->iccp_compression = (png_byte)compression_type;
+#ifdef PNG_FREE_ME_SUPPORTED
+   info_ptr->free_me |= PNG_FREE_ICCP;
+#endif
+   info_ptr->valid |= PNG_INFO_iCCP;
+}
+#endif
+
+#if defined(PNG_TEXT_SUPPORTED)
+void PNGAPI
+png_set_text(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
+   int num_text)
+{
+   int ret;
+   ret=png_set_text_2(png_ptr, info_ptr, text_ptr, num_text);
+   if (ret)
+     png_error(png_ptr, "Insufficient memory to store text");
+}
+
+int /* PRIVATE */
+png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr,
+   int num_text)
+{
+   int i;
+
+   png_debug1(1, "in %s storage function\n", (png_ptr->chunk_name[0] == '\0' ?
+      "text" : (png_const_charp)png_ptr->chunk_name));
+
+   if (png_ptr == NULL || info_ptr == NULL || num_text == 0)
+      return(0);
+
+   /* Make sure we have enough space in the "text" array in info_struct
+    * to hold all of the incoming text_ptr objects.
+    */
+   if (info_ptr->num_text + num_text > info_ptr->max_text)
+   {
+      if (info_ptr->text != NULL)
+      {
+         png_textp old_text;
+         int old_max;
+
+         old_max = info_ptr->max_text;
+         info_ptr->max_text = info_ptr->num_text + num_text + 8;
+         old_text = info_ptr->text;
+         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
+            (png_uint_32)(info_ptr->max_text * png_sizeof (png_text)));
+         if (info_ptr->text == NULL)
+           {
+             png_free(png_ptr, old_text);
+             return(1);
+           }
+         png_memcpy(info_ptr->text, old_text, (png_size_t)(old_max *
+            png_sizeof(png_text)));
+         png_free(png_ptr, old_text);
+      }
+      else
+      {
+         info_ptr->max_text = num_text + 8;
+         info_ptr->num_text = 0;
+         info_ptr->text = (png_textp)png_malloc_warn(png_ptr,
+            (png_uint_32)(info_ptr->max_text * png_sizeof (png_text)));
+         if (info_ptr->text == NULL)
+           return(1);
+#ifdef PNG_FREE_ME_SUPPORTED
+         info_ptr->free_me |= PNG_FREE_TEXT;
+#endif
+      }
+      png_debug1(3, "allocated %d entries for info_ptr->text\n",
+         info_ptr->max_text);
+   }
+   for (i = 0; i < num_text; i++)
+   {
+      png_size_t text_length,key_len;
+      png_size_t lang_len,lang_key_len;
+      png_textp textp = &(info_ptr->text[info_ptr->num_text]);
+
+      if (text_ptr[i].key == NULL)
+          continue;
+
+      key_len = png_strlen(text_ptr[i].key);
+
+      if(text_ptr[i].compression <= 0)
+      {
+        lang_len = 0;
+        lang_key_len = 0;
+      }
+      else
+#ifdef PNG_iTXt_SUPPORTED
+      {
+        /* set iTXt data */
+        if (text_ptr[i].lang != NULL)
+          lang_len = png_strlen(text_ptr[i].lang);
+        else
+          lang_len = 0;
+        if (text_ptr[i].lang_key != NULL)
+          lang_key_len = png_strlen(text_ptr[i].lang_key);
+        else
+          lang_key_len = 0;
+      }
+#else
+      {
+        png_warning(png_ptr, "iTXt chunk not supported.");
+        continue;
+      }
+#endif
+
+      if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')
+      {
+         text_length = 0;
+#ifdef PNG_iTXt_SUPPORTED
+         if(text_ptr[i].compression > 0)
+            textp->compression = PNG_ITXT_COMPRESSION_NONE;
+         else
+#endif
+            textp->compression = PNG_TEXT_COMPRESSION_NONE;
+      }
+      else
+      {
+         text_length = png_strlen(text_ptr[i].text);
+         textp->compression = text_ptr[i].compression;
+      }
+
+      textp->key = (png_charp)png_malloc_warn(png_ptr,
+         (png_uint_32)(key_len + text_length + lang_len + lang_key_len + 4));
+      if (textp->key == NULL)
+        return(1);
+      png_debug2(2, "Allocated %lu bytes at %x in png_set_text\n",
+         (png_uint_32)(key_len + lang_len + lang_key_len + text_length + 4),
+         (int)textp->key);
+
+      png_memcpy(textp->key, text_ptr[i].key,
+         (png_size_t)(key_len));
+      *(textp->key+key_len) = '\0';
+#ifdef PNG_iTXt_SUPPORTED
+      if (text_ptr[i].compression > 0)
+      {
+         textp->lang=textp->key + key_len + 1;
+         png_memcpy(textp->lang, text_ptr[i].lang, lang_len);
+         *(textp->lang+lang_len) = '\0';
+         textp->lang_key=textp->lang + lang_len + 1;
+         png_memcpy(textp->lang_key, text_ptr[i].lang_key, lang_key_len);
+         *(textp->lang_key+lang_key_len) = '\0';
+         textp->text=textp->lang_key + lang_key_len + 1;
+      }
+      else
+#endif
+      {
+#ifdef PNG_iTXt_SUPPORTED
+         textp->lang=NULL;
+         textp->lang_key=NULL;
+#endif
+         textp->text=textp->key + key_len + 1;
+      }
+      if(text_length)
+         png_memcpy(textp->text, text_ptr[i].text,
+            (png_size_t)(text_length));
+      *(textp->text+text_length) = '\0';
+
+#ifdef PNG_iTXt_SUPPORTED
+      if(textp->compression > 0)
+      {
+         textp->text_length = 0;
+         textp->itxt_length = text_length;
+      }
+      else
+#endif
+      {
+         textp->text_length = text_length;
+#ifdef PNG_iTXt_SUPPORTED
+         textp->itxt_length = 0;
+#endif
+      }
+      info_ptr->text[info_ptr->num_text]= *textp;
+      info_ptr->num_text++;
+      png_debug1(3, "transferred text chunk %d\n", info_ptr->num_text);
+   }
+   return(0);
+}
+#endif
+
+#if defined(PNG_tIME_SUPPORTED)
+void PNGAPI
+png_set_tIME(png_structp png_ptr, png_infop info_ptr, png_timep mod_time)
+{
+   png_debug1(1, "in %s storage function\n", "tIME");
+   if (png_ptr == NULL || info_ptr == NULL ||
+       (png_ptr->mode & PNG_WROTE_tIME))
+      return;
+
+   png_memcpy(&(info_ptr->mod_time), mod_time, png_sizeof (png_time));
+   info_ptr->valid |= PNG_INFO_tIME;
+}
+#endif
+
+#if defined(PNG_tRNS_SUPPORTED)
+void PNGAPI
+png_set_tRNS(png_structp png_ptr, png_infop info_ptr,
+   png_bytep trans, int num_trans, png_color_16p trans_values)
+{
+   png_debug1(1, "in %s storage function\n", "tRNS");
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if (trans != NULL)
+   {
+       /*
+        * It may not actually be necessary to set png_ptr->trans here;
+        * we do it for backward compatibility with the way the png_handle_tRNS
+        * function used to do the allocation.
+        */
+#ifdef PNG_FREE_ME_SUPPORTED
+       png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
+#endif
+       /* Changed from num_trans to 256 in version 1.2.1 */
+       png_ptr->trans = info_ptr->trans = (png_bytep)png_malloc(png_ptr,
+           (png_uint_32)256);
+       png_memcpy(info_ptr->trans, trans, (png_size_t)num_trans);
+#ifdef PNG_FREE_ME_SUPPORTED
+       info_ptr->free_me |= PNG_FREE_TRNS;
+#else
+       png_ptr->flags |= PNG_FLAG_FREE_TRNS;
+#endif
+   }
+
+   if (trans_values != NULL)
+   {
+      png_memcpy(&(info_ptr->trans_values), trans_values,
+         png_sizeof(png_color_16));
+      if (num_trans == 0)
+        num_trans = 1;
+   }
+   info_ptr->num_trans = (png_uint_16)num_trans;
+   info_ptr->valid |= PNG_INFO_tRNS;
+}
+#endif
+
+#if defined(PNG_sPLT_SUPPORTED)
+void PNGAPI
+png_set_sPLT(png_structp png_ptr,
+             png_infop info_ptr, png_sPLT_tp entries, int nentries)
+{
+    png_sPLT_tp np;
+    int i;
+
+    np = (png_sPLT_tp)png_malloc_warn(png_ptr,
+        (info_ptr->splt_palettes_num + nentries) * png_sizeof(png_sPLT_t));
+    if (np == NULL)
+    {
+      png_warning(png_ptr, "No memory for sPLT palettes.");
+      return;
+    }
+
+    png_memcpy(np, info_ptr->splt_palettes,
+           info_ptr->splt_palettes_num * png_sizeof(png_sPLT_t));
+    png_free(png_ptr, info_ptr->splt_palettes);
+    info_ptr->splt_palettes=NULL;
+
+    for (i = 0; i < nentries; i++)
+    {
+        png_sPLT_tp to = np + info_ptr->splt_palettes_num + i;
+        png_sPLT_tp from = entries + i;
+
+        to->name = (png_charp)png_malloc(png_ptr,
+            png_strlen(from->name) + 1);
+        /* TODO: use png_malloc_warn */
+        png_strcpy(to->name, from->name);
+        to->entries = (png_sPLT_entryp)png_malloc(png_ptr,
+            from->nentries * png_sizeof(png_sPLT_t));
+        /* TODO: use png_malloc_warn */
+        png_memcpy(to->entries, from->entries,
+            from->nentries * png_sizeof(png_sPLT_t));
+        to->nentries = from->nentries;
+        to->depth = from->depth;
+    }
+
+    info_ptr->splt_palettes = np;
+    info_ptr->splt_palettes_num += nentries;
+    info_ptr->valid |= PNG_INFO_sPLT;
+#ifdef PNG_FREE_ME_SUPPORTED
+    info_ptr->free_me |= PNG_FREE_SPLT;
+#endif
+}
+#endif /* PNG_sPLT_SUPPORTED */
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+void PNGAPI
+png_set_unknown_chunks(png_structp png_ptr,
+   png_infop info_ptr, png_unknown_chunkp unknowns, int num_unknowns)
+{
+    png_unknown_chunkp np;
+    int i;
+
+    if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
+        return;
+
+    np = (png_unknown_chunkp)png_malloc_warn(png_ptr,
+        (info_ptr->unknown_chunks_num + num_unknowns) *
+        png_sizeof(png_unknown_chunk));
+    if (np == NULL)
+    {
+       png_warning(png_ptr, "Out of memory while processing unknown chunk.");
+       return;
+    }
+
+    png_memcpy(np, info_ptr->unknown_chunks,
+           info_ptr->unknown_chunks_num * png_sizeof(png_unknown_chunk));
+    png_free(png_ptr, info_ptr->unknown_chunks);
+    info_ptr->unknown_chunks=NULL;
+
+    for (i = 0; i < num_unknowns; i++)
+    {
+        png_unknown_chunkp to = np + info_ptr->unknown_chunks_num + i;
+        png_unknown_chunkp from = unknowns + i;
+
+        png_strncpy((png_charp)to->name, (png_charp)from->name, 5);
+        to->data = (png_bytep)png_malloc_warn(png_ptr, from->size);
+        if (to->data == NULL)
+        {
+           png_warning(png_ptr, "Out of memory processing unknown chunk.");
+        }
+        else
+        {
+           png_memcpy(to->data, from->data, from->size);
+           to->size = from->size;
+
+           /* note our location in the read or write sequence */
+           to->location = (png_byte)(png_ptr->mode & 0xff);
+        }
+    }
+
+    info_ptr->unknown_chunks = np;
+    info_ptr->unknown_chunks_num += num_unknowns;
+#ifdef PNG_FREE_ME_SUPPORTED
+    info_ptr->free_me |= PNG_FREE_UNKN;
+#endif
+}
+void PNGAPI
+png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr,
+   int chunk, int location)
+{
+   if(png_ptr != NULL && info_ptr != NULL && chunk >= 0 && chunk <
+         (int)info_ptr->unknown_chunks_num)
+      info_ptr->unknown_chunks[chunk].location = (png_byte)location;
+}
+#endif
+
+#if defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
+    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
+void PNGAPI
+png_permit_empty_plte (png_structp png_ptr, int empty_plte_permitted)
+{
+   /* This function is deprecated in favor of png_permit_mng_features()
+      and will be removed from libpng-2.0.0 */
+   png_debug(1, "in png_permit_empty_plte, DEPRECATED.\n");
+   if (png_ptr == NULL)
+      return;
+   png_ptr->mng_features_permitted = (png_byte)
+     ((png_ptr->mng_features_permitted & (~(PNG_FLAG_MNG_EMPTY_PLTE))) |
+     ((empty_plte_permitted & PNG_FLAG_MNG_EMPTY_PLTE)));
+}
+#endif
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+png_uint_32 PNGAPI
+png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features)
+{
+   png_debug(1, "in png_permit_mng_features\n");
+   if (png_ptr == NULL)
+      return (png_uint_32)0;
+   png_ptr->mng_features_permitted =
+     (png_byte)(mng_features & PNG_ALL_MNG_FEATURES);
+   return (png_uint_32)png_ptr->mng_features_permitted;
+}
+#endif
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+void PNGAPI
+png_set_keep_unknown_chunks(png_structp png_ptr, int keep, png_bytep
+   chunk_list, int num_chunks)
+{
+    png_bytep new_list, p;
+    int i, old_num_chunks;
+    if (num_chunks == 0)
+    {
+      if(keep == PNG_HANDLE_CHUNK_ALWAYS || keep == PNG_HANDLE_CHUNK_IF_SAFE)
+        png_ptr->flags |= PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+      else
+        png_ptr->flags &= ~PNG_FLAG_KEEP_UNKNOWN_CHUNKS;
+
+      if(keep == PNG_HANDLE_CHUNK_ALWAYS)
+        png_ptr->flags |= PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+      else
+        png_ptr->flags &= ~PNG_FLAG_KEEP_UNSAFE_CHUNKS;
+      return;
+    }
+    if (chunk_list == NULL)
+      return;
+    old_num_chunks=png_ptr->num_chunk_list;
+    new_list=(png_bytep)png_malloc(png_ptr,
+       (png_uint_32)(5*(num_chunks+old_num_chunks)));
+    if(png_ptr->chunk_list != NULL)
+    {
+       png_memcpy(new_list, png_ptr->chunk_list,
+          (png_size_t)(5*old_num_chunks));
+       png_free(png_ptr, png_ptr->chunk_list);
+       png_ptr->chunk_list=NULL;
+    }
+    png_memcpy(new_list+5*old_num_chunks, chunk_list,
+       (png_size_t)(5*num_chunks));
+    for (p=new_list+5*old_num_chunks+4, i=0; i<num_chunks; i++, p+=5)
+       *p=(png_byte)keep;
+    png_ptr->num_chunk_list=old_num_chunks+num_chunks;
+    png_ptr->chunk_list=new_list;
+#ifdef PNG_FREE_ME_SUPPORTED
+    png_ptr->free_me |= PNG_FREE_LIST;
+#endif
+}
+#endif
+
+#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
+void PNGAPI
+png_set_read_user_chunk_fn(png_structp png_ptr, png_voidp user_chunk_ptr,
+   png_user_chunk_ptr read_user_chunk_fn)
+{
+   png_debug(1, "in png_set_read_user_chunk_fn\n");
+   png_ptr->read_user_chunk_fn = read_user_chunk_fn;
+   png_ptr->user_chunk_ptr = user_chunk_ptr;
+}
+#endif
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+void PNGAPI
+png_set_rows(png_structp png_ptr, png_infop info_ptr, png_bytepp row_pointers)
+{
+   png_debug1(1, "in %s storage function\n", "rows");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   if(info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))
+      png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
+   info_ptr->row_pointers = row_pointers;
+   if(row_pointers)
+      info_ptr->valid |= PNG_INFO_IDAT;
+}
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+void PNGAPI
+png_set_compression_buffer_size(png_structp png_ptr, png_uint_32 size)
+{
+    if(png_ptr->zbuf)
+       png_free(png_ptr, png_ptr->zbuf);
+    png_ptr->zbuf_size = (png_size_t)size;
+    png_ptr->zbuf = (png_bytep)png_malloc(png_ptr, size);
+    png_ptr->zstream.next_out = png_ptr->zbuf;
+    png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+}
+#endif
+
+void PNGAPI
+png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask)
+{
+   if (png_ptr && info_ptr)
+      info_ptr->valid &= ~(mask);
+}
+
+
+#ifndef PNG_1_0_X
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+/* this function was added to libpng 1.2.0 and should always exist by default */
+void PNGAPI
+png_set_asm_flags (png_structp png_ptr, png_uint_32 asm_flags)
+{
+    png_uint_32 settable_asm_flags;
+    png_uint_32 settable_mmx_flags;
+
+    settable_mmx_flags =
+#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW
+                         PNG_ASM_FLAG_MMX_READ_COMBINE_ROW  |
+#endif
+#ifdef PNG_HAVE_ASSEMBLER_READ_INTERLACE
+                         PNG_ASM_FLAG_MMX_READ_INTERLACE    |
+#endif
+#ifdef PNG_HAVE_ASSEMBLER_READ_FILTER_ROW
+                         PNG_ASM_FLAG_MMX_READ_FILTER_SUB   |
+                         PNG_ASM_FLAG_MMX_READ_FILTER_UP    |
+                         PNG_ASM_FLAG_MMX_READ_FILTER_AVG   |
+                         PNG_ASM_FLAG_MMX_READ_FILTER_PAETH |
+#endif
+                         0;
+
+    /* could be some non-MMX ones in the future, but not currently: */
+    settable_asm_flags = settable_mmx_flags;
+
+    if (!(png_ptr->asm_flags & PNG_ASM_FLAG_MMX_SUPPORT_COMPILED) ||
+        !(png_ptr->asm_flags & PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU))
+    {
+        /* clear all MMX flags if MMX isn't supported */
+        settable_asm_flags &= ~settable_mmx_flags;
+        png_ptr->asm_flags &= ~settable_mmx_flags;
+    }
+
+    /* we're replacing the settable bits with those passed in by the user,
+     * so first zero them out of the master copy, then logical-OR in the
+     * allowed subset that was requested */
+
+    png_ptr->asm_flags &= ~settable_asm_flags;               /* zero them */
+    png_ptr->asm_flags |= (asm_flags & settable_asm_flags);  /* set them */
+}
+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+/* this function was added to libpng 1.2.0 */
+void PNGAPI
+png_set_mmx_thresholds (png_structp png_ptr,
+                        png_byte mmx_bitdepth_threshold,
+                        png_uint_32 mmx_rowbytes_threshold)
+{
+    png_ptr->mmx_bitdepth_threshold = mmx_bitdepth_threshold;
+    png_ptr->mmx_rowbytes_threshold = mmx_rowbytes_threshold;
+}
+#endif /* ?PNG_ASSEMBLER_CODE_SUPPORTED */
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+/* this function was added to libpng 1.2.6 */
+void PNGAPI
+png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max,
+    png_uint_32 user_height_max)
+{
+    /* Images with dimensions larger than these limits will be
+     * rejected by png_set_IHDR().  To accept any PNG datastream
+     * regardless of dimensions, set both limits to 0x7ffffffL.
+     */
+    png_ptr->user_width_max = user_width_max;
+    png_ptr->user_height_max = user_height_max;
+}
+#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+
+#endif /* ?PNG_1_0_X */
diff --git a/Source/3rd Party/wx/src/png/pngstruct.h b/Source/3rd Party/wx/src/png/pngstruct.h
deleted file mode 100644
index 4466b045d..000000000
--- a/Source/3rd Party/wx/src/png/pngstruct.h	
+++ /dev/null
@@ -1,360 +0,0 @@
-
-/* pngstruct.h - header file for PNG reference library
- *
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * Last changed in libpng 1.5.5 [September 22, 2011]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* The structure that holds the information to read and write PNG files.
- * The only people who need to care about what is inside of this are the
- * people who will be modifying the library for their own special needs.
- * It should NOT be accessed directly by an application.
- */
-
-#ifndef PNGSTRUCT_H
-#define PNGSTRUCT_H
-/* zlib.h defines the structure z_stream, an instance of which is included
- * in this structure and is required for decompressing the LZ compressed
- * data in PNG files.
- */
-#include "zlib.h"
-
-struct png_struct_def
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf longjmp_buffer;    /* used in png_error */
-   png_longjmp_ptr longjmp_fn;/* setjmp non-local goto function. */
-#endif
-   png_error_ptr error_fn;    /* function for printing errors and aborting */
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_error_ptr warning_fn;  /* function for printing warnings */
-#endif
-   png_voidp error_ptr;       /* user supplied struct for error functions */
-   png_rw_ptr write_data_fn;  /* function for writing output data */
-   png_rw_ptr read_data_fn;   /* function for reading input data */
-   png_voidp io_ptr;          /* ptr to application struct for I/O functions */
-
-#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
-   png_user_transform_ptr read_user_transform_fn; /* user read transform */
-#endif
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-   png_user_transform_ptr write_user_transform_fn; /* user write transform */
-#endif
-
-/* These were added in libpng-1.0.2 */
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-   png_voidp user_transform_ptr; /* user supplied struct for user transform */
-   png_byte user_transform_depth;    /* bit depth of user transformed pixels */
-   png_byte user_transform_channels; /* channels in user transformed pixels */
-#endif
-#endif
-
-   png_uint_32 mode;          /* tells us where we are in the PNG file */
-   png_uint_32 flags;         /* flags indicating various things to libpng */
-   png_uint_32 transformations; /* which transformations to perform */
-
-   z_stream zstream;          /* pointer to decompression structure (below) */
-   png_bytep zbuf;            /* buffer for zlib */
-   uInt zbuf_size;            /* size of zbuf (typically 65536) */
-#ifdef PNG_WRITE_SUPPORTED
-
-/* Added in 1.5.4: state to keep track of whether the zstream has been
- * initialized and if so whether it is for IDAT or some other chunk.
- */
-#define PNG_ZLIB_UNINITIALIZED 0
-#define PNG_ZLIB_FOR_IDAT      1
-#define PNG_ZLIB_FOR_TEXT      2 /* anything other than IDAT */
-#define PNG_ZLIB_USE_MASK      3 /* bottom two bits */
-#define PNG_ZLIB_IN_USE        4 /* a flag value */
-
-   png_uint_32 zlib_state;       /* State of zlib initialization */
-/* End of material added at libpng 1.5.4 */
-
-   int zlib_level;            /* holds zlib compression level */
-   int zlib_method;           /* holds zlib compression method */
-   int zlib_window_bits;      /* holds zlib compression window bits */
-   int zlib_mem_level;        /* holds zlib compression memory level */
-   int zlib_strategy;         /* holds zlib compression strategy */
-#endif
-/* Added at libpng 1.5.4 */
-#if defined(PNG_WRITE_COMPRESSED_TEXT_SUPPORTED) || \
-    defined(PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED)
-   int zlib_text_level;            /* holds zlib compression level */
-   int zlib_text_method;           /* holds zlib compression method */
-   int zlib_text_window_bits;      /* holds zlib compression window bits */
-   int zlib_text_mem_level;        /* holds zlib compression memory level */
-   int zlib_text_strategy;         /* holds zlib compression strategy */
-#endif
-/* End of material added at libpng 1.5.4 */
-
-   png_uint_32 width;         /* width of image in pixels */
-   png_uint_32 height;        /* height of image in pixels */
-   png_uint_32 num_rows;      /* number of rows in current pass */
-   png_uint_32 usr_width;     /* width of row at start of write */
-   png_size_t rowbytes;       /* size of row in bytes */
-   png_uint_32 iwidth;        /* width of current interlaced row in pixels */
-   png_uint_32 row_number;    /* current row in interlace pass */
-   png_uint_32 chunk_name;    /* PNG_CHUNK() id of current chunk */
-   png_bytep prev_row;        /* buffer to save previous (unfiltered) row.
-                               * This is a pointer into big_prev_row
-                               */
-   png_bytep row_buf;         /* buffer to save current (unfiltered) row.
-                               * This is a pointer into big_row_buf
-                               */
-   png_bytep sub_row;         /* buffer to save "sub" row when filtering */
-   png_bytep up_row;          /* buffer to save "up" row when filtering */
-   png_bytep avg_row;         /* buffer to save "avg" row when filtering */
-   png_bytep paeth_row;       /* buffer to save "Paeth" row when filtering */
-   png_size_t info_rowbytes;  /* Added in 1.5.4: cache of updated row bytes */
-
-   png_uint_32 idat_size;     /* current IDAT size for read */
-   png_uint_32 crc;           /* current chunk CRC value */
-   png_colorp palette;        /* palette from the input file */
-   png_uint_16 num_palette;   /* number of color entries in palette */
-   png_uint_16 num_trans;     /* number of transparency values */
-   png_byte compression;      /* file compression type (always 0) */
-   png_byte filter;           /* file filter type (always 0) */
-   png_byte interlaced;       /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */
-   png_byte pass;             /* current interlace pass (0 - 6) */
-   png_byte do_filter;        /* row filter flags (see PNG_FILTER_ below ) */
-   png_byte color_type;       /* color type of file */
-   png_byte bit_depth;        /* bit depth of file */
-   png_byte usr_bit_depth;    /* bit depth of users row: write only */
-   png_byte pixel_depth;      /* number of bits per pixel */
-   png_byte channels;         /* number of channels in file */
-   png_byte usr_channels;     /* channels at start of write: write only */
-   png_byte sig_bytes;        /* magic bytes read/written from start of file */
-   png_byte maximum_pixel_depth;
-                              /* pixel depth used for the row buffers */
-   png_byte transformed_pixel_depth;
-                              /* pixel depth after read/write transforms */
-   png_byte io_chunk_string[5];
-                              /* string name of chunk */
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-   png_uint_16 filler;           /* filler bytes for pixel expansion */
-#endif
-
-#if defined(PNG_bKGD_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED)
-   png_byte background_gamma_type;
-   png_fixed_point background_gamma;
-   png_color_16 background;   /* background color in screen gamma space */
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   png_color_16 background_1; /* background normalized to gamma 1.0 */
-#endif
-#endif /* PNG_bKGD_SUPPORTED */
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-   png_flush_ptr output_flush_fn; /* Function for flushing output */
-   png_uint_32 flush_dist;    /* how many rows apart to flush, 0 - no flush */
-   png_uint_32 flush_rows;    /* number of rows written since last flush */
-#endif
-
-#ifdef PNG_READ_GAMMA_SUPPORTED
-   int gamma_shift;      /* number of "insignificant" bits in 16-bit gamma */
-   png_fixed_point gamma;        /* file gamma value */
-   png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */
-
-   png_bytep gamma_table;     /* gamma table for 8-bit depth files */
-   png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
-   png_bytep gamma_from_1;    /* converts from 1.0 to screen */
-   png_bytep gamma_to_1;      /* converts from file to 1.0 */
-   png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
-   png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-#endif
-
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
-   png_color_8 sig_bit;       /* significant bits in each available channel */
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-   png_color_8 shift;         /* shift for significant bit tranformation */
-#endif
-
-#if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \
- || defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-   png_bytep trans_alpha;           /* alpha values for paletted files */
-   png_color_16 trans_color;  /* transparent color for non-paletted files */
-#endif
-
-   png_read_status_ptr read_row_fn;   /* called after each row is decoded */
-   png_write_status_ptr write_row_fn; /* called after each row is encoded */
-#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-   png_progressive_info_ptr info_fn; /* called after header data fully read */
-   png_progressive_row_ptr row_fn;   /* called after a prog. row is decoded */
-   png_progressive_end_ptr end_fn;   /* called after image is complete */
-   png_bytep save_buffer_ptr;        /* current location in save_buffer */
-   png_bytep save_buffer;            /* buffer for previously read data */
-   png_bytep current_buffer_ptr;     /* current location in current_buffer */
-   png_bytep current_buffer;         /* buffer for recently used data */
-   png_uint_32 push_length;          /* size of current input chunk */
-   png_uint_32 skip_length;          /* bytes to skip in input data */
-   png_size_t save_buffer_size;      /* amount of data now in save_buffer */
-   png_size_t save_buffer_max;       /* total size of save_buffer */
-   png_size_t buffer_size;           /* total amount of available input data */
-   png_size_t current_buffer_size;   /* amount of data now in current_buffer */
-   int process_mode;                 /* what push library is currently doing */
-   int cur_palette;                  /* current push library palette index */
-
-#  ifdef PNG_TEXT_SUPPORTED
-     png_size_t current_text_size;   /* current size of text input data */
-     png_size_t current_text_left;   /* how much text left to read in input */
-     png_charp current_text;         /* current text chunk buffer */
-     png_charp current_text_ptr;     /* current location in current_text */
-#  endif /* PNG_PROGRESSIVE_READ_SUPPORTED && PNG_TEXT_SUPPORTED */
-
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
-
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* For the Borland special 64K segment handler */
-   png_bytepp offset_table_ptr;
-   png_bytep offset_table;
-   png_uint_16 offset_table_number;
-   png_uint_16 offset_table_count;
-   png_uint_16 offset_table_count_free;
-#endif
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-   png_bytep palette_lookup; /* lookup table for quantizing */
-   png_bytep quantize_index; /* index translation for palette files */
-#endif
-
-#if defined(PNG_READ_QUANTIZE_SUPPORTED) || defined(PNG_hIST_SUPPORTED)
-   png_uint_16p hist;                /* histogram */
-#endif
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   png_byte heuristic_method;        /* heuristic for row filter selection */
-   png_byte num_prev_filters;        /* number of weights for previous rows */
-   png_bytep prev_filters;           /* filter type(s) of previous row(s) */
-   png_uint_16p filter_weights;      /* weight(s) for previous line(s) */
-   png_uint_16p inv_filter_weights;  /* 1/weight(s) for previous line(s) */
-   png_uint_16p filter_costs;        /* relative filter calculation cost */
-   png_uint_16p inv_filter_costs;    /* 1/relative filter calculation cost */
-#endif
-
-#ifdef PNG_TIME_RFC1123_SUPPORTED
-   char time_buffer[29]; /* String to hold RFC 1123 time text */
-#endif
-
-/* New members added in libpng-1.0.6 */
-
-   png_uint_32 free_me;    /* flags items libpng is responsible for freeing */
-
-#ifdef PNG_USER_CHUNKS_SUPPORTED
-   png_voidp user_chunk_ptr;
-   png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
-#endif
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-   int num_chunk_list;
-   png_bytep chunk_list;
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-   /* Added in 1.5.5 to record an sRGB chunk in the png. */
-   png_byte is_sRGB;
-#endif
-
-/* New members added in libpng-1.0.3 */
-#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-   png_byte rgb_to_gray_status;
-   /* Added in libpng 1.5.5 to record setting of coefficients: */
-   png_byte rgb_to_gray_coefficients_set;
-   /* These were changed from png_byte in libpng-1.0.6 */
-   png_uint_16 rgb_to_gray_red_coeff;
-   png_uint_16 rgb_to_gray_green_coeff;
-   /* deleted in 1.5.5: rgb_to_gray_blue_coeff; */
-#endif
-
-/* New member added in libpng-1.0.4 (renamed in 1.0.9) */
-#if defined(PNG_MNG_FEATURES_SUPPORTED) || \
-    defined(PNG_READ_EMPTY_PLTE_SUPPORTED) || \
-    defined(PNG_WRITE_EMPTY_PLTE_SUPPORTED)
-/* Changed from png_byte to png_uint_32 at version 1.2.0 */
-   png_uint_32 mng_features_permitted;
-#endif
-
-/* New member added in libpng-1.0.9, ifdef'ed out in 1.0.12, enabled in 1.2.0 */
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   png_byte filter_type;
-#endif
-
-/* New members added in libpng-1.2.0 */
-
-/* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_voidp mem_ptr;             /* user supplied struct for mem functions */
-   png_malloc_ptr malloc_fn;      /* function for allocating memory */
-   png_free_ptr free_fn;          /* function for freeing memory */
-#endif
-
-/* New member added in libpng-1.0.13 and 1.2.0 */
-   png_bytep big_row_buf;         /* buffer to save current (unfiltered) row */
-
-#ifdef PNG_READ_QUANTIZE_SUPPORTED
-/* The following three members were added at version 1.0.14 and 1.2.4 */
-   png_bytep quantize_sort;          /* working sort array */
-   png_bytep index_to_palette;       /* where the original index currently is
-                                        in the palette */
-   png_bytep palette_to_index;       /* which original index points to this
-                                         palette color */
-#endif
-
-/* New members added in libpng-1.0.16 and 1.2.6 */
-   png_byte compression_type;
-
-#ifdef PNG_USER_LIMITS_SUPPORTED
-   png_uint_32 user_width_max;
-   png_uint_32 user_height_max;
-
-   /* Added in libpng-1.4.0: Total number of sPLT, text, and unknown
-    * chunks that can be stored (0 means unlimited).
-    */
-   png_uint_32 user_chunk_cache_max;
-
-   /* Total memory that a zTXt, sPLT, iTXt, iCCP, or unknown chunk
-    * can occupy when decompressed.  0 means unlimited.
-    */
-   png_alloc_size_t user_chunk_malloc_max;
-#endif
-
-/* New member added in libpng-1.0.25 and 1.2.17 */
-#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-   /* Storage for unknown chunk that the library doesn't recognize. */
-   png_unknown_chunk unknown_chunk;
-#endif
-
-/* New member added in libpng-1.2.26 */
-  png_size_t old_big_row_buf_size;
-
-/* New member added in libpng-1.2.30 */
-  png_charp chunkdata;  /* buffer for reading chunk data */
-
-#ifdef PNG_IO_STATE_SUPPORTED
-/* New member added in libpng-1.4.0 */
-   png_uint_32 io_state;
-#endif
-
-/* New member added in libpng-1.5.6 */
-   png_bytep big_prev_row;
-
-   void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,
-      png_bytep row, png_const_bytep prev_row);
-};
-#endif /* PNGSTRUCT_H */
diff --git a/Source/3rd Party/wx/src/png/pngtest.c b/Source/3rd Party/wx/src/png/pngtest.c
new file mode 100644
index 000000000..431c85dd3
--- /dev/null
+++ b/Source/3rd Party/wx/src/png/pngtest.c	
@@ -0,0 +1,1554 @@
+
+/* pngtest.c - a simple test program to test libpng
+ *
+ * libpng 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This program reads in a PNG image, writes it out again, and then
+ * compares the two files.  If the files are identical, this shows that
+ * the basic chunk handling, filtering, and (de)compression code is working
+ * properly.  It does not currently test all of the transforms, although
+ * it probably should.
+ *
+ * The program will report "FAIL" in certain legitimate cases:
+ * 1) when the compression level or filter selection method is changed.
+ * 2) when the maximum IDAT size (PNG_ZBUF_SIZE in pngconf.h) is not 8192.
+ * 3) unknown unsafe-to-copy ancillary chunks or unknown critical chunks
+ *    exist in the input file.
+ * 4) others not listed here...
+ * In these cases, it is best to check with another tool such as "pngcheck"
+ * to see what the differences between the two files are.
+ *
+ * If a filename is given on the command-line, then this file is used
+ * for the input, rather than the default "pngtest.png".  This allows
+ * testing a wide variety of files easily.  You can also test a number
+ * of files at once by typing "pngtest -m file1.png file2.png ..."
+ */
+
+#include "png.h"
+
+#if defined(_WIN32_WCE)
+#  if _WIN32_WCE < 211
+     __error__ (f|w)printf functions are not supported on old WindowsCE.;
+#  endif
+#  include <windows.h>
+#  include <stdlib.h>
+#  define READFILE(file, data, length, check) \
+     if (ReadFile(file, data, length, &check,NULL)) check = 0
+#  define WRITEFILE(file, data, length, check)) \
+     if (WriteFile(file, data, length, &check, NULL)) check = 0
+#  define FCLOSE(file) CloseHandle(file)
+#else
+#  include <stdio.h>
+#  include <stdlib.h>
+#  include <assert.h>
+#  define READFILE(file, data, length, check) \
+     check=(png_size_t)fread(data,(png_size_t)1,length,file)
+#  define WRITEFILE(file, data, length, check) \
+     check=(png_size_t)fwrite(data,(png_size_t)1, length, file)
+#  define FCLOSE(file) fclose(file)
+#endif
+
+#if defined(PNG_NO_STDIO)
+#  if defined(_WIN32_WCE)
+     typedef HANDLE                png_FILE_p;
+#  else
+     typedef FILE                * png_FILE_p;
+#  endif
+#endif
+
+/* Makes pngtest verbose so we can find problems (needs to be before png.h) */
+#ifndef PNG_DEBUG
+#  define PNG_DEBUG 0
+#endif
+
+#if !PNG_DEBUG
+#  define SINGLE_ROWBUF_ALLOC  /* makes buffer overruns easier to nail */
+#endif
+
+/* Turn on CPU timing
+#define PNGTEST_TIMING
+*/
+
+#ifdef PNG_NO_FLOATING_POINT_SUPPORTED
+#undef PNGTEST_TIMING
+#endif
+
+#ifdef PNGTEST_TIMING
+static float t_start, t_stop, t_decode, t_encode, t_misc;
+#include <time.h>
+#endif
+
+/* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */
+#ifndef png_jmpbuf
+#  define png_jmpbuf(png_ptr) png_ptr->jmpbuf
+#endif
+
+#ifdef PNGTEST_TIMING
+static float t_start, t_stop, t_decode, t_encode, t_misc;
+#if !defined(PNG_tIME_SUPPORTED)
+#include <time.h>
+#endif
+#endif
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+static int tIME_chunk_present=0;
+static char tIME_string[30] = "no tIME chunk present in file";
+#endif
+
+static int verbose = 0;
+
+int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
+
+#ifdef __TURBOC__
+#include <mem.h>
+#endif
+
+/* defined so I can write to a file on gui/windowing platforms */
+/*  #define STDERR stderr  */
+#define STDERR stdout   /* for DOS */
+
+/* example of using row callbacks to make a simple progress meter */
+static int status_pass=1;
+static int status_dots_requested=0;
+static int status_dots=1;
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
+{
+    if(png_ptr == NULL || row_number > PNG_UINT_31_MAX) return;
+    if(status_pass != pass)
+    {
+       fprintf(stdout,"\n Pass %d: ",pass);
+       status_pass = pass;
+       status_dots = 31;
+    }
+    status_dots--;
+    if(status_dots == 0)
+    {
+       fprintf(stdout, "\n         ");
+       status_dots=30;
+    }
+    fprintf(stdout, "r");
+}
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
+{
+    if(png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return;
+    fprintf(stdout, "w");
+}
+
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+/* Example of using user transform callback (we don't transform anything,
+   but merely examine the row filters.  We set this to 256 rather than
+   5 in case illegal filter values are present.) */
+static png_uint_32 filters_used[256];
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+{
+    if(png_ptr != NULL && row_info != NULL)
+      ++filters_used[*(data-1)];
+}
+#endif
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+/* example of using user transform callback (we don't transform anything,
+   but merely count the zero samples) */
+
+static png_uint_32 zero_samples;
+
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+{
+   png_bytep dp = data;
+   if(png_ptr == NULL)return;
+
+   /* contents of row_info:
+    *  png_uint_32 width      width of row
+    *  png_uint_32 rowbytes   number of bytes in row
+    *  png_byte color_type    color type of pixels
+    *  png_byte bit_depth     bit depth of samples
+    *  png_byte channels      number of channels (1-4)
+    *  png_byte pixel_depth   bits per pixel (depth*channels)
+    */
+
+
+    /* counts the number of zero samples (or zero pixels if color_type is 3 */
+
+    if(row_info->color_type == 0 || row_info->color_type == 3)
+    {
+       int pos=0;
+       png_uint_32 n, nstop;
+       for (n=0, nstop=row_info->width; n<nstop; n++)
+       {
+          if(row_info->bit_depth == 1)
+          {
+             if(((*dp << pos++ ) & 0x80) == 0) zero_samples++;
+             if(pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if(row_info->bit_depth == 2)
+          {
+             if(((*dp << (pos+=2)) & 0xc0) == 0) zero_samples++;
+             if(pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if(row_info->bit_depth == 4)
+          {
+             if(((*dp << (pos+=4)) & 0xf0) == 0) zero_samples++;
+             if(pos == 8)
+             {
+                pos = 0;
+                dp++;
+             }
+          }
+          if(row_info->bit_depth == 8)
+             if(*dp++ == 0) zero_samples++;
+          if(row_info->bit_depth == 16)
+          {
+             if((*dp | *(dp+1)) == 0) zero_samples++;
+             dp+=2;
+          }
+       }
+    }
+    else /* other color types */
+    {
+       png_uint_32 n, nstop;
+       int channel;
+       int color_channels = row_info->channels;
+       if(row_info->color_type > 3)color_channels--;
+
+       for (n=0, nstop=row_info->width; n<nstop; n++)
+       {
+          for (channel = 0; channel < color_channels; channel++)
+          {
+             if(row_info->bit_depth == 8)
+                if(*dp++ == 0) zero_samples++;
+             if(row_info->bit_depth == 16)
+             {
+                if((*dp | *(dp+1)) == 0) zero_samples++;
+                dp+=2;
+             }
+          }
+          if(row_info->color_type > 3)
+          {
+             dp++;
+             if(row_info->bit_depth == 16)dp++;
+          }
+       }
+    }
+}
+#endif /* PNG_WRITE_USER_TRANSFORM_SUPPORTED */
+
+static int wrote_question = 0;
+
+#if defined(PNG_NO_STDIO)
+/* START of code to validate stdio-free compilation */
+/* These copies of the default read/write functions come from pngrio.c and */
+/* pngwio.c.  They allow "don't include stdio" testing of the library. */
+/* This is the function that does the actual reading of data.  If you are
+   not reading from a standard C stream, you should create a replacement
+   read_data function and use it at run time with png_set_read_fn(), rather
+   than changing the library. */
+
+#ifndef USE_FAR_KEYWORD
+static void
+pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_size_t check;
+
+   /* fread() returns 0 on error, so it is OK to store this in a png_size_t
+    * instead of an int, which is what fread() actually returns.
+    */
+   READFILE((png_FILE_p)png_ptr->io_ptr, data, length, check);
+
+   if (check != length)
+   {
+      png_error(png_ptr, "Read Error!");
+   }
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   int check;
+   png_byte *n_data;
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   n_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)n_data == data)
+   {
+      READFILE(io_ptr, n_data, length, check);
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t read, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         read = MIN(NEAR_BUF_SIZE, remaining);
+         READFILE(io_ptr, buf, 1, err);
+         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
+         if(err != read)
+            break;
+         else
+            check += err;
+         data += read;
+         remaining -= read;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+   {
+      png_error(png_ptr, "read Error");
+   }
+}
+#endif /* USE_FAR_KEYWORD */
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+static void
+pngtest_flush(png_structp png_ptr)
+{
+#if !defined(_WIN32_WCE)
+   png_FILE_p io_ptr;
+   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+   if (io_ptr != NULL)
+      fflush(io_ptr);
+#endif
+}
+#endif
+
+/* This is the function that does the actual writing of data.  If you are
+   not writing to a standard C stream, you should create a replacement
+   write_data function and use it at run time with png_set_write_fn(), rather
+   than changing the library. */
+#ifndef USE_FAR_KEYWORD
+static void
+pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+
+   WRITEFILE((png_FILE_p)png_ptr->io_ptr,  data, length, check);
+   if (check != length)
+   {
+      png_error(png_ptr, "Write Error");
+   }
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+static void
+pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)near_data == data)
+   {
+      WRITEFILE(io_ptr, near_data, length, check);
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t written, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         written = MIN(NEAR_BUF_SIZE, remaining);
+         png_memcpy(buf, data, written); /* copy far buffer to near buffer */
+         WRITEFILE(io_ptr, buf, written, err);
+         if (err != written)
+            break;
+         else
+            check += err;
+         data += written;
+         remaining -= written;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+   {
+      png_error(png_ptr, "Write Error");
+   }
+}
+
+#endif /* USE_FAR_KEYWORD */
+
+/* This function is called when there is a warning, but the library thinks
+ * it can continue anyway.  Replacement functions don't have to do anything
+ * here if you don't want to.  In the default configuration, png_ptr is
+ * not used, but it is passed in case it may be useful.
+ */
+static void
+pngtest_warning(png_structp png_ptr, png_const_charp message)
+{
+   PNG_CONST char *name = "UNKNOWN (ERROR!)";
+   if (png_ptr != NULL && png_ptr->error_ptr != NULL)
+      name = png_ptr->error_ptr;
+   fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
+}
+
+/* This is the default error handling function.  Note that replacements for
+ * this function MUST NOT RETURN, or the program will likely crash.  This
+ * function is used by default, or if the program supplies NULL for the
+ * error function pointer in png_set_error_fn().
+ */
+static void
+pngtest_error(png_structp png_ptr, png_const_charp message)
+{
+   pngtest_warning(png_ptr, message);
+   /* We can return because png_error calls the default handler, which is
+    * actually OK in this case. */
+}
+#endif /* PNG_NO_STDIO */
+/* END of code to validate stdio-free compilation */
+
+/* START of code to validate memory allocation and deallocation */
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+
+/* Allocate memory.  For reasonable files, size should never exceed
+   64K.  However, zlib may allocate more then 64K if you don't tell
+   it not to.  See zconf.h and png.h for more information.  zlib does
+   need to allocate exactly 64K, so whatever you call here must
+   have the ability to do that.
+
+   This piece of code can be compiled to validate max 64K allocations
+   by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K. */
+typedef struct memory_information
+{
+   png_uint_32               size;
+   png_voidp                 pointer;
+   struct memory_information FAR *next;
+} memory_information;
+typedef memory_information FAR *memory_infop;
+
+static memory_infop pinformation = NULL;
+static int current_allocation = 0;
+static int maximum_allocation = 0;
+static int total_allocation = 0;
+static int num_allocations = 0;
+
+png_voidp png_debug_malloc PNGARG((png_structp png_ptr, png_uint_32 size));
+void png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));
+
+png_voidp
+png_debug_malloc(png_structp png_ptr, png_uint_32 size)
+{
+
+   /* png_malloc has already tested for NULL; png_create_struct calls
+      png_debug_malloc directly, with png_ptr == NULL which is OK */
+
+   if (size == 0)
+      return (NULL);
+
+   /* This calls the library allocator twice, once to get the requested
+      buffer and once to get a new free list entry. */
+   {
+      /* Disable malloc_fn and free_fn */
+      memory_infop pinfo;
+      png_set_mem_fn(png_ptr, NULL, NULL, NULL);
+      pinfo = (memory_infop)png_malloc(png_ptr,
+         (png_uint_32)png_sizeof (*pinfo));
+      pinfo->size = size;
+      current_allocation += size;
+      total_allocation += size;
+      num_allocations ++;
+      if (current_allocation > maximum_allocation)
+         maximum_allocation = current_allocation;
+      pinfo->pointer = (png_voidp)png_malloc(png_ptr, size);
+      /* Restore malloc_fn and free_fn */
+      png_set_mem_fn(png_ptr, png_voidp_NULL, (png_malloc_ptr)png_debug_malloc,
+         (png_free_ptr)png_debug_free);
+      if (size != 0 && pinfo->pointer == NULL)
+      {
+         current_allocation -= size;
+         total_allocation -= size;
+         png_error(png_ptr,
+           "out of memory in pngtest->png_debug_malloc.");
+      }
+      pinfo->next = pinformation;
+      pinformation = pinfo;
+      /* Make sure the caller isn't assuming zeroed memory. */
+      png_memset(pinfo->pointer, 0xdd, pinfo->size);
+      if(verbose)
+         printf("png_malloc %lu bytes at %x\n",size,pinfo->pointer);
+      assert(pinfo->size != 12345678);
+      return (png_voidp)(pinfo->pointer);
+   }
+}
+
+/* Free a pointer.  It is removed from the list at the same time. */
+void
+png_debug_free(png_structp png_ptr, png_voidp ptr)
+{
+   if (png_ptr == NULL)
+      fprintf(STDERR, "NULL pointer to png_debug_free.\n");
+   if (ptr == 0)
+   {
+#if 0 /* This happens all the time. */
+      fprintf(STDERR, "WARNING: freeing NULL pointer\n");
+#endif
+      return;
+   }
+
+   /* Unlink the element from the list. */
+   {
+      memory_infop FAR *ppinfo = &pinformation;
+      for (;;)
+      {
+         memory_infop pinfo = *ppinfo;
+         if (pinfo->pointer == ptr)
+         {
+            *ppinfo = pinfo->next;
+            current_allocation -= pinfo->size;
+            if (current_allocation < 0)
+               fprintf(STDERR, "Duplicate free of memory\n");
+            /* We must free the list element too, but first kill
+               the memory that is to be freed. */
+            png_memset(ptr, 0x55, pinfo->size);
+            png_free_default(png_ptr, pinfo);
+            pinfo=NULL;
+            break;
+         }
+         if (pinfo->next == NULL)
+         {
+            fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr);
+            break;
+         }
+         ppinfo = &pinfo->next;
+      }
+   }
+
+   /* Finally free the data. */
+   if(verbose)
+      printf("Freeing %x\n",ptr);
+   png_free_default(png_ptr, ptr);
+   ptr=NULL;
+}
+#endif /* PNG_USER_MEM_SUPPORTED && PNG_DEBUG */
+/* END of code to test memory allocation/deallocation */
+
+/* Test one file */
+int
+test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
+{
+   static png_FILE_p fpin;
+   static png_FILE_p fpout;  /* "static" prevents setjmp corruption */
+   png_structp read_ptr;
+   png_infop read_info_ptr, end_info_ptr;
+#ifdef PNG_WRITE_SUPPORTED
+   png_structp write_ptr;
+   png_infop write_info_ptr;
+   png_infop write_end_info_ptr;
+#else
+   png_structp write_ptr = NULL;
+   png_infop write_info_ptr = NULL;
+   png_infop write_end_info_ptr = NULL;
+#endif
+   png_bytep row_buf;
+   png_uint_32 y;
+   png_uint_32 width, height;
+   int num_pass, pass;
+   int bit_depth, color_type;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+
+#if defined(_WIN32_WCE)
+   TCHAR path[MAX_PATH];
+#endif
+   char inbuf[256], outbuf[256];
+
+   row_buf = NULL;
+
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find input file %s\n", inname);
+      return (1);
+   }
+
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpout = fopen(outname, "wb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not open output file %s\n", outname);
+      FCLOSE(fpin);
+      return (1);
+   }
+
+   png_debug(0, "Allocating read and write structures\n");
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+   read_ptr = png_create_read_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
+      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+#else
+   read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);
+#endif
+#if defined(PNG_NO_STDIO)
+   png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
+       pngtest_warning);
+#endif
+#ifdef PNG_WRITE_SUPPORTED
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+   write_ptr = png_create_write_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
+      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+#else
+   write_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);
+#endif
+#if defined(PNG_NO_STDIO)
+   png_set_error_fn(write_ptr, (png_voidp)inname, pngtest_error,
+       pngtest_warning);
+#endif
+#endif
+   png_debug(0, "Allocating read_info, write_info and end_info structures\n");
+   read_info_ptr = png_create_info_struct(read_ptr);
+   end_info_ptr = png_create_info_struct(read_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+   write_info_ptr = png_create_info_struct(write_ptr);
+   write_end_info_ptr = png_create_info_struct(write_ptr);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_debug(0, "Setting jmpbuf for read struct\n");
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_jmpbuf(read_ptr)))
+#endif
+   {
+      fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);
+      if (row_buf)
+         png_free(read_ptr, row_buf);
+      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+      png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);
+      return (1);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_jmpbuf(read_ptr),jmpbuf,png_sizeof(jmp_buf));
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(0, "Setting jmpbuf for write struct\n");
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_jmpbuf(write_ptr)))
+#endif
+   {
+      fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
+      png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+      png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);
+      return (1);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_jmpbuf(write_ptr),jmpbuf,png_sizeof(jmp_buf));
+#endif
+#endif
+#endif
+
+   png_debug(0, "Initializing input and output streams\n");
+#if !defined(PNG_NO_STDIO)
+   png_init_io(read_ptr, fpin);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_init_io(write_ptr, fpout);
+#  endif
+#else
+   png_set_read_fn(read_ptr, (png_voidp)fpin, pngtest_read_data);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_set_write_fn(write_ptr, (png_voidp)fpout,  pngtest_write_data,
+#    if defined(PNG_WRITE_FLUSH_SUPPORTED)
+      pngtest_flush);
+#    else
+      NULL);
+#    endif
+#  endif
+#endif
+   if(status_dots_requested == 1)
+   {
+#ifdef PNG_WRITE_SUPPORTED
+      png_set_write_status_fn(write_ptr, write_row_callback);
+#endif
+      png_set_read_status_fn(read_ptr, read_row_callback);
+   }
+   else
+   {
+#ifdef PNG_WRITE_SUPPORTED
+      png_set_write_status_fn(write_ptr, png_write_status_ptr_NULL);
+#endif
+      png_set_read_status_fn(read_ptr, png_read_status_ptr_NULL);
+   }
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+   {
+     int i;
+     for(i=0; i<256; i++)
+        filters_used[i]=0;
+     png_set_read_user_transform_fn(read_ptr, count_filters);
+   }
+#endif
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   zero_samples=0;
+   png_set_write_user_transform_fn(write_ptr, count_zero_samples);
+#endif
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#  ifndef PNG_HANDLE_CHUNK_ALWAYS
+#    define PNG_HANDLE_CHUNK_ALWAYS       3
+#  endif
+   png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
+      png_bytep_NULL, 0);
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+#  ifndef PNG_HANDLE_CHUNK_IF_SAFE
+#    define PNG_HANDLE_CHUNK_IF_SAFE      2
+#  endif
+   png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_IF_SAFE,
+      png_bytep_NULL, 0);
+#endif
+
+   png_debug(0, "Reading info struct\n");
+   png_read_info(read_ptr, read_info_ptr);
+
+   png_debug(0, "Transferring info struct\n");
+   {
+      int interlace_type, compression_type, filter_type;
+
+      if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,
+          &color_type, &interlace_type, &compression_type, &filter_type))
+      {
+         png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+            color_type, interlace_type, compression_type, filter_type);
+#else
+            color_type, PNG_INTERLACE_NONE, compression_type, filter_type);
+#endif
+      }
+   }
+#if defined(PNG_FIXED_POINT_SUPPORTED)
+#if defined(PNG_cHRM_SUPPORTED)
+   {
+      png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
+         blue_y;
+      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
+         &red_y, &green_x, &green_y, &blue_x, &blue_y))
+      {
+         png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
+            red_y, green_x, green_y, blue_x, blue_y);
+      }
+   }
+#endif
+#if defined(PNG_gAMA_SUPPORTED)
+   {
+      png_fixed_point gamma;
+
+      if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma))
+      {
+         png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);
+      }
+   }
+#endif
+#else /* Use floating point versions */
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+#if defined(PNG_cHRM_SUPPORTED)
+   {
+      double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
+         blue_y;
+      if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
+         &red_y, &green_x, &green_y, &blue_x, &blue_y))
+      {
+         png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
+            red_y, green_x, green_y, blue_x, blue_y);
+      }
+   }
+#endif
+#if defined(PNG_gAMA_SUPPORTED)
+   {
+      double gamma;
+
+      if (png_get_gAMA(read_ptr, read_info_ptr, &gamma))
+      {
+         png_set_gAMA(write_ptr, write_info_ptr, gamma);
+      }
+   }
+#endif
+#endif /* floating point */
+#endif /* fixed point */
+#if defined(PNG_iCCP_SUPPORTED)
+   {
+      png_charp name;
+      png_charp profile;
+      png_uint_32 proflen;
+      int compression_type;
+
+      if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
+                      &profile, &proflen))
+      {
+         png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
+                      profile, proflen);
+      }
+   }
+#endif
+#if defined(PNG_sRGB_SUPPORTED)
+   {
+      int intent;
+
+      if (png_get_sRGB(read_ptr, read_info_ptr, &intent))
+      {
+         png_set_sRGB(write_ptr, write_info_ptr, intent);
+      }
+   }
+#endif
+   {
+      png_colorp palette;
+      int num_palette;
+
+      if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))
+      {
+         png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
+      }
+   }
+#if defined(PNG_bKGD_SUPPORTED)
+   {
+      png_color_16p background;
+
+      if (png_get_bKGD(read_ptr, read_info_ptr, &background))
+      {
+         png_set_bKGD(write_ptr, write_info_ptr, background);
+      }
+   }
+#endif
+#if defined(PNG_hIST_SUPPORTED)
+   {
+      png_uint_16p hist;
+
+      if (png_get_hIST(read_ptr, read_info_ptr, &hist))
+      {
+         png_set_hIST(write_ptr, write_info_ptr, hist);
+      }
+   }
+#endif
+#if defined(PNG_oFFs_SUPPORTED)
+   {
+      png_int_32 offset_x, offset_y;
+      int unit_type;
+
+      if (png_get_oFFs(read_ptr, read_info_ptr,&offset_x,&offset_y,&unit_type))
+      {
+         png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
+      }
+   }
+#endif
+#if defined(PNG_pCAL_SUPPORTED)
+   {
+      png_charp purpose, units;
+      png_charpp params;
+      png_int_32 X0, X1;
+      int type, nparams;
+
+      if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
+         &nparams, &units, &params))
+      {
+         png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
+            nparams, units, params);
+      }
+   }
+#endif
+#if defined(PNG_pHYs_SUPPORTED)
+   {
+      png_uint_32 res_x, res_y;
+      int unit_type;
+
+      if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type))
+      {
+         png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
+      }
+   }
+#endif
+#if defined(PNG_sBIT_SUPPORTED)
+   {
+      png_color_8p sig_bit;
+
+      if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))
+      {
+         png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
+      }
+   }
+#endif
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+   {
+      int unit;
+      double scal_width, scal_height;
+
+      if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
+         &scal_height))
+      {
+         png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
+      }
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   {
+      int unit;
+      png_charp scal_width, scal_height;
+
+      if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
+          &scal_height))
+      {
+         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width, scal_height);
+      }
+   }
+#endif
+#endif
+#endif
+#if defined(PNG_TEXT_SUPPORTED)
+   {
+      png_textp text_ptr;
+      int num_text;
+
+      if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
+      {
+         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks\n", num_text);
+         png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
+      }
+   }
+#endif
+#if defined(PNG_tIME_SUPPORTED)
+   {
+      png_timep mod_time;
+
+      if (png_get_tIME(read_ptr, read_info_ptr, &mod_time))
+      {
+         png_set_tIME(write_ptr, write_info_ptr, mod_time);
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         /* we have to use png_strcpy instead of "=" because the string
+            pointed to by png_convert_to_rfc1123() gets free'ed before
+            we use it */
+         png_strcpy(tIME_string,png_convert_to_rfc1123(read_ptr, mod_time));
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+      }
+   }
+#endif
+#if defined(PNG_tRNS_SUPPORTED)
+   {
+      png_bytep trans;
+      int num_trans;
+      png_color_16p trans_values;
+
+      if (png_get_tRNS(read_ptr, read_info_ptr, &trans, &num_trans,
+         &trans_values))
+      {
+         png_set_tRNS(write_ptr, write_info_ptr, trans, num_trans,
+            trans_values);
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns = (int)png_get_unknown_chunks(read_ptr, read_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
+           num_unknowns);
+         /* copy the locations from the read_info_ptr.  The automatically
+            generated locations in write_info_ptr are wrong because we
+            haven't written anything yet */
+         for (i = 0; i < (png_size_t)num_unknowns; i++)
+           png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif
+
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(0, "\nWriting info struct\n");
+
+/* If we wanted, we could write info in two steps:
+   png_write_info_before_PLTE(write_ptr, write_info_ptr);
+ */
+   png_write_info(write_ptr, write_info_ptr);
+#endif
+
+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(0, "\nAllocating row buffer...");
+   row_buf = (png_bytep)png_malloc(read_ptr,
+      png_get_rowbytes(read_ptr, read_info_ptr));
+   png_debug1(0, "0x%08lx\n\n", (unsigned long)row_buf);
+#endif /* SINGLE_ROWBUF_ALLOC */
+   png_debug(0, "Writing row data\n");
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+  defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   num_pass = png_set_interlace_handling(read_ptr);
+#  ifdef PNG_WRITE_SUPPORTED
+   png_set_interlace_handling(write_ptr);
+#  endif
+#else
+   num_pass=1;
+#endif
+
+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+#endif
+   for (pass = 0; pass < num_pass; pass++)
+   {
+      png_debug1(0, "Writing row data for pass %d\n",pass);
+      for (y = 0; y < height; y++)
+      {
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "\nAllocating row buffer (pass %d, y = %ld)...", pass,y);
+         row_buf = (png_bytep)png_malloc(read_ptr,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+         png_debug2(0, "0x%08lx (%ld bytes)\n", (unsigned long)row_buf,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+#endif /* !SINGLE_ROWBUF_ALLOC */
+         png_read_rows(read_ptr, (png_bytepp)&row_buf, png_bytepp_NULL, 1);
+
+#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_decode += (t_stop - t_start);
+         t_start = t_stop;
+#endif
+         png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_encode += (t_stop - t_start);
+         t_start = t_stop;
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
+
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "Freeing row buffer (pass %d, y = %ld)\n\n", pass, y);
+         png_free(read_ptr, row_buf);
+#endif /* !SINGLE_ROWBUF_ALLOC */
+      }
+   }
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+
+   png_debug(0, "Reading and writing end_info data\n");
+
+   png_read_end(read_ptr, end_info_ptr);
+#if defined(PNG_TEXT_SUPPORTED)
+   {
+      png_textp text_ptr;
+      int num_text;
+
+      if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)
+      {
+         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks\n", num_text);
+         png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
+      }
+   }
+#endif
+#if defined(PNG_tIME_SUPPORTED)
+   {
+      png_timep mod_time;
+
+      if (png_get_tIME(read_ptr, end_info_ptr, &mod_time))
+      {
+         png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         /* we have to use png_strcpy instead of "=" because the string
+            pointed to by png_convert_to_rfc1123() gets free'ed before
+            we use it */
+         png_strcpy(tIME_string,png_convert_to_rfc1123(read_ptr, mod_time));
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns;
+      num_unknowns = (int)png_get_unknown_chunks(read_ptr, end_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
+           num_unknowns);
+         /* copy the locations from the read_info_ptr.  The automatically
+            generated locations in write_end_info_ptr are wrong because we
+            haven't written the end_info yet */
+         for (i = 0; i < (png_size_t)num_unknowns; i++)
+           png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif
+#ifdef PNG_WRITE_SUPPORTED
+   png_write_end(write_ptr, write_end_info_ptr);
+#endif
+
+#ifdef PNG_EASY_ACCESS_SUPPORTED
+   if(verbose)
+   {
+      png_uint_32 iwidth, iheight;
+      iwidth = png_get_image_width(write_ptr, write_info_ptr);
+      iheight = png_get_image_height(write_ptr, write_info_ptr);
+      fprintf(STDERR, "Image width = %lu, height = %lu\n",
+         iwidth, iheight);
+   }
+#endif
+
+   png_debug(0, "Destroying data structs\n");
+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(1, "destroying row_buf for read_ptr\n");
+   png_free(read_ptr, row_buf);
+   row_buf=NULL;
+#endif /* SINGLE_ROWBUF_ALLOC */
+   png_debug(1, "destroying read_ptr, read_info_ptr, end_info_ptr\n");
+   png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED
+   png_debug(1, "destroying write_end_info_ptr\n");
+   png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+   png_debug(1, "destroying write_ptr, write_info_ptr\n");
+   png_destroy_write_struct(&write_ptr, &write_info_ptr);
+#endif
+   png_debug(0, "Destruction complete.\n");
+
+   FCLOSE(fpin);
+   FCLOSE(fpout);
+
+   png_debug(0, "Opening files for comparison\n");
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find file %s\n", inname);
+      return (1);
+   }
+
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
+   if ((fpout = fopen(outname, "rb")) == NULL)
+#endif
+   {
+      fprintf(STDERR, "Could not find file %s\n", outname);
+      FCLOSE(fpin);
+      return (1);
+   }
+
+   for(;;)
+   {
+      png_size_t num_in, num_out;
+
+      READFILE(fpin, inbuf, 1, num_in);
+      READFILE(fpout, outbuf, 1, num_out);
+
+      if (num_in != num_out)
+      {
+         fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
+                 inname, outname);
+         if(wrote_question == 0)
+         {
+            fprintf(STDERR,
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+              inname,PNG_ZBUF_SIZE);
+            fprintf(STDERR,
+              "\n   filtering heuristic (libpng default), compression");
+            fprintf(STDERR,
+              " level (zlib default),\n   and zlib version (%s)?\n\n",
+              ZLIB_VERSION);
+            wrote_question=1;
+         }
+         FCLOSE(fpin);
+         FCLOSE(fpout);
+         return (0);
+      }
+
+      if (!num_in)
+         break;
+
+      if (png_memcmp(inbuf, outbuf, num_in))
+      {
+         fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);
+         if(wrote_question == 0)
+         {
+            fprintf(STDERR,
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+                 inname,PNG_ZBUF_SIZE);
+            fprintf(STDERR,
+              "\n   filtering heuristic (libpng default), compression");
+            fprintf(STDERR,
+              " level (zlib default),\n   and zlib version (%s)?\n\n",
+              ZLIB_VERSION);
+            wrote_question=1;
+         }
+         FCLOSE(fpin);
+         FCLOSE(fpout);
+         return (0);
+      }
+   }
+
+   FCLOSE(fpin);
+   FCLOSE(fpout);
+
+   return (0);
+}
+
+/* input and output filenames */
+#ifdef RISCOS
+static PNG_CONST char *inname = "pngtest/png";
+static PNG_CONST char *outname = "pngout/png";
+#else
+static PNG_CONST char *inname = "pngtest.png";
+static PNG_CONST char *outname = "pngout.png";
+#endif
+
+int
+main(int argc, char *argv[])
+{
+   int multiple = 0;
+   int ierror = 0;
+
+   fprintf(STDERR, "Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);
+   fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);
+   fprintf(STDERR,"%s",png_get_copyright(NULL));
+   /* Show the version of libpng used in building the library */
+   fprintf(STDERR," library (%lu):%s", png_access_version_number(),
+      png_get_header_version(NULL));
+   /* Show the version of libpng used in building the application */
+   fprintf(STDERR," pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,
+      PNG_HEADER_VERSION_STRING);
+   fprintf(STDERR," png_sizeof(png_struct)=%ld, png_sizeof(png_info)=%ld\n",
+                    (long)png_sizeof(png_struct), (long)png_sizeof(png_info));
+
+   /* Do some consistency checking on the memory allocation settings, I'm
+      not sure this matters, but it is nice to know, the first of these
+      tests should be impossible because of the way the macros are set
+      in pngconf.h */
+#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
+      fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
+#endif
+   /* I think the following can happen. */
+#if !defined(MAXSEG_64K) && defined(PNG_MAX_MALLOC_64K)
+      fprintf(STDERR, " NOTE: libpng compiled for max 64k, zlib not\n");
+#endif
+
+   if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING))
+   {
+      fprintf(STDERR,
+         "Warning: versions are different between png.h and png.c\n");
+      fprintf(STDERR, "  png.h version: %s\n", PNG_LIBPNG_VER_STRING);
+      fprintf(STDERR, "  png.c version: %s\n\n", png_libpng_ver);
+      ++ierror;
+   }
+
+   if (argc > 1)
+   {
+      if (strcmp(argv[1], "-m") == 0)
+      {
+         multiple = 1;
+         status_dots_requested = 0;
+      }
+      else if (strcmp(argv[1], "-mv") == 0 ||
+               strcmp(argv[1], "-vm") == 0 )
+      {
+         multiple = 1;
+         verbose = 1;
+         status_dots_requested = 1;
+      }
+      else if (strcmp(argv[1], "-v") == 0)
+      {
+         verbose = 1;
+         status_dots_requested = 1;
+         inname = argv[2];
+      }
+      else
+      {
+         inname = argv[1];
+         status_dots_requested = 0;
+      }
+   }
+
+   if (!multiple && argc == 3+verbose)
+     outname = argv[2+verbose];
+
+   if ((!multiple && argc > 3+verbose) || (multiple && argc < 2))
+   {
+     fprintf(STDERR,
+       "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
+        argv[0], argv[0]);
+     fprintf(STDERR,
+       "  reads/writes one PNG file (without -m) or multiple files (-m)\n");
+     fprintf(STDERR,
+       "  with -m %s is used as a temporary file\n", outname);
+     exit(1);
+   }
+
+   if (multiple)
+   {
+      int i;
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+      int allocation_now = current_allocation;
+#endif
+      for (i=2; i<argc; ++i)
+      {
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+         int k;
+#endif
+         int kerror;
+         fprintf(STDERR, "Testing %s:",argv[i]);
+         kerror = test_one_file(argv[i], outname);
+         if (kerror == 0)
+         {
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+            fprintf(STDERR, "\n PASS (%lu zero samples)\n",zero_samples);
+#else
+            fprintf(STDERR, " PASS\n");
+#endif
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+            for (k=0; k<256; k++)
+               if(filters_used[k])
+                  fprintf(STDERR, " Filter %d was used %lu times\n",
+                     k,filters_used[k]);
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         if(tIME_chunk_present != 0)
+            fprintf(STDERR, " tIME = %s\n",tIME_string);
+         tIME_chunk_present = 0;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+         }
+         else
+         {
+            fprintf(STDERR, " FAIL\n");
+            ierror += kerror;
+         }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         if (allocation_now != current_allocation)
+            fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+               current_allocation-allocation_now);
+         if (current_allocation != 0)
+         {
+            memory_infop pinfo = pinformation;
+
+            fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+               current_allocation);
+            while (pinfo != NULL)
+            {
+               fprintf(STDERR, " %lu bytes at %x\n", pinfo->size, 
+                 (unsigned int) pinfo->pointer);
+               pinfo = pinfo->next;
+            }
+         }
+#endif
+      }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+            current_allocation);
+         fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+            maximum_allocation);
+         fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+            total_allocation);
+         fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);
+#endif
+   }
+   else
+   {
+      int i;
+      for (i=0; i<3; ++i)
+      {
+         int kerror;
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         int allocation_now = current_allocation;
+#endif
+         if (i == 1) status_dots_requested = 1;
+         else if(verbose == 0)status_dots_requested = 0;
+         if (i == 0 || verbose == 1 || ierror != 0)
+            fprintf(STDERR, "Testing %s:",inname);
+         kerror = test_one_file(inname, outname);
+         if(kerror == 0)
+         {
+            if(verbose == 1 || i == 2)
+            {
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+                int k;
+#endif
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+                fprintf(STDERR, "\n PASS (%lu zero samples)\n",zero_samples);
+#else
+                fprintf(STDERR, " PASS\n");
+#endif
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+                for (k=0; k<256; k++)
+                   if(filters_used[k])
+                      fprintf(STDERR, " Filter %d was used %lu times\n",
+                         k,filters_used[k]);
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+             if(tIME_chunk_present != 0)
+                fprintf(STDERR, " tIME = %s\n",tIME_string);
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+            }
+         }
+         else
+         {
+            if(verbose == 0 && i != 2)
+               fprintf(STDERR, "Testing %s:",inname);
+            fprintf(STDERR, " FAIL\n");
+            ierror += kerror;
+         }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         if (allocation_now != current_allocation)
+             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
+               current_allocation-allocation_now);
+         if (current_allocation != 0)
+         {
+             memory_infop pinfo = pinformation;
+
+             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
+                current_allocation);
+             while (pinfo != NULL)
+             {
+                fprintf(STDERR," %lu bytes at %x\n",
+                   pinfo->size, (unsigned int)pinfo->pointer);
+                pinfo = pinfo->next;
+             }
+          }
+#endif
+       }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+       fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+          current_allocation);
+       fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",
+          maximum_allocation);
+       fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+          total_allocation);
+       fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);
+#endif
+   }
+
+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+   fprintf(STDERR," CPU time used = %.3f seconds",
+      (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR," (decoding %.3f,\n",
+      t_decode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR,"        encoding %.3f ,",
+      t_encode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR," other %.3f seconds)\n\n",
+      t_misc/(float)CLOCKS_PER_SEC);
+#endif
+
+   if (ierror == 0)
+      fprintf(STDERR, "libpng passes test\n");
+   else
+      fprintf(STDERR, "libpng FAILS test\n");
+   return (int)(ierror != 0);
+}
+
+/* Generate a compiler error if there is an old png.h in the search path. */
+typedef version_1_2_7 your_png_h_is_not_version_1_2_7;
diff --git a/Source/3rd Party/wx/src/png/pngtrans.c b/Source/3rd Party/wx/src/png/pngtrans.c
index 53d9a25b9..f279f9e79 100644
--- a/Source/3rd Party/wx/src/png/pngtrans.c	
+++ b/Source/3rd Party/wx/src/png/pngtrans.c	
@@ -1,678 +1,644 @@
-
-/* pngtrans.c - transforms the data in a row (used by both readers and writers)
- *
- * Last changed in libpng 1.5.4 [July 7, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Turn on BGR-to-RGB mapping */
-void PNGAPI
-png_set_bgr(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_bgr");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_BGR;
-}
-#endif
-
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Turn on 16 bit byte swapping */
-void PNGAPI
-png_set_swap(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_swap");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (png_ptr->bit_depth == 16)
-      png_ptr->transformations |= PNG_SWAP_BYTES;
-}
-#endif
-
-#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
-/* Turn on pixel packing */
-void PNGAPI
-png_set_packing(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_packing");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (png_ptr->bit_depth < 8)
-   {
-      png_ptr->transformations |= PNG_PACK;
-      png_ptr->usr_bit_depth = 8;
-   }
-}
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-/* Turn on packed pixel swapping */
-void PNGAPI
-png_set_packswap(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_packswap");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (png_ptr->bit_depth < 8)
-      png_ptr->transformations |= PNG_PACKSWAP;
-}
-#endif
-
-#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
-void PNGAPI
-png_set_shift(png_structp png_ptr, png_const_color_8p true_bits)
-{
-   png_debug(1, "in png_set_shift");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_SHIFT;
-   png_ptr->shift = *true_bits;
-}
-#endif
-
-#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
-    defined(PNG_WRITE_INTERLACING_SUPPORTED)
-int PNGAPI
-png_set_interlace_handling(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_interlace handling");
-
-   if (png_ptr && png_ptr->interlaced)
-   {
-      png_ptr->transformations |= PNG_INTERLACE;
-      return (7);
-   }
-
-   return (1);
-}
-#endif
-
-#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
-/* Add a filler byte on read, or remove a filler or alpha byte on write.
- * The filler type has changed in v0.95 to allow future 2-byte fillers
- * for 48-bit input data, as well as to avoid problems with some compilers
- * that don't like bytes as parameters.
- */
-void PNGAPI
-png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
-{
-   png_debug(1, "in png_set_filler");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_FILLER;
-   png_ptr->filler = (png_uint_16)filler;
-
-   if (filler_loc == PNG_FILLER_AFTER)
-      png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
-
-   else
-      png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
-
-   /* This should probably go in the "do_read_filler" routine.
-    * I attempted to do that in libpng-1.0.1a but that caused problems
-    * so I restored it in libpng-1.0.2a
-   */
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
-   {
-      png_ptr->usr_channels = 4;
-   }
-
-   /* Also I added this in libpng-1.0.2a (what happens when we expand
-    * a less-than-8-bit grayscale to GA?) */
-
-   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
-   {
-      png_ptr->usr_channels = 2;
-   }
-}
-
-/* Added to libpng-1.2.7 */
-void PNGAPI
-png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
-{
-   png_debug(1, "in png_set_add_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_set_filler(png_ptr, filler, filler_loc);
-   png_ptr->transformations |= PNG_ADD_ALPHA;
-}
-
-#endif
-
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
-void PNGAPI
-png_set_swap_alpha(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_swap_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_SWAP_ALPHA;
-}
-#endif
-
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
-    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
-void PNGAPI
-png_set_invert_alpha(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_invert_alpha");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_INVERT_ALPHA;
-}
-#endif
-
-#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
-void PNGAPI
-png_set_invert_mono(png_structp png_ptr)
-{
-   png_debug(1, "in png_set_invert_mono");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_INVERT_MONO;
-}
-
-/* Invert monochrome grayscale data */
-void /* PRIVATE */
-png_do_invert(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_invert");
-
-  /* This test removed from libpng version 1.0.13 and 1.2.0:
-   *   if (row_info->bit_depth == 1 &&
-   */
-   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
-
-      for (i = 0; i < istop; i++)
-      {
-         *rp = (png_byte)(~(*rp));
-         rp++;
-      }
-   }
-
-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-      row_info->bit_depth == 8)
-   {
-      png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
-
-      for (i = 0; i < istop; i += 2)
-      {
-         *rp = (png_byte)(~(*rp));
-         rp += 2;
-      }
-   }
-
-#ifdef PNG_16BIT_SUPPORTED
-   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-      row_info->bit_depth == 16)
-   {
-      png_bytep rp = row;
-      png_size_t i;
-      png_size_t istop = row_info->rowbytes;
-
-      for (i = 0; i < istop; i += 4)
-      {
-         *rp = (png_byte)(~(*rp));
-         *(rp + 1) = (png_byte)(~(*(rp + 1)));
-         rp += 4;
-      }
-   }
-#endif
-}
-#endif
-
-#ifdef PNG_16BIT_SUPPORTED
-#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
-/* Swaps byte order on 16 bit depth images */
-void /* PRIVATE */
-png_do_swap(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_swap");
-
-   if (row_info->bit_depth == 16)
-   {
-      png_bytep rp = row;
-      png_uint_32 i;
-      png_uint_32 istop= row_info->width * row_info->channels;
-
-      for (i = 0; i < istop; i++, rp += 2)
-      {
-         png_byte t = *rp;
-         *rp = *(rp + 1);
-         *(rp + 1) = t;
-      }
-   }
-}
-#endif
-#endif
-
-#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-static PNG_CONST png_byte onebppswaptable[256] = {
-   0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
-   0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
-   0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
-   0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
-   0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
-   0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
-   0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
-   0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
-   0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
-   0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
-   0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
-   0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
-   0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
-   0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
-   0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
-   0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
-   0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
-   0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
-   0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
-   0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
-   0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
-   0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
-   0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
-   0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
-   0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
-   0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
-   0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
-   0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
-   0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
-   0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
-   0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
-   0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
-};
-
-static PNG_CONST png_byte twobppswaptable[256] = {
-   0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
-   0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
-   0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
-   0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,
-   0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,
-   0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,
-   0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,
-   0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
-   0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,
-   0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,
-   0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,
-   0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,
-   0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,
-   0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,
-   0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,
-   0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,
-   0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,
-   0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,
-   0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,
-   0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,
-   0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,
-   0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,
-   0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,
-   0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,
-   0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,
-   0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,
-   0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,
-   0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,
-   0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,
-   0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,
-   0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,
-   0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
-};
-
-static PNG_CONST png_byte fourbppswaptable[256] = {
-   0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
-   0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
-   0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
-   0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
-   0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
-   0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,
-   0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
-   0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,
-   0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
-   0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,
-   0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
-   0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,
-   0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
-   0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,
-   0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
-   0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,
-   0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
-   0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,
-   0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
-   0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,
-   0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,
-   0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
-   0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,
-   0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,
-   0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,
-   0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,
-   0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,
-   0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,
-   0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
-   0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
-   0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
-   0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF
-};
-
-/* Swaps pixel packing order within bytes */
-void /* PRIVATE */
-png_do_packswap(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_packswap");
-
-   if (row_info->bit_depth < 8)
-   {
-      png_bytep rp;
-      png_const_bytep end, table;
-
-      end = row + row_info->rowbytes;
-
-      if (row_info->bit_depth == 1)
-         table = onebppswaptable;
-
-      else if (row_info->bit_depth == 2)
-         table = twobppswaptable;
-
-      else if (row_info->bit_depth == 4)
-         table = fourbppswaptable;
-
-      else
-         return;
-
-      for (rp = row; rp < end; rp++)
-         *rp = table[*rp];
-   }
-}
-#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
-
-#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
-    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-/* Remove a channel - this used to be 'png_do_strip_filler' but it used a
- * somewhat weird combination of flags to determine what to do.  All the calls
- * to png_do_strip_filler are changed in 1.5.2 to call this instead with the
- * correct arguments.
- *
- * The routine isn't general - the channel must be the channel at the start or
- * end (not in the middle) of each pixel.
- */
-void /* PRIVATE */
-png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start)
-{
-   png_bytep sp = row; /* source pointer */
-   png_bytep dp = row; /* destination pointer */
-   png_bytep ep = row + row_info->rowbytes; /* One beyond end of row */
-
-   /* At the start sp will point to the first byte to copy and dp to where
-    * it is copied to.  ep always points just beyond the end of the row, so
-    * the loop simply copies (channels-1) channels until sp reaches ep.
-    *
-    * at_start:        0 -- convert AG, XG, ARGB, XRGB, AAGG, XXGG, etc.
-    *            nonzero -- convert GA, GX, RGBA, RGBX, GGAA, RRGGBBXX, etc.
-    */
-
-   /* GA, GX, XG cases */
-   if (row_info->channels == 2)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if (at_start) /* Skip initial filler */
-            ++sp;
-         else          /* Skip initial channel and, for sp, the filler */
-            sp += 2, ++dp;
-
-         /* For a 1 pixel wide image there is nothing to do */
-         while (sp < ep)
-            *dp++ = *sp, sp += 2;
-
-         row_info->pixel_depth = 8;
-      }
-
-      else if (row_info->bit_depth == 16)
-      {
-         if (at_start) /* Skip initial filler */
-            sp += 2;
-         else          /* Skip initial channel and, for sp, the filler */
-            sp += 4, dp += 2;
-
-         while (sp < ep)
-            *dp++ = *sp++, *dp++ = *sp, sp += 3;
-
-         row_info->pixel_depth = 16;
-      }
-
-      else
-         return; /* bad bit depth */
-
-      row_info->channels = 1;
-
-      /* Finally fix the color type if it records an alpha channel */
-      if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-         row_info->color_type = PNG_COLOR_TYPE_GRAY;
-   }
-
-   /* RGBA, RGBX, XRGB cases */
-   else if (row_info->channels == 4)
-   {
-      if (row_info->bit_depth == 8)
-      {
-         if (at_start) /* Skip initial filler */
-            ++sp;
-         else          /* Skip initial channels and, for sp, the filler */
-            sp += 4, dp += 3;
-
-         /* Note that the loop adds 3 to dp and 4 to sp each time. */
-         while (sp < ep)
-            *dp++ = *sp++, *dp++ = *sp++, *dp++ = *sp, sp += 2;
-
-         row_info->pixel_depth = 24;
-      }
-
-      else if (row_info->bit_depth == 16)
-      {
-         if (at_start) /* Skip initial filler */
-            sp += 2;
-         else          /* Skip initial channels and, for sp, the filler */
-            sp += 8, dp += 6;
-
-         while (sp < ep)
-         {
-            /* Copy 6 bytes, skip 2 */
-            *dp++ = *sp++, *dp++ = *sp++;
-            *dp++ = *sp++, *dp++ = *sp++;
-            *dp++ = *sp++, *dp++ = *sp, sp += 3;
-         }
-
-         row_info->pixel_depth = 48;
-      }
-
-      else
-         return; /* bad bit depth */
-
-      row_info->channels = 3;
-
-      /* Finally fix the color type if it records an alpha channel */
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         row_info->color_type = PNG_COLOR_TYPE_RGB;
-   }
-
-   else
-      return; /* The filler channel has gone already */
-
-   /* Fix the rowbytes value. */
-   row_info->rowbytes = dp-row;
-}
-#endif
-
-#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
-/* Swaps red and blue bytes within a pixel */
-void /* PRIVATE */
-png_do_bgr(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_bgr");
-
-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      png_uint_32 row_width = row_info->width;
-      if (row_info->bit_depth == 8)
-      {
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 3)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 2);
-               *(rp + 2) = save;
-            }
-         }
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 4)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 2);
-               *(rp + 2) = save;
-            }
-         }
-      }
-
-#ifdef PNG_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 6)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 4);
-               *(rp + 4) = save;
-               save = *(rp + 1);
-               *(rp + 1) = *(rp + 5);
-               *(rp + 5) = save;
-            }
-         }
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-         {
-            png_bytep rp;
-            png_uint_32 i;
-
-            for (i = 0, rp = row; i < row_width; i++, rp += 8)
-            {
-               png_byte save = *rp;
-               *rp = *(rp + 4);
-               *(rp + 4) = save;
-               save = *(rp + 1);
-               *(rp + 1) = *(rp + 5);
-               *(rp + 5) = save;
-            }
-         }
-      }
-#endif
-   }
-}
-#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
-
-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-void PNGAPI
-png_set_user_transform_info(png_structp png_ptr, png_voidp
-   user_transform_ptr, int user_transform_depth, int user_transform_channels)
-{
-   png_debug(1, "in png_set_user_transform_info");
-
-   if (png_ptr == NULL)
-      return;
-   png_ptr->user_transform_ptr = user_transform_ptr;
-   png_ptr->user_transform_depth = (png_byte)user_transform_depth;
-   png_ptr->user_transform_channels = (png_byte)user_transform_channels;
-}
-#endif
-
-/* This function returns a pointer to the user_transform_ptr associated with
- * the user transform functions.  The application should free any memory
- * associated with this pointer before png_write_destroy and png_read_destroy
- * are called.
- */
-#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
-png_voidp PNGAPI
-png_get_user_transform_ptr(png_const_structp png_ptr)
-{
-   if (png_ptr == NULL)
-      return (NULL);
-
-   return ((png_voidp)png_ptr->user_transform_ptr);
-}
-#endif
-
-#ifdef PNG_USER_TRANSFORM_INFO_SUPPORTED
-png_uint_32 PNGAPI
-png_get_current_row_number(png_const_structp png_ptr)
-{
-   /* See the comments in png.h - this is the sub-image row when reading and
-    * interlaced image.
-    */
-   if (png_ptr != NULL)
-      return png_ptr->row_number;
-
-   return PNG_UINT_32_MAX; /* help the app not to fail silently */
-}
-
-png_byte PNGAPI
-png_get_current_pass_number(png_const_structp png_ptr)
-{
-   if (png_ptr != NULL)
-      return png_ptr->pass;
-   return 8; /* invalid */
-}
-#endif /* PNG_USER_TRANSFORM_INFO_SUPPORTED */
-#endif /* PNG_READ_USER_TRANSFORM_SUPPORTED ||
-          PNG_WRITE_USER_TRANSFORM_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+
+/* pngtrans.c - transforms the data in a row (used by both readers and writers)
+ *
+ * libpng  1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* turn on BGR-to-RGB mapping */
+void PNGAPI
+png_set_bgr(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_bgr\n");
+   png_ptr->transformations |= PNG_BGR;
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* turn on 16 bit byte swapping */
+void PNGAPI
+png_set_swap(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_swap\n");
+   if (png_ptr->bit_depth == 16)
+      png_ptr->transformations |= PNG_SWAP_BYTES;
+}
+#endif
+
+#if defined(PNG_READ_PACK_SUPPORTED) || defined(PNG_WRITE_PACK_SUPPORTED)
+/* turn on pixel packing */
+void PNGAPI
+png_set_packing(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_packing\n");
+   if (png_ptr->bit_depth < 8)
+   {
+      png_ptr->transformations |= PNG_PACK;
+      png_ptr->usr_bit_depth = 8;
+   }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+/* turn on packed pixel swapping */
+void PNGAPI
+png_set_packswap(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_packswap\n");
+   if (png_ptr->bit_depth < 8)
+      png_ptr->transformations |= PNG_PACKSWAP;
+}
+#endif
+
+#if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+void PNGAPI
+png_set_shift(png_structp png_ptr, png_color_8p true_bits)
+{
+   png_debug(1, "in png_set_shift\n");
+   png_ptr->transformations |= PNG_SHIFT;
+   png_ptr->shift = *true_bits;
+}
+#endif
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED) || \
+    defined(PNG_WRITE_INTERLACING_SUPPORTED)
+int PNGAPI
+png_set_interlace_handling(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_interlace handling\n");
+   if (png_ptr->interlaced)
+   {
+      png_ptr->transformations |= PNG_INTERLACE;
+      return (7);
+   }
+
+   return (1);
+}
+#endif
+
+#if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
+/* Add a filler byte on read, or remove a filler or alpha byte on write.
+ * The filler type has changed in v0.95 to allow future 2-byte fillers
+ * for 48-bit input data, as well as to avoid problems with some compilers
+ * that don't like bytes as parameters.
+ */
+void PNGAPI
+png_set_filler(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+{
+   png_debug(1, "in png_set_filler\n");
+   png_ptr->transformations |= PNG_FILLER;
+   png_ptr->filler = (png_byte)filler;
+   if (filler_loc == PNG_FILLER_AFTER)
+      png_ptr->flags |= PNG_FLAG_FILLER_AFTER;
+   else
+      png_ptr->flags &= ~PNG_FLAG_FILLER_AFTER;
+
+   /* This should probably go in the "do_read_filler" routine.
+    * I attempted to do that in libpng-1.0.1a but that caused problems
+    * so I restored it in libpng-1.0.2a
+   */
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
+   {
+      png_ptr->usr_channels = 4;
+   }
+
+   /* Also I added this in libpng-1.0.2a (what happens when we expand
+    * a less-than-8-bit grayscale to GA? */
+
+   if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY && png_ptr->bit_depth >= 8)
+   {
+      png_ptr->usr_channels = 2;
+   }
+}
+
+#if !defined(PNG_1_0_X)
+/* Added to libpng-1.2.7 */
+void PNGAPI
+png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int filler_loc)
+{
+   png_debug(1, "in png_set_add_alpha\n");
+   png_set_filler(png_ptr, filler, filler_loc);
+   png_ptr->transformations |= PNG_ADD_ALPHA;
+}
+#endif
+
+#endif
+
+#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_swap_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_swap_alpha\n");
+   png_ptr->transformations |= PNG_SWAP_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED) || \
+    defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+void PNGAPI
+png_set_invert_alpha(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_invert_alpha\n");
+   png_ptr->transformations |= PNG_INVERT_ALPHA;
+}
+#endif
+
+#if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED)
+void PNGAPI
+png_set_invert_mono(png_structp png_ptr)
+{
+   png_debug(1, "in png_set_invert_mono\n");
+   png_ptr->transformations |= PNG_INVERT_MONO;
+}
+
+/* invert monochrome grayscale data */
+void /* PRIVATE */
+png_do_invert(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_invert\n");
+  /* This test removed from libpng version 1.0.13 and 1.2.0:
+   *   if (row_info->bit_depth == 1 &&
+   */
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row == NULL || row_info == NULL)
+     return;
+#endif
+   if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i++)
+      {
+         *rp = (png_byte)(~(*rp));
+         rp++;
+      }
+   }
+   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+      row_info->bit_depth == 8)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i+=2)
+      {
+         *rp = (png_byte)(~(*rp));
+         rp+=2;
+      }
+   }
+   else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
+      row_info->bit_depth == 16)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop = row_info->rowbytes;
+
+      for (i = 0; i < istop; i+=4)
+      {
+         *rp = (png_byte)(~(*rp));
+         *(rp+1) = (png_byte)(~(*(rp+1)));
+         rp+=4;
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
+/* swaps byte order on 16 bit depth images */
+void /* PRIVATE */
+png_do_swap(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_swap\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->bit_depth == 16)
+   {
+      png_bytep rp = row;
+      png_uint_32 i;
+      png_uint_32 istop= row_info->width * row_info->channels;
+
+      for (i = 0; i < istop; i++, rp += 2)
+      {
+         png_byte t = *rp;
+         *rp = *(rp + 1);
+         *(rp + 1) = t;
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+static png_byte onebppswaptable[256] = {
+   0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
+   0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+   0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
+   0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+   0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
+   0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+   0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
+   0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+   0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
+   0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+   0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
+   0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+   0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
+   0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+   0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
+   0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+   0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
+   0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+   0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
+   0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
+   0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
+   0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+   0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
+   0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+   0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
+   0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
+   0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
+   0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+   0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
+   0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
+   0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
+   0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
+};
+
+static png_byte twobppswaptable[256] = {
+   0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0,
+   0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0,
+   0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4,
+   0x24, 0x64, 0xA4, 0xE4, 0x34, 0x74, 0xB4, 0xF4,
+   0x08, 0x48, 0x88, 0xC8, 0x18, 0x58, 0x98, 0xD8,
+   0x28, 0x68, 0xA8, 0xE8, 0x38, 0x78, 0xB8, 0xF8,
+   0x0C, 0x4C, 0x8C, 0xCC, 0x1C, 0x5C, 0x9C, 0xDC,
+   0x2C, 0x6C, 0xAC, 0xEC, 0x3C, 0x7C, 0xBC, 0xFC,
+   0x01, 0x41, 0x81, 0xC1, 0x11, 0x51, 0x91, 0xD1,
+   0x21, 0x61, 0xA1, 0xE1, 0x31, 0x71, 0xB1, 0xF1,
+   0x05, 0x45, 0x85, 0xC5, 0x15, 0x55, 0x95, 0xD5,
+   0x25, 0x65, 0xA5, 0xE5, 0x35, 0x75, 0xB5, 0xF5,
+   0x09, 0x49, 0x89, 0xC9, 0x19, 0x59, 0x99, 0xD9,
+   0x29, 0x69, 0xA9, 0xE9, 0x39, 0x79, 0xB9, 0xF9,
+   0x0D, 0x4D, 0x8D, 0xCD, 0x1D, 0x5D, 0x9D, 0xDD,
+   0x2D, 0x6D, 0xAD, 0xED, 0x3D, 0x7D, 0xBD, 0xFD,
+   0x02, 0x42, 0x82, 0xC2, 0x12, 0x52, 0x92, 0xD2,
+   0x22, 0x62, 0xA2, 0xE2, 0x32, 0x72, 0xB2, 0xF2,
+   0x06, 0x46, 0x86, 0xC6, 0x16, 0x56, 0x96, 0xD6,
+   0x26, 0x66, 0xA6, 0xE6, 0x36, 0x76, 0xB6, 0xF6,
+   0x0A, 0x4A, 0x8A, 0xCA, 0x1A, 0x5A, 0x9A, 0xDA,
+   0x2A, 0x6A, 0xAA, 0xEA, 0x3A, 0x7A, 0xBA, 0xFA,
+   0x0E, 0x4E, 0x8E, 0xCE, 0x1E, 0x5E, 0x9E, 0xDE,
+   0x2E, 0x6E, 0xAE, 0xEE, 0x3E, 0x7E, 0xBE, 0xFE,
+   0x03, 0x43, 0x83, 0xC3, 0x13, 0x53, 0x93, 0xD3,
+   0x23, 0x63, 0xA3, 0xE3, 0x33, 0x73, 0xB3, 0xF3,
+   0x07, 0x47, 0x87, 0xC7, 0x17, 0x57, 0x97, 0xD7,
+   0x27, 0x67, 0xA7, 0xE7, 0x37, 0x77, 0xB7, 0xF7,
+   0x0B, 0x4B, 0x8B, 0xCB, 0x1B, 0x5B, 0x9B, 0xDB,
+   0x2B, 0x6B, 0xAB, 0xEB, 0x3B, 0x7B, 0xBB, 0xFB,
+   0x0F, 0x4F, 0x8F, 0xCF, 0x1F, 0x5F, 0x9F, 0xDF,
+   0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF
+};
+
+static png_byte fourbppswaptable[256] = {
+   0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70,
+   0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0,
+   0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71,
+   0x81, 0x91, 0xA1, 0xB1, 0xC1, 0xD1, 0xE1, 0xF1,
+   0x02, 0x12, 0x22, 0x32, 0x42, 0x52, 0x62, 0x72,
+   0x82, 0x92, 0xA2, 0xB2, 0xC2, 0xD2, 0xE2, 0xF2,
+   0x03, 0x13, 0x23, 0x33, 0x43, 0x53, 0x63, 0x73,
+   0x83, 0x93, 0xA3, 0xB3, 0xC3, 0xD3, 0xE3, 0xF3,
+   0x04, 0x14, 0x24, 0x34, 0x44, 0x54, 0x64, 0x74,
+   0x84, 0x94, 0xA4, 0xB4, 0xC4, 0xD4, 0xE4, 0xF4,
+   0x05, 0x15, 0x25, 0x35, 0x45, 0x55, 0x65, 0x75,
+   0x85, 0x95, 0xA5, 0xB5, 0xC5, 0xD5, 0xE5, 0xF5,
+   0x06, 0x16, 0x26, 0x36, 0x46, 0x56, 0x66, 0x76,
+   0x86, 0x96, 0xA6, 0xB6, 0xC6, 0xD6, 0xE6, 0xF6,
+   0x07, 0x17, 0x27, 0x37, 0x47, 0x57, 0x67, 0x77,
+   0x87, 0x97, 0xA7, 0xB7, 0xC7, 0xD7, 0xE7, 0xF7,
+   0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x68, 0x78,
+   0x88, 0x98, 0xA8, 0xB8, 0xC8, 0xD8, 0xE8, 0xF8,
+   0x09, 0x19, 0x29, 0x39, 0x49, 0x59, 0x69, 0x79,
+   0x89, 0x99, 0xA9, 0xB9, 0xC9, 0xD9, 0xE9, 0xF9,
+   0x0A, 0x1A, 0x2A, 0x3A, 0x4A, 0x5A, 0x6A, 0x7A,
+   0x8A, 0x9A, 0xAA, 0xBA, 0xCA, 0xDA, 0xEA, 0xFA,
+   0x0B, 0x1B, 0x2B, 0x3B, 0x4B, 0x5B, 0x6B, 0x7B,
+   0x8B, 0x9B, 0xAB, 0xBB, 0xCB, 0xDB, 0xEB, 0xFB,
+   0x0C, 0x1C, 0x2C, 0x3C, 0x4C, 0x5C, 0x6C, 0x7C,
+   0x8C, 0x9C, 0xAC, 0xBC, 0xCC, 0xDC, 0xEC, 0xFC,
+   0x0D, 0x1D, 0x2D, 0x3D, 0x4D, 0x5D, 0x6D, 0x7D,
+   0x8D, 0x9D, 0xAD, 0xBD, 0xCD, 0xDD, 0xED, 0xFD,
+   0x0E, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E,
+   0x8E, 0x9E, 0xAE, 0xBE, 0xCE, 0xDE, 0xEE, 0xFE,
+   0x0F, 0x1F, 0x2F, 0x3F, 0x4F, 0x5F, 0x6F, 0x7F,
+   0x8F, 0x9F, 0xAF, 0xBF, 0xCF, 0xDF, 0xEF, 0xFF
+};
+
+/* swaps pixel packing order within bytes */
+void /* PRIVATE */
+png_do_packswap(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_packswap\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       row_info->bit_depth < 8)
+   {
+      png_bytep rp, end, table;
+
+      end = row + row_info->rowbytes;
+
+      if (row_info->bit_depth == 1)
+         table = onebppswaptable;
+      else if (row_info->bit_depth == 2)
+         table = twobppswaptable;
+      else if (row_info->bit_depth == 4)
+         table = fourbppswaptable;
+      else
+         return;
+
+      for (rp = row; rp < end; rp++)
+         *rp = table[*rp];
+   }
+}
+#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
+    defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+/* remove filler or alpha byte(s) */
+void /* PRIVATE */
+png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
+{
+   png_debug(1, "in png_do_strip_filler\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      png_bytep sp=row;
+      png_bytep dp=row;
+      png_uint_32 row_width=row_info->width;
+      png_uint_32 i;
+
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
+         row_info->channels == 4)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            /* This converts from RGBX or RGBA to RGB */
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               dp+=3; sp+=4;
+               for (i = 1; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp++;
+               }
+            }
+            /* This converts from XRGB or ARGB to RGB */
+            else
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 24;
+            row_info->rowbytes = row_width * 3;
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               /* This converts from RRGGBBXX or RRGGBBAA to RRGGBB */
+               sp += 8; dp += 6;
+               for (i = 1; i < row_width; i++)
+               {
+                  /* This could be (although png_memcpy is probably slower):
+                  png_memcpy(dp, sp, 6);
+                  sp += 8;
+                  dp += 6;
+                  */
+
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp += 2;
+               }
+            }
+            else
+            {
+               /* This converts from XXRRGGBB or AARRGGBB to RRGGBB */
+               for (i = 0; i < row_width; i++)
+               {
+                  /* This could be (although png_memcpy is probably slower):
+                  png_memcpy(dp, sp, 6);
+                  sp += 8;
+                  dp += 6;
+                  */
+
+                  sp+=2;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 48;
+            row_info->rowbytes = row_width * 6;
+         }
+         row_info->channels = 3;
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY &&
+          row_info->channels == 2)
+      {
+         if (row_info->bit_depth == 8)
+         {
+            /* This converts from GX or GA to G */
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  sp++;
+               }
+            }
+            /* This converts from XG or AG to G */
+            else
+            {
+               for (i = 0; i < row_width; i++)
+               {
+                  sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 8;
+            row_info->rowbytes = row_width;
+         }
+         else /* if (row_info->bit_depth == 16) */
+         {
+            if (flags & PNG_FLAG_FILLER_AFTER)
+            {
+               /* This converts from GGXX or GGAA to GG */
+               sp += 4; dp += 2;
+               for (i = 1; i < row_width; i++)
+               {
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+                  sp += 2;
+               }
+            }
+            else
+            {
+               /* This converts from XXGG or AAGG to GG */
+               for (i = 0; i < row_width; i++)
+               {
+                  sp += 2;
+                  *dp++ = *sp++;
+                  *dp++ = *sp++;
+               }
+            }
+            row_info->pixel_depth = 16;
+            row_info->rowbytes = row_width * 2;
+         }
+         row_info->channels = 1;
+      }
+   }
+}
+#endif
+
+#if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED)
+/* swaps red and blue bytes within a pixel */
+void /* PRIVATE */
+png_do_bgr(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_bgr\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 3)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 2);
+               *(rp + 2) = save;
+            }
+         }
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 4)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 2);
+               *(rp + 2) = save;
+            }
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 6)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 4);
+               *(rp + 4) = save;
+               save = *(rp + 1);
+               *(rp + 1) = *(rp + 5);
+               *(rp + 5) = save;
+            }
+         }
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+         {
+            png_bytep rp;
+            png_uint_32 i;
+
+            for (i = 0, rp = row; i < row_width; i++, rp += 8)
+            {
+               png_byte save = *rp;
+               *rp = *(rp + 4);
+               *(rp + 4) = save;
+               save = *(rp + 1);
+               *(rp + 1) = *(rp + 5);
+               *(rp + 5) = save;
+            }
+         }
+      }
+   }
+}
+#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
+
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
+    defined(PNG_LEGACY_SUPPORTED)
+void PNGAPI
+png_set_user_transform_info(png_structp png_ptr, png_voidp
+   user_transform_ptr, int user_transform_depth, int user_transform_channels)
+{
+   png_debug(1, "in png_set_user_transform_info\n");
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   png_ptr->user_transform_ptr = user_transform_ptr;
+   png_ptr->user_transform_depth = (png_byte)user_transform_depth;
+   png_ptr->user_transform_channels = (png_byte)user_transform_channels;
+#else
+   if(user_transform_ptr || user_transform_depth || user_transform_channels)
+      png_warning(png_ptr,
+        "This version of libpng does not support user transform info");
+#endif
+}
+#endif
+
+/* This function returns a pointer to the user_transform_ptr associated with
+ * the user transform functions.  The application should free any memory
+ * associated with this pointer before png_write_destroy and png_read_destroy
+ * are called.
+ */
+png_voidp PNGAPI
+png_get_user_transform_ptr(png_structp png_ptr)
+{
+#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
+   return ((png_voidp)png_ptr->user_transform_ptr);
+#else
+   if(png_ptr)
+     return (NULL);
+   return (NULL);
+#endif
+}
diff --git a/Source/3rd Party/wx/src/png/pngvcrd.c b/Source/3rd Party/wx/src/png/pngvcrd.c
new file mode 100644
index 000000000..b6fea2e35
--- /dev/null
+++ b/Source/3rd Party/wx/src/png/pngvcrd.c	
@@ -0,0 +1,3903 @@
+/* pngvcrd.c - mixed C/assembler version of utilities to read a PNG file
+ *
+ * For Intel x86 CPU and Microsoft Visual C++ compiler
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * Copyright (c) 1998, Intel Corporation
+ *
+ * Contributed by Nirav Chhatrapati, Intel Corporation, 1998
+ * Interface to libpng contributed by Gilles Vollant, 1999
+ *
+ *
+ * In png_do_read_interlace() in libpng versions 1.0.3a through 1.0.4d,
+ * a sign error in the post-MMX cleanup code for each pixel_depth resulted
+ * in bad pixels at the beginning of some rows of some images, and also
+ * (due to out-of-range memory reads and writes) caused heap corruption
+ * when compiled with MSVC 6.0.  The error was fixed in version 1.0.4e.
+ *
+ * [png_read_filter_row_mmx_avg() bpp == 2 bugfix, GRR 20000916]
+ *
+ * [runtime MMX configuration, GRR 20010102]
+ *
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+
+#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && defined(PNG_USE_PNGVCRD)
+
+static int mmx_supported=2;
+
+
+int PNGAPI
+png_mmx_support(void)
+{
+  int mmx_supported_local = 0;
+  _asm {
+    push ebx          /*CPUID will trash these */
+    push ecx
+    push edx
+
+    pushfd            /*Save Eflag to stack */
+    pop eax           /*Get Eflag from stack into eax */
+    mov ecx, eax      /*Make another copy of Eflag in ecx */
+    xor eax, 0x200000 /*Toggle ID bit in Eflag [i.e. bit(21)] */
+    push eax          /*Save modified Eflag back to stack */
+
+    popfd             /*Restored modified value back to Eflag reg */
+    pushfd            /*Save Eflag to stack */
+    pop eax           /*Get Eflag from stack */
+    push ecx          /* save original Eflag to stack */
+    popfd             /* restore original Eflag */
+    xor eax, ecx      /*Compare the new Eflag with the original Eflag */
+    jz NOT_SUPPORTED  /*If the same, CPUID instruction is not supported, */
+                      /*skip following instructions and jump to */
+                      /*NOT_SUPPORTED label */
+
+    xor eax, eax      /*Set eax to zero */
+
+    _asm _emit 0x0f   /*CPUID instruction  (two bytes opcode) */
+    _asm _emit 0xa2
+
+    cmp eax, 1        /*make sure eax return non-zero value */
+    jl NOT_SUPPORTED  /*If eax is zero, mmx not supported */
+
+    xor eax, eax      /*set eax to zero */
+    inc eax           /*Now increment eax to 1.  This instruction is */
+                      /*faster than the instruction "mov eax, 1" */
+
+    _asm _emit 0x0f   /*CPUID instruction */
+    _asm _emit 0xa2
+
+    and edx, 0x00800000  /*mask out all bits but mmx bit(24) */
+    cmp edx, 0        /* 0 = mmx not supported */
+    jz  NOT_SUPPORTED /* non-zero = Yes, mmx IS supported */
+
+    mov  mmx_supported_local, 1  /*set return value to 1 */
+
+NOT_SUPPORTED:
+    mov  eax, mmx_supported_local  /*move return value to eax */
+    pop edx          /*CPUID trashed these */
+    pop ecx
+    pop ebx
+  }
+
+  /*mmx_supported_local=0; // test code for force don't support MMX */
+  /*printf("MMX : %u (1=MMX supported)\n",mmx_supported_local); */
+
+  mmx_supported = mmx_supported_local;
+  return mmx_supported_local;
+}
+
+/* Combines the row recently read in with the previous row.
+   This routine takes care of alpha and transparency if requested.
+   This routine also handles the two methods of progressive display
+   of interlaced images, depending on the mask value.
+   The mask value describes which pixels are to be combined with
+   the row.  The pattern always repeats every 8 pixels, so just 8
+   bits are needed.  A one indicates the pixel is to be combined; a
+   zero indicates the pixel is to be skipped.  This is in addition
+   to any alpha or transparency value associated with the pixel.  If
+   you want all pixels to be combined, pass 0xff (255) in mask.  */
+
+/* Use this routine for x86 platform - uses faster MMX routine if machine
+   supports MMX */
+
+void /* PRIVATE */
+png_combine_row(png_structp png_ptr, png_bytep row, int mask)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   const int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+#endif
+
+   png_debug(1,"in png_combine_row_asm\n");
+
+   if (mmx_supported == 2) {
+#if !defined(PNG_1_0_X)
+       /* this should have happened in png_init_mmx_flags() already */
+       png_warning(png_ptr, "asm_flags may not have been initialized");
+#endif
+       png_mmx_support();
+   }
+
+   if (mask == 0xff)
+   {
+      png_memcpy(row, png_ptr->row_buf + 1,
+       (png_size_t)PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+       png_ptr->width));
+   }
+   /* GRR:  add "else if (mask == 0)" case?
+    *       or does png_combine_row() not even get called in that case? */
+   else
+   {
+      switch (png_ptr->row_info.pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int s_inc, s_start, s_end;
+            int m;
+            int shift;
+            png_uint_32 i;
+
+            sp = png_ptr->row_buf + 1;
+            dp = row;
+            m = 0x80;
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+                s_start = 0;
+                s_end = 7;
+                s_inc = 1;
+            }
+            else
+#endif
+            {
+                s_start = 7;
+                s_end = 0;
+                s_inc = -1;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < png_ptr->width; i++)
+            {
+               if (m & mask)
+               {
+                  int value;
+
+                  value = (*sp >> shift) & 0x1;
+                  *dp &= (png_byte)((0x7f7f >> (7 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+
+         case 2:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int s_start, s_end, s_inc;
+            int m;
+            int shift;
+            png_uint_32 i;
+            int value;
+
+            sp = png_ptr->row_buf + 1;
+            dp = row;
+            m = 0x80;
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+            else
+#endif
+            {
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+
+            shift = s_start;
+
+            for (i = 0; i < png_ptr->width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0x3;
+                  *dp &= (png_byte)((0x3f3f >> (6 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+
+         case 4:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int s_start, s_end, s_inc;
+            int m;
+            int shift;
+            png_uint_32 i;
+            int value;
+
+            sp = png_ptr->row_buf + 1;
+            dp = row;
+            m = 0x80;
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (png_ptr->transformations & PNG_PACKSWAP)
+            {
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+            else
+#endif
+            {
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            shift = s_start;
+
+            for (i = 0; i < png_ptr->width; i++)
+            {
+               if (m & mask)
+               {
+                  value = (*sp >> shift) & 0xf;
+                  *dp &= (png_byte)((0xf0f >> (4 - shift)) & 0xff);
+                  *dp |= (png_byte)(value << shift);
+               }
+
+               if (shift == s_end)
+               {
+                  shift = s_start;
+                  sp++;
+                  dp++;
+               }
+               else
+                  shift += s_inc;
+               if (m == 1)
+                  m = 0x80;
+               else
+                  m >>= 1;
+            }
+            break;
+         }
+
+         case 8:
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+            png_uint_32 len;
+            int m;
+            int diff, unmask;
+
+            __int64 mask0=0x0102040810204080;
+
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && mmx_supported */ )
+#else
+            if (mmx_supported)
+#endif
+            {
+               srcptr = png_ptr->row_buf + 1;
+               dstptr = row;
+               m = 0x80;
+               unmask = ~mask;
+               len  = png_ptr->width &~7;  /*reduce to multiple of 8 */
+               diff = png_ptr->width & 7;  /*amount lost */
+
+               _asm
+               {
+                  movd       mm7, unmask   /*load bit pattern */
+                  psubb      mm6,mm6       /*zero mm6 */
+                  punpcklbw  mm7,mm7
+                  punpcklwd  mm7,mm7
+                  punpckldq  mm7,mm7       /*fill register with 8 masks */
+
+                  movq       mm0,mask0
+
+                  pand       mm0,mm7       /*nonzero if keep byte */
+                  pcmpeqb    mm0,mm6       /*zeros->1s, v versa */
+
+                  mov        ecx,len       /*load length of line (pixels) */
+                  mov        esi,srcptr    /*load source */
+                  mov        ebx,dstptr    /*load dest */
+                  cmp        ecx,0         /*lcr */
+                  je         mainloop8end
+
+mainloop8:
+                  movq       mm4,[esi]
+                  pand       mm4,mm0
+                  movq       mm6,mm0
+                  pandn      mm6,[ebx]
+                  por        mm4,mm6
+                  movq       [ebx],mm4
+
+                  add        esi,8         /*inc by 8 bytes processed */
+                  add        ebx,8
+                  sub        ecx,8         /*dec by 8 pixels processed */
+
+                  ja         mainloop8
+mainloop8end:
+
+                  mov        ecx,diff
+                  cmp        ecx,0
+                  jz         end8
+
+                  mov        edx,mask
+                  sal        edx,24        /*make low byte the high byte */
+
+secondloop8:
+                  sal        edx,1         /*move high bit to CF */
+                  jnc        skip8         /*if CF = 0 */
+                  mov        al,[esi]
+                  mov        [ebx],al
+skip8:
+                  inc        esi
+                  inc        ebx
+
+                  dec        ecx
+                  jnz        secondloop8
+end8:
+                  emms
+               }
+            }
+            else /* mmx not supported - use modified C routine */
+            {
+               register unsigned int incr1, initial_val, final_val;
+               png_size_t pixel_bytes;
+               png_uint_32 i;
+               register int disp = png_pass_inc[png_ptr->pass];
+               int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
+
+               pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+               srcptr = png_ptr->row_buf + 1 + offset_table[png_ptr->pass]*
+                  pixel_bytes;
+               dstptr = row + offset_table[png_ptr->pass]*pixel_bytes;
+               initial_val = offset_table[png_ptr->pass]*pixel_bytes;
+               final_val = png_ptr->width*pixel_bytes;
+               incr1 = (disp)*pixel_bytes;
+               for (i = initial_val; i < final_val; i += incr1)
+               {
+                  png_memcpy(dstptr, srcptr, pixel_bytes);
+                  srcptr += incr1;
+                  dstptr += incr1;
+               }
+            } /* end of else */
+
+            break;
+         }       /* end 8 bpp */
+
+         case 16:
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+            png_uint_32 len;
+            int unmask, diff;
+            __int64 mask1=0x0101020204040808,
+                    mask0=0x1010202040408080;
+
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && mmx_supported */ )
+#else
+            if (mmx_supported)
+#endif
+            {
+               srcptr = png_ptr->row_buf + 1;
+               dstptr = row;
+
+               unmask = ~mask;
+               len     = (png_ptr->width)&~7;
+               diff = (png_ptr->width)&7;
+               _asm
+               {
+                  movd       mm7, unmask       /*load bit pattern */
+                  psubb      mm6,mm6           /*zero mm6 */
+                  punpcklbw  mm7,mm7
+                  punpcklwd  mm7,mm7
+                  punpckldq  mm7,mm7           /*fill register with 8 masks */
+
+                  movq       mm0,mask0
+                  movq       mm1,mask1
+
+                  pand       mm0,mm7
+                  pand       mm1,mm7
+
+                  pcmpeqb    mm0,mm6
+                  pcmpeqb    mm1,mm6
+
+                  mov        ecx,len           /*load length of line */
+                  mov        esi,srcptr        /*load source */
+                  mov        ebx,dstptr        /*load dest */
+                  cmp        ecx,0             /*lcr */
+                  jz         mainloop16end
+
+mainloop16:
+                  movq       mm4,[esi]
+                  pand       mm4,mm0
+                  movq       mm6,mm0
+                  movq       mm7,[ebx]
+                  pandn      mm6,mm7
+                  por        mm4,mm6
+                  movq       [ebx],mm4
+
+                  movq       mm5,[esi+8]
+                  pand       mm5,mm1
+                  movq       mm7,mm1
+                  movq       mm6,[ebx+8]
+                  pandn      mm7,mm6
+                  por        mm5,mm7
+                  movq       [ebx+8],mm5
+
+                  add        esi,16            /*inc by 16 bytes processed */
+                  add        ebx,16
+                  sub        ecx,8             /*dec by 8 pixels processed */
+
+                  ja         mainloop16
+
+mainloop16end:
+                  mov        ecx,diff
+                  cmp        ecx,0
+                  jz         end16
+
+                  mov        edx,mask
+                  sal        edx,24            /*make low byte the high byte */
+secondloop16:
+                  sal        edx,1             /*move high bit to CF */
+                  jnc        skip16            /*if CF = 0 */
+                  mov        ax,[esi]
+                  mov        [ebx],ax
+skip16:
+                  add        esi,2
+                  add        ebx,2
+
+                  dec        ecx
+                  jnz        secondloop16
+end16:
+                  emms
+               }
+            }
+            else /* mmx not supported - use modified C routine */
+            {
+               register unsigned int incr1, initial_val, final_val;
+               png_size_t pixel_bytes;
+               png_uint_32 i;
+               register int disp = png_pass_inc[png_ptr->pass];
+               int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
+
+               pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+               srcptr = png_ptr->row_buf + 1 + offset_table[png_ptr->pass]*
+                  pixel_bytes;
+               dstptr = row + offset_table[png_ptr->pass]*pixel_bytes;
+               initial_val = offset_table[png_ptr->pass]*pixel_bytes;
+               final_val = png_ptr->width*pixel_bytes;
+               incr1 = (disp)*pixel_bytes;
+               for (i = initial_val; i < final_val; i += incr1)
+               {
+                  png_memcpy(dstptr, srcptr, pixel_bytes);
+                  srcptr += incr1;
+                  dstptr += incr1;
+               }
+            } /* end of else */
+
+            break;
+         }       /* end 16 bpp */
+
+         case 24:
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+            png_uint_32 len;
+            int unmask, diff;
+
+            __int64 mask2=0x0101010202020404,  /*24bpp */
+                    mask1=0x0408080810101020,
+                    mask0=0x2020404040808080;
+
+            srcptr = png_ptr->row_buf + 1;
+            dstptr = row;
+
+            unmask = ~mask;
+            len     = (png_ptr->width)&~7;
+            diff = (png_ptr->width)&7;
+
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && mmx_supported */ )
+#else
+            if (mmx_supported)
+#endif
+            {
+               _asm
+               {
+                  movd       mm7, unmask       /*load bit pattern */
+                  psubb      mm6,mm6           /*zero mm6 */
+                  punpcklbw  mm7,mm7
+                  punpcklwd  mm7,mm7
+                  punpckldq  mm7,mm7           /*fill register with 8 masks */
+
+                  movq       mm0,mask0
+                  movq       mm1,mask1
+                  movq       mm2,mask2
+
+                  pand       mm0,mm7
+                  pand       mm1,mm7
+                  pand       mm2,mm7
+
+                  pcmpeqb    mm0,mm6
+                  pcmpeqb    mm1,mm6
+                  pcmpeqb    mm2,mm6
+
+                  mov        ecx,len           /*load length of line */
+                  mov        esi,srcptr        /*load source */
+                  mov        ebx,dstptr        /*load dest */
+                  cmp        ecx,0
+                  jz         mainloop24end
+
+mainloop24:
+                  movq       mm4,[esi]
+                  pand       mm4,mm0
+                  movq       mm6,mm0
+                  movq       mm7,[ebx]
+                  pandn      mm6,mm7
+                  por        mm4,mm6
+                  movq       [ebx],mm4
+
+
+                  movq       mm5,[esi+8]
+                  pand       mm5,mm1
+                  movq       mm7,mm1
+                  movq       mm6,[ebx+8]
+                  pandn      mm7,mm6
+                  por        mm5,mm7
+                  movq       [ebx+8],mm5
+
+                  movq       mm6,[esi+16]
+                  pand       mm6,mm2
+                  movq       mm4,mm2
+                  movq       mm7,[ebx+16]
+                  pandn      mm4,mm7
+                  por        mm6,mm4
+                  movq       [ebx+16],mm6
+
+                  add        esi,24            /*inc by 24 bytes processed */
+                  add        ebx,24
+                  sub        ecx,8             /*dec by 8 pixels processed */
+
+                  ja         mainloop24
+
+mainloop24end:
+                  mov        ecx,diff
+                  cmp        ecx,0
+                  jz         end24
+
+                  mov        edx,mask
+                  sal        edx,24            /*make low byte the high byte */
+secondloop24:
+                  sal        edx,1             /*move high bit to CF */
+                  jnc        skip24            /*if CF = 0 */
+                  mov        ax,[esi]
+                  mov        [ebx],ax
+                  xor        eax,eax
+                  mov        al,[esi+2]
+                  mov        [ebx+2],al
+skip24:
+                  add        esi,3
+                  add        ebx,3
+
+                  dec        ecx
+                  jnz        secondloop24
+
+end24:
+                  emms
+               }
+            }
+            else /* mmx not supported - use modified C routine */
+            {
+               register unsigned int incr1, initial_val, final_val;
+               png_size_t pixel_bytes;
+               png_uint_32 i;
+               register int disp = png_pass_inc[png_ptr->pass];
+               int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
+
+               pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+               srcptr = png_ptr->row_buf + 1 + offset_table[png_ptr->pass]*
+                  pixel_bytes;
+               dstptr = row + offset_table[png_ptr->pass]*pixel_bytes;
+               initial_val = offset_table[png_ptr->pass]*pixel_bytes;
+               final_val = png_ptr->width*pixel_bytes;
+               incr1 = (disp)*pixel_bytes;
+               for (i = initial_val; i < final_val; i += incr1)
+               {
+                  png_memcpy(dstptr, srcptr, pixel_bytes);
+                  srcptr += incr1;
+                  dstptr += incr1;
+               }
+            } /* end of else */
+
+            break;
+         }       /* end 24 bpp */
+
+         case 32:
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+            png_uint_32 len;
+            int unmask, diff;
+
+            __int64 mask3=0x0101010102020202,  /*32bpp */
+                    mask2=0x0404040408080808,
+                    mask1=0x1010101020202020,
+                    mask0=0x4040404080808080;
+
+            srcptr = png_ptr->row_buf + 1;
+            dstptr = row;
+
+            unmask = ~mask;
+            len     = (png_ptr->width)&~7;
+            diff = (png_ptr->width)&7;
+
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && mmx_supported */ )
+#else
+            if (mmx_supported)
+#endif
+            {
+               _asm
+               {
+                  movd       mm7, unmask       /*load bit pattern */
+                  psubb      mm6,mm6           /*zero mm6 */
+                  punpcklbw  mm7,mm7
+                  punpcklwd  mm7,mm7
+                  punpckldq  mm7,mm7           /*fill register with 8 masks */
+
+                  movq       mm0,mask0
+                  movq       mm1,mask1
+                  movq       mm2,mask2
+                  movq       mm3,mask3
+
+                  pand       mm0,mm7
+                  pand       mm1,mm7
+                  pand       mm2,mm7
+                  pand       mm3,mm7
+
+                  pcmpeqb    mm0,mm6
+                  pcmpeqb    mm1,mm6
+                  pcmpeqb    mm2,mm6
+                  pcmpeqb    mm3,mm6
+
+                  mov        ecx,len           /*load length of line */
+                  mov        esi,srcptr        /*load source */
+                  mov        ebx,dstptr        /*load dest */
+
+                  cmp        ecx,0             /*lcr */
+                  jz         mainloop32end
+
+mainloop32:
+                  movq       mm4,[esi]
+                  pand       mm4,mm0
+                  movq       mm6,mm0
+                  movq       mm7,[ebx]
+                  pandn      mm6,mm7
+                  por        mm4,mm6
+                  movq       [ebx],mm4
+
+                  movq       mm5,[esi+8]
+                  pand       mm5,mm1
+                  movq       mm7,mm1
+                  movq       mm6,[ebx+8]
+                  pandn      mm7,mm6
+                  por        mm5,mm7
+                  movq       [ebx+8],mm5
+
+                  movq       mm6,[esi+16]
+                  pand       mm6,mm2
+                  movq       mm4,mm2
+                  movq       mm7,[ebx+16]
+                  pandn      mm4,mm7
+                  por        mm6,mm4
+                  movq       [ebx+16],mm6
+
+                  movq       mm7,[esi+24]
+                  pand       mm7,mm3
+                  movq       mm5,mm3
+                  movq       mm4,[ebx+24]
+                  pandn      mm5,mm4
+                  por        mm7,mm5
+                  movq       [ebx+24],mm7
+
+                  add        esi,32            /*inc by 32 bytes processed */
+                  add        ebx,32
+                  sub        ecx,8             /*dec by 8 pixels processed */
+
+                  ja         mainloop32
+
+mainloop32end:
+                  mov        ecx,diff
+                  cmp        ecx,0
+                  jz         end32
+
+                  mov        edx,mask
+                  sal        edx,24            /*make low byte the high byte */
+secondloop32:
+                  sal        edx,1             /*move high bit to CF */
+                  jnc        skip32            /*if CF = 0 */
+                  mov        eax,[esi]
+                  mov        [ebx],eax
+skip32:
+                  add        esi,4
+                  add        ebx,4
+
+                  dec        ecx
+                  jnz        secondloop32
+
+end32:
+                  emms
+               }
+            }
+            else /* mmx _not supported - Use modified C routine */
+            {
+               register unsigned int incr1, initial_val, final_val;
+               png_size_t pixel_bytes;
+               png_uint_32 i;
+               register int disp = png_pass_inc[png_ptr->pass];
+               int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
+
+               pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+               srcptr = png_ptr->row_buf + 1 + offset_table[png_ptr->pass]*
+                  pixel_bytes;
+               dstptr = row + offset_table[png_ptr->pass]*pixel_bytes;
+               initial_val = offset_table[png_ptr->pass]*pixel_bytes;
+               final_val = png_ptr->width*pixel_bytes;
+               incr1 = (disp)*pixel_bytes;
+               for (i = initial_val; i < final_val; i += incr1)
+               {
+                  png_memcpy(dstptr, srcptr, pixel_bytes);
+                  srcptr += incr1;
+                  dstptr += incr1;
+               }
+            } /* end of else */
+
+            break;
+         }       /* end 32 bpp */
+
+         case 48:
+         {
+            png_bytep srcptr;
+            png_bytep dstptr;
+            png_uint_32 len;
+            int unmask, diff;
+
+            __int64 mask5=0x0101010101010202,
+                    mask4=0x0202020204040404,
+                    mask3=0x0404080808080808,
+                    mask2=0x1010101010102020,
+                    mask1=0x2020202040404040,
+                    mask0=0x4040808080808080;
+
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_COMBINE_ROW)
+                /* && mmx_supported */ )
+#else
+            if (mmx_supported)
+#endif
+            {
+               srcptr = png_ptr->row_buf + 1;
+               dstptr = row;
+
+               unmask = ~mask;
+               len     = (png_ptr->width)&~7;
+               diff = (png_ptr->width)&7;
+               _asm
+               {
+                  movd       mm7, unmask       /*load bit pattern */
+                  psubb      mm6,mm6           /*zero mm6 */
+                  punpcklbw  mm7,mm7
+                  punpcklwd  mm7,mm7
+                  punpckldq  mm7,mm7           /*fill register with 8 masks */
+
+                  movq       mm0,mask0
+                  movq       mm1,mask1
+                  movq       mm2,mask2
+                  movq       mm3,mask3
+                  movq       mm4,mask4
+                  movq       mm5,mask5
+
+                  pand       mm0,mm7
+                  pand       mm1,mm7
+                  pand       mm2,mm7
+                  pand       mm3,mm7
+                  pand       mm4,mm7
+                  pand       mm5,mm7
+
+                  pcmpeqb    mm0,mm6
+                  pcmpeqb    mm1,mm6
+                  pcmpeqb    mm2,mm6
+                  pcmpeqb    mm3,mm6
+                  pcmpeqb    mm4,mm6
+                  pcmpeqb    mm5,mm6
+
+                  mov        ecx,len           /*load length of line */
+                  mov        esi,srcptr        /*load source */
+                  mov        ebx,dstptr        /*load dest */
+
+                  cmp        ecx,0
+                  jz         mainloop48end
+
+mainloop48:
+                  movq       mm7,[esi]
+                  pand       mm7,mm0
+                  movq       mm6,mm0
+                  pandn      mm6,[ebx]
+                  por        mm7,mm6
+                  movq       [ebx],mm7
+
+                  movq       mm6,[esi+8]
+                  pand       mm6,mm1
+                  movq       mm7,mm1
+                  pandn      mm7,[ebx+8]
+                  por        mm6,mm7
+                  movq       [ebx+8],mm6
+
+                  movq       mm6,[esi+16]
+                  pand       mm6,mm2
+                  movq       mm7,mm2
+                  pandn      mm7,[ebx+16]
+                  por        mm6,mm7
+                  movq       [ebx+16],mm6
+
+                  movq       mm7,[esi+24]
+                  pand       mm7,mm3
+                  movq       mm6,mm3
+                  pandn      mm6,[ebx+24]
+                  por        mm7,mm6
+                  movq       [ebx+24],mm7
+
+                  movq       mm6,[esi+32]
+                  pand       mm6,mm4
+                  movq       mm7,mm4
+                  pandn      mm7,[ebx+32]
+                  por        mm6,mm7
+                  movq       [ebx+32],mm6
+
+                  movq       mm7,[esi+40]
+                  pand       mm7,mm5
+                  movq       mm6,mm5
+                  pandn      mm6,[ebx+40]
+                  por        mm7,mm6
+                  movq       [ebx+40],mm7
+
+                  add        esi,48            /*inc by 32 bytes processed */
+                  add        ebx,48
+                  sub        ecx,8             /*dec by 8 pixels processed */
+
+                  ja         mainloop48
+mainloop48end:
+
+                  mov        ecx,diff
+                  cmp        ecx,0
+                  jz         end48
+
+                  mov        edx,mask
+                  sal        edx,24            /*make low byte the high byte */
+
+secondloop48:
+                  sal        edx,1             /*move high bit to CF */
+                  jnc        skip48            /*if CF = 0 */
+                  mov        eax,[esi]
+                  mov        [ebx],eax
+skip48:
+                  add        esi,4
+                  add        ebx,4
+
+                  dec        ecx
+                  jnz        secondloop48
+
+end48:
+                  emms
+               }
+            }
+            else /* mmx _not supported - Use modified C routine */
+            {
+               register unsigned int incr1, initial_val, final_val;
+               png_size_t pixel_bytes;
+               png_uint_32 i;
+               register int disp = png_pass_inc[png_ptr->pass];
+               int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
+
+               pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+               srcptr = png_ptr->row_buf + 1 + offset_table[png_ptr->pass]*
+                  pixel_bytes;
+               dstptr = row + offset_table[png_ptr->pass]*pixel_bytes;
+               initial_val = offset_table[png_ptr->pass]*pixel_bytes;
+               final_val = png_ptr->width*pixel_bytes;
+               incr1 = (disp)*pixel_bytes;
+               for (i = initial_val; i < final_val; i += incr1)
+               {
+                  png_memcpy(dstptr, srcptr, pixel_bytes);
+                  srcptr += incr1;
+                  dstptr += incr1;
+               }
+            } /* end of else */
+
+            break;
+         }       /* end 48 bpp */
+
+         default:
+         {
+            png_bytep sptr;
+            png_bytep dp;
+            png_size_t pixel_bytes;
+            int offset_table[7] = {0, 4, 0, 2, 0, 1, 0};
+            unsigned int i;
+            register int disp = png_pass_inc[png_ptr->pass];  /* get the offset */
+            register unsigned int incr1, initial_val, final_val;
+
+            pixel_bytes = (png_ptr->row_info.pixel_depth >> 3);
+            sptr = png_ptr->row_buf + 1 + offset_table[png_ptr->pass]*
+               pixel_bytes;
+            dp = row + offset_table[png_ptr->pass]*pixel_bytes;
+            initial_val = offset_table[png_ptr->pass]*pixel_bytes;
+            final_val = png_ptr->width*pixel_bytes;
+            incr1 = (disp)*pixel_bytes;
+            for (i = initial_val; i < final_val; i += incr1)
+            {
+               png_memcpy(dp, sptr, pixel_bytes);
+               sptr += incr1;
+               dp += incr1;
+            }
+            break;
+         }
+      } /* end switch (png_ptr->row_info.pixel_depth) */
+   } /* end if (non-trivial mask) */
+
+} /* end png_combine_row() */
+
+
+#if defined(PNG_READ_INTERLACING_SUPPORTED)
+
+void /* PRIVATE */
+png_do_read_interlace(png_structp png_ptr)
+{
+   png_row_infop row_info = &(png_ptr->row_info);
+   png_bytep row = png_ptr->row_buf + 1;
+   int pass = png_ptr->pass;
+   png_uint_32 transformations = png_ptr->transformations;
+#ifdef PNG_USE_LOCAL_ARRAYS
+   const int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+#endif
+
+   png_debug(1,"in png_do_read_interlace\n");
+
+   if (mmx_supported == 2) {
+#if !defined(PNG_1_0_X)
+       /* this should have happened in png_init_mmx_flags() already */
+       png_warning(png_ptr, "asm_flags may not have been initialized");
+#endif
+       png_mmx_support();
+   }
+
+   if (row != NULL && row_info != NULL)
+   {
+      png_uint_32 final_width;
+
+      final_width = row_info->width * png_pass_inc[pass];
+
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp, dp;
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_byte v;
+            png_uint_32 i;
+            int j;
+
+            sp = row + (png_size_t)((row_info->width - 1) >> 3);
+            dp = row + (png_size_t)((final_width - 1) >> 3);
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (int)((row_info->width + 7) & 7);
+               dshift = (int)((final_width + 7) & 7);
+               s_start = 7;
+               s_end = 0;
+               s_inc = -1;
+            }
+            else
+#endif
+            {
+               sshift = 7 - (int)((row_info->width + 7) & 7);
+               dshift = 7 - (int)((final_width + 7) & 7);
+               s_start = 0;
+               s_end = 7;
+               s_inc = 1;
+            }
+
+            for (i = row_info->width; i; i--)
+            {
+               v = (png_byte)((*sp >> sshift) & 0x1);
+               for (j = 0; j < png_pass_inc[pass]; j++)
+               {
+                  *dp &= (png_byte)((0x7f7f >> (7 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+
+         case 2:
+         {
+            png_bytep sp, dp;
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_uint_32 i;
+
+            sp = row + (png_size_t)((row_info->width - 1) >> 2);
+            dp = row + (png_size_t)((final_width - 1) >> 2);
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (png_size_t)(((row_info->width + 3) & 3) << 1);
+               dshift = (png_size_t)(((final_width + 3) & 3) << 1);
+               s_start = 6;
+               s_end = 0;
+               s_inc = -2;
+            }
+            else
+#endif
+            {
+               sshift = (png_size_t)((3 - ((row_info->width + 3) & 3)) << 1);
+               dshift = (png_size_t)((3 - ((final_width + 3) & 3)) << 1);
+               s_start = 0;
+               s_end = 6;
+               s_inc = 2;
+            }
+
+            for (i = row_info->width; i; i--)
+            {
+               png_byte v;
+               int j;
+
+               v = (png_byte)((*sp >> sshift) & 0x3);
+               for (j = 0; j < png_pass_inc[pass]; j++)
+               {
+                  *dp &= (png_byte)((0x3f3f >> (6 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+
+         case 4:
+         {
+            png_bytep sp, dp;
+            int sshift, dshift;
+            int s_start, s_end, s_inc;
+            png_uint_32 i;
+
+            sp = row + (png_size_t)((row_info->width - 1) >> 1);
+            dp = row + (png_size_t)((final_width - 1) >> 1);
+#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+            if (transformations & PNG_PACKSWAP)
+            {
+               sshift = (png_size_t)(((row_info->width + 1) & 1) << 2);
+               dshift = (png_size_t)(((final_width + 1) & 1) << 2);
+               s_start = 4;
+               s_end = 0;
+               s_inc = -4;
+            }
+            else
+#endif
+            {
+               sshift = (png_size_t)((1 - ((row_info->width + 1) & 1)) << 2);
+               dshift = (png_size_t)((1 - ((final_width + 1) & 1)) << 2);
+               s_start = 0;
+               s_end = 4;
+               s_inc = 4;
+            }
+
+            for (i = row_info->width; i; i--)
+            {
+               png_byte v;
+               int j;
+
+               v = (png_byte)((*sp >> sshift) & 0xf);
+               for (j = 0; j < png_pass_inc[pass]; j++)
+               {
+                  *dp &= (png_byte)((0xf0f >> (4 - dshift)) & 0xff);
+                  *dp |= (png_byte)(v << dshift);
+                  if (dshift == s_end)
+                  {
+                     dshift = s_start;
+                     dp--;
+                  }
+                  else
+                     dshift += s_inc;
+               }
+               if (sshift == s_end)
+               {
+                  sshift = s_start;
+                  sp--;
+               }
+               else
+                  sshift += s_inc;
+            }
+            break;
+         }
+
+         default:         /* This is the place where the routine is modified */
+         {
+            __int64 const4 = 0x0000000000FFFFFF;
+            /* __int64 const5 = 0x000000FFFFFF0000;  // unused... */
+            __int64 const6 = 0x00000000000000FF;
+            png_bytep sptr, dp;
+            png_uint_32 i;
+            png_size_t pixel_bytes;
+            int width = row_info->width;
+
+            pixel_bytes = (row_info->pixel_depth >> 3);
+
+            sptr = row + (width - 1) * pixel_bytes;
+            dp = row + (final_width - 1) * pixel_bytes;
+            /* New code by Nirav Chhatrapati - Intel Corporation */
+            /* sign fix by GRR */
+            /* NOTE:  there is NO MMX code for 48-bit and 64-bit images */
+
+            // use MMX routine if machine supports it
+#if !defined(PNG_1_0_X)
+            if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_INTERLACE)
+                /* && mmx_supported */ )
+#else
+            if (mmx_supported)
+#endif
+            {
+               if (pixel_bytes == 3)
+               {
+                  if (((pass == 0) || (pass == 1)) && width)
+                  {
+                     _asm
+                     {
+                        mov esi, sptr
+                        mov edi, dp
+                        mov ecx, width
+                        sub edi, 21   /* (png_pass_inc[pass] - 1)*pixel_bytes */
+loop_pass0:
+                        movd mm0, [esi]     ; X X X X X v2 v1 v0
+                        pand mm0, const4    ; 0 0 0 0 0 v2 v1 v0
+                        movq mm1, mm0       ; 0 0 0 0 0 v2 v1 v0
+                        psllq mm0, 16       ; 0 0 0 v2 v1 v0 0 0
+                        movq mm2, mm0       ; 0 0 0 v2 v1 v0 0 0
+                        psllq mm0, 24       ; v2 v1 v0 0 0 0 0 0
+                        psrlq mm1, 8        ; 0 0 0 0 0 0 v2 v1
+                        por mm0, mm2        ; v2 v1 v0 v2 v1 v0 0 0
+                        por mm0, mm1        ; v2 v1 v0 v2 v1 v0 v2 v1
+                        movq mm3, mm0       ; v2 v1 v0 v2 v1 v0 v2 v1
+                        psllq mm0, 16       ; v0 v2 v1 v0 v2 v1 0 0
+                        movq mm4, mm3       ; v2 v1 v0 v2 v1 v0 v2 v1
+                        punpckhdq mm3, mm0  ; v0 v2 v1 v0 v2 v1 v0 v2
+                        movq [edi+16] , mm4
+                        psrlq mm0, 32       ; 0 0 0 0 v0 v2 v1 v0
+                        movq [edi+8] , mm3
+                        punpckldq mm0, mm4  ; v1 v0 v2 v1 v0 v2 v1 v0
+                        sub esi, 3
+                        movq [edi], mm0
+                        sub edi, 24
+                        /*sub esi, 3 */
+                        dec ecx
+                        jnz loop_pass0
+                        EMMS
+                     }
+                  }
+                  else if (((pass == 2) || (pass == 3)) && width)
+                  {
+                     _asm
+                     {
+                        mov esi, sptr
+                        mov edi, dp
+                        mov ecx, width
+                        sub edi, 9   /* (png_pass_inc[pass] - 1)*pixel_bytes */
+loop_pass2:
+                        movd mm0, [esi]     ; X X X X X v2 v1 v0
+                        pand mm0, const4    ; 0 0 0 0 0 v2 v1 v0
+                        movq mm1, mm0       ; 0 0 0 0 0 v2 v1 v0
+                        psllq mm0, 16       ; 0 0 0 v2 v1 v0 0 0
+                        movq mm2, mm0       ; 0 0 0 v2 v1 v0 0 0
+                        psllq mm0, 24       ; v2 v1 v0 0 0 0 0 0
+                        psrlq mm1, 8        ; 0 0 0 0 0 0 v2 v1
+                        por mm0, mm2        ; v2 v1 v0 v2 v1 v0 0 0
+                        por mm0, mm1        ; v2 v1 v0 v2 v1 v0 v2 v1
+                        movq [edi+4], mm0   ; move to memory
+                        psrlq mm0, 16       ; 0 0 v2 v1 v0 v2 v1 v0
+                        movd [edi], mm0     ; move to memory
+                        sub esi, 3
+                        sub edi, 12
+                        dec ecx
+                        jnz loop_pass2
+                        EMMS
+                     }
+                  }
+                  else if (width) /* && ((pass == 4) || (pass == 5)) */
+                  {
+                     int width_mmx = ((width >> 1) << 1) - 8;
+                     if (width_mmx < 0)
+                         width_mmx = 0;
+                     width -= width_mmx;        /* 8 or 9 pix, 24 or 27 bytes */
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub esi, 3
+                           sub edi, 9
+loop_pass4:
+                           movq mm0, [esi]     ; X X v2 v1 v0 v5 v4 v3
+                           movq mm7, mm0       ; X X v2 v1 v0 v5 v4 v3
+                           movq mm6, mm0       ; X X v2 v1 v0 v5 v4 v3
+                           psllq mm0, 24       ; v1 v0 v5 v4 v3 0 0 0
+                           pand mm7, const4    ; 0 0 0 0 0 v5 v4 v3
+                           psrlq mm6, 24       ; 0 0 0 X X v2 v1 v0
+                           por mm0, mm7        ; v1 v0 v5 v4 v3 v5 v4 v3
+                           movq mm5, mm6       ; 0 0 0 X X v2 v1 v0
+                           psllq mm6, 8        ; 0 0 X X v2 v1 v0 0
+                           movq [edi], mm0     ; move quad to memory
+                           psrlq mm5, 16       ; 0 0 0 0 0 X X v2
+                           pand mm5, const6    ; 0 0 0 0 0 0 0 v2
+                           por mm6, mm5        ; 0 0 X X v2 v1 v0 v2
+                           movd [edi+8], mm6   ; move double to memory
+                           sub esi, 6
+                           sub edi, 12
+                           sub ecx, 2
+                           jnz loop_pass4
+                           EMMS
+                        }
+                     }
+
+                     sptr -= width_mmx*3;
+                     dp -= width_mmx*6;
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+
+                        png_memcpy(v, sptr, 3);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           png_memcpy(dp, v, 3);
+                           dp -= 3;
+                        }
+                        sptr -= 3;
+                     }
+                  }
+               } /* end of pixel_bytes == 3 */
+
+               else if (pixel_bytes == 1)
+               {
+                  if (((pass == 0) || (pass == 1)) && width)
+                  {
+                     int width_mmx = ((width >> 2) << 2);
+                     width -= width_mmx;
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub edi, 31
+                           sub esi, 3
+loop1_pass0:
+                           movd mm0, [esi]     ; X X X X v0 v1 v2 v3
+                           movq mm1, mm0       ; X X X X v0 v1 v2 v3
+                           punpcklbw mm0, mm0  ; v0 v0 v1 v1 v2 v2 v3 v3
+                           movq mm2, mm0       ; v0 v0 v1 v1 v2 v2 v3 v3
+                           punpcklwd mm0, mm0  ; v2 v2 v2 v2 v3 v3 v3 v3
+                           movq mm3, mm0       ; v2 v2 v2 v2 v3 v3 v3 v3
+                           punpckldq mm0, mm0  ; v3 v3 v3 v3 v3 v3 v3 v3
+                           punpckhdq mm3, mm3  ; v2 v2 v2 v2 v2 v2 v2 v2
+                           movq [edi], mm0     ; move to memory v3
+                           punpckhwd mm2, mm2  ; v0 v0 v0 v0 v1 v1 v1 v1
+                           movq [edi+8], mm3   ; move to memory v2
+                           movq mm4, mm2       ; v0 v0 v0 v0 v1 v1 v1 v1
+                           punpckldq mm2, mm2  ; v1 v1 v1 v1 v1 v1 v1 v1
+                           punpckhdq mm4, mm4  ; v0 v0 v0 v0 v0 v0 v0 v0
+                           movq [edi+16], mm2  ; move to memory v1
+                           movq [edi+24], mm4  ; move to memory v0
+                           sub esi, 4
+                           sub edi, 32
+                           sub ecx, 4
+                           jnz loop1_pass0
+                           EMMS
+                        }
+                     }
+
+                     sptr -= width_mmx;
+                     dp -= width_mmx*8;
+                     for (i = width; i; i--)
+                     {
+                        int j;
+
+                       /* I simplified this part in version 1.0.4e
+                        * here and in several other instances where
+                        * pixel_bytes == 1  -- GR-P
+                        *
+                        * Original code:
+                        *
+                        * png_byte v[8];
+                        * png_memcpy(v, sptr, pixel_bytes);
+                        * for (j = 0; j < png_pass_inc[pass]; j++)
+                        * {
+                        *    png_memcpy(dp, v, pixel_bytes);
+                        *    dp -= pixel_bytes;
+                        * }
+                        * sptr -= pixel_bytes;
+                        *
+                        * Replacement code is in the next three lines:
+                        */
+
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                           *dp-- = *sptr;
+                        sptr--;
+                     }
+                  }
+                  else if (((pass == 2) || (pass == 3)) && width)
+                  {
+                     int width_mmx = ((width >> 2) << 2);
+                     width -= width_mmx;
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub edi, 15
+                           sub esi, 3
+loop1_pass2:
+                           movd mm0, [esi]     ; X X X X v0 v1 v2 v3
+                           punpcklbw mm0, mm0  ; v0 v0 v1 v1 v2 v2 v3 v3
+                           movq mm1, mm0       ; v0 v0 v1 v1 v2 v2 v3 v3
+                           punpcklwd mm0, mm0  ; v2 v2 v2 v2 v3 v3 v3 v3
+                           punpckhwd mm1, mm1  ; v0 v0 v0 v0 v1 v1 v1 v1
+                           movq [edi], mm0     ; move to memory v2 and v3
+                           sub esi, 4
+                           movq [edi+8], mm1   ; move to memory v1     and v0
+                           sub edi, 16
+                           sub ecx, 4
+                           jnz loop1_pass2
+                           EMMS
+                        }
+                     }
+
+                     sptr -= width_mmx;
+                     dp -= width_mmx*4;
+                     for (i = width; i; i--)
+                     {
+                        int j;
+
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           *dp-- = *sptr;
+                        }
+                        sptr --;
+                     }
+                  }
+                  else if (width) /* && ((pass == 4) || (pass == 5))) */
+                  {
+                     int width_mmx = ((width >> 3) << 3);
+                     width -= width_mmx;
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub edi, 15
+                           sub esi, 7
+loop1_pass4:
+                           movq mm0, [esi]     ; v0 v1 v2 v3 v4 v5 v6 v7
+                           movq mm1, mm0       ; v0 v1 v2 v3 v4 v5 v6 v7
+                           punpcklbw mm0, mm0  ; v4 v4 v5 v5 v6 v6 v7 v7
+                           /*movq mm1, mm0     ; v0 v0 v1 v1 v2 v2 v3 v3 */
+                           punpckhbw mm1, mm1  ;v0 v0 v1 v1 v2 v2 v3 v3
+                           movq [edi+8], mm1   ; move to memory v0 v1 v2 and v3
+                           sub esi, 8
+                           movq [edi], mm0     ; move to memory v4 v5 v6 and v7
+                           /*sub esi, 4 */
+                           sub edi, 16
+                           sub ecx, 8
+                           jnz loop1_pass4
+                           EMMS
+                        }
+                     }
+
+                     sptr -= width_mmx;
+                     dp -= width_mmx*2;
+                     for (i = width; i; i--)
+                     {
+                        int j;
+
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           *dp-- = *sptr;
+                        }
+                        sptr --;
+                     }
+                  }
+               } /* end of pixel_bytes == 1 */
+
+               else if (pixel_bytes == 2)
+               {
+                  if (((pass == 0) || (pass == 1)) && width)
+                  {
+                     int width_mmx = ((width >> 1) << 1);
+                     width -= width_mmx;
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub esi, 2
+                           sub edi, 30
+loop2_pass0:
+                           movd mm0, [esi]        ; X X X X v1 v0 v3 v2
+                           punpcklwd mm0, mm0     ; v1 v0 v1 v0 v3 v2 v3 v2
+                           movq mm1, mm0          ; v1 v0 v1 v0 v3 v2 v3 v2
+                           punpckldq mm0, mm0     ; v3 v2 v3 v2 v3 v2 v3 v2
+                           punpckhdq mm1, mm1     ; v1 v0 v1 v0 v1 v0 v1 v0
+                           movq [edi], mm0
+                           movq [edi + 8], mm0
+                           movq [edi + 16], mm1
+                           movq [edi + 24], mm1
+                           sub esi, 4
+                           sub edi, 32
+                           sub ecx, 2
+                           jnz loop2_pass0
+                           EMMS
+                        }
+                     }
+
+                     sptr -= (width_mmx*2 - 2);            /* sign fixed */
+                     dp -= (width_mmx*16 - 2);            /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 2;
+                        png_memcpy(v, sptr, 2);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 2;
+                           png_memcpy(dp, v, 2);
+                        }
+                     }
+                  }
+                  else if (((pass == 2) || (pass == 3)) && width)
+                  {
+                     int width_mmx = ((width >> 1) << 1) ;
+                     width -= width_mmx;
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub esi, 2
+                           sub edi, 14
+loop2_pass2:
+                           movd mm0, [esi]        ; X X X X v1 v0 v3 v2
+                           punpcklwd mm0, mm0     ; v1 v0 v1 v0 v3 v2 v3 v2
+                           movq mm1, mm0          ; v1 v0 v1 v0 v3 v2 v3 v2
+                           punpckldq mm0, mm0     ; v3 v2 v3 v2 v3 v2 v3 v2
+                           punpckhdq mm1, mm1     ; v1 v0 v1 v0 v1 v0 v1 v0
+                           movq [edi], mm0
+                           sub esi, 4
+                           movq [edi + 8], mm1
+                           /*sub esi, 4 */
+                           sub edi, 16
+                           sub ecx, 2
+                           jnz loop2_pass2
+                           EMMS
+                        }
+                     }
+
+                     sptr -= (width_mmx*2 - 2);            /* sign fixed */
+                     dp -= (width_mmx*8 - 2);            /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 2;
+                        png_memcpy(v, sptr, 2);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 2;
+                           png_memcpy(dp, v, 2);
+                        }
+                     }
+                  }
+                  else if (width)  /* pass == 4 or 5 */
+                  {
+                     int width_mmx = ((width >> 1) << 1) ;
+                     width -= width_mmx;
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub esi, 2
+                           sub edi, 6
+loop2_pass4:
+                           movd mm0, [esi]        ; X X X X v1 v0 v3 v2
+                           punpcklwd mm0, mm0     ; v1 v0 v1 v0 v3 v2 v3 v2
+                           sub esi, 4
+                           movq [edi], mm0
+                           sub edi, 8
+                           sub ecx, 2
+                           jnz loop2_pass4
+                           EMMS
+                        }
+                     }
+
+                     sptr -= (width_mmx*2 - 2);            /* sign fixed */
+                     dp -= (width_mmx*4 - 2);            /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 2;
+                        png_memcpy(v, sptr, 2);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 2;
+                           png_memcpy(dp, v, 2);
+                        }
+                     }
+                  }
+               } /* end of pixel_bytes == 2 */
+
+               else if (pixel_bytes == 4)
+               {
+                  if (((pass == 0) || (pass == 1)) && width)
+                  {
+                     int width_mmx = ((width >> 1) << 1) ;
+                     width -= width_mmx;
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub esi, 4
+                           sub edi, 60
+loop4_pass0:
+                           movq mm0, [esi]        ; v3 v2 v1 v0 v7 v6 v5 v4
+                           movq mm1, mm0          ; v3 v2 v1 v0 v7 v6 v5 v4
+                           punpckldq mm0, mm0     ; v7 v6 v5 v4 v7 v6 v5 v4
+                           punpckhdq mm1, mm1     ; v3 v2 v1 v0 v3 v2 v1 v0
+                           movq [edi], mm0
+                           movq [edi + 8], mm0
+                           movq [edi + 16], mm0
+                           movq [edi + 24], mm0
+                           movq [edi+32], mm1
+                           movq [edi + 40], mm1
+                           movq [edi+ 48], mm1
+                           sub esi, 8
+                           movq [edi + 56], mm1
+                           sub edi, 64
+                           sub ecx, 2
+                           jnz loop4_pass0
+                           EMMS
+                        }
+                     }
+
+                     sptr -= (width_mmx*4 - 4);            /* sign fixed */
+                     dp -= (width_mmx*32 - 4);            /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 4;
+                        png_memcpy(v, sptr, 4);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 4;
+                           png_memcpy(dp, v, 4);
+                        }
+                     }
+                  }
+                  else if (((pass == 2) || (pass == 3)) && width)
+                  {
+                     int width_mmx = ((width >> 1) << 1) ;
+                     width -= width_mmx;
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub esi, 4
+                           sub edi, 28
+loop4_pass2:
+                           movq mm0, [esi]      ; v3 v2 v1 v0 v7 v6 v5 v4
+                           movq mm1, mm0        ; v3 v2 v1 v0 v7 v6 v5 v4
+                           punpckldq mm0, mm0   ; v7 v6 v5 v4 v7 v6 v5 v4
+                           punpckhdq mm1, mm1   ; v3 v2 v1 v0 v3 v2 v1 v0
+                           movq [edi], mm0
+                           movq [edi + 8], mm0
+                           movq [edi+16], mm1
+                           movq [edi + 24], mm1
+                           sub esi, 8
+                           sub edi, 32
+                           sub ecx, 2
+                           jnz loop4_pass2
+                           EMMS
+                        }
+                     }
+
+                     sptr -= (width_mmx*4 - 4);            /* sign fixed */
+                     dp -= (width_mmx*16 - 4);            /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 4;
+                        png_memcpy(v, sptr, 4);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 4;
+                           png_memcpy(dp, v, 4);
+                        }
+                     }
+                  }
+                  else if (width)  /* pass == 4 or 5 */
+                  {
+                     int width_mmx = ((width >> 1) << 1) ;
+                     width -= width_mmx;
+                     if (width_mmx)
+                     {
+                        _asm
+                        {
+                           mov esi, sptr
+                           mov edi, dp
+                           mov ecx, width_mmx
+                           sub esi, 4
+                           sub edi, 12
+loop4_pass4:
+                           movq mm0, [esi]      ; v3 v2 v1 v0 v7 v6 v5 v4
+                           movq mm1, mm0        ; v3 v2 v1 v0 v7 v6 v5 v4
+                           punpckldq mm0, mm0   ; v7 v6 v5 v4 v7 v6 v5 v4
+                           punpckhdq mm1, mm1   ; v3 v2 v1 v0 v3 v2 v1 v0
+                           movq [edi], mm0
+                           sub esi, 8
+                           movq [edi + 8], mm1
+                           sub edi, 16
+                           sub ecx, 2
+                           jnz loop4_pass4
+                           EMMS
+                        }
+                     }
+
+                     sptr -= (width_mmx*4 - 4);          /* sign fixed */
+                     dp -= (width_mmx*8 - 4);            /* sign fixed */
+                     for (i = width; i; i--)
+                     {
+                        png_byte v[8];
+                        int j;
+                        sptr -= 4;
+                        png_memcpy(v, sptr, 4);
+                        for (j = 0; j < png_pass_inc[pass]; j++)
+                        {
+                           dp -= 4;
+                           png_memcpy(dp, v, 4);
+                        }
+                     }
+                  }
+
+               } /* end of pixel_bytes == 4 */
+
+               else if (pixel_bytes == 6)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, 6);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, 6);
+                        dp -= 6;
+                     }
+                     sptr -= 6;
+                  }
+               } /* end of pixel_bytes == 6 */
+
+               else
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, pixel_bytes);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, pixel_bytes);
+                        dp -= pixel_bytes;
+                     }
+                     sptr-= pixel_bytes;
+                  }
+               }
+            } /* end of mmx_supported */
+
+            else /* MMX not supported:  use modified C code - takes advantage
+                  * of inlining of memcpy for a constant */
+            {
+               if (pixel_bytes == 1)
+               {
+                  for (i = width; i; i--)
+                  {
+                     int j;
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                        *dp-- = *sptr;
+                     sptr--;
+                  }
+               }
+               else if (pixel_bytes == 3)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, pixel_bytes);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, pixel_bytes);
+                        dp -= pixel_bytes;
+                     }
+                     sptr -= pixel_bytes;
+                  }
+               }
+               else if (pixel_bytes == 2)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, pixel_bytes);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, pixel_bytes);
+                        dp -= pixel_bytes;
+                     }
+                     sptr -= pixel_bytes;
+                  }
+               }
+               else if (pixel_bytes == 4)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, pixel_bytes);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, pixel_bytes);
+                        dp -= pixel_bytes;
+                     }
+                     sptr -= pixel_bytes;
+                  }
+               }
+               else if (pixel_bytes == 6)
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, pixel_bytes);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, pixel_bytes);
+                        dp -= pixel_bytes;
+                     }
+                     sptr -= pixel_bytes;
+                  }
+               }
+               else
+               {
+                  for (i = width; i; i--)
+                  {
+                     png_byte v[8];
+                     int j;
+                     png_memcpy(v, sptr, pixel_bytes);
+                     for (j = 0; j < png_pass_inc[pass]; j++)
+                     {
+                        png_memcpy(dp, v, pixel_bytes);
+                        dp -= pixel_bytes;
+                     }
+                     sptr -= pixel_bytes;
+                  }
+               }
+
+            } /* end of MMX not supported */
+            break;
+         }
+      } /* end switch (row_info->pixel_depth) */
+
+      row_info->width = final_width;
+
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,final_width);
+   }
+
+}
+
+#endif /* PNG_READ_INTERLACING_SUPPORTED */
+
+
+/* These variables are utilized in the functions below.  They are declared */
+/* globally here to ensure alignment on 8-byte boundaries. */
+
+union uAll {
+   __int64 use;
+   double  align;
+} LBCarryMask = {0x0101010101010101},
+  HBClearMask = {0x7f7f7f7f7f7f7f7f},
+  ActiveMask, ActiveMask2, ActiveMaskEnd, ShiftBpp, ShiftRem;
+
+
+/* Optimized code for PNG Average filter decoder */
+void /* PRIVATE */
+png_read_filter_row_mmx_avg(png_row_infop row_info, png_bytep row
+                            , png_bytep prev_row)
+{
+   int bpp;
+   png_uint_32 FullLength;
+   png_uint_32 MMXLength;
+   /*png_uint_32 len; */
+   int diff;
+
+   bpp = (row_info->pixel_depth + 7) >> 3; /* Get # bytes per pixel */
+   FullLength  = row_info->rowbytes; /* # of bytes to filter */
+   _asm {
+         /* Init address pointers and offset */
+         mov edi, row          /* edi ==> Avg(x) */
+         xor ebx, ebx          /* ebx ==> x */
+         mov edx, edi
+         mov esi, prev_row           /* esi ==> Prior(x) */
+         sub edx, bpp          /* edx ==> Raw(x-bpp) */
+
+         xor eax, eax
+         /* Compute the Raw value for the first bpp bytes */
+         /*    Raw(x) = Avg(x) + (Prior(x)/2) */
+davgrlp:
+         mov al, [esi + ebx]   /* Load al with Prior(x) */
+         inc ebx
+         shr al, 1             /* divide by 2 */
+         add al, [edi+ebx-1]   /* Add Avg(x); -1 to offset inc ebx */
+         cmp ebx, bpp
+         mov [edi+ebx-1], al    /* Write back Raw(x); */
+                            /* mov does not affect flags; -1 to offset inc ebx */
+         jb davgrlp
+         /* get # of bytes to alignment */
+         mov diff, edi         /* take start of row */
+         add diff, ebx         /* add bpp */
+         add diff, 0xf         /* add 7 + 8 to incr past alignment boundary */
+         and diff, 0xfffffff8  /* mask to alignment boundary */
+         sub diff, edi         /* subtract from start ==> value ebx at alignment */
+         jz davggo
+         /* fix alignment */
+         /* Compute the Raw value for the bytes upto the alignment boundary */
+         /*    Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2) */
+         xor ecx, ecx
+davglp1:
+         xor eax, eax
+         mov cl, [esi + ebx]        /* load cl with Prior(x) */
+         mov al, [edx + ebx]  /* load al with Raw(x-bpp) */
+         add ax, cx
+         inc ebx
+         shr ax, 1            /* divide by 2 */
+         add al, [edi+ebx-1]  /* Add Avg(x); -1 to offset inc ebx */
+         cmp ebx, diff              /* Check if at alignment boundary */
+         mov [edi+ebx-1], al        /* Write back Raw(x); */
+                            /* mov does not affect flags; -1 to offset inc ebx */
+         jb davglp1               /* Repeat until at alignment boundary */
+davggo:
+         mov eax, FullLength
+         mov ecx, eax
+         sub eax, ebx          /* subtract alignment fix */
+         and eax, 0x00000007   /* calc bytes over mult of 8 */
+         sub ecx, eax          /* drop over bytes from original length */
+         mov MMXLength, ecx
+   } /* end _asm block */
+   /* Now do the math for the rest of the row */
+   switch ( bpp )
+   {
+      case 3:
+      {
+         ActiveMask.use  = 0x0000000000ffffff;
+         ShiftBpp.use = 24;    /* == 3 * 8 */
+         ShiftRem.use = 40;    /* == 64 - 24 */
+         _asm {
+            /* Re-init address pointers and offset */
+            movq mm7, ActiveMask
+            mov ebx, diff      /* ebx ==> x = offset to alignment boundary */
+            movq mm5, LBCarryMask
+            mov edi, row       /* edi ==> Avg(x) */
+            movq mm4, HBClearMask
+            mov esi, prev_row        /* esi ==> Prior(x) */
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm2, [edi + ebx - 8]  /* Load previous aligned 8 bytes */
+                               /* (we correct position in loop below) */
+davg3lp:
+            movq mm0, [edi + ebx]      /* Load mm0 with Avg(x) */
+            /* Add (Prev_row/2) to Average */
+            movq mm3, mm5
+            psrlq mm2, ShiftRem      /* Correct position Raw(x-bpp) data */
+            movq mm1, [esi + ebx]    /* Load mm1 with Prior(x) */
+            movq mm6, mm7
+            pand mm3, mm1      /* get lsb for each prev_row byte */
+            psrlq mm1, 1       /* divide prev_row bytes by 2 */
+            pand  mm1, mm4     /* clear invalid bit 7 of each byte */
+            paddb mm0, mm1     /* add (Prev_row/2) to Avg for each byte */
+            /* Add 1st active group (Raw(x-bpp)/2) to Average with LBCarry */
+            movq mm1, mm3      /* now use mm1 for getting LBCarrys */
+            pand mm1, mm2      /* get LBCarrys for each byte where both */
+                               /* lsb's were == 1 (Only valid for active group) */
+            psrlq mm2, 1       /* divide raw bytes by 2 */
+            pand  mm2, mm4     /* clear invalid bit 7 of each byte */
+            paddb mm2, mm1     /* add LBCarrys to (Raw(x-bpp)/2) for each byte */
+            pand mm2, mm6      /* Leave only Active Group 1 bytes to add to Avg */
+            paddb mm0, mm2     /* add (Raw/2) + LBCarrys to Avg for each Active */
+                               /*  byte */
+            /* Add 2nd active group (Raw(x-bpp)/2) to Average with LBCarry */
+            psllq mm6, ShiftBpp  /* shift the mm6 mask to cover bytes 3-5 */
+            movq mm2, mm0        /* mov updated Raws to mm2 */
+            psllq mm2, ShiftBpp  /* shift data to position correctly */
+            movq mm1, mm3        /* now use mm1 for getting LBCarrys */
+            pand mm1, mm2      /* get LBCarrys for each byte where both */
+                               /* lsb's were == 1 (Only valid for active group) */
+            psrlq mm2, 1       /* divide raw bytes by 2 */
+            pand  mm2, mm4     /* clear invalid bit 7 of each byte */
+            paddb mm2, mm1     /* add LBCarrys to (Raw(x-bpp)/2) for each byte */
+            pand mm2, mm6      /* Leave only Active Group 2 bytes to add to Avg */
+            paddb mm0, mm2     /* add (Raw/2) + LBCarrys to Avg for each Active */
+                               /*  byte */
+
+            /* Add 3rd active group (Raw(x-bpp)/2) to Average with LBCarry */
+            psllq mm6, ShiftBpp  /* shift the mm6 mask to cover the last two */
+                                 /* bytes */
+            movq mm2, mm0        /* mov updated Raws to mm2 */
+            psllq mm2, ShiftBpp  /* shift data to position correctly */
+                              /* Data only needs to be shifted once here to */
+                              /* get the correct x-bpp offset. */
+            movq mm1, mm3     /* now use mm1 for getting LBCarrys */
+            pand mm1, mm2     /* get LBCarrys for each byte where both */
+                              /* lsb's were == 1 (Only valid for active group) */
+            psrlq mm2, 1      /* divide raw bytes by 2 */
+            pand  mm2, mm4    /* clear invalid bit 7 of each byte */
+            paddb mm2, mm1    /* add LBCarrys to (Raw(x-bpp)/2) for each byte */
+            pand mm2, mm6     /* Leave only Active Group 2 bytes to add to Avg */
+            add ebx, 8
+            paddb mm0, mm2    /* add (Raw/2) + LBCarrys to Avg for each Active */
+                              /* byte */
+
+            /* Now ready to write back to memory */
+            movq [edi + ebx - 8], mm0
+            /* Move updated Raw(x) to use as Raw(x-bpp) for next loop */
+            cmp ebx, MMXLength
+            movq mm2, mm0     /* mov updated Raw(x) to mm2 */
+            jb davg3lp
+         } /* end _asm block */
+      }
+      break;
+
+      case 6:
+      case 4:
+      case 7:
+      case 5:
+      {
+         ActiveMask.use  = 0xffffffffffffffff;  /* use shift below to clear */
+                                                /* appropriate inactive bytes */
+         ShiftBpp.use = bpp << 3;
+         ShiftRem.use = 64 - ShiftBpp.use;
+         _asm {
+            movq mm4, HBClearMask
+            /* Re-init address pointers and offset */
+            mov ebx, diff       /* ebx ==> x = offset to alignment boundary */
+            /* Load ActiveMask and clear all bytes except for 1st active group */
+            movq mm7, ActiveMask
+            mov edi, row         /* edi ==> Avg(x) */
+            psrlq mm7, ShiftRem
+            mov esi, prev_row    /* esi ==> Prior(x) */
+            movq mm6, mm7
+            movq mm5, LBCarryMask
+            psllq mm6, ShiftBpp  /* Create mask for 2nd active group */
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm2, [edi + ebx - 8]  /* Load previous aligned 8 bytes */
+                                 /* (we correct position in loop below) */
+davg4lp:
+            movq mm0, [edi + ebx]
+            psrlq mm2, ShiftRem  /* shift data to position correctly */
+            movq mm1, [esi + ebx]
+            /* Add (Prev_row/2) to Average */
+            movq mm3, mm5
+            pand mm3, mm1     /* get lsb for each prev_row byte */
+            psrlq mm1, 1      /* divide prev_row bytes by 2 */
+            pand  mm1, mm4    /* clear invalid bit 7 of each byte */
+            paddb mm0, mm1    /* add (Prev_row/2) to Avg for each byte */
+            /* Add 1st active group (Raw(x-bpp)/2) to Average with LBCarry */
+            movq mm1, mm3     /* now use mm1 for getting LBCarrys */
+            pand mm1, mm2     /* get LBCarrys for each byte where both */
+                              /* lsb's were == 1 (Only valid for active group) */
+            psrlq mm2, 1      /* divide raw bytes by 2 */
+            pand  mm2, mm4    /* clear invalid bit 7 of each byte */
+            paddb mm2, mm1    /* add LBCarrys to (Raw(x-bpp)/2) for each byte */
+            pand mm2, mm7     /* Leave only Active Group 1 bytes to add to Avg */
+            paddb mm0, mm2    /* add (Raw/2) + LBCarrys to Avg for each Active */
+                              /* byte */
+            /* Add 2nd active group (Raw(x-bpp)/2) to Average with LBCarry */
+            movq mm2, mm0     /* mov updated Raws to mm2 */
+            psllq mm2, ShiftBpp /* shift data to position correctly */
+            add ebx, 8
+            movq mm1, mm3     /* now use mm1 for getting LBCarrys */
+            pand mm1, mm2     /* get LBCarrys for each byte where both */
+                              /* lsb's were == 1 (Only valid for active group) */
+            psrlq mm2, 1      /* divide raw bytes by 2 */
+            pand  mm2, mm4    /* clear invalid bit 7 of each byte */
+            paddb mm2, mm1    /* add LBCarrys to (Raw(x-bpp)/2) for each byte */
+            pand mm2, mm6     /* Leave only Active Group 2 bytes to add to Avg */
+            paddb mm0, mm2    /* add (Raw/2) + LBCarrys to Avg for each Active */
+                              /* byte */
+            cmp ebx, MMXLength
+            /* Now ready to write back to memory */
+            movq [edi + ebx - 8], mm0
+            /* Prep Raw(x-bpp) for next loop */
+            movq mm2, mm0     /* mov updated Raws to mm2 */
+            jb davg4lp
+         } /* end _asm block */
+      }
+      break;
+      case 2:
+      {
+         ActiveMask.use  = 0x000000000000ffff;
+         ShiftBpp.use = 16;   /* == 2 * 8     [BUGFIX] */
+         ShiftRem.use = 48;   /* == 64 - 16   [BUGFIX] */
+         _asm {
+            /* Load ActiveMask */
+            movq mm7, ActiveMask
+            /* Re-init address pointers and offset */
+            mov ebx, diff     /* ebx ==> x = offset to alignment boundary */
+            movq mm5, LBCarryMask
+            mov edi, row      /* edi ==> Avg(x) */
+            movq mm4, HBClearMask
+            mov esi, prev_row  /* esi ==> Prior(x) */
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm2, [edi + ebx - 8]  /* Load previous aligned 8 bytes */
+                              /* (we correct position in loop below) */
+davg2lp:
+            movq mm0, [edi + ebx]
+            psrlq mm2, ShiftRem  /* shift data to position correctly   [BUGFIX] */
+            movq mm1, [esi + ebx]
+            /* Add (Prev_row/2) to Average */
+            movq mm3, mm5
+            pand mm3, mm1     /* get lsb for each prev_row byte */
+            psrlq mm1, 1      /* divide prev_row bytes by 2 */
+            pand  mm1, mm4    /* clear invalid bit 7 of each byte */
+            movq mm6, mm7
+            paddb mm0, mm1    /* add (Prev_row/2) to Avg for each byte */
+            /* Add 1st active group (Raw(x-bpp)/2) to Average with LBCarry */
+            movq mm1, mm3     /* now use mm1 for getting LBCarrys */
+            pand mm1, mm2     /* get LBCarrys for each byte where both */
+                              /* lsb's were == 1 (Only valid for active group) */
+            psrlq mm2, 1      /* divide raw bytes by 2 */
+            pand  mm2, mm4    /* clear invalid bit 7 of each byte */
+            paddb mm2, mm1    /* add LBCarrys to (Raw(x-bpp)/2) for each byte */
+            pand mm2, mm6     /* Leave only Active Group 1 bytes to add to Avg */
+            paddb mm0, mm2 /* add (Raw/2) + LBCarrys to Avg for each Active byte */
+            /* Add 2nd active group (Raw(x-bpp)/2) to Average with LBCarry */
+            psllq mm6, ShiftBpp /* shift the mm6 mask to cover bytes 2 & 3 */
+            movq mm2, mm0       /* mov updated Raws to mm2 */
+            psllq mm2, ShiftBpp /* shift data to position correctly */
+            movq mm1, mm3       /* now use mm1 for getting LBCarrys */
+            pand mm1, mm2       /* get LBCarrys for each byte where both */
+                                /* lsb's were == 1 (Only valid for active group) */
+            psrlq mm2, 1        /* divide raw bytes by 2 */
+            pand  mm2, mm4      /* clear invalid bit 7 of each byte */
+            paddb mm2, mm1      /* add LBCarrys to (Raw(x-bpp)/2) for each byte */
+            pand mm2, mm6       /* Leave only Active Group 2 bytes to add to Avg */
+            paddb mm0, mm2 /* add (Raw/2) + LBCarrys to Avg for each Active byte */
+
+            /* Add rdd active group (Raw(x-bpp)/2) to Average with LBCarry */
+            psllq mm6, ShiftBpp /* shift the mm6 mask to cover bytes 4 & 5 */
+            movq mm2, mm0       /* mov updated Raws to mm2 */
+            psllq mm2, ShiftBpp /* shift data to position correctly */
+                                /* Data only needs to be shifted once here to */
+                                /* get the correct x-bpp offset. */
+            movq mm1, mm3       /* now use mm1 for getting LBCarrys */
+            pand mm1, mm2       /* get LBCarrys for each byte where both */
+                                /* lsb's were == 1 (Only valid for active group) */
+            psrlq mm2, 1        /* divide raw bytes by 2 */
+            pand  mm2, mm4      /* clear invalid bit 7 of each byte */
+            paddb mm2, mm1      /* add LBCarrys to (Raw(x-bpp)/2) for each byte */
+            pand mm2, mm6       /* Leave only Active Group 2 bytes to add to Avg */
+            paddb mm0, mm2 /* add (Raw/2) + LBCarrys to Avg for each Active byte */
+
+            /* Add 4th active group (Raw(x-bpp)/2) to Average with LBCarry */
+            psllq mm6, ShiftBpp  /* shift the mm6 mask to cover bytes 6 & 7 */
+            movq mm2, mm0        /* mov updated Raws to mm2 */
+            psllq mm2, ShiftBpp  /* shift data to position correctly */
+                                 /* Data only needs to be shifted once here to */
+                                 /* get the correct x-bpp offset. */
+            add ebx, 8
+            movq mm1, mm3    /* now use mm1 for getting LBCarrys */
+            pand mm1, mm2    /* get LBCarrys for each byte where both */
+                             /* lsb's were == 1 (Only valid for active group) */
+            psrlq mm2, 1     /* divide raw bytes by 2 */
+            pand  mm2, mm4   /* clear invalid bit 7 of each byte */
+            paddb mm2, mm1   /* add LBCarrys to (Raw(x-bpp)/2) for each byte */
+            pand mm2, mm6    /* Leave only Active Group 2 bytes to add to Avg */
+            paddb mm0, mm2 /* add (Raw/2) + LBCarrys to Avg for each Active byte */
+
+            cmp ebx, MMXLength
+            /* Now ready to write back to memory */
+            movq [edi + ebx - 8], mm0
+            /* Prep Raw(x-bpp) for next loop */
+            movq mm2, mm0    /* mov updated Raws to mm2 */
+            jb davg2lp
+        } /* end _asm block */
+      }
+      break;
+
+      case 1:                 /* bpp == 1 */
+      {
+         _asm {
+            /* Re-init address pointers and offset */
+            mov ebx, diff     /* ebx ==> x = offset to alignment boundary */
+            mov edi, row      /* edi ==> Avg(x) */
+            cmp ebx, FullLength  /* Test if offset at end of array */
+            jnb davg1end
+            /* Do Paeth decode for remaining bytes */
+            mov esi, prev_row    /* esi ==> Prior(x) */
+            mov edx, edi
+            xor ecx, ecx         /* zero ecx before using cl & cx in loop below */
+            sub edx, bpp         /* edx ==> Raw(x-bpp) */
+davg1lp:
+            /* Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2) */
+            xor eax, eax
+            mov cl, [esi + ebx]  /* load cl with Prior(x) */
+            mov al, [edx + ebx]  /* load al with Raw(x-bpp) */
+            add ax, cx
+            inc ebx
+            shr ax, 1            /* divide by 2 */
+            add al, [edi+ebx-1]  /* Add Avg(x); -1 to offset inc ebx */
+            cmp ebx, FullLength  /* Check if at end of array */
+            mov [edi+ebx-1], al  /* Write back Raw(x); */
+                         /* mov does not affect flags; -1 to offset inc ebx */
+            jb davg1lp
+davg1end:
+         } /* end _asm block */
+      }
+      return;
+
+      case 8:             /* bpp == 8 */
+      {
+         _asm {
+            /* Re-init address pointers and offset */
+            mov ebx, diff           /* ebx ==> x = offset to alignment boundary */
+            movq mm5, LBCarryMask
+            mov edi, row            /* edi ==> Avg(x) */
+            movq mm4, HBClearMask
+            mov esi, prev_row       /* esi ==> Prior(x) */
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm2, [edi + ebx - 8]  /* Load previous aligned 8 bytes */
+                                /* (NO NEED to correct position in loop below) */
+davg8lp:
+            movq mm0, [edi + ebx]
+            movq mm3, mm5
+            movq mm1, [esi + ebx]
+            add ebx, 8
+            pand mm3, mm1       /* get lsb for each prev_row byte */
+            psrlq mm1, 1        /* divide prev_row bytes by 2 */
+            pand mm3, mm2       /* get LBCarrys for each byte where both */
+                                /* lsb's were == 1 */
+            psrlq mm2, 1        /* divide raw bytes by 2 */
+            pand  mm1, mm4      /* clear invalid bit 7 of each byte */
+            paddb mm0, mm3      /* add LBCarrys to Avg for each byte */
+            pand  mm2, mm4      /* clear invalid bit 7 of each byte */
+            paddb mm0, mm1      /* add (Prev_row/2) to Avg for each byte */
+            paddb mm0, mm2      /* add (Raw/2) to Avg for each byte */
+            cmp ebx, MMXLength
+            movq [edi + ebx - 8], mm0
+            movq mm2, mm0       /* reuse as Raw(x-bpp) */
+            jb davg8lp
+        } /* end _asm block */
+      }
+      break;
+      default:                  /* bpp greater than 8 */
+      {
+        _asm {
+            movq mm5, LBCarryMask
+            /* Re-init address pointers and offset */
+            mov ebx, diff       /* ebx ==> x = offset to alignment boundary */
+            mov edi, row        /* edi ==> Avg(x) */
+            movq mm4, HBClearMask
+            mov edx, edi
+            mov esi, prev_row   /* esi ==> Prior(x) */
+            sub edx, bpp        /* edx ==> Raw(x-bpp) */
+davgAlp:
+            movq mm0, [edi + ebx]
+            movq mm3, mm5
+            movq mm1, [esi + ebx]
+            pand mm3, mm1       /* get lsb for each prev_row byte */
+            movq mm2, [edx + ebx]
+            psrlq mm1, 1        /* divide prev_row bytes by 2 */
+            pand mm3, mm2       /* get LBCarrys for each byte where both */
+                                /* lsb's were == 1 */
+            psrlq mm2, 1        /* divide raw bytes by 2 */
+            pand  mm1, mm4      /* clear invalid bit 7 of each byte */
+            paddb mm0, mm3      /* add LBCarrys to Avg for each byte */
+            pand  mm2, mm4      /* clear invalid bit 7 of each byte */
+            paddb mm0, mm1      /* add (Prev_row/2) to Avg for each byte */
+            add ebx, 8
+            paddb mm0, mm2      /* add (Raw/2) to Avg for each byte */
+            cmp ebx, MMXLength
+            movq [edi + ebx - 8], mm0
+            jb davgAlp
+        } /* end _asm block */
+      }
+      break;
+   }                         /* end switch ( bpp ) */
+
+   _asm {
+         /* MMX acceleration complete now do clean-up */
+         /* Check if any remaining bytes left to decode */
+         mov ebx, MMXLength    /* ebx ==> x = offset bytes remaining after MMX */
+         mov edi, row          /* edi ==> Avg(x) */
+         cmp ebx, FullLength   /* Test if offset at end of array */
+         jnb davgend
+         /* Do Paeth decode for remaining bytes */
+         mov esi, prev_row     /* esi ==> Prior(x) */
+         mov edx, edi
+         xor ecx, ecx          /* zero ecx before using cl & cx in loop below */
+         sub edx, bpp          /* edx ==> Raw(x-bpp) */
+davglp2:
+         /* Raw(x) = Avg(x) + ((Raw(x-bpp) + Prior(x))/2) */
+         xor eax, eax
+         mov cl, [esi + ebx]   /* load cl with Prior(x) */
+         mov al, [edx + ebx]   /* load al with Raw(x-bpp) */
+         add ax, cx
+         inc ebx
+         shr ax, 1              /* divide by 2 */
+         add al, [edi+ebx-1]    /* Add Avg(x); -1 to offset inc ebx */
+         cmp ebx, FullLength    /* Check if at end of array */
+         mov [edi+ebx-1], al    /* Write back Raw(x); */
+                          /* mov does not affect flags; -1 to offset inc ebx */
+         jb davglp2
+davgend:
+         emms             /* End MMX instructions; prep for possible FP instrs. */
+   } /* end _asm block */
+}
+
+/* Optimized code for PNG Paeth filter decoder */
+void /* PRIVATE */
+png_read_filter_row_mmx_paeth(png_row_infop row_info, png_bytep row,
+                              png_bytep prev_row)
+{
+   png_uint_32 FullLength;
+   png_uint_32 MMXLength;
+   /*png_uint_32 len; */
+   int bpp;
+   int diff;
+   /*int ptemp; */
+   int patemp, pbtemp, pctemp;
+
+   bpp = (row_info->pixel_depth + 7) >> 3; /* Get # bytes per pixel */
+   FullLength  = row_info->rowbytes; /* # of bytes to filter */
+   _asm
+   {
+         xor ebx, ebx        /* ebx ==> x offset */
+         mov edi, row
+         xor edx, edx        /* edx ==> x-bpp offset */
+         mov esi, prev_row
+         xor eax, eax
+
+         /* Compute the Raw value for the first bpp bytes */
+         /* Note: the formula works out to be always */
+         /*   Paeth(x) = Raw(x) + Prior(x)      where x < bpp */
+dpthrlp:
+         mov al, [edi + ebx]
+         add al, [esi + ebx]
+         inc ebx
+         cmp ebx, bpp
+         mov [edi + ebx - 1], al
+         jb dpthrlp
+         /* get # of bytes to alignment */
+         mov diff, edi         /* take start of row */
+         add diff, ebx         /* add bpp */
+         xor ecx, ecx
+         add diff, 0xf         /* add 7 + 8 to incr past alignment boundary */
+         and diff, 0xfffffff8  /* mask to alignment boundary */
+         sub diff, edi         /* subtract from start ==> value ebx at alignment */
+         jz dpthgo
+         /* fix alignment */
+dpthlp1:
+         xor eax, eax
+         /* pav = p - a = (a + b - c) - a = b - c */
+         mov al, [esi + ebx]   /* load Prior(x) into al */
+         mov cl, [esi + edx]   /* load Prior(x-bpp) into cl */
+         sub eax, ecx          /* subtract Prior(x-bpp) */
+         mov patemp, eax       /* Save pav for later use */
+         xor eax, eax
+         /* pbv = p - b = (a + b - c) - b = a - c */
+         mov al, [edi + edx]   /* load Raw(x-bpp) into al */
+         sub eax, ecx          /* subtract Prior(x-bpp) */
+         mov ecx, eax
+         /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+         add eax, patemp       /* pcv = pav + pbv */
+         /* pc = abs(pcv) */
+         test eax, 0x80000000
+         jz dpthpca
+         neg eax               /* reverse sign of neg values */
+dpthpca:
+         mov pctemp, eax       /* save pc for later use */
+         /* pb = abs(pbv) */
+         test ecx, 0x80000000
+         jz dpthpba
+         neg ecx               /* reverse sign of neg values */
+dpthpba:
+         mov pbtemp, ecx       /* save pb for later use */
+         /* pa = abs(pav) */
+         mov eax, patemp
+         test eax, 0x80000000
+         jz dpthpaa
+         neg eax               /* reverse sign of neg values */
+dpthpaa:
+         mov patemp, eax       /* save pa for later use */
+         /* test if pa <= pb */
+         cmp eax, ecx
+         jna dpthabb
+         /* pa > pb; now test if pb <= pc */
+         cmp ecx, pctemp
+         jna dpthbbc
+         /* pb > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+         mov cl, [esi + edx]  /* load Prior(x-bpp) into cl */
+         jmp dpthpaeth
+dpthbbc:
+         /* pb <= pc; Raw(x) = Paeth(x) + Prior(x) */
+         mov cl, [esi + ebx]   /* load Prior(x) into cl */
+         jmp dpthpaeth
+dpthabb:
+         /* pa <= pb; now test if pa <= pc */
+         cmp eax, pctemp
+         jna dpthabc
+         /* pa > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+         mov cl, [esi + edx]  /* load Prior(x-bpp) into cl */
+         jmp dpthpaeth
+dpthabc:
+         /* pa <= pc; Raw(x) = Paeth(x) + Raw(x-bpp) */
+         mov cl, [edi + edx]  /* load Raw(x-bpp) into cl */
+dpthpaeth:
+         inc ebx
+         inc edx
+         /* Raw(x) = (Paeth(x) + Paeth_Predictor( a, b, c )) mod 256 */
+         add [edi + ebx - 1], cl
+         cmp ebx, diff
+         jb dpthlp1
+dpthgo:
+         mov ecx, FullLength
+         mov eax, ecx
+         sub eax, ebx          /* subtract alignment fix */
+         and eax, 0x00000007   /* calc bytes over mult of 8 */
+         sub ecx, eax          /* drop over bytes from original length */
+         mov MMXLength, ecx
+   } /* end _asm block */
+   /* Now do the math for the rest of the row */
+   switch ( bpp )
+   {
+      case 3:
+      {
+         ActiveMask.use = 0x0000000000ffffff;
+         ActiveMaskEnd.use = 0xffff000000000000;
+         ShiftBpp.use = 24;    /* == bpp(3) * 8 */
+         ShiftRem.use = 40;    /* == 64 - 24 */
+         _asm
+         {
+            mov ebx, diff
+            mov edi, row
+            mov esi, prev_row
+            pxor mm0, mm0
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm1, [edi+ebx-8]
+dpth3lp:
+            psrlq mm1, ShiftRem     /* shift last 3 bytes to 1st 3 bytes */
+            movq mm2, [esi + ebx]   /* load b=Prior(x) */
+            punpcklbw mm1, mm0      /* Unpack High bytes of a */
+            movq mm3, [esi+ebx-8]   /* Prep c=Prior(x-bpp) bytes */
+            punpcklbw mm2, mm0      /* Unpack High bytes of b */
+            psrlq mm3, ShiftRem     /* shift last 3 bytes to 1st 3 bytes */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            movq mm4, mm2
+            punpcklbw mm3, mm0      /* Unpack High bytes of c */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            movq mm5, mm1
+            psubw mm4, mm3
+            pxor mm7, mm7
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            movq mm6, mm4
+            psubw mm5, mm3
+
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            pcmpgtw mm0, mm4    /* Create mask pav bytes < 0 */
+            paddw mm6, mm5
+            pand mm0, mm4       /* Only pav bytes < 0 in mm7 */
+            pcmpgtw mm7, mm5    /* Create mask pbv bytes < 0 */
+            psubw mm4, mm0
+            pand mm7, mm5       /* Only pbv bytes < 0 in mm0 */
+            psubw mm4, mm0
+            psubw mm5, mm7
+            pxor mm0, mm0
+            pcmpgtw mm0, mm6    /* Create mask pcv bytes < 0 */
+            pand mm0, mm6       /* Only pav bytes < 0 in mm7 */
+            psubw mm5, mm7
+            psubw mm6, mm0
+            /*  test pa <= pb */
+            movq mm7, mm4
+            psubw mm6, mm0
+            pcmpgtw mm7, mm5    /* pa > pb? */
+            movq mm0, mm7
+            /* use mm7 mask to merge pa & pb */
+            pand mm5, mm7
+            /* use mm0 mask copy to merge a & b */
+            pand mm2, mm0
+            pandn mm7, mm4
+            pandn mm0, mm1
+            paddw mm7, mm5
+            paddw mm0, mm2
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            pcmpgtw mm7, mm6       /* pab > pc? */
+            pxor mm1, mm1
+            pand mm3, mm7
+            pandn mm7, mm0
+            paddw mm7, mm3
+            pxor mm0, mm0
+            packuswb mm7, mm1
+            movq mm3, [esi + ebx]   /* load c=Prior(x-bpp) */
+            pand mm7, ActiveMask
+            movq mm2, mm3           /* load b=Prior(x) step 1 */
+            paddb mm7, [edi + ebx]  /* add Paeth predictor with Raw(x) */
+            punpcklbw mm3, mm0      /* Unpack High bytes of c */
+            movq [edi + ebx], mm7   /* write back updated value */
+            movq mm1, mm7           /* Now mm1 will be used as Raw(x-bpp) */
+            /* Now do Paeth for 2nd set of bytes (3-5) */
+            psrlq mm2, ShiftBpp     /* load b=Prior(x) step 2 */
+            punpcklbw mm1, mm0      /* Unpack High bytes of a */
+            pxor mm7, mm7
+            punpcklbw mm2, mm0      /* Unpack High bytes of b */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            movq mm5, mm1
+            /* pav = p - a = (a + b - c) - a = b - c */
+            movq mm4, mm2
+            psubw mm5, mm3
+            psubw mm4, mm3
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = */
+            /*       pav + pbv = pbv + pav */
+            movq mm6, mm5
+            paddw mm6, mm4
+
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            pcmpgtw mm0, mm5       /* Create mask pbv bytes < 0 */
+            pcmpgtw mm7, mm4       /* Create mask pav bytes < 0 */
+            pand mm0, mm5          /* Only pbv bytes < 0 in mm0 */
+            pand mm7, mm4          /* Only pav bytes < 0 in mm7 */
+            psubw mm5, mm0
+            psubw mm4, mm7
+            psubw mm5, mm0
+            psubw mm4, mm7
+            pxor mm0, mm0
+            pcmpgtw mm0, mm6       /* Create mask pcv bytes < 0 */
+            pand mm0, mm6          /* Only pav bytes < 0 in mm7 */
+            psubw mm6, mm0
+            /*  test pa <= pb */
+            movq mm7, mm4
+            psubw mm6, mm0
+            pcmpgtw mm7, mm5       /* pa > pb? */
+            movq mm0, mm7
+            /* use mm7 mask to merge pa & pb */
+            pand mm5, mm7
+            /* use mm0 mask copy to merge a & b */
+            pand mm2, mm0
+            pandn mm7, mm4
+            pandn mm0, mm1
+            paddw mm7, mm5
+            paddw mm0, mm2
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            pcmpgtw mm7, mm6       /* pab > pc? */
+            movq mm2, [esi + ebx]  /* load b=Prior(x) */
+            pand mm3, mm7
+            pandn mm7, mm0
+            pxor mm1, mm1
+            paddw mm7, mm3
+            pxor mm0, mm0
+            packuswb mm7, mm1
+            movq mm3, mm2           /* load c=Prior(x-bpp) step 1 */
+            pand mm7, ActiveMask
+            punpckhbw mm2, mm0      /* Unpack High bytes of b */
+            psllq mm7, ShiftBpp     /* Shift bytes to 2nd group of 3 bytes */
+             /* pav = p - a = (a + b - c) - a = b - c */
+            movq mm4, mm2
+            paddb mm7, [edi + ebx]  /* add Paeth predictor with Raw(x) */
+            psllq mm3, ShiftBpp     /* load c=Prior(x-bpp) step 2 */
+            movq [edi + ebx], mm7   /* write back updated value */
+            movq mm1, mm7
+            punpckhbw mm3, mm0      /* Unpack High bytes of c */
+            psllq mm1, ShiftBpp     /* Shift bytes */
+                                    /* Now mm1 will be used as Raw(x-bpp) */
+            /* Now do Paeth for 3rd, and final, set of bytes (6-7) */
+            pxor mm7, mm7
+            punpckhbw mm1, mm0      /* Unpack High bytes of a */
+            psubw mm4, mm3
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            movq mm5, mm1
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            movq mm6, mm4
+            psubw mm5, mm3
+            pxor mm0, mm0
+            paddw mm6, mm5
+
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            pcmpgtw mm0, mm4    /* Create mask pav bytes < 0 */
+            pcmpgtw mm7, mm5    /* Create mask pbv bytes < 0 */
+            pand mm0, mm4       /* Only pav bytes < 0 in mm7 */
+            pand mm7, mm5       /* Only pbv bytes < 0 in mm0 */
+            psubw mm4, mm0
+            psubw mm5, mm7
+            psubw mm4, mm0
+            psubw mm5, mm7
+            pxor mm0, mm0
+            pcmpgtw mm0, mm6    /* Create mask pcv bytes < 0 */
+            pand mm0, mm6       /* Only pav bytes < 0 in mm7 */
+            psubw mm6, mm0
+            /*  test pa <= pb */
+            movq mm7, mm4
+            psubw mm6, mm0
+            pcmpgtw mm7, mm5    /* pa > pb? */
+            movq mm0, mm7
+            /* use mm0 mask copy to merge a & b */
+            pand mm2, mm0
+            /* use mm7 mask to merge pa & pb */
+            pand mm5, mm7
+            pandn mm0, mm1
+            pandn mm7, mm4
+            paddw mm0, mm2
+            paddw mm7, mm5
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            pcmpgtw mm7, mm6    /* pab > pc? */
+            pand mm3, mm7
+            pandn mm7, mm0
+            paddw mm7, mm3
+            pxor mm1, mm1
+            packuswb mm1, mm7
+            /* Step ebx to next set of 8 bytes and repeat loop til done */
+            add ebx, 8
+            pand mm1, ActiveMaskEnd
+            paddb mm1, [edi + ebx - 8] /* add Paeth predictor with Raw(x) */
+
+            cmp ebx, MMXLength
+            pxor mm0, mm0              /* pxor does not affect flags */
+            movq [edi + ebx - 8], mm1  /* write back updated value */
+                                 /* mm1 will be used as Raw(x-bpp) next loop */
+                           /* mm3 ready to be used as Prior(x-bpp) next loop */
+            jb dpth3lp
+         } /* end _asm block */
+      }
+      break;
+
+      case 6:
+      case 7:
+      case 5:
+      {
+         ActiveMask.use  = 0x00000000ffffffff;
+         ActiveMask2.use = 0xffffffff00000000;
+         ShiftBpp.use = bpp << 3;    /* == bpp * 8 */
+         ShiftRem.use = 64 - ShiftBpp.use;
+         _asm
+         {
+            mov ebx, diff
+            mov edi, row
+            mov esi, prev_row
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm1, [edi+ebx-8]
+            pxor mm0, mm0
+dpth6lp:
+            /* Must shift to position Raw(x-bpp) data */
+            psrlq mm1, ShiftRem
+            /* Do first set of 4 bytes */
+            movq mm3, [esi+ebx-8]      /* read c=Prior(x-bpp) bytes */
+            punpcklbw mm1, mm0      /* Unpack Low bytes of a */
+            movq mm2, [esi + ebx]   /* load b=Prior(x) */
+            punpcklbw mm2, mm0      /* Unpack Low bytes of b */
+            /* Must shift to position Prior(x-bpp) data */
+            psrlq mm3, ShiftRem
+            /* pav = p - a = (a + b - c) - a = b - c */
+            movq mm4, mm2
+            punpcklbw mm3, mm0      /* Unpack Low bytes of c */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            movq mm5, mm1
+            psubw mm4, mm3
+            pxor mm7, mm7
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            movq mm6, mm4
+            psubw mm5, mm3
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            pcmpgtw mm0, mm4    /* Create mask pav bytes < 0 */
+            paddw mm6, mm5
+            pand mm0, mm4       /* Only pav bytes < 0 in mm7 */
+            pcmpgtw mm7, mm5    /* Create mask pbv bytes < 0 */
+            psubw mm4, mm0
+            pand mm7, mm5       /* Only pbv bytes < 0 in mm0 */
+            psubw mm4, mm0
+            psubw mm5, mm7
+            pxor mm0, mm0
+            pcmpgtw mm0, mm6    /* Create mask pcv bytes < 0 */
+            pand mm0, mm6       /* Only pav bytes < 0 in mm7 */
+            psubw mm5, mm7
+            psubw mm6, mm0
+            /*  test pa <= pb */
+            movq mm7, mm4
+            psubw mm6, mm0
+            pcmpgtw mm7, mm5    /* pa > pb? */
+            movq mm0, mm7
+            /* use mm7 mask to merge pa & pb */
+            pand mm5, mm7
+            /* use mm0 mask copy to merge a & b */
+            pand mm2, mm0
+            pandn mm7, mm4
+            pandn mm0, mm1
+            paddw mm7, mm5
+            paddw mm0, mm2
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            pcmpgtw mm7, mm6    /* pab > pc? */
+            pxor mm1, mm1
+            pand mm3, mm7
+            pandn mm7, mm0
+            paddw mm7, mm3
+            pxor mm0, mm0
+            packuswb mm7, mm1
+            movq mm3, [esi + ebx - 8]  /* load c=Prior(x-bpp) */
+            pand mm7, ActiveMask
+            psrlq mm3, ShiftRem
+            movq mm2, [esi + ebx]      /* load b=Prior(x) step 1 */
+            paddb mm7, [edi + ebx]     /* add Paeth predictor with Raw(x) */
+            movq mm6, mm2
+            movq [edi + ebx], mm7      /* write back updated value */
+            movq mm1, [edi+ebx-8]
+            psllq mm6, ShiftBpp
+            movq mm5, mm7
+            psrlq mm1, ShiftRem
+            por mm3, mm6
+            psllq mm5, ShiftBpp
+            punpckhbw mm3, mm0         /* Unpack High bytes of c */
+            por mm1, mm5
+            /* Do second set of 4 bytes */
+            punpckhbw mm2, mm0         /* Unpack High bytes of b */
+            punpckhbw mm1, mm0         /* Unpack High bytes of a */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            movq mm4, mm2
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            movq mm5, mm1
+            psubw mm4, mm3
+            pxor mm7, mm7
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            movq mm6, mm4
+            psubw mm5, mm3
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            pcmpgtw mm0, mm4       /* Create mask pav bytes < 0 */
+            paddw mm6, mm5
+            pand mm0, mm4          /* Only pav bytes < 0 in mm7 */
+            pcmpgtw mm7, mm5       /* Create mask pbv bytes < 0 */
+            psubw mm4, mm0
+            pand mm7, mm5          /* Only pbv bytes < 0 in mm0 */
+            psubw mm4, mm0
+            psubw mm5, mm7
+            pxor mm0, mm0
+            pcmpgtw mm0, mm6       /* Create mask pcv bytes < 0 */
+            pand mm0, mm6          /* Only pav bytes < 0 in mm7 */
+            psubw mm5, mm7
+            psubw mm6, mm0
+            /*  test pa <= pb */
+            movq mm7, mm4
+            psubw mm6, mm0
+            pcmpgtw mm7, mm5       /* pa > pb? */
+            movq mm0, mm7
+            /* use mm7 mask to merge pa & pb */
+            pand mm5, mm7
+            /* use mm0 mask copy to merge a & b */
+            pand mm2, mm0
+            pandn mm7, mm4
+            pandn mm0, mm1
+            paddw mm7, mm5
+            paddw mm0, mm2
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            pcmpgtw mm7, mm6           /* pab > pc? */
+            pxor mm1, mm1
+            pand mm3, mm7
+            pandn mm7, mm0
+            pxor mm1, mm1
+            paddw mm7, mm3
+            pxor mm0, mm0
+            /* Step ex to next set of 8 bytes and repeat loop til done */
+            add ebx, 8
+            packuswb mm1, mm7
+            paddb mm1, [edi + ebx - 8]     /* add Paeth predictor with Raw(x) */
+            cmp ebx, MMXLength
+            movq [edi + ebx - 8], mm1      /* write back updated value */
+                                /* mm1 will be used as Raw(x-bpp) next loop */
+            jb dpth6lp
+         } /* end _asm block */
+      }
+      break;
+
+      case 4:
+      {
+         ActiveMask.use  = 0x00000000ffffffff;
+         _asm {
+            mov ebx, diff
+            mov edi, row
+            mov esi, prev_row
+            pxor mm0, mm0
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm1, [edi+ebx-8]    /* Only time should need to read */
+                                     /*  a=Raw(x-bpp) bytes */
+dpth4lp:
+            /* Do first set of 4 bytes */
+            movq mm3, [esi+ebx-8]    /* read c=Prior(x-bpp) bytes */
+            punpckhbw mm1, mm0       /* Unpack Low bytes of a */
+            movq mm2, [esi + ebx]    /* load b=Prior(x) */
+            punpcklbw mm2, mm0       /* Unpack High bytes of b */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            movq mm4, mm2
+            punpckhbw mm3, mm0       /* Unpack High bytes of c */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            movq mm5, mm1
+            psubw mm4, mm3
+            pxor mm7, mm7
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            movq mm6, mm4
+            psubw mm5, mm3
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            pcmpgtw mm0, mm4       /* Create mask pav bytes < 0 */
+            paddw mm6, mm5
+            pand mm0, mm4          /* Only pav bytes < 0 in mm7 */
+            pcmpgtw mm7, mm5       /* Create mask pbv bytes < 0 */
+            psubw mm4, mm0
+            pand mm7, mm5          /* Only pbv bytes < 0 in mm0 */
+            psubw mm4, mm0
+            psubw mm5, mm7
+            pxor mm0, mm0
+            pcmpgtw mm0, mm6       /* Create mask pcv bytes < 0 */
+            pand mm0, mm6          /* Only pav bytes < 0 in mm7 */
+            psubw mm5, mm7
+            psubw mm6, mm0
+            /*  test pa <= pb */
+            movq mm7, mm4
+            psubw mm6, mm0
+            pcmpgtw mm7, mm5       /* pa > pb? */
+            movq mm0, mm7
+            /* use mm7 mask to merge pa & pb */
+            pand mm5, mm7
+            /* use mm0 mask copy to merge a & b */
+            pand mm2, mm0
+            pandn mm7, mm4
+            pandn mm0, mm1
+            paddw mm7, mm5
+            paddw mm0, mm2
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            pcmpgtw mm7, mm6       /* pab > pc? */
+            pxor mm1, mm1
+            pand mm3, mm7
+            pandn mm7, mm0
+            paddw mm7, mm3
+            pxor mm0, mm0
+            packuswb mm7, mm1
+            movq mm3, [esi + ebx]      /* load c=Prior(x-bpp) */
+            pand mm7, ActiveMask
+            movq mm2, mm3              /* load b=Prior(x) step 1 */
+            paddb mm7, [edi + ebx]     /* add Paeth predictor with Raw(x) */
+            punpcklbw mm3, mm0         /* Unpack High bytes of c */
+            movq [edi + ebx], mm7      /* write back updated value */
+            movq mm1, mm7              /* Now mm1 will be used as Raw(x-bpp) */
+            /* Do second set of 4 bytes */
+            punpckhbw mm2, mm0         /* Unpack Low bytes of b */
+            punpcklbw mm1, mm0         /* Unpack Low bytes of a */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            movq mm4, mm2
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            movq mm5, mm1
+            psubw mm4, mm3
+            pxor mm7, mm7
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            movq mm6, mm4
+            psubw mm5, mm3
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            pcmpgtw mm0, mm4       /* Create mask pav bytes < 0 */
+            paddw mm6, mm5
+            pand mm0, mm4          /* Only pav bytes < 0 in mm7 */
+            pcmpgtw mm7, mm5       /* Create mask pbv bytes < 0 */
+            psubw mm4, mm0
+            pand mm7, mm5          /* Only pbv bytes < 0 in mm0 */
+            psubw mm4, mm0
+            psubw mm5, mm7
+            pxor mm0, mm0
+            pcmpgtw mm0, mm6       /* Create mask pcv bytes < 0 */
+            pand mm0, mm6          /* Only pav bytes < 0 in mm7 */
+            psubw mm5, mm7
+            psubw mm6, mm0
+            /*  test pa <= pb */
+            movq mm7, mm4
+            psubw mm6, mm0
+            pcmpgtw mm7, mm5       /* pa > pb? */
+            movq mm0, mm7
+            /* use mm7 mask to merge pa & pb */
+            pand mm5, mm7
+            /* use mm0 mask copy to merge a & b */
+            pand mm2, mm0
+            pandn mm7, mm4
+            pandn mm0, mm1
+            paddw mm7, mm5
+            paddw mm0, mm2
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            pcmpgtw mm7, mm6       /* pab > pc? */
+            pxor mm1, mm1
+            pand mm3, mm7
+            pandn mm7, mm0
+            pxor mm1, mm1
+            paddw mm7, mm3
+            pxor mm0, mm0
+            /* Step ex to next set of 8 bytes and repeat loop til done */
+            add ebx, 8
+            packuswb mm1, mm7
+            paddb mm1, [edi + ebx - 8]     /* add Paeth predictor with Raw(x) */
+            cmp ebx, MMXLength
+            movq [edi + ebx - 8], mm1      /* write back updated value */
+                                /* mm1 will be used as Raw(x-bpp) next loop */
+            jb dpth4lp
+         } /* end _asm block */
+      }
+      break;
+      case 8:                          /* bpp == 8 */
+      {
+         ActiveMask.use  = 0x00000000ffffffff;
+         _asm {
+            mov ebx, diff
+            mov edi, row
+            mov esi, prev_row
+            pxor mm0, mm0
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm1, [edi+ebx-8]      /* Only time should need to read */
+                                       /*  a=Raw(x-bpp) bytes */
+dpth8lp:
+            /* Do first set of 4 bytes */
+            movq mm3, [esi+ebx-8]      /* read c=Prior(x-bpp) bytes */
+            punpcklbw mm1, mm0         /* Unpack Low bytes of a */
+            movq mm2, [esi + ebx]      /* load b=Prior(x) */
+            punpcklbw mm2, mm0         /* Unpack Low bytes of b */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            movq mm4, mm2
+            punpcklbw mm3, mm0         /* Unpack Low bytes of c */
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            movq mm5, mm1
+            psubw mm4, mm3
+            pxor mm7, mm7
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            movq mm6, mm4
+            psubw mm5, mm3
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            pcmpgtw mm0, mm4       /* Create mask pav bytes < 0 */
+            paddw mm6, mm5
+            pand mm0, mm4          /* Only pav bytes < 0 in mm7 */
+            pcmpgtw mm7, mm5       /* Create mask pbv bytes < 0 */
+            psubw mm4, mm0
+            pand mm7, mm5          /* Only pbv bytes < 0 in mm0 */
+            psubw mm4, mm0
+            psubw mm5, mm7
+            pxor mm0, mm0
+            pcmpgtw mm0, mm6       /* Create mask pcv bytes < 0 */
+            pand mm0, mm6          /* Only pav bytes < 0 in mm7 */
+            psubw mm5, mm7
+            psubw mm6, mm0
+            /*  test pa <= pb */
+            movq mm7, mm4
+            psubw mm6, mm0
+            pcmpgtw mm7, mm5       /* pa > pb? */
+            movq mm0, mm7
+            /* use mm7 mask to merge pa & pb */
+            pand mm5, mm7
+            /* use mm0 mask copy to merge a & b */
+            pand mm2, mm0
+            pandn mm7, mm4
+            pandn mm0, mm1
+            paddw mm7, mm5
+            paddw mm0, mm2
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            pcmpgtw mm7, mm6       /* pab > pc? */
+            pxor mm1, mm1
+            pand mm3, mm7
+            pandn mm7, mm0
+            paddw mm7, mm3
+            pxor mm0, mm0
+            packuswb mm7, mm1
+            movq mm3, [esi+ebx-8]    /* read c=Prior(x-bpp) bytes */
+            pand mm7, ActiveMask
+            movq mm2, [esi + ebx]    /* load b=Prior(x) */
+            paddb mm7, [edi + ebx]   /* add Paeth predictor with Raw(x) */
+            punpckhbw mm3, mm0       /* Unpack High bytes of c */
+            movq [edi + ebx], mm7    /* write back updated value */
+            movq mm1, [edi+ebx-8]    /* read a=Raw(x-bpp) bytes */
+
+            /* Do second set of 4 bytes */
+            punpckhbw mm2, mm0       /* Unpack High bytes of b */
+            punpckhbw mm1, mm0       /* Unpack High bytes of a */
+            /* pav = p - a = (a + b - c) - a = b - c */
+            movq mm4, mm2
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            movq mm5, mm1
+            psubw mm4, mm3
+            pxor mm7, mm7
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            movq mm6, mm4
+            psubw mm5, mm3
+            /* pa = abs(p-a) = abs(pav) */
+            /* pb = abs(p-b) = abs(pbv) */
+            /* pc = abs(p-c) = abs(pcv) */
+            pcmpgtw mm0, mm4       /* Create mask pav bytes < 0 */
+            paddw mm6, mm5
+            pand mm0, mm4          /* Only pav bytes < 0 in mm7 */
+            pcmpgtw mm7, mm5       /* Create mask pbv bytes < 0 */
+            psubw mm4, mm0
+            pand mm7, mm5          /* Only pbv bytes < 0 in mm0 */
+            psubw mm4, mm0
+            psubw mm5, mm7
+            pxor mm0, mm0
+            pcmpgtw mm0, mm6       /* Create mask pcv bytes < 0 */
+            pand mm0, mm6          /* Only pav bytes < 0 in mm7 */
+            psubw mm5, mm7
+            psubw mm6, mm0
+            /*  test pa <= pb */
+            movq mm7, mm4
+            psubw mm6, mm0
+            pcmpgtw mm7, mm5       /* pa > pb? */
+            movq mm0, mm7
+            /* use mm7 mask to merge pa & pb */
+            pand mm5, mm7
+            /* use mm0 mask copy to merge a & b */
+            pand mm2, mm0
+            pandn mm7, mm4
+            pandn mm0, mm1
+            paddw mm7, mm5
+            paddw mm0, mm2
+            /*  test  ((pa <= pb)? pa:pb) <= pc */
+            pcmpgtw mm7, mm6       /* pab > pc? */
+            pxor mm1, mm1
+            pand mm3, mm7
+            pandn mm7, mm0
+            pxor mm1, mm1
+            paddw mm7, mm3
+            pxor mm0, mm0
+            /* Step ex to next set of 8 bytes and repeat loop til done */
+            add ebx, 8
+            packuswb mm1, mm7
+            paddb mm1, [edi + ebx - 8]     /* add Paeth predictor with Raw(x) */
+            cmp ebx, MMXLength
+            movq [edi + ebx - 8], mm1      /* write back updated value */
+                            /* mm1 will be used as Raw(x-bpp) next loop */
+            jb dpth8lp
+         } /* end _asm block */
+      }
+      break;
+
+      case 1:                /* bpp = 1 */
+      case 2:                /* bpp = 2 */
+      default:               /* bpp > 8 */
+      {
+         _asm {
+            mov ebx, diff
+            cmp ebx, FullLength
+            jnb dpthdend
+            mov edi, row
+            mov esi, prev_row
+            /* Do Paeth decode for remaining bytes */
+            mov edx, ebx
+            xor ecx, ecx        /* zero ecx before using cl & cx in loop below */
+            sub edx, bpp        /* Set edx = ebx - bpp */
+dpthdlp:
+            xor eax, eax
+            /* pav = p - a = (a + b - c) - a = b - c */
+            mov al, [esi + ebx]        /* load Prior(x) into al */
+            mov cl, [esi + edx]        /* load Prior(x-bpp) into cl */
+            sub eax, ecx                 /* subtract Prior(x-bpp) */
+            mov patemp, eax                 /* Save pav for later use */
+            xor eax, eax
+            /* pbv = p - b = (a + b - c) - b = a - c */
+            mov al, [edi + edx]        /* load Raw(x-bpp) into al */
+            sub eax, ecx                 /* subtract Prior(x-bpp) */
+            mov ecx, eax
+            /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+            add eax, patemp                 /* pcv = pav + pbv */
+            /* pc = abs(pcv) */
+            test eax, 0x80000000
+            jz dpthdpca
+            neg eax                     /* reverse sign of neg values */
+dpthdpca:
+            mov pctemp, eax             /* save pc for later use */
+            /* pb = abs(pbv) */
+            test ecx, 0x80000000
+            jz dpthdpba
+            neg ecx                     /* reverse sign of neg values */
+dpthdpba:
+            mov pbtemp, ecx             /* save pb for later use */
+            /* pa = abs(pav) */
+            mov eax, patemp
+            test eax, 0x80000000
+            jz dpthdpaa
+            neg eax                     /* reverse sign of neg values */
+dpthdpaa:
+            mov patemp, eax             /* save pa for later use */
+            /* test if pa <= pb */
+            cmp eax, ecx
+            jna dpthdabb
+            /* pa > pb; now test if pb <= pc */
+            cmp ecx, pctemp
+            jna dpthdbbc
+            /* pb > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+            mov cl, [esi + edx]  /* load Prior(x-bpp) into cl */
+            jmp dpthdpaeth
+dpthdbbc:
+            /* pb <= pc; Raw(x) = Paeth(x) + Prior(x) */
+            mov cl, [esi + ebx]        /* load Prior(x) into cl */
+            jmp dpthdpaeth
+dpthdabb:
+            /* pa <= pb; now test if pa <= pc */
+            cmp eax, pctemp
+            jna dpthdabc
+            /* pa > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+            mov cl, [esi + edx]  /* load Prior(x-bpp) into cl */
+            jmp dpthdpaeth
+dpthdabc:
+            /* pa <= pc; Raw(x) = Paeth(x) + Raw(x-bpp) */
+            mov cl, [edi + edx]  /* load Raw(x-bpp) into cl */
+dpthdpaeth:
+            inc ebx
+            inc edx
+            /* Raw(x) = (Paeth(x) + Paeth_Predictor( a, b, c )) mod 256 */
+            add [edi + ebx - 1], cl
+            cmp ebx, FullLength
+            jb dpthdlp
+dpthdend:
+         } /* end _asm block */
+      }
+      return;                   /* No need to go further with this one */
+   }                         /* end switch ( bpp ) */
+   _asm
+   {
+         /* MMX acceleration complete now do clean-up */
+         /* Check if any remaining bytes left to decode */
+         mov ebx, MMXLength
+         cmp ebx, FullLength
+         jnb dpthend
+         mov edi, row
+         mov esi, prev_row
+         /* Do Paeth decode for remaining bytes */
+         mov edx, ebx
+         xor ecx, ecx         /* zero ecx before using cl & cx in loop below */
+         sub edx, bpp         /* Set edx = ebx - bpp */
+dpthlp2:
+         xor eax, eax
+         /* pav = p - a = (a + b - c) - a = b - c */
+         mov al, [esi + ebx]  /* load Prior(x) into al */
+         mov cl, [esi + edx]  /* load Prior(x-bpp) into cl */
+         sub eax, ecx         /* subtract Prior(x-bpp) */
+         mov patemp, eax      /* Save pav for later use */
+         xor eax, eax
+         /* pbv = p - b = (a + b - c) - b = a - c */
+         mov al, [edi + edx]  /* load Raw(x-bpp) into al */
+         sub eax, ecx         /* subtract Prior(x-bpp) */
+         mov ecx, eax
+         /* pcv = p - c = (a + b - c) -c = (a - c) + (b - c) = pav + pbv */
+         add eax, patemp      /* pcv = pav + pbv */
+         /* pc = abs(pcv) */
+         test eax, 0x80000000
+         jz dpthpca2
+         neg eax              /* reverse sign of neg values */
+dpthpca2:
+         mov pctemp, eax      /* save pc for later use */
+         /* pb = abs(pbv) */
+         test ecx, 0x80000000
+         jz dpthpba2
+         neg ecx              /* reverse sign of neg values */
+dpthpba2:
+         mov pbtemp, ecx      /* save pb for later use */
+         /* pa = abs(pav) */
+         mov eax, patemp
+         test eax, 0x80000000
+         jz dpthpaa2
+         neg eax              /* reverse sign of neg values */
+dpthpaa2:
+         mov patemp, eax      /* save pa for later use */
+         /* test if pa <= pb */
+         cmp eax, ecx
+         jna dpthabb2
+         /* pa > pb; now test if pb <= pc */
+         cmp ecx, pctemp
+         jna dpthbbc2
+         /* pb > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+         mov cl, [esi + edx]  /* load Prior(x-bpp) into cl */
+         jmp dpthpaeth2
+dpthbbc2:
+         /* pb <= pc; Raw(x) = Paeth(x) + Prior(x) */
+         mov cl, [esi + ebx]        /* load Prior(x) into cl */
+         jmp dpthpaeth2
+dpthabb2:
+         /* pa <= pb; now test if pa <= pc */
+         cmp eax, pctemp
+         jna dpthabc2
+         /* pa > pc; Raw(x) = Paeth(x) + Prior(x-bpp) */
+         mov cl, [esi + edx]  /* load Prior(x-bpp) into cl */
+         jmp dpthpaeth2
+dpthabc2:
+         /* pa <= pc; Raw(x) = Paeth(x) + Raw(x-bpp) */
+         mov cl, [edi + edx]  /* load Raw(x-bpp) into cl */
+dpthpaeth2:
+         inc ebx
+         inc edx
+         /* Raw(x) = (Paeth(x) + Paeth_Predictor( a, b, c )) mod 256 */
+         add [edi + ebx - 1], cl
+         cmp ebx, FullLength
+         jb dpthlp2
+dpthend:
+         emms             /* End MMX instructions; prep for possible FP instrs. */
+   } /* end _asm block */
+}
+
+/* Optimized code for PNG Sub filter decoder */
+void /* PRIVATE */
+png_read_filter_row_mmx_sub(png_row_infop row_info, png_bytep row)
+{
+   /*int test; */
+   int bpp;
+   png_uint_32 FullLength;
+   png_uint_32 MMXLength;
+   int diff;
+
+   bpp = (row_info->pixel_depth + 7) >> 3; /* Get # bytes per pixel */
+   FullLength  = row_info->rowbytes - bpp; /* # of bytes to filter */
+   _asm {
+        mov edi, row
+        mov esi, edi               /* lp = row */
+        add edi, bpp               /* rp = row + bpp */
+        xor eax, eax
+        /* get # of bytes to alignment */
+        mov diff, edi               /* take start of row */
+        add diff, 0xf               /* add 7 + 8 to incr past */
+                                        /* alignment boundary */
+        xor ebx, ebx
+        and diff, 0xfffffff8        /* mask to alignment boundary */
+        sub diff, edi               /* subtract from start ==> value */
+                                        /*  ebx at alignment */
+        jz dsubgo
+        /* fix alignment */
+dsublp1:
+        mov al, [esi+ebx]
+        add [edi+ebx], al
+        inc ebx
+        cmp ebx, diff
+        jb dsublp1
+dsubgo:
+        mov ecx, FullLength
+        mov edx, ecx
+        sub edx, ebx                  /* subtract alignment fix */
+        and edx, 0x00000007           /* calc bytes over mult of 8 */
+        sub ecx, edx                  /* drop over bytes from length */
+        mov MMXLength, ecx
+   } /* end _asm block */
+
+   /* Now do the math for the rest of the row */
+   switch ( bpp )
+   {
+        case 3:
+        {
+         ActiveMask.use  = 0x0000ffffff000000;
+         ShiftBpp.use = 24;       /* == 3 * 8 */
+         ShiftRem.use  = 40;      /* == 64 - 24 */
+         _asm {
+            mov edi, row
+            movq mm7, ActiveMask  /* Load ActiveMask for 2nd active byte group */
+            mov esi, edi              /* lp = row */
+            add edi, bpp          /* rp = row + bpp */
+            movq mm6, mm7
+            mov ebx, diff
+            psllq mm6, ShiftBpp   /* Move mask in mm6 to cover 3rd active */
+                                  /* byte group */
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm1, [edi+ebx-8]
+dsub3lp:
+            psrlq mm1, ShiftRem   /* Shift data for adding 1st bpp bytes */
+                          /* no need for mask; shift clears inactive bytes */
+            /* Add 1st active group */
+            movq mm0, [edi+ebx]
+            paddb mm0, mm1
+            /* Add 2nd active group */
+            movq mm1, mm0         /* mov updated Raws to mm1 */
+            psllq mm1, ShiftBpp   /* shift data to position correctly */
+            pand mm1, mm7         /* mask to use only 2nd active group */
+            paddb mm0, mm1
+            /* Add 3rd active group */
+            movq mm1, mm0         /* mov updated Raws to mm1 */
+            psllq mm1, ShiftBpp   /* shift data to position correctly */
+            pand mm1, mm6         /* mask to use only 3rd active group */
+            add ebx, 8
+            paddb mm0, mm1
+            cmp ebx, MMXLength
+            movq [edi+ebx-8], mm0     /* Write updated Raws back to array */
+            /* Prep for doing 1st add at top of loop */
+            movq mm1, mm0
+            jb dsub3lp
+         } /* end _asm block */
+      }
+      break;
+
+      case 1:
+      {
+         /* Placed here just in case this is a duplicate of the */
+         /* non-MMX code for the SUB filter in png_read_filter_row below */
+         //
+         /*         png_bytep rp; */
+         /*         png_bytep lp; */
+         /*         png_uint_32 i; */
+         /*         bpp = (row_info->pixel_depth + 7) >> 3; */
+         /*         for (i = (png_uint_32)bpp, rp = row + bpp, lp = row; */
+         /*            i < row_info->rowbytes; i++, rp++, lp++) */
+         /*      { */
+         /*            *rp = (png_byte)(((int)(*rp) + (int)(*lp)) & 0xff); */
+         /*      } */
+         _asm {
+            mov ebx, diff
+            mov edi, row
+            cmp ebx, FullLength
+            jnb dsub1end
+            mov esi, edi          /* lp = row */
+            xor eax, eax
+            add edi, bpp      /* rp = row + bpp */
+dsub1lp:
+            mov al, [esi+ebx]
+            add [edi+ebx], al
+            inc ebx
+            cmp ebx, FullLength
+            jb dsub1lp
+dsub1end:
+         } /* end _asm block */
+      }
+      return;
+
+      case 6:
+      case 7:
+      case 4:
+      case 5:
+      {
+         ShiftBpp.use = bpp << 3;
+         ShiftRem.use = 64 - ShiftBpp.use;
+         _asm {
+            mov edi, row
+            mov ebx, diff
+            mov esi, edi               /* lp = row */
+            add edi, bpp           /* rp = row + bpp */
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm1, [edi+ebx-8]
+dsub4lp:
+            psrlq mm1, ShiftRem /* Shift data for adding 1st bpp bytes */
+                          /* no need for mask; shift clears inactive bytes */
+            movq mm0, [edi+ebx]
+            paddb mm0, mm1
+            /* Add 2nd active group */
+            movq mm1, mm0          /* mov updated Raws to mm1 */
+            psllq mm1, ShiftBpp    /* shift data to position correctly */
+                                   /* there is no need for any mask */
+                                   /* since shift clears inactive bits/bytes */
+            add ebx, 8
+            paddb mm0, mm1
+            cmp ebx, MMXLength
+            movq [edi+ebx-8], mm0
+            movq mm1, mm0          /* Prep for doing 1st add at top of loop */
+            jb dsub4lp
+         } /* end _asm block */
+      }
+      break;
+
+      case 2:
+      {
+         ActiveMask.use  = 0x00000000ffff0000;
+         ShiftBpp.use = 16;       /* == 2 * 8 */
+         ShiftRem.use = 48;       /* == 64 - 16 */
+         _asm {
+            movq mm7, ActiveMask  /* Load ActiveMask for 2nd active byte group */
+            mov ebx, diff
+            movq mm6, mm7
+            mov edi, row
+            psllq mm6, ShiftBpp     /* Move mask in mm6 to cover 3rd active */
+                                    /*  byte group */
+            mov esi, edi            /* lp = row */
+            movq mm5, mm6
+            add edi, bpp            /* rp = row + bpp */
+            psllq mm5, ShiftBpp     /* Move mask in mm5 to cover 4th active */
+                                    /*  byte group */
+            /* PRIME the pump (load the first Raw(x-bpp) data set */
+            movq mm1, [edi+ebx-8]
+dsub2lp:
+            /* Add 1st active group */
+            psrlq mm1, ShiftRem     /* Shift data for adding 1st bpp bytes */
+                                    /* no need for mask; shift clears inactive */
+                                    /*  bytes */
+            movq mm0, [edi+ebx]
+            paddb mm0, mm1
+            /* Add 2nd active group */
+            movq mm1, mm0           /* mov updated Raws to mm1 */
+            psllq mm1, ShiftBpp     /* shift data to position correctly */
+            pand mm1, mm7           /* mask to use only 2nd active group */
+            paddb mm0, mm1
+            /* Add 3rd active group */
+            movq mm1, mm0           /* mov updated Raws to mm1 */
+            psllq mm1, ShiftBpp     /* shift data to position correctly */
+            pand mm1, mm6           /* mask to use only 3rd active group */
+            paddb mm0, mm1
+            /* Add 4th active group */
+            movq mm1, mm0           /* mov updated Raws to mm1 */
+            psllq mm1, ShiftBpp     /* shift data to position correctly */
+            pand mm1, mm5           /* mask to use only 4th active group */
+            add ebx, 8
+            paddb mm0, mm1
+            cmp ebx, MMXLength
+            movq [edi+ebx-8], mm0   /* Write updated Raws back to array */
+            movq mm1, mm0           /* Prep for doing 1st add at top of loop */
+            jb dsub2lp
+         } /* end _asm block */
+      }
+      break;
+      case 8:
+      {
+         _asm {
+            mov edi, row
+            mov ebx, diff
+            mov esi, edi            /* lp = row */
+            add edi, bpp            /* rp = row + bpp */
+            mov ecx, MMXLength
+            movq mm7, [edi+ebx-8]   /* PRIME the pump (load the first */
+                                    /* Raw(x-bpp) data set */
+            and ecx, 0x0000003f     /* calc bytes over mult of 64 */
+dsub8lp:
+            movq mm0, [edi+ebx]     /* Load Sub(x) for 1st 8 bytes */
+            paddb mm0, mm7
+            movq mm1, [edi+ebx+8]   /* Load Sub(x) for 2nd 8 bytes */
+            movq [edi+ebx], mm0    /* Write Raw(x) for 1st 8 bytes */
+                                   /* Now mm0 will be used as Raw(x-bpp) for */
+                                   /* the 2nd group of 8 bytes.  This will be */
+                                   /* repeated for each group of 8 bytes with */
+                                   /* the 8th group being used as the Raw(x-bpp) */
+                                   /* for the 1st group of the next loop. */
+            paddb mm1, mm0
+            movq mm2, [edi+ebx+16]  /* Load Sub(x) for 3rd 8 bytes */
+            movq [edi+ebx+8], mm1   /* Write Raw(x) for 2nd 8 bytes */
+            paddb mm2, mm1
+            movq mm3, [edi+ebx+24]  /* Load Sub(x) for 4th 8 bytes */
+            movq [edi+ebx+16], mm2  /* Write Raw(x) for 3rd 8 bytes */
+            paddb mm3, mm2
+            movq mm4, [edi+ebx+32]  /* Load Sub(x) for 5th 8 bytes */
+            movq [edi+ebx+24], mm3  /* Write Raw(x) for 4th 8 bytes */
+            paddb mm4, mm3
+            movq mm5, [edi+ebx+40]  /* Load Sub(x) for 6th 8 bytes */
+            movq [edi+ebx+32], mm4  /* Write Raw(x) for 5th 8 bytes */
+            paddb mm5, mm4
+            movq mm6, [edi+ebx+48]  /* Load Sub(x) for 7th 8 bytes */
+            movq [edi+ebx+40], mm5  /* Write Raw(x) for 6th 8 bytes */
+            paddb mm6, mm5
+            movq mm7, [edi+ebx+56]  /* Load Sub(x) for 8th 8 bytes */
+            movq [edi+ebx+48], mm6  /* Write Raw(x) for 7th 8 bytes */
+            add ebx, 64
+            paddb mm7, mm6
+            cmp ebx, ecx
+            movq [edi+ebx-8], mm7   /* Write Raw(x) for 8th 8 bytes */
+            jb dsub8lp
+            cmp ebx, MMXLength
+            jnb dsub8lt8
+dsub8lpA:
+            movq mm0, [edi+ebx]
+            add ebx, 8
+            paddb mm0, mm7
+            cmp ebx, MMXLength
+            movq [edi+ebx-8], mm0   /* use -8 to offset early add to ebx */
+            movq mm7, mm0           /* Move calculated Raw(x) data to mm1 to */
+                                    /* be the new Raw(x-bpp) for the next loop */
+            jb dsub8lpA
+dsub8lt8:
+         } /* end _asm block */
+      }
+      break;
+
+      default:                /* bpp greater than 8 bytes */
+      {
+         _asm {
+            mov ebx, diff
+            mov edi, row
+            mov esi, edi           /* lp = row */
+            add edi, bpp           /* rp = row + bpp */
+dsubAlp:
+            movq mm0, [edi+ebx]
+            movq mm1, [esi+ebx]
+            add ebx, 8
+            paddb mm0, mm1
+            cmp ebx, MMXLength
+            movq [edi+ebx-8], mm0  /* mov does not affect flags; -8 to offset */
+                                   /*  add ebx */
+            jb dsubAlp
+         } /* end _asm block */
+      }
+      break;
+
+   } /* end switch ( bpp ) */
+
+   _asm {
+        mov ebx, MMXLength
+        mov edi, row
+        cmp ebx, FullLength
+        jnb dsubend
+        mov esi, edi               /* lp = row */
+        xor eax, eax
+        add edi, bpp               /* rp = row + bpp */
+dsublp2:
+        mov al, [esi+ebx]
+        add [edi+ebx], al
+        inc ebx
+        cmp ebx, FullLength
+        jb dsublp2
+dsubend:
+        emms             /* End MMX instructions; prep for possible FP instrs. */
+   } /* end _asm block */
+}
+
+/* Optimized code for PNG Up filter decoder */
+void /* PRIVATE */
+png_read_filter_row_mmx_up(png_row_infop row_info, png_bytep row,
+   png_bytep prev_row)
+{
+   png_uint_32 len;
+   len  = row_info->rowbytes;       /* # of bytes to filter */
+   _asm {
+      mov edi, row
+      /* get # of bytes to alignment */
+      mov ecx, edi
+      xor ebx, ebx
+      add ecx, 0x7
+      xor eax, eax
+      and ecx, 0xfffffff8
+      mov esi, prev_row
+      sub ecx, edi
+      jz dupgo
+      /* fix alignment */
+duplp1:
+      mov al, [edi+ebx]
+      add al, [esi+ebx]
+      inc ebx
+      cmp ebx, ecx
+      mov [edi + ebx-1], al  /* mov does not affect flags; -1 to offset inc ebx */
+      jb duplp1
+dupgo:
+      mov ecx, len
+      mov edx, ecx
+      sub edx, ebx                  /* subtract alignment fix */
+      and edx, 0x0000003f           /* calc bytes over mult of 64 */
+      sub ecx, edx                  /* drop over bytes from length */
+      /* Unrolled loop - use all MMX registers and interleave to reduce */
+      /* number of branch instructions (loops) and reduce partial stalls */
+duploop:
+      movq mm1, [esi+ebx]
+      movq mm0, [edi+ebx]
+      movq mm3, [esi+ebx+8]
+      paddb mm0, mm1
+      movq mm2, [edi+ebx+8]
+      movq [edi+ebx], mm0
+      paddb mm2, mm3
+      movq mm5, [esi+ebx+16]
+      movq [edi+ebx+8], mm2
+      movq mm4, [edi+ebx+16]
+      movq mm7, [esi+ebx+24]
+      paddb mm4, mm5
+      movq mm6, [edi+ebx+24]
+      movq [edi+ebx+16], mm4
+      paddb mm6, mm7
+      movq mm1, [esi+ebx+32]
+      movq [edi+ebx+24], mm6
+      movq mm0, [edi+ebx+32]
+      movq mm3, [esi+ebx+40]
+      paddb mm0, mm1
+      movq mm2, [edi+ebx+40]
+      movq [edi+ebx+32], mm0
+      paddb mm2, mm3
+      movq mm5, [esi+ebx+48]
+      movq [edi+ebx+40], mm2
+      movq mm4, [edi+ebx+48]
+      movq mm7, [esi+ebx+56]
+      paddb mm4, mm5
+      movq mm6, [edi+ebx+56]
+      movq [edi+ebx+48], mm4
+      add ebx, 64
+      paddb mm6, mm7
+      cmp ebx, ecx
+      movq [edi+ebx-8], mm6 /* (+56)movq does not affect flags; */
+                                     /* -8 to offset add ebx */
+      jb duploop
+
+      cmp edx, 0                     /* Test for bytes over mult of 64 */
+      jz dupend
+
+
+      /* 2 lines added by lcreeve@netins.net */
+      /* (mail 11 Jul 98 in png-implement list) */
+      cmp edx, 8 /*test for less than 8 bytes */
+      jb duplt8
+
+
+      add ecx, edx
+      and edx, 0x00000007           /* calc bytes over mult of 8 */
+      sub ecx, edx                  /* drop over bytes from length */
+      jz duplt8
+      /* Loop using MMX registers mm0 & mm1 to update 8 bytes simultaneously */
+duplpA:
+      movq mm1, [esi+ebx]
+      movq mm0, [edi+ebx]
+      add ebx, 8
+      paddb mm0, mm1
+      cmp ebx, ecx
+      movq [edi+ebx-8], mm0 /* movq does not affect flags; -8 to offset add ebx */
+      jb duplpA
+      cmp edx, 0            /* Test for bytes over mult of 8 */
+      jz dupend
+duplt8:
+      xor eax, eax
+      add ecx, edx          /* move over byte count into counter */
+      /* Loop using x86 registers to update remaining bytes */
+duplp2:
+      mov al, [edi + ebx]
+      add al, [esi + ebx]
+      inc ebx
+      cmp ebx, ecx
+      mov [edi + ebx-1], al /* mov does not affect flags; -1 to offset inc ebx */
+      jb duplp2
+dupend:
+      /* Conversion of filtered row completed */
+      emms          /* End MMX instructions; prep for possible FP instrs. */
+   } /* end _asm block */
+}
+
+
+/* Optimized png_read_filter_row routines */
+void /* PRIVATE */
+png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep
+   row, png_bytep prev_row, int filter)
+{
+#ifdef PNG_DEBUG
+   char filnm[10];
+#endif
+
+   if (mmx_supported == 2) {
+#if !defined(PNG_1_0_X)
+       /* this should have happened in png_init_mmx_flags() already */
+       png_warning(png_ptr, "asm_flags may not have been initialized");
+#endif
+       png_mmx_support();
+   }
+
+#ifdef PNG_DEBUG
+   png_debug(1, "in png_read_filter_row\n");
+   switch (filter)
+   {
+      case 0: sprintf(filnm, "none");
+         break;
+#if !defined(PNG_1_0_X)
+      case 1: sprintf(filnm, "sub-%s",
+        (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB)? "MMX" : "x86");
+         break;
+      case 2: sprintf(filnm, "up-%s",
+        (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP)? "MMX" : "x86");
+         break;
+      case 3: sprintf(filnm, "avg-%s",
+        (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG)? "MMX" : "x86");
+         break;
+      case 4: sprintf(filnm, "Paeth-%s",
+        (png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH)? "MMX":"x86");
+         break;
+#else
+      case 1: sprintf(filnm, "sub");
+         break;
+      case 2: sprintf(filnm, "up");
+         break;
+      case 3: sprintf(filnm, "avg");
+         break;
+      case 4: sprintf(filnm, "Paeth");
+         break;
+#endif
+      default: sprintf(filnm, "unknw");
+         break;
+   }
+   png_debug2(0,"row=%5d, %s, ", png_ptr->row_number, filnm);
+   png_debug2(0, "pd=%2d, b=%d, ", (int)row_info->pixel_depth,
+      (int)((row_info->pixel_depth + 7) >> 3));
+   png_debug1(0,"len=%8d, ", row_info->rowbytes);
+#endif /* PNG_DEBUG */
+
+   switch (filter)
+   {
+      case PNG_FILTER_VALUE_NONE:
+         break;
+
+      case PNG_FILTER_VALUE_SUB:
+      {
+#if !defined(PNG_1_0_X)
+         if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_SUB) &&
+             (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
+             (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+         if (mmx_supported)
+#endif
+         {
+            png_read_filter_row_mmx_sub(row_info, row);
+         }
+         else
+         {
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+            png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+            png_bytep rp = row + bpp;
+            png_bytep lp = row;
+
+            for (i = bpp; i < istop; i++)
+            {
+               *rp = (png_byte)(((int)(*rp) + (int)(*lp++)) & 0xff);
+               rp++;
+            }
+         }
+         break;
+      }
+
+      case PNG_FILTER_VALUE_UP:
+      {
+#if !defined(PNG_1_0_X)
+         if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_UP) &&
+             (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
+             (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+         if (mmx_supported)
+#endif
+         {
+            png_read_filter_row_mmx_up(row_info, row, prev_row);
+         }
+         else
+         {
+            png_uint_32 i;
+            png_uint_32 istop = row_info->rowbytes;
+            png_bytep rp = row;
+            png_bytep pp = prev_row;
+
+            for (i = 0; i < istop; ++i)
+            {
+               *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+               rp++;
+            }
+         }
+         break;
+      }
+
+      case PNG_FILTER_VALUE_AVG:
+      {
+#if !defined(PNG_1_0_X)
+         if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_AVG) &&
+             (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
+             (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+         if (mmx_supported)
+#endif
+         {
+            png_read_filter_row_mmx_avg(row_info, row, prev_row);
+         }
+         else
+         {
+            png_uint_32 i;
+            png_bytep rp = row;
+            png_bytep pp = prev_row;
+            png_bytep lp = row;
+            png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+            png_uint_32 istop = row_info->rowbytes - bpp;
+
+            for (i = 0; i < bpp; i++)
+            {
+               *rp = (png_byte)(((int)(*rp) +
+                  ((int)(*pp++) >> 1)) & 0xff);
+               rp++;
+            }
+
+            for (i = 0; i < istop; i++)
+            {
+               *rp = (png_byte)(((int)(*rp) +
+                  ((int)(*pp++ + *lp++) >> 1)) & 0xff);
+               rp++;
+            }
+         }
+         break;
+      }
+
+      case PNG_FILTER_VALUE_PAETH:
+      {
+#if !defined(PNG_1_0_X)
+         if ((png_ptr->asm_flags & PNG_ASM_FLAG_MMX_READ_FILTER_PAETH) &&
+             (row_info->pixel_depth >= png_ptr->mmx_bitdepth_threshold) &&
+             (row_info->rowbytes >= png_ptr->mmx_rowbytes_threshold))
+#else
+         if (mmx_supported)
+#endif
+         {
+            png_read_filter_row_mmx_paeth(row_info, row, prev_row);
+         }
+         else
+         {
+            png_uint_32 i;
+            png_bytep rp = row;
+            png_bytep pp = prev_row;
+            png_bytep lp = row;
+            png_bytep cp = prev_row;
+            png_uint_32 bpp = (row_info->pixel_depth + 7) >> 3;
+            png_uint_32 istop=row_info->rowbytes - bpp;
+
+            for (i = 0; i < bpp; i++)
+            {
+               *rp = (png_byte)(((int)(*rp) + (int)(*pp++)) & 0xff);
+               rp++;
+            }
+
+            for (i = 0; i < istop; i++)   /* use leftover rp,pp */
+            {
+               int a, b, c, pa, pb, pc, p;
+
+               a = *lp++;
+               b = *pp++;
+               c = *cp++;
+
+               p = b - c;
+               pc = a - c;
+
+#ifdef PNG_USE_ABS
+               pa = abs(p);
+               pb = abs(pc);
+               pc = abs(p + pc);
+#else
+               pa = p < 0 ? -p : p;
+               pb = pc < 0 ? -pc : pc;
+               pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+               /*
+                  if (pa <= pb && pa <= pc)
+                     p = a;
+                  else if (pb <= pc)
+                     p = b;
+                  else
+                     p = c;
+                */
+
+               p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+               *rp = (png_byte)(((int)(*rp) + p) & 0xff);
+               rp++;
+            }
+         }
+         break;
+      }
+
+      default:
+         png_warning(png_ptr, "Ignoring bad row filter type");
+         *row=0;
+         break;
+   }
+}
+
+#endif /* PNG_ASSEMBLER_CODE_SUPPORTED && PNG_USE_PNGVCRD */
diff --git a/Source/3rd Party/wx/src/png/pngwio.c b/Source/3rd Party/wx/src/png/pngwio.c
index 8eacf9f6d..adc57b309 100644
--- a/Source/3rd Party/wx/src/png/pngwio.c	
+++ b/Source/3rd Party/wx/src/png/pngwio.c	
@@ -1,254 +1,228 @@
-
-/* pngwio.c - functions for data output
- *
- * Last changed in libpng 1.5.0 [January 6, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- *
- * This file provides a location for all output.  Users who need
- * special handling are expected to write functions that have the same
- * arguments as these and perform similar functions, but that possibly
- * use different output methods.  Note that you shouldn't change these
- * functions, but rather write replacement functions and then change
- * them at run time with png_set_write_fn(...).
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-/* Write the data to whatever output you are using.  The default routine
- * writes to a file pointer.  Note that this routine sometimes gets called
- * with very small lengths, so you should implement some kind of simple
- * buffering if you are using unbuffered writes.  This should never be asked
- * to write more than 64K on a 16 bit machine.
- */
-
-void /* PRIVATE */
-png_write_data(png_structp png_ptr, png_const_bytep data, png_size_t length)
-{
-   /* NOTE: write_data_fn must not change the buffer! */
-   if (png_ptr->write_data_fn != NULL )
-      (*(png_ptr->write_data_fn))(png_ptr, (png_bytep)data, length);
-
-   else
-      png_error(png_ptr, "Call to NULL write function");
-}
-
-#ifdef PNG_STDIO_SUPPORTED
-/* This is the function that does the actual writing of data.  If you are
- * not writing to a standard C stream, you should create a replacement
- * write_data function and use it at run time with png_set_write_fn(), rather
- * than changing the library.
- */
-#ifndef USE_FAR_KEYWORD
-void PNGCBAPI
-png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_size_t check;
-
-   if (png_ptr == NULL)
-      return;
-
-   check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
-
-   if (check != length)
-      png_error(png_ptr, "Write Error");
-}
-#else
-/* This is the model-independent version. Since the standard I/O library
- * can't handle far buffers in the medium and small models, we have to copy
- * the data.
- */
-
-#define NEAR_BUF_SIZE 1024
-#define MIN(a,b) (a <= b ? a : b)
-
-void PNGCBAPI
-png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_uint_32 check;
-   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
-   png_FILE_p io_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Check if data really is near. If so, use usual code. */
-   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
-
-   if ((png_bytep)near_data == data)
-   {
-      check = fwrite(near_data, 1, length, io_ptr);
-   }
-
-   else
-   {
-      png_byte buf[NEAR_BUF_SIZE];
-      png_size_t written, remaining, err;
-      check = 0;
-      remaining = length;
-
-      do
-      {
-         written = MIN(NEAR_BUF_SIZE, remaining);
-         png_memcpy(buf, data, written); /* Copy far buffer to near buffer */
-         err = fwrite(buf, 1, written, io_ptr);
-
-         if (err != written)
-            break;
-
-         else
-            check += err;
-
-         data += written;
-         remaining -= written;
-      }
-      while (remaining != 0);
-   }
-
-   if (check != length)
-      png_error(png_ptr, "Write Error");
-}
-
-#endif
-#endif
-
-/* This function is called to output any data pending writing (normally
- * to disk).  After png_flush is called, there should be no data pending
- * writing in any buffers.
- */
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-void /* PRIVATE */
-png_flush(png_structp png_ptr)
-{
-   if (png_ptr->output_flush_fn != NULL)
-      (*(png_ptr->output_flush_fn))(png_ptr);
-}
-
-#  ifdef PNG_STDIO_SUPPORTED
-void PNGCBAPI
-png_default_flush(png_structp png_ptr)
-{
-   png_FILE_p io_ptr;
-
-   if (png_ptr == NULL)
-      return;
-
-   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
-   fflush(io_ptr);
-}
-#  endif
-#endif
-
-/* This function allows the application to supply new output functions for
- * libpng if standard C streams aren't being used.
- *
- * This function takes as its arguments:
- * png_ptr       - pointer to a png output data structure
- * io_ptr        - pointer to user supplied structure containing info about
- *                 the output functions.  May be NULL.
- * write_data_fn - pointer to a new output function that takes as its
- *                 arguments a pointer to a png_struct, a pointer to
- *                 data to be written, and a 32-bit unsigned int that is
- *                 the number of bytes to be written.  The new write
- *                 function should call png_error(png_ptr, "Error msg")
- *                 to exit and output any fatal error messages.  May be
- *                 NULL, in which case libpng's default function will
- *                 be used.
- * flush_data_fn - pointer to a new flush function that takes as its
- *                 arguments a pointer to a png_struct.  After a call to
- *                 the flush function, there should be no data in any buffers
- *                 or pending transmission.  If the output method doesn't do
- *                 any buffering of output, a function prototype must still be
- *                 supplied although it doesn't have to do anything.  If
- *                 PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile
- *                 time, output_flush_fn will be ignored, although it must be
- *                 supplied for compatibility.  May be NULL, in which case
- *                 libpng's default function will be used, if
- *                 PNG_WRITE_FLUSH_SUPPORTED is defined.  This is not
- *                 a good idea if io_ptr does not point to a standard
- *                 *FILE structure.
- */
-void PNGAPI
-png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
-    png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->io_ptr = io_ptr;
-
-#ifdef PNG_STDIO_SUPPORTED
-   if (write_data_fn != NULL)
-      png_ptr->write_data_fn = write_data_fn;
-
-   else
-      png_ptr->write_data_fn = png_default_write_data;
-#else
-   png_ptr->write_data_fn = write_data_fn;
-#endif
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#  ifdef PNG_STDIO_SUPPORTED
-
-   if (output_flush_fn != NULL)
-      png_ptr->output_flush_fn = output_flush_fn;
-
-   else
-      png_ptr->output_flush_fn = png_default_flush;
-
-#  else
-   png_ptr->output_flush_fn = output_flush_fn;
-#  endif
-#endif /* PNG_WRITE_FLUSH_SUPPORTED */
-
-   /* It is an error to read while writing a png file */
-   if (png_ptr->read_data_fn != NULL)
-   {
-      png_ptr->read_data_fn = NULL;
-
-      png_warning(png_ptr,
-          "Can't set both read_data_fn and write_data_fn in the"
-          " same structure");
-   }
-}
-
-#ifdef USE_FAR_KEYWORD
-#  ifdef _MSC_VER
-void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
-{
-   void *near_ptr;
-   void FAR *far_ptr;
-   FP_OFF(near_ptr) = FP_OFF(ptr);
-   far_ptr = (void FAR *)near_ptr;
-
-   if (check != 0)
-      if (FP_SEG(ptr) != FP_SEG(far_ptr))
-         png_error(png_ptr, "segment lost in conversion");
-
-   return(near_ptr);
-}
-#  else
-void *png_far_to_near(png_structp png_ptr, png_voidp ptr, int check)
-{
-   void *near_ptr;
-   void FAR *far_ptr;
-   near_ptr = (void FAR *)ptr;
-   far_ptr = (void FAR *)near_ptr;
-
-   if (check != 0)
-      if (far_ptr != ptr)
-         png_error(png_ptr, "segment lost in conversion");
-
-   return(near_ptr);
-}
-#  endif
-#endif
-#endif /* PNG_WRITE_SUPPORTED */
+
+/* pngwio.c - functions for data output
+ *
+ * libpng 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ *
+ * This file provides a location for all output.  Users who need
+ * special handling are expected to write functions that have the same
+ * arguments as these and perform similar functions, but that possibly
+ * use different output methods.  Note that you shouldn't change these
+ * functions, but rather write replacement functions and then change
+ * them at run time with png_set_write_fn(...).
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Write the data to whatever output you are using.  The default routine
+   writes to a file pointer.  Note that this routine sometimes gets called
+   with very small lengths, so you should implement some kind of simple
+   buffering if you are using unbuffered writes.  This should never be asked
+   to write more than 64K on a 16 bit machine.  */
+
+void /* PRIVATE */
+png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   if (png_ptr->write_data_fn != NULL )
+      (*(png_ptr->write_data_fn))(png_ptr, data, length);
+   else
+      png_error(png_ptr, "Call to NULL write function");
+}
+
+#if !defined(PNG_NO_STDIO)
+/* This is the function that does the actual writing of data.  If you are
+   not writing to a standard C stream, you should create a replacement
+   write_data function and use it at run time with png_set_write_fn(), rather
+   than changing the library. */
+#ifndef USE_FAR_KEYWORD
+void PNGAPI
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+
+#if defined(_WIN32_WCE)
+   if ( !WriteFile((HANDLE)(png_ptr->io_ptr), data, length, &check, NULL) )
+      check = 0;
+#else
+   check = fwrite(data, 1, length, (png_FILE_p)(png_ptr->io_ptr));
+#endif
+   if (check != length)
+      png_error(png_ptr, "Write Error");
+}
+#else
+/* this is the model-independent version. Since the standard I/O library
+   can't handle far buffers in the medium and small models, we have to copy
+   the data.
+*/
+
+#define NEAR_BUF_SIZE 1024
+#define MIN(a,b) (a <= b ? a : b)
+
+void PNGAPI
+png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   png_uint_32 check;
+   png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
+   png_FILE_p io_ptr;
+
+   /* Check if data really is near. If so, use usual code. */
+   near_data = (png_byte *)CVT_PTR_NOCHECK(data);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   if ((png_bytep)near_data == data)
+   {
+#if defined(_WIN32_WCE)
+      if ( !WriteFile(io_ptr, near_data, length, &check, NULL) )
+         check = 0;
+#else
+      check = fwrite(near_data, 1, length, io_ptr);
+#endif
+   }
+   else
+   {
+      png_byte buf[NEAR_BUF_SIZE];
+      png_size_t written, remaining, err;
+      check = 0;
+      remaining = length;
+      do
+      {
+         written = MIN(NEAR_BUF_SIZE, remaining);
+         png_memcpy(buf, data, written); /* copy far buffer to near buffer */
+#if defined(_WIN32_WCE)
+         if ( !WriteFile(io_ptr, buf, written, &err, NULL) )
+            err = 0;
+#else
+         err = fwrite(buf, 1, written, io_ptr);
+#endif
+         if (err != written)
+            break;
+         else
+            check += err;
+         data += written;
+         remaining -= written;
+      }
+      while (remaining != 0);
+   }
+   if (check != length)
+      png_error(png_ptr, "Write Error");
+}
+
+#endif
+#endif
+
+/* This function is called to output any data pending writing (normally
+   to disk).  After png_flush is called, there should be no data pending
+   writing in any buffers. */
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+void /* PRIVATE */
+png_flush(png_structp png_ptr)
+{
+   if (png_ptr->output_flush_fn != NULL)
+      (*(png_ptr->output_flush_fn))(png_ptr);
+}
+
+#if !defined(PNG_NO_STDIO)
+void PNGAPI
+png_default_flush(png_structp png_ptr)
+{
+#if !defined(_WIN32_WCE)
+   png_FILE_p io_ptr;
+   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
+   if (io_ptr != NULL)
+      fflush(io_ptr);
+#endif
+}
+#endif
+#endif
+
+/* This function allows the application to supply new output functions for
+   libpng if standard C streams aren't being used.
+
+   This function takes as its arguments:
+   png_ptr       - pointer to a png output data structure
+   io_ptr        - pointer to user supplied structure containing info about
+                   the output functions.  May be NULL.
+   write_data_fn - pointer to a new output function that takes as its
+                   arguments a pointer to a png_struct, a pointer to
+                   data to be written, and a 32-bit unsigned int that is
+                   the number of bytes to be written.  The new write
+                   function should call png_error(png_ptr, "Error msg")
+                   to exit and output any fatal error messages.
+   flush_data_fn - pointer to a new flush function that takes as its
+                   arguments a pointer to a png_struct.  After a call to
+                   the flush function, there should be no data in any buffers
+                   or pending transmission.  If the output method doesn't do
+                   any buffering of ouput, a function prototype must still be
+                   supplied although it doesn't have to do anything.  If
+                   PNG_WRITE_FLUSH_SUPPORTED is not defined at libpng compile
+                   time, output_flush_fn will be ignored, although it must be
+                   supplied for compatibility. */
+void PNGAPI
+png_set_write_fn(png_structp png_ptr, png_voidp io_ptr,
+   png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn)
+{
+   png_ptr->io_ptr = io_ptr;
+
+#if !defined(PNG_NO_STDIO)
+   if (write_data_fn != NULL)
+      png_ptr->write_data_fn = write_data_fn;
+   else
+      png_ptr->write_data_fn = png_default_write_data;
+#else
+   png_ptr->write_data_fn = write_data_fn;
+#endif
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+#if !defined(PNG_NO_STDIO)
+   if (output_flush_fn != NULL)
+      png_ptr->output_flush_fn = output_flush_fn;
+   else
+      png_ptr->output_flush_fn = png_default_flush;
+#else
+   png_ptr->output_flush_fn = output_flush_fn;
+#endif
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+   /* It is an error to read while writing a png file */
+   if (png_ptr->read_data_fn != NULL)
+   {
+      png_ptr->read_data_fn = NULL;
+      png_warning(png_ptr,
+         "Attempted to set both read_data_fn and write_data_fn in");
+      png_warning(png_ptr,
+         "the same structure.  Resetting read_data_fn to NULL.");
+   }
+}
+
+#if defined(USE_FAR_KEYWORD)
+#if defined(_MSC_VER)
+void *png_far_to_near(png_structp png_ptr,png_voidp ptr, int check)
+{
+   void *near_ptr;
+   void FAR *far_ptr;
+   FP_OFF(near_ptr) = FP_OFF(ptr);
+   far_ptr = (void FAR *)near_ptr;
+   if(check != 0)
+      if(FP_SEG(ptr) != FP_SEG(far_ptr))
+         png_error(png_ptr,"segment lost in conversion");
+   return(near_ptr);
+}
+#  else
+void *png_far_to_near(png_structp png_ptr,png_voidp ptr, int check)
+{
+   void *near_ptr;
+   void FAR *far_ptr;
+   near_ptr = (void FAR *)ptr;
+   far_ptr = (void FAR *)near_ptr;
+   if(check != 0)
+      if(far_ptr != ptr)
+         png_error(png_ptr,"segment lost in conversion");
+   return(near_ptr);
+}
+#   endif
+#   endif
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/png/pngwrite.c b/Source/3rd Party/wx/src/png/pngwrite.c
index dc12a2048..f422173bf 100644
--- a/Source/3rd Party/wx/src/png/pngwrite.c	
+++ b/Source/3rd Party/wx/src/png/pngwrite.c	
@@ -1,1655 +1,1464 @@
-
-/* pngwrite.c - general routines to write a PNG file
- *
- * Last changed in libpng 1.5.7 [December 15, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-/* Writes all the PNG information.  This is the suggested way to use the
- * library.  If you have a new chunk to add, make a function to write it,
- * and put it in the correct location here.  If you want the chunk written
- * after the image data, put it in png_write_end().  I strongly encourage
- * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
- * the chunk, as that will keep the code from breaking if you want to just
- * write a plain PNG file.  If you have long comments, I suggest writing
- * them in png_write_end(), and compressing them.
- */
-void PNGAPI
-png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_write_info_before_PLTE");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
-   {
-   /* Write PNG signature */
-   png_write_sig(png_ptr);
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) && \
-       (png_ptr->mng_features_permitted))
-   {
-      png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
-      png_ptr->mng_features_permitted = 0;
-   }
-#endif
-
-   /* Write IHDR information. */
-   png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,
-       info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
-       info_ptr->filter_type,
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-       info_ptr->interlace_type);
-#else
-       0);
-#endif
-   /* The rest of these check to see if the valid field has the appropriate
-    * flag set, and if it does, writes the chunk.
-    */
-#ifdef PNG_WRITE_gAMA_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_gAMA)
-      png_write_gAMA_fixed(png_ptr, info_ptr->gamma);
-#endif
-#ifdef PNG_WRITE_sRGB_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sRGB)
-      png_write_sRGB(png_ptr, (int)info_ptr->srgb_intent);
-#endif
-
-#ifdef PNG_WRITE_iCCP_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_iCCP)
-      png_write_iCCP(png_ptr, info_ptr->iccp_name, PNG_COMPRESSION_TYPE_BASE,
-          (png_charp)info_ptr->iccp_profile, (int)info_ptr->iccp_proflen);
-#endif
-#ifdef PNG_WRITE_sBIT_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sBIT)
-      png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
-#endif
-#ifdef PNG_WRITE_cHRM_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_cHRM)
-      png_write_cHRM_fixed(png_ptr,
-          info_ptr->x_white, info_ptr->y_white,
-          info_ptr->x_red, info_ptr->y_red,
-          info_ptr->x_green, info_ptr->y_green,
-          info_ptr->x_blue, info_ptr->y_blue);
-#endif
-
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   if (info_ptr->unknown_chunks_num)
-   {
-      png_unknown_chunk *up;
-
-      png_debug(5, "writing extra chunks");
-
-      for (up = info_ptr->unknown_chunks;
-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-           up++)
-      {
-         int keep = png_handle_as_unknown(png_ptr, up->name);
-
-         if (keep != PNG_HANDLE_CHUNK_NEVER &&
-             up->location &&
-             !(up->location & PNG_HAVE_PLTE) &&
-             !(up->location & PNG_HAVE_IDAT) &&
-             !(up->location & PNG_AFTER_IDAT) &&
-             ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-             (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-         {
-            if (up->size == 0)
-               png_warning(png_ptr, "Writing zero-length unknown chunk");
-
-            png_write_chunk(png_ptr, up->name, up->data, up->size);
-         }
-      }
-   }
-#endif
-      png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
-   }
-}
-
-void PNGAPI
-png_write_info(png_structp png_ptr, png_infop info_ptr)
-{
-#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
-   int i;
-#endif
-
-   png_debug(1, "in png_write_info");
-
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   png_write_info_before_PLTE(png_ptr, info_ptr);
-
-   if (info_ptr->valid & PNG_INFO_PLTE)
-      png_write_PLTE(png_ptr, info_ptr->palette,
-          (png_uint_32)info_ptr->num_palette);
-
-   else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      png_error(png_ptr, "Valid palette required for paletted images");
-
-#ifdef PNG_WRITE_tRNS_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_tRNS)
-   {
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-      /* Invert the alpha channel (in tRNS) */
-      if ((png_ptr->transformations & PNG_INVERT_ALPHA) &&
-          info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         int j;
-         for (j = 0; j<(int)info_ptr->num_trans; j++)
-            info_ptr->trans_alpha[j] =
-               (png_byte)(255 - info_ptr->trans_alpha[j]);
-      }
-#endif
-      png_write_tRNS(png_ptr, info_ptr->trans_alpha, &(info_ptr->trans_color),
-          info_ptr->num_trans, info_ptr->color_type);
-   }
-#endif
-#ifdef PNG_WRITE_bKGD_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_bKGD)
-      png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
-#endif
-
-#ifdef PNG_WRITE_hIST_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_hIST)
-      png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
-#endif
-
-#ifdef PNG_WRITE_oFFs_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_oFFs)
-      png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
-          info_ptr->offset_unit_type);
-#endif
-
-#ifdef PNG_WRITE_pCAL_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_pCAL)
-      png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
-          info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
-          info_ptr->pcal_units, info_ptr->pcal_params);
-#endif
-
-#ifdef PNG_WRITE_sCAL_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sCAL)
-      png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
-          info_ptr->scal_s_width, info_ptr->scal_s_height);
-#endif /* sCAL */
-
-#ifdef PNG_WRITE_pHYs_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_pHYs)
-      png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
-          info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
-#endif /* pHYs */
-
-#ifdef PNG_WRITE_tIME_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_tIME)
-   {
-      png_write_tIME(png_ptr, &(info_ptr->mod_time));
-      png_ptr->mode |= PNG_WROTE_tIME;
-   }
-#endif /* tIME */
-
-#ifdef PNG_WRITE_sPLT_SUPPORTED
-   if (info_ptr->valid & PNG_INFO_sPLT)
-      for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
-         png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
-#endif /* sPLT */
-
-#ifdef PNG_WRITE_TEXT_SUPPORTED
-   /* Check to see if we need to write text chunks */
-   for (i = 0; i < info_ptr->num_text; i++)
-   {
-      png_debug2(2, "Writing header text chunk %d, type %d", i,
-          info_ptr->text[i].compression);
-      /* An internationalized chunk? */
-      if (info_ptr->text[i].compression > 0)
-      {
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-         /* Write international chunk */
-         png_write_iTXt(png_ptr,
-             info_ptr->text[i].compression,
-             info_ptr->text[i].key,
-             info_ptr->text[i].lang,
-             info_ptr->text[i].lang_key,
-             info_ptr->text[i].text);
-#else
-          png_warning(png_ptr, "Unable to write international text");
-#endif
-          /* Mark this chunk as written */
-          info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-      }
-
-      /* If we want a compressed text chunk */
-      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_zTXt)
-      {
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-         /* Write compressed chunk */
-         png_write_zTXt(png_ptr, info_ptr->text[i].key,
-             info_ptr->text[i].text, 0,
-             info_ptr->text[i].compression);
-#else
-         png_warning(png_ptr, "Unable to write compressed text");
-#endif
-         /* Mark this chunk as written */
-         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
-      }
-
-      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-      {
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-         /* Write uncompressed chunk */
-         png_write_tEXt(png_ptr, info_ptr->text[i].key,
-             info_ptr->text[i].text,
-             0);
-         /* Mark this chunk as written */
-         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-#else
-         /* Can't get here */
-         png_warning(png_ptr, "Unable to write uncompressed text");
-#endif
-      }
-   }
-#endif /* tEXt */
-
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   if (info_ptr->unknown_chunks_num)
-   {
-      png_unknown_chunk *up;
-
-      png_debug(5, "writing extra chunks");
-
-      for (up = info_ptr->unknown_chunks;
-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-           up++)
-      {
-         int keep = png_handle_as_unknown(png_ptr, up->name);
-         if (keep != PNG_HANDLE_CHUNK_NEVER &&
-             up->location &&
-             (up->location & PNG_HAVE_PLTE) &&
-             !(up->location & PNG_HAVE_IDAT) &&
-             !(up->location & PNG_AFTER_IDAT) &&
-             ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-             (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-         {
-            png_write_chunk(png_ptr, up->name, up->data, up->size);
-         }
-      }
-   }
-#endif
-}
-
-/* Writes the end of the PNG file.  If you don't want to write comments or
- * time information, you can pass NULL for info.  If you already wrote these
- * in png_write_info(), do not write them again here.  If you have long
- * comments, I suggest writing them here, and compressing them.
- */
-void PNGAPI
-png_write_end(png_structp png_ptr, png_infop info_ptr)
-{
-   png_debug(1, "in png_write_end");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (!(png_ptr->mode & PNG_HAVE_IDAT))
-      png_error(png_ptr, "No IDATs written into file");
-
-   /* See if user wants us to write information chunks */
-   if (info_ptr != NULL)
-   {
-#ifdef PNG_WRITE_TEXT_SUPPORTED
-      int i; /* local index variable */
-#endif
-#ifdef PNG_WRITE_tIME_SUPPORTED
-      /* Check to see if user has supplied a time chunk */
-      if ((info_ptr->valid & PNG_INFO_tIME) &&
-          !(png_ptr->mode & PNG_WROTE_tIME))
-         png_write_tIME(png_ptr, &(info_ptr->mod_time));
-
-#endif
-#ifdef PNG_WRITE_TEXT_SUPPORTED
-      /* Loop through comment chunks */
-      for (i = 0; i < info_ptr->num_text; i++)
-      {
-         png_debug2(2, "Writing trailer text chunk %d, type %d", i,
-            info_ptr->text[i].compression);
-         /* An internationalized chunk? */
-         if (info_ptr->text[i].compression > 0)
-         {
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-            /* Write international chunk */
-            png_write_iTXt(png_ptr,
-                info_ptr->text[i].compression,
-                info_ptr->text[i].key,
-                info_ptr->text[i].lang,
-                info_ptr->text[i].lang_key,
-                info_ptr->text[i].text);
-#else
-            png_warning(png_ptr, "Unable to write international text");
-#endif
-            /* Mark this chunk as written */
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-         }
-
-         else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
-         {
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-            /* Write compressed chunk */
-            png_write_zTXt(png_ptr, info_ptr->text[i].key,
-                info_ptr->text[i].text, 0,
-                info_ptr->text[i].compression);
-#else
-            png_warning(png_ptr, "Unable to write compressed text");
-#endif
-            /* Mark this chunk as written */
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
-         }
-
-         else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
-         {
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-            /* Write uncompressed chunk */
-            png_write_tEXt(png_ptr, info_ptr->text[i].key,
-                info_ptr->text[i].text, 0);
-#else
-            png_warning(png_ptr, "Unable to write uncompressed text");
-#endif
-
-            /* Mark this chunk as written */
-            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
-         }
-      }
-#endif
-#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-   if (info_ptr->unknown_chunks_num)
-   {
-      png_unknown_chunk *up;
-
-      png_debug(5, "writing extra chunks");
-
-      for (up = info_ptr->unknown_chunks;
-           up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
-           up++)
-      {
-         int keep = png_handle_as_unknown(png_ptr, up->name);
-         if (keep != PNG_HANDLE_CHUNK_NEVER &&
-             up->location &&
-             (up->location & PNG_AFTER_IDAT) &&
-             ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
-             (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
-         {
-            png_write_chunk(png_ptr, up->name, up->data, up->size);
-         }
-      }
-   }
-#endif
-   }
-
-   png_ptr->mode |= PNG_AFTER_IDAT;
-
-   /* Write end of PNG file */
-   png_write_IEND(png_ptr);
-   /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03,
-    * and restored again in libpng-1.2.30, may cause some applications that
-    * do not set png_ptr->output_flush_fn to crash.  If your application
-    * experiences a problem, please try building libpng with
-    * PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED defined, and report the event to
-    * png-mng-implement at lists.sf.net .
-    */
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#  ifdef PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED
-   png_flush(png_ptr);
-#  endif
-#endif
-}
-
-#ifdef PNG_CONVERT_tIME_SUPPORTED
-/* "tm" structure is not supported on WindowsCE */
-void PNGAPI
-png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm FAR * ttime)
-{
-   png_debug(1, "in png_convert_from_struct_tm");
-
-   ptime->year = (png_uint_16)(1900 + ttime->tm_year);
-   ptime->month = (png_byte)(ttime->tm_mon + 1);
-   ptime->day = (png_byte)ttime->tm_mday;
-   ptime->hour = (png_byte)ttime->tm_hour;
-   ptime->minute = (png_byte)ttime->tm_min;
-   ptime->second = (png_byte)ttime->tm_sec;
-}
-
-void PNGAPI
-png_convert_from_time_t(png_timep ptime, time_t ttime)
-{
-   struct tm *tbuf;
-
-   png_debug(1, "in png_convert_from_time_t");
-
-   tbuf = gmtime(&ttime);
-   png_convert_from_struct_tm(ptime, tbuf);
-}
-#endif
-
-/* Initialize png_ptr structure, and allocate any memory needed */
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_write_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn),PNG_ALLOCATED)
-{
-#ifdef PNG_USER_MEM_SUPPORTED
-   return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
-       warn_fn, NULL, NULL, NULL));
-}
-
-/* Alternate initialize png_ptr structure, and allocate any memory needed */
-static void png_reset_filter_heuristics(png_structp png_ptr); /* forward decl */
-
-PNG_FUNCTION(png_structp,PNGAPI
-png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
-    png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
-    png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED)
-{
-#endif /* PNG_USER_MEM_SUPPORTED */
-   volatile int png_cleanup_needed = 0;
-#ifdef PNG_SETJMP_SUPPORTED
-   volatile
-#endif
-   png_structp png_ptr;
-#ifdef PNG_SETJMP_SUPPORTED
-#ifdef USE_FAR_KEYWORD
-   jmp_buf tmp_jmpbuf;
-#endif
-#endif
-
-   png_debug(1, "in png_create_write_struct");
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
-       (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
-#else
-   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
-#endif /* PNG_USER_MEM_SUPPORTED */
-   if (png_ptr == NULL)
-      return (NULL);
-
-   /* Added at libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
-   png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-/* Applications that neglect to set up their own setjmp() and then
- * encounter a png_error() will longjmp here.  Since the jmpbuf is
- * then meaningless we abort instead of returning.
- */
-#ifdef USE_FAR_KEYWORD
-   if (setjmp(tmp_jmpbuf))
-#else
-   if (setjmp(png_jmpbuf(png_ptr))) /* sets longjmp to match setjmp */
-#endif
-#ifdef USE_FAR_KEYWORD
-   png_memcpy(png_jmpbuf(png_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));
-#endif
-      PNG_ABORT();
-#endif
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
-#endif /* PNG_USER_MEM_SUPPORTED */
-   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
-
-   if (!png_user_version_check(png_ptr, user_png_ver))
-      png_cleanup_needed = 1;
-
-   /* Initialize zbuf - compression buffer */
-   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
-
-   if (!png_cleanup_needed)
-   {
-      png_ptr->zbuf = (png_bytep)png_malloc_warn(png_ptr,
-          png_ptr->zbuf_size);
-      if (png_ptr->zbuf == NULL)
-         png_cleanup_needed = 1;
-   }
-
-   if (png_cleanup_needed)
-   {
-       /* Clean up PNG structure and deallocate any memory. */
-       png_free(png_ptr, png_ptr->zbuf);
-       png_ptr->zbuf = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-       png_destroy_struct_2((png_voidp)png_ptr,
-           (png_free_ptr)free_fn, (png_voidp)mem_ptr);
-#else
-       png_destroy_struct((png_voidp)png_ptr);
-#endif
-       return (NULL);
-   }
-
-   png_set_write_fn(png_ptr, NULL, NULL, NULL);
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   png_reset_filter_heuristics(png_ptr);
-#endif
-
-   return (png_ptr);
-}
-
-
-/* Write a few rows of image data.  If the image is interlaced,
- * either you will have to write the 7 sub images, or, if you
- * have called png_set_interlace_handling(), you will have to
- * "write" the image seven times.
- */
-void PNGAPI
-png_write_rows(png_structp png_ptr, png_bytepp row,
-    png_uint_32 num_rows)
-{
-   png_uint_32 i; /* row counter */
-   png_bytepp rp; /* row pointer */
-
-   png_debug(1, "in png_write_rows");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* Loop through the rows */
-   for (i = 0, rp = row; i < num_rows; i++, rp++)
-   {
-      png_write_row(png_ptr, *rp);
-   }
-}
-
-/* Write the image.  You only need to call this function once, even
- * if you are writing an interlaced image.
- */
-void PNGAPI
-png_write_image(png_structp png_ptr, png_bytepp image)
-{
-   png_uint_32 i; /* row index */
-   int pass, num_pass; /* pass variables */
-   png_bytepp rp; /* points to current row */
-
-   if (png_ptr == NULL)
-      return;
-
-   png_debug(1, "in png_write_image");
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Initialize interlace handling.  If image is not interlaced,
-    * this will set pass to 1
-    */
-   num_pass = png_set_interlace_handling(png_ptr);
-#else
-   num_pass = 1;
-#endif
-   /* Loop through passes */
-   for (pass = 0; pass < num_pass; pass++)
-   {
-      /* Loop through image */
-      for (i = 0, rp = image; i < png_ptr->height; i++, rp++)
-      {
-         png_write_row(png_ptr, *rp);
-      }
-   }
-}
-
-/* Called by user to write a row of image data */
-void PNGAPI
-png_write_row(png_structp png_ptr, png_const_bytep row)
-{
-   /* 1.5.6: moved from png_struct to be a local structure: */
-   png_row_info row_info;
-
-   if (png_ptr == NULL)
-      return;
-
-   png_debug2(1, "in png_write_row (row %u, pass %d)",
-      png_ptr->row_number, png_ptr->pass);
-
-   /* Initialize transformations and other stuff if first time */
-   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
-   {
-      /* Make sure we wrote the header info */
-      if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
-         png_error(png_ptr,
-             "png_write_info was never called before png_write_row");
-
-      /* Check for transforms that have been set but were defined out */
-#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
-      if (png_ptr->transformations & PNG_INVERT_MONO)
-         png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
-      if (png_ptr->transformations & PNG_FILLER)
-         png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined");
-#endif
-#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
-    defined(PNG_READ_PACKSWAP_SUPPORTED)
-      if (png_ptr->transformations & PNG_PACKSWAP)
-         png_warning(png_ptr,
-             "PNG_WRITE_PACKSWAP_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
-      if (png_ptr->transformations & PNG_PACK)
-         png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
-      if (png_ptr->transformations & PNG_SHIFT)
-         png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
-      if (png_ptr->transformations & PNG_BGR)
-         png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined");
-#endif
-
-#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
-      if (png_ptr->transformations & PNG_SWAP_BYTES)
-         png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined");
-#endif
-
-      png_write_start_row(png_ptr);
-   }
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* If interlaced and not interested in row, return */
-   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
-   {
-      switch (png_ptr->pass)
-      {
-         case 0:
-            if (png_ptr->row_number & 0x07)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 1:
-            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 2:
-            if ((png_ptr->row_number & 0x07) != 4)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 3:
-            if ((png_ptr->row_number & 0x03) || png_ptr->width < 3)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 4:
-            if ((png_ptr->row_number & 0x03) != 2)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 5:
-            if ((png_ptr->row_number & 0x01) || png_ptr->width < 2)
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         case 6:
-            if (!(png_ptr->row_number & 0x01))
-            {
-               png_write_finish_row(png_ptr);
-               return;
-            }
-            break;
-
-         default: /* error: ignore it */
-            break;
-      }
-   }
-#endif
-
-   /* Set up row info for transformations */
-   row_info.color_type = png_ptr->color_type;
-   row_info.width = png_ptr->usr_width;
-   row_info.channels = png_ptr->usr_channels;
-   row_info.bit_depth = png_ptr->usr_bit_depth;
-   row_info.pixel_depth = (png_byte)(row_info.bit_depth * row_info.channels);
-   row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width);
-
-   png_debug1(3, "row_info->color_type = %d", row_info.color_type);
-   png_debug1(3, "row_info->width = %u", row_info.width);
-   png_debug1(3, "row_info->channels = %d", row_info.channels);
-   png_debug1(3, "row_info->bit_depth = %d", row_info.bit_depth);
-   png_debug1(3, "row_info->pixel_depth = %d", row_info.pixel_depth);
-   png_debug1(3, "row_info->rowbytes = %lu", (unsigned long)row_info.rowbytes);
-
-   /* Copy user's row into buffer, leaving room for filter byte. */
-   png_memcpy(png_ptr->row_buf + 1, row, row_info.rowbytes);
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Handle interlacing */
-   if (png_ptr->interlaced && png_ptr->pass < 6 &&
-       (png_ptr->transformations & PNG_INTERLACE))
-   {
-      png_do_write_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass);
-      /* This should always get caught above, but still ... */
-      if (!(row_info.width))
-      {
-         png_write_finish_row(png_ptr);
-         return;
-      }
-   }
-#endif
-
-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-   /* Handle other transformations */
-   if (png_ptr->transformations)
-      png_do_write_transformations(png_ptr, &row_info);
-#endif
-
-   /* At this point the row_info pixel depth must match the 'transformed' depth,
-    * which is also the output depth.
-    */
-   if (row_info.pixel_depth != png_ptr->pixel_depth ||
-      row_info.pixel_depth != png_ptr->transformed_pixel_depth)
-      png_error(png_ptr, "internal write transform logic error");
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   /* Write filter_method 64 (intrapixel differencing) only if
-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-    * 2. Libpng did not write a PNG signature (this filter_method is only
-    *    used in PNG datastreams that are embedded in MNG datastreams) and
-    * 3. The application called png_permit_mng_features with a mask that
-    *    included PNG_FLAG_MNG_FILTER_64 and
-    * 4. The filter_method is 64 and
-    * 5. The color_type is RGB or RGBA
-    */
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-       (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
-   {
-      /* Intrapixel differencing */
-      png_do_write_intrapixel(&row_info, png_ptr->row_buf + 1);
-   }
-#endif
-
-   /* Find a filter if necessary, filter the row and write it out. */
-   png_write_find_filter(png_ptr, &row_info);
-
-   if (png_ptr->write_row_fn != NULL)
-      (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
-}
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-/* Set the automatic flush interval or 0 to turn flushing off */
-void PNGAPI
-png_set_flush(png_structp png_ptr, int nrows)
-{
-   png_debug(1, "in png_set_flush");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flush_dist = (nrows < 0 ? 0 : nrows);
-}
-
-/* Flush the current output buffers now */
-void PNGAPI
-png_write_flush(png_structp png_ptr)
-{
-   int wrote_IDAT;
-
-   png_debug(1, "in png_write_flush");
-
-   if (png_ptr == NULL)
-      return;
-
-   /* We have already written out all of the data */
-   if (png_ptr->row_number >= png_ptr->num_rows)
-      return;
-
-   do
-   {
-      int ret;
-
-      /* Compress the data */
-      ret = deflate(&png_ptr->zstream, Z_SYNC_FLUSH);
-      wrote_IDAT = 0;
-
-      /* Check for compression errors */
-      if (ret != Z_OK)
-      {
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-
-      if (!(png_ptr->zstream.avail_out))
-      {
-         /* Write the IDAT and reset the zlib output buffer */
-         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-         wrote_IDAT = 1;
-      }
-   } while (wrote_IDAT == 1);
-
-   /* If there is any data left to be output, write it into a new IDAT */
-   if (png_ptr->zbuf_size != png_ptr->zstream.avail_out)
-   {
-      /* Write the IDAT and reset the zlib output buffer */
-      png_write_IDAT(png_ptr, png_ptr->zbuf,
-          png_ptr->zbuf_size - png_ptr->zstream.avail_out);
-   }
-   png_ptr->flush_rows = 0;
-   png_flush(png_ptr);
-}
-#endif /* PNG_WRITE_FLUSH_SUPPORTED */
-
-/* Free all memory used by the write */
-void PNGAPI
-png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
-{
-   png_structp png_ptr = NULL;
-   png_infop info_ptr = NULL;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn = NULL;
-   png_voidp mem_ptr = NULL;
-#endif
-
-   png_debug(1, "in png_destroy_write_struct");
-
-   if (png_ptr_ptr != NULL)
-      png_ptr = *png_ptr_ptr;
-
-#ifdef PNG_USER_MEM_SUPPORTED
-   if (png_ptr != NULL)
-   {
-      free_fn = png_ptr->free_fn;
-      mem_ptr = png_ptr->mem_ptr;
-   }
-#endif
-
-   if (info_ptr_ptr != NULL)
-      info_ptr = *info_ptr_ptr;
-
-   if (info_ptr != NULL)
-   {
-      if (png_ptr != NULL)
-      {
-         png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
-
-#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-         if (png_ptr->num_chunk_list)
-         {
-            png_free(png_ptr, png_ptr->chunk_list);
-            png_ptr->num_chunk_list = 0;
-         }
-#endif
-      }
-
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)info_ptr);
-#endif
-      *info_ptr_ptr = NULL;
-   }
-
-   if (png_ptr != NULL)
-   {
-      png_write_destroy(png_ptr);
-#ifdef PNG_USER_MEM_SUPPORTED
-      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
-          (png_voidp)mem_ptr);
-#else
-      png_destroy_struct((png_voidp)png_ptr);
-#endif
-      *png_ptr_ptr = NULL;
-   }
-}
-
-
-/* Free any memory used in png_ptr struct (old method) */
-void /* PRIVATE */
-png_write_destroy(png_structp png_ptr)
-{
-#ifdef PNG_SETJMP_SUPPORTED
-   jmp_buf tmp_jmp; /* Save jump buffer */
-#endif
-   png_error_ptr error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_error_ptr warning_fn;
-#endif
-   png_voidp error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_free_ptr free_fn;
-#endif
-
-   png_debug(1, "in png_write_destroy");
-
-   /* Free any memory zlib uses */
-   if (png_ptr->zlib_state != PNG_ZLIB_UNINITIALIZED)
-      deflateEnd(&png_ptr->zstream);
-
-   /* Free our memory.  png_free checks NULL for us. */
-   png_free(png_ptr, png_ptr->zbuf);
-   png_free(png_ptr, png_ptr->row_buf);
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   png_free(png_ptr, png_ptr->prev_row);
-   png_free(png_ptr, png_ptr->sub_row);
-   png_free(png_ptr, png_ptr->up_row);
-   png_free(png_ptr, png_ptr->avg_row);
-   png_free(png_ptr, png_ptr->paeth_row);
-#endif
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   /* Use this to save a little code space, it doesn't free the filter_costs */
-   png_reset_filter_heuristics(png_ptr);
-   png_free(png_ptr, png_ptr->filter_costs);
-   png_free(png_ptr, png_ptr->inv_filter_costs);
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   /* Reset structure */
-   png_memcpy(tmp_jmp, png_ptr->longjmp_buffer, png_sizeof(jmp_buf));
-#endif
-
-   error_fn = png_ptr->error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   warning_fn = png_ptr->warning_fn;
-#endif
-   error_ptr = png_ptr->error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   free_fn = png_ptr->free_fn;
-#endif
-
-   png_memset(png_ptr, 0, png_sizeof(png_struct));
-
-   png_ptr->error_fn = error_fn;
-#ifdef PNG_WARNINGS_SUPPORTED
-   png_ptr->warning_fn = warning_fn;
-#endif
-   png_ptr->error_ptr = error_ptr;
-#ifdef PNG_USER_MEM_SUPPORTED
-   png_ptr->free_fn = free_fn;
-#endif
-
-#ifdef PNG_SETJMP_SUPPORTED
-   png_memcpy(png_ptr->longjmp_buffer, tmp_jmp, png_sizeof(jmp_buf));
-#endif
-}
-
-/* Allow the application to select one or more row filters to use. */
-void PNGAPI
-png_set_filter(png_structp png_ptr, int method, int filters)
-{
-   png_debug(1, "in png_set_filter");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-       (method == PNG_INTRAPIXEL_DIFFERENCING))
-      method = PNG_FILTER_TYPE_BASE;
-
-#endif
-   if (method == PNG_FILTER_TYPE_BASE)
-   {
-      switch (filters & (PNG_ALL_FILTERS | 0x07))
-      {
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-         case 5:
-         case 6:
-         case 7: png_warning(png_ptr, "Unknown row filter for method 0");
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-         case PNG_FILTER_VALUE_NONE:
-            png_ptr->do_filter = PNG_FILTER_NONE; break;
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-         case PNG_FILTER_VALUE_SUB:
-            png_ptr->do_filter = PNG_FILTER_SUB; break;
-
-         case PNG_FILTER_VALUE_UP:
-            png_ptr->do_filter = PNG_FILTER_UP; break;
-
-         case PNG_FILTER_VALUE_AVG:
-            png_ptr->do_filter = PNG_FILTER_AVG; break;
-
-         case PNG_FILTER_VALUE_PAETH:
-            png_ptr->do_filter = PNG_FILTER_PAETH; break;
-
-         default:
-            png_ptr->do_filter = (png_byte)filters; break;
-#else
-         default:
-            png_warning(png_ptr, "Unknown row filter for method 0");
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-      }
-
-      /* If we have allocated the row_buf, this means we have already started
-       * with the image and we should have allocated all of the filter buffers
-       * that have been selected.  If prev_row isn't already allocated, then
-       * it is too late to start using the filters that need it, since we
-       * will be missing the data in the previous row.  If an application
-       * wants to start and stop using particular filters during compression,
-       * it should start out with all of the filters, and then add and
-       * remove them after the start of compression.
-       */
-      if (png_ptr->row_buf != NULL)
-      {
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-         if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
-         {
-            png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
-                (png_ptr->rowbytes + 1));
-            png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
-         }
-
-         if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL)
-         {
-            if (png_ptr->prev_row == NULL)
-            {
-               png_warning(png_ptr, "Can't add Up filter after starting");
-               png_ptr->do_filter = (png_byte)(png_ptr->do_filter &
-                   ~PNG_FILTER_UP);
-            }
-
-            else
-            {
-               png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
-                   (png_ptr->rowbytes + 1));
-               png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
-            }
-         }
-
-         if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL)
-         {
-            if (png_ptr->prev_row == NULL)
-            {
-               png_warning(png_ptr, "Can't add Average filter after starting");
-               png_ptr->do_filter = (png_byte)(png_ptr->do_filter &
-                   ~PNG_FILTER_AVG);
-            }
-
-            else
-            {
-               png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
-                   (png_ptr->rowbytes + 1));
-               png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
-            }
-         }
-
-         if ((png_ptr->do_filter & PNG_FILTER_PAETH) &&
-             png_ptr->paeth_row == NULL)
-         {
-            if (png_ptr->prev_row == NULL)
-            {
-               png_warning(png_ptr, "Can't add Paeth filter after starting");
-               png_ptr->do_filter &= (png_byte)(~PNG_FILTER_PAETH);
-            }
-
-            else
-            {
-               png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
-                   (png_ptr->rowbytes + 1));
-               png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
-            }
-         }
-
-         if (png_ptr->do_filter == PNG_NO_FILTERS)
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-            png_ptr->do_filter = PNG_FILTER_NONE;
-      }
-   }
-   else
-      png_error(png_ptr, "Unknown custom filter method");
-}
-
-/* This allows us to influence the way in which libpng chooses the "best"
- * filter for the current scanline.  While the "minimum-sum-of-absolute-
- * differences metric is relatively fast and effective, there is some
- * question as to whether it can be improved upon by trying to keep the
- * filtered data going to zlib more consistent, hopefully resulting in
- * better compression.
- */
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED      /* GRR 970116 */
-/* Convenience reset API. */
-static void
-png_reset_filter_heuristics(png_structp png_ptr)
-{
-   /* Clear out any old values in the 'weights' - this must be done because if
-    * the app calls set_filter_heuristics multiple times with different
-    * 'num_weights' values we would otherwise potentially have wrong sized
-    * arrays.
-    */
-   png_ptr->num_prev_filters = 0;
-   png_ptr->heuristic_method = PNG_FILTER_HEURISTIC_UNWEIGHTED;
-   if (png_ptr->prev_filters != NULL)
-   {
-      png_bytep old = png_ptr->prev_filters;
-      png_ptr->prev_filters = NULL;
-      png_free(png_ptr, old);
-   }
-   if (png_ptr->filter_weights != NULL)
-   {
-      png_uint_16p old = png_ptr->filter_weights;
-      png_ptr->filter_weights = NULL;
-      png_free(png_ptr, old);
-   }
-
-   if (png_ptr->inv_filter_weights != NULL)
-   {
-      png_uint_16p old = png_ptr->inv_filter_weights;
-      png_ptr->inv_filter_weights = NULL;
-      png_free(png_ptr, old);
-   }
-
-   /* Leave the filter_costs - this array is fixed size. */
-}
-
-static int
-png_init_filter_heuristics(png_structp png_ptr, int heuristic_method,
-   int num_weights)
-{
-   if (png_ptr == NULL)
-      return 0;
-
-   /* Clear out the arrays */
-   png_reset_filter_heuristics(png_ptr);
-
-   /* Check arguments; the 'reset' function makes the correct settings for the
-    * unweighted case, but we must handle the weight case by initializing the
-    * arrays for the caller.
-    */
-   if (heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-   {
-      int i;
-
-      if (num_weights > 0)
-      {
-         png_ptr->prev_filters = (png_bytep)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_byte) * num_weights));
-
-         /* To make sure that the weighting starts out fairly */
-         for (i = 0; i < num_weights; i++)
-         {
-            png_ptr->prev_filters[i] = 255;
-         }
-
-         png_ptr->filter_weights = (png_uint_16p)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
-
-         png_ptr->inv_filter_weights = (png_uint_16p)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
-
-         for (i = 0; i < num_weights; i++)
-         {
-            png_ptr->inv_filter_weights[i] =
-            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
-         }
-
-         /* Safe to set this now */
-         png_ptr->num_prev_filters = (png_byte)num_weights;
-      }
-
-      /* If, in the future, there are other filter methods, this would
-       * need to be based on png_ptr->filter.
-       */
-      if (png_ptr->filter_costs == NULL)
-      {
-         png_ptr->filter_costs = (png_uint_16p)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
-
-         png_ptr->inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,
-             (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
-      }
-
-      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
-      {
-         png_ptr->inv_filter_costs[i] =
-         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
-      }
-
-      /* All the arrays are inited, safe to set this: */
-      png_ptr->heuristic_method = PNG_FILTER_HEURISTIC_WEIGHTED;
-
-      /* Return the 'ok' code. */
-      return 1;
-   }
-   else if (heuristic_method == PNG_FILTER_HEURISTIC_DEFAULT ||
-      heuristic_method == PNG_FILTER_HEURISTIC_UNWEIGHTED)
-   {
-      return 1;
-   }
-   else
-   {
-      png_warning(png_ptr, "Unknown filter heuristic method");
-      return 0;
-   }
-}
-
-/* Provide floating and fixed point APIs */
-#ifdef PNG_FLOATING_POINT_SUPPORTED
-void PNGAPI
-png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
-    int num_weights, png_const_doublep filter_weights,
-    png_const_doublep filter_costs)
-{
-   png_debug(1, "in png_set_filter_heuristics");
-
-   /* The internal API allocates all the arrays and ensures that the elements of
-    * those arrays are set to the default value.
-    */
-   if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))
-      return;
-
-   /* If using the weighted method copy in the weights. */
-   if (heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-   {
-      int i;
-      for (i = 0; i < num_weights; i++)
-      {
-         if (filter_weights[i] <= 0.0)
-         {
-            png_ptr->inv_filter_weights[i] =
-            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
-         }
-
-         else
-         {
-            png_ptr->inv_filter_weights[i] =
-                (png_uint_16)(PNG_WEIGHT_FACTOR*filter_weights[i]+.5);
-
-            png_ptr->filter_weights[i] =
-                (png_uint_16)(PNG_WEIGHT_FACTOR/filter_weights[i]+.5);
-         }
-      }
-
-      /* Here is where we set the relative costs of the different filters.  We
-       * should take the desired compression level into account when setting
-       * the costs, so that Paeth, for instance, has a high relative cost at low
-       * compression levels, while it has a lower relative cost at higher
-       * compression settings.  The filter types are in order of increasing
-       * relative cost, so it would be possible to do this with an algorithm.
-       */
-      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++) if (filter_costs[i] >= 1.0)
-      {
-         png_ptr->inv_filter_costs[i] =
-             (png_uint_16)(PNG_COST_FACTOR / filter_costs[i] + .5);
-
-         png_ptr->filter_costs[i] =
-             (png_uint_16)(PNG_COST_FACTOR * filter_costs[i] + .5);
-      }
-   }
-}
-#endif /* FLOATING_POINT */
-
-#ifdef PNG_FIXED_POINT_SUPPORTED
-void PNGAPI
-png_set_filter_heuristics_fixed(png_structp png_ptr, int heuristic_method,
-    int num_weights, png_const_fixed_point_p filter_weights,
-    png_const_fixed_point_p filter_costs)
-{
-   png_debug(1, "in png_set_filter_heuristics_fixed");
-
-   /* The internal API allocates all the arrays and ensures that the elements of
-    * those arrays are set to the default value.
-    */
-   if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))
-      return;
-
-   /* If using the weighted method copy in the weights. */
-   if (heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-   {
-      int i;
-      for (i = 0; i < num_weights; i++)
-      {
-         if (filter_weights[i] <= 0)
-         {
-            png_ptr->inv_filter_weights[i] =
-            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
-         }
-
-         else
-         {
-            png_ptr->inv_filter_weights[i] = (png_uint_16)
-               ((PNG_WEIGHT_FACTOR*filter_weights[i]+PNG_FP_HALF)/PNG_FP_1);
-
-            png_ptr->filter_weights[i] = (png_uint_16)((PNG_WEIGHT_FACTOR*
-               PNG_FP_1+(filter_weights[i]/2))/filter_weights[i]);
-         }
-      }
-
-      /* Here is where we set the relative costs of the different filters.  We
-       * should take the desired compression level into account when setting
-       * the costs, so that Paeth, for instance, has a high relative cost at low
-       * compression levels, while it has a lower relative cost at higher
-       * compression settings.  The filter types are in order of increasing
-       * relative cost, so it would be possible to do this with an algorithm.
-       */
-      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
-         if (filter_costs[i] >= PNG_FP_1)
-      {
-         png_uint_32 tmp;
-
-         /* Use a 32 bit unsigned temporary here because otherwise the
-          * intermediate value will be a 32 bit *signed* integer (ANSI rules)
-          * and this will get the wrong answer on division.
-          */
-         tmp = PNG_COST_FACTOR*PNG_FP_1 + (filter_costs[i]/2);
-         tmp /= filter_costs[i];
-
-         png_ptr->inv_filter_costs[i] = (png_uint_16)tmp;
-
-         tmp = PNG_COST_FACTOR * filter_costs[i] + PNG_FP_HALF;
-         tmp /= PNG_FP_1;
-
-         png_ptr->filter_costs[i] = (png_uint_16)tmp;
-      }
-   }
-}
-#endif /* FIXED_POINT */
-#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
-
-void PNGAPI
-png_set_compression_level(png_structp png_ptr, int level)
-{
-   png_debug(1, "in png_set_compression_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
-   png_ptr->zlib_level = level;
-}
-
-void PNGAPI
-png_set_compression_mem_level(png_structp png_ptr, int mem_level)
-{
-   png_debug(1, "in png_set_compression_mem_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
-   png_ptr->zlib_mem_level = mem_level;
-}
-
-void PNGAPI
-png_set_compression_strategy(png_structp png_ptr, int strategy)
-{
-   png_debug(1, "in png_set_compression_strategy");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
-   png_ptr->zlib_strategy = strategy;
-}
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-void PNGAPI
-png_set_compression_window_bits(png_structp png_ptr, int window_bits)
-{
-   if (png_ptr == NULL)
-      return;
-
-   if (window_bits > 15)
-      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
-
-   else if (window_bits < 8)
-      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
-
-#ifndef WBITS_8_OK
-   /* Avoid libpng bug with 256-byte windows */
-   if (window_bits == 8)
-      {
-        png_warning(png_ptr, "Compression window is being reset to 512");
-        window_bits = 9;
-      }
-
-#endif
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;
-   png_ptr->zlib_window_bits = window_bits;
-}
-
-void PNGAPI
-png_set_compression_method(png_structp png_ptr, int method)
-{
-   png_debug(1, "in png_set_compression_method");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (method != 8)
-      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
-
-   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
-   png_ptr->zlib_method = method;
-}
-
-/* The following were added to libpng-1.5.4 */
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-void PNGAPI
-png_set_text_compression_level(png_structp png_ptr, int level)
-{
-   png_debug(1, "in png_set_text_compression_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_LEVEL;
-   png_ptr->zlib_text_level = level;
-}
-
-void PNGAPI
-png_set_text_compression_mem_level(png_structp png_ptr, int mem_level)
-{
-   png_debug(1, "in png_set_text_compression_mem_level");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_MEM_LEVEL;
-   png_ptr->zlib_text_mem_level = mem_level;
-}
-
-void PNGAPI
-png_set_text_compression_strategy(png_structp png_ptr, int strategy)
-{
-   png_debug(1, "in png_set_text_compression_strategy");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_STRATEGY;
-   png_ptr->zlib_text_strategy = strategy;
-}
-
-/* If PNG_WRITE_OPTIMIZE_CMF_SUPPORTED is defined, libpng will use a
- * smaller value of window_bits if it can do so safely.
- */
-void PNGAPI
-png_set_text_compression_window_bits(png_structp png_ptr, int window_bits)
-{
-   if (png_ptr == NULL)
-      return;
-
-   if (window_bits > 15)
-      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
-
-   else if (window_bits < 8)
-      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
-
-#ifndef WBITS_8_OK
-   /* Avoid libpng bug with 256-byte windows */
-   if (window_bits == 8)
-      {
-        png_warning(png_ptr, "Text compression window is being reset to 512");
-        window_bits = 9;
-      }
-
-#endif
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_WINDOW_BITS;
-   png_ptr->zlib_text_window_bits = window_bits;
-}
-
-void PNGAPI
-png_set_text_compression_method(png_structp png_ptr, int method)
-{
-   png_debug(1, "in png_set_text_compression_method");
-
-   if (png_ptr == NULL)
-      return;
-
-   if (method != 8)
-      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
-
-   png_ptr->flags |= PNG_FLAG_ZTXT_CUSTOM_METHOD;
-   png_ptr->zlib_text_method = method;
-}
-#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
-/* end of API added to libpng-1.5.4 */
-
-void PNGAPI
-png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
-{
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->write_row_fn = write_row_fn;
-}
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-void PNGAPI
-png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
-    write_user_transform_fn)
-{
-   png_debug(1, "in png_set_write_user_transform_fn");
-
-   if (png_ptr == NULL)
-      return;
-
-   png_ptr->transformations |= PNG_USER_TRANSFORM;
-   png_ptr->write_user_transform_fn = write_user_transform_fn;
-}
-#endif
-
-
-#ifdef PNG_INFO_IMAGE_SUPPORTED
-void PNGAPI
-png_write_png(png_structp png_ptr, png_infop info_ptr,
-    int transforms, voidp params)
-{
-   if (png_ptr == NULL || info_ptr == NULL)
-      return;
-
-   /* Write the file header information. */
-   png_write_info(png_ptr, info_ptr);
-
-   /* ------ these transformations don't touch the info structure ------- */
-
-#ifdef PNG_WRITE_INVERT_SUPPORTED
-   /* Invert monochrome pixels */
-   if (transforms & PNG_TRANSFORM_INVERT_MONO)
-      png_set_invert_mono(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-   /* Shift the pixels up to a legal bit depth and fill in
-    * as appropriate to correctly scale the image.
-    */
-   if ((transforms & PNG_TRANSFORM_SHIFT)
-       && (info_ptr->valid & PNG_INFO_sBIT))
-      png_set_shift(png_ptr, &info_ptr->sig_bit);
-#endif
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-   /* Pack pixels into bytes */
-   if (transforms & PNG_TRANSFORM_PACKING)
-       png_set_packing(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-   /* Swap location of alpha bytes from ARGB to RGBA */
-   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
-      png_set_swap_alpha(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_FILLER_SUPPORTED
-   /* Pack XRGB/RGBX/ARGB/RGBA into RGB (4 channels -> 3 channels) */
-   if (transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER)
-      png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
-
-   else if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE)
-      png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
-#endif
-
-#ifdef PNG_WRITE_BGR_SUPPORTED
-   /* Flip BGR pixels to RGB */
-   if (transforms & PNG_TRANSFORM_BGR)
-      png_set_bgr(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_SWAP_SUPPORTED
-   /* Swap bytes of 16-bit files to most significant byte first */
-   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
-      png_set_swap(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-   /* Swap bits of 1, 2, 4 bit packed pixel formats */
-   if (transforms & PNG_TRANSFORM_PACKSWAP)
-      png_set_packswap(png_ptr);
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-   /* Invert the alpha channel from opacity to transparency */
-   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
-      png_set_invert_alpha(png_ptr);
-#endif
-
-   /* ----------------------- end of transformations ------------------- */
-
-   /* Write the bits */
-   if (info_ptr->valid & PNG_INFO_IDAT)
-       png_write_image(png_ptr, info_ptr->row_pointers);
-
-   /* It is REQUIRED to call this to finish writing the rest of the file */
-   png_write_end(png_ptr, info_ptr);
-
-   PNG_UNUSED(transforms)   /* Quiet compiler warnings */
-   PNG_UNUSED(params)
-}
-#endif
-#endif /* PNG_WRITE_SUPPORTED */
+
+/* pngwrite.c - general routines to write a PNG file
+ *
+ * libpng 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+/* get internal access to png.h */
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Writes all the PNG information.  This is the suggested way to use the
+ * library.  If you have a new chunk to add, make a function to write it,
+ * and put it in the correct location here.  If you want the chunk written
+ * after the image data, put it in png_write_end().  I strongly encourage
+ * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing
+ * the chunk, as that will keep the code from breaking if you want to just
+ * write a plain PNG file.  If you have long comments, I suggest writing
+ * them in png_write_end(), and compressing them.
+ */
+void PNGAPI
+png_write_info_before_PLTE(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_write_info_before_PLTE\n");
+   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+   {
+   png_write_sig(png_ptr); /* write PNG signature */
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   if((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE)&&(png_ptr->mng_features_permitted))
+   {
+      png_warning(png_ptr,"MNG features are not allowed in a PNG datastream\n");
+      png_ptr->mng_features_permitted=0;
+   }
+#endif
+   /* write IHDR information. */
+   png_write_IHDR(png_ptr, info_ptr->width, info_ptr->height,
+      info_ptr->bit_depth, info_ptr->color_type, info_ptr->compression_type,
+      info_ptr->filter_type,
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+      info_ptr->interlace_type);
+#else
+      0);
+#endif
+   /* the rest of these check to see if the valid field has the appropriate
+      flag set, and if it does, writes the chunk. */
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_gAMA)
+   {
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+      png_write_gAMA(png_ptr, info_ptr->gamma);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_gAMA_fixed(png_ptr, info_ptr->int_gamma);
+#  endif
+#endif
+   }
+#endif
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sRGB)
+      png_write_sRGB(png_ptr, (int)info_ptr->srgb_intent);
+#endif
+#if defined(PNG_WRITE_iCCP_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_iCCP)
+      png_write_iCCP(png_ptr, info_ptr->iccp_name, PNG_COMPRESSION_TYPE_BASE,
+                     info_ptr->iccp_profile, (int)info_ptr->iccp_proflen);
+#endif
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sBIT)
+      png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
+#endif
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_cHRM)
+   {
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+      png_write_cHRM(png_ptr,
+         info_ptr->x_white, info_ptr->y_white,
+         info_ptr->x_red, info_ptr->y_red,
+         info_ptr->x_green, info_ptr->y_green,
+         info_ptr->x_blue, info_ptr->y_blue);
+#else
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_cHRM_fixed(png_ptr,
+         info_ptr->int_x_white, info_ptr->int_y_white,
+         info_ptr->int_x_red, info_ptr->int_y_red,
+         info_ptr->int_x_green, info_ptr->int_y_green,
+         info_ptr->int_x_blue, info_ptr->int_y_blue);
+#  endif
+#endif
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   if (info_ptr->unknown_chunks_num)
+   {
+       png_unknown_chunk *up;
+
+       png_debug(5, "writing extra chunks\n");
+
+       for (up = info_ptr->unknown_chunks;
+            up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+            up++)
+       {
+         int keep=png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && !(up->location & PNG_HAVE_PLTE) &&
+            !(up->location & PNG_HAVE_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+       }
+   }
+#endif
+      png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
+   }
+}
+
+void PNGAPI
+png_write_info(png_structp png_ptr, png_infop info_ptr)
+{
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+   int i;
+#endif
+
+   png_debug(1, "in png_write_info\n");
+
+   png_write_info_before_PLTE(png_ptr, info_ptr);
+
+   if (info_ptr->valid & PNG_INFO_PLTE)
+      png_write_PLTE(png_ptr, info_ptr->palette,
+         (png_uint_32)info_ptr->num_palette);
+   else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      png_error(png_ptr, "Valid palette required for paletted images\n");
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_tRNS)
+      {
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+         /* invert the alpha channel (in tRNS) */
+         if ((png_ptr->transformations & PNG_INVERT_ALPHA) &&
+            info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+         {
+            int j;
+            for (j=0; j<(int)info_ptr->num_trans; j++)
+               info_ptr->trans[j] = (png_byte)(255 - info_ptr->trans[j]);
+         }
+#endif
+      png_write_tRNS(png_ptr, info_ptr->trans, &(info_ptr->trans_values),
+         info_ptr->num_trans, info_ptr->color_type);
+      }
+#endif
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_bKGD)
+      png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
+#endif
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_hIST)
+      png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
+#endif
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_oFFs)
+      png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
+         info_ptr->offset_unit_type);
+#endif
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pCAL)
+      png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
+         info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
+         info_ptr->pcal_units, info_ptr->pcal_params);
+#endif
+#if defined(PNG_WRITE_sCAL_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sCAL)
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+      png_write_sCAL(png_ptr, (int)info_ptr->scal_unit,
+          info_ptr->scal_pixel_width, info_ptr->scal_pixel_height);
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+      png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
+          info_ptr->scal_s_width, info_ptr->scal_s_height);
+#else
+      png_warning(png_ptr,
+          "png_write_sCAL not supported; sCAL chunk not written.\n");
+#endif
+#endif
+#endif
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_pHYs)
+      png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
+         info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
+#endif
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_tIME)
+   {
+      png_write_tIME(png_ptr, &(info_ptr->mod_time));
+      png_ptr->mode |= PNG_WROTE_tIME;
+   }
+#endif
+#if defined(PNG_WRITE_sPLT_SUPPORTED)
+   if (info_ptr->valid & PNG_INFO_sPLT)
+     for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
+       png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
+#endif
+#if defined(PNG_WRITE_TEXT_SUPPORTED)
+   /* Check to see if we need to write text chunks */
+   for (i = 0; i < info_ptr->num_text; i++)
+   {
+      png_debug2(2, "Writing header text chunk %d, type %d\n", i,
+         info_ptr->text[i].compression);
+      /* an internationalized chunk? */
+      if (info_ptr->text[i].compression > 0)
+      {
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+          /* write international chunk */
+          png_write_iTXt(png_ptr,
+                         info_ptr->text[i].compression,
+                         info_ptr->text[i].key,
+                         info_ptr->text[i].lang,
+                         info_ptr->text[i].lang_key,
+                         info_ptr->text[i].text);
+#else
+          png_warning(png_ptr, "Unable to write international text\n");
+#endif
+          /* Mark this chunk as written */
+          info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+      }
+      /* If we want a compressed text chunk */
+      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_zTXt)
+      {
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+         /* write compressed chunk */
+         png_write_zTXt(png_ptr, info_ptr->text[i].key,
+            info_ptr->text[i].text, 0,
+            info_ptr->text[i].compression);
+#else
+         png_warning(png_ptr, "Unable to write compressed text\n");
+#endif
+         /* Mark this chunk as written */
+         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+      }
+      else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+      {
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+         /* write uncompressed chunk */
+         png_write_tEXt(png_ptr, info_ptr->text[i].key,
+                         info_ptr->text[i].text,
+                         0);
+#else
+         png_warning(png_ptr, "Unable to write uncompressed text\n");
+#endif
+         /* Mark this chunk as written */
+         info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   if (info_ptr->unknown_chunks_num)
+   {
+       png_unknown_chunk *up;
+
+       png_debug(5, "writing extra chunks\n");
+
+       for (up = info_ptr->unknown_chunks;
+            up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+            up++)
+       {
+         int keep=png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && (up->location & PNG_HAVE_PLTE) &&
+            !(up->location & PNG_HAVE_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+       }
+   }
+#endif
+}
+
+/* Writes the end of the PNG file.  If you don't want to write comments or
+ * time information, you can pass NULL for info.  If you already wrote these
+ * in png_write_info(), do not write them again here.  If you have long
+ * comments, I suggest writing them here, and compressing them.
+ */
+void PNGAPI
+png_write_end(png_structp png_ptr, png_infop info_ptr)
+{
+   png_debug(1, "in png_write_end\n");
+   if (!(png_ptr->mode & PNG_HAVE_IDAT))
+      png_error(png_ptr, "No IDATs written into file");
+
+   /* see if user wants us to write information chunks */
+   if (info_ptr != NULL)
+   {
+#if defined(PNG_WRITE_TEXT_SUPPORTED)
+      int i; /* local index variable */
+#endif
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+      /* check to see if user has supplied a time chunk */
+      if ((info_ptr->valid & PNG_INFO_tIME) &&
+         !(png_ptr->mode & PNG_WROTE_tIME))
+         png_write_tIME(png_ptr, &(info_ptr->mod_time));
+#endif
+#if defined(PNG_WRITE_TEXT_SUPPORTED)
+      /* loop through comment chunks */
+      for (i = 0; i < info_ptr->num_text; i++)
+      {
+         png_debug2(2, "Writing trailer text chunk %d, type %d\n", i,
+            info_ptr->text[i].compression);
+         /* an internationalized chunk? */
+         if (info_ptr->text[i].compression > 0)
+         {
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+             /* write international chunk */
+             png_write_iTXt(png_ptr,
+                         info_ptr->text[i].compression,
+                         info_ptr->text[i].key,
+                         info_ptr->text[i].lang,
+                         info_ptr->text[i].lang_key,
+                         info_ptr->text[i].text);
+#else
+             png_warning(png_ptr, "Unable to write international text\n");
+#endif
+             /* Mark this chunk as written */
+             info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+         }
+         else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt)
+         {
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+            /* write compressed chunk */
+            png_write_zTXt(png_ptr, info_ptr->text[i].key,
+               info_ptr->text[i].text, 0,
+               info_ptr->text[i].compression);
+#else
+            png_warning(png_ptr, "Unable to write compressed text\n");
+#endif
+            /* Mark this chunk as written */
+            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR;
+         }
+         else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE)
+         {
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+            /* write uncompressed chunk */
+            png_write_tEXt(png_ptr, info_ptr->text[i].key,
+               info_ptr->text[i].text, 0);
+#else
+            png_warning(png_ptr, "Unable to write uncompressed text\n");
+#endif
+
+            /* Mark this chunk as written */
+            info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR;
+         }
+      }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   if (info_ptr->unknown_chunks_num)
+   {
+       png_unknown_chunk *up;
+
+       png_debug(5, "writing extra chunks\n");
+
+       for (up = info_ptr->unknown_chunks;
+            up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
+            up++)
+       {
+         int keep=png_handle_as_unknown(png_ptr, up->name);
+         if (keep != PNG_HANDLE_CHUNK_NEVER &&
+            up->location && (up->location & PNG_AFTER_IDAT) &&
+            ((up->name[3] & 0x20) || keep == PNG_HANDLE_CHUNK_ALWAYS ||
+            (png_ptr->flags & PNG_FLAG_KEEP_UNSAFE_CHUNKS)))
+         {
+            png_write_chunk(png_ptr, up->name, up->data, up->size);
+         }
+       }
+   }
+#endif
+   }
+
+   png_ptr->mode |= PNG_AFTER_IDAT;
+
+   /* write end of PNG file */
+   png_write_IEND(png_ptr);
+#if 0
+/* This flush, added in libpng-1.0.8,  causes some applications to crash
+   because they do not set png_ptr->output_flush_fn */
+   png_flush(png_ptr);
+#endif
+}
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+#if !defined(_WIN32_WCE)
+/* "time.h" functions are not supported on WindowsCE */
+void PNGAPI
+png_convert_from_struct_tm(png_timep ptime, struct tm FAR * ttime)
+{
+   png_debug(1, "in png_convert_from_struct_tm\n");
+   ptime->year = (png_uint_16)(1900 + ttime->tm_year);
+   ptime->month = (png_byte)(ttime->tm_mon + 1);
+   ptime->day = (png_byte)ttime->tm_mday;
+   ptime->hour = (png_byte)ttime->tm_hour;
+   ptime->minute = (png_byte)ttime->tm_min;
+   ptime->second = (png_byte)ttime->tm_sec;
+}
+
+void PNGAPI
+png_convert_from_time_t(png_timep ptime, time_t ttime)
+{
+   struct tm *tbuf;
+
+   png_debug(1, "in png_convert_from_time_t\n");
+   tbuf = gmtime(&ttime);
+   png_convert_from_struct_tm(ptime, tbuf);
+}
+#endif
+#endif
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+png_structp PNGAPI
+png_create_write_struct(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn)
+{
+#ifdef PNG_USER_MEM_SUPPORTED
+   return (png_create_write_struct_2(user_png_ver, error_ptr, error_fn,
+      warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
+}
+
+/* Alternate initialize png_ptr structure, and allocate any memory needed */
+png_structp PNGAPI
+png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
+   png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr,
+   png_malloc_ptr malloc_fn, png_free_ptr free_fn)
+{
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_structp png_ptr;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   jmp_buf jmpbuf;
+#endif
+#endif
+   int i;
+   png_debug(1, "in png_create_write_struct\n");
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
+      (png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
+#else
+   png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+#endif /* PNG_USER_MEM_SUPPORTED */
+   if (png_ptr == NULL)
+      return (NULL);
+
+#if !defined(PNG_1_0_X)
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+   png_init_mmx_flags(png_ptr);   /* 1.2.0 addition */
+#endif
+#endif /* PNG_1_0_X */
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+#else
+   if (setjmp(png_ptr->jmpbuf))
+#endif
+   {
+      png_free(png_ptr, png_ptr->zbuf);
+      png_ptr->zbuf=NULL;
+      png_destroy_struct(png_ptr);
+      return (NULL);
+   }
+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_ptr->jmpbuf,jmpbuf,png_sizeof(jmp_buf));
+#endif
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif /* PNG_USER_MEM_SUPPORTED */
+   png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+
+   i=0;
+   do
+   {
+     if(user_png_ver[i] != png_libpng_ver[i])
+        png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+   } while (png_libpng_ver[i++]);
+
+   if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+   {
+     /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+      * we must recompile any applications that use any older library version.
+      * For versions after libpng 1.0, we will be compatible, so we need
+      * only check the first digit.
+      */
+     if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+         (user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
+         (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+     {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+        char msg[80];
+        if (user_png_ver)
+        {
+          sprintf(msg, "Application was compiled with png.h from libpng-%.20s",
+             user_png_ver);
+          png_warning(png_ptr, msg);
+        }
+        sprintf(msg, "Application  is  running with png.c from libpng-%.20s",
+           png_libpng_ver);
+        png_warning(png_ptr, msg);
+#endif
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+        png_ptr->flags=0;
+#endif
+        png_error(png_ptr,
+           "Incompatible libpng version in application and library");
+     }
+   }
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+      (png_uint_32)png_ptr->zbuf_size);
+
+   png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+      png_flush_ptr_NULL);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+      1, png_doublep_NULL, png_doublep_NULL);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+/* Applications that neglect to set up their own setjmp() and then encounter
+   a png_error() will longjmp here.  Since the jmpbuf is then meaningless we
+   abort instead of returning. */
+#ifdef USE_FAR_KEYWORD
+   if (setjmp(jmpbuf))
+      PNG_ABORT();
+   png_memcpy(png_ptr->jmpbuf,jmpbuf,png_sizeof(jmp_buf));
+#else
+   if (setjmp(png_ptr->jmpbuf))
+      PNG_ABORT();
+#endif
+#endif
+   return (png_ptr);
+}
+
+/* Initialize png_ptr structure, and allocate any memory needed */
+#undef png_write_init
+void PNGAPI
+png_write_init(png_structp png_ptr)
+{
+   /* We only come here via pre-1.0.7-compiled applications */
+   png_write_init_2(png_ptr, "1.0.6 or earlier", 0, 0);
+}
+
+void PNGAPI
+png_write_init_2(png_structp png_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size, png_size_t png_info_size)
+{
+   /* We only come here via pre-1.0.12-compiled applications */
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+   if(png_sizeof(png_struct) > png_struct_size ||
+      png_sizeof(png_info) > png_info_size)
+   {
+      char msg[80];
+      png_ptr->warning_fn=NULL;
+      if (user_png_ver)
+      {
+        sprintf(msg, "Application was compiled with png.h from libpng-%.20s",
+           user_png_ver);
+        png_warning(png_ptr, msg);
+      }
+      sprintf(msg, "Application  is  running with png.c from libpng-%.20s",
+         png_libpng_ver);
+      png_warning(png_ptr, msg);
+   }
+#endif
+   if(png_sizeof(png_struct) > png_struct_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+       "The png struct allocated by the application for writing is too small.");
+     }
+   if(png_sizeof(png_info) > png_info_size)
+     {
+       png_ptr->error_fn=NULL;
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+       png_ptr->flags=0;
+#endif
+       png_error(png_ptr,
+       "The info struct allocated by the application for writing is too small.");
+     }
+   png_write_init_3(&png_ptr, user_png_ver, png_struct_size);
+}
+
+
+void PNGAPI
+png_write_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
+   png_size_t png_struct_size)
+{
+   png_structp png_ptr=*ptr_ptr;
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp; /* to save current jump buffer */
+#endif
+   int i = 0;
+   do
+   {
+     if (user_png_ver[i] != png_libpng_ver[i])
+     {
+#ifdef PNG_LEGACY_SUPPORTED
+       png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+#else
+       png_ptr->warning_fn=NULL;
+       png_warning(png_ptr,
+     "Application uses deprecated png_write_init() and should be recompiled.");
+       break;
+#endif
+     }
+   } while (png_libpng_ver[i++]);
+
+   png_debug(1, "in png_write_init_3\n");
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* save jump buffer and error functions */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof (jmp_buf));
+#endif
+
+   if (png_sizeof(png_struct) > png_struct_size)
+     {
+       png_destroy_struct(png_ptr);
+       png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
+       *ptr_ptr = png_ptr;
+     }
+
+   /* reset all variables to 0 */
+   png_memset(png_ptr, 0, png_sizeof (png_struct));
+
+   /* added at libpng-1.2.6 */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+   png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+   png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+#endif
+
+#if !defined(PNG_1_0_X)
+#ifdef PNG_ASSEMBLER_CODE_SUPPORTED
+   png_init_mmx_flags(png_ptr);   /* 1.2.0 addition */
+#endif
+#endif /* PNG_1_0_X */
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* restore jump buffer */
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof (jmp_buf));
+#endif
+
+   png_set_write_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL,
+      png_flush_ptr_NULL);
+
+   /* initialize zbuf - compression buffer */
+   png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+   png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
+      (png_uint_32)png_ptr->zbuf_size);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_set_filter_heuristics(png_ptr, PNG_FILTER_HEURISTIC_DEFAULT,
+      1, png_doublep_NULL, png_doublep_NULL);
+#endif
+}
+
+/* Write a few rows of image data.  If the image is interlaced,
+ * either you will have to write the 7 sub images, or, if you
+ * have called png_set_interlace_handling(), you will have to
+ * "write" the image seven times.
+ */
+void PNGAPI
+png_write_rows(png_structp png_ptr, png_bytepp row,
+   png_uint_32 num_rows)
+{
+   png_uint_32 i; /* row counter */
+   png_bytepp rp; /* row pointer */
+
+   png_debug(1, "in png_write_rows\n");
+   /* loop through the rows */
+   for (i = 0, rp = row; i < num_rows; i++, rp++)
+   {
+      png_write_row(png_ptr, *rp);
+   }
+}
+
+/* Write the image.  You only need to call this function once, even
+ * if you are writing an interlaced image.
+ */
+void PNGAPI
+png_write_image(png_structp png_ptr, png_bytepp image)
+{
+   png_uint_32 i; /* row index */
+   int pass, num_pass; /* pass variables */
+   png_bytepp rp; /* points to current row */
+
+   png_debug(1, "in png_write_image\n");
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   /* intialize interlace handling.  If image is not interlaced,
+      this will set pass to 1 */
+   num_pass = png_set_interlace_handling(png_ptr);
+#else
+   num_pass = 1;
+#endif
+   /* loop through passes */
+   for (pass = 0; pass < num_pass; pass++)
+   {
+      /* loop through image */
+      for (i = 0, rp = image; i < png_ptr->height; i++, rp++)
+      {
+         png_write_row(png_ptr, *rp);
+      }
+   }
+}
+
+/* called by user to write a row of image data */
+void PNGAPI
+png_write_row(png_structp png_ptr, png_bytep row)
+{
+   png_debug2(1, "in png_write_row (row %ld, pass %d)\n",
+      png_ptr->row_number, png_ptr->pass);
+   /* initialize transformations and other stuff if first time */
+   if (png_ptr->row_number == 0 && png_ptr->pass == 0)
+   {
+   /* make sure we wrote the header info */
+   if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+      png_error(png_ptr,
+         "png_write_info was never called before png_write_row.");
+
+   /* check for transforms that have been set but were defined out */
+#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && defined(PNG_READ_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_warning(png_ptr, "PNG_WRITE_PACKSWAP_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined.");
+#endif
+#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined.");
+#endif
+
+      png_write_start_row(png_ptr);
+   }
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   /* if interlaced and not interested in row, return */
+   if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+   {
+      switch (png_ptr->pass)
+      {
+         case 0:
+            if (png_ptr->row_number & 0x07)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 1:
+            if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 2:
+            if ((png_ptr->row_number & 0x07) != 4)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 3:
+            if ((png_ptr->row_number & 0x03) || png_ptr->width < 3)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 4:
+            if ((png_ptr->row_number & 0x03) != 2)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 5:
+            if ((png_ptr->row_number & 0x01) || png_ptr->width < 2)
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+         case 6:
+            if (!(png_ptr->row_number & 0x01))
+            {
+               png_write_finish_row(png_ptr);
+               return;
+            }
+            break;
+      }
+   }
+#endif
+
+   /* set up row info for transformations */
+   png_ptr->row_info.color_type = png_ptr->color_type;
+   png_ptr->row_info.width = png_ptr->usr_width;
+   png_ptr->row_info.channels = png_ptr->usr_channels;
+   png_ptr->row_info.bit_depth = png_ptr->usr_bit_depth;
+   png_ptr->row_info.pixel_depth = (png_byte)(png_ptr->row_info.bit_depth *
+      png_ptr->row_info.channels);
+
+   png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth,
+      png_ptr->row_info.width);
+
+   png_debug1(3, "row_info->color_type = %d\n", png_ptr->row_info.color_type);
+   png_debug1(3, "row_info->width = %lu\n", png_ptr->row_info.width);
+   png_debug1(3, "row_info->channels = %d\n", png_ptr->row_info.channels);
+   png_debug1(3, "row_info->bit_depth = %d\n", png_ptr->row_info.bit_depth);
+   png_debug1(3, "row_info->pixel_depth = %d\n", png_ptr->row_info.pixel_depth);
+   png_debug1(3, "row_info->rowbytes = %lu\n", png_ptr->row_info.rowbytes);
+
+   /* Copy user's row into buffer, leaving room for filter byte. */
+   png_memcpy_check(png_ptr, png_ptr->row_buf + 1, row,
+      png_ptr->row_info.rowbytes);
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+   /* handle interlacing */
+   if (png_ptr->interlaced && png_ptr->pass < 6 &&
+      (png_ptr->transformations & PNG_INTERLACE))
+   {
+      png_do_write_interlace(&(png_ptr->row_info),
+         png_ptr->row_buf + 1, png_ptr->pass);
+      /* this should always get caught above, but still ... */
+      if (!(png_ptr->row_info.width))
+      {
+         png_write_finish_row(png_ptr);
+         return;
+      }
+   }
+#endif
+
+   /* handle other transformations */
+   if (png_ptr->transformations)
+      png_do_write_transformations(png_ptr);
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   /* Write filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not write a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
+   {
+      /* Intrapixel differencing */
+      png_do_write_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
+   }
+#endif
+
+   /* Find a filter if necessary, filter the row and write it out. */
+   png_write_find_filter(png_ptr, &(png_ptr->row_info));
+
+   if (png_ptr->write_row_fn != NULL)
+      (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
+}
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+/* Set the automatic flush interval or 0 to turn flushing off */
+void PNGAPI
+png_set_flush(png_structp png_ptr, int nrows)
+{
+   png_debug(1, "in png_set_flush\n");
+   png_ptr->flush_dist = (nrows < 0 ? 0 : nrows);
+}
+
+/* flush the current output buffers now */
+void PNGAPI
+png_write_flush(png_structp png_ptr)
+{
+   int wrote_IDAT;
+
+   png_debug(1, "in png_write_flush\n");
+   /* We have already written out all of the data */
+   if (png_ptr->row_number >= png_ptr->num_rows)
+     return;
+
+   do
+   {
+      int ret;
+
+      /* compress the data */
+      ret = deflate(&png_ptr->zstream, Z_SYNC_FLUSH);
+      wrote_IDAT = 0;
+
+      /* check for compression errors */
+      if (ret != Z_OK)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* write the IDAT and reset the zlib output buffer */
+         png_write_IDAT(png_ptr, png_ptr->zbuf,
+                        png_ptr->zbuf_size);
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         wrote_IDAT = 1;
+      }
+   } while(wrote_IDAT == 1);
+
+   /* If there is any data left to be output, write it into a new IDAT */
+   if (png_ptr->zbuf_size != png_ptr->zstream.avail_out)
+   {
+      /* write the IDAT and reset the zlib output buffer */
+      png_write_IDAT(png_ptr, png_ptr->zbuf,
+                     png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+      png_ptr->zstream.next_out = png_ptr->zbuf;
+      png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   }
+   png_ptr->flush_rows = 0;
+   png_flush(png_ptr);
+}
+#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+
+/* free all memory used by the write */
+void PNGAPI
+png_destroy_write_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr)
+{
+   png_structp png_ptr = NULL;
+   png_infop info_ptr = NULL;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn = NULL;
+   png_voidp mem_ptr = NULL;
+#endif
+
+   png_debug(1, "in png_destroy_write_struct\n");
+   if (png_ptr_ptr != NULL)
+   {
+      png_ptr = *png_ptr_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+      free_fn = png_ptr->free_fn;
+      mem_ptr = png_ptr->mem_ptr;
+#endif
+   }
+
+   if (info_ptr_ptr != NULL)
+      info_ptr = *info_ptr_ptr;
+
+   if (info_ptr != NULL)
+   {
+      png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1);
+
+#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+      if (png_ptr->num_chunk_list)
+      {
+         png_free(png_ptr, png_ptr->chunk_list);
+         png_ptr->chunk_list=NULL;
+         png_ptr->num_chunk_list=0;
+      }
+#endif
+
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)info_ptr);
+#endif
+      *info_ptr_ptr = NULL;
+   }
+
+   if (png_ptr != NULL)
+   {
+      png_write_destroy(png_ptr);
+#ifdef PNG_USER_MEM_SUPPORTED
+      png_destroy_struct_2((png_voidp)png_ptr, (png_free_ptr)free_fn,
+         (png_voidp)mem_ptr);
+#else
+      png_destroy_struct((png_voidp)png_ptr);
+#endif
+      *png_ptr_ptr = NULL;
+   }
+}
+
+
+/* Free any memory used in png_ptr struct (old method) */
+void /* PRIVATE */
+png_write_destroy(png_structp png_ptr)
+{
+#ifdef PNG_SETJMP_SUPPORTED
+   jmp_buf tmp_jmp; /* save jump buffer */
+#endif
+   png_error_ptr error_fn;
+   png_error_ptr warning_fn;
+   png_voidp error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_free_ptr free_fn;
+#endif
+
+   png_debug(1, "in png_write_destroy\n");
+   /* free any memory zlib uses */
+   deflateEnd(&png_ptr->zstream);
+
+   /* free our memory.  png_free checks NULL for us. */
+   png_free(png_ptr, png_ptr->zbuf);
+   png_free(png_ptr, png_ptr->row_buf);
+   png_free(png_ptr, png_ptr->prev_row);
+   png_free(png_ptr, png_ptr->sub_row);
+   png_free(png_ptr, png_ptr->up_row);
+   png_free(png_ptr, png_ptr->avg_row);
+   png_free(png_ptr, png_ptr->paeth_row);
+
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+   png_free(png_ptr, png_ptr->time_buffer);
+#endif
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   png_free(png_ptr, png_ptr->prev_filters);
+   png_free(png_ptr, png_ptr->filter_weights);
+   png_free(png_ptr, png_ptr->inv_filter_weights);
+   png_free(png_ptr, png_ptr->filter_costs);
+   png_free(png_ptr, png_ptr->inv_filter_costs);
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   /* reset structure */
+   png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof (jmp_buf));
+#endif
+
+   error_fn = png_ptr->error_fn;
+   warning_fn = png_ptr->warning_fn;
+   error_ptr = png_ptr->error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   free_fn = png_ptr->free_fn;
+#endif
+
+   png_memset(png_ptr, 0, png_sizeof (png_struct));
+
+   png_ptr->error_fn = error_fn;
+   png_ptr->warning_fn = warning_fn;
+   png_ptr->error_ptr = error_ptr;
+#ifdef PNG_USER_MEM_SUPPORTED
+   png_ptr->free_fn = free_fn;
+#endif
+
+#ifdef PNG_SETJMP_SUPPORTED
+   png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof (jmp_buf));
+#endif
+}
+
+/* Allow the application to select one or more row filters to use. */
+void PNGAPI
+png_set_filter(png_structp png_ptr, int method, int filters)
+{
+   png_debug(1, "in png_set_filter\n");
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   if((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      (method == PNG_INTRAPIXEL_DIFFERENCING))
+         method = PNG_FILTER_TYPE_BASE;
+#endif
+   if (method == PNG_FILTER_TYPE_BASE)
+   {
+      switch (filters & (PNG_ALL_FILTERS | 0x07))
+      {
+         case 5:
+         case 6:
+         case 7: png_warning(png_ptr, "Unknown row filter for method 0");
+         case PNG_FILTER_VALUE_NONE:  png_ptr->do_filter=PNG_FILTER_NONE; break;
+         case PNG_FILTER_VALUE_SUB:   png_ptr->do_filter=PNG_FILTER_SUB;  break;
+         case PNG_FILTER_VALUE_UP:    png_ptr->do_filter=PNG_FILTER_UP;   break;
+         case PNG_FILTER_VALUE_AVG:   png_ptr->do_filter=PNG_FILTER_AVG;  break;
+         case PNG_FILTER_VALUE_PAETH: png_ptr->do_filter=PNG_FILTER_PAETH;break;
+         default: png_ptr->do_filter = (png_byte)filters; break;
+      }
+
+      /* If we have allocated the row_buf, this means we have already started
+       * with the image and we should have allocated all of the filter buffers
+       * that have been selected.  If prev_row isn't already allocated, then
+       * it is too late to start using the filters that need it, since we
+       * will be missing the data in the previous row.  If an application
+       * wants to start and stop using particular filters during compression,
+       * it should start out with all of the filters, and then add and
+       * remove them after the start of compression.
+       */
+      if (png_ptr->row_buf != NULL)
+      {
+         if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
+         {
+            png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+              (png_ptr->rowbytes + 1));
+            png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Up filter after starting");
+               png_ptr->do_filter &= ~PNG_FILTER_UP;
+            }
+            else
+            {
+               png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+            }
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Average filter after starting");
+               png_ptr->do_filter &= ~PNG_FILTER_AVG;
+            }
+            else
+            {
+               png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+            }
+         }
+
+         if ((png_ptr->do_filter & PNG_FILTER_PAETH) &&
+             png_ptr->paeth_row == NULL)
+         {
+            if (png_ptr->prev_row == NULL)
+            {
+               png_warning(png_ptr, "Can't add Paeth filter after starting");
+               png_ptr->do_filter &= (png_byte)(~PNG_FILTER_PAETH);
+            }
+            else
+            {
+               png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
+                  (png_ptr->rowbytes + 1));
+               png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+            }
+         }
+
+         if (png_ptr->do_filter == PNG_NO_FILTERS)
+            png_ptr->do_filter = PNG_FILTER_NONE;
+      }
+   }
+   else
+      png_error(png_ptr, "Unknown custom filter method");
+}
+
+/* This allows us to influence the way in which libpng chooses the "best"
+ * filter for the current scanline.  While the "minimum-sum-of-absolute-
+ * differences metric is relatively fast and effective, there is some
+ * question as to whether it can be improved upon by trying to keep the
+ * filtered data going to zlib more consistent, hopefully resulting in
+ * better compression.
+ */
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)      /* GRR 970116 */
+void PNGAPI
+png_set_filter_heuristics(png_structp png_ptr, int heuristic_method,
+   int num_weights, png_doublep filter_weights,
+   png_doublep filter_costs)
+{
+   int i;
+
+   png_debug(1, "in png_set_filter_heuristics\n");
+   if (heuristic_method >= PNG_FILTER_HEURISTIC_LAST)
+   {
+      png_warning(png_ptr, "Unknown filter heuristic method");
+      return;
+   }
+
+   if (heuristic_method == PNG_FILTER_HEURISTIC_DEFAULT)
+   {
+      heuristic_method = PNG_FILTER_HEURISTIC_UNWEIGHTED;
+   }
+
+   if (num_weights < 0 || filter_weights == NULL ||
+      heuristic_method == PNG_FILTER_HEURISTIC_UNWEIGHTED)
+   {
+      num_weights = 0;
+   }
+
+   png_ptr->num_prev_filters = (png_byte)num_weights;
+   png_ptr->heuristic_method = (png_byte)heuristic_method;
+
+   if (num_weights > 0)
+   {
+      if (png_ptr->prev_filters == NULL)
+      {
+         png_ptr->prev_filters = (png_bytep)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_byte) * num_weights));
+
+         /* To make sure that the weighting starts out fairly */
+         for (i = 0; i < num_weights; i++)
+         {
+            png_ptr->prev_filters[i] = 255;
+         }
+      }
+
+      if (png_ptr->filter_weights == NULL)
+      {
+         png_ptr->filter_weights = (png_uint_16p)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
+
+         png_ptr->inv_filter_weights = (png_uint_16p)png_malloc(png_ptr,
+            (png_uint_32)(png_sizeof(png_uint_16) * num_weights));
+         for (i = 0; i < num_weights; i++)
+         {
+            png_ptr->inv_filter_weights[i] =
+            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+         }
+      }
+
+      for (i = 0; i < num_weights; i++)
+      {
+         if (filter_weights[i] < 0.0)
+         {
+            png_ptr->inv_filter_weights[i] =
+            png_ptr->filter_weights[i] = PNG_WEIGHT_FACTOR;
+         }
+         else
+         {
+            png_ptr->inv_filter_weights[i] =
+               (png_uint_16)((double)PNG_WEIGHT_FACTOR*filter_weights[i]+0.5);
+            png_ptr->filter_weights[i] =
+               (png_uint_16)((double)PNG_WEIGHT_FACTOR/filter_weights[i]+0.5);
+         }
+      }
+   }
+
+   /* If, in the future, there are other filter methods, this would
+    * need to be based on png_ptr->filter.
+    */
+   if (png_ptr->filter_costs == NULL)
+   {
+      png_ptr->filter_costs = (png_uint_16p)png_malloc(png_ptr,
+         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+      png_ptr->inv_filter_costs = (png_uint_16p)png_malloc(png_ptr,
+         (png_uint_32)(png_sizeof(png_uint_16) * PNG_FILTER_VALUE_LAST));
+
+      for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+      {
+         png_ptr->inv_filter_costs[i] =
+         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+      }
+   }
+
+   /* Here is where we set the relative costs of the different filters.  We
+    * should take the desired compression level into account when setting
+    * the costs, so that Paeth, for instance, has a high relative cost at low
+    * compression levels, while it has a lower relative cost at higher
+    * compression settings.  The filter types are in order of increasing
+    * relative cost, so it would be possible to do this with an algorithm.
+    */
+   for (i = 0; i < PNG_FILTER_VALUE_LAST; i++)
+   {
+      if (filter_costs == NULL || filter_costs[i] < 0.0)
+      {
+         png_ptr->inv_filter_costs[i] =
+         png_ptr->filter_costs[i] = PNG_COST_FACTOR;
+      }
+      else if (filter_costs[i] >= 1.0)
+      {
+         png_ptr->inv_filter_costs[i] =
+            (png_uint_16)((double)PNG_COST_FACTOR / filter_costs[i] + 0.5);
+         png_ptr->filter_costs[i] =
+            (png_uint_16)((double)PNG_COST_FACTOR * filter_costs[i] + 0.5);
+      }
+   }
+}
+#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+
+void PNGAPI
+png_set_compression_level(png_structp png_ptr, int level)
+{
+   png_debug(1, "in png_set_compression_level\n");
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_LEVEL;
+   png_ptr->zlib_level = level;
+}
+
+void PNGAPI
+png_set_compression_mem_level(png_structp png_ptr, int mem_level)
+{
+   png_debug(1, "in png_set_compression_mem_level\n");
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL;
+   png_ptr->zlib_mem_level = mem_level;
+}
+
+void PNGAPI
+png_set_compression_strategy(png_structp png_ptr, int strategy)
+{
+   png_debug(1, "in png_set_compression_strategy\n");
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_STRATEGY;
+   png_ptr->zlib_strategy = strategy;
+}
+
+void PNGAPI
+png_set_compression_window_bits(png_structp png_ptr, int window_bits)
+{
+   if (window_bits > 15)
+      png_warning(png_ptr, "Only compression windows <= 32k supported by PNG");
+   else if (window_bits < 8)
+      png_warning(png_ptr, "Only compression windows >= 256 supported by PNG");
+#ifndef WBITS_8_OK
+   /* avoid libpng bug with 256-byte windows */
+   if (window_bits == 8)
+     {
+       png_warning(png_ptr, "Compression window is being reset to 512");
+       window_bits=9;
+     }
+#endif
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS;
+   png_ptr->zlib_window_bits = window_bits;
+}
+
+void PNGAPI
+png_set_compression_method(png_structp png_ptr, int method)
+{
+   png_debug(1, "in png_set_compression_method\n");
+   if (method != 8)
+      png_warning(png_ptr, "Only compression method 8 is supported by PNG");
+   png_ptr->flags |= PNG_FLAG_ZLIB_CUSTOM_METHOD;
+   png_ptr->zlib_method = method;
+}
+
+void PNGAPI
+png_set_write_status_fn(png_structp png_ptr, png_write_status_ptr write_row_fn)
+{
+   png_ptr->write_row_fn = write_row_fn;
+}
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+void PNGAPI
+png_set_write_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
+   write_user_transform_fn)
+{
+   png_debug(1, "in png_set_write_user_transform_fn\n");
+   png_ptr->transformations |= PNG_USER_TRANSFORM;
+   png_ptr->write_user_transform_fn = write_user_transform_fn;
+}
+#endif
+
+
+#if defined(PNG_INFO_IMAGE_SUPPORTED)
+void PNGAPI
+png_write_png(png_structp png_ptr, png_infop info_ptr,
+              int transforms, voidp params)
+{
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+   /* invert the alpha channel from opacity to transparency */
+   if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+       png_set_invert_alpha(png_ptr);
+#endif
+
+   /* Write the file header information. */
+   png_write_info(png_ptr, info_ptr);
+
+   /* ------ these transformations don't touch the info structure ------- */
+
+#if defined(PNG_WRITE_INVERT_SUPPORTED)
+   /* invert monochrome pixels */
+   if (transforms & PNG_TRANSFORM_INVERT_MONO)
+       png_set_invert_mono(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+   /* Shift the pixels up to a legal bit depth and fill in
+    * as appropriate to correctly scale the image.
+    */
+   if ((transforms & PNG_TRANSFORM_SHIFT)
+               && (info_ptr->valid & PNG_INFO_sBIT))
+       png_set_shift(png_ptr, &info_ptr->sig_bit);
+#endif
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+   /* pack pixels into bytes */
+   if (transforms & PNG_TRANSFORM_PACKING)
+       png_set_packing(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+   /* swap location of alpha bytes from ARGB to RGBA */
+   if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+       png_set_swap_alpha(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_FILLER_SUPPORTED)
+   /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into
+    * RGB (4 channels -> 3 channels). The second parameter is not used.
+    */
+   if (transforms & PNG_TRANSFORM_STRIP_FILLER)
+       png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
+#endif
+
+#if defined(PNG_WRITE_BGR_SUPPORTED)
+   /* flip BGR pixels to RGB */
+   if (transforms & PNG_TRANSFORM_BGR)
+       png_set_bgr(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_SWAP_SUPPORTED)
+   /* swap bytes of 16-bit files to most significant byte first */
+   if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+       png_set_swap(png_ptr);
+#endif
+
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+   /* swap bits of 1, 2, 4 bit packed pixel formats */
+   if (transforms & PNG_TRANSFORM_PACKSWAP)
+       png_set_packswap(png_ptr);
+#endif
+
+   /* ----------------------- end of transformations ------------------- */
+
+   /* write the bits */
+   if (info_ptr->valid & PNG_INFO_IDAT)
+       png_write_image(png_ptr, info_ptr->row_pointers);
+
+   /* It is REQUIRED to call this to finish writing the rest of the file */
+   png_write_end(png_ptr, info_ptr);
+
+   if(transforms == 0 || params == NULL)
+      /* quiet compiler warnings */ return;
+}
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/png/pngwtran.c b/Source/3rd Party/wx/src/png/pngwtran.c
index b598149a9..94d8ecc1c 100644
--- a/Source/3rd Party/wx/src/png/pngwtran.c	
+++ b/Source/3rd Party/wx/src/png/pngwtran.c	
@@ -1,633 +1,563 @@
-
-/* pngwtran.c - transforms the data in a row for PNG writers
- *
- * Last changed in libpng 1.5.6 [November 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
-/* Transform the data according to the user's wishes.  The order of
- * transformations is significant.
- */
-void /* PRIVATE */
-png_do_write_transformations(png_structp png_ptr, png_row_infop row_info)
-{
-   png_debug(1, "in png_do_write_transformations");
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
-   if (png_ptr->transformations & PNG_USER_TRANSFORM)
-      if (png_ptr->write_user_transform_fn != NULL)
-         (*(png_ptr->write_user_transform_fn)) /* User write transform
-                                                 function */
-             (png_ptr,  /* png_ptr */
-             row_info,  /* row_info: */
-                /*  png_uint_32 width;       width of row */
-                /*  png_size_t rowbytes;     number of bytes in row */
-                /*  png_byte color_type;     color type of pixels */
-                /*  png_byte bit_depth;      bit depth of samples */
-                /*  png_byte channels;       number of channels (1-4) */
-                /*  png_byte pixel_depth;    bits per pixel (depth*channels) */
-             png_ptr->row_buf + 1);      /* start of pixel data for row */
-#endif
-
-#ifdef PNG_WRITE_FILLER_SUPPORTED
-   if (png_ptr->transformations & PNG_FILLER)
-      png_do_strip_channel(row_info, png_ptr->row_buf + 1,
-         !(png_ptr->flags & PNG_FLAG_FILLER_AFTER));
-#endif
-
-#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_PACKSWAP)
-      png_do_packswap(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-   if (png_ptr->transformations & PNG_PACK)
-      png_do_pack(row_info, png_ptr->row_buf + 1,
-          (png_uint_32)png_ptr->bit_depth);
-#endif
-
-#ifdef PNG_WRITE_SWAP_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_BYTES)
-      png_do_swap(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-   if (png_ptr->transformations & PNG_SHIFT)
-      png_do_shift(row_info, png_ptr->row_buf + 1,
-          &(png_ptr->shift));
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_SWAP_ALPHA)
-      png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_ALPHA)
-      png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_BGR_SUPPORTED
-   if (png_ptr->transformations & PNG_BGR)
-      png_do_bgr(row_info, png_ptr->row_buf + 1);
-#endif
-
-#ifdef PNG_WRITE_INVERT_SUPPORTED
-   if (png_ptr->transformations & PNG_INVERT_MONO)
-      png_do_invert(row_info, png_ptr->row_buf + 1);
-#endif
-}
-
-#ifdef PNG_WRITE_PACK_SUPPORTED
-/* Pack pixels into bytes.  Pass the true bit depth in bit_depth.  The
- * row_info bit depth should be 8 (one pixel per byte).  The channels
- * should be 1 (this only happens on grayscale and paletted images).
- */
-void /* PRIVATE */
-png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
-{
-   png_debug(1, "in png_do_pack");
-
-   if (row_info->bit_depth == 8 &&
-      row_info->channels == 1)
-   {
-      switch ((int)bit_depth)
-      {
-         case 1:
-         {
-            png_bytep sp, dp;
-            int mask, v;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            sp = row;
-            dp = row;
-            mask = 0x80;
-            v = 0;
-
-            for (i = 0; i < row_width; i++)
-            {
-               if (*sp != 0)
-                  v |= mask;
-
-               sp++;
-
-               if (mask > 1)
-                  mask >>= 1;
-
-               else
-               {
-                  mask = 0x80;
-                  *dp = (png_byte)v;
-                  dp++;
-                  v = 0;
-               }
-            }
-
-            if (mask != 0x80)
-               *dp = (png_byte)v;
-
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp, dp;
-            int shift, v;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            sp = row;
-            dp = row;
-            shift = 6;
-            v = 0;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte value;
-
-               value = (png_byte)(*sp & 0x03);
-               v |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 6;
-                  *dp = (png_byte)v;
-                  dp++;
-                  v = 0;
-               }
-
-               else
-                  shift -= 2;
-
-               sp++;
-            }
-
-            if (shift != 6)
-               *dp = (png_byte)v;
-
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp, dp;
-            int shift, v;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            sp = row;
-            dp = row;
-            shift = 4;
-            v = 0;
-
-            for (i = 0; i < row_width; i++)
-            {
-               png_byte value;
-
-               value = (png_byte)(*sp & 0x0f);
-               v |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 4;
-                  *dp = (png_byte)v;
-                  dp++;
-                  v = 0;
-               }
-
-               else
-                  shift -= 4;
-
-               sp++;
-            }
-
-            if (shift != 4)
-               *dp = (png_byte)v;
-
-            break;
-         }
-
-         default:
-            break;
-      }
-
-      row_info->bit_depth = (png_byte)bit_depth;
-      row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-          row_info->width);
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_SHIFT_SUPPORTED
-/* Shift pixel values to take advantage of whole range.  Pass the
- * true number of bits in bit_depth.  The row should be packed
- * according to row_info->bit_depth.  Thus, if you had a row of
- * bit depth 4, but the pixels only had values from 0 to 7, you
- * would pass 3 as bit_depth, and this routine would translate the
- * data to 0 to 15.
- */
-void /* PRIVATE */
-png_do_shift(png_row_infop row_info, png_bytep row,
-    png_const_color_8p bit_depth)
-{
-   png_debug(1, "in png_do_shift");
-
-   if (row_info->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      int shift_start[4], shift_dec[4];
-      int channels = 0;
-
-      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
-      {
-         shift_start[channels] = row_info->bit_depth - bit_depth->red;
-         shift_dec[channels] = bit_depth->red;
-         channels++;
-
-         shift_start[channels] = row_info->bit_depth - bit_depth->green;
-         shift_dec[channels] = bit_depth->green;
-         channels++;
-
-         shift_start[channels] = row_info->bit_depth - bit_depth->blue;
-         shift_dec[channels] = bit_depth->blue;
-         channels++;
-      }
-
-      else
-      {
-         shift_start[channels] = row_info->bit_depth - bit_depth->gray;
-         shift_dec[channels] = bit_depth->gray;
-         channels++;
-      }
-
-      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
-      {
-         shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
-         shift_dec[channels] = bit_depth->alpha;
-         channels++;
-      }
-
-      /* With low row depths, could only be grayscale, so one channel */
-      if (row_info->bit_depth < 8)
-      {
-         png_bytep bp = row;
-         png_size_t i;
-         png_byte mask;
-         png_size_t row_bytes = row_info->rowbytes;
-
-         if (bit_depth->gray == 1 && row_info->bit_depth == 2)
-            mask = 0x55;
-
-         else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
-            mask = 0x11;
-
-         else
-            mask = 0xff;
-
-         for (i = 0; i < row_bytes; i++, bp++)
-         {
-            png_uint_16 v;
-            int j;
-
-            v = *bp;
-            *bp = 0;
-
-            for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
-            {
-               if (j > 0)
-                  *bp |= (png_byte)((v << j) & 0xff);
-
-               else
-                  *bp |= (png_byte)((v >> (-j)) & mask);
-            }
-         }
-      }
-
-      else if (row_info->bit_depth == 8)
-      {
-         png_bytep bp = row;
-         png_uint_32 i;
-         png_uint_32 istop = channels * row_info->width;
-
-         for (i = 0; i < istop; i++, bp++)
-         {
-
-            png_uint_16 v;
-            int j;
-            int c = (int)(i%channels);
-
-            v = *bp;
-            *bp = 0;
-
-            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
-            {
-               if (j > 0)
-                  *bp |= (png_byte)((v << j) & 0xff);
-
-               else
-                  *bp |= (png_byte)((v >> (-j)) & 0xff);
-            }
-         }
-      }
-
-      else
-      {
-         png_bytep bp;
-         png_uint_32 i;
-         png_uint_32 istop = channels * row_info->width;
-
-         for (bp = row, i = 0; i < istop; i++)
-         {
-            int c = (int)(i%channels);
-            png_uint_16 value, v;
-            int j;
-
-            v = (png_uint_16)(((png_uint_16)(*bp) << 8) + *(bp + 1));
-            value = 0;
-
-            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
-            {
-               if (j > 0)
-                  value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
-
-               else
-                  value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
-            }
-            *bp++ = (png_byte)(value >> 8);
-            *bp++ = (png_byte)(value & 0xff);
-         }
-      }
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
-void /* PRIVATE */
-png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_write_swap_alpha");
-
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This converts from ARGB to RGBA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save;
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This converts from AARRGGBB to RRGGBBAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save[2];
-               save[0] = *(sp++);
-               save[1] = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save[0];
-               *(dp++) = save[1];
-            }
-         }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This converts from AG to GA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save;
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This converts from AAGG to GGAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               png_byte save[2];
-               save[0] = *(sp++);
-               save[1] = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = save[0];
-               *(dp++) = save[1];
-            }
-         }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-      }
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
-void /* PRIVATE */
-png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_write_invert_alpha");
-
-   {
-      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This inverts the alpha channel in RGBA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               /* Does nothing
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               */
-               sp+=3; dp = sp;
-               *(dp++) = (png_byte)(255 - *(sp++));
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This inverts the alpha channel in RRGGBBAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               /* Does nothing
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               */
-               sp+=6; dp = sp;
-               *(dp++) = (png_byte)(255 - *(sp++));
-               *(dp++) = (png_byte)(255 - *(sp++));
-            }
-         }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-      }
-
-      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      {
-         if (row_info->bit_depth == 8)
-         {
-            /* This inverts the alpha channel in GA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               *(dp++) = *(sp++);
-               *(dp++) = (png_byte)(255 - *(sp++));
-            }
-         }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         else
-         {
-            /* This inverts the alpha channel in GGAA */
-            png_bytep sp, dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            for (i = 0, sp = dp = row; i < row_width; i++)
-            {
-               /* Does nothing
-               *(dp++) = *(sp++);
-               *(dp++) = *(sp++);
-               */
-               sp+=2; dp = sp;
-               *(dp++) = (png_byte)(255 - *(sp++));
-               *(dp++) = (png_byte)(255 - *(sp++));
-            }
-         }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-      }
-   }
-}
-#endif
-#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
-
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-/* Undoes intrapixel differencing  */
-void /* PRIVATE */
-png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
-{
-   png_debug(1, "in png_do_write_intrapixel");
-
-   if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
-   {
-      int bytes_per_pixel;
-      png_uint_32 row_width = row_info->width;
-      if (row_info->bit_depth == 8)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 3;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 4;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            *(rp)     = (png_byte)((*rp       - *(rp + 1)) & 0xff);
-            *(rp + 2) = (png_byte)((*(rp + 2) - *(rp + 1)) & 0xff);
-         }
-      }
-
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      else if (row_info->bit_depth == 16)
-      {
-         png_bytep rp;
-         png_uint_32 i;
-
-         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
-            bytes_per_pixel = 6;
-
-         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-            bytes_per_pixel = 8;
-
-         else
-            return;
-
-         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
-         {
-            png_uint_32 s0   = (*(rp    ) << 8) | *(rp + 1);
-            png_uint_32 s1   = (*(rp + 2) << 8) | *(rp + 3);
-            png_uint_32 s2   = (*(rp + 4) << 8) | *(rp + 5);
-            png_uint_32 red  = (png_uint_32)((s0 - s1) & 0xffffL);
-            png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL);
-            *(rp    ) = (png_byte)((red >> 8) & 0xff);
-            *(rp + 1) = (png_byte)(red & 0xff);
-            *(rp + 4) = (png_byte)((blue >> 8) & 0xff);
-            *(rp + 5) = (png_byte)(blue & 0xff);
-         }
-      }
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
-   }
-}
-#endif /* PNG_MNG_FEATURES_SUPPORTED */
-#endif /* PNG_WRITE_SUPPORTED */
+
+/* pngwtran.c - transforms the data in a row for PNG writers
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Transform the data according to the user's wishes.  The order of
+ * transformations is significant.
+ */
+void /* PRIVATE */
+png_do_write_transformations(png_structp png_ptr)
+{
+   png_debug(1, "in png_do_write_transformations\n");
+
+   if (png_ptr == NULL)
+      return;
+
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   if (png_ptr->transformations & PNG_USER_TRANSFORM)
+      if(png_ptr->write_user_transform_fn != NULL)
+        (*(png_ptr->write_user_transform_fn)) /* user write transform function */
+          (png_ptr,                    /* png_ptr */
+           &(png_ptr->row_info),       /* row_info:     */
+             /*  png_uint_32 width;          width of row */
+             /*  png_uint_32 rowbytes;       number of bytes in row */
+             /*  png_byte color_type;        color type of pixels */
+             /*  png_byte bit_depth;         bit depth of samples */
+             /*  png_byte channels;          number of channels (1-4) */
+             /*  png_byte pixel_depth;       bits per pixel (depth*channels) */
+           png_ptr->row_buf + 1);      /* start of pixel data for row */
+#endif
+#if defined(PNG_WRITE_FILLER_SUPPORTED)
+   if (png_ptr->transformations & PNG_FILLER)
+      png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         png_ptr->flags);
+#endif
+#if defined(PNG_WRITE_PACKSWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACKSWAP)
+      png_do_packswap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+   if (png_ptr->transformations & PNG_PACK)
+      png_do_pack(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         (png_uint_32)png_ptr->bit_depth);
+#endif
+#if defined(PNG_WRITE_SWAP_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_BYTES)
+      png_do_swap(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+   if (png_ptr->transformations & PNG_SHIFT)
+      png_do_shift(&(png_ptr->row_info), png_ptr->row_buf + 1,
+         &(png_ptr->shift));
+#endif
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_ALPHA)
+      png_do_write_invert_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+   if (png_ptr->transformations & PNG_SWAP_ALPHA)
+      png_do_write_swap_alpha(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_BGR_SUPPORTED)
+   if (png_ptr->transformations & PNG_BGR)
+      png_do_bgr(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+#if defined(PNG_WRITE_INVERT_SUPPORTED)
+   if (png_ptr->transformations & PNG_INVERT_MONO)
+      png_do_invert(&(png_ptr->row_info), png_ptr->row_buf + 1);
+#endif
+}
+
+#if defined(PNG_WRITE_PACK_SUPPORTED)
+/* Pack pixels into bytes.  Pass the true bit depth in bit_depth.  The
+ * row_info bit depth should be 8 (one pixel per byte).  The channels
+ * should be 1 (this only happens on grayscale and paletted images).
+ */
+void /* PRIVATE */
+png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth)
+{
+   png_debug(1, "in png_do_pack\n");
+   if (row_info->bit_depth == 8 &&
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+      row_info->channels == 1)
+   {
+      switch ((int)bit_depth)
+      {
+         case 1:
+         {
+            png_bytep sp, dp;
+            int mask, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            mask = 0x80;
+            v = 0;
+
+            for (i = 0; i < row_width; i++)
+            {
+               if (*sp != 0)
+                  v |= mask;
+               sp++;
+               if (mask > 1)
+                  mask >>= 1;
+               else
+               {
+                  mask = 0x80;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+            }
+            if (mask != 0x80)
+               *dp = (png_byte)v;
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp, dp;
+            int shift, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            shift = 6;
+            v = 0;
+            for (i = 0; i < row_width; i++)
+            {
+               png_byte value;
+
+               value = (png_byte)(*sp & 0x03);
+               v |= (value << shift);
+               if (shift == 0)
+               {
+                  shift = 6;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+               else
+                  shift -= 2;
+               sp++;
+            }
+            if (shift != 6)
+               *dp = (png_byte)v;
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp, dp;
+            int shift, v;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            sp = row;
+            dp = row;
+            shift = 4;
+            v = 0;
+            for (i = 0; i < row_width; i++)
+            {
+               png_byte value;
+
+               value = (png_byte)(*sp & 0x0f);
+               v |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 4;
+                  *dp = (png_byte)v;
+                  dp++;
+                  v = 0;
+               }
+               else
+                  shift -= 4;
+
+               sp++;
+            }
+            if (shift != 4)
+               *dp = (png_byte)v;
+            break;
+         }
+      }
+      row_info->bit_depth = (png_byte)bit_depth;
+      row_info->pixel_depth = (png_byte)(bit_depth * row_info->channels);
+      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+         row_info->width);
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_SHIFT_SUPPORTED)
+/* Shift pixel values to take advantage of whole range.  Pass the
+ * true number of bits in bit_depth.  The row should be packed
+ * according to row_info->bit_depth.  Thus, if you had a row of
+ * bit depth 4, but the pixels only had values from 0 to 7, you
+ * would pass 3 as bit_depth, and this routine would translate the
+ * data to 0 to 15.
+ */
+void /* PRIVATE */
+png_do_shift(png_row_infop row_info, png_bytep row, png_color_8p bit_depth)
+{
+   png_debug(1, "in png_do_shift\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL &&
+#else
+   if (
+#endif
+      row_info->color_type != PNG_COLOR_TYPE_PALETTE)
+   {
+      int shift_start[4], shift_dec[4];
+      int channels = 0;
+
+      if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->red;
+         shift_dec[channels] = bit_depth->red;
+         channels++;
+         shift_start[channels] = row_info->bit_depth - bit_depth->green;
+         shift_dec[channels] = bit_depth->green;
+         channels++;
+         shift_start[channels] = row_info->bit_depth - bit_depth->blue;
+         shift_dec[channels] = bit_depth->blue;
+         channels++;
+      }
+      else
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->gray;
+         shift_dec[channels] = bit_depth->gray;
+         channels++;
+      }
+      if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+      {
+         shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
+         shift_dec[channels] = bit_depth->alpha;
+         channels++;
+      }
+
+      /* with low row depths, could only be grayscale, so one channel */
+      if (row_info->bit_depth < 8)
+      {
+         png_bytep bp = row;
+         png_uint_32 i;
+         png_byte mask;
+         png_uint_32 row_bytes = row_info->rowbytes;
+
+         if (bit_depth->gray == 1 && row_info->bit_depth == 2)
+            mask = 0x55;
+         else if (row_info->bit_depth == 4 && bit_depth->gray == 3)
+            mask = 0x11;
+         else
+            mask = 0xff;
+
+         for (i = 0; i < row_bytes; i++, bp++)
+         {
+            png_uint_16 v;
+            int j;
+
+            v = *bp;
+            *bp = 0;
+            for (j = shift_start[0]; j > -shift_dec[0]; j -= shift_dec[0])
+            {
+               if (j > 0)
+                  *bp |= (png_byte)((v << j) & 0xff);
+               else
+                  *bp |= (png_byte)((v >> (-j)) & mask);
+            }
+         }
+      }
+      else if (row_info->bit_depth == 8)
+      {
+         png_bytep bp = row;
+         png_uint_32 i;
+         png_uint_32 istop = channels * row_info->width;
+
+         for (i = 0; i < istop; i++, bp++)
+         {
+
+            png_uint_16 v;
+            int j;
+            int c = (int)(i%channels);
+
+            v = *bp;
+            *bp = 0;
+            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+            {
+               if (j > 0)
+                  *bp |= (png_byte)((v << j) & 0xff);
+               else
+                  *bp |= (png_byte)((v >> (-j)) & 0xff);
+            }
+         }
+      }
+      else
+      {
+         png_bytep bp;
+         png_uint_32 i;
+         png_uint_32 istop = channels * row_info->width;
+
+         for (bp = row, i = 0; i < istop; i++)
+         {
+            int c = (int)(i%channels);
+            png_uint_16 value, v;
+            int j;
+
+            v = (png_uint_16)(((png_uint_16)(*bp) << 8) + *(bp + 1));
+            value = 0;
+            for (j = shift_start[c]; j > -shift_dec[c]; j -= shift_dec[c])
+            {
+               if (j > 0)
+                  value |= (png_uint_16)((v << j) & (png_uint_16)0xffff);
+               else
+                  value |= (png_uint_16)((v >> (-j)) & (png_uint_16)0xffff);
+            }
+            *bp++ = (png_byte)(value >> 8);
+            *bp++ = (png_byte)(value & 0xff);
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_SWAP_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_swap_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This converts from ARGB to RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save;
+            }
+         }
+         /* This converts from AARRGGBB to RRGGBBAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save[2];
+               save[0] = *(sp++);
+               save[1] = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save[0];
+               *(dp++) = save[1];
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This converts from AG to GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save;
+            }
+         }
+         /* This converts from AAGG to GGAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               png_byte save[2];
+               save[0] = *(sp++);
+               save[1] = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = save[0];
+               *(dp++) = save[1];
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_INVERT_ALPHA_SUPPORTED)
+void /* PRIVATE */
+png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_invert_alpha\n");
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL)
+#endif
+   {
+      if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+      {
+         /* This inverts the alpha channel in RGBA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+         /* This inverts the alpha channel in RRGGBBAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+      }
+      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+      {
+         /* This inverts the alpha channel in GA */
+         if (row_info->bit_depth == 8)
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               *(dp++) = *(sp++);
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+         /* This inverts the alpha channel in GGAA */
+         else
+         {
+            png_bytep sp, dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            for (i = 0, sp = dp = row; i < row_width; i++)
+            {
+               *(dp++) = *(sp++);
+               *(dp++) = *(sp++);
+               *(dp++) = (png_byte)(255 - *(sp++));
+               *(dp++) = (png_byte)(255 - *(sp++));
+            }
+         }
+      }
+   }
+}
+#endif
+
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+/* undoes intrapixel differencing  */
+void /* PRIVATE */
+png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
+{
+   png_debug(1, "in png_do_write_intrapixel\n");
+   if (
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+       row != NULL && row_info != NULL &&
+#endif
+       (row_info->color_type & PNG_COLOR_MASK_COLOR))
+   {
+      int bytes_per_pixel;
+      png_uint_32 row_width = row_info->width;
+      if (row_info->bit_depth == 8)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 3;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 4;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            *(rp)   = (png_byte)((*rp     - *(rp+1))&0xff);
+            *(rp+2) = (png_byte)((*(rp+2) - *(rp+1))&0xff);
+         }
+      }
+      else if (row_info->bit_depth == 16)
+      {
+         png_bytep rp;
+         png_uint_32 i;
+
+         if (row_info->color_type == PNG_COLOR_TYPE_RGB)
+            bytes_per_pixel = 6;
+         else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+            bytes_per_pixel = 8;
+         else
+            return;
+
+         for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel)
+         {
+            png_uint_32 s0   = (*(rp  ) << 8) | *(rp+1);
+            png_uint_32 s1   = (*(rp+2) << 8) | *(rp+3);
+            png_uint_32 s2   = (*(rp+4) << 8) | *(rp+5);
+            png_uint_32 red  = (png_uint_32)((s0-s1) & 0xffffL);
+            png_uint_32 blue = (png_uint_32)((s2-s1) & 0xffffL);
+            *(rp  ) = (png_byte)((red >> 8) & 0xff);
+            *(rp+1) = (png_byte)(red & 0xff);
+            *(rp+4) = (png_byte)((blue >> 8) & 0xff);
+            *(rp+5) = (png_byte)(blue & 0xff);
+         }
+      }
+   }
+}
+#endif /* PNG_MNG_FEATURES_SUPPORTED */
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/png/pngwutil.c b/Source/3rd Party/wx/src/png/pngwutil.c
index 64888f7c6..17938d227 100644
--- a/Source/3rd Party/wx/src/png/pngwutil.c	
+++ b/Source/3rd Party/wx/src/png/pngwutil.c	
@@ -1,3180 +1,2726 @@
-
-/* pngwutil.c - utilities to write a PNG file
- *
- * Last changed in libpng 1.5.6 [November 3, 2011]
- * Copyright (c) 1998-2011 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-#include "pngpriv.h"
-
-#ifdef PNG_WRITE_SUPPORTED
-
-#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-/* Place a 32-bit number into a buffer in PNG byte order.  We work
- * with unsigned numbers for convenience, although one supported
- * ancillary chunk uses signed (two's complement) numbers.
- */
-void PNGAPI
-png_save_uint_32(png_bytep buf, png_uint_32 i)
-{
-   buf[0] = (png_byte)((i >> 24) & 0xff);
-   buf[1] = (png_byte)((i >> 16) & 0xff);
-   buf[2] = (png_byte)((i >> 8) & 0xff);
-   buf[3] = (png_byte)(i & 0xff);
-}
-
-#ifdef PNG_SAVE_INT_32_SUPPORTED
-/* The png_save_int_32 function assumes integers are stored in two's
- * complement format.  If this isn't the case, then this routine needs to
- * be modified to write data in two's complement format.  Note that,
- * the following works correctly even if png_int_32 has more than 32 bits
- * (compare the more complex code required on read for sign extention.)
- */
-void PNGAPI
-png_save_int_32(png_bytep buf, png_int_32 i)
-{
-   buf[0] = (png_byte)((i >> 24) & 0xff);
-   buf[1] = (png_byte)((i >> 16) & 0xff);
-   buf[2] = (png_byte)((i >> 8) & 0xff);
-   buf[3] = (png_byte)(i & 0xff);
-}
-#endif
-
-/* Place a 16-bit number into a buffer in PNG byte order.
- * The parameter is declared unsigned int, not png_uint_16,
- * just to avoid potential problems on pre-ANSI C compilers.
- */
-void PNGAPI
-png_save_uint_16(png_bytep buf, unsigned int i)
-{
-   buf[0] = (png_byte)((i >> 8) & 0xff);
-   buf[1] = (png_byte)(i & 0xff);
-}
-#endif
-
-/* Simple function to write the signature.  If we have already written
- * the magic bytes of the signature, or more likely, the PNG stream is
- * being embedded into another stream and doesn't need its own signature,
- * we should call png_set_sig_bytes() to tell libpng how many of the
- * bytes have already been written.
- */
-void PNGAPI
-png_write_sig(png_structp png_ptr)
-{
-   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the signature is being written */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_SIGNATURE;
-#endif
-
-   /* Write the rest of the 8 byte signature */
-   png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
-      (png_size_t)(8 - png_ptr->sig_bytes));
-
-   if (png_ptr->sig_bytes < 3)
-      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
-}
-
-/* Write the start of a PNG chunk.  The type is the chunk type.
- * The total_length is the sum of the lengths of all the data you will be
- * passing in png_write_chunk_data().
- */
-static void
-png_write_chunk_header(png_structp png_ptr, png_uint_32 chunk_name,
-    png_uint_32 length)
-{
-   png_byte buf[8];
-
-#if defined(PNG_DEBUG) && (PNG_DEBUG > 0)
-   PNG_CSTRING_FROM_CHUNK(buf, chunk_name);
-   png_debug2(0, "Writing %s chunk, length = %lu", buf, (unsigned long)length);
-#endif
-
-   if (png_ptr == NULL)
-      return;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the chunk header is being written.
-    * PNG_IO_CHUNK_HDR requires a single I/O call.
-    */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_HDR;
-#endif
-
-   /* Write the length and the chunk name */
-   png_save_uint_32(buf, length);
-   png_save_uint_32(buf + 4, chunk_name);
-   png_write_data(png_ptr, buf, 8);
-
-   /* Put the chunk name into png_ptr->chunk_name */
-   png_ptr->chunk_name = chunk_name;
-
-   /* Reset the crc and run it over the chunk name */
-   png_reset_crc(png_ptr);
-
-   png_calculate_crc(png_ptr, buf + 4, 4);
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that chunk data will (possibly) be written.
-    * PNG_IO_CHUNK_DATA does NOT require a specific number of I/O calls.
-    */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_DATA;
-#endif
-}
-
-void PNGAPI
-png_write_chunk_start(png_structp png_ptr, png_const_bytep chunk_string,
-    png_uint_32 length)
-{
-   png_write_chunk_header(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), length);
-}
-
-/* Write the data of a PNG chunk started with png_write_chunk_header().
- * Note that multiple calls to this function are allowed, and that the
- * sum of the lengths from these calls *must* add up to the total_length
- * given to png_write_chunk_header().
- */
-void PNGAPI
-png_write_chunk_data(png_structp png_ptr, png_const_bytep data,
-    png_size_t length)
-{
-   /* Write the data, and run the CRC over it */
-   if (png_ptr == NULL)
-      return;
-
-   if (data != NULL && length > 0)
-   {
-      png_write_data(png_ptr, data, length);
-
-      /* Update the CRC after writing the data,
-       * in case that the user I/O routine alters it.
-       */
-      png_calculate_crc(png_ptr, data, length);
-   }
-}
-
-/* Finish a chunk started with png_write_chunk_header(). */
-void PNGAPI
-png_write_chunk_end(png_structp png_ptr)
-{
-   png_byte buf[4];
-
-   if (png_ptr == NULL) return;
-
-#ifdef PNG_IO_STATE_SUPPORTED
-   /* Inform the I/O callback that the chunk CRC is being written.
-    * PNG_IO_CHUNK_CRC requires a single I/O function call.
-    */
-   png_ptr->io_state = PNG_IO_WRITING | PNG_IO_CHUNK_CRC;
-#endif
-
-   /* Write the crc in a single operation */
-   png_save_uint_32(buf, png_ptr->crc);
-
-   png_write_data(png_ptr, buf, (png_size_t)4);
-}
-
-/* Write a PNG chunk all at once.  The type is an array of ASCII characters
- * representing the chunk name.  The array must be at least 4 bytes in
- * length, and does not need to be null terminated.  To be safe, pass the
- * pre-defined chunk names here, and if you need a new one, define it
- * where the others are defined.  The length is the length of the data.
- * All the data must be present.  If that is not possible, use the
- * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()
- * functions instead.
- */
-static void
-png_write_complete_chunk(png_structp png_ptr, png_uint_32 chunk_name,
-   png_const_bytep data, png_size_t length)
-{
-   if (png_ptr == NULL)
-      return;
-
-   /* On 64 bit architectures 'length' may not fit in a png_uint_32. */
-   if (length > PNG_UINT_32_MAX)
-      png_error(png_ptr, "length exceeds PNG maxima");
-
-   png_write_chunk_header(png_ptr, chunk_name, (png_uint_32)length);
-   png_write_chunk_data(png_ptr, data, length);
-   png_write_chunk_end(png_ptr);
-}
-
-/* This is the API that calls the internal function above. */
-void PNGAPI
-png_write_chunk(png_structp png_ptr, png_const_bytep chunk_string,
-   png_const_bytep data, png_size_t length)
-{
-   png_write_complete_chunk(png_ptr, PNG_CHUNK_FROM_STRING(chunk_string), data,
-      length);
-}
-
-/* Initialize the compressor for the appropriate type of compression. */
-static void
-png_zlib_claim(png_structp png_ptr, png_uint_32 state)
-{
-   if (!(png_ptr->zlib_state & PNG_ZLIB_IN_USE))
-   {
-      /* If already initialized for 'state' do not re-init. */
-      if (png_ptr->zlib_state != state)
-      {
-         int ret = Z_OK;
-         png_const_charp who = "-";
-
-         /* If actually initialized for another state do a deflateEnd. */
-         if (png_ptr->zlib_state != PNG_ZLIB_UNINITIALIZED)
-         {
-            ret = deflateEnd(&png_ptr->zstream);
-            who = "end";
-            png_ptr->zlib_state = PNG_ZLIB_UNINITIALIZED;
-         }
-
-         /* zlib itself detects an incomplete state on deflateEnd */
-         if (ret == Z_OK) switch (state)
-         {
-#           ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-               case PNG_ZLIB_FOR_TEXT:
-                  ret = deflateInit2(&png_ptr->zstream,
-                     png_ptr->zlib_text_level, png_ptr->zlib_text_method,
-                     png_ptr->zlib_text_window_bits,
-                     png_ptr->zlib_text_mem_level, png_ptr->zlib_text_strategy);
-                  who = "text";
-                  break;
-#           endif
-
-            case PNG_ZLIB_FOR_IDAT:
-               ret = deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
-                   png_ptr->zlib_method, png_ptr->zlib_window_bits,
-                   png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
-               who = "IDAT";
-               break;
-
-            default:
-               png_error(png_ptr, "invalid zlib state");
-         }
-
-         if (ret == Z_OK)
-            png_ptr->zlib_state = state;
-
-         else /* an error in deflateEnd or deflateInit2 */
-         {
-            size_t pos = 0;
-            char msg[64];
-
-            pos = png_safecat(msg, sizeof msg, pos,
-               "zlib failed to initialize compressor (");
-            pos = png_safecat(msg, sizeof msg, pos, who);
-
-            switch (ret)
-            {
-               case Z_VERSION_ERROR:
-                  pos = png_safecat(msg, sizeof msg, pos, ") version error");
-                  break;
-
-               case Z_STREAM_ERROR:
-                  pos = png_safecat(msg, sizeof msg, pos, ") stream error");
-                  break;
-
-               case Z_MEM_ERROR:
-                  pos = png_safecat(msg, sizeof msg, pos, ") memory error");
-                  break;
-
-               default:
-                  pos = png_safecat(msg, sizeof msg, pos, ") unknown error");
-                  break;
-            }
-
-            png_error(png_ptr, msg);
-         }
-      }
-
-      /* Here on success, claim the zstream: */
-      png_ptr->zlib_state |= PNG_ZLIB_IN_USE;
-   }
-
-   else
-      png_error(png_ptr, "zstream already in use (internal error)");
-}
-
-/* The opposite: release the stream.  It is also reset, this API will warn on
- * error but will not fail.
- */
-static void
-png_zlib_release(png_structp png_ptr)
-{
-   if (png_ptr->zlib_state & PNG_ZLIB_IN_USE)
-   {
-      int ret = deflateReset(&png_ptr->zstream);
-
-      png_ptr->zlib_state &= ~PNG_ZLIB_IN_USE;
-
-      if (ret != Z_OK)
-      {
-         png_const_charp err;
-         PNG_WARNING_PARAMETERS(p)
-
-         switch (ret)
-         {
-            case Z_VERSION_ERROR:
-               err = "version";
-               break;
-
-            case Z_STREAM_ERROR:
-               err = "stream";
-               break;
-
-            case Z_MEM_ERROR:
-               err = "memory";
-               break;
-
-            default:
-               err = "unknown";
-               break;
-         }
-
-         png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d, ret);
-         png_warning_parameter(p, 2, err);
-
-         if (png_ptr->zstream.msg)
-            err = png_ptr->zstream.msg;
-         else
-            err = "[no zlib message]";
-
-         png_warning_parameter(p, 3, err);
-
-         png_formatted_warning(png_ptr, p,
-            "zlib failed to reset compressor: @1(@2): @3");
-      }
-   }
-
-   else
-      png_warning(png_ptr, "zstream not in use (internal error)");
-}
-
-#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-/* This pair of functions encapsulates the operation of (a) compressing a
- * text string, and (b) issuing it later as a series of chunk data writes.
- * The compression_state structure is shared context for these functions
- * set up by the caller in order to make the whole mess thread-safe.
- */
-
-typedef struct
-{
-   png_const_bytep input;   /* The uncompressed input data */
-   png_size_t input_len;    /* Its length */
-   int num_output_ptr;      /* Number of output pointers used */
-   int max_output_ptr;      /* Size of output_ptr */
-   png_bytep *output_ptr;   /* Array of pointers to output */
-} compression_state;
-
-/* Compress given text into storage in the png_ptr structure */
-static int /* PRIVATE */
-png_text_compress(png_structp png_ptr,
-    png_const_charp text, png_size_t text_len, int compression,
-    compression_state *comp)
-{
-   int ret;
-
-   comp->num_output_ptr = 0;
-   comp->max_output_ptr = 0;
-   comp->output_ptr = NULL;
-   comp->input = NULL;
-   comp->input_len = text_len;
-
-   /* We may just want to pass the text right through */
-   if (compression == PNG_TEXT_COMPRESSION_NONE)
-   {
-      comp->input = (png_const_bytep)text;
-      return((int)text_len);
-   }
-
-   if (compression >= PNG_TEXT_COMPRESSION_LAST)
-   {
-      PNG_WARNING_PARAMETERS(p)
-
-      png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d,
-         compression);
-      png_formatted_warning(png_ptr, p, "Unknown compression type @1");
-   }
-
-   /* We can't write the chunk until we find out how much data we have,
-    * which means we need to run the compressor first and save the
-    * output.  This shouldn't be a problem, as the vast majority of
-    * comments should be reasonable, but we will set up an array of
-    * malloc'd pointers to be sure.
-    *
-    * If we knew the application was well behaved, we could simplify this
-    * greatly by assuming we can always malloc an output buffer large
-    * enough to hold the compressed text ((1001 * text_len / 1000) + 12)
-    * and malloc this directly.  The only time this would be a bad idea is
-    * if we can't malloc more than 64K and we have 64K of random input
-    * data, or if the input string is incredibly large (although this
-    * wouldn't cause a failure, just a slowdown due to swapping).
-    */
-   png_zlib_claim(png_ptr, PNG_ZLIB_FOR_TEXT);
-
-   /* Set up the compression buffers */
-   /* TODO: the following cast hides a potential overflow problem. */
-   png_ptr->zstream.avail_in = (uInt)text_len;
-
-   /* NOTE: assume zlib doesn't overwrite the input */
-   png_ptr->zstream.next_in = (Bytef *)text;
-   png_ptr->zstream.avail_out = png_ptr->zbuf_size;
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-
-   /* This is the same compression loop as in png_write_row() */
-   do
-   {
-      /* Compress the data */
-      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
-
-      if (ret != Z_OK)
-      {
-         /* Error */
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-
-      /* Check to see if we need more room */
-      if (!(png_ptr->zstream.avail_out))
-      {
-         /* Make sure the output array has room */
-         if (comp->num_output_ptr >= comp->max_output_ptr)
-         {
-            int old_max;
-
-            old_max = comp->max_output_ptr;
-            comp->max_output_ptr = comp->num_output_ptr + 4;
-            if (comp->output_ptr != NULL)
-            {
-               png_bytepp old_ptr;
-
-               old_ptr = comp->output_ptr;
-
-               comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                   (png_alloc_size_t)
-                   (comp->max_output_ptr * png_sizeof(png_charpp)));
-
-               png_memcpy(comp->output_ptr, old_ptr, old_max
-                   * png_sizeof(png_charp));
-
-               png_free(png_ptr, old_ptr);
-            }
-            else
-               comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                   (png_alloc_size_t)
-                   (comp->max_output_ptr * png_sizeof(png_charp)));
-         }
-
-         /* Save the data */
-         comp->output_ptr[comp->num_output_ptr] =
-             (png_bytep)png_malloc(png_ptr,
-             (png_alloc_size_t)png_ptr->zbuf_size);
-
-         png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
-             png_ptr->zbuf_size);
-
-         comp->num_output_ptr++;
-
-         /* and reset the buffer */
-         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-         png_ptr->zstream.next_out = png_ptr->zbuf;
-      }
-   /* Continue until we don't have any more to compress */
-   } while (png_ptr->zstream.avail_in);
-
-   /* Finish the compression */
-   do
-   {
-      /* Tell zlib we are finished */
-      ret = deflate(&png_ptr->zstream, Z_FINISH);
-
-      if (ret == Z_OK)
-      {
-         /* Check to see if we need more room */
-         if (!(png_ptr->zstream.avail_out))
-         {
-            /* Check to make sure our output array has room */
-            if (comp->num_output_ptr >= comp->max_output_ptr)
-            {
-               int old_max;
-
-               old_max = comp->max_output_ptr;
-               comp->max_output_ptr = comp->num_output_ptr + 4;
-               if (comp->output_ptr != NULL)
-               {
-                  png_bytepp old_ptr;
-
-                  old_ptr = comp->output_ptr;
-
-                  /* This could be optimized to realloc() */
-                  comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                      (png_alloc_size_t)(comp->max_output_ptr *
-                      png_sizeof(png_charp)));
-
-                  png_memcpy(comp->output_ptr, old_ptr,
-                      old_max * png_sizeof(png_charp));
-
-                  png_free(png_ptr, old_ptr);
-               }
-
-               else
-                  comp->output_ptr = (png_bytepp)png_malloc(png_ptr,
-                      (png_alloc_size_t)(comp->max_output_ptr *
-                      png_sizeof(png_charp)));
-            }
-
-            /* Save the data */
-            comp->output_ptr[comp->num_output_ptr] =
-                (png_bytep)png_malloc(png_ptr,
-                (png_alloc_size_t)png_ptr->zbuf_size);
-
-            png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
-                png_ptr->zbuf_size);
-
-            comp->num_output_ptr++;
-
-            /* and reset the buffer pointers */
-            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-            png_ptr->zstream.next_out = png_ptr->zbuf;
-         }
-      }
-      else if (ret != Z_STREAM_END)
-      {
-         /* We got an error */
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-   } while (ret != Z_STREAM_END);
-
-   /* Text length is number of buffers plus last buffer */
-   text_len = png_ptr->zbuf_size * comp->num_output_ptr;
-
-   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
-      text_len += png_ptr->zbuf_size - (png_size_t)png_ptr->zstream.avail_out;
-
-   return((int)text_len);
-}
-
-/* Ship the compressed text out via chunk writes */
-static void /* PRIVATE */
-png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
-{
-   int i;
-
-   /* Handle the no-compression case */
-   if (comp->input)
-   {
-      png_write_chunk_data(png_ptr, comp->input, comp->input_len);
-
-      return;
-   }
-
-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-   /* The zbuf_size test is because the code below doesn't work if zbuf_size is
-    * '1'; simply skip it to avoid memory overwrite.
-    */
-   if (comp->input_len >= 2 && comp->input_len < 16384 && png_ptr->zbuf_size > 1)
-   {
-      unsigned int z_cmf;  /* zlib compression method and flags */
-
-      /* Optimize the CMF field in the zlib stream.  This hack of the zlib
-       * stream is compliant to the stream specification.
-       */
-
-      if (comp->num_output_ptr)
-        z_cmf = comp->output_ptr[0][0];
-      else
-        z_cmf = png_ptr->zbuf[0];
-
-      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
-      {
-         unsigned int z_cinfo;
-         unsigned int half_z_window_size;
-         png_size_t uncompressed_text_size = comp->input_len;
-
-         z_cinfo = z_cmf >> 4;
-         half_z_window_size = 1 << (z_cinfo + 7);
-
-         while (uncompressed_text_size <= half_z_window_size &&
-             half_z_window_size >= 256)
-         {
-            z_cinfo--;
-            half_z_window_size >>= 1;
-         }
-
-         z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
-
-         if (comp->num_output_ptr)
-         {
-
-           if (comp->output_ptr[0][0] != z_cmf)
-           {
-              int tmp;
-
-              comp->output_ptr[0][0] = (png_byte)z_cmf;
-              tmp = comp->output_ptr[0][1] & 0xe0;
-              tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-              comp->output_ptr[0][1] = (png_byte)tmp;
-           }
-         }
-         else
-         {
-            int tmp;
-
-            png_ptr->zbuf[0] = (png_byte)z_cmf;
-            tmp = png_ptr->zbuf[1] & 0xe0;
-            tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-            png_ptr->zbuf[1] = (png_byte)tmp;
-         }
-      }
-
-      else
-         png_error(png_ptr,
-             "Invalid zlib compression method or flags in non-IDAT chunk");
-   }
-#endif /* PNG_WRITE_OPTIMIZE_CMF_SUPPORTED */
-
-   /* Write saved output buffers, if any */
-   for (i = 0; i < comp->num_output_ptr; i++)
-   {
-      png_write_chunk_data(png_ptr, comp->output_ptr[i],
-          (png_size_t)png_ptr->zbuf_size);
-
-      png_free(png_ptr, comp->output_ptr[i]);
-   }
-
-   if (comp->max_output_ptr != 0)
-      png_free(png_ptr, comp->output_ptr);
-
-   /* Write anything left in zbuf */
-   if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
-      png_write_chunk_data(png_ptr, png_ptr->zbuf,
-          (png_size_t)(png_ptr->zbuf_size - png_ptr->zstream.avail_out));
-
-   /* Reset zlib for another zTXt/iTXt or image data */
-   png_zlib_release(png_ptr);
-}
-#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
-
-/* Write the IHDR chunk, and update the png_struct with the necessary
- * information.  Note that the rest of this code depends upon this
- * information being correct.
- */
-void /* PRIVATE */
-png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
-    int bit_depth, int color_type, int compression_type, int filter_type,
-    int interlace_type)
-{
-   png_byte buf[13]; /* Buffer to store the IHDR info */
-
-   png_debug(1, "in png_write_IHDR");
-
-   /* Check that we have valid input data from the application info */
-   switch (color_type)
-   {
-      case PNG_COLOR_TYPE_GRAY:
-         switch (bit_depth)
-         {
-            case 1:
-            case 2:
-            case 4:
-            case 8:
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-            case 16:
-#endif
-               png_ptr->channels = 1; break;
-
-            default:
-               png_error(png_ptr,
-                   "Invalid bit depth for grayscale image");
-         }
-         break;
-
-      case PNG_COLOR_TYPE_RGB:
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         if (bit_depth != 8 && bit_depth != 16)
-#else
-         if (bit_depth != 8)
-#endif
-            png_error(png_ptr, "Invalid bit depth for RGB image");
-
-         png_ptr->channels = 3;
-         break;
-
-      case PNG_COLOR_TYPE_PALETTE:
-         switch (bit_depth)
-         {
-            case 1:
-            case 2:
-            case 4:
-            case 8:
-               png_ptr->channels = 1;
-               break;
-
-            default:
-               png_error(png_ptr, "Invalid bit depth for paletted image");
-         }
-         break;
-
-      case PNG_COLOR_TYPE_GRAY_ALPHA:
-         if (bit_depth != 8 && bit_depth != 16)
-            png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");
-
-         png_ptr->channels = 2;
-         break;
-
-      case PNG_COLOR_TYPE_RGB_ALPHA:
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-         if (bit_depth != 8 && bit_depth != 16)
-#else
-         if (bit_depth != 8)
-#endif
-            png_error(png_ptr, "Invalid bit depth for RGBA image");
-
-         png_ptr->channels = 4;
-         break;
-
-      default:
-         png_error(png_ptr, "Invalid image color type specified");
-   }
-
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Invalid compression type specified");
-      compression_type = PNG_COMPRESSION_TYPE_BASE;
-   }
-
-   /* Write filter_method 64 (intrapixel differencing) only if
-    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
-    * 2. Libpng did not write a PNG signature (this filter_method is only
-    *    used in PNG datastreams that are embedded in MNG datastreams) and
-    * 3. The application called png_permit_mng_features with a mask that
-    *    included PNG_FLAG_MNG_FILTER_64 and
-    * 4. The filter_method is 64 and
-    * 5. The color_type is RGB or RGBA
-    */
-   if (
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-       !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
-       ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
-       (color_type == PNG_COLOR_TYPE_RGB ||
-        color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
-       (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
-#endif
-       filter_type != PNG_FILTER_TYPE_BASE)
-   {
-      png_warning(png_ptr, "Invalid filter type specified");
-      filter_type = PNG_FILTER_TYPE_BASE;
-   }
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   if (interlace_type != PNG_INTERLACE_NONE &&
-       interlace_type != PNG_INTERLACE_ADAM7)
-   {
-      png_warning(png_ptr, "Invalid interlace type specified");
-      interlace_type = PNG_INTERLACE_ADAM7;
-   }
-#else
-   interlace_type=PNG_INTERLACE_NONE;
-#endif
-
-   /* Save the relevent information */
-   png_ptr->bit_depth = (png_byte)bit_depth;
-   png_ptr->color_type = (png_byte)color_type;
-   png_ptr->interlaced = (png_byte)interlace_type;
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-   png_ptr->filter_type = (png_byte)filter_type;
-#endif
-   png_ptr->compression_type = (png_byte)compression_type;
-   png_ptr->width = width;
-   png_ptr->height = height;
-
-   png_ptr->pixel_depth = (png_byte)(bit_depth * png_ptr->channels);
-   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
-   /* Set the usr info, so any transformations can modify it */
-   png_ptr->usr_width = png_ptr->width;
-   png_ptr->usr_bit_depth = png_ptr->bit_depth;
-   png_ptr->usr_channels = png_ptr->channels;
-
-   /* Pack the header information into the buffer */
-   png_save_uint_32(buf, width);
-   png_save_uint_32(buf + 4, height);
-   buf[8] = (png_byte)bit_depth;
-   buf[9] = (png_byte)color_type;
-   buf[10] = (png_byte)compression_type;
-   buf[11] = (png_byte)filter_type;
-   buf[12] = (png_byte)interlace_type;
-
-   /* Write the chunk */
-   png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
-
-   /* Initialize zlib with PNG info */
-   png_ptr->zstream.zalloc = png_zalloc;
-   png_ptr->zstream.zfree = png_zfree;
-   png_ptr->zstream.opaque = (voidpf)png_ptr;
-
-   if (!(png_ptr->do_filter))
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
-          png_ptr->bit_depth < 8)
-         png_ptr->do_filter = PNG_FILTER_NONE;
-
-      else
-         png_ptr->do_filter = PNG_ALL_FILTERS;
-   }
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY))
-   {
-      if (png_ptr->do_filter != PNG_FILTER_NONE)
-         png_ptr->zlib_strategy = Z_FILTERED;
-
-      else
-         png_ptr->zlib_strategy = Z_DEFAULT_STRATEGY;
-   }
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_LEVEL))
-      png_ptr->zlib_level = Z_DEFAULT_COMPRESSION;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))
-      png_ptr->zlib_mem_level = 8;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))
-      png_ptr->zlib_window_bits = 15;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
-      png_ptr->zlib_method = 8;
-
-#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_STRATEGY))
-      png_ptr->zlib_text_strategy = Z_DEFAULT_STRATEGY;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_LEVEL))
-      png_ptr->zlib_text_level = png_ptr->zlib_level;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_MEM_LEVEL))
-      png_ptr->zlib_text_mem_level = png_ptr->zlib_mem_level;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_WINDOW_BITS))
-      png_ptr->zlib_text_window_bits = png_ptr->zlib_window_bits;
-
-   if (!(png_ptr->flags & PNG_FLAG_ZTXT_CUSTOM_METHOD))
-      png_ptr->zlib_text_method = png_ptr->zlib_method;
-#else
-   png_ptr->zlib_text_strategy = Z_DEFAULT_STRATEGY;
-   png_ptr->zlib_text_level = png_ptr->zlib_level;
-   png_ptr->zlib_text_mem_level = png_ptr->zlib_mem_level;
-   png_ptr->zlib_text_window_bits = png_ptr->zlib_window_bits;
-   png_ptr->zlib_text_method = png_ptr->zlib_method;
-#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
-#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
-
-   /* Record that the compressor has not yet been initialized. */
-   png_ptr->zlib_state = PNG_ZLIB_UNINITIALIZED;
-
-   png_ptr->mode = PNG_HAVE_IHDR; /* not READY_FOR_ZTXT */
-}
-
-/* Write the palette.  We are careful not to trust png_color to be in the
- * correct order for PNG, so people can redefine it to any convenient
- * structure.
- */
-void /* PRIVATE */
-png_write_PLTE(png_structp png_ptr, png_const_colorp palette,
-    png_uint_32 num_pal)
-{
-   png_uint_32 i;
-   png_const_colorp pal_ptr;
-   png_byte buf[3];
-
-   png_debug(1, "in png_write_PLTE");
-
-   if ((
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-       !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) &&
-#endif
-       num_pal == 0) || num_pal > 256)
-   {
-      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      {
-         png_error(png_ptr, "Invalid number of colors in palette");
-      }
-
-      else
-      {
-         png_warning(png_ptr, "Invalid number of colors in palette");
-         return;
-      }
-   }
-
-   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
-   {
-      png_warning(png_ptr,
-          "Ignoring request to write a PLTE chunk in grayscale PNG");
-
-      return;
-   }
-
-   png_ptr->num_palette = (png_uint_16)num_pal;
-   png_debug1(3, "num_palette = %d", png_ptr->num_palette);
-
-   png_write_chunk_header(png_ptr, png_PLTE, (png_uint_32)(num_pal * 3));
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-
-   for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)
-   {
-      buf[0] = pal_ptr->red;
-      buf[1] = pal_ptr->green;
-      buf[2] = pal_ptr->blue;
-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
-   }
-
-#else
-   /* This is a little slower but some buggy compilers need to do this
-    * instead
-    */
-   pal_ptr=palette;
-
-   for (i = 0; i < num_pal; i++)
-   {
-      buf[0] = pal_ptr[i].red;
-      buf[1] = pal_ptr[i].green;
-      buf[2] = pal_ptr[i].blue;
-      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
-   }
-
-#endif
-   png_write_chunk_end(png_ptr);
-   png_ptr->mode |= PNG_HAVE_PLTE;
-}
-
-/* Write an IDAT chunk */
-void /* PRIVATE */
-png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
-{
-   png_debug(1, "in png_write_IDAT");
-
-#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-   if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
-       png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
-   {
-      /* Optimize the CMF field in the zlib stream.  This hack of the zlib
-       * stream is compliant to the stream specification.
-       */
-      unsigned int z_cmf = data[0];  /* zlib compression method and flags */
-
-      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
-      {
-         /* Avoid memory underflows and multiplication overflows.
-          *
-          * The conditions below are practically always satisfied;
-          * however, they still must be checked.
-          */
-         if (length >= 2 &&
-             png_ptr->height < 16384 && png_ptr->width < 16384)
-         {
-            /* Compute the maximum possible length of the datastream */
-
-            /* Number of pixels, plus for each row a filter byte
-             * and possibly a padding byte, so increase the maximum
-             * size to account for these.
-             */
-            unsigned int z_cinfo;
-            unsigned int half_z_window_size;
-            png_uint_32 uncompressed_idat_size = png_ptr->height *
-                ((png_ptr->width *
-                png_ptr->channels * png_ptr->bit_depth + 15) >> 3);
-
-            /* If it's interlaced, each block of 8 rows is sent as up to
-             * 14 rows, i.e., 6 additional rows, each with a filter byte
-             * and possibly a padding byte
-             */
-            if (png_ptr->interlaced)
-               uncompressed_idat_size += ((png_ptr->height + 7)/8) *
-                   (png_ptr->bit_depth < 8 ? 12 : 6);
-
-            z_cinfo = z_cmf >> 4;
-            half_z_window_size = 1 << (z_cinfo + 7);
-
-            while (uncompressed_idat_size <= half_z_window_size &&
-                half_z_window_size >= 256)
-            {
-               z_cinfo--;
-               half_z_window_size >>= 1;
-            }
-
-            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
-
-            if (data[0] != z_cmf)
-            {
-               int tmp;
-               data[0] = (png_byte)z_cmf;
-               tmp = data[1] & 0xe0;
-               tmp += 0x1f - ((z_cmf << 8) + tmp) % 0x1f;
-               data[1] = (png_byte)tmp;
-            }
-         }
-      }
-
-      else
-         png_error(png_ptr,
-             "Invalid zlib compression method or flags in IDAT");
-   }
-#endif /* PNG_WRITE_OPTIMIZE_CMF_SUPPORTED */
-
-   png_write_complete_chunk(png_ptr, png_IDAT, data, length);
-   png_ptr->mode |= PNG_HAVE_IDAT;
-
-   /* Prior to 1.5.4 this code was replicated in every caller (except at the
-    * end, where it isn't technically necessary).  Since this function has
-    * flushed the data we can safely reset the zlib output buffer here.
-    */
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-}
-
-/* Write an IEND chunk */
-void /* PRIVATE */
-png_write_IEND(png_structp png_ptr)
-{
-   png_debug(1, "in png_write_IEND");
-
-   png_write_complete_chunk(png_ptr, png_IEND, NULL, (png_size_t)0);
-   png_ptr->mode |= PNG_HAVE_IEND;
-}
-
-#ifdef PNG_WRITE_gAMA_SUPPORTED
-/* Write a gAMA chunk */
-void /* PRIVATE */
-png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)
-{
-   png_byte buf[4];
-
-   png_debug(1, "in png_write_gAMA");
-
-   /* file_gamma is saved in 1/100,000ths */
-   png_save_uint_32(buf, (png_uint_32)file_gamma);
-   png_write_complete_chunk(png_ptr, png_gAMA, buf, (png_size_t)4);
-}
-#endif
-
-#ifdef PNG_WRITE_sRGB_SUPPORTED
-/* Write a sRGB chunk */
-void /* PRIVATE */
-png_write_sRGB(png_structp png_ptr, int srgb_intent)
-{
-   png_byte buf[1];
-
-   png_debug(1, "in png_write_sRGB");
-
-   if (srgb_intent >= PNG_sRGB_INTENT_LAST)
-      png_warning(png_ptr,
-          "Invalid sRGB rendering intent specified");
-
-   buf[0]=(png_byte)srgb_intent;
-   png_write_complete_chunk(png_ptr, png_sRGB, buf, (png_size_t)1);
-}
-#endif
-
-#ifdef PNG_WRITE_iCCP_SUPPORTED
-/* Write an iCCP chunk */
-void /* PRIVATE */
-png_write_iCCP(png_structp png_ptr, png_const_charp name, int compression_type,
-    png_const_charp profile, int profile_len)
-{
-   png_size_t name_len;
-   png_charp new_name;
-   compression_state comp;
-   int embedded_profile_len = 0;
-
-   png_debug(1, "in png_write_iCCP");
-
-   comp.num_output_ptr = 0;
-   comp.max_output_ptr = 0;
-   comp.output_ptr = NULL;
-   comp.input = NULL;
-   comp.input_len = 0;
-
-   if ((name_len = png_check_keyword(png_ptr, name, &new_name)) == 0)
-      return;
-
-   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
-      png_warning(png_ptr, "Unknown compression type in iCCP chunk");
-
-   if (profile == NULL)
-      profile_len = 0;
-
-   if (profile_len > 3)
-      embedded_profile_len =
-          ((*( (png_const_bytep)profile    ))<<24) |
-          ((*( (png_const_bytep)profile + 1))<<16) |
-          ((*( (png_const_bytep)profile + 2))<< 8) |
-          ((*( (png_const_bytep)profile + 3))    );
-
-   if (embedded_profile_len < 0)
-   {
-      png_warning(png_ptr,
-          "Embedded profile length in iCCP chunk is negative");
-
-      png_free(png_ptr, new_name);
-      return;
-   }
-
-   if (profile_len < embedded_profile_len)
-   {
-      png_warning(png_ptr,
-          "Embedded profile length too large in iCCP chunk");
-
-      png_free(png_ptr, new_name);
-      return;
-   }
-
-   if (profile_len > embedded_profile_len)
-   {
-      png_warning(png_ptr,
-          "Truncating profile to actual length in iCCP chunk");
-
-      profile_len = embedded_profile_len;
-   }
-
-   if (profile_len)
-      profile_len = png_text_compress(png_ptr, profile,
-          (png_size_t)profile_len, PNG_COMPRESSION_TYPE_BASE, &comp);
-
-   /* Make sure we include the NULL after the name and the compression type */
-   png_write_chunk_header(png_ptr, png_iCCP,
-       (png_uint_32)(name_len + profile_len + 2));
-
-   new_name[name_len + 1] = 0x00;
-
-   png_write_chunk_data(png_ptr, (png_bytep)new_name,
-       (png_size_t)(name_len + 2));
-
-   if (profile_len)
-   {
-      comp.input_len = profile_len;
-      png_write_compressed_data_out(png_ptr, &comp);
-   }
-
-   png_write_chunk_end(png_ptr);
-   png_free(png_ptr, new_name);
-}
-#endif
-
-#ifdef PNG_WRITE_sPLT_SUPPORTED
-/* Write a sPLT chunk */
-void /* PRIVATE */
-png_write_sPLT(png_structp png_ptr, png_const_sPLT_tp spalette)
-{
-   png_size_t name_len;
-   png_charp new_name;
-   png_byte entrybuf[10];
-   png_size_t entry_size = (spalette->depth == 8 ? 6 : 10);
-   png_size_t palette_size = entry_size * spalette->nentries;
-   png_sPLT_entryp ep;
-#ifndef PNG_POINTER_INDEXING_SUPPORTED
-   int i;
-#endif
-
-   png_debug(1, "in png_write_sPLT");
-
-   if ((name_len = png_check_keyword(png_ptr,spalette->name, &new_name))==0)
-      return;
-
-   /* Make sure we include the NULL after the name */
-   png_write_chunk_header(png_ptr, png_sPLT,
-       (png_uint_32)(name_len + 2 + palette_size));
-
-   png_write_chunk_data(png_ptr, (png_bytep)new_name,
-       (png_size_t)(name_len + 1));
-
-   png_write_chunk_data(png_ptr, &spalette->depth, (png_size_t)1);
-
-   /* Loop through each palette entry, writing appropriately */
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (ep = spalette->entries; ep<spalette->entries + spalette->nentries; ep++)
-   {
-      if (spalette->depth == 8)
-      {
-         entrybuf[0] = (png_byte)ep->red;
-         entrybuf[1] = (png_byte)ep->green;
-         entrybuf[2] = (png_byte)ep->blue;
-         entrybuf[3] = (png_byte)ep->alpha;
-         png_save_uint_16(entrybuf + 4, ep->frequency);
-      }
-
-      else
-      {
-         png_save_uint_16(entrybuf + 0, ep->red);
-         png_save_uint_16(entrybuf + 2, ep->green);
-         png_save_uint_16(entrybuf + 4, ep->blue);
-         png_save_uint_16(entrybuf + 6, ep->alpha);
-         png_save_uint_16(entrybuf + 8, ep->frequency);
-      }
-
-      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
-   }
-#else
-   ep=spalette->entries;
-   for (i = 0; i>spalette->nentries; i++)
-   {
-      if (spalette->depth == 8)
-      {
-         entrybuf[0] = (png_byte)ep[i].red;
-         entrybuf[1] = (png_byte)ep[i].green;
-         entrybuf[2] = (png_byte)ep[i].blue;
-         entrybuf[3] = (png_byte)ep[i].alpha;
-         png_save_uint_16(entrybuf + 4, ep[i].frequency);
-      }
-
-      else
-      {
-         png_save_uint_16(entrybuf + 0, ep[i].red);
-         png_save_uint_16(entrybuf + 2, ep[i].green);
-         png_save_uint_16(entrybuf + 4, ep[i].blue);
-         png_save_uint_16(entrybuf + 6, ep[i].alpha);
-         png_save_uint_16(entrybuf + 8, ep[i].frequency);
-      }
-
-      png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
-   }
-#endif
-
-   png_write_chunk_end(png_ptr);
-   png_free(png_ptr, new_name);
-}
-#endif
-
-#ifdef PNG_WRITE_sBIT_SUPPORTED
-/* Write the sBIT chunk */
-void /* PRIVATE */
-png_write_sBIT(png_structp png_ptr, png_const_color_8p sbit, int color_type)
-{
-   png_byte buf[4];
-   png_size_t size;
-
-   png_debug(1, "in png_write_sBIT");
-
-   /* Make sure we don't depend upon the order of PNG_COLOR_8 */
-   if (color_type & PNG_COLOR_MASK_COLOR)
-   {
-      png_byte maxbits;
-
-      maxbits = (png_byte)(color_type==PNG_COLOR_TYPE_PALETTE ? 8 :
-          png_ptr->usr_bit_depth);
-
-      if (sbit->red == 0 || sbit->red > maxbits ||
-          sbit->green == 0 || sbit->green > maxbits ||
-          sbit->blue == 0 || sbit->blue > maxbits)
-      {
-         png_warning(png_ptr, "Invalid sBIT depth specified");
-         return;
-      }
-
-      buf[0] = sbit->red;
-      buf[1] = sbit->green;
-      buf[2] = sbit->blue;
-      size = 3;
-   }
-
-   else
-   {
-      if (sbit->gray == 0 || sbit->gray > png_ptr->usr_bit_depth)
-      {
-         png_warning(png_ptr, "Invalid sBIT depth specified");
-         return;
-      }
-
-      buf[0] = sbit->gray;
-      size = 1;
-   }
-
-   if (color_type & PNG_COLOR_MASK_ALPHA)
-   {
-      if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
-      {
-         png_warning(png_ptr, "Invalid sBIT depth specified");
-         return;
-      }
-
-      buf[size++] = sbit->alpha;
-   }
-
-   png_write_complete_chunk(png_ptr, png_sBIT, buf, size);
-}
-#endif
-
-#ifdef PNG_WRITE_cHRM_SUPPORTED
-/* Write the cHRM chunk */
-void /* PRIVATE */
-png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,
-    png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,
-    png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,
-    png_fixed_point blue_y)
-{
-   png_byte buf[32];
-
-   png_debug(1, "in png_write_cHRM");
-
-   /* Each value is saved in 1/100,000ths */
-#ifdef PNG_CHECK_cHRM_SUPPORTED
-   if (png_check_cHRM_fixed(png_ptr, white_x, white_y, red_x, red_y,
-       green_x, green_y, blue_x, blue_y))
-#endif
-   {
-      png_save_uint_32(buf, (png_uint_32)white_x);
-      png_save_uint_32(buf + 4, (png_uint_32)white_y);
-
-      png_save_uint_32(buf + 8, (png_uint_32)red_x);
-      png_save_uint_32(buf + 12, (png_uint_32)red_y);
-
-      png_save_uint_32(buf + 16, (png_uint_32)green_x);
-      png_save_uint_32(buf + 20, (png_uint_32)green_y);
-
-      png_save_uint_32(buf + 24, (png_uint_32)blue_x);
-      png_save_uint_32(buf + 28, (png_uint_32)blue_y);
-
-      png_write_complete_chunk(png_ptr, png_cHRM, buf, (png_size_t)32);
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_tRNS_SUPPORTED
-/* Write the tRNS chunk */
-void /* PRIVATE */
-png_write_tRNS(png_structp png_ptr, png_const_bytep trans_alpha,
-    png_const_color_16p tran, int num_trans, int color_type)
-{
-   png_byte buf[6];
-
-   png_debug(1, "in png_write_tRNS");
-
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
-      {
-         png_warning(png_ptr, "Invalid number of transparent colors specified");
-         return;
-      }
-
-      /* Write the chunk out as it is */
-      png_write_complete_chunk(png_ptr, png_tRNS, trans_alpha, (png_size_t)num_trans);
-   }
-
-   else if (color_type == PNG_COLOR_TYPE_GRAY)
-   {
-      /* One 16 bit value */
-      if (tran->gray >= (1 << png_ptr->bit_depth))
-      {
-         png_warning(png_ptr,
-             "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
-
-         return;
-      }
-
-      png_save_uint_16(buf, tran->gray);
-      png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)2);
-   }
-
-   else if (color_type == PNG_COLOR_TYPE_RGB)
-   {
-      /* Three 16 bit values */
-      png_save_uint_16(buf, tran->red);
-      png_save_uint_16(buf + 2, tran->green);
-      png_save_uint_16(buf + 4, tran->blue);
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
-#else
-      if (buf[0] | buf[2] | buf[4])
-#endif
-      {
-         png_warning(png_ptr,
-           "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
-         return;
-      }
-
-      png_write_complete_chunk(png_ptr, png_tRNS, buf, (png_size_t)6);
-   }
-
-   else
-   {
-      png_warning(png_ptr, "Can't write tRNS with an alpha channel");
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_bKGD_SUPPORTED
-/* Write the background chunk */
-void /* PRIVATE */
-png_write_bKGD(png_structp png_ptr, png_const_color_16p back, int color_type)
-{
-   png_byte buf[6];
-
-   png_debug(1, "in png_write_bKGD");
-
-   if (color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-      if (
-#ifdef PNG_MNG_FEATURES_SUPPORTED
-          (png_ptr->num_palette ||
-          (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) &&
-#endif
-         back->index >= png_ptr->num_palette)
-      {
-         png_warning(png_ptr, "Invalid background palette index");
-         return;
-      }
-
-      buf[0] = back->index;
-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
-   }
-
-   else if (color_type & PNG_COLOR_MASK_COLOR)
-   {
-      png_save_uint_16(buf, back->red);
-      png_save_uint_16(buf + 2, back->green);
-      png_save_uint_16(buf + 4, back->blue);
-#ifdef PNG_WRITE_16BIT_SUPPORTED
-      if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
-#else
-      if (buf[0] | buf[2] | buf[4])
-#endif
-      {
-         png_warning(png_ptr,
-             "Ignoring attempt to write 16-bit bKGD chunk when bit_depth is 8");
-
-         return;
-      }
-
-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)6);
-   }
-
-   else
-   {
-      if (back->gray >= (1 << png_ptr->bit_depth))
-      {
-         png_warning(png_ptr,
-             "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");
-
-         return;
-      }
-
-      png_save_uint_16(buf, back->gray);
-      png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)2);
-   }
-}
-#endif
-
-#ifdef PNG_WRITE_hIST_SUPPORTED
-/* Write the histogram */
-void /* PRIVATE */
-png_write_hIST(png_structp png_ptr, png_const_uint_16p hist, int num_hist)
-{
-   int i;
-   png_byte buf[3];
-
-   png_debug(1, "in png_write_hIST");
-
-   if (num_hist > (int)png_ptr->num_palette)
-   {
-      png_debug2(3, "num_hist = %d, num_palette = %d", num_hist,
-          png_ptr->num_palette);
-
-      png_warning(png_ptr, "Invalid number of histogram entries specified");
-      return;
-   }
-
-   png_write_chunk_header(png_ptr, png_hIST, (png_uint_32)(num_hist * 2));
-
-   for (i = 0; i < num_hist; i++)
-   {
-      png_save_uint_16(buf, hist[i]);
-      png_write_chunk_data(png_ptr, buf, (png_size_t)2);
-   }
-
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
-    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
-/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
- * and if invalid, correct the keyword rather than discarding the entire
- * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in
- * length, forbids leading or trailing whitespace, multiple internal spaces,
- * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.
- *
- * The new_key is allocated to hold the corrected keyword and must be freed
- * by the calling routine.  This avoids problems with trying to write to
- * static keywords without having to have duplicate copies of the strings.
- */
-png_size_t /* PRIVATE */
-png_check_keyword(png_structp png_ptr, png_const_charp key, png_charpp new_key)
-{
-   png_size_t key_len;
-   png_const_charp ikp;
-   png_charp kp, dp;
-   int kflag;
-   int kwarn=0;
-
-   png_debug(1, "in png_check_keyword");
-
-   *new_key = NULL;
-
-   if (key == NULL || (key_len = png_strlen(key)) == 0)
-   {
-      png_warning(png_ptr, "zero length keyword");
-      return ((png_size_t)0);
-   }
-
-   png_debug1(2, "Keyword to be checked is '%s'", key);
-
-   *new_key = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)(key_len + 2));
-
-   if (*new_key == NULL)
-   {
-      png_warning(png_ptr, "Out of memory while procesing keyword");
-      return ((png_size_t)0);
-   }
-
-   /* Replace non-printing characters with a blank and print a warning */
-   for (ikp = key, dp = *new_key; *ikp != '\0'; ikp++, dp++)
-   {
-      if ((png_byte)*ikp < 0x20 ||
-         ((png_byte)*ikp > 0x7E && (png_byte)*ikp < 0xA1))
-      {
-         PNG_WARNING_PARAMETERS(p)
-
-         png_warning_parameter_unsigned(p, 1, PNG_NUMBER_FORMAT_02x,
-            (png_byte)*ikp);
-         png_formatted_warning(png_ptr, p, "invalid keyword character 0x@1");
-         *dp = ' ';
-      }
-
-      else
-      {
-         *dp = *ikp;
-      }
-   }
-   *dp = '\0';
-
-   /* Remove any trailing white space. */
-   kp = *new_key + key_len - 1;
-   if (*kp == ' ')
-   {
-      png_warning(png_ptr, "trailing spaces removed from keyword");
-
-      while (*kp == ' ')
-      {
-         *(kp--) = '\0';
-         key_len--;
-      }
-   }
-
-   /* Remove any leading white space. */
-   kp = *new_key;
-   if (*kp == ' ')
-   {
-      png_warning(png_ptr, "leading spaces removed from keyword");
-
-      while (*kp == ' ')
-      {
-         kp++;
-         key_len--;
-      }
-   }
-
-   png_debug1(2, "Checking for multiple internal spaces in '%s'", kp);
-
-   /* Remove multiple internal spaces. */
-   for (kflag = 0, dp = *new_key; *kp != '\0'; kp++)
-   {
-      if (*kp == ' ' && kflag == 0)
-      {
-         *(dp++) = *kp;
-         kflag = 1;
-      }
-
-      else if (*kp == ' ')
-      {
-         key_len--;
-         kwarn = 1;
-      }
-
-      else
-      {
-         *(dp++) = *kp;
-         kflag = 0;
-      }
-   }
-   *dp = '\0';
-   if (kwarn)
-      png_warning(png_ptr, "extra interior spaces removed from keyword");
-
-   if (key_len == 0)
-   {
-      png_free(png_ptr, *new_key);
-      png_warning(png_ptr, "Zero length keyword");
-   }
-
-   if (key_len > 79)
-   {
-      png_warning(png_ptr, "keyword length must be 1 - 79 characters");
-      (*new_key)[79] = '\0';
-      key_len = 79;
-   }
-
-   return (key_len);
-}
-#endif
-
-#ifdef PNG_WRITE_tEXt_SUPPORTED
-/* Write a tEXt chunk */
-void /* PRIVATE */
-png_write_tEXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
-    png_size_t text_len)
-{
-   png_size_t key_len;
-   png_charp new_key;
-
-   png_debug(1, "in png_write_tEXt");
-
-   if ((key_len = png_check_keyword(png_ptr, key, &new_key))==0)
-      return;
-
-   if (text == NULL || *text == '\0')
-      text_len = 0;
-
-   else
-      text_len = png_strlen(text);
-
-   /* Make sure we include the 0 after the key */
-   png_write_chunk_header(png_ptr, png_tEXt,
-       (png_uint_32)(key_len + text_len + 1));
-   /*
-    * We leave it to the application to meet PNG-1.0 requirements on the
-    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
-    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
-    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
-    */
-   png_write_chunk_data(png_ptr, (png_bytep)new_key,
-       (png_size_t)(key_len + 1));
-
-   if (text_len)
-      png_write_chunk_data(png_ptr, (png_const_bytep)text,
-          (png_size_t)text_len);
-
-   png_write_chunk_end(png_ptr);
-   png_free(png_ptr, new_key);
-}
-#endif
-
-#ifdef PNG_WRITE_zTXt_SUPPORTED
-/* Write a compressed text chunk */
-void /* PRIVATE */
-png_write_zTXt(png_structp png_ptr, png_const_charp key, png_const_charp text,
-    png_size_t text_len, int compression)
-{
-   png_size_t key_len;
-   png_byte buf;
-   png_charp new_key;
-   compression_state comp;
-
-   png_debug(1, "in png_write_zTXt");
-
-   comp.num_output_ptr = 0;
-   comp.max_output_ptr = 0;
-   comp.output_ptr = NULL;
-   comp.input = NULL;
-   comp.input_len = 0;
-
-   if ((key_len = png_check_keyword(png_ptr, key, &new_key)) == 0)
-   {
-      png_free(png_ptr, new_key);
-      return;
-   }
-
-   if (text == NULL || *text == '\0' || compression==PNG_TEXT_COMPRESSION_NONE)
-   {
-      png_write_tEXt(png_ptr, new_key, text, (png_size_t)0);
-      png_free(png_ptr, new_key);
-      return;
-   }
-
-   text_len = png_strlen(text);
-
-   /* Compute the compressed data; do it now for the length */
-   text_len = png_text_compress(png_ptr, text, text_len, compression,
-       &comp);
-
-   /* Write start of chunk */
-   png_write_chunk_header(png_ptr, png_zTXt,
-       (png_uint_32)(key_len+text_len + 2));
-
-   /* Write key */
-   png_write_chunk_data(png_ptr, (png_bytep)new_key,
-       (png_size_t)(key_len + 1));
-
-   png_free(png_ptr, new_key);
-
-   buf = (png_byte)compression;
-
-   /* Write compression */
-   png_write_chunk_data(png_ptr, &buf, (png_size_t)1);
-
-   /* Write the compressed data */
-   comp.input_len = text_len;
-   png_write_compressed_data_out(png_ptr, &comp);
-
-   /* Close the chunk */
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_iTXt_SUPPORTED
-/* Write an iTXt chunk */
-void /* PRIVATE */
-png_write_iTXt(png_structp png_ptr, int compression, png_const_charp key,
-    png_const_charp lang, png_const_charp lang_key, png_const_charp text)
-{
-   png_size_t lang_len, key_len, lang_key_len, text_len;
-   png_charp new_lang;
-   png_charp new_key = NULL;
-   png_byte cbuf[2];
-   compression_state comp;
-
-   png_debug(1, "in png_write_iTXt");
-
-   comp.num_output_ptr = 0;
-   comp.max_output_ptr = 0;
-   comp.output_ptr = NULL;
-   comp.input = NULL;
-
-   if ((key_len = png_check_keyword(png_ptr, key, &new_key)) == 0)
-      return;
-
-   if ((lang_len = png_check_keyword(png_ptr, lang, &new_lang)) == 0)
-   {
-      png_warning(png_ptr, "Empty language field in iTXt chunk");
-      new_lang = NULL;
-      lang_len = 0;
-   }
-
-   if (lang_key == NULL)
-      lang_key_len = 0;
-
-   else
-      lang_key_len = png_strlen(lang_key);
-
-   if (text == NULL)
-      text_len = 0;
-
-   else
-      text_len = png_strlen(text);
-
-   /* Compute the compressed data; do it now for the length */
-   text_len = png_text_compress(png_ptr, text, text_len, compression - 2,
-       &comp);
-
-
-   /* Make sure we include the compression flag, the compression byte,
-    * and the NULs after the key, lang, and lang_key parts
-    */
-
-   png_write_chunk_header(png_ptr, png_iTXt, (png_uint_32)(
-        5 /* comp byte, comp flag, terminators for key, lang and lang_key */
-        + key_len
-        + lang_len
-        + lang_key_len
-        + text_len));
-
-   /* We leave it to the application to meet PNG-1.0 requirements on the
-    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
-    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
-    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
-    */
-   png_write_chunk_data(png_ptr, (png_bytep)new_key, (png_size_t)(key_len + 1));
-
-   /* Set the compression flag */
-   if (compression == PNG_ITXT_COMPRESSION_NONE ||
-       compression == PNG_TEXT_COMPRESSION_NONE)
-      cbuf[0] = 0;
-
-   else /* compression == PNG_ITXT_COMPRESSION_zTXt */
-      cbuf[0] = 1;
-
-   /* Set the compression method */
-   cbuf[1] = 0;
-
-   png_write_chunk_data(png_ptr, cbuf, (png_size_t)2);
-
-   cbuf[0] = 0;
-   png_write_chunk_data(png_ptr, (new_lang ? (png_const_bytep)new_lang : cbuf),
-       (png_size_t)(lang_len + 1));
-
-   png_write_chunk_data(png_ptr, (lang_key ? (png_const_bytep)lang_key : cbuf),
-       (png_size_t)(lang_key_len + 1));
-
-   png_write_compressed_data_out(png_ptr, &comp);
-
-   png_write_chunk_end(png_ptr);
-
-   png_free(png_ptr, new_key);
-   png_free(png_ptr, new_lang);
-}
-#endif
-
-#ifdef PNG_WRITE_oFFs_SUPPORTED
-/* Write the oFFs chunk */
-void /* PRIVATE */
-png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
-    int unit_type)
-{
-   png_byte buf[9];
-
-   png_debug(1, "in png_write_oFFs");
-
-   if (unit_type >= PNG_OFFSET_LAST)
-      png_warning(png_ptr, "Unrecognized unit type for oFFs chunk");
-
-   png_save_int_32(buf, x_offset);
-   png_save_int_32(buf + 4, y_offset);
-   buf[8] = (png_byte)unit_type;
-
-   png_write_complete_chunk(png_ptr, png_oFFs, buf, (png_size_t)9);
-}
-#endif
-#ifdef PNG_WRITE_pCAL_SUPPORTED
-/* Write the pCAL chunk (described in the PNG extensions document) */
-void /* PRIVATE */
-png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
-    png_int_32 X1, int type, int nparams, png_const_charp units,
-    png_charpp params)
-{
-   png_size_t purpose_len, units_len, total_len;
-   png_size_tp params_len;
-   png_byte buf[10];
-   png_charp new_purpose;
-   int i;
-
-   png_debug1(1, "in png_write_pCAL (%d parameters)", nparams);
-
-   if (type >= PNG_EQUATION_LAST)
-      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
-
-   purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1;
-   png_debug1(3, "pCAL purpose length = %d", (int)purpose_len);
-   units_len = png_strlen(units) + (nparams == 0 ? 0 : 1);
-   png_debug1(3, "pCAL units length = %d", (int)units_len);
-   total_len = purpose_len + units_len + 10;
-
-   params_len = (png_size_tp)png_malloc(png_ptr,
-       (png_alloc_size_t)(nparams * png_sizeof(png_size_t)));
-
-   /* Find the length of each parameter, making sure we don't count the
-    * null terminator for the last parameter.
-    */
-   for (i = 0; i < nparams; i++)
-   {
-      params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
-      png_debug2(3, "pCAL parameter %d length = %lu", i,
-          (unsigned long)params_len[i]);
-      total_len += params_len[i];
-   }
-
-   png_debug1(3, "pCAL total length = %d", (int)total_len);
-   png_write_chunk_header(png_ptr, png_pCAL, (png_uint_32)total_len);
-   png_write_chunk_data(png_ptr, (png_const_bytep)new_purpose, purpose_len);
-   png_save_int_32(buf, X0);
-   png_save_int_32(buf + 4, X1);
-   buf[8] = (png_byte)type;
-   buf[9] = (png_byte)nparams;
-   png_write_chunk_data(png_ptr, buf, (png_size_t)10);
-   png_write_chunk_data(png_ptr, (png_const_bytep)units, (png_size_t)units_len);
-
-   png_free(png_ptr, new_purpose);
-
-   for (i = 0; i < nparams; i++)
-   {
-      png_write_chunk_data(png_ptr, (png_const_bytep)params[i], params_len[i]);
-   }
-
-   png_free(png_ptr, params_len);
-   png_write_chunk_end(png_ptr);
-}
-#endif
-
-#ifdef PNG_WRITE_sCAL_SUPPORTED
-/* Write the sCAL chunk */
-void /* PRIVATE */
-png_write_sCAL_s(png_structp png_ptr, int unit, png_const_charp width,
-    png_const_charp height)
-{
-   png_byte buf[64];
-   png_size_t wlen, hlen, total_len;
-
-   png_debug(1, "in png_write_sCAL_s");
-
-   wlen = png_strlen(width);
-   hlen = png_strlen(height);
-   total_len = wlen + hlen + 2;
-
-   if (total_len > 64)
-   {
-      png_warning(png_ptr, "Can't write sCAL (buffer too small)");
-      return;
-   }
-
-   buf[0] = (png_byte)unit;
-   png_memcpy(buf + 1, width, wlen + 1);      /* Append the '\0' here */
-   png_memcpy(buf + wlen + 2, height, hlen);  /* Do NOT append the '\0' here */
-
-   png_debug1(3, "sCAL total length = %u", (unsigned int)total_len);
-   png_write_complete_chunk(png_ptr, png_sCAL, buf, total_len);
-}
-#endif
-
-#ifdef PNG_WRITE_pHYs_SUPPORTED
-/* Write the pHYs chunk */
-void /* PRIVATE */
-png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
-    png_uint_32 y_pixels_per_unit,
-    int unit_type)
-{
-   png_byte buf[9];
-
-   png_debug(1, "in png_write_pHYs");
-
-   if (unit_type >= PNG_RESOLUTION_LAST)
-      png_warning(png_ptr, "Unrecognized unit type for pHYs chunk");
-
-   png_save_uint_32(buf, x_pixels_per_unit);
-   png_save_uint_32(buf + 4, y_pixels_per_unit);
-   buf[8] = (png_byte)unit_type;
-
-   png_write_complete_chunk(png_ptr, png_pHYs, buf, (png_size_t)9);
-}
-#endif
-
-#ifdef PNG_WRITE_tIME_SUPPORTED
-/* Write the tIME chunk.  Use either png_convert_from_struct_tm()
- * or png_convert_from_time_t(), or fill in the structure yourself.
- */
-void /* PRIVATE */
-png_write_tIME(png_structp png_ptr, png_const_timep mod_time)
-{
-   png_byte buf[7];
-
-   png_debug(1, "in png_write_tIME");
-
-   if (mod_time->month  > 12 || mod_time->month  < 1 ||
-       mod_time->day    > 31 || mod_time->day    < 1 ||
-       mod_time->hour   > 23 || mod_time->second > 60)
-   {
-      png_warning(png_ptr, "Invalid time specified for tIME chunk");
-      return;
-   }
-
-   png_save_uint_16(buf, mod_time->year);
-   buf[2] = mod_time->month;
-   buf[3] = mod_time->day;
-   buf[4] = mod_time->hour;
-   buf[5] = mod_time->minute;
-   buf[6] = mod_time->second;
-
-   png_write_complete_chunk(png_ptr, png_tIME, buf, (png_size_t)7);
-}
-#endif
-
-/* Initializes the row writing capability of libpng */
-void /* PRIVATE */
-png_write_start_row(png_structp png_ptr)
-{
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif
-
-   png_alloc_size_t buf_size;
-   int usr_pixel_depth;
-
-   png_debug(1, "in png_write_start_row");
-
-   usr_pixel_depth = png_ptr->usr_channels * png_ptr->usr_bit_depth;
-   buf_size = PNG_ROWBYTES(usr_pixel_depth, png_ptr->width) + 1;
-
-   /* 1.5.6: added to allow checking in the row write code. */
-   png_ptr->transformed_pixel_depth = png_ptr->pixel_depth;
-   png_ptr->maximum_pixel_depth = (png_byte)usr_pixel_depth;
-
-   /* Set up row buffer */
-   png_ptr->row_buf = (png_bytep)png_malloc(png_ptr, buf_size);
-
-   png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   /* Set up filtering buffer, if using this filter */
-   if (png_ptr->do_filter & PNG_FILTER_SUB)
-   {
-      png_ptr->sub_row = (png_bytep)png_malloc(png_ptr, png_ptr->rowbytes + 1);
-
-      png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
-   }
-
-   /* We only need to keep the previous row if we are using one of these. */
-   if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
-   {
-      /* Set up previous row buffer */
-      png_ptr->prev_row = (png_bytep)png_calloc(png_ptr, buf_size);
-
-      if (png_ptr->do_filter & PNG_FILTER_UP)
-      {
-         png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
-            png_ptr->rowbytes + 1);
-
-         png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
-      }
-
-      if (png_ptr->do_filter & PNG_FILTER_AVG)
-      {
-         png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
-             png_ptr->rowbytes + 1);
-
-         png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
-      }
-
-      if (png_ptr->do_filter & PNG_FILTER_PAETH)
-      {
-         png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
-             png_ptr->rowbytes + 1);
-
-         png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
-      }
-   }
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* If interlaced, we need to set up width and height of pass */
-   if (png_ptr->interlaced)
-   {
-      if (!(png_ptr->transformations & PNG_INTERLACE))
-      {
-         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
-             png_pass_ystart[0]) / png_pass_yinc[0];
-
-         png_ptr->usr_width = (png_ptr->width + png_pass_inc[0] - 1 -
-             png_pass_start[0]) / png_pass_inc[0];
-      }
-
-      else
-      {
-         png_ptr->num_rows = png_ptr->height;
-         png_ptr->usr_width = png_ptr->width;
-      }
-   }
-
-   else
-#endif
-   {
-      png_ptr->num_rows = png_ptr->height;
-      png_ptr->usr_width = png_ptr->width;
-   }
-
-   png_zlib_claim(png_ptr, PNG_ZLIB_FOR_IDAT);
-   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-   png_ptr->zstream.next_out = png_ptr->zbuf;
-}
-
-/* Internal use only.  Called when finished processing a row of data. */
-void /* PRIVATE */
-png_write_finish_row(png_structp png_ptr)
-{
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   /* Start of interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
-
-   /* Offset to next interlace block in the y direction */
-   static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
-#endif
-
-   int ret;
-
-   png_debug(1, "in png_write_finish_row");
-
-   /* Next row */
-   png_ptr->row_number++;
-
-   /* See if we are done */
-   if (png_ptr->row_number < png_ptr->num_rows)
-      return;
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-   /* If interlaced, go to next pass */
-   if (png_ptr->interlaced)
-   {
-      png_ptr->row_number = 0;
-      if (png_ptr->transformations & PNG_INTERLACE)
-      {
-         png_ptr->pass++;
-      }
-
-      else
-      {
-         /* Loop until we find a non-zero width or height pass */
-         do
-         {
-            png_ptr->pass++;
-
-            if (png_ptr->pass >= 7)
-               break;
-
-            png_ptr->usr_width = (png_ptr->width +
-                png_pass_inc[png_ptr->pass] - 1 -
-                png_pass_start[png_ptr->pass]) /
-                png_pass_inc[png_ptr->pass];
-
-            png_ptr->num_rows = (png_ptr->height +
-                png_pass_yinc[png_ptr->pass] - 1 -
-                png_pass_ystart[png_ptr->pass]) /
-                png_pass_yinc[png_ptr->pass];
-
-            if (png_ptr->transformations & PNG_INTERLACE)
-               break;
-
-         } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
-
-      }
-
-      /* Reset the row above the image for the next pass */
-      if (png_ptr->pass < 7)
-      {
-         if (png_ptr->prev_row != NULL)
-            png_memset(png_ptr->prev_row, 0,
-                (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
-                png_ptr->usr_bit_depth, png_ptr->width)) + 1);
-
-         return;
-      }
-   }
-#endif
-
-   /* If we get here, we've just written the last row, so we need
-      to flush the compressor */
-   do
-   {
-      /* Tell the compressor we are done */
-      ret = deflate(&png_ptr->zstream, Z_FINISH);
-
-      /* Check for an error */
-      if (ret == Z_OK)
-      {
-         /* Check to see if we need more room */
-         if (!(png_ptr->zstream.avail_out))
-         {
-            png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-            png_ptr->zstream.next_out = png_ptr->zbuf;
-            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-         }
-      }
-
-      else if (ret != Z_STREAM_END)
-      {
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-   } while (ret != Z_STREAM_END);
-
-   /* Write any extra space */
-   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
-   {
-      png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size -
-          png_ptr->zstream.avail_out);
-   }
-
-   png_zlib_release(png_ptr);
-   png_ptr->zstream.data_type = Z_BINARY;
-}
-
-#ifdef PNG_WRITE_INTERLACING_SUPPORTED
-/* Pick out the correct pixels for the interlace pass.
- * The basic idea here is to go through the row with a source
- * pointer and a destination pointer (sp and dp), and copy the
- * correct pixels for the pass.  As the row gets compacted,
- * sp will always be >= dp, so we should never overwrite anything.
- * See the default: case for the easiest code to understand.
- */
-void /* PRIVATE */
-png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
-{
-   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
-
-   /* Start of interlace block */
-   static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
-
-   /* Offset to next interlace block */
-   static PNG_CONST png_byte  png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
-
-   png_debug(1, "in png_do_write_interlace");
-
-   /* We don't have to do anything on the last pass (6) */
-   if (pass < 6)
-   {
-      /* Each pixel depth is handled separately */
-      switch (row_info->pixel_depth)
-      {
-         case 1:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            int shift;
-            int d;
-            int value;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            dp = row;
-            d = 0;
-            shift = 7;
-
-            for (i = png_pass_start[pass]; i < row_width;
-               i += png_pass_inc[pass])
-            {
-               sp = row + (png_size_t)(i >> 3);
-               value = (int)(*sp >> (7 - (int)(i & 0x07))) & 0x01;
-               d |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 7;
-                  *dp++ = (png_byte)d;
-                  d = 0;
-               }
-
-               else
-                  shift--;
-
-            }
-            if (shift != 7)
-               *dp = (png_byte)d;
-
-            break;
-         }
-
-         case 2:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            int shift;
-            int d;
-            int value;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            dp = row;
-            shift = 6;
-            d = 0;
-
-            for (i = png_pass_start[pass]; i < row_width;
-               i += png_pass_inc[pass])
-            {
-               sp = row + (png_size_t)(i >> 2);
-               value = (*sp >> ((3 - (int)(i & 0x03)) << 1)) & 0x03;
-               d |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 6;
-                  *dp++ = (png_byte)d;
-                  d = 0;
-               }
-
-               else
-                  shift -= 2;
-            }
-            if (shift != 6)
-               *dp = (png_byte)d;
-
-            break;
-         }
-
-         case 4:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            int shift;
-            int d;
-            int value;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-
-            dp = row;
-            shift = 4;
-            d = 0;
-            for (i = png_pass_start[pass]; i < row_width;
-                i += png_pass_inc[pass])
-            {
-               sp = row + (png_size_t)(i >> 1);
-               value = (*sp >> ((1 - (int)(i & 0x01)) << 2)) & 0x0f;
-               d |= (value << shift);
-
-               if (shift == 0)
-               {
-                  shift = 4;
-                  *dp++ = (png_byte)d;
-                  d = 0;
-               }
-
-               else
-                  shift -= 4;
-            }
-            if (shift != 4)
-               *dp = (png_byte)d;
-
-            break;
-         }
-
-         default:
-         {
-            png_bytep sp;
-            png_bytep dp;
-            png_uint_32 i;
-            png_uint_32 row_width = row_info->width;
-            png_size_t pixel_bytes;
-
-            /* Start at the beginning */
-            dp = row;
-
-            /* Find out how many bytes each pixel takes up */
-            pixel_bytes = (row_info->pixel_depth >> 3);
-
-            /* Loop through the row, only looking at the pixels that matter */
-            for (i = png_pass_start[pass]; i < row_width;
-               i += png_pass_inc[pass])
-            {
-               /* Find out where the original pixel is */
-               sp = row + (png_size_t)i * pixel_bytes;
-
-               /* Move the pixel */
-               if (dp != sp)
-                  png_memcpy(dp, sp, pixel_bytes);
-
-               /* Next pixel */
-               dp += pixel_bytes;
-            }
-            break;
-         }
-      }
-      /* Set new row width */
-      row_info->width = (row_info->width +
-          png_pass_inc[pass] - 1 -
-          png_pass_start[pass]) /
-          png_pass_inc[pass];
-
-      row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
-          row_info->width);
-   }
-}
-#endif
-
-/* This filters the row, chooses which filter to use, if it has not already
- * been specified by the application, and then writes the row out with the
- * chosen filter.
- */
-static void png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row,
-   png_size_t row_bytes);
-
-#define PNG_MAXSUM (((png_uint_32)(-1)) >> 1)
-#define PNG_HISHIFT 10
-#define PNG_LOMASK ((png_uint_32)0xffffL)
-#define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
-void /* PRIVATE */
-png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
-{
-   png_bytep best_row;
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   png_bytep prev_row, row_buf;
-   png_uint_32 mins, bpp;
-   png_byte filter_to_do = png_ptr->do_filter;
-   png_size_t row_bytes = row_info->rowbytes;
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   int num_p_filters = png_ptr->num_prev_filters;
-#endif
-
-   png_debug(1, "in png_write_find_filter");
-
-#ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-  if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
-  {
-     /* These will never be selected so we need not test them. */
-     filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);
-  }
-#endif
-
-   /* Find out how many bytes offset each pixel is */
-   bpp = (row_info->pixel_depth + 7) >> 3;
-
-   prev_row = png_ptr->prev_row;
-#endif
-   best_row = png_ptr->row_buf;
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-   row_buf = best_row;
-   mins = PNG_MAXSUM;
-
-   /* The prediction method we use is to find which method provides the
-    * smallest value when summing the absolute values of the distances
-    * from zero, using anything >= 128 as negative numbers.  This is known
-    * as the "minimum sum of absolute differences" heuristic.  Other
-    * heuristics are the "weighted minimum sum of absolute differences"
-    * (experimental and can in theory improve compression), and the "zlib
-    * predictive" method (not implemented yet), which does test compressions
-    * of lines using different filter methods, and then chooses the
-    * (series of) filter(s) that give minimum compressed data size (VERY
-    * computationally expensive).
-    *
-    * GRR 980525:  consider also
-    *
-    *   (1) minimum sum of absolute differences from running average (i.e.,
-    *       keep running sum of non-absolute differences & count of bytes)
-    *       [track dispersion, too?  restart average if dispersion too large?]
-    *
-    *  (1b) minimum sum of absolute differences from sliding average, probably
-    *       with window size <= deflate window (usually 32K)
-    *
-    *   (2) minimum sum of squared differences from zero or running average
-    *       (i.e., ~ root-mean-square approach)
-    */
-
-
-   /* We don't need to test the 'no filter' case if this is the only filter
-    * that has been chosen, as it doesn't actually do anything to the data.
-    */
-   if ((filter_to_do & PNG_FILTER_NONE) && filter_to_do != PNG_FILTER_NONE)
-   {
-      png_bytep rp;
-      png_uint_32 sum = 0;
-      png_size_t i;
-      int v;
-
-      for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
-      {
-         v = *rp;
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         png_uint_32 sumhi, sumlo;
-         int j;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK; /* Gives us some footroom */
-
-         /* Reduce the sum if we match any of the previous rows */
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
-            {
-               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         /* Factor in the cost of this filter (this is here for completeness,
-          * but it makes no sense to have a "cost" for the NONE filter, as
-          * it has the minimum possible computational cost - none).
-          */
-         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-      mins = sum;
-   }
-
-   /* Sub filter */
-   if (filter_to_do == PNG_FILTER_SUB)
-   /* It's the only filter so no testing is needed */
-   {
-      png_bytep rp, lp, dp;
-      png_size_t i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
-           i++, rp++, dp++)
-      {
-         *dp = *rp;
-      }
-
-      for (lp = row_buf + 1; i < row_bytes;
-         i++, rp++, lp++, dp++)
-      {
-         *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
-      }
-
-      best_row = png_ptr->sub_row;
-   }
-
-   else if (filter_to_do & PNG_FILTER_SUB)
-   {
-      png_bytep rp, dp, lp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      /* We temporarily increase the "minimum sum" by the factor we
-       * would reduce the sum of this filter, so that we can do the
-       * early exit comparison without scaling the sum each time.
-       */
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 lmhi, lmlo;
-         lmlo = lmins & PNG_LOMASK;
-         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
-            {
-               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
-             PNG_COST_SHIFT;
-
-         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
-             PNG_COST_SHIFT;
-
-         if (lmhi > PNG_HIMASK)
-            lmins = PNG_MAXSUM;
-
-         else
-            lmins = (lmhi << PNG_HISHIFT) + lmlo;
-      }
-#endif
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
-           i++, rp++, dp++)
-      {
-         v = *dp = *rp;
-
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-      for (lp = row_buf + 1; i < row_bytes;
-         i++, rp++, lp++, dp++)
-      {
-         v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 sumhi, sumlo;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
-            {
-               sumlo = (sumlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         sumlo = (sumlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-
-      if (sum < mins)
-      {
-         mins = sum;
-         best_row = png_ptr->sub_row;
-      }
-   }
-
-   /* Up filter */
-   if (filter_to_do == PNG_FILTER_UP)
-   {
-      png_bytep rp, dp, pp;
-      png_size_t i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
-          pp = prev_row + 1; i < row_bytes;
-          i++, rp++, pp++, dp++)
-      {
-         *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
-      }
-
-      best_row = png_ptr->up_row;
-   }
-
-   else if (filter_to_do & PNG_FILTER_UP)
-   {
-      png_bytep rp, dp, pp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 lmhi, lmlo;
-         lmlo = lmins & PNG_LOMASK;
-         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
-            {
-               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
-             PNG_COST_SHIFT;
-
-         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
-             PNG_COST_SHIFT;
-
-         if (lmhi > PNG_HIMASK)
-            lmins = PNG_MAXSUM;
-
-         else
-            lmins = (lmhi << PNG_HISHIFT) + lmlo;
-      }
-#endif
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
-          pp = prev_row + 1; i < row_bytes; i++)
-      {
-         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 sumhi, sumlo;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
-            {
-               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-
-      if (sum < mins)
-      {
-         mins = sum;
-         best_row = png_ptr->up_row;
-      }
-   }
-
-   /* Avg filter */
-   if (filter_to_do == PNG_FILTER_AVG)
-   {
-      png_bytep rp, dp, pp, lp;
-      png_uint_32 i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
-           pp = prev_row + 1; i < bpp; i++)
-      {
-         *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
-      }
-
-      for (lp = row_buf + 1; i < row_bytes; i++)
-      {
-         *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
-                 & 0xff);
-      }
-      best_row = png_ptr->avg_row;
-   }
-
-   else if (filter_to_do & PNG_FILTER_AVG)
-   {
-      png_bytep rp, dp, pp, lp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 lmhi, lmlo;
-         lmlo = lmins & PNG_LOMASK;
-         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_AVG)
-            {
-               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
-             PNG_COST_SHIFT;
-
-         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
-             PNG_COST_SHIFT;
-
-         if (lmhi > PNG_HIMASK)
-            lmins = PNG_MAXSUM;
-
-         else
-            lmins = (lmhi << PNG_HISHIFT) + lmlo;
-      }
-#endif
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
-           pp = prev_row + 1; i < bpp; i++)
-      {
-         v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-      for (lp = row_buf + 1; i < row_bytes; i++)
-      {
-         v = *dp++ =
-             (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 sumhi, sumlo;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
-            {
-               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-
-      if (sum < mins)
-      {
-         mins = sum;
-         best_row = png_ptr->avg_row;
-      }
-   }
-
-   /* Paeth filter */
-   if (filter_to_do == PNG_FILTER_PAETH)
-   {
-      png_bytep rp, dp, pp, cp, lp;
-      png_size_t i;
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
-          pp = prev_row + 1; i < bpp; i++)
-      {
-         *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-      }
-
-      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
-      {
-         int a, b, c, pa, pb, pc, p;
-
-         b = *pp++;
-         c = *cp++;
-         a = *lp++;
-
-         p = b - c;
-         pc = a - c;
-
-#ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-
-         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
-
-         *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
-      }
-      best_row = png_ptr->paeth_row;
-   }
-
-   else if (filter_to_do & PNG_FILTER_PAETH)
-   {
-      png_bytep rp, dp, pp, cp, lp;
-      png_uint_32 sum = 0, lmins = mins;
-      png_size_t i;
-      int v;
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 lmhi, lmlo;
-         lmlo = lmins & PNG_LOMASK;
-         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
-            {
-               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
-             PNG_COST_SHIFT;
-
-         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
-             PNG_COST_SHIFT;
-
-         if (lmhi > PNG_HIMASK)
-            lmins = PNG_MAXSUM;
-
-         else
-            lmins = (lmhi << PNG_HISHIFT) + lmlo;
-      }
-#endif
-
-      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
-          pp = prev_row + 1; i < bpp; i++)
-      {
-         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-      }
-
-      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
-      {
-         int a, b, c, pa, pb, pc, p;
-
-         b = *pp++;
-         c = *cp++;
-         a = *lp++;
-
-#ifndef PNG_SLOW_PAETH
-         p = b - c;
-         pc = a - c;
-#ifdef PNG_USE_ABS
-         pa = abs(p);
-         pb = abs(pc);
-         pc = abs(p + pc);
-#else
-         pa = p < 0 ? -p : p;
-         pb = pc < 0 ? -pc : pc;
-         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
-#endif
-         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
-#else /* PNG_SLOW_PAETH */
-         p = a + b - c;
-         pa = abs(p - a);
-         pb = abs(p - b);
-         pc = abs(p - c);
-
-         if (pa <= pb && pa <= pc)
-            p = a;
-
-         else if (pb <= pc)
-            p = b;
-
-         else
-            p = c;
-#endif /* PNG_SLOW_PAETH */
-
-         v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
-
-         sum += (v < 128) ? v : 256 - v;
-
-         if (sum > lmins)  /* We are already worse, don't continue. */
-            break;
-      }
-
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
-      {
-         int j;
-         png_uint_32 sumhi, sumlo;
-         sumlo = sum & PNG_LOMASK;
-         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
-
-         for (j = 0; j < num_p_filters; j++)
-         {
-            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
-            {
-               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-
-               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
-                   PNG_WEIGHT_SHIFT;
-            }
-         }
-
-         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
-             PNG_COST_SHIFT;
-
-         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
-             PNG_COST_SHIFT;
-
-         if (sumhi > PNG_HIMASK)
-            sum = PNG_MAXSUM;
-
-         else
-            sum = (sumhi << PNG_HISHIFT) + sumlo;
-      }
-#endif
-
-      if (sum < mins)
-      {
-         best_row = png_ptr->paeth_row;
-      }
-   }
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-
-   /* Do the actual writing of the filtered row data from the chosen filter. */
-   png_write_filtered_row(png_ptr, best_row, row_info->rowbytes+1);
-
-#ifdef PNG_WRITE_FILTER_SUPPORTED
-#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   /* Save the type of filter we picked this time for future calculations */
-   if (png_ptr->num_prev_filters > 0)
-   {
-      int j;
-
-      for (j = 1; j < num_p_filters; j++)
-      {
-         png_ptr->prev_filters[j] = png_ptr->prev_filters[j - 1];
-      }
-
-      png_ptr->prev_filters[j] = best_row[0];
-   }
-#endif
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
-}
-
-
-/* Do the actual writing of a previously filtered row. */
-static void
-png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row,
-   png_size_t avail/*includes filter byte*/)
-{
-   png_debug(1, "in png_write_filtered_row");
-
-   png_debug1(2, "filter = %d", filtered_row[0]);
-   /* Set up the zlib input buffer */
-
-   png_ptr->zstream.next_in = filtered_row;
-   png_ptr->zstream.avail_in = 0;
-   /* Repeat until we have compressed all the data */
-   do
-   {
-      int ret; /* Return of zlib */
-
-      /* Record the number of bytes available - zlib supports at least 65535
-       * bytes at one step, depending on the size of the zlib type 'uInt', the
-       * maximum size zlib can write at once is ZLIB_IO_MAX (from pngpriv.h).
-       * Use this because on 16 bit systems 'rowbytes' can be up to 65536 (i.e.
-       * one more than 16 bits) and, in this case 'rowbytes+1' can overflow a
-       * uInt.  ZLIB_IO_MAX can be safely reduced to cause zlib to be called
-       * with smaller chunks of data.
-       */
-      if (png_ptr->zstream.avail_in == 0)
-      {
-         if (avail > ZLIB_IO_MAX)
-         {
-            png_ptr->zstream.avail_in  = ZLIB_IO_MAX;
-            avail -= ZLIB_IO_MAX;
-         }
-
-         else
-         {
-            /* So this will fit in the available uInt space: */
-            png_ptr->zstream.avail_in = (uInt)avail;
-            avail = 0;
-         }
-      }
-
-      /* Compress the data */
-      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
-
-      /* Check for compression errors */
-      if (ret != Z_OK)
-      {
-         if (png_ptr->zstream.msg != NULL)
-            png_error(png_ptr, png_ptr->zstream.msg);
-
-         else
-            png_error(png_ptr, "zlib error");
-      }
-
-      /* See if it is time to write another IDAT */
-      if (!(png_ptr->zstream.avail_out))
-      {
-         /* Write the IDAT and reset the zlib output buffer */
-         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
-      }
-   /* Repeat until all data has been compressed */
-   } while (avail > 0 || png_ptr->zstream.avail_in > 0);
-
-   /* Swap the current and previous rows */
-   if (png_ptr->prev_row != NULL)
-   {
-      png_bytep tptr;
-
-      tptr = png_ptr->prev_row;
-      png_ptr->prev_row = png_ptr->row_buf;
-      png_ptr->row_buf = tptr;
-   }
-
-   /* Finish row - updates counters and flushes zlib if last row */
-   png_write_finish_row(png_ptr);
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-   png_ptr->flush_rows++;
-
-   if (png_ptr->flush_dist > 0 &&
-       png_ptr->flush_rows >= png_ptr->flush_dist)
-   {
-      png_write_flush(png_ptr);
-   }
-#endif
-}
-#endif /* PNG_WRITE_SUPPORTED */
+
+/* pngwutil.c - utilities to write a PNG file
+ *
+ * libpng version 1.2.7 - September 12, 2004
+ * For conditions of distribution and use, see copyright notice in png.h
+ * Copyright (c) 1998-2004 Glenn Randers-Pehrson
+ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
+ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ */
+
+#define PNG_INTERNAL
+#include "png.h"
+#ifdef PNG_WRITE_SUPPORTED
+
+/* Place a 32-bit number into a buffer in PNG byte order.  We work
+ * with unsigned numbers for convenience, although one supported
+ * ancillary chunk uses signed (two's complement) numbers.
+ */
+void /* PRIVATE */
+png_save_uint_32(png_bytep buf, png_uint_32 i)
+{
+   buf[0] = (png_byte)((i >> 24) & 0xff);
+   buf[1] = (png_byte)((i >> 16) & 0xff);
+   buf[2] = (png_byte)((i >> 8) & 0xff);
+   buf[3] = (png_byte)(i & 0xff);
+}
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED) || defined(PNG_WRITE_oFFs_SUPPORTED)
+/* The png_save_int_32 function assumes integers are stored in two's
+ * complement format.  If this isn't the case, then this routine needs to
+ * be modified to write data in two's complement format.
+ */
+void /* PRIVATE */
+png_save_int_32(png_bytep buf, png_int_32 i)
+{
+   buf[0] = (png_byte)((i >> 24) & 0xff);
+   buf[1] = (png_byte)((i >> 16) & 0xff);
+   buf[2] = (png_byte)((i >> 8) & 0xff);
+   buf[3] = (png_byte)(i & 0xff);
+}
+#endif
+
+/* Place a 16-bit number into a buffer in PNG byte order.
+ * The parameter is declared unsigned int, not png_uint_16,
+ * just to avoid potential problems on pre-ANSI C compilers.
+ */
+void /* PRIVATE */
+png_save_uint_16(png_bytep buf, unsigned int i)
+{
+   buf[0] = (png_byte)((i >> 8) & 0xff);
+   buf[1] = (png_byte)(i & 0xff);
+}
+
+/* Write a PNG chunk all at once.  The type is an array of ASCII characters
+ * representing the chunk name.  The array must be at least 4 bytes in
+ * length, and does not need to be null terminated.  To be safe, pass the
+ * pre-defined chunk names here, and if you need a new one, define it
+ * where the others are defined.  The length is the length of the data.
+ * All the data must be present.  If that is not possible, use the
+ * png_write_chunk_start(), png_write_chunk_data(), and png_write_chunk_end()
+ * functions instead.
+ */
+void PNGAPI
+png_write_chunk(png_structp png_ptr, png_bytep chunk_name,
+   png_bytep data, png_size_t length)
+{
+   png_write_chunk_start(png_ptr, chunk_name, (png_uint_32)length);
+   png_write_chunk_data(png_ptr, data, length);
+   png_write_chunk_end(png_ptr);
+}
+
+/* Write the start of a PNG chunk.  The type is the chunk type.
+ * The total_length is the sum of the lengths of all the data you will be
+ * passing in png_write_chunk_data().
+ */
+void PNGAPI
+png_write_chunk_start(png_structp png_ptr, png_bytep chunk_name,
+   png_uint_32 length)
+{
+   png_byte buf[4];
+   png_debug2(0, "Writing %s chunk (%lu bytes)\n", chunk_name, length);
+
+   /* write the length */
+   png_save_uint_32(buf, length);
+   png_write_data(png_ptr, buf, (png_size_t)4);
+
+   /* write the chunk name */
+   png_write_data(png_ptr, chunk_name, (png_size_t)4);
+   /* reset the crc and run it over the chunk name */
+   png_reset_crc(png_ptr);
+   png_calculate_crc(png_ptr, chunk_name, (png_size_t)4);
+}
+
+/* Write the data of a PNG chunk started with png_write_chunk_start().
+ * Note that multiple calls to this function are allowed, and that the
+ * sum of the lengths from these calls *must* add up to the total_length
+ * given to png_write_chunk_start().
+ */
+void PNGAPI
+png_write_chunk_data(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+   /* write the data, and run the CRC over it */
+   if (data != NULL && length > 0)
+   {
+      png_calculate_crc(png_ptr, data, length);
+      png_write_data(png_ptr, data, length);
+   }
+}
+
+/* Finish a chunk started with png_write_chunk_start(). */
+void PNGAPI
+png_write_chunk_end(png_structp png_ptr)
+{
+   png_byte buf[4];
+
+   /* write the crc */
+   png_save_uint_32(buf, png_ptr->crc);
+
+   png_write_data(png_ptr, buf, (png_size_t)4);
+}
+
+/* Simple function to write the signature.  If we have already written
+ * the magic bytes of the signature, or more likely, the PNG stream is
+ * being embedded into another stream and doesn't need its own signature,
+ * we should call png_set_sig_bytes() to tell libpng how many of the
+ * bytes have already been written.
+ */
+void /* PRIVATE */
+png_write_sig(png_structp png_ptr)
+{
+   png_byte png_signature[8] = {137, 80, 78, 71, 13, 10, 26, 10};
+   /* write the rest of the 8 byte signature */
+   png_write_data(png_ptr, &png_signature[png_ptr->sig_bytes],
+      (png_size_t)8 - png_ptr->sig_bytes);
+   if(png_ptr->sig_bytes < 3)
+      png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
+}
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_iCCP_SUPPORTED)
+/*
+ * This pair of functions encapsulates the operation of (a) compressing a
+ * text string, and (b) issuing it later as a series of chunk data writes.
+ * The compression_state structure is shared context for these functions
+ * set up by the caller in order to make the whole mess thread-safe.
+ */
+
+typedef struct
+{
+    char *input;   /* the uncompressed input data */
+    int input_len;   /* its length */
+    int num_output_ptr; /* number of output pointers used */
+    int max_output_ptr; /* size of output_ptr */
+    png_charpp output_ptr; /* array of pointers to output */
+} compression_state;
+
+/* compress given text into storage in the png_ptr structure */
+static int /* PRIVATE */
+png_text_compress(png_structp png_ptr,
+        png_charp text, png_size_t text_len, int compression,
+        compression_state *comp)
+{
+   int ret;
+
+   comp->num_output_ptr = comp->max_output_ptr = 0;
+   comp->output_ptr = NULL;
+   comp->input = NULL;
+
+   /* we may just want to pass the text right through */
+   if (compression == PNG_TEXT_COMPRESSION_NONE)
+   {
+       comp->input = text;
+       comp->input_len = text_len;
+       return((int)text_len);
+   }
+
+   if (compression >= PNG_TEXT_COMPRESSION_LAST)
+   {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+      char msg[50];
+      sprintf(msg, "Unknown compression type %d", compression);
+      png_warning(png_ptr, msg);
+#else
+      png_warning(png_ptr, "Unknown compression type");
+#endif
+   }
+
+   /* We can't write the chunk until we find out how much data we have,
+    * which means we need to run the compressor first and save the
+    * output.  This shouldn't be a problem, as the vast majority of
+    * comments should be reasonable, but we will set up an array of
+    * malloc'd pointers to be sure.
+    *
+    * If we knew the application was well behaved, we could simplify this
+    * greatly by assuming we can always malloc an output buffer large
+    * enough to hold the compressed text ((1001 * text_len / 1000) + 12)
+    * and malloc this directly.  The only time this would be a bad idea is
+    * if we can't malloc more than 64K and we have 64K of random input
+    * data, or if the input string is incredibly large (although this
+    * wouldn't cause a failure, just a slowdown due to swapping).
+    */
+
+   /* set up the compression buffers */
+   png_ptr->zstream.avail_in = (uInt)text_len;
+   png_ptr->zstream.next_in = (Bytef *)text;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   png_ptr->zstream.next_out = (Bytef *)png_ptr->zbuf;
+
+   /* this is the same compression loop as in png_write_row() */
+   do
+   {
+      /* compress the data */
+      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+      if (ret != Z_OK)
+      {
+         /* error */
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+      /* check to see if we need more room */
+      if (!png_ptr->zstream.avail_out && png_ptr->zstream.avail_in)
+      {
+         /* make sure the output array has room */
+         if (comp->num_output_ptr >= comp->max_output_ptr)
+         {
+            int old_max;
+
+            old_max = comp->max_output_ptr;
+            comp->max_output_ptr = comp->num_output_ptr + 4;
+            if (comp->output_ptr != NULL)
+            {
+               png_charpp old_ptr;
+
+               old_ptr = comp->output_ptr;
+               comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                  (png_uint_32)(comp->max_output_ptr *
+                  png_sizeof (png_charpp)));
+               png_memcpy(comp->output_ptr, old_ptr, old_max
+                  * png_sizeof (png_charp));
+               png_free(png_ptr, old_ptr);
+            }
+            else
+               comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                  (png_uint_32)(comp->max_output_ptr *
+                  png_sizeof (png_charp)));
+         }
+
+         /* save the data */
+         comp->output_ptr[comp->num_output_ptr] = (png_charp)png_malloc(png_ptr,
+            (png_uint_32)png_ptr->zbuf_size);
+         png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
+            png_ptr->zbuf_size);
+         comp->num_output_ptr++;
+
+         /* and reset the buffer */
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+      }
+   /* continue until we don't have any more to compress */
+   } while (png_ptr->zstream.avail_in);
+
+   /* finish the compression */
+   do
+   {
+      /* tell zlib we are finished */
+      ret = deflate(&png_ptr->zstream, Z_FINISH);
+
+      if (ret == Z_OK)
+      {
+         /* check to see if we need more room */
+         if (!(png_ptr->zstream.avail_out))
+         {
+            /* check to make sure our output array has room */
+            if (comp->num_output_ptr >= comp->max_output_ptr)
+            {
+               int old_max;
+
+               old_max = comp->max_output_ptr;
+               comp->max_output_ptr = comp->num_output_ptr + 4;
+               if (comp->output_ptr != NULL)
+               {
+                  png_charpp old_ptr;
+
+                  old_ptr = comp->output_ptr;
+                  /* This could be optimized to realloc() */
+                  comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                     (png_uint_32)(comp->max_output_ptr *
+                     png_sizeof (png_charpp)));
+                  png_memcpy(comp->output_ptr, old_ptr,
+                     old_max * png_sizeof (png_charp));
+                  png_free(png_ptr, old_ptr);
+               }
+               else
+                  comp->output_ptr = (png_charpp)png_malloc(png_ptr,
+                     (png_uint_32)(comp->max_output_ptr *
+                     png_sizeof (png_charp)));
+            }
+
+            /* save off the data */
+            comp->output_ptr[comp->num_output_ptr] =
+               (png_charp)png_malloc(png_ptr, (png_uint_32)png_ptr->zbuf_size);
+            png_memcpy(comp->output_ptr[comp->num_output_ptr], png_ptr->zbuf,
+               png_ptr->zbuf_size);
+            comp->num_output_ptr++;
+
+            /* and reset the buffer pointers */
+            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+            png_ptr->zstream.next_out = png_ptr->zbuf;
+         }
+      }
+      else if (ret != Z_STREAM_END)
+      {
+         /* we got an error */
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+   } while (ret != Z_STREAM_END);
+
+   /* text length is number of buffers plus last buffer */
+   text_len = png_ptr->zbuf_size * comp->num_output_ptr;
+   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+      text_len += png_ptr->zbuf_size - (png_size_t)png_ptr->zstream.avail_out;
+
+   return((int)text_len);
+}
+
+/* ship the compressed text out via chunk writes */
+static void /* PRIVATE */
+png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
+{
+   int i;
+
+   /* handle the no-compression case */
+   if (comp->input)
+   {
+       png_write_chunk_data(png_ptr, (png_bytep)comp->input,
+                            (png_size_t)comp->input_len);
+       return;
+   }
+
+   /* write saved output buffers, if any */
+   for (i = 0; i < comp->num_output_ptr; i++)
+   {
+      png_write_chunk_data(png_ptr,(png_bytep)comp->output_ptr[i],
+         png_ptr->zbuf_size);
+      png_free(png_ptr, comp->output_ptr[i]);
+      comp->output_ptr[i]=NULL;
+   }
+   if (comp->max_output_ptr != 0)
+      png_free(png_ptr, comp->output_ptr);
+      comp->output_ptr=NULL;
+   /* write anything left in zbuf */
+   if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
+      png_write_chunk_data(png_ptr, png_ptr->zbuf,
+         png_ptr->zbuf_size - png_ptr->zstream.avail_out);
+
+   /* reset zlib for another zTXt/iTXt or the image data */
+   deflateReset(&png_ptr->zstream);
+
+}
+#endif
+
+/* Write the IHDR chunk, and update the png_struct with the necessary
+ * information.  Note that the rest of this code depends upon this
+ * information being correct.
+ */
+void /* PRIVATE */
+png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height,
+   int bit_depth, int color_type, int compression_type, int filter_type,
+   int interlace_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IHDR;
+#endif
+   png_byte buf[13]; /* buffer to store the IHDR info */
+
+   png_debug(1, "in png_write_IHDR\n");
+   /* Check that we have valid input data from the application info */
+   switch (color_type)
+   {
+      case PNG_COLOR_TYPE_GRAY:
+         switch (bit_depth)
+         {
+            case 1:
+            case 2:
+            case 4:
+            case 8:
+            case 16: png_ptr->channels = 1; break;
+            default: png_error(png_ptr,"Invalid bit depth for grayscale image");
+         }
+         break;
+      case PNG_COLOR_TYPE_RGB:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for RGB image");
+         png_ptr->channels = 3;
+         break;
+      case PNG_COLOR_TYPE_PALETTE:
+         switch (bit_depth)
+         {
+            case 1:
+            case 2:
+            case 4:
+            case 8: png_ptr->channels = 1; break;
+            default: png_error(png_ptr, "Invalid bit depth for paletted image");
+         }
+         break;
+      case PNG_COLOR_TYPE_GRAY_ALPHA:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for grayscale+alpha image");
+         png_ptr->channels = 2;
+         break;
+      case PNG_COLOR_TYPE_RGB_ALPHA:
+         if (bit_depth != 8 && bit_depth != 16)
+            png_error(png_ptr, "Invalid bit depth for RGBA image");
+         png_ptr->channels = 4;
+         break;
+      default:
+         png_error(png_ptr, "Invalid image color type specified");
+   }
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Invalid compression type specified");
+      compression_type = PNG_COMPRESSION_TYPE_BASE;
+   }
+
+   /* Write filter_method 64 (intrapixel differencing) only if
+    * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and
+    * 2. Libpng did not write a PNG signature (this filter_method is only
+    *    used in PNG datastreams that are embedded in MNG datastreams) and
+    * 3. The application called png_permit_mng_features with a mask that
+    *    included PNG_FLAG_MNG_FILTER_64 and
+    * 4. The filter_method is 64 and
+    * 5. The color_type is RGB or RGBA
+    */
+   if (
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+      !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+      ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
+      (color_type == PNG_COLOR_TYPE_RGB ||
+       color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
+      (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
+#endif
+      filter_type != PNG_FILTER_TYPE_BASE)
+   {
+      png_warning(png_ptr, "Invalid filter type specified");
+      filter_type = PNG_FILTER_TYPE_BASE;
+   }
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   if (interlace_type != PNG_INTERLACE_NONE &&
+      interlace_type != PNG_INTERLACE_ADAM7)
+   {
+      png_warning(png_ptr, "Invalid interlace type specified");
+      interlace_type = PNG_INTERLACE_ADAM7;
+   }
+#else
+   interlace_type=PNG_INTERLACE_NONE;
+#endif
+
+   /* save off the relevent information */
+   png_ptr->bit_depth = (png_byte)bit_depth;
+   png_ptr->color_type = (png_byte)color_type;
+   png_ptr->interlaced = (png_byte)interlace_type;
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+   png_ptr->filter_type = (png_byte)filter_type;
+#endif
+   png_ptr->compression_type = (png_byte)compression_type;
+   png_ptr->width = width;
+   png_ptr->height = height;
+
+   png_ptr->pixel_depth = (png_byte)(bit_depth * png_ptr->channels);
+   png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
+   /* set the usr info, so any transformations can modify it */
+   png_ptr->usr_width = png_ptr->width;
+   png_ptr->usr_bit_depth = png_ptr->bit_depth;
+   png_ptr->usr_channels = png_ptr->channels;
+
+   /* pack the header information into the buffer */
+   png_save_uint_32(buf, width);
+   png_save_uint_32(buf + 4, height);
+   buf[8] = (png_byte)bit_depth;
+   buf[9] = (png_byte)color_type;
+   buf[10] = (png_byte)compression_type;
+   buf[11] = (png_byte)filter_type;
+   buf[12] = (png_byte)interlace_type;
+
+   /* write the chunk */
+   png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
+
+   /* initialize zlib with PNG info */
+   png_ptr->zstream.zalloc = png_zalloc;
+   png_ptr->zstream.zfree = png_zfree;
+   png_ptr->zstream.opaque = (voidpf)png_ptr;
+   if (!(png_ptr->do_filter))
+   {
+      if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
+         png_ptr->bit_depth < 8)
+         png_ptr->do_filter = PNG_FILTER_NONE;
+      else
+         png_ptr->do_filter = PNG_ALL_FILTERS;
+   }
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY))
+   {
+      if (png_ptr->do_filter != PNG_FILTER_NONE)
+         png_ptr->zlib_strategy = Z_FILTERED;
+      else
+         png_ptr->zlib_strategy = Z_DEFAULT_STRATEGY;
+   }
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_LEVEL))
+      png_ptr->zlib_level = Z_DEFAULT_COMPRESSION;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_MEM_LEVEL))
+      png_ptr->zlib_mem_level = 8;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_WINDOW_BITS))
+      png_ptr->zlib_window_bits = 15;
+   if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD))
+      png_ptr->zlib_method = 8;
+   deflateInit2(&png_ptr->zstream, png_ptr->zlib_level,
+      png_ptr->zlib_method, png_ptr->zlib_window_bits,
+      png_ptr->zlib_mem_level, png_ptr->zlib_strategy);
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+
+   png_ptr->mode = PNG_HAVE_IHDR;
+}
+
+/* write the palette.  We are careful not to trust png_color to be in the
+ * correct order for PNG, so people can redefine it to any convenient
+ * structure.
+ */
+void /* PRIVATE */
+png_write_PLTE(png_structp png_ptr, png_colorp palette, png_uint_32 num_pal)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_PLTE;
+#endif
+   png_uint_32 i;
+   png_colorp pal_ptr;
+   png_byte buf[3];
+
+   png_debug(1, "in png_write_PLTE\n");
+   if ((
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+        !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) &&
+#endif
+        num_pal == 0) || num_pal > 256)
+   {
+     if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+     {
+        png_error(png_ptr, "Invalid number of colors in palette");
+     }
+     else
+     {
+        png_warning(png_ptr, "Invalid number of colors in palette");
+        return;
+     }
+   }
+
+   if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+   {
+      png_warning(png_ptr,
+        "Ignoring request to write a PLTE chunk in grayscale PNG");
+      return;
+   }
+
+   png_ptr->num_palette = (png_uint_16)num_pal;
+   png_debug1(3, "num_palette = %d\n", png_ptr->num_palette);
+
+   png_write_chunk_start(png_ptr, (png_bytep)png_PLTE, num_pal * 3);
+#ifndef PNG_NO_POINTER_INDEXING
+   for (i = 0, pal_ptr = palette; i < num_pal; i++, pal_ptr++)
+   {
+      buf[0] = pal_ptr->red;
+      buf[1] = pal_ptr->green;
+      buf[2] = pal_ptr->blue;
+      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+   }
+#else
+   /* This is a little slower but some buggy compilers need to do this instead */
+   pal_ptr=palette;
+   for (i = 0; i < num_pal; i++)
+   {
+      buf[0] = pal_ptr[i].red;
+      buf[1] = pal_ptr[i].green;
+      buf[2] = pal_ptr[i].blue;
+      png_write_chunk_data(png_ptr, buf, (png_size_t)3);
+   }
+#endif
+   png_write_chunk_end(png_ptr);
+   png_ptr->mode |= PNG_HAVE_PLTE;
+}
+
+/* write an IDAT chunk */
+void /* PRIVATE */
+png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IDAT;
+#endif
+   png_debug(1, "in png_write_IDAT\n");
+
+   /* Optimize the CMF field in the zlib stream. */
+   /* This hack of the zlib stream is compliant to the stream specification. */
+   if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
+       png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
+   {
+      unsigned int z_cmf = data[0];  /* zlib compression method and flags */
+      if ((z_cmf & 0x0f) == 8 && (z_cmf & 0xf0) <= 0x70)
+      {
+         /* Avoid memory underflows and multiplication overflows. */
+         /* The conditions below are practically always satisfied;
+            however, they still must be checked. */
+         if (length >= 2 &&
+             png_ptr->height < 16384 && png_ptr->width < 16384)
+         {
+            png_uint_32 uncompressed_idat_size = png_ptr->height *
+               ((png_ptr->width *
+               png_ptr->channels * png_ptr->bit_depth + 15) >> 3);
+            unsigned int z_cinfo = z_cmf >> 4;
+            unsigned int half_z_window_size = 1 << (z_cinfo + 7);
+            while (uncompressed_idat_size <= half_z_window_size &&
+                   half_z_window_size >= 256)
+            {
+               z_cinfo--;
+               half_z_window_size >>= 1;
+            }
+            z_cmf = (z_cmf & 0x0f) | (z_cinfo << 4);
+            if (data[0] != (png_byte)z_cmf)
+            {
+               data[0] = (png_byte)z_cmf;
+               data[1] &= 0xe0;
+               data[1] += (png_byte)(0x1f - ((z_cmf << 8) + data[1]) % 0x1f);
+            }
+         }
+      }
+      else
+         png_error(png_ptr,
+            "Invalid zlib compression method or flags in IDAT");
+   }
+
+   png_write_chunk(png_ptr, (png_bytep)png_IDAT, data, length);
+   png_ptr->mode |= PNG_HAVE_IDAT;
+}
+
+/* write an IEND chunk */
+void /* PRIVATE */
+png_write_IEND(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_IEND;
+#endif
+   png_debug(1, "in png_write_IEND\n");
+   png_write_chunk(png_ptr, (png_bytep)png_IEND, png_bytep_NULL,
+     (png_size_t)0);
+   png_ptr->mode |= PNG_HAVE_IEND;
+}
+
+#if defined(PNG_WRITE_gAMA_SUPPORTED)
+/* write a gAMA chunk */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_gAMA(png_structp png_ptr, double file_gamma)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_gAMA;
+#endif
+   png_uint_32 igamma;
+   png_byte buf[4];
+
+   png_debug(1, "in png_write_gAMA\n");
+   /* file_gamma is saved in 1/100,000ths */
+   igamma = (png_uint_32)(file_gamma * 100000.0 + 0.5);
+   png_save_uint_32(buf, igamma);
+   png_write_chunk(png_ptr, (png_bytep)png_gAMA, buf, (png_size_t)4);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_gAMA_fixed(png_structp png_ptr, png_fixed_point file_gamma)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_gAMA;
+#endif
+   png_byte buf[4];
+
+   png_debug(1, "in png_write_gAMA\n");
+   /* file_gamma is saved in 1/100,000ths */
+   png_save_uint_32(buf, (png_uint_32)file_gamma);
+   png_write_chunk(png_ptr, (png_bytep)png_gAMA, buf, (png_size_t)4);
+}
+#endif
+#endif
+
+#if defined(PNG_WRITE_sRGB_SUPPORTED)
+/* write a sRGB chunk */
+void /* PRIVATE */
+png_write_sRGB(png_structp png_ptr, int srgb_intent)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sRGB;
+#endif
+   png_byte buf[1];
+
+   png_debug(1, "in png_write_sRGB\n");
+   if(srgb_intent >= PNG_sRGB_INTENT_LAST)
+         png_warning(png_ptr,
+            "Invalid sRGB rendering intent specified");
+   buf[0]=(png_byte)srgb_intent;
+   png_write_chunk(png_ptr, (png_bytep)png_sRGB, buf, (png_size_t)1);
+}
+#endif
+
+#if defined(PNG_WRITE_iCCP_SUPPORTED)
+/* write an iCCP chunk */
+void /* PRIVATE */
+png_write_iCCP(png_structp png_ptr, png_charp name, int compression_type,
+   png_charp profile, int profile_len)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_iCCP;
+#endif
+   png_size_t name_len;
+   png_charp new_name;
+   compression_state comp;
+
+   png_debug(1, "in png_write_iCCP\n");
+   if (name == NULL || (name_len = png_check_keyword(png_ptr, name,
+      &new_name)) == 0)
+   {
+      png_warning(png_ptr, "Empty keyword in iCCP chunk");
+      return;
+   }
+
+   if (compression_type != PNG_COMPRESSION_TYPE_BASE)
+      png_warning(png_ptr, "Unknown compression type in iCCP chunk");
+
+   if (profile == NULL)
+      profile_len = 0;
+
+   if (profile_len)
+       profile_len = png_text_compress(png_ptr, profile, (png_size_t)profile_len,
+          PNG_COMPRESSION_TYPE_BASE, &comp);
+
+   /* make sure we include the NULL after the name and the compression type */
+   png_write_chunk_start(png_ptr, (png_bytep)png_iCCP,
+          (png_uint_32)name_len+profile_len+2);
+   new_name[name_len+1]=0x00;
+   png_write_chunk_data(png_ptr, (png_bytep)new_name, name_len + 2);
+
+   if (profile_len)
+      png_write_compressed_data_out(png_ptr, &comp);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_name);
+}
+#endif
+
+#if defined(PNG_WRITE_sPLT_SUPPORTED)
+/* write a sPLT chunk */
+void /* PRIVATE */
+png_write_sPLT(png_structp png_ptr, png_sPLT_tp spalette)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sPLT;
+#endif
+   png_size_t name_len;
+   png_charp new_name;
+   png_byte entrybuf[10];
+   int entry_size = (spalette->depth == 8 ? 6 : 10);
+   int palette_size = entry_size * spalette->nentries;
+   png_sPLT_entryp ep;
+#ifdef PNG_NO_POINTER_INDEXING
+   int i;
+#endif
+
+   png_debug(1, "in png_write_sPLT\n");
+   if (spalette->name == NULL || (name_len = png_check_keyword(png_ptr,
+      spalette->name, &new_name))==0)
+   {
+      png_warning(png_ptr, "Empty keyword in sPLT chunk");
+      return;
+   }
+
+   /* make sure we include the NULL after the name */
+   png_write_chunk_start(png_ptr, (png_bytep)png_sPLT,
+          (png_uint_32)(name_len + 2 + palette_size));
+   png_write_chunk_data(png_ptr, (png_bytep)new_name, name_len + 1);
+   png_write_chunk_data(png_ptr, (png_bytep)&spalette->depth, 1);
+
+   /* loop through each palette entry, writing appropriately */
+#ifndef PNG_NO_POINTER_INDEXING
+   for (ep = spalette->entries; ep<spalette->entries+spalette->nentries; ep++)
+   {
+       if (spalette->depth == 8)
+       {
+           entrybuf[0] = (png_byte)ep->red;
+           entrybuf[1] = (png_byte)ep->green;
+           entrybuf[2] = (png_byte)ep->blue;
+           entrybuf[3] = (png_byte)ep->alpha;
+           png_save_uint_16(entrybuf + 4, ep->frequency);
+       }
+       else
+       {
+           png_save_uint_16(entrybuf + 0, ep->red);
+           png_save_uint_16(entrybuf + 2, ep->green);
+           png_save_uint_16(entrybuf + 4, ep->blue);
+           png_save_uint_16(entrybuf + 6, ep->alpha);
+           png_save_uint_16(entrybuf + 8, ep->frequency);
+       }
+       png_write_chunk_data(png_ptr, entrybuf, (png_size_t)entry_size);
+   }
+#else
+   ep=spalette->entries;
+   for (i=0; i>spalette->nentries; i++)
+   {
+       if (spalette->depth == 8)
+       {
+           entrybuf[0] = (png_byte)ep[i].red;
+           entrybuf[1] = (png_byte)ep[i].green;
+           entrybuf[2] = (png_byte)ep[i].blue;
+           entrybuf[3] = (png_byte)ep[i].alpha;
+           png_save_uint_16(entrybuf + 4, ep[i].frequency);
+       }
+       else
+       {
+           png_save_uint_16(entrybuf + 0, ep[i].red);
+           png_save_uint_16(entrybuf + 2, ep[i].green);
+           png_save_uint_16(entrybuf + 4, ep[i].blue);
+           png_save_uint_16(entrybuf + 6, ep[i].alpha);
+           png_save_uint_16(entrybuf + 8, ep[i].frequency);
+       }
+       png_write_chunk_data(png_ptr, entrybuf, entry_size);
+   }
+#endif
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_name);
+}
+#endif
+
+#if defined(PNG_WRITE_sBIT_SUPPORTED)
+/* write the sBIT chunk */
+void /* PRIVATE */
+png_write_sBIT(png_structp png_ptr, png_color_8p sbit, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sBIT;
+#endif
+   png_byte buf[4];
+   png_size_t size;
+
+   png_debug(1, "in png_write_sBIT\n");
+   /* make sure we don't depend upon the order of PNG_COLOR_8 */
+   if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_byte maxbits;
+
+      maxbits = (png_byte)(color_type==PNG_COLOR_TYPE_PALETTE ? 8 :
+                png_ptr->usr_bit_depth);
+      if (sbit->red == 0 || sbit->red > maxbits ||
+          sbit->green == 0 || sbit->green > maxbits ||
+          sbit->blue == 0 || sbit->blue > maxbits)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[0] = sbit->red;
+      buf[1] = sbit->green;
+      buf[2] = sbit->blue;
+      size = 3;
+   }
+   else
+   {
+      if (sbit->gray == 0 || sbit->gray > png_ptr->usr_bit_depth)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[0] = sbit->gray;
+      size = 1;
+   }
+
+   if (color_type & PNG_COLOR_MASK_ALPHA)
+   {
+      if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
+      {
+         png_warning(png_ptr, "Invalid sBIT depth specified");
+         return;
+      }
+      buf[size++] = sbit->alpha;
+   }
+
+   png_write_chunk(png_ptr, (png_bytep)png_sBIT, buf, size);
+}
+#endif
+
+#if defined(PNG_WRITE_cHRM_SUPPORTED)
+/* write the cHRM chunk */
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_cHRM(png_structp png_ptr, double white_x, double white_y,
+   double red_x, double red_y, double green_x, double green_y,
+   double blue_x, double blue_y)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_cHRM;
+#endif
+   png_byte buf[32];
+   png_uint_32 itemp;
+
+   png_debug(1, "in png_write_cHRM\n");
+   /* each value is saved in 1/100,000ths */
+   if (white_x < 0 || white_x > 0.8 || white_y < 0 || white_y > 0.8 ||
+       white_x + white_y > 1.0)
+   {
+      png_warning(png_ptr, "Invalid cHRM white point specified");
+#if !defined(PNG_NO_CONSOLE_IO)
+      fprintf(stderr,"white_x=%f, white_y=%f\n",white_x, white_y);
+#endif
+      return;
+   }
+   itemp = (png_uint_32)(white_x * 100000.0 + 0.5);
+   png_save_uint_32(buf, itemp);
+   itemp = (png_uint_32)(white_y * 100000.0 + 0.5);
+   png_save_uint_32(buf + 4, itemp);
+
+   if (red_x < 0 || red_x > 0.8 || red_y < 0 || red_y > 0.8 ||
+       red_x + red_y > 1.0)
+   {
+      png_warning(png_ptr, "Invalid cHRM red point specified");
+      return;
+   }
+   itemp = (png_uint_32)(red_x * 100000.0 + 0.5);
+   png_save_uint_32(buf + 8, itemp);
+   itemp = (png_uint_32)(red_y * 100000.0 + 0.5);
+   png_save_uint_32(buf + 12, itemp);
+
+   if (green_x < 0 || green_x > 0.8 || green_y < 0 || green_y > 0.8 ||
+       green_x + green_y > 1.0)
+   {
+      png_warning(png_ptr, "Invalid cHRM green point specified");
+      return;
+   }
+   itemp = (png_uint_32)(green_x * 100000.0 + 0.5);
+   png_save_uint_32(buf + 16, itemp);
+   itemp = (png_uint_32)(green_y * 100000.0 + 0.5);
+   png_save_uint_32(buf + 20, itemp);
+
+   if (blue_x < 0 || blue_x > 0.8 || blue_y < 0 || blue_y > 0.8 ||
+       blue_x + blue_y > 1.0)
+   {
+      png_warning(png_ptr, "Invalid cHRM blue point specified");
+      return;
+   }
+   itemp = (png_uint_32)(blue_x * 100000.0 + 0.5);
+   png_save_uint_32(buf + 24, itemp);
+   itemp = (png_uint_32)(blue_y * 100000.0 + 0.5);
+   png_save_uint_32(buf + 28, itemp);
+
+   png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);
+}
+#endif
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x,
+   png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y,
+   png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x,
+   png_fixed_point blue_y)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_cHRM;
+#endif
+   png_byte buf[32];
+
+   png_debug(1, "in png_write_cHRM\n");
+   /* each value is saved in 1/100,000ths */
+   if (white_x > 80000L || white_y > 80000L || white_x + white_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid fixed cHRM white point specified");
+#if !defined(PNG_NO_CONSOLE_IO)
+      fprintf(stderr,"white_x=%ld, white_y=%ld\n",white_x, white_y);
+#endif
+      return;
+   }
+   png_save_uint_32(buf, (png_uint_32)white_x);
+   png_save_uint_32(buf + 4, (png_uint_32)white_y);
+
+   if (red_x > 80000L || red_y > 80000L || red_x + red_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid cHRM fixed red point specified");
+      return;
+   }
+   png_save_uint_32(buf + 8, (png_uint_32)red_x);
+   png_save_uint_32(buf + 12, (png_uint_32)red_y);
+
+   if (green_x > 80000L || green_y > 80000L || green_x + green_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid fixed cHRM green point specified");
+      return;
+   }
+   png_save_uint_32(buf + 16, (png_uint_32)green_x);
+   png_save_uint_32(buf + 20, (png_uint_32)green_y);
+
+   if (blue_x > 80000L || blue_y > 80000L || blue_x + blue_y > 100000L)
+   {
+      png_warning(png_ptr, "Invalid fixed cHRM blue point specified");
+      return;
+   }
+   png_save_uint_32(buf + 24, (png_uint_32)blue_x);
+   png_save_uint_32(buf + 28, (png_uint_32)blue_y);
+
+   png_write_chunk(png_ptr, (png_bytep)png_cHRM, buf, (png_size_t)32);
+}
+#endif
+#endif
+
+#if defined(PNG_WRITE_tRNS_SUPPORTED)
+/* write the tRNS chunk */
+void /* PRIVATE */
+png_write_tRNS(png_structp png_ptr, png_bytep trans, png_color_16p tran,
+   int num_trans, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tRNS;
+#endif
+   png_byte buf[6];
+
+   png_debug(1, "in png_write_tRNS\n");
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (num_trans <= 0 || num_trans > (int)png_ptr->num_palette)
+      {
+         png_warning(png_ptr,"Invalid number of transparent colors specified");
+         return;
+      }
+      /* write the chunk out as it is */
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, trans, (png_size_t)num_trans);
+   }
+   else if (color_type == PNG_COLOR_TYPE_GRAY)
+   {
+      /* one 16 bit value */
+      if(tran->gray >= (1 << png_ptr->bit_depth))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write tRNS chunk out-of-range for bit_depth");
+         return;
+      }
+      png_save_uint_16(buf, tran->gray);
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, buf, (png_size_t)2);
+   }
+   else if (color_type == PNG_COLOR_TYPE_RGB)
+   {
+      /* three 16 bit values */
+      png_save_uint_16(buf, tran->red);
+      png_save_uint_16(buf + 2, tran->green);
+      png_save_uint_16(buf + 4, tran->blue);
+      if(png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+         {
+            png_warning(png_ptr,
+              "Ignoring attempt to write 16-bit tRNS chunk when bit_depth is 8");
+            return;
+         }
+      png_write_chunk(png_ptr, (png_bytep)png_tRNS, buf, (png_size_t)6);
+   }
+   else
+   {
+      png_warning(png_ptr, "Can't write tRNS with an alpha channel");
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_bKGD_SUPPORTED)
+/* write the background chunk */
+void /* PRIVATE */
+png_write_bKGD(png_structp png_ptr, png_color_16p back, int color_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_bKGD;
+#endif
+   png_byte buf[6];
+
+   png_debug(1, "in png_write_bKGD\n");
+   if (color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if (
+#if defined(PNG_MNG_FEATURES_SUPPORTED)
+          (png_ptr->num_palette ||
+          (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) &&
+#endif
+         back->index > png_ptr->num_palette)
+      {
+         png_warning(png_ptr, "Invalid background palette index");
+         return;
+      }
+      buf[0] = back->index;
+      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)1);
+   }
+   else if (color_type & PNG_COLOR_MASK_COLOR)
+   {
+      png_save_uint_16(buf, back->red);
+      png_save_uint_16(buf + 2, back->green);
+      png_save_uint_16(buf + 4, back->blue);
+      if(png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+         {
+            png_warning(png_ptr,
+              "Ignoring attempt to write 16-bit bKGD chunk when bit_depth is 8");
+            return;
+         }
+      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)6);
+   }
+   else
+   {
+      if(back->gray >= (1 << png_ptr->bit_depth))
+      {
+         png_warning(png_ptr,
+           "Ignoring attempt to write bKGD chunk out-of-range for bit_depth");
+         return;
+      }
+      png_save_uint_16(buf, back->gray);
+      png_write_chunk(png_ptr, (png_bytep)png_bKGD, buf, (png_size_t)2);
+   }
+}
+#endif
+
+#if defined(PNG_WRITE_hIST_SUPPORTED)
+/* write the histogram */
+void /* PRIVATE */
+png_write_hIST(png_structp png_ptr, png_uint_16p hist, int num_hist)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_hIST;
+#endif
+   int i;
+   png_byte buf[3];
+
+   png_debug(1, "in png_write_hIST\n");
+   if (num_hist > (int)png_ptr->num_palette)
+   {
+      png_debug2(3, "num_hist = %d, num_palette = %d\n", num_hist,
+         png_ptr->num_palette);
+      png_warning(png_ptr, "Invalid number of histogram entries specified");
+      return;
+   }
+
+   png_write_chunk_start(png_ptr, (png_bytep)png_hIST, (png_uint_32)(num_hist * 2));
+   for (i = 0; i < num_hist; i++)
+   {
+      png_save_uint_16(buf, hist[i]);
+      png_write_chunk_data(png_ptr, buf, (png_size_t)2);
+   }
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
+    defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
+/* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification,
+ * and if invalid, correct the keyword rather than discarding the entire
+ * chunk.  The PNG 1.0 specification requires keywords 1-79 characters in
+ * length, forbids leading or trailing whitespace, multiple internal spaces,
+ * and the non-break space (0x80) from ISO 8859-1.  Returns keyword length.
+ *
+ * The new_key is allocated to hold the corrected keyword and must be freed
+ * by the calling routine.  This avoids problems with trying to write to
+ * static keywords without having to have duplicate copies of the strings.
+ */
+png_size_t /* PRIVATE */
+png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)
+{
+   png_size_t key_len;
+   png_charp kp, dp;
+   int kflag;
+   int kwarn=0;
+
+   png_debug(1, "in png_check_keyword\n");
+   *new_key = NULL;
+
+   if (key == NULL || (key_len = png_strlen(key)) == 0)
+   {
+      png_warning(png_ptr, "zero length keyword");
+      return ((png_size_t)0);
+   }
+
+   png_debug1(2, "Keyword to be checked is '%s'\n", key);
+
+   *new_key = (png_charp)png_malloc_warn(png_ptr, (png_uint_32)(key_len + 2));
+   if (*new_key == NULL)
+   {
+      png_warning(png_ptr, "Out of memory while procesing keyword");
+      return ((png_size_t)0);
+   }
+
+   /* Replace non-printing characters with a blank and print a warning */
+   for (kp = key, dp = *new_key; *kp != '\0'; kp++, dp++)
+   {
+      if (*kp < 0x20 || (*kp > 0x7E && (png_byte)*kp < 0xA1))
+      {
+#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
+         char msg[40];
+
+         sprintf(msg, "invalid keyword character 0x%02X", *kp);
+         png_warning(png_ptr, msg);
+#else
+         png_warning(png_ptr, "invalid character in keyword");
+#endif
+         *dp = ' ';
+      }
+      else
+      {
+         *dp = *kp;
+      }
+   }
+   *dp = '\0';
+
+   /* Remove any trailing white space. */
+   kp = *new_key + key_len - 1;
+   if (*kp == ' ')
+   {
+      png_warning(png_ptr, "trailing spaces removed from keyword");
+
+      while (*kp == ' ')
+      {
+        *(kp--) = '\0';
+        key_len--;
+      }
+   }
+
+   /* Remove any leading white space. */
+   kp = *new_key;
+   if (*kp == ' ')
+   {
+      png_warning(png_ptr, "leading spaces removed from keyword");
+
+      while (*kp == ' ')
+      {
+        kp++;
+        key_len--;
+      }
+   }
+
+   png_debug1(2, "Checking for multiple internal spaces in '%s'\n", kp);
+
+   /* Remove multiple internal spaces. */
+   for (kflag = 0, dp = *new_key; *kp != '\0'; kp++)
+   {
+      if (*kp == ' ' && kflag == 0)
+      {
+         *(dp++) = *kp;
+         kflag = 1;
+      }
+      else if (*kp == ' ')
+      {
+         key_len--;
+         kwarn=1;
+      }
+      else
+      {
+         *(dp++) = *kp;
+         kflag = 0;
+      }
+   }
+   *dp = '\0';
+   if(kwarn)
+      png_warning(png_ptr, "extra interior spaces removed from keyword");
+
+   if (key_len == 0)
+   {
+      png_free(png_ptr, *new_key);
+      *new_key=NULL;
+      png_warning(png_ptr, "Zero length keyword");
+   }
+
+   if (key_len > 79)
+   {
+      png_warning(png_ptr, "keyword length must be 1 - 79 characters");
+      new_key[79] = '\0';
+      key_len = 79;
+   }
+
+   return (key_len);
+}
+#endif
+
+#if defined(PNG_WRITE_tEXt_SUPPORTED)
+/* write a tEXt chunk */
+void /* PRIVATE */
+png_write_tEXt(png_structp png_ptr, png_charp key, png_charp text,
+   png_size_t text_len)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tEXt;
+#endif
+   png_size_t key_len;
+   png_charp new_key;
+
+   png_debug(1, "in png_write_tEXt\n");
+   if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+   {
+      png_warning(png_ptr, "Empty keyword in tEXt chunk");
+      return;
+   }
+
+   if (text == NULL || *text == '\0')
+      text_len = 0;
+   else
+      text_len = png_strlen(text);
+
+   /* make sure we include the 0 after the key */
+   png_write_chunk_start(png_ptr, (png_bytep)png_tEXt, (png_uint_32)key_len+text_len+1);
+   /*
+    * We leave it to the application to meet PNG-1.0 requirements on the
+    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
+    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
+    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
+    */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key, key_len + 1);
+   if (text_len)
+      png_write_chunk_data(png_ptr, (png_bytep)text, text_len);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_key);
+}
+#endif
+
+#if defined(PNG_WRITE_zTXt_SUPPORTED)
+/* write a compressed text chunk */
+void /* PRIVATE */
+png_write_zTXt(png_structp png_ptr, png_charp key, png_charp text,
+   png_size_t text_len, int compression)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_zTXt;
+#endif
+   png_size_t key_len;
+   char buf[1];
+   png_charp new_key;
+   compression_state comp;
+
+   png_debug(1, "in png_write_zTXt\n");
+
+   if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+   {
+      png_warning(png_ptr, "Empty keyword in zTXt chunk");
+      return;
+   }
+
+   if (text == NULL || *text == '\0' || compression==PNG_TEXT_COMPRESSION_NONE)
+   {
+      png_write_tEXt(png_ptr, new_key, text, (png_size_t)0);
+      png_free(png_ptr, new_key);
+      return;
+   }
+
+   text_len = png_strlen(text);
+
+   png_free(png_ptr, new_key);
+
+   /* compute the compressed data; do it now for the length */
+   text_len = png_text_compress(png_ptr, text, text_len, compression,
+       &comp);
+
+   /* write start of chunk */
+   png_write_chunk_start(png_ptr, (png_bytep)png_zTXt, (png_uint_32)
+      (key_len+text_len+2));
+   /* write key */
+   png_write_chunk_data(png_ptr, (png_bytep)key, key_len + 1);
+   buf[0] = (png_byte)compression;
+   /* write compression */
+   png_write_chunk_data(png_ptr, (png_bytep)buf, (png_size_t)1);
+   /* write the compressed data */
+   png_write_compressed_data_out(png_ptr, &comp);
+
+   /* close the chunk */
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_iTXt_SUPPORTED)
+/* write an iTXt chunk */
+void /* PRIVATE */
+png_write_iTXt(png_structp png_ptr, int compression, png_charp key,
+    png_charp lang, png_charp lang_key, png_charp text)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_iTXt;
+#endif
+   png_size_t lang_len, key_len, lang_key_len, text_len;
+   png_charp new_lang, new_key;
+   png_byte cbuf[2];
+   compression_state comp;
+
+   png_debug(1, "in png_write_iTXt\n");
+
+   if (key == NULL || (key_len = png_check_keyword(png_ptr, key, &new_key))==0)
+   {
+      png_warning(png_ptr, "Empty keyword in iTXt chunk");
+      return;
+   }
+   if (lang == NULL || (lang_len = png_check_keyword(png_ptr, lang, &new_lang))==0)
+   {
+      png_warning(png_ptr, "Empty language field in iTXt chunk");
+      new_lang = NULL;
+      lang_len = 0;
+   }
+
+   if (lang_key == NULL)
+     lang_key_len = 0;
+   else
+     lang_key_len = png_strlen(lang_key);
+
+   if (text == NULL)
+      text_len = 0;
+   else
+     text_len = png_strlen(text);
+
+   /* compute the compressed data; do it now for the length */
+   text_len = png_text_compress(png_ptr, text, text_len, compression-2,
+      &comp);
+
+
+   /* make sure we include the compression flag, the compression byte,
+    * and the NULs after the key, lang, and lang_key parts */
+
+   png_write_chunk_start(png_ptr, (png_bytep)png_iTXt,
+          (png_uint_32)(
+        5 /* comp byte, comp flag, terminators for key, lang and lang_key */
+        + key_len
+        + lang_len
+        + lang_key_len
+        + text_len));
+
+   /*
+    * We leave it to the application to meet PNG-1.0 requirements on the
+    * contents of the text.  PNG-1.0 through PNG-1.2 discourage the use of
+    * any non-Latin-1 characters except for NEWLINE.  ISO PNG will forbid them.
+    * The NUL character is forbidden by PNG-1.0 through PNG-1.2 and ISO PNG.
+    */
+   png_write_chunk_data(png_ptr, (png_bytep)new_key, key_len + 1);
+
+   /* set the compression flag */
+   if (compression == PNG_ITXT_COMPRESSION_NONE || \
+       compression == PNG_TEXT_COMPRESSION_NONE)
+       cbuf[0] = 0;
+   else /* compression == PNG_ITXT_COMPRESSION_zTXt */
+       cbuf[0] = 1;
+   /* set the compression method */
+   cbuf[1] = 0;
+   png_write_chunk_data(png_ptr, cbuf, 2);
+
+   cbuf[0] = 0;
+   png_write_chunk_data(png_ptr, (new_lang ? (png_bytep)new_lang : cbuf), lang_len + 1);
+   png_write_chunk_data(png_ptr, (lang_key ? (png_bytep)lang_key : cbuf), lang_key_len + 1);
+   png_write_compressed_data_out(png_ptr, &comp);
+
+   png_write_chunk_end(png_ptr);
+   png_free(png_ptr, new_key);
+   if (new_lang)
+     png_free(png_ptr, new_lang);
+}
+#endif
+
+#if defined(PNG_WRITE_oFFs_SUPPORTED)
+/* write the oFFs chunk */
+void /* PRIVATE */
+png_write_oFFs(png_structp png_ptr, png_int_32 x_offset, png_int_32 y_offset,
+   int unit_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_oFFs;
+#endif
+   png_byte buf[9];
+
+   png_debug(1, "in png_write_oFFs\n");
+   if (unit_type >= PNG_OFFSET_LAST)
+      png_warning(png_ptr, "Unrecognized unit type for oFFs chunk");
+
+   png_save_int_32(buf, x_offset);
+   png_save_int_32(buf + 4, y_offset);
+   buf[8] = (png_byte)unit_type;
+
+   png_write_chunk(png_ptr, (png_bytep)png_oFFs, buf, (png_size_t)9);
+}
+#endif
+
+#if defined(PNG_WRITE_pCAL_SUPPORTED)
+/* write the pCAL chunk (described in the PNG extensions document) */
+void /* PRIVATE */
+png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
+   png_int_32 X1, int type, int nparams, png_charp units, png_charpp params)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_pCAL;
+#endif
+   png_size_t purpose_len, units_len, total_len;
+   png_uint_32p params_len;
+   png_byte buf[10];
+   png_charp new_purpose;
+   int i;
+
+   png_debug1(1, "in png_write_pCAL (%d parameters)\n", nparams);
+   if (type >= PNG_EQUATION_LAST)
+      png_warning(png_ptr, "Unrecognized equation type for pCAL chunk");
+
+   purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1;
+   png_debug1(3, "pCAL purpose length = %d\n", (int)purpose_len);
+   units_len = png_strlen(units) + (nparams == 0 ? 0 : 1);
+   png_debug1(3, "pCAL units length = %d\n", (int)units_len);
+   total_len = purpose_len + units_len + 10;
+
+   params_len = (png_uint_32p)png_malloc(png_ptr, (png_uint_32)(nparams
+      *png_sizeof(png_uint_32)));
+
+   /* Find the length of each parameter, making sure we don't count the
+      null terminator for the last parameter. */
+   for (i = 0; i < nparams; i++)
+   {
+      params_len[i] = png_strlen(params[i]) + (i == nparams - 1 ? 0 : 1);
+      png_debug2(3, "pCAL parameter %d length = %lu\n", i, params_len[i]);
+      total_len += (png_size_t)params_len[i];
+   }
+
+   png_debug1(3, "pCAL total length = %d\n", (int)total_len);
+   png_write_chunk_start(png_ptr, (png_bytep)png_pCAL, (png_uint_32)total_len);
+   png_write_chunk_data(png_ptr, (png_bytep)new_purpose, purpose_len);
+   png_save_int_32(buf, X0);
+   png_save_int_32(buf + 4, X1);
+   buf[8] = (png_byte)type;
+   buf[9] = (png_byte)nparams;
+   png_write_chunk_data(png_ptr, buf, (png_size_t)10);
+   png_write_chunk_data(png_ptr, (png_bytep)units, (png_size_t)units_len);
+
+   png_free(png_ptr, new_purpose);
+
+   for (i = 0; i < nparams; i++)
+   {
+      png_write_chunk_data(png_ptr, (png_bytep)params[i],
+         (png_size_t)params_len[i]);
+   }
+
+   png_free(png_ptr, params_len);
+   png_write_chunk_end(png_ptr);
+}
+#endif
+
+#if defined(PNG_WRITE_sCAL_SUPPORTED)
+/* write the sCAL chunk */
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && !defined(PNG_NO_STDIO)
+void /* PRIVATE */
+png_write_sCAL(png_structp png_ptr, int unit, double width,double height)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sCAL;
+#endif
+   png_size_t total_len;
+   char wbuf[32], hbuf[32];
+   png_byte bunit = unit;
+
+   png_debug(1, "in png_write_sCAL\n");
+
+#if defined(_WIN32_WCE)
+/* sprintf() function is not supported on WindowsCE */
+   {
+      wchar_t wc_buf[32];
+      swprintf(wc_buf, TEXT("%12.12e"), width);
+      WideCharToMultiByte(CP_ACP, 0, wc_buf, -1, wbuf, 32, NULL, NULL);
+      swprintf(wc_buf, TEXT("%12.12e"), height);
+      WideCharToMultiByte(CP_ACP, 0, wc_buf, -1, hbuf, 32, NULL, NULL);
+   }
+#else
+   sprintf(wbuf, "%12.12e", width);
+   sprintf(hbuf, "%12.12e", height);
+#endif
+   total_len = 1 + png_strlen(wbuf)+1 + png_strlen(hbuf);
+
+   png_debug1(3, "sCAL total length = %d\n", (int)total_len);
+   png_write_chunk_start(png_ptr, (png_bytep)png_sCAL, (png_uint_32)total_len);
+   png_write_chunk_data(png_ptr, (png_bytep)&bunit, 1);
+   png_write_chunk_data(png_ptr, (png_bytep)wbuf, png_strlen(wbuf)+1);
+   png_write_chunk_data(png_ptr, (png_bytep)hbuf, png_strlen(hbuf));
+
+   png_write_chunk_end(png_ptr);
+}
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+void /* PRIVATE */
+png_write_sCAL_s(png_structp png_ptr, int unit, png_charp width,
+   png_charp height)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_sCAL;
+#endif
+   png_size_t total_len;
+   char wbuf[32], hbuf[32];
+   png_byte bunit = unit;
+
+   png_debug(1, "in png_write_sCAL_s\n");
+
+   png_strcpy(wbuf,(const char *)width);
+   png_strcpy(hbuf,(const char *)height);
+   total_len = 1 + png_strlen(wbuf)+1 + png_strlen(hbuf);
+
+   png_debug1(3, "sCAL total length = %d\n", total_len);
+   png_write_chunk_start(png_ptr, (png_bytep)png_sCAL, (png_uint_32)total_len);
+   png_write_chunk_data(png_ptr, (png_bytep)&bunit, 1);
+   png_write_chunk_data(png_ptr, (png_bytep)wbuf, png_strlen(wbuf)+1);
+   png_write_chunk_data(png_ptr, (png_bytep)hbuf, png_strlen(hbuf));
+
+   png_write_chunk_end(png_ptr);
+}
+#endif
+#endif
+#endif
+
+#if defined(PNG_WRITE_pHYs_SUPPORTED)
+/* write the pHYs chunk */
+void /* PRIVATE */
+png_write_pHYs(png_structp png_ptr, png_uint_32 x_pixels_per_unit,
+   png_uint_32 y_pixels_per_unit,
+   int unit_type)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_pHYs;
+#endif
+   png_byte buf[9];
+
+   png_debug(1, "in png_write_pHYs\n");
+   if (unit_type >= PNG_RESOLUTION_LAST)
+      png_warning(png_ptr, "Unrecognized unit type for pHYs chunk");
+
+   png_save_uint_32(buf, x_pixels_per_unit);
+   png_save_uint_32(buf + 4, y_pixels_per_unit);
+   buf[8] = (png_byte)unit_type;
+
+   png_write_chunk(png_ptr, (png_bytep)png_pHYs, buf, (png_size_t)9);
+}
+#endif
+
+#if defined(PNG_WRITE_tIME_SUPPORTED)
+/* Write the tIME chunk.  Use either png_convert_from_struct_tm()
+ * or png_convert_from_time_t(), or fill in the structure yourself.
+ */
+void /* PRIVATE */
+png_write_tIME(png_structp png_ptr, png_timep mod_time)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   PNG_tIME;
+#endif
+   png_byte buf[7];
+
+   png_debug(1, "in png_write_tIME\n");
+   if (mod_time->month  > 12 || mod_time->month  < 1 ||
+       mod_time->day    > 31 || mod_time->day    < 1 ||
+       mod_time->hour   > 23 || mod_time->second > 60)
+   {
+      png_warning(png_ptr, "Invalid time specified for tIME chunk");
+      return;
+   }
+
+   png_save_uint_16(buf, mod_time->year);
+   buf[2] = mod_time->month;
+   buf[3] = mod_time->day;
+   buf[4] = mod_time->hour;
+   buf[5] = mod_time->minute;
+   buf[6] = mod_time->second;
+
+   png_write_chunk(png_ptr, (png_bytep)png_tIME, buf, (png_size_t)7);
+}
+#endif
+
+/* initializes the row writing capability of libpng */
+void /* PRIVATE */
+png_write_start_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+
+   png_size_t buf_size;
+
+   png_debug(1, "in png_write_start_row\n");
+   buf_size = (png_size_t)(PNG_ROWBYTES(
+      png_ptr->usr_channels*png_ptr->usr_bit_depth,png_ptr->width)+1);
+
+   /* set up row buffer */
+   png_ptr->row_buf = (png_bytep)png_malloc(png_ptr, (png_uint_32)buf_size);
+   png_ptr->row_buf[0] = PNG_FILTER_VALUE_NONE;
+
+   /* set up filtering buffer, if using this filter */
+   if (png_ptr->do_filter & PNG_FILTER_SUB)
+   {
+      png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
+         (png_ptr->rowbytes + 1));
+      png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
+   }
+
+   /* We only need to keep the previous row if we are using one of these. */
+   if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
+   {
+     /* set up previous row buffer */
+      png_ptr->prev_row = (png_bytep)png_malloc(png_ptr, (png_uint_32)buf_size);
+      png_memset(png_ptr->prev_row, 0, buf_size);
+
+      if (png_ptr->do_filter & PNG_FILTER_UP)
+      {
+         png_ptr->up_row = (png_bytep )png_malloc(png_ptr,
+            (png_ptr->rowbytes + 1));
+         png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
+      }
+
+      if (png_ptr->do_filter & PNG_FILTER_AVG)
+      {
+         png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
+            (png_ptr->rowbytes + 1));
+         png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
+      }
+
+      if (png_ptr->do_filter & PNG_FILTER_PAETH)
+      {
+         png_ptr->paeth_row = (png_bytep )png_malloc(png_ptr,
+            (png_ptr->rowbytes + 1));
+         png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
+      }
+   }
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* if interlaced, we need to set up width and height of pass */
+   if (png_ptr->interlaced)
+   {
+      if (!(png_ptr->transformations & PNG_INTERLACE))
+      {
+         png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
+            png_pass_ystart[0]) / png_pass_yinc[0];
+         png_ptr->usr_width = (png_ptr->width + png_pass_inc[0] - 1 -
+            png_pass_start[0]) / png_pass_inc[0];
+      }
+      else
+      {
+         png_ptr->num_rows = png_ptr->height;
+         png_ptr->usr_width = png_ptr->width;
+      }
+   }
+   else
+#endif
+   {
+      png_ptr->num_rows = png_ptr->height;
+      png_ptr->usr_width = png_ptr->width;
+   }
+   png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+   png_ptr->zstream.next_out = png_ptr->zbuf;
+}
+
+/* Internal use only.  Called when finished processing a row of data. */
+void /* PRIVATE */
+png_write_finish_row(png_structp png_ptr)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+
+   /* start of interlace block in the y direction */
+   int png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
+
+   /* offset to next interlace block in the y direction */
+   int png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
+#endif
+
+   int ret;
+
+   png_debug(1, "in png_write_finish_row\n");
+   /* next row */
+   png_ptr->row_number++;
+
+   /* see if we are done */
+   if (png_ptr->row_number < png_ptr->num_rows)
+      return;
+
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED
+   /* if interlaced, go to next pass */
+   if (png_ptr->interlaced)
+   {
+      png_ptr->row_number = 0;
+      if (png_ptr->transformations & PNG_INTERLACE)
+      {
+         png_ptr->pass++;
+      }
+      else
+      {
+         /* loop until we find a non-zero width or height pass */
+         do
+         {
+            png_ptr->pass++;
+            if (png_ptr->pass >= 7)
+               break;
+            png_ptr->usr_width = (png_ptr->width +
+               png_pass_inc[png_ptr->pass] - 1 -
+               png_pass_start[png_ptr->pass]) /
+               png_pass_inc[png_ptr->pass];
+            png_ptr->num_rows = (png_ptr->height +
+               png_pass_yinc[png_ptr->pass] - 1 -
+               png_pass_ystart[png_ptr->pass]) /
+               png_pass_yinc[png_ptr->pass];
+            if (png_ptr->transformations & PNG_INTERLACE)
+               break;
+         } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
+
+      }
+
+      /* reset the row above the image for the next pass */
+      if (png_ptr->pass < 7)
+      {
+         if (png_ptr->prev_row != NULL)
+            png_memset(png_ptr->prev_row, 0,
+               (png_size_t)(PNG_ROWBYTES(png_ptr->usr_channels*
+               png_ptr->usr_bit_depth,png_ptr->width))+1);
+         return;
+      }
+   }
+#endif
+
+   /* if we get here, we've just written the last row, so we need
+      to flush the compressor */
+   do
+   {
+      /* tell the compressor we are done */
+      ret = deflate(&png_ptr->zstream, Z_FINISH);
+      /* check for an error */
+      if (ret == Z_OK)
+      {
+         /* check to see if we need more room */
+         if (!(png_ptr->zstream.avail_out))
+         {
+            png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+            png_ptr->zstream.next_out = png_ptr->zbuf;
+            png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+         }
+      }
+      else if (ret != Z_STREAM_END)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+   } while (ret != Z_STREAM_END);
+
+   /* write any extra space */
+   if (png_ptr->zstream.avail_out < png_ptr->zbuf_size)
+   {
+      png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size -
+         png_ptr->zstream.avail_out);
+   }
+
+   deflateReset(&png_ptr->zstream);
+}
+
+#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+/* Pick out the correct pixels for the interlace pass.
+ * The basic idea here is to go through the row with a source
+ * pointer and a destination pointer (sp and dp), and copy the
+ * correct pixels for the pass.  As the row gets compacted,
+ * sp will always be >= dp, so we should never overwrite anything.
+ * See the default: case for the easiest code to understand.
+ */
+void /* PRIVATE */
+png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
+{
+#ifdef PNG_USE_LOCAL_ARRAYS
+   /* arrays to facilitate easy interlacing - use pass (0 - 6) as index */
+
+   /* start of interlace block */
+   int png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
+
+   /* offset to next interlace block */
+   int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
+#endif
+
+   png_debug(1, "in png_do_write_interlace\n");
+   /* we don't have to do anything on the last pass (6) */
+#if defined(PNG_USELESS_TESTS_SUPPORTED)
+   if (row != NULL && row_info != NULL && pass < 6)
+#else
+   if (pass < 6)
+#endif
+   {
+      /* each pixel depth is handled separately */
+      switch (row_info->pixel_depth)
+      {
+         case 1:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            d = 0;
+            shift = 7;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 3);
+               value = (int)(*sp >> (7 - (int)(i & 0x07))) & 0x01;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 7;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift--;
+
+            }
+            if (shift != 7)
+               *dp = (png_byte)d;
+            break;
+         }
+         case 2:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            shift = 6;
+            d = 0;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 2);
+               value = (*sp >> ((3 - (int)(i & 0x03)) << 1)) & 0x03;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 6;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift -= 2;
+            }
+            if (shift != 6)
+                   *dp = (png_byte)d;
+            break;
+         }
+         case 4:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            int shift;
+            int d;
+            int value;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+
+            dp = row;
+            shift = 4;
+            d = 0;
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               sp = row + (png_size_t)(i >> 1);
+               value = (*sp >> ((1 - (int)(i & 0x01)) << 2)) & 0x0f;
+               d |= (value << shift);
+
+               if (shift == 0)
+               {
+                  shift = 4;
+                  *dp++ = (png_byte)d;
+                  d = 0;
+               }
+               else
+                  shift -= 4;
+            }
+            if (shift != 4)
+               *dp = (png_byte)d;
+            break;
+         }
+         default:
+         {
+            png_bytep sp;
+            png_bytep dp;
+            png_uint_32 i;
+            png_uint_32 row_width = row_info->width;
+            png_size_t pixel_bytes;
+
+            /* start at the beginning */
+            dp = row;
+            /* find out how many bytes each pixel takes up */
+            pixel_bytes = (row_info->pixel_depth >> 3);
+            /* loop through the row, only looking at the pixels that
+               matter */
+            for (i = png_pass_start[pass]; i < row_width;
+               i += png_pass_inc[pass])
+            {
+               /* find out where the original pixel is */
+               sp = row + (png_size_t)i * pixel_bytes;
+               /* move the pixel */
+               if (dp != sp)
+                  png_memcpy(dp, sp, pixel_bytes);
+               /* next pixel */
+               dp += pixel_bytes;
+            }
+            break;
+         }
+      }
+      /* set new row width */
+      row_info->width = (row_info->width +
+         png_pass_inc[pass] - 1 -
+         png_pass_start[pass]) /
+         png_pass_inc[pass];
+         row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth,
+            row_info->width);
+   }
+}
+#endif
+
+/* This filters the row, chooses which filter to use, if it has not already
+ * been specified by the application, and then writes the row out with the
+ * chosen filter.
+ */
+#define PNG_MAXSUM (~((png_uint_32)0) >> 1)
+#define PNG_HISHIFT 10
+#define PNG_LOMASK ((png_uint_32)0xffffL)
+#define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT))
+void /* PRIVATE */
+png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
+{
+   png_bytep prev_row, best_row, row_buf;
+   png_uint_32 mins, bpp;
+   png_byte filter_to_do = png_ptr->do_filter;
+   png_uint_32 row_bytes = row_info->rowbytes;
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   int num_p_filters = (int)png_ptr->num_prev_filters;
+#endif
+
+   png_debug(1, "in png_write_find_filter\n");
+   /* find out how many bytes offset each pixel is */
+   bpp = (row_info->pixel_depth + 7) >> 3;
+
+   prev_row = png_ptr->prev_row;
+   best_row = row_buf = png_ptr->row_buf;
+   mins = PNG_MAXSUM;
+
+   /* The prediction method we use is to find which method provides the
+    * smallest value when summing the absolute values of the distances
+    * from zero, using anything >= 128 as negative numbers.  This is known
+    * as the "minimum sum of absolute differences" heuristic.  Other
+    * heuristics are the "weighted minimum sum of absolute differences"
+    * (experimental and can in theory improve compression), and the "zlib
+    * predictive" method (not implemented yet), which does test compressions
+    * of lines using different filter methods, and then chooses the
+    * (series of) filter(s) that give minimum compressed data size (VERY
+    * computationally expensive).
+    *
+    * GRR 980525:  consider also
+    *   (1) minimum sum of absolute differences from running average (i.e.,
+    *       keep running sum of non-absolute differences & count of bytes)
+    *       [track dispersion, too?  restart average if dispersion too large?]
+    *  (1b) minimum sum of absolute differences from sliding average, probably
+    *       with window size <= deflate window (usually 32K)
+    *   (2) minimum sum of squared differences from zero or running average
+    *       (i.e., ~ root-mean-square approach)
+    */
+
+
+   /* We don't need to test the 'no filter' case if this is the only filter
+    * that has been chosen, as it doesn't actually do anything to the data.
+    */
+   if ((filter_to_do & PNG_FILTER_NONE) &&
+       filter_to_do != PNG_FILTER_NONE)
+   {
+      png_bytep rp;
+      png_uint_32 sum = 0;
+      png_uint_32 i;
+      int v;
+
+      for (i = 0, rp = row_buf + 1; i < row_bytes; i++, rp++)
+      {
+         v = *rp;
+         sum += (v < 128) ? v : 256 - v;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         png_uint_32 sumhi, sumlo;
+         int j;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK; /* Gives us some footroom */
+
+         /* Reduce the sum if we match any of the previous rows */
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         /* Factor in the cost of this filter (this is here for completeness,
+          * but it makes no sense to have a "cost" for the NONE filter, as
+          * it has the minimum possible computational cost - none).
+          */
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_NONE]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+      mins = sum;
+   }
+
+   /* sub filter */
+   if (filter_to_do == PNG_FILTER_SUB)
+   /* it's the only filter so no testing is needed */
+   {
+      png_bytep rp, lp, dp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+           i++, rp++, dp++)
+      {
+         *dp = *rp;
+      }
+      for (lp = row_buf + 1; i < row_bytes;
+         i++, rp++, lp++, dp++)
+      {
+         *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+      }
+      best_row = png_ptr->sub_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_SUB)
+   {
+      png_bytep rp, dp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      /* We temporarily increase the "minimum sum" by the factor we
+       * would reduce the sum of this filter, so that we can do the
+       * early exit comparison without scaling the sum each time.
+       */
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->sub_row + 1; i < bpp;
+           i++, rp++, dp++)
+      {
+         v = *dp = *rp;
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+      for (lp = row_buf + 1; i < row_bytes;
+         i++, rp++, lp++, dp++)
+      {
+         v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_SUB)
+            {
+               sumlo = (sumlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_SUB]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->sub_row;
+      }
+   }
+
+   /* up filter */
+   if (filter_to_do == PNG_FILTER_UP)
+   {
+      png_bytep rp, dp, pp;
+      png_uint_32 i;
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+           pp = prev_row + 1; i < row_bytes;
+           i++, rp++, pp++, dp++)
+      {
+         *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff);
+      }
+      best_row = png_ptr->up_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_UP)
+   {
+      png_bytep rp, dp, pp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1,
+           pp = prev_row + 1; i < row_bytes; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_UP)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_UP]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->up_row;
+      }
+   }
+
+   /* avg filter */
+   if (filter_to_do == PNG_FILTER_AVG)
+   {
+      png_bytep rp, dp, pp, lp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+      }
+      for (lp = row_buf + 1; i < row_bytes; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2))
+                 & 0xff);
+      }
+      best_row = png_ptr->avg_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_AVG)
+   {
+      png_bytep rp, dp, pp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_AVG)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+      for (lp = row_buf + 1; i < row_bytes; i++)
+      {
+         v = *dp++ =
+          (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_NONE)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_AVG]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         mins = sum;
+         best_row = png_ptr->avg_row;
+      }
+   }
+
+   /* Paeth filter */
+   if (filter_to_do == PNG_FILTER_PAETH)
+   {
+      png_bytep rp, dp, pp, cp, lp;
+      png_uint_32 i;
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+      }
+
+      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+      {
+         int a, b, c, pa, pb, pc, p;
+
+         b = *pp++;
+         c = *cp++;
+         a = *lp++;
+
+         p = b - c;
+         pc = a - c;
+
+#ifdef PNG_USE_ABS
+         pa = abs(p);
+         pb = abs(pc);
+         pc = abs(p + pc);
+#else
+         pa = p < 0 ? -p : p;
+         pb = pc < 0 ? -pc : pc;
+         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+
+         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+
+         *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+      }
+      best_row = png_ptr->paeth_row;
+   }
+
+   else if (filter_to_do & PNG_FILTER_PAETH)
+   {
+      png_bytep rp, dp, pp, cp, lp;
+      png_uint_32 sum = 0, lmins = mins;
+      png_uint_32 i;
+      int v;
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 lmhi, lmlo;
+         lmlo = lmins & PNG_LOMASK;
+         lmhi = (lmins >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+            {
+               lmlo = (lmlo * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               lmhi = (lmhi * png_ptr->inv_filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         lmlo = (lmlo * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+         lmhi = (lmhi * png_ptr->inv_filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+
+         if (lmhi > PNG_HIMASK)
+            lmins = PNG_MAXSUM;
+         else
+            lmins = (lmhi << PNG_HISHIFT) + lmlo;
+      }
+#endif
+
+      for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1,
+           pp = prev_row + 1; i < bpp; i++)
+      {
+         v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+      }
+
+      for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++)
+      {
+         int a, b, c, pa, pb, pc, p;
+
+         b = *pp++;
+         c = *cp++;
+         a = *lp++;
+
+#ifndef PNG_SLOW_PAETH
+         p = b - c;
+         pc = a - c;
+#ifdef PNG_USE_ABS
+         pa = abs(p);
+         pb = abs(pc);
+         pc = abs(p + pc);
+#else
+         pa = p < 0 ? -p : p;
+         pb = pc < 0 ? -pc : pc;
+         pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+#endif
+         p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
+#else /* PNG_SLOW_PAETH */
+         p = a + b - c;
+         pa = abs(p - a);
+         pb = abs(p - b);
+         pc = abs(p - c);
+         if (pa <= pb && pa <= pc)
+            p = a;
+         else if (pb <= pc)
+            p = b;
+         else
+            p = c;
+#endif /* PNG_SLOW_PAETH */
+
+         v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
+
+         sum += (v < 128) ? v : 256 - v;
+
+         if (sum > lmins)  /* We are already worse, don't continue. */
+            break;
+      }
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+      if (png_ptr->heuristic_method == PNG_FILTER_HEURISTIC_WEIGHTED)
+      {
+         int j;
+         png_uint_32 sumhi, sumlo;
+         sumlo = sum & PNG_LOMASK;
+         sumhi = (sum >> PNG_HISHIFT) & PNG_HIMASK;
+
+         for (j = 0; j < num_p_filters; j++)
+         {
+            if (png_ptr->prev_filters[j] == PNG_FILTER_VALUE_PAETH)
+            {
+               sumlo = (sumlo * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+               sumhi = (sumhi * png_ptr->filter_weights[j]) >>
+                  PNG_WEIGHT_SHIFT;
+            }
+         }
+
+         sumlo = (sumlo * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+         sumhi = (sumhi * png_ptr->filter_costs[PNG_FILTER_VALUE_PAETH]) >>
+            PNG_COST_SHIFT;
+
+         if (sumhi > PNG_HIMASK)
+            sum = PNG_MAXSUM;
+         else
+            sum = (sumhi << PNG_HISHIFT) + sumlo;
+      }
+#endif
+
+      if (sum < mins)
+      {
+         best_row = png_ptr->paeth_row;
+      }
+   }
+
+   /* Do the actual writing of the filtered row data from the chosen filter. */
+
+   png_write_filtered_row(png_ptr, best_row);
+
+#if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
+   /* Save the type of filter we picked this time for future calculations */
+   if (png_ptr->num_prev_filters > 0)
+   {
+      int j;
+      for (j = 1; j < num_p_filters; j++)
+      {
+         png_ptr->prev_filters[j] = png_ptr->prev_filters[j - 1];
+      }
+      png_ptr->prev_filters[j] = best_row[0];
+   }
+#endif
+}
+
+
+/* Do the actual writing of a previously filtered row. */
+void /* PRIVATE */
+png_write_filtered_row(png_structp png_ptr, png_bytep filtered_row)
+{
+   png_debug(1, "in png_write_filtered_row\n");
+   png_debug1(2, "filter = %d\n", filtered_row[0]);
+   /* set up the zlib input buffer */
+
+   png_ptr->zstream.next_in = filtered_row;
+   png_ptr->zstream.avail_in = (uInt)png_ptr->row_info.rowbytes + 1;
+   /* repeat until we have compressed all the data */
+   do
+   {
+      int ret; /* return of zlib */
+
+      /* compress the data */
+      ret = deflate(&png_ptr->zstream, Z_NO_FLUSH);
+      /* check for compression errors */
+      if (ret != Z_OK)
+      {
+         if (png_ptr->zstream.msg != NULL)
+            png_error(png_ptr, png_ptr->zstream.msg);
+         else
+            png_error(png_ptr, "zlib error");
+      }
+
+      /* see if it is time to write another IDAT */
+      if (!(png_ptr->zstream.avail_out))
+      {
+         /* write the IDAT and reset the zlib output buffer */
+         png_write_IDAT(png_ptr, png_ptr->zbuf, png_ptr->zbuf_size);
+         png_ptr->zstream.next_out = png_ptr->zbuf;
+         png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
+      }
+   /* repeat until all data has been compressed */
+   } while (png_ptr->zstream.avail_in);
+
+   /* swap the current and previous rows */
+   if (png_ptr->prev_row != NULL)
+   {
+      png_bytep tptr;
+
+      tptr = png_ptr->prev_row;
+      png_ptr->prev_row = png_ptr->row_buf;
+      png_ptr->row_buf = tptr;
+   }
+
+   /* finish row - updates counters and flushes zlib if last row */
+   png_write_finish_row(png_ptr);
+
+#if defined(PNG_WRITE_FLUSH_SUPPORTED)
+   png_ptr->flush_rows++;
+
+   if (png_ptr->flush_dist > 0 &&
+       png_ptr->flush_rows >= png_ptr->flush_dist)
+   {
+      png_write_flush(png_ptr);
+   }
+#endif
+}
+#endif /* PNG_WRITE_SUPPORTED */
diff --git a/Source/3rd Party/wx/src/zlib/ChangeLog b/Source/3rd Party/wx/src/zlib/ChangeLog
new file mode 100644
index 000000000..f22aabaef
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/ChangeLog	
@@ -0,0 +1,1472 @@
+
+                ChangeLog file for zlib
+
+Changes in 1.2.8 (28 Apr 2013)
+- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
+- Do not force Z_CONST for C++
+- Clean up contrib/vstudio [Ro�]
+- Correct spelling error in zlib.h
+- Fix mixed line endings in contrib/vstudio
+
+Changes in 1.2.7.3 (13 Apr 2013)
+- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
+
+Changes in 1.2.7.2 (13 Apr 2013)
+- Change check for a four-byte type back to hexadecimal
+- Fix typo in win32/Makefile.msc
+- Add casts in gzwrite.c for pointer differences
+
+Changes in 1.2.7.1 (24 Mar 2013)
+- Replace use of unsafe string functions with snprintf if available
+- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
+- Fix gzgetc undefine when Z_PREFIX set [Turk]
+- Eliminate use of mktemp in Makefile (not always available)
+- Fix bug in 'F' mode for gzopen()
+- Add inflateGetDictionary() function
+- Correct comment in deflate.h
+- Use _snprintf for snprintf in Microsoft C
+- On Darwin, only use /usr/bin/libtool if libtool is not Apple
+- Delete "--version" file if created by "ar --version" [Richard G.]
+- Fix configure check for veracity of compiler error return codes
+- Fix CMake compilation of static lib for MSVC2010 x64
+- Remove unused variable in infback9.c
+- Fix argument checks in gzlog_compress() and gzlog_write()
+- Clean up the usage of z_const and respect const usage within zlib
+- Clean up examples/gzlog.[ch] comparisons of different types
+- Avoid shift equal to bits in type (caused endless loop)
+- Fix unintialized value bug in gzputc() introduced by const patches
+- Fix memory allocation error in examples/zran.c [Nor]
+- Fix bug where gzopen(), gzclose() would write an empty file
+- Fix bug in gzclose() when gzwrite() runs out of memory
+- Check for input buffer malloc failure in examples/gzappend.c
+- Add note to contrib/blast to use binary mode in stdio
+- Fix comparisons of differently signed integers in contrib/blast
+- Check for invalid code length codes in contrib/puff
+- Fix serious but very rare decompression bug in inftrees.c
+- Update inflateBack() comments, since inflate() can be faster
+- Use underscored I/O function names for WINAPI_FAMILY
+- Add _tr_flush_bits to the external symbols prefixed by --zprefix
+- Add contrib/vstudio/vc10 pre-build step for static only
+- Quote --version-script argument in CMakeLists.txt
+- Don't specify --version-script on Apple platforms in CMakeLists.txt
+- Fix casting error in contrib/testzlib/testzlib.c
+- Fix types in contrib/minizip to match result of get_crc_table()
+- Simplify contrib/vstudio/vc10 with 'd' suffix
+- Add TOP support to win32/Makefile.msc
+- Suport i686 and amd64 assembler builds in CMakeLists.txt
+- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
+- Add vc11 and vc12 build files to contrib/vstudio
+- Add gzvprintf() as an undocumented function in zlib
+- Fix configure for Sun shell
+- Remove runtime check in configure for four-byte integer type
+- Add casts and consts to ease user conversion to C++
+- Add man pages for minizip and miniunzip
+- In Makefile uninstall, don't rm if preceding cd fails
+- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
+
+Changes in 1.2.7 (2 May 2012)
+- Replace use of memmove() with a simple copy for portability
+- Test for existence of strerror
+- Restore gzgetc_ for backward compatibility with 1.2.6
+- Fix build with non-GNU make on Solaris
+- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
+- Include unistd.h for Watcom C
+- Use __WATCOMC__ instead of __WATCOM__
+- Do not use the visibility attribute if NO_VIZ defined
+- Improve the detection of no hidden visibility attribute
+- Avoid using __int64 for gcc or solo compilation
+- Cast to char * in gzprintf to avoid warnings [Zinser]
+- Fix make_vms.com for VAX [Zinser]
+- Don't use library or built-in byte swaps
+- Simplify test and use of gcc hidden attribute
+- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
+- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
+- Fix bug in test/minigzip.c for configure --solo
+- Fix contrib/vstudio project link errors [Mohanathas]
+- Add ability to choose the builder in make_vms.com [Schweda]
+- Add DESTDIR support to mingw32 win32/Makefile.gcc
+- Fix comments in win32/Makefile.gcc for proper usage
+- Allow overriding the default install locations for cmake
+- Generate and install the pkg-config file with cmake
+- Build both a static and a shared version of zlib with cmake
+- Include version symbols for cmake builds
+- If using cmake with MSVC, add the source directory to the includes
+- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
+- Move obsolete emx makefile to old [Truta]
+- Allow the use of -Wundef when compiling or using zlib
+- Avoid the use of the -u option with mktemp
+- Improve inflate() documentation on the use of Z_FINISH
+- Recognize clang as gcc
+- Add gzopen_w() in Windows for wide character path names
+- Rename zconf.h in CMakeLists.txt to move it out of the way
+- Add source directory in CMakeLists.txt for building examples
+- Look in build directory for zlib.pc in CMakeLists.txt
+- Remove gzflags from zlibvc.def in vc9 and vc10
+- Fix contrib/minizip compilation in the MinGW environment
+- Update ./configure for Solaris, support --64 [Mooney]
+- Remove -R. from Solaris shared build (possible security issue)
+- Avoid race condition for parallel make (-j) running example
+- Fix type mismatch between get_crc_table() and crc_table
+- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
+- Fix the path to zlib.map in CMakeLists.txt
+- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
+- Add instructions to win32/Makefile.gcc for shared install [Torri]
+
+Changes in 1.2.6.1 (12 Feb 2012)
+- Avoid the use of the Objective-C reserved name "id"
+- Include io.h in gzguts.h for Microsoft compilers
+- Fix problem with ./configure --prefix and gzgetc macro
+- Include gz_header definition when compiling zlib solo
+- Put gzflags() functionality back in zutil.c
+- Avoid library header include in crc32.c for Z_SOLO
+- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
+- Minor cleanup in contrib/minizip/zip.c [Vollant]
+- Update make_vms.com [Zinser]
+- Remove unnecessary gzgetc_ function
+- Use optimized byte swap operations for Microsoft and GNU [Snyder]
+- Fix minor typo in zlib.h comments [Rzesniowiecki]
+
+Changes in 1.2.6 (29 Jan 2012)
+- Update the Pascal interface in contrib/pascal
+- Fix function numbers for gzgetc_ in zlibvc.def files
+- Fix configure.ac for contrib/minizip [Schiffer]
+- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
+- Have ./configure use the compiler return code for error indication
+- Fix CMakeLists.txt for cross compilation [McClure]
+- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
+- Fix compilation of contrib/minizip on FreeBSD [Marquez]
+- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
+- Include io.h for Turbo C / Borland C on all platforms [Truta]
+- Make version explicit in contrib/minizip/configure.ac [Bosmans]
+- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
+- Minor cleanup up contrib/minizip/unzip.c [Vollant]
+- Fix bug when compiling minizip with C++ [Vollant]
+- Protect for long name and extra fields in contrib/minizip [Vollant]
+- Avoid some warnings in contrib/minizip [Vollant]
+- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
+- Add missing libs to minizip linker command
+- Add support for VPATH builds in contrib/minizip
+- Add an --enable-demos option to contrib/minizip/configure
+- Add the generation of configure.log by ./configure
+- Exit when required parameters not provided to win32/Makefile.gcc
+- Have gzputc return the character written instead of the argument
+- Use the -m option on ldconfig for BSD systems [Tobias]
+- Correct in zlib.map when deflateResetKeep was added
+
+Changes in 1.2.5.3 (15 Jan 2012)
+- Restore gzgetc function for binary compatibility
+- Do not use _lseeki64 under Borland C++ [Truta]
+- Update win32/Makefile.msc to build test/*.c [Truta]
+- Remove old/visualc6 given CMakefile and other alternatives
+- Update AS400 build files and documentation [Monnerat]
+- Update win32/Makefile.gcc to build test/*.c [Truta]
+- Permit stronger flushes after Z_BLOCK flushes
+- Avoid extraneous empty blocks when doing empty flushes
+- Permit Z_NULL arguments to deflatePending
+- Allow deflatePrime() to insert bits in the middle of a stream
+- Remove second empty static block for Z_PARTIAL_FLUSH
+- Write out all of the available bits when using Z_BLOCK
+- Insert the first two strings in the hash table after a flush
+
+Changes in 1.2.5.2 (17 Dec 2011)
+- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
+- use relative symlinks for shared libs
+- Avoid searching past window for Z_RLE strategy
+- Assure that high-water mark initialization is always applied in deflate
+- Add assertions to fill_window() in deflate.c to match comments
+- Update python link in README
+- Correct spelling error in gzread.c
+- Fix bug in gzgets() for a concatenated empty gzip stream
+- Correct error in comment for gz_make()
+- Change gzread() and related to ignore junk after gzip streams
+- Allow gzread() and related to continue after gzclearerr()
+- Allow gzrewind() and gzseek() after a premature end-of-file
+- Simplify gzseek() now that raw after gzip is ignored
+- Change gzgetc() to a macro for speed (~40% speedup in testing)
+- Fix gzclose() to return the actual error last encountered
+- Always add large file support for windows
+- Include zconf.h for windows large file support
+- Include zconf.h.cmakein for windows large file support
+- Update zconf.h.cmakein on make distclean
+- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
+- Clarify how gzopen() appends in zlib.h comments
+- Correct documentation of gzdirect() since junk at end now ignored
+- Add a transparent write mode to gzopen() when 'T' is in the mode
+- Update python link in zlib man page
+- Get inffixed.h and MAKEFIXED result to match
+- Add a ./config --solo option to make zlib subset with no libary use
+- Add undocumented inflateResetKeep() function for CAB file decoding
+- Add --cover option to ./configure for gcc coverage testing
+- Add #define ZLIB_CONST option to use const in the z_stream interface
+- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
+- Note behavior of uncompress() to provide as much data as it can
+- Add files in contrib/minizip to aid in building libminizip
+- Split off AR options in Makefile.in and configure
+- Change ON macro to Z_ARG to avoid application conflicts
+- Facilitate compilation with Borland C++ for pragmas and vsnprintf
+- Include io.h for Turbo C / Borland C++
+- Move example.c and minigzip.c to test/
+- Simplify incomplete code table filling in inflate_table()
+- Remove code from inflate.c and infback.c that is impossible to execute
+- Test the inflate code with full coverage
+- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
+- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
+- Fix gzwrite.c to accommodate reduced memory zlib compilation
+- Have inflate() with Z_FINISH avoid the allocation of a window
+- Do not set strm->adler when doing raw inflate
+- Fix gzeof() to behave just like feof() when read is not past end of file
+- Fix bug in gzread.c when end-of-file is reached
+- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
+- Document gzread() capability to read concurrently written files
+- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]
+
+Changes in 1.2.5.1 (10 Sep 2011)
+- Update FAQ entry on shared builds (#13)
+- Avoid symbolic argument to chmod in Makefile.in
+- Fix bug and add consts in contrib/puff [Oberhumer]
+- Update contrib/puff/zeros.raw test file to have all block types
+- Add full coverage test for puff in contrib/puff/Makefile
+- Fix static-only-build install in Makefile.in
+- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]
+- Add libz.a dependency to shared in Makefile.in for parallel builds
+- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
+- Replace $(...) with `...` in configure for non-bash sh [Bowler]
+- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]
+- Add solaris* to Linux* in configure to allow gcc use [Groffen]
+- Add *bsd* to Linux* case in configure [Bar-Lev]
+- Add inffast.obj to dependencies in win32/Makefile.msc
+- Correct spelling error in deflate.h [Kohler]
+- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
+- Add test to configure for GNU C looking for gcc in output of $cc -v
+- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]
+- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
+- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
+- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
+- Make stronger test in zconf.h to include unistd.h for LFS
+- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]
+- Fix zlib.h LFS support when Z_PREFIX used
+- Add updated as400 support (removed from old) [Monnerat]
+- Avoid deflate sensitivity to volatile input data
+- Avoid division in adler32_combine for NO_DIVIDE
+- Clarify the use of Z_FINISH with deflateBound() amount of space
+- Set binary for output file in puff.c
+- Use u4 type for crc_table to avoid conversion warnings
+- Apply casts in zlib.h to avoid conversion warnings
+- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
+- Improve inflateSync() documentation to note indeterminancy
+- Add deflatePending() function to return the amount of pending output
+- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
+- Add a check in configure for stdarg.h, use for gzprintf()
+- Check that pointers fit in ints when gzprint() compiled old style
+- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
+- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
+- Add debug records in assmebler code [Londer]
+- Update RFC references to use http://tools.ietf.org/html/... [Li]
+- Add --archs option, use of libtool to configure for Mac OS X [Borstel]
+
+Changes in 1.2.5 (19 Apr 2010)
+- Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
+- Default to libdir as sharedlibdir in configure [Nieder]
+- Update copyright dates on modified source files
+- Update trees.c to be able to generate modified trees.h
+- Exit configure for MinGW, suggesting win32/Makefile.gcc
+- Check for NULL path in gz_open [Homurlu]
+
+Changes in 1.2.4.5 (18 Apr 2010)
+- Set sharedlibdir in configure [Torok]
+- Set LDFLAGS in Makefile.in [Bar-Lev]
+- Avoid mkdir objs race condition in Makefile.in [Bowler]
+- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
+- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
+- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
+
+Changes in 1.2.4.4 (18 Apr 2010)
+- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* [Torok]
+- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
+- Try to use bash or ksh regardless of functionality of /bin/sh
+- Fix configure incompatibility with NetBSD sh
+- Remove attempt to run under bash or ksh since have better NetBSD fix
+- Fix win32/Makefile.gcc for MinGW [Bar-Lev]
+- Add diagnostic messages when using CROSS_PREFIX in configure
+- Added --sharedlibdir option to configure [Weigelt]
+- Use hidden visibility attribute when available [Frysinger]
+
+Changes in 1.2.4.3 (10 Apr 2010)
+- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
+- Use CROSS_PREFIX for nm [Bar-Lev]
+- Assume _LARGEFILE64_SOURCE defined is equivalent to true
+- Avoid use of undefined symbols in #if with && and ||
+- Make *64 prototypes in gzguts.h consistent with functions
+- Add -shared load option for MinGW in configure [Bowler]
+- Move z_off64_t to public interface, use instead of off64_t
+- Remove ! from shell test in configure (not portable to Solaris)
+- Change +0 macro tests to -0 for possibly increased portability
+
+Changes in 1.2.4.2 (9 Apr 2010)
+- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
+- Really provide prototypes for *64 functions when building without LFS
+- Only define unlink() in minigzip.c if unistd.h not included
+- Update README to point to contrib/vstudio project files
+- Move projects/vc6 to old/ and remove projects/
+- Include stdlib.h in minigzip.c for setmode() definition under WinCE
+- Clean up assembler builds in win32/Makefile.msc [Rowe]
+- Include sys/types.h for Microsoft for off_t definition
+- Fix memory leak on error in gz_open()
+- Symbolize nm as $NM in configure [Weigelt]
+- Use TEST_LDSHARED instead of LDSHARED to link test programs [Weigelt]
+- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
+- Fix bug in gzeof() to take into account unused input data
+- Avoid initialization of structures with variables in puff.c
+- Updated win32/README-WIN32.txt [Rowe]
+
+Changes in 1.2.4.1 (28 Mar 2010)
+- Remove the use of [a-z] constructs for sed in configure [gentoo 310225]
+- Remove $(SHAREDLIB) from LIBS in Makefile.in [Creech]
+- Restore "for debugging" comment on sprintf() in gzlib.c
+- Remove fdopen for MVS from gzguts.h
+- Put new README-WIN32.txt in win32 [Rowe]
+- Add check for shell to configure and invoke another shell if needed
+- Fix big fat stinking bug in gzseek() on uncompressed files
+- Remove vestigial F_OPEN64 define in zutil.h
+- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
+- Avoid errors on non-LFS systems when applications define LFS macros
+- Set EXE to ".exe" in configure for MINGW [Kahle]
+- Match crc32() in crc32.c exactly to the prototype in zlib.h [Sherrill]
+- Add prefix for cross-compilation in win32/makefile.gcc [Bar-Lev]
+- Add DLL install in win32/makefile.gcc [Bar-Lev]
+- Allow Linux* or linux* from uname in configure [Bar-Lev]
+- Allow ldconfig to be redefined in configure and Makefile.in [Bar-Lev]
+- Add cross-compilation prefixes to configure [Bar-Lev]
+- Match type exactly in gz_load() invocation in gzread.c
+- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
+- Provide prototypes for *64 functions when building zlib without LFS
+- Don't use -lc when linking shared library on MinGW
+- Remove errno.h check in configure and vestigial errno code in zutil.h
+
+Changes in 1.2.4 (14 Mar 2010)
+- Fix VER3 extraction in configure for no fourth subversion
+- Update zlib.3, add docs to Makefile.in to make .pdf out of it
+- Add zlib.3.pdf to distribution
+- Don't set error code in gzerror() if passed pointer is NULL
+- Apply destination directory fixes to CMakeLists.txt [Lowman]
+- Move #cmakedefine's to a new zconf.in.cmakein
+- Restore zconf.h for builds that don't use configure or cmake
+- Add distclean to dummy Makefile for convenience
+- Update and improve INDEX, README, and FAQ
+- Update CMakeLists.txt for the return of zconf.h [Lowman]
+- Update contrib/vstudio/vc9 and vc10 [Vollant]
+- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
+- Apply license and readme changes to contrib/asm686 [Raiter]
+- Check file name lengths and add -c option in minigzip.c [Li]
+- Update contrib/amd64 and contrib/masmx86/ [Vollant]
+- Avoid use of "eof" parameter in trees.c to not shadow library variable
+- Update make_vms.com for removal of zlibdefs.h [Zinser]
+- Update assembler code and vstudio projects in contrib [Vollant]
+- Remove outdated assembler code contrib/masm686 and contrib/asm586
+- Remove old vc7 and vc8 from contrib/vstudio
+- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION [Rowe]
+- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
+- Add contrib/gcc_gvmat64 for longest_match and inflate_fast [Vollant]
+- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
+- Fix bug in void-returning vsprintf() case in gzwrite.c
+- Fix name change from inflate.h in contrib/inflate86/inffas86.c
+- Check if temporary file exists before removing in make_vms.com [Zinser]
+- Fix make install and uninstall for --static option
+- Fix usage of _MSC_VER in gzguts.h and zutil.h [Truta]
+- Update readme.txt in contrib/masmx64 and masmx86 to assemble
+
+Changes in 1.2.3.9 (21 Feb 2010)
+- Expunge gzio.c
+- Move as400 build information to old
+- Fix updates in contrib/minizip and contrib/vstudio
+- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
+- Delete zconf.h (made by configure) [Weigelt]
+- Change zconf.in.h to zconf.h.in per convention [Weigelt]
+- Check for NULL buf in gzgets()
+- Return empty string for gzgets() with len == 1 (like fgets())
+- Fix description of gzgets() in zlib.h for end-of-file, NULL return
+- Update minizip to 1.1 [Vollant]
+- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
+- Note in zlib.h that gzerror() should be used to distinguish from EOF
+- Remove use of snprintf() from gzlib.c
+- Fix bug in gzseek()
+- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
+- Fix zconf.h generation in CMakeLists.txt [Lowman]
+- Improve comments in zconf.h where modified by configure
+
+Changes in 1.2.3.8 (13 Feb 2010)
+- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
+- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
+- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
+- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
+- Fix missing error return in gzflush(), add zlib.h note
+- Add *64 functions to zlib.map [Levin]
+- Fix signed/unsigned comparison in gz_comp()
+- Use SFLAGS when testing shared linking in configure
+- Add --64 option to ./configure to use -m64 with gcc
+- Fix ./configure --help to correctly name options
+- Have make fail if a test fails [Levin]
+- Avoid buffer overrun in contrib/masmx64/gvmat64.asm [Simpson]
+- Remove assembler object files from contrib
+
+Changes in 1.2.3.7 (24 Jan 2010)
+- Always gzopen() with O_LARGEFILE if available
+- Fix gzdirect() to work immediately after gzopen() or gzdopen()
+- Make gzdirect() more precise when the state changes while reading
+- Improve zlib.h documentation in many places
+- Catch memory allocation failure in gz_open()
+- Complete close operation if seek forward in gzclose_w() fails
+- Return Z_ERRNO from gzclose_r() if close() fails
+- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
+- Return zero for gzwrite() errors to match zlib.h description
+- Return -1 on gzputs() error to match zlib.h description
+- Add zconf.in.h to allow recovery from configure modification [Weigelt]
+- Fix static library permissions in Makefile.in [Weigelt]
+- Avoid warnings in configure tests that hide functionality [Weigelt]
+- Add *BSD and DragonFly to Linux case in configure [gentoo 123571]
+- Change libzdll.a to libz.dll.a in win32/Makefile.gcc [gentoo 288212]
+- Avoid access of uninitialized data for first inflateReset2 call [Gomes]
+- Keep object files in subdirectories to reduce the clutter somewhat
+- Remove default Makefile and zlibdefs.h, add dummy Makefile
+- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
+- Remove zlibdefs.h completely -- modify zconf.h instead
+
+Changes in 1.2.3.6 (17 Jan 2010)
+- Avoid void * arithmetic in gzread.c and gzwrite.c
+- Make compilers happier with const char * for gz_error message
+- Avoid unused parameter warning in inflate.c
+- Avoid signed-unsigned comparison warning in inflate.c
+- Indent #pragma's for traditional C
+- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
+- Correct email address in configure for system options
+- Update make_vms.com and add make_vms.com to contrib/minizip [Zinser]
+- Update zlib.map [Brown]
+- Fix Makefile.in for Solaris 10 make of example64 and minizip64 [Torok]
+- Apply various fixes to CMakeLists.txt [Lowman]
+- Add checks on len in gzread() and gzwrite()
+- Add error message for no more room for gzungetc()
+- Remove zlib version check in gzwrite()
+- Defer compression of gzprintf() result until need to
+- Use snprintf() in gzdopen() if available
+- Remove USE_MMAP configuration determination (only used by minigzip)
+- Remove examples/pigz.c (available separately)
+- Update examples/gun.c to 1.6
+
+Changes in 1.2.3.5 (8 Jan 2010)
+- Add space after #if in zutil.h for some compilers
+- Fix relatively harmless bug in deflate_fast() [Exarevsky]
+- Fix same problem in deflate_slow()
+- Add $(SHAREDLIBV) to LIBS in Makefile.in [Brown]
+- Add deflate_rle() for faster Z_RLE strategy run-length encoding
+- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
+- Change name of "write" variable in inffast.c to avoid library collisions
+- Fix premature EOF from gzread() in gzio.c [Brown]
+- Use zlib header window size if windowBits is 0 in inflateInit2()
+- Remove compressBound() call in deflate.c to avoid linking compress.o
+- Replace use of errno in gz* with functions, support WinCE [Alves]
+- Provide alternative to perror() in minigzip.c for WinCE [Alves]
+- Don't use _vsnprintf on later versions of MSVC [Lowman]
+- Add CMake build script and input file [Lowman]
+- Update contrib/minizip to 1.1 [Svensson, Vollant]
+- Moved nintendods directory from contrib to .
+- Replace gzio.c with a new set of routines with the same functionality
+- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
+- Update contrib/minizip to 1.1b
+- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
+
+Changes in 1.2.3.4 (21 Dec 2009)
+- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
+- Update comments in configure and Makefile.in for default --shared
+- Fix test -z's in configure [Marquess]
+- Build examplesh and minigzipsh when not testing
+- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
+- Import LDFLAGS from the environment in configure
+- Fix configure to populate SFLAGS with discovered CFLAGS options
+- Adapt make_vms.com to the new Makefile.in [Zinser]
+- Add zlib2ansi script for C++ compilation [Marquess]
+- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
+- Add AMD64 assembler code for longest match to contrib [Teterin]
+- Include options from $SFLAGS when doing $LDSHARED
+- Simplify 64-bit file support by introducing z_off64_t type
+- Make shared object files in objs directory to work around old Sun cc
+- Use only three-part version number for Darwin shared compiles
+- Add rc option to ar in Makefile.in for when ./configure not run
+- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
+- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
+- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
+- Rename Makefile.in targets allstatic to static and allshared to shared
+- Fix static and shared Makefile.in targets to be independent
+- Correct error return bug in gz_open() by setting state [Brown]
+- Put spaces before ;;'s in configure for better sh compatibility
+- Add pigz.c (parallel implementation of gzip) to examples/
+- Correct constant in crc32.c to UL [Leventhal]
+- Reject negative lengths in crc32_combine()
+- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
+- Include sys/types.h for _LARGEFILE64_SOURCE [Brown]
+- Correct typo in doc/algorithm.txt [Janik]
+- Fix bug in adler32_combine() [Zhu]
+- Catch missing-end-of-block-code error in all inflates and in puff
+    Assures that random input to inflate eventually results in an error
+- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
+- Update ENOUGH and its usage to reflect discovered bounds
+- Fix gzerror() error report on empty input file [Brown]
+- Add ush casts in trees.c to avoid pedantic runtime errors
+- Fix typo in zlib.h uncompress() description [Reiss]
+- Correct inflate() comments with regard to automatic header detection
+- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
+- Put new version of gzlog (2.0) in examples with interruption recovery
+- Add puff compile option to permit invalid distance-too-far streams
+- Add puff TEST command options, ability to read piped input
+- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
+  _LARGEFILE64_SOURCE not defined
+- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
+- Fix deflateSetDictionary() to use all 32K for output consistency
+- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
+- Clear bytes after deflate lookahead to avoid use of uninitialized data
+- Change a limit in inftrees.c to be more transparent to Coverity Prevent
+- Update win32/zlib.def with exported symbols from zlib.h
+- Correct spelling errors in zlib.h [Willem, Sobrado]
+- Allow Z_BLOCK for deflate() to force a new block
+- Allow negative bits in inflatePrime() to delete existing bit buffer
+- Add Z_TREES flush option to inflate() to return at end of trees
+- Add inflateMark() to return current state information for random access
+- Add Makefile for NintendoDS to contrib [Costa]
+- Add -w in configure compile tests to avoid spurious warnings [Beucler]
+- Fix typos in zlib.h comments for deflateSetDictionary()
+- Fix EOF detection in transparent gzread() [Maier]
+
+Changes in 1.2.3.3 (2 October 2006)
+- Make --shared the default for configure, add a --static option
+- Add compile option to permit invalid distance-too-far streams
+- Add inflateUndermine() function which is required to enable above
+- Remove use of "this" variable name for C++ compatibility [Marquess]
+- Add testing of shared library in make test, if shared library built
+- Use ftello() and fseeko() if available instead of ftell() and fseek()
+- Provide two versions of all functions that use the z_off_t type for
+  binary compatibility -- a normal version and a 64-bit offset version,
+  per the Large File Support Extension when _LARGEFILE64_SOURCE is
+  defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
+  is defined to be 64
+- Add a --uname= option to configure to perhaps help with cross-compiling
+
+Changes in 1.2.3.2 (3 September 2006)
+- Turn off silly Borland warnings [Hay]
+- Use off64_t and define _LARGEFILE64_SOURCE when present
+- Fix missing dependency on inffixed.h in Makefile.in
+- Rig configure --shared to build both shared and static [Teredesai, Truta]
+- Remove zconf.in.h and instead create a new zlibdefs.h file
+- Fix contrib/minizip/unzip.c non-encrypted after encrypted [Vollant]
+- Add treebuild.xml (see http://treebuild.metux.de/) [Weigelt]
+
+Changes in 1.2.3.1 (16 August 2006)
+- Add watcom directory with OpenWatcom make files [Daniel]
+- Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
+- Update make_vms.com [Zinser]
+- Use -fPIC for shared build in configure [Teredesai, Nicholson]
+- Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
+- Use fdopen() (not _fdopen()) for Interix in zutil.h [B�ck]
+- Add some FAQ entries about the contrib directory
+- Update the MVS question in the FAQ
+- Avoid extraneous reads after EOF in gzio.c [Brown]
+- Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
+- Add comments to zlib.h about gzerror() usage [Brown]
+- Set extra flags in gzip header in gzopen() like deflate() does
+- Make configure options more compatible with double-dash conventions
+  [Weigelt]
+- Clean up compilation under Solaris SunStudio cc [Rowe, Reinholdtsen]
+- Fix uninstall target in Makefile.in [Truta]
+- Add pkgconfig support [Weigelt]
+- Use $(DESTDIR) macro in Makefile.in [Reinholdtsen, Weigelt]
+- Replace set_data_type() with a more accurate detect_data_type() in
+  trees.c, according to the txtvsbin.txt document [Truta]
+- Swap the order of #include <stdio.h> and #include "zlib.h" in
+  gzio.c, example.c and minigzip.c [Truta]
+- Shut up annoying VS2005 warnings about standard C deprecation [Rowe,
+  Truta] (where?)
+- Fix target "clean" from win32/Makefile.bor [Truta]
+- Create .pdb and .manifest files in win32/makefile.msc [Ziegler, Rowe]
+- Update zlib www home address in win32/DLL_FAQ.txt [Truta]
+- Update contrib/masmx86/inffas32.asm for VS2005 [Vollant, Van Wassenhove]
+- Enable browse info in the "Debug" and "ASM Debug" configurations in
+  the Visual C++ 6 project, and set (non-ASM) "Debug" as default [Truta]
+- Add pkgconfig support [Weigelt]
+- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
+  for use in win32/zlib1.rc [Polushin, Rowe, Truta]
+- Add a document that explains the new text detection scheme to
+  doc/txtvsbin.txt [Truta]
+- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ [Truta]
+- Move algorithm.txt into doc/ [Truta]
+- Synchronize FAQ with website
+- Fix compressBound(), was low for some pathological cases [Fearnley]
+- Take into account wrapper variations in deflateBound()
+- Set examples/zpipe.c input and output to binary mode for Windows
+- Update examples/zlib_how.html with new zpipe.c (also web site)
+- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
+  that gcc became pickier in 4.0)
+- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
+  un-versioned, the patch adds versioning only for symbols introduced in
+  zlib-1.2.0 or later.  It also declares as local those symbols which are
+  not designed to be exported." [Levin]
+- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
+- Do not initialize global static by default in trees.c, add a response
+  NO_INIT_GLOBAL_POINTERS to initialize them if needed [Marquess]
+- Don't use strerror() in gzio.c under WinCE [Yakimov]
+- Don't use errno.h in zutil.h under WinCE [Yakimov]
+- Move arguments for AR to its usage to allow replacing ar [Marot]
+- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla [Randers-Pehrson]
+- Improve inflateInit() and inflateInit2() documentation
+- Fix structure size comment in inflate.h
+- Change configure help option from --h* to --help [Santos]
+
+Changes in 1.2.3 (18 July 2005)
+- Apply security vulnerability fixes to contrib/infback9 as well
+- Clean up some text files (carriage returns, trailing space)
+- Update testzlib, vstudio, masmx64, and masmx86 in contrib [Vollant]
+
+Changes in 1.2.2.4 (11 July 2005)
+- Add inflatePrime() function for starting inflation at bit boundary
+- Avoid some Visual C warnings in deflate.c
+- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
+  compile
+- Fix some spelling errors in comments [Betts]
+- Correct inflateInit2() error return documentation in zlib.h
+- Add zran.c example of compressed data random access to examples
+  directory, shows use of inflatePrime()
+- Fix cast for assignments to strm->state in inflate.c and infback.c
+- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts [Oberhumer]
+- Move declarations of gf2 functions to right place in crc32.c [Oberhumer]
+- Add cast in trees.c t avoid a warning [Oberhumer]
+- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples [Oberhumer]
+- Update make_vms.com [Zinser]
+- Initialize state->write in inflateReset() since copied in inflate_fast()
+- Be more strict on incomplete code sets in inflate_table() and increase
+  ENOUGH and MAXD -- this repairs a possible security vulnerability for
+  invalid inflate input.  Thanks to Tavis Ormandy and Markus Oberhumer for
+  discovering the vulnerability and providing test cases.
+- Add ia64 support to configure for HP-UX [Smith]
+- Add error return to gzread() for format or i/o error [Levin]
+- Use malloc.h for OS/2 [Necasek]
+
+Changes in 1.2.2.3 (27 May 2005)
+- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
+- Typecast fread() return values in gzio.c [Vollant]
+- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
+- Fix crc check bug in gzread() after gzungetc() [Heiner]
+- Add the deflateTune() function to adjust internal compression parameters
+- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
+- Remove an incorrect assertion in examples/zpipe.c
+- Add C++ wrapper in infback9.h [Donais]
+- Fix bug in inflateCopy() when decoding fixed codes
+- Note in zlib.h how much deflateSetDictionary() actually uses
+- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
+- Add _WIN32_WCE to define WIN32 in zconf.in.h [Spencer]
+- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h [Spencer]
+- Add gzdirect() function to indicate transparent reads
+- Update contrib/minizip [Vollant]
+- Fix compilation of deflate.c when both ASMV and FASTEST [Oberhumer]
+- Add casts in crc32.c to avoid warnings [Oberhumer]
+- Add contrib/masmx64 [Vollant]
+- Update contrib/asm586, asm686, masmx86, testzlib, vstudio [Vollant]
+
+Changes in 1.2.2.2 (30 December 2004)
+- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
+  avoid implicit memcpy calls (portability for no-library compilation)
+- Increase sprintf() buffer size in gzdopen() to allow for large numbers
+- Add INFLATE_STRICT to check distances against zlib header
+- Improve WinCE errno handling and comments [Chang]
+- Remove comment about no gzip header processing in FAQ
+- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
+- Add updated make_vms.com [Coghlan], update README
+- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
+  fitblk.c, gzlog.[ch], gzjoin.c, and zlib_how.html.
+- Add FAQ entry and comments in deflate.c on uninitialized memory access
+- Add Solaris 9 make options in configure [Gilbert]
+- Allow strerror() usage in gzio.c for STDC
+- Fix DecompressBuf in contrib/delphi/ZLib.pas [ManChesTer]
+- Update contrib/masmx86/inffas32.asm and gvmat32.asm [Vollant]
+- Use z_off_t for adler32_combine() and crc32_combine() lengths
+- Make adler32() much faster for small len
+- Use OS_CODE in deflate() default gzip header
+
+Changes in 1.2.2.1 (31 October 2004)
+- Allow inflateSetDictionary() call for raw inflate
+- Fix inflate header crc check bug for file names and comments
+- Add deflateSetHeader() and gz_header structure for custom gzip headers
+- Add inflateGetheader() to retrieve gzip headers
+- Add crc32_combine() and adler32_combine() functions
+- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
+- Use zstreamp consistently in zlib.h (inflate_back functions)
+- Remove GUNZIP condition from definition of inflate_mode in inflate.h
+  and in contrib/inflate86/inffast.S [Truta, Anderson]
+- Add support for AMD64 in contrib/inflate86/inffas86.c [Anderson]
+- Update projects/README.projects and projects/visualc6 [Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo [Truta]
+- Deprecate Z_ASCII; use Z_TEXT instead [Truta]
+- Use a new algorithm for setting strm->data_type in trees.c [Truta]
+- Do not define an exit() prototype in zutil.c unless DEBUG defined
+- Remove prototype of exit() from zutil.c, example.c, minigzip.c [Truta]
+- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
+- Fix Darwin build version identification [Peterson]
+
+Changes in 1.2.2 (3 October 2004)
+- Update zlib.h comments on gzip in-memory processing
+- Set adler to 1 in inflateReset() to support Java test suite [Walles]
+- Add contrib/dotzlib [Ravn]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update contrib/minizip [Vollant]
+- Move contrib/visual-basic.txt to old/ [Truta]
+- Fix assembler builds in projects/visualc6/ [Truta]
+
+Changes in 1.2.1.2 (9 September 2004)
+- Update INDEX file
+- Fix trees.c to update strm->data_type (no one ever noticed!)
+- Fix bug in error case in inflate.c, infback.c, and infback9.c [Brown]
+- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
+- Add limited multitasking protection to DYNAMIC_CRC_TABLE
+- Add NO_vsnprintf for VMS in zutil.h [Mozilla]
+- Don't declare strerror() under VMS [Mozilla]
+- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
+- Update contrib/ada [Anisimkov]
+- Update contrib/minizip [Vollant]
+- Fix configure to not hardcode directories for Darwin [Peterson]
+- Fix gzio.c to not return error on empty files [Brown]
+- Fix indentation; update version in contrib/delphi/ZLib.pas and
+  contrib/pascal/zlibpas.pas [Truta]
+- Update mkasm.bat in contrib/masmx86 [Truta]
+- Update contrib/untgz [Truta]
+- Add projects/README.projects [Truta]
+- Add project for MS Visual C++ 6.0 in projects/visualc6 [Cadieux, Truta]
+- Update win32/DLL_FAQ.txt [Truta]
+- Update list of Z_PREFIX symbols in zconf.h [Randers-Pehrson, Truta]
+- Remove an unnecessary assignment to curr in inftrees.c [Truta]
+- Add OS/2 to exe builds in configure [Poltorak]
+- Remove err dummy parameter in zlib.h [Kientzle]
+
+Changes in 1.2.1.1 (9 January 2004)
+- Update email address in README
+- Several FAQ updates
+- Fix a big fat bug in inftrees.c that prevented decoding valid
+  dynamic blocks with only literals and no distance codes --
+  Thanks to "Hot Emu" for the bug report and sample file
+- Add a note to puff.c on no distance codes case.
+
+Changes in 1.2.1 (17 November 2003)
+- Remove a tab in contrib/gzappend/gzappend.c
+- Update some interfaces in contrib for new zlib functions
+- Update zlib version number in some contrib entries
+- Add Windows CE definition for ptrdiff_t in zutil.h [Mai, Truta]
+- Support shared libraries on Hurd and KFreeBSD [Brown]
+- Fix error in NO_DIVIDE option of adler32.c
+
+Changes in 1.2.0.8 (4 November 2003)
+- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
+- Add experimental NO_DIVIDE #define in adler32.c
+    - Possibly faster on some processors (let me know if it is)
+- Correct Z_BLOCK to not return on first inflate call if no wrap
+- Fix strm->data_type on inflate() return to correctly indicate EOB
+- Add deflatePrime() function for appending in the middle of a byte
+- Add contrib/gzappend for an example of appending to a stream
+- Update win32/DLL_FAQ.txt [Truta]
+- Delete Turbo C comment in README [Truta]
+- Improve some indentation in zconf.h [Truta]
+- Fix infinite loop on bad input in configure script [Church]
+- Fix gzeof() for concatenated gzip files [Johnson]
+- Add example to contrib/visual-basic.txt [Michael B.]
+- Add -p to mkdir's in Makefile.in [vda]
+- Fix configure to properly detect presence or lack of printf functions
+- Add AS400 support [Monnerat]
+- Add a little Cygwin support [Wilson]
+
+Changes in 1.2.0.7 (21 September 2003)
+- Correct some debug formats in contrib/infback9
+- Cast a type in a debug statement in trees.c
+- Change search and replace delimiter in configure from % to # [Beebe]
+- Update contrib/untgz to 0.2 with various fixes [Truta]
+- Add build support for Amiga [Nikl]
+- Remove some directories in old that have been updated to 1.2
+- Add dylib building for Mac OS X in configure and Makefile.in
+- Remove old distribution stuff from Makefile
+- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
+- Update links in README
+
+Changes in 1.2.0.6 (13 September 2003)
+- Minor FAQ updates
+- Update contrib/minizip to 1.00 [Vollant]
+- Remove test of gz functions in example.c when GZ_COMPRESS defined [Truta]
+- Update POSTINC comment for 68060 [Nikl]
+- Add contrib/infback9 with deflate64 decoding (unsupported)
+- For MVS define NO_vsnprintf and undefine FAR [van Burik]
+- Add pragma for fdopen on MVS [van Burik]
+
+Changes in 1.2.0.5 (8 September 2003)
+- Add OF to inflateBackEnd() declaration in zlib.h
+- Remember start when using gzdopen in the middle of a file
+- Use internal off_t counters in gz* functions to properly handle seeks
+- Perform more rigorous check for distance-too-far in inffast.c
+- Add Z_BLOCK flush option to return from inflate at block boundary
+- Set strm->data_type on return from inflate
+    - Indicate bits unused, if at block boundary, and if in last block
+- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
+- Add condition so old NO_DEFLATE define still works for compatibility
+- FAQ update regarding the Windows DLL [Truta]
+- INDEX update: add qnx entry, remove aix entry [Truta]
+- Install zlib.3 into mandir [Wilson]
+- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update [Truta]
+- Adapt the zlib interface to the new DLL convention guidelines [Truta]
+- Introduce ZLIB_WINAPI macro to allow the export of functions using
+  the WINAPI calling convention, for Visual Basic [Vollant, Truta]
+- Update msdos and win32 scripts and makefiles [Truta]
+- Export symbols by name, not by ordinal, in win32/zlib.def [Truta]
+- Add contrib/ada [Anisimkov]
+- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 [Truta]
+- Rename contrib/asm386 to contrib/masmx86 [Truta, Vollant]
+- Add contrib/masm686 [Truta]
+- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
+  [Truta, Vollant]
+- Update contrib/delphi; rename to contrib/pascal; add example [Truta]
+- Remove contrib/delphi2; add a new contrib/delphi [Truta]
+- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
+  and fix some method prototypes [Truta]
+- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
+  [Truta]
+- Avoid the use of backslash (\) in contrib/minizip [Vollant]
+- Fix file time handling in contrib/untgz; update makefiles [Truta]
+- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
+  [Vollant]
+- Remove contrib/vstudio/vc15_16 [Vollant]
+- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 [Truta]
+- Update README.contrib [Truta]
+- Invert the assignment order of match_head and s->prev[...] in
+  INSERT_STRING [Truta]
+- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
+  [Truta]
+- Compare function pointers with 0, not with NULL or Z_NULL [Truta]
+- Fix prototype of syncsearch in inflate.c [Truta]
+- Introduce ASMINF macro to be enabled when using an ASM implementation
+  of inflate_fast [Truta]
+- Change NO_DEFLATE to NO_GZCOMPRESS [Truta]
+- Modify test_gzio in example.c to take a single file name as a
+  parameter [Truta]
+- Exit the example.c program if gzopen fails [Truta]
+- Add type casts around strlen in example.c [Truta]
+- Remove casting to sizeof in minigzip.c; give a proper type
+  to the variable compared with SUFFIX_LEN [Truta]
+- Update definitions of STDC and STDC99 in zconf.h [Truta]
+- Synchronize zconf.h with the new Windows DLL interface [Truta]
+- Use SYS16BIT instead of __32BIT__ to distinguish between
+  16- and 32-bit platforms [Truta]
+- Use far memory allocators in small 16-bit memory models for
+  Turbo C [Truta]
+- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
+  zlibCompileFlags [Truta]
+- Cygwin has vsnprintf [Wilson]
+- In Windows16, OS_CODE is 0, as in MSDOS [Truta]
+- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) [Wilson]
+
+Changes in 1.2.0.4 (10 August 2003)
+- Minor FAQ updates
+- Be more strict when checking inflateInit2's windowBits parameter
+- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
+- Add gzip wrapper option to deflateInit2 using windowBits
+- Add updated QNX rule in configure and qnx directory [Bonnefoy]
+- Make inflate distance-too-far checks more rigorous
+- Clean up FAR usage in inflate
+- Add casting to sizeof() in gzio.c and minigzip.c
+
+Changes in 1.2.0.3 (19 July 2003)
+- Fix silly error in gzungetc() implementation [Vollant]
+- Update contrib/minizip and contrib/vstudio [Vollant]
+- Fix printf format in example.c
+- Correct cdecl support in zconf.in.h [Anisimkov]
+- Minor FAQ updates
+
+Changes in 1.2.0.2 (13 July 2003)
+- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
+- Attempt to avoid warnings in crc32.c for pointer-int conversion
+- Add AIX to configure, remove aix directory [Bakker]
+- Add some casts to minigzip.c
+- Improve checking after insecure sprintf() or vsprintf() calls
+- Remove #elif's from crc32.c
+- Change leave label to inf_leave in inflate.c and infback.c to avoid
+  library conflicts
+- Remove inflate gzip decoding by default--only enable gzip decoding by
+  special request for stricter backward compatibility
+- Add zlibCompileFlags() function to return compilation information
+- More typecasting in deflate.c to avoid warnings
+- Remove leading underscore from _Capital #defines [Truta]
+- Fix configure to link shared library when testing
+- Add some Windows CE target adjustments [Mai]
+- Remove #define ZLIB_DLL in zconf.h [Vollant]
+- Add zlib.3 [Rodgers]
+- Update RFC URL in deflate.c and algorithm.txt [Mai]
+- Add zlib_dll_FAQ.txt to contrib [Truta]
+- Add UL to some constants [Truta]
+- Update minizip and vstudio [Vollant]
+- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
+- Expand use of NO_DUMMY_DECL to avoid all dummy structures
+- Added iostream3 to contrib [Schwardt]
+- Replace rewind() with fseek() for WinCE [Truta]
+- Improve setting of zlib format compression level flags
+    - Report 0 for huffman and rle strategies and for level == 0 or 1
+    - Report 2 only for level == 6
+- Only deal with 64K limit when necessary at compile time [Truta]
+- Allow TOO_FAR check to be turned off at compile time [Truta]
+- Add gzclearerr() function [Souza]
+- Add gzungetc() function
+
+Changes in 1.2.0.1 (17 March 2003)
+- Add Z_RLE strategy for run-length encoding [Truta]
+    - When Z_RLE requested, restrict matches to distance one
+    - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
+- Correct FASTEST compilation to allow level == 0
+- Clean up what gets compiled for FASTEST
+- Incorporate changes to zconf.in.h [Vollant]
+    - Refine detection of Turbo C need for dummy returns
+    - Refine ZLIB_DLL compilation
+    - Include additional header file on VMS for off_t typedef
+- Try to use _vsnprintf where it supplants vsprintf [Vollant]
+- Add some casts in inffast.c
+- Enchance comments in zlib.h on what happens if gzprintf() tries to
+  write more than 4095 bytes before compression
+- Remove unused state from inflateBackEnd()
+- Remove exit(0) from minigzip.c, example.c
+- Get rid of all those darn tabs
+- Add "check" target to Makefile.in that does the same thing as "test"
+- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
+- Update contrib/inflate86 [Anderson]
+- Update contrib/testzlib, contrib/vstudio, contrib/minizip [Vollant]
+- Add msdos and win32 directories with makefiles [Truta]
+- More additions and improvements to the FAQ
+
+Changes in 1.2.0 (9 March 2003)
+- New and improved inflate code
+    - About 20% faster
+    - Does not allocate 32K window unless and until needed
+    - Automatically detects and decompresses gzip streams
+    - Raw inflate no longer needs an extra dummy byte at end
+    - Added inflateBack functions using a callback interface--even faster
+      than inflate, useful for file utilities (gzip, zip)
+    - Added inflateCopy() function to record state for random access on
+      externally generated deflate streams (e.g. in gzip files)
+    - More readable code (I hope)
+- New and improved crc32()
+    - About 50% faster, thanks to suggestions from Rodney Brown
+- Add deflateBound() and compressBound() functions
+- Fix memory leak in deflateInit2()
+- Permit setting dictionary for raw deflate (for parallel deflate)
+- Fix const declaration for gzwrite()
+- Check for some malloc() failures in gzio.c
+- Fix bug in gzopen() on single-byte file 0x1f
+- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
+  and next buffer doesn't start with 0x8b
+- Fix uncompress() to return Z_DATA_ERROR on truncated input
+- Free memory at end of example.c
+- Remove MAX #define in trees.c (conflicted with some libraries)
+- Fix static const's in deflate.c, gzio.c, and zutil.[ch]
+- Declare malloc() and free() in gzio.c if STDC not defined
+- Use malloc() instead of calloc() in zutil.c if int big enough
+- Define STDC for AIX
+- Add aix/ with approach for compiling shared library on AIX
+- Add HP-UX support for shared libraries in configure
+- Add OpenUNIX support for shared libraries in configure
+- Use $cc instead of gcc to build shared library
+- Make prefix directory if needed when installing
+- Correct Macintosh avoidance of typedef Byte in zconf.h
+- Correct Turbo C memory allocation when under Linux
+- Use libz.a instead of -lz in Makefile (assure use of compiled library)
+- Update configure to check for snprintf or vsnprintf functions and their
+  return value, warn during make if using an insecure function
+- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
+  is lost when library is used--resolution is to build new zconf.h
+- Documentation improvements (in zlib.h):
+    - Document raw deflate and inflate
+    - Update RFCs URL
+    - Point out that zlib and gzip formats are different
+    - Note that Z_BUF_ERROR is not fatal
+    - Document string limit for gzprintf() and possible buffer overflow
+    - Note requirement on avail_out when flushing
+    - Note permitted values of flush parameter of inflate()
+- Add some FAQs (and even answers) to the FAQ
+- Add contrib/inflate86/ for x86 faster inflate
+- Add contrib/blast/ for PKWare Data Compression Library decompression
+- Add contrib/puff/ simple inflate for deflate format description
+
+Changes in 1.1.4 (11 March 2002)
+- ZFREE was repeated on same allocation on some error conditions.
+  This creates a security problem described in
+  http://www.zlib.org/advisory-2002-03-11.txt
+- Returned incorrect error (Z_MEM_ERROR) on some invalid data
+- Avoid accesses before window for invalid distances with inflate window
+  less than 32K.
+- force windowBits > 8 to avoid a bug in the encoder for a window size
+  of 256 bytes. (A complete fix will be available in 1.1.5).
+
+Changes in 1.1.3 (9 July 1998)
+- fix "an inflate input buffer bug that shows up on rare but persistent
+  occasions" (Mark)
+- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
+- fix gzseek(..., SEEK_SET) in write mode
+- fix crc check after a gzeek (Frank Faubert)
+- fix miniunzip when the last entry in a zip file is itself a zip file
+  (J Lillge)
+- add contrib/asm586 and contrib/asm686 (Brian Raiter)
+  See http://www.muppetlabs.com/~breadbox/software/assembly.html
+- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
+- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
+- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
+- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
+- added a FAQ file
+
+- Support gzdopen on Mac with Metrowerks (Jason Linhart)
+- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
+- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
+- avoid some warnings with Borland C (Tom Tanner)
+- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
+- emulate utime() for WIN32 in contrib/untgz  (Gilles Vollant)
+- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
+- use libdir and includedir in Makefile.in (Tim Mooney)
+- support shared libraries on OSF1 V4 (Tim Mooney)
+- remove so_locations in "make clean"  (Tim Mooney)
+- fix maketree.c compilation error (Glenn, Mark)
+- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
+- new Makefile.riscos (Rich Walker)
+- initialize static descriptors in trees.c for embedded targets (Nick Smith)
+- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
+- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
+- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
+- fix maketree.c to allow clean compilation of inffixed.h (Mark)
+- fix parameter check in deflateCopy (Gunther Nikl)
+- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
+- Many portability patches by Christian Spieler:
+  . zutil.c, zutil.h: added "const" for zmem*
+  . Make_vms.com: fixed some typos
+  . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
+  . msdos/Makefile.msc: remove "default rtl link library" info from obj files
+  . msdos/Makefile.*: use model-dependent name for the built zlib library
+  . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
+     new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
+- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
+- replace __far with _far for better portability (Christian Spieler, Tom Lane)
+- fix test for errno.h in configure (Tim Newsham)
+
+Changes in 1.1.2 (19 March 98)
+- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
+  See http://www.winimage.com/zLibDll/unzip.html
+- preinitialize the inflate tables for fixed codes, to make the code
+  completely thread safe (Mark)
+- some simplifications and slight speed-up to the inflate code (Mark)
+- fix gzeof on non-compressed files (Allan Schrum)
+- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
+- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
+- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
+- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
+- do not wrap extern "C" around system includes (Tom Lane)
+- mention zlib binding for TCL in README (Andreas Kupries)
+- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
+- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
+- allow "configure --prefix $HOME" (Tim Mooney)
+- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
+- move Makefile.sas to amiga/Makefile.sas
+
+Changes in 1.1.1 (27 Feb 98)
+- fix macros _tr_tally_* in deflate.h for debug mode  (Glenn Randers-Pehrson)
+- remove block truncation heuristic which had very marginal effect for zlib
+  (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
+  compression ratio on some files. This also allows inlining _tr_tally for
+  matches in deflate_slow.
+- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
+
+Changes in 1.1.0 (24 Feb 98)
+- do not return STREAM_END prematurely in inflate (John Bowler)
+- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
+- compile with -DFASTEST to get compression code optimized for speed only
+- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
+- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
+  on Sun but significant on HP)
+
+- add a pointer to experimental unzip library in README (Gilles Vollant)
+- initialize variable gcc in configure (Chris Herborth)
+
+Changes in 1.0.9 (17 Feb 1998)
+- added gzputs and gzgets functions
+- do not clear eof flag in gzseek (Mark Diekhans)
+- fix gzseek for files in transparent mode (Mark Diekhans)
+- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
+- replace EXPORT with ZEXPORT to avoid conflict with other programs
+- added compress2 in zconf.h, zlib.def, zlib.dnt
+- new asm code from Gilles Vollant in contrib/asm386
+- simplify the inflate code (Mark):
+ . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
+ . ZALLOC the length list in inflate_trees_fixed() instead of using stack
+ . ZALLOC the value area for huft_build() instead of using stack
+ . Simplify Z_FINISH check in inflate()
+
+- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
+- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
+- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
+  the declaration of FAR (Gilles VOllant)
+- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
+- read_buf buf parameter of type Bytef* instead of charf*
+- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
+- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
+- fix check for presence of directories in "make install" (Ian Willis)
+
+Changes in 1.0.8 (27 Jan 1998)
+- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
+- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
+- added compress2() to allow setting the compression level
+- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
+- use constant arrays for the static trees in trees.c instead of computing
+  them at run time (thanks to Ken Raeburn for this suggestion). To create
+  trees.h, compile with GEN_TREES_H and run "make test".
+- check return code of example in "make test" and display result
+- pass minigzip command line options to file_compress
+- simplifying code of inflateSync to avoid gcc 2.8 bug
+
+- support CC="gcc -Wall" in configure -s (QingLong)
+- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
+- fix test for shared library support to avoid compiler warnings
+- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
+- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
+- do not use fdopen for Metrowerks on Mac (Brad Pettit))
+- add checks for gzputc and gzputc in example.c
+- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
+- use const for the CRC table (Ken Raeburn)
+- fixed "make uninstall" for shared libraries
+- use Tracev instead of Trace in infblock.c
+- in example.c use correct compressed length for test_sync
+- suppress +vnocompatwarnings in configure for HPUX (not always supported)
+
+Changes in 1.0.7 (20 Jan 1998)
+- fix gzseek which was broken in write mode
+- return error for gzseek to negative absolute position
+- fix configure for Linux (Chun-Chung Chen)
+- increase stack space for MSC (Tim Wegner)
+- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
+- define EXPORTVA for gzprintf (Gilles Vollant)
+- added man page zlib.3 (Rick Rodgers)
+- for contrib/untgz, fix makedir() and improve Makefile
+
+- check gzseek in write mode in example.c
+- allocate extra buffer for seeks only if gzseek is actually called
+- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
+- add inflateSyncPoint in zconf.h
+- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
+
+Changes in 1.0.6 (19 Jan 1998)
+- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
+  gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
+- Fix a deflate bug occurring only with compression level 0 (thanks to
+  Andy Buckler for finding this one).
+- In minigzip, pass transparently also the first byte for .Z files.
+- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
+- check Z_FINISH in inflate (thanks to Marc Schluper)
+- Implement deflateCopy (thanks to Adam Costello)
+- make static libraries by default in configure, add --shared option.
+- move MSDOS or Windows specific files to directory msdos
+- suppress the notion of partial flush to simplify the interface
+  (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
+- suppress history buffer provided by application to simplify the interface
+  (this feature was not implemented anyway in 1.0.4)
+- next_in and avail_in must be initialized before calling inflateInit or
+  inflateInit2
+- add EXPORT in all exported functions (for Windows DLL)
+- added Makefile.nt (thanks to Stephen Williams)
+- added the unsupported "contrib" directory:
+   contrib/asm386/ by Gilles Vollant <info@winimage.com>
+        386 asm code replacing longest_match().
+   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
+        A C++ I/O streams interface to the zlib gz* functions
+   contrib/iostream2/  by Tyge L�vset <Tyge.Lovset@cmr.no>
+        Another C++ I/O streams interface
+   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+        A very simple tar.gz file extractor using zlib
+   contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
+        How to use compress(), uncompress() and the gz* functions from VB.
+- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
+  level) in minigzip (thanks to Tom Lane)
+
+- use const for rommable constants in deflate
+- added test for gzseek and gztell in example.c
+- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
+- add undocumented function zError to convert error code to string
+  (for Tim Smithers)
+- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
+- Use default memcpy for Symantec MSDOS compiler.
+- Add EXPORT keyword for check_func (needed for Windows DLL)
+- add current directory to LD_LIBRARY_PATH for "make test"
+- create also a link for libz.so.1
+- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
+- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
+- added -soname for Linux in configure (Chun-Chung Chen,
+- assign numbers to the exported functions in zlib.def (for Windows DLL)
+- add advice in zlib.h for best usage of deflateSetDictionary
+- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
+- allow compilation with ANSI keywords only enabled for TurboC in large model
+- avoid "versionString"[0] (Borland bug)
+- add NEED_DUMMY_RETURN for Borland
+- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
+- allow compilation with CC
+- defined STDC for OS/2 (David Charlap)
+- limit external names to 8 chars for MVS (Thomas Lund)
+- in minigzip.c, use static buffers only for 16-bit systems
+- fix suffix check for "minigzip -d foo.gz"
+- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
+- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
+- added makelcc.bat for lcc-win32 (Tom St Denis)
+- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
+- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- check for unistd.h in configure (for off_t)
+- remove useless check parameter in inflate_blocks_free
+- avoid useless assignment of s->check to itself in inflate_blocks_new
+- do not flush twice in gzclose (thanks to Ken Raeburn)
+- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
+- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
+- work around buggy fclose on pipes for HP/UX
+- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
+- fix configure if CC is already equal to gcc
+
+Changes in 1.0.5 (3 Jan 98)
+- Fix inflate to terminate gracefully when fed corrupted or invalid data
+- Use const for rommable constants in inflate
+- Eliminate memory leaks on error conditions in inflate
+- Removed some vestigial code in inflate
+- Update web address in README
+
+Changes in 1.0.4 (24 Jul 96)
+- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
+  bit, so the decompressor could decompress all the correct data but went
+  on to attempt decompressing extra garbage data. This affected minigzip too.
+- zlibVersion and gzerror return const char* (needed for DLL)
+- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
+- use z_error only for DEBUG (avoid problem with DLLs)
+
+Changes in 1.0.3 (2 Jul 96)
+- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
+  small and medium models; this makes the library incompatible with previous
+  versions for these models. (No effect in large model or on other systems.)
+- return OK instead of BUF_ERROR if previous deflate call returned with
+  avail_out as zero but there is nothing to do
+- added memcmp for non STDC compilers
+- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
+- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
+- better check for 16-bit mode MSC (avoids problem with Symantec)
+
+Changes in 1.0.2 (23 May 96)
+- added Windows DLL support
+- added a function zlibVersion (for the DLL support)
+- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
+- Bytef is define's instead of typedef'd only for Borland C
+- avoid reading uninitialized memory in example.c
+- mention in README that the zlib format is now RFC1950
+- updated Makefile.dj2
+- added algorithm.doc
+
+Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
+- fix array overlay in deflate.c which sometimes caused bad compressed data
+- fix inflate bug with empty stored block
+- fix MSDOS medium model which was broken in 0.99
+- fix deflateParams() which could generated bad compressed data.
+- Bytef is define'd instead of typedef'ed (work around Borland bug)
+- added an INDEX file
+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
+  Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
+- speed up adler32 for modern machines without auto-increment
+- added -ansi for IRIX in configure
+- static_init_done in trees.c is an int
+- define unlink as delete for VMS
+- fix configure for QNX
+- add configure branch for SCO and HPUX
+- avoid many warnings (unused variables, dead assignments, etc...)
+- no fdopen for BeOS
+- fix the Watcom fix for 32 bit mode (define FAR as empty)
+- removed redefinition of Byte for MKWERKS
+- work around an MWKERKS bug (incorrect merge of all .h files)
+
+Changes in 0.99 (27 Jan 96)
+- allow preset dictionary shared between compressor and decompressor
+- allow compression level 0 (no compression)
+- add deflateParams in zlib.h: allow dynamic change of compression level
+  and compression strategy.
+- test large buffers and deflateParams in example.c
+- add optional "configure" to build zlib as a shared library
+- suppress Makefile.qnx, use configure instead
+- fixed deflate for 64-bit systems (detected on Cray)
+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- deflateInit and inflateInit are now macros to allow version checking
+- prefix all global functions and types with z_ with -DZ_PREFIX
+- make falloc completely reentrant (inftrees.c)
+- fixed very unlikely race condition in ct_static_init
+- free in reverse order of allocation to help memory manager
+- use zlib-1.0/* instead of zlib/* inside the tar.gz
+- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
+  -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
+- allow gzread on concatenated .gz files
+- deflateEnd now returns Z_DATA_ERROR if it was premature
+- deflate is finally (?) fully deterministic (no matches beyond end of input)
+- Document Z_SYNC_FLUSH
+- add uninstall in Makefile
+- Check for __cpluplus in zlib.h
+- Better test in ct_align for partial flush
+- avoid harmless warnings for Borland C++
+- initialize hash_head in deflate.c
+- avoid warning on fdopen (gzio.c) for HP cc -Aa
+- include stdlib.h for STDC compilers
+- include errno.h for Cray
+- ignore error if ranlib doesn't exist
+- call ranlib twice for NeXTSTEP
+- use exec_prefix instead of prefix for libz.a
+- renamed ct_* as _tr_* to avoid conflict with applications
+- clear z->msg in inflateInit2 before any error return
+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
+- in fcalloc, normalize pointer if size > 65520 bytes
+- don't use special fcalloc for 32 bit Borland C++
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+- use Z_BINARY instead of BINARY
+- document that gzclose after gzdopen will close the file
+- allow "a" as mode in gzopen.
+- fix error checking in gzread
+- allow skipping .gz extra-field on pipes
+- added reference to Perl interface in README
+- put the crc table in FAR data (I dislike more and more the medium model :)
+- added get_crc_table
+- added a dimension to all arrays (Borland C can't count).
+- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
+- guard against multiple inclusion of *.h (for precompiled header on Mac)
+- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
+- don't use unsized arrays to avoid silly warnings by Visual C++:
+     warning C4746: 'inflate_mask' : unsized array treated as  '__far'
+     (what's wrong with far data in far model?).
+- define enum out of inflate_blocks_state to allow compilation with C++
+
+Changes in 0.95 (16 Aug 95)
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
+- inlined send_bits
+- fix the final (:-) bug for deflate with flush (output was correct but
+  not completely flushed in rare occasions).
+- default window size is same for compression and decompression
+  (it's now sufficient to set MAX_WBITS in zconf.h).
+- voidp -> voidpf and voidnp -> voidp (for consistency with other
+  typedefs and because voidnp was not near in large model).
+
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided.
+- rename libgz.a as libz.a
+- avoid complex expression in infcodes.c triggering Turbo C bug
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define.
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
+Changes in 0.93 (25 June 95)
+- temporarily disable inline functions
+- make deflate deterministic
+- give enough lookahead for PARTIAL_FLUSH
+- Set binary mode for stdin/stdout in minigzip.c for OS/2
+- don't even use signed char in inflate (not portable enough)
+- fix inflate memory leak for segmented architectures
+
+Changes in 0.92 (3 May 95)
+- don't assume that char is signed (problem on SGI)
+- Clear bit buffer when starting a stored block
+- no memcpy on Pyramid
+- suppressed inftest.c
+- optimized fill_window, put longest_match inline for gcc
+- optimized inflate on stored blocks.
+- untabify all sources to simplify patches
+
+Changes in 0.91 (2 May 95)
+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- Document the memory requirements in zconf.h
+- added "make install"
+- fix sync search logic in inflateSync
+- deflate(Z_FULL_FLUSH) now works even if output buffer too short
+- after inflateSync, don't scare people with just "lo world"
+- added support for DJGPP
+
+Changes in 0.9 (1 May 95)
+- don't assume that zalloc clears the allocated memory (the TurboC bug
+  was Mark's bug after all :)
+- let again gzread copy uncompressed data unchanged (was working in 0.71)
+- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
+- added a test of inflateSync in example.c
+- moved MAX_WBITS to zconf.h because users might want to change that.
+- document explicitly that zalloc(64K) on MSDOS must return a normalized
+  pointer (zero offset)
+- added Makefiles for Microsoft C, Turbo C, Borland C++
+- faster crc32()
+
+Changes in 0.8 (29 April 95)
+- added fast inflate (inffast.c)
+- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
+  is incompatible with previous versions of zlib which returned Z_OK.
+- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
+  (actually that was not a compiler bug, see 0.81 above)
+- gzread no longer reads one extra byte in certain cases
+- In gzio destroy(), don't reference a freed structure
+- avoid many warnings for MSDOS
+- avoid the ERROR symbol which is used by MS Windows
+
+Changes in 0.71 (14 April 95)
+- Fixed more MSDOS compilation problems :( There is still a bug with
+  TurboC large model.
+
+Changes in 0.7 (14 April 95)
+- Added full inflate support.
+- Simplified the crc32() interface. The pre- and post-conditioning
+  (one's complement) is now done inside crc32(). WARNING: this is
+  incompatible with previous versions; see zlib.h for the new usage.
+
+Changes in 0.61 (12 April 95)
+- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
+
+Changes in 0.6 (11 April 95)
+- added minigzip.c
+- added gzdopen to reopen a file descriptor as gzFile
+- added transparent reading of non-gziped files in gzread.
+- fixed bug in gzread (don't read crc as data)
+- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
+- don't allocate big arrays in the stack (for MSDOS)
+- fix some MSDOS compilation problems
+
+Changes in 0.5:
+- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
+  not yet Z_FULL_FLUSH.
+- support decompression but only in a single step (forced Z_FINISH)
+- added opaque object for zalloc and zfree.
+- added deflateReset and inflateReset
+- added a variable zlib_version for consistency checking.
+- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
+  Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
+
+Changes in 0.4:
+- avoid "zip" everywhere, use zlib instead of ziplib.
+- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
+  if compression method == 8.
+- added adler32 and crc32
+- renamed deflateOptions as deflateInit2, call one or the other but not both
+- added the method parameter for deflateInit2.
+- added inflateInit2
+- simplied considerably deflateInit and inflateInit by not supporting
+  user-provided history buffer. This is supported only in deflateInit2
+  and inflateInit2.
+
+Changes in 0.3:
+- prefix all macro names with Z_
+- use Z_FINISH instead of deflateEnd to finish compression.
+- added Z_HUFFMAN_ONLY
+- added gzerror()
diff --git a/Source/3rd Party/wx/src/zlib/FAQ b/Source/3rd Party/wx/src/zlib/FAQ
new file mode 100644
index 000000000..99b7cf92e
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/FAQ	
@@ -0,0 +1,368 @@
+
+                Frequently Asked Questions about zlib
+
+
+If your question is not there, please check the zlib home page
+http://zlib.net/ which may have more recent information.
+The lastest zlib FAQ is at http://zlib.net/zlib_faq.html
+
+
+ 1. Is zlib Y2K-compliant?
+
+    Yes. zlib doesn't handle dates.
+
+ 2. Where can I get a Windows DLL version?
+
+    The zlib sources can be compiled without change to produce a DLL.  See the
+    file win32/DLL_FAQ.txt in the zlib distribution.  Pointers to the
+    precompiled DLL are found in the zlib web site at http://zlib.net/ .
+
+ 3. Where can I get a Visual Basic interface to zlib?
+
+    See
+        * http://marknelson.us/1997/01/01/zlib-engine/
+        * win32/DLL_FAQ.txt in the zlib distribution
+
+ 4. compress() returns Z_BUF_ERROR.
+
+    Make sure that before the call of compress(), the length of the compressed
+    buffer is equal to the available size of the compressed buffer and not
+    zero.  For Visual Basic, check that this parameter is passed by reference
+    ("as any"), not by value ("as long").
+
+ 5. deflate() or inflate() returns Z_BUF_ERROR.
+
+    Before making the call, make sure that avail_in and avail_out are not zero.
+    When setting the parameter flush equal to Z_FINISH, also make sure that
+    avail_out is big enough to allow processing all pending input.  Note that a
+    Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be
+    made with more input or output space.  A Z_BUF_ERROR may in fact be
+    unavoidable depending on how the functions are used, since it is not
+    possible to tell whether or not there is more output pending when
+    strm.avail_out returns with zero.  See http://zlib.net/zlib_how.html for a
+    heavily annotated example.
+
+ 6. Where's the zlib documentation (man pages, etc.)?
+
+    It's in zlib.h .  Examples of zlib usage are in the files test/example.c
+    and test/minigzip.c, with more in examples/ .
+
+ 7. Why don't you use GNU autoconf or libtool or ...?
+
+    Because we would like to keep zlib as a very small and simple package.
+    zlib is rather portable and doesn't need much configuration.
+
+ 8. I found a bug in zlib.
+
+    Most of the time, such problems are due to an incorrect usage of zlib.
+    Please try to reproduce the problem with a small program and send the
+    corresponding source to us at zlib@gzip.org .  Do not send multi-megabyte
+    data files without prior agreement.
+
+ 9. Why do I get "undefined reference to gzputc"?
+
+    If "make test" produces something like
+
+       example.o(.text+0x154): undefined reference to `gzputc'
+
+    check that you don't have old files libz.* in /usr/lib, /usr/local/lib or
+    /usr/X11R6/lib. Remove any old versions, then do "make install".
+
+10. I need a Delphi interface to zlib.
+
+    See the contrib/delphi directory in the zlib distribution.
+
+11. Can zlib handle .zip archives?
+
+    Not by itself, no.  See the directory contrib/minizip in the zlib
+    distribution.
+
+12. Can zlib handle .Z files?
+
+    No, sorry.  You have to spawn an uncompress or gunzip subprocess, or adapt
+    the code of uncompress on your own.
+
+13. How can I make a Unix shared library?
+
+    By default a shared (and a static) library is built for Unix.  So:
+
+    make distclean
+    ./configure
+    make
+
+14. How do I install a shared zlib library on Unix?
+
+    After the above, then:
+
+    make install
+
+    However, many flavors of Unix come with a shared zlib already installed.
+    Before going to the trouble of compiling a shared version of zlib and
+    trying to install it, you may want to check if it's already there!  If you
+    can #include <zlib.h>, it's there.  The -lz option will probably link to
+    it.  You can check the version at the top of zlib.h or with the
+    ZLIB_VERSION symbol defined in zlib.h .
+
+15. I have a question about OttoPDF.
+
+    We are not the authors of OttoPDF. The real author is on the OttoPDF web
+    site: Joel Hainley, jhainley@myndkryme.com.
+
+16. Can zlib decode Flate data in an Adobe PDF file?
+
+    Yes. See http://www.pdflib.com/ . To modify PDF forms, see
+    http://sourceforge.net/projects/acroformtool/ .
+
+17. Why am I getting this "register_frame_info not found" error on Solaris?
+
+    After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib
+    generates an error such as:
+
+        ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so:
+        symbol __register_frame_info: referenced symbol not found
+
+    The symbol __register_frame_info is not part of zlib, it is generated by
+    the C compiler (cc or gcc).  You must recompile applications using zlib
+    which have this problem.  This problem is specific to Solaris.  See
+    http://www.sunfreeware.com for Solaris versions of zlib and applications
+    using zlib.
+
+18. Why does gzip give an error on a file I make with compress/deflate?
+
+    The compress and deflate functions produce data in the zlib format, which
+    is different and incompatible with the gzip format.  The gz* functions in
+    zlib on the other hand use the gzip format.  Both the zlib and gzip formats
+    use the same compressed data format internally, but have different headers
+    and trailers around the compressed data.
+
+19. Ok, so why are there two different formats?
+
+    The gzip format was designed to retain the directory information about a
+    single file, such as the name and last modification date.  The zlib format
+    on the other hand was designed for in-memory and communication channel
+    applications, and has a much more compact header and trailer and uses a
+    faster integrity check than gzip.
+
+20. Well that's nice, but how do I make a gzip file in memory?
+
+    You can request that deflate write the gzip format instead of the zlib
+    format using deflateInit2().  You can also request that inflate decode the
+    gzip format using inflateInit2().  Read zlib.h for more details.
+
+21. Is zlib thread-safe?
+
+    Yes.  However any library routines that zlib uses and any application-
+    provided memory allocation routines must also be thread-safe.  zlib's gz*
+    functions use stdio library routines, and most of zlib's functions use the
+    library memory allocation routines by default.  zlib's *Init* functions
+    allow for the application to provide custom memory allocation routines.
+
+    Of course, you should only operate on any given zlib or gzip stream from a
+    single thread at a time.
+
+22. Can I use zlib in my commercial application?
+
+    Yes.  Please read the license in zlib.h.
+
+23. Is zlib under the GNU license?
+
+    No.  Please read the license in zlib.h.
+
+24. The license says that altered source versions must be "plainly marked". So
+    what exactly do I need to do to meet that requirement?
+
+    You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h.  In
+    particular, the final version number needs to be changed to "f", and an
+    identification string should be appended to ZLIB_VERSION.  Version numbers
+    x.x.x.f are reserved for modifications to zlib by others than the zlib
+    maintainers.  For example, if the version of the base zlib you are altering
+    is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and
+    ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3".  You can also
+    update the version strings in deflate.c and inftrees.c.
+
+    For altered source distributions, you should also note the origin and
+    nature of the changes in zlib.h, as well as in ChangeLog and README, along
+    with the dates of the alterations.  The origin should include at least your
+    name (or your company's name), and an email address to contact for help or
+    issues with the library.
+
+    Note that distributing a compiled zlib library along with zlib.h and
+    zconf.h is also a source distribution, and so you should change
+    ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes
+    in zlib.h as you would for a full source distribution.
+
+25. Will zlib work on a big-endian or little-endian architecture, and can I
+    exchange compressed data between them?
+
+    Yes and yes.
+
+26. Will zlib work on a 64-bit machine?
+
+    Yes.  It has been tested on 64-bit machines, and has no dependence on any
+    data types being limited to 32-bits in length.  If you have any
+    difficulties, please provide a complete problem report to zlib@gzip.org
+
+27. Will zlib decompress data from the PKWare Data Compression Library?
+
+    No.  The PKWare DCL uses a completely different compressed data format than
+    does PKZIP and zlib.  However, you can look in zlib's contrib/blast
+    directory for a possible solution to your problem.
+
+28. Can I access data randomly in a compressed stream?
+
+    No, not without some preparation.  If when compressing you periodically use
+    Z_FULL_FLUSH, carefully write all the pending data at those points, and
+    keep an index of those locations, then you can start decompression at those
+    points.  You have to be careful to not use Z_FULL_FLUSH too often, since it
+    can significantly degrade compression.  Alternatively, you can scan a
+    deflate stream once to generate an index, and then use that index for
+    random access.  See examples/zran.c .
+
+29. Does zlib work on MVS, OS/390, CICS, etc.?
+
+    It has in the past, but we have not heard of any recent evidence.  There
+    were working ports of zlib 1.1.4 to MVS, but those links no longer work.
+    If you know of recent, successful applications of zlib on these operating
+    systems, please let us know.  Thanks.
+
+30. Is there some simpler, easier to read version of inflate I can look at to
+    understand the deflate format?
+
+    First off, you should read RFC 1951.  Second, yes.  Look in zlib's
+    contrib/puff directory.
+
+31. Does zlib infringe on any patents?
+
+    As far as we know, no.  In fact, that was originally the whole point behind
+    zlib.  Look here for some more information:
+
+    http://www.gzip.org/#faq11
+
+32. Can zlib work with greater than 4 GB of data?
+
+    Yes.  inflate() and deflate() will process any amount of data correctly.
+    Each call of inflate() or deflate() is limited to input and output chunks
+    of the maximum value that can be stored in the compiler's "unsigned int"
+    type, but there is no limit to the number of chunks.  Note however that the
+    strm.total_in and strm_total_out counters may be limited to 4 GB.  These
+    counters are provided as a convenience and are not used internally by
+    inflate() or deflate().  The application can easily set up its own counters
+    updated after each call of inflate() or deflate() to count beyond 4 GB.
+    compress() and uncompress() may be limited to 4 GB, since they operate in a
+    single call.  gzseek() and gztell() may be limited to 4 GB depending on how
+    zlib is compiled.  See the zlibCompileFlags() function in zlib.h.
+
+    The word "may" appears several times above since there is a 4 GB limit only
+    if the compiler's "long" type is 32 bits.  If the compiler's "long" type is
+    64 bits, then the limit is 16 exabytes.
+
+33. Does zlib have any security vulnerabilities?
+
+    The only one that we are aware of is potentially in gzprintf().  If zlib is
+    compiled to use sprintf() or vsprintf(), then there is no protection
+    against a buffer overflow of an 8K string space (or other value as set by
+    gzbuffer()), other than the caller of gzprintf() assuring that the output
+    will not exceed 8K.  On the other hand, if zlib is compiled to use
+    snprintf() or vsnprintf(), which should normally be the case, then there is
+    no vulnerability.  The ./configure script will display warnings if an
+    insecure variation of sprintf() will be used by gzprintf().  Also the
+    zlibCompileFlags() function will return information on what variant of
+    sprintf() is used by gzprintf().
+
+    If you don't have snprintf() or vsnprintf() and would like one, you can
+    find a portable implementation here:
+
+        http://www.ijs.si/software/snprintf/
+
+    Note that you should be using the most recent version of zlib.  Versions
+    1.1.3 and before were subject to a double-free vulnerability, and versions
+    1.2.1 and 1.2.2 were subject to an access exception when decompressing
+    invalid compressed data.
+
+34. Is there a Java version of zlib?
+
+    Probably what you want is to use zlib in Java. zlib is already included
+    as part of the Java SDK in the java.util.zip package. If you really want
+    a version of zlib written in the Java language, look on the zlib home
+    page for links: http://zlib.net/ .
+
+35. I get this or that compiler or source-code scanner warning when I crank it
+    up to maximally-pedantic. Can't you guys write proper code?
+
+    Many years ago, we gave up attempting to avoid warnings on every compiler
+    in the universe.  It just got to be a waste of time, and some compilers
+    were downright silly as well as contradicted each other.  So now, we simply
+    make sure that the code always works.
+
+36. Valgrind (or some similar memory access checker) says that deflate is
+    performing a conditional jump that depends on an uninitialized value.
+    Isn't that a bug?
+
+    No.  That is intentional for performance reasons, and the output of deflate
+    is not affected.  This only started showing up recently since zlib 1.2.x
+    uses malloc() by default for allocations, whereas earlier versions used
+    calloc(), which zeros out the allocated memory.  Even though the code was
+    correct, versions 1.2.4 and later was changed to not stimulate these
+    checkers.
+
+37. Will zlib read the (insert any ancient or arcane format here) compressed
+    data format?
+
+    Probably not. Look in the comp.compression FAQ for pointers to various
+    formats and associated software.
+
+38. How can I encrypt/decrypt zip files with zlib?
+
+    zlib doesn't support encryption.  The original PKZIP encryption is very
+    weak and can be broken with freely available programs.  To get strong
+    encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib
+    compression.  For PKZIP compatible "encryption", look at
+    http://www.info-zip.org/
+
+39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings?
+
+    "gzip" is the gzip format, and "deflate" is the zlib format.  They should
+    probably have called the second one "zlib" instead to avoid confusion with
+    the raw deflate compressed data format.  While the HTTP 1.1 RFC 2616
+    correctly points to the zlib specification in RFC 1950 for the "deflate"
+    transfer encoding, there have been reports of servers and browsers that
+    incorrectly produce or expect raw deflate data per the deflate
+    specification in RFC 1951, most notably Microsoft.  So even though the
+    "deflate" transfer encoding using the zlib format would be the more
+    efficient approach (and in fact exactly what the zlib format was designed
+    for), using the "gzip" transfer encoding is probably more reliable due to
+    an unfortunate choice of name on the part of the HTTP 1.1 authors.
+
+    Bottom line: use the gzip format for HTTP 1.1 encoding.
+
+40. Does zlib support the new "Deflate64" format introduced by PKWare?
+
+    No.  PKWare has apparently decided to keep that format proprietary, since
+    they have not documented it as they have previous compression formats.  In
+    any case, the compression improvements are so modest compared to other more
+    modern approaches, that it's not worth the effort to implement.
+
+41. I'm having a problem with the zip functions in zlib, can you help?
+
+    There are no zip functions in zlib.  You are probably using minizip by
+    Giles Vollant, which is found in the contrib directory of zlib.  It is not
+    part of zlib.  In fact none of the stuff in contrib is part of zlib.  The
+    files in there are not supported by the zlib authors.  You need to contact
+    the authors of the respective contribution for help.
+
+42. The match.asm code in contrib is under the GNU General Public License.
+    Since it's part of zlib, doesn't that mean that all of zlib falls under the
+    GNU GPL?
+
+    No.  The files in contrib are not part of zlib.  They were contributed by
+    other authors and are provided as a convenience to the user within the zlib
+    distribution.  Each item in contrib has its own license.
+
+43. Is zlib subject to export controls?  What is its ECCN?
+
+    zlib is not subject to export controls, and so is classified as EAR99.
+
+44. Can you please sign these lengthy legal documents and fax them back to us
+    so that we can use your software in our product?
+
+    No. Go away. Shoo.
diff --git a/Source/3rd Party/wx/src/zlib/INDEX b/Source/3rd Party/wx/src/zlib/INDEX
new file mode 100644
index 000000000..2ba064120
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/INDEX	
@@ -0,0 +1,68 @@
+CMakeLists.txt  cmake build file
+ChangeLog       history of changes
+FAQ             Frequently Asked Questions about zlib
+INDEX           this file
+Makefile        dummy Makefile that tells you to ./configure
+Makefile.in     template for Unix Makefile
+README          guess what
+configure       configure script for Unix
+make_vms.com    makefile for VMS
+test/example.c  zlib usages examples for build testing
+test/minigzip.c minimal gzip-like functionality for build testing
+test/infcover.c inf*.c code coverage for build coverage testing
+treebuild.xml   XML description of source file dependencies
+zconf.h.cmakein zconf.h template for cmake
+zconf.h.in      zconf.h template for configure
+zlib.3          Man page for zlib
+zlib.3.pdf      Man page in PDF format
+zlib.map        Linux symbol information
+zlib.pc.in      Template for pkg-config descriptor
+zlib.pc.cmakein zlib.pc template for cmake
+zlib2ansi       perl script to convert source files for C++ compilation
+
+amiga/          makefiles for Amiga SAS C
+as400/          makefiles for AS/400
+doc/            documentation for formats and algorithms
+msdos/          makefiles for MSDOS
+nintendods/     makefile for Nintendo DS
+old/            makefiles for various architectures and zlib documentation
+                files that have not yet been updated for zlib 1.2.x
+qnx/            makefiles for QNX
+watcom/         makefiles for OpenWatcom
+win32/          makefiles for Windows
+
+                zlib public header files (required for library use):
+zconf.h
+zlib.h
+
+                private source files used to build the zlib library:
+adler32.c
+compress.c
+crc32.c
+crc32.h
+deflate.c
+deflate.h
+gzclose.c
+gzguts.h
+gzlib.c
+gzread.c
+gzwrite.c
+infback.c
+inffast.c
+inffast.h
+inffixed.h
+inflate.c
+inflate.h
+inftrees.c
+inftrees.h
+trees.c
+trees.h
+uncompr.c
+zutil.c
+zutil.h
+
+                source files for sample programs
+See examples/README.examples
+
+                unsupported contributions by third parties
+See contrib/README.contrib
diff --git a/Source/3rd Party/wx/src/zlib/README b/Source/3rd Party/wx/src/zlib/README
new file mode 100644
index 000000000..5ca9d127e
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/README	
@@ -0,0 +1,115 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.8 is a general purpose data compression library.  All the code is
+thread safe.  The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
+rfc1952 (gzip format).
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
+of the library is given in the file test/example.c which also tests that
+the library is working correctly.  Another example is given in the file
+test/minigzip.c.  The compression library itself is composed of all source
+files in the root directory.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile.in.  In short "./configure; make test", and if that goes
+well, "make install" should work for most flavors of Unix.  For Windows, use
+one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
+make_vms.com.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version.  The zlib home page is
+http://zlib.net/ .  Before reporting a problem, please check this site to
+verify that you have the latest version of zlib; otherwise get the latest
+version and check whether the problem still exists or not.
+
+PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
+issue of Dr.  Dobb's Journal; a copy of the article is available at
+http://marknelson.us/1997/01/01/zlib-engine/ .
+
+The changes made in version 1.2.8 are documented in the file ChangeLog.
+
+Unsupported third party contributions are provided in directory contrib/ .
+
+zlib is available in Java using the java.util.zip package, documented at
+http://java.sun.com/developer/technicalArticles/Programming/compression/ .
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
+at CPAN (Comprehensive Perl Archive Network) sites, including
+http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://docs.python.org/library/zlib.html .
+
+zlib is built into tcl: http://wiki.tcl.tk/4610 .
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+  -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+  compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+  when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+  necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+  other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS or BEOS.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+
+Acknowledgments:
+
+  The deflate format used by zlib was defined by Phil Katz.  The deflate and
+  zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
+  people who reported problems and suggested various improvements in zlib; they
+  are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign.  The sources are provided for free but without
+warranty of any kind.  The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes.  Please read
+the FAQ for more information on the distribution of modified source versions.
diff --git a/Source/3rd Party/wx/src/zlib/adler32.c b/Source/3rd Party/wx/src/zlib/adler32.c
index f201d6701..0491dcd01 100644
--- a/Source/3rd Party/wx/src/zlib/adler32.c	
+++ b/Source/3rd Party/wx/src/zlib/adler32.c	
@@ -1,149 +1,178 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-#define BASE 65521UL    /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* use NO_DIVIDE if your processor does not do division in hardware */
-#ifdef NO_DIVIDE
-#  define MOD(a) \
-    do { \
-        if (a >= (BASE << 16)) a -= (BASE << 16); \
-        if (a >= (BASE << 15)) a -= (BASE << 15); \
-        if (a >= (BASE << 14)) a -= (BASE << 14); \
-        if (a >= (BASE << 13)) a -= (BASE << 13); \
-        if (a >= (BASE << 12)) a -= (BASE << 12); \
-        if (a >= (BASE << 11)) a -= (BASE << 11); \
-        if (a >= (BASE << 10)) a -= (BASE << 10); \
-        if (a >= (BASE << 9)) a -= (BASE << 9); \
-        if (a >= (BASE << 8)) a -= (BASE << 8); \
-        if (a >= (BASE << 7)) a -= (BASE << 7); \
-        if (a >= (BASE << 6)) a -= (BASE << 6); \
-        if (a >= (BASE << 5)) a -= (BASE << 5); \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#  define MOD4(a) \
-    do { \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
-#else
-#  define MOD(a) a %= BASE
-#  define MOD4(a) a %= BASE
-#endif
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
-    unsigned long sum2;
-    unsigned n;
-
-    /* split Adler-32 into component sums */
-    sum2 = (adler >> 16) & 0xffff;
-    adler &= 0xffff;
-
-    /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1) {
-        adler += buf[0];
-        if (adler >= BASE)
-            adler -= BASE;
-        sum2 += adler;
-        if (sum2 >= BASE)
-            sum2 -= BASE;
-        return adler | (sum2 << 16);
-    }
-
-    /* initial Adler-32 value (deferred check for len == 1 speed) */
-    if (buf == Z_NULL)
-        return 1L;
-
-    /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16) {
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        if (adler >= BASE)
-            adler -= BASE;
-        MOD4(sum2);             /* only added so many BASE's */
-        return adler | (sum2 << 16);
-    }
-
-    /* do length NMAX blocks -- requires just one modulo operation */
-    while (len >= NMAX) {
-        len -= NMAX;
-        n = NMAX / 16;          /* NMAX is divisible by 16 */
-        do {
-            DO16(buf);          /* 16 sums unrolled */
-            buf += 16;
-        } while (--n);
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* do remaining bytes (less than NMAX, still just one modulo) */
-    if (len) {                  /* avoid modulos if none remaining */
-        while (len >= 16) {
-            len -= 16;
-            DO16(buf);
-            buf += 16;
-        }
-        while (len--) {
-            adler += *buf++;
-            sum2 += adler;
-        }
-        MOD(adler);
-        MOD(sum2);
-    }
-
-    /* return recombined sums */
-    return adler | (sum2 << 16);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
-    unsigned long sum1;
-    unsigned long sum2;
-    unsigned rem;
-
-    /* the derivation of this formula is left as an exercise for the reader */
-    rem = (unsigned)(len2 % BASE);
-    sum1 = adler1 & 0xffff;
-    sum2 = rem * sum1;
-    MOD(sum2);
-    sum1 += (adler2 & 0xffff) + BASE - 1;
-    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
-    if (sum1 > BASE) sum1 -= BASE;
-    if (sum1 > BASE) sum1 -= BASE;
-    if (sum2 > (BASE << 1)) sum2 -= (BASE << 1);
-    if (sum2 > BASE) sum2 -= BASE;
-    return sum1 | (sum2 << 16);
-}
+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2011 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+
+#include "zutil.h"
+
+#define local static
+
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
+
+#define BASE 65521      /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
+#ifdef NO_DIVIDE
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
+    do { \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#  define MOD(a) \
+    do { \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
+#endif
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    unsigned long sum2;
+    unsigned n;
+
+    /* split Adler-32 into component sums */
+    sum2 = (adler >> 16) & 0xffff;
+    adler &= 0xffff;
+
+    /* in case user likes doing a byte at a time, keep it fast */
+    if (len == 1) {
+        adler += buf[0];
+        if (adler >= BASE)
+            adler -= BASE;
+        sum2 += adler;
+        if (sum2 >= BASE)
+            sum2 -= BASE;
+        return adler | (sum2 << 16);
+    }
+
+    /* initial Adler-32 value (deferred check for len == 1 speed) */
+    if (buf == Z_NULL)
+        return 1L;
+
+    /* in case short lengths are provided, keep it somewhat fast */
+    if (len < 16) {
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        if (adler >= BASE)
+            adler -= BASE;
+        MOD28(sum2);            /* only added so many BASE's */
+        return adler | (sum2 << 16);
+    }
+
+    /* do length NMAX blocks -- requires just one modulo operation */
+    while (len >= NMAX) {
+        len -= NMAX;
+        n = NMAX / 16;          /* NMAX is divisible by 16 */
+        do {
+            DO16(buf);          /* 16 sums unrolled */
+            buf += 16;
+        } while (--n);
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* do remaining bytes (less than NMAX, still just one modulo) */
+    if (len) {                  /* avoid modulos if none remaining */
+        while (len >= 16) {
+            len -= 16;
+            DO16(buf);
+            buf += 16;
+        }
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* return recombined sums */
+    return adler | (sum2 << 16);
+}
+
+/* ========================================================================= */
+local uLong adler32_combine_(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    unsigned long sum1;
+    unsigned long sum2;
+    unsigned rem;
+
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
+    /* the derivation of this formula is left as an exercise for the reader */
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
+    sum1 = adler1 & 0xffff;
+    sum2 = rem * sum1;
+    MOD(sum2);
+    sum1 += (adler2 & 0xffff) + BASE - 1;
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
+    if (sum2 >= BASE) sum2 -= BASE;
+    return sum1 | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
+
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
diff --git a/Source/3rd Party/wx/src/zlib/compress.c b/Source/3rd Party/wx/src/zlib/compress.c
index d37e84f5e..8699c7abe 100644
--- a/Source/3rd Party/wx/src/zlib/compress.c	
+++ b/Source/3rd Party/wx/src/zlib/compress.c	
@@ -1,79 +1,79 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2003 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-    int level;
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (Bytef*)source;
-    stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-#endif
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = deflateInit(&stream, level);
-    if (err != Z_OK) return err;
-
-    err = deflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        deflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
-    }
-    *destLen = stream.total_out;
-
-    err = deflateEnd(&stream);
-    return err;
-}
-
-/* ===========================================================================
- */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-}
-
-/* ===========================================================================
-     If the default memLevel or windowBits for deflateInit() is changed, then
-   this function needs to be updated.
- */
-uLong ZEXPORT compressBound (sourceLen)
-    uLong sourceLen;
-{
-    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + 11;
-}
+/* compress.c -- compress a memory buffer
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least 0.1% larger than sourceLen plus
+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+    int level;
+{
+    z_stream stream;
+    int err;
+
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = (uInt)sourceLen;
+#ifdef MAXSEG_64K
+    /* Check for source > 64K on 16-bit machine: */
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+#endif
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
+
+    err = deflateInit(&stream, level);
+    if (err != Z_OK) return err;
+
+    err = deflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        deflateEnd(&stream);
+        return err == Z_OK ? Z_BUF_ERROR : err;
+    }
+    *destLen = stream.total_out;
+
+    err = deflateEnd(&stream);
+    return err;
+}
+
+/* ===========================================================================
+ */
+int ZEXPORT compress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+}
+
+/* ===========================================================================
+     If the default memLevel or windowBits for deflateInit() is changed, then
+   this function needs to be updated.
+ */
+uLong ZEXPORT compressBound (sourceLen)
+    uLong sourceLen;
+{
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13;
+}
diff --git a/Source/3rd Party/wx/src/zlib/crc32.c b/Source/3rd Party/wx/src/zlib/crc32.c
index 237cc58be..be58899c7 100644
--- a/Source/3rd Party/wx/src/zlib/crc32.c	
+++ b/Source/3rd Party/wx/src/zlib/crc32.c	
@@ -1,425 +1,424 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors.  This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
- */
-
-/* @(#) $Id$ */
-
-/*
-  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
-  protection on the static variables used to control the first-use generation
-  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
-  first call get_crc_table() to initialize the tables before allowing more than
-  one thread to use crc32().
- */
-
-#include <stdio.h>
-
-#ifdef MAKECRCH
-#  include <stdio.h>
-#  ifndef DYNAMIC_CRC_TABLE
-#    define DYNAMIC_CRC_TABLE
-#  endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
-
-#include "zutil.h"      /* for STDC and FAR definitions */
-
-#define local static
-
-/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#ifndef NOBYFOUR
-#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
-#    include <limits.h>
-#    define BYFOUR
-#    if (UINT_MAX == 0xffffffffUL)
-       typedef unsigned int u4;
-#    else
-#      if (ULONG_MAX == 0xffffffffUL)
-         typedef unsigned long u4;
-#      else
-#        if (USHRT_MAX == 0xffffffffUL)
-           typedef unsigned short u4;
-#        else
-#          undef BYFOUR     /* can't find a four-byte integer type! */
-#        endif
-#      endif
-#    endif
-#  endif /* STDC */
-#endif /* !NOBYFOUR */
-
-/* Definitions for doing the crc four data bytes at a time. */
-#ifdef BYFOUR
-#  define REV(w) (((w)>>24)+(((w)>>8)&0xff00)+ \
-                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
-   local unsigned long crc32_little OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-   local unsigned long crc32_big OF((unsigned long,
-                        const unsigned char FAR *, unsigned));
-#  define TBLS 8
-#else
-#  define TBLS 1
-#endif /* BYFOUR */
-
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
-                                         unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local volatile int crc_table_empty = 1;
-local unsigned long FAR crc_table[TBLS][256];
-local void make_crc_table OF((void));
-#ifdef MAKECRCH
-   local void write_table OF((FILE *, const unsigned long FAR *));
-#endif /* MAKECRCH */
-/*
-  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The first table is simply the CRC of all possible eight bit values.  This is
-  all the information needed to generate CRCs on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.  The remaining tables
-  allow for word-at-a-time CRC calculation for both big-endian and little-
-  endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
-    unsigned long c;
-    int n, k;
-    unsigned long poly;                 /* polynomial exclusive-or pattern */
-    /* terms of polynomial defining this crc (except x^32): */
-    static volatile int first = 1;      /* flag to limit concurrent making */
-    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-    /* See if another task is already doing this (not thread-safe, but better
-       than nothing -- significantly reduces duration of vulnerability in
-       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first) {
-        first = 0;
-
-        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0UL;
-        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
-            poly |= 1UL << (31 - p[n]);
-
-        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++) {
-            c = (unsigned long)n;
-            for (k = 0; k < 8; k++)
-                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-            crc_table[0][n] = c;
-        }
-
-#ifdef BYFOUR
-        /* generate crc for each value followed by one, two, and three zeros,
-           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++) {
-            c = crc_table[0][n];
-            crc_table[4][n] = REV(c);
-            for (k = 1; k < 4; k++) {
-                c = crc_table[0][c & 0xff] ^ (c >> 8);
-                crc_table[k][n] = c;
-                crc_table[k + 4][n] = REV(c);
-            }
-        }
-#endif /* BYFOUR */
-
-        crc_table_empty = 0;
-    }
-    else {      /* not first */
-        /* wait for the other guy to finish (not efficient, but rare) */
-        while (crc_table_empty)
-            ;
-    }
-
-#ifdef MAKECRCH
-    /* write out CRC tables to crc32.h */
-    {
-        FILE *out;
-
-        out = fopen("crc32.h", "w");
-        if (out == NULL) return;
-        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
-        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const unsigned long FAR ");
-        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
-        write_table(out, crc_table[0]);
-#  ifdef BYFOUR
-        fprintf(out, "#ifdef BYFOUR\n");
-        for (k = 1; k < 8; k++) {
-            fprintf(out, "  },\n  {\n");
-            write_table(out, crc_table[k]);
-        }
-        fprintf(out, "#endif\n");
-#  endif /* BYFOUR */
-        fprintf(out, "  }\n};\n");
-        fclose(out);
-    }
-#endif /* MAKECRCH */
-}
-
-#ifdef MAKECRCH
-local void write_table(out, table)
-    FILE *out;
-    const unsigned long FAR *table;
-{
-    int n;
-
-    for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
-                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-}
-#endif /* MAKECRCH */
-
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
- */
-#include "crc32.h"
-#endif /* DYNAMIC_CRC_TABLE */
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const unsigned long FAR * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-    return (const unsigned long FAR *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    if (buf == Z_NULL) return 0UL;
-
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-
-#ifdef BYFOUR
-    if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        u4 endian;
-
-        endian = 1;
-        if (*((unsigned char *)(&endian)))
-            return crc32_little(crc, buf, len);
-        else
-            return crc32_big(crc, buf, len);
-    }
-#endif /* BYFOUR */
-    crc = crc ^ 0xffffffffUL;
-    while (len >= 8) {
-        DO8;
-        len -= 8;
-    }
-    if (len) do {
-        DO1;
-    } while (--len);
-    return crc ^ 0xffffffffUL;
-}
-
-#ifdef BYFOUR
-
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
-        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
-            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    register u4 c;
-    register const u4 FAR *buf4;
-
-    c = (u4)crc;
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        len--;
-    }
-
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
-    while (len >= 32) {
-        DOLIT32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOLIT4;
-        len -= 4;
-    }
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)c;
-}
-
-/* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
-        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
-            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
-    unsigned long crc;
-    const unsigned char FAR *buf;
-    unsigned len;
-{
-    register u4 c;
-    register const u4 FAR *buf4;
-
-    c = REV((u4)crc);
-    c = ~c;
-    while (len && ((ptrdiff_t)buf & 3)) {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        len--;
-    }
-
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
-    buf4--;
-    while (len >= 32) {
-        DOBIG32;
-        len -= 32;
-    }
-    while (len >= 4) {
-        DOBIG4;
-        len -= 4;
-    }
-    buf4++;
-    buf = (const unsigned char FAR *)buf4;
-
-    if (len) do {
-        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-    } while (--len);
-    c = ~c;
-    return (unsigned long)(REV(c));
-}
-
-#endif /* BYFOUR */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
-
-/* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
-    unsigned long *mat;
-    unsigned long vec;
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
-}
-
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
-    unsigned long *square;
-    unsigned long *mat;
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
-    uLong crc1;
-    uLong crc2;
-    z_off_t len2;
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case */
-    if (len2 == 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320L;           /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-    return crc1;
-}
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
+ * tables for updating the shift register in one step with three exclusive-ors
+ * instead of four steps with four exclusive-ors.  This results in about a
+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ */
+
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+
+  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
+ */
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h"      /* for STDC and FAR definitions */
+
+#define local static
+
+/* Definitions for doing the crc four data bytes at a time. */
+#if !defined(NOBYFOUR) && defined(Z_U4)
+#  define BYFOUR
+#endif
+#ifdef BYFOUR
+   local unsigned long crc32_little OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+   local unsigned long crc32_big OF((unsigned long,
+                        const unsigned char FAR *, unsigned));
+#  define TBLS 8
+#else
+#  define TBLS 1
+#endif /* BYFOUR */
+
+/* Local functions for crc concatenation */
+local unsigned long gf2_matrix_times OF((unsigned long *mat,
+                                         unsigned long vec));
+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local volatile int crc_table_empty = 1;
+local z_crc_t FAR crc_table[TBLS][256];
+local void make_crc_table OF((void));
+#ifdef MAKECRCH
+   local void write_table OF((FILE *, const z_crc_t FAR *));
+#endif /* MAKECRCH */
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The first table is simply the CRC of all possible eight bit values.  This is
+  all the information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.  The remaining tables
+  allow for word-at-a-time CRC calculation for both big-endian and little-
+  endian machines, where a word is four bytes.
+*/
+local void make_crc_table()
+{
+    z_crc_t c;
+    int n, k;
+    z_crc_t poly;                       /* polynomial exclusive-or pattern */
+    /* terms of polynomial defining this crc (except x^32): */
+    static volatile int first = 1;      /* flag to limit concurrent making */
+    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+    /* See if another task is already doing this (not thread-safe, but better
+       than nothing -- significantly reduces duration of vulnerability in
+       case the advice about DYNAMIC_CRC_TABLE is ignored) */
+    if (first) {
+        first = 0;
+
+        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
+        poly = 0;
+        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
+            poly |= (z_crc_t)1 << (31 - p[n]);
+
+        /* generate a crc for every 8-bit value */
+        for (n = 0; n < 256; n++) {
+            c = (z_crc_t)n;
+            for (k = 0; k < 8; k++)
+                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+            crc_table[0][n] = c;
+        }
+
+#ifdef BYFOUR
+        /* generate crc for each value followed by one, two, and three zeros,
+           and then the byte reversal of those as well as the first table */
+        for (n = 0; n < 256; n++) {
+            c = crc_table[0][n];
+            crc_table[4][n] = ZSWAP32(c);
+            for (k = 1; k < 4; k++) {
+                c = crc_table[0][c & 0xff] ^ (c >> 8);
+                crc_table[k][n] = c;
+                crc_table[k + 4][n] = ZSWAP32(c);
+            }
+        }
+#endif /* BYFOUR */
+
+        crc_table_empty = 0;
+    }
+    else {      /* not first */
+        /* wait for the other guy to finish (not efficient, but rare) */
+        while (crc_table_empty)
+            ;
+    }
+
+#ifdef MAKECRCH
+    /* write out CRC tables to crc32.h */
+    {
+        FILE *out;
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
+        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
+        fprintf(out, "local const z_crc_t FAR ");
+        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
+        write_table(out, crc_table[0]);
+#  ifdef BYFOUR
+        fprintf(out, "#ifdef BYFOUR\n");
+        for (k = 1; k < 8; k++) {
+            fprintf(out, "  },\n  {\n");
+            write_table(out, crc_table[k]);
+        }
+        fprintf(out, "#endif\n");
+#  endif /* BYFOUR */
+        fprintf(out, "  }\n};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+local void write_table(out, table)
+    FILE *out;
+    const z_crc_t FAR *table;
+{
+    int n;
+
+    for (n = 0; n < 256; n++)
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
+                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+}
+#endif /* MAKECRCH */
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const z_crc_t FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+    return (const z_crc_t FAR *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    uInt len;
+{
+    if (buf == Z_NULL) return 0UL;
+
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+
+#ifdef BYFOUR
+    if (sizeof(void *) == sizeof(ptrdiff_t)) {
+        z_crc_t endian;
+
+        endian = 1;
+        if (*((unsigned char *)(&endian)))
+            return crc32_little(crc, buf, len);
+        else
+            return crc32_big(crc, buf, len);
+    }
+#endif /* BYFOUR */
+    crc = crc ^ 0xffffffffUL;
+    while (len >= 8) {
+        DO8;
+        len -= 8;
+    }
+    if (len) do {
+        DO1;
+    } while (--len);
+    return crc ^ 0xffffffffUL;
+}
+
+#ifdef BYFOUR
+
+/* ========================================================================= */
+#define DOLIT4 c ^= *buf4++; \
+        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
+            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+
+/* ========================================================================= */
+local unsigned long crc32_little(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
+
+    c = (z_crc_t)crc;
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+        len--;
+    }
+
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    while (len >= 32) {
+        DOLIT32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOLIT4;
+        len -= 4;
+    }
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)c;
+}
+
+/* ========================================================================= */
+#define DOBIG4 c ^= *++buf4; \
+        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
+            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+
+/* ========================================================================= */
+local unsigned long crc32_big(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    unsigned len;
+{
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
+
+    c = ZSWAP32((z_crc_t)crc);
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+        len--;
+    }
+
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    buf4--;
+    while (len >= 32) {
+        DOBIG32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOBIG4;
+        len -= 4;
+    }
+    buf4++;
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)(ZSWAP32(c));
+}
+
+#endif /* BYFOUR */
+
+#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
+
+/* ========================================================================= */
+local unsigned long gf2_matrix_times(mat, vec)
+    unsigned long *mat;
+    unsigned long vec;
+{
+    unsigned long sum;
+
+    sum = 0;
+    while (vec) {
+        if (vec & 1)
+            sum ^= *mat;
+        vec >>= 1;
+        mat++;
+    }
+    return sum;
+}
+
+/* ========================================================================= */
+local void gf2_matrix_square(square, mat)
+    unsigned long *square;
+    unsigned long *mat;
+{
+    int n;
+
+    for (n = 0; n < GF2_DIM; n++)
+        square[n] = gf2_matrix_times(mat, mat[n]);
+}
+
+/* ========================================================================= */
+local uLong crc32_combine_(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    int n;
+    unsigned long row;
+    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
+    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
+
+    /* degenerate case (also disallow negative lengths) */
+    if (len2 <= 0)
+        return crc1;
+
+    /* put operator for one zero bit in odd */
+    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
+    row = 1;
+    for (n = 1; n < GF2_DIM; n++) {
+        odd[n] = row;
+        row <<= 1;
+    }
+
+    /* put operator for two zero bits in even */
+    gf2_matrix_square(even, odd);
+
+    /* put operator for four zero bits in odd */
+    gf2_matrix_square(odd, even);
+
+    /* apply len2 zeros to crc1 (first square will put the operator for one
+       zero byte, eight zero bits, in even) */
+    do {
+        /* apply zeros operator for this bit of len2 */
+        gf2_matrix_square(even, odd);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(even, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+        if (len2 == 0)
+            break;
+
+        /* another iteration of the loop with odd and even swapped */
+        gf2_matrix_square(odd, even);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(odd, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+    } while (len2 != 0);
+
+    /* return combined crc */
+    crc1 ^= crc2;
+    return crc1;
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}
+
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}
diff --git a/Source/3rd Party/wx/src/zlib/crc32.h b/Source/3rd Party/wx/src/zlib/crc32.h
index 5de49bc97..9e0c77810 100644
--- a/Source/3rd Party/wx/src/zlib/crc32.h	
+++ b/Source/3rd Party/wx/src/zlib/crc32.h	
@@ -1,441 +1,441 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const unsigned long FAR crc_table[TBLS][256] =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
-#endif
-  }
-};
+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const z_crc_t FAR crc_table[TBLS][256] =
+{
+  {
+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+    0x2d02ef8dUL
+#ifdef BYFOUR
+  },
+  {
+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
+    0x9324fd72UL
+  },
+  {
+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
+    0xbe9834edUL
+  },
+  {
+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
+    0xde0506f1UL
+  },
+  {
+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
+    0x8def022dUL
+  },
+  {
+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
+    0x72fd2493UL
+  },
+  {
+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
+    0xed3498beUL
+  },
+  {
+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
+    0xf10605deUL
+#endif
+  }
+};
diff --git a/Source/3rd Party/wx/src/zlib/deflate.c b/Source/3rd Party/wx/src/zlib/deflate.c
index f58dee255..eff295d2f 100644
--- a/Source/3rd Party/wx/src/zlib/deflate.c	
+++ b/Source/3rd Party/wx/src/zlib/deflate.c	
@@ -1,1737 +1,1966 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://www.ietf.org/rfc/rfc1951.txt
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include <stdio.h>
-#include "deflate.h"
-
-const char deflate_copyright[] =
-   " deflate 1.2.3 Copyright 1995-2005 Jean-loup Gailly ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Function prototypes.
- */
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-#ifndef FASTEST
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-#endif
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifndef FASTEST
-#ifdef ASMV
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-#endif
-local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
-
-#ifdef DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-#  define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
-} config;
-
-#ifdef FASTEST
-local const config configuration_table[2] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
-#else
-local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-#endif
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-#ifndef NO_DUMMY_DECL
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-#endif
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
- *    input characters, so that a running hash key can be computed from the
- *    previous key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
- *    input characters and the first MIN_MATCH bytes of str are valid
- *    (except for the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-                         Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
-    deflate_state *s;
-    int wrap = 1;
-    static const char my_version[] = ZLIB_VERSION;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-        return Z_VERSION_ERROR;
-    }
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->msg = Z_NULL;
-    if (strm->zalloc == (alloc_func)0) {
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-
-    if (windowBits < 0) { /* suppress zlib wrapper */
-        wrap = 0;
-        windowBits = -windowBits;
-    }
-#ifdef GZIP
-    else if (windowBits > 15) {
-        wrap = 2;       /* write gzip wrapper instead */
-        windowBits -= 16;
-    }
-#endif
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-        strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state FAR *)s;
-    s->strm = strm;
-
-    s->wrap = wrap;
-    s->gzhead = Z_NULL;
-    s->w_bits = windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = memLevel + 7;
-    s->hash_size = 1 << s->hash_bits;
-    s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
-        s->status = FINISH_STATE;
-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
-        return Z_MEM_ERROR;
-    }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
-    deflate_state *s;
-    uInt length = dictLength;
-    uInt n;
-    IPos hash_head = 0;
-
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->wrap == 2 ||
-        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
-        return Z_STREAM_ERROR;
-
-    s = strm->state;
-    if (s->wrap)
-        strm->adler = adler32(strm->adler, dictionary, dictLength);
-
-    if (length < MIN_MATCH) return Z_OK;
-    if (length > MAX_DIST(s)) {
-        length = MAX_DIST(s);
-        dictionary += dictLength - length; /* use the tail of the dictionary */
-    }
-    zmemcpy(s->window, dictionary, length);
-    s->strstart = length;
-    s->block_start = (long)length;
-
-    /* Insert all strings in the hash table (except for the last two bytes).
-     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-     * call of fill_window.
-     */
-    s->ins_h = s->window[0];
-    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    for (n = 0; n <= length - MIN_MATCH; n++) {
-        INSERT_STRING(s, n, hash_head);
-    }
-    if (hash_head) hash_head = 0;  /* to make compiler happy */
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
-        return Z_STREAM_ERROR;
-    }
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->wrap < 0) {
-        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
-    }
-    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
-    strm->adler =
-#ifdef GZIP
-        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-#endif
-        adler32(0L, Z_NULL, 0);
-    s->last_flush = Z_NO_FLUSH;
-
-    _tr_init(s);
-    lm_init(s);
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
-    z_streamp strm;
-    gz_headerp head;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
-    strm->state->gzhead = head;
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
-    z_streamp strm;
-    int bits;
-    int value;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    strm->state->bi_valid = bits;
-    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
-    deflate_state *s;
-    compress_func func;
-    int err = Z_OK;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-
-#ifdef FASTEST
-    if (level != 0) level = 1;
-#else
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
-        return Z_STREAM_ERROR;
-    }
-    func = configuration_table[s->level].func;
-
-    if (func != configuration_table[level].func && strm->total_in != 0) {
-        /* Flush the last buffer: */
-        err = deflate(strm, Z_PARTIAL_FLUSH);
-    }
-    if (s->level != level) {
-        s->level = level;
-        s->max_lazy_match   = configuration_table[level].max_lazy;
-        s->good_match       = configuration_table[level].good_length;
-        s->nice_match       = configuration_table[level].nice_length;
-        s->max_chain_length = configuration_table[level].max_chain;
-    }
-    s->strategy = strategy;
-    return err;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
-    z_streamp strm;
-    int good_length;
-    int max_lazy;
-    int nice_length;
-    int max_chain;
-{
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-    s->good_match = good_length;
-    s->max_lazy_match = max_lazy;
-    s->nice_match = nice_length;
-    s->max_chain_length = max_chain;
-    return Z_OK;
-}
-
-/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well.  The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds
- * for every combination of windowBits and memLevel, as well as wrap.
- * But even the conservative upper bound of about 14% expansion does not
- * seem onerous for output buffer allocation.
- */
-uLong ZEXPORT deflateBound(strm, sourceLen)
-    z_streamp strm;
-    uLong sourceLen;
-{
-    deflate_state *s;
-    uLong destLen;
-
-    /* conservative upper bound */
-    destLen = sourceLen +
-              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 11;
-
-    /* if can't get parameters, return conservative bound */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return destLen;
-
-    /* if not default parameters, return conservative bound */
-    s = strm->state;
-    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
-        return destLen;
-
-    /* default settings: return tight bound for that case */
-    return compressBound(sourceLen);
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
-    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, (Byte)(b & 0xff));
-}
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also read_buf()).
- */
-local void flush_pending(strm)
-    z_streamp strm;
-{
-    unsigned len = strm->state->pending;
-
-    if (len > strm->avail_out) len = strm->avail_out;
-    if (len == 0) return;
-
-    zmemcpy(strm->next_out, strm->state->pending_out, len);
-    strm->next_out  += len;
-    strm->state->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out  -= len;
-    strm->state->pending -= len;
-    if (strm->state->pending == 0) {
-        strm->state->pending_out = strm->state->pending_buf;
-    }
-}
-
-/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
-    int old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        flush > Z_FINISH || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    s->strm = strm; /* just in case */
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Write the header */
-    if (s->status == INIT_STATE) {
-#ifdef GZIP
-        if (s->wrap == 2) {
-            strm->adler = crc32(0L, Z_NULL, 0);
-            put_byte(s, 31);
-            put_byte(s, 139);
-            put_byte(s, 8);
-            if (s->gzhead == NULL) {
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, 0);
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, OS_CODE);
-                s->status = BUSY_STATE;
-            }
-            else {
-                put_byte(s, (s->gzhead->text ? 1 : 0) +
-                            (s->gzhead->hcrc ? 2 : 0) +
-                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
-                            (s->gzhead->name == Z_NULL ? 0 : 8) +
-                            (s->gzhead->comment == Z_NULL ? 0 : 16)
-                        );
-                put_byte(s, (Byte)(s->gzhead->time & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
-                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
-                put_byte(s, s->level == 9 ? 2 :
-                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
-                             4 : 0));
-                put_byte(s, s->gzhead->os & 0xff);
-                if (s->gzhead->extra != NULL) {
-                    put_byte(s, s->gzhead->extra_len & 0xff);
-                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
-                }
-                if (s->gzhead->hcrc)
-                    strm->adler = crc32(strm->adler, s->pending_buf,
-                                        s->pending);
-                s->gzindex = 0;
-                s->status = EXTRA_STATE;
-            }
-        }
-        else
-#endif
-        {
-            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-            uInt level_flags;
-
-            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
-                level_flags = 0;
-            else if (s->level < 6)
-                level_flags = 1;
-            else if (s->level == 6)
-                level_flags = 2;
-            else
-                level_flags = 3;
-            header |= (level_flags << 6);
-            if (s->strstart != 0) header |= PRESET_DICT;
-            header += 31 - (header % 31);
-
-            s->status = BUSY_STATE;
-            putShortMSB(s, header);
-
-            /* Save the adler32 of the preset dictionary: */
-            if (s->strstart != 0) {
-                putShortMSB(s, (uInt)(strm->adler >> 16));
-                putShortMSB(s, (uInt)(strm->adler & 0xffff));
-            }
-            strm->adler = adler32(0L, Z_NULL, 0);
-        }
-    }
-#ifdef GZIP
-    if (s->status == EXTRA_STATE) {
-        if (s->gzhead->extra != NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-
-            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size)
-                        break;
-                }
-                put_byte(s, s->gzhead->extra[s->gzindex]);
-                s->gzindex++;
-            }
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (s->gzindex == s->gzhead->extra_len) {
-                s->gzindex = 0;
-                s->status = NAME_STATE;
-            }
-        }
-        else
-            s->status = NAME_STATE;
-    }
-    if (s->status == NAME_STATE) {
-        if (s->gzhead->name != NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->name[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0) {
-                s->gzindex = 0;
-                s->status = COMMENT_STATE;
-            }
-        }
-        else
-            s->status = COMMENT_STATE;
-    }
-    if (s->status == COMMENT_STATE) {
-        if (s->gzhead->comment != NULL) {
-            uInt beg = s->pending;  /* start of bytes to update crc */
-            int val;
-
-            do {
-                if (s->pending == s->pending_buf_size) {
-                    if (s->gzhead->hcrc && s->pending > beg)
-                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                            s->pending - beg);
-                    flush_pending(strm);
-                    beg = s->pending;
-                    if (s->pending == s->pending_buf_size) {
-                        val = 1;
-                        break;
-                    }
-                }
-                val = s->gzhead->comment[s->gzindex++];
-                put_byte(s, val);
-            } while (val != 0);
-            if (s->gzhead->hcrc && s->pending > beg)
-                strm->adler = crc32(strm->adler, s->pending_buf + beg,
-                                    s->pending - beg);
-            if (val == 0)
-                s->status = HCRC_STATE;
-        }
-        else
-            s->status = HCRC_STATE;
-    }
-    if (s->status == HCRC_STATE) {
-        if (s->gzhead->hcrc) {
-            if (s->pending + 2 > s->pending_buf_size)
-                flush_pending(strm);
-            if (s->pending + 2 <= s->pending_buf_size) {
-                put_byte(s, (Byte)(strm->adler & 0xff));
-                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-                strm->adler = crc32(0L, Z_NULL, 0);
-                s->status = BUSY_STATE;
-            }
-        }
-        else
-            s->status = BUSY_STATE;
-    }
-#endif
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        flush_pending(strm);
-        if (strm->avail_out == 0) {
-            /* Since avail_out is 0, deflate will be called again with
-             * more output space, but possibly with both pending and
-             * avail_in equal to zero. There won't be anything to do,
-             * but this is not an error situation so make sure we
-             * return OK instead of BUF_ERROR at next call of deflate:
-             */
-            s->last_flush = -1;
-            return Z_OK;
-        }
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && flush <= old_flush &&
-               flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-        bstate = (*(configuration_table[s->level].func))(s, flush);
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-            if (strm->avail_out == 0) {
-                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-            }
-            return Z_OK;
-            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-             * of deflate should use the same flush parameter to make sure
-             * that the flush is complete. So we don't have to output an
-             * empty block here, this will be done at next call. This also
-             * ensures that for a very small output buffer, we emit at most
-             * one empty block.
-             */
-        }
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                _tr_align(s);
-            } else { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                }
-            }
-            flush_pending(strm);
-            if (strm->avail_out == 0) {
-              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-              return Z_OK;
-            }
-        }
-    }
-    Assert(strm->avail_out > 0, "bug2");
-
-    if (flush != Z_FINISH) return Z_OK;
-    if (s->wrap <= 0) return Z_STREAM_END;
-
-    /* Write the trailer */
-#ifdef GZIP
-    if (s->wrap == 2) {
-        put_byte(s, (Byte)(strm->adler & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
-        put_byte(s, (Byte)(strm->total_in & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
-        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
-    }
-    else
-#endif
-    {
-        putShortMSB(s, (uInt)(strm->adler >> 16));
-        putShortMSB(s, (uInt)(strm->adler & 0xffff));
-    }
-    flush_pending(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
-    return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
-    int status;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-    if (status != INIT_STATE &&
-        status != EXTRA_STATE &&
-        status != NAME_STATE &&
-        status != COMMENT_STATE &&
-        status != HCRC_STATE &&
-        status != BUSY_STATE &&
-        status != FINISH_STATE) {
-      return Z_STREAM_ERROR;
-    }
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->window);
-
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MSDOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
-#ifdef MAXSEG_64K
-    return Z_STREAM_ERROR;
-#else
-    deflate_state *ds;
-    deflate_state *ss;
-    ushf *overlay;
-
-
-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
-        return Z_STREAM_ERROR;
-    }
-
-    ss = source->state;
-
-    zmemcpy(dest, source, sizeof(z_stream));
-
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-    if (ds == Z_NULL) return Z_MEM_ERROR;
-    dest->state = (struct internal_state FAR *) ds;
-    zmemcpy(ds, ss, sizeof(deflate_state));
-    ds->strm = dest;
-
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
-        return Z_MEM_ERROR;
-    }
-    /* following zmemcpy do not work for 16-bit MSDOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-#endif /* MAXSEG_64K */
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local int read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, strm->next_in, len);
-    }
-#ifdef GZIP
-    else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, strm->next_in, len);
-    }
-#endif
-    zmemcpy(buf, strm->next_in, len);
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return (int)len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    int best_len = s->prev_length;              /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0.
-     */
-    Posf *prev = s->prev;
-    uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
-    /* Compare two bytes at a time. Note: this is not always beneficial.
-     * Try with and without -DUNALIGNED_OK to check.
-     */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
-#else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
-    register Byte scan_end   = scan[best_len];
-#endif
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    /* Do not waste too much time if we already have a good match: */
-    if (s->prev_length >= s->good_match) {
-        chain_length >>= 2;
-    }
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    do {
-        Assert(cur_match < s->strstart, "no future");
-        match = s->window + cur_match;
-
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2.  Note that the checks below
-         * for insufficient lookahead only occur occasionally for performance
-         * reasons.  Therefore uninitialized memory will be accessed, and
-         * conditional jumps will be made that depend on those values.
-         * However the length of the match is limited to the lookahead, so
-         * the output of deflate is not affected by the uninitialized values.
-         */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-        /* This code assumes sizeof(unsigned short) == 2. Do not use
-         * UNALIGNED_OK if your compiler uses a different size.
-         */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
-
-        /* It is not necessary to compare scan[2] and match[2] since they are
-         * always equal when the other bytes match, given that the hash keys
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
-         * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-         * necessary to put more guard bytes at the end of the window, or
-         * to check more often for insufficient lookahead.
-         */
-        Assert(scan[2] == match[2], "scan[2]?");
-        scan++, match++;
-        do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 scan < strend);
-        /* The funny "do {}" generates better code on most compilers */
-
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-        if (*scan == *match) scan++;
-
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * It is not necessary to compare scan[2] and match[2] since they
-         * are always equal when the other bytes match, given that
-         * the hash keys are equal and that HASH_BITS >= 8.
-         */
-        scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 scan < strend);
-
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-        len = MAX_MATCH - (int)(strend - scan);
-        scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
-        if (len > best_len) {
-            s->match_start = cur_match;
-            best_len = len;
-            if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
-#else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
-#endif
-        }
-    } while ((cur_match = prev[cur_match & wmask]) > limit
-             && --chain_length != 0);
-
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-    return s->lookahead;
-}
-#endif /* ASMV */
-#endif /* FASTEST */
-
-/* ---------------------------------------------------------------------------
- * Optimized version for level == 1 or strategy == Z_RLE only
- */
-local uInt longest_match_fast(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    Assert(cur_match < s->strstart, "no future");
-
-    match = s->window + cur_match;
-
-    /* Return failure if the match length is less than 2:
-     */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2, match += 2;
-    Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-    } while (*++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             *++scan == *++match && *++scan == *++match &&
-             scan < strend);
-
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (int)(strend - scan);
-
-    if (len < MIN_MATCH) return MIN_MATCH - 1;
-
-    s->match_start = cur_match;
-    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
-}
-
-#ifdef DEBUG
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
-    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-                start, match, length);
-        do {
-            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-        } while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
-    }
-}
-#else
-#  define check_match(s, start, match, length)
-#endif /* DEBUG */
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(s)
-    deflate_state *s;
-{
-    register unsigned n, m;
-    register Posf *p;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (sizeof(int) <= 2) {
-            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-                more = wsize;
-
-            } else if (more == (unsigned)(-1)) {
-                /* Very unlikely, but possible on 16 bit machine if
-                 * strstart == 0 && lookahead == 1 (input done a byte at time)
-                 */
-                more--;
-            }
-        }
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-
-            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage). We slide even when level == 0
-               to keep the hash table consistent if we switch back to level > 0
-               later. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-            /* %%% avoid this when Z_RLE */
-            n = s->hash_size;
-            p = &s->head[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-            } while (--n);
-
-            n = wsize;
-#ifndef FASTEST
-            p = &s->prev[n];
-            do {
-                m = *--p;
-                *p = (Pos)(m >= wsize ? m-wsize : NIL);
-                /* If n is not on any hash chain, prev[n] is garbage but
-                 * its value will never be used.
-                 */
-            } while (--n);
-#endif
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) return;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            s->ins_h = s->window[s->strstart];
-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, eof) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-                (ulg)((long)s->strstart - s->block_start), \
-                (eof)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, eof) { \
-   FLUSH_BLOCK_ONLY(s, eof); \
-   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-     * to pending_buf_size, and each stored block has a 5 byte header:
-     */
-    ulg max_block_size = 0xffff;
-    ulg max_start;
-
-    if (max_block_size > s->pending_buf_size - 5) {
-        max_block_size = s->pending_buf_size - 5;
-    }
-
-    /* Copy as much as possible from input to output: */
-    for (;;) {
-        /* Fill the window as much as possible: */
-        if (s->lookahead <= 1) {
-
-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-                   s->block_start >= (long)s->w_size, "slide too late");
-
-            fill_window(s);
-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
-
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-        Assert(s->block_start >= 0L, "block gone");
-
-        s->strstart += s->lookahead;
-        s->lookahead = 0;
-
-        /* Emit a stored block if pending_buf will be full: */
-        max_start = s->block_start + max_block_size;
-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-            /* strstart == 0 is possible when wraparound on 16-bit machine */
-            s->lookahead = (uInt)(s->strstart - max_start);
-            s->strstart = (uInt)max_start;
-            FLUSH_BLOCK(s, 0);
-        }
-        /* Flush if we may have to slide, otherwise block_start may become
-         * negative and the data will be gone:
-         */
-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-            FLUSH_BLOCK(s, 0);
-        }
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head = NIL; /* head of the hash chain */
-    int bflush;           /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-#ifdef FASTEST
-            if ((s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) ||
-                (s->strategy == Z_RLE && s->strstart - hash_head == 1)) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-#else
-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-                s->match_length = longest_match (s, hash_head);
-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-#endif
-            /* longest_match() or longest_match_fast() sets match_start */
-        }
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
-
-            _tr_tally_dist(s, s->strstart - s->match_start,
-                           s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-#ifndef FASTEST
-            if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in table */
-                do {
-                    s->strstart++;
-                    INSERT_STRING(s, s->strstart, hash_head);
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead.
-                     */
-                } while (--s->match_length != 0);
-                s->strstart++;
-            } else
-#endif
-            {
-                s->strstart += s->match_length;
-                s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head = NIL;    /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            if (s->strategy != Z_HUFFMAN_ONLY && s->strategy != Z_RLE) {
-                s->match_length = longest_match (s, hash_head);
-            } else if (s->strategy == Z_RLE && s->strstart - hash_head == 1) {
-                s->match_length = longest_match_fast (s, hash_head);
-            }
-            /* longest_match() or longest_match_fast() sets match_start */
-
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-#if TOO_FAR <= 32767
-                || (s->match_length == MIN_MATCH &&
-                    s->strstart - s->match_start > TOO_FAR)
-#endif
-                )) {
-
-                /* If prev_match is also MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                s->match_length = MIN_MATCH-1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-                           s->prev_length - MIN_MATCH, bflush);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->lookahead -= s->prev_length-1;
-            s->prev_length -= 2;
-            do {
-                if (++s->strstart <= max_insert) {
-                    INSERT_STRING(s, s->strstart, hash_head);
-                }
-            } while (--s->prev_length != 0);
-            s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
-            s->strstart++;
-
-            if (bflush) FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-            if (bflush) {
-                FLUSH_BLOCK_ONLY(s, 0);
-            }
-            s->strstart++;
-            s->lookahead--;
-            if (s->strm->avail_out == 0) return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
-    if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-        s->match_available = 0;
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-#endif /* FASTEST */
-
-#if 0
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one.  Do not maintain a hash table.  (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-local block_state deflate_rle(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    int bflush;         /* set if current block must be flushed */
-    uInt run;           /* length of run */
-    uInt max;           /* maximum length of run */
-    uInt prev;          /* byte at distance one to match */
-    Bytef *scan;        /* scan for end of run */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest encodable run.
-         */
-        if (s->lookahead < MAX_MATCH) {
-            fill_window(s);
-            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
-                return need_more;
-            }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* See how many times the previous byte repeats */
-        run = 0;
-        if (s->strstart > 0) {      /* if there is a previous byte, that is */
-            max = s->lookahead < MAX_MATCH ? s->lookahead : MAX_MATCH;
-            scan = s->window + s->strstart - 1;
-            prev = *scan++;
-            do {
-                if (*scan++ != prev)
-                    break;
-            } while (++run < max);
-        }
-
-        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
-        if (run >= MIN_MATCH) {
-            check_match(s, s->strstart, s->strstart - 1, run);
-            _tr_tally_dist(s, 1, run - MIN_MATCH, bflush);
-            s->lookahead -= run;
-            s->strstart += run;
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++;
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-#endif
+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process depends on being able to identify portions
+ *      of the input text which are identical to earlier input (within a
+ *      sliding window trailing behind the input currently being processed).
+ *
+ *      The most straightforward technique turns out to be the fastest for
+ *      most input files: try all possible matches and select the longest.
+ *      The key feature of this algorithm is that insertions into the string
+ *      dictionary are very simple and thus fast, and deletions are avoided
+ *      completely. Insertions are performed at each input character, whereas
+ *      string matches are performed only when the previous match ends. So it
+ *      is preferable to spend more time in matches to allow very fast string
+ *      insertions and avoid deletions. The matching algorithm for small
+ *      strings is inspired from that of Rabin & Karp. A brute force approach
+ *      is used to find longer strings when a small match has been found.
+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ *      (by Leonid Broukhis).
+ *         A previous version of this file used a more sophisticated algorithm
+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized
+ *      time, but has a larger average cost, uses more memory and is patented.
+ *      However the F&G algorithm may be faster for some highly redundant
+ *      files if the parameter max_chain_length (described below) is too large.
+ *
+ *  ACKNOWLEDGEMENTS
+ *
+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ *      I found it in 'freeze' written by Leonid Broukhis.
+ *      Thanks to many people for bug reports and testing.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ *      Available in http://tools.ietf.org/html/rfc1951
+ *
+ *      A description of the Rabin and Karp algorithm is given in the book
+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ *      Fiala,E.R., and Greene,D.H.
+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+
+#include "deflate.h"
+
+const char deflate_copyright[] =
+   " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ *  Function prototypes.
+ */
+typedef enum {
+    need_more,      /* block not completed, need more input or more output */
+    block_done,     /* block flush performed */
+    finish_started, /* finish started, need only more output at next deflate */
+    finish_done     /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local void fill_window    OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast   OF((deflate_state *s, int flush));
+#ifndef FASTEST
+local block_state deflate_slow   OF((deflate_state *s, int flush));
+#endif
+local block_state deflate_rle    OF((deflate_state *s, int flush));
+local block_state deflate_huff   OF((deflate_state *s, int flush));
+local void lm_init        OF((deflate_state *s));
+local void putShortMSB    OF((deflate_state *s, uInt b));
+local void flush_pending  OF((z_streamp strm));
+local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifdef ASMV
+      void match_init OF((void)); /* asm code initialization */
+      uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#else
+local uInt longest_match  OF((deflate_state *s, IPos cur_match));
+#endif
+
+#ifdef DEBUG
+local  void check_match OF((deflate_state *s, IPos start, IPos match,
+                            int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+#  define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+   ush good_length; /* reduce lazy search above this match length */
+   ush max_lazy;    /* do not perform lazy search above this match length */
+   ush nice_length; /* quit search above this match length */
+   ush max_chain;
+   compress_func func;
+} config;
+
+#ifdef FASTEST
+local const config configuration_table[2] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */
+#else
+local const config configuration_table[10] = {
+/*      good lazy nice chain */
+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */
+/* 2 */ {4,    5, 16,    8, deflate_fast},
+/* 3 */ {4,    6, 32,   32, deflate_fast},
+
+/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
+/* 5 */ {8,   16, 32,   32, deflate_slow},
+/* 6 */ {8,   16, 128, 128, deflate_slow},
+/* 7 */ {8,   32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+#ifndef NO_DUMMY_DECL
+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+#endif
+
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
+#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
+ *    input characters, so that a running hash key can be computed from the
+ *    previous key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+ *    input characters and the first MIN_MATCH bytes of str are valid
+ *    (except for the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \
+    s->head[s->ins_h] = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev[] will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+    s->head[s->hash_size-1] = NIL; \
+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+    z_streamp strm;
+    int level;
+    const char *version;
+    int stream_size;
+{
+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+                         Z_DEFAULT_STRATEGY, version, stream_size);
+    /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                  version, stream_size)
+    z_streamp strm;
+    int  level;
+    int  method;
+    int  windowBits;
+    int  memLevel;
+    int  strategy;
+    const char *version;
+    int stream_size;
+{
+    deflate_state *s;
+    int wrap = 1;
+    static const char my_version[] = ZLIB_VERSION;
+
+    ushf *overlay;
+    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+     * output size for (length,distance) codes is <= 24 bits.
+     */
+
+    if (version == Z_NULL || version[0] != my_version[0] ||
+        stream_size != sizeof(z_stream)) {
+        return Z_VERSION_ERROR;
+    }
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+    strm->msg = Z_NULL;
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+
+    if (windowBits < 0) { /* suppress zlib wrapper */
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+#ifdef GZIP
+    else if (windowBits > 15) {
+        wrap = 2;       /* write gzip wrapper instead */
+        windowBits -= 16;
+    }
+#endif
+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+        strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */
+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+    if (s == Z_NULL) return Z_MEM_ERROR;
+    strm->state = (struct internal_state FAR *)s;
+    s->strm = strm;
+
+    s->wrap = wrap;
+    s->gzhead = Z_NULL;
+    s->w_bits = windowBits;
+    s->w_size = 1 << s->w_bits;
+    s->w_mask = s->w_size - 1;
+
+    s->hash_bits = memLevel + 7;
+    s->hash_size = 1 << s->hash_bits;
+    s->hash_mask = s->hash_size - 1;
+    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+
+    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+    s->high_water = 0;      /* nothing written to s->window yet */
+
+    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+    s->pending_buf = (uchf *) overlay;
+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+
+    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+        s->pending_buf == Z_NULL) {
+        s->status = FINISH_STATE;
+        strm->msg = ERR_MSG(Z_MEM_ERROR);
+        deflateEnd (strm);
+        return Z_MEM_ERROR;
+    }
+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+
+    s->level = level;
+    s->strategy = strategy;
+    s->method = (Byte)method;
+
+    return deflateReset(strm);
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+    z_streamp strm;
+    const Bytef *dictionary;
+    uInt  dictLength;
+{
+    deflate_state *s;
+    uInt str, n;
+    int wrap;
+    unsigned avail;
+    z_const unsigned char *next;
+
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    wrap = s->wrap;
+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
+        return Z_STREAM_ERROR;
+
+    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+    if (wrap == 1)
+        strm->adler = adler32(strm->adler, dictionary, dictLength);
+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
+
+    /* if dictionary would fill window, just replace the history */
+    if (dictLength >= s->w_size) {
+        if (wrap == 0) {            /* already empty otherwise */
+            CLEAR_HASH(s);
+            s->strstart = 0;
+            s->block_start = 0L;
+            s->insert = 0;
+        }
+        dictionary += dictLength - s->w_size;  /* use the tail */
+        dictLength = s->w_size;
+    }
+
+    /* insert dictionary into window and hash */
+    avail = strm->avail_in;
+    next = strm->next_in;
+    strm->avail_in = dictLength;
+    strm->next_in = (z_const Bytef *)dictionary;
+    fill_window(s);
+    while (s->lookahead >= MIN_MATCH) {
+        str = s->strstart;
+        n = s->lookahead - (MIN_MATCH-1);
+        do {
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+            s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+            s->head[s->ins_h] = (Pos)str;
+            str++;
+        } while (--n);
+        s->strstart = str;
+        s->lookahead = MIN_MATCH-1;
+        fill_window(s);
+    }
+    s->strstart += s->lookahead;
+    s->block_start = (long)s->strstart;
+    s->insert = s->lookahead;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    strm->next_in = next;
+    strm->avail_in = avail;
+    s->wrap = wrap;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateResetKeep (strm)
+    z_streamp strm;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+        return Z_STREAM_ERROR;
+    }
+
+    strm->total_in = strm->total_out = 0;
+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+    strm->data_type = Z_UNKNOWN;
+
+    s = (deflate_state *)strm->state;
+    s->pending = 0;
+    s->pending_out = s->pending_buf;
+
+    if (s->wrap < 0) {
+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
+    }
+    s->status = s->wrap ? INIT_STATE : BUSY_STATE;
+    strm->adler =
+#ifdef GZIP
+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+        adler32(0L, Z_NULL, 0);
+    s->last_flush = Z_NO_FLUSH;
+
+    _tr_init(s);
+
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    int ret;
+
+    ret = deflateResetKeep(strm);
+    if (ret == Z_OK)
+        lm_init(strm->state);
+    return ret;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetHeader (strm, head)
+    z_streamp strm;
+    gz_headerp head;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (strm->state->wrap != 2) return Z_STREAM_ERROR;
+    strm->state->gzhead = head;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePending (strm, pending, bits)
+    unsigned *pending;
+    int *bits;
+    z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime (strm, bits, value)
+    z_streamp strm;
+    int bits;
+    int value;
+{
+    deflate_state *s;
+    int put;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+    do {
+        put = Buf_size - s->bi_valid;
+        if (put > bits)
+            put = bits;
+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+        s->bi_valid += put;
+        _tr_flush_bits(s);
+        value >>= put;
+        bits -= put;
+    } while (bits);
+    return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+    z_streamp strm;
+    int level;
+    int strategy;
+{
+    deflate_state *s;
+    compress_func func;
+    int err = Z_OK;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+
+#ifdef FASTEST
+    if (level != 0) level = 1;
+#else
+    if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
+        return Z_STREAM_ERROR;
+    }
+    func = configuration_table[s->level].func;
+
+    if ((strategy != s->strategy || func != configuration_table[level].func) &&
+        strm->total_in != 0) {
+        /* Flush the last buffer: */
+        err = deflate(strm, Z_BLOCK);
+        if (err == Z_BUF_ERROR && s->pending == 0)
+            err = Z_OK;
+    }
+    if (s->level != level) {
+        s->level = level;
+        s->max_lazy_match   = configuration_table[level].max_lazy;
+        s->good_match       = configuration_table[level].good_length;
+        s->nice_match       = configuration_table[level].nice_length;
+        s->max_chain_length = configuration_table[level].max_chain;
+    }
+    s->strategy = strategy;
+    return err;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
+    z_streamp strm;
+    int good_length;
+    int max_lazy;
+    int nice_length;
+    int max_chain;
+{
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    s = strm->state;
+    s->good_match = good_length;
+    s->max_lazy_match = max_lazy;
+    s->nice_match = nice_length;
+    s->max_chain_length = max_chain;
+    return Z_OK;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns
+ * a close to exact, as well as small, upper bound on the compressed size.
+ * They are coded as constants here for a reason--if the #define's are
+ * changed, then this function needs to be changed as well.  The return
+ * value for 15 and 8 only works for those exact settings.
+ *
+ * For any setting other than those defaults for windowBits and memLevel,
+ * the value returned is a conservative worst case for the maximum expansion
+ * resulting from using fixed blocks instead of stored blocks, which deflate
+ * can emit on compressed data for some combinations of the parameters.
+ *
+ * This function could be more sophisticated to provide closer upper bounds for
+ * every combination of windowBits and memLevel.  But even the conservative
+ * upper bound of about 14% expansion does not seem onerous for output buffer
+ * allocation.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+    z_streamp strm;
+    uLong sourceLen;
+{
+    deflate_state *s;
+    uLong complen, wraplen;
+    Bytef *str;
+
+    /* conservative upper bound for compressed data */
+    complen = sourceLen +
+              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+
+    /* if can't get parameters, return conservative bound plus zlib wrapper */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return complen + 6;
+
+    /* compute wrapper length */
+    s = strm->state;
+    switch (s->wrap) {
+    case 0:                                 /* raw deflate */
+        wraplen = 0;
+        break;
+    case 1:                                 /* zlib wrapper */
+        wraplen = 6 + (s->strstart ? 4 : 0);
+        break;
+    case 2:                                 /* gzip wrapper */
+        wraplen = 18;
+        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */
+            if (s->gzhead->extra != Z_NULL)
+                wraplen += 2 + s->gzhead->extra_len;
+            str = s->gzhead->name;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            str = s->gzhead->comment;
+            if (str != Z_NULL)
+                do {
+                    wraplen++;
+                } while (*str++);
+            if (s->gzhead->hcrc)
+                wraplen += 2;
+        }
+        break;
+    default:                                /* for compiler happiness */
+        wraplen = 6;
+    }
+
+    /* if not default parameters, return conservative bound */
+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+        return complen + wraplen;
+
+    /* default settings: return tight bound for that case */
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13 - 6 + wraplen;
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB (s, b)
+    deflate_state *s;
+    uInt b;
+{
+    put_byte(s, (Byte)(b >> 8));
+    put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->next_out buffer and copying into it.
+ * (See also read_buf()).
+ */
+local void flush_pending(strm)
+    z_streamp strm;
+{
+    unsigned len;
+    deflate_state *s = strm->state;
+
+    _tr_flush_bits(s);
+    len = s->pending;
+    if (len > strm->avail_out) len = strm->avail_out;
+    if (len == 0) return;
+
+    zmemcpy(strm->next_out, s->pending_out, len);
+    strm->next_out  += len;
+    s->pending_out  += len;
+    strm->total_out += len;
+    strm->avail_out  -= len;
+    s->pending -= len;
+    if (s->pending == 0) {
+        s->pending_out = s->pending_buf;
+    }
+}
+
+/* ========================================================================= */
+int ZEXPORT deflate (strm, flush)
+    z_streamp strm;
+    int flush;
+{
+    int old_flush; /* value of flush param for previous deflate call */
+    deflate_state *s;
+
+    if (strm == Z_NULL || strm->state == Z_NULL ||
+        flush > Z_BLOCK || flush < 0) {
+        return Z_STREAM_ERROR;
+    }
+    s = strm->state;
+
+    if (strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+        ERR_RETURN(strm, Z_STREAM_ERROR);
+    }
+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+    s->strm = strm; /* just in case */
+    old_flush = s->last_flush;
+    s->last_flush = flush;
+
+    /* Write the header */
+    if (s->status == INIT_STATE) {
+#ifdef GZIP
+        if (s->wrap == 2) {
+            strm->adler = crc32(0L, Z_NULL, 0);
+            put_byte(s, 31);
+            put_byte(s, 139);
+            put_byte(s, 8);
+            if (s->gzhead == Z_NULL) {
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, 0);
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, OS_CODE);
+                s->status = BUSY_STATE;
+            }
+            else {
+                put_byte(s, (s->gzhead->text ? 1 : 0) +
+                            (s->gzhead->hcrc ? 2 : 0) +
+                            (s->gzhead->extra == Z_NULL ? 0 : 4) +
+                            (s->gzhead->name == Z_NULL ? 0 : 8) +
+                            (s->gzhead->comment == Z_NULL ? 0 : 16)
+                        );
+                put_byte(s, (Byte)(s->gzhead->time & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+                put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+                put_byte(s, s->level == 9 ? 2 :
+                            (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+                             4 : 0));
+                put_byte(s, s->gzhead->os & 0xff);
+                if (s->gzhead->extra != Z_NULL) {
+                    put_byte(s, s->gzhead->extra_len & 0xff);
+                    put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
+                }
+                if (s->gzhead->hcrc)
+                    strm->adler = crc32(strm->adler, s->pending_buf,
+                                        s->pending);
+                s->gzindex = 0;
+                s->status = EXTRA_STATE;
+            }
+        }
+        else
+#endif
+        {
+            uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+            uInt level_flags;
+
+            if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+                level_flags = 0;
+            else if (s->level < 6)
+                level_flags = 1;
+            else if (s->level == 6)
+                level_flags = 2;
+            else
+                level_flags = 3;
+            header |= (level_flags << 6);
+            if (s->strstart != 0) header |= PRESET_DICT;
+            header += 31 - (header % 31);
+
+            s->status = BUSY_STATE;
+            putShortMSB(s, header);
+
+            /* Save the adler32 of the preset dictionary: */
+            if (s->strstart != 0) {
+                putShortMSB(s, (uInt)(strm->adler >> 16));
+                putShortMSB(s, (uInt)(strm->adler & 0xffff));
+            }
+            strm->adler = adler32(0L, Z_NULL, 0);
+        }
+    }
+#ifdef GZIP
+    if (s->status == EXTRA_STATE) {
+        if (s->gzhead->extra != Z_NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+
+            while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size)
+                        break;
+                }
+                put_byte(s, s->gzhead->extra[s->gzindex]);
+                s->gzindex++;
+            }
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (s->gzindex == s->gzhead->extra_len) {
+                s->gzindex = 0;
+                s->status = NAME_STATE;
+            }
+        }
+        else
+            s->status = NAME_STATE;
+    }
+    if (s->status == NAME_STATE) {
+        if (s->gzhead->name != Z_NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->name[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0) {
+                s->gzindex = 0;
+                s->status = COMMENT_STATE;
+            }
+        }
+        else
+            s->status = COMMENT_STATE;
+    }
+    if (s->status == COMMENT_STATE) {
+        if (s->gzhead->comment != Z_NULL) {
+            uInt beg = s->pending;  /* start of bytes to update crc */
+            int val;
+
+            do {
+                if (s->pending == s->pending_buf_size) {
+                    if (s->gzhead->hcrc && s->pending > beg)
+                        strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                            s->pending - beg);
+                    flush_pending(strm);
+                    beg = s->pending;
+                    if (s->pending == s->pending_buf_size) {
+                        val = 1;
+                        break;
+                    }
+                }
+                val = s->gzhead->comment[s->gzindex++];
+                put_byte(s, val);
+            } while (val != 0);
+            if (s->gzhead->hcrc && s->pending > beg)
+                strm->adler = crc32(strm->adler, s->pending_buf + beg,
+                                    s->pending - beg);
+            if (val == 0)
+                s->status = HCRC_STATE;
+        }
+        else
+            s->status = HCRC_STATE;
+    }
+    if (s->status == HCRC_STATE) {
+        if (s->gzhead->hcrc) {
+            if (s->pending + 2 > s->pending_buf_size)
+                flush_pending(strm);
+            if (s->pending + 2 <= s->pending_buf_size) {
+                put_byte(s, (Byte)(strm->adler & 0xff));
+                put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+                strm->adler = crc32(0L, Z_NULL, 0);
+                s->status = BUSY_STATE;
+            }
+        }
+        else
+            s->status = BUSY_STATE;
+    }
+#endif
+
+    /* Flush as much pending output as possible */
+    if (s->pending != 0) {
+        flush_pending(strm);
+        if (strm->avail_out == 0) {
+            /* Since avail_out is 0, deflate will be called again with
+             * more output space, but possibly with both pending and
+             * avail_in equal to zero. There won't be anything to do,
+             * but this is not an error situation so make sure we
+             * return OK instead of BUF_ERROR at next call of deflate:
+             */
+            s->last_flush = -1;
+            return Z_OK;
+        }
+
+    /* Make sure there is something to do and avoid duplicate consecutive
+     * flushes. For repeated and useless calls with Z_FINISH, we keep
+     * returning Z_STREAM_END instead of Z_BUF_ERROR.
+     */
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
+               flush != Z_FINISH) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* User must not provide more input after the first FINISH: */
+    if (s->status == FINISH_STATE && strm->avail_in != 0) {
+        ERR_RETURN(strm, Z_BUF_ERROR);
+    }
+
+    /* Start a new block or continue the current one.
+     */
+    if (strm->avail_in != 0 || s->lookahead != 0 ||
+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+        block_state bstate;
+
+        bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
+                    (s->strategy == Z_RLE ? deflate_rle(s, flush) :
+                        (*(configuration_table[s->level].func))(s, flush));
+
+        if (bstate == finish_started || bstate == finish_done) {
+            s->status = FINISH_STATE;
+        }
+        if (bstate == need_more || bstate == finish_started) {
+            if (strm->avail_out == 0) {
+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+            }
+            return Z_OK;
+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+             * of deflate should use the same flush parameter to make sure
+             * that the flush is complete. So we don't have to output an
+             * empty block here, this will be done at next call. This also
+             * ensures that for a very small output buffer, we emit at most
+             * one empty block.
+             */
+        }
+        if (bstate == block_done) {
+            if (flush == Z_PARTIAL_FLUSH) {
+                _tr_align(s);
+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
+                _tr_stored_block(s, (char*)0, 0L, 0);
+                /* For a full flush, this empty block will be recognized
+                 * as a special marker by inflate_sync().
+                 */
+                if (flush == Z_FULL_FLUSH) {
+                    CLEAR_HASH(s);             /* forget history */
+                    if (s->lookahead == 0) {
+                        s->strstart = 0;
+                        s->block_start = 0L;
+                        s->insert = 0;
+                    }
+                }
+            }
+            flush_pending(strm);
+            if (strm->avail_out == 0) {
+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+              return Z_OK;
+            }
+        }
+    }
+    Assert(strm->avail_out > 0, "bug2");
+
+    if (flush != Z_FINISH) return Z_OK;
+    if (s->wrap <= 0) return Z_STREAM_END;
+
+    /* Write the trailer */
+#ifdef GZIP
+    if (s->wrap == 2) {
+        put_byte(s, (Byte)(strm->adler & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+        put_byte(s, (Byte)(strm->total_in & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+    }
+    else
+#endif
+    {
+        putShortMSB(s, (uInt)(strm->adler >> 16));
+        putShortMSB(s, (uInt)(strm->adler & 0xffff));
+    }
+    flush_pending(strm);
+    /* If avail_out is zero, the application will call deflate again
+     * to flush the rest.
+     */
+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
+    return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd (strm)
+    z_streamp strm;
+{
+    int status;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+
+    status = strm->state->status;
+    if (status != INIT_STATE &&
+        status != EXTRA_STATE &&
+        status != NAME_STATE &&
+        status != COMMENT_STATE &&
+        status != HCRC_STATE &&
+        status != BUSY_STATE &&
+        status != FINISH_STATE) {
+      return Z_STREAM_ERROR;
+    }
+
+    /* Deallocate in reverse order of allocations: */
+    TRY_FREE(strm, strm->state->pending_buf);
+    TRY_FREE(strm, strm->state->head);
+    TRY_FREE(strm, strm->state->prev);
+    TRY_FREE(strm, strm->state->window);
+
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+
+    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy (dest, source)
+    z_streamp dest;
+    z_streamp source;
+{
+#ifdef MAXSEG_64K
+    return Z_STREAM_ERROR;
+#else
+    deflate_state *ds;
+    deflate_state *ss;
+    ushf *overlay;
+
+
+    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+        return Z_STREAM_ERROR;
+    }
+
+    ss = source->state;
+
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+
+    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+    if (ds == Z_NULL) return Z_MEM_ERROR;
+    dest->state = (struct internal_state FAR *) ds;
+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
+    ds->strm = dest;
+
+    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+    ds->pending_buf = (uchf *) overlay;
+
+    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+        ds->pending_buf == Z_NULL) {
+        deflateEnd (dest);
+        return Z_MEM_ERROR;
+    }
+    /* following zmemcpy do not work for 16-bit MSDOS */
+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+
+    ds->l_desc.dyn_tree = ds->dyn_ltree;
+    ds->d_desc.dyn_tree = ds->dyn_dtree;
+    ds->bl_desc.dyn_tree = ds->bl_tree;
+
+    return Z_OK;
+#endif /* MAXSEG_64K */
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read.  All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local int read_buf(strm, buf, size)
+    z_streamp strm;
+    Bytef *buf;
+    unsigned size;
+{
+    unsigned len = strm->avail_in;
+
+    if (len > size) len = size;
+    if (len == 0) return 0;
+
+    strm->avail_in  -= len;
+
+    zmemcpy(buf, strm->next_in, len);
+    if (strm->state->wrap == 1) {
+        strm->adler = adler32(strm->adler, buf, len);
+    }
+#ifdef GZIP
+    else if (strm->state->wrap == 2) {
+        strm->adler = crc32(strm->adler, buf, len);
+    }
+#endif
+    strm->next_in  += len;
+    strm->total_in += len;
+
+    return (int)len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init (s)
+    deflate_state *s;
+{
+    s->window_size = (ulg)2L*s->w_size;
+
+    CLEAR_HASH(s);
+
+    /* Set the default configuration parameters:
+     */
+    s->max_lazy_match   = configuration_table[s->level].max_lazy;
+    s->good_match       = configuration_table[s->level].good_length;
+    s->nice_match       = configuration_table[s->level].nice_length;
+    s->max_chain_length = configuration_table[s->level].max_chain;
+
+    s->strstart = 0;
+    s->block_start = 0L;
+    s->lookahead = 0;
+    s->insert = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    s->ins_h = 0;
+#ifndef FASTEST
+#ifdef ASMV
+    match_init(); /* initialize the asm code */
+#endif
+#endif
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+#ifndef ASMV
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+ * match.S. The code will be functionally equivalent.
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    unsigned chain_length = s->max_chain_length;/* max hash chain length */
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    int best_len = s->prev_length;              /* best match length so far */
+    int nice_match = s->nice_match;             /* stop if match long enough */
+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+        s->strstart - (IPos)MAX_DIST(s) : NIL;
+    /* Stop when cur_match becomes <= limit. To simplify the code,
+     * we prevent matches with the string of window index 0.
+     */
+    Posf *prev = s->prev;
+    uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+    /* Compare two bytes at a time. Note: this is not always beneficial.
+     * Try with and without -DUNALIGNED_OK to check.
+     */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+    register ush scan_start = *(ushf*)scan;
+    register ush scan_end   = *(ushf*)(scan+best_len-1);
+#else
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+    register Byte scan_end1  = scan[best_len-1];
+    register Byte scan_end   = scan[best_len];
+#endif
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    /* Do not waste too much time if we already have a good match: */
+    if (s->prev_length >= s->good_match) {
+        chain_length >>= 2;
+    }
+    /* Do not look for matches beyond the end of the input. This is necessary
+     * to make deflate deterministic.
+     */
+    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    do {
+        Assert(cur_match < s->strstart, "no future");
+        match = s->window + cur_match;
+
+        /* Skip to next match if the match length cannot increase
+         * or if the match length is less than 2.  Note that the checks below
+         * for insufficient lookahead only occur occasionally for performance
+         * reasons.  Therefore uninitialized memory will be accessed, and
+         * conditional jumps will be made that depend on those values.
+         * However the length of the match is limited to the lookahead, so
+         * the output of deflate is not affected by the uninitialized values.
+         */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+        /* This code assumes sizeof(unsigned short) == 2. Do not use
+         * UNALIGNED_OK if your compiler uses a different size.
+         */
+        if (*(ushf*)(match+best_len-1) != scan_end ||
+            *(ushf*)match != scan_start) continue;
+
+        /* It is not necessary to compare scan[2] and match[2] since they are
+         * always equal when the other bytes match, given that the hash keys
+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+         * strstart+3, +5, ... up to strstart+257. We check for insufficient
+         * lookahead only every 4th comparison; the 128th check will be made
+         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+         * necessary to put more guard bytes at the end of the window, or
+         * to check more often for insufficient lookahead.
+         */
+        Assert(scan[2] == match[2], "scan[2]?");
+        scan++, match++;
+        do {
+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+                 scan < strend);
+        /* The funny "do {}" generates better code on most compilers */
+
+        /* Here, scan <= window+strstart+257 */
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+        if (*scan == *match) scan++;
+
+        len = (MAX_MATCH - 1) - (int)(strend-scan);
+        scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+        if (match[best_len]   != scan_end  ||
+            match[best_len-1] != scan_end1 ||
+            *match            != *scan     ||
+            *++match          != scan[1])      continue;
+
+        /* The check at best_len-1 can be removed because it will be made
+         * again later. (This heuristic is not always a win.)
+         * It is not necessary to compare scan[2] and match[2] since they
+         * are always equal when the other bytes match, given that
+         * the hash keys are equal and that HASH_BITS >= 8.
+         */
+        scan += 2, match++;
+        Assert(*scan == *match, "match[2]?");
+
+        /* We check for insufficient lookahead only every 8th comparison;
+         * the 256th check will be made at strstart+258.
+         */
+        do {
+        } while (*++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 *++scan == *++match && *++scan == *++match &&
+                 scan < strend);
+
+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+        len = MAX_MATCH - (int)(strend - scan);
+        scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+        if (len > best_len) {
+            s->match_start = cur_match;
+            best_len = len;
+            if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+            scan_end = *(ushf*)(scan+best_len-1);
+#else
+            scan_end1  = scan[best_len-1];
+            scan_end   = scan[best_len];
+#endif
+        }
+    } while ((cur_match = prev[cur_match & wmask]) > limit
+             && --chain_length != 0);
+
+    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+    return s->lookahead;
+}
+#endif /* ASMV */
+
+#else /* FASTEST */
+
+/* ---------------------------------------------------------------------------
+ * Optimized version for FASTEST only
+ */
+local uInt longest_match(s, cur_match)
+    deflate_state *s;
+    IPos cur_match;                             /* current match */
+{
+    register Bytef *scan = s->window + s->strstart; /* current string */
+    register Bytef *match;                       /* matched string */
+    register int len;                           /* length of current match */
+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+     * It is easy to get rid of this optimization if necessary.
+     */
+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+    Assert(cur_match < s->strstart, "no future");
+
+    match = s->window + cur_match;
+
+    /* Return failure if the match length is less than 2:
+     */
+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
+
+    /* The check at best_len-1 can be removed because it will be made
+     * again later. (This heuristic is not always a win.)
+     * It is not necessary to compare scan[2] and match[2] since they
+     * are always equal when the other bytes match, given that
+     * the hash keys are equal and that HASH_BITS >= 8.
+     */
+    scan += 2, match += 2;
+    Assert(*scan == *match, "match[2]?");
+
+    /* We check for insufficient lookahead only every 8th comparison;
+     * the 256th check will be made at strstart+258.
+     */
+    do {
+    } while (*++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             *++scan == *++match && *++scan == *++match &&
+             scan < strend);
+
+    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+    len = MAX_MATCH - (int)(strend - scan);
+
+    if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+    s->match_start = cur_match;
+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
+}
+
+#endif /* FASTEST */
+
+#ifdef DEBUG
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+    deflate_state *s;
+    IPos start, match;
+    int length;
+{
+    /* check that the match is indeed a match */
+    if (zmemcmp(s->window + match,
+                s->window + start, length) != EQUAL) {
+        fprintf(stderr, " start %u, match %u, length %d\n",
+                start, match, length);
+        do {
+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
+        } while (--length != 0);
+        z_error("invalid match");
+    }
+    if (z_verbose > 1) {
+        fprintf(stderr,"\\[%d,%d]", start-match, length);
+        do { putc(s->window[start++], stderr); } while (--length != 0);
+    }
+}
+#else
+#  define check_match(s, start, match, length)
+#endif /* DEBUG */
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ *    At least one byte has been read, or avail_in == 0; reads are
+ *    performed for at least two bytes (required for the zip translate_eol
+ *    option -- not supported here).
+ */
+local void fill_window(s)
+    deflate_state *s;
+{
+    register unsigned n, m;
+    register Posf *p;
+    unsigned more;    /* Amount of free space at the end of the window. */
+    uInt wsize = s->w_size;
+
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+    do {
+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+        /* Deal with !@#$% 64K limit: */
+        if (sizeof(int) <= 2) {
+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+                more = wsize;
+
+            } else if (more == (unsigned)(-1)) {
+                /* Very unlikely, but possible on 16 bit machine if
+                 * strstart == 0 && lookahead == 1 (input done a byte at time)
+                 */
+                more--;
+            }
+        }
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (s->strstart >= wsize+MAX_DIST(s)) {
+
+            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+            s->match_start -= wsize;
+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
+            s->block_start -= (long) wsize;
+
+            /* Slide the hash table (could be avoided with 32 bit values
+               at the expense of memory usage). We slide even when level == 0
+               to keep the hash table consistent if we switch back to level > 0
+               later. (Using level 0 permanently is not an optimal usage of
+               zlib, so we don't care about this pathological case.)
+             */
+            n = s->hash_size;
+            p = &s->head[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+            } while (--n);
+
+            n = wsize;
+#ifndef FASTEST
+            p = &s->prev[n];
+            do {
+                m = *--p;
+                *p = (Pos)(m >= wsize ? m-wsize : NIL);
+                /* If n is not on any hash chain, prev[n] is garbage but
+                 * its value will never be used.
+                 */
+            } while (--n);
+#endif
+            more += wsize;
+        }
+        if (s->strm->avail_in == 0) break;
+
+        /* If there was no sliding:
+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+         *    more == window_size - lookahead - strstart
+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+         * => more >= window_size - 2*WSIZE + 2
+         * In the BIG_MEM or MMAP case (not yet supported),
+         *   window_size == input_size + MIN_LOOKAHEAD  &&
+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+         * Otherwise, window_size == 2*WSIZE so more >= 2.
+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+         */
+        Assert(more >= 2, "more < 2");
+
+        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+        s->lookahead += n;
+
+        /* Initialize the hash value now that we have some input: */
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
+#if MIN_MATCH != 3
+            Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
+        }
+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+         * but this is not important since only literal bytes will be emitted.
+         */
+
+    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+    /* If the WIN_INIT bytes after the end of the current data have never been
+     * written, then zero those bytes in order to avoid memory check reports of
+     * the use of uninitialized (or uninitialised as Julian writes) bytes by
+     * the longest match routines.  Update the high water mark for the next
+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match
+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+     */
+    if (s->high_water < s->window_size) {
+        ulg curr = s->strstart + (ulg)(s->lookahead);
+        ulg init;
+
+        if (s->high_water < curr) {
+            /* Previous high water mark below current data -- zero WIN_INIT
+             * bytes or up to end of window, whichever is less.
+             */
+            init = s->window_size - curr;
+            if (init > WIN_INIT)
+                init = WIN_INIT;
+            zmemzero(s->window + curr, (unsigned)init);
+            s->high_water = curr + init;
+        }
+        else if (s->high_water < (ulg)curr + WIN_INIT) {
+            /* High water mark at or above current data, but below current data
+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+             * to end of window, whichever is less.
+             */
+            init = (ulg)curr + WIN_INIT - s->high_water;
+            if (init > s->window_size - s->high_water)
+                init = s->window_size - s->high_water;
+            zmemzero(s->window + s->high_water, (unsigned)init);
+            s->high_water += init;
+        }
+    }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, last) { \
+   _tr_flush_block(s, (s->block_start >= 0L ? \
+                   (charf *)&s->window[(unsigned)s->block_start] : \
+                   (charf *)Z_NULL), \
+                (ulg)((long)s->strstart - s->block_start), \
+                (last)); \
+   s->block_start = s->strstart; \
+   flush_pending(s->strm); \
+   Tracev((stderr,"[FLUSH]")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, last) { \
+   FLUSH_BLOCK_ONLY(s, last); \
+   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
+}
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ * This function does not insert new strings in the dictionary since
+ * uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying from
+ * window to pending_buf.
+ */
+local block_state deflate_stored(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+     * to pending_buf_size, and each stored block has a 5 byte header:
+     */
+    ulg max_block_size = 0xffff;
+    ulg max_start;
+
+    if (max_block_size > s->pending_buf_size - 5) {
+        max_block_size = s->pending_buf_size - 5;
+    }
+
+    /* Copy as much as possible from input to output: */
+    for (;;) {
+        /* Fill the window as much as possible: */
+        if (s->lookahead <= 1) {
+
+            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+                   s->block_start >= (long)s->w_size, "slide too late");
+
+            fill_window(s);
+            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+        Assert(s->block_start >= 0L, "block gone");
+
+        s->strstart += s->lookahead;
+        s->lookahead = 0;
+
+        /* Emit a stored block if pending_buf will be full: */
+        max_start = s->block_start + max_block_size;
+        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
+            /* strstart == 0 is possible when wraparound on 16-bit machine */
+            s->lookahead = (uInt)(s->strstart - max_start);
+            s->strstart = (uInt)max_start;
+            FLUSH_BLOCK(s, 0);
+        }
+        /* Flush if we may have to slide, otherwise block_start may become
+         * negative and the data will be gone:
+         */
+        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
+            FLUSH_BLOCK(s, 0);
+        }
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if ((long)s->strstart > s->block_start)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;       /* head of the hash chain */
+    int bflush;           /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+        }
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->match_start, s->match_length);
+
+            _tr_tally_dist(s, s->strstart - s->match_start,
+                           s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+#ifndef FASTEST
+            if (s->match_length <= s->max_insert_length &&
+                s->lookahead >= MIN_MATCH) {
+                s->match_length--; /* string at strstart already in table */
+                do {
+                    s->strstart++;
+                    INSERT_STRING(s, s->strstart, hash_head);
+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                     * always MIN_MATCH bytes ahead.
+                     */
+                } while (--s->match_length != 0);
+                s->strstart++;
+            } else
+#endif
+            {
+                s->strstart += s->match_length;
+                s->match_length = 0;
+                s->ins_h = s->window[s->strstart];
+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+#if MIN_MATCH != 3
+                Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+                 * matter since it will be recomputed at next deflate call.
+                 */
+            }
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    IPos hash_head;          /* head of hash chain */
+    int bflush;              /* set if current block must be flushed */
+
+    /* Process the input block. */
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+        if (s->lookahead < MIN_LOOKAHEAD) {
+            fill_window(s);
+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+        hash_head = NIL;
+        if (s->lookahead >= MIN_MATCH) {
+            INSERT_STRING(s, s->strstart, hash_head);
+        }
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+        s->prev_length = s->match_length, s->prev_match = s->match_start;
+        s->match_length = MIN_MATCH-1;
+
+        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+            s->strstart - hash_head <= MAX_DIST(s)) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+            s->match_length = longest_match (s, hash_head);
+            /* longest_match() sets match_start */
+
+            if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+                || (s->match_length == MIN_MATCH &&
+                    s->strstart - s->match_start > TOO_FAR)
+#endif
+                )) {
+
+                /* If prev_match is also MIN_MATCH, match_start is garbage
+                 * but we will ignore the current match anyway.
+                 */
+                s->match_length = MIN_MATCH-1;
+            }
+        }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+            /* Do not insert strings in hash table beyond this. */
+
+            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+
+            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+                           s->prev_length - MIN_MATCH, bflush);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart-1 and strstart are already inserted. If there is not
+             * enough lookahead, the last two strings are not inserted in
+             * the hash table.
+             */
+            s->lookahead -= s->prev_length-1;
+            s->prev_length -= 2;
+            do {
+                if (++s->strstart <= max_insert) {
+                    INSERT_STRING(s, s->strstart, hash_head);
+                }
+            } while (--s->prev_length != 0);
+            s->match_available = 0;
+            s->match_length = MIN_MATCH-1;
+            s->strstart++;
+
+            if (bflush) FLUSH_BLOCK(s, 0);
+
+        } else if (s->match_available) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+            Tracevv((stderr,"%c", s->window[s->strstart-1]));
+            _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+            if (bflush) {
+                FLUSH_BLOCK_ONLY(s, 0);
+            }
+            s->strstart++;
+            s->lookahead--;
+            if (s->strm->avail_out == 0) return need_more;
+        } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+            s->match_available = 1;
+            s->strstart++;
+            s->lookahead--;
+        }
+    }
+    Assert (flush != Z_NO_FLUSH, "no flush?");
+    if (s->match_available) {
+        Tracevv((stderr,"%c", s->window[s->strstart-1]));
+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+        s->match_available = 0;
+    }
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+#endif /* FASTEST */
+
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+local block_state deflate_rle(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+    uInt prev;              /* byte at distance one to match */
+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */
+
+    for (;;) {
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the longest run, plus one for the unrolled loop.
+         */
+        if (s->lookahead <= MAX_MATCH) {
+            fill_window(s);
+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
+                return need_more;
+            }
+            if (s->lookahead == 0) break; /* flush the current block */
+        }
+
+        /* See how many times the previous byte repeats */
+        s->match_length = 0;
+        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
+            scan = s->window + s->strstart - 1;
+            prev = *scan;
+            if (prev == *++scan && prev == *++scan && prev == *++scan) {
+                strend = s->window + s->strstart + MAX_MATCH;
+                do {
+                } while (prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         prev == *++scan && prev == *++scan &&
+                         scan < strend);
+                s->match_length = MAX_MATCH - (int)(strend - scan);
+                if (s->match_length > s->lookahead)
+                    s->match_length = s->lookahead;
+            }
+            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+        }
+
+        /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+        if (s->match_length >= MIN_MATCH) {
+            check_match(s, s->strstart, s->strstart - 1, s->match_length);
+
+            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
+
+            s->lookahead -= s->match_length;
+            s->strstart += s->match_length;
+            s->match_length = 0;
+        } else {
+            /* No match, output a literal byte */
+            Tracevv((stderr,"%c", s->window[s->strstart]));
+            _tr_tally_lit (s, s->window[s->strstart], bflush);
+            s->lookahead--;
+            s->strstart++;
+        }
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
+
+/* ===========================================================================
+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.
+ * (It will be regenerated if this run of deflate switches away from Huffman.)
+ */
+local block_state deflate_huff(s, flush)
+    deflate_state *s;
+    int flush;
+{
+    int bflush;             /* set if current block must be flushed */
+
+    for (;;) {
+        /* Make sure that we have a literal to write. */
+        if (s->lookahead == 0) {
+            fill_window(s);
+            if (s->lookahead == 0) {
+                if (flush == Z_NO_FLUSH)
+                    return need_more;
+                break;      /* flush the current block */
+            }
+        }
+
+        /* Output a literal byte */
+        s->match_length = 0;
+        Tracevv((stderr,"%c", s->window[s->strstart]));
+        _tr_tally_lit (s, s->window[s->strstart], bflush);
+        s->lookahead--;
+        s->strstart++;
+        if (bflush) FLUSH_BLOCK(s, 0);
+    }
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
+}
diff --git a/Source/3rd Party/wx/src/zlib/deflate.h b/Source/3rd Party/wx/src/zlib/deflate.h
index 222c53e04..958822f61 100644
--- a/Source/3rd Party/wx/src/zlib/deflate.h	
+++ b/Source/3rd Party/wx/src/zlib/deflate.h	
@@ -1,331 +1,345 @@
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-2004 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef DEFLATE_H
-#define DEFLATE_H
-
-#include "zutil.h"
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip encoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GZIP
-#endif
-
-/* ===========================================================================
- * Internal compression state.
- */
-
-#define LENGTH_CODES 29
-/* number of length codes, not counting the special END_BLOCK code */
-
-#define LITERALS  256
-/* number of literal bytes 0..255 */
-
-#define L_CODES (LITERALS+1+LENGTH_CODES)
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-#define D_CODES   30
-/* number of distance codes */
-
-#define BL_CODES  19
-/* number of codes used to transfer the bit lengths */
-
-#define HEAP_SIZE (2*L_CODES+1)
-/* maximum heap size */
-
-#define MAX_BITS 15
-/* All codes must not exceed MAX_BITS bits */
-
-#define INIT_STATE    42
-#define EXTRA_STATE   69
-#define NAME_STATE    73
-#define COMMENT_STATE 91
-#define HCRC_STATE   103
-#define BUSY_STATE   113
-#define FINISH_STATE 666
-/* Stream status */
-
-
-/* Data structure describing a single value and its code string. */
-typedef struct ct_data_s {
-    union {
-        ush  freq;       /* frequency count */
-        ush  code;       /* bit string */
-    } fc;
-    union {
-        ush  dad;        /* father node in Huffman tree */
-        ush  len;        /* length of bit string */
-    } dl;
-} FAR ct_data;
-
-#define Freq fc.freq
-#define Code fc.code
-#define Dad  dl.dad
-#define Len  dl.len
-
-typedef struct static_tree_desc_s  static_tree_desc;
-
-typedef struct tree_desc_s {
-    ct_data *dyn_tree;           /* the dynamic tree */
-    int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc *stat_desc; /* the corresponding static tree */
-} FAR tree_desc;
-
-typedef ush Pos;
-typedef Pos FAR Posf;
-typedef unsigned IPos;
-
-/* A Pos is an index in the character window. We use short instead of int to
- * save space in the various tables. IPos is used only for parameter passing.
- */
-
-typedef struct internal_state {
-    z_streamp strm;      /* pointer back to this zlib stream */
-    int   status;        /* as the name implies */
-    Bytef *pending_buf;  /* output still pending */
-    ulg   pending_buf_size; /* size of pending_buf */
-    Bytef *pending_out;  /* next pending byte to output to the stream */
-    uInt   pending;      /* nb of bytes in the pending buffer */
-    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
-    gz_headerp  gzhead;  /* gzip header information to write */
-    uInt   gzindex;      /* where in extra, name, or comment */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
-    int   last_flush;    /* value of flush param for previous deflate call */
-
-                /* used by deflate.c: */
-
-    uInt  w_size;        /* LZ77 window size (32K by default) */
-    uInt  w_bits;        /* log2(w_size)  (8..16) */
-    uInt  w_mask;        /* w_size - 1 */
-
-    Bytef *window;
-    /* Sliding window. Input bytes are read into the second half of the window,
-     * and move to the first half later to keep a dictionary of at least wSize
-     * bytes. With this organization, matches are limited to a distance of
-     * wSize-MAX_MATCH bytes, but this ensures that IO is always
-     * performed with a length multiple of the block size. Also, it limits
-     * the window size to 64K, which is quite useful on MSDOS.
-     * To do: use the user input buffer as sliding window.
-     */
-
-    ulg window_size;
-    /* Actual size of window: 2*wSize, except when the user input buffer
-     * is directly used as sliding window.
-     */
-
-    Posf *prev;
-    /* Link to older string with same hash index. To limit the size of this
-     * array to 64K, this link is maintained only for the last 32K strings.
-     * An index in this array is thus a window index modulo 32K.
-     */
-
-    Posf *head; /* Heads of the hash chains or NIL. */
-
-    uInt  ins_h;          /* hash index of string to be inserted */
-    uInt  hash_size;      /* number of elements in hash table */
-    uInt  hash_bits;      /* log2(hash_size) */
-    uInt  hash_mask;      /* hash_size-1 */
-
-    uInt  hash_shift;
-    /* Number of bits by which ins_h must be shifted at each input
-     * step. It must be such that after MIN_MATCH steps, the oldest
-     * byte no longer takes part in the hash key, that is:
-     *   hash_shift * MIN_MATCH >= hash_bits
-     */
-
-    long block_start;
-    /* Window position at the beginning of the current output block. Gets
-     * negative when the window is moved backwards.
-     */
-
-    uInt match_length;           /* length of best match */
-    IPos prev_match;             /* previous match */
-    int match_available;         /* set if previous match exists */
-    uInt strstart;               /* start of string to insert */
-    uInt match_start;            /* start of matching string */
-    uInt lookahead;              /* number of valid bytes ahead in window */
-
-    uInt prev_length;
-    /* Length of the best match at previous step. Matches not greater than this
-     * are discarded. This is used in the lazy match evaluation.
-     */
-
-    uInt max_chain_length;
-    /* To speed up deflation, hash chains are never searched beyond this
-     * length.  A higher limit improves compression ratio but degrades the
-     * speed.
-     */
-
-    uInt max_lazy_match;
-    /* Attempt to find a better match only when the current match is strictly
-     * smaller than this value. This mechanism is used only for compression
-     * levels >= 4.
-     */
-#   define max_insert_length  max_lazy_match
-    /* Insert new strings in the hash table only if the match length is not
-     * greater than this length. This saves time but degrades compression.
-     * max_insert_length is used only for compression levels <= 3.
-     */
-
-    int level;    /* compression level (1..9) */
-    int strategy; /* favor or force Huffman coding*/
-
-    uInt good_match;
-    /* Use a faster search when the previous match is longer than this */
-
-    int nice_match; /* Stop searching when current match exceeds this */
-
-                /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-    int heap_len;               /* number of elements in the heap */
-    int heap_max;               /* element of largest frequency */
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-     * The same heap array is used to build all trees.
-     */
-
-    uch depth[2*L_CODES+1];
-    /* Depth of each subtree used as tie breaker for trees of equal frequency
-     */
-
-    uchf *l_buf;          /* buffer for literals or lengths */
-
-    uInt  lit_bufsize;
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for
-     * limiting lit_bufsize to 64K:
-     *   - frequencies can be kept in 16 bit counters
-     *   - if compression is not successful for the first block, all input
-     *     data is still in the window so we can still emit a stored block even
-     *     when input comes from standard input.  (This can also be done for
-     *     all blocks if lit_bufsize is not greater than 32K.)
-     *   - if compression is not successful for a file smaller than 64K, we can
-     *     even emit a stored file instead of a stored block (saving 5 bytes).
-     *     This is applicable only for zip (not gzip or zlib).
-     *   - creating new Huffman trees less frequently may not provide fast
-     *     adaptation to changes in the input data statistics. (Take for
-     *     example a binary file with poorly compressible code followed by
-     *     a highly compressible string table.) Smaller buffer sizes give
-     *     fast adaptation but have of course the overhead of transmitting
-     *     trees more frequently.
-     *   - I can't count above 4
-     */
-
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
-
-    ulg opt_len;        /* bit length of current block with optimal trees */
-    ulg static_len;     /* bit length of current block with static trees */
-    uInt matches;       /* number of string matches in current block */
-    int last_eob_len;   /* bit length of EOB code for last block */
-
-#ifdef DEBUG
-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
-#endif
-
-    ush bi_buf;
-    /* Output buffer. bits are inserted starting at the bottom (least
-     * significant bits).
-     */
-    int bi_valid;
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit
-     * are always zero.
-     */
-
-} FAR deflate_state;
-
-/* Output a byte on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
-
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
-/* In order to simplify the code, particularly on 16 bit machines, match
- * distances are limited to MAX_DIST instead of WSIZE.
- */
-
-        /* in trees.c */
-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-void _tr_align        OF((deflate_state *s));
-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-
-#define d_code(dist) \
-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
-/* Mapping from a distance to a distance code. dist is the distance - 1 and
- * must not have side effects. _dist_code[256] and _dist_code[257] are never
- * used.
- */
-
-#ifndef DEBUG
-/* Inline versions of _tr_tally for speed: */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch _length_code[];
-  extern uch _dist_code[];
-#else
-  extern const uch _length_code[];
-  extern const uch _dist_code[];
-#endif
-
-# define _tr_tally_lit(s, c, flush) \
-  { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
-    s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-   }
-# define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (length); \
-    ush dist = (distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
-    dist--; \
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-    s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-  }
-#else
-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-# define _tr_tally_dist(s, distance, length, flush) \
-              flush = _tr_tally(s, distance, length)
-#endif
-
-#endif /* DEFLATE_H */
+/* deflate.h -- internal compression state
+ * Copyright (C) 1995-2012 Jean-loup Gailly
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+
+#ifndef DEFLATE_H
+#define DEFLATE_H
+
+#include "zutil.h"
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip encoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GZIP
+#endif
+
+/* ===========================================================================
+ * Internal compression state.
+ */
+
+#define LENGTH_CODES 29
+/* number of length codes, not counting the special END_BLOCK code */
+
+#define LITERALS  256
+/* number of literal bytes 0..255 */
+
+#define L_CODES (LITERALS+1+LENGTH_CODES)
+/* number of Literal or Length codes, including the END_BLOCK code */
+
+#define D_CODES   30
+/* number of distance codes */
+
+#define BL_CODES  19
+/* number of codes used to transfer the bit lengths */
+
+#define HEAP_SIZE (2*L_CODES+1)
+/* maximum heap size */
+
+#define MAX_BITS 15
+/* All codes must not exceed MAX_BITS bits */
+
+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+
+#define INIT_STATE    42
+#define EXTRA_STATE   69
+#define NAME_STATE    73
+#define COMMENT_STATE 91
+#define HCRC_STATE   103
+#define BUSY_STATE   113
+#define FINISH_STATE 666
+/* Stream status */
+
+
+/* Data structure describing a single value and its code string. */
+typedef struct ct_data_s {
+    union {
+        ush  freq;       /* frequency count */
+        ush  code;       /* bit string */
+    } fc;
+    union {
+        ush  dad;        /* father node in Huffman tree */
+        ush  len;        /* length of bit string */
+    } dl;
+} FAR ct_data;
+
+#define Freq fc.freq
+#define Code fc.code
+#define Dad  dl.dad
+#define Len  dl.len
+
+typedef struct static_tree_desc_s  static_tree_desc;
+
+typedef struct tree_desc_s {
+    ct_data *dyn_tree;           /* the dynamic tree */
+    int     max_code;            /* largest code with non zero frequency */
+    static_tree_desc *stat_desc; /* the corresponding static tree */
+} FAR tree_desc;
+
+typedef ush Pos;
+typedef Pos FAR Posf;
+typedef unsigned IPos;
+
+/* A Pos is an index in the character window. We use short instead of int to
+ * save space in the various tables. IPos is used only for parameter passing.
+ */
+
+typedef struct internal_state {
+    z_streamp strm;      /* pointer back to this zlib stream */
+    int   status;        /* as the name implies */
+    Bytef *pending_buf;  /* output still pending */
+    ulg   pending_buf_size; /* size of pending_buf */
+    Bytef *pending_out;  /* next pending byte to output to the stream */
+    uInt   pending;      /* nb of bytes in the pending buffer */
+    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    gz_headerp  gzhead;  /* gzip header information to write */
+    uInt   gzindex;      /* where in extra, name, or comment */
+    Byte  method;        /* can only be DEFLATED */
+    int   last_flush;    /* value of flush param for previous deflate call */
+
+                /* used by deflate.c: */
+
+    uInt  w_size;        /* LZ77 window size (32K by default) */
+    uInt  w_bits;        /* log2(w_size)  (8..16) */
+    uInt  w_mask;        /* w_size - 1 */
+
+    Bytef *window;
+    /* Sliding window. Input bytes are read into the second half of the window,
+     * and move to the first half later to keep a dictionary of at least wSize
+     * bytes. With this organization, matches are limited to a distance of
+     * wSize-MAX_MATCH bytes, but this ensures that IO is always
+     * performed with a length multiple of the block size. Also, it limits
+     * the window size to 64K, which is quite useful on MSDOS.
+     * To do: use the user input buffer as sliding window.
+     */
+
+    ulg window_size;
+    /* Actual size of window: 2*wSize, except when the user input buffer
+     * is directly used as sliding window.
+     */
+
+    Posf *prev;
+    /* Link to older string with same hash index. To limit the size of this
+     * array to 64K, this link is maintained only for the last 32K strings.
+     * An index in this array is thus a window index modulo 32K.
+     */
+
+    Posf *head; /* Heads of the hash chains or NIL. */
+
+    uInt  ins_h;          /* hash index of string to be inserted */
+    uInt  hash_size;      /* number of elements in hash table */
+    uInt  hash_bits;      /* log2(hash_size) */
+    uInt  hash_mask;      /* hash_size-1 */
+
+    uInt  hash_shift;
+    /* Number of bits by which ins_h must be shifted at each input
+     * step. It must be such that after MIN_MATCH steps, the oldest
+     * byte no longer takes part in the hash key, that is:
+     *   hash_shift * MIN_MATCH >= hash_bits
+     */
+
+    long block_start;
+    /* Window position at the beginning of the current output block. Gets
+     * negative when the window is moved backwards.
+     */
+
+    uInt match_length;           /* length of best match */
+    IPos prev_match;             /* previous match */
+    int match_available;         /* set if previous match exists */
+    uInt strstart;               /* start of string to insert */
+    uInt match_start;            /* start of matching string */
+    uInt lookahead;              /* number of valid bytes ahead in window */
+
+    uInt prev_length;
+    /* Length of the best match at previous step. Matches not greater than this
+     * are discarded. This is used in the lazy match evaluation.
+     */
+
+    uInt max_chain_length;
+    /* To speed up deflation, hash chains are never searched beyond this
+     * length.  A higher limit improves compression ratio but degrades the
+     * speed.
+     */
+
+    uInt max_lazy_match;
+    /* Attempt to find a better match only when the current match is strictly
+     * smaller than this value. This mechanism is used only for compression
+     * levels >= 4.
+     */
+#   define max_insert_length  max_lazy_match
+    /* Insert new strings in the hash table only if the match length is not
+     * greater than this length. This saves time but degrades compression.
+     * max_insert_length is used only for compression levels <= 3.
+     */
+
+    int level;    /* compression level (1..9) */
+    int strategy; /* favor or force Huffman coding*/
+
+    uInt good_match;
+    /* Use a faster search when the previous match is longer than this */
+
+    int nice_match; /* Stop searching when current match exceeds this */
+
+                /* used by trees.c: */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
+
+    struct tree_desc_s l_desc;               /* desc. for literal tree */
+    struct tree_desc_s d_desc;               /* desc. for distance tree */
+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
+
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
+    int heap_len;               /* number of elements in the heap */
+    int heap_max;               /* element of largest frequency */
+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
+     * The same heap array is used to build all trees.
+     */
+
+    uch depth[2*L_CODES+1];
+    /* Depth of each subtree used as tie breaker for trees of equal frequency
+     */
+
+    uchf *l_buf;          /* buffer for literals or lengths */
+
+    uInt  lit_bufsize;
+    /* Size of match buffer for literals/lengths.  There are 4 reasons for
+     * limiting lit_bufsize to 64K:
+     *   - frequencies can be kept in 16 bit counters
+     *   - if compression is not successful for the first block, all input
+     *     data is still in the window so we can still emit a stored block even
+     *     when input comes from standard input.  (This can also be done for
+     *     all blocks if lit_bufsize is not greater than 32K.)
+     *   - if compression is not successful for a file smaller than 64K, we can
+     *     even emit a stored file instead of a stored block (saving 5 bytes).
+     *     This is applicable only for zip (not gzip or zlib).
+     *   - creating new Huffman trees less frequently may not provide fast
+     *     adaptation to changes in the input data statistics. (Take for
+     *     example a binary file with poorly compressible code followed by
+     *     a highly compressible string table.) Smaller buffer sizes give
+     *     fast adaptation but have of course the overhead of transmitting
+     *     trees more frequently.
+     *   - I can't count above 4
+     */
+
+    uInt last_lit;      /* running index in l_buf */
+
+    ushf *d_buf;
+    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+     * the same number of elements. To use different lengths, an extra flag
+     * array would be necessary.
+     */
+
+    ulg opt_len;        /* bit length of current block with optimal trees */
+    ulg static_len;     /* bit length of current block with static trees */
+    uInt matches;       /* number of string matches in current block */
+    uInt insert;        /* bytes at end of window left to insert */
+
+#ifdef DEBUG
+    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
+    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
+#endif
+
+    ush bi_buf;
+    /* Output buffer. bits are inserted starting at the bottom (least
+     * significant bits).
+     */
+    int bi_valid;
+    /* Number of valid bits in bi_buf.  All bits above the last valid bit
+     * are always zero.
+     */
+
+    ulg high_water;
+    /* High water mark offset in window for initialized bytes -- bytes above
+     * this are set to zero in order to avoid memory check warnings when
+     * longest match routines access bytes past the input.  This is then
+     * updated to the new high water mark.
+     */
+
+} FAR deflate_state;
+
+/* Output a byte on the stream.
+ * IN assertion: there is enough room in pending_buf.
+ */
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+
+
+#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
+/* Minimum amount of lookahead, except at the end of the input file.
+ * See deflate.c for comments about the MIN_MATCH+1.
+ */
+
+#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
+/* In order to simplify the code, particularly on 16 bit machines, match
+ * distances are limited to MAX_DIST instead of WSIZE.
+ */
+
+#define WIN_INIT MAX_MATCH
+/* Number of bytes after end of data in window to initialize in order to avoid
+   memory checker errors from longest match routines */
+
+        /* in trees.c */
+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+                        ulg stored_len, int last));
+
+#define d_code(dist) \
+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
+/* Mapping from a distance to a distance code. dist is the distance - 1 and
+ * must not have side effects. _dist_code[256] and _dist_code[257] are never
+ * used.
+ */
+
+#ifndef DEBUG
+/* Inline versions of _tr_tally for speed: */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+  extern uch ZLIB_INTERNAL _length_code[];
+  extern uch ZLIB_INTERNAL _dist_code[];
+#else
+  extern const uch ZLIB_INTERNAL _length_code[];
+  extern const uch ZLIB_INTERNAL _dist_code[];
+#endif
+
+# define _tr_tally_lit(s, c, flush) \
+  { uch cc = (c); \
+    s->d_buf[s->last_lit] = 0; \
+    s->l_buf[s->last_lit++] = cc; \
+    s->dyn_ltree[cc].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+   }
+# define _tr_tally_dist(s, distance, length, flush) \
+  { uch len = (length); \
+    ush dist = (distance); \
+    s->d_buf[s->last_lit] = dist; \
+    s->l_buf[s->last_lit++] = len; \
+    dist--; \
+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+    s->dyn_dtree[d_code(dist)].Freq++; \
+    flush = (s->last_lit == s->lit_bufsize-1); \
+  }
+#else
+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+# define _tr_tally_dist(s, distance, length, flush) \
+              flush = _tr_tally(s, distance, length)
+#endif
+
+#endif /* DEFLATE_H */
diff --git a/Source/3rd Party/wx/src/zlib/gzclose.c b/Source/3rd Party/wx/src/zlib/gzclose.c
new file mode 100644
index 000000000..caeb99a31
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/gzclose.c	
@@ -0,0 +1,25 @@
+/* gzclose.c -- zlib gzclose() function
+ * Copyright (C) 2004, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* gzclose() is in a separate file so that it is linked in only if it is used.
+   That way the other gzclose functions can be used instead to avoid linking in
+   unneeded compression or decompression routines. */
+int ZEXPORT gzclose(file)
+    gzFile file;
+{
+#ifndef NO_GZCOMPRESS
+    gz_statep state;
+
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
+#else
+    return gzclose_r(file);
+#endif
+}
diff --git a/Source/3rd Party/wx/src/zlib/gzguts.h b/Source/3rd Party/wx/src/zlib/gzguts.h
new file mode 100644
index 000000000..d87659d03
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/gzguts.h	
@@ -0,0 +1,209 @@
+/* gzguts.h -- zlib internal header definitions for gz* operations
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#ifdef _LARGEFILE64_SOURCE
+#  ifndef _LARGEFILE_SOURCE
+#    define _LARGEFILE_SOURCE 1
+#  endif
+#  ifdef _FILE_OFFSET_BITS
+#    undef _FILE_OFFSET_BITS
+#  endif
+#endif
+
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include <stdio.h>
+#include "zlib.h"
+#ifdef STDC
+#  include <string.h>
+#  include <stdlib.h>
+#  include <limits.h>
+#endif
+#include <fcntl.h>
+
+#ifdef _WIN32
+#  include <stddef.h>
+#endif
+
+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
+#  include <io.h>
+#endif
+
+#ifdef WINAPI_FAMILY
+#  define open _open
+#  define read _read
+#  define write _write
+#  define close _close
+#endif
+
+#ifdef NO_DEFLATE       /* for compatibility with old definition */
+#  define NO_GZCOMPRESS
+#endif
+
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+   but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#         define vsnprintf _vsnprintf
+#      endif
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#  ifdef VMS
+#    define NO_vsnprintf
+#  endif
+#  ifdef __OS400__
+#    define NO_vsnprintf
+#  endif
+#  ifdef __MVS__
+#    define NO_vsnprintf
+#  endif
+#endif
+
+/* unlike snprintf (which is required in C99, yet still not supported by
+   Microsoft more than a decade later!), _snprintf does not guarantee null
+   termination of the result -- however this is only used in gzlib.c where
+   the result is assured to fit in the space provided */
+#ifdef _MSC_VER
+#  define snprintf _snprintf
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+/* gz* functions always use library allocation functions */
+#ifndef STDC
+  extern voidp  malloc OF((uInt size));
+  extern void   free   OF((voidpf ptr));
+#endif
+
+/* get errno and strerror definition */
+#if defined UNDER_CE
+#  include <windows.h>
+#  define zstrerror() gz_strwinerror((DWORD)GetLastError())
+#else
+#  ifndef NO_STRERROR
+#    include <errno.h>
+#    define zstrerror() strerror(errno)
+#  else
+#    define zstrerror() "stdio error (consult errno)"
+#  endif
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+#endif
+
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
+/* default i/o buffer size -- double this for output when reading (this and
+   twice this must be able to fit in an unsigned type) */
+#define GZBUFSIZE 8192
+
+/* gzip modes, also provide a little integrity check on the passed structure */
+#define GZ_NONE 0
+#define GZ_READ 7247
+#define GZ_WRITE 31153
+#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */
+
+/* values for gz_state how */
+#define LOOK 0      /* look for a gzip header */
+#define COPY 1      /* copy input directly */
+#define GZIP 2      /* decompress a gzip stream */
+
+/* internal gzip file state data structure */
+typedef struct {
+        /* exposed contents for gzgetc() macro */
+    struct gzFile_s x;      /* "x" for exposed */
+                            /* x.have: number of bytes available at x.next */
+                            /* x.next: next output data to deliver or write */
+                            /* x.pos: current position in uncompressed data */
+        /* used for both reading and writing */
+    int mode;               /* see gzip modes above */
+    int fd;                 /* file descriptor */
+    char *path;             /* path or fd for error messages */
+    unsigned size;          /* buffer size, zero if not allocated yet */
+    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
+    unsigned char *in;      /* input buffer */
+    unsigned char *out;     /* output buffer (double-sized when reading) */
+    int direct;             /* 0 if processing gzip, 1 if transparent */
+        /* just for reading */
+    int how;                /* 0: get header, 1: copy, 2: decompress */
+    z_off64_t start;        /* where the gzip data started, for rewinding */
+    int eof;                /* true if end of input file reached */
+    int past;               /* true if read requested past end */
+        /* just for writing */
+    int level;              /* compression level */
+    int strategy;           /* compression strategy */
+        /* seek request */
+    z_off64_t skip;         /* amount to skip (already rewound if backwards) */
+    int seek;               /* true if seek request pending */
+        /* error information */
+    int err;                /* error code */
+    char *msg;              /* error message */
+        /* zlib inflate or deflate stream */
+    z_stream strm;          /* stream structure in-place (not a pointer) */
+} gz_state;
+typedef gz_state FAR *gz_statep;
+
+/* shared functions */
+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+#if defined UNDER_CE
+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+#endif
+
+/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
+   value -- needed when comparing unsigned to z_off64_t, which is signed
+   (possible z_off64_t types off_t, off64_t, and long are all signed) */
+#ifdef INT_MAX
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
+#else
+unsigned ZLIB_INTERNAL gz_intmax OF((void));
+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
+#endif
diff --git a/Source/3rd Party/wx/src/zlib/gzio.c b/Source/3rd Party/wx/src/zlib/gzio.c
deleted file mode 100644
index 83e67c779..000000000
--- a/Source/3rd Party/wx/src/zlib/gzio.c	
+++ /dev/null
@@ -1,1032 +0,0 @@
-/* gzio.c -- IO on .gz files
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
- */
-
-/* @(#) $Id$ */
-
-#include <stdio.h>
-
-#include "zutil.h"
-
-#ifdef NO_DEFLATE       /* for compatibility with old definition */
-#  define NO_GZCOMPRESS
-#endif
-
-#ifndef NO_DUMMY_DECL
-struct internal_state {int dummy;}; /* for buggy compilers */
-#endif
-
-#ifndef Z_BUFSIZE
-#  ifdef MAXSEG_64K
-#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
-#  else
-#    define Z_BUFSIZE 16384
-#  endif
-#endif
-#ifndef Z_PRINTF_BUFSIZE
-#  define Z_PRINTF_BUFSIZE 4096
-#endif
-
-#ifdef __MVS__
-#  pragma map (fdopen , "\174\174FDOPEN")
-   FILE *fdopen(int, const char *);
-#endif
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-#define ALLOC(size) malloc(size)
-#define TRYFREE(p) {if (p) free(p);}
-
-/* there is no errno under Windows CE, provide a dummy one to avoid modifying
-   too much code in this file */
-#ifdef _WIN32_WCE
-static int errno;
-#endif
-
-static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
-
-/* gzip flag byte */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define RESERVED     0xE0 /* bits 5..7: reserved */
-
-typedef struct gz_stream {
-    z_stream stream;
-    int      z_err;   /* error code for last stream operation */
-    int      z_eof;   /* set if end of input file */
-    FILE     *file;   /* .gz file */
-    Byte     *inbuf;  /* input buffer */
-    Byte     *outbuf; /* output buffer */
-    uLong    crc;     /* crc32 of uncompressed data */
-    char     *msg;    /* error message */
-    char     *path;   /* path name for debugging only */
-    int      transparent; /* 1 if input file is not a .gz file */
-    char     mode;    /* 'w' or 'r' */
-    z_off_t  start;   /* start of compressed data in file (header skipped) */
-    z_off_t  in;      /* bytes into deflate or inflate */
-    z_off_t  out;     /* bytes out of deflate or inflate */
-    int      back;    /* one character push-back */
-    int      last;    /* true if push-back is last character */
-} gz_stream;
-
-
-local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
-local int do_flush        OF((gzFile file, int flush));
-local int    get_byte     OF((gz_stream *s));
-local void   check_header OF((gz_stream *s));
-local int    destroy      OF((gz_stream *s));
-local void   putLong      OF((FILE *file, uLong x));
-local uLong  getLong      OF((gz_stream *s));
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
-   or path name (if fd == -1).
-     gz_open returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).
-*/
-local gzFile gz_open (path, mode, fd)
-    const char *path;
-    const char *mode;
-    int  fd;
-{
-    int err;
-    int level = Z_DEFAULT_COMPRESSION; /* compression level */
-    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
-    char *p = (char*)mode;
-    gz_stream *s;
-    char fmode[80]; /* copy of mode, without the compression level */
-    char *m = fmode;
-
-    if (!path || !mode) return Z_NULL;
-
-    s = (gz_stream *)ALLOC(sizeof(gz_stream));
-    if (!s) return Z_NULL;
-
-    s->stream.zalloc = (alloc_func)0;
-    s->stream.zfree = (free_func)0;
-    s->stream.opaque = (voidpf)0;
-    s->stream.next_in = s->inbuf = Z_NULL;
-    s->stream.next_out = s->outbuf = Z_NULL;
-    s->stream.avail_in = s->stream.avail_out = 0;
-    s->file = NULL;
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->in = 0;
-    s->out = 0;
-    s->back = EOF;
-    s->crc = crc32(0L, Z_NULL, 0);
-    s->msg = NULL;
-    s->transparent = 0;
-
-    s->path = (char*)ALLOC(strlen(path)+1);
-    if (s->path == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    strcpy(s->path, path); /* do this early for debugging */
-
-    s->mode = '\0';
-    do {
-        if (*p == 'r') s->mode = 'r';
-        if (*p == 'w' || *p == 'a') s->mode = 'w';
-        if (*p >= '0' && *p <= '9') {
-            level = *p - '0';
-        } else if (*p == 'f') {
-          strategy = Z_FILTERED;
-        } else if (*p == 'h') {
-          strategy = Z_HUFFMAN_ONLY;
-        } else if (*p == 'R') {
-          strategy = Z_RLE;
-        } else {
-            *m++ = *p; /* copy the mode */
-        }
-    } while (*p++ && m != fmode + sizeof(fmode));
-    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
-
-    if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-        err = Z_STREAM_ERROR;
-#else
-        err = deflateInit2(&(s->stream), level,
-                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
-        /* windowBits is passed < 0 to suppress zlib header */
-
-        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-#endif
-        if (err != Z_OK || s->outbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    } else {
-        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
-        err = inflateInit2(&(s->stream), -MAX_WBITS);
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
-         * present after the compressed stream.
-         */
-        if (err != Z_OK || s->inbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    }
-    s->stream.avail_out = Z_BUFSIZE;
-
-    errno = 0;
-    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
-
-    if (s->file == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    if (s->mode == 'w') {
-        /* Write a very simple .gz header:
-         */
-        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-        s->start = 10L;
-        /* We use 10L instead of ftell(s->file) to because ftell causes an
-         * fflush on some systems. This version of the library doesn't use
-         * start anyway in write mode, so this initialization is not
-         * necessary.
-         */
-    } else {
-        check_header(s); /* skip the .gz header */
-        s->start = ftell(s->file) - s->stream.avail_in;
-    }
-
-    return (gzFile)s;
-}
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing.
-*/
-gzFile ZEXPORT gzopen (path, mode)
-    const char *path;
-    const char *mode;
-{
-    return gz_open (path, mode, -1);
-}
-
-/* ===========================================================================
-     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
-   to mimic the behavio(u)r of fdopen.
-*/
-gzFile ZEXPORT gzdopen (fd, mode)
-    int fd;
-    const char *mode;
-{
-    char name[46];      /* allow for up to 128-bit integers */
-
-    if (fd < 0) return (gzFile)Z_NULL;
-    sprintf(name, "<fd:%d>", fd); /* for debugging */
-
-    return gz_open (name, mode, fd);
-}
-
-/* ===========================================================================
- * Update the compression level and strategy
- */
-int ZEXPORT gzsetparams (file, level, strategy)
-    gzFile file;
-    int level;
-    int strategy;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    /* Make room to allow flushing */
-    if (s->stream.avail_out == 0) {
-
-        s->stream.next_out = s->outbuf;
-        if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-            s->z_err = Z_ERRNO;
-        }
-        s->stream.avail_out = Z_BUFSIZE;
-    }
-
-    return deflateParams (&(s->stream), level, strategy);
-}
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-local int get_byte(s)
-    gz_stream *s;
-{
-    if (s->z_eof) return EOF;
-    if (s->stream.avail_in == 0) {
-        errno = 0;
-        s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-        if (s->stream.avail_in == 0) {
-            s->z_eof = 1;
-            if (ferror(s->file)) s->z_err = Z_ERRNO;
-            return EOF;
-        }
-        s->stream.next_in = s->inbuf;
-    }
-    s->stream.avail_in--;
-    return *(s->stream.next_in)++;
-}
-
-/* ===========================================================================
-      Check the gzip header of a gz_stream opened for reading. Set the stream
-    mode to transparent if the gzip magic header is not present; set s->err
-    to Z_DATA_ERROR if the magic header is present but the rest of the header
-    is incorrect.
-    IN assertion: the stream s has already been created sucessfully;
-       s->stream.avail_in is zero for the first time, but may be non-zero
-       for concatenated .gz files.
-*/
-local void check_header(s)
-    gz_stream *s;
-{
-    int method; /* method byte */
-    int flags;  /* flags byte */
-    uInt len;
-    int c;
-
-    /* Assure two bytes in the buffer so we can peek ahead -- handle case
-       where first byte of header is at the end of the buffer after the last
-       gzip segment */
-    len = s->stream.avail_in;
-    if (len < 2) {
-        if (len) s->inbuf[0] = s->stream.next_in[0];
-        errno = 0;
-        len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
-        if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
-        s->stream.avail_in += len;
-        s->stream.next_in = s->inbuf;
-        if (s->stream.avail_in < 2) {
-            s->transparent = s->stream.avail_in;
-            return;
-        }
-    }
-
-    /* Peek ahead to check the gzip magic header */
-    if (s->stream.next_in[0] != gz_magic[0] ||
-        s->stream.next_in[1] != gz_magic[1]) {
-        s->transparent = 1;
-        return;
-    }
-    s->stream.avail_in -= 2;
-    s->stream.next_in += 2;
-
-    /* Check the rest of the gzip header */
-    method = get_byte(s);
-    flags = get_byte(s);
-    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
-        s->z_err = Z_DATA_ERROR;
-        return;
-    }
-
-    /* Discard time, xflags and OS code: */
-    for (len = 0; len < 6; len++) (void)get_byte(s);
-
-    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-        len  =  (uInt)get_byte(s);
-        len += ((uInt)get_byte(s))<<8;
-        /* len is garbage if EOF but the loop below will quit anyway */
-        while (len-- != 0 && get_byte(s) != EOF) ;
-    }
-    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-        while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
-        while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
-        for (len = 0; len < 2; len++) (void)get_byte(s);
-    }
-    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
-}
-
- /* ===========================================================================
- * Cleanup then free the given gz_stream. Return a zlib error code.
-   Try freeing in the reverse order of allocations.
- */
-local int destroy (s)
-    gz_stream *s;
-{
-    int err = Z_OK;
-
-    if (!s) return Z_STREAM_ERROR;
-
-    TRYFREE(s->msg);
-
-    if (s->stream.state != NULL) {
-        if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-            err = Z_STREAM_ERROR;
-#else
-            err = deflateEnd(&(s->stream));
-#endif
-        } else if (s->mode == 'r') {
-            err = inflateEnd(&(s->stream));
-        }
-    }
-    if (s->file != NULL && fclose(s->file)) {
-#ifdef ESPIPE
-        if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
-#endif
-            err = Z_ERRNO;
-    }
-    if (s->z_err < 0) err = s->z_err;
-
-    TRYFREE(s->inbuf);
-    TRYFREE(s->outbuf);
-    TRYFREE(s->path);
-    TRYFREE(s);
-    return err;
-}
-
-/* ===========================================================================
-     Reads the given number of uncompressed bytes from the compressed file.
-   gzread returns the number of bytes actually read (0 for end of file).
-*/
-int ZEXPORT gzread (file, buf, len)
-    gzFile file;
-    voidp buf;
-    unsigned len;
-{
-    gz_stream *s = (gz_stream*)file;
-    Bytef *start = (Bytef*)buf; /* starting point for crc computation */
-    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
-
-    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
-
-    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
-    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
-
-    next_out = (Byte*)buf;
-    s->stream.next_out = (Bytef*)buf;
-    s->stream.avail_out = len;
-
-    if (s->stream.avail_out && s->back != EOF) {
-        *next_out++ = s->back;
-        s->stream.next_out++;
-        s->stream.avail_out--;
-        s->back = EOF;
-        s->out++;
-        start++;
-        if (s->last) {
-            s->z_err = Z_STREAM_END;
-            return 1;
-        }
-    }
-
-    while (s->stream.avail_out != 0) {
-
-        if (s->transparent) {
-            /* Copy first the lookahead bytes: */
-            uInt n = s->stream.avail_in;
-            if (n > s->stream.avail_out) n = s->stream.avail_out;
-            if (n > 0) {
-                zmemcpy(s->stream.next_out, s->stream.next_in, n);
-                next_out += n;
-                s->stream.next_out = next_out;
-                s->stream.next_in   += n;
-                s->stream.avail_out -= n;
-                s->stream.avail_in  -= n;
-            }
-            if (s->stream.avail_out > 0) {
-                s->stream.avail_out -=
-                    (uInt)fread(next_out, 1, s->stream.avail_out, s->file);
-            }
-            len -= s->stream.avail_out;
-            s->in  += len;
-            s->out += len;
-            if (len == 0) s->z_eof = 1;
-            return (int)len;
-        }
-        if (s->stream.avail_in == 0 && !s->z_eof) {
-
-            errno = 0;
-            s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-            if (s->stream.avail_in == 0) {
-                s->z_eof = 1;
-                if (ferror(s->file)) {
-                    s->z_err = Z_ERRNO;
-                    break;
-                }
-            }
-            s->stream.next_in = s->inbuf;
-        }
-        s->in += s->stream.avail_in;
-        s->out += s->stream.avail_out;
-        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
-        s->in -= s->stream.avail_in;
-        s->out -= s->stream.avail_out;
-
-        if (s->z_err == Z_STREAM_END) {
-            /* Check CRC and original size */
-            s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-            start = s->stream.next_out;
-
-            if (getLong(s) != s->crc) {
-                s->z_err = Z_DATA_ERROR;
-            } else {
-                (void)getLong(s);
-                /* The uncompressed length returned by above getlong() may be
-                 * different from s->out in case of concatenated .gz files.
-                 * Check for such files:
-                 */
-                check_header(s);
-                if (s->z_err == Z_OK) {
-                    inflateReset(&(s->stream));
-                    s->crc = crc32(0L, Z_NULL, 0);
-                }
-            }
-        }
-        if (s->z_err != Z_OK || s->z_eof) break;
-    }
-    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-
-    if (len == s->stream.avail_out &&
-        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))
-        return -1;
-    return (int)(len - s->stream.avail_out);
-}
-
-
-/* ===========================================================================
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-int ZEXPORT gzgetc(file)
-    gzFile file;
-{
-    unsigned char c;
-
-    return gzread(file, &c, 1) == 1 ? c : -1;
-}
-
-
-/* ===========================================================================
-      Push one byte back onto the stream.
-*/
-int ZEXPORT gzungetc(c, file)
-    int c;
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;
-    s->back = c;
-    s->out--;
-    s->last = (s->z_err == Z_STREAM_END);
-    if (s->last) s->z_err = Z_OK;
-    s->z_eof = 0;
-    return c;
-}
-
-
-/* ===========================================================================
-      Reads bytes from the compressed file until len-1 characters are
-   read, or a newline character is read and transferred to buf, or an
-   end-of-file condition is encountered.  The string is then terminated
-   with a null character.
-      gzgets returns buf, or Z_NULL in case of error.
-
-      The current implementation is not optimized at all.
-*/
-char * ZEXPORT gzgets(file, buf, len)
-    gzFile file;
-    char *buf;
-    int len;
-{
-    char *b = buf;
-    if (buf == Z_NULL || len <= 0) return Z_NULL;
-
-    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
-    *buf = '\0';
-    return b == buf && len > 0 ? Z_NULL : b;
-}
-
-
-#ifndef NO_GZCOMPRESS
-/* ===========================================================================
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of bytes actually written (0 in case of error).
-*/
-int ZEXPORT gzwrite (file, buf, len)
-    gzFile file;
-    voidpc buf;
-    unsigned len;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.next_in = (Bytef*)buf;
-    s->stream.avail_in = len;
-
-    while (s->stream.avail_in != 0) {
-
-        if (s->stream.avail_out == 0) {
-
-            s->stream.next_out = s->outbuf;
-            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-                s->z_err = Z_ERRNO;
-                break;
-            }
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        s->in += s->stream.avail_in;
-        s->out += s->stream.avail_out;
-        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-        s->in -= s->stream.avail_in;
-        s->out -= s->stream.avail_out;
-        if (s->z_err != Z_OK) break;
-    }
-    s->crc = crc32(s->crc, (const Bytef *)buf, len);
-
-    return (int)(len - s->stream.avail_in);
-}
-
-
-/* ===========================================================================
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-#ifdef STDC
-#include <stdarg.h>
-
-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
-{
-    char buf[Z_PRINTF_BUFSIZE];
-    va_list va;
-    int len;
-
-    buf[sizeof(buf) - 1] = 0;
-    va_start(va, format);
-#ifdef NO_vsnprintf
-#  ifdef HAS_vsprintf_void
-    (void)vsprintf(buf, format, va);
-    va_end(va);
-    for (len = 0; len < sizeof(buf); len++)
-        if (buf[len] == 0) break;
-#  else
-    len = vsprintf(buf, format, va);
-    va_end(va);
-#  endif
-#else
-#  ifdef HAS_vsnprintf_void
-    (void)vsnprintf(buf, sizeof(buf), format, va);
-    va_end(va);
-    len = strlen(buf);
-#  else
-    len = vsnprintf(buf, sizeof(buf), format, va);
-    va_end(va);
-#  endif
-#endif
-    if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-        return 0;
-    return gzwrite(file, buf, (unsigned)len);
-}
-#else /* not ANSI C */
-
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-    gzFile file;
-    const char *format;
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
-    char buf[Z_PRINTF_BUFSIZE];
-    int len;
-
-    buf[sizeof(buf) - 1] = 0;
-#ifdef NO_snprintf
-#  ifdef HAS_sprintf_void
-    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    for (len = 0; len < sizeof(buf); len++)
-        if (buf[len] == 0) break;
-#  else
-    len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#else
-#  ifdef HAS_snprintf_void
-    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen(buf);
-#  else
-    len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#endif
-    if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-        return 0;
-    return gzwrite(file, buf, len);
-}
-#endif
-
-/* ===========================================================================
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-int ZEXPORT gzputc(file, c)
-    gzFile file;
-    int c;
-{
-    unsigned char cc = (unsigned char) c; /* required for big endian systems */
-
-    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
-}
-
-
-/* ===========================================================================
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-int ZEXPORT gzputs(file, s)
-    gzFile file;
-    const char *s;
-{
-    return gzwrite(file, (char*)s, (unsigned)strlen(s));
-}
-
-
-/* ===========================================================================
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function.
-*/
-local int do_flush (file, flush)
-    gzFile file;
-    int flush;
-{
-    uInt len;
-    int done = 0;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.avail_in = 0; /* should be zero already anyway */
-
-    for (;;) {
-        len = Z_BUFSIZE - s->stream.avail_out;
-
-        if (len != 0) {
-            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
-                s->z_err = Z_ERRNO;
-                return Z_ERRNO;
-            }
-            s->stream.next_out = s->outbuf;
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        if (done) break;
-        s->out += s->stream.avail_out;
-        s->z_err = deflate(&(s->stream), flush);
-        s->out -= s->stream.avail_out;
-
-        /* Ignore the second of two consecutive flushes: */
-        if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
-
-        /* deflate has finished flushing only when it hasn't used up
-         * all the available space in the output buffer:
-         */
-        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
-
-        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
-    }
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-
-int ZEXPORT gzflush (file, flush)
-     gzFile file;
-     int flush;
-{
-    gz_stream *s = (gz_stream*)file;
-    int err = do_flush (file, flush);
-
-    if (err) return err;
-    fflush(s->file);
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-#endif /* NO_GZCOMPRESS */
-
-/* ===========================================================================
-      Sets the starting position for the next gzread or gzwrite on the given
-   compressed file. The offset represents a number of bytes in the
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error.
-      SEEK_END is not implemented, returns error.
-      In this version of the library, gzseek can be extremely slow.
-*/
-z_off_t ZEXPORT gzseek (file, offset, whence)
-    gzFile file;
-    z_off_t offset;
-    int whence;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || whence == SEEK_END ||
-        s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
-        return -1L;
-    }
-
-    if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-        return -1L;
-#else
-        if (whence == SEEK_SET) {
-            offset -= s->in;
-        }
-        if (offset < 0) return -1L;
-
-        /* At this point, offset is the number of zero bytes to write. */
-        if (s->inbuf == Z_NULL) {
-            s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
-            if (s->inbuf == Z_NULL) return -1L;
-            zmemzero(s->inbuf, Z_BUFSIZE);
-        }
-        while (offset > 0)  {
-            uInt size = Z_BUFSIZE;
-            if (offset < Z_BUFSIZE) size = (uInt)offset;
-
-            size = gzwrite(file, s->inbuf, size);
-            if (size == 0) return -1L;
-
-            offset -= size;
-        }
-        return s->in;
-#endif
-    }
-    /* Rest of function is for reading only */
-
-    /* compute absolute position */
-    if (whence == SEEK_CUR) {
-        offset += s->out;
-    }
-    if (offset < 0) return -1L;
-
-    if (s->transparent) {
-        /* map to fseek */
-        s->back = EOF;
-        s->stream.avail_in = 0;
-        s->stream.next_in = s->inbuf;
-        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
-
-        s->in = s->out = offset;
-        return offset;
-    }
-
-    /* For a negative seek, rewind and use positive seek */
-    if (offset >= s->out) {
-        offset -= s->out;
-    } else if (gzrewind(file) < 0) {
-        return -1L;
-    }
-    /* offset is now the number of bytes to skip. */
-
-    if (offset != 0 && s->outbuf == Z_NULL) {
-        s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-        if (s->outbuf == Z_NULL) return -1L;
-    }
-    if (offset && s->back != EOF) {
-        s->back = EOF;
-        s->out++;
-        offset--;
-        if (s->last) s->z_err = Z_STREAM_END;
-    }
-    while (offset > 0)  {
-        int size = Z_BUFSIZE;
-        if (offset < Z_BUFSIZE) size = (int)offset;
-
-        size = gzread(file, s->outbuf, (uInt)size);
-        if (size <= 0) return -1L;
-        offset -= size;
-    }
-    return s->out;
-}
-
-/* ===========================================================================
-     Rewinds input file.
-*/
-int ZEXPORT gzrewind (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'r') return -1;
-
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->back = EOF;
-    s->stream.avail_in = 0;
-    s->stream.next_in = s->inbuf;
-    s->crc = crc32(0L, Z_NULL, 0);
-    if (!s->transparent) (void)inflateReset(&s->stream);
-    s->in = 0;
-    s->out = 0;
-    return fseek(s->file, s->start, SEEK_SET);
-}
-
-/* ===========================================================================
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-*/
-z_off_t ZEXPORT gztell (file)
-    gzFile file;
-{
-    return gzseek(file, 0L, SEEK_CUR);
-}
-
-/* ===========================================================================
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-int ZEXPORT gzeof (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    /* With concatenated compressed files that can have embedded
-     * crc trailers, z_eof is no longer the only/best indicator of EOF
-     * on a gz_stream. Handle end-of-stream error explicitly here.
-     */
-    if (s == NULL || s->mode != 'r') return 0;
-    if (s->z_eof) return 1;
-    return s->z_err == Z_STREAM_END;
-}
-
-/* ===========================================================================
-     Returns 1 if reading and doing so transparently, otherwise zero.
-*/
-int ZEXPORT gzdirect (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'r') return 0;
-    return s->transparent;
-}
-
-/* ===========================================================================
-   Outputs a long in LSB order to the given file
-*/
-local void putLong (file, x)
-    FILE *file;
-    uLong x;
-{
-    int n;
-    for (n = 0; n < 4; n++) {
-        fputc((int)(x & 0xff), file);
-        x >>= 8;
-    }
-}
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets z_err in case
-   of error.
-*/
-local uLong getLong (s)
-    gz_stream *s;
-{
-    uLong x = (uLong)get_byte(s);
-    int c;
-
-    x += ((uLong)get_byte(s))<<8;
-    x += ((uLong)get_byte(s))<<16;
-    c = get_byte(s);
-    if (c == EOF) s->z_err = Z_DATA_ERROR;
-    x += ((uLong)c)<<24;
-    return x;
-}
-
-/* ===========================================================================
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state.
-*/
-int ZEXPORT gzclose (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) return Z_STREAM_ERROR;
-
-    if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-        return Z_STREAM_ERROR;
-#else
-        if (do_flush (file, Z_FINISH) != Z_OK)
-            return destroy((gz_stream*)file);
-
-        putLong (s->file, s->crc);
-        putLong (s->file, (uLong)(s->in & 0xffffffff));
-#endif
-    }
-    return destroy((gz_stream*)file);
-}
-
-#ifdef STDC
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
-/* ===========================================================================
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-const char * ZEXPORT gzerror (file, errnum)
-    gzFile file;
-    int *errnum;
-{
-    char *m;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) {
-        *errnum = Z_STREAM_ERROR;
-        return (const char*)ERR_MSG(Z_STREAM_ERROR);
-    }
-    *errnum = s->z_err;
-    if (*errnum == Z_OK) return (const char*)"";
-
-    m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
-
-    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
-
-    TRYFREE(s->msg);
-    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
-    if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);
-    strcpy(s->msg, s->path);
-    strcat(s->msg, ": ");
-    strcat(s->msg, m);
-    return (const char*)s->msg;
-}
-
-/* ===========================================================================
-     Clear the error and end-of-file flags, and do the same for the real file.
-*/
-void ZEXPORT gzclearerr (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) return;
-    if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;
-    s->z_eof = 0;
-    clearerr(s->file);
-}
diff --git a/Source/3rd Party/wx/src/zlib/gzlib.c b/Source/3rd Party/wx/src/zlib/gzlib.c
new file mode 100644
index 000000000..fae202ef8
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/gzlib.c	
@@ -0,0 +1,634 @@
+/* gzlib.c -- zlib functions common to reading and writing gzip files
+ * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+#if defined(_WIN32) && !defined(__BORLANDC__)
+#  define LSEEK _lseeki64
+#else
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#  define LSEEK lseek64
+#else
+#  define LSEEK lseek
+#endif
+#endif
+
+/* Local functions */
+local void gz_reset OF((gz_statep));
+local gzFile gz_open OF((const void *, int, const char *));
+
+#if defined UNDER_CE
+
+/* Map the Windows error number in ERROR to a locale-dependent error message
+   string and return a pointer to it.  Typically, the values for ERROR come
+   from GetLastError.
+
+   The string pointed to shall not be modified by the application, but may be
+   overwritten by a subsequent call to gz_strwinerror
+
+   The gz_strwinerror function does not change the current setting of
+   GetLastError. */
+char ZLIB_INTERNAL *gz_strwinerror (error)
+     DWORD error;
+{
+    static char buf[1024];
+
+    wchar_t *msgbuf;
+    DWORD lasterr = GetLastError();
+    DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+        | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+        NULL,
+        error,
+        0, /* Default language */
+        (LPVOID)&msgbuf,
+        0,
+        NULL);
+    if (chars != 0) {
+        /* If there is an \r\n appended, zap it.  */
+        if (chars >= 2
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
+            chars -= 2;
+            msgbuf[chars] = 0;
+        }
+
+        if (chars > sizeof (buf) - 1) {
+            chars = sizeof (buf) - 1;
+            msgbuf[chars] = 0;
+        }
+
+        wcstombs(buf, msgbuf, chars + 1);
+        LocalFree(msgbuf);
+    }
+    else {
+        sprintf(buf, "unknown win32 error (%ld)", error);
+    }
+
+    SetLastError(lasterr);
+    return buf;
+}
+
+#endif /* UNDER_CE */
+
+/* Reset gzip file state */
+local void gz_reset(state)
+    gz_statep state;
+{
+    state->x.have = 0;              /* no output data available */
+    if (state->mode == GZ_READ) {   /* for reading ... */
+        state->eof = 0;             /* not at end of file */
+        state->past = 0;            /* have not read past end yet */
+        state->how = LOOK;          /* look for gzip header */
+    }
+    state->seek = 0;                /* no seek request pending */
+    gz_error(state, Z_OK, NULL);    /* clear error */
+    state->x.pos = 0;               /* no uncompressed data yet */
+    state->strm.avail_in = 0;       /* no input data yet */
+}
+
+/* Open a gzip file either by name or file descriptor. */
+local gzFile gz_open(path, fd, mode)
+    const void *path;
+    int fd;
+    const char *mode;
+{
+    gz_statep state;
+    size_t len;
+    int oflag;
+#ifdef O_CLOEXEC
+    int cloexec = 0;
+#endif
+#ifdef O_EXCL
+    int exclusive = 0;
+#endif
+
+    /* check input */
+    if (path == NULL)
+        return NULL;
+
+    /* allocate gzFile structure to return */
+    state = (gz_statep)malloc(sizeof(gz_state));
+    if (state == NULL)
+        return NULL;
+    state->size = 0;            /* no buffers allocated yet */
+    state->want = GZBUFSIZE;    /* requested buffer size */
+    state->msg = NULL;          /* no error message yet */
+
+    /* interpret mode */
+    state->mode = GZ_NONE;
+    state->level = Z_DEFAULT_COMPRESSION;
+    state->strategy = Z_DEFAULT_STRATEGY;
+    state->direct = 0;
+    while (*mode) {
+        if (*mode >= '0' && *mode <= '9')
+            state->level = *mode - '0';
+        else
+            switch (*mode) {
+            case 'r':
+                state->mode = GZ_READ;
+                break;
+#ifndef NO_GZCOMPRESS
+            case 'w':
+                state->mode = GZ_WRITE;
+                break;
+            case 'a':
+                state->mode = GZ_APPEND;
+                break;
+#endif
+            case '+':       /* can't read and write at the same time */
+                free(state);
+                return NULL;
+            case 'b':       /* ignore -- will request binary anyway */
+                break;
+#ifdef O_CLOEXEC
+            case 'e':
+                cloexec = 1;
+                break;
+#endif
+#ifdef O_EXCL
+            case 'x':
+                exclusive = 1;
+                break;
+#endif
+            case 'f':
+                state->strategy = Z_FILTERED;
+                break;
+            case 'h':
+                state->strategy = Z_HUFFMAN_ONLY;
+                break;
+            case 'R':
+                state->strategy = Z_RLE;
+                break;
+            case 'F':
+                state->strategy = Z_FIXED;
+                break;
+            case 'T':
+                state->direct = 1;
+                break;
+            default:        /* could consider as an error, but just ignore */
+                ;
+            }
+        mode++;
+    }
+
+    /* must provide an "r", "w", or "a" */
+    if (state->mode == GZ_NONE) {
+        free(state);
+        return NULL;
+    }
+
+    /* can't force transparent read */
+    if (state->mode == GZ_READ) {
+        if (state->direct) {
+            free(state);
+            return NULL;
+        }
+        state->direct = 1;      /* for empty file */
+    }
+
+    /* save the path name for error messages */
+#ifdef _WIN32
+    if (fd == -2) {
+        len = wcstombs(NULL, path, 0);
+        if (len == (size_t)-1)
+            len = 0;
+    }
+    else
+#endif
+        len = strlen((const char *)path);
+    state->path = (char *)malloc(len + 1);
+    if (state->path == NULL) {
+        free(state);
+        return NULL;
+    }
+#ifdef _WIN32
+    if (fd == -2)
+        if (len)
+            wcstombs(state->path, path, len + 1);
+        else
+            *(state->path) = 0;
+    else
+#endif
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+        snprintf(state->path, len + 1, "%s", (const char *)path);
+#else
+        strcpy(state->path, path);
+#endif
+
+    /* compute the flags for open() */
+    oflag =
+#ifdef O_LARGEFILE
+        O_LARGEFILE |
+#endif
+#ifdef O_BINARY
+        O_BINARY |
+#endif
+#ifdef O_CLOEXEC
+        (cloexec ? O_CLOEXEC : 0) |
+#endif
+        (state->mode == GZ_READ ?
+         O_RDONLY :
+         (O_WRONLY | O_CREAT |
+#ifdef O_EXCL
+          (exclusive ? O_EXCL : 0) |
+#endif
+          (state->mode == GZ_WRITE ?
+           O_TRUNC :
+           O_APPEND)));
+
+    /* open the file with the appropriate flags (or just use fd) */
+    state->fd = fd > -1 ? fd : (
+#ifdef _WIN32
+        fd == -2 ? _wopen(path, oflag, 0666) :
+#endif
+        open((const char *)path, oflag, 0666));
+    if (state->fd == -1) {
+        free(state->path);
+        free(state);
+        return NULL;
+    }
+    if (state->mode == GZ_APPEND)
+        state->mode = GZ_WRITE;         /* simplify later checks */
+
+    /* save the current position for rewinding (only if reading) */
+    if (state->mode == GZ_READ) {
+        state->start = LSEEK(state->fd, 0, SEEK_CUR);
+        if (state->start == -1) state->start = 0;
+    }
+
+    /* initialize stream */
+    gz_reset(state);
+
+    /* return stream */
+    return (gzFile)state;
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen64(path, mode)
+    const char *path;
+    const char *mode;
+{
+    return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzdopen(fd, mode)
+    int fd;
+    const char *mode;
+{
+    char *path;         /* identifier for error messages */
+    gzFile gz;
+
+    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
+        return NULL;
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
+#else
+    sprintf(path, "<fd:%d>", fd);   /* for debugging */
+#endif
+    gz = gz_open(path, fd, mode);
+    free(path);
+    return gz;
+}
+
+/* -- see zlib.h -- */
+#ifdef _WIN32
+gzFile ZEXPORT gzopen_w(path, mode)
+    const wchar_t *path;
+    const char *mode;
+{
+    return gz_open(path, -2, mode);
+}
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzbuffer(file, size)
+    gzFile file;
+    unsigned size;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* make sure we haven't already allocated memory */
+    if (state->size != 0)
+        return -1;
+
+    /* check and set requested size */
+    if (size < 2)
+        size = 2;               /* need two bytes to check magic header */
+    state->want = size;
+    return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzrewind(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* back up and start over */
+    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
+        return -1;
+    gz_reset(state);
+    return 0;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzseek64(file, offset, whence)
+    gzFile file;
+    z_off64_t offset;
+    int whence;
+{
+    unsigned n;
+    z_off64_t ret;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* check that there's no error */
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+
+    /* can only seek from start or relative to current position */
+    if (whence != SEEK_SET && whence != SEEK_CUR)
+        return -1;
+
+    /* normalize offset to a SEEK_CUR specification */
+    if (whence == SEEK_SET)
+        offset -= state->x.pos;
+    else if (state->seek)
+        offset += state->skip;
+    state->seek = 0;
+
+    /* if within raw area while reading, just go there */
+    if (state->mode == GZ_READ && state->how == COPY &&
+            state->x.pos + offset >= 0) {
+        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
+        if (ret == -1)
+            return -1;
+        state->x.have = 0;
+        state->eof = 0;
+        state->past = 0;
+        state->seek = 0;
+        gz_error(state, Z_OK, NULL);
+        state->strm.avail_in = 0;
+        state->x.pos += offset;
+        return state->x.pos;
+    }
+
+    /* calculate skip amount, rewinding if needed for back seek when reading */
+    if (offset < 0) {
+        if (state->mode != GZ_READ)         /* writing -- can't go backwards */
+            return -1;
+        offset += state->x.pos;
+        if (offset < 0)                     /* before start of file! */
+            return -1;
+        if (gzrewind(file) == -1)           /* rewind, then skip to offset */
+            return -1;
+    }
+
+    /* if reading, skip what's in output buffer (one less gzgetc() check) */
+    if (state->mode == GZ_READ) {
+        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
+            (unsigned)offset : state->x.have;
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
+        offset -= n;
+    }
+
+    /* request skip (if not zero) */
+    if (offset) {
+        state->seek = 1;
+        state->skip = offset;
+    }
+    return state->x.pos + offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzseek(file, offset, whence)
+    gzFile file;
+    z_off_t offset;
+    int whence;
+{
+    z_off64_t ret;
+
+    ret = gzseek64(file, (z_off64_t)offset, whence);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gztell64(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* return position */
+    return state->x.pos + (state->seek ? state->skip : 0);
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gztell(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gztell64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzoffset64(file)
+    gzFile file;
+{
+    z_off64_t offset;
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return -1;
+
+    /* compute and return effective offset in file */
+    offset = LSEEK(state->fd, 0, SEEK_CUR);
+    if (offset == -1)
+        return -1;
+    if (state->mode == GZ_READ)             /* reading */
+        offset -= state->strm.avail_in;     /* don't count buffered input */
+    return offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzoffset(file)
+    gzFile file;
+{
+    z_off64_t ret;
+
+    ret = gzoffset64(file);
+    return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzeof(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return 0;
+
+    /* return end-of-file state */
+    return state->mode == GZ_READ ? state->past : 0;
+}
+
+/* -- see zlib.h -- */
+const char * ZEXPORT gzerror(file, errnum)
+    gzFile file;
+    int *errnum;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return NULL;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return NULL;
+
+    /* return error information */
+    if (errnum != NULL)
+        *errnum = state->err;
+    return state->err == Z_MEM_ERROR ? "out of memory" :
+                                       (state->msg == NULL ? "" : state->msg);
+}
+
+/* -- see zlib.h -- */
+void ZEXPORT gzclearerr(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure and check integrity */
+    if (file == NULL)
+        return;
+    state = (gz_statep)file;
+    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+        return;
+
+    /* clear error and end-of-file */
+    if (state->mode == GZ_READ) {
+        state->eof = 0;
+        state->past = 0;
+    }
+    gz_error(state, Z_OK, NULL);
+}
+
+/* Create an error message in allocated memory and set state->err and
+   state->msg accordingly.  Free any previous error message already there.  Do
+   not try to free or allocate space if the error is Z_MEM_ERROR (out of
+   memory).  Simply save the error message as a static string.  If there is an
+   allocation failure constructing the error message, then convert the error to
+   out of memory. */
+void ZLIB_INTERNAL gz_error(state, err, msg)
+    gz_statep state;
+    int err;
+    const char *msg;
+{
+    /* free previously allocated message and clear */
+    if (state->msg != NULL) {
+        if (state->err != Z_MEM_ERROR)
+            free(state->msg);
+        state->msg = NULL;
+    }
+
+    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
+    if (err != Z_OK && err != Z_BUF_ERROR)
+        state->x.have = 0;
+
+    /* set error code, and if no message, then done */
+    state->err = err;
+    if (msg == NULL)
+        return;
+
+    /* for an out of memory error, return literal string when requested */
+    if (err == Z_MEM_ERROR)
+        return;
+
+    /* construct error message with path */
+    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
+            NULL) {
+        state->err = Z_MEM_ERROR;
+        return;
+    }
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
+             "%s%s%s", state->path, ": ", msg);
+#else
+    strcpy(state->msg, state->path);
+    strcat(state->msg, ": ");
+    strcat(state->msg, msg);
+#endif
+    return;
+}
+
+#ifndef INT_MAX
+/* portably return maximum value for an int (when limits.h presumed not
+   available) -- we need to do this to cover cases where 2's complement not
+   used, since C standard permits 1's complement and sign-bit representations,
+   otherwise we could just use ((unsigned)-1) >> 1 */
+unsigned ZLIB_INTERNAL gz_intmax()
+{
+    unsigned p, q;
+
+    p = 1;
+    do {
+        q = p;
+        p <<= 1;
+        p++;
+    } while (p > q);
+    return q >> 1;
+}
+#endif
diff --git a/Source/3rd Party/wx/src/zlib/gzread.c b/Source/3rd Party/wx/src/zlib/gzread.c
new file mode 100644
index 000000000..bf4538eb2
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/gzread.c	
@@ -0,0 +1,594 @@
+/* gzread.c -- zlib functions for reading gzip files
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
+local int gz_avail OF((gz_statep));
+local int gz_look OF((gz_statep));
+local int gz_decomp OF((gz_statep));
+local int gz_fetch OF((gz_statep));
+local int gz_skip OF((gz_statep, z_off64_t));
+
+/* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
+   state->fd, and update state->eof, state->err, and state->msg as appropriate.
+   This function needs to loop on read(), since read() is not guaranteed to
+   read the number of bytes requested, depending on the type of descriptor. */
+local int gz_load(state, buf, len, have)
+    gz_statep state;
+    unsigned char *buf;
+    unsigned len;
+    unsigned *have;
+{
+    int ret;
+
+    *have = 0;
+    do {
+        ret = read(state->fd, buf + *have, len - *have);
+        if (ret <= 0)
+            break;
+        *have += ret;
+    } while (*have < len);
+    if (ret < 0) {
+        gz_error(state, Z_ERRNO, zstrerror());
+        return -1;
+    }
+    if (ret == 0)
+        state->eof = 1;
+    return 0;
+}
+
+/* Load up input buffer and set eof flag if last data loaded -- return -1 on
+   error, 0 otherwise.  Note that the eof flag is set when the end of the input
+   file is reached, even though there may be unused data in the buffer.  Once
+   that data has been used, no more attempts will be made to read the file.
+   If strm->avail_in != 0, then the current data is moved to the beginning of
+   the input buffer, and then the remainder of the buffer is loaded with the
+   available data from the input file. */
+local int gz_avail(state)
+    gz_statep state;
+{
+    unsigned got;
+    z_streamp strm = &(state->strm);
+
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+        return -1;
+    if (state->eof == 0) {
+        if (strm->avail_in) {       /* copy what's there to the start */
+            unsigned char *p = state->in;
+            unsigned const char *q = strm->next_in;
+            unsigned n = strm->avail_in;
+            do {
+                *p++ = *q++;
+            } while (--n);
+        }
+        if (gz_load(state, state->in + strm->avail_in,
+                    state->size - strm->avail_in, &got) == -1)
+            return -1;
+        strm->avail_in += got;
+        strm->next_in = state->in;
+    }
+    return 0;
+}
+
+/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
+   If this is the first time in, allocate required memory.  state->how will be
+   left unchanged if there is no more input data available, will be set to COPY
+   if there is no gzip header and direct copying will be performed, or it will
+   be set to GZIP for decompression.  If direct copying, then leftover input
+   data from the input buffer will be copied to the output buffer.  In that
+   case, all further file reads will be directly to either the output buffer or
+   a user buffer.  If decompressing, the inflate state will be initialized.
+   gz_look() will return 0 on success or -1 on failure. */
+local int gz_look(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    /* allocate read buffers and inflate memory */
+    if (state->size == 0) {
+        /* allocate buffers */
+        state->in = (unsigned char *)malloc(state->want);
+        state->out = (unsigned char *)malloc(state->want << 1);
+        if (state->in == NULL || state->out == NULL) {
+            if (state->out != NULL)
+                free(state->out);
+            if (state->in != NULL)
+                free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        state->size = state->want;
+
+        /* allocate inflate memory */
+        state->strm.zalloc = Z_NULL;
+        state->strm.zfree = Z_NULL;
+        state->strm.opaque = Z_NULL;
+        state->strm.avail_in = 0;
+        state->strm.next_in = Z_NULL;
+        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
+            free(state->out);
+            free(state->in);
+            state->size = 0;
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+    }
+
+    /* get at least the magic bytes in the input buffer */
+    if (strm->avail_in < 2) {
+        if (gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0)
+            return 0;
+    }
+
+    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
+       a logical dilemma here when considering the case of a partially written
+       gzip file, to wit, if a single 31 byte is written, then we cannot tell
+       whether this is a single-byte file, or just a partially written gzip
+       file -- for here we assume that if a gzip file is being written, then
+       the header will be written in a single operation, so that reading a
+       single byte is sufficient indication that it is not a gzip file) */
+    if (strm->avail_in > 1 &&
+            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
+        inflateReset(strm);
+        state->how = GZIP;
+        state->direct = 0;
+        return 0;
+    }
+
+    /* no gzip header -- if we were decoding gzip before, then this is trailing
+       garbage.  Ignore the trailing garbage and finish. */
+    if (state->direct == 0) {
+        strm->avail_in = 0;
+        state->eof = 1;
+        state->x.have = 0;
+        return 0;
+    }
+
+    /* doing raw i/o, copy any leftover input to output -- this assumes that
+       the output buffer is larger than the input buffer, which also assures
+       space for gzungetc() */
+    state->x.next = state->out;
+    if (strm->avail_in) {
+        memcpy(state->x.next, strm->next_in, strm->avail_in);
+        state->x.have = strm->avail_in;
+        strm->avail_in = 0;
+    }
+    state->how = COPY;
+    state->direct = 1;
+    return 0;
+}
+
+/* Decompress from input to the provided next_out and avail_out in the state.
+   On return, state->x.have and state->x.next point to the just decompressed
+   data.  If the gzip stream completes, state->how is reset to LOOK to look for
+   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
+   on success, -1 on failure. */
+local int gz_decomp(state)
+    gz_statep state;
+{
+    int ret = Z_OK;
+    unsigned had;
+    z_streamp strm = &(state->strm);
+
+    /* fill output buffer up to end of deflate stream */
+    had = strm->avail_out;
+    do {
+        /* get more input for inflate() */
+        if (strm->avail_in == 0 && gz_avail(state) == -1)
+            return -1;
+        if (strm->avail_in == 0) {
+            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
+            break;
+        }
+
+        /* decompress and handle errors */
+        ret = inflate(strm, Z_NO_FLUSH);
+        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
+            gz_error(state, Z_STREAM_ERROR,
+                     "internal error: inflate stream corrupt");
+            return -1;
+        }
+        if (ret == Z_MEM_ERROR) {
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
+            gz_error(state, Z_DATA_ERROR,
+                     strm->msg == NULL ? "compressed data error" : strm->msg);
+            return -1;
+        }
+    } while (strm->avail_out && ret != Z_STREAM_END);
+
+    /* update available output */
+    state->x.have = had - strm->avail_out;
+    state->x.next = strm->next_out - state->x.have;
+
+    /* if the gzip stream completed successfully, look for another */
+    if (ret == Z_STREAM_END)
+        state->how = LOOK;
+
+    /* good decompression */
+    return 0;
+}
+
+/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
+   Data is either copied from the input file or decompressed from the input
+   file depending on state->how.  If state->how is LOOK, then a gzip header is
+   looked for to determine whether to copy or decompress.  Returns -1 on error,
+   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
+   end of the input file has been reached and all data has been processed.  */
+local int gz_fetch(state)
+    gz_statep state;
+{
+    z_streamp strm = &(state->strm);
+
+    do {
+        switch(state->how) {
+        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
+            if (gz_look(state) == -1)
+                return -1;
+            if (state->how == LOOK)
+                return 0;
+            break;
+        case COPY:      /* -> COPY */
+            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
+                    == -1)
+                return -1;
+            state->x.next = state->out;
+            return 0;
+        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
+            strm->avail_out = state->size << 1;
+            strm->next_out = state->out;
+            if (gz_decomp(state) == -1)
+                return -1;
+        }
+    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
+    return 0;
+}
+
+/* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
+local int gz_skip(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    unsigned n;
+
+    /* skip over len bytes or reach end-of-file, whichever comes first */
+    while (len)
+        /* skip over whatever is in output buffer */
+        if (state->x.have) {
+            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
+                (unsigned)len : state->x.have;
+            state->x.have -= n;
+            state->x.next += n;
+            state->x.pos += n;
+            len -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
+        else if (state->eof && state->strm.avail_in == 0)
+            break;
+
+        /* need more data to skip -- load up output buffer */
+        else {
+            /* get more output, looking for header if required */
+            if (gz_fetch(state) == -1)
+                return -1;
+        }
+    return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzread(file, buf, len)
+    gzFile file;
+    voidp buf;
+    unsigned len;
+{
+    unsigned got, n;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* since an int is returned, make sure len fits in one, otherwise return
+       with an error (this avoids the flaw in the interface) */
+    if ((int)len < 0) {
+        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
+        return -1;
+    }
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* get len bytes to buf, or less than len if at the end */
+    got = 0;
+    do {
+        /* first just try copying data from the output buffer */
+        if (state->x.have) {
+            n = state->x.have > len ? len : state->x.have;
+            memcpy(buf, state->x.next, n);
+            state->x.next += n;
+            state->x.have -= n;
+        }
+
+        /* output buffer empty -- return if we're at the end of the input */
+        else if (state->eof && strm->avail_in == 0) {
+            state->past = 1;        /* tried to read past end */
+            break;
+        }
+
+        /* need output data -- for small len or new stream load up our output
+           buffer */
+        else if (state->how == LOOK || len < (state->size << 1)) {
+            /* get more output, looking for header if required */
+            if (gz_fetch(state) == -1)
+                return -1;
+            continue;       /* no progress yet -- go back to copy above */
+            /* the copy above assures that we will leave with space in the
+               output buffer, allowing at least one gzungetc() to succeed */
+        }
+
+        /* large len -- read directly into user buffer */
+        else if (state->how == COPY) {      /* read directly */
+            if (gz_load(state, (unsigned char *)buf, len, &n) == -1)
+                return -1;
+        }
+
+        /* large len -- decompress directly into user buffer */
+        else {  /* state->how == GZIP */
+            strm->avail_out = len;
+            strm->next_out = (unsigned char *)buf;
+            if (gz_decomp(state) == -1)
+                return -1;
+            n = state->x.have;
+            state->x.have = 0;
+        }
+
+        /* update progress */
+        len -= n;
+        buf = (char *)buf + n;
+        got += n;
+        state->x.pos += n;
+    } while (len);
+
+    /* return number of bytes read into user buffer (will fit in int) */
+    return (int)got;
+}
+
+/* -- see zlib.h -- */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#else
+#  undef gzgetc
+#endif
+int ZEXPORT gzgetc(file)
+    gzFile file;
+{
+    int ret;
+    unsigned char buf[1];
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* try output buffer (no need to check for skip request) */
+    if (state->x.have) {
+        state->x.have--;
+        state->x.pos++;
+        return *(state->x.next)++;
+    }
+
+    /* nothing there -- try gzread() */
+    ret = gzread(file, buf, 1);
+    return ret < 1 ? -1 : buf[0];
+}
+
+int ZEXPORT gzgetc_(file)
+gzFile file;
+{
+    return gzgetc(file);
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzungetc(c, file)
+    int c;
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return -1;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* can't push EOF */
+    if (c < 0)
+        return -1;
+
+    /* if output buffer empty, put byte at end (allows more pushing) */
+    if (state->x.have == 0) {
+        state->x.have = 1;
+        state->x.next = state->out + (state->size << 1) - 1;
+        state->x.next[0] = c;
+        state->x.pos--;
+        state->past = 0;
+        return c;
+    }
+
+    /* if no room, give up (must have already done a gzungetc()) */
+    if (state->x.have == (state->size << 1)) {
+        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
+        return -1;
+    }
+
+    /* slide output data if needed and insert byte before existing data */
+    if (state->x.next == state->out) {
+        unsigned char *src = state->out + state->x.have;
+        unsigned char *dest = state->out + (state->size << 1);
+        while (src > state->out)
+            *--dest = *--src;
+        state->x.next = dest;
+    }
+    state->x.have++;
+    state->x.next--;
+    state->x.next[0] = c;
+    state->x.pos--;
+    state->past = 0;
+    return c;
+}
+
+/* -- see zlib.h -- */
+char * ZEXPORT gzgets(file, buf, len)
+    gzFile file;
+    char *buf;
+    int len;
+{
+    unsigned left, n;
+    char *str;
+    unsigned char *eol;
+    gz_statep state;
+
+    /* check parameters and get internal structure */
+    if (file == NULL || buf == NULL || len < 1)
+        return NULL;
+    state = (gz_statep)file;
+
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
+        return NULL;
+
+    /* process a skip request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_skip(state, state->skip) == -1)
+            return NULL;
+    }
+
+    /* copy output bytes up to new line or len - 1, whichever comes first --
+       append a terminating zero to the string (we don't check for a zero in
+       the contents, let the user worry about that) */
+    str = buf;
+    left = (unsigned)len - 1;
+    if (left) do {
+        /* assure that something is in the output buffer */
+        if (state->x.have == 0 && gz_fetch(state) == -1)
+            return NULL;                /* error */
+        if (state->x.have == 0) {       /* end of file */
+            state->past = 1;            /* read past end */
+            break;                      /* return what we have */
+        }
+
+        /* look for end-of-line in current output buffer */
+        n = state->x.have > left ? left : state->x.have;
+        eol = (unsigned char *)memchr(state->x.next, '\n', n);
+        if (eol != NULL)
+            n = (unsigned)(eol - state->x.next) + 1;
+
+        /* copy through end-of-line, or remainder if not found */
+        memcpy(buf, state->x.next, n);
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
+        left -= n;
+        buf += n;
+    } while (left && eol == NULL);
+
+    /* return terminated string, or if nothing, end of file */
+    if (buf == str)
+        return NULL;
+    buf[0] = 0;
+    return str;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzdirect(file)
+    gzFile file;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+
+    /* if the state is not known, but we can find out, then do so (this is
+       mainly for right after a gzopen() or gzdopen()) */
+    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
+        (void)gz_look(state);
+
+    /* return 1 if transparent, 0 if processing a gzip stream */
+    return state->direct;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_r(file)
+    gzFile file;
+{
+    int ret, err;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're reading */
+    if (state->mode != GZ_READ)
+        return Z_STREAM_ERROR;
+
+    /* free memory and close file */
+    if (state->size) {
+        inflateEnd(&(state->strm));
+        free(state->out);
+        free(state->in);
+    }
+    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    ret = close(state->fd);
+    free(state);
+    return ret ? Z_ERRNO : err;
+}
diff --git a/Source/3rd Party/wx/src/zlib/gzwrite.c b/Source/3rd Party/wx/src/zlib/gzwrite.c
new file mode 100644
index 000000000..aa767fbf6
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/gzwrite.c	
@@ -0,0 +1,577 @@
+/* gzwrite.c -- zlib functions for writing gzip files
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_init OF((gz_statep));
+local int gz_comp OF((gz_statep, int));
+local int gz_zero OF((gz_statep, z_off64_t));
+
+/* Initialize state for writing a gzip file.  Mark initialization by setting
+   state->size to non-zero.  Return -1 on failure or 0 on success. */
+local int gz_init(state)
+    gz_statep state;
+{
+    int ret;
+    z_streamp strm = &(state->strm);
+
+    /* allocate input buffer */
+    state->in = (unsigned char *)malloc(state->want);
+    if (state->in == NULL) {
+        gz_error(state, Z_MEM_ERROR, "out of memory");
+        return -1;
+    }
+
+    /* only need output buffer and deflate state if compressing */
+    if (!state->direct) {
+        /* allocate output buffer */
+        state->out = (unsigned char *)malloc(state->want);
+        if (state->out == NULL) {
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+
+        /* allocate deflate memory, set up for gzip compression */
+        strm->zalloc = Z_NULL;
+        strm->zfree = Z_NULL;
+        strm->opaque = Z_NULL;
+        ret = deflateInit2(strm, state->level, Z_DEFLATED,
+                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
+        if (ret != Z_OK) {
+            free(state->out);
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+    }
+
+    /* mark state as initialized */
+    state->size = state->want;
+
+    /* initialize write buffer if compressing */
+    if (!state->direct) {
+        strm->avail_out = state->size;
+        strm->next_out = state->out;
+        state->x.next = strm->next_out;
+    }
+    return 0;
+}
+
+/* Compress whatever is at avail_in and next_in and write to the output file.
+   Return -1 if there is an error writing to the output file, otherwise 0.
+   flush is assumed to be a valid deflate() flush value.  If flush is Z_FINISH,
+   then the deflate() state is reset to start a new gzip stream.  If gz->direct
+   is true, then simply write to the output file without compressing, and
+   ignore flush. */
+local int gz_comp(state, flush)
+    gz_statep state;
+    int flush;
+{
+    int ret, got;
+    unsigned have;
+    z_streamp strm = &(state->strm);
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return -1;
+
+    /* write directly if requested */
+    if (state->direct) {
+        got = write(state->fd, strm->next_in, strm->avail_in);
+        if (got < 0 || (unsigned)got != strm->avail_in) {
+            gz_error(state, Z_ERRNO, zstrerror());
+            return -1;
+        }
+        strm->avail_in = 0;
+        return 0;
+    }
+
+    /* run deflate() on provided input until it produces no more output */
+    ret = Z_OK;
+    do {
+        /* write out current buffer contents if full, or if flushing, but if
+           doing Z_FINISH then don't write until we get to Z_STREAM_END */
+        if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
+            (flush != Z_FINISH || ret == Z_STREAM_END))) {
+            have = (unsigned)(strm->next_out - state->x.next);
+            if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
+                         (unsigned)got != have)) {
+                gz_error(state, Z_ERRNO, zstrerror());
+                return -1;
+            }
+            if (strm->avail_out == 0) {
+                strm->avail_out = state->size;
+                strm->next_out = state->out;
+            }
+            state->x.next = strm->next_out;
+        }
+
+        /* compress */
+        have = strm->avail_out;
+        ret = deflate(strm, flush);
+        if (ret == Z_STREAM_ERROR) {
+            gz_error(state, Z_STREAM_ERROR,
+                      "internal error: deflate stream corrupt");
+            return -1;
+        }
+        have -= strm->avail_out;
+    } while (have);
+
+    /* if that completed a deflate stream, allow another to start */
+    if (flush == Z_FINISH)
+        deflateReset(strm);
+
+    /* all done, no errors */
+    return 0;
+}
+
+/* Compress len zeros to output.  Return -1 on error, 0 on success. */
+local int gz_zero(state, len)
+    gz_statep state;
+    z_off64_t len;
+{
+    int first;
+    unsigned n;
+    z_streamp strm = &(state->strm);
+
+    /* consume whatever's left in the input buffer */
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        return -1;
+
+    /* compress len zeros (len guaranteed > 0) */
+    first = 1;
+    while (len) {
+        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
+            (unsigned)len : state->size;
+        if (first) {
+            memset(state->in, 0, n);
+            first = 0;
+        }
+        strm->avail_in = n;
+        strm->next_in = state->in;
+        state->x.pos += n;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return -1;
+        len -= n;
+    }
+    return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzwrite(file, buf, len)
+    gzFile file;
+    voidpc buf;
+    unsigned len;
+{
+    unsigned put = len;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return 0;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* since an int is returned, make sure len fits in one, otherwise return
+       with an error (this avoids the flaw in the interface) */
+    if ((int)len < 0) {
+        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
+        return 0;
+    }
+
+    /* if len is zero, avoid unnecessary operations */
+    if (len == 0)
+        return 0;
+
+    /* allocate memory if this is the first time through */
+    if (state->size == 0 && gz_init(state) == -1)
+        return 0;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* for small len, copy to input buffer, otherwise compress directly */
+    if (len < state->size) {
+        /* copy to input buffer, compress when full */
+        do {
+            unsigned have, copy;
+
+            if (strm->avail_in == 0)
+                strm->next_in = state->in;
+            have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+            copy = state->size - have;
+            if (copy > len)
+                copy = len;
+            memcpy(state->in + have, buf, copy);
+            strm->avail_in += copy;
+            state->x.pos += copy;
+            buf = (const char *)buf + copy;
+            len -= copy;
+            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
+                return 0;
+        } while (len);
+    }
+    else {
+        /* consume whatever's left in the input buffer */
+        if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+            return 0;
+
+        /* directly compress user buffer to file */
+        strm->avail_in = len;
+        strm->next_in = (z_const Bytef *)buf;
+        state->x.pos += len;
+        if (gz_comp(state, Z_NO_FLUSH) == -1)
+            return 0;
+    }
+
+    /* input was all buffered or compressed (put will fit in int) */
+    return (int)put;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputc(file, c)
+    gzFile file;
+    int c;
+{
+    unsigned have;
+    unsigned char buf[1];
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return -1;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* try writing to input buffer for speed (state->size == 0 if buffer not
+       initialized) */
+    if (state->size) {
+        if (strm->avail_in == 0)
+            strm->next_in = state->in;
+        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+        if (have < state->size) {
+            state->in[have] = c;
+            strm->avail_in++;
+            state->x.pos++;
+            return c & 0xff;
+        }
+    }
+
+    /* no room in buffer or not initialized, use gz_write() */
+    buf[0] = c;
+    if (gzwrite(file, buf, 1) != 1)
+        return -1;
+    return c & 0xff;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputs(file, str)
+    gzFile file;
+    const char *str;
+{
+    int ret;
+    unsigned len;
+
+    /* write string */
+    len = (unsigned)strlen(str);
+    ret = gzwrite(file, str, len);
+    return ret == 0 && len != 0 ? -1 : ret;
+}
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#include <stdarg.h>
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
+{
+    int size, len;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
+        return 0;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* consume whatever's left in the input buffer */
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        return 0;
+
+    /* do the printf() into the input buffer, put length in len */
+    size = (int)(state->size);
+    state->in[size - 1] = 0;
+#ifdef NO_vsnprintf
+#  ifdef HAS_vsprintf_void
+    (void)vsprintf((char *)(state->in), format, va);
+    for (len = 0; len < size; len++)
+        if (state->in[len] == 0) break;
+#  else
+    len = vsprintf((char *)(state->in), format, va);
+#  endif
+#else
+#  ifdef HAS_vsnprintf_void
+    (void)vsnprintf((char *)(state->in), size, format, va);
+    len = strlen((char *)(state->in));
+#  else
+    len = vsnprintf((char *)(state->in), size, format, va);
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
+    if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
+        return 0;
+
+    /* update buffer and position, defer compression until needed */
+    strm->avail_in = (unsigned)len;
+    strm->next_in = state->in;
+    state->x.pos += len;
+    return len;
+}
+
+int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
+{
+    va_list va;
+    int ret;
+
+    va_start(va, format);
+    ret = gzvprintf(file, format, va);
+    va_end(va);
+    return ret;
+}
+
+#else /* !STDC && !Z_HAVE_STDARG_H */
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+                       a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+    gzFile file;
+    const char *format;
+    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
+{
+    int size, len;
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that can really pass pointer in ints */
+    if (sizeof(int) != sizeof(void *))
+        return 0;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return 0;
+
+    /* make sure we have some buffer space */
+    if (state->size == 0 && gz_init(state) == -1)
+        return 0;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return 0;
+    }
+
+    /* consume whatever's left in the input buffer */
+    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        return 0;
+
+    /* do the printf() into the input buffer, put length in len */
+    size = (int)(state->size);
+    state->in[size - 1] = 0;
+#ifdef NO_snprintf
+#  ifdef HAS_sprintf_void
+    sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    for (len = 0; len < size; len++)
+        if (state->in[len] == 0) break;
+#  else
+    len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+                  a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#else
+#  ifdef HAS_snprintf_void
+    snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = strlen((char *)(state->in));
+#  else
+    len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6,
+                   a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
+                   a19, a20);
+#  endif
+#endif
+
+    /* check that printf() results fit in buffer */
+    if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
+        return 0;
+
+    /* update buffer and position, defer compression until needed */
+    strm->avail_in = (unsigned)len;
+    strm->next_in = state->in;
+    state->x.pos += len;
+    return len;
+}
+
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzflush(file, flush)
+    gzFile file;
+    int flush;
+{
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return -1;
+    state = (gz_statep)file;
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* check flush parameter */
+    if (flush < 0 || flush > Z_FINISH)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* compress remaining data with requested flush */
+    gz_comp(state, flush);
+    return state->err;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzsetparams(file, level, strategy)
+    gzFile file;
+    int level;
+    int strategy;
+{
+    gz_statep state;
+    z_streamp strm;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+    strm = &(state->strm);
+
+    /* check that we're writing and that there's no error */
+    if (state->mode != GZ_WRITE || state->err != Z_OK)
+        return Z_STREAM_ERROR;
+
+    /* if no change is requested, then do nothing */
+    if (level == state->level && strategy == state->strategy)
+        return Z_OK;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            return -1;
+    }
+
+    /* change compression parameters for subsequent input */
+    if (state->size) {
+        /* flush previous input with previous parameters before changing */
+        if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1)
+            return state->err;
+        deflateParams(strm, level, strategy);
+    }
+    state->level = level;
+    state->strategy = strategy;
+    return Z_OK;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_w(file)
+    gzFile file;
+{
+    int ret = Z_OK;
+    gz_statep state;
+
+    /* get internal structure */
+    if (file == NULL)
+        return Z_STREAM_ERROR;
+    state = (gz_statep)file;
+
+    /* check that we're writing */
+    if (state->mode != GZ_WRITE)
+        return Z_STREAM_ERROR;
+
+    /* check for seek request */
+    if (state->seek) {
+        state->seek = 0;
+        if (gz_zero(state, state->skip) == -1)
+            ret = state->err;
+    }
+
+    /* flush, free memory, and close file */
+    if (gz_comp(state, Z_FINISH) == -1)
+        ret = state->err;
+    if (state->size) {
+        if (!state->direct) {
+            (void)deflateEnd(&(state->strm));
+            free(state->out);
+        }
+        free(state->in);
+    }
+    gz_error(state, Z_OK, NULL);
+    free(state->path);
+    if (close(state->fd) == -1)
+        ret = Z_ERRNO;
+    free(state);
+    return ret;
+}
diff --git a/Source/3rd Party/wx/src/zlib/infback.c b/Source/3rd Party/wx/src/zlib/infback.c
index 1e03e1bab..f3833c2e4 100644
--- a/Source/3rd Party/wx/src/zlib/infback.c	
+++ b/Source/3rd Party/wx/src/zlib/infback.c	
@@ -1,623 +1,640 @@
-/* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
-   This code is largely copied from inflate.c.  Normally either infback.o or
-   inflate.o would be linked into an application--not both.  The interface
-   with inffast.c is retained so that optimized assembler-coded versions of
-   inflate_fast() can be used with either inflate.c or infback.c.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-
-/*
-   strm provides memory allocation functions in zalloc and zfree, or
-   Z_NULL to use the library memory allocation functions.
-
-   windowBits is in the range 8..15, and window is a user-supplied
-   window and output buffer that is 2**windowBits bytes.
- */
-int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
-z_streamp strm;
-int windowBits;
-unsigned char FAR *window;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL || window == Z_NULL ||
-        windowBits < 8 || windowBits > 15)
-        return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
-                                               sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    state->dmax = 32768U;
-    state->wbits = windowBits;
-    state->wsize = 1U << windowBits;
-    state->window = window;
-    state->write = 0;
-    state->whave = 0;
-    return Z_OK;
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-/* Macros for inflateBack(): */
-
-/* Load returned state from inflate_fast() */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Set state from registers for inflate_fast() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Assure that some input is available.  If input is requested, but denied,
-   then return a Z_BUF_ERROR from inflateBack(). */
-#define PULL() \
-    do { \
-        if (have == 0) { \
-            have = in(in_desc, &next); \
-            if (have == 0) { \
-                next = Z_NULL; \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflateBack()
-   with an error if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        PULL(); \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflateBack() with
-   an error. */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Assure that some output space is available, by writing out the window
-   if it's full.  If the write fails, return from inflateBack() with a
-   Z_BUF_ERROR. */
-#define ROOM() \
-    do { \
-        if (left == 0) { \
-            put = state->window; \
-            left = state->wsize; \
-            state->whave = left; \
-            if (out(out_desc, put, left)) { \
-                ret = Z_BUF_ERROR; \
-                goto inf_leave; \
-            } \
-        } \
-    } while (0)
-
-/*
-   strm provides the memory allocation functions and window buffer on input,
-   and provides information on the unused input on return.  For Z_DATA_ERROR
-   returns, strm will also provide an error message.
-
-   in() and out() are the call-back input and output functions.  When
-   inflateBack() needs more input, it calls in().  When inflateBack() has
-   filled the window with output, or when it completes with data in the
-   window, it calls out() to write out the data.  The application must not
-   change the provided input until in() is called again or inflateBack()
-   returns.  The application must not change the window/output buffer until
-   inflateBack() returns.
-
-   in() and out() are called with a descriptor parameter provided in the
-   inflateBack() call.  This parameter can be a structure that provides the
-   information required to do the read or write, as well as accumulated
-   information on the input and output such as totals and check values.
-
-   in() should return zero on failure.  out() should return non-zero on
-   failure.  If either in() or out() fails, than inflateBack() returns a
-   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
-   was in() or out() that caused in the error.  Otherwise,  inflateBack()
-   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
-   error, or Z_MEM_ERROR if it could not allocate memory for the state.
-   inflateBack() can also return Z_STREAM_ERROR if the input parameters
-   are not correct, i.e. strm is Z_NULL or the state was not initialized.
- */
-int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
-z_streamp strm;
-in_func in;
-void FAR *in_desc;
-out_func out;
-void FAR *out_desc;
-{
-    struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code this;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    /* Check that the strm exists and that the state was initialized */
-    if (strm == Z_NULL || strm->state == Z_NULL)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* Reset the state */
-    strm->msg = Z_NULL;
-    state->mode = TYPE;
-    state->last = 0;
-    state->whave = 0;
-    next = strm->next_in;
-    have = next != Z_NULL ? strm->avail_in : 0;
-    hold = 0;
-    bits = 0;
-    put = state->window;
-    left = state->wsize;
-
-    /* Inflate until end of block marked as last */
-    for (;;)
-        switch (state->mode) {
-        case TYPE:
-            /* determine and dispatch block type */
-            if (state->last) {
-                BYTEBITS();
-                state->mode = DONE;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-
-        case STORED:
-            /* get and verify stored block length */
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-
-            /* copy stored block from input to output */
-            while (state->length != 0) {
-                copy = state->length;
-                PULL();
-                ROOM();
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-
-        case TABLE:
-            /* get dynamic table entries descriptor */
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-
-            /* get code length code lengths (not a typo) */
-            state->have = 0;
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-
-            /* get length and distance code code lengths */
-            state->have = 0;
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    this = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (this.val < 16) {
-                    NEEDBITS(this.bits);
-                    DROPBITS(this.bits);
-                    state->lens[state->have++] = this.val;
-                }
-                else {
-                    if (this.val == 16) {
-                        NEEDBITS(this.bits + 2);
-                        DROPBITS(this.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = (unsigned)(state->lens[state->have - 1]);
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (this.val == 17) {
-                        NEEDBITS(this.bits + 3);
-                        DROPBITS(this.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(this.bits + 7);
-                        DROPBITS(this.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* build code tables */
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN;
-
-        case LEN:
-            /* use inflate_fast() if we have enough input and output */
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                if (state->whave < state->wsize)
-                    state->whave = state->wsize - left;
-                inflate_fast(strm, state->wsize);
-                LOAD();
-                break;
-            }
-
-            /* get a literal, length, or end-of-block code */
-            for (;;) {
-                this = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(this.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (this.op && (this.op & 0xf0) == 0) {
-                last = this;
-                for (;;) {
-                    this = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(this.bits);
-            state->length = (unsigned)this.val;
-
-            /* process literal */
-            if (this.op == 0) {
-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", this.val));
-                ROOM();
-                *put++ = (unsigned char)(state->length);
-                left--;
-                state->mode = LEN;
-                break;
-            }
-
-            /* process end of block */
-            if (this.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->mode = TYPE;
-                break;
-            }
-
-            /* invalid code */
-            if (this.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-
-            /* length code -- get extra bits, if any */
-            state->extra = (unsigned)(this.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-
-            /* get distance code */
-            for (;;) {
-                this = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(this.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((this.op & 0xf0) == 0) {
-                last = this;
-                for (;;) {
-                    this = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(this.bits);
-            if (this.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)this.val;
-
-            /* get distance extra bits, if any */
-            state->extra = (unsigned)(this.op) & 15;
-            if (state->extra != 0) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            if (state->offset > state->wsize - (state->whave < state->wsize ?
-                                                left : 0)) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-
-            /* copy match from window to output */
-            do {
-                ROOM();
-                copy = state->wsize - state->offset;
-                if (copy < left) {
-                    from = put + copy;
-                    copy = left - copy;
-                }
-                else {
-                    from = put - state->offset;
-                    copy = left;
-                }
-                if (copy > state->length) copy = state->length;
-                state->length -= copy;
-                left -= copy;
-                do {
-                    *put++ = *from++;
-                } while (--copy);
-            } while (state->length != 0);
-            break;
-
-        case DONE:
-            /* inflate stream terminated properly -- write leftover output */
-            ret = Z_STREAM_END;
-            if (left < state->wsize) {
-                if (out(out_desc, state->window, state->wsize - left))
-                    ret = Z_BUF_ERROR;
-            }
-            goto inf_leave;
-
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-
-        default:                /* can't happen, but makes compilers happy */
-            ret = Z_STREAM_ERROR;
-            goto inf_leave;
-        }
-
-    /* Return unused input */
-  inf_leave:
-    strm->next_in = next;
-    strm->avail_in = have;
-    return ret;
-}
-
-int ZEXPORT inflateBackEnd(strm)
-z_streamp strm;
-{
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
+/* infback.c -- inflate using a call-back interface
+ * Copyright (C) 1995-2011 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+   This code is largely copied from inflate.c.  Normally either infback.o or
+   inflate.o would be linked into an application--not both.  The interface
+   with inffast.c is retained so that optimized assembler-coded versions of
+   inflate_fast() can be used with either inflate.c or infback.c.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+
+/*
+   strm provides memory allocation functions in zalloc and zfree, or
+   Z_NULL to use the library memory allocation functions.
+
+   windowBits is in the range 8..15, and window is a user-supplied
+   window and output buffer that is 2**windowBits bytes.
+ */
+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
+z_streamp strm;
+int windowBits;
+unsigned char FAR *window;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL || window == Z_NULL ||
+        windowBits < 8 || windowBits > 15)
+        return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+    strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
+                                               sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->dmax = 32768U;
+    state->wbits = windowBits;
+    state->wsize = 1U << windowBits;
+    state->window = window;
+    state->wnext = 0;
+    state->whave = 0;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+/* Macros for inflateBack(): */
+
+/* Load returned state from inflate_fast() */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Set state from registers for inflate_fast() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Assure that some input is available.  If input is requested, but denied,
+   then return a Z_BUF_ERROR from inflateBack(). */
+#define PULL() \
+    do { \
+        if (have == 0) { \
+            have = in(in_desc, &next); \
+            if (have == 0) { \
+                next = Z_NULL; \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflateBack()
+   with an error if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        PULL(); \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflateBack() with
+   an error. */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Assure that some output space is available, by writing out the window
+   if it's full.  If the write fails, return from inflateBack() with a
+   Z_BUF_ERROR. */
+#define ROOM() \
+    do { \
+        if (left == 0) { \
+            put = state->window; \
+            left = state->wsize; \
+            state->whave = left; \
+            if (out(out_desc, put, left)) { \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/*
+   strm provides the memory allocation functions and window buffer on input,
+   and provides information on the unused input on return.  For Z_DATA_ERROR
+   returns, strm will also provide an error message.
+
+   in() and out() are the call-back input and output functions.  When
+   inflateBack() needs more input, it calls in().  When inflateBack() has
+   filled the window with output, or when it completes with data in the
+   window, it calls out() to write out the data.  The application must not
+   change the provided input until in() is called again or inflateBack()
+   returns.  The application must not change the window/output buffer until
+   inflateBack() returns.
+
+   in() and out() are called with a descriptor parameter provided in the
+   inflateBack() call.  This parameter can be a structure that provides the
+   information required to do the read or write, as well as accumulated
+   information on the input and output such as totals and check values.
+
+   in() should return zero on failure.  out() should return non-zero on
+   failure.  If either in() or out() fails, than inflateBack() returns a
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.
+ */
+int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
+z_streamp strm;
+in_func in;
+void FAR *in_desc;
+out_func out;
+void FAR *out_desc;
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    /* Check that the strm exists and that the state was initialized */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* Reset the state */
+    strm->msg = Z_NULL;
+    state->mode = TYPE;
+    state->last = 0;
+    state->whave = 0;
+    next = strm->next_in;
+    have = next != Z_NULL ? strm->avail_in : 0;
+    hold = 0;
+    bits = 0;
+    put = state->window;
+    left = state->wsize;
+
+    /* Inflate until end of block marked as last */
+    for (;;)
+        switch (state->mode) {
+        case TYPE:
+            /* determine and dispatch block type */
+            if (state->last) {
+                BYTEBITS();
+                state->mode = DONE;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+
+        case STORED:
+            /* get and verify stored block length */
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+
+            /* copy stored block from input to output */
+            while (state->length != 0) {
+                copy = state->length;
+                PULL();
+                ROOM();
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+
+        case TABLE:
+            /* get dynamic table entries descriptor */
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+
+            /* get code length code lengths (not a typo) */
+            state->have = 0;
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+
+            /* get length and distance code code lengths */
+            state->have = 0;
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = (unsigned)(state->lens[state->have - 1]);
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+
+        case LEN:
+            /* use inflate_fast() if we have enough input and output */
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                if (state->whave < state->wsize)
+                    state->whave = state->wsize - left;
+                inflate_fast(strm, state->wsize);
+                LOAD();
+                break;
+            }
+
+            /* get a literal, length, or end-of-block code */
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            state->length = (unsigned)here.val;
+
+            /* process literal */
+            if (here.op == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                ROOM();
+                *put++ = (unsigned char)(state->length);
+                left--;
+                state->mode = LEN;
+                break;
+            }
+
+            /* process end of block */
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+
+            /* invalid code */
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+
+            /* length code -- get extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+
+            /* get distance code */
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+
+            /* get distance extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            if (state->offset > state->wsize - (state->whave < state->wsize ?
+                                                left : 0)) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+
+            /* copy match from window to output */
+            do {
+                ROOM();
+                copy = state->wsize - state->offset;
+                if (copy < left) {
+                    from = put + copy;
+                    copy = left - copy;
+                }
+                else {
+                    from = put - state->offset;
+                    copy = left;
+                }
+                if (copy > state->length) copy = state->length;
+                state->length -= copy;
+                left -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+            } while (state->length != 0);
+            break;
+
+        case DONE:
+            /* inflate stream terminated properly -- write leftover output */
+            ret = Z_STREAM_END;
+            if (left < state->wsize) {
+                if (out(out_desc, state->window, state->wsize - left))
+                    ret = Z_BUF_ERROR;
+            }
+            goto inf_leave;
+
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+
+        default:                /* can't happen, but makes compilers happy */
+            ret = Z_STREAM_ERROR;
+            goto inf_leave;
+        }
+
+    /* Return unused input */
+  inf_leave:
+    strm->next_in = next;
+    strm->avail_in = have;
+    return ret;
+}
+
+int ZEXPORT inflateBackEnd(strm)
+z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
diff --git a/Source/3rd Party/wx/src/zlib/inffast.c b/Source/3rd Party/wx/src/zlib/inffast.c
index fa31cad90..bda59ceb6 100644
--- a/Source/3rd Party/wx/src/zlib/inffast.c	
+++ b/Source/3rd Party/wx/src/zlib/inffast.c	
@@ -1,318 +1,340 @@
-/* inffast.c -- fast decoding
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifndef ASMINF
-
-/* Allow machine dependent optimization for post-increment or pre-increment.
-   Based on testing to date,
-   Pre-increment preferred for:
-   - PowerPC G3 (Adler)
-   - MIPS R5000 (Randers-Pehrson)
-   Post-increment preferred for:
-   - none
-   No measurable difference:
-   - Pentium III (Anderson)
-   - M68060 (Nikl)
- */
-#ifdef POSTINC
-#  define OFF 0
-#  define PUP(a) *(a)++
-#else
-#  define OFF 1
-#  define PUP(a) *++(a)
-#endif
-
-/*
-   Decode literal, length, and distance codes and write out the resulting
-   literal and match bytes until either not enough input or output is
-   available, an end-of-block is encountered, or a data error is encountered.
-   When large enough input and output buffers are supplied to inflate(), for
-   example, a 16K input buffer and a 64K output buffer, more than 95% of the
-   inflate execution time is spent in this routine.
-
-   Entry assumptions:
-
-        state->mode == LEN
-        strm->avail_in >= 6
-        strm->avail_out >= 258
-        start >= strm->avail_out
-        state->bits < 8
-
-   On return, state->mode is one of:
-
-        LEN -- ran out of enough output space or enough available input
-        TYPE -- reached end of block code, inflate() to interpret next block
-        BAD -- error in block data
-
-   Notes:
-
-    - The maximum input bits used by a length/distance pair is 15 bits for the
-      length code, 5 bits for the length extra, 15 bits for the distance code,
-      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
-      Therefore if strm->avail_in >= 6, then there is enough input to avoid
-      checking for available input while decoding.
-
-    - The maximum bytes that a single length/distance pair can output is 258
-      bytes, which is the maximum length that can be coded.  inflate_fast()
-      requires strm->avail_out >= 258 for each loop to avoid checking for
-      output space.
- */
-void inflate_fast(strm, start)
-z_streamp strm;
-unsigned start;         /* inflate()'s starting value for strm->avail_out */
-{
-    struct inflate_state FAR *state;
-    unsigned char FAR *in;      /* local strm->next_in */
-    unsigned char FAR *last;    /* while in < last, enough input available */
-    unsigned char FAR *out;     /* local strm->next_out */
-    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
-    unsigned char FAR *end;     /* while out < end, enough space available */
-#ifdef INFLATE_STRICT
-    unsigned dmax;              /* maximum distance from zlib header */
-#endif
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned write;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
-    unsigned long hold;         /* local strm->hold */
-    unsigned bits;              /* local strm->bits */
-    code const FAR *lcode;      /* local strm->lencode */
-    code const FAR *dcode;      /* local strm->distcode */
-    unsigned lmask;             /* mask for first level of length codes */
-    unsigned dmask;             /* mask for first level of distance codes */
-    code this;                  /* retrieved table entry */
-    unsigned op;                /* code bits, operation, extra bits, or */
-                                /*  window position, window bytes to copy */
-    unsigned len;               /* match length, unused bytes */
-    unsigned dist;              /* match distance */
-    unsigned char FAR *from;    /* where to copy match from */
-
-    /* copy state to local variables */
-    state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in - OFF;
-    last = in + (strm->avail_in - 5);
-    out = strm->next_out - OFF;
-    beg = out - (start - strm->avail_out);
-    end = out + (strm->avail_out - 257);
-#ifdef INFLATE_STRICT
-    dmax = state->dmax;
-#endif
-    wsize = state->wsize;
-    whave = state->whave;
-    write = state->write;
-    window = state->window;
-    hold = state->hold;
-    bits = state->bits;
-    lcode = state->lencode;
-    dcode = state->distcode;
-    lmask = (1U << state->lenbits) - 1;
-    dmask = (1U << state->distbits) - 1;
-
-    /* decode literals and length/distances until end-of-block or not enough
-       input data or output space */
-    do {
-        if (bits < 15) {
-            hold += (unsigned long)(PUP(in)) << bits;
-            bits += 8;
-            hold += (unsigned long)(PUP(in)) << bits;
-            bits += 8;
-        }
-        this = lcode[hold & lmask];
-      dolen:
-        op = (unsigned)(this.bits);
-        hold >>= op;
-        bits -= op;
-        op = (unsigned)(this.op);
-        if (op == 0) {                          /* literal */
-            Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-                    "inflate:         literal '%c'\n" :
-                    "inflate:         literal 0x%02x\n", this.val));
-            PUP(out) = (unsigned char)(this.val);
-        }
-        else if (op & 16) {                     /* length base */
-            len = (unsigned)(this.val);
-            op &= 15;                           /* number of extra bits */
-            if (op) {
-                if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
-                    bits += 8;
-                }
-                len += (unsigned)hold & ((1U << op) - 1);
-                hold >>= op;
-                bits -= op;
-            }
-            Tracevv((stderr, "inflate:         length %u\n", len));
-            if (bits < 15) {
-                hold += (unsigned long)(PUP(in)) << bits;
-                bits += 8;
-                hold += (unsigned long)(PUP(in)) << bits;
-                bits += 8;
-            }
-            this = dcode[hold & dmask];
-          dodist:
-            op = (unsigned)(this.bits);
-            hold >>= op;
-            bits -= op;
-            op = (unsigned)(this.op);
-            if (op & 16) {                      /* distance base */
-                dist = (unsigned)(this.val);
-                op &= 15;                       /* number of extra bits */
-                if (bits < op) {
-                    hold += (unsigned long)(PUP(in)) << bits;
-                    bits += 8;
-                    if (bits < op) {
-                        hold += (unsigned long)(PUP(in)) << bits;
-                        bits += 8;
-                    }
-                }
-                dist += (unsigned)hold & ((1U << op) - 1);
-#ifdef INFLATE_STRICT
-                if (dist > dmax) {
-                    strm->msg = (char *)"invalid distance too far back";
-                    state->mode = BAD;
-                    break;
-                }
-#endif
-                hold >>= op;
-                bits -= op;
-                Tracevv((stderr, "inflate:         distance %u\n", dist));
-                op = (unsigned)(out - beg);     /* max distance in output */
-                if (dist > op) {                /* see if copy from window */
-                    op = dist - op;             /* distance back in window */
-                    if (op > whave) {
-                        strm->msg = (char *)"invalid distance too far back";
-                        state->mode = BAD;
-                        break;
-                    }
-                    from = window - OFF;
-                    if (write == 0) {           /* very common case */
-                        from += wsize - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    else if (write < op) {      /* wrap around window */
-                        from += wsize + write - op;
-                        op -= write;
-                        if (op < len) {         /* some from end of window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = window - OFF;
-                            if (write < len) {  /* some from start of window */
-                                op = write;
-                                len -= op;
-                                do {
-                                    PUP(out) = PUP(from);
-                                } while (--op);
-                                from = out - dist;      /* rest from output */
-                            }
-                        }
-                    }
-                    else {                      /* contiguous in window */
-                        from += write - op;
-                        if (op < len) {         /* some from window */
-                            len -= op;
-                            do {
-                                PUP(out) = PUP(from);
-                            } while (--op);
-                            from = out - dist;  /* rest from output */
-                        }
-                    }
-                    while (len > 2) {
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    }
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(from);
-                    }
-                }
-                else {
-                    from = out - dist;          /* copy direct from output */
-                    do {                        /* minimum length is three */
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        len -= 3;
-                    } while (len > 2);
-                    if (len) {
-                        PUP(out) = PUP(from);
-                        if (len > 1)
-                            PUP(out) = PUP(from);
-                    }
-                }
-            }
-            else if ((op & 64) == 0) {          /* 2nd level distance code */
-                this = dcode[this.val + (hold & ((1U << op) - 1))];
-                goto dodist;
-            }
-            else {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-        }
-        else if ((op & 64) == 0) {              /* 2nd level length code */
-            this = lcode[this.val + (hold & ((1U << op) - 1))];
-            goto dolen;
-        }
-        else if (op & 32) {                     /* end-of-block */
-            Tracevv((stderr, "inflate:         end of block\n"));
-            state->mode = TYPE;
-            break;
-        }
-        else {
-            strm->msg = (char *)"invalid literal/length code";
-            state->mode = BAD;
-            break;
-        }
-    } while (in < last && out < end);
-
-    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
-    len = bits >> 3;
-    in -= len;
-    bits -= len << 3;
-    hold &= (1U << bits) - 1;
-
-    /* update state and return */
-    strm->next_in = in + OFF;
-    strm->next_out = out + OFF;
-    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
-    strm->avail_out = (unsigned)(out < end ?
-                                 257 + (end - out) : 257 - (out - end));
-    state->hold = hold;
-    state->bits = bits;
-    return;
-}
-
-/*
-   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
-   - Using bit fields for code structure
-   - Different op definition to avoid & for extra bits (do & for table bits)
-   - Three separate decoding do-loops for direct, window, and write == 0
-   - Special case for distance > 1 copies to do overlapped load and store copy
-   - Explicit branch predictions (based on measured branch probabilities)
-   - Deferring match copy and interspersed it with decoding subsequent codes
-   - Swapping literal/length else
-   - Swapping window/direct else
-   - Larger unrolled copy loops (three is about right)
-   - Moving len -= 3 statement into middle of loop
- */
-
-#endif /* !ASMINF */
+/* inffast.c -- fast decoding
+ * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifndef ASMINF
+
+/* Allow machine dependent optimization for post-increment or pre-increment.
+   Based on testing to date,
+   Pre-increment preferred for:
+   - PowerPC G3 (Adler)
+   - MIPS R5000 (Randers-Pehrson)
+   Post-increment preferred for:
+   - none
+   No measurable difference:
+   - Pentium III (Anderson)
+   - M68060 (Nikl)
+ */
+#ifdef POSTINC
+#  define OFF 0
+#  define PUP(a) *(a)++
+#else
+#  define OFF 1
+#  define PUP(a) *++(a)
+#endif
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void ZLIB_INTERNAL inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    unsigned long hold;         /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code here;                  /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in - OFF;
+    last = in + (strm->avail_in - 5);
+    out = strm->next_out - OFF;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - 257);
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    wnext = state->wnext;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+        if (bits < 15) {
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+            hold += (unsigned long)(PUP(in)) << bits;
+            bits += 8;
+        }
+        here = lcode[hold & lmask];
+      dolen:
+        op = (unsigned)(here.bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(here.op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here.val));
+            PUP(out) = (unsigned char)(here.val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(here.val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                }
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+            if (bits < 15) {
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+                hold += (unsigned long)(PUP(in)) << bits;
+                bits += 8;
+            }
+            here = dcode[hold & dmask];
+          dodist:
+            op = (unsigned)(here.bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(here.op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(here.val);
+                op &= 15;                       /* number of extra bits */
+                if (bits < op) {
+                    hold += (unsigned long)(PUP(in)) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(PUP(in)) << bits;
+                        bits += 8;
+                    }
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        if (state->sane) {
+                            strm->msg =
+                                (char *)"invalid distance too far back";
+                            state->mode = BAD;
+                            break;
+                        }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        if (len <= op - whave) {
+                            do {
+                                PUP(out) = 0;
+                            } while (--len);
+                            continue;
+                        }
+                        len -= op - whave;
+                        do {
+                            PUP(out) = 0;
+                        } while (--op > whave);
+                        if (op == 0) {
+                            from = out - dist;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--len);
+                            continue;
+                        }
+#endif
+                    }
+                    from = window - OFF;
+                    if (wnext == 0) {           /* very common case */
+                        from += wsize - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    else if (wnext < op) {      /* wrap around window */
+                        from += wsize + wnext - op;
+                        op -= wnext;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = window - OFF;
+                            if (wnext < len) {  /* some from start of window */
+                                op = wnext;
+                                len -= op;
+                                do {
+                                    PUP(out) = PUP(from);
+                                } while (--op);
+                                from = out - dist;      /* rest from output */
+                            }
+                        }
+                    }
+                    else {                      /* contiguous in window */
+                        from += wnext - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                PUP(out) = PUP(from);
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    while (len > 2) {
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    }
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+                else {
+                    from = out - dist;          /* copy direct from output */
+                    do {                        /* minimum length is three */
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        PUP(out) = PUP(from);
+                        len -= 3;
+                    } while (len > 2);
+                    if (len) {
+                        PUP(out) = PUP(from);
+                        if (len > 1)
+                            PUP(out) = PUP(from);
+                    }
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                here = dcode[here.val + (hold & ((1U << op) - 1))];
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            here = lcode[here.val + (hold & ((1U << op) - 1))];
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in + OFF;
+    strm->next_out = out + OFF;
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+                                 257 + (end - out) : 257 - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+    return;
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and wnext == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */
diff --git a/Source/3rd Party/wx/src/zlib/inffast.h b/Source/3rd Party/wx/src/zlib/inffast.h
index 614fa7877..e5c1aa4ca 100644
--- a/Source/3rd Party/wx/src/zlib/inffast.h	
+++ b/Source/3rd Party/wx/src/zlib/inffast.h	
@@ -1,11 +1,11 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2003 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-void inflate_fast OF((z_streamp strm, unsigned start));
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2003, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));
diff --git a/Source/3rd Party/wx/src/zlib/inffixed.h b/Source/3rd Party/wx/src/zlib/inffixed.h
index 423d5c5b5..d62832776 100644
--- a/Source/3rd Party/wx/src/zlib/inffixed.h	
+++ b/Source/3rd Party/wx/src/zlib/inffixed.h	
@@ -1,94 +1,94 @@
-    /* inffixed.h -- table for decoding fixed codes
-     * Generated automatically by makefixed().
-     */
-
-    /* WARNING: this file should *not* be used by applications. It
-       is part of the implementation of the compression library and
-       is subject to change. Applications should only use zlib.h.
-     */
-
-    static const code lenfix[512] = {
-        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
-        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
-        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
-        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
-        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
-        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
-        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
-        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
-        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
-        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
-        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
-        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
-        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
-        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
-        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
-        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
-        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
-        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
-        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
-        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
-        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
-        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
-        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
-        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
-        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
-        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
-        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
-        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
-        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
-        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
-        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
-        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
-        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
-        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
-        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
-        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
-        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
-        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
-        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
-        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
-        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
-        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
-        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
-        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
-        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
-        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
-        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
-        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
-        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
-        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
-        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
-        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
-        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
-        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
-        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
-        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
-        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
-        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
-        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
-        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
-        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
-        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
-        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
-        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
-        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
-        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
-        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
-        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
-        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
-        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
-        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
-        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
-        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
-        {0,9,255}
-    };
-
-    static const code distfix[32] = {
-        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
-        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
-        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
-        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
-        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
-        {22,5,193},{64,5,0}
-    };
+    /* inffixed.h -- table for decoding fixed codes
+     * Generated automatically by makefixed().
+     */
+
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
+     */
+
+    static const code lenfix[512] = {
+        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
+        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
+        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
+        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
+        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
+        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
+        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
+        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
+        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
+        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
+        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
+        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
+        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
+        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
+        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
+        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
+        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
+        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
+        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
+        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
+        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
+        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
+        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
+        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
+        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
+        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
+        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
+        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
+        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
+        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
+        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
+        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
+        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
+        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
+        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
+        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
+        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
+        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
+        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
+        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
+        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
+        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
+        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
+        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
+        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
+        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
+        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
+        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
+        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
+        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
+        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
+        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
+        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
+        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
+        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
+        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
+        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
+        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
+        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
+        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
+        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
+        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
+        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
+        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
+        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
+        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
+        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
+        {0,9,255}
+    };
+
+    static const code distfix[32] = {
+        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
+        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
+        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
+        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
+        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
+        {22,5,193},{64,5,0}
+    };
diff --git a/Source/3rd Party/wx/src/zlib/inflate.c b/Source/3rd Party/wx/src/zlib/inflate.c
index 33ea90292..870f89bb4 100644
--- a/Source/3rd Party/wx/src/zlib/inflate.c	
+++ b/Source/3rd Party/wx/src/zlib/inflate.c	
@@ -1,1368 +1,1512 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * Change history:
- *
- * 1.2.beta0    24 Nov 2002
- * - First version -- complete rewrite of inflate to simplify code, avoid
- *   creation of window when not needed, minimize use of window when it is
- *   needed, make inffast.c even faster, implement gzip decoding, and to
- *   improve code readability and style over the previous zlib inflate code
- *
- * 1.2.beta1    25 Nov 2002
- * - Use pointers for available input and output checking in inffast.c
- * - Remove input and output counters in inffast.c
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
- * - Remove unnecessary second byte pull from length extra in inffast.c
- * - Unroll direct copy to three copies per loop in inffast.c
- *
- * 1.2.beta2    4 Dec 2002
- * - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
- * - Make hbuf[] unsigned char to match parameter type in inflate.c
- * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
- *   to avoid negation problem on Alphas (64 bit) in inflate.c
- *
- * 1.2.beta3    22 Dec 2002
- * - Add comments on state->bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
- * - Fix bug in reuse of allocated window after inflateReset()
- * - Remove bit fields--back to byte structure for speed
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
- * - Use local copies of stream next and avail values, as well as local bit
- *   buffer and bit count in inflate()--for speed when inflate_fast() not used
- *
- * 1.2.beta4    1 Jan 2003
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
- * - Move a comment on output buffer sizes from inffast.c to inflate.c
- * - Add comments in inffast.c to introduce the inflate_fast() routine
- * - Rearrange window copies in inflate_fast() for speed and simplification
- * - Unroll last copy for window match in inflate_fast()
- * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common write == 0 case for speed in inflate_fast()
- * - Make op and len in inflate_fast() unsigned for consistency
- * - Add FAR to lcode and dcode declarations in inflate_fast()
- * - Simplified bad distance check in inflate_fast()
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
- *   source file infback.c to provide a call-back interface to inflate for
- *   programs like gzip and unzip -- uses window as output buffer to avoid
- *   window copying
- *
- * 1.2.beta5    1 Jan 2003
- * - Improved inflateBack() interface to allow the caller to provide initial
- *   input in strm.
- * - Fixed stored blocks bug in inflateBack()
- *
- * 1.2.beta6    4 Jan 2003
- * - Added comments in inffast.c on effectiveness of POSTINC
- * - Typecasting all around to reduce compiler warnings
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
- *   make compilers happy
- * - Changed type of window in inflateBackInit() to unsigned char *
- *
- * 1.2.beta7    27 Jan 2003
- * - Changed many types to unsigned or unsigned short to avoid warnings
- * - Added inflateCopy() function
- *
- * 1.2.0        9 Mar 2003
- * - Changed inflateBack() interface to provide separate opaque descriptors
- *   for the in() and out() functions
- * - Changed inflateBack() argument and in_func typedef to swap the length
- *   and buffer address return values for the input function
- * - Check next_in and next_out for Z_NULL on entry to inflate()
- *
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef MAKEFIXED
-#  ifndef BUILDFIXED
-#    define BUILDFIXED
-#  endif
-#endif
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, unsigned out));
-#ifdef BUILDFIXED
-   void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
-                              unsigned len));
-
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    strm->total_in = strm->total_out = state->total = 0;
-    strm->msg = Z_NULL;
-    strm->adler = 1;        /* to support ill-conceived Java test suite */
-    state->mode = HEAD;
-    state->last = 0;
-    state->havedict = 0;
-    state->dmax = 32768U;
-    state->head = Z_NULL;
-    state->wsize = 0;
-    state->whave = 0;
-    state->write = 0;
-    state->hold = 0;
-    state->bits = 0;
-    state->lencode = state->distcode = state->next = state->codes;
-    Tracev((stderr, "inflate: reset\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
-    value &= (1L << bits) - 1;
-    state->hold += value << state->bits;
-    state->bits += bits;
-    return Z_OK;
-}
-
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
-    struct inflate_state FAR *state;
-
-    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-        stream_size != (int)(sizeof(z_stream)))
-        return Z_VERSION_ERROR;
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-    strm->msg = Z_NULL;                 /* in case we return an error */
-    if (strm->zalloc == (alloc_func)0) {
-        strm->zalloc = zcalloc;
-        strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-    state = (struct inflate_state FAR *)
-            ZALLOC(strm, 1, sizeof(struct inflate_state));
-    if (state == Z_NULL) return Z_MEM_ERROR;
-    Tracev((stderr, "inflate: allocated\n"));
-    strm->state = (struct internal_state FAR *)state;
-    if (windowBits < 0) {
-        state->wrap = 0;
-        windowBits = -windowBits;
-    }
-    else {
-        state->wrap = (windowBits >> 4) + 1;
-#ifdef GUNZIP
-        if (windowBits < 48) windowBits &= 15;
-#endif
-    }
-    if (windowBits < 8 || windowBits > 15) {
-        ZFREE(strm, state);
-        strm->state = Z_NULL;
-        return Z_STREAM_ERROR;
-    }
-    state->wbits = (unsigned)windowBits;
-    state->window = Z_NULL;
-    return inflateReset(strm);
-}
-
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
-    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-}
-
-/*
-   Return state with length and distance decoding tables and index sizes set to
-   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
-   If BUILDFIXED is defined, then instead this routine builds the tables the
-   first time it's called, and returns those tables the first time and
-   thereafter.  This reduces the size of the code by about 2K bytes, in
-   exchange for a little execution time.  However, BUILDFIXED should not be
-   used for threaded applications, since the rewriting of the tables and virgin
-   may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
-    static int virgin = 1;
-    static code *lenfix, *distfix;
-    static code fixed[544];
-
-    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin) {
-        unsigned sym, bits;
-        static code *next;
-
-        /* literal/length table */
-        sym = 0;
-        while (sym < 144) state->lens[sym++] = 8;
-        while (sym < 256) state->lens[sym++] = 9;
-        while (sym < 280) state->lens[sym++] = 7;
-        while (sym < 288) state->lens[sym++] = 8;
-        next = fixed;
-        lenfix = next;
-        bits = 9;
-        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
-        /* distance table */
-        sym = 0;
-        while (sym < 32) state->lens[sym++] = 5;
-        distfix = next;
-        bits = 5;
-        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
-        /* do this just once */
-        virgin = 0;
-    }
-#else /* !BUILDFIXED */
-#   include "inffixed.h"
-#endif /* BUILDFIXED */
-    state->lencode = lenfix;
-    state->lenbits = 9;
-    state->distcode = distfix;
-    state->distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
-   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
-   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
-   those tables to stdout, which would be piped to inffixed.h.  A small program
-   can simply call makefixed to do this:
-
-    void makefixed(void);
-
-    int main(void)
-    {
-        makefixed();
-        return 0;
-    }
-
-   Then that can be linked with zlib built with MAKEFIXED defined and run:
-
-    a.out > inffixed.h
- */
-void makefixed()
-{
-    unsigned low, size;
-    struct inflate_state state;
-
-    fixedtables(&state);
-    puts("    /* inffixed.h -- table for decoding fixed codes");
-    puts("     * Generated automatically by makefixed().");
-    puts("     */");
-    puts("");
-    puts("    /* WARNING: this file should *not* be used by applications.");
-    puts("       It is part of the implementation of this library and is");
-    puts("       subject to change. Applications should only use zlib.h.");
-    puts("     */");
-    puts("");
-    size = 1U << 9;
-    printf("    static const code lenfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
-               state.lencode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-    size = 1U << 5;
-    printf("\n    static const code distfix[%u] = {", size);
-    low = 0;
-    for (;;) {
-        if ((low % 6) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
-               state.distcode[low].val);
-        if (++low == size) break;
-        putchar(',');
-    }
-    puts("\n    };");
-}
-#endif /* MAKEFIXED */
-
-/*
-   Update the window with the last wsize (normally 32K) bytes written before
-   returning.  If window does not exist yet, create it.  This is only called
-   when a window is already in use, or when output has been written during this
-   inflate call, but the end of the deflate stream has not been reached yet.
-   It is also called to create a window for dictionary data when a dictionary
-   is loaded.
-
-   Providing output buffers larger than 32K to inflate() should provide a speed
-   advantage, since only the last 32K of output is copied to the sliding window
-   upon return from inflate(), and since all distances after the first 32K of
-   output will fall in the output data, making match copies simpler and faster.
-   The advantage may be dependent on the size of the processor's data caches.
- */
-local int updatewindow(strm, out)
-z_streamp strm;
-unsigned out;
-{
-    struct inflate_state FAR *state;
-    unsigned copy, dist;
-
-    state = (struct inflate_state FAR *)strm->state;
-
-    /* if it hasn't been done already, allocate space for the window */
-    if (state->window == Z_NULL) {
-        state->window = (unsigned char FAR *)
-                        ZALLOC(strm, 1U << state->wbits,
-                               sizeof(unsigned char));
-        if (state->window == Z_NULL) return 1;
-    }
-
-    /* if window not in use yet, initialize */
-    if (state->wsize == 0) {
-        state->wsize = 1U << state->wbits;
-        state->write = 0;
-        state->whave = 0;
-    }
-
-    /* copy state->wsize or less output bytes into the circular window */
-    copy = out - strm->avail_out;
-    if (copy >= state->wsize) {
-        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
-        state->write = 0;
-        state->whave = state->wsize;
-    }
-    else {
-        dist = state->wsize - state->write;
-        if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->write, strm->next_out - copy, dist);
-        copy -= dist;
-        if (copy) {
-            zmemcpy(state->window, strm->next_out - copy, copy);
-            state->write = copy;
-            state->whave = state->wsize;
-        }
-        else {
-            state->write += dist;
-            if (state->write == state->wsize) state->write = 0;
-            if (state->whave < state->wsize) state->whave += dist;
-        }
-    }
-    return 0;
-}
-
-/* Macros for inflate(): */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-#  define UPDATE(check, buf, len) \
-    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-#  define UPDATE(check, buf, len) adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-#  define CRC2(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        check = crc32(check, hbuf, 2); \
-    } while (0)
-
-#  define CRC4(check, word) \
-    do { \
-        hbuf[0] = (unsigned char)(word); \
-        hbuf[1] = (unsigned char)((word) >> 8); \
-        hbuf[2] = (unsigned char)((word) >> 16); \
-        hbuf[3] = (unsigned char)((word) >> 24); \
-        check = crc32(check, hbuf, 4); \
-    } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
-    do { \
-        put = strm->next_out; \
-        left = strm->avail_out; \
-        next = strm->next_in; \
-        have = strm->avail_in; \
-        hold = state->hold; \
-        bits = state->bits; \
-    } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
-    do { \
-        strm->next_out = put; \
-        strm->avail_out = left; \
-        strm->next_in = next; \
-        strm->avail_in = have; \
-        state->hold = hold; \
-        state->bits = bits; \
-    } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
-    do { \
-        hold = 0; \
-        bits = 0; \
-    } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflate()
-   if there is no input available. */
-#define PULLBYTE() \
-    do { \
-        if (have == 0) goto inf_leave; \
-        have--; \
-        hold += (unsigned long)(*next++) << bits; \
-        bits += 8; \
-    } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator.  If there is
-   not enough available input to do that, then return from inflate(). */
-#define NEEDBITS(n) \
-    do { \
-        while (bits < (unsigned)(n)) \
-            PULLBYTE(); \
-    } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
-    ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
-    do { \
-        hold >>= (n); \
-        bits -= (unsigned)(n); \
-    } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
-    do { \
-        hold >>= bits & 7; \
-        bits -= bits & 7; \
-    } while (0)
-
-/* Reverse the bytes in a 32-bit value */
-#define REVERSE(q) \
-    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
-/*
-   inflate() uses a state machine to process as much input data and generate as
-   much output data as possible before returning.  The state machine is
-   structured roughly as follows:
-
-    for (;;) switch (state) {
-    ...
-    case STATEn:
-        if (not enough input data or output space to make progress)
-            return;
-        ... make progress ...
-        state = STATEm;
-        break;
-    ...
-    }
-
-   so when inflate() is called again, the same case is attempted again, and
-   if the appropriate resources are provided, the machine proceeds to the
-   next state.  The NEEDBITS() macro is usually the way the state evaluates
-   whether it can proceed or should return.  NEEDBITS() does the return if
-   the requested bits are not available.  The typical use of the BITS macros
-   is:
-
-        NEEDBITS(n);
-        ... do something with BITS(n) ...
-        DROPBITS(n);
-
-   where NEEDBITS(n) either returns from inflate() if there isn't enough
-   input left to load n bits into the accumulator, or it continues.  BITS(n)
-   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
-   the low n bits off the accumulator.  INITBITS() clears the accumulator
-   and sets the number of available bits to zero.  BYTEBITS() discards just
-   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
-   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
-   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
-   if there is no input available.  The decoding of variable length codes uses
-   PULLBYTE() directly in order to pull just enough bytes to decode the next
-   code, and no more.
-
-   Some states loop until they get enough input, making sure that enough
-   state information is maintained to continue the loop where it left off
-   if NEEDBITS() returns in the loop.  For example, want, need, and keep
-   would all have to actually be part of the saved state in case NEEDBITS()
-   returns:
-
-    case STATEw:
-        while (want < need) {
-            NEEDBITS(n);
-            keep[want++] = BITS(n);
-            DROPBITS(n);
-        }
-        state = STATEx;
-    case STATEx:
-
-   As shown above, if the next state is also the next case, then the break
-   is omitted.
-
-   A state may also return if there is not enough output space available to
-   complete that state.  Those states are copying stored data, writing a
-   literal byte, and copying a matching string.
-
-   When returning, a "goto inf_leave" is used to update the total counters,
-   update the check value, and determine whether any progress has been made
-   during that inflate() call in order to return the proper return code.
-   Progress is defined as a change in either strm->avail_in or strm->avail_out.
-   When there is a window, goto inf_leave will update the window with the last
-   output written.  If a goto inf_leave occurs in the middle of decompression
-   and there is no window currently, goto inf_leave will create one and copy
-   output to the window for the next call of inflate().
-
-   In this implementation, the flush parameter of inflate() only affects the
-   return code (per zlib.h).  inflate() always writes as much as possible to
-   strm->next_out, given the space available and the provided input--the effect
-   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
-   the allocation of and copying into a sliding window until necessary, which
-   provides the effect documented in zlib.h for Z_FINISH when the entire input
-   stream available.  So the only thing the flush parameter actually does is:
-   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
-   will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
-    struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
-    unsigned char FAR *put;     /* next output */
-    unsigned have, left;        /* available input and output */
-    unsigned long hold;         /* bit buffer */
-    unsigned bits;              /* bits in bit buffer */
-    unsigned in, out;           /* save starting available input and output */
-    unsigned copy;              /* number of stored or match bytes to copy */
-    unsigned char FAR *from;    /* where to copy match bytes from */
-    code this;                  /* current decoding table entry */
-    code last;                  /* parent table entry */
-    unsigned len;               /* length to copy for repeats, bits to drop */
-    int ret;                    /* return code */
-#ifdef GUNZIP
-    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
-#endif
-    static const unsigned short order[19] = /* permutation of code lengths */
-        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0))
-        return Z_STREAM_ERROR;
-
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
-    LOAD();
-    in = have;
-    out = left;
-    ret = Z_OK;
-    for (;;)
-        switch (state->mode) {
-        case HEAD:
-            if (state->wrap == 0) {
-                state->mode = TYPEDO;
-                break;
-            }
-            NEEDBITS(16);
-#ifdef GUNZIP
-            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
-                state->check = crc32(0L, Z_NULL, 0);
-                CRC2(state->check, hold);
-                INITBITS();
-                state->mode = FLAGS;
-                break;
-            }
-            state->flags = 0;           /* expect zlib header */
-            if (state->head != Z_NULL)
-                state->head->done = -1;
-            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
-#else
-            if (
-#endif
-                ((BITS(8) << 8) + (hold >> 8)) % 31) {
-                strm->msg = (char *)"incorrect header check";
-                state->mode = BAD;
-                break;
-            }
-            if (BITS(4) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            DROPBITS(4);
-            len = BITS(4) + 8;
-            if (len > state->wbits) {
-                strm->msg = (char *)"invalid window size";
-                state->mode = BAD;
-                break;
-            }
-            state->dmax = 1U << len;
-            Tracev((stderr, "inflate:   zlib header ok\n"));
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = hold & 0x200 ? DICTID : TYPE;
-            INITBITS();
-            break;
-#ifdef GUNZIP
-        case FLAGS:
-            NEEDBITS(16);
-            state->flags = (int)(hold);
-            if ((state->flags & 0xff) != Z_DEFLATED) {
-                strm->msg = (char *)"unknown compression method";
-                state->mode = BAD;
-                break;
-            }
-            if (state->flags & 0xe000) {
-                strm->msg = (char *)"unknown header flags set";
-                state->mode = BAD;
-                break;
-            }
-            if (state->head != Z_NULL)
-                state->head->text = (int)((hold >> 8) & 1);
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = TIME;
-        case TIME:
-            NEEDBITS(32);
-            if (state->head != Z_NULL)
-                state->head->time = hold;
-            if (state->flags & 0x0200) CRC4(state->check, hold);
-            INITBITS();
-            state->mode = OS;
-        case OS:
-            NEEDBITS(16);
-            if (state->head != Z_NULL) {
-                state->head->xflags = (int)(hold & 0xff);
-                state->head->os = (int)(hold >> 8);
-            }
-            if (state->flags & 0x0200) CRC2(state->check, hold);
-            INITBITS();
-            state->mode = EXLEN;
-        case EXLEN:
-            if (state->flags & 0x0400) {
-                NEEDBITS(16);
-                state->length = (unsigned)(hold);
-                if (state->head != Z_NULL)
-                    state->head->extra_len = (unsigned)hold;
-                if (state->flags & 0x0200) CRC2(state->check, hold);
-                INITBITS();
-            }
-            else if (state->head != Z_NULL)
-                state->head->extra = Z_NULL;
-            state->mode = EXTRA;
-        case EXTRA:
-            if (state->flags & 0x0400) {
-                copy = state->length;
-                if (copy > have) copy = have;
-                if (copy) {
-                    if (state->head != Z_NULL &&
-                        state->head->extra != Z_NULL) {
-                        len = state->head->extra_len - state->length;
-                        zmemcpy(state->head->extra + len, next,
-                                len + copy > state->head->extra_max ?
-                                state->head->extra_max - len : copy);
-                    }
-                    if (state->flags & 0x0200)
-                        state->check = crc32(state->check, next, copy);
-                    have -= copy;
-                    next += copy;
-                    state->length -= copy;
-                }
-                if (state->length) goto inf_leave;
-            }
-            state->length = 0;
-            state->mode = NAME;
-        case NAME:
-            if (state->flags & 0x0800) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->name != Z_NULL &&
-                            state->length < state->head->name_max)
-                        state->head->name[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->name = Z_NULL;
-            state->length = 0;
-            state->mode = COMMENT;
-        case COMMENT:
-            if (state->flags & 0x1000) {
-                if (have == 0) goto inf_leave;
-                copy = 0;
-                do {
-                    len = (unsigned)(next[copy++]);
-                    if (state->head != Z_NULL &&
-                            state->head->comment != Z_NULL &&
-                            state->length < state->head->comm_max)
-                        state->head->comment[state->length++] = len;
-                } while (len && copy < have);
-                if (state->flags & 0x0200)
-                    state->check = crc32(state->check, next, copy);
-                have -= copy;
-                next += copy;
-                if (len) goto inf_leave;
-            }
-            else if (state->head != Z_NULL)
-                state->head->comment = Z_NULL;
-            state->mode = HCRC;
-        case HCRC:
-            if (state->flags & 0x0200) {
-                NEEDBITS(16);
-                if (hold != (state->check & 0xffff)) {
-                    strm->msg = (char *)"header crc mismatch";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-            }
-            if (state->head != Z_NULL) {
-                state->head->hcrc = (int)((state->flags >> 9) & 1);
-                state->head->done = 1;
-            }
-            strm->adler = state->check = crc32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-            break;
-#endif
-        case DICTID:
-            NEEDBITS(32);
-            strm->adler = state->check = REVERSE(hold);
-            INITBITS();
-            state->mode = DICT;
-        case DICT:
-            if (state->havedict == 0) {
-                RESTORE();
-                return Z_NEED_DICT;
-            }
-            strm->adler = state->check = adler32(0L, Z_NULL, 0);
-            state->mode = TYPE;
-        case TYPE:
-            if (flush == Z_BLOCK) goto inf_leave;
-        case TYPEDO:
-            if (state->last) {
-                BYTEBITS();
-                state->mode = CHECK;
-                break;
-            }
-            NEEDBITS(3);
-            state->last = BITS(1);
-            DROPBITS(1);
-            switch (BITS(2)) {
-            case 0:                             /* stored block */
-                Tracev((stderr, "inflate:     stored block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = STORED;
-                break;
-            case 1:                             /* fixed block */
-                fixedtables(state);
-                Tracev((stderr, "inflate:     fixed codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = LEN;              /* decode codes */
-                break;
-            case 2:                             /* dynamic block */
-                Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                        state->last ? " (last)" : ""));
-                state->mode = TABLE;
-                break;
-            case 3:
-                strm->msg = (char *)"invalid block type";
-                state->mode = BAD;
-            }
-            DROPBITS(2);
-            break;
-        case STORED:
-            BYTEBITS();                         /* go to byte boundary */
-            NEEDBITS(32);
-            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
-                strm->msg = (char *)"invalid stored block lengths";
-                state->mode = BAD;
-                break;
-            }
-            state->length = (unsigned)hold & 0xffff;
-            Tracev((stderr, "inflate:       stored length %u\n",
-                    state->length));
-            INITBITS();
-            state->mode = COPY;
-        case COPY:
-            copy = state->length;
-            if (copy) {
-                if (copy > have) copy = have;
-                if (copy > left) copy = left;
-                if (copy == 0) goto inf_leave;
-                zmemcpy(put, next, copy);
-                have -= copy;
-                next += copy;
-                left -= copy;
-                put += copy;
-                state->length -= copy;
-                break;
-            }
-            Tracev((stderr, "inflate:       stored end\n"));
-            state->mode = TYPE;
-            break;
-        case TABLE:
-            NEEDBITS(14);
-            state->nlen = BITS(5) + 257;
-            DROPBITS(5);
-            state->ndist = BITS(5) + 1;
-            DROPBITS(5);
-            state->ncode = BITS(4) + 4;
-            DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
-            if (state->nlen > 286 || state->ndist > 30) {
-                strm->msg = (char *)"too many length or distance symbols";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            Tracev((stderr, "inflate:       table sizes ok\n"));
-            state->have = 0;
-            state->mode = LENLENS;
-        case LENLENS:
-            while (state->have < state->ncode) {
-                NEEDBITS(3);
-                state->lens[order[state->have++]] = (unsigned short)BITS(3);
-                DROPBITS(3);
-            }
-            while (state->have < 19)
-                state->lens[order[state->have++]] = 0;
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 7;
-            ret = inflate_table(CODES, state->lens, 19, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid code lengths set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       code lengths ok\n"));
-            state->have = 0;
-            state->mode = CODELENS;
-        case CODELENS:
-            while (state->have < state->nlen + state->ndist) {
-                for (;;) {
-                    this = state->lencode[BITS(state->lenbits)];
-                    if ((unsigned)(this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                if (this.val < 16) {
-                    NEEDBITS(this.bits);
-                    DROPBITS(this.bits);
-                    state->lens[state->have++] = this.val;
-                }
-                else {
-                    if (this.val == 16) {
-                        NEEDBITS(this.bits + 2);
-                        DROPBITS(this.bits);
-                        if (state->have == 0) {
-                            strm->msg = (char *)"invalid bit length repeat";
-                            state->mode = BAD;
-                            break;
-                        }
-                        len = state->lens[state->have - 1];
-                        copy = 3 + BITS(2);
-                        DROPBITS(2);
-                    }
-                    else if (this.val == 17) {
-                        NEEDBITS(this.bits + 3);
-                        DROPBITS(this.bits);
-                        len = 0;
-                        copy = 3 + BITS(3);
-                        DROPBITS(3);
-                    }
-                    else {
-                        NEEDBITS(this.bits + 7);
-                        DROPBITS(this.bits);
-                        len = 0;
-                        copy = 11 + BITS(7);
-                        DROPBITS(7);
-                    }
-                    if (state->have + copy > state->nlen + state->ndist) {
-                        strm->msg = (char *)"invalid bit length repeat";
-                        state->mode = BAD;
-                        break;
-                    }
-                    while (copy--)
-                        state->lens[state->have++] = (unsigned short)len;
-                }
-            }
-
-            /* handle error breaks in while */
-            if (state->mode == BAD) break;
-
-            /* build code tables */
-            state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
-            state->lenbits = 9;
-            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
-                                &(state->lenbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid literal/lengths set";
-                state->mode = BAD;
-                break;
-            }
-            state->distcode = (code const FAR *)(state->next);
-            state->distbits = 6;
-            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
-                            &(state->next), &(state->distbits), state->work);
-            if (ret) {
-                strm->msg = (char *)"invalid distances set";
-                state->mode = BAD;
-                break;
-            }
-            Tracev((stderr, "inflate:       codes ok\n"));
-            state->mode = LEN;
-        case LEN:
-            if (have >= 6 && left >= 258) {
-                RESTORE();
-                inflate_fast(strm, out);
-                LOAD();
-                break;
-            }
-            for (;;) {
-                this = state->lencode[BITS(state->lenbits)];
-                if ((unsigned)(this.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if (this.op && (this.op & 0xf0) == 0) {
-                last = this;
-                for (;;) {
-                    this = state->lencode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(this.bits);
-            state->length = (unsigned)this.val;
-            if ((int)(this.op) == 0) {
-                Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
-                        "inflate:         literal '%c'\n" :
-                        "inflate:         literal 0x%02x\n", this.val));
-                state->mode = LIT;
-                break;
-            }
-            if (this.op & 32) {
-                Tracevv((stderr, "inflate:         end of block\n"));
-                state->mode = TYPE;
-                break;
-            }
-            if (this.op & 64) {
-                strm->msg = (char *)"invalid literal/length code";
-                state->mode = BAD;
-                break;
-            }
-            state->extra = (unsigned)(this.op) & 15;
-            state->mode = LENEXT;
-        case LENEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->length += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-            Tracevv((stderr, "inflate:         length %u\n", state->length));
-            state->mode = DIST;
-        case DIST:
-            for (;;) {
-                this = state->distcode[BITS(state->distbits)];
-                if ((unsigned)(this.bits) <= bits) break;
-                PULLBYTE();
-            }
-            if ((this.op & 0xf0) == 0) {
-                last = this;
-                for (;;) {
-                    this = state->distcode[last.val +
-                            (BITS(last.bits + last.op) >> last.bits)];
-                    if ((unsigned)(last.bits + this.bits) <= bits) break;
-                    PULLBYTE();
-                }
-                DROPBITS(last.bits);
-            }
-            DROPBITS(this.bits);
-            if (this.op & 64) {
-                strm->msg = (char *)"invalid distance code";
-                state->mode = BAD;
-                break;
-            }
-            state->offset = (unsigned)this.val;
-            state->extra = (unsigned)(this.op) & 15;
-            state->mode = DISTEXT;
-        case DISTEXT:
-            if (state->extra) {
-                NEEDBITS(state->extra);
-                state->offset += BITS(state->extra);
-                DROPBITS(state->extra);
-            }
-#ifdef INFLATE_STRICT
-            if (state->offset > state->dmax) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-#endif
-            if (state->offset > state->whave + out - left) {
-                strm->msg = (char *)"invalid distance too far back";
-                state->mode = BAD;
-                break;
-            }
-            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
-            state->mode = MATCH;
-        case MATCH:
-            if (left == 0) goto inf_leave;
-            copy = out - left;
-            if (state->offset > copy) {         /* copy from window */
-                copy = state->offset - copy;
-                if (copy > state->write) {
-                    copy -= state->write;
-                    from = state->window + (state->wsize - copy);
-                }
-                else
-                    from = state->window + (state->write - copy);
-                if (copy > state->length) copy = state->length;
-            }
-            else {                              /* copy from output */
-                from = put - state->offset;
-                copy = state->length;
-            }
-            if (copy > left) copy = left;
-            left -= copy;
-            state->length -= copy;
-            do {
-                *put++ = *from++;
-            } while (--copy);
-            if (state->length == 0) state->mode = LEN;
-            break;
-        case LIT:
-            if (left == 0) goto inf_leave;
-            *put++ = (unsigned char)(state->length);
-            left--;
-            state->mode = LEN;
-            break;
-        case CHECK:
-            if (state->wrap) {
-                NEEDBITS(32);
-                out -= left;
-                strm->total_out += out;
-                state->total += out;
-                if (out)
-                    strm->adler = state->check =
-                        UPDATE(state->check, put - out, out);
-                out = left;
-                if ((
-#ifdef GUNZIP
-                     state->flags ? hold :
-#endif
-                     REVERSE(hold)) != state->check) {
-                    strm->msg = (char *)"incorrect data check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   check matches trailer\n"));
-            }
-#ifdef GUNZIP
-            state->mode = LENGTH;
-        case LENGTH:
-            if (state->wrap && state->flags) {
-                NEEDBITS(32);
-                if (hold != (state->total & 0xffffffffUL)) {
-                    strm->msg = (char *)"incorrect length check";
-                    state->mode = BAD;
-                    break;
-                }
-                INITBITS();
-                Tracev((stderr, "inflate:   length matches trailer\n"));
-            }
-#endif
-            state->mode = DONE;
-        case DONE:
-            ret = Z_STREAM_END;
-            goto inf_leave;
-        case BAD:
-            ret = Z_DATA_ERROR;
-            goto inf_leave;
-        case MEM:
-            return Z_MEM_ERROR;
-        case SYNC:
-        default:
-            return Z_STREAM_ERROR;
-        }
-
-    /*
-       Return from inflate(), updating the total counts and the check value.
-       If there was no progress during the inflate() call, return a buffer
-       error.  Call updatewindow() to create and/or update the window state.
-       Note: a memory error from inflate() is non-recoverable.
-     */
-  inf_leave:
-    RESTORE();
-    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
-        if (updatewindow(strm, out)) {
-            state->mode = MEM;
-            return Z_MEM_ERROR;
-        }
-    in -= strm->avail_in;
-    out -= strm->avail_out;
-    strm->total_in += in;
-    strm->total_out += out;
-    state->total += out;
-    if (state->wrap && out)
-        strm->adler = state->check =
-            UPDATE(state->check, strm->next_out - out, out);
-    strm->data_type = state->bits + (state->last ? 64 : 0) +
-                      (state->mode == TYPE ? 128 : 0);
-    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
-        ret = Z_BUF_ERROR;
-    return ret;
-}
-
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->window != Z_NULL) ZFREE(strm, state->window);
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-    Tracev((stderr, "inflate: end\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
-    struct inflate_state FAR *state;
-    unsigned long id;
-
-    /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (state->wrap != 0 && state->mode != DICT)
-        return Z_STREAM_ERROR;
-
-    /* check for correct dictionary id */
-    if (state->mode == DICT) {
-        id = adler32(0L, Z_NULL, 0);
-        id = adler32(id, dictionary, dictLength);
-        if (id != state->check)
-            return Z_DATA_ERROR;
-    }
-
-    /* copy dictionary to window */
-    if (updatewindow(strm, strm->avail_out)) {
-        state->mode = MEM;
-        return Z_MEM_ERROR;
-    }
-    if (dictLength > state->wsize) {
-        zmemcpy(state->window, dictionary + dictLength - state->wsize,
-                state->wsize);
-        state->whave = state->wsize;
-    }
-    else {
-        zmemcpy(state->window + state->wsize - dictLength, dictionary,
-                dictLength);
-        state->whave = dictLength;
-    }
-    state->havedict = 1;
-    Tracev((stderr, "inflate:   dictionary set\n"));
-    return Z_OK;
-}
-
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
-    struct inflate_state FAR *state;
-
-    /* check state */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
-
-    /* save header structure */
-    state->head = head;
-    head->done = 0;
-    return Z_OK;
-}
-
-/*
-   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
-   or when out of input.  When called, *have is the number of pattern bytes
-   found in order so far, in 0..3.  On return *have is updated to the new
-   state.  If on return *have equals four, then the pattern was found and the
-   return value is how many bytes were read including the last byte of the
-   pattern.  If *have is less than four, then the pattern has not been found
-   yet and the return value is len.  In the latter case, syncsearch() can be
-   called again with more data and the *have state.  *have is initialized to
-   zero for the first call.
- */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-unsigned char FAR *buf;
-unsigned len;
-{
-    unsigned got;
-    unsigned next;
-
-    got = *have;
-    next = 0;
-    while (next < len && got < 4) {
-        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
-            got++;
-        else if (buf[next])
-            got = 0;
-        else
-            got = 4 - got;
-        next++;
-    }
-    *have = got;
-    return next;
-}
-
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
-    unsigned len;               /* number of bytes to look at or looked at */
-    unsigned long in, out;      /* temporary to save total_in and total_out */
-    unsigned char buf[4];       /* to restore bit buffer to byte string */
-    struct inflate_state FAR *state;
-
-    /* check parameters */
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
-
-    /* if first time, start search in bit buffer */
-    if (state->mode != SYNC) {
-        state->mode = SYNC;
-        state->hold <<= state->bits & 7;
-        state->bits -= state->bits & 7;
-        len = 0;
-        while (state->bits >= 8) {
-            buf[len++] = (unsigned char)(state->hold);
-            state->hold >>= 8;
-            state->bits -= 8;
-        }
-        state->have = 0;
-        syncsearch(&(state->have), buf, len);
-    }
-
-    /* search available input */
-    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
-    strm->avail_in -= len;
-    strm->next_in += len;
-    strm->total_in += len;
-
-    /* return no joy or set up to restart inflate() on a new block */
-    if (state->have != 4) return Z_DATA_ERROR;
-    in = strm->total_in;  out = strm->total_out;
-    inflateReset(strm);
-    strm->total_in = in;  strm->total_out = out;
-    state->mode = TYPE;
-    return Z_OK;
-}
-
-/*
-   Returns true if inflate is currently at the end of a block generated by
-   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
-   implementation to provide an additional safety check. PPP uses
-   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
-   block. When decompressing, PPP checks that at the end of input packet,
-   inflate is waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    return state->mode == STORED && state->bits == 0;
-}
-
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
-    struct inflate_state FAR *state;
-    struct inflate_state FAR *copy;
-    unsigned char FAR *window;
-    unsigned wsize;
-
-    /* check input */
-    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
-        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
-        return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)source->state;
-
-    /* allocate space */
-    copy = (struct inflate_state FAR *)
-           ZALLOC(source, 1, sizeof(struct inflate_state));
-    if (copy == Z_NULL) return Z_MEM_ERROR;
-    window = Z_NULL;
-    if (state->window != Z_NULL) {
-        window = (unsigned char FAR *)
-                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
-        if (window == Z_NULL) {
-            ZFREE(source, copy);
-            return Z_MEM_ERROR;
-        }
-    }
-
-    /* copy state */
-    zmemcpy(dest, source, sizeof(z_stream));
-    zmemcpy(copy, state, sizeof(struct inflate_state));
-    if (state->lencode >= state->codes &&
-        state->lencode <= state->codes + ENOUGH - 1) {
-        copy->lencode = copy->codes + (state->lencode - state->codes);
-        copy->distcode = copy->codes + (state->distcode - state->codes);
-    }
-    copy->next = copy->codes + (state->next - state->codes);
-    if (window != Z_NULL) {
-        wsize = 1U << state->wbits;
-        zmemcpy(window, state->window, wsize);
-    }
-    copy->window = window;
-    dest->state = (struct internal_state FAR *)copy;
-    return Z_OK;
-}
+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0    24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ *   creation of window when not needed, minimize use of window when it is
+ *   needed, make inffast.c even faster, implement gzip decoding, and to
+ *   improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1    25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2    4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf[] unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset)
+ *   to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3    22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ *   buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4    1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common wnext == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ *   source file infback.c to provide a call-back interface to inflate for
+ *   programs like gzip and unzip -- uses window as output buffer to avoid
+ *   window copying
+ *
+ * 1.2.beta5    1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ *   input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6    4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ *   make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7    27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0        9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ *   for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ *   and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef MAKEFIXED
+#  ifndef BUILDFIXED
+#    define BUILDFIXED
+#  endif
+#endif
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
+                           unsigned copy));
+#ifdef BUILDFIXED
+   void makefixed OF((void));
+#endif
+local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
+                              unsigned len));
+
+int ZEXPORT inflateResetKeep(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    strm->total_in = strm->total_out = state->total = 0;
+    strm->msg = Z_NULL;
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
+    state->mode = HEAD;
+    state->last = 0;
+    state->havedict = 0;
+    state->dmax = 32768U;
+    state->head = Z_NULL;
+    state->hold = 0;
+    state->bits = 0;
+    state->lencode = state->distcode = state->next = state->codes;
+    state->sane = 1;
+    state->back = -1;
+    Tracev((stderr, "inflate: reset\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
+int ZEXPORT inflateReset2(strm, windowBits)
+z_streamp strm;
+int windowBits;
+{
+    int wrap;
+    struct inflate_state FAR *state;
+
+    /* get the state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* extract wrap request from windowBits parameter */
+    if (windowBits < 0) {
+        wrap = 0;
+        windowBits = -windowBits;
+    }
+    else {
+        wrap = (windowBits >> 4) + 1;
+#ifdef GUNZIP
+        if (windowBits < 48)
+            windowBits &= 15;
+#endif
+    }
+
+    /* set number of window bits, free window if different */
+    if (windowBits && (windowBits < 8 || windowBits > 15))
+        return Z_STREAM_ERROR;
+    if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
+        ZFREE(strm, state->window);
+        state->window = Z_NULL;
+    }
+
+    /* update state and reset the rest of it */
+    state->wrap = wrap;
+    state->wbits = (unsigned)windowBits;
+    return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{
+    int ret;
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL) return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)
+            ZALLOC(strm, 1, sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->window = Z_NULL;
+    ret = inflateReset2(strm, windowBits);
+    if (ret != Z_OK) {
+        ZFREE(strm, state);
+        strm->state = Z_NULL;
+    }
+    return ret;
+}
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{
+    return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+int ZEXPORT inflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (bits < 0) {
+        state->hold = 0;
+        state->bits = 0;
+        return Z_OK;
+    }
+    if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+    value &= (1L << bits) - 1;
+    state->hold += value << state->bits;
+    state->bits += bits;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+   Write out the inffixed.h that is #include'd above.  Defining MAKEFIXED also
+   defines BUILDFIXED, so the tables are built on the fly.  makefixed() writes
+   those tables to stdout, which would be piped to inffixed.h.  A small program
+   can simply call makefixed to do this:
+
+    void makefixed(void);
+
+    int main(void)
+    {
+        makefixed();
+        return 0;
+    }
+
+   Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+    a.out > inffixed.h
+ */
+void makefixed()
+{
+    unsigned low, size;
+    struct inflate_state state;
+
+    fixedtables(&state);
+    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("     * Generated automatically by makefixed().");
+    puts("     */");
+    puts("");
+    puts("    /* WARNING: this file should *not* be used by applications.");
+    puts("       It is part of the implementation of this library and is");
+    puts("       subject to change. Applications should only use zlib.h.");
+    puts("     */");
+    puts("");
+    size = 1U << 9;
+    printf("    static const code lenfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 7) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+    size = 1U << 5;
+    printf("\n    static const code distfix[%u] = {", size);
+    low = 0;
+    for (;;) {
+        if ((low % 6) == 0) printf("\n        ");
+        printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits,
+               state.distcode[low].val);
+        if (++low == size) break;
+        putchar(',');
+    }
+    puts("\n    };");
+}
+#endif /* MAKEFIXED */
+
+/*
+   Update the window with the last wsize (normally 32K) bytes written before
+   returning.  If window does not exist yet, create it.  This is only called
+   when a window is already in use, or when output has been written during this
+   inflate call, but the end of the deflate stream has not been reached yet.
+   It is also called to create a window for dictionary data when a dictionary
+   is loaded.
+
+   Providing output buffers larger than 32K to inflate() should provide a speed
+   advantage, since only the last 32K of output is copied to the sliding window
+   upon return from inflate(), and since all distances after the first 32K of
+   output will fall in the output data, making match copies simpler and faster.
+   The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(strm, end, copy)
+z_streamp strm;
+const Bytef *end;
+unsigned copy;
+{
+    struct inflate_state FAR *state;
+    unsigned dist;
+
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* if it hasn't been done already, allocate space for the window */
+    if (state->window == Z_NULL) {
+        state->window = (unsigned char FAR *)
+                        ZALLOC(strm, 1U << state->wbits,
+                               sizeof(unsigned char));
+        if (state->window == Z_NULL) return 1;
+    }
+
+    /* if window not in use yet, initialize */
+    if (state->wsize == 0) {
+        state->wsize = 1U << state->wbits;
+        state->wnext = 0;
+        state->whave = 0;
+    }
+
+    /* copy state->wsize or less output bytes into the circular window */
+    if (copy >= state->wsize) {
+        zmemcpy(state->window, end - state->wsize, state->wsize);
+        state->wnext = 0;
+        state->whave = state->wsize;
+    }
+    else {
+        dist = state->wsize - state->wnext;
+        if (dist > copy) dist = copy;
+        zmemcpy(state->window + state->wnext, end - copy, dist);
+        copy -= dist;
+        if (copy) {
+            zmemcpy(state->window, end - copy, copy);
+            state->wnext = copy;
+            state->whave = state->wsize;
+        }
+        else {
+            state->wnext += dist;
+            if (state->wnext == state->wsize) state->wnext = 0;
+            if (state->whave < state->wsize) state->whave += dist;
+        }
+    }
+    return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+#  define UPDATE(check, buf, len) \
+    (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+#  define UPDATE(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+#  define CRC2(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        check = crc32(check, hbuf, 2); \
+    } while (0)
+
+#  define CRC4(check, word) \
+    do { \
+        hbuf[0] = (unsigned char)(word); \
+        hbuf[1] = (unsigned char)((word) >> 8); \
+        hbuf[2] = (unsigned char)((word) >> 16); \
+        hbuf[3] = (unsigned char)((word) >> 24); \
+        check = crc32(check, hbuf, 4); \
+    } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+   if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        if (have == 0) goto inf_leave; \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/*
+   inflate() uses a state machine to process as much input data and generate as
+   much output data as possible before returning.  The state machine is
+   structured roughly as follows:
+
+    for (;;) switch (state) {
+    ...
+    case STATEn:
+        if (not enough input data or output space to make progress)
+            return;
+        ... make progress ...
+        state = STATEm;
+        break;
+    ...
+    }
+
+   so when inflate() is called again, the same case is attempted again, and
+   if the appropriate resources are provided, the machine proceeds to the
+   next state.  The NEEDBITS() macro is usually the way the state evaluates
+   whether it can proceed or should return.  NEEDBITS() does the return if
+   the requested bits are not available.  The typical use of the BITS macros
+   is:
+
+        NEEDBITS(n);
+        ... do something with BITS(n) ...
+        DROPBITS(n);
+
+   where NEEDBITS(n) either returns from inflate() if there isn't enough
+   input left to load n bits into the accumulator, or it continues.  BITS(n)
+   gives the low n bits in the accumulator.  When done, DROPBITS(n) drops
+   the low n bits off the accumulator.  INITBITS() clears the accumulator
+   and sets the number of available bits to zero.  BYTEBITS() discards just
+   enough bits to put the accumulator on a byte boundary.  After BYTEBITS()
+   and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+   NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+   if there is no input available.  The decoding of variable length codes uses
+   PULLBYTE() directly in order to pull just enough bytes to decode the next
+   code, and no more.
+
+   Some states loop until they get enough input, making sure that enough
+   state information is maintained to continue the loop where it left off
+   if NEEDBITS() returns in the loop.  For example, want, need, and keep
+   would all have to actually be part of the saved state in case NEEDBITS()
+   returns:
+
+    case STATEw:
+        while (want < need) {
+            NEEDBITS(n);
+            keep[want++] = BITS(n);
+            DROPBITS(n);
+        }
+        state = STATEx;
+    case STATEx:
+
+   As shown above, if the next state is also the next case, then the break
+   is omitted.
+
+   A state may also return if there is not enough output space available to
+   complete that state.  Those states are copying stored data, writing a
+   literal byte, and copying a matching string.
+
+   When returning, a "goto inf_leave" is used to update the total counters,
+   update the check value, and determine whether any progress has been made
+   during that inflate() call in order to return the proper return code.
+   Progress is defined as a change in either strm->avail_in or strm->avail_out.
+   When there is a window, goto inf_leave will update the window with the last
+   output written.  If a goto inf_leave occurs in the middle of decompression
+   and there is no window currently, goto inf_leave will create one and copy
+   output to the window for the next call of inflate().
+
+   In this implementation, the flush parameter of inflate() only affects the
+   return code (per zlib.h).  inflate() always writes as much as possible to
+   strm->next_out, given the space available and the provided input--the effect
+   documented in zlib.h of Z_SYNC_FLUSH.  Furthermore, inflate() always defers
+   the allocation of and copying into a sliding window until necessary, which
+   provides the effect documented in zlib.h for Z_FINISH when the entire input
+   stream available.  So the only thing the flush parameter actually does is:
+   when flush is set to Z_FINISH, inflate() cannot return Z_OK.  Instead it
+   will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned in, out;           /* save starting available input and output */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+#ifdef GUNZIP
+    unsigned char hbuf[4];      /* buffer for gzip header crc calculation */
+#endif
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
+        (strm->next_in == Z_NULL && strm->avail_in != 0))
+        return Z_STREAM_ERROR;
+
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->mode == TYPE) state->mode = TYPEDO;      /* skip check */
+    LOAD();
+    in = have;
+    out = left;
+    ret = Z_OK;
+    for (;;)
+        switch (state->mode) {
+        case HEAD:
+            if (state->wrap == 0) {
+                state->mode = TYPEDO;
+                break;
+            }
+            NEEDBITS(16);
+#ifdef GUNZIP
+            if ((state->wrap & 2) && hold == 0x8b1f) {  /* gzip header */
+                state->check = crc32(0L, Z_NULL, 0);
+                CRC2(state->check, hold);
+                INITBITS();
+                state->mode = FLAGS;
+                break;
+            }
+            state->flags = 0;           /* expect zlib header */
+            if (state->head != Z_NULL)
+                state->head->done = -1;
+            if (!(state->wrap & 1) ||   /* check if zlib header allowed */
+#else
+            if (
+#endif
+                ((BITS(8) << 8) + (hold >> 8)) % 31) {
+                strm->msg = (char *)"incorrect header check";
+                state->mode = BAD;
+                break;
+            }
+            if (BITS(4) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            DROPBITS(4);
+            len = BITS(4) + 8;
+            if (state->wbits == 0)
+                state->wbits = len;
+            else if (len > state->wbits) {
+                strm->msg = (char *)"invalid window size";
+                state->mode = BAD;
+                break;
+            }
+            state->dmax = 1U << len;
+            Tracev((stderr, "inflate:   zlib header ok\n"));
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = hold & 0x200 ? DICTID : TYPE;
+            INITBITS();
+            break;
+#ifdef GUNZIP
+        case FLAGS:
+            NEEDBITS(16);
+            state->flags = (int)(hold);
+            if ((state->flags & 0xff) != Z_DEFLATED) {
+                strm->msg = (char *)"unknown compression method";
+                state->mode = BAD;
+                break;
+            }
+            if (state->flags & 0xe000) {
+                strm->msg = (char *)"unknown header flags set";
+                state->mode = BAD;
+                break;
+            }
+            if (state->head != Z_NULL)
+                state->head->text = (int)((hold >> 8) & 1);
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = TIME;
+        case TIME:
+            NEEDBITS(32);
+            if (state->head != Z_NULL)
+                state->head->time = hold;
+            if (state->flags & 0x0200) CRC4(state->check, hold);
+            INITBITS();
+            state->mode = OS;
+        case OS:
+            NEEDBITS(16);
+            if (state->head != Z_NULL) {
+                state->head->xflags = (int)(hold & 0xff);
+                state->head->os = (int)(hold >> 8);
+            }
+            if (state->flags & 0x0200) CRC2(state->check, hold);
+            INITBITS();
+            state->mode = EXLEN;
+        case EXLEN:
+            if (state->flags & 0x0400) {
+                NEEDBITS(16);
+                state->length = (unsigned)(hold);
+                if (state->head != Z_NULL)
+                    state->head->extra_len = (unsigned)hold;
+                if (state->flags & 0x0200) CRC2(state->check, hold);
+                INITBITS();
+            }
+            else if (state->head != Z_NULL)
+                state->head->extra = Z_NULL;
+            state->mode = EXTRA;
+        case EXTRA:
+            if (state->flags & 0x0400) {
+                copy = state->length;
+                if (copy > have) copy = have;
+                if (copy) {
+                    if (state->head != Z_NULL &&
+                        state->head->extra != Z_NULL) {
+                        len = state->head->extra_len - state->length;
+                        zmemcpy(state->head->extra + len, next,
+                                len + copy > state->head->extra_max ?
+                                state->head->extra_max - len : copy);
+                    }
+                    if (state->flags & 0x0200)
+                        state->check = crc32(state->check, next, copy);
+                    have -= copy;
+                    next += copy;
+                    state->length -= copy;
+                }
+                if (state->length) goto inf_leave;
+            }
+            state->length = 0;
+            state->mode = NAME;
+        case NAME:
+            if (state->flags & 0x0800) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->name != Z_NULL &&
+                            state->length < state->head->name_max)
+                        state->head->name[state->length++] = len;
+                } while (len && copy < have);
+                if (state->flags & 0x0200)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->name = Z_NULL;
+            state->length = 0;
+            state->mode = COMMENT;
+        case COMMENT:
+            if (state->flags & 0x1000) {
+                if (have == 0) goto inf_leave;
+                copy = 0;
+                do {
+                    len = (unsigned)(next[copy++]);
+                    if (state->head != Z_NULL &&
+                            state->head->comment != Z_NULL &&
+                            state->length < state->head->comm_max)
+                        state->head->comment[state->length++] = len;
+                } while (len && copy < have);
+                if (state->flags & 0x0200)
+                    state->check = crc32(state->check, next, copy);
+                have -= copy;
+                next += copy;
+                if (len) goto inf_leave;
+            }
+            else if (state->head != Z_NULL)
+                state->head->comment = Z_NULL;
+            state->mode = HCRC;
+        case HCRC:
+            if (state->flags & 0x0200) {
+                NEEDBITS(16);
+                if (hold != (state->check & 0xffff)) {
+                    strm->msg = (char *)"header crc mismatch";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+            }
+            if (state->head != Z_NULL) {
+                state->head->hcrc = (int)((state->flags >> 9) & 1);
+                state->head->done = 1;
+            }
+            strm->adler = state->check = crc32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+            break;
+#endif
+        case DICTID:
+            NEEDBITS(32);
+            strm->adler = state->check = ZSWAP32(hold);
+            INITBITS();
+            state->mode = DICT;
+        case DICT:
+            if (state->havedict == 0) {
+                RESTORE();
+                return Z_NEED_DICT;
+            }
+            strm->adler = state->check = adler32(0L, Z_NULL, 0);
+            state->mode = TYPE;
+        case TYPE:
+            if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+        case TYPEDO:
+            if (state->last) {
+                BYTEBITS();
+                state->mode = CHECK;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN_;             /* decode codes */
+                if (flush == Z_TREES) {
+                    DROPBITS(2);
+                    goto inf_leave;
+                }
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+        case STORED:
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+            state->mode = COPY_;
+            if (flush == Z_TREES) goto inf_leave;
+        case COPY_:
+            state->mode = COPY;
+        case COPY:
+            copy = state->length;
+            if (copy) {
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                if (copy == 0) goto inf_leave;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+                break;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+        case TABLE:
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+            state->have = 0;
+            state->mode = LENLENS;
+        case LENLENS:
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+            state->have = 0;
+            state->mode = CODELENS;
+        case CODELENS:
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = state->lens[state->have - 1];
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (const code FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (const code FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN_;
+            if (flush == Z_TREES) goto inf_leave;
+        case LEN_:
+            state->mode = LEN;
+        case LEN:
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                inflate_fast(strm, out);
+                LOAD();
+                if (state->mode == TYPE)
+                    state->back = -1;
+                break;
+            }
+            state->back = 0;
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            state->length = (unsigned)here.val;
+            if ((int)(here.op) == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                state->mode = LIT;
+                break;
+            }
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->back = -1;
+                state->mode = TYPE;
+                break;
+            }
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = LENEXT;
+        case LENEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+            state->was = state->length;
+            state->mode = DIST;
+        case DIST:
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+                state->back += last.bits;
+            }
+            DROPBITS(here.bits);
+            state->back += here.bits;
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+            state->extra = (unsigned)(here.op) & 15;
+            state->mode = DISTEXT;
+        case DISTEXT:
+            if (state->extra) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+                state->back += state->extra;
+            }
+#ifdef INFLATE_STRICT
+            if (state->offset > state->dmax) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+            state->mode = MATCH;
+        case MATCH:
+            if (left == 0) goto inf_leave;
+            copy = out - left;
+            if (state->offset > copy) {         /* copy from window */
+                copy = state->offset - copy;
+                if (copy > state->whave) {
+                    if (state->sane) {
+                        strm->msg = (char *)"invalid distance too far back";
+                        state->mode = BAD;
+                        break;
+                    }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                    Trace((stderr, "inflate.c too far\n"));
+                    copy -= state->whave;
+                    if (copy > state->length) copy = state->length;
+                    if (copy > left) copy = left;
+                    left -= copy;
+                    state->length -= copy;
+                    do {
+                        *put++ = 0;
+                    } while (--copy);
+                    if (state->length == 0) state->mode = LEN;
+                    break;
+#endif
+                }
+                if (copy > state->wnext) {
+                    copy -= state->wnext;
+                    from = state->window + (state->wsize - copy);
+                }
+                else
+                    from = state->window + (state->wnext - copy);
+                if (copy > state->length) copy = state->length;
+            }
+            else {                              /* copy from output */
+                from = put - state->offset;
+                copy = state->length;
+            }
+            if (copy > left) copy = left;
+            left -= copy;
+            state->length -= copy;
+            do {
+                *put++ = *from++;
+            } while (--copy);
+            if (state->length == 0) state->mode = LEN;
+            break;
+        case LIT:
+            if (left == 0) goto inf_leave;
+            *put++ = (unsigned char)(state->length);
+            left--;
+            state->mode = LEN;
+            break;
+        case CHECK:
+            if (state->wrap) {
+                NEEDBITS(32);
+                out -= left;
+                strm->total_out += out;
+                state->total += out;
+                if (out)
+                    strm->adler = state->check =
+                        UPDATE(state->check, put - out, out);
+                out = left;
+                if ((
+#ifdef GUNZIP
+                     state->flags ? hold :
+#endif
+                     ZSWAP32(hold)) != state->check) {
+                    strm->msg = (char *)"incorrect data check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   check matches trailer\n"));
+            }
+#ifdef GUNZIP
+            state->mode = LENGTH;
+        case LENGTH:
+            if (state->wrap && state->flags) {
+                NEEDBITS(32);
+                if (hold != (state->total & 0xffffffffUL)) {
+                    strm->msg = (char *)"incorrect length check";
+                    state->mode = BAD;
+                    break;
+                }
+                INITBITS();
+                Tracev((stderr, "inflate:   length matches trailer\n"));
+            }
+#endif
+            state->mode = DONE;
+        case DONE:
+            ret = Z_STREAM_END;
+            goto inf_leave;
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+        case MEM:
+            return Z_MEM_ERROR;
+        case SYNC:
+        default:
+            return Z_STREAM_ERROR;
+        }
+
+    /*
+       Return from inflate(), updating the total counts and the check value.
+       If there was no progress during the inflate() call, return a buffer
+       error.  Call updatewindow() to create and/or update the window state.
+       Note: a memory error from inflate() is non-recoverable.
+     */
+  inf_leave:
+    RESTORE();
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
+        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
+            state->mode = MEM;
+            return Z_MEM_ERROR;
+        }
+    in -= strm->avail_in;
+    out -= strm->avail_out;
+    strm->total_in += in;
+    strm->total_out += out;
+    state->total += out;
+    if (state->wrap && out)
+        strm->adler = state->check =
+            UPDATE(state->check, strm->next_out - out, out);
+    strm->data_type = state->bits + (state->last ? 64 : 0) +
+                      (state->mode == TYPE ? 128 : 0) +
+                      (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
+    if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+        ret = Z_BUF_ERROR;
+    return ret;
+}
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->window != Z_NULL) ZFREE(strm, state->window);
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+Bytef *dictionary;
+uInt *dictLength;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* copy dictionary */
+    if (state->whave && dictionary != Z_NULL) {
+        zmemcpy(dictionary, state->window + state->wnext,
+                state->whave - state->wnext);
+        zmemcpy(dictionary + state->whave - state->wnext,
+                state->window, state->wnext);
+    }
+    if (dictLength != Z_NULL)
+        *dictLength = state->whave;
+    return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt dictLength;
+{
+    struct inflate_state FAR *state;
+    unsigned long dictid;
+    int ret;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (state->wrap != 0 && state->mode != DICT)
+        return Z_STREAM_ERROR;
+
+    /* check for correct dictionary identifier */
+    if (state->mode == DICT) {
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
+            return Z_DATA_ERROR;
+    }
+
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+    if (ret) {
+        state->mode = MEM;
+        return Z_MEM_ERROR;
+    }
+    state->havedict = 1;
+    Tracev((stderr, "inflate:   dictionary set\n"));
+    return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(strm, head)
+z_streamp strm;
+gz_headerp head;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+    /* save header structure */
+    state->head = head;
+    head->done = 0;
+    return Z_OK;
+}
+
+/*
+   Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff.  Return when found
+   or when out of input.  When called, *have is the number of pattern bytes
+   found in order so far, in 0..3.  On return *have is updated to the new
+   state.  If on return *have equals four, then the pattern was found and the
+   return value is how many bytes were read including the last byte of the
+   pattern.  If *have is less than four, then the pattern has not been found
+   yet and the return value is len.  In the latter case, syncsearch() can be
+   called again with more data and the *have state.  *have is initialized to
+   zero for the first call.
+ */
+local unsigned syncsearch(have, buf, len)
+unsigned FAR *have;
+const unsigned char FAR *buf;
+unsigned len;
+{
+    unsigned got;
+    unsigned next;
+
+    got = *have;
+    next = 0;
+    while (next < len && got < 4) {
+        if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
+            got++;
+        else if (buf[next])
+            got = 0;
+        else
+            got = 4 - got;
+        next++;
+    }
+    *have = got;
+    return next;
+}
+
+int ZEXPORT inflateSync(strm)
+z_streamp strm;
+{
+    unsigned len;               /* number of bytes to look at or looked at */
+    unsigned long in, out;      /* temporary to save total_in and total_out */
+    unsigned char buf[4];       /* to restore bit buffer to byte string */
+    struct inflate_state FAR *state;
+
+    /* check parameters */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+    /* if first time, start search in bit buffer */
+    if (state->mode != SYNC) {
+        state->mode = SYNC;
+        state->hold <<= state->bits & 7;
+        state->bits -= state->bits & 7;
+        len = 0;
+        while (state->bits >= 8) {
+            buf[len++] = (unsigned char)(state->hold);
+            state->hold >>= 8;
+            state->bits -= 8;
+        }
+        state->have = 0;
+        syncsearch(&(state->have), buf, len);
+    }
+
+    /* search available input */
+    len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+    strm->avail_in -= len;
+    strm->next_in += len;
+    strm->total_in += len;
+
+    /* return no joy or set up to restart inflate() on a new block */
+    if (state->have != 4) return Z_DATA_ERROR;
+    in = strm->total_in;  out = strm->total_out;
+    inflateReset(strm);
+    strm->total_in = in;  strm->total_out = out;
+    state->mode = TYPE;
+    return Z_OK;
+}
+
+/*
+   Returns true if inflate is currently at the end of a block generated by
+   Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+   implementation to provide an additional safety check. PPP uses
+   Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+   block. When decompressing, PPP checks that at the end of input packet,
+   inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
+{
+    struct inflate_state FAR *state;
+    struct inflate_state FAR *copy;
+    unsigned char FAR *window;
+    unsigned wsize;
+
+    /* check input */
+    if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
+        source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)source->state;
+
+    /* allocate space */
+    copy = (struct inflate_state FAR *)
+           ZALLOC(source, 1, sizeof(struct inflate_state));
+    if (copy == Z_NULL) return Z_MEM_ERROR;
+    window = Z_NULL;
+    if (state->window != Z_NULL) {
+        window = (unsigned char FAR *)
+                 ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+        if (window == Z_NULL) {
+            ZFREE(source, copy);
+            return Z_MEM_ERROR;
+        }
+    }
+
+    /* copy state */
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+    if (state->lencode >= state->codes &&
+        state->lencode <= state->codes + ENOUGH - 1) {
+        copy->lencode = copy->codes + (state->lencode - state->codes);
+        copy->distcode = copy->codes + (state->distcode - state->codes);
+    }
+    copy->next = copy->codes + (state->next - state->codes);
+    if (window != Z_NULL) {
+        wsize = 1U << state->wbits;
+        zmemcpy(window, state->window, wsize);
+    }
+    copy->window = window;
+    dest->state = (struct internal_state FAR *)copy;
+    return Z_OK;
+}
+
+int ZEXPORT inflateUndermine(strm, subvert)
+z_streamp strm;
+int subvert;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->sane = !subvert;
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+    return Z_OK;
+#else
+    state->sane = 1;
+    return Z_DATA_ERROR;
+#endif
+}
+
+long ZEXPORT inflateMark(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+    state = (struct inflate_state FAR *)strm->state;
+    return ((long)(state->back) << 16) +
+        (state->mode == COPY ? state->length :
+            (state->mode == MATCH ? state->was - state->length : 0));
+}
diff --git a/Source/3rd Party/wx/src/zlib/inflate.h b/Source/3rd Party/wx/src/zlib/inflate.h
index fbbc87143..95f4986d4 100644
--- a/Source/3rd Party/wx/src/zlib/inflate.h	
+++ b/Source/3rd Party/wx/src/zlib/inflate.h	
@@ -1,115 +1,122 @@
-/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2004 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* define NO_GZIP when compiling if you want to disable gzip header and
-   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
-   the crc code when it is not needed.  For shared libraries, gzip decoding
-   should be left enabled. */
-#ifndef NO_GZIP
-#  define GUNZIP
-#endif
-
-/* Possible inflate modes between inflate() calls */
-typedef enum {
-    HEAD,       /* i: waiting for magic header */
-    FLAGS,      /* i: waiting for method and flags (gzip) */
-    TIME,       /* i: waiting for modification time (gzip) */
-    OS,         /* i: waiting for extra flags and operating system (gzip) */
-    EXLEN,      /* i: waiting for extra length (gzip) */
-    EXTRA,      /* i: waiting for extra bytes (gzip) */
-    NAME,       /* i: waiting for end of file name (gzip) */
-    COMMENT,    /* i: waiting for end of comment (gzip) */
-    HCRC,       /* i: waiting for header crc (gzip) */
-    DICTID,     /* i: waiting for dictionary check value */
-    DICT,       /* waiting for inflateSetDictionary() call */
-        TYPE,       /* i: waiting for type bits, including last-flag bit */
-        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
-        STORED,     /* i: waiting for stored size (length and complement) */
-        COPY,       /* i/o: waiting for input or output to copy stored block */
-        TABLE,      /* i: waiting for dynamic block table lengths */
-        LENLENS,    /* i: waiting for code length code lengths */
-        CODELENS,   /* i: waiting for length/lit and distance code lengths */
-            LEN,        /* i: waiting for length/lit code */
-            LENEXT,     /* i: waiting for length extra bits */
-            DIST,       /* i: waiting for distance code */
-            DISTEXT,    /* i: waiting for distance extra bits */
-            MATCH,      /* o: waiting for output space to copy string */
-            LIT,        /* o: waiting for output space to write literal */
-    CHECK,      /* i: waiting for 32-bit check value */
-    LENGTH,     /* i: waiting for 32-bit length (gzip) */
-    DONE,       /* finished check, done -- remain here until reset */
-    BAD,        /* got a data error -- remain here until reset */
-    MEM,        /* got an inflate() memory error -- remain here until reset */
-    SYNC        /* looking for synchronization bytes to restart inflate() */
-} inflate_mode;
-
-/*
-    State transitions between above modes -
-
-    (most modes can go to the BAD or MEM mode -- not shown for clarity)
-
-    Process header:
-        HEAD -> (gzip) or (zlib)
-        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
-        NAME -> COMMENT -> HCRC -> TYPE
-        (zlib) -> DICTID or TYPE
-        DICTID -> DICT -> TYPE
-    Read deflate blocks:
-            TYPE -> STORED or TABLE or LEN or CHECK
-            STORED -> COPY -> TYPE
-            TABLE -> LENLENS -> CODELENS -> LEN
-    Read deflate codes:
-                LEN -> LENEXT or LIT or TYPE
-                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
-                LIT -> LEN
-    Process trailer:
-        CHECK -> LENGTH -> DONE
- */
-
-/* state maintained between inflate() calls.  Approximately 7K bytes. */
-struct inflate_state {
-    inflate_mode mode;          /* current inflate mode */
-    int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
-    int havedict;               /* true if dictionary provided */
-    int flags;                  /* gzip header method and flags (0 if zlib) */
-    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
-    unsigned long check;        /* protected copy of check value */
-    unsigned long total;        /* protected copy of output count */
-    gz_headerp head;            /* where to save gzip header information */
-        /* sliding window */
-    unsigned wbits;             /* log base 2 of requested window size */
-    unsigned wsize;             /* window size or zero if not using window */
-    unsigned whave;             /* valid bytes in the window */
-    unsigned write;             /* window write index */
-    unsigned char FAR *window;  /* allocated sliding window, if needed */
-        /* bit accumulator */
-    unsigned long hold;         /* input bit accumulator */
-    unsigned bits;              /* number of bits in "in" */
-        /* for string and stored block copying */
-    unsigned length;            /* literal or length of data to copy */
-    unsigned offset;            /* distance back to copy string from */
-        /* for table and code decoding */
-    unsigned extra;             /* extra bits needed */
-        /* fixed and dynamic code tables */
-    code const FAR *lencode;    /* starting table for length/literal codes */
-    code const FAR *distcode;   /* starting table for distance codes */
-    unsigned lenbits;           /* index bits for lencode */
-    unsigned distbits;          /* index bits for distcode */
-        /* dynamic table building */
-    unsigned ncode;             /* number of code length code lengths */
-    unsigned nlen;              /* number of length code lengths */
-    unsigned ndist;             /* number of distance code lengths */
-    unsigned have;              /* number of code lengths in lens[] */
-    code FAR *next;             /* next available space in codes[] */
-    unsigned short lens[320];   /* temporary storage for code lengths */
-    unsigned short work[288];   /* work area for code table building */
-    code codes[ENOUGH];         /* space for code tables */
-};
+/* inflate.h -- internal inflate state definition
+ * Copyright (C) 1995-2009 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip decoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GUNZIP
+#endif
+
+/* Possible inflate modes between inflate() calls */
+typedef enum {
+    HEAD,       /* i: waiting for magic header */
+    FLAGS,      /* i: waiting for method and flags (gzip) */
+    TIME,       /* i: waiting for modification time (gzip) */
+    OS,         /* i: waiting for extra flags and operating system (gzip) */
+    EXLEN,      /* i: waiting for extra length (gzip) */
+    EXTRA,      /* i: waiting for extra bytes (gzip) */
+    NAME,       /* i: waiting for end of file name (gzip) */
+    COMMENT,    /* i: waiting for end of comment (gzip) */
+    HCRC,       /* i: waiting for header crc (gzip) */
+    DICTID,     /* i: waiting for dictionary check value */
+    DICT,       /* waiting for inflateSetDictionary() call */
+        TYPE,       /* i: waiting for type bits, including last-flag bit */
+        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
+        STORED,     /* i: waiting for stored size (length and complement) */
+        COPY_,      /* i/o: same as COPY below, but only first time in */
+        COPY,       /* i/o: waiting for input or output to copy stored block */
+        TABLE,      /* i: waiting for dynamic block table lengths */
+        LENLENS,    /* i: waiting for code length code lengths */
+        CODELENS,   /* i: waiting for length/lit and distance code lengths */
+            LEN_,       /* i: same as LEN below, but only first time in */
+            LEN,        /* i: waiting for length/lit/eob code */
+            LENEXT,     /* i: waiting for length extra bits */
+            DIST,       /* i: waiting for distance code */
+            DISTEXT,    /* i: waiting for distance extra bits */
+            MATCH,      /* o: waiting for output space to copy string */
+            LIT,        /* o: waiting for output space to write literal */
+    CHECK,      /* i: waiting for 32-bit check value */
+    LENGTH,     /* i: waiting for 32-bit length (gzip) */
+    DONE,       /* finished check, done -- remain here until reset */
+    BAD,        /* got a data error -- remain here until reset */
+    MEM,        /* got an inflate() memory error -- remain here until reset */
+    SYNC        /* looking for synchronization bytes to restart inflate() */
+} inflate_mode;
+
+/*
+    State transitions between above modes -
+
+    (most modes can go to BAD or MEM on error -- not shown for clarity)
+
+    Process header:
+        HEAD -> (gzip) or (zlib) or (raw)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
+                  HCRC -> TYPE
+        (zlib) -> DICTID or TYPE
+        DICTID -> DICT -> TYPE
+        (raw) -> TYPEDO
+    Read deflate blocks:
+            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
+            STORED -> COPY_ -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN_
+            LEN_ -> LEN
+    Read deflate codes in fixed or dynamic block:
+                LEN -> LENEXT or LIT or TYPE
+                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
+                LIT -> LEN
+    Process trailer:
+        CHECK -> LENGTH -> DONE
+ */
+
+/* state maintained between inflate() calls.  Approximately 10K bytes. */
+struct inflate_state {
+    inflate_mode mode;          /* current inflate mode */
+    int last;                   /* true if processing last block */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
+    int havedict;               /* true if dictionary provided */
+    int flags;                  /* gzip header method and flags (0 if zlib) */
+    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
+    unsigned long check;        /* protected copy of check value */
+    unsigned long total;        /* protected copy of output count */
+    gz_headerp head;            /* where to save gzip header information */
+        /* sliding window */
+    unsigned wbits;             /* log base 2 of requested window size */
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+        /* bit accumulator */
+    unsigned long hold;         /* input bit accumulator */
+    unsigned bits;              /* number of bits in "in" */
+        /* for string and stored block copying */
+    unsigned length;            /* literal or length of data to copy */
+    unsigned offset;            /* distance back to copy string from */
+        /* for table and code decoding */
+    unsigned extra;             /* extra bits needed */
+        /* fixed and dynamic code tables */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+        /* dynamic table building */
+    unsigned ncode;             /* number of code length code lengths */
+    unsigned nlen;              /* number of length code lengths */
+    unsigned ndist;             /* number of distance code lengths */
+    unsigned have;              /* number of code lengths in lens[] */
+    code FAR *next;             /* next available space in codes[] */
+    unsigned short lens[320];   /* temporary storage for code lengths */
+    unsigned short work[288];   /* work area for code table building */
+    code codes[ENOUGH];         /* space for code tables */
+    int sane;                   /* if false, allow invalid distance too far */
+    int back;                   /* bits back of last unprocessed length/lit */
+    unsigned was;               /* initial length of match */
+};
diff --git a/Source/3rd Party/wx/src/zlib/inftrees.c b/Source/3rd Party/wx/src/zlib/inftrees.c
index 38ded81c3..44d89cf24 100644
--- a/Source/3rd Party/wx/src/zlib/inftrees.c	
+++ b/Source/3rd Party/wx/src/zlib/inftrees.c	
@@ -1,329 +1,306 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#define MAXBITS 15
-
-const char inflate_copyright[] =
-   " inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/*
-   Build a set of tables to decode the provided canonical Huffman code.
-   The code lengths are lens[0..codes-1].  The result starts at *table,
-   whose indices are 0..2^bits-1.  work is a writable array of at least
-   lens shorts, which is used as a work area.  type is the type of code
-   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
-   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
-   on return points to the next available entry's address.  bits is the
-   requested root table index bits, and on return it is the actual root
-   table index bits.  It will differ if the request is greater than the
-   longest code or if it is less than the shortest code.
- */
-int inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
-    unsigned len;               /* a code's length in bits */
-    unsigned sym;               /* index of code symbols */
-    unsigned min, max;          /* minimum and maximum code lengths */
-    unsigned root;              /* number of index bits for root table */
-    unsigned curr;              /* number of index bits for current table */
-    unsigned drop;              /* code bits to drop for sub-table */
-    int left;                   /* number of prefix codes available */
-    unsigned used;              /* code entries in table used */
-    unsigned huff;              /* Huffman code */
-    unsigned incr;              /* for incrementing code, index */
-    unsigned fill;              /* index for replicating entries */
-    unsigned low;               /* low bits for current root entry */
-    unsigned mask;              /* mask for low root bits */
-    code this;                  /* table entry for duplication */
-    code FAR *next;             /* next available space in table */
-    const unsigned short FAR *base;     /* base value table to use */
-    const unsigned short FAR *extra;    /* extra bits table to use */
-    int end;                    /* use base and extra for symbol > end */
-    unsigned short count[MAXBITS+1];    /* number of codes of each length */
-    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
-        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
-    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577, 0, 0};
-    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
-        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
-        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-        28, 28, 29, 29, 64, 64};
-
-    /*
-       Process a set of code lengths to create a canonical Huffman code.  The
-       code lengths are lens[0..codes-1].  Each length corresponds to the
-       symbols 0..codes-1.  The Huffman code is generated by first sorting the
-       symbols by length from short to long, and retaining the symbol order
-       for codes with equal lengths.  Then the code starts with all zero bits
-       for the first code of the shortest length, and the codes are integer
-       increments for the same length, and zeros are appended as the length
-       increases.  For the deflate format, these bits are stored backwards
-       from their more natural integer increment ordering, and so when the
-       decoding tables are built in the large loop below, the integer codes
-       are incremented backwards.
-
-       This routine assumes, but does not check, that all of the entries in
-       lens[] are in the range 0..MAXBITS.  The caller must assure this.
-       1..MAXBITS is interpreted as that code length.  zero means that that
-       symbol does not occur in this code.
-
-       The codes are sorted by computing a count of codes for each length,
-       creating from that a table of starting indices for each length in the
-       sorted table, and then entering the symbols in order in the sorted
-       table.  The sorted table is work[], with that space being provided by
-       the caller.
-
-       The length counts are used for other purposes as well, i.e. finding
-       the minimum and maximum length codes, determining if there are any
-       codes at all, checking for a valid set of lengths, and looking ahead
-       at length counts to determine sub-table sizes when building the
-       decoding tables.
-     */
-
-    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
-    for (len = 0; len <= MAXBITS; len++)
-        count[len] = 0;
-    for (sym = 0; sym < codes; sym++)
-        count[lens[sym]]++;
-
-    /* bound code lengths, force root to be within code lengths */
-    root = *bits;
-    for (max = MAXBITS; max >= 1; max--)
-        if (count[max] != 0) break;
-    if (root > max) root = max;
-    if (max == 0) {                     /* no symbols to code at all */
-        this.op = (unsigned char)64;    /* invalid code marker */
-        this.bits = (unsigned char)1;
-        this.val = (unsigned short)0;
-        *(*table)++ = this;             /* make a table to force an error */
-        *(*table)++ = this;
-        *bits = 1;
-        return 0;     /* no symbols, but wait for decoding to report error */
-    }
-    for (min = 1; min <= MAXBITS; min++)
-        if (count[min] != 0) break;
-    if (root < min) root = min;
-
-    /* check for an over-subscribed or incomplete set of lengths */
-    left = 1;
-    for (len = 1; len <= MAXBITS; len++) {
-        left <<= 1;
-        left -= count[len];
-        if (left < 0) return -1;        /* over-subscribed */
-    }
-    if (left > 0 && (type == CODES || max != 1))
-        return -1;                      /* incomplete set */
-
-    /* generate offsets into symbol table for each length for sorting */
-    offs[1] = 0;
-    for (len = 1; len < MAXBITS; len++)
-        offs[len + 1] = offs[len] + count[len];
-
-    /* sort symbols by length, by symbol order within each length */
-    for (sym = 0; sym < codes; sym++)
-        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
-
-    /*
-       Create and fill in decoding tables.  In this loop, the table being
-       filled is at next and has curr index bits.  The code being used is huff
-       with length len.  That code is converted to an index by dropping drop
-       bits off of the bottom.  For codes where len is less than drop + curr,
-       those top drop + curr - len bits are incremented through all values to
-       fill the table with replicated entries.
-
-       root is the number of index bits for the root table.  When len exceeds
-       root, sub-tables are created pointed to by the root entry with an index
-       of the low root bits of huff.  This is saved in low to check for when a
-       new sub-table should be started.  drop is zero when the root table is
-       being filled, and drop is root when sub-tables are being filled.
-
-       When a new sub-table is needed, it is necessary to look ahead in the
-       code lengths to determine what size sub-table is needed.  The length
-       counts are used for this, and so count[] is decremented as codes are
-       entered in the tables.
-
-       used keeps track of how many table entries have been allocated from the
-       provided *table space.  It is checked when a LENS table is being made
-       against the space in *table, ENOUGH, minus the maximum space needed by
-       the worst case distance code, MAXD.  This should never happen, but the
-       sufficiency of ENOUGH has not been proven exhaustively, hence the check.
-       This assumes that when type == LENS, bits == 9.
-
-       sym increments through all symbols, and the loop terminates when
-       all codes of length max, i.e. all codes, have been processed.  This
-       routine permits incomplete codes, so another loop after this one fills
-       in the rest of the decoding tables with invalid code markers.
-     */
-
-    /* set up for code type */
-    switch (type) {
-    case CODES:
-        base = extra = work;    /* dummy value--not used */
-        end = 19;
-        break;
-    case LENS:
-        base = lbase;
-        base -= 257;
-        extra = lext;
-        extra -= 257;
-        end = 256;
-        break;
-    default:            /* DISTS */
-        base = dbase;
-        extra = dext;
-        end = -1;
-    }
-
-    /* initialize state for loop */
-    huff = 0;                   /* starting code */
-    sym = 0;                    /* starting code symbol */
-    len = min;                  /* starting code length */
-    next = *table;              /* current table to fill in */
-    curr = root;                /* current table index bits */
-    drop = 0;                   /* current bits to drop from code for index */
-    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
-    used = 1U << root;          /* use root table entries */
-    mask = used - 1;            /* mask for comparing low */
-
-    /* check available table space */
-    if (type == LENS && used >= ENOUGH - MAXD)
-        return 1;
-
-    /* process all codes and make table entries */
-    for (;;) {
-        /* create table entry */
-        this.bits = (unsigned char)(len - drop);
-        if ((int)(work[sym]) < end) {
-            this.op = (unsigned char)0;
-            this.val = work[sym];
-        }
-        else if ((int)(work[sym]) > end) {
-            this.op = (unsigned char)(extra[work[sym]]);
-            this.val = base[work[sym]];
-        }
-        else {
-            this.op = (unsigned char)(32 + 64);         /* end of block */
-            this.val = 0;
-        }
-
-        /* replicate for those indices with low len bits equal to huff */
-        incr = 1U << (len - drop);
-        fill = 1U << curr;
-        min = fill;                 /* save offset to next table */
-        do {
-            fill -= incr;
-            next[(huff >> drop) + fill] = this;
-        } while (fill != 0);
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-
-        /* go to next symbol, update count, len */
-        sym++;
-        if (--(count[len]) == 0) {
-            if (len == max) break;
-            len = lens[work[sym]];
-        }
-
-        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low) {
-            /* if first time, transition to sub-tables */
-            if (drop == 0)
-                drop = root;
-
-            /* increment past last table */
-            next += min;            /* here min is 1 << curr */
-
-            /* determine length of next table */
-            curr = len - drop;
-            left = (int)(1 << curr);
-            while (curr + drop < max) {
-                left -= count[curr + drop];
-                if (left <= 0) break;
-                curr++;
-                left <<= 1;
-            }
-
-            /* check for enough space */
-            used += 1U << curr;
-            if (type == LENS && used >= ENOUGH - MAXD)
-                return 1;
-
-            /* point entry in root table to sub-table */
-            low = huff & mask;
-            (*table)[low].op = (unsigned char)curr;
-            (*table)[low].bits = (unsigned char)root;
-            (*table)[low].val = (unsigned short)(next - *table);
-        }
-    }
-
-    /*
-       Fill in rest of table for incomplete codes.  This loop is similar to the
-       loop above in incrementing huff for table indices.  It is assumed that
-       len is equal to curr + drop, so there is no loop needed to increment
-       through high index bits.  When the current sub-table is filled, the loop
-       drops back to the root table to fill in any remaining entries there.
-     */
-    this.op = (unsigned char)64;                /* invalid code marker */
-    this.bits = (unsigned char)(len - drop);
-    this.val = (unsigned short)0;
-    while (huff != 0) {
-        /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & mask) != low) {
-            drop = 0;
-            len = root;
-            next = *table;
-            this.bits = (unsigned char)len;
-        }
-
-        /* put invalid code marker in table */
-        next[huff >> drop] = this;
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
-    }
-
-    /* set return parameters */
-    *table += used;
-    *bits = root;
-    return 0;
-}
+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2013 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#define MAXBITS 15
+
+const char inflate_copyright[] =
+   " inflate 1.2.8 Copyright 1995-2013 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/*
+   Build a set of tables to decode the provided canonical Huffman code.
+   The code lengths are lens[0..codes-1].  The result starts at *table,
+   whose indices are 0..2^bits-1.  work is a writable array of at least
+   lens shorts, which is used as a work area.  type is the type of code
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
+   on return points to the next available entry's address.  bits is the
+   requested root table index bits, and on return it is the actual root
+   table index bits.  It will differ if the request is greater than the
+   longest code or if it is less than the shortest code.
+ */
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+    unsigned len;               /* a code's length in bits */
+    unsigned sym;               /* index of code symbols */
+    unsigned min, max;          /* minimum and maximum code lengths */
+    unsigned root;              /* number of index bits for root table */
+    unsigned curr;              /* number of index bits for current table */
+    unsigned drop;              /* code bits to drop for sub-table */
+    int left;                   /* number of prefix codes available */
+    unsigned used;              /* code entries in table used */
+    unsigned huff;              /* Huffman code */
+    unsigned incr;              /* for incrementing code, index */
+    unsigned fill;              /* index for replicating entries */
+    unsigned low;               /* low bits for current root entry */
+    unsigned mask;              /* mask for low root bits */
+    code here;                  /* table entry for duplication */
+    code FAR *next;             /* next available space in table */
+    const unsigned short FAR *base;     /* base value table to use */
+    const unsigned short FAR *extra;    /* extra bits table to use */
+    int end;                    /* use base and extra for symbol > end */
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577, 0, 0};
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
+        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+        28, 28, 29, 29, 64, 64};
+
+    /*
+       Process a set of code lengths to create a canonical Huffman code.  The
+       code lengths are lens[0..codes-1].  Each length corresponds to the
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the
+       symbols by length from short to long, and retaining the symbol order
+       for codes with equal lengths.  Then the code starts with all zero bits
+       for the first code of the shortest length, and the codes are integer
+       increments for the same length, and zeros are appended as the length
+       increases.  For the deflate format, these bits are stored backwards
+       from their more natural integer increment ordering, and so when the
+       decoding tables are built in the large loop below, the integer codes
+       are incremented backwards.
+
+       This routine assumes, but does not check, that all of the entries in
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.
+       1..MAXBITS is interpreted as that code length.  zero means that that
+       symbol does not occur in this code.
+
+       The codes are sorted by computing a count of codes for each length,
+       creating from that a table of starting indices for each length in the
+       sorted table, and then entering the symbols in order in the sorted
+       table.  The sorted table is work[], with that space being provided by
+       the caller.
+
+       The length counts are used for other purposes as well, i.e. finding
+       the minimum and maximum length codes, determining if there are any
+       codes at all, checking for a valid set of lengths, and looking ahead
+       at length counts to determine sub-table sizes when building the
+       decoding tables.
+     */
+
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++)
+        count[len] = 0;
+    for (sym = 0; sym < codes; sym++)
+        count[lens[sym]]++;
+
+    /* bound code lengths, force root to be within code lengths */
+    root = *bits;
+    for (max = MAXBITS; max >= 1; max--)
+        if (count[max] != 0) break;
+    if (root > max) root = max;
+    if (max == 0) {                     /* no symbols to code at all */
+        here.op = (unsigned char)64;    /* invalid code marker */
+        here.bits = (unsigned char)1;
+        here.val = (unsigned short)0;
+        *(*table)++ = here;             /* make a table to force an error */
+        *(*table)++ = here;
+        *bits = 1;
+        return 0;     /* no symbols, but wait for decoding to report error */
+    }
+    for (min = 1; min < max; min++)
+        if (count[min] != 0) break;
+    if (root < min) root = min;
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;
+        left -= count[len];
+        if (left < 0) return -1;        /* over-subscribed */
+    }
+    if (left > 0 && (type == CODES || max != 1))
+        return -1;                      /* incomplete set */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + count[len];
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++)
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
+
+    /*
+       Create and fill in decoding tables.  In this loop, the table being
+       filled is at next and has curr index bits.  The code being used is huff
+       with length len.  That code is converted to an index by dropping drop
+       bits off of the bottom.  For codes where len is less than drop + curr,
+       those top drop + curr - len bits are incremented through all values to
+       fill the table with replicated entries.
+
+       root is the number of index bits for the root table.  When len exceeds
+       root, sub-tables are created pointed to by the root entry with an index
+       of the low root bits of huff.  This is saved in low to check for when a
+       new sub-table should be started.  drop is zero when the root table is
+       being filled, and drop is root when sub-tables are being filled.
+
+       When a new sub-table is needed, it is necessary to look ahead in the
+       code lengths to determine what size sub-table is needed.  The length
+       counts are used for this, and so count[] is decremented as codes are
+       entered in the tables.
+
+       used keeps track of how many table entries have been allocated from the
+       provided *table space.  It is checked for LENS and DIST tables against
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+       the initial root table size constants.  See the comments in inftrees.h
+       for more information.
+
+       sym increments through all symbols, and the loop terminates when
+       all codes of length max, i.e. all codes, have been processed.  This
+       routine permits incomplete codes, so another loop after this one fills
+       in the rest of the decoding tables with invalid code markers.
+     */
+
+    /* set up for code type */
+    switch (type) {
+    case CODES:
+        base = extra = work;    /* dummy value--not used */
+        end = 19;
+        break;
+    case LENS:
+        base = lbase;
+        base -= 257;
+        extra = lext;
+        extra -= 257;
+        end = 256;
+        break;
+    default:            /* DISTS */
+        base = dbase;
+        extra = dext;
+        end = -1;
+    }
+
+    /* initialize state for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = *table;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
+    used = 1U << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if ((type == LENS && used > ENOUGH_LENS) ||
+        (type == DISTS && used > ENOUGH_DISTS))
+        return 1;
+
+    /* process all codes and make table entries */
+    for (;;) {
+        /* create table entry */
+        here.bits = (unsigned char)(len - drop);
+        if ((int)(work[sym]) < end) {
+            here.op = (unsigned char)0;
+            here.val = work[sym];
+        }
+        else if ((int)(work[sym]) > end) {
+            here.op = (unsigned char)(extra[work[sym]]);
+            here.val = base[work[sym]];
+        }
+        else {
+            here.op = (unsigned char)(32 + 64);         /* end of block */
+            here.val = 0;
+        }
+
+        /* replicate for those indices with low len bits equal to huff */
+        incr = 1U << (len - drop);
+        fill = 1U << curr;
+        min = fill;                 /* save offset to next table */
+        do {
+            fill -= incr;
+            next[(huff >> drop) + fill] = here;
+        } while (fill != 0);
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+
+        /* go to next symbol, update count, len */
+        sym++;
+        if (--(count[len]) == 0) {
+            if (len == max) break;
+            len = lens[work[sym]];
+        }
+
+        /* create new sub-table if needed */
+        if (len > root && (huff & mask) != low) {
+            /* if first time, transition to sub-tables */
+            if (drop == 0)
+                drop = root;
+
+            /* increment past last table */
+            next += min;            /* here min is 1 << curr */
+
+            /* determine length of next table */
+            curr = len - drop;
+            left = (int)(1 << curr);
+            while (curr + drop < max) {
+                left -= count[curr + drop];
+                if (left <= 0) break;
+                curr++;
+                left <<= 1;
+            }
+
+            /* check for enough space */
+            used += 1U << curr;
+            if ((type == LENS && used > ENOUGH_LENS) ||
+                (type == DISTS && used > ENOUGH_DISTS))
+                return 1;
+
+            /* point entry in root table to sub-table */
+            low = huff & mask;
+            (*table)[low].op = (unsigned char)curr;
+            (*table)[low].bits = (unsigned char)root;
+            (*table)[low].val = (unsigned short)(next - *table);
+        }
+    }
+
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
+       at most one remaining entry, since if the code is incomplete, the
+       maximum code length that was allowed to get this far is one bit) */
+    if (huff != 0) {
+        here.op = (unsigned char)64;            /* invalid code marker */
+        here.bits = (unsigned char)(len - drop);
+        here.val = (unsigned short)0;
+        next[huff] = here;
+    }
+
+    /* set return parameters */
+    *table += used;
+    *bits = root;
+    return 0;
+}
diff --git a/Source/3rd Party/wx/src/zlib/inftrees.h b/Source/3rd Party/wx/src/zlib/inftrees.h
index dc0fd567e..baa53a0b1 100644
--- a/Source/3rd Party/wx/src/zlib/inftrees.h	
+++ b/Source/3rd Party/wx/src/zlib/inftrees.h	
@@ -1,55 +1,62 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2005 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Structure for decoding tables.  Each entry provides either the
-   information needed to do the operation requested by the code that
-   indexed that table entry, or it provides a pointer to another
-   table that indexes more bits of the code.  op indicates whether
-   the entry is a pointer to another table, a literal, a length or
-   distance, an end-of-block, or an invalid code.  For a table
-   pointer, the low four bits of op is the number of index bits of
-   that table.  For a length or distance, the low four bits of op
-   is the number of extra bits to get after the code.  bits is
-   the number of bits in this code or part of the code to drop off
-   of the bit buffer.  val is the actual byte to output in the case
-   of a literal, the base length or distance, or the offset from
-   the current table to the next table.  Each entry is four bytes. */
-typedef struct {
-    unsigned char op;           /* operation, extra bits, table bits */
-    unsigned char bits;         /* bits in this part of the code */
-    unsigned short val;         /* offset in table or code value */
-} code;
-
-/* op values as set by inflate_table():
-    00000000 - literal
-    0000tttt - table link, tttt != 0 is the number of table index bits
-    0001eeee - length or distance, eeee is the number of extra bits
-    01100000 - end of block
-    01000000 - invalid code
- */
-
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1444 code structures (852 for length/literals
-   and 592 for distances, the latter actually the result of an
-   exhaustive search).  The true maximum is not known, but the value
-   below is more than safe. */
-#define ENOUGH 2048
-#define MAXD 592
-
-/* Type of code to build for inftable() */
-typedef enum {
-    CODES,
-    LENS,
-    DISTS
-} codetype;
-
-extern int inflate_table OF((codetype type, unsigned short FAR *lens,
-                             unsigned codes, code FAR * FAR *table,
-                             unsigned FAR *bits, unsigned short FAR *work));
+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2005, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of the dynamic table.  The maximum number of code structures is
+   1444, which is the sum of 852 for literal/length codes and 592 for distance
+   codes.  These values were found by exhaustive searches using the program
+   examples/enough.c found in the zlib distribtution.  The arguments to that
+   program are the number of symbols, the initial root table size, and the
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
+   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
+   The initial root table size (9 or 6) is found in the fifth argument of the
+   inflate_table() calls in inflate.c and infback.c.  If the root table size is
+   changed, then these maximum sizes would be need to be recalculated and
+   updated. */
+#define ENOUGH_LENS 852
+#define ENOUGH_DISTS 592
+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
+
+/* Type of code to build for inflate_table() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));
diff --git a/Source/3rd Party/wx/src/zlib/trees.c b/Source/3rd Party/wx/src/zlib/trees.c
index d07b20532..b7002b16a 100644
--- a/Source/3rd Party/wx/src/zlib/trees.c	
+++ b/Source/3rd Party/wx/src/zlib/trees.c	
@@ -1,1219 +1,1225 @@
-/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2005 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process uses several Huffman trees. The more
- *      common source values are represented by shorter bit sequences.
- *
- *      Each code tree is stored in a compressed form which is itself
- * a Huffman encoding of the lengths of all the code strings (in
- * ascending order by source values).  The actual code strings are
- * reconstructed from the lengths in the inflate process, as described
- * in the deflate specification.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
- *
- *      Storer, James A.
- *          Data Compression:  Methods and Theory, pp. 49-50.
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
- *
- *      Sedgewick, R.
- *          Algorithms, p290.
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
- */
-
-/* @(#) $Id$ */
-
-/* #define GEN_TREES_H */
-
-#include "deflate.h"
-
-#ifdef DEBUG
-#  include <ctype.h>
-#endif
-
-/* ===========================================================================
- * Constants
- */
-
-#define MAX_BL_BITS 7
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-#define END_BLOCK 256
-/* end of block literal code */
-
-#define REP_3_6      16
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-#define REPZ_3_10    17
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-#define REPZ_11_138  18
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-
-local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-
-local const uch bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-#define Buf_size (8 * 2*sizeof(char))
-/* Number of bits used within bi_buf. (bi_buf might be implemented on
- * more than 16 bits on some systems.)
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-/* non ANSI compilers may not accept trees.h */
-
-local ct_data static_ltree[L_CODES+2];
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-local ct_data static_dtree[D_CODES];
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-uch _dist_code[DIST_CODE_LEN];
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-uch _length_code[MAX_MATCH-MIN_MATCH+1];
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-local int base_length[LENGTH_CODES];
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-local int base_dist[D_CODES];
-/* First normalized distance for each code (0 = distance of 1) */
-
-#else
-#  include "trees.h"
-#endif /* GEN_TREES_H */
-
-struct static_tree_desc_s {
-    const ct_data *static_tree;  /* static tree or NULL */
-    const intf *extra_bits;      /* extra bits for each code or NULL */
-    int     extra_base;          /* base index for extra_bits */
-    int     elems;               /* max number of elements in the tree */
-    int     max_length;          /* max bit length for the codes */
-};
-
-local static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-
-local static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
-
-local static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
-
-/* ===========================================================================
- * Local (static) routines in this file.
- */
-
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, ct_data *ltree,
-                              ct_data *dtree));
-local void set_data_type  OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                              int header));
-
-#ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
-#endif
-
-#ifndef DEBUG
-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-   /* Send a code of the given tree. c and tree must not have side effects */
-
-#else /* DEBUG */
-#  define send_code(s, c, tree) \
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-       send_bits(s, tree[c].Code, tree[c].Len); }
-#endif
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-#ifdef DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-    Tracevv((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid) & 0xFFFF;
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
-#else /* !DEBUG */
-
-#define send_bits(s, value, length) \
-{ int len = length;\
-  if (s->bi_valid > (int)Buf_size - len) {\
-    int val = value;\
-    s->bi_buf |= (val << s->bi_valid);\
-    put_short(s, s->bi_buf);\
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-    s->bi_valid += len - Buf_size;\
-  } else {\
-    s->bi_buf |= (value) << s->bi_valid;\
-    s->bi_valid += len;\
-  }\
-}
-#endif /* DEBUG */
-
-
-/* the arguments must not have side effects */
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-local void tr_static_init()
-{
-#if defined(GEN_TREES_H) || !defined(STDC)
-    static int static_init_done = 0;
-    int n;        /* iterates over tree elements */
-    int bits;     /* bit counter */
-    int length;   /* length value */
-    int code;     /* code value */
-    int dist;     /* distance index */
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    if (static_init_done) return;
-
-    /* For some embedded targets, global variables are not initialized: */
-    static_l_desc.static_tree = static_ltree;
-    static_l_desc.extra_bits = extra_lbits;
-    static_d_desc.static_tree = static_dtree;
-    static_d_desc.extra_bits = extra_dbits;
-    static_bl_desc.extra_bits = extra_blbits;
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            _length_code[length++] = (uch)code;
-        }
-    }
-    Assert (length == 256, "tr_static_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented
-     * in two different ways: code 284 + 5 bits or code 285, so we
-     * overwrite length_code[255] to use the best encoding:
-     */
-    _length_code[length-1] = (uch)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0 ; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            _dist_code[dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            _dist_code[256 + dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the
-     * tree construction to get a canonical Huffman tree (longest code
-     * all ones)
-     */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-    }
-    static_init_done = 1;
-
-#  ifdef GEN_TREES_H
-    gen_trees_header();
-#  endif
-#endif /* defined(GEN_TREES_H) || !defined(STDC) */
-}
-
-/* ===========================================================================
- * Genererate the file trees.h describing the static trees.
- */
-#ifdef GEN_TREES_H
-#  ifndef DEBUG
-#    include <stdio.h>
-#  endif
-
-#  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
-
-void gen_trees_header()
-{
-    FILE *header = fopen("trees.h", "w");
-    int i;
-
-    Assert (header != NULL, "Can't open trees.h");
-    fprintf(header,
-            "/* header created automatically with -DGEN_TREES_H */\n\n");
-
-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
-        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-    }
-
-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-    }
-
-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
-    for (i = 0; i < DIST_CODE_LEN; i++) {
-        fprintf(header, "%2u%s", _dist_code[i],
-                SEPARATOR(i, DIST_CODE_LEN-1, 20));
-    }
-
-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-        fprintf(header, "%2u%s", _length_code[i],
-                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-    }
-
-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-    for (i = 0; i < LENGTH_CODES; i++) {
-        fprintf(header, "%1u%s", base_length[i],
-                SEPARATOR(i, LENGTH_CODES-1, 20));
-    }
-
-    fprintf(header, "local const int base_dist[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-        fprintf(header, "%5u%s", base_dist[i],
-                SEPARATOR(i, D_CODES-1, 10));
-    }
-
-    fclose(header);
-}
-#endif /* GEN_TREES_H */
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-void _tr_init(s)
-    deflate_state *s;
-{
-    tr_static_init();
-
-    s->l_desc.dyn_tree = s->dyn_ltree;
-    s->l_desc.stat_desc = &static_l_desc;
-
-    s->d_desc.dyn_tree = s->dyn_dtree;
-    s->d_desc.stat_desc = &static_d_desc;
-
-    s->bl_desc.dyn_tree = s->bl_tree;
-    s->bl_desc.stat_desc = &static_bl_desc;
-
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-#ifdef DEBUG
-    s->compressed_len = 0L;
-    s->bits_sent = 0L;
-#endif
-
-    /* Initialize the first block of the first file: */
-    init_block(s);
-}
-
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(s)
-    deflate_state *s;
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
-#define SMALLEST 1
-/* Index within the heap array of least frequent node in the Huffman tree */
-
-
-/* ===========================================================================
- * Remove the smallest element from the heap and recreate the heap with
- * one less element. Updates heap and heap_len.
- */
-#define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-#define smaller(tree, n, m, depth) \
-   (tree[n].Freq < tree[m].Freq || \
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-{
-    int v = s->heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= s->heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-            j++;
-        }
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, s->heap[j], s->depth)) break;
-
-        /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];  k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    s->heap[k] = v;
-}
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
-{
-    ct_data *tree        = desc->dyn_tree;
-    int max_code         = desc->max_code;
-    const ct_data *stree = desc->stat_desc->static_tree;
-    const intf *extra    = desc->stat_desc->extra_bits;
-    int base             = desc->stat_desc->extra_base;
-    int max_length       = desc->stat_desc->max_length;
-    int h;              /* heap index */
-    int n, m;           /* iterate over the tree elements */
-    int bits;           /* bit length */
-    int xbits;          /* extra bits */
-    ush f;              /* frequency */
-    int overflow = 0;   /* number of elements with bit length too large */
-
-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-        n = s->heap[h];
-        bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
-        tree[n].Len = (ush)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) continue; /* not a leaf node */
-
-        s->bl_count[bits]++;
-        xbits = 0;
-        if (n >= base) xbits = extra[n-base];
-        f = tree[n].Freq;
-        s->opt_len += (ulg)f * (bits + xbits);
-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
-    }
-    if (overflow == 0) return;
-
-    Trace((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length-1;
-        while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-        s->bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = s->bl_count[bits];
-        while (n != 0) {
-            m = s->heap[--h];
-            if (m > max_code) continue;
-            if ((unsigned) tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
-                tree[m].Len = (ush)bits;
-            }
-            n--;
-        }
-    }
-}
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    ush code = 0;              /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
-{
-    ct_data *tree         = desc->dyn_tree;
-    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems             = desc->stat_desc->elems;
-    int n, m;          /* iterate over heap elements */
-    int max_code = -1; /* largest code with non zero frequency */
-    int node;          /* new node being created */
-
-    /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-     * heap[0] is not used.
-     */
-    s->heap_len = 0, s->heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            s->heap[++(s->heap_len)] = max_code = n;
-            s->depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (s->heap_len < 2) {
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[node].Freq = 1;
-        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* node is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    node = elems;              /* next internal node of the tree */
-    do {
-        pqremove(s, tree, n);  /* n = node of least frequency */
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */
-
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-        s->heap[--(s->heap_max)] = m;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
-                                s->depth[n] : s->depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (ush)node;
-#ifdef DUMP_BL_TREE
-        if (tree == s->bl_tree) {
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-        }
-#endif
-        /* and insert the new node in the heap */
-        s->heap[SMALLEST] = node++;
-        pqdownheap(s, tree, SMALLEST);
-
-    } while (s->heap_len >= 2);
-
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen(s, (tree_desc *)desc);
-
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data *)tree, max_code, s->bl_count);
-}
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-            s->bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            s->bl_tree[REPZ_3_10].Freq++;
-        } else {
-            s->bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) max_count = 138, min_count = 3;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree); count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
-
-        } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
-
-        } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-local int build_bl_tree(s)
-    deflate_state *s;
-{
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    /* Determine the bit length frequencies for literal and distance trees */
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-
-    /* Build the bit length tree: */
-    build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-    }
-    /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*(max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-            s->opt_len, s->static_len));
-
-    return max_blindex;
-}
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
-    int rank;                    /* index in bl_order */
-
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-            "too many codes");
-    Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-    }
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-/* ===========================================================================
- * Send a stored block
- */
-void _tr_stored_block(s, buf, stored_len, eof)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
-#ifdef DEBUG
-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-    s->compressed_len += (stored_len + 4) << 3;
-#endif
-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
-}
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- * The current inflate code requires 9 bits of lookahead. If the
- * last two codes for the previous block (real code plus EOB) were coded
- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
- * the last real code. In this case we send two empty static blocks instead
- * of one. (There are no problems if the previous block is stored or fixed.)
- * To simplify the code, we assume the worst case of last real code encoded
- * on one bit only.
- */
-void _tr_align(s)
-    deflate_state *s;
-{
-    send_bits(s, STATIC_TREES<<1, 3);
-    send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
-#endif
-    bi_flush(s);
-    /* Of the 10 bits for the empty block, we have already sent
-     * (10 - bi_valid) bits. The lookahead for the last real code (before
-     * the EOB of the previous block) was thus at least one plus the length
-     * of the EOB plus what we have just sent of the empty static block.
-     */
-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
-        send_bits(s, STATIC_TREES<<1, 3);
-        send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-        s->compressed_len += 10L;
-#endif
-        bi_flush(s);
-    }
-    s->last_eob_len = 7;
-}
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
- */
-void _tr_flush_block(s, buf, stored_len, eof)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
-{
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */
-
-    /* Build the Huffman trees unless a stored block is forced */
-    if (s->level > 0) {
-
-        /* Check if the file is binary or text */
-        if (stored_len > 0 && s->strm->data_type == Z_UNKNOWN)
-            set_data_type(s);
-
-        /* Construct the literal and distance trees */
-        build_tree(s, (tree_desc *)(&(s->l_desc)));
-        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-
-        build_tree(s, (tree_desc *)(&(s->d_desc)));
-        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-                s->static_len));
-        /* At this point, opt_len and static_len are the total bit lengths of
-         * the compressed block data, excluding the tree representations.
-         */
-
-        /* Build the bit length tree for the above two trees, and get the index
-         * in bl_order of the last bit length code to send.
-         */
-        max_blindex = build_bl_tree(s);
-
-        /* Determine the best encoding. Compute the block lengths in bytes. */
-        opt_lenb = (s->opt_len+3+7)>>3;
-        static_lenb = (s->static_len+3+7)>>3;
-
-        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-                s->last_lit));
-
-        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-
-    } else {
-        Assert(buf != (char*)0, "lost buf");
-        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-    }
-
-#ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
-#else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-                       /* 4: two words for the lengths */
-#endif
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        _tr_stored_block(s, buf, stored_len, eof);
-
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+eof, 3);
-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->static_len;
-#endif
-    } else {
-        send_bits(s, (DYN_TREES<<1)+eof, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->opt_len;
-#endif
-    }
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-    /* The above check is made mod 2^32, for files larger than 512 MB
-     * and uLong implemented on 32 bits.
-     */
-    init_block(s);
-
-    if (eof) {
-        bi_windup(s);
-#ifdef DEBUG
-        s->compressed_len += 7;  /* align on byte boundary */
-#endif
-    }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*eof));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-int _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
-    if (dist == 0) {
-        /* lc is the unmatched char */
-        s->dyn_ltree[lc].Freq++;
-    } else {
-        s->matches++;
-        /* Here, lc is the match length - MIN_MATCH */
-        dist--;             /* dist = match distance - 1 */
-        Assert((ush)dist < (ush)MAX_DIST(s) &&
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-        s->dyn_dtree[d_code(dist)].Freq++;
-    }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    ct_data *ltree; /* literal tree */
-    ct_data *dtree; /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
-               "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-    s->last_eob_len = ltree[END_BLOCK].Len;
-}
-
-/* ===========================================================================
- * Set the data type to BINARY or TEXT, using a crude approximation:
- * set it to Z_TEXT if all symbols are either printable characters (33 to 255)
- * or white spaces (9 to 13, or 32); or set it to Z_BINARY otherwise.
- * IN assertion: the fields Freq of dyn_ltree are set.
- */
-local void set_data_type(s)
-    deflate_state *s;
-{
-    int n;
-
-    for (n = 0; n < 9; n++)
-        if (s->dyn_ltree[n].Freq != 0)
-            break;
-    if (n == 9)
-        for (n = 14; n < 32; n++)
-            if (s->dyn_ltree[n].Freq != 0)
-                break;
-    s->strm->data_type = (n == 32) ? Z_TEXT : Z_BINARY;
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(s)
-    deflate_state *s;
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(s)
-    deflate_state *s;
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(s, buf, len, header)
-    deflate_state *s;
-    charf    *buf;    /* the input data */
-    unsigned len;     /* its length */
-    int      header;  /* true if block header must be written */
-{
-    bi_windup(s);        /* align on byte boundary */
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-
-    if (header) {
-        put_short(s, (ush)len);
-        put_short(s, (ush)~len);
-#ifdef DEBUG
-        s->bits_sent += 2*16;
-#endif
-    }
-#ifdef DEBUG
-    s->bits_sent += (ulg)len<<3;
-#endif
-    while (len--) {
-        put_byte(s, *buf++);
-    }
-}
+/* trees.c -- output deflated data using Huffman coding
+ * Copyright (C) 1995-2012 Jean-loup Gailly
+ * detect_data_type() function provided freely by Cosmin Truta, 2006
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ *  ALGORITHM
+ *
+ *      The "deflation" process uses several Huffman trees. The more
+ *      common source values are represented by shorter bit sequences.
+ *
+ *      Each code tree is stored in a compressed form which is itself
+ * a Huffman encoding of the lengths of all the code strings (in
+ * ascending order by source values).  The actual code strings are
+ * reconstructed from the lengths in the inflate process, as described
+ * in the deflate specification.
+ *
+ *  REFERENCES
+ *
+ *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
+ *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
+ *
+ *      Storer, James A.
+ *          Data Compression:  Methods and Theory, pp. 49-50.
+ *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
+ *
+ *      Sedgewick, R.
+ *          Algorithms, p290.
+ *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
+ */
+
+
+/* #define GEN_TREES_H */
+
+#include "deflate.h"
+
+#ifdef DEBUG
+#  include <ctype.h>
+#endif
+
+/* ===========================================================================
+ * Constants
+ */
+
+#define MAX_BL_BITS 7
+/* Bit length codes must not exceed MAX_BL_BITS bits */
+
+#define END_BLOCK 256
+/* end of block literal code */
+
+#define REP_3_6      16
+/* repeat previous bit length 3-6 times (2 bits of repeat count) */
+
+#define REPZ_3_10    17
+/* repeat a zero length 3-10 times  (3 bits of repeat count) */
+
+#define REPZ_11_138  18
+/* repeat a zero length 11-138 times  (7 bits of repeat count) */
+
+local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
+   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
+
+local const int extra_dbits[D_CODES] /* extra bits for each distance code */
+   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
+   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
+
+local const uch bl_order[BL_CODES]
+   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
+/* The lengths of the bit length codes are sent in order of decreasing
+ * probability, to avoid transmitting the lengths for unused bit length codes.
+ */
+
+/* ===========================================================================
+ * Local data. These are initialized only once.
+ */
+
+#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
+
+#if defined(GEN_TREES_H) || !defined(STDC)
+/* non ANSI compilers may not accept trees.h */
+
+local ct_data static_ltree[L_CODES+2];
+/* The static literal tree. Since the bit lengths are imposed, there is no
+ * need for the L_CODES extra codes used during heap construction. However
+ * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
+ * below).
+ */
+
+local ct_data static_dtree[D_CODES];
+/* The static distance tree. (Actually a trivial tree since all codes use
+ * 5 bits.)
+ */
+
+uch _dist_code[DIST_CODE_LEN];
+/* Distance codes. The first 256 values correspond to the distances
+ * 3 .. 258, the last 256 values correspond to the top 8 bits of
+ * the 15 bit distances.
+ */
+
+uch _length_code[MAX_MATCH-MIN_MATCH+1];
+/* length code for each normalized match length (0 == MIN_MATCH) */
+
+local int base_length[LENGTH_CODES];
+/* First normalized length for each code (0 = MIN_MATCH) */
+
+local int base_dist[D_CODES];
+/* First normalized distance for each code (0 = distance of 1) */
+
+#else
+#  include "trees.h"
+#endif /* GEN_TREES_H */
+
+struct static_tree_desc_s {
+    const ct_data *static_tree;  /* static tree or NULL */
+    const intf *extra_bits;      /* extra bits for each code or NULL */
+    int     extra_base;          /* base index for extra_bits */
+    int     elems;               /* max number of elements in the tree */
+    int     max_length;          /* max bit length for the codes */
+};
+
+local static_tree_desc  static_l_desc =
+{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
+
+local static_tree_desc  static_d_desc =
+{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
+
+local static_tree_desc  static_bl_desc =
+{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
+
+/* ===========================================================================
+ * Local (static) routines in this file.
+ */
+
+local void tr_static_init OF((void));
+local void init_block     OF((deflate_state *s));
+local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
+local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
+local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
+local void build_tree     OF((deflate_state *s, tree_desc *desc));
+local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
+local int  build_bl_tree  OF((deflate_state *s));
+local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
+                              int blcodes));
+local void compress_block OF((deflate_state *s, const ct_data *ltree,
+                              const ct_data *dtree));
+local int  detect_data_type OF((deflate_state *s));
+local unsigned bi_reverse OF((unsigned value, int length));
+local void bi_windup      OF((deflate_state *s));
+local void bi_flush       OF((deflate_state *s));
+local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
+                              int header));
+
+#ifdef GEN_TREES_H
+local void gen_trees_header OF((void));
+#endif
+
+#ifndef DEBUG
+#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
+   /* Send a code of the given tree. c and tree must not have side effects */
+
+#else /* DEBUG */
+#  define send_code(s, c, tree) \
+     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
+       send_bits(s, tree[c].Code, tree[c].Len); }
+#endif
+
+/* ===========================================================================
+ * Output a short LSB first on the stream.
+ * IN assertion: there is enough room in pendingBuf.
+ */
+#define put_short(s, w) { \
+    put_byte(s, (uch)((w) & 0xff)); \
+    put_byte(s, (uch)((ush)(w) >> 8)); \
+}
+
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+#ifdef DEBUG
+local void send_bits      OF((deflate_state *s, int value, int length));
+
+local void send_bits(s, value, length)
+    deflate_state *s;
+    int value;  /* value to send */
+    int length; /* number of bits */
+{
+    Tracevv((stderr," l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (ulg)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (ush)value << s->bi_valid;
+        put_short(s, s->bi_buf);
+        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= (ush)value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
+#else /* !DEBUG */
+
+#define send_bits(s, value, length) \
+{ int len = length;\
+  if (s->bi_valid > (int)Buf_size - len) {\
+    int val = value;\
+    s->bi_buf |= (ush)val << s->bi_valid;\
+    put_short(s, s->bi_buf);\
+    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
+    s->bi_valid += len - Buf_size;\
+  } else {\
+    s->bi_buf |= (ush)(value) << s->bi_valid;\
+    s->bi_valid += len;\
+  }\
+}
+#endif /* DEBUG */
+
+
+/* the arguments must not have side effects */
+
+/* ===========================================================================
+ * Initialize the various 'constant' tables.
+ */
+local void tr_static_init()
+{
+#if defined(GEN_TREES_H) || !defined(STDC)
+    static int static_init_done = 0;
+    int n;        /* iterates over tree elements */
+    int bits;     /* bit counter */
+    int length;   /* length value */
+    int code;     /* code value */
+    int dist;     /* distance index */
+    ush bl_count[MAX_BITS+1];
+    /* number of codes at each bit length for an optimal tree */
+
+    if (static_init_done) return;
+
+    /* For some embedded targets, global variables are not initialized: */
+#ifdef NO_INIT_GLOBAL_POINTERS
+    static_l_desc.static_tree = static_ltree;
+    static_l_desc.extra_bits = extra_lbits;
+    static_d_desc.static_tree = static_dtree;
+    static_d_desc.extra_bits = extra_dbits;
+    static_bl_desc.extra_bits = extra_blbits;
+#endif
+
+    /* Initialize the mapping length (0..255) -> length code (0..28) */
+    length = 0;
+    for (code = 0; code < LENGTH_CODES-1; code++) {
+        base_length[code] = length;
+        for (n = 0; n < (1<<extra_lbits[code]); n++) {
+            _length_code[length++] = (uch)code;
+        }
+    }
+    Assert (length == 256, "tr_static_init: length != 256");
+    /* Note that the length 255 (match length 258) can be represented
+     * in two different ways: code 284 + 5 bits or code 285, so we
+     * overwrite length_code[255] to use the best encoding:
+     */
+    _length_code[length-1] = (uch)code;
+
+    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+    dist = 0;
+    for (code = 0 ; code < 16; code++) {
+        base_dist[code] = dist;
+        for (n = 0; n < (1<<extra_dbits[code]); n++) {
+            _dist_code[dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: dist != 256");
+    dist >>= 7; /* from now on, all distances are divided by 128 */
+    for ( ; code < D_CODES; code++) {
+        base_dist[code] = dist << 7;
+        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+            _dist_code[256 + dist++] = (uch)code;
+        }
+    }
+    Assert (dist == 256, "tr_static_init: 256+dist != 512");
+
+    /* Construct the codes of the static literal tree */
+    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
+    n = 0;
+    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
+    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
+    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
+    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
+    /* Codes 286 and 287 do not exist, but we must include them in the
+     * tree construction to get a canonical Huffman tree (longest code
+     * all ones)
+     */
+    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
+
+    /* The static distance tree is trivial: */
+    for (n = 0; n < D_CODES; n++) {
+        static_dtree[n].Len = 5;
+        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
+    }
+    static_init_done = 1;
+
+#  ifdef GEN_TREES_H
+    gen_trees_header();
+#  endif
+#endif /* defined(GEN_TREES_H) || !defined(STDC) */
+}
+
+/* ===========================================================================
+ * Genererate the file trees.h describing the static trees.
+ */
+#ifdef GEN_TREES_H
+#  ifndef DEBUG
+#    include <stdio.h>
+#  endif
+
+#  define SEPARATOR(i, last, width) \
+      ((i) == (last)? "\n};\n\n" :    \
+       ((i) % (width) == (width)-1 ? ",\n" : ", "))
+
+void gen_trees_header()
+{
+    FILE *header = fopen("trees.h", "w");
+    int i;
+
+    Assert (header != NULL, "Can't open trees.h");
+    fprintf(header,
+            "/* header created automatically with -DGEN_TREES_H */\n\n");
+
+    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
+    for (i = 0; i < L_CODES+2; i++) {
+        fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
+                static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
+    }
+
+    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
+                static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
+    }
+
+    fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n");
+    for (i = 0; i < DIST_CODE_LEN; i++) {
+        fprintf(header, "%2u%s", _dist_code[i],
+                SEPARATOR(i, DIST_CODE_LEN-1, 20));
+    }
+
+    fprintf(header,
+        "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
+    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
+        fprintf(header, "%2u%s", _length_code[i],
+                SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
+    }
+
+    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
+    for (i = 0; i < LENGTH_CODES; i++) {
+        fprintf(header, "%1u%s", base_length[i],
+                SEPARATOR(i, LENGTH_CODES-1, 20));
+    }
+
+    fprintf(header, "local const int base_dist[D_CODES] = {\n");
+    for (i = 0; i < D_CODES; i++) {
+        fprintf(header, "%5u%s", base_dist[i],
+                SEPARATOR(i, D_CODES-1, 10));
+    }
+
+    fclose(header);
+}
+#endif /* GEN_TREES_H */
+
+/* ===========================================================================
+ * Initialize the tree data structures for a new zlib stream.
+ */
+void ZLIB_INTERNAL _tr_init(s)
+    deflate_state *s;
+{
+    tr_static_init();
+
+    s->l_desc.dyn_tree = s->dyn_ltree;
+    s->l_desc.stat_desc = &static_l_desc;
+
+    s->d_desc.dyn_tree = s->dyn_dtree;
+    s->d_desc.stat_desc = &static_d_desc;
+
+    s->bl_desc.dyn_tree = s->bl_tree;
+    s->bl_desc.stat_desc = &static_bl_desc;
+
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef DEBUG
+    s->compressed_len = 0L;
+    s->bits_sent = 0L;
+#endif
+
+    /* Initialize the first block of the first file: */
+    init_block(s);
+}
+
+/* ===========================================================================
+ * Initialize a new block.
+ */
+local void init_block(s)
+    deflate_state *s;
+{
+    int n; /* iterates over tree elements */
+
+    /* Initialize the trees. */
+    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
+    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
+    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
+
+    s->dyn_ltree[END_BLOCK].Freq = 1;
+    s->opt_len = s->static_len = 0L;
+    s->last_lit = s->matches = 0;
+}
+
+#define SMALLEST 1
+/* Index within the heap array of least frequent node in the Huffman tree */
+
+
+/* ===========================================================================
+ * Remove the smallest element from the heap and recreate the heap with
+ * one less element. Updates heap and heap_len.
+ */
+#define pqremove(s, tree, top) \
+{\
+    top = s->heap[SMALLEST]; \
+    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
+    pqdownheap(s, tree, SMALLEST); \
+}
+
+/* ===========================================================================
+ * Compares to subtrees, using the tree depth as tie breaker when
+ * the subtrees have equal frequency. This minimizes the worst case length.
+ */
+#define smaller(tree, n, m, depth) \
+   (tree[n].Freq < tree[m].Freq || \
+   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
+
+/* ===========================================================================
+ * Restore the heap property by moving down the tree starting at node k,
+ * exchanging a node with the smallest of its two sons if necessary, stopping
+ * when the heap property is re-established (each father smaller than its
+ * two sons).
+ */
+local void pqdownheap(s, tree, k)
+    deflate_state *s;
+    ct_data *tree;  /* the tree to restore */
+    int k;               /* node to move down */
+{
+    int v = s->heap[k];
+    int j = k << 1;  /* left son of k */
+    while (j <= s->heap_len) {
+        /* Set j to the smallest of the two sons: */
+        if (j < s->heap_len &&
+            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+            j++;
+        }
+        /* Exit if v is smaller than both sons */
+        if (smaller(tree, v, s->heap[j], s->depth)) break;
+
+        /* Exchange v with the smallest son */
+        s->heap[k] = s->heap[j];  k = j;
+
+        /* And continue down the tree, setting j to the left son of k */
+        j <<= 1;
+    }
+    s->heap[k] = v;
+}
+
+/* ===========================================================================
+ * Compute the optimal bit lengths for a tree and update the total bit length
+ * for the current block.
+ * IN assertion: the fields freq and dad are set, heap[heap_max] and
+ *    above are the tree nodes sorted by increasing frequency.
+ * OUT assertions: the field len is set to the optimal bit length, the
+ *     array bl_count contains the frequencies for each bit length.
+ *     The length opt_len is updated; static_len is also updated if stree is
+ *     not null.
+ */
+local void gen_bitlen(s, desc)
+    deflate_state *s;
+    tree_desc *desc;    /* the tree descriptor */
+{
+    ct_data *tree        = desc->dyn_tree;
+    int max_code         = desc->max_code;
+    const ct_data *stree = desc->stat_desc->static_tree;
+    const intf *extra    = desc->stat_desc->extra_bits;
+    int base             = desc->stat_desc->extra_base;
+    int max_length       = desc->stat_desc->max_length;
+    int h;              /* heap index */
+    int n, m;           /* iterate over the tree elements */
+    int bits;           /* bit length */
+    int xbits;          /* extra bits */
+    ush f;              /* frequency */
+    int overflow = 0;   /* number of elements with bit length too large */
+
+    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
+
+    /* In a first pass, compute the optimal bit lengths (which may
+     * overflow in the case of the bit length tree).
+     */
+    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
+
+    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+        n = s->heap[h];
+        bits = tree[tree[n].Dad].Len + 1;
+        if (bits > max_length) bits = max_length, overflow++;
+        tree[n].Len = (ush)bits;
+        /* We overwrite tree[n].Dad which is no longer needed */
+
+        if (n > max_code) continue; /* not a leaf node */
+
+        s->bl_count[bits]++;
+        xbits = 0;
+        if (n >= base) xbits = extra[n-base];
+        f = tree[n].Freq;
+        s->opt_len += (ulg)f * (bits + xbits);
+        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
+    }
+    if (overflow == 0) return;
+
+    Trace((stderr,"\nbit length overflow\n"));
+    /* This happens for example on obj2 and pic of the Calgary corpus */
+
+    /* Find the first bit length which could increase: */
+    do {
+        bits = max_length-1;
+        while (s->bl_count[bits] == 0) bits--;
+        s->bl_count[bits]--;      /* move one leaf down the tree */
+        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+        s->bl_count[max_length]--;
+        /* The brother of the overflow item also moves one step up,
+         * but this does not affect bl_count[max_length]
+         */
+        overflow -= 2;
+    } while (overflow > 0);
+
+    /* Now recompute all bit lengths, scanning in increasing frequency.
+     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+     * lengths instead of fixing only the wrong ones. This idea is taken
+     * from 'ar' written by Haruhiko Okumura.)
+     */
+    for (bits = max_length; bits != 0; bits--) {
+        n = s->bl_count[bits];
+        while (n != 0) {
+            m = s->heap[--h];
+            if (m > max_code) continue;
+            if ((unsigned) tree[m].Len != (unsigned) bits) {
+                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
+                s->opt_len += ((long)bits - (long)tree[m].Len)
+                              *(long)tree[m].Freq;
+                tree[m].Len = (ush)bits;
+            }
+            n--;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Generate the codes for a given tree and bit counts (which need not be
+ * optimal).
+ * IN assertion: the array bl_count contains the bit length statistics for
+ * the given tree and the field len is set for all tree elements.
+ * OUT assertion: the field code is set for all tree elements of non
+ *     zero code length.
+ */
+local void gen_codes (tree, max_code, bl_count)
+    ct_data *tree;             /* the tree to decorate */
+    int max_code;              /* largest code with non zero frequency */
+    ushf *bl_count;            /* number of codes at each bit length */
+{
+    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
+    ush code = 0;              /* running code value */
+    int bits;                  /* bit index */
+    int n;                     /* code index */
+
+    /* The distribution counts are first used to generate the code values
+     * without bit reversal.
+     */
+    for (bits = 1; bits <= MAX_BITS; bits++) {
+        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
+    }
+    /* Check that the bit counts in bl_count are consistent. The last code
+     * must be all ones.
+     */
+    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+            "inconsistent bit counts");
+    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+    for (n = 0;  n <= max_code; n++) {
+        int len = tree[n].Len;
+        if (len == 0) continue;
+        /* Now reverse the bits */
+        tree[n].Code = bi_reverse(next_code[len]++, len);
+
+        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+    }
+}
+
+/* ===========================================================================
+ * Construct one Huffman tree and assigns the code bit strings and lengths.
+ * Update the total bit length for the current block.
+ * IN assertion: the field freq is set for all tree elements.
+ * OUT assertions: the fields len and code are set to the optimal bit length
+ *     and corresponding code. The length opt_len is updated; static_len is
+ *     also updated if stree is not null. The field max_code is set.
+ */
+local void build_tree(s, desc)
+    deflate_state *s;
+    tree_desc *desc; /* the tree descriptor */
+{
+    ct_data *tree         = desc->dyn_tree;
+    const ct_data *stree  = desc->stat_desc->static_tree;
+    int elems             = desc->stat_desc->elems;
+    int n, m;          /* iterate over heap elements */
+    int max_code = -1; /* largest code with non zero frequency */
+    int node;          /* new node being created */
+
+    /* Construct the initial heap, with least frequent element in
+     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+     * heap[0] is not used.
+     */
+    s->heap_len = 0, s->heap_max = HEAP_SIZE;
+
+    for (n = 0; n < elems; n++) {
+        if (tree[n].Freq != 0) {
+            s->heap[++(s->heap_len)] = max_code = n;
+            s->depth[n] = 0;
+        } else {
+            tree[n].Len = 0;
+        }
+    }
+
+    /* The pkzip format requires that at least one distance code exists,
+     * and that at least one bit should be sent even if there is only one
+     * possible code. So to avoid special checks later on we force at least
+     * two codes of non zero frequency.
+     */
+    while (s->heap_len < 2) {
+        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
+        tree[node].Freq = 1;
+        s->depth[node] = 0;
+        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
+        /* node is 0 or 1 so it does not have extra bits */
+    }
+    desc->max_code = max_code;
+
+    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+     * establish sub-heaps of increasing lengths:
+     */
+    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
+
+    /* Construct the Huffman tree by repeatedly combining the least two
+     * frequent nodes.
+     */
+    node = elems;              /* next internal node of the tree */
+    do {
+        pqremove(s, tree, n);  /* n = node of least frequency */
+        m = s->heap[SMALLEST]; /* m = node of next least frequency */
+
+        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
+        s->heap[--(s->heap_max)] = m;
+
+        /* Create a new node father of n and m */
+        tree[node].Freq = tree[n].Freq + tree[m].Freq;
+        s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ?
+                                s->depth[n] : s->depth[m]) + 1);
+        tree[n].Dad = tree[m].Dad = (ush)node;
+#ifdef DUMP_BL_TREE
+        if (tree == s->bl_tree) {
+            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
+                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
+        }
+#endif
+        /* and insert the new node in the heap */
+        s->heap[SMALLEST] = node++;
+        pqdownheap(s, tree, SMALLEST);
+
+    } while (s->heap_len >= 2);
+
+    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
+
+    /* At this point, the fields freq and dad are set. We can now
+     * generate the bit lengths.
+     */
+    gen_bitlen(s, (tree_desc *)desc);
+
+    /* The field len is now set, we can generate the bit codes */
+    gen_codes ((ct_data *)tree, max_code, s->bl_count);
+}
+
+/* ===========================================================================
+ * Scan a literal or distance tree to determine the frequencies of the codes
+ * in the bit length tree.
+ */
+local void scan_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree;   /* the tree to be scanned */
+    int max_code;    /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    if (nextlen == 0) max_count = 138, min_count = 3;
+    tree[max_code+1].Len = (ush)0xffff; /* guard */
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            s->bl_tree[curlen].Freq += count;
+        } else if (curlen != 0) {
+            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
+            s->bl_tree[REP_3_6].Freq++;
+        } else if (count <= 10) {
+            s->bl_tree[REPZ_3_10].Freq++;
+        } else {
+            s->bl_tree[REPZ_11_138].Freq++;
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Send a literal or distance tree in compressed form, using the codes in
+ * bl_tree.
+ */
+local void send_tree (s, tree, max_code)
+    deflate_state *s;
+    ct_data *tree; /* the tree to be scanned */
+    int max_code;       /* and its largest code of non zero frequency */
+{
+    int n;                     /* iterates over all tree elements */
+    int prevlen = -1;          /* last emitted length */
+    int curlen;                /* length of current code */
+    int nextlen = tree[0].Len; /* length of next code */
+    int count = 0;             /* repeat count of the current code */
+    int max_count = 7;         /* max repeat count */
+    int min_count = 4;         /* min repeat count */
+
+    /* tree[max_code+1].Len = -1; */  /* guard already set */
+    if (nextlen == 0) max_count = 138, min_count = 3;
+
+    for (n = 0; n <= max_code; n++) {
+        curlen = nextlen; nextlen = tree[n+1].Len;
+        if (++count < max_count && curlen == nextlen) {
+            continue;
+        } else if (count < min_count) {
+            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
+
+        } else if (curlen != 0) {
+            if (curlen != prevlen) {
+                send_code(s, curlen, s->bl_tree); count--;
+            }
+            Assert(count >= 3 && count <= 6, " 3_6?");
+            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+
+        } else if (count <= 10) {
+            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+
+        } else {
+            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+        }
+        count = 0; prevlen = curlen;
+        if (nextlen == 0) {
+            max_count = 138, min_count = 3;
+        } else if (curlen == nextlen) {
+            max_count = 6, min_count = 3;
+        } else {
+            max_count = 7, min_count = 4;
+        }
+    }
+}
+
+/* ===========================================================================
+ * Construct the Huffman tree for the bit lengths and return the index in
+ * bl_order of the last bit length code to send.
+ */
+local int build_bl_tree(s)
+    deflate_state *s;
+{
+    int max_blindex;  /* index of last bit length code of non zero freq */
+
+    /* Determine the bit length frequencies for literal and distance trees */
+    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
+    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
+
+    /* Build the bit length tree: */
+    build_tree(s, (tree_desc *)(&(s->bl_desc)));
+    /* opt_len now includes the length of the tree representations, except
+     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+     */
+
+    /* Determine the number of bit length codes to send. The pkzip format
+     * requires that at least 4 bit length codes be sent. (appnote.txt says
+     * 3 but the actual value used is 4.)
+     */
+    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
+        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
+    }
+    /* Update opt_len to include the bit length tree and counts */
+    s->opt_len += 3*(max_blindex+1) + 5+5+4;
+    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+            s->opt_len, s->static_len));
+
+    return max_blindex;
+}
+
+/* ===========================================================================
+ * Send the header for a block using dynamic Huffman trees: the counts, the
+ * lengths of the bit length codes, the literal tree and the distance tree.
+ * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+ */
+local void send_all_trees(s, lcodes, dcodes, blcodes)
+    deflate_state *s;
+    int lcodes, dcodes, blcodes; /* number of codes for each tree */
+{
+    int rank;                    /* index in bl_order */
+
+    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+            "too many codes");
+    Tracev((stderr, "\nbl counts: "));
+    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
+    send_bits(s, dcodes-1,   5);
+    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
+    for (rank = 0; rank < blcodes; rank++) {
+        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
+    }
+    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
+
+    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
+}
+
+/* ===========================================================================
+ * Send a stored block
+ */
+void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
+    deflate_state *s;
+    charf *buf;       /* input block */
+    ulg stored_len;   /* length of input block */
+    int last;         /* one if this is the last block for a file */
+{
+    send_bits(s, (STORED_BLOCK<<1)+last, 3);    /* send block type */
+#ifdef DEBUG
+    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
+    s->compressed_len += (stored_len + 4) << 3;
+#endif
+    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
+}
+
+/* ===========================================================================
+ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
+ */
+void ZLIB_INTERNAL _tr_flush_bits(s)
+    deflate_state *s;
+{
+    bi_flush(s);
+}
+
+/* ===========================================================================
+ * Send one empty static block to give enough lookahead for inflate.
+ * This takes 10 bits, of which 7 may remain in the bit buffer.
+ */
+void ZLIB_INTERNAL _tr_align(s)
+    deflate_state *s;
+{
+    send_bits(s, STATIC_TREES<<1, 3);
+    send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
+#endif
+    bi_flush(s);
+}
+
+/* ===========================================================================
+ * Determine the best encoding for the current block: dynamic trees, static
+ * trees or store, and output the encoded block to the zip file.
+ */
+void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+    deflate_state *s;
+    charf *buf;       /* input block, or NULL if too old */
+    ulg stored_len;   /* length of input block */
+    int last;         /* one if this is the last block for a file */
+{
+    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
+    int max_blindex = 0;  /* index of last bit length code of non zero freq */
+
+    /* Build the Huffman trees unless a stored block is forced */
+    if (s->level > 0) {
+
+        /* Check if the file is binary or text */
+        if (s->strm->data_type == Z_UNKNOWN)
+            s->strm->data_type = detect_data_type(s);
+
+        /* Construct the literal and distance trees */
+        build_tree(s, (tree_desc *)(&(s->l_desc)));
+        Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+
+        build_tree(s, (tree_desc *)(&(s->d_desc)));
+        Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
+                s->static_len));
+        /* At this point, opt_len and static_len are the total bit lengths of
+         * the compressed block data, excluding the tree representations.
+         */
+
+        /* Build the bit length tree for the above two trees, and get the index
+         * in bl_order of the last bit length code to send.
+         */
+        max_blindex = build_bl_tree(s);
+
+        /* Determine the best encoding. Compute the block lengths in bytes. */
+        opt_lenb = (s->opt_len+3+7)>>3;
+        static_lenb = (s->static_len+3+7)>>3;
+
+        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+                s->last_lit));
+
+        if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+
+    } else {
+        Assert(buf != (char*)0, "lost buf");
+        opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
+    }
+
+#ifdef FORCE_STORED
+    if (buf != (char*)0) { /* force stored block */
+#else
+    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+                       /* 4: two words for the lengths */
+#endif
+        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+         * Otherwise we can't have processed more than WSIZE input bytes since
+         * the last block flush, because compression would have been
+         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+         * transform a block into a stored block.
+         */
+        _tr_stored_block(s, buf, stored_len, last);
+
+#ifdef FORCE_STATIC
+    } else if (static_lenb >= 0) { /* force static trees */
+#else
+    } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
+#endif
+        send_bits(s, (STATIC_TREES<<1)+last, 3);
+        compress_block(s, (const ct_data *)static_ltree,
+                       (const ct_data *)static_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->static_len;
+#endif
+    } else {
+        send_bits(s, (DYN_TREES<<1)+last, 3);
+        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
+                       max_blindex+1);
+        compress_block(s, (const ct_data *)s->dyn_ltree,
+                       (const ct_data *)s->dyn_dtree);
+#ifdef DEBUG
+        s->compressed_len += 3 + s->opt_len;
+#endif
+    }
+    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
+    /* The above check is made mod 2^32, for files larger than 512 MB
+     * and uLong implemented on 32 bits.
+     */
+    init_block(s);
+
+    if (last) {
+        bi_windup(s);
+#ifdef DEBUG
+        s->compressed_len += 7;  /* align on byte boundary */
+#endif
+    }
+    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
+           s->compressed_len-7*last));
+}
+
+/* ===========================================================================
+ * Save the match info and tally the frequency counts. Return true if
+ * the current block must be flushed.
+ */
+int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+    deflate_state *s;
+    unsigned dist;  /* distance of matched string */
+    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+{
+    s->d_buf[s->last_lit] = (ush)dist;
+    s->l_buf[s->last_lit++] = (uch)lc;
+    if (dist == 0) {
+        /* lc is the unmatched char */
+        s->dyn_ltree[lc].Freq++;
+    } else {
+        s->matches++;
+        /* Here, lc is the match length - MIN_MATCH */
+        dist--;             /* dist = match distance - 1 */
+        Assert((ush)dist < (ush)MAX_DIST(s) &&
+               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
+
+        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+        s->dyn_dtree[d_code(dist)].Freq++;
+    }
+
+#ifdef TRUNCATE_BLOCK
+    /* Try to guess if it is profitable to stop the current block here */
+    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+        /* Compute an upper bound for the compressed length */
+        ulg out_length = (ulg)s->last_lit*8L;
+        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+        int dcode;
+        for (dcode = 0; dcode < D_CODES; dcode++) {
+            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+                (5L+extra_dbits[dcode]);
+        }
+        out_length >>= 3;
+        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+               s->last_lit, in_length, out_length,
+               100L - out_length*100L/in_length));
+        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+    }
+#endif
+    return (s->last_lit == s->lit_bufsize-1);
+    /* We avoid equality with lit_bufsize because of wraparound at 64K
+     * on 16 bit machines and because stored blocks are restricted to
+     * 64K-1 bytes.
+     */
+}
+
+/* ===========================================================================
+ * Send the block data compressed using the given Huffman trees
+ */
+local void compress_block(s, ltree, dtree)
+    deflate_state *s;
+    const ct_data *ltree; /* literal tree */
+    const ct_data *dtree; /* distance tree */
+{
+    unsigned dist;      /* distance of matched string */
+    int lc;             /* match length or unmatched char (if dist == 0) */
+    unsigned lx = 0;    /* running index in l_buf */
+    unsigned code;      /* the code to send */
+    int extra;          /* number of extra bits to send */
+
+    if (s->last_lit != 0) do {
+        dist = s->d_buf[lx];
+        lc = s->l_buf[lx++];
+        if (dist == 0) {
+            send_code(s, lc, ltree); /* send a literal byte */
+            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+        } else {
+            /* Here, lc is the match length - MIN_MATCH */
+            code = _length_code[lc];
+            send_code(s, code+LITERALS+1, ltree); /* send the length code */
+            extra = extra_lbits[code];
+            if (extra != 0) {
+                lc -= base_length[code];
+                send_bits(s, lc, extra);       /* send the extra length bits */
+            }
+            dist--; /* dist is now the match distance - 1 */
+            code = d_code(dist);
+            Assert (code < D_CODES, "bad d_code");
+
+            send_code(s, code, dtree);       /* send the distance code */
+            extra = extra_dbits[code];
+            if (extra != 0) {
+                dist -= base_dist[code];
+                send_bits(s, dist, extra);   /* send the extra distance bits */
+            }
+        } /* literal or match pair ? */
+
+        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+               "pendingBuf overflow");
+
+    } while (lx < s->last_lit);
+
+    send_code(s, END_BLOCK, ltree);
+}
+
+/* ===========================================================================
+ * Check if the data type is TEXT or BINARY, using the following algorithm:
+ * - TEXT if the two conditions below are satisfied:
+ *    a) There are no non-portable control characters belonging to the
+ *       "black list" (0..6, 14..25, 28..31).
+ *    b) There is at least one printable character belonging to the
+ *       "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255).
+ * - BINARY otherwise.
+ * - The following partially-portable control characters form a
+ *   "gray list" that is ignored in this detection algorithm:
+ *   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
+ * IN assertion: the fields Freq of dyn_ltree are set.
+ */
+local int detect_data_type(s)
+    deflate_state *s;
+{
+    /* black_mask is the bit mask of black-listed bytes
+     * set bits 0..6, 14..25, and 28..31
+     * 0xf3ffc07f = binary 11110011111111111100000001111111
+     */
+    unsigned long black_mask = 0xf3ffc07fUL;
+    int n;
+
+    /* Check for non-textual ("black-listed") bytes. */
+    for (n = 0; n <= 31; n++, black_mask >>= 1)
+        if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0))
+            return Z_BINARY;
+
+    /* Check for textual ("white-listed") bytes. */
+    if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0
+            || s->dyn_ltree[13].Freq != 0)
+        return Z_TEXT;
+    for (n = 32; n < LITERALS; n++)
+        if (s->dyn_ltree[n].Freq != 0)
+            return Z_TEXT;
+
+    /* There are no "black-listed" or "white-listed" bytes:
+     * this stream either is empty or has tolerated ("gray-listed") bytes only.
+     */
+    return Z_BINARY;
+}
+
+/* ===========================================================================
+ * Reverse the first len bits of a code, using straightforward code (a faster
+ * method would use a table)
+ * IN assertion: 1 <= len <= 15
+ */
+local unsigned bi_reverse(code, len)
+    unsigned code; /* the value to invert */
+    int len;       /* its bit length */
+{
+    register unsigned res = 0;
+    do {
+        res |= code & 1;
+        code >>= 1, res <<= 1;
+    } while (--len > 0);
+    return res >> 1;
+}
+
+/* ===========================================================================
+ * Flush the bit buffer, keeping at most 7 bits in it.
+ */
+local void bi_flush(s)
+    deflate_state *s;
+{
+    if (s->bi_valid == 16) {
+        put_short(s, s->bi_buf);
+        s->bi_buf = 0;
+        s->bi_valid = 0;
+    } else if (s->bi_valid >= 8) {
+        put_byte(s, (Byte)s->bi_buf);
+        s->bi_buf >>= 8;
+        s->bi_valid -= 8;
+    }
+}
+
+/* ===========================================================================
+ * Flush the bit buffer and align the output on a byte boundary
+ */
+local void bi_windup(s)
+    deflate_state *s;
+{
+    if (s->bi_valid > 8) {
+        put_short(s, s->bi_buf);
+    } else if (s->bi_valid > 0) {
+        put_byte(s, (Byte)s->bi_buf);
+    }
+    s->bi_buf = 0;
+    s->bi_valid = 0;
+#ifdef DEBUG
+    s->bits_sent = (s->bits_sent+7) & ~7;
+#endif
+}
+
+/* ===========================================================================
+ * Copy a stored block, storing first the length and its
+ * one's complement if requested.
+ */
+local void copy_block(s, buf, len, header)
+    deflate_state *s;
+    charf    *buf;    /* the input data */
+    unsigned len;     /* its length */
+    int      header;  /* true if block header must be written */
+{
+    bi_windup(s);        /* align on byte boundary */
+
+    if (header) {
+        put_short(s, (ush)len);
+        put_short(s, (ush)~len);
+#ifdef DEBUG
+        s->bits_sent += 2*16;
+#endif
+    }
+#ifdef DEBUG
+    s->bits_sent += (ulg)len<<3;
+#endif
+    while (len--) {
+        put_byte(s, *buf++);
+    }
+}
diff --git a/Source/3rd Party/wx/src/zlib/trees.h b/Source/3rd Party/wx/src/zlib/trees.h
index 1ca868b84..d35639d82 100644
--- a/Source/3rd Party/wx/src/zlib/trees.h	
+++ b/Source/3rd Party/wx/src/zlib/trees.h	
@@ -1,128 +1,128 @@
-/* header created automatically with -DGEN_TREES_H */
-
-local const ct_data static_ltree[L_CODES+2] = {
-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
-};
-
-local const ct_data static_dtree[D_CODES] = {
-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
-};
-
-const uch _dist_code[DIST_CODE_LEN] = {
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-};
-
-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
-};
-
-local const int base_length[LENGTH_CODES] = {
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-64, 80, 96, 112, 128, 160, 192, 224, 0
-};
-
-local const int base_dist[D_CODES] = {
-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
-};
-
+/* header created automatically with -DGEN_TREES_H */
+
+local const ct_data static_ltree[L_CODES+2] = {
+{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
+{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
+{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
+{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
+{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
+{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
+{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
+{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
+{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
+{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
+{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
+{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
+{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
+{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
+{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
+{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
+{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
+{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
+{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
+{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
+{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
+{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
+{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
+{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
+{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
+{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
+{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
+{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
+{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
+{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
+{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
+{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
+{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
+{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
+{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
+{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
+{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
+{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
+{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
+{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
+{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
+{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
+{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
+{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
+{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
+{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
+{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
+{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
+{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
+{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
+{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
+{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
+{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
+{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
+{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
+{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
+{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
+{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
+};
+
+local const ct_data static_dtree[D_CODES] = {
+{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
+{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
+{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
+{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
+{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
+{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
+};
+
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
+ 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
+ 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
+10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
+18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+};
+
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
+ 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
+13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
+19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
+22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
+23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
+};
+
+local const int base_length[LENGTH_CODES] = {
+0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
+64, 80, 96, 112, 128, 160, 192, 224, 0
+};
+
+local const int base_dist[D_CODES] = {
+    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
+   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
+ 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
+};
+
diff --git a/Source/3rd Party/wx/src/zlib/uncompr.c b/Source/3rd Party/wx/src/zlib/uncompr.c
index ad6db0a67..cc6ed1537 100644
--- a/Source/3rd Party/wx/src/zlib/uncompr.c	
+++ b/Source/3rd Party/wx/src/zlib/uncompr.c	
@@ -1,61 +1,58 @@
-/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-/* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (Bytef*)source;
-    stream.avail_in = (uInt)sourceLen;
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-
-    err = inflateInit(&stream);
-    if (err != Z_OK) return err;
-
-    err = inflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        inflateEnd(&stream);
-        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
-            return Z_DATA_ERROR;
-        return err;
-    }
-    *destLen = stream.total_out;
-
-    err = inflateEnd(&stream);
-    return err;
-}
+/* uncompr.c -- decompress a memory buffer
+ * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+
+#define ZLIB_INTERNAL
+#include "zlib.h"
+
+/* ===========================================================================
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+{
+    z_stream stream;
+    int err;
+
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = (uInt)sourceLen;
+    /* Check for source > 64K on 16-bit machine: */
+    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
+
+    stream.next_out = dest;
+    stream.avail_out = (uInt)*destLen;
+    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+
+    err = inflateInit(&stream);
+    if (err != Z_OK) return err;
+
+    err = inflate(&stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        inflateEnd(&stream);
+        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
+            return Z_DATA_ERROR;
+        return err;
+    }
+    *destLen = stream.total_out;
+
+    err = inflateEnd(&stream);
+    return err;
+}
diff --git a/Source/3rd Party/wx/src/zlib/zconf.h b/Source/3rd Party/wx/src/zlib/zconf.h
index e3b0c962e..81bc11d1e 100644
--- a/Source/3rd Party/wx/src/zlib/zconf.h	
+++ b/Source/3rd Party/wx/src/zlib/zconf.h	
@@ -1,332 +1,510 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
-#  define deflate               z_deflate
-#  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
-#  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
-#  define deflatePrime          z_deflatePrime
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
-#  define zError                z_zError
-
-#  define alloc_func            z_alloc_func
-#  define free_func             z_free_func
-#  define in_func               z_in_func
-#  define out_func              z_out_func
-#  define Byte                  z_Byte
-#  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
-#  define uIntf                 z_uIntf
-#  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
-#  define voidp                 z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
+
+/* all linked symbols */
+#  define _dist_code            z__dist_code
+#  define _length_code          z__length_code
+#  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
+#  define _tr_flush_block       z__tr_flush_block
+#  define _tr_init              z__tr_init
+#  define _tr_stored_block      z__tr_stored_block
+#  define _tr_tally             z__tr_tally
+#  define adler32               z_adler32
+#  define adler32_combine       z_adler32_combine
+#  define adler32_combine64     z_adler32_combine64
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
+#  define crc32                 z_crc32
+#  define crc32_combine         z_crc32_combine
+#  define crc32_combine64       z_crc32_combine64
+#  define deflate               z_deflate
+#  define deflateBound          z_deflateBound
+#  define deflateCopy           z_deflateCopy
+#  define deflateEnd            z_deflateEnd
+#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit_          z_deflateInit_
+#  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
+#  define deflatePrime          z_deflatePrime
+#  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
+#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetHeader      z_deflateSetHeader
+#  define deflateTune           z_deflateTune
+#  define deflate_copyright     z_deflate_copyright
+#  define get_crc_table         z_get_crc_table
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzwrite               z_gzwrite
+#  endif
+#  define inflate               z_inflate
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
+#  define inflateBackInit_      z_inflateBackInit_
+#  define inflateCopy           z_inflateCopy
+#  define inflateEnd            z_inflateEnd
+#  define inflateGetHeader      z_inflateGetHeader
+#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit_          z_inflateInit_
+#  define inflateMark           z_inflateMark
+#  define inflatePrime          z_inflatePrime
+#  define inflateReset          z_inflateReset
+#  define inflateReset2         z_inflateReset2
+#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateGetDictionary  z_inflateGetDictionary
+#  define inflateSync           z_inflateSync
+#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateUndermine      z_inflateUndermine
+#  define inflateResetKeep      z_inflateResetKeep
+#  define inflate_copyright     z_inflate_copyright
+#  define inflate_fast          z_inflate_fast
+#  define inflate_table         z_inflate_table
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#  endif
+#  define zError                z_zError
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
+#  define zlibCompileFlags      z_zlibCompileFlags
+#  define zlibVersion           z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+#  define Byte                  z_Byte
+#  define Bytef                 z_Bytef
+#  define alloc_func            z_alloc_func
+#  define charf                 z_charf
+#  define free_func             z_free_func
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
+#  define gz_header             z_gz_header
+#  define gz_headerp            z_gz_headerp
+#  define in_func               z_in_func
+#  define intf                  z_intf
+#  define out_func              z_out_func
+#  define uInt                  z_uInt
+#  define uIntf                 z_uIntf
+#  define uLong                 z_uLong
+#  define uLongf                z_uLongf
+#  define voidp                 z_voidp
+#  define voidpc                z_voidpc
+#  define voidpf                z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+#  define gz_header_s           z_gz_header_s
+#  define internal_state        z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+#  define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+#  define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
+#    define WIN32
+#  endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+#    ifndef SYS16BIT
+#      define SYS16BIT
+#    endif
+#  endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+#  ifndef STDC
+#    define STDC
+#  endif
+#  if __STDC_VERSION__ >= 199901L
+#    ifndef STDC99
+#      define STDC99
+#    endif
+#  endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+#  define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+#  define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
+#  define STDC
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const       /* note: need a more gentle solution here */
+#  endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+#  if defined(M_I86SM) || defined(M_I86MM)
+     /* MSC small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef _MSC_VER
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#  if (defined(__SMALL__) || defined(__MEDIUM__))
+     /* Turbo C small or medium model */
+#    define SMALL_MEDIUM
+#    ifdef __BORLANDC__
+#      define FAR _far
+#    else
+#      define FAR far
+#    endif
+#  endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+   /* If building or using zlib as a DLL, define ZLIB_DLL.
+    * This is not mandatory, but it offers a little performance increase.
+    */
+#  ifdef ZLIB_DLL
+#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+#      ifdef ZLIB_INTERNAL
+#        define ZEXTERN extern __declspec(dllexport)
+#      else
+#        define ZEXTERN extern __declspec(dllimport)
+#      endif
+#    endif
+#  endif  /* ZLIB_DLL */
+   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+    * define ZLIB_WINAPI.
+    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+    */
+#  ifdef ZLIB_WINAPI
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+     /* No need for _export, use ZLIB.DEF instead. */
+     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+#    define ZEXPORT WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA WINAPIV
+#    else
+#      define ZEXPORTVA FAR CDECL
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  ifdef ZLIB_DLL
+#    ifdef ZLIB_INTERNAL
+#      define ZEXPORT   __declspec(dllexport)
+#      define ZEXPORTVA __declspec(dllexport)
+#    else
+#      define ZEXPORT   __declspec(dllimport)
+#      define ZEXPORTVA __declspec(dllimport)
+#    endif
+#  endif
+#endif
+
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+
+#ifndef FAR
+#  define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef Byte  FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void const *voidpc;
+   typedef void FAR   *voidpf;
+   typedef void       *voidp;
+#else
+   typedef Byte const *voidpc;
+   typedef Byte FAR   *voidpf;
+   typedef Byte       *voidp;
+#endif
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#  undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+#  define Z_HAVE_UNISTD_H
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
+#  endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+#  define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+#  define z_off64_t off64_t
+#else
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+  #pragma map(deflateInit_,"DEIN")
+  #pragma map(deflateInit2_,"DEIN2")
+  #pragma map(deflateEnd,"DEEND")
+  #pragma map(deflateBound,"DEBND")
+  #pragma map(inflateInit_,"ININ")
+  #pragma map(inflateInit2_,"ININ2")
+  #pragma map(inflateEnd,"INEND")
+  #pragma map(inflateSync,"INSY")
+  #pragma map(inflateSetDictionary,"INSEDI")
+  #pragma map(compressBound,"CMBND")
+  #pragma map(inflate_table,"INTABL")
+  #pragma map(inflate_fast,"INFA")
+  #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */
diff --git a/Source/3rd Party/wx/src/zlib/zlib.3 b/Source/3rd Party/wx/src/zlib/zlib.3
new file mode 100644
index 000000000..0160e62b6
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/zlib.3	
@@ -0,0 +1,151 @@
+.TH ZLIB 3 "28 Apr 2013"
+.SH NAME
+zlib \- compression/decompression library
+.SH SYNOPSIS
+[see
+.I zlib.h
+for full description]
+.SH DESCRIPTION
+The
+.I zlib
+library is a general purpose data compression library.
+The code is thread safe, assuming that the standard library functions
+used are thread safe, such as memory allocation routines.
+It provides in-memory compression and decompression functions,
+including integrity checks of the uncompressed data.
+This version of the library supports only one compression method (deflation)
+but other algorithms may be added later
+with the same stream interface.
+.LP
+Compression can be done in a single step if the buffers are large enough
+or can be done by repeated calls of the compression function.
+In the latter case,
+the application must provide more input and/or consume the output
+(providing more output space) before each call.
+.LP
+The library also supports reading and writing files in
+.IR gzip (1)
+(.gz) format
+with an interface similar to that of stdio.
+.LP
+The library does not install any signal handler.
+The decoder checks the consistency of the compressed data,
+so the library should never crash even in the case of corrupted input.
+.LP
+All functions of the compression library are documented in the file
+.IR zlib.h .
+The distribution source includes examples of use of the library
+in the files
+.I test/example.c
+and
+.IR test/minigzip.c,
+as well as other examples in the
+.IR examples/
+directory.
+.LP
+Changes to this version are documented in the file
+.I ChangeLog
+that accompanies the source.
+.LP
+.I zlib
+is available in Java using the java.util.zip package:
+.IP
+http://java.sun.com/developer/technicalArticles/Programming/compression/
+.LP
+A Perl interface to
+.IR zlib ,
+written by Paul Marquess (pmqs@cpan.org),
+is available at CPAN (Comprehensive Perl Archive Network) sites,
+including:
+.IP
+http://search.cpan.org/~pmqs/IO-Compress-Zlib/
+.LP
+A Python interface to
+.IR zlib ,
+written by A.M. Kuchling (amk@magnet.com),
+is available in Python 1.5 and later versions:
+.IP
+http://docs.python.org/library/zlib.html
+.LP
+.I zlib
+is built into
+.IR tcl:
+.IP
+http://wiki.tcl.tk/4610
+.LP
+An experimental package to read and write files in .zip format,
+written on top of
+.I zlib
+by Gilles Vollant (info@winimage.com),
+is available at:
+.IP
+http://www.winimage.com/zLibDll/minizip.html
+and also in the
+.I contrib/minizip
+directory of the main
+.I zlib
+source distribution.
+.SH "SEE ALSO"
+The
+.I zlib
+web site can be found at:
+.IP
+http://zlib.net/
+.LP
+The data format used by the zlib library is described by RFC
+(Request for Comments) 1950 to 1952 in the files:
+.IP
+http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
+.br
+http://tools.ietf.org/html/rfc1951 (for the deflate compressed data format)
+.br
+http://tools.ietf.org/html/rfc1952 (for the gzip header and trailer format)
+.LP
+Mark Nelson wrote an article about
+.I zlib
+for the Jan. 1997 issue of  Dr. Dobb's Journal;
+a copy of the article is available at:
+.IP
+http://marknelson.us/1997/01/01/zlib-engine/
+.SH "REPORTING PROBLEMS"
+Before reporting a problem,
+please check the
+.I zlib
+web site to verify that you have the latest version of
+.IR zlib ;
+otherwise,
+obtain the latest version and see if the problem still exists.
+Please read the
+.I zlib
+FAQ at:
+.IP
+http://zlib.net/zlib_faq.html
+.LP
+before asking for help.
+Send questions and/or comments to zlib@gzip.org,
+or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
+.SH AUTHORS
+Version 1.2.8
+Copyright (C) 1995-2013 Jean-loup Gailly (jloup@gzip.org)
+and Mark Adler (madler@alumni.caltech.edu).
+.LP
+This software is provided "as-is,"
+without any express or implied warranty.
+In no event will the authors be held liable for any damages
+arising from the use of this software.
+See the distribution directory with respect to requirements
+governing redistribution.
+The deflate format used by
+.I zlib
+was defined by Phil Katz.
+The deflate and
+.I zlib
+specifications were written by L. Peter Deutsch.
+Thanks to all the people who reported problems and suggested various
+improvements in
+.IR zlib ;
+who are too numerous to cite here.
+.LP
+UNIX manual page by R. P. C. Rodgers,
+U.S. National Library of Medicine (rodgers@nlm.nih.gov).
+.\" end of man page
diff --git a/Source/3rd Party/wx/src/zlib/zlib.h b/Source/3rd Party/wx/src/zlib/zlib.h
index 62d0e4675..3e0c7672a 100644
--- a/Source/3rd Party/wx/src/zlib/zlib.h	
+++ b/Source/3rd Party/wx/src/zlib/zlib.h	
@@ -1,1357 +1,1768 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
-
-/*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-     This library can optionally read and write gzip streams in memory as well.
-
-     The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumualte before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it gets to the next deflate block boundary. When decoding the
-  zlib or gzip format, this will cause inflate() to return immediately after
-  the header and before the first block. When doing a raw inflate, inflate()
-  will go ahead and process the first block, and will return when it gets to
-  the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding. Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.  Z_FIXED prevents the
-   use of dynamic Huffman codes, allowing for a simpler decoder for special
-   applications.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front. In addition, the
-   current implementation of deflate will use at most the window size minus
-   262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
-*/
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-      If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding. Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
-   a crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-   is set to null if there is no error message.  inflateInit2 does not perform
-   any decompression apart from reading the zlib header if present: this will
-   be done by inflate(). (So next_in and avail_in may be modified, but next_out
-   and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-  that this function is used to start inflating at a bit position in the
-  middle of a byte.  The provided bits will be used before any bytes are used
-  from next_in.  This function should only be used with raw inflate, and
-  should be used before the first inflate() call after inflateInit2() or
-  inflateReset().  bits must be less than or equal to 16, and that many of the
-  least significant bits of value will be inserted in the input.
-
-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
-   force inflate() to return immediately after header processing is complete
-   and before any actual data is decompressed.
-
-      The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When
-   any of extra, name, or comment are not Z_NULL and the respective field is
-   not present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-      If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
-/*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
-/*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns 1 if file is being read directly without decompression, otherwise
-   zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-/*
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. If buf is NULL, this function returns the required initial
-   value for the for the crc. Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-/*
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.8, April 28th, 2013
+
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.8"
+#define ZLIB_VERNUM 0x1280
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 8
+#define ZLIB_VER_SUBREVISION 0
+
+/*
+    The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed data.
+  This version of the library supports only one compression method (deflation)
+  but other algorithms will be added later and will have the same stream
+  interface.
+
+    Compression can be done in a single step if the buffers are large enough,
+  or can be done by repeated calls of the compression function.  In the latter
+  case, the application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+    The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
+    The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+    This library can optionally read and write gzip streams in memory as well.
+
+    The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+    The library does not install any signal handler.  The decoder checks
+  the consistency of the compressed data, so the library should never crash
+  even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    z_const Bytef *next_in;     /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total number of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte should be put there */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total number of bytes output so far */
+
+    z_const char *msg;  /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: binary or text */
+    uLong   adler;      /* adler32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+     The application must update next_in and avail_in when avail_in has dropped
+   to zero.  It must update next_out and avail_out when avail_out has dropped
+   to zero.  The application must initialize zalloc, zfree and opaque before
+   calling the init function.  All other fields are set by the compression
+   library and must not be updated by the application.
+
+     The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree.  This can be useful for custom
+   memory management.  The compression library attaches no meaning to the
+   opaque value.
+
+     zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.
+
+     On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this if
+   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
+   returned by zalloc for objects of exactly 65536 bytes *must* have their
+   offset normalized to zero.  The default allocation function provided by this
+   library ensures this (see zutil.c).  To reduce memory requirements and avoid
+   any allocation of 64K objects, at the expense of compression ratio, compile
+   the library with -DMAX_WBITS=14 (see zconf.h).
+
+     The fields total_in and total_out can be used for statistics or progress
+   reports.  After compression, total_in holds the total size of the
+   uncompressed data and may be saved for use in the decompressor (particularly
+   if the decompressor wants to decompress everything in a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+#define Z_TREES         6
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is not
+   compatible with the zlib.h header file used by the application.  This check
+   is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression.  The fields
+   zalloc, zfree and opaque must be initialized before by the caller.  If
+   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+   allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at all
+   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
+   requests a default compromise between speed and compression (currently
+   equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if level is not a valid compression level, or
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
+   if there is no error message.  deflateInit does not perform any compression:
+   this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows.  deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
+    should be set only when necessary (in interactive applications).  Some
+    output may be provided even if flush is not set.
+
+    Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating avail_in or avail_out accordingly; avail_out should
+  never be zero before the call.  The application can consume the compressed
+  output when it wants, for example when the output buffer is full (avail_out
+  == 0), or after each call of deflate().  If deflate returns Z_OK and with
+  zero avail_out, it must be called again after making room in the output
+  buffer because there might be more output pending.
+
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumulate before producing output, in order to
+  maximize compression.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far.  (In
+  particular avail_in is zero after the call if enough output space has been
+  provided before the call.) Flushing may degrade compression for some
+  compression algorithms and so it should be used only when necessary.  This
+  completes the current deflate block and follows it with an empty stored block
+  that is three bits plus filler bits to the next byte, followed by four bytes
+  (00 00 ff ff).
+
+    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+  output buffer, but the output is not aligned to a byte boundary.  All of the
+  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+  This completes the current deflate block and follows it with an empty fixed
+  codes block that is 10 bits long.  This assures that enough bytes are output
+  in order for the decompressor to finish the block before the empty fixed code
+  block.
+
+    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+  seven bits of the current block are held to be written as the next byte after
+  the next deflate block is completed.  In this case, the decompressor may not
+  be provided enough bits at this point in order to complete decompression of
+  the data provided so far to the compressor.  It may need to wait for the next
+  block to be emitted.  This is for advanced applications that need to control
+  the emission of deflate blocks.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
+  compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there was
+  enough output space; if deflate returns with Z_OK, this function must be
+  called again with Z_FINISH and more output space (updated avail_out) but no
+  more input data, until it returns with Z_STREAM_END or an error.  After
+  deflate has returned Z_STREAM_END, the only possible operations on the stream
+  are deflateReset or deflateEnd.
+
+    Z_FINISH can be used immediately after deflateInit if all the compression
+  is to be done in a single step.  In this case, avail_out must be at least the
+  value returned by deflateBound (see below).  Then deflate is guaranteed to
+  return Z_STREAM_END.  If not enough output space is provided, deflate will
+  not return Z_STREAM_END, and it must be called again as described above.
+
+    deflate() sets strm->adler to the adler32 checksum of all input read
+  so far (that is, total_in bytes).
+
+    deflate() may update strm->data_type if it can make a good guess about
+  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
+  binary.  This field is only for information purposes and does not affect the
+  compression algorithm in any manner.
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
+  fatal, and deflate() can be called again with more input and more output
+  space to continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded).  In the error case, msg
+   may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression.  The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
+   exact value depends on the compression method), inflateInit determines the
+   compression method from the zlib header and allocates all data structures
+   accordingly; otherwise the allocation will be deferred to the first call of
+   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+   use default allocation functions.
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit() does not process any header information -- that is deferred
+   until inflate() is called.
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full.  It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows.  inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly.  If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing will
+    resume at this point for the next call of inflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  inflate() provides as much output as possible, until there is
+    no more input data or no more space in the output buffer (see below about
+    the flush parameter).
+
+    Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming more
+  output, and updating the next_* and avail_* values accordingly.  The
+  application can consume the uncompressed output when it wants, for example
+  when the output buffer is full (avail_out == 0), or after each call of
+  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
+  called again after making room in the output buffer because there might be
+  more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer.  Z_BLOCK requests that inflate()
+  stop if and when it gets to the next deflate block boundary.  When decoding
+  the zlib or gzip format, this will cause inflate() to return immediately
+  after the header and before the first block.  When doing a raw inflate,
+  inflate() will go ahead and process the first block, and will return when it
+  gets to the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  Also to assist in this, on return inflate() will set strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64 if
+  inflate() is currently decoding the last block in the deflate stream, plus
+  128 if inflate() returned immediately after decoding an end-of-block code or
+  decoding the complete header up to just before the first byte of the deflate
+  stream.  The end-of-block will not be indicated until all of the uncompressed
+  data from that block has been written to strm->next_out.  The number of
+  unused bits may in general be greater than seven, except when bit 7 of
+  data_type is set, in which case the number of unused bits will be less than
+  eight.  data_type is set as noted here every time inflate() returns for all
+  flush options, and so can be used to determine the amount of currently
+  consumed input in bits.
+
+    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+  end of each deflate block header is reached, before any actual data in that
+  block is decoded.  This allows the caller to determine the length of the
+  deflate block header for later use in random access within a deflate block.
+  256 is added to the value of strm->data_type when inflate() returns
+  immediately after reaching the end of the deflate block header.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error.  However if all decompression is to be performed in a single step (a
+  single call of inflate), the parameter flush should be set to Z_FINISH.  In
+  this case all pending input is processed and all pending output is flushed;
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
+  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call.  So the effects of the flush parameter in this implementation are
+  on the return value of inflate() as noted below, when inflate() returns early
+  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  memory for a sliding window when Z_FINISH is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the Adler-32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below.  At the end of the stream, inflate() checks that its computed adler32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically, if requested when
+  initializing with inflateInit2().  Any information contained in the gzip
+  header is not retained, so applications that need that information should
+  instead use raw inflate, see inflateInit2() below, or inflateBack() and
+  perform their own processing of the gzip header and trailer.  When processing
+  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
+  producted so far.  The CRC-32 is checked against the gzip trailer.
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect check
+  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  inflate() can be called again with more input and more output space to
+  continue decompressing.  If Z_DATA_ERROR is returned, the application may
+  then call inflateSync() to look for a good compression block if a partial
+  recovery of the data is desired.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any pending
+   output.
+
+     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+   was inconsistent.  In the error case, msg may be set but then points to a
+   static string (which must not be deallocated).
+*/
+
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options.  The
+   fields next_in, zalloc, zfree and opaque must be initialized before by the
+   caller.
+
+     The method parameter is the compression method.  It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer).  It should be in the range 8..15 for this
+   version of the library.  Larger values of this parameter result in better
+   compression at the expense of memory usage.  The default value is 15 if
+   deflateInit is used instead.
+
+     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
+   determines the window size.  deflate() will then generate raw deflate data
+   with no zlib header or trailer, and will not compute an adler32 check value.
+
+     windowBits can also be greater than 15 for optional gzip encoding.  Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   compressed data instead of a zlib wrapper.  The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero), no
+   header crc, and the operating system will be set to 255 (unknown).  If a
+   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state.  memLevel=1 uses minimum memory but is
+   slow and reduces compression ratio; memLevel=9 uses maximum memory for
+   optimal speed.  The default value is 8.  See zconf.h for total memory usage
+   as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm.  Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding).  Filtered data consists mostly of small values with a somewhat
+   random distribution.  In this case, the compression algorithm is tuned to
+   compress them better.  The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
+   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
+   strategy parameter only affects the compression ratio but not the
+   correctness of the compressed output even if it is not set appropriately.
+   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+   decoder for special applications.
+
+     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
+   set to null if there is no error message.  deflateInit2 does not perform any
+   compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output.  When using the zlib format, this
+   function must be called immediately after deflateInit, deflateInit2 or
+   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   function must be called either before any call of deflate, or immediately
+   after the completion of a deflate block, i.e. after all input has been
+   consumed and all output has been delivered when using any of the flush
+   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
+   compressor and decompressor must use exactly the same dictionary (see
+   inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary.  Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size
+   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
+   useful should be put at the end of the dictionary, not at the front.  In
+   addition, the current implementation of deflate will use at most the window
+   size minus 262 bytes of the provided dictionary.
+
+     Upon return of this function, strm->adler is set to the adler32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor.  (The adler32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.) If a raw deflate was requested, then the
+   adler32 value is not computed and strm->adler is not set.
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter.  The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and can
+   consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit,
+   but does not free and reallocate all the internal compression state.  The
+   stream will keep the same compression level and any other attributes that
+   may have been set by deflateInit2.
+
+     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2.  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different strategy.
+   If the compression level is changed, the input available so far is
+   compressed with the old level (and may be flushed); the new level will take
+   effect only at the next call of deflate().
+
+     Before the call of deflateParams, the stream state must be set as for
+   a call of deflate(), since the currently available input may have to be
+   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
+   strm->avail_out was zero.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit() or
+   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
+   to allocate an output buffer for deflation in a single pass, and so would be
+   called before deflate().  If that first deflate() call is provided the
+   sourceLen input bytes, an output buffer allocated to the size returned by
+   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+   to return Z_STREAM_END.  Note that it is possible for the compressed size to
+   be larger than the value returned by deflateBound() if flush options other
+   than Z_FINISH or Z_NO_FLUSH are used.
+*/
+
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+                                       unsigned *pending,
+                                       int *bits));
+/*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+ */
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+   is that this function is used to start off the deflate output with the bits
+   leftover from a previous deflate stream when appending to it.  As such, this
+   function can only be used for raw deflate, and must be used before the first
+   deflate() call after a deflateInit2() or deflateReset().  bits must be less
+   than or equal to 16, and that many of the least significant bits of value
+   will be inserted in the output.
+
+     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+     If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter.  The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library.  The default value is 15 if inflateInit is used
+   instead.  windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used.  If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be zero to request that inflate use the window size in
+   the zlib header of the compressed stream.
+
+     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
+   determines the window size.  inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream.  This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values.  If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an adler32 or a crc32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is.  Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding.  Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
+   crc32 instead of an adler32.
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+   invalid, such as a null pointer to the structure.  msg is set to null if
+   there is no error message.  inflateInit2 does not perform any decompression
+   apart from possibly reading the zlib header if present: actual decompression
+   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out and avail_out are unused and unchanged.) The current implementation
+   of inflateInit2() does not process any header information -- that is
+   deferred until inflate() is called.
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence.  This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
+   can be determined from the adler32 value returned by that call of inflate.
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called at any
+   time to set the dictionary.  If the provided dictionary is smaller than the
+   window and there is already data in the window, then the provided dictionary
+   will amend what's there.  The application must insure that the dictionary
+   that was used for compression is provided.
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+     Skips invalid compressed data until a possible full flush point (see above
+   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
+   available input is skipped.  No output is provided.
+
+     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+   All full flush points have this pattern, but not all occurrences of this
+   pattern are full flush points.
+
+     inflateSync returns Z_OK if a possible full flush point has been found,
+   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   In the success case, the application may save the current current value of
+   total_in which indicates where valid compressed data was found.  In the
+   error case, the application may repeatedly call inflateSync, providing more
+   input each time, until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate all the internal decompression state.  The
+   stream will keep attributes that may have been set by inflateInit2.
+
+     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+                                      int windowBits));
+/*
+     This function is the same as inflateReset, but it also permits changing
+   the wrap and window size requests.  The windowBits parameter is interpreted
+   the same as it is for inflateInit2.
+
+     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+   the windowBits parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+   that this function is used to start inflating at a bit position in the
+   middle of a byte.  The provided bits will be used before any bytes are used
+   from next_in.  This function should only be used with raw inflate, and
+   should be used before the first inflate() call after inflateInit2() or
+   inflateReset().  bits must be less than or equal to 16, and that many of the
+   least significant bits of value will be inserted in the input.
+
+     If bits is negative, then the input stream bit buffer is emptied.  Then
+   inflatePrime() can be called again to put bits in the buffer.  This is used
+   to clear out bits leftover after feeding inflate a block description prior
+   to feeding inflate codes.
+
+     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+     This function returns two values, one in the lower 16 bits of the return
+   value, and the other in the remaining upper bits, obtained by shifting the
+   return value down 16 bits.  If the upper value is -1 and the lower value is
+   zero, then inflate() is currently decoding information outside of a block.
+   If the upper value is -1 and the lower value is non-zero, then inflate is in
+   the middle of a stored block, with the lower value equaling the number of
+   bytes from the input remaining to copy.  If the upper value is not -1, then
+   it is the number of bits back from the current bit position in the input of
+   the code (literal or length/distance pair) currently being processed.  In
+   that case the lower value is the number of bytes already emitted for that
+   code.
+
+     A code is being processed if inflate is waiting for more input to complete
+   decoding of the code, or if it has completed decoding but is waiting for
+   more output space to write the literal or match data.
+
+     inflateMark() is used to mark locations in the input data for random
+   access, which may be at bit positions, and to note those cases where the
+   output of a code may span boundaries of random access blocks.  The current
+   location in the input stream can be determined from avail_in and data_type
+   as noted in the description for the Z_BLOCK flush parameter for inflate.
+
+     inflateMark returns the value noted above or -1 << 16 if the provided
+   source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+     inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
+   used to force inflate() to return immediately after header processing is
+   complete and before any actual data is decompressed.
+
+     The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When any
+   of extra, name, or comment are not Z_NULL and the respective field is not
+   present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+     If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+   allocated, or Z_VERSION_ERROR if the version of the library does not match
+   the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free the
+   allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects only
+   the raw deflate stream to decompress.  This is different from the normal
+   behavior of inflate(), which expects either a zlib or gzip header and
+   trailer around the deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero--buf is ignored in that
+   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   should return zero on success, or non-zero on failure.  If out() returns
+   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+   in the deflate stream (in which case strm->msg is set to indicate the nature
+   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+   In the case of Z_BUF_ERROR, an input or output error can be distinguished
+   using strm->next_in which will be Z_NULL only if in() returned an error.  If
+   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+   non-zero.  (in() will always be called before out(), so strm->next_in is
+   assured to be defined if out() returns non-zero.) Note that inflateBack()
+   cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+#ifndef Z_SOLO
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the basic
+   stream-oriented functions.  To simplify the interface, some default options
+   are assumed (compression level and memory usage, standard memory allocation
+   functions).  The source code of these utility functions can be modified if
+   you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed buffer.
+
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer.  The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer.  Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
+   compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before a
+   compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer.  Upon entry, destLen is the total size
+   of the destination buffer, which must be large enough to hold the entire
+   uncompressed data.  (The size of the uncompressed data must have been saved
+   previously by the compressor and transmitted to the decompressor by some
+   mechanism outside the scope of this compression library.) Upon exit, destLen
+   is the actual size of the uncompressed buffer.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   the case where there is not enough room, uncompress() will fill the output
+   buffer with the uncompressed data up to that point.
+*/
+
+                        /* gzip file access functions */
+
+/*
+     This library supports reading and writing files in gzip (.gz) format with
+   an interface similar to that of stdio, using the functions that start with
+   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
+   wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
+
+/*
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
+   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
+   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
+   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
+   for fixed code compression as in "wb9F".  (See the description of
+   deflateInit2 for more information about the strategy parameter.)  'T' will
+   request transparent writing or appending with no compression and not using
+   the gzip format.
+
+     "a" can be used instead of "w" to request that the gzip stream that will
+   be written be appended to the file.  "+" will result in an error, since
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
+
+     These functions, as well as gzip, will read and decode a sequence of gzip
+   streams in a file.  The append function of gzopen() can be used to create
+   such a file.  (Also see gzflush() for another way to do this.)  When
+   appending, gzopen does not test whether the file begins with a gzip stream,
+   nor does it look for the end of the gzip streams to begin appending.  gzopen
+   will simply append a gzip stream to the existing file.
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.  When
+   reading, this will be detected automatically by looking for the magic two-
+   byte gzip header.
+
+     gzopen returns NULL if the file could not be opened, if there was
+   insufficient memory to allocate the gzFile state, or if an invalid mode was
+   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+   errno can be checked to determine if the reason gzopen failed was that the
+   file could not be opened.
+*/
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
+   are obtained from calls like open, dup, creat, pipe or fileno (if the file
+   has been previously opened with fopen).  The mode parameter is as in gzopen.
+
+     The next call of gzclose on the returned gzFile will also close the file
+   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+   mode);.  The duplicated descriptor should be saved to avoid a leak, since
+   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   file descriptor from a FILE *, then you will have to use dup() to avoid
+   double-close()ing the file descriptor.  Both gzclose() and fclose() will
+   close the associated file descriptor, so they need to have different file
+   descriptors.
+
+     gzdopen returns NULL if there was insufficient memory to allocate the
+   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
+   used until the next gz* read, write, seek, or close operation, so gzdopen
+   will not detect if fd is invalid (unless fd is -1).
+*/
+
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+/*
+     Set the internal buffer size used by this library's functions.  The
+   default buffer size is 8192 bytes.  This function must be called after
+   gzopen() or gzdopen(), and before any other calls that read or write the
+   file.  The buffer memory allocation is always deferred to the first read or
+   write.  Two buffers are allocated, either both of the specified size when
+   writing, or one of the specified size and the other twice that size when
+   reading.  A larger buffer size of, for example, 64K or 128K bytes will
+   noticeably increase the speed of decompression (reading).
+
+     The new buffer size also affects the maximum length for gzprintf().
+
+     gzbuffer() returns 0 on success, or -1 on failure, such as being called
+   too late.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level or strategy.  See the description
+   of deflateInit2 for the meaning of these parameters.
+
+     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+   opened for writing.
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+     Reads the given number of uncompressed bytes from the compressed file.  If
+   the input file is not in gzip format, gzread copies the given number of
+   bytes into the buffer directly from the file.
+
+     After reaching the end of a gzip stream in the input, gzread will continue
+   to read, looking for another gzip stream.  Any number of gzip streams may be
+   concatenated in the input file, and will all be decompressed by gzread().
+   If something other than a gzip stream is encountered after a gzip stream,
+   that remaining trailing garbage is ignored (and no error is returned).
+
+     gzread can be used to read a gzip file that is being concurrently written.
+   Upon reaching the end of the input, gzread will return with the available
+   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+   gzclearerr can be used to clear the end of file indicator in order to permit
+   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
+   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
+   middle of a gzip stream.  Note that gzread does not return -1 in the event
+   of an incomplete gzip stream.  This error is deferred until gzclose(), which
+   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+   stream.  Alternatively, gzerror can be used before gzclose to detect this
+   case.
+
+     gzread returns the number of uncompressed bytes actually read, less than
+   len for end of file, or -1 for error.
+*/
+
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+                                voidpc buf, unsigned len));
+/*
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of uncompressed bytes written or 0 in case of
+   error.
+*/
+
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+/*
+     Converts, formats, and writes the arguments to the compressed file under
+   control of the format string, as in fprintf.  gzprintf returns the number of
+   uncompressed bytes actually written, or 0 in case of error.  The number of
+   uncompressed bytes written is limited to 8191, or one less than the buffer
+   size given to gzbuffer().  The caller should assure that this limit is not
+   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
+   nothing written.  In this case, there may also be a buffer overflow with
+   unpredictable consequences, which is possible only if zlib was compiled with
+   the insecure functions sprintf() or vsprintf() because the secure snprintf()
+   or vsnprintf() functions were not available.  This can be determined using
+   zlibCompileFlags().
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+     Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+
+     gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+     Reads bytes from the compressed file until len-1 characters are read, or a
+   newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  If any characters are read or if len == 1, the
+   string is terminated with a null character.  If no characters are read due
+   to an end-of-file or len < 1, then the buffer is left untouched.
+
+     gzgets returns buf which is a null-terminated string, or it returns NULL
+   for end-of-file or in case of error.  If there was an error, the contents at
+   buf are indeterminate.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+     Writes c, converted to an unsigned char, into the compressed file.  gzputc
+   returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+     Reads one byte from the compressed file.  gzgetc returns this byte or -1
+   in case of end of file or error.  This is implemented as a macro for speed.
+   As such, it does not do all of the checking the other functions do.  I.e.
+   it does not check to see if file is NULL, nor whether the structure file
+   points to has been clobbered or not.
+*/
+
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+/*
+     Push one character back onto the stream to be read as the first character
+   on the next read.  At least one character of push-back is allowed.
+   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
+   fail if c is -1, and may fail if a character has been pushed but not read
+   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
+   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
+   The pushed character will be discarded if the stream is repositioned with
+   gzseek() or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+     Flushes all pending output into the compressed file.  The parameter flush
+   is as in the deflate() function.  The return value is the zlib error number
+   (see function gzerror below).  gzflush is only permitted when writing.
+
+     If the flush parameter is Z_FINISH, the remaining data is written and the
+   gzip stream is completed in the output.  If gzwrite() is called again, a new
+   gzip stream will be started in the output.  gzread() is able to read such
+   concatented gzip streams.
+
+     gzflush should be called only when strictly necessary because it will
+   degrade compression if called too often.
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+                                   z_off_t offset, int whence));
+
+     Sets the starting position for the next gzread or gzwrite on the given
+   compressed file.  The offset represents a number of bytes in the
+   uncompressed data stream.  The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow.  If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+     gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewinds the given file. This function is supported only for reading.
+
+     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+
+     Returns the starting position for the next gzread or gzwrite on the given
+   compressed file.  This position represents a number of bytes in the
+   uncompressed data stream, and is zero when starting, even if appending or
+   reading a gzip stream from the middle of a file using gzdopen().
+
+     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+
+     Returns the current offset in the file being read or written.  This offset
+   includes the count of bytes that precede the gzip stream, for example when
+   appending or when using gzdopen() for reading.  When reading, the offset
+   does not include as yet unused buffered input.  This information can be used
+   for a progress indicator.  On error, gzoffset() returns -1.
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Returns true (1) if the end-of-file indicator has been set while reading,
+   false (0) otherwise.  Note that the end-of-file indicator is set only if the
+   read tried to go past the end of the input, but came up short.  Therefore,
+   just like feof(), gzeof() may return false even if there is no more data to
+   read, in the event that the last read request was for the exact number of
+   bytes remaining in the input file.  This will happen if the input file size
+   is an exact multiple of the buffer size.
+
+     If gzeof() returns true, then the read functions will return no more data,
+   unless the end-of-file indicator is reset by gzclearerr() and the input file
+   has grown since the previous end of file was detected.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Returns true (1) if file is being copied directly while reading, or false
+   (0) if file is a gzip stream being decompressed.
+
+     If the input file is empty, gzdirect() will return true, since the input
+   does not contain a gzip stream.
+
+     If gzdirect() is used immediately after gzopen() or gzdopen() it will
+   cause buffers to be allocated to allow reading the file to determine if it
+   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
+   gzdirect().
+
+     When writing, gzdirect() returns true (1) if transparent writing was
+   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
+   gzdirect() is not needed when writing.  Transparent writing must be
+   explicitly requested, so the application already knows the answer.  When
+   linking statically, using gzdirect() will include all of the zlib code for
+   gzip file reading and decompression, which may not be desired.)
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flushes all pending output if necessary, closes the compressed file and
+   deallocates the (de)compression state.  Note that once file is closed, you
+   cannot call gzerror with file, since its structures have been deallocated.
+   gzclose must not be called more than once on the same file, just as free
+   must not be called more than once on the same allocation.
+
+     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   last read ended in the middle of a gzip stream, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+     Same as gzclose(), but gzclose_r() is only for use when reading, and
+   gzclose_w() is only for use when writing or appending.  The advantage to
+   using these instead of gzclose() is that they avoid linking in zlib
+   compression or decompression code that is not used when only reading or only
+   writing respectively.  If gzclose() is used, then both compression and
+   decompression code will be included the application when linking to a static
+   zlib library.
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Returns the error message for the last error which occurred on the given
+   compressed file.  errnum is set to zlib error number.  If an error occurred
+   in the file system and not in the compression library, errnum is set to
+   Z_ERRNO and the application may consult errno to get the exact error code.
+
+     The application must not modify the returned string.  Future calls to
+   this function may invalidate the previously returned string.  If file is
+   closed, then the string previously returned by gzerror will no longer be
+   available.
+
+     gzerror() should be used to distinguish errors from end-of-file for those
+   functions above that do not distinguish those cases in their return values.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clears the error and end-of-file flags for file.  This is analogous to the
+   clearerr() function in stdio.  This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
+#endif /* !Z_SOLO */
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the compression
+   library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum.  If buf is Z_NULL, this function returns the
+   required initial value for the checksum.
+
+     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster.
+
+   Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   that the z_off_t type (like off_t) is a signed integer.  If len2 is
+   negative, the result has no meaning or utility.
+*/
+
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32.  If buf is Z_NULL, this function returns the required
+   initial value for the crc.  Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
+
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#define deflateInit(strm, level) \
+        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#define inflateInit(strm) \
+        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                      (int)sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+        inflateBackInit_((strm), (windowBits), (window), \
+                      ZLIB_VERSION, (int)sizeof(z_stream))
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure.  Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro.  The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously.  They can
+ * only be used by the gzgetc() macro.  You have been warned.
+ */
+struct gzFile_s {
+    unsigned have;
+    unsigned char *next;
+    z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#endif
+
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#ifdef Z_LARGE64
+   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#  ifdef Z_PREFIX_SET
+#    define z_gzopen z_gzopen64
+#    define z_gzseek z_gzseek64
+#    define z_gztell z_gztell64
+#    define z_gzoffset z_gzoffset64
+#    define z_adler32_combine z_adler32_combine64
+#    define z_crc32_combine z_crc32_combine64
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#  endif
+#  ifndef Z_LARGE64
+     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#  endif
+#else
+   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+#endif
+
+#else /* Z_SOLO */
+
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+
+#endif /* !Z_SOLO */
+
+/* hack for buggy compilers */
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+    struct internal_state {int dummy;};
+#endif
+
+/* undocumented functions */
+ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
+ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
diff --git a/Source/3rd Party/wx/src/zlib/zlib.map b/Source/3rd Party/wx/src/zlib/zlib.map
new file mode 100644
index 000000000..55c6647eb
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/zlib.map	
@@ -0,0 +1,83 @@
+ZLIB_1.2.0 {
+  global:
+    compressBound;
+    deflateBound;
+    inflateBack;
+    inflateBackEnd;
+    inflateBackInit_;
+    inflateCopy;
+  local:
+    deflate_copyright;
+    inflate_copyright;
+    inflate_fast;
+    inflate_table;
+    zcalloc;
+    zcfree;
+    z_errmsg;
+    gz_error;
+    gz_intmax;
+    _*;
+};
+
+ZLIB_1.2.0.2 {
+    gzclearerr;
+    gzungetc;
+    zlibCompileFlags;
+} ZLIB_1.2.0;
+
+ZLIB_1.2.0.8 {
+    deflatePrime;
+} ZLIB_1.2.0.2;
+
+ZLIB_1.2.2 {
+    adler32_combine;
+    crc32_combine;
+    deflateSetHeader;
+    inflateGetHeader;
+} ZLIB_1.2.0.8;
+
+ZLIB_1.2.2.3 {
+    deflateTune;
+    gzdirect;
+} ZLIB_1.2.2;
+
+ZLIB_1.2.2.4 {
+    inflatePrime;
+} ZLIB_1.2.2.3;
+
+ZLIB_1.2.3.3 {
+    adler32_combine64;
+    crc32_combine64;
+    gzopen64;
+    gzseek64;
+    gztell64;
+    inflateUndermine;
+} ZLIB_1.2.2.4;
+
+ZLIB_1.2.3.4 {
+    inflateReset2;
+    inflateMark;
+} ZLIB_1.2.3.3;
+
+ZLIB_1.2.3.5 {
+    gzbuffer;
+    gzoffset;
+    gzoffset64;
+    gzclose_r;
+    gzclose_w;
+} ZLIB_1.2.3.4;
+
+ZLIB_1.2.5.1 {
+    deflatePending;
+} ZLIB_1.2.3.5;
+
+ZLIB_1.2.5.2 {
+    deflateResetKeep;
+    gzgetc_;
+    inflateResetKeep;
+} ZLIB_1.2.5.1;
+
+ZLIB_1.2.7.1 {
+    inflateGetDictionary;
+    gzvprintf;
+} ZLIB_1.2.5.2;
diff --git a/Source/3rd Party/wx/src/zlib/zlib.pc.in b/Source/3rd Party/wx/src/zlib/zlib.pc.in
new file mode 100644
index 000000000..7e5acf9c7
--- /dev/null
+++ b/Source/3rd Party/wx/src/zlib/zlib.pc.in	
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+sharedlibdir=@sharedlibdir@
+includedir=@includedir@
+
+Name: zlib
+Description: zlib compression library
+Version: @VERSION@
+
+Requires:
+Libs: -L${libdir} -L${sharedlibdir} -lz
+Cflags: -I${includedir}
diff --git a/Source/3rd Party/wx/src/zlib/zutil.c b/Source/3rd Party/wx/src/zlib/zutil.c
index 0f4bd7871..769c992cd 100644
--- a/Source/3rd Party/wx/src/zlib/zutil.c	
+++ b/Source/3rd Party/wx/src/zlib/zutil.c	
@@ -1,318 +1,323 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-#ifndef NO_DUMMY_DECL
-struct internal_state      {int dummy;}; /* for buggy compilers */
-#endif
-
-const char * const z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
-
-
-const char * ZEXPORT zlibVersion()
-{
-    return ZLIB_VERSION;
-}
-
-uLong ZEXPORT zlibCompileFlags()
-{
-    uLong flags;
-
-    flags = 0;
-    switch (sizeof(uInt)) {
-    case 2:     break;
-    case 4:     flags += 1;     break;
-    case 8:     flags += 2;     break;
-    default:    flags += 3;
-    }
-    switch (sizeof(uLong)) {
-    case 2:     break;
-    case 4:     flags += 1 << 2;        break;
-    case 8:     flags += 2 << 2;        break;
-    default:    flags += 3 << 2;
-    }
-    switch (sizeof(voidpf)) {
-    case 2:     break;
-    case 4:     flags += 1 << 4;        break;
-    case 8:     flags += 2 << 4;        break;
-    default:    flags += 3 << 4;
-    }
-    switch (sizeof(z_off_t)) {
-    case 2:     break;
-    case 4:     flags += 1 << 6;        break;
-    case 8:     flags += 2 << 6;        break;
-    default:    flags += 3 << 6;
-    }
-#ifdef DEBUG
-    flags += 1 << 8;
-#endif
-#if defined(ASMV) || defined(ASMINF)
-    flags += 1 << 9;
-#endif
-#ifdef ZLIB_WINAPI
-    flags += 1 << 10;
-#endif
-#ifdef BUILDFIXED
-    flags += 1 << 12;
-#endif
-#ifdef DYNAMIC_CRC_TABLE
-    flags += 1 << 13;
-#endif
-#ifdef NO_GZCOMPRESS
-    flags += 1L << 16;
-#endif
-#ifdef NO_GZIP
-    flags += 1L << 17;
-#endif
-#ifdef PKZIP_BUG_WORKAROUND
-    flags += 1L << 20;
-#endif
-#ifdef FASTEST
-    flags += 1L << 21;
-#endif
-#ifdef STDC
-#  ifdef NO_vsnprintf
-        flags += 1L << 25;
-#    ifdef HAS_vsprintf_void
-        flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_vsnprintf_void
-        flags += 1L << 26;
-#    endif
-#  endif
-#else
-        flags += 1L << 24;
-#  ifdef NO_snprintf
-        flags += 1L << 25;
-#    ifdef HAS_sprintf_void
-        flags += 1L << 26;
-#    endif
-#  else
-#    ifdef HAS_snprintf_void
-        flags += 1L << 26;
-#    endif
-#  endif
-#endif
-    return flags;
-}
-
-#ifdef DEBUG
-
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int z_verbose = verbose;
-
-void z_error (m)
-    char *m;
-{
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(err)
-    int err;
-{
-    return ERR_MSG(err);
-}
-
-#if defined(_WIN32_WCE)
-    /* The Microsoft C Run-Time Library for Windows CE doesn't have
-     * errno.  We define it as a global variable to simplify porting.
-     * Its value is always 0 and should not be used.
-     */
-    int errno = 0;
-#endif
-
-#ifndef HAVE_MEMCPY
-
-void zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
-}
-
-int zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
-    uInt j;
-
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-    }
-    return 0;
-}
-
-void zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
-}
-#endif
-
-
-#ifdef SYS16BIT
-
-#ifdef __TURBOC__
-/* Turbo C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    ptr = opaque; /* just to make some compilers happy */
-    Assert(0, "zcfree: ptr not found");
-}
-
-#endif /* __TURBOC__ */
-
-
-#ifdef M_I86
-/* Microsoft C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-#  define _halloc  halloc
-#  define _hfree   hfree
-#endif
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    return _halloc((long)items, size);
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    _hfree(ptr);
-}
-
-#endif /* M_I86 */
-
-#endif /* SYS16BIT */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp  malloc OF((uInt size));
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-voidpf zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
-    if (opaque) items += size - size; /* make compiler happy */
-    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
-                              (voidpf)calloc(items, size);
-}
-
-void  zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
-    free(ptr);
-    if (opaque) return; /* make compiler happy */
-}
-
-#endif /* MY_ZCALLOC */
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+
+#include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
+
+#ifndef NO_DUMMY_DECL
+struct internal_state      {int dummy;}; /* for buggy compilers */
+#endif
+
+z_const char * const z_errmsg[10] = {
+"need dictionary",     /* Z_NEED_DICT       2  */
+"stream end",          /* Z_STREAM_END      1  */
+"",                    /* Z_OK              0  */
+"file error",          /* Z_ERRNO         (-1) */
+"stream error",        /* Z_STREAM_ERROR  (-2) */
+"data error",          /* Z_DATA_ERROR    (-3) */
+"insufficient memory", /* Z_MEM_ERROR     (-4) */
+"buffer error",        /* Z_BUF_ERROR     (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
+""};
+
+
+const char * ZEXPORT zlibVersion()
+{
+    return ZLIB_VERSION;
+}
+
+uLong ZEXPORT zlibCompileFlags()
+{
+    uLong flags;
+
+    flags = 0;
+    switch ((int)(sizeof(uInt))) {
+    case 2:     break;
+    case 4:     flags += 1;     break;
+    case 8:     flags += 2;     break;
+    default:    flags += 3;
+    }
+    switch ((int)(sizeof(uLong))) {
+    case 2:     break;
+    case 4:     flags += 1 << 2;        break;
+    case 8:     flags += 2 << 2;        break;
+    default:    flags += 3 << 2;
+    }
+    switch ((int)(sizeof(voidpf))) {
+    case 2:     break;
+    case 4:     flags += 1 << 4;        break;
+    case 8:     flags += 2 << 4;        break;
+    default:    flags += 3 << 4;
+    }
+    switch ((int)(sizeof(z_off_t))) {
+    case 2:     break;
+    case 4:     flags += 1 << 6;        break;
+    case 8:     flags += 2 << 6;        break;
+    default:    flags += 3 << 6;
+    }
+#ifdef DEBUG
+    flags += 1 << 8;
+#endif
+#if defined(ASMV) || defined(ASMINF)
+    flags += 1 << 9;
+#endif
+#ifdef ZLIB_WINAPI
+    flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+    flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+    flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+    flags += 1L << 16;
+#endif
+#ifdef NO_GZIP
+    flags += 1L << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+    flags += 1L << 20;
+#endif
+#ifdef FASTEST
+    flags += 1L << 21;
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifdef NO_vsnprintf
+    flags += 1L << 25;
+#    ifdef HAS_vsprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_vsnprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#else
+    flags += 1L << 24;
+#  ifdef NO_snprintf
+    flags += 1L << 25;
+#    ifdef HAS_sprintf_void
+    flags += 1L << 26;
+#    endif
+#  else
+#    ifdef HAS_snprintf_void
+    flags += 1L << 26;
+#    endif
+#  endif
+#endif
+    return flags;
+}
+
+#ifdef DEBUG
+
+#  ifndef verbose
+#    define verbose 0
+#  endif
+int ZLIB_INTERNAL z_verbose = verbose;
+
+void ZLIB_INTERNAL z_error (m)
+    char *m;
+{
+    fprintf(stderr, "%s\n", m);
+    exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+    int err;
+{
+    return ERR_MSG(err);
+}
+
+#if defined(_WIN32_WCE)
+    /* The Microsoft C Run-Time Library for Windows CE doesn't have
+     * errno.  We define it as a global variable to simplify porting.
+     * Its value is always 0 and should not be used.
+     */
+    int errno = 0;
+#endif
+
+#ifndef HAVE_MEMCPY
+
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
+    Bytef* dest;
+    const Bytef* source;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = *source++; /* ??? to be unrolled */
+    } while (--len != 0);
+}
+
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
+    const Bytef* s1;
+    const Bytef* s2;
+    uInt  len;
+{
+    uInt j;
+
+    for (j = 0; j < len; j++) {
+        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
+    }
+    return 0;
+}
+
+void ZLIB_INTERNAL zmemzero(dest, len)
+    Bytef* dest;
+    uInt  len;
+{
+    if (len == 0) return;
+    do {
+        *dest++ = 0;  /* ??? to be unrolled */
+    } while (--len != 0);
+}
+#endif
+
+#ifndef Z_SOLO
+
+#ifdef SYS16BIT
+
+#ifdef __TURBOC__
+/* Turbo C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+    voidpf org_ptr;
+    voidpf new_ptr;
+} ptr_table;
+
+local ptr_table table[MAX_PTR];
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+    voidpf buf = opaque; /* just to make some compilers happy */
+    ulg bsize = (ulg)items*size;
+
+    /* If we allocate less than 65520 bytes, we assume that farmalloc
+     * will return a usable pointer which doesn't have to be normalized.
+     */
+    if (bsize < 65520L) {
+        buf = farmalloc(bsize);
+        if (*(ush*)&buf != 0) return buf;
+    } else {
+        buf = farmalloc(bsize + 16L);
+    }
+    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+    table[next_ptr].org_ptr = buf;
+
+    /* Normalize the pointer to seg:0 */
+    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+    *(ush*)&buf = 0;
+    table[next_ptr++].new_ptr = buf;
+    return buf;
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
+    int n;
+    if (*(ush*)&ptr != 0) { /* object < 64K */
+        farfree(ptr);
+        return;
+    }
+    /* Find the original pointer */
+    for (n = 0; n < next_ptr; n++) {
+        if (ptr != table[n].new_ptr) continue;
+
+        farfree(table[n].org_ptr);
+        while (++n < next_ptr) {
+            table[n-1] = table[n];
+        }
+        next_ptr--;
+        return;
+    }
+    ptr = opaque; /* just to make some compilers happy */
+    Assert(0, "zcfree: ptr not found");
+}
+
+#endif /* __TURBOC__ */
+
+
+#ifdef M_I86
+/* Microsoft C in 16-bit mode */
+
+#  define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+#  define _halloc  halloc
+#  define _hfree   hfree
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    return _halloc((long)items, size);
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
+    if (opaque) opaque = 0; /* to make compiler happy */
+    _hfree(ptr);
+}
+
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp  malloc OF((uInt size));
+extern voidp  calloc OF((uInt items, uInt size));
+extern void   free   OF((voidpf ptr));
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
+    voidpf opaque;
+    unsigned items;
+    unsigned size;
+{
+    if (opaque) items += size - size; /* make compiler happy */
+    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+                              (voidpf)calloc(items, size);
+}
+
+void ZLIB_INTERNAL zcfree (opaque, ptr)
+    voidpf opaque;
+    voidpf ptr;
+{
+    free(ptr);
+    if (opaque) return; /* make compiler happy */
+}
+
+#endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */
diff --git a/Source/3rd Party/wx/src/zlib/zutil.h b/Source/3rd Party/wx/src/zlib/zutil.h
index 03452cc7e..428dbb01c 100644
--- a/Source/3rd Party/wx/src/zlib/zutil.h	
+++ b/Source/3rd Party/wx/src/zlib/zutil.h	
@@ -1,271 +1,252 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#include <stdio.h>
-
-#define ZLIB_INTERNAL
-#include "zlib.h"
-
-#ifdef STDC
-#  ifndef _WIN32_WCE
-#    include <stddef.h>
-#  endif
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-#   ifdef _WIN32_WCE
-      /* The Microsoft C Run-Time Library for Windows CE doesn't have
-       * errno.  We define it as a global variable to simplify porting.
-       * Its value is always 0 and should not be used.  We rename it to
-       * avoid conflict with other libraries that use the same workaround.
-       */
-#     define errno z_errno
-#   endif
-    extern int errno;
-#else
-#  ifndef _WIN32_WCE
-#    include <errno.h>
-#  endif
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-#  define OS_CODE  0x00
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl farfree( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
-#    else
-#      include <alloc.h>
-#    endif
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
-#  endif
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  0x01
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
-#  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
-#endif
-
-#ifdef OS2
-#  define OS_CODE  0x06
-#  ifdef M_I86
-     #include <malloc.h>
-#  endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#    include <unix.h> /* for fdopen */
-#  else
-#    ifndef fdopen
-#      define fdopen(fd,mode) NULL /* No fdopen() */
-#    endif
-#  endif
-#endif
-
-#ifdef TOPS20
-#  define OS_CODE  0x0a
-#endif
-
-#ifdef WIN32
-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
-#    define OS_CODE  0x0b
-#  endif
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0f
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600))
-#  if defined(_WIN32_WCE)
-#    define fdopen(fd,mode) NULL /* No fdopen() */
-#    ifndef _PTRDIFF_T_DEFINED
-       typedef int ptrdiff_t;
-#      define _PTRDIFF_T_DEFINED
-#    endif
-#  else
-#    define fdopen(fd,type)  _fdopen(fd,type)
-#  endif
-#endif
-
-        /* common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#if defined(__CYGWIN__)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
-     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-        but for now we just assume it doesn't. */
-#    define NO_vsnprintf
-#  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
-#  ifdef WIN32
-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      define vsnprintf _vsnprintf
-#    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#endif
-#ifdef VMS
-#  define NO_vsnprintf
-#endif
-
-#if defined(pyr)
-#  define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
-#  define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#  define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-#else
-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  include <stdio.h>
-   extern int z_verbose;
-   extern void z_error    OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-#endif /* ZUTIL_H */
+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+
+#ifndef ZUTIL_H
+#define ZUTIL_H
+
+#ifdef HAVE_HIDDEN
+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+#  define ZLIB_INTERNAL
+#endif
+
+#include "zlib.h"
+
+#if defined(STDC) && !defined(Z_SOLO)
+#  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
+#    include <stddef.h>
+#  endif
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+
+#ifdef Z_SOLO
+   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
+#endif
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+typedef unsigned char  uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long  ulg;
+
+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
+
+#define ERR_RETURN(strm,err) \
+  return (strm->msg = ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+        /* common constants */
+
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES    2
+/* The three kinds of block type */
+
+#define MIN_MATCH  3
+#define MAX_MATCH  258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+        /* target dependencies */
+
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+#  define OS_CODE  0x00
+#  ifndef Z_SOLO
+#    if defined(__TURBOC__) || defined(__BORLANDC__)
+#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+         /* Allow compilation with ANSI keywords only enabled */
+         void _Cdecl farfree( void *block );
+         void *_Cdecl farmalloc( unsigned long nbytes );
+#      else
+#        include <alloc.h>
+#      endif
+#    else /* MSC or DJGPP */
+#      include <malloc.h>
+#    endif
+#  endif
+#endif
+
+#ifdef AMIGA
+#  define OS_CODE  0x01
+#endif
+
+#if defined(VAXC) || defined(VMS)
+#  define OS_CODE  0x02
+#  define F_OPEN(name, mode) \
+     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#if defined(ATARI) || defined(atarist)
+#  define OS_CODE  0x05
+#endif
+
+#ifdef OS2
+#  define OS_CODE  0x06
+#  if defined(M_I86) && !defined(Z_SOLO)
+#    include <malloc.h>
+#  endif
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+#  define OS_CODE  0x07
+#  ifndef Z_SOLO
+#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#      include <unix.h> /* for fdopen */
+#    else
+#      ifndef fdopen
+#        define fdopen(fd,mode) NULL /* No fdopen() */
+#      endif
+#    endif
+#  endif
+#endif
+
+#ifdef TOPS20
+#  define OS_CODE  0x0a
+#endif
+
+#ifdef WIN32
+#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
+#    define OS_CODE  0x0b
+#  endif
+#endif
+
+#ifdef __50SERIES /* Prime/PRIMOS */
+#  define OS_CODE  0x0f
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+#  define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+#  if defined(_WIN32_WCE)
+#    define fdopen(fd,mode) NULL /* No fdopen() */
+#    ifndef _PTRDIFF_T_DEFINED
+       typedef int ptrdiff_t;
+#      define _PTRDIFF_T_DEFINED
+#    endif
+#  else
+#    define fdopen(fd,type)  _fdopen(fd,type)
+#  endif
+#endif
+
+#if defined(__BORLANDC__) && !defined(MSDOS)
+  #pragma warn -8004
+  #pragma warn -8008
+  #pragma warn -8066
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_WIN32) && \
+    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+    ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#endif
+
+        /* common defaults */
+
+#ifndef OS_CODE
+#  define OS_CODE  0x03  /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+#  define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+         /* functions */
+
+#if defined(pyr) || defined(Z_SOLO)
+#  define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+  * You may have to use the same strategy for Borland C (untested).
+  * The __SC__ check is for Symantec.
+  */
+#  define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+#  define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+#    define zmemcpy _fmemcpy
+#    define zmemcmp _fmemcmp
+#    define zmemzero(dest, len) _fmemset(dest, 0, len)
+#  else
+#    define zmemcpy memcpy
+#    define zmemcmp memcmp
+#    define zmemzero(dest, len) memset(dest, 0, len)
+#  endif
+#else
+   void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+   int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+   void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef DEBUG
+#  include <stdio.h>
+   extern int ZLIB_INTERNAL z_verbose;
+   extern void ZLIB_INTERNAL z_error OF((char *m));
+#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
+#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
+#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+#  define Assert(cond,msg)
+#  define Trace(x)
+#  define Tracev(x)
+#  define Tracevv(x)
+#  define Tracec(c,x)
+#  define Tracecv(c,x)
+#endif
+
+#ifndef Z_SOLO
+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                                    unsigned size));
+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#endif
+
+#define ZALLOC(strm, items, size) \
+           (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+/* Reverse the bytes in a 32-bit value */
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
+#endif /* ZUTIL_H */
diff --git a/Source/3rd Party/wx/wx_base.vcproj b/Source/3rd Party/wx/wx_base.vcproj
index c3fe5d048..cb168334c 100644
--- a/Source/3rd Party/wx/wx_base.vcproj	
+++ b/Source/3rd Party/wx/wx_base.vcproj	
@@ -53,7 +53,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\lib\wxbase29d.lib"
+				OutputFile="$(OutDir)\lib\wxbase28d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -109,7 +109,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\lib\wxbase29.lib"
+				OutputFile="$(OutDir)\lib\wxbase28.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -134,10 +134,6 @@
 		<Filter
 			Name="Common Sources"
 			>
-			<File
-				RelativePath="src\common\any.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\appbase.cpp"
 				>
@@ -154,14 +150,6 @@
 				RelativePath="src\common\archive.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\arrstr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\base64.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\clntdata.cpp"
 				>
@@ -179,11 +167,11 @@
 				>
 			</File>
 			<File
-				RelativePath="src\common\datetime.cpp"
+				RelativePath=".\src\common\datacmn.cpp"
 				>
 			</File>
 			<File
-				RelativePath="src\common\datetimefmt.cpp"
+				RelativePath="src\common\datetime.cpp"
 				>
 			</File>
 			<File
@@ -234,10 +222,6 @@
 				RelativePath="src\common\event.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\evtloopcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\extended.c"
 				>
@@ -310,10 +294,6 @@
 				RelativePath="src\common\fs_mem.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\fswatchercmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\hash.cpp"
 				>
@@ -334,10 +314,6 @@
 				RelativePath="src\common\ipcbase.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\languageinfo.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\list.cpp"
 				>
@@ -370,10 +346,6 @@
 				RelativePath="src\common\mstream.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\numformatter.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\object.cpp"
 				>
@@ -402,10 +374,6 @@
 				RelativePath="src\common\stdpbase.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\stdstream.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\stopwatch.cpp"
 				>
@@ -422,18 +390,6 @@
 				RelativePath="src\common\string.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\stringimpl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\stringops.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\strvararg.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\sysopt.cpp"
 				>
@@ -450,42 +406,18 @@
 				RelativePath="src\common\textfile.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\time.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\timercmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\timerimpl.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\tokenzr.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\translation.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\txtstrm.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\unichar.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\uri.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\ustring.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\utilscmn.cpp"
 				>
@@ -499,15 +431,7 @@
 				>
 			</File>
 			<File
-				RelativePath="src\common\wxcrt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\wxprintf.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\xlocale.cpp"
+				RelativePath=".\src\common\wxchar.cpp"
 				>
 			</File>
 			<File
@@ -554,14 +478,6 @@
 				RelativePath="src\msw\dlmsw.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\evtloop.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\msw\fswatcher.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\main.cpp"
 				>
@@ -602,10 +518,6 @@
 				RelativePath="src\msw\thread.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\timer.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\utils.cpp"
 				>
@@ -660,10 +572,6 @@
 		<Filter
 			Name="Generic Sources"
 			>
-			<File
-				RelativePath="src\generic\fswatcherg.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Setup Headers"
diff --git a/Source/3rd Party/wx/wx_base.vcxproj b/Source/3rd Party/wx/wx_base.vcxproj
index a846dcea8..2544289b0 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj	
+++ b/Source/3rd Party/wx/wx_base.vcxproj	
@@ -5,62 +5,58 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>base</ProjectName>
     <ProjectGuid>{427F1DCD-3BED-4010-9322-077A4C06D871}</ProjectGuid>
     <RootNamespace>base</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetName>wxbase29</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxbase29d</TargetName>
+    <TargetName>wxbase28</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxbase28d</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>lib\vc_lib\mswud;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswud;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
       <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)wxbase29.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxbase29d.lib</OutputFile>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\common\any.cpp" />
     <ClCompile Include="src\common\appbase.cpp" />
     <ClCompile Include="src\common\arcall.cpp" />
     <ClCompile Include="src\common\arcfind.cpp" />
     <ClCompile Include="src\common\archive.cpp" />
-    <ClCompile Include="src\common\arrstr.cpp" />
-    <ClCompile Include="src\common\base64.cpp" />
     <ClCompile Include="src\common\clntdata.cpp" />
     <ClCompile Include="src\common\cmdline.cpp" />
     <ClCompile Include="src\common\config.cpp" />
     <ClCompile Include="src\common\convauto.cpp" />
+    <ClCompile Include="src\common\datacmn.cpp" />
     <ClCompile Include="src\common\datetime.cpp" />
-    <ClCompile Include="src\common\datetimefmt.cpp" />
     <ClCompile Include="src\common\datstrm.cpp" />
     <ClCompile Include="src\common\dircmn.cpp" />
     <ClCompile Include="src\common\dummy.cpp">
@@ -71,7 +67,6 @@
     <ClCompile Include="src\common\dynload.cpp" />
     <ClCompile Include="src\common\encconv.cpp" />
     <ClCompile Include="src\common\event.cpp" />
-    <ClCompile Include="src\common\evtloopcmn.cpp" />
     <ClCompile Include="src\common\extended.c">
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -89,13 +84,11 @@
     <ClCompile Include="src\common\fs_arc.cpp" />
     <ClCompile Include="src\common\fs_filter.cpp" />
     <ClCompile Include="src\common\fs_mem.cpp" />
-    <ClCompile Include="src\common\fswatchercmn.cpp" />
     <ClCompile Include="src\common\hash.cpp" />
     <ClCompile Include="src\common\hashmap.cpp" />
     <ClCompile Include="src\common\init.cpp" />
     <ClCompile Include="src\common\intl.cpp" />
     <ClCompile Include="src\common\ipcbase.cpp" />
-    <ClCompile Include="src\common\languageinfo.cpp" />
     <ClCompile Include="src\common\list.cpp" />
     <ClCompile Include="src\common\log.cpp" />
     <ClCompile Include="src\common\longlong.cpp" />
@@ -104,7 +97,6 @@
     <ClCompile Include="src\common\module.cpp" />
     <ClCompile Include="src\common\msgout.cpp" />
     <ClCompile Include="src\common\mstream.cpp" />
-    <ClCompile Include="src\common\numformatter.cpp" />
     <ClCompile Include="src\common\object.cpp" />
     <ClCompile Include="src\common\platinfo.cpp" />
     <ClCompile Include="src\common\powercmn.cpp" />
@@ -112,33 +104,21 @@
     <ClCompile Include="src\common\regex.cpp" />
     <ClCompile Include="src\common\sstream.cpp" />
     <ClCompile Include="src\common\stdpbase.cpp" />
-    <ClCompile Include="src\common\stdstream.cpp" />
     <ClCompile Include="src\common\stopwatch.cpp" />
     <ClCompile Include="src\common\strconv.cpp" />
     <ClCompile Include="src\common\stream.cpp" />
     <ClCompile Include="src\common\string.cpp" />
-    <ClCompile Include="src\common\stringimpl.cpp" />
-    <ClCompile Include="src\common\stringops.cpp" />
-    <ClCompile Include="src\common\strvararg.cpp" />
     <ClCompile Include="src\common\sysopt.cpp" />
     <ClCompile Include="src\common\tarstrm.cpp" />
     <ClCompile Include="src\common\textbuf.cpp" />
     <ClCompile Include="src\common\textfile.cpp" />
-    <ClCompile Include="src\common\time.cpp" />
-    <ClCompile Include="src\common\timercmn.cpp" />
-    <ClCompile Include="src\common\timerimpl.cpp" />
     <ClCompile Include="src\common\tokenzr.cpp" />
-    <ClCompile Include="src\common\translation.cpp" />
     <ClCompile Include="src\common\txtstrm.cpp" />
-    <ClCompile Include="src\common\unichar.cpp" />
     <ClCompile Include="src\common\uri.cpp" />
-    <ClCompile Include="src\common\ustring.cpp" />
     <ClCompile Include="src\common\utilscmn.cpp" />
     <ClCompile Include="src\common\variant.cpp" />
     <ClCompile Include="src\common\wfstream.cpp" />
-    <ClCompile Include="src\common\wxcrt.cpp" />
-    <ClCompile Include="src\common\wxprintf.cpp" />
-    <ClCompile Include="src\common\xlocale.cpp" />
+    <ClCompile Include="src\common\wxchar.cpp" />
     <ClCompile Include="src\common\xti.cpp" />
     <ClCompile Include="src\common\xtistrm.cpp" />
     <ClCompile Include="src\common\zipstrm.cpp" />
@@ -149,8 +129,6 @@
     <ClCompile Include="src\msw\debughlp.cpp" />
     <ClCompile Include="src\msw\dir.cpp" />
     <ClCompile Include="src\msw\dlmsw.cpp" />
-    <ClCompile Include="src\msw\evtloop.cpp" />
-    <ClCompile Include="src\msw\fswatcher.cpp" />
     <ClCompile Include="src\msw\main.cpp" />
     <ClCompile Include="src\msw\mimetype.cpp" />
     <ClCompile Include="src\msw\mslu.cpp" />
@@ -161,14 +139,12 @@
     <ClCompile Include="src\msw\stackwalk.cpp" />
     <ClCompile Include="src\msw\stdpaths.cpp" />
     <ClCompile Include="src\msw\thread.cpp" />
-    <ClCompile Include="src\msw\timer.cpp" />
     <ClCompile Include="src\msw\utils.cpp">
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="src\msw\utilsexc.cpp" />
     <ClCompile Include="src\msw\volume.cpp" />
-    <ClCompile Include="src\generic\fswatcherg.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\msw\version.rc">
@@ -178,14 +154,14 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="include\wx\msw\setup.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswud\wx\setup.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" lib\vc_lib\mswud\wx\setup.h
+      <Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswud\wx\setup.h</Message>
+      <Command Condition="'$(Configuration)'=='Debug'">copy "%(FullPath)" lib\vc_lib\mswud\wx\setup.h
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h
+      <Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
+      <Command Condition="'$(Configuration)'=='Release'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="include\wx\msw\apptbase.h" />
     <ClInclude Include="include\wx\msw\apptrait.h" />
@@ -195,14 +171,12 @@
     <ClInclude Include="include\wx\msw\debughlp.h" />
     <ClInclude Include="include\wx\msw\fswatcher.h" />
     <CustomBuild Include="include\wx\msw\genrcdefs.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)'=='Debug'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
+      <Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)'=='Release'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
+      <Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="include\wx\msw\libraries.h" />
     <ClInclude Include="include\wx\msw\mimetype.h" />
@@ -370,7 +344,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_base.vcxproj.filters b/Source/3rd Party/wx/wx_base.vcxproj.filters
index 0652ad22f..efdb44d8b 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_base.vcxproj.filters	
@@ -24,9 +24,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\common\any.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\appbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -39,12 +36,6 @@
     <ClCompile Include="src\common\archive.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\arrstr.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\base64.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\clntdata.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -60,9 +51,6 @@
     <ClCompile Include="src\common\datetime.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\datetimefmt.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\datstrm.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -87,9 +75,6 @@
     <ClCompile Include="src\common\event.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\evtloopcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\extended.c">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -132,9 +117,6 @@
     <ClCompile Include="src\common\fs_mem.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\fswatchercmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\hash.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -150,9 +132,6 @@
     <ClCompile Include="src\common\ipcbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\languageinfo.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\list.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -177,9 +156,6 @@
     <ClCompile Include="src\common\mstream.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\numformatter.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\object.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -201,9 +177,6 @@
     <ClCompile Include="src\common\stdpbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\stdstream.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\stopwatch.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -216,15 +189,6 @@
     <ClCompile Include="src\common\string.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\stringimpl.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\stringops.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\strvararg.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\sysopt.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -237,33 +201,15 @@
     <ClCompile Include="src\common\textfile.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\time.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\timercmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\timerimpl.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\tokenzr.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\translation.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\txtstrm.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\unichar.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\uri.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\ustring.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\utilscmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -273,15 +219,6 @@
     <ClCompile Include="src\common\wfstream.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\wxcrt.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\wxprintf.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\xlocale.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\xti.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -312,12 +249,6 @@
     <ClCompile Include="src\msw\dlmsw.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\evtloop.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\fswatcher.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\main.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -348,9 +279,6 @@
     <ClCompile Include="src\msw\thread.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\timer.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\utils.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -360,8 +288,11 @@
     <ClCompile Include="src\msw\volume.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\generic\fswatcherg.cpp">
-      <Filter>Generic Sources</Filter>
+    <ClCompile Include="src\common\datacmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\wxchar.cpp">
+      <Filter>Common Sources</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/3rd Party/wx/wx_core.vcproj b/Source/3rd Party/wx/wx_core.vcproj
index 3afbfa91c..ba8c88e53 100644
--- a/Source/3rd Party/wx/wx_core.vcproj	
+++ b/Source/3rd Party/wx/wx_core.vcproj	
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="lib\vc_lib\mswu;include,src\tiff\libtiff,src\jpeg,src\png"
+				AdditionalIncludeDirectories="&quot;$(Root)Source\3rd Party\wx\lib\vc_lib\mswd&quot;;&quot;$(Root)Source\3rd Party\wx\include&quot;;&quot;$(Root)Source\3rd Party\wx\src\tiff\libtiff&quot;;&quot;$(Root)Source\3rd Party\wx\src\jpeg&quot;;&quot;$(Root)Source\3rd Party\wx\src\png&quot;;&quot;$(Root)Source\3rd Party\wx\src\zlib&quot;"
 				PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				DisableSpecificWarnings="4005"
@@ -53,7 +53,8 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\lib\wxmsw29d_core.lib"
+				AdditionalDependencies="Comctl32.lib Rpcrt4.lib"
+				OutputFile="$(OutDir)\lib\wxmsw28d_core.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -93,7 +94,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="lib\vc_lib\mswu;include,src\tiff\libtiff,src\jpeg,src\png"
+				AdditionalIncludeDirectories="&quot;$(Root)Source\3rd Party\wx\lib\vc_lib\mswd&quot;;&quot;$(Root)Source\3rd Party\wx\include&quot;;&quot;$(Root)Source\3rd Party\wx\src\tiff\libtiff&quot;;&quot;$(Root)Source\3rd Party\wx\src\jpeg&quot;;&quot;$(Root)Source\3rd Party\wx\src\png&quot;;&quot;$(Root)Source\3rd Party\wx\src\zlib&quot;"
 				PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0"
 				PrecompiledHeaderThrough="wx/wxprec.h"
 				DisableSpecificWarnings="4005"
@@ -109,7 +110,8 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\lib\wxmsw29_core.lib"
+				AdditionalDependencies="Comctl32.lib Rpcrt4.lib"
+				OutputFile="$(OutDir)\lib\wxmsw28_core.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -134,18 +136,10 @@
 		<Filter
 			Name="Common Sources"
 			>
-			<File
-				RelativePath="src\common\accelcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\accesscmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\affinematrix2d.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\anidecod.cpp"
 				>
@@ -162,38 +156,14 @@
 				RelativePath="src\common\artstd.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\arttango.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\bmpbase.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\bmpbtncmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\bookctrl.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\btncmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\cairo.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\checkboxcmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\checklstcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\choiccmn.cpp"
 				>
@@ -218,10 +188,6 @@
 				RelativePath="src\common\colourcmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\colourdata.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\combocmn.cpp"
 				>
@@ -254,14 +220,6 @@
 				RelativePath="src\common\dcgraph.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\dcsvg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\dirctrlcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\dlgcmn.cpp"
 				>
@@ -322,18 +280,14 @@
 				RelativePath="src\common\event.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\common\evtloopcmn.cpp"
+				>
+			</File>
 			<File
 				RelativePath="src\common\fddlgcmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\filectrlcmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\filehistorycmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\filepickercmn.cpp"
 				>
@@ -346,10 +300,6 @@
 				RelativePath="src\common\fontcmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\fontdata.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\fontenumcmn.cpp"
 				>
@@ -362,10 +312,6 @@
 				RelativePath="src\common\fontpickercmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\fontutilcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\framecmn.cpp"
 				>
@@ -398,14 +344,6 @@
 				RelativePath="src\common\graphcmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\headercolcmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\headerctrlcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\helpbase.cpp"
 				>
@@ -478,10 +416,6 @@
 				RelativePath="src\common\listctrlcmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\markupparser.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\matrix.cpp"
 				>
@@ -490,10 +424,6 @@
 				RelativePath="src\common\menucmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\mousemanager.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\msgout.cpp"
 				>
@@ -506,22 +436,10 @@
 				RelativePath="src\common\overlaycmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\ownerdrwcmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\panelcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\paper.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\persist.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\pickerbase.cpp"
 				>
@@ -538,18 +456,10 @@
 				RelativePath="src\common\quantize.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\radiobtncmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\radiocmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\rearrangectrl.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\rendcmn.cpp"
 				>
@@ -558,10 +468,6 @@
 				RelativePath="src\common\rgncmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\scrolbarcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\settcmn.cpp"
 				>
@@ -570,18 +476,6 @@
 				RelativePath="src\common\sizer.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\slidercmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\spinbtncmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\spinctrlcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\srchcmn.cpp"
 				>
@@ -590,22 +484,6 @@
 				RelativePath="src\common\statbar.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\statbmpcmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\statboxcmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\statlinecmn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\stattextcmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\stockitem.cpp"
 				>
@@ -619,7 +497,7 @@
 				>
 			</File>
 			<File
-				RelativePath="src\common\textentrycmn.cpp"
+				RelativePath=".\src\common\timercmn.cpp"
 				>
 			</File>
 			<File
@@ -630,10 +508,6 @@
 				RelativePath="src\common\treebase.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\uiactioncmn.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\utilscmn.cpp"
 				>
@@ -646,10 +520,6 @@
 				RelativePath="src\common\validate.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\valnum.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\valtext.cpp"
 				>
@@ -658,14 +528,6 @@
 				RelativePath="src\common\wincmn.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\common\windowid.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\common\wrapsizer.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\common\xpmdecod.cpp"
 				>
@@ -702,18 +564,10 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="src\msw\anybutton.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\app.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\artmsw.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\ole\automtn.cpp"
 				>
@@ -906,10 +760,6 @@
 				RelativePath="src\msw\frame.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\gauge.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\gdiimage.cpp"
 				>
@@ -918,26 +768,6 @@
 				RelativePath="src\msw\gdiobj.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\gdiplus.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="src\msw\graphics.cpp"
 				>
@@ -959,7 +789,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\msw\headerctrl.cpp"
+				RelativePath=".\src\msw\gsockmsw.cpp"
 				>
 			</File>
 			<File
@@ -1026,30 +856,6 @@
 				RelativePath="src\msw\nativdlg.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\nativewin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\msw\nonownedwnd.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="src\msw\notebook.cpp"
 				>
@@ -1082,10 +888,6 @@
 				RelativePath="src\msw\palette.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\panel.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\pen.cpp"
 				>
@@ -1118,10 +920,6 @@
 				RelativePath="src\msw\printwin.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\progdlg.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\radiobox.cpp"
 				>
@@ -1138,10 +936,6 @@
 				RelativePath="src\msw\renderer.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\richmsgdlg.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\scrolbar.cpp"
 				>
@@ -1151,7 +945,7 @@
 				>
 			</File>
 			<File
-				RelativePath="src\msw\slider.cpp"
+				RelativePath=".\src\msw\slider95.cpp"
 				>
 			</File>
 			<File
@@ -1170,6 +964,10 @@
 				RelativePath="src\msw\statbox.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\msw\statbr95.cpp"
+				>
+			</File>
 			<File
 				RelativePath="src\msw\statline.cpp"
 				>
@@ -1179,23 +977,19 @@
 				>
 			</File>
 			<File
-				RelativePath="src\msw\statusbar.cpp"
+				RelativePath=".\src\msw\tbar95.cpp"
 				>
 			</File>
 			<File
 				RelativePath="src\msw\textctrl.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\textentry.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\tglbtn.cpp"
 				>
 			</File>
 			<File
-				RelativePath="src\msw\toolbar.cpp"
+				RelativePath=".\src\msw\timer.cpp"
 				>
 			</File>
 			<File
@@ -1210,10 +1004,6 @@
 				RelativePath="src\msw\treectrl.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\msw\uiaction.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\msw\utilsgui.cpp"
 				>
@@ -1380,10 +1170,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="src\generic\filectrlg.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\generic\filedlgg.cpp"
 				>
@@ -1436,14 +1222,6 @@
 				RelativePath="src\generic\graphicc.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\generic\headerctrlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\generic\infobar.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\generic\listbkg.cpp"
 				>
@@ -1472,10 +1250,6 @@
 				RelativePath="src\generic\logg.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\generic\markuptext.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\generic\mdig.cpp"
 				>
@@ -1497,11 +1271,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="src\generic\msgdlgg.cpp"
+				RelativePath="src\generic\numdlgg.cpp"
 				>
 			</File>
 			<File
-				RelativePath="src\generic\numdlgg.cpp"
+				RelativePath=".\src\generic\panelg.cpp"
 				>
 			</File>
 			<File
@@ -1520,10 +1294,6 @@
 				RelativePath="src\generic\renderg.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\generic\richmsgdlgg.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\generic\scrlwing.cpp"
 				>
@@ -1544,14 +1314,6 @@
 				RelativePath="src\generic\srchctlg.cpp"
 				>
 			</File>
-			<File
-				RelativePath="src\generic\statbmpg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="src\generic\stattextg.cpp"
-				>
-			</File>
 			<File
 				RelativePath="src\generic\statusbr.cpp"
 				>
@@ -3408,78 +3170,22 @@
 		<Filter
 			Name="Common Headers"
 			>
-			<File
-				RelativePath="include\wx\aboutdlg.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\accel.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\access.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\propgrid\advprops.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\affinematrix2d.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\affinematrix2dbase.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\anidecod.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\animate.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\animdecod.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\anybutton.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\ribbon\art.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\ribbon\art_internal.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\artprov.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\aui\aui.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\aui\auibar.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\aui\auibook.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\bannerwindow.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\ribbon\bar.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\bitmap.h"
 				>
@@ -3488,18 +3194,10 @@
 				RelativePath="include\wx\bmpbuttn.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\bmpcbox.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\bookctrl.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\persist\bookctrl.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\brush.h"
 				>
@@ -3512,18 +3210,6 @@
 				RelativePath="include\wx\button.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\ribbon\buttonbar.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\cairo.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\calctrl.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\caret.h"
 				>
@@ -3576,10 +3262,6 @@
 				RelativePath="include\wx\colour.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\colourdata.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\combo.h"
 				>
@@ -3588,22 +3270,10 @@
 				RelativePath="include\wx\combobox.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\commandlinkbutton.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\compositewin.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\control.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\ribbon\control.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\cshelp.h"
 				>
@@ -3616,30 +3286,10 @@
 				RelativePath="include\wx\cursor.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\custombgwin.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\dataobj.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\dataview.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\datectrl.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\dateevt.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\datetimectrl.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\dc.h"
 				>
@@ -3668,22 +3318,10 @@
 				RelativePath="include\wx\dcprint.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\dcps.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\dcscreen.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\dcsvg.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\debugrpt.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\dialog.h"
 				>
@@ -3692,10 +3330,6 @@
 				RelativePath="include\wx\dialup.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\dirctrl.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\dirdlg.h"
 				>
@@ -3712,10 +3346,6 @@
 				RelativePath="include\wx\dnd.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\aui\dockart.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\docmdi.h"
 				>
@@ -3724,22 +3354,6 @@
 				RelativePath="include\wx\docview.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\dragimag.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\dvrenderers.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\editlbox.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\propgrid\editors.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\effects.h"
 				>
@@ -3748,34 +3362,18 @@
 				RelativePath="include\wx\encinfo.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\evtloopsrc.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\fdrepdlg.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\filectrl.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\filedlg.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\filehistory.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\filepicker.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\aui\floatpane.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\fmappriv.h"
 				>
@@ -3784,10 +3382,6 @@
 				RelativePath="include\wx\font.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\fontdata.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\fontdlg.h"
 				>
@@ -3808,14 +3402,6 @@
 				RelativePath="include\wx\frame.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\aui\framemanager.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\ribbon\gallery.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\gauge.h"
 				>
@@ -3840,26 +3426,10 @@
 				RelativePath="include\wx\gifdecod.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\glcanvas.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\graphics.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\grid.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\headercol.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\headerctrl.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\help.h"
 				>
@@ -3868,22 +3438,6 @@
 				RelativePath="include\wx\helpbase.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\helphtml.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\helpwin.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\htmllbox.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\hyperlink.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\icon.h"
 				>
@@ -3940,26 +3494,10 @@
 				RelativePath="include\wx\imagxpm.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\infobar.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\itemid.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\joystick.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\layout.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\laywin.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\listbase.h"
 				>
@@ -3976,10 +3514,6 @@
 				RelativePath="include\wx\listctrl.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\propgrid\manager.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\matrix.h"
 				>
@@ -3988,10 +3522,6 @@
 				RelativePath="include\wx\mdi.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\mediactrl.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\menu.h"
 				>
@@ -4008,38 +3538,18 @@
 				RelativePath="include\wx\minifram.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\mousemanager.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\msgdlg.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\nativewin.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\nonownedwnd.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\notebook.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\notifmsg.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\numdlg.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\odcombo.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\overlay.h"
 				>
@@ -4048,10 +3558,6 @@
 				RelativePath="include\wx\ownerdrw.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\ribbon\page.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\palette.h"
 				>
@@ -4060,10 +3566,6 @@
 				RelativePath="include\wx\panel.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\ribbon\panel.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\paper.h"
 				>
@@ -4072,10 +3574,6 @@
 				RelativePath="include\wx\pen.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\persist.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\pickerbase.h"
 				>
@@ -4084,10 +3582,6 @@
 				RelativePath="include\wx\popupwin.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\position.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\print.h"
 				>
@@ -4104,34 +3598,6 @@
 				RelativePath="include\wx\progdlg.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\propdlg.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\propgrid\property.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\propgrid\propgrid.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\propgrid\propgriddefs.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\propgrid\propgridiface.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\propgrid\propgridpagestate.h"
-				>
-			</File>
-			<File
-				RelativePath="include\wx\propgrid\props.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\quantize.h"
 				>
@@ -4144,18 +3610,10 @@
 				RelativePath="include\wx\radiobut.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\range.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\rawbmp.h"
 				>
 			</File>
-			<File
-				RelativePath="include\wx\rearrangectrl.h"
-				>
-			</File>
 			<File
 				RelativePath="include\wx\region.h"
 				>
@@ -4305,11 +3763,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\persist\splitter.h"
+				RelativePath="include\wx\splitter.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\splitter.h"
+				RelativePath="include\wx\persist\splitter.h"
 				>
 			</File>
 			<File
@@ -4393,11 +3851,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\ribbon\toolbar.h"
+				RelativePath="include\wx\toolbar.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\toolbar.h"
+				RelativePath="include\wx\ribbon\toolbar.h"
 				>
 			</File>
 			<File
@@ -4409,11 +3867,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\persist\toplevel.h"
+				RelativePath="include\wx\toplevel.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\toplevel.h"
+				RelativePath="include\wx\persist\toplevel.h"
 				>
 			</File>
 			<File
@@ -4421,11 +3879,11 @@
 				>
 			</File>
 			<File
-				RelativePath="include\wx\persist\treebook.h"
+				RelativePath="include\wx\treebook.h"
 				>
 			</File>
 			<File
-				RelativePath="include\wx\treebook.h"
+				RelativePath="include\wx\persist\treebook.h"
 				>
 			</File>
 			<File
diff --git a/Source/3rd Party/wx/wx_core.vcxproj b/Source/3rd Party/wx/wx_core.vcxproj
index 8ce311047..bb827cd98 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj	
+++ b/Source/3rd Party/wx/wx_core.vcxproj	
@@ -5,71 +5,66 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>core</ProjectName>
     <ProjectGuid>{93447136-FACD-4740-8F35-FC46FB4A9E82}</ProjectGuid>
     <RootNamespace>core</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <TargetName>wxmsw29_core</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxmsw29d_core</TargetName>
+    <TargetName>wxmsw28_core</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxmsw28d_core</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>lib\vc_lib\mswu;include;src\tiff\libtiff;src\jpeg;src\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)'=='Debug'">$(Root)Source\3rd Party\wx\lib\vc_lib\mswd;$(Root)Source\3rd Party\wx\include;$(Root)Source\3rd Party\wx\src\tiff\libtiff;$(Root)Source\3rd Party\wx\src\jpeg;$(Root)Source\3rd Party\wx\src\png;$(Root)Source\3rd Party\wx\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)'=='Release'">$(Root)Source\3rd Party\wx\lib\vc_lib\msw;$(Root)Source\3rd Party\wx\include;$(Root)Source\3rd Party\wx\src\tiff\libtiff;$(Root)Source\3rd Party\wx\src\jpeg;$(Root)Source\3rd Party\wx\src\png;$(Root)Source\3rd Party\wx\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;__WXMSW__;__WXDEBUG__;WXBUILDING;wxUSE_BASE=0;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
       <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <UndefinePreprocessorDefinitions>
+      </UndefinePreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)wxmsw29_core.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxmsw29d_core.lib</OutputFile>
+      <AdditionalDependencies>Comctl32.lib;Rpcrt4.lib</AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\common\accelcmn.cpp" />
     <ClCompile Include="src\common\accesscmn.cpp" />
-    <ClCompile Include="src\common\affinematrix2d.cpp" />
     <ClCompile Include="src\common\anidecod.cpp" />
     <ClCompile Include="src\common\appcmn.cpp" />
     <ClCompile Include="src\common\artprov.cpp" />
     <ClCompile Include="src\common\artstd.cpp" />
-    <ClCompile Include="src\common\arttango.cpp" />
     <ClCompile Include="src\common\bmpbase.cpp" />
-    <ClCompile Include="src\common\bmpbtncmn.cpp" />
     <ClCompile Include="src\common\bookctrl.cpp" />
-    <ClCompile Include="src\common\btncmn.cpp" />
-    <ClCompile Include="src\common\cairo.cpp" />
-    <ClCompile Include="src\common\checkboxcmn.cpp" />
-    <ClCompile Include="src\common\checklstcmn.cpp" />
     <ClCompile Include="src\common\choiccmn.cpp" />
     <ClCompile Include="src\common\clipcmn.cpp" />
     <ClCompile Include="src\common\clrpickercmn.cpp" />
     <ClCompile Include="src\common\cmdproc.cpp" />
     <ClCompile Include="src\common\cmndata.cpp" />
     <ClCompile Include="src\common\colourcmn.cpp" />
-    <ClCompile Include="src\common\colourdata.cpp" />
     <ClCompile Include="src\common\combocmn.cpp" />
     <ClCompile Include="src\common\containr.cpp" />
     <ClCompile Include="src\common\cshelp.cpp" />
@@ -78,8 +73,6 @@
     <ClCompile Include="src\common\dcbase.cpp" />
     <ClCompile Include="src\common\dcbufcmn.cpp" />
     <ClCompile Include="src\common\dcgraph.cpp" />
-    <ClCompile Include="src\common\dcsvg.cpp" />
-    <ClCompile Include="src\common\dirctrlcmn.cpp" />
     <ClCompile Include="src\common\dlgcmn.cpp" />
     <ClCompile Include="src\common\dndcmn.cpp" />
     <ClCompile Include="src\common\dobjcmn.cpp" />
@@ -92,17 +85,14 @@
     </ClCompile>
     <ClCompile Include="src\common\effects.cpp" />
     <ClCompile Include="src\common\event.cpp" />
+    <ClCompile Include="src\common\evtloopcmn.cpp" />
     <ClCompile Include="src\common\fddlgcmn.cpp" />
-    <ClCompile Include="src\common\filectrlcmn.cpp" />
-    <ClCompile Include="src\common\filehistorycmn.cpp" />
     <ClCompile Include="src\common\filepickercmn.cpp" />
     <ClCompile Include="src\common\fldlgcmn.cpp" />
     <ClCompile Include="src\common\fontcmn.cpp" />
-    <ClCompile Include="src\common\fontdata.cpp" />
     <ClCompile Include="src\common\fontenumcmn.cpp" />
     <ClCompile Include="src\common\fontmap.cpp" />
     <ClCompile Include="src\common\fontpickercmn.cpp" />
-    <ClCompile Include="src\common\fontutilcmn.cpp" />
     <ClCompile Include="src\common\framecmn.cpp" />
     <ClCompile Include="src\common\fs_mem.cpp" />
     <ClCompile Include="src\common\gaugecmn.cpp" />
@@ -111,8 +101,6 @@
     <ClCompile Include="src\common\geometry.cpp" />
     <ClCompile Include="src\common\gifdecod.cpp" />
     <ClCompile Include="src\common\graphcmn.cpp" />
-    <ClCompile Include="src\common\headercolcmn.cpp" />
-    <ClCompile Include="src\common\headerctrlcmn.cpp" />
     <ClCompile Include="src\common\helpbase.cpp" />
     <ClCompile Include="src\common\iconbndl.cpp" />
     <ClCompile Include="src\common\imagall.cpp" />
@@ -131,63 +119,44 @@
     <ClCompile Include="src\common\layout.cpp" />
     <ClCompile Include="src\common\lboxcmn.cpp" />
     <ClCompile Include="src\common\listctrlcmn.cpp" />
-    <ClCompile Include="src\common\markupparser.cpp" />
     <ClCompile Include="src\common\matrix.cpp" />
     <ClCompile Include="src\common\menucmn.cpp" />
-    <ClCompile Include="src\common\mousemanager.cpp" />
     <ClCompile Include="src\common\msgout.cpp" />
     <ClCompile Include="src\common\nbkbase.cpp" />
     <ClCompile Include="src\common\overlaycmn.cpp" />
-    <ClCompile Include="src\common\ownerdrwcmn.cpp" />
-    <ClCompile Include="src\common\panelcmn.cpp" />
     <ClCompile Include="src\common\paper.cpp" />
-    <ClCompile Include="src\common\persist.cpp" />
     <ClCompile Include="src\common\pickerbase.cpp" />
     <ClCompile Include="src\common\popupcmn.cpp" />
     <ClCompile Include="src\common\prntbase.cpp" />
     <ClCompile Include="src\common\quantize.cpp" />
-    <ClCompile Include="src\common\radiobtncmn.cpp" />
     <ClCompile Include="src\common\radiocmn.cpp" />
-    <ClCompile Include="src\common\rearrangectrl.cpp" />
     <ClCompile Include="src\common\rendcmn.cpp" />
     <ClCompile Include="src\common\rgncmn.cpp" />
-    <ClCompile Include="src\common\scrolbarcmn.cpp" />
     <ClCompile Include="src\common\settcmn.cpp" />
     <ClCompile Include="src\common\sizer.cpp" />
-    <ClCompile Include="src\common\slidercmn.cpp" />
-    <ClCompile Include="src\common\spinbtncmn.cpp" />
-    <ClCompile Include="src\common\spinctrlcmn.cpp" />
     <ClCompile Include="src\common\srchcmn.cpp" />
     <ClCompile Include="src\common\statbar.cpp" />
-    <ClCompile Include="src\common\statbmpcmn.cpp" />
-    <ClCompile Include="src\common\statboxcmn.cpp" />
-    <ClCompile Include="src\common\statlinecmn.cpp" />
-    <ClCompile Include="src\common\stattextcmn.cpp" />
     <ClCompile Include="src\common\stockitem.cpp" />
     <ClCompile Include="src\common\tbarbase.cpp" />
     <ClCompile Include="src\common\textcmn.cpp" />
-    <ClCompile Include="src\common\textentrycmn.cpp" />
+    <ClCompile Include="src\common\timercmn.cpp" />
     <ClCompile Include="src\common\toplvcmn.cpp" />
     <ClCompile Include="src\common\treebase.cpp" />
-    <ClCompile Include="src\common\uiactioncmn.cpp" />
     <ClCompile Include="src\common\utilscmn.cpp" />
     <ClCompile Include="src\common\valgen.cpp" />
     <ClCompile Include="src\common\validate.cpp" />
-    <ClCompile Include="src\common\valnum.cpp" />
     <ClCompile Include="src\common\valtext.cpp" />
     <ClCompile Include="src\common\wincmn.cpp" />
-    <ClCompile Include="src\common\windowid.cpp" />
-    <ClCompile Include="src\common\wrapsizer.cpp" />
     <ClCompile Include="src\common\xpmdecod.cpp" />
+    <ClCompile Include="src\generic\panelg.cpp" />
     <ClCompile Include="src\msw\accel.cpp" />
+    <ClCompile Include="src\msw\gsockmsw.cpp" />
     <ClCompile Include="src\msw\ole\access.cpp" />
     <ClCompile Include="src\msw\ole\activex.cpp">
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="src\msw\anybutton.cpp" />
     <ClCompile Include="src\msw\app.cpp" />
-    <ClCompile Include="src\msw\artmsw.cpp" />
     <ClCompile Include="src\msw\ole\automtn.cpp" />
     <ClCompile Include="src\msw\bitmap.cpp" />
     <ClCompile Include="src\msw\bmpbuttn.cpp" />
@@ -234,18 +203,12 @@
     <ClCompile Include="src\msw\fontenum.cpp" />
     <ClCompile Include="src\msw\fontutil.cpp" />
     <ClCompile Include="src\msw\frame.cpp" />
-    <ClCompile Include="src\msw\gauge.cpp" />
     <ClCompile Include="src\msw\gdiimage.cpp" />
     <ClCompile Include="src\msw\gdiobj.cpp" />
-    <ClCompile Include="src\msw\gdiplus.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="src\msw\graphics.cpp">
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="src\msw\headerctrl.cpp" />
     <ClCompile Include="src\msw\helpchm.cpp" />
     <ClCompile Include="src\msw\helpwin.cpp" />
     <ClCompile Include="src\msw\icon.cpp" />
@@ -262,21 +225,13 @@
     <ClCompile Include="src\msw\msgdlg.cpp" />
     <ClCompile Include="src\msw\mslu.cpp" />
     <ClCompile Include="src\msw\nativdlg.cpp" />
-    <ClCompile Include="src\msw\nativewin.cpp" />
-    <ClCompile Include="src\msw\nonownedwnd.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="src\msw\notebook.cpp" />
     <ClCompile Include="src\msw\ole\oleutils.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="src\msw\ownerdrw.cpp" />
     <ClCompile Include="src\msw\palette.cpp" />
-    <ClCompile Include="src\msw\panel.cpp" />
     <ClCompile Include="src\msw\pen.cpp" />
     <ClCompile Include="src\msw\popupwin.cpp" />
     <ClCompile Include="src\msw\printdlg.cpp">
@@ -284,30 +239,27 @@
       </PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="src\msw\printwin.cpp" />
-    <ClCompile Include="src\msw\progdlg.cpp" />
     <ClCompile Include="src\msw\radiobox.cpp" />
     <ClCompile Include="src\msw\radiobut.cpp" />
     <ClCompile Include="src\msw\region.cpp" />
     <ClCompile Include="src\msw\renderer.cpp" />
-    <ClCompile Include="src\msw\richmsgdlg.cpp" />
     <ClCompile Include="src\msw\scrolbar.cpp" />
     <ClCompile Include="src\msw\settings.cpp" />
-    <ClCompile Include="src\msw\slider.cpp" />
+    <ClCompile Include="src\msw\slider95.cpp" />
     <ClCompile Include="src\msw\spinbutt.cpp" />
     <ClCompile Include="src\msw\spinctrl.cpp" />
     <ClCompile Include="src\msw\statbmp.cpp" />
     <ClCompile Include="src\msw\statbox.cpp" />
+    <ClCompile Include="src\msw\statbr95.cpp" />
     <ClCompile Include="src\msw\statline.cpp" />
     <ClCompile Include="src\msw\stattext.cpp" />
-    <ClCompile Include="src\msw\statusbar.cpp" />
+    <ClCompile Include="src\msw\tbar95.cpp" />
     <ClCompile Include="src\msw\textctrl.cpp" />
-    <ClCompile Include="src\msw\textentry.cpp" />
     <ClCompile Include="src\msw\tglbtn.cpp" />
-    <ClCompile Include="src\msw\toolbar.cpp" />
+    <ClCompile Include="src\msw\timer.cpp" />
     <ClCompile Include="src\msw\tooltip.cpp" />
     <ClCompile Include="src\msw\toplevel.cpp" />
     <ClCompile Include="src\msw\treectrl.cpp" />
-    <ClCompile Include="src\msw\uiaction.cpp" />
     <ClCompile Include="src\msw\utilsgui.cpp" />
     <ClCompile Include="src\msw\ole\uuid.cpp" />
     <ClCompile Include="src\msw\uxtheme.cpp" />
@@ -323,28 +275,21 @@
     <ClCompile Include="src\generic\dcpsg.cpp" />
     <ClCompile Include="src\generic\dirctrlg.cpp" />
     <ClCompile Include="src\generic\dragimgg.cpp" />
-    <ClCompile Include="src\generic\filectrlg.cpp" />
     <ClCompile Include="src\generic\filepickerg.cpp" />
     <ClCompile Include="src\generic\fontpickerg.cpp" />
     <ClCompile Include="src\generic\graphicc.cpp" />
-    <ClCompile Include="src\generic\infobar.cpp" />
     <ClCompile Include="src\generic\listbkg.cpp" />
     <ClCompile Include="src\generic\logg.cpp" />
-    <ClCompile Include="src\generic\markuptext.cpp" />
-    <ClCompile Include="src\generic\msgdlgg.cpp" />
     <ClCompile Include="src\generic\numdlgg.cpp" />
     <ClCompile Include="src\generic\printps.cpp" />
     <ClCompile Include="src\generic\prntdlgg.cpp" />
     <ClCompile Include="src\generic\progdlgg.cpp" />
     <ClCompile Include="src\generic\renderg.cpp" />
-    <ClCompile Include="src\generic\richmsgdlgg.cpp" />
     <ClCompile Include="src\generic\scrlwing.cpp" />
     <ClCompile Include="src\generic\selstore.cpp" />
     <ClCompile Include="src\generic\spinctlg.cpp" />
     <ClCompile Include="src\generic\splitter.cpp" />
     <ClCompile Include="src\generic\srchctlg.cpp" />
-    <ClCompile Include="src\generic\statbmpg.cpp" />
-    <ClCompile Include="src\generic\stattextg.cpp" />
     <ClCompile Include="src\generic\statusbr.cpp" />
     <ClCompile Include="src\generic\textdlgg.cpp" />
     <ClCompile Include="src\generic\tipwin.cpp" />
@@ -354,26 +299,17 @@
     <ClCompile Include="src\generic\vlbox.cpp" />
     <ClCompile Include="src\generic\vscroll.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="src\msw\version.rc">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-      <AdditionalIncludeDirectories>\wxWidgets-2.9.4\src\msw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="include\wx\msw\setup.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswd\wx\setup.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswd\wx\setup.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswd\wx\setup.h</Message>
+      <Command Condition="'$(Configuration)'=='Debug'">copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h</Command>
+      <Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswd\wx\setup.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\msw\wx\setup.h</Message>
+      <Command Condition="'$(Configuration)'=='Release'">copy "%(FullPath)" lib\vc_lib\msw\wx\setup.h</Command>
+      <Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\msw\wx\setup.h;%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="include\wx\msw\accel.h" />
     <ClInclude Include="include\wx\msw\ole\activex.h" />
-    <ClInclude Include="include\wx\msw\anybutton.h" />
     <ClInclude Include="include\wx\msw\app.h" />
     <ClInclude Include="include\wx\msw\ole\automtn.h" />
     <ClInclude Include="include\wx\msw\bitmap.h" />
@@ -416,14 +352,12 @@
     <ClInclude Include="include\wx\msw\gauge.h" />
     <ClInclude Include="include\wx\msw\gdiimage.h" />
     <CustomBuild Include="include\wx\msw\genrcdefs.h">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)'=='Debug'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
+      <Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)'=='Release'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
+      <Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="include\wx\msw\headerctrl.h" />
     <ClInclude Include="include\wx\msw\helpchm.h" />
@@ -455,7 +389,6 @@
     <ClInclude Include="include\wx\msw\radiobox.h" />
     <ClInclude Include="include\wx\msw\radiobut.h" />
     <ClInclude Include="include\wx\msw\region.h" />
-    <ClInclude Include="include\wx\msw\richmsgdlg.h" />
     <ClInclude Include="include\wx\msw\scrolbar.h" />
     <ClInclude Include="include\wx\msw\slider.h" />
     <ClInclude Include="include\wx\msw\spinbutt.h" />
@@ -505,11 +438,8 @@
     <ClInclude Include="include\wx\generic\textdlgg.h" />
     <ClInclude Include="include\wx\generic\treectlg.h" />
     <ClInclude Include="include\wx\accel.h" />
-    <ClInclude Include="include\wx\affinematrix2d.h" />
-    <ClInclude Include="include\wx\affinematrix2dbase.h" />
     <ClInclude Include="include\wx\anidecod.h" />
     <ClInclude Include="include\wx\animdecod.h" />
-    <ClInclude Include="include\wx\anybutton.h" />
     <ClInclude Include="include\wx\artprov.h" />
     <ClInclude Include="include\wx\bitmap.h" />
     <ClInclude Include="include\wx\bmpbuttn.h" />
@@ -517,7 +447,6 @@
     <ClInclude Include="include\wx\brush.h" />
     <ClInclude Include="include\wx\busyinfo.h" />
     <ClInclude Include="include\wx\button.h" />
-    <ClInclude Include="include\wx\cairo.h" />
     <ClInclude Include="include\wx\caret.h" />
     <ClInclude Include="include\wx\checkbox.h" />
     <ClInclude Include="include\wx\checklst.h" />
@@ -531,10 +460,8 @@
     <ClInclude Include="include\wx\collpane.h" />
     <ClInclude Include="include\wx\colordlg.h" />
     <ClInclude Include="include\wx\colour.h" />
-    <ClInclude Include="include\wx\colourdata.h" />
     <ClInclude Include="include\wx\combo.h" />
     <ClInclude Include="include\wx\combobox.h" />
-    <ClInclude Include="include\wx\compositewin.h" />
     <ClInclude Include="include\wx\control.h" />
     <ClInclude Include="include\wx\cshelp.h" />
     <ClInclude Include="include\wx\ctrlsub.h" />
@@ -548,7 +475,6 @@
     <ClInclude Include="include\wx\dcmirror.h" />
     <ClInclude Include="include\wx\dcprint.h" />
     <ClInclude Include="include\wx\dcscreen.h" />
-    <ClInclude Include="include\wx\dcsvg.h" />
     <ClInclude Include="include\wx\dialog.h" />
     <ClInclude Include="include\wx\dialup.h" />
     <ClInclude Include="include\wx\dirdlg.h" />
@@ -560,13 +486,10 @@
     <ClInclude Include="include\wx\effects.h" />
     <ClInclude Include="include\wx\encinfo.h" />
     <ClInclude Include="include\wx\fdrepdlg.h" />
-    <ClInclude Include="include\wx\filectrl.h" />
     <ClInclude Include="include\wx\filedlg.h" />
-    <ClInclude Include="include\wx\filehistory.h" />
     <ClInclude Include="include\wx\filepicker.h" />
     <ClInclude Include="include\wx\fmappriv.h" />
     <ClInclude Include="include\wx\font.h" />
-    <ClInclude Include="include\wx\fontdata.h" />
     <ClInclude Include="include\wx\fontdlg.h" />
     <ClInclude Include="include\wx\fontenum.h" />
     <ClInclude Include="include\wx\fontpicker.h" />
@@ -579,7 +502,6 @@
     <ClInclude Include="include\wx\geometry.h" />
     <ClInclude Include="include\wx\gifdecod.h" />
     <ClInclude Include="include\wx\graphics.h" />
-    <ClInclude Include="include\wx\headercol.h" />
     <ClInclude Include="include\wx\headerctrl.h" />
     <ClInclude Include="include\wx\help.h" />
     <ClInclude Include="include\wx\helpbase.h" />
@@ -593,7 +515,4 @@
     <ClInclude Include="include\wx\imaglist.h" />
     <ClInclude Include="include\wx\imagpcx.h" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_core.vcxproj.filters b/Source/3rd Party/wx/wx_core.vcxproj.filters
index 9b0034a55..475735b49 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_core.vcxproj.filters	
@@ -24,15 +24,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\common\accelcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\accesscmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\affinematrix2d.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\anidecod.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -45,30 +39,12 @@
     <ClCompile Include="src\common\artstd.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\arttango.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\bmpbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\bmpbtncmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\bookctrl.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\btncmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\cairo.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\checkboxcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\checklstcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\choiccmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -87,9 +63,6 @@
     <ClCompile Include="src\common\colourcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\colourdata.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\combocmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -114,12 +87,6 @@
     <ClCompile Include="src\common\dcgraph.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\dcsvg.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\dirctrlcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\dlgcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -153,12 +120,6 @@
     <ClCompile Include="src\common\fddlgcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\filectrlcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\filehistorycmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\filepickercmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -168,9 +129,6 @@
     <ClCompile Include="src\common\fontcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\fontdata.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\fontenumcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -180,9 +138,6 @@
     <ClCompile Include="src\common\fontpickercmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\fontutilcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\framecmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -207,12 +162,6 @@
     <ClCompile Include="src\common\graphcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\headercolcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\headerctrlcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\helpbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -267,18 +216,12 @@
     <ClCompile Include="src\common\listctrlcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\markupparser.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\matrix.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\menucmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\mousemanager.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\msgout.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -288,18 +231,9 @@
     <ClCompile Include="src\common\overlaycmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\ownerdrwcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\panelcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\paper.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\persist.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\pickerbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -312,57 +246,27 @@
     <ClCompile Include="src\common\quantize.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\radiobtncmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\radiocmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\rearrangectrl.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\rendcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\rgncmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\scrolbarcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\settcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\sizer.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\slidercmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\spinbtncmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\spinctrlcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\srchcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\statbar.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\statbmpcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\statboxcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\statlinecmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\stattextcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\stockitem.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -372,18 +276,12 @@
     <ClCompile Include="src\common\textcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\textentrycmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\toplvcmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\treebase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\uiactioncmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\utilscmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -393,21 +291,12 @@
     <ClCompile Include="src\common\validate.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\valnum.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\valtext.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\wincmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\windowid.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\wrapsizer.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\xpmdecod.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -420,15 +309,9 @@
     <ClCompile Include="src\msw\ole\activex.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\anybutton.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\app.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\artmsw.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\ole\automtn.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -549,24 +432,15 @@
     <ClCompile Include="src\msw\frame.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\gauge.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\gdiimage.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\gdiobj.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\gdiplus.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\graphics.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\headerctrl.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\helpchm.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -615,12 +489,6 @@
     <ClCompile Include="src\msw\nativdlg.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\nativewin.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\nonownedwnd.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\notebook.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -633,9 +501,6 @@
     <ClCompile Include="src\msw\palette.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\panel.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\pen.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -648,9 +513,6 @@
     <ClCompile Include="src\msw\printwin.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\progdlg.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\radiobox.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -663,18 +525,12 @@
     <ClCompile Include="src\msw\renderer.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\richmsgdlg.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\scrolbar.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\settings.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\slider.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\spinbutt.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -693,21 +549,12 @@
     <ClCompile Include="src\msw\stattext.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\statusbar.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\textctrl.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\textentry.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\tglbtn.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\toolbar.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\tooltip.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -717,9 +564,6 @@
     <ClCompile Include="src\msw\treectrl.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\uiaction.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\utilsgui.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -765,9 +609,6 @@
     <ClCompile Include="src\generic\dragimgg.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\generic\filectrlg.cpp">
-      <Filter>Generic Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\generic\filepickerg.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
@@ -777,21 +618,12 @@
     <ClCompile Include="src\generic\graphicc.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\generic\infobar.cpp">
-      <Filter>Generic Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\generic\listbkg.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\logg.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\generic\markuptext.cpp">
-      <Filter>Generic Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generic\msgdlgg.cpp">
-      <Filter>Generic Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\generic\numdlgg.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
@@ -807,9 +639,6 @@
     <ClCompile Include="src\generic\renderg.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\generic\richmsgdlgg.cpp">
-      <Filter>Generic Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\generic\scrlwing.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
@@ -825,12 +654,6 @@
     <ClCompile Include="src\generic\srchctlg.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\generic\statbmpg.cpp">
-      <Filter>Generic Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generic\stattextg.cpp">
-      <Filter>Generic Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\generic\statusbr.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
@@ -855,11 +678,30 @@
     <ClCompile Include="src\generic\vscroll.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="src\msw\version.rc">
+    <ClCompile Include="src\generic\panelg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\statbr95.cpp">
       <Filter>MSW Sources</Filter>
-    </ResourceCompile>
+    </ClCompile>
+    <ClCompile Include="src\msw\slider95.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\tbar95.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\gsockmsw.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\evtloopcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\timercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\timer.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\wx\msw\accel.h">
@@ -868,9 +710,6 @@
     <ClInclude Include="include\wx\msw\ole\activex.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\msw\anybutton.h">
-      <Filter>MSW Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\msw\app.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1084,9 +923,6 @@
     <ClInclude Include="include\wx\msw\region.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\msw\richmsgdlg.h">
-      <Filter>MSW Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\msw\scrolbar.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1234,21 +1070,12 @@
     <ClInclude Include="include\wx\accel.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\affinematrix2d.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="include\wx\affinematrix2dbase.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\anidecod.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\animdecod.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\anybutton.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\artprov.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1270,9 +1097,6 @@
     <ClInclude Include="include\wx\button.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\cairo.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\caret.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1312,18 +1136,12 @@
     <ClInclude Include="include\wx\colour.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\colourdata.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\combo.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\combobox.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\compositewin.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\control.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1363,9 +1181,6 @@
     <ClInclude Include="include\wx\dcscreen.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\dcsvg.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\dialog.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1399,15 +1214,9 @@
     <ClInclude Include="include\wx\fdrepdlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\filectrl.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\filedlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\filehistory.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\filepicker.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1417,9 +1226,6 @@
     <ClInclude Include="include\wx\font.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\fontdata.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\fontdlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1456,9 +1262,6 @@
     <ClInclude Include="include\wx\graphics.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
-    <ClInclude Include="include\wx\headercol.h">
-      <Filter>Common Headers</Filter>
-    </ClInclude>
     <ClInclude Include="include\wx\headerctrl.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcxproj b/Source/3rd Party/wx/wx_wxjpeg.vcxproj
index 554f3ab8d..998623bc3 100644
--- a/Source/3rd Party/wx/wx_wxjpeg.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxjpeg.vcxproj	
@@ -5,35 +5,36 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxjpeg</ProjectName>
     <ProjectGuid>{93CFEDF3-9A75-4484-B169-D9D8074F5AC2}</ProjectGuid>
     <RootNamespace>wxjpeg</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>wxjpeg</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxjpegd</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxjpegd</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -42,10 +43,6 @@
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)wxjpeg.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxjpegd.lib</OutputFile>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\jpeg\jcapimin.c" />
@@ -95,7 +92,4 @@
     <ClCompile Include="src\jpeg\jquant2.c" />
     <ClCompile Include="src\jpeg\jutils.c" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_wxpng.vcproj b/Source/3rd Party/wx/wx_wxpng.vcproj
index 16cb96828..6aa7482f4 100644
--- a/Source/3rd Party/wx/wx_wxpng.vcproj	
+++ b/Source/3rd Party/wx/wx_wxpng.vcproj	
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="src\zlib"
+				AdditionalIncludeDirectories="$(Root)Source\3rd Party\wx\src\zlib"
 				PreprocessorDefinitions="_LIB"
 				SmallerTypeCheck="false"
 				UsePrecompiledHeader="0"
diff --git a/Source/3rd Party/wx/wx_wxpng.vcxproj b/Source/3rd Party/wx/wx_wxpng.vcxproj
index 568a9aaeb..dd9f2f4f6 100644
--- a/Source/3rd Party/wx/wx_wxpng.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxpng.vcxproj	
@@ -5,47 +5,44 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxpng</ProjectName>
     <ProjectGuid>{05B9CB11-12D1-47CD-8E4A-88E12162119B}</ProjectGuid>
     <RootNamespace>wxpng</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>wxpng</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxpngd</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxpngd</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(Root)Source\3rd Party\wx\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)wxpng.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxpngd.lib</OutputFile>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\png\png.c" />
@@ -64,7 +61,4 @@
     <ClCompile Include="src\png\pngwtran.c" />
     <ClCompile Include="src\png\pngwutil.c" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj b/Source/3rd Party/wx/wx_wxzlib.vcxproj
index d3d2534aa..f1b7b72e8 100644
--- a/Source/3rd Party/wx/wx_wxzlib.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj	
@@ -5,35 +5,36 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxzlib</ProjectName>
     <ProjectGuid>{25A25249-C284-4C5A-8DC2-26FC3EB13703}</ProjectGuid>
     <RootNamespace>wxzlib</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>wxzlib</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxzlibd</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxzlibd</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -41,17 +42,16 @@
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)wxzlib.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxzlibd.lib</OutputFile>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\zlib\adler32.c" />
     <ClCompile Include="src\zlib\compress.c" />
     <ClCompile Include="src\zlib\crc32.c" />
     <ClCompile Include="src\zlib\deflate.c" />
-    <ClCompile Include="src\zlib\gzio.c" />
+    <ClCompile Include="src\zlib\gzclose.c" />
+    <ClCompile Include="src\zlib\gzlib.c" />
+    <ClCompile Include="src\zlib\gzread.c" />
+    <ClCompile Include="src\zlib\gzwrite.c" />
     <ClCompile Include="src\zlib\infback.c" />
     <ClCompile Include="src\zlib\inffast.c" />
     <ClCompile Include="src\zlib\inflate.c" />
@@ -60,7 +60,17 @@
     <ClCompile Include="src\zlib\uncompr.c" />
     <ClCompile Include="src\zlib\zutil.c" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+  <ItemGroup>
+    <ClInclude Include="src\zlib\crc32.h" />
+    <ClInclude Include="src\zlib\deflate.h" />
+    <ClInclude Include="src\zlib\gzguts.h" />
+    <ClInclude Include="src\zlib\inffast.h" />
+    <ClInclude Include="src\zlib\inffixed.h" />
+    <ClInclude Include="src\zlib\inflate.h" />
+    <ClInclude Include="src\zlib\inftrees.h" />
+    <ClInclude Include="src\zlib\trees.h" />
+    <ClInclude Include="src\zlib\zconf.h" />
+    <ClInclude Include="src\zlib\zlib.h" />
+    <ClInclude Include="src\zlib\zutil.h" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters b/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters
index 3734eb6dd..7118f108b 100644
--- a/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj.filters	
@@ -18,7 +18,16 @@
     <ClCompile Include="src\zlib\deflate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\zlib\gzio.c">
+    <ClCompile Include="src\zlib\gzclose.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\gzlib.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\gzread.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\zlib\gzwrite.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\zlib\infback.c">
@@ -43,4 +52,39 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\zlib\crc32.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\deflate.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\gzguts.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\inffast.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\inffixed.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\inflate.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\inftrees.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\trees.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\zconf.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\zlib.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\zlib\zutil.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/zlib/ChangeLog b/Source/3rd Party/zlib/ChangeLog
index f310bb0fc..f22aabaef 100644
--- a/Source/3rd Party/zlib/ChangeLog	
+++ b/Source/3rd Party/zlib/ChangeLog	
@@ -1,12 +1,276 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.8 (28 Apr 2013)
+- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
+- Do not force Z_CONST for C++
+- Clean up contrib/vstudio [Ro�]
+- Correct spelling error in zlib.h
+- Fix mixed line endings in contrib/vstudio
+
+Changes in 1.2.7.3 (13 Apr 2013)
+- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
+
+Changes in 1.2.7.2 (13 Apr 2013)
+- Change check for a four-byte type back to hexadecimal
+- Fix typo in win32/Makefile.msc
+- Add casts in gzwrite.c for pointer differences
+
+Changes in 1.2.7.1 (24 Mar 2013)
+- Replace use of unsafe string functions with snprintf if available
+- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
+- Fix gzgetc undefine when Z_PREFIX set [Turk]
+- Eliminate use of mktemp in Makefile (not always available)
+- Fix bug in 'F' mode for gzopen()
+- Add inflateGetDictionary() function
+- Correct comment in deflate.h
+- Use _snprintf for snprintf in Microsoft C
+- On Darwin, only use /usr/bin/libtool if libtool is not Apple
+- Delete "--version" file if created by "ar --version" [Richard G.]
+- Fix configure check for veracity of compiler error return codes
+- Fix CMake compilation of static lib for MSVC2010 x64
+- Remove unused variable in infback9.c
+- Fix argument checks in gzlog_compress() and gzlog_write()
+- Clean up the usage of z_const and respect const usage within zlib
+- Clean up examples/gzlog.[ch] comparisons of different types
+- Avoid shift equal to bits in type (caused endless loop)
+- Fix unintialized value bug in gzputc() introduced by const patches
+- Fix memory allocation error in examples/zran.c [Nor]
+- Fix bug where gzopen(), gzclose() would write an empty file
+- Fix bug in gzclose() when gzwrite() runs out of memory
+- Check for input buffer malloc failure in examples/gzappend.c
+- Add note to contrib/blast to use binary mode in stdio
+- Fix comparisons of differently signed integers in contrib/blast
+- Check for invalid code length codes in contrib/puff
+- Fix serious but very rare decompression bug in inftrees.c
+- Update inflateBack() comments, since inflate() can be faster
+- Use underscored I/O function names for WINAPI_FAMILY
+- Add _tr_flush_bits to the external symbols prefixed by --zprefix
+- Add contrib/vstudio/vc10 pre-build step for static only
+- Quote --version-script argument in CMakeLists.txt
+- Don't specify --version-script on Apple platforms in CMakeLists.txt
+- Fix casting error in contrib/testzlib/testzlib.c
+- Fix types in contrib/minizip to match result of get_crc_table()
+- Simplify contrib/vstudio/vc10 with 'd' suffix
+- Add TOP support to win32/Makefile.msc
+- Suport i686 and amd64 assembler builds in CMakeLists.txt
+- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
+- Add vc11 and vc12 build files to contrib/vstudio
+- Add gzvprintf() as an undocumented function in zlib
+- Fix configure for Sun shell
+- Remove runtime check in configure for four-byte integer type
+- Add casts and consts to ease user conversion to C++
+- Add man pages for minizip and miniunzip
+- In Makefile uninstall, don't rm if preceding cd fails
+- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
+
+Changes in 1.2.7 (2 May 2012)
+- Replace use of memmove() with a simple copy for portability
+- Test for existence of strerror
+- Restore gzgetc_ for backward compatibility with 1.2.6
+- Fix build with non-GNU make on Solaris
+- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
+- Include unistd.h for Watcom C
+- Use __WATCOMC__ instead of __WATCOM__
+- Do not use the visibility attribute if NO_VIZ defined
+- Improve the detection of no hidden visibility attribute
+- Avoid using __int64 for gcc or solo compilation
+- Cast to char * in gzprintf to avoid warnings [Zinser]
+- Fix make_vms.com for VAX [Zinser]
+- Don't use library or built-in byte swaps
+- Simplify test and use of gcc hidden attribute
+- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
+- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
+- Fix bug in test/minigzip.c for configure --solo
+- Fix contrib/vstudio project link errors [Mohanathas]
+- Add ability to choose the builder in make_vms.com [Schweda]
+- Add DESTDIR support to mingw32 win32/Makefile.gcc
+- Fix comments in win32/Makefile.gcc for proper usage
+- Allow overriding the default install locations for cmake
+- Generate and install the pkg-config file with cmake
+- Build both a static and a shared version of zlib with cmake
+- Include version symbols for cmake builds
+- If using cmake with MSVC, add the source directory to the includes
+- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
+- Move obsolete emx makefile to old [Truta]
+- Allow the use of -Wundef when compiling or using zlib
+- Avoid the use of the -u option with mktemp
+- Improve inflate() documentation on the use of Z_FINISH
+- Recognize clang as gcc
+- Add gzopen_w() in Windows for wide character path names
+- Rename zconf.h in CMakeLists.txt to move it out of the way
+- Add source directory in CMakeLists.txt for building examples
+- Look in build directory for zlib.pc in CMakeLists.txt
+- Remove gzflags from zlibvc.def in vc9 and vc10
+- Fix contrib/minizip compilation in the MinGW environment
+- Update ./configure for Solaris, support --64 [Mooney]
+- Remove -R. from Solaris shared build (possible security issue)
+- Avoid race condition for parallel make (-j) running example
+- Fix type mismatch between get_crc_table() and crc_table
+- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
+- Fix the path to zlib.map in CMakeLists.txt
+- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
+- Add instructions to win32/Makefile.gcc for shared install [Torri]
+
+Changes in 1.2.6.1 (12 Feb 2012)
+- Avoid the use of the Objective-C reserved name "id"
+- Include io.h in gzguts.h for Microsoft compilers
+- Fix problem with ./configure --prefix and gzgetc macro
+- Include gz_header definition when compiling zlib solo
+- Put gzflags() functionality back in zutil.c
+- Avoid library header include in crc32.c for Z_SOLO
+- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
+- Minor cleanup in contrib/minizip/zip.c [Vollant]
+- Update make_vms.com [Zinser]
+- Remove unnecessary gzgetc_ function
+- Use optimized byte swap operations for Microsoft and GNU [Snyder]
+- Fix minor typo in zlib.h comments [Rzesniowiecki]
+
+Changes in 1.2.6 (29 Jan 2012)
+- Update the Pascal interface in contrib/pascal
+- Fix function numbers for gzgetc_ in zlibvc.def files
+- Fix configure.ac for contrib/minizip [Schiffer]
+- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
+- Have ./configure use the compiler return code for error indication
+- Fix CMakeLists.txt for cross compilation [McClure]
+- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
+- Fix compilation of contrib/minizip on FreeBSD [Marquez]
+- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
+- Include io.h for Turbo C / Borland C on all platforms [Truta]
+- Make version explicit in contrib/minizip/configure.ac [Bosmans]
+- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
+- Minor cleanup up contrib/minizip/unzip.c [Vollant]
+- Fix bug when compiling minizip with C++ [Vollant]
+- Protect for long name and extra fields in contrib/minizip [Vollant]
+- Avoid some warnings in contrib/minizip [Vollant]
+- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
+- Add missing libs to minizip linker command
+- Add support for VPATH builds in contrib/minizip
+- Add an --enable-demos option to contrib/minizip/configure
+- Add the generation of configure.log by ./configure
+- Exit when required parameters not provided to win32/Makefile.gcc
+- Have gzputc return the character written instead of the argument
+- Use the -m option on ldconfig for BSD systems [Tobias]
+- Correct in zlib.map when deflateResetKeep was added
+
+Changes in 1.2.5.3 (15 Jan 2012)
+- Restore gzgetc function for binary compatibility
+- Do not use _lseeki64 under Borland C++ [Truta]
+- Update win32/Makefile.msc to build test/*.c [Truta]
+- Remove old/visualc6 given CMakefile and other alternatives
+- Update AS400 build files and documentation [Monnerat]
+- Update win32/Makefile.gcc to build test/*.c [Truta]
+- Permit stronger flushes after Z_BLOCK flushes
+- Avoid extraneous empty blocks when doing empty flushes
+- Permit Z_NULL arguments to deflatePending
+- Allow deflatePrime() to insert bits in the middle of a stream
+- Remove second empty static block for Z_PARTIAL_FLUSH
+- Write out all of the available bits when using Z_BLOCK
+- Insert the first two strings in the hash table after a flush
+
+Changes in 1.2.5.2 (17 Dec 2011)
+- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
+- use relative symlinks for shared libs
+- Avoid searching past window for Z_RLE strategy
+- Assure that high-water mark initialization is always applied in deflate
+- Add assertions to fill_window() in deflate.c to match comments
+- Update python link in README
+- Correct spelling error in gzread.c
+- Fix bug in gzgets() for a concatenated empty gzip stream
+- Correct error in comment for gz_make()
+- Change gzread() and related to ignore junk after gzip streams
+- Allow gzread() and related to continue after gzclearerr()
+- Allow gzrewind() and gzseek() after a premature end-of-file
+- Simplify gzseek() now that raw after gzip is ignored
+- Change gzgetc() to a macro for speed (~40% speedup in testing)
+- Fix gzclose() to return the actual error last encountered
+- Always add large file support for windows
+- Include zconf.h for windows large file support
+- Include zconf.h.cmakein for windows large file support
+- Update zconf.h.cmakein on make distclean
+- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
+- Clarify how gzopen() appends in zlib.h comments
+- Correct documentation of gzdirect() since junk at end now ignored
+- Add a transparent write mode to gzopen() when 'T' is in the mode
+- Update python link in zlib man page
+- Get inffixed.h and MAKEFIXED result to match
+- Add a ./config --solo option to make zlib subset with no libary use
+- Add undocumented inflateResetKeep() function for CAB file decoding
+- Add --cover option to ./configure for gcc coverage testing
+- Add #define ZLIB_CONST option to use const in the z_stream interface
+- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
+- Note behavior of uncompress() to provide as much data as it can
+- Add files in contrib/minizip to aid in building libminizip
+- Split off AR options in Makefile.in and configure
+- Change ON macro to Z_ARG to avoid application conflicts
+- Facilitate compilation with Borland C++ for pragmas and vsnprintf
+- Include io.h for Turbo C / Borland C++
+- Move example.c and minigzip.c to test/
+- Simplify incomplete code table filling in inflate_table()
+- Remove code from inflate.c and infback.c that is impossible to execute
+- Test the inflate code with full coverage
+- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
+- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
+- Fix gzwrite.c to accommodate reduced memory zlib compilation
+- Have inflate() with Z_FINISH avoid the allocation of a window
+- Do not set strm->adler when doing raw inflate
+- Fix gzeof() to behave just like feof() when read is not past end of file
+- Fix bug in gzread.c when end-of-file is reached
+- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
+- Document gzread() capability to read concurrently written files
+- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]
+
+Changes in 1.2.5.1 (10 Sep 2011)
+- Update FAQ entry on shared builds (#13)
+- Avoid symbolic argument to chmod in Makefile.in
+- Fix bug and add consts in contrib/puff [Oberhumer]
+- Update contrib/puff/zeros.raw test file to have all block types
+- Add full coverage test for puff in contrib/puff/Makefile
+- Fix static-only-build install in Makefile.in
+- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]
+- Add libz.a dependency to shared in Makefile.in for parallel builds
+- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
+- Replace $(...) with `...` in configure for non-bash sh [Bowler]
+- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]
+- Add solaris* to Linux* in configure to allow gcc use [Groffen]
+- Add *bsd* to Linux* case in configure [Bar-Lev]
+- Add inffast.obj to dependencies in win32/Makefile.msc
+- Correct spelling error in deflate.h [Kohler]
+- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
+- Add test to configure for GNU C looking for gcc in output of $cc -v
+- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]
+- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
+- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
+- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
+- Make stronger test in zconf.h to include unistd.h for LFS
+- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]
+- Fix zlib.h LFS support when Z_PREFIX used
+- Add updated as400 support (removed from old) [Monnerat]
+- Avoid deflate sensitivity to volatile input data
+- Avoid division in adler32_combine for NO_DIVIDE
+- Clarify the use of Z_FINISH with deflateBound() amount of space
+- Set binary for output file in puff.c
+- Use u4 type for crc_table to avoid conversion warnings
+- Apply casts in zlib.h to avoid conversion warnings
+- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
+- Improve inflateSync() documentation to note indeterminancy
+- Add deflatePending() function to return the amount of pending output
+- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
+- Add a check in configure for stdarg.h, use for gzprintf()
+- Check that pointers fit in ints when gzprint() compiled old style
+- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
+- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
+- Add debug records in assmebler code [Londer]
+- Update RFC references to use http://tools.ietf.org/html/... [Li]
+- Add --archs option, use of libtool to configure for Mac OS X [Borstel]
+
 Changes in 1.2.5 (19 Apr 2010)
 - Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
 - Default to libdir as sharedlibdir in configure [Nieder]
 - Update copyright dates on modified source files
 - Update trees.c to be able to generate modified trees.h
 - Exit configure for MinGW, suggesting win32/Makefile.gcc
+- Check for NULL path in gz_open [Homurlu]
 
 Changes in 1.2.4.5 (18 Apr 2010)
 - Set sharedlibdir in configure [Torok]
@@ -261,7 +525,7 @@ Changes in 1.2.3.4 (21 Dec 2009)
 - Clear bytes after deflate lookahead to avoid use of uninitialized data
 - Change a limit in inftrees.c to be more transparent to Coverity Prevent
 - Update win32/zlib.def with exported symbols from zlib.h
-- Correct spelling error in zlib.h [Willem]
+- Correct spelling errors in zlib.h [Willem, Sobrado]
 - Allow Z_BLOCK for deflate() to force a new block
 - Allow negative bits in inflatePrime() to delete existing bit buffer
 - Add Z_TREES flush option to inflate() to return at end of trees
diff --git a/Source/3rd Party/zlib/INDEX b/Source/3rd Party/zlib/INDEX
index f6c51ca17..2ba064120 100644
--- a/Source/3rd Party/zlib/INDEX	
+++ b/Source/3rd Party/zlib/INDEX	
@@ -7,6 +7,9 @@ Makefile.in     template for Unix Makefile
 README          guess what
 configure       configure script for Unix
 make_vms.com    makefile for VMS
+test/example.c  zlib usages examples for build testing
+test/minigzip.c minimal gzip-like functionality for build testing
+test/infcover.c inf*.c code coverage for build coverage testing
 treebuild.xml   XML description of source file dependencies
 zconf.h.cmakein zconf.h template for cmake
 zconf.h.in      zconf.h template for configure
@@ -14,9 +17,11 @@ zlib.3          Man page for zlib
 zlib.3.pdf      Man page in PDF format
 zlib.map        Linux symbol information
 zlib.pc.in      Template for pkg-config descriptor
+zlib.pc.cmakein zlib.pc template for cmake
 zlib2ansi       perl script to convert source files for C++ compilation
 
 amiga/          makefiles for Amiga SAS C
+as400/          makefiles for AS/400
 doc/            documentation for formats and algorithms
 msdos/          makefiles for MSDOS
 nintendods/     makefile for Nintendo DS
@@ -56,10 +61,8 @@ uncompr.c
 zutil.c
 zutil.h
 
-                source files for sample programs:
-example.c
-minigzip.c
-See examples/README.examples for more
+                source files for sample programs
+See examples/README.examples
 
-                unsupported contribution by third parties
+                unsupported contributions by third parties
 See contrib/README.contrib
diff --git a/Source/3rd Party/zlib/README b/Source/3rd Party/zlib/README
index d4219bf88..5ca9d127e 100644
--- a/Source/3rd Party/zlib/README	
+++ b/Source/3rd Party/zlib/README	
@@ -1,22 +1,22 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.5 is a general purpose data compression library.  All the code is
+zlib 1.2.8 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
-and rfc1952.txt (gzip format).
+http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
+rfc1952 (gzip format).
 
 All functions of the compression library are documented in the file zlib.h
 (volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
-of the library is given in the file example.c which also tests that the library
-is working correctly.  Another example is given in the file minigzip.c.  The
-compression library itself is composed of all source files except example.c and
-minigzip.c.
+of the library is given in the file test/example.c which also tests that
+the library is working correctly.  Another example is given in the file
+test/minigzip.c.  The compression library itself is composed of all source
+files in the root directory.
 
 To compile all files and run the test program, follow the instructions given at
 the top of Makefile.in.  In short "./configure; make test", and if that goes
-well, "make install" should work for most flavors of Unix.  For Windows, use one
-of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
+well, "make install" should work for most flavors of Unix.  For Windows, use
+one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use
 make_vms.com.
 
 Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
 
-The changes made in version 1.2.5 are documented in the file ChangeLog.
+The changes made in version 1.2.8 are documented in the file ChangeLog.
 
 Unsupported third party contributions are provided in directory contrib/ .
 
@@ -44,7 +44,7 @@ http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
 
 A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
 available in Python 1.5 and later versions, see
-http://www.python.org/doc/lib/module-zlib.html .
+http://docs.python.org/library/zlib.html .
 
 zlib is built into tcl: http://wiki.tcl.tk/4610 .
 
@@ -84,7 +84,7 @@ Acknowledgments:
 
 Copyright notice:
 
- (C) 1995-2010 Jean-loup Gailly and Mark Adler
+ (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
diff --git a/Source/3rd Party/zlib/adler32.c b/Source/3rd Party/zlib/adler32.c
index 65ad6a5ad..a868f073d 100644
--- a/Source/3rd Party/zlib/adler32.c	
+++ b/Source/3rd Party/zlib/adler32.c	
@@ -1,5 +1,5 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2007 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,9 +9,9 @@
 
 #define local static
 
-local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 
-#define BASE 65521UL    /* largest prime smaller than 65536 */
+#define BASE 65521      /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
@@ -21,39 +21,44 @@ local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
 #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
-/* use NO_DIVIDE if your processor does not do division in hardware */
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
 #ifdef NO_DIVIDE
-#  define MOD(a) \
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
     do { \
-        if (a >= (BASE << 16)) a -= (BASE << 16); \
-        if (a >= (BASE << 15)) a -= (BASE << 15); \
-        if (a >= (BASE << 14)) a -= (BASE << 14); \
-        if (a >= (BASE << 13)) a -= (BASE << 13); \
-        if (a >= (BASE << 12)) a -= (BASE << 12); \
-        if (a >= (BASE << 11)) a -= (BASE << 11); \
-        if (a >= (BASE << 10)) a -= (BASE << 10); \
-        if (a >= (BASE << 9)) a -= (BASE << 9); \
-        if (a >= (BASE << 8)) a -= (BASE << 8); \
-        if (a >= (BASE << 7)) a -= (BASE << 7); \
-        if (a >= (BASE << 6)) a -= (BASE << 6); \
-        if (a >= (BASE << 5)) a -= (BASE << 5); \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
         if (a >= BASE) a -= BASE; \
     } while (0)
-#  define MOD4(a) \
+#  define MOD(a) \
     do { \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
         if (a >= BASE) a -= BASE; \
     } while (0)
 #else
 #  define MOD(a) a %= BASE
-#  define MOD4(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
 #endif
 
 /* ========================================================================= */
@@ -92,7 +97,7 @@ uLong ZEXPORT adler32(adler, buf, len)
         }
         if (adler >= BASE)
             adler -= BASE;
-        MOD4(sum2);             /* only added so many BASE's */
+        MOD28(sum2);            /* only added so many BASE's */
         return adler | (sum2 << 16);
     }
 
@@ -137,8 +142,13 @@ local uLong adler32_combine_(adler1, adler2, len2)
     unsigned long sum2;
     unsigned rem;
 
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
     /* the derivation of this formula is left as an exercise for the reader */
-    rem = (unsigned)(len2 % BASE);
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
     sum1 = adler1 & 0xffff;
     sum2 = rem * sum1;
     MOD(sum2);
diff --git a/Source/3rd Party/zlib/compress.c b/Source/3rd Party/zlib/compress.c
index ea4dfbe9d..6e9762676 100644
--- a/Source/3rd Party/zlib/compress.c	
+++ b/Source/3rd Party/zlib/compress.c	
@@ -29,7 +29,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
     z_stream stream;
     int err;
 
-    stream.next_in = (Bytef*)source;
+    stream.next_in = (z_const Bytef *)source;
     stream.avail_in = (uInt)sourceLen;
 #ifdef MAXSEG_64K
     /* Check for source > 64K on 16-bit machine: */
diff --git a/Source/3rd Party/zlib/contrib/minizip/crypt.h b/Source/3rd Party/zlib/contrib/minizip/crypt.h
index 622f4bc2e..02db6531a 100644
--- a/Source/3rd Party/zlib/contrib/minizip/crypt.h	
+++ b/Source/3rd Party/zlib/contrib/minizip/crypt.h	
@@ -32,20 +32,20 @@
 /***********************************************************************
  * Return the next byte in the pseudo-random sequence
  */
-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
+static Byte decrypt_byte(unsigned long* pkeys)
 {
     unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
                      * unpredictable manner on 16-bit systems; not a problem
                      * with any known compiler so far, though */
 
     temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+    return (Byte)(((temp * (temp ^ 1)) >> 8) & 0xFF);
 }
 
 /***********************************************************************
  * Update the encryption keys with the next byte of plain text
  */
-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
+static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
 {
     (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
     (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
@@ -62,7 +62,7 @@ static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int
  * Initialize the encryption keys and the random header according to
  * the given password.
  */
-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
+static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
 {
     *(pkeys+0) = 305419896L;
     *(pkeys+1) = 591751049L;
@@ -77,7 +77,7 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned lon
     (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
 
 #define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+    (t=decrypt_byte(pkeys), update_keys(pkeys,pcrc_32_tab,c), t^(c))
 
 #ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
 
@@ -87,17 +87,16 @@ static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned lon
 #    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
 #  endif
 
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
-    const char *passwd;         /* password string */
-    unsigned char *buf;         /* where to write header */
-    int bufSize;
-    unsigned long* pkeys;
-    const unsigned long* pcrc_32_tab;
-    unsigned long crcForCrypting;
+static int crypthead(const char* passwd,      /* password string */
+                     unsigned char* buf,      /* where to write header */
+                     int bufSize,
+                     unsigned long* pkeys,
+                     const z_crc_t* pcrc_32_tab,
+                     unsigned long crcForCrypting)
 {
     int n;                       /* index in random header */
-    int t;                       /* temporary */
-    int c;                       /* random byte */
+    Byte t;                      /* temporary */
+    Byte c;                      /* random byte */
     unsigned char header[RAND_HEAD_LEN-2]; /* random header */
     static unsigned calls = 0;   /* ensure different random header each time */
 
@@ -115,17 +114,17 @@ static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
     init_keys(passwd, pkeys, pcrc_32_tab);
     for (n = 0; n < RAND_HEAD_LEN-2; n++)
     {
-        c = (rand() >> 7) & 0xff;
-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
+        c = (Byte)((rand() >> 7) & 0xFF);
+        header[n] = zencode(pkeys, pcrc_32_tab, c, t);
     }
     /* Encrypt random header (last two bytes is high word of crc) */
     init_keys(passwd, pkeys, pcrc_32_tab);
     for (n = 0; n < RAND_HEAD_LEN-2; n++)
     {
-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
+        buf[n] = zencode(pkeys, pcrc_32_tab, header[n], t);
     }
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
+    buf[n++] = zencode(pkeys, pcrc_32_tab, (crcForCrypting >> 16) & 0xFF, t);
+    buf[n++] = zencode(pkeys, pcrc_32_tab, (crcForCrypting >> 24) & 0xFF, t);
     return n;
 }
 
diff --git a/Source/3rd Party/zlib/contrib/minizip/ioapi.c b/Source/3rd Party/zlib/contrib/minizip/ioapi.c
index 06ec03ae6..7f5c191b2 100644
--- a/Source/3rd Party/zlib/contrib/minizip/ioapi.c	
+++ b/Source/3rd Party/zlib/contrib/minizip/ioapi.c	
@@ -1,77 +1,98 @@
-/* ioapi.c -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Version 1.01e, February 12th, 2005
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
 
-   Copyright (C) 1998-2005 Gilles Vollant
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
-#include "../../zlib.h"
+#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS)))
+        #define _CRT_SECURE_NO_WARNINGS
 #endif
 
+#if defined(__APPLE__) || defined(IOAPI_NO_64)
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
+
 #include "ioapi.h"
 
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
+voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
+{
+    if (pfilefunc->zfile_func64.zopen64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
+    else
+    {
+        return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
+    }
+}
 
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
+long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
+    else
+    {
+        uLong offsetTruncated = (uLong)offset;
+        if (offsetTruncated != offset)
+            return -1;
+        else
+            return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
+    }
+}
 
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
+ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
+{
+    if (pfilefunc->zfile_func64.zseek64_file != NULL)
+        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
+    else
+    {
+        uLong tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
+        if ((tell_uLong) == MAXU32)
+            return (ZPOS64_T)-1;
+        else
+            return tell_uLong;
+    }
+}
 
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-voidpf ZCALLBACK fopen_file_func OF((
-   voidpf opaque,
-   const char* filename,
-   int mode));
-
-uLong ZCALLBACK fread_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   void* buf,
-   uLong size));
-
-uLong ZCALLBACK fwrite_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   const void* buf,
-   uLong size));
-
-long ZCALLBACK ftell_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-long ZCALLBACK fseek_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   uLong offset,
-   int origin));
-
-int ZCALLBACK fclose_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-int ZCALLBACK ferror_file_func OF((
-   voidpf opaque,
-   voidpf stream));
+void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
+{
+    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
+    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
+    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
+    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
+    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
+    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
+    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
+    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
+    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
+    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
+}
 
 
-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
+
+static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
+static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
+static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
+static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
+static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
+
+static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
 {
     FILE* file = NULL;
     const char* mode_fopen = NULL;
@@ -89,44 +110,55 @@ voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
     return file;
 }
 
+static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
 
-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = FOPEN_FUNC((const char*)filename, mode_fopen);
+    return file;
+}
+
+
+static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
 {
     uLong ret;
     ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
-
-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
+static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
 {
     uLong ret;
     ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
     return ret;
 }
 
-long ZCALLBACK ftell_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
 {
     long ret;
     ret = ftell((FILE *)stream);
     return ret;
 }
 
-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
+
+static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret;
+    ret = FTELLO_FUNC((FILE *)stream);
+    return ret;
+}
+
+static long ZCALLBACK fseek_file_func (voidpf  opaque, voidpf stream, uLong offset, int origin)
 {
     int fseek_origin=0;
     long ret;
@@ -144,22 +176,45 @@ long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
     default: return -1;
     }
     ret = 0;
-    fseek((FILE *)stream, offset, fseek_origin);
+    if (fseek((FILE *)stream, offset, fseek_origin) != 0)
+        ret = -1;
     return ret;
 }
 
-int ZCALLBACK fclose_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T offset, int origin)
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+
+    if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)
+                        ret = -1;
+
+    return ret;
+}
+
+
+static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
 {
     int ret;
     ret = fclose((FILE *)stream);
     return ret;
 }
 
-int ZCALLBACK ferror_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
 {
     int ret;
     ret = ferror((FILE *)stream);
@@ -178,3 +233,15 @@ void fill_fopen_filefunc (pzlib_filefunc_def)
     pzlib_filefunc_def->zerror_file = ferror_file_func;
     pzlib_filefunc_def->opaque = NULL;
 }
+
+void fill_fopen64_filefunc (zlib_filefunc64_def*  pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
+    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/Source/3rd Party/zlib/contrib/minizip/ioapi.h b/Source/3rd Party/zlib/contrib/minizip/ioapi.h
index 7d457baab..f2138cc77 100644
--- a/Source/3rd Party/zlib/contrib/minizip/ioapi.h	
+++ b/Source/3rd Party/zlib/contrib/minizip/ioapi.h	
@@ -1,13 +1,112 @@
 /* ioapi.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Version 1.01e, February 12th, 2005
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+
+    Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this)
+    Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux.
+               More if/def section may be needed to support other platforms
+    Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows.
+                          (but you should use iowin32.c for windows instead)
 
-   Copyright (C) 1998-2005 Gilles Vollant
 */
 
-#ifndef _ZLIBIOAPI_H
-#define _ZLIBIOAPI_H
+#ifndef _ZLIBIOAPI64_H
+#define _ZLIBIOAPI64_H
+
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+
+  // Linux needs this to support file operation on files larger then 4+GB
+  // But might need better if/def to select just the platforms that needs them.
+
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "../../zlib.h"
+
+#if defined(USE_FILE32API)
+#define fopen64 fopen
+#define ftello64 ftell
+#define fseeko64 fseek
+#else
+#ifdef __FreeBSD__
+#define fopen64 fopen
+#define ftello64 ftello
+#define fseeko64 fseeko
+#endif
+#ifdef _MSC_VER
+ #define fopen64 fopen
+ #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC)))
+  #define ftello64 _ftelli64
+  #define fseeko64 _fseeki64
+ #else // old MSC
+  #define ftello64 ftell
+  #define fseeko64 fseek
+ #endif
+#endif
+#endif
+
+/*
+#ifndef ZPOS64_T
+  #ifdef _WIN32
+                #define ZPOS64_T fpos_t
+  #else
+    #include <stdint.h>
+    #define ZPOS64_T uint64_t
+  #endif
+#endif
+*/
+
+#ifdef HAVE_MINIZIP64_CONF_H
+#include "mz64conf.h"
+#endif
+
+/* a type choosen by DEFINE */
+#ifdef HAVE_64BIT_INT_CUSTOM
+typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;
+#else
+#ifdef HAS_STDINT_H
+#include "stdint.h"
+typedef uint64_t ZPOS64_T;
+#else
+
+/* Maximum unsigned 32-bit value used as placeholder for zip64 */
+#define MAXU32 0xffffffff
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef unsigned __int64 ZPOS64_T;
+#else
+typedef unsigned long long int ZPOS64_T;
+#endif
+#endif
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 
 #define ZLIB_FILEFUNC_SEEK_CUR (1)
@@ -23,26 +122,27 @@
 
 
 #ifndef ZCALLBACK
-
-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#define ZCALLBACK CALLBACK
-#else
-#define ZCALLBACK
-#endif
+ #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+   #define ZCALLBACK CALLBACK
+ #else
+   #define ZCALLBACK
+ #endif
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
 
+
+typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
+typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
+typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+
+typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+
+
+/* here is the "old" 32 bits structure structure */
 typedef struct zlib_filefunc_def_s
 {
     open_file_func      zopen_file;
@@ -55,21 +155,54 @@ typedef struct zlib_filefunc_def_s
     voidpf              opaque;
 } zlib_filefunc_def;
 
+typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
+typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
 
+typedef struct zlib_filefunc64_def_s
+{
+    open64_file_func    zopen64_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell64_file_func    ztell64_file;
+    seek64_file_func    zseek64_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc64_def;
 
+void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
 void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
 
-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
+/* now internal definition, only for zip.c and unzip.h */
+typedef struct zlib_filefunc64_32_def_s
+{
+    zlib_filefunc64_def zfile_func64;
+    open_file_func      zopen32_file;
+    tell_file_func      ztell32_file;
+    seek_file_func      zseek32_file;
+} zlib_filefunc64_32_def;
 
 
+#define ZREAD64(filefunc,filestream,buf,size)     ((*((filefunc).zfile_func64.zread_file))   ((filefunc).zfile_func64.opaque,filestream,buf,size))
+#define ZWRITE64(filefunc,filestream,buf,size)    ((*((filefunc).zfile_func64.zwrite_file))  ((filefunc).zfile_func64.opaque,filestream,buf,size))
+//#define ZTELL64(filefunc,filestream)            ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
+//#define ZSEEK64(filefunc,filestream,pos,mode)   ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
+#define ZCLOSE64(filefunc,filestream)             ((*((filefunc).zfile_func64.zclose_file))  ((filefunc).zfile_func64.opaque,filestream))
+#define ZERROR64(filefunc,filestream)             ((*((filefunc).zfile_func64.zerror_file))  ((filefunc).zfile_func64.opaque,filestream))
+
+voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
+long    call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
+ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
+
+void    fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32);
+
+#define ZOPEN64(filefunc,filename,mode)         (call_zopen64((&(filefunc)),(filename),(mode)))
+#define ZTELL64(filefunc,filestream)            (call_ztell64((&(filefunc)),(filestream)))
+#define ZSEEK64(filefunc,filestream,pos,mode)   (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
+
 #ifdef __cplusplus
 }
 #endif
 
 #endif
-
diff --git a/Source/3rd Party/zlib/contrib/minizip/iowin32.c b/Source/3rd Party/zlib/contrib/minizip/iowin32.c
index 79e27d5cf..a46d96c7f 100644
--- a/Source/3rd Party/zlib/contrib/minizip/iowin32.c	
+++ b/Source/3rd Party/zlib/contrib/minizip/iowin32.c	
@@ -1,15 +1,19 @@
 /* iowin32.c -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-   This IO API version uses the Win32 API (for Microsoft Windows)
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Version 1.01e, February 12th, 2005
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+     For more info read MiniZip_info.txt
 
-   Copyright (C) 1998-2005 Gilles Vollant
 */
 
 #include <stdlib.h>
 
-#include "../../zlib.h"
+#include "zlib.h"
 #include "ioapi.h"
 #include "iowin32.h"
 
@@ -21,40 +25,20 @@
 #define INVALID_SET_FILE_POINTER ((DWORD)-1)
 #endif
 
-voidpf ZCALLBACK win32_open_file_func OF((
-   voidpf opaque,
-   const char* filename,
-   int mode));
 
-uLong ZCALLBACK win32_read_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   void* buf,
-   uLong size));
+#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
+#define IOWIN32_USING_WINRT_API 1
+#endif
+#endif
 
-uLong ZCALLBACK win32_write_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   const void* buf,
-   uLong size));
-
-long ZCALLBACK win32_tell_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-long ZCALLBACK win32_seek_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   uLong offset,
-   int origin));
-
-int ZCALLBACK win32_close_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-int ZCALLBACK win32_error_file_func OF((
-   voidpf opaque,
-   voidpf stream));
+voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
+uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+ZPOS64_T ZCALLBACK win32_tell64_file_func  OF((voidpf opaque, voidpf stream));
+long    ZCALLBACK win32_seek64_file_func  OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
+int     ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream));
+int     ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream));
 
 typedef struct
 {
@@ -62,69 +46,163 @@ typedef struct
     int error;
 } WIN32FILE_IOWIN;
 
-voidpf ZCALLBACK win32_open_file_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
-{
-    const char* mode_fopen = NULL;
-    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
-    HANDLE hFile = 0;
-    voidpf ret=NULL;
 
-    dwDesiredAccess = dwShareMode = dwFlagsAndAttributes = 0;
+static void win32_translate_open_mode(int mode,
+                                      DWORD* lpdwDesiredAccess,
+                                      DWORD* lpdwCreationDisposition,
+                                      DWORD* lpdwShareMode,
+                                      DWORD* lpdwFlagsAndAttributes)
+{
+    *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0;
 
     if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
     {
-        dwDesiredAccess = GENERIC_READ;
-        dwCreationDisposition = OPEN_EXISTING;
-        dwShareMode = FILE_SHARE_READ;
+        *lpdwDesiredAccess = GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
+        *lpdwShareMode = FILE_SHARE_READ;
     }
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
     {
-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        dwCreationDisposition = OPEN_EXISTING;
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = OPEN_EXISTING;
     }
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
     {
-        dwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
-        dwCreationDisposition = CREATE_ALWAYS;
+        *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ;
+        *lpdwCreationDisposition = CREATE_ALWAYS;
     }
+}
 
-    if ((filename!=NULL) && (dwDesiredAccess != 0))
-        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL,
-                      dwCreationDisposition, dwFlagsAndAttributes, NULL);
+static voidpf win32_build_iowin(HANDLE hFile)
+{
+    voidpf ret=NULL;
 
-    if (hFile == INVALID_HANDLE_VALUE)
-        hFile = NULL;
-
-    if (hFile != NULL)
+    if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE))
     {
         WIN32FILE_IOWIN w32fiow;
         w32fiow.hf = hFile;
         w32fiow.error = 0;
         ret = malloc(sizeof(WIN32FILE_IOWIN));
+
         if (ret==NULL)
             CloseHandle(hFile);
-        else *((WIN32FILE_IOWIN*)ret) = w32fiow;
+        else
+            *((WIN32FILE_IOWIN*)ret) = w32fiow;
     }
     return ret;
 }
 
+voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
 
-uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+#ifdef UNICODE
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+    {
+        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
+        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
+        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+    }
+#endif
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+    {
+        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
+        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
+        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+    }
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition,NULL);
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode)
+{
+    const char* mode_fopen = NULL;
+    DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ;
+    HANDLE hFile = NULL;
+
+    win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes);
+
+#ifdef IOWIN32_USING_WINRT_API
+#ifdef UNICODE
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+    {
+        WCHAR filenameW[FILENAME_MAX + 0x200 + 1];
+        MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200);
+        hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL);
+    }
+#endif
+#else
+    if ((filename!=NULL) && (dwDesiredAccess != 0))
+        hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL);
+#endif
+
+    return win32_build_iowin(hFile);
+}
+
+
+uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size)
 {
     uLong ret=0;
     HANDLE hFile = NULL;
     if (stream!=NULL)
         hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
+
     if (hFile != NULL)
+    {
         if (!ReadFile(hFile, buf, size, &ret, NULL))
         {
             DWORD dwErr = GetLastError();
@@ -132,23 +210,21 @@ uLong ZCALLBACK win32_read_file_func (opaque, stream, buf, size)
                 dwErr = 0;
             ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
         }
+    }
 
     return ret;
 }
 
 
-uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
+uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size)
 {
     uLong ret=0;
     HANDLE hFile = NULL;
     if (stream!=NULL)
         hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
 
-    if (hFile !=NULL)
+    if (hFile != NULL)
+    {
         if (!WriteFile(hFile, buf, size, &ret, NULL))
         {
             DWORD dwErr = GetLastError();
@@ -156,13 +232,32 @@ uLong ZCALLBACK win32_write_file_func (opaque, stream, buf, size)
                 dwErr = 0;
             ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
         }
+    }
 
     return ret;
 }
 
-long ZCALLBACK win32_tell_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos,  DWORD dwMoveMethod)
+{
+#ifdef IOWIN32_USING_WINRT_API
+    return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod);
+#else
+    LONG lHigh = pos.HighPart;
+    DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, FILE_CURRENT);
+    BOOL fOk = TRUE;
+    if (dwNewPos == 0xFFFFFFFF)
+        if (GetLastError() != NO_ERROR)
+            fOk = FALSE;
+    if ((newPos != NULL) && (fOk))
+    {
+        newPos->LowPart = dwNewPos;
+        newPos->HighPart = lHigh;
+    }
+    return fOk;
+#endif
+}
+
+long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream)
 {
     long ret=-1;
     HANDLE hFile = NULL;
@@ -170,24 +265,47 @@ long ZCALLBACK win32_tell_file_func (opaque, stream)
         hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
     if (hFile != NULL)
     {
-        DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
-        if (dwSet == INVALID_SET_FILE_POINTER)
+        LARGE_INTEGER pos;
+        pos.QuadPart = 0;
+
+        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
         {
             DWORD dwErr = GetLastError();
             ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
             ret = -1;
         }
         else
-            ret=(long)dwSet;
+            ret=(long)pos.LowPart;
     }
     return ret;
 }
 
-long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
+ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream)
+{
+    ZPOS64_T ret= (ZPOS64_T)-1;
+    HANDLE hFile = NULL;
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    if (hFile)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = 0;
+
+        if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = (ZPOS64_T)-1;
+        }
+        else
+            ret=pos.QuadPart;
+    }
+    return ret;
+}
+
+
+long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin)
 {
     DWORD dwMoveMethod=0xFFFFFFFF;
     HANDLE hFile = NULL;
@@ -211,8 +329,9 @@ long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
 
     if (hFile != NULL)
     {
-        DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod);
-        if (dwSet == INVALID_SET_FILE_POINTER)
+        LARGE_INTEGER pos;
+        pos.QuadPart = offset;
+        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
         {
             DWORD dwErr = GetLastError();
             ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
@@ -224,9 +343,46 @@ long ZCALLBACK win32_seek_file_func (opaque, stream, offset, origin)
     return ret;
 }
 
-int ZCALLBACK win32_close_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin)
+{
+    DWORD dwMoveMethod=0xFFFFFFFF;
+    HANDLE hFile = NULL;
+    long ret=-1;
+
+    if (stream!=NULL)
+        hFile = ((WIN32FILE_IOWIN*)stream)->hf;
+
+    switch (origin)
+    {
+        case ZLIB_FILEFUNC_SEEK_CUR :
+            dwMoveMethod = FILE_CURRENT;
+            break;
+        case ZLIB_FILEFUNC_SEEK_END :
+            dwMoveMethod = FILE_END;
+            break;
+        case ZLIB_FILEFUNC_SEEK_SET :
+            dwMoveMethod = FILE_BEGIN;
+            break;
+        default: return -1;
+    }
+
+    if (hFile)
+    {
+        LARGE_INTEGER pos;
+        pos.QuadPart = offset;
+        if (!MySetFilePointerEx(hFile, pos, NULL, FILE_CURRENT))
+        {
+            DWORD dwErr = GetLastError();
+            ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
+            ret = -1;
+        }
+        else
+            ret=0;
+    }
+    return ret;
+}
+
+int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream)
 {
     int ret=-1;
 
@@ -244,9 +400,7 @@ int ZCALLBACK win32_close_file_func (opaque, stream)
     return ret;
 }
 
-int ZCALLBACK win32_error_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
+int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream)
 {
     int ret=-1;
     if (stream!=NULL)
@@ -256,8 +410,7 @@ int ZCALLBACK win32_error_file_func (opaque, stream)
     return ret;
 }
 
-void fill_win32_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
+void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
 {
     pzlib_filefunc_def->zopen_file = win32_open_file_func;
     pzlib_filefunc_def->zread_file = win32_read_file_func;
@@ -266,5 +419,43 @@ void fill_win32_filefunc (pzlib_filefunc_def)
     pzlib_filefunc_def->zseek_file = win32_seek_file_func;
     pzlib_filefunc_def->zclose_file = win32_close_file_func;
     pzlib_filefunc_def->zerror_file = win32_error_file_func;
-    pzlib_filefunc_def->opaque=NULL;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_func;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
+
+
+void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW;
+    pzlib_filefunc_def->zread_file = win32_read_file_func;
+    pzlib_filefunc_def->zwrite_file = win32_write_file_func;
+    pzlib_filefunc_def->ztell64_file = win32_tell64_file_func;
+    pzlib_filefunc_def->zseek64_file = win32_seek64_file_func;
+    pzlib_filefunc_def->zclose_file = win32_close_file_func;
+    pzlib_filefunc_def->zerror_file = win32_error_file_func;
+    pzlib_filefunc_def->opaque = NULL;
 }
diff --git a/Source/3rd Party/zlib/contrib/minizip/iowin32.h b/Source/3rd Party/zlib/contrib/minizip/iowin32.h
index a3a437adf..0ca0969a7 100644
--- a/Source/3rd Party/zlib/contrib/minizip/iowin32.h	
+++ b/Source/3rd Party/zlib/contrib/minizip/iowin32.h	
@@ -1,10 +1,14 @@
 /* iowin32.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-   This IO API version uses the Win32 API (for Microsoft Windows)
+     Version 1.1, February 14h, 2010
+     part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Version 1.01e, February 12th, 2005
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
 
-   Copyright (C) 1998-2005 Gilles Vollant
 */
 
 #include <windows.h>
@@ -15,6 +19,9 @@ extern "C" {
 #endif
 
 void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def));
+void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def));
 
 #ifdef __cplusplus
 }
diff --git a/Source/3rd Party/zlib/contrib/minizip/miniunz.c b/Source/3rd Party/zlib/contrib/minizip/miniunz.c
index f59993888..3d65401be 100644
--- a/Source/3rd Party/zlib/contrib/minizip/miniunz.c	
+++ b/Source/3rd Party/zlib/contrib/minizip/miniunz.c	
@@ -1,10 +1,43 @@
 /*
    miniunz.c
-   Version 1.01e, February 12th, 2005
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Copyright (C) 1998-2005 Gilles Vollant
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */
 
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#ifdef __APPLE__
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -13,21 +46,22 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#ifdef unix
-# include <unistd.h>
-# include <utime.h>
-#else
+#ifdef _WIN32
 # include <direct.h>
 # include <io.h>
+#else
+# include <unistd.h>
+# include <utime.h>
 #endif
 
+
 #include "unzip.h"
 
 #define CASESENSITIVITY (0)
 #define WRITEBUFFERSIZE (8192)
 #define MAXFILENAME (256)
 
-#ifdef WIN32
+#ifdef _WIN32
 #define USEWIN32IOAPI
 #include "iowin32.h"
 #endif
@@ -51,11 +85,11 @@ void change_file_date(filename,dosdate,tmu_date)
     uLong dosdate;
     tm_unz tmu_date;
 {
-#ifdef WIN32
+#ifdef _WIN32
   HANDLE hFile;
   FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
 
-  hFile = CreateFile(filename,GENERIC_READ | GENERIC_WRITE,
+  hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE,
                       0,NULL,OPEN_EXISTING,0,NULL);
   GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite);
   DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal);
@@ -63,7 +97,7 @@ void change_file_date(filename,dosdate,tmu_date)
   SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
   CloseHandle(hFile);
 #else
-#ifdef unix
+#ifdef unix || __APPLE__
   struct utimbuf ut;
   struct tm newdate;
   newdate.tm_sec = tmu_date.tm_sec;
@@ -91,12 +125,12 @@ int mymkdir(dirname)
     const char* dirname;
 {
     int ret=0;
-#ifdef WIN32
-    ret = mkdir(dirname);
-#else
-#ifdef unix
+#ifdef _WIN32
+    ret = _mkdir(dirname);
+#elif unix
+    ret = mkdir (dirname,0775);
+#elif __APPLE__
     ret = mkdir (dirname,0775);
-#endif
 #endif
     return ret;
 }
@@ -112,6 +146,11 @@ int makedir (newdir)
     return 0;
 
   buffer = (char*)malloc(len+1);
+        if (buffer==NULL)
+        {
+                printf("Error allocating memory\n");
+                return UNZ_INTERNALERROR;
+        }
   strcpy(buffer,newdir);
 
   if (buffer[len-1] == '/') {
@@ -164,34 +203,61 @@ void do_help()
            "  -p  extract crypted file using password\n\n");
 }
 
+void Display64BitsSize(ZPOS64_T n, int size_char)
+{
+  /* to avoid compatibility problem , we do here the conversion */
+  char number[21];
+  int offset=19;
+  int pos_string = 19;
+  number[20]=0;
+  for (;;) {
+      number[offset]=(char)((n%10)+'0');
+      if (number[offset] != '0')
+          pos_string=offset;
+      n/=10;
+      if (offset==0)
+          break;
+      offset--;
+  }
+  {
+      int size_display_string = 19-pos_string;
+      while (size_char > size_display_string)
+      {
+          size_char--;
+          printf(" ");
+      }
+  }
+
+  printf("%s",&number[pos_string]);
+}
 
 int do_list(uf)
     unzFile uf;
 {
     uLong i;
-    unz_global_info gi;
+    unz_global_info64 gi;
     int err;
 
-    err = unzGetGlobalInfo (uf,&gi);
+    err = unzGetGlobalInfo64(uf,&gi);
     if (err!=UNZ_OK)
         printf("error %d with zipfile in unzGetGlobalInfo \n",err);
-    printf(" Length  Method   Size  Ratio   Date    Time   CRC-32     Name\n");
-    printf(" ------  ------   ----  -----   ----    ----   ------     ----\n");
+    printf("  Length  Method     Size Ratio   Date    Time   CRC-32     Name\n");
+    printf("  ------  ------     ---- -----   ----    ----   ------     ----\n");
     for (i=0;i<gi.number_entry;i++)
     {
         char filename_inzip[256];
-        unz_file_info file_info;
+        unz_file_info64 file_info;
         uLong ratio=0;
         const char *string_method;
         char charCrypt=' ';
-        err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+        err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
         if (err!=UNZ_OK)
         {
             printf("error %d with zipfile in unzGetCurrentFileInfo\n",err);
             break;
         }
         if (file_info.uncompressed_size>0)
-            ratio = (file_info.compressed_size*100)/file_info.uncompressed_size;
+            ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size);
 
         /* display a '*' if the file is crypted */
         if ((file_info.flag & 1) != 0)
@@ -210,13 +276,18 @@ int do_list(uf)
             else if ((iLevel==2) || (iLevel==3))
               string_method="Defl:F"; /* 2:fast , 3 : extra fast*/
         }
+        else
+        if (file_info.compression_method==Z_BZIP2ED)
+        {
+              string_method="BZip2 ";
+        }
         else
             string_method="Unkn. ";
 
-        printf("%7lu  %6s%c%7lu %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
-                file_info.uncompressed_size,string_method,
-                charCrypt,
-                file_info.compressed_size,
+        Display64BitsSize(file_info.uncompressed_size,7);
+        printf("  %6s%c",string_method,charCrypt);
+        Display64BitsSize(file_info.compressed_size,7);
+        printf(" %3lu%%  %2.2lu-%2.2lu-%2.2lu  %2.2lu:%2.2lu  %8.8lx   %s\n",
                 ratio,
                 (uLong)file_info.tmu_date.tm_mon + 1,
                 (uLong)file_info.tmu_date.tm_mday,
@@ -252,9 +323,9 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
     void* buf;
     uInt size_buf;
 
-    unz_file_info file_info;
+    unz_file_info64 file_info;
     uLong ratio=0;
-    err = unzGetCurrentFileInfo(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+    err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
 
     if (err!=UNZ_OK)
     {
@@ -306,7 +377,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
         {
             char rep=0;
             FILE* ftestexist;
-            ftestexist = fopen(write_filename,"rb");
+            ftestexist = FOPEN_FUNC(write_filename,"rb");
             if (ftestexist!=NULL)
             {
                 fclose(ftestexist);
@@ -317,7 +388,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
 
                     printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
                     ret = scanf("%1s",answer);
-                    if (ret != 1) 
+                    if (ret != 1)
                     {
                        exit(EXIT_FAILURE);
                     }
@@ -337,8 +408,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
 
         if ((skip==0) && (err==UNZ_OK))
         {
-            fout=fopen(write_filename,"wb");
-
+            fout=FOPEN_FUNC(write_filename,"wb");
             /* some zipfile don't contain directory alone before file */
             if ((fout==NULL) && ((*popt_extract_without_path)==0) &&
                                 (filename_withoutpath!=(char*)filename_inzip))
@@ -347,7 +417,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
                 *(filename_withoutpath-1)='\0';
                 makedir(write_filename);
                 *(filename_withoutpath-1)=c;
-                fout=fopen(write_filename,"wb");
+                fout=FOPEN_FUNC(write_filename,"wb");
             }
 
             if (fout==NULL)
@@ -409,11 +479,11 @@ int do_extract(uf,opt_extract_without_path,opt_overwrite,password)
     const char* password;
 {
     uLong i;
-    unz_global_info gi;
+    unz_global_info64 gi;
     int err;
     FILE* fout=NULL;
 
-    err = unzGetGlobalInfo (uf,&gi);
+    err = unzGetGlobalInfo64(uf,&gi);
     if (err!=UNZ_OK)
         printf("error %d with zipfile in unzGetGlobalInfo \n",err);
 
@@ -470,6 +540,7 @@ int main(argc,argv)
     const char *password=NULL;
     char filename_try[MAXFILENAME+16] = "";
     int i;
+    int ret_value=0;
     int opt_do_list=0;
     int opt_do_extract=1;
     int opt_do_extract_withoutpath=0;
@@ -532,7 +603,7 @@ int main(argc,argv)
     {
 
 #        ifdef USEWIN32IOAPI
-        zlib_filefunc_def ffunc;
+        zlib_filefunc64_def ffunc;
 #        endif
 
         strncpy(filename_try, zipfilename,MAXFILENAME-1);
@@ -540,18 +611,18 @@ int main(argc,argv)
         filename_try[ MAXFILENAME ] = '\0';
 
 #        ifdef USEWIN32IOAPI
-        fill_win32_filefunc(&ffunc);
-        uf = unzOpen2(zipfilename,&ffunc);
+        fill_win32_filefunc64A(&ffunc);
+        uf = unzOpen2_64(zipfilename,&ffunc);
 #        else
-        uf = unzOpen(zipfilename);
+        uf = unzOpen64(zipfilename);
 #        endif
         if (uf==NULL)
         {
             strcat(filename_try,".zip");
 #            ifdef USEWIN32IOAPI
-            uf = unzOpen2(filename_try,&ffunc);
+            uf = unzOpen2_64(filename_try,&ffunc);
 #            else
-            uf = unzOpen(filename_try);
+            uf = unzOpen64(filename_try);
 #            endif
         }
     }
@@ -564,22 +635,26 @@ int main(argc,argv)
     printf("%s opened\n",filename_try);
 
     if (opt_do_list==1)
-        return do_list(uf);
+        ret_value = do_list(uf);
     else if (opt_do_extract==1)
     {
-        if (opt_extractdir && chdir(dirname)) 
+#ifdef _WIN32
+        if (opt_extractdir && _chdir(dirname))
+#else
+        if (opt_extractdir && chdir(dirname))
+#endif
         {
           printf("Error changing into %s, aborting\n", dirname);
           exit(-1);
         }
 
         if (filename_to_extract == NULL)
-            return do_extract(uf,opt_do_extract_withoutpath,opt_overwrite,password);
+            ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password);
         else
-            return do_extract_onefile(uf,filename_to_extract,
-                                      opt_do_extract_withoutpath,opt_overwrite,password);
+            ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password);
     }
-    unzCloseCurrentFile(uf);
 
-    return 0;
+    unzClose(uf);
+
+    return ret_value;
 }
diff --git a/Source/3rd Party/zlib/contrib/minizip/minizip.c b/Source/3rd Party/zlib/contrib/minizip/minizip.c
index 262c700f5..4288962ec 100644
--- a/Source/3rd Party/zlib/contrib/minizip/minizip.c	
+++ b/Source/3rd Party/zlib/contrib/minizip/minizip.c	
@@ -1,10 +1,46 @@
 /*
    minizip.c
-   Version 1.01e, February 12th, 2005
+   Version 1.1, February 14h, 2010
+   sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Copyright (C) 1998-2005 Gilles Vollant
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 */
 
+
+#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
+        #ifndef __USE_FILE_OFFSET64
+                #define __USE_FILE_OFFSET64
+        #endif
+        #ifndef __USE_LARGEFILE64
+                #define __USE_LARGEFILE64
+        #endif
+        #ifndef _LARGEFILE64_SOURCE
+                #define _LARGEFILE64_SOURCE
+        #endif
+        #ifndef _FILE_OFFSET_BIT
+                #define _FILE_OFFSET_BIT 64
+        #endif
+#endif
+
+#ifdef __APPLE__
+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)
+#define FTELLO_FUNC(stream) ftello(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
+#else
+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
+#define FTELLO_FUNC(stream) ftello64(stream)
+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -12,21 +48,21 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#ifdef unix
+#ifdef _WIN32
+# include <direct.h>
+# include <io.h>
+#else
 # include <unistd.h>
 # include <utime.h>
 # include <sys/types.h>
 # include <sys/stat.h>
-#else
-# include <direct.h>
-# include <io.h>
 #endif
 
 #include "zip.h"
 
-#ifdef WIN32
-#define USEWIN32IOAPI
-#include "iowin32.h"
+#ifdef _WIN32
+        #define USEWIN32IOAPI
+        #include "iowin32.h"
 #endif
 
 
@@ -34,9 +70,9 @@
 #define WRITEBUFFERSIZE (16384)
 #define MAXFILENAME (256)
 
-#ifdef WIN32
+#ifdef _WIN32
 uLong filetime(f, tmzip, dt)
-    TCHAR *f;                /* name of file to get info on */
+    char *f;                /* name of file to get info on */
     tm_zip *tmzip;             /* return value: access, modific. and creation times */
     uLong *dt;             /* dostime */
 {
@@ -44,9 +80,9 @@ uLong filetime(f, tmzip, dt)
   {
       FILETIME ftLocal;
       HANDLE hFind;
-      WIN32_FIND_DATA  ff32;
+      WIN32_FIND_DATAA ff32;
 
-      hFind = FindFirstFile(f,&ff32);
+      hFind = FindFirstFileA(f,&ff32);
       if (hFind != INVALID_HANDLE_VALUE)
       {
         FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal);
@@ -58,7 +94,7 @@ uLong filetime(f, tmzip, dt)
   return ret;
 }
 #else
-#ifdef unix
+#ifdef unix || __APPLE__
 uLong filetime(f, tmzip, dt)
     char *f;               /* name of file to get info on */
     tm_zip *tmzip;         /* return value: access, modific. and creation times */
@@ -119,7 +155,7 @@ int check_exist_file(filename)
 {
     FILE* ftestexist;
     int ret = 1;
-    ftestexist = fopen(filename,"rb");
+    ftestexist = FOPEN_FUNC(filename,"rb");
     if (ftestexist==NULL)
         ret = 0;
     else
@@ -129,18 +165,19 @@ int check_exist_file(filename)
 
 void do_banner()
 {
-    printf("MiniZip 1.01b, demo of zLib + Zip package written by Gilles Vollant\n");
-    printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
+    printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n");
+    printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n");
 }
 
 void do_help()
 {
-    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] file.zip [files_to_add]\n\n" \
+    printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
            "  -o  Overwrite existing file.zip\n" \
            "  -a  Append to existing file.zip\n" \
            "  -0  Store only\n" \
            "  -1  Compress faster\n" \
-           "  -9  Compress better\n\n");
+           "  -9  Compress better\n\n" \
+           "  -j  exclude path. store only the file name.\n\n");
 }
 
 /* calculate the CRC32 of a file,
@@ -149,7 +186,8 @@ int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigne
 {
    unsigned long calculate_crc=0;
    int err=ZIP_OK;
-   FILE * fin = fopen(filenameinzip,"rb");
+   FILE * fin = FOPEN_FUNC(filenameinzip,"rb");
+
    unsigned long size_read = 0;
    unsigned long total_read = 0;
    if (fin==NULL)
@@ -179,10 +217,32 @@ int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigne
         fclose(fin);
 
     *result_crc=calculate_crc;
-    printf("file %s crc %x\n",filenameinzip,calculate_crc);
+    printf("file %s crc %lx\n", filenameinzip, calculate_crc);
     return err;
 }
 
+int isLargeFile(const char* filename)
+{
+  int largeFile = 0;
+  ZPOS64_T pos = 0;
+  FILE* pFile = FOPEN_FUNC(filename, "rb");
+
+  if(pFile != NULL)
+  {
+    int n = FSEEKO_FUNC(pFile, 0, SEEK_END);
+    pos = FTELLO_FUNC(pFile);
+
+                printf("File : %s is %lld bytes\n", filename, pos);
+
+    if(pos >= 0xffffffff)
+     largeFile = 1;
+
+                fclose(pFile);
+  }
+
+ return largeFile;
+}
+
 int main(argc,argv)
     int argc;
     char *argv[];
@@ -190,6 +250,7 @@ int main(argc,argv)
     int i;
     int opt_overwrite=0;
     int opt_compress_level=Z_DEFAULT_COMPRESSION;
+    int opt_exclude_path=0;
     int zipfilenamearg = 0;
     char filename_try[MAXFILENAME+16];
     int zipok;
@@ -222,6 +283,8 @@ int main(argc,argv)
                         opt_overwrite = 2;
                     if ((c>='0') && (c<='9'))
                         opt_compress_level = c-'0';
+                    if ((c=='j') || (c=='J'))
+                        opt_exclude_path = 1;
 
                     if (((c=='p') || (c=='P')) && (i+1<argc))
                     {
@@ -231,8 +294,12 @@ int main(argc,argv)
                 }
             }
             else
+            {
                 if (zipfilenamearg == 0)
+                {
                     zipfilenamearg = i ;
+                }
+            }
         }
     }
 
@@ -245,7 +312,9 @@ int main(argc,argv)
     }
 
     if (zipfilenamearg==0)
+    {
         zipok=0;
+    }
     else
     {
         int i,len;
@@ -302,11 +371,11 @@ int main(argc,argv)
         zipFile zf;
         int errclose;
 #        ifdef USEWIN32IOAPI
-        zlib_filefunc_def ffunc;
-        fill_win32_filefunc(&ffunc);
-        zf = zipOpen2(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
+        zlib_filefunc64_def ffunc;
+        fill_win32_filefunc64A(&ffunc);
+        zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc);
 #        else
-        zf = zipOpen(filename_try,(opt_overwrite==2) ? 2 : 0);
+        zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0);
 #        endif
 
         if (zf == NULL)
@@ -329,8 +398,10 @@ int main(argc,argv)
                 FILE * fin;
                 int size_read;
                 const char* filenameinzip = argv[i];
+                const char *savefilenameinzip;
                 zip_fileinfo zi;
                 unsigned long crcFile=0;
+                int zip64 = 0;
 
                 zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour =
                 zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0;
@@ -348,19 +419,48 @@ int main(argc,argv)
                 if ((password != NULL) && (err==ZIP_OK))
                     err = getFileCrc(filenameinzip,buf,size_buf,&crcFile);
 
-                err = zipOpenNewFileInZip3(zf,filenameinzip,&zi,
+                zip64 = isLargeFile(filenameinzip);
+
+                                                         /* The path name saved, should not include a leading slash. */
+               /*if it did, windows/xp and dynazip couldn't read the zip file. */
+                 savefilenameinzip = filenameinzip;
+                 while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' )
+                 {
+                     savefilenameinzip++;
+                 }
+
+                 /*should the zip file contain any path at all?*/
+                 if( opt_exclude_path )
+                 {
+                     const char *tmpptr;
+                     const char *lastslash = 0;
+                     for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++)
+                     {
+                         if( *tmpptr == '\\' || *tmpptr == '/')
+                         {
+                             lastslash = tmpptr;
+                         }
+                     }
+                     if( lastslash != NULL )
+                     {
+                         savefilenameinzip = lastslash+1; // base filename follows last slash.
+                     }
+                 }
+
+                 /**/
+                err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi,
                                  NULL,0,NULL,0,NULL /* comment*/,
                                  (opt_compress_level != 0) ? Z_DEFLATED : 0,
                                  opt_compress_level,0,
                                  /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */
                                  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 password,crcFile);
+                                 password,crcFile, zip64);
 
                 if (err != ZIP_OK)
                     printf("error in opening %s in zipfile\n",filenameinzip);
                 else
                 {
-                    fin = fopen(filenameinzip,"rb");
+                    fin = FOPEN_FUNC(filenameinzip,"rb");
                     if (fin==NULL)
                     {
                         err=ZIP_ERRNO;
diff --git a/Source/3rd Party/zlib/contrib/minizip/mztools.c b/Source/3rd Party/zlib/contrib/minizip/mztools.c
index d0f84a1ce..96891c2e0 100644
--- a/Source/3rd Party/zlib/contrib/minizip/mztools.c	
+++ b/Source/3rd Party/zlib/contrib/minizip/mztools.c	
@@ -8,12 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
-#include "../../zlib.h"
-#endif
+#include "zlib.h"
 #include "unzip.h"
 
 #define READ_8(adr)  ((unsigned char)*(adr))
@@ -47,7 +42,7 @@ uLong* bytesRecovered;
     int entries = 0;
     uLong totalBytes = 0;
     char header[30];
-    char filename[256];
+    char filename[1024];
     char extra[1024];
     int offset = 0;
     int offsetCD = 0;
@@ -67,7 +62,7 @@ uLong* bytesRecovered;
         unsigned int fnsize = READ_16(header + 26); /* file name length */
         unsigned int extsize = READ_16(header + 28); /* extra field length */
         filename[0] = extra[0] = '\0';
-        
+
         /* Header */
         if (fwrite(header, 1, 30, fpOut) == 30) {
           offset += 30;
@@ -75,12 +70,17 @@ uLong* bytesRecovered;
           err = Z_ERRNO;
           break;
         }
-        
+
         /* Filename */
         if (fnsize > 0) {
-          if (fread(filename, 1, fnsize, fpZip) == fnsize) {
-            if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
-              offset += fnsize;
+          if (fnsize < sizeof(filename)) {
+            if (fread(filename, 1, fnsize, fpZip) == fnsize) {
+                if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {
+                offset += fnsize;
+              } else {
+                err = Z_ERRNO;
+                break;
+              }
             } else {
               err = Z_ERRNO;
               break;
@@ -96,9 +96,14 @@ uLong* bytesRecovered;
 
         /* Extra field */
         if (extsize > 0) {
-          if (fread(extra, 1, extsize, fpZip) == extsize) {
-            if (fwrite(extra, 1, extsize, fpOut) == extsize) {
-              offset += extsize;
+          if (extsize < sizeof(extra)) {
+            if (fread(extra, 1, extsize, fpZip) == extsize) {
+              if (fwrite(extra, 1, extsize, fpOut) == extsize) {
+                offset += extsize;
+                } else {
+                err = Z_ERRNO;
+                break;
+              }
             } else {
               err = Z_ERRNO;
               break;
@@ -108,7 +113,7 @@ uLong* bytesRecovered;
             break;
           }
         }
-        
+
         /* Data */
         {
           int dataSize = cpsize;
@@ -138,7 +143,7 @@ uLong* bytesRecovered;
             }
           }
         }
-        
+
         /* Central directory entry */
         {
           char header[46];
@@ -164,7 +169,7 @@ uLong* bytesRecovered;
           /* Header */
           if (fwrite(header, 1, 46, fpOutCD) == 46) {
             offsetCD += 46;
-            
+
             /* Filename */
             if (fnsize > 0) {
               if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) {
@@ -177,7 +182,7 @@ uLong* bytesRecovered;
               err = Z_STREAM_ERROR;
               break;
             }
-            
+
             /* Extra field */
             if (extsize > 0) {
               if (fwrite(extra, 1, extsize, fpOutCD) == extsize) {
@@ -187,7 +192,7 @@ uLong* bytesRecovered;
                 break;
               }
             }
-            
+
             /* Comment field */
             if (comsize > 0) {
               if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) {
@@ -197,8 +202,8 @@ uLong* bytesRecovered;
                 break;
               }
             }
-            
-            
+
+
           } else {
             err = Z_ERRNO;
             break;
@@ -230,17 +235,17 @@ uLong* bytesRecovered;
       WRITE_32(header + 12, offsetCD);    /* size of CD */
       WRITE_32(header + 16, offset);      /* offset to CD */
       WRITE_16(header + 20, comsize);     /* comment */
-      
+
       /* Header */
       if (fwrite(header, 1, 22, fpOutCD) == 22) {
-        
+
         /* Comment field */
         if (comsize > 0) {
           if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
             err = Z_ERRNO;
           }
         }
-        
+
       } else {
         err = Z_ERRNO;
       }
@@ -262,14 +267,14 @@ uLong* bytesRecovered;
         fclose(fpOutCD);
       }
     }
-    
+
     /* Close */
     fclose(fpZip);
     fclose(fpOut);
-    
+
     /* Wipe temporary file */
     (void)remove(fileOutTmp);
-    
+
     /* Number of recovered entries */
     if (err == Z_OK) {
       if (nRecovered != NULL) {
diff --git a/Source/3rd Party/zlib/contrib/minizip/mztools.h b/Source/3rd Party/zlib/contrib/minizip/mztools.h
index 4af7a46b6..a49a426ec 100644
--- a/Source/3rd Party/zlib/contrib/minizip/mztools.h	
+++ b/Source/3rd Party/zlib/contrib/minizip/mztools.h	
@@ -11,23 +11,27 @@
 extern "C" {
 #endif
 
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
-#include "third_party/zlib/zlib.h"
+#ifndef _ZLIB_H
+#include "zlib.h"
 #endif
 
 #include "unzip.h"
 
-/* Repair a ZIP file (missing central directory) 
+/* Repair a ZIP file (missing central directory)
    file: file to recover
    fileOut: output file after recovery
    fileOutTmp: temporary file name used for recovery
 */
-extern int ZEXPORT unzRepair(const char* file, 
-                             const char* fileOut, 
-                             const char* fileOutTmp, 
+extern int ZEXPORT unzRepair(const char* file,
+                             const char* fileOut,
+                             const char* fileOutTmp,
                              uLong* nRecovered,
                              uLong* bytesRecovered);
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif
diff --git a/Source/3rd Party/zlib/contrib/minizip/unzip.c b/Source/3rd Party/zlib/contrib/minizip/unzip.c
index 59886cd11..b63c0c39e 100644
--- a/Source/3rd Party/zlib/contrib/minizip/unzip.c	
+++ b/Source/3rd Party/zlib/contrib/minizip/unzip.c	
@@ -1,48 +1,78 @@
 /* unzip.c -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Copyright (C) 1998-2005 Gilles Vollant
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Read unzip.h for more info
-*/
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+
+  ------------------------------------------------------------------------------------
+  Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
+  compatibility with older software. The following is from the original crypt.c.
+  Code woven in by Terry Thorsen 1/2003.
 
-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-compatibility with older software. The following is from the original crypt.c. Code
-woven in by Terry Thorsen 1/2003.
-*/
-/*
   Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
 
   See the accompanying file LICENSE, version 2000-Apr-09 or later
   (the contents of which are also included in zip.h) for terms of use.
   If, for some reason, all these files are missing, the Info-ZIP license
   also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
-*/
-/*
-  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
+
+        crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
 
   The encryption/decryption parts of this source code (as opposed to the
   non-echoing password parts) were originally written in Europe.  The
   whole source package can be freely distributed, including from the USA.
   (Prior to January 2000, re-export from the US was a violation of US law.)
- */
 
-/*
-  This encryption code is a direct transcription of the algorithm from
+        This encryption code is a direct transcription of the algorithm from
   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
   file (appnote.txt) is distributed with the PKZIP program (even in the
   version without encryption capabilities).
- */
+
+        ------------------------------------------------------------------------------------
+
+        Changes in unzip.c
+
+        2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos
+  2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz*
+  2007-2008 - Even Rouault - Remove old C style function prototypes
+  2007-2008 - Even Rouault - Add unzip support for ZIP64
+
+        Copyright (C) 2007-2008 Even Rouault
+
+
+        Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again).
+  Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G
+                                should only read the compressed/uncompressed size from the Zip64 format if
+                                the size from normal header was 0xFFFFFFFF
+  Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant
+        Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required)
+                                Patch created by Daniel Borca
+
+  Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+  Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
+
+*/
 
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
-#include "../../zlib.h"
+
+#ifndef NOUNCRYPT
+        #define NOUNCRYPT
 #endif
+
+#include "../../zlib.h"
 #include "unzip.h"
 
 #ifdef STDC
@@ -89,16 +119,14 @@ woven in by Terry Thorsen 1/2003.
 #define SIZEZIPLOCALHEADER (0x1e)
 
 
-
-
 const char unz_copyright[] =
    " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
 
 /* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info_internal_s
+typedef struct unz_file_info64_internal_s
 {
-    uLong offset_curfile;/* relative offset of local header 4 bytes */
-} unz_file_info_internal;
+    ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
+} unz_file_info64_internal;
 
 
 /* file_in_zip_read_info_s contain internal information about a file in zipfile,
@@ -108,52 +136,61 @@ typedef struct
     char  *read_buffer;         /* internal buffer for compressed data */
     z_stream stream;            /* zLib stream structure for inflate */
 
-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
+    ZPOS64_T pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
     uLong stream_initialised;   /* flag set if stream structure is initialised*/
 
-    uLong offset_local_extrafield;/* offset of the local extra field */
+    ZPOS64_T offset_local_extrafield;/* offset of the local extra field */
     uInt  size_local_extrafield;/* size of the local extra field */
-    uLong pos_local_extrafield;   /* position in the local extra field in read*/
+    ZPOS64_T pos_local_extrafield;   /* position in the local extra field in read*/
+    ZPOS64_T total_out_64;
 
     uLong crc32;                /* crc32 of all data uncompressed */
     uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-    uLong rest_read_compressed; /* number of byte to be decompressed */
-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-    zlib_filefunc_def z_filefunc;
+    ZPOS64_T rest_read_compressed; /* number of byte to be decompressed */
+    ZPOS64_T rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+    zlib_filefunc64_32_def z_filefunc;
     voidpf filestream;        /* io structore of the zipfile */
     uLong compression_method;   /* compression method (0==store) */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
     int   raw;
-} file_in_zip_read_info_s;
+} file_in_zip64_read_info_s;
 
 
-/* unz_s contain internal information about the zipfile
+/* unz64_s contain internal information about the zipfile
 */
 typedef struct
 {
-    zlib_filefunc_def z_filefunc;
+    zlib_filefunc64_32_def z_filefunc;
+    int is64bitOpenFunction;
     voidpf filestream;        /* io structore of the zipfile */
-    unz_global_info gi;       /* public global information */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    uLong num_file;             /* number of the current file in the zipfile*/
-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
-    uLong current_file_ok;      /* flag about the usability of the current file*/
-    uLong central_pos;          /* position of the beginning of the central dir*/
+    unz_global_info64 gi;       /* public global information */
+    ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    ZPOS64_T num_file;             /* number of the current file in the zipfile*/
+    ZPOS64_T pos_in_central_dir;   /* pos of the current file in the central dir*/
+    ZPOS64_T current_file_ok;      /* flag about the usability of the current file*/
+    ZPOS64_T central_pos;          /* position of the beginning of the central dir*/
 
-    uLong size_central_dir;     /* size of the central directory  */
-    uLong offset_central_dir;   /* offset of start of central directory with
+    ZPOS64_T size_central_dir;     /* size of the central directory  */
+    ZPOS64_T offset_central_dir;   /* offset of start of central directory with
                                    respect to the starting disk number */
 
-    unz_file_info cur_file_info; /* public info about the current file in zip*/
-    unz_file_info_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
+    unz_file_info64 cur_file_info; /* public info about the current file in zip*/
+    unz_file_info64_internal cur_file_info_internal; /* private info about it*/
+    file_in_zip64_read_info_s* pfile_in_zip_read; /* structure about the current
                                         file if we are decompressing it */
     int encrypted;
+
+    int isZip64;
+
 #    ifndef NOUNCRYPT
     unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const unsigned long* pcrc_32_tab;
+    const z_crc_t* pcrc_32_tab;
 #    endif
-} unz_s;
+} unz64_s;
 
 
 #ifndef NOUNCRYPT
@@ -167,18 +204,15 @@ typedef struct
 */
 
 
-local int unzlocal_getByte OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
+local int unz64local_getByte OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
     voidpf filestream,
     int *pi));
 
-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
+local int unz64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi)
 {
     unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
     if (err==1)
     {
         *pi = (int)c;
@@ -186,7 +220,7 @@ local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
     }
     else
     {
-        if (ZERROR(*pzlib_filefunc_def,filestream))
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
             return UNZ_ERRNO;
         else
             return UNZ_EOF;
@@ -197,26 +231,25 @@ local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
 /* ===========================================================================
    Reads a long in LSB order from the given gz_stream. Sets
 */
-local int unzlocal_getShort OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
+local int unz64local_getShort OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
     voidpf filestream,
     uLong *pX));
 
-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+local int unz64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                             voidpf filestream,
+                             uLong *pX)
 {
     uLong x ;
-    int i;
+    int i = 0;
     int err;
 
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
     x = (uLong)i;
 
     if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
 
     if (err==UNZ_OK)
         *pX = x;
@@ -225,33 +258,32 @@ local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
     return err;
 }
 
-local int unzlocal_getLong OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
+local int unz64local_getLong OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
     voidpf filestream,
     uLong *pX));
 
-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+local int unz64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            uLong *pX)
 {
     uLong x ;
-    int i;
+    int i = 0;
     int err;
 
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
     x = (uLong)i;
 
     if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<8;
 
     if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((uLong)i)<<16;
 
     if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<24;
 
     if (err==UNZ_OK)
@@ -261,11 +293,60 @@ local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
     return err;
 }
 
+local int unz64local_getLong64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream,
+    ZPOS64_T *pX));
+
+
+local int unz64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                            voidpf filestream,
+                            ZPOS64_T *pX)
+{
+    ZPOS64_T x ;
+    int i = 0;
+    int err;
+
+    err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (ZPOS64_T)i;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<24;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<32;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<40;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<48;
+
+    if (err==UNZ_OK)
+        err = unz64local_getByte(pzlib_filefunc_def,filestream,&i);
+    x |= ((ZPOS64_T)i)<<56;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
 
 /* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (fileName1,fileName2)
-    const char* fileName1;
-    const char* fileName2;
+local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
 {
     for (;;)
     {
@@ -306,10 +387,10 @@ local int strcmpcasenosensitive_internal (fileName1,fileName2)
         (like 1 on Unix, 2 on Windows)
 
 */
-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
-    const char* fileName1;
-    const char* fileName2;
-    int iCaseSensitivity;
+extern int ZEXPORT unzStringFileNameCompare (const char*  fileName1,
+                                                 const char*  fileName2,
+                                                 int iCaseSensitivity)
+
 {
     if (iCaseSensitivity==0)
         iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
@@ -328,25 +409,20 @@ extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivit
   Locate the Central directory of a zipfile (at the end, just before
     the global comment)
 */
-local uLong unzlocal_SearchCentralDir OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream));
-
-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
+local ZPOS64_T unz64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
 {
     unsigned char* buf;
-    uLong uSizeFile;
-    uLong uBackRead;
-    uLong uMaxBack=0xffff; /* maximum size of global comment */
-    uLong uPosFound=0;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
 
-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
         return 0;
 
 
-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
 
     if (uMaxBack>uSizeFile)
         uMaxBack = uSizeFile;
@@ -358,7 +434,8 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
     uBackRead = 4;
     while (uBackRead<uMaxBack)
     {
-        uLong uReadSize,uReadPos ;
+        uLong uReadSize;
+        ZPOS64_T uReadPos ;
         int i;
         if (uBackRead+BUFREADCOMMENT>uMaxBack)
             uBackRead = uMaxBack;
@@ -367,11 +444,11 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
         uReadPos = uSizeFile-uBackRead ;
 
         uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
             break;
 
-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
             break;
 
         for (i=(int)uReadSize-3; (i--)>0;)
@@ -389,6 +466,112 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
     return uPosFound;
 }
 
+
+/*
+  Locate the Central directory 64 of a zipfile (at the end, just before
+    the global comment)
+*/
+local ZPOS64_T unz64local_SearchCentralDir64 OF((
+    const zlib_filefunc64_32_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def,
+                                      voidpf filestream)
+{
+    unsigned char* buf;
+    ZPOS64_T uSizeFile;
+    ZPOS64_T uBackRead;
+    ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+    ZPOS64_T uPosFound=0;
+    uLong uL;
+                ZPOS64_T relativeOffset;
+
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize;
+        ZPOS64_T uReadPos;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+        if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    if (uPosFound == 0)
+        return 0;
+
+    /* Zip64 end of central directory locator */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+    /* the signature, already checked */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    /* number of the disk with the start of the zip64 end of  central directory */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 0)
+        return 0;
+
+    /* relative offset of the zip64 end of central directory record */
+    if (unz64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=UNZ_OK)
+        return 0;
+
+    /* total number of disks */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+    if (uL != 1)
+        return 0;
+
+    /* Goto end of central directory record */
+    if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return 0;
+
+     /* the signature */
+    if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
+        return 0;
+
+    if (uL != 0x06064b50)
+        return 0;
+
+    return relativeOffset;
+}
+
 /*
   Open a Zip file. path contain the full pathname (by example,
      on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
@@ -398,19 +581,20 @@ local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
      Else, the return value is a unzFile Handle, usable with other function
        of this unzip package.
 */
-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
-    const char *path;
-    zlib_filefunc_def* pzlib_filefunc_def;
+local unzFile unzOpenInternal (const void *path,
+                               zlib_filefunc64_32_def* pzlib_filefunc64_32_def,
+                               int is64bitOpenFunction)
 {
-    unz_s us;
-    unz_s *s;
-    uLong central_pos,uL;
+    unz64_s us;
+    unz64_s *s;
+    ZPOS64_T central_pos;
+    uLong   uL;
 
     uLong number_disk;          /* number of the current dist, used for
                                    spaning ZIP, unsupported, always 0*/
     uLong number_disk_with_CD;  /* number the the disk with central dir, used
                                    for spaning ZIP, unsupported, always 0*/
-    uLong number_entry_CD;      /* total number of entries in
+    ZPOS64_T number_entry_CD;      /* total number of entries in
                                    the central dir
                                    (same than number_entry on nospan) */
 
@@ -419,63 +603,137 @@ extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
     if (unz_copyright[0]!=' ')
         return NULL;
 
-    if (pzlib_filefunc_def==NULL)
-        fill_fopen_filefunc(&us.z_filefunc);
+    us.z_filefunc.zseek32_file = NULL;
+    us.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&us.z_filefunc.zfile_func64);
     else
-        us.z_filefunc = *pzlib_filefunc_def;
+        us.z_filefunc = *pzlib_filefunc64_32_def;
+    us.is64bitOpenFunction = is64bitOpenFunction;
 
-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
+
+
+    us.filestream = ZOPEN64(us.z_filefunc,
                                                  path,
                                                  ZLIB_FILEFUNC_MODE_READ |
                                                  ZLIB_FILEFUNC_MODE_EXISTING);
     if (us.filestream==NULL)
         return NULL;
 
-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
-    if (central_pos==0)
-        err=UNZ_ERRNO;
+    central_pos = unz64local_SearchCentralDir64(&us.z_filefunc,us.filestream);
+    if (central_pos)
+    {
+        uLong uS;
+        ZPOS64_T uL64;
 
-    if (ZSEEK(us.z_filefunc, us.filestream,
+        us.isZip64 = 1;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
                                       central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
         err=UNZ_ERRNO;
 
-    /* the signature, already checked */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-        err=UNZ_ERRNO;
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
 
-    /* number of this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-        err=UNZ_ERRNO;
+        /* size of zip64 end of central directory record */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&uL64)!=UNZ_OK)
+            err=UNZ_ERRNO;
 
-    /* number of the disk with the start of the central directory */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
+        /* version made by */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
 
-    /* total number of entries in the central dir on this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
-        err=UNZ_ERRNO;
+        /* version needed to extract */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uS)!=UNZ_OK)
+            err=UNZ_ERRNO;
 
-    /* total number of entries in the central dir */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
+        /* number of this disk */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
 
-    if ((number_entry_CD!=us.gi.number_entry) ||
-        (number_disk_with_CD!=0) ||
-        (number_disk!=0))
-        err=UNZ_BADZIPFILE;
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
 
-    /* size of the central directory */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
+        /* total number of entries in the central directory on this disk */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+            err=UNZ_ERRNO;
 
-    /* offset of start of central directory with respect to the
+        /* total number of entries in the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* offset of start of central directory with respect to the
           starting disk number */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
+        if (unz64local_getLong64(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+            err=UNZ_ERRNO;
 
-    /* zipfile comment length */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
-        err=UNZ_ERRNO;
+        us.gi.size_comment = 0;
+    }
+    else
+    {
+        central_pos = unz64local_SearchCentralDir(&us.z_filefunc,us.filestream);
+        if (central_pos==0)
+            err=UNZ_ERRNO;
+
+        us.isZip64 = 0;
+
+        if (ZSEEK64(us.z_filefunc, us.filestream,
+                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            err=UNZ_ERRNO;
+
+        /* the signature, already checked */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* number of the disk with the start of the central directory */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+            err=UNZ_ERRNO;
+
+        /* total number of entries in the central dir on this disk */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.gi.number_entry = uL;
+
+        /* total number of entries in the central dir */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        number_entry_CD = uL;
+
+        if ((number_entry_CD!=us.gi.number_entry) ||
+            (number_disk_with_CD!=0) ||
+            (number_disk!=0))
+            err=UNZ_BADZIPFILE;
+
+        /* size of the central directory */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.size_central_dir = uL;
+
+        /* offset of start of central directory with respect to the
+            starting disk number */
+        if (unz64local_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+            err=UNZ_ERRNO;
+        us.offset_central_dir = uL;
+
+        /* zipfile comment length */
+        if (unz64local_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+            err=UNZ_ERRNO;
+    }
 
     if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
         (err==UNZ_OK))
@@ -483,7 +741,7 @@ extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
 
     if (err!=UNZ_OK)
     {
-        ZCLOSE(us.z_filefunc, us.filestream);
+        ZCLOSE64(us.z_filefunc, us.filestream);
         return NULL;
     }
 
@@ -494,36 +752,70 @@ extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
     us.encrypted = 0;
 
 
-    s=(unz_s*)ALLOC(sizeof(unz_s));
-    *s=us;
-    unzGoToFirstFile((unzFile)s);
+    s=(unz64_s*)ALLOC(sizeof(unz64_s));
+    if( s != NULL)
+    {
+        *s=us;
+        unzGoToFirstFile((unzFile)s);
+    }
     return (unzFile)s;
 }
 
 
-extern unzFile ZEXPORT unzOpen (path)
-    const char *path;
+extern unzFile ZEXPORT unzOpen2 (const char *path,
+                                        zlib_filefunc_def* pzlib_filefunc32_def)
 {
-    return unzOpen2(path, NULL);
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 0);
+    }
+    else
+        return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen2_64 (const void *path,
+                                     zlib_filefunc64_def* pzlib_filefunc_def)
+{
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return unzOpenInternal(path, &zlib_filefunc64_32_def_fill, 1);
+    }
+    else
+        return unzOpenInternal(path, NULL, 1);
+}
+
+extern unzFile ZEXPORT unzOpen (const char *path)
+{
+    return unzOpenInternal(path, NULL, 0);
+}
+
+extern unzFile ZEXPORT unzOpen64 (const void *path)
+{
+    return unzOpenInternal(path, NULL, 1);
 }
 
 /*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+  Close a ZipFile opened with unzOpen.
+  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+    these files MUST be closed with unzCloseCurrentFile before call unzClose.
   return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (file)
-    unzFile file;
+extern int ZEXPORT unzClose (unzFile file)
 {
-    unz_s* s;
+    unz64_s* s;
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
 
     if (s->pfile_in_zip_read!=NULL)
         unzCloseCurrentFile(file);
 
-    ZCLOSE(s->z_filefunc, s->filestream);
+    ZCLOSE64(s->z_filefunc, s->filestream);
     TRYFREE(s);
     return UNZ_OK;
 }
@@ -533,28 +825,34 @@ extern int ZEXPORT unzClose (file)
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
   return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
-    unzFile file;
-    unz_global_info *pglobal_info;
+extern int ZEXPORT unzGetGlobalInfo64 (unzFile file, unz_global_info64* pglobal_info)
 {
-    unz_s* s;
+    unz64_s* s;
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     *pglobal_info=s->gi;
     return UNZ_OK;
 }
 
-
+extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info* pglobal_info32)
+{
+    unz64_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz64_s*)file;
+    /* to do : check if number_entry is not truncated */
+    pglobal_info32->number_entry = (uLong)s->gi.number_entry;
+    pglobal_info32->size_comment = s->gi.size_comment;
+    return UNZ_OK;
+}
 /*
    Translate date/time from Dos format to tm_unz (readable more easilty)
 */
-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
-    uLong ulDosDate;
-    tm_unz* ptm;
+local void unz64local_DosDateToTmuDate (ZPOS64_T ulDosDate, tm_unz* ptm)
 {
-    uLong uDate;
-    uDate = (uLong)(ulDosDate>>16);
+    ZPOS64_T uDate;
+    uDate = (ZPOS64_T)(ulDosDate>>16);
     ptm->tm_mday = (uInt)(uDate&0x1f) ;
     ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
     ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
@@ -567,9 +865,9 @@ local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
 /*
   Get Info about the current file in the zipfile, with internal only info
 */
-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-                                                  unz_file_info *pfile_info,
-                                                  unz_file_info_internal
+local int unz64local_GetCurrentFileInfoInternal OF((unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
                                                   *pfile_info_internal,
                                                   char *szFileName,
                                                   uLong fileNameBufferSize,
@@ -578,92 +876,93 @@ local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
                                                   char *szComment,
                                                   uLong commentBufferSize));
 
-local int unzlocal_GetCurrentFileInfoInternal (file,
-                                              pfile_info,
-                                              pfile_info_internal,
-                                              szFileName, fileNameBufferSize,
-                                              extraField, extraFieldBufferSize,
-                                              szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    unz_file_info_internal *pfile_info_internal;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
+local int unz64local_GetCurrentFileInfoInternal (unzFile file,
+                                                  unz_file_info64 *pfile_info,
+                                                  unz_file_info64_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize)
 {
-    unz_s* s;
-    unz_file_info file_info;
-    unz_file_info_internal file_info_internal;
+    unz64_s* s;
+    unz_file_info64 file_info;
+    unz_file_info64_internal file_info_internal;
     int err=UNZ_OK;
     uLong uMagic;
     long lSeek=0;
+    uLong uL;
 
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (ZSEEK(s->z_filefunc, s->filestream,
+    s=(unz64_s*)file;
+    if (ZSEEK64(s->z_filefunc, s->filestream,
               s->pos_in_central_dir+s->byte_before_the_zipfile,
               ZLIB_FILEFUNC_SEEK_SET)!=0)
         err=UNZ_ERRNO;
 
 
     /* we check the magic */
-    if (err==UNZ_OK) {
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
             err=UNZ_ERRNO;
         else if (uMagic!=0x02014b50)
             err=UNZ_BADZIPFILE;
     }
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
+    unz64local_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.compressed_size = uL;
+
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+        err=UNZ_ERRNO;
+    file_info.uncompressed_size = uL;
+
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+                // relative offset of local header
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
         err=UNZ_ERRNO;
+    file_info_internal.offset_curfile = uL;
 
     lSeek+=file_info.size_filename;
     if ((err==UNZ_OK) && (szFileName!=NULL))
@@ -678,35 +977,106 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
             uSizeRead = fileNameBufferSize;
 
         if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+            if (ZREAD64(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
                 err=UNZ_ERRNO;
         lSeek -= uSizeRead;
     }
 
-
+    // Read extrafield
     if ((err==UNZ_OK) && (extraField!=NULL))
     {
-        uLong uSizeRead ;
+        ZPOS64_T uSizeRead ;
         if (file_info.size_file_extra<extraFieldBufferSize)
             uSizeRead = file_info.size_file_extra;
         else
             uSizeRead = extraFieldBufferSize;
 
-        if (lSeek!=0) {
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
                 lSeek=0;
             else
                 err=UNZ_ERRNO;
         }
+
         if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
+            if (ZREAD64(s->z_filefunc, s->filestream,extraField,(uLong)uSizeRead)!=uSizeRead)
                 err=UNZ_ERRNO;
-        lSeek += file_info.size_file_extra - uSizeRead;
+
+        lSeek += file_info.size_file_extra - (uLong)uSizeRead;
     }
     else
-        lSeek+=file_info.size_file_extra;
+        lSeek += file_info.size_file_extra;
 
 
+    if ((err==UNZ_OK) && (file_info.size_file_extra != 0))
+    {
+                                uLong acc = 0;
+
+        // since lSeek now points to after the extra field we need to move back
+        lSeek -= file_info.size_file_extra;
+
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+
+        while(acc < file_info.size_file_extra)
+        {
+            uLong headerId;
+                                                uLong dataSize;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            if (unz64local_getShort(&s->z_filefunc, s->filestream,&dataSize) != UNZ_OK)
+                err=UNZ_ERRNO;
+
+            /* ZIP64 extra fields */
+            if (headerId == 0x0001)
+            {
+                                                        uLong uL;
+
+                                                                if(file_info.uncompressed_size == MAXU32)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+                                                                                        err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.compressed_size == MAXU32)
+                                                                {
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+                                                                                  err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info_internal.offset_curfile == MAXU32)
+                                                                {
+                                                                        /* Relative Header offset */
+                                                                        if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+                                                                if(file_info.disk_num_start == MAXU32)
+                                                                {
+                                                                        /* Disk Start Number */
+                                                                        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
+                                                                                err=UNZ_ERRNO;
+                                                                }
+
+            }
+            else
+            {
+                if (ZSEEK64(s->z_filefunc, s->filestream,dataSize,ZLIB_FILEFUNC_SEEK_CUR)!=0)
+                    err=UNZ_ERRNO;
+            }
+
+            acc += 2 + 2 + dataSize;
+        }
+    }
+
     if ((err==UNZ_OK) && (szComment!=NULL))
     {
         uLong uSizeRead ;
@@ -718,20 +1088,23 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
         else
             uSizeRead = commentBufferSize;
 
-        if (lSeek!=0) {
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+        if (lSeek!=0)
+        {
+            if (ZSEEK64(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
                 lSeek=0;
             else
                 err=UNZ_ERRNO;
         }
+
         if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+            if (ZREAD64(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
                 err=UNZ_ERRNO;
         lSeek+=file_info.size_file_comment - uSizeRead;
     }
     else
         lSeek+=file_info.size_file_comment;
 
+
     if ((err==UNZ_OK) && (pfile_info!=NULL))
         *pfile_info=file_info;
 
@@ -748,41 +1121,70 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
   No preparation of the structure is needed
   return UNZ_OK if there is no problem.
 */
-extern int ZEXPORT unzGetCurrentFileInfo (file,
-                                          pfile_info,
-                                          szFileName, fileNameBufferSize,
-                                          extraField, extraFieldBufferSize,
-                                          szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
+extern int ZEXPORT unzGetCurrentFileInfo64 (unzFile file,
+                                          unz_file_info64 * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
 {
-    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
+    return unz64local_GetCurrentFileInfoInternal(file,pfile_info,NULL,
                                                 szFileName,fileNameBufferSize,
                                                 extraField,extraFieldBufferSize,
                                                 szComment,commentBufferSize);
 }
 
+extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
+                                          unz_file_info * pfile_info,
+                                          char * szFileName, uLong fileNameBufferSize,
+                                          void *extraField, uLong extraFieldBufferSize,
+                                          char* szComment,  uLong commentBufferSize)
+{
+    int err;
+    unz_file_info64 file_info64;
+    err = unz64local_GetCurrentFileInfoInternal(file,&file_info64,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+    if ((err==UNZ_OK) && (pfile_info != NULL))
+    {
+        pfile_info->version = file_info64.version;
+        pfile_info->version_needed = file_info64.version_needed;
+        pfile_info->flag = file_info64.flag;
+        pfile_info->compression_method = file_info64.compression_method;
+        pfile_info->dosDate = file_info64.dosDate;
+        pfile_info->crc = file_info64.crc;
+
+        pfile_info->size_filename = file_info64.size_filename;
+        pfile_info->size_file_extra = file_info64.size_file_extra;
+        pfile_info->size_file_comment = file_info64.size_file_comment;
+
+        pfile_info->disk_num_start = file_info64.disk_num_start;
+        pfile_info->internal_fa = file_info64.internal_fa;
+        pfile_info->external_fa = file_info64.external_fa;
+
+        pfile_info->tmu_date = file_info64.tmu_date,
+
+
+        pfile_info->compressed_size = (uLong)file_info64.compressed_size;
+        pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;
+
+    }
+    return err;
+}
 /*
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
-extern int ZEXPORT unzGoToFirstFile (file)
-    unzFile file;
+extern int ZEXPORT unzGoToFirstFile (unzFile file)
 {
     int err=UNZ_OK;
-    unz_s* s;
+    unz64_s* s;
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     s->pos_in_central_dir=s->offset_central_dir;
     s->num_file=0;
-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+    err=unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
                                              &s->cur_file_info_internal,
                                              NULL,0,NULL,0,NULL,0);
     s->current_file_ok = (err == UNZ_OK);
@@ -794,15 +1196,14 @@ extern int ZEXPORT unzGoToFirstFile (file)
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
-extern int ZEXPORT unzGoToNextFile (file)
-    unzFile file;
+extern int ZEXPORT unzGoToNextFile (unzFile  file)
 {
-    unz_s* s;
+    unz64_s* s;
     int err;
 
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     if (!s->current_file_ok)
         return UNZ_END_OF_LIST_OF_FILE;
     if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
@@ -812,7 +1213,7 @@ extern int ZEXPORT unzGoToNextFile (file)
     s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
             s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
     s->num_file++;
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
                                                &s->cur_file_info_internal,
                                                NULL,0,NULL,0,NULL,0);
     s->current_file_ok = (err == UNZ_OK);
@@ -822,27 +1223,24 @@ extern int ZEXPORT unzGoToNextFile (file)
 
 /*
   Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzipStringFileNameCompare
+  For the iCaseSensitivity signification, see unzStringFileNameCompare
 
   return value :
   UNZ_OK if the file is found. It becomes the current file.
   UNZ_END_OF_LIST_OF_FILE if the file is not found
 */
-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
-    unzFile file;
-    const char *szFileName;
-    int iCaseSensitivity;
+extern int ZEXPORT unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
 {
-    unz_s* s;
+    unz64_s* s;
     int err;
 
     /* We remember the 'current' position in the file so that we can jump
      * back there if we fail.
      */
-    unz_file_info cur_file_infoSaved;
-    unz_file_info_internal cur_file_info_internalSaved;
-    uLong num_fileSaved;
-    uLong pos_in_central_dirSaved;
+    unz_file_info64 cur_file_infoSaved;
+    unz_file_info64_internal cur_file_info_internalSaved;
+    ZPOS64_T num_fileSaved;
+    ZPOS64_T pos_in_central_dirSaved;
 
 
     if (file==NULL)
@@ -851,7 +1249,7 @@ extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
     if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
         return UNZ_PARAMERROR;
 
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     if (!s->current_file_ok)
         return UNZ_END_OF_LIST_OF_FILE;
 
@@ -866,7 +1264,7 @@ extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
     while (err == UNZ_OK)
     {
         char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-        err = unzGetCurrentFileInfo(file,NULL,
+        err = unzGetCurrentFileInfo64(file,NULL,
                                     szCurrentFileName,sizeof(szCurrentFileName)-1,
                                     NULL,0,NULL,0);
         if (err == UNZ_OK)
@@ -902,20 +1300,18 @@ extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
 /*
 typedef struct unz_file_pos_s
 {
-    uLong pos_in_zip_directory;   // offset in file
-    uLong num_of_file;            // # of file
+    ZPOS64_T pos_in_zip_directory;   // offset in file
+    ZPOS64_T num_of_file;            // # of file
 } unz_file_pos;
 */
 
-extern int ZEXPORT unzGetFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
+extern int ZEXPORT unzGetFilePos64(unzFile file, unz64_file_pos*  file_pos)
 {
-    unz_s* s;
+    unz64_s* s;
 
     if (file==NULL || file_pos==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     if (!s->current_file_ok)
         return UNZ_END_OF_LIST_OF_FILE;
 
@@ -925,23 +1321,35 @@ extern int ZEXPORT unzGetFilePos(file, file_pos)
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzGoToFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
 {
-    unz_s* s;
+    unz64_file_pos file_pos64;
+    int err = unzGetFilePos64(file,&file_pos64);
+    if (err==UNZ_OK)
+    {
+        file_pos->pos_in_zip_directory = (uLong)file_pos64.pos_in_zip_directory;
+        file_pos->num_of_file = (uLong)file_pos64.num_of_file;
+    }
+    return err;
+}
+
+extern int ZEXPORT unzGoToFilePos64(unzFile file, const unz64_file_pos* file_pos)
+{
+    unz64_s* s;
     int err;
 
     if (file==NULL || file_pos==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
 
     /* jump to the right spot */
     s->pos_in_central_dir = file_pos->pos_in_zip_directory;
     s->num_file           = file_pos->num_of_file;
 
     /* set the current file */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
                                                &s->cur_file_info_internal,
                                                NULL,0,NULL,0,NULL,0);
     /* return results */
@@ -949,6 +1357,19 @@ extern int ZEXPORT unzGoToFilePos(file, file_pos)
     return err;
 }
 
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos)
+{
+    unz64_file_pos file_pos64;
+    if (file_pos == NULL)
+        return UNZ_PARAMERROR;
+
+    file_pos64.pos_in_zip_directory = file_pos->pos_in_zip_directory;
+    file_pos64.num_of_file = file_pos->num_of_file;
+    return unzGoToFilePos64(file,&file_pos64);
+}
+
 /*
 // Unzip Helper Functions - should be here?
 ///////////////////////////////////////////
@@ -961,13 +1382,9 @@ extern int ZEXPORT unzGoToFilePos(file, file_pos)
   store in *piSizeVar the size of extra info in local header
         (filename and size of extra field data)
 */
-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
-                                                    poffset_local_extrafield,
-                                                    psize_local_extrafield)
-    unz_s* s;
-    uInt* piSizeVar;
-    uLong *poffset_local_extrafield;
-    uInt  *psize_local_extrafield;
+local int unz64local_CheckCurrentFileCoherencyHeader (unz64_s* s, uInt* piSizeVar,
+                                                    ZPOS64_T * poffset_local_extrafield,
+                                                    uInt  * psize_local_extrafield)
 {
     uLong uMagic,uData,uFlags;
     uLong size_filename;
@@ -978,66 +1395,66 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
     *poffset_local_extrafield = 0;
     *psize_local_extrafield = 0;
 
-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+    if (ZSEEK64(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
                                 s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
         return UNZ_ERRNO;
 
 
-    if (err==UNZ_OK) {
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+    if (err==UNZ_OK)
+    {
+        if (unz64local_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
             err=UNZ_ERRNO;
         else if (uMagic!=0x04034b50)
             err=UNZ_BADZIPFILE;
     }
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
         err=UNZ_ERRNO;
 /*
     else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
         err=UNZ_BADZIPFILE;
 */
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
         err=UNZ_ERRNO;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
         err=UNZ_ERRNO;
     else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
         err=UNZ_BADZIPFILE;
 
     if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+                         (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
                          (s->cur_file_info.compression_method!=Z_DEFLATED))
         err=UNZ_BADZIPFILE;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
         err=UNZ_ERRNO;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
         err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-                              ((uFlags & 8)==0))
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) && ((uFlags & 8)==0))
         err=UNZ_BADZIPFILE;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
         err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
-                              ((uFlags & 8)==0))
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) && ((uFlags & 8)==0))
         err=UNZ_BADZIPFILE;
 
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+    if (unz64local_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
         err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
-                              ((uFlags & 8)==0))
+    else if (uData != 0xFFFFFFFF && (err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && ((uFlags & 8)==0))
         err=UNZ_BADZIPFILE;
 
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
         err=UNZ_ERRNO;
     else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
         err=UNZ_BADZIPFILE;
 
     *piSizeVar += (uInt)size_filename;
 
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+    if (unz64local_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
         err=UNZ_ERRNO;
     *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
                                     SIZEZIPLOCALHEADER + size_filename;
@@ -1052,18 +1469,14 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
   Open for reading data the current file in the zipfile.
   If there is no error and the file is opened, the return value is UNZ_OK.
 */
-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-    const char* password;
+extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
+                                            int* level, int raw, const char* password)
 {
     int err=UNZ_OK;
     uInt iSizeVar;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uLong offset_local_extrafield;  /* offset of the local extra field */
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    ZPOS64_T offset_local_extrafield;  /* offset of the local extra field */
     uInt  size_local_extrafield;    /* size of the local extra field */
 #    ifndef NOUNCRYPT
     char source[12];
@@ -1074,19 +1487,17 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
 
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     if (!s->current_file_ok)
         return UNZ_PARAMERROR;
 
     if (s->pfile_in_zip_read != NULL)
         unzCloseCurrentFile(file);
 
-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+    if (unz64local_CheckCurrentFileCoherencyHeader(s,&iSizeVar, &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
         return UNZ_BADZIPFILE;
 
-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
-                                        ALLOC(sizeof(file_in_zip_read_info_s));
+    pfile_in_zip_read_info = (file_in_zip64_read_info_s*)ALLOC(sizeof(file_in_zip64_read_info_s));
     if (pfile_in_zip_read_info==NULL)
         return UNZ_INTERNALERROR;
 
@@ -1119,31 +1530,60 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
     }
 
     if ((s->cur_file_info.compression_method!=0) &&
+/* #ifdef HAVE_BZIP2 */
+        (s->cur_file_info.compression_method!=Z_BZIP2ED) &&
+/* #endif */
         (s->cur_file_info.compression_method!=Z_DEFLATED))
+
         err=UNZ_BADZIPFILE;
 
     pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
     pfile_in_zip_read_info->crc32=0;
-    pfile_in_zip_read_info->compression_method =
-            s->cur_file_info.compression_method;
+    pfile_in_zip_read_info->total_out_64=0;
+    pfile_in_zip_read_info->compression_method = s->cur_file_info.compression_method;
     pfile_in_zip_read_info->filestream=s->filestream;
     pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
     pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
 
     pfile_in_zip_read_info->stream.total_out = 0;
 
-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
-        (!raw))
+    if ((s->cur_file_info.compression_method==Z_BZIP2ED) && (!raw))
     {
+#ifdef HAVE_BZIP2
+      pfile_in_zip_read_info->bstream.bzalloc = (void *(*) (void *, int, int))0;
+      pfile_in_zip_read_info->bstream.bzfree = (free_func)0;
+      pfile_in_zip_read_info->bstream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->bstream.state = (voidpf)0;
+
       pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
       pfile_in_zip_read_info->stream.zfree = (free_func)0;
       pfile_in_zip_read_info->stream.opaque = (voidpf)0;
       pfile_in_zip_read_info->stream.next_in = (voidpf)0;
       pfile_in_zip_read_info->stream.avail_in = 0;
 
+      err=BZ2_bzDecompressInit(&pfile_in_zip_read_info->bstream, 0, 0);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+#else
+      pfile_in_zip_read_info->raw=1;
+#endif
+    }
+    else if ((s->cur_file_info.compression_method==Z_DEFLATED) && (!raw))
+    {
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = 0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
       err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
       if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=1;
+        pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
       else
       {
         TRYFREE(pfile_in_zip_read_info);
@@ -1170,6 +1610,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
     pfile_in_zip_read_info->stream.avail_in = (uInt)0;
 
     s->pfile_in_zip_read = pfile_in_zip_read_info;
+                s->encrypted = 0;
 
 #    ifndef NOUNCRYPT
     if (password != NULL)
@@ -1177,12 +1618,12 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
         int i;
         s->pcrc_32_tab = get_crc_table();
         init_keys(password,s->keys,s->pcrc_32_tab);
-        if (ZSEEK(s->z_filefunc, s->filestream,
+        if (ZSEEK64(s->z_filefunc, s->filestream,
                   s->pfile_in_zip_read->pos_in_zipfile +
                      s->pfile_in_zip_read->byte_before_the_zipfile,
                   SEEK_SET)!=0)
             return UNZ_INTERNALERROR;
-        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
+        if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12)
             return UNZ_INTERNALERROR;
 
         for (i = 0; i<12; i++)
@@ -1197,28 +1638,39 @@ extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
     return UNZ_OK;
 }
 
-extern int ZEXPORT unzOpenCurrentFile (file)
-    unzFile file;
+extern int ZEXPORT unzOpenCurrentFile (unzFile file)
 {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
 }
 
-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
-    unzFile file;
-    const char* password;
+extern int ZEXPORT unzOpenCurrentFilePassword (unzFile file, const char*  password)
 {
     return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
 }
 
-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
+extern int ZEXPORT unzOpenCurrentFile2 (unzFile file, int* method, int* level, int raw)
 {
     return unzOpenCurrentFile3(file, method, level, raw, NULL);
 }
 
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64( unzFile file)
+{
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    s=(unz64_s*)file;
+    if (file==NULL)
+        return 0; //UNZ_PARAMERROR;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+    if (pfile_in_zip_read_info==NULL)
+        return 0; //UNZ_PARAMERROR;
+    return pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile;
+}
+
+/** Addition for GDAL : END */
+
 /*
   Read bytes from the current file.
   buf contain buffer where data must be copied
@@ -1229,25 +1681,22 @@ extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
   return <0 with error code if there is an error
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
+extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
 {
     int err=UNZ_OK;
     uInt iRead = 0;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
     if (pfile_in_zip_read_info==NULL)
         return UNZ_PARAMERROR;
 
 
-    if ((pfile_in_zip_read_info->read_buffer == NULL))
+    if (pfile_in_zip_read_info->read_buffer == NULL)
         return UNZ_END_OF_LIST_OF_FILE;
     if (len==0)
         return 0;
@@ -1278,13 +1727,13 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
                 uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
             if (uReadThis == 0)
                 return UNZ_EOF;
-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+            if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
                       pfile_in_zip_read_info->filestream,
                       pfile_in_zip_read_info->pos_in_zipfile +
                          pfile_in_zip_read_info->byte_before_the_zipfile,
                          ZLIB_FILEFUNC_SEEK_SET)!=0)
                 return UNZ_ERRNO;
-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+            if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
                       pfile_in_zip_read_info->filestream,
                       pfile_in_zip_read_info->read_buffer,
                       uReadThis)!=uReadThis)
@@ -1330,6 +1779,8 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
                 *(pfile_in_zip_read_info->stream.next_out+i) =
                         *(pfile_in_zip_read_info->stream.next_in+i);
 
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uDoCopy;
+
             pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
                                 pfile_in_zip_read_info->stream.next_out,
                                 uDoCopy);
@@ -1341,11 +1792,54 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
             pfile_in_zip_read_info->stream.total_out += uDoCopy;
             iRead += uDoCopy;
         }
-        else
+        else if (pfile_in_zip_read_info->compression_method==Z_BZIP2ED)
         {
+#ifdef HAVE_BZIP2
             uLong uTotalOutBefore,uTotalOutAfter;
             const Bytef *bufBefore;
             uLong uOutThis;
+
+            pfile_in_zip_read_info->bstream.next_in        = (char*)pfile_in_zip_read_info->stream.next_in;
+            pfile_in_zip_read_info->bstream.avail_in       = pfile_in_zip_read_info->stream.avail_in;
+            pfile_in_zip_read_info->bstream.total_in_lo32  = pfile_in_zip_read_info->stream.total_in;
+            pfile_in_zip_read_info->bstream.total_in_hi32  = 0;
+            pfile_in_zip_read_info->bstream.next_out       = (char*)pfile_in_zip_read_info->stream.next_out;
+            pfile_in_zip_read_info->bstream.avail_out      = pfile_in_zip_read_info->stream.avail_out;
+            pfile_in_zip_read_info->bstream.total_out_lo32 = pfile_in_zip_read_info->stream.total_out;
+            pfile_in_zip_read_info->bstream.total_out_hi32 = 0;
+
+            uTotalOutBefore = pfile_in_zip_read_info->bstream.total_out_lo32;
+            bufBefore = (const Bytef *)pfile_in_zip_read_info->bstream.next_out;
+
+            err=BZ2_bzDecompress(&pfile_in_zip_read_info->bstream);
+
+            uTotalOutAfter = pfile_in_zip_read_info->bstream.total_out_lo32;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,bufBefore, (uInt)(uOutThis));
+            pfile_in_zip_read_info->rest_read_uncompressed -= uOutThis;
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            pfile_in_zip_read_info->stream.next_in   = (Bytef*)pfile_in_zip_read_info->bstream.next_in;
+            pfile_in_zip_read_info->stream.avail_in  = pfile_in_zip_read_info->bstream.avail_in;
+            pfile_in_zip_read_info->stream.total_in  = pfile_in_zip_read_info->bstream.total_in_lo32;
+            pfile_in_zip_read_info->stream.next_out  = (Bytef*)pfile_in_zip_read_info->bstream.next_out;
+            pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out;
+            pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32;
+
+            if (err==BZ_STREAM_END)
+              return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=BZ_OK)
+              break;
+#endif
+        } // end Z_BZIP2ED
+        else
+        {
+            ZPOS64_T uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            ZPOS64_T uOutThis;
             int flush=Z_SYNC_FLUSH;
 
             uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
@@ -1365,6 +1859,8 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
             uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
             uOutThis = uTotalOutAfter-uTotalOutBefore;
 
+            pfile_in_zip_read_info->total_out_64 = pfile_in_zip_read_info->total_out_64 + uOutThis;
+
             pfile_in_zip_read_info->crc32 =
                 crc32(pfile_in_zip_read_info->crc32,bufBefore,
                         (uInt)(uOutThis));
@@ -1390,14 +1886,13 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
 /*
   Give the current position in uncompressed data
 */
-extern z_off_t ZEXPORT unztell (file)
-    unzFile file;
+extern z_off_t ZEXPORT unztell (unzFile file)
 {
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
     if (pfile_in_zip_read_info==NULL)
@@ -1406,18 +1901,33 @@ extern z_off_t ZEXPORT unztell (file)
     return (z_off_t)pfile_in_zip_read_info->stream.total_out;
 }
 
+extern ZPOS64_T ZEXPORT unztell64 (unzFile file)
+{
+
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return (ZPOS64_T)-1;
+    s=(unz64_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return (ZPOS64_T)-1;
+
+    return pfile_in_zip_read_info->total_out_64;
+}
+
 
 /*
   return 1 if the end of file was reached, 0 elsewhere
 */
-extern int ZEXPORT unzeof (file)
-    unzFile file;
+extern int ZEXPORT unzeof (unzFile file)
 {
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
     if (pfile_in_zip_read_info==NULL)
@@ -1432,9 +1942,9 @@ extern int ZEXPORT unzeof (file)
 
 
 /*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
+Read extra field from the current file (opened by unzOpenCurrentFile)
+This is the local-header version of the extra field (sometimes, there is
+more info in the local-header version than in the central-header)
 
   if buf==NULL, it return the size of the local extra field that can be read
 
@@ -1443,19 +1953,16 @@ extern int ZEXPORT unzeof (file)
   the return value is the number of bytes copied in buf, or (if <0)
     the error code
 */
-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
+extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len)
 {
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
     uInt read_now;
-    uLong size_to_read;
+    ZPOS64_T size_to_read;
 
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
     if (pfile_in_zip_read_info==NULL)
@@ -1475,14 +1982,14 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
     if (read_now==0)
         return 0;
 
-    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+    if (ZSEEK64(pfile_in_zip_read_info->z_filefunc,
               pfile_in_zip_read_info->filestream,
               pfile_in_zip_read_info->offset_local_extrafield +
               pfile_in_zip_read_info->pos_local_extrafield,
               ZLIB_FILEFUNC_SEEK_SET)!=0)
         return UNZ_ERRNO;
 
-    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+    if (ZREAD64(pfile_in_zip_read_info->z_filefunc,
               pfile_in_zip_read_info->filestream,
               buf,read_now)!=read_now)
         return UNZ_ERRNO;
@@ -1491,19 +1998,18 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
 }
 
 /*
-  Close the file in zip opened with unzipOpenCurrentFile
+  Close the file in zip opened with unzOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
-extern int ZEXPORT unzCloseCurrentFile (file)
-    unzFile file;
+extern int ZEXPORT unzCloseCurrentFile (unzFile file)
 {
     int err=UNZ_OK;
 
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    unz64_s* s;
+    file_in_zip64_read_info_s* pfile_in_zip_read_info;
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
     if (pfile_in_zip_read_info==NULL)
@@ -1520,8 +2026,13 @@ extern int ZEXPORT unzCloseCurrentFile (file)
 
     TRYFREE(pfile_in_zip_read_info->read_buffer);
     pfile_in_zip_read_info->read_buffer = NULL;
-    if (pfile_in_zip_read_info->stream_initialised)
+    if (pfile_in_zip_read_info->stream_initialised == Z_DEFLATED)
         inflateEnd(&pfile_in_zip_read_info->stream);
+#ifdef HAVE_BZIP2
+    else if (pfile_in_zip_read_info->stream_initialised == Z_BZIP2ED)
+        BZ2_bzDecompressEnd(&pfile_in_zip_read_info->bstream);
+#endif
+
 
     pfile_in_zip_read_info->stream_initialised = 0;
     TRYFREE(pfile_in_zip_read_info);
@@ -1537,29 +2048,25 @@ extern int ZEXPORT unzCloseCurrentFile (file)
   uSizeBuf is the size of the szComment buffer.
   return the number of byte copied or an error code <0
 */
-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
-    unzFile file;
-    char *szComment;
-    uLong uSizeBuf;
+extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uSizeBuf)
 {
-    //int err=UNZ_OK;
-    unz_s* s;
+    unz64_s* s;
     uLong uReadThis ;
     if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+        return (int)UNZ_PARAMERROR;
+    s=(unz64_s*)file;
 
     uReadThis = uSizeBuf;
     if (uReadThis>s->gi.size_comment)
         uReadThis = s->gi.size_comment;
 
-    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    if (ZSEEK64(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
         return UNZ_ERRNO;
 
     if (uReadThis>0)
     {
       *szComment='\0';
-      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
+      if (ZREAD64(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
         return UNZ_ERRNO;
     }
 
@@ -1569,14 +2076,13 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
 }
 
 /* Additions by RX '2004 */
-extern uLong ZEXPORT unzGetOffset (file)
-    unzFile file;
+extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file)
 {
-    unz_s* s;
+    unz64_s* s;
 
     if (file==NULL)
-          return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+          return 0; //UNZ_PARAMERROR;
+    s=(unz64_s*)file;
     if (!s->current_file_ok)
       return 0;
     if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
@@ -1585,22 +2091,35 @@ extern uLong ZEXPORT unzGetOffset (file)
     return s->pos_in_central_dir;
 }
 
-extern int ZEXPORT unzSetOffset (file, pos)
-        unzFile file;
-        uLong pos;
+extern uLong ZEXPORT unzGetOffset (unzFile file)
 {
-    unz_s* s;
+    ZPOS64_T offset64;
+
+    if (file==NULL)
+          return 0; //UNZ_PARAMERROR;
+    offset64 = unzGetOffset64(file);
+    return (uLong)offset64;
+}
+
+extern int ZEXPORT unzSetOffset64(unzFile file, ZPOS64_T pos)
+{
+    unz64_s* s;
     int err;
 
     if (file==NULL)
         return UNZ_PARAMERROR;
-    s=(unz_s*)file;
+    s=(unz64_s*)file;
 
     s->pos_in_central_dir = pos;
     s->num_file = s->gi.number_entry;      /* hack */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+    err = unz64local_GetCurrentFileInfoInternal(file,&s->cur_file_info,
                                               &s->cur_file_info_internal,
                                               NULL,0,NULL,0,NULL,0);
     s->current_file_ok = (err == UNZ_OK);
     return err;
 }
+
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos)
+{
+    return unzSetOffset64(file,pos);
+}
diff --git a/Source/3rd Party/zlib/contrib/minizip/unzip.h b/Source/3rd Party/zlib/contrib/minizip/unzip.h
index 0ebef0e2d..e563428f8 100644
--- a/Source/3rd Party/zlib/contrib/minizip/unzip.h	
+++ b/Source/3rd Party/zlib/contrib/minizip/unzip.h	
@@ -1,20 +1,20 @@
 /* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Copyright (C) 1998-2005 Gilles Vollant
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
 
-   Multi volume ZipFile (span) are not supported.
-   Encryption compatible with pkzip 2.04g only supported
-   Old compressions used by old PKZip 1.x are not supported
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
+         For more info read MiniZip_info.txt
 
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
+         ---------------------------------------------------------------------------------
 
-   Condition of use and distribution are the same than zlib :
+        Condition of use and distribution are the same than zlib :
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -32,33 +32,35 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
+  ---------------------------------------------------------------------------------
+
+        Changes
+
+        See header of unzip64.c
 
 */
 
-/* for more info about .ZIP format, see
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
-      http://www.info-zip.org/pub/infozip/doc/
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _unz_H
-#define _unz_H
+#ifndef _unz64_H
+#define _unz64_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
+#ifndef _ZLIB_H
 #include "../../zlib.h"
 #endif
 
-#ifndef _ZLIBIOAPI_H
+#ifndef  _ZLIBIOAPI_H
 #include "ioapi.h"
 #endif
 
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
     from (void*) without cast */
@@ -91,15 +93,42 @@ typedef struct tm_unz_s
 
 /* unz_global_info structure contain global data about the ZIPfile
    These data comes from the end of central dir */
+typedef struct unz_global_info64_s
+{
+    ZPOS64_T number_entry;         /* total number of entries in
+                                     the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info64;
+
 typedef struct unz_global_info_s
 {
     uLong number_entry;         /* total number of entries in
-                       the central dir on this disk */
+                                     the central dir on this disk */
     uLong size_comment;         /* size of the global comment of the zipfile */
 } unz_global_info;
 
-
 /* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_info64_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
+    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info64;
+
 typedef struct unz_file_info_s
 {
     uLong version;              /* version made by                 2 bytes */
@@ -135,6 +164,7 @@ extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
 
 
 extern unzFile ZEXPORT unzOpen OF((const char *path));
+extern unzFile ZEXPORT unzOpen64 OF((const void *path));
 /*
   Open a Zip file. path contain the full pathname (by example,
      on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
@@ -143,8 +173,14 @@ extern unzFile ZEXPORT unzOpen OF((const char *path));
        return value is NULL.
      Else, the return value is a unzFile Handle, usable with other function
        of this unzip package.
+     the "64" function take a const void* pointer, because the path is just the
+       value passed to the open64_file_func callback.
+     Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path
+       is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char*
+       does not describe the reality
 */
 
+
 extern unzFile ZEXPORT unzOpen2 OF((const char *path,
                                     zlib_filefunc_def* pzlib_filefunc_def));
 /*
@@ -152,15 +188,25 @@ extern unzFile ZEXPORT unzOpen2 OF((const char *path,
       for read/write the zip file (see ioapi.h)
 */
 
+extern unzFile ZEXPORT unzOpen2_64 OF((const void *path,
+                                    zlib_filefunc64_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unz64Open, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
 extern int ZEXPORT unzClose OF((unzFile file));
 /*
-  Close a ZipFile opened with unzipOpen.
+  Close a ZipFile opened with unzOpen.
   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+    these files MUST be closed with unzCloseCurrentFile before call unzClose.
   return UNZ_OK if there is no problem. */
 
 extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
                                         unz_global_info *pglobal_info));
+
+extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file,
+                                        unz_global_info64 *pglobal_info));
 /*
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
@@ -223,8 +269,31 @@ extern int ZEXPORT unzGoToFilePos(
     unzFile file,
     unz_file_pos* file_pos);
 
+typedef struct unz64_file_pos_s
+{
+    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
+    ZPOS64_T num_of_file;            /* # of file */
+} unz64_file_pos;
+
+extern int ZEXPORT unzGetFilePos64(
+    unzFile file,
+    unz64_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos64(
+    unzFile file,
+    const unz64_file_pos* file_pos);
+
 /* ****************************************** */
 
+extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file,
+                         unz_file_info64 *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+
 extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
                          unz_file_info *pfile_info,
                          char *szFileName,
@@ -246,6 +315,14 @@ extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
             (commentBufferSize is the size of the buffer)
 */
 
+
+/** Addition for GDAL : START */
+
+extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
+
+/** Addition for GDAL : END */
+
+
 /***************************************************************************/
 /* for reading the content of the current zipfile, you can open it, read data
    from it, and close it (you can close it before reading all the file)
@@ -314,6 +391,8 @@ extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
 */
 
 extern z_off_t ZEXPORT unztell OF((unzFile file));
+
+extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
 /*
   Give the current position in uncompressed data
 */
@@ -342,9 +421,11 @@ extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
 /***************************************************************************/
 
 /* Get the current file offset */
+extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file);
 extern uLong ZEXPORT unzGetOffset (unzFile file);
 
 /* Set the current file offset */
+extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos);
 extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
 
 
@@ -353,4 +434,4 @@ extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
 }
 #endif
 
-#endif /* _unz_H */
+#endif /* _unz64_H */
diff --git a/Source/3rd Party/zlib/contrib/minizip/zip.c b/Source/3rd Party/zlib/contrib/minizip/zip.c
index ea2ac6fc1..68a4b2b48 100644
--- a/Source/3rd Party/zlib/contrib/minizip/zip.c	
+++ b/Source/3rd Party/zlib/contrib/minizip/zip.c	
@@ -1,12 +1,24 @@
 /* zip.c -- IO on .zip files using zlib
-   Version 1.01e, February 12th, 2005
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   27 Dec 2004 Rolf Kalbermatter
-   Modification to zipOpen2 to support globalComment retrieval.
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Copyright (C) 1998-2005 Gilles Vollant
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+         For more info read MiniZip_info.txt
+
+         Changes
+   Oct-2009 - Mathias Svensson - Remove old C style function prototypes
+   Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
+   Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
+   Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
+                                 It is used when recreting zip archive with RAW when deleting items from a zip.
+                                 ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
+   Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
+   Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
 
-   Read zip.h for more info
 */
 
 
@@ -14,11 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
 #include "../../zlib.h"
-#endif
 #include "zip.h"
 
 #ifdef STDC
@@ -43,7 +51,7 @@
 #endif
 
 #ifndef Z_BUFSIZE
-#define Z_BUFSIZE (16384)
+#define Z_BUFSIZE (64*1024) //(16384)
 #endif
 
 #ifndef Z_MAXFILENAMEINZIP
@@ -64,6 +72,10 @@
 
 /* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
 
+
+// NOT sure that this work on ALL platform
+#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
+
 #ifndef SEEK_CUR
 #define SEEK_CUR    1
 #endif
@@ -83,8 +95,7 @@
 #  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
 #endif
 #endif
-const char zip_copyright[] =
-   " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
 
 
 #define SIZEDATA_INDATABLOCK (4096-(4*4))
@@ -92,6 +103,8 @@ const char zip_copyright[] =
 #define LOCALHEADERMAGIC    (0x04034b50)
 #define CENTRALHEADERMAGIC  (0x02014b50)
 #define ENDHEADERMAGIC      (0x06054b50)
+#define ZIP64ENDHEADERMAGIC      (0x6064b50)
+#define ZIP64ENDLOCHEADERMAGIC   (0x7064b50)
 
 #define FLAG_LOCALHEADER_OFFSET (0x06)
 #define CRC_LOCALHEADER_OFFSET  (0x0e)
@@ -117,13 +130,19 @@ typedef struct linkedlist_data_s
 typedef struct
 {
     z_stream stream;            /* zLib stream structure for inflate */
+#ifdef HAVE_BZIP2
+    bz_stream bstream;          /* bzLib stream structure for bziped */
+#endif
+
     int  stream_initialised;    /* 1 is stream is initialised */
     uInt pos_in_buffered_data;  /* last written byte in buffered_data */
 
-    uLong pos_local_header;     /* offset of the local header of the file
+    ZPOS64_T pos_local_header;     /* offset of the local header of the file
                                      currenty writing */
     char* central_header;       /* central header data for the current file */
+    uLong size_centralExtra;
     uLong size_centralheader;   /* size of the central header for cur file */
+    uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
     uLong flag;                 /* flag of the file currently writing */
 
     int  method;                /* compression method of file currenty wr.*/
@@ -132,29 +151,34 @@ typedef struct
     uLong dosDate;
     uLong crc32;
     int  encrypt;
+    int  zip64;               /* Add ZIP64 extened information in the extra field */
+    ZPOS64_T pos_zip64extrainfo;
+    ZPOS64_T totalCompressedData;
+    ZPOS64_T totalUncompressedData;
 #ifndef NOCRYPT
     unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const unsigned long* pcrc_32_tab;
+    const z_crc_t* pcrc_32_tab;
     int crypt_header_size;
 #endif
-} curfile_info;
+} curfile64_info;
 
 typedef struct
 {
-    zlib_filefunc_def z_filefunc;
+    zlib_filefunc64_32_def z_filefunc;
     voidpf filestream;        /* io structore of the zipfile */
     linkedlist_data central_dir;/* datablock with central dir in construction*/
     int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
-    curfile_info ci;            /* info on the file curretly writing */
+    curfile64_info ci;            /* info on the file curretly writing */
+
+    ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
+    ZPOS64_T add_position_when_writting_offset;
+    ZPOS64_T number_entry;
 
-    uLong begin_pos;            /* position of the beginning of the zipfile */
-    uLong add_position_when_writting_offset;
-    uLong number_entry;
 #ifndef NO_ADDFILEINEXISTINGZIP
     char *globalcomment;
 #endif
-} zip_internal;
 
+} zip64_internal;
 
 
 #ifndef NOCRYPT
@@ -176,8 +200,7 @@ local linkedlist_datablock_internal* allocate_new_datablock()
     return ldi;
 }
 
-local void free_datablock(ldi)
-    linkedlist_datablock_internal* ldi;
+local void free_datablock(linkedlist_datablock_internal* ldi)
 {
     while (ldi!=NULL)
     {
@@ -187,24 +210,19 @@ local void free_datablock(ldi)
     }
 }
 
-local void init_linkedlist(ll)
-    linkedlist_data* ll;
+local void init_linkedlist(linkedlist_data* ll)
 {
     ll->first_block = ll->last_block = NULL;
 }
 
-local void free_linkedlist(ll)
-    linkedlist_data* ll;
+local void free_linkedlist(linkedlist_data* ll)
 {
     free_datablock(ll->first_block);
     ll->first_block = ll->last_block = NULL;
 }
 
 
-local int add_data_in_datablock(ll,buf,len)
-    linkedlist_data* ll;
-    const void* buf;
-    uLong len;
+local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
 {
     linkedlist_datablock_internal* ldi;
     const unsigned char* from_copy;
@@ -262,18 +280,13 @@ local int add_data_in_datablock(ll,buf,len)
 #ifndef NO_ADDFILEINEXISTINGZIP
 /* ===========================================================================
    Inputs a long in LSB order to the given file
-   nbByte == 1, 2 or 4 (byte, short or long)
+   nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
 */
 
-local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
-                                voidpf filestream, uLong x, int nbByte));
-local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong x;
-    int nbByte;
+local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
+local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
 {
-    unsigned char buf[4];
+    unsigned char buf[8];
     int n;
     for (n = 0; n < nbByte; n++)
     {
@@ -288,17 +301,14 @@ local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
         }
       }
 
-    if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
+    if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
         return ZIP_ERRNO;
     else
         return ZIP_OK;
 }
 
-local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
-local void ziplocal_putValue_inmemory (dest, x, nbByte)
-    void* dest;
-    uLong x;
-    int nbByte;
+local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
+local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
 {
     unsigned char* buf=(unsigned char*)dest;
     int n;
@@ -319,14 +329,12 @@ local void ziplocal_putValue_inmemory (dest, x, nbByte)
 /****************************************************************************/
 
 
-local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
-    const tm_zip* ptm;
-    uLong dosDate;
+local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
 {
     uLong year = (uLong)ptm->tm_year;
-    if (year>1980)
+    if (year>=1980)
         year-=1980;
-    else if (year>80)
+    else if (year>=80)
         year-=80;
     return
       (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
@@ -336,18 +344,12 @@ local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
 
 /****************************************************************************/
 
-local int ziplocal_getByte OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    int *pi));
+local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
 
-local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
+local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
 {
     unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
+    int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
     if (err==1)
     {
         *pi = (int)c;
@@ -355,7 +357,7 @@ local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
     }
     else
     {
-        if (ZERROR(*pzlib_filefunc_def,filestream))
+        if (ZERROR64(*pzlib_filefunc_def,filestream))
             return ZIP_ERRNO;
         else
             return ZIP_EOF;
@@ -366,25 +368,19 @@ local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
 /* ===========================================================================
    Reads a long in LSB order from the given gz_stream. Sets
 */
-local int ziplocal_getShort OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
+local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
 
-local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
 {
     uLong x ;
-    int i;
+    int i = 0;
     int err;
 
-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
     x = (uLong)i;
 
     if (err==ZIP_OK)
-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<8;
 
     if (err==ZIP_OK)
@@ -394,33 +390,27 @@ local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)
     return err;
 }
 
-local int ziplocal_getLong OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
+local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
 
-local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
+local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
 {
     uLong x ;
-    int i;
+    int i = 0;
     int err;
 
-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
     x = (uLong)i;
 
     if (err==ZIP_OK)
-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<8;
 
     if (err==ZIP_OK)
-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<16;
 
     if (err==ZIP_OK)
-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
+        err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<24;
 
     if (err==ZIP_OK)
@@ -430,6 +420,54 @@ local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
     return err;
 }
 
+local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
+
+
+local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
+{
+  ZPOS64_T x;
+  int i = 0;
+  int err;
+
+  err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x = (ZPOS64_T)i;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<8;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<16;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<24;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<32;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<40;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<48;
+
+  if (err==ZIP_OK)
+    err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+  x += ((ZPOS64_T)i)<<56;
+
+  if (err==ZIP_OK)
+    *pX = x;
+  else
+    *pX = 0;
+
+  return err;
+}
+
 #ifndef BUFREADCOMMENT
 #define BUFREADCOMMENT (0x400)
 #endif
@@ -437,87 +475,391 @@ local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
   Locate the Central directory of a zipfile (at the end, just before
     the global comment)
 */
-local uLong ziplocal_SearchCentralDir OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream));
+local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
 
-local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
+local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
 {
-    unsigned char* buf;
-    uLong uSizeFile;
-    uLong uBackRead;
-    uLong uMaxBack=0xffff; /* maximum size of global comment */
-    uLong uPosFound=0;
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
 
-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
 
 
-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
 
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
 
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
 
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize,uReadPos ;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos ;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
 
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
 
-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
 
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
+    for (i=(int)uReadSize-3; (i--)>0;)
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+        ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
 
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    return uPosFound;
+      if (uPosFound!=0)
+        break;
+  }
+  TRYFREE(buf);
+  return uPosFound;
 }
+
+/*
+Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
+the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+  unsigned char* buf;
+  ZPOS64_T uSizeFile;
+  ZPOS64_T uBackRead;
+  ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+  ZPOS64_T uPosFound=0;
+  uLong uL;
+  ZPOS64_T relativeOffset;
+
+  if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+    return 0;
+
+  uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+  if (uMaxBack>uSizeFile)
+    uMaxBack = uSizeFile;
+
+  buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+  if (buf==NULL)
+    return 0;
+
+  uBackRead = 4;
+  while (uBackRead<uMaxBack)
+  {
+    uLong uReadSize;
+    ZPOS64_T uReadPos;
+    int i;
+    if (uBackRead+BUFREADCOMMENT>uMaxBack)
+      uBackRead = uMaxBack;
+    else
+      uBackRead+=BUFREADCOMMENT;
+    uReadPos = uSizeFile-uBackRead ;
+
+    uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+      (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+    if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      break;
+
+    if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+      break;
+
+    for (i=(int)uReadSize-3; (i--)>0;)
+    {
+      // Signature "0x07064b50" Zip64 end of central directory locater
+      if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+      {
+        uPosFound = uReadPos+i;
+        break;
+      }
+    }
+
+      if (uPosFound!=0)
+        break;
+  }
+
+  TRYFREE(buf);
+  if (uPosFound == 0)
+    return 0;
+
+  /* Zip64 end of central directory locator */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature, already checked */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  /* number of the disk with the start of the zip64 end of  central directory */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 0)
+    return 0;
+
+  /* relative offset of the zip64 end of central directory record */
+  if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
+    return 0;
+
+  /* total number of disks */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+  if (uL != 1)
+    return 0;
+
+  /* Goto Zip64 end of central directory record */
+  if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+    return 0;
+
+  /* the signature */
+  if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+    return 0;
+
+  if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
+    return 0;
+
+  return relativeOffset;
+}
+
+int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+{
+  int err=ZIP_OK;
+  ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+
+  ZPOS64_T size_central_dir;     /* size of the central directory  */
+  ZPOS64_T offset_central_dir;   /* offset of start of central directory */
+  ZPOS64_T central_pos;
+  uLong uL;
+
+  uLong number_disk;          /* number of the current dist, used for
+                              spaning ZIP, unsupported, always 0*/
+  uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                              for spaning ZIP, unsupported, always 0*/
+  ZPOS64_T number_entry;
+  ZPOS64_T number_entry_CD;      /* total number of entries in
+                                the central dir
+                                (same than number_entry on nospan) */
+  uLong VersionMadeBy;
+  uLong VersionNeeded;
+  uLong size_comment;
+
+  int hasZIP64Record = 0;
+
+  // check first if we find a ZIP64 record
+  central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
+  if(central_pos > 0)
+  {
+    hasZIP64Record = 1;
+  }
+  else if(central_pos == 0)
+  {
+    central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
+  }
+
+/* disable to allow appending to empty ZIP archive
+        if (central_pos==0)
+            err=ZIP_ERRNO;
+*/
+
+  if(hasZIP64Record)
+  {
+    ZPOS64_T sizeEndOfCentralDirectory;
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* size of zip64 end of central directory record */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version made by */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* version needed to extract */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory on this disk */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* offset of start of central directory with respect to the
+    starting disk number */
+    if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    // TODO..
+    // read the comment from the standard central header.
+    size_comment = 0;
+  }
+  else
+  {
+    // Read End of central Directory info
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+      err=ZIP_ERRNO;
+
+    /* the signature, already checked */
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of this disk */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+      err=ZIP_ERRNO;
+
+    /* total number of entries in the central dir on this disk */
+    number_entry = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry = uL;
+
+    /* total number of entries in the central dir */
+    number_entry_CD = 0;
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      number_entry_CD = uL;
+
+    if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+      err=ZIP_BADZIPFILE;
+
+    /* size of the central directory */
+    size_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      size_central_dir = uL;
+
+    /* offset of start of central directory with respect to the starting disk number */
+    offset_central_dir = 0;
+    if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+      err=ZIP_ERRNO;
+    else
+      offset_central_dir = uL;
+
+
+    /* zipfile global comment length */
+    if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
+      err=ZIP_ERRNO;
+  }
+
+  if ((central_pos<offset_central_dir+size_central_dir) &&
+    (err==ZIP_OK))
+    err=ZIP_BADZIPFILE;
+
+  if (err!=ZIP_OK)
+  {
+    ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
+    return ZIP_ERRNO;
+  }
+
+  if (size_comment>0)
+  {
+    pziinit->globalcomment = (char*)ALLOC(size_comment+1);
+    if (pziinit->globalcomment)
+    {
+      size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
+      pziinit->globalcomment[size_comment]=0;
+    }
+  }
+
+  byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
+  pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
+
+  {
+    ZPOS64_T size_central_dir_to_read = size_central_dir;
+    size_t buf_size = SIZEDATA_INDATABLOCK;
+    void* buf_read = (void*)ALLOC(buf_size);
+    if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
+      err=ZIP_ERRNO;
+
+    while ((size_central_dir_to_read>0) && (err==ZIP_OK))
+    {
+      ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
+      if (read_this > size_central_dir_to_read)
+        read_this = size_central_dir_to_read;
+
+      if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
+        err=ZIP_ERRNO;
+
+      if (err==ZIP_OK)
+        err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
+
+      size_central_dir_to_read-=read_this;
+    }
+    TRYFREE(buf_read);
+  }
+  pziinit->begin_pos = byte_before_the_zipfile;
+  pziinit->number_entry = number_entry_CD;
+
+  if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
+    err=ZIP_ERRNO;
+
+  return err;
+}
+
+
 #endif /* !NO_ADDFILEINEXISTINGZIP*/
 
+
 /************************************************************/
-extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)
-    const char *pathname;
-    int append;
-    zipcharpc* globalcomment;
-    zlib_filefunc_def* pzlib_filefunc_def;
+extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
 {
-    zip_internal ziinit;
-    zip_internal* zi;
+    zip64_internal ziinit;
+    zip64_internal* zi;
     int err=ZIP_OK;
 
-
-    if (pzlib_filefunc_def==NULL)
-        fill_fopen_filefunc(&ziinit.z_filefunc);
+    ziinit.z_filefunc.zseek32_file = NULL;
+    ziinit.z_filefunc.ztell32_file = NULL;
+    if (pzlib_filefunc64_32_def==NULL)
+        fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
     else
-        ziinit.z_filefunc = *pzlib_filefunc_def;
+        ziinit.z_filefunc = *pzlib_filefunc64_32_def;
 
-    ziinit.filestream = (*(ziinit.z_filefunc.zopen_file))
-                 (ziinit.z_filefunc.opaque,
+    ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
                   pathname,
                   (append == APPEND_STATUS_CREATE) ?
                   (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
@@ -525,7 +867,11 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
 
     if (ziinit.filestream == NULL)
         return NULL;
-    ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream);
+
+    if (append == APPEND_STATUS_CREATEAFTER)
+        ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
+
+    ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
     ziinit.in_opened_file_inzip = 0;
     ziinit.ci.stream_initialised = 0;
     ziinit.number_entry = 0;
@@ -533,10 +879,11 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
     init_linkedlist(&(ziinit.central_dir));
 
 
-    zi = (zip_internal*)ALLOC(sizeof(zip_internal));
+
+    zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
     if (zi==NULL)
     {
-        ZCLOSE(ziinit.z_filefunc,ziinit.filestream);
+        ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
         return NULL;
     }
 
@@ -545,122 +892,8 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
     ziinit.globalcomment = NULL;
     if (append == APPEND_STATUS_ADDINZIP)
     {
-        uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-
-        uLong size_central_dir;     /* size of the central directory  */
-        uLong offset_central_dir;   /* offset of start of central directory */
-        uLong central_pos,uL;
-
-        uLong number_disk;          /* number of the current dist, used for
-                                    spaning ZIP, unsupported, always 0*/
-        uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                    for spaning ZIP, unsupported, always 0*/
-        uLong number_entry;
-        uLong number_entry_CD;      /* total number of entries in
-                                    the central dir
-                                    (same than number_entry on nospan) */
-        uLong size_comment;
-
-        central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream);
-        if (central_pos==0)
-            err=ZIP_ERRNO;
-
-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
-                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err=ZIP_ERRNO;
-
-        /* the signature, already checked */
-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* number of this disk */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* number of the disk with the start of the central directory */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* total number of entries in the central dir on this disk */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* total number of entries in the central dir */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        if ((number_entry_CD!=number_entry) ||
-            (number_disk_with_CD!=0) ||
-            (number_disk!=0))
-            err=ZIP_BADZIPFILE;
-
-        /* size of the central directory */
-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* offset of start of central directory with respect to the
-            starting disk number */
-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        /* zipfile global comment length */
-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)
-            err=ZIP_ERRNO;
-
-        if ((central_pos<offset_central_dir+size_central_dir) &&
-            (err==ZIP_OK))
-            err=ZIP_BADZIPFILE;
-
-        if (err!=ZIP_OK)
-        {
-            ZCLOSE(ziinit.z_filefunc, ziinit.filestream);
-            return NULL;
-        }
-
-        if (size_comment>0)
-        {
-            ziinit.globalcomment = ALLOC(size_comment+1);
-            if (ziinit.globalcomment)
-            {
-               size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);
-               ziinit.globalcomment[size_comment]=0;
-            }
-        }
-
-        byte_before_the_zipfile = central_pos -
-                                (offset_central_dir+size_central_dir);
-        ziinit.add_position_when_writting_offset = byte_before_the_zipfile;
-
-        {
-            uLong size_central_dir_to_read = size_central_dir;
-            size_t buf_size = SIZEDATA_INDATABLOCK;
-            void* buf_read = (void*)ALLOC(buf_size);
-            if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
-                  offset_central_dir + byte_before_the_zipfile,
-                  ZLIB_FILEFUNC_SEEK_SET) != 0)
-                  err=ZIP_ERRNO;
-
-            while ((size_central_dir_to_read>0) && (err==ZIP_OK))
-            {
-                uLong read_this = SIZEDATA_INDATABLOCK;
-                if (read_this > size_central_dir_to_read)
-                    read_this = size_central_dir_to_read;
-                if (ZREAD(ziinit.z_filefunc, ziinit.filestream,buf_read,read_this) != read_this)
-                    err=ZIP_ERRNO;
-
-                if (err==ZIP_OK)
-                    err = add_data_in_datablock(&ziinit.central_dir,buf_read,
-                                                (uLong)read_this);
-                size_central_dir_to_read-=read_this;
-            }
-            TRYFREE(buf_read);
-        }
-        ziinit.begin_pos = byte_before_the_zipfile;
-        ziinit.number_entry = number_entry_CD;
-
-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
-                  offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            err=ZIP_ERRNO;
+      // Read and Cache Central Directory Records
+      err = LoadCentralDirectoryRecord(&ziinit);
     }
 
     if (globalcomment)
@@ -684,53 +917,173 @@ extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc
     }
 }
 
-extern zipFile ZEXPORT zipOpen (pathname, append)
-    const char *pathname;
-    int append;
+extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
 {
-    return zipOpen2(pathname,append,NULL,NULL);
+    if (pzlib_filefunc32_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
 }
 
-extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
-                                         extrafield_local, size_extrafield_local,
-                                         extrafield_global, size_extrafield_global,
-                                         comment, method, level, raw,
-                                         windowBits, memLevel, strategy,
-                                         password, crcForCrypting)
-    zipFile file;
-    const char* filename;
-    const zip_fileinfo* zipfi;
-    const void* extrafield_local;
-    uInt size_extrafield_local;
-    const void* extrafield_global;
-    uInt size_extrafield_global;
-    const char* comment;
-    int method;
-    int level;
-    int raw;
-    int windowBits;
-    int memLevel;
-    int strategy;
-    const char* password;
-    uLong crcForCrypting;
+extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
 {
-    zip_internal* zi;
+    if (pzlib_filefunc_def != NULL)
+    {
+        zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+        zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+        zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+        zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+        return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+    }
+    else
+        return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+
+
+extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
+{
+    return zipOpen3((const void*)pathname,append,NULL,NULL);
+}
+
+extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
+{
+    return zipOpen3(pathname,append,NULL,NULL);
+}
+
+int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+{
+  /* write the local header */
+  int err;
+  uInt size_filename = (uInt)strlen(filename);
+  uInt size_extrafield = size_extrafield_local;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
+
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
+
+  // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
+  }
+  if (err==ZIP_OK)
+  {
+    if(zi->ci.zip64)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
+
+  if(zi->ci.zip64)
+  {
+    size_extrafield += 20;
+  }
+
+  if (err==ZIP_OK)
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
+
+  if ((err==ZIP_OK) && (size_filename > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
+      err = ZIP_ERRNO;
+  }
+
+  if ((err==ZIP_OK) && (size_extrafield_local > 0))
+  {
+    if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
+      err = ZIP_ERRNO;
+  }
+
+
+  if ((err==ZIP_OK) && (zi->ci.zip64))
+  {
+      // write the Zip64 extended info
+      short HeaderID = 1;
+      short DataSize = 16;
+      ZPOS64_T CompressedSize = 0;
+      ZPOS64_T UncompressedSize = 0;
+
+      // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
+      zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
+
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
+      err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
+  }
+
+  return err;
+}
+
+/*
+ NOTE.
+ When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
+ before calling this function it can be done with zipRemoveExtraInfoBlock
+
+ It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
+ unnecessary allocations.
+ */
+extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase, int zip64)
+{
+    zip64_internal* zi;
     uInt size_filename;
     uInt size_comment;
     uInt i;
     int err = ZIP_OK;
 
 #    ifdef NOCRYPT
+    (crcForCrypting);
     if (password != NULL)
         return ZIP_PARAMERROR;
 #    endif
 
     if (file == NULL)
         return ZIP_PARAMERROR;
-    if ((method!=0) && (method!=Z_DEFLATED))
-        return ZIP_PARAMERROR;
 
-    zi = (zip_internal*)file;
+#ifdef HAVE_BZIP2
+    if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
+      return ZIP_PARAMERROR;
+#else
+    if ((method!=0) && (method!=Z_DEFLATED))
+      return ZIP_PARAMERROR;
+#endif
+
+    zi = (zip64_internal*)file;
 
     if (zi->in_opened_file_inzip == 1)
     {
@@ -739,7 +1092,6 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
             return err;
     }
 
-
     if (filename==NULL)
         filename="-";
 
@@ -756,15 +1108,16 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
     {
         if (zipfi->dosDate != 0)
             zi->ci.dosDate = zipfi->dosDate;
-        else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);
+        else
+          zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
     }
 
-    zi->ci.flag = 0;
+    zi->ci.flag = flagBase;
     if ((level==8) || (level==9))
       zi->ci.flag |= 2;
-    if ((level==2))
+    if (level==2)
       zi->ci.flag |= 4;
-    if ((level==1))
+    if (level==1)
       zi->ci.flag |= 6;
     if (password != NULL)
       zi->ci.flag |= 1;
@@ -775,37 +1128,43 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
     zi->ci.stream_initialised = 0;
     zi->ci.pos_in_buffered_data = 0;
     zi->ci.raw = raw;
-    zi->ci.pos_local_header = ZTELL(zi->z_filefunc,zi->filestream) ;
-    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename +
-                                      size_extrafield_global + size_comment;
-    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);
+    zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
 
-    ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
+    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
+    zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
+
+    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
+
+    zi->ci.size_centralExtra = size_extrafield_global;
+    zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
     /* version info */
-    ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
-    ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
+    zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
+    zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
+    zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
+    zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
+    zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
 
     if (zipfi==NULL)
-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
     else
-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
 
     if (zipfi==NULL)
-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
     else
-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
+        zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
 
-    ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header- zi->add_position_when_writting_offset,4);
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
 
     for (i=0;i<size_filename;i++)
         *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
@@ -820,63 +1179,66 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
     if (zi->ci.central_header == NULL)
         return ZIP_INTERNALERROR;
 
-    /* write the local header */
-    err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC,4);
+    zi->ci.zip64 = zip64;
+    zi->ci.totalCompressedData = 0;
+    zi->ci.totalUncompressedData = 0;
+    zi->ci.pos_zip64extrainfo = 0;
 
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
+    err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
 
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield_local,2);
-
-    if ((err==ZIP_OK) && (size_filename>0))
-        if (ZWRITE(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
-                err = ZIP_ERRNO;
-
-    if ((err==ZIP_OK) && (size_extrafield_local>0))
-        if (ZWRITE(zi->z_filefunc,zi->filestream,extrafield_local,size_extrafield_local)
-                                                                           !=size_extrafield_local)
-                err = ZIP_ERRNO;
+#ifdef HAVE_BZIP2
+    zi->ci.bstream.avail_in = (uInt)0;
+    zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+    zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+    zi->ci.bstream.total_in_hi32 = 0;
+    zi->ci.bstream.total_in_lo32 = 0;
+    zi->ci.bstream.total_out_hi32 = 0;
+    zi->ci.bstream.total_out_lo32 = 0;
+#endif
 
     zi->ci.stream.avail_in = (uInt)0;
     zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
     zi->ci.stream.next_out = zi->ci.buffered_data;
     zi->ci.stream.total_in = 0;
     zi->ci.stream.total_out = 0;
+    zi->ci.stream.data_type = Z_BINARY;
 
+#ifdef HAVE_BZIP2
+    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+#else
     if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+#endif
     {
-        zi->ci.stream.zalloc = (alloc_func)0;
-        zi->ci.stream.zfree = (free_func)0;
-        zi->ci.stream.opaque = (voidpf)0;
+        if(zi->ci.method == Z_DEFLATED)
+        {
+          zi->ci.stream.zalloc = (alloc_func)0;
+          zi->ci.stream.zfree = (free_func)0;
+          zi->ci.stream.opaque = (voidpf)0;
 
-        if (windowBits>0)
-            windowBits = -windowBits;
+          if (windowBits>0)
+              windowBits = -windowBits;
 
-        err = deflateInit2(&zi->ci.stream, level,
-               Z_DEFLATED, windowBits, memLevel, strategy);
+          err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+
+          if (err==Z_OK)
+              zi->ci.stream_initialised = Z_DEFLATED;
+        }
+        else if(zi->ci.method == Z_BZIP2ED)
+        {
+#ifdef HAVE_BZIP2
+            // Init BZip stuff here
+          zi->ci.bstream.bzalloc = 0;
+          zi->ci.bstream.bzfree = 0;
+          zi->ci.bstream.opaque = (voidpf)0;
+
+          err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
+          if(err == BZ_OK)
+            zi->ci.stream_initialised = Z_BZIP2ED;
+#endif
+        }
 
-        if (err==Z_OK)
-            zi->ci.stream_initialised = 1;
     }
+
 #    ifndef NOCRYPT
     zi->ci.crypt_header_size = 0;
     if ((err==Z_OK) && (password != NULL))
@@ -890,7 +1252,7 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
         sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
         zi->ci.crypt_header_size = sizeHead;
 
-        if (ZWRITE(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
+        if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
                 err = ZIP_ERRNO;
     }
 #    endif
@@ -900,53 +1262,105 @@ extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
     return err;
 }
 
-extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
-                                        extrafield_local, size_extrafield_local,
-                                        extrafield_global, size_extrafield_global,
-                                        comment, method, level, raw)
-    zipFile file;
-    const char* filename;
-    const zip_fileinfo* zipfi;
-    const void* extrafield_local;
-    uInt size_extrafield_local;
-    const void* extrafield_global;
-    uInt size_extrafield_global;
-    const char* comment;
-    int method;
-    int level;
-    int raw;
+extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting,
+                                         uLong versionMadeBy, uLong flagBase)
 {
-    return zipOpenNewFileInZip3 (file, filename, zipfi,
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, versionMadeBy, flagBase, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                         const void* extrafield_local, uInt size_extrafield_local,
+                                         const void* extrafield_global, uInt size_extrafield_global,
+                                         const char* comment, int method, int level, int raw,
+                                         int windowBits,int memLevel, int strategy,
+                                         const char* password, uLong crcForCrypting, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, raw,
+                                 windowBits, memLevel, strategy,
+                                 password, crcForCrypting, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
                                  extrafield_local, size_extrafield_local,
                                  extrafield_global, size_extrafield_global,
                                  comment, method, level, raw,
                                  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
-                                 NULL, 0);
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
 }
 
-extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
-                                        extrafield_local, size_extrafield_local,
-                                        extrafield_global, size_extrafield_global,
-                                        comment, method, level)
-    zipFile file;
-    const char* filename;
-    const zip_fileinfo* zipfi;
-    const void* extrafield_local;
-    uInt size_extrafield_local;
-    const void* extrafield_global;
-    uInt size_extrafield_global;
-    const char* comment;
-    int method;
-    int level;
+extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void* extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int raw, int zip64)
 {
-    return zipOpenNewFileInZip2 (file, filename, zipfi,
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
                                  extrafield_local, size_extrafield_local,
                                  extrafield_global, size_extrafield_global,
-                                 comment, method, level, 0);
+                                 comment, method, level, raw,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
 }
 
-local int zipFlushWriteBuffer(zi)
-  zip_internal* zi;
+extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level, int zip64)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+                                        const void* extrafield_local, uInt size_extrafield_local,
+                                        const void*extrafield_global, uInt size_extrafield_global,
+                                        const char* comment, int method, int level)
+{
+    return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+                                 extrafield_local, size_extrafield_local,
+                                 extrafield_global, size_extrafield_global,
+                                 comment, method, level, 0,
+                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+                                 NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+local int zip64FlushWriteBuffer(zip64_internal* zi)
 {
     int err=ZIP_OK;
 
@@ -954,171 +1368,377 @@ local int zipFlushWriteBuffer(zi)
     {
 #ifndef NOCRYPT
         uInt i;
-        int t;
-        for (i=0;i<zi->ci.pos_in_buffered_data;i++)
-            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab,
-                                       zi->ci.buffered_data[i],t);
+        Byte t;
+
+        for (i = 0; i < zi->ci.pos_in_buffered_data; i++)
+            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
 #endif
     }
-    if (ZWRITE(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data)
-                                                                    !=zi->ci.pos_in_buffered_data)
+
+    if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
       err = ZIP_ERRNO;
+
+    zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
+
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED)
+    {
+      zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
+      zi->ci.bstream.total_in_lo32 = 0;
+      zi->ci.bstream.total_in_hi32 = 0;
+    }
+    else
+#endif
+    {
+      zi->ci.totalUncompressedData += zi->ci.stream.total_in;
+      zi->ci.stream.total_in = 0;
+    }
+
+
     zi->ci.pos_in_buffered_data = 0;
+
     return err;
 }
 
-extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
-    zipFile file;
-    const void* buf;
-    unsigned len;
+extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
 {
-    zip_internal* zi;
+    zip64_internal* zi;
     int err=ZIP_OK;
 
     if (file == NULL)
         return ZIP_PARAMERROR;
-    zi = (zip_internal*)file;
+    zi = (zip64_internal*)file;
 
     if (zi->in_opened_file_inzip == 0)
         return ZIP_PARAMERROR;
 
-    zi->ci.stream.next_in = (void*)buf;
-    zi->ci.stream.avail_in = len;
-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
+    zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
 
-    while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
+#ifdef HAVE_BZIP2
+    if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
     {
-        if (zi->ci.stream.avail_out == 0)
+      zi->ci.bstream.next_in = (void*)buf;
+      zi->ci.bstream.avail_in = len;
+      err = BZ_RUN_OK;
+
+      while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
+      {
+        if (zi->ci.bstream.avail_out == 0)
         {
-            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)
-                err = ZIP_ERRNO;
-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-            zi->ci.stream.next_out = zi->ci.buffered_data;
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
         }
 
 
-        if(err != ZIP_OK)
-            break;
+        if(err != BZ_RUN_OK)
+          break;
 
-        if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+        if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
         {
-            uLong uTotalOutBefore = zi->ci.stream.total_out;
-            err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
-            zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+          uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
+//          uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
+          err=BZ2_bzCompress(&zi->ci.bstream,  BZ_RUN);
 
+          zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
         }
-        else
-        {
-            uInt copy_this,i;
-            if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
-                copy_this = zi->ci.stream.avail_in;
-            else
-                copy_this = zi->ci.stream.avail_out;
-            for (i=0;i<copy_this;i++)
-                *(((char*)zi->ci.stream.next_out)+i) =
-                    *(((const char*)zi->ci.stream.next_in)+i);
-            {
-                zi->ci.stream.avail_in -= copy_this;
-                zi->ci.stream.avail_out-= copy_this;
-                zi->ci.stream.next_in+= copy_this;
-                zi->ci.stream.next_out+= copy_this;
-                zi->ci.stream.total_in+= copy_this;
-                zi->ci.stream.total_out+= copy_this;
-                zi->ci.pos_in_buffered_data += copy_this;
-            }
-        }
+      }
+
+      if(err == BZ_RUN_OK)
+        err = ZIP_OK;
+    }
+    else
+#endif
+    {
+      zi->ci.stream.next_in = (Bytef*)buf;
+      zi->ci.stream.avail_in = len;
+
+      while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
+      {
+          if (zi->ci.stream.avail_out == 0)
+          {
+              if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                  err = ZIP_ERRNO;
+              zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+              zi->ci.stream.next_out = zi->ci.buffered_data;
+          }
+
+
+          if(err != ZIP_OK)
+              break;
+
+          if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+          {
+              uLong uTotalOutBefore = zi->ci.stream.total_out;
+              err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
+              if(uTotalOutBefore > zi->ci.stream.total_out)
+              {
+                int bBreak = 0;
+                bBreak++;
+              }
+
+              zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+          }
+          else
+          {
+              uInt copy_this,i;
+              if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
+                  copy_this = zi->ci.stream.avail_in;
+              else
+                  copy_this = zi->ci.stream.avail_out;
+
+              for (i = 0; i < copy_this; i++)
+                  *(((char*)zi->ci.stream.next_out)+i) =
+                      *(((const char*)zi->ci.stream.next_in)+i);
+              {
+                  zi->ci.stream.avail_in -= copy_this;
+                  zi->ci.stream.avail_out-= copy_this;
+                  zi->ci.stream.next_in+= copy_this;
+                  zi->ci.stream.next_out+= copy_this;
+                  zi->ci.stream.total_in+= copy_this;
+                  zi->ci.stream.total_out+= copy_this;
+                  zi->ci.pos_in_buffered_data += copy_this;
+              }
+          }
+      }// while(...)
     }
 
     return err;
 }
 
-extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
-    zipFile file;
-    uLong uncompressed_size;
-    uLong crc32;
+extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
 {
-    zip_internal* zi;
-    uLong compressed_size;
+    return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
+{
+    zip64_internal* zi;
+    ZPOS64_T compressed_size;
+    uLong invalidValue = 0xffffffff;
+    short datasize = 0;
     int err=ZIP_OK;
 
     if (file == NULL)
         return ZIP_PARAMERROR;
-    zi = (zip_internal*)file;
+    zi = (zip64_internal*)file;
 
     if (zi->in_opened_file_inzip == 0)
         return ZIP_PARAMERROR;
     zi->ci.stream.avail_in = 0;
 
     if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-        while (err==ZIP_OK)
+                {
+                        while (err==ZIP_OK)
+                        {
+                                uLong uTotalOutBefore;
+                                if (zi->ci.stream.avail_out == 0)
+                                {
+                                        if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+                                                err = ZIP_ERRNO;
+                                        zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+                                        zi->ci.stream.next_out = zi->ci.buffered_data;
+                                }
+                                uTotalOutBefore = zi->ci.stream.total_out;
+                                err=deflate(&zi->ci.stream,  Z_FINISH);
+                                zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+                        }
+                }
+    else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
     {
+#ifdef HAVE_BZIP2
+      err = BZ_FINISH_OK;
+      while (err==BZ_FINISH_OK)
+      {
         uLong uTotalOutBefore;
-        if (zi->ci.stream.avail_out == 0)
+        if (zi->ci.bstream.avail_out == 0)
         {
-            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)
-                err = ZIP_ERRNO;
-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-            zi->ci.stream.next_out = zi->ci.buffered_data;
+          if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+            err = ZIP_ERRNO;
+          zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+          zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
         }
-        uTotalOutBefore = zi->ci.stream.total_out;
-        err=deflate(&zi->ci.stream,  Z_FINISH);
-        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+        uTotalOutBefore = zi->ci.bstream.total_out_lo32;
+        err=BZ2_bzCompress(&zi->ci.bstream,  BZ_FINISH);
+        if(err == BZ_STREAM_END)
+          err = Z_STREAM_END;
+
+        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
+      }
+
+      if(err == BZ_FINISH_OK)
+        err = ZIP_OK;
+#endif
     }
 
     if (err==Z_STREAM_END)
         err=ZIP_OK; /* this is normal */
 
     if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
-        if (zipFlushWriteBuffer(zi)==ZIP_ERRNO)
+                {
+        if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
             err = ZIP_ERRNO;
+                }
 
     if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
     {
-        err=deflateEnd(&zi->ci.stream);
+        int tmp_err = deflateEnd(&zi->ci.stream);
+        if (err == ZIP_OK)
+            err = tmp_err;
         zi->ci.stream_initialised = 0;
     }
+#ifdef HAVE_BZIP2
+    else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+    {
+      int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
+                        if (err==ZIP_OK)
+                                err = tmperr;
+                        zi->ci.stream_initialised = 0;
+    }
+#endif
 
     if (!zi->ci.raw)
     {
         crc32 = (uLong)zi->ci.crc32;
-        uncompressed_size = (uLong)zi->ci.stream.total_in;
+        uncompressed_size = zi->ci.totalUncompressedData;
     }
-    compressed_size = (uLong)zi->ci.stream.total_out;
+    compressed_size = zi->ci.totalCompressedData;
+
 #    ifndef NOCRYPT
     compressed_size += zi->ci.crypt_header_size;
 #    endif
 
-    ziplocal_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+20,
-                                compressed_size,4); /*compr size*/
+    // update Current Item crc and sizes,
+    if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
+    {
+      /*version Made by*/
+      zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
+      /*version needed*/
+      zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
+
+    }
+
+    zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
+
+
+    if(compressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
+
+    /// set internal file attributes field
     if (zi->ci.stream.data_type == Z_ASCII)
-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+24,
-                                uncompressed_size,4); /*uncompr size*/
+        zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
+
+    if(uncompressed_size >= 0xffffffff)
+      zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
+    else
+      zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
+
+    // Add ZIP64 extra info field for uncompressed size
+    if(uncompressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for compressed size
+    if(compressed_size >= 0xffffffff)
+      datasize += 8;
+
+    // Add ZIP64 extra info field for relative offset to local file header of current file
+    if(zi->ci.pos_local_header >= 0xffffffff)
+      datasize += 8;
+
+    if(datasize > 0)
+    {
+      char* p = NULL;
+
+      if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
+      {
+        // we can not write more data to the buffer that we have room for.
+        return ZIP_BADZIPFILE;
+      }
+
+      p = zi->ci.central_header + zi->ci.size_centralheader;
+
+      // Add Extra Information Header for 'ZIP64 information'
+      zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
+      p += 2;
+      zip64local_putValue_inmemory(p, datasize, 2); // DataSize
+      p += 2;
+
+      if(uncompressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, uncompressed_size, 8);
+        p += 8;
+      }
+
+      if(compressed_size >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, compressed_size, 8);
+        p += 8;
+      }
+
+      if(zi->ci.pos_local_header >= 0xffffffff)
+      {
+        zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
+        p += 8;
+      }
+
+      // Update how much extra free space we got in the memory buffer
+      // and increase the centralheader size so the new ZIP64 fields are included
+      // ( 4 below is the size of HeaderID and DataSize field )
+      zi->ci.size_centralExtraFree -= datasize + 4;
+      zi->ci.size_centralheader += datasize + 4;
+
+      // Update the extra info size field
+      zi->ci.size_centralExtra += datasize + 4;
+      zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
+    }
 
     if (err==ZIP_OK)
-        err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,
-                                       (uLong)zi->ci.size_centralheader);
+        err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
+
     free(zi->ci.central_header);
 
     if (err==ZIP_OK)
     {
-        long cur_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
-        if (ZSEEK(zi->z_filefunc,zi->filestream,
-                  zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        // Update the LocalFileHeader with the new values.
+
+        ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
             err = ZIP_ERRNO;
 
         if (err==ZIP_OK)
-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
+            err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
 
-        if (err==ZIP_OK) /* compressed size, unknown */
-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
+        if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
+        {
+          if(zi->ci.pos_zip64extrainfo > 0)
+          {
+            // Update the size in the ZIP64 extended field.
+            if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
+              err = ZIP_ERRNO;
 
-        if (err==ZIP_OK) /* uncompressed size, unknown */
-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
+            if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
 
-        if (ZSEEK(zi->z_filefunc,zi->filestream,
-                  cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
+          }
+          else
+              err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
+        }
+        else
+        {
+          if (err==ZIP_OK) /* compressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
+
+          if (err==ZIP_OK) /* uncompressed size, unknown */
+              err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
+        }
+
+        if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
             err = ZIP_ERRNO;
     }
 
@@ -1128,24 +1748,150 @@ extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
     return err;
 }
 
-extern int ZEXPORT zipCloseFileInZip (file)
-    zipFile file;
+extern int ZEXPORT zipCloseFileInZip (zipFile file)
 {
     return zipCloseFileInZipRaw (file,0,0);
 }
 
-extern int ZEXPORT zipClose (file, global_comment)
-    zipFile file;
-    const char* global_comment;
+int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
 {
-    zip_internal* zi;
+  int err = ZIP_OK;
+  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
+
+  /*num disks*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  /*relative offset*/
+    if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
+
+  /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
+    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
+
+    return err;
+}
+
+int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  uLong Zip64DataSize = 44;
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
+
+  if (err==ZIP_OK) /* version made by */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* version needed */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+    err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
+  }
+  return err;
+}
+int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+  int err = ZIP_OK;
+
+  /*signature*/
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
+
+  if (err==ZIP_OK) /* number of this disk */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+  if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+  {
+    {
+      if(zi->number_entry >= 0xFFFF)
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+      else
+        err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+    }
+  }
+
+  if (err==ZIP_OK) /* total number of entries in the central dir */
+  {
+    if(zi->number_entry >= 0xFFFF)
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+  }
+
+  if (err==ZIP_OK) /* size of the central directory */
+    err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
+
+  if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+  {
+    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    if(pos >= 0xffffffff)
+    {
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
+    }
+    else
+      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
+  }
+
+   return err;
+}
+
+int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+{
+  int err = ZIP_OK;
+  uInt size_global_comment = 0;
+
+  if(global_comment != NULL)
+    size_global_comment = (uInt)strlen(global_comment);
+
+  err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
+
+  if (err == ZIP_OK && size_global_comment > 0)
+  {
+    if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
+      err = ZIP_ERRNO;
+  }
+  return err;
+}
+
+extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
+{
+    zip64_internal* zi;
     int err = 0;
     uLong size_centraldir = 0;
-    uLong centraldir_pos_inzip;
-    uInt size_global_comment;
+    ZPOS64_T centraldir_pos_inzip;
+    ZPOS64_T pos;
+
     if (file == NULL)
         return ZIP_PARAMERROR;
-    zi = (zip_internal*)file;
+
+    zi = (zip64_internal*)file;
 
     if (zi->in_opened_file_inzip == 1)
     {
@@ -1156,61 +1902,42 @@ extern int ZEXPORT zipClose (file, global_comment)
     if (global_comment==NULL)
         global_comment = zi->globalcomment;
 #endif
-    if (global_comment==NULL)
-        size_global_comment = 0;
-    else
-        size_global_comment = (uInt)strlen(global_comment);
 
-    centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
+    centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
     if (err==ZIP_OK)
     {
-        linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;
+        linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
         while (ldi!=NULL)
         {
             if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
-                if (ZWRITE(zi->z_filefunc,zi->filestream,
-                           ldi->data,ldi->filled_in_this_block)
-                              !=ldi->filled_in_this_block )
+            {
+                if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
                     err = ZIP_ERRNO;
+            }
 
             size_centraldir += ldi->filled_in_this_block;
             ldi = ldi->next_datablock;
         }
     }
-    free_datablock(zi->central_dir.first_block);
+    free_linkedlist(&(zi->central_dir));
 
-    if (err==ZIP_OK) /* Magic End */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
+    pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+    if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
+    {
+      ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
+      Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
 
-    if (err==ZIP_OK) /* number of this disk */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+      Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
+    }
 
-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+    if (err==ZIP_OK)
+      err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
 
-    if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+    if(err == ZIP_OK)
+      err = Write_GlobalComment(zi, global_comment);
 
-    if (err==ZIP_OK) /* total number of entries in the central dir */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
-
-    if (err==ZIP_OK) /* size of the central directory */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
-
-    if (err==ZIP_OK) /* offset of start of central directory with respect to the
-                            starting disk number */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,
-                                (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
-
-    if (err==ZIP_OK) /* zipfile comment length */
-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
-
-    if ((err==ZIP_OK) && (size_global_comment>0))
-        if (ZWRITE(zi->z_filefunc,zi->filestream,
-                   global_comment,size_global_comment) != size_global_comment)
-                err = ZIP_ERRNO;
-
-    if (ZCLOSE(zi->z_filefunc,zi->filestream) != 0)
+    if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
         if (err == ZIP_OK)
             err = ZIP_ERRNO;
 
@@ -1221,3 +1948,61 @@ extern int ZEXPORT zipClose (file, global_comment)
 
     return err;
 }
+
+extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
+{
+  char* p = pData;
+  int size = 0;
+  char* pNewHeader;
+  char* pTmp;
+  short header;
+  short dataSize;
+
+  int retVal = ZIP_OK;
+
+  if(pData == NULL || *dataLen < 4)
+    return ZIP_PARAMERROR;
+
+  pNewHeader = (char*)ALLOC(*dataLen);
+  pTmp = pNewHeader;
+
+  while(p < (pData + *dataLen))
+  {
+    header = *(short*)p;
+    dataSize = *(((short*)p)+1);
+
+    if( header == sHeader ) // Header found.
+    {
+      p += dataSize + 4; // skip it. do not copy to temp buffer
+    }
+    else
+    {
+      // Extra Info block should not be removed, So copy it to the temp buffer.
+      memcpy(pTmp, p, dataSize + 4);
+      p += dataSize + 4;
+      size += dataSize + 4;
+    }
+
+  }
+
+  if(size < *dataLen)
+  {
+    // clean old extra info block.
+    memset(pData,0, *dataLen);
+
+    // copy the new extra info block over the old
+    if(size > 0)
+      memcpy(pData, pNewHeader, size);
+
+    // set the new extra info size
+    *dataLen = size;
+
+    retVal = ZIP_OK;
+  }
+  else
+    retVal = ZIP_ERRNO;
+
+  TRYFREE(pNewHeader);
+
+  return retVal;
+}
diff --git a/Source/3rd Party/zlib/contrib/minizip/zip.h b/Source/3rd Party/zlib/contrib/minizip/zip.h
index 6bea219d0..1664dc08d 100644
--- a/Source/3rd Party/zlib/contrib/minizip/zip.h	
+++ b/Source/3rd Party/zlib/contrib/minizip/zip.h	
@@ -1,19 +1,15 @@
-/* zip.h -- IO for compress .zip files using zlib
-   Version 1.01e, February 12th, 2005
+/* zip.h -- IO on .zip files using zlib
+   Version 1.1, February 14h, 2010
+   part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
 
-   Copyright (C) 1998-2005 Gilles Vollant
+         Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
 
-   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-   Multi volume ZipFile (span) are not supported.
-   Encryption compatible with pkzip 2.04g only supported
-   Old compressions used by old PKZip 1.x are not supported
+         Modifications for Zip64 support
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
 
-  For uncompress .zip file, look at unzip.h
+         For more info read MiniZip_info.txt
 
-
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.html for evolution
+         ---------------------------------------------------------------------------
 
    Condition of use and distribution are the same than zlib :
 
@@ -33,26 +29,24 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 
+        ---------------------------------------------------------------------------
+
+        Changes
+
+        See header of zip.h
 
 */
 
-/* for more info about .ZIP format, see
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
-      http://www.info-zip.org/pub/infozip/doc/
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _zip_H
-#define _zip_H
+#ifndef _zip12_H
+#define _zip12_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
+//#define HAVE_BZIP2
+
+#ifndef _ZLIB_H
 #include "../../zlib.h"
 #endif
 
@@ -60,6 +54,12 @@ extern "C" {
 #include "ioapi.h"
 #endif
 
+#ifdef HAVE_BZIP2
+#include "bzlib.h"
+#endif
+
+#define Z_BZIP2ED 12
+
 #if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
     from (void*) without cast */
@@ -114,6 +114,7 @@ typedef const char* zipcharpc;
 #define APPEND_STATUS_ADDINZIP      (2)
 
 extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
+extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append));
 /*
   Create a zipfile.
      pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
@@ -138,6 +139,11 @@ extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
                                    zipcharpc* globalcomment,
                                    zlib_filefunc_def* pzlib_filefunc_def));
 
+extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname,
+                                   int append,
+                                   zipcharpc* globalcomment,
+                                   zlib_filefunc64_def* pzlib_filefunc_def));
+
 extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
                        const char* filename,
                        const zip_fileinfo* zipfi,
@@ -148,6 +154,19 @@ extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
                        const char* comment,
                        int method,
                        int level));
+
+extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file,
+                       const char* filename,
+                       const zip_fileinfo* zipfi,
+                       const void* extrafield_local,
+                       uInt size_extrafield_local,
+                       const void* extrafield_global,
+                       uInt size_extrafield_global,
+                       const char* comment,
+                       int method,
+                       int level,
+                       int zip64));
+
 /*
   Open a file in the ZIP for writing.
   filename : the filename in zip (if NULL, '-' without quote will be used
@@ -159,6 +178,9 @@ extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
   if comment != NULL, comment contain the comment string
   method contain the compression method (0 for store, Z_DEFLATED for deflate)
   level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
+  zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
+                    this MUST be '1' if the uncompressed size is >= 0xffffffff.
+
 */
 
 
@@ -174,6 +196,19 @@ extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
                                             int level,
                                             int raw));
 
+
+extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int zip64));
 /*
   Same than zipOpenNewFileInZip, except if raw=1, we write raw file
  */
@@ -193,13 +228,79 @@ extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,
                                             int memLevel,
                                             int strategy,
                                             const char* password,
-                                            uLong crcForCtypting));
+                                            uLong crcForCrypting));
+
+extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            int zip64
+                                            ));
 
 /*
   Same than zipOpenNewFileInZip2, except
     windowBits,memLevel,,strategy : see parameter strategy in deflateInit2
     password : crypting password (NULL for no crypting)
-    crcForCtypting : crc of file to compress (needed for crypting)
+    crcForCrypting : crc of file to compress (needed for crypting)
+ */
+
+extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase
+                                            ));
+
+
+extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file,
+                                            const char* filename,
+                                            const zip_fileinfo* zipfi,
+                                            const void* extrafield_local,
+                                            uInt size_extrafield_local,
+                                            const void* extrafield_global,
+                                            uInt size_extrafield_global,
+                                            const char* comment,
+                                            int method,
+                                            int level,
+                                            int raw,
+                                            int windowBits,
+                                            int memLevel,
+                                            int strategy,
+                                            const char* password,
+                                            uLong crcForCrypting,
+                                            uLong versionMadeBy,
+                                            uLong flagBase,
+                                            int zip64
+                                            ));
+/*
+  Same than zipOpenNewFileInZip4, except
+    versionMadeBy : value for Version made by field
+    flag : value for flag field (compression level info will be added)
  */
 
 
@@ -218,8 +319,13 @@ extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
 extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
                                             uLong uncompressed_size,
                                             uLong crc32));
+
+extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file,
+                                            ZPOS64_T uncompressed_size,
+                                            uLong crc32));
+
 /*
-  Close the current file in the zipfile, for fiel opened with
+  Close the current file in the zipfile, for file opened with
     parameter raw=1 in zipOpenNewFileInZip2
   uncompressed_size and crc32 are value for the uncompressed size
 */
@@ -230,8 +336,27 @@ extern int ZEXPORT zipClose OF((zipFile file,
   Close the zipfile
 */
 
+
+extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader));
+/*
+  zipRemoveExtraInfoBlock -  Added by Mathias Svensson
+
+  Remove extra information block from a extra information data for the local file header or central directory header
+
+  It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode.
+
+  0x0001 is the signature header for the ZIP64 extra information blocks
+
+  usage.
+                        Remove ZIP64 Extra information from a central director extra field data
+              zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001);
+
+                        Remove ZIP64 Extra information from a Local File Header extra field data
+        zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001);
+*/
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _zip_H */
+#endif /* _zip64_H */
diff --git a/Source/3rd Party/zlib/crc32.c b/Source/3rd Party/zlib/crc32.c
index 91be372d2..979a7190a 100644
--- a/Source/3rd Party/zlib/crc32.c	
+++ b/Source/3rd Party/zlib/crc32.c	
@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010 Mark Adler
+ * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
@@ -17,6 +17,8 @@
   of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
   first call get_crc_table() to initialize the tables before allowing more than
   one thread to use crc32().
+
+  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
  */
 
 #ifdef MAKECRCH
@@ -30,31 +32,11 @@
 
 #define local static
 
-/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#ifndef NOBYFOUR
-#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
-#    include <limits.h>
-#    define BYFOUR
-#    if (UINT_MAX == 0xffffffffUL)
-       typedef unsigned int u4;
-#    else
-#      if (ULONG_MAX == 0xffffffffUL)
-         typedef unsigned long u4;
-#      else
-#        if (USHRT_MAX == 0xffffffffUL)
-           typedef unsigned short u4;
-#        else
-#          undef BYFOUR     /* can't find a four-byte integer type! */
-#        endif
-#      endif
-#    endif
-#  endif /* STDC */
-#endif /* !NOBYFOUR */
-
 /* Definitions for doing the crc four data bytes at a time. */
+#if !defined(NOBYFOUR) && defined(Z_U4)
+#  define BYFOUR
+#endif
 #ifdef BYFOUR
-#  define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
-                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
    local unsigned long crc32_little OF((unsigned long,
                         const unsigned char FAR *, unsigned));
    local unsigned long crc32_big OF((unsigned long,
@@ -68,16 +50,16 @@
 local unsigned long gf2_matrix_times OF((unsigned long *mat,
                                          unsigned long vec));
 local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);
+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
 
 
 #ifdef DYNAMIC_CRC_TABLE
 
 local volatile int crc_table_empty = 1;
-local unsigned long FAR crc_table[TBLS][256];
+local z_crc_t FAR crc_table[TBLS][256];
 local void make_crc_table OF((void));
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const unsigned long FAR *));
+   local void write_table OF((FILE *, const z_crc_t FAR *));
 #endif /* MAKECRCH */
 /*
   Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
@@ -107,9 +89,9 @@ local void make_crc_table OF((void));
 */
 local void make_crc_table()
 {
-    unsigned long c;
+    z_crc_t c;
     int n, k;
-    unsigned long poly;                 /* polynomial exclusive-or pattern */
+    z_crc_t poly;                       /* polynomial exclusive-or pattern */
     /* terms of polynomial defining this crc (except x^32): */
     static volatile int first = 1;      /* flag to limit concurrent making */
     static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
@@ -121,13 +103,13 @@ local void make_crc_table()
         first = 0;
 
         /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0UL;
-        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
-            poly |= 1UL << (31 - p[n]);
+        poly = 0;
+        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
+            poly |= (z_crc_t)1 << (31 - p[n]);
 
         /* generate a crc for every 8-bit value */
         for (n = 0; n < 256; n++) {
-            c = (unsigned long)n;
+            c = (z_crc_t)n;
             for (k = 0; k < 8; k++)
                 c = c & 1 ? poly ^ (c >> 1) : c >> 1;
             crc_table[0][n] = c;
@@ -138,11 +120,11 @@ local void make_crc_table()
            and then the byte reversal of those as well as the first table */
         for (n = 0; n < 256; n++) {
             c = crc_table[0][n];
-            crc_table[4][n] = REV(c);
+            crc_table[4][n] = ZSWAP32(c);
             for (k = 1; k < 4; k++) {
                 c = crc_table[0][c & 0xff] ^ (c >> 8);
                 crc_table[k][n] = c;
-                crc_table[k + 4][n] = REV(c);
+                crc_table[k + 4][n] = ZSWAP32(c);
             }
         }
 #endif /* BYFOUR */
@@ -164,7 +146,7 @@ local void make_crc_table()
         if (out == NULL) return;
         fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
         fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const unsigned long FAR ");
+        fprintf(out, "local const z_crc_t FAR ");
         fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
         write_table(out, crc_table[0]);
 #  ifdef BYFOUR
@@ -184,12 +166,13 @@ local void make_crc_table()
 #ifdef MAKECRCH
 local void write_table(out, table)
     FILE *out;
-    const unsigned long FAR *table;
+    const z_crc_t FAR *table;
 {
     int n;
 
     for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
                 n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
 }
 #endif /* MAKECRCH */
@@ -204,13 +187,13 @@ local void write_table(out, table)
 /* =========================================================================
  * This function can be used by asm versions of crc32()
  */
-const unsigned long FAR * ZEXPORT get_crc_table()
+const z_crc_t FAR * ZEXPORT get_crc_table()
 {
 #ifdef DYNAMIC_CRC_TABLE
     if (crc_table_empty)
         make_crc_table();
 #endif /* DYNAMIC_CRC_TABLE */
-    return (const unsigned long FAR *)crc_table;
+    return (const z_crc_t FAR *)crc_table;
 }
 
 /* ========================================================================= */
@@ -232,7 +215,7 @@ unsigned long ZEXPORT crc32(crc, buf, len)
 
 #ifdef BYFOUR
     if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        u4 endian;
+        z_crc_t endian;
 
         endian = 1;
         if (*((unsigned char *)(&endian)))
@@ -266,17 +249,17 @@ local unsigned long crc32_little(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register u4 c;
-    register const u4 FAR *buf4;
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
 
-    c = (u4)crc;
+    c = (z_crc_t)crc;
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
         len--;
     }
 
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
     while (len >= 32) {
         DOLIT32;
         len -= 32;
@@ -306,17 +289,17 @@ local unsigned long crc32_big(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register u4 c;
-    register const u4 FAR *buf4;
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
 
-    c = REV((u4)crc);
+    c = ZSWAP32((z_crc_t)crc);
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
         len--;
     }
 
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
     buf4--;
     while (len >= 32) {
         DOBIG32;
@@ -333,7 +316,7 @@ local unsigned long crc32_big(crc, buf, len)
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
     } while (--len);
     c = ~c;
-    return (unsigned long)(REV(c));
+    return (unsigned long)(ZSWAP32(c));
 }
 
 #endif /* BYFOUR */
diff --git a/Source/3rd Party/zlib/crc32.h b/Source/3rd Party/zlib/crc32.h
index 8053b6117..9e0c77810 100644
--- a/Source/3rd Party/zlib/crc32.h	
+++ b/Source/3rd Party/zlib/crc32.h	
@@ -2,7 +2,7 @@
  * Generated automatically by crc32.c
  */
 
-local const unsigned long FAR crc_table[TBLS][256] =
+local const z_crc_t FAR crc_table[TBLS][256] =
 {
   {
     0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
diff --git a/Source/3rd Party/zlib/deflate.c b/Source/3rd Party/zlib/deflate.c
index 5c4022f3d..696957705 100644
--- a/Source/3rd Party/zlib/deflate.c	
+++ b/Source/3rd Party/zlib/deflate.c	
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -37,7 +37,7 @@
  *  REFERENCES
  *
  *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://www.ietf.org/rfc/rfc1951.txt
+ *      Available in http://tools.ietf.org/html/rfc1951
  *
  *      A description of the Rabin and Karp algorithm is given in the book
  *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -155,6 +155,9 @@ local const config configuration_table[10] = {
 struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 #endif
 
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
+#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+
 /* ===========================================================================
  * Update a hash value with the given input byte
  * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
@@ -235,10 +238,19 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
     strm->msg = Z_NULL;
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
 
 #ifdef FASTEST
     if (level != 0) level = 1;
@@ -293,7 +305,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
         s->pending_buf == Z_NULL) {
         s->status = FINISH_STATE;
-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+        strm->msg = ERR_MSG(Z_MEM_ERROR);
         deflateEnd (strm);
         return Z_MEM_ERROR;
     }
@@ -314,43 +326,70 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
     uInt  dictLength;
 {
     deflate_state *s;
-    uInt length = dictLength;
-    uInt n;
-    IPos hash_head = 0;
+    uInt str, n;
+    int wrap;
+    unsigned avail;
+    z_const unsigned char *next;
 
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->wrap == 2 ||
-        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    wrap = s->wrap;
+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
         return Z_STREAM_ERROR;
 
-    s = strm->state;
-    if (s->wrap)
+    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+    if (wrap == 1)
         strm->adler = adler32(strm->adler, dictionary, dictLength);
+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
 
-    if (length < MIN_MATCH) return Z_OK;
-    if (length > s->w_size) {
-        length = s->w_size;
-        dictionary += dictLength - length; /* use the tail of the dictionary */
+    /* if dictionary would fill window, just replace the history */
+    if (dictLength >= s->w_size) {
+        if (wrap == 0) {            /* already empty otherwise */
+            CLEAR_HASH(s);
+            s->strstart = 0;
+            s->block_start = 0L;
+            s->insert = 0;
+        }
+        dictionary += dictLength - s->w_size;  /* use the tail */
+        dictLength = s->w_size;
     }
-    zmemcpy(s->window, dictionary, length);
-    s->strstart = length;
-    s->block_start = (long)length;
 
-    /* Insert all strings in the hash table (except for the last two bytes).
-     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-     * call of fill_window.
-     */
-    s->ins_h = s->window[0];
-    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    for (n = 0; n <= length - MIN_MATCH; n++) {
-        INSERT_STRING(s, n, hash_head);
+    /* insert dictionary into window and hash */
+    avail = strm->avail_in;
+    next = strm->next_in;
+    strm->avail_in = dictLength;
+    strm->next_in = (z_const Bytef *)dictionary;
+    fill_window(s);
+    while (s->lookahead >= MIN_MATCH) {
+        str = s->strstart;
+        n = s->lookahead - (MIN_MATCH-1);
+        do {
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+            s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+            s->head[s->ins_h] = (Pos)str;
+            str++;
+        } while (--n);
+        s->strstart = str;
+        s->lookahead = MIN_MATCH-1;
+        fill_window(s);
     }
-    if (hash_head) hash_head = 0;  /* to make compiler happy */
+    s->strstart += s->lookahead;
+    s->block_start = (long)s->strstart;
+    s->insert = s->lookahead;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    strm->next_in = next;
+    strm->avail_in = avail;
+    s->wrap = wrap;
     return Z_OK;
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateReset (strm)
+int ZEXPORT deflateResetKeep (strm)
     z_streamp strm;
 {
     deflate_state *s;
@@ -380,11 +419,22 @@ int ZEXPORT deflateReset (strm)
     s->last_flush = Z_NO_FLUSH;
 
     _tr_init(s);
-    lm_init(s);
 
     return Z_OK;
 }
 
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    int ret;
+
+    ret = deflateResetKeep(strm);
+    if (ret == Z_OK)
+        lm_init(strm->state);
+    return ret;
+}
+
 /* ========================================================================= */
 int ZEXPORT deflateSetHeader (strm, head)
     z_streamp strm;
@@ -396,15 +446,43 @@ int ZEXPORT deflateSetHeader (strm, head)
     return Z_OK;
 }
 
+/* ========================================================================= */
+int ZEXPORT deflatePending (strm, pending, bits)
+    unsigned *pending;
+    int *bits;
+    z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
+    return Z_OK;
+}
+
 /* ========================================================================= */
 int ZEXPORT deflatePrime (strm, bits, value)
     z_streamp strm;
     int bits;
     int value;
 {
+    deflate_state *s;
+    int put;
+
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    strm->state->bi_valid = bits;
-    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
+    s = strm->state;
+    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+    do {
+        put = Buf_size - s->bi_valid;
+        if (put > bits)
+            put = bits;
+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+        s->bi_valid += put;
+        _tr_flush_bits(s);
+        value >>= put;
+        bits -= put;
+    } while (bits);
     return Z_OK;
 }
 
@@ -435,6 +513,8 @@ int ZEXPORT deflateParams(strm, level, strategy)
         strm->total_in != 0) {
         /* Flush the last buffer: */
         err = deflate(strm, Z_BLOCK);
+        if (err == Z_BUF_ERROR && s->pending == 0)
+            err = Z_OK;
     }
     if (s->level != level) {
         s->level = level;
@@ -562,19 +642,22 @@ local void putShortMSB (s, b)
 local void flush_pending(strm)
     z_streamp strm;
 {
-    unsigned len = strm->state->pending;
+    unsigned len;
+    deflate_state *s = strm->state;
 
+    _tr_flush_bits(s);
+    len = s->pending;
     if (len > strm->avail_out) len = strm->avail_out;
     if (len == 0) return;
 
-    zmemcpy(strm->next_out, strm->state->pending_out, len);
+    zmemcpy(strm->next_out, s->pending_out, len);
     strm->next_out  += len;
-    strm->state->pending_out  += len;
+    s->pending_out  += len;
     strm->total_out += len;
     strm->avail_out  -= len;
-    strm->state->pending -= len;
-    if (strm->state->pending == 0) {
-        strm->state->pending_out = strm->state->pending_buf;
+    s->pending -= len;
+    if (s->pending == 0) {
+        s->pending_out = s->pending_buf;
     }
 }
 
@@ -801,7 +884,7 @@ int ZEXPORT deflate (strm, flush)
      * flushes. For repeated and useless calls with Z_FINISH, we keep
      * returning Z_STREAM_END instead of Z_BUF_ERROR.
      */
-    } else if (strm->avail_in == 0 && flush <= old_flush &&
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
                flush != Z_FINISH) {
         ERR_RETURN(strm, Z_BUF_ERROR);
     }
@@ -850,6 +933,7 @@ int ZEXPORT deflate (strm, flush)
                     if (s->lookahead == 0) {
                         s->strstart = 0;
                         s->block_start = 0L;
+                        s->insert = 0;
                     }
                 }
             }
@@ -945,12 +1029,12 @@ int ZEXPORT deflateCopy (dest, source)
 
     ss = source->state;
 
-    zmemcpy(dest, source, sizeof(z_stream));
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
 
     ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
     if (ds == Z_NULL) return Z_MEM_ERROR;
     dest->state = (struct internal_state FAR *) ds;
-    zmemcpy(ds, ss, sizeof(deflate_state));
+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
     ds->strm = dest;
 
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
@@ -966,8 +1050,8 @@ int ZEXPORT deflateCopy (dest, source)
     }
     /* following zmemcpy do not work for 16-bit MSDOS */
     zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
@@ -1001,15 +1085,15 @@ local int read_buf(strm, buf, size)
 
     strm->avail_in  -= len;
 
+    zmemcpy(buf, strm->next_in, len);
     if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, strm->next_in, len);
+        strm->adler = adler32(strm->adler, buf, len);
     }
 #ifdef GZIP
     else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, strm->next_in, len);
+        strm->adler = crc32(strm->adler, buf, len);
     }
 #endif
-    zmemcpy(buf, strm->next_in, len);
     strm->next_in  += len;
     strm->total_in += len;
 
@@ -1036,6 +1120,7 @@ local void lm_init (s)
     s->strstart = 0;
     s->block_start = 0L;
     s->lookahead = 0;
+    s->insert = 0;
     s->match_length = s->prev_length = MIN_MATCH-1;
     s->match_available = 0;
     s->ins_h = 0;
@@ -1310,6 +1395,8 @@ local void fill_window(s)
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
     do {
         more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
 
@@ -1362,7 +1449,7 @@ local void fill_window(s)
 #endif
             more += wsize;
         }
-        if (s->strm->avail_in == 0) return;
+        if (s->strm->avail_in == 0) break;
 
         /* If there was no sliding:
          *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
@@ -1381,12 +1468,24 @@ local void fill_window(s)
         s->lookahead += n;
 
         /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            s->ins_h = s->window[s->strstart];
-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
 #if MIN_MATCH != 3
             Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
         }
         /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
          * but this is not important since only literal bytes will be emitted.
@@ -1427,6 +1526,9 @@ local void fill_window(s)
             s->high_water += init;
         }
     }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
 }
 
 /* ===========================================================================
@@ -1506,8 +1608,14 @@ local block_state deflate_stored(s, flush)
             FLUSH_BLOCK(s, 0);
         }
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if ((long)s->strstart > s->block_start)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 /* ===========================================================================
@@ -1603,8 +1711,14 @@ local block_state deflate_fast(s, flush)
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 #ifndef FASTEST
@@ -1728,8 +1842,14 @@ local block_state deflate_slow(s, flush)
         _tr_tally_lit(s, s->window[s->strstart-1], bflush);
         s->match_available = 0;
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 #endif /* FASTEST */
 
@@ -1749,11 +1869,11 @@ local block_state deflate_rle(s, flush)
     for (;;) {
         /* Make sure that we always have enough lookahead, except
          * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest encodable run.
+         * for the longest run, plus one for the unrolled loop.
          */
-        if (s->lookahead < MAX_MATCH) {
+        if (s->lookahead <= MAX_MATCH) {
             fill_window(s);
-            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
                 return need_more;
             }
             if (s->lookahead == 0) break; /* flush the current block */
@@ -1776,6 +1896,7 @@ local block_state deflate_rle(s, flush)
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
+            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -1796,8 +1917,14 @@ local block_state deflate_rle(s, flush)
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 /* ===========================================================================
@@ -1829,6 +1956,12 @@ local block_state deflate_huff(s, flush)
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
diff --git a/Source/3rd Party/zlib/deflate.h b/Source/3rd Party/zlib/deflate.h
index cbf0d1ea5..ce0299edd 100644
--- a/Source/3rd Party/zlib/deflate.h	
+++ b/Source/3rd Party/zlib/deflate.h	
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2010 Jean-loup Gailly
+ * Copyright (C) 1995-2012 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -48,6 +48,9 @@
 #define MAX_BITS 15
 /* All codes must not exceed MAX_BITS bits */
 
+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+
 #define INIT_STATE    42
 #define EXTRA_STATE   69
 #define NAME_STATE    73
@@ -101,7 +104,7 @@ typedef struct internal_state {
     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
     gz_headerp  gzhead;  /* gzip header information to write */
     uInt   gzindex;      /* where in extra, name, or comment */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    Byte  method;        /* can only be DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
 
                 /* used by deflate.c: */
@@ -188,7 +191,7 @@ typedef struct internal_state {
     int nice_match; /* Stop searching when current match exceeds this */
 
                 /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
     struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
     struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
     struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
@@ -244,7 +247,7 @@ typedef struct internal_state {
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */
     uInt matches;       /* number of string matches in current block */
-    int last_eob_len;   /* bit length of EOB code for last block */
+    uInt insert;        /* bytes at end of window left to insert */
 
 #ifdef DEBUG
     ulg compressed_len; /* total bit length of compressed file mod 2^32 */
@@ -294,6 +297,7 @@ void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
 int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
 void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
                         ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
                         ulg stored_len, int last));
diff --git a/Source/3rd Party/zlib/gzguts.h b/Source/3rd Party/zlib/gzguts.h
index 0f8fb79f8..d87659d03 100644
--- a/Source/3rd Party/zlib/gzguts.h	
+++ b/Source/3rd Party/zlib/gzguts.h	
@@ -1,5 +1,5 @@
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -12,7 +12,7 @@
 #  endif
 #endif
 
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#ifdef HAVE_HIDDEN
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL
@@ -27,13 +27,80 @@
 #endif
 #include <fcntl.h>
 
+#ifdef _WIN32
+#  include <stddef.h>
+#endif
+
+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
+#  include <io.h>
+#endif
+
+#ifdef WINAPI_FAMILY
+#  define open _open
+#  define read _read
+#  define write _write
+#  define close _close
+#endif
+
 #ifdef NO_DEFLATE       /* for compatibility with old definition */
 #  define NO_GZCOMPRESS
 #endif
 
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+   but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#         define vsnprintf _vsnprintf
+#      endif
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#  ifdef VMS
+#    define NO_vsnprintf
+#  endif
+#  ifdef __OS400__
+#    define NO_vsnprintf
+#  endif
+#  ifdef __MVS__
+#    define NO_vsnprintf
+#  endif
+#endif
+
+/* unlike snprintf (which is required in C99, yet still not supported by
+   Microsoft more than a decade later!), _snprintf does not guarantee null
+   termination of the result -- however this is only used in gzlib.c where
+   the result is assured to fit in the space provided */
 #ifdef _MSC_VER
-#  include <io.h>
-#  define vsnprintf _vsnprintf
+#  define snprintf _snprintf
 #endif
 
 #ifndef local
@@ -52,7 +119,7 @@
 #  include <windows.h>
 #  define zstrerror() gz_strwinerror((DWORD)GetLastError())
 #else
-#  ifdef STDC
+#  ifndef NO_STRERROR
 #    include <errno.h>
 #    define zstrerror() strerror(errno)
 #  else
@@ -68,7 +135,15 @@
     ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
 #endif
 
-/* default i/o buffer size -- double this for output when reading */
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
+/* default i/o buffer size -- double this for output when reading (this and
+   twice this must be able to fit in an unsigned type) */
 #define GZBUFSIZE 8192
 
 /* gzip modes, also provide a little integrity check on the passed structure */
@@ -84,23 +159,25 @@
 
 /* internal gzip file state data structure */
 typedef struct {
+        /* exposed contents for gzgetc() macro */
+    struct gzFile_s x;      /* "x" for exposed */
+                            /* x.have: number of bytes available at x.next */
+                            /* x.next: next output data to deliver or write */
+                            /* x.pos: current position in uncompressed data */
         /* used for both reading and writing */
     int mode;               /* see gzip modes above */
     int fd;                 /* file descriptor */
     char *path;             /* path or fd for error messages */
-    z_off64_t pos;          /* current position in uncompressed data */
     unsigned size;          /* buffer size, zero if not allocated yet */
     unsigned want;          /* requested buffer size, default is GZBUFSIZE */
     unsigned char *in;      /* input buffer */
     unsigned char *out;     /* output buffer (double-sized when reading) */
-    unsigned char *next;    /* next output data to deliver or write */
+    int direct;             /* 0 if processing gzip, 1 if transparent */
         /* just for reading */
-    unsigned have;          /* amount of output data unused at next */
-    int eof;                /* true if end of input file reached */
-    z_off64_t start;        /* where the gzip data started, for rewinding */
-    z_off64_t raw;          /* where the raw data started, for seeking */
     int how;                /* 0: get header, 1: copy, 2: decompress */
-    int direct;             /* true if last read direct, false if gzip */
+    z_off64_t start;        /* where the gzip data started, for rewinding */
+    int eof;                /* true if end of input file reached */
+    int past;               /* true if read requested past end */
         /* just for writing */
     int level;              /* compression level */
     int strategy;           /* compression strategy */
diff --git a/Source/3rd Party/zlib/gzlib.c b/Source/3rd Party/zlib/gzlib.c
index ec8993e24..fae202ef8 100644
--- a/Source/3rd Party/zlib/gzlib.c	
+++ b/Source/3rd Party/zlib/gzlib.c	
@@ -1,19 +1,23 @@
 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010 Mark Adler
+ * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
+#if defined(_WIN32) && !defined(__BORLANDC__)
+#  define LSEEK _lseeki64
+#else
 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
 #  define LSEEK lseek64
 #else
-#  define LSEEK _lseek
+#  define LSEEK lseek
+#endif
 #endif
 
 /* Local functions */
 local void gz_reset OF((gz_statep));
-local gzFile gz_open OF((const char *, int, const char *));
+local gzFile gz_open OF((const void *, int, const char *));
 
 #if defined UNDER_CE
 
@@ -71,28 +75,40 @@ char ZLIB_INTERNAL *gz_strwinerror (error)
 local void gz_reset(state)
     gz_statep state;
 {
+    state->x.have = 0;              /* no output data available */
     if (state->mode == GZ_READ) {   /* for reading ... */
-        state->have = 0;            /* no output data available */
         state->eof = 0;             /* not at end of file */
+        state->past = 0;            /* have not read past end yet */
         state->how = LOOK;          /* look for gzip header */
-        state->direct = 1;          /* default for empty file */
     }
     state->seek = 0;                /* no seek request pending */
     gz_error(state, Z_OK, NULL);    /* clear error */
-    state->pos = 0;                 /* no uncompressed data yet */
+    state->x.pos = 0;               /* no uncompressed data yet */
     state->strm.avail_in = 0;       /* no input data yet */
 }
 
 /* Open a gzip file either by name or file descriptor. */
 local gzFile gz_open(path, fd, mode)
-    const char *path;
+    const void *path;
     int fd;
     const char *mode;
 {
     gz_statep state;
+    size_t len;
+    int oflag;
+#ifdef O_CLOEXEC
+    int cloexec = 0;
+#endif
+#ifdef O_EXCL
+    int exclusive = 0;
+#endif
+
+    /* check input */
+    if (path == NULL)
+        return NULL;
 
     /* allocate gzFile structure to return */
-    state = malloc(sizeof(gz_state));
+    state = (gz_statep)malloc(sizeof(gz_state));
     if (state == NULL)
         return NULL;
     state->size = 0;            /* no buffers allocated yet */
@@ -103,6 +119,7 @@ local gzFile gz_open(path, fd, mode)
     state->mode = GZ_NONE;
     state->level = Z_DEFAULT_COMPRESSION;
     state->strategy = Z_DEFAULT_STRATEGY;
+    state->direct = 0;
     while (*mode) {
         if (*mode >= '0' && *mode <= '9')
             state->level = *mode - '0';
@@ -124,6 +141,16 @@ local gzFile gz_open(path, fd, mode)
                 return NULL;
             case 'b':       /* ignore -- will request binary anyway */
                 break;
+#ifdef O_CLOEXEC
+            case 'e':
+                cloexec = 1;
+                break;
+#endif
+#ifdef O_EXCL
+            case 'x':
+                exclusive = 1;
+                break;
+#endif
             case 'f':
                 state->strategy = Z_FILTERED;
                 break;
@@ -135,6 +162,10 @@ local gzFile gz_open(path, fd, mode)
                 break;
             case 'F':
                 state->strategy = Z_FIXED;
+                break;
+            case 'T':
+                state->direct = 1;
+                break;
             default:        /* could consider as an error, but just ignore */
                 ;
             }
@@ -147,30 +178,71 @@ local gzFile gz_open(path, fd, mode)
         return NULL;
     }
 
+    /* can't force transparent read */
+    if (state->mode == GZ_READ) {
+        if (state->direct) {
+            free(state);
+            return NULL;
+        }
+        state->direct = 1;      /* for empty file */
+    }
+
     /* save the path name for error messages */
-    state->path = malloc(strlen(path) + 1);
+#ifdef _WIN32
+    if (fd == -2) {
+        len = wcstombs(NULL, path, 0);
+        if (len == (size_t)-1)
+            len = 0;
+    }
+    else
+#endif
+        len = strlen((const char *)path);
+    state->path = (char *)malloc(len + 1);
     if (state->path == NULL) {
         free(state);
         return NULL;
     }
-    strcpy(state->path, path);
+#ifdef _WIN32
+    if (fd == -2)
+        if (len)
+            wcstombs(state->path, path, len + 1);
+        else
+            *(state->path) = 0;
+    else
+#endif
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+        snprintf(state->path, len + 1, "%s", (const char *)path);
+#else
+        strcpy(state->path, path);
+#endif
 
-    /* open the file with the appropriate mode (or just use fd) */
-    state->fd = fd != -1 ? fd :
-        _open(path,
+    /* compute the flags for open() */
+    oflag =
 #ifdef O_LARGEFILE
-            O_LARGEFILE |
+        O_LARGEFILE |
 #endif
 #ifdef O_BINARY
-            O_BINARY |
+        O_BINARY |
 #endif
-            (state->mode == GZ_READ ?
-                O_RDONLY :
-                (O_WRONLY | O_CREAT | (
-                    state->mode == GZ_WRITE ?
-                        O_TRUNC :
-                        O_APPEND))),
-            0666);
+#ifdef O_CLOEXEC
+        (cloexec ? O_CLOEXEC : 0) |
+#endif
+        (state->mode == GZ_READ ?
+         O_RDONLY :
+         (O_WRONLY | O_CREAT |
+#ifdef O_EXCL
+          (exclusive ? O_EXCL : 0) |
+#endif
+          (state->mode == GZ_WRITE ?
+           O_TRUNC :
+           O_APPEND)));
+
+    /* open the file with the appropriate flags (or just use fd) */
+    state->fd = fd > -1 ? fd : (
+#ifdef _WIN32
+        fd == -2 ? _wopen(path, oflag, 0666) :
+#endif
+        open((const char *)path, oflag, 0666));
     if (state->fd == -1) {
         free(state->path);
         free(state);
@@ -216,14 +288,28 @@ gzFile ZEXPORT gzdopen(fd, mode)
     char *path;         /* identifier for error messages */
     gzFile gz;
 
-    if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)
+    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
         return NULL;
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
+#else
     sprintf(path, "<fd:%d>", fd);   /* for debugging */
+#endif
     gz = gz_open(path, fd, mode);
     free(path);
     return gz;
 }
 
+/* -- see zlib.h -- */
+#ifdef _WIN32
+gzFile ZEXPORT gzopen_w(path, mode)
+    const wchar_t *path;
+    const char *mode;
+{
+    return gz_open(path, -2, mode);
+}
+#endif
+
 /* -- see zlib.h -- */
 int ZEXPORT gzbuffer(file, size)
     gzFile file;
@@ -243,8 +329,8 @@ int ZEXPORT gzbuffer(file, size)
         return -1;
 
     /* check and set requested size */
-    if (size == 0)
-        return -1;
+    if (size < 2)
+        size = 2;               /* need two bytes to check magic header */
     state->want = size;
     return 0;
 }
@@ -261,7 +347,8 @@ int ZEXPORT gzrewind(file)
     state = (gz_statep)file;
 
     /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* back up and start over */
@@ -289,7 +376,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
         return -1;
 
     /* check that there's no error */
-    if (state->err != Z_OK)
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
         return -1;
 
     /* can only seek from start or relative to current position */
@@ -298,31 +385,32 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
 
     /* normalize offset to a SEEK_CUR specification */
     if (whence == SEEK_SET)
-        offset -= state->pos;
+        offset -= state->x.pos;
     else if (state->seek)
         offset += state->skip;
     state->seek = 0;
 
     /* if within raw area while reading, just go there */
     if (state->mode == GZ_READ && state->how == COPY &&
-        state->pos + offset >= state->raw) {
-        ret = LSEEK(state->fd, offset - state->have, SEEK_CUR);
+            state->x.pos + offset >= 0) {
+        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
         if (ret == -1)
             return -1;
-        state->have = 0;
+        state->x.have = 0;
         state->eof = 0;
+        state->past = 0;
         state->seek = 0;
         gz_error(state, Z_OK, NULL);
         state->strm.avail_in = 0;
-        state->pos += offset;
-        return state->pos;
+        state->x.pos += offset;
+        return state->x.pos;
     }
 
     /* calculate skip amount, rewinding if needed for back seek when reading */
     if (offset < 0) {
         if (state->mode != GZ_READ)         /* writing -- can't go backwards */
             return -1;
-        offset += state->pos;
+        offset += state->x.pos;
         if (offset < 0)                     /* before start of file! */
             return -1;
         if (gzrewind(file) == -1)           /* rewind, then skip to offset */
@@ -331,11 +419,11 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
 
     /* if reading, skip what's in output buffer (one less gzgetc() check) */
     if (state->mode == GZ_READ) {
-        n = GT_OFF(state->have) || (z_off64_t)state->have > offset ?
-            (unsigned)offset : state->have;
-        state->have -= n;
-        state->next += n;
-        state->pos += n;
+        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
+            (unsigned)offset : state->x.have;
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
         offset -= n;
     }
 
@@ -344,7 +432,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
         state->seek = 1;
         state->skip = offset;
     }
-    return state->pos + offset;
+    return state->x.pos + offset;
 }
 
 /* -- see zlib.h -- */
@@ -373,7 +461,7 @@ z_off64_t ZEXPORT gztell64(file)
         return -1;
 
     /* return position */
-    return state->pos + (state->seek ? state->skip : 0);
+    return state->x.pos + (state->seek ? state->skip : 0);
 }
 
 /* -- see zlib.h -- */
@@ -433,8 +521,7 @@ int ZEXPORT gzeof(file)
         return 0;
 
     /* return end-of-file state */
-    return state->mode == GZ_READ ?
-        (state->eof && state->strm.avail_in == 0 && state->have == 0) : 0;
+    return state->mode == GZ_READ ? state->past : 0;
 }
 
 /* -- see zlib.h -- */
@@ -454,7 +541,8 @@ const char * ZEXPORT gzerror(file, errnum)
     /* return error information */
     if (errnum != NULL)
         *errnum = state->err;
-    return state->msg == NULL ? "" : state->msg;
+    return state->err == Z_MEM_ERROR ? "out of memory" :
+                                       (state->msg == NULL ? "" : state->msg);
 }
 
 /* -- see zlib.h -- */
@@ -471,8 +559,10 @@ void ZEXPORT gzclearerr(file)
         return;
 
     /* clear error and end-of-file */
-    if (state->mode == GZ_READ)
+    if (state->mode == GZ_READ) {
         state->eof = 0;
+        state->past = 0;
+    }
     gz_error(state, Z_OK, NULL);
 }
 
@@ -494,26 +584,33 @@ void ZLIB_INTERNAL gz_error(state, err, msg)
         state->msg = NULL;
     }
 
+    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
+    if (err != Z_OK && err != Z_BUF_ERROR)
+        state->x.have = 0;
+
     /* set error code, and if no message, then done */
     state->err = err;
     if (msg == NULL)
         return;
 
-    /* for an out of memory error, save as static string */
-    if (err == Z_MEM_ERROR) {
-        state->msg = (char *)msg;
+    /* for an out of memory error, return literal string when requested */
+    if (err == Z_MEM_ERROR)
         return;
-    }
 
     /* construct error message with path */
-    if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
+    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
+            NULL) {
         state->err = Z_MEM_ERROR;
-        state->msg = (char *)"out of memory";
         return;
     }
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
+             "%s%s%s", state->path, ": ", msg);
+#else
     strcpy(state->msg, state->path);
     strcat(state->msg, ": ");
     strcat(state->msg, msg);
+#endif
     return;
 }
 
diff --git a/Source/3rd Party/zlib/gzread.c b/Source/3rd Party/zlib/gzread.c
index 15fec9115..bf4538eb2 100644
--- a/Source/3rd Party/zlib/gzread.c	
+++ b/Source/3rd Party/zlib/gzread.c	
@@ -1,5 +1,5 @@
 /* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,10 +8,9 @@
 /* Local functions */
 local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
 local int gz_avail OF((gz_statep));
-local int gz_next4 OF((gz_statep, unsigned long *));
-local int gz_head OF((gz_statep));
+local int gz_look OF((gz_statep));
 local int gz_decomp OF((gz_statep));
-local int gz_make OF((gz_statep));
+local int gz_fetch OF((gz_statep));
 local int gz_skip OF((gz_statep, z_off64_t));
 
 /* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
@@ -28,7 +27,7 @@ local int gz_load(state, buf, len, have)
 
     *have = 0;
     do {
-        ret = _read(state->fd, buf + *have, len - *have);
+        ret = read(state->fd, buf + *have, len - *have);
         if (ret <= 0)
             break;
         *have += ret;
@@ -46,73 +45,54 @@ local int gz_load(state, buf, len, have)
    error, 0 otherwise.  Note that the eof flag is set when the end of the input
    file is reached, even though there may be unused data in the buffer.  Once
    that data has been used, no more attempts will be made to read the file.
-   gz_avail() assumes that strm->avail_in == 0. */
+   If strm->avail_in != 0, then the current data is moved to the beginning of
+   the input buffer, and then the remainder of the buffer is loaded with the
+   available data from the input file. */
 local int gz_avail(state)
     gz_statep state;
 {
+    unsigned got;
     z_streamp strm = &(state->strm);
 
-    if (state->err != Z_OK)
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
         return -1;
     if (state->eof == 0) {
-        if (gz_load(state, state->in, state->size,
-                (unsigned *)&(strm->avail_in)) == -1)
+        if (strm->avail_in) {       /* copy what's there to the start */
+            unsigned char *p = state->in;
+            unsigned const char *q = strm->next_in;
+            unsigned n = strm->avail_in;
+            do {
+                *p++ = *q++;
+            } while (--n);
+        }
+        if (gz_load(state, state->in + strm->avail_in,
+                    state->size - strm->avail_in, &got) == -1)
             return -1;
+        strm->avail_in += got;
         strm->next_in = state->in;
     }
     return 0;
 }
 
-/* Get next byte from input, or -1 if end or error. */
-#define NEXT() ((strm->avail_in == 0 && gz_avail(state) == -1) ? -1 : \
-                (strm->avail_in == 0 ? -1 : \
-                 (strm->avail_in--, *(strm->next_in)++)))
-
-/* Get a four-byte little-endian integer and return 0 on success and the value
-   in *ret.  Otherwise -1 is returned and *ret is not modified. */
-local int gz_next4(state, ret)
-    gz_statep state;
-    unsigned long *ret;
-{
-    int ch;
-    unsigned long val;
-    z_streamp strm = &(state->strm);
-
-    val = NEXT();
-    val += (unsigned)NEXT() << 8;
-    val += (unsigned long)NEXT() << 16;
-    ch = NEXT();
-    if (ch == -1)
-        return -1;
-    val += (unsigned long)ch << 24;
-    *ret = val;
-    return 0;
-}
-
-/* Look for gzip header, set up for inflate or copy.  state->have must be zero.
+/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
    If this is the first time in, allocate required memory.  state->how will be
    left unchanged if there is no more input data available, will be set to COPY
    if there is no gzip header and direct copying will be performed, or it will
-   be set to GZIP for decompression, and the gzip header will be skipped so
-   that the next available input data is the raw deflate stream.  If direct
-   copying, then leftover input data from the input buffer will be copied to
-   the output buffer.  In that case, all further file reads will be directly to
-   either the output buffer or a user buffer.  If decompressing, the inflate
-   state and the check value will be initialized.  gz_head() will return 0 on
-   success or -1 on failure.  Failures may include read errors or gzip header
-   errors.  */
-local int gz_head(state)
+   be set to GZIP for decompression.  If direct copying, then leftover input
+   data from the input buffer will be copied to the output buffer.  In that
+   case, all further file reads will be directly to either the output buffer or
+   a user buffer.  If decompressing, the inflate state will be initialized.
+   gz_look() will return 0 on success or -1 on failure. */
+local int gz_look(state)
     gz_statep state;
 {
     z_streamp strm = &(state->strm);
-    int flags;
-    unsigned len;
 
     /* allocate read buffers and inflate memory */
     if (state->size == 0) {
         /* allocate buffers */
-        state->in = malloc(state->want);
-        state->out = malloc(state->want << 1);
+        state->in = (unsigned char *)malloc(state->want);
+        state->out = (unsigned char *)malloc(state->want << 1);
         if (state->in == NULL || state->out == NULL) {
             if (state->out != NULL)
                 free(state->out);
@@ -129,7 +109,7 @@ local int gz_head(state)
         state->strm.opaque = Z_NULL;
         state->strm.avail_in = 0;
         state->strm.next_in = Z_NULL;
-        if (inflateInit2(&(state->strm), -15) != Z_OK) {    /* raw inflate */
+        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
             free(state->out);
             free(state->in);
             state->size = 0;
@@ -138,83 +118,45 @@ local int gz_head(state)
         }
     }
 
-    /* get some data in the input buffer */
-    if (strm->avail_in == 0) {
+    /* get at least the magic bytes in the input buffer */
+    if (strm->avail_in < 2) {
         if (gz_avail(state) == -1)
             return -1;
         if (strm->avail_in == 0)
             return 0;
     }
 
-    /* look for the gzip magic header bytes 31 and 139 */
-    if (strm->next_in[0] == 31) {
-        strm->avail_in--;
-        strm->next_in++;
-        if (strm->avail_in == 0 && gz_avail(state) == -1)
-            return -1;
-        if (strm->avail_in && strm->next_in[0] == 139) {
-            /* we have a gzip header, woo hoo! */
-            strm->avail_in--;
-            strm->next_in++;
-
-            /* skip rest of header */
-            if (NEXT() != 8) {      /* compression method */
-                gz_error(state, Z_DATA_ERROR, "unknown compression method");
-                return -1;
-            }
-            flags = NEXT();
-            if (flags & 0xe0) {     /* reserved flag bits */
-                gz_error(state, Z_DATA_ERROR, "unknown header flags set");
-                return -1;
-            }
-            NEXT();                 /* modification time */
-            NEXT();
-            NEXT();
-            NEXT();
-            NEXT();                 /* extra flags */
-            NEXT();                 /* operating system */
-            if (flags & 4) {        /* extra field */
-                len = (unsigned)NEXT();
-                len += (unsigned)NEXT() << 8;
-                while (len--)
-                    if (NEXT() < 0)
-                        break;
-            }
-            if (flags & 8)          /* file name */
-                while (NEXT() > 0)
-                    ;
-            if (flags & 16)         /* comment */
-                while (NEXT() > 0)
-                    ;
-            if (flags & 2) {        /* header crc */
-                NEXT();
-                NEXT();
-            }
-            /* an unexpected end of file is not checked for here -- it will be
-               noticed on the first request for uncompressed data */
-
-            /* set up for decompression */
-            inflateReset(strm);
-            strm->adler = crc32(0L, Z_NULL, 0);
-            state->how = GZIP;
-            state->direct = 0;
-            return 0;
-        }
-        else {
-            /* not a gzip file -- save first byte (31) and fall to raw i/o */
-            state->out[0] = 31;
-            state->have = 1;
-        }
+    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
+       a logical dilemma here when considering the case of a partially written
+       gzip file, to wit, if a single 31 byte is written, then we cannot tell
+       whether this is a single-byte file, or just a partially written gzip
+       file -- for here we assume that if a gzip file is being written, then
+       the header will be written in a single operation, so that reading a
+       single byte is sufficient indication that it is not a gzip file) */
+    if (strm->avail_in > 1 &&
+            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
+        inflateReset(strm);
+        state->how = GZIP;
+        state->direct = 0;
+        return 0;
     }
 
-    /* doing raw i/o, save start of raw data for seeking, copy any leftover
-       input to output -- this assumes that the output buffer is larger than
-       the input buffer, which also assures space for gzungetc() */
-    state->raw = state->pos;
-    state->next = state->out;
+    /* no gzip header -- if we were decoding gzip before, then this is trailing
+       garbage.  Ignore the trailing garbage and finish. */
+    if (state->direct == 0) {
+        strm->avail_in = 0;
+        state->eof = 1;
+        state->x.have = 0;
+        return 0;
+    }
+
+    /* doing raw i/o, copy any leftover input to output -- this assumes that
+       the output buffer is larger than the input buffer, which also assures
+       space for gzungetc() */
+    state->x.next = state->out;
     if (strm->avail_in) {
-        memcpy(state->next + state->have, strm->next_in, strm->avail_in);
-        state->have += strm->avail_in;
+        memcpy(state->x.next, strm->next_in, strm->avail_in);
+        state->x.have = strm->avail_in;
         strm->avail_in = 0;
     }
     state->how = COPY;
@@ -223,19 +165,15 @@ local int gz_head(state)
 }
 
 /* Decompress from input to the provided next_out and avail_out in the state.
-   If the end of the compressed data is reached, then verify the gzip trailer
-   check value and length (modulo 2^32).  state->have and state->next are set
-   to point to the just decompressed data, and the crc is updated.  If the
-   trailer is verified, state->how is reset to LOOK to look for the next gzip
-   stream or raw data, once state->have is depleted.  Returns 0 on success, -1
-   on failure.  Failures may include invalid compressed data or a failed gzip
-   trailer verification. */
+   On return, state->x.have and state->x.next point to the just decompressed
+   data.  If the gzip stream completes, state->how is reset to LOOK to look for
+   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
+   on success, -1 on failure. */
 local int gz_decomp(state)
     gz_statep state;
 {
-    int ret;
+    int ret = Z_OK;
     unsigned had;
-    unsigned long crc, len;
     z_streamp strm = &(state->strm);
 
     /* fill output buffer up to end of deflate stream */
@@ -245,15 +183,15 @@ local int gz_decomp(state)
         if (strm->avail_in == 0 && gz_avail(state) == -1)
             return -1;
         if (strm->avail_in == 0) {
-            gz_error(state, Z_DATA_ERROR, "unexpected end of file");
-            return -1;
+            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
+            break;
         }
 
         /* decompress and handle errors */
         ret = inflate(strm, Z_NO_FLUSH);
         if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
             gz_error(state, Z_STREAM_ERROR,
-                      "internal error: inflate stream corrupt");
+                     "internal error: inflate stream corrupt");
             return -1;
         }
         if (ret == Z_MEM_ERROR) {
@@ -262,67 +200,55 @@ local int gz_decomp(state)
         }
         if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
             gz_error(state, Z_DATA_ERROR,
-                      strm->msg == NULL ? "compressed data error" : strm->msg);
+                     strm->msg == NULL ? "compressed data error" : strm->msg);
             return -1;
         }
     } while (strm->avail_out && ret != Z_STREAM_END);
 
-    /* update available output and crc check value */
-    state->have = had - strm->avail_out;
-    state->next = strm->next_out - state->have;
-    strm->adler = crc32(strm->adler, state->next, state->have);
+    /* update available output */
+    state->x.have = had - strm->avail_out;
+    state->x.next = strm->next_out - state->x.have;
 
-    /* check gzip trailer if at end of deflate stream */
-    if (ret == Z_STREAM_END) {
-        if (gz_next4(state, &crc) == -1 || gz_next4(state, &len) == -1) {
-            gz_error(state, Z_DATA_ERROR, "unexpected end of file");
-            return -1;
-        }
-        if (crc != strm->adler) {
-            gz_error(state, Z_DATA_ERROR, "incorrect data check");
-            return -1;
-        }
-        if (len != (strm->total_out & 0xffffffffL)) {
-            gz_error(state, Z_DATA_ERROR, "incorrect length check");
-            return -1;
-        }
-        state->how = LOOK;      /* ready for next stream, once have is 0 (leave
-                                   state->direct unchanged to remember how) */
-    }
+    /* if the gzip stream completed successfully, look for another */
+    if (ret == Z_STREAM_END)
+        state->how = LOOK;
 
     /* good decompression */
     return 0;
 }
 
-/* Make data and put in the output buffer.  Assumes that state->have == 0.
+/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
    Data is either copied from the input file or decompressed from the input
    file depending on state->how.  If state->how is LOOK, then a gzip header is
-   looked for (and skipped if found) to determine wither to copy or decompress.
-   Returns -1 on error, otherwise 0.  gz_make() will leave state->have as COPY
-   or GZIP unless the end of the input file has been reached and all data has
-   been processed.  */
-local int gz_make(state)
+   looked for to determine whether to copy or decompress.  Returns -1 on error,
+   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
+   end of the input file has been reached and all data has been processed.  */
+local int gz_fetch(state)
     gz_statep state;
 {
     z_streamp strm = &(state->strm);
 
-    if (state->how == LOOK) {           /* look for gzip header */
-        if (gz_head(state) == -1)
-            return -1;
-        if (state->have)                /* got some data from gz_head() */
+    do {
+        switch(state->how) {
+        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
+            if (gz_look(state) == -1)
+                return -1;
+            if (state->how == LOOK)
+                return 0;
+            break;
+        case COPY:      /* -> COPY */
+            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
+                    == -1)
+                return -1;
+            state->x.next = state->out;
             return 0;
-    }
-    if (state->how == COPY) {           /* straight copy */
-        if (gz_load(state, state->out, state->size << 1, &(state->have)) == -1)
-            return -1;
-        state->next = state->out;
-    }
-    else if (state->how == GZIP) {      /* decompress */
-        strm->avail_out = state->size << 1;
-        strm->next_out = state->out;
-        if (gz_decomp(state) == -1)
-            return -1;
-    }
+        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
+            strm->avail_out = state->size << 1;
+            strm->next_out = state->out;
+            if (gz_decomp(state) == -1)
+                return -1;
+        }
+    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
     return 0;
 }
 
@@ -336,12 +262,12 @@ local int gz_skip(state, len)
     /* skip over len bytes or reach end-of-file, whichever comes first */
     while (len)
         /* skip over whatever is in output buffer */
-        if (state->have) {
-            n = GT_OFF(state->have) || (z_off64_t)state->have > len ?
-                (unsigned)len : state->have;
-            state->have -= n;
-            state->next += n;
-            state->pos += n;
+        if (state->x.have) {
+            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
+                (unsigned)len : state->x.have;
+            state->x.have -= n;
+            state->x.next += n;
+            state->x.pos += n;
             len -= n;
         }
 
@@ -352,7 +278,7 @@ local int gz_skip(state, len)
         /* need more data to skip -- load up output buffer */
         else {
             /* get more output, looking for header if required */
-            if (gz_make(state) == -1)
+            if (gz_fetch(state) == -1)
                 return -1;
         }
     return 0;
@@ -374,14 +300,15 @@ int ZEXPORT gzread(file, buf, len)
     state = (gz_statep)file;
     strm = &(state->strm);
 
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* since an int is returned, make sure len fits in one, otherwise return
        with an error (this avoids the flaw in the interface) */
     if ((int)len < 0) {
-        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");
+        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
         return -1;
     }
 
@@ -400,49 +327,51 @@ int ZEXPORT gzread(file, buf, len)
     got = 0;
     do {
         /* first just try copying data from the output buffer */
-        if (state->have) {
-            n = state->have > len ? len : state->have;
-            memcpy(buf, state->next, n);
-            state->next += n;
-            state->have -= n;
+        if (state->x.have) {
+            n = state->x.have > len ? len : state->x.have;
+            memcpy(buf, state->x.next, n);
+            state->x.next += n;
+            state->x.have -= n;
         }
 
         /* output buffer empty -- return if we're at the end of the input */
-        else if (state->eof && strm->avail_in == 0)
+        else if (state->eof && strm->avail_in == 0) {
+            state->past = 1;        /* tried to read past end */
             break;
+        }
 
         /* need output data -- for small len or new stream load up our output
            buffer */
         else if (state->how == LOOK || len < (state->size << 1)) {
             /* get more output, looking for header if required */
-            if (gz_make(state) == -1)
+            if (gz_fetch(state) == -1)
                 return -1;
-            continue;       /* no progress yet -- go back to memcpy() above */
+            continue;       /* no progress yet -- go back to copy above */
             /* the copy above assures that we will leave with space in the
                output buffer, allowing at least one gzungetc() to succeed */
         }
 
         /* large len -- read directly into user buffer */
         else if (state->how == COPY) {      /* read directly */
-            if (gz_load(state, buf, len, &n) == -1)
+            if (gz_load(state, (unsigned char *)buf, len, &n) == -1)
                 return -1;
         }
 
         /* large len -- decompress directly into user buffer */
         else {  /* state->how == GZIP */
             strm->avail_out = len;
-            strm->next_out = buf;
+            strm->next_out = (unsigned char *)buf;
             if (gz_decomp(state) == -1)
                 return -1;
-            n = state->have;
-            state->have = 0;
+            n = state->x.have;
+            state->x.have = 0;
         }
 
         /* update progress */
         len -= n;
         buf = (char *)buf + n;
         got += n;
-        state->pos += n;
+        state->x.pos += n;
     } while (len);
 
     /* return number of bytes read into user buffer (will fit in int) */
@@ -450,6 +379,11 @@ int ZEXPORT gzread(file, buf, len)
 }
 
 /* -- see zlib.h -- */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#else
+#  undef gzgetc
+#endif
 int ZEXPORT gzgetc(file)
     gzFile file;
 {
@@ -462,15 +396,16 @@ int ZEXPORT gzgetc(file)
         return -1;
     state = (gz_statep)file;
 
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* try output buffer (no need to check for skip request) */
-    if (state->have) {
-        state->have--;
-        state->pos++;
-        return *(state->next)++;
+    if (state->x.have) {
+        state->x.have--;
+        state->x.pos++;
+        return *(state->x.next)++;
     }
 
     /* nothing there -- try gzread() */
@@ -478,6 +413,12 @@ int ZEXPORT gzgetc(file)
     return ret < 1 ? -1 : buf[0];
 }
 
+int ZEXPORT gzgetc_(file)
+gzFile file;
+{
+    return gzgetc(file);
+}
+
 /* -- see zlib.h -- */
 int ZEXPORT gzungetc(c, file)
     int c;
@@ -490,8 +431,9 @@ int ZEXPORT gzungetc(c, file)
         return -1;
     state = (gz_statep)file;
 
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* process a skip request */
@@ -506,32 +448,34 @@ int ZEXPORT gzungetc(c, file)
         return -1;
 
     /* if output buffer empty, put byte at end (allows more pushing) */
-    if (state->have == 0) {
-        state->have = 1;
-        state->next = state->out + (state->size << 1) - 1;
-        state->next[0] = c;
-        state->pos--;
+    if (state->x.have == 0) {
+        state->x.have = 1;
+        state->x.next = state->out + (state->size << 1) - 1;
+        state->x.next[0] = c;
+        state->x.pos--;
+        state->past = 0;
         return c;
     }
 
     /* if no room, give up (must have already done a gzungetc()) */
-    if (state->have == (state->size << 1)) {
-        gz_error(state, Z_BUF_ERROR, "out of room to push characters");
+    if (state->x.have == (state->size << 1)) {
+        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
         return -1;
     }
 
     /* slide output data if needed and insert byte before existing data */
-    if (state->next == state->out) {
-        unsigned char *src = state->out + state->have;
+    if (state->x.next == state->out) {
+        unsigned char *src = state->out + state->x.have;
         unsigned char *dest = state->out + (state->size << 1);
         while (src > state->out)
             *--dest = *--src;
-        state->next = dest;
+        state->x.next = dest;
     }
-    state->have++;
-    state->next--;
-    state->next[0] = c;
-    state->pos--;
+    state->x.have++;
+    state->x.next--;
+    state->x.next[0] = c;
+    state->x.pos--;
+    state->past = 0;
     return c;
 }
 
@@ -551,8 +495,9 @@ char * ZEXPORT gzgets(file, buf, len)
         return NULL;
     state = (gz_statep)file;
 
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return NULL;
 
     /* process a skip request */
@@ -569,32 +514,31 @@ char * ZEXPORT gzgets(file, buf, len)
     left = (unsigned)len - 1;
     if (left) do {
         /* assure that something is in the output buffer */
-        if (state->have == 0) {
-            if (gz_make(state) == -1)
-                return NULL;            /* error */
-            if (state->have == 0) {     /* end of file */
-                if (buf == str)         /* got bupkus */
-                    return NULL;
-                break;                  /* got something -- return it */
-            }
+        if (state->x.have == 0 && gz_fetch(state) == -1)
+            return NULL;                /* error */
+        if (state->x.have == 0) {       /* end of file */
+            state->past = 1;            /* read past end */
+            break;                      /* return what we have */
         }
 
         /* look for end-of-line in current output buffer */
-        n = state->have > left ? left : state->have;
-        eol = memchr(state->next, '\n', n);
+        n = state->x.have > left ? left : state->x.have;
+        eol = (unsigned char *)memchr(state->x.next, '\n', n);
         if (eol != NULL)
-            n = (unsigned)(eol - state->next) + 1;
+            n = (unsigned)(eol - state->x.next) + 1;
 
         /* copy through end-of-line, or remainder if not found */
-        memcpy(buf, state->next, n);
-        state->have -= n;
-        state->next += n;
-        state->pos += n;
+        memcpy(buf, state->x.next, n);
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
         left -= n;
         buf += n;
     } while (left && eol == NULL);
 
-    /* found end-of-line or out of space -- terminate string and return it */
+    /* return terminated string, or if nothing, end of file */
+    if (buf == str)
+        return NULL;
     buf[0] = 0;
     return str;
 }
@@ -610,16 +554,12 @@ int ZEXPORT gzdirect(file)
         return 0;
     state = (gz_statep)file;
 
-    /* check that we're reading */
-    if (state->mode != GZ_READ)
-        return 0;
-
     /* if the state is not known, but we can find out, then do so (this is
        mainly for right after a gzopen() or gzdopen()) */
-    if (state->how == LOOK && state->have == 0)
-        (void)gz_head(state);
+    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
+        (void)gz_look(state);
 
-    /* return 1 if reading direct, 0 if decompressing a gzip stream */
+    /* return 1 if transparent, 0 if processing a gzip stream */
     return state->direct;
 }
 
@@ -627,7 +567,7 @@ int ZEXPORT gzdirect(file)
 int ZEXPORT gzclose_r(file)
     gzFile file;
 {
-    int ret;
+    int ret, err;
     gz_statep state;
 
     /* get internal structure */
@@ -645,9 +585,10 @@ int ZEXPORT gzclose_r(file)
         free(state->out);
         free(state->in);
     }
+    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
     gz_error(state, Z_OK, NULL);
     free(state->path);
-    ret = _close(state->fd);
+    ret = close(state->fd);
     free(state);
-    return ret ? Z_ERRNO : Z_OK;
+    return ret ? Z_ERRNO : err;
 }
diff --git a/Source/3rd Party/zlib/gzwrite.c b/Source/3rd Party/zlib/gzwrite.c
index 9dfe04105..aa767fbf6 100644
--- a/Source/3rd Party/zlib/gzwrite.c	
+++ b/Source/3rd Party/zlib/gzwrite.c	
@@ -1,5 +1,5 @@
 /* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004, 2005, 2010 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -18,44 +18,55 @@ local int gz_init(state)
     int ret;
     z_streamp strm = &(state->strm);
 
-    /* allocate input and output buffers */
-    state->in = malloc(state->want);
-    state->out = malloc(state->want);
-    if (state->in == NULL || state->out == NULL) {
-        if (state->out != NULL)
-            free(state->out);
-        if (state->in != NULL)
-            free(state->in);
+    /* allocate input buffer */
+    state->in = (unsigned char *)malloc(state->want);
+    if (state->in == NULL) {
         gz_error(state, Z_MEM_ERROR, "out of memory");
         return -1;
     }
 
-    /* allocate deflate memory, set up for gzip compression */
-    strm->zalloc = Z_NULL;
-    strm->zfree = Z_NULL;
-    strm->opaque = Z_NULL;
-    ret = deflateInit2(strm, state->level, Z_DEFLATED,
-                       15 + 16, 8, state->strategy);
-    if (ret != Z_OK) {
-        free(state->in);
-        gz_error(state, Z_MEM_ERROR, "out of memory");
-        return -1;
+    /* only need output buffer and deflate state if compressing */
+    if (!state->direct) {
+        /* allocate output buffer */
+        state->out = (unsigned char *)malloc(state->want);
+        if (state->out == NULL) {
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+
+        /* allocate deflate memory, set up for gzip compression */
+        strm->zalloc = Z_NULL;
+        strm->zfree = Z_NULL;
+        strm->opaque = Z_NULL;
+        ret = deflateInit2(strm, state->level, Z_DEFLATED,
+                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
+        if (ret != Z_OK) {
+            free(state->out);
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
     }
 
     /* mark state as initialized */
     state->size = state->want;
 
-    /* initialize write buffer */
-    strm->avail_out = state->size;
-    strm->next_out = state->out;
-    state->next = strm->next_out;
+    /* initialize write buffer if compressing */
+    if (!state->direct) {
+        strm->avail_out = state->size;
+        strm->next_out = state->out;
+        state->x.next = strm->next_out;
+    }
     return 0;
 }
 
 /* Compress whatever is at avail_in and next_in and write to the output file.
    Return -1 if there is an error writing to the output file, otherwise 0.
    flush is assumed to be a valid deflate() flush value.  If flush is Z_FINISH,
-   then the deflate() state is reset to start a new gzip stream. */
+   then the deflate() state is reset to start a new gzip stream.  If gz->direct
+   is true, then simply write to the output file without compressing, and
+   ignore flush. */
 local int gz_comp(state, flush)
     gz_statep state;
     int flush;
@@ -68,6 +79,17 @@ local int gz_comp(state, flush)
     if (state->size == 0 && gz_init(state) == -1)
         return -1;
 
+    /* write directly if requested */
+    if (state->direct) {
+        got = write(state->fd, strm->next_in, strm->avail_in);
+        if (got < 0 || (unsigned)got != strm->avail_in) {
+            gz_error(state, Z_ERRNO, zstrerror());
+            return -1;
+        }
+        strm->avail_in = 0;
+        return 0;
+    }
+
     /* run deflate() on provided input until it produces no more output */
     ret = Z_OK;
     do {
@@ -75,8 +97,8 @@ local int gz_comp(state, flush)
            doing Z_FINISH then don't write until we get to Z_STREAM_END */
         if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
             (flush != Z_FINISH || ret == Z_STREAM_END))) {
-            have = (unsigned)(strm->next_out - state->next);
-            if (have && ((got = _write(state->fd, state->next, have)) < 0 ||
+            have = (unsigned)(strm->next_out - state->x.next);
+            if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
                          (unsigned)got != have)) {
                 gz_error(state, Z_ERRNO, zstrerror());
                 return -1;
@@ -85,7 +107,7 @@ local int gz_comp(state, flush)
                 strm->avail_out = state->size;
                 strm->next_out = state->out;
             }
-            state->next = strm->next_out;
+            state->x.next = strm->next_out;
         }
 
         /* compress */
@@ -131,7 +153,7 @@ local int gz_zero(state, len)
         }
         strm->avail_in = n;
         strm->next_in = state->in;
-        state->pos += n;
+        state->x.pos += n;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return -1;
         len -= n;
@@ -146,7 +168,6 @@ int ZEXPORT gzwrite(file, buf, len)
     unsigned len;
 {
     unsigned put = len;
-    unsigned n;
     gz_statep state;
     z_streamp strm;
 
@@ -163,7 +184,7 @@ int ZEXPORT gzwrite(file, buf, len)
     /* since an int is returned, make sure len fits in one, otherwise return
        with an error (this avoids the flaw in the interface) */
     if ((int)len < 0) {
-        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");
+        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
         return 0;
     }
 
@@ -186,16 +207,19 @@ int ZEXPORT gzwrite(file, buf, len)
     if (len < state->size) {
         /* copy to input buffer, compress when full */
         do {
+            unsigned have, copy;
+
             if (strm->avail_in == 0)
                 strm->next_in = state->in;
-            n = state->size - strm->avail_in;
-            if (n > len)
-                n = len;
-            memcpy(strm->next_in + strm->avail_in, buf, n);
-            strm->avail_in += n;
-            state->pos += n;
-            buf = (char *)buf + n;
-            len -= n;
+            have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+            copy = state->size - have;
+            if (copy > len)
+                copy = len;
+            memcpy(state->in + have, buf, copy);
+            strm->avail_in += copy;
+            state->x.pos += copy;
+            buf = (const char *)buf + copy;
+            len -= copy;
             if (len && gz_comp(state, Z_NO_FLUSH) == -1)
                 return 0;
         } while (len);
@@ -207,8 +231,8 @@ int ZEXPORT gzwrite(file, buf, len)
 
         /* directly compress user buffer to file */
         strm->avail_in = len;
-        strm->next_in = (voidp)buf;
-        state->pos += len;
+        strm->next_in = (z_const Bytef *)buf;
+        state->x.pos += len;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return 0;
     }
@@ -222,6 +246,7 @@ int ZEXPORT gzputc(file, c)
     gzFile file;
     int c;
 {
+    unsigned have;
     unsigned char buf[1];
     gz_statep state;
     z_streamp strm;
@@ -245,19 +270,23 @@ int ZEXPORT gzputc(file, c)
 
     /* try writing to input buffer for speed (state->size == 0 if buffer not
        initialized) */
-    if (strm->avail_in < state->size) {
+    if (state->size) {
         if (strm->avail_in == 0)
             strm->next_in = state->in;
-        strm->next_in[strm->avail_in++] = c;
-        state->pos++;
-        return c;
+        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+        if (have < state->size) {
+            state->in[have] = c;
+            strm->avail_in++;
+            state->x.pos++;
+            return c & 0xff;
+        }
     }
 
     /* no room in buffer or not initialized, use gz_write() */
     buf[0] = c;
     if (gzwrite(file, buf, 1) != 1)
         return -1;
-    return c;
+    return c & 0xff;
 }
 
 /* -- see zlib.h -- */
@@ -274,16 +303,15 @@ int ZEXPORT gzputs(file, str)
     return ret == 0 && len != 0 ? -1 : ret;
 }
 
-#ifdef STDC
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #include <stdarg.h>
 
 /* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
 {
     int size, len;
     gz_statep state;
     z_streamp strm;
-    va_list va;
 
     /* get internal structure */
     if (file == NULL)
@@ -313,25 +341,20 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
     /* do the printf() into the input buffer, put length in len */
     size = (int)(state->size);
     state->in[size - 1] = 0;
-    va_start(va, format);
 #ifdef NO_vsnprintf
 #  ifdef HAS_vsprintf_void
-    (void)vsprintf(state->in, format, va);
-    va_end(va);
+    (void)vsprintf((char *)(state->in), format, va);
     for (len = 0; len < size; len++)
         if (state->in[len] == 0) break;
 #  else
-    len = vsprintf(state->in, format, va);
-    va_end(va);
+    len = vsprintf((char *)(state->in), format, va);
 #  endif
 #else
 #  ifdef HAS_vsnprintf_void
-    (void)vsnprintf(state->in, size, format, va);
-    va_end(va);
-    len = strlen(state->in);
+    (void)vsnprintf((char *)(state->in), size, format, va);
+    len = strlen((char *)(state->in));
 #  else
     len = vsnprintf((char *)(state->in), size, format, va);
-    va_end(va);
 #  endif
 #endif
 
@@ -342,11 +365,22 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
     /* update buffer and position, defer compression until needed */
     strm->avail_in = (unsigned)len;
     strm->next_in = state->in;
-    state->pos += len;
+    state->x.pos += len;
     return len;
 }
 
-#else /* !STDC */
+int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
+{
+    va_list va;
+    int ret;
+
+    va_start(va, format);
+    ret = gzvprintf(file, format, va);
+    va_end(va);
+    return ret;
+}
+
+#else /* !STDC && !Z_HAVE_STDARG_H */
 
 /* -- see zlib.h -- */
 int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
@@ -366,6 +400,10 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
     state = (gz_statep)file;
     strm = &(state->strm);
 
+    /* check that can really pass pointer in ints */
+    if (sizeof(int) != sizeof(void *))
+        return 0;
+
     /* check that we're writing and that there's no error */
     if (state->mode != GZ_WRITE || state->err != Z_OK)
         return 0;
@@ -390,22 +428,23 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
     state->in[size - 1] = 0;
 #ifdef NO_snprintf
 #  ifdef HAS_sprintf_void
-    sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
+    sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
     for (len = 0; len < size; len++)
         if (state->in[len] == 0) break;
 #  else
-    len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+                  a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
 #  endif
 #else
 #  ifdef HAS_snprintf_void
-    snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+    snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
              a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen(state->in);
+    len = strlen((char *)(state->in));
 #  else
-    len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6,
+                   a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
+                   a19, a20);
 #  endif
 #endif
 
@@ -416,7 +455,7 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
     /* update buffer and position, defer compression until needed */
     strm->avail_in = (unsigned)len;
     strm->next_in = state->in;
-    state->pos += len;
+    state->x.pos += len;
     return len;
 }
 
@@ -500,7 +539,7 @@ int ZEXPORT gzsetparams(file, level, strategy)
 int ZEXPORT gzclose_w(file)
     gzFile file;
 {
-    int ret = 0;
+    int ret = Z_OK;
     gz_statep state;
 
     /* get internal structure */
@@ -515,17 +554,24 @@ int ZEXPORT gzclose_w(file)
     /* check for seek request */
     if (state->seek) {
         state->seek = 0;
-        ret += gz_zero(state, state->skip);
+        if (gz_zero(state, state->skip) == -1)
+            ret = state->err;
     }
 
     /* flush, free memory, and close file */
-    ret += gz_comp(state, Z_FINISH);
-    (void)deflateEnd(&(state->strm));
-    free(state->out);
-    free(state->in);
+    if (gz_comp(state, Z_FINISH) == -1)
+        ret = state->err;
+    if (state->size) {
+        if (!state->direct) {
+            (void)deflateEnd(&(state->strm));
+            free(state->out);
+        }
+        free(state->in);
+    }
     gz_error(state, Z_OK, NULL);
     free(state->path);
-    ret += _close(state->fd);
+    if (close(state->fd) == -1)
+        ret = Z_ERRNO;
     free(state);
-    return ret ? Z_ERRNO : Z_OK;
+    return ret;
 }
diff --git a/Source/3rd Party/zlib/infback.c b/Source/3rd Party/zlib/infback.c
index af3a8c965..f3833c2e4 100644
--- a/Source/3rd Party/zlib/infback.c	
+++ b/Source/3rd Party/zlib/infback.c	
@@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -42,10 +42,19 @@ int stream_size;
         return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+    strm->zfree = zcfree;
+#endif
     state = (struct inflate_state FAR *)ZALLOC(strm, 1,
                                                sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
@@ -246,7 +255,7 @@ out_func out;
 void FAR *out_desc;
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
+    z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
     unsigned long hold;         /* bit buffer */
@@ -394,7 +403,6 @@ void FAR *out_desc;
                     PULLBYTE();
                 }
                 if (here.val < 16) {
-                    NEEDBITS(here.bits);
                     DROPBITS(here.bits);
                     state->lens[state->have++] = here.val;
                 }
diff --git a/Source/3rd Party/zlib/inffast.c b/Source/3rd Party/zlib/inffast.c
index 2f1d60b43..bda59ceb6 100644
--- a/Source/3rd Party/zlib/inffast.c	
+++ b/Source/3rd Party/zlib/inffast.c	
@@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010 Mark Adler
+ * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -69,8 +69,8 @@ z_streamp strm;
 unsigned start;         /* inflate()'s starting value for strm->avail_out */
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *in;      /* local strm->next_in */
-    unsigned char FAR *last;    /* while in < last, enough input available */
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
     unsigned char FAR *out;     /* local strm->next_out */
     unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
     unsigned char FAR *end;     /* while out < end, enough space available */
diff --git a/Source/3rd Party/zlib/inffixed.h b/Source/3rd Party/zlib/inffixed.h
index 75ed4b597..d62832776 100644
--- a/Source/3rd Party/zlib/inffixed.h	
+++ b/Source/3rd Party/zlib/inffixed.h	
@@ -2,9 +2,9 @@
      * Generated automatically by makefixed().
      */
 
-    /* WARNING: this file should *not* be used by applications. It
-       is part of the implementation of the compression library and
-       is subject to change. Applications should only use zlib.h.
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
      */
 
     static const code lenfix[512] = {
diff --git a/Source/3rd Party/zlib/inflate.c b/Source/3rd Party/zlib/inflate.c
index a8431abea..870f89bb4 100644
--- a/Source/3rd Party/zlib/inflate.c	
+++ b/Source/3rd Party/zlib/inflate.c	
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2012 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -93,14 +93,15 @@
 
 /* function prototypes */
 local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, unsigned out));
+local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
+                           unsigned copy));
 #ifdef BUILDFIXED
    void makefixed OF((void));
 #endif
-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
                               unsigned len));
 
-int ZEXPORT inflateReset(strm)
+int ZEXPORT inflateResetKeep(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
@@ -109,15 +110,13 @@ z_streamp strm;
     state = (struct inflate_state FAR *)strm->state;
     strm->total_in = strm->total_out = state->total = 0;
     strm->msg = Z_NULL;
-    strm->adler = 1;        /* to support ill-conceived Java test suite */
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
     state->mode = HEAD;
     state->last = 0;
     state->havedict = 0;
     state->dmax = 32768U;
     state->head = Z_NULL;
-    state->wsize = 0;
-    state->whave = 0;
-    state->wnext = 0;
     state->hold = 0;
     state->bits = 0;
     state->lencode = state->distcode = state->next = state->codes;
@@ -127,6 +126,19 @@ z_streamp strm;
     return Z_OK;
 }
 
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
 int ZEXPORT inflateReset2(strm, windowBits)
 z_streamp strm;
 int windowBits;
@@ -180,10 +192,19 @@ int stream_size;
     if (strm == Z_NULL) return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
     state = (struct inflate_state FAR *)
             ZALLOC(strm, 1, sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
@@ -321,8 +342,8 @@ void makefixed()
     low = 0;
     for (;;) {
         if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
-               state.lencode[low].val);
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
         if (++low == size) break;
         putchar(',');
     }
@@ -355,12 +376,13 @@ void makefixed()
    output will fall in the output data, making match copies simpler and faster.
    The advantage may be dependent on the size of the processor's data caches.
  */
-local int updatewindow(strm, out)
+local int updatewindow(strm, end, copy)
 z_streamp strm;
-unsigned out;
+const Bytef *end;
+unsigned copy;
 {
     struct inflate_state FAR *state;
-    unsigned copy, dist;
+    unsigned dist;
 
     state = (struct inflate_state FAR *)strm->state;
 
@@ -380,19 +402,18 @@ unsigned out;
     }
 
     /* copy state->wsize or less output bytes into the circular window */
-    copy = out - strm->avail_out;
     if (copy >= state->wsize) {
-        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
+        zmemcpy(state->window, end - state->wsize, state->wsize);
         state->wnext = 0;
         state->whave = state->wsize;
     }
     else {
         dist = state->wsize - state->wnext;
         if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->wnext, strm->next_out - copy, dist);
+        zmemcpy(state->window + state->wnext, end - copy, dist);
         copy -= dist;
         if (copy) {
-            zmemcpy(state->window, strm->next_out - copy, copy);
+            zmemcpy(state->window, end - copy, copy);
             state->wnext = copy;
             state->whave = state->wsize;
         }
@@ -499,11 +520,6 @@ unsigned out;
         bits -= bits & 7; \
     } while (0)
 
-/* Reverse the bytes in a 32-bit value */
-#define REVERSE(q) \
-    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
 /*
    inflate() uses a state machine to process as much input data and generate as
    much output data as possible before returning.  The state machine is
@@ -591,7 +607,7 @@ z_streamp strm;
 int flush;
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
+    z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
     unsigned long hold;         /* bit buffer */
@@ -797,7 +813,7 @@ int flush;
 #endif
         case DICTID:
             NEEDBITS(32);
-            strm->adler = state->check = REVERSE(hold);
+            strm->adler = state->check = ZSWAP32(hold);
             INITBITS();
             state->mode = DICT;
         case DICT:
@@ -905,7 +921,7 @@ int flush;
             while (state->have < 19)
                 state->lens[order[state->have++]] = 0;
             state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
+            state->lencode = (const code FAR *)(state->next);
             state->lenbits = 7;
             ret = inflate_table(CODES, state->lens, 19, &(state->next),
                                 &(state->lenbits), state->work);
@@ -925,7 +941,6 @@ int flush;
                     PULLBYTE();
                 }
                 if (here.val < 16) {
-                    NEEDBITS(here.bits);
                     DROPBITS(here.bits);
                     state->lens[state->have++] = here.val;
                 }
@@ -980,7 +995,7 @@ int flush;
                values here (9 and 6) without reading the comments in inftrees.h
                concerning the ENOUGH constants, which depend on those values */
             state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
+            state->lencode = (const code FAR *)(state->next);
             state->lenbits = 9;
             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                 &(state->lenbits), state->work);
@@ -989,7 +1004,7 @@ int flush;
                 state->mode = BAD;
                 break;
             }
-            state->distcode = (code const FAR *)(state->next);
+            state->distcode = (const code FAR *)(state->next);
             state->distbits = 6;
             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                             &(state->next), &(state->distbits), state->work);
@@ -1170,7 +1185,7 @@ int flush;
 #ifdef GUNZIP
                      state->flags ? hold :
 #endif
-                     REVERSE(hold)) != state->check) {
+                     ZSWAP32(hold)) != state->check) {
                     strm->msg = (char *)"incorrect data check";
                     state->mode = BAD;
                     break;
@@ -1214,8 +1229,9 @@ int flush;
      */
   inf_leave:
     RESTORE();
-    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
-        if (updatewindow(strm, out)) {
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
+        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
             state->mode = MEM;
             return Z_MEM_ERROR;
         }
@@ -1249,13 +1265,37 @@ z_streamp strm;
     return Z_OK;
 }
 
+int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+Bytef *dictionary;
+uInt *dictLength;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* copy dictionary */
+    if (state->whave && dictionary != Z_NULL) {
+        zmemcpy(dictionary, state->window + state->wnext,
+                state->whave - state->wnext);
+        zmemcpy(dictionary + state->whave - state->wnext,
+                state->window, state->wnext);
+    }
+    if (dictLength != Z_NULL)
+        *dictLength = state->whave;
+    return Z_OK;
+}
+
 int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
 z_streamp strm;
 const Bytef *dictionary;
 uInt dictLength;
 {
     struct inflate_state FAR *state;
-    unsigned long id;
+    unsigned long dictid;
+    int ret;
 
     /* check state */
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
@@ -1263,29 +1303,21 @@ uInt dictLength;
     if (state->wrap != 0 && state->mode != DICT)
         return Z_STREAM_ERROR;
 
-    /* check for correct dictionary id */
+    /* check for correct dictionary identifier */
     if (state->mode == DICT) {
-        id = adler32(0L, Z_NULL, 0);
-        id = adler32(id, dictionary, dictLength);
-        if (id != state->check)
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
             return Z_DATA_ERROR;
     }
 
-    /* copy dictionary to window */
-    if (updatewindow(strm, strm->avail_out)) {
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+    if (ret) {
         state->mode = MEM;
         return Z_MEM_ERROR;
     }
-    if (dictLength > state->wsize) {
-        zmemcpy(state->window, dictionary + dictLength - state->wsize,
-                state->wsize);
-        state->whave = state->wsize;
-    }
-    else {
-        zmemcpy(state->window + state->wsize - dictLength, dictionary,
-                dictLength);
-        state->whave = dictLength;
-    }
     state->havedict = 1;
     Tracev((stderr, "inflate:   dictionary set\n"));
     return Z_OK;
@@ -1321,7 +1353,7 @@ gz_headerp head;
  */
 local unsigned syncsearch(have, buf, len)
 unsigned FAR *have;
-unsigned char FAR *buf;
+const unsigned char FAR *buf;
 unsigned len;
 {
     unsigned got;
@@ -1433,8 +1465,8 @@ z_streamp source;
     }
 
     /* copy state */
-    zmemcpy(dest, source, sizeof(z_stream));
-    zmemcpy(copy, state, sizeof(struct inflate_state));
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
     if (state->lencode >= state->codes &&
         state->lencode <= state->codes + ENOUGH - 1) {
         copy->lencode = copy->codes + (state->lencode - state->codes);
diff --git a/Source/3rd Party/zlib/inftrees.c b/Source/3rd Party/zlib/inftrees.c
index 11e9c52ac..44d89cf24 100644
--- a/Source/3rd Party/zlib/inftrees.c	
+++ b/Source/3rd Party/zlib/inftrees.c	
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";
+   " inflate 1.2.8 Copyright 1995-2013 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -208,8 +208,8 @@ unsigned short FAR *work;
     mask = used - 1;            /* mask for comparing low */
 
     /* check available table space */
-    if ((type == LENS && used >= ENOUGH_LENS) ||
-        (type == DISTS && used >= ENOUGH_DISTS))
+    if ((type == LENS && used > ENOUGH_LENS) ||
+        (type == DISTS && used > ENOUGH_DISTS))
         return 1;
 
     /* process all codes and make table entries */
@@ -277,8 +277,8 @@ unsigned short FAR *work;
 
             /* check for enough space */
             used += 1U << curr;
-            if ((type == LENS && used >= ENOUGH_LENS) ||
-                (type == DISTS && used >= ENOUGH_DISTS))
+            if ((type == LENS && used > ENOUGH_LENS) ||
+                (type == DISTS && used > ENOUGH_DISTS))
                 return 1;
 
             /* point entry in root table to sub-table */
@@ -289,38 +289,14 @@ unsigned short FAR *work;
         }
     }
 
-    /*
-       Fill in rest of table for incomplete codes.  This loop is similar to the
-       loop above in incrementing huff for table indices.  It is assumed that
-       len is equal to curr + drop, so there is no loop needed to increment
-       through high index bits.  When the current sub-table is filled, the loop
-       drops back to the root table to fill in any remaining entries there.
-     */
-    here.op = (unsigned char)64;                /* invalid code marker */
-    here.bits = (unsigned char)(len - drop);
-    here.val = (unsigned short)0;
-    while (huff != 0) {
-        /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & mask) != low) {
-            drop = 0;
-            len = root;
-            next = *table;
-            here.bits = (unsigned char)len;
-        }
-
-        /* put invalid code marker in table */
-        next[huff >> drop] = here;
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
+       at most one remaining entry, since if the code is incomplete, the
+       maximum code length that was allowed to get this far is one bit) */
+    if (huff != 0) {
+        here.op = (unsigned char)64;            /* invalid code marker */
+        here.bits = (unsigned char)(len - drop);
+        here.val = (unsigned short)0;
+        next[huff] = here;
     }
 
     /* set return parameters */
diff --git a/Source/3rd Party/zlib/trees.c b/Source/3rd Party/zlib/trees.c
index 747ca2944..1fd7759ef 100644
--- a/Source/3rd Party/zlib/trees.c	
+++ b/Source/3rd Party/zlib/trees.c	
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2010 Jean-loup Gailly
+ * Copyright (C) 1995-2012 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -74,11 +74,6 @@ local const uch bl_order[BL_CODES]
  * probability, to avoid transmitting the lengths for unused bit length codes.
  */
 
-#define Buf_size (8 * 2*sizeof(char))
-/* Number of bits used within bi_buf. (bi_buf might be implemented on
- * more than 16 bits on some systems.)
- */
-
 /* ===========================================================================
  * Local data. These are initialized only once.
  */
@@ -151,8 +146,8 @@ local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
 local int  build_bl_tree  OF((deflate_state *s));
 local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
                               int blcodes));
-local void compress_block OF((deflate_state *s, ct_data *ltree,
-                              ct_data *dtree));
+local void compress_block OF((deflate_state *s, const ct_data *ltree,
+                              const ct_data *dtree));
 local int  detect_data_type OF((deflate_state *s));
 local unsigned bi_reverse OF((unsigned value, int length));
 local void bi_windup      OF((deflate_state *s));
@@ -204,7 +199,7 @@ local void send_bits(s, value, length)
      * unused bits in value.
      */
     if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid) & 0xFFFF;
+        s->bi_buf |= (ush)value << s->bi_valid;
         put_short(s, s->bi_buf);
         s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
         s->bi_valid += length - Buf_size;
@@ -399,7 +394,6 @@ void ZLIB_INTERNAL _tr_init(s)
 
     s->bi_buf = 0;
     s->bi_valid = 0;
-    s->last_eob_len = 8; /* enough lookahead for inflate */
 #ifdef DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
@@ -882,16 +876,18 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
     copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
 }
 
+/* ===========================================================================
+ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
+ */
+void ZLIB_INTERNAL _tr_flush_bits(s)
+    deflate_state *s;
+{
+    bi_flush(s);
+}
+
 /* ===========================================================================
  * Send one empty static block to give enough lookahead for inflate.
  * This takes 10 bits, of which 7 may remain in the bit buffer.
- * The current inflate code requires 9 bits of lookahead. If the
- * last two codes for the previous block (real code plus EOB) were coded
- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
- * the last real code. In this case we send two empty static blocks instead
- * of one. (There are no problems if the previous block is stored or fixed.)
- * To simplify the code, we assume the worst case of last real code encoded
- * on one bit only.
  */
 void ZLIB_INTERNAL _tr_align(s)
     deflate_state *s;
@@ -902,20 +898,6 @@ void ZLIB_INTERNAL _tr_align(s)
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
 #endif
     bi_flush(s);
-    /* Of the 10 bits for the empty block, we have already sent
-     * (10 - bi_valid) bits. The lookahead for the last real code (before
-     * the EOB of the previous block) was thus at least one plus the length
-     * of the EOB plus what we have just sent of the empty static block.
-     */
-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
-        send_bits(s, STATIC_TREES<<1, 3);
-        send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-        s->compressed_len += 10L;
-#endif
-        bi_flush(s);
-    }
-    s->last_eob_len = 7;
 }
 
 /* ===========================================================================
@@ -990,7 +972,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
     } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
 #endif
         send_bits(s, (STATIC_TREES<<1)+last, 3);
-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+        compress_block(s, (const ct_data *)static_ltree,
+                       (const ct_data *)static_dtree);
 #ifdef DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
@@ -998,7 +981,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         send_bits(s, (DYN_TREES<<1)+last, 3);
         send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
                        max_blindex+1);
-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
+        compress_block(s, (const ct_data *)s->dyn_ltree,
+                       (const ct_data *)s->dyn_dtree);
 #ifdef DEBUG
         s->compressed_len += 3 + s->opt_len;
 #endif
@@ -1075,8 +1059,8 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
  */
 local void compress_block(s, ltree, dtree)
     deflate_state *s;
-    ct_data *ltree; /* literal tree */
-    ct_data *dtree; /* distance tree */
+    const ct_data *ltree; /* literal tree */
+    const ct_data *dtree; /* distance tree */
 {
     unsigned dist;      /* distance of matched string */
     int lc;             /* match length or unmatched char (if dist == 0) */
@@ -1118,7 +1102,6 @@ local void compress_block(s, ltree, dtree)
     } while (lx < s->last_lit);
 
     send_code(s, END_BLOCK, ltree);
-    s->last_eob_len = ltree[END_BLOCK].Len;
 }
 
 /* ===========================================================================
@@ -1226,7 +1209,6 @@ local void copy_block(s, buf, len, header)
     int      header;  /* true if block header must be written */
 {
     bi_windup(s);        /* align on byte boundary */
-    s->last_eob_len = 8; /* enough lookahead for inflate */
 
     if (header) {
         put_short(s, (ush)len);
diff --git a/Source/3rd Party/zlib/uncompr.c b/Source/3rd Party/zlib/uncompr.c
index ad98be3a5..242e9493d 100644
--- a/Source/3rd Party/zlib/uncompr.c	
+++ b/Source/3rd Party/zlib/uncompr.c	
@@ -30,7 +30,7 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen)
     z_stream stream;
     int err;
 
-    stream.next_in = (Bytef*)source;
+    stream.next_in = (z_const Bytef *)source;
     stream.avail_in = (uInt)sourceLen;
     /* Check for source > 64K on 16-bit machine: */
     if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
diff --git a/Source/3rd Party/zlib/zconf.h b/Source/3rd Party/zlib/zconf.h
index 02ce56c43..9987a7755 100644
--- a/Source/3rd Party/zlib/zconf.h	
+++ b/Source/3rd Party/zlib/zconf.h	
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -15,11 +15,13 @@
  * this permanently in zconf.h using "./configure --zprefix".
  */
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
 
 /* all linked symbols */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
 #  define _tr_flush_block       z__tr_flush_block
 #  define _tr_init              z__tr_init
 #  define _tr_stored_block      z__tr_stored_block
@@ -27,9 +29,11 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
@@ -40,44 +44,53 @@
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
 #  define deflatePrime          z_deflatePrime
 #  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
 #  define deflateSetDictionary  z_deflateSetDictionary
 #  define deflateSetHeader      z_deflateSetHeader
 #  define deflateTune           z_deflateTune
 #  define deflate_copyright     z_deflate_copyright
 #  define get_crc_table         z_get_crc_table
-#  define gz_error              z_gz_error
-#  define gz_intmax             z_gz_intmax
-#  define gz_strwinerror        z_gz_strwinerror
-#  define gzbuffer              z_gzbuffer
-#  define gzclearerr            z_gzclearerr
-#  define gzclose               z_gzclose
-#  define gzclose_r             z_gzclose_r
-#  define gzclose_w             z_gzclose_w
-#  define gzdirect              z_gzdirect
-#  define gzdopen               z_gzdopen
-#  define gzeof                 z_gzeof
-#  define gzerror               z_gzerror
-#  define gzflush               z_gzflush
-#  define gzgetc                z_gzgetc
-#  define gzgets                z_gzgets
-#  define gzoffset              z_gzoffset
-#  define gzoffset64            z_gzoffset64
-#  define gzopen                z_gzopen
-#  define gzopen64              z_gzopen64
-#  define gzprintf              z_gzprintf
-#  define gzputc                z_gzputc
-#  define gzputs                z_gzputs
-#  define gzread                z_gzread
-#  define gzrewind              z_gzrewind
-#  define gzseek                z_gzseek
-#  define gzseek64              z_gzseek64
-#  define gzsetparams           z_gzsetparams
-#  define gztell                z_gztell
-#  define gztell64              z_gztell64
-#  define gzungetc              z_gzungetc
-#  define gzwrite               z_gzwrite
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzwrite               z_gzwrite
+#  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
@@ -92,16 +105,22 @@
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
 #  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
+#  define inflateResetKeep      z_inflateResetKeep
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
-#  define uncompress            z_uncompress
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#  endif
 #  define zError                z_zError
-#  define zcalloc               z_zcalloc
-#  define zcfree                z_zcfree
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
 #  define zlibCompileFlags      z_zlibCompileFlags
 #  define zlibVersion           z_zlibVersion
 
@@ -111,7 +130,9 @@
 #  define alloc_func            z_alloc_func
 #  define charf                 z_charf
 #  define free_func             z_free_func
-#  define gzFile                z_gzFile
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
 #  define gz_header             z_gz_header
 #  define gz_headerp            z_gz_headerp
 #  define in_func               z_in_func
@@ -197,6 +218,12 @@
 #  endif
 #endif
 
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
 /* Some Mac compilers merge all .h files incorrectly: */
 #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
 #  define NO_DUMMY_DECL
@@ -243,6 +270,14 @@
 #  endif
 #endif
 
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
@@ -356,12 +391,47 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
 #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_UNISTD_H
 #endif
 
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
 #ifdef STDC
-#  include <sys/types.h>    /* for off_t */
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
 #endif
 
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
@@ -370,21 +440,38 @@ typedef uLong FAR uLongf;
  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
  * equivalently requesting no 64-bit operations
  */
-#if -_LARGEFILE64_SOURCE - -1 == 1
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#  include <unistd.h>       /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>     /* for off_t */
-#  endif
-#  ifndef z_off_t
-#    define z_off_t off_t
+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+#  define Z_HAVE_UNISTD_H
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
 #  endif
 #endif
 
-#ifndef SEEK_SET
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
@@ -394,18 +481,14 @@ typedef uLong FAR uLongf;
 #  define z_off_t long
 #endif
 
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  define z_off64_t z_off_t
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */
diff --git a/Source/3rd Party/zlib/zconf.h.in b/Source/3rd Party/zlib/zconf.h.in
index 02ce56c43..9987a7755 100644
--- a/Source/3rd Party/zlib/zconf.h.in	
+++ b/Source/3rd Party/zlib/zconf.h.in	
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -15,11 +15,13 @@
  * this permanently in zconf.h using "./configure --zprefix".
  */
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
 
 /* all linked symbols */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
 #  define _tr_flush_block       z__tr_flush_block
 #  define _tr_init              z__tr_init
 #  define _tr_stored_block      z__tr_stored_block
@@ -27,9 +29,11 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
@@ -40,44 +44,53 @@
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
 #  define deflatePrime          z_deflatePrime
 #  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
 #  define deflateSetDictionary  z_deflateSetDictionary
 #  define deflateSetHeader      z_deflateSetHeader
 #  define deflateTune           z_deflateTune
 #  define deflate_copyright     z_deflate_copyright
 #  define get_crc_table         z_get_crc_table
-#  define gz_error              z_gz_error
-#  define gz_intmax             z_gz_intmax
-#  define gz_strwinerror        z_gz_strwinerror
-#  define gzbuffer              z_gzbuffer
-#  define gzclearerr            z_gzclearerr
-#  define gzclose               z_gzclose
-#  define gzclose_r             z_gzclose_r
-#  define gzclose_w             z_gzclose_w
-#  define gzdirect              z_gzdirect
-#  define gzdopen               z_gzdopen
-#  define gzeof                 z_gzeof
-#  define gzerror               z_gzerror
-#  define gzflush               z_gzflush
-#  define gzgetc                z_gzgetc
-#  define gzgets                z_gzgets
-#  define gzoffset              z_gzoffset
-#  define gzoffset64            z_gzoffset64
-#  define gzopen                z_gzopen
-#  define gzopen64              z_gzopen64
-#  define gzprintf              z_gzprintf
-#  define gzputc                z_gzputc
-#  define gzputs                z_gzputs
-#  define gzread                z_gzread
-#  define gzrewind              z_gzrewind
-#  define gzseek                z_gzseek
-#  define gzseek64              z_gzseek64
-#  define gzsetparams           z_gzsetparams
-#  define gztell                z_gztell
-#  define gztell64              z_gztell64
-#  define gzungetc              z_gzungetc
-#  define gzwrite               z_gzwrite
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzwrite               z_gzwrite
+#  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
@@ -92,16 +105,22 @@
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
 #  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
+#  define inflateResetKeep      z_inflateResetKeep
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
-#  define uncompress            z_uncompress
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#  endif
 #  define zError                z_zError
-#  define zcalloc               z_zcalloc
-#  define zcfree                z_zcfree
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
 #  define zlibCompileFlags      z_zlibCompileFlags
 #  define zlibVersion           z_zlibVersion
 
@@ -111,7 +130,9 @@
 #  define alloc_func            z_alloc_func
 #  define charf                 z_charf
 #  define free_func             z_free_func
-#  define gzFile                z_gzFile
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
 #  define gz_header             z_gz_header
 #  define gz_headerp            z_gz_headerp
 #  define in_func               z_in_func
@@ -197,6 +218,12 @@
 #  endif
 #endif
 
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
 /* Some Mac compilers merge all .h files incorrectly: */
 #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
 #  define NO_DUMMY_DECL
@@ -243,6 +270,14 @@
 #  endif
 #endif
 
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
@@ -356,12 +391,47 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
 #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_UNISTD_H
 #endif
 
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
 #ifdef STDC
-#  include <sys/types.h>    /* for off_t */
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
 #endif
 
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
@@ -370,21 +440,38 @@ typedef uLong FAR uLongf;
  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
  * equivalently requesting no 64-bit operations
  */
-#if -_LARGEFILE64_SOURCE - -1 == 1
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#  include <unistd.h>       /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>     /* for off_t */
-#  endif
-#  ifndef z_off_t
-#    define z_off_t off_t
+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+#  define Z_HAVE_UNISTD_H
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
 #  endif
 #endif
 
-#ifndef SEEK_SET
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
@@ -394,18 +481,14 @@ typedef uLong FAR uLongf;
 #  define z_off_t long
 #endif
 
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  define z_off64_t z_off_t
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */
diff --git a/Source/3rd Party/zlib/zlib.h b/Source/3rd Party/zlib/zlib.h
index bfbba83e8..3e0c7672a 100644
--- a/Source/3rd Party/zlib/zlib.h	
+++ b/Source/3rd Party/zlib/zlib.h	
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.5, April 19th, 2010
+  version 1.2.8, April 28th, 2013
 
-  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -24,8 +24,8 @@
 
 
   The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
 #ifndef ZLIB_H
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.5"
-#define ZLIB_VERNUM 0x1250
+#define ZLIB_VERSION "1.2.8"
+#define ZLIB_VERNUM 0x1280
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 5
+#define ZLIB_VER_REVISION 8
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -83,15 +83,15 @@ typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
 struct internal_state;
 
 typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
+    z_const Bytef *next_in;     /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
+    uLong    total_in;  /* total number of input bytes read so far */
 
     Bytef    *next_out; /* next output byte should be put there */
     uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
+    uLong    total_out; /* total number of bytes output so far */
 
-    char     *msg;      /* last error message, NULL if no error */
+    z_const char *msg;  /* last error message, NULL if no error */
     struct internal_state FAR *state; /* not visible by applications */
 
     alloc_func zalloc;  /* used to allocate the internal state */
@@ -327,8 +327,9 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 
     Z_FINISH can be used immediately after deflateInit if all the compression
   is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
+  value returned by deflateBound (see below).  Then deflate is guaranteed to
+  return Z_STREAM_END.  If not enough output space is provided, deflate will
+  not return Z_STREAM_END, and it must be called again as described above.
 
     deflate() sets strm->adler to the adler32 checksum of all input read
   so far (that is, total_in bytes).
@@ -451,23 +452,29 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   error.  However if all decompression is to be performed in a single step (a
   single call of inflate), the parameter flush should be set to Z_FINISH.  In
   this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all the uncompressed data.  (The size
-  of the uncompressed data may have been saved by the compressor for this
-  purpose.) The next operation on this stream must be inflateEnd to deallocate
-  the decompression state.  The use of Z_FINISH is never required, but can be
-  used to inform inflate that a faster approach may be used for the single
-  inflate() call.
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
+  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
 
      In this implementation, inflate() always flushes as much output as
   possible to the output buffer, and always uses the faster approach on the
-  first call.  So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK or Z_TREES is used.
+  first call.  So the effects of the flush parameter in this implementation are
+  on the return value of inflate() as noted below, when inflate() returns early
+  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  memory for a sliding window when Z_FINISH is used.
 
      If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
+  strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
   below.  At the end of the stream, inflate() checks that its computed adler32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
@@ -478,7 +485,9 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   initializing with inflateInit2().  Any information contained in the gzip
   header is not retained, so applications that need that information should
   instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.
+  perform their own processing of the gzip header and trailer.  When processing
+  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
+  producted so far.  The CRC-32 is checked against the gzip trailer.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
@@ -580,10 +589,15 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any call
-   of deflate.  The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
+   without producing any compressed output.  When using the zlib format, this
+   function must be called immediately after deflateInit, deflateInit2 or
+   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   function must be called either before any call of deflate, or immediately
+   after the completion of a deflate block, i.e. after all input has been
+   consumed and all output has been delivered when using any of the flush
+   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
+   compressor and decompressor must use exactly the same dictionary (see
+   inflateSetDictionary).
 
      The dictionary should consist of strings (byte sequences) that are likely
    to be encountered later in the data to be compressed, with the most commonly
@@ -610,8 +624,8 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort).  deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
+   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   not perform any compression: this will be done by deflate().
 */
 
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
@@ -688,9 +702,29 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
    deflation of sourceLen bytes.  It must be called after deflateInit() or
    deflateInit2(), and after deflateSetHeader(), if used.  This would be used
    to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().
+   called before deflate().  If that first deflate() call is provided the
+   sourceLen input bytes, an output buffer allocated to the size returned by
+   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+   to return Z_STREAM_END.  Note that it is possible for the compressed size to
+   be larger than the value returned by deflateBound() if flush options other
+   than Z_FINISH or Z_NO_FLUSH are used.
 */
 
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+                                       unsigned *pending,
+                                       int *bits));
+/*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+ */
+
 ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
                                      int bits,
                                      int value));
@@ -703,8 +737,9 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
    than or equal to 16, and that many of the least significant bits of value
    will be inserted in the output.
 
-     deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
+     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   source stream state was inconsistent.
 */
 
 ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
@@ -790,10 +825,11 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
    can be determined from the adler32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
+   deflateSetDictionary).  For raw inflate, this function can be called at any
+   time to set the dictionary.  If the provided dictionary is smaller than the
+   window and there is already data in the window, then the provided dictionary
+   will amend what's there.  The application must insure that the dictionary
+   that was used for compression is provided.
 
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
@@ -803,19 +839,38 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    inflate().
 */
 
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
 ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
 /*
-     Skips invalid compressed data until a full flush point (see above the
-   description of deflate with Z_FULL_FLUSH) can be found, or until all
+     Skips invalid compressed data until a possible full flush point (see above
+   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
    available input is skipped.  No output is provided.
 
-     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-   if no more input was provided, Z_DATA_ERROR if no flush point has been
-   found, or Z_STREAM_ERROR if the stream structure was inconsistent.  In the
-   success case, the application may save the current current value of total_in
-   which indicates where valid compressed data was found.  In the error case,
-   the application may repeatedly call inflateSync, providing more input each
-   time, until success or end of the input data.
+     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+   All full flush points have this pattern, but not all occurrences of this
+   pattern are full flush points.
+
+     inflateSync returns Z_OK if a possible full flush point has been found,
+   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   In the success case, the application may save the current current value of
+   total_in which indicates where valid compressed data was found.  In the
+   error case, the application may repeatedly call inflateSync, providing more
+   input each time, until success or end of the input data.
 */
 
 ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
@@ -962,12 +1017,13 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
      See inflateBack() for the usage of these routines.
 
      inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not be
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
    allocated, or Z_VERSION_ERROR if the version of the library does not match
    the version of the header file.
 */
 
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
 typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
 
 ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
@@ -975,11 +1031,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
                                     out_func out, void FAR *out_desc));
 /*
      inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
 
      inflateBackInit() must be called first to allocate the internal state
    and to initialize the state with the user-provided window buffer.
@@ -1088,6 +1145,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
      27-31: 0 (reserved)
  */
 
+#ifndef Z_SOLO
 
                         /* utility functions */
 
@@ -1149,10 +1207,11 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   the case where there is not enough room, uncompress() will fill the output
+   buffer with the uncompressed data up to that point.
 */
 
-
                         /* gzip file access functions */
 
 /*
@@ -1162,7 +1221,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    wrapper, documented in RFC 1952, wrapped around a deflate stream.
 */
 
-typedef voidp gzFile;       /* opaque gzip file descriptor */
+typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
 
 /*
 ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
@@ -1172,13 +1231,28 @@ ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
    a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
    compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
    for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.) Also "a"
-   can be used instead of "w" to request that the gzip stream that will be
-   written be appended to the file.  "+" will result in an error, since reading
-   and writing to the same gzip file is not supported.
+   deflateInit2 for more information about the strategy parameter.)  'T' will
+   request transparent writing or appending with no compression and not using
+   the gzip format.
+
+     "a" can be used instead of "w" to request that the gzip stream that will
+   be written be appended to the file.  "+" will result in an error, since
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
+
+     These functions, as well as gzip, will read and decode a sequence of gzip
+   streams in a file.  The append function of gzopen() can be used to create
+   such a file.  (Also see gzflush() for another way to do this.)  When
+   appending, gzopen does not test whether the file begins with a gzip stream,
+   nor does it look for the end of the gzip streams to begin appending.  gzopen
+   will simply append a gzip stream to the existing file.
 
      gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
+   case gzread will directly read from the file without decompression.  When
+   reading, this will be detected automatically by looking for the magic two-
+   byte gzip header.
 
      gzopen returns NULL if the file could not be opened, if there was
    insufficient memory to allocate the gzFile state, or if an invalid mode was
@@ -1197,7 +1271,11 @@ ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
    descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
    fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
    mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.
+   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   file descriptor from a FILE *, then you will have to use dup() to avoid
+   double-close()ing the file descriptor.  Both gzclose() and fclose() will
+   close the associated file descriptor, so they need to have different file
+   descriptors.
 
      gzdopen returns NULL if there was insufficient memory to allocate the
    gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
@@ -1235,14 +1313,26 @@ ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
 /*
      Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file was not in gzip format, gzread copies the given number of
-   bytes into the buffer.
+   the input file is not in gzip format, gzread copies the given number of
+   bytes into the buffer directly from the file.
 
      After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream, or failing that, reading the rest
-   of the input file directly without decompression.  The entire input file
-   will be read if gzread is called until it returns less than the requested
-   len.
+   to read, looking for another gzip stream.  Any number of gzip streams may be
+   concatenated in the input file, and will all be decompressed by gzread().
+   If something other than a gzip stream is encountered after a gzip stream,
+   that remaining trailing garbage is ignored (and no error is returned).
+
+     gzread can be used to read a gzip file that is being concurrently written.
+   Upon reaching the end of the input, gzread will return with the available
+   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+   gzclearerr can be used to clear the end of file indicator in order to permit
+   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
+   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
+   middle of a gzip stream.  Note that gzread does not return -1 in the event
+   of an incomplete gzip stream.  This error is deferred until gzclose(), which
+   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+   stream.  Alternatively, gzerror can be used before gzclose to detect this
+   case.
 
      gzread returns the number of uncompressed bytes actually read, less than
    len for end of file, or -1 for error.
@@ -1256,7 +1346,7 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
    error.
 */
 
-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
@@ -1301,7 +1391,10 @@ ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
 ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
 /*
      Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.
+   in case of end of file or error.  This is implemented as a macro for speed.
+   As such, it does not do all of the checking the other functions do.  I.e.
+   it does not check to see if file is NULL, nor whether the structure file
+   points to has been clobbered or not.
 */
 
 ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
@@ -1397,9 +1490,7 @@ ZEXTERN int ZEXPORT gzeof OF((gzFile file));
 ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
 /*
      Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.  This state can change from
-   false to true while reading the input file if the end of a gzip stream is
-   reached, but is followed by data that is not another gzip stream.
+   (0) if file is a gzip stream being decompressed.
 
      If the input file is empty, gzdirect() will return true, since the input
    does not contain a gzip stream.
@@ -1408,6 +1499,13 @@ ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
    cause buffers to be allocated to allow reading the file to determine if it
    is a gzip file.  Therefore if gzbuffer() is used, it should be called before
    gzdirect().
+
+     When writing, gzdirect() returns true (1) if transparent writing was
+   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
+   gzdirect() is not needed when writing.  Transparent writing must be
+   explicitly requested, so the application already knows the answer.  When
+   linking statically, using gzdirect() will include all of the zlib code for
+   gzip file reading and decompression, which may not be desired.)
 */
 
 ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
@@ -1419,7 +1517,8 @@ ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
    must not be called more than once on the same allocation.
 
      gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, or Z_OK on success.
+   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   last read ended in the middle of a gzip stream, or Z_OK on success.
 */
 
 ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
@@ -1457,6 +1556,7 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
    file that is being written concurrently.
 */
 
+#endif /* !Z_SOLO */
 
                         /* checksum functions */
 
@@ -1492,16 +1592,17 @@ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
    each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   that the z_off_t type (like off_t) is a signed integer.  If len2 is
+   negative, the result has no meaning or utility.
 */
 
 ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
    updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the for the crc.  Pre- and post-conditioning (one's
-   complement) is performed within this function so it shouldn't be done by the
-   application.
+   initial value for the crc.  Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
 
    Usage example:
 
@@ -1544,17 +1645,42 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                          const char *version,
                                          int stream_size));
 #define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
 #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
         deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                      (int)sizeof(z_stream))
 #define inflateBackInit(strm, windowBits, window) \
         inflateBackInit_((strm), (windowBits), (window), \
-                                            ZLIB_VERSION, sizeof(z_stream))
+                      ZLIB_VERSION, (int)sizeof(z_stream))
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure.  Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro.  The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously.  They can
+ * only be used by the gzgetc() macro.  You have been warned.
+ */
+struct gzFile_s {
+    unsigned have;
+    unsigned char *next;
+    z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
  * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
@@ -1562,7 +1688,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
  * functions are changed to 64 bits) -- in case these are set on systems
  * without large file support, _LFS64_LARGEFILE must also be true
  */
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#ifdef Z_LARGE64
    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
@@ -1571,14 +1697,23 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
 #endif
 
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-#  define gzopen gzopen64
-#  define gzseek gzseek64
-#  define gztell gztell64
-#  define gzoffset gzoffset64
-#  define adler32_combine adler32_combine64
-#  define crc32_combine crc32_combine64
-#  ifdef _LARGEFILE64_SOURCE
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#  ifdef Z_PREFIX_SET
+#    define z_gzopen z_gzopen64
+#    define z_gzseek z_gzseek64
+#    define z_gztell z_gztell64
+#    define z_gzoffset z_gzoffset64
+#    define z_adler32_combine z_adler32_combine64
+#    define z_crc32_combine z_crc32_combine64
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#  endif
+#  ifndef Z_LARGE64
      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
@@ -1595,6 +1730,13 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
    ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
 #endif
 
+#else /* Z_SOLO */
+
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+
+#endif /* !Z_SOLO */
+
 /* hack for buggy compilers */
 #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
     struct internal_state {int dummy;};
@@ -1603,8 +1745,21 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
 /* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/Source/3rd Party/zlib/zlib.vcxproj b/Source/3rd Party/zlib/zlib.vcxproj
index 29895db48..2774e1d26 100644
--- a/Source/3rd Party/zlib/zlib.vcxproj	
+++ b/Source/3rd Party/zlib/zlib.vcxproj	
@@ -5,35 +5,37 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{731BD205-2826-4631-B7AF-117658E88DBC}</ProjectGuid>
     <RootNamespace>zlib</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
+      <WarningLevel>Level4</WarningLevel>
+      <DisableSpecificWarnings>4100;4127;4131;4189;4244;4701;4703;4996</DisableSpecificWarnings>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -78,7 +80,4 @@
     <ClInclude Include="contrib\minizip\unzip.h" />
     <ClInclude Include="contrib\minizip\zip.h" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/zlib/zutil.c b/Source/3rd Party/zlib/zutil.c
index 898ed345b..23d2ebef0 100644
--- a/Source/3rd Party/zlib/zutil.c	
+++ b/Source/3rd Party/zlib/zutil.c	
@@ -1,17 +1,20 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
 #include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
 
 #ifndef NO_DUMMY_DECL
 struct internal_state      {int dummy;}; /* for buggy compilers */
 #endif
 
-const char * const z_errmsg[10] = {
+z_const char * const z_errmsg[10] = {
 "need dictionary",     /* Z_NEED_DICT       2  */
 "stream end",          /* Z_STREAM_END      1  */
 "",                    /* Z_OK              0  */
@@ -85,27 +88,27 @@ uLong ZEXPORT zlibCompileFlags()
 #ifdef FASTEST
     flags += 1L << 21;
 #endif
-#ifdef STDC
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifdef NO_vsnprintf
-        flags += 1L << 25;
+    flags += 1L << 25;
 #    ifdef HAS_vsprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  else
 #    ifdef HAS_vsnprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  endif
 #else
-        flags += 1L << 24;
+    flags += 1L << 24;
 #  ifdef NO_snprintf
-        flags += 1L << 25;
+    flags += 1L << 25;
 #    ifdef HAS_sprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  else
 #    ifdef HAS_snprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  endif
 #endif
@@ -181,6 +184,7 @@ void ZLIB_INTERNAL zmemzero(dest, len)
 }
 #endif
 
+#ifndef Z_SOLO
 
 #ifdef SYS16BIT
 
@@ -316,3 +320,5 @@ void ZLIB_INTERNAL zcfree (opaque, ptr)
 }
 
 #endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */
diff --git a/Source/3rd Party/zlib/zutil.h b/Source/3rd Party/zlib/zutil.h
index 258fa8879..24ab06b1c 100644
--- a/Source/3rd Party/zlib/zutil.h	
+++ b/Source/3rd Party/zlib/zutil.h	
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -13,7 +13,7 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#ifdef HAVE_HIDDEN
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL
@@ -21,7 +21,7 @@
 
 #include "zlib.h"
 
-#ifdef STDC
+#if defined(STDC) && !defined(Z_SOLO)
 #  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
 #    include <stddef.h>
 #  endif
@@ -29,6 +29,10 @@
 #  include <stdlib.h>
 #endif
 
+#ifdef Z_SOLO
+   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
+#endif
+
 #ifndef local
 #  define local static
 #endif
@@ -40,13 +44,13 @@ typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long  ulg;
 
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
 
 #define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
+  return (strm->msg = ERR_MSG(err), (err))
 /* To be used only when the state is known to be valid */
 
         /* common constants */
@@ -78,16 +82,18 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl farfree( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
-#    else
-#      include <alloc.h>
+#  ifndef Z_SOLO
+#    if defined(__TURBOC__) || defined(__BORLANDC__)
+#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+         /* Allow compilation with ANSI keywords only enabled */
+         void _Cdecl farfree( void *block );
+         void *_Cdecl farmalloc( unsigned long nbytes );
+#      else
+#        include <alloc.h>
+#      endif
+#    else /* MSC or DJGPP */
+#      include <malloc.h>
 #    endif
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
 #  endif
 #endif
 
@@ -107,18 +113,20 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #ifdef OS2
 #  define OS_CODE  0x06
-#  ifdef M_I86
+#  if defined(M_I86) && !defined(Z_SOLO)
 #    include <malloc.h>
 #  endif
 #endif
 
 #if defined(MACOS) || defined(TARGET_OS_MAC)
 #  define OS_CODE  0x07
-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#    include <unix.h> /* for fdopen */
-#  else
-#    ifndef fdopen
-#      define fdopen(fd,mode) NULL /* No fdopen() */
+#  ifndef Z_SOLO
+#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#      include <unix.h> /* for fdopen */
+#    else
+#      ifndef fdopen
+#        define fdopen(fd,mode) NULL /* No fdopen() */
+#      endif
 #    endif
 #  endif
 #endif
@@ -153,14 +161,15 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__) && !defined(MSDOS)
   #pragma warn -8004
   #pragma warn -8008
   #pragma warn -8066
 #endif
 
 /* provide prototypes for these when building zlib without LFS */
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+#if !defined(_WIN32) && \
+    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 #endif
@@ -177,42 +186,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
          /* functions */
 
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#if defined(__CYGWIN__)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
-     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-        but for now we just assume it doesn't. */
-#    define NO_vsnprintf
-#  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
-#  ifdef WIN32
-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-#         define vsnprintf _vsnprintf
-#      endif
-#    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#endif
-#ifdef VMS
-#  define NO_vsnprintf
-#endif
-
-#if defined(pyr)
+#if defined(pyr) || defined(Z_SOLO)
 #  define NO_MEMCPY
 #endif
 #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
@@ -261,14 +235,19 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define Tracecv(c,x)
 #endif
 
-
-voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                        unsigned size));
-void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#ifndef Z_SOLO
+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                                    unsigned size));
+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#endif
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
 #define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
+/* Reverse the bytes in a 32-bit value */
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
 #endif /* ZUTIL_H */
diff --git a/Source/Common/Common.vcproj b/Source/Common/Common.vcproj
index 9d06dab8e..ecce01f61 100644
--- a/Source/Common/Common.vcproj
+++ b/Source/Common/Common.vcproj
@@ -125,6 +125,10 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath=".\CriticalSection.cpp"
+				>
+			</File>
 			<File
 				RelativePath="File Class.cpp"
 				>
@@ -149,10 +153,6 @@
 				RelativePath="path.cpp"
 				>
 			</File>
-			<File
-				RelativePath="registry.cpp"
-				>
-			</File>
 			<File
 				RelativePath="std string.cpp"
 				>
@@ -214,10 +214,6 @@
 				RelativePath="path.h"
 				>
 			</File>
-			<File
-				RelativePath="registry.h"
-				>
-			</File>
 			<File
 				RelativePath="Smart Pointer.h"
 				>
@@ -230,6 +226,10 @@
 				RelativePath="stdafx.h"
 				>
 			</File>
+			<File
+				RelativePath=".\stdtypes.h"
+				>
+			</File>
 			<File
 				RelativePath="Trace.h"
 				>
diff --git a/Source/Common/Common.vcxproj b/Source/Common/Common.vcxproj
index 2992f2167..caa307a36 100644
--- a/Source/Common/Common.vcxproj
+++ b/Source/Common/Common.vcxproj
@@ -5,41 +5,40 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}</ProjectGuid>
     <RootNamespace>Common</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemGroup>
+    <ClCompile Include="CriticalSection.cpp" />
     <ClCompile Include="File Class.cpp" />
     <ClCompile Include="Ini File Class.cpp" />
     <ClCompile Include="Log Class.cpp" />
     <ClCompile Include="md5.cpp" />
     <ClCompile Include="MemTest.cpp" />
     <ClCompile Include="path.cpp" />
-    <ClCompile Include="registry.cpp" />
     <ClCompile Include="std string.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -54,14 +53,11 @@
     <ClInclude Include="md5.h" />
     <ClInclude Include="MemTest.h" />
     <ClInclude Include="path.h" />
-    <ClInclude Include="registry.h" />
     <ClInclude Include="Smart Pointer.h" />
     <ClInclude Include="std string.h" />
     <ClInclude Include="stdafx.h" />
+    <ClInclude Include="stdtypes.h" />
     <ClInclude Include="Trace.h" />
     <ClInclude Include="TraceDefs.h" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Common/Common.vcxproj.filters b/Source/Common/Common.vcxproj.filters
index 9d36cc727..852dc95bd 100644
--- a/Source/Common/Common.vcxproj.filters
+++ b/Source/Common/Common.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClCompile Include="path.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="registry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="std string.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -41,6 +38,9 @@
     <ClCompile Include="Trace.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="CriticalSection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CriticalSection.h">
@@ -64,9 +64,6 @@
     <ClInclude Include="path.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="registry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Smart Pointer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -82,5 +79,8 @@
     <ClInclude Include="TraceDefs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="stdtypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Common/CriticalSection.cpp b/Source/Common/CriticalSection.cpp
new file mode 100644
index 000000000..05c151cad
--- /dev/null
+++ b/Source/Common/CriticalSection.cpp
@@ -0,0 +1,36 @@
+#include "stdafx.h"
+
+CriticalSection::CriticalSection()
+{
+	m_cs = new CRITICAL_SECTION;
+	::InitializeCriticalSection((CRITICAL_SECTION *)m_cs);
+}
+
+CriticalSection::~CriticalSection(void)
+{
+	::DeleteCriticalSection((CRITICAL_SECTION *)m_cs);
+	delete (CRITICAL_SECTION *)m_cs;
+}
+
+/**
+*	Enters a critical section of code.
+*	Prevents other threads from accessing the section between the enter and leave sections simultaneously.
+*	@note It is good practice to try and keep the critical section code as little as possible, so that
+*		  other threads are not locked waiting for it.
+*/
+void CriticalSection::enter(void)
+{
+	::EnterCriticalSection((CRITICAL_SECTION *)m_cs);
+}
+
+/**
+*	Leaves the critical section.
+*	Allows threads access to the critical code section again.
+*	@warning Note that an exception occurring with a critical section may not result in the expected leave being
+*			 called.  To ensure that your critical section is exception safe, ensure that you wrap the critical
+*			 section in a try catch, and the catch calls the leave method.
+*/
+void CriticalSection::leave(void)
+{
+	::LeaveCriticalSection((CRITICAL_SECTION *)m_cs);
+}
\ No newline at end of file
diff --git a/Source/Common/CriticalSection.h b/Source/Common/CriticalSection.h
index f057c9e3c..db22b0c73 100644
--- a/Source/Common/CriticalSection.h
+++ b/Source/Common/CriticalSection.h
@@ -1,104 +1,33 @@
-/**
- *	@file
- */
 #pragma once
-#include <windows.h>
-#include <exception>
-#include <string>
-/**
- *	Encapsulates a Win32 critical section.
- *	Provides control over creation and clean destruction of native win32 critical sections.  Also
- *  allows the object to be used directly in place of a CRITICAL_SECTION handle via the void* overload
- *	
- *	@author Peter Hancock
- * 
- */
+
 class CriticalSection
 {
 public:
-	/**
-	 *	Create the critical section.
-	 */
-	CriticalSection()
-	{
-		::InitializeCriticalSection(&cs);
-	}
-	/** 
-	 *	Cleans up the critical section.
-	 */
-	~CriticalSection(void)
-	{
-		::DeleteCriticalSection(&cs);
-	}
-	/** 
-	 *	Enters a critical section of code.
-	 *	Prevents other threads from accessing the section between the enter and leave sections simultaneously.
-	 *	@note It is good practice to try and keep the critical section code as little as possible, so that 
-	 *		  other threads are not locked waiting for it.
-	 */
-	void enter(void)
-	{
-		::EnterCriticalSection(&cs);
-	}
-	/**
-	 *	Leaves the critical section.
-	 *	Allows threads access to the critical code section again.
-	 *	@warning Note that an exception occurring with a critical section may not result in the expected leave being
-	 *			 called.  To ensure that your critical section is exception safe, ensure that you wrap the critical 
-	 *			 section in a try catch, and the catch calls the leave method.
-	 */
-	void leave(void)
-	{
-		::LeaveCriticalSection(&cs);
-	}
-	/**
-	 *	Provides conversion to the native WIN32 CRITICAL_SECTION object
-	 *	Allows the client to use the CriticalSection object as a native handle also.
-	 *	@return CRITICAL_SECTION handle
-	 */
-	operator CRITICAL_SECTION&()
-	{
-		return cs;
-	}
+	CriticalSection();
+	~CriticalSection(void);
+
+	void enter(void);
+	void leave(void);
 
 private:
 	CriticalSection(const CriticalSection&);				// Disable copy constructor
 	CriticalSection& operator=(const CriticalSection&);		// Disable assignment
-	CRITICAL_SECTION cs;
+	void * m_cs;
 };
 
-/**
- *	CGuard class provides exception safety for critical sections
- *	A helper class that enters a critical section on construction, and leaves
- *  the critical section on destruction.  
- *
- *	@code 
- 	int i;
- 	{
- 		CGuard loopGuard(moduleCS);			// enters the critical section
-		for(int i=0 ; i < 10 ; i++)
-		{
-			// Do stuff here				// If an exception is thrown here, loopGuard goes out of scope - calling leave()
-		}
-	}	// Guard goes out of scope here, destructor calls leave()
- *	@endcode
- *
- *	@author Peter Hancock
- *
- */
 class CGuard
 {
 public:
-	CGuard(CriticalSection& sectionName) : cs(sectionName)
+	CGuard(CriticalSection& sectionName) : m_cs(sectionName)
 	{
-		cs.enter();
+		m_cs.enter();
 	}
 	~CGuard()
 	{
-		cs.leave();
+		m_cs.leave();
 	}
 private:
-	CriticalSection& cs;
+	CriticalSection& m_cs;
 	CGuard(const CGuard& copy);
 	CGuard &operator=(const CGuard& rhs);
 };
diff --git a/Source/Common/File Class.cpp b/Source/Common/File Class.cpp
index ec01bb536..c5035fb97 100644
--- a/Source/Common/File Class.cpp	
+++ b/Source/Common/File Class.cpp	
@@ -1,210 +1,211 @@
 #include "stdafx.h"
 
+#include <TChar.H>
+
 CFile::CFile() :
-	m_hFile(INVALID_HANDLE_VALUE),
-	m_bCloseOnDelete(false)
+    m_hFile(INVALID_HANDLE_VALUE),
+    m_bCloseOnDelete(false)
 {
 }
 
 CFile::CFile(HANDLE hFile) :
-	m_hFile(hFile),
-	m_bCloseOnDelete(true)
+    m_hFile(hFile),
+    m_bCloseOnDelete(true)
 {
-	if (hFile == 0)
-	{
-		_ASSERTE(hFile != 0);
-	}
+    if (hFile == 0)
+    {
+        _ASSERTE(hFile != 0);
+    }
 }
 
 CFile::~CFile()
 {
-	if (m_hFile != INVALID_HANDLE_VALUE && m_bCloseOnDelete)
-	{
-		Close();
-	}
+    if (m_hFile != INVALID_HANDLE_VALUE && m_bCloseOnDelete)
+    {
+        Close();
+    }
 }
 
-CFile::CFile(LPCTSTR lpszFileName, ULONG nOpenFlags) :
-	m_hFile(INVALID_HANDLE_VALUE),
-	m_bCloseOnDelete(true)
+CFile::CFile(const char * lpszFileName, uint32_t nOpenFlags) :
+    m_hFile(INVALID_HANDLE_VALUE),
+    m_bCloseOnDelete(true)
 {
-	Open(lpszFileName, nOpenFlags);
+    Open(lpszFileName, nOpenFlags);
 }
 
-bool CFile::Open(LPCTSTR lpszFileName, ULONG nOpenFlags)
+bool CFile::Open(const char * lpszFileName, uint32_t nOpenFlags)
 {
-	if (!Close())
-	{
-		return false;
-	}
+    if (!Close())
+    {
+        return false;
+    }
 
-	if (lpszFileName == NULL || _tcslen(lpszFileName) == 0)
-	{
-		return false;
-	}
+    if (lpszFileName == NULL || _tcslen(lpszFileName) == 0)
+    {
+        return false;
+    }
 
-	m_bCloseOnDelete = true;
-	m_hFile = INVALID_HANDLE_VALUE;
+    m_bCloseOnDelete = true;
+    m_hFile = INVALID_HANDLE_VALUE;
 
-	ULONG dwAccess = 0;
-	switch (nOpenFlags & 3)
-	{
-	case modeRead:
-		dwAccess = GENERIC_READ;
-		break;
-	case modeWrite:
-		dwAccess = GENERIC_WRITE;
-		break;
-	case modeReadWrite:
-		dwAccess = GENERIC_READ|GENERIC_WRITE;
-		break;
-	default:
-		_ASSERTE(false);
-	}
+    ULONG dwAccess = 0;
+    switch (nOpenFlags & 3)
+    {
+    case modeRead:
+        dwAccess = GENERIC_READ;
+        break;
+    case modeWrite:
+        dwAccess = GENERIC_WRITE;
+        break;
+    case modeReadWrite:
+        dwAccess = GENERIC_READ|GENERIC_WRITE;
+        break;
+    default:
+        _ASSERTE(false);
+    }
 
-	// map share mode
-	ULONG dwShareMode = 0;
-	
-	dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
-	if ((nOpenFlags & shareDenyWrite) == shareDenyWrite) { dwShareMode &= ~FILE_SHARE_WRITE; }
-	if ((nOpenFlags & shareDenyRead) == shareDenyRead)   { dwShareMode &= ~FILE_SHARE_READ; }
-	if ((nOpenFlags & shareExclusive) == shareExclusive) { dwShareMode = 0; }
+    // map share mode
+    ULONG dwShareMode = 0;
 
-	// map modeNoInherit flag
-	SECURITY_ATTRIBUTES sa;
-	sa.nLength = sizeof(sa);
-	sa.lpSecurityDescriptor = NULL;
-	sa.bInheritHandle = (nOpenFlags & modeNoInherit) == 0;
+    dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
+    if ((nOpenFlags & shareDenyWrite) == shareDenyWrite) { dwShareMode &= ~FILE_SHARE_WRITE; }
+    if ((nOpenFlags & shareDenyRead) == shareDenyRead)   { dwShareMode &= ~FILE_SHARE_READ; }
+    if ((nOpenFlags & shareExclusive) == shareExclusive) { dwShareMode = 0; }
 
-	// map creation flags
-	ULONG dwCreateFlag = 0;
-	if (nOpenFlags & modeCreate)
-	{
-		if (nOpenFlags & modeNoTruncate)
-			dwCreateFlag = OPEN_ALWAYS;
-		else
-			dwCreateFlag = CREATE_ALWAYS;
-	}
-	else
-		dwCreateFlag = OPEN_EXISTING;
+    // map modeNoInherit flag
+    SECURITY_ATTRIBUTES sa;
+    sa.nLength = sizeof(sa);
+    sa.lpSecurityDescriptor = NULL;
+    sa.bInheritHandle = (nOpenFlags & modeNoInherit) == 0;
 
-	// attempt file creation
-	HANDLE hFile = ::CreateFile(lpszFileName, dwAccess, dwShareMode, &sa,
-		dwCreateFlag, FILE_ATTRIBUTE_NORMAL, NULL);
-	if (hFile == INVALID_HANDLE_VALUE)
-	{ //#define ERROR_PATH_NOT_FOUND             3L
-		//ULONG err = GetLastError();
-		return false;
-	}
-	m_hFile = hFile;
-	m_bCloseOnDelete = TRUE;
+    // map creation flags
+    ULONG dwCreateFlag = 0;
+    if (nOpenFlags & modeCreate)
+    {
+        if (nOpenFlags & modeNoTruncate)
+            dwCreateFlag = OPEN_ALWAYS;
+        else
+            dwCreateFlag = CREATE_ALWAYS;
+    }
+    else
+        dwCreateFlag = OPEN_EXISTING;
 
-	return TRUE;
+    // attempt file creation
+    HANDLE hFile = ::CreateFile(lpszFileName, dwAccess, dwShareMode, &sa,
+        dwCreateFlag, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (hFile == INVALID_HANDLE_VALUE)
+    { //#define ERROR_PATH_NOT_FOUND             3L
+        //ULONG err = GetLastError();
+        return false;
+    }
+    m_hFile = hFile;
+    m_bCloseOnDelete = TRUE;
+
+    return TRUE;
 }
 
 bool CFile::Close()
 {
-	bool bError = true;
-	if (m_hFile != INVALID_HANDLE_VALUE)
-	{
-		bError = !::CloseHandle(m_hFile);
-	}
-	m_hFile = INVALID_HANDLE_VALUE;
-	m_bCloseOnDelete = false;
-	return bError;
+    bool bError = true;
+    if (m_hFile != INVALID_HANDLE_VALUE)
+    {
+        bError = !::CloseHandle(m_hFile);
+    }
+    m_hFile = INVALID_HANDLE_VALUE;
+    m_bCloseOnDelete = false;
+    return bError;
 }
 
-ULONG CFile::SeekToEnd ( void )
-{ 
-	return Seek(0, CFile::end); 
+uint32_t CFile::SeekToEnd ( void )
+{
+    return Seek(0, CFile::end);
 }
 
 void CFile::SeekToBegin ( void )
 {
-	Seek(0, CFile::begin);
+    Seek(0, CFile::begin);
 }
 
 bool CFile::IsOpen( void ) const
 {
-	return m_hFile != INVALID_HANDLE_VALUE;
+    return m_hFile != INVALID_HANDLE_VALUE;
 }
 
 bool CFile::Flush()
 {
-	if (m_hFile == INVALID_HANDLE_VALUE)
-	{
-		return true;
-	}
+    if (m_hFile == INVALID_HANDLE_VALUE)
+    {
+        return true;
+    }
 
-	return ::FlushFileBuffers(m_hFile) != 0;
+    return ::FlushFileBuffers(m_hFile) != 0;
 }
 
-bool CFile::Write(const void* lpBuf, ULONG nCount)
+bool CFile::Write(const void* lpBuf, uint32_t nCount)
 {
-	if (nCount == 0)
-	{
-		return true;     // avoid Win32 "null-write" option
-	}
+    if (nCount == 0)
+    {
+        return true;     // avoid Win32 "null-write" option
+    }
 
-	ULONG nWritten = 0;
-	if (!::WriteFile(m_hFile, lpBuf, nCount, &nWritten, NULL))
-	{
-		return false;
-	}
+    ULONG nWritten = 0;
+    if (!::WriteFile(m_hFile, lpBuf, nCount, &nWritten, NULL))
+    {
+        return false;
+    }
 
-	if (nWritten != nCount)
-	{
-		// Win32s will not return an error all the time (usually DISK_FULL)
-		return false;
-	}
-	return true;
+    if (nWritten != nCount)
+    {
+        // Win32s will not return an error all the time (usually DISK_FULL)
+        return false;
+    }
+    return true;
 }
 
-ULONG CFile::Read(void* lpBuf, ULONG nCount)
+uint32_t CFile::Read(void* lpBuf, uint32_t nCount)
 {
-	if (nCount == 0)
-	{
-		return 0;   // avoid Win32 "null-read"
-	}
+    if (nCount == 0)
+    {
+        return 0;   // avoid Win32 "null-read"
+    }
 
-	ULONG dwRead = 0;
-	if (!::ReadFile(m_hFile, lpBuf, nCount, &dwRead, NULL))
-	{
-		return 0;
-	}
-	return (UINT)dwRead;
+    ULONG dwRead = 0;
+    if (!::ReadFile(m_hFile, lpBuf, nCount, &dwRead, NULL))
+    {
+        return 0;
+    }
+    return (UINT)dwRead;
 }
 
 long CFile::Seek(long lOff, SeekPosition nFrom)
 {
-	ULONG dwNew = ::SetFilePointer(m_hFile, lOff, NULL, (ULONG)nFrom);
-	if (dwNew  == (ULONG)-1)
-	{
-		return -1;
-	}
+    ULONG dwNew = ::SetFilePointer(m_hFile, lOff, NULL, (ULONG)nFrom);
+    if (dwNew  == (ULONG)-1)
+    {
+        return -1;
+    }
 
-	return dwNew;
+    return dwNew;
 }
 
-ULONG CFile::GetPosition() const
+uint32_t CFile::GetPosition() const
 {
-	return ::SetFilePointer(m_hFile, 0, NULL, FILE_CURRENT);
+    return ::SetFilePointer(m_hFile, 0, NULL, FILE_CURRENT);
 }
 
-bool CFile::SetLength(ULONG dwNewLen)
+bool CFile::SetLength(uint32_t dwNewLen)
 {
-	Seek((LONG)dwNewLen, begin);
+    Seek((LONG)dwNewLen, begin);
 
-	return ::SetEndOfFile(m_hFile) != 0;
+    return ::SetEndOfFile(m_hFile) != 0;
 }
 
-ULONG CFile::GetLength() const
+uint32_t CFile::GetLength() const
 {
-	return GetFileSize(m_hFile,0);
+    return GetFileSize(m_hFile,0);
 }
 
 bool CFile::SetEndOfFile()
 {
-	return ::SetEndOfFile(m_hFile) != 0;
+    return ::SetEndOfFile(m_hFile) != 0;
 }
-
diff --git a/Source/Common/File Class.h b/Source/Common/File Class.h
index 2a0039f8c..a491febaf 100644
--- a/Source/Common/File Class.h	
+++ b/Source/Common/File Class.h	
@@ -1,90 +1,86 @@
-#ifndef __FILE_CLASS__H__
-#define __FILE_CLASS__H__
+#pragma once
+
+#include "stdtypes.h"
 
 class CFileBase
 {
 public:
-	enum OpenFlags {
-		modeRead =          0x0000,
-		modeWrite =         0x0001,
-		modeReadWrite =     0x0002,
-		shareCompat =       0x0000,
-		shareExclusive =    0x0010,
-		shareDenyWrite =    0x0020,
-		shareDenyRead =     0x0030,
-		shareDenyNone =     0x0040,
-		modeNoInherit =     0x0080,
-		modeCreate =        0x1000,
-		modeNoTruncate =    0x2000,
-	};
+    enum OpenFlags {
+        modeRead =          0x0000,
+        modeWrite =         0x0001,
+        modeReadWrite =     0x0002,
+        shareCompat =       0x0000,
+        shareExclusive =    0x0010,
+        shareDenyWrite =    0x0020,
+        shareDenyRead =     0x0030,
+        shareDenyNone =     0x0040,
+        modeNoInherit =     0x0080,
+        modeCreate =        0x1000,
+        modeNoTruncate =    0x2000,
+    };
 
-	enum Attribute {
-		normal =    0x00,
-		readOnly =  0x01,
-		hidden =    0x02,
-		system =    0x04,
-		volume =    0x08,
-		directory = 0x10,
-		archive =   0x20
-	};
+    enum Attribute {
+        normal =    0x00,
+        readOnly =  0x01,
+        hidden =    0x02,
+        system =    0x04,
+        volume =    0x08,
+        directory = 0x10,
+        archive =   0x20
+    };
 
-	enum SeekPosition { begin = 0x0, current = 0x1, end = 0x2 };
+    enum SeekPosition { begin = 0x0, current = 0x1, end = 0x2 };
 
-	virtual bool Open(LPCTSTR lpszFileName, ULONG nOpenFlags ) = 0;
+    virtual bool Open(const char * lpszFileName, uint32_t nOpenFlags ) = 0;
 
-	virtual ULONG GetPosition() const = 0;
-	virtual long Seek(long lOff, SeekPosition nFrom) = 0;
-	virtual bool SetLength(ULONG dwNewLen) = 0;
-	virtual ULONG GetLength() const = 0;
+    virtual uint32_t GetPosition() const = 0;
+    virtual long Seek(long lOff, SeekPosition nFrom) = 0;
+    virtual bool SetLength(uint32_t dwNewLen) = 0;
+    virtual uint32_t GetLength() const = 0;
 
-	virtual ULONG Read(void* lpBuf, ULONG nCount) = 0;
-	virtual bool Write(const void* lpBuf, ULONG nCount) = 0;
+    virtual uint32_t Read(void* lpBuf, uint32_t nCount) = 0;
+    virtual bool Write(const void* lpBuf, uint32_t nCount) = 0;
 
-	virtual bool Flush() = 0;
-	virtual bool Close() = 0;
-	virtual bool IsOpen() const = 0;
-	virtual bool SetEndOfFile() = 0;
-	
+    virtual bool Flush() = 0;
+    virtual bool Close() = 0;
+    virtual bool IsOpen() const = 0;
+    virtual bool SetEndOfFile() = 0;
 };
 
 class CFile : public CFileBase
 {
+    // Attributes
+    void *  m_hFile;
+    bool    m_bCloseOnDelete;
 
-// Attributes
-	HANDLE  m_hFile;
-	bool    m_bCloseOnDelete;
-	
 public:
-// Flag values
+    // Flag values
 
-// Constructors
-	CFile();
-	CFile(HANDLE hFile);
-	CFile(LPCTSTR lpszFileName, ULONG nOpenFlags);
+    // Constructors
+    CFile();
+    CFile(void * hFile);
+    CFile(const char * lpszFileName, uint32_t nOpenFlags);
 
-// Deconstructors
-	virtual ~CFile();
+    // Deconstructors
+    virtual ~CFile();
 
+    // Operations
+    virtual bool Open(const char * lpszFileName, uint32_t nOpenFlags );
 
-	// Operations
-	virtual bool Open(LPCTSTR lpszFileName, ULONG nOpenFlags );
+    uint32_t SeekToEnd   ( void );
+    void  SeekToBegin ( void );
 
-	ULONG SeekToEnd   ( void );
-	void  SeekToBegin ( void );
+    // Overridables
+    virtual uint32_t GetPosition() const;
+    virtual long Seek(long lOff, SeekPosition nFrom);
+    virtual bool SetLength(uint32_t dwNewLen);
+    virtual uint32_t GetLength() const;
 
-	// Overridables	
-	virtual ULONG GetPosition() const;
-	virtual long Seek(long lOff, SeekPosition nFrom);
-	virtual bool SetLength(ULONG dwNewLen);
-	virtual ULONG GetLength() const;
+    virtual uint32_t Read(void* lpBuf, uint32_t nCount);
+    virtual bool Write(const void* lpBuf, uint32_t nCount);
 
-	virtual ULONG Read(void* lpBuf, ULONG nCount);
-	virtual bool Write(const void* lpBuf, ULONG nCount);
-
-	virtual bool Flush();
-	virtual bool Close();
-	virtual bool IsOpen() const;
-	virtual bool SetEndOfFile();
+    virtual bool Flush();
+    virtual bool Close();
+    virtual bool IsOpen() const;
+    virtual bool SetEndOfFile();
 };
-
-#endif
diff --git a/Source/Common/Ini File Class.cpp b/Source/Common/Ini File Class.cpp
index 5a91ecf63..217de27a1 100644
--- a/Source/Common/Ini File Class.cpp	
+++ b/Source/Common/Ini File Class.cpp	
@@ -1,859 +1,859 @@
 #include "stdafx.h"
 
+#include <TChar.H>
+
 CIniFileBase::CIniFileBase(CFileBase & FileObject, LPCTSTR FileName) :
-	m_lastSectionSearch(0),
-	m_CurrentSectionFilePos(0),
-	m_LineFeed("\r\n"),
-	m_ReadOnly(true),
-	m_InstantFlush(true),
-	m_File(FileObject),
-	m_FileName(FileName),
-	m_CurrentSectionDirty(false)
+    m_lastSectionSearch(0),
+    m_CurrentSectionFilePos(0),
+    m_LineFeed("\r\n"),
+    m_ReadOnly(true),
+    m_InstantFlush(true),
+    m_File(FileObject),
+    m_FileName(FileName),
+    m_CurrentSectionDirty(false)
 {
 }
 
 CIniFileBase::~CIniFileBase(void)
 {
-	SaveCurrentSection();
+    SaveCurrentSection();
 }
 
 void CIniFileBase::fInsertSpaces ( int Pos, int NoOfSpaces )
 {
-	enum { fIS_MvSize  = 0x2000 };
+    enum { fIS_MvSize  = 0x2000 };
 
-	unsigned char Data[fIS_MvSize + 1];
-	int SizeToRead, result;
-	long end, WritePos;
+    unsigned char Data[fIS_MvSize + 1];
+    int SizeToRead, result;
+    long end, WritePos;
 
-	m_File.Seek(0,CFileBase::end);
-	end = m_File.GetPosition();
+    m_File.Seek(0,CFileBase::end);
+    end = m_File.GetPosition();
 
-	if (NoOfSpaces > 0)
-	{
-		stdstr_f SpaceBuffer(_T("%*c"),NoOfSpaces,' ');
+    if (NoOfSpaces > 0)
+    {
+        stdstr_f SpaceBuffer(_T("%*c"),NoOfSpaces,' ');
 
-		do {
-			SizeToRead = end - Pos;
-			if (SizeToRead > fIS_MvSize) { SizeToRead = fIS_MvSize; }
-			if (SizeToRead > 0)
-			{
-				m_File.Seek(SizeToRead * -1,CFileBase::current);
-				WritePos = m_File.GetPosition();
-				memset(Data,0,sizeof(Data));
-				result = m_File.Read(Data,SizeToRead);
-				m_File.Seek(WritePos,CFileBase::begin);
-				end = WritePos;
+        do {
+            SizeToRead = end - Pos;
+            if (SizeToRead > fIS_MvSize) { SizeToRead = fIS_MvSize; }
+            if (SizeToRead > 0)
+            {
+                m_File.Seek(SizeToRead * -1,CFileBase::current);
+                WritePos = m_File.GetPosition();
+                memset(Data,0,sizeof(Data));
+                result = m_File.Read(Data,SizeToRead);
+                m_File.Seek(WritePos,CFileBase::begin);
+                end = WritePos;
 
-				m_File.Write(SpaceBuffer.c_str(),(ULONG)SpaceBuffer.length());
-				m_File.Write(Data,result);
-				m_File.Seek(WritePos,CFileBase::begin);
-			}
-		} while (SizeToRead > 0);
-	}
-	if (NoOfSpaces < 0)
-	{
-		int ReadPos = Pos + (NoOfSpaces * -1);
-		int WritePos = Pos;
+                m_File.Write(SpaceBuffer.c_str(),(ULONG)SpaceBuffer.length());
+                m_File.Write(Data,result);
+                m_File.Seek(WritePos,CFileBase::begin);
+            }
+        } while (SizeToRead > 0);
+    }
+    if (NoOfSpaces < 0)
+    {
+        int ReadPos = Pos + (NoOfSpaces * -1);
+        int WritePos = Pos;
 
-		do {
-			SizeToRead = end - ReadPos;
-			if (SizeToRead > fIS_MvSize) { SizeToRead = fIS_MvSize; }
-			m_File.Seek(ReadPos,CFileBase::begin);
-			m_File.Read(Data,SizeToRead);
-			m_File.Seek(WritePos,CFileBase::begin);
-			m_File.Write(Data,SizeToRead);
-			ReadPos += SizeToRead;
-			WritePos += SizeToRead;
-		} while (SizeToRead > 0);
+        do {
+            SizeToRead = end - ReadPos;
+            if (SizeToRead > fIS_MvSize) { SizeToRead = fIS_MvSize; }
+            m_File.Seek(ReadPos,CFileBase::begin);
+            m_File.Read(Data,SizeToRead);
+            m_File.Seek(WritePos,CFileBase::begin);
+            m_File.Write(Data,SizeToRead);
+            ReadPos += SizeToRead;
+            WritePos += SizeToRead;
+        } while (SizeToRead > 0);
 
-		m_File.Seek(WritePos,CFileBase::begin);
-		stdstr_f SpaceBuffer(_T("%*c"),(NoOfSpaces * -1),' ');
-		m_File.Write(SpaceBuffer.c_str(),(ULONG)SpaceBuffer.length());
+        m_File.Seek(WritePos,CFileBase::begin);
+        stdstr_f SpaceBuffer(_T("%*c"),(NoOfSpaces * -1),' ');
+        m_File.Write(SpaceBuffer.c_str(),(ULONG)SpaceBuffer.length());
 
-		m_File.Seek(WritePos,CFileBase::begin);
-		m_File.SetEndOfFile();
-		m_File.Seek(0,CFileBase::begin);
-	}
+        m_File.Seek(WritePos,CFileBase::begin);
+        m_File.SetEndOfFile();
+        m_File.Seek(0,CFileBase::begin);
+    }
 }
 
 int CIniFileBase::GetStringFromFile ( char * & String, char * &Data, int & MaxDataSize, int & DataSize, int & ReadPos )
 {
-	enum { BufferIncrease = 0x2000 };
-	if (MaxDataSize == 0) 
-	{
-		ReadPos = 0;
-		MaxDataSize = BufferIncrease;
-		Data = new char[MaxDataSize];
-		DataSize = m_File.Read(&Data[DataSize],MaxDataSize);
-	}
+    enum { BufferIncrease = 0x2000 };
+    if (MaxDataSize == 0)
+    {
+        ReadPos = 0;
+        MaxDataSize = BufferIncrease;
+        Data = new char[MaxDataSize];
+        DataSize = m_File.Read(&Data[DataSize],MaxDataSize);
+    }
 
-	for (;;)
-	{
-		int count;
+    for (;;)
+    {
+        int count;
 
-		for (count = ReadPos; count < DataSize; count ++)
-		{
-			if (Data[count] == '\n') 
-			{
-				int len = (count - ReadPos) + 1;
-				String = &Data[ReadPos];
-				String[len-1] = 0;
-				ReadPos = count + 1;
-				return len;
-			}
-		}
+        for (count = ReadPos; count < DataSize; count ++)
+        {
+            if (Data[count] == '\n')
+            {
+                int len = (count - ReadPos) + 1;
+                String = &Data[ReadPos];
+                String[len-1] = 0;
+                ReadPos = count + 1;
+                return len;
+            }
+        }
 
-		if (ReadPos != 0)
-		{
-			if ((DataSize - ReadPos) > 0 )
-			{
-				memmove(Data,&Data[ReadPos],DataSize - ReadPos);
-			}
-			DataSize -= ReadPos;
-			ReadPos = 0;
-		}
-		else
-		{
-			//Increase buffer size
-			int NewMaxDataSize = MaxDataSize + BufferIncrease;
-			char * NewBuffer = new char[NewMaxDataSize];
-			if (NewBuffer == NULL) 
-			{
-				return -1;
-			}
-			memcpy(NewBuffer,Data,DataSize);
-			MaxDataSize = NewMaxDataSize;
-			delete [] Data;
-			Data = NewBuffer;
-		}
+        if (ReadPos != 0)
+        {
+            if ((DataSize - ReadPos) > 0 )
+            {
+                memmove(Data,&Data[ReadPos],DataSize - ReadPos);
+            }
+            DataSize -= ReadPos;
+            ReadPos = 0;
+        }
+        else
+        {
+            //Increase buffer size
+            int NewMaxDataSize = MaxDataSize + BufferIncrease;
+            char * NewBuffer = new char[NewMaxDataSize];
+            if (NewBuffer == NULL)
+            {
+                return -1;
+            }
+            memcpy(NewBuffer,Data,DataSize);
+            MaxDataSize = NewMaxDataSize;
+            delete [] Data;
+            Data = NewBuffer;
+        }
 
-		int dwRead = m_File.Read(&Data[DataSize],MaxDataSize - DataSize);
-		if (dwRead == 0) 
-		{ 
-			if (DataSize > 0)
-			{
-				int len = DataSize + 1;
-				String = &Data[ReadPos];
-				String[len-1] = 0;
-				DataSize = 0;
-				ReadPos = 0;
-				return len;
-			}
-			return -1; 
-		}
-		DataSize += dwRead;
-	}
+        int dwRead = m_File.Read(&Data[DataSize],MaxDataSize - DataSize);
+        if (dwRead == 0)
+        {
+            if (DataSize > 0)
+            {
+                int len = DataSize + 1;
+                String = &Data[ReadPos];
+                String[len-1] = 0;
+                DataSize = 0;
+                ReadPos = 0;
+                return len;
+            }
+            return -1;
+        }
+        DataSize += dwRead;
+    }
 }
 
 void CIniFileBase::SaveCurrentSection ( void )
 {
-	if (!m_CurrentSectionDirty)
-	{
-		return;
-	}
-	m_CurrentSectionDirty = false;
-	if (m_CurrentSection.length() == 0)
-	{
-		m_CurrentSection = "default";
-	}
+    if (!m_CurrentSectionDirty)
+    {
+        return;
+    }
+    m_CurrentSectionDirty = false;
+    if (m_CurrentSection.length() == 0)
+    {
+        m_CurrentSection = "default";
+    }
 
-	int lineFeedLen = (int)strlen(m_LineFeed);
+    int lineFeedLen = (int)strlen(m_LineFeed);
 
-	if (m_CurrentSectionFilePos == -1)
-	{
-		//Section has not been added yet
-		m_File.Seek(0,CFileBase::end);
+    if (m_CurrentSectionFilePos == -1)
+    {
+        //Section has not been added yet
+        m_File.Seek(0,CFileBase::end);
 
-		int len = (int)m_CurrentSection.length() + (lineFeedLen * 2) + 5;
-		AUTO_PTR<char> SectionName(new char[len]);
-		if (m_File.GetLength() < (int)strlen(m_LineFeed))
-		{
-			sprintf(SectionName.get(),"[%s]%s",m_CurrentSection.c_str(),m_LineFeed);
-		}
-		else
-		{
-			sprintf(SectionName.get(),"%s[%s]%s",m_LineFeed,m_CurrentSection.c_str(),m_LineFeed);
-		}
-		m_File.Write(SectionName.get(),(int)strlen(SectionName.get()));
-		m_CurrentSectionFilePos = m_File.GetPosition();
-		m_SectionsPos.insert(FILELOC::value_type(m_CurrentSection,m_CurrentSectionFilePos));
-	}
-	else
-	{
-		//increase/decrease space needed
-		int NeededBufferLen = 0;
-		{
-			AUTO_PTR<char> LineData(NULL);
-			int len = 0;
+        int len = (int)m_CurrentSection.length() + (lineFeedLen * 2) + 5;
+        AUTO_PTR<char> SectionName(new char[len]);
+        if (m_File.GetLength() < (int)strlen(m_LineFeed))
+        {
+            sprintf(SectionName.get(),"[%s]%s",m_CurrentSection.c_str(),m_LineFeed);
+        }
+        else
+        {
+            sprintf(SectionName.get(),"%s[%s]%s",m_LineFeed,m_CurrentSection.c_str(),m_LineFeed);
+        }
+        m_File.Write(SectionName.get(),(int)strlen(SectionName.get()));
+        m_CurrentSectionFilePos = m_File.GetPosition();
+        m_SectionsPos.insert(FILELOC::value_type(m_CurrentSection,m_CurrentSectionFilePos));
+    }
+    else
+    {
+        //increase/decrease space needed
+        int NeededBufferLen = 0;
+        {
+            AUTO_PTR<char> LineData(NULL);
+            int len = 0;
 
-			for (KeyValueList::iterator iter = m_CurrentSectionData.begin(); iter != m_CurrentSectionData.end(); iter++)
-			{
-				int newLen = (int)iter->first.length() + (int)iter->second.length() + lineFeedLen + 5;
-				if (newLen > len)
-				{
-					LineData.reset(new char[newLen]);
-					len = newLen;
-				}
-				sprintf(LineData.get(),"%s=%s%s",iter->first.c_str(),iter->second.c_str(),m_LineFeed);
-				NeededBufferLen += (int)strlen(LineData.get());
-			}
-		}
-		int currentLen = 0;
+            for (KeyValueList::iterator iter = m_CurrentSectionData.begin(); iter != m_CurrentSectionData.end(); iter++)
+            {
+                int newLen = (int)iter->first.length() + (int)iter->second.length() + lineFeedLen + 5;
+                if (newLen > len)
+                {
+                    LineData.reset(new char[newLen]);
+                    len = newLen;
+                }
+                sprintf(LineData.get(),"%s=%s%s",iter->first.c_str(),iter->second.c_str(),m_LineFeed);
+                NeededBufferLen += (int)strlen(LineData.get());
+            }
+        }
+        int currentLen = 0;
 
-		m_File.Seek(m_CurrentSectionFilePos, CFileBase::begin);
+        m_File.Seek(m_CurrentSectionFilePos, CFileBase::begin);
 
-		int MaxDataSize = 0, DataSize = 0, ReadPos = 0, result;
-		char *Input = NULL, *Data = NULL;
-	
-		//Skip first line as it is the section name
-		int StartPos = m_CurrentSectionFilePos;
-		int EndPos = StartPos;
-		do {
-			result = GetStringFromFile(Input,Data,MaxDataSize,DataSize,ReadPos);
-			if (result <= 1) { continue; }
-			if (strlen(CleanLine(Input)) <= 1 || Input[0] != '[')
-			{
-				EndPos = ((m_File.GetPosition() - DataSize) + ReadPos);
+        int MaxDataSize = 0, DataSize = 0, ReadPos = 0, result;
+        char *Input = NULL, *Data = NULL;
 
-				continue; 
-			}
-			if (Input[0] == '[')
-			{
-				NeededBufferLen += lineFeedLen;
-			}
-			break;
-		} while (result >= 0);
-		currentLen = EndPos - StartPos;
+        //Skip first line as it is the section name
+        int StartPos = m_CurrentSectionFilePos;
+        int EndPos = StartPos;
+        do {
+            result = GetStringFromFile(Input,Data,MaxDataSize,DataSize,ReadPos);
+            if (result <= 1) { continue; }
+            if (strlen(CleanLine(Input)) <= 1 || Input[0] != '[')
+            {
+                EndPos = ((m_File.GetPosition() - DataSize) + ReadPos);
 
-		if (Data) {  delete [] Data;  Data = NULL; }
+                continue;
+            }
+            if (Input[0] == '[')
+            {
+                NeededBufferLen += lineFeedLen;
+            }
+            break;
+        } while (result >= 0);
+        currentLen = EndPos - StartPos;
 
-		if (NeededBufferLen != currentLen)
-		{
-			fInsertSpaces(StartPos,NeededBufferLen - currentLen);
-			m_File.Flush();
-			ClearSectionPosList(StartPos);
-		}
-		//set pointer to beginning of the start pos
-		m_File.Seek(StartPos, CFileBase::begin);
-	}
+        if (Data) {  delete [] Data;  Data = NULL; }
 
+        if (NeededBufferLen != currentLen)
+        {
+            fInsertSpaces(StartPos,NeededBufferLen - currentLen);
+            m_File.Flush();
+            ClearSectionPosList(StartPos);
+        }
+        //set pointer to beginning of the start pos
+        m_File.Seek(StartPos, CFileBase::begin);
+    }
 
-	{
-		AUTO_PTR<char> LineData(NULL);
-		int len = 0;
-		
-		for (KeyValueList::iterator iter = m_CurrentSectionData.begin(); iter != m_CurrentSectionData.end(); iter++)
-		{
-			int newLen = (int)iter->first.length() + (int)iter->second.length() + lineFeedLen + 5;
-			if (newLen > len)
-			{
-				LineData.reset(new char[newLen]);
-				len = newLen;
-			}
-			sprintf(LineData.get(),"%s=%s%s",iter->first.c_str(),iter->second.c_str(),m_LineFeed);
-			m_File.Write(LineData.get(),(int)strlen(LineData.get()));
-		}
-	}
-	m_File.Flush();
+    {
+        AUTO_PTR<char> LineData(NULL);
+        int len = 0;
+
+        for (KeyValueList::iterator iter = m_CurrentSectionData.begin(); iter != m_CurrentSectionData.end(); iter++)
+        {
+            int newLen = (int)iter->first.length() + (int)iter->second.length() + lineFeedLen + 5;
+            if (newLen > len)
+            {
+                LineData.reset(new char[newLen]);
+                len = newLen;
+            }
+            sprintf(LineData.get(),"%s=%s%s",iter->first.c_str(),iter->second.c_str(),m_LineFeed);
+            m_File.Write(LineData.get(),(int)strlen(LineData.get()));
+        }
+    }
+    m_File.Flush();
 }
 
 bool CIniFileBase::MoveToSectionNameData ( LPCSTR lpSectionName, bool ChangeCurrentSection )
 {
-	if (strcmp(lpSectionName,m_CurrentSection.c_str()) == 0) 
-	{
-		return true;
-	}
-	if (ChangeCurrentSection)
-	{
-		SaveCurrentSection();
-		m_CurrentSection = "";
-	}
-	
-	char *Input = NULL, *Data = NULL;
-	int MaxDataSize = 0, DataSize = 0, ReadPos = 0, result;
+    if (strcmp(lpSectionName,m_CurrentSection.c_str()) == 0)
+    {
+        return true;
+    }
+    if (ChangeCurrentSection)
+    {
+        SaveCurrentSection();
+        m_CurrentSection = "";
+    }
 
-	FILELOC_ITR iter = m_SectionsPos.find(std::string(lpSectionName));
-	bool bFoundSection = false;
-	if (iter != m_SectionsPos.end())
-	{
-		if (ChangeCurrentSection)
-		{
-			m_CurrentSection = iter->first;
-			m_CurrentSectionFilePos = iter->second;
-		}
-		m_File.Seek(iter->second,CFileBase::begin);
-		bFoundSection = true;
-	}
-	else
-	{
-		m_File.Seek(m_lastSectionSearch, CFileBase::begin);
+    char *Input = NULL, *Data = NULL;
+    int MaxDataSize = 0, DataSize = 0, ReadPos = 0, result;
 
-		//long Fpos;
-		BYTE pUTF8[3];
-		pUTF8[0] = 0xef;
-		pUTF8[1] = 0xbb;
-		pUTF8[2] = 0xbf;
+    FILELOC_ITR iter = m_SectionsPos.find(std::string(lpSectionName));
+    bool bFoundSection = false;
+    if (iter != m_SectionsPos.end())
+    {
+        if (ChangeCurrentSection)
+        {
+            m_CurrentSection = iter->first;
+            m_CurrentSectionFilePos = iter->second;
+        }
+        m_File.Seek(iter->second,CFileBase::begin);
+        bFoundSection = true;
+    }
+    else
+    {
+        m_File.Seek(m_lastSectionSearch, CFileBase::begin);
 
-		do {
-			result = GetStringFromFile(Input,Data,MaxDataSize,DataSize,ReadPos);
-			if (result <= 1) { continue; }
-			if (strlen(CleanLine(Input)) <= 1) { continue; }
+        //long Fpos;
+        BYTE pUTF8[3];
+        pUTF8[0] = 0xef;
+        pUTF8[1] = 0xbb;
+        pUTF8[2] = 0xbf;
 
-			//We Only care about sections
-			char * CurrentSection = Input;
+        do {
+            result = GetStringFromFile(Input,Data,MaxDataSize,DataSize,ReadPos);
+            if (result <= 1) { continue; }
+            if (strlen(CleanLine(Input)) <= 1) { continue; }
 
-			if (m_lastSectionSearch == 0 && !memcmp(CurrentSection, pUTF8, 3))
-			{
-				CurrentSection += 3;
-			}
+            //We Only care about sections
+            char * CurrentSection = Input;
 
-			if (CurrentSection[0] != '[') { continue; }
-			int lineEndPos = (int)strlen(CurrentSection) - 1;  
-			if (CurrentSection[lineEndPos] != ']') { continue; }
-			//take off the ']' from the end of the string
-			CurrentSection[lineEndPos] = 0;
-			CurrentSection += 1;
-			m_lastSectionSearch = (m_File.GetPosition() - DataSize) + ReadPos;
-			m_SectionsPos.insert(FILELOC::value_type(CurrentSection,m_lastSectionSearch));
+            if (m_lastSectionSearch == 0 && !memcmp(CurrentSection, pUTF8, 3))
+            {
+                CurrentSection += 3;
+            }
 
-			if (_stricmp(lpSectionName,CurrentSection) != 0)
-			{
-				continue;
-			}
+            if (CurrentSection[0] != '[') { continue; }
+            int lineEndPos = (int)strlen(CurrentSection) - 1;
+            if (CurrentSection[lineEndPos] != ']') { continue; }
+            //take off the ']' from the end of the string
+            CurrentSection[lineEndPos] = 0;
+            CurrentSection += 1;
+            m_lastSectionSearch = (m_File.GetPosition() - DataSize) + ReadPos;
+            m_SectionsPos.insert(FILELOC::value_type(CurrentSection,m_lastSectionSearch));
 
-			if (ChangeCurrentSection)
-			{
-				m_CurrentSection = lpSectionName;
-				m_CurrentSectionFilePos = m_lastSectionSearch;
-			}
-			else
-			{
-				m_File.Seek(m_lastSectionSearch,CFileBase::begin);
-			}
-			bFoundSection = true;
-			break;
-		} while (result >= 0);
-	}
+            if (_stricmp(lpSectionName,CurrentSection) != 0)
+            {
+                continue;
+            }
 
-	if (bFoundSection && ChangeCurrentSection)
-	{
-		m_CurrentSectionData.clear();
-		do {
-			result = GetStringFromFile(Input,Data,MaxDataSize,DataSize,ReadPos);
-			if (result <= 1) { continue; }
-			if (strlen(CleanLine(Input)) <= 1) { continue; }
-			if (Input[0] == '[') { break; }
-			char * Pos = strchr(Input,'=');
-			if (Pos == NULL) { continue; }
-			char * Value = &Pos[1];
+            if (ChangeCurrentSection)
+            {
+                m_CurrentSection = lpSectionName;
+                m_CurrentSectionFilePos = m_lastSectionSearch;
+            }
+            else
+            {
+                m_File.Seek(m_lastSectionSearch,CFileBase::begin);
+            }
+            bFoundSection = true;
+            break;
+        } while (result >= 0);
+    }
 
-			char * Pos1 = Pos-1;
-			while (((*Pos1 == ' ') || (*Pos1 == '\t')) && (Pos1 > Input))
-			{
-				Pos1--;
-			}
-			Pos1[1] = 0;
+    if (bFoundSection && ChangeCurrentSection)
+    {
+        m_CurrentSectionData.clear();
+        do {
+            result = GetStringFromFile(Input,Data,MaxDataSize,DataSize,ReadPos);
+            if (result <= 1) { continue; }
+            if (strlen(CleanLine(Input)) <= 1) { continue; }
+            if (Input[0] == '[') { break; }
+            char * Pos = strchr(Input,'=');
+            if (Pos == NULL) { continue; }
+            char * Value = &Pos[1];
 
-			m_CurrentSectionData.insert(KeyValueList::value_type(Input,Value));
-		} while (result >= 0);
-	}
+            char * Pos1 = Pos-1;
+            while (((*Pos1 == ' ') || (*Pos1 == '\t')) && (Pos1 > Input))
+            {
+                Pos1--;
+            }
+            Pos1[1] = 0;
 
-	if (Data) {  delete [] Data;  Data = NULL; }
-	return bFoundSection;
+            m_CurrentSectionData.insert(KeyValueList::value_type(Input,Value));
+        } while (result >= 0);
+    }
+
+    if (Data) {  delete [] Data;  Data = NULL; }
+    return bFoundSection;
 }
 
 const char * CIniFileBase::CleanLine ( char * const Line )
 {
-	char * Pos = Line;
+    char * Pos = Line;
 
-	//Remove any comment from the line
-	while (Pos != NULL)
-	{
-		Pos = strchr(Pos,'/');
-		if (Pos != NULL)
-		{
-			if (Pos[1] == '/')
-			{ 
-				if (Pos > Line)
-				{
-					char * Pos_1 = Pos-1;
+    //Remove any comment from the line
+    while (Pos != NULL)
+    {
+        Pos = strchr(Pos,'/');
+        if (Pos != NULL)
+        {
+            if (Pos[1] == '/')
+            {
+                if (Pos > Line)
+                {
+                    char * Pos_1 = Pos-1;
 
-					if (Pos_1[0] != ':')
-					{
-						Pos[0] = 0;
-					}
-					else
-						Pos += 1;
-				}
-				else
-				{
-					Pos[0] = 0;
-				}
-			} 
-			else 
-			{ 
-				Pos += 1;
-			}
-		}
-	}
+                    if (Pos_1[0] != ':')
+                    {
+                        Pos[0] = 0;
+                    }
+                    else
+                        Pos += 1;
+                }
+                else
+                {
+                    Pos[0] = 0;
+                }
+            }
+            else
+            {
+                Pos += 1;
+            }
+        }
+    }
 
-	//strip any spaces or line feeds from the end of the line
-	for (int count = (int)strlen(&Line[0]) - 1; count >= 0; count --)
-	{
-		if (Line[count] != ' ' && Line[count] != '\r') { break; }
-		Line[count] = 0;
-	}
-	return Line;
+    //strip any spaces or line feeds from the end of the line
+    for (int count = (int)strlen(&Line[0]) - 1; count >= 0; count --)
+    {
+        if (Line[count] != ' ' && Line[count] != '\r') { break; }
+        Line[count] = 0;
+    }
+    return Line;
 }
 
 void CIniFileBase::OpenIniFileReadOnly()
 {
-	if (m_File.Open(m_FileName.c_str(),CFileBase::modeRead))
-	{
-		m_ReadOnly = true;
-		m_File.Seek(0,CFileBase::begin);
-	}
+    if (m_File.Open(m_FileName.c_str(),CFileBase::modeRead))
+    {
+        m_ReadOnly = true;
+        m_File.Seek(0,CFileBase::begin);
+    }
 }
 
 void CIniFileBase::OpenIniFile(bool bCreate)
 {
-	//Open for reading/Writing
-	m_ReadOnly = false;
-	if (!m_File.Open(m_FileName.c_str(),CFileBase::modeReadWrite | CFileBase::shareDenyWrite))
-	{
-		if (!m_File.Open(m_FileName.c_str(),CFileBase::modeRead))
-		{
-			if(bCreate)
-			{
-				if (!m_File.Open(m_FileName.c_str(),CFileBase::modeReadWrite | CFileBase::modeCreate | CFileBase::shareDenyWrite))
-				{
-					return;
-				}
-			}
-		} 
-		else
-		{
-			m_ReadOnly = true;
-		}
-	}
-	m_File.Seek(0,CFileBase::begin);
+    //Open for reading/Writing
+    m_ReadOnly = false;
+    if (!m_File.Open(m_FileName.c_str(),CFileBase::modeReadWrite | CFileBase::shareDenyWrite))
+    {
+        if (!m_File.Open(m_FileName.c_str(),CFileBase::modeRead))
+        {
+            if(bCreate)
+            {
+                if (!m_File.Open(m_FileName.c_str(),CFileBase::modeReadWrite | CFileBase::modeCreate | CFileBase::shareDenyWrite))
+                {
+                    return;
+                }
+            }
+        }
+        else
+        {
+            m_ReadOnly = true;
+        }
+    }
+    m_File.Seek(0,CFileBase::begin);
 }
 
 bool CIniFileBase::IsEmpty()
 {
-	if (m_File.GetLength() == 0)
-		return true;
-	return false;
+    if (m_File.GetLength() == 0)
+        return true;
+    return false;
 }
 
 bool CIniFileBase::IsFileOpen ( void )
-{ 
-	return m_File.IsOpen(); 
+{
+    return m_File.IsOpen();
 }
 
 bool CIniFileBase::DeleteSection ( LPCTSTR lpSectionName )
 {
-	stdstr_f strSection("[%s]",lpSectionName);
+    stdstr_f strSection("[%s]",lpSectionName);
 
-	/*if(m_File.IsOpen())
-	{
-		m_CurrentSectionFilePos = 0;
-		m_File.Seek(m_CurrentSectionFilePos,CFileBase::begin);
+    /*if(m_File.IsOpen())
+    {
+    m_CurrentSectionFilePos = 0;
+    m_File.Seek(m_CurrentSectionFilePos,CFileBase::begin);
 
-		ULONG dwSize = m_File.GetLength();
-		if(dwSize)
-		{
-			char *pData = new char[dwSize+1];
-			if(pData)
-			{
-				ULONG dwRet = m_File.Read(pData, dwSize);
-				if(dwRet != 0)
-				{
-					if(dwRet <= dwSize)
-					{
-						pData[dwRet] = 0;
+    ULONG dwSize = m_File.GetLength();
+    if(dwSize)
+    {
+    char *pData = new char[dwSize+1];
+    if(pData)
+    {
+    ULONG dwRet = m_File.Read(pData, dwSize);
+    if(dwRet != 0)
+    {
+    if(dwRet <= dwSize)
+    {
+    pData[dwRet] = 0;
 
-						char *pSection = strstr(pData, strSection.c_str());
-						if(pSection)
-						{
-							char tmp = pSection[0];
-							pSection[0] = 0;
+    char *pSection = strstr(pData, strSection.c_str());
+    if(pSection)
+    {
+    char tmp = pSection[0];
+    pSection[0] = 0;
 
-							std::string strNewData = pData;
-							pSection[0] = tmp;
+    std::string strNewData = pData;
+    pSection[0] = tmp;
 
-							char *pEndSection = pSection + strlen(strSection.c_str());
-							char *pNextSection = strstr(pEndSection, "[");
-							if(pNextSection)
-							{
-								strNewData += pNextSection;
-							}
+    char *pEndSection = pSection + strlen(strSection.c_str());
+    char *pNextSection = strstr(pEndSection, "[");
+    if(pNextSection)
+    {
+    strNewData += pNextSection;
+    }
 
-							m_File.Seek(m_CurrentSectionFilePos,CFileBase::begin);
-							m_File.Write(strNewData.c_str(), (ULONG)strlen(strNewData.c_str()));
-							m_File.Flush();
-							m_File.SetEndOfFile();
-						}
-					}
-					else
-					{
-						delete [] pData;
+    m_File.Seek(m_CurrentSectionFilePos,CFileBase::begin);
+    m_File.Write(strNewData.c_str(), (ULONG)strlen(strNewData.c_str()));
+    m_File.Flush();
+    m_File.SetEndOfFile();
+    }
+    }
+    else
+    {
+    delete [] pData;
 
-						return false;
-					}
-				}
+    return false;
+    }
+    }
 
-				delete [] pData;
-			}
-			else
-				return false;
-		}
-	}
-	else
-		return false;*/
+    delete [] pData;
+    }
+    else
+    return false;
+    }
+    }
+    else
+    return false;*/
 
-	return true;
+    return true;
 }
 
 bool CIniFileBase::GetString ( LPCSTR lpSectionName, LPCSTR lpKeyName, LPCSTR lpDefault, stdstr & Value )
 {
-	CGuard Guard(m_CS);
+    CGuard Guard(m_CS);
 
-	if (lpSectionName == NULL || strlen(lpSectionName) == 0)
-	{
-		lpSectionName = "default";
-	}
+    if (lpSectionName == NULL || strlen(lpSectionName) == 0)
+    {
+        lpSectionName = "default";
+    }
 
-	if (m_File.IsOpen() && MoveToSectionNameData(lpSectionName,true)) 
-	{
-		KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
-		if (iter != m_CurrentSectionData.end())
-		{
-			Value = iter->second.c_str();
-			return true;
-		}
-	}
-	Value = lpDefault;
-	return false;
+    if (m_File.IsOpen() && MoveToSectionNameData(lpSectionName,true))
+    {
+        KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
+        if (iter != m_CurrentSectionData.end())
+        {
+            Value = iter->second.c_str();
+            return true;
+        }
+    }
+    Value = lpDefault;
+    return false;
 }
 
 stdstr CIniFileBase::GetString  ( LPCSTR lpSectionName, LPCSTR lpKeyName, LPCSTR lpDefault )
 {
-	stdstr Value;
-	GetString(lpSectionName,lpKeyName,lpDefault,Value);
-	return Value;
+    stdstr Value;
+    GetString(lpSectionName,lpKeyName,lpDefault,Value);
+    return Value;
 }
 
 #ifdef _UNICODE
 bool CIniFileBase::GetString ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault, stdstr & Value )
 {
-	CGuard Guard(m_CS);
+    CGuard Guard(m_CS);
 
-	std::string strSection;
+    std::string strSection;
 
-	if (lpSectionName == NULL || wcslen(lpSectionName) == 0)
-	{
-		strSection = "default";
-	}
-	else
-	{
-		stdstr::fromTString(lpSectionName,strSection);
-	}
+    if (lpSectionName == NULL || wcslen(lpSectionName) == 0)
+    {
+        strSection = "default";
+    }
+    else
+    {
+        stdstr::fromTString(lpSectionName,strSection);
+    }
 
-	if (m_File.IsOpen() && MoveToSectionNameData(strSection.c_str(),true)) 
-	{
-		KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
-		if (iter != m_CurrentSectionData.end())
-		{
-			stdstr::toTString(iter->second.c_str(),Value);
-			return true;
-		}
-	}
-	Value = lpDefault;
-	return false;
+    if (m_File.IsOpen() && MoveToSectionNameData(strSection.c_str(),true))
+    {
+        KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
+        if (iter != m_CurrentSectionData.end())
+        {
+            stdstr::toTString(iter->second.c_str(),Value);
+            return true;
+        }
+    }
+    Value = lpDefault;
+    return false;
 }
 
 stdstr CIniFileBase::GetString  ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault )
 {
-	stdstr Value;
-	GetString(lpSectionName,lpKeyName,lpDefault,Value);
-	return Value;
+    stdstr Value;
+    GetString(lpSectionName,lpKeyName,lpDefault,Value);
+    return Value;
 }
 
 #endif
 
-ULONG  CIniFileBase::GetString  ( LPCTSTR lpSectionName, LPCTSTR lpKeyName, LPCTSTR lpDefault, LPTSTR lpReturnedString, ULONG nSize )
+uint32_t CIniFileBase::GetString  ( LPCTSTR lpSectionName, LPCTSTR lpKeyName, LPCTSTR lpDefault, LPTSTR lpReturnedString, uint32_t nSize )
 {
-	CGuard Guard(m_CS);
+    CGuard Guard(m_CS);
 
-	std::string strSection;
+    std::string strSection;
 
-	if (lpSectionName == NULL || _tcslen(lpSectionName) == 0)
-	{
-		strSection = "default";
-	}
-	else
-	{
-		strSection = lpSectionName;
-	}
+    if (lpSectionName == NULL || _tcslen(lpSectionName) == 0)
+    {
+        strSection = "default";
+    }
+    else
+    {
+        strSection = lpSectionName;
+    }
 
-	if (m_File.IsOpen() && MoveToSectionNameData(strSection.c_str(),true)) 
-	{
-		KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
-		if (iter != m_CurrentSectionData.end())
-		{
-			_tcsncpy(lpReturnedString,iter->second.c_str(),nSize - 1);
-			lpReturnedString[nSize - 1] = 0;
-			return (ULONG)_tcslen(lpReturnedString);
-		}
-	}
-	_tcsncpy(lpReturnedString,lpDefault,nSize - 1);
-	lpReturnedString[nSize - 1] = 0;
-	return (ULONG)_tcslen(lpReturnedString);
+    if (m_File.IsOpen() && MoveToSectionNameData(strSection.c_str(),true))
+    {
+        KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
+        if (iter != m_CurrentSectionData.end())
+        {
+            _tcsncpy(lpReturnedString,iter->second.c_str(),nSize - 1);
+            lpReturnedString[nSize - 1] = 0;
+            return (ULONG)_tcslen(lpReturnedString);
+        }
+    }
+    _tcsncpy(lpReturnedString,lpDefault,nSize - 1);
+    lpReturnedString[nSize - 1] = 0;
+    return (ULONG)_tcslen(lpReturnedString);
 }
 
 #ifdef _UNICODE
 ULONG CIniFileBase::GetNumber ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, ULONG nDefault )
 {
-	ULONG Value;
-	GetNumber(lpSectionName,lpKeyName,nDefault,Value);
-	return Value;
+    ULONG Value;
+    GetNumber(lpSectionName,lpKeyName,nDefault,Value);
+    return Value;
 }
 
 bool CIniFileBase::GetNumber ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, ULONG nDefault, ULONG & Value )
 {
-	std::string strSection;
+    std::string strSection;
 
-	if (lpSectionName != NULL && wcslen(lpSectionName) > 0)
-	{
-		stdstr::fromTString(lpSectionName,strSection);
-		return GetNumber(strSection.c_str(),lpKeyName.c_str(),nDefault,Value);
-	}
-	else
-	{
-		return GetNumber(NULL,lpKeyName.c_str(),nDefault,Value);
-	}
+    if (lpSectionName != NULL && wcslen(lpSectionName) > 0)
+    {
+        stdstr::fromTString(lpSectionName,strSection);
+        return GetNumber(strSection.c_str(),lpKeyName.c_str(),nDefault,Value);
+    }
+    else
+    {
+        return GetNumber(NULL,lpKeyName.c_str(),nDefault,Value);
+    }
 }
 #endif
 
-ULONG CIniFileBase::GetNumber ( LPCSTR lpSectionName, LPCSTR lpKeyName, ULONG nDefault )
+uint32_t CIniFileBase::GetNumber ( LPCSTR lpSectionName, LPCSTR lpKeyName, uint32_t nDefault )
 {
-	ULONG Value;
-	GetNumber(lpSectionName,lpKeyName,nDefault,Value);
-	return Value;
+    uint32_t Value;
+    GetNumber(lpSectionName,lpKeyName,nDefault,Value);
+    return Value;
 }
 
-bool CIniFileBase::GetNumber ( LPCSTR lpSectionName, LPCSTR lpKeyName, ULONG nDefault, ULONG & Value )
+bool CIniFileBase::GetNumber ( LPCSTR lpSectionName, LPCSTR lpKeyName, uint32_t nDefault, uint32_t & Value )
 {
-	CGuard Guard(m_CS);
+    CGuard Guard(m_CS);
 
-	if (lpSectionName == NULL || strlen(lpSectionName) == 0)
-	{
-		lpSectionName = "default";
-	}
+    if (lpSectionName == NULL || strlen(lpSectionName) == 0)
+    {
+        lpSectionName = "default";
+    }
 
-	if (m_File.IsOpen() && MoveToSectionNameData(lpSectionName,true)) 
-	{
-		KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
-		if (iter != m_CurrentSectionData.end())
-		{
-			Value = 0;
-			sscanf(iter->second.c_str(), "%u", &Value);
-			return true;
-		}
-	}
-	Value = nDefault; 
-	return false;
+    if (m_File.IsOpen() && MoveToSectionNameData(lpSectionName,true))
+    {
+        KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
+        if (iter != m_CurrentSectionData.end())
+        {
+            Value = 0;
+            sscanf(iter->second.c_str(), "%u", &Value);
+            return true;
+        }
+    }
+    Value = nDefault;
+    return false;
 }
 
 void  CIniFileBase::SaveString ( LPCTSTR lpSectionName, LPCTSTR lpKeyName, LPCTSTR lpString )
 {
-	CGuard Guard(m_CS);
-	if (!m_File.IsOpen())
-	{
-		if (lpString)
-		{
-			OpenIniFile();
-		}
-		if (!m_File.IsOpen())
-		{
-			return;
-		}
-	}
-	std::string strSection;
+    CGuard Guard(m_CS);
+    if (!m_File.IsOpen())
+    {
+        if (lpString)
+        {
+            OpenIniFile();
+        }
+        if (!m_File.IsOpen())
+        {
+            return;
+        }
+    }
+    std::string strSection;
 
-	if (lpSectionName == NULL || _tcslen(lpSectionName) == 0)
-	{
-		strSection = "default";
-	}
-	else
-	{
-		strSection = lpSectionName;
-	}
+    if (lpSectionName == NULL || _tcslen(lpSectionName) == 0)
+    {
+        strSection = "default";
+    }
+    else
+    {
+        strSection = lpSectionName;
+    }
 
-	if (!MoveToSectionNameData(strSection.c_str(),true))
-	{
-		m_CurrentSection = strSection;
-		m_CurrentSectionData.clear();
-		m_CurrentSectionFilePos = -1;
-	}
-	
-	KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
-	if (iter != m_CurrentSectionData.end())
-	{
-		if (lpString)
-		{
-			if (iter->second != lpString)
-			{
-				iter->second = lpString;
-				m_CurrentSectionDirty = true;
-			}
-		}
-		else
-		{
-			m_CurrentSectionData.erase(iter);
-			m_CurrentSectionDirty = true;
-		}
-	}
-	else
-	{
-		if (lpString)
-		{
-			m_CurrentSectionData.insert(KeyValueList::value_type(lpKeyName,lpString));
-			m_CurrentSectionDirty = true;
-		}
-	}
+    if (!MoveToSectionNameData(strSection.c_str(),true))
+    {
+        m_CurrentSection = strSection;
+        m_CurrentSectionData.clear();
+        m_CurrentSectionFilePos = -1;
+    }
 
-	if (m_InstantFlush)
-	{
-		SaveCurrentSection();
-	}
+    KeyValueList::iterator iter = m_CurrentSectionData.find(lpKeyName);
+    if (iter != m_CurrentSectionData.end())
+    {
+        if (lpString)
+        {
+            if (iter->second != lpString)
+            {
+                iter->second = lpString;
+                m_CurrentSectionDirty = true;
+            }
+        }
+        else
+        {
+            m_CurrentSectionData.erase(iter);
+            m_CurrentSectionDirty = true;
+        }
+    }
+    else
+    {
+        if (lpString)
+        {
+            m_CurrentSectionData.insert(KeyValueList::value_type(lpKeyName,lpString));
+            m_CurrentSectionDirty = true;
+        }
+    }
+
+    if (m_InstantFlush)
+    {
+        SaveCurrentSection();
+    }
 }
 
-void CIniFileBase::SaveNumber ( LPCTSTR lpSectionName, LPCTSTR lpKeyName, ULONG Value )
+void CIniFileBase::SaveNumber ( LPCTSTR lpSectionName, LPCTSTR lpKeyName, uint32_t Value )
 {
-	//translate the string to an ascii version and save as text	
-	SaveString(lpSectionName,lpKeyName,stdstr_f(_T("%d"),Value).c_str());
+    //translate the string to an ascii version and save as text
+    SaveString(lpSectionName,lpKeyName,stdstr_f(_T("%d"),Value).c_str());
 }
 
 void CIniFileBase::FlushChanges (void)
 {
-	SaveCurrentSection();
+    CGuard Guard(m_CS);
+    SaveCurrentSection();
 }
 
 void CIniFileBase::SetAutoFlush (bool AutoFlush)
 {
-	m_InstantFlush = AutoFlush;
-	if (AutoFlush)
-	{
-		FlushChanges();
-	}
+    m_InstantFlush = AutoFlush;
+    if (AutoFlush)
+    {
+        FlushChanges();
+    }
 }
 
-
 void CIniFileBase::GetKeyList ( LPCTSTR lpSectionName, strlist &List )
 {
-	List.clear();
+    List.clear();
 
-	CGuard Guard(m_CS);
-	if (!m_File.IsOpen())
-	{
-		return; 
-	}
+    CGuard Guard(m_CS);
+    if (!m_File.IsOpen())
+    {
+        return;
+    }
 
-	if (lpSectionName == NULL || _tcslen(lpSectionName) == 0)
-	{
-		lpSectionName = "default";
-	}
+    if (lpSectionName == NULL || _tcslen(lpSectionName) == 0)
+    {
+        lpSectionName = "default";
+    }
 
-	if (MoveToSectionNameData(lpSectionName,true))
-	{
-		for (KeyValueList::iterator iter = m_CurrentSectionData.begin(); iter != m_CurrentSectionData.end(); iter++)
-		{
-			List.push_back(iter->first);
-		}
-	}
+    if (MoveToSectionNameData(lpSectionName,true))
+    {
+        for (KeyValueList::iterator iter = m_CurrentSectionData.begin(); iter != m_CurrentSectionData.end(); iter++)
+        {
+            List.push_back(iter->first);
+        }
+    }
 }
 
 void CIniFileBase::GetKeyValueData ( LPCTSTR lpSectionName, KeyValueData & List )
 {
-	CGuard Guard(m_CS);
-	if (!m_File.IsOpen())
-	{
-		return;
-	}
+    CGuard Guard(m_CS);
+    if (!m_File.IsOpen())
+    {
+        return;
+    }
 
-	std::string strSection;
+    std::string strSection;
 
-	if (lpSectionName == NULL || _tcslen(lpSectionName) == 0)
-	{
-		strSection = "default";
-	}
-	else
-	{
-		strSection = lpSectionName;
-	}
+    if (lpSectionName == NULL || _tcslen(lpSectionName) == 0)
+    {
+        strSection = "default";
+    }
+    else
+    {
+        strSection = lpSectionName;
+    }
 
-	if (!MoveToSectionNameData(strSection.c_str(),false)) { return; }
+    if (!MoveToSectionNameData(strSection.c_str(),false)) { return; }
 
-	int MaxDataSize = 0, DataSize = 0, ReadPos = 0, result;
-	char *Input = NULL, *Data = NULL;
-	do {
-		result = GetStringFromFile(Input,Data,MaxDataSize,DataSize,ReadPos);
-		if (result <= 1) { continue; }
-		if (strlen(CleanLine(Input)) <= 1) { continue; }
-		if (Input[0] == '[') { break; }
-		char * Pos = strchr(Input,'=');
-		if (Pos == NULL) { continue; }
-		Pos[0] = 0;
+    int MaxDataSize = 0, DataSize = 0, ReadPos = 0, result;
+    char *Input = NULL, *Data = NULL;
+    do {
+        result = GetStringFromFile(Input,Data,MaxDataSize,DataSize,ReadPos);
+        if (result <= 1) { continue; }
+        if (strlen(CleanLine(Input)) <= 1) { continue; }
+        if (Input[0] == '[') { break; }
+        char * Pos = strchr(Input,'=');
+        if (Pos == NULL) { continue; }
+        Pos[0] = 0;
 
-		List.insert(KeyValueData::value_type(Input,&Pos[1]));
-	} while (result >= 0);
-	if (Data) {  delete [] Data;  Data = NULL; }
+        List.insert(KeyValueData::value_type(Input,&Pos[1]));
+    } while (result >= 0);
+    if (Data) {  delete [] Data;  Data = NULL; }
 }
 
 void CIniFileBase::ClearSectionPosList( long FilePos )
 {
-	if (FilePos <= 0)
-	{
-		m_SectionsPos.clear();
-		m_lastSectionSearch = 0;
-	}
-	else
-	{
-		FILELOC::iterator iter = m_SectionsPos.begin();
-		while (iter != m_SectionsPos.end())
-		{
-			FILELOC::iterator CurrentIter = iter;
-			iter ++;
-			long TestFilePos = CurrentIter->second;
-			if (TestFilePos > FilePos)
-			{
-				m_SectionsPos.erase(CurrentIter);
-			}
-		}
-		m_lastSectionSearch = FilePos;
-	}
-
+    if (FilePos <= 0)
+    {
+        m_SectionsPos.clear();
+        m_lastSectionSearch = 0;
+    }
+    else
+    {
+        FILELOC::iterator iter = m_SectionsPos.begin();
+        while (iter != m_SectionsPos.end())
+        {
+            FILELOC::iterator CurrentIter = iter;
+            iter ++;
+            long TestFilePos = CurrentIter->second;
+            if (TestFilePos > FilePos)
+            {
+                m_SectionsPos.erase(CurrentIter);
+            }
+        }
+        m_lastSectionSearch = FilePos;
+    }
 }
 
 void CIniFileBase::GetVectorOfSections( SectionList & sections)
 {
-	sections.clear();
+    sections.clear();
 
-	CGuard Guard(m_CS);
-	if (!m_File.IsOpen())
-	{
-		return; 
-	}
+    CGuard Guard(m_CS);
+    if (!m_File.IsOpen())
+    {
+        return;
+    }
 
-	{
-		stdstr_f DoesNotExist(_T("DoesNotExist%d%d%d"),rand(),rand(),rand());
-		MoveToSectionNameData(DoesNotExist.c_str(),false);
-	}
+    {
+        stdstr_f DoesNotExist(_T("DoesNotExist%d%d%d"),rand(),rand(),rand());
+        MoveToSectionNameData(DoesNotExist.c_str(),false);
+    }
 
-	for (FILELOC::const_iterator iter = m_SectionsPos.begin(); iter != m_SectionsPos.end(); iter++)
-	{
-		sections.push_back(iter->first);
-	}
-}
+    for (FILELOC::const_iterator iter = m_SectionsPos.begin(); iter != m_SectionsPos.end(); iter++)
+    {
+        sections.push_back(iter->first);
+    }
+}
\ No newline at end of file
diff --git a/Source/Common/Ini File Class.h b/Source/Common/Ini File Class.h
index cf14d62bd..55a10cf87 100644
--- a/Source/Common/Ini File Class.h	
+++ b/Source/Common/Ini File Class.h	
@@ -5,124 +5,121 @@
 #include "std string.h"
 #include <map>
 
-class CIniFileBase 
+class CIniFileBase
 {
-	struct insensitive_compare
-	{
-		bool operator() (const std::string & a, const std::string & b) const { return _stricmp(a.c_str(),b.c_str()) < 0; }
-	};
+    struct insensitive_compare
+    {
+        bool operator() (const std::string & a, const std::string & b) const { return _stricmp(a.c_str(),b.c_str()) < 0; }
+    };
 
-	typedef std::string ansi_string;
-	typedef std::map<ansi_string,long> FILELOC;
-	typedef FILELOC::iterator FILELOC_ITR;
-	typedef std::map<ansi_string,ansi_string, insensitive_compare> KeyValueList;
+    typedef std::string ansi_string;
+    typedef std::map<ansi_string,long> FILELOC;
+    typedef FILELOC::iterator FILELOC_ITR;
+    typedef std::map<ansi_string,ansi_string, insensitive_compare> KeyValueList;
 
 public:
-	typedef std::map<stdstr,stdstr>           KeyValueData;
-	typedef std::vector<stdstr>               SectionList;
+    typedef std::map<stdstr,stdstr>           KeyValueData;
+    typedef std::vector<stdstr>               SectionList;
 
 protected:
-	CFileBase   & m_File;
-	stdstr m_FileName;
+    CFileBase   & m_File;
+    stdstr m_FileName;
 
 private:
-	ansi_string m_CurrentSection;
-	bool   m_CurrentSectionDirty;
-	int    m_CurrentSectionFilePos; // Where in the file is the current Section
-	KeyValueList m_CurrentSectionData;
-	
-	long   m_lastSectionSearch; // When Scanning for a section, what was the last scanned pos
+    ansi_string m_CurrentSection;
+    bool   m_CurrentSectionDirty;
+    int    m_CurrentSectionFilePos; // Where in the file is the current Section
+    KeyValueList m_CurrentSectionData;
 
+    long   m_lastSectionSearch; // When Scanning for a section, what was the last scanned pos
 
-	bool   m_ReadOnly;
-	bool   m_InstantFlush;
-	LPCSTR m_LineFeed;
+    bool   m_ReadOnly;
+    bool   m_InstantFlush;
+    const char * m_LineFeed;
 
-	CriticalSection m_CS;
-	FILELOC m_SectionsPos;
+    CriticalSection m_CS;
+    FILELOC m_SectionsPos;
 
-	//void AddItemData ( LPCTSTR lpKeyName, LPCTSTR lpString);
-	//bool ChangeItemData ( LPCTSTR lpKeyName, LPCTSTR lpString );
-	//void DeleteItem ( LPCSTR lpKeyName );
-	void fInsertSpaces ( int Pos, int NoOfSpaces );
-	int  GetStringFromFile ( char * & String, char * &Data, int & MaxDataSize, int & DataSize, int & ReadPos );
-	bool MoveToSectionNameData ( LPCSTR lpSectionName, bool ChangeCurrentSection );
-	const char * CleanLine ( char * const Line );
-	void ClearSectionPosList( long FilePos );
+    //void AddItemData ( const char * lpKeyName, const char * lpString);
+    //bool ChangeItemData ( const char * lpKeyName, const char * lpString );
+    //void DeleteItem ( const char * lpKeyName );
+    void fInsertSpaces ( int Pos, int NoOfSpaces );
+    int  GetStringFromFile ( char * & String, char * &Data, int & MaxDataSize, int & DataSize, int & ReadPos );
+	bool MoveToSectionNameData(const char * lpSectionName, bool ChangeCurrentSection);
+    const char * CleanLine ( char * const Line );
+    void ClearSectionPosList( long FilePos );
 
 protected:
-	void OpenIniFileReadOnly();
-	void OpenIniFile(bool bCreate = true);
-	void SaveCurrentSection ( void );
+    void OpenIniFileReadOnly();
+    void OpenIniFile(bool bCreate = true);
+    void SaveCurrentSection ( void );
 
 public:
-	CIniFileBase( CFileBase & FileObject, LPCTSTR FileName );
-	virtual ~CIniFileBase(void);
+	CIniFileBase(CFileBase & FileObject, const char * FileName);
+    virtual ~CIniFileBase(void);
 
-	bool IsEmpty();
-	bool IsFileOpen ( void );
-	bool DeleteSection ( LPCSTR lpSectionName );
-	bool GetString ( LPCSTR lpSectionName, LPCSTR lpKeyName, LPCSTR lpDefault, stdstr & Value );
-	stdstr GetString  ( LPCSTR lpSectionName, LPCSTR lpKeyName, LPCSTR lpDefault );
-	ULONG  GetString  ( LPCSTR lpSectionName, LPCSTR lpKeyName, LPCSTR lpDefault, LPSTR lpReturnedString, ULONG nSize );
-	ULONG GetNumber ( LPCSTR lpSectionName, LPCSTR lpKeyName, ULONG nDefault );
-	bool  GetNumber ( LPCSTR lpSectionName, LPCSTR lpKeyName, ULONG nDefault, ULONG & Value );
+    bool IsEmpty();
+    bool IsFileOpen ( void );
+	bool DeleteSection(const char * lpSectionName);
+    bool GetString ( const char * lpSectionName, const char * lpKeyName, const char * lpDefault, stdstr & Value );
+    stdstr GetString  ( const char * lpSectionName, const char * lpKeyName, const char * lpDefault );
+    uint32_t GetString  ( const char * lpSectionName, const char * lpKeyName, const char * lpDefault, char * lpReturnedString, uint32_t nSize );
+    uint32_t GetNumber ( const char * lpSectionName, const char * lpKeyName, uint32_t nDefault );
+    bool  GetNumber ( const char * lpSectionName, const char * lpKeyName, uint32_t nDefault, uint32_t & Value );
 
 #ifdef _UNICODE
-	bool DeleteSection ( LPCWSTR lpSectionName );
-	bool GetString ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault, stdstr & Value );
-	stdstr GetString  ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault );
-	ULONG  GetString  ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault, LPTSTR lpReturnedString, ULONG nSize );
-	ULONG GetNumber ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, ULONG nDefault );
-	bool  GetNumber ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, ULONG nDefault, ULONG & Value );
+    bool DeleteSection ( LPCWSTR lpSectionName );
+    bool GetString ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault, stdstr & Value );
+    stdstr GetString  ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault );
+    uint32_t  GetString  ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault, LPTSTR lpReturnedString, uint32_t nSize );
+    uint32_t GetNumber ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, uint32_t nDefault );
+    bool  GetNumber ( LPCWSTR lpSectionName, LPCWSTR lpKeyName, uint32_t nDefault, uint32_t & Value );
 
 #endif
 
-	virtual void  SaveString ( LPCTSTR lpSectionName, LPCTSTR lpKeyName, LPCTSTR lpString );
-	virtual void  SaveNumber ( LPCTSTR lpSectionName, LPCTSTR lpKeyName, ULONG Value );
-	void SetAutoFlush (bool AutoFlush);
-	void FlushChanges (void);
-	void GetKeyList ( LPCTSTR lpSectionName, strlist &List );
-	void GetKeyValueData ( LPCTSTR lpSectionName, KeyValueData & List );
-	
-	void GetVectorOfSections( SectionList & sections); 
-	const stdstr &GetFileName() {return m_FileName;}
+    virtual void  SaveString ( const char * lpSectionName, const char * lpKeyName, const char * lpString );
+    virtual void  SaveNumber ( const char * lpSectionName, const char * lpKeyName, uint32_t Value );
+    void SetAutoFlush (bool AutoFlush);
+    void FlushChanges (void);
+    void GetKeyList ( const char * lpSectionName, strlist &List );
+    void GetKeyValueData ( const char * lpSectionName, KeyValueData & List );
+
+    void GetVectorOfSections( SectionList & sections);
+    const stdstr &GetFileName() {return m_FileName;}
 };
 
 template <class CFileStorage>
 class CIniFileT :
-	public CIniFileBase
+    public CIniFileBase
 {
 public:
-	CIniFileT( LPCTSTR FileName ) :
-		CIniFileBase(m_FileObject,FileName)
-	{
-		//Try to open file for reading
-		OpenIniFile();
+    CIniFileT( const char * FileName ) :
+        CIniFileBase(m_FileObject,FileName)
+    {
+        //Try to open file for reading
+        OpenIniFile();
+    }
 
-	}
-	
-	CIniFileT( LPCTSTR FileName, bool bCreate, bool bReadOnly) :
-		CIniFileBase(m_FileObject,FileName)
-	{
-		if(bReadOnly)
-		{
-			OpenIniFileReadOnly();
-		}
-		else
-		{
-			//Try to open file for reading
-			OpenIniFile(bCreate);
-		}
-
-	}
-	virtual ~CIniFileT(void)
-	{
-		SaveCurrentSection();
-	}
+    CIniFileT( const char * FileName, bool bCreate, bool bReadOnly) :
+        CIniFileBase(m_FileObject,FileName)
+    {
+        if(bReadOnly)
+        {
+            OpenIniFileReadOnly();
+        }
+        else
+        {
+            //Try to open file for reading
+            OpenIniFile(bCreate);
+        }
+    }
+    virtual ~CIniFileT(void)
+    {
+        SaveCurrentSection();
+    }
 
 protected:
-	CFileStorage  m_FileObject;
+    CFileStorage  m_FileObject;
 };
 
 typedef CIniFileT<CFile>   CIniFile;
diff --git a/Source/Common/Log Class.cpp b/Source/Common/Log Class.cpp
index b2c5f806f..86fa8e088 100644
--- a/Source/Common/Log Class.cpp	
+++ b/Source/Common/Log Class.cpp	
@@ -2,6 +2,7 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <TChar.h>
 
 CLog::CLog (void ) :
 	m_FlushOnWrite(false),
diff --git a/Source/Common/Log Class.h b/Source/Common/Log Class.h
index 1ba18d229..e507ef1a6 100644
--- a/Source/Common/Log Class.h	
+++ b/Source/Common/Log Class.h	
@@ -25,7 +25,6 @@ public:
 	void LogF     ( LPCTSTR Message, ... );
 	void LogArgs  ( LPCTSTR Message, va_list & args );
 	bool Empty    ( void );
-	void Reset    ( void );
 	void Close    ( void );
 	
 	inline void SetMaxFileSize ( ULONG Size )    
diff --git a/Source/Common/MemTest.h b/Source/Common/MemTest.h
index 1fce02e68..eb2635e36 100644
--- a/Source/Common/MemTest.h
+++ b/Source/Common/MemTest.h
@@ -1,5 +1,8 @@
 #ifdef _DEBUG
+
+#if (defined(_MSC_VER) && (_MSC_VER < 1900))
 #define MEM_LEAK_TEST
+#endif
 
 #ifdef MEM_LEAK_TEST
 
diff --git a/Source/Common/Trace.cpp b/Source/Common/Trace.cpp
index 50276577b..15c9c18f5 100644
--- a/Source/Common/Trace.cpp
+++ b/Source/Common/Trace.cpp
@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include <TChar.H>
 
 BOOL TraceClosed = FALSE;
 
diff --git a/Source/Common/Trace.h b/Source/Common/Trace.h
index 4c8d21fd3..3bda9afb4 100644
--- a/Source/Common/Trace.h
+++ b/Source/Common/Trace.h
@@ -1,50 +1,47 @@
-#ifndef __TRACE_H__
-#define __TRACE_H__
+#pragma once
 
-class CTraceModule 
+class CTraceModule
 {
-	TraceLevel m_Type;
-	
-public:
-	CTraceModule () {  m_Type = TrLvError; }
-	virtual ~CTraceModule () {}
+    TraceLevel m_Type;
 
-	inline  void       SetTraceLevel ( TraceLevel Type ) { m_Type = Type; }
-	inline  TraceLevel GetTraceLevel ( void ) const     { return m_Type; }
-	virtual void       Write         ( LPCTSTR Message, bool EndOfLine ) = 0;
+public:
+    CTraceModule () {  m_Type = TrLvError; }
+    virtual ~CTraceModule () {}
+
+    inline  void       SetTraceLevel ( TraceLevel Type ) { m_Type = Type; }
+    inline  TraceLevel GetTraceLevel ( void ) const     { return m_Type; }
+    virtual void       Write         ( LPCTSTR Message, bool EndOfLine ) = 0;
 };
 
 class CTraceFileLog : public CTraceModule
 {
-	enum { MB = 1024 * 1024 };
+    enum { MB = 1024 * 1024 };
 
-	CriticalSection m_CriticalSection;
-	CLog            m_hLogFile;
-	bool            m_FlushFile;
+    CriticalSection m_CriticalSection;
+    CLog            m_hLogFile;
+    bool            m_FlushFile;
 
 public:
-	CTraceFileLog (LPCTSTR FileName, bool FlushFile = true);
-	CTraceFileLog (LPCTSTR FileName, bool FlushFile, LOG_OPEN_MODE eMode, DWORD dwMaxFileSize = 5);
-	virtual ~CTraceFileLog ();
-	
-	void Write ( LPCTSTR Message, bool EndOfLine );
-	void SetFlushFile ( bool bFlushFile );
+    CTraceFileLog (LPCTSTR FileName, bool FlushFile = true);
+    CTraceFileLog (LPCTSTR FileName, bool FlushFile, LOG_OPEN_MODE eMode, DWORD dwMaxFileSize = 5);
+    virtual ~CTraceFileLog ();
+
+    void Write ( LPCTSTR Message, bool EndOfLine );
+    void SetFlushFile ( bool bFlushFile );
 };
 
 class CDebugTraceLog : public CTraceModule
 {
-public:	
-	void Write ( LPCTSTR Message, bool EndOfLine ) 
-	{
-		OutputDebugString(Message); 
-		if (EndOfLine)
-		{
-			OutputDebugString("\n"); 
-		}
-	}
+public:
+    void Write ( LPCTSTR Message, bool EndOfLine )
+    {
+        OutputDebugString(Message);
+        if (EndOfLine)
+        {
+            OutputDebugString("\n");
+        }
+    }
 };
 
 CTraceModule * AddTraceModule    ( CTraceModule * TraceModule ); // Must be created with new
 CTraceModule * RemoveTraceModule ( CTraceModule * TraceModule ); // Is not automaticly deleted
-
-#endif // __TRACE_H__
diff --git a/Source/Common/TraceDefs.h b/Source/Common/TraceDefs.h
index 79a317fa8..65fae3295 100644
--- a/Source/Common/TraceDefs.h
+++ b/Source/Common/TraceDefs.h
@@ -1,36 +1,31 @@
-#ifndef __TRACE_DEFS_H__
-#define __TRACE_DEFS_H__
+#pragma once
 
 enum TraceType
 {
-	TraceNone			= 0x00000000,
-	TraceError			= 0x00000001,
-	TraceSettings		= 0x00000002,
-	TraceGfxPlugin		= 0x00000004,	
-	TraceDebug			= 0x00000010,	
-	TraceRecompiler		= 0x00000020,	
-	TraceRSP			= 0x00000040,	
-	TraceTLB			= 0x00000080,	
-	TraceValidate		= 0x00000100,	
-	TraceAudio			= 0x00000200,	
-	TraceProtectedMem	= 0x00000400,	
-	TraceNoHeader       = 0x80000000,
+    TraceNone			= 0x00000000,
+    TraceError			= 0x00000001,
+    TraceSettings		= 0x00000002,
+    TraceGfxPlugin		= 0x00000004,
+    TraceDebug			= 0x00000010,
+    TraceRecompiler		= 0x00000020,
+    TraceRSP			= 0x00000040,
+    TraceTLB			= 0x00000080,
+    TraceValidate		= 0x00000100,
+    TraceAudio			= 0x00000200,
+    TraceProtectedMem	= 0x00000400,
+    TraceNoHeader       = 0x80000000,
 };
 
 enum TraceLevel
 {
-	//Handle Existing Code
-	TrLvError     = TraceError,
-	TrLv1         = TraceSettings |  TrLvError,
-	TrLv2         = TrLv1         |  TraceDebug,
-	TrlvGfxPlugin = TraceGfxPlugin,
-	TrLvAll       = ~TraceNoHeader,
+    //Handle Existing Code
+    TrLvError     = TraceError,
+    TrLv1         = TraceSettings |  TrLvError,
+    TrLv2         = TrLv1         |  TraceDebug,
+    TrlvGfxPlugin = TraceGfxPlugin,
+    TrLvAll       = ~TraceNoHeader,
 };
 
-
-void WriteTrace     ( TraceType Type, LPCTSTR Message );
-void WriteTraceF    ( TraceType Type, LPCTSTR strFormat, ... );
+void WriteTrace     ( TraceType Type, const char * Message );
+void WriteTraceF    ( TraceType Type, const char * strFormat, ... );
 void CloseTrace     ( void ); //Free's all memory associated with trace
-
-
-#endif // __TRACE_DEFS_H__
diff --git a/Source/Common/md5.cpp b/Source/Common/md5.cpp
index 3fe2536d1..1dc7a1c8b 100644
--- a/Source/Common/md5.cpp
+++ b/Source/Common/md5.cpp
@@ -41,6 +41,7 @@ documentation and/or software.
  */
 
 #include "stdafx.h"
+#include <TChar.H>
 
 // MD5 simple initialization method
 
diff --git a/Source/Common/path.cpp b/Source/Common/path.cpp
index 151690d4e..d21893411 100644
--- a/Source/Common/path.cpp
+++ b/Source/Common/path.cpp
@@ -3,35 +3,36 @@
 //////////////////////////////////////////////////////////////////////
 #include "stdafx.h"
 #include <Shlobj.h>
+#include <dos.h>
 
 //////////////////////////////////////////////////////////////////////
 // Constants
 //////////////////////////////////////////////////////////////////////
 
-LPCTSTR const DLL_EXTENSION = _T("dll");
-LPCTSTR const INI_EXTENSION = _T("ini");
-LPCTSTR const EXE_EXTENSION = _T("exe");
-LPCTSTR const WILD_NAME_EXTENSION = _T("*.*");
+const char * const DLL_EXTENSION = "dll";
+const char * const INI_EXTENSION = "ini";
+const char * const EXE_EXTENSION = "exe";
+const char * const WILD_NAME_EXTENSION = "*.*";
 const TCHAR WILD_ONE             = '?';
 const TCHAR WILD_ANY             = '*';
-LPCTSTR const WILD_SET           = _T("?*");
-LPCTSTR const DIR_DOUBLEDELIM    = _T("\\\\");
+const char * const WILD_SET           = "?*";
+const char * const DIR_DOUBLEDELIM    = "\\\\";
 const TCHAR DRIVE_DELIMITER      = ':';
 const TCHAR DIRECTORY_DELIMITER  = '\\';
 const TCHAR EXTENSION_DELIMITER  = '.';
 const TCHAR DIRECTORY_DELIMITER2 = '/';
-HINSTANCE CPath::m_hInst = NULL;
+void * CPath::m_hInst = NULL;
 
 //////////////////////////////////////////////////////////////////////
 // Helpers
 //////////////////////////////////////////////////////////////////////
 
-void CPath::SethInst ( HINSTANCE hInst )
+void CPath::SethInst ( void * hInst )
 {
 	m_hInst = hInst;
 }
 
-HINSTANCE CPath::GethInst()
+void * CPath::GethInst()
 {
 	return m_hInst;
 }
@@ -89,14 +90,14 @@ CPath::CPath(const CPath& rPath)
 //-------------------------------------------------------------
 // Task    : Constructs a path and points it 2 lpszPath
 //-------------------------------------------------------------
-CPath::CPath(LPCTSTR lpszPath)
+CPath::CPath(const char * lpszPath)
 {
 	Init();
-    m_strPath =lpszPath ? lpszPath : _T("");
+    m_strPath =lpszPath ? lpszPath : "";
 	cleanPathString(m_strPath);
 }
 
-CPath::CPath(LPCTSTR lpszPath, LPCTSTR NameExten)
+CPath::CPath(const char * lpszPath, const char * NameExten)
 {
 	Init();
 	SetDriveDirectory(lpszPath);
@@ -106,7 +107,7 @@ CPath::CPath(LPCTSTR lpszPath, LPCTSTR NameExten)
 //-------------------------------------------------------------
 // Task    : Constructs a path and points it 2 strPath
 //-------------------------------------------------------------
-CPath::CPath(const stdstr& strPath)
+CPath::CPath(const std::string& strPath)
 {
     Init();
     m_strPath =strPath;
@@ -116,7 +117,7 @@ CPath::CPath(const stdstr& strPath)
 //-------------------------------------------------------------
 // Task    : Constructs a path and points it 2 strPath
 //-------------------------------------------------------------
-CPath::CPath(const stdstr& strPath, LPCTSTR NameExten )
+CPath::CPath(const std::string& strPath, const char * NameExten)
 {
 	Init();
 	SetDriveDirectory(strPath.c_str());
@@ -126,7 +127,7 @@ CPath::CPath(const stdstr& strPath, LPCTSTR NameExten )
 //-------------------------------------------------------------
 // Task    : Constructs a path and points it 2 strPath
 //-------------------------------------------------------------
-CPath::CPath(const stdstr& strPath, const stdstr& NameExten )
+CPath::CPath(const std::string& strPath, const std::string& NameExten)
 {
 	Init();
 	SetDriveDirectory(strPath.c_str());
@@ -146,24 +147,24 @@ CPath::~CPath()
 // Post    : Return TRUE if paths are equal
 // Task    : Check if the two path are the same
 //-------------------------------------------------------------
-BOOL CPath::operator ==(const CPath& rPath) const
+bool CPath::operator ==(const CPath& rPath) const
 {
     // Get fully qualified versions of the paths
-	stdstr FullyQualified1;
-    stdstr FullyQualified2;
+	std::string FullyQualified1;
+    std::string FullyQualified2;
 	
 	GetFullyQualified(FullyQualified1);
 	rPath.GetFullyQualified(FullyQualified2);
 	
     // Compare them
-	return _tcsicmp(FullyQualified1.c_str(),FullyQualified2.c_str()) == 0;
+	return _stricmp(FullyQualified1.c_str(), FullyQualified2.c_str()) == 0;
 }
 
 //-------------------------------------------------------------
 // Post    : Return TRUE if paths are different
 // Task    : Check if the two path are different
 //-------------------------------------------------------------
-BOOL CPath::operator !=(const CPath& rPath) const
+bool CPath::operator !=(const CPath& rPath) const
 {
     return !(*this == rPath);
 }
@@ -182,9 +183,9 @@ CPath& CPath::operator =(const CPath& rPath)
 // Post    : Return the path, so that assignements can be chained
 // Task    : Assign a string 2 a path
 //-------------------------------------------------------------
-CPath& CPath::operator =(LPCTSTR lpszPath)
+CPath& CPath::operator =(const char * lpszPath)
 {
-    m_strPath =lpszPath ? lpszPath : _T("");
+    m_strPath =lpszPath ? lpszPath : "";
     return *this;
 }
 
@@ -192,7 +193,7 @@ CPath& CPath::operator =(LPCTSTR lpszPath)
 // Post    : Return the path, so that assignements can be chained
 // Task    : Assign a string 2 a path
 //-------------------------------------------------------------
-CPath& CPath::operator =(const stdstr& strPath)
+CPath& CPath::operator =(const std::string& strPath)
 {
     m_strPath =strPath;
     return *this;
@@ -206,12 +207,12 @@ CPath& CPath::operator =(const stdstr& strPath)
 //           function in any non-constant pointer and alter the data.
 //           Very dangerous
 //-------------------------------------------------------------
-CPath::operator LPCTSTR() const
+CPath::operator const char *() const
 {
-    return (LPCTSTR)m_strPath.c_str();
+    return (const char *)m_strPath.c_str();
 }
 
-CPath::CPath(DIR_CURRENT_DIRECTORY /*sdt*/, LPCTSTR NameExten)
+CPath::CPath(DIR_CURRENT_DIRECTORY /*sdt*/, const char * NameExten)
 {
 	// Application's current directory	 
 	Init();
@@ -219,7 +220,7 @@ CPath::CPath(DIR_CURRENT_DIRECTORY /*sdt*/, LPCTSTR NameExten)
 	if (NameExten) { SetNameExtension(NameExten); }
 }
 
-CPath::CPath(DIR_MODULE_DIRECTORY /*sdt*/, LPCTSTR NameExten)
+CPath::CPath(DIR_MODULE_DIRECTORY /*sdt*/, const char * NameExten)
 {
 	// The directory where the executable of this app is
 	Init();
@@ -248,10 +249,10 @@ CPath::CPath(DIR_MODULE_FILE /*sdt*/)
 //           Do not rely on pNames being <= 8 characters, extensions 
 //           being <= 3 characters, or drives being 1 character
 //-------------------------------------------------------------
-void CPath::GetComponents(stdstr* pDrive, 
-                       	  stdstr* pDirectory, 
-                       	  stdstr* pName, 
-                          stdstr* pExtension) const
+void CPath::GetComponents(std::string* pDrive, 
+                       	  std::string* pDirectory, 
+                       	  std::string* pName, 
+                          std::string* pExtension) const
 {
     TCHAR buff_drive[_MAX_DRIVE + 1];
     TCHAR buff_dir  [_MAX_DIR   + 1];
@@ -263,7 +264,7 @@ void CPath::GetComponents(stdstr* pDrive,
     ZeroMemory(buff_name, sizeof(buff_name));
     ZeroMemory(buff_ext,  sizeof(buff_ext));
 
-	_tsplitpath(m_strPath.c_str(), 
+	_splitpath(m_strPath.c_str(),
 		pDrive     ? buff_drive : NULL,
 		pDirectory ? buff_dir   : NULL,
 		pName      ? buff_name  : NULL,
@@ -292,10 +293,10 @@ void CPath::GetComponents(stdstr* pDrive,
 //-------------------------------------------------------------
 // Task    : Get drive and directory from path
 //-------------------------------------------------------------
-void CPath::GetDriveDirectory(stdstr& rDriveDirectory) const
+void CPath::GetDriveDirectory(std::string& rDriveDirectory) const
 {
-    stdstr Drive;
-    stdstr Directory;
+    std::string Drive;
+    std::string Directory;
 
 	GetComponents(&Drive,&Directory);
 	rDriveDirectory =Drive;
@@ -306,23 +307,23 @@ void CPath::GetDriveDirectory(stdstr& rDriveDirectory) const
     }
 }
 
-stdstr CPath::GetDriveDirectory(void) const
+std::string CPath::GetDriveDirectory(void) const
 {
-	stdstr rDriveDirectory;
+	std::string rDriveDirectory;
 	GetDriveDirectory(rDriveDirectory);
 	return rDriveDirectory;
 }
 //-------------------------------------------------------------
 // Task    : Get directory from path
 //-------------------------------------------------------------
-void CPath::GetDirectory(stdstr& rDirectory) const
+void CPath::GetDirectory(std::string& rDirectory) const
 {
     GetComponents(NULL,&rDirectory);
 }    
 
-stdstr CPath::GetDirectory(void) const
+std::string CPath::GetDirectory(void) const
 {
-	stdstr rDirectory;
+	std::string rDirectory;
 	GetComponents(NULL,&rDirectory);
 	return rDirectory;
 }    
@@ -330,10 +331,10 @@ stdstr CPath::GetDirectory(void) const
 //-------------------------------------------------------------
 // Task    : Get filename and extension from path
 //-------------------------------------------------------------
-void CPath::GetNameExtension(stdstr& rNameExtension) const
+void CPath::GetNameExtension(std::string& rNameExtension) const
 {
-    stdstr Name;
-    stdstr Extension;
+    std::string Name;
+    std::string Extension;
 
 	GetComponents(NULL,NULL,&Name,&Extension);
     rNameExtension =Name;
@@ -344,9 +345,9 @@ void CPath::GetNameExtension(stdstr& rNameExtension) const
     }
 }
 
-stdstr CPath::GetNameExtension(void) const
+std::string CPath::GetNameExtension(void) const
 {
-	stdstr rNameExtension;
+	std::string rNameExtension;
 	GetNameExtension(rNameExtension);
 	return rNameExtension;
 }
@@ -354,14 +355,14 @@ stdstr CPath::GetNameExtension(void) const
 //-------------------------------------------------------------
 // Task    : Get filename from path
 //-------------------------------------------------------------
-void CPath::GetName(stdstr& rName) const
+void CPath::GetName(std::string& rName) const
 {
     GetComponents(NULL,NULL,&rName);
 }
 
-stdstr CPath::GetName(void) const
+std::string CPath::GetName(void) const
 {
-	stdstr rName;
+	std::string rName;
 	GetComponents(NULL,NULL,&rName);
 	return rName;
 }
@@ -369,14 +370,14 @@ stdstr CPath::GetName(void) const
 //-------------------------------------------------------------
 // Task    : Get file extension from path
 //-------------------------------------------------------------
-void CPath::GetExtension(stdstr& rExtension) const
+void CPath::GetExtension(std::string& rExtension) const
 {
     GetComponents(NULL,NULL,NULL,&rExtension);
 }   
 
-stdstr CPath::GetExtension(void) const
+std::string CPath::GetExtension(void) const
 {
-	stdstr rExtension;
+	std::string rExtension;
 	GetComponents(NULL,NULL,NULL,&rExtension);
 	return rExtension;
 }   
@@ -384,9 +385,9 @@ stdstr CPath::GetExtension(void) const
 //-------------------------------------------------------------
 // Task    : Get current directory
 //-------------------------------------------------------------
-void CPath::GetCurrentDirectory(stdstr& rDirectory) const
+void CPath::GetCurrentDirectory(std::string& rDirectory) const
 {
-	stdstr Directory;
+	std::string Directory;
 
 	rDirectory = "";
 	
@@ -395,15 +396,15 @@ void CPath::GetCurrentDirectory(stdstr& rDirectory) const
 	if(Directory.empty())
 		return;
 	
-    stdstr::size_type nDelimiter =Directory.rfind(DIRECTORY_DELIMITER);
+    std::string::size_type nDelimiter =Directory.rfind(DIRECTORY_DELIMITER);
 	
 	rDirectory =Directory.substr(nDelimiter);
 	StripLeadingBackslash(rDirectory);
 }   
 
-stdstr CPath::GetCurrentDirectory(void) const
+std::string CPath::GetCurrentDirectory(void) const
 {
-	stdstr rDirecotry;
+	std::string rDirecotry;
 	GetCurrentDirectory(rDirecotry);
 	return rDirecotry;
 }   
@@ -411,13 +412,13 @@ stdstr CPath::GetCurrentDirectory(void) const
 //-------------------------------------------------------------
 // Task    : Get fully qualified path
 //-------------------------------------------------------------
-void CPath::GetFullyQualified(stdstr& rFullyQualified) const
+void CPath::GetFullyQualified(std::string& rFullyQualified) const
 {
     TCHAR buff_fullname[MAX_PATH];
 
 	memset(buff_fullname, 0, sizeof(buff_fullname));
 
-	_tfullpath(buff_fullname,m_strPath.c_str(),MAX_PATH-1);
+	_fullpath(buff_fullname, m_strPath.c_str(), MAX_PATH - 1);
     rFullyQualified =buff_fullname;
 }
 
@@ -425,7 +426,7 @@ void CPath::GetFullyQualified(stdstr& rFullyQualified) const
 // Post    : Return TRUE if path does not start from filesystem root
 // Task    : Check if path is a relative one (e.g. doesn't start with C:\...)
 //-------------------------------------------------------------    
-BOOL CPath::IsRelative() const
+bool CPath::IsRelative() const
 {
 	if (m_strPath.length() > 1 && m_strPath[1] == DRIVE_DELIMITER)
 	{
@@ -441,16 +442,16 @@ BOOL CPath::IsRelative() const
 //-------------------------------------------------------------
 // Task    : Set path components
 //-------------------------------------------------------------
-void CPath::SetComponents(LPCTSTR lpszDrive, 
-                          LPCTSTR lpszDirectory,
-						  LPCTSTR lpszName, 
-                          LPCTSTR lpszExtension)
+void CPath::SetComponents(const char * lpszDrive, 
+                          const char * lpszDirectory,
+						  const char * lpszName, 
+                          const char * lpszExtension)
 {
     TCHAR buff_fullname[MAX_PATH];
 
 	memset(buff_fullname, 0, sizeof(buff_fullname));
 
-	_tmakepath(buff_fullname,lpszDrive,lpszDirectory,lpszName,lpszExtension);
+	_makepath(buff_fullname, lpszDrive, lpszDirectory, lpszName, lpszExtension);
 
     m_strPath.erase();
     m_strPath =buff_fullname;
@@ -461,10 +462,10 @@ void CPath::SetComponents(LPCTSTR lpszDrive,
 //-------------------------------------------------------------
 void CPath::SetDrive(TCHAR chDrive)
 {
-	stdstr_f Drive(_T("%c"),chDrive);
-	stdstr	 Directory;
-	stdstr	 Name;
-	stdstr	 Extension;
+	stdstr_f Drive("%c",chDrive);
+	std::string	 Directory;
+	std::string	 Name;
+	std::string	 Extension;
 	
 	GetComponents(NULL,&Directory,&Name,&Extension);
 	SetComponents(Drive.c_str(),Directory.c_str(),Name.c_str(),Extension.c_str());
@@ -473,12 +474,12 @@ void CPath::SetDrive(TCHAR chDrive)
 //-------------------------------------------------------------
 // Task    : Set path's directory
 //-------------------------------------------------------------
-void CPath::SetDirectory(LPCTSTR lpszDirectory, BOOL bEnsureAbsolute /*= FALSE*/)
+void CPath::SetDirectory(const char * lpszDirectory, bool bEnsureAbsolute /*= FALSE*/)
 {
-	stdstr	Drive;	
-	stdstr	Directory =lpszDirectory;
-	stdstr	Name;
-	stdstr	Extension;
+	std::string	Drive;	
+	std::string	Directory =lpszDirectory;
+	std::string	Name;
+	std::string	Extension;
 	
 	if(bEnsureAbsolute)
 		EnsureLeadingBackslash(Directory);
@@ -491,11 +492,11 @@ void CPath::SetDirectory(LPCTSTR lpszDirectory, BOOL bEnsureAbsolute /*= FALSE*/
 //-------------------------------------------------------------
 // Task    : Set path's drive and directory
 //-------------------------------------------------------------
-void CPath::SetDriveDirectory(LPCTSTR lpszDriveDirectory)
+void CPath::SetDriveDirectory(const char * lpszDriveDirectory)
 {
-	stdstr	DriveDirectory =lpszDriveDirectory;
-	stdstr	Name;
-	stdstr	Extension;
+	std::string	DriveDirectory =lpszDriveDirectory;
+	std::string	Name;
+	std::string	Extension;
 	
 	EnsureTrailingBackslash(DriveDirectory);
 	cleanPathString(DriveDirectory);
@@ -507,11 +508,11 @@ void CPath::SetDriveDirectory(LPCTSTR lpszDriveDirectory)
 //-------------------------------------------------------------
 // Task    : Set path's filename
 //-------------------------------------------------------------
-void CPath::SetName(LPCTSTR lpszName)
+void CPath::SetName(const char * lpszName)
 {
-	stdstr	Drive;
-	stdstr	Directory;
-	stdstr	Extension;
+	std::string	Drive;
+	std::string	Directory;
+	std::string	Extension;
 	
 	GetComponents(&Drive,&Directory,NULL,&Extension);
 	SetComponents(Drive.c_str(),Directory.c_str(),lpszName,Extension.c_str());
@@ -522,14 +523,14 @@ void CPath::SetName(LPCTSTR lpszName)
 //-------------------------------------------------------------
 void CPath::SetName(int iName)
 {
-	stdstr	Drive;
-	stdstr	Directory;
-	stdstr	Extension;
+	std::string	Drive;
+	std::string	Directory;
+	std::string	Extension;
 	TCHAR 	sName[33];
 	
 	memset(sName, 0, sizeof(sName));
 
-	_itot(iName, sName, 10);
+	_itoa(iName, sName, 10);
 	
 	GetComponents(&Drive,&Directory,NULL,&Extension);
 	SetComponents(Drive.c_str(),Directory.c_str(),sName,Extension.c_str());
@@ -539,11 +540,11 @@ void CPath::SetName(int iName)
 //-------------------------------------------------------------
 // Task    : Set path's file extension
 //-------------------------------------------------------------
-void CPath::SetExtension(LPCTSTR lpszExtension)
+void CPath::SetExtension(const char * lpszExtension)
 {
-	stdstr	Drive;
-	stdstr	Directory;
-	stdstr	Name;
+	std::string	Drive;
+	std::string	Directory;
+	std::string	Name;
 	
 	GetComponents(&Drive,&Directory,&Name);
 	SetComponents(Drive.c_str(),Directory.c_str(),Name.c_str(),lpszExtension);
@@ -554,14 +555,14 @@ void CPath::SetExtension(LPCTSTR lpszExtension)
 //-------------------------------------------------------------
 void CPath::SetExtension(int iExtension)
 {
-	stdstr	Drive;
-	stdstr	Directory;
-	stdstr	Name;
+	std::string	Drive;
+	std::string	Directory;
+	std::string	Name;
 	TCHAR	sExtension[20];
 
 	memset(sExtension, 0, sizeof(sExtension));
 
-	_itot(iExtension, sExtension, 10);
+	_itoa(iExtension, sExtension, 10);
 
 	GetComponents(&Drive,&Directory,&Name);
 	SetComponents(Drive.c_str(),Directory.c_str(),Name.c_str(),sExtension);
@@ -570,10 +571,10 @@ void CPath::SetExtension(int iExtension)
 //-------------------------------------------------------------
 // Task    : Set path's filename and extension
 //-------------------------------------------------------------
-void CPath::SetNameExtension(LPCTSTR lpszNameExtension)
+void CPath::SetNameExtension(const char * lpszNameExtension)
 {
-	stdstr	Drive;
-	stdstr	Directory;
+	std::string	Drive;
+	std::string	Directory;
 
 	GetComponents(&Drive,&Directory);
 	SetComponents(Drive.c_str(),Directory.c_str(),lpszNameExtension,NULL);
@@ -582,13 +583,13 @@ void CPath::SetNameExtension(LPCTSTR lpszNameExtension)
 //-------------------------------------------------------------
 // Task    : Append a subdirectory 2 path's directory
 //-------------------------------------------------------------
-void CPath::AppendDirectory(LPCTSTR lpszSubDirectory)
+void CPath::AppendDirectory(const char * lpszSubDirectory)
 {                                               
-	stdstr	Drive;
-	stdstr	Directory;
-	stdstr	SubDirectory =lpszSubDirectory;
-	stdstr	Name;
-	stdstr	Extension;
+	std::string	Drive;
+	std::string	Directory;
+	std::string	SubDirectory =lpszSubDirectory;
+	std::string	Name;
+	std::string	Extension;
 	
 	if(SubDirectory.empty())
 		return;
@@ -609,16 +610,16 @@ void CPath::AppendDirectory(LPCTSTR lpszSubDirectory)
 //           deepest directory (the one we're just exiting) in it
 // Task    : Remove deepest subdirectory from path
 //-------------------------------------------------------------
-void CPath::UpDirectory(stdstr *pLastDirectory /*= NULL*/)
+void CPath::UpDirectory(std::string *pLastDirectory /*= NULL*/)
 {
-	stdstr Directory;
+	std::string Directory;
 
 	GetDirectory(Directory);	
 	StripTrailingBackslash(Directory);
 	if(Directory.empty())
 		return;
 	
-    stdstr::size_type nDelimiter =Directory.rfind(DIRECTORY_DELIMITER);
+    std::string::size_type nDelimiter =Directory.rfind(DIRECTORY_DELIMITER);
 	
 	if(pLastDirectory != NULL)
 	{
@@ -626,7 +627,7 @@ void CPath::UpDirectory(stdstr *pLastDirectory /*= NULL*/)
 		StripLeadingBackslash(*pLastDirectory);
 	}
 		
-    if(nDelimiter != stdstr::npos)
+    if(nDelimiter != std::string::npos)
 		Directory =Directory.substr(0,nDelimiter);
 		
 	SetDirectory(Directory.c_str());
@@ -650,13 +651,13 @@ void CPath::CurrentDirectory()
 //-------------------------------------------------------------
 // Task    : Set path 2 the name of specified module
 //-------------------------------------------------------------
-void CPath::Module(HINSTANCE hInstance)
+void CPath::Module(void * hInstance)
 {
     TCHAR buff_path[MAX_PATH];
 
 	memset(buff_path, 0, sizeof(buff_path));
 
-	GetModuleFileName(hInstance,buff_path,MAX_PATH);
+	GetModuleFileName((HINSTANCE)hInstance, buff_path, MAX_PATH);
     m_strPath =buff_path;
 }
 
@@ -668,17 +669,17 @@ void CPath::Module()
     TCHAR buff_path[MAX_PATH];
 	memset(buff_path, 0, sizeof(buff_path));
 
-	GetModuleFileName(m_hInst,buff_path,MAX_PATH);
+	GetModuleFileName((HMODULE)m_hInst,buff_path,MAX_PATH);
     m_strPath =buff_path;
 }
 
 //-------------------------------------------------------------
 // Task    : Set path 2 the directory of specified module
 //-------------------------------------------------------------
-void CPath::ModuleDirectory(HINSTANCE hInstance)
+void CPath::ModuleDirectory(void * hInstance)
 {
-	Module(hInstance);
-	SetNameExtension(_T(""));
+	Module((HINSTANCE)hInstance);
+	SetNameExtension("");
 }
 
 //-------------------------------------------------------------
@@ -687,17 +688,17 @@ void CPath::ModuleDirectory(HINSTANCE hInstance)
 void CPath::ModuleDirectory()
 {
 	Module();
-	SetNameExtension(_T(""));
+	SetNameExtension("");
 }
 
 //---------------------------------------------------------------------------
 // Post    : Return TRUE if a directory
 // Task    : Check if this path represents a directory
 //---------------------------------------------------------------------------
-BOOL CPath::IsDirectory() const
+bool CPath::IsDirectory() const
 {
     // Check if this path has a filename
-    stdstr file_name;
+    std::string file_name;
     GetNameExtension(file_name);
     
     return file_name.empty();
@@ -711,18 +712,18 @@ BOOL CPath::IsDirectory() const
 //           use CPath::FindFirst() because that routine parses out
 //           '.' and '..', which fails for empty directories
 //-------------------------------------------------------------
-BOOL CPath::DirectoryExists() const
+bool CPath::DirectoryExists() const
 {
     // Create test path	
 	CPath TestPath(m_strPath.c_str());
 
-	stdstr DirName;
+	std::string DirName;
 	TestPath.UpDirectory(&DirName);
 	TestPath.SetNameExtension(DirName.c_str());
 
 	WIN32_FIND_DATA	FindData;
-	HANDLE          hFindFile =FindFirstFile((LPCTSTR)TestPath,&FindData); // Find anything
-	BOOL            bGotFile  =(hFindFile != INVALID_HANDLE_VALUE);
+	HANDLE          hFindFile =FindFirstFile((const char *)TestPath,&FindData); // Find anything
+	bool            bGotFile  =(hFindFile != INVALID_HANDLE_VALUE);
 
 	if(hFindFile != NULL)	// Make sure we close the search
 	    FindClose(hFindFile);
@@ -734,11 +735,11 @@ BOOL CPath::DirectoryExists() const
 // Post    : Return TRUE if these is such a file
 // Task    : Check if file exists
 //-------------------------------------------------------------
-BOOL CPath::Exists() const
+bool CPath::Exists() const
 {
 	WIN32_FIND_DATA FindData;
 	HANDLE          hFindFile =FindFirstFile(m_strPath.c_str(),&FindData);
-	BOOL            bSuccess  =(hFindFile != INVALID_HANDLE_VALUE);
+	bool            bSuccess  =(hFindFile != INVALID_HANDLE_VALUE);
 
 	if(hFindFile != NULL)	// Make sure we close the search
 	    FindClose(hFindFile);
@@ -750,10 +751,10 @@ BOOL CPath::Exists() const
 // Post    : Return TRUE on success
 // Task    : Delete file
 //-------------------------------------------------------------
-BOOL CPath::Delete(BOOL bEvenIfReadOnly) const
+bool CPath::Delete(bool bEvenIfReadOnly) const
 {
-    ULONG dwAttr =::GetFileAttributes(m_strPath.c_str());
-    if(dwAttr == (ULONG)-1)
+    uint32_t dwAttr =::GetFileAttributes(m_strPath.c_str());
+    if(dwAttr == (uint32_t)-1)
         // File does not exists
         return FALSE;
 
@@ -762,7 +763,7 @@ BOOL CPath::Delete(BOOL bEvenIfReadOnly) const
         return FALSE;
 
     SetFileAttributes(m_strPath.c_str(),FILE_ATTRIBUTE_NORMAL);
-    return DeleteFile(m_strPath.c_str());
+    return DeleteFile(m_strPath.c_str()) != 0;
 }	
 
 //-------------------------------------------------------------
@@ -772,7 +773,7 @@ BOOL CPath::Delete(BOOL bEvenIfReadOnly) const
 //           Since ::CopyFile will not overwrite read only files
 //           we will make sure the target file is writable first
 //-------------------------------------------------------------
-BOOL CPath::CopyTo(LPCTSTR lpcszTargetFile, BOOL bOverwrite)
+bool CPath::CopyTo(const char * lpcszTargetFile, bool bOverwrite)
 {
     // Check if the target file exists
     CPath TargetFile(lpcszTargetFile);
@@ -790,7 +791,7 @@ BOOL CPath::CopyTo(LPCTSTR lpcszTargetFile, BOOL bOverwrite)
 
     // CopyFile will set the target's attributes 2 the same as 
     // the source after copying
-    return CopyFile(m_strPath.c_str(),lpcszTargetFile,!bOverwrite);
+    return CopyFile(m_strPath.c_str(),lpcszTargetFile,!bOverwrite) != 0;
 }
 
 //-------------------------------------------------------------
@@ -798,7 +799,7 @@ BOOL CPath::CopyTo(LPCTSTR lpcszTargetFile, BOOL bOverwrite)
 //           and we weren't granted permission 2 overwrite file or some error
 // Task    : Move file
 //-------------------------------------------------------------
-BOOL CPath::MoveTo(LPCTSTR lpcszTargetFile, BOOL bOverwrite)
+bool CPath::MoveTo(const char * lpcszTargetFile, bool bOverwrite)
 {
     // Check if the target file exists
     CPath TargetFile(lpcszTargetFile);
@@ -814,14 +815,14 @@ BOOL CPath::MoveTo(LPCTSTR lpcszTargetFile, BOOL bOverwrite)
             return FALSE;
     }
 
-   return MoveFile(m_strPath.c_str(),lpcszTargetFile);
+   return MoveFile(m_strPath.c_str(),lpcszTargetFile) != 0;
 }
 
 //-------------------------------------------------------------
 // Post    : Return TRUE if attributes do match
 // Task    : Compare finder attributes
 //-------------------------------------------------------------
-BOOL CPath::AttributesMatch(ULONG dwTargetAttributes, ULONG dwFileAttributes)
+bool CPath::AttributesMatch(uint32_t dwTargetAttributes, uint32_t dwFileAttributes)
 {
 	if (dwTargetAttributes == _A_ALLFILES)
 	{
@@ -862,7 +863,7 @@ BOOL CPath::AttributesMatch(ULONG dwTargetAttributes, ULONG dwFileAttributes)
 //           if you specify those attributes
 //           See aso: FindFirstFile, FindNextFile
 //-------------------------------------------------------------
-BOOL CPath::FindFirst(ULONG dwAttributes /*= _A_NORMAL*/)
+bool CPath::FindFirst(uint32_t dwAttributes /*= _A_NORMAL*/)
 {
 	m_dwFindFileAttributes =dwAttributes;
 	BOOL bGotFile;
@@ -907,7 +908,7 @@ BOOL CPath::FindFirst(ULONG dwAttributes /*= _A_NORMAL*/)
 // Task    : Find the next file that meets the conditions specified 
 //           in the last FindFirst call
 //-------------------------------------------------------------
-BOOL CPath::FindNext()
+bool CPath::FindNext()
 {
     if (m_hFindFile == NULL)
 		return FALSE;
@@ -954,12 +955,12 @@ BOOL CPath::FindNext()
 // Post    : Return TRUE on success
 // Task    : Change current working directory of application 2 path
 //-------------------------------------------------------------
-BOOL CPath::ChangeDirectory()
+bool CPath::ChangeDirectory()
 {
-	stdstr DriveDirectory;
+	std::string DriveDirectory;
 	GetDriveDirectory(DriveDirectory);
 
-    return SetCurrentDirectory(DriveDirectory.c_str());
+    return SetCurrentDirectory(DriveDirectory.c_str()) != 0;
 }
 
 //-------------------------------------------------------------
@@ -968,32 +969,32 @@ BOOL CPath::ChangeDirectory()
 // Post    : Return TRUE on success
 // Task    : Create new directory
 //-------------------------------------------------------------
-BOOL CPath::CreateDirectory(BOOL bCreateIntermediates /*= TRUE*/)
+bool CPath::DirectoryCreate(bool bCreateIntermediates /*= TRUE*/)
 {
-	stdstr	PathText;
-	BOOL	bSuccess;
+	std::string	PathText;
+	bool	bSuccess;
 		
 	GetDriveDirectory(PathText);
     StripTrailingBackslash(PathText);
-    bSuccess =::CreateDirectory(PathText.c_str(),NULL);
+    bSuccess =::CreateDirectory(PathText.c_str(),NULL) != 0;
 	if(!bSuccess)
 	{
 		CPath CurrentDir(CPath::CURRENT_DIRECTORY);
-		bSuccess = ChangeDirectory();
+		bSuccess = ChangeDirectory() != 0;
 		CurrentDir.ChangeDirectory();
 	}
 
 	if(!bSuccess && bCreateIntermediates)
 	{
-        stdstr::size_type nDelimiter =PathText.rfind(DIRECTORY_DELIMITER);
-        if(nDelimiter == stdstr::npos)
+        std::string::size_type nDelimiter =PathText.rfind(DIRECTORY_DELIMITER);
+        if(nDelimiter == std::string::npos)
 			return FALSE;
 
 		PathText.resize(nDelimiter + 1);
 		CPath SubPath(PathText);
 		
-		if(SubPath.CreateDirectory())
-			return CreateDirectory(FALSE);
+		if (SubPath.DirectoryCreate())
+			return DirectoryCreate(false);
 		else 
 			return FALSE;
 	}
@@ -1006,7 +1007,7 @@ BOOL CPath::CreateDirectory(BOOL bCreateIntermediates /*= TRUE*/)
 //------------------------------------------------------------------------
 // Task    : Remove first character (if any) if it's chLeading
 //------------------------------------------------------------------------
-void CPath::cleanPathString(stdstr& rDirectory) const
+void CPath::cleanPathString(std::string& rDirectory) const
 {
 	LPCSTR const DIR_DOUBLEDELIM    = "\\\\";
 
@@ -1021,7 +1022,7 @@ void CPath::cleanPathString(stdstr& rDirectory) const
 	pos = rDirectory.find( DIR_DOUBLEDELIM );
 	while ( pos != std::string::npos )
 	{
-		rDirectory.replace( pos, 1, &DIRECTORY_DELIMITER );
+		rDirectory.replace( pos, 2, &DIRECTORY_DELIMITER );
 		pos = rDirectory.find( DIR_DOUBLEDELIM, pos + 1 );
 	}
 	if (AppendEnd)
@@ -1030,9 +1031,9 @@ void CPath::cleanPathString(stdstr& rDirectory) const
 	}
 }
 
-void CPath::StripLeadingChar(stdstr& rText, TCHAR chLeading) const
+void CPath::StripLeadingChar(std::string& rText, TCHAR chLeading) const
 {
-    stdstr::size_type nLength =rText.length();
+    std::string::size_type nLength =rText.length();
 	if(nLength == 0)
 		return;
 
@@ -1044,9 +1045,9 @@ void CPath::StripLeadingChar(stdstr& rText, TCHAR chLeading) const
 //------------------------------------------------------------------------
 // Task    : Remove first character if \
 //------------------------------------------------------------------------
-void CPath::StripLeadingBackslash(stdstr& Directory) const
+void CPath::StripLeadingBackslash(std::string& Directory) const
 {
-	stdstr::size_type nLength =Directory.length();
+	std::string::size_type nLength =Directory.length();
 
     // If Directory is of the form '\', don't do it
 	if(nLength <= 1)
@@ -1059,9 +1060,9 @@ void CPath::StripLeadingBackslash(stdstr& Directory) const
 //------------------------------------------------------------------------
 // Task    : Remove last character (if any) if it's chTrailing
 //------------------------------------------------------------------------
-void CPath::StripTrailingChar(stdstr& rText, TCHAR chTrailing) const
+void CPath::StripTrailingChar(std::string& rText, TCHAR chTrailing) const
 {
-	stdstr::size_type nLength =rText.length();
+	std::string::size_type nLength =rText.length();
 	if(nLength == 0)
 		return;
 	
@@ -1072,11 +1073,11 @@ void CPath::StripTrailingChar(stdstr& rText, TCHAR chTrailing) const
 //------------------------------------------------------------------------
 // Task    : Remove last character if \
 //------------------------------------------------------------------------
-void CPath::StripTrailingBackslash(stdstr& rDirectory) const
+void CPath::StripTrailingBackslash(std::string& rDirectory) const
 {
 	for (;;)
 	{
-		stdstr::size_type nLength = rDirectory.length();
+		std::string::size_type nLength = rDirectory.length();
 		if(nLength <= 1)
 		{
 			return;
@@ -1095,23 +1096,24 @@ void CPath::StripTrailingBackslash(stdstr& rDirectory) const
 // Task    : Add a backslash to the end of Directory if there is
 //           not already one there
 //------------------------------------------------------------------------
-void CPath::EnsureTrailingBackslash(stdstr& Directory) const
+void CPath::EnsureTrailingBackslash(std::string& Directory) const
 {
-	stdstr::size_type nLength =Directory.length();
+	std::string::size_type nLength = Directory.length();
 
-	if(Directory.empty() || (Directory[nLength-1] != DIRECTORY_DELIMITER))
-		Directory +=DIRECTORY_DELIMITER;
+	if (Directory.empty() || (Directory[nLength - 1] != DIRECTORY_DELIMITER))
+	{
+		Directory += DIRECTORY_DELIMITER;
+	}
 }
 
 //------------------------------------------------------------------------
 // Task    : Add a backslash to the beginning of Directory if there
 //           is not already one there
 //------------------------------------------------------------------------
-void CPath::EnsureLeadingBackslash(stdstr& Directory) const
+void CPath::EnsureLeadingBackslash(std::string & Directory) const
 {
 	if(Directory.empty() || (Directory[0] != DIRECTORY_DELIMITER))
     {
-        stdstr temp =Directory;
-		Directory.Format(_T("%c%s"),DIRECTORY_DELIMITER,temp.c_str());
+		Directory = stdstr_f("%c%s", DIRECTORY_DELIMITER, Directory.c_str());
     }
 }
diff --git a/Source/Common/path.h b/Source/Common/path.h
index de1f8919c..186e3133b 100644
--- a/Source/Common/path.h
+++ b/Source/Common/path.h
@@ -1,32 +1,14 @@
-//////////////////////////////////////////////////////////////////////
-//
-// Handy routines to help with file & path management
-//
-// This class is used to represent pathnames, that is the name and 
-// location of a file. CPaths are used when you want to refer to a file
-// as a whole, or to the location of a file.
-//
-//////////////////////////////////////////////////////////////////////
-
-#if !defined(AFX_PATH_H__6DD6923B_E241_40CE_81A3_4C2C88C140E4__INCLUDED_)
-#define AFX_PATH_H__6DD6923B_E241_40CE_81A3_4C2C88C140E4__INCLUDED_
-
-#if _MSC_VER > 1000
 #pragma once
-#endif // _MSC_VER > 1000
-
-#include "std string.h"
-#include <sys\types.h>
-#include <dos.h>
-#include <WTypes.h>
+#include <string>
+#include "stdtypes.h"
 
 class CPathException
 {
 public:
-    ULONG m_dwErrorCode;
+    uint32_t m_dwErrorCode;
 
 public:
-    CPathException(ULONG code =0): m_dwErrorCode(code) {}
+    CPathException(uint32_t code =0): m_dwErrorCode(code) {}
 };
 
 class CPath  
@@ -43,10 +25,10 @@ public:
 //Attributes
 private:	
 	
-	stdstr	m_strPath;
-	ULONG   m_dwFindFileAttributes;
-	HANDLE	m_hFindFile;
-	static HINSTANCE m_hInst;
+	std::string	m_strPath;
+	uint32_t   m_dwFindFileAttributes;
+	void *	m_hFindFile;
+	static void * m_hInst;
 
 public:
 //Methods
@@ -54,15 +36,15 @@ public:
 	//Construction / destruction
 	CPath();
     CPath(const CPath& rPath);
-    CPath(LPCTSTR lpszPath);
-	CPath(LPCTSTR lpszPath, LPCTSTR NameExten);
-	CPath(LPCTSTR lpszPath, const stdstr& NameExten);
-    CPath(const stdstr& strPath);
-	CPath(const stdstr& strPath, LPCTSTR NameExten);
-	CPath(const stdstr& strPath, const stdstr& NameExten);
+    CPath(const char * lpszPath);
+	CPath(const char * lpszPath, const char * NameExten);
+	CPath(const char * lpszPath, const std::string & NameExten);
+	CPath(const std::string& strPath);
+	CPath(const std::string& strPath, const char * NameExten);
+	CPath(const std::string& strPath, const std::string& NameExten);
 
-	CPath(DIR_CURRENT_DIRECTORY sdt, LPCTSTR NameExten = NULL);
-	CPath(DIR_MODULE_DIRECTORY sdt, LPCTSTR NameExten = NULL);
+	CPath(DIR_CURRENT_DIRECTORY sdt, const char * NameExten = NULL);
+	CPath(DIR_MODULE_DIRECTORY sdt, const char * NameExten = NULL);
 	CPath(DIR_MODULE_FILE sdt);
 	
 	virtual ~CPath();
@@ -73,95 +55,93 @@ public:
 
 	//Operators
     CPath& operator  = (const CPath& rPath);
-    CPath& operator  = (LPCTSTR lpszPath);
-    CPath& operator  = (const stdstr& strPath);
-    BOOL   operator == (const CPath& rPath) const;
-    BOOL   operator != (const CPath& rPath) const;
-    operator LPCTSTR() const;
-	operator stdstr&() { return m_strPath; }
+    CPath& operator  = (const char * lpszPath);
+    CPath& operator  = (const std::string & strPath);
+    bool   operator == (const CPath& rPath) const;
+	bool   operator != (const CPath& rPath) const;
+    operator const char *() const;
+	operator std::string &() { return m_strPath; }
 	
 	//Get path components
-	void   GetDriveDirectory(stdstr& rDriveDirectory) const;
-	stdstr GetDriveDirectory(void) const;
-	void   GetDirectory(stdstr& rDirectory) const;
-	stdstr GetDirectory(void) const;
-	void   GetName(stdstr& rName) const;
-	stdstr GetName(void) const;
-	void   GetNameExtension(stdstr& rNameExtension) const;
-	stdstr GetNameExtension(void) const;
-	void   GetExtension(stdstr& rExtension) const;
-	stdstr GetExtension(void) const;
-	void   GetCurrentDirectory(stdstr& rDrive) const;
-	stdstr GetCurrentDirectory(void) const;
-    void GetFullyQualified(stdstr& rFullyQualified) const;
-	void GetComponents(stdstr* pDrive     =NULL, 
-                       stdstr* pDirectory =NULL, 
-                       stdstr* pName      =NULL, 
-                       stdstr* pExtension =NULL) const;
+	void   GetDriveDirectory(std::string & rDriveDirectory) const;
+	std::string GetDriveDirectory(void) const;
+	void   GetDirectory(std::string& rDirectory) const;
+	std::string GetDirectory(void) const;
+	void   GetName(std::string& rName) const;
+	std::string GetName(void) const;
+	void   GetNameExtension(std::string& rNameExtension) const;
+	std::string GetNameExtension(void) const;
+	void   GetExtension(std::string& rExtension) const;
+	std::string GetExtension(void) const;
+	void   GetCurrentDirectory(std::string& rDrive) const;
+	std::string GetCurrentDirectory(void) const;
+	void GetFullyQualified(std::string& rFullyQualified) const;
+	void GetComponents(std::string* pDrive = NULL,
+                       std::string* pDirectory =NULL, 
+					   std::string* pName = NULL,
+					   std::string* pExtension = NULL) const;
 
 	//Get other state
-    BOOL IsEmpty() const { return m_strPath.empty(); }
-    BOOL IsRelative() const;
+	bool IsEmpty() const { return m_strPath.empty(); }
+	bool IsRelative() const;
 
 	//Set path components
-    void SetDrive(TCHAR chDrive);
-    void SetDriveDirectory(LPCTSTR lpszDriveDirectory);
-    void SetDirectory(LPCTSTR lpszDirectory, BOOL bEnsureAbsolute =FALSE);
-    void SetName(LPCTSTR lpszName);
+    void SetDrive(char chDrive);
+    void SetDriveDirectory(const char * lpszDriveDirectory);
+    void SetDirectory(const char * lpszDirectory, bool bEnsureAbsolute = false);
+    void SetName(const char * lpszName);
     void SetName(int iName);
-    void SetNameExtension(LPCTSTR lpszNameExtension);
-    void SetExtension(LPCTSTR lpszExtension);
+    void SetNameExtension(const char * lpszNameExtension);
+    void SetExtension(const char * lpszExtension);
     void SetExtension(int iExtension);
-	void AppendDirectory(LPCTSTR lpszSubDirectory);
-	void UpDirectory(stdstr* pLastDirectory =NULL);
-	void SetComponents(LPCTSTR lpszDrive, 
-                       LPCTSTR lpszDirectory,
-					   LPCTSTR lpszName, 
-                       LPCTSTR lpszExtension);
+	void AppendDirectory(const char * lpszSubDirectory);
+	void UpDirectory(std::string* pLastDirectory = NULL);
+	void SetComponents(const char * lpszDrive, 
+                       const char * lpszDirectory,
+					   const char * lpszName, 
+                       const char * lpszExtension);
 
 	//Set whole path
     void Empty()		{ m_strPath.erase(); }
     void CurrentDirectory();
     void Module();
-	void Module(HINSTANCE hInstance);
+	void Module(void * hInstance);
     void ModuleDirectory();
-    void ModuleDirectory(HINSTANCE hInstance);
+	void ModuleDirectory(void * hInstance);
 
 	//Directory information
-    BOOL IsDirectory() const;
-    BOOL DirectoryExists() const;
+    bool IsDirectory() const;
+	bool DirectoryExists() const;
 
 	//File Information
-    BOOL     IsFile() const { return !IsDirectory(); }
-    BOOL     Exists() const;
+	bool     IsFile() const { return !IsDirectory(); }
+	bool     Exists() const;
 
 	//Directory operations
-    BOOL CreateDirectory(BOOL bCreateIntermediates =TRUE);
-    BOOL ChangeDirectory();
+	bool DirectoryCreate(bool bCreateIntermediates = true);
+	bool ChangeDirectory();
 	    
 	//File operations
-	BOOL Delete(BOOL bEvenIfReadOnly =TRUE) const;
-    BOOL CopyTo(LPCTSTR lpcszTargetFile, BOOL bOverwrite =TRUE);
-    BOOL MoveTo(LPCTSTR lpcszTargetFile, BOOL bOverwrite =TRUE);
+	bool Delete(bool bEvenIfReadOnly = true) const;
+	bool CopyTo(const char * lpcszTargetFile, bool bOverwrite = true);
+	bool MoveTo(const char * lpcszTargetFile, bool bOverwrite = true);
 
 	//Finders
-    BOOL FindFirst(ULONG dwAttributes =_A_NORMAL);
-    BOOL FindNext();
+	bool FindFirst(uint32_t dwAttributes = 0);
+	bool FindNext();
 
 	// Helpers
-	static void SethInst ( HINSTANCE hInst );
-	static HINSTANCE GethInst();
+	static void SethInst(void * hInst);
+	static void * GethInst();
 
 private:
-    BOOL AttributesMatch(ULONG dwTargetAttributes, ULONG dwFileAttributes);
+	bool AttributesMatch(uint32_t dwTargetAttributes, uint32_t dwFileAttributes);
 
-	void cleanPathString(stdstr& rDirectory) const;
-	void StripLeadingChar(stdstr& rText, TCHAR chLeading) const;
-	void StripLeadingBackslash(stdstr& Directory)  const;
-	void StripTrailingChar(stdstr& rText, TCHAR chTrailing) const;
-	void StripTrailingBackslash(stdstr& rDirectory) const;
-	void EnsureTrailingBackslash(stdstr& Directory) const;
-	void EnsureLeadingBackslash(stdstr& Directory) const;
+	void cleanPathString(std::string& rDirectory) const;
+	void StripLeadingChar(std::string& rText, char chLeading) const;
+	void StripLeadingBackslash(std::string& Directory)  const;
+	void StripTrailingChar(std::string& rText, char chTrailing) const;
+	void StripTrailingBackslash(std::string& rDirectory) const;
+	void EnsureTrailingBackslash(std::string& Directory) const;
+	void EnsureLeadingBackslash(std::string& Directory) const;
 };
-
-#endif // !defined(AFX_PATH_H__6DD6923B_E241_40CE_81A3_4C2C88C140E4__INCLUDED_)
diff --git a/Source/Common/registry.cpp b/Source/Common/registry.cpp
deleted file mode 100644
index 378374312..000000000
--- a/Source/Common/registry.cpp
+++ /dev/null
@@ -1,468 +0,0 @@
- //---------------------------------------------------------------------------
-// Copyright (C) 1998, Interscope Ltd. All rights reserved.
-// Reproduction or distribution of this program, or any portion of it, 
-// is permitted only if this header is kept as it is.
-// For more information, contact:
-//
-// Interscope Ltd., 5 Culturii St., 5th Floor, 4800 Baia Mare, RO
-//    Phone/Fax: +40-62-215023
-//    E-mail: office@interscope.ro
-//
-//   $Author: Levente Farkas $
-//     $Date: 5/12/98 11:50p $
-//  $Modtime: 4/27/98 6:50a $
-// $Revision: 41 $
-//  $Archive: /Interscope/Thebe/InstallMaster/Registry.cpp $
-// $Workfile: Registry.cpp $
-//-----------------------------------------------------------------------
-#include "stdafx.h"
-
-//--- Miscellaneous -----------------------------------------------------
-
-const int MAX_REG_MACHINE_NAME_LEN  = 50;
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : 
-// Globals :
-// I/O     :
-// Task    : Create a new registry key object, butdo not attach it 2 any key yet
-//-----------------------------------------------------------------------
-CRegistry::CRegistry():
-           m_hKey(NULL),
-           m_bStatus(FALSE)
-{
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Set the status 2 TRUE if opened OK
-// Globals :
-// I/O     :
-// Task    : Open a registry key
-//-----------------------------------------------------------------------
-CRegistry::CRegistry(HKEY    hKey,         // A previously open key or a section
-                     LPCTSTR lpcszSubKey,  // Path relative 2 hKey
-                     REGSAM  dwDesiredSecurityAccessMask,        // Desired open/create access
-                     BOOL    bAllowCreate,                       // Create new, if does not exist
-                     DWORD   dwOptions,                          // New key options
-                     LPSECURITY_ATTRIBUTES lpSecurityAttributes, // New key security
-                     LPDWORD lpdwDisposition):                   // Cretion disposition (created or opened)
-           m_hKey(NULL),
-           m_bStatus(FALSE)
-{
-    Open(hKey,lpcszSubKey,dwDesiredSecurityAccessMask,bAllowCreate,dwOptions,lpSecurityAttributes,lpdwDisposition);
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Set the status 2 TRUE if opened OK
-// Globals :
-// I/O     :
-// Task    : Open a registry key
-//-----------------------------------------------------------------------
-BOOL CRegistry::Open(HKEY    hKey,         // A previously open key or a section
-                     LPCTSTR lpcszSubKey,  // Path relative 2 hKey
-                     REGSAM  dwDesiredSecurityAccessMask,        // Desired open/create access
-                     BOOL    bAllowCreate,                       // Create new, if does not exist
-                     DWORD   dwOptions,                          // New key options
-                     LPSECURITY_ATTRIBUTES lpSecurityAttributes, // New key security
-                     LPDWORD lpdwDisposition)                    // Creation disposition (created or opened)
-{
-    // If already attached 2 a key, close it now
-    Close();
-
-#ifdef _DEBUG
-    // Store the key's parent and the key's path
-    m_hKeyParent =hKey;
-    _tcsncpy(m_hKeyPath,lpcszSubKey,sizeof(m_hKeyPath)/sizeof(TCHAR));
-#endif
-
-    // Attempt 2 open specified key
-    m_nErrorCode =RegOpenKeyEx(hKey,lpcszSubKey,0,dwDesiredSecurityAccessMask,&m_hKey);
-    if(m_nErrorCode == ERROR_SUCCESS)
-    {
-        m_bStatus=TRUE;
-        if(lpdwDisposition)
-            *lpdwDisposition =REG_OPENED_EXISTING_KEY;
-    }
-
-    if(!m_bStatus && bAllowCreate)
-    {
-        // Could not open key, probably inexistent
-        // Attempt 2 create it
-        DWORD operation;
-        m_nErrorCode =RegCreateKeyEx(hKey,lpcszSubKey,0,NULL,dwOptions,dwDesiredSecurityAccessMask,lpSecurityAttributes,&m_hKey,&operation);
-        if(m_nErrorCode == ERROR_SUCCESS)
-        {
-            m_bStatus=TRUE;
-            if(lpdwDisposition)
-                *lpdwDisposition =operation;
-        }
-    }
-
-    return m_bStatus;
-}
-
-//---------------------------------------------------------------------------
-// Pre     : 
-// Post    : Returns size in bytes, -1 on error
-// Globals : 
-// I/O     : 
-// Task    : Get the size of the specified value
-//---------------------------------------------------------------------------
-DWORD CRegistry::GetValueSize(LPCTSTR name)
-{
-    if(!m_bStatus)
-        return (DWORD)-1;
-
-    DWORD value_size;
-    if(!GetValue(name,NULL,value_size))
-        return (DWORD)-1;
-
-    return value_size;
-}
-
-//-----------------------------------------------------------------------
-// Pre     : data_size must be initialized before this call 2 the size of 
-//           the buffer where you expect data 2 be returned
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Extract a value from current key
-//-----------------------------------------------------------------------
-BOOL CRegistry::GetValue(LPCTSTR name, BYTE *data, DWORD &data_size, DWORD *type)
-{
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegQueryValueEx(m_hKey,name,NULL,type,data,&data_size);
-    return m_nErrorCode==ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------
-// Pre     : buffsize must be initialized before this call 2 the size of 
-//           the buffer where you expect data 2 be returned
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Extract default value from current key
-//-----------------------------------------------------------------------
-BOOL CRegistry::GetDefaultValue(LPTSTR def_value_buff, DWORD &buffsize)
-{
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegQueryValueEx(m_hKey,NULL,0,NULL,(BYTE *)def_value_buff,&buffsize);
-    return m_nErrorCode==ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Set a value of the current key
-//-----------------------------------------------------------------------
-BOOL CRegistry::SetValue(LPCTSTR name, const BYTE *data, DWORD data_size, DWORD type)
-{
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegSetValueEx(m_hKey,name,0,type,data,data_size);
-    return m_nErrorCode==ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Set default value of current key
-//-----------------------------------------------------------------------
-BOOL CRegistry::SetDefaultValue(LPCTSTR def_value)
-{
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegSetValueEx(m_hKey,NULL,0,REG_SZ,(BYTE *)def_value,lstrlen(def_value)+1);
-    return m_nErrorCode==ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Deletete specified value of current key
-//-----------------------------------------------------------------------
-BOOL CRegistry::DeleteValue(LPCTSTR name)
-{
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegDeleteValue(m_hKey,name);
-    return m_nErrorCode==ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------
-// Pre     : data_size must be initialized before this call 2 the size of 
-//           the buffer where you expect data 2 be returned
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Extract a value from current key
-//-----------------------------------------------------------------------
-/*BOOL CRegistry::GetValue(LPCTSTR name, BYTE *data, DWORD &data_size, DWORD *type)
-{
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegQueryValueEx(m_hKey,name,NULL,type,data,&data_size);
-    return m_nErrorCode==ERROR_SUCCESS;
-}*/
-stdstr CRegistry::GetString(LPCTSTR name) {
-	DWORD ValSize = GetValueSize(name);
-	if (static_cast<int>(ValSize) <= 0) { return _T(""); }
-
-	DWORD ValType;
-	LPTSTR String = new TCHAR[ValSize];
-	if (!GetValue(name,reinterpret_cast<BYTE *>(String),ValSize,&ValType)) {
-		return stdstr(_T(""));
-	}
-	stdstr Result(String);
-	delete [] String;
-
-	return Result;
-}
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Enumerate subkeys of the current key
-//           You can use this by calling CountSubKeys 2 get the number of 
-//           subkeys, then calling this member with 0-based indexes of subkey
-//           2 get info about
-//-----------------------------------------------------------------------
-BOOL CRegistry::EnumerateSubKeys(DWORD index, LPTSTR name, DWORD &name_size)
-{
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegEnumKeyEx(m_hKey,index,name,&name_size,NULL,NULL,0,NULL);
-    return (m_nErrorCode==ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------
-// Pre     : If a pointer 2 value data is specified (retrieving value data too)
-//           then data_size must not be NULL and the pointed DWORD must hold
-//           the size of the data buffer
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Enumerate values of current key
-//           You can use this by calling CountValues 2 get the number of 
-//           values, then calling this member with 0-based indexes of value
-//           2 get info about
-//-----------------------------------------------------------------------
-BOOL CRegistry::EnumerateValues(DWORD index, LPTSTR name, DWORD &name_size, DWORD *type, BYTE *data, DWORD *data_size)
-{
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegEnumValue(m_hKey,index,name,&name_size,NULL,type,data,data_size);
-   return (m_nErrorCode==ERROR_SUCCESS);
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Return TRUE if info was retrieved OK
-// Globals :
-// I/O     :
-// Task    : Query info about registy key
-//-----------------------------------------------------------------------
-BOOL CRegistry::GetInfo(LPTSTR  lpszKeyClass, LPDWORD lpcKeyClassSize, // Non-NULL values should be supplied 4 at least
-                        LPDWORD lpcSubKeyCount,                        // parameters from one line
-                        LPDWORD lpcbLongestSubKeyName,
-                        LPDWORD lpcbLargestSubKeyClass,
-                        LPDWORD lpcValueCount,
-                        LPDWORD lpcbLongestValueName,
-                        LPDWORD lpcbLargestValueData,
-                        LPDWORD lpcbSecurityDescriptorSize,
-                        PFILETIME lpLastWriteTime) // NT only
-{
-#ifdef _WIN95
-    if(lpLastWriteTime)
-        ASSERT(FALSE); // This should be used only on NT, because on Windows 95 it gets filled with 0s
-#endif
-
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegQueryInfoKey(m_hKey,lpszKeyClass,lpcKeyClassSize,NULL,
-                                 lpcSubKeyCount,lpcbLongestSubKeyName,lpcbLargestSubKeyClass,
-                                 lpcValueCount,lpcbLongestValueName,lpcbLargestValueData,
-                                 lpcbSecurityDescriptorSize,
-                                 lpLastWriteTime);
-    return m_nErrorCode==ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : On error returns -1
-// Globals :
-// I/O     :
-// Task    : Return the number of subkeys of this key
-//-----------------------------------------------------------------------
-DWORD CRegistry::CountSubKeys()
-{
-    DWORD subkeys;
-    if(!GetInfo(NULL,NULL,&subkeys))
-        return (DWORD)-1;
-    return subkeys;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : On error returns FALSE
-// Globals :
-// I/O     :
-// Task    : Remove this key and its descendants
-//           Because on NT the key 2 be removed must not have subkeys, remove 
-//           first all the subkeys
-//-----------------------------------------------------------------------
-BOOL CRegistry::Delete(BOOL bDeleteSubkeys)
-{
-    if(!m_bStatus)
-        return FALSE;
-
-    BOOL success =TRUE;
-    if(bDeleteSubkeys)
-    {
-        // Attempt 2 delete all subkeys
-        DWORD keys =CountSubKeys();
-        while(keys>0)
-        {
-            TCHAR key_name[MAX_PATH];
-            DWORD key_name_size =sizeof(key_name);
-
-            // Get a subkey...
-            if(EnumerateSubKeys(0,key_name,key_name_size))
-            {
-                // Got a subkey, now delete it
-                CRegistry sub_key(*this,key_name);
-                success =sub_key.Delete();
-            }
-
-            if(success)
-                keys =CountSubKeys();
-            else
-                break;
-        }
-    }
-
-    if(success)
-    {
-        m_nErrorCode=RegDeleteKey(m_hKey,_T(""));
-        if(m_nErrorCode==ERROR_SUCCESS)
-            Close();
-    }
-
-    return success;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : On error returns -1
-// Globals :
-// I/O     :
-// Task    : Return the number of values in this key
-//           This count does not include the default value
-//-----------------------------------------------------------------------
-DWORD CRegistry::CountValues()
-{
-    DWORD values;
-    if(!GetInfo(NULL,NULL,NULL,NULL,NULL,&values))
-        return (DWORD)-1;
-    return values;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Force saving of registry key data back in the registry
-//-----------------------------------------------------------------------
-BOOL CRegistry::Flush()
-{
-    if(!m_bStatus)
-        return FALSE;
-    m_nErrorCode=RegFlushKey(m_hKey);
-    return m_nErrorCode==ERROR_SUCCESS;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Conect to a remote computer's HKEY_LOCAL_MACHINE key
-//-----------------------------------------------------------------------
-BOOL CRegistry::Connect_HKEY_LOCAL_MACHINE(LPCTSTR machine)
-{
-    Close();
-
-    TCHAR machine_name[MAX_REG_MACHINE_NAME_LEN];
-    lstrcpy(machine_name,machine);
-    m_nErrorCode=RegConnectRegistry(machine_name,HKEY_LOCAL_MACHINE,&m_hKey);
-    if(m_nErrorCode==ERROR_SUCCESS)
-        m_bStatus=TRUE;
-    else
-        m_bStatus=FALSE;
-
-    return m_bStatus;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    : Return TRUE on success
-// Globals :
-// I/O     :
-// Task    : Conect to a remote computer's HKLM key
-//-----------------------------------------------------------------------
-BOOL CRegistry::Connect_HKEY_USERS(LPCTSTR machine)
-{
-    Close();
-
-    TCHAR machine_name[MAX_REG_MACHINE_NAME_LEN];
-    lstrcpy(machine_name,machine);
-    m_nErrorCode=RegConnectRegistry(machine_name,HKEY_USERS,&m_hKey);
-    if(m_nErrorCode==ERROR_SUCCESS)
-        m_bStatus=TRUE;
-    else	  
-        m_bStatus=FALSE;
-
-    return m_bStatus;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    :
-// Globals :
-// I/O     :
-// Task    : Close key
-//-----------------------------------------------------------------------
-void CRegistry::Close()
-{
-    if(m_bStatus)
-        RegCloseKey(m_hKey);
-
-    m_hKey    =NULL;
-    m_bStatus =FALSE;
-}
-
-//-----------------------------------------------------------------------
-// Pre     :
-// Post    :
-// Globals :
-// I/O     :
-// Task    : Close registry key before destruction
-//-----------------------------------------------------------------------
-CRegistry::~CRegistry()
-{
-    Close();
-}
-
diff --git a/Source/Common/registry.h b/Source/Common/registry.h
deleted file mode 100644
index 758e939a9..000000000
--- a/Source/Common/registry.h
+++ /dev/null
@@ -1,111 +0,0 @@
-//---------------------------------------------------------------------------
-// Copyright (C) 1998, Interscope Ltd. All rights reserved.
-// Reproduction or distribution of this program, or any portion of it, 
-// is permitted only if this header is kept as it is.
-// For more information, contact:
-//
-// Interscope Ltd., 5 Culturii St., 5th Floor, 4800 Baia Mare, RO
-//    Phone/Fax: +40-62-215023
-//    E-mail: office@interscope.ro
-//
-//   $Author: Levente Farkas $
-//     $Date: 5/13/98 12:03a $
-//  $Modtime: 4/27/98 6:50a $
-// $Revision: 30 $
-//  $Archive: /Interscope/Thebe/InstallMaster/Registry.Hpp $
-// $Workfile: Registry.Hpp $
-//-----------------------------------------------------------------------
-
-#ifndef __Registry_Hpp__
-#define __Registry_Hpp__
-
-#if !defined(__WIN32__) && !defined(_WIN32)
-#ifndef STRICT
-#define STRICT
-#endif
-#endif // __WIN32__
-
-#include <Windows.H>
-#include <WinReg.H>
-#include <RegStr.H>
-#include <WinError.H>
-#include <TChar.H>
-#include "std string.h"
-
-//--- Registry key handler ------------------------------------------
-
-class CRegistry
-{
-private:
-    HKEY  m_hKey;
-    BOOL  m_bStatus;
-    LONG  m_nErrorCode;
-
-#ifdef _DEBUG 
-    HKEY  m_hKeyParent;
-    TCHAR m_hKeyPath[MAX_PATH];
-#endif
-
-public:
-    // Construction
-    CRegistry();
-    CRegistry(HKEY    hKey,         // A previously open key or a section
-              LPCTSTR lpcszSubKey,  // Path relative 2 hKey
-              REGSAM  dwDesiredSecurityAccessMask        =KEY_ALL_ACCESS,          // Desired open/create access
-              BOOL    bAllowCreate                       =FALSE,                   // Create new, if does not exist
-              DWORD   dwOptions                          =REG_OPTION_NON_VOLATILE, // New key options
-              LPSECURITY_ATTRIBUTES lpSecurityAttributes =NULL,                    // New key security
-              LPDWORD lpdwDisposition                    =NULL);                   // Cretion disposition (created or opened)
-    
-    BOOL Open(HKEY    hKey,         // A previously open key or a section
-              LPCTSTR lpcszSubKey,  // Path relative 2 hKey
-              REGSAM  dwDesiredSecurityAccessMask        =KEY_ALL_ACCESS,          // Desired open/create access
-              BOOL    bAllowCreate                       =FALSE,                   // Create new, if does not exist
-              DWORD   dwOptions                          =REG_OPTION_NON_VOLATILE, // New key options
-              LPSECURITY_ATTRIBUTES lpSecurityAttributes =NULL,                    // New key security
-              LPDWORD lpdwDisposition                    =NULL);                   // Cretion disposition (created or opened)
-
-    // Value functions
-    DWORD  GetValueSize(LPCTSTR name);
-    BOOL   GetValue(LPCTSTR name,       BYTE *data, DWORD &data_size, DWORD *type=NULL);
-    BOOL   SetValue(LPCTSTR name, const BYTE *data, DWORD  data_size, DWORD  type);
-    BOOL   GetDefaultValue(LPTSTR  def_value_buff, DWORD &buffsize);
-    BOOL   SetDefaultValue(LPCTSTR def_value);
-    BOOL   DeleteValue(LPCTSTR name);
-	stdstr GetString(LPCTSTR name);
-
-    // Enumerators
-    BOOL  EnumerateSubKeys(DWORD index, LPTSTR name, DWORD &name_size);
-    BOOL  EnumerateValues (DWORD index, LPTSTR name, DWORD &name_size, DWORD *type=NULL, BYTE *data=NULL, DWORD *data_size=NULL);
-
-    // Conversions
-    operator HKEY() const { return m_bStatus ? m_hKey : NULL; }
-
-    // Remote registry functions
-    BOOL  Connect_HKEY_LOCAL_MACHINE(LPCTSTR machine);
-    BOOL  Connect_HKEY_USERS(LPCTSTR machine);
-
-    // Miscellaneous
-    LONG  GetLastError() const { return m_nErrorCode; } // Retruns ERROR_SUCCESS when inited OK and everything is fine
-    DWORD CountSubKeys();
-    DWORD CountValues();
-    BOOL  GetInfo(LPTSTR  lpszKeyClass =NULL, LPDWORD lpcKeyClassSize =NULL, // Must supply non-NULL values 4 at least
-                  LPDWORD lpcSubKeyCount         =NULL,                      // parameters from one line
-                  LPDWORD lpcbLongestSubKeyName  =NULL,
-                  LPDWORD lpcbLargestSubKeyClass =NULL,
-                  LPDWORD lpcValueCount          =NULL,
-                  LPDWORD lpcbLongestValueName   =NULL,
-                  LPDWORD lpcbLargestValueData   =NULL,
-                  LPDWORD lpcbSecurityDescriptorSize =NULL,
-                  PFILETIME lpLastWriteTime =NULL); // NT only
-
-    // Cleanup
-    BOOL Delete(BOOL bDeleteSubkeys =TRUE);
-    BOOL Flush();
-    void Close();
-    virtual ~CRegistry();
-};
-
-
-#endif
-
diff --git a/Source/Common/stdafx.h b/Source/Common/stdafx.h
index d87ca6230..e601c4074 100644
--- a/Source/Common/stdafx.h
+++ b/Source/Common/stdafx.h
@@ -10,7 +10,6 @@
 #include "CriticalSection.h"
 #include "File Class.h"
 #include "Ini File Class.h"
-#include "registry.h"
 #include "path.h"
 #include "Log Class.h"
 #include "TraceDefs.h"
diff --git a/Source/Common/stdtypes.h b/Source/Common/stdtypes.h
new file mode 100644
index 000000000..5e8ba5e24
--- /dev/null
+++ b/Source/Common/stdtypes.h
@@ -0,0 +1,19 @@
+#pragma once
+
+/*
+ * Some versions of Microsoft Visual C/++ compilers before Visual Studio 2010
+ * have <stdint.h> removed in favor of these nonstandard built-in types:
+ */
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
+typedef signed __int8           int8_t;
+typedef signed __int16          int16_t;
+typedef signed __int32          int32_t;
+typedef signed __int64          int64_t;
+
+typedef unsigned __int8         uint8_t;
+typedef unsigned __int16        uint16_t;
+typedef unsigned __int32        uint32_t;
+typedef unsigned __int64        uint64_t;
+#else
+#include <stdint.h>
+#endif
diff --git a/Source/Glide64/3dmath.cpp b/Source/Glide64/3dmath.cpp
index 79e1fb985..51bd0ae6d 100644
--- a/Source/Glide64/3dmath.cpp
+++ b/Source/Glide64/3dmath.cpp
@@ -37,7 +37,14 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
+extern "C" {
+#ifndef NOSSE
+#include <xmmintrin.h>
+#endif
+}
+
+#include <math.h>
 #include "3dmath.h"
 
 void calc_light (VERTEX *v)
@@ -183,87 +190,267 @@ void InverseTransformVectorC (float *src, float *dst, float mat[4][4])
 
 void MulMatricesC(float m1[4][4],float m2[4][4],float r[4][4])
 {
-  for (int i=0; i<4; i++)
-  {
-    for (int j=0; j<4; j++)
+    float row[4][4];
+    register unsigned int i, j;
+
+    for (i = 0; i < 4; i++)
+        for (j = 0; j < 4; j++)
+            row[i][j] = m2[i][j];
+    for (i = 0; i < 4; i++)
     {
-      r[i][j] = m1[i][0] * m2[0][j] +
-                m1[i][1] * m2[1][j] +
-                m1[i][2] * m2[2][j] +
-                m1[i][3] * m2[3][j];
+        // auto-vectorizable algorithm
+        // vectorized loop style, such that compilers can
+        // easily create optimized SSE instructions.
+        float leftrow[4];
+        float summand[4][4];
+
+        for (j = 0; j < 4; j++)
+            leftrow[j] = m1[i][j];
+
+        for (j = 0; j < 4; j++)
+            summand[0][j] = leftrow[0] * row[0][j];
+        for (j = 0; j < 4; j++)
+            summand[1][j] = leftrow[1] * row[1][j];
+        for (j = 0; j < 4; j++)
+            summand[2][j] = leftrow[2] * row[2][j];
+        for (j = 0; j < 4; j++)
+            summand[3][j] = leftrow[3] * row[3][j];
+
+        for (j = 0; j < 4; j++)
+            r[i][j] =
+                summand[0][j]
+              + summand[1][j]
+              + summand[2][j]
+              + summand[3][j]
+        ;
     }
-  }
 }
 
 // 2008.03.29 H.Morii - added SSE 3DNOW! 3x3 1x3 matrix multiplication
 //                      and 3DNOW! 4x4 4x4 matrix multiplication
+// 2011-01-03 Balrog - removed because is in NASM format and not 64-bit compatible
+// This will need fixing.
 MULMATRIX MulMatrices = MulMatricesC;
 TRANSFORMVECTOR TransformVector = TransformVectorC;
 TRANSFORMVECTOR InverseTransformVector = InverseTransformVectorC;
 DOTPRODUCT DotProduct = DotProductC;
 NORMALIZEVECTOR NormalizeVector = NormalizeVectorC;
 
-extern "C" void  TransformVectorSSE(float *src, float *dst, float mat[4][4]);
-extern "C" void  TransformVector3DNOW(float *src, float *dst, float mat[4][4]);
-extern "C" void  InverseTransformVector3DNOW(float *src, float *dst, float mat[4][4]);
-extern "C" void  MulMatricesSSE(float m1[4][4],float m2[4][4],float r[4][4]);
-extern "C" void  MulMatrices3DNOW(float m1[4][4],float m2[4][4],float r[4][4]);
-extern "C" float DotProductSSE3(register float *v1, register float *v2);
-extern "C" float DotProduct3DNOW(register float *v1, register float *v2);
-extern "C" void NormalizeVectorSSE(float *v);
-extern "C" void NormalizeVector3DNOW(float *v);
-
-extern "C" void DetectSIMD(int function, int * iedx, int * iecx);
-
-void math_init()
+void MulMatricesSSE(float m1[4][4],float m2[4][4],float r[4][4])
 {
-#ifndef _DEBUG
-  int iecx = 0, iedx = 0;
+#if defined(__GNUC__) && !defined(NO_ASM) && !defined(NOSSE)
+   /* [row][col]*/
+  typedef float v4sf __attribute__ ((vector_size (16)));
+  v4sf row0 = _mm_loadu_ps(m2[0]);
+  v4sf row1 = _mm_loadu_ps(m2[1]);
+  v4sf row2 = _mm_loadu_ps(m2[2]);
+  v4sf row3 = _mm_loadu_ps(m2[3]);
 
-  GLIDE64_TRY
+  for (int i = 0; i < 4; ++i)
   {
-    DetectSIMD(0x0000001, &iedx, &iecx);
+    v4sf leftrow = _mm_loadu_ps(m1[i]);
+
+    // Fill tmp with four copies of leftrow[0]
+    v4sf tmp = leftrow;
+    tmp = _mm_shuffle_ps (tmp, tmp, 0);
+    // Calculate the four first summands
+    v4sf destrow = tmp * row0;
+
+    // Fill tmp with four copies of leftrow[1]
+    tmp = leftrow;
+    tmp = _mm_shuffle_ps (tmp, tmp, 1 + (1 << 2) + (1 << 4) + (1 << 6));
+    destrow += tmp * row1;
+
+    // Fill tmp with four copies of leftrow[2]
+    tmp = leftrow;
+    tmp = _mm_shuffle_ps (tmp, tmp, 2 + (2 << 2) + (2 << 4) + (2 << 6));
+    destrow += tmp * row2;
+
+    // Fill tmp with four copies of leftrow[3]
+    tmp = leftrow;
+    tmp = _mm_shuffle_ps (tmp, tmp, 3 + (3 << 2) + (3 << 4) + (3 << 6));
+    destrow += tmp * row3;
+
+    __builtin_ia32_storeups(r[i], destrow);
   }
-  GLIDE64_CATCH
+ #elif !defined(NO_ASM) && !defined(NOSSE)
+  __asm
   {
-    return;
+    mov     eax, dword ptr [r]  
+      mov     ecx, dword ptr [m1]
+      mov     edx, dword ptr [m2]
+
+      movaps  xmm0,[edx]
+      movaps  xmm1,[edx+16]
+      movaps  xmm2,[edx+32]
+      movaps  xmm3,[edx+48]
+
+// r[0][0],r[0][1],r[0][2],r[0][3]
+
+      movaps  xmm4,xmmword ptr[ecx]
+      movaps  xmm5,xmm4
+      movaps  xmm6,xmm4
+      movaps  xmm7,xmm4
+
+      shufps  xmm4,xmm4,00000000b
+      shufps  xmm5,xmm5,01010101b
+      shufps  xmm6,xmm6,10101010b
+      shufps  xmm7,xmm7,11111111b
+
+      mulps   xmm4,xmm0
+      mulps   xmm5,xmm1
+      mulps   xmm6,xmm2
+      mulps   xmm7,xmm3
+
+      addps   xmm4,xmm5
+      addps   xmm4,xmm6
+      addps   xmm4,xmm7
+
+      movaps  xmmword ptr[eax],xmm4
+
+// r[1][0],r[1][1],r[1][2],r[1][3]
+
+      movaps  xmm4,xmmword ptr[ecx+16]
+      movaps  xmm5,xmm4
+      movaps  xmm6,xmm4
+      movaps  xmm7,xmm4
+
+      shufps  xmm4,xmm4,00000000b
+      shufps  xmm5,xmm5,01010101b
+      shufps  xmm6,xmm6,10101010b
+      shufps  xmm7,xmm7,11111111b
+
+      mulps   xmm4,xmm0
+      mulps   xmm5,xmm1
+      mulps   xmm6,xmm2
+      mulps   xmm7,xmm3
+
+      addps   xmm4,xmm5
+      addps   xmm4,xmm6
+      addps   xmm4,xmm7
+
+      movaps  xmmword ptr[eax+16],xmm4
+
+
+// r[2][0],r[2][1],r[2][2],r[2][3]
+
+      movaps  xmm4,xmmword ptr[ecx+32]
+      movaps  xmm5,xmm4
+      movaps  xmm6,xmm4
+      movaps  xmm7,xmm4
+
+      shufps  xmm4,xmm4,00000000b
+      shufps  xmm5,xmm5,01010101b
+      shufps  xmm6,xmm6,10101010b
+      shufps  xmm7,xmm7,11111111b
+
+      mulps   xmm4,xmm0
+      mulps   xmm5,xmm1
+      mulps   xmm6,xmm2
+      mulps   xmm7,xmm3
+
+      addps   xmm4,xmm5
+      addps   xmm4,xmm6
+      addps   xmm4,xmm7
+
+      movaps  xmmword ptr[eax+32],xmm4
+
+// r[3][0],r[3][1],r[3][2],r[3][3]
+
+      movaps  xmm4,xmmword ptr[ecx+48]
+      movaps  xmm5,xmm4
+      movaps  xmm6,xmm4
+      movaps  xmm7,xmm4
+
+      shufps  xmm4,xmm4,00000000b
+      shufps  xmm5,xmm5,01010101b
+      shufps  xmm6,xmm6,10101010b
+      shufps  xmm7,xmm7,11111111b
+
+      mulps   xmm4,xmm0
+      mulps   xmm5,xmm1
+      mulps   xmm6,xmm2
+      mulps   xmm7,xmm3
+
+      addps   xmm4,xmm5
+      addps   xmm4,xmm6
+      addps   xmm4,xmm7
+
+      movaps  xmmword ptr[eax+48],xmm4
+    }
+#endif // _WIN32
   }
-  if (iedx & 0x2000000) //SSE
+
+
+
+  void math_init()
   {
-    MulMatrices = MulMatricesSSE;
-    TransformVector = TransformVectorSSE;
-    //InverseTransformVector = InverseTransformVectorSSE;
-    //NormalizeVector = NormalizeVectorSSE; /* not ready yet */
-    LOG("SSE detected.\n");
-  }
-  if (iedx & 0x4000000) // SSE2
-  {
-    LOG("SSE2 detected.\n");
-  }
-  if (iecx & 0x1) // SSE3
-  {
-    //DotProduct = DotProductSSE3; /* not ready yet */
-    LOG("SSE3 detected.\n");
-  }
-  // the 3dnow version is faster than sse
-  iecx = 0;
-  iedx = 0;
-  GLIDE64_TRY
-  {
-    DetectSIMD(0x80000001, &iedx, &iecx);
-  }
-  GLIDE64_CATCH
-  {
-    return;
-  }
-  if (iedx & 0x80000000) //3DNow!
-  {
-    MulMatrices = MulMatrices3DNOW;
-    TransformVector = TransformVector3DNOW;
-    InverseTransformVector = InverseTransformVector3DNOW;
-    //DotProduct = DotProduct3DNOW;  //not ready yet 
-    NormalizeVector = NormalizeVector3DNOW; // not ready yet 
-    LOG("3DNOW! detected.\n");
-  }
+#ifndef _DEBUG
+    int IsSSE = FALSE;
+#if defined(__GNUC__) && !defined(NO_ASM) && !defined(NOSSE)
+    int edx, eax;
+    GLIDE64_TRY
+    {
+  #if defined(__x86_64__)
+      asm volatile(" cpuid;        "
+        : "=a"(eax), "=d"(edx)
+        : "0"(1)
+        : "rbx", "rcx"
+        );
+  #else
+      asm volatile(" push %%ebx;   "
+        " push %%ecx;   "
+        " cpuid;        "
+        " pop %%ecx;    "
+        " pop %%ebx;    "
+        : "=a"(eax), "=d"(edx)
+        : "0"(1)
+        :
+      );
+  #endif
+    }
+    GLIDE64_CATCH
+      { return; }
+    // Check for SSE
+    if (edx & (1 << 25))
+      IsSSE = TRUE;
+#elif !defined(NO_ASM) && !defined(NOSSE)
+    DWORD dwEdx;
+    __try
+    {
+      __asm 
+      {
+        mov  eax,1
+          cpuid
+          mov dwEdx,edx
+        }  
+      }
+      __except(EXCEPTION_EXECUTE_HANDLER)
+      {
+        return;
+      }
+
+      if (dwEdx & (1<<25)) 
+      {
+        if (dwEdx & (1<<24))
+        {      
+          __try
+          {
+            __asm xorps xmm0, xmm0
+              IsSSE = TRUE;
+          }
+          __except(EXCEPTION_EXECUTE_HANDLER)
+          {
+            return;
+          }
+        }
+      }
+#endif // _WIN32
+      if (IsSSE)
+      {
+        MulMatrices = MulMatricesSSE;
+        LOG("3DNOW! detected.\n");
+      }
+
 #endif //_DEBUG
-}
+    }
diff --git a/Source/Glide64/3dmathSIMD.asm.cpp b/Source/Glide64/3dmathSIMD.asm.cpp
deleted file mode 100644
index 1a876511b..000000000
--- a/Source/Glide64/3dmathSIMD.asm.cpp
+++ /dev/null
@@ -1,527 +0,0 @@
-;/*
-;* Glide64 - Glide video plugin for Nintendo 64 emulators.
-;*
-;* This program is free software; you can redistribute it and/or modify
-;* it under the terms of the GNU General Public License as published by
-;* the Free Software Foundation; either version 2 of the License, or
-;* any later version.
-;*
-;* This program is distributed in the hope that it will be useful,
-;* but WITHOUT ANY WARRANTY; without even the implied warranty of
-;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;* GNU General Public License for more details.
-;*
-;* You should have received a copy of the GNU General Public License
-;* along with this program; if not, write to the Free Software
-;* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-;
-;****************************************************************
-;
-; Glide64 - Glide Plugin for Nintendo 64 emulators
-; Project started on December 29th, 2001
-;
-; Authors:
-; Dave2001, original author, founded the project in 2001, left it in 2002
-; Gugaman, joined the project in 2002, left it in 2002
-; Sergey 'Gonetz' Lipski, joined the project in 2002, main author since fall of 2002
-; Hiroshi 'KoolSmoky' Morii, joined the project in 2007
-;
-;****************************************************************
-;
-; To modify Glide64:
-; * Write your name and (optional)email, commented by your work, so I know who did it, and so that you can find which parts you modified when it comes time to send it to me.
-; * Do NOT send me the whole project or file that you modified.  Take out your modified code sections, and tell me where to put them.  If people sent the whole thing, I would have many different versions, but no idea how to combine them all.
-;
-;****************************************************************
-
-%include "inc/c32.mac"
-
-segment .text
-*/
-
-extern "C" void __declspec(naked) DetectSIMD(int func, int * iedx, int * iecx)
-{
-	_asm {
-		push ebp
-		mov ebp,esp
-		mov       eax,[func]
-		cpuid
-		mov       eax,[iedx]
-		mov       [eax],edx
-		mov       eax,[iecx]
-		mov       [eax],ecx
-		leave
-		ret
-	}
-}
-
-/****************************************************************
-;
-;                     ******** SSE ********
-;
-;****************************************************************/
-
-extern "C" void __declspec(naked) TransformVectorSSE(float *src, float *dst, float mat[4][4])
-{
-	__asm
-	{
-		push ebp
-		mov ebp,esp
-
-		mov       ecx,[src]
-		mov       eax,[dst]
-		mov       edx,[mat]
-		           
-		movss     xmm0,[ecx]    ; 0 0 0 src[0]
-		movss     xmm5,[edx]    ; 0 0 0 mat[0][0]
-		movhps    xmm5,[edx+4]  ; mat[0][2] mat[0][1] 0 mat[0][0]
-		shufps    xmm0,xmm0, 0  ; src[0] src[0] src[0] src[0]
-		movss     xmm1,[ecx+4]  ; 0 0 0 src[1]
-		movss     xmm3,[edx+16] ; 0 0 0 mat[1][0]
-		movhps    xmm3,[edx+20] ; mat[1][2] mat[1][1] 0 mat[1][0]
-		shufps    xmm1,xmm1, 0  ; src[1] src[1] src[1] src[1]
-		mulps     xmm0,xmm5     ; mat[0][2]*src[0] mat[0][1]*src[0] 0 mat[0][0]*src[0]
-		mulps     xmm1,xmm3     ; mat[1][2]*src[1] mat[1][1]*src[1] 0 mat[1][0]*src[1]
-		movss     xmm2,[ecx+8]  ; 0 0 0 src[2]
-		shufps    xmm2,xmm2, 0  ; src[2] src[2] src[2] src[2]
-		movss     xmm4,[edx+32] ; 0 0 0 mat[2][0]
-		movhps    xmm4,[edx+36] ; mat[2][2] mat[2][1] 0 mat[2][0]
-		addps     xmm0,xmm1     ; mat[0][2]*src[0]+mat[1][2]*src[1] mat[0][1]*src[0]+mat[1][1]*src[1] 0 mat[0][0]*src[0]+mat[1][0]*src[1]
-		mulps     xmm2,xmm4     ; mat[2][2]*src[2] mat[2][1]*src[2] 0 mat[2][0]*src[2]
-		addps     xmm0,xmm2     ; mat[0][2]*src[0]+mat[1][2]*src[1]+mat[2][2]*src[2] mat[0][1]*src[0]+mat[1][1]*src[1]+mat[2][1]*src[2] 0 mat[0][0]*src[0]+mat[1][0]*src[1]+mat[2][0]*src[2]
-		movss     [eax],xmm0    ; mat[0][0]*src[0]+mat[1][0]*src[1]+mat[2][0]*src[2]
-		movhps    [eax+4],xmm0  ; mat[0][2]*src[0]+mat[1][2]*src[1]+mat[2][2]*src[2] mat[0][1]*src[0]+mat[1][1]*src[1]+mat[2][1]*src[2]
-		leave
-		ret
-	}
-}
-
-extern "C" void __declspec(naked) MulMatricesSSE(float m1[4][4],float m2[4][4],float r[4][4])
-{
-	__asm
-	{
-		push ebp
-		mov ebp,esp
-
-      mov       eax,[r]      
-      mov       ecx,[m1]
-      mov       edx,[m2]
-      
-      movaps    xmm0,[edx]
-      movaps    xmm1,[edx+16]
-      movaps    xmm2,[edx+32]
-      movaps    xmm3,[edx+48]
-      
-      ; r[0][0],r[0][1],r[0][2],r[0][3]
-      
-      movaps    xmm4,[ecx]
-      movaps    xmm5,xmm4
-      movaps    xmm6,xmm4
-      movaps    xmm7,xmm4
-      
-      shufps    xmm4,xmm4,00000000b
-      shufps    xmm5,xmm5,01010101b
-      shufps    xmm6,xmm6,10101010b
-      shufps    xmm7,xmm7,11111111b
-      
-      mulps     xmm4,xmm0
-      mulps     xmm5,xmm1
-      mulps     xmm6,xmm2
-      mulps     xmm7,xmm3
-      
-      addps     xmm4,xmm5
-      addps     xmm4,xmm6
-      addps     xmm4,xmm7
-      
-      movaps    [eax],xmm4
-      
-      ; r[1][0],r[1][1],r[1][2],r[1][3]
-      
-      movaps    xmm4,[ecx+16]
-      movaps    xmm5,xmm4
-      movaps    xmm6,xmm4
-      movaps    xmm7,xmm4
-      
-      shufps    xmm4,xmm4,00000000b
-      shufps    xmm5,xmm5,01010101b
-      shufps    xmm6,xmm6,10101010b
-      shufps    xmm7,xmm7,11111111b
-      
-      mulps     xmm4,xmm0
-      mulps     xmm5,xmm1
-      mulps     xmm6,xmm2
-      mulps     xmm7,xmm3
-      
-      addps     xmm4,xmm5
-      addps     xmm4,xmm6
-      addps     xmm4,xmm7
-      
-      movaps    [eax+16],xmm4
-      
-      
-      ; r[2][0],r[2][1],r[2][2],r[2][3]
-      
-      movaps    xmm4,[ecx+32]
-      movaps    xmm5,xmm4
-      movaps    xmm6,xmm4
-      movaps    xmm7,xmm4
-      
-      shufps    xmm4,xmm4,00000000b
-      shufps    xmm5,xmm5,01010101b
-      shufps    xmm6,xmm6,10101010b
-      shufps    xmm7,xmm7,11111111b
-      
-      mulps     xmm4,xmm0
-      mulps     xmm5,xmm1
-      mulps     xmm6,xmm2
-      mulps     xmm7,xmm3
-      
-      addps     xmm4,xmm5
-      addps     xmm4,xmm6
-      addps     xmm4,xmm7
-      
-      movaps    [eax+32],xmm4
-      
-      ; r[3][0],r[3][1],r[3][2],r[3][3]
-      
-      movaps    xmm4,[ecx+48]
-      movaps    xmm5,xmm4
-      movaps    xmm6,xmm4
-      movaps    xmm7,xmm4
-      
-      shufps    xmm4,xmm4,00000000b
-      shufps    xmm5,xmm5,01010101b
-      shufps    xmm6,xmm6,10101010b
-      shufps    xmm7,xmm7,11111111b
-      
-      mulps     xmm4,xmm0
-      mulps     xmm5,xmm1
-      mulps     xmm6,xmm2
-      mulps     xmm7,xmm3
-      
-      addps     xmm4,xmm5
-      addps     xmm4,xmm6
-      addps     xmm4,xmm7
-      
-      movaps    [eax+48],xmm4
-	  leave
-	  ret
-	}
-}
-
-extern "C" void __declspec(naked) NormalizeVectorSSE (float *v)
-{
-	_asm
-	{
-		push ebp
-		mov ebp,esp
-
-      mov edx, [v]
-      movaps xmm0, [edx]      ; x y z 0
-      movaps xmm2, xmm0       ; x y z 0
-      mulps  xmm0, xmm0       ; x*x y*y z*z 0
-      movaps xmm1, xmm0       ; x*x y*y z*z 0
-      shufps xmm0, xmm1, 0x4e ; z*z 0 x*x y*y
-      addps  xmm0, xmm1       ; x*x+z*z y*y z*z+x*x y*y
-      movaps xmm1, xmm0       ; x*x+z*z y*y z*z+x*x y*y
-      shufps xmm1, xmm1, 0x11 ; y*y z*z+x*x y*y z*z+x*x
-      addps  xmm0, xmm1       ; x*x+z*z+y*y
-      rsqrtps xmm0, xmm0      ; 1.0/sqrt(x*x+z*z+y*y)
-      mulps  xmm2, xmm0       ; x/sqrt(x*x+z*z+y*y) y/sqrt(x*x+z*z+y*y) z/sqrt(x*x+z*z+y*y) 0
-      movaps [edx], xmm2
-	  leave
-	  ret
-	}
-}
-
-/*****************************************************************
-;
-;                     ******** SSE3 ********
-;
-;****************************************************************/
-
-float __declspec(naked) DotProductSSE3(register float *v1, register float *v2)
-{
-	_asm {
-		push ebp
-		mov ebp,esp
-
-      mov eax,[v1]
-      mov edx,[v2]
-      movaps xmm0, [eax]
-      mulps xmm0, [edx]
-      haddps xmm0, xmm0
-      haddps xmm0, xmm0
-;      movss eax, xmm0
-		leave
-		ret
-	}
-}
-
-/****************************************************************
-;
-;                     ******** 3DNOW ********
-;
-;****************************************************************/
-
-extern "C" void __declspec(naked) TransformVector3DNOW(float *src, float *dst, float mat[4][4])
-{
-	_asm {
-		push ebp
-		mov ebp,esp
-
-    femms
-      mov         ecx,[src]
-      mov         eax,[dst]
-      mov         edx,[mat]
-      movq        mm0,[ecx]     ; src[1] src[0]
-      movd        mm2,[ecx+8]   ; 0 src[2]
-      movq        mm1,mm0       ; src[1] src[0]
-      punpckldq   mm0,mm0       ; src[0] src[0]
-      punpckhdq   mm1,mm1       ; src[1] src[1]
-      punpckldq   mm2,mm2       ; src[2] src[2]
-      movq        mm3,mm0       ; src[0] src[0]
-      movq        mm4,mm1       ; src[1] src[1]
-      movq        mm5,mm2       ; src[2] src[2]
-      pfmul       mm0,[edx]     ; src[0]*mat[0][1] src[0]*mat[0][0]
-      pfmul       mm3,[edx+8]   ; 0 src[0]*mat[0][2]
-      pfmul       mm1,[edx+16]  ; src[1]*mat[1][1] src[1]*mat[1][0]
-      pfmul       mm4,[edx+24]  ; 0 src[1]*mat[1][2]
-      pfmul       mm2,[edx+32]  ; src[2]*mat[2][1] src[2]*mat[2][0]
-      pfmul       mm5,[edx+40]  ; 0 src[2]*mat[2][2]
-      pfadd       mm0,mm1       ; src[0]*mat[0][1]+src[1]*mat[1][1] src[0]*mat[0][0]+src[1]*mat[1][0]
-      pfadd       mm3,mm4       ; 0 src[0]*mat[0][2]+src[1]*mat[1][2]
-      pfadd       mm0,mm2       ; src[0]*mat[0][1]+src[1]*mat[1][1]+src[2]*mat[2][1] src[0]*mat[0][0]+src[1]*mat[1][0]+src[2]*mat[2][0]
-      pfadd       mm3,mm5       ; 0 src[0]*mat[0][2]+src[1]*mat[1][2]+src[2]*mat[2][2]
-      movq        [eax],mm0     ; mat[0][1]*src[0]+mat[1][1]*src[1]+mat[2][1]*src[2] mat[0][0]*src[0]+mat[1][0]*src[1]+mat[2][0]*src[2]
-      movd        [eax+8],mm3   ; mat[0][2]*src[0]+mat[1][2]*src[1]+mat[2][2]*src[2]
-      femms
-		  leave
-		  ret
-	}
-}
-
-extern "C" void __declspec(naked) InverseTransformVector3DNOW(float *src, float *dst, float mat[4][4])
-{
-	_asm {
-		push ebp
-		mov ebp,esp
-
-    femms
-      mov         ecx,[src]
-      mov         eax,[dst]
-      mov         edx,[mat]
-      movq        mm0,[ecx]     ; src[1] src[0]
-      movd        mm4,[ecx+8]   ; 0 src[2]
-      movq        mm1,mm0       ; src[1] src[0]
-      pfmul       mm0,[edx]     ; src[1]*mat[0][1] src[0]*mat[0][0]
-      movq        mm5,mm4       ; 0 src[2]
-      pfmul       mm4,[edx+8]   ; 0 src[2]*mat[0][2]
-      movq        mm2,mm1       ; src[1] src[0]
-      pfmul       mm1,[edx+16]  ; src[1]*mat[1][1] src[0]*mat[1][0]
-      movq        mm6,mm5       ; 0 src[2]
-      pfmul       mm5,[edx+24]  ; 0 src[2]*mat[1][2]
-      movq        mm3,mm2       ; src[1] src[0]
-      pfmul       mm2,[edx+32]  ; src[1]*mat[2][1] src[0]*mat[2][0]
-      movq        mm7,mm6       ; 0 src[2]
-      pfmul       mm6,[edx+40]  ; 0 src[2]*mat[2][2]
-      pfacc       mm0,mm4       ; src[2]*mat[0][2] src[1]*mat[0][1]+src[0]*mat[0][0]
-      pfacc       mm1,mm5       ; src[2]*mat[1][2] src[1]*mat[1][1]+src[0]*mat[1][0]
-      pfacc       mm2,mm6       ; src[2]*mat[2][2] src[1]*mat[2][1]+src[0]*mat[2][0]
-      pfacc       mm0,mm1       ; src[2]*mat[1][2]+src[1]*mat[1][1]+src[0]*mat[1][0] src[2]*mat[0][2]+src[1]*mat[0][1]+src[0]*mat[0][0]
-      pfacc       mm2,mm3       ; 0 src[2]*mat[2][2]+src[1]*mat[2][1]+src[0]*mat[2][0]
-      movq        [eax],mm0     ; mat[1][0]*src[0]+mat[1][1]*src[1]+mat[1][2]*src[2] mat[0][0]*src[0]+mat[0][1]*src[1]+mat[0][2]*src[2]
-      movd        [eax+8],mm2   ; mat[2][0]*src[0]+mat[2][1]*src[1]+mat[2][2]*src[2]
-      femms                    
-		  leave
-		  ret
-	}
-}
-
-extern "C" void  __declspec(naked) MulMatrices3DNOW(float m1[4][4],float m2[4][4],float r[4][4])
-{
-	_asm {
-		push ebp
-		mov ebp,esp
-
-    femms
-      mov         ecx,[m1]
-      mov         eax,[r]
-      mov         edx,[m2]
-      
-      movq        mm0,[ecx]
-      movq        mm1,[ecx+8]
-      movq        mm4,[edx]
-      punpckhdq   mm2,mm0
-      movq        mm5,[edx+16]
-      punpckhdq   mm3,mm1
-      movq        mm6,[edx+32]
-      punpckldq   mm0,mm0
-      punpckldq   mm1,mm1
-      pfmul       mm4,mm0
-      punpckhdq   mm2,mm2
-      pfmul       mm0,[edx+8]
-      movq        mm7,[edx+48]
-      pfmul       mm5,mm2
-      punpckhdq   mm3,mm3
-      pfmul       mm2,[edx+24]
-      pfmul       mm6,mm1
-      pfadd       mm5,mm4
-      pfmul       mm1,[edx+40]
-      pfadd       mm2,mm0
-      pfmul       mm7,mm3
-      pfadd       mm6,mm5
-      pfmul       mm3,[edx+56]
-      pfadd       mm2,mm1
-      pfadd       mm7,mm6
-      movq        mm0,[ecx+16]
-      pfadd       mm3,mm2
-      movq        mm1,[ecx+24]
-      movq        [eax],mm7
-      movq        mm4,[edx]
-      movq        [eax+8],mm3
-      
-      punpckhdq   mm2,mm0
-      movq        mm5,[edx+16]
-      punpckhdq   mm3,mm1
-      movq        mm6,[edx+32]
-      punpckldq   mm0,mm0
-      punpckldq   mm1,mm1
-      pfmul       mm4,mm0
-      punpckhdq   mm2,mm2
-      pfmul       mm0,[edx+8]
-      movq        mm7,[edx+48]
-      pfmul       mm5,mm2
-      punpckhdq   mm3,mm3
-      pfmul       mm2,[edx+24]
-      pfmul       mm6,mm1
-      pfadd       mm5,mm4
-      pfmul       mm1,[edx+40]
-      pfadd       mm2,mm0
-      pfmul       mm7,mm3
-      pfadd       mm6,mm5
-      pfmul       mm3,[edx+56]
-      pfadd       mm2,mm1
-      pfadd       mm7,mm6
-      movq        mm0,[ecx+32]
-      pfadd       mm3,mm2
-      movq        mm1,[ecx+40]
-      movq        [eax+16],mm7
-      movq        mm4,[edx]
-      movq        [eax+24],mm3
-      
-      punpckhdq   mm2,mm0
-      movq        mm5,[edx+16]
-      punpckhdq   mm3,mm1
-      movq        mm6,[edx+32]
-      punpckldq   mm0,mm0
-      punpckldq   mm1,mm1
-      pfmul       mm4,mm0
-      punpckhdq   mm2,mm2
-      pfmul       mm0,[edx+8]
-      movq        mm7,[edx+48]
-      pfmul       mm5,mm2
-      punpckhdq   mm3,mm3
-      pfmul       mm2,[edx+24]
-      pfmul       mm6,mm1
-      pfadd       mm5,mm4
-      pfmul       mm1,[edx+40]
-      pfadd       mm2,mm0
-      pfmul       mm7,mm3
-      pfadd       mm6,mm5
-      pfmul       mm3,[edx+56]
-      pfadd       mm2,mm1
-      pfadd       mm7,mm6
-      movq        mm0,[ecx+48]
-      pfadd       mm3,mm2
-      movq        mm1,[ecx+56]
-      movq        [eax+32],mm7
-      movq        mm4,[edx]
-      movq        [eax+40],mm3
-      
-      punpckhdq   mm2,mm0
-      movq        mm5,[edx+16]
-      punpckhdq   mm3,mm1
-      movq        mm6,[edx+32]
-      punpckldq   mm0,mm0
-      punpckldq   mm1,mm1
-      pfmul       mm4,mm0
-      punpckhdq   mm2,mm2
-      pfmul       mm0,[edx+8]
-      movq        mm7,[edx+48]
-      pfmul       mm5,mm2
-      punpckhdq   mm3,mm3
-      pfmul       mm2,[edx+24]
-      pfmul       mm6,mm1
-      pfadd       mm5,mm4
-      pfmul       mm1,[edx+40]
-      pfadd       mm2,mm0
-      pfmul       mm7,mm3
-      pfadd       mm6,mm5
-      pfmul       mm3,[edx+56]
-      pfadd       mm2,mm1
-      pfadd       mm7,mm6
-      pfadd       mm3,mm2
-      movq        [eax+48],mm7
-      movq        [eax+56],mm3
-      femms
-	  leave
-	  ret
-	}
-}
-
-extern "C" float  __declspec(naked) DotProduct3DNOW(register float *v1, register float *v2)
-{
-	_asm {
-		push ebp
-		mov ebp,esp
-      
-      femms
-      mov         edx,[v1]
-      mov         eax,[v2]
-      movq        mm0,[edx]
-      movq        mm3,[eax]
-      pfmul       mm0,mm3
-      movq        mm2,[edx+8]
-      movq        mm1,[eax+8]
-      pfacc       mm0,mm0
-      pfmul       mm1,mm2
-      pfadd       mm0,mm1
-      movd        eax,mm0
-      femms
-	  leave
-	  ret
-	}
-}
-
-extern "C" void __declspec(naked) NormalizeVector3DNOW(float *v)
-{
-	_asm {
-		push ebp
-		mov ebp,esp      
-      femms
-      mov          edx,[v]
-      movq         mm0,[edx]
-      movq         mm3,[edx+8]
-      movq         mm1,mm0
-      movq         mm2,mm3
-      pfmul        mm0,mm0
-      pfmul        mm3,mm3
-      pfacc        mm0,mm0
-      pfadd        mm0,mm3
-      ;movq mm4,mm0 ; prepare for 24bit precision
-      ;punpckldq mm4,mm4 ; prepare for 24bit precision
-      pfrsqrt      mm0,mm0 ; 15bit precision 1/sqrtf(v)
-      ;movq mm3,mm0
-      ;pfmul mm0,mm0
-      ;pfrsqit1 mm0,mm4
-      ;pfrcpit2 mm0,mm3 ; 24bit precision 1/sqrtf(v)
-      pfmul        mm1,mm0
-      pfmul        mm2,mm0
-      movq         [edx],mm1
-      movq         [edx+8],mm2
-      femms
-	  leave
-	  ret
-	}
-}
diff --git a/Source/Glide64/CB/Glide64.cbp b/Source/Glide64/CB/Glide64.cbp
deleted file mode 100644
index 9ad22babf..000000000
--- a/Source/Glide64/CB/Glide64.cbp
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="Glide64" />
-		<Option makefile="Makefile.gcc" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Option virtualFolders="Config/;Texture/;Ucode/;Resources/;" />
-		<Build>
-			<Target title="Debug">
-				<Option output="../Plugin/Glide64" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="../Plugin" />
-				<Option object_output="obj/Debug/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option host_application="mupen64plus" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-DBUILD_DLL" />
-				</Compiler>
-				<MakeCommands>
-					<Build command="$make -f $makefile " />
-					<CompileFile command="" />
-					<Clean command="" />
-					<DistClean command="" />
-				</MakeCommands>
-			</Target>
-			<Target title="Release">
-				<Option output="../Plugin/Glide64" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="../Plugin" />
-				<Option object_output="obj/Release/" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-DBUILD_DLL" />
-					<Add directory="../inc" />
-					<Add directory="$(WXDIR)/include" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add directory="../" />
-					<Add directory="../lib" />
-					<Add directory="$(WXDIR)/lib/gcc_lib" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="`wx-config --cppflags`" />
-			<Add option="-fexceptions" />
-			<Add option="-fPIC" />
-			<Add option="-D__unix__" />
-			<Add directory="../inc" />
-		</Compiler>
-		<Linker>
-			<Add option="`wx-config --libs`" />
-			<Add option="-lglide3x" />
-			<Add option="../3dmathSIMD.o" />
-			<Add option="../FixedPoint.o" />
-			<Add option="../Texture.o" />
-			<Add directory="../lib" />
-		</Linker>
-		<Unit filename="../3dmath.cpp" />
-		<Unit filename="../3dmath.h" />
-		<Unit filename="../CRC.cpp">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../CRC.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../Combine.cpp" />
-		<Unit filename="../Combine.h" />
-		<Unit filename="../Config.cpp">
-			<Option virtualFolder="Config/" />
-		</Unit>
-		<Unit filename="../Config.h">
-			<Option virtualFolder="Config/" />
-		</Unit>
-		<Unit filename="../Debugger.cpp" />
-		<Unit filename="../Debugger.h" />
-		<Unit filename="../DepthBufferRender.cpp" />
-		<Unit filename="../DepthBufferRender.h" />
-		<Unit filename="../Ext_TxFilter.cpp" />
-		<Unit filename="../Ext_TxFilter.h" />
-		<Unit filename="../FBtoScreen.cpp" />
-		<Unit filename="../FBtoScreen.h" />
-		<Unit filename="../Gfx #1.3.h" />
-		<Unit filename="../GlideExtensions.h" />
-		<Unit filename="../Keys.cpp" />
-		<Unit filename="../Keys.h" />
-		<Unit filename="../Main.cpp" />
-		<Unit filename="../MiClWr16b.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../MiClWr32b.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../MiClWr8b.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexBuffer.cpp" />
-		<Unit filename="../TexBuffer.h" />
-		<Unit filename="../TexCache.cpp">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexCache.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexConv.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexLoad.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexLoad16b.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexLoad32b.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexLoad4b.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexLoad8b.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexMod.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../TexModCI.h">
-			<Option virtualFolder="Texture/" />
-		</Unit>
-		<Unit filename="../Util.cpp" />
-		<Unit filename="../Util.h" />
-		<Unit filename="../australia.xpm" />
-		<Unit filename="../brazil.xpm" />
-		<Unit filename="../c32.mac" />
-		<Unit filename="../cursor.h" />
-		<Unit filename="../font.h" />
-		<Unit filename="../france.xpm" />
-		<Unit filename="../japan.xpm" />
-		<Unit filename="../logo.xpm" />
-		<Unit filename="../main.h" />
-		<Unit filename="../rdp.cpp" />
-		<Unit filename="../rdp.h" />
-		<Unit filename="../russia.xpm" />
-		<Unit filename="../turbo3D.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode00.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode01.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode02.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode03.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode04.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode05.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode06.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode07.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode08.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode09.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucode09rdp.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../ucodeFB.h">
-			<Option virtualFolder="Ucode/" />
-		</Unit>
-		<Unit filename="../usa.xpm" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-			<lib_finder disable_auto="1" />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/Source/Glide64/Combine.cpp b/Source/Glide64/Combine.cpp
index d62da3faf..b588da98b 100644
--- a/Source/Glide64/Combine.cpp
+++ b/Source/Glide64/Combine.cpp
@@ -37,7 +37,7 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
 #include "Util.h"
 #include "Combine.h"
 
@@ -15599,7 +15599,7 @@ void Combine ()
   wxUint32 actual_combine, current_combine, color_combine, alpha_combine;
   int left, right;
 
-  actual_combine = cmb_mode_c;
+  actual_combine = current_combine = cmb_mode_c;
   color_combine = actual_combine;
   if ((rdp.cycle2 & 0xFFFF) == 0x1FFF)
     actual_combine = (rdp.cycle1 << 16) | (rdp.cycle1 & 0xFFFF);
@@ -15901,7 +15901,11 @@ void CombineBlender ()
       }
       A_BLEND (GR_BLEND_SRC_ALPHA, GR_BLEND_ONE);
       break;
-
+      
+      case 0x5000: /* Vigilante 8 explosions */
+      A_BLEND (GR_BLEND_ONE_MINUS_SRC_ALPHA, GR_BLEND_SRC_ALPHA);
+      break;
+            
     default:
       A_BLEND (GR_BLEND_SRC_ALPHA, GR_BLEND_ONE_MINUS_SRC_ALPHA);
     }
@@ -16017,12 +16021,14 @@ void ColorCombinerToExtension ()
     ext_local = GR_CMBX_ITRGB;
     ext_local_a = GR_CMBX_ITALPHA;
     break;
-  default:
-    FRDP_E("Invalid combiner locality %u.\n", cmb.c_loc);
   case GR_COMBINE_LOCAL_CONSTANT:
     ext_local = GR_CMBX_CONSTANT_COLOR;
     ext_local_a = GR_CMBX_CONSTANT_ALPHA;
     break;
+  default:
+    FRDP_E("Invalid combiner locality %u.\n", cmb.c_loc);
+    ext_local = GR_CMBX_ZERO;
+    ext_local_a = GR_CMBX_ZERO;
   };
   switch (cmb.c_oth)
   {
@@ -16034,12 +16040,14 @@ void ColorCombinerToExtension ()
     ext_other = GR_CMBX_TEXTURE_RGB;
     ext_other_a = GR_CMBX_TEXTURE_ALPHA;
     break;
-  default:
-    FRDP_E("Invalid combiner flag %u.\n", cmb.c_oth);
   case GR_COMBINE_OTHER_CONSTANT:
     ext_other = GR_CMBX_CONSTANT_COLOR;
     ext_other_a = GR_CMBX_CONSTANT_ALPHA;
     break;
+  default:
+    FRDP_E("Invalid combiner flag %u.\n", cmb.c_oth);
+    ext_other = GR_CMBX_ZERO;
+    ext_other_a = GR_CMBX_ZERO;
   };
   switch (cmb.c_fac)
   {
@@ -16087,6 +16095,9 @@ void ColorCombinerToExtension ()
     cmb.c_ext_c = GR_CMBX_TEXTURE_ALPHA;
     cmb.c_ext_c_invert = 1;
     break;
+  default:
+    cmb.c_ext_c = GR_CMBX_ZERO;
+    cmb.c_ext_c_invert = 0;
   }
 
   switch (cmb.c_fnc)
@@ -16178,6 +16189,7 @@ void ColorCombinerToExtension ()
     cmb.c_ext_d_invert = 0;
     break;
   case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL_ALPHA:
+  default:
     cmb.c_ext_a = GR_CMBX_ZERO;
     cmb.c_ext_a_mode = GR_FUNC_MODE_ZERO;
     cmb.c_ext_b = ext_local;
@@ -16381,12 +16393,15 @@ void TexColorCombinerToExtension (GrChipID_t tmu)
     tc_ext_c = GR_CMBX_OTHER_TEXTURE_ALPHA;
     tc_ext_c_invert = 1;
     break;
-  default:
-    FRDP_E("Invalid combiner TMU factor %u.\n", tmu_fac);
   case GR_COMBINE_FACTOR_ONE_MINUS_DETAIL_FACTOR:
     tc_ext_c = GR_CMBX_DETAIL_FACTOR;
     tc_ext_c_invert = 1;
     break;
+  default:
+    FRDP_E("Invalid combiner TMU factor %u.\n", tmu_fac);
+    tc_ext_c = GR_CMBX_ZERO;
+    tc_ext_c_invert = 0;
+    break;
   }
 
   switch (tmu_func)
@@ -16477,8 +16492,6 @@ void TexColorCombinerToExtension (GrChipID_t tmu)
     tc_ext_d = GR_CMBX_B;
     tc_ext_d_invert = 0;
     break;
-  default:
-    FRDP_E("Invalid combiner TMU function %u.\n", tmu_func);
   case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL_ALPHA:
     tc_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB;
     tc_ext_a_mode = GR_FUNC_MODE_ZERO;
@@ -16487,6 +16500,17 @@ void TexColorCombinerToExtension (GrChipID_t tmu)
     tc_ext_d = GR_CMBX_LOCAL_TEXTURE_ALPHA;
     tc_ext_d_invert = 0;
     break;
+  default:
+    FRDP_E("Invalid combiner TMU function %u.\n", tmu_func);
+    tc_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB;
+    tc_ext_a_mode = GR_FUNC_MODE_ZERO;
+    tc_ext_b = GR_CMBX_LOCAL_TEXTURE_RGB;
+    tc_ext_b_mode = GR_FUNC_MODE_ZERO;
+    tc_ext_c = GR_CMBX_ZERO;
+    tc_ext_c_invert = 0;
+    tc_ext_d = GR_CMBX_ZERO;
+    tc_ext_d_invert = 0;
+    break;
   }
 
   if (tmu == GR_TMU0)
@@ -16562,12 +16586,15 @@ void TexAlphaCombinerToExtension (GrChipID_t tmu)
     ta_ext_c = GR_CMBX_OTHER_TEXTURE_ALPHA;
     ta_ext_c_invert = 1;
     break;
-  default:
-    FRDP_E("Invalid combiner alpha factor %u.\n", tmu_a_fac);
   case GR_COMBINE_FACTOR_ONE_MINUS_DETAIL_FACTOR:
     ta_ext_c = GR_CMBX_DETAIL_FACTOR;
     ta_ext_c_invert = 1;
     break;
+  default:
+    FRDP_E("Invalid combiner alpha factor %u.\n", tmu_a_fac);
+    ta_ext_c = GR_CMBX_ZERO;
+    ta_ext_c_invert = 0;
+    break;
   }
 
   switch (tmu_a_func)
@@ -16627,8 +16654,6 @@ void TexAlphaCombinerToExtension (GrChipID_t tmu)
     ta_ext_d = GR_CMBX_B;
     ta_ext_d_invert = 0;
     break;
-  default:
-    FRDP_E("Invalid combiner alpha coverage function %u.\n", tmu_a_func);
   case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL:
   case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL_ALPHA:
     ta_ext_a = GR_CMBX_LOCAL_TEXTURE_ALPHA;
@@ -16638,6 +16663,17 @@ void TexAlphaCombinerToExtension (GrChipID_t tmu)
     ta_ext_d = GR_CMBX_B;
     ta_ext_d_invert = 0;
     break;
+  default:
+    FRDP_E("Invalid combiner alpha coverage function %u.\n", tmu_a_func);
+    ta_ext_a = GR_CMBX_LOCAL_TEXTURE_ALPHA;
+    ta_ext_a_mode = GR_FUNC_MODE_ZERO;
+    ta_ext_b = GR_CMBX_LOCAL_TEXTURE_ALPHA;
+    ta_ext_b_mode = GR_FUNC_MODE_ZERO;
+    ta_ext_c = GR_CMBX_ZERO;
+    ta_ext_c_invert = 0;
+    ta_ext_d = GR_CMBX_ZERO;
+    ta_ext_d_invert = 0;
+    break;
   }
 
   if (tmu == GR_TMU0)
diff --git a/Source/Glide64/Config.cpp b/Source/Glide64/Config.cpp
index 9ad0b4750..90b988e29 100644
--- a/Source/Glide64/Config.cpp
+++ b/Source/Glide64/Config.cpp
@@ -45,7 +45,7 @@
 
 // -*- C++ -*- generated by wxGlade 0.6.3 on Tue Oct 07 22:39:28 2008
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
 #include "DepthBufferRender.h"
 #include "Config.h"
 #include <wx/file.h>
@@ -1195,75 +1195,45 @@ void AboutDialog::do_layout()
   wxBoxSizer* sizer_3 = new wxBoxSizer(wxHORIZONTAL);
   wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
 
-#include "logo.xpm"
-#include "australia.xpm"
-#include "brazil.xpm"
-#include "france.xpm"
-#include "japan.xpm"
-#include "russia.xpm"
-#include "usa.xpm"
-
-  wxStaticBitmap* bitmap_1 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(logo_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER);
-  sizer_1->Add(bitmap_1, 0, wxALL|wxEXPAND, 10);
   wxStaticText* label_1 = new wxStaticText(this, wxID_ANY, _("authors:"));
   sizer_1->Add(label_1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);
-  wxStaticBitmap* bitmap_2 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(usa_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER);
-  sizer_2->Add(bitmap_2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 10);
   wxStaticText* label_2 = new wxStaticText(this, wxID_ANY, _("Dave2001. Original author and former main developer.\nHe founded Glide64 project on Dec. 29th, 2001.\nLeft the project at fall of 2002.\n"));
   label_2->Enable(false);
   sizer_2->Add(label_2, 0, 0, 0);
   sizer_1->Add(sizer_2, 1, wxEXPAND, 0);
-  wxStaticBitmap* bitmap_3 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(brazil_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER);
-  sizer_3->Add(bitmap_3, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10);
   wxStaticText* label_3 = new wxStaticText(this, wxID_ANY, _("Gugaman. Developer. Joined the project at winter 2002\n and left it at fall 2002."));
   label_3->Enable(false);
   sizer_3->Add(label_3, 0, 0, 0);
   sizer_1->Add(sizer_3, 1, wxEXPAND, 0);
-  wxStaticBitmap* bitmap_4 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(russia_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER);
-  sizer_4->Add(bitmap_4, 0, wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 10);
   wxStaticText* label_4 = new wxStaticText(this, wxID_ANY, _("Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\nMain developer since fall of 2002."));
   sizer_4->Add(label_4, 0, 0, 0);
   sizer_1->Add(sizer_4, 1, wxEXPAND, 0);
-  wxStaticBitmap* bitmap_5 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(japan_xpm, wxBITMAP_TYPE_XPM), wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER);
-  sizer_13->Add(bitmap_5, 0, wxLEFT|wxRIGHT|wxBOTTOM, 10);
   wxStaticText* label_15 = new wxStaticText(this, wxID_ANY, _("Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. "));
   sizer_13->Add(label_15, 0, 0, 0);
   sizer_1->Add(sizer_13, 1, wxEXPAND, 0);
   wxStaticText* label_5 = new wxStaticText(this, wxID_ANY, _("Glitch64 (the wrapper) authors:"));
   sizer_1->Add(label_5, 0, wxBOTTOM|wxALIGN_CENTER_HORIZONTAL, 10);
-  wxStaticBitmap* bitmap_6 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(france_xpm, wxBITMAP_TYPE_XPM));
-  sizer_6->Add(bitmap_6, 0, wxLEFT|wxRIGHT|wxBOTTOM, 10);
   wxStaticText* label_6 = new wxStaticText(this, wxID_ANY, wxT("hacktarux"));
   sizer_6->Add(label_6, 0, 0, 0);
   sizer_5->Add(sizer_6, 1, wxEXPAND, 0);
-  wxStaticBitmap* bitmap_7 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(australia_xpm, wxBITMAP_TYPE_XPM));
-  sizer_7->Add(bitmap_7, 0, wxRIGHT|wxBOTTOM, 10);
   wxStaticText* label_7 = new wxStaticText(this, wxID_ANY, wxT("mudlord"));
   sizer_7->Add(label_7, 0, 0, 0);
   sizer_5->Add(sizer_7, 1, wxEXPAND, 0);
   sizer_1->Add(sizer_5, 0, wxEXPAND, 0);
-  wxStaticBitmap* bitmap_8 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(france_xpm, wxBITMAP_TYPE_XPM));
-  sizer_9->Add(bitmap_8, 0, wxLEFT|wxRIGHT|wxBOTTOM, 10);
   wxStaticText* label_8 = new wxStaticText(this, wxID_ANY, wxT("ziggy"));
   sizer_9->Add(label_8, 0, 0, 0);
   sizer_8->Add(sizer_9, 1, wxEXPAND, 0);
-  wxStaticBitmap* bitmap_9 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(japan_xpm, wxBITMAP_TYPE_XPM));
-  sizer_10->Add(bitmap_9, 0, wxRIGHT|wxBOTTOM, 10);
   wxStaticText* label_9 = new wxStaticText(this, wxID_ANY, wxT("Hiroshi 'KoolSmoky' Morii"));
   sizer_10->Add(label_9, 0, 0, 0);
   sizer_8->Add(sizer_10, 1, wxEXPAND, 0);
   sizer_1->Add(sizer_8, 0, wxEXPAND, 0);
   wxStaticText* label_10 = new wxStaticText(this, wxID_ANY, _("GlideHQ author:"));
   sizer_11->Add(label_10, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 10);
-  wxStaticBitmap* bitmap_10 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(japan_xpm, wxBITMAP_TYPE_XPM));
-  sizer_11->Add(bitmap_10, 0, wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10);
   wxStaticText* label_11 = new wxStaticText(this, wxID_ANY, wxT("Hiroshi 'KoolSmoky' Morii"));
   sizer_11->Add(label_11, 0, wxALIGN_CENTER_VERTICAL, 0);
   sizer_1->Add(sizer_11, 1, wxEXPAND, 0);
   wxStaticText* label_12 = new wxStaticText(this, wxID_ANY, _("beta tester:"));
   sizer_12->Add(label_12, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 10);
-  wxStaticBitmap* bitmap_11 = new wxStaticBitmap(this, wxID_ANY, wxBitmap(france_xpm, wxBITMAP_TYPE_XPM));
-  sizer_12->Add(bitmap_11, 0, wxLEFT|wxRIGHT|wxALIGN_CENTER_VERTICAL, 10);
   wxStaticText* label_13 = new wxStaticText(this, wxID_ANY, wxT("olivieryuyu"));
   sizer_12->Add(label_13, 0, wxALIGN_CENTER_VERTICAL, 0);
   sizer_1->Add(sizer_12, 1, wxEXPAND, 0);
diff --git a/Source/Glide64/Debugger.cpp b/Source/Glide64/Debugger.cpp
index 46a9091e4..db5c22527 100644
--- a/Source/Glide64/Debugger.cpp
+++ b/Source/Glide64/Debugger.cpp
@@ -37,7 +37,7 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
 #include "Util.h"
 #include "Debugger.h"
 
@@ -70,7 +70,7 @@ int  grid = 0;
 static const char *tri_type[4] = { "TRIANGLE", "TEXRECT", "FILLRECT", "BACKGROUND" };
 
 //Platform-specific stuff
-#ifndef __WINDOWS__
+#ifndef _WIN32
 typedef struct dbgPOINT {
    int x;
    int y;
@@ -78,11 +78,7 @@ typedef struct dbgPOINT {
 #endif
 void DbgCursorPos(POINT * pt)
 {
-#ifdef __WINDOWS__
-  GetCursorPos (pt);
-#else //!todo find a way to get cursor position on Unix
   pt->x = pt->y = 0;
-#endif
 }
 
 //
diff --git a/Source/Glide64/DepthBufferRender.cpp b/Source/Glide64/DepthBufferRender.cpp
index dd68a5235..ae4f367aa 100644
--- a/Source/Glide64/DepthBufferRender.cpp
+++ b/Source/Glide64/DepthBufferRender.cpp
@@ -45,7 +45,7 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
 #include "rdp.h"
 #include "DepthBufferRender.h"
 
@@ -85,9 +85,45 @@ static int right_height, left_height;
 static int right_x, right_dxdy, left_x, left_dxdy;
 static int left_z, left_dzdy;
 
-extern "C" int imul16(int x, int y);
-extern "C" int imul14(int x, int y);
-extern int idiv16(int x, int y);
+__inline int imul16(int x, int y)        // (x * y) >> 16
+{
+    return (((long long)x) * ((long long)y)) >> 16;
+}
+
+__inline int imul14(int x, int y)        // (x * y) >> 14
+{
+    return (((long long)x) * ((long long)y)) >> 14;
+}
+
+__inline int idiv16(int x, int y)        // (x << 16) / y
+{
+    //x = (((long long)x) << 16) / ((long long)y);
+ /*   
+  eax = x;
+  ebx = y;
+  edx = x;
+  (x << 16) | ()
+   */ 
+#if !defined(__GNUC__) && !defined(NO_ASM)
+  __asm {
+        mov   eax, x
+        mov   ebx, y
+        mov   edx,eax   
+        sar   edx,16
+        shl   eax,16    
+        idiv  ebx  
+        mov   x, eax
+    }
+#elif !defined(NO_ASM)
+    int reminder;
+    asm ("idivl %[divisor]"
+          : "=a" (x), "=d" (reminder)
+          : [divisor] "g" (y), "d" (x >> 16), "a" (x << 16));
+#else
+	x = (((long long)x) << 16) / ((long long)y);
+#endif
+    return x;
+}
 
 __inline int iceil(int x)
 {
@@ -95,7 +131,7 @@ __inline int iceil(int x)
   return (x >> 16);
 }
 
-void RightSection(void)
+static void RightSection(void)
 {
   // Walk backwards trough the vertex array
   
diff --git a/Source/Glide64/FBtoScreen.cpp b/Source/Glide64/FBtoScreen.cpp
index 3833b308a..0585383e5 100644
--- a/Source/Glide64/FBtoScreen.cpp
+++ b/Source/Glide64/FBtoScreen.cpp
@@ -43,7 +43,7 @@
 //****************************************************************
 
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
 #include "FBtoScreen.h"
 #include "TexCache.h"
 
@@ -317,7 +317,7 @@ bool DrawFrameBufferToScreen(FB_TO_SCREEN_INFO & fb_info)
   FRDP("DrawFrameBufferToScreen. ul_x=%d, ul_y=%d, lr_x=%d, lr_y=%d, size=%d, addr=%08lx\n", fb_info.ul_x, fb_info.ul_y, fb_info.lr_x, fb_info.lr_y, fb_info.size, fb_info.addr);
   GrTexInfo t_info;
   wxUint8 * image = gfx.RDRAM+fb_info.addr;
-  wxUint32 texwidth, texheight;
+  wxUint32 texwidth;
   float scale;
   if (width <= 256)
   {
@@ -335,12 +335,10 @@ bool DrawFrameBufferToScreen(FB_TO_SCREEN_INFO & fb_info)
   if (height <= (texwidth>>1))
   {
     t_info.aspectRatioLog2 = GR_ASPECT_LOG2_2x1;
-    texheight = texwidth>>1;
   }
   else
   {
     t_info.aspectRatioLog2 = GR_ASPECT_LOG2_1x1;
-    texheight = texwidth;
   }
 
   if (fb_info.size == 2)
@@ -588,7 +586,7 @@ void DrawDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info)
   FRDP("DrawDepthBufferToScreen. ul_x=%d, ul_y=%d, lr_x=%d, lr_y=%d, size=%d, addr=%08lx\n", fb_info.ul_x, fb_info.ul_y, fb_info.lr_x, fb_info.lr_y, fb_info.size, fb_info.addr);
   GrTexInfo t_info;
   wxUint8 * image = gfx.RDRAM+fb_info.addr;
-  wxUint32 texwidth, texheight;
+  wxUint32 texwidth;
   float scale;
   if (width <= 256)
   {
@@ -606,12 +604,10 @@ void DrawDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info)
   if (height <= (texwidth>>1))
   {
     t_info.aspectRatioLog2 = GR_ASPECT_LOG2_2x1;
-    texheight = texwidth>>1;
   }
   else
   {
     t_info.aspectRatioLog2 = GR_ASPECT_LOG2_1x1;
-    texheight = texwidth;
   }
 
   wxUint16 * tex = (wxUint16*)texture_buffer;
diff --git a/Source/Glide64/FixedPoint.asm.cpp b/Source/Glide64/FixedPoint.asm.cpp
deleted file mode 100644
index bd2d41d2b..000000000
--- a/Source/Glide64/FixedPoint.asm.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-* Glide64 - Glide video plugin for Nintendo 64 emulators.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/****************************************************************
-;
-; Glide64 - Glide Plugin for Nintendo 64 emulators
-; Project started on December 29th, 2001
-;
-; Authors:
-; Dave2001, original author, founded the project in 2001, left it in 2002
-; Gugaman, joined the project in 2002, left it in 2002
-; Sergey 'Gonetz' Lipski, joined the project in 2002, main author since fall of 2002
-; Hiroshi 'KoolSmoky' Morii, joined the project in 2007
-;
-;****************************************************************
-;
-; To modify Glide64:
-; * Write your name and (optional)email, commented by your work, so I know who did it, and so that you can find which parts you modified when it comes time to send it to me.
-; * Do NOT send me the whole project or file that you modified.  Take out your modified code sections, and tell me where to put them.  If people sent the whole thing, I would have many different versions, but no idea how to combine them all.
-;
-;****************************************************************/
-
-#if defined(_MSC_VER) && !defined(_STDINT)
-typedef signed __int64          int64_t;
-#else
-#include <stdint.h>
-#endif
-
-// (x * y) >> 16
-extern "C" int __declspec(naked) imul16(int x, int y)
-{
-	_asm {
-		push ebp
-		mov ebp,esp
-		mov   eax, [x]
-		mov   edx, [y]
-		imul  edx        
-		shrd  eax,edx,16
-		leave
-		ret
-	}
-}
-
-//(x * y) >> 14
-extern "C" int  __declspec(naked) imul14(int x, int y)
-{
-	_asm {
-		push ebp
-		mov ebp,esp
-		mov   eax, [x]
-		mov   edx, [y]
-		imul  edx        
-		shrd  eax,edx,14
-		leave
-		ret
-	}
-}
-
-int idiv16(int x, int y)
-{
-    int64_t result;
-    const int64_t m = (int64_t)(x);
-    const int64_t n = (int64_t)(y);
-
-    result = (m << 16) / n;
-    return (int)(result);
-}
diff --git a/Source/Glide64/Gfx #1.3.h b/Source/Glide64/Gfx_1.3.h
similarity index 95%
rename from Source/Glide64/Gfx #1.3.h
rename to Source/Glide64/Gfx_1.3.h
index cf5da999e..2419e71e5 100644
--- a/Source/Glide64/Gfx #1.3.h	
+++ b/Source/Glide64/Gfx_1.3.h
@@ -62,29 +62,8 @@ the plugin
 #ifndef _GFX_H_INCLUDED__
 #define _GFX_H_INCLUDED__
 
-#define wxNO_GL_LIB
-#define wxNO_HTML_LIB
-#define wxNO_ADV_LIB
-#define wxNO_ZLIB_LIB
-#define wxNO_TIFF_LIB
-#define wxNO_EXPAT_LIB
-#define wxNO_REGEX_LIB
-#define wxNO_XML_LIB
-#define wxNO_NET_LIB
-#define wxNO_QA_LIB
-#define wxNO_XRC_LIB
-#define wxNO_AUI_LIB
-#define wxNO_PROPGRID_LIB
-#define wxNO_RIBBON_LIB
-#define wxNO_RICHTEXT_LIB
-#define wxNO_MEDIA_LIB
-#define wxNO_STC_LIB
+#include "winlnxdefs.h"
 
-
-#include <wx/wx.h>
-#include <wx/dynlib.h>
-#include <wx/filename.h>
-#include <wx/datetime.h>
 #include <stdio.h>
 #include <fstream>
 #include <stddef.h>		// offsetof
@@ -105,7 +84,7 @@ typedef unsigned char boolean;
 #define GLIDE64_CATCH catch (...)
 #endif
 
-#ifndef __WINDOWS__
+#ifndef _WIN32
 typedef void* HWND;
 #endif
 
diff --git a/Source/Glide64/Glide64.vcproj b/Source/Glide64/Glide64.vcproj
index cf5d1d64d..38a98711d 100644
--- a/Source/Glide64/Glide64.vcproj
+++ b/Source/Glide64/Glide64.vcproj
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;inc"
+				AdditionalIncludeDirectories="&quot;$(Root)Source\3rd Party\sdl\include&quot;;&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;&quot;$(Root)Source/Glitch64/inc&quot;;inc"
 				PreprocessorDefinitions="__MSC__;RDP_LOGGING;RDP_ERROR_LOG;"
 				UsePrecompiledHeader="0"
 			/>
@@ -53,7 +53,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(Root)Plugin/GFX/PJ64Glide64_d.dll"
-				AdditionalLibraryDirectories="&quot;$(Root)Source\3rd Party\wx\lib\vc_lib&quot;"
+				AdditionalLibraryDirectories=""
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -99,7 +99,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;inc"
+				AdditionalIncludeDirectories="&quot;$(Root)Source\3rd Party\sdl\include&quot;;&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;&quot;$(Root)Source/Glitch64/inc&quot;;inc"
 				PreprocessorDefinitions="__MSC__"
 				UsePrecompiledHeader="0"
 			/>
@@ -199,11 +199,11 @@
 				>
 			</File>
 			<File
-				RelativePath="Version.h"
+				RelativePath="ucodeFB.h"
 				>
 			</File>
 			<File
-				RelativePath="ucodeFB.h"
+				RelativePath="Version.h"
 				>
 			</File>
 		</Filter>
@@ -270,10 +270,6 @@
 				RelativePath="TexModCI.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Texture.asm.cpp"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Config"
@@ -356,10 +352,6 @@
 			RelativePath="3dmath.h"
 			>
 		</File>
-		<File
-			RelativePath=".\3dmathSIMD.asm.cpp"
-			>
-		</File>
 		<File
 			RelativePath="Combine.cpp"
 			>
@@ -400,10 +392,6 @@
 			RelativePath="FBtoScreen.h"
 			>
 		</File>
-		<File
-			RelativePath=".\FixedPoint.asm.cpp"
-			>
-		</File>
 		<File
 			RelativePath="Gfx #1.3.h"
 			>
@@ -448,6 +436,10 @@
 			RelativePath="Util.h"
 			>
 		</File>
+		<File
+			RelativePath=".\winlnxdefs.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Source/Glide64/Glide64.vcxproj b/Source/Glide64/Glide64.vcxproj
index 4c87f0ee4..453e73498 100644
--- a/Source/Glide64/Glide64.vcxproj
+++ b/Source/Glide64/Glide64.vcxproj
@@ -5,47 +5,48 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A4D13408-A794-4199-8FC7-4A9A32505005}</ProjectGuid>
     <RootNamespace>n64Glide</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>PJ64Glide64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PJ64Glide64_d</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">PJ64Glide64_d</TargetName>
     <OutDir>$(SolutionDir)Plugin\GFX\</OutDir>
+	<OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\GFX\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/include/msvc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(Root)Source\3rd Party\sdl\include;$(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/include/msvc;$(Root)Source/Glitch64/inc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>__MSC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RDP_LOGGING;RDP_ERROR_LOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">NO_ASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">RDP_LOGGING;RDP_ERROR_LOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(Root)Source\3rd Party\wx\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Windows</SubSystem>
-      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -86,7 +87,6 @@
     <ClInclude Include="DepthBufferRender.h" />
     <ClInclude Include="Ext_TxFilter.h" />
     <ClInclude Include="FBtoScreen.h" />
-    <ClInclude Include="Gfx #1.3.h" />
     <ClInclude Include="GlideExtensions.h" />
     <ClInclude Include="Keys.h" />
     <ClInclude Include="rdp.h" />
@@ -97,16 +97,13 @@
   <ItemGroup>
     <ClCompile Include="CRC.cpp" />
     <ClCompile Include="TexCache.cpp" />
-    <ClCompile Include="Texture.asm.cpp" />
     <ClCompile Include="Config.cpp" />
     <ClCompile Include="3dmath.cpp" />
-    <ClCompile Include="3dmathSIMD.asm.cpp" />
     <ClCompile Include="Combine.cpp" />
     <ClCompile Include="Debugger.cpp" />
     <ClCompile Include="DepthBufferRender.cpp" />
     <ClCompile Include="Ext_TxFilter.cpp" />
     <ClCompile Include="FBtoScreen.cpp" />
-    <ClCompile Include="FixedPoint.asm.cpp" />
     <ClCompile Include="Keys.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="rdp.cpp" />
@@ -129,6 +126,9 @@
     <ResourceCompile Include="Glide64.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\3rd Party\sdl\sdl2.vcxproj">
+      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\3rd Party\wx\wx_base.vcxproj">
       <Project>{427f1dcd-3bed-4010-9322-077a4c06d871}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -166,7 +166,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Glide64/Glide64.vcxproj.filters b/Source/Glide64/Glide64.vcxproj.filters
index 3641fcf10..abe1572ee 100644
--- a/Source/Glide64/Glide64.vcxproj.filters
+++ b/Source/Glide64/Glide64.vcxproj.filters
@@ -121,7 +121,6 @@
     <ClInclude Include="DepthBufferRender.h" />
     <ClInclude Include="Ext_TxFilter.h" />
     <ClInclude Include="FBtoScreen.h" />
-    <ClInclude Include="Gfx #1.3.h" />
     <ClInclude Include="GlideExtensions.h" />
     <ClInclude Include="Keys.h" />
     <ClInclude Include="rdp.h" />
@@ -136,20 +135,15 @@
     <ClCompile Include="TexCache.cpp">
       <Filter>Texture</Filter>
     </ClCompile>
-    <ClCompile Include="Texture.asm.cpp">
-      <Filter>Texture</Filter>
-    </ClCompile>
     <ClCompile Include="Config.cpp">
       <Filter>Config</Filter>
     </ClCompile>
     <ClCompile Include="3dmath.cpp" />
-    <ClCompile Include="3dmathSIMD.asm.cpp" />
     <ClCompile Include="Combine.cpp" />
     <ClCompile Include="Debugger.cpp" />
     <ClCompile Include="DepthBufferRender.cpp" />
     <ClCompile Include="Ext_TxFilter.cpp" />
     <ClCompile Include="FBtoScreen.cpp" />
-    <ClCompile Include="FixedPoint.asm.cpp" />
     <ClCompile Include="Keys.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="rdp.cpp" />
diff --git a/Source/Glide64/GlideExtensions.h b/Source/Glide64/GlideExtensions.h
index aee41f7eb..d4be2a371 100644
--- a/Source/Glide64/GlideExtensions.h
+++ b/Source/Glide64/GlideExtensions.h
@@ -52,7 +52,7 @@ FX_ENTRY void FX_CALL grGetGammaTableExt(FxU32, FxU32*, FxU32*, FxU32*);
 
 FX_ENTRY GrContext_t FX_CALL
 	grSstWinOpenExt(
-	FxU32                hWnd,
+	HWND                hWnd,
 	GrScreenResolution_t screen_resolution,
 	GrScreenRefresh_t    refresh_rate,
 	GrColorFormat_t      color_format,
diff --git a/Source/Glide64/Help/Glide64 Help.chm b/Source/Glide64/Help/Glide64 Help.chm
deleted file mode 100644
index 808323c50..000000000
Binary files a/Source/Glide64/Help/Glide64 Help.chm and /dev/null differ
diff --git a/Source/Glide64/Help/Glide64 Known Issues.html b/Source/Glide64/Help/Glide64 Known Issues.html
deleted file mode 100644
index fc02ecc8d..000000000
--- a/Source/Glide64/Help/Glide64 Known Issues.html	
+++ /dev/null
@@ -1,1399 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0042)http://www.eluni.net/glide64_known_issues/ -->
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:x="urn:schemas-microsoft-com:office:excel"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Excel.Sheet>
-<meta name=Generator content="Microsoft Excel 11">
-<link rel=File-List href="Glide64%20Known%20Issues_fichiers/filelist.xml">
-<link rel=Edit-Time-Data href="Glide64%20Known%20Issues_fichiers/editdata.mso">
-<link rel=OLE-Object-Data href="Glide64%20Known%20Issues_fichiers/oledata.mso">
-<title>Glide64 Known Issues</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:LastAuthor>Olivier</o:LastAuthor>
-  <o:Created>2007-06-19T06:39:39Z</o:Created>
-  <o:LastSaved>2009-07-06T05:26:51Z</o:LastSaved>
-  <o:Version>11.5606</o:Version>
- </o:DocumentProperties>
- <o:OfficeDocumentSettings>
-  <o:DownloadComponents/>
-  <o:LocationOfComponents HRef="/"/>
- </o:OfficeDocumentSettings>
-</xml><![endif]-->
-<style>
-<!--
-A:hover {
-	COLOR: #745e4c; TEXT-DECORATION: underline
-}
-A:hover {
-	COLOR: #745e4c; TEXT-DECORATION: underline
-}
-table
-	{mso-displayed-decimal-separator:"\,";
-	mso-displayed-thousand-separator:" ";}
-@page
-	{margin:1.0in .75in 1.0in .75in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;}
-.font5
-	{color:windowtext;
-	font-size:8.0pt;
-	font-weight:400;
-	font-style:normal;
-	text-decoration:none;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;}
-.font7
-	{color:red;
-	font-size:12.0pt;
-	font-weight:700;
-	font-style:normal;
-	text-decoration:none;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;}
-.font8
-	{color:gray;
-	font-size:12.0pt;
-	font-weight:700;
-	font-style:normal;
-	text-decoration:none;
-	font-family:Arial, sans-serif;
-	mso-font-charset:0;}
-.font12
-	{color:windowtext;
-	font-size:8.0pt;
-	font-weight:700;
-	font-style:normal;
-	text-decoration:none;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;}
-.font19
-	{color:gray;
-	font-size:8.0pt;
-	font-weight:700;
-	font-style:normal;
-	text-decoration:none;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;}
-tr
-	{mso-height-source:auto;}
-col
-	{mso-width-source:auto;}
-br
-	{mso-data-placement:same-cell;}
-.style0
-	{mso-number-format:General;
-	text-align:general;
-	vertical-align:bottom;
-	white-space:nowrap;
-	mso-rotate:0;
-	mso-background-source:auto;
-	mso-pattern:auto;
-	color:windowtext;
-	font-size:10.0pt;
-	font-weight:400;
-	font-style:normal;
-	text-decoration:none;
-	font-family:Arial;
-	mso-generic-font-family:auto;
-	mso-font-charset:0;
-	border:none;
-	mso-protection:locked visible;
-	mso-style-name:Normal;
-	mso-style-id:0;}
-td
-	{mso-style-parent:style0;
-	padding-top:1px;
-	padding-right:1px;
-	padding-left:1px;
-	mso-ignore:padding;
-	color:windowtext;
-	font-size:10.0pt;
-	font-weight:400;
-	font-style:normal;
-	text-decoration:none;
-	font-family:Arial;
-	mso-generic-font-family:auto;
-	mso-font-charset:0;
-	mso-number-format:General;
-	text-align:general;
-	vertical-align:bottom;
-	border:none;
-	mso-background-source:auto;
-	mso-pattern:auto;
-	mso-protection:locked visible;
-	white-space:nowrap;
-	mso-rotate:0;}
-.xl24
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;}
-.xl25
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;}
-.xl26
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	white-space:normal;}
-.xl27
-	{mso-style-parent:style0;
-	color:green;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;}
-.xl28
-	{mso-style-parent:style0;
-	color:green;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid green;
-	border-left:none;
-	white-space:normal;}
-.xl29
-	{mso-style-parent:style0;
-	color:green;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:1.0pt solid green;
-	border-right:none;
-	border-bottom:1.0pt solid green;
-	border-left:none;}
-.xl30
-	{mso-style-parent:style0;
-	color:green;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid green;
-	border-left:none;}
-.xl31
-	{mso-style-parent:style0;
-	color:#FF9900;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid #FF9900;
-	border-left:none;
-	white-space:normal;}
-.xl32
-	{mso-style-parent:style0;
-	color:#FF6600;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:1.0pt solid #FF9900;
-	border-right:none;
-	border-bottom:1.0pt solid #FF9900;
-	border-left:none;}
-.xl33
-	{mso-style-parent:style0;
-	color:#FF6600;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid #FF9900;
-	border-left:none;}
-.xl34
-	{mso-style-parent:style0;
-	color:#FF9900;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	white-space:normal;}
-.xl35
-	{mso-style-parent:style0;
-	color:purple;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid green;
-	border-left:none;
-	white-space:normal;}
-.xl36
-	{mso-style-parent:style0;
-	color:red;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid black;
-	border-left:none;
-	white-space:normal;}
-.xl37
-	{mso-style-parent:style0;
-	color:red;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid windowtext;
-	border-left:none;}
-.xl38
-	{mso-style-parent:style0;
-	color:gray;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid #969696;
-	border-left:none;
-	white-space:normal;}
-.xl39
-	{mso-style-parent:style0;
-	color:#993300;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid #969696;
-	border-left:none;
-	white-space:normal;}
-.xl40
-	{mso-style-parent:style0;
-	color:#993300;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid maroon;
-	border-left:none;
-	white-space:normal;}
-.xl41
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid black;
-	border-left:none;
-	white-space:normal;}
-.xl42
-	{mso-style-parent:style0;
-	color:#993366;
-	font-size:12.0pt;
-	font-weight:700;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	text-align:left;
-	white-space:normal;}
-.xl43
-	{mso-style-parent:style0;
-	font-size:7.5pt;
-	font-weight:700;
-	font-family:Arial, sans-serif;
-	mso-font-charset:0;
-	text-align:right;
-	white-space:normal;}
-.xl44
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	text-align:left;
-	white-space:normal;}
-.xl45
-	{mso-style-parent:style0;
-	font-size:14.0pt;
-	font-style:italic;
-	font-family:"Arial Black", sans-serif;
-	mso-font-charset:0;
-	text-align:center;
-	white-space:normal;}
-.xl46
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-style:italic;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	white-space:normal;}
-.xl47
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid green;
-	border-left:none;}
-.xl48
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:1.0pt solid green;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;}
-.xl49
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	text-align:center;
-	white-space:normal;}
-.xl50
-	{mso-style-parent:style0;
-	font-size:18.0pt;
-	font-weight:700;
-	font-style:italic;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	text-align:center;
-	white-space:normal;}
-.xl51
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	white-space:normal;}
-.xl52
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid #FF9900;
-	border-left:none;}
-.xl53
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	text-align:center;
-	border-top:1.0pt solid #FF9900;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	white-space:normal;}
-.xl54
-	{mso-style-parent:style0;
-	font-size:18.0pt;
-	font-weight:700;
-	font-style:italic;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	white-space:normal;}
-.xl55
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid purple;
-	border-left:none;}
-.xl56
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	text-align:center;
-	border-top:1.0pt solid purple;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	white-space:normal;}
-.xl57
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid black;
-	border-left:none;}
-.xl58
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	text-align:center;
-	border-top:1.0pt solid black;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	white-space:normal;}
-.xl59
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid #969696;
-	border-left:none;}
-.xl60
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	text-align:center;
-	border-top:1.0pt solid #969696;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	white-space:normal;}
-.xl61
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:none;
-	border-bottom:1.0pt solid maroon;
-	border-left:none;}
-.xl62
-	{mso-style-parent:style0;
-	font-size:8.0pt;
-	font-family:Verdana, sans-serif;
-	mso-font-charset:0;
-	text-align:center;
-	border-top:1.0pt solid maroon;
-	border-right:none;
-	border-bottom:none;
-	border-left:none;
-	white-space:normal;}
--->
-</style>
-<!--[if gte mso 9]><xml>
- <x:ExcelWorkbook>
-  <x:ExcelWorksheets>
-   <x:ExcelWorksheet>
-    <x:Name>Glide64 Known Issues</x:Name>
-    <x:WorksheetOptions>
-     <x:DefaultRowHeight>210</x:DefaultRowHeight>
-     <x:DefaultColWidth>10</x:DefaultColWidth>
-     <x:Print>
-      <x:ValidPrinterInfo/>
-      <x:PaperSizeIndex>9</x:PaperSizeIndex>
-      <x:HorizontalResolution>600</x:HorizontalResolution>
-      <x:VerticalResolution>600</x:VerticalResolution>
-     </x:Print>
-     <x:Selected/>
-     <x:DoNotDisplayGridlines/>
-     <x:Panes>
-      <x:Pane>
-       <x:Number>3</x:Number>
-       <x:ActiveRow>10</x:ActiveRow>
-      </x:Pane>
-     </x:Panes>
-     <x:ProtectContents>False</x:ProtectContents>
-     <x:ProtectObjects>False</x:ProtectObjects>
-     <x:ProtectScenarios>False</x:ProtectScenarios>
-    </x:WorksheetOptions>
-   </x:ExcelWorksheet>
-  </x:ExcelWorksheets>
-  <x:WindowHeight>8580</x:WindowHeight>
-  <x:WindowWidth>15180</x:WindowWidth>
-  <x:WindowTopX>120</x:WindowTopX>
-  <x:WindowTopY>45</x:WindowTopY>
-  <x:ProtectStructure>False</x:ProtectStructure>
-  <x:ProtectWindows>False</x:ProtectWindows>
- </x:ExcelWorkbook>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="1025"/>
-</xml><![endif]-->
-</head>
-
-<body link=gray vlink=gray class=xl24>
-
-<table x:str border=0 cellpadding=0 cellspacing=0 width=960 style='border-collapse:
- collapse;table-layout:fixed;width:720pt'>
- <col class=xl24 width=373 style='mso-width-source:userset;mso-width-alt:13641;
- width:280pt'>
- <col class=xl24 width=435 style='mso-width-source:userset;mso-width-alt:15908;
- width:326pt'>
- <col class=xl24 width=152 style='mso-width-source:userset;mso-width-alt:5558;
- width:114pt'>
- <col class=xl24 width=64 span=253 style='mso-width-source:userset;mso-width-alt:
- 2340;width:48pt'>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl24 width=373 style='height:10.5pt;width:280pt'></td>
-  <td class=xl24 width=435 style='width:326pt'></td>
-  <td class=xl24 width=152 style='width:114pt'></td>
- </tr>
- <tr height=20 style='mso-height-source:userset;height:15.0pt'>
-  <td colspan=2 height=20 class=xl42 width=808 style='height:15.0pt;width:606pt'>Current
-  Version:<font class="font7"> 9.07 </font><font class="font8">(year: 2009,
-  month: 07)</font></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl43 width=808 style='height:10.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=17 style='mso-height-source:userset;height:12.75pt'>
-  <td colspan=2 height=17 style='height:12.75pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl44 width=808 style='height:10.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=26 style='mso-height-source:userset;height:19.5pt'>
-  <td colspan=2 height=26 class=xl45 width=808 style='height:19.5pt;width:606pt'>Known
-  issues</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl46 width=808 style='height:10.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl26 width=373 style='height:10.5pt;width:280pt'>Game</td>
-  <td class=xl26 width=435 style='width:326pt'>Description</td>
-  <td class=xl25 x:str="Correct with ">Correct with<span
-  style='mso-spacerun:yes'>�</span></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 rowspan=2 height=29 class=xl24 style='border-bottom:1.0pt solid green;
-  height:21.75pt'></td>
-  <td class=xl25><span style='mso-spacerun:yes'>�</span>following plugin:</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl24 style='height:11.25pt'></td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl28 width=373 style='height:21.75pt;width:280pt'>64 de
-  Hakken!! Tamagotchi Minna de Tamagotchi World</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing or wrong textures
-  everywhere</td>
-  <td class=xl29>Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>All-Star
-  Baseball '99</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing gfx in menu</td>
-  <td class=xl30>Rice, Jabo</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Bio
-  Freaks</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing transition effects
-  during intro</td>
-  <td class=xl30>None</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Blast
-  Corps</td>
-  <td class=xl28 width=435 style='width:326pt'
-  x:str="missing 2d gfx in menu and game; missing noise effects ">missing 2d
-  gfx in menu and game; missing noise effects<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl30>Jabo software</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Command
-  &amp; Conquer</td>
-  <td class=xl28 width=435 style='width:326pt'>Briefing menu error. Intro
-  texture errors.</td>
-  <td class=xl30>(Intro only )Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Derby
-  Stallion 64</td>
-  <td class=xl28 width=435 style='width:326pt'>textures problem during demo</td>
-  <td class=xl30>Rice</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Donkey
-  kong 64</td>
-  <td class=xl28 width=435 style='width:326pt'>Wide screen doesn t work</td>
-  <td class=xl30>&nbsp;</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Excitebike
-  64</td>
-  <td class=xl28 width=435 style='width:326pt'>sky textures sliced in
-  multiplayer</td>
-  <td class=xl30>to check</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Extreme-G</td>
-  <td class=xl28 width=435 style='width:326pt'>Wrong title: the blue square
-  must not appear (coverage?)</td>
-  <td class=xl30>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'
-  x:str="FX-Zero: ">FX-Zero:<span style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=435 style='width:326pt'>Wrong or missing (fb ?) effects
-  in menu</td>
-  <td class=xl30>Jabo Software</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Gauntlet
-  Legends 64</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing status bar, flickering
-  (fb+core issue ?)</td>
-  <td class=xl30>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Gex 3,
-  Deep Cover Gecko</td>
-  <td class=xl28 width=435 style='width:326pt'>Bad water</td>
-  <td class=xl30>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Glover</td>
-  <td class=xl28 width=435 style='width:326pt'>strange blue line in sky
-  sometimes</td>
-  <td class=xl30>Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Harvest
-  Moon 64 (Bokujo Monogatari 2)</td>
-  <td class=xl28 width=435 style='width:326pt'>Problem with shadows</td>
-  <td class=xl30>Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Hey
-  You, Pikachu</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing gfx</td>
-  <td class=xl30>Rice</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Jet
-  force gemini</td>
-  <td class=xl28 width=435 style='width:326pt'>Coronas behave slighly
-  incorrectly</td>
-  <td class=xl30>Wonder++</td>
- </tr>
- <tr height=20 style='mso-height-source:userset;height:15.0pt'>
-  <td height=20 class=xl28 width=373 style='height:15.0pt;width:280pt'>Kuiki-Uhabi-Suigo</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing jigsaw (microcode issue
-  ? )</td>
-  <td class=xl30>Ziggy LLE</td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl28 width=373 style='height:21.75pt;width:280pt'>Mahjong
-  Master</td>
-  <td class=xl28 width=435 style='width:326pt'>Pictures of the character are
-  wrong. Menu doesn't show the japanese letters</td>
-  <td class=xl30>Rice/SP8</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Major
-  League Baseball Featuring Ken Griffey Jr</td>
-  <td class=xl28 width=435 style='width:326pt'>Wrong textures in game</td>
-  <td class=xl30>Jabo soft/Rice</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Mario
-  Tennis</td>
-  <td class=xl28 width=435 style='width:326pt'>Gfx errors</td>
-  <td class=xl30>to check</td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl28 width=373 style='height:21.75pt;width:280pt'>Mia
-  Hamm Soccer/Michael Owens WLS/Telefoot/RTL World League Soccer</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing title; wrong transition
-  effect</td>
-  <td class=xl30>None</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Midway's
-  Greatest Arcade Hits Volume 1</td>
-  <td class=xl28 width=435 style='width:326pt'>gfx errors in lot of mini games</td>
-  <td class=xl30>to check</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Mission
-  Impossible</td>
-  <td class=xl28 width=435 style='width:326pt'>missing dithering color alpha
-  effect in menu</td>
-  <td class=xl30>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Monster
-  Truck Madness 64</td>
-  <td class=xl28 width=435 style='width:326pt'>Letters have some very small gfx
-  issue</td>
-  <td class=xl30>to check</td>
- </tr>
- <tr height=18 style='mso-height-source:userset;height:13.5pt'>
-  <td height=18 class=xl28 width=373 style='height:13.5pt;width:280pt'>Nascar
-  2000</td>
-  <td class=xl28 width=435 style='width:326pt'>Split screen in multiplayer
-  doesn't work correctly.</td>
-  <td class=xl30>Jabo Software</td>
- </tr>
- <tr height=19 style='mso-height-source:userset;height:14.25pt'>
-  <td height=19 class=xl28 width=373 style='height:14.25pt;width:280pt'>Nushi
-  Zuri 64 - Shiokaze ni Notte</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing gfx in game (blender ?)</td>
-  <td class=xl30>Direct64, LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Operation
-  WinBack</td>
-  <td class=xl28 width=435 style='width:326pt'>A gray square sometimes appear
-  on the screen; missing sky</td>
-  <td class=xl30>Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>OgreBattle
-  64</td>
-  <td class=xl28 width=435 style='width:326pt'>the shadows in menu are wrong</td>
-  <td class=xl30>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Parlor!
-  Pro 64 Pachinko Jikki Simulation Game</td>
-  <td class=xl28 width=435 style='width:326pt'>small texture issue in game</td>
-  <td class=xl30>Rice</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>PGA
-  European Tour</td>
-  <td class=xl28 width=435 style='width:326pt'>colors seems wrong / jauge doesn
-  t work</td>
-  <td class=xl30>Jabo</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Pikachu
-  Genki Dech</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing and stretched textures</td>
-  <td class=xl30>Rice</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Pilotwings</td>
-  <td class=xl28 width=435 style='width:326pt'>Wrong shadows (coverage?)</td>
-  <td class=xl30>None</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Space
-  Silicon Valley</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing on TV dithering color
-  alpha (noise)</td>
-  <td class=xl30>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Starfox
-  64</td>
-  <td class=xl28 width=435 style='width:326pt'>Missing dithering color alpha
-  (noise) at logo</td>
-  <td class=xl30>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Super
-  Bowling 64</td>
-  <td class=xl28 width=435 style='width:326pt'>In game, the two part of the
-  screen is mixed</td>
-  <td class=xl30>Rice (hack)</td>
- </tr>
- <tr height=43 style='height:32.25pt'>
-  <td height=43 class=xl28 width=373 style='height:32.25pt;width:280pt'>Super
-  Robot Spirit</td>
-  <td class=xl28 width=435 style='width:326pt'>In menu, just before beginning a
-  new game there is a problem in this screen: it's seems that there is only
-  half of the screen for the flames ( checked on real system)</td>
-  <td class=xl30>Rice</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Super
-  Speed Race 64</td>
-  <td class=xl28 width=435 style='width:326pt'>Sliced textures in menu</td>
-  <td class=xl30>Rice</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Top
-  Gear Hyper-Bike</td>
-  <td class=xl28 width=435 style='width:326pt'>wrong texture, problem of
-  framebuffer effect</td>
-  <td class=xl30>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Top
-  Gear Overdrive</td>
-  <td class=xl28 width=435 style='width:326pt'>Resolution change causes gfx
-  glitches in menu</td>
-  <td class=xl30>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Turok 2</td>
-  <td class=xl28 width=435 style='width:326pt'>Flashlight doesn't work</td>
-  <td class=xl30>Ziggy LLE</td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl28 width=373 style='height:21.75pt;width:280pt'>Twine</td>
-  <td class=xl28 width=435 style='width:326pt'>title screen during demo is
-  wrong; shadow at entrance of 1st level should be displayed</td>
-  <td class=xl30>Jabo</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Twisted
-  Edge Extreme Snowboarding</td>
-  <td class=xl28 width=435 style='width:326pt'>wrong background in game</td>
-  <td class=xl30>to check</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Vigilante
-  8</td>
-  <td class=xl28 width=435 style='width:326pt'>No menus, missing textures and
-  many gfx errors</td>
-  <td class=xl30>Jabo software</td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl28 width=373 style='height:21.75pt;width:280pt'>Vigilante
-  8 - 2nd Offense</td>
-  <td class=xl28 width=435 style='width:326pt'>No menus, depth problem, missing
-  textures and many gfx errors</td>
-  <td class=xl30>Jabo software</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Wipeout
-  64</td>
-  <td class=xl28 width=435 style='width:326pt'>wrong sky in some particular
-  places, ok with jabo</td>
-  <td class=xl30>Jabo</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl28 width=373 style='height:11.25pt;width:280pt'>Yoshi's
-  Story</td>
-  <td class=xl28 width=435 style='width:326pt'>cut textures</td>
-  <td class=xl30>Jabo</td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl48 style='height:10.5pt'>&nbsp;</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl49 width=808 style='height:10.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl24 style='height:10.5pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl49 width=808 style='height:10.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='mso-height-source:userset;height:22.5pt'>
-  <td colspan=2 height=30 class=xl50 width=808 style='height:22.5pt;width:606pt'>Framebuffer
-  issues</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl49 width=808 style='height:10.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='mso-height-source:userset;height:10.5pt'>
-  <td colspan=2 height=14 class=xl44 width=808 style='height:10.5pt;width:606pt'>NOTE:
-  HWFBE or fb notification with Mupen is correct solution in terms of speed and
-  quality. Only when REFB is needed or when the fb effect</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='mso-height-source:userset;height:10.5pt'>
-  <td colspan=2 height=14 class=xl44 width=808 style='height:10.5pt;width:606pt'>is
-  not emulated that it is considered as an issue.</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl51 width=808 style='height:10.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl26 width=373 style='height:10.5pt;width:280pt'>Game</td>
-  <td class=xl26 width=435 style='width:326pt'>Description</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 rowspan=2 height=29 class=xl24 style='border-bottom:1.0pt solid #FF9900;
-  height:21.75pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl25 style='height:11.25pt'></td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl31 width=373 style='height:21.75pt;width:280pt'>Akumajou
-  Dracula Makushiroku: Real Action Adventure</td>
-  <td class=xl31 width=435 style='width:326pt'>REFB needed to get motion blur
-  in intro and correct gfx in menu</td>
-  <td class=xl32>Jabo</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl31 width=373 style='height:11.25pt;width:280pt'>All-Star
-  Baseball 2000, 2001</td>
-  <td class=xl31 width=435 style='width:326pt'>Monitors requires REFB.</td>
-  <td class=xl33>NONE</td>
- </tr>
- <tr height=39 style='mso-height-source:userset;height:29.25pt'>
-  <td height=39 class=xl31 width=373 style='height:29.25pt;width:280pt'>Bakushou
-  Jinsei 64 - Mezase</td>
-  <td class=xl31 width=435 style='width:326pt'>Needs REFB to be playable (or
-  background will be missing) (Mupen doesn t handle fb effect
-  correctly=disabled)</td>
-  <td class=xl33>NONE</td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl31 width=373 style='height:21.75pt;width:280pt'>Beetle
-  Adventure Racing</td>
-  <td class=xl31 width=435 style='width:326pt'>Unemulated fb effects in menu
-  (scrolling effect); shadows on cars needs REFB</td>
-  <td class=xl33>Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl31 width=373 style='height:11.25pt;width:280pt'>Blast
-  Corps</td>
-  <td class=xl31 width=435 style='width:326pt'>wrong depth with shadows with
-  HWFBE</td>
-  <td class=xl33>to check</td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl31 width=373 style='height:21.75pt;width:280pt'>Bottom
-  of the 9th</td>
-  <td class=xl31 width=435 style='width:326pt'>needs REFB for correct intro;
-  With HWFBE only one of the 2 of the player heads are displayed in game</td>
-  <td class=xl33>NONE</td>
- </tr>
- <tr height=15 style='mso-height-source:userset;height:11.25pt'>
-  <td height=15 class=xl31 width=373 style='height:11.25pt;width:280pt'>Castlevania
-  - Legacy of Darkness</td>
-  <td class=xl31 width=435 style='width:326pt'>REFB needed to get motion blur
-  in intro and correct gfx in menu</td>
-  <td class=xl33>Jabo</td>
- </tr>
- <tr height=16 style='mso-height-source:userset;height:12.0pt'>
-  <td height=16 class=xl31 width=373 style='height:12.0pt;width:280pt'>Dobutsu
-  no Mori (Animal Forest)</td>
-  <td class=xl31 width=435 style='width:326pt'>The character menu is uncorrect
-  due to an unhandeld fb effect</td>
-  <td class=xl33>Direct64</td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl31 width=373 style='height:21.75pt;width:280pt'>Donkey
-  Kong 64</td>
-  <td class=xl31 width=435 style='width:326pt'>The zipper screen issue is a
-  framebuffer effects (needs REFB) (Mupen doesn t support this game)</td>
-  <td class=xl33>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl31 width=373 style='height:11.25pt;width:280pt'>Extreme-G</td>
-  <td class=xl31 width=435 style='width:326pt'>Missing transfer effects in
-  after select the car</td>
-  <td class=xl33>Direct64</td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl31 width=373 style='height:21.75pt;width:280pt'
-  x:str="iss98/2000/Jikkyou World Cup France '98/J. League Perfect Striker ">iss98/2000/Jikkyou
-  World Cup France '98/J. League Perfect Striker<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl31 width=435 style='width:326pt'>Missing fb effect when a goal is
-  scored</td>
-  <td class=xl33>GLN64 0.41</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl31 width=373 style='height:11.25pt;width:280pt'>The New
-  tetris</td>
-  <td class=xl31 width=435 style='width:326pt'>Missing fb effect in menu
-  (partially working with HWBFE)</td>
-  <td class=xl33>Direct64</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl31 width=373 style='height:11.25pt;width:280pt'>Micromachines
-  64</td>
-  <td class=xl31 width=435 style='width:326pt'>Missing shadows for some
-  elements of the environment</td>
-  <td class=xl33>Jabo software</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl31 width=373 style='height:11.25pt;width:280pt'>Ogre
-  Battle 64 - Person of Lordly Caliber</td>
-  <td class=xl31 width=435 style='width:326pt'>Screen transition effects
-  requires REFB.</td>
-  <td class=xl33>to check</td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl31 width=373 style='height:21.75pt;width:280pt'>Tonic
-  Trouble</td>
-  <td class=xl31 width=435 style='width:326pt'>texts for the screen just before
-  going in game needs REFB (side effect of cpu gfx effect ?)</td>
-  <td class=xl33>NONE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl31 width=373 style='height:11.25pt;width:280pt'>WWF
-  WrestleMania 2000 /Virtual Pro Wrestling 2</td>
-  <td class=xl31 width=435 style='width:326pt'>REFB is needed to get motion
-  blur in intro</td>
-  <td class=xl33>Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl34 width=373 style='height:11.25pt;width:280pt'>Yoshi's
-  Story</td>
-  <td class=xl34 width=435 style='width:326pt'><span
-  style='mso-spacerun:yes'>�</span>Transition &quot;page&quot; level needs REFB</td>
-  <td class=xl33>to check</td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 height=14 class=xl53 width=808 style='height:10.5pt;width:606pt'>&nbsp;</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='mso-height-source:userset;height:22.5pt'>
-  <td colspan=2 height=30 class=xl50 width=808 style='height:22.5pt;width:606pt'>Pending
-  investigation</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='height:22.5pt'>
-  <td colspan=2 height=30 class=xl54 width=808 style='height:22.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl26 width=373 style='height:10.5pt;width:280pt'>Game</td>
-  <td class=xl26 width=435 style='width:326pt'>Description</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 rowspan=2 height=29 class=xl24 style='border-bottom:1.0pt solid purple;
-  height:21.75pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl24 style='height:11.25pt'></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl35 width=373 style='height:11.25pt;width:280pt'>F1 Pole
-  position 64</td>
-  <td class=xl35 width=435 style='width:326pt'>Wrong use of dithering alpha for
-  texts ?</td>
-  <td class=xl27></td>
- </tr>
- <tr height=30 style='mso-height-source:userset;height:22.5pt'>
-  <td colspan=2 height=30 class=xl56 width=808 style='height:22.5pt;width:606pt'>&nbsp;</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='height:22.5pt'>
-  <td colspan=2 height=30 class=xl50 width=808 style='height:22.5pt;width:606pt'>Non-working
-  games</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='height:22.5pt'>
-  <td colspan=2 height=30 class=xl54 width=808 style='height:22.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl26 width=373 style='height:10.5pt;width:280pt'>Game</td>
-  <td class=xl26 width=435 style='width:326pt'>Description</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 rowspan=2 height=29 class=xl24 style='border-bottom:1.0pt solid black;
-  height:21.75pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl24 style='height:11.25pt'></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl36 width=373 style='height:11.25pt;width:280pt'>Indiana
-  Jones and the Infernal Machine</td>
-  <td class=xl36 width=435 style='width:326pt'>Unimplemented microcode</td>
-  <td class=xl37>Jabo/ Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl36 width=373 style='height:11.25pt;width:280pt'>Last
-  Legion U</td>
-  <td class=xl36 width=435 style='width:326pt'>Unimplemented microcode</td>
-  <td class=xl37>Jabo/ Ziggy LLE</td>
- </tr>
- <tr height=17 style='mso-height-source:userset;height:12.75pt'>
-  <td height=17 class=xl36 width=373 style='height:12.75pt;width:280pt'>Star
-  Wars - Rogue Squadron</td>
-  <td class=xl36 width=435 style='width:326pt'>Unimplemented microcode</td>
-  <td class=xl37>Jabo/ Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl36 width=373 style='height:11.25pt;width:280pt'>Star
-  Wars Episode I - Battle for Naboo</td>
-  <td class=xl36 width=435 style='width:326pt'>Unimplemented microcode</td>
-  <td class=xl37>Jabo/ Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl36 width=373 style='height:11.25pt;width:280pt'>Toukon
-  Road - Brave Spirits</td>
-  <td class=xl36 width=435 style='width:326pt'>Unimplemented microcode</td>
-  <td class=xl37>Jabo/ Ziggy LLE</td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl36 width=373 style='height:11.25pt;width:280pt'>Toukon
-  Roads - The Next Generation</td>
-  <td class=xl36 width=435 style='width:326pt'>Unimplemented microcode</td>
-  <td class=xl37>Jabo/ Ziggy LLE</td>
- </tr>
- <tr height=30 style='mso-height-source:userset;height:22.5pt'>
-  <td colspan=2 height=30 class=xl58 width=808 style='height:22.5pt;width:606pt'>&nbsp;</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='height:22.5pt'>
-  <td colspan=2 height=30 class=xl50 width=808 style='height:22.5pt;width:606pt'>Emu
-  issues</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='height:22.5pt'>
-  <td colspan=2 height=30 class=xl54 width=808 style='height:22.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl26 width=373 style='height:10.5pt;width:280pt'>Game</td>
-  <td class=xl26 width=435 style='width:326pt'>Description</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 rowspan=2 height=29 class=xl24 style='border-bottom:1.0pt solid #969696;
-  height:21.75pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl24 style='height:11.25pt'></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl38 width=373 style='height:11.25pt;width:280pt'>Ai
-  Shougi 3</td>
-  <td class=xl38 width=435 style='width:326pt'>Textures are completely
-  distorted (use 1964!)</td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl38 width=373 style='height:11.25pt;width:280pt'>Banjo
-  Tooie</td>
-  <td class=xl38 width=435 style='width:326pt'>Random crashes</td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl38 width=373 style='height:11.25pt;width:280pt'>Dobutsu
-  no Mori</td>
-  <td class=xl38 width=435 style='width:326pt'>NES games crash emulation</td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl38 width=373 style='height:11.25pt;width:280pt'>Hoshi
-  no Kirby 64</td>
-  <td class=xl38 width=435 style='width:326pt'>Minor gfx errors with the status
-  bar (use Mupen!)</td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl38 width=373 style='height:11.25pt;width:280pt'>Kirby
-  64 - The Crystal Shards</td>
-  <td class=xl38 width=435 style='width:326pt'>Minor gfx errors with the status
-  bar (use Mupen!)</td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl38 width=373 style='height:11.25pt;width:280pt'>Mario
-  No Photopie</td>
-  <td class=xl38 width=435 style='width:326pt'>Special card issues</td>
-  <td class=xl24></td>
- </tr>
- <tr height=29 style='height:21.75pt'>
-  <td height=29 class=xl38 width=373 style='height:21.75pt;width:280pt'>NBA
-  Courtside 2 - Featuring Kobe Bryant&nbsp;&nbsp;&nbsp;&nbsp;</td>
-  <td class=xl39 width=435 style='width:326pt'>CPU gfx effect issue &gt;&gt; <font
-  class="font19">Missing intro. (TIP: set &quot;Frame Buffer R/W: Yes&quot;
-  with 1964 : got some gfx but broken)</font></td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl38 width=373 style='height:11.25pt;width:280pt'>Yakouchuu
-  II - Satsujun Kouru:&nbsp;</td>
-  <td class=xl39 width=435 style='width:326pt'>CPU gfx effect issue &gt;&gt; <font
-  class="font19">Missing movies</font></td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='mso-height-source:userset;height:22.5pt'>
-  <td colspan=2 height=30 class=xl60 width=808 style='height:22.5pt;width:606pt'>&nbsp;</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='height:22.5pt'>
-  <td colspan=2 height=30 class=xl50 width=808 style='height:22.5pt;width:606pt'>Wrapper
-  issues</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='height:22.5pt'>
-  <td colspan=2 height=30 class=xl54 width=808 style='height:22.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl26 width=373 style='height:10.5pt;width:280pt'>Game</td>
-  <td class=xl26 width=435 style='width:326pt'>Description</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 rowspan=2 height=29 class=xl24 style='border-bottom:1.0pt solid maroon;
-  height:21.75pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl24 style='height:11.25pt'></td>
- </tr>
- <tr height=43 style='height:32.25pt'>
-  <td height=43 class=xl40 width=373 style='height:32.25pt;width:280pt'>Depth
-  issue when using HWFBE, mostly with fbo:International Track and Field Summer
-  Games, NFL98 TV screen (?), others</td>
-  <td class=xl40 width=435 style='width:326pt'>&nbsp;</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='mso-height-source:userset;height:22.5pt'>
-  <td colspan=2 height=30 class=xl62 width=808 style='height:22.5pt;width:606pt'>&nbsp;</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='height:22.5pt'>
-  <td colspan=2 height=30 class=xl50 width=808 style='height:22.5pt;width:606pt'>Unknown
-  issues</td>
-  <td class=xl24></td>
- </tr>
- <tr height=30 style='height:22.5pt'>
-  <td colspan=2 height=30 class=xl54 width=808 style='height:22.5pt;width:606pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl26 width=373 style='height:10.5pt;width:280pt'>Game</td>
-  <td class=xl26 width=435 style='width:326pt'>Description</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td colspan=2 rowspan=2 height=29 class=xl24 style='border-bottom:1.0pt solid black;
-  height:21.75pt'></td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl24 style='height:11.25pt'></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl41 width=373 style='height:11.25pt;width:280pt'>Stunt
-  Racer 64</td>
-  <td class=xl41 width=435 style='width:326pt'>Microcode issue and core issues</td>
-  <td class=xl24></td>
- </tr>
- <tr height=15 style='height:11.25pt'>
-  <td height=15 class=xl41 width=373 style='height:11.25pt;width:280pt'>World
-  Driver Championship</td>
-  <td class=xl41 width=435 style='width:326pt'>Microcode issue and core issues</td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 colspan=3 class=xl24 style='height:10.5pt;mso-ignore:colspan'></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 colspan=3 class=xl24 style='height:10.5pt;mso-ignore:colspan'></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl25 style='height:10.5pt'>Credits :)<font class="font5">
-  Current list's maintainer: Olivieryuyu</font></td>
-  <td class=xl25></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 colspan=3 class=xl24 style='height:10.5pt;mso-ignore:colspan'></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl24 style='height:10.5pt'>A BIG thanks to:</td>
-  <td colspan=2 class=xl24 style='mso-ignore:colspan'></td>
- </tr>
- <tr height=28 style='mso-height-source:userset;height:21.0pt'>
-  <td colspan=2 height=28 class=xl26 width=808 style='height:21.0pt;width:606pt'>Raziel64<font
-  class="font5">, </font><font class="font12">MasterPhW</font><font
-  class="font5">, </font><font class="font12">Noxious Ninja</font><font
-  class="font5">, </font><font class="font12">TRS</font><font class="font5">, </font><font
-  class="font12">Straight</font><font class="font5">, </font><font
-  class="font12">Knuckles</font><font class="font5">, </font><font
-  class="font12">Flash</font><font class="font5">, </font><font class="font12">Milen</font><font
-  class="font5">, </font><font class="font12">Jelta</font><font class="font5">,
-  </font><font class="font12">Federelli</font><font class="font5">, </font><font
-  class="font12">Clements</font><font class="font5">, </font><font
-  class="font12">Doomulation</font><font class="font5">, etc.</font></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl24 style='height:10.5pt'>They are issues' hunters :D
-  (so am i, hehe)</td>
-  <td colspan=2 class=xl24 style='mso-ignore:colspan'></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 colspan=3 class=xl24 style='height:10.5pt;mso-ignore:colspan'></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl24 style='height:10.5pt'>And a Very special thanks to:</td>
-  <td colspan=2 class=xl24 style='mso-ignore:colspan'></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl25 colspan=2 style='height:10.5pt;mso-ignore:colspan'>Dave2001<font
-  class="font5"> for starting, </font><font class="font12">Gugaman</font><font
-  class="font5"> and </font><font class="font12">Gonetz</font><font
-  class="font5"> (^_^ He is tha man! ^_^ Thks a lot pal :) ) for enhancing and
-  fixing</font></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl24 colspan=2 style='height:10.5pt;mso-ignore:colspan'>the
-  best video plugin and showing the true power of <font class="font12">3DFX</font><font
-  class="font5"> and Glide. And to the N64 emulators' authors &amp;
-  betatesters!</font></td>
-  <td class=xl24></td>
- </tr>
- <tr height=14 style='height:10.5pt'>
-  <td height=14 class=xl25 colspan=2 style='height:10.5pt;mso-ignore:colspan'>Hacktarux,
-  Mulord and Ziggy<font class="font5"> for making the best Glide Wrapper out
-  there.</font></td>
-  <td class=xl24></td>
- </tr>
- <![if supportMisalignedColumns]>
- <tr height=0 style='display:none'>
-  <td width=373 style='width:280pt'></td>
-  <td width=435 style='width:326pt'></td>
-  <td width=152 style='width:114pt'></td>
- </tr>
- <![endif]>
-</table>
-
-</body>
-
-</html>
diff --git a/Source/Glide64/Help/Glide64 Readme.html b/Source/Glide64/Help/Glide64 Readme.html
deleted file mode 100644
index 1eab205cc..000000000
--- a/Source/Glide64/Help/Glide64 Readme.html	
+++ /dev/null
@@ -1,311 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML><HEAD><TITLE></TITLE><META http-equiv=Content-Type content="text/html; charset=UTF-8"><META content="MSHTML 6.00.2900.5512" name=GENERATOR><STYLE type=text/css>BODY {
-	FONT-FAMILY: verdana, arial, sans-serif
-}</STYLE></HEAD><BODY>
-<H1>
-<P align=center>Glide64</P><BR></H1>
-<H2 align=center>International Emulation Project <BR></H2>
-<H3 align=center>Version: "Napalm WX"</H3>
-<H4 align=center>Author: <A href="mailto:gonetz@ngs.ru">Sergey 'Gonetz' Lipski 
-</A>(Russia)<BR><BR></H4>
-<H4 align=left>Disclaimer:</H4>
-<H5 align=left>Neither I, nor anyone who is working with me, will take ANY 
-responsibility for your actions or if this program causes harm to anything, 
-including you and your computer, in any way, physically or 
-mentally.<BR><BR></H5>
-<H4 align=left>Table of Contents:</H4>
-<H4 align=left>
-<OL>
-  <LI>
-  <H5 align=left><A href="#What is Glide64">What is Glide64</A>?</H5>
-  <LI>
-  <H5 align=left><A href="#Quick Start">The Very Quick Start</A></H5>
-  <LI>
-  <H5 align=left><A href="#Common Settings">Common Settings</A></H5>
-  <LI>
-  <H5 align=left><A href="#Emulation settings">Emulation settings</A>
-  </H5><LI>
-  <H5 align=left><A href="#HWFBE">About hardware frame buffer emulation</A></H5>
-  <LI>
-  <H5 align=left><A href="#Texture_enhancement">Texture enhancement and 
-  hi-resolution textures</A></H5><LI><H5 align=left><A href="#Hotkeys">Hotkeys</A></H5><LI><H5 align=left><A href="#Specific Game Settings">Specific Game Settings</A></H5></LI></OL></H4>
-<H4 align=left>&nbsp;</H4><H4 align=left>1. <A name="What is Glide64">What is Glide64</A>?</H4>
-<P align=left>Glide64 is a graphics plugin for Nintendo 64 emulators. It can run 
-natively on 3dfx cards, or via a OpenGL-based wrapper&nbsp;for modern video 
-cards. The project started on 29 December 2001 by <STRONG>David 'Dave2001' 
-Forrester </STRONG>(USA). <STRONG>Gugaman</STRONG> (Brazil) and <STRONG>Sergey 
-'Gonetz' Lipski</STRONG> (that is me) joined him at February 2002. We worked 
-together until the autumn of 2002. Then, Dave2001 and Gugaman left the project. 
-Since that time I'm the only developer of the plugin. However, I'm not the only 
-one, who works on this project. The Glide64 project includes two additional 
-libraries beside the plugin itself. The first one is the library known as the 
-'Glitch64' wrapper, previously known as "Hacktarux's glide wrapper", named after 
-its original author, <STRONG>Hacktarux</STRONG> (France). It then was heavily 
-modified&nbsp;&amp; improved by <STRONG>Vincent 'ziggy' 
-Penne</STRONG>&nbsp;(France) and <STRONG>Brad 'mudlord' 
-Miller</STRONG>&nbsp;(Australia). The second library is a texture enhancement 
-module named 'GlideHQ', created by <STRONG>Hiroshi 'KoolSmoky' Morii</STRONG> 
-(Japan). Beside that, lots of people from around the world helped me to test the 
-plugin and gave me valuable advices on how to improve it. The main tester of 
-this version is <STRONG>Olivieryuyu </STRONG>(France); and&nbsp;additional 
-testing, advices and friendly support was provided by <STRONG>Wes 'Legend' 
-McDaniel&nbsp;</STRONG>(USA). <BR></P>
-<H4>2. <A name="Quick Start">The Very Quick Start<BR></A></H4>
-<P align=left>To install Glide64:
-  </P><OL><LI><DIV align=left><SPAN lang=EN-US style="FONT-SIZE: 12pt; LINE-HEIGHT: 115%; FONT-FAMILY: Verdana; mso-fareast-font-family: 'Times New Roman'; mso-bidi-font-family: 'Times New Roman'; mso-ansi-language: EN-US; mso-fareast-language: EN-US; mso-bidi-language: AR-SA">Open archive and c</SPAN>opy everything from the <EM>'Plugin'</EM> folder into the 
-  folder where all your N64 plugins are stored (this is usually the 
-  '<EM>Plugin</EM>' folder in your emulator's folder, e.g. 
-  Project64\Plugin).</DIV>
-  <LI>
-  <DIV align=left><SPAN lang=EN-US style="FONT-SIZE: 12pt; COLOR: #00b050; LINE-HEIGHT: 115%; FONT-FAMILY: Verdana; mso-fareast-font-family: 'Times New Roman'; mso-bidi-font-family: 'Times New Roman'; mso-ansi-language: EN-US; mso-fareast-language: EN-US; mso-bidi-language: AR-SA"><FONT color=#000000>If you don’t have a Voodoo card, make sure you</FONT> </SPAN>copy the glide3x.dll file from the 
-  '<EM>Wrapper</EM>' folder into your emulator's folder.</DIV></LI></OL>
-<P align=left>To setup Glide64:<BR></P>
-<OL>
-  <LI>
-  <DIV align=left>Launch your emulator.</DIV>
-  <LI>
-  <DIV align=left>Select Glide64 as your graphics plugin.</DIV>
-  <LI>
-  <DIV align=left>Select <EM>'Configure graphics plugin'</EM></DIV>
-  <LI>
-  <DIV align=left>In Glide64 configuration dialog, on the <EM>'Common 
-  settings'</EM> tab, in the "Rendering" section, select your desired windowed 
-  and full screen resolution.&nbsp;</DIV></LI></OL>
-<P align=left>Glide64 is now ready to use. If you're a novice in N64 emulation, 
-you may skip the rest of this document, start your favorite games and enjoy! If 
-you are an experienced emu fan, or a curious person, read further for 
-explanation for other options and various tips and tricks.<BR></P>
-<H4><A name="Common Settings">3. Common Settings</A></H4><H5>3.1 Rendering</H5><P>Rendering related settings described here.</P><H5>3.1.1 Common </H5><P><EM>'Windowed or 3dfx card resolution'</EM> - This option selects the fullscreen resolution for 3dfx cards and windowed resolution for other cards. Note: for 3dfx cards the plugin must be in fullscreen mode to see anything.</P><P><EM>'Vertical sync'</EM> - This option will enable the vertical sync, which will prevent tearing. Note: this option will ONLY have effect if vsync is set to <EM>"Software Controlled".</EM></P><H5>3.1.2 OpenGL settings</H5><P><EM>'Anisotropic filtering'</EM>&nbsp; -&nbsp; This filter sharpens and brings out the details of textures that recede into the distance. When activated, it will use the max anisotropy your video card supports. However, this will override native way of texture filtering and may cause visual artifacts in some games.</P><P><EM>'Autodetect VRAM Size'</EM> - If checked, plugin will try to autodetect VRAM size. But if this appears wrong, please uncheck and set it to correct value. Currently VRAM autodetection is implemented only for Windows.</P><P><EM><A name=Use_FBO>'Use Frame buffer objects'</A></EM> - Changes the way frame buffer effects are rendered - with or without usage of the OpenGL Frame Buffer Objects (FBO) extension. The choice depends on game and your video card. FBO off is good for NVIDIA cards, while for ATI cards, it's usually best that FBOs are turned on. Also, some FB effects work only with one of the methods, no matter which card you have. On the whole, with FBO off, compatibility/accuracy is a bit better (which is the case for Resident Evil 2). However, with FBO on with some systems, it can actually be a bit faster in cases.</P><H5>3.2 On screen display</H5><P>These settings are located in&nbsp;<EM>'Common settings'</EM> tab -&nbsp;in the <EM>'On screen display'</EM> section. You may select them with no worries - these settings do not impact the emulation. </P><P>Select any or all options in the <EM>'Speed'</EM> option group to see how fast the game is running.<EM> 'FPS counter'</EM> will show you the actual frames per second (FPS) for the current game. This number depends on the running game. The<EM> 'VI/s counter'</EM> will show you the number of visual interrupts per second received by the plugin. This number must be 50 for PAL games and 60 for NTSC games.&nbsp; <EM>'% spe</EM>ed' will show you, how fast your game is emulated; 100% means that the currently emulated game runs at perfect speed. <EM>'FPS transparent'</EM> option makes the&nbsp;background of the counter(s) transparent. </P><P>Select <EM>'Clock enabled'</EM> in the <EM>'Time'</EM> group to see the current&nbsp; time. Select <EM>'Clock is 24-hour'</EM> to see the time in 24-hour format. Time information will be displayed in the lower right corner of the screen. </P><H5>3.3 Other</H5><P>All other common settings are grouped in the <EM>'Other'</EM> section.</P><P><EM>'Show advanced emulation options'</EM> - Enable <EM>'Emulation settings'</EM> tab. Read more in <A href="#Emulation settings">'Emulation settings'</A> section.</P><P><EM>'Show texture enhancement options'</EM> - Enable <EM>'Texture enhancement'</EM> tab. Read more in <A href="#Texture_enhancement">'Texture enhancement and hi-resolution textures'</A> section.</P><P><EM>'Screenshot format'</EM> - Format, in which screen shots will be saved. Currently you may choose <EM>'BMP', 'PNG'</EM> or <EM>'JPEG'</EM>.</P><P><EM>'Glide card #'</EM> - This option is only for users with multiple 3dfx cards installed in one machine. This selects the glide card number to use. If you only have one glide card installed in your system, set this option to #1. Otherwise, select the number that corresponds to the glide card you want to use.</P><P align=left></P><H4>4.&nbsp;<A name="Emulation settings">Emulation settings</A></H4>
-<P align=left><U>Warning</U>: The plugin already has optimal settings for all 
-games. Changing these settings is dangerous: it can cause glitches and 
-instability. Access to emulation settings is disabled by default.</P>
-<P align=left>To enable <EM>'Emulation settings'</EM> tab, check <EM>'Show advanced emulation 
-options'</EM> on the <EM>'Common settings tab'</EM> and close the configuration 
-dialog.&nbsp;Open&nbsp;configuration dialog again and&nbsp;the <EM>'Emulation 
-settings'</EM> tab will now be available.<BR><BR><U>Important</U>: <EM>'Emulation settings'</EM> tab operates in 2 different ways depending on whether or not a game is running.</P>
-<UL>
-  <LI>
-  <DIV align=left>When no game is running, you may change <EM>"default"</EM> emulation 
-  settings.&nbsp;The plugin uses these settings when&nbsp;a game does not 
-  have&nbsp;corresponding custom settings. Again, it is strongly recommended to not touch anything here.</DIV>
-  <LI>
-  <DIV align=left>When a game&nbsp;<STRONG>IS</STRONG> running, this tab shows emulation settings the 
-  game is using. Any changes will be applied immediately after you close the configuration dialog. You will be asked - save the changes in the ini file or use them in the current session only. If you choose 'Yes',&nbsp;your changes will&nbsp;be saved in the custom section of the ini file and will be used permanently. Otherwise, new setting will be used until the game stops or new save state loaded.</DIV></LI></UL>
-<H5>4.1 General options</H5>
-<P align=left><EM><A name="Filtering mode">'Filtering mode'</A></EM> - you may set <EM>'Force bilinear', 
-'Automatic'</EM> or <EM>'Force point-sampled'</EM> mode. You also may easily 
-switch between filtering modes during game play by pressing the&nbsp;backspace 
-button. </P>
-<P align=left><EM>'Buffer swapping modes'</EM> - It's hard to explain the 
-difference between these modes. Just select any available option. If a game suffers from flickering, select another buffer swapping mode and see if that fixes the problem.<BR><BR><EM>'LOD calculation'</EM>. 
-The N64 uses a very special way to implement mip-mapping, which is not available on PC hardware. Glide64 implements a rough approximation of N64 
-mip-mapping, which can be enabled by setting <EM>'LOD calculation'</EM> option 
-to <EM>'fast'</EM> or <EM>'precise'</EM>. The result is not always good 
-though.</P><P align=left><EM>'Aspect ratio'</EM> - Most N64 games use 4:3 aspect ratio, but some support widescreen too. You may select appropriate aspect here and set widescreen mode in game settings. In <EM>'Stretch'</EM> mode the output will be stretched to the entire screen, other modes may add black boarders if necessary.</P>
-<P align=left><EM>'Fog'</EM> - Sets fog emulation on/off. </P>
-<P align=left><EM>'Buffer clear on every frame'</EM> - Forces the frame buffer to be cleared every frame drawn. Usually frame buffer clear is controlled by the game. However, in some cases it is not well emulated, and some garbage may be left on the screen. In such cases, this option must be set on.</P>
-<H4>
-<H5>4.2. Frame buffer emulation</H5></H4>
-<P align=left>N64 games often use auxiliary frame buffers to implement special 
-game effects like motion blur or for optimization purposes. The console can 
-allocate as many auxiliary frame buffers as needed and then use them as usual 
-textures. PC video cards usually use only one buffer per frame, thus emulation 
-of frame buffer effects is always a hard problem. Glide64 implements lot of 
-methods of frame buffer emulation, to support as many effects as possible. Most 
-games will work fine with&nbsp;pre-defined settings, but some effects require 
-additional options to be set. Known cases are described in the <A href="Glide64 compatibility list.html">Compatibility List</A> and in the <A href="#Specific Game Settings">Specific Game Settings</A>. You may set the following 
-options:</P>
-<P align=left><EM>'Enable frame buffer emulation'</EM> - When this option is on, the plugin will try to detect frame buffer effects usage and emulate them. This option is off by default, but for all games, which use frame buffer effects,&nbsp;it will be automatically turned on. </P>
-<P align=left><EM><A name=Use_HWFBE>'Hardware frame buffer emulation'</A></EM> - Enables hardware 
-frame buffer emulation. Usually, this must be set on, except some rare cases, 
-mentioned in the <A href="Glide64 compatibility list.html">Compatibility 
-List</A>. Read <A href="#HWFBE">next chapter </A>for explanation of hardware 
-frame buffer emulation.</P>
-<P align=left><EM><A name="Motion blur">'Motion blur'</A></EM> - Enables motion blur emulation. Motion blur 
-works slow without hardware frame buffer emulation, so it is made optional. This 
-option usually must be on, because most of cards support hardware frame buffer 
-emulation. You may also switch it on/off during game play by pressing ALT-B.</P>
-<P align=left><EM><A name="Read every frame">'Read every frame'</A></EM> - In some cases,&nbsp; Glide64 cannot 
-detect frame buffer usage by the game. In this case the only way to emulate 
-frame buffer effects, is to read every rendered frame from video memory and put 
-it into the emulated RDRAM. Reading from video memory is usually slow, so this 
-method of frame buffer emulation is optional. You may also switch it on/off 
-during game play by pressing ALT-V.</P>
-<P align=left><EM><A name=Get_FBI>'Get frame buffer info'</A></EM> - This is another way to emulate 
-frame buffer effects, which the plugin cannot detect. This option allows the 
-plugin to get notification about frame buffer usage from the emulator and thus 
-emulate frame buffer effects without slowdown. Currently it works only with 
-Mupen64 (and even Mupen is not 100% reliable with this). Do not enable this option with 1964, otherwise the emulator will 
-crash.</P>
-<P align=left><EM><A name=RenderN64FB>'Render N64 frame buffer as texture'</A></EM>. The N64 
-architecture allows the CPU to write directly into the frame buffer. Sometimes 
-N64 games uses this ability, which may lead to graphics lost during emulation, 
-since graphics plugin does not know, that some graphics are already written in 
-the N64 frame buffer by the CPU. Some examples of this are: falling pills in 
-Dr.Mario and rain in Jet Force Gemini. When this option is enabled, content of 
-each N64 frame buffer is rendered as a texture over the current rendered frame. 
-This prevents graphics loss, but may cause slowdowns and various glitches in 
-some games. </P>
-<P align=left><EM>'Detect CPU write to N64 frame buffer'</EM>- This option works 
-as the previous options, but the plugin is trying to detect, when a game uses 
-CPU writes to the N64 frame buffer. The N64 frame buffer is rendered only when 
-CPU writes is detected. Use this option for those games, in which you see still 
-image or no image at all for some time with no reason.</P>
-<H4>
-<H5>4.3. <A name="Depth buffer emulation">Depth buffer emulation</A></H5></H4>
-<P align=left>Sometimes N64 games use values in the depth buffer to decide, when 
-to render some particular object or not. This is often used for coronas, which 
-must be rendered only if they are not covered by other objects in the 3D scene. 
-To emulate it properly, the N64 depth buffer must be filled with correct values. 
-Glide64 uses software rendering to fill the N64 depth buffer. It is enabled by 
-default. If you experience performance issues, set the <EM>'Software depth 
-buffer rendering'</EM> option off.</P>
-<H4>5. <A name=HWFBE>About hardware frame buffer emulation</A></H4>
-<P align=left>The usual method of frame buffer emulation, which theoretically 
-should always work, is to render auxiliary frame buffers into the main video 
-buffer and then read it from video memory into main memory, and put into the 
-structure representing N64 memory (RDRAM). This approach has 2 main 
-disadvantages:</P>
-<P align=left>1) auxiliary frame buffers may be visible when they should
-n't be.</P>
-<P align=left>2) reading from video memory is a very slow operation, thus many 
-frame buffer effects will be slow.</P>
-<P align=left>Also, image taken from video memory must be scaled down to N64 
-native resolution (usually 320x240), thus quality lost is inevitable. To avoid 
-these problems, Glide64 uses the Glide3x extension, which allows it to create 
-auxiliary frame buffers right into video memory, like the N64 does. This allows 
-the plugin to run frame buffer effects without speed&nbsp;hits or quality loss. 
-Hardware frame buffer emulation (HWFBE) greatly improves many games, but it has 
-some restrictions:</P>
-<P align=left>1) HWFBE is in fact a hack - auxiliary frame buffers are not put 
-into N64 memory. When a game uses a texture located in RDRAM corresponding to an 
-auxiliary frame buffer, the plugin uses the texture located in video memory 
-instead. The game may use this area in RDRAM for different textures later, but 
-the plugin will use it's auxiliary buffer anyway, which leads to serious 
-glitches. I have tried to reduce the probability of this situation, but it is 
-still possible. If you encounter it, switch to windowed mode, and then back to 
-full screen again.</P>
-<P align=left>2) The Glide extension used for HWFBE is fully supported by Voodoo 
-4/5 only. Banshee and Voodoo3 cards also support it, but only for small 
-auxiliary frame buffers (e.g. shadows). Other Voodoo cards do not support it at 
-all! </P>
-<P align=left>3) HWFBE may not work for Voodoo4/5 if the anti-aliasing option is 
-set to "fastest performance". Use any other option there.</P>
-<P align=left>4) Anti-aliasing is not applicable to auxiliary frame buffers.</P>
-<P align=left>5) The wrapper support HWFBE almost fully, but it has its peculiarities. Two ways of hardware frame buffer emulation are implemented in the wrapper - with, and without usage of the OpenGL Frame Buffer Objects (FBO) extension. The method with FBO's works fast on any card, which supports FBO's, but it may cause depth issues, since framebuffer objects use their own depth buffer. The method without FBO's works on almost any card, has no problems with depth buffer usage, but it may work slowly on ATI cards. To switch between these methods set the <EM><A href="#Use_FBO">'Use frame buffer objects'</A></EM> option on/off.&nbsp;</P>
-<H4>6. <A name=Texture_enhancement>Texture enhancement and hi-resolution 
-textures</A></H4>
-<P align=left>Texture enhancement is done via GlideHQ - a real-time texture enhancer library with hi-resolution texture pack support. GlideHQ is an independent DLL, which dynamically loaded by Glide64, when it is needed. GlideHQ itself has no user interface; all its settings are placed on the <EM>'Texture enhancement'</EM> tab. This tab is disabled by default. To enable it, check <EM>'Show texture enhancement options'</EM> on the<EM> 'Common settings'</EM> tab and close the configuration dialog. Open configuration dialog again and switch to <EM>'Texture enhancement'</EM> tab.</P><H5 align=left>6.1. Texture enhancement</H5><P align=left>GlideHQ uses variety of methods to enhance the original N64 textures.</P><P align=left><EM>'Filter'</EM> - Apply a filter to either smooth or sharpen textures. There are 4 different smoothing filters and 2 different sharpening filters. The higher the number, the stronger the effect, i.e. <EM>'Smoothing filter 4'</EM> will have a much more noticeable effect than <EM>'Smoothing filter 1'</EM>. Be aware that performance may have an impact depending on the game and/or the PC.</P><P align=left><EM>'Enhancement'</EM> - 7 different filters are selectable here, each one with a distinctive look. Be aware of possible performance impacts. <BR><U>Important</U>: <EM>'Store'</EM> mode - saves textures in cache "as is". It can improve performance in games, which load many textures. Disable <A href="#Ignore backgrounds"><EM>'Ignore backgrounds'</EM></A> option for better result.</P><P align=left><EM>'Texture cache'</EM> - Enhanced and filtered textures are cached for later use. This helps boost performance if there are subsequent requests for the same texture, which is the case for most games. Normally, 128MB should be more than enough but there is a sweet spot for each game. 32MB will be enough for Super Mario, but Conker's BFD streams a lot of textures so setting 256MB or more will boost performance.</P><P align=left><EM>'Compress texture cache'</EM> - Memory will be compressed so that more textures can be held in the texture cache. The compression ratio varies with each texture, but 1/5 of the original size would be a modest approximation. They will be decompressed on-the-fly, before being downloaded to the gfx hardware. This option will still help save memory space even when using texture compressions such as FXT1 and S3TC.</P><P align=left><EM>'Apply texture compression'</EM> - Textures will be compressed using selected texture compression method. The overall compression ratio is about 1/6 for FXT1 and 1/4 for S3TC. In addition to saving space on the texture cache, the space occupied on the GFX hardware's texture RAM, by the enhanced textures, will be greatly reduced. This minimizes texture RAM usage, decreasing the number of texture swaps to the GFX hardware leading to performance gains. However, due to the nature of lossy compression of FXT1 and S3TC, using this option can sometimes lead to quality degradtion of small size textures and color banding of gradient colored textures.</P><P align=left><EM><A name="Ignore backgrounds">'Ignore backgrounds'</A></EM> - It is used to skip enhancement for wide narrow textures, usually used for backgrounds. This may save texture memory greatly and increase performance.</P><H5 align=left>6.2 Hi-resolution textures</H5><P align=left>GlideHQ supports hi-resolution texture packs, and texture dumping/editing.</P><P align=left><EM>'Format'</EM> - Chose which method is to be used for loading Hi-res texture packs. Only Rice's format is available currently. Leave on <EM>'None'</EM> if you will not be needing to load hi-res packs.</P><P align=left><EM>'Alternative CRC calculation'</EM> - This option enables emulation of a palette CRC calculation bug in RiceVideo. If some textures are not loaded, try to set this option on/off. This option is disabled in texture dumping mode.</P><P align=left><EM>'Texture dumping/editing mode'</EM> - In this mode, you have that ability to dump textures on screen to the appropriate folder. You can also reload textures while the game is running to see how they look instantly - big time saver! <U>Hotkeys</U>: <EM>"R"</EM> reloads hires textures from texture pack - <EM>"D"</EM> toggles texture dumps on/off.</P><P align=left><EM>'Use alpha channel fully'</EM> - When this option is off, 16bit rgba textures will be loaded using RiceVideo style - with 1bit for alpha channel. When it is on, GlideHQ will check, how alpha channel is used by the hires texture, and select most appropriate format for it. This gives texture designers freedom to play with alpha, as they need, regardless of format of original N64 texture. For older and badly designed texture packs it may cause unwanted black borders.</P><P align=left><EM>'Compress texture cache'</EM>&nbsp; - When game started, plugin loads all its hi-resolution textures into PC memory. Since hi-resolution textures are usually large, the whole pack can take hundreds megabytes of memory. Cache compression allows to save memory space greatly. Textures will be decompressed on-the-fly, before being downloaded to the gfx hardware. This option will still help save memory space even when using texture compression.</P><P align=left><EM>'Apply texture compression'</EM> - Textures will be compressed using selected texture compression method. The overall compression ratio is about 1/6 for FXT1 and 1/4 for S3TC. In addition to saving space on the texture cache, the space occupied on the GFX hardware's texture RAM, by the enhanced textures, will be greatly reduced. This minimizes texture RAM usage, decreasing the number of texture swaps to the GFX hardware leading to performance gains. However, due to the nature of lossy compression of FXT1 and S3TC, using this option can sometimes lead to quality degradtion of small size textures and color banding of gradient colored textures.</P><P align=left><EM>'Force 16bpp textures'</EM> - The color of the textures will be reduced to 16bpp. This is another space saver and performance enhancer. This halves the space used on the texture cache and the GFX hardware's texture RAM. Color reduction is done so that the original quality is preserved as much as possible. Depending on the texture, this usually is hardly noticeable. Sometimes though, it can be: skies are a good example.</P><P align=left><EM>'Tile textures'</EM> - When on, wide texture will be split on several tiles to fit in one 256-width texture. This tiled texture takes much less video memory space and thus overall performance will increase. However, corresponding polygons must be split too, and this is not polished yet- various issues are possible, including black lines and polygons distortions.</P><H5 align=left>6.3 Common</H5><P align=left><EM>'Texture compression method'</EM> - Select the method for texture compression. 3dfx cards support both FXT1 and S3TC, other cards can use S3TC only.</P><P align=left><EM>'Save texture cache to hard disk'</EM> - <U>For enhanced textures cache</U>: this will save <STRONG>all</STRONG> previously loaded and enhanced textures to the hard drive. So upon next game launch, all the textures will be instantly loaded, resulting in smoother performance for all your games. <U>For high-resolution textures cache</U>: After creation, loading hi-res texture will take only a few seconds upon game launch, as opposed to the 5 - 60 seconds a pack can take to load without this cache file. The only downside here is upon any changes to the pack, the cache file will need to be manually deleted. Saved cache files go into a folder called <EM>"Cache"</EM> within the<EM> "Plugins</EM>" folder.</P><H4 align=left>7. <A name=Hotkeys>Hotkeys</A></H4><P align=left>Glide64 uses the following hotkeys:</P><P align=left><EM>"BACKSPACE"</EM> - Cycle between <A href="#Filtering mode">texture filtering modes</A>. Currently selected mode will be shown in the status line on the bottom of the screen for a short time.</P><P align=left><EM>"Alt"+"V"</EM> - Toggles <A href="#Read every frame">read every frame</A> on/off. Current status of this option will be shown in the status line on the bottom of the screen for a short time.</P><P align=left><EM>"Alt"+"B"</EM> - Toggles <A href="#Motion blur">motion blur</A> on/off. Current status of this option will be shown in the status line on the bottom of the screen for a short time.</P><P align=left>GlideHQ uses the following hotkeys:</P><P align=left><EM>"D"</EM> - toggles texture dumps on/off.</P><P align=left><EM>"R"</EM> - reloads hires textures from the texture pack.</P><H4 align=left>
-&nbsp;8. <A name="Specific Game Settings">Specific Game Settings</A></H4><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><H5 class=MsoNormal style="MARGIN: 0cm 0cm 0pt">
-<DIV class=MsoNormal style="MARGIN: 0cm 0cm 0pt">
-<H4>
-<UL>
-  <DIV class=MsoNormal style="MARGIN: 0cm 0cm 0pt">
-  <H3>
-  <LI>
-  </FONT><H5 class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><A href="#Banjo-Kazooie">Banjo-Kazooie</A></H5><FONT face="Times New Roman">
-  <LI>
-  </FONT><H5 class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><A href="#Beetle Adventure Racing">Beetle Adventure Racing / HSV Adventure Racing</A></H5><FONT face="Times New Roman">
-  <LI>
-  </FONT><H5 class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><A href="#Resident Evil 2">Bio Hazard 2 / Resident Evil 2</A></H5><FONT face="Times New Roman">
-  <LI>
-  </FONT><H5 class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><A href="#Conker's Bad Fur Day">Conker's Bad Fur Day</A></H5><FONT face="Times New Roman">
-  <LI>
-  </FONT><H5 class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><A href="#Fushigi no Dungeon">Fushigi no Dungeon - Furai no Shiren 2 (J)</A></H5><FONT face="Times New Roman">
-  <LI>
-  </FONT><H5 class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><A href="#The - Majora's Mask">Legend of Zelda, The - Majora's Mask</A></H5><FONT face="Times New Roman">
-  <LI>
-  </FONT><H5 class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><A href="#Paper Mario">Mario Story / Paper Mario</A></H5><FONT face="Times New Roman">
-  <LI>
-  </FONT><H5 class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><A href="#Perfect Dark">Perfect Dark</A></H5></H3></LI></DIV></UL></H4></DIV></H5></SPAN>
-
-<H5><A name=Banjo-Kazooie>Banjo-Kazooie</A></H5>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><FONT face=Verdana>The puzzle effect 
-is not emulated by default. To see it, either set <EM><A href="#Read every frame">'Read every frame'</A></EM> 
-option on or set <EM><A href="#Get_FBI">'Get frame buffer info'</A></EM> and run this game with 
-Mupen64</FONT>.</FONT></SPAN><O:P></O:P></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><O:P></O:P></FONT></SPAN></P><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman">
-</FONT><H5><SPAN lang=EN-US style="mso-ansi-language: EN-US"><A name="Beetle Adventure Racing">Beetle Adventure 
-Racing</A> / HSV Adventure Racing</SPAN></H5><FONT face="Times New Roman">
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><O:P></O:P></FONT></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><O:P></O:P></FONT></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><STRONG>Fog.</STRONG> The fog in this game is 
-implemented&nbsp;in a&nbsp;very specific way. When rendering of the current 
-frame is finished, the depth buffer, filled during rendering of this frame, is 
-used as a texture and blended with the color buffer. As the result, the frame 
-becomes fogged, and the fog is thicker where depth values are higher. Glide64 
-implements two ways to emulate this effect, software and hardware ones. 
-<O:P></O:P></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US">Software emulation 
-uses software depth buffer rendering. It works on all cards, but has two 
-disadvantages:<O:P></O:P></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><SPAN style="mso-spacerun: yes">&nbsp;</SPAN>- Alpha testing is not used during 
-software depth buffer rendering. As the result, the pixels, which would normally 
-be rejected by alpha testing, are stored in the depth buffer. This causes 
-artifacts in the produced fog.<O:P></O:P></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US">- The software 
-depth buffer has original (that is low) N64 resolution output. When it is used 
-as a&nbsp;texture, blended with the high-resolution frame buffer, aliasing is 
-visible.<O:P></O:P></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US">Hardware emulation 
-produces perfect fog, but currently it works only on 3dfx Voodoo 4/5's. These 
-cards use the same depth buffer format, as the N64, and they can allocate the 
-depth buffer right in the texture memory, so it can be easily used as a texture, 
-as on N64 hardware. </SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US">In both cases, the 
-<EM><A href="#Depth buffer emulation">'Software depth buffer rendering'</A></EM> option must be on.</SPAN></P><P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"></SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US"><BR><STRONG>On car reflection.</STRONG> Your car (the car 
-you drive) should reflect the environment in this game. That is, various 
-objects, which you roll by, should be reflected on your car. This is implemented 
-via the usage of frame buffer content. Emulation of this effect implies frame 
-buffer emulation. Unfortunately, this can't be done in hardware, because the 
-texture, which is used as a reflection, is not a part of the frame buffer - it 
-is the result of frame buffer post processing, made on the N64 CPU. Thus, the 
-only way to emulate this effect is to use the <EM><A href="#Read every frame">'Read every frame'</A></EM> 
-option. If your hardware allows you to use this option without slowdown, you are 
-lucky.<O:P></O:P></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><O:P></O:P></FONT></SPAN></P><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman">
-</FONT><H5><SPAN lang=EN-US style="mso-ansi-language: EN-US">Bio Hazard 2 / <A name="Resident Evil 2">Resident Evil 
-2</A></SPAN></H5><FONT face="Times New Roman">
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><O:P></O:P></FONT></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US">This game uses 
-pre-rendered depth buffers, which are stored in the game's ROM, and are loaded 
-into the depth buffer memory area each frame before rendering is started. This 
-is hard to emulate, and especially hard to emulate efficiently. The following 
-options must be set:<O:P></O:P></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><EM><A href="#Use_HWFBE">'Hardware frame buffer emulation'</A></EM> - on<O:P></O:P></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><EM><A href="#Depth buffer emulation">'Software depth buffer rendering'</A></EM> - on<O:P></O:P></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><EM><A href="#Use_FBO">'Use Framebuffer Objects'</A></EM> - off<O:P></O:P></SPAN></P>
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><FONT face=Verdana>To get good sound 
-in this game, use Mupen64 with Azimer's HLE sound plugin v.056. However, the 
-game may flicker in some places with Mupen64.</FONT>&nbsp;</FONT></SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman">&nbsp;<O:P></O:P></FONT></SPAN></P><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman">
-</FONT><H5><SPAN lang=EN-US style="mso-ansi-language: EN-US"><A name="Conker's Bad Fur Day">Conker's Bad Fur 
-Day</A></SPAN></H5><FONT face="Times New Roman">
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"></FONT></SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><FONT face=Verdana>The game is well 
-emulated with default settings. However, there are two special effects in this 
-game, which require special settings: the black-and-white "It's war" cut-scene, 
-and the Uga-Buga pixilated effect. To see these effects, set the following 
-options:<BR><EM><A href="#Read every frame">'Read every frame'</A></EM> - on<BR><EM><A href="#RenderN64FB">'Render N64 frame buffer as texture' </A></EM>- on<BR>The game is not 
-playable with these settings, so use them only to see these particular effects. 
-<BR><BR>Note for ATI users: you must&nbsp;set <EM><A href="#Use_FBO">'Use Framebuffer Objects'</A></EM> 
-option on, otherwise the game will work very 
-slow.</FONT></P>
-</FONT><H5><A name="Fushigi no Dungeon">Fushigi no Dungeon</A> - Furai no Shiren 2 
-(J)</H5><FONT face="Times New Roman">
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"></FONT></SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US">To see correct 
-background in menus, either set <A href="#Read every frame"><EM>'Read every frame'</EM></A> option on or set <EM><A href="#Get_FBI">'Get frame buffer info'</A></EM> and run this game with Mupen64.</SPAN></P><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman">
-</FONT><H5><SPAN lang=EN-US style="mso-ansi-language: EN-US">Legend of Zelda, <A name="The - Majora's Mask">The - 
-Majora's Mask</A></SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US"></H5></SPAN><FONT face="Times New Roman">
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"></FONT></SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><FONT face=Verdana>Lens of&nbsp; 
-Truth may not work, if <EM><A href="#Use_FBO">'Use Framebuffer Objects'</A></EM> option set off
-. <BR>Also, when Lens of Truth is used, some 
-objects outside of the lens can be cut. This is not a bug - depth buffer copy 
-must be emulated to&nbsp;fully emulate Lens of Truth. It is currently supported 
-only by 3dfx Voodoo 4/5 cards.</FONT> <BR></FONT></SPAN></P><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman">
-</FONT></FONT><H5>Mario Story / <A name="Paper Mario">Paper Mario</A></H5></SPAN><FONT face="Times New Roman">
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"></FONT></SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US">To see correct 
-background in the menu subscreen, either set the <EM><A href="#Read every frame">'Read every frame'</A></EM> 
-option on or set <EM><A href="#Get_FBI">'Get frame buffer info'</A></EM> and run this game with 
-Mupen64.</SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman">&nbsp;</P></FONT></SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US"><H5><A name="Perfect Dark">Perfect Dark</A></H5><FONT face="Times New Roman">
-<P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"></FONT></SPAN><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><FONT face=Verdana>Frame buffer 
-emulation must be disabled in multiplayer mode to avoid flickering. Most of the 
-special effects used will not work without frame buffer emulation, but it's 
-not&nbsp;that important for multiplayer.</FONT></FONT></SPAN></P><P><SPAN lang=EN-US style="mso-ansi-language: EN-US"><FONT face="Times New Roman"><FONT face=Verdana>For settings for other games check the <A href="Glide64 compatibility list.html">Compatibility List</A>.</FONT></P><P class=MsoNormal style="MARGIN: 0cm 0cm 0pt"><BR></P></FONT></SPAN>
-</BODY></HTML>
\ No newline at end of file
diff --git a/Source/Glide64/Help/Glide64 compatibility list.html b/Source/Glide64/Help/Glide64 compatibility list.html
deleted file mode 100644
index 58d24c4c5..000000000
--- a/Source/Glide64/Help/Glide64 compatibility list.html	
+++ /dev/null
@@ -1,6153 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:x="urn:schemas-microsoft-com:office:excel"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<meta name=ProgId content=Excel.Sheet>
-<meta name=Generator content="Microsoft Excel 11">
-<link rel=File-List href="Glide64%20compatibility%20list_fichiers/filelist.xml">
-<link rel=Edit-Time-Data
-href="Glide64%20compatibility%20list_fichiers/editdata.mso">
-<link rel=OLE-Object-Data
-href="Glide64%20compatibility%20list_fichiers/oledata.mso">
-<title>.::Glide64 compatibility list::.</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:LastAuthor>Olivier</o:LastAuthor>
-  <o:Created>2008-04-01T20:59:16Z</o:Created>
-  <o:LastSaved>2009-07-22T17:34:08Z</o:LastSaved>
-  <o:Version>11.5606</o:Version>
- </o:DocumentProperties>
-</xml><![endif]-->
-<style>
-<!--@page SECTION1
-	{margin-bottom:72pt;
-	margin-left:90pt;
-	margin-right:90pt;
-	margin-top:72pt;
-	mso-footer-margin:35.4pt;
-	mso-header-margin:35.4pt;
-	mso-paper-source-first-page:0;
-	mso-paper-source-other-pages:0;
-	size:612pt 792pt;}
-table
-	{mso-displayed-decimal-separator:"\,";
-	mso-displayed-thousand-separator:" ";}
-@page
-	{margin:.98in .79in .98in .79in;
-	mso-header-margin:.49in;
-	mso-footer-margin:.49in;}
-.font10
-	{color:windowtext;
-	font-size:12.0pt;
-	font-weight:400;
-	font-style:normal;
-	text-decoration:none;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;}
-.font11
-	{color:black;
-	font-size:12.0pt;
-	font-weight:400;
-	font-style:normal;
-	text-decoration:none;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;}
-tr
-	{mso-height-source:auto;}
-col
-	{mso-width-source:auto;}
-br
-	{mso-data-placement:same-cell;}
-.style0
-	{mso-number-format:General;
-	text-align:general;
-	vertical-align:bottom;
-	white-space:nowrap;
-	mso-rotate:0;
-	mso-background-source:auto;
-	mso-pattern:auto;
-	color:windowtext;
-	font-size:10.0pt;
-	font-weight:400;
-	font-style:normal;
-	text-decoration:none;
-	font-family:Arial;
-	mso-generic-font-family:auto;
-	mso-font-charset:0;
-	border:none;
-	mso-protection:locked visible;
-	mso-style-name:Normal;
-	mso-style-id:0;}
-td
-	{mso-style-parent:style0;
-	padding-top:1px;
-	padding-right:1px;
-	padding-left:1px;
-	mso-ignore:padding;
-	color:windowtext;
-	font-size:10.0pt;
-	font-weight:400;
-	font-style:normal;
-	text-decoration:none;
-	font-family:Arial;
-	mso-generic-font-family:auto;
-	mso-font-charset:0;
-	mso-number-format:General;
-	text-align:general;
-	vertical-align:bottom;
-	border:none;
-	mso-background-source:auto;
-	mso-pattern:auto;
-	mso-protection:locked visible;
-	white-space:nowrap;
-	mso-rotate:0;}
-.xl24
-	{mso-style-parent:style0;
-	background:white;
-	mso-pattern:auto none;}
-.xl25
-	{mso-style-parent:style0;
-	color:#993300;
-	font-size:12.0pt;
-	font-weight:700;
-	text-decoration:underline;
-	text-underline-style:single;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl26
-	{mso-style-parent:style0;
-	color:#993300;
-	font-size:12.0pt;
-	font-weight:700;
-	text-decoration:underline;
-	text-underline-style:single;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:.5pt solid black;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl27
-	{mso-style-parent:style0;
-	color:green;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl28
-	{mso-style-parent:style0;
-	color:green;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl29
-	{mso-style-parent:style0;
-	color:#FF6600;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl30
-	{mso-style-parent:style0;
-	color:#FF6600;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl31
-	{mso-style-parent:style0;
-	color:green;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:none;
-	border-left:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl32
-	{mso-style-parent:style0;
-	color:green;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:none;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl33
-	{mso-style-parent:style0;
-	color:green;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl34
-	{mso-style-parent:style0;
-	color:green;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:.5pt solid black;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl35
-	{mso-style-parent:style0;
-	color:red;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl36
-	{mso-style-parent:style0;
-	color:red;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl37
-	{mso-style-parent:style0;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	background:white;
-	mso-pattern:auto none;}
-.xl38
-	{mso-style-parent:style0;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl39
-	{mso-style-parent:style0;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl40
-	{mso-style-parent:style0;
-	color:black;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl41
-	{mso-style-parent:style0;
-	color:black;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl42
-	{mso-style-parent:style0;
-	color:blue;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:none;
-	border-left:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl43
-	{mso-style-parent:style0;
-	color:blue;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:none;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl44
-	{mso-style-parent:style0;
-	color:black;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl45
-	{mso-style-parent:style0;
-	color:black;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:.5pt solid black;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl46
-	{mso-style-parent:style0;
-	color:blue;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:.5pt solid black;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl47
-	{mso-style-parent:style0;
-	color:blue;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl48
-	{mso-style-parent:style0;
-	color:green;
-	font-size:12.0pt;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	vertical-align:top;
-	border-top:none;
-	border-right:.5pt solid black;
-	border-bottom:.5pt solid black;
-	border-left:none;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
-.xl49
-	{mso-style-parent:style0;
-	color:red;
-	font-size:26.0pt;
-	font-weight:700;
-	text-decoration:underline;
-	text-underline-style:single;
-	font-family:"Times New Roman", serif;
-	mso-font-charset:0;
-	text-align:center;
-	background:white;
-	mso-pattern:auto none;
-	white-space:normal;}
--->
-</style>
-<!--[if gte mso 9]><xml>
- <x:ExcelWorkbook>
-  <x:ExcelWorksheets>
-   <x:ExcelWorksheet>
-    <x:Name>Glide64 compatibility list</x:Name>
-    <x:WorksheetOptions>
-     <x:DefaultColWidth>10</x:DefaultColWidth>
-     <x:Print>
-      <x:ValidPrinterInfo/>
-      <x:PaperSizeIndex>9</x:PaperSizeIndex>
-      <x:HorizontalResolution>600</x:HorizontalResolution>
-      <x:VerticalResolution>600</x:VerticalResolution>
-     </x:Print>
-     <x:Selected/>
-     <x:DoNotDisplayGridlines/>
-     <x:LeftColumnVisible>1</x:LeftColumnVisible>
-     <x:Panes>
-      <x:Pane>
-       <x:Number>3</x:Number>
-       <x:RangeSelection>$A$1:$E$1</x:RangeSelection>
-      </x:Pane>
-     </x:Panes>
-     <x:ProtectContents>False</x:ProtectContents>
-     <x:ProtectObjects>False</x:ProtectObjects>
-     <x:ProtectScenarios>False</x:ProtectScenarios>
-    </x:WorksheetOptions>
-   </x:ExcelWorksheet>
-  </x:ExcelWorksheets>
-  <x:WindowHeight>9375</x:WindowHeight>
-  <x:WindowWidth>15195</x:WindowWidth>
-  <x:WindowTopX>0</x:WindowTopX>
-  <x:WindowTopY>45</x:WindowTopY>
-  <x:ProtectStructure>False</x:ProtectStructure>
-  <x:ProtectWindows>False</x:ProtectWindows>
- </x:ExcelWorkbook>
-</xml><![endif]--><u1:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="PlaceType"/><u1:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="PlaceName"/><u1:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="PersonName"/><u1:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="country-region"/><u1:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="State"/><u1:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="City"/><u1:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags" name="place"/>
-</head>
-
-<body link="#003366" vlink=purple class=xl24 lang=EN-GB style='tab-interval:
-36pt'>
-
-<table x:str border=0 cellpadding=0 cellspacing=0 width=973 style='border-collapse:
- collapse;table-layout:fixed;width:729pt'>
- <col class=xl24 width=183 style='mso-width-source:userset;mso-width-alt:6692;
- width:137pt'>
- <col class=xl24 width=107 style='mso-width-source:userset;mso-width-alt:3913;
- width:80pt'>
- <col class=xl24 width=87 style='mso-width-source:userset;mso-width-alt:3181;
- width:65pt'>
- <col class=xl24 width=76 style='mso-width-source:userset;mso-width-alt:2779;
- width:57pt'>
- <col class=xl24 width=520 style='mso-width-source:userset;mso-width-alt:19017;
- width:390pt'>
- <tr height=44 style='mso-height-source:userset;height:33.0pt'>
-  <td colspan=5 height=44 class=xl49 width=973 style='height:33.0pt;width:729pt'
-  x:str="Compatibility List ">Compatibility List<span
-  style='mso-spacerun:yes'>�</span></td>
- </tr>
- <tr height=44 style='mso-height-source:userset;height:33.0pt'>
-  <td colspan=5 height=44 class=xl49 width=973 style='height:33.0pt;width:729pt'>for
-  Glide64 1.0<span lang=EN-US style='mso-ansi-language:EN-US'><u1:p></u1:p></span></td>
- </tr>
- <tr height=17 style='height:12.75pt'>
-  <td height=17 colspan=5 class=xl24 style='height:12.75pt;mso-ignore:colspan'>&nbsp;</td>
- </tr>
- <tr height=42 style='height:31.5pt'>
-  <td height=42 class=xl25 width=183 style='height:31.5pt;width:137pt'
-  x:str="Game Name: "><span lang=NL style='mso-ansi-language:NL'>Game
-  Name:<span style='mso-spacerun:yes'>�</span></span></td>
-  <td class=xl26 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=NL style='mso-ansi-language:NL'>RSP Microcode</span></td>
-  <td class=xl26 width=87 style='width:65pt;padding-bottom:0cm;padding-top:
-  0cm'>Playability Level</td>
-  <td class=xl26 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Relative speed</td>
-  <td class=xl26 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Comments</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:1'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>007 - The World is Not Enough</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:2'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>1080 Snowboarding</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to see correct TV
-  monitors (slow)</td>
- </tr>
- <tr height=21 style='height:15.75pt'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt'>40
-  Winks</td>
-  <td class=xl28 width=107 style='width:80pt'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'>Normal</td>
-  <td class=xl28 width=520 style='width:390pt'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:3'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>64 Oozumou</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:4'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>64 Oozumou 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=43 style='mso-height-source:userset;height:32.25pt;mso-yfti-irow:
-  5'>
-  <td height=43 class=xl27 width=183 style='height:32.25pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>64 Trump Collection - Alice no Wakuwaku
-  Trump World<st1:place u2:st="on"><st1:City u2:st="on"></st1:City></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:6'>
-  <td height=42 class=xl29 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=NL style='mso-ansi-language:
-  NL'>64 de Hakken!! Tamagotchi Minna de Tamagotchi World</span></td>
-  <td class=xl30 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm' x:str="F3DTEX/A ">F3DTEX/A<span style='mso-spacerun:yes'>�</span></td>
-  <td class=xl30 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>3</td>
-  <td class=xl30 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl30 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Major gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:7'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>AI Shogi 3</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use 1964</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:8'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Aerofighter's Assault</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:9'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>AeroGauge</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:10'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Aidyn Chronicles - The First Mage</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:11'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Airboarder 64 ">Airboarder 64<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='mso-height-source:userset;height:31.5pt;mso-yfti-irow:
-  12'>
-  <td height=42 class=xl31 width=183 style='height:31.5pt;width:137pt'>Akumajou
-  Dracula Makushiroku - Real Action Adventure</td>
-  <td class=xl32 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl32 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl32 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl32 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to see correct menu
-  (slow)</td>
- </tr>
- <tr height=63 style='height:47.25pt;mso-yfti-irow:13'>
-  <td height=63 class=xl33 width=183 style='height:47.25pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Akumajou Dracula Makushiroku-Legend of
-  Cornell</td>
-  <td class=xl34 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl34 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl34 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl34 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Enable hi-res mode for correct menus</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:14'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>All Star Tennis '99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:15'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>All-Star Baseball 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Get frame buffer info&quot; option with Mupen or
-  use &quot;Read every frame&quot; option to see correct TV monitors (slow).
-  Minor gfx errors</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:16'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>All-Star Baseball 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Nemu 0.8. Use &quot;Read every frame&quot; option to see
-  correct TV monitors (slow)</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:17'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>All-Star Baseball 2001</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Nemu 0.8. Use &quot;Read every frame&quot; option to see
-  correct TV monitors (slow)</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:18'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Armorines - Project S.W.A.R.M.</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:19'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Army Men - Air Combat</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:20'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Army Men - Sarge's Heroes</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:21'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Army Men - Sarge's Heroes 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:22'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Asteroids Hyper 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:23'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Automobili Lamborghini</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:24'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:City u2:st="on"><st1:place u2:st="on">Baku
-  Bomberman</st1:place></st1:City></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Get frame buffer info&quot; option with Mupen or
-  use &quot;Read every frame&quot; option to see intro correctly (slow)</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:25'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:City u2:st="on"><st1:place u2:st="on">Baku
-  Bomberman 2</st1:place></st1:City></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:26'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bakuretsu Muteki Bangaioh</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:27'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bakushou Jinsei 64 - Mezase! (Game of
-  Life)</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to have correct gfx
-  in game</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:28'>
-  <td height=42 class=xl31 width=183 style='height:31.5pt;width:137pt'>Banjo to
-  Kazooie no Dai Bouken</td>
-  <td class=xl32 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl32 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl32 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl32 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) or &quot;Get
-  frame buffer info&quot; option with Mupen to see puzzle effect &nbsp;&nbsp;</td>
- </tr>
- <tr height=21 style='mso-height-source:userset;height:15.75pt;mso-yfti-irow:
-  29'>
-  <td height=21 class=xl33 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Banjo to Kazooie no Dai Bouken 2</td>
-  <td class=xl34 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl34 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl34 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl34 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:30'>
-  <td height=42 class=xl31 width=183 style='height:31.5pt;width:137pt'>Banjo-Kazooie</td>
-  <td class=xl32 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl32 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl32 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl32 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) or &quot;Get
-  frame buffer info&quot; option to see puzzle effect with
-  Mupen&nbsp;&nbsp;&nbsp;</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:31'>
-  <td height=21 class=xl33 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Banjo-Tooie</td>
-  <td class=xl34 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl34 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl34 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl34 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:32'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bass Hunter 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:33'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bass Rush - ECOGEAR PowerWorm
-  Championship</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:34'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bass Tsuri No.1 - Shigesato Itoi's Bass
-  Fishing</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:35'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bassmasters 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:36'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Batman Beyond - Return of the Joker</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:37'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>BattleTanx</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:38'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>BattleTanx - Global Assault</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:39'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Battlezone - Rise of the Black Dogs<u1:p></u1:p></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX<u1:p></u1:p></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5<u1:p></u1:p></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Normal<u1:p></u1:p></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible<u1:p></u1:p></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:40'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Beetle Adventure Racing</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:41'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Big Mountain 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:42'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bio F.R.E.A.K.S.</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:43'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bio Hazard 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:44'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Blast Corps</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:45'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Blast Dozer</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:46'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Blues Brothers 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:47'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Body Harvest</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) or &quot;Get
-  frame buffer info&quot; with Mupen to have correct menu</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:48'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bokujo Monogatari 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:49'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bomberman 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Get frame buffer info&quot; option with Mupen or
-  use &quot;Read every frame&quot; option to see intro correctly (slow)</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:50'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bomberman64 - The Second Attack</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:51'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bomberman Hero</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm' x:str="Compatible. ">Compatible.<span style='mso-spacerun:yes'>�</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:52'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bottom of the 9th</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) to see
-  correct intro</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:53'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:place u2:st="on"><st1:City u2:st="on">Brunswick
-  Circuit Pro Bowling</st1:City></st1:place><u1:p></u1:p></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX<u1:p></u1:p></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5<u1:p></u1:p></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast<u1:p></u1:p></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible<u1:p></u1:p></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:54'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Buck Bumble</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:55'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bug's Life, A</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:56'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bust-A-Move '99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:57'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bust-A-Move 2 - Arcade Edition<st1:place u2:st="on"></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:58'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Bust-A-Move 3 DX</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:59'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:State u2:st="on"><st1:place u2:st="on">California
-  Speed</st1:place></st1:State></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:60'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Carmageddon 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:61'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt'>Castlevania</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to see correct menu
-  (slow)</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:62'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Castlevania - Legacy of Darkness</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Enable hi-res mode for correct menus</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:63'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Centre Court Tennis</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:64'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Chameleon Twist</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:65'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Chameleon Twist 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:66'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Charlie Blast's Territory</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:67'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Chopper Attack</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:68'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Choro Q 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:69'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Choro Q 64 II</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) or &quot;Get
-  frame buffer info&quot; option with Mupen to see correct menu</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:70'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Chou Kuukan Night Pro Yakyuu King</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:71'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Chou Kuukan Night Pro Yakyuu King 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:72'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Chou Snobow Kids</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:73'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>City-Tour GP - Zennihon GT Senshuken</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:74'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Clay Fighter - Sculptor's Cut</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:75'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Clay Fighter 63 1-3</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:76'>
-  <td height=21 class=xl29 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Command &amp; Conquer</td>
-  <td class=xl30 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl30 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>3</span></td>
-  <td class=xl30 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl30 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Not playable</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:77'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Conker's Bad Fur Day</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEXGB2.08</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) to get black
-  and white effect during &#8220;It&#8217;s war&#8221; cut scene and Buga
-  pixellisation effect</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:78'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Cruis'n Exotica</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:79'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Cruis'n USA<st1:country-region u2:st="on"><st1:place u2:st="on"></st1:place></st1:country-region></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:80'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Cruis'n World</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:81'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Custom Robo</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:82'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Custom Robo V2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:83'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="CyberTiger ">CyberTiger<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:84'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Dance Dance Revolution - Disney Dancing
-  Museum</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:85'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Dark Rift</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>TURBO3D</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'>Normal</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:86'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Deadly Arts</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:87'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>D�fi au Tetris Magique</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:88'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Densha de GO! 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use 1964</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:89'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:City u2:st="on"><st1:place u2:st="on">Derby
-  Stallion</st1:place></st1:City></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Nemu 0.8</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:90'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Destruction Derby 64<st1:City u2:st="on"><st1:place u2:st="on"></st1:place></st1:City></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:91'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Dezaemon 3D</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:92'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Diddy Kong Racing</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=NL style='mso-ansi-language:NL'>RSP SW DKR</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:93'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Disney's Donald Duck - Goin' Quackers</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to see correct
-  transition effects in menu</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:94'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Disney's Tarzan</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:place u2:st="on"><st1:City u2:st="on">Normal</st1:City></st1:place></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:95'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Donald Duck - Quack Attack</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to see correct
-  transition effect in menu</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:96'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Donkey Kong 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:97'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Doom 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:98'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Doraemon - Mittsu no Seireiseki</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:99'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Doraemon 2 - Hikari no Shinden</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:100'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Doraemon 3 - Nobi Dai no Machi SOS!</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm' x:str="Compatible. Use 1964 "><span lang=DE style='mso-ansi-language:
-  DE'>Compatible. Use 1964<span style='mso-spacerun:yes'>�</span></span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:101'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Doubutsu no Mori</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Normal</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:102'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Dr. Mario 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:103'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Dual Heroes</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:104'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Duck Dodgers Starring Daffy Duck</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:105'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Duke Nukem - ZER0 H0UR</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:106'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Duke Nukem 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSPSW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:107'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>ECW Hardcore Revolution</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:108'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Earthworm Jim 3D</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:109'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Eikou no Saint Andrew</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>2</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible, Use &quot;Read every frame&quot; option (slow) or &quot;Get
-  frame buffer info&quot; with Mupen to have correct background in game</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:110'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Elmo's Letter Adventure</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:111'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Elmo's Number Journey</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:112'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Eltale Monsters</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:113'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Excitebike 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:114'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Extreme-G</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm' x:str="Compatible. Minor gfx errors ">Compatible. Minor gfx errors<span
-  style='mso-spacerun:yes'>�</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:115'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Extreme-G XG2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:116'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>F-1 Pole Position 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) or &quot;Get
-  frame buffer info&quot; with Mupen to have correct menu</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:117'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>F-1 World Grand Prix</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:118'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>F-1 World Grand Prix II</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:119'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>F-Zero X</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:120'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>F1 Racing Championship</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Mupen</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:121'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>FIFA - Road to World Cup 98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:122'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>FIFA 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:123'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>FIFA Soccer 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use 1964</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:124'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Famista 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) or &quot;Get
-  frame buffer info&quot; with Mupen to have ground in game</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:125'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Fighter Destiny 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:126'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Fighter's Destiny</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:127'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Fighting Cup</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:128'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Fighting Force 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:129'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Fire Electric Pen</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:130'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Flying Dragon</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:131'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Forsaken 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt'>Frogger
-  2 (Alpha)</td>
-  <td class=xl28 width=107 style='width:80pt'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:132'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>FoxSportsCollege Hoops &#8216;99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:133'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Fushigi no Dungeon - Fuurai no Shiren 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'
-  x:str="Compatible. Use &quot;Read every frame&quot; option (slow) or &quot;Get frame buffer info&quot; with Mupen to have backgrounds in menus ">Compatible.
-  Use &quot;Read every frame&quot; option (slow) or &quot;Get frame buffer
-  info&quot; with Mupen to have backgrounds in menus<span
-  style='mso-spacerun:yes'>�</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:134'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>G.A.S.P! Fighter's NEXTream</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use (J) version or use Mupen</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:135'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>GT 64 - Championship Edition</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=63 style='height:47.25pt;mso-yfti-irow:136'>
-  <td height=63 class=xl27 width=183 style='height:47.25pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=NL style='mso-ansi-language:
-  NL'>Ganbare Goemon - Derudero Douchuu Obake Tenkomori</span><span lang=DE
-  style='mso-ansi-language:DE'><u1:p></u1:p></span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=NL style='mso-ansi-language:NL'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=NL style='mso-ansi-language:NL'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=NL style='mso-ansi-language:NL'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:137'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Ganbare Goemon - Mononoke Sugoroku</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=63 style='height:47.25pt;mso-yfti-irow:138'>
-  <td height=63 class=xl27 width=183 style='height:47.25pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Ganbare Goemon - Neo Momoyama Bakufu no
-  Odori</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:139'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Ganbare Nippon Olympics 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:140'>
-  <td height=21 class=xl35 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Gauntlet Legends</td>
-  <td class=xl36 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl36 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>2</td>
-  <td class=xl36 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl36 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Missing gfx. Flickerings. Use PJ64</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:141'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Getter Love !! Cho Renai Party Game</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:142'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Gex 3 - Deep Cover Gecko</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:143'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Gex 64 - Enter the Gecko</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:144'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Glover</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible (For (E) version use Mupen)</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:145'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Goemon's Great Adventure</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:146'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Golden Nugget 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use 1964 or Mupen</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:147'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>GoldenEye 007</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0G</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:148'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>HVS Adventure Racing</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64 Audio Fix Edition</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:149'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hamster Monogatari 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:150'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hanafuda 64 - Tenshi no Yakusoku</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use 1964</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:151'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Harukanaru Augusta Masters 98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:152'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Harvest Moon 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:153'>
-  <td height=21 class=xl29 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Heiwa Pachinko World 64</td>
-  <td class=xl30 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl30 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>3</td>
-  <td class=xl30 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl30 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Gfx errors</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:154'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hercules - The Legendary Journeys</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=22 style='mso-height-source:userset;height:16.5pt;mso-yfti-irow:
-  155'>
-  <td height=22 class=xl27 width=183 style='height:16.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hexen</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) to see texts
-  at objectives screen</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:156'>
-  <td height=21 class=xl29 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hey You, Pikachu!</td>
-  <td class=xl30 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl30 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>3</td>
-  <td class=xl30 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl30 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Gfx errors (needs voice pak)</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:157'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hiryuu no Ken Twin</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:158'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Holy Magic Century</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:159'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hoshi no Kirby 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Mupen for correct status bar</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:160'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hot Wheels Turbo Racing</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:161'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Human Grand Prix - New Generation</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) or &quot;Get
-  frame buffer info&quot; with Mupen to have correct menu</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:162'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hybrid Heaven</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:163'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Hydro Thunder</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:164'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Ide Yosuke no Mahjong Juku</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm' x:str="Normal "><st1:City u2:st="on"><st1:place u2:st="on">Normal<span
-  style='mso-spacerun:yes'>�</span></st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Nemu 0.8 (disable audio HLE)</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:165'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Iggy's Reckin' Balls</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:166'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Iggy-kun no Bura Bura Poyon</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:167'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>In-Fisherman Bass Hunter 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:168'>
-  <td height=42 class=xl38 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:place u2:st="on"><st1:State u2:st="on">Indiana
-  Jones and the Infernal Machine</st1:State></st1:place></td>
-  <td class=xl39 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>0</td>
-  <td class=xl39 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Unsupported.<font class="font11"> Microcode not implemented</font></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:169'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Indy Racing 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:170'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>International Superstar Soccer '98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'
-  x:str="Compatible. Use &#8220;Read every frame&#8221; option to see correct effects after scoring a goal  ">Compatible.
-  Use &#8220;Read every frame&#8221; option to see correct effects after
-  scoring a goal<span style='mso-spacerun:yes'>��</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:171'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>International Superstar Soccer 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'
-  x:str="Compatible. Use &#8220;Read every frame&#8221; option to see correct effects after scoring a goal  ">Compatible.
-  Use &#8220;Read every frame&#8221; option to see correct effects after
-  scoring a goal<span style='mso-spacerun:yes'>��</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:172'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>International Superstar Soccer 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:173'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>International Track &amp;&nbsp; Field
-  2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:174'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>International Track &amp; Field Summer
-  Games</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:175'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>J. League Dynamite Soccer 64<u1:p></u1:p></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX<u1:p></u1:p></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5<u1:p></u1:p></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City><u1:p></u1:p></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible<u1:p></u1:p></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:176'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>J. League Eleven Beat 1997</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:177'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>J. League Live 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:178'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>J. League Tactics Soccer</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:179'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jangou Simulation Mahjong Do 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:180'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jeopardy!</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:181'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jeremy McGrath Supercross 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:182'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jet Force Gemini</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW RARE4<st1:place u2:st="on"></st1:place></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:183'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou G1 Stable</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:184'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou J. League 1999 - Perfect Striker
-  2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'
-  x:str="Compatible. Use &#8220;Read every frame&#8221; option to see correct effects after scoring a goal  ">Compatible.
-  Use &#8220;Read every frame&#8221; option to see correct effects after
-  scoring a goal<span style='mso-spacerun:yes'>��</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:185'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou J. League Perfect Striker</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'
-  x:str="Compatible. Use &#8220;Read every frame&#8221; option to see correct effects after scoring a goal  ">Compatible.
-  Use &#8220;Read every frame&#8221; option to see correct effects after
-  scoring a goal<span style='mso-spacerun:yes'>��</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:186'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou Powerful Pro Yakyuu - Basic Han
-  2001</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:187'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou Powerful Pro Yakyuu 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:188'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou Powerful Pro Yakyuu 4</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:189'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou Powerful Pro Yakyuu 5</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:190'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou Powerful Pro Yakyuu 6</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:191'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou World Cup France '98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'
-  x:str="Compatible. Use &#8220;Read every frame&#8221; option to see correct effects after scoring a goal  ">Compatible.
-  Use &#8220;Read every frame&#8221; option to see correct effects after
-  scoring a goal<span style='mso-spacerun:yes'>��</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:192'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jikkyou World Soccer 3</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:193'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Jinsei Game 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:194'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>John Romero's Daikatana</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:195'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Kakutou Denshou - F-Cup Maniax</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:196'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Ken Griffey Jr.'s Slugfest</span><span lang=DE style='mso-ansi-language:
-  DE'><u1:p></u1:p></span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:197'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Killer Instinct Gold</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='mso-height-source:userset;height:15.75pt;mso-yfti-irow:
-  198'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>King Hill 64 - Extreme Snowboarding</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors.</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:199'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Kiratto Kaiketsu! 64 Tanteidan</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:200'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Kirby 64 - The Crystal Shards<st1:City u2:st="on"><st1:place u2:st="on"></st1:place></st1:City></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Mupen for correct status bar</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:201'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Knife Edge - Nose Gunner</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:202'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Knockout Kings 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use 1964. Minor gfx errors</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:203'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:place u2:st="on"><st1:City u2:st="on">Kobe
-  Bryant NBA Courtside</st1:City></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:204'>
-  <td height=21 class=xl35 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Kuiki-Uhabi-Suigo</td>
-  <td class=xl36 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl36 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>2</td>
-  <td class=xl36 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl36 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:205'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>LEGO Racers</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Depends</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:206'>
-  <td height=21 class=xl40 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Last Legion UX</td>
-  <td class=xl39 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>0</td>
-  <td class=xl39 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl41 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Unsupported<font class="font10">.</font><font class="font11"> Microcode
-  not implemented</font></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:207'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Legend of Zelda, The - Ocarina of Time</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX 2.06H</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>*Mostly* Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:208'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Legend of Zelda 2, The - Majora's Mask</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='mso-height-source:userset;height:15.75pt;mso-yfti-irow:
-  209'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Legend of Zelda, The - Ocarina of Time -
-  Master Quest</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX 2.06H</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>*Mostly* Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:210'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Les Razmoket - La Chasse aux Tr�sors<st1:PersonName ProductID="La Chasse" u2:st="on"></st1:PersonName></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:211'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Let's Smash Tennis</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:212'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Lode Runner 3-D</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:213'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Looney Tunes - Duck Dodgers</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:214'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Lylat Wars</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:215'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>MRC - Multi Racing Championship</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:216'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mace - The Dark Age</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible.</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:217'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Madden Football 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:218'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Madden NFL 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:219'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Madden NFL 2001</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:220'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Madden NFL 2002</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:221'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Madden NFL 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:222'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Magical Tetris Challenge</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:223'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mahjong 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:224'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mahjong Hourouki Classic</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:225'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mahjong Master</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minors gfx errors</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:226'>
-  <td height=42 class=xl29 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Major League Baseball Featuring Ken
-  Griffey Jr.</td>
-  <td class=xl30 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl30 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>3</td>
-  <td class=xl30 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl30 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:227'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mario Golf</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:228'>
-  <td height=42 class=xl31 width=183 style='height:31.5pt;width:137pt'>Mario
-  Kart 64</td>
-  <td class=xl32 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl32 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl32 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl32 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &#8220;Read every frame&#8221; option (slow) or use
-  &quot;Get frame buffer info&quot; with Mupen to see correct billboards</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:229'>
-  <td height=21 class=xl33 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mario Party</td>
-  <td class=xl34 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl34 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl34 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl34 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:230'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mario Party 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:231'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mario Party 3</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:232'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mario Story</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:233'>
-  <td height=21 class=xl42 width=183 style='height:15.75pt;width:137pt'>Mario
-  Tennis</td>
-  <td class=xl43 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl43 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>4</td>
-  <td class=xl43 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Unstable</td>
-  <td class=xl43 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Various gfx errors.</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:234'>
-  <td height=21 class=xl44 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mario No Photopie</td>
-  <td class=xl45 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl45 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>0</td>
-  <td class=xl45 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl45 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Unsupported</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:235'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mega Man 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:236'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mia Hamm Soccer</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>ZSortp 0.33</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'><span lang=DE style='mso-ansi-language:
-  DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minors gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:237'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=NL style='mso-ansi-language:
-  NL'>Michael Owens WLS 2000</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>ZSortp 0.33</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'><span lang=DE style='mso-ansi-language:
-  DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minors gfx errors</td>
- </tr>
- <tr height=21 style='mso-height-source:userset;height:15.75pt;mso-yfti-irow:
-  238'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mickey no Racing Challenge USA<st1:place u2:st="on"><st1:country-region u2:st="on"></st1:country-region></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW RARE4<st1:place u2:st="on"></st1:place></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='mso-height-source:userset;height:15.75pt;mso-yfti-irow:
-  239'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mickey's Speedway USA<st1:City u2:st="on"></st1:City><st1:place u2:st="on"><st1:country-region u2:st="on"></st1:country-region></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW RARE4<st1:place u2:st="on"></st1:place></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:240'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Micro Machines 64 Turbo</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:241'>
-  <td height=42 class=xl29 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Midway's Greatest Arcade Hits Volume 1<st1:place u2:st="on"></st1:place></td>
-  <td class=xl30 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl30 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>3</td>
-  <td class=xl30 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl30 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Only few games are fully playable</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:242'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mike Piazza's Strike Zone</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:243'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:place u2:st="on">Milo's Astro Lanes</st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:244'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mischief Makers</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:245'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:City u2:st="on"><st1:place u2:st="on">Mission
-  Impossible</st1:place></st1:City></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:246'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:country-region u2:st="on"><st1:place u2:st="on">Monaco
-  Grand Prix</st1:place></st1:country-region></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Mupen64</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:247'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:country-region u2:st="on"><st1:place u2:st="on">Monaco
-  Grand Prix - Racing Simulation 2</st1:place></st1:country-region></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use 1964</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:248'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Monopoly</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:249'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Monster Truck Madness 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:250'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Morita Shougi 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:251'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mortal Kombat 4</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Scene dependent</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:252'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mortal Kombat Mythologies - Sub-Zero</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:253'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Mortal Kombat Trilogy</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>RSP SW 0.2X</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:254'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Ms. Pac-Man - Maze Madness</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Normal</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:255'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'
-  x:str="Mystical Ninja 2 - Starring Goemon ">Mystical Ninja 2 - Starring
-  Goemon<span style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:256'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Mystical Ninja - Starring Goemon</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:257'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NASCAR 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:258'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NASCAR 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:259'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA Courtside 2 - Featuring Kobe Bryant<st1:place u2:st="on"><st1:City u2:st="on"></st1:City></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:260'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA Hangtime</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:261'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA In the Zone '98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:262'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA In the Zone '99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:263'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA In the Zone 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:264'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA In the Zone 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:265'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA Jam 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:266'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA Jam 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:267'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA Live 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:268'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA Live 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:269'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NBA Showtime - NBA on NBC</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:270'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>NFL Blitz</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:271'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NFL Blitz - Special Edition</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:272'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NFL Blitz 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:273'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NFL Blitz 2001</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:274'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NFL Quarterback Club 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Nemu 0.8</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:275'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NFL Quarterback Club 2001</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Nemu 0.8</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:276'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NFL Quarterback Club 98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Mupen</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:277'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NFL Quarterback Club 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use Nemu 0.8</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:278'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NHL 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:279'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NHL Blades of Steel '99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:280'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NHL Breakaway 98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:281'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NHL Breakaway 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:282'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>NHL Pro 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:283'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:City u2:st="on"><st1:place u2:st="on">Nagano
-  Winter Olympics '98</st1:place></st1:City></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:284'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:place u2:st="on"><st1:PlaceName u2:st="on">Namco
-  Museum 64</st1:PlaceName><st1:PlaceType u2:st="on"></st1:PlaceType></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:285'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Neon Genesis Evangelion</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:286'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>New Tetris, The</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'
-  x:str="Compatible. Use Mupen&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ">Compatible.
-  Use
-  Mupen&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span
-  style='mso-spacerun:yes'>�</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:287'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Nightmare Creatures</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:288'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Nintama Rantarou Gallery 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:289'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Nintendo All-Star! Dairantou Smash
-  Brothers</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:290'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Nuclear Strike 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:291'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Nushi Zuri 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &#8220;Read every frame&#8221; option (slow) or use
-  &quot;Get frame buffer info&quot; with Mupen to have backgrounds in game</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:292'>
-  <td height=42 class=xl35 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Nushi Zuri 64 - Shiokaze ni Notte</td>
-  <td class=xl36 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl36 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>2</td>
-  <td class=xl36 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl36 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Missing gfx in game</td>
- </tr>
- <tr height=21 style='height:15.75pt'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt'>O.D.T</td>
-  <td class=xl28 width=107 style='width:80pt'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'>Normal</td>
-  <td class=xl28 width=520 style='width:390pt'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:293'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Off Road Challenge</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=63 style='height:47.25pt;mso-yfti-irow:294'>
-  <td height=63 class=xl27 width=183 style='height:47.25pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Ogre Battle 64 - Person of Lordly Caliber<st1:place u2:st="on"><st1:City u2:st="on"></st1:City></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64 or 1964 0.8.5 (Win9X users must use 1964 0.8.5 or
-  Nemu 0.8, to get backgrounds). Use &quot;Read every frame&quot; option to see
-  screen transition effects (slow)</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:295'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Olympic Hockey Nagano '98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:296'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Onegai Monster</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:297'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Operation WinBack</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible, but a gray square sometimes appear on the screen. Missing
-  sky</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:298'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>PD Ultraman Battle Collection 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:299'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>PGA European Tour</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:300'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Pachinko 365 Nichi</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>2</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:301'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Paper Mario</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:302'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Paperboy</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:303'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Parlor! Pro 64 Pachinko Jikki Simulation
-  Game</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:304'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Penny Racers</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=47 style='mso-height-source:userset;height:35.45pt;mso-yfti-irow:
-  305'>
-  <td height=47 class=xl27 width=183 style='height:35.45pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Perfect Dark</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW PD</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; (slow) or &quot;Get frame
-  buffer info&quot; with Mupen to get correct pause menu in game</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:306'>
-  <td height=21 class=xl29 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Pikachu Genki Dechu</td>
-  <td class=xl30 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl30 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>3</td>
-  <td class=xl30 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl30 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Gfx errors (needs voice pak)</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:307'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Pilot Wings<u1:p></u1:p></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX<u1:p></u1:p></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5<u1:p></u1:p></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast<u1:p></u1:p></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible<u1:p></u1:p></td>
- </tr>
- <tr class=xl24 height=21 style='mso-height-source:userset;height:15.75pt;
-  mso-yfti-irow:308'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt'>Pocket
-  Monsters Snap</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option when selecting shots
-  for professor Oak</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:309'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Pokemon Puzzle League</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=22 style='mso-height-source:userset;height:16.5pt;mso-yfti-irow:
-  310'>
-  <td height=22 class=xl27 width=183 style='height:16.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Pokemon Snap</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option when selecting shots
-  for professor Oak</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:311'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Pokemon Stadium</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:312'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Pokemon Stadium 2</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Normal</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:313'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Polaris SnoCross</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:314'>
-  <td height=21 class=xl28 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Power League Baseball 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>4</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:315'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Power Rangers - Lightspeed Rescue</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:316'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Powerpuff Girls, The - Chemical
-  X-traction<u1:p></u1:p></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX<u1:p></u1:p></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5<u1:p></u1:p></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City><u1:p></u1:p></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible<u1:p></u1:p></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:317'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Premier Manager 64</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:318'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Pro Mahjong Kiwame 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:319'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Pro Majhong Tsuwamono 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:320'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Puyo Puyo 4 - Puyo Puyo Party</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:321'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Puyo Puyo Sun 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:322'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Puzzle Bobble 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:323'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Quake 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:324'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Quake II</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible, Use &quot;Read every frame&quot; (slow) or &quot;Get frame
-  buffer info&quot; with Mupen to get correct pause menu in game</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:325'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Quest 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:326'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>RR64 - Ridge Racer 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Pause menu doesn't work correctly with Voodoo 1-3</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:327'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>RTL World League Soccer 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>ZSortp 0.33</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'><span lang=DE style='mso-ansi-language:
-  DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:328'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Racing Simulation 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use 1964. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:329'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rakuga Kids</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:330'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rally '99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:331'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rally Challenge 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:332'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rampage - World Tour</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:333'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rampage 2 - Universal Tour</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:334'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rat Attack</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:335'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rayman 2 - The Great Escape</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to see correct
-  transition effects in game</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:336'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Razor Freestyle Scooter</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:337'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Re-Volt</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:338'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Ready 2 Rumble Boxing</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:339'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Ready 2 Rumble Boxing Round 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:340'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Resident Evil 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:341'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Road Rash 64 ">Road Rash 64<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:342'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Roadsters</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt'>Robotech
-  - Crystal Dreams (Beta)</td>
-  <td class=xl28 width=107 style='width:80pt'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'>Normal</td>
-  <td class=xl28 width=520 style='width:390pt'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:343'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Robot Ponkottsu 64 - Caramel of the 7
-  Seas</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:344'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Robotron 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:345'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rocket - Robot on Wheels</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:346'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rockman Dash</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:347'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rugrats - Scavenger Hunt</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:348'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rugrats - Treasure Hunt</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:349'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Rugrats in Paris - The Movie<st1:place u2:st="on"><st1:City u2:st="on"></st1:City></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:350'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Rush 2 - Extreme Racing USA "><span
-  lang=DE style='mso-ansi-language:DE'>Rush 2 - Extreme Racing USA<span
-  style='mso-spacerun:yes'>�</span></span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Normal</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:351'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>S.C.A.R.S.</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:352'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>SD Hiryuu no Ken Densetsu</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:353'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>San Francisco Rush - Extreme Racing</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:354'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>San Francisco Rush 2049</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:355'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Scooby-Doo - Classic Creep Capers</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Sky in game doesn't work correctly with Voodoo 1-3</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:356'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Shadow Man ">Shadow Man<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option (slow) or &quot;Get
-  frame buffer info&quot; with Mupen to have correct pause menu in game</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:357'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Shadowgate 64 - Trials of the Four Towers<st1:place u2:st="on"><st1:PlaceName u2:st="on"></st1:PlaceName><st1:PlaceType u2:st="on"></st1:PlaceType></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:358'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Sim City 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:359'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Snow Speeders</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:360'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Snowboard Kids</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:361'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Snowboard Kids 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:362'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Sonic Wings Assault</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:363'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:place u2:st="on"><st1:PlaceName u2:st="on">South
-  Park</st1:PlaceName><st1:PlaceType u2:st="on"></st1:PlaceType></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:364'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>SouthPark - Chef's Luv Shack</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:365'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:place u2:st="on"><st1:PlaceName u2:st="on">South
-  Park Rally</st1:PlaceName><st1:PlaceType u2:st="on"></st1:PlaceType></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:366'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Space Dynamites</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>TURBO3D</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'>Normal</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:367'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Space Invaders ">Space
-  Invaders<span style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:368'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Space Station Silicon Valley</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Normal</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:369'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Spider-Man "><span lang=DE
-  style='mso-ansi-language:DE'>Spider-Man<span
-  style='mso-spacerun:yes'>�</span></span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Compatible</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:370'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Star Fox 64</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:371'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Star Soldier - Vanishing Earth</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:372'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Star Twins</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW RARE4<st1:place u2:st="on"></st1:place></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Get frame buffer info&quot; option with Mupen or
-  use &#8220;Read every frame&#8221; option (slow) to see correct TV</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:373'>
-  <td height=42 class=xl38 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Star Wars - Rogue Squadron</td>
-  <td class=xl39 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>0</td>
-  <td class=xl39 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Unsupported.<font class="font11"> Microcode not implemented</font></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:374'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Star Wars - Shadows of the Empire</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0D EXT</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:375'>
-  <td height=42 class=xl38 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Star Wars Episode I - Battle for Naboo</td>
-  <td class=xl39 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>0</td>
-  <td class=xl39 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Unsupported.<font class="font11"> Microcode not implemented</font></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:376'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Star Wars Episode I - Racer</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:377'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="StarCraft 64 ">StarCraft 64<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:378'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Starshot - Space Circus Fever</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:379'>
-  <td height=21 class=xl38 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Stunt Racer 64</td>
-  <td class=xl39 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>0</td>
-  <td class=xl39 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Unsupported</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:380'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Super B-Daman - Battle Phoenix 64<st1:City u2:st="on"></st1:City><st1:place u2:st="on"><st1:City u2:st="on"></st1:City></st1:place></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:381'>
-  <td height=21 class=xl29 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Super Bowling 64</td>
-  <td class=xl30 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl30 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>3</td>
-  <td class=xl30 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl30 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:382'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Super Mario 64 ">Super Mario
-  64<span style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:383'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Super Robot Spirits</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:384'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Super Robot Taisen 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:385'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Super Smash Bros.</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:386'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Super Speed Race 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:387'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Supercross 2000<u1:p></u1:p></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX<u1:p></u1:p></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5<u1:p></u1:p></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City><u1:p></u1:p></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible<u1:p></u1:p></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:388'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Superman ">Superman<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:389'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Susume! taisen puzzle dama toukon !
-  Marumata Chou</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:390'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Taz Express</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm' x:str="Compatible. Use Mupen 0.4 ">Compatible. Use Mupen 0.4<span
-  style='mso-spacerun:yes'>�</span></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:391'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Telefoot Soccer 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>ZSortp 0.33</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:392'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tetris 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:393'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tetrisphere</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:394'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tigger's Honey Hunt</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:395'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tom Clancy's Rainbow Six</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:396'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tom and Jerry in Fists of Furry</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:397'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tonic Trouble</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to see correct
-  transition effects for pause menu in game</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:398'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tony Hawk's Pro Skater</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use PJ64</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:399'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tony Hawk's Pro Skater 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:400'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tony Hawk's Pro Skater 3</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt'>Toon
-  Panic</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt'><span lang=DE style='mso-ansi-language:
-  DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:401'>
-  <td height=21 class=xl35 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Top Gear Hyper-Bike</td>
-  <td class=xl36 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl36 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>2</td>
-  <td class=xl36 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl36 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Major gfx errors. Use Mupen</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:402'>
-  <td height=21 class=xl46 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Top Gear Overdrive</td>
-  <td class=xl47 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl47 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>4</td>
-  <td class=xl47 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl47 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Gfx errors. Use Mupen</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:403'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Top Gear Rally</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:404'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Top Gear Rally 2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:405'>
-  <td height=21 class=xl40 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Toukon Roads</td>
-  <td class=xl41 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl41 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>0</td>
-  <td class=xl41 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl41 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Unsupported<font class="font10">.</font><font class="font11"> Microcode
-  not implemented</font></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:406'>
-  <td height=21 class=xl40 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Toukon Roads 2</td>
-  <td class=xl41 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl41 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>0</td>
-  <td class=xl41 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl41 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Unsupported<font class="font10">.</font><font class="font11"> Microcode
-  not implemented</font></td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:407'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Toy Story 2 ">Toy Story 2<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:408'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Transformers - Beast Wars Metals 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:409'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Transformers - Beast Wars Transmetal</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:410'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Triple Play 2000 ">Triple Play
-  2000<span style='mso-spacerun:yes'>�</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Get frame buffer info&quot; option with Mupen or
-  use &quot;Read every frame&quot; option to see correct TV monitors (slow)</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:411'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Tsumi to Batsu - Chikyuu no Keishousha</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:412'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><span lang=DE style='mso-ansi-language:
-  DE'>Turok - Dinosaur Hunter</span></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:413'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Turok - Rage Wars</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:414'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Turok 2 - Seeds of Evil</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:415'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Turok 3 - Shadow of Oblivion</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='mso-height-source:userset;height:15.75pt;mso-yfti-irow:
-  416'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Twisted Edge Extreme Snowboarding</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:417'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>V-Rally Edition 99</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:418'>
-  <td height=21 class=xl35 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm' x:str="Vigilante 8 ">Vigilante 8<span
-  style='mso-spacerun:yes'>�</span></td>
-  <td class=xl36 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl36 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>2</td>
-  <td class=xl36 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl36 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Many gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:419'>
-  <td height=21 class=xl35 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Vigilante 8 - 2nd Offense</td>
-  <td class=xl36 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl36 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>2</td>
-  <td class=xl36 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl36 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Many gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:420'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Virtual Chess 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:421'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Virtual Pool 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:422'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Virtual Pro Wrestling 2&nbsp; - Oudou
-  Keishou</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to see motion blur
-  effects during intro</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:423'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Virtual Pro Wrestling 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:424'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WCW Backstage Assault</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:425'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WCW Mayhem</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:426'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WCW Nitro</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:427'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WCW vs. nWo - World Tour</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:428'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WCW-nWo Revenge</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:429'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WWF - War Zone</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Get frame buffer info&quot; option with Mupen or
-  use &quot;Read every frame&quot; option to see correct TV monitors (slow)</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:430'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WWF Attitude</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:431'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WWF No Mercy</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:432'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WWF WrestleMania 2000</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Use &quot;Read every frame&quot; option to see motion blur
-  effects during intro</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:433'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Waialae Country Club - True Golf Classics</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible. Minor gfx errors</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:434'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>War Gods</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:435'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Wave Race 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0D EXT</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:436'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Wave Race 64 Shindou Edition</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:437'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Wayne Gretzky's 3D Hockey '98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX1.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:438'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Wetrix</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:439'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Wheel of Fortune</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Slow</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:440'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Wild Choppers</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:441'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>WinBack - Covert Operations</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible, but a gray square sometimes appear on the screen. Missing
-  sky</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:442'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Wipeout 64</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:443'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Wonder Project J2</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:444'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>World Cup 98</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:445'>
-  <td height=21 class=xl38 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>World Driver Championship</td>
-  <td class=xl39 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>0</td>
-  <td class=xl39 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>?</td>
-  <td class=xl39 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Unsupported</td>
- </tr>
- <tr height=21 style='height:15.75pt;mso-yfti-irow:446'>
-  <td height=21 class=xl27 width=183 style='height:15.75pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'><st1:City u2:st="on"><st1:place u2:st="on">Worms
-  - Armageddon</st1:place></st1:City></td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:447'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Xena Warrior Princess - Talisman of Fate</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>F3DEX2.XX</span></td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num><span lang=DE style='mso-ansi-language:DE'>5</span></td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><span lang=DE style='mso-ansi-language:DE'>Fast</span></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:448'>
-  <td height=42 class=xl46 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Yakouchuu II - Satsujun Kouru</td>
-  <td class=xl47 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl47 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>4</td>
-  <td class=xl47 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl47 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Use Nemu 0.8 (disable audio HLE). No movies</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:449'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Yoshi's Story</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>S2DEX.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'
-  x:str="Compatible. Minor texture errors. Use &quot;Read every frame&quot; option to see transition effects ">Compatible.
-  Minor texture errors. Use &quot;Read every frame&quot; option to see
-  transition effects<span style='mso-spacerun:yes'>�</span></td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:450'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Yuke Yuke!! Trouble Makers</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>RSP SW 2.0X</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:451'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Zelda no Densetsu 2 - Mujura no Kamen</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX2.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl48 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:452'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Zelda no Densetsu - Toki no Ocarina</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX 2.06H</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'>*Mostly* Fast</td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=42 style='height:31.5pt;mso-yfti-irow:453;mso-yfti-lastrow:yes'>
-  <td height=42 class=xl27 width=183 style='height:31.5pt;width:137pt;
-  padding-bottom:0cm;padding-top:0cm'>Zool - Majou Tsukai Densetsu</td>
-  <td class=xl28 width=107 style='width:80pt;padding-bottom:0cm;padding-top:
-  0cm'>F3DEX1.XX</td>
-  <td class=xl28 align=right width=87 style='width:65pt;padding-bottom:0cm;
-  padding-top:0cm' x:num>5</td>
-  <td class=xl28 width=76 style='width:57pt;padding-bottom:0cm;padding-top:
-  0cm'><st1:City u2:st="on"><st1:place u2:st="on">Normal</st1:place></st1:City></td>
-  <td class=xl28 width=520 style='width:390pt;padding-bottom:0cm;padding-top:
-  0cm'>Compatible</td>
- </tr>
- <tr height=21 style='height:15.75pt'>
-  <td height=21 class=xl37 style='height:15.75pt'><span lang=FR
-  style='mso-ansi-language:FR'>&nbsp;<u1:p></u1:p></span></td>
-  <td colspan=4 class=xl24 style='mso-ignore:colspan'>&nbsp;</td>
- </tr>
- <![if supportMisalignedColumns]>
- <tr height=0 style='display:none'>
-  <td width=183 style='width:137pt'></td>
-  <td width=107 style='width:80pt'></td>
-  <td width=87 style='width:65pt'></td>
-  <td width=76 style='width:57pt'></td>
-  <td width=520 style='width:390pt'></td>
- </tr>
- <![endif]>
-</table>
-
-</body>
-
-</html>
diff --git a/Source/Glide64/Internalization/Glide64_de_DE.po b/Source/Glide64/Internalization/Glide64_de_DE.po
deleted file mode 100644
index a04607c46..000000000
--- a/Source/Glide64/Internalization/Glide64_de_DE.po
+++ /dev/null
@@ -1,1284 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 17:29+0700\n"
-"PO-Revision-Date: 2012-01-27 16:23+0100\n"
-"Last-Translator: Herr et <troyfan@gmx.at>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Config.cpp:64
-msgid "Rendering"
-msgstr "Wiedergabe"
-
-#: Config.cpp:65
-msgid "Other"
-msgstr "Andere"
-
-#: Config.cpp:66
-msgid "Speed"
-msgstr "Geschwindigkeit"
-
-#: Config.cpp:67
-msgid "Time"
-msgstr "Zeit"
-
-#: Config.cpp:68
-msgid "On screen display"
-msgstr "Anzeigen"
-
-#: Config.cpp:69
-msgid "OpenGL settings"
-msgstr "OpenGL Einstellungen"
-
-#: Config.cpp:70
-#: Config.cpp:137
-msgid "Frame buffer emulation"
-msgstr "Framebuffer Emulation"
-
-#: Config.cpp:71
-msgid ""
-"Windowed or\n"
-"3dfx card resolution:"
-msgstr "Fenster- oder 3dfx-Kartenauflösung"
-
-#: Config.cpp:99
-msgid "Vertical sync"
-msgstr "vertikale Synchronisation"
-
-#: Config.cpp:100
-msgid "Show advanced emulation options"
-msgstr "erweiterte Emulationseinstellungen anzeigen"
-
-#: Config.cpp:101
-msgid "Show texture enhancement options"
-msgstr "Texturverbesserungsoptionen anzeigen"
-
-#: Config.cpp:102
-msgid "Screenshot format:"
-msgstr "Screenshotformat"
-
-#: Config.cpp:105
-msgid "Language: "
-msgstr "Sprache:"
-
-#: Config.cpp:106
-msgid "LANGUAGE_NAME"
-msgstr "Deutsch"
-
-#: Config.cpp:112
-msgid "FPS counter"
-msgstr "FPS-Zähler"
-
-#: Config.cpp:113
-msgid "VI/s counter"
-msgstr "VI/s-Zähler"
-
-#: Config.cpp:114
-#, c-format
-msgid "% speed"
-msgstr "% Geschwindigkeit"
-
-#: Config.cpp:115
-msgid "Clock enabled"
-msgstr "Uhr anzeigen"
-
-#: Config.cpp:116
-msgid "Clock is 24-hour"
-msgstr "24 Stunden verwenden"
-
-#: Config.cpp:117
-msgid "Transparent text background"
-msgstr "transparenter Texthintergrund"
-
-#: Config.cpp:118
-msgid ""
-"Full screen\n"
-"resolution:"
-msgstr "Vollbildauflösung"
-
-#: Config.cpp:121
-msgid "Anisotropic filtering"
-msgstr "anisotropische Filterung"
-
-#: Config.cpp:122
-msgid "Autodetect "
-msgstr "automatisch"
-
-#: Config.cpp:123
-msgid "VRAM size"
-msgstr "VRAM-Größe bestimmen"
-
-#: Config.cpp:125
-msgid "Mb"
-msgstr "Mb"
-
-#: Config.cpp:126
-msgid "Use frame buffer objects"
-msgstr "Framebufferobjekte verwenden"
-
-#: Config.cpp:133
-msgid "Current game emulation settings. Change with care!"
-msgstr "Spielspezifische Emulationseinstellungen. Vorsicht bei Veränderungen!"
-
-#: Config.cpp:135
-msgid "Default emulation settings. Not recommended to change!"
-msgstr "Standardmäßige Emulationseinstellungen. Veränderungen sind nicht empfohlen!"
-
-#: Config.cpp:136
-msgid "General options"
-msgstr "allgemeine Optionen"
-
-#: Config.cpp:138
-msgid "Depth buffer emulation"
-msgstr "depht buffer emulation"
-
-#: Config.cpp:139
-msgid "Filtering mode:"
-msgstr "Filtermodus"
-
-#: Config.cpp:141
-msgid "Automatic"
-msgstr "automatisch"
-
-#: Config.cpp:142
-msgid "Force Bilinear"
-msgstr "bilinearen Filter erzwingen"
-
-#: Config.cpp:143
-msgid "Force Point-sampled"
-msgstr "point-sampled Filter erzwingen"
-
-#: Config.cpp:146
-msgid "Buffer swapping method:"
-msgstr "Buffertauschmethode"
-
-#: Config.cpp:148
-msgid "Old"
-msgstr "alt"
-
-#: Config.cpp:149
-msgid "New"
-msgstr "neu"
-
-#: Config.cpp:150
-msgid "Hybrid"
-msgstr "hybrid"
-
-#: Config.cpp:153
-msgid "LOD calculation:"
-msgstr "LOD-Kalkulation"
-
-#: Config.cpp:155
-msgid "off"
-msgstr "aus"
-
-#: Config.cpp:156
-msgid "fast"
-msgstr "schnell"
-
-#: Config.cpp:157
-msgid "precise"
-msgstr "prezise"
-
-#: Config.cpp:160
-msgid "Aspect ratio:"
-msgstr "Seitenverhältnis:"
-
-#: Config.cpp:162
-msgid "4:3 (default)"
-msgstr "4:3 (Standard)"
-
-#: Config.cpp:163
-msgid "Force 16:9"
-msgstr "16:9 erzwingen"
-
-#: Config.cpp:164
-msgid "Stretch"
-msgstr "strecken"
-
-#: Config.cpp:165
-msgid "Original"
-msgstr "Original"
-
-#: Config.cpp:168
-msgid "Fog"
-msgstr "Nebel"
-
-#: Config.cpp:169
-msgid "Buffer clear on every frame"
-msgstr "Buffer nach jedem Frame entleeren"
-
-#: Config.cpp:170
-msgid "Enable frame buffer emulation"
-msgstr "Framebufferemulation aktivieren"
-
-#: Config.cpp:171
-msgid "Hardware frame buffer emulation"
-msgstr "Hardware Framebuffer Emulation"
-
-#: Config.cpp:172
-msgid "Get frame buffer info"
-msgstr "Framebufferinformation erhalten"
-
-#: Config.cpp:173
-msgid "Read every frame (slow!)"
-msgstr "jeden Frame lesen (langsam!)"
-
-#: Config.cpp:174
-msgid "Render N64 frame buffer as texture"
-msgstr "N64 Framebuffer als Textur darstellen"
-
-#: Config.cpp:175
-msgid "Detect CPU write to the N64 frame buffer"
-msgstr "CPU-writes auf den Nintendo64 Framebuffer ermitteln"
-
-#: Config.cpp:176
-msgid "Software depth buffer rendering"
-msgstr "Depthbufferdarstellung durch Software"
-
-#: Config.cpp:200
-#: Config.cpp:619
-msgid "Texture enhancement"
-msgstr "Texturverbesserung"
-
-#: Config.cpp:201
-msgid "Hi-resolution textures"
-msgstr "Texturpakete"
-
-#: Config.cpp:202
-msgid "Common"
-msgstr "allgemein"
-
-#: Config.cpp:203
-msgid "Presets"
-msgstr "Voreinstellungen"
-
-#: Config.cpp:204
-#: Config.cpp:205
-msgid "Performance tweaks"
-msgstr "Leistung verbessern"
-
-#: Config.cpp:206
-msgid "Filter"
-msgstr "Filterung"
-
-#: Config.cpp:208
-#: Config.cpp:219
-#: Config.cpp:238
-msgid "None"
-msgstr "keine/s"
-
-#: Config.cpp:209
-msgid "Smooth filtering 1"
-msgstr "weiche Filterung 1"
-
-#: Config.cpp:210
-msgid "Smooth filtering 2"
-msgstr "weiche Filterung 2"
-
-#: Config.cpp:211
-msgid "Smooth filtering 3"
-msgstr "weiche Filterung 3"
-
-#: Config.cpp:212
-msgid "Smooth filtering 4"
-msgstr "weiche Filterung 4"
-
-#: Config.cpp:213
-msgid "Sharp filtering 1"
-msgstr "harte Filterung 1"
-
-#: Config.cpp:214
-msgid "Sharp filtering 2"
-msgstr "harte Filterung 2"
-
-#: Config.cpp:217
-msgid "Enhancement"
-msgstr "Erweiterung"
-
-#: Config.cpp:220
-msgid "Store"
-msgstr "Speicher"
-
-#: Config.cpp:230
-msgid "Texture cache"
-msgstr "Textur-cache"
-
-#: Config.cpp:232
-msgid "Mbytes"
-msgstr "Mbytes"
-
-#: Config.cpp:233
-msgid "Ignore Backgrounds"
-msgstr "Hintergründe ignorieren"
-
-#: Config.cpp:234
-#: Config.cpp:245
-msgid "Apply texture compression"
-msgstr "Texturkomprimierung anwenden"
-
-#: Config.cpp:235
-#: Config.cpp:246
-msgid "Compress texture cache"
-msgstr "Textur-cache komprimieren"
-
-#: Config.cpp:236
-msgid "Format"
-msgstr "Format"
-
-#: Config.cpp:239
-msgid "Rice format"
-msgstr "Rice Format"
-
-#: Config.cpp:242
-msgid "Tile textures"
-msgstr "Texturen teilen"
-
-#: Config.cpp:243
-msgid "Force 16bpp textures"
-msgstr "16bpp-Texturen erzwingen"
-
-#: Config.cpp:244
-msgid "Alternative CRC calculation"
-msgstr "alternative CRC-Kalkulation"
-
-#: Config.cpp:247
-msgid "Use alpha channel fully"
-msgstr "Alphakanal vollständig verwenden"
-
-#: Config.cpp:248
-msgid "Texture dumping/editing mode"
-msgstr "Texturbearbeitungsmodus"
-
-#: Config.cpp:249
-msgid "Texture compression method"
-msgstr "Texturkompressionsmethode"
-
-#: Config.cpp:255
-msgid "Save texture cache to hard disk"
-msgstr "Textur-cache auf der Festplatte speichern"
-
-#: Config.cpp:256
-msgid "Best performance"
-msgstr "beste Leisung"
-
-#: Config.cpp:257
-msgid "Best texture quality"
-msgstr "höchste Texturqualität"
-
-#: Config.cpp:263
-msgid "Developers settings"
-msgstr ""
-
-#: Config.cpp:264
-msgid "Debug/Misc"
-msgstr ""
-
-#: Config.cpp:265
-msgid "Autodetect Microcode"
-msgstr ""
-
-#: Config.cpp:266
-msgid "Force Microcode:"
-msgstr ""
-
-#: Config.cpp:279
-msgid "Wireframe using:"
-msgstr ""
-
-#: Config.cpp:281
-msgid "Original colors"
-msgstr ""
-
-#: Config.cpp:282
-msgid "Vertex colors"
-msgstr ""
-
-#: Config.cpp:283
-msgid "Red only"
-msgstr ""
-
-#: Config.cpp:286
-msgid "Log to rdp.txt (SLOW)"
-msgstr ""
-
-#: Config.cpp:287
-msgid "Unknown combiners as red"
-msgstr ""
-
-#: Config.cpp:288
-msgid "Log clear every frame"
-msgstr ""
-
-#: Config.cpp:289
-msgid "Combiner logging"
-msgstr ""
-
-#: Config.cpp:290
-msgid "Run (+log) in window"
-msgstr ""
-
-#: Config.cpp:291
-msgid "Cmb. clear every frame"
-msgstr ""
-
-#: Config.cpp:292
-msgid "Error log (rdp_e.txt)"
-msgstr ""
-
-#: Config.cpp:293
-msgid "Bilinear filter texture cache"
-msgstr ""
-
-#: Config.cpp:325
-#: Config.cpp:546
-msgid " auto"
-msgstr ""
-
-#: Config.cpp:382
-msgid "Please choose language:"
-msgstr "Wähle deine Sprache:"
-
-#: Config.cpp:383
-msgid "Language"
-msgstr "Sprache"
-
-#: Config.cpp:390
-msgid "Press OK to change to "
-msgstr "Drücke OK um die Sprache zu ändern"
-
-#: Config.cpp:486
-msgid "Basic settings"
-msgstr "Grundeinstellungen"
-
-#: Config.cpp:487
-msgid ""
-"Resolution\n"
-"This option selects the fullscreen resolution for 3dfx cards and windowed resolution for other cards\n"
-"(note again that for 3dfx cards the plugin must be in fullscreen mode to see anything).\n"
-"[Recommended: 640x480, 800x600, 1024x768]"
-msgstr ""
-"Auflösung\n"
-"Diese Option wählt die Vollbildauflösung für 3dfx-Grafikkarten und die Fenstergröße für andere Grafikkarten\n"
-"(bei 3dfx-Grafikkarten muss der Vollbildmodus verwendet werden, um etwas zu sehen).\n"
-"[empfohlen: 640x480, 800x600, 1024x768]"
-
-#: Config.cpp:491
-msgid ""
-"Vertical sync\n"
-"This option will enable the vertical sync, which will prevent tearing.\n"
-"Note: this option will ONLY have effect if vsync is set to \"Software Controlled\".\n"
-msgstr ""
-"vertikale Synchronisation\n"
-"Diese Option aktiviert vertikale Synchronisation um tearing zu vermeiden.\n"
-"Beachte: Diese Option hat NUR dann einen Effekt, wenn vsync auf \"software controlled\" gestellt ist."
-
-#: Config.cpp:493
-msgid "Select a format, in which screen shots will be saved"
-msgstr "Wähle das Format, in dem Screenshots gespeichert werden sollen"
-
-#: Config.cpp:500
-msgid ""
-"Language select:\n"
-"Press the button to invoke language selection dialog.\n"
-"Selected language will be activated after restart of the configuration dialog."
-msgstr ""
-"Sprachauswahl:\n"
-"Drücke den Knopf, um den Dialog zur Sprachauswahl aufzurufen.\n"
-"Die gewählte Sprache wird nach einem Neustart des Konfigurationsdialoges aktiviert."
-
-#: Config.cpp:501
-msgid ""
-"FPS counter\n"
-"When this option is checked, a FPS (frames per second) counter will be shown\n"
-"in the lower left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"FPS-Zähler\n"
-"Wenn diese Option aktiviert wird, wird ein FPS (Frames pro Sekunde)-Zähler\n"
-"in der linken, unteren Ecke des Bildes angezeigt.\n"
-"[empfohlen: deine Wahl]"
-
-#: Config.cpp:503
-msgid ""
-"VI/s counter\n"
-"When this option is checked, a VI/s (vertical interrupts per second) counter\n"
-"will be shown in the lower left corner of the screen.  This is like the FPS\n"
-"counter but will be consistent at 60 VI/s for full speed on NTSC (U) games and\n"
-"50 VI/s for full speed on PAL (E) ones.\n"
-"[Recommended: your preference]"
-msgstr ""
-"VI/s-Zähler\n"
-"Wenn diese Option aktiviert wird, wird ein VI/s (vertikale Unterbrechungen pro Sekunde)-Zähler\n"
-"in der linken, unteren Ecke des Bildes angezeigt. Das ist wie bei dem FPS-Zähler, aber es wird\n"
-"konstant 60 VI/s für Normalgeschwindigkeit bei NTSC (U) Spielen und 50 VI/s für\n"
-"Normalgeschwindigkeit bei PAL (E) Spielen anzeigen.\n"
-"[empfohlen: deine Wahl]"
-
-#: Config.cpp:505
-#, c-format
-msgid ""
-"% speed\n"
-"This displays a percentage of the actual N64 speed in the lower\n"
-"left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"% Geschwindigkeit\n"
-"Zeigt die aktuelle Geschwindigkeit in % in der linken, unteren Ecke\n"
-"des Bildes an.\n"
-"[empfohlen: deine Wahl]"
-
-#: Config.cpp:507
-msgid ""
-"Clock enabled\n"
-"This option will put a clock in the lower right corner of the screen, showing the current time.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Uhr anzeigen\n"
-"Diese Option zeigt eine Uhr in der rechten, unteren Ecke des Bildes an, die die Uhrzeit anzeigt.\n"
-"[empfohlen: deine Wahl]"
-
-#: Config.cpp:510
-msgid ""
-"Display hours as 24-hour clock.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Zeigt die Uhr im 24-Stunden-Format an.\n"
-"[empfohlen: deine Wahl]"
-
-#: Config.cpp:511
-msgid ""
-"Transparent text background\n"
-"If this is checked, all on-screen messages will have a transparent background.  Otherwise, it will have a solid black background.\n"
-"[Recommended: your preference]"
-msgstr ""
-"transparenter Texthintergrund\n"
-"Ersetzt den schwarzen Standardhintergrund für alle Anzeigen durch einen transparenten Hintergrund.\n"
-"[empfohlen: deine Wahl]"
-
-#: Config.cpp:514
-msgid ""
-"Enable \"Emulation settings\" panel. For experienced users only!\n"
-"It shows default emulation settings when game is not loaded, or current game settings otherwise."
-msgstr ""
-"Zeigt die \"Emulationseinstellungen\" an. Nur für erfahrene Benutzer!\n"
-"Wenn kein Spiel geladen ist, werden die Standardeinstellungen angezeigt. Während des Spiels\n"
-"werden die Optionen für das jeweilige Spiel angezeigt."
-
-#: Config.cpp:516
-msgid ""
-"Enable \"Texture enhancement\" panel.\n"
-"It shows various enhancement options for original textures as well as options for hi-resolution textures."
-msgstr ""
-"Zeigt das Texturverbesserungsmenü an.\n"
-"Es zeigt verschiedene Verbesserungsoptionen für Originaltexturen und Texturpakete an."
-
-#: Config.cpp:517
-msgid ""
-"Full screen resolution:\n"
-"This sets the full screen resolution for non-3dfx video cards.\n"
-"All the resolutions that your video card/monitor support should be displayed.\n"
-"[Recommended: native (max) resolution of your monitor - unless performance becomes an issue]"
-msgstr ""
-"Vollbildauflösung:\n"
-"Bestimmt die Vollbildauflösung für nicht-3dfx Grafikkarten.\n"
-"Alle Auflösungen, die deine Grafikkarte/dein Monitor unterstützt, sollten angezeigt werden.\n"
-"[empfohlen: maximale Auflösung deines Monitors - es sei denn die Leistung leidet darunter]"
-
-#: Config.cpp:520
-msgid ""
-"Anisotropic filtering:\n"
-"This filter sharpens and brings out the details of textures that recede into the distance.\n"
-"When activated, it will use the max anisotropy your video card supports.\n"
-"However, this will override native way of texture filtering and may cause visual artifacts in some games.\n"
-"[Recommended: your preference, game dependant]"
-msgstr ""
-"anisotropische Filterung:\n"
-"Dieser Filter schärft Texturen, die in die Ferne ragen und bringt die Details besser zur Geltung.\n"
-"Durch die Aktivierung wird so viel Anisotropie verwendet, wie deine Grafikkarte unterstützt.\n"
-"Die naturliche Texturfilterung wird jedoch überschrieben und in manchen Spielen können Bildfehler entstehen.\n"
-"[empfohlen: deine Wahl, Spielabhängig]"
-
-#: Config.cpp:521
-msgid ""
-"Autodetect VRAM Size:\n"
-"Since OpenGL cannot do this reliably at the moment, the option to set this manually is available.\n"
-"If checked, plugin will try to autodetect VRAM size.\n"
-"But if this appears wrong, please uncheck and set it to correct value.\n"
-"[Recommended: on]"
-msgstr ""
-"automatisch VRAM-Größe bestimmen:\n"
-"Da OpenGL diese Funktion derzeit nicht zuverlässig übernehmen kann, ist sie manuell einstellbar.\n"
-"Wenn diese Option ausgewählt wird, wird das Plugin versuchen, die VRAM-Größe automatisch zu bestimmen.\n"
-"Bitte stelle den richtigen Wert ein, wenn sich der automatische Wert als falsch herausstellt.\n"
-"[empfohlen: ein]"
-
-#: Config.cpp:523
-msgid ""
-"Use frame buffer objects:\n"
-"Changes the way FB effects are rendered - with or without usage of the OpenGL Frame Buffer Objects (FBO) extension.\n"
-"The choice depends on game and your video card. FBO off is good for NVIDIA cards, while for ATI cards, it's usually best that FBOs are turned on.\n"
-"Also, some FB effects works only with one of the methods, no matter, which card you have.\n"
-"On the whole, with FBO off, compatibility/ accuracy is a bit better (which is the case for Resident Evil 2).\n"
-"However, with FBO on with some systems, it can actually be a bit faster in cases.\n"
-"[Recommended: video card and game dependant]"
-msgstr ""
-"Framebufferobjekte verwenden:\n"
-"Ändert die Art, in der FB-Effekte verarbeitet werden - mit oder ohne der OpenGL Frame Buffer Objects (FBO)-Erweiterung.\n"
-"Die Auswahl hängt vom Spiel und von der Grafikkarte ab. FBO aus ist gut für NVIDIA-Karten, während es für ATI-Karten meist am besten\n"
-"ist, wenn FBO aktiviert sind. Manche FB-Effekte funktionieren nur mit einer dieser Methoden unabhängig von der Grafikkarte.\n"
-"Insgesamt ist Kompatibilität/Genauigkeit ohne FBO ein bisschen besser (das ist in Resident Evil 2 der Fall).\n"
-"Jedoch ist die Spielgeschwindigkeit auf manchen Systemen besser, wenn FBO aktiviert wurde.\n"
-"[empfohlen: von der Grafikkarte und vom Spiel abhängig]"
-
-#: Config.cpp:578
-msgid "Emulation settings"
-msgstr "Emulationseinstellungen"
-
-#: Config.cpp:579
-msgid ""
-"Filtering mode\n"
-"There are three filtering modes possible:\n"
-"* Automatic filtering - filter exactly how the N64 specifies.\n"
-"* Point-sampled filtering - causes texels to appear square and sharp.\n"
-"* Bilinear filtering - interpolates the texture to make it appear more smooth.\n"
-"[Recommended: Automatic]"
-msgstr ""
-"Filtermodus:\n"
-"3 verschiedene Filtermodi sind möglich:\n"
-"*Automatische Filterung - filtert genauso, wie es der N64 vorgibt.\n"
-"*Point-sampled Filterung - lässt texturen eckig und scharf erscheinen.\n"
-"*bilineare Filterung - interpoliert Texturen um sie weicher erscheinen zu lassen.\n"
-"[empfohlen: automatisch]"
-
-#: Config.cpp:583
-msgid ""
-"Buffer swapping method\n"
-"There are 3 buffer swapping methods:\n"
-"* old - swap buffers when vertical interrupt has occurred.\n"
-"* new - swap buffers when set of conditions is satisfied. Prevents flicker on some games.\n"
-"* hybrid - mix of first two methods.\n"
-"Can prevent even more flickering then previous method, but also can cause artefacts.\n"
-"If you have flickering problems in a game (or graphics that don't show),\n"
-"try to change swapping method.\n"
-"[Recommended: new (hybrid for Paper Mario)]"
-msgstr ""
-"Buffertauschmethode\n"
-"Es gibt 3 Buffertauschmethoden:\n"
-"*alt - wechselt Buffer, wenn eine vertikale Unterbrechung aufgetreten ist\n"
-"*new - wechselt Buffer, wenn bestimmte Bedingungen erfüllt sind. Vermeidet Flimmern in manchen Spielen\n"
-"*hybrid - eine Mischung aus diesen zwei Methoden\n"
-"Kann mehr Flimmern als die vorherige Methode vermeiden, aber kann auch Bildfehler verursachen.\n"
-"Bei Problemen mit Flimmern in einem Spiel (oder mit Grafiken die nicht erscheinen),\n"
-"versuche die Methode zu ändern.\n"
-"[empfohlen: neu (hybrid für Paper Mario)]"
-
-#: Config.cpp:587
-msgid ""
-"Per-pixel level-of-detail calculation\n"
-"N64 uses special mechanism for mip-mapping, which nearly impossible to reproduce\n"
-"correctly on PC hardware. This option enables approximate emulation of this feature.\n"
-"For example, it is required for the Peach/Bowser portrait's transition in Super Mario 64.\n"
-"There are 3 modes:\n"
-"* off - LOD is not calculated\n"
-"* fast - fast imprecise LOD calculation.\n"
-"* precise - most precise LOD calculation possible, but more slow.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Detailstufen (Level-Of-Detail)-Kalkulation pro Pixel\n"
-"Es ist beinahe unmöglich den speziellen Mechanismus des N64 für mip-mapping korrekt\n"
-"auf PC-Hardware wiederzugeben. Diese Option stellt dieses Feature annäherungsweise dar.\n"
-"Zum Beispiel benötigt Übergang des Peach/Bowser Porträts in Super Mario 64 diese Option.\n"
-"Es gibt 3 Modi:\n"
-"*aus - LOD wird nicht kalkuliert\n"
-"*schnell - schnelle und ungenaue LOD-Kalkulation\n"
-"*prezise - die preziseste LOD-Kalkulation ist etwas langsamer\n"
-"[empfohlen: deine Wahl]"
-
-#: Config.cpp:592
-msgid ""
-"Aspect ratio of the output.\n"
-"Most N64 games use 4:3 aspect ratio, but some support widescreen too.\n"
-"You may select appropriate aspect here and set widescreen mode in game settings.\n"
-"In \"Stretch\" mode the output will be stretched to the entire screen,\n"
-"other modes may add black borders if necessary"
-msgstr ""
-"Seitenverhältnis der Anzeige\n"
-"Die meisten N64-Spiele verwenden das Seitenverhältnis 4:3 aber manche unterstützen auch Breitbild.\n"
-"Stelle hier das passende Seitenverhältnis ein und lege den Breitbildmodus in den Spieleinstellungen fest.\n"
-"Mit \"strecken\" wird das Bild verzerrt, um den Bildschirm auszufüllen,\n"
-"andere Modi verwenden schwarze Streifen, wenn benötigt."
-
-#: Config.cpp:595
-msgid ""
-"Fog enabled\n"
-"Sets fog emulation on//off.\n"
-"[Recommended: on]"
-msgstr ""
-"Nebel aktivieren\n"
-"Schaltet Nebel ein/aus.\n"
-"[empfohlen: ein]"
-
-#: Config.cpp:597
-msgid ""
-"Buffer clear on every frame\n"
-"Forces the frame buffer to be cleared every frame drawn.\n"
-"Usually frame buffer clear is controlled by the game.\n"
-"However, in some cases it is not well emulated,\n"
-"and some garbage may be left on the screen.\n"
-"In such cases, this option must be set on.\n"
-"[Recommended: on]"
-msgstr ""
-"Buffer nach jedem Frame entleeren\n"
-"Zwingt den Framebuffer, sich nach jedem Frame zu entleeren.\n"
-"Normalerweise kontrolliert das Spiel das entleeren des Framebuffers.\n"
-"Jedoch wird dies in manchen Fällen nicht gut emuliert,\n"
-"und es bleibt Müll auf den Bildschirm zurück.\n"
-"In diesen Fällen muss diese Option aktiviert werden.\n"
-"[empfohlen: ein]"
-
-#: Config.cpp:599
-msgid ""
-"Enable frame buffer emulation\n"
-"If on, plugin will try to detect frame buffer usage and apply appropriate frame buffer emulation.\n"
-"[Recommended: on for games which use frame buffer effects]"
-msgstr ""
-"Framebuffer Emulation aktivieren\n"
-"Aktiviert wird das Plugin versuchen, die Benützung des Framebuffers aufzuspüren, und die\n"
-"dementsprechende Framebufferemulation anwenden.\n"
-"[empfohlen: ein für Spiele, die Framebuffer Effekte verwenden]"
-
-#: Config.cpp:601
-msgid ""
-"Enable hardware frame buffer emulation\n"
-"If this option is on, plugin will create auxiliary frame buffers in video memory instead of copying\n"
-"frame buffer content into main memory. This allows plugin to run frame buffer effects without slowdown\n"
-"and without scaling image down to N64's native resolution. This feature is fully supported by\n"
-"Voodoo 4/5 cards and partially by Voodoo3 and Banshee. Modern cards also fully support it.\n"
-"[Recommended: on, if supported by your hardware]"
-msgstr ""
-"Hardware Framebuffer Emulation aktivieren\n"
-"Wenn diese Option aktiviert wurde, wird das Plugin Hilfsframebuffer im Video-Speicher erzeugen, statt\n"
-"Framebfferinhalt in den Arbeitsspeicher zu kopieren. Dadurch können Framebuffer Effekte ohne\n"
-"Geschwindigkeitsverlust und ohne das Bild auf die Originalauflösung des Nintendo64 zu verkleinern\n"
-"dargestellt werden. Dieses Feature wird von Voodoo 4/5-Karten vollständig und von Voodoo3/Banshee-Karten\n"
-"teilweise unterstützt. Moderne Grafikkarten unterstützen es auch vollständig.\n"
-"[empfohlen: ein, wenn von deiner Hardware unterstützt]"
-
-#: Config.cpp:604
-msgid ""
-"Get information about frame buffers\n"
-"This is compatibility option. It must be set on for Mupen64 and off for 1964"
-msgstr ""
-"Informationen über Framebuffer erhalten\n"
-"Das ist eine Kompatibilitätsoption. Es muss für Mupen64 aktiviert und für 1964 deaktiviert werden."
-
-#: Config.cpp:606
-msgid ""
-"Read every frame\n"
-"In some games plugin can't detect frame buffer usage.\n"
-"In such cases you need to enable this option to see frame buffer effects.\n"
-"Every drawn frame will be read from video card -> it works very slow.\n"
-"[Recommended: mostly off (needed only for a few games)]"
-msgstr ""
-"jeden Frame lesen\n"
-"In manchen Spielen kann das plugin die Benützung des Framebuffers nicht feststellen.\n"
-"In diesen Fällen muss diese Option aktiviert werden, um die Framebuffereffekte zu sehen.\n"
-"Jeder Frame wird von der Grafikkarte gelesen -> sehr langsam.\n"
-"[empfohlen: meist aus (wird nur für wenige Spiele gebraucht)]"
-
-#: Config.cpp:608
-msgid ""
-"Render N64 frame buffer as texture\n"
-"When this option is enabled, content of each N64 frame buffer is rendered\n"
-"as texture over the frame, rendered by the plugin. This prevents graphics lost,\n"
-"but may cause slowdowns and various glitches in some games.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"N64 Framebuffer als Textur darstellen\n"
-"Wenn diese Option aktiviert ist, wird der Inhalt jedes N64 Framebuffers als Textur\n"
-"über dem Frame durch das Plugin dargestellt. Dadurch kann verhindert werden, dass\n"
-"Grafiken verloren gehen, aber es kann das Spiel verlangsamen und verschiedene Fehler\n"
-"können etstehen.\n"
-"[empfohlen: meist aus]"
-
-#: Config.cpp:610
-msgid ""
-"Detect CPU write to the N64 frame buffer\n"
-"This option works as the previous options, but the plugin is trying to detect,\n"
-"when game uses CPU writes to N64 frame buffer. The N64 frame buffer is rendered\n"
-"only when CPU writes is detected. Use this option for those games, in which you\n"
-"see still image or no image at all for some time with no reason.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"CPU-writes auf den Nintendo64 Framebuffer ermitteln\n"
-"Diese Option funktioniert wie die vorherigen Optionen, aber das plugin versucht\n"
-"CPU-writes auf den Nintendo64 Framebuffer zu ermitteln. Der N64 Framebuffer\n"
-"wird nur verabbeitet, wenn CPU-writes festgestellt werden. Verwende diese\n"
-"Option für Spiele, in denen Standbilder manchmal grundlos vorkommen, oder\n"
-"wenn teilweise kein Bild angezeigt wird\n"
-"[empfohlen: meist aus]"
-
-#: Config.cpp:612
-msgid ""
-"Enable depth buffer rendering\n"
-"This option is used to fully emulate N64 depth buffer.\n"
-"It is required for correct emulation of depth buffer based effects.\n"
-"However, it requires fast (>1GHz) CPU to work full speed.\n"
-"[Recommended: on for fast PC]"
-msgstr ""
-"depht buffer-Verarbeitung aktivieren\n"
-"Mit dieser Option wird der N64 depth buffer vollständig dargestellt.\n"
-"Dies ist erforderlich um Effekte, die auf dem depth buffer basieren\n"
-"korrekt darzustellen. Es wird jedoch ein schneller (>1GHz) Prozsssor\n"
-"benötigt, um die volle Geschwindigkeit zu erreichen.\n"
-"[empfohlen: ein für schnelle PCs]"
-
-#: Config.cpp:620
-msgid ""
-"Filters:\n"
-"Apply a filter to either smooth or sharpen textures.\n"
-"There are 4 different smoothing filters and 2 different sharpening filters.\n"
-"The higher the number, the stronger the effect,\n"
-"i.e. \"Smoothing filter 4\" will have a much more noticeable effect than \"Smoothing filter 1\".\n"
-"Be aware that performance may have an impact depending on the game and/or the PC.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Filter:\n"
-"Verwende Filter, um Texturen zu glätten oder zu schärfen.\n"
-"Es gibt 4 verschiedene Glättungs- und 2 verschiedene Schärfungsfilter.\n"
-"Je höher die Nummer, desto stärker ist der Effekt,\n"
-"d. h. \"weiche Filterung 4\" ist viel stärker spürbar als \"weiche Filterung1\".\n"
-"Beachten Sie, dass sich Filter auf die Leistung abhängig von dem Spiel und\n"
-"dem PC auswirken können.\n"
-"[empfohlen: deine Wahl]"
-
-#: Config.cpp:624
-msgid ""
-"Texture enhancement:\n"
-"7 different filters are selectable here, each one with a distinctive look.\n"
-"Be aware of possible performance impacts.\n"
-"\n"
-"IMPORTANT: 'Store' mode - saves textures in cache 'as is'. It can improve performance in games, which load many textures.\n"
-"Disable 'Ignore backgrounds' option for better result.\n"
-"\n"
-"[Recommended: your preference]"
-msgstr ""
-"Texturverbesserung:\n"
-"7 verschiedene Filter können hier ausgewählt werden.\n"
-"Die Benützung eines Filters kann sich auf die Leistung auswirken.\n"
-"\n"
-"WICHTIG: \"Speicher\"-Modus speichert Texturen im Speicher \"as is\".\n"
-"Dadurch kann die Leistung in Spielen, die viele Texturen laden, verbessert werden.\n"
-"Deaktiviere \"Hintergründe ignorieren\" für bessere Ergebnisse.\n"
-"\n"
-"[empfohlen: deine Wahl]"
-
-#: Config.cpp:628
-msgid ""
-"Texture cache size:\n"
-"Enhanced and filtered textures can be cached to aid performance.\n"
-"This setting will adjust how much PC memory will be dedicated for texture cache.\n"
-"This helps boost performance if there are subsequent requests for the same texture (usually the case).\n"
-"Normally, 128MB should be more than enough but there is a sweet spot for each game.\n"
-"Super Mario may not need more than 32megs, but Conker streams a lot of textures,\n"
-"so setting 256+ megs can boost performance. Adjust accordingly if you are encountering speed issues.\n"
-"'0' disables cache.\n"
-"[Recommended: PC and game dependant]"
-msgstr ""
-"Größe des Textur-cache:\n"
-"Verbesserte und gefilterte Texturen können zwischengespeichert werden, um die Leistung zu verbessern.\n"
-"Hier kann eingestellt werden, wie viel Speicher für den Textur-cache verwendet werden soll.\n"
-"Dadurch wird die Leistung verbessert, wenn die gleiche Textur mehrmals abgerufen wird (das ist meistens der Fall).\n"
-"Normalerweise sollten 128MB mehr als genug sein aber es gibt einen Optimalbereich für jedes Spiel.\n"
-"Super Mario wird nicht mehr als 32MB brauchen, aber Conker verwendet viele Texturen.\n"
-"Hier können 256+ MB die Leistung verbessern. Stelle bei Problemen mit der Geschwindigkeit die richtige Größe ein.\n"
-"'0' deaktiviert den Textur-cache.\n"
-"[empfohlen: abhängig von PC und Spiel]"
-
-#: Config.cpp:634
-msgid ""
-"Ignore Backgrounds:\n"
-"It is used to skip enhancement for long narrow textures, usually used for backgrounds.\n"
-"This may save texture memory greatly and increase performance.\n"
-"[Recommended: on (off for 'Store' mode)]"
-msgstr ""
-"Hintergründe ignorieren:\n"
-"Lange, schmale Texturen, die normalerweise für Hintergründe verwedet werden, werden nicht verbessert.\n"
-"Dadurch kann Texturspeicher gespart, und die Leistung verbessert werden\n"
-"[empfohlen: ein (aus für 'Speicher'-Modus)]"
-
-#: Config.cpp:636
-msgid ""
-"Texture compression:\n"
-"Textures will be compressed using selected texture compression method.\n"
-"The overall compression ratio is about 1/6 for FXT1 and 1/4 for S3TC.\n"
-"In addition to saving space on the texture cache,\n"
-"the space occupied on the GFX hardware's texture RAM,\n"
-"by the enhanced textures, will be greatly reduced.\n"
-"This minimizes texture RAM usage,\n"
-"decreasing the number of texture swaps to the GFX hardware leading to performance gains.\n"
-"However, due to the nature of lossy compression of FXT1 and S3TC, using this option can sometimes lead to quality degradation of small size textures and color banding of gradient colored textures.\n"
-"[Recommended: off]"
-msgstr ""
-"Texturkomprimierung:\n"
-"Texturen werden mit der ausgewählten Methode komprimiert.\n"
-"Insgesamt liegt das Verhältnis ungefähr bei 1/6 für FXT1 und 1/4 für S3TC.\n"
-"Neben den Speichereinsparungen im Textur-cache\n"
-"wird auch der Speicherbedarf auf der Textur-RAM der GFX-Hardware\n"
-"durch die verbesserten Texturen stark reduziert.\n"
-"Es wird die benützte Textur-RAM minimiert\n"
-"was zu einer Verringerung von textur-swaps auf der GFX-Hardware führt und dadurch die Leistung steigert.\n"
-"Da FXT1 und S3TC nicht verlustfrei sind, kann diese Option bei kleinen Texturen die Qualität verringern und zu Streifen bei Texturen mit großem Farbunterschied führen.\n"
-"[empfohlen: aus]"
-
-#: Config.cpp:640
-msgid ""
-"Compress texture cache:\n"
-"Memory will be compressed so that more textures can be held in the texture cache.\n"
-"The compression ratio varies with each texture,\n"
-"but 1/5 of the original size would be a modest approximation.\n"
-"They will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"Textur cache komprimieren:\n"
-"Der speicher wird komprimiert, damit mehr Texturen im Textur cache Platz haben.\n"
-"Das Verhältnis der Komprimierung variiert bei jeder Textur,\n"
-"und liegt bei ca. 1/5 der Originalgröße.\n"
-"Texturen werden laufend dekomprimiert, bevor sie von der Grafikkarte geladen werden.\n"
-"Diese Option wird helfen, um Speicherplatz zu sparen, selbst wenn Texturkomprimierung verwendet wird.\n"
-"[empfohlen: ein]"
-
-#: Config.cpp:642
-msgid ""
-"Hi-res pack format:\n"
-"Choose which method is to be used for loading Hi-res texture packs.\n"
-"Only Rice's format is available currently.\n"
-"Leave on \"None\" if you will not be needing to load hi-res packs.\n"
-"[Recommended: Rice's format. Default: \"None\"]"
-msgstr ""
-"Hi-res FormatWähle welche Methode für das Laden von Hi-res Texturen verwendet werden soll.\n"
-"Derzeit ist nur Rices Format verfügbar.\n"
-"Wähle \"keine/s\" um keine Hi-res Packete zu laden.\n"
-"[empfohlen: Rices Format, Standard: \"keine/s\"]"
-
-#: Config.cpp:646
-msgid ""
-"Tile textures:\n"
-"When on, wide texture will be split on several tiles to fit in one 256-width texture.\n"
-"This tiled texture takes much less video memory space and thus overall performance will increase.\n"
-"However, corresponding polygons must be split too, and this is not polished yet\n"
-"- various issues are possible, including black lines and polygons distortions.\n"
-"[Recommended: off]"
-msgstr ""
-"Texturen teilen:\n"
-"Große Texturen werden in mehrere Teile zerlegt, um in eine 256 Pixel breite Textur zu passen.\n"
-"Geteilte Texturen brauchen weniger Grafikspeicher und deshalb verbessert sich die Leistung.\n"
-"Jedoch müssen auch die betreffenden Polygone geteilt werden, was derzeit nicht glatt fungtioniert.\n"
-"- verschiedene Probleme wie schwarze Linien und verzerrte Polygone sind möglich.\n"
-"[empfohlen: aus]"
-
-#: Config.cpp:648
-msgid ""
-"Force 16bpp textures:\n"
-"The color of the textures will be reduced to 16bpp.\n"
-"This is another space saver and performance enhancer.\n"
-"This halves the space used on the texture cache and the GFX hardware's texture RAM.\n"
-"Color reduction is done so that the original quality is preserved as much as possible.\n"
-"Depending on the texture, this usually is hardly noticeable.\n"
-"Sometimes though, it can be: skies are a good example.\n"
-"[Recommended: off]"
-msgstr ""
-"16bpp-Texturen erzwingen:\n"
-"Reduziert die Farbe der Texturen auf 16bpp.\n"
-"Es wird Speicher gespart und die Leistung verbessert.\n"
-"Der verwendete Spercher im Textur cache und im Textur-RAM der GFX-Hardware.\n"
-"Bei der Farbreduktion wird darauf geachtet, dass Qualität des Originals so gut wie möglich erhalten bleibt.\n"
-"Das ist, von der Textur abhängig, normalerweise kaum bemerkbar.\n"
-"Manchmal ist es sichtbar: Himmel sind ein gutes Beispiel.\n"
-"[empfohlen: aus]"
-
-#: Config.cpp:650
-msgid ""
-"Texture dumping mode:\n"
-"In this mode, you have that ability to dump textures on screen to the appropriate folder.\n"
-"You can also reload textures while the game is running to see how they look instantly - big time saver!\n"
-"\n"
-"Hotkeys: \"R\" reloads hires textures from the texture pack - \"D\" toggles texture dumps on/off."
-msgstr ""
-"Texturbearbeitungsmodus:\n"
-"In diesem Modus gibt es die Möglichkeit Texturen, die angezeigt werden, in den entsprechenden Ordner zu speichern.\n"
-"Texturen können auch neu geladen werden während das Spiel läuft, um neue Texturen auszuprobieren - spart viel Zeit!\n"
-"\n"
-"Tastenkombinationen: \"R\" Texturen aus dem Packet neu laden - \"D\" schaltet Textur-dumps ein/aus."
-
-#: Config.cpp:652
-msgid ""
-"Alternative CRC calculation:\n"
-"This option enables emulation of a palette CRC calculation bug in RiceVideo.\n"
-"If some textures are not loaded, try to set this option on/off.\n"
-"[Recommended: texture pack dependant, mostly on]"
-msgstr ""
-"Alternative CRC Kalkulation:\n"
-"Diese Option ahmt einen CRC Kalkulationsbugs aus RiceVideo nach.\n"
-"Wenn einige Texturen nicht geladen werden, versuche diese Option ein- oder auszuschelten.\n"
-"[empfohlen: abhängig vom Texturpaket, meist ein]"
-
-#: Config.cpp:657
-msgid ""
-"Compress texture cache:\n"
-"When game started, plugin loads all its hi-resolution textures into PC memory.\n"
-"Since hi-resolution textures are usually large, the whole pack can take hundreds megabytes of memory.\n"
-"Cache compression allows save memory space greatly.\n"
-"Textures will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"Textur-cache komprimieren:\n"
-"Wenn ein Spiel startet, werden alle Texturen in den Arbeitsspeicher geladen.\n"
-"Da Texturpakete meist viel Speicher benötigen, kann das gesamte Paket mehrere hundert megabyte benötigen.\n"
-"Durch Komprimierung kann viel Speicherplatz gespart werden.\n"
-"Texturen werden laufend dekomprimiert, bevor sie von der Grafikkarte geladen werden.\n"
-"Diese Option wird helfen, um Speicherplatz zu sparen, selbst wenn Texturkomprimierung verwendet wird.\n"
-"[empfohlen: ein]"
-
-#: Config.cpp:659
-msgid ""
-"Use Alpha channel fully:\n"
-"When this option is off, 16bit rgba textures will be loaded using RiceVideo style\n"
-"- with 1bit for alpha channel.\n"
-"When it is on, GlideHQ will check, how alpha channel is used by the hires texture,\n"
-"and select most appropriate format for it.\n"
-"This gives texture designers freedom to play with alpha, as they need,\n"
-"regardless of format of original N64 texture.\n"
-"For older and badly designed texture packs it can cause unwanted black borders.\n"
-"[Recommended: texture pack dependant]"
-msgstr ""
-"Alphakanal vollständig verwenden:\n"
-"Wenn diese Option deaktiviert ist, werden 16bit rgba Texturen wie in RiceVideo geladen\n"
-"-mit 1bit für den Alphakanal.\n"
-"Wenn diese Option aktiviert ist, wird GlideHQ überprüfen, wie der Alphakanal verwendet wird\n"
-"und wird das passende Format auswählen.\n"
-"Dadurch können Texturdesigner den Alphakanal verwenden, wie sie ihn benötigen,\n"
-"unabhängig vom Format der Originaltextur des N64.\n"
-"Bei älteren und schlecht designten Texturpaketen können schwarze Ränder entstehen.\n"
-"[empfohlen: abhängig vom Texturpaket]"
-
-#: Config.cpp:662
-msgid ""
-"Save texture cache to HD:\n"
-"\n"
-"For enhanced textures cache:\n"
-"This will save all previously loaded and enhanced textures to HD.\n"
-"So upon next game launch, all the textures will be instantly loaded, resulting in smoother performance.\n"
-"\n"
-"For high-resolution textures cache:\n"
-"After creation, loading hi-res texture will take only a few seconds upon game launch,\n"
-"as opposed to the 5 -60 seconds a pack can take to load without this cache file.\n"
-"The only downside here is upon any changes to the pack, the cache file will need to be manually deleted.\n"
-"\n"
-"Saved cache files go into a folder called \"Cache\" within the Plugins folder.\n"
-"\n"
-"[Highly Recommended: on]"
-msgstr ""
-"Textur-cache auf der Festplatte speichern:\n"
-"\n"
-"Für verbesserten Textur-cache:\n"
-"Alle zuvor geladenen und verbesserten Texturen werden auf der Festplatte gespeichert.\n"
-"Wenn das Spiel das nächste mal gestartet wird, werden alle texturen sofort geladen und die Leistung wird dadurch verbessert.\n"
-"\n"
-"Für Texturpakete:\n"
-"Nach der Erstellung werden Texturpakete in wenigen Sekunden nach dem Spielstart geladen.\n"
-"Ohne diese Option kann es 5-60 Sekunden dauern, bis die Texturen geladen sind.\n"
-"Es gibt einen Nachteil. Die cache-Datei muss manuell gelöscht werden, wenn das Texturpaket verändert wird.\n"
-"\n"
-"Cache-Dateien werden im Ordner \"Cache\" gespeichert, der sich im Plugin-Ordner befindet.\n"
-"\n"
-"[dringend empfohlen: ein]"
-
-#: Config.cpp:685
-msgid "Debug"
-msgstr ""
-
-#: Config.cpp:686
-msgid ""
-"Autodetect Microcode\n"
-"If this option is checked, the microcode of the game\n"
-"will be detected automatically from the INI, and\n"
-"therefore it will not need to be set in this\n"
-"configuration dialog.\n"
-"[Recommended: on]"
-msgstr ""
-
-#: Config.cpp:688
-msgid ""
-"Force Microcode\n"
-"This option ONLY has an effect if Autodetect Microcode\n"
-"is unchecked, the crc from the game could not be\n"
-"found in the INI, OR after the game has already started\n"
-"running. In any of those three cases, this will\n"
-"select the microcode to use\n"
-"[Recommended: any, turn on Autodetect Microcode]"
-msgstr ""
-
-#: Config.cpp:692
-msgid ""
-"Wireframe\n"
-"This option, when checked, makes it so that the plugin will draw only the\n"
-"outlines of objects.  The colors specified in the combo box to the right\n"
-"determines the color that the wireframes show up as.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:694
-msgid ""
-"Wireframe Colors\n"
-"This selects the colors to use for the wireframes (if wireframe mode is enabled).\n"
-"There are 3 modes:\n"
-"* Original colors - draw exactly as it would normally, textures and all, only in wireframes.\n"
-"* Vertex colors - use the colors specified in the vertices to draw the wireframes with.\n"
-"* Red only - use a constant red color to draw the wireframes.\n"
-"[Recommended: Vertex colors]"
-msgstr ""
-
-#: Config.cpp:696
-msgid ""
-"Log to RDP.txt\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option, when checked, will log EVERY SINGLE\n"
-"COMMAND the plugin processes to a file called RDP.txt in the current directory.\n"
-"This is incredibly slow, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:698
-msgid ""
-"Unknown combiners as red\n"
-"Objects that use an unimplemented combine mode will show up as red instead of\n"
-"assuming texture with full alpha. Disable this option to remove the red stuff\n"
-"and at least have a guess at the correct combine mode.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:700
-msgid ""
-"Log clear every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option has no effect unless 'Log to RDP.txt'\n"
-"is checked. This will make it so that the log, RDP.txt, will be cleared at the\n"
-"beginning of every frame.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:702
-msgid ""
-"Log unknown combiners\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will cause every\n"
-"unimplemented combiner drawn to be logged to a file called Unimp.txt in the\n"
-"current directory. This becomes slow when there are unimplemented combiners\n"
-"on the screen, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:704
-msgid ""
-"Run and log in window\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option will make it so that the plugin will\n"
-"still process dlists in windowed mode. This allows for logging to occur while not\n"
-"in fullscreen, possibly allowing you to debug a crash.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:706
-msgid ""
-"Clear unknown combiner log every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option works much like 'Log clear every frame'\n"
-"except it clears the combiner log (Unimp.txt) instead of RDP.txt at the\n"
-"beginning of each frame. Again, this option has no effect if 'combiner logging' is disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:709
-msgid ""
-"Bilinear filter texture cache\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will make the graphical\n"
-"debugger texture cache use bilinear filtering as opposed to point-sampled filtering,\n"
-"which it will use otherwise. See 'Filtering mode' for descriptions of bilinear and\n"
-"point-sampled filtering.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:1104
-msgid "Glide64 settings"
-msgstr "Glide64 Einstellungen"
-
-#: Config.cpp:1293
-msgid "About Glide64"
-msgstr "Über Glide64"
-
-#: Config.cpp:1326
-msgid "authors:"
-msgstr "Urheber:"
-
-#: Config.cpp:1330
-msgid ""
-"Dave2001. Original author and former main developer.\n"
-"He founded Glide64 project on Dec. 29th, 2001.\n"
-"Left the project at fall of 2002.\n"
-msgstr ""
-"Dave2001. Originalautor und ehemaliger Hauptentwickler.\n"
-"Er gründete das Glide64-Projekt am 29. Dez. 2001.\n"
-"Er verließ das Projekt im Herbst 2002.\n"
-
-#: Config.cpp:1336
-msgid ""
-"Gugaman. Developer. Joined the project at winter 2002\n"
-" and left it at fall 2002."
-msgstr ""
-"Gugaman. Entwickler. Trat dem Projekt Winter 2002 bei\n"
-"und verließ es Herbst 2002."
-
-#: Config.cpp:1342
-msgid ""
-"Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\n"
-"Main developer since fall of 2002."
-msgstr ""
-"Sergey 'Gonetz' Lipski. Trat dem Projekt Winter 2002 bei.\n"
-"Hauptentwickler seit Herbst 2002."
-
-#: Config.cpp:1347
-msgid "Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. "
-msgstr "Hiroshi 'KoolSmoky' Morii, trat dem Projekt 2007 bei."
-
-#: Config.cpp:1350
-msgid "Glitch64 (the wrapper) authors:"
-msgstr "Glitch64 (der Wrapper) Autoren:"
-
-#: Config.cpp:1374
-msgid "GlideHQ author:"
-msgstr "GlideHQ Autor:"
-
-#: Config.cpp:1381
-msgid "beta tester:"
-msgstr "Betatester:"
-
-#: Config.cpp:1388
-msgid ""
-"special thanks to:\n"
-" Orkin, Rice, Daniel Borca, Legend.\n"
-"Thanks to EmuXHaven for hosting my site:\n"
-"http://glide64.emuxhaven.net\n"
-msgstr ""
-"Besonderen Dank an:\n"
-"Orkin, Rice, Daniel Borca, Legend.\n"
-"EmuXHaven für das hosten meiner Seite:\n"
-"http://glide64.emuxhaven.net\n"
-
diff --git a/Source/Glide64/Internalization/Glide64_en.pot b/Source/Glide64/Internalization/Glide64_en.pot
deleted file mode 100644
index e2f8b5c55..000000000
--- a/Source/Glide64/Internalization/Glide64_en.pot
+++ /dev/null
@@ -1,1118 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 17:29+0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Config.cpp:64
-msgid "Rendering"
-msgstr ""
-
-#: Config.cpp:65
-msgid "Other"
-msgstr ""
-
-#: Config.cpp:66
-msgid "Speed"
-msgstr ""
-
-#: Config.cpp:67
-msgid "Time"
-msgstr ""
-
-#: Config.cpp:68
-msgid "On screen display"
-msgstr ""
-
-#: Config.cpp:69
-msgid "OpenGL settings"
-msgstr ""
-
-#: Config.cpp:70 Config.cpp:137
-msgid "Frame buffer emulation"
-msgstr ""
-
-#: Config.cpp:71
-msgid ""
-"Windowed or\n"
-"3dfx card resolution:"
-msgstr ""
-
-#: Config.cpp:99
-msgid "Vertical sync"
-msgstr ""
-
-#: Config.cpp:100
-msgid "Show advanced emulation options"
-msgstr ""
-
-#: Config.cpp:101
-msgid "Show texture enhancement options"
-msgstr ""
-
-#: Config.cpp:102
-msgid "Screenshot format:"
-msgstr ""
-
-#: Config.cpp:105
-msgid "Language: "
-msgstr ""
-
-#: Config.cpp:106
-msgid "LANGUAGE_NAME"
-msgstr ""
-
-#: Config.cpp:112
-msgid "FPS counter"
-msgstr ""
-
-#: Config.cpp:113
-msgid "VI/s counter"
-msgstr ""
-
-#: Config.cpp:114
-#, c-format
-msgid "% speed"
-msgstr ""
-
-#: Config.cpp:115
-msgid "Clock enabled"
-msgstr ""
-
-#: Config.cpp:116
-msgid "Clock is 24-hour"
-msgstr ""
-
-#: Config.cpp:117
-msgid "Transparent text background"
-msgstr ""
-
-#: Config.cpp:118
-msgid ""
-"Full screen\n"
-"resolution:"
-msgstr ""
-
-#: Config.cpp:121
-msgid "Anisotropic filtering"
-msgstr ""
-
-#: Config.cpp:122
-msgid "Autodetect "
-msgstr ""
-
-#: Config.cpp:123
-msgid "VRAM size"
-msgstr ""
-
-#: Config.cpp:125
-msgid "Mb"
-msgstr ""
-
-#: Config.cpp:126
-msgid "Use frame buffer objects"
-msgstr ""
-
-#: Config.cpp:133
-msgid "Current game emulation settings. Change with care!"
-msgstr ""
-
-#: Config.cpp:135
-msgid "Default emulation settings. Not recommended to change!"
-msgstr ""
-
-#: Config.cpp:136
-msgid "General options"
-msgstr ""
-
-#: Config.cpp:138
-msgid "Depth buffer emulation"
-msgstr ""
-
-#: Config.cpp:139
-msgid "Filtering mode:"
-msgstr ""
-
-#: Config.cpp:141
-msgid "Automatic"
-msgstr ""
-
-#: Config.cpp:142
-msgid "Force Bilinear"
-msgstr ""
-
-#: Config.cpp:143
-msgid "Force Point-sampled"
-msgstr ""
-
-#: Config.cpp:146
-msgid "Buffer swapping method:"
-msgstr ""
-
-#: Config.cpp:148
-msgid "Old"
-msgstr ""
-
-#: Config.cpp:149
-msgid "New"
-msgstr ""
-
-#: Config.cpp:150
-msgid "Hybrid"
-msgstr ""
-
-#: Config.cpp:153
-msgid "LOD calculation:"
-msgstr ""
-
-#: Config.cpp:155
-msgid "off"
-msgstr ""
-
-#: Config.cpp:156
-msgid "fast"
-msgstr ""
-
-#: Config.cpp:157
-msgid "precise"
-msgstr ""
-
-#: Config.cpp:160
-msgid "Aspect ratio:"
-msgstr ""
-
-#: Config.cpp:162
-msgid "4:3 (default)"
-msgstr ""
-
-#: Config.cpp:163
-msgid "Force 16:9"
-msgstr ""
-
-#: Config.cpp:164
-msgid "Stretch"
-msgstr ""
-
-#: Config.cpp:165
-msgid "Original"
-msgstr ""
-
-#: Config.cpp:168
-msgid "Fog"
-msgstr ""
-
-#: Config.cpp:169
-msgid "Buffer clear on every frame"
-msgstr ""
-
-#: Config.cpp:170
-msgid "Enable frame buffer emulation"
-msgstr ""
-
-#: Config.cpp:171
-msgid "Hardware frame buffer emulation"
-msgstr ""
-
-#: Config.cpp:172
-msgid "Get frame buffer info"
-msgstr ""
-
-#: Config.cpp:173
-msgid "Read every frame (slow!)"
-msgstr ""
-
-#: Config.cpp:174
-msgid "Render N64 frame buffer as texture"
-msgstr ""
-
-#: Config.cpp:175
-msgid "Detect CPU write to the N64 frame buffer"
-msgstr ""
-
-#: Config.cpp:176
-msgid "Software depth buffer rendering"
-msgstr ""
-
-#: Config.cpp:200 Config.cpp:619
-msgid "Texture enhancement"
-msgstr ""
-
-#: Config.cpp:201
-msgid "Hi-resolution textures"
-msgstr ""
-
-#: Config.cpp:202
-msgid "Common"
-msgstr ""
-
-#: Config.cpp:203
-msgid "Presets"
-msgstr ""
-
-#: Config.cpp:204 Config.cpp:205
-msgid "Performance tweaks"
-msgstr ""
-
-#: Config.cpp:206
-msgid "Filter"
-msgstr ""
-
-#: Config.cpp:208 Config.cpp:219 Config.cpp:238
-msgid "None"
-msgstr ""
-
-#: Config.cpp:209
-msgid "Smooth filtering 1"
-msgstr ""
-
-#: Config.cpp:210
-msgid "Smooth filtering 2"
-msgstr ""
-
-#: Config.cpp:211
-msgid "Smooth filtering 3"
-msgstr ""
-
-#: Config.cpp:212
-msgid "Smooth filtering 4"
-msgstr ""
-
-#: Config.cpp:213
-msgid "Sharp filtering 1"
-msgstr ""
-
-#: Config.cpp:214
-msgid "Sharp filtering 2"
-msgstr ""
-
-#: Config.cpp:217
-msgid "Enhancement"
-msgstr ""
-
-#: Config.cpp:220
-msgid "Store"
-msgstr ""
-
-#: Config.cpp:230
-msgid "Texture cache"
-msgstr ""
-
-#: Config.cpp:232
-msgid "Mbytes"
-msgstr ""
-
-#: Config.cpp:233
-msgid "Ignore Backgrounds"
-msgstr ""
-
-#: Config.cpp:234 Config.cpp:245
-msgid "Apply texture compression"
-msgstr ""
-
-#: Config.cpp:235 Config.cpp:246
-msgid "Compress texture cache"
-msgstr ""
-
-#: Config.cpp:236
-msgid "Format"
-msgstr ""
-
-#: Config.cpp:239
-msgid "Rice format"
-msgstr ""
-
-#: Config.cpp:242
-msgid "Tile textures"
-msgstr ""
-
-#: Config.cpp:243
-msgid "Force 16bpp textures"
-msgstr ""
-
-#: Config.cpp:244
-msgid "Alternative CRC calculation"
-msgstr ""
-
-#: Config.cpp:247
-msgid "Use alpha channel fully"
-msgstr ""
-
-#: Config.cpp:248
-msgid "Texture dumping/editing mode"
-msgstr ""
-
-#: Config.cpp:249
-msgid "Texture compression method"
-msgstr ""
-
-#: Config.cpp:255
-msgid "Save texture cache to hard disk"
-msgstr ""
-
-#: Config.cpp:256
-msgid "Best performance"
-msgstr ""
-
-#: Config.cpp:257
-msgid "Best texture quality"
-msgstr ""
-
-#: Config.cpp:263
-msgid "Developers settings"
-msgstr ""
-
-#: Config.cpp:264
-msgid "Debug/Misc"
-msgstr ""
-
-#: Config.cpp:265
-msgid "Autodetect Microcode"
-msgstr ""
-
-#: Config.cpp:266
-msgid "Force Microcode:"
-msgstr ""
-
-#: Config.cpp:279
-msgid "Wireframe using:"
-msgstr ""
-
-#: Config.cpp:281
-msgid "Original colors"
-msgstr ""
-
-#: Config.cpp:282
-msgid "Vertex colors"
-msgstr ""
-
-#: Config.cpp:283
-msgid "Red only"
-msgstr ""
-
-#: Config.cpp:286
-msgid "Log to rdp.txt (SLOW)"
-msgstr ""
-
-#: Config.cpp:287
-msgid "Unknown combiners as red"
-msgstr ""
-
-#: Config.cpp:288
-msgid "Log clear every frame"
-msgstr ""
-
-#: Config.cpp:289
-msgid "Combiner logging"
-msgstr ""
-
-#: Config.cpp:290
-msgid "Run (+log) in window"
-msgstr ""
-
-#: Config.cpp:291
-msgid "Cmb. clear every frame"
-msgstr ""
-
-#: Config.cpp:292
-msgid "Error log (rdp_e.txt)"
-msgstr ""
-
-#: Config.cpp:293
-msgid "Bilinear filter texture cache"
-msgstr ""
-
-#: Config.cpp:325 Config.cpp:546
-msgid " auto"
-msgstr ""
-
-#: Config.cpp:382
-msgid "Please choose language:"
-msgstr ""
-
-#: Config.cpp:383
-msgid "Language"
-msgstr ""
-
-#: Config.cpp:390
-msgid "Press OK to change to "
-msgstr ""
-
-#: Config.cpp:486
-msgid "Basic settings"
-msgstr ""
-
-#: Config.cpp:487
-msgid ""
-"Resolution\n"
-"This option selects the fullscreen resolution for 3dfx cards and windowed "
-"resolution for other cards\n"
-"(note again that for 3dfx cards the plugin must be in fullscreen mode to see "
-"anything).\n"
-"[Recommended: 640x480, 800x600, 1024x768]"
-msgstr ""
-
-#: Config.cpp:491
-msgid ""
-"Vertical sync\n"
-"This option will enable the vertical sync, which will prevent tearing.\n"
-"Note: this option will ONLY have effect if vsync is set to \"Software "
-"Controlled\".\n"
-msgstr ""
-
-#: Config.cpp:493
-msgid "Select a format, in which screen shots will be saved"
-msgstr ""
-
-#: Config.cpp:500
-msgid ""
-"Language select:\n"
-"Press the button to invoke language selection dialog.\n"
-"Selected language will be activated after restart of the configuration "
-"dialog."
-msgstr ""
-
-#: Config.cpp:501
-msgid ""
-"FPS counter\n"
-"When this option is checked, a FPS (frames per second) counter will be "
-"shown\n"
-"in the lower left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-
-#: Config.cpp:503
-msgid ""
-"VI/s counter\n"
-"When this option is checked, a VI/s (vertical interrupts per second) "
-"counter\n"
-"will be shown in the lower left corner of the screen.  This is like the FPS\n"
-"counter but will be consistent at 60 VI/s for full speed on NTSC (U) games "
-"and\n"
-"50 VI/s for full speed on PAL (E) ones.\n"
-"[Recommended: your preference]"
-msgstr ""
-
-#: Config.cpp:505
-#, c-format
-msgid ""
-"% speed\n"
-"This displays a percentage of the actual N64 speed in the lower\n"
-"left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-
-#: Config.cpp:507
-msgid ""
-"Clock enabled\n"
-"This option will put a clock in the lower right corner of the screen, "
-"showing the current time.\n"
-"[Recommended: your preference]"
-msgstr ""
-
-#: Config.cpp:510
-msgid ""
-"Display hours as 24-hour clock.\n"
-"[Recommended: your preference]"
-msgstr ""
-
-#: Config.cpp:511
-msgid ""
-"Transparent text background\n"
-"If this is checked, all on-screen messages will have a transparent "
-"background.  Otherwise, it will have a solid black background.\n"
-"[Recommended: your preference]"
-msgstr ""
-
-#: Config.cpp:514
-msgid ""
-"Enable \"Emulation settings\" panel. For experienced users only!\n"
-"It shows default emulation settings when game is not loaded, or current game "
-"settings otherwise."
-msgstr ""
-
-#: Config.cpp:516
-msgid ""
-"Enable \"Texture enhancement\" panel.\n"
-"It shows various enhancement options for original textures as well as "
-"options for hi-resolution textures."
-msgstr ""
-
-#: Config.cpp:517
-msgid ""
-"Full screen resolution:\n"
-"This sets the full screen resolution for non-3dfx video cards.\n"
-"All the resolutions that your video card/monitor support should be "
-"displayed.\n"
-"[Recommended: native (max) resolution of your monitor - unless performance "
-"becomes an issue]"
-msgstr ""
-
-#: Config.cpp:520
-msgid ""
-"Anisotropic filtering:\n"
-"This filter sharpens and brings out the details of textures that recede into "
-"the distance.\n"
-"When activated, it will use the max anisotropy your video card supports.\n"
-"However, this will override native way of texture filtering and may cause "
-"visual artifacts in some games.\n"
-"[Recommended: your preference, game dependant]"
-msgstr ""
-
-#: Config.cpp:521
-msgid ""
-"Autodetect VRAM Size:\n"
-"Since OpenGL cannot do this reliably at the moment, the option to set this "
-"manually is available.\n"
-"If checked, plugin will try to autodetect VRAM size.\n"
-"But if this appears wrong, please uncheck and set it to correct value.\n"
-"[Recommended: on]"
-msgstr ""
-
-#: Config.cpp:523
-msgid ""
-"Use frame buffer objects:\n"
-"Changes the way FB effects are rendered - with or without usage of the "
-"OpenGL Frame Buffer Objects (FBO) extension.\n"
-"The choice depends on game and your video card. FBO off is good for NVIDIA "
-"cards, while for ATI cards, it's usually best that FBOs are turned on.\n"
-"Also, some FB effects works only with one of the methods, no matter, which "
-"card you have.\n"
-"On the whole, with FBO off, compatibility/ accuracy is a bit better (which "
-"is the case for Resident Evil 2).\n"
-"However, with FBO on with some systems, it can actually be a bit faster in "
-"cases.\n"
-"[Recommended: video card and game dependant]"
-msgstr ""
-
-#: Config.cpp:578
-msgid "Emulation settings"
-msgstr ""
-
-#: Config.cpp:579
-msgid ""
-"Filtering mode\n"
-"There are three filtering modes possible:\n"
-"* Automatic filtering - filter exactly how the N64 specifies.\n"
-"* Point-sampled filtering - causes texels to appear square and sharp.\n"
-"* Bilinear filtering - interpolates the texture to make it appear more "
-"smooth.\n"
-"[Recommended: Automatic]"
-msgstr ""
-
-#: Config.cpp:583
-msgid ""
-"Buffer swapping method\n"
-"There are 3 buffer swapping methods:\n"
-"* old - swap buffers when vertical interrupt has occurred.\n"
-"* new - swap buffers when set of conditions is satisfied. Prevents flicker "
-"on some games.\n"
-"* hybrid - mix of first two methods.\n"
-"Can prevent even more flickering then previous method, but also can cause "
-"artefacts.\n"
-"If you have flickering problems in a game (or graphics that don't show),\n"
-"try to change swapping method.\n"
-"[Recommended: new (hybrid for Paper Mario)]"
-msgstr ""
-
-#: Config.cpp:587
-msgid ""
-"Per-pixel level-of-detail calculation\n"
-"N64 uses special mechanism for mip-mapping, which nearly impossible to "
-"reproduce\n"
-"correctly on PC hardware. This option enables approximate emulation of this "
-"feature.\n"
-"For example, it is required for the Peach/Bowser portrait's transition in "
-"Super Mario 64.\n"
-"There are 3 modes:\n"
-"* off - LOD is not calculated\n"
-"* fast - fast imprecise LOD calculation.\n"
-"* precise - most precise LOD calculation possible, but more slow.\n"
-"[Recommended: your preference]"
-msgstr ""
-
-#: Config.cpp:592
-msgid ""
-"Aspect ratio of the output.\n"
-"Most N64 games use 4:3 aspect ratio, but some support widescreen too.\n"
-"You may select appropriate aspect here and set widescreen mode in game "
-"settings.\n"
-"In \"Stretch\" mode the output will be stretched to the entire screen,\n"
-"other modes may add black borders if necessary"
-msgstr ""
-
-#: Config.cpp:595
-msgid ""
-"Fog enabled\n"
-"Sets fog emulation on//off.\n"
-"[Recommended: on]"
-msgstr ""
-
-#: Config.cpp:597
-msgid ""
-"Buffer clear on every frame\n"
-"Forces the frame buffer to be cleared every frame drawn.\n"
-"Usually frame buffer clear is controlled by the game.\n"
-"However, in some cases it is not well emulated,\n"
-"and some garbage may be left on the screen.\n"
-"In such cases, this option must be set on.\n"
-"[Recommended: on]"
-msgstr ""
-
-#: Config.cpp:599
-msgid ""
-"Enable frame buffer emulation\n"
-"If on, plugin will try to detect frame buffer usage and apply appropriate "
-"frame buffer emulation.\n"
-"[Recommended: on for games which use frame buffer effects]"
-msgstr ""
-
-#: Config.cpp:601
-msgid ""
-"Enable hardware frame buffer emulation\n"
-"If this option is on, plugin will create auxiliary frame buffers in video "
-"memory instead of copying\n"
-"frame buffer content into main memory. This allows plugin to run frame "
-"buffer effects without slowdown\n"
-"and without scaling image down to N64's native resolution. This feature is "
-"fully supported by\n"
-"Voodoo 4/5 cards and partially by Voodoo3 and Banshee. Modern cards also "
-"fully support it.\n"
-"[Recommended: on, if supported by your hardware]"
-msgstr ""
-
-#: Config.cpp:604
-msgid ""
-"Get information about frame buffers\n"
-"This is compatibility option. It must be set on for Mupen64 and off for 1964"
-msgstr ""
-
-#: Config.cpp:606
-msgid ""
-"Read every frame\n"
-"In some games plugin can't detect frame buffer usage.\n"
-"In such cases you need to enable this option to see frame buffer effects.\n"
-"Every drawn frame will be read from video card -> it works very slow.\n"
-"[Recommended: mostly off (needed only for a few games)]"
-msgstr ""
-
-#: Config.cpp:608
-msgid ""
-"Render N64 frame buffer as texture\n"
-"When this option is enabled, content of each N64 frame buffer is rendered\n"
-"as texture over the frame, rendered by the plugin. This prevents graphics "
-"lost,\n"
-"but may cause slowdowns and various glitches in some games.\n"
-"[Recommended: mostly off]"
-msgstr ""
-
-#: Config.cpp:610
-msgid ""
-"Detect CPU write to the N64 frame buffer\n"
-"This option works as the previous options, but the plugin is trying to "
-"detect,\n"
-"when game uses CPU writes to N64 frame buffer. The N64 frame buffer is "
-"rendered\n"
-"only when CPU writes is detected. Use this option for those games, in which "
-"you\n"
-"see still image or no image at all for some time with no reason.\n"
-"[Recommended: mostly off]"
-msgstr ""
-
-#: Config.cpp:612
-msgid ""
-"Enable depth buffer rendering\n"
-"This option is used to fully emulate N64 depth buffer.\n"
-"It is required for correct emulation of depth buffer based effects.\n"
-"However, it requires fast (>1GHz) CPU to work full speed.\n"
-"[Recommended: on for fast PC]"
-msgstr ""
-
-#: Config.cpp:620
-msgid ""
-"Filters:\n"
-"Apply a filter to either smooth or sharpen textures.\n"
-"There are 4 different smoothing filters and 2 different sharpening filters.\n"
-"The higher the number, the stronger the effect,\n"
-"i.e. \"Smoothing filter 4\" will have a much more noticeable effect than "
-"\"Smoothing filter 1\".\n"
-"Be aware that performance may have an impact depending on the game and/or "
-"the PC.\n"
-"[Recommended: your preference]"
-msgstr ""
-
-#: Config.cpp:624
-msgid ""
-"Texture enhancement:\n"
-"7 different filters are selectable here, each one with a distinctive look.\n"
-"Be aware of possible performance impacts.\n"
-"\n"
-"IMPORTANT: 'Store' mode - saves textures in cache 'as is'. It can improve "
-"performance in games, which load many textures.\n"
-"Disable 'Ignore backgrounds' option for better result.\n"
-"\n"
-"[Recommended: your preference]"
-msgstr ""
-
-#: Config.cpp:628
-msgid ""
-"Texture cache size:\n"
-"Enhanced and filtered textures can be cached to aid performance.\n"
-"This setting will adjust how much PC memory will be dedicated for texture "
-"cache.\n"
-"This helps boost performance if there are subsequent requests for the same "
-"texture (usually the case).\n"
-"Normally, 128MB should be more than enough but there is a sweet spot for "
-"each game.\n"
-"Super Mario may not need more than 32megs, but Conker streams a lot of "
-"textures,\n"
-"so setting 256+ megs can boost performance. Adjust accordingly if you are "
-"encountering speed issues.\n"
-"'0' disables cache.\n"
-"[Recommended: PC and game dependant]"
-msgstr ""
-
-#: Config.cpp:634
-msgid ""
-"Ignore Backgrounds:\n"
-"It is used to skip enhancement for long narrow textures, usually used for "
-"backgrounds.\n"
-"This may save texture memory greatly and increase performance.\n"
-"[Recommended: on (off for 'Store' mode)]"
-msgstr ""
-
-#: Config.cpp:636
-msgid ""
-"Texture compression:\n"
-"Textures will be compressed using selected texture compression method.\n"
-"The overall compression ratio is about 1/6 for FXT1 and 1/4 for S3TC.\n"
-"In addition to saving space on the texture cache,\n"
-"the space occupied on the GFX hardware's texture RAM,\n"
-"by the enhanced textures, will be greatly reduced.\n"
-"This minimizes texture RAM usage,\n"
-"decreasing the number of texture swaps to the GFX hardware leading to "
-"performance gains.\n"
-"However, due to the nature of lossy compression of FXT1 and S3TC, using this "
-"option can sometimes lead to quality degradation of small size textures and "
-"color banding of gradient colored textures.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:640
-msgid ""
-"Compress texture cache:\n"
-"Memory will be compressed so that more textures can be held in the texture "
-"cache.\n"
-"The compression ratio varies with each texture,\n"
-"but 1/5 of the original size would be a modest approximation.\n"
-"They will be decompressed on-the-fly, before being downloaded to the gfx "
-"hardware.\n"
-"This option will still help save memory space even when using texture "
-"compression.\n"
-"[Recommended: on]"
-msgstr ""
-
-#: Config.cpp:642
-msgid ""
-"Hi-res pack format:\n"
-"Choose which method is to be used for loading Hi-res texture packs.\n"
-"Only Rice's format is available currently.\n"
-"Leave on \"None\" if you will not be needing to load hi-res packs.\n"
-"[Recommended: Rice's format. Default: \"None\"]"
-msgstr ""
-
-#: Config.cpp:646
-msgid ""
-"Tile textures:\n"
-"When on, wide texture will be split on several tiles to fit in one 256-width "
-"texture.\n"
-"This tiled texture takes much less video memory space and thus overall "
-"performance will increase.\n"
-"However, corresponding polygons must be split too, and this is not polished "
-"yet\n"
-"- various issues are possible, including black lines and polygons "
-"distortions.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:648
-msgid ""
-"Force 16bpp textures:\n"
-"The color of the textures will be reduced to 16bpp.\n"
-"This is another space saver and performance enhancer.\n"
-"This halves the space used on the texture cache and the GFX hardware's "
-"texture RAM.\n"
-"Color reduction is done so that the original quality is preserved as much as "
-"possible.\n"
-"Depending on the texture, this usually is hardly noticeable.\n"
-"Sometimes though, it can be: skies are a good example.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:650
-msgid ""
-"Texture dumping mode:\n"
-"In this mode, you have that ability to dump textures on screen to the "
-"appropriate folder.\n"
-"You can also reload textures while the game is running to see how they look "
-"instantly - big time saver!\n"
-"\n"
-"Hotkeys: \"R\" reloads hires textures from the texture pack - \"D\" toggles "
-"texture dumps on/off."
-msgstr ""
-
-#: Config.cpp:652
-msgid ""
-"Alternative CRC calculation:\n"
-"This option enables emulation of a palette CRC calculation bug in "
-"RiceVideo.\n"
-"If some textures are not loaded, try to set this option on/off.\n"
-"[Recommended: texture pack dependant, mostly on]"
-msgstr ""
-
-#: Config.cpp:657
-msgid ""
-"Compress texture cache:\n"
-"When game started, plugin loads all its hi-resolution textures into PC "
-"memory.\n"
-"Since hi-resolution textures are usually large, the whole pack can take "
-"hundreds megabytes of memory.\n"
-"Cache compression allows save memory space greatly.\n"
-"Textures will be decompressed on-the-fly, before being downloaded to the gfx "
-"hardware.\n"
-"This option will still help save memory space even when using texture "
-"compression.\n"
-"[Recommended: on]"
-msgstr ""
-
-#: Config.cpp:659
-msgid ""
-"Use Alpha channel fully:\n"
-"When this option is off, 16bit rgba textures will be loaded using RiceVideo "
-"style\n"
-"- with 1bit for alpha channel.\n"
-"When it is on, GlideHQ will check, how alpha channel is used by the hires "
-"texture,\n"
-"and select most appropriate format for it.\n"
-"This gives texture designers freedom to play with alpha, as they need,\n"
-"regardless of format of original N64 texture.\n"
-"For older and badly designed texture packs it can cause unwanted black "
-"borders.\n"
-"[Recommended: texture pack dependant]"
-msgstr ""
-
-#: Config.cpp:662
-msgid ""
-"Save texture cache to HD:\n"
-"\n"
-"For enhanced textures cache:\n"
-"This will save all previously loaded and enhanced textures to HD.\n"
-"So upon next game launch, all the textures will be instantly loaded, "
-"resulting in smoother performance.\n"
-"\n"
-"For high-resolution textures cache:\n"
-"After creation, loading hi-res texture will take only a few seconds upon "
-"game launch,\n"
-"as opposed to the 5 -60 seconds a pack can take to load without this cache "
-"file.\n"
-"The only downside here is upon any changes to the pack, the cache file will "
-"need to be manually deleted.\n"
-"\n"
-"Saved cache files go into a folder called \"Cache\" within the Plugins "
-"folder.\n"
-"\n"
-"[Highly Recommended: on]"
-msgstr ""
-
-#: Config.cpp:685
-msgid "Debug"
-msgstr ""
-
-#: Config.cpp:686
-msgid ""
-"Autodetect Microcode\n"
-"If this option is checked, the microcode of the game\n"
-"will be detected automatically from the INI, and\n"
-"therefore it will not need to be set in this\n"
-"configuration dialog.\n"
-"[Recommended: on]"
-msgstr ""
-
-#: Config.cpp:688
-msgid ""
-"Force Microcode\n"
-"This option ONLY has an effect if Autodetect Microcode\n"
-"is unchecked, the crc from the game could not be\n"
-"found in the INI, OR after the game has already started\n"
-"running. In any of those three cases, this will\n"
-"select the microcode to use\n"
-"[Recommended: any, turn on Autodetect Microcode]"
-msgstr ""
-
-#: Config.cpp:692
-msgid ""
-"Wireframe\n"
-"This option, when checked, makes it so that the plugin will draw only the\n"
-"outlines of objects.  The colors specified in the combo box to the right\n"
-"determines the color that the wireframes show up as.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:694
-msgid ""
-"Wireframe Colors\n"
-"This selects the colors to use for the wireframes (if wireframe mode is "
-"enabled).\n"
-"There are 3 modes:\n"
-"* Original colors - draw exactly as it would normally, textures and all, "
-"only in wireframes.\n"
-"* Vertex colors - use the colors specified in the vertices to draw the "
-"wireframes with.\n"
-"* Red only - use a constant red color to draw the wireframes.\n"
-"[Recommended: Vertex colors]"
-msgstr ""
-
-#: Config.cpp:696
-msgid ""
-"Log to RDP.txt\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option, when checked, will log EVERY "
-"SINGLE\n"
-"COMMAND the plugin processes to a file called RDP.txt in the current "
-"directory.\n"
-"This is incredibly slow, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:698
-msgid ""
-"Unknown combiners as red\n"
-"Objects that use an unimplemented combine mode will show up as red instead "
-"of\n"
-"assuming texture with full alpha. Disable this option to remove the red "
-"stuff\n"
-"and at least have a guess at the correct combine mode.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:700
-msgid ""
-"Log clear every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option has no effect unless 'Log to "
-"RDP.txt'\n"
-"is checked. This will make it so that the log, RDP.txt, will be cleared at "
-"the\n"
-"beginning of every frame.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:702
-msgid ""
-"Log unknown combiners\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will cause every\n"
-"unimplemented combiner drawn to be logged to a file called Unimp.txt in the\n"
-"current directory. This becomes slow when there are unimplemented combiners\n"
-"on the screen, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:704
-msgid ""
-"Run and log in window\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option will make it so that the plugin "
-"will\n"
-"still process dlists in windowed mode. This allows for logging to occur "
-"while not\n"
-"in fullscreen, possibly allowing you to debug a crash.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:706
-msgid ""
-"Clear unknown combiner log every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option works much like 'Log clear "
-"every frame'\n"
-"except it clears the combiner log (Unimp.txt) instead of RDP.txt at the\n"
-"beginning of each frame. Again, this option has no effect if 'combiner "
-"logging' is disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:709
-msgid ""
-"Bilinear filter texture cache\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will make the "
-"graphical\n"
-"debugger texture cache use bilinear filtering as opposed to point-sampled "
-"filtering,\n"
-"which it will use otherwise. See 'Filtering mode' for descriptions of "
-"bilinear and\n"
-"point-sampled filtering.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:1104
-msgid "Glide64 settings"
-msgstr ""
-
-#: Config.cpp:1293
-msgid "About Glide64"
-msgstr ""
-
-#: Config.cpp:1326
-msgid "authors:"
-msgstr ""
-
-#: Config.cpp:1330
-msgid ""
-"Dave2001. Original author and former main developer.\n"
-"He founded Glide64 project on Dec. 29th, 2001.\n"
-"Left the project at fall of 2002.\n"
-msgstr ""
-
-#: Config.cpp:1336
-msgid ""
-"Gugaman. Developer. Joined the project at winter 2002\n"
-" and left it at fall 2002."
-msgstr ""
-
-#: Config.cpp:1342
-msgid ""
-"Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\n"
-"Main developer since fall of 2002."
-msgstr ""
-
-#: Config.cpp:1347
-msgid "Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. "
-msgstr ""
-
-#: Config.cpp:1350
-msgid "Glitch64 (the wrapper) authors:"
-msgstr ""
-
-#: Config.cpp:1374
-msgid "GlideHQ author:"
-msgstr ""
-
-#: Config.cpp:1381
-msgid "beta tester:"
-msgstr ""
-
-#: Config.cpp:1388
-msgid ""
-"special thanks to:\n"
-" Orkin, Rice, Daniel Borca, Legend.\n"
-"Thanks to EmuXHaven for hosting my site:\n"
-"http://glide64.emuxhaven.net\n"
-msgstr ""
diff --git a/Source/Glide64/Internalization/Glide64_fr_FR.po b/Source/Glide64/Internalization/Glide64_fr_FR.po
deleted file mode 100644
index d619e39af..000000000
--- a/Source/Glide64/Internalization/Glide64_fr_FR.po
+++ /dev/null
@@ -1,1336 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 17:29+0700\n"
-"PO-Revision-Date: 2011-12-29 12:30+0700\n"
-"Last-Translator: Navitel <support@navitel.su>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Config.cpp:64
-msgid "Rendering"
-msgstr "Rendu"
-
-#: Config.cpp:65
-msgid "Other"
-msgstr "Autres"
-
-#: Config.cpp:66
-msgid "Speed"
-msgstr "Vitesse"
-
-#: Config.cpp:67
-msgid "Time"
-msgstr "Heure"
-
-#: Config.cpp:68
-msgid "On screen display"
-msgstr "Affichage"
-
-#: Config.cpp:69
-msgid "OpenGL settings"
-msgstr "Configuration OpenGL"
-
-#: Config.cpp:70
-#: Config.cpp:137
-msgid "Frame buffer emulation"
-msgstr "Emulation du frame buffer"
-
-#: Config.cpp:71
-msgid ""
-"Windowed or\n"
-"3dfx card resolution:"
-msgstr ""
-"Fenétré ou\n"
-"resolution de la carte 3DFX"
-
-#: Config.cpp:99
-msgid "Vertical sync"
-msgstr "Synchronisation verticale"
-
-#: Config.cpp:100
-msgid "Show advanced emulation options"
-msgstr "Afficher les options d'emulation avancée"
-
-#: Config.cpp:101
-msgid "Show texture enhancement options"
-msgstr "Afficher les options des textures améliorés"
-
-#: Config.cpp:102
-msgid "Screenshot format:"
-msgstr "Format des captures d'écran"
-
-#: Config.cpp:105
-msgid "Language: "
-msgstr "Langues:"
-
-#: Config.cpp:106
-msgid "LANGUAGE_NAME"
-msgstr "Francais"
-
-#: Config.cpp:112
-msgid "FPS counter"
-msgstr "Compteur FPS"
-
-#: Config.cpp:113
-msgid "VI/s counter"
-msgstr "Compteur VI/s"
-
-#: Config.cpp:114
-#, c-format
-msgid "% speed"
-msgstr "% speed"
-
-#: Config.cpp:115
-msgid "Clock enabled"
-msgstr "Horloge activé"
-
-#: Config.cpp:116
-msgid "Clock is 24-hour"
-msgstr "Horloge est 24-heure"
-
-#: Config.cpp:117
-msgid "Transparent text background"
-msgstr "Texte transparent"
-
-#: Config.cpp:118
-msgid ""
-"Full screen\n"
-"resolution:"
-msgstr ""
-"Plein écran\n"
-"résolution"
-
-#: Config.cpp:121
-msgid "Anisotropic filtering"
-msgstr "Filterage Anisotropic"
-
-#: Config.cpp:122
-msgid "Autodetect "
-msgstr "Autodetection"
-
-#: Config.cpp:123
-msgid "VRAM size"
-msgstr "Taille VRAM"
-
-#: Config.cpp:125
-msgid "Mb"
-msgstr "Mb"
-
-#: Config.cpp:126
-msgid "Use frame buffer objects"
-msgstr "Utiliser frame buffer objects"
-
-#: Config.cpp:133
-msgid "Current game emulation settings. Change with care!"
-msgstr "paramétres d'émulation actuelle. A changer avec précaution!"
-
-#: Config.cpp:135
-msgid "Default emulation settings. Not recommended to change!"
-msgstr "Paramétres d'émulation par défaut. Changement non recommandé.!"
-
-#: Config.cpp:136
-msgid "General options"
-msgstr "Options générales"
-
-#: Config.cpp:138
-msgid "Depth buffer emulation"
-msgstr "Emulation Depth buffer"
-
-#: Config.cpp:139
-msgid "Filtering mode:"
-msgstr "Mode de filtrage"
-
-#: Config.cpp:141
-msgid "Automatic"
-msgstr "Automatique"
-
-#: Config.cpp:142
-msgid "Force Bilinear"
-msgstr "Forcer Bilinéaire"
-
-#: Config.cpp:143
-msgid "Force Point-sampled"
-msgstr "Forcer Point sampled"
-
-#: Config.cpp:146
-msgid "Buffer swapping method:"
-msgstr "Méthode de changement de buffer"
-
-#: Config.cpp:148
-msgid "Old"
-msgstr "Vieux"
-
-#: Config.cpp:149
-msgid "New"
-msgstr "Nouveau"
-
-#: Config.cpp:150
-msgid "Hybrid"
-msgstr "Hybride"
-
-#: Config.cpp:153
-msgid "LOD calculation:"
-msgstr "Calculation LOD:"
-
-#: Config.cpp:155
-msgid "off"
-msgstr "désactivé"
-
-#: Config.cpp:156
-msgid "fast"
-msgstr "rapide"
-
-#: Config.cpp:157
-msgid "precise"
-msgstr "précis"
-
-#: Config.cpp:160
-msgid "Aspect ratio:"
-msgstr "Ratio d'aspect"
-
-#: Config.cpp:162
-msgid "4:3 (default)"
-msgstr "4:3 (défaut)"
-
-#: Config.cpp:163
-msgid "Force 16:9"
-msgstr "Forcer 16:9"
-
-#: Config.cpp:164
-msgid "Stretch"
-msgstr "Etirer"
-
-#: Config.cpp:165
-msgid "Original"
-msgstr "Originale"
-
-#: Config.cpp:168
-msgid "Fog"
-msgstr "Brouillard"
-
-#: Config.cpp:169
-msgid "Buffer clear on every frame"
-msgstr "Vider Buffer à chaque image"
-
-#: Config.cpp:170
-msgid "Enable frame buffer emulation"
-msgstr "Activer émulation du frame buffer"
-
-#: Config.cpp:171
-msgid "Hardware frame buffer emulation"
-msgstr "Emulation matériel du frame buffer "
-
-#: Config.cpp:172
-msgid "Get frame buffer info"
-msgstr "Obtenir les infos frame buffer"
-
-#: Config.cpp:173
-msgid "Read every frame (slow!)"
-msgstr "Lire chaque image (lent)"
-
-#: Config.cpp:174
-msgid "Render N64 frame buffer as texture"
-msgstr "Rendre le frame buffer de la N64 comme une texture"
-
-#: Config.cpp:175
-msgid "Detect CPU write to the N64 frame buffer"
-msgstr "Detecter écritures du CPU dans le frame buffer de la N64"
-
-#: Config.cpp:176
-msgid "Software depth buffer rendering"
-msgstr "Rendu du buffer de profondeur da manière logicielle"
-
-#: Config.cpp:200
-#: Config.cpp:619
-msgid "Texture enhancement"
-msgstr "Amélioration des textures"
-
-#: Config.cpp:201
-msgid "Hi-resolution textures"
-msgstr "Textures hautes resolutions"
-
-#: Config.cpp:202
-msgid "Common"
-msgstr "Commun"
-
-#: Config.cpp:203
-msgid "Presets"
-msgstr "Prédéfinis"
-
-#: Config.cpp:204
-#: Config.cpp:205
-msgid "Performance tweaks"
-msgstr "Performance "
-
-#: Config.cpp:206
-msgid "Filter"
-msgstr "Filtre"
-
-#: Config.cpp:208
-#: Config.cpp:219
-#: Config.cpp:238
-msgid "None"
-msgstr "Aucun"
-
-#: Config.cpp:209
-msgid "Smooth filtering 1"
-msgstr "Filtre doux 1"
-
-#: Config.cpp:210
-msgid "Smooth filtering 2"
-msgstr "Filtre doux 2"
-
-#: Config.cpp:211
-msgid "Smooth filtering 3"
-msgstr "Filtre doux 3"
-
-#: Config.cpp:212
-msgid "Smooth filtering 4"
-msgstr "Filtre doux 1"
-
-#: Config.cpp:213
-msgid "Sharp filtering 1"
-msgstr "Filtre dur 1"
-
-#: Config.cpp:214
-msgid "Sharp filtering 2"
-msgstr "Filtre dur 1"
-
-#: Config.cpp:217
-msgid "Enhancement"
-msgstr "Amélioration"
-
-#: Config.cpp:220
-msgid "Store"
-msgstr "Stocker"
-
-#: Config.cpp:230
-msgid "Texture cache"
-msgstr "Mise en cache des textures"
-
-#: Config.cpp:232
-msgid "Mbytes"
-msgstr "Mbytes"
-
-#: Config.cpp:233
-msgid "Ignore Backgrounds"
-msgstr "Ignorer les arriéres plans"
-
-#: Config.cpp:234
-#: Config.cpp:245
-msgid "Apply texture compression"
-msgstr "Appliquer la compression des textures"
-
-#: Config.cpp:235
-#: Config.cpp:246
-msgid "Compress texture cache"
-msgstr "Compresser la mise en cache des textures"
-
-#: Config.cpp:236
-msgid "Format"
-msgstr "Format"
-
-#: Config.cpp:239
-msgid "Rice format"
-msgstr "Format Rice"
-
-#: Config.cpp:242
-msgid "Tile textures"
-msgstr "Texures de tuiles"
-
-#: Config.cpp:243
-msgid "Force 16bpp textures"
-msgstr "Forcer les textures en 16bits"
-
-#: Config.cpp:244
-msgid "Alternative CRC calculation"
-msgstr "Calculation CRC alternative"
-
-#: Config.cpp:247
-msgid "Use alpha channel fully"
-msgstr "Utilisation totale du canal alpha "
-
-#: Config.cpp:248
-msgid "Texture dumping/editing mode"
-msgstr "Dump des texutres/mode d'édition"
-
-#: Config.cpp:249
-msgid "Texture compression method"
-msgstr "méthode de compression des textures"
-
-#: Config.cpp:255
-msgid "Save texture cache to hard disk"
-msgstr "Sauver le cache texture sur le disque dur"
-
-#: Config.cpp:256
-msgid "Best performance"
-msgstr "Meilleure performance"
-
-#: Config.cpp:257
-msgid "Best texture quality"
-msgstr "Meilleure qualité de textures"
-
-#: Config.cpp:263
-msgid "Developers settings"
-msgstr "Paramétres développeurs"
-
-#: Config.cpp:264
-msgid "Debug/Misc"
-msgstr "Debug/Divers"
-
-#: Config.cpp:265
-msgid "Autodetect Microcode"
-msgstr "Détection automatique du microcode"
-
-#: Config.cpp:266
-msgid "Force Microcode:"
-msgstr "Forcage du Microcode:"
-
-#: Config.cpp:279
-msgid "Wireframe using:"
-msgstr "Rendu fil de fer"
-
-#: Config.cpp:281
-msgid "Original colors"
-msgstr "Couleurs d'origine"
-
-#: Config.cpp:282
-msgid "Vertex colors"
-msgstr "Couleurs des vertex"
-
-#: Config.cpp:283
-msgid "Red only"
-msgstr "Rouge seulement"
-
-#: Config.cpp:286
-msgid "Log to rdp.txt (SLOW)"
-msgstr "Logger vers rdp.txt(lent)"
-
-#: Config.cpp:287
-msgid "Unknown combiners as red"
-msgstr "Combiners inconnus en rouge"
-
-#: Config.cpp:288
-msgid "Log clear every frame"
-msgstr "Vidage du log à chaque frame"
-
-#: Config.cpp:289
-msgid "Combiner logging"
-msgstr "Loggage des combiners"
-
-#: Config.cpp:290
-msgid "Run (+log) in window"
-msgstr "Démarrer (+log) en mode fenétré"
-
-#: Config.cpp:291
-msgid "Cmb. clear every frame"
-msgstr "effacer Cmb. a chaque frame "
-
-#: Config.cpp:292
-msgid "Error log (rdp_e.txt)"
-msgstr "Log d'erreurs (rdp_e.txt)"
-
-#: Config.cpp:293
-msgid "Bilinear filter texture cache"
-msgstr "Cache des textures filtrées bilinéaires"
-
-#: Config.cpp:325
-#: Config.cpp:546
-msgid " auto"
-msgstr "auto"
-
-#: Config.cpp:382
-msgid "Please choose language:"
-msgstr "SVP choissisez la langue"
-
-#: Config.cpp:383
-msgid "Language"
-msgstr "Langue"
-
-#: Config.cpp:390
-msgid "Press OK to change to "
-msgstr "Pressez OK pour changer à"
-
-#: Config.cpp:486
-msgid "Basic settings"
-msgstr "Paramétres basiques"
-
-#: Config.cpp:487
-msgid ""
-"Resolution\n"
-"This option selects the fullscreen resolution for 3dfx cards and windowed resolution for other cards\n"
-"(note again that for 3dfx cards the plugin must be in fullscreen mode to see anything).\n"
-"[Recommended: 640x480, 800x600, 1024x768]"
-msgstr ""
-"Résolution\n"
-"Cette option choisit la resolution plein écran des cartes 3dfx ou la résolution fenétré pour les autres cartes\n"
-"(attention avec les cartes 3dfx les plugin doit être en mode plein écran pour voir quelque chose).\n"
-"[Recommandé: 640x480, 800x600, 1024x768]"
-
-#: Config.cpp:491
-msgid ""
-"Vertical sync\n"
-"This option will enable the vertical sync, which will prevent tearing.\n"
-"Note: this option will ONLY have effect if vsync is set to \"Software Controlled\".\n"
-msgstr ""
-"Vertical sync\n"
-"Cette option va activer la synchronisation verticale, ce qui va empécher les balayages.\n"
-
-#: Config.cpp:493
-msgid "Select a format, in which screen shots will be saved"
-msgstr "Choissisez un format dans lequel les captures d'écran seront sauvés"
-
-#: Config.cpp:500
-msgid ""
-"Language select:\n"
-"Press the button to invoke language selection dialog.\n"
-"Selected language will be activated after restart of the configuration dialog."
-msgstr ""
-"Selection de la language:\n"
-"Pressez le bouton pour demander la menu de séléection du language.\n"
-"Le language sélectionné sera activé aprés le rédémmarage de la boite de dialogue."
-
-#: Config.cpp:501
-msgid ""
-"FPS counter\n"
-"When this option is checked, a FPS (frames per second) counter will be shown\n"
-"in the lower left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Compteur FPS\n"
-"Lorsque cette option est activé, un compteur FPS (Frame Per Second) sera affiché\n"
-"dans le coin gauche en bas de l'écran.\n"
-"[Recommandé: votre préférence]"
-
-#: Config.cpp:503
-msgid ""
-"VI/s counter\n"
-"When this option is checked, a VI/s (vertical interrupts per second) counter\n"
-"will be shown in the lower left corner of the screen.  This is like the FPS\n"
-"counter but will be consistent at 60 VI/s for full speed on NTSC (U) games and\n"
-"50 VI/s for full speed on PAL (E) ones.\n"
-"[Recommended: your preference]"
-msgstr ""
-"VI/s counter\n"
-"Lorsque cette option est activée, un compteur VI/s (vertical interrupts per second)\n"
-"sera affiché dans le coin gauche en bas de l'écran. Ce sera comme le compteur FPS\n"
-"mais il sera toujouts a 60/VI/s à plein vitesse pour les jeux NTSC (U) games et\n"
-"50 VI/s à pleine vitesse pour un jeu PAL (E).\n"
-"[Recommandé: votre préférence]"
-
-#: Config.cpp:505
-#, c-format
-msgid ""
-"% speed\n"
-"This displays a percentage of the actual N64 speed in the lower\n"
-"left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"% speed\n"
-"Ceci affiche le pourcentage de la vitesse de la N64 dans le coin gauche\n"
-"en bas de l'écran.\n"
-"[Recommandé: votre préférence]"
-
-#: Config.cpp:507
-msgid ""
-"Clock enabled\n"
-"This option will put a clock in the lower right corner of the screen, showing the current time.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Horloge activée\n"
-"Cette option affichera l'heure dans le coin droit de l'écran.\n"
-"[Recommandé: votre préférence]"
-
-#: Config.cpp:510
-msgid ""
-"Display hours as 24-hour clock.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Afficher l'heure comme une horloge de 24 heures.\n"
-"[Recommandé: votre préférence]"
-
-#: Config.cpp:511
-msgid ""
-"Transparent text background\n"
-"If this is checked, all on-screen messages will have a transparent background.  Otherwise, it will have a solid black background.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Texte en arrière plan transparent\n"
-"Si activé, tout les messages à l'écran affichés aurant un arrière plan transparent. Autrement ils auront une arrière plan opaque.\n"
-"[Recommandé: votre préférence]"
-
-#: Config.cpp:514
-msgid ""
-"Enable \"Emulation settings\" panel. For experienced users only!\n"
-"It shows default emulation settings when game is not loaded, or current game settings otherwise."
-msgstr ""
-"Activer le panneau \"paramètres d'émulation\". Pour utilisateurs expérimentés seulement!\n"
-"Il montre les options d'émulation par défault si aucun jeu n'est chargé. Si un jeu est chargé les options d'émulation de ce jeu particulier autrement."
-
-#: Config.cpp:516
-msgid ""
-"Enable \"Texture enhancement\" panel.\n"
-"It shows various enhancement options for original textures as well as options for hi-resolution textures."
-msgstr ""
-"Activer un panneau \"Amélioration des textures\".\n"
-"Il montre les divers options d'amélioration des textures originales ainsi ques les options pour les textures hautes résolutions."
-
-#: Config.cpp:517
-msgid ""
-"Full screen resolution:\n"
-"This sets the full screen resolution for non-3dfx video cards.\n"
-"All the resolutions that your video card/monitor support should be displayed.\n"
-"[Recommended: native (max) resolution of your monitor - unless performance becomes an issue]"
-msgstr ""
-"Résolution plein écran:\n"
-"Cela paramétre la résolution plein écran pour les cartes graphiques non-3dfx.\n"
-"Toutes les résolutions supportées par votre carte vidéo/écran devrait être affichées.\n"
-"[Recommandé: résolution native de votre écran - sauf en cas de soucis de performance]"
-
-#: Config.cpp:520
-msgid ""
-"Anisotropic filtering:\n"
-"This filter sharpens and brings out the details of textures that recede into the distance.\n"
-"When activated, it will use the max anisotropy your video card supports.\n"
-"However, this will override native way of texture filtering and may cause visual artifacts in some games.\n"
-"[Recommended: your preference, game dependant]"
-msgstr ""
-"Filtrage anisotropic:\n"
-"Ce filtre améliore les détails des textures qui s'estompe vers l'horizon.\n"
-"Activé ce paramétre utilisera le niveau maximum d'anisotropie supporté par votre carte vidéo.\n"
-"Par contre ce filtrage supplantera la manière native de filtrage des textures et peut causer des parasites visuels dans certains jeux.\n"
-"[Recommandé: votre préférence, selon le jeu]"
-
-#: Config.cpp:521
-msgid ""
-"Autodetect VRAM Size:\n"
-"Since OpenGL cannot do this reliably at the moment, the option to set this manually is available.\n"
-"If checked, plugin will try to autodetect VRAM size.\n"
-"But if this appears wrong, please uncheck and set it to correct value.\n"
-"[Recommended: on]"
-msgstr ""
-"Autodetection de la taille de mémoire vidéo::\n"
-"Comme OpenGL ne peut effectuer la detection de la mémoire vidéo de manière fiable, une option manuelle est disponible.\n"
-"Si activée, le plugin tentera de détecter la taille de la mémoire vidéoMais si celle-ci est incorrecte, svp desactivez l'option et saisissez la valeur correct.\n"
-"[Recommandé: activé]"
-
-#: Config.cpp:523
-msgid ""
-"Use frame buffer objects:\n"
-"Changes the way FB effects are rendered - with or without usage of the OpenGL Frame Buffer Objects (FBO) extension.\n"
-"The choice depends on game and your video card. FBO off is good for NVIDIA cards, while for ATI cards, it's usually best that FBOs are turned on.\n"
-"Also, some FB effects works only with one of the methods, no matter, which card you have.\n"
-"On the whole, with FBO off, compatibility/ accuracy is a bit better (which is the case for Resident Evil 2).\n"
-"However, with FBO on with some systems, it can actually be a bit faster in cases.\n"
-"[Recommended: video card and game dependant]"
-msgstr ""
-"Utiliser \"frame buffer objects\":\n"
-"Change la facon dans les effets frame buffer sont rendu - avec ou sans utilisation de l'extension OpenGL  Frame Buffer Objects (FBO)Ce choix depend du jeu et de votre carte vidéo. Pour les cartes vidéos NVIDIA, FBO est meilleur desactivé alors que pour les cartes vidéos ATI il est habituellement meilleur de l'activer.Aussi certain effets frame buffer ne marche qu'avec l'une des deux méthodes, qu'importe la carte video.\n"
-"De manière générale sans FBO, la compatibilité et la précision est meilleure (par exemple pour Resident Evil 2).\n"
-"Par contre FBO sur certain systèmes est plus rapide dans certains cas.\n"
-"[Recommandé: selon la carte vidéo et le jeu]"
-
-#: Config.cpp:578
-msgid "Emulation settings"
-msgstr "Paramètres d'émulation"
-
-#: Config.cpp:579
-msgid ""
-"Filtering mode\n"
-"There are three filtering modes possible:\n"
-"* Automatic filtering - filter exactly how the N64 specifies.\n"
-"* Point-sampled filtering - causes texels to appear square and sharp.\n"
-"* Bilinear filtering - interpolates the texture to make it appear more smooth.\n"
-"[Recommended: Automatic]"
-msgstr ""
-"Méthode de filtrage\n"
-"Il y a trois méthodes de filtrage possible:\n"
-"* Filtrage automatique - filtre exactement comme la N64 le specifie.\n"
-"* Filtrage Point-sampled - les pixels s'affichent comme des carrés grossiers.\n"
-"* Filtrage Bilinéaire - ce filtre extrapole les textures pour les rendres plus douces.\n"
-"[Recommended: Automatique]"
-
-#: Config.cpp:583
-msgid ""
-"Buffer swapping method\n"
-"There are 3 buffer swapping methods:\n"
-"* old - swap buffers when vertical interrupt has occurred.\n"
-"* new - swap buffers when set of conditions is satisfied. Prevents flicker on some games.\n"
-"* hybrid - mix of first two methods.\n"
-"Can prevent even more flickering then previous method, but also can cause artefacts.\n"
-"If you have flickering problems in a game (or graphics that don't show),\n"
-"try to change swapping method.\n"
-"[Recommended: new (hybrid for Paper Mario)]"
-msgstr ""
-"Méthode de changement de buffer\n"
-"Il y a 3 méthodes de changement de buffer:\n"
-"* ancienne - change de buffer lorque l'interruption verticale s'est faite.\n"
-"* nouvelle -change de buffer lorsque les conditions sont satisfaites. Previent des flashs dans certains jeux.\n"
-"* hybride - mélange des 2 premières méthodes.\n"
-"Peut prévenir encore plus de flashs que la méthode précédente, mais peut aussi en causer.\n"
-"Si vous avez des problémes des flashs dans un jeu (ou les graphiques ne s'affichent pas,\n"
-"essayez de changer de méthode de changement de buffer.\n"
-"[Recommandé: nouvelle (hybride pour Paper Mario)]"
-
-#: Config.cpp:587
-msgid ""
-"Per-pixel level-of-detail calculation\n"
-"N64 uses special mechanism for mip-mapping, which nearly impossible to reproduce\n"
-"correctly on PC hardware. This option enables approximate emulation of this feature.\n"
-"For example, it is required for the Peach/Bowser portrait's transition in Super Mario 64.\n"
-"There are 3 modes:\n"
-"* off - LOD is not calculated\n"
-"* fast - fast imprecise LOD calculation.\n"
-"* precise - most precise LOD calculation possible, but more slow.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Level de détail par pixel\n"
-"La N64 utilise un mechanisme spécial pour le mip-mapping qui est presque impossible à reproduire\n"
-"correctement sur PC. Cette option en active une émulation approximative\n"
-"Par exemple, il est requis pour le portrait de Peach/Browser dans Super Mario 64.\n"
-"Il existe 3 modes:\n"
-"* off - LOD n'est pas calculé\n"
-"* rapide - caculation rapide mais imprécise du LOD.\n"
-"* précise - calculation la plus précise possible du LOD mais plus lente.\n"
-"[Recommandé: votre préférence]"
-
-#: Config.cpp:592
-msgid ""
-"Aspect ratio of the output.\n"
-"Most N64 games use 4:3 aspect ratio, but some support widescreen too.\n"
-"You may select appropriate aspect here and set widescreen mode in game settings.\n"
-"In \"Stretch\" mode the output will be stretched to the entire screen,\n"
-"other modes may add black borders if necessary"
-msgstr ""
-"Ratio d'affichage.\n"
-"La plupart des jeux N64 utilise un ratio d'affichage 4:3, mais certains supportent aussi les écrans 16:9.\n"
-"Vous pouvez choisir le ratio approprié ici et selectionner le mode grand écran dans les paramètres du jeu.\n"
-"En mode \"Etiré\" l'affichage sera étiré sur la totalité de l'écran,\n"
-"les autres modes peuvent ajouter des bords noirs si nécéssaire"
-
-#: Config.cpp:595
-msgid ""
-"Fog enabled\n"
-"Sets fog emulation on//off.\n"
-"[Recommended: on]"
-msgstr ""
-"Brouillard activé\n"
-"Active ou désactive l'émulation du brouillard.\n"
-"[Recommandé: activé]"
-
-#: Config.cpp:597
-msgid ""
-"Buffer clear on every frame\n"
-"Forces the frame buffer to be cleared every frame drawn.\n"
-"Usually frame buffer clear is controlled by the game.\n"
-"However, in some cases it is not well emulated,\n"
-"and some garbage may be left on the screen.\n"
-"In such cases, this option must be set on.\n"
-"[Recommended: on]"
-msgstr ""
-"Vide le Buffer à chaque frame\n"
-"Force le frame buffer à se vider à chaque drawn.\n"
-"Habituellement ce vidage est controlé par le jeu.\n"
-"Par contre dans certain cas cela n'est pas bien émulé,\n"
-"et des rebuts peut rester à l'écran.\n"
-"Dans ces case, cette option doit être utilisée.\n"
-"[Recommandé: activé]"
-
-#: Config.cpp:599
-msgid ""
-"Enable frame buffer emulation\n"
-"If on, plugin will try to detect frame buffer usage and apply appropriate frame buffer emulation.\n"
-"[Recommended: on for games which use frame buffer effects]"
-msgstr ""
-"Active l'émulation du frame buffer\n"
-"Si actif, le plugin essayera de détecter l'usage du frame buffer et appliquera l'émulation du frame buffer appropriée.\n"
-"[Recommandé: actif pour les jeux utilisant des effets de \"frames buffer\"]"
-
-#: Config.cpp:601
-msgid ""
-"Enable hardware frame buffer emulation\n"
-"If this option is on, plugin will create auxiliary frame buffers in video memory instead of copying\n"
-"frame buffer content into main memory. This allows plugin to run frame buffer effects without slowdown\n"
-"and without scaling image down to N64's native resolution. This feature is fully supported by\n"
-"Voodoo 4/5 cards and partially by Voodoo3 and Banshee. Modern cards also fully support it.\n"
-"[Recommended: on, if supported by your hardware]"
-msgstr ""
-"Active l'émulation matérielle du frame buffer \n"
-"Si cette option est active, le plugin crééra des frame buffer auxilliaire dans la mémoire vidéo au lieu de copier\n"
-"le contenu du frame buffer dans la mémoire principale. Ceci permet au plugin d'utiliser les effets frame buffer sans ralenti\n"
-"et sans réduire l'image à la résolution native de la N64. Cette option est supporté pleinement par\n"
-"les cartes Voodoo 4/5 cards and partiellment par les Voodoo3 and les Banshee. Les cartes modernes la supportent pleinement aussi.\n"
-"[Recommandé: activée, si supporté par votre matériel]"
-
-#: Config.cpp:604
-msgid ""
-"Get information about frame buffers\n"
-"This is compatibility option. It must be set on for Mupen64 and off for 1964"
-msgstr ""
-"Obtenir les informations concernant le frame buffer\n"
-"Ceci est un option de compatibilité. Elle doit être activée pour Mupen64 and désactivé pour 1964"
-
-#: Config.cpp:606
-msgid ""
-"Read every frame\n"
-"In some games plugin can't detect frame buffer usage.\n"
-"In such cases you need to enable this option to see frame buffer effects.\n"
-"Every drawn frame will be read from video card -> it works very slow.\n"
-"[Recommended: mostly off (needed only for a few games)]"
-msgstr ""
-"Lire chaque frame\n"
-"Dans certain jeux le plugin ne peut détecter l'usage du frame buffer.\n"
-"Dans de tel case vous devez activer cette option pour voir les effets de frame buffer.\n"
-"Chaque frame sera lu par votre carte vidéo -> ceci marche trés lentement.\n"
-"[Recommandé: normalement desactivée (requis que pour certains jeux)]"
-
-#: Config.cpp:608
-msgid ""
-"Render N64 frame buffer as texture\n"
-"When this option is enabled, content of each N64 frame buffer is rendered\n"
-"as texture over the frame, rendered by the plugin. This prevents graphics lost,\n"
-"but may cause slowdowns and various glitches in some games.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"Rendre le frame buffer de la N64 comme une texture\n"
-"Quand cette option est activée, le contenu de chaque frame buffer de la N64 est rendu\n"
-"comme texture par le plugin. Ceci empéche de perdre certains graphismes,\n"
-"mais peut causer des ralentissements et divers erreurs d'affichage dans certain jeux.\n"
-"[Recommandé: principalement désactivé]"
-
-#: Config.cpp:610
-msgid ""
-"Detect CPU write to the N64 frame buffer\n"
-"This option works as the previous options, but the plugin is trying to detect,\n"
-"when game uses CPU writes to N64 frame buffer. The N64 frame buffer is rendered\n"
-"only when CPU writes is detected. Use this option for those games, in which you\n"
-"see still image or no image at all for some time with no reason.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"Détecte l'écriture du CPU dans le frame buffer de la N64\n"
-"Cette option marche comme les options précédentes mais le plugin va essayer de détecter,\n"
-"lorsque le jeu utilise des écritures du CPU dans le frame buffer de la N64. Le frame buffer de la N64 est rendu\n"
-"seulement lorsque ces écriture sont détectées. Utilisez cette option pour certains jeux dans lequels vous\n"
-"voyez une image fixe ou pas d'image du tout pour un certain temps sont raison.\n"
-"[Recommandé: principalement désactivé]"
-
-#: Config.cpp:612
-msgid ""
-"Enable depth buffer rendering\n"
-"This option is used to fully emulate N64 depth buffer.\n"
-"It is required for correct emulation of depth buffer based effects.\n"
-"However, it requires fast (>1GHz) CPU to work full speed.\n"
-"[Recommended: on for fast PC]"
-msgstr ""
-"Activer le rendu du depth buffer\n"
-"Cette option est utilisé pour émuler pleinement le depth buffer de la N64.\n"
-"Elle est requise pour émuler correctement des effets graphiques basés sur le depth buffer.\n"
-"Par contre cela demande une CPU rapide (>1GHz) pour éviter tout ralentissement.\n"
-"[Recommandé: activée sur les PC rapides]"
-
-#: Config.cpp:620
-msgid ""
-"Filters:\n"
-"Apply a filter to either smooth or sharpen textures.\n"
-"There are 4 different smoothing filters and 2 different sharpening filters.\n"
-"The higher the number, the stronger the effect,\n"
-"i.e. \"Smoothing filter 4\" will have a much more noticeable effect than \"Smoothing filter 1\".\n"
-"Be aware that performance may have an impact depending on the game and/or the PC.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Filtres:\n"
-"Applique un filtre pour adoucir ou affiner les textures.\n"
-"Il y a 4 différentes filtres adoucissants et deux filtres affinants.\n"
-"Plus le nombre est élevé, plus l'effet est fort,\n"
-"par exemple \"Filtre adoucissant 4\" aura un effet plus notable que \"Filtre adoucissant 1\".\n"
-"Prenez note que les performances peuvent être impacter selon le jeu et/ou le PC.\n"
-"[Recommandé: votre préférence]"
-
-#: Config.cpp:624
-msgid ""
-"Texture enhancement:\n"
-"7 different filters are selectable here, each one with a distinctive look.\n"
-"Be aware of possible performance impacts.\n"
-"\n"
-"IMPORTANT: 'Store' mode - saves textures in cache 'as is'. It can improve performance in games, which load many textures.\n"
-"Disable 'Ignore backgrounds' option for better result.\n"
-"\n"
-"[Recommended: your preference]"
-msgstr ""
-"Amélioration des textures:\n"
-"Sept différent filtres sont sélectionnables ici, chacun avec un aspect différent.\n"
-"Attention à l'impact possible sur les performances.\n"
-"\n"
-"IMPORTANT: Mode 'Mise en mémoire cache' - Sauve les textures en cache en tant que tel. Cela peut améliorer les performances dans les jeux où beaucoup de textures sont chargées.\n"
-"Désactivez 'Ignorer l'arrière plan' pour de meilleurs résultats.\n"
-"\n"
-"[Recommandé: votre préférence]"
-
-#: Config.cpp:628
-msgid ""
-"Texture cache size:\n"
-"Enhanced and filtered textures can be cached to aid performance.\n"
-"This setting will adjust how much PC memory will be dedicated for texture cache.\n"
-"This helps boost performance if there are subsequent requests for the same texture (usually the case).\n"
-"Normally, 128MB should be more than enough but there is a sweet spot for each game.\n"
-"Super Mario may not need more than 32megs, but Conker streams a lot of textures,\n"
-"so setting 256+ megs can boost performance. Adjust accordingly if you are encountering speed issues.\n"
-"'0' disables cache.\n"
-"[Recommended: PC and game dependant]"
-msgstr ""
-"Taille du cache des textures:\n"
-"Les textures améliorées et filtrées peuvent être mise en cache pour de meilleures performances.\n"
-"Ce paramètre s'ajustera la mémoire qui sera dédiée au cache des textures.\n"
-"Cela aide à booster les performances si il y a des requêtes ultérieures pour la même texture (souvent).\n"
-"Normalement, 128MB devvrait être plus que suffisant mais cela dépend aussi du jeu.\n"
-"Super Mario 64 peut n'avoir besoin que de 32MB, mais Conker utilise beaucoup de textures,\n"
-"donc 256MB pour ce jeu peut améliorer les performances. Ajustez ce paramètre en case de soucis de performance.\n"
-"'0' désactive le cache.\n"
-"[Recommandé: selon le PC et le jeu]"
-
-#: Config.cpp:634
-msgid ""
-"Ignore Backgrounds:\n"
-"It is used to skip enhancement for long narrow textures, usually used for backgrounds.\n"
-"This may save texture memory greatly and increase performance.\n"
-"[Recommended: on (off for 'Store' mode)]"
-msgstr ""
-"Ignorer les arrière plans:\n"
-"Cette option est utilisée pour passer l'amélioration des longues textures, généralement utilisées pour les arrière plans.\n"
-"Cela peut sauver beaucoup de mémoire et augementer les performances.\n"
-"[Recommandé: activé (desactivé pour mode 'Store')]"
-
-#: Config.cpp:636
-msgid ""
-"Texture compression:\n"
-"Textures will be compressed using selected texture compression method.\n"
-"The overall compression ratio is about 1/6 for FXT1 and 1/4 for S3TC.\n"
-"In addition to saving space on the texture cache,\n"
-"the space occupied on the GFX hardware's texture RAM,\n"
-"by the enhanced textures, will be greatly reduced.\n"
-"This minimizes texture RAM usage,\n"
-"decreasing the number of texture swaps to the GFX hardware leading to performance gains.\n"
-"However, due to the nature of lossy compression of FXT1 and S3TC, using this option can sometimes lead to quality degradation of small size textures and color banding of gradient colored textures.\n"
-"[Recommended: off]"
-msgstr ""
-"Compression des textures:\n"
-"Les textures vont être compréssé en utilisant la méthode de compression sélectionné.\n"
-"La ratio de compression est d'environ 1/6 pour FXT1 and 1/4 pour S3TC.\n"
-"Cela va sauver de l'espace disque du cache de texture,\n"
-"ainsi que de la mémoire graphique, ce qui peut améliorer les performances.\n"
-"Par contre,de part la nature de la compression du FXT1 et S3TC, utiliser cette option peut mener à une dégradation des petites textures et de la couleur des textures dégradées.\n"
-"[Recommandé: desactivée]"
-
-#: Config.cpp:640
-msgid ""
-"Compress texture cache:\n"
-"Memory will be compressed so that more textures can be held in the texture cache.\n"
-"The compression ratio varies with each texture,\n"
-"but 1/5 of the original size would be a modest approximation.\n"
-"They will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"Compresser le cache des textures:\n"
-"Les textures seront compressées donc plus de textures pourra être mise dans le cache des textures.\n"
-"Le ratio de compression varie selon chaque texture,\n"
-"mais 1/5 de la taille originale devrait être un approximation modeste.\n"
-"Elles seront décompressées à la volée, avant d'être envoyées à la carte graphique.\n"
-"Cette option sauvera de l'espace disque, même en utilisant la compression des textures.\n"
-"[Recommandé: on]"
-
-#: Config.cpp:642
-msgid ""
-"Hi-res pack format:\n"
-"Choose which method is to be used for loading Hi-res texture packs.\n"
-"Only Rice's format is available currently.\n"
-"Leave on \"None\" if you will not be needing to load hi-res packs.\n"
-"[Recommended: Rice's format. Default: \"None\"]"
-msgstr ""
-"Format du paquet de textures haute résolution:\n"
-"Choissisez quelle méthode doit être utilisée pour charger le paquet de textures haute résolution.\n"
-"Seul le format 'Rice' est actuellement disponible.\n"
-"Laisser sur \"Aucun\" si vous n'avez pas besoin de charger des paquet de textures haute résolution.\n"
-"[Recommandé: Rice's format. Par défaut: \"Aucun\"]"
-
-#: Config.cpp:646
-msgid ""
-"Tile textures:\n"
-"When on, wide texture will be split on several tiles to fit in one 256-width texture.\n"
-"This tiled texture takes much less video memory space and thus overall performance will increase.\n"
-"However, corresponding polygons must be split too, and this is not polished yet\n"
-"- various issues are possible, including black lines and polygons distortions.\n"
-"[Recommended: off]"
-msgstr ""
-"Textures découpées:\n"
-"Lorsque activée, les larges textures seront découpées en plus petites textures de 256 pixels de large.\n"
-"Ces textures prennent moins de mémoire vidéo et les performances augementeront.\n"
-"Par contre les polygones correspondant peuvent être découpés aussi et ceci n'est pas encore totalement pris en charge\n"
-"- différent problémes peuvent survenir, comme des lignes noires et des distortions de polygones.\n"
-"[Recommandé: desactivée]"
-
-#: Config.cpp:648
-msgid ""
-"Force 16bpp textures:\n"
-"The color of the textures will be reduced to 16bpp.\n"
-"This is another space saver and performance enhancer.\n"
-"This halves the space used on the texture cache and the GFX hardware's texture RAM.\n"
-"Color reduction is done so that the original quality is preserved as much as possible.\n"
-"Depending on the texture, this usually is hardly noticeable.\n"
-"Sometimes though, it can be: skies are a good example.\n"
-"[Recommended: off]"
-msgstr ""
-"Forcer les textures en 16 bits:\n"
-"La couleur des textures sera réduit à 16 bits.\n"
-"C'est une autre source d'économie de mémoire et d'augementation des performances.\n"
-"Ceci réduit de moitié l'espace utilisé dans le cache des textures et dans la mémoire de la carte vidéo.\n"
-"La réduction des couleurs essaye de préserver la qualité originelle autant que possible.\n"
-"Selon la texture, cette réduction sera à pein remarquable.\n"
-"Parfois elle peut l'être: les ciels sont un bon exemple.\n"
-"[Recommandé: desactivée]"
-
-#: Config.cpp:650
-msgid ""
-"Texture dumping mode:\n"
-"In this mode, you have that ability to dump textures on screen to the appropriate folder.\n"
-"You can also reload textures while the game is running to see how they look instantly - big time saver!\n"
-"\n"
-"Hotkeys: \"R\" reloads hires textures from the texture pack - \"D\" toggles texture dumps on/off."
-msgstr ""
-"Mode dumping des textures:\n"
-"Dans ce mode, vous avez la possibilité de dumper les textures affichées à l'écran dans le répertoire approprié.\n"
-"Vous pouvez aussi recharger les textures pendant que le jeu tourne pour voir à quoi elles ressemblent directement - gain de temps considérable!\n"
-"\n"
-"Raccourcis clavier: \"R\" recharge les textures haute résolution à partir du paquet de textures - \"D\" active/désactive le dump des textures."
-
-#: Config.cpp:652
-msgid ""
-"Alternative CRC calculation:\n"
-"This option enables emulation of a palette CRC calculation bug in RiceVideo.\n"
-"If some textures are not loaded, try to set this option on/off.\n"
-"[Recommended: texture pack dependant, mostly on]"
-msgstr ""
-"Calcul alternatif du CRC:\n"
-"Cette option active l'émulation d'un bug de calcul de la palette CRC par RiceVideo.\n"
-"Si certaines textures ne se chargent pas , activez our désactivez cette option .\n"
-"[Recommandé: selon le paquet de textures, principalement activé]"
-
-#: Config.cpp:657
-msgid ""
-"Compress texture cache:\n"
-"When game started, plugin loads all its hi-resolution textures into PC memory.\n"
-"Since hi-resolution textures are usually large, the whole pack can take hundreds megabytes of memory.\n"
-"Cache compression allows save memory space greatly.\n"
-"Textures will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"Compression du cache des textures:\n"
-"Lorsqu'un jeu est lancé, le plugin charge toutes les textures haute résolution dans mémoire du PC.\n"
-"Puisque les textures haute résolution sont habituellement assez larges, tout le paquet peut prendre des centaines de megabytes de mémoire.\n"
-"La compression du cache permet de sauver de beaucoup d'espace mémoire.\n"
-"Les textures seront décompréssées à la volée, avant d'être envoyé à la carte graphique.\n"
-"Cette option sauvera de l'espace mémoire même en utilisant la compression des textures.\n"
-"[Recommandé: activé]"
-
-#: Config.cpp:659
-msgid ""
-"Use Alpha channel fully:\n"
-"When this option is off, 16bit rgba textures will be loaded using RiceVideo style\n"
-"- with 1bit for alpha channel.\n"
-"When it is on, GlideHQ will check, how alpha channel is used by the hires texture,\n"
-"and select most appropriate format for it.\n"
-"This gives texture designers freedom to play with alpha, as they need,\n"
-"regardless of format of original N64 texture.\n"
-"For older and badly designed texture packs it can cause unwanted black borders.\n"
-"[Recommended: texture pack dependant]"
-msgstr ""
-"Utilisation du canal alpha pleinement:\n"
-"Lorsque cette option est desactivée, les textures rgba 16 bits seront chargées en utilisant le style RiceVideo\n"
-"- avec un 1bit for canal alpha.\n"
-"Lorsqu'elle est active, GlideHQ vérifiera comment le canal alpha est utilisé par les textures haute résolution,\n"
-"et sélectionnera le format les plus approprié pour celles-ci.\n"
-"Cela donne aux designers la liberté de jouer avec le canal alpha selon leurs besoins,\n"
-"sans faire attention au format original de la texture.\n"
-"For les plus vieux et mal conçu des paquets de textures cela peut causer des bords noirs non desirés.\n"
-"[Recommandé: selon le paquet de textures]"
-
-#: Config.cpp:662
-msgid ""
-"Save texture cache to HD:\n"
-"\n"
-"For enhanced textures cache:\n"
-"This will save all previously loaded and enhanced textures to HD.\n"
-"So upon next game launch, all the textures will be instantly loaded, resulting in smoother performance.\n"
-"\n"
-"For high-resolution textures cache:\n"
-"After creation, loading hi-res texture will take only a few seconds upon game launch,\n"
-"as opposed to the 5 -60 seconds a pack can take to load without this cache file.\n"
-"The only downside here is upon any changes to the pack, the cache file will need to be manually deleted.\n"
-"\n"
-"Saved cache files go into a folder called \"Cache\" within the Plugins folder.\n"
-"\n"
-"[Highly Recommended: on]"
-msgstr ""
-"Sauver le cache des textures sur le disque dur:\n"
-"\n"
-"Pour une cache de textures améliorées:\n"
-"Cela sauvera toutes les textures préalablement chargées sur le disque dur.\n"
-"Au prochain lancement du jeu, toutes les textures seront instantement chargées, ce qui améliore les performances.\n"
-"\n"
-"Pour un cache de textures haute resolution:\n"
-"Après création, le chargement des textures haute résolution ne prendra que quelque secondes au lancement du jeu,\n"
-", loin des 5 à 60 secondes qu'un paquet de textures peut prendre pour charger sans le cache.\n"
-"Seulement si le paquet de textures change, le cache doit être manuellement effacé.\n"
-"\n"
-"Sauver les fichiers du cache dans un répertoire nommé \"Cache\" dans le répertoire Plugins.\n"
-"\n"
-"[Hautement Recommandé: activé]"
-
-#: Config.cpp:685
-msgid "Debug"
-msgstr "Debug"
-
-#: Config.cpp:686
-msgid ""
-"Autodetect Microcode\n"
-"If this option is checked, the microcode of the game\n"
-"will be detected automatically from the INI, and\n"
-"therefore it will not need to be set in this\n"
-"configuration dialog.\n"
-"[Recommended: on]"
-msgstr ""
-"Détection automatique du microcode\n"
-"Si cette option est activée, le microcode du jeu\n"
-"sera automatiquement détecté à partir de l'INI, et\n"
-"donc il n'est pas besoin de le choisir\n"
-"dans la boite de dialogue.\n"
-"[Recommandé: activé]"
-
-#: Config.cpp:688
-msgid ""
-"Force Microcode\n"
-"This option ONLY has an effect if Autodetect Microcode\n"
-"is unchecked, the crc from the game could not be\n"
-"found in the INI, OR after the game has already started\n"
-"running. In any of those three cases, this will\n"
-"select the microcode to use\n"
-"[Recommended: any, turn on Autodetect Microcode]"
-msgstr ""
-"Forcer le microcode\n"
-"Cette option n'a SEULEMENT d'effet si l'autodétection du microcode\n"
-"est désactivée, the crc du jeu ne peut pas\n"
-"trouvé dans l'INI, OU après que le jeu ne soit lancé.\n"
-"Si ces trois conditions sont remplis cas, le microcode selectionné\n"
-"sera utilisé\n"
-"[Recommandé: desactivée]"
-
-#: Config.cpp:692
-msgid ""
-"Wireframe\n"
-"This option, when checked, makes it so that the plugin will draw only the\n"
-"outlines of objects.  The colors specified in the combo box to the right\n"
-"determines the color that the wireframes show up as.\n"
-"[Recommended: off]"
-msgstr ""
-"Wireframe\n"
-"Cette option fait en sorte que le plugin n'affiche que les arrêtes des objets.\n"
-"Les couleurs spécifiées dans la boite de dialogue à droite\n"
-"determine la couleur que ces arrêtes prennent.\n"
-"[Recommandé: desactivée]"
-
-#: Config.cpp:694
-msgid ""
-"Wireframe Colors\n"
-"This selects the colors to use for the wireframes (if wireframe mode is enabled).\n"
-"There are 3 modes:\n"
-"* Original colors - draw exactly as it would normally, textures and all, only in wireframes.\n"
-"* Vertex colors - use the colors specified in the vertices to draw the wireframes with.\n"
-"* Red only - use a constant red color to draw the wireframes.\n"
-"[Recommended: Vertex colors]"
-msgstr ""
-"Couleurs des arrêtes\n"
-"Cela selectionne les couleurs lors de l'utilisation des arrêtes (si le mode \"Wireframe\" est activé).\n"
-"Il existe 3 modes:\n"
-"* Couleurs originales - utilise exactement les couleurs définies par le jeu lui même mais en affichant seulement les arrêtes.\n"
-"* Couleurs des vertices - utilise les couleurs spécifiées des vertices pour afficher les arrêtes.\n"
-"* Rouge seulement - utilise une seule couleur rouge pour afficher les arrêtes.\n"
-"[Recommandé: les couleurs des vertices]"
-
-#: Config.cpp:696
-msgid ""
-"Log to RDP.txt\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option, when checked, will log EVERY SINGLE\n"
-"COMMAND the plugin processes to a file called RDP.txt in the current directory.\n"
-"This is incredibly slow, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-"Log vers RDP.txt\n"
-"RECOMMANDE POU DEBOGAGE SEULEMENT - Cette option si activée logera chaque\n"
-"COMMANDE que le plugin exécute vers un fichier nommé RDP.txt dans le répertoire du plugin.\n"
-"Ceci est incroyablement lent, donc il est recommandé de garder cette option désactivée.\n"
-"[Recommandé: désactivée]"
-
-#: Config.cpp:698
-msgid ""
-"Unknown combiners as red\n"
-"Objects that use an unimplemented combine mode will show up as red instead of\n"
-"assuming texture with full alpha. Disable this option to remove the red stuff\n"
-"and at least have a guess at the correct combine mode.\n"
-"[Recommended: off]"
-msgstr ""
-"Combiners inconnus en rouge\n"
-"Les objets qui utilise des modes de combiners inconnus seront affichés en rouge\n"
-"au lieu de sa texture. Désactiver cette option pour ne plus voir ce rouge\n"
-"et au moins deviner le mode de combiners correct.\n"
-"[Recommandé: désactivée]"
-
-#: Config.cpp:700
-msgid ""
-"Log clear every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option has no effect unless 'Log to RDP.txt'\n"
-"is checked. This will make it so that the log, RDP.txt, will be cleared at the\n"
-"beginning of every frame.\n"
-"[Recommended: off]"
-msgstr ""
-"Logger à chaque frame\n"
-"RECOMMANDE SEULEMENT POUR DEBOGAGE - cette option n'a pas d' effet sauf si 'Log to RDP.txt'\n"
-"est activé. Cela fera que le log sera effacé à chaque frame\n"
-"[Recommandé: désactivée]"
-
-#: Config.cpp:702
-msgid ""
-"Log unknown combiners\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will cause every\n"
-"unimplemented combiner drawn to be logged to a file called Unimp.txt in the\n"
-"current directory. This becomes slow when there are unimplemented combiners\n"
-"on the screen, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-"Logger les combiners inconnus\n"
-"RECOMMANDE SEULEMENT POUR DEBOGAGE - lorsqu'elle est active cette option aura pour effets\n"
-"de logger tous les combiners non implémentés vers un fichier nommé Unimp.txt dans\n"
-"répertoire courant. Lorsque beaucoup de combiners non implémentés sont affichés à l'écran, des ralentissements peuvent survenir\n"
-", de ce fait il est recommandé de garder cette option désactivée.\n"
-"[Recommandé: desactivée]"
-
-#: Config.cpp:704
-msgid ""
-"Run and log in window\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option will make it so that the plugin will\n"
-"still process dlists in windowed mode. This allows for logging to occur while not\n"
-"in fullscreen, possibly allowing you to debug a crash.\n"
-"[Recommended: off]"
-msgstr ""
-"Logger en mode fenêtré\n"
-"RECOMMANDE SEULEMENT POUR DEBOGAGE - cette option fera que le pluginl\n"
-"continuera à traiter les dlists en mode fenêtré. Ceci permet de logger même\n"
-"sans affichage, permettant de deboger un crash.\n"
-"[Recommandé: desactivée]"
-
-#: Config.cpp:706
-msgid ""
-"Clear unknown combiner log every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option works much like 'Log clear every frame'\n"
-"except it clears the combiner log (Unimp.txt) instead of RDP.txt at the\n"
-"beginning of each frame. Again, this option has no effect if 'combiner logging' is disabled.\n"
-"[Recommended: off]"
-msgstr ""
-"Effacer le log des combiner inconnus à chaque frame\n"
-"RECOMMANDE SEULEMENT POUR DEBOGAGE - cette option ressemble à 'Logger à chaque frame'\n"
-"sauf que c'est le log des combiners qui s'efface (Unimp.txt) au lieu de RDP.txt à chaque frame.\n"
-"De même cette option n'a aucun effet si 'logger les combiners' est désactivé.\n"
-"[Recommandé: desactivée]"
-
-#: Config.cpp:709
-msgid ""
-"Bilinear filter texture cache\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will make the graphical\n"
-"debugger texture cache use bilinear filtering as opposed to point-sampled filtering,\n"
-"which it will use otherwise. See 'Filtering mode' for descriptions of bilinear and\n"
-"point-sampled filtering.\n"
-"[Recommended: off]"
-msgstr ""
-"Cache de textures en filtre bilinéaire\n"
-"RECOMMANDE SEULEMENT POUR DEBOGAGE - lorsque activée cette ption fera en sorte que\n"
-"le cache pour le déboggage des textures utilise le filtre bilinéaire et non le filtre 'point-sampled',\n"
-"qu'il utiliserait autrement. Voir 'Mode de filtrage' pour la description de filtre\n"
-"bilinéaire et 'point-sampled'.\n"
-"[Recommandé: désactivée]"
-
-#: Config.cpp:1104
-msgid "Glide64 settings"
-msgstr "Paramètres Glide64"
-
-#: Config.cpp:1293
-msgid "About Glide64"
-msgstr "A propos Glide64"
-
-#: Config.cpp:1326
-msgid "authors:"
-msgstr "auteurs:"
-
-#: Config.cpp:1330
-msgid ""
-"Dave2001. Original author and former main developer.\n"
-"He founded Glide64 project on Dec. 29th, 2001.\n"
-"Left the project at fall of 2002.\n"
-msgstr ""
-"Dave2001. Auteur originel et ancien principal développeur.\n"
-"Il fonda le projet Glide64 le 29 Décembre 2001.\n"
-"Parti du projet à l'automne 2002.\n"
-
-#: Config.cpp:1336
-msgid ""
-"Gugaman. Developer. Joined the project at winter 2002\n"
-" and left it at fall 2002."
-msgstr ""
-"Gugaman. Développeur. A rejoint le projet en hiver 2002\n"
-" and l'a quitté à l'automne 2002."
-
-#: Config.cpp:1342
-msgid ""
-"Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\n"
-"Main developer since fall of 2002."
-msgstr ""
-"Sergey 'Gonetz' Lipski. A rejoint le projet fin 2002.\n"
-"Principal développeur depuis l'automne 2002."
-
-#: Config.cpp:1347
-msgid "Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. "
-msgstr "Hiroshi 'KoolSmoky' Morii, A rejoint le project en 2007. "
-
-#: Config.cpp:1350
-msgid "Glitch64 (the wrapper) authors:"
-msgstr "Auteurs de Glitch64 (le wrapper):"
-
-#: Config.cpp:1374
-msgid "GlideHQ author:"
-msgstr "Auteur de GlideHQ:"
-
-#: Config.cpp:1381
-msgid "beta tester:"
-msgstr "beta tester:"
-
-#: Config.cpp:1388
-msgid ""
-"special thanks to:\n"
-" Orkin, Rice, Daniel Borca, Legend.\n"
-"Thanks to EmuXHaven for hosting my site:\n"
-"http://glide64.emuxhaven.net\n"
-msgstr ""
-"Grand merci à:\n"
-"Orkin, Rice, Daniel Borca, Legend.\n"
-"Merci à EmuXHaven d'héberger mon site:\n"
-"http://glide64.emuxhaven.net\n"
-
diff --git a/Source/Glide64/Internalization/Glide64_ja_JP.po b/Source/Glide64/Internalization/Glide64_ja_JP.po
deleted file mode 100644
index cd84065b6..000000000
--- a/Source/Glide64/Internalization/Glide64_ja_JP.po
+++ /dev/null
@@ -1,1258 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 17:29+0700\n"
-"PO-Revision-Date: 2011-12-19 17:59+0700\n"
-"Last-Translator: Navitel <support@navitel.su>\n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Config.cpp:64
-msgid "Rendering"
-msgstr "レンダリング"
-
-#: Config.cpp:65
-msgid "Other"
-msgstr "その他"
-
-#: Config.cpp:66
-msgid "Speed"
-msgstr "速度関連"
-
-#: Config.cpp:67
-msgid "Time"
-msgstr "時間関連"
-
-#: Config.cpp:68
-msgid "On screen display"
-msgstr "画面表示"
-
-#: Config.cpp:69
-msgid "OpenGL settings"
-msgstr "OpenGLの設定"
-
-#: Config.cpp:70
-#: Config.cpp:137
-msgid "Frame buffer emulation"
-msgstr "フレームバッファエミュレーション"
-
-#: Config.cpp:71
-msgid ""
-"Windowed or\n"
-"3dfx card resolution:"
-msgstr "ウインドウ表示時解像度"
-
-#: Config.cpp:99
-msgid "Vertical sync"
-msgstr "垂直同期を有効にする"
-
-#: Config.cpp:100
-msgid "Show advanced emulation options"
-msgstr "エミュレーションの設定を表示する"
-
-#: Config.cpp:101
-msgid "Show texture enhancement options"
-msgstr "テクスチャ向上の設定を表示する"
-
-#: Config.cpp:102
-msgid "Screenshot format:"
-msgstr "スクリーンショットの形式"
-
-#: Config.cpp:105
-msgid "Language: "
-msgstr "言語："
-
-#: Config.cpp:106
-msgid "LANGUAGE_NAME"
-msgstr "日本語(2010.05.21対応版)"
-
-#: Config.cpp:112
-msgid "FPS counter"
-msgstr "FPS カウンタ"
-
-#: Config.cpp:113
-msgid "VI/s counter"
-msgstr "VI/s カウンタ"
-
-#: Config.cpp:114
-#, c-format
-msgid "% speed"
-msgstr "実機速度比(％)"
-
-#: Config.cpp:115
-msgid "Clock enabled"
-msgstr "時計"
-
-#: Config.cpp:116
-msgid "Clock is 24-hour"
-msgstr "時計を24時間制で表示する"
-
-#: Config.cpp:117
-msgid "Transparent text background"
-msgstr "テキスト表示の背景を透過させる"
-
-#: Config.cpp:118
-msgid ""
-"Full screen\n"
-"resolution:"
-msgstr ""
-"全画面表示時\n"
-"解像度"
-
-#: Config.cpp:121
-msgid "Anisotropic filtering"
-msgstr "異方性フィルタリングを有効にする"
-
-#: Config.cpp:122
-msgid "Autodetect "
-msgstr "自動検出"
-
-#: Config.cpp:123
-msgid "VRAM size"
-msgstr "VRAM容量"
-
-#: Config.cpp:125
-msgid "Mb"
-msgstr "MB"
-
-#: Config.cpp:126
-msgid "Use frame buffer objects"
-msgstr "フレームバッファオブジェクトを使用する"
-
-#: Config.cpp:133
-msgid "Current game emulation settings. Change with care!"
-msgstr "実行中のゲームのエミュレーション設定です。注意して変更してください！"
-
-#: Config.cpp:135
-msgid "Default emulation settings. Not recommended to change!"
-msgstr "デフォルトのエミュレーション設定です。この設定の変更は推奨されません！"
-
-#: Config.cpp:136
-msgid "General options"
-msgstr "一般"
-
-#: Config.cpp:138
-msgid "Depth buffer emulation"
-msgstr "Zバッファエミュレーション"
-
-#: Config.cpp:139
-msgid "Filtering mode:"
-msgstr "フィルタモード"
-
-#: Config.cpp:141
-msgid "Automatic"
-msgstr "自動"
-
-#: Config.cpp:142
-msgid "Force Bilinear"
-msgstr "強制 バイリニア"
-
-#: Config.cpp:143
-msgid "Force Point-sampled"
-msgstr "強制 点サンプリング"
-
-#: Config.cpp:146
-msgid "Buffer swapping method:"
-msgstr "バッファスワッピング方式"
-
-#: Config.cpp:148
-msgid "Old"
-msgstr "旧式"
-
-#: Config.cpp:149
-msgid "New"
-msgstr "新式"
-
-#: Config.cpp:150
-msgid "Hybrid"
-msgstr "ハイブリッド"
-
-#: Config.cpp:153
-msgid "LOD calculation:"
-msgstr "LOD計算方式"
-
-#: Config.cpp:155
-msgid "off"
-msgstr "無効"
-
-#: Config.cpp:156
-msgid "fast"
-msgstr "速度優先"
-
-#: Config.cpp:157
-msgid "precise"
-msgstr "精度優先"
-
-#: Config.cpp:160
-msgid "Aspect ratio:"
-msgstr "アスペクト比"
-
-#: Config.cpp:162
-msgid "4:3 (default)"
-msgstr "4:3 (デフォルト)"
-
-#: Config.cpp:163
-msgid "Force 16:9"
-msgstr "強制 16:9"
-
-#: Config.cpp:164
-msgid "Stretch"
-msgstr "引き伸ばし"
-
-#: Config.cpp:165
-msgid "Original"
-msgstr ""
-
-#: Config.cpp:168
-msgid "Fog"
-msgstr "フォグエミュレーション"
-
-#: Config.cpp:169
-msgid "Buffer clear on every frame"
-msgstr "フレーム毎にバッファを消去する"
-
-#: Config.cpp:170
-msgid "Enable frame buffer emulation"
-msgstr "フレームバッファエミュレーションを有効にする"
-
-#: Config.cpp:171
-msgid "Hardware frame buffer emulation"
-msgstr "ハードウェアで処理する"
-
-#: Config.cpp:172
-msgid "Get frame buffer info"
-msgstr "フレームバッファの情報を取得する"
-
-#: Config.cpp:173
-msgid "Read every frame (slow!)"
-msgstr "全てのフレームを読み込む（遅くなります！）"
-
-#: Config.cpp:174
-msgid "Render N64 frame buffer as texture"
-msgstr "フレームバッファをテクスチャとして描写する"
-
-#: Config.cpp:175
-msgid "Detect CPU write to the N64 frame buffer"
-msgstr "CPUのN64フレームバッファへの書き込みを検出する"
-
-#: Config.cpp:176
-msgid "Software depth buffer rendering"
-msgstr "ソフトウェアZバッファレンダリングを使用する"
-
-#: Config.cpp:200
-#: Config.cpp:619
-msgid "Texture enhancement"
-msgstr "テクスチャ向上の設定"
-
-#: Config.cpp:201
-msgid "Hi-resolution textures"
-msgstr "ハイレゾテクスチャ"
-
-#: Config.cpp:202
-msgid "Common"
-msgstr "共通設定"
-
-#: Config.cpp:203
-msgid "Presets"
-msgstr "プリセット"
-
-#: Config.cpp:204
-#: Config.cpp:205
-msgid "Performance tweaks"
-msgstr "パフォーマンス"
-
-#: Config.cpp:206
-msgid "Filter"
-msgstr "フィルタ"
-
-#: Config.cpp:208
-#: Config.cpp:219
-#: Config.cpp:238
-msgid "None"
-msgstr "無し"
-
-#: Config.cpp:209
-msgid "Smooth filtering 1"
-msgstr "スムースネス 1"
-
-#: Config.cpp:210
-msgid "Smooth filtering 2"
-msgstr "スムースネス 2"
-
-#: Config.cpp:211
-msgid "Smooth filtering 3"
-msgstr "スムースネス 3"
-
-#: Config.cpp:212
-msgid "Smooth filtering 4"
-msgstr "スムースネス 4"
-
-#: Config.cpp:213
-msgid "Sharp filtering 1"
-msgstr "シャープネス 1"
-
-#: Config.cpp:214
-msgid "Sharp filtering 2"
-msgstr "シャープネス 2"
-
-#: Config.cpp:217
-msgid "Enhancement"
-msgstr "ピクセルフィルタ"
-
-#: Config.cpp:220
-msgid "Store"
-msgstr "保存用"
-
-#: Config.cpp:230
-msgid "Texture cache"
-msgstr "テクスチャキャッシュサイズ"
-
-#: Config.cpp:232
-msgid "Mbytes"
-msgstr "MB"
-
-#: Config.cpp:233
-msgid "Ignore Backgrounds"
-msgstr "背景を無視する"
-
-#: Config.cpp:234
-#: Config.cpp:245
-msgid "Apply texture compression"
-msgstr "テクスチャ圧縮を有効にする"
-
-#: Config.cpp:235
-#: Config.cpp:246
-msgid "Compress texture cache"
-msgstr "テクスチャキャッシュを圧縮する"
-
-#: Config.cpp:236
-msgid "Format"
-msgstr "フォーマット設定"
-
-#: Config.cpp:239
-msgid "Rice format"
-msgstr "Rice フォーマット"
-
-#: Config.cpp:242
-msgid "Tile textures"
-msgstr "テクスチャをタイル状に分割する"
-
-#: Config.cpp:243
-msgid "Force 16bpp textures"
-msgstr "強制16ビットテクスチャ"
-
-#: Config.cpp:244
-msgid "Alternative CRC calculation"
-msgstr "別の方法でCRC計算処理を行う"
-
-#: Config.cpp:247
-msgid "Use alpha channel fully"
-msgstr "高精度アルファチャンネルを使用する"
-
-#: Config.cpp:248
-msgid "Texture dumping/editing mode"
-msgstr "テクスチャダンプ／編集モード"
-
-#: Config.cpp:249
-msgid "Texture compression method"
-msgstr "テクスチャ圧縮方式"
-
-#: Config.cpp:255
-msgid "Save texture cache to hard disk"
-msgstr "テクスチャキャッシュをHDDに保存する"
-
-#: Config.cpp:256
-msgid "Best performance"
-msgstr "ハイパフォーマンス設定"
-
-#: Config.cpp:257
-msgid "Best texture quality"
-msgstr "ハイクオリティ設定"
-
-#: Config.cpp:263
-msgid "Developers settings"
-msgstr "開発者向けの設定"
-
-#: Config.cpp:264
-msgid "Debug/Misc"
-msgstr "デバッグ／その他"
-
-#: Config.cpp:265
-msgid "Autodetect Microcode"
-msgstr "マイクロコード自動検出"
-
-#: Config.cpp:266
-msgid "Force Microcode:"
-msgstr "マイクロコード強制適用"
-
-#: Config.cpp:279
-msgid "Wireframe using:"
-msgstr "ワイヤーフレームを使用する"
-
-#: Config.cpp:281
-msgid "Original colors"
-msgstr "オリジナルカラー"
-
-#: Config.cpp:282
-msgid "Vertex colors"
-msgstr "頂点色"
-
-#: Config.cpp:283
-msgid "Red only"
-msgstr "赤"
-
-#: Config.cpp:286
-msgid "Log to rdp.txt (SLOW)"
-msgstr "ログを rdp.txt に出力(遅くなります！)"
-
-#: Config.cpp:287
-msgid "Unknown combiners as red"
-msgstr "不明なコンバイナを赤で表示する"
-
-#: Config.cpp:288
-msgid "Log clear every frame"
-msgstr "フレーム毎にログを消去する"
-
-#: Config.cpp:289
-msgid "Combiner logging"
-msgstr "コンバイナをログ出力"
-
-#: Config.cpp:290
-msgid "Run (+log) in window"
-msgstr "ウィンドウ内で実行する（ログ付き）"
-
-#: Config.cpp:291
-msgid "Cmb. clear every frame"
-msgstr "コンバイナをフレーム毎にクリア"
-
-#: Config.cpp:292
-msgid "Error log (rdp_e.txt)"
-msgstr "エラーログ (rdp_e.txt)"
-
-#: Config.cpp:293
-msgid "Bilinear filter texture cache"
-msgstr "バイリニアフィルタ テクスチャキャッシュ"
-
-#: Config.cpp:325
-#: Config.cpp:546
-msgid " auto"
-msgstr "自動"
-
-#: Config.cpp:382
-msgid "Please choose language:"
-msgstr "言語を選択してください"
-
-#: Config.cpp:383
-msgid "Language"
-msgstr "言語"
-
-#: Config.cpp:390
-msgid "Press OK to change to "
-msgstr "この画面を閉じると次に変更："
-
-#: Config.cpp:486
-msgid "Basic settings"
-msgstr "基本的な設定"
-
-#: Config.cpp:487
-msgid ""
-"Resolution\n"
-"This option selects the fullscreen resolution for 3dfx cards and windowed resolution for other cards\n"
-"(note again that for 3dfx cards the plugin must be in fullscreen mode to see anything).\n"
-"[Recommended: 640x480, 800x600, 1024x768]"
-msgstr ""
-"【ウインドウ表示時解像度】\n"
-"ウインドウ表示時の解像度を選択するオプションです。（3dfx製のビデオカードの場合はフルスクリーン時）\n"
-"[推奨設定: 640x480, 800x600, 1024x768]"
-
-#: Config.cpp:491
-msgid ""
-"Vertical sync\n"
-"This option will enable the vertical sync, which will prevent tearing.\n"
-"Note: this option will ONLY have effect if vsync is set to \"Software Controlled\".\n"
-msgstr ""
-"【垂直同期を有効にする】\n"
-"有効にすると画面のちらつきが抑えられます。\n"
-"※ これはビデオカードのドライバ側で垂直同期を【アプリケーション側でコントロールする】設定にしている時のみ動作します。"
-
-#: Config.cpp:493
-msgid "Select a format, in which screen shots will be saved"
-msgstr "選択したフォーマットでスクリーンショットが保存されます。\n"
-
-#: Config.cpp:500
-msgid ""
-"Language select:\n"
-"Press the button to invoke language selection dialog.\n"
-"Selected language will be activated after restart of the configuration dialog."
-msgstr ""
-"【言語の変更】\n"
-"このボタンをクリックすると言語選択画面が開きます。\n"
-"選択された言語はこの設定画面を一度抜けると適用されます。"
-
-#: Config.cpp:501
-msgid ""
-"FPS counter\n"
-"When this option is checked, a FPS (frames per second) counter will be shown\n"
-"in the lower left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"【FPS カウンタ】\n"
-"有効にすると画面左下にFPSカウンタを表示します。"
-
-#: Config.cpp:503
-msgid ""
-"VI/s counter\n"
-"When this option is checked, a VI/s (vertical interrupts per second) counter\n"
-"will be shown in the lower left corner of the screen.  This is like the FPS\n"
-"counter but will be consistent at 60 VI/s for full speed on NTSC (U) games and\n"
-"50 VI/s for full speed on PAL (E) ones.\n"
-"[Recommended: your preference]"
-msgstr ""
-"【VI/s カウンタ】\n"
-"有効にすると画面左下にVI/sカウンタを表示します。 \n"
-"これはFPSカウンタに似ていますが、NTSCのゲームの場合 60 VI/s 、PALの場合は 50 VI/sがフルスピードに相当します。"
-
-#: Config.cpp:505
-#, c-format
-msgid ""
-"% speed\n"
-"This displays a percentage of the actual N64 speed in the lower\n"
-"left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"【実機速度比】\n"
-"有効にすると画面左下にN64実機との比較速度を％表示します。"
-
-#: Config.cpp:507
-msgid ""
-"Clock enabled\n"
-"This option will put a clock in the lower right corner of the screen, showing the current time.\n"
-"[Recommended: your preference]"
-msgstr ""
-"【時計】\n"
-"有効にすると画面右下に現在時刻を表示します。"
-
-#: Config.cpp:510
-msgid ""
-"Display hours as 24-hour clock.\n"
-"[Recommended: your preference]"
-msgstr "時計を24時間制で表示します。"
-
-#: Config.cpp:511
-msgid ""
-"Transparent text background\n"
-"If this is checked, all on-screen messages will have a transparent background.  Otherwise, it will have a solid black background.\n"
-"[Recommended: your preference]"
-msgstr ""
-"【背景透過テキスト表示】\n"
-"有効にするとテキスト表示の背景が透過処理されます。無効の場合、黒背景上で表示されます。"
-
-#: Config.cpp:514
-msgid ""
-"Enable \"Emulation settings\" panel. For experienced users only!\n"
-"It shows default emulation settings when game is not loaded, or current game settings otherwise."
-msgstr ""
-"【エミュレーションの設定 タブを表示】 ※上級者向け\n"
-"有効にするとデフォルトのエミュレーション設定を変更する為のタブが表示されます。\n"
-"チェックを入れた後、この設定画面を一度抜けると有効になります。"
-
-#: Config.cpp:516
-msgid ""
-"Enable \"Texture enhancement\" panel.\n"
-"It shows various enhancement options for original textures as well as options for hi-resolution textures."
-msgstr ""
-"【テクスチャ向上の設定 タブを表示】\n"
-"有効にするとオリジナルテクスチャとハイレゾテクスチャに対しての設定を行うタブを表示します。\n"
-"チェックを入れた後、この設定画面を一度抜けると有効になります。"
-
-#: Config.cpp:517
-msgid ""
-"Full screen resolution:\n"
-"This sets the full screen resolution for non-3dfx video cards.\n"
-"All the resolutions that your video card/monitor support should be displayed.\n"
-"[Recommended: native (max) resolution of your monitor - unless performance becomes an issue]"
-msgstr ""
-"【全画面表示時解像度】\n"
-"全画面表示にした際の解像度を選択します。\n"
-"ここで選択できるのは搭載中のビデオカード／モニタがサポートしている形式に限られます。\n"
-"[推奨設定: パフォーマンスに問題が無ければ、選択できる最大の解像度]"
-
-#: Config.cpp:520
-msgid ""
-"Anisotropic filtering:\n"
-"This filter sharpens and brings out the details of textures that recede into the distance.\n"
-"When activated, it will use the max anisotropy your video card supports.\n"
-"However, this will override native way of texture filtering and may cause visual artifacts in some games.\n"
-"[Recommended: your preference, game dependant]"
-msgstr ""
-"【異方性フィルタリングを有効にする】\n"
-"遠方のテクスチャのディテールをよりくっきりさせるフィルタです。\n"
-"有効にすると、搭載しているビデオカードで使用可能な最高レベルの異方性フィルタリングが選択されます。\n"
-"また、これは通常行われるはずのテクスチャフィルタリングを上書きするので、ゲームによって不自然な表示になる場合があります。\n"
-"[推奨設定： PC性能とゲームタイトルに依存]"
-
-#: Config.cpp:521
-msgid ""
-"Autodetect VRAM Size:\n"
-"Since OpenGL cannot do this reliably at the moment, the option to set this manually is available.\n"
-"If checked, plugin will try to autodetect VRAM size.\n"
-"But if this appears wrong, please uncheck and set it to correct value.\n"
-"[Recommended: on]"
-msgstr ""
-"【VRAM容量自動検出】\n"
-"有効にすると、ビデオカードのVRAM容量を自動検出します。\n"
-"しかし現在 OpenGL は正確なVRAM容量を検出できないので、間違った値が表示された場合は無効にして正確な値を入力してください。\n"
-"[推奨設定: 有効]"
-
-#: Config.cpp:523
-msgid ""
-"Use frame buffer objects:\n"
-"Changes the way FB effects are rendered - with or without usage of the OpenGL Frame Buffer Objects (FBO) extension.\n"
-"The choice depends on game and your video card. FBO off is good for NVIDIA cards, while for ATI cards, it's usually best that FBOs are turned on.\n"
-"Also, some FB effects works only with one of the methods, no matter, which card you have.\n"
-"On the whole, with FBO off, compatibility/ accuracy is a bit better (which is the case for Resident Evil 2).\n"
-"However, with FBO on with some systems, it can actually be a bit faster in cases.\n"
-"[Recommended: video card and game dependant]"
-msgstr ""
-"【フレームバッファオブジェクトを使用する】\n"
-"有効にすると、フレームバッファエフェクトのレンダリング方式としてOpenGLのフレームバッファオブジェクトが使用されます。\n"
-"このオプションは使用しているビデオカードとゲームタイトルに依存します。\n"
-"NVIDIA製のビデオカードは【無効】ATI製は【有効】にしたほうが良いようですが、\n"
-"有効にしないと動作しないフレームバッファエフェクトがあります。またその逆もあります。\n"
-"有効にするとエミュレーション速度が向上するようです。\n"
-"無効にするとエミュレーション精度が向上します。（例：バイオハザード2）.\n"
-"[推奨設定： ビデオカードとゲームタイトルに依存]"
-
-#: Config.cpp:578
-msgid "Emulation settings"
-msgstr "エミュレーションの設定"
-
-#: Config.cpp:579
-msgid ""
-"Filtering mode\n"
-"There are three filtering modes possible:\n"
-"* Automatic filtering - filter exactly how the N64 specifies.\n"
-"* Point-sampled filtering - causes texels to appear square and sharp.\n"
-"* Bilinear filtering - interpolates the texture to make it appear more smooth.\n"
-"[Recommended: Automatic]"
-msgstr ""
-"【フィルタモード】\n"
-"3つのフィルタが選択可能です。\n"
-"* 自動 - N64の仕様に沿ったフィルタリングを行います。\n"
-"* 強制 バイリニア - テクスチャを滑らかな表示になるよう補間します。\n"
-"* 強制 点サンプリング - テクセルのくっきり感を際立たせます。\n"
-"[推奨設定: 自動]"
-
-#: Config.cpp:583
-msgid ""
-"Buffer swapping method\n"
-"There are 3 buffer swapping methods:\n"
-"* old - swap buffers when vertical interrupt has occurred.\n"
-"* new - swap buffers when set of conditions is satisfied. Prevents flicker on some games.\n"
-"* hybrid - mix of first two methods.\n"
-"Can prevent even more flickering then previous method, but also can cause artefacts.\n"
-"If you have flickering problems in a game (or graphics that don't show),\n"
-"try to change swapping method.\n"
-"[Recommended: new (hybrid for Paper Mario)]"
-msgstr ""
-"【バッファスワッピング方式】\n"
-"3つの方式が選択可能です。\n"
-"* 旧式 - 垂直同期割り込みが発生した時にバッファスワッピングを行います。\n"
-"* 新式 - 特定の条件を満たした時にバッファスワッピングを行います。一部のゲームのちらつきを抑えます。\n"
-"* ハイブリッド - 新式と旧式とを混合した処理です。新式よりもちらつきを抑えられますが、不自然な画面描写の原因になることもあります。\n"
-"ゲーム中にちらつきが発生したり画面表示がされなくなった場合は、スワップ方式を変更してみてください。\n"
-"[推奨設定: 新式]"
-
-#: Config.cpp:587
-msgid ""
-"Per-pixel level-of-detail calculation\n"
-"N64 uses special mechanism for mip-mapping, which nearly impossible to reproduce\n"
-"correctly on PC hardware. This option enables approximate emulation of this feature.\n"
-"For example, it is required for the Peach/Bowser portrait's transition in Super Mario 64.\n"
-"There are 3 modes:\n"
-"* off - LOD is not calculated\n"
-"* fast - fast imprecise LOD calculation.\n"
-"* precise - most precise LOD calculation possible, but more slow.\n"
-"[Recommended: your preference]"
-msgstr ""
-"【LOD計算方式】\n"
-"N64ではミップマッピングのために特殊な処理をしており、これはPC向けのハードウェアでは正確な再現が難しいものです。\n"
-"このオプションを有効にすることでこの処理のほぼ正確なエミュレーションが可能です。\n"
-"例えば『スーパーマリオ64』においてピーチ姫からクッパへ変化する肖像画の描写に必要です。\n"
-"3つの方式が選択可能です。\n"
-"* 無効 - LODは計算されません。\n"
-"* 速度優先 - 速いが不正確なLOD計算を行います。\n"
-"* 精度優先 - できるだけ正確なLOD計算を行いますが、非常に遅くなります。\n"
-"[推奨設定: PC性能に依存]"
-
-#: Config.cpp:592
-msgid ""
-"Aspect ratio of the output.\n"
-"Most N64 games use 4:3 aspect ratio, but some support widescreen too.\n"
-"You may select appropriate aspect here and set widescreen mode in game settings.\n"
-"In \"Stretch\" mode the output will be stretched to the entire screen,\n"
-"other modes may add black borders if necessary"
-msgstr ""
-"【アスペクト比】\n"
-"多くのN64のゲームでは4:3の比率が使われていますが、ワイドスクリーンをサポートしているソフトも存在します。\n"
-"このオプションで適切なアスペクト比を設定すれば、ゲーム内設定からワイドスクリーン表示をすることが可能です。\n"
-"【引き伸ばし】モードではアスペクト比に関係なく画面全体に出力が行われます。\n"
-"他のモードでは強制的に黒帯が表示されることがあります。"
-
-#: Config.cpp:595
-msgid ""
-"Fog enabled\n"
-"Sets fog emulation on//off.\n"
-"[Recommended: on]"
-msgstr ""
-"【フォグエミュレーション】\n"
-"有効にするとフォグのエミュレーションを行います。\n"
-"[推奨設定: 有効]"
-
-#: Config.cpp:597
-msgid ""
-"Buffer clear on every frame\n"
-"Forces the frame buffer to be cleared every frame drawn.\n"
-"Usually frame buffer clear is controlled by the game.\n"
-"However, in some cases it is not well emulated,\n"
-"and some garbage may be left on the screen.\n"
-"In such cases, this option must be set on.\n"
-"[Recommended: on]"
-msgstr ""
-"【フレーム毎にバッファを消去する】\n"
-"有効にするとフレーム毎に強制的にフレームバッファを消去します。\n"
-"消去のタイミングは通常ゲーム側でコントロールされますが、時々エミュレートがうまくいかず、画面上にゴミが残る場合があります。\n"
-"そのような場合に備えて、通常このオプションは有効にしておいてください。\n"
-"[推奨設定: 有効]"
-
-#: Config.cpp:599
-msgid ""
-"Enable frame buffer emulation\n"
-"If on, plugin will try to detect frame buffer usage and apply appropriate frame buffer emulation.\n"
-"[Recommended: on for games which use frame buffer effects]"
-msgstr ""
-"【フレームバッファエミュレーションを有効にする】\n"
-"有効にするとフレームバッファの使用を検出し、適切なフレームバッファエミュレーションを試みます。\n"
-"[推奨設定: フレームバッファエフェクトを使用しているゲームでは有効]"
-
-#: Config.cpp:601
-msgid ""
-"Enable hardware frame buffer emulation\n"
-"If this option is on, plugin will create auxiliary frame buffers in video memory instead of copying\n"
-"frame buffer content into main memory. This allows plugin to run frame buffer effects without slowdown\n"
-"and without scaling image down to N64's native resolution. This feature is fully supported by\n"
-"Voodoo 4/5 cards and partially by Voodoo3 and Banshee. Modern cards also fully support it.\n"
-"[Recommended: on, if supported by your hardware]"
-msgstr ""
-"【ハードウェアで処理する】\n"
-"有効にした場合、メインメモリへのフレームバッファのコピーの代用としてビデオメモリ内に補助的なフレームバッファを作成します。\n"
-"これはフレームバッファエフェクトを減速させずに、また解像度をN64実機のものまで落とさないように動作させることを可能にします。\n"
-"この機能は Voodoo 4/5 で完全に、 Voodoo 3 / Banshee では一部サポートされます。近年のビデオカードでも完全に動作するでしょう。\n"
-"[推奨設定: ビデオカードでサポートしていれば有効]"
-
-#: Config.cpp:604
-msgid ""
-"Get information about frame buffers\n"
-"This is compatibility option. It must be set on for Mupen64 and off for 1964"
-msgstr ""
-"【フレームバッファの情報を取得する】\n"
-"これは互換性のためのオプションです。Mupen64では有効に、1964では無効にしてください。"
-
-#: Config.cpp:606
-msgid ""
-"Read every frame\n"
-"In some games plugin can't detect frame buffer usage.\n"
-"In such cases you need to enable this option to see frame buffer effects.\n"
-"Every drawn frame will be read from video card -> it works very slow.\n"
-"[Recommended: mostly off (needed only for a few games)]"
-msgstr ""
-"【全てのフレームを読み込む】\n"
-"一部のゲームではフレームバッファを使用していても検出できないことがあります。\n"
-"そのような場合、このオプションを有効にすることでフレームバッファエフェクトが認識可能となります。\n"
-"有効にしている間は全てのフレームをビデオカードから読みこむので非常に遅くなります。\n"
-"[推奨設定: ほとんどの場合無効 (特定のゲームタイトルのみ有効)]"
-
-#: Config.cpp:608
-msgid ""
-"Render N64 frame buffer as texture\n"
-"When this option is enabled, content of each N64 frame buffer is rendered\n"
-"as texture over the frame, rendered by the plugin. This prevents graphics lost,\n"
-"but may cause slowdowns and various glitches in some games.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"【フレームバッファをテクスチャとして描写する】\n"
-"有効にするとN64のフレームバッファをテクスチャと同じようにフレーム上に描写します。\n"
-"これによりグラフィック欠けを防ぐことができますが、ゲームによっては処理落ちや不具合の原因になります。\n"
-"[推奨設定: ほとんどの場合で無効]"
-
-#: Config.cpp:610
-msgid ""
-"Detect CPU write to the N64 frame buffer\n"
-"This option works as the previous options, but the plugin is trying to detect,\n"
-"when game uses CPU writes to N64 frame buffer. The N64 frame buffer is rendered\n"
-"only when CPU writes is detected. Use this option for those games, in which you\n"
-"see still image or no image at all for some time with no reason.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"【CPUのN64フレームバッファへの書き込みを検出する】\n"
-"このオプションは過去のもので、有効にするとプラグインはゲーム内でCPUがN64フレームバッファへ書き込むようにするところを検出します。\n"
-"N64フレームバッファはCPUが書き込むのを検出した時のみ描写されるということです。\n"
-"このオプションはそれらのゲームタイトルに使用してください。（その際しばらく静止画または真っ暗な画面が表示されます。）\n"
-"[推奨設定: ほとんどの場合無効]"
-
-#: Config.cpp:612
-msgid ""
-"Enable depth buffer rendering\n"
-"This option is used to fully emulate N64 depth buffer.\n"
-"It is required for correct emulation of depth buffer based effects.\n"
-"However, it requires fast (>1GHz) CPU to work full speed.\n"
-"[Recommended: on for fast PC]"
-msgstr ""
-"【ソフトウェアZバッファレンダリングを使用する】\n"
-"有効にするとN64のZバッファの完全なエミュレートを行います。\n"
-"これはZバッファに基づくエフェクトを正しくエミュレートするために必要です。\n"
-"このオプションをフルスピードで動作させるためには、1GHz以上のCPUが必要とされます。\n"
-"[推奨設定: 高性能なPCでは有効]"
-
-#: Config.cpp:620
-msgid ""
-"Filters:\n"
-"Apply a filter to either smooth or sharpen textures.\n"
-"There are 4 different smoothing filters and 2 different sharpening filters.\n"
-"The higher the number, the stronger the effect,\n"
-"i.e. \"Smoothing filter 4\" will have a much more noticeable effect than \"Smoothing filter 1\".\n"
-"Be aware that performance may have an impact depending on the game and/or the PC.\n"
-"[Recommended: your preference]"
-msgstr ""
-"【フィルタ】\n"
-"テクスチャをよりスムースまたはシャープにするフィルタを適用できます。数字が大きいほど強い効果となります。\n"
-"（つまり、【スムースネス 1】より【スムースネス 4】のほうが強い効果となります。）\n"
-"ゲームタイトルやPC性能によってはパフォーマンスに影響を与えるので注意してください。\n"
-"[推奨設定: PC性能に依存]"
-
-#: Config.cpp:624
-msgid ""
-"Texture enhancement:\n"
-"7 different filters are selectable here, each one with a distinctive look.\n"
-"Be aware of possible performance impacts.\n"
-"\n"
-"IMPORTANT: 'Store' mode - saves textures in cache 'as is'. It can improve performance in games, which load many textures.\n"
-"Disable 'Ignore backgrounds' option for better result.\n"
-"\n"
-"[Recommended: your preference]"
-msgstr ""
-"【ピクセルフィルタ】\n"
-"7つのそれぞれ独特のフィルタが選択できます。パフォーマンスに影響を与えるので注意してください。\n"
-"\n"
-"重要：【保存用】モードについて - これはテクスチャをそのままキャッシュとして保存するものです。\n"
-"ゲーム中多くのテクスチャが使用される場面でパフォーマンス向上が期待できます。\n"
-"このオプションを選択している場合は下の【背景を無視する】オプションを無効にしたほうが良い結果になります。\n"
-"[推奨設定: PC性能に依存]"
-
-#: Config.cpp:628
-msgid ""
-"Texture cache size:\n"
-"Enhanced and filtered textures can be cached to aid performance.\n"
-"This setting will adjust how much PC memory will be dedicated for texture cache.\n"
-"This helps boost performance if there are subsequent requests for the same texture (usually the case).\n"
-"Normally, 128MB should be more than enough but there is a sweet spot for each game.\n"
-"Super Mario may not need more than 32megs, but Conker streams a lot of textures,\n"
-"so setting 256+ megs can boost performance. Adjust accordingly if you are encountering speed issues.\n"
-"'0' disables cache.\n"
-"[Recommended: PC and game dependant]"
-msgstr ""
-"【テクスチャキャッシュサイズ】\n"
-"パフォーマンス改善のためにフィルタリングされたテクスチャをキャッシュすることができます。\n"
-"この設定はテクスチャキャッシングのためのメモリ使用量を調節するものです。\n"
-"キャッシングされたテクスチャは、同じテクスチャを後続要求された場合などでパフォーマンスを大きく高めるのに役立ちます。\n"
-"通常、128MB程度あれば充分なはずですが、それぞれのゲームで効果的な容量は違ってきます。\n"
-"『スーパーマリオ64』では32MBも必要ありませんが、『Conker 64』では多くのテクスチャを使用するので、パフォーマンス向上には256MB以上必要です。\n"
-"キャッシュをしているのに速度が出ない時は、キャッシュ容量を調節してみてください。\n"
-"【0】に設定するとキャッシュは無効になります。\n"
-"[推奨設定: PC性能とゲームタイトルに依存]"
-
-#: Config.cpp:634
-msgid ""
-"Ignore Backgrounds:\n"
-"It is used to skip enhancement for long narrow textures, usually used for backgrounds.\n"
-"This may save texture memory greatly and increase performance.\n"
-"[Recommended: on (off for 'Store' mode)]"
-msgstr ""
-"【背景を無視する】\n"
-"これはたいていの場合背景に使われている、細長いテクスチャをフィルタの対象から外すオプションです。\n"
-"テクスチャメモリの使用量とパフォーマンスを大きく改善します。\n"
-"[推奨設定: 有効 (【保存用】モード時は無効)]"
-
-#: Config.cpp:636
-msgid ""
-"Texture compression:\n"
-"Textures will be compressed using selected texture compression method.\n"
-"The overall compression ratio is about 1/6 for FXT1 and 1/4 for S3TC.\n"
-"In addition to saving space on the texture cache,\n"
-"the space occupied on the GFX hardware's texture RAM,\n"
-"by the enhanced textures, will be greatly reduced.\n"
-"This minimizes texture RAM usage,\n"
-"decreasing the number of texture swaps to the GFX hardware leading to performance gains.\n"
-"However, due to the nature of lossy compression of FXT1 and S3TC, using this option can sometimes lead to quality degradation of small size textures and color banding of gradient colored textures.\n"
-"[Recommended: off]"
-msgstr ""
-"【テクスチャ圧縮を有効にする】\n"
-"有効にすると、テクスチャが選択された方式によって圧縮されます。\n"
-"FXT1では6分の1、S3TCでは4分の1程度となるでしょう。\n"
-"テクスチャキャッシュを行うことで容量も抑えられ、またフィルタリングされたテクスチャによって、ビデオカードのテクスチャRAM使用量も削減されます。\n"
-"テクスチャRAM使用量を最小限にすることはまた、テクスチャスワッピングも起こりにくくなり、ビデオカード性能は向上します。\n"
-"しかしながら、FXT1とS3TCの非可逆圧縮という性質のために、時々小さなテクスチャの品質が悪化したり、カラーバンディングが発生したりする場合があります。\n"
-"[推奨設定: 無効]"
-
-#: Config.cpp:640
-msgid ""
-"Compress texture cache:\n"
-"Memory will be compressed so that more textures can be held in the texture cache.\n"
-"The compression ratio varies with each texture,\n"
-"but 1/5 of the original size would be a modest approximation.\n"
-"They will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"【テクスチャキャッシュを圧縮する】\n"
-"有効にするとメモリにより保持しているテクスチャキャッシュ内部のキャッシュを圧縮します。\n"
-"テクスチャによって圧縮率は違いますが、控えめに見ても5分の1程度のサイズになるでしょう。\n"
-"圧縮されたテクスチャキャッシュは、ビデオカードに送られる前にオンザフライで解凍されます。\n"
-"このオプションは圧縮されたテクスチャキャッシュを使用する際のメモリ使用量の削減に役立つでしょう。\n"
-"[推奨設定: 有効]"
-
-#: Config.cpp:642
-msgid ""
-"Hi-res pack format:\n"
-"Choose which method is to be used for loading Hi-res texture packs.\n"
-"Only Rice's format is available currently.\n"
-"Leave on \"None\" if you will not be needing to load hi-res packs.\n"
-"[Recommended: Rice's format. Default: \"None\"]"
-msgstr ""
-"フォーマット設定\n"
-"ハイレゾパックを読み込むのに使用する方式を選択できます。\n"
-"現在は Rice フォーマット のみが選択可能です。\n"
-"ハイレゾパックを読み込む必要がない時は【無し】にしておきましょう。\n"
-"[推奨設定: Rice フォーマット （デフォルト：無し）]"
-
-#: Config.cpp:646
-msgid ""
-"Tile textures:\n"
-"When on, wide texture will be split on several tiles to fit in one 256-width texture.\n"
-"This tiled texture takes much less video memory space and thus overall performance will increase.\n"
-"However, corresponding polygons must be split too, and this is not polished yet\n"
-"- various issues are possible, including black lines and polygons distortions.\n"
-"[Recommended: off]"
-msgstr ""
-"【テクスチャをタイル状に分割する】\n"
-"有効にすると、大きなテクスチャを256px幅のタイル状のテクスチャとして分割します。\n"
-"これによりビデオメモリ使用量が削減され、パフォーマンスも向上します。\n"
-"しかし、多角形をも分割しなければならず、この機能についてはまだあまり洗練されていません。\n"
-"不要な黒線が出たり多角形のポリゴンがひずんでしまうなど、様々な問題をはらんでいます。\n"
-"[推奨設定: 無効]"
-
-#: Config.cpp:648
-msgid ""
-"Force 16bpp textures:\n"
-"The color of the textures will be reduced to 16bpp.\n"
-"This is another space saver and performance enhancer.\n"
-"This halves the space used on the texture cache and the GFX hardware's texture RAM.\n"
-"Color reduction is done so that the original quality is preserved as much as possible.\n"
-"Depending on the texture, this usually is hardly noticeable.\n"
-"Sometimes though, it can be: skies are a good example.\n"
-"[Recommended: off]"
-msgstr ""
-"【強制16ビットテクスチャ】\n"
-"有効にするとテクスチャの色数を16ビットに変更します。\n"
-"これによりテクスチャキャッシュのサイズとビデオカードのテクスチャRAM使用量が半分になります。\n"
-"減色は出来る限り元の品質を保ったまま行われ、テクスチャにもよりますが、ほとんどの場合目立つことはないでしょう。\n"
-"とは言え、「青空」のテクスチャなど、目立つ例もあります。\n"
-"[推奨設定: 無効]"
-
-#: Config.cpp:650
-msgid ""
-"Texture dumping mode:\n"
-"In this mode, you have that ability to dump textures on screen to the appropriate folder.\n"
-"You can also reload textures while the game is running to see how they look instantly - big time saver!\n"
-"\n"
-"Hotkeys: \"R\" reloads hires textures from the texture pack - \"D\" toggles texture dumps on/off."
-msgstr ""
-"【テクスチャダンプ／編集モード】\n"
-"有効にすると表示中の画面からテクスチャをダンプして割り当てられたフォルダに保存する機能が使用できるようになります。\n"
-"この機能でゲーム実行中にテクスチャを再読込してそれがどのように見えるかをすぐに確認できます。大きな時間の節約になります！\n"
-"\n"
-"ホットキー: \"R\" テクスチャパックからハイレゾテクスチャを再読込する。 \"D\" テクスチャダンプの有効／無効切り替え。"
-
-#: Config.cpp:652
-msgid ""
-"Alternative CRC calculation:\n"
-"This option enables emulation of a palette CRC calculation bug in RiceVideo.\n"
-"If some textures are not loaded, try to set this option on/off.\n"
-"[Recommended: texture pack dependant, mostly on]"
-msgstr ""
-"【別の方法でCRC計算処理を行う】\n"
-"有効にすると RiceVideo 上でのパレットCRC計算処理のバグをエミュレートします。\n"
-"テクスチャが正しくロードされない時にこのオプションの有効／無効を切り替えると改善する場合があります。\n"
-"[推奨: テクスチャパックに依存、ほとんどの場合有効]"
-
-#: Config.cpp:657
-msgid ""
-"Compress texture cache:\n"
-"When game started, plugin loads all its hi-resolution textures into PC memory.\n"
-"Since hi-resolution textures are usually large, the whole pack can take hundreds megabytes of memory.\n"
-"Cache compression allows save memory space greatly.\n"
-"Textures will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"【テクスチャキャッシュを圧縮する】\n"
-"プラグインはゲーム起動と同時に、全てのハイレゾテクスチャをメモリに読み込みます。\n"
-"多くの場合ハイレゾテクスチャはサイズが大きいので、パック全体として数百MBものメモリが使われることになってしまいます。\n"
-"キャッシュの圧縮でこうしたメモリ使用量を大きく削減することができます。\n"
-"圧縮されたテクスチャキャッシュは、ビデオカードに送られる前にオンザフライで解凍されます。\n"
-"このオプションは圧縮されたテクスチャキャッシュを使用する際のメモリ使用量の削減に役立つでしょう。\n"
-"[推奨設定: 有効]"
-
-#: Config.cpp:659
-msgid ""
-"Use Alpha channel fully:\n"
-"When this option is off, 16bit rgba textures will be loaded using RiceVideo style\n"
-"- with 1bit for alpha channel.\n"
-"When it is on, GlideHQ will check, how alpha channel is used by the hires texture,\n"
-"and select most appropriate format for it.\n"
-"This gives texture designers freedom to play with alpha, as they need,\n"
-"regardless of format of original N64 texture.\n"
-"For older and badly designed texture packs it can cause unwanted black borders.\n"
-"[Recommended: texture pack dependant]"
-msgstr ""
-"【高精度アルファチャンネルを使用する】\n"
-"無効の場合、16ビットのRGBAテクスチャは RiceVideo 形式（1ビットをアルファチャンネル使用）として読み込まれます。\n"
-"有効の場合、GlideHQ はハイレゾテクスチャがどのようにアルファチャンネルを使用しているかを検出してそのフォーマットに合わせるようにします。\n"
-"これはテクスチャデザイナーに、N64オリジナルのフォーマットに関係なく、自由にアルファチャンネルを使用させるものです。\n"
-"古かったりできの悪いテクスチャパックでは黒枠が表示される場合があります。\n"
-"[推奨設定: テクスチャパックに依存]"
-
-#: Config.cpp:662
-msgid ""
-"Save texture cache to HD:\n"
-"\n"
-"For enhanced textures cache:\n"
-"This will save all previously loaded and enhanced textures to HD.\n"
-"So upon next game launch, all the textures will be instantly loaded, resulting in smoother performance.\n"
-"\n"
-"For high-resolution textures cache:\n"
-"After creation, loading hi-res texture will take only a few seconds upon game launch,\n"
-"as opposed to the 5 -60 seconds a pack can take to load without this cache file.\n"
-"The only downside here is upon any changes to the pack, the cache file will need to be manually deleted.\n"
-"\n"
-"Saved cache files go into a folder called \"Cache\" within the Plugins folder.\n"
-"\n"
-"[Highly Recommended: on]"
-msgstr ""
-"【テクスチャキャッシュをHDDに保存する】\n"
-"\n"
-"※ フィルタリングされたテクスチャのキャッシュの場合\n"
-"有効にするとすでに読み込まれたテクスチャとフィルタリングされたテクスチャがHDDに保存されます。\n"
-"これにより次からのゲーム起動でキャッシュの読み込みが高速化されるため、パフォーマンスが向上します。\n"
-"\n"
-"※ ハイレゾテクスチャのキャッシュの場合\n"
-"キャッシュ保存後、ゲーム起動時のハイレゾテクスチャの読み込みが、数秒で完了するようになります。\n"
-"(キャッシュなしだと一つのパックで5～60秒かかる。)\n"
-"唯一の欠点は、テクスチャパックに何かしらの変更があった場合、キャッシュファイルを手動で削除しなければならないということです。\n"
-"\n"
-"キャッシュファイルはプラグインフォルダ内の『Cache』フォルダに保存されます。\n"
-"\n"
-"[推奨設定: 有効 (強く推奨します)]"
-
-#: Config.cpp:685
-msgid "Debug"
-msgstr "デバッグ"
-
-#: Config.cpp:686
-msgid ""
-"Autodetect Microcode\n"
-"If this option is checked, the microcode of the game\n"
-"will be detected automatically from the INI, and\n"
-"therefore it will not need to be set in this\n"
-"configuration dialog.\n"
-"[Recommended: on]"
-msgstr ""
-"【マイクロコード自動検出】\n"
-"ゲーム別のマイクロコードをINIを元に自動検出します。\n"
-"[推奨設定: 有効]"
-
-#: Config.cpp:688
-msgid ""
-"Force Microcode\n"
-"This option ONLY has an effect if Autodetect Microcode\n"
-"is unchecked, the crc from the game could not be\n"
-"found in the INI, OR after the game has already started\n"
-"running. In any of those three cases, this will\n"
-"select the microcode to use\n"
-"[Recommended: any, turn on Autodetect Microcode]"
-msgstr ""
-
-#: Config.cpp:692
-msgid ""
-"Wireframe\n"
-"This option, when checked, makes it so that the plugin will draw only the\n"
-"outlines of objects.  The colors specified in the combo box to the right\n"
-"determines the color that the wireframes show up as.\n"
-"[Recommended: off]"
-msgstr ""
-"【ワイヤーフレームを使用する】\n"
-"有効にするとプラグインはオブジェクトの輪郭線だけを描写するようにします。\n"
-"輪郭線の色は右のコンボボックスで指定されたものになります。\n"
-"[推奨設定: 無効]"
-
-#: Config.cpp:694
-msgid ""
-"Wireframe Colors\n"
-"This selects the colors to use for the wireframes (if wireframe mode is enabled).\n"
-"There are 3 modes:\n"
-"* Original colors - draw exactly as it would normally, textures and all, only in wireframes.\n"
-"* Vertex colors - use the colors specified in the vertices to draw the wireframes with.\n"
-"* Red only - use a constant red color to draw the wireframes.\n"
-"[Recommended: Vertex colors]"
-msgstr ""
-
-#: Config.cpp:696
-msgid ""
-"Log to RDP.txt\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option, when checked, will log EVERY SINGLE\n"
-"COMMAND the plugin processes to a file called RDP.txt in the current directory.\n"
-"This is incredibly slow, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:698
-msgid ""
-"Unknown combiners as red\n"
-"Objects that use an unimplemented combine mode will show up as red instead of\n"
-"assuming texture with full alpha. Disable this option to remove the red stuff\n"
-"and at least have a guess at the correct combine mode.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:700
-msgid ""
-"Log clear every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option has no effect unless 'Log to RDP.txt'\n"
-"is checked. This will make it so that the log, RDP.txt, will be cleared at the\n"
-"beginning of every frame.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:702
-msgid ""
-"Log unknown combiners\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will cause every\n"
-"unimplemented combiner drawn to be logged to a file called Unimp.txt in the\n"
-"current directory. This becomes slow when there are unimplemented combiners\n"
-"on the screen, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:704
-msgid ""
-"Run and log in window\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option will make it so that the plugin will\n"
-"still process dlists in windowed mode. This allows for logging to occur while not\n"
-"in fullscreen, possibly allowing you to debug a crash.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:706
-msgid ""
-"Clear unknown combiner log every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option works much like 'Log clear every frame'\n"
-"except it clears the combiner log (Unimp.txt) instead of RDP.txt at the\n"
-"beginning of each frame. Again, this option has no effect if 'combiner logging' is disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:709
-msgid ""
-"Bilinear filter texture cache\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will make the graphical\n"
-"debugger texture cache use bilinear filtering as opposed to point-sampled filtering,\n"
-"which it will use otherwise. See 'Filtering mode' for descriptions of bilinear and\n"
-"point-sampled filtering.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:1104
-msgid "Glide64 settings"
-msgstr "Glide64 の設定"
-
-#: Config.cpp:1293
-msgid "About Glide64"
-msgstr "Glide64 について"
-
-#: Config.cpp:1326
-msgid "authors:"
-msgstr "開発チーム"
-
-#: Config.cpp:1330
-msgid ""
-"Dave2001. Original author and former main developer.\n"
-"He founded Glide64 project on Dec. 29th, 2001.\n"
-"Left the project at fall of 2002.\n"
-msgstr ""
-"Dave2001. Original author and former main developer.\n"
-"He founded Glide64 project on Dec. 29th, 2001.\n"
-"Left the project at fall of 2002.\n"
-
-#: Config.cpp:1336
-msgid ""
-"Gugaman. Developer. Joined the project at winter 2002\n"
-" and left it at fall 2002."
-msgstr ""
-"Gugaman. Developer. Joined the project at winter 2002\n"
-" and left it at fall 2002."
-
-#: Config.cpp:1342
-msgid ""
-"Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\n"
-"Main developer since fall of 2002."
-msgstr ""
-"Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\n"
-"Main developer since fall of 2002."
-
-#: Config.cpp:1347
-msgid "Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. "
-msgstr "Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. "
-
-#: Config.cpp:1350
-msgid "Glitch64 (the wrapper) authors:"
-msgstr "Glitch64 (the wrapper) 開発チーム"
-
-#: Config.cpp:1374
-msgid "GlideHQ author:"
-msgstr "GlideHQ 作者："
-
-#: Config.cpp:1381
-msgid "beta tester:"
-msgstr "ベータテスター："
-
-#: Config.cpp:1388
-msgid ""
-"special thanks to:\n"
-" Orkin, Rice, Daniel Borca, Legend.\n"
-"Thanks to EmuXHaven for hosting my site:\n"
-"http://glide64.emuxhaven.net\n"
-msgstr ""
-"スペシャルサンクス：\n"
-" Orkin, Rice, Daniel Borca, Legend.\n"
-"Thanks to EmuXHaven for hosting my site:\n"
-"http://glide64.emuxhaven.net\n"
-
diff --git a/Source/Glide64/Internalization/Glide64_ru_RU.po b/Source/Glide64/Internalization/Glide64_ru_RU.po
deleted file mode 100644
index 3e7fc2647..000000000
--- a/Source/Glide64/Internalization/Glide64_ru_RU.po
+++ /dev/null
@@ -1,1315 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 17:29+0700\n"
-"PO-Revision-Date: 2011-12-19 17:56+0700\n"
-"Last-Translator: Navitel <support@navitel.su>\n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Config.cpp:64
-msgid "Rendering"
-msgstr "Рендеринг"
-
-#: Config.cpp:65
-msgid "Other"
-msgstr "Другое"
-
-#: Config.cpp:66
-msgid "Speed"
-msgstr "Скорость"
-
-#: Config.cpp:67
-msgid "Time"
-msgstr "Время"
-
-#: Config.cpp:68
-msgid "On screen display"
-msgstr "Экранная информация"
-
-#: Config.cpp:69
-msgid "OpenGL settings"
-msgstr "Настройки OpenGL"
-
-#: Config.cpp:70
-#: Config.cpp:137
-msgid "Frame buffer emulation"
-msgstr "Эмуляция буфера кадра"
-
-#: Config.cpp:71
-msgid ""
-"Windowed or\n"
-"3dfx card resolution:"
-msgstr ""
-"Разрешение окна\n"
-"или карты 3dfx:"
-
-#: Config.cpp:99
-msgid "Vertical sync"
-msgstr "Кадровая синхронизация"
-
-#: Config.cpp:100
-msgid "Show advanced emulation options"
-msgstr "Показывать расширенные настройки эмуляции"
-
-#: Config.cpp:101
-msgid "Show texture enhancement options"
-msgstr "Показывать настройки улучшения текстур"
-
-#: Config.cpp:102
-msgid "Screenshot format:"
-msgstr "Формат скриншота:"
-
-#: Config.cpp:105
-msgid "Language: "
-msgstr "Язык: "
-
-#: Config.cpp:106
-msgid "LANGUAGE_NAME"
-msgstr "Русский"
-
-#: Config.cpp:112
-msgid "FPS counter"
-msgstr "Счётчик FPS"
-
-#: Config.cpp:113
-msgid "VI/s counter"
-msgstr "Счётчик VI/s"
-
-#: Config.cpp:114
-#, c-format
-msgid "% speed"
-msgstr "Скорость в %"
-
-#: Config.cpp:115
-msgid "Clock enabled"
-msgstr "Показывать часы"
-
-#: Config.cpp:116
-msgid "Clock is 24-hour"
-msgstr "24 часовой формат"
-
-#: Config.cpp:117
-msgid "Transparent text background"
-msgstr "Прозрачный фон текста"
-
-#: Config.cpp:118
-msgid ""
-"Full screen\n"
-"resolution:"
-msgstr ""
-"Полноэкранное\n"
-"разрешение:"
-
-#: Config.cpp:121
-msgid "Anisotropic filtering"
-msgstr "Анизотропная фильтрация"
-
-#: Config.cpp:122
-msgid "Autodetect "
-msgstr "Авто "
-
-#: Config.cpp:123
-msgid "VRAM size"
-msgstr "Размер видеопамяти"
-
-#: Config.cpp:125
-msgid "Mb"
-msgstr "Мб"
-
-#: Config.cpp:126
-msgid "Use frame buffer objects"
-msgstr "Использовать frame buffer objects"
-
-#: Config.cpp:133
-msgid "Current game emulation settings. Change with care!"
-msgstr "Настройки эмуляции текущей игры. Менять острожно!"
-
-#: Config.cpp:135
-msgid "Default emulation settings. Not recommended to change!"
-msgstr "Настройки эмуляции по умолчанию. Менять не рекомендуется!"
-
-#: Config.cpp:136
-msgid "General options"
-msgstr "Основные настройки"
-
-#: Config.cpp:138
-msgid "Depth buffer emulation"
-msgstr "Эмуляция буфера глубины"
-
-#: Config.cpp:139
-msgid "Filtering mode:"
-msgstr ""
-"Фильтрация\n"
-"текстур:"
-
-#: Config.cpp:141
-msgid "Automatic"
-msgstr "Автоматическая"
-
-#: Config.cpp:142
-msgid "Force Bilinear"
-msgstr "Всегда биллинейная"
-
-#: Config.cpp:143
-msgid "Force Point-sampled"
-msgstr "Всегда Point-sampled"
-
-#: Config.cpp:146
-msgid "Buffer swapping method:"
-msgstr ""
-"Метод смены\n"
-"буфера кадра:"
-
-#: Config.cpp:148
-msgid "Old"
-msgstr "Старый"
-
-#: Config.cpp:149
-msgid "New"
-msgstr "Новый"
-
-#: Config.cpp:150
-msgid "Hybrid"
-msgstr "Гибридный"
-
-#: Config.cpp:153
-msgid "LOD calculation:"
-msgstr "Вычисление LOD:"
-
-#: Config.cpp:155
-msgid "off"
-msgstr "нет"
-
-#: Config.cpp:156
-msgid "fast"
-msgstr "быстро"
-
-#: Config.cpp:157
-msgid "precise"
-msgstr "точно"
-
-#: Config.cpp:160
-msgid "Aspect ratio:"
-msgstr "Формат кадра:"
-
-#: Config.cpp:162
-msgid "4:3 (default)"
-msgstr "4:3 (по умолчанию)"
-
-#: Config.cpp:163
-msgid "Force 16:9"
-msgstr "Принудительно 16:9"
-
-#: Config.cpp:164
-msgid "Stretch"
-msgstr "Растянуть"
-
-#: Config.cpp:165
-msgid "Original"
-msgstr "Как в N64"
-
-#: Config.cpp:168
-msgid "Fog"
-msgstr "Туман"
-
-#: Config.cpp:169
-msgid "Buffer clear on every frame"
-msgstr "Очистка буфера каждого кадра"
-
-#: Config.cpp:170
-msgid "Enable frame buffer emulation"
-msgstr "Включить эмуляцию буфера кадра"
-
-#: Config.cpp:171
-msgid "Hardware frame buffer emulation"
-msgstr "Аппаратная эмуляция буфера кадра"
-
-#: Config.cpp:172
-msgid "Get frame buffer info"
-msgstr "Давать информацию о буфере"
-
-#: Config.cpp:173
-msgid "Read every frame (slow!)"
-msgstr "Считывать каждый кадр (медленно!)"
-
-#: Config.cpp:174
-msgid "Render N64 frame buffer as texture"
-msgstr "Выводить буфер N64 как текстуру"
-
-#: Config.cpp:175
-msgid "Detect CPU write to the N64 frame buffer"
-msgstr "Определять, что N64 CPU пишет в буфер"
-
-#: Config.cpp:176
-msgid "Software depth buffer rendering"
-msgstr "Программный рендеринг буфера глубины"
-
-#: Config.cpp:200
-#: Config.cpp:619
-msgid "Texture enhancement"
-msgstr "Улучшение текстур"
-
-#: Config.cpp:201
-msgid "Hi-resolution textures"
-msgstr "Текстуры высокого разрешения"
-
-#: Config.cpp:202
-msgid "Common"
-msgstr "Общие"
-
-#: Config.cpp:203
-msgid "Presets"
-msgstr "Предустановки"
-
-#: Config.cpp:204
-#: Config.cpp:205
-msgid "Performance tweaks"
-msgstr "Улучшение производительности"
-
-#: Config.cpp:206
-msgid "Filter"
-msgstr "Фильтр"
-
-#: Config.cpp:208
-#: Config.cpp:219
-#: Config.cpp:238
-msgid "None"
-msgstr "Никакой"
-
-#: Config.cpp:209
-msgid "Smooth filtering 1"
-msgstr "Сглаживающий фильтр 1"
-
-#: Config.cpp:210
-msgid "Smooth filtering 2"
-msgstr "Сглаживающий фильтр 2"
-
-#: Config.cpp:211
-msgid "Smooth filtering 3"
-msgstr "Сглаживающий фильтр 3"
-
-#: Config.cpp:212
-msgid "Smooth filtering 4"
-msgstr "Сглаживающий фильтр 4"
-
-#: Config.cpp:213
-msgid "Sharp filtering 1"
-msgstr " 1"
-
-#: Config.cpp:214
-msgid "Sharp filtering 2"
-msgstr "Фильтр резкости 2"
-
-#: Config.cpp:217
-msgid "Enhancement"
-msgstr "Улучшение"
-
-#: Config.cpp:220
-msgid "Store"
-msgstr "Хранить"
-
-#: Config.cpp:230
-msgid "Texture cache"
-msgstr "Текстурный кэш"
-
-#: Config.cpp:232
-msgid "Mbytes"
-msgstr "Мбайт"
-
-#: Config.cpp:233
-msgid "Ignore Backgrounds"
-msgstr "Игнорировать текстуры фона"
-
-#: Config.cpp:234
-#: Config.cpp:245
-msgid "Apply texture compression"
-msgstr "Применить компрессию текстур"
-
-#: Config.cpp:235
-#: Config.cpp:246
-msgid "Compress texture cache"
-msgstr "Сжимать текстурный кэш"
-
-#: Config.cpp:236
-msgid "Format"
-msgstr "Формат"
-
-#: Config.cpp:239
-msgid "Rice format"
-msgstr "Формат Rice"
-
-#: Config.cpp:242
-msgid "Tile textures"
-msgstr "Резать на тайлы"
-
-#: Config.cpp:243
-msgid "Force 16bpp textures"
-msgstr "Приводить к 16 бит текстурам"
-
-#: Config.cpp:244
-msgid "Alternative CRC calculation"
-msgstr "Альтернативное вычисление CRC"
-
-#: Config.cpp:247
-msgid "Use alpha channel fully"
-msgstr "Использовать альфа канал полностью"
-
-#: Config.cpp:248
-msgid "Texture dumping/editing mode"
-msgstr "Дамп/редактирование текстур"
-
-#: Config.cpp:249
-msgid "Texture compression method"
-msgstr "Метод компрессии текстур"
-
-#: Config.cpp:255
-msgid "Save texture cache to hard disk"
-msgstr "Сохранять текстурный кэш на диск"
-
-#: Config.cpp:256
-msgid "Best performance"
-msgstr "Наилучшая производительность"
-
-#: Config.cpp:257
-msgid "Best texture quality"
-msgstr "Наилучшее качество текстур"
-
-#: Config.cpp:263
-msgid "Developers settings"
-msgstr "Настройки разработчика"
-
-#: Config.cpp:264
-msgid "Debug/Misc"
-msgstr "Отладка/Разное"
-
-#: Config.cpp:265
-msgid "Autodetect Microcode"
-msgstr "Автоопределение Микрокода"
-
-#: Config.cpp:266
-msgid "Force Microcode:"
-msgstr "Форсировать Микрокод:"
-
-#: Config.cpp:279
-msgid "Wireframe using:"
-msgstr "Каркасный режим:"
-
-#: Config.cpp:281
-msgid "Original colors"
-msgstr "Исходные цвета"
-
-#: Config.cpp:282
-msgid "Vertex colors"
-msgstr "Цвета вершин"
-
-#: Config.cpp:283
-msgid "Red only"
-msgstr "Только красный"
-
-#: Config.cpp:286
-msgid "Log to rdp.txt (SLOW)"
-msgstr "Лог в rdp.txt"
-
-#: Config.cpp:287
-msgid "Unknown combiners as red"
-msgstr "Красные неизвестные комбайнеры"
-
-#: Config.cpp:288
-msgid "Log clear every frame"
-msgstr "Очистка лога каждый кадр"
-
-#: Config.cpp:289
-msgid "Combiner logging"
-msgstr "Лог комбайнеров"
-
-#: Config.cpp:290
-msgid "Run (+log) in window"
-msgstr "Лог в оконном режиме"
-
-#: Config.cpp:291
-msgid "Cmb. clear every frame"
-msgstr "Очистка комб. лога каждый кадр"
-
-#: Config.cpp:292
-msgid "Error log (rdp_e.txt)"
-msgstr "Лог ошибок  (rdp_e.txt)"
-
-#: Config.cpp:293
-msgid "Bilinear filter texture cache"
-msgstr "Билинейная фильтрация текстурного кэша"
-
-#: Config.cpp:325
-#: Config.cpp:546
-msgid " auto"
-msgstr " авто"
-
-#: Config.cpp:382
-msgid "Please choose language:"
-msgstr "Пожалуйста, выберите язык:"
-
-#: Config.cpp:383
-msgid "Language"
-msgstr "Язык"
-
-#: Config.cpp:390
-msgid "Press OK to change to "
-msgstr "Нажмите ОК для смены на "
-
-#: Config.cpp:486
-msgid "Basic settings"
-msgstr "Базовые настройки"
-
-#: Config.cpp:487
-msgid ""
-"Resolution\n"
-"This option selects the fullscreen resolution for 3dfx cards and windowed resolution for other cards\n"
-"(note again that for 3dfx cards the plugin must be in fullscreen mode to see anything).\n"
-"[Recommended: 640x480, 800x600, 1024x768]"
-msgstr ""
-"Разрешение экрана\n"
-"Эта опция устанавливает полноэкранное разрешение для карт 3dfx и оконное разрешение для остальных карт\n"
-"(ещё раз заметим, что для 3dfx карт плагин нужно перевести в полноэкранный режим)\n"
-"[Рекомендуется: 640x480, 800x600, 1024x768]"
-
-#: Config.cpp:491
-msgid ""
-"Vertical sync\n"
-"This option will enable the vertical sync, which will prevent tearing.\n"
-"Note: this option will ONLY have effect if vsync is set to \"Software Controlled\".\n"
-msgstr ""
-"Кадровая синхронизация\n"
-"Эта опция включает кадровую синхронизацию.\n"
-"Примечание: эта опция имеет эффект только если vsync установлен в \"Software Controlled\".\n"
-
-#: Config.cpp:493
-msgid "Select a format, in which screen shots will be saved"
-msgstr "Выберите формат, в котором будут сохраняться скриншоты."
-
-#: Config.cpp:500
-msgid ""
-"Language select:\n"
-"Press the button to invoke language selection dialog.\n"
-"Selected language will be activated after restart of the configuration dialog."
-msgstr ""
-"Выбор языка:\n"
-"Нажмите эту кнопку для вызова диалога выбора языка.\n"
-"Выбранный язык будет активирован после перезапуска\n"
-"диалога настроек."
-
-#: Config.cpp:501
-msgid ""
-"FPS counter\n"
-"When this option is checked, a FPS (frames per second) counter will be shown\n"
-"in the lower left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Счётчик FPS\n"
-"Когда включено, в левом нижнем углу экрана показывается счётчик количества кадров в секунду (FPS, frames per second)\n"
-"[Рекомендуется: на ваше усмотрение]"
-
-#: Config.cpp:503
-msgid ""
-"VI/s counter\n"
-"When this option is checked, a VI/s (vertical interrupts per second) counter\n"
-"will be shown in the lower left corner of the screen.  This is like the FPS\n"
-"counter but will be consistent at 60 VI/s for full speed on NTSC (U) games and\n"
-"50 VI/s for full speed on PAL (E) ones.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Счётчик VI/s\n"
-"Когда включено, в левом нижнем углу экрана показывается счётчик вертикальных прерываний в секунду (VI/s, vertical interrupts per second)\n"
-"Подобно счётчику FPS он показывает скорость работы и при полной скорости должен показывать 60 VI/s для NTSC (U) игр\n"
-"и 50 VI/s для PAL (E) игр.\n"
-"[Рекомендуется: на ваше усмотрение]"
-
-#: Config.cpp:505
-#, c-format
-msgid ""
-"% speed\n"
-"This displays a percentage of the actual N64 speed in the lower\n"
-"left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Скорость в %\n"
-"В нижнем левом углу экрана показывает скорость эмуляции в % от скорости игры на N64.\n"
-"[Рекомендуется: на ваше усмотрение]"
-
-#: Config.cpp:507
-msgid ""
-"Clock enabled\n"
-"This option will put a clock in the lower right corner of the screen, showing the current time.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Включить часы\n"
-"Если включено, в правом нижнем углу выводятся часы, показывающие текущее время.\n"
-"[Рекомендуется: на ваше усмотрение]"
-
-#: Config.cpp:510
-msgid ""
-"Display hours as 24-hour clock.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Показывать часы в 24х часовом формате.\n"
-"[Рекомендуется: на ваше усмотрение]"
-
-#: Config.cpp:511
-msgid ""
-"Transparent text background\n"
-"If this is checked, all on-screen messages will have a transparent background.  Otherwise, it will have a solid black background.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Прозрачный фон текста\n"
-"Если включено, у всех экранных сообщений будет прозрачный фон, иначе фон будет чёрный.\n"
-"[Рекомендуется: на ваше усмотрение]"
-
-#: Config.cpp:514
-msgid ""
-"Enable \"Emulation settings\" panel. For experienced users only!\n"
-"It shows default emulation settings when game is not loaded, or current game settings otherwise."
-msgstr ""
-"Показывать панель \"Настройки эмуляции\". Только для опытных пользователей!\n"
-"Если игра не загружена, показывает настройки эмуляции по умолчанию, иначе показываются настройки текущей игры."
-
-#: Config.cpp:516
-msgid ""
-"Enable \"Texture enhancement\" panel.\n"
-"It shows various enhancement options for original textures as well as options for hi-resolution textures."
-msgstr ""
-"Показывать панель \"Улучшение текстур\".\n"
-"Показывает различные настройки улучшения исходных текстур, а также настройки текстур высокого разрешения."
-
-#: Config.cpp:517
-msgid ""
-"Full screen resolution:\n"
-"This sets the full screen resolution for non-3dfx video cards.\n"
-"All the resolutions that your video card/monitor support should be displayed.\n"
-"[Recommended: native (max) resolution of your monitor - unless performance becomes an issue]"
-msgstr ""
-"Полноэкранное разрешение:\n"
-"Устанавливает полноэкранное разрешение для не-3dfx карт.\n"
-"В списке должны быть все разрешения, поддерживаемые вашей картой и монитором.\n"
-"[Рекомендуется: родное (максимальное) разрешение вашего монитора, если нет проблем с производительностью]"
-
-#: Config.cpp:520
-msgid ""
-"Anisotropic filtering:\n"
-"This filter sharpens and brings out the details of textures that recede into the distance.\n"
-"When activated, it will use the max anisotropy your video card supports.\n"
-"However, this will override native way of texture filtering and may cause visual artifacts in some games.\n"
-"[Recommended: your preference, game dependant]"
-msgstr ""
-"Анизотропная фильтрация:\n"
-"Этот фильтр делает резче и детальнее текстуры, уходящие в даль.\n"
-"Если включено, используется максимальный уровень анизотропии,\n"
-"поддерживаемый вашей картой.\n"
-"Однако, это отключает родные методы фильтрации текстур и может\n"
-"привести к визуальным артифактам в некоторых играх.\n"
-"[Рекомендуется: на ваше усмотрение, зависит от игры]"
-
-#: Config.cpp:521
-msgid ""
-"Autodetect VRAM Size:\n"
-"Since OpenGL cannot do this reliably at the moment, the option to set this manually is available.\n"
-"If checked, plugin will try to autodetect VRAM size.\n"
-"But if this appears wrong, please uncheck and set it to correct value.\n"
-"[Recommended: on]"
-msgstr ""
-"Авто определение размера видеопамяти:\n"
-"Т.к. OpenGL пока не позволяет надежно определить размер доступной видеопамяти,\n"
-"его можно установить вручную.\n"
-"Если включено, плагин попытается определить размеер самостоятельно.\n"
-"Если возникнут ошибки в работе плагина, выключите авто определение и установите размер вручную.\n"
-"[Рекомендуется: вкл.]"
-
-#: Config.cpp:523
-msgid ""
-"Use frame buffer objects:\n"
-"Changes the way FB effects are rendered - with or without usage of the OpenGL Frame Buffer Objects (FBO) extension.\n"
-"The choice depends on game and your video card. FBO off is good for NVIDIA cards, while for ATI cards, it's usually best that FBOs are turned on.\n"
-"Also, some FB effects works only with one of the methods, no matter, which card you have.\n"
-"On the whole, with FBO off, compatibility/ accuracy is a bit better (which is the case for Resident Evil 2).\n"
-"However, with FBO on with some systems, it can actually be a bit faster in cases.\n"
-"[Recommended: video card and game dependant]"
-msgstr ""
-"Использовать frame buffer objects:\n"
-"Опция меняет способ рендеринга эффектов буфера кадра:\n"
-"с использованием  Объектов Буфера Кадра (OpenGL Frame Buffer Objects, FBO) или без.\n"
-"Выбор зависит от игры и от вышей видео карты. Для NVidia обычно лучше отключать FBO,\n"
-"а для ATI карт лучше включить.\n"
-"Также, некоторые эффекты буфера кадра работают только с одним из методов,\n"
-"в не зависимости от используемой видеокарты.\n"
-"В целом, при отключенном FBO совместимость/качество чуть лучше (например для Resident Evil 2).\n"
-"Однако, на некоторые системы работают заметно быстрее с FBO.\n"
-"[Рекомендуется: зависит от игры и видео карты]"
-
-#: Config.cpp:578
-msgid "Emulation settings"
-msgstr "Настройки эмуляции"
-
-#: Config.cpp:579
-msgid ""
-"Filtering mode\n"
-"There are three filtering modes possible:\n"
-"* Automatic filtering - filter exactly how the N64 specifies.\n"
-"* Point-sampled filtering - causes texels to appear square and sharp.\n"
-"* Bilinear filtering - interpolates the texture to make it appear more smooth.\n"
-"[Recommended: Automatic]"
-msgstr ""
-"Фильтрация текстур\n"
-"Доступны три режима фильтрации:\n"
-"* Автоматическая - фильтровать в точночти как на N64.\n"
-"* Всегда Point-sampled - все тексели будут квадратными и резкими.\n"
-"* Всегда билинейная - интерполирует тексели текстуры, делая ее более гладкой.\n"
-"[Рекомендуется: Автоматическая]"
-
-#: Config.cpp:583
-msgid ""
-"Buffer swapping method\n"
-"There are 3 buffer swapping methods:\n"
-"* old - swap buffers when vertical interrupt has occurred.\n"
-"* new - swap buffers when set of conditions is satisfied. Prevents flicker on some games.\n"
-"* hybrid - mix of first two methods.\n"
-"Can prevent even more flickering then previous method, but also can cause artefacts.\n"
-"If you have flickering problems in a game (or graphics that don't show),\n"
-"try to change swapping method.\n"
-"[Recommended: new (hybrid for Paper Mario)]"
-msgstr ""
-"Метод смены буфера кадра\n"
-"Доступны 3 метода:\n"
-"* старый - смена буфера по вертикальному прерыванию.\n"
-"* новый - смена буфера по набору условий.\n"
-"Предотвращает мерцание в некоторых играх.\n"
-"* гибридный - комбинация первых двух методов.\n"
-"Может ещё надёжнее предотвращать мерцание, чем предыдущий метод,\n"
-"но также может вызывать артифакты.\n"
-"Если в какой-то игре есть мерциние (или графика вообще не выводится),\n"
-"попытайтесь поменять метод  смены буфера .\n"
-"[Рекомендуется: новый (гибридный для Paper Mario)]"
-
-#: Config.cpp:587
-msgid ""
-"Per-pixel level-of-detail calculation\n"
-"N64 uses special mechanism for mip-mapping, which nearly impossible to reproduce\n"
-"correctly on PC hardware. This option enables approximate emulation of this feature.\n"
-"For example, it is required for the Peach/Bowser portrait's transition in Super Mario 64.\n"
-"There are 3 modes:\n"
-"* off - LOD is not calculated\n"
-"* fast - fast imprecise LOD calculation.\n"
-"* precise - most precise LOD calculation possible, but more slow.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Попиксельное вычисление уровня детализации\n"
-"N64 использует специфичный механизм мип-маппинга, который почти невозможно\n"
-"корректно воспроизвести на PC. Эта опция включает его приблизительную эмуляцию.\n"
-"Это нужно, к примеру, в Super Mario 64 для превращения портрета Peach в портерт Bowser'а.\n"
-"Доступны 3 режима:\n"
-"* нет - LOD не вычисляется\n"
-"* быстро - быстрое неточное вычисление LOD.\n"
-"* точно - наиболее точный метод вычисления LOD, но более медленный.\n"
-"[Рекомендуется: на ваше усмотрение]"
-
-#: Config.cpp:592
-msgid ""
-"Aspect ratio of the output.\n"
-"Most N64 games use 4:3 aspect ratio, but some support widescreen too.\n"
-"You may select appropriate aspect here and set widescreen mode in game settings.\n"
-"In \"Stretch\" mode the output will be stretched to the entire screen,\n"
-"other modes may add black borders if necessary"
-msgstr ""
-"Соотношение размеров кадра.\n"
-"Большинство игр на N64 используют соотношение размеров кадра 4:3,\n"
-"но некоторые таже поддерживают широкоформатные разрешения.\n"
-"Вы можете выбрать подходящее соотношение здесь и выбрать режим  \"widescreen\"\n"
-"в настройках игры.\n"
-"В режиме \"Растянуть\" кадр будет растянут на весь экран,\n"
-"остальные режимы добавляют черные полосы по краям экрана,\n"
-"если это необходимо для поддержания выбранного соотношения."
-
-#: Config.cpp:595
-msgid ""
-"Fog enabled\n"
-"Sets fog emulation on//off.\n"
-"[Recommended: on]"
-msgstr ""
-"Туман\n"
-"Включает эмуляцию тумана.\n"
-"[Рекомендуется: вкл]"
-
-#: Config.cpp:597
-msgid ""
-"Buffer clear on every frame\n"
-"Forces the frame buffer to be cleared every frame drawn.\n"
-"Usually frame buffer clear is controlled by the game.\n"
-"However, in some cases it is not well emulated,\n"
-"and some garbage may be left on the screen.\n"
-"In such cases, this option must be set on.\n"
-"[Recommended: on]"
-msgstr ""
-"Очистка буфера каждого кадра\n"
-"Принудительно очищает буфер каждого кадра перед отрисовкой.\n"
-"Как правило, очистка буфера контролируется игрой.\n"
-"Однако, это не всегда хорошо эмулируется, и на экране может появляться мусор.\n"
-"В таких случаях эта опция должна быть включена.\n"
-"[Рекомендуется: вкл]"
-
-#: Config.cpp:599
-msgid ""
-"Enable frame buffer emulation\n"
-"If on, plugin will try to detect frame buffer usage and apply appropriate frame buffer emulation.\n"
-"[Recommended: on for games which use frame buffer effects]"
-msgstr ""
-"Включить эмуляцию буфера кадра\n"
-"Если включено, плагин пытается определить использование буфера кадра\n"
-"и применить подходящий метод эмуляции.\n"
-"[Рекомендуется: вкл. для игр, использующих эффекты буфера кадра]"
-
-#: Config.cpp:601
-msgid ""
-"Enable hardware frame buffer emulation\n"
-"If this option is on, plugin will create auxiliary frame buffers in video memory instead of copying\n"
-"frame buffer content into main memory. This allows plugin to run frame buffer effects without slowdown\n"
-"and without scaling image down to N64's native resolution. This feature is fully supported by\n"
-"Voodoo 4/5 cards and partially by Voodoo3 and Banshee. Modern cards also fully support it.\n"
-"[Recommended: on, if supported by your hardware]"
-msgstr ""
-"Аппаратная эмуляция буфера кадра\n"
-"Если включено, плагин будет создавать вспомогательные буферы кадра в видео памяти\n"
-"вместо копирования содержимого основного буфера кадра в основную память.\n"
-"Это позволяет эфектам буфера кадра работать без замедления и без уменьшения картинки до размеров кадра N64.\n"
-"Эта возможность полностью поддерживается Voodoo 4/5 и современными видеокартами,\n"
-"а также частично работает на Voodoo3 и Banshee.\n"
-"[Рекомендуется: вкл. если поддерживается вашей видеокартой]"
-
-#: Config.cpp:604
-msgid ""
-"Get information about frame buffers\n"
-"This is compatibility option. It must be set on for Mupen64 and off for 1964"
-msgstr ""
-"Выдать информацию о буферах кадра\n"
-"Опция для совместимости. Должна быть включена для Mupen64 и выключена для 1964."
-
-#: Config.cpp:606
-msgid ""
-"Read every frame\n"
-"In some games plugin can't detect frame buffer usage.\n"
-"In such cases you need to enable this option to see frame buffer effects.\n"
-"Every drawn frame will be read from video card -> it works very slow.\n"
-"[Recommended: mostly off (needed only for a few games)]"
-msgstr ""
-"Считывать каждый кадр\n"
-"В некоторых играх плагин не может обнаружить использование буфера кадра.\n"
-"В таких случаях нужно включить эту опцию чтобы увидеть эффект буфера кадра.\n"
-"Каждый отрисованный кадр будет считываться из видео карты в основную\n"
-"память -> работает очень медленно.\n"
-"[Рекомендуется: в основном выкл. (нужна только для нескольких игр)]"
-
-#: Config.cpp:608
-msgid ""
-"Render N64 frame buffer as texture\n"
-"When this option is enabled, content of each N64 frame buffer is rendered\n"
-"as texture over the frame, rendered by the plugin. This prevents graphics lost,\n"
-"but may cause slowdowns and various glitches in some games.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"Выводить буфер N64 как текстуру\n"
-"Если включено, содержимое каждого буфера кадра N64 выводится\n"
-"как текстура поверх кадра, рисуемого плагином. Это предотвращает потерю\n"
-"графики, выводимой в буфер процессором N64, но может вызвать замедление и\n"
-"различные визуальные проблемы в некоторых играх.\n"
-"[Рекомендуется: в основном выкл.]"
-
-#: Config.cpp:610
-msgid ""
-"Detect CPU write to the N64 frame buffer\n"
-"This option works as the previous options, but the plugin is trying to detect,\n"
-"when game uses CPU writes to N64 frame buffer. The N64 frame buffer is rendered\n"
-"only when CPU writes is detected. Use this option for those games, in which you\n"
-"see still image or no image at all for some time with no reason.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"Определять, что N64 CPU пишет в буфер\n"
-"Эта опция работает как предыдущая, только плагин пытается определить,\n"
-"когда игра использует CPU для записи напрямую в буфер N64. Буфер N64 отрисовывается\n"
-"только когда обнаружено, что CPU пишет в буфер. Используйте эту опцию для игр,\n"
-"в которых картинка застывает или пропадает на некоторое время без видимой причины.\n"
-"[Рекомендуется: в основном выкл.]"
-
-#: Config.cpp:612
-msgid ""
-"Enable depth buffer rendering\n"
-"This option is used to fully emulate N64 depth buffer.\n"
-"It is required for correct emulation of depth buffer based effects.\n"
-"However, it requires fast (>1GHz) CPU to work full speed.\n"
-"[Recommended: on for fast PC]"
-msgstr ""
-"Программный рендеринг буфера глубины\n"
-"Используется для полной эмуляции буфера глубины N64.\n"
-"Требуется для корректной эмуляции эфектов, основанных на значениях из буфера глубины.\n"
-"Для работы на полной скорости требуется быстрый (>1Ггц) процессор.\n"
-"[Рекомендуется: для быстрых процессоров - вкл.]"
-
-#: Config.cpp:620
-msgid ""
-"Filters:\n"
-"Apply a filter to either smooth or sharpen textures.\n"
-"There are 4 different smoothing filters and 2 different sharpening filters.\n"
-"The higher the number, the stronger the effect,\n"
-"i.e. \"Smoothing filter 4\" will have a much more noticeable effect than \"Smoothing filter 1\".\n"
-"Be aware that performance may have an impact depending on the game and/or the PC.\n"
-"[Recommended: your preference]"
-msgstr ""
-"Фильтры:\n"
-"Применить фильтр для сглаживания текстур, или наоборот для увеличения резкости.\n"
-"Есть 4 различных сглаживающих фильтра и 2 разных фильтра резкости.\n"
-"Чем выше номер, тем сильнее эффект, т.е. применение \"Сглаживающего фильтра 4\" будет\n"
-"намного заметнее чем \"Сглаживающего фильтра 1\".\n"
-"Имейте в виду, что в зависимости от игры и вашей системы фильтры могут влиять на скорость работы.\n"
-"[Рекомендуется: на ваше усмотрение]"
-
-#: Config.cpp:624
-msgid ""
-"Texture enhancement:\n"
-"7 different filters are selectable here, each one with a distinctive look.\n"
-"Be aware of possible performance impacts.\n"
-"\n"
-"IMPORTANT: 'Store' mode - saves textures in cache 'as is'. It can improve performance in games, which load many textures.\n"
-"Disable 'Ignore backgrounds' option for better result.\n"
-"\n"
-"[Recommended: your preference]"
-msgstr ""
-"Улучшение текстур:\n"
-"Здесь можно выбрать 7 различных фильтров, каждый выглядит по своему.\n"
-"Применение может повлиять на производительность.\n"
-"\n"
-"ВАЖНО: в режиме 'Хранить' текстуры сохраняются в кэше без изменений. Этот режим может повысить производительность в играх,\n"
-"которые грузят множество текстур. Отключите опцию 'Игнорировать текстуры фона' для лучшего результата.\n"
-"[Рекомендуется: на ваше усмотрение]"
-
-#: Config.cpp:628
-msgid ""
-"Texture cache size:\n"
-"Enhanced and filtered textures can be cached to aid performance.\n"
-"This setting will adjust how much PC memory will be dedicated for texture cache.\n"
-"This helps boost performance if there are subsequent requests for the same texture (usually the case).\n"
-"Normally, 128MB should be more than enough but there is a sweet spot for each game.\n"
-"Super Mario may not need more than 32megs, but Conker streams a lot of textures,\n"
-"so setting 256+ megs can boost performance. Adjust accordingly if you are encountering speed issues.\n"
-"'0' disables cache.\n"
-"[Recommended: PC and game dependant]"
-msgstr ""
-"Размер текстурного кэша:\n"
-"Текстуры, к которым применялись фильтры, могут сохраняться в кэше для повышения производительности.\n"
-"Эта настройка регулирует, сколько системной памяти будет выделено под текстурный кэш.\n"
-"Кэш резко повышает производительность при многократных обращениях к текстуре (что обычно и бывает).\n"
-"Обычно 128мб больше чем достаточно, но для каждой игры можно подобрать оптимальное значение.\n"
-"Для Super Mario нужно не более 32мб, а вот Conker загружает множество текстур,\n"
-"так что 256+ мб под кэш будут не лишними. Если возникают проблемы с производительностью,\n"
-"попробуйте увеличить размер кэша.\n"
-"'0' отключает кэширование текстур.\n"
-"[Рекомендуется: зависит от игры и вашей системы]"
-
-#: Config.cpp:634
-msgid ""
-"Ignore Backgrounds:\n"
-"It is used to skip enhancement for long narrow textures, usually used for backgrounds.\n"
-"This may save texture memory greatly and increase performance.\n"
-"[Recommended: on (off for 'Store' mode)]"
-msgstr ""
-"Игнорировать текстуры фона:\n"
-"Используется чтобы не применять фильтры к длинным узким текстурам, обычно используемым для заднего плана.\n"
-"Это может сильно сократить расход видеопамяти и увеличить производительность.\n"
-"[Рекомендуется: вкл. (выкл. в режиме 'Хранить')]"
-
-#: Config.cpp:636
-msgid ""
-"Texture compression:\n"
-"Textures will be compressed using selected texture compression method.\n"
-"The overall compression ratio is about 1/6 for FXT1 and 1/4 for S3TC.\n"
-"In addition to saving space on the texture cache,\n"
-"the space occupied on the GFX hardware's texture RAM,\n"
-"by the enhanced textures, will be greatly reduced.\n"
-"This minimizes texture RAM usage,\n"
-"decreasing the number of texture swaps to the GFX hardware leading to performance gains.\n"
-"However, due to the nature of lossy compression of FXT1 and S3TC, using this option can sometimes lead to quality degradation of small size textures and color banding of gradient colored textures.\n"
-"[Recommended: off]"
-msgstr ""
-"Компрессия текстур:\n"
-"Текстуры будут сжаты с применением выбранного метода компресии.\n"
-"Общий уровень сжатия приблизительно равен 1/6 для FXT1 и 1/4 для S3TC.\n"
-"Это позволяет резко сократить размер используемой текстурной памяти видеокарты,\n"
-"а также сохраненить место в текстурном кэше. В результате минимизируется количество\n"
-"перезагрузок текстур, что улучшает производительность.\n"
-"Так как для компресии текстур применяются алгоритмы с потерей информации,\n"
-"использование этой опции иногда приводит к потере качества текстур небольшого размера\n"
-"и равномерной закраске текстур с градиентной закраской.\n"
-"[Рекомендуется: выкл.]"
-
-#: Config.cpp:640
-msgid ""
-"Compress texture cache:\n"
-"Memory will be compressed so that more textures can be held in the texture cache.\n"
-"The compression ratio varies with each texture,\n"
-"but 1/5 of the original size would be a modest approximation.\n"
-"They will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"Сжимать текстурный кэш:\n"
-"Память кэша будет сжиматься позволяя хранить в нём больше текстур.\n"
-"Уровень сжатия свой для каждой текстуры, в среднем приблизительно 1/5.\n"
-"Содержимое кэша распаковывается на лету, перед загрузкой  в видеокарту.\n"
-"Эта опция позволяет сохранить память даже в случае применения компрессии текстур.\n"
-"[Рекомендуется: вкл.]"
-
-#: Config.cpp:642
-msgid ""
-"Hi-res pack format:\n"
-"Choose which method is to be used for loading Hi-res texture packs.\n"
-"Only Rice's format is available currently.\n"
-"Leave on \"None\" if you will not be needing to load hi-res packs.\n"
-"[Recommended: Rice's format. Default: \"None\"]"
-msgstr ""
-"Формат набора тестур высокого разрешения:\n"
-"Выбрать метод загрузки тестур высокого разрешения.\n"
-"В данный момент поддерживается только формат RiceVideo.\n"
-"Оставьте \"Никакой\", если вам не нужна загрузка тестур высокого разрешения.\n"
-"[Рекомендуется: Формат Rice. По умолчанию:  \"Никакой\"]"
-
-#: Config.cpp:646
-msgid ""
-"Tile textures:\n"
-"When on, wide texture will be split on several tiles to fit in one 256-width texture.\n"
-"This tiled texture takes much less video memory space and thus overall performance will increase.\n"
-"However, corresponding polygons must be split too, and this is not polished yet\n"
-"- various issues are possible, including black lines and polygons distortions.\n"
-"[Recommended: off]"
-msgstr ""
-"Резать на тайлы:\n"
-"Когда включено, длинные текстуры будут разаться на куски, помещающиеся в текстуру шириной 256.\n"
-"такая порезанная текстура занимает намного меньше места в видео памяти,\n"
-"что улучшает общую производительность. Однако, соотвествующие полигоны также должны быть порезаны,\n"
-"и этот механизм ещё не до конца отлажен, так что возможны различные проблемы, вроде черных полос\n"
-"или искривления текстур.\n"
-"[Рекомендуется: выкл.]"
-
-#: Config.cpp:648
-msgid ""
-"Force 16bpp textures:\n"
-"The color of the textures will be reduced to 16bpp.\n"
-"This is another space saver and performance enhancer.\n"
-"This halves the space used on the texture cache and the GFX hardware's texture RAM.\n"
-"Color reduction is done so that the original quality is preserved as much as possible.\n"
-"Depending on the texture, this usually is hardly noticeable.\n"
-"Sometimes though, it can be: skies are a good example.\n"
-"[Recommended: off]"
-msgstr ""
-"Приводить к 16 бит текстурам:\n"
-"Цвет текстур будет приведен к 16бит.\n"
-"Ещё один способ сохранить память и улучшить производительность.\n"
-"Размер текстуры в видеопамяти и в текстурном кэше уменьшается вдвое.\n"
-"Используемый алгоритм приведения максимально возможно сохраняет качество исходной текстуры.\n"
-"Обычно разница едва видна, но иногда различие заметно, например в текстурах небес.\n"
-"[Рекомендуется: выкл.]"
-
-#: Config.cpp:650
-msgid ""
-"Texture dumping mode:\n"
-"In this mode, you have that ability to dump textures on screen to the appropriate folder.\n"
-"You can also reload textures while the game is running to see how they look instantly - big time saver!\n"
-"\n"
-"Hotkeys: \"R\" reloads hires textures from the texture pack - \"D\" toggles texture dumps on/off."
-msgstr ""
-"Дамп и редактирование текстур:\n"
-"В этом режиме вы можете сделать дамп текстур с экрана в соотвествующую папку.\n"
-"Вы также можете перезагрузить текстуры во время работы игры чтобы сразу увидеть, как они выглядят.\n"
-"\n"
-"Горячие клавишы: R - перезагрузить текстуры из набора, D - режим дампа вкл./выкл."
-
-#: Config.cpp:652
-msgid ""
-"Alternative CRC calculation:\n"
-"This option enables emulation of a palette CRC calculation bug in RiceVideo.\n"
-"If some textures are not loaded, try to set this option on/off.\n"
-"[Recommended: texture pack dependant, mostly on]"
-msgstr ""
-"Альтернативное вычисление CRC:\n"
-"Эта опция включает эмуляцию ошибки в вычислении контрольной суммы в RiceVideo.\n"
-"Если какие-то текстуры не загружаются, попробуйте переключить эту опцию.\n"
-"[Рекомендуется: зависит от набора текстур, обычно вкл.]"
-
-#: Config.cpp:657
-msgid ""
-"Compress texture cache:\n"
-"When game started, plugin loads all its hi-resolution textures into PC memory.\n"
-"Since hi-resolution textures are usually large, the whole pack can take hundreds megabytes of memory.\n"
-"Cache compression allows save memory space greatly.\n"
-"Textures will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"Сжимать текстурный кэш:\n"
-"При запуске игры плагин грузит в основную память все текстуры высокого разрешения для этой игры.\n"
-"Так как эти текстуры довольно большие, весь набор может занимать сотни мегабайт памяти.\n"
-"Сжатие текстурного кэша приводит к сильной сэкономии памяти.\n"
-"Содержимое кэша распаковывается на лету, перед загрузкой  в видеокарту.\n"
-"Эта опция позволяет сохранить память даже в случае применения компрессии текстур.\n"
-"[Рекомендуется: вкл.]"
-
-#: Config.cpp:659
-msgid ""
-"Use Alpha channel fully:\n"
-"When this option is off, 16bit rgba textures will be loaded using RiceVideo style\n"
-"- with 1bit for alpha channel.\n"
-"When it is on, GlideHQ will check, how alpha channel is used by the hires texture,\n"
-"and select most appropriate format for it.\n"
-"This gives texture designers freedom to play with alpha, as they need,\n"
-"regardless of format of original N64 texture.\n"
-"For older and badly designed texture packs it can cause unwanted black borders.\n"
-"[Recommended: texture pack dependant]"
-msgstr ""
-"Использовать альфа канал полностью:\n"
-"Если отключено, 16 битные RGBA текстуры загружаются в стиле RiceVideo - \n"
-"1бит на альфа канал. Если включено, GlideHQ проверяет, каким образом альфа используется\n"
-"в текстуре высокого разрешения и использует для загрузки наиболее подходящий формат.\n"
-"Это позволяет дизайнерам текстур работать с альфой как им нужно,\n"
-"в независимости от формата исходной текстуры N64.\n"
-"Опция может вызывать чёрные бордюры у старых и криво сделанных текстур.\n"
-"[Рекомендуется: зависит от набора текстур]"
-
-#: Config.cpp:662
-msgid ""
-"Save texture cache to HD:\n"
-"\n"
-"For enhanced textures cache:\n"
-"This will save all previously loaded and enhanced textures to HD.\n"
-"So upon next game launch, all the textures will be instantly loaded, resulting in smoother performance.\n"
-"\n"
-"For high-resolution textures cache:\n"
-"After creation, loading hi-res texture will take only a few seconds upon game launch,\n"
-"as opposed to the 5 -60 seconds a pack can take to load without this cache file.\n"
-"The only downside here is upon any changes to the pack, the cache file will need to be manually deleted.\n"
-"\n"
-"Saved cache files go into a folder called \"Cache\" within the Plugins folder.\n"
-"\n"
-"[Highly Recommended: on]"
-msgstr ""
-"Сохранять текстурный кэш на диск:\n"
-"\n"
-"Для кэша улучшенных текстур:\n"
-"Все имеющиеся в кэше улучшенные текстуры будут сохранены на диске.\n"
-"При следующем запуске игры все эти текстуры будут мгновенно загружены.\n"
-"\n"
-"Для кэша текстур высокого разрешения:\n"
-"После создания кэша, загрузка текстур с диска займет пару секунд, в отличии от\n"
-"50-60 секунд, требуемых для загрузки без кэша.\n"
-"Единственным неудобством является необходимость вручную удалять файл кэша при\n"
-"изменениях в наборе текстур.\n"
-"\n"
-"Файлы кэша сохраняются в папке Plugins, в подпапке Cache.\n"
-"\n"
-"[Весьма рекомендуется: вкл.]"
-
-#: Config.cpp:685
-msgid "Debug"
-msgstr "Отладка"
-
-#: Config.cpp:686
-msgid ""
-"Autodetect Microcode\n"
-"If this option is checked, the microcode of the game\n"
-"will be detected automatically from the INI, and\n"
-"therefore it will not need to be set in this\n"
-"configuration dialog.\n"
-"[Recommended: on]"
-msgstr ""
-
-#: Config.cpp:688
-msgid ""
-"Force Microcode\n"
-"This option ONLY has an effect if Autodetect Microcode\n"
-"is unchecked, the crc from the game could not be\n"
-"found in the INI, OR after the game has already started\n"
-"running. In any of those three cases, this will\n"
-"select the microcode to use\n"
-"[Recommended: any, turn on Autodetect Microcode]"
-msgstr ""
-
-#: Config.cpp:692
-msgid ""
-"Wireframe\n"
-"This option, when checked, makes it so that the plugin will draw only the\n"
-"outlines of objects.  The colors specified in the combo box to the right\n"
-"determines the color that the wireframes show up as.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:694
-msgid ""
-"Wireframe Colors\n"
-"This selects the colors to use for the wireframes (if wireframe mode is enabled).\n"
-"There are 3 modes:\n"
-"* Original colors - draw exactly as it would normally, textures and all, only in wireframes.\n"
-"* Vertex colors - use the colors specified in the vertices to draw the wireframes with.\n"
-"* Red only - use a constant red color to draw the wireframes.\n"
-"[Recommended: Vertex colors]"
-msgstr ""
-
-#: Config.cpp:696
-msgid ""
-"Log to RDP.txt\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option, when checked, will log EVERY SINGLE\n"
-"COMMAND the plugin processes to a file called RDP.txt in the current directory.\n"
-"This is incredibly slow, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:698
-msgid ""
-"Unknown combiners as red\n"
-"Objects that use an unimplemented combine mode will show up as red instead of\n"
-"assuming texture with full alpha. Disable this option to remove the red stuff\n"
-"and at least have a guess at the correct combine mode.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:700
-msgid ""
-"Log clear every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option has no effect unless 'Log to RDP.txt'\n"
-"is checked. This will make it so that the log, RDP.txt, will be cleared at the\n"
-"beginning of every frame.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:702
-msgid ""
-"Log unknown combiners\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will cause every\n"
-"unimplemented combiner drawn to be logged to a file called Unimp.txt in the\n"
-"current directory. This becomes slow when there are unimplemented combiners\n"
-"on the screen, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:704
-msgid ""
-"Run and log in window\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option will make it so that the plugin will\n"
-"still process dlists in windowed mode. This allows for logging to occur while not\n"
-"in fullscreen, possibly allowing you to debug a crash.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:706
-msgid ""
-"Clear unknown combiner log every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option works much like 'Log clear every frame'\n"
-"except it clears the combiner log (Unimp.txt) instead of RDP.txt at the\n"
-"beginning of each frame. Again, this option has no effect if 'combiner logging' is disabled.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:709
-msgid ""
-"Bilinear filter texture cache\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will make the graphical\n"
-"debugger texture cache use bilinear filtering as opposed to point-sampled filtering,\n"
-"which it will use otherwise. See 'Filtering mode' for descriptions of bilinear and\n"
-"point-sampled filtering.\n"
-"[Recommended: off]"
-msgstr ""
-
-#: Config.cpp:1104
-msgid "Glide64 settings"
-msgstr "Настройки Glide64"
-
-#: Config.cpp:1293
-msgid "About Glide64"
-msgstr "Сведения о Glide64"
-
-#: Config.cpp:1326
-msgid "authors:"
-msgstr "авторы:"
-
-#: Config.cpp:1330
-msgid ""
-"Dave2001. Original author and former main developer.\n"
-"He founded Glide64 project on Dec. 29th, 2001.\n"
-"Left the project at fall of 2002.\n"
-msgstr ""
-"Dave2001. Основатель и  бывший главный разработчик\n"
-"проекта. Основал проект Glide64 29 Декабря, 2001 г.\n"
-"Покинул проект осенью 2002.\n"
-
-#: Config.cpp:1336
-msgid ""
-"Gugaman. Developer. Joined the project at winter 2002\n"
-" and left it at fall 2002."
-msgstr ""
-"Gugaman. Разработчик. Пришёл в проект зимой 2002 г.,\n"
-"покинул проект осенью 2002 г."
-
-#: Config.cpp:1342
-msgid ""
-"Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\n"
-"Main developer since fall of 2002."
-msgstr ""
-"Сергей 'Gonetz' Липский. Пришёл в проект зимой 2002 г.\n"
-"Основной разработчик с осени 2002 г."
-
-#: Config.cpp:1347
-msgid "Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. "
-msgstr "Hiroshi 'KoolSmoky' Morii, пришёл в проект в 2007 г. "
-
-#: Config.cpp:1350
-msgid "Glitch64 (the wrapper) authors:"
-msgstr "авторы Glitch64 (glide3x wrapper):"
-
-#: Config.cpp:1374
-msgid "GlideHQ author:"
-msgstr "автор GlideHQ:"
-
-#: Config.cpp:1381
-msgid "beta tester:"
-msgstr "бета тестер:"
-
-#: Config.cpp:1388
-msgid ""
-"special thanks to:\n"
-" Orkin, Rice, Daniel Borca, Legend.\n"
-"Thanks to EmuXHaven for hosting my site:\n"
-"http://glide64.emuxhaven.net\n"
-msgstr ""
-"особая благодарность:\n"
-"Orkin, Rice, Daniel Borca, Legend.\n"
-"спасибо EmuXHaven за хостинг моего сайта:\n"
-"http://glide64.emuxhaven.net\n"
-
-#~ msgid "Gfx cannot be drawn in windowed mode"
-#~ msgstr "Плагин не может выводить графику в оконном режиме"
-
-#~ msgid "Press Alt+Enter to switch to fullscreen"
-#~ msgstr "Нажмите Alt+Enter для переключения в оконный режим."
-
-#~ msgid ""
-#~ "Buffer clear on every frame\n"
-#~ "If this option is checked, the buffer will be cleared (screen initialized "
-#~ "to black)\n"
-#~ "at the beginning of each frame. If this option is disabled, the speed "
-#~ "might increase\n"
-#~ "slightly, but some trails may appear.\n"
-#~ "[Recommended: on]"
-#~ msgstr ""
-#~ "Очистка буфера каждого кадра\n"
-#~ "Если включено, буфер кадра будет очищаться (заливаться чёрным)\n"
-#~ "в начале отрисовки каждого кадра. "
diff --git a/Source/Glide64/Internalization/Glide64_zh_CN.po b/Source/Glide64/Internalization/Glide64_zh_CN.po
deleted file mode 100644
index 4db527a13..000000000
--- a/Source/Glide64/Internalization/Glide64_zh_CN.po
+++ /dev/null
@@ -1,1419 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Glide64 Chinese Translation v1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 17:29+0700\n"
-"PO-Revision-Date: 2011-12-19 17:59+0700\n"
-"Last-Translator: Navitel <support@navitel.su>\n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: Config.cpp:64
-msgid "Rendering"
-msgstr "渲染"
-
-#: Config.cpp:65
-msgid "Other"
-msgstr "其它"
-
-#: Config.cpp:66
-msgid "Speed"
-msgstr "速度"
-
-#: Config.cpp:67
-msgid "Time"
-msgstr "时间"
-
-#: Config.cpp:68
-msgid "On screen display"
-msgstr "屏幕上显示"
-
-#: Config.cpp:69
-msgid "OpenGL settings"
-msgstr "OpenGL设置"
-
-#: Config.cpp:70
-#: Config.cpp:137
-msgid "Frame buffer emulation"
-msgstr "帧缓冲区仿真"
-
-#: Config.cpp:71
-msgid ""
-"Windowed or\n"
-"3dfx card resolution:"
-msgstr ""
-"窗口或\n"
-"3dfx卡分辨率:"
-
-#: Config.cpp:99
-msgid "Vertical sync"
-msgstr "直同步"
-
-#: Config.cpp:100
-msgid "Show advanced emulation options"
-msgstr "显示高级仿真选项"
-
-#: Config.cpp:101
-msgid "Show texture enhancement options"
-msgstr "显示纹理增强选项"
-
-#: Config.cpp:102
-msgid "Screenshot format:"
-msgstr "截图格式:"
-
-#: Config.cpp:105
-msgid "Language: "
-msgstr "语言： "
-
-#: Config.cpp:106
-msgid "LANGUAGE_NAME"
-msgstr "华语（简体）"
-
-#: Config.cpp:112
-msgid "FPS counter"
-msgstr "FPS 计数器"
-
-#: Config.cpp:113
-msgid "VI/s counter"
-msgstr "VI/s 计数器"
-
-#: Config.cpp:114
-#, c-format
-msgid "% speed"
-msgstr "％速度 "
-
-#: Config.cpp:115
-msgid "Clock enabled"
-msgstr "时钟启用"
-
-#: Config.cpp:116
-msgid "Clock is 24-hour"
-msgstr "时钟为24小时"
-
-#: Config.cpp:117
-msgid "Transparent text background"
-msgstr "透明文字的背景"
-
-#: Config.cpp:118
-msgid ""
-"Full screen\n"
-"resolution:"
-msgstr ""
-"全屏幕\n"
-"分辨率:"
-
-#: Config.cpp:121
-msgid "Anisotropic filtering"
-msgstr "各向异性过滤"
-
-#: Config.cpp:122
-msgid "Autodetect "
-msgstr "自动检测 "
-
-#: Config.cpp:123
-msgid "VRAM size"
-msgstr "显存大小"
-
-#: Config.cpp:125
-msgid "Mb"
-msgstr "兆"
-
-#: Config.cpp:126
-msgid "Use frame buffer objects"
-msgstr "使用帧缓冲对象"
-
-#: Config.cpp:133
-msgid "Current game emulation settings. Change with care!"
-msgstr "目前的游戏仿真设置。更改时要小心！"
-
-#: Config.cpp:135
-msgid "Default emulation settings. Not recommended to change!"
-msgstr "默认仿真设置。不推荐更改！"
-
-#: Config.cpp:136
-msgid "General options"
-msgstr "一般选项"
-
-#: Config.cpp:138
-msgid "Depth buffer emulation"
-msgstr "深度缓冲仿真"
-
-#: Config.cpp:139
-msgid "Filtering mode:"
-msgstr "过滤模式："
-
-#: Config.cpp:141
-msgid "Automatic"
-msgstr "自动"
-
-#: Config.cpp:142
-msgid "Force Bilinear"
-msgstr "强行支持双线性"
-
-#: Config.cpp:143
-msgid "Force Point-sampled"
-msgstr "强行支持点采样"
-
-#: Config.cpp:146
-msgid "Buffer swapping method:"
-msgstr "缓冲交换方法："
-
-#: Config.cpp:148
-msgid "Old"
-msgstr "旧"
-
-#: Config.cpp:149
-msgid "New"
-msgstr "新"
-
-#: Config.cpp:150
-msgid "Hybrid"
-msgstr "混合"
-
-#: Config.cpp:153
-msgid "LOD calculation:"
-msgstr "LOD计算："
-
-#: Config.cpp:155
-msgid "off"
-msgstr "关"
-
-#: Config.cpp:156
-msgid "fast"
-msgstr "快"
-
-#: Config.cpp:157
-msgid "precise"
-msgstr "精确"
-
-#: Config.cpp:160
-msgid "Aspect ratio:"
-msgstr "宽高比："
-
-#: Config.cpp:162
-msgid "4:3 (default)"
-msgstr "4:3 （默认）"
-
-#: Config.cpp:163
-msgid "Force 16:9"
-msgstr "强行支持 16:9"
-
-#: Config.cpp:164
-msgid "Stretch"
-msgstr "伸展"
-
-#: Config.cpp:165
-msgid "Original"
-msgstr ""
-
-#: Config.cpp:168
-msgid "Fog"
-msgstr "雾"
-
-#: Config.cpp:169
-msgid "Buffer clear on every frame"
-msgstr "清除每一帧缓冲"
-
-#: Config.cpp:170
-msgid "Enable frame buffer emulation"
-msgstr "启用帧缓冲仿真"
-
-#: Config.cpp:171
-msgid "Hardware frame buffer emulation"
-msgstr "硬件仿真帧缓冲"
-
-#: Config.cpp:172
-msgid "Get frame buffer info"
-msgstr "取帧缓冲信息"
-
-#: Config.cpp:173
-msgid "Read every frame (slow!)"
-msgstr "读取每一帧（慢！）"
-
-#: Config.cpp:174
-msgid "Render N64 frame buffer as texture"
-msgstr "呈现N64帧缓冲为纹理"
-
-#: Config.cpp:175
-msgid "Detect CPU write to the N64 frame buffer"
-msgstr "检测CPU写入到N64帧缓冲"
-
-#: Config.cpp:176
-msgid "Software depth buffer rendering"
-msgstr "呈现软件深度缓冲"
-
-#: Config.cpp:200
-#: Config.cpp:619
-msgid "Texture enhancement"
-msgstr "纹理增强"
-
-#: Config.cpp:201
-msgid "Hi-resolution textures"
-msgstr "高清晰度的纹理"
-
-#: Config.cpp:202
-msgid "Common"
-msgstr "一般"
-
-#: Config.cpp:203
-msgid "Presets"
-msgstr "预置"
-
-#: Config.cpp:204
-#: Config.cpp:205
-msgid "Performance tweaks"
-msgstr "性能调整"
-
-#: Config.cpp:206
-msgid "Filter"
-msgstr "过滤器"
-
-#: Config.cpp:208
-#: Config.cpp:219
-#: Config.cpp:238
-msgid "None"
-msgstr "无"
-
-#: Config.cpp:209
-msgid "Smooth filtering 1"
-msgstr "平滑过滤 1"
-
-#: Config.cpp:210
-msgid "Smooth filtering 2"
-msgstr "平滑过滤 2"
-
-#: Config.cpp:211
-msgid "Smooth filtering 3"
-msgstr "平滑过滤 3"
-
-#: Config.cpp:212
-msgid "Smooth filtering 4"
-msgstr "平滑过滤 4"
-
-#: Config.cpp:213
-msgid "Sharp filtering 1"
-msgstr "尖锐过滤 1"
-
-#: Config.cpp:214
-msgid "Sharp filtering 2"
-msgstr "尖锐过滤 2"
-
-#: Config.cpp:217
-msgid "Enhancement"
-msgstr "增强"
-
-#: Config.cpp:220
-msgid "Store"
-msgstr "储存"
-
-#: Config.cpp:230
-msgid "Texture cache"
-msgstr "纹理缓存"
-
-#: Config.cpp:232
-msgid "Mbytes"
-msgstr "兆"
-
-#: Config.cpp:233
-msgid "Ignore Backgrounds"
-msgstr "忽视背景"
-
-#: Config.cpp:234
-#: Config.cpp:245
-msgid "Apply texture compression"
-msgstr "应用纹理压缩"
-
-#: Config.cpp:235
-#: Config.cpp:246
-msgid "Compress texture cache"
-msgstr "压缩纹理缓存"
-
-#: Config.cpp:236
-msgid "Format"
-msgstr "格式"
-
-#: Config.cpp:239
-msgid "Rice format"
-msgstr "Rice 格式"
-
-#: Config.cpp:242
-msgid "Tile textures"
-msgstr "图砖纹理"
-
-#: Config.cpp:243
-msgid "Force 16bpp textures"
-msgstr "强行支持16位纹理"
-
-#: Config.cpp:244
-msgid "Alternative CRC calculation"
-msgstr "另一种CRC计算"
-
-#: Config.cpp:247
-msgid "Use alpha channel fully"
-msgstr "充分利用透明通道"
-
-#: Config.cpp:248
-msgid "Texture dumping/editing mode"
-msgstr "纹理转储与编辑模式"
-
-#: Config.cpp:249
-msgid "Texture compression method"
-msgstr "纹理压缩方法"
-
-#: Config.cpp:255
-msgid "Save texture cache to hard disk"
-msgstr "保存纹理缓存到硬盘"
-
-#: Config.cpp:256
-msgid "Best performance"
-msgstr "最佳性能"
-
-#: Config.cpp:257
-msgid "Best texture quality"
-msgstr "最佳纹理质量"
-
-#: Config.cpp:263
-msgid "Developers settings"
-msgstr "开发人员设置"
-
-#: Config.cpp:264
-msgid "Debug/Misc"
-msgstr "调试与杂项"
-
-#: Config.cpp:265
-msgid "Autodetect Microcode"
-msgstr "自动检测微码"
-
-#: Config.cpp:266
-msgid "Force Microcode:"
-msgstr "强行支持微码："
-
-#: Config.cpp:279
-msgid "Wireframe using:"
-msgstr "线框使用："
-
-#: Config.cpp:281
-msgid "Original colors"
-msgstr "原来的颜色"
-
-#: Config.cpp:282
-msgid "Vertex colors"
-msgstr "顶点的颜色"
-
-#: Config.cpp:283
-msgid "Red only"
-msgstr "仅红"
-
-#: Config.cpp:286
-msgid "Log to rdp.txt (SLOW)"
-msgstr "登录到 rdp.txt（慢）"
-
-#: Config.cpp:287
-msgid "Unknown combiners as red"
-msgstr "未知合成器为红色"
-
-#: Config.cpp:288
-msgid "Log clear every frame"
-msgstr "在每一帧清除记录"
-
-#: Config.cpp:289
-msgid "Combiner logging"
-msgstr "合成器记录"
-
-#: Config.cpp:290
-msgid "Run (+log) in window"
-msgstr "窗口运行（+记录）"
-
-#: Config.cpp:291
-msgid "Cmb. clear every frame"
-msgstr "在每一帧清除合成器"
-
-#: Config.cpp:292
-msgid "Error log (rdp_e.txt)"
-msgstr "错误记录（rdp_e.txt）"
-
-#: Config.cpp:293
-msgid "Bilinear filter texture cache"
-msgstr "双线性过滤纹理缓存"
-
-#: Config.cpp:325
-#: Config.cpp:546
-msgid " auto"
-msgstr "自动"
-
-#: Config.cpp:382
-msgid "Please choose language:"
-msgstr "请选择语言："
-
-#: Config.cpp:383
-msgid "Language"
-msgstr "语言"
-
-#: Config.cpp:390
-msgid "Press OK to change to "
-msgstr "按确定更改为 "
-
-#: Config.cpp:486
-msgid "Basic settings"
-msgstr "基本设置"
-
-#: Config.cpp:487
-msgid ""
-"Resolution\n"
-"This option selects the fullscreen resolution for 3dfx cards and windowed resolution for other cards\n"
-"(note again that for 3dfx cards the plugin must be in fullscreen mode to see anything).\n"
-"[Recommended: 640x480, 800x600, 1024x768]"
-msgstr ""
-"分辨率\n"
-"--------\n"
-"此选项选择3dfx卡为全屏分辨率和其它窗口分辨率。\n"
-"注意：\t对于3dfx卡上的插件必须\n"
-"\t在全屏模式才能看到东西\n"
-"[推荐：640x480，800x600，1024X768]"
-
-#: Config.cpp:491
-msgid ""
-"Vertical sync\n"
-"This option will enable the vertical sync, which will prevent tearing.\n"
-"Note: this option will ONLY have effect if vsync is set to \"Software Controlled\".\n"
-msgstr ""
-"直同步\n"
-"-------\n"
-"此选项将启用直同步，它将防止撕裂。\n"
-"注意：\t如果直同步设置为\"软件控制\"，\n"
-"\t此选项才会生效。\n"
-
-#: Config.cpp:493
-msgid "Select a format, in which screen shots will be saved"
-msgstr "选择屏幕截图被保存的一种格式"
-
-#: Config.cpp:500
-msgid ""
-"Language select:\n"
-"Press the button to invoke language selection dialog.\n"
-"Selected language will be activated after restart of the configuration dialog."
-msgstr ""
-"语言选择:\n"
-"----------\n"
-"按下按钮调用语言选择对话框。\n"
-"选择的语言会在重新启动配置对话框后生效。"
-
-#: Config.cpp:501
-msgid ""
-"FPS counter\n"
-"When this option is checked, a FPS (frames per second) counter will be shown\n"
-"in the lower left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"FPS 计数器\n"
-"------------\n"
-"当选定，FPS（帧每秒）计数器\n"
-"会显示在屏幕左下角的角落。\n"
-"[推荐：您的偏好]"
-
-#: Config.cpp:503
-msgid ""
-"VI/s counter\n"
-"When this option is checked, a VI/s (vertical interrupts per second) counter\n"
-"will be shown in the lower left corner of the screen.  This is like the FPS\n"
-"counter but will be consistent at 60 VI/s for full speed on NTSC (U) games and\n"
-"50 VI/s for full speed on PAL (E) ones.\n"
-"[Recommended: your preference]"
-msgstr ""
-"VI/s 计数器\n"
-"------------\n"
-"当选定，VI/s（每秒垂直中断）计数器\n"
-"将显示在屏幕左下角的角落。\n"
-"它将在全速 NTSC(U)的游戏里保持 60VI/s\n"
-"或在全速 PAL(E)的游戏里保持 50VI/s。\n"
-"[推荐：您的偏好]"
-
-#: Config.cpp:505
-#, c-format
-msgid ""
-"% speed\n"
-"This displays a percentage of the actual N64 speed in the lower\n"
-"left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"％速度\n"
-"-------\n"
-"在屏幕左下角的角落，\n"
-"将显示N64实际速度的百分比。\n"
-"[推荐：您的偏好]"
-
-#: Config.cpp:507
-msgid ""
-"Clock enabled\n"
-"This option will put a clock in the lower right corner of the screen, showing the current time.\n"
-"[Recommended: your preference]"
-msgstr ""
-"时钟启用\n"
-"----------\n"
-"此选项将在屏幕的右下角\n"
-"摆放时钟，显示当前时间。\n"
-"[推荐：您的偏好]"
-
-#: Config.cpp:510
-msgid ""
-"Display hours as 24-hour clock.\n"
-"[Recommended: your preference]"
-msgstr ""
-"显示时间为24小时制。\n"
-"[推荐：您的偏好]"
-
-#: Config.cpp:511
-msgid ""
-"Transparent text background\n"
-"If this is checked, all on-screen messages will have a transparent background.  Otherwise, it will have a solid black background.\n"
-"[Recommended: your preference]"
-msgstr ""
-"透明文字的背景\n"
-"-----------------\n"
-"当选定，所有在屏幕上的信息\n"
-"将有一个透明的背景。\n"
-"否则，将有黑色背景。\n"
-"[推荐：您的偏好]"
-
-#: Config.cpp:514
-msgid ""
-"Enable \"Emulation settings\" panel. For experienced users only!\n"
-"It shows default emulation settings when game is not loaded, or current game settings otherwise."
-msgstr ""
-"启用\"仿真设置\"面板。于有经验的用户！\n"
-"它显示了尚未加载游戏的默认仿真设置，\n"
-"或当前游戏设置。"
-
-#: Config.cpp:516
-msgid ""
-"Enable \"Texture enhancement\" panel.\n"
-"It shows various enhancement options for original textures as well as options for hi-resolution textures."
-msgstr ""
-"启用\"纹理增强\"面板。\n"
-"它显示原来的纹理增强选项\n"
-"以及高清晰度的纹理选项。"
-
-#: Config.cpp:517
-msgid ""
-"Full screen resolution:\n"
-"This sets the full screen resolution for non-3dfx video cards.\n"
-"All the resolutions that your video card/monitor support should be displayed.\n"
-"[Recommended: native (max) resolution of your monitor - unless performance becomes an issue]"
-msgstr ""
-"全屏幕分辨率：\n"
-"---------------\n"
-"这将设置非3dfx卡的全屏幕分辨率。\n"
-"您的视频卡与显示器所支持的分辨率将会显示。\n"
-"[推荐：显示器的原始（最大）分辨率 - 除非性能成为问题]"
-
-#: Config.cpp:520
-msgid ""
-"Anisotropic filtering:\n"
-"This filter sharpens and brings out the details of textures that recede into the distance.\n"
-"When activated, it will use the max anisotropy your video card supports.\n"
-"However, this will override native way of texture filtering and may cause visual artifacts in some games.\n"
-"[Recommended: your preference, game dependant]"
-msgstr ""
-"各向异性过滤：\n"
-"---------------\n"
-"该过滤器会锐化和带出在远方退去的纹理细节。\n"
-"启用时，它将使用视频卡所支持的最大各向异性。\n"
-"不过，这将覆盖原始的纹理过滤方式，\n"
-"并可能导致某些游戏展示视觉干扰。\n"
-"[推荐：您的偏好，取决于游戏]"
-
-#: Config.cpp:521
-msgid ""
-"Autodetect VRAM Size:\n"
-"Since OpenGL cannot do this reliably at the moment, the option to set this manually is available.\n"
-"If checked, plugin will try to autodetect VRAM size.\n"
-"But if this appears wrong, please uncheck and set it to correct value.\n"
-"[Recommended: on]"
-msgstr ""
-"自动检测显存大小：\n"
-"-------------------\n"
-"由于OpenGL不能可靠地做到，因此可以选择手动设置。\n"
-"当选定，插件将尝试自动检测显存的大小。\n"
-"如果出现错误，请取消选择并将其设置为正确的值。\n"
-"[推荐：选]"
-
-#: Config.cpp:523
-msgid ""
-"Use frame buffer objects:\n"
-"Changes the way FB effects are rendered - with or without usage of the OpenGL Frame Buffer Objects (FBO) extension.\n"
-"The choice depends on game and your video card. FBO off is good for NVIDIA cards, while for ATI cards, it's usually best that FBOs are turned on.\n"
-"Also, some FB effects works only with one of the methods, no matter, which card you have.\n"
-"On the whole, with FBO off, compatibility/ accuracy is a bit better (which is the case for Resident Evil 2).\n"
-"However, with FBO on with some systems, it can actually be a bit faster in cases.\n"
-"[Recommended: video card and game dependant]"
-msgstr ""
-"使用帧缓冲对象：\n"
-"-----------------\n"
-"当选定，即使没有使用OpenGL帧缓冲对象(FBO)扩展，\n"
-"它仍然会改变帧缓冲效果的呈现方式。\n"
-"您的选择取决于你的游戏和视频卡。对于NVIDIA视频卡，\n"
-"不要选择FBO而对于ATI视频卡，FBO通常是一个很好的选择。\n"
-"\n"
-"另外，一些帧缓冲效果只适用其中之一的方法，而不管视频卡。\n"
-"整体而言，不选FBO将会增加游戏兼容性与准确性，例如，\n"
-"Resident Evil 2。\n"
-"\n"
-"然而，在某些系统上，FBO的选择会加速一些游戏。\n"
-"[推荐：取决于视频卡和游戏]"
-
-#: Config.cpp:578
-msgid "Emulation settings"
-msgstr "仿真设置"
-
-#: Config.cpp:579
-msgid ""
-"Filtering mode\n"
-"There are three filtering modes possible:\n"
-"* Automatic filtering - filter exactly how the N64 specifies.\n"
-"* Point-sampled filtering - causes texels to appear square and sharp.\n"
-"* Bilinear filtering - interpolates the texture to make it appear more smooth.\n"
-"[Recommended: Automatic]"
-msgstr ""
-"过滤模式\n"
-"----------\n"
-"过滤方式有三种：\n"
-"*自动过滤\t: 与N64的过滤是相同的。\n"
-"*点采样过滤\t: 使纹理元素出现正方形和尖锐。\n"
-"*双线性过滤\t: 插值纹理，使其看起来更光滑。\n"
-"[推荐：自动]"
-
-#: Config.cpp:583
-msgid ""
-"Buffer swapping method\n"
-"There are 3 buffer swapping methods:\n"
-"* old - swap buffers when vertical interrupt has occurred.\n"
-"* new - swap buffers when set of conditions is satisfied. Prevents flicker on some games.\n"
-"* hybrid - mix of first two methods.\n"
-"Can prevent even more flickering then previous method, but also can cause artefacts.\n"
-"If you have flickering problems in a game (or graphics that don't show),\n"
-"try to change swapping method.\n"
-"[Recommended: new (hybrid for Paper Mario)]"
-msgstr ""
-"缓冲交换方法\n"
-"---------------\n"
-"缓冲交换方法有3种：\n"
-"*旧\t: 在垂直中断发生时，交换缓冲区。\n"
-"*新\t: 当条件符合时，交换缓冲区。\n"
-"\t  防止一些游戏的闪烁。\n"
-"*混合\t: 混合前两种方法。\n"
-"\t  可防止更多闪烁，但也可能会有视觉干扰。\n"
-"\n"
-"如果您在游戏中有闪烁的问题（或图形不显示），\n"
-"尝试改变交换方法。\n"
-"[推荐：新（Paper Mario - 选择混合）]"
-
-#: Config.cpp:587
-msgid ""
-"Per-pixel level-of-detail calculation\n"
-"N64 uses special mechanism for mip-mapping, which nearly impossible to reproduce\n"
-"correctly on PC hardware. This option enables approximate emulation of this feature.\n"
-"For example, it is required for the Peach/Bowser portrait's transition in Super Mario 64.\n"
-"There are 3 modes:\n"
-"* off - LOD is not calculated\n"
-"* fast - fast imprecise LOD calculation.\n"
-"* precise - most precise LOD calculation possible, but more slow.\n"
-"[Recommended: your preference]"
-msgstr ""
-"每个像素详细程度计算\n"
-"------------------------\n"
-"N64使用特殊的纹理映射,几乎是不可能在电脑硬件\n"
-"上很正确地复制。此选项将启用此功能近似仿真。\n"
-"例如，应用在\"Super Mario 64\"游戏内的\n"
-"Peach与Bowser肖像的过渡。\n"
-"\n"
-"有3种模式：\n"
-"*关\t: 不进行LOD计算。\n"
-"*快\t: 快而不准的LOD计算。\n"
-"*准确\t: 最精确的LOD计算，但更慢。\n"
-"[推荐：您的偏好]"
-
-#: Config.cpp:592
-msgid ""
-"Aspect ratio of the output.\n"
-"Most N64 games use 4:3 aspect ratio, but some support widescreen too.\n"
-"You may select appropriate aspect here and set widescreen mode in game settings.\n"
-"In \"Stretch\" mode the output will be stretched to the entire screen,\n"
-"other modes may add black borders if necessary"
-msgstr ""
-"宽高比的输出\n"
-"---------------\n"
-"大多数N64的游戏使用4:3的比例，但一些支持宽屏了。\n"
-"你可以在这里选择合适的比例，并在游戏上设置宽屏模式。\n"
-"在\"伸展\"模式下，输出将被拉伸到整个屏幕，\n"
-"其它模式可能在必要时加黑色边境。"
-
-#: Config.cpp:595
-msgid ""
-"Fog enabled\n"
-"Sets fog emulation on//off.\n"
-"[Recommended: on]"
-msgstr ""
-"启用雾\n"
-"-------\n"
-"设置雾仿真的开与关\n"
-"[推荐：选]"
-
-#: Config.cpp:597
-msgid ""
-"Buffer clear on every frame\n"
-"Forces the frame buffer to be cleared every frame drawn.\n"
-"Usually frame buffer clear is controlled by the game.\n"
-"However, in some cases it is not well emulated,\n"
-"and some garbage may be left on the screen.\n"
-"In such cases, this option must be set on.\n"
-"[Recommended: on]"
-msgstr ""
-"清除每一帧缓冲\n"
-"-----------------\n"
-"强行在每一帧中的绘制，清除帧缓冲。\n"
-"通常帧缓冲是由游戏控制的。\n"
-"但是，在某些情况下，没有很好地模拟，\n"
-"有些图形垃圾可能会残留在屏幕上。\n"
-"在这种情况下，此选项必须设置。\n"
-"[推荐：选]"
-
-#: Config.cpp:599
-msgid ""
-"Enable frame buffer emulation\n"
-"If on, plugin will try to detect frame buffer usage and apply appropriate frame buffer emulation.\n"
-"[Recommended: on for games which use frame buffer effects]"
-msgstr ""
-"启用帧缓冲仿真\n"
-"-----------------\n"
-"当选定，插件将尝试检测帧缓冲区的\n"
-"使用情况而采用适当的帧缓冲仿真。\n"
-"[推荐：游戏使用帧缓冲效果- 选]"
-
-#: Config.cpp:601
-msgid ""
-"Enable hardware frame buffer emulation\n"
-"If this option is on, plugin will create auxiliary frame buffers in video memory instead of copying\n"
-"frame buffer content into main memory. This allows plugin to run frame buffer effects without slowdown\n"
-"and without scaling image down to N64's native resolution. This feature is fully supported by\n"
-"Voodoo 4/5 cards and partially by Voodoo3 and Banshee. Modern cards also fully support it.\n"
-"[Recommended: on, if supported by your hardware]"
-msgstr ""
-"启用硬件帧缓冲仿真\n"
-"----------------------\n"
-"当选定，插件将在视频内存中创建辅助的帧缓冲器，\n"
-"而不是复制到主存储器。这允许插件运行帧缓冲效果而\n"
-"不放缓，并不缩放图像到N64的原始分辨率。\n"
-"\n"
-"此功能会完全支持Voodoo 4与5卡和部分Voodoo3\n"
-"和Banshee。现代卡也完全支持。\n"
-"[推荐：硬件支持 - 选]"
-
-#: Config.cpp:604
-msgid ""
-"Get information about frame buffers\n"
-"This is compatibility option. It must be set on for Mupen64 and off for 1964"
-msgstr ""
-"取帧缓冲器的有关信息\n"
-"这是兼容性选项。在Mupen64上，必须设置为开\n"
-"而在1964必须设置为关"
-
-#: Config.cpp:606
-msgid ""
-"Read every frame\n"
-"In some games plugin can't detect frame buffer usage.\n"
-"In such cases you need to enable this option to see frame buffer effects.\n"
-"Every drawn frame will be read from video card -> it works very slow.\n"
-"[Recommended: mostly off (needed only for a few games)]"
-msgstr ""
-"读取每一帧\n"
-"------------\n"
-"在一些游戏上，插件无法检测到帧缓冲区的使用。\n"
-"在这种情况下，您需要启用该选项才能看到帧缓冲效果。\n"
-"每一个帧的绘制将从视频卡读取->这是非常的缓慢。\n"
-"[推荐：大多不选（运用在少数游戏上）]"
-
-#: Config.cpp:608
-msgid ""
-"Render N64 frame buffer as texture\n"
-"When this option is enabled, content of each N64 frame buffer is rendered\n"
-"as texture over the frame, rendered by the plugin. This prevents graphics lost,\n"
-"but may cause slowdowns and various glitches in some games.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"呈现N64的帧缓冲为纹理\n"
-"--------------------------\n"
-"当选定，每个N64的帧缓冲的内容将由插件\n"
-"在帧上呈现为纹理。这可以防止图形的流失，\n"
-"但可能会导致速度下降，和一些游戏的各种故障。\n"
-"[推荐：大多不选]"
-
-#: Config.cpp:610
-msgid ""
-"Detect CPU write to the N64 frame buffer\n"
-"This option works as the previous options, but the plugin is trying to detect,\n"
-"when game uses CPU writes to N64 frame buffer. The N64 frame buffer is rendered\n"
-"only when CPU writes is detected. Use this option for those games, in which you\n"
-"see still image or no image at all for some time with no reason.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"检测CPU写入到N64帧缓冲\n"
-"----------------------------\n"
-"此选项与上一个选项有一样的功能，但插件会试图\n"
-"检测游戏在何时使用CPU写入到N64的帧缓冲区。\n"
-"当检测到CPU写入时，才会呈现N64的帧缓冲。\n"
-"\n"
-"如果过了一段时间后，你只能看到静态图像或\n"
-"无图像时，请使用此选项。\n"
-"[推荐：大多不选]"
-
-#: Config.cpp:612
-msgid ""
-"Enable depth buffer rendering\n"
-"This option is used to fully emulate N64 depth buffer.\n"
-"It is required for correct emulation of depth buffer based effects.\n"
-"However, it requires fast (>1GHz) CPU to work full speed.\n"
-"[Recommended: on for fast PC]"
-msgstr ""
-"启用深度缓冲渲染\n"
-"-------------------\n"
-"此选项用于完全模仿N64的深度缓冲区。\n"
-"这是需要正确的仿真深度缓冲的效果。\n"
-"但是，它需要快速（>1GHz）的CPU才能达到全速。\n"
-"[推荐：快速电脑 - 选]"
-
-#: Config.cpp:620
-msgid ""
-"Filters:\n"
-"Apply a filter to either smooth or sharpen textures.\n"
-"There are 4 different smoothing filters and 2 different sharpening filters.\n"
-"The higher the number, the stronger the effect,\n"
-"i.e. \"Smoothing filter 4\" will have a much more noticeable effect than \"Smoothing filter 1\".\n"
-"Be aware that performance may have an impact depending on the game and/or the PC.\n"
-"[Recommended: your preference]"
-msgstr ""
-"过滤器：\n"
-"--------\n"
-"应用一个过滤器来平滑或锐化纹理。\n"
-"有4种不同的平滑过滤器和2个不同的锐化过滤器。\n"
-"- 数字越高，效果越强。\n"
-"- 例如，平滑过滤器4将比1有更明显的效果。\n"
-"\n"
-"注意:\t游戏性能可能会受到影响，\n"
-"\t取决于游戏与或电脑。\n"
-"[推荐：您的偏好]"
-
-#: Config.cpp:624
-msgid ""
-"Texture enhancement:\n"
-"7 different filters are selectable here, each one with a distinctive look.\n"
-"Be aware of possible performance impacts.\n"
-"\n"
-"IMPORTANT: 'Store' mode - saves textures in cache 'as is'. It can improve performance in games, which load many textures.\n"
-"Disable 'Ignore backgrounds' option for better result.\n"
-"\n"
-"[Recommended: your preference]"
-msgstr ""
-"纹理增强：\n"
-"----------\n"
-"在这里可选择7种不同的过滤器，每一个具有独特的外观。\n"
-"注意:\t可能会有性能影响。\n"
-"\n"
-"要点:\t\"存储\"模式 - 储存在缓存的纹理为\"原状\"。\n"
-"\t它可以提高游戏的性能，但载有很多纹理。\n"
-"\t禁用\"忽略背景\"选项，让效果更佳。\n"
-"[推荐：您的偏好]"
-
-#: Config.cpp:628
-msgid ""
-"Texture cache size:\n"
-"Enhanced and filtered textures can be cached to aid performance.\n"
-"This setting will adjust how much PC memory will be dedicated for texture cache.\n"
-"This helps boost performance if there are subsequent requests for the same texture (usually the case).\n"
-"Normally, 128MB should be more than enough but there is a sweet spot for each game.\n"
-"Super Mario may not need more than 32megs, but Conker streams a lot of textures,\n"
-"so setting 256+ megs can boost performance. Adjust accordingly if you are encountering speed issues.\n"
-"'0' disables cache.\n"
-"[Recommended: PC and game dependant]"
-msgstr ""
-"纹理缓存大小：\n"
-"---------------\n"
-"加强和过滤的纹理可被缓存已助性能。\n"
-"此设置将调整多少电脑内存为纹理缓存专用。\n"
-"如果是相同的纹理（通常如此）有后续请求，\n"
-"这将有助于提高性能。一般情况下，\n"
-"128兆应该是绰绰有余，但每个游戏有其甜点。\n"
-"\n"
-"\"Super Mario\"可能不需要比32兆多，\n"
-"但\"Conker\"用很多纹理，因而用256兆+\n"
-"可提高性能。如果你遇到速度问题，\n"
-"可根据实际情况调整。\n"
-"\n"
-"'0'禁用缓存。\n"
-"[推荐：取决于电脑和游戏]"
-
-#: Config.cpp:634
-msgid ""
-"Ignore Backgrounds:\n"
-"It is used to skip enhancement for long narrow textures, usually used for backgrounds.\n"
-"This may save texture memory greatly and increase performance.\n"
-"[Recommended: on (off for 'Store' mode)]"
-msgstr ""
-"忽略背景：\n"
-"----------\n"
-"它是用来跳过增强狭长纹理（通常为背景用）。\n"
-"这可能会大大节省纹理内存和提高性能。\n"
-"[推荐：选（\"存储\"模式- 不选）]"
-
-#: Config.cpp:636
-msgid ""
-"Texture compression:\n"
-"Textures will be compressed using selected texture compression method.\n"
-"The overall compression ratio is about 1/6 for FXT1 and 1/4 for S3TC.\n"
-"In addition to saving space on the texture cache,\n"
-"the space occupied on the GFX hardware's texture RAM,\n"
-"by the enhanced textures, will be greatly reduced.\n"
-"This minimizes texture RAM usage,\n"
-"decreasing the number of texture swaps to the GFX hardware leading to performance gains.\n"
-"However, due to the nature of lossy compression of FXT1 and S3TC, using this option can sometimes lead to quality degradation of small size textures and color banding of gradient colored textures.\n"
-"[Recommended: off]"
-msgstr ""
-"纹理压缩：\n"
-"----------\n"
-"纹理的压缩是依照选定纹理压缩方法。\n"
-"整体压缩比大约是1/6于FXT1或1/4于S3TC.\n"
-"除了节省纹理缓存的空间，在显卡硬件的纹理内存\n"
-"所占领的增强纹理空间，将大大减少。\n"
-"这将最大限度地减少纹理内存的使用，\n"
-"降低纹理在显卡硬件的交换数次，导致提高效能。\n"
-"\n"
-"然而，由于FXT1和S3TC有损压缩的性质，\n"
-"使用此选项有时会导致体积小纹理的质量退化\n"
-"和渐变色的纹理出现色带。\n"
-"[推荐：不选]"
-
-#: Config.cpp:640
-msgid ""
-"Compress texture cache:\n"
-"Memory will be compressed so that more textures can be held in the texture cache.\n"
-"The compression ratio varies with each texture,\n"
-"but 1/5 of the original size would be a modest approximation.\n"
-"They will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"压缩纹理缓存：\n"
-"---------------\n"
-"内存将被压缩，使更多的纹理可以存储在纹理缓存。\n"
-"压缩比率会因纹理而各有不同，但1/5的原来大小\n"
-"将是一个温和的逼近。\n"
-"他们将立即被解压缩，然后被下载到显卡硬件。\n"
-"即使使用纹理压缩，此选项仍会节省内存空间。\n"
-"[推荐：选]"
-
-#: Config.cpp:642
-msgid ""
-"Hi-res pack format:\n"
-"Choose which method is to be used for loading Hi-res texture packs.\n"
-"Only Rice's format is available currently.\n"
-"Leave on \"None\" if you will not be needing to load hi-res packs.\n"
-"[Recommended: Rice's format. Default: \"None\"]"
-msgstr ""
-"高清晰度包格式：\n"
-"------------------\n"
-"选择哪种方法来加载高分辨率纹理包。\n"
-"目前只能用 Rice's 格式。\n"
-"如果你不需要加载高清晰度包，请选择\"无\"。\n"
-"[推荐：Rice's 格式。默认：无]"
-
-#: Config.cpp:646
-msgid ""
-"Tile textures:\n"
-"When on, wide texture will be split on several tiles to fit in one 256-width texture.\n"
-"This tiled texture takes much less video memory space and thus overall performance will increase.\n"
-"However, corresponding polygons must be split too, and this is not polished yet\n"
-"- various issues are possible, including black lines and polygons distortions.\n"
-"[Recommended: off]"
-msgstr ""
-"图砖纹理：\n"
-"----------\n"
-"当选定，宽纹理将被分割在几个瓦片，以适应一个256宽的纹理。\n"
-"这平铺纹理花费更少的视频内存空间，因此整体性能会有所增加。\n"
-"但是，必须相应的多边形也需要分割，却尚未完全开发出来。\n"
-"- 各种问题都有可能的，包括黑线和多边形的扭曲。\n"
-"[推荐：不选]"
-
-#: Config.cpp:648
-msgid ""
-"Force 16bpp textures:\n"
-"The color of the textures will be reduced to 16bpp.\n"
-"This is another space saver and performance enhancer.\n"
-"This halves the space used on the texture cache and the GFX hardware's texture RAM.\n"
-"Color reduction is done so that the original quality is preserved as much as possible.\n"
-"Depending on the texture, this usually is hardly noticeable.\n"
-"Sometimes though, it can be: skies are a good example.\n"
-"[Recommended: off]"
-msgstr ""
-"强行支持16位纹理：\n"
-"--------------------\n"
-"该纹理色彩将减少为16位。\n"
-"这是另一种节省空间和性能增强。\n"
-"这将节省一半的纹理缓存和\n"
-"显卡硬件的纹理内存使用的空间。\n"
-"\n"
-"色彩还原将尽可能保留其原来的颜色。\n"
-"根据不同的纹理，这通常是难以察觉的。\n"
-"但，并非不可能：天空是一个很好的例子。\n"
-"[推荐：不选]"
-
-#: Config.cpp:650
-msgid ""
-"Texture dumping mode:\n"
-"In this mode, you have that ability to dump textures on screen to the appropriate folder.\n"
-"You can also reload textures while the game is running to see how they look instantly - big time saver!\n"
-"\n"
-"Hotkeys: \"R\" reloads hires textures from the texture pack - \"D\" toggles texture dumps on/off."
-msgstr ""
-"纹理转储方式：\n"
-"---------------\n"
-"在这模式下，你可将屏幕上的纹理转储到适当的文件夹。\n"
-"您也可以在游戏运行时重新载入纹理，而马上看到结果\n"
-"- 大大节省时间！\n"
-"热键：\tR - 重载高分辨率纹理的纹理包\n"
-"\tD - 将切换纹理转储开与关"
-
-#: Config.cpp:652
-msgid ""
-"Alternative CRC calculation:\n"
-"This option enables emulation of a palette CRC calculation bug in RiceVideo.\n"
-"If some textures are not loaded, try to set this option on/off.\n"
-"[Recommended: texture pack dependant, mostly on]"
-msgstr ""
-"另一种CRC计算：\n"
-"-----------------\n"
-"此选项可以仿真RiceVideo在调色板上的CRC计算错误。\n"
-"如果某些纹理不能加载，请尝试设置此选项开与关。\n"
-"[推荐：取决于纹理包，大多选]"
-
-#: Config.cpp:657
-msgid ""
-"Compress texture cache:\n"
-"When game started, plugin loads all its hi-resolution textures into PC memory.\n"
-"Since hi-resolution textures are usually large, the whole pack can take hundreds megabytes of memory.\n"
-"Cache compression allows save memory space greatly.\n"
-"Textures will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"压缩纹理缓存：\n"
-"---------------\n"
-"当游戏开始，插件加载所有\n"
-"的高清晰度纹理在电脑内存。\n"
-"由于高清晰度的纹理通常很大，\n"
-"整个包可以利用数百兆的内存。\n"
-"缓存压缩可以大大节省存储空间。\n"
-"纹理将立即被解压缩，然后下载到显卡硬件。\n"
-"即使使用纹理压缩，此选项仍会节省内存空间。\n"
-"[推荐：选]"
-
-#: Config.cpp:659
-msgid ""
-"Use Alpha channel fully:\n"
-"When this option is off, 16bit rgba textures will be loaded using RiceVideo style\n"
-"- with 1bit for alpha channel.\n"
-"When it is on, GlideHQ will check, how alpha channel is used by the hires texture,\n"
-"and select most appropriate format for it.\n"
-"This gives texture designers freedom to play with alpha, as they need,\n"
-"regardless of format of original N64 texture.\n"
-"For older and badly designed texture packs it can cause unwanted black borders.\n"
-"[Recommended: texture pack dependant]"
-msgstr ""
-"充分利用透明通道：\n"
-"--------------------\n"
-"如不选此选项，使用RiceVideo风格会加载\n"
-"16位RGBA纹理与1位透明通道。\n"
-"当选定，GlideHQ将检查高清晰度的纹理如何\n"
-"使用透明通道，并选择最适当的格式。\n"
-"它让设计者自由发挥纹理透明的使用，\n"
-"不论其原来的N64的纹理格式。\n"
-"对于旧或设计不良的纹理包，可能会出现不必要的黑边。\n"
-"[推荐：取决于纹理包]"
-
-#: Config.cpp:662
-msgid ""
-"Save texture cache to HD:\n"
-"\n"
-"For enhanced textures cache:\n"
-"This will save all previously loaded and enhanced textures to HD.\n"
-"So upon next game launch, all the textures will be instantly loaded, resulting in smoother performance.\n"
-"\n"
-"For high-resolution textures cache:\n"
-"After creation, loading hi-res texture will take only a few seconds upon game launch,\n"
-"as opposed to the 5 -60 seconds a pack can take to load without this cache file.\n"
-"The only downside here is upon any changes to the pack, the cache file will need to be manually deleted.\n"
-"\n"
-"Saved cache files go into a folder called \"Cache\" within the Plugins folder.\n"
-"\n"
-"[Highly Recommended: on]"
-msgstr ""
-"保存纹理缓到硬盘：\n"
-"--------------------\n"
-"增强纹理缓存：\n"
-"---------------\n"
-"这将保存所有之前加载和增强纹理到硬盘。\n"
-"下一次游戏开始后，所有的纹理将即刻加载，\n"
-"导致更顺畅的性能。\n"
-"\n"
-"高分辨率的纹理缓存：\n"
-"----------------------\n"
-"创建后，当游戏启动时，加载高清晰度的纹理只需几秒钟。\n"
-"如果没有这个缓存文件，载入纹理包需要5-60秒。\n"
-"唯一的缺点是在更改纹理包时，缓存文件将需要手动删除。\n"
-"\n"
-"保存的缓存文将被保存到Plugins文件夹内的Cache文件夹。\n"
-"[强烈推荐：选]"
-
-#: Config.cpp:685
-msgid "Debug"
-msgstr "调试"
-
-#: Config.cpp:686
-msgid ""
-"Autodetect Microcode\n"
-"If this option is checked, the microcode of the game\n"
-"will be detected automatically from the INI, and\n"
-"therefore it will not need to be set in this\n"
-"configuration dialog.\n"
-"[Recommended: on]"
-msgstr ""
-"自动检测微码\n"
-"当选定，游戏的微码会自动从INI检测到。\n"
-"因此它不需要在此配置对话框中设置。\n"
-"[推荐：选]"
-
-#: Config.cpp:688
-msgid ""
-"Force Microcode\n"
-"This option ONLY has an effect if Autodetect Microcode\n"
-"is unchecked, the crc from the game could not be\n"
-"found in the INI, OR after the game has already started\n"
-"running. In any of those three cases, this will\n"
-"select the microcode to use\n"
-"[Recommended: any, turn on Autodetect Microcode]"
-msgstr ""
-"强行支持微码\n"
-"此选项是在以下情况才有效:\n"
-"1. 如果没选定自动检测微码，\n"
-"2. 游戏的CRC在INI找不到，或\n"
-"3. 游戏已经开始运行。\n"
-"在这三种情形之下，它将使用微码。\n"
-"[推荐：任何，选自\"动检测微码\"]"
-
-#: Config.cpp:692
-msgid ""
-"Wireframe\n"
-"This option, when checked, makes it so that the plugin will draw only the\n"
-"outlines of objects.  The colors specified in the combo box to the right\n"
-"determines the color that the wireframes show up as.\n"
-"[Recommended: off]"
-msgstr ""
-"线框\n"
-"当选定，插件会画出对象的轮廓。\n"
-"在组合框中指定的颜色，将决定线框颜色的显示。\n"
-"[推荐：不选]"
-
-#: Config.cpp:694
-msgid ""
-"Wireframe Colors\n"
-"This selects the colors to use for the wireframes (if wireframe mode is enabled).\n"
-"There are 3 modes:\n"
-"* Original colors - draw exactly as it would normally, textures and all, only in wireframes.\n"
-"* Vertex colors - use the colors specified in the vertices to draw the wireframes with.\n"
-"* Red only - use a constant red color to draw the wireframes.\n"
-"[Recommended: Vertex colors]"
-msgstr ""
-"线框颜色\n"
-"这将选择用于线框的颜色（如线框模式已启用）。\n"
-"有3种模式：\n"
-"*原始颜色\t: 纹理和所有，是与原来相同的颜色来绘制线框。\n"
-"*顶点颜色\t: 使用指定的顶点来绘制线框的颜色。\n"
-"*仅红\t: 利用固定的红色来绘制线框。\n"
-"[推荐：顶点颜色]"
-
-#: Config.cpp:696
-msgid ""
-"Log to RDP.txt\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option, when checked, will log EVERY SINGLE\n"
-"COMMAND the plugin processes to a file called RDP.txt in the current directory.\n"
-"This is incredibly slow, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-"登录到RDP.txt\n"
-"推荐仅调试 - 当选定，将记录该插件程序的\n"
-"每一个命令到当前目录的RDP.txt。\n"
-"这是令人难以置信的慢，所以我建议保持禁用。\n"
-"[推荐：不选]"
-
-#: Config.cpp:698
-msgid ""
-"Unknown combiners as red\n"
-"Objects that use an unimplemented combine mode will show up as red instead of\n"
-"assuming texture with full alpha. Disable this option to remove the red stuff\n"
-"and at least have a guess at the correct combine mode.\n"
-"[Recommended: off]"
-msgstr ""
-"未知合成器为红色\n"
-"如果对象使用一个未知的合成模式，它会显示为红色而不是\n"
-"假设纹理具有完全透明的功能。禁用此选项，删除红色的东西，\n"
-"并至少能对正确的合成模式作出猜测。\n"
-"[推荐：不选]"
-
-#: Config.cpp:700
-msgid ""
-"Log clear every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option has no effect unless 'Log to RDP.txt'\n"
-"is checked. This will make it so that the log, RDP.txt, will be cleared at the\n"
-"beginning of every frame.\n"
-"[Recommended: off]"
-msgstr ""
-"在每一帧清除记录\n"
-"推荐仅调试 - 这个选项没有任何作用，除非选择\"记录到RDP.txt\"。\n"
-"这将让这个记录RDP.txt，在每一帧的开始清除。\n"
-"[推荐：不选]"
-
-#: Config.cpp:702
-msgid ""
-"Log unknown combiners\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will cause every\n"
-"unimplemented combiner drawn to be logged to a file called Unimp.txt in the\n"
-"current directory. This becomes slow when there are unimplemented combiners\n"
-"on the screen, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-"登录不明合成器\n"
-"推荐仅调试 - 当选定，这个选项将导致所有未执行\n"
-"的绘制合成器被记录到 Unimp.txt的文件。\n"
-"如果有未执行的合成器在屏幕上，它会变得缓慢，\n"
-"所以我建议保持禁用。\n"
-"[推荐：不选]"
-
-#: Config.cpp:704
-msgid ""
-"Run and log in window\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option will make it so that the plugin will\n"
-"still process dlists in windowed mode. This allows for logging to occur while not\n"
-"in fullscreen, possibly allowing you to debug a crash.\n"
-"[Recommended: off]"
-msgstr ""
-"运行并登录窗口\n"
-"推荐仅调试 - 这个选项将让插件仍然会在窗口模式处理dlists。\n"
-"虽然不是在全屏，但仍允许记录，可能让你调试崩溃的原因。\n"
-"[推荐：不选]"
-
-#: Config.cpp:706
-msgid ""
-"Clear unknown combiner log every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option works much like 'Log clear every frame'\n"
-"except it clears the combiner log (Unimp.txt) instead of RDP.txt at the\n"
-"beginning of each frame. Again, this option has no effect if 'combiner logging' is disabled.\n"
-"[Recommended: off]"
-msgstr ""
-"在每一帧清除未知合成器记录\n"
-"推荐仅调试 - 这个选项很像\"在每一帧清除记录\"，\n"
-"除了它在每一帧的开始清除合成器记录（Unimp.txt），\n"
-"而不是RDP.txt。\n"
-"如果\"合成器记录\"被禁用，这个选项不会起作用。\n"
-"[推荐：不选]"
-
-#: Config.cpp:709
-msgid ""
-"Bilinear filter texture cache\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will make the graphical\n"
-"debugger texture cache use bilinear filtering as opposed to point-sampled filtering,\n"
-"which it will use otherwise. See 'Filtering mode' for descriptions of bilinear and\n"
-"point-sampled filtering.\n"
-"[Recommended: off]"
-msgstr ""
-"双线性过滤纹理缓存\n"
-"---------------------\n"
-"推荐仅调试 - 当选定，此选项将使图形调试器的纹理缓存\n"
-"使用双线性过滤纹理缓存，而不是点采样过滤。\n"
-"阅读\"过滤模式\"对双线性和点采样过滤的描述。\n"
-"[推荐：不选]"
-
-#: Config.cpp:1104
-msgid "Glide64 settings"
-msgstr "Glide64 设置"
-
-#: Config.cpp:1293
-msgid "About Glide64"
-msgstr "关于Glide64"
-
-#: Config.cpp:1326
-msgid "authors:"
-msgstr "作者："
-
-#: Config.cpp:1330
-msgid ""
-"Dave2001. Original author and former main developer.\n"
-"He founded Glide64 project on Dec. 29th, 2001.\n"
-"Left the project at fall of 2002.\n"
-msgstr ""
-"Dave2001。 原作者和原主要开发者。\n"
-"他在2001年12月29日创立Glide64项目。\n"
-"在2002年的秋天离开Glide64项目。\n"
-
-#: Config.cpp:1336
-msgid ""
-"Gugaman. Developer. Joined the project at winter 2002\n"
-" and left it at fall 2002."
-msgstr ""
-"开发人员Gugaman。在2002年冬季加入了这个项目，\n"
-"在2002年秋天离开Glide64项目。"
-
-#: Config.cpp:1342
-msgid ""
-"Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\n"
-"Main developer since fall of 2002."
-msgstr ""
-"Sergey 'Gonetz' Lipsk。在2002年冬季加入了这个项目。\n"
-"主要开发自2002年秋季。"
-
-#: Config.cpp:1347
-msgid "Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. "
-msgstr "Hiroshi 'KoolSmoky' Morii，加入该项目于2007年。"
-
-#: Config.cpp:1350
-msgid "Glitch64 (the wrapper) authors:"
-msgstr "Glitch64（包装）作者："
-
-#: Config.cpp:1374
-msgid "GlideHQ author:"
-msgstr "GlideHQ 作者："
-
-#: Config.cpp:1381
-msgid "beta tester:"
-msgstr "Beta测试者："
-
-#: Config.cpp:1388
-msgid ""
-"special thanks to:\n"
-" Orkin, Rice, Daniel Borca, Legend.\n"
-"Thanks to EmuXHaven for hosting my site:\n"
-"http://glide64.emuxhaven.net\n"
-msgstr ""
-"特别感谢：\n"
-"--------\n"
-"Orkin, Rice, Daniel Borca, Legend.\n"
-"感谢 EmuXHaven 提供网站:\n"
-"http://glide64.emuxhaven.net\n"
-
diff --git a/Source/Glide64/Internalization/Glide64_zh_TW.po b/Source/Glide64/Internalization/Glide64_zh_TW.po
deleted file mode 100644
index 87c442677..000000000
--- a/Source/Glide64/Internalization/Glide64_zh_TW.po
+++ /dev/null
@@ -1,1419 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Glide64 Chinese Translation v1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 17:29+0700\n"
-"PO-Revision-Date: 2011-12-19 18:00+0700\n"
-"Last-Translator: Navitel <support@navitel.su>\n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Language: Chinese\n"
-
-#: Config.cpp:64
-msgid "Rendering"
-msgstr "渲染"
-
-#: Config.cpp:65
-msgid "Other"
-msgstr "其它"
-
-#: Config.cpp:66
-msgid "Speed"
-msgstr "速度"
-
-#: Config.cpp:67
-msgid "Time"
-msgstr "時間"
-
-#: Config.cpp:68
-msgid "On screen display"
-msgstr "在螢幕上顯示"
-
-#: Config.cpp:69
-msgid "OpenGL settings"
-msgstr "OpenGL設置"
-
-#: Config.cpp:70
-#: Config.cpp:137
-msgid "Frame buffer emulation"
-msgstr "幀緩衝區模擬"
-
-#: Config.cpp:71
-msgid ""
-"Windowed or\n"
-"3dfx card resolution:"
-msgstr ""
-"視窗或\n"
-"3dfx解析度:"
-
-#: Config.cpp:99
-msgid "Vertical sync"
-msgstr "垂直同步"
-
-#: Config.cpp:100
-msgid "Show advanced emulation options"
-msgstr "顯示高級模擬選項"
-
-#: Config.cpp:101
-msgid "Show texture enhancement options"
-msgstr "顯示材質增強選項"
-
-#: Config.cpp:102
-msgid "Screenshot format:"
-msgstr "截圖格式:"
-
-#: Config.cpp:105
-msgid "Language: "
-msgstr "語言： "
-
-#: Config.cpp:106
-msgid "LANGUAGE_NAME"
-msgstr "中文（繁體）"
-
-#: Config.cpp:112
-msgid "FPS counter"
-msgstr "FPS 計數器"
-
-#: Config.cpp:113
-msgid "VI/s counter"
-msgstr "VI/s 計數器"
-
-#: Config.cpp:114
-#, c-format
-msgid "% speed"
-msgstr "% 速度 "
-
-#: Config.cpp:115
-msgid "Clock enabled"
-msgstr "時鐘啟用"
-
-#: Config.cpp:116
-msgid "Clock is 24-hour"
-msgstr "時鐘為24小時"
-
-#: Config.cpp:117
-msgid "Transparent text background"
-msgstr "透明文字背景"
-
-#: Config.cpp:118
-msgid ""
-"Full screen\n"
-"resolution:"
-msgstr ""
-"全螢幕\n"
-"解析度:"
-
-#: Config.cpp:121
-msgid "Anisotropic filtering"
-msgstr "各向異性過濾"
-
-#: Config.cpp:122
-msgid "Autodetect "
-msgstr "自動檢測 "
-
-#: Config.cpp:123
-msgid "VRAM size"
-msgstr "顯卡記憶體大小"
-
-#: Config.cpp:125
-msgid "Mb"
-msgstr "Mb"
-
-#: Config.cpp:126
-msgid "Use frame buffer objects"
-msgstr "使用幀緩衝對象"
-
-#: Config.cpp:133
-msgid "Current game emulation settings. Change with care!"
-msgstr "目前的遊戲模擬設置。更改時要小心！"
-
-#: Config.cpp:135
-msgid "Default emulation settings. Not recommended to change!"
-msgstr "默認模擬設置。不推薦更改！"
-
-#: Config.cpp:136
-msgid "General options"
-msgstr "一般選項"
-
-#: Config.cpp:138
-msgid "Depth buffer emulation"
-msgstr "深度緩衝模擬"
-
-#: Config.cpp:139
-msgid "Filtering mode:"
-msgstr "過濾模式："
-
-#: Config.cpp:141
-msgid "Automatic"
-msgstr "自動"
-
-#: Config.cpp:142
-msgid "Force Bilinear"
-msgstr "強制啟用雙線性"
-
-#: Config.cpp:143
-msgid "Force Point-sampled"
-msgstr "強制啟用點取樣"
-
-#: Config.cpp:146
-msgid "Buffer swapping method:"
-msgstr "緩衝交換方法："
-
-#: Config.cpp:148
-msgid "Old"
-msgstr "舊"
-
-#: Config.cpp:149
-msgid "New"
-msgstr "新"
-
-#: Config.cpp:150
-msgid "Hybrid"
-msgstr "混合"
-
-#: Config.cpp:153
-msgid "LOD calculation:"
-msgstr "LOD計算："
-
-#: Config.cpp:155
-msgid "off"
-msgstr "關閉"
-
-#: Config.cpp:156
-msgid "fast"
-msgstr "快速"
-
-#: Config.cpp:157
-msgid "precise"
-msgstr "精確"
-
-#: Config.cpp:160
-msgid "Aspect ratio:"
-msgstr "長寬比："
-
-#: Config.cpp:162
-msgid "4:3 (default)"
-msgstr "4:3 （默認）"
-
-#: Config.cpp:163
-msgid "Force 16:9"
-msgstr "強制啟用 16:9"
-
-#: Config.cpp:164
-msgid "Stretch"
-msgstr "拉伸"
-
-#: Config.cpp:165
-msgid "Original"
-msgstr ""
-
-#: Config.cpp:168
-msgid "Fog"
-msgstr "霧化"
-
-#: Config.cpp:169
-msgid "Buffer clear on every frame"
-msgstr "清除每一幀緩衝"
-
-#: Config.cpp:170
-msgid "Enable frame buffer emulation"
-msgstr "啟用幀緩衝模擬"
-
-#: Config.cpp:171
-msgid "Hardware frame buffer emulation"
-msgstr "硬體模擬幀緩衝"
-
-#: Config.cpp:172
-msgid "Get frame buffer info"
-msgstr "取得幀緩衝訊息"
-
-#: Config.cpp:173
-msgid "Read every frame (slow!)"
-msgstr "讀取每一幀（緩慢！）"
-
-#: Config.cpp:174
-msgid "Render N64 frame buffer as texture"
-msgstr "呈現N64幀緩衝材質"
-
-#: Config.cpp:175
-msgid "Detect CPU write to the N64 frame buffer"
-msgstr "檢測CPU寫入到N64幀緩衝"
-
-#: Config.cpp:176
-msgid "Software depth buffer rendering"
-msgstr "呈現軟體深度緩衝"
-
-#: Config.cpp:200
-#: Config.cpp:619
-msgid "Texture enhancement"
-msgstr "材質增強"
-
-#: Config.cpp:201
-msgid "Hi-resolution textures"
-msgstr "高解析材質"
-
-#: Config.cpp:202
-msgid "Common"
-msgstr "一般"
-
-#: Config.cpp:203
-msgid "Presets"
-msgstr "預置"
-
-#: Config.cpp:204
-#: Config.cpp:205
-msgid "Performance tweaks"
-msgstr "效能調整"
-
-#: Config.cpp:206
-msgid "Filter"
-msgstr "濾鏡"
-
-#: Config.cpp:208
-#: Config.cpp:219
-#: Config.cpp:238
-msgid "None"
-msgstr "無"
-
-#: Config.cpp:209
-msgid "Smooth filtering 1"
-msgstr "平滑過濾 1"
-
-#: Config.cpp:210
-msgid "Smooth filtering 2"
-msgstr "平滑過濾 2"
-
-#: Config.cpp:211
-msgid "Smooth filtering 3"
-msgstr "平滑過濾 3"
-
-#: Config.cpp:212
-msgid "Smooth filtering 4"
-msgstr "平滑過濾 4"
-
-#: Config.cpp:213
-msgid "Sharp filtering 1"
-msgstr "尖銳過濾 1"
-
-#: Config.cpp:214
-msgid "Sharp filtering 2"
-msgstr "尖銳過濾 2"
-
-#: Config.cpp:217
-msgid "Enhancement"
-msgstr "增強"
-
-#: Config.cpp:220
-msgid "Store"
-msgstr "儲存"
-
-#: Config.cpp:230
-msgid "Texture cache"
-msgstr "材質快取"
-
-#: Config.cpp:232
-msgid "Mbytes"
-msgstr "MBytes"
-
-#: Config.cpp:233
-msgid "Ignore Backgrounds"
-msgstr "忽略背景"
-
-#: Config.cpp:234
-#: Config.cpp:245
-msgid "Apply texture compression"
-msgstr "應用材質壓縮"
-
-#: Config.cpp:235
-#: Config.cpp:246
-msgid "Compress texture cache"
-msgstr "壓縮材質快取"
-
-#: Config.cpp:236
-msgid "Format"
-msgstr "格式"
-
-#: Config.cpp:239
-msgid "Rice format"
-msgstr "Rice 格式"
-
-#: Config.cpp:242
-msgid "Tile textures"
-msgstr "圖磚材質"
-
-#: Config.cpp:243
-msgid "Force 16bpp textures"
-msgstr "強制啟用16位元材質"
-
-#: Config.cpp:244
-msgid "Alternative CRC calculation"
-msgstr "另一種CRC計算"
-
-#: Config.cpp:247
-msgid "Use alpha channel fully"
-msgstr "充分利用透明通道"
-
-#: Config.cpp:248
-msgid "Texture dumping/editing mode"
-msgstr "材質轉儲與編輯模式"
-
-#: Config.cpp:249
-msgid "Texture compression method"
-msgstr "材質壓縮方式"
-
-#: Config.cpp:255
-msgid "Save texture cache to hard disk"
-msgstr "保存材質快取到硬碟"
-
-#: Config.cpp:256
-msgid "Best performance"
-msgstr "最佳效能"
-
-#: Config.cpp:257
-msgid "Best texture quality"
-msgstr "最佳材質質量"
-
-#: Config.cpp:263
-msgid "Developers settings"
-msgstr "開發人員設置"
-
-#: Config.cpp:264
-msgid "Debug/Misc"
-msgstr "偵錯與雜項"
-
-#: Config.cpp:265
-msgid "Autodetect Microcode"
-msgstr "自動檢測微碼"
-
-#: Config.cpp:266
-msgid "Force Microcode:"
-msgstr "強制啟用微碼："
-
-#: Config.cpp:279
-msgid "Wireframe using:"
-msgstr "線框使用："
-
-#: Config.cpp:281
-msgid "Original colors"
-msgstr "原始顏色"
-
-#: Config.cpp:282
-msgid "Vertex colors"
-msgstr "頂點顏色"
-
-#: Config.cpp:283
-msgid "Red only"
-msgstr "僅紅色"
-
-#: Config.cpp:286
-msgid "Log to rdp.txt (SLOW)"
-msgstr "登錄到 rdp.txt（緩慢）"
-
-#: Config.cpp:287
-msgid "Unknown combiners as red"
-msgstr "未知的合成器為紅色"
-
-#: Config.cpp:288
-msgid "Log clear every frame"
-msgstr "在每一幀清除記錄"
-
-#: Config.cpp:289
-msgid "Combiner logging"
-msgstr "合成器記錄"
-
-#: Config.cpp:290
-msgid "Run (+log) in window"
-msgstr "視窗執行（+記錄）"
-
-#: Config.cpp:291
-msgid "Cmb. clear every frame"
-msgstr "在每一幀清除合成器"
-
-#: Config.cpp:292
-msgid "Error log (rdp_e.txt)"
-msgstr "錯誤記錄（rdp_e.txt）"
-
-#: Config.cpp:293
-msgid "Bilinear filter texture cache"
-msgstr "雙線性過濾材質快取"
-
-#: Config.cpp:325
-#: Config.cpp:546
-msgid " auto"
-msgstr "自動"
-
-#: Config.cpp:382
-msgid "Please choose language:"
-msgstr "請選擇語言："
-
-#: Config.cpp:383
-msgid "Language"
-msgstr "語言"
-
-#: Config.cpp:390
-msgid "Press OK to change to "
-msgstr "按確定更改為 "
-
-#: Config.cpp:486
-msgid "Basic settings"
-msgstr "基本設置"
-
-#: Config.cpp:487
-msgid ""
-"Resolution\n"
-"This option selects the fullscreen resolution for 3dfx cards and windowed resolution for other cards\n"
-"(note again that for 3dfx cards the plugin must be in fullscreen mode to see anything).\n"
-"[Recommended: 640x480, 800x600, 1024x768]"
-msgstr ""
-"解析度\n"
-"--------\n"
-"此選項選擇3dfx卡為全螢幕解析度和其他視窗解析度。\n"
-"注意：\t對於3dfx卡上的插件必須\n"
-"\t在全螢幕模式才能看到東西\n"
-"[推薦：640x480，800x600，1024X768]"
-
-#: Config.cpp:491
-msgid ""
-"Vertical sync\n"
-"This option will enable the vertical sync, which will prevent tearing.\n"
-"Note: this option will ONLY have effect if vsync is set to \"Software Controlled\".\n"
-msgstr ""
-"垂直同步\n"
-"-------\n"
-"此選項將啟用垂直同步，它將防止撕裂。\n"
-"注意：\t如果垂直同步設置為\"軟體控制\"，\n"
-"\t此選項才會生效。\n"
-
-#: Config.cpp:493
-msgid "Select a format, in which screen shots will be saved"
-msgstr "選擇螢幕截圖所要儲存的一種格式"
-
-#: Config.cpp:500
-msgid ""
-"Language select:\n"
-"Press the button to invoke language selection dialog.\n"
-"Selected language will be activated after restart of the configuration dialog."
-msgstr ""
-"語言選擇:\n"
-"----------\n"
-"按下按鈕調用語言選擇視窗。\n"
-"選擇的語言會在重新啟動設置視窗後生效。"
-
-#: Config.cpp:501
-msgid ""
-"FPS counter\n"
-"When this option is checked, a FPS (frames per second) counter will be shown\n"
-"in the lower left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"FPS 計數器\n"
-"------------\n"
-"當選擇後，FPS（幀每秒）計數器\n"
-"會顯示在螢幕左下角的角落。\n"
-"[推薦：您的偏好]"
-
-#: Config.cpp:503
-msgid ""
-"VI/s counter\n"
-"When this option is checked, a VI/s (vertical interrupts per second) counter\n"
-"will be shown in the lower left corner of the screen.  This is like the FPS\n"
-"counter but will be consistent at 60 VI/s for full speed on NTSC (U) games and\n"
-"50 VI/s for full speed on PAL (E) ones.\n"
-"[Recommended: your preference]"
-msgstr ""
-"VI/s 計數器\n"
-"------------\n"
-"當選擇後，VI/s（每秒垂直中斷）計數器\n"
-"將顯示在螢幕左下角的角落。\n"
-"它將在全速的 NTSC(U)遊戲裡維持 60VI/s\n"
-"或在全速的 PAL(E)遊戲裡維持 50VI/s。\n"
-"[推薦：您的偏好]"
-
-#: Config.cpp:505
-#, c-format
-msgid ""
-"% speed\n"
-"This displays a percentage of the actual N64 speed in the lower\n"
-"left corner of the screen.\n"
-"[Recommended: your preference]"
-msgstr ""
-"% 速度\n"
-"--------\n"
-"在螢幕左下角的角落，\n"
-"將顯示N64實際速度的百分比。\n"
-"[推薦：您的偏好]"
-
-#: Config.cpp:507
-msgid ""
-"Clock enabled\n"
-"This option will put a clock in the lower right corner of the screen, showing the current time.\n"
-"[Recommended: your preference]"
-msgstr ""
-"時鐘啟用\n"
-"----------\n"
-"此選項將在螢幕的右下角\n"
-"擺放時鐘，顯示目前時間。\n"
-"[推薦：您的偏好]"
-
-#: Config.cpp:510
-msgid ""
-"Display hours as 24-hour clock.\n"
-"[Recommended: your preference]"
-msgstr ""
-"顯示時間為24 小時制。\n"
-"[推薦：您的偏好]"
-
-#: Config.cpp:511
-msgid ""
-"Transparent text background\n"
-"If this is checked, all on-screen messages will have a transparent background.  Otherwise, it will have a solid black background.\n"
-"[Recommended: your preference]"
-msgstr ""
-"透明文字背景\n"
-"-----------------\n"
-"當選擇後，所有在螢幕上的訊息\n"
-"將有一個透明的背景。\n"
-"否則，將有黑色背景。\n"
-"[推薦：您的偏好]"
-
-#: Config.cpp:514
-msgid ""
-"Enable \"Emulation settings\" panel. For experienced users only!\n"
-"It shows default emulation settings when game is not loaded, or current game settings otherwise."
-msgstr ""
-"啟用\"模擬設置\"面板。給有經驗的用戶！\n"
-"它顯示了尚未加載遊戲的默認模擬設置，\n"
-"或目前的遊戲設置。"
-
-#: Config.cpp:516
-msgid ""
-"Enable \"Texture enhancement\" panel.\n"
-"It shows various enhancement options for original textures as well as options for hi-resolution textures."
-msgstr ""
-"啟用\"材質增強\"面板。\n"
-"它顯示原來的材質增強選項\n"
-"以及高解析材質選項。"
-
-#: Config.cpp:517
-msgid ""
-"Full screen resolution:\n"
-"This sets the full screen resolution for non-3dfx video cards.\n"
-"All the resolutions that your video card/monitor support should be displayed.\n"
-"[Recommended: native (max) resolution of your monitor - unless performance becomes an issue]"
-msgstr ""
-"全螢幕解析度：\n"
-"---------------\n"
-"這將設置非 3dfx卡的全螢幕解析度。\n"
-"您的顯示卡與顯示器所支援的解析度將會顯示。\n"
-"[推薦：顯示器的原始（最大）解析- 除非性能成為問題]"
-
-#: Config.cpp:520
-msgid ""
-"Anisotropic filtering:\n"
-"This filter sharpens and brings out the details of textures that recede into the distance.\n"
-"When activated, it will use the max anisotropy your video card supports.\n"
-"However, this will override native way of texture filtering and may cause visual artifacts in some games.\n"
-"[Recommended: your preference, game dependant]"
-msgstr ""
-"各向異性過濾：\n"
-"---------------\n"
-"該過濾器會銳化和帶出在遠方退去的材質細節。\n"
-"啟用時，它將使用顯示卡所支援的最大各向異性。\n"
-"不過，這將覆蓋原始的材質過濾方式，\n"
-"並可能導致某些遊戲展示視覺干擾。\n"
-"[推薦：您的偏好，取決於遊戲]"
-
-#: Config.cpp:521
-msgid ""
-"Autodetect VRAM Size:\n"
-"Since OpenGL cannot do this reliably at the moment, the option to set this manually is available.\n"
-"If checked, plugin will try to autodetect VRAM size.\n"
-"But if this appears wrong, please uncheck and set it to correct value.\n"
-"[Recommended: on]"
-msgstr ""
-"自動檢測顯卡記憶體大小：\n"
-"-------------------\n"
-"由於 OpenGL目前無法可靠地做到確實檢測，因此可以選擇手動設置。\n"
-"當選擇後，插件將嘗試自動檢測顯卡記憶體的大小。\n"
-"如果出現錯誤，請取消選擇並將其設置為正確數值。\n"
-"[推薦：選用]"
-
-#: Config.cpp:523
-msgid ""
-"Use frame buffer objects:\n"
-"Changes the way FB effects are rendered - with or without usage of the OpenGL Frame Buffer Objects (FBO) extension.\n"
-"The choice depends on game and your video card. FBO off is good for NVIDIA cards, while for ATI cards, it's usually best that FBOs are turned on.\n"
-"Also, some FB effects works only with one of the methods, no matter, which card you have.\n"
-"On the whole, with FBO off, compatibility/ accuracy is a bit better (which is the case for Resident Evil 2).\n"
-"However, with FBO on with some systems, it can actually be a bit faster in cases.\n"
-"[Recommended: video card and game dependant]"
-msgstr ""
-"使用幀緩衝對象：\n"
-"-----------------\n"
-"當選擇後，即使沒有使用OpenGL幀緩衝對象 (FBO)擴展，\n"
-"它仍然會改變幀緩衝效果的呈現方式。\n"
-"您的選擇取決於你的遊戲和顯示卡。對於Nvidia顯示卡，\n"
-"不要選擇FBO而對於ATI視頻卡，FBO通常是一個很好的選擇。\n"
-"\n"
-"另外，一些幀緩衝效果只適用其中之一的方法，而不管顯示卡。\n"
-"整體而言，不選FBO將會增加遊戲相容性與準確性，例如，\n"
-"Resident Evil 2。\n"
-"\n"
-"然而，在某些系統上，FBO的選擇會加速一些遊戲。\n"
-"[推薦：取決於顯示卡和遊戲]"
-
-#: Config.cpp:578
-msgid "Emulation settings"
-msgstr "模擬設置"
-
-#: Config.cpp:579
-msgid ""
-"Filtering mode\n"
-"There are three filtering modes possible:\n"
-"* Automatic filtering - filter exactly how the N64 specifies.\n"
-"* Point-sampled filtering - causes texels to appear square and sharp.\n"
-"* Bilinear filtering - interpolates the texture to make it appear more smooth.\n"
-"[Recommended: Automatic]"
-msgstr ""
-"過濾模式\n"
-"----------\n"
-"過濾方式有三種：\n"
-"*自動過濾\t: 與N64的過濾是相同的。\n"
-"*點取樣過濾\t: 使材質元素出現正方形和尖銳。\n"
-"*雙線性過濾\t: 插補材質，使其看起來更光滑。\n"
-"[推薦：自動]"
-
-#: Config.cpp:583
-msgid ""
-"Buffer swapping method\n"
-"There are 3 buffer swapping methods:\n"
-"* old - swap buffers when vertical interrupt has occurred.\n"
-"* new - swap buffers when set of conditions is satisfied. Prevents flicker on some games.\n"
-"* hybrid - mix of first two methods.\n"
-"Can prevent even more flickering then previous method, but also can cause artefacts.\n"
-"If you have flickering problems in a game (or graphics that don't show),\n"
-"try to change swapping method.\n"
-"[Recommended: new (hybrid for Paper Mario)]"
-msgstr ""
-"緩衝交換方法\n"
-"---------------\n"
-"緩衝交換方法有3種：\n"
-"*舊\t: 在垂直中斷發生時，交換緩衝區。\n"
-"*新\t: 當條件符合時，交換緩衝區。\n"
-"\t  防止一些遊戲的閃爍。\n"
-"*混合\t: 混合前兩種方法。\n"
-"\t  可防止更多閃爍，但也可能會有視覺干擾。\n"
-"\n"
-"如果您在遊戲中有閃爍的問題（或圖形不顯示），\n"
-"嘗試改變交換方法。\n"
-"[推薦：新（Paper Mario - 選擇混合）]"
-
-#: Config.cpp:587
-msgid ""
-"Per-pixel level-of-detail calculation\n"
-"N64 uses special mechanism for mip-mapping, which nearly impossible to reproduce\n"
-"correctly on PC hardware. This option enables approximate emulation of this feature.\n"
-"For example, it is required for the Peach/Bowser portrait's transition in Super Mario 64.\n"
-"There are 3 modes:\n"
-"* off - LOD is not calculated\n"
-"* fast - fast imprecise LOD calculation.\n"
-"* precise - most precise LOD calculation possible, but more slow.\n"
-"[Recommended: your preference]"
-msgstr ""
-"每個像素詳細程度計算\n"
-"------------------------\n"
-"N64使用特殊的材質映射,幾乎是不可能在電腦硬體\n"
-"上很正確地複製。此選項將啟用此功能近似模擬。\n"
-"例如，應用在\"Super Mario 64\"遊戲內的\n"
-"Peach與Bowser肖像的過渡。\n"
-"\n"
-"有3種模式：\n"
-"*關閉\t: 不進行LOD計算。\n"
-"*快速\t: 快而不準確的LOD計算。\n"
-"*準確\t: 最精確的LOD計算，但更慢。\n"
-"[推薦：您的偏好]"
-
-#: Config.cpp:592
-msgid ""
-"Aspect ratio of the output.\n"
-"Most N64 games use 4:3 aspect ratio, but some support widescreen too.\n"
-"You may select appropriate aspect here and set widescreen mode in game settings.\n"
-"In \"Stretch\" mode the output will be stretched to the entire screen,\n"
-"other modes may add black borders if necessary"
-msgstr ""
-"長寬比的輸出\n"
-"---------------\n"
-"大多數N64 的遊戲使用4:3的比例，但有些支援寬螢幕了。\n"
-"你可以在這裡選擇合適的比例，並在遊戲上設置寬螢幕模式。\n"
-"在\"拉伸 \"模式下，輸出將被拉伸到整個螢幕，\n"
-"其它模式可能在必要時加黑色邊框。"
-
-#: Config.cpp:595
-msgid ""
-"Fog enabled\n"
-"Sets fog emulation on//off.\n"
-"[Recommended: on]"
-msgstr ""
-"啟用霧化\n"
-"-------\n"
-"設置霧化模擬的開與關\n"
-"[推薦：選用]"
-
-#: Config.cpp:597
-msgid ""
-"Buffer clear on every frame\n"
-"Forces the frame buffer to be cleared every frame drawn.\n"
-"Usually frame buffer clear is controlled by the game.\n"
-"However, in some cases it is not well emulated,\n"
-"and some garbage may be left on the screen.\n"
-"In such cases, this option must be set on.\n"
-"[Recommended: on]"
-msgstr ""
-"清除每一幀緩衝\n"
-"-----------------\n"
-"強制在每一幀中的繪製，清除幀緩衝。\n"
-"通常幀緩衝是由遊戲控制的。\n"
-"但是，在某些情況下可能並沒有很好地模擬，\n"
-"有些圖形垃圾或許會殘留在螢幕上。\n"
-"在這種情況下，此選項必須設置。\n"
-"[推薦：選用]"
-
-#: Config.cpp:599
-msgid ""
-"Enable frame buffer emulation\n"
-"If on, plugin will try to detect frame buffer usage and apply appropriate frame buffer emulation.\n"
-"[Recommended: on for games which use frame buffer effects]"
-msgstr ""
-"啟用幀緩衝模擬\n"
-"-----------------\n"
-"當選擇時，插件將嘗試檢測幀緩衝區的\n"
-"使用情況而採用適當的幀緩衝模擬。\n"
-"[推薦：遊戲使用幀緩衝效果- 選用]"
-
-#: Config.cpp:601
-msgid ""
-"Enable hardware frame buffer emulation\n"
-"If this option is on, plugin will create auxiliary frame buffers in video memory instead of copying\n"
-"frame buffer content into main memory. This allows plugin to run frame buffer effects without slowdown\n"
-"and without scaling image down to N64's native resolution. This feature is fully supported by\n"
-"Voodoo 4/5 cards and partially by Voodoo3 and Banshee. Modern cards also fully support it.\n"
-"[Recommended: on, if supported by your hardware]"
-msgstr ""
-"啟用硬體幀緩衝模擬\n"
-"----------------------\n"
-"當選擇後，插件將在顯卡記憶體中創建輔助的幀緩衝器，\n"
-"而不是複製到主記憶體。這允許插件運行幀緩衝效果\n"
-"而不緩衝，並不縮放圖像到N64的原始解析率。\n"
-"\n"
-"此功能會完全支援Voodoo 4與5卡和部分Voodoo3\n"
-"和 Banshee。近期顯卡也完全支援。\n"
-"[推薦：硬體支援 - 選用]"
-
-#: Config.cpp:604
-msgid ""
-"Get information about frame buffers\n"
-"This is compatibility option. It must be set on for Mupen64 and off for 1964"
-msgstr ""
-"取得幀緩衝器的有關訊息\n"
-"這是相容性選項。在Mupen64上，必須設置為開\n"
-"而在1964必須設置為關"
-
-#: Config.cpp:606
-msgid ""
-"Read every frame\n"
-"In some games plugin can't detect frame buffer usage.\n"
-"In such cases you need to enable this option to see frame buffer effects.\n"
-"Every drawn frame will be read from video card -> it works very slow.\n"
-"[Recommended: mostly off (needed only for a few games)]"
-msgstr ""
-"讀取每一幀\n"
-"------------\n"
-"在一些遊戲上，插件無法檢測到幀緩衝區的使用。\n"
-"在這種情況下，您需要啟用該選項才能看到幀緩衝效果。\n"
-"每一個幀的繪製將從顯示卡讀取->這將是非常的緩慢。\n"
-"[推薦：大多不選（運用在少數遊戲上）]"
-
-#: Config.cpp:608
-msgid ""
-"Render N64 frame buffer as texture\n"
-"When this option is enabled, content of each N64 frame buffer is rendered\n"
-"as texture over the frame, rendered by the plugin. This prevents graphics lost,\n"
-"but may cause slowdowns and various glitches in some games.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"呈現N64的幀緩衝到材質\n"
-"--------------------------\n"
-"當選擇後，每個 N64的幀緩衝的內容將由插件\n"
-"在幀上呈現材質。這可以防止圖形的流失，\n"
-"但可能會導致速度下降，和一些遊戲的各種錯誤。\n"
-"[推薦：大多不選]"
-
-#: Config.cpp:610
-msgid ""
-"Detect CPU write to the N64 frame buffer\n"
-"This option works as the previous options, but the plugin is trying to detect,\n"
-"when game uses CPU writes to N64 frame buffer. The N64 frame buffer is rendered\n"
-"only when CPU writes is detected. Use this option for those games, in which you\n"
-"see still image or no image at all for some time with no reason.\n"
-"[Recommended: mostly off]"
-msgstr ""
-"檢測CPU寫入到N64幀緩衝\n"
-"----------------------------\n"
-"此選項與上一個選項有一樣的功能，但插件會試圖\n"
-"檢測遊戲在何時使用CPU寫入到N64的幀緩衝區。\n"
-"當檢測到 CPU寫入時，才會呈現N64的幀緩衝。\n"
-"\n"
-"如果過了一段時間後，你只能看到靜態圖像或\n"
-"無圖像時，請使用此選項。\n"
-"[推薦：大多不選]"
-
-#: Config.cpp:612
-msgid ""
-"Enable depth buffer rendering\n"
-"This option is used to fully emulate N64 depth buffer.\n"
-"It is required for correct emulation of depth buffer based effects.\n"
-"However, it requires fast (>1GHz) CPU to work full speed.\n"
-"[Recommended: on for fast PC]"
-msgstr ""
-"啟用深度緩衝渲染\n"
-"-------------------\n"
-"此選項用於完全模擬N64的深度緩衝區。\n"
-"這是需要正確的模擬深度緩衝的效果。\n"
-"但是，它需要快速（>1GHz）的CPU才能達到全速。\n"
-"[推薦：快速電腦 - 選用]"
-
-#: Config.cpp:620
-msgid ""
-"Filters:\n"
-"Apply a filter to either smooth or sharpen textures.\n"
-"There are 4 different smoothing filters and 2 different sharpening filters.\n"
-"The higher the number, the stronger the effect,\n"
-"i.e. \"Smoothing filter 4\" will have a much more noticeable effect than \"Smoothing filter 1\".\n"
-"Be aware that performance may have an impact depending on the game and/or the PC.\n"
-"[Recommended: your preference]"
-msgstr ""
-"濾鏡：\n"
-"--------\n"
-"應用一個濾鏡來平滑或銳化材質。\n"
-"有4種不同的平滑濾鏡和2個不同的銳化濾鏡。\n"
-"- 數字越高，效果越強。\n"
-"- 例如，平滑濾鏡4將比1有更明顯的效果。\n"
-"\n"
-"注意:\t遊戲性能可能會受到影響，\n"
-"\t取決於遊戲與或電腦。\n"
-"[推薦：您的偏好]"
-
-#: Config.cpp:624
-msgid ""
-"Texture enhancement:\n"
-"7 different filters are selectable here, each one with a distinctive look.\n"
-"Be aware of possible performance impacts.\n"
-"\n"
-"IMPORTANT: 'Store' mode - saves textures in cache 'as is'. It can improve performance in games, which load many textures.\n"
-"Disable 'Ignore backgrounds' option for better result.\n"
-"\n"
-"[Recommended: your preference]"
-msgstr ""
-"材質增強：\n"
-"----------\n"
-"在這裡可選擇 7種不同的濾鏡，每一個具有獨特的外觀。\n"
-"注意:\t可能會有性能影響。\n"
-"\n"
-"要點:\t \"存儲\"模式- 儲存在快取的材質為\"原狀\"。\n"
-"\t它可以提高遊戲的性能，但載有很多材質。\n"
-"\t禁用\"忽略背景\"選項，讓效果更佳。\n"
-"[推薦：您的偏好]"
-
-#: Config.cpp:628
-msgid ""
-"Texture cache size:\n"
-"Enhanced and filtered textures can be cached to aid performance.\n"
-"This setting will adjust how much PC memory will be dedicated for texture cache.\n"
-"This helps boost performance if there are subsequent requests for the same texture (usually the case).\n"
-"Normally, 128MB should be more than enough but there is a sweet spot for each game.\n"
-"Super Mario may not need more than 32megs, but Conker streams a lot of textures,\n"
-"so setting 256+ megs can boost performance. Adjust accordingly if you are encountering speed issues.\n"
-"'0' disables cache.\n"
-"[Recommended: PC and game dependant]"
-msgstr ""
-"材質快取大小：\n"
-"---------------\n"
-"加強和過濾後的材質可被快取以輔助效能。\n"
-"此設置將調整多少電腦主記憶體為材質快取專用。\n"
-"如果是相同的材質（通常如此）有後續請求，\n"
-"這將有助於提高效能。一般情況下，\n"
-"128MB應該是綽綽有餘，但每個遊戲有其不同特點。\n"
-"\n"
-"\"Super Mario\"可能不需要比32 MB還多，\n"
-"但\"Conker \"使用很多材質，因而用256MB+\n"
-"可提高效能。如果你遇到速度問題，\n"
-"可依據實際情況調整。\n"
-"\n"
-"'0'禁用快取。\n"
-"[推薦：取決於電腦和遊戲]"
-
-#: Config.cpp:634
-msgid ""
-"Ignore Backgrounds:\n"
-"It is used to skip enhancement for long narrow textures, usually used for backgrounds.\n"
-"This may save texture memory greatly and increase performance.\n"
-"[Recommended: on (off for 'Store' mode)]"
-msgstr ""
-"忽略背景：\n"
-"----------\n"
-"它是用來跳過增強狹長材質（通常為背景用）。\n"
-"這可能會大大節省材質儲存記憶體和提高性能。\n"
-"[推薦：選（\" 存儲\"模式- 不選）]"
-
-#: Config.cpp:636
-msgid ""
-"Texture compression:\n"
-"Textures will be compressed using selected texture compression method.\n"
-"The overall compression ratio is about 1/6 for FXT1 and 1/4 for S3TC.\n"
-"In addition to saving space on the texture cache,\n"
-"the space occupied on the GFX hardware's texture RAM,\n"
-"by the enhanced textures, will be greatly reduced.\n"
-"This minimizes texture RAM usage,\n"
-"decreasing the number of texture swaps to the GFX hardware leading to performance gains.\n"
-"However, due to the nature of lossy compression of FXT1 and S3TC, using this option can sometimes lead to quality degradation of small size textures and color banding of gradient colored textures.\n"
-"[Recommended: off]"
-msgstr ""
-"材質壓縮：\n"
-"----------\n"
-"材質的壓縮是依照所選的材質壓縮方法。\n"
-"整體壓縮比大約是 1/6於FXT1或1/4於S3TC.\n"
-"除了節省材質快取的空間，在顯卡硬體的材質記憶體\n"
-"所佔領的增強材質空間，將大大減少。\n"
-"這將最大限度地減少材質記憶體的使用，\n"
-"降低材質在顯卡硬體的交換數次，導致提高效能。\n"
-"\n"
-"然而，由於 FXT1和S3TC有損壓縮的性質，\n"
-"使用此選項有時會導致小體積的材質出現質量退化\n"
-"和漸變色的材質出現色帶。\n"
-"[推薦：不選]"
-
-#: Config.cpp:640
-msgid ""
-"Compress texture cache:\n"
-"Memory will be compressed so that more textures can be held in the texture cache.\n"
-"The compression ratio varies with each texture,\n"
-"but 1/5 of the original size would be a modest approximation.\n"
-"They will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"壓縮材質快取：\n"
-"---------------\n"
-"主記憶體將被壓縮，使更多的材質可以存儲在材質快取。\n"
-"壓縮比率會因材質而各有不同，大約1/5的原始大小\n"
-"是個較普遍的壓縮效率。\n"
-"他們將立即被解壓縮，然後被下載到顯卡硬體。\n"
-"即使使用材質壓縮，此選項仍會節省主記憶體空間。\n"
-"[推薦：選用]"
-
-#: Config.cpp:642
-msgid ""
-"Hi-res pack format:\n"
-"Choose which method is to be used for loading Hi-res texture packs.\n"
-"Only Rice's format is available currently.\n"
-"Leave on \"None\" if you will not be needing to load hi-res packs.\n"
-"[Recommended: Rice's format. Default: \"None\"]"
-msgstr ""
-"高解析材質包格式：\n"
-"------------------\n"
-"選擇哪種方法來加載高解析材質包。\n"
-"目前只能用 Rice's 格式。\n"
-"如果你不需要加載高解析材質包，請選擇\"無\"。\n"
-"[推薦：Rice's 格式。默認：無]"
-
-#: Config.cpp:646
-msgid ""
-"Tile textures:\n"
-"When on, wide texture will be split on several tiles to fit in one 256-width texture.\n"
-"This tiled texture takes much less video memory space and thus overall performance will increase.\n"
-"However, corresponding polygons must be split too, and this is not polished yet\n"
-"- various issues are possible, including black lines and polygons distortions.\n"
-"[Recommended: off]"
-msgstr ""
-"圖磚材質：\n"
-"----------\n"
-"當選擇後，寬材質將被分割在幾個瓦片，以適應一個256寬的材質。\n"
-"這平鋪材質花費更少的顯卡記憶體空間，因此整體性能會有所增加。\n"
-"但是，必須相應的多邊形也需要分割，卻尚未完全開發出來。\n"
-"- 各種問題都有可能的，包括黑線和多邊形的扭曲。\n"
-"[推薦：不選]"
-
-#: Config.cpp:648
-msgid ""
-"Force 16bpp textures:\n"
-"The color of the textures will be reduced to 16bpp.\n"
-"This is another space saver and performance enhancer.\n"
-"This halves the space used on the texture cache and the GFX hardware's texture RAM.\n"
-"Color reduction is done so that the original quality is preserved as much as possible.\n"
-"Depending on the texture, this usually is hardly noticeable.\n"
-"Sometimes though, it can be: skies are a good example.\n"
-"[Recommended: off]"
-msgstr ""
-"強制啟用16位元材質：\n"
-"--------------------\n"
-"該材質色彩將減少為16位元。\n"
-"這是另一種節省空間和性能增強的方式。\n"
-"將節省一半的材質快取和\n"
-"顯卡硬體存放材質的記憶體使用空間。\n"
-"\n"
-"色彩還原將盡可能的保留其原來顏色。\n"
-"根據不同的材質，這通常是難以察覺的。\n"
-"但，並非不可能：天空是一個很好的例子。\n"
-"[推薦：不選]"
-
-#: Config.cpp:650
-msgid ""
-"Texture dumping mode:\n"
-"In this mode, you have that ability to dump textures on screen to the appropriate folder.\n"
-"You can also reload textures while the game is running to see how they look instantly - big time saver!\n"
-"\n"
-"Hotkeys: \"R\" reloads hires textures from the texture pack - \"D\" toggles texture dumps on/off."
-msgstr ""
-"材質轉儲方式：\n"
-"---------------\n"
-"在這模式下，你可將螢幕上的材質轉儲到適當的資料夾。\n"
-"您也可以在遊戲運行時重新載入材質，而馬上看到結果\n"
-"- 大大節省時間！\n"
-"熱鍵：\tR - 重新載入高解析材質包\n"
-"\tD - 將切換材質轉儲開與關"
-
-#: Config.cpp:652
-msgid ""
-"Alternative CRC calculation:\n"
-"This option enables emulation of a palette CRC calculation bug in RiceVideo.\n"
-"If some textures are not loaded, try to set this option on/off.\n"
-"[Recommended: texture pack dependant, mostly on]"
-msgstr ""
-"另一種CRC 計算：\n"
-"-----------------\n"
-"此選項可以模擬RiceVideo在調色板上的CRC計算錯誤。\n"
-"如果某些材質不能加載，請嘗試設置此選項開與關。\n"
-"[推薦：取決於材質包，大多選用]"
-
-#: Config.cpp:657
-msgid ""
-"Compress texture cache:\n"
-"When game started, plugin loads all its hi-resolution textures into PC memory.\n"
-"Since hi-resolution textures are usually large, the whole pack can take hundreds megabytes of memory.\n"
-"Cache compression allows save memory space greatly.\n"
-"Textures will be decompressed on-the-fly, before being downloaded to the gfx hardware.\n"
-"This option will still help save memory space even when using texture compression.\n"
-"[Recommended: on]"
-msgstr ""
-"壓縮材質快取：\n"
-"---------------\n"
-"當遊戲開始後，插件將加載所有\n"
-"的高解析材質在電腦主記憶體。\n"
-"由於高解析材質通常很大，\n"
-"整個材質包可以利用幾百MB的主記憶體。\n"
-"快取壓縮可以大大節省存儲空間。\n"
-"材質將立即被解壓縮，然後下載到顯卡硬體。\n"
-"即使使用材質壓縮，此選項仍會節省主記憶體空間。\n"
-"[推薦：選用]"
-
-#: Config.cpp:659
-msgid ""
-"Use Alpha channel fully:\n"
-"When this option is off, 16bit rgba textures will be loaded using RiceVideo style\n"
-"- with 1bit for alpha channel.\n"
-"When it is on, GlideHQ will check, how alpha channel is used by the hires texture,\n"
-"and select most appropriate format for it.\n"
-"This gives texture designers freedom to play with alpha, as they need,\n"
-"regardless of format of original N64 texture.\n"
-"For older and badly designed texture packs it can cause unwanted black borders.\n"
-"[Recommended: texture pack dependant]"
-msgstr ""
-"充分利用透明通道：\n"
-"--------------------\n"
-"如不選此選項，使用RiceVideo風格會加載\n"
-"16位元RGBA材質與1位元透明通道。\n"
-"當選擇後，GlideHQ將檢查高解析材質如何\n"
-"使用透明通道，並選擇最適當的格式。\n"
-"它讓設計者自由發揮材質透明的使用，\n"
-"不論其原來的 N64的材質格式。\n"
-"對於老舊或設計不良的材質包，可能會出現不必要的黑邊。\n"
-"[推薦：取決於材質包]"
-
-#: Config.cpp:662
-msgid ""
-"Save texture cache to HD:\n"
-"\n"
-"For enhanced textures cache:\n"
-"This will save all previously loaded and enhanced textures to HD.\n"
-"So upon next game launch, all the textures will be instantly loaded, resulting in smoother performance.\n"
-"\n"
-"For high-resolution textures cache:\n"
-"After creation, loading hi-res texture will take only a few seconds upon game launch,\n"
-"as opposed to the 5 -60 seconds a pack can take to load without this cache file.\n"
-"The only downside here is upon any changes to the pack, the cache file will need to be manually deleted.\n"
-"\n"
-"Saved cache files go into a folder called \"Cache\" within the Plugins folder.\n"
-"\n"
-"[Highly Recommended: on]"
-msgstr ""
-"保存材質快取到硬碟：\n"
-"--------------------\n"
-"增強材質快取：\n"
-"---------------\n"
-"這將保存所有之前加載和增強材質到硬碟。\n"
-"下一次遊戲開始後，所有的材質將即刻加載，\n"
-"導致更順暢的性能。\n"
-"\n"
-"高解析材質快取：\n"
-"----------------------\n"
-"在創建後，當遊戲啟動時，加載高解析材質只需幾秒鐘。\n"
-"如果沒有這個快取檔案，載入材質包可能需要5-60秒。\n"
-"唯一的缺點是在更改材質包時，快取檔案將需要手動刪除。\n"
-"\n"
-"儲存的快取檔案將被儲存到Plugins資料夾內的Cache資料夾。\n"
-"[強烈推薦：選用]"
-
-#: Config.cpp:685
-msgid "Debug"
-msgstr "偵錯"
-
-#: Config.cpp:686
-msgid ""
-"Autodetect Microcode\n"
-"If this option is checked, the microcode of the game\n"
-"will be detected automatically from the INI, and\n"
-"therefore it will not need to be set in this\n"
-"configuration dialog.\n"
-"[Recommended: on]"
-msgstr ""
-"自動檢測微碼\n"
-"當選擇後，遊戲的微碼會自動從INI檢測到。\n"
-"因此它不需要在此設置視窗中設置。\n"
-"[推薦：選用]"
-
-#: Config.cpp:688
-msgid ""
-"Force Microcode\n"
-"This option ONLY has an effect if Autodetect Microcode\n"
-"is unchecked, the crc from the game could not be\n"
-"found in the INI, OR after the game has already started\n"
-"running. In any of those three cases, this will\n"
-"select the microcode to use\n"
-"[Recommended: any, turn on Autodetect Microcode]"
-msgstr ""
-"強制啟用微碼\n"
-"此選項是在以下情況才有效:\n"
-"1. 如果沒選定自動檢測微碼，\n"
-"2. 遊戲的CRC在INI找不到，或\n"
-"3. 遊戲已經開始運行。\n"
-"在這三種情形之下，它將使用微碼。\n"
-"[推薦：任何，選自\"動檢測微碼\"]"
-
-#: Config.cpp:692
-msgid ""
-"Wireframe\n"
-"This option, when checked, makes it so that the plugin will draw only the\n"
-"outlines of objects.  The colors specified in the combo box to the right\n"
-"determines the color that the wireframes show up as.\n"
-"[Recommended: off]"
-msgstr ""
-"線框\n"
-"當選擇後，插件會畫出對象的輪廓。\n"
-"在組合框中指定的顏色，將決定線框顏色的顯示。\n"
-"[推薦：不選]"
-
-#: Config.cpp:694
-msgid ""
-"Wireframe Colors\n"
-"This selects the colors to use for the wireframes (if wireframe mode is enabled).\n"
-"There are 3 modes:\n"
-"* Original colors - draw exactly as it would normally, textures and all, only in wireframes.\n"
-"* Vertex colors - use the colors specified in the vertices to draw the wireframes with.\n"
-"* Red only - use a constant red color to draw the wireframes.\n"
-"[Recommended: Vertex colors]"
-msgstr ""
-"線框顏色\n"
-"這將選擇用於線框的顏色（如線框模式已啟用）。\n"
-"有3種模式：\n"
-"*原始顏色\t: 材質和所有，是與原來相同的顏色來繪製線框。\n"
-"*頂點顏色\t: 使用指定的頂點來繪製線框的顏色。\n"
-"*僅紅色\t: 利用固定的紅色來繪製線框。\n"
-"[推薦：頂點顏色]"
-
-#: Config.cpp:696
-msgid ""
-"Log to RDP.txt\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option, when checked, will log EVERY SINGLE\n"
-"COMMAND the plugin processes to a file called RDP.txt in the current directory.\n"
-"This is incredibly slow, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-"登錄到RDP.txt\n"
-"推薦僅用於偵錯- 當選擇後，將記錄該插件程序的\n"
-"每一個命令到目前目錄的RDP.txt。\n"
-"這是令人難以置信的慢，所以我建議保持禁用。\n"
-"[推薦：不選]"
-
-#: Config.cpp:698
-msgid ""
-"Unknown combiners as red\n"
-"Objects that use an unimplemented combine mode will show up as red instead of\n"
-"assuming texture with full alpha. Disable this option to remove the red stuff\n"
-"and at least have a guess at the correct combine mode.\n"
-"[Recommended: off]"
-msgstr ""
-"未知的合成器為紅色\n"
-"如果對象使用一個未知的合成模式，它會顯示為紅色而不是\n"
-"假設材質具有完全透明的功能。禁用此選項，刪除紅色的東西，\n"
-"並至少能對正確的合成模式作出猜測。\n"
-"[推薦：不選]"
-
-#: Config.cpp:700
-msgid ""
-"Log clear every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option has no effect unless 'Log to RDP.txt'\n"
-"is checked. This will make it so that the log, RDP.txt, will be cleared at the\n"
-"beginning of every frame.\n"
-"[Recommended: off]"
-msgstr ""
-"在每一幀清除記錄\n"
-"推薦僅用於偵錯- 這個選項沒有任何作用，除非選擇\"記錄到RDP.txt\"。\n"
-"這將讓這個記錄RDP.txt，在每一幀的開始清除。\n"
-"[推薦：不選]"
-
-#: Config.cpp:702
-msgid ""
-"Log unknown combiners\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will cause every\n"
-"unimplemented combiner drawn to be logged to a file called Unimp.txt in the\n"
-"current directory. This becomes slow when there are unimplemented combiners\n"
-"on the screen, so I recommend keeping it disabled.\n"
-"[Recommended: off]"
-msgstr ""
-"登錄不明合成器\n"
-"推薦僅用於偵錯- 當選擇後，這個選項將導致所有未執行\n"
-"的繪製合成器被記錄到Unimp.txt的文件。\n"
-"如果有未執行的合成器在螢幕上，它會變得緩慢，\n"
-"所以我建議保持禁用。\n"
-"[推薦：不選]"
-
-#: Config.cpp:704
-msgid ""
-"Run and log in window\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option will make it so that the plugin will\n"
-"still process dlists in windowed mode. This allows for logging to occur while not\n"
-"in fullscreen, possibly allowing you to debug a crash.\n"
-"[Recommended: off]"
-msgstr ""
-"運行並紀錄於視窗\n"
-"推薦僅用於偵錯- 這個選項將讓插件仍然會在視窗模式處理dlists。\n"
-"雖然不是在全螢幕，但仍允許記錄，可以讓你測試崩潰的原因。\n"
-"[推薦：不選]"
-
-#: Config.cpp:706
-msgid ""
-"Clear unknown combiner log every frame\n"
-"RECOMMENDED FOR DEBUGGING ONLY - this option works much like 'Log clear every frame'\n"
-"except it clears the combiner log (Unimp.txt) instead of RDP.txt at the\n"
-"beginning of each frame. Again, this option has no effect if 'combiner logging' is disabled.\n"
-"[Recommended: off]"
-msgstr ""
-"在每一幀清除未知合成器記錄\n"
-"推薦僅用於偵錯- 這個選項很像\"在每一幀清除記錄\"，\n"
-"除了它在每一幀的開始清除合成器記錄（Unimp.txt），\n"
-"而不是RDP.txt。\n"
-"如果\"合成器記錄\"被禁用，這個選項不會起作用。\n"
-"[推薦：不選]"
-
-#: Config.cpp:709
-msgid ""
-"Bilinear filter texture cache\n"
-"RECOMMENDED FOR DEBUGGING ONLY - when checked, this option will make the graphical\n"
-"debugger texture cache use bilinear filtering as opposed to point-sampled filtering,\n"
-"which it will use otherwise. See 'Filtering mode' for descriptions of bilinear and\n"
-"point-sampled filtering.\n"
-"[Recommended: off]"
-msgstr ""
-"雙線性過濾材質快取\n"
-"---------------------\n"
-"推薦僅用於偵錯- 當選擇後，此選項將使圖形偵錯器的材質快取\n"
-"使用雙線性過濾材質快取，而不是點取樣過濾。\n"
-"閱讀\"過濾模式\"對雙線性和點取樣樣過濾的描述。\n"
-"[推薦：不選]"
-
-#: Config.cpp:1104
-msgid "Glide64 settings"
-msgstr "Glide64 設置"
-
-#: Config.cpp:1293
-msgid "About Glide64"
-msgstr "關於 Glide64"
-
-#: Config.cpp:1326
-msgid "authors:"
-msgstr "作者："
-
-#: Config.cpp:1330
-msgid ""
-"Dave2001. Original author and former main developer.\n"
-"He founded Glide64 project on Dec. 29th, 2001.\n"
-"Left the project at fall of 2002.\n"
-msgstr ""
-"Dave2001。 原作者和原主要開發者。\n"
-"他在2001年 12月29日創立Glide64項目。\n"
-"在2002年的秋天離開Glide64項目。\n"
-
-#: Config.cpp:1336
-msgid ""
-"Gugaman. Developer. Joined the project at winter 2002\n"
-" and left it at fall 2002."
-msgstr ""
-"開發人員Gugaman。在2002年冬季加入了這個項目，\n"
-"在2002年秋天離開Glide64項目。"
-
-#: Config.cpp:1342
-msgid ""
-"Sergey 'Gonetz' Lipski. Joined the project at winter 2002.\n"
-"Main developer since fall of 2002."
-msgstr ""
-"Sergey 'Gonetz' Lipski。在2002年冬季加入了這個項目。\n"
-"主要開發自2002年秋季。"
-
-#: Config.cpp:1347
-msgid "Hiroshi 'KoolSmoky' Morii, Joined the project in 2007. "
-msgstr "Hiroshi 'KoolSmoky' Morii，加入該項目於 2007年。"
-
-#: Config.cpp:1350
-msgid "Glitch64 (the wrapper) authors:"
-msgstr "Glitch64（包裝）作者："
-
-#: Config.cpp:1374
-msgid "GlideHQ author:"
-msgstr "GlideHQ 作者："
-
-#: Config.cpp:1381
-msgid "beta tester:"
-msgstr "測試版測試者： "
-
-#: Config.cpp:1388
-msgid ""
-"special thanks to:\n"
-" Orkin, Rice, Daniel Borca, Legend.\n"
-"Thanks to EmuXHaven for hosting my site:\n"
-"http://glide64.emuxhaven.net\n"
-msgstr ""
-"特別感謝：\n"
-"-------------\n"
-"Orkin, Rice, Daniel Borca, Legend.\n"
-"感謝 EmuXHaven 提供網站:\n"
-"http://glide64.emuxhaven.net\n"
-
diff --git a/Source/Glide64/Keys.cpp b/Source/Glide64/Keys.cpp
index 83ee5cb05..c604e1d97 100644
--- a/Source/Glide64/Keys.cpp
+++ b/Source/Glide64/Keys.cpp
@@ -43,42 +43,10 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
 
 Glide64Keys::Glide64Keys()
 {
-#ifdef __WINDOWS__
-_keys[G64_VK_CONTROL] = 0x11;
-_keys[G64_VK_ALT]     = 0x12;
-_keys[G64_VK_INSERT]  = 0x2D;
-_keys[G64_VK_LBUTTON] = 0x01;
-_keys[G64_VK_UP]      = 0x26;
-_keys[G64_VK_DOWN]    = 0x28;
-_keys[G64_VK_LEFT]    = 0x25;
-_keys[G64_VK_RIGHT]   = 0x27;
-_keys[G64_VK_SPACE]   = 0x20;
-_keys[G64_VK_BACK]    = 0x08;
-_keys[G64_VK_SCROLL]  = 0x91;
-_keys[G64_VK_1]       = 0x31;
-_keys[G64_VK_2]       = 0x32;
-_keys[G64_VK_3]       = 0x33;
-_keys[G64_VK_4]       = 0x34;
-_keys[G64_VK_5]       = 0x35;
-_keys[G64_VK_6]       = 0x36;
-_keys[G64_VK_7]       = 0x37;
-_keys[G64_VK_8]       = 0x38;
-_keys[G64_VK_9]       = 0x39;
-_keys[G64_VK_0]       = 0x30;
-_keys[G64_VK_A]       = 0x41;
-_keys[G64_VK_B]       = 0x42;
-_keys[G64_VK_D]       = 0x44;
-_keys[G64_VK_G]       = 0x47;
-_keys[G64_VK_Q]       = 0x51;
-_keys[G64_VK_R]       = 0x52;
-_keys[G64_VK_S]       = 0x53;
-_keys[G64_VK_V]       = 0x56;
-_keys[G64_VK_W]       = 0x57;
-#else
 _keys[G64_VK_CONTROL] = 306;
 _keys[G64_VK_ALT]     = 308;
 _keys[G64_VK_INSERT]  = 277;
@@ -109,5 +77,4 @@ _keys[G64_VK_R]       = 114;
 _keys[G64_VK_S]       = 115;
 _keys[G64_VK_V]       = 118;
 _keys[G64_VK_W]       = 119;
-#endif
 }
diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp
index 174330771..07a8ecd04 100644
--- a/Source/Glide64/Main.cpp
+++ b/Source/Glide64/Main.cpp
@@ -37,7 +37,7 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
 #include "Version.h"
 #include <Common/std string.h>
 #include <Settings/Settings.h>
@@ -322,7 +322,7 @@ void ConfigWrapper()
 
 void UseUnregisteredSetting (int /*SettingID*/)
 {
-	_asm int 3
+	DebugBreak();
 }
 
 void ReadSettings ()
@@ -411,7 +411,9 @@ void ReadSpecialSettings (const char * name)
   settings.hacks = 0;
 
   //detect games which require special hacks
-  if (strstr(name, (const char *)"ZELDA") || strstr(name, (const char *)"MASK"))
+  if (strstr(name, (const char *)"ZELDA"))
+    settings.hacks |= (hack_Zelda | hack_OoT);
+  else if(strstr(name, (const char *)"MASK"))
     settings.hacks |= hack_Zelda;
   else if (strstr(name, (const char *)"ROADSTERS TROPHY"))
     settings.hacks |= hack_Zelda;
@@ -801,7 +803,7 @@ void DisplayLoadProgress(const wchar_t *format, ...)
     float x;
     set_message_combiner ();
     output (382, 380, 1, "LOADING TEXTURES. PLEASE WAIT...");
-    int len = min (strlen(buf)*8, 1024);
+    int len = min ((int)strlen(buf)*8, 1024);
     x = (1024-len)/2.0f;
     output (x, 360, 1, buf);
     grBufferSwap (0);
@@ -905,7 +907,7 @@ int InitGfx ()
       1);   // 1 auxillary buffer
   }*/
   if (!gfx_context)
-    gfx_context = grSstWinOpen (wxPtrToUInt(gfx.hWnd),
+    gfx_context = grSstWinOpen (gfx.hWnd,
     res_data,
     GR_REFRESH_60Hz,
     GR_COLORFORMAT_RGBA,
@@ -1198,7 +1200,7 @@ extern "C" int WINAPI DllMain (HINSTANCE hinst,
                      wxUint32 fdwReason,
                      LPVOID /*lpReserved*/)
 {
-  sprintf (out_buf, "DllMain (%08lx - %d)\n", hinst, fdwReason);
+  sprintf (out_buf, "DllMain (%0p - %d)\n", hinst, fdwReason);
   LOG (out_buf);
 
   if (fdwReason == DLL_PROCESS_ATTACH)
@@ -1341,9 +1343,11 @@ EXPORT void CALL ChangeWindow (void)
       InitGfx ();
 #ifdef __WINDOWS__
       ShowCursor( TRUE );
-      if (gfx.hStatusBar)
-        ShowWindow( gfx.hStatusBar, SW_SHOW );
-      SetWindowLong (gfx.hWnd, GWL_WNDPROC, (long)oldWndProc);
+	  if (gfx.hStatusBar)
+	  {
+		  ShowWindow(gfx.hStatusBar, SW_SHOW);
+	  }
+	  SetWindowLongPtr(gfx.hWnd, GWLP_WNDPROC, (LONG_PTR)oldWndProc);
 #endif
     }
   }
@@ -1371,7 +1375,7 @@ EXPORT void CALL ChangeWindow (void)
       // SetWindowLong fixes the following Windows XP Banshee issues:
       // 1964 crash error when loading another rom.
       // All N64 emu's minimize, restore crashes.
-      SetWindowLong (gfx.hWnd, GWL_WNDPROC, (long)oldWndProc);
+	  SetWindowLongPtr(gfx.hWnd, GWLP_WNDPROC, (LONG_PTR)oldWndProc);
 #endif
     }
   }
@@ -1390,7 +1394,7 @@ void CALL CloseDLL (void)
 
   // re-set the old window proc
 #ifdef WINPROC_OVERRIDE
-  SetWindowLong (gfx.hWnd, GWL_WNDPROC, (long)oldWndProc);
+  SetWindowLongPtr(gfx.hWnd, GWLP_WNDPROC, (LONG_PTR)oldWndProc);
 #endif
 
 #ifdef ALTTAB_FIX
@@ -1519,9 +1523,9 @@ int CALL InitiateGFX (GFX_INFO Gfx_Info)
 #ifdef WINPROC_OVERRIDE
   // [H.Morii] inject our own winproc so that "alt-enter to fullscreen"
   // message is shown when the emulator window is activated.
-  WNDPROC curWndProc = (WNDPROC)GetWindowLong(gfx.hWnd, GWL_WNDPROC);
+  WNDPROC curWndProc = (WNDPROC)GetWindowLongPtr(gfx.hWnd, GWLP_WNDPROC);
   if (curWndProc && curWndProc != (WNDPROC)WndProc) {
-    oldWndProc = (WNDPROC)SetWindowLong (gfx.hWnd, GWL_WNDPROC, (long)WndProc);
+	  oldWndProc = (WNDPROC)SetWindowLongPtr(gfx.hWnd, GWLP_WNDPROC, (LONG_PTR)WndProc);
   }
 #endif
 
@@ -1661,7 +1665,7 @@ void CALL PluginLoaded (void)
 	game_setting(Set_read_back_to_screen, "read_back_to_screen", 0);
 	game_setting(Set_detect_cpu_write, "detect_cpu_write", 0);
 	game_setting(Set_fb_get_info, "fb_get_info", 0);
-	game_setting(Set_fb_render, "fb_render", 1);
+	game_setting(Set_fb_render, "fb_render", 0);
 }
 
 /******************************************************************
diff --git a/Source/Glide64/Makefile.gcc b/Source/Glide64/Makefile.gcc
deleted file mode 100644
index f01ebaf05..000000000
--- a/Source/Glide64/Makefile.gcc
+++ /dev/null
@@ -1,189 +0,0 @@
-# This MUST be processed by GNU make
-#
-# Glide64 Makefile
-# Version:  1.0
-#
-# this is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# this is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Make; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	DEBUG=1		enable debugging checks and messages
-#			default = no
-#
-#    Environment variables:
-#
-#    Targets:
-#	all:		build dynamic module
-#	clean:		remove object files
-#	realclean:	remove all generated files
-#
-#
-#  Requirements:
-#
-#    Compiler:
-#       GCC 4.2
-#
-#    Libraries:
-#       glide3x - build Glitch64 first, copy the result dll to 'lib' folder
-#       wx-widgets 2.8 (http://www.wxwidgets.org)
-#
-
-#
-# GCC does not have SEH (structured exception handling)
-#
-
-.PHONY: all clean realclean ostype
-
-OS=$(shell uname)
-ifeq ($(findstring MINGW,$(OS)),MINGW)
-OS := WINDOWS
-endif
-ifeq ($(findstring CYGWIN,$(OS)),CYGWIN)
-OS=WINDOWS
-endif
-ifeq ($(findstring WINNT,$(OS)),WINNT)
-OS=WINDOWS
-endif
-ifeq ($(OS),Darwin)
-OS=MACOSX
-endif
-
-ifeq ($(OS), WINDOWS)
-DLLNAME = Glide64.dll
-else
-DLLNAME = Glide64.so
-endif
-
-EXT_INC = ./inc
-EXT_LIB = ./lib
-
-CC = g++ 
-STRIP = strip
-
-CFLAGS = -DBUILDING_DLL=1  -fexceptions 
-LDLIBS = -L"." -L"lib" `wx-config --libs` 
-
-ifeq ($(OS), Linux)
-CC += -V 4.2
-LDFLAGS = -shared -lstdc++ 
-CFLAGS += -D__unix__
-LDLIBS += $(EXT_LIB)/glide3x.so
-endif
-ifeq ($(OS), MACOSX)
-LDFLAGS = -dynamiclib -lstdc++ 
-CFLAGS += -D__unix__ -Dmacintosh
-LDLIBS += $(EXT_LIB)/glide3x.dylib
-endif
-ifeq ($(OS), WINDOWS)
-LDFLAGS = -shared -mwindows 
-CFLAGS += -D__WIN32__ -DWIN32 -D_WIN32
-LDLIBS += $(EXT_LIB)/glide3x.lib
-endif
-
-CFLAGS += -ffast-math -funroll-loops
-#CFLAGS += -fexpensive-optimizations -march=k6
-CFLAGS += -I. -I$(EXT_INC) `wx-config --cppflags`
-
-ifdef DEBUG
-CFLAGS += -g -DDEBUG
-endif
-
-LD = g++
-
-AS = nasm
-ifeq ($(OS), Linux)
-ASFLAGS = -O6 -felf -D__linux__ 
-ASM_OBJ = \
-  3dmathSIMD.o \
-  FixedPoint.o \
-  Texture.o
-else 
-  ifeq ($(OS), MACOSX)
-    ASFLAGS = -O6 -fmacho --prefix _
-    ASM_OBJ = \
-     3dmathSIMD.o \
-     FixedPoint.o \
-     Texture.o
-  else 
-    ifeq ($(OS), WINDOWS)
-      ASFLAGS = -O6 -fwin32 -D__WIN32__ --prefix _
-      ASM_OBJ = \
-       3dmathSIMD.obj \
-       FixedPoint.obj \
-       Texture.obj
-    endif
-  endif
-endif
-
-RM = rm
-
-SOURCES = \
-  3dmath.cpp \
-  Combine.cpp \
-  Config.cpp \
-  CRC.cpp \
-  Debugger.cpp \
-  DepthBufferRender.cpp \
-  Ext_TxFilter.cpp \
-  FBtoScreen.cpp \
-  Main.cpp \
-  Keys.cpp \
-  rdp.cpp \
-  TexBuffer.cpp \
-  TexCache.cpp \
-  Util.cpp
-
-OBJECTS = $(SOURCES:.cpp=.o)
-
-.cpp.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-
-all: $(DLLNAME)
-
-$(DLLNAME): $(OBJECTS) $(ASM_OBJ)
-	$(LD) -o $@ $(LDFLAGS) $^ $(LDLIBS)
-ifeq ($(OS), Linux)
-	$(STRIP) $@
-endif
-
-ifneq ($(OS), WINDOWS)
-3dmathSIMD.o: 3dmathSIMD.asm
-	$(AS) -o $@ $(ASFLAGS) $<
-FixedPoint.o: FixedPoint.asm
-	$(AS) -o $@ $(ASFLAGS) $<
-Texture.o: Texture.asm
-	$(AS) -o $@ $(ASFLAGS) $<
-else
-3dmathSIMD.obj: 3dmathSIMD.asm
-	$(AS) -o $@ $(ASFLAGS) $<
-FixedPoint.obj: FixedPoint.asm
-	$(AS) -o $@ $(ASFLAGS) $<
-Texture.obj: Texture.asm
-	$(AS) -o $@ $(ASFLAGS) $<
-endif
-
-clean:
-	-$(RM) *.o
-
-realclean: clean
-	-$(RM) $(DLLNAME) 
-
-ostype:
-	echo $(OS)
-
--include depend
diff --git a/Source/Glide64/MiClWr16b.h b/Source/Glide64/MiClWr16b.h
index 949cd3952..32fcd512f 100644
--- a/Source/Glide64/MiClWr16b.h
+++ b/Source/Glide64/MiClWr16b.h
@@ -36,15 +36,100 @@
 // * Do NOT send me the whole project or file that you modified.  Take out your modified code sections, and tell me where to put them.  If people sent the whole thing, I would have many different versions, but no idea how to combine them all.
 //
 //****************************************************************
+#include <common/stdtypes.h>
+#include <string.h>
+typedef uint32_t wxUint32;
 
-extern "C" void asmMirror16bS (int tex, int start, int width, int height, int mask, int line, int full, int count);
-extern "C" void asmWrap16bS (int tex, int start, int height, int mask, int line, int full, int count);
-extern "C" void asmClamp16bS (int tex, int constant, int height,int line, int full, int count);
+static inline void mirror16bS(uint8_t *tex, uint8_t *start, int width, int height, int mask, int line, int full, int count)
+{
+  uint16_t *v8;
+  int v9;
+  int v10;
+
+  v8 = (uint16_t *)start;
+  v9 = height;
+  do
+  {
+    v10 = 0;
+    do
+    {
+      if ( width & (v10 + width) )
+      {
+        *v8 = *(uint16_t *)(&tex[mask] - (mask & 2 * v10));
+        ++v8;
+      }
+      else
+      {
+        *v8 = *(uint16_t *)&tex[mask & 2 * v10];
+        ++v8;
+      }
+      ++v10;
+    }
+    while ( v10 != count );
+    v8 = (uint16_t *)((char *)v8 + line);
+    tex += full;
+    --v9;
+  }
+  while ( v9 );
+}
+
+static inline void wrap16bS(uint8_t *tex, uint8_t *start, int height, int mask, int line, int full, int count)
+{
+  uint32_t *v7;
+  int v8;
+  int v9;
+
+  v7 = (uint32_t *)start;
+  v8 = height;
+  do
+  {
+    v9 = 0;
+    do
+    {
+      *v7 = *(uint32_t *)&tex[4 * (mask & v9)];
+      ++v7;
+      ++v9;
+    }
+    while ( v9 != count );
+    v7 = (uint32_t *)((char *)v7 + line);
+    tex += full;
+    --v8;
+  }
+  while ( v8 );
+}
+
+static inline void clamp16bS(uint8_t *tex, uint8_t *constant, int height, int line, int full, int count)
+{
+  uint16_t *v6;
+  uint16_t *v7;
+  int v8;
+  uint16_t v9;
+  int v10;
+
+  v6 = (uint16_t *)constant;
+  v7 = (uint16_t *)tex;
+  v8 = height;
+  do
+  {
+    v9 = *v6;
+    v10 = count;
+    do
+    {
+      *v7 = v9;
+      ++v7;
+      --v10;
+    }
+    while ( v10 );
+    v6 = (uint16_t *)((char *)v6 + full);
+    v7 = (uint16_t *)((char *)v7 + line);
+    --v8;
+  }
+  while ( v8 );
+}
 
 //****************************************************************
 // 16-bit Horizontal Mirror
-
-void Mirror16bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
+void Mirror16bS (unsigned char * tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
 {
   if (mask == 0) return;
 
@@ -56,14 +141,14 @@ void Mirror16bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_
   int line_full = real_width << 1;
   int line = line_full - (count << 1);
   if (line < 0) return;
-  wxUint32 start = tex + (mask_width << 1);
-  asmMirror16bS (tex, start, mask_width, height, mask_mask, line, line_full, count);
+  unsigned char *start = tex + (mask_width << 1);
+  mirror16bS (tex, start, mask_width, height, mask_mask, line, line_full, count);
 }
 
 //****************************************************************
 // 16-bit Horizontal Wrap (like mirror)
 
-void Wrap16bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
+void Wrap16bS (unsigned char * tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
 {
   if (mask == 0) return;
 
@@ -75,31 +160,31 @@ void Wrap16bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_wi
   int line_full = real_width << 1;
   int line = line_full - (count << 2);
   if (line < 0) return;
-  wxUint32 start = tex + (mask_width << 1);
-  asmWrap16bS (tex, start, height, mask_mask, line, line_full, count);
+  unsigned char * start = tex + (mask_width << 1);
+  wrap16bS (tex, start, height, mask_mask, line, line_full, count);
 }
 
 //****************************************************************
 // 16-bit Horizontal Clamp
 
-void Clamp16bS (wxUint32 tex, wxUint32 width, wxUint32 clamp_to, wxUint32 real_width, wxUint32 real_height)
+void Clamp16bS (unsigned char * tex, wxUint32 width, wxUint32 clamp_to, wxUint32 real_width, wxUint32 real_height)
 {
   if (real_width <= width) return;
 
-  wxUint32 dest = tex + (width << 1);
-  wxUint32 constant = dest-2;
+  unsigned char * dest = tex + (width << 1);
+  unsigned char * constant = dest-2;
   int count = clamp_to - width;
 
   int line_full = real_width << 1;
   int line = width << 1;
 
-  asmClamp16bS (dest, constant, real_height, line, line_full, count);
+  clamp16bS (dest, constant, real_height, line, line_full, count);
 }
 
 //****************************************************************
 // 16-bit Vertical Mirror
 
-void Mirror16bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
+void Mirror16bT (unsigned char * tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
 {
   if (mask == 0) return;
 
@@ -108,7 +193,7 @@ void Mirror16bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real
   if (max_height <= mask_height) return;
   int line_full = real_width << 1;
 
-  wxUint32 dst = tex + mask_height * line_full;
+  unsigned char * dst = tex + mask_height * line_full;
 
   for (wxUint32 y=mask_height; y<max_height; y++)
   {
@@ -130,7 +215,7 @@ void Mirror16bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real
 //****************************************************************
 // 16-bit Vertical Wrap
 
-void Wrap16bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
+void Wrap16bT (unsigned char * tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
 {
   if (mask == 0) return;
 
@@ -139,7 +224,7 @@ void Wrap16bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_w
   if (max_height <= mask_height) return;
   int line_full = real_width << 1;
 
-  wxUint32 dst = tex + mask_height * line_full;
+  unsigned char * dst = tex + mask_height * line_full;
 
   for (wxUint32 y=mask_height; y<max_height; y++)
   {
@@ -153,11 +238,11 @@ void Wrap16bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_w
 //****************************************************************
 // 16-bit Vertical Clamp
 
-void Clamp16bT (wxUint32 tex, wxUint32 height, wxUint32 real_width, wxUint32 clamp_to)
+void Clamp16bT (unsigned char * tex, wxUint32 height, wxUint32 real_width, wxUint32 clamp_to)
 {
   int line_full = real_width << 1;
-  wxUint32 dst = tex + height * line_full;
-  wxUint32 const_line = dst - line_full;
+  unsigned char * dst = tex + height * line_full;
+  unsigned char * const_line = dst - line_full;
 
   for (wxUint32 y=height; y<clamp_to; y++)
   {
diff --git a/Source/Glide64/MiClWr32b.h b/Source/Glide64/MiClWr32b.h
index 00df5def4..05fe29822 100644
--- a/Source/Glide64/MiClWr32b.h
+++ b/Source/Glide64/MiClWr32b.h
@@ -41,14 +41,97 @@
 //
 //****************************************************************
 
-extern "C" void asmMirror32bS (int tex, int start, int width, int height, int mask, int line, int full, int count);
-extern "C" void asmWrap32bS (int tex, int start, int height, int mask, int line, int full, int count);
-extern "C" void asmClamp32bS (int tex, int constant, int height,int line, int full, int count);
+static inline void mirror32bS(uint8_t *tex, uint8_t *start, int width, int height, int mask, int line, int full, int count)
+{
+  uint32_t *v8;
+  int v9;
+  int v10;
+
+  v8 = (uint32_t *)start;
+  v9 = height;
+  do
+  {
+    v10 = 0;
+    do
+    {
+      if ( width & (v10 + width) )
+      {
+        *v8 = *(uint32_t *)(&tex[mask] - (mask & 4 * v10));
+        ++v8;
+      }
+      else
+      {
+        *v8 = *(uint32_t *)&tex[mask & 4 * v10];
+        ++v8;
+      }
+      ++v10;
+    }
+    while ( v10 != count );
+    v8 = (uint32_t *)((char *)v8 + line);
+    tex += full;
+    --v9;
+  }
+  while ( v9 );
+}
+
+static inline void wrap32bS(uint8_t *tex, uint8_t *start, int height, int mask, int line, int full, int count)
+{
+  uint32_t *v7;
+  int v8;
+  int v9;
+
+  v7 = (uint32_t *)start;
+  v8 = height;
+  do
+  {
+    v9 = 0;
+    do
+    {
+      *v7 = *(uint32_t *)&tex[4 * (mask & v9)];
+      ++v7;
+      ++v9;
+    }
+    while ( v9 != count );
+    v7 = (uint32_t *)((char *)v7 + line);
+    tex += full;
+    --v8;
+  }
+  while ( v8 );
+}
+
+static inline void clamp32bS(uint8_t *tex, uint8_t *constant, int height, int line, int full, int count)
+{
+  uint32_t *v6;
+  uint32_t *v7;
+  int v8;
+  uint32_t v9;
+  int v10;
+
+  v6 = (uint32_t *)constant;
+  v7 = (uint32_t *)tex;
+  v8 = height;
+  do
+  {
+    v9 = *v6;
+    v10 = count;
+    do
+    {
+      *v7 = v9;
+      ++v7;
+      --v10;
+    }
+    while ( v10 );
+    v6 = (uint32_t *)((char *)v6 + full);
+    v7 = (uint32_t *)((char *)v7 + line);
+    --v8;
+  }
+  while ( v8 );
+}
 
 //****************************************************************
 // 32-bit Horizontal Mirror
 
-void Mirror32bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
+void Mirror32bS (unsigned char * tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
 {
 	if (mask == 0) return;
 
@@ -60,14 +143,14 @@ void Mirror32bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_
 	int line_full = real_width << 2;
 	int line = line_full - (count << 2);
 	if (line < 0) return;
-	wxUint32 start = tex + (mask_width << 2);
-    asmMirror32bS (tex, start, mask_width, height, mask_mask, line, line_full, count);
+	unsigned char * start = tex + (mask_width << 2);
+	mirror32bS (tex, start, mask_width, height, mask_mask, line, line_full, count);
 }
 
 //****************************************************************
 // 32-bit Horizontal Wrap 
 
-void Wrap32bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
+void Wrap32bS (unsigned char * tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
 {
 	if (mask == 0) return;
 
@@ -79,31 +162,31 @@ void Wrap32bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_wi
 	int line_full = real_width << 2;
 	int line = line_full - (count << 2);
 	if (line < 0) return;
-	wxUint32 start = tex + (mask_width << 2);
-    asmWrap32bS (tex, start, height, mask_mask, line, line_full, count);
+	unsigned char * start = tex + (mask_width << 2);
+	wrap32bS (tex, start, height, mask_mask, line, line_full, count);
 }
 
 //****************************************************************
 // 32-bit Horizontal Clamp
 
-void Clamp32bS (wxUint32 tex, wxUint32 width, wxUint32 clamp_to, wxUint32 real_width, wxUint32 real_height)
+void Clamp32bS (unsigned char * tex, wxUint32 width, wxUint32 clamp_to, wxUint32 real_width, wxUint32 real_height)
 {
 	if (real_width <= width) return;
 
-	wxUint32 dest = tex + (width << 2);
-	wxUint32 constant = dest-4;
+	unsigned char *dest = tex + (width << 2);
+	unsigned char *constant = dest-4;
+	
 	int count = clamp_to - width;
-
+	
 	int line_full = real_width << 2;
 	int line = width << 2;
-
-    asmClamp32bS (dest, constant, real_height, line, line_full, count);
+	clamp32bS (dest, constant, real_height, line, line_full, count);
 }
 
 //****************************************************************
 // 32-bit Vertical Mirror
 
-void Mirror32bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
+void Mirror32bT (unsigned char * tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
 {
 	if (mask == 0) return;
 
@@ -112,7 +195,7 @@ void Mirror32bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real
 	if (max_height <= mask_height) return;
 	int line_full = real_width << 2;
 
-	wxUint32 dst = tex + mask_height * line_full;
+	unsigned char *dst = tex + mask_height * line_full;
 
 	for (wxUint32 y=mask_height; y<max_height; y++)
 	{
@@ -134,21 +217,21 @@ void Mirror32bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real
 //****************************************************************
 // 32-bit Vertical Wrap
 
-void Wrap32bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
+void Wrap32bT (unsigned char * tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
 {
 	if (mask == 0) return;
 
 	wxUint32 mask_height = (1 << mask);
 	wxUint32 mask_mask = mask_height-1;
 	if (max_height <= mask_height) return;
-	int line_full = real_width << 2;
+  int line_full = real_width << 2;
 
-	wxUint32 dst = tex + mask_height * line_full;
+	unsigned char *dst = tex + mask_height * line_full;
 
 	for (wxUint32 y=mask_height; y<max_height; y++)
 	{
 		// not mirrored
-		memcpy ((void*)dst, (void*)(tex + (y & mask_mask) * line_full), line_full);
+		memcpy ((void*)dst, (void*)(tex + (y & mask_mask) * (line_full>>2)), (line_full>>2));
 
 		dst += line_full;
 	}
@@ -157,11 +240,11 @@ void Wrap32bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_w
 //****************************************************************
 // 32-bit Vertical Clamp
 
-void Clamp32bT (wxUint32 tex, wxUint32 height, wxUint32 real_width, wxUint32 clamp_to)
+void Clamp32bT (unsigned char * tex, wxUint32 height, wxUint32 real_width, wxUint32 clamp_to)
 {
 	int line_full = real_width << 2;
-	wxUint32 dst = tex + height * line_full;
-	wxUint32 const_line = dst - line_full;
+	unsigned char *dst = tex + height * line_full;
+	unsigned char *const_line = dst - line_full;
 
 	for (wxUint32 y=height; y<clamp_to; y++)
 	{
diff --git a/Source/Glide64/MiClWr8b.h b/Source/Glide64/MiClWr8b.h
index 03e4652ae..35beb9425 100644
--- a/Source/Glide64/MiClWr8b.h
+++ b/Source/Glide64/MiClWr8b.h
@@ -40,11 +40,87 @@
 //****************************************************************
 // 8-bit Horizontal Mirror
 
-extern "C" void asmMirror8bS (int tex, int start, int width, int height, int mask, int line, int full, int count);
-extern "C" void asmWrap8bS (int tex, int start, int height, int mask, int line, int full, int count);
-extern "C" void asmClamp8bS (int tex, int constant, int height,int line, int full, int count);
+static inline void mirror8bS(uint8_t *tex, uint8_t *start, int width, int height, int mask, int line, int full, int count)
+{
+  uint8_t *v8;
+  int v9;
+  int v10;
 
-void Mirror8bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
+  v8 = start;
+  v9 = height;
+  do
+  {
+    v10 = 0;
+    do
+    {
+      if ( width & (v10 + width) )
+        *v8++ = *(&tex[mask] - (mask & v10));
+      else
+        *v8++ = tex[mask & v10];
+      ++v10;
+    }
+    while ( v10 != count );
+    v8 += line;
+    tex += full;
+    --v9;
+  }
+  while ( v9 );
+}
+
+static inline void wrap8bS(uint8_t *tex, uint8_t *start, int height, int mask, int line, int full, int count)
+{
+  uint32_t *v7;
+  int v8;
+  int v9;
+
+  v7 = (uint32_t *)start;
+  v8 = height;
+  do
+  {
+    v9 = 0;
+    do
+    {
+      *v7 = *(uint32_t *)&tex[4 * (mask & v9)];
+      ++v7;
+      ++v9;
+    }
+    while ( v9 != count );
+    v7 = (uint32_t *)((char *)v7 + line);
+    tex += full;
+    --v8;
+  }
+  while ( v8 );
+}
+
+static inline void clamp8bS(uint8_t *tex, uint8_t *constant, int height, int line, int full, int count)
+{
+  uint8_t *v6;
+  uint8_t *v7;
+  int v8;
+  uint8_t v9;
+  int v10;
+
+  v6 = constant;
+  v7 = tex;
+  v8 = height;
+  do
+  {
+    v9 = *v6;
+    v10 = count;
+    do
+    {
+      *v7++ = v9;
+      --v10;
+    }
+    while ( v10 );
+    v6 += full;
+    v7 += line;
+    --v8;
+  }
+  while ( v8 );
+}
+
+void Mirror8bS (unsigned char * tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
 {
   if (mask == 0) return;
 
@@ -56,14 +132,15 @@ void Mirror8bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_w
   int line_full = real_width;
   int line = line_full - (count);
   if (line < 0) return;
-  wxUint32 start = tex + (mask_width);
-  asmMirror8bS (tex, start, mask_width, height, mask_mask, line, line_full, count);
+  unsigned char * start = tex + (mask_width);
+  mirror8bS (tex, start, mask_width, height, mask_mask, line, line_full, count);
 }
 
 //****************************************************************
 // 8-bit Horizontal Wrap (like mirror) ** UNTESTED **
 
-void Wrap8bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
+
+void Wrap8bS (unsigned char * tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_width, wxUint32 height)
 {
   if (mask == 0) return;
 
@@ -75,30 +152,31 @@ void Wrap8bS (wxUint32 tex, wxUint32 mask, wxUint32 max_width, wxUint32 real_wid
   int line_full = real_width;
   int line = line_full - (count << 2);
   if (line < 0) return;
-  wxUint32 start = tex + (mask_width);
-  asmWrap8bS (tex, start, height, mask_mask, line, line_full, count);
+  unsigned char * start = tex + (mask_width);
+  wrap8bS (tex, start, height, mask_mask, line, line_full, count);
 }
 
 //****************************************************************
 // 8-bit Horizontal Clamp
 
-void Clamp8bS (wxUint32 tex, wxUint32 width, wxUint32 clamp_to, wxUint32 real_width, wxUint32 real_height)
+
+void Clamp8bS (unsigned char * tex, wxUint32 width, wxUint32 clamp_to, wxUint32 real_width, wxUint32 real_height)
 {
   if (real_width <= width) return;
 
-  wxUint32 dest = tex + (width);
-  wxUint32 constant = dest-1;
+  unsigned char * dest = tex + (width);
+  unsigned char * constant = dest-1;
   int count = clamp_to - width;
 
   int line_full = real_width;
   int line = width;
-  asmClamp8bS (dest, constant, real_height, line, line_full, count);
+  clamp8bS (dest, constant, real_height, line, line_full, count);
 }
 
 //****************************************************************
 // 8-bit Vertical Mirror
 
-void Mirror8bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
+void Mirror8bT (unsigned char * tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
 {
   if (mask == 0) return;
 
@@ -107,7 +185,7 @@ void Mirror8bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_
   if (max_height <= mask_height) return;
   int line_full = real_width;
 
-  wxUint32 dst = tex + mask_height * line_full;
+  unsigned char * dst = tex + mask_height * line_full;
 
   for (wxUint32 y=mask_height; y<max_height; y++)
   {
@@ -129,7 +207,7 @@ void Mirror8bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_
 //****************************************************************
 // 8-bit Vertical Wrap
 
-void Wrap8bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
+void Wrap8bT (unsigned char * tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_width)
 {
   if (mask == 0) return;
 
@@ -138,7 +216,7 @@ void Wrap8bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_wi
   if (max_height <= mask_height) return;
   int line_full = real_width;
 
-  wxUint32 dst = tex + mask_height * line_full;
+  unsigned char * dst = tex + mask_height * line_full;
 
   for (wxUint32 y=mask_height; y<max_height; y++)
   {
@@ -152,11 +230,11 @@ void Wrap8bT (wxUint32 tex, wxUint32 mask, wxUint32 max_height, wxUint32 real_wi
 //****************************************************************
 // 8-bit Vertical Clamp
 
-void Clamp8bT (wxUint32 tex, wxUint32 height, wxUint32 real_width, wxUint32 clamp_to)
+void Clamp8bT (unsigned char * tex, wxUint32 height, wxUint32 real_width, wxUint32 clamp_to)
 {
   int line_full = real_width;
-  wxUint32 dst = tex + height * line_full;
-  wxUint32 const_line = dst - line_full;
+  unsigned char * dst = tex + height * line_full;
+  unsigned char * const_line = dst - line_full;
 
   for (wxUint32 y=height; y<clamp_to; y++)
   {
@@ -164,3 +242,4 @@ void Clamp8bT (wxUint32 tex, wxUint32 height, wxUint32 real_width, wxUint32 clam
     dst += line_full;
   }
 }
+
diff --git a/Source/Glide64/TexBuffer.cpp b/Source/Glide64/TexBuffer.cpp
index ef4582fdc..b94b65825 100644
--- a/Source/Glide64/TexBuffer.cpp
+++ b/Source/Glide64/TexBuffer.cpp
@@ -42,7 +42,7 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
 #include "TexBuffer.h"
 #include "CRC.h"
 
@@ -293,7 +293,7 @@ int OpenTextureBuffer(COLOR_IMAGE & cimage)
             grRenderBuffer( GR_BUFFER_BACKBUFFER );
             rdp.texbufs[i].count--;
             if (j < rdp.texbufs[i].count)
-              memcpy(&(rdp.texbufs[i].images[j]), &(rdp.texbufs[i].images[j+1]), sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[i].count-j));
+              memmove(&(rdp.texbufs[i].images[j]), &(rdp.texbufs[i].images[j+1]), sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[i].count-j));
           }
         }
       }
@@ -705,12 +705,7 @@ int FindTextureBuffer(wxUint32 addr, wxUint16 width)
         if (rdp.tbuff_tex->crc == 0)
         {
           rdp.tbuff_tex->crc = CalcCRC(rdp.tbuff_tex);
-          bCorrect =
-            (width == 1)
-         || (rdp.tbuff_tex->width == width)
-         || (   (rdp.tbuff_tex->width > 320)
-             && (rdp.tbuff_tex->width == (wxUint32)width*2)
-          );
+          bCorrect = width == 1 || rdp.tbuff_tex->width == width || (rdp.tbuff_tex->width > 320 && rdp.tbuff_tex->width == width*2);
         }
         else
           bCorrect = rdp.tbuff_tex->crc == CalcCRC(rdp.tbuff_tex);
@@ -727,7 +722,7 @@ int FindTextureBuffer(wxUint32 addr, wxUint16 width)
         {
           rdp.texbufs[index].count--;
           if (j < rdp.texbufs[index].count)
-            memcpy(&(rdp.texbufs[index].images[j]), &(rdp.texbufs[index].images[j+1]), sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[index].count-j));
+            memmove(&(rdp.texbufs[index].images[j]), &(rdp.texbufs[index].images[j+1]), sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[index].count-j));
         }
       }
     }
diff --git a/Source/Glide64/TexCache.cpp b/Source/Glide64/TexCache.cpp
index d401a2b06..d98f482b3 100644
--- a/Source/Glide64/TexCache.cpp
+++ b/Source/Glide64/TexCache.cpp
@@ -37,9 +37,14 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#ifndef _WIN32
+#include <SDL.h>
+#endif
+#include "Gfx_1.3.h"
+
 #include "TexCache.h"
 #include "Combine.h"
+#include "Util.h"
 
 void LoadTex (int id, int tmu);
 
@@ -147,9 +152,28 @@ void ClearCache ()
 }
 
 //****************************************************************
+uint32_t textureCRC(uint8_t *addr, int width, int height, int line)
+{
+  uint32_t crc = 0;
+  uint32_t *pixelpos;
+  unsigned int i;
+  uint64_t twopixel_crc;
+
+  pixelpos = (uint32_t*)addr;
+  for (; height; height--) {
+    for (i = width; i; --i) {
+      twopixel_crc = i * (uint64_t)(pixelpos[1] + pixelpos[0] + crc);
+      crc = (uint32_t) ((twopixel_crc >> 32) + twopixel_crc);
+      pixelpos += 2;
+    }
+    crc = ((unsigned int)height * (uint64_t)crc >> 32) + height * crc;
+    pixelpos = (uint32_t *)((char *)pixelpos + line);
+  }
+
+  return crc;
+}
 // GetTexInfo - gets information for either t0 or t1, checks if in cache & fills tex_found
 
-extern "C" int asmTextureCRC(int addr, int width, int height, int line);
 void GetTexInfo (int id, int tile)
 {
   FRDP (" | |-+ GetTexInfo (id: %d, tile: %d)\n", id, tile);
@@ -338,17 +362,17 @@ void GetTexInfo (int id, int tile)
   {
     line = (line - wid_64) << 3;
     if (wid_64 < 1) wid_64 = 1;
-    wxUIntPtr addr = wxPtrToUInt(rdp.tmem) + (rdp.tiles[tile].t_mem<<3);
+    uint8_t * addr = (((uint8_t*)rdp.tmem) + (rdp.tiles[tile].t_mem<<3));
     if (crc_height > 0) // Check the CRC
     {
       if (rdp.tiles[tile].size < 3)
-        crc = asmTextureCRC(addr, wid_64, crc_height, line);
+        crc = textureCRC(addr, wid_64, crc_height, line);
       else //32b texture
       {
         int line_2 = line >> 1;
         int wid_64_2 = max(1, wid_64 >> 1);
-        crc = asmTextureCRC(addr, wid_64_2, crc_height, line_2);
-        crc += asmTextureCRC(addr+0x800, wid_64_2, crc_height, line_2);
+        crc = textureCRC(addr, wid_64_2, crc_height, line_2);
+        crc += textureCRC(addr+0x800, wid_64_2, crc_height, line_2);
       }
     }
   }
@@ -518,11 +542,14 @@ void TexCache ()
       if (ghq_dmptex_toggle_key) {
         DisplayLoadProgress(L"Texture dump - ON\n");
         ClearCache();
-        wxThread::Sleep(1000);
       } else {
         DisplayLoadProgress(L"Texture dump - OFF\n");
-        wxThread::Sleep(1000);
       }
+#if defined(_WIN32)
+      Sleep(1000);
+#else
+      SDL_Delay(1000);
+#endif
     }
   }
 #endif
@@ -1037,8 +1064,8 @@ void LoadTex (int id, int tmu)
   cache->f_mirror_t = FALSE;
   cache->f_wrap_s = FALSE;
   cache->f_wrap_t = FALSE;
-  cache->is_hires_tex = FALSE;
 #ifdef TEXTURE_FILTER
+  cache->is_hires_tex = FALSE;
   cache->ricecrc    = texinfo[id].ricecrc;
 #endif
 
@@ -1366,11 +1393,11 @@ void LoadTex (int id, int tmu)
         wxUint32 size = HIWORD(result);
         // clamp so that it looks somewhat ok when wrapping
         if (size == 1)
-          Clamp16bT (wxPtrToUInt(texture)+start_dst, texinfo[id].height, real_x, cache->splitheight);
+          Clamp16bT ((texture)+start_dst, texinfo[id].height, real_x, cache->splitheight);
         else if (size != 2)
-          Clamp8bT (wxPtrToUInt(texture)+start_dst, texinfo[id].height, real_x, cache->splitheight);
+          Clamp8bT ((texture)+start_dst, texinfo[id].height, real_x, cache->splitheight);
         else
-          Clamp32bT (wxPtrToUInt(texture)+start_dst, texinfo[id].height, real_x, cache->splitheight);
+          Clamp32bT ((texture)+start_dst, texinfo[id].height, real_x, cache->splitheight);
       }
     }
     // ** end texture splitting **
@@ -1396,11 +1423,11 @@ void LoadTex (int id, int tmu)
       if (min_x > texinfo[id].width)
       {
         if (size == 1)
-          Clamp16bS (wxPtrToUInt(texture), texinfo[id].width, min_x, real_x, texinfo[id].height);
+          Clamp16bS ((texture), texinfo[id].width, min_x, real_x, texinfo[id].height);
         else if (size != 2)
-          Clamp8bS (wxPtrToUInt(texture), texinfo[id].width, min_x, real_x, texinfo[id].height);
+          Clamp8bS ((texture), texinfo[id].width, min_x, real_x, texinfo[id].height);
         else
-          Clamp32bS (wxPtrToUInt(texture), texinfo[id].width, min_x, real_x, texinfo[id].height);
+          Clamp32bS ((texture), texinfo[id].width, min_x, real_x, texinfo[id].height);
       }
 
       if (texinfo[id].width < (int)real_x)
@@ -1408,25 +1435,25 @@ void LoadTex (int id, int tmu)
         if (rdp.tiles[td].mirror_s)
         {
           if (size == 1)
-            Mirror16bS (wxPtrToUInt(texture), rdp.tiles[td].mask_s,
+            Mirror16bS ((texture), rdp.tiles[td].mask_s,
             real_x, real_x, texinfo[id].height);
           else if (size != 2)
-            Mirror8bS (wxPtrToUInt(texture), rdp.tiles[td].mask_s,
+            Mirror8bS ((texture), rdp.tiles[td].mask_s,
             real_x, real_x, texinfo[id].height);
           else
-            Mirror32bS (wxPtrToUInt(texture), rdp.tiles[td].mask_s,
+            Mirror32bS ((texture), rdp.tiles[td].mask_s,
             real_x, real_x, texinfo[id].height);
         }
         else
         {
           if (size == 1)
-            Wrap16bS (wxPtrToUInt(texture), rdp.tiles[td].mask_s,
+            Wrap16bS ((texture), rdp.tiles[td].mask_s,
             real_x, real_x, texinfo[id].height);
           else if (size != 2)
-            Wrap8bS (wxPtrToUInt(texture), rdp.tiles[td].mask_s,
+            Wrap8bS ((texture), rdp.tiles[td].mask_s,
             real_x, real_x, texinfo[id].height);
           else
-            Wrap32bS (wxPtrToUInt(texture), rdp.tiles[td].mask_s,
+            Wrap32bS ((texture), rdp.tiles[td].mask_s,
             real_x, real_x, texinfo[id].height);
         }
       }
@@ -1434,11 +1461,11 @@ void LoadTex (int id, int tmu)
       if (min_y > texinfo[id].height)
       {
         if (size == 1)
-          Clamp16bT (wxPtrToUInt(texture), texinfo[id].height, real_x, min_y);
+          Clamp16bT ((texture), texinfo[id].height, real_x, min_y);
         else if (size != 2)
-          Clamp8bT (wxPtrToUInt(texture), texinfo[id].height, real_x, min_y);
+          Clamp8bT ((texture), texinfo[id].height, real_x, min_y);
         else
-          Clamp32bT (wxPtrToUInt(texture), texinfo[id].height, real_x, min_y);
+          Clamp32bT ((texture), texinfo[id].height, real_x, min_y);
       }
 
       if (texinfo[id].height < (int)real_y)
@@ -1446,25 +1473,25 @@ void LoadTex (int id, int tmu)
         if (rdp.tiles[td].mirror_t)
         {
           if (size == 1)
-            Mirror16bT (wxPtrToUInt(texture), rdp.tiles[td].mask_t,
+            Mirror16bT ((texture), rdp.tiles[td].mask_t,
             real_y, real_x);
           else if (size != 2)
-            Mirror8bT (wxPtrToUInt(texture), rdp.tiles[td].mask_t,
+            Mirror8bT ((texture), rdp.tiles[td].mask_t,
             real_y, real_x);
           else
-            Mirror32bT (wxPtrToUInt(texture), rdp.tiles[td].mask_t,
+            Mirror32bT ((texture), rdp.tiles[td].mask_t,
             real_y, real_x);
         }
         else
         {
           if (size == 1)
-            Wrap16bT (wxPtrToUInt(texture), rdp.tiles[td].mask_t,
+            Wrap16bT ((texture), rdp.tiles[td].mask_t,
             real_y, real_x);
           else if (size != 2)
-            Wrap8bT (wxPtrToUInt(texture), rdp.tiles[td].mask_t,
+            Wrap8bT ((texture), rdp.tiles[td].mask_t,
             real_y, real_x);
           else
-            Wrap32bT (wxPtrToUInt(texture), rdp.tiles[td].mask_t,
+            Wrap32bT ((texture), rdp.tiles[td].mask_t,
             real_y, real_x);
         }
       }
@@ -1484,22 +1511,22 @@ void LoadTex (int id, int tmu)
       // Convert the texture to ARGB 4444
       if (LOWORD(result) == GR_TEXFMT_ARGB_1555)
       {
-        TexConv_ARGB1555_ARGB4444 (wxPtrToUInt(texture), wxPtrToUInt(tex2), real_x, real_y);
+        TexConv_ARGB1555_ARGB4444 ((texture), (tex2), real_x, real_y);
         texture = tex2;
       }
       else if (LOWORD(result) == GR_TEXFMT_ALPHA_INTENSITY_88)
       {
-        TexConv_AI88_ARGB4444 (wxPtrToUInt(texture), wxPtrToUInt(tex2), real_x, real_y);
+        TexConv_AI88_ARGB4444 ((texture), (tex2), real_x, real_y);
         texture = tex2;
       }
       else if (LOWORD(result) == GR_TEXFMT_ALPHA_INTENSITY_44)
       {
-        TexConv_AI44_ARGB4444 (wxPtrToUInt(texture), wxPtrToUInt(tex2), real_x, real_y);
+        TexConv_AI44_ARGB4444 ((texture), (tex2), real_x, real_y);
         texture = tex2;
       }
       else if (LOWORD(result) == GR_TEXFMT_ALPHA_8)
       {
-        TexConv_A8_ARGB4444 (wxPtrToUInt(texture), wxPtrToUInt(tex2), real_x, real_y);
+        TexConv_A8_ARGB4444 ((texture), (tex2), real_x, real_y);
         texture = tex2;
       }
       /*else if (LOWORD(result) == GR_TEXFMT_ARGB_4444)
diff --git a/Source/Glide64/TexConv.h b/Source/Glide64/TexConv.h
index eb910e808..6a638868f 100644
--- a/Source/Glide64/TexConv.h
+++ b/Source/Glide64/TexConv.h
@@ -37,39 +37,131 @@
 //
 //****************************************************************
 
-extern "C" void asmTexConv_ARGB1555_ARGB4444(wxUIntPtr src, wxUIntPtr dst, int size);
-extern "C" void asmTexConv_AI88_ARGB4444(wxUIntPtr src, wxUIntPtr dst, int size);
-extern "C" void asmTexConv_AI44_ARGB4444(wxUIntPtr src, wxUIntPtr dst, int size);
-extern "C" void asmTexConv_A8_ARGB4444(wxUIntPtr src, wxUIntPtr dst, int size);
+static inline void texConv_ARGB1555_ARGB4444(uint8_t *src, uint8_t *dst, int size)
+{
+  uint32_t *v3;
+  uint32_t *v4;
+  int v5;
+  uint32_t v6;
+  uint32_t v7;
 
-void TexConv_ARGB1555_ARGB4444 (wxUIntPtr src, wxUIntPtr dst, int width, int height)
+  v3 = (uint32_t *)src;
+  v4 = (uint32_t *)dst;
+  v5 = size;
+  do
+  {
+    v6 = *v3;
+    ++v3;
+    v7 = v6;
+    *v4 = ((v7 & 0x1E001E) >> 1) | ((v6 & 0x3C003C0) >> 2) | ((v6 & 0x78007800) >> 3) | ((v6 & 0x80008000) >> 3) | ((v6 & 0x80008000) >> 2) | ((v6 & 0x80008000) >> 1) | (v6 & 0x80008000);
+    ++v4;
+    --v5;
+  }
+  while ( v5 );
+}
+
+static inline void texConv_AI88_ARGB4444(uint8_t *src, uint8_t *dst, int size)
+{
+  uint32_t *v3;
+  uint32_t *v4;
+  int v5;
+  uint32_t v6;
+  uint32_t v7;
+
+  v3 = (uint32_t *)src;
+  v4 = (uint32_t *)dst;
+  v5 = size;
+  do
+  {
+    v6 = *v3;
+    ++v3;
+    v7 = v6;
+    *v4 = (16 * (v7 & 0xF000F0) >> 8) | (v7 & 0xF000F0) | (16 * (v7 & 0xF000F0)) | (v6 & 0xF000F000);
+    ++v4;
+    --v5;
+  }
+  while ( v5 );
+}
+
+static inline void texConv_AI44_ARGB4444(uint8_t *src, uint8_t *dst, int size)
+{
+  uint32_t *v3;
+  uint32_t *v4;
+  int v5;
+  uint32_t v6;
+  uint32_t *v7;
+
+  v3 = (uint32_t *)src;
+  v4 = (uint32_t *)dst;
+  v5 = size;
+  do
+  {
+    v6 = *v3;
+    ++v3;
+    *v4 = ((((uint16_t)v6 << 8) & 0xFF00 & 0xF00u) >> 8) | ((((uint16_t)v6 << 8) & 0xFF00 & 0xF00u) >> 4) | (uint16_t)(((uint16_t)v6 << 8) & 0xFF00) | (((v6 << 16) & 0xF000000) >> 8) | (((v6 << 16) & 0xF000000) >> 4) | ((v6 << 16) & 0xFF000000);
+    v7 = v4 + 1;
+    *v7 = (((v6 >> 8) & 0xF00) >> 8) | (((v6 >> 8) & 0xF00) >> 4) | ((v6 >> 8) & 0xFF00) | ((v6 & 0xF000000) >> 8) | ((v6 & 0xF000000) >> 4) | (v6 & 0xFF000000);
+    v4 = v7 + 1;
+    --v5;
+  }
+  while ( v5 );
+}
+
+static inline void texConv_A8_ARGB4444(uint8_t *src, uint8_t *dst, int size)
+{
+  uint32_t *v3;
+  uint32_t *v4;
+  int v5;
+  uint32_t v6;
+  uint32_t v7;
+  uint32_t *v8;
+
+  v3 = (uint32_t *)src;
+  v4 = (uint32_t *)dst;
+  v5 = size;
+  do
+  {
+    v6 = *v3;
+    ++v3;
+    v7 = v6;
+    *v4 = ((v6 & 0xF0) << 8 >> 12) | (uint8_t)(v6 & 0xF0) | (16 * (uint8_t)(v6 & 0xF0) & 0xFFFFFFF) | ((uint8_t)(v6 & 0xF0) << 8) | (16 * (uint16_t)(v6 & 0xF000) & 0xFFFFF) | (((uint16_t)(v6 & 0xF000) << 8) & 0xFFFFFF) | (((uint16_t)(v6 & 0xF000) << 12) & 0xFFFFFFF) | ((uint16_t)(v6 & 0xF000) << 16);
+    v8 = v4 + 1;
+    *v8 = ((v7 & 0xF00000) >> 20) | ((v7 & 0xF00000) >> 16) | ((v7 & 0xF00000) >> 12) | ((v7 & 0xF00000) >> 8) | ((v6 & 0xF0000000) >> 12) | ((v6 & 0xF0000000) >> 8) | ((v6 & 0xF0000000) >> 4) | (v6 & 0xF0000000);
+    v4 = v8 + 1;
+    --v5;
+  }
+  while ( v5 );
+}
+
+void TexConv_ARGB1555_ARGB4444 (unsigned char * src, unsigned char * dst, int width, int height)
 {
   int size = (width * height) >> 1;	// Hiroshi Morii <koolsmoky@users.sourceforge.net>
   // 2 pixels are converted in one loop
   // NOTE: width * height must be a multiple of 2
-  asmTexConv_ARGB1555_ARGB4444(src, dst, size);
+  texConv_ARGB1555_ARGB4444(src, dst, size);
 }
 
-void TexConv_AI88_ARGB4444 (wxUIntPtr src, wxUIntPtr dst, int width, int height)
+void TexConv_AI88_ARGB4444 (unsigned char * src, unsigned char * dst, int width, int height)
 {
   int size = (width * height) >> 1;	// Hiroshi Morii <koolsmoky@users.sourceforge.net>
   // 2 pixels are converted in one loop
   // NOTE: width * height must be a multiple of 2
-  asmTexConv_AI88_ARGB4444(src, dst, size);
+  texConv_AI88_ARGB4444(src, dst, size);
 }
 
-void TexConv_AI44_ARGB4444 (wxUIntPtr src, wxUIntPtr dst, int width, int height)
+void TexConv_AI44_ARGB4444 (unsigned char * src, unsigned char * dst, int width, int height)
 {
   int size = (width * height) >> 2;	// Hiroshi Morii <koolsmoky@users.sourceforge.net>
   // 4 pixels are converted in one loop
   // NOTE: width * height must be a multiple of 4
-  asmTexConv_AI44_ARGB4444(src, dst, size);
+  texConv_AI44_ARGB4444(src, dst, size);
 }
 
-void TexConv_A8_ARGB4444 (wxUIntPtr src, wxUIntPtr dst, int width, int height)
+void TexConv_A8_ARGB4444 (unsigned char * src, unsigned char * dst, int width, int height)
 {
   int size = (width * height) >> 2;	// Hiroshi Morii <koolsmoky@users.sourceforge.net>
   // 4 pixels are converted in one loop
   // NOTE: width * height must be a multiple of 4
-  asmTexConv_A8_ARGB4444(src, dst, size);
+  texConv_A8_ARGB4444(src, dst, size);
 }
+
diff --git a/Source/Glide64/TexLoad.h b/Source/Glide64/TexLoad.h
index 7220dec27..be38523ac 100644
--- a/Source/Glide64/TexLoad.h
+++ b/Source/Glide64/TexLoad.h
@@ -42,14 +42,7 @@
 #include "TexLoad16b.h"
 #include "TexLoad32b.h"
 
-wxUint32 LoadNone(
-	wxUIntPtr /*dst*/,
-	wxUIntPtr /*src*/,
-	int /*wid_64*/,
-	int /*height*/,
-	int /*line*/,
-	int /*real_width*/,
-	int /*tile*/)
+wxUint32 LoadNone(wxUIntPtr /*dst*/,wxUIntPtr /*src*/,int /*wid_64*/,int /*height*/,int /*line*/,int /*real_width*/,int /*tile*/)
 {
 	memset (texture, 0, 4096*4);
 	return (1 << 16) | GR_TEXFMT_ARGB_1555;
diff --git a/Source/Glide64/TexLoad16b.h b/Source/Glide64/TexLoad16b.h
index d9fe091b0..00a2f334b 100644
--- a/Source/Glide64/TexLoad16b.h
+++ b/Source/Glide64/TexLoad16b.h
@@ -37,8 +37,129 @@
 //
 //****************************************************************
 
-extern "C" void asmLoad16bRGBA (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext);
-extern "C" void asmLoad16bIA (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext);
+static inline void load16bRGBA(uint8_t *src, uint8_t *dst, int wid_64, int height, int line, int ext)
+{
+  uint32_t *v6;
+  uint32_t *v7;
+  int v8;
+  int v9;
+  uint32_t v10;
+  uint32_t v11;
+  uint32_t *v12;
+  uint32_t *v13;
+  int v14;
+  uint32_t v15;
+  uint32_t v16;
+  int v17;
+  int v18;
+
+  v6 = (uint32_t *)src;
+  v7 = (uint32_t *)dst;
+  v8 = height;
+  do
+  {
+    v17 = v8;
+    v9 = wid_64;
+    do
+    {
+      v10 = bswap32(*v6);
+      v11 = bswap32(v6[1]);
+      ALOWORD(v10) = __ROR__((uint16_t)v10, 1);
+      ALOWORD(v11) = __ROR__((uint16_t)v11, 1);
+      v10 = __ROR__(v10, 16);
+      v11 = __ROR__(v11, 16);
+      ALOWORD(v10) = __ROR__((uint16_t)v10, 1);
+      ALOWORD(v11) = __ROR__((uint16_t)v11, 1);
+      *v7 = v10;
+      v7[1] = v11;
+      v6 += 2;
+      v7 += 2;
+      --v9;
+    }
+    while ( v9 );
+    if ( v17 == 1 )
+      break;
+    v18 = v17 - 1;
+    v12 = (uint32_t *)&src[(line + (uintptr_t)v6 - (uintptr_t)src) & 0xFFF];
+    v13 = (uint32_t *)((char *)v7 + ext);
+    v14 = wid_64;
+    do
+    {
+      v15 = bswap32(v12[1]);
+      v16 = bswap32(*v12);
+      ALOWORD(v15) = __ROR__((uint16_t)v15, 1);
+      ALOWORD(v16) = __ROR__((uint16_t)v16, 1);
+      v15 = __ROR__(v15, 16);
+      v16 = __ROR__(v16, 16);
+      ALOWORD(v15) = __ROR__((uint16_t)v15, 1);
+      ALOWORD(v16) = __ROR__((uint16_t)v16, 1);
+      *v13 = v15;
+      v13[1] = v16;
+      v12 += 2;
+      v13 += 2;
+      --v14;
+    }
+    while ( v14 );
+    v6 = (uint32_t *)&src[(line + (uintptr_t)v12 - (uintptr_t)src) & 0xFFF];
+    v7 = (uint32_t *)((char *)v13 + ext);
+    v8 = v18 - 1;
+  }
+  while ( v18 != 1 );
+}
+
+static inline void load16bIA(uint8_t *src, uint8_t *dst, int wid_64, int height, int line, int ext)
+{
+  uint32_t *v6;
+  uint32_t *v7;
+  int v8;
+  int v9;
+  uint32_t v10;
+  uint32_t *v11;
+  uint32_t *v12;
+  int v13;
+  uint32_t v14;
+  int v15;
+  int v16;
+
+  v6 = (uint32_t *)src;
+  v7 = (uint32_t *)dst;
+  v8 = height;
+  do
+  {
+    v15 = v8;
+    v9 = wid_64;
+    do
+    {
+      v10 = v6[1];
+      *v7 = *v6;
+      v7[1] = v10;
+      v6 += 2;
+      v7 += 2;
+      --v9;
+    }
+    while ( v9 );
+    if ( v15 == 1 )
+      break;
+    v16 = v15 - 1;
+    v11 = (uint32_t *)((char *)v6 + line);
+    v12 = (uint32_t *)((char *)v7 + ext);
+    v13 = wid_64;
+    do
+    {
+      v14 = *v11;
+      *v12 = v11[1];
+      v12[1] = v14;
+      v11 += 2;
+      v12 += 2;
+      --v13;
+    }
+    while ( v13 );
+    v6 = (uint32_t *)((char *)v11 + line);
+    v7 = (uint32_t *)((char *)v12 + ext);
+    v8 = v16 - 1;
+  }
+  while ( v16 != 1 );
+}
 
 
 //****************************************************************
@@ -51,7 +172,7 @@ wxUint32 Load16bRGBA (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int
   if (height < 1) height = 1;
   int ext = (real_width - (wid_64 << 2)) << 1;
 
-  asmLoad16bRGBA(src, dst, wid_64, height, line, ext);
+  load16bRGBA((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext);
 
   return (1 << 16) | GR_TEXFMT_ARGB_1555;
 }
@@ -66,7 +187,7 @@ wxUint32 Load16bIA (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int li
   if (height < 1) height = 1;
   int ext = (real_width - (wid_64 << 2)) << 1;
 
-  asmLoad16bIA(src, dst, wid_64, height, line, ext);
+  load16bIA((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext);
 
   return (1 << 16) | GR_TEXFMT_ALPHA_INTENSITY_88;
 }
diff --git a/Source/Glide64/TexLoad4b.h b/Source/Glide64/TexLoad4b.h
index 1ed02751d..9b70874b4 100644
--- a/Source/Glide64/TexLoad4b.h
+++ b/Source/Glide64/TexLoad4b.h
@@ -37,10 +37,555 @@
 //
 //****************************************************************
 
-extern "C" void asmLoad4bCI (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext, wxUIntPtr pal);
-extern "C" void asmLoad4bIAPal (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext, wxUIntPtr pal);
-extern "C" void asmLoad4bIA (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext);
-extern "C" void asmLoad4bI (wxUIntPtr src, int dst, wxUIntPtr wid_64, int height, int line, int ext);
+static inline void load4bCI(uint8_t *src, uint8_t *dst, int wid_64, int height, uint16_t line, int ext, uint16_t *pal)
+{
+  uint8_t *v7;
+  uint8_t *v8;
+  int v9;
+  int v10;
+  int v11;
+  uint32_t v12;
+  uint8_t *v13;
+  uint32_t v14;
+  uint32_t *v15;
+  uint32_t v16;
+  uint8_t *v17;
+  uint32_t *v18;
+  int v19;
+  int v20;
+  uint32_t v21;
+  uint32_t v22;
+  uint32_t *v23;
+  uint32_t v24;
+  int v25;
+  int v26;
+
+  v7 = src;
+  v8 = dst;
+  v9 = height;
+  do
+  {
+    v25 = v9;
+    v10 = wid_64;
+    do
+    {
+      v11 = v10;
+      v12 = bswap32(*(uint32_t *)v7);
+      v13 = v7 + 4;
+      ALOWORD(v10) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 23) & 0x1E)), 1);
+      v14 = v10 << 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 27) & 0x1E)), 1);
+      *(uint32_t *)v8 = v14;
+      v15 = (uint32_t *)(v8 + 4);
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 15) & 0x1E)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 19) & 0x1E)), 1);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 7) & 0x1E)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 11) & 0x1E)), 1);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint8_t)v12 & 0x1E)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 3) & 0x1E)), 1);
+      *v15 = v14;
+      ++v15;
+      v16 = bswap32(*(uint32_t *)v13);
+      v7 = v13 + 4;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 23) & 0x1E)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 27) & 0x1E)), 1);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 15) & 0x1E)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 19) & 0x1E)), 1);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 7) & 0x1E)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 11) & 0x1E)), 1);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint8_t)v16 & 0x1E)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 3) & 0x1E)), 1);
+      *v15 = v14;
+      v8 = (uint8_t *)(v15 + 1);
+      v10 = v11 - 1;
+    }
+    while ( v11 != 1 );
+    if ( v25 == 1 )
+      break;
+    v26 = v25 - 1;
+    v17 = &src[(line + (uintptr_t)v7 - (uintptr_t)src) & 0x7FF];
+    v18 = (uint32_t *)&v8[ext];
+    v19 = wid_64;
+    do
+    {
+      v20 = v19;
+      v21 = bswap32(*((uint32_t *)v17 + 1));
+      ALOWORD(v19) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 23) & 0x1E)), 1);
+      v22 = v19 << 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 27) & 0x1E)), 1);
+      *v18 = v22;
+      v23 = v18 + 1;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 15) & 0x1E)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 19) & 0x1E)), 1);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 7) & 0x1E)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 11) & 0x1E)), 1);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint8_t)v21 & 0x1E)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 3) & 0x1E)), 1);
+      *v23 = v22;
+      ++v23;
+      v24 = bswap32(*(uint32_t *)v17);
+      v17 = &src[((uintptr_t)v17 + 8 - (uintptr_t)src) & 0x7FF];
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 23) & 0x1E)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 27) & 0x1E)), 1);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 15) & 0x1E)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 19) & 0x1E)), 1);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 7) & 0x1E)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 11) & 0x1E)), 1);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint8_t)v24 & 0x1E)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 3) & 0x1E)), 1);
+      *v23 = v22;
+      v18 = v23 + 1;
+      v19 = v20 - 1;
+    }
+    while ( v20 != 1 );
+    v7 = &src[(line + (uintptr_t)v17 - (uintptr_t)src) & 0x7FF];
+    v8 = (uint8_t *)((char *)v18 + ext);
+    v9 = v26 - 1;
+  }
+  while ( v26 != 1 );
+}
+
+static inline void load4bIAPal(uint8_t *src, uint8_t *dst, int wid_64, int height, int line, int ext, uint16_t *pal)
+{
+  uint8_t *v7;
+  uint32_t *v8;
+  int v9;
+  int v10;
+  int v11;
+  uint32_t v12;
+  uint32_t *v13;
+  uint32_t v14;
+  uint32_t *v15;
+  uint32_t v16;
+  uint8_t *v17;
+  uint32_t *v18;
+  int v19;
+  int v20;
+  uint32_t v21;
+  uint32_t v22;
+  uint32_t *v23;
+  uint32_t v24;
+  int v25;
+  int v26;
+
+  v7 = src;
+  v8 = (uint32_t *)dst;
+  v9 = height;
+  do
+  {
+    v25 = v9;
+    v10 = wid_64;
+    do
+    {
+      v11 = v10;
+      v12 = bswap32(*(uint32_t *)v7);
+      v13 = (uint32_t *)(v7 + 4);
+      ALOWORD(v10) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 23) & 0x1E)), 8);
+      v14 = v10 << 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 27) & 0x1E)), 8);
+      *v8 = v14;
+      v15 = v8 + 1;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 15) & 0x1E)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 19) & 0x1E)), 8);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 7) & 0x1E)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 11) & 0x1E)), 8);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint8_t)v12 & 0x1E)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 3) & 0x1E)), 8);
+      *v15 = v14;
+      ++v15;
+      v16 = bswap32(*v13);
+      v7 = (uint8_t *)(v13 + 1);
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 23) & 0x1E)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 27) & 0x1E)), 8);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 15) & 0x1E)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 19) & 0x1E)), 8);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 7) & 0x1E)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 11) & 0x1E)), 8);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint8_t)v16 & 0x1E)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 3) & 0x1E)), 8);
+      *v15 = v14;
+      v8 = v15 + 1;
+      v10 = v11 - 1;
+    }
+    while ( v11 != 1 );
+    if ( v25 == 1 )
+      break;
+    v26 = v25 - 1;
+    v17 = &src[(line + (uintptr_t)v7 - (uintptr_t)src) & 0x7FF];
+    v18 = (uint32_t *)((char *)v8 + ext);
+    v19 = wid_64;
+    do
+    {
+      v20 = v19;
+      v21 = bswap32(*((uint32_t *)v17 + 1));
+      ALOWORD(v19) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 23) & 0x1E)), 8);
+      v22 = v19 << 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 27) & 0x1E)), 8);
+      *v18 = v22;
+      v23 = v18 + 1;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 15) & 0x1E)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 19) & 0x1E)), 8);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 7) & 0x1E)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 11) & 0x1E)), 8);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint8_t)v21 & 0x1E)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 3) & 0x1E)), 8);
+      *v23 = v22;
+      ++v23;
+      v24 = bswap32(*(uint32_t *)v17);
+      v17 = &src[((uintptr_t)v17 + 8 - (uintptr_t)src) & 0x7FF];
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 23) & 0x1E)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 27) & 0x1E)), 8);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 15) & 0x1E)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 19) & 0x1E)), 8);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 7) & 0x1E)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 11) & 0x1E)), 8);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint8_t)v24 & 0x1E)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 3) & 0x1E)), 8);
+      *v23 = v22;
+      v18 = v23 + 1;
+      v19 = v20 - 1;
+    }
+    while ( v20 != 1 );
+    v7 = &src[(line + (uintptr_t)v17 - (uintptr_t)src) & 0x7FF];
+    v8 = (uint32_t *)((char *)v18 + ext);
+    v9 = v26 - 1;
+  }
+  while ( v26 != 1 );
+}
+
+static inline void load4bIA(uint8_t *src, uint8_t *dst, int wid_64, int height, int line, int ext)
+{
+  uint32_t *v6;
+  uint32_t *v7;
+  int v8;
+  int v9;
+  int v10;
+  uint32_t v11;
+  uint32_t *v12;
+  uint32_t v13;
+  uint32_t v14;
+  uint32_t v15;
+  uint32_t *v16;
+  uint32_t v17;
+  uint32_t v18;
+  uint32_t v19;
+  uint32_t v20;
+  uint32_t v21;
+  uint32_t v22;
+  uint32_t v23;
+  uint32_t v24;
+  uint32_t v25;
+  uint32_t v26;
+  uint32_t v27;
+  uint32_t v28;
+  uint32_t v29;
+  uint32_t v30;
+  uint32_t v31;
+  uint32_t v32;
+  uint32_t *v33;
+  uint32_t *v34;
+  int v35;
+  int v36;
+  uint32_t v37;
+  uint32_t v38;
+  uint32_t v39;
+  uint32_t *v40;
+  uint32_t v41;
+  uint32_t v42;
+  uint32_t v43;
+  uint32_t v44;
+  uint32_t v45;
+  uint32_t v46;
+  uint32_t v47;
+  uint32_t v48;
+  uint32_t v49;
+  uint32_t v50;
+  uint32_t v51;
+  uint32_t v52;
+  uint32_t v53;
+  uint32_t v54;
+  uint32_t v55;
+  uint32_t v56;
+  int v57;
+  int v58;
+
+  v6 = (uint32_t *)src;
+  v7 = (uint32_t *)dst;
+  v8 = height;
+  do
+  {
+    v57 = v8;
+    v9 = wid_64;
+    do
+    {
+      v10 = v9;
+      v11 = bswap32(*v6);
+      v12 = v6 + 1;
+      v13 = v11;
+      v14 = (8 * (v11 & 0x100000)) | (4 * (v11 & 0x100000)) | (2 * (v11 & 0x100000)) | (v11 & 0x100000) | ((((v11 >> 16) & 0xE00) >> 3) & 0x100) | ((v11 >> 16) & 0xE00) | (8 * ((v11 >> 12) & 0x1000)) | (4 * ((v11 >> 12) & 0x1000)) | (2 * ((v11 >> 12) & 0x1000)) | ((v11 >> 12) & 0x1000) | ((((v11 >> 28) & 0xE) >> 3)) | ((v11 >> 28) & 0xE) | (8 * ((v11 >> 24) & 0x10)) | (4 * ((v11 >> 24) & 0x10)) | (2 * ((v11 >> 24) & 0x10)) | ((v11 >> 24) & 0x10);
+      v11 >>= 4;
+      v11 &= 0xE0000u;
+      v15 = v11 | v14;
+      v11 >>= 3;
+      *v7 = ((((v13 << 8) & 0xE000000) >> 3) & 0x1000000) | ((v13 << 8) & 0xE000000) | (8 * ((v13 << 12) & 0x10000000)) | (4 * ((v13 << 12) & 0x10000000)) | (2 * ((v13 << 12) & 0x10000000)) | ((v13 << 12) & 0x10000000) | (v11 & 0x10000) | v15;
+      v16 = v7 + 1;
+      v17 = 16 * (uint16_t)v13 & 0x1000;
+      v18 = (((v13 & 0xE00) >> 3) & 0x100) | (v13 & 0xE00) | (8 * v17) | (4 * v17) | (2 * v17) | (v17) | ((((v13 >> 12) & 0xE) >> 3)) | ((v13 >> 12) & 0xE) | (8 * ((v13 >> 8) & 0x10)) | (4 * ((v13 >> 8) & 0x10)) | (2 * ((v13 >> 8) & 0x10)) | ((v13 >> 8) & 0x10);
+      v19 = v13 << 16;
+      v20 = (8 * (v19 & 0x100000)) | (4 * (v19 & 0x100000)) | (2 * (v19 & 0x100000)) | (v19 & 0x100000) | v18;
+      v21 = v13 << 12;
+      v21 &= 0xE0000u;
+      v22 = v21 | v20;
+      v21 >>= 3;
+      *v16 = ((((v13 << 24) & 0xE000000) >> 3) & 0x1000000) | ((v13 << 24) & 0xE000000) | (8 * ((v13 << 28) & 0x10000000)) | (4 * ((v13 << 28) & 0x10000000)) | (2 * ((v13 << 28) & 0x10000000)) | ((v13 << 28) & 0x10000000) | (v21 & 0x10000) | v22;
+      ++v16;
+      v23 = bswap32(*v12);
+      v6 = v12 + 1;
+      v24 = v23;
+      v25 = (8 * (v23 & 0x100000)) | (4 * (v23 & 0x100000)) | (2 * (v23 & 0x100000)) | (v23 & 0x100000) | ((((v23 >> 16) & 0xE00) >> 3) & 0x100) | ((v23 >> 16) & 0xE00) | (8 * ((v23 >> 12) & 0x1000)) | (4 * ((v23 >> 12) & 0x1000)) | (2 * ((v23 >> 12) & 0x1000)) | ((v23 >> 12) & 0x1000) | (((v23 >> 28) & 0xE) >> 3) | ((v23 >> 28) & 0xE) | (8 * ((v23 >> 24) & 0x10)) | (4 * ((v23 >> 24) & 0x10)) | (2 * ((v23 >> 24) & 0x10)) | ((v23 >> 24) & 0x10);
+      v23 >>= 4;
+      v23 &= 0xE0000u;
+      v26 = v23 | v25;
+      v23 >>= 3;
+      *v16 = ((((v24 << 8) & 0xE000000) >> 3) & 0x1000000) | ((v24 << 8) & 0xE000000) | (8 * ((v24 << 12) & 0x10000000)) | (4 * ((v24 << 12) & 0x10000000)) | (2 * ((v24 << 12) & 0x10000000)) | ((v24 << 12) & 0x10000000) | (v23 & 0x10000) | (v26);
+      ++v16;
+      v27 = 16 * (uint16_t)v24 & 0x1000;
+      v28 = (((v24 & 0xE00) >> 3) & 0x100) | (v24 & 0xE00) | (8 * v27) | (4 * v27) | (2 * v27) | (v27) | ((((v24 >> 12) & 0xE) >> 3)) | ((v24 >> 12) & 0xE) | (8 * ((v24 >> 8) & 0x10)) | (4 * ((v24 >> 8) & 0x10)) | (2 * ((v24 >> 8) & 0x10)) | ((v24 >> 8) & 0x10);
+      v29 = v24 << 16;
+      v30 = (8 * (v29 & 0x100000)) | (4 * (v29 & 0x100000)) | (2 * (v29 & 0x100000)) | (v29 & 0x100000) | v28;
+      v31 = v24 << 12;
+      v31 &= 0xE0000u;
+      v32 = v31 | v30;
+      v31 >>= 3;
+      *v16 = ((((v24 << 24) & 0xE000000) >> 3) & 0x1000000) | ((v24 << 24) & 0xE000000) | (8 * ((v24 << 28) & 0x10000000)) | (4 * ((v24 << 28) & 0x10000000)) | (2 * ((v24 << 28) & 0x10000000)) | ((v24 << 28) & 0x10000000) | (v31 & 0x10000) | v32;
+      v7 = v16 + 1;
+      v9 = v10 - 1;
+    }
+    while ( v10 != 1 );
+    if ( v57 == 1 )
+      break;
+    v58 = v57 - 1;
+    v33 = (uint32_t *)((char *)v6 + line);
+    v34 = (uint32_t *)((char *)v7 + ext);
+    v35 = wid_64;
+    do
+    {
+      v36 = v35;
+      v37 = bswap32(v33[1]);
+      v38 = v37 >> 4;
+      v38 &= 0xE0000u;
+      v39 = v38 | (8 * (v37 & 0x100000)) | (4 * (v37 & 0x100000)) | (2 * (v37 & 0x100000)) | (v37 & 0x100000) | ((((v37 >> 16) & 0xE00) >> 3) & 0x100) | ((v37 >> 16) & 0xE00) | (8 * ((v37 >> 12) & 0x1000)) | (4 * ((v37 >> 12) & 0x1000)) | (2 * ((v37 >> 12) & 0x1000)) | ((v37 >> 12) & 0x1000) | (((v37 >> 28) & 0xE) >> 3) | ((v37 >> 28) & 0xE) | (8 * ((v37 >> 24) & 0x10)) | (4 * ((v37 >> 24) & 0x10)) | (2 * ((v37 >> 24) & 0x10)) | ((v37 >> 24) & 0x10);
+      v38 >>= 3;
+      *v34 = ((((v37 << 8) & 0xE000000) >> 3) & 0x1000000) | ((v37 << 8) & 0xE000000) | (8 * ((v37 << 12) & 0x10000000)) | (4 * ((v37 << 12) & 0x10000000)) | (2 * ((v37 << 12) & 0x10000000)) | ((v37 << 12) & 0x10000000) | (v38 & 0x10000) | v39;
+      v40 = v34 + 1;
+      v41 = 16 * (uint16_t)v37 & 0x1000;
+      v42 = (((v37 & 0xE00) >> 3) & 0x100) | (v37 & 0xE00) | (8 * v41) | (4 * v41) | (2 * v41) | v41 | (((v37 >> 12) & 0xE) >> 3) | ((v37 >> 12) & 0xE) | (8 * ((v37 >> 8) & 0x10)) | (4 * ((v37 >> 8) & 0x10)) | (2 * ((v37 >> 8) & 0x10)) | ((v37 >> 8) & 0x10);
+      v43 = v37 << 16;
+      v44 = (8 * (v43 & 0x100000)) | (4 * (v43 & 0x100000)) | (2 * (v43 & 0x100000)) | (v43 & 0x100000) | v42;
+      v45 = v37 << 12;
+      v45 &= 0xE0000u;
+      v46 = v45 | v44;
+      v45 >>= 3;
+      *v40 = ((((v37 << 24) & 0xE000000) >> 3) & 0x1000000) | ((v37 << 24) & 0xE000000) | (8 * ((v37 << 28) & 0x10000000)) | (4 * ((v37 << 28) & 0x10000000)) | (2 * ((v37 << 28) & 0x10000000)) | ((v37 << 28) & 0x10000000) | (v45 & 0x10000) | v46;
+      ++v40;
+      v47 = bswap32(*v33);
+      v33 += 2;
+      v48 = v47;
+      v49 = (8 * (v47 & 0x100000)) | (4 * (v47 & 0x100000)) | (2 * (v47 & 0x100000)) | (v47 & 0x100000) | ((((v47 >> 16) & 0xE00) >> 3) & 0x100) | ((v47 >> 16) & 0xE00) | (8 * ((v47 >> 12) & 0x1000)) | (4 * ((v47 >> 12) & 0x1000)) | (2 * ((v47 >> 12) & 0x1000)) | ((v47 >> 12) & 0x1000) | (((v47 >> 28) & 0xE) >> 3) | ((v47 >> 28) & 0xE) | (8 * ((v47 >> 24) & 0x10)) | (4 * ((v47 >> 24) & 0x10)) | (2 * ((v47 >> 24) & 0x10)) | ((v47 >> 24) & 0x10);
+      v47 >>= 4;
+      v47 &= 0xE0000u;
+      v50 = v47 | v49;
+      v47 >>= 3;
+      *v40 = ((((v48 << 8) & 0xE000000) >> 3) & 0x1000000) | ((v48 << 8) & 0xE000000) | (8 * ((v48 << 12) & 0x10000000)) | (4 * ((v48 << 12) & 0x10000000)) | (2 * ((v48 << 12) & 0x10000000)) | ((v48 << 12) & 0x10000000) | (v47 & 0x10000) | v50;
+      ++v40;
+      v51 = 16 * (uint16_t)v48 & 0x1000;
+      v52 = (((v48 & 0xE00) >> 3) & 0x100) | (v48 & 0xE00) | (8 * v51) | (4 * v51) | (2 * v51) | v51 | (((v48 >> 12) & 0xE) >> 3) | ((v48 >> 12) & 0xE) | (8 * ((v48 >> 8) & 0x10)) | (4 * ((v48 >> 8) & 0x10)) | (2 * ((v48 >> 8) & 0x10)) | ((v48 >> 8) & 0x10);
+      v53 = v48 << 16;
+      v54 = (8 * (v53 & 0x100000)) | (4 * (v53 & 0x100000)) | (2 * (v53 & 0x100000)) | (v53 & 0x100000) | v52;
+      v55 = v48 << 12;
+      v55 &= 0xE0000u;
+      v56 = v55 | v54;
+      v55 >>= 3;
+      *v40 = ((((v48 << 24) & 0xE000000) >> 3) & 0x1000000) | ((v48 << 24) & 0xE000000) | (8 * ((v48 << 28) & 0x10000000)) | (4 * ((v48 << 28) & 0x10000000)) | (2 * ((v48 << 28) & 0x10000000)) | ((v48 << 28) & 0x10000000) | (v55 & 0x10000) | v56;
+      v34 = v40 + 1;
+      v35 = v36 - 1;
+    }
+    while ( v36 != 1 );
+    v6 = (uint32_t *)((char *)v33 + line);
+    v7 = (uint32_t *)((char *)v34 + ext);
+    v8 = v58 - 1;
+  }
+  while ( v58 != 1 );
+}
+
+static inline void load4bI(uint8_t *src, uint8_t *dst, int wid_64, int height, int line, int ext)
+{
+  uint32_t *v6;
+  uint32_t *v7;
+  int v8;
+  int v9;
+  int v10;
+  uint32_t v11;
+  uint32_t *v12;
+  uint32_t v13;
+  uint32_t v14;
+  uint32_t *v15;
+  uint32_t v16;
+  unsigned int v17;
+  unsigned int v18;
+  uint32_t v19;
+  uint32_t v20;
+  uint32_t *v21;
+  uint32_t *v22;
+  int v23;
+  int v24;
+  uint32_t v25;
+  uint32_t v26;
+  uint32_t *v27;
+  uint32_t v28;
+  uint32_t v29;
+  uint32_t v30;
+  uint32_t v31;
+  uint32_t v32;
+  int v33;
+  int v34;
+
+  v6 = (uint32_t *)src;
+  v7 = (uint32_t *)dst;
+  v8 = height;
+  do
+  {
+    v33 = v8;
+    v9 = wid_64;
+    do
+    {
+      v10 = v9;
+      v11 = bswap32(*v6);
+      v12 = v6 + 1;
+      v13 = v11;
+      v14 = (16 * ((v11 >> 16) & 0xF00)) | ((v11 >> 16) & 0xF00) | (16 * (v11 >> 28)) | (v11 >> 28);
+      v11 >>= 4;
+      *v7 = (16 * ((v13 << 8) & 0xF000000)) | ((v13 << 8) & 0xF000000) | (16 * (v11 & 0xF0000)) | (v11 & 0xF0000) | v14;
+      v15 = v7 + 1;
+      v16 = v13 << 12;
+      *v15 = (16 * ((v13 << 24) & 0xF000000)) | ((v13 << 24) & 0xF000000) | (16 * (v16 & 0xF0000)) | (v16 & 0xF0000) | (16 * (v13 & 0xF00)) | (v13 & 0xF00) | (16 * ((uint16_t)v13 >> 12)) | ((uint16_t)v13 >> 12);
+      ++v15;
+      v17 = bswap32(*v12);
+      v6 = v12 + 1;
+      v18 = v17;
+      v19 = (16 * ((v17 >> 16) & 0xF00)) | ((v17 >> 16) & 0xF00) | (16 * (v17 >> 28)) | (v17 >> 28);
+      v17 >>= 4;
+      *v15 = (16 * ((v18 << 8) & 0xF000000)) | ((v18 << 8) & 0xF000000) | (16 * (v17 & 0xF0000)) | (v17 & 0xF0000) | v19;
+      ++v15;
+      v20 = v18 << 12;
+      *v15 = (16 * ((v18 << 24) & 0xF000000)) | ((v18 << 24) & 0xF000000) | (16 * (v20 & 0xF0000)) | (v20 & 0xF0000) | (16 * (v18 & 0xF00)) | (v18 & 0xF00) | (16 * ((uint16_t)v18 >> 12)) | ((uint16_t)v18 >> 12);
+      v7 = v15 + 1;
+      v9 = v10 - 1;
+    }
+    while ( v10 != 1 );
+    if ( v33 == 1 )
+      break;
+    v34 = v33 - 1;
+    v21 = (uint32_t *)((char *)v6 + line);
+    v22 = (uint32_t *)((char *)v7 + ext);
+    v23 = wid_64;
+    do
+    {
+      v24 = v23;
+      v25 = bswap32(v21[1]);
+      v26 = v25 >> 4;
+      *v22 = (16 * ((v25 << 8) & 0xF000000)) | ((v25 << 8) & 0xF000000) | (16 * (v26 & 0xF0000)) | (v26 & 0xF0000) | (16 * ((v25 >> 16) & 0xF00)) | ((v25 >> 16) & 0xF00) | (16 * (v25 >> 28)) | (v25 >> 28);
+      v27 = v22 + 1;
+      v28 = v25 << 12;
+      *v27 = (16 * ((v25 << 24) & 0xF000000)) | ((v25 << 24) & 0xF000000) | (16 * (v28 & 0xF0000)) | (v28 & 0xF0000) | (16 * (v25 & 0xF00)) | (v25 & 0xF00) | (16 * ((uint16_t)v25 >> 12)) | ((uint16_t)v25 >> 12);
+      ++v27;
+      v29 = bswap32(*v21);
+      v21 += 2;
+      v30 = v29;
+      v31 = (16 * ((v29 >> 16) & 0xF00)) | ((v29 >> 16) & 0xF00) | (16 * (v29 >> 28)) | (v29 >> 28);
+      v29 >>= 4;
+      *v27 = (16 * ((v30 << 8) & 0xF000000)) | ((v30 << 8) & 0xF000000) | (16 * (v29 & 0xF0000)) | (v29 & 0xF0000) | v31;
+      ++v27;
+      v32 = v30 << 12;
+      *v27 = (16 * ((v30 << 24) & 0xF000000)) | ((v30 << 24) & 0xF000000) | (16 * (v32 & 0xF0000)) | (v32 & 0xF0000) | (16 * (v30 & 0xF00)) | (v30 & 0xF00) | (16 * ((uint16_t)v30 >> 12)) | ((uint16_t)v30 >> 12);
+      v22 = v27 + 1;
+      v23 = v24 - 1;
+    }
+    while ( v24 != 1 );
+    v6 = (uint32_t *)((char *)v21 + line);
+    v7 = (uint32_t *)((char *)v22 + ext);
+    v8 = v34 - 1;
+  }
+  while ( v34 != 1 );
+}
 
 //****************************************************************
 // Size: 0, Format: 2
@@ -49,24 +594,26 @@ wxUint32 Load4bCI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int lin
 {
   if (wid_64 < 1) wid_64 = 1;
   if (height < 1) height = 1;
-  int ext = (real_width - (wid_64 << 4)) << 1;
+  int ext = (real_width - (wid_64 << 4));
 
-  if (rdp.tlut_mode == 0) 
+  if (rdp.tlut_mode == 0)
   {
-    //in tlut DISABLE mode load CI texture as plain intensity texture instead of palette dereference. 
+    //in tlut DISABLE mode load CI texture as plain intensity texture instead of palette dereference.
     //Thanks to angrylion for the advice
-    asmLoad4bI (src, dst, wid_64, height, line, ext);	
+    load4bI ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext);
     return /*(0 << 16) | */GR_TEXFMT_ALPHA_INTENSITY_44;
   }
 
   wxUIntPtr pal = wxPtrToUInt(rdp.pal_8 + (rdp.tiles[tile].palette << 4));
-  if (rdp.tlut_mode == 2) 
+  if (rdp.tlut_mode == 2)
   {
-    asmLoad4bCI (src, dst, wid_64, height, line, ext, pal);
+    ext <<= 1;
+    load4bCI ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext, (uint16_t *)pal);
     return (1 << 16) | GR_TEXFMT_ARGB_1555;
   }
 
-  asmLoad4bIAPal (src, dst, wid_64, height, line, ext, pal);
+  ext <<= 1;
+  load4bIAPal ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext, (uint16_t *)pal);
   return (1 << 16) | GR_TEXFMT_ALPHA_INTENSITY_88;
 }
 
@@ -83,7 +630,7 @@ wxUint32 Load4bIA (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int lin
   if (wid_64 < 1) wid_64 = 1;
   if (height < 1) height = 1;
   int ext = (real_width - (wid_64 << 4));
-  asmLoad4bIA (src, dst, wid_64, height, line, ext);	
+  load4bIA ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext);
   return /*(0 << 16) | */GR_TEXFMT_ALPHA_INTENSITY_44;
 }
 
@@ -98,7 +645,8 @@ wxUint32 Load4bI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int line
   if (wid_64 < 1) wid_64 = 1;
   if (height < 1) height = 1;
   int ext = (real_width - (wid_64 << 4));
-  asmLoad4bI (src, dst, wid_64, height, line, ext);
+  load4bI ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext);
+  
   return /*(0 << 16) | */GR_TEXFMT_ALPHA_INTENSITY_44;
 }
 
diff --git a/Source/Glide64/TexLoad8b.h b/Source/Glide64/TexLoad8b.h
index d0477877b..64e01eb40 100644
--- a/Source/Glide64/TexLoad8b.h
+++ b/Source/Glide64/TexLoad8b.h
@@ -37,10 +37,337 @@
 //
 //****************************************************************
 
-extern "C" void asmLoad8bCI (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext, wxUIntPtr pal);
-extern "C" void asmLoad8bIA8 (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext, wxUIntPtr pal);
-extern "C" void asmLoad8bIA4 (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext);
-extern "C" void asmLoad8bI (wxUIntPtr src, int dst, wxUIntPtr wid_64, int height, int line, int ext);
+static inline void load8bCI(uint8_t *src, uint8_t *dst, int wid_64, int height, int line, int ext, uint16_t *pal)
+{
+  uint8_t *v7;
+  uint32_t *v8;
+  int v9;
+  int v10;
+  int v11;
+  uint32_t v12;
+  uint32_t *v13;
+  uint32_t v14;
+  uint32_t *v15;
+  uint32_t v16;
+  uint32_t *v17;
+  uint32_t *v18;
+  int v19;
+  int v20;
+  uint32_t v21;
+  uint32_t v22;
+  uint32_t *v23;
+  uint32_t v24;
+  int v25;
+  int v26;
+
+  v7 = src;
+  v8 = (uint32_t *)dst;
+  v9 = height;
+  do
+  {
+    v25 = v9;
+    v10 = wid_64;
+    do
+    {
+      v11 = v10;
+      v12 = bswap32(*(uint32_t *)v7);
+      v13 = (uint32_t *)(v7 + 4);
+      ALOWORD(v10) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 15) & 0x1FE)), 1);
+      v14 = v10 << 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 23) & 0x1FE)), 1);
+      *v8 = v14;
+      v15 = v8 + 1;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint16_t)v12 & 0x1FE)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 7) & 0x1FE)), 1);
+      *v15 = v14;
+      ++v15;
+      v16 = bswap32(*v13);
+      v7 = (uint8_t *)(v13 + 1);
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 15) & 0x1FE)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 23) & 0x1FE)), 1);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint16_t)v16 & 0x1FE)), 1);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 7) & 0x1FE)), 1);
+      *v15 = v14;
+      v8 = v15 + 1;
+      v10 = v11 - 1;
+    }
+    while ( v11 != 1 );
+    if ( v25 == 1 )
+      break;
+    v26 = v25 - 1;
+    v17 = (uint32_t *)&src[(line + (uintptr_t)v7 - (uintptr_t)src) & 0x7FF];
+    v18 = (uint32_t *)((char *)v8 + ext);
+    v19 = wid_64;
+    do
+    {
+      v20 = v19;
+      v21 = bswap32(v17[1]);
+      ALOWORD(v19) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 15) & 0x1FE)), 1);
+      v22 = v19 << 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 23) & 0x1FE)), 1);
+      *v18 = v22;
+      v23 = v18 + 1;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint16_t)v21 & 0x1FE)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 7) & 0x1FE)), 1);
+      *v23 = v22;
+      ++v23;
+      v24 = bswap32(*v17);
+      v17 = (uint32_t *)&src[((uintptr_t)v17 + 8 - (uintptr_t)src) & 0x7FF];
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 15) & 0x1FE)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 23) & 0x1FE)), 1);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint16_t)v24 & 0x1FE)), 1);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 7) & 0x1FE)), 1);
+      *v23 = v22;
+      v18 = v23 + 1;
+      v19 = v20 - 1;
+    }
+    while ( v20 != 1 );
+    v7 = &src[(line + (uintptr_t)v17 - (uintptr_t)src) & 0x7FF];
+    v8 = (uint32_t *)((char *)v18 + ext);
+    v9 = v26 - 1;
+  }
+  while ( v26 != 1 );
+}
+
+static inline void load8bIA8(uint8_t *src, uint8_t *dst, int wid_64, int height, int line, int ext, uint16_t *pal)
+{
+  uint32_t *v7;
+  uint32_t *v8;
+  int v9;
+  int v10;
+  int v11;
+  uint32_t v12;
+  uint32_t *v13;
+  uint32_t v14;
+  uint32_t *v15;
+  uint32_t v16;
+  uint32_t *v17;
+  uint32_t *v18;
+  int v19;
+  int v20;
+  uint32_t v21;
+  uint32_t v22;
+  uint32_t *v23;
+  uint32_t v24;
+  int v25;
+  int v26;
+
+  v7 = (uint32_t *)src;
+  v8 = (uint32_t *)dst;
+  v9 = height;
+  do
+  {
+    v25 = v9;
+    v10 = wid_64;
+    do
+    {
+      v11 = v10;
+      v12 = bswap32(*v7);
+      v13 = v7 + 1;
+      ALOWORD(v10) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 15) & 0x1FE)), 8);
+      v14 = v10 << 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 23) & 0x1FE)), 8);
+      *v8 = v14;
+      v15 = v8 + 1;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint16_t)v12 & 0x1FE)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v12 >> 7) & 0x1FE)), 8);
+      *v15 = v14;
+      ++v15;
+      v16 = bswap32(*v13);
+      v7 = v13 + 1;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 15) & 0x1FE)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 23) & 0x1FE)), 8);
+      *v15 = v14;
+      ++v15;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint16_t)v16 & 0x1FE)), 8);
+      v14 <<= 16;
+      ALOWORD(v14) = __ROR__(*(uint16_t *)((char *)pal + ((v16 >> 7) & 0x1FE)), 8);
+      *v15 = v14;
+      v8 = v15 + 1;
+      v10 = v11 - 1;
+    }
+    while ( v11 != 1 );
+    if ( v25 == 1 )
+      break;
+    v26 = v25 - 1;
+    v17 = (uint32_t *)((char *)v7 + line);
+    v18 = (uint32_t *)((char *)v8 + ext);
+    v19 = wid_64;
+    do
+    {
+      v20 = v19;
+      v21 = bswap32(v17[1]);
+      ALOWORD(v19) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 15) & 0x1FE)), 8);
+      v22 = v19 << 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 23) & 0x1FE)), 8);
+      *v18 = v22;
+      v23 = v18 + 1;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint16_t)v21 & 0x1FE)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v21 >> 7) & 0x1FE)), 8);
+      *v23 = v22;
+      ++v23;
+      v24 = bswap32(*v17);
+      v17 += 2;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 15) & 0x1FE)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 23) & 0x1FE)), 8);
+      *v23 = v22;
+      ++v23;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + (2 * (uint16_t)v24 & 0x1FE)), 8);
+      v22 <<= 16;
+      ALOWORD(v22) = __ROR__(*(uint16_t *)((char *)pal + ((v24 >> 7) & 0x1FE)), 8);
+      *v23 = v22;
+      v18 = v23 + 1;
+      v19 = v20 - 1;
+    }
+    while ( v20 != 1 );
+    v7 = (uint32_t *)((char *)v17 + line);
+    v8 = (uint32_t *)((char *)v18 + ext);
+    v9 = v26 - 1;
+  }
+  while ( v26 != 1 );
+}
+
+static inline void load8bIA4(uint8_t *src, uint8_t *dst, int wid_64, int height, int line, int ext)
+{
+  uint32_t *v6;
+  uint32_t *v7;
+  int v8;
+  int v9;
+  uint32_t v10;
+  uint32_t v11;
+  uint32_t *v12;
+  uint32_t *v13;
+  uint32_t v14;
+  uint32_t v15;
+  uint32_t *v16;
+  uint32_t *v17;
+  int v18;
+  uint32_t *v19;
+  uint32_t v20;
+  int v21;
+  int v22;
+
+  v6 = (uint32_t *)src;
+  v7 = (uint32_t *)dst;
+  v8 = height;
+  do
+  {
+    v21 = v8;
+    v9 = wid_64;
+    do
+    {
+      v10 = *v6;
+      v11 = (*v6 >> 4) & 0xF0F0F0F;
+      v12 = v6 + 1;
+      *v7 = (16 * v10 & 0xF0F0F0F0) | v11;
+      v13 = v7 + 1;
+      v14 = (*v12 >> 4) & 0xF0F0F0F;
+      v15 = 16 * *v12 & 0xF0F0F0F0;
+      v6 = v12 + 1;
+      *v13 = v15 | v14;
+      v7 = v13 + 1;
+      --v9;
+    }
+    while ( v9 );
+    if ( v21 == 1 )
+      break;
+    v22 = v21 - 1;
+    v16 = (uint32_t *)((char *)v6 + line);
+    v17 = (uint32_t *)((char *)v7 + ext);
+    v18 = wid_64;
+    do
+    {
+      *v17 = (16 * v16[1] & 0xF0F0F0F0) | ((v16[1] >> 4) & 0xF0F0F0F);
+      v19 = v17 + 1;
+      v20 = *v16;
+      v16 += 2;
+      *v19 = (16 * v20 & 0xF0F0F0F0) | ((v20 >> 4) & 0xF0F0F0F);
+      v17 = v19 + 1;
+      --v18;
+    }
+    while ( v18 );
+    v6 = (uint32_t *)((char *)v16 + line);
+    v7 = (uint32_t *)((char *)v17 + ext);
+    v8 = v22 - 1;
+  }
+  while ( v22 != 1 );
+}
+
+static inline void load8bI(uint8_t *src, uint8_t *dst, int wid_64, int height, int line, int ext)
+{
+  uint32_t *v6;
+  uint32_t *v7;
+  int v8;
+  int v9;
+  uint32_t v10;
+  uint32_t *v11;
+  uint32_t *v12;
+  uint32_t v13;
+  uint32_t *v14;
+  uint32_t *v15;
+  int v16;
+  uint32_t *v17;
+  uint32_t v18;
+  int v19;
+  int v20;
+
+  v6 = (uint32_t *)src;
+  v7 = (uint32_t *)dst;
+  v8 = height;
+  do
+  {
+    v19 = v8;
+    v9 = wid_64;
+    do
+    {
+      v10 = *v6;
+      v11 = v6 + 1;
+      *v7 = v10;
+      v12 = v7 + 1;
+      v13 = *v11;
+      v6 = v11 + 1;
+      *v12 = v13;
+      v7 = v12 + 1;
+      --v9;
+    }
+    while ( v9 );
+    if ( v19 == 1 )
+      break;
+    v20 = v19 - 1;
+    v14 = (uint32_t *)((char *)v6 + line);
+    v15 = (uint32_t *)((char *)v7 + ext);
+    v16 = wid_64;
+    do
+    {
+      *v15 = v14[1];
+      v17 = v15 + 1;
+      v18 = *v14;
+      v14 += 2;
+      *v17 = v18;
+      v15 = v17 + 1;
+      --v16;
+    }
+    while ( v16 );
+    v6 = (uint32_t *)((char *)v14 + line);
+    v7 = (uint32_t *)((char *)v15 + ext);
+    v8 = v20 - 1;
+  }
+  while ( v20 != 1 );
+}
 
 //****************************************************************
 // Size: 1, Format: 2
@@ -51,21 +378,21 @@ wxUint32 Load8bCI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int lin
   if (wid_64 < 1) wid_64 = 1;
   if (height < 1) height = 1;
   int ext = (real_width - (wid_64 << 3));
-  wxUIntPtr pal = wxPtrToUInt(rdp.pal_8);
+  unsigned short * pal = rdp.pal_8;
 
   switch (rdp.tlut_mode) {
     case 0: //palette is not used
-      //in tlut DISABLE mode load CI texture as plain intensity texture instead of palette dereference. 
+      //in tlut DISABLE mode load CI texture as plain intensity texture instead of palette dereference.
       //Thanks to angrylion for the advice
-      asmLoad8bI (src, dst, wid_64, height, line, ext);	
+      load8bI ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext);
       return /*(0 << 16) | */GR_TEXFMT_ALPHA_8;
     case 2: //color palette
       ext <<= 1;
-      asmLoad8bCI (src, dst, wid_64, height, line, ext, pal);
+      load8bCI ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext, pal);
       return (1 << 16) | GR_TEXFMT_ARGB_1555;
     default: //IA palette
       ext <<= 1;
-      asmLoad8bIA8 (src, dst, wid_64, height, line, ext, pal);
+      load8bIA8 ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext, pal);
       return (1 << 16) | GR_TEXFMT_ALPHA_INTENSITY_88;
   }
 }
@@ -74,30 +401,30 @@ wxUint32 Load8bCI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int lin
 // Size: 1, Format: 3
 //
 
-wxUint32 Load8bIA (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int line, int real_width, int tile)  
-{ 
+wxUint32 Load8bIA (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int line, int real_width, int tile)
+{
   if (rdp.tlut_mode != 0)
     return Load8bCI (dst, src, wid_64, height, line, real_width, tile);
 
-  if (wid_64 < 1) wid_64 = 1;  
-  if (height < 1) height = 1;  
-  int ext = (real_width - (wid_64 << 3));  
-  asmLoad8bIA4 (src, dst, wid_64, height, line, ext);
-  return /*(0 << 16) | */GR_TEXFMT_ALPHA_INTENSITY_44;  
+  if (wid_64 < 1) wid_64 = 1;
+  if (height < 1) height = 1;
+  int ext = (real_width - (wid_64 << 3));
+  load8bIA4 ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext);
+  return /*(0 << 16) | */GR_TEXFMT_ALPHA_INTENSITY_44;
 } 
 
 //****************************************************************
 // Size: 1, Format: 4
 //
 
-wxUint32 Load8bI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int line, int real_width, int tile)  
-{ 
+wxUint32 Load8bI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int line, int real_width, int tile)
+{
   if (rdp.tlut_mode != 0)
     return Load8bCI (dst, src, wid_64, height, line, real_width, tile);
 
-  if (wid_64 < 1) wid_64 = 1;  
-  if (height < 1) height = 1;  
-  int ext = (real_width - (wid_64 << 3));  
-  asmLoad8bI (src, dst, wid_64, height, line, ext);	
-  return /*(0 << 16) | */GR_TEXFMT_ALPHA_8;  
+  if (wid_64 < 1) wid_64 = 1;
+  if (height < 1) height = 1;
+  int ext = (real_width - (wid_64 << 3));
+  load8bI ((uint8_t *)src, (uint8_t *)dst, wid_64, height, line, ext);
+  return /*(0 << 16) | */GR_TEXFMT_ALPHA_8;
 }
diff --git a/Source/Glide64/TexMod.h b/Source/Glide64/TexMod.h
index 39563d15b..ffa79c363 100644
--- a/Source/Glide64/TexMod.h
+++ b/Source/Glide64/TexMod.h
@@ -359,14 +359,13 @@ static void mod_tex_scale_col_add_col (wxUint16 *dst, int size, wxUint32 color0,
 
 static void mod_tex_add_col (wxUint16 *dst, int size, wxUint32 color)
 {
-	wxUint32 cr, cg, cb, ca;
+	wxUint32 cr, cg, cb;
 	wxUint16 col;
 	wxUint8 a, r, g, b;
 
 	cr = (color >> 12) & 0xF;
 	cg = (color >> 8) & 0xF;
 	cb = (color >> 4) & 0xF;
-	ca = color & 0xF;
 
 	for (int i=0; i<size; i++)
 	{
@@ -540,7 +539,6 @@ static void mod_tex_mul_col (wxUint16 *dst, int size, wxUint32 color)
 	wxUint16 col;
 	wxUint8 r, g, b;
 	wxUint16 a;
-	float percent, percent_i;
 
 	cr = (float)((color >> 12) & 0xF)/16.0f;
 	cg = (float)((color >> 8) & 0xF)/16.0f;
@@ -550,8 +548,6 @@ static void mod_tex_mul_col (wxUint16 *dst, int size, wxUint32 color)
 	{
 		col = *dst;
 		a = col & 0xF000;
-		percent = (a >> 12) / 15.0f;
-		percent_i = 1.0f - percent;
 		r = (wxUint8)(cr * ((col & 0x0F00) >> 8));
 		g = (wxUint8)(cg * ((col & 0x00F0) >> 4));
 		b = (wxUint8)(cb * (col & 0x000F));
diff --git a/Source/Glide64/Texture.asm.cpp b/Source/Glide64/Texture.asm.cpp
deleted file mode 100644
index 018126f1a..000000000
--- a/Source/Glide64/Texture.asm.cpp
+++ /dev/null
@@ -1,3857 +0,0 @@
-/*
-* Glide64 - Glide video plugin for Nintendo 64 emulators.
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/****************************************************************
-
- Glide64 - Glide Plugin for Nintendo 64 emulators
- Project started on December 29th, 2001
-
- Authors:
- Dave2001, original author, founded the project in 2001, left it in 2002
- Gugaman, joined the project in 2002, left it in 2002
- Sergey 'Gonetz' Lipski, joined the project in 2002, main author since fall of 2002
- Hiroshi 'KoolSmoky' Morii, joined the project in 2007
-
-****************************************************************
-
- To modify Glide64:
- * Write your name and (optional)email, commented by your work, so I know who did it, and so that you can find which parts you modified when it comes time to send it to me.
- * Do NOT send me the whole project or file that you modified.  Take out your modified code sections, and tell me where to put them.  If people sent the whole thing, I would have many different versions, but no idea how to combine them all.
-
-****************************************************************
-*/
-
-#include "Gfx #1.3.h"
-
-/****************************************************************
-
-               ******** Textures load ********
-
-****************************************************************/
-
-
-/*****************************************************************
-4b textures load
-*****************************************************************/
-
-
-/****************************************************************
- Size: 0, Format: 2
- 2009 ported to NASM - Sergey (Gonetz) Lipski
- *****************************************************************/
-extern "C" void __declspec(naked) asmLoad4bCI (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext, wxUIntPtr pal)
-{
-	_asm {
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov ebx,[pal]
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        push ecx
-
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,23
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,27
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shr eax,15
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,19
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 3rd dword output {
-        mov eax,edx
-        shr eax,7
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,11
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 4th dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        shr edx,3
-        and edx,0x1E
-        mov cx,[ebx+edx]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,23
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,27
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shr eax,15
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,19
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 3rd dword output {
-        mov eax,edx
-        shr eax,7
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,11
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 4th dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        shr edx,3
-        and edx,0x1E
-        mov cx,[ebx+edx]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz near end_y_loop
-        push ecx
-
-        mov eax,esi
-        add eax,[line]
-        mov esi,[src]
-        sub eax,esi
-        and eax,0x7FF
-        add esi,eax
-        add edi,[ext]
-
-        mov ecx,[wid_64]
- x_loop_2:
-        push ecx
-
-        mov eax,[esi+4]         // read all 8 pixels
-        bswap eax
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,23
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,27
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shr eax,15
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,19
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 3rd dword output {
-        mov eax,edx
-        shr eax,7
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,11
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 4th dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        shr edx,3
-        and edx,0x1E
-        mov cx,[ebx+edx]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        mov edx,esi
-        add edx,8
-        mov esi,[src]
-        sub edx,esi
-        and edx,0x7FF
-        add esi,edx
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,23
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,27
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shr eax,15
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,19
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 3rd dword output {
-        mov eax,edx
-        shr eax,7
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,11
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 4th dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        shr edx,3
-        and edx,0x1E
-        mov cx,[ebx+edx]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-
-        dec ecx
-        jnz x_loop_2
-
-        mov eax,esi
-        add eax,[line]
-        mov esi,[src]
-        sub eax,esi
-        and eax,0x7FF
-        add esi,eax
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmLoad4bIAPal (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext, wxUIntPtr pal)
-{
-	_asm {
-		push ebp
-		mov ebp, esp
-		push ebx
-        push esi
-        push edi
-
-        mov ebx,[pal]
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        push ecx
-
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,23
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,27
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shr eax,15
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,19
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 3rd dword output {
-        mov eax,edx
-        shr eax,7
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,11
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 4th dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        shr edx,3
-        and edx,0x1E
-        mov cx,[ebx+edx]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,23
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,27
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shr eax,15
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,19
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 3rd dword output {
-        mov eax,edx
-        shr eax,7
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,11
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 4th dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        shr edx,3
-        and edx,0x1E
-        mov cx,[ebx+edx]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz near end_y_loop
-        push ecx
-
-        mov eax,esi
-        add eax,[line]
-        mov esi,[src]
-        sub eax,esi
-        and eax,0x7FF
-        add esi,eax
-        add edi,[ext]
-
-        mov ecx,[wid_64]
-x_loop_2:
-        push ecx
-
-        mov eax,[esi+4]         // read all 8 pixels
-        bswap eax
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,23
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,27
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shr eax,15
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,19
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 3rd dword output {
-        mov eax,edx
-        shr eax,7
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,11
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 4th dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        shr edx,3
-        and edx,0x1E
-        mov cx,[ebx+edx]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        mov edx,esi
-        add edx,8
-        mov esi,[src]
-        sub edx,esi
-        and edx,0x7FF
-        add esi,edx
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,23
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,27
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shr eax,15
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,19
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 3rd dword output {
-        mov eax,edx
-        shr eax,7
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,11
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 4th dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1E
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        shr edx,3
-        and edx,0x1E
-        mov cx,[ebx+edx]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-
-        dec ecx
-        jnz x_loop_2
-
-        mov eax,esi
-        add eax,[line]
-        mov esi,[src]
-        sub eax,esi
-        and eax,0x7FF
-        add esi,eax
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-/*****************************************************************
- Size: 0, Format: 3
-
- ** BY GUGAMAN **
- 2009 ported to NASM - Sergey (Gonetz) Lipski
-*****************************************************************/
-extern "C" void  __declspec(naked) asmLoad4bIA (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext)
-{
-	_asm {
-		push ebp
-		mov ebp, esp
-		push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        push ecx
-
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword {
-        xor ecx,ecx
-
-        // pixel #1
-        //       IIIAxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxxxxxxxxxAAAAIIII
-        mov eax,edx
-        shr eax,24 //Alpha
-        and eax,0x00000010
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,28 // Intensity
-        and eax,0x0000000E
-        or ecx,eax
-        shr eax,3
-        or ecx,eax
-
-        // pixel #2
-        //       xxxxIIIAxxxxxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxAAAAIIIIxxxxxxxx
-        mov eax,edx
-        shr eax,12 //Alpha
-        and eax,0x00001000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,16 // Intensity
-        and eax,0x00000E00
-        or ecx,eax
-        shr eax,3
-        and eax,0x00000100
-        or ecx,eax
-
-        // pixel #3
-        //       xxxxxxxxIIIAxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxAAAAIIIIxxxxxxxxxxxxxxxx
-        //Alpha
-        mov eax,edx
-        and eax,0x00100000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,4 // Intensity
-        and eax,0x000E0000
-        or ecx,eax
-        shr eax,3
-        and eax,0x00010000
-        or ecx,eax
-
-        // pixel #4
-        //       xxxxxxxxxxxxIIIAxxxxxxxxxxxxxxxx
-        //       AAAAIIIIxxxxxxxxxxxxxxxxxxxxxxxx
-        mov eax,edx
-        shl eax,12 //Alpha
-        and eax,0x10000000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,8 // Intensity
-        and eax,0x0E000000
-        or ecx,eax
-        shr eax,3
-        and eax,0x01000000
-        or ecx,eax
-
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-// 2nd dword {
-        xor ecx,ecx
-
-        // pixel #5
-        //       xxxxxxxxxxxxxxxxIIIAxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxxxxxxxxxAAAAIIII
-        mov eax,edx
-        shr eax,8 //Alpha
-        and eax,0x00000010
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,12 // Intensity
-        and eax,0x0000000E
-        or ecx,eax
-        shr eax,3
-        or ecx,eax
-
-        // pixel #6
-        //       xxxxxxxxxxxxxxxxxxxxIIIAxxxxxxxx
-        //       xxxxxxxxxxxxxxxxAAAAIIIIxxxxxxxx
-        //Alpha
-        mov eax,edx
-        shl eax,4
-        and eax,0x00001000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx     // Intensity
-        and eax,0x00000E00
-        or ecx,eax
-        shr eax,3
-        and eax,0x00000100
-        or ecx,eax
-
-        // pixel #7
-        //       xxxxxxxxxxxxxxxxxxxxxxxxIIIAxxxx
-        //       xxxxxxxxAAAAIIIIxxxxxxxxxxxxxxxx
-        //Alpha
-        mov eax,edx
-        shl eax,16
-        and eax,0x00100000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,12 // Intensity
-        and eax,0x000E0000
-        or ecx,eax
-        shr eax,3
-        and eax,0x00010000
-        or ecx,eax
-
-        // pixel #8
-        //       xxxxxxxxxxxxxxxxxxxxxxxxxxxxIIIA
-        //       AAAAIIIIxxxxxxxxxxxxxxxxxxxxxxxx
-        mov eax,edx
-        shl eax,28 //Alpha
-        and eax,0x10000000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,24 // Intensity
-        and eax,0x0E000000
-        or ecx,eax
-        shr eax,3
-        and eax,0x01000000
-        or ecx,eax
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword {
-        xor ecx,ecx
-
-        // pixel #1
-        //       IIIAxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxxxxxxxxxAAAAIIII
-        mov eax,edx
-        shr eax,24 //Alpha
-        and eax,0x00000010
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,28 // Intensity
-        and eax,0x0000000E
-        or ecx,eax
-        shr eax,3
-        or ecx,eax
-
-        // pixel #2
-        //       xxxxIIIAxxxxxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxAAAAIIIIxxxxxxxx
-        mov eax,edx
-        shr eax,12 //Alpha
-        and eax,0x00001000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,16 // Intensity
-        and eax,0x00000E00
-        or ecx,eax
-        shr eax,3
-        and eax,0x00000100
-        or ecx,eax
-
-        // pixel #3
-        //       xxxxxxxxIIIAxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxAAAAIIIIxxxxxxxxxxxxxxxx
-        //Alpha
-        mov eax,edx
-        and eax,0x00100000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,4 // Intensity
-        and eax,0x000E0000
-        or ecx,eax
-        shr eax,3
-        and eax,0x00010000
-        or ecx,eax
-
-        // pixel #4
-        //       xxxxxxxxxxxxIIIAxxxxxxxxxxxxxxxx
-        //       AAAAIIIIxxxxxxxxxxxxxxxxxxxxxxxx
-        mov eax,edx
-        shl eax,12 //Alpha
-        and eax,0x10000000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,8 // Intensity
-        and eax,0x0E000000
-        or ecx,eax
-        shr eax,3
-        and eax,0x01000000
-        or ecx,eax
-
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-// 2nd dword {
-        xor ecx,ecx
-
-        // pixel #5
-        //       xxxxxxxxxxxxxxxxIIIAxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxxxxxxxxxAAAAIIII
-        mov eax,edx
-        shr eax,8 //Alpha
-        and eax,0x00000010
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,12 // Intensity
-        and eax,0x0000000E
-        or ecx,eax
-        shr eax,3
-        or ecx,eax
-
-        // pixel #6
-        //       xxxxxxxxxxxxxxxxxxxxIIIAxxxxxxxx
-        //       xxxxxxxxxxxxxxxxAAAAIIIIxxxxxxxx
-        //Alpha
-        mov eax,edx
-        shl eax,4
-        and eax,0x00001000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx     // Intensity
-        and eax,0x00000E00
-        or ecx,eax
-        shr eax,3
-        and eax,0x00000100
-        or ecx,eax
-
-        // pixel #7
-        //       xxxxxxxxxxxxxxxxxxxxxxxxIIIAxxxx
-        //       xxxxxxxxAAAAIIIIxxxxxxxxxxxxxxxx
-        //Alpha
-        mov eax,edx
-        shl eax,16
-        and eax,0x00100000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,12 // Intensity
-        and eax,0x000E0000
-        or ecx,eax
-        shr eax,3
-        and eax,0x00010000
-        or ecx,eax
-
-        // pixel #8
-        //       xxxxxxxxxxxxxxxxxxxxxxxxxxxxIIIA
-        //       AAAAIIIIxxxxxxxxxxxxxxxxxxxxxxxx
-        mov eax,edx
-        shl eax,28 //Alpha
-        and eax,0x10000000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,24 // Intensity
-        and eax,0x0E000000
-        or ecx,eax
-        shr eax,3
-        and eax,0x01000000
-        or ecx,eax
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // *
-
-        pop ecx
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz near end_y_loop
-        push ecx
-
-        add esi,[line]
-        add edi,[ext]
-
-        mov ecx,[wid_64]
-x_loop_2:
-        push ecx
-
-        mov eax,[esi+4]         // read all 8 pixels
-        bswap eax
-        mov edx,eax
-
-        // 1st dword {
-        xor ecx,ecx
-
-        // pixel #1
-        //       IIIAxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxxxxxxxxxAAAAIIII
-        mov eax,edx
-        shr eax,24 //Alpha
-        and eax,0x00000010
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,28 // Intensity
-        and eax,0x0000000E
-        or ecx,eax
-        shr eax,3
-        or ecx,eax
-
-        // pixel #2
-        //       xxxxIIIAxxxxxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxAAAAIIIIxxxxxxxx
-        mov eax,edx
-        shr eax,12 //Alpha
-        and eax,0x00001000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,16 // Intensity
-        and eax,0x00000E00
-        or ecx,eax
-        shr eax,3
-        and eax,0x00000100
-        or ecx,eax
-
-        // pixel #3
-        //       xxxxxxxxIIIAxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxAAAAIIIIxxxxxxxxxxxxxxxx
-        //Alpha
-        mov eax,edx
-        and eax,0x00100000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,4 // Intensity
-        and eax,0x000E0000
-        or ecx,eax
-        shr eax,3
-        and eax,0x00010000
-        or ecx,eax
-
-        // pixel #4
-        //       xxxxxxxxxxxxIIIAxxxxxxxxxxxxxxxx
-        //       AAAAIIIIxxxxxxxxxxxxxxxxxxxxxxxx
-        mov eax,edx
-        shl eax,12 //Alpha
-        and eax,0x10000000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,8 // Intensity
-        and eax,0x0E000000
-        or ecx,eax
-        shr eax,3
-        and eax,0x01000000
-        or ecx,eax
-
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-// 2nd dword {
-        xor ecx,ecx
-
-        // pixel #5
-        //       xxxxxxxxxxxxxxxxIIIAxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxxxxxxxxxAAAAIIII
-        mov eax,edx
-        shr eax,8 //Alpha
-        and eax,0x00000010
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,12 // Intensity
-        and eax,0x0000000E
-        or ecx,eax
-        shr eax,3
-        or ecx,eax
-
-        // pixel #6
-        //       xxxxxxxxxxxxxxxxxxxxIIIAxxxxxxxx
-        //       xxxxxxxxxxxxxxxxAAAAIIIIxxxxxxxx
-        //Alpha
-        mov eax,edx
-        shl eax,4
-        and eax,0x00001000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx     // Intensity
-        and eax,0x00000E00
-        or ecx,eax
-        shr eax,3
-        and eax,0x00000100
-        or ecx,eax
-
-        // pixel #7
-        //       xxxxxxxxxxxxxxxxxxxxxxxxIIIAxxxx
-        //       xxxxxxxxAAAAIIIIxxxxxxxxxxxxxxxx
-        //Alpha
-        mov eax,edx
-        shl eax,16
-        and eax,0x00100000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,12 // Intensity
-        and eax,0x000E0000
-        or ecx,eax
-        shr eax,3
-        and eax,0x00010000
-        or ecx,eax
-
-        // pixel #8
-        //       xxxxxxxxxxxxxxxxxxxxxxxxxxxxIIIA
-        //       AAAAIIIIxxxxxxxxxxxxxxxxxxxxxxxx
-        mov eax,edx
-        shl eax,28 //Alpha
-        and eax,0x10000000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,24 // Intensity
-        and eax,0x0E000000
-        or ecx,eax
-        shr eax,3
-        and eax,0x01000000
-        or ecx,eax
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,8
-        mov edx,eax
-
-// 1st dword {
-        xor ecx,ecx
-
-        // pixel #1
-        //       IIIAxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxxxxxxxxxAAAAIIII
-        mov eax,edx
-        shr eax,24 //Alpha
-        and eax,0x00000010
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,28 // Intensity
-        and eax,0x0000000E
-        or ecx,eax
-        shr eax,3
-        or ecx,eax
-
-        // pixel #2
-        //       xxxxIIIAxxxxxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxAAAAIIIIxxxxxxxx
-        mov eax,edx
-        shr eax,12 //Alpha
-        and eax,0x00001000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,16 // Intensity
-        and eax,0x00000E00
-        or ecx,eax
-        shr eax,3
-        and eax,0x00000100
-        or ecx,eax
-
-        // pixel #3
-        //       xxxxxxxxIIIAxxxxxxxxxxxxxxxxxxxx
-        //       xxxxxxxxAAAAIIIIxxxxxxxxxxxxxxxx
-        //Alpha
-        mov eax,edx
-        and eax,0x00100000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,4 // Intensity
-        and eax,0x000E0000
-        or ecx,eax
-        shr eax,3
-        and eax,0x00010000
-        or ecx,eax
-
-        // pixel #4
-        //       xxxxxxxxxxxxIIIAxxxxxxxxxxxxxxxx
-        //       AAAAIIIIxxxxxxxxxxxxxxxxxxxxxxxx
-        mov eax,edx
-        shl eax,12 //Alpha
-        and eax,0x10000000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,8 // Intensity
-        and eax,0x0E000000
-        or ecx,eax
-        shr eax,3
-        and eax,0x01000000
-        or ecx,eax
-
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-// 2nd dword {
-        xor ecx,ecx
-
-        // pixel #5
-        //       xxxxxxxxxxxxxxxxIIIAxxxxxxxxxxxx
-        //       xxxxxxxxxxxxxxxxxxxxxxxxAAAAIIII
-        mov eax,edx
-        shr eax,8 //Alpha
-        and eax,0x00000010
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shr eax,12 // Intensity
-        and eax,0x0000000E
-        or ecx,eax
-        shr eax,3
-        or ecx,eax
-
-        // pixel #6
-        //       xxxxxxxxxxxxxxxxxxxxIIIAxxxxxxxx
-        //       xxxxxxxxxxxxxxxxAAAAIIIIxxxxxxxx
-        //Alpha
-        mov eax,edx
-        shl eax,4
-        and eax,0x00001000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx     // Intensity
-        and eax,0x00000E00
-        or ecx,eax
-        shr eax,3
-        and eax,0x00000100
-        or ecx,eax
-
-        // pixel #7
-        //       xxxxxxxxxxxxxxxxxxxxxxxxIIIAxxxx
-        //       xxxxxxxxAAAAIIIIxxxxxxxxxxxxxxxx
-        //Alpha
-        mov eax,edx
-        shl eax,16
-        and eax,0x00100000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,12 // Intensity
-        and eax,0x000E0000
-        or ecx,eax
-        shr eax,3
-        and eax,0x00010000
-        or ecx,eax
-
-        // pixel #8
-        //       xxxxxxxxxxxxxxxxxxxxxxxxxxxxIIIA
-        //       AAAAIIIIxxxxxxxxxxxxxxxxxxxxxxxx
-        mov eax,edx
-        shl eax,28 //Alpha
-        and eax,0x10000000
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        shl eax,1
-        or ecx,eax
-        mov eax,edx
-        shl eax,24 // Intensity
-        and eax,0x0E000000
-        or ecx,eax
-        shr eax,3
-        and eax,0x01000000
-        or ecx,eax
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-        dec ecx
-        jnz x_loop_2
-
-        add esi,[line]
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-//****************************************************************
-// Size: 0, Format: 4
-// 2009 ported to NASM - Sergey (Gonetz) Lipski
-
-extern "C" void  __declspec(naked) asmLoad4bI (wxUIntPtr src, int dst, wxUIntPtr wid_64, int height, int line, int ext)
-{
-	_asm {
-		push ebp
-		mov ebp, esp
-		push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        push ecx
-
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword {
-        xor ecx,ecx
-        shr eax,28              // 0xF0000000 -> 0x0000000F
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx             // 0x0F000000 -> 0x00000F00
-        shr eax,16
-        and eax,0x00000F00
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shr eax,4               // 0x00F00000 -> 0x000F0000
-        and eax,0x000F0000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shl eax,8               // 0x000F0000 -> 0x0F000000
-        and eax,0x0F000000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword {
-        xor ecx,ecx
-        mov eax,edx
-        shr eax,12              // 0x0000F000 -> 0x0000000F
-        and eax,0x0000000F
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx             // 0x00000F00 -> 0x00000F00
-        and eax,0x00000F00
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shl eax,12              // 0x000000F0 -> 0x000F0000
-        and eax,0x000F0000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        shl edx,24              // 0x0000000F -> 0x0F000000
-        and edx,0x0F000000
-        or ecx,edx
-        shl edx,4
-        or ecx,edx
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword {
-        xor ecx,ecx
-        shr eax,28              // 0xF0000000 -> 0x0000000F
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx             // 0x0F000000 -> 0x00000F00
-        shr eax,16
-        and eax,0x00000F00
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shr eax,4               // 0x00F00000 -> 0x000F0000
-        and eax,0x000F0000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shl eax,8               // 0x000F0000 -> 0x0F000000
-        and eax,0x0F000000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword {
-        xor ecx,ecx
-        mov eax,edx
-        shr eax,12              // 0x0000F000 -> 0x0000000F
-        and eax,0x0000000F
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx             // 0x00000F00 -> 0x00000F00
-        and eax,0x00000F00
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shl eax,12              // 0x000000F0 -> 0x000F0000
-        and eax,0x000F0000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        shl edx,24              // 0x0000000F -> 0x0F000000
-        and edx,0x0F000000
-        or ecx,edx
-        shl edx,4
-        or ecx,edx
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz near end_y_loop
-        push ecx
-
-        add esi,[line]
-        add edi,[ext]
-
-        mov ecx,[wid_64]
-x_loop_2:
-        push ecx
-
-        mov eax,[esi+4]         // read all 8 pixels
-        bswap eax
-        mov edx,eax
-
-        // 1st dword {
-        xor ecx,ecx
-        shr eax,28              // 0xF0000000 -> 0x0000000F
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx             // 0x0F000000 -> 0x00000F00
-        shr eax,16
-        and eax,0x00000F00
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shr eax,4               // 0x00F00000 -> 0x000F0000
-        and eax,0x000F0000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shl eax,8               // 0x000F0000 -> 0x0F000000
-        and eax,0x0F000000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword {
-        xor ecx,ecx
-        mov eax,edx
-        shr eax,12              // 0x0000F000 -> 0x0000000F
-        and eax,0x0000000F
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx             // 0x00000F00 -> 0x00000F00
-        and eax,0x00000F00
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shl eax,12              // 0x000000F0 -> 0x000F0000
-        and eax,0x000F0000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        shl edx,24              // 0x0000000F -> 0x0F000000
-        and edx,0x0F000000
-        or ecx,edx
-        shl edx,4
-        or ecx,edx
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 8 pixels
-        bswap eax
-        add esi,8
-        mov edx,eax
-
-        // 1st dword {
-        xor ecx,ecx
-        shr eax,28              // 0xF0000000 -> 0x0000000F
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx             // 0x0F000000 -> 0x00000F00
-        shr eax,16
-        and eax,0x00000F00
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shr eax,4               // 0x00F00000 -> 0x000F0000
-        and eax,0x000F0000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shl eax,8               // 0x000F0000 -> 0x0F000000
-        and eax,0x0F000000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword {
-        xor ecx,ecx
-        mov eax,edx
-        shr eax,12              // 0x0000F000 -> 0x0000000F
-        and eax,0x0000000F
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx             // 0x00000F00 -> 0x00000F00
-        and eax,0x00000F00
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        mov eax,edx
-        shl eax,12              // 0x000000F0 -> 0x000F0000
-        and eax,0x000F0000
-        or ecx,eax
-        shl eax,4
-        or ecx,eax
-
-        shl edx,24              // 0x0000000F -> 0x0F000000
-        and edx,0x0F000000
-        or ecx,edx
-        shl edx,4
-        or ecx,edx
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-        dec ecx
-        jnz x_loop_2
-
-        add esi,[line]
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-//****************************************************************
-//8b textures load
-//****************************************************************
-
-//****************************************************************
-// Size: 1, Format: 2
-//
-// 2008.03.29 cleaned up - H.Morii
-// 2009 ported to NASM - Sergey (Gonetz) Lipski
-
-extern "C" void  __declspec(naked) asmLoad8bCI (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext, wxUIntPtr pal)
-{
-	_asm {
-		push ebp
-		mov ebp, esp
-		push ebx
-        push esi
-        push edi
-
-        mov ebx,[pal]
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        push ecx
-
-        mov eax,[esi]           // read all 4 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,15
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,23
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        shr edx,7
-        and edx,0x1FE
-        mov cx,[ebx+edx]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 4 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,15
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,23
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        shr edx,7
-        and edx,0x1FE
-        mov cx,[ebx+edx]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz near end_y_loop
-        push ecx
-
-        mov eax,esi
-        add eax,[line]
-        mov esi,[src]
-        sub eax,esi
-        and eax,0x7FF
-        add esi,eax
-        add edi,[ext]
-
-        mov ecx,[wid_64]
-x_loop_2:
-        push ecx
-
-        mov eax,[esi+4]         // read all 4 pixels
-        bswap eax
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,15
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,23
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        shr edx,7
-        and edx,0x1FE
-        mov cx,[ebx+edx]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 4 pixels
-        bswap eax
-        mov edx,esi
-        add edx,8
-        mov esi,[src]
-        sub edx,esi
-        and edx,0x7FF
-        add esi,edx
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,15
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,23
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,1
-        shl ecx,16
-
-        shr edx,7
-        and edx,0x1FE
-        mov cx,[ebx+edx]
-        ror cx,1
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-
-        dec ecx
-        jnz x_loop_2
-
-        mov eax,esi
-        add eax,[line]
-        mov esi,[src]
-        sub eax,esi
-        and eax,0x7FF
-        add esi,eax
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmLoad8bIA8 (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext, wxUIntPtr pal)
-{
-	_asm {
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov ebx,[pal]
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        push ecx
-
-        mov eax,[esi]           // read all 4 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,15
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,23
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        shr edx,7
-        and edx,0x1FE
-        mov cx,[ebx+edx]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 4 pixels
-        bswap eax
-        add esi,4
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,15
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,23
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        shr edx,7
-        and edx,0x1FE
-        mov cx,[ebx+edx]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz near end_y_loop
-        push ecx
-
-        add esi,[line]
-        add edi,[ext]
-
-        mov ecx,[wid_64]
-x_loop_2:
-        push ecx
-
-        mov eax,[esi+4]         // read all 4 pixels
-        bswap eax
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,15
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,23
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        shr edx,7
-        and edx,0x1FE
-        mov cx,[ebx+edx]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // * copy
-        mov eax,[esi]           // read all 4 pixels
-        bswap eax
-        add esi,8
-        mov edx,eax
-
-        // 1st dword output {
-        shr eax,15
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        mov eax,edx
-        shr eax,23
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-
-        // 2nd dword output {
-        mov eax,edx
-        shl eax,1
-        and eax,0x1FE
-        mov cx,[ebx+eax]
-        ror cx,8
-        shl ecx,16
-
-        shr edx,7
-        and edx,0x1FE
-        mov cx,[ebx+edx]
-        ror cx,8
-
-        mov [edi],ecx
-        add edi,4
-        // }
-        // *
-
-        pop ecx
-
-        dec ecx
-        jnz x_loop_2
-
-        add esi,[line]
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-//****************************************************************
-// Size: 1, Format: 3
-//
-// ** by Gugaman **
-//
-// 2008.03.29 cleaned up - H.Morii
-// 2009 ported to NASM - Sergey (Gonetz) Lipski
-
-extern "C" void  __declspec(naked) asmLoad8bIA4 (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext)
-{
-	_asm {
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        mov eax,[esi] // read all 4 pixels
-        mov edx,eax
-
-        shr eax,4     //all alpha
-        shl edx,4
-        and eax,0x0F0F0F0F
-        and edx,0xF0F0F0F0
-        add esi,4
-        or eax,edx
-
-        mov [edi],eax // save dword
-        add edi,4
-
-        mov eax,[esi] // read all 4 pixels
-        mov edx,eax
-
-        shr eax,4     //all alpha
-        shl edx,4
-        and eax,0x0F0F0F0F
-        and edx,0xF0F0F0F0
-        add esi,4
-        or eax,edx
-
-        mov [edi],eax // save dword
-        add edi,4
-        // *
-
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz end_y_loop
-        push ecx
-
-        add esi,[line]
-        add edi,[ext]
-
-        mov ecx,[wid_64]
-x_loop_2:
-        mov eax,[esi+4] // read both pixels
-        mov edx,eax
-
-        shr eax,4       //all alpha
-        shl edx,4
-        and eax,0x0F0F0F0F
-        and edx,0xF0F0F0F0
-        or eax,edx
-
-        mov [edi],eax //save dword
-        add edi,4
-
-        mov eax,[esi] // read both pixels
-        add esi,8
-        mov edx,eax
-
-        shr eax,4     //all alpha
-        shl edx,4
-        and eax,0x0F0F0F0F
-        and edx,0xF0F0F0F0
-        or eax,edx
-
-        mov [edi],eax //save dword
-        add edi,4
-        // *
-
-        dec ecx
-        jnz x_loop_2
-
-        add esi,[line]
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-//****************************************************************
-// Size: 1, Format: 4
-//
-// ** by Gugaman **
-// 2009 ported to NASM - Sergey (Gonetz) Lipski
-
-extern "C" void  __declspec(naked) asmLoad8bI (wxUIntPtr src, int dst, wxUIntPtr wid_64, int height, int line, int ext)
-{
-	_asm {
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        mov eax,[esi] // read all 4 pixels
-        add esi,4
-
-        mov [edi],eax // save dword
-        add edi,4
-
-        mov eax,[esi] // read all 4 pixels
-        add esi,4
-
-        mov [edi],eax // save dword
-        add edi,4
-        // *
-
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz end_y_loop
-        push ecx
-
-        add esi,[line]
-        add edi,[ext]
-
-        mov ecx,[wid_64]
-x_loop_2:
-        mov eax,[esi+4] // read both pixels
-
-        mov [edi],eax //save dword
-        add edi,4
-
-        mov eax,[esi] // read both pixels
-        add esi,8
-
-        mov [edi],eax //save dword
-        add edi,4
-        // *
-
-        dec ecx
-        jnz x_loop_2
-
-        add esi,[line]
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-
-//****************************************************************
-//16b textures load
-//****************************************************************
-
-//****************************************************************
-// Size: 2, Format: 0
-//
-// 2008.03.29 cleaned up - H.Morii
-// 2009 ported to NASM - Sergey (Gonetz) Lipski
-
-extern "C" void __declspec(naked) asmLoad16bRGBA (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext)
-{
-	_asm {
-		align 4
-		push        ebp  
-		mov         ebp,esp 
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        mov eax,[esi]   // read both pixels
-        mov ebx,[esi+4] // read both pixels
-        bswap eax
-        bswap ebx
-
-        ror ax,1
-        ror bx,1
-        ror eax,16
-        ror ebx,16
-        ror ax,1
-        ror bx,1
-
-        mov  [edi],eax
-        mov  [edi+4],ebx
-        add esi,8
-        add edi,8
-
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz end_y_loop
-        push ecx
-
-        mov eax,esi
-        add eax,[line]
-        mov esi,[src]
-        sub eax, esi
-        and eax, 0xFFF
-        add esi, eax
-        add edi,[ext]
-
-        mov ecx,[wid_64]
-x_loop_2:
-        mov eax,[esi+4] // read both pixels
-        mov ebx,[esi]   // read both pixels
-        bswap eax
-        bswap ebx
-
-        ror ax,1
-        ror bx,1
-        ror eax,16
-        ror ebx,16
-        ror ax,1
-        ror bx,1
-
-        mov [edi],eax
-        mov [edi+4],ebx
-        add esi,8
-        add edi,8
-
-        dec ecx
-        jnz x_loop_2
-
-        mov eax,esi
-        add eax,[line]
-        mov esi,[src]
-        sub eax, esi
-        and eax, 0xFFF
-        add esi, eax
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-
-
-//****************************************************************
-// Size: 2, Format: 3
-//
-// ** by Gugaman/Dave2001 **
-//
-// 2008.03.29 cleaned up - H.Morii
-// 2009 ported to NASM - Sergey (Gonetz) Lipski
-
-extern "C" void  __declspec(naked) asmLoad16bIA (wxUIntPtr src, wxUIntPtr dst, int wid_64, int height, int line, int ext)
-{
-	_asm {
-		ALIGN 4
-
-		push ebp
-		mov ebp, esp
-		push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[height]
-y_loop:
-        push ecx
-        mov ecx,[wid_64]
-x_loop:
-        mov eax,[esi]   // read both pixels
-        mov ebx,[esi+4] // read both pixels
-        mov [edi],eax
-        mov [edi+4],ebx
-        add esi,8
-        add edi,8
-
-        dec ecx
-        jnz x_loop
-
-        pop ecx
-        dec ecx
-        jz end_y_loop
-        push ecx
-
-        add esi,[line]
-        add edi,[ext]
-
-        mov ecx,[wid_64]
-x_loop_2:
-        mov eax,[esi+4] // read both pixels
-        mov ebx,[esi]   // read both pixels
-        mov [edi],eax
-        mov [edi+4],ebx
-        add esi,8
-        add edi,8
-
-        dec ecx
-        jnz x_loop_2
-
-        add esi,[line]
-        add edi,[ext]
-
-        pop ecx
-        dec ecx
-        jnz y_loop
-
-end_y_loop:
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-//****************************************************************
-//
-//            ******** Textures mirror/clamp/wrap ********
-//
-//****************************************************************
-
-//****************************************************************
-//8b textures mirror/clamp/wrap
-//****************************************************************
-
-extern "C" void  __declspec(naked) asmMirror8bS (int tex, int start, int width, int height, int mask, int line, int full, int count)
-{
-	_asm{
-		ALIGN 4
-
-		push ebp
-		mov ebp, esp
-		push ebx
-        push esi
-        push edi
-
-        mov edi,[start]
-        mov ecx,[height]
-loop_y:
-
-        xor edx,edx
-loop_x:
-        mov esi,[tex]
-        mov ebx,[width]
-        add ebx,edx
-        and ebx,[width]
-        jnz is_mirrored
-
-        mov eax,edx
-        and eax,[mask]
-        add esi,eax
-        mov al,[esi]
-        mov [edi],al
-        inc edi
-        jmp end_mirror_check
-is_mirrored:
-        add esi,[mask]
-        mov eax,edx
-        and eax,[mask]
-        sub esi,eax
-        mov al,[esi]
-        mov [edi],al
-        inc edi
-end_mirror_check:
-
-        inc edx
-        cmp edx,[count]
-        jne loop_x
-
-        add edi,[line]
-        mov eax,[tex]
-        add eax,[full]
-        mov [tex],eax
-
-        dec ecx
-        jnz loop_y
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmWrap8bS (int tex, int start, int height, int mask, int line, int full, int count)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov edi,[start]
-        mov ecx,[height]
-loop_y:
-
-        xor edx,edx
-loop_x:
-
-        mov esi,[tex]
-        mov eax,edx
-        and eax,[mask]
-        shl eax,2
-        add esi,eax
-        mov eax,[esi]
-        mov [edi],eax
-        add edi,4
-
-        inc edx
-        cmp edx,[count]
-        jne loop_x
-
-        add edi,[line]
-        mov eax,[tex]
-        add eax,[full]
-        mov [tex],eax
-
-        dec ecx
-        jnz loop_y
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmClamp8bS (int tex, int constant, int height,int line, int full, int count)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[constant]
-        mov edi,[tex]
-
-        mov ecx,[height]
-y_loop:
-
-        mov al,[esi]
-
-        mov edx,[count]
-x_loop:
-
-        mov [edi],al            // don't unroll or make dword, it may go into next line (doesn't have to be multiple of two)
-        inc edi
-
-        dec edx
-        jnz x_loop
-
-        add esi,[full]
-        add edi,[line]
-
-        dec ecx
-        jnz y_loop
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-//****************************************************************
-//16b textures mirror/clamp/wrap
-//****************************************************************
-
-extern "C" void  __declspec(naked) asmMirror16bS (int tex, int start, int width, int height, int mask, int line, int full, int count)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov edi,[start]
-        mov ecx,[height]
-loop_y:
-
-        xor edx,edx
-loop_x:
-        mov esi,[tex]
-        mov ebx,[width]
-        add ebx,edx
-        and ebx,[width]
-        jnz is_mirrored
-
-        mov eax,edx
-        shl eax,1
-        and eax,[mask]
-        add esi,eax
-        mov ax,[esi]
-        mov [edi],ax
-        add edi,2
-        jmp end_mirror_check
-is_mirrored:
-        add esi,[mask]
-        mov eax,edx
-        shl eax,1
-        and eax,[mask]
-        sub esi,eax
-        mov ax,[esi]
-        mov [edi],ax
-        add edi,2
-end_mirror_check:
-
-        inc edx
-        cmp edx,[count]
-        jne loop_x
-
-        add edi,[line]
-        mov eax,[tex]
-        add eax,[full]
-        mov [tex],eax
-
-        dec ecx
-        jnz loop_y
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmWrap16bS (int tex, int start, int height, int mask, int line, int full, int count)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov edi,[start]
-        mov ecx,[height]
-loop_y:
-
-        xor edx,edx
-loop_x:
-
-        mov esi,[tex]
-        mov eax,edx
-        and eax,[mask]
-        shl eax,2
-        add esi,eax
-        mov eax,[esi]
-        mov [edi],eax
-        add edi,4
-
-        inc edx
-        cmp edx,[count]
-        jne loop_x
-
-        add edi,[line]
-        mov eax,[tex]
-        add eax,[full]
-        mov [tex],eax
-
-        dec ecx
-        jnz loop_y
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmClamp16bS (int tex, int constant, int height,int line, int full, int count)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[constant]
-        mov edi,[tex]
-
-        mov ecx,[height]
-y_loop:
-
-        mov ax,[esi]
-
-        mov edx,[count]
-x_loop:
-
-        mov [edi],ax            // don't unroll or make dword, it may go into next line (doesn't have to be multiple of two)
-        add edi,2
-
-        dec edx
-        jnz x_loop
-
-        add esi,[full]
-        add edi,[line]
-
-        dec ecx
-        jnz y_loop
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-//****************************************************************
-//32b textures mirror/clamp/wrap
-//****************************************************************
-
-extern "C" void  __declspec(naked) asmMirror32bS (int tex, int start, int width, int height, int mask, int line, int full, int count)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov edi,[start]
-        mov ecx,[height]
-loop_y:
-
-        xor edx,edx
-loop_x:
-        mov esi,[tex]
-        mov ebx,[width]
-        add ebx,edx
-        and ebx,[width]
-        jnz is_mirrored
-
-        mov eax,edx
-        shl eax,2
-        and eax,[mask]
-        add esi,eax
-        mov eax,[esi]
-        mov [edi],eax
-        add edi,4
-        jmp end_mirror_check
-is_mirrored:
-        add esi,[mask]
-        mov eax,edx
-        shl eax,2
-        and eax,[mask]
-        sub esi,eax
-        mov eax,[esi]
-        mov [edi],eax
-        add edi,4
-end_mirror_check:
-
-        inc edx
-        cmp edx,[count]
-        jne loop_x
-
-        add edi,[line]
-        mov eax,[tex]
-        add eax,[full]
-        mov [tex],eax
-
-        dec ecx
-        jnz loop_y
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmWrap32bS (int tex, int start, int height, int mask, int line, int full, int count)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov edi,[start]
-        mov ecx,[height]
-loop_y:
-
-        xor edx,edx
-loop_x:
-
-        mov esi,[tex]
-        mov eax,edx
-        and eax,[mask]
-        shl eax,2
-        add esi,eax
-        mov eax,[esi]
-        mov [edi],eax
-        add edi,4
-
-        inc edx
-        cmp edx,[count]
-        jne loop_x
-
-        add edi,[line]
-        mov eax,[tex]
-        add eax,[full]
-        mov [tex],eax
-
-        dec ecx
-        jnz loop_y
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmClamp32bS (int tex, int constant, int height,int line, int full, int count)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[constant]
-        mov edi,[tex]
-
-        mov ecx,[height]
-y_loop:
-
-        mov eax,[esi]
-
-        mov edx,[count]
-x_loop:
-
-        mov [edi],eax           // don't unroll or make dword, it may go into next line (doesn't have to be multiple of two)
-        add edi,4
-
-        dec edx
-        jnz x_loop
-
-        add esi,[full]
-        add edi,[line]
-
-        dec ecx
-        jnz y_loop
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-//****************************************************************
-//
-//             ******** Textures conversion ********
-//
-//****************************************************************
-
-extern "C" void  __declspec(naked) asmTexConv_ARGB1555_ARGB4444(wxUIntPtr src, wxUIntPtr dst, int isize)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[isize]
-
-tc1_loop:
-        mov eax,[esi]
-        add esi,4
-
-        // arrr rrgg gggb bbbb
-        // aaaa rrrr gggg bbbb
-        mov edx,eax
-        and eax,0x80008000
-        mov ebx,eax                             // ebx = 0xa000000000000000
-        shr eax,1
-        or ebx,eax                              // ebx = 0xaa00000000000000
-        shr eax,1
-        or ebx,eax                              // ebx = 0xaaa0000000000000
-        shr eax,1
-        or ebx,eax                              // ebx = 0xaaaa000000000000
-
-        mov eax,edx
-        and eax,0x78007800              // eax = 0x0rrrr00000000000
-        shr eax,3                               // eax = 0x0000rrrr00000000
-        or ebx,eax                              // ebx = 0xaaaarrrr00000000
-
-        mov eax,edx
-        and eax,0x03c003c0              // eax = 0x000000gggg000000
-        shr eax,2                               // eax = 0x00000000gggg0000
-        or ebx,eax                              // ebx = 0xaaaarrrrgggg0000
-
-        and edx,0x001e001e              // edx = 0x00000000000bbbb0
-        shr edx,1                               // edx = 0x000000000000bbbb
-        or ebx,edx                              // ebx = 0xaaaarrrrggggbbbb
-
-        mov [edi],ebx
-        add edi,4
-
-        dec ecx
-        jnz tc1_loop
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmTexConv_AI88_ARGB4444(wxUIntPtr src, wxUIntPtr dst, int isize)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[isize]
-
-tc1_loop:
-        mov eax,[esi]
-        add esi,4
-
-        // aaaa aaaa iiii iiii
-        // aaaa rrrr gggg bbbb
-        mov edx,eax
-        and eax,0xF000F000              // eax = 0xaaaa000000000000
-        mov ebx,eax                             // ebx = 0xaaaa000000000000
-
-        and edx,0x00F000F0              // edx = 0x00000000iiii0000
-        shl edx,4                               // edx = 0x0000iiii00000000
-        or ebx,edx                              // ebx = 0xaaaaiiii00000000
-        shr edx,4                               // edx = 0x00000000iiii0000
-        or ebx,edx                              // ebx = 0xaaaaiiiiiiii0000
-        shr edx,4                               // edx = 0x000000000000iiii
-        or ebx,edx                              // ebx = 0xaaaaiiiiiiiiiiii
-
-        mov [edi],ebx
-        add edi,4
-
-        dec ecx
-        jnz tc1_loop
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmTexConv_AI44_ARGB4444(wxUIntPtr src, wxUIntPtr dst, int isize)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[isize]
-
-tc1_loop:
-        mov eax,[esi]
-        add esi,4
-
-        // aaaa3 iiii3 aaaa2 iiii2 aaaa1 iiii1 aaaa0 iiii0
-        // aaaa1 rrrr1 gggg1 bbbb1 aaaa0 rrrr0 gggg0 bbbb0
-        // aaaa3 rrrr3 gggg3 bbbb3 aaaa2 rrrr2 gggg2 bbbb2
-        mov edx,eax                             // eax = aaaa3 iiii3 aaaa2 iiii2 aaaa1 iiii1 aaaa0 iiii0
-        shl eax,16                              // eax = aaaa1 iiii1 aaaa0 iiii0 0000  0000  0000  0000
-        and eax,0xFF000000              // eax = aaaa1 iiii1 0000  0000  0000  0000  0000  0000
-        mov ebx,eax                             // ebx = aaaa1 iiii1 0000  0000  0000  0000  0000  0000
-        and eax,0x0F000000              // eax = 0000  iiii1 0000  0000  0000  0000  0000  0000
-        shr eax,4                               // eax = 0000  0000  iiii1 0000  0000  0000  0000  0000
-        or ebx,eax                              // ebx = aaaa1 iiii1 iiii1 0000  0000  0000  0000  0000
-        shr eax,4                               // eax = 0000  0000  0000  iiii1 0000  0000  0000  0000
-        or ebx,eax                              // ebx = aaaa1 iiii1 iiii1 iiii1 0000  0000  0000  0000
-
-        mov eax,edx                             // eax = aaaa3 iiii3 aaaa2 iiii2 aaaa1 iiii1 aaaa0 iiii0
-        shl eax,8                               // eax = aaaa2 iiii2 aaaa1 iiii1 aaaa0 iiii0 0000  0000
-        and eax,0x0000FF00              // eax = 0000  0000  0000  0000  aaaa0 iiii0 0000  0000
-        or ebx,eax                              // ebx = aaaa1 iiii1 iiii1 iiii1 aaaa0 iiii0 0000  0000
-        and eax,0x00000F00              // eax = 0000  0000  0000  0000  0000  iiii0 0000  0000
-        shr eax,4                               // eax = 0000  0000  0000  0000  0000  0000  iiii0 0000
-        or ebx,eax                              // ebx = aaaa1 iiii1 iiii1 iiii1 aaaa0 iiii0 iiii0 0000
-        shr eax,4                               // eax = 0000  0000  0000  0000  0000  0000  0000  iiii0
-        or ebx,eax                              // ebx = aaaa1 iiii1 iiii1 iiii1 aaaa0 iiii0 iiii0 iiii0
-
-        mov [edi],ebx
-        add edi,4
-
-        mov eax,edx                             // eax = aaaa3 iiii3 aaaa2 iiii2 aaaa1 iiii1 aaaa0 iiii0
-        and eax,0xFF000000              // eax = aaaa3 iiii3 0000  0000  0000  0000  0000  0000
-        mov ebx,eax                             // ebx = aaaa3 iiii3 0000  0000  0000  0000  0000  0000
-        and eax,0x0F000000              // eax = 0000  iiii3 0000  0000  0000  0000  0000  0000
-        shr eax,4                               // eax = 0000  0000  iiii3 0000  0000  0000  0000  0000
-        or ebx,eax                              // ebx = aaaa3 iiii3 iiii3 0000  0000  0000  0000  0000
-        shr eax,4                               // eax = 0000  0000  0000  iiii3 0000  0000  0000  0000
-        or ebx,eax                              // ebx = aaaa3 iiii3 iiii3 iiii3 0000  0000  0000  0000
-
-                                                        // edx = aaaa3 iiii3 aaaa2 iiii2 aaaa1 iiii1 aaaa0 iiii0
-        shr edx,8                               // edx = 0000  0000  aaaa3 aaaa3 aaaa2 iiii2 aaaa1 iiii1
-        and edx,0x0000FF00              // edx = 0000  0000  0000  0000  aaaa2 iiii2 0000  0000
-        or ebx,edx                              // ebx = aaaa3 iiii3 iiii3 iiii3 aaaa2 iiii2 0000  0000
-        and edx,0x00000F00              // edx = 0000  0000  0000  0000  0000  iiii2 0000  0000
-        shr edx,4                               // edx = 0000  0000  0000  0000  0000  0000  iiii2 0000
-        or ebx,edx                              // ebx = aaaa3 iiii3 iiii3 iiii3 aaaa2 iiii2 iiii2 0000
-        shr edx,4                               // edx = 0000  0000  0000  0000  0000  0000  0000  iiii2
-        or ebx,edx                              // ebx = aaaa3 iiii3 iiii3 iiii3 aaaa2 iiii2 iiii2 iiii2
-
-        mov [edi],ebx
-        add edi,4
-
-        dec ecx
-        jnz tc1_loop
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" void  __declspec(naked) asmTexConv_A8_ARGB4444(wxUIntPtr src, wxUIntPtr dst, int isize)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push ebx
-        push esi
-        push edi
-
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[isize]
-
-tc1_loop:
-        mov eax,[esi]
-        add esi,4
-
-        // aaaa3 aaaa3 aaaa2 aaaa2 aaaa1 aaaa1 aaaa0 aaaa0
-        // aaaa1 rrrr1 gggg1 bbbb1 aaaa0 rrrr0 gggg0 bbbb0
-        // aaaa3 rrrr3 gggg3 bbbb3 aaaa2 rrrr2 gggg2 bbbb2
-        mov edx,eax
-        and eax,0x0000F000              // eax = 00 00 00 00 a1 00 00 00
-        shl eax,16                              // eax = a1 00 00 00 00 00 00 00
-        mov ebx,eax                             // ebx = a1 00 00 00 00 00 00 00
-        shr eax,4
-        or ebx,eax                              // ebx = a1 a1 00 00 00 00 00 00
-        shr eax,4
-        or ebx,eax                              // ebx = a1 a1 a1 00 00 00 00 00
-        shr eax,4
-        or ebx,eax                              // ebx = a1 a1 a1 a1 00 00 00 00
-
-        mov eax,edx
-        and eax,0x000000F0              // eax = 00 00 00 00 00 00 a0 00
-        shl eax,8                               // eax = 00 00 00 00 a0 00 00 00
-        or ebx,eax
-        shr eax,4
-        or ebx,eax
-        shr eax,4
-        or ebx,eax
-        shr eax,4
-        or ebx,eax                              // ebx = a1 a1 a1 a1 a0 a0 a0 a0
-
-        mov [edi],ebx
-        add edi,4
-
-        mov eax,edx                             // eax = a3 a3 a2 a2 a1 a1 a0 a0
-        and eax,0xF0000000              // eax = a3 00 00 00 00 00 00 00
-        mov ebx,eax                             // ebx = a3 00 00 00 00 00 00 00
-        shr eax,4
-        or ebx,eax                              // ebx = a3 a3 00 00 00 00 00 00
-        shr eax,4
-        or ebx,eax                              // ebx = a3 a3 a3 00 00 00 00 00
-        shr eax,4
-        or ebx,eax                              // ebx = a3 a3 a3 a3 00 00 00 00
-
-        and edx,0x00F00000              // eax = 00 00 a2 00 00 00 00 00
-        shr edx,8                               // eax = 00 00 00 00 a2 00 00 00
-        or ebx,edx
-        shr edx,4
-        or ebx,edx
-        shr edx,4
-        or ebx,edx
-        shr edx,4
-        or ebx,edx                              // ebx = a3 a3 a3 a3 a2 a2 a2 a2
-
-        mov [edi],ebx
-        add edi,4
-
-        dec ecx
-        jnz tc1_loop
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-//****************************************************************
-//
-//                ******** Tmem functions ********
-//
-//****************************************************************
-
-//****************************************************************
-// CopyBlock - copies a block from base_addr+offset to dest_addr, while unswapping the
-//  data within.
-//
-// edi = dest_addr -> end of dest
-// ecx = num_words
-// esi = base_addr (preserved)
-// edx = offset (preserved)
-//****************************************************************
-void __declspec(naked) CopyBlock ( void )
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push eax
-        push ebx
-        push esi
-        push edx
-
-        or ecx,ecx
-        jz near copyblock_end
-
-        push ecx
-
-        // first, set the source address and check if not on a dword boundary
-        push esi
-        push edx
-        mov ebx,edx
-        and edx,0FFFFFFFCh
-        add esi,edx
-
-        and ebx,3                               // ebx = # we DON'T need to copy
-        jz copyblock_copy
-
-        mov edx,4                               // ecx = # we DO need to copy
-        sub edx,ebx
-
-        // load the first word, accounting for swapping
-
-        mov eax,[esi]
-        add esi,4
-copyblock_precopy_skip:
-        rol eax,8
-        dec ebx
-        jnz copyblock_precopy_skip
-
-copyblock_precopy_copy:
-        rol eax,8
-        mov [edi],al
-        inc edi
-        dec edx
-        jnz copyblock_precopy_copy
-
-        mov eax,[esi]
-        add esi,4
-        bswap eax
-        mov [edi],eax
-        add edi,4
-
-        dec ecx         // 1 less word to copy
-        jz copyblock_postcopy
-
-copyblock_copy:
-        mov eax,[esi]
-        bswap eax
-        mov [edi],eax
-
-        mov eax,[esi+4]
-        bswap eax
-        mov [edi+4],eax
-
-        add esi,8
-        add edi,8
-
-        dec ecx
-        jnz copyblock_copy
-
-copyblock_postcopy:
-        pop edx
-        pop esi
-        pop ecx
-
-        // check again if on dword boundary
-        mov ebx,edx     // ebx = # we DO need to copy
-
-        and ebx,3
-        jz copyblock_end
-
-        shl ecx,3       // ecx = num_words * 8
-        add edx,ecx
-        and edx,0FFFFFFFCh
-        add esi,edx
-
-        mov eax,[esi]
-
-copyblock_postcopy_copy:
-        rol eax,8
-        mov [edi],al
-        inc edi
-        dec ebx
-        jnz copyblock_postcopy_copy
-
-copyblock_end:
-        pop edx
-        pop esi
-        pop ebx
-        pop eax
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" __declspec(naked) void SwapBlock32 ( void )
-{
-//****************************************************************
-// SwapBlock - swaps every other 32-bit word at addr
-//
-// ecx = num_words -> 0
-// edi = addr -> end of dest
-//****************************************************************
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-        push eax
-        push ebx
-        or ecx,ecx
-        jz swapblock32_end
-swapblock32_loop:
-        mov eax,[edi]
-        mov ebx,[edi+4]
-        mov [edi],ebx
-        mov [edi+4],eax
-        add edi,8
-        dec ecx
-        jnz swapblock32_loop
-swapblock32_end:
-        pop ebx
-        pop eax
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-//****************************************************************
-//
-//               ******** Load block/tile ********
-//
-//****************************************************************
-
-extern "C" __declspec(naked) void asmLoadBlock(int src, int dst, int off, int dxt, int cnt, wxUIntPtr swp)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-
-        push ebx
-        push esi
-        push edi
-
-        // copy the data
-        mov esi,[src]
-        mov edi,[dst]
-        mov ecx,[cnt]
-        mov edx,[off]
-        call CopyBlock
-
-        // now swap it
-        mov eax,[cnt]   // eax = count remaining
-        xor edx,edx         // edx = dxt counter
-        mov edi,[dst]
-        mov ebx,[dxt]
-
-        xor ecx,ecx     // ecx = how much to copy
-dxt_test:
-        add edi,8
-        dec eax
-        jz end_dxt_test
-        add edx,ebx
-        jns dxt_test
-
-dxt_s_test:
-        inc ecx
-        dec eax
-        jz end_dxt_test
-        add edx,ebx
-        js dxt_s_test
-
-        // swap this data (ecx set, dst set)
-        call [swp] // (ecx reset to 0 after)
-
-        jmp dxt_test  // and repeat
-
-end_dxt_test:
-        // swap any remaining data
-        call [swp]
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-extern "C" __declspec(naked) void asmLoadTile(int src, int dst, int width, int height, int line, int off, int end)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-
-        push ebx
-        push esi
-        push edi
-
-        // set initial values
-        mov edi,[dst]
-        mov ecx,[width]
-        mov esi,[src]
-        mov edx,[off]
-        xor ebx,ebx         // swap this line?
-        mov eax,[height]
-
-loadtile_loop:
-        cmp [end],edi   // end of tmem: error
-        jc loadtile_end
-
-        // copy this line
-        push edi
-        push ecx
-        call CopyBlock
-        pop ecx
-
-        // swap it?
-        xor ebx,1
-        jnz loadtile_no_swap
-
-        // (ecx set, restore edi)
-        pop edi
-        push ecx
-        call SwapBlock32
-        pop ecx
-        jmp loadtile_swap_end
-loadtile_no_swap:
-        add sp,4  // forget edi, we are already at the next position
-loadtile_swap_end:
-
-        add edx,[line]
-
-        dec eax
-        jnz loadtile_loop
-
-loadtile_end:
-
-        pop edi
-        pop esi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
-
-
-//****************************************************************
-//
-//               ******** Texture CRC ********
-//
-//****************************************************************
-extern "C" __declspec(naked) int asmTextureCRC(int addr, int width, int height, int line)
-{
-	_asm {
-		align 4
-		push ebp
-		mov ebp, esp
-
-        push ebx
-        push edi
-
-        xor eax,eax                             // eax is final result
-        mov ebx,[line]
-        mov ecx,[height]                // ecx is height counter
-        mov edi,[addr]                  // edi is ptr to texture memory
-crc_loop_y:
-        push ecx
-
-        mov ecx,[width]
-crc_loop_x:
-
-        add eax,[edi]           // MUST be 64-bit aligned, so manually unroll
-        add eax,[edi+4]
-        mov edx,ecx
-        mul edx
-        add eax,edx
-        add edi,8
-
-        dec ecx
-        jnz crc_loop_x
-
-        pop ecx
-
-        mov edx,ecx
-        mul edx
-        add eax,edx
-
-        add edi,ebx
-
-        dec ecx
-        jnz crc_loop_y
-
-        pop edi
-        pop ebx
-		mov esp, ebp
-		pop ebp
-		ret
-	}
-}
diff --git a/Source/Glide64/Util.cpp b/Source/Glide64/Util.cpp
index 4a9923697..b710261bb 100644
--- a/Source/Glide64/Util.cpp
+++ b/Source/Glide64/Util.cpp
@@ -37,7 +37,8 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#include <math.h>
+#include "Gfx_1.3.h"
 #include "Util.h"
 #include "Combine.h"
 #include "3dmath.h"
diff --git a/Source/Glide64/Util.h b/Source/Glide64/Util.h
index 9f11c56d0..9f49c5a06 100644
--- a/Source/Glide64/Util.h
+++ b/Source/Glide64/Util.h
@@ -90,4 +90,42 @@ float ScaleZ(float z);
 			lx = lc; \
 		}
 
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+  #include <stdlib.h>
+  #define bswap32(x) _byteswap_ulong(x)
+#else
+static inline uint32_t bswap32(uint32_t val)
+{
+	return (((val & 0xff000000) >> 24) |
+		((val & 0x00ff0000) >>  8) |
+		((val & 0x0000ff00) <<  8) |
+		((val & 0x000000ff) << 24));
+}
+#endif
+
+#define ALOWORD(x)   (*((uint16_t*)&(x)))   // low word
+
+template<class T> static inline T __ROR__(T value, unsigned int count)
+{
+  const unsigned int nbits = sizeof(T) * 8;
+  count %= nbits;
+
+  T low = value << (nbits - count);
+  value >>= count;
+  value |= low;
+  return value;
+}
+
+// rotate left
+template<class T> static T __ROL__(T value, unsigned int count)
+{
+  const unsigned int nbits = sizeof(T) * 8;
+  count %= nbits;
+
+  T high = value >> (nbits - count);
+  value <<= count;
+  value |= high;
+  return value;
+}
+
 #endif  // ifndef Util_H
diff --git a/Source/Glide64/Version.h b/Source/Glide64/Version.h
index 5cba9de90..10280e683 100644
--- a/Source/Glide64/Version.h
+++ b/Source/Glide64/Version.h
@@ -23,7 +23,7 @@
 #define VERSION_MAJOR               2
 #define VERSION_MINOR               0
 #define VERSION_REVISION            0
-#define VERSION_BUILD               5
+#define VERSION_BUILD               9999
 
 #define VER_FILE_DESCRIPTION_STR    "Glide 64 for Project64"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
diff --git a/Source/Glide64/australia.xpm b/Source/Glide64/australia.xpm
deleted file mode 100644
index a07822b50..000000000
--- a/Source/Glide64/australia.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static const char *australia_xpm[]={
-"30 15 16 1",
-"      c #E68885",
-"0     c #D7BCC7",
-"1     c #2F4C95",
-"2     c #092A7F",
-"3     c #DC2C23",
-"4     c #EB9A99",
-"5     c #916785",
-"6     c #59659D",
-"7     c #AEA8C3",
-"8     c #DDD5E1",
-"9     c #7689BA",
-"a     c #F7F8FA",
-"b     c #E46A64",
-"c     c #C08494",
-"d     c #6C426C",
-"e     c #6C2A54",
-" 001120342215 0222222221222221",
-"65 07143 15 781222222212222222",
-"99700a03400a099222222281222222",
-"333333333333333222222222222222",
-"44 44 b3b4 4 4 222222222221222",
-"2170 c43478 512222122222297222",
-"08 5227342270 5222792222222222",
-"6d22226e122229d222222222122222",
-"222222222222222222222222122222",
-"222222922222222222222222222222",
-"222228a72222222222222222222222",
-"22226aa81222222222222212222222",
-"222229762222222222222286222222",
-"222221212222222222222212222222",
-"122222222222222222222222222221"};
diff --git a/Source/Glide64/brazil.xpm b/Source/Glide64/brazil.xpm
deleted file mode 100644
index 424d7050c..000000000
--- a/Source/Glide64/brazil.xpm
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static const char *brazil_xpm[]={
-"30 21 16 1",
-"      c #3A8E12",
-"0     c #3B960A",
-"1     c #6FAA02",
-"2     c #96B802",
-"3     c #FBDD02",
-"4     c #D6CA0C",
-"5     c #B8BF0D",
-"6     c #728652",
-"7     c #426272",
-"8     c #A29E3A",
-"9     c #063C9F",
-"a     c #A2C2AA",
-"b     c #8AB1A3",
-"c     c #3A68A2",
-"d     c #1D4DA0",
-"e     c #528492",
-"     0    0    0    0    0    ",
-" 0000000000000000000000000000 ",
-" 0000000000000110000000000000 ",
-" 0000000000002332000000000000 ",
-" 0000000000143333410000000000 ",
-" 0000000005346776435000000000 ",
-" 0000000133899999983310000000 ",
-" 0000005338999999998335000000 ",
-" 000023333abbbbc999d333320000 ",
-" 0014333349999cebc99433334100 ",
-" 0133333359999999ebd533333310 ",
-" 0014333349d999d99da433334100 ",
-" 000023333d9d99d99dc333320000 ",
-" 0000005338999999dd8335000000 ",
-" 0000000133899999983310000000 ",
-" 0000000002346776435000000000 ",
-" 0000000000143333410000000000 ",
-" 0000000000002332000000000000 ",
-" 0000000000000000000000000000 ",
-" 0000000000000000000000000000 ",
-"     0    0        0    0   0 "};
diff --git a/Source/Glide64/build_asm.bat b/Source/Glide64/build_asm.bat
deleted file mode 100644
index 76c58b91a..000000000
--- a/Source/Glide64/build_asm.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-nasm.exe -o lib\Texture.obj -O6 -fwin32 -D__WIN32__ --prefix _ Texture.asm
-nasm.exe -o lib\FixedPoint.obj -O6 -fwin32 -D__WIN32__ --prefix _ FixedPoint.asm
-nasm.exe -o lib\3dmathSIMD.obj -O6 -fwin32 -D__WIN32__ --prefix _ 3dmathSIMD.asm
diff --git a/Source/Glide64/config/Glide64.ini b/Source/Glide64/config/Glide64.ini
deleted file mode 100644
index 84a844a78..000000000
--- a/Source/Glide64/config/Glide64.ini
+++ /dev/null
@@ -1,1774 +0,0 @@
-;_____________________________________________________________________
-; SETTINGS:
-; This section contains the plugin settings, such as
-; resolution.
-;
-; resolution - specifies which resolution to use
-;  Resolutions are as follows:
-; 0  - 320, 200
-; 1  - 320, 240
-; 2  - 400, 256
-; 3  - 512, 384
-; 4  - 640, 200
-; 5  - 640, 350
-; 6  - 640, 400
-; 7  - 640, 480
-; 8  - 800, 600
-; 9  - 960, 720
-; 10 - 856, 480
-; 11 - 512, 256
-; 12 - 1024, 768
-; 13 - 1280, 1024
-; 14 - 1600, 1200
-; 15 - 400, 300
-; 16 - 1152, 864
-; 17 - 1280, 960
-; 18 - 1600, 1024
-; 19 - 1792, 1344
-; 20 - 1856, 1392
-; 21 - 1920, 1440
-; 22 - 2048, 1536
-; 23 - 2048, 2048
-; Note: some video cards or monitors do not support all
-; resolutions!
-;
-; Note#2:For compatibility issues always distribute this
-; file with the resolution: 640, 480 (7)  
-;
-
-[SETTINGS]
-card_id = 0
-resolution=8
-filter_cache = 0
-autodetect_ucode = 1
-ucode = 2
-wireframe = 0
-wfmode=1
-filtering = 1
-depthmode = 0
-fog = 1
-buff_clear = 1
-vsync = 1
-swapmode = 1
-run_in_window = 0
-show_fps = 0
-clock = 0
-clock_24_hr = 0
-wrap_big_tex = 0
-custom_ini = 1
-hotkeys = 1
-ssformat=1
-logging = 0
-log_clear = 0
-unk_as_red = 0
-log_unk = 0
-unk_clear = 0
-new_swap = 1
-hires_motionblur = 0
-flame_corona = 0
-fb_smart = 1
-fb_read_always = 0
-fb_clear = 0
-fb_hires = 1
-fb_depth_clear = 0
-motionblur = 1
-elogging = 0
-lodmode = 0
-fb_get_info = 0
-fb_render = 1
-detect_cpu_write = 0
-fillrec_depth_compare = 0
-tex_wrap_hack = 0
-read_back_to_screen = 0
-advanced_options = 0
-texenh_options = 0
-ghq_fltr = 0
-ghq_cmpr = 0
-ghq_enht = 0
-ghq_hirs = 0
-ghq_enht_cmpr = 0
-ghq_enht_tile = 0
-ghq_enht_f16bpp = 0
-ghq_enht_gz = 1
-ghq_enht_nobg=0
-ghq_hirs_cmpr = 0
-ghq_hirs_tile = 0
-ghq_hirs_f16bpp = 0
-ghq_hirs_gz = 1
-ghq_hirs_altcrc = 1
-ghq_cache_save = 1
-ghq_cache_size=0
-ghq_hirs_let_texartists_fly = 0
-ghq_hirs_dump = 0
-wrpResolution=0
-wrpVRAM=0
-wrpFBO=0
-wrpAnisotropic=0
-
-; UCODE:
-; These are ucode crcs used in the uCode detector.
-; If a crc is not found here, the plugin will ask you
-; to add it. All these values are in hexadecimal.
-;
-; uCodes:
-; -1 - Unknown, display error
-; 0 - RSP SW 2.0X (Super Mario 64)
-; 1 - F3DEX 1.XX (Star Fox 64)
-; 2 - F3DEX 2.XX (The Legend of Zelda: Ocarina of Time)
-; 3 - F3DEX ? (WaveRace)
-; 4 - RSP SW 2.0D EXT (Star Wars: Shadows of the Empire)
-; 5 - RSP SW 2.0 (Diddy Kong Racing); 
-; 6 - S2DEX 1.XX  (Yoshi's Story - SimCity 2000)
-; 7 - RSP SW PD (Perfect Dark)
-; 8 - F3DEXBG 2.08 (Conker's Bad Fur Day)
-
-[UCODE]
-006bd77f=0
-03044b84=2
-030f4b84=2
-05165579=1
-05777c62=1
-057e7c62=1
-07200895=0
-0bf36d36=9
-0d7bbffb=-1 
-0d7cbffb=5
-0ff79527=2
-0ff795bf=-1 
-1118b3e0=1
-1517a281=1
-168e9cd5=2
-1a1e18a0=2
-1a1e1920=2
-1a62dbaf=2
-1a62dc2f=2
-1de712ff=1
-1ea9e30f=6
-1f120bbb=21
-21f91834=2
-21f91874=2
-22099872=2
-24cd885b=1
-26a7879a=1
-299d5072=6
-2b291027=2
-2b5a89c2=6
-2c7975d6=1
-2d3fe3f1=1
-2f71d1d5=2
-2f7dd1d5=2
-327b933d=1
-339872a6=1
-377359b6=2
-3a1c2b34=0
-3a1cbac3=0
-3f7247fb=0
-3ff1a4ca=1
-4165e1fd=0
-4340ac9b=1
-440cfad6=1
-47d46e86=7
-485abff2=2
-4fe6df78=1
-5182f610=0
-5257cd2a=1
-5414030c=1
-5414030d=1
-559ff7d4=1
-5b5d36e3=4
-5b5d3763=3
-5d1d6f53=0
-5d3099f1=2
-5df1408c=1
-5ef4e34a=1
-6075e9eb=1
-60c1dcc4=1
-6124a508=2
-630a61fb=2
-63be08b1=5
-63be08b3=5
-64ed27e5=1
-65201989=2
-65201a09=2
-66c0b10a=1
-679e1205=2
-6bb745c9=6
-6d8f8f8a=2
-6e4d50af=0
-6eaa1da8=1
-72a4f34e=1
-73999a23=1
-74af0a74=6
-753be4a5=2
-794c3e28=6
-7df75834=1
-7f2d0a2e=1
-82f48073=1
-832fcb99=1
-841ce10f=1
-844b55b5=-1
-863e1ca7=1
-86b1593e=-1
-8805ffea=1
-8d5735b2=1
-8d5735b3=1
-8ec3e124=-1
-93d11f7b=2
-93d11ffb=2
-93d1ff7b=2
-9551177b=2
-955117fb=2
-95cd0062=2
-97d1b58a=1
-a2d0f88e=2
-a346a5cc=1
-aa86cb1d=2
-aae4a5b9=2
-ad0a6292=2
-ad0a6312=2
-ae08d5b9=0
-b1821ed3=1
-b4577b9c=1
-b54e7f93=0
-b62f900f=2
-ba65ea1e=2
-ba86cb1d=8
-bc03e969=0
-bc45382e=2
-be78677c=1
-bed8b069=1
-c3704e41=1
-c46dbc3d=1
-c99a4c6c=1
-c901ce73=2
-c901cef3=2
-cb8c9b6c=2
-cee7920f=1
-cfa35a45=2
-d1663234=1
-d20dedbf=6
-d2a9f59c=1
-d41db5f7=1
-d5604971=0
-d57049a5=1
-d5c4dc96=-1
-d5d68b1f=0
-d67c2f8b=0
-d802ec04=1
-da13ab96=2
-de7d67d4=2
-e1290fa2=2
-e41ec47e=0
-e65cb4ad=2
-e89c2b92=1
-e9231df2=1
-ec040469=1
-ee47381b=1
-ef54ee35=1
-f9893f70=21
-fb816260=1
-ff372492=21
-
-
-
-; Game specific settings
-;
-; In the [DEFAULT] section there are the default options for a game, which can
-; be overriden in the section with the game's internal name.
-
-[DEFAULT]
-filtering = 0
-fog = 1
-buff_clear = 1
-swapmode = 1
-lodmode = 0
-fb_smart = 0
-fb_hires = 1
-fb_get_info = 0
-fb_read_always = 0
-fb_render = 1
-fb_crc_mode = 1
-read_back_to_screen = 0
-detect_cpu_write = 0
-alt_tex_size = 0
-use_sts1_only = 0
-PPL = 0
-fast_crc = 1
-force_microcheck = 0
-force_quad3d = 0
-texrect_zbuf = 0
-fix_tex_coord = 0
-optimize_texrect = 1
-optimize_write = 0
-hires_buf_clear = 1
-depthmode = 1
-fb_clear = 0
-fb_read_alpha = 0
-ignore_previous = 0
-soft_depth_compare = 0
-force_depth_compare = 0
-force_calc_sphere = 0
-texrect_compare_less = 0
-texture_correction = 1
-fillcolor_fix = 0
-depth_bias = 20
-increase_texrect_edge = 0
-decrease_fillrect_edge = 0
-stipple_mode = 2
-stipple_pattern = 1041204192
-clip_zmax = 1
-clip_zmin = 0
-adjust_aspect = 1
-correct_viewport = 0
-aspect = 0
-zmode_compare_less = 0
-old_style_adither = 0
-n64_z_scale = 0
-
-[1080 SNOWBOARDING]
-optimize_texrect = 1
-alt_tex_size = 1
-depthmode = 0
-swapmode = 2
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[A Bug's Life]
-depthmode = 0
-
-[AERO FIGHTERS ASSAUL]
-clip_zmin = 1
-
-[AIDYN_CHRONICLES]
-depthmode = 1
-
-[All-Star Baseball 20] 
-force_depth_compare = 1 
-
-[All-Star Baseball 99]
-force_depth_compare = 1
-depthmode = 1
-buff_clear = 0
-
-[All Star Baseball 99]
-force_depth_compare = 1
-depthmode = 1
-buff_clear = 0
-
-[All-Star Baseball '0]
-force_depth_compare = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[ARMYMENAIRCOMBAT]
-increase_texrect_edge = 1
-depthmode = 1
-
-[BURABURA POYON]
-fix_tex_coord = 1
-depthmode = 0
-
-;Bakushou Jinsei 64 - Mezease! Resort Ou.
-[�޸�����ݾ�64]
-fb_info_disable = 1
-depthmode = 0
-
-[BAKU-BOMBERMAN]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[BAKUBOMB2]
-filtering = 1
-depthmode = 0
-
-[BANGAIOH]
-depthmode = 1
-
-[Banjo-Kazooie]
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[BANJO KAZOOIE 2]
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[BANJO TOOIE]
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[BASS HUNTER 64]
-fix_tex_coord = 1
-depthmode = 1
-buff_clear = 0
-swapmode = 2
-
-[BATTLEZONE]
-force_depth_compare = 1
-depthmode = 1
-
-[BEETLE ADVENTURE JP]
-wrap_big_tex = 1
-n64_z_scale = 1
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[Beetle Adventure Rac]
-wrap_big_tex = 1
-n64_z_scale = 1
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[Big Mountain 2000]
-depthmode = 1
-
-[BIOFREAKS]
-depthmode = 0
-buff_clear = 0
-fb_smart = 1
-fb_hires = 1
-
-[BioHazard II]
-detect_cpu_write = 1
-adjust_aspect = 0
-n64_z_scale = 1
-fix_tex_coord = 128
-depthmode = 0
-swapmode = 2
-fb_smart = 1
-fb_hires = 1
-
-[Blast Corps]
-depthmode = 1
-swapmode = 0
-fb_smart = 1
-fb_hires = 1
-fb_read_alpha = 1
-
-[Blastdozer]
-depthmode = 1
-swapmode = 0
-fb_smart = 1
-fb_hires = 1
-fb_read_alpha = 1
-
-[blitz2k]
-lodmode = 2
-
-[Body Harvest]
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[BOMBERMAN64E]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[BOMBERMAN64U]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[BOMBERMAN64U2]
-filtering = 1
-depthmode = 0
-
-[Bottom of the 9th]
-optimize_texrect = 0
-filtering = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[BRUNSWICKBOWLING]
-depthmode = 0
-buff_clear = 0
-swapmode = 0
-
-[Bust A Move 3 DX]
-filtering = 2
-depthmode = 1
-
-[Bust A Move '99]
-filtering = 2
-depthmode = 1
-
-[Bust A Move 2]
-fix_tex_coord = 1
-filtering = 2
-depthmode = 1
-fog = 0
-
-[CARMAGEDDON64]
-wrap_big_tex = 1
-filtering = 1
-depthmode = 1
-
-[CASTLEVANIA]
-depthmode = 0
-fb_clear = 1
-old_style_adither = 1
-
-[CASTLEVANIA2]
-depthmode = 0
-fb_clear = 1
-
-[CENTRE COURT TENNIS]
-soft_depth_compare = 1
-depthmode = 0
-
-[Chameleon Twist2]
-filtering = 1
-depthmode = 0
-
-[CHOPPER_ATTACK]
-filtering = 1
-depthmode = 0
-
-[CITY TOUR GP]
-force_microcheck = 1
-filtering = 1
-depthmode = 1
-
-[Command&Conquer]
-fix_tex_coord = 1
-aspect = 2
-filtering = 1
-depthmode = 1
-fog = 0
-
-[CONKER BFD]
-optimize_texrect = 1
-ignore_previous = 1
-lodmode = 1
-filtering = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[Cruis'n USA]
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[CruisnExotica]
-filtering = 1
-depthmode = 1
-buff_clear = 0
-swapmode = 0
-
-[custom robo]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[CUSTOMROBOV2]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[CyberTiger]
-fix_tex_coord = 16
-depthmode = 0
-
-[DAFFY DUCK STARRING]
-depthmode = 1
-wrap_big_tex = 1
-
-[DARK RIFT]
-force_microcheck = 1
-
-[DeadlyArts]
-soft_depth_compare = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-clip_zmin = 1
-
-[DERBYSTALLION 64]
-fix_tex_coord = 1
-depthmode = 0
-
-[D K DISPLAY]
-depthmode = 1
-fb_clear = 1
-
-[Donald Duck Goin' Qu]
-detect_cpu_write = 1
-depthmode = 0
-
-[Donald Duck Quack At]
-detect_cpu_write = 1
-depthmode = 0
-
-[DONKEY KONG 64]
-lodmode = 1
-depth_bias = 64
-depthmode = 1
-fb_clear = 1
-
-[Doom64]
-fillcolor_fix = 1
-depthmode = 1
-
-;Doraemon - Mittsu no Seireiseki (J)
-[��״�� Я�ɾ�ڲ��]
-read_back_to_screen = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-;Doraemon 3 - Nobita no Machi SOS! (J)
-[��״��3 �������SOS!]
-clip_zmin = 1
-
-[DR.MARIO 64]
-fix_tex_coord = 256
-optimize_write = 1
-read_back_to_screen = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 0
-
-[DRACULA MOKUSHIROKU]
-depthmode = 0
-fb_clear = 1
-
-[DRACULA MOKUSHIROKU2]
-depthmode = 0
-fb_clear = 1
-
-[Dual heroes JAPAN]
-filtering = 1
-depthmode = 0
-swapmode = 0
-
-[Dual heroes PAL]
-filtering = 1
-depthmode = 0
-swapmode = 0
-
-[Dual heroes USA]
-filtering = 1
-depthmode = 0
-swapmode = 0
-
-[DUKE NUKEM]
-increase_primdepth = 1
-depthmode = 0
-
-[EARTHWORM JIM 3D]
-increase_primdepth = 1
-filtering = 1
-depthmode = 0
-buff_clear = 0
-
-;Eikou no Saint Andrew
-[����ɾ�ı���ح��]
-correct_viewport = 1
-
-[Eltail]
-filtering = 2
-depthmode = 1
-
-[EVANGELION]
-depthmode = 1
-
-[EXCITEBIKE64]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[extreme_g]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[extremeg]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[����ذ�G2]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[Extreme G 2]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[F1 POLE POSITION 64]
-clip_zmin = 1
-filtering = 2
-depthmode = 1
-
-[F1RacingChampionship]
-depthmode = 0
-buff_clear = 0
-swapmode = 0
-
-[F1 WORLD GRAND PRIX]
-soft_depth_compare = 1
-wrap_big_tex = 1
-depthmode = 0
-buff_clear = 0
-
-[F1 WORLD GRAND PRIX2]
-wrap_big_tex = 1
-soft_depth_compare = 1
-depthmode = 0
-buff_clear = 0
-
-[F-ZERO X]
-depthmode = 1
-
-;Fushigi no Dungeon - Furai no Shiren 2 (J) 
-[F3 ̳ײɼ��2]
-decrease_fillrect_edge = 1
-depthmode = 0
-
-[Fighting Force]
-depthmode = 1
-
-[G.A.S.P!!Fighters'NE]
-soft_depth_compare = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-clip_zmin = 1
-
-[GANBAKE GOEMON]
-optimize_texrect = 0
-alt_tex_size = 1
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-;Ganbare Goemon - Neo Momoyama Bakufu no Odori
-[������\ �޴��]
-optimize_texrect = 0
-alt_tex_size = 1
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[GAUNTLET LEGENDS]
-depthmode = 1
-swapmode = 2
-
-[Getter Love!!]
-zmode_compare_less = 1
-texrect_compare_less = 1
-filtering = 2
-depthmode = 1
-
-[Gex 3 Deep Cover Gec]
-filtering = 1
-depthmode = 0
-
-[GEX: ENTER THE GECKO]
-filtering = 1
-depthmode = 0
-
-[Glover]
-filtering = 1
-depthmode = 0
-
-[GOEMON2 DERODERO]
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[GOEMONS GREAT ADV]
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[GOLDENEYE]
-lodmode = 1
-depth_bias = 40
-filtering = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[GOLDEN NUGGET 64]
-filtering = 2
-depthmode = 1
-
-[GT64]
-force_microcheck = 1
-filtering = 1
-depthmode = 1
-
-; Hamster Monogatori
-[�ѽ���ɶ���64]
-force_microcheck = 1
-depthmode = 0
-
-[HARVESTMOON64]
-zmode_compare_less = 1
-depthmode = 0
-fog = 0
-
-; Harvest Moon 64 JAP
-[�޸�ޮ��ɶ���2]
-zmode_compare_less = 1
-depthmode = 0
-fog = 0
-
-; Heiwa Pachinko World
-[HEIWA ���ݺ ܰ���64]
-depthmode = 0
-fog = 0
-swapmode = 2
-fb_smart = 1
-fb_hires = 1
-
-[HEXEN]
-detect_cpu_write = 1
-filtering = 1
-depthmode = 1
-buff_clear = 0
-swapmode = 2
-
-[HSV ADVENTURE RACING]
-wrap_big_tex = 1
-n64_z_scale = 1
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[Holy Magic Century]
-filtering = 2
-depthmode = 1
-
-[HUMAN GRAND PRIX]
-filtering = 2
-depthmode = 0
-
-[�ׯĶ��� 64��ò���]
-filtering = 1
-depthmode = 0
-buff_clear = 0
-
-[Iggy's Reckin' Balls]
-fix_tex_coord = 512
-depthmode = 0
-
-[I S S 64]
-depthmode = 1
-swapmode = 2
-old_style_adither = 1
-
-[I.S.S.2000]
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[ITF 2000]
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[IT&F SUMMERGAMES]
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[J_league 1997]
-fix_tex_coord = 1
-depthmode = 1
-swapmode = 0
-
-;J.League Eleven Beat 1997
-[Jذ��\ ������ް�1997]
-fb_smart=1
-fb_hires=1
-
-[J LEAGUE LIVE 64]
-wrap_big_tex = 1
-depthmode = 1
-
-[J WORLD SOCCER3]
-depthmode = 1
-swapmode = 2
-
-[JEREMY MCGRATH SUPER]
-depthmode = 0
-swapmode = 0
-
-[JET FORCE GEMINI]
-read_back_to_screen = 1
-decrease_fillrect_edge = 1
-alt_tex_size = 1
-depthmode = 1
-swapmode = 2
-fb_smart = 1
-fb_hires = 1
-
-[J F G DISPLAY]
-read_back_to_screen = 1
-decrease_fillrect_edge = 1
-alt_tex_size = 1
-depthmode = 1
-swapmode = 2
-fb_smart = 1
-fb_hires = 1
-
-[KEN GRIFFEY SLUGFEST]
-read_back_to_screen = 2
-depthmode = 1
-swapmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[Kirby64]
-filtering = 1
-depthmode = 0
-buff_clear = 0
-swapmode = 0
-
-[Killer Instinct Gold]
-filtering = 1
-depthmode = 0
-fog = 0
-buff_clear = 0
-
-[KNIFE EDGE]
-wrap_big_tex = 1
-fast_crc = 0
-filtering = 1
-depthmode = 1
-
-[Knockout Kings 2000]
-fb_info_disable = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-fb_read_alpha = 1
-
-[LAMBORGHINI]
-use_sts1_only = 1
-
-[LCARS - WT_Riker]
-depthmode = 1
-
-[LEGORacers]
-detect_cpu_write = 1
-depthmode = 1
-buff_clear = 0
-fb_smart = 1
-fb_hires = 1
-fb_read_alpha = 1
-
-[LET'S SMASH]
-soft_depth_compare = 1
-depthmode = 0
-
-[Lode Runner 3D] 
-swapmode = 0
-
-[LT DUCK DODGERS]
-wrap_big_tex = 1
-depthmode = 1
-
-[MACE]
-fix_tex_coord = 8
-filtering = 1
-depthmode = 1
-
-[MAGICAL TETRIS]
-force_microcheck = 1
-depthmode = 1
-fog = 0
-
-;Mahjong Master (J)
-[ϰ�ެ� Ͻ��]
-n64_z_scale = 1
-texrect_compare_less = 1
-zmode_compare_less = 1
-
-[MAJORA'S MASK]
-wrap_big_tex = 1
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-fb_crc_mode = 0
-
-[MARIOKART64]
-fast_crc = 0
-stipple_mode = 1
-stipple_pattern = 4286595040
-depthmode = 1
-
-[MarioGolf64]
-fb_info_disable = 1
-ignore_aux_copy = 1
-buff_clear = 0
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[MarioParty]
-clip_zmin = 1
-depthmode = 0
-swapmode = 2
-
-[MarioParty2]
-depthmode = 0
-swapmode = 2
-
-[MarioParty3]
-fix_tex_coord = 1
-depthmode = 0
-
-[MARIO STORY]
-useless_is_useless = 1
-hires_buf_clear = 0
-optimize_texrect = 0
-filtering = 1
-depthmode = 1
-swapmode = 2
-fb_smart = 1
-fb_hires = 1
-fb_read_alpha = 1
-
-[MASTERS'98]
-wrap_big_tex = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[Mega Man 64]
-increase_texrect_edge = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[MGAH VOL1]
-force_microcheck = 1
-depthmode = 1
-zmode_compare_less = 1
-fb_smart = 1
-
-[Mia Hamm Soccer 64]
-buff_clear = 0
-
-[MICKEY USA]
-alt_tex_size = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[MICKEY USA PAL]
-alt_tex_size = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[MICROMACHINES64TURBO]
-depthmode = 0
-
-[Mini Racers]
-force_microcheck = 1
-buff_clear = 0
-fb_smart = 1
-fb_hires = 1
-swapmode = 0
-
-[MISCHIEF MAKERS]
-tex_wrap_hack = 0
-depthmode = 1
-fog = 0
-
-[MLB FEATURING K G JR]
-read_back_to_screen = 2
-depthmode = 1
-
-[MK_MYTHOLOGIES]
-depthmode = 1
-
-[MO WORLD LEAGUE SOCC]
-buff_clear = 0
-
-[Monaco GP Racing 2]
-depthmode = 0
-buff_clear = 0
-
-[Monaco Grand Prix]
-depthmode = 0
-buff_clear = 0
-
-;Morita Shogi 64
-[��������64]
-correct_viewport = 1
-
-[MortalKombatTrilogy]
-filtering = 2
-depthmode = 1
-
-[MS. PAC-MAN MM]
-detect_cpu_write = 1
-depthmode = 1
-
-[MYSTICAL NINJA]
-alt_tex_size = 1
-optimize_texrect = 0
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[MYSTICAL NINJA2 SG]
-alt_tex_size = 1
-optimize_texrect = 0
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[NASCAR 99]
-depthmode = 0
-buff_clear = 0
-swapmode = 0
-
-[NASCAR 2000]
-depthmode = 0
-buff_clear = 0
-swapmode = 0
-
-[NBA Courtside 2]
-depthmode = 0
-buff_clear = 0
-swapmode = 0
-
-[NBA JAM 2000]
-buff_clear = 0
-
-[NBA JAM 99]
-buff_clear = 0
-
-[NBA LIVE 2000]
-adjust_aspect = 0
-
-[NBA Live 99]
-swapmode = 0
-adjust_aspect = 0
-
-[NEWTETRIS]
-pal230 = 1
-fix_tex_coord = 1
-increase_texrect_edge = 1
-depthmode = 0
-fog = 0
-
-[NFL BLITZ]
-lodmode = 2
-
-[NFL BLITZ 2001]
-lodmode = 2
-
-[NFL BLITZ SPECIAL ED]
-lodmode = 2
-
-[NFL QBC '99]
-force_depth_compare = 1
-wrap_big_tex = 1
-depthmode = 0
-
-[NFL QBC 2000]
-wrap_big_tex = 1
-depthmode = 0
-swapmode = 0
-
-[NFL Quarterback Club]
-wrap_big_tex = 1
-depthmode = 0
-swapmode = 0
-
-[NINTAMAGAMEGALLERY64]
-force_microcheck = 1
-depthmode = 0
-
-[NITRO64] 
-fb_smart = 1 
-fb_hires = 1
-
-[NUCLEARSTRIKE64]
-buff_clear = 0
-
-; Nushi Zuri 64
-[Ǽ���64]
-force_microcheck = 1
-wrap_big_tex = 0
-depthmode = 0
-buff_clear = 0
-
-[OgreBattle64]
-fb_info_disable = 1
-force_depth_compare = 1
-depthmode = 1
-
-[PACHINKO365NICHI]
-correct_viewport = 1
-
-[PAPER MARIO]
-useless_is_useless = 1
-hires_buf_clear = 0
-optimize_texrect = 0
-filtering = 1
-depthmode = 1
-swapmode = 2
-fb_smart = 1
-fb_hires = 1
-fb_read_alpha = 1
-
-[Parlor PRO 64]
-force_microcheck = 1
-filtering = 1
-depthmode = 1
-
-[Perfect Dark]
-useless_is_useless = 1
-decrease_fillrect_edge = 1
-optimize_texrect = 0
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[PERFECT STRIKER]
-depthmode = 1
-swapmode = 2
-
-[Pilot Wings64]
-depthmode = 1
-buff_clear = 0
-
-[PUZZLE LEAGUE N64]
-PPL = 1
-force_microcheck = 1
-fix_tex_coord = 1
-filtering = 2
-depthmode = 1
-fog = 0
-buff_clear = 0
-fb_smart = 1
-fb_hires = 0
-fb_read_alpha = 1
-
-[PUZZLE LEAGUE]
-PPL = 1
-force_microcheck = 1
-fix_tex_coord = 1
-filtering = 2
-depthmode = 1
-fog = 0
-buff_clear = 0
-fb_smart = 1
-fb_hires = 0
-fb_read_alpha = 1
-
-[POKEMON SNAP]
-fast_crc = 0
-depthmode = 1
-fb_smart = 1
-fb_hires = 0
-fb_clear = 1
-
-[POKEMON STADIUM]
-optimize_texrect = 0
-depthmode = 1
-fast_crc = 0
-buff_clear = 0
-fb_smart = 1
-fb_hires = 0
-fb_read_alpha = 1
-fb_crc_mode = 2
-
-[POKEMON STADIUM 2]
-optimize_texrect = 0
-swapmode = 2
-depthmode = 1
-fast_crc = 0
-buff_clear = 0
-fb_smart = 1
-fb_hires = 1
-fb_read_alpha = 1
-fb_crc_mode = 2
-
-[POKEMON STADIUM G&S]
-optimize_texrect = 0
-depthmode = 1
-fast_crc = 0
-buff_clear = 0
-fb_smart = 1
-fb_hires = 0
-fb_read_alpha = 1
-fb_crc_mode = 2
-
-[POLARISSNOCROSS]
-fix_tex_coord = 5
-depthmode = 1
-
-[PowerLeague64]
-force_quad3d = 1
-
-[Quake]
-force_microcheck = 1
-swapmode = 2
-buff_clear = 0
-
-[QUAKE II]
-fb_smart = 1
-fb_hires = 1
-
-[quarterback_club_98]
-optimize_texrect = 0
-hires_buf_clear = 0
-filtering = 1
-depthmode = 1
-swapmode = 0
-buff_clear = 0
-fb_smart = 1
-fb_hires = 1
-fb_read_alpha = 1
-
-[Quest 64]
-depthmode = 1
-
-[Racing Simulation 2] 
-depthmode = 0
-buff_clear = 0
-
-[RAINBOW SIX]
-increase_texrect_edge = 1
-depthmode = 1
-
-[Rally'99]
-filtering = 1
-depthmode = 1
-buff_clear = 0
-fb_smart = 1
-fb_hires = 1
-
-[RALLY CHALLENGE]
-filtering = 1
-depthmode = 1
-buff_clear = 0
-fb_smart = 1
-fb_hires = 1
-
-[Rayman 2]
-depthmode = 0
-detect_cpu_write = 1
-
-[READY 2 RUMBLE]
-fix_tex_coord = 64
-depthmode = 0
-
-[Ready to Rumble]
-fix_tex_coord = 1
-depthmode = 0
-
-[Resident Evil II]
-detect_cpu_write = 1
-adjust_aspect = 0
-n64_z_scale = 1
-fix_tex_coord = 128
-depthmode = 0
-swapmode = 2
-fb_smart = 1
-fb_hires = 1
-
-[Re-Volt]
-texture_correction = 0
-depthmode = 1
-
-[RIDGE RACER 64]
-force_calc_sphere = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[ROAD RASH 64]
-depthmode = 0
-swapmode = 2
-
-[Robopon64]
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[ROCKETROBOTONWHEELS]
-clip_zmin = 1
-
-[RockMan Dash]
-increase_texrect_edge = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-
-[RONALDINHO SOCCER]
-depthmode = 1
-swapmode = 2
-old_style_adither = 1
-
-[RTL WLS2000]
-buff_clear = 0
-
-[RUGRATS IN PARIS]
-depthmode = 1
-
-[RUSH 2049]
-force_texrect_zbuf = 1
-filtering = 1
-depthmode = 0
-
-[SCARS]
-filtering = 1
-depthmode = 0
-
-[SD HIRYU STADIUM]
-force_microcheck = 1
-depthmode = 0
-
-[Shadow of the Empire]
-swapmode = 2
-
-[Shadowman]
-depthmode = 0
-
-[Silicon Valley]
-filtering = 1
-depthmode = 0
-
-[Snobow Kids 2]
-swapmode = 0
-filtering = 1
-
-[SNOWBOARD KIDS2]
-swapmode = 0
-filtering = 1
-
-[South Park: Chef's L]
-fix_tex_coord = 4
-filtering = 2
-depthmode = 1
-fog = 0
-buff_clear = 0
-
-[South Park Chef's Lu]
-fix_tex_coord = 4
-filtering = 1
-depthmode = 1
-fog = 0
-buff_clear = 0
-
-[SPACE DYNAMITES] 
-force_microcheck = 1
-
-[SPIDERMAN]
-fast_crc = 0
-
-[STARCRAFT 64]
-detect_cpu_write = 1
-aspect = 2
-filtering = 2
-depthmode = 1
-fog = 0
-
-[STAR SOLDIER]
-force_microcheck = 1
-filtering = 1
-depthmode = 1
-swapmode = 0
-
-[STAR TWINS]
-read_back_to_screen = 1
-decrease_fillrect_edge = 1
-alt_tex_size = 1
-depthmode = 1
-swapmode = 2
-fb_smart = 1
-fb_hires = 1
-
-[STAR WARS EP1 RACER]
-swapmode = 2
-
-[SUPERROBOTSPIRITS]
-aspect = 2
-
-;Super Robot Taisen 64 (J)
-[���߰��ޯ�����64]
-fast_crc = 0
-use_sts1_only = 1
-fb_smart = 1
-fb_hires = 1
-
-[Supercross]
-depthmode = 1
-buff_clear = 0
-
-[SUPER MARIO 64]
-depth_bias = 32
-lodmode = 1
-filtering = 1
-depthmode = 1
-
-[SUPERMARIO64]
-depth_bias = 32
-lodmode = 1
-filtering = 1
-depthmode = 1
-
-[SUPERMAN]
-detect_cpu_write = 1
-
-;Susume! Taisen Puzzle Dama Toukon! Marumata Chou (J) 
-[���!�����߽�����]
-force_microcheck = 1
-depthmode = 1
-fog = 0
-swapmode = 0
-
-;Tamagotchi World 64 (J) 
-[������Ϻޯ�ܰ���]
-use_sts1_only = 1
-depthmode = 0
-fog = 0
-
-[Taz Express]
-filtering = 1
-depthmode = 0
-buff_clear = 0
-
-[TELEFOOT SOCCER 2000]
-buff_clear = 0
-
-[TETRISPHERE]
-alt_tex_size = 1
-use_sts1_only = 1
-increase_texrect_edge = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_crc_mode = 2
-
-[TG RALLY 2]
-filtering = 1
-depthmode = 1
-buff_clear = 0
-swapmode = 2
-
-[THE LEGEND OF ZELDA]
-depth_bias = 60
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[THE MASK OF MUJURA]
-wrap_big_tex = 1
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-fb_crc_mode = 0
-
-[THPS2]
-filtering = 1
-depthmode = 0
-
-[THPS3]
-filtering = 1
-depthmode = 0
-
-[Tigger's Honey Hunt]
-zmode_compare_less = 1
-depthmode = 0
-buff_clear = 0
-
-[TOM AND JERRY]
-depth_bias = 2
-filtering = 1
-depthmode = 0
-
-[Tonic Trouble]
-depthmode = 0
-detect_cpu_write = 1
-
-[TONY HAWK PRO SKATER]
-filtering = 1
-depthmode = 0
-
-[TONY HAWK SKATEBOARD]
-filtering = 1
-depthmode = 0
-
-[Top Gear Hyper Bike]
-fb_info_disable = 1
-swapmode = 2
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[Top Gear Overdrive]
-fb_info_disable = 1
-depthmode = 0
-buff_clear = 0
-
-[TOP GEAR RALLY]
-depth_bias = 64
-fillcolor_fix = 1
-depthmode = 0
-
-[TOP GEAR RALLY 2]
-filtering = 1
-depthmode = 1
-buff_clear = 0
-swapmode = 2
-
-[TRIPLE PLAY 2000]
-wrap_big_tex = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[TROUBLE MAKERS]
-mischief_tex_hack = 0
-depthmode = 1
-fog = 0
-
-[TSUMI TO BATSU]
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[TSUWAMONO64]
-force_microcheck = 1
-depthmode = 0
-
-[TWINE]
-filtering = 1
-depthmode = 0
-
-[TWISTED EDGE]
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-[Ultraman Battle JAPA]
-depthmode = 0
-
-[Virtual Pool 64]
-depthmode = 1
-buff_clear = 0
-
-[V-RALLY]
-fix_tex_coord = 3
-filtering = 1
-depthmode = 0
-buff_clear = 0
-swapmode = 0
-
-[Waialae Country Club]
-wrap_big_tex = 1
-depthmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[WAVE RACE 64]
-pal230 = 1
-
-[WILD CHOPPERS]
-filtering = 1
-depthmode = 0
-
-[Wipeout 64]
-filtering = 1
-depthmode = 0
-swapmode = 2
-
-[WONDER PROJECT J2]
-depthmode = 0
-buff_clear = 0
-swapmode = 0
-
-[World Cup 98] 
-depthmode = 0
-swapmode = 0
-fb_smart = 1
-fb_hires = 1
-
-[WRESTLEMANIA 2000]
-depthmode = 0
-
-[YAKOUTYUU2]
-depthmode = 0
-
-[YOSHI STORY]
-fix_tex_coord = 32
-filtering = 1
-depthmode = 1
-fog = 0
-
-[ZELDA MAJORA'S MASK]
-wrap_big_tex = 1
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-fb_crc_mode = 0
-
-[ZELDA MASTER QUEST]
-depth_bias = 60
-filtering = 1
-depthmode = 1
-fb_smart = 1
-fb_hires = 1
-fb_clear = 1
-
-;End Of Original File
diff --git a/Source/Glide64/france.xpm b/Source/Glide64/france.xpm
deleted file mode 100644
index a54f5cea4..000000000
--- a/Source/Glide64/france.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static const char *france_xpm[]={
-"30 20 5 1",
-"      c #0C429C",
-"0     c #F4F6FC",
-"1     c #FCFEFC",
-"2     c #FCEAEC",
-"3     c #FC0204",
-"          01111111123333333333",
-"          21111111123333333333",
-"          01111111123333333333",
-"          21111111123333333333",
-"          01111111123333333333",
-"          21111111123333333333",
-"          01111111123333333333",
-"          21111111123333333333",
-"          01111111123333333333",
-"          21111111123333333333",
-"          01111111123333333333",
-"          21111111123333333333",
-"          01111111123333333333",
-"          01111111123333333333",
-"          01111111123333333333",
-"          21111111123333333333",
-"          01111111123333333333",
-"          01111111123333333333",
-"          01111111123333333333",
-"          01111111123333333333"};
diff --git a/Source/Glide64/inc/3dfx.h b/Source/Glide64/inc/3dfx.h
deleted file mode 100644
index b2011bfee..000000000
--- a/Source/Glide64/inc/3dfx.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
-** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
-** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
-** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
-** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
-** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
-** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
-** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
-** 
-** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
-** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
-** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
-** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
-** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
-** THE UNITED STATES.  
-** 
-** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
-**
-** $Revision: 1.3.4.2 $
-** $Date: 2003/05/05 06:50:41 $
-*/
-#ifndef __3DFX_H__
-#define __3DFX_H__
-
-/*
-** basic data types
-*/
-typedef unsigned char   FxU8;
-typedef signed   char   FxI8;
-typedef unsigned short  FxU16;
-typedef signed   short  FxI16;
-#if defined(__alpha__) || defined (__LP64__)
-typedef signed   int    FxI32;
-typedef unsigned int    FxU32;
-#else
-typedef signed   long   FxI32;
-typedef unsigned long   FxU32;
-#endif
-typedef unsigned long   AnyPtr;
-typedef int             FxBool;
-typedef float           FxFloat;
-typedef double          FxDouble;
-
-/*
-** color types
-*/
-typedef unsigned long                FxColor_t;
-typedef struct { float r, g, b, a; } FxColor4;
-
-/*
-** fundamental types
-*/
-#define FXTRUE    1
-#define FXFALSE   0
-
-/*
-** helper macros
-*/
-#define FXUNUSED( a ) ((void)(a))
-#define FXBIT( i )    ( 1L << (i) )
-
-/*
-** export macros
-*/
-
-#if defined(__MSC__) || defined(_MSC_VER)
-#  if defined (MSVC16)
-#    define FX_ENTRY 
-#    define FX_CALL
-#  else
-#    define FX_ENTRY extern
-#    define FX_CALL  __stdcall
-#  endif
-#elif defined(__WATCOMC__)
-#  define FX_ENTRY extern
-#  define FX_CALL  __stdcall
-#elif defined (__IBMC__) || defined (__IBMCPP__)
-   /*  IBM Visual Age C/C++: */
-#  define FX_ENTRY extern
-#  define FX_CALL  __stdcall
-#elif defined(__DJGPP__)
-#  define FX_ENTRY extern
-#  define FX_CALL
-#elif defined(__MINGW32__)
-#  define FX_ENTRY extern
-#  define FX_CALL  __stdcall
-#elif defined(__unix__)
-#  define FX_ENTRY extern
-#  define FX_CALL
-#elif defined(__MWERKS__)
-#  if macintosh
-#    define FX_ENTRY extern
-#    define FX_CALL
-#  else /* !macintosh */
-#    error "Unknown MetroWerks target platform"
-#  endif /* !macintosh */
-#else
-#  warning define FX_ENTRY & FX_CALL for your compiler
-#  define FX_ENTRY extern
-#  define FX_CALL
-#endif
-
-/*
-** x86 compiler specific stuff
-*/
-#if defined(__BORLANDC_)
-#  define REALMODE
-
-#  define REGW( a, b ) ((a).x.b)
-#  define REGB( a, b ) ((a).h.b)
-#  define INT86( a, b, c ) int86(a,b,c)
-#  define INT86X( a, b, c, d ) int86x(a,b,c,d)
-
-#  define RM_SEG( a ) FP_SEG( a )
-#  define RM_OFF( a ) FP_OFF( a )
-#elif defined(__WATCOMC__)
-#  undef FP_SEG
-#  undef FP_OFF
-
-#  define REGW( a, b ) ((a).w.b)
-#  define REGB( a, b ) ((a).h.b)
-#  define INT86( a, b, c ) int386(a,b,c)
-#  define INT86X( a, b, c, d ) int386x(a,b,c,d)
-
-#  define RM_SEG( a )  ( ( ( ( FxU32 ) (a) ) & 0x000F0000 ) >> 4 )
-#  define RM_OFF( a )  ( ( FxU16 ) (a) )
-#endif
-
-#endif /* !__3DFX_H__ */
diff --git a/Source/Glide64/inc/c32.mac b/Source/Glide64/inc/c32.mac
deleted file mode 100644
index f0c116ba3..000000000
--- a/Source/Glide64/inc/c32.mac
+++ /dev/null
@@ -1,52 +0,0 @@
-; NASM macro set to make interfacing to 32-bit programs easier -*- nasm -*-
-
-
-
-%imacro proc 1			; begin a procedure definition
-
-%push proc
-
-          global %1
-
-%1:       push ebp
-
-          mov ebp,esp
-
-%assign %$arg 8
-
-%define %$procname %1
-
-%endmacro
-
-
-
-%imacro arg 0-1 4		; used with the argument name as a label
-
-%00	  equ %$arg
-
-%assign %$arg %1+%$arg
-
-%endmacro
-
-
-
-%imacro endproc 0
-
-%ifnctx proc
-
-%error Mismatched `endproc'/`proc'
-
-%else
-
-	  leave
-
-	  ret
-
-__end_%$procname:		; useful for calculating function size
-
-%pop
-
-%endif
-
-%endmacro
-
diff --git a/Source/Glide64/inc/glide.h b/Source/Glide64/inc/glide.h
deleted file mode 100644
index d89f049ff..000000000
--- a/Source/Glide64/inc/glide.h
+++ /dev/null
@@ -1,946 +0,0 @@
-/*
-** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
-** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
-** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
-** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
-** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
-** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
-** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
-** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
-** 
-** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
-** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
-** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
-** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
-** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
-** THE UNITED STATES.  
-** 
-** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
-*/
-
-/*
-** GLIDE.H
-**
-** The following #defines are relevant when using Glide:
-**
-** One of the following "platform constants" must be defined during
-** compilation:
-**
-**            __DOS__           Defined for 32-bit DOS applications
-**            __WIN32__         Defined for 32-bit Windows applications
-**            __sparc__         Defined for Sun Solaris/SunOS
-**            __linux__         Defined for Linux applications
-**            __FreeBSD__       Defined for FreeBSD applications
-**            __NetBSD__        Defined for NetBSD applications
-**            __OpenBSD__       Defined for OpenBSD applications
-**            __IRIX__          Defined for SGI Irix applications
-**
-*/
-#ifndef __GLIDE_H__
-#define __GLIDE_H__
-
-#include <3dfx.h>
-#include <glidesys.h>
-#include <sst1vid.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** -----------------------------------------------------------------------
-** TYPE DEFINITIONS
-** -----------------------------------------------------------------------
-*/
-typedef FxU32 GrColor_t;
-typedef FxU8  GrAlpha_t;
-typedef FxU32 GrMipMapId_t;
-typedef FxU32 GrStipplePattern_t;
-typedef FxU8  GrFog_t;
-typedef FxU32 GrContext_t;
-typedef int (FX_CALL *GrProc)();
-
-/*
-** -----------------------------------------------------------------------
-** CONSTANTS AND TYPES
-** -----------------------------------------------------------------------
-*/
-#define GR_NULL_MIPMAP_HANDLE  ((GrMipMapId_t) -1)
-
-#define GR_MIPMAPLEVELMASK_EVEN  FXBIT(0)
-#define GR_MIPMAPLEVELMASK_ODD  FXBIT(1)
-#define GR_MIPMAPLEVELMASK_BOTH (GR_MIPMAPLEVELMASK_EVEN | GR_MIPMAPLEVELMASK_ODD )
-
-#define GR_LODBIAS_BILINEAR     0.5
-#define GR_LODBIAS_TRILINEAR    0.0
-
-typedef FxI32 GrChipID_t;
-#define GR_TMU0         0x0
-#define GR_TMU1         0x1
-#define GR_TMU2         0x2
-
-#define GR_FBI          0x0
-
-typedef FxI32 GrCombineFunction_t;
-#define GR_COMBINE_FUNCTION_ZERO        0x0
-#define GR_COMBINE_FUNCTION_NONE        GR_COMBINE_FUNCTION_ZERO
-#define GR_COMBINE_FUNCTION_LOCAL       0x1
-#define GR_COMBINE_FUNCTION_LOCAL_ALPHA 0x2
-#define GR_COMBINE_FUNCTION_SCALE_OTHER 0x3
-#define GR_COMBINE_FUNCTION_BLEND_OTHER GR_COMBINE_FUNCTION_SCALE_OTHER
-#define GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL 0x4
-#define GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL_ALPHA 0x5 
-#define GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL 0x6
-#define GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL 0x7
-#define GR_COMBINE_FUNCTION_BLEND GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL
-#define GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL_ALPHA 0x8
-#define GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL 0x9
-#define GR_COMBINE_FUNCTION_BLEND_LOCAL GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL
-#define GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL_ALPHA 0x10
-
-typedef FxI32 GrCombineFactor_t;
-#define GR_COMBINE_FACTOR_ZERO          0x0
-#define GR_COMBINE_FACTOR_NONE          GR_COMBINE_FACTOR_ZERO
-#define GR_COMBINE_FACTOR_LOCAL         0x1
-#define GR_COMBINE_FACTOR_OTHER_ALPHA   0x2
-#define GR_COMBINE_FACTOR_LOCAL_ALPHA   0x3
-#define GR_COMBINE_FACTOR_TEXTURE_ALPHA 0x4
-#define GR_COMBINE_FACTOR_TEXTURE_RGB   0x5
-#define GR_COMBINE_FACTOR_DETAIL_FACTOR GR_COMBINE_FACTOR_TEXTURE_ALPHA
-#define GR_COMBINE_FACTOR_LOD_FRACTION  0x5
-#define GR_COMBINE_FACTOR_ONE           0x8
-#define GR_COMBINE_FACTOR_ONE_MINUS_LOCAL 0x9
-#define GR_COMBINE_FACTOR_ONE_MINUS_OTHER_ALPHA 0xa
-#define GR_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA 0xb
-#define GR_COMBINE_FACTOR_ONE_MINUS_TEXTURE_ALPHA 0xc
-#define GR_COMBINE_FACTOR_ONE_MINUS_DETAIL_FACTOR GR_COMBINE_FACTOR_ONE_MINUS_TEXTURE_ALPHA
-#define GR_COMBINE_FACTOR_ONE_MINUS_LOD_FRACTION 0xd
-
-
-typedef FxI32 GrCombineLocal_t;
-#define GR_COMBINE_LOCAL_ITERATED 0x0
-#define GR_COMBINE_LOCAL_CONSTANT 0x1
-#define GR_COMBINE_LOCAL_NONE GR_COMBINE_LOCAL_CONSTANT
-#define GR_COMBINE_LOCAL_DEPTH  0x2
-
-typedef FxI32 GrCombineOther_t;
-#define GR_COMBINE_OTHER_ITERATED 0x0
-#define GR_COMBINE_OTHER_TEXTURE 0x1
-#define GR_COMBINE_OTHER_CONSTANT 0x2
-#define GR_COMBINE_OTHER_NONE GR_COMBINE_OTHER_CONSTANT
-
-
-typedef FxI32 GrAlphaSource_t;
-#define GR_ALPHASOURCE_CC_ALPHA 0x0
-#define GR_ALPHASOURCE_ITERATED_ALPHA 0x1
-#define GR_ALPHASOURCE_TEXTURE_ALPHA 0x2
-#define GR_ALPHASOURCE_TEXTURE_ALPHA_TIMES_ITERATED_ALPHA 0x3
-
-
-typedef FxI32 GrColorCombineFnc_t;
-#define GR_COLORCOMBINE_ZERO 0x0
-#define GR_COLORCOMBINE_CCRGB 0x1
-#define GR_COLORCOMBINE_ITRGB 0x2
-#define GR_COLORCOMBINE_ITRGB_DELTA0 0x3
-#define GR_COLORCOMBINE_DECAL_TEXTURE 0x4
-#define GR_COLORCOMBINE_TEXTURE_TIMES_CCRGB 0x5
-#define GR_COLORCOMBINE_TEXTURE_TIMES_ITRGB 0x6
-#define GR_COLORCOMBINE_TEXTURE_TIMES_ITRGB_DELTA0 0x7
-#define GR_COLORCOMBINE_TEXTURE_TIMES_ITRGB_ADD_ALPHA 0x8
-#define GR_COLORCOMBINE_TEXTURE_TIMES_ALPHA 0x9
-#define GR_COLORCOMBINE_TEXTURE_TIMES_ALPHA_ADD_ITRGB 0xa
-#define GR_COLORCOMBINE_TEXTURE_ADD_ITRGB 0xb
-#define GR_COLORCOMBINE_TEXTURE_SUB_ITRGB 0xc
-#define GR_COLORCOMBINE_CCRGB_BLEND_ITRGB_ON_TEXALPHA 0xd
-#define GR_COLORCOMBINE_DIFF_SPEC_A 0xe
-#define GR_COLORCOMBINE_DIFF_SPEC_B 0xf
-#define GR_COLORCOMBINE_ONE 0x10
-
-typedef FxI32 GrAlphaBlendFnc_t;
-#define GR_BLEND_ZERO 0x0
-#define GR_BLEND_SRC_ALPHA 0x1
-#define GR_BLEND_SRC_COLOR 0x2
-#define GR_BLEND_DST_COLOR GR_BLEND_SRC_COLOR
-#define GR_BLEND_DST_ALPHA 0x3 
-#define GR_BLEND_ONE 0x4
-#define GR_BLEND_ONE_MINUS_SRC_ALPHA 0x5
-#define GR_BLEND_ONE_MINUS_SRC_COLOR 0x6
-#define GR_BLEND_ONE_MINUS_DST_COLOR GR_BLEND_ONE_MINUS_SRC_COLOR 
-#define GR_BLEND_ONE_MINUS_DST_ALPHA 0x7
-#define GR_BLEND_RESERVED_8 0x8
-#define GR_BLEND_RESERVED_9 0x9
-#define GR_BLEND_RESERVED_A 0xa
-#define GR_BLEND_RESERVED_B 0xb
-#define GR_BLEND_RESERVED_C 0xc
-#define GR_BLEND_RESERVED_D 0xd
-#define GR_BLEND_RESERVED_E 0xe
-#define GR_BLEND_ALPHA_SATURATE 0xf
-#define GR_BLEND_PREFOG_COLOR GR_BLEND_ALPHA_SATURATE
-
-typedef FxI32 GrAspectRatio_t;
-#define GR_ASPECT_LOG2_8x1        3       /* 8W x 1H */
-#define GR_ASPECT_LOG2_4x1        2       /* 4W x 1H */
-#define GR_ASPECT_LOG2_2x1        1       /* 2W x 1H */
-#define GR_ASPECT_LOG2_1x1        0       /* 1W x 1H */
-#define GR_ASPECT_LOG2_1x2       -1       /* 1W x 2H */
-#define GR_ASPECT_LOG2_1x4       -2       /* 1W x 4H */
-#define GR_ASPECT_LOG2_1x8       -3       /* 1W x 8H */
-
-typedef FxI32 GrBuffer_t;
-#define GR_BUFFER_FRONTBUFFER   0x0
-#define GR_BUFFER_BACKBUFFER    0x1
-#define GR_BUFFER_AUXBUFFER     0x2
-#define GR_BUFFER_DEPTHBUFFER   0x3
-#define GR_BUFFER_ALPHABUFFER   0x4
-#define GR_BUFFER_TRIPLEBUFFER  0x5
-
-typedef FxI32 GrChromakeyMode_t;
-#define GR_CHROMAKEY_DISABLE    0x0
-#define GR_CHROMAKEY_ENABLE     0x1
-
-typedef FxI32 GrChromaRangeMode_t;
-#define GR_CHROMARANGE_RGB_ALL_EXT  0x0
-
-#define GR_CHROMARANGE_DISABLE_EXT  0x00
-#define GR_CHROMARANGE_ENABLE_EXT   0x01
-
-typedef FxI32 GrTexChromakeyMode_t;
-#define GR_TEXCHROMA_DISABLE_EXT               0x0
-#define GR_TEXCHROMA_ENABLE_EXT                0x1
-
-#define GR_TEXCHROMARANGE_RGB_ALL_EXT  0x0
-
-typedef FxI32 GrCmpFnc_t;
-#define GR_CMP_NEVER    0x0
-#define GR_CMP_LESS     0x1
-#define GR_CMP_EQUAL    0x2
-#define GR_CMP_LEQUAL   0x3
-#define GR_CMP_GREATER  0x4
-#define GR_CMP_NOTEQUAL 0x5
-#define GR_CMP_GEQUAL   0x6
-#define GR_CMP_ALWAYS   0x7
-
-typedef FxI32 GrColorFormat_t;
-#define GR_COLORFORMAT_ARGB     0x0
-#define GR_COLORFORMAT_ABGR     0x1
-
-#define GR_COLORFORMAT_RGBA     0x2
-#define GR_COLORFORMAT_BGRA     0x3
-
-typedef FxI32 GrCullMode_t;
-#define GR_CULL_DISABLE         0x0
-#define GR_CULL_NEGATIVE        0x1
-#define GR_CULL_POSITIVE        0x2
-
-typedef FxI32 GrDepthBufferMode_t;
-#define GR_DEPTHBUFFER_DISABLE                  0x0
-#define GR_DEPTHBUFFER_ZBUFFER                  0x1
-#define GR_DEPTHBUFFER_WBUFFER                  0x2
-#define GR_DEPTHBUFFER_ZBUFFER_COMPARE_TO_BIAS  0x3
-#define GR_DEPTHBUFFER_WBUFFER_COMPARE_TO_BIAS  0x4
-
-typedef FxI32 GrDitherMode_t;
-#define GR_DITHER_DISABLE       0x0
-#define GR_DITHER_2x2           0x1
-#define GR_DITHER_4x4           0x2
-
-typedef FxI32 GrStippleMode_t;
-#define GR_STIPPLE_DISABLE	0x0
-#define GR_STIPPLE_PATTERN	0x1
-#define GR_STIPPLE_ROTATE	0x2
-
-typedef FxI32 GrFogMode_t;
-#define GR_FOG_DISABLE                     0x0
-#define GR_FOG_WITH_TABLE_ON_FOGCOORD_EXT  0x1
-#define GR_FOG_WITH_TABLE_ON_Q             0x2
-#define GR_FOG_WITH_TABLE_ON_W             GR_FOG_WITH_TABLE_ON_Q
-#define GR_FOG_WITH_ITERATED_Z             0x3
-#define GR_FOG_WITH_ITERATED_ALPHA_EXT     0x4
-#define GR_FOG_MULT2                       0x100
-#define GR_FOG_ADD2                        0x200
-
-typedef FxU32 GrLock_t;
-#define GR_LFB_READ_ONLY  0x00
-#define GR_LFB_WRITE_ONLY 0x01
-#define GR_LFB_IDLE       0x00
-#define GR_LFB_NOIDLE     0x10
-
-#define GR_LFB_WRITE_ONLY_EXPLICIT_EXT	0x02 /* explicitly not allow reading from the lfb pointer */
-
-typedef FxI32 GrLfbBypassMode_t;
-#define GR_LFBBYPASS_DISABLE    0x0
-#define GR_LFBBYPASS_ENABLE     0x1
-
-typedef FxI32 GrLfbWriteMode_t;
-#define GR_LFBWRITEMODE_565        0x0 /* RGB:RGB */
-#define GR_LFBWRITEMODE_555        0x1 /* RGB:RGB */
-#define GR_LFBWRITEMODE_1555       0x2 /* ARGB:ARGB */
-#define GR_LFBWRITEMODE_RESERVED1  0x3
-#define GR_LFBWRITEMODE_888        0x4 /* RGB */
-#define GR_LFBWRITEMODE_8888       0x5 /* ARGB */
-#define GR_LFBWRITEMODE_RESERVED2  0x6
-#define GR_LFBWRITEMODE_RESERVED3  0x7
-#define GR_LFBWRITEMODE_RESERVED4  0x8
-#define GR_LFBWRITEMODE_RESERVED5  0x9
-#define GR_LFBWRITEMODE_RESERVED6  0xa
-#define GR_LFBWRITEMODE_RESERVED7  0xb
-#define GR_LFBWRITEMODE_565_DEPTH  0xc /* RGB:DEPTH */
-#define GR_LFBWRITEMODE_555_DEPTH  0xd /* RGB:DEPTH */
-#define GR_LFBWRITEMODE_1555_DEPTH 0xe /* ARGB:DEPTH */
-#define GR_LFBWRITEMODE_ZA16       0xf /* DEPTH:DEPTH */
-#define GR_LFBWRITEMODE_ANY        0xFF
-
-
-typedef FxI32 GrOriginLocation_t;
-#define GR_ORIGIN_UPPER_LEFT    0x0
-#define GR_ORIGIN_LOWER_LEFT    0x1
-#define GR_ORIGIN_ANY           0xFF
-
-typedef struct {
-    int                size;
-    void               *lfbPtr;
-    FxU32              strideInBytes;        
-    GrLfbWriteMode_t   writeMode;
-    GrOriginLocation_t origin;
-} GrLfbInfo_t;
-
-typedef FxI32 GrLOD_t;
-#define GR_LOD_LOG2_256         0x8
-#define GR_LOD_LOG2_128         0x7
-#define GR_LOD_LOG2_64          0x6
-#define GR_LOD_LOG2_32          0x5
-#define GR_LOD_LOG2_16          0x4
-#define GR_LOD_LOG2_8           0x3
-#define GR_LOD_LOG2_4           0x2
-#define GR_LOD_LOG2_2           0x1
-#define GR_LOD_LOG2_1           0x0
-
-typedef FxI32 GrMipMapMode_t;
-#define GR_MIPMAP_DISABLE               0x0 /* no mip mapping  */
-#define GR_MIPMAP_NEAREST               0x1 /* use nearest mipmap */
-#define GR_MIPMAP_NEAREST_DITHER        0x2 /* GR_MIPMAP_NEAREST + LOD dith */
-
-typedef FxI32 GrSmoothingMode_t;
-#define GR_SMOOTHING_DISABLE    0x0
-#define GR_SMOOTHING_ENABLE     0x1
-
-typedef FxI32 GrTextureClampMode_t;
-#define GR_TEXTURECLAMP_WRAP        0x0
-#define GR_TEXTURECLAMP_CLAMP       0x1
-#define GR_TEXTURECLAMP_MIRROR_EXT  0x2
-
-typedef FxI32 GrTextureCombineFnc_t;
-#define GR_TEXTURECOMBINE_ZERO          0x0 /* texout = 0 */
-#define GR_TEXTURECOMBINE_DECAL         0x1 /* texout = texthis */
-#define GR_TEXTURECOMBINE_OTHER         0x2 /* this TMU in passthru mode */
-#define GR_TEXTURECOMBINE_ADD           0x3 /* tout = tthis + t(this+1) */
-#define GR_TEXTURECOMBINE_MULTIPLY      0x4 /* texout = tthis * t(this+1) */
-#define GR_TEXTURECOMBINE_SUBTRACT      0x5 /* Sutract from upstream TMU */
-#define GR_TEXTURECOMBINE_DETAIL        0x6 /* detail--detail on tthis */
-#define GR_TEXTURECOMBINE_DETAIL_OTHER  0x7 /* detail--detail on tthis+1 */
-#define GR_TEXTURECOMBINE_TRILINEAR_ODD 0x8 /* trilinear--odd levels tthis*/
-#define GR_TEXTURECOMBINE_TRILINEAR_EVEN 0x9 /*trilinear--even levels tthis*/
-#define GR_TEXTURECOMBINE_ONE           0xa /* texout = 0xFFFFFFFF */
-
-typedef FxI32 GrTextureFilterMode_t;
-#define GR_TEXTUREFILTER_POINT_SAMPLED  0x0
-#define GR_TEXTUREFILTER_BILINEAR       0x1
-
-typedef FxI32 GrTextureFormat_t;
-/* KoolSmoky - */
-#define GR_TEXFMT_8BIT                  0x0
-#define GR_TEXFMT_RGB_332               GR_TEXFMT_8BIT
-#define GR_TEXFMT_YIQ_422               0x1
-#define GR_TEXFMT_ALPHA_8               0x2 /* (0..0xFF) alpha     */
-#define GR_TEXFMT_INTENSITY_8           0x3 /* (0..0xFF) intensity */
-#define GR_TEXFMT_ALPHA_INTENSITY_44    0x4
-#define GR_TEXFMT_P_8                   0x5 /* 8-bit palette */
-#define GR_TEXFMT_RSVD0                 0x6 /* GR_TEXFMT_P_8_RGBA */
-#define GR_TEXFMT_P_8_6666              GR_TEXFMT_RSVD0
-#define GR_TEXFMT_P_8_6666_EXT          GR_TEXFMT_RSVD0
-#define GR_TEXFMT_RSVD1                 0x7
-#define GR_TEXFMT_16BIT                 0x8
-#define GR_TEXFMT_ARGB_8332             GR_TEXFMT_16BIT
-#define GR_TEXFMT_AYIQ_8422             0x9
-#define GR_TEXFMT_RGB_565               0xa
-#define GR_TEXFMT_ARGB_1555             0xb
-#define GR_TEXFMT_ARGB_4444             0xc
-#define GR_TEXFMT_ALPHA_INTENSITY_88    0xd
-#define GR_TEXFMT_AP_88                 0xe /* 8-bit alpha 8-bit palette */
-#define GR_TEXFMT_RSVD2                 0xf
-#define GR_TEXFMT_RSVD4                 GR_TEXFMT_RSVD2
-
-typedef FxU32 GrTexTable_t;
-#define GR_TEXTABLE_NCC0                 0x0
-#define GR_TEXTABLE_NCC1                 0x1
-#define GR_TEXTABLE_PALETTE              0x2
-#define GR_TEXTABLE_PALETTE_6666_EXT     0x3
-
-typedef FxU32 GrNCCTable_t;
-#define GR_NCCTABLE_NCC0    0x0
-#define GR_NCCTABLE_NCC1    0x1
-
-typedef FxU32 GrTexBaseRange_t;
-#define GR_TEXBASE_256      0x3
-#define GR_TEXBASE_128      0x2
-#define GR_TEXBASE_64       0x1
-#define GR_TEXBASE_32_TO_1  0x0
-
-
-typedef FxU32 GrEnableMode_t;
-#define GR_MODE_DISABLE     0x0
-#define GR_MODE_ENABLE      0x1
-
-#define GR_AA_ORDERED            0x01
-#define GR_ALLOW_MIPMAP_DITHER   0x02
-#define GR_PASSTHRU              0x03
-#define GR_SHAMELESS_PLUG        0x04
-#define GR_VIDEO_SMOOTHING       0x05
-
-typedef FxU32 GrCoordinateSpaceMode_t;
-#define GR_WINDOW_COORDS    0x00
-#define GR_CLIP_COORDS      0x01
-
-/* Types of data in strips */
-#define GR_FLOAT        0
-#define GR_U8           1
-
-/* Parameters for strips */
-#define GR_PARAM_XY       0x01
-#define GR_PARAM_Z        0x02
-#define GR_PARAM_W        0x03
-#define GR_PARAM_Q        0x04
-#define GR_PARAM_FOG_EXT  0x05
-
-#define GR_PARAM_A        0x10
-
-#define GR_PARAM_RGB      0x20
-
-#define GR_PARAM_PARGB    0x30
-
-#define GR_PARAM_ST0      0x40
-#define GR_PARAM_ST1      GR_PARAM_ST0+1
-#define GR_PARAM_ST2      GR_PARAM_ST0+2
-
-#define GR_PARAM_Q0       0x50
-#define GR_PARAM_Q1       GR_PARAM_Q0+1
-#define GR_PARAM_Q2       GR_PARAM_Q0+2
-
-#define GR_PARAM_DISABLE  0x00
-#define GR_PARAM_ENABLE   0x01
-
-/*
-** grDrawVertexArray/grDrawVertexArrayContiguous primitive type
-*/
-#define GR_POINTS                        0
-#define GR_LINE_STRIP                    1
-#define GR_LINES                         2
-#define GR_POLYGON                       3
-#define GR_TRIANGLE_STRIP                4
-#define GR_TRIANGLE_FAN                  5
-#define GR_TRIANGLES                     6
-#define GR_TRIANGLE_STRIP_CONTINUE       7
-#define GR_TRIANGLE_FAN_CONTINUE         8
-
-/* 
-** grGet/grReset types
-*/
-#define GR_BITS_DEPTH                   0x01
-#define GR_BITS_RGBA                    0x02
-#define GR_FIFO_FULLNESS                0x03
-#define GR_FOG_TABLE_ENTRIES            0x04
-#define GR_GAMMA_TABLE_ENTRIES          0x05
-#define GR_GLIDE_STATE_SIZE             0x06
-#define GR_GLIDE_VERTEXLAYOUT_SIZE      0x07
-#define GR_IS_BUSY                      0x08
-#define GR_LFB_PIXEL_PIPE               0x09
-#define GR_MAX_TEXTURE_SIZE             0x0a
-#define GR_MAX_TEXTURE_ASPECT_RATIO     0x0b
-#define GR_MEMORY_FB                    0x0c
-#define GR_MEMORY_TMU                   0x0d
-#define GR_MEMORY_UMA                   0x0e
-#define GR_NUM_BOARDS                   0x0f
-#define GR_NON_POWER_OF_TWO_TEXTURES    0x10
-#define GR_NUM_FB                       0x11
-#define GR_NUM_SWAP_HISTORY_BUFFER      0x12
-#define GR_NUM_TMU                      0x13
-#define GR_PENDING_BUFFERSWAPS          0x14
-#define GR_REVISION_FB                  0x15
-#define GR_REVISION_TMU                 0x16
-#define GR_STATS_LINES                  0x17  /* grGet/grReset */
-#define GR_STATS_PIXELS_AFUNC_FAIL      0x18
-#define GR_STATS_PIXELS_CHROMA_FAIL     0x19
-#define GR_STATS_PIXELS_DEPTHFUNC_FAIL  0x1a
-#define GR_STATS_PIXELS_IN              0x1b
-#define GR_STATS_PIXELS_OUT             0x1c
-#define GR_STATS_PIXELS                 0x1d  /* grReset */
-#define GR_STATS_POINTS                 0x1e  /* grGet/grReset */
-#define GR_STATS_TRIANGLES_IN           0x1f
-#define GR_STATS_TRIANGLES_OUT          0x20
-#define GR_STATS_TRIANGLES              0x21  /* grReset */
-#define GR_SWAP_HISTORY                 0x22
-#define GR_SUPPORTS_PASSTHRU            0x23
-#define GR_TEXTURE_ALIGN                0x24
-#define GR_VIDEO_POSITION               0x25
-#define GR_VIEWPORT                     0x26
-#define GR_WDEPTH_MIN_MAX               0x27
-#define GR_ZDEPTH_MIN_MAX               0x28
-#define GR_VERTEX_PARAMETER             0x29
-#define GR_BITS_GAMMA                   0x2a
-#define GR_GET_RESERVED_1               0x1000
-
-/*
-** grGetString types
-*/
-#define GR_EXTENSION                    0xa0
-#define GR_HARDWARE                     0xa1
-#define GR_RENDERER                     0xa2
-#define GR_VENDOR                       0xa3
-#define GR_VERSION                      0xa4
-
-/*
-** -----------------------------------------------------------------------
-** STRUCTURES
-** -----------------------------------------------------------------------
-*/
-
-typedef struct {
-    GrLOD_t           smallLodLog2;
-    GrLOD_t           largeLodLog2;
-    GrAspectRatio_t   aspectRatioLog2;
-    GrTextureFormat_t format;
-    void              *data;
-} GrTexInfo;
-
-typedef struct GrSstPerfStats_s {
-  FxU32  pixelsIn;              /* # pixels processed (minus buffer clears) */
-  FxU32  chromaFail;            /* # pixels not drawn due to chroma key */ 
-  FxU32  zFuncFail;             /* # pixels not drawn due to Z comparison */
-  FxU32  aFuncFail;             /* # pixels not drawn due to alpha comparison */
-  FxU32  pixelsOut;             /* # pixels drawn (including buffer clears) */
-} GrSstPerfStats_t;
-
-typedef struct {
-  GrScreenResolution_t resolution;
-  GrScreenRefresh_t    refresh;
-  int                  numColorBuffers;
-  int                  numAuxBuffers;
-} GrResolution;
-
-typedef GrResolution GlideResolution;
-
-#define GR_QUERY_ANY  ((FxU32)(~0))
-
-typedef FxU32 GrLfbSrcFmt_t;
-#define GR_LFB_SRC_FMT_565          0x00
-#define GR_LFB_SRC_FMT_555          0x01
-#define GR_LFB_SRC_FMT_1555         0x02
-#define GR_LFB_SRC_FMT_888          0x04
-#define GR_LFB_SRC_FMT_8888         0x05
-#define GR_LFB_SRC_FMT_565_DEPTH    0x0c
-#define GR_LFB_SRC_FMT_555_DEPTH    0x0d
-#define GR_LFB_SRC_FMT_1555_DEPTH   0x0e
-#define GR_LFB_SRC_FMT_ZA16         0x0f
-#define GR_LFB_SRC_FMT_RLE16        0x80
-
-#ifdef H3D
-#define GR_HINT_H3DENABLE               4
-#undef  GR_HINTTYPE_MAX
-#define GR_HINTTYPE_MAX 4
-#endif
-
-/*
-** -----------------------------------------------------------------------
-** FUNCTION PROTOTYPES
-** -----------------------------------------------------------------------
-*/
-#ifndef FX_GLIDE_NO_FUNC_PROTO
-/*
-** rendering functions
-*/
-FX_ENTRY void FX_CALL
-grDrawPoint( const void *pt );
-
-FX_ENTRY void FX_CALL
-grDrawLine( const void *v1, const void *v2 );
-
-FX_ENTRY void FX_CALL
-grDrawTriangle( const void *a, const void *b, const void *c );
-
-FX_ENTRY void FX_CALL
-grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode);
-
-FX_ENTRY void FX_CALL 
-grDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers);
-
-FX_ENTRY void FX_CALL 
-grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride);
-
-/*
-**  Antialiasing Functions
-*/
-
-FX_ENTRY void FX_CALL
-grAADrawTriangle(
-                 const void *a, const void *b, const void *c,
-                 FxBool ab_antialias, FxBool bc_antialias, FxBool ca_antialias
-                 );
-
-/*
-** buffer management
-*/
-FX_ENTRY void FX_CALL
-grBufferClear( GrColor_t color, GrAlpha_t alpha, FxU32 depth );
-
-FX_ENTRY void FX_CALL
-grBufferSwap( FxU32 swap_interval );
-
-FX_ENTRY void FX_CALL
-grRenderBuffer( GrBuffer_t buffer );
-
-/*
-** error management
-*/
-typedef void (*GrErrorCallbackFnc_t)( const char *string, FxBool fatal );
-
-FX_ENTRY void FX_CALL 
-grErrorSetCallback( GrErrorCallbackFnc_t fnc );
-
-/*
-** SST routines
-*/
-FX_ENTRY void FX_CALL 
-grFinish(void);
-
-FX_ENTRY void FX_CALL 
-grFlush(void);
-
-FX_ENTRY GrContext_t FX_CALL 
-grSstWinOpen(
-          FxU32                hWnd,
-          GrScreenResolution_t screen_resolution,
-          GrScreenRefresh_t    refresh_rate,
-          GrColorFormat_t      color_format,
-          GrOriginLocation_t   origin_location,
-          int                  nColBuffers,
-          int                  nAuxBuffers);
-
-FX_ENTRY FxBool FX_CALL
-grSstWinClose( GrContext_t context );
-
-FX_ENTRY void FX_CALL
-grSetNumPendingBuffers(FxI32 NumPendingBuffers);
-
-FX_ENTRY FxBool FX_CALL
-grSelectContext( GrContext_t context );
-
-FX_ENTRY void FX_CALL
-grSstOrigin(GrOriginLocation_t  origin);
-
-FX_ENTRY void FX_CALL 
-grSstSelect( int which_sst );
-
-/*
-** Glide configuration and special effect maintenance functions
-*/
-FX_ENTRY void FX_CALL
-grAlphaBlendFunction(
-                     GrAlphaBlendFnc_t rgb_sf,   GrAlphaBlendFnc_t rgb_df,
-                     GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df
-                     );
-
-FX_ENTRY void FX_CALL
-grAlphaCombine(
-               GrCombineFunction_t function, GrCombineFactor_t factor,
-               GrCombineLocal_t local, GrCombineOther_t other,
-               FxBool invert
-               );
-
-FX_ENTRY void FX_CALL
-grAlphaControlsITRGBLighting( FxBool enable );
-
-FX_ENTRY void FX_CALL
-grAlphaTestFunction( GrCmpFnc_t function );
-
-FX_ENTRY void FX_CALL
-grAlphaTestReferenceValue( GrAlpha_t value );
-
-FX_ENTRY void FX_CALL 
-grChromakeyMode( GrChromakeyMode_t mode );
-
-FX_ENTRY void FX_CALL 
-grChromakeyValue( GrColor_t value );
-
-FX_ENTRY void FX_CALL 
-grClipWindow( FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy );
-
-FX_ENTRY void FX_CALL 
-grColorCombine(
-               GrCombineFunction_t function, GrCombineFactor_t factor,
-               GrCombineLocal_t local, GrCombineOther_t other,
-               FxBool invert );
-
-FX_ENTRY void FX_CALL
-grColorMask( FxBool rgb, FxBool a );
-
-FX_ENTRY void FX_CALL 
-grCullMode( GrCullMode_t mode );
-
-FX_ENTRY void FX_CALL 
-grConstantColorValue( GrColor_t value );
-
-FX_ENTRY void FX_CALL 
-grDepthBiasLevel( FxI32 level );
-
-FX_ENTRY void FX_CALL 
-grDepthBufferFunction( GrCmpFnc_t function );
-
-FX_ENTRY void FX_CALL 
-grDepthBufferMode( GrDepthBufferMode_t mode );
-
-FX_ENTRY void FX_CALL 
-grDepthMask( FxBool mask );
-
-FX_ENTRY void FX_CALL 
-grDisableAllEffects( void );
-
-FX_ENTRY void FX_CALL 
-grDitherMode( GrDitherMode_t mode );
-
-FX_ENTRY void FX_CALL 
-grFogColorValue( GrColor_t fogcolor );
-
-FX_ENTRY void FX_CALL 
-grFogMode( GrFogMode_t mode );
-
-FX_ENTRY void FX_CALL 
-grFogTable( const GrFog_t ft[] );
-
-FX_ENTRY void FX_CALL 
-grLoadGammaTable( FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue);
-
-FX_ENTRY void FX_CALL
-grSplash(float x, float y, float width, float height, FxU32 frame);
-
-FX_ENTRY FxU32 FX_CALL 
-grGet( FxU32 pname, FxU32 plength, FxI32 *params );
-
-FX_ENTRY const char * FX_CALL 
-grGetString( FxU32 pname );
-
-FX_ENTRY FxI32 FX_CALL 
-grQueryResolutions( const GrResolution *resTemplate, GrResolution *output );
-
-FX_ENTRY FxBool FX_CALL 
-grReset( FxU32 what );
-
-FX_ENTRY GrProc FX_CALL
-grGetProcAddress( char *procName );
-
-FX_ENTRY void FX_CALL 
-grEnable( GrEnableMode_t mode );
-
-FX_ENTRY void FX_CALL 
-grDisable( GrEnableMode_t mode );
-
-FX_ENTRY void FX_CALL 
-grCoordinateSpace( GrCoordinateSpaceMode_t mode );
-
-FX_ENTRY void FX_CALL 
-grDepthRange( FxFloat n, FxFloat f );
-
-FX_ENTRY void FX_CALL 
-grStippleMode( GrStippleMode_t mode );
-
-FX_ENTRY void FX_CALL 
-grStipplePattern( GrStipplePattern_t mode );
-
-FX_ENTRY void FX_CALL 
-grViewport( FxI32 x, FxI32 y, FxI32 width, FxI32 height );
-
-/*
-** texture mapping control functions
-*/
-FX_ENTRY FxU32 FX_CALL 
-grTexCalcMemRequired(
-                     GrLOD_t lodmin, GrLOD_t lodmax,
-                     GrAspectRatio_t aspect, GrTextureFormat_t fmt);
-
-FX_ENTRY FxU32 FX_CALL 
-grTexTextureMemRequired( FxU32     evenOdd,
-                                 GrTexInfo *info   );
-
-FX_ENTRY FxU32 FX_CALL 
-grTexMinAddress( GrChipID_t tmu );
-
-FX_ENTRY FxU32 FX_CALL 
-grTexMaxAddress( GrChipID_t tmu );
-
-FX_ENTRY void FX_CALL 
-grTexNCCTable( GrNCCTable_t table );
-
-FX_ENTRY void FX_CALL 
-grTexSource( GrChipID_t tmu,
-             FxU32      startAddress,
-             FxU32      evenOdd,
-             GrTexInfo  *info );
-
-FX_ENTRY void FX_CALL 
-grTexClampMode(
-               GrChipID_t tmu,
-               GrTextureClampMode_t s_clampmode,
-               GrTextureClampMode_t t_clampmode
-               );
-
-FX_ENTRY void FX_CALL 
-grTexCombine(
-             GrChipID_t tmu,
-             GrCombineFunction_t rgb_function,
-             GrCombineFactor_t rgb_factor, 
-             GrCombineFunction_t alpha_function,
-             GrCombineFactor_t alpha_factor,
-             FxBool rgb_invert,
-             FxBool alpha_invert
-             );
-
-FX_ENTRY void FX_CALL 
-grTexDetailControl(
-                   GrChipID_t tmu,
-                   int lod_bias,
-                   FxU8 detail_scale,
-                   float detail_max
-                   );
-
-FX_ENTRY void FX_CALL 
-grTexFilterMode(
-                GrChipID_t tmu,
-                GrTextureFilterMode_t minfilter_mode,
-                GrTextureFilterMode_t magfilter_mode
-                );
-
-
-FX_ENTRY void FX_CALL 
-grTexLodBiasValue(GrChipID_t tmu, float bias );
-
-FX_ENTRY void FX_CALL 
-grTexDownloadMipMap( GrChipID_t tmu,
-                     FxU32      startAddress,
-                     FxU32      evenOdd,
-                     GrTexInfo  *info );
-
-FX_ENTRY void FX_CALL 
-grTexDownloadMipMapLevel( GrChipID_t        tmu,
-                          FxU32             startAddress,
-                          GrLOD_t           thisLod,
-                          GrLOD_t           largeLod,
-                          GrAspectRatio_t   aspectRatio,
-                          GrTextureFormat_t format,
-                          FxU32             evenOdd,
-                          void              *data );
-
-FX_ENTRY FxBool FX_CALL 
-grTexDownloadMipMapLevelPartial( GrChipID_t        tmu,
-                                 FxU32             startAddress,
-                                 GrLOD_t           thisLod,
-                                 GrLOD_t           largeLod,
-                                 GrAspectRatio_t   aspectRatio,
-                                 GrTextureFormat_t format,
-                                 FxU32             evenOdd,
-                                 void              *data,
-                                 int               start,
-                                 int               end );
-
-FX_ENTRY void FX_CALL
-grTexDownloadTable( GrTexTable_t type, 
-                    void         *data );
-
-FX_ENTRY void FX_CALL
-grTexDownloadTablePartial( GrTexTable_t type, 
-                           void         *data,
-                           int          start,
-                           int          end );
-
-FX_ENTRY void FX_CALL 
-grTexMipMapMode( GrChipID_t     tmu, 
-                 GrMipMapMode_t mode,
-                 FxBool         lodBlend );
-
-FX_ENTRY void FX_CALL 
-grTexMultibase( GrChipID_t tmu,
-                FxBool     enable );
-
-FX_ENTRY void FX_CALL
-grTexMultibaseAddress( GrChipID_t       tmu,
-                       GrTexBaseRange_t range,
-                       FxU32            startAddress,
-                       FxU32            evenOdd,
-                       GrTexInfo        *info );
-
-/*
-** linear frame buffer functions
-*/
-
-FX_ENTRY FxBool FX_CALL
-grLfbLock( GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode,
-           GrOriginLocation_t origin, FxBool pixelPipeline, 
-           GrLfbInfo_t *info );
-
-FX_ENTRY FxBool FX_CALL
-grLfbUnlock( GrLock_t type, GrBuffer_t buffer );
-
-FX_ENTRY void FX_CALL 
-grLfbConstantAlpha( GrAlpha_t alpha );
-
-FX_ENTRY void FX_CALL 
-grLfbConstantDepth( FxU32 depth );
-
-FX_ENTRY void FX_CALL 
-grLfbWriteColorSwizzle(FxBool swizzleBytes, FxBool swapWords);
-
-FX_ENTRY void FX_CALL
-grLfbWriteColorFormat(GrColorFormat_t colorFormat);
-
-FX_ENTRY FxBool FX_CALL
-grLfbWriteRegion( GrBuffer_t dst_buffer, 
-                  FxU32 dst_x, FxU32 dst_y, 
-                  GrLfbSrcFmt_t src_format, 
-                  FxU32 src_width, FxU32 src_height, 
-                  FxBool pixelPipeline,
-                  FxI32 src_stride, void *src_data );
-
-FX_ENTRY FxBool FX_CALL
-grLfbReadRegion( GrBuffer_t src_buffer,
-                 FxU32 src_x, FxU32 src_y,
-                 FxU32 src_width, FxU32 src_height,
-                 FxU32 dst_stride, void *dst_data );
-
-/*
-** glide management functions
-*/
-FX_ENTRY void FX_CALL
-grGlideInit( void );
-
-FX_ENTRY void FX_CALL
-grGlideShutdown( void );
-
-FX_ENTRY void FX_CALL
-grGlideGetState( void *state );
-
-FX_ENTRY void FX_CALL
-grGlideSetState( const void *state );
-
-FX_ENTRY void FX_CALL
-grGlideGetVertexLayout( void *layout );
-
-FX_ENTRY void FX_CALL
-grGlideSetVertexLayout( const void *layout );
-
-#endif /* FX_GLIDE_NO_FUNC_PROTO */
-
-#ifdef __cplusplus
-}
-#endif
-
-#include <glideutl.h>
-
-#endif /* __GLIDE_H__ */
diff --git a/Source/Glide64/inc/glidesys.h b/Source/Glide64/inc/glidesys.h
deleted file mode 100644
index 4925b9d95..000000000
--- a/Source/Glide64/inc/glidesys.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
-** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
-** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
-** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
-** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
-** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
-** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
-** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
-** 
-** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
-** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
-** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
-** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
-** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
-** THE UNITED STATES.  
-** 
-** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
-**
-** $Header: /cvsroot/glide/glide3x/h5/glide3/src/glidesys.h,v 1.3.4.3 2003/07/24 03:51:08 anholt Exp $
-** $Log: 
-**  3    3dfx      1.0.1.0.1.0 10/11/00 Brent           Forced check in to enforce
-**       branching.
-**  2    3dfx      1.0.1.0     06/20/00 Joseph Kain     Changes to support the
-**       Napalm Glide open source release.  Changes include cleaned up offensive
-**       comments and new legal headers.
-**  1    3dfx      1.0         09/11/99 StarTeam VTS Administrator 
-** $
-** 
-** 4     11/05/98 11:18a Russp
-** Fix GLIDE_NUM_TMU error check (change "&&" to "||")
-** 
-** 3     7/24/98 1:41p Hohn
-** 
-** 2     6/15/98 10:50a Peter
-** made csim compile time option
- * 
- * 1     1/16/98 4:29p Atai
- * create glide 3 src
- * 
- * 10    12/09/97 12:20p Peter
- * mac glide port
- * 
- * 9     11/04/97 4:00p Dow
- * Banshee Mods
- * 
- * 8     8/18/97 3:52p Peter
- * pre-hw arrival fixes/cleanup
- * 
- * 7     6/02/97 4:09p Peter
- * Compile w/ gcc for Dural
- * 
- * 6     5/27/97 1:16p Peter
- * Basic cvg, w/o cmd fifo stuff. 
- * 
- * 5     5/21/97 6:05a Peter
-*/
-#ifndef __GLIDESYS_H__
-#define __GLIDESYS_H__
-
-/*
-n** -----------------------------------------------------------------------
-** COMPILER/ENVIRONMENT CONFIGURATION
-** -----------------------------------------------------------------------
-*/
-
-/* Endianness is stored in bits [30:31] */
-#define GLIDE_ENDIAN_SHIFT      30
-#define GLIDE_ENDIAN_LITTLE     (0x1 << GLIDE_ENDIAN_SHIFT)
-#define GLIDE_ENDIAN_BIG        (0x2 << GLIDE_ENDIAN_SHIFT)
-
-/* OS is stored in bits [0:6] */
-#define GLIDE_OS_SHIFT          0
-#define GLIDE_OS_UNIX           0x1
-#define GLIDE_OS_DOS32          0x2
-#define GLIDE_OS_WIN32          0x4
-#define GLIDE_OS_MACOS          0x8
-#define GLIDE_OS_OS2            0x10
-#define GLIDE_OS_OTHER          0x40 /* For Proprietary Arcade HW */
-
-/* Sim vs. Hardware is stored in bits [7:8] */
-#define GLIDE_SST_SHIFT         7
-#define GLIDE_SST_SIM           (0x1 << GLIDE_SST_SHIFT)
-#define GLIDE_SST_HW            (0x2 << GLIDE_SST_SHIFT)
-
-/* Hardware Type is stored in bits [9:13] */
-#define GLIDE_HW_SHIFT          9
-#define GLIDE_HW_SST1           (0x1 << GLIDE_HW_SHIFT)
-#define GLIDE_HW_SST96          (0x2 << GLIDE_HW_SHIFT)
-#define GLIDE_HW_H3             (0x4 << GLIDE_HW_SHIFT)
-#define GLIDE_HW_SST2           (0x8 << GLIDE_HW_SHIFT)
-#define GLIDE_HW_CVG            (0x10 << GLIDE_HW_SHIFT)
-
-/*
-** Make sure we handle all instances of WIN32
-*/
-#ifndef __WIN32__
-#  if defined (_WIN32) || defined (WIN32) || defined(__NT__)
-#    define __WIN32__
-#  endif
-#endif
-
-/* We need two checks on the OS: one for endian, the other for OS */
-/* Check for endianness */
-#if defined(__IRIX__) || defined(__sparc__) || defined(MACOS)
-#  define GLIDE_ENDIAN    GLIDE_ENDIAN_BIG
-#else
-#  define GLIDE_ENDIAN    GLIDE_ENDIAN_LITTLE
-#endif
-
-/* Check for OS */
-#if defined(__IRIX__) || defined(__sparc__) || defined(__linux__) || \
-	defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#  define GLIDE_OS        GLIDE_OS_UNIX
-#elif defined(__DOS__)
-#  define GLIDE_OS        GLIDE_OS_DOS32
-#elif defined(__WIN32__)
-#  define GLIDE_OS        GLIDE_OS_WIN32
-#elif defined(macintosh)
-#  define GLIDE_OS        GLIDE_OS_MACOS
-#else
-#error "Unknown OS"
-#endif
-
-/* Check for Simulator vs. Hardware */
-#if HAL_CSIM || HWC_CSIM
-#  define GLIDE_SST       GLIDE_SST_SIM
-#else
-#  define GLIDE_SST       GLIDE_SST_HW
-#endif
-
-/* Check for type of hardware */
-#ifdef SST96
-#  define GLIDE_HW        GLIDE_HW_SST96
-#elif defined(H3)
-#  define GLIDE_HW        GLIDE_HW_H3
-#elif defined(SST2)
-#  define GLIDE_HW        GLIDE_HW_SST2
-#elif defined(CVG)
-#  define GLIDE_HW        GLIDE_HW_CVG
-#else /* Default to SST1 */
-#  define GLIDE_HW        GLIDE_HW_SST1
-#endif
-
-
-#define GLIDE_PLATFORM (GLIDE_ENDIAN | GLIDE_OS | GLIDE_SST | GLIDE_HW)
-
-/*
-** Control the number of TMUs
-*/
-#ifndef GLIDE_NUM_TMU
-#  define GLIDE_NUM_TMU 2
-#endif
-
-
-#if ((GLIDE_NUM_TMU < 0) || (GLIDE_NUM_TMU > 3))
-#  error "GLIDE_NUM_TMU set to an invalid value"
-#endif
-
-#endif /* __GLIDESYS_H__ */
diff --git a/Source/Glide64/inc/glideutl.h b/Source/Glide64/inc/glideutl.h
deleted file mode 100644
index 16c6e3299..000000000
--- a/Source/Glide64/inc/glideutl.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
-** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
-** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
-** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
-** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
-** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
-** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
-** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
-** 
-** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
-** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
-** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
-** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
-** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
-** THE UNITED STATES.  
-** 
-** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
-**
-** $Header: /cvsroot/glide/glide3x/h5/glide3/src/glideutl.h,v 1.3.4.2 2003/06/05 08:23:53 koolsmoky Exp $
-** $Log: 
-**  3    3dfx      1.0.1.0.1.0 10/11/00 Brent           Forced check in to enforce
-**       branching.
-**  2    3dfx      1.0.1.0     06/20/00 Joseph Kain     Changes to support the
-**       Napalm Glide open source release.  Changes include cleaned up offensive
-**       comments and new legal headers.
-**  1    3dfx      1.0         09/11/99 StarTeam VTS Administrator 
-** $
-** 
-** 4     7/24/98 1:41p Hohn
-** 
-** 3     1/30/98 4:27p Atai
-** gufog* prototype
-** 
-** 1     1/29/98 4:00p Atai
- * 
- * 1     1/16/98 4:29p Atai
- * create glide 3 src
- * 
- * 11    1/07/98 11:18a Atai
- * remove GrMipMapInfo and GrGC.mm_table in glide3
- * 
- * 10    1/06/98 6:47p Atai
- * undo grSplash and remove gu routines
- * 
- * 9     1/05/98 6:04p Atai
- * move 3df gu related data structure from glide.h to glideutl.h
- * 
- * 8     12/18/97 2:13p Peter
- * fogTable cataclysm
- * 
- * 7     12/15/97 5:52p Atai
- * disable obsolete glide2 api for glide3
- * 
- * 6     8/14/97 5:32p Pgj
- * remove dead code per GMT
- * 
- * 5     6/12/97 5:19p Pgj
- * Fix bug 578
- * 
- * 4     3/05/97 9:36p Jdt
- * Removed guFbWriteRegion added guEncodeRLE16
- * 
- * 3     1/16/97 3:45p Dow
- * Embedded fn protos in ifndef FX_GLIDE_NO_FUNC_PROTO 
-*/
-
-/* Glide Utility routines */
-
-#ifndef __GLIDEUTL_H__
-#define __GLIDEUTL_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** 3DF texture file structs
-*/
-
-typedef struct
-{
-  FxU32               width, height;
-  int                 small_lod, large_lod;
-  GrAspectRatio_t     aspect_ratio;
-  GrTextureFormat_t   format;
-} Gu3dfHeader;
-
-typedef struct
-{
-  FxU8  yRGB[16];
-  FxI16 iRGB[4][3];
-  FxI16 qRGB[4][3];
-  FxU32 packed_data[12];
-} GuNccTable;
-
-typedef struct {
-    FxU32 data[256];
-} GuTexPalette;
-
-typedef union {
-    GuNccTable   nccTable;
-    GuTexPalette palette;
-} GuTexTable;
-
-typedef struct
-{
-  Gu3dfHeader  header;
-  GuTexTable   table;
-  void        *data;
-  FxU32        mem_required;    /* memory required for mip map in bytes. */
-} Gu3dfInfo;
-
-#ifndef FX_GLIDE_NO_FUNC_PROTO
-/*
-** Gamma functions
-*/
-
-FX_ENTRY void FX_CALL 
-guGammaCorrectionRGB( FxFloat red, FxFloat green, FxFloat blue );
-
-/*
-** fog stuff
-*/
-FX_ENTRY float FX_CALL
-guFogTableIndexToW( int i );
-
-FX_ENTRY void FX_CALL
-guFogGenerateExp( GrFog_t *fogtable, float density );
-
-FX_ENTRY void FX_CALL
-guFogGenerateExp2( GrFog_t *fogtable, float density );
-
-FX_ENTRY void FX_CALL
-guFogGenerateLinear(GrFog_t *fogtable,
-                    float nearZ, float farZ );
-
-/*
-** hi-level texture manipulation tools.
-*/
-FX_ENTRY FxBool FX_CALL
-gu3dfGetInfo( const char *filename, Gu3dfInfo *info );
-
-FX_ENTRY FxBool FX_CALL
-gu3dfLoad( const char *filename, Gu3dfInfo *data );
-
-#endif /* FX_GLIDE_NO_FUNC_PROTO */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GLIDEUTL_H__ */
diff --git a/Source/Glide64/inc/sst1vid.h b/Source/Glide64/inc/sst1vid.h
deleted file mode 100644
index d76e7141d..000000000
--- a/Source/Glide64/inc/sst1vid.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
-** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
-** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
-** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
-** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
-** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
-** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
-** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
-** 
-** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
-** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
-** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
-** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
-** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
-** THE UNITED STATES.  
-** 
-** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
-**
-** $Header: /cvsroot/glide/glide3x/h5/incsrc/sst1vid.h,v 1.3.4.1 2003/04/06 18:23:10 koolsmoky Exp $
-** $Log: 
-**  7    3dfx      1.4.1.0.1.0 10/11/00 Brent           Forced check in to enforce
-**       branching.
-**  6    3dfx      1.4.1.0     06/20/00 Joseph Kain     Changes to support the
-**       Napalm Glide open source release.  Changes include cleaned up offensive
-**       comments and new legal headers.
-**  5    3dfx      1.4         12/10/99 Leo Galway      Removed previous hi-res
-**       mode information for Glide3. These modes were only necessary for
-**       Cornerstone (or future hi-res) support in RT4.2 source branch and
-**       proceeded to break the V3 and V2 builds (from 3dfx view), hence they have
-**       been removed.
-**  4    3dfx      1.3         12/08/99 Leo Galway      Added mode information for
-**       1600x1280, 1792x1440, 1920x1080, 1920x1200, 2046x1536 (as a result of
-**       glide being tested with Cornerstone modes). Although not all of these
-**       modes are currently capable under Glide, their inclusion prevents Glide
-**       apps from displaying in incorrect modes when these hi-res modes are
-**       selected. Search for SUSTAINED_ENGINEERING_CHANGE_BEGIN. 
-**  3    3dfx      1.2         09/17/99 Jeremy Zelsnack 
-**  2    3dfx      1.1         09/17/99 Jeremy Zelsnack 
-**  1    3dfx      1.0         09/11/99 StarTeam VTS Administrator 
-** $
-** 
-** 8     3/04/99 1:19p Atai
-** sync new res modes
-** 
-** 10    2/27/99 12:28p Dow
-** new resolutions
-** 
-** 6     2/13/99 1:56p Dow
-** Added new resolution constants
-** 
-** 5     7/24/98 1:38p Hohn
- * 
- * 4     9/09/97 7:35p Sellers
- * Added 400x300 resolution
- * 
- * 3     8/24/97 9:31a Sellers
- * moved new video timing to sst1vid.h
- * redefined 1600x1280 to be 1600x1200
- * 
- * 2     6/05/97 11:14p Pgj
- * 
- * 5     7/24/96 3:43p Sellers
- * added 512x384 @ 60 Hz for arcade monitors
- * added 512x256 @ 60 Hz for arcade monitors
- * 
- * 4     7/18/96 10:58a Sellers
- * fixed FT and TF clock delay values for lower frequencies with
- * .5/.5 combos
- * 
- * 3     6/18/96 6:54p Sellers
- * added sst1InitShutdownSli() to fix Glide Splash screen problems with
- * SLI
- * 
- * 2     6/13/96 7:45p Sellers
- * added "voodoo.ini" support
- * added DirectX support
- * misc cleanup
- * 
- * 2     6/11/96 1:43p Sellers
- * added support for 60, 75, 85, and 120 Hz refresh rates for "most"
- * resolutions
- * 
- * 1     5/08/96 5:43p Paik
- * Video definitions
-*/
-#ifndef __SST1VID_H__
-#define __SST1VID_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Video defines */
-
-typedef FxI32 GrScreenRefresh_t;
-#define GR_REFRESH_60Hz   0x0
-#define GR_REFRESH_70Hz   0x1
-#define GR_REFRESH_72Hz   0x2
-#define GR_REFRESH_75Hz   0x3
-#define GR_REFRESH_80Hz   0x4
-#define GR_REFRESH_90Hz   0x5
-#define GR_REFRESH_100Hz  0x6
-#define GR_REFRESH_85Hz   0x7
-#define GR_REFRESH_120Hz  0x8
-#define GR_REFRESH_NONE   0xff
-
-typedef FxI32 GrScreenResolution_t;
-#define GR_RESOLUTION_320x200   0x0
-#define GR_RESOLUTION_320x240   0x1
-#define GR_RESOLUTION_400x256   0x2
-#define GR_RESOLUTION_512x384   0x3
-#define GR_RESOLUTION_640x200   0x4
-#define GR_RESOLUTION_640x350   0x5
-#define GR_RESOLUTION_640x400   0x6
-#define GR_RESOLUTION_640x480   0x7
-#define GR_RESOLUTION_800x600   0x8
-#define GR_RESOLUTION_960x720   0x9
-#define GR_RESOLUTION_856x480   0xa
-#define GR_RESOLUTION_512x256   0xb
-#define GR_RESOLUTION_1024x768  0xC
-#define GR_RESOLUTION_1280x1024 0xD
-#define GR_RESOLUTION_1600x1200 0xE
-#define GR_RESOLUTION_400x300   0xF
-#define GR_RESOLUTION_1152x864  0x10
-#define GR_RESOLUTION_1280x960  0x11
-#define GR_RESOLUTION_1600x1024 0x12
-#define GR_RESOLUTION_1792x1344 0x13
-#define GR_RESOLUTION_1856x1392 0x14
-#define GR_RESOLUTION_1920x1440 0x15
-#define GR_RESOLUTION_2048x1536 0x16
-#define GR_RESOLUTION_2048x2048 0x17
-#define GR_RESOLUTION_NONE      0xff
-
-#ifdef GR_RESOLUTION_MAX
-#undef GR_RESOLUTION_MAX
-#endif
-#ifdef GR_RESOLUTION_MIN
-#undef GR_RESOLUTION_MIN
-#endif
-#define GR_RESOLUTION_MIN       GR_RESOLUTION_320x200
-#define GR_RESOLUTION_MAX       GR_RESOLUTION_2048x2048
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SST1VID_H__ */
diff --git a/Source/Glide64/japan.xpm b/Source/Glide64/japan.xpm
deleted file mode 100644
index 0eb198182..000000000
--- a/Source/Glide64/japan.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static const char *japan_xpm[]={
-"30 20 4 1",
-"      c #FFFFFF",
-"0     c #C0C0C0",
-"1     c #FF0000",
-"2     c #808080",
-"                              ",
-"                              ",
-"                              ",
-"                              ",
-"            011110            ",
-"           11111111           ",
-"          1111111111          ",
-"         211111111110         ",
-"         111111111111         ",
-"         111111111111         ",
-"         111111111111         ",
-"         111111111111         ",
-"         211111111110         ",
-"          1111111111          ",
-"           11111111           ",
-"            211112            ",
-"                              ",
-"                              ",
-"                              ",
-"                              "};
diff --git a/Source/Glide64/logo.xpm b/Source/Glide64/logo.xpm
deleted file mode 100644
index 7b3fd20da..000000000
--- a/Source/Glide64/logo.xpm
+++ /dev/null
@@ -1,360 +0,0 @@
-/* XPM */
-static const char *logo_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"315 98 256 2",
-"   c #141A2C",
-".  c #848E94",
-"X  c #52565C",
-"o  c #C4CACC",
-"O  c #ACAEAC",
-"+  c #546A94",
-"@  c #343A3C",
-"#  c #6C7274",
-"$  c #768EBC",
-"%  c #DCE6E4",
-"&  c #9CAECC",
-"*  c #44567C",
-"=  c #2C3E64",
-"-  c #9C9E9C",
-";  c #6C7E94",
-":  c #BCCAE4",
-">  c #444A4C",
-",  c #ECF6F4",
-"<  c #B2BECC",
-"1  c #1F2A34",
-"2  c #7C8EAC",
-"3  c #687EAC",
-"4  c #5F666C",
-"5  c #8D9EBC",
-"6  c #2B3A54",
-"7  c #767E84",
-"8  c #DCE6F4",
-"9  c #5B667C",
-"0  c #D0DAE4",
-"q  c #24324C",
-"w  c #48566C",
-"e  c #BBBEC4",
-"r  c #7B8694",
-"t  c #869ECC",
-"y  c #949694",
-"u  c #A1AEBC",
-"i  c #3B4A64",
-"p  c #ADBEDC",
-"a  c #647284",
-"s  c #919EAC",
-"d  c #2B323C",
-"f  c #D7DBDC",
-"g  c #647694",
-"h  c #AAB8CC",
-"j  c #58698C",
-"k  c #545E6C",
-"l  c #B0B7BC",
-"z  c #3E5074",
-"x  c #A2A9AC",
-"c  c #CCD2D4",
-"v  c #394454",
-"b  c #E4EEF4",
-"n  c #D7E2F4",
-"m  c #3C4244",
-"M  c #8B98AC",
-"N  c #EBEFEC",
-"B  c #9BA9BC",
-"V  c #6B80A4",
-"C  c #404C5C",
-"Z  c #F4FEFC",
-"A  c #C1C6CC",
-"S  c #646E7C",
-"D  c #DFE2E4",
-"F  c #465264",
-"G  c #747A84",
-"H  c #6379A4",
-"J  c #172334",
-"K  c #8391A4",
-"L  c #8498BC",
-"P  c #50607C",
-"I  c #C4D3E4",
-"U  c #232D44",
-"Y  c #7388AC",
-"T  c #7687A4",
-"R  c #A8B9DC",
-"E  c #C0CCDC",
-"W  c #555F64",
-"Q  c #2F3B4C",
-"!  c #E5E7E4",
-"~  c #F4F7F4",
-"^  c #93A8CC",
-"/  c #8A97A4",
-"(  c #758094",
-")  c #686E74",
-"_  c #81868C",
-"`  c #D2DCEC",
-"'  c #7B889C",
-"]  c #A3B0C4",
-"[  c #3B4D6C",
-"{  c #B9C6DC",
-"}  c #6D7484",
-"|  c #93A1B4",
-" . c #273344",
-".. c #6C7A94",
-"X. c #A5B7D4",
-"o. c #536074",
-"O. c #EDF0F4",
-"+. c #CBD6EC",
-"@. c #8F8F94",
-"#. c #4C5664",
-"$. c #787A7C",
-"%. c #B3C1D4",
-"&. c #202B3C",
-"*. c #2F3E5C",
-"=. c #566784",
-"-. c #495874",
-";. c #A9B6C4",
-":. c #9AA6B4",
-">. c #38455C",
-",. c #8898B4",
-"<. c #1B263C",
-"1. c #849ACC",
-"2. c #4F6084",
-"3. c #748ABC",
-"4. c #617294",
-"5. c #9CB1D4",
-"6. c #7B90B4",
-"7. c #5F6874",
-"8. c #8AA0C4",
-"9. c #737E8C",
-"0. c #DEEAFC",
-"q. c #243454",
-"w. c #97A7C4",
-"e. c #4A525C",
-"r. c #849AC4",
-"t. c #7088B4",
-"y. c #93A9D4",
-"u. c #C1CBD4",
-"i. c #6B747C",
-"p. c #4C5254",
-"a. c #374664",
-"s. c #C4C6C4",
-"d. c #5D6E8C",
-"f. c #A9AFB4",
-"g. c #343B44",
-"h. c #414B54",
-"j. c #93989C",
-"k. c #CAD3DC",
-"l. c #3B424C",
-"z. c #DCE2DC",
-"x. c #BBC6D4",
-"c. c #636E84",
-"v. c #D8E2EC",
-"b. c #44526C",
-"n. c #141E34",
-"m. c #828F9C",
-"M. c #546E9C",
-"N. c #7C92C4",
-"B. c #DCE6EC",
-"V. c #445A84",
-"C. c #9A9FA4",
-"Z. c #6B7E9C",
-"A. c #ECF7FC",
-"S. c #6C82B4",
-"D. c #B4C2E4",
-"F. c #63728C",
-"G. c #63789C",
-"H. c #3C527C",
-"J. c #E4F0FC",
-"K. c #E6E9EC",
-"L. c #F6F9FC",
-"P. c #75829C",
-"I. c #6C768C",
-"U. c #6C7A9C",
-"Y. c #EDF2FC",
-"T. c #8C929C",
-"R. c #BCC2CC",
-"E. c #343E54",
-"W. c #E4E9F4",
-"Q. c #646A7C",
-"!. c #DCDEE4",
-"~. c #545A6C",
-"^. c #C4C2C4",
-"/. c #848994",
-"(. c #ACB2BC",
-"). c #444E64",
-"_. c #9CA2AC",
-"`. c #34363C",
-"'. c #B4BACC",
-"]. c #5C626C",
-"[. c #444654",
-"{. c #949AAC",
-"}. c #F4F2EC",
-"|. c #A4AABC",
-" X c #7482A4",
-".X c #4C4E5C",
-"XX c #6C7AA4",
-"oX c #8C92A4",
-"OX c #8C9ABC",
-"+X c #5C627C",
-"@X c #CCD5E4",
-"#X c #7C8AAC",
-"$X c #CCCEDC",
-"%X c #3C3E4C",
-"&X c #9CAACC",
-"*X c #9499A4",
-"=X c #DCDEEC",
-"-X c #848A9C",
-";X c #ACB2C4",
-":X c #444E6C",
-">X c #9CA2B4",
-",X c #343644",
-"<X c #B4BAD4",
-"1X c #5C6274",
-"2X c #545A64",
-"3X c #BCC2D4",
-"4X c #2C2E3C",
-"5X c #B4BAC4",
-"6X c #A4A9B4",
-"7X c #A4B2D4",
-"8X c #8492B4",
-"9X c #94A2C4",
-"0X c #7C818C",
-"qX c #CCCED4",
-"wX c #74757C",
-"eX c #B4B2B4",
-"rX c #3C3E44",
-"tX c #4C4E54",
-"yX c #9C9A9C",
-"uX c #D4D6DC",
-"iX c #44464C",
-"pX c #6D7A8C",
-"aX c #B8C6E4",
-"sX c #5C729C",
-"dX c #FCFEFC",
-"fX c #6C6E7C",
-"gX c #C4C6D4",
-"hX c #141E2C",
-"jX c #545A5C",
-"kX c #CCCECC",
-"lX c #5C6E94",
-"zX c #7C92BC",
-"xX c #A3B2CC",
-"cX c #4A5A7C",
-"vX c #2F4264",
-"bX c #C2CEE4",
-"nX c #B4C2CC",
-"mX c #242E34",
-"MX c #8292AC",
-"NX c #6C82AC",
-"BX c #646A6C",
-"VX c #94A2BC",
-"CX c #2C3E54",
-"ZX c #DCEAF4",
-"AX c #5C6A7C",
-"SX c #D4DEE4",
-"DX c #2A364C",
-"FX c #4C5A6C",
-"GX c #BCC2C4",
-"HX c #7C8A94",
-"JX c #8CA2CC",
-"KX c #A4B2BC",
-"LX c #3C4E64",
-"PX c #B4C2DC",
-"IX c #94A2AC",
-"UX c #2C363C",
-/* pixels */
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.dXL.L.L.L.~ L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.dXL.dXdXL.L.L.L.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.~ O.Y.O.A.L.L.dXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ A.O.O.O.O.A.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.~ Y.O.B.n v.8 O.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.O.8 v.8 B.O.O.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.W.v.` I +.0 v.W.O.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.Y.W.B.` I I +.v.W.Y.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.A.O.v.I : PXPX: +.n O.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.A.O.v.+.: p PX: +.v.O.A.L.dXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.n I PX&XL ,.^ aX@XB.Y.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.8 +.{ 5.OX,.^ PX+.v.O.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ A.8 ` : & T P o.T & : ` W.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ W.` { 5.Y P -.P.&XaX` W.O.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.v.bXR 6.-.,XCXP ,.R bXv.O.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.~ O.v.+.R ,.P DXCXP MXX.I ` O.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.8 @XPXw.j DXh.( ..g ^ PX+.W.O.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.W.+.{ w.4.CX7.N E 4.8.PX@XW.O.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ O.n bX7XY ).DXI.( ' c.Y X.bX=XO.A.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.=XbXR Y i E.K.A.A.M V 7X: ` O.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.v.@Xp OX2. .o.9.( ' ' j 5 p +.B.Y.~ dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.8 I PX8.=.q x Z A.b ` g L <XI n O.~ dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.A.W.` : &XZ.>.v pX( ( r ' F.Z.5.aX` W.A.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.W.` aX&  X>.F A.Z A.J.8 u G.^ { ` 8 A.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.v.I R ,.-. .=.9.; ( r ( K j L X.+.v.O.~ dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.v.+.%.L P DXA Z Z J.W.8 v.pX6.R +.v.O.L.L.dXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.W.` PX^ 4.q.C 9.( ( ( r ' ' ( g ^ PX` 8 O.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.A.W.` aX&X4.>.wXdXZ A.J.ZXZXB.%.F.8.D.@X8 O.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.=XbXX.2 b. .a pX( ( ( ( ( ' K F.Y X.I ` O.A.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.dXdXdXA.O.v.bXR 8Xb. .v.Z Z Y.J.W.ZX8 B.K Y xXbX` O.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ Y.8 ` PX8.=.CX#.pX9.; ( ( r ' ' m.T F.8.{ +.W.Y.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ O.W.` PX^ lXDXm.dXdXL.J.J.W.ZX8 W.@Xg OXPX+.8 Y.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.A.O.` : & V i Q I.pX( 9.( P.( ' ' T / I. XX.bX=XO.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.` bX5.#XLXv ~ dXZ A.J.0.J.W.W.8 b B Z.& : v.O.~ dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ O.8 I p 8.P U o.9...; ( ( r ' ' ' m.K M F.5 { =XO.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.B.+.PXr.P DX(.dXdXL.Y.J.J.W.b W.ZXW.v.; OX{ ` W.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.8 ` { &XU.CXv I.9.9.( ( ( ( ' ' ' K K M T P.X.` W.A.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ A.W.` aX& Z.>.1XdXdXZ A.Y.J.b J.b J.W.J.b 3XZ.<X@XW.A.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.v.I R 6.-. .Q.pX( 9.( ( ( ' P.' ' K K M IX( B @XW.A.L.dXdXdXdXdXdXdXdXZ dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.dXA.O.v.bXp L -.U k.dXdXZ A.J.Y.J.Y.J.O.J.J.b J./ B E W.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.dXdXL.L.L.L.L.L.L.L.L.A.L.L.A.L.L.L.A.L.A.L.A.L.L.L.A.L.L.A.L.A.L.L.A.L.L.A.L.A.A.L.L.L.dXL.A.~ W.+.aXw.lXCXC pXpX..pX; ( ' P.' m.' K / M s >XM I W.O.A.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.dXL.dXdXL.dXZ L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.A.L.L.L.A.A.b v.+.PX^ G.6 G dXdXdXA.A.A.Y.J.Y.J.J.J.O.Y.J.v.M E ZXO.A.L.L.A.L.L.A.L.L.L.L.L.L.A.L.A.L.L.A.L.A.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.dXdXdXdXdXdXL.L.L.L.L.L.L.L.L.L.L.A.L.A.L.A.A.L.L.L.A.L.A.L.A.A.L.L.L.L.A.L.L.L.L.L.L.L.L.L.L.L.dXL.dXdXdXdXL.dXL.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.dXdXdXdXdXdXdXL.dXL.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.dXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.~ Y.O.O.b b b b b J.O.O.b O.J.O.b O.O.O.O.b O.J.O.O.J.O.O.O.O.J.O.O.O.J.O.O.O.O.O.J.O.Y.~ O.W.` : X.Y [ ,Xa pXpX9.( ( ( r ' ' T T.K / M | (.u k.8 b O.J.b b b b b b J.b O.b b J.O.A.O.L.L.A.~ O.O.Y.b b b b b b b b O.b O.O.b O.O.b O.b W.8 ` I aX& Y b.Q K.dXdXZ A.Y.Y.Y.Y.A.Y.Y.J.Y.J., A.x.gX=XW.O.O.b O.b O.O.O.O.b O.b O.O.O.O.J.O.O.O.J.O.b O.b b b b b b b b b b b b b J.O.O.A.~ A.L.L.L.L.O.Y.O.b b J.O.b O.b J.O.O.O.O.O.O.O.O.O.b O.O.O.O.O.O.b O.b O.J.O.b O.O.b O.b O.O.O.O.A.L.L.L.L.A.~ O.O.b b b b O.b J.b b b b O.J.O.A.L.~ L.dXdXL.L.L.A.O.O.b J.b b b J.b b O.b O.O.J.O.~ L.~ L.dXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.O.b B.n v.n v.v.v.` v.` v.` v.` v.=X=Xv.` v.v.` v.` v.` v.` v.` v.` v.` v.` v.v.` v.v.8 K.W.8 n I PX8.=. .w pXpXpX..9.( ( P.' ' ' K K M s >X(.E bX` n v.v.v.v.` v.` v.` v.` v.v.B.B.ZXO.b O.O.b ZX8 v.v.` v.` v.` v.` v.` v.` v.` v.` v.` ` +.bXD.X.r.2.DX_.dXdXdXL.A.A.Y.A.Y.Y.A.Y.Y.A.Y.J.O.b E ` =Xv.v.=Xv.=Xv.` v.` v.` v.=Xv.` v.` v.` v.` v.v.` v.` v.v.` v.` v.` v.` v.` v.v.v.ZXO.O., , O.b b B.n v.v.` v.` v.` v.v.` v.` v.v.` v.` =Xv.v.` v.` v.` v.` v.` v.` v.` v.` v.=Xv.8 8 O.O.O.A., O.b 8 n v.v.v.` v.` v.` v.` v.v.v.8 W.O.L.~ L.L.A.~ O.ZXK.8 v.v.` v.v.` v.v.` v.=Xv.v.8 W.O.L.L.L.dXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ dX~ A.W.B.` @XI bX{ : : : : : : : : : : : : : : bXbX: : E : : aX: : aX: : : : : : : : : : bXbXI ` ` 0 @XaX^ T a.Q a pXpXpX( ; ( r ' ' ' -XK K M s :.5XI E @XI bXbX: : : : : : : : : { bXbXI ` ` 8 B.v.` @XI bX: : : : : : : : : : : : : E : : bX{ : PXR 5.1.G.*.C L.dXdXZ A.A.A.A.Y.A.A.Y.A.A.O.Y.b N K.{ : : : : : : : : : : : : : : : : : bXbXE bX: E : : : : : : : : : : : : : : : : : bXI ` ` ZXW.b 8 ` +.I bX: : : : : : : { bX: : : : : bX: bXE : : : : : : : : : : { : : : : : : : : : bX@X` B.W.W.W.v.` @XI bX: : : : : : : : : : : bX@X` B.O.Y.A.L.O.b 8 ` @XI bXbX: { : : : : : aX: : I I ` v.W.O.L.dXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.ZX` +.{ p R 5.5.5.5.5.5.5.5.5.5.5.5.5.5.X.R X.X.R R R X.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.<Xp E : : D.X.6.P  .k I.pXpX..9.( ( P.r ' -Xm.K M {.s B nX@XaXPXp R 5.5.5.5.5.5.5.5.5.5.5.X.R p aXI I I I bXPXR R 5.5.5.5.5.5.5.5.5.5.5.5.5.R X.R <XR 5.5.JXN.3 z U GXdXdXZ Z L.A.A.A.A.A.A.A.A.Y.A.O.b B.v.%.X.R X.5.5.5.7X5.5.5.5.5.5.5.5.5.X.X.R R <XR R 5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.R p : @X+.` ` I bX{ p X.5.5.5.5.5.5.5.5.5.5.5.5.5.7XR X.R R R R 7XX.5.5.5.5.5.5.5.5.5.5.5.5.5.5.5.X.p aXbX` ` ` ` I { p R 5.5.5.5.5.5.5.5.5.5.5.X.R PXbX+.B.O.O.O.ZX` I : p R 5.5.5.5.5.5.5.5.5.5.5.5.X.PX: ` 8 O.L.dXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ Y.W.` bXp 5.^ t t 1.1.N.1.N.1.N.1.N.r.r.t t ^ ^ y.5.^ ^ JXt t r.r.r.r.1.N.r.r.r.N.r.r.N.r.t t y.X.R p R JXg CX>.} pXpXpXpX( 9.( ' P.' T K K M s >X(.E bXX.5.^ JXt r.1.r.r.r.N.r.1.r.1.r.JX5.X.p aXD.p 5.y.JXt r.1.N.1.N.r.N.r.1.N.r.1.t JXy.^ y.&XJX8.$ H z q 7.dXdXdXZ L.A.L.A.L.A.L.A.L.A., A.O.K.% uXy.y.t 1.r.1.N.N.r.N.1.N.1.r.r.t t JX^ y.^ y.^ JXt 8.1.N.1.N.r.N.r.1.r.N.r.1.r.r.t JX& R : bXI bXaXp y.^ t r.1.r.1.N.1.r.1.N.1.N.t t JXJXy.y.& ^ ^ t t N.r.1.N.1.r.1.r.1.r.N.r.r.N.8.t ^ X.p bX+.bX: PX5.y.t t r.1.N.1.N.1.r.1.N.1.t ^ 5.p I n 8 O.8 ` bXPX5.^ t 1.1.N.1.1.N.1.N.r.1.r.t ^ 5.p bXv.O.O.L.dXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.A.W.` bXp ^ $ NXM.M.M.M.M.M.M.M.M.M.M.M.M.M.G.H V T V V V G.sXM.M.M.M.M.M.M.M.M.M.M.M.M.M.M.sXH V 6.8.^ y.Y [  .S } I.pXpXpX9.; r P.' ' m.K / {.s |.< E X.JXzXNXM.M.M.+ M.M.M.M.M.M.+ M.M.G.V 6.w.5.5.^ r.NXH M.M.+ M.M.M.M.M.M.M.M.M.sXG.G.V V T V V sX2.vXq Q D dXdXdXZ L.L.A.L.A.L.L.L.A.L.A.O.K.% f xX$ 3 sXM.M.M.M.M.M.M.M.+ M.M.M.M.G.XXV  XT  XV H G.M.M.+ M.M.M.M.M.M.+ M.M.+ M.M.M.H V MXw.p { p 5.r.t.H M.M.M.+ M.+ M.+ M.+ M.M.sXsXG.V T V  X XH G.sXM.M.lXM.M.lXM.M.lXM.M.M.M.M.M.sXXX#XVXX.PXp X.^ $ NXM.M.M.M.M.M.M.M.M.M.M.M.sXH T OX%.0 v.8 ` bXp ^ $ 3 H M.M.M.M.M.M.M.M.M.M.M.sXH T ,.'.` W.L.dXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXL.~ O.v.+.p JXNX2.vX*.6 q.6 q.6 q.6 q.6 6 6 *.CX>.>.C C C C >.*.CX6 q.q.q.q.q.6 q.q.q.q.q.q.6 q.6 CX>.w G.r.zXj DXLX} I.pXpXpX( ( ( ( ' ' ' K K M {.| ;.x.PXJXY V.a.6 q.q.q.q q.q q.q q.q q.6 CXCXw g 8.t t.+ [ 6 q.q q.q q q q q.q q q q.q.CXCX>.v >.v v q.U J ,Xk.dXdXdXdXZ L.A.L.A.L.A.A.Z A.A.O.N % SXE Y P a.6 q.q q q q.q q q q.q q q.6 6 CX>.v >.>.v 6 6 q.DXq.q q q.q q q.q.q q.q.q q.6 6 CXw ; w.X.y.L 4.z *.q.q.q q.q.q.q.q.q.q.q.q.6 6 v >.>.C C >.>.CX*.q.q.q.q.q.q.q.q.q.q.q.q.q.6 6 CX>.C =.| R 5.JXV 2.i 6 6 q.q.6 q.q.q.6 q.6 *.6 *.C o.s bX=X` I PX^ Y 2.i *.q.6 q.6 q.6 q.6 q.q.6 CX*.i k M k.W.A.L.dXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXL.Y.K.+.{ ^ Z.b. .<.J n.J n.J J n.J J J J <.1 &.&.d ,Xg.g.,Xd &.<.J J J <.J <.n.<.J <.<.J <.J <.&.&.d Q 9 t.H i DXS a pXpXpXpXpX( ( ( ' ' -XK K {.s |.< { w.V b.DX<.<.U <.U &.&.U &.U U U &. . . .CX=.t.NXcXCXU J U U  .U U  .U  .U  . .,X .g.%Xl.v iXv l.,Xh./.O.dXdXdXdXZ A.L.L.A.L.L.L.L.L.L., O.K.z.SXM z DX&.J  . .U  .U  .U  .U  . . .,Xg.%Xl.v iXv %XDX . .U U  .U U  .U U &.U U &. .&. . .g.CX9 5 ^ $ d.CXU <.&.&.&.U &.&.<.&.&.&.&.&.&. .,Xg.%X%X%Xg. .4X&.&.<.&.<.<.<.<.<.<.<.J <.<.<.<.&.U d F 2 ^ 8.H b.q <.J <.J J J J J J J J J J <.4Xd v . E ` I aX& V z q <.J J J n.J n.J n.n.<.J J <.&.d l.r k.O.L.dXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXL.dXA.O.` bXX.Y b.U n.    hXn.hXn.n.J J J <.J &.&. .%Xh.X o.AXo.C Q g.Q Q DXQ 6 CXv *.v >.C >.LXLXw w k o.a T NXcXq #.} I.I.pXpX..( ( ( ' ' ' K K M {.| ;.{ X.Y z U  .9.] ;.h < X.x.%.{ { E I I I +.0 0 I Y V.DXd P.v.A.A.A.A.Z A.Z Z Z Z Z Z dXdXdXdXdXdXZ dXdXdXdXdXdXdXdXZ L.A.Z L.L.L.Z L.Z L.L.~ N ! !.h -.U Q 6XL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXZ dXZ Z Z L.A.A.A.A.A.J.J.J.0.0.ZX0.n n +.+.+.I I I k.I w.r.d.*.<.FXs xX] ] B B B | | M | s s | s >X:.f.u u s m.( 0XpXpXI.} a a Q.9 o.o.w #.F #.#.#.#.~.} OX8.NXb.U J U  .DX .q  .U &. .&.&.&.&.&. .%X2X| E @XaXX.2 z  .n.        hX        n.  hXn.J 4X,X2X6Xv.O.L.dXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXL.O.8 @XPX8.j DXJ         n.n.J n.n.<.J J &.&. .%X.X7./.>XB K 9 v Q  .DXQ Q E.E.E.v >.>.>.C LXF F FXFXo.P.L g *.Q a F.} I.pXpXpX9.( ( P.' -XK K M s |.< E L j  .LX| ] ;.h xXh < X.%.%.PX{ E E I E E I +.K *.DX%.J.A.J.J.J.J.A.A.A.A.A.A.Z Z Z Z Z dXdXdXdXZ dXdXdXdXdXdXZ L.Z L.L.L.Z dXZ Z dXdX~ }.K.! 0 F.DX2XO.dXdXdXdXdXdXdXdXdXdXdXdXdXZ dXZ Z dXL.L.A.A.A.J.J.J.0.0.ZX8 8 n n v.` I +.I I k.E E { @Xp V i &.m.h & ] ] w.B B | | | | ,.s M s >XB 5XE @Xk.< {.r ; 9.pXG I.} a S AXo.o.FXw w w w FXk AXT w.L 2.DX&.DXQ DXDX .DX . .U U &.&.U &. .%XC 9.< +.I p 8.d.DXJ hX  n.    n.n.hXn.hXn.hXn.J J ,Xe.m.!.O.L.L.dXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXL.A.W.` : ^ V >.J hX  n.n.n.n.J n.J <.n.<.<.&.,X%Xe.9.(.bX+.aXw.F.>.g.Q Q Q E.6 E.v >.>.>.i i F F FXo.o.a MX,.-.U o.a a } I.pXpX( pX( P.r ' -XK / {.>X;.{ 7XV >.CX| ] ] ] ] ;.xXh h < %.%.%.{ { E E E k.I P DX< J.A.J.0.ZXZX0.ZX0.J.J.Y.A.A.A.A.L.L.L.~ O.b K.A.Z dXdXZ Z L.A.Z L.Z Z Z L.dXdXdX~ ~ N ! ! |.a.%XK.dXdXdXdXdXdXdXdXZ dXZ Z Z Z L.A.A.L.A.O.O.B.n ZX0.ZXZX8 8 n v.v.` ` +.0 I k.E E E { u.E I 8.2. .r X.< ;.] B B B | | | M M s M s s |.5X0 O.O.v.gX{.( 0X0X9.pXG } } a S 7.o.o.k k k k o.7.( VX8.Z.a.&.Q Q Q DXDXDX .q  .U  .U U &. .,Xv S :.I I D.& T i <.  n.  n.hXn.hXhXn.  n.hXn.J <.d tXr f dXL.L.dXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXL.O.v.I p L P  .hX  n.hXhXn.n.n.<.n.J J &.&.4XDXh.fX;.8 J.` : 5 o.CXQ Q Q Q 6 E.v v >.>.C C ).F w FXk 7.P.5 G.q.v c.} a I.pXpXpXpX( ( ( ' ' m.K *Xs u %.p 6.P  .( u ] ] u ] ] ] ;.h xX%.h %.%.x.x.x.E I ,.DX9.0.J.0.n n v.n 8 8 8 ZXZXb J.J.Y.O.Y.O.O.v.: 9Xd.T.L.dXZ Z L.Z L.L.Z Z dXdXdXdX~ L.~ O.! D uX2. .6XdXdXdXdXdXdXZ Z dXZ L.A.L.A.A.A.Y.O.O.O.v.PXOX=.B ZXZX8 n v.v.` ` 0 0 @X@XI E E { u.u.{ k.%.G.>.>.h nXxX] ] B VX:.| | ,.| M M M M | (.k.b A.8 I :.i.r _ ( 0X9.pXG G } i.S 7.7.].o.].7.7.} s ^ 6.cXU DXQ Q 6 Q DXDXq  . . .&.U &. . .Q X ' %.bX: X.zXP  .n.hX  n.hXn.  n.n.  n.hXn.J J 4Xl.fXA L.L.A.dXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdX~ ~ W.+.aX^ g *.J hXn.  n.n.n.n.J n.n.<.<.<.&. .v k *Xv.A.8 @X{ T C g.Q Q CXv v v >.>.C C ).).F w FXk o.a 6.6.b. .7.c.a } I.} pXpX9.( ( ( ' ' K oXM :.h E w.G.>.LXVXB B u w.] ] ] ;.xX< h %.< %.x.x.x.I x.b.DXI 0.ZXn v.v.v.n v.n 8 ZXZXZXb J.b J.O.N v.E X.6.b.k dXdXdXZ L.L.Z Z dXdXL.~ dXL.dX~ O.N D z.M a.#.L.dXdXdXdXdXZ L.L.A.L.A.A.A.Y.A.O.b O.K.0 aX& V ).r 0.ZXn v.v.` 0 +.0 @XI k.E E E { x.x.E k.6.-. .| nXh ;.] B B :.| | ,.s s M M M M :.< ` B.` ` E oX#._ r 0X_ 9.9.7 G G } S S 7.7.7.S S G M & 9X4.CX .CXQ CXQ DXDXDXDXDX .U  .U  .U  .%Xo.VXPXPXR JXg *.1 hXn.  hXn.hXn.hXn.hXn.hXn.J &.,X2Xs O.dX~ L.dXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXL.~ W.n bXX.6.b.<.hX    n.hXn.n.n.n.n.<.J <.&.U Q e.9.A A.Y.B.0 ] S g.Q %Xv v v v C C C C F F #.#.FXk o.S T ,.d.DXLXQ.c.a a } pXpX..pX( ( P.' m.K *Xs u x.<XY b.DXK VXB B u B u ] ] ] ;.xXh < < %.nXx.{ I P.U K ZX0.n v.` ` ` v.v.v.8 8 8 ZXW.J.b b N v.bXR 9Xj DX6XdXdXZ L.Z L.Z Z dX~ dXdXdXdXL.~ }.! !.A -.DXqXdXdXdXdXdXZ L.Z L.~ A.L.Y.A.A.J.b W.K.0 aXR L P DXnXJ.ZX8 v.` SX+.0 @XI @XI I E { u.%.u.bXxXj 6 9 x.X.h ] ] B B :.| | | s M M M / M B x.I : bXbX%.' S m.m.' r r r r ( 9.9.G } } } G 0Xm.:.h X.#Xb.U %XE.E.Q 6 Q Q DX .q  . .U U U U ,X>...& 5.5.JXNX[ U n.hX  n.  n.  n.hXn.n.hXn.J J  .h.9.uXdXL.L.dXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXL.~ 8 ` PX8.4.Q J   n.hXn.hXn.n.<.n.<.J <.J &.,Xl.1Xx 8 A.O.8 bXM e.g.l.CXh.h.C C C C e.F F #.FXk k ].7...L Y >. .AXc.c.} a I.pXpXpX( ( ( ' ' m.oXM :.'.E 8.d.DXo.:.B B B :.u w.] ] ;.;.h h %.%.%.%.x.E xX>.LX0 n n v.` ` v.v.v.n v.8 8 ZXZXb W.b b K.@X: 5.V i F ~ dXdXdXZ L.Z dXdXdXdXdX~ dXL.~ O.K.! D P.DX} dXdXdXdXdXZ Z L.L.A.L.A.A.A.Y.O.O.W.K.D : p ^ G.6 o.L.A.0.8 v.` ` 0 I 0 I k.I k.E E x.u.u.E 2 [ q ] %.< ;.] w.B :.VX:.| | M M M *XM s ] { p R p R X.L | :.| | | | M M M M M M M M s :.;Xx.$X{ ] F.Q DXv v E.6 Q Q Q Q DX . . . . . . .Q -.Y y.y.t $ j q J hXn.hXn.n.hXn.n.n.  n.n.n.J &.,X4 (.L.L.~ L.dXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXA.W.` bX5.T LX<.hX    hXn.hXn.n.n.n.n.J <.&. .%XC 0XE A.b ZXv.x._ l.l.h.h.h.C e.C e.F #.#.2Xk ].o.7.AXpXM 5 P U F AXS c.a a } I.pXpX; ( ( ' -XK / s ] %.X.Y i Q M B B B B B u w.] ] ;.xXh < h %.nX%.x.E c.DXu n n v.` ` 0 ` ` v.v.n B.8 ZXb W.b W.O.SX: p L P DXA dXdXdXdXZ Z dXdX~ dXL.dXdXdXL.O.}.! D 5X:XDXD dXdXdXdXdXdXdXZ L.L.L.A.A.A.O.J.W.B.D bXR y.6.-.U f Z A.ZXv.v.v.+.0 +.@X0 I @XI E E x.u.E ^ j DX9.%.%.< ] ] u B B B | | s | s M M M | xXX.JXJXy.JXJXt xXX.xXxXxXxX& & & & & & 7X%.: @Xv.v.=XPX,.w ,Xh.>.v v v v E.%XQ Q Q Q DXg. . . .%X2.6.N.N.S.+ *.<.J n.hXn.n.hXn.hXhXhXn.hXn.J &. .tXm.B.dX~ L.L.dXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXL.~ O.8 I p L 2. .n.  n.hXn.hXn.n.n.n.<.n.J <.&. .v 7.6X8 O.8 v.+.< ( #.e.e.#.#.#.FXFXk k o.o.7.S S i.9.' | 8. XCXDX7.AXc.a } a I.pXpX..9.( r ' K K *X6X< PXL 2.q a | B B VX:.B B ] u ] ;.;.h < %.< %.x.E VX6 o.n v.v.` ` 0 ` v.` v.v.n 8 8 ZXZXb W.N K.I PX& G.*.7.dXdXdXdXZ Z dXZ dXL.dXdXdXL.~ ~ }.K.D f d.q j.dXdXdXdXdXdXdX~ dXZ ~ A.~ A.O.O.b B.D I X.y.r.j DXHXdXZ J.0.n v.` ` SX0 @X@X@Xk.k.k.E u.E x.Z.a.CX%.%.%.xX;.] u B B | :.| | s M s M *Xs ] 6.t.3.3.S.t.S.3.r.L r.L L L L L N.r.8.8.7XPX+.n 8 @X'.pXl.v C C C C >.h.v v v l.l.%X%XQ %Xg.DXE.P V S.H V.*.<.n.n.n.n.n.n.n.  n.n.n.n.n.n.J 4Xl.7.A L.L.L.L.dXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXY.b ` { 5.Z.*.<.hX    n.hX  n.n.n.n.n.<.J &.4X%X#.0Xx.J.v.` @XbXX.,.; F.g g ..; Z.; ; Z.' ' T K M s :.] xX,.w  .w 9 AXc.c.a } I.I.9.pX( ( ' ' T./ s ] E ^ G.>.>.| | B | B B B B ] ] ] ;.h h h < < nXE E -.q < n n ` ` 0 ` 0 ` v.v.v.n 8 ZXb W.W.b K.` : R ,.cXDXf dXdXdXdXdXZ Z dXL.dXdXL.dXdX~ O.N ! !.| i C ~ dXdXdXdXdXL.dXdX~ Z L.L.A.A.A.O.K.B.SXX.y.8.XX[ v O.dXA.J.ZXv.v.v.` ` 0 ` 0 @X@X@XE qXu.k.L cX .M { %.< ;.] u B B :.B | | | | | s {.{.s T -.2.cX* V.* V.* * * H.V.* V.V.* * * P 2.d.' ] @Xn ` 6X].[.X #.X F e.e.C tXC h.h.[.[.v l.l.%X%X%XC -.* i DX<.n.J n.n.J n.n.hXn.hX  hXhXn.J &.,X#.oXN dXL.L.dXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXL.~ O.v.bXX.,.-.&.n.hXn.n.hXn.hXn.n.n.J <.J <.&.,Xv S 6X` 8 ` : PXR ^ 8.zX,.L L r.L r.r.8.8.t ^ & X.%.PXPXX.8.d.6 v o.7.AXc.c.a F.I.pXpXpX( ( ' ' K M B %.PX6.-. .r | VX:.| B :.B B ] ] ] xXh < < < < x.E MXDXpX` n ` ` 0 ` ` ` ` v.v.n 8 B.ZXW.b W.N B.I p 9Xg CX/.dXdXdXdXZ Z Z dX~ dXdXdXdXL.~ ~ }.! D qXP DXl dXdXdXdXdXL.dXL.dXdXL.Z L.A., , O.B.D x.JX8.Y -. .l dXZ A.J.ZXv.n v.` SX` 0 @X@X@XuXE E k.%.4.CXw I { %.< xX;.& u B B :.B | | :.| >XIXs {.9. .U U U U <.U <.U <.U <.<.<.<.U <.U U  .Q #.oXk.W.0 *XjX2Xk k k W ~.2X2X#.X #.X e.e..XtXh.h.[.%XQ  .U &.J n.J n.J n.n.n.n.n.  n.n.n.n.J J 4Xv 7 u.dXL.~ L.dXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXL.L.A.8 ` D.w.4.CXn.hX  n.hXn.  n.  n.n.n.J J <. .Q X m.E n +.bXp 5.8.$ $ Y S.S.S.S.t.t.t.t.t.6.zXr.w.5.X.X.^ Y i U w o.9 AXc.c.} a I.I.pXpX( ( ' m.oXs ;.{ w.4.6 F | | | VX>X| B B u w.] ;.;.h h < < x.E < LXCX{ ` v.v.+.0 0 ` 0 ` ` v.8 8 8 ZXZXW.b K.@X: X.#X:X[.N dXdXdXdXZ Z dXdXdXdXdXdX~ L.~ O.K.z.B.K 6 1XdXdXdXdXdXdXdXL.dXdX~ Z dXA.L.A.O.b % 0 ,.6...-.Q ].L.dXA.O.W.8 v.v.v.` D ` 0 ` 0 @Xk.k.E k.6.z  .KXE x.X.h ;.] KXw.B B B | :.| | >X:.>X:.IXM } FX2Xw F F F F ).).C i C C C >.C v >.C C 7._.@XW.K.O $.G wX$.} } wXwXi.i.i.# ) ) ) ) BX4 ].W e.C g.&.J <.J <.J n.n.J n.n.n.hX  hXhXn.J 4X,Xk 6XA.L.L.L.dXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXL.L.O.` bXX.Y b.&.hX  n.n.hXn.hXn.n.n.n.J J <.&.,Xh.S ;X` +.bXp ^ zX4.V.z z z z z z z z z z z z -.cX9 G.L JXzX=.DXv FXo.9 AXS c.a I.I.pXpX( ( r ' T.M |.%.X.6.z  .T | | | | | B B B B ] ] ] ;.h < h nXx.{ g  .M 0 +.` +.0 0 +.` v.` v.v.n B.ZXW.K.W.b v.bXPX8.=. .6XdXdXdXdXZ L.Z Z L.dX~ dXL.dXL.~ }.! !.gX-. .k.dXdXdXdXdXdXL.dXL.dXdX~ Z ~ L., O.O.K.KX7.-.C rXC !.dXdXY.J.W.8 B.v.v.v.` SX` SX0 @Xk.k.k.& 4.CXa { { %.< ;.xX] KXu B B B :.B :.B 6Xu (.'.< KXs K m.' ' ' ( ( ( pXpXpX} } a c.c.c.} } 9.6X=XK.A.O.f A e e ^.R.^.R.e ^.GXe e e e e l l eX6XC.K pX~.DX&.J J n.n.<.n.n.n.n.n.  n.n.n.J J  .v _ !.dXL.L.L.dXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXL.O.8 @Xp 5 =.DXn.  n.hX  n.n.  n.hXn.n.n.J <. .l.2X/ @X` I PX^ V z CX<.<.<.<.J <.<.J <.<.<.<.<.&.U  .i G.zXG.*.U #.-.o.9 AXc.c.a } I.pXpX9.( ' -XK >Xh PXL j DX7.M | | | | | >XB B B ] ] ] ;.h h < %.E u CXLX+.+.+.0 0 I 0 +.0 +.` v.v.8 8 8 ZXb W.K.@XaX5. X>.F L.dXdXdXZ L.Z Z dXdXL.dXL.dXL.~ O.K.z.!.( q.0XdXdXdXdXdXdXL.dXdXL.dXL.dXL.Z Z A., O.K.l %Xg.,XG K.dXZ A.O.8 B.v.v.v.v.` v.` ` 0 0 @Xk.@XE T [ Q %.: x.%.< xX;.] u w.B B B :.B 6X|.(.< k.uXI x.B K -X' ' ' ( ( ( ( pXpXI.a a a c.} } 9.*Xk.L.O.L.L.L.L.L.dXL.L.dXL.dXdXL.dXL.dXL.dXL.L.~ W.0 3Xw.g v &.<.J <.J n.n.J n.n.  n.hXhXJ J 4X%X4 5XL.L.~ dXL.dXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdX~ W.v.: 7XT a.<.hXn.hXn.n.n.  hXhXn.n.n.J <.&. ..XG ;.` +.{ X.6.-. .<.J <.<.&. .&.U U U  . .q DX%XQ v -.Z.3 z  .C b.FXo.9 Q.c.c.} F.} pXpX( r ' m./ u { h V a.Q M M | | | | | VX:.B u u ] ;.h 5X;.< x.E =.U :.I 0 I 0 I 0 0 0 ` SX` v.n n B.ZXW.K.K.v.bX<XL P q A dXdXdXZ Z Z L.Z dXL.dXdXdXL.~ ~ K.! D u a.v K.dXdXdXdXdXdXL.dXL.dXdXdXdX~ L.~ L., O.N W.o l D Z Z L.A.b 8 B.v.v.=XSX` SX` D SXSX0 0 f 0 w.=. .K E E x.%.h ;.xX;.] B B B B B B |.u < 0 v.` E &X' K ' HXP.r ( ( pXpXpXI.I.} a a } } pXr l O.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.W.` { & ..CX&.J J n.<.n.n.n.n.n.n.  n.n.J J  .e.T.B.dXL.L.L.dXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXL.A.O.v.I R L P U n.hX  n.  n.hXn.n.hXn.n.J J <. .l.4 s k.` bXR L =.DXJ <.U  . . .DXDXQ Q 6 6 CXv >.C ).FX..Y j CXDXw w -.o.9 =.S c.a } I.I.9.( r /.oXIX< PX6.P  .} M | M ,.| | | | B B u ] ] ] ;.h < %.{ ,.6 9 I +.I I I @XI 0 +.0 ` ` v.n B.ZX8 W.N B.I D.&XU.a.i.dXdXdXdXZ A.L.Z Z dX~ dX~ dXL.~ }.! ! uX=.U 6XdXdXdXdXdXdXL.dXL.dXdX~ dX~ Z Z A., O.O.N N b O., A.A.b K.v.v.SXSX0 SXSXSXSXD v.v.B.D SXuX%.Z.*.C I I { %.< h ;.& ] u ] B B B B u (.'.k.B.` { 5.T >.a ' ' ' P.( ( ..pXpXpXI.a a a } pX0Xs @XdXA.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.~ O.B.I p r.P U <.J J <.n.<.n.J n.n.n.hXn.J J 4Xl.wXgXL.L.~ L.dXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXL.~ W.` { ^ g *.J hXn.  n.n.hXn.  hXn.n.n.J J &.Q .X0X%.` +.aX& Z.>.<.<. .d  .q DXDXDXDXCXQ E.v >.C C F 9 T Y [ &.LXF w FXo.o.AXc.c.a F.I.pX9.( ' -XM KXPX&XG.*.>.M s ,.s | M | | B B :.w.u ] ;.h ;.< x.%.b.DXh I I I I I I 0 0 0 +.SXv.n v.8 B.ZXK.W.0 : X.6.z %XD dXdXdXdXL.A.L.L.Z dXL.dXdX~ ~ O.K.D ! {.*.e.L.dXdXdXdXdXL.dXdXL.dXL.dXdX~ dXA.~ O.}.K.! K.K.N ZXK.K.B.v.D SXSXSXSXSX0 SXv.v.B.K.B.B.0 %.zXP  .VXI E x.%.h ;.xX;.] ] B B B |.u u ;.u.v.v.bX<XL 2.U pX' ' ' ( ( ( I.pXI.} } a a } I.9.T.< O.dXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.A.W.` aX& Z.>.J <.J J J n.J n.n.n.hXn.n.n.J &.,X#._.O.dXL.L.dXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXL.O.v.I R 6.-.U hXhX  n.hXn.  n.n.n.  hXn.J <. .l.].:.` ` { p 6.-.U &.&.&.U  . .DXDXDXQ Q 6 6 >.v C F FXg 6.d.DX6 F b.w FXo.9 AXS c.} a I.pX( r HXK >X%.X.6.-.U ( / ,.M s M | | | | B B u ] ] ;.;.h x.{ P. .r E I I E I k.I I 0 +.0 v.` v.n B.ZXK.K.B.I PX^ F.q . dXdXdXZ L.L.L.L.Z Z L.dXdXL.L.~ }.! z.$XP q R.dXdXdXdXdXdXdXL.dXL.dXdXdX~ Z ~ ~ ~ N K.D I %.5.w.L ,.,.6.6.6.6.6.6.6.6.6.6.,.5 w.h { aXX.^ g CX9 I I { PX< < h ;.] ] u ] u B u u ] R.@Xv.I aX^ U.>.v K m.' ' ( ( ( pXpXI.I.I.} } G 7 r 6Xv.L.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.v.I p 8X-. .&.J J J <.n.n.J n.n.n.n.hXJ J  .v G uXdXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXL.O.W.@XPX8.d.DXJ   n.hXn.  n.n.  n.hXn.n.n.J 4Xg.F r x.` bXp ^ 4.6 &.&.&.U  . . .q  .DXQ CXQ CXv >.C F =.Y V a.U C F w w -.o.o.AXc.c.a } I.pX( r -X{.;XPXOXd.CXw / M M M M s | | | B :.B u ] ;.;.;.h u.xX*.CX{ I I E E bXI I 0 I SX` ` v.v.8 n B.W.K.@XaX7X#X[ v O.dXdXZ L.L.A.L.L.Z L.dXdX~ dX~ O.K.! z.T E.fXdXdXdXdXdXdXL.dXdXL.dXL.dXL.dX~ ~ , N ! 0 aX7X8.H cX[ = = = *.= = *.= = vX*.vXa.LX-.I.9XX.y.Y b.CX%.I I x.%.h h ;.h ;.] u ] B u u ] 5XE v.0 : R 8X-. .( K ' ' P.( ( pXpXpXI.} } } I.pX( *Xu.L.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.W.+.PX^ lX6 J J J <.J n.<.n.n.J n.n.hXJ J &.rX].f.L.L.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXL.A.b ` bX7X#XLX&.    hXn.hXn.n.hXn.  n.hXn.J J 4X%X7.:.@X+.: 5.2 b.&.<.&.&.U &. .q  .DXDX6 Q 6 v v C LXo.Z.Y 2. .v LXb.F w FXo.9 S S c.a I.pX9.( ' m.:.%.X.Y i DX' K M M M M s ,.| | :.B B u ] ] ;.;.x.{ F. .MXE I : E E k.I I 0 I +.0 ` v.v.v.B.K.K.` bXp 8.=.DXf.dXdXdXL.A.A.L.A.L.L.Z ~ dXL.~ ~ N ! D < i Q D dXdXdXdXdXdXdXL.L.dXdXdX~ dXL.~ O.N K.0 E p 8.d.vXU n.J J J J J n.J J J J J J &.&.,XF #X^ r.j q r ` I { %.%.< < h xX] ] ] ] B ] KX] R.0 v.bXPXw.4.6 w oXK m.' ' ( ( ( pXpXpXI.I.pXpX0Xm.(.W.L.~ dXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.A.O.v.bXX.2 b.&.<.J <.J <.<.n.J n.n.n.n.n.J &.4XC /.v.dX~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXL.O.B.+.p OX=.DXhXhXn.n.  n.hXhXn.hXhXn.n.J J &. .C r %.bX: R 5 j Q <.&.&.U  . .U  .DXDXDXQ Q CXv >.C F c.2 G.E. .).LXF b.w FXo.P AXc.c.a } pX0Xr -Xs h p OX2.DX7.MX/ MXM M M s | | | | B B ] ] ] ;.h x.VX*.F { E E E { E E I I 0 0 0 ` ` v.v.v.v.B.D bXD.&XZ.a.k L.dXdXZ A.A.A.L.A.L.L.Z L.Z dX~ }.K.! !.F.q T.dXdXdXdXdXdXL.dXdXdXdXL.dXL.dX~ , }.K.!.: p &XU.>.U #.f.k.uXuXk.uXk.k.k.E E E E qXE x.x.] t V a.v I ` I { %.%.h h ;.;.;.] KXu ] u ] 5XqX` bXD.5.t.b. .-XMXK ' ' P.( ( ( pXpXpX} pXpX9.r _.k.L.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.8 +.PX5 j DXJ &.J J <.J n.<.n.n.<.n.n.n.J d %XS R.L.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dX~ L.W.` : & Z.>.J   n.hXhXn.n.n.n.hXn.n.hXn.n.J &.,Xk | PX{ p ^ G.i &.J &.&.&.U U U  .DXDXDXQ 6 CXv C C o. XY z U v LXF b.#.w -.o.9 AXS a } I.9.( HXoXB %.& V vXQ m.M K M K M M M | | | B B B u ;X] ;.%.%.-.DXu E E { x.E { E k.@XI 0 +.SX` ` v.D v.v.I p X.6.-.DXqXdXdXZ A.A.A.Y.L.A.A.L.Z Z dX~ }.N ! D |.vXv O.dXdXdXdXdXL.dXL.dXdXL.dXdXdX~ ~ }.K.D E p y.Y b.U *XdXdXdXdXdXZ Z Z Z Z A.L.A.A.A.J.b ZX+.6.P  .| v.+.E x.%.%.< h h h ] ] ] ] ] u ;X%.uXI PXX.L =.q AXK / K ' ' ' ( ( 9.pXpXpXpX9.9.( *X< O.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.A.O.` : & V i &.J <.1 <.<.<.J <.n.J n.n.J J &.,X#.*XO.L.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXL.O.W.+.p L -. .n.    n.  hXhXhXhXhXhXhXn.hXJ J 4XE.F.&XR R y.zXcX .J &.<.&.U U  . . .DXDXDXQ CXv v C w F.2 4.6  .i ).).F b.w FXo.9 AXc.a } pX0Xr /.>X%.%.6.P  .a K K MXoXM M M s | | | :.B u ] u ;.%.E K DX9 { E { u.{ { { E I I @X+.0 +.SX` ` ` D ` R 5.JXsX6 S dXdXZ L.A.Y.A.A.A.L.~ A.L.Z ~ ~ O.N z.uX=.DXeXdXdXdXdXdXdXdXL.dXL.dXdXL.L.~ ~ O.N ! k.R 5.r.=.6 @.dXdXdXdXZ A.A.Y.J.A.J.J.J.0.J.8 B.v.B.{ 4.>.o.` ` I { x.< h < h ;.] ;.] KXu ] u h u.I R X.JXU.a.v oXM K K ' ' P.( ( 9.( pXpXpX9.( /.6X!.L.~ L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.W.@XD.OXP DXJ &.<.J J J J J n.J n.J n.n.J 4Xv i.qXdXL.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"L.A.O.v.bXxX..E.<.hXn.hXn.J n.J n.n.n.n.n.J n.J J U LX Xy.y.JXzXlX6 J &.<.<. .&.U  .U q  .DXDXQ v v C ).AXT Y :X .C LXLXF b.w FX-.o.7.S c.} I.9.( ' *Xh E &Xg >.F ' K / K K M M M M | | | B B u ] ;.h x.%.[ Q ;.E { { { x.{ u.E I @X@X0 0 0 ` ` SXSXSX%.5.JXY b.Q D dXdXL.A.A.A.Y.Y.A.A.L.A.L.Z L.~ N ! D M >.1XdXdXdXdXdXdXdXL.dXL.dXL.dXL.dX~ , N ! SX5.y.8.G.a.F A.dXdXZ L.Y.Y.J.J.J.ZXZX0.W.8 8 B.` v.v.,.-.Q %.n @XE u.%.%.%.< h h h ;.] ] ] u ] < E R 5.y.t.cX .( M M K m.' ' r P.( ( 9.pX( 9.( /.*XgXA.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.J.=XbXX.Z.v &.&.&.&.&.&.<.<.J <.J J J J 1 &.%X4 6XA.dX~ L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dX~ J.=X{ 5 o.4XJ hX1 J J n.J J J J J J J J J J <.DXP $ t 1.N.M.[ <.<.J &.&.&.U U d  .q DXDXDXQ CXC C o.' OXd.Q E.C F F b.#.w FXo.o.AXc.a } 9.( r / f.E : ,.o.,X( K K K / M M M {.s | | B B u u ;Xh x.E ' Q ( { { x.x.x.{ { E E k.@X@X0 0 ` 0 0 0 ` E y.JX6.2.Q T.dXdXZ A.Y.J.Y.A.A.A.L.A.A.L.L.~ , K.N qXo.Q k.dXdXdXdXdXdXdXL.dXdXdXdX~ dXL.~ }.K.D PX^ JXY -. .GXdXdXdXA.A.J.0.b W.ZX8 8 B.8 v.v.v.!.D { ..E.pXZXn I E { %.nX< '.h h 5X;.] ] KX] ] nX{ y.^ zXd.6 F s ,.*XK K ' -X' ( r ( ( ( 0X( r oX(.B.dXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ O.n E 9Xo.U 4X&.4X&.&.&.&.&.&.<.1 <.J <.&.,Xe.@.!.dXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXL.O.=X3Xr >.mXJ &.J <.1 1 &.J &.1 <.1 <.1 1 &.&.Q 2.t.$ S.+ [ q J J <.<.<.U &.U U  . .DXDXQ v v C 2XpXVX,.F Q e.F F #.FXFXFXk o.9 S } } pX( HXT.:.x.0 %.' v k oX/ K M / M M {.s | | :.6Xu ] ] 5XR.k.'.#.F %.x.E x.x.{ x.E E E I @X@X@X` 0 ` 0 0 0 w.r.6.=.E.C A.dXZ A.Y.A.J.A.Y.A.Y.L.A.L.L.L., }.K.O./ >.7 dXdXdXdXdXdXdXL.dXL.dXdXL.dXdX~ , O.% k.w.r.Y 2.%X7.dXdXdXL.Y.J.b b W.W.ZXB.8 8 8 v.v.v.v.=XB o.C E 8 ` I E x.x.%.%.< < h h ;.;.;X] u ;.%.&X8.6.4.i Q K | s M oXoXK m.-X' r ( r ( r /.m.6Xk.L.L.A.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.Y.v.3X-XC d  . . . .&. .d 4X&.&.&.&.4X4Xg.h.} A dXL.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXL.O.v.(.7.rXmXd 4Xd 4Xd d d 4X4Xd d 4Xd 4Xd d 4X,XLX2.j H.6 <.J J &.<.&.<.U &. .U  .q  .DXQ CXC 2Xa >Xh 9.l..Xw ~.k k o.o.1X7.9 S i.G 9.r /.T._.A D =X;X7.[.-X/ M *X{.{.{.| IX>X>X:.|.u ;X;X5X%.@X0 r [._.E u.{ x.{ u.E E E I I 0 0 ` 0 ` 0 0 @X(...I.o.E.,Xo dXdXL.A.Y.J.Y.Y.A.Y.A.A.L.A.A.~ , O.N c fX[.N dXdXdXdXdXL.dXdXdXdXdXL.dXdX~ Z , }.% s ; c.w l.[.B.dXdXZ A.Y.O.0.W.W.ZXZXK.8 B.8 v.B.B.K.$Xm..XC.ZX8 ` E E E x.x.%.%.nX< '.h 5X;.;.u ] B ( g o.C g.} B |.IX{.M / oXK m.m.-X-X/./.-XT.s R.O.dXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.~ O.v.;X) %Xg.Q g.g.g.g.g.,Xg. .,X,X,Xg.g..X) f.L.dXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"L.L.~ v.s X @ `.`.`.`.g.,X@ ,Xg.`.g.`.g.`.g.,X`.,Xd ,XQ DXU <.J J <.J <.<.<.U <.U U U  .DXDXl.v F Q./ gX;.4 [.2XW k ].].7.7.Q.) fXi.G 9._ /.T._.e v.Y.0 _.#.wX/ *X{.{.s s IX_.>X:.6X|.u u ;.;.R.uXW.A 4 ) x.E E E x.u.E E $XE k.@X@XSX0 SX` SX0 0 /.v %X,XiXGXdXdXZ A.Y.Y.Y.Y.Y.A.Y.A.A.A.L.L.L.~ ~ O.6XW x dXdXdXdXdXdXdXL.dXL.dXL.dXdX~ Z ~ , O.K.) v %XUX2XD dXdXdXL.Y.J.J.b 0.b W.W.ZX8 8 8 B.W.O.O.R.wX7.` 8 v.0 k.E E x.u.x.R.%.R.< < '.;.;.;.KX/.v l.rXg.} (.u :.6Xs C.M *X*XoXT.T.m.m.m.oXC.5XB.dXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.v._.2Xm l.l.l.%X%Xl.%Xm %XrXg.rXrXl.h.) C.B.dXL.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXL.L.K.x 4 > tXtXtXp.tXp.tXp.tXp.tXp.tXp.tXp.tX> l.%XUX&.J 1 J J <.&.<.<.&.U U &. . . .DXQ CXC 4 T.E W.5XwXBX) fXwXwXG G 7 7 9.0X/./.T.j.s eXo W.dX~ D 6X$.C._.6X6X6X6X|.f.u (.(.l ;.5X5XR.$XSXO.L.e wX;.$Xk.$X$Xk.$Xk.I k.@X0 0 SX` v.v.v.v.v.v.u.wX) C.K.dXdXdXL.A.Y.Y.Y.Y.Y.A.A.Y.A.A.L.L.L.~ ~ K.eX_ L.dXdXdXdXdXdXL.dXdXdXdXdXdXdXL.L.dX~ ~ O.s.wX$.f.~ dXdXdXZ A.Y.Y.J.O.b b W.b W.W.W.b O.A.L.O.o 0XA W.W.v.0 @XuX$Xk.$XqXE u.u.x.3XR.nX< e h KX# ].G 6Xe < 5Xl u 6X6X>Xx _._._.s _.C._.f.GXv.dXdXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.K.x BXX X X jX#.jXjXX X X X X X jX].wXC.D dXdXL.dXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXL.~ kXx yX@.T.y j.j.j.yXj.j.j.yXj.j.j.j.@.@.r G Q.C d &.J J <.J <.<.&.<.&.&.U U  . .Q %X>.2X9.x.L.Y.f l x x f.f.f.(.eX(.(.l l l 5X^.A c v.L.dXdXL.O.c R.A o u.qXu.u.qXqX$Xc k.k.uX@X0 v.O.L.dXL.f s.v.8 B.v.v.v.v.B.B.B.8 B.W.W.W.W.b W.O.0.O.A.L.dXdXdXdXdXdXL.L.A.A.A.A.L.L.A.L.L.L.L.dXL.L.L.O.uXD dXdXdXdXdXL.dXL.dXdXL.dXdXL.dXL.dXL.L.L.L.dXdXdXdXdXdXdXdXdXL.A.A.A.A.Y.Y.Y.Y.Y.Y.A.L.L.dXdX~ D o L.L.Y.b W.8 B.B.v.v.v.D v.SX!.SX!.0 f @Xf uXuX0 D =X=X!.@Xk.qXqXqXu.o gXo A A A o qX!.Y.dXdXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXO.qXx yXj.yX*X- C.yXC.- C.- - C.C.x ^.O.dXdXdXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXL.O.O.N N O.O.O.O.O.O.O.O.O.O.O.O.O.N K.v.k.< |.pXv <.J J <.J <.<.<.&.U U U U  . .Q CXe.7.6XO.dXO.O.O.O.O.O.O.A.O.A.O.L.O.A.L.A.L.L.dXdXdXdXdXL.dXO.~ A.L.L.L.L.L.L.L.L.L.L.L.L.L.dXdXdXdXdXL.A.~ L.dXdXL.dXL.L.L.L.dXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.~ L.dXdXdXdXdXL.L.dXL.L.dXL.L.dXL.L.dXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.dXdXdXdXdXL.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.L.dXdXdXdXdXL.L.L.A.~ A.L.A.L.A.L.A.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXO.N B.K.O.O.O.O.O.O.O.O.O.O.O.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXO.` 3XT v &.J <.J <.<.<.<.<.&.&.U  . .DX%X>.k /.@XdX~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.Y.v.{ ( %X<.J J J <.J &.<.<.U &.U U  .Q CXe.i.l A.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.v.<Xi.,XJ J J <.J <.<.<.<.&.&.U  . .Q v ].*Xv.dX~ L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.Y.B.'.7.4X1 1 <.J <.J &.<.&.&.U &. .,Xv F G x.L.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.W.R.7.d &.J &.J J <.<.<.<.&.U U  .Q v 7.*XO.dX~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.k./.rXd 1 &.J <.J &.<.<.U &.U DXv #.r qXdXL.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.B.f.2X,X4X&.&.J <.<.<.&.&.U  .Q [.) u O.dXL.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.k.0XtXd &.1 &.J &.<.<.&.U ,Xv F m.!.dXA.~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.W.(.) rX4X&.&.J <.<.&.&.U Q C i.< L.L.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.~ 0 *Xe.d 4X&.&.<.&.&.U  .v k T.B.dX~ L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX~ W.A } %Xd 4X&.<.&.&. .Q .XpXgXdXL.L.L.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.B.6XW g.4X&.&.&.&. .v ].6XO.dXL.L.dX        dXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX        dXdXdXdXdXdXdXdXdXdXdXdX            dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX        dXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX          dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.qX0Xh.d 4X&.&. .%X.X0X0 dX~ L.L.dXdX    dXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.K.(.) %Xd d  .,X[.7.(.L.L.L.L.dXdXdX    dXdXdXdX          dXdXdX            dXdXdX        dXdXdX    dXdX    dXdX          dXdXdXdX        dXdXdX            dXdX        dXdXdXdXdX        dXdXdX          dXdXdXdX        dXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdX            dXdX    dXdX    dXdXdXdX    dXdXdXdXdX        dXdXdX            dXdX        dXdXdXdXdX        dXdXdX          dXdXdXdXdXdXdXdXdXdXdX    dXdX    dXdX    dXdX    dXdXdX        dXdXdXdX        dXdXdXdX        dXdXdXdX        dXdXdX            dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.0 j.tXg.,X,Xl.#.m.v.dX~ L.dXdXdXdX    dXdXdXdX    dXdX    dXdXdX    dXdXdXdXdX    dXdX    dXdX    dX      dXdX    dXdX    dXdXdXdXdXdX    dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdXdXdXdXdX    dXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdX    dX  dX    dX    dXdX    dXdXdXdX    dXdXdXdXdXdXdXdX    dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdXdXdXdXdXdXdXdXdX    dXdX    dXdX    dX      dXdX    dXdX    dXdXdXdXdX    dXdXdX    dXdX    dXdX    dXdX    dXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.R.wXh.rXrX[.} A L.dXA.L.dXdXdXdX    dXdXdXdX    dXdX    dXdXdX    dXdXdXdXdX    dXdX    dXdX      dXdXdXdXdX    dXdX    dXdXdXdXdXdX    dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdXdXdXdXdX    dXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdX          dXdXdX    dX  dX    dX    dXdX    dXdXdXdX    dXdXdXdXdXdXdXdX    dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdXdXdXdXdXdXdXdXdX          dXdXdX      dXdXdXdXdX    dXdX    dXdXdXdXdX    dXdXdX    dXdX    dXdX    dXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.K.6X4 [.iXW _.O.dX~ L.dXdXdXdXdX    dXdXdXdX    dXdX    dXdXdX    dXdXdXdXdX            dXdX    dXdXdXdXdXdX    dXdX    dXdXdX          dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdXdX          dXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdX    dX  dX    dX    dXdX    dXdXdXdX    dXdXdXdXdX          dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdX    dXdXdXdXdXdX    dXdX    dXdXdXdXdX    dXdXdX            dXdX    dXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.O.k.y X iX) u.dXL.L.L.dXdXdXdXdX    dXdXdXdX    dXdX    dXdXdX    dXdXdXdXdX    dXdXdXdXdXdX    dXdXdXdXdXdX    dXdX    dXdX    dXdX    dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdX    dXdX    dXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdX    dX  dX    dX    dXdX    dXdXdXdX    dXdXdXdX    dXdX    dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdX    dXdXdXdXdXdX    dXdX    dXdXdXdXdX    dXdXdX    dXdXdXdXdXdX    dXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.L.K.o _ BXyXO.dXL.L.dXdXdXdXdXdX    dXdXdXdX    dXdX    dXdXdX    dXdXdXdXdX    dXdXdXdXdXdX    dXdXdXdXdXdX    dXdX    dXdX    dXdX    dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdX    dXdX    dXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdX    dX  dX    dX    dXdX    dXdXdXdX    dXdXdXdX    dXdX    dXdXdX    dXdXdXdXdXdXdX    dXdXdXdX    dXdX    dXdX    dXdX    dXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdX    dXdXdXdXdXdX    dXdX    dXdXdXdXdX    dXdXdX    dXdXdXdXdXdX    dXdX    dXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.K.s.eXf dXdXL.dXdXdXdXdXdX        dXdXdX    dXdX    dXdXdXdX        dXdXdX        dXdXdX    dXdXdXdXdXdX    dXdX    dXdXdX          dXdXdXdX        dXdX            dXdXdX        dXdXdX    dXdX    dXdXdX          dXdX            dXdXdXdXdXdXdXdXdXdX            dXdX    dXdXdX    dXdX          dXdX            dXdXdX          dXdXdXdX        dXdX            dXdXdX        dXdXdX    dXdX    dXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdX    dXdXdXdXdXdXdX        dXdXdXdXdXdX    dXdXdXdX        dXdXdXdX        dXdXdXdXdX        dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXL.O.A.dXdXL.dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX    dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX        dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX        dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX",
-"dXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdXdX"
-};
diff --git a/Source/Glide64/rdp.cpp b/Source/Glide64/rdp.cpp
index 59d348eb4..c28194470 100644
--- a/Source/Glide64/rdp.cpp
+++ b/Source/Glide64/rdp.cpp
@@ -37,7 +37,7 @@
 //
 //****************************************************************
 
-#include "Gfx #1.3.h"
+#include "Gfx_1.3.h"
 #include <wx/confbase.h>
 #include "3dmath.h"
 #include "Util.h"
@@ -48,8 +48,6 @@
 #include "FBtoScreen.h"
 #include "CRC.h"
 
-extern "C" void SwapBlock32 ();
-extern "C" void SwapBlock64 ();
 
 const int NumOfFormats = 3;
 SCREEN_SHOT_FORMAT ScreenShotFormats[NumOfFormats] = { {wxT("BMP"), wxT("bmp"), wxBITMAP_TYPE_BMP}, {wxT("PNG"), wxT("png"), wxBITMAP_TYPE_PNG}, {wxT("JPEG"), wxT("jpeg"), wxBITMAP_TYPE_JPEG} };
@@ -440,6 +438,26 @@ static void DrawPartFrameBufferToScreen()
   ((wxUint32)((float)((color&0x07C0) >> 6) / 31.0f * 255.0f) << 16) | \
   ((wxUint32)((float)((color&0x003E) >> 1) / 31.0f * 255.0f) << 8)
 
+static void copyWhiteToRDRAM()
+{
+    if(rdp.ci_width == 0)
+        return;
+
+    wxUint16 *ptr_dst = (wxUint16*)(gfx.RDRAM + rdp.cimg);
+    wxUint32 *ptr_dst32 = (wxUint32*)(gfx.RDRAM + rdp.cimg);
+
+    for(wxUint32 y = 0; y < rdp.ci_height; y++)
+    {
+        for(wxUint32 x = 0; x < rdp.ci_width; x++)
+        {
+            if(rdp.ci_size == 2)
+                ptr_dst[(x + y * rdp.ci_width) ^ 1] = 0xFFFF;
+            else
+                ptr_dst32[x + y * rdp.ci_width] = 0xFFFFFFFF;
+        }
+    }
+}
+
 static void CopyFrameBuffer (GrBuffer_t buffer = GR_BUFFER_BACKBUFFER)
 {
   if (!fullscreen)
@@ -760,6 +778,10 @@ EXPORT void CALL ProcessDList(void)
   FRDP("--- NEW DLIST --- crc: %08lx, ucode: %d, fbuf: %08lx, fbuf_width: %d, dlist start: %08lx, dlist_length: %d, x_scale: %f, y_scale: %f\n", uc_crc, settings.ucode, *gfx.VI_ORIGIN_REG, *gfx.VI_WIDTH_REG, dlist_start, dlist_length, (*gfx.VI_X_SCALE_REG & 0xFFF)/1024.0f, (*gfx.VI_Y_SCALE_REG & 0xFFF)/1024.0f);
   FRDP_E("--- NEW DLIST --- crc: %08lx, ucode: %d, fbuf: %08lx\n", uc_crc, settings.ucode, *gfx.VI_ORIGIN_REG);
 
+  // Do nothing if dlist is empty
+  if (dlist_start == 0)
+      return;
+
   if (cpu_fb_write == TRUE)
     DrawPartFrameBufferToScreen();
   if ((settings.hacks&hack_Tonic) && dlist_length < 16)
@@ -862,8 +884,12 @@ EXPORT void CALL ProcessDList(void)
     rdp.scale_x = rdp.scale_x_bak;
     rdp.scale_y = rdp.scale_y_bak;
   }
-  if (settings.frame_buffer & fb_ref)
+
+  if(settings.hacks & hack_OoT)
+    copyWhiteToRDRAM(); //Subscreen delay fix
+  else if (settings.frame_buffer & fb_ref)
     CopyFrameBuffer ();
+
   if (rdp.cur_image)
     CloseTextureBuffer(rdp.read_whole_frame && ((settings.hacks&hack_PMario) || rdp.swap_ci_index >= 0));
 
@@ -1038,7 +1064,7 @@ static void rdp_texrect()
     return;
   }
 
-  if ((settings.ucode == ucode_PerfectDark) && (rdp.frame_buffers[rdp.ci_count-1].status == ci_zcopy))
+  if ((settings.ucode == ucode_PerfectDark) && rdp.ci_count > 0 && (rdp.frame_buffers[rdp.ci_count-1].status == ci_zcopy))
   {
     pd_zcopy ();
     LRDP("Depth buffer copied.\n");
@@ -1145,7 +1171,7 @@ static void rdp_texrect()
   if ((settings.ucode == ucode_PerfectDark) && (rdp.maincimg[1].addr != rdp.maincimg[0].addr) && (rdp.timg.addr >= rdp.maincimg[1].addr) && (rdp.timg.addr < (rdp.maincimg[1].addr+rdp.ci_width*rdp.ci_height*rdp.ci_size)))
   {
     if (fb_emulation_enabled)
-      if (rdp.frame_buffers[rdp.ci_count-1].status == ci_copy_self)
+      if (rdp.ci_count > 0 && rdp.frame_buffers[rdp.ci_count-1].status == ci_copy_self)
       {
         //FRDP("Wrong Texrect. texaddr: %08lx, cimg: %08lx, cimg_end: %08lx\n", rdp.timg.addr, rdp.maincimg[1], rdp.maincimg[1]+rdp.ci_width*rdp.ci_height*rdp.ci_size);
         LRDP("Wrong Texrect.\n");
@@ -1639,13 +1665,13 @@ static void rdp_setprimdepth()
 static void rdp_setothermode()
 {
 #define F3DEX2_SETOTHERMODE(cmd,sft,len,data) { \
-  rdp.cmd0 = (wxUint32)(((cmd)<<24) | ((32-(sft)-(len))<<8) | (((len)-1))); \
+  rdp.cmd0 = (wxUint32)((cmd<<24) | ((32-(sft)-(len))<<8) | (((len)-1))); \
   rdp.cmd1 = (wxUint32)(data); \
   gfx_instruction[settings.ucode][cmd] (); \
 }
 #define SETOTHERMODE(cmd,sft,len,data) { \
-  rdp.cmd0 = (wxUint32)(((cmd)<<24) | ((sft)<<8) | (len)); \
-  rdp.cmd1 = (wxUint32)(data); \
+  rdp.cmd0 = (wxUint32)((cmd<<24) | ((sft)<<8) | (len)); \
+  rdp.cmd1 = (wxUint32)data; \
   gfx_instruction[settings.ucode][cmd] (); \
 }
 
@@ -1824,7 +1850,130 @@ void setTBufTex(wxUint16 t_mem, wxUint32 cnt)
   }
 }
 
-extern "C" void asmLoadBlock(int src, int dst, int off, int dxt, int cnt, int swp);
+static inline void loadBlock(uint32_t *src, uint32_t *dst, uint32_t off, int dxt, int cnt)
+{
+  uint32_t *v5;
+  int v6;
+  uint32_t *v7;
+  uint32_t v8;
+  int v9;
+  uint32_t v10;
+  uint32_t *v11;
+  uint32_t v12;
+  uint32_t v13;
+  uint32_t v14;
+  int v15;
+  int v16;
+  uint32_t *v17;
+  int v18;
+  uint32_t v19;
+  uint32_t v20;
+  int i;
+
+  v5 = dst;
+  v6 = cnt;
+  if ( cnt )
+  {
+    v7 = (uint32_t *)((char *)src + (off & 0xFFFFFFFC));
+    v8 = off & 3;
+    if ( !(off & 3) )
+      goto LABEL_23;
+    v9 = 4 - v8;
+    v10 = *v7;
+    v11 = v7 + 1;
+    do
+    {
+      v10 = __ROL__(v10, 8);
+      --v8;
+    }
+    while ( v8 );
+    do
+    {
+      v10 = __ROL__(v10, 8);
+      *(uint8_t *)v5 = v10;
+      v5 = (uint32_t *)((char *)v5 + 1);
+      --v9;
+    }
+    while ( v9 );
+    v12 = *v11;
+    v7 = v11 + 1;
+    *v5 = bswap32(v12);
+    ++v5;
+    v6 = cnt - 1;
+    if ( cnt != 1 )
+    {
+LABEL_23:
+      do
+      {
+        *v5 = bswap32(*v7);
+        v5[1] = bswap32(v7[1]);
+        v7 += 2;
+        v5 += 2;
+        --v6;
+      }
+      while ( v6 );
+    }
+    v13 = off & 3;
+    if ( off & 3 )
+    {
+      v14 = *(uint32_t *)((char *)src + ((8 * cnt + off) & 0xFFFFFFFC));
+      do
+      {
+        v14 = __ROL__(v14, 8);
+        *(uint8_t *)v5 = v14;
+        v5 = (uint32_t *)((char *)v5 + 1);
+        --v13;
+      }
+      while ( v13 );
+    }
+  }
+  v15 = cnt;
+  v16 = 0;
+  v17 = dst;
+  v18 = 0;
+dxt_test:
+  while ( 1 )
+  {
+    v17 += 2;
+    --v15;
+    if ( !v15 )
+      break;
+    v16 += dxt;
+    if ( v16 < 0 )
+    {
+      while ( 1 )
+      {
+        ++v18;
+        --v15;
+        if ( !v15 )
+          goto end_dxt_test;
+        v16 += dxt;
+        if ( v16 >= 0 )
+        {
+          for ( i = v15; v18; --v18 )
+          {
+            v19 = *v17;
+            *v17 = v17[1];
+            v17[1] = v19;
+            v17 += 2;
+          }
+          v15 = i;
+          goto dxt_test;
+        }
+      }
+    }
+  }
+end_dxt_test:
+  while ( v18 )
+  {
+    v20 = *v17;
+    *v17 = v17[1];
+    v17[1] = v20;
+    v17 += 2;
+    --v18;
+  }
+}
+
 void LoadBlock32b(wxUint32 tile, wxUint32 ul_s, wxUint32 ul_t, wxUint32 lr_s, wxUint32 dxt);
 static void rdp_loadblock()
 {
@@ -1862,8 +2011,8 @@ static void rdp_loadblock()
 
   // lr_s specifies number of 64-bit words to copy
   // 10.2 format
-  wxUint16 ul_s = (wxUint16)((rdp.cmd0 >> 14) & 0x3FF);
-  wxUint16 ul_t = (wxUint16)((rdp.cmd0 >>  2) & 0x3FF);
+  wxUint16 ul_s = (wxUint16)(rdp.cmd0 >> 14) & 0x3FF;
+  wxUint16 ul_t = (wxUint16)(rdp.cmd0 >>  2) & 0x3FF;
 
   rdp.tiles[tile].ul_s = ul_s;
   rdp.tiles[tile].ul_t = ul_t;
@@ -1891,17 +2040,19 @@ static void rdp_loadblock()
   //angrylion's advice to use ul_s in texture image offset and cnt calculations.
   //Helps to fix Vigilante 8 jpeg backgrounds and logos
   wxUint32 off = rdp.timg.addr + (ul_s << rdp.tiles[tile].size >> 1);
-  wxUIntPtr dst = wxPtrToUInt(rdp.tmem)+(rdp.tiles[tile].t_mem<<3);
+  unsigned char *dst = ((unsigned char *)rdp.tmem) + (rdp.tiles[tile].t_mem<<3);
   wxUint32 cnt = lr_s-ul_s+1;
   if (rdp.tiles[tile].size == 3)
     cnt <<= 1;
 
-  wxUIntPtr SwapMethod = wxPtrToUInt(reinterpret_cast<void*>(SwapBlock32));
+  if (((rdp.tiles[tile].t_mem + cnt) << 3) > sizeof(rdp.tmem)) {
+    cnt = (sizeof(rdp.tmem) >> 3) - (rdp.tiles[tile].t_mem);
+  }
 
   if (rdp.timg.size == 3)
     LoadBlock32b(tile, ul_s, ul_t, lr_s, dxt);
   else
-    asmLoadBlock(wxPtrToUInt(gfx.RDRAM), dst, off, _dxt, cnt, SwapMethod);
+    loadBlock((uint32_t *)gfx.RDRAM, (uint32_t *)dst, off, _dxt, cnt);
 
   rdp.timg.addr += cnt << 3;
   rdp.tiles[tile].lr_t = ul_t + ((dxt*cnt)>>11);
@@ -1916,7 +2067,137 @@ static void rdp_loadblock()
     setTBufTex(rdp.tiles[tile].t_mem, cnt);
 }
 
-extern "C" void asmLoadTile(int src, int dst, int width, int height, int line, int off, int end);
+
+static inline void loadTile(uint32_t *src, uint32_t *dst, int width, int height, int line, int off, uint32_t *end)
+{
+  uint32_t *v7;
+  int v8;
+  uint32_t *v9;
+  int v10;
+  int v11;
+  int v12;
+  uint32_t *v13;
+  int v14;
+  int v15;
+  uint32_t v16;
+  uint32_t *v17;
+  uint32_t v18;
+  int v19;
+  uint32_t v20;
+  int v21;
+  uint32_t v22;
+  int v23;
+  uint32_t *v24;
+  int v25;
+  int v26;
+  uint32_t *v27;
+  int v28;
+  int v29;
+  int v30;
+  uint32_t *v31;
+
+  v7 = dst;
+  v8 = width;
+  v9 = src;
+  v10 = off;
+  v11 = 0;
+  v12 = height;
+  do
+  {
+    if ( end < v7 )
+      break;
+    v31 = v7;
+    v30 = v8;
+    v29 = v12;
+    v28 = v11;
+    v27 = v9;
+    v26 = v10;
+    if ( v8 )
+    {
+      v25 = v8;
+      v24 = v9;
+      v23 = v10;
+      v13 = (uint32_t *)((char *)v9 + (v10 & 0xFFFFFFFC));
+      v14 = v10 & 3;
+      if ( !(v10 & 3) )
+        goto LABEL_20;
+      v15 = 4 - v14;
+      v16 = *v13;
+      v17 = v13 + 1;
+      do
+      {
+        v16 = __ROL__(v16, 8);
+        --v14;
+      }
+      while ( v14 );
+      do
+      {
+        v16 = __ROL__(v16, 8);
+        *(uint8_t *)v7 = v16;
+        v7 = (uint32_t *)((char *)v7 + 1);
+        --v15;
+      }
+      while ( v15 );
+      v18 = *v17;
+      v13 = v17 + 1;
+      *v7 = bswap32(v18);
+      ++v7;
+      --v8;
+      if ( v8 )
+      {
+LABEL_20:
+        do
+        {
+          *v7 = bswap32(*v13);
+          v7[1] = bswap32(v13[1]);
+          v13 += 2;
+          v7 += 2;
+          --v8;
+        }
+        while ( v8 );
+      }
+      v19 = v23 & 3;
+      if ( v23 & 3 )
+      {
+        v20 = *(uint32_t *)((char *)v24 + ((8 * v25 + v23) & 0xFFFFFFFC));
+        do
+        {
+          v20 = __ROL__(v20, 8);
+          *(uint8_t *)v7 = v20;
+          v7 = (uint32_t *)((char *)v7 + 1);
+          --v19;
+        }
+        while ( v19 );
+      }
+    }
+    v9 = v27;
+    v21 = v29;
+    v8 = v30;
+    v11 = v28 ^ 1;
+    if ( v28 == 1 )
+    {
+      v7 = v31;
+      if ( v30 )
+      {
+        do
+        {
+          v22 = *v7;
+          *v7 = v7[1];
+          v7[1] = v22;
+          v7 += 2;
+          --v8;
+        }
+        while ( v8 );
+      }
+      v21 = v29;
+      v8 = v30;
+    }
+    v10 = line + v26;
+    v12 = v21 - 1;
+  }
+  while ( v12 );
+}
+
 void LoadTile32b (wxUint32 tile, wxUint32 ul_s, wxUint32 ul_t, wxUint32 width, wxUint32 height);
 static void rdp_loadtile()
 {
@@ -2005,9 +2286,9 @@ static void rdp_loadtile()
       return;
 
     wxUint32 wid_64 = rdp.tiles[tile].line;
-    wxUIntPtr dst = wxPtrToUInt(rdp.tmem) + (rdp.tiles[tile].t_mem<<3);
-    wxUIntPtr end = wxPtrToUInt(rdp.tmem) + 4096 - (wid_64<<3);
-    asmLoadTile(wxPtrToUInt(gfx.RDRAM), dst, wid_64, height, line_n, offs, end);
+    unsigned char *dst = ((unsigned char *)rdp.tmem) + (rdp.tiles[tile].t_mem<<3);
+    unsigned char *end = ((unsigned char *)rdp.tmem) + 4096 - (wid_64<<3);
+    loadTile((uint32_t *)gfx.RDRAM, (uint32_t *)dst, wid_64, height, line_n, offs, (uint32_t *)end);
   }
   FRDP("loadtile: tile: %d, ul_s: %d, ul_t: %d, lr_s: %d, lr_t: %d\n", tile,
     ul_s, ul_t, lr_s, lr_t);
@@ -2089,7 +2370,7 @@ static void rdp_fillrect()
     return;
   }
   int pd_multiplayer = (settings.ucode == ucode_PerfectDark) && (rdp.cycle_mode == 3) && (rdp.fill_color == 0xFFFCFFFC);
-  if ((rdp.cimg == rdp.zimg) || (fb_emulation_enabled && rdp.frame_buffers[rdp.ci_count-1].status == ci_zimg) || pd_multiplayer)
+  if ((rdp.cimg == rdp.zimg) || (fb_emulation_enabled && rdp.ci_count > 0 && rdp.frame_buffers[rdp.ci_count-1].status == ci_zimg) || pd_multiplayer)
   {
     LRDP("Fillrect - cleared the depth buffer\n");
     if (fullscreen)
@@ -2195,7 +2476,7 @@ static void rdp_fillrect()
       {
         wxUint32 color = rdp.fill_color;
 
-        if ((settings.hacks&hack_PMario) && rdp.frame_buffers[rdp.ci_count-1].status == ci_aux)
+        if ((settings.hacks&hack_PMario) && rdp.ci_count > 0 && rdp.frame_buffers[rdp.ci_count-1].status == ci_aux)
         {
           //background of auxiliary frame buffers must have zero alpha.
           //make it black, set 0 alpha to plack pixels on frame buffer read
@@ -2408,7 +2689,7 @@ static void rdp_settextureimage()
   rdp.s2dex_tex_loaded = TRUE;
   rdp.update |= UPDATE_TEXTURE;
 
-  if (rdp.frame_buffers[rdp.ci_count-1].status == ci_copy_self && (rdp.timg.addr >= rdp.cimg) && (rdp.timg.addr < rdp.ci_end))
+  if (rdp.ci_count > 0 && rdp.frame_buffers[rdp.ci_count-1].status == ci_copy_self && (rdp.timg.addr >= rdp.cimg) && (rdp.timg.addr < rdp.ci_end))
   {
     if (!rdp.fb_drawn)
     {
@@ -2755,7 +3036,7 @@ static void rdp_setcolorimage()
   rdp.ocimg = rdp.cimg;
   rdp.cimg = segoffset(rdp.cmd1) & BMASK;
   rdp.ci_width = (rdp.cmd0 & 0xFFF) + 1;
-  if (fb_emulation_enabled)
+  if (fb_emulation_enabled && rdp.ci_count > 0)
     rdp.ci_height = rdp.frame_buffers[rdp.ci_count-1].height;
   else if (rdp.ci_width == 32)
     rdp.ci_height = 32;
@@ -2777,7 +3058,7 @@ static void rdp_setcolorimage()
   {
     if (!rdp.cur_image)
     {
-      if (fb_hwfbe_enabled && rdp.ci_width <= 64)
+      if (fb_hwfbe_enabled && rdp.ci_width <= 64 && rdp.ci_count > 0)
         OpenTextureBuffer(rdp.frame_buffers[rdp.ci_count - 1]);
       else if (format > 2)
         rdp.skip_drawing = TRUE;
diff --git a/Source/Glide64/rdp.h b/Source/Glide64/rdp.h
index fff889af6..9dfa8d7b0 100644
--- a/Source/Glide64/rdp.h
+++ b/Source/Glide64/rdp.h
@@ -115,9 +115,9 @@ extern wxUint32 frame_count; // frame counter
 #define uc(x) coord[x<<1]
 #define vc(x) coord[(x<<1)+1]
 
-#if defined __VISUALC__
-#define DECLAREALIGN16VAR(var) __declspec(align(16)) float (var)
-#elif defined __GNUG__
+#if defined(_MSC_VER)
+#define DECLAREALIGN16VAR(var) __declspec(align(16)) float var
+#elif defined(__GNUG__)
 #define DECLAREALIGN16VAR(var) float (var) __attribute__ ((aligned(16)))
 #endif
 
@@ -330,6 +330,7 @@ typedef struct {
   #define  hack_Tonic       (1<<26)  //tonic trouble
   #define  hack_Yoshi       (1<<27)  //Yoshi Story
   #define  hack_Zelda       (1<<28)  //zeldas hacks
+  #define  hack_OoT         (1<<29)  //zelda OoT hacks
   wxUint32 hacks;
 
   //wrapper settings
diff --git a/Source/Glide64/russia.xpm b/Source/Glide64/russia.xpm
deleted file mode 100644
index babcb7f8e..000000000
--- a/Source/Glide64/russia.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static const char *russia_xpm[]={
-"30 20 12 1",
-"      c #E7E7E7",
-"0     c #F7F7F7",
-"1     c #FFFFFF",
-"2     c #ADCEE7",
-"3     c #B5D6EF",
-"4     c #0073C6",
-"5     c #0073CE",
-"6     c #9C394A",
-"7     c #9C3942",
-"8     c #CE2918",
-"9     c #DE2110",
-"a     c #D62110",
-" 0 0 0 0 0 0 0 0 0 0 0 0 0 0  ",
-"011111111111111111111111111110",
-"01111111111111111111111111111 ",
-"001111111111111111111111111110",
-"01111111111111111111111111111 ",
-"001111111111111111111111111110",
-"223232323232323232323232323232",
-"455555555555555555555555555554",
-"455555555555555555555555555554",
-"455555555555555555555555555554",
-"455555555555555555555555555554",
-"455555555555555555555555555554",
-"455555555555555555555555555554",
-"677677677677677677677677677676",
-"89999999999999999999999999999a",
-"89999999999999999999999999999a",
-"a99999999999999999999999999998",
-"89999999999999999999999999999a",
-"899999999999999999999999999998",
-"88a8a8a8a8a8a8a8a8a8a8a8a8a8a8"};
diff --git a/Source/Glide64/ucode02.h b/Source/Glide64/ucode02.h
index 8bb7af1ad..d23f5aaff 100644
--- a/Source/Glide64/ucode02.h
+++ b/Source/Glide64/ucode02.h
@@ -593,10 +593,7 @@ static void uc2_moveword ()
         int index_y = index_x >> 2;
         index_x &= 3;
 
-        float fpart = (float)fabs(rdp.combined[index_y][index_x] - (int)rdp.combined[index_y][index_x]);
         rdp.combined[index_y][index_x] = (short)(rdp.cmd1>>16);
-
-        fpart = (float)fabs(rdp.combined[index_y][index_x+1] - (int)rdp.combined[index_y][index_x+1]);
         rdp.combined[index_y][index_x+1] = (short)(rdp.cmd1&0xFFFF);
       }
 
diff --git a/Source/Glide64/ucode06.h b/Source/Glide64/ucode06.h
index 29c5b7c3c..621047b59 100644
--- a/Source/Glide64/ucode06.h
+++ b/Source/Glide64/ucode06.h
@@ -66,11 +66,9 @@ static float set_sprite_combine_mode ()
   float Z = 0.0f;
   if ((rdp.othermode_l & 0x00000030) && rdp.cycle_mode < 2)
   {
-    wxUint16 prim_dz = 0;
     if (rdp.zsrc == 1)
     {
       Z = rdp.prim_depth;
-      prim_dz = rdp.prim_dz;
     }
     FRDP ("prim_depth = %d, prim_dz = %d\n", rdp.prim_depth, rdp.prim_dz);
     Z = ScaleZ(Z);
diff --git a/Source/Glide64/ucode09.h b/Source/Glide64/ucode09.h
index 882d1226b..05f5c0594 100644
--- a/Source/Glide64/ucode09.h
+++ b/Source/Glide64/ucode09.h
@@ -99,8 +99,6 @@ static void uc9_draw_object (wxUint8 * addr, wxUint32 type)
 {
   wxUint32 textured, vnum, vsize;
   switch (type) {
-    default: /* added to fix uninitialized variable warnings + debugging */
-      FRDP_E("Unknown geometric primitive type %u.\n", type);
     case 0: //null
       textured = vnum = vsize = 0;
       break;
@@ -124,6 +122,10 @@ static void uc9_draw_object (wxUint8 * addr, wxUint32 type)
       vnum = 4;
       vsize = 16;
       break;
+    default:
+      FRDP_E("Unknown geometric primitive type %u.\n", type);
+      textured = vnum = vsize = 0;
+      break;
   }
   VERTEX vtx[4];
   for (wxUint32 i = 0; i < vnum; i++)
@@ -255,7 +257,7 @@ static void uc9_fmlight ()
   wxUint32 a = -1024 + (rdp.cmd1&0xFFF);
   FRDP ("uc9:fmlight matrix: %d, num: %d, dmem: %04lx\n", mid, rdp.num_lights, a);
 
-  M44 *m;
+  M44 *m = NULL;
   switch (mid) {
   case 4:
     m = (M44*)rdp.model;
@@ -388,8 +390,8 @@ static void uc9_mtxtrnsp ()
 static void uc9_mtxcat ()
 {
   LRDP("uc9:mtxcat ");
-  M44 *s;
-  M44 *t;
+  M44 *s = NULL;
+  M44 *t = NULL;
   wxUint32 S = rdp.cmd0&0xF;
   wxUint32 T = (rdp.cmd1>>16)&0xF;
   wxUint32 D = rdp.cmd1&0xF;
diff --git a/Source/Glide64/usa.xpm b/Source/Glide64/usa.xpm
deleted file mode 100644
index f38194564..000000000
--- a/Source/Glide64/usa.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static const char *usa_xpm[]={
-"30 16 16 1",
-"      c #303F8B",
-"0     c #27327A",
-"1     c #D3332B",
-"2     c #1A2A7A",
-"3     c #3A428E",
-"4     c #F5CDCD",
-"5     c #3A4A8E",
-"6     c #EB8E8D",
-"7     c #122272",
-"8     c #E56A64",
-"9     c #FBE1E1",
-"a     c #FBEEEE",
-"b     c #DE322A",
-"c     c #F3D6DB",
-"d     c #EA7A7A",
-"e     c #636DA9",
-" 0 0 0 0 0 0111111111111111111",
-"23 3 3 3 3 2444444444444444444",
-"5           666666666666666666",
-"73         7888888888888888888",
-"3 3         9aaaaaaaaaaaaaaaa9",
-"0535535355301bbbbbbbbbbbbbbbb1",
-"05 3 3 3 3 0cccccccccccccccc94",
-"3 3 3 3   3 dddddddddddddddddd",
-"eeeeeeeeeeeedddddddddddddddddd",
-"cc9c9c9c9c9c9c99c99c99c99c99cc",
-"1bbbbbbbbbbbbbbbbbbbbbbbbbbbb1",
-"99aaa9aa9aa9aaa9aa9aaa9aaa9aa9",
-"888888888888888888888888888888",
-"666666666666666666666666666666",
-"444444444444444444444444444444",
-"111111111111111111111111111111"};
diff --git a/Source/Glide64/winlnxdefs.h b/Source/Glide64/winlnxdefs.h
new file mode 100644
index 000000000..55f37a3ff
--- /dev/null
+++ b/Source/Glide64/winlnxdefs.h
@@ -0,0 +1,92 @@
+/*
+* Glide64 - Glide video plugin for Nintendo 64 emulators.
+* Copyright (c) 2002  Dave2001
+* Copyright (c) 2003-2009  Sergey 'Gonetz' Lipski
+* Copyright (c) 2012-2013 balrog, wahrhaft
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+
+#ifndef WINLNXDEFS_H
+#define WINLNXDEFS_H
+
+#define wxNO_GL_LIB
+#define wxNO_HTML_LIB
+#define wxNO_ADV_LIB
+#define wxNO_ZLIB_LIB
+#define wxNO_TIFF_LIB
+#define wxNO_EXPAT_LIB
+#define wxNO_REGEX_LIB
+#define wxNO_XML_LIB
+#define wxNO_NET_LIB
+#define wxNO_QA_LIB
+#define wxNO_XRC_LIB
+#define wxNO_AUI_LIB
+#define wxNO_PROPGRID_LIB
+#define wxNO_RIBBON_LIB
+#define wxNO_RICHTEXT_LIB
+#define wxNO_MEDIA_LIB
+#define wxNO_STC_LIB
+
+
+#include <wx/wx.h>
+#include <wx/dynlib.h>
+#include <wx/filename.h>
+#include <wx/datetime.h>
+
+#define wxPtrToUInt (uintptr_t)
+#define TRUE 1
+#define FALSE 0
+
+#include <Common/stdtypes.h>
+
+typedef int BOOL;
+typedef uint32_t wxUint32;
+typedef uint16_t wxUint16;
+typedef uint8_t wxUint8;
+typedef uint8_t BYTE;
+typedef long long LONGLONG;
+
+
+typedef int32_t wxInt32;
+typedef int16_t wxInt16;
+typedef int8_t wxInt8;
+
+typedef uint64_t wxUint64;
+typedef int64_t wxInt64;
+
+#ifndef _WIN32
+
+typedef union _LARGE_INTEGER
+{
+   struct
+     {
+    uint32_t LowPart;
+    uint32_t HighPart;
+     } s;
+   struct
+     {
+    uint32_t LowPart;
+    uint32_t HighPart;
+     } u;
+   long long QuadPart;
+} LARGE_INTEGER, *PLARGE_INTEGER;
+
+#define WINAPI
+
+#endif
+
+#endif
diff --git a/Source/GlideHQ/Ext_TxFilter.h b/Source/GlideHQ/Ext_TxFilter.h
index 9a7010c3d..f8833a572 100644
--- a/Source/GlideHQ/Ext_TxFilter.h
+++ b/Source/GlideHQ/Ext_TxFilter.h
@@ -24,7 +24,7 @@
 #ifndef __EXT_TXFILTER_H__
 #define __EXT_TXFILTER_H__
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #define TXHMODULE HMODULE
 #define DLOPEN(a) LoadLibraryW(a)
diff --git a/Source/GlideHQ/GlideHQ.vcproj b/Source/GlideHQ/GlideHQ.vcproj
index 1984cb6be..774dcd597 100644
--- a/Source/GlideHQ/GlideHQ.vcproj
+++ b/Source/GlideHQ/GlideHQ.vcproj
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/src&quot;"
+				AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/src/zlib&quot;;&quot;$(Root)Source/3rd Party/wx/src&quot;"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>
@@ -91,7 +91,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/src&quot;"
+				AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/src/zlib&quot;;&quot;$(Root)Source/3rd Party/wx/src&quot;"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 			/>
diff --git a/Source/GlideHQ/GlideHQ.vcxproj b/Source/GlideHQ/GlideHQ.vcxproj
index facf498c4..822afbd13 100644
--- a/Source/GlideHQ/GlideHQ.vcxproj
+++ b/Source/GlideHQ/GlideHQ.vcxproj
@@ -5,34 +5,35 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2DADDAA5-0F57-46ED-A974-747908DDC7F3}</ProjectGuid>
     <RootNamespace>GlideHQ</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/include/msvc;$(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/src/zlib;$(Root)Source/3rd Party/wx/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
@@ -82,7 +83,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/GlideHQ/TextureFilters.cpp b/Source/GlideHQ/TextureFilters.cpp
index e0e2d9b43..b46dcb566 100644
--- a/Source/GlideHQ/TextureFilters.cpp
+++ b/Source/GlideHQ/TextureFilters.cpp
@@ -74,70 +74,57 @@ void Texture2x_32(uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch
       r1 = (pSrc[xSrc]>>16)&0xFF;
       a1 = (pSrc[xSrc]>>24)&0xFF;
 
-      if( xSrc<nWidth-1 )
-      {
-        b2 = (pSrc[xSrc+1]>>0)&0xFF;
-        g2 = (pSrc[xSrc+1]>>8)&0xFF;
-        r2 = (pSrc[xSrc+1]>>16)&0xFF;
-        a2 = (pSrc[xSrc+1]>>24)&0xFF;
-      }
-
-      if( ySrc<nHeight-1 )
-      {
-        b3 = (pSrc2[xSrc]>>0)&0xFF;
-        g3 = (pSrc2[xSrc]>>8)&0xFF;
-        r3 = (pSrc2[xSrc]>>16)&0xFF;
-        a3 = (pSrc2[xSrc]>>24)&0xFF;
-        if( xSrc<nWidth-1 )
-        {
-          b4 = (pSrc2[xSrc+1]>>0)&0xFF;
-          g4 = (pSrc2[xSrc+1]>>8)&0xFF;
-          r4 = (pSrc2[xSrc+1]>>16)&0xFF;
-          a4 = (pSrc2[xSrc+1]>>24)&0xFF;
-        }
-      }
-
-
       // Pixel 1
       pDst1[xSrc*2] = pSrc[xSrc];
 
       // Pixel 2
       if( xSrc<nWidth-1 )
       {
+        b2 = (pSrc[xSrc+1]>>0)&0xFF;
+        g2 = (pSrc[xSrc+1]>>8)&0xFF;
+        r2 = (pSrc[xSrc+1]>>16)&0xFF;
+        a2 = (pSrc[xSrc+1]>>24)&0xFF;
         pDst1[xSrc*2+1] = DWORD_MAKE((r1+r2)/2, (g1+g2)/2, (b1+b2)/2, (a1+a2)/2);
       }
       else
         pDst1[xSrc*2+1] = pSrc[xSrc];
 
-
       // Pixel 3
       if( ySrc<nHeight-1 )
       {
+        b3 = (pSrc2[xSrc]>>0)&0xFF;
+        g3 = (pSrc2[xSrc]>>8)&0xFF;
+        r3 = (pSrc2[xSrc]>>16)&0xFF;
+        a3 = (pSrc2[xSrc]>>24)&0xFF;
         pDst2[xSrc*2] = DWORD_MAKE((r1+r3)/2, (g1+g3)/2, (b1+b3)/2, (a1+a3)/2);
-      }
-      else
-        pDst2[xSrc*2] = pSrc[xSrc];
-
-      // Pixel 4
-      if( xSrc<nWidth-1 )
-      {
-        if( ySrc<nHeight-1 )
+        if( xSrc<nWidth-1 )
         {
+          b4 = (pSrc2[xSrc+1]>>0)&0xFF;
+          g4 = (pSrc2[xSrc+1]>>8)&0xFF;
+          r4 = (pSrc2[xSrc+1]>>16)&0xFF;
+          a4 = (pSrc2[xSrc+1]>>24)&0xFF;
+          // Pixel 4
           pDst2[xSrc*2+1] = DWORD_MAKE((r1+r2+r3+r4)/4, (g1+g2+g3+g4)/4, (b1+b2+b3+b4)/4, (a1+a2+a3+a4)/4);
         }
         else
         {
-          pDst2[xSrc*2+1] = DWORD_MAKE((r1+r2)/2, (g1+g2)/2, (b1+b2)/2, (a1+a2)/2);
+          // Pixel 4
+          pDst2[xSrc*2+1] = DWORD_MAKE((r1+r3)/2, (g1+g3)/2, (b1+b3)/2, (a1+a3)/2);
         }
       }
       else
       {
-        if( ySrc<nHeight-1 )
+        // Pixel 3
+        pDst2[xSrc*2] = pSrc[xSrc];
+        // Pixel 4
+        if( xSrc<nWidth-1 )
         {
-          pDst2[xSrc*2+1] = DWORD_MAKE((r1+r3)/2, (g1+g3)/2, (b1+b3)/2, (a1+a3)/2);
+          pDst2[xSrc*2+1] = DWORD_MAKE((r1+r2)/2, (g1+g2)/2, (b1+b2)/2, (a1+a2)/2);
         }
         else
+        {
           pDst2[xSrc*2+1] = pSrc[xSrc];
+        }
       }
     }
   }
diff --git a/Source/GlideHQ/TextureFilters_2xsai.cpp b/Source/GlideHQ/TextureFilters_2xsai.cpp
index 38226df28..d7e8305ff 100644
--- a/Source/GlideHQ/TextureFilters_2xsai.cpp
+++ b/Source/GlideHQ/TextureFilters_2xsai.cpp
@@ -37,7 +37,6 @@ void Super2xSaI_8888(uint32 *srcPtr, uint32 *destPtr, uint32 width, uint32 heigh
 #define SAI_Q_INTERPOLATE SAI_Q_INTERPOLATE_8888
 
   uint32 destWidth = width << 1;
-  uint32 destHeight = height << 1;
   
   uint32 color4, color5, color6;
   uint32 color1, color2, color3;
diff --git a/Source/GlideHQ/TxCache.cpp b/Source/GlideHQ/TxCache.cpp
index e9b9ef9da..1c2832da7 100644
--- a/Source/GlideHQ/TxCache.cpp
+++ b/Source/GlideHQ/TxCache.cpp
@@ -29,6 +29,7 @@
 #include "TxDbg.h"
 #include <zlib/zlib.h>
 #include <Common/path.h>
+#include <common/std string.h>
 
 TxCache::~TxCache()
 {
@@ -89,7 +90,7 @@ TxCache::add(uint64 checksum, GHQTexInfo *info, int dataSize)
 
     if (_options & (GZ_TEXCACHE|GZ_HIRESTEXCACHE)) {
       /* zlib compress it. compression level:1 (best speed) */
-      uint32 destLen = _gzdestLen;
+      uLongf destLen = _gzdestLen;
       dest = (dest == _gzdest0) ? _gzdest1 : _gzdest0;
       if (compress2(dest, &destLen, info->data, dataSize, 1) != Z_OK) {
         dest = info->data;
@@ -208,7 +209,7 @@ TxCache::get(uint64 checksum, GHQTexInfo *info)
 
     /* zlib decompress it */
     if (info->format & GR_TEXFMT_GZ) {
-      uint32 destLen = _gzdestLen;
+      uLongf destLen = _gzdestLen;
       uint8 *dest = (_gzdest0 == info->data) ? _gzdest1 : _gzdest0;
       if (uncompress(dest, &destLen, info->data, ((*itMap).second)->size) != Z_OK) {
         DBG_INFO(80, L"Error: zlib decompression failed!\n");
@@ -233,16 +234,16 @@ TxCache::save(const wchar_t *path, const wchar_t *filename, int config)
     char cbuf[MAX_PATH];
 
 	CPath cachepath(stdstr().FromUTF16(path),"");
-	cachepath.CreateDirectory();
+	cachepath.DirectoryCreate();
 
     /* Ugly hack to enable fopen/gzopen in Win9x */
-#ifdef WIN32
+#ifdef _WIN32
     wchar_t curpath[MAX_PATH];
     GETCWD(MAX_PATH, curpath);
     cachepath.ChangeDirectory();
 #else
     char curpath[MAX_PATH];
-    wcstombs(cbuf, cachepath.string().c_str(), MAX_PATH);
+    wcstombs(cbuf, cachepath.wstring().c_str(), MAX_PATH);
     GETCWD(MAX_PATH, curpath);
     CHDIR(cbuf);
 #endif
diff --git a/Source/GlideHQ/TxDbg.h b/Source/GlideHQ/TxDbg.h
index f22b87e87..8f366ce84 100644
--- a/Source/GlideHQ/TxDbg.h
+++ b/Source/GlideHQ/TxDbg.h
@@ -43,17 +43,17 @@ public:
 };
 
 #ifdef DEBUG
-#define DBG_INFO TxDbg::getInstance()->output
-#define INFO DBG_INFO
+#define DBG_INFO(...) TxDbg::getInstance()->output(__VA_ARGS__)
+#define INFO(...) DBG_INFO(__VA_ARGS__)
 #else
-#define DBG_INFO 0 && (wchar_t)
+#define DBG_INFO(...)
 #ifdef GHQCHK
-#define INFO TxDbg::getInstance()->output
+#define INFO(...) TxDbg::getInstance()->output(__VA_ARGS__)
 #else
 #if 0 /* XXX enable this to log basic hires texture checks */
-#define INFO TxDbg::getInstance()->output
+#define INFO(...) TxDbg::getInstance()->output(__VA_ARGS__)
 #else
-#define INFO DBG_INFO
+#define INFO(...) DBG_INFO(__VA_ARGS__)
 #endif
 #endif
 #endif
diff --git a/Source/GlideHQ/TxFilter.cpp b/Source/GlideHQ/TxFilter.cpp
index 9d98f65a3..6600aa39f 100644
--- a/Source/GlideHQ/TxFilter.cpp
+++ b/Source/GlideHQ/TxFilter.cpp
@@ -21,15 +21,15 @@
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #pragma warning(disable: 4786)
 #endif
 
 #include <common/path.h>
+#include <common/std string.h>
 #include "TxFilter.h"
 #include "TextureFilters.h"
 #include "TxDbg.h"
-#include "bldno.h"
 
 void TxFilter::clear()
 {
@@ -83,6 +83,11 @@ TxFilter::TxFilter(int maxwidth, int maxheight, int maxbpp, int options,
   /* shamelessness :P this first call to the debug output message creates
    * a file in the executable directory. */
   INFO(0, L"------------------------------------------------------------------\n");
+#ifdef GHQCHK
+  INFO(0, L" GlideHQ Hires Texture Checker 1.02.00.%d\n", 0);
+#else
+  INFO(0, L" GlideHQ version 1.02.00.%d\n", 0);
+#endif
   INFO(0, L" Copyright (C) 2010  Hiroshi Morii   All Rights Reserved\n");
   INFO(0, L"    email   : koolsmoky(at)users.sourceforge.net\n");
   INFO(0, L"    website : http://www.3dfxzone.it/koolsmoky\n");
@@ -609,15 +614,15 @@ TxFilter::dmptx(uint8 *src, int width, int height, int rowStridePixel, uint16 gf
     /* create directories */
 	tmpbuf.AppendDirectory("texture_dump");
 
-	if (!tmpbuf.DirectoryExists() && !tmpbuf.CreateDirectory())
+	if (!tmpbuf.DirectoryExists() && !tmpbuf.DirectoryCreate())
       return 0;
 
 	tmpbuf.AppendDirectory(stdstr().FromUTF16(_ident.c_str()).c_str());
-	if (!tmpbuf.DirectoryExists() && !tmpbuf.CreateDirectory())
+	if (!tmpbuf.DirectoryExists() && !tmpbuf.DirectoryCreate())
 		return 0;
 
 	tmpbuf.AppendDirectory("GlideHQ");
-	if (!tmpbuf.DirectoryExists() && !tmpbuf.CreateDirectory())
+	if (!tmpbuf.DirectoryExists() && !tmpbuf.DirectoryCreate())
 		return 0;
 
     if ((n64fmt >> 8) == 0x2) {
@@ -625,7 +630,7 @@ TxFilter::dmptx(uint8 *src, int width, int height, int rowStridePixel, uint16 gf
     } else {
       tmpbuf.SetNameExtension(stdstr_f("%ls#%08X#%01X#%01X_all.png",_ident.c_str(),(uint32)(r_crc64 & 0xffffffff),(n64fmt >> 8),(n64fmt & 0xf)).c_str());
     }
-#ifdef WIN32
+#ifdef _WIN32
     if ((fp = fopen(tmpbuf, "wb")) != NULL) {
 #else
     char cbuf[MAX_PATH];
diff --git a/Source/GlideHQ/TxHiResCache.cpp b/Source/GlideHQ/TxHiResCache.cpp
index b78533ac4..27dc4a39e 100644
--- a/Source/GlideHQ/TxHiResCache.cpp
+++ b/Source/GlideHQ/TxHiResCache.cpp
@@ -24,7 +24,7 @@
 /* 2007 Gonetz <gonetz(at)ngs.ru>
  * Added callback to display hires texture info. */
 
-#ifdef WIN32
+#ifdef _WIN32
 #pragma warning(disable: 4786)
 #endif
 
@@ -61,6 +61,8 @@
 #include <zlib/zlib.h>
 #include <string>
 #include <common/path.h>
+#include <common/std string.h>
+#include <io.h>
 
 TxHiResCache::~TxHiResCache()
 {
@@ -73,7 +75,7 @@ TxHiResCache::~TxHiResCache()
     cachepath.AppendDirectory("cache");
     int config = _options & (HIRESTEXTURES_MASK|COMPRESS_HIRESTEX|COMPRESSION_MASK|TILE_HIRESTEX|FORCE16BPP_HIRESTEX|GZ_HIRESTEXCACHE|LET_TEXARTISTS_FLY);
 
-    TxCache::save(stdstr(cachepath).ToUTF16().c_str(), filename.c_str(), config);
+	TxCache::save(stdstr((std::string &)cachepath).ToUTF16().c_str(), filename.c_str(), config);
   }
 #endif
 
@@ -115,7 +117,7 @@ TxHiResCache::TxHiResCache(int maxwidth, int maxheight, int maxbpp, int options,
 	cachepath.AppendDirectory("cache");
     int config = _options & (HIRESTEXTURES_MASK|COMPRESS_HIRESTEX|COMPRESSION_MASK|TILE_HIRESTEX|FORCE16BPP_HIRESTEX|GZ_HIRESTEXCACHE|LET_TEXARTISTS_FLY);
 
-    _haveCache = TxCache::load(stdstr(cachepath).ToUTF16().c_str(), filename.c_str(), config);
+	_haveCache = TxCache::load(stdstr((std::string &)cachepath).ToUTF16().c_str(), filename.c_str(), config);
   }
 #endif
 
@@ -225,27 +227,27 @@ boolean TxHiResCache::loadHiResTextures(LPCSTR dir_path, boolean replace)
 			/* XXX case sensitivity fiasco!
 			* files must use _a, _rgb, _all, _allciByRGBA, _ciByRGBA, _ci
 			* and file extensions must be in lower case letters! */
-			#ifdef WIN32
+#ifdef _WIN32
 			{
 				unsigned int i;
 				for (i = 0; i < strlen(fname); i++) fname[i] = (char)tolower(fname[i]);
 			}
-			#endif
+#endif
 			ident.assign(fname);
 
 			/* read in Rice's file naming convention */
 			#define CRCFMTSIZ_LEN 13
 			#define PALCRC_LEN 9
-			wcstombs(fname, TextureDir.GetNameExtension().ToUTF16().c_str(), MAX_PATH);
+			wcstombs(fname, stdstr(TextureDir.GetNameExtension()).ToUTF16().c_str(), MAX_PATH);
 			/* XXX case sensitivity fiasco!
 			* files must use _a, _rgb, _all, _allciByRGBA, _ciByRGBA, _ci
 			* and file extensions must be in lower case letters! */
-			#ifdef WIN32
+#ifdef _WIN32
 			{
 				unsigned int i;
 				for (i = 0; i < strlen(fname); i++) fname[i] = (char)tolower(fname[i]);
 			}
-			#endif
+#endif
 			pfname = fname + strlen(fname) - 4;
 			if (!(pfname == strstr(fname, ".png") ||
 				  pfname == strstr(fname, ".bmp") ||
@@ -451,7 +453,7 @@ boolean TxHiResCache::loadHiResTextures(LPCSTR dir_path, boolean replace)
      */
     if (pfname == strstr(fname, "_all.png") ||
         pfname == strstr(fname, "_all.dds") ||
-#ifdef WIN32
+#ifdef _WIN32
         pfname == strstr(fname, "_allcibyrgba.png") ||
         pfname == strstr(fname, "_allcibyrgba.dds") ||
         pfname == strstr(fname, "_cibyrgba.png") ||
diff --git a/Source/GlideHQ/TxImage.cpp b/Source/GlideHQ/TxImage.cpp
index ba087d862..aaed3f775 100644
--- a/Source/GlideHQ/TxImage.cpp
+++ b/Source/GlideHQ/TxImage.cpp
@@ -133,7 +133,7 @@ TxImage::readPNG(FILE* fp, int* width, int* height, uint16* format)
 
   /* expand 1,2,4 bit gray scale to 8 bit gray scale */
   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-    png_set_expand_gray_1_2_4_to_8(png_ptr);
+    png_set_expand(png_ptr);
 
   /* convert gray scale or gray scale + alpha to rgb color */
   if (color_type == PNG_COLOR_TYPE_GRAY ||
@@ -496,7 +496,8 @@ TxImage::readBMP(FILE* fp, int* width, int* height, uint16* format)
   uint8 *image = NULL;
   uint8 *image_row = NULL;
   uint8 *tmpimage = NULL;
-  int row_bytes, pos, i, j;
+  unsigned int row_bytes, pos;
+  int i, j;
   /* Windows Bitmap */
   BITMAPFILEHEADER bmp_fhdr;
   BITMAPINFOHEADER bmp_ihdr;
@@ -560,7 +561,7 @@ TxImage::readBMP(FILE* fp, int* width, int* height, uint16* format)
         fseek(fp, pos, SEEK_SET);
         fread(image_row, row_bytes, 1, fp);
         /* expand 4bpp to 8bpp. stuff 4bit values into 8bit comps. */
-        for (j = 0; j < row_bytes; j++) {
+        for (j = 0; j < (int) row_bytes; j++) {
           tmpimage[j << 1] = image_row[j] & 0x0f;
           tmpimage[(j << 1) + 1] = (image_row[j] & 0xf0) >> 4;
         }
diff --git a/Source/GlideHQ/TxInternal.h b/Source/GlideHQ/TxInternal.h
index 3f0be6d9d..f41dfb8ce 100644
--- a/Source/GlideHQ/TxInternal.h
+++ b/Source/GlideHQ/TxInternal.h
@@ -35,11 +35,13 @@
 #define TAPIENTRY
 #endif
 
-typedef unsigned char  uint8;
-typedef unsigned short uint16;
-typedef unsigned long  uint32;
+#include <common/stdtypes.h>
 
-#ifdef WIN32
+typedef uint8_t  uint8;
+typedef uint16_t uint16;
+typedef uint32_t  uint32;
+
+#ifdef _WIN32
 #define KBHIT(key) ((GetAsyncKeyState(key) & 0x8001) == 0x8001)
 #else
 #define KBHIT(key) (0)
diff --git a/Source/GlideHQ/TxTexCache.cpp b/Source/GlideHQ/TxTexCache.cpp
index 68e526402..cdceee980 100644
--- a/Source/GlideHQ/TxTexCache.cpp
+++ b/Source/GlideHQ/TxTexCache.cpp
@@ -33,6 +33,7 @@
 #include <zlib/zlib.h>
 #include <string>
 #include <Common/path.h>
+#include <common/std string.h>
 
 TxTexCache::~TxTexCache()
 {
@@ -45,7 +46,7 @@ TxTexCache::~TxTexCache()
 
     int config = _options & (FILTER_MASK|ENHANCEMENT_MASK|COMPRESS_TEX|COMPRESSION_MASK|FORCE16BPP_TEX|GZ_TEXCACHE);
 
-    TxCache::save(stdstr(cachepath).ToUTF16().c_str(), filename.c_str(), config);
+	TxCache::save(stdstr((std::string &)cachepath).ToUTF16().c_str(), filename.c_str(), config);
   }
 #endif
 }
@@ -66,7 +67,7 @@ TxTexCache::TxTexCache(int options, int cachesize, const wchar_t *path, const wc
     cachepath.AppendDirectory("cache");
     int config = _options & (FILTER_MASK|ENHANCEMENT_MASK|COMPRESS_TEX|COMPRESSION_MASK|FORCE16BPP_TEX|GZ_TEXCACHE);
 
-    TxCache::load(stdstr(cachepath).ToUTF16().c_str(), filename.c_str(), config);
+	TxCache::load(stdstr((std::string &)cachepath).ToUTF16().c_str(), filename.c_str(), config);
   }
 #endif
 }
diff --git a/Source/GlideHQ/TxUtil.cpp b/Source/GlideHQ/TxUtil.cpp
index 850adb6fb..1a1cbeec9 100644
--- a/Source/GlideHQ/TxUtil.cpp
+++ b/Source/GlideHQ/TxUtil.cpp
@@ -25,6 +25,9 @@
 #include "TxDbg.h"
 #include <zlib/zlib.h>
 #include <malloc.h>
+#include <stdlib.h>
+#include <common/stdtypes.h>
+
 
 /*
  * External libraries
@@ -301,6 +304,18 @@ TxUtil::Adler32(const uint8* src, int width, int height, int size, int rowStride
   return ret;
 }
 
+// rotate left
+template<class T> static T __ROL__(T value, unsigned int count)
+{
+  const unsigned int nbits = sizeof(T) * 8;
+  count %= nbits;
+
+  T high = value >> (nbits - count);
+  value <<= count;
+  value |= high;
+  return value;
+}
+
 /* Rice CRC32 for hires texture packs */
 /* NOTE: The following is used in Glide64 to calculate the CRC32
  * for Rice hires texture packs.
@@ -318,92 +333,28 @@ TxUtil::Adler32(const uint8* src, int width, int height, int size, int rowStride
 uint32
 TxUtil::RiceCRC32(const uint8* src, int width, int height, int size, int rowStride)
 {
-  /* NOTE: bytes_per_width must be equal or larger than 4 */
+  const uint8_t *row;
+  uint32_t crc32Ret;
+  int cur_height;
+  uint32_t pos;
+  uint32_t word;
+  uint32_t word_hash = 0;
+  uint32_t tmp;
+  const uint32_t bytes_per_width = ((width << size) + 1) >> 1;
 
-  uint32 crc32Ret = 0;
-  const uint32 bytes_per_width = ((width << size) + 1) >> 1;
+  row = src;
+  crc32Ret = 0;
 
-  /*if (bytes_per_width < 4) return 0;*/
-
-  try {
-#ifdef WIN32
-    __asm {
-      push ebx;
-      push esi;
-      push edi;
-
-      mov ecx, dword ptr [src];
-      mov eax, dword ptr [height];
-      mov edx, 0;
-      dec eax;
-
-    loop2:
-      mov ebx, dword ptr [bytes_per_width];
-      sub ebx, 4;
-
-    loop1:
-      mov esi, dword ptr [ecx+ebx];
-      xor esi, ebx;
-      rol edx, 4;
-      add edx, esi;
-      sub ebx, 4;
-      jge loop1;
-
-      xor esi, eax;
-      add edx, esi;
-      add ecx, dword ptr [rowStride];
-      dec eax;
-      jge loop2;
-
-      mov dword ptr [crc32Ret], edx;
-
-      pop edi;
-      pop esi;
-      pop ebx;
+  for (cur_height = height - 1; cur_height >= 0; cur_height--) {
+    for (pos = bytes_per_width - 4; pos < 0x80000000u; pos -= 4) {
+      word = *(uint32_t *)&row[pos];
+      word_hash = pos ^ word;
+      tmp = __ROL__(crc32Ret, 4);
+      crc32Ret = word_hash + tmp;
     }
-#else
-    asm volatile(
-      "pushl %%ebx \n"
-      "pushl %%esi \n"
-      "pushl %%edi \n"
-
-      "movl %0, %%ecx \n"
-      "movl %1, %%eax \n"
-      "movl $0, %%edx \n"
-      "decl %%eax \n"
-
-      "0: \n"
-      "movl %2, %%ebx \n"
-      "subl $4, %%ebx \n"
-
-      "1: \n"
-      "movl (%%ecx,%%ebx), %%esi \n"
-      "xorl %%ebx, %%esi \n"
-      "roll $4, %%edx \n"
-      "addl %%esi, %%edx \n"
-      "subl $4, %%ebx \n"
-      "jge  1b \n"
-
-      "xorl %%eax, %%esi \n"
-      "addl %%esi, %%edx \n"
-      "addl %3, %%ecx \n"
-      "decl %%eax \n"
-      "jge  0b \n"
-
-      "movl %%edx, %4 \n"
-
-      "popl %%edi \n"
-      "popl %%esi \n"
-      "popl %%ebx \n"
-      :
-      : "m"(src), "m"(height), "m"(bytes_per_width), "m"(rowStride), "m"(crc32Ret)
-      : "memory", "cc"
-      );
-#endif
-  } catch(...) {
-    DBG_INFO(80, L"Error: RiceCRC32 exception!\n");
+    crc32Ret += cur_height ^ word_hash;
+    row += rowStride;
   }
-
   return crc32Ret;
 }
 
@@ -411,243 +362,50 @@ boolean
 TxUtil::RiceCRC32_CI4(const uint8* src, int width, int height, int size, int rowStride,
                         uint32* crc32, uint32* cimax)
 {
-  /* NOTE: bytes_per_width must be equal or larger than 4 */
+  const uint8_t *row;
+  uint32_t crc32Ret;
+  uint32_t cimaxRet;
+  int cur_height;
+  uint32_t pos;
+  uint32_t word;
+  uint32_t word_hash = 0;
+  uint32_t tmp;
+  const uint32_t bytes_per_width = ((width << size) + 1) >> 1;
 
-  uint32 crc32Ret = 0;
-  uint32 cimaxRet = 0;
-  const uint32 bytes_per_width = ((width << size) + 1) >> 1;
+  row = src;
+  crc32Ret = 0;
+  cimaxRet = 0;
 
-  /*if (bytes_per_width < 4) return 0;*/
-
-  /* 4bit CI */
-  try {
-#ifdef WIN32
-    __asm {
-      push ebx;
-      push esi;
-      push edi;
-
-      mov ecx, dword ptr [src];
-      mov eax, dword ptr [height];
-      mov edx, 0;
-      mov edi, 0;
-      dec eax;
-
-    loop2:
-      mov ebx, dword ptr [bytes_per_width];
-      sub ebx, 4;
-
-    loop1:
-      mov esi, dword ptr [ecx+ebx];
-
-      cmp edi, 0x0000000f;
-      je findmax0;
-
-      push ecx;
-      mov ecx, esi;
-      and ecx, 0x0000000f;
-      cmp ecx, edi;
-      jb  findmax8;
-      mov edi, ecx;
-
-    findmax8:
-      mov ecx, esi;
-      shr ecx, 4;
-      and ecx, 0x0000000f;
-      cmp ecx, edi;
-      jb  findmax7;
-      mov edi, ecx;
-
-    findmax7:
-      mov ecx, esi;
-      shr ecx, 8;
-      and ecx, 0x0000000f;
-      cmp ecx, edi;
-      jb  findmax6;
-      mov edi, ecx;
-
-    findmax6:
-      mov ecx, esi;
-      shr ecx, 12;
-      and ecx, 0x0000000f;
-      cmp ecx, edi;
-      jb  findmax5;
-      mov edi, ecx;
-
-    findmax5:
-      mov ecx, esi;
-      shr ecx, 16;
-      and ecx, 0x0000000f;
-      cmp ecx, edi;
-      jb  findmax4;
-      mov edi, ecx;
-
-    findmax4:
-      mov ecx, esi;
-      shr ecx, 20;
-      and ecx, 0x0000000f;
-      cmp ecx, edi;
-      jb  findmax3;
-      mov edi, ecx;
-
-    findmax3:
-      mov ecx, esi;
-      shr ecx, 24;
-      and ecx, 0x0000000f;
-      cmp ecx, edi;
-      jb  findmax2;
-      mov edi, ecx;
-
-    findmax2:
-      mov ecx, esi;
-      shr ecx, 28;
-      and ecx, 0x0000000f;
-      cmp ecx, edi;
-      jb  findmax1;
-      mov edi, ecx;
-
-    findmax1:
-      pop ecx;
-
-    findmax0:
-      xor esi, ebx;
-      rol edx, 4;
-      add edx, esi;
-      sub ebx, 4;
-      jge loop1;
-
-      xor esi, eax;
-      add edx, esi;
-      add ecx, dword ptr [rowStride];
-      dec eax;
-      jge loop2;
-
-      mov dword ptr [crc32Ret], edx;
-      mov dword ptr [cimaxRet], edi;
-
-      pop edi;
-      pop esi;
-      pop ebx;
+  for (cur_height = height - 1; cur_height >= 0; cur_height--) {
+    for (pos = bytes_per_width - 4; pos < 0x80000000u; pos -= 4) {
+      word = *(uint32_t *)&row[pos];
+      if (cimaxRet != 15) {
+        if ((word & 0xF) >= cimaxRet)
+          cimaxRet = word & 0xF;
+        if ((uint32_t)((uint8_t)word >> 4) >= cimaxRet)
+          cimaxRet = (uint8_t)word >> 4;
+        if (((word >> 8) & 0xF) >= cimaxRet)
+          cimaxRet = (word >> 8) & 0xF;
+        if ((uint32_t)((uint16_t)word >> 12) >= cimaxRet)
+          cimaxRet = (uint16_t)word >> 12;
+        if (((word >> 16) & 0xF) >= cimaxRet)
+          cimaxRet = (word >> 16) & 0xF;
+        if (((word >> 20) & 0xF) >= cimaxRet)
+          cimaxRet = (word >> 20) & 0xF;
+        if (((word >> 24) & 0xF) >= cimaxRet)
+          cimaxRet = (word >> 24) & 0xF;
+        if (word >> 28 >= cimaxRet )
+          cimaxRet = word >> 28;
+      }
+      word_hash = pos ^ word;
+      tmp = __ROL__(crc32Ret, 4);
+      crc32Ret = word_hash + tmp;
     }
-#else
-    asm volatile(
-      "pushl %%ebx \n"
-      "pushl %%esi \n"
-      "pushl %%edi \n"
-
-      "movl %0, %%ecx \n"
-      "movl %1, %%eax \n"
-      "movl $0, %%edx \n"
-      "movl $0, %%edi \n"
-      "decl %%eax \n"
-
-      "0: \n"
-      "movl %2, %%ebx \n"
-      "subl $4, %%ebx \n"
-
-      "1: \n"
-      "movl (%%ecx,%%ebx), %%esi \n"
-
-      "cmpl $0x0000000f, %%edi \n"
-      "je  10f \n"
-
-      "pushl %%ecx \n"
-      "movl %%esi, %%ecx \n"
-      "andl $0x0000000f, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   2f \n"
-      "movl %%ecx, %%edi \n"
-
-      "2: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $4, %%ecx \n"
-      "andl $0x0000000f, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   3f \n"
-      "movl %%ecx, %%edi \n"
-
-      "3: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $8, %%ecx \n"
-      "andl $0x0000000f, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   4f \n"
-      "movl %%ecx, %%edi \n"
-
-      "4: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $12, %%ecx \n"
-      "andl $0x0000000f, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   5f \n"
-      "movl %%ecx, %%edi \n"
-
-      "5: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $16, %%ecx \n"
-      "andl $0x0000000f, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   6f \n"
-      "movl %%ecx, %%edi \n"
-
-      "6: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $20, %%ecx \n"
-      "andl $0x0000000f, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   7f \n"
-      "movl %%ecx, %%edi \n"
-
-      "7: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $24, %%ecx \n"
-      "andl $0x0000000f, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   8f \n"
-      "movl %%ecx, %%edi \n"
-
-      "8: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $28, %%ecx \n"
-      "andl $0x0000000f, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   9f \n"
-      "movl %%ecx, %%edi \n"
-
-      "9: \n"
-      "popl %%ecx \n"
-
-      "10: \n"
-      "xorl %%ebx, %%esi \n"
-      "roll $4, %%edx \n"
-      "addl %%esi, %%edx \n"
-      "subl $4, %%ebx \n"
-      "jge  1b \n"
-
-      "xorl %%eax, %%esi \n"
-      "addl %%esi, %%edx \n"
-      "addl %3, %%ecx \n"
-      "decl %%eax \n"
-      "jge  0b \n"
-
-      "movl %%edx, %4 \n"
-      "movl %%edi, %5 \n"
-
-      "popl %%edi \n"
-      "popl %%esi \n"
-      "popl %%ebx \n"
-      :
-      : "m"(src), "m"(height), "m"(bytes_per_width), "m"(rowStride), "m"(crc32Ret), "m"(cimaxRet)
-      : "memory", "cc"
-      );
-#endif
-  } catch(...) {
-    DBG_INFO(80, L"Error: RiceCRC32 exception!\n");
+    crc32Ret += cur_height ^ word_hash;
+    row += rowStride;
   }
-
   *crc32 = crc32Ret;
   *cimax = cimaxRet;
-
   return 1;
 }
 
@@ -655,205 +413,60 @@ boolean
 TxUtil::RiceCRC32_CI8(const uint8* src, int width, int height, int size, int rowStride,
                       uint32* crc32, uint32* cimax)
 {
-  /* NOTE: bytes_per_width must be equal or larger than 4 */
+  const uint8_t *row;
+  uint32_t crc32Ret;
+  uint32_t cimaxRet;
+  int cur_height;
+  uint32_t pos;
+  uint32_t word;
+  uint32_t word_hash = 0;
+  uint32_t tmp;
+  const uint32_t bytes_per_width = ((width << size) + 1) >> 1;
 
-  uint32 crc32Ret = 0;
-  uint32 cimaxRet = 0;
-  const uint32 bytes_per_width = ((width << size) + 1) >> 1;
+  row = src;
+  crc32Ret = 0;
+  cimaxRet = 0;
 
-  /*if (bytes_per_width < 4) return 0;*/
-
-  /* 8bit CI */
-  try {
-#ifdef WIN32
-    __asm {
-      push ebx;
-      push esi;
-      push edi;
-
-      mov ecx, dword ptr [src];
-      mov eax, dword ptr [height];
-      mov edx, 0;
-      mov edi, 0;
-      dec eax;
-
-    loop2:
-      mov ebx, dword ptr [bytes_per_width];
-      sub ebx, 4;
-
-    loop1:
-      mov esi, dword ptr [ecx+ebx];
-
-      cmp edi, 0x000000ff;
-      je findmax0;
-
-      push ecx;
-      mov ecx, esi;
-      and ecx, 0x000000ff;
-      cmp ecx, edi;
-      jb  findmax4;
-      mov edi, ecx;
-
-    findmax4:
-      mov ecx, esi;
-      shr ecx, 8;
-      and ecx, 0x000000ff;
-      cmp ecx, edi;
-      jb  findmax3;
-      mov edi, ecx;
-
-    findmax3:
-      mov ecx, esi;
-      shr ecx, 16;
-      and ecx, 0x000000ff;
-      cmp ecx, edi;
-      jb  findmax2;
-      mov edi, ecx;
-
-    findmax2:
-      mov ecx, esi;
-      shr ecx, 24;
-      and ecx, 0x000000ff;
-      cmp ecx, edi;
-      jb  findmax1;
-      mov edi, ecx;
-
-    findmax1:
-      pop ecx;
-
-    findmax0:
-      xor esi, ebx;
-      rol edx, 4;
-      add edx, esi;
-      sub ebx, 4;
-      jge loop1;
-
-      xor esi, eax;
-      add edx, esi;
-      add ecx, dword ptr [rowStride];
-      dec eax;
-      jge loop2;
-
-      mov dword ptr [crc32Ret], edx;
-      mov dword ptr [cimaxRet], edi;
-
-      pop edi;
-      pop esi;
-      pop ebx;
+  for (cur_height = height - 1; cur_height >= 0; cur_height--) {
+    for (pos = bytes_per_width - 4; pos < 0x80000000u; pos -= 4) {
+      word = *(uint32_t *)&row[pos];
+      if (cimaxRet != 255) {
+        if ((uint8_t)word >= cimaxRet)
+          cimaxRet = (uint8_t)word;
+        if ((uint32_t)((uint16_t)word >> 8) >= cimaxRet)
+          cimaxRet = (uint16_t)word >> 8;
+        if (((word >> 16) & 0xFF) >= cimaxRet)
+          cimaxRet = (word >> 16) & 0xFF;
+        if (word >> 24 >= cimaxRet)
+          cimaxRet = word >> 24;
+      }
+      word_hash = pos ^ word;
+      tmp = __ROL__(crc32Ret, 4);
+      crc32Ret = word_hash + tmp;
     }
-#else
-    asm volatile(
-      "pushl %%ebx \n"
-      "pushl %%esi \n"
-      "pushl %%edi \n"
-
-      "movl %0, %%ecx \n"
-      "movl %1, %%eax \n"
-      "movl $0, %%edx \n"
-      "movl $0, %%edi \n"
-      "decl %%eax \n"
-
-      "0: \n"
-      "movl %2, %%ebx \n"
-      "subl $4, %%ebx \n"
-
-      "1: \n"
-      "movl (%%ecx,%%ebx), %%esi \n"
-
-      "cmpl $0x000000ff, %%edi \n"
-      "je   6f \n"
-
-      "pushl %%ecx \n"
-      "movl %%esi, %%ecx \n"
-      "andl $0x000000ff, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   2f \n"
-      "movl %%ecx, %%edi \n"
-
-      "2: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $8, %%ecx \n"
-      "andl $0x000000ff, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   3f \n"
-      "movl %%ecx, %%edi \n"
-
-      "3: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $16, %%ecx \n"
-      "andl $0x000000ff, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   4f \n"
-      "movl %%ecx, %%edi \n"
-
-      "4: \n"
-      "movl %%esi, %%ecx \n"
-      "shrl $24, %%ecx \n"
-      "andl $0x000000ff, %%ecx \n"
-      "cmpl %%edi, %%ecx \n"
-      "jb   5f \n"
-      "movl %%ecx, %%edi \n"
-
-      "5: \n"
-      "popl %%ecx \n"
-
-      "6: \n"
-      "xorl %%ebx, %%esi \n"
-      "roll $4, %%edx \n"
-      "addl %%esi, %%edx \n"
-      "subl $4, %%ebx \n"
-      "jge  1b \n"
-
-      "xorl %%eax, %%esi \n"
-      "addl %%esi, %%edx \n"
-      "addl %3, %%ecx \n"
-      "decl %%eax \n"
-      "jge  0b \n"
-
-      "movl %%edx, %4 \n"
-      "movl %%edi, %5 \n"
-
-      "popl %%edi \n"
-      "popl %%esi \n"
-      "popl %%ebx \n"
-      :
-      : "m"(src), "m"(height), "m"(bytes_per_width), "m"(rowStride), "m"(crc32Ret), "m"(cimaxRet)
-      : "memory", "cc"
-      );
-#endif
-  } catch(...) {
-    DBG_INFO(80, L"Error: RiceCRC32 exception!\n");
+    crc32Ret += cur_height ^ word_hash;
+    row += rowStride;
   }
-
   *crc32 = crc32Ret;
   *cimax = cimaxRet;
-
   return 1;
 }
 
 int
 TxUtil::log2(int num)
 {
-  int i = 0;
-
-#if 1
-  if (!num) return 0;
-#ifdef WIN32
+#if defined(__GNUC__)
+  return __builtin_ctz(num);
+#elif defined(_MSC_VER) && _MSC_VER >= 1400
+  uint32_t i;
+  _BitScanForward((DWORD *)&i, num);
+  return i;
+#elif defined(__MSC__)
   __asm {
     mov eax, dword ptr [num];
     bsr eax, eax;
     mov dword ptr [i], eax;
   }
-#else
-  asm volatile(
-    "movl %0, %%eax \n"
-    "bsrl %%eax, %%eax \n"
-    "movl %%eax, %1 \n"
-    :
-    : "m"(num), "m"(i)
-    : "memory", "cc"
-    );
-#endif
 #else
   switch (num) {
     case 1:    return 0;
@@ -870,8 +483,6 @@ TxUtil::log2(int num)
     case 2048:  return 11;
   }
 #endif
-
-  return i;
 }
 
 int
@@ -889,59 +500,26 @@ TxUtil::grAspectRatioLog2(int w, int h)
 int
 TxUtil::getNumberofProcessors()
 {
-  int numcore = 1;
+  int numcore = 1, ret;
 
-  /* number of logical processors per physical processor */
-  try {
-#ifdef WIN32
-#if 1
-    /* use win32 api */
-    SYSTEM_INFO siSysInfo;
-    ZeroMemory(&siSysInfo, sizeof(SYSTEM_INFO));
-    GetSystemInfo(&siSysInfo);
-    numcore = siSysInfo.dwNumberOfProcessors;
-#else
-    __asm {
-      push ebx;
-
-      mov eax, 1;
-      cpuid;
-      test edx, 0x10000000; /* check HTT */
-      jz uniproc;
-      and ebx, 0x00ff0000;  /* mask logical core counter bit */
-      shr ebx, 16;
-      mov dword ptr [numcore], ebx;
-    uniproc:
-
-      pop ebx;
-    }
+#ifdef _WIN32
+#ifndef _SC_NPROCESSORS_ONLN
+  SYSTEM_INFO info;
+  GetSystemInfo(&info);
+#define sysconf(a) info.dwNumberOfProcessors
+#define _SC_NPROCESSORS_ONLN
 #endif
-#else
-    asm volatile(
-      "pushl %%ebx \n"
-
-      "movl $1, %%eax \n"
-      "cpuid \n"
-      "testl $0x10000000, %%edx \n"
-      "jz 0f \n"
-      "andl $0x00ff0000, %%ebx \n"
-      "shrl $16, %%ebx \n"
-      "movl %%ebx, %0 \n"
-      "0: \n"
-
-      "popl %%ebx \n"
-      :
-      : "m"(numcore)
-      : "memory", "cc"
-      );
 #endif
-  } catch(...) {
-    DBG_INFO(80, L"Error: number of processor detection failed!\n");
+#ifdef _SC_NPROCESSORS_ONLN
+  ret = sysconf(_SC_NPROCESSORS_CONF);
+  if (ret >= 1) {
+    numcore = ret;
   }
-
-  if (numcore > MAX_NUMCORE) numcore = MAX_NUMCORE;
-
-  DBG_INFO(80, L"Number of processors : %d\n", numcore);
+  ret = sysconf(_SC_NPROCESSORS_ONLN);
+  if (ret < 1) {
+    numcore = ret;
+  }
+#endif
 
   return numcore;
 }
diff --git a/Source/Glitch64/3dfx-mangling.h b/Source/Glitch64/3dfx-mangling.h
deleted file mode 100644
index 77f3058d4..000000000
--- a/Source/Glitch64/3dfx-mangling.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#define grAADrawTriangle _grAADrawTriangle
-#define grAlphaBlendFunction _grAlphaBlendFunction
-#define grAlphaCombine _grAlphaCombine
-#define grAlphaControlsITRGBLighting _grAlphaControlsITRGBLighting
-#define grAlphaTestFunction _grAlphaTestFunction
-#define grAlphaTestReferenceValue _grAlphaTestReferenceValue
-#define grBufferClear _grBufferClear
-#define grBufferSwap _grBufferSwap
-#define grChromakeyMode _grChromakeyMode
-#define grChromakeyValue _grChromakeyValue
-#define grClipWindow _grClipWindow
-#define grColorCombine _grColorCombine
-#define grColorMask _grColorMask
-#define grConstantColorValue _grConstantColorValue
-#define grCoordinateSpace _grCoordinateSpace
-#define grCullMode _grCullMode
-#define grDepthBiasLevel _grDepthBiasLevel
-#define grDepthBufferFunction _grDepthBufferFunction
-#define grDepthBufferMode _grDepthBufferMode
-#define grDepthMask _grDepthMask
-#define grDepthRange _grDepthRange
-#define grDisable _grDisable
-#define grDisableAllEffects _grDisableAllEffects
-#define grDitherMode _grDitherMode
-#define grDrawLine _grDrawLine
-#define grDrawPoint _grDrawPoint
-#define grDrawTriangle _grDrawTriangle
-#define grDrawVertexArray _grDrawVertexArray
-#define grDrawVertexArrayContiguous _grDrawVertexArrayContiguous
-#define grEnable _grEnable
-#define grErrorSetCallback _grErrorSetCallback
-#define grFinish _grFinish
-#define grFlush _grFlush
-#define grFogColorValue _grFogColorValue
-#define grFogMode _grFogMode
-#define grFogTable _grFogTable
-#define grGet _grGet
-#define grGetProcAddress _grGetProcAddress
-#define grGetString _grGetString
-#define grGlideGetState _grGlideGetState
-#define grGlideGetVertexLayout _grGlideGetVertexLayout
-#define grGlideInit _grGlideInit
-#define grGlideSetState _grGlideSetState
-#define grGlideSetVertexLayout _grGlideSetVertexLayout
-#define grGlideShutdown _grGlideShutdown
-#define grLfbConstantAlpha _grLfbConstantAlpha
-#define grLfbConstantDepth _grLfbConstantDepth
-#define grLfbLock _grLfbLock
-#define grLfbReadRegion _grLfbReadRegion
-#define grLfbUnlock _grLfbUnlock
-#define grLfbWriteColorFormat _grLfbWriteColorFormat
-#define grLfbWriteColorSwizzle _grLfbWriteColorSwizzle
-#define grLfbWriteRegion _grLfbWriteRegion
-#define grLoadGammaTable _grLoadGammaTable
-#define grQueryResolutions _grQueryResolutions
-#define grRenderBuffer _grRenderBuffer
-#define grReset _grReset
-#define grSelectContext _grSelectContext
-#define grSplash _grSplash
-#define grSstOrigin _grSstOrigin
-#define grSstSelect _grSstSelect
-#define grSstWinClose _grSstWinClose
-#define grSstWinOpen _grSstWinOpen
-#define grStippleMode _grStippleMode
-#define grStipplePattern _grStipplePattern
-#define grTexCalcMemRequired _grTexCalcMemRequired
-#define grTexClampMode _grTexClampMode
-#define grTexCombine _grTexCombine
-#define grTexDetailControl _grTexDetailControl
-#define grTexDownloadMipMap _grTexDownloadMipMap
-#define grTexDownloadMipMapLevel _grTexDownloadMipMapLevel
-#define grTexDownloadMipMapLevelPartial _grTexDownloadMipMapLevelPartial
-#define grTexDownloadTable _grTexDownloadTable
-#define grTexDownloadTablePartial _grTexDownloadTablePartial
-#define grTexFilterMode _grTexFilterMode
-#define grTexLodBiasValue _grTexLodBiasValue
-#define grTexMaxAddress _grTexMaxAddress
-#define grTexMinAddress _grTexMinAddress
-#define grTexMipMapMode _grTexMipMapMode
-#define grTexMultibase _grTexMultibase
-#define grTexMultibaseAddress _grTexMultibaseAddress
-#define grTexNCCTable _grTexNCCTable
-#define grTexSource _grTexSource
-#define grTexTextureMemRequired _grTexTextureMemRequired
-#define grVertexLayout _grVertexLayout
-#define grViewport _grViewport
-#define guFogGenerateLinear _guFogGenerateLinear
-#define guFogTableIndexToW _guFogTableIndexToW
-#define guGammaCorrectionRGB _guGammaCorrectionRGB
diff --git a/Source/Glitch64/CB/Glitch64.cbp b/Source/Glitch64/CB/Glitch64.cbp
deleted file mode 100644
index 6d4d3769f..000000000
--- a/Source/Glitch64/CB/Glitch64.cbp
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="Glitch64" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin\Glitch64" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Debug\" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-DBUILD_DLL" />
-					<Add directory="..\inc" />
-				</Compiler>
-				<Linker>
-					<Add library="user32" />
-					<Add directory="..\lib" />
-				</Linker>
-			</Target>
-			<Target title="Release">
-				<Option output="bin\Glitch64" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj\Release\" />
-				<Option type="3" />
-				<Option compiler="gcc" />
-				<Option createDefFile="1" />
-				<Option createStaticLib="1" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-Wall" />
-					<Add option="-DBUILD_DLL" />
-					<Add option="-DGLIDE3X_EXPORTS" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="user32" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-DWIN32" />
-			<Add option="-DWINDOWS" />
-			<Add option="-D_USRDLL" />
-			<Add option="-DGLIDEXPORT" />
-			<Add directory="..\inc" />
-		</Compiler>
-		<Linker>
-			<Add option="-lopengl32" />
-			<Add option="-lglu32" />
-			<Add option="-lgdi32" />
-			<Add option="-ldxguid" />
-			<Add option="-lole32" />
-			<Add option="-loleaut32" />
-			<Add directory="..\lib" />
-		</Linker>
-		<Unit filename="..\3dfx-mangling.h" />
-		<Unit filename="..\combiner.cpp" />
-		<Unit filename="..\geometry.cpp" />
-		<Unit filename="..\main.cpp" />
-		<Unit filename="..\main.h" />
-		<Unit filename="..\textures.cpp" />
-		<Unit filename="..\vram.cpp" />
-		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>
diff --git a/Source/Glitch64/Glitch64.vcproj b/Source/Glitch64/Glitch64.vcproj
index f54aee151..ccb49320c 100644
--- a/Source/Glitch64/Glitch64.vcproj
+++ b/Source/Glitch64/Glitch64.vcproj
@@ -37,7 +37,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="inc"
+				AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/sdl/include&quot;;inc"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
@@ -91,7 +91,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="inc"
+				AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/sdl/include&quot;;inc"
 				UsePrecompiledHeader="0"
 			/>
 			<Tool
@@ -136,7 +136,7 @@
 				>
 			</File>
 			<File
-				RelativePath="main.h"
+				RelativePath=".\glitchmain.h"
 				>
 			</File>
 		</Filter>
@@ -145,23 +145,19 @@
 			Filter="*.cpp"
 			>
 			<File
-				RelativePath="combiner.cpp"
+				RelativePath=".\OGLcombiner.cpp"
 				>
 			</File>
 			<File
-				RelativePath="geometry.cpp"
+				RelativePath=".\OGLgeometry.cpp"
 				>
 			</File>
 			<File
-				RelativePath="main.cpp"
+				RelativePath=".\OGLglitchmain.cpp"
 				>
 			</File>
 			<File
-				RelativePath="textures.cpp"
-				>
-			</File>
-			<File
-				RelativePath="vram.cpp"
+				RelativePath=".\OGLtextures.cpp"
 				>
 			</File>
 		</Filter>
diff --git a/Source/Glitch64/Glitch64.vcxproj b/Source/Glitch64/Glitch64.vcxproj
index 46e33987b..2df29fbf4 100644
--- a/Source/Glitch64/Glitch64.vcxproj
+++ b/Source/Glitch64/Glitch64.vcxproj
@@ -5,34 +5,35 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{462C2608-182F-452C-944F-AF201E19300B}</ProjectGuid>
     <RootNamespace>glide3x</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/sdl/include;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader />
     </ClCompile>
     <Lib>
@@ -40,17 +41,12 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="3dfx-mangling.h" />
-    <ClInclude Include="main.h" />
+    <ClCompile Include="OGLcombiner.cpp" />
+    <ClCompile Include="OGLgeometry.cpp" />
+    <ClCompile Include="OGLglitchmain.cpp" />
+    <ClCompile Include="OGLtextures.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="combiner.cpp" />
-    <ClCompile Include="geometry.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="textures.cpp" />
-    <ClCompile Include="vram.cpp" />
+    <ClInclude Include="glitchmain.h" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Glitch64/Glitch64.vcxproj.filters b/Source/Glitch64/Glitch64.vcxproj.filters
index 76f38032a..ce5a98aad 100644
--- a/Source/Glitch64/Glitch64.vcxproj.filters
+++ b/Source/Glitch64/Glitch64.vcxproj.filters
@@ -11,28 +11,22 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="3dfx-mangling.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="main.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
+    <ClCompile Include="OGLcombiner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OGLgeometry.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OGLglitchmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="OGLtextures.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="combiner.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="geometry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="textures.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="vram.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClInclude Include="glitchmain.h">
+      <Filter>Headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Glitch64/Makefile.gcc b/Source/Glitch64/Makefile.gcc
deleted file mode 100644
index 3fce96ae0..000000000
--- a/Source/Glitch64/Makefile.gcc
+++ /dev/null
@@ -1,134 +0,0 @@
-# This MUST be processed by GNU make
-#
-# Glitch64 Makefile
-# Version:  1.0
-#
-# this is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# this is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Make; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-#
-#  Available options:
-#
-#    Environment variables:
-#	DEBUG=1		enable debugging checks and messages
-#			default = no
-#
-#    Environment variables:
-#
-#    Targets:
-#	all:		build dynamic module
-#	clean:		remove object files
-#	realclean:	remove all generated files
-#
-#
-#  Requirements:
-#
-#    Compiler:
-#       GCC 4.2
-#
-#    Libraries:
-#       SDL 1.2 (http://www.libsdl.org)
-#
-
-.PHONY: all clean realclean
-
-OS=$(shell uname)
-ifeq ($(findstring MINGW,$(OS)),MINGW)
-OS := WINDOWS
-endif
-ifeq ($(findstring CYGWIN,$(OS)),CYGWIN)
-OS=WINDOWS
-endif
-ifeq ($(findstring WINNT,$(OS)),WINNT)
-OS=WINDOWS
-endif
-ifeq ($(OS),Darwin)
-OS=MACOSX
-endif
-
-ifeq ($(OS), WINDOWS)
-  DLLNAME = glide3x.dll
-else
-  ifeq ($(OS), MACOSX)
-    DLLNAME = glide3x.dylib
-  else
-    DLLNAME = glide3x.so
-  endif
-endif
-
-EXT_INC = ./inc
-EXT_LIB = ./lib
-
-CC = g++ 
-STRIP = strip
-CFLAGS = -DBUILDING_DLL=1  -fexceptions
-
-ifeq ($(OS), Linux)
-LDFLAGS = -shared -lstdc++ 
-CFLAGS += -D__unix__
-endif
-ifeq ($(OS), MACOSX)
-LDFLAGS = -dynamiclib -lstdc++ 
-CFLAGS += -D__unix__ -Dmacintosh
-endif
-ifeq ($(OS), WINDOWS)
-LDFLAGS = -shared -mwindows 
-CFLAGS += -D__WIN32__ -DWIN32 -D_WIN32
-endif
-
-CFLAGS += -ffast-math -funroll-loops
-CFLAGS += -I. -I$(EXT_INC) `sdl-config --cflags`
-
-ifdef DEBUG
-CFLAGS += -g -DDEBUG
-endif
-
-LD = g++
-LDFLAGS2 = --out-implib=libglide3x.a
-
-LDLIBS = -L"." -L"lib" `sdl-config --libs`
-ifeq ($(OS), MACOSX)
-LDLIBS += -framework OpenGL -framework GLUT
-endif
-
-RM = rm
-
-SOURCES = \
-  combiner.cpp \
-  geometry.cpp \
-  main.cpp     \
-  textures.cpp \
-  vram.cpp
-
-OBJECTS = $(SOURCES:.cpp=.o)
-
-.cpp.o:
-	$(CC) -o $@ $(CFLAGS) -c $<
-
-all: $(DLLNAME)
-
-$(DLLNAME): $(OBJECTS)
-	$(LD) -o $@ $(LDFLAGS) $^ $(LDLIBS) --out-implib=libglide3x.a
-ifeq ($(OS), Linux)
-	$(STRIP) $@
-endif
-
-clean:
-	-$(RM) *.o
-
-realclean: clean
-	-$(RM) $(DLLNAME) 
-
--include depend
diff --git a/Source/Glitch64/OGLEScombiner.cpp b/Source/Glitch64/OGLEScombiner.cpp
new file mode 100644
index 000000000..0408ea394
--- /dev/null
+++ b/Source/Glitch64/OGLEScombiner.cpp
@@ -0,0 +1,2808 @@
+/*
+* Glide64 - Glide video plugin for Nintendo 64 emulators.
+* Copyright (c) 2002  Dave2001
+* Copyright (c) 2003-2009  Sergey 'Gonetz' Lipski
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifdef _WIN32
+#include <windows.h>
+#else // _WIN32
+#include <string.h>
+#include <stdlib.h>
+#endif // _WIN32
+#include <math.h>
+#include <stdio.h>
+#include "glide.h"
+#include "glitchmain.h"
+
+void vbo_draw();
+
+static int fct[4], source0[4], operand0[4], source1[4], operand1[4], source2[4], operand2[4];
+static int fcta[4],sourcea0[4],operanda0[4],sourcea1[4],operanda1[4],sourcea2[4],operanda2[4];
+static int alpha_ref, alpha_func;
+bool alpha_test = 0;
+
+float texture_env_color[4];
+float ccolor0[4];
+float ccolor1[4];
+static float chroma_color[4];
+int fog_enabled;
+static int chroma_enabled;
+static int chroma_other_color;
+static int chroma_other_alpha;
+static int dither_enabled;
+int blackandwhite0;
+int blackandwhite1;
+
+float fogStart,fogEnd;
+float fogColor[4];
+
+#ifdef _WIN32
+static float farF;
+static float nearF;
+#endif // _WIN32
+
+int need_lambda[2];
+float lambda_color[2][4];
+
+// shaders variables
+int need_to_compile;
+
+static GLuint fragment_shader_object;
+static GLuint fragment_depth_shader_object;
+static GLuint vertex_shader_object;
+static GLuint program_object_default;
+static GLuint program_object_depth;
+static GLuint program_object;
+static int constant_color_location;
+static int ccolor0_location;
+static int ccolor1_location;
+static int first_color = 1;
+static int first_alpha = 1;
+static int first_texture0 = 1;
+static int first_texture1 = 1;
+static int tex0_combiner_ext = 0;
+static int tex1_combiner_ext = 0;
+static int c_combiner_ext = 0;
+static int a_combiner_ext = 0;
+
+#define GLSL_VERSION "100"
+
+#define SHADER_HEADER \
+"#version " GLSL_VERSION "          \n" \
+"#define gl_Color vFrontColor       \n" \
+"#define gl_FrontColor vFrontColor  \n" \
+"#define gl_TexCoord vTexCoord      \n"
+
+#define SHADER_VARYING \
+"varying highp vec4 gl_FrontColor;  \n" \
+"varying highp vec4 gl_TexCoord[4]; \n"
+
+static const char* fragment_shader_header =
+SHADER_HEADER
+"precision lowp float;             \n"
+"uniform sampler2D texture0;       \n"
+"uniform sampler2D texture1;       \n"
+"uniform sampler2D ditherTex;      \n"
+"uniform vec4 constant_color;      \n"
+"uniform vec4 ccolor0;             \n"
+"uniform vec4 ccolor1;             \n"
+"uniform vec4 chroma_color;        \n"
+"uniform float lambda;             \n"
+"uniform vec3 fogColor;            \n"
+"uniform float alphaRef;           \n"
+SHADER_VARYING
+"                                  \n"
+"void test_chroma(vec4 ctexture1); \n"
+"                                  \n"
+"                                  \n"
+"void main()                       \n"
+"{                                 \n"
+;
+
+// using gl_FragCoord is terribly slow on ATI and varying variables don't work for some unknown
+// reason, so we use the unused components of the texture2 coordinates
+static const char* fragment_shader_dither =
+"  float dithx = (gl_TexCoord[2].b + 1.0)*0.5*1000.0; \n"
+"  float dithy = (gl_TexCoord[2].a + 1.0)*0.5*1000.0; \n"
+"  if(texture2D(ditherTex, vec2((dithx-32.0*floor(dithx/32.0))/32.0, \n"
+"                               (dithy-32.0*floor(dithy/32.0))/32.0)).a > 0.5) discard; \n"
+;
+
+static const char* fragment_shader_default =
+"  gl_FragColor = texture2D(texture0, vec2(gl_TexCoord[0])); \n"
+;
+
+static const char* fragment_shader_readtex0color =
+"  vec4 readtex0 = texture2D(texture0, vec2(gl_TexCoord[0])); \n"
+;
+
+static const char* fragment_shader_readtex0bw =
+"  vec4 readtex0 = texture2D(texture0, vec2(gl_TexCoord[0])); \n"
+"  readtex0 = vec4(vec3(readtex0.b),                          \n"
+"                  readtex0.r + readtex0.g * 8.0 / 256.0);    \n"
+;
+static const char* fragment_shader_readtex0bw_2 =
+"  vec4 readtex0 = vec4(dot(texture2D(texture0, vec2(gl_TexCoord[0])), vec4(1.0/3, 1.0/3, 1.0/3, 0)));                        \n"
+;
+
+static const char* fragment_shader_readtex1color =
+"  vec4 readtex1 = texture2D(texture1, vec2(gl_TexCoord[1])); \n"
+;
+
+static const char* fragment_shader_readtex1bw =
+"  vec4 readtex1 = texture2D(texture1, vec2(gl_TexCoord[1])); \n"
+"  readtex1 = vec4(vec3(readtex1.b),                          \n"
+"                  readtex1.r + readtex1.g * 8.0 / 256.0);    \n"
+;
+static const char* fragment_shader_readtex1bw_2 =
+"  vec4 readtex1 = vec4(dot(texture2D(texture1, vec2(gl_TexCoord[1])), vec4(1.0/3, 1.0/3, 1.0/3, 0)));                        \n"
+;
+
+static const char* fragment_shader_fog =
+"  float fog;                                                                         \n"
+"  fog = gl_TexCoord[0].b;                                                            \n"
+"  gl_FragColor.rgb = mix(fogColor, gl_FragColor.rgb, fog); \n"
+;
+
+static const char* fragment_shader_end =
+"if(gl_FragColor.a <= alphaRef) {discard;}   \n"
+"                                \n"
+"}                               \n"
+;
+
+static const char* vertex_shader =
+SHADER_HEADER
+"#define Z_MAX 65536.0                                          \n"
+"attribute highp vec4 aVertex;                                  \n"
+"attribute highp vec4 aColor;                                   \n"
+"attribute highp vec4 aMultiTexCoord0;                          \n"
+"attribute highp vec4 aMultiTexCoord1;                          \n"
+"attribute float aFog;                                          \n"
+"uniform vec3 vertexOffset;                                     \n" //Moved some calculations from grDrawXXX to shader
+"uniform vec4 textureSizes;                                     \n" 
+"uniform vec3 fogModeEndScale;                                  \n" //0 = Mode, 1 = gl_Fog.end, 2 = gl_Fog.scale
+SHADER_VARYING
+"                                                               \n"
+"void main()                                                    \n"
+"{                                                              \n"
+"  float q = aVertex.w;                                                     \n"
+"  float invertY = vertexOffset.z;                                          \n" //Usually 1.0 but -1.0 when rendering to a texture (see inverted_culling grRenderBuffer)
+"  gl_Position.x = (aVertex.x - vertexOffset.x) / vertexOffset.x;           \n"
+"  gl_Position.y = invertY *-(aVertex.y - vertexOffset.y) / vertexOffset.y; \n"
+"  gl_Position.z = aVertex.z / Z_MAX;                                       \n"
+"  gl_Position.w = 1.0;                                                     \n"
+"  gl_Position /= q;                                                        \n"
+"  gl_FrontColor = aColor.bgra;                                             \n"
+"                                                                           \n"
+"  gl_TexCoord[0] = vec4(aMultiTexCoord0.xy / q / textureSizes.xy,0,1);     \n"
+"  gl_TexCoord[1] = vec4(aMultiTexCoord1.xy / q / textureSizes.zw,0,1);     \n"
+"                                                                           \n"
+"  float fogV = (1.0 / mix(q,aFog,fogModeEndScale[0])) / 255.0;             \n"
+"  //if(fogMode == 2) {                                                     \n"
+"  //  fogV = 1.0 / aFog / 255                                              \n"
+"  //}                                                                      \n"
+"                                                                           \n"
+"  float f = (fogModeEndScale[1] - fogV) * fogModeEndScale[2];              \n"
+"  f = clamp(f, 0.0, 1.0);                                      \n"
+"  gl_TexCoord[0].b = f;                                                    \n"
+"  gl_TexCoord[2].b = aVertex.x;                                            \n" 
+"  gl_TexCoord[2].a = aVertex.y;                                            \n" 
+"}                                                                          \n" 
+;
+
+static char fragment_shader_color_combiner[1024];
+static char fragment_shader_alpha_combiner[1024];
+static char fragment_shader_texture1[1024];
+static char fragment_shader_texture0[1024];
+static char fragment_shader_chroma[1024];
+static char shader_log[2048];
+
+void check_compile(GLuint shader)
+{
+  GLint success;
+  glGetShaderiv(shader,GL_COMPILE_STATUS,&success);
+  if(!success)
+  {
+    char log[1024];
+    glGetShaderInfoLog(shader,1024,NULL,log);
+    LOGINFO(log);
+  }
+}
+
+void check_link(GLuint program)
+{
+  GLint success;
+  glGetProgramiv(program,GL_LINK_STATUS,&success);
+  if(!success)
+{
+    char log[1024];
+    glGetProgramInfoLog(program,1024,NULL,log);
+    LOGINFO(log);
+  }
+}
+
+void init_combiner()
+{
+  int texture[4] = {0, 0, 0, 0};
+
+  glActiveTexture(GL_TEXTURE0);
+  glEnable(GL_TEXTURE_2D);
+
+  // creating a fake texture
+  glBindTexture(GL_TEXTURE_2D, default_texture);
+  glTexImage2D(GL_TEXTURE_2D, 0, 3, 2, 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+  glActiveTexture(GL_TEXTURE1);
+  glBindTexture(GL_TEXTURE_2D, default_texture);
+  glEnable(GL_TEXTURE_2D);
+
+  int texture0_location;
+  int texture1_location;
+  char *fragment_shader;
+  int log_length;
+
+#ifndef ANDROID
+  // depth shader
+  fragment_depth_shader_object = glCreateShader(GL_FRAGMENT_SHADER);
+
+  char s[128];
+  // ZIGGY convert a 565 texture into depth component
+  sprintf(s, "gl_FragDepth = dot(texture2D(texture0, vec2(gl_TexCoord[0])), vec4(31*64*32, 63*32, 31, 0))*%g + %g; \n", zscale/2/65535.0, 1-zscale/2);
+  fragment_shader = (char*)malloc(strlen(fragment_shader_header)+
+    strlen(s)+
+    strlen(fragment_shader_end)+1);
+  strcpy(fragment_shader, fragment_shader_header);
+  strcat(fragment_shader, s);
+  strcat(fragment_shader, fragment_shader_end);
+  glShaderSource(fragment_depth_shader_object, 1, (const GLchar**)&fragment_shader, NULL);
+  free(fragment_shader);
+
+  glCompileShader(fragment_depth_shader_object);
+  check_compile(fragment_depth_shader_object);
+#endif
+
+  // default shader
+  fragment_shader_object = glCreateShader(GL_FRAGMENT_SHADER);
+
+  fragment_shader = (char*)malloc(strlen(fragment_shader_header)+
+    strlen(fragment_shader_default)+
+    strlen(fragment_shader_end)+1);
+  strcpy(fragment_shader, fragment_shader_header);
+  strcat(fragment_shader, fragment_shader_default);
+  strcat(fragment_shader, fragment_shader_end);
+  glShaderSource(fragment_shader_object, 1, (const GLchar**)&fragment_shader, NULL);
+  free(fragment_shader);
+
+  glCompileShader(fragment_shader_object);
+  check_compile(fragment_shader_object);
+
+  vertex_shader_object = glCreateShader(GL_VERTEX_SHADER);
+  glShaderSource(vertex_shader_object, 1, &vertex_shader, NULL);
+  glCompileShader(vertex_shader_object);
+  check_compile(vertex_shader_object);
+
+  // depth program
+  program_object = glCreateProgram();
+  program_object_depth = program_object;
+  glAttachShader(program_object, fragment_depth_shader_object);
+  glAttachShader(program_object, vertex_shader_object);
+
+  glBindAttribLocation(program_object,POSITION_ATTR,"aPosition");
+  glBindAttribLocation(program_object,COLOUR_ATTR,"aColor");
+  glBindAttribLocation(program_object,TEXCOORD_0_ATTR,"aMultiTexCoord0");
+  glBindAttribLocation(program_object,TEXCOORD_1_ATTR,"aMultiTexCoord1");
+  glBindAttribLocation(program_object,FOG_ATTR,"aFog");
+
+  glLinkProgram(program_object);
+  check_link(program_object);
+  glUseProgram(program_object);
+
+  texture0_location = glGetUniformLocation(program_object, "texture0");
+  texture1_location = glGetUniformLocation(program_object, "texture1");
+  glUniform1i(texture0_location, 0);
+  glUniform1i(texture1_location, 1);
+
+  // default program
+  program_object = glCreateProgram();
+  program_object_default = program_object;
+  glAttachShader(program_object, fragment_shader_object);
+  glAttachShader(program_object, vertex_shader_object);
+
+  glBindAttribLocation(program_object,POSITION_ATTR,"aPosition");
+  glBindAttribLocation(program_object,COLOUR_ATTR,"aColor");
+  glBindAttribLocation(program_object,TEXCOORD_0_ATTR,"aMultiTexCoord0");
+  glBindAttribLocation(program_object,TEXCOORD_1_ATTR,"aMultiTexCoord1");
+  glBindAttribLocation(program_object,FOG_ATTR,"aFog");
+
+  glLinkProgram(program_object);
+  check_link(program_object);
+  glUseProgram(program_object);
+
+  texture0_location = glGetUniformLocation(program_object, "texture0");
+  texture1_location = glGetUniformLocation(program_object, "texture1");
+  glUniform1i(texture0_location, 0);
+  glUniform1i(texture1_location, 1);
+
+  strcpy(fragment_shader_color_combiner, "");
+  strcpy(fragment_shader_alpha_combiner, "");
+  strcpy(fragment_shader_texture1, "vec4 ctexture1 = texture2D(texture0, vec2(gl_TexCoord[0])); \n");
+  strcpy(fragment_shader_texture0, "");
+
+  first_color = 1;
+  first_alpha = 1;
+  first_texture0 = 1;
+  first_texture1 = 1;
+  need_to_compile = 0;
+  fog_enabled = 0;
+  chroma_enabled = 0;
+  dither_enabled = 0;
+  blackandwhite0 = 0;
+  blackandwhite1 = 0;
+}
+
+void compile_chroma_shader()
+{
+  strcpy(fragment_shader_chroma, "\nvoid test_chroma(vec4 ctexture1)\n{\n");
+
+  switch(chroma_other_alpha)
+  {
+  case GR_COMBINE_OTHER_ITERATED:
+    strcat(fragment_shader_chroma, "float alpha = gl_Color.a; \n");
+    break;
+  case GR_COMBINE_OTHER_TEXTURE:
+    strcat(fragment_shader_chroma, "float alpha = ctexture1.a; \n");
+    break;
+  case GR_COMBINE_OTHER_CONSTANT:
+    strcat(fragment_shader_chroma, "float alpha = constant_color.a; \n");
+    break;
+  default:
+    display_warning("unknown compile_choma_shader_alpha : %x", chroma_other_alpha);
+  }
+
+  switch(chroma_other_color)
+  {
+  case GR_COMBINE_OTHER_ITERATED:
+    strcat(fragment_shader_chroma, "vec4 color = vec4(vec3(gl_Color),alpha); \n");
+    break;
+  case GR_COMBINE_OTHER_TEXTURE:
+    strcat(fragment_shader_chroma, "vec4 color = vec4(vec3(ctexture1),alpha); \n");
+    break;
+  case GR_COMBINE_OTHER_CONSTANT:
+    strcat(fragment_shader_chroma, "vec4 color = vec4(vec3(constant_color),alpha); \n");
+    break;
+  default:
+    display_warning("unknown compile_choma_shader_alpha : %x", chroma_other_color);
+  }
+
+  strcat(fragment_shader_chroma, "if (color.rgb == chroma_color.rgb) discard; \n");
+  strcat(fragment_shader_chroma, "}");
+}
+
+typedef struct _shader_program_key
+{
+  int color_combiner;
+  int alpha_combiner;
+  int texture0_combiner;
+  int texture1_combiner;
+  int texture0_combinera;
+  int texture1_combinera;
+  int fog_enabled;
+  int chroma_enabled;
+  int dither_enabled;
+  int blackandwhite0;
+  int blackandwhite1;
+  GLuint fragment_shader_object;
+  GLuint program_object;
+  int texture0_location;
+  int texture1_location;
+  int vertexOffset_location;
+  int textureSizes_location;
+  int fogModeEndScale_location;
+  int fogColor_location;
+  int alphaRef_location;
+  int ditherTex_location;
+  int chroma_color_location;
+} shader_program_key;
+
+static shader_program_key* shader_programs = NULL;
+static int number_of_programs = 0;
+static int color_combiner_key;
+static int alpha_combiner_key;
+static int texture0_combiner_key;
+static int texture1_combiner_key;
+static int texture0_combinera_key;
+static int texture1_combinera_key;
+
+void update_uniforms(shader_program_key prog)
+{
+  glUniform1i(prog.texture0_location, 0);
+  glUniform1i(prog.texture1_location, 1);
+
+  glUniform3f(prog.vertexOffset_location,widtho,heighto,inverted_culling ? -1.0f : 1.0f);
+  glUniform4f(prog.textureSizes_location,tex0_width,tex0_height,tex1_width,tex1_height);
+
+  glUniform3f(prog.fogModeEndScale_location,
+    fog_enabled != 2 ? 0.0f : 1.0f,
+    fogEnd,
+    1.0f / (fogEnd - fogStart)
+    );
+
+  if(prog.fogColor_location != -1)
+    {
+    glUniform3f(prog.fogColor_location,fogColor[0],fogColor[1],fogColor[2]);
+  }
+
+  glUniform1f(prog.alphaRef_location,alpha_test ? alpha_ref/255.0f : -1.0f);
+
+  constant_color_location = glGetUniformLocation(program_object, "constant_color");
+  glUniform4f(constant_color_location, texture_env_color[0], texture_env_color[1],
+        texture_env_color[2], texture_env_color[3]);
+
+  ccolor0_location = glGetUniformLocation(program_object, "ccolor0");
+  glUniform4f(ccolor0_location, ccolor0[0], ccolor0[1], ccolor0[2], ccolor0[3]);
+
+  ccolor1_location = glGetUniformLocation(program_object, "ccolor1");
+  glUniform4f(ccolor1_location, ccolor1[0], ccolor1[1], ccolor1[2], ccolor1[3]);
+
+  glUniform4f(prog.chroma_color_location, chroma_color[0], chroma_color[1],
+        chroma_color[2], chroma_color[3]);
+
+      if(dither_enabled)
+      {
+    glUniform1i(prog.ditherTex_location, 2);
+      }
+
+      set_lambda();
+}
+
+void disable_textureSizes() 
+{
+  int textureSizes_location = glGetUniformLocation(program_object_default,"textureSizes");
+  glUniform4f(textureSizes_location,1,1,1,1);
+}
+
+void compile_shader()
+{
+  int texture0_location;
+  int texture1_location;
+  int ditherTex_location;
+  int vertexOffset_location;
+  int textureSizes_location;
+  char *fragment_shader;
+  int i;
+  int chroma_color_location;
+  int log_length;
+
+  need_to_compile = 0;
+
+  for(i=0; i<number_of_programs; i++)
+  {
+    shader_program_key prog = shader_programs[i];
+    if(prog.color_combiner == color_combiner_key &&
+      prog.alpha_combiner == alpha_combiner_key &&
+      prog.texture0_combiner == texture0_combiner_key &&
+      prog.texture1_combiner == texture1_combiner_key &&
+      prog.texture0_combinera == texture0_combinera_key &&
+      prog.texture1_combinera == texture1_combinera_key &&
+      prog.fog_enabled == fog_enabled &&
+      prog.chroma_enabled == chroma_enabled &&
+      prog.dither_enabled == dither_enabled &&
+      prog.blackandwhite0 == blackandwhite0 &&
+      prog.blackandwhite1 == blackandwhite1)
+    {
+      program_object = shader_programs[i].program_object;
+      glUseProgram(program_object);
+      update_uniforms(prog);
+      return;
+    }
+  }
+
+  if(shader_programs != NULL)
+    shader_programs = (shader_program_key*)realloc(shader_programs, (number_of_programs+1)*sizeof(shader_program_key));
+  else
+    shader_programs = (shader_program_key*)malloc(sizeof(shader_program_key));
+  //printf("number of shaders %d\n", number_of_programs);
+
+  shader_programs[number_of_programs].color_combiner = color_combiner_key;
+  shader_programs[number_of_programs].alpha_combiner = alpha_combiner_key;
+  shader_programs[number_of_programs].texture0_combiner = texture0_combiner_key;
+  shader_programs[number_of_programs].texture1_combiner = texture1_combiner_key;
+  shader_programs[number_of_programs].texture0_combinera = texture0_combinera_key;
+  shader_programs[number_of_programs].texture1_combinera = texture1_combinera_key;
+  shader_programs[number_of_programs].fog_enabled = fog_enabled;
+  shader_programs[number_of_programs].chroma_enabled = chroma_enabled;
+  shader_programs[number_of_programs].dither_enabled = dither_enabled;
+  shader_programs[number_of_programs].blackandwhite0 = blackandwhite0;
+  shader_programs[number_of_programs].blackandwhite1 = blackandwhite1;
+
+  if(chroma_enabled)
+  {
+    strcat(fragment_shader_texture1, "test_chroma(ctexture1); \n");
+    compile_chroma_shader();
+  }
+
+  fragment_shader = (char*)malloc(4096);
+
+  strcpy(fragment_shader, fragment_shader_header);
+  if(dither_enabled) strcat(fragment_shader, fragment_shader_dither);
+  switch (blackandwhite0) {
+    case 1: strcat(fragment_shader, fragment_shader_readtex0bw); break;
+    case 2: strcat(fragment_shader, fragment_shader_readtex0bw_2); break;
+    default: strcat(fragment_shader, fragment_shader_readtex0color);
+  }
+  switch (blackandwhite1) {
+    case 1: strcat(fragment_shader, fragment_shader_readtex1bw); break;
+    case 2: strcat(fragment_shader, fragment_shader_readtex1bw_2); break;
+    default: strcat(fragment_shader, fragment_shader_readtex1color);
+  }
+  strcat(fragment_shader, fragment_shader_texture0);
+  strcat(fragment_shader, fragment_shader_texture1);
+  strcat(fragment_shader, fragment_shader_color_combiner);
+  strcat(fragment_shader, fragment_shader_alpha_combiner);
+  if(fog_enabled) strcat(fragment_shader, fragment_shader_fog);
+  strcat(fragment_shader, fragment_shader_end);
+  if(chroma_enabled) strcat(fragment_shader, fragment_shader_chroma);
+
+  shader_programs[number_of_programs].fragment_shader_object = glCreateShader(GL_FRAGMENT_SHADER);
+  glShaderSource(shader_programs[number_of_programs].fragment_shader_object, 1, (const GLchar**)&fragment_shader, NULL);
+
+  glCompileShader(shader_programs[number_of_programs].fragment_shader_object);
+  check_compile(shader_programs[number_of_programs].fragment_shader_object);
+
+  program_object = glCreateProgram();
+  shader_programs[number_of_programs].program_object = program_object;
+
+  glBindAttribLocation(program_object,POSITION_ATTR,"aPosition");
+  glBindAttribLocation(program_object,COLOUR_ATTR,"aColor");
+  glBindAttribLocation(program_object,TEXCOORD_0_ATTR,"aMultiTexCoord0");
+  glBindAttribLocation(program_object,TEXCOORD_1_ATTR,"aMultiTexCoord1");
+  glBindAttribLocation(program_object,FOG_ATTR,"aFog");
+
+  glAttachShader(program_object, shader_programs[number_of_programs].fragment_shader_object);
+  glAttachShader(program_object, vertex_shader_object);
+
+  glLinkProgram(program_object);
+  check_link(program_object);
+  glUseProgram(program_object);
+
+
+  shader_programs[number_of_programs].texture0_location = glGetUniformLocation(program_object, "texture0");
+  shader_programs[number_of_programs].texture1_location = glGetUniformLocation(program_object, "texture1");
+  shader_programs[number_of_programs].vertexOffset_location = glGetUniformLocation(program_object, "vertexOffset");
+  shader_programs[number_of_programs].textureSizes_location = glGetUniformLocation(program_object, "textureSizes");
+  shader_programs[number_of_programs].fogModeEndScale_location = glGetUniformLocation(program_object, "fogModeEndScale");
+  shader_programs[number_of_programs].fogColor_location = glGetUniformLocation(program_object, "fogColor");
+  shader_programs[number_of_programs].alphaRef_location = glGetUniformLocation(program_object, "alphaRef");
+
+  update_uniforms(shader_programs[number_of_programs]);
+
+  number_of_programs++;
+}
+
+void free_combiners()
+{
+  free(shader_programs);
+  shader_programs = NULL;
+  number_of_programs = 0;
+}
+
+void set_copy_shader()
+{
+  int texture0_location;
+  int alphaRef_location;
+
+  glUseProgram(program_object_default);
+  texture0_location = glGetUniformLocation(program_object_default, "texture0");
+  glUniform1i(texture0_location, 0);
+
+  alphaRef_location = glGetUniformLocation(program_object_default, "alphaRef");
+  if(alphaRef_location != -1)
+      glUniform1f(alphaRef_location,alpha_test ? alpha_ref/255.0f : -1.0f);
+}
+
+void set_depth_shader()
+{
+  int texture0_location;
+  int alphaRef_location;
+
+  glUseProgram(program_object_depth);
+  texture0_location = glGetUniformLocation(program_object_depth, "texture0");
+  glUniform1i(texture0_location, 0);
+
+  alphaRef_location = glGetUniformLocation(program_object_depth, "alphaRef");
+  if(alphaRef_location != -1)
+      glUniform1f(alphaRef_location,alpha_test ? alpha_ref/255.0f : -1.0f);
+}
+
+void set_lambda()
+{
+  int lambda_location = glGetUniformLocation(program_object, "lambda");
+  glUniform1f(lambda_location, lambda);
+}
+
+FX_ENTRY void FX_CALL 
+grConstantColorValue( GrColor_t value )
+{
+  LOG("grConstantColorValue(%d)\r\n", value);
+  switch(lfb_color_fmt)
+  {
+  case GR_COLORFORMAT_ARGB:
+    texture_env_color[3] = ((value >> 24) & 0xFF) / 255.0f;
+    texture_env_color[0] = ((value >> 16) & 0xFF) / 255.0f;
+    texture_env_color[1] = ((value >>  8) & 0xFF) / 255.0f;
+    texture_env_color[2] = (value & 0xFF) / 255.0f;
+    break;
+  case GR_COLORFORMAT_RGBA:
+    texture_env_color[0] = ((value >> 24) & 0xFF) / 255.0f;
+    texture_env_color[1] = ((value >> 16) & 0xFF) / 255.0f;
+    texture_env_color[2] = ((value >>  8) & 0xFF) / 255.0f;
+    texture_env_color[3] = (value & 0xFF) / 255.0f;
+    break;
+  default:
+    display_warning("grConstantColorValue: unknown color format : %x", lfb_color_fmt);
+  }
+
+  vbo_draw();
+
+  constant_color_location = glGetUniformLocation(program_object, "constant_color");
+  glUniform4f(constant_color_location, texture_env_color[0], texture_env_color[1], 
+    texture_env_color[2], texture_env_color[3]);
+}
+
+void writeGLSLColorOther(int other)
+{
+  switch(other)
+  {
+  case GR_COMBINE_OTHER_ITERATED:
+    strcat(fragment_shader_color_combiner, "vec4 color_other = gl_Color; \n");
+    break;
+  case GR_COMBINE_OTHER_TEXTURE:
+    strcat(fragment_shader_color_combiner, "vec4 color_other = ctexture1; \n");
+    break;
+  case GR_COMBINE_OTHER_CONSTANT:
+    strcat(fragment_shader_color_combiner, "vec4 color_other = constant_color; \n");
+    break;
+  default:
+    display_warning("unknown writeGLSLColorOther : %x", other);
+  }
+}
+
+void writeGLSLColorLocal(int local)
+{
+  switch(local)
+  {
+  case GR_COMBINE_LOCAL_ITERATED:
+    strcat(fragment_shader_color_combiner, "vec4 color_local = gl_Color; \n");
+    break;
+  case GR_COMBINE_LOCAL_CONSTANT:
+    strcat(fragment_shader_color_combiner, "vec4 color_local = constant_color; \n");
+    break;
+  default:
+    display_warning("unknown writeGLSLColorLocal : %x", local);
+  }
+}
+
+void writeGLSLColorFactor(int factor, int local, int need_local, int other, int need_other)
+{
+  switch(factor)
+  {
+  case GR_COMBINE_FACTOR_ZERO:
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = vec4(0.0); \n");
+    break;
+  case GR_COMBINE_FACTOR_LOCAL:
+    if(need_local) writeGLSLColorLocal(local);
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = color_local; \n");
+    break;
+  case GR_COMBINE_FACTOR_OTHER_ALPHA:
+    if(need_other) writeGLSLColorOther(other);
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = vec4(color_other.a); \n");
+    break;
+  case GR_COMBINE_FACTOR_LOCAL_ALPHA:
+    if(need_local) writeGLSLColorLocal(local);
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = vec4(color_local.a); \n");
+    break;
+  case GR_COMBINE_FACTOR_TEXTURE_ALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = vec4(ctexture1.a); \n");
+    break;
+  case GR_COMBINE_FACTOR_TEXTURE_RGB:
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = ctexture1; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE:
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = vec4(1.0); \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_LOCAL:
+    if(need_local) writeGLSLColorLocal(local);
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = vec4(1.0) - color_local; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_OTHER_ALPHA:
+    if(need_other) writeGLSLColorOther(other);
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = vec4(1.0) - vec4(color_other.a); \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA:
+    if(need_local) writeGLSLColorLocal(local);
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = vec4(1.0) - vec4(color_local.a); \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_TEXTURE_ALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 color_factor = vec4(1.0) - vec4(ctexture1.a); \n");
+    break;
+  default:
+    display_warning("unknown writeGLSLColorFactor : %x", factor);
+  }
+}
+
+FX_ENTRY void FX_CALL 
+grColorCombine(
+               GrCombineFunction_t function, GrCombineFactor_t factor,
+               GrCombineLocal_t local, GrCombineOther_t other,
+               FxBool invert )
+{
+  LOG("grColorCombine(%d,%d,%d,%d,%d)\r\n", function, factor, local, other, invert);
+  static int last_function = 0;
+  static int last_factor = 0;
+  static int last_local = 0;
+  static int last_other = 0;
+
+  if(last_function == function && last_factor == factor &&
+    last_local == local && last_other == other && first_color == 0 && !c_combiner_ext) return;
+  first_color = 0;
+  c_combiner_ext = 0;
+
+  last_function = function;
+  last_factor = factor;
+  last_local = local;
+  last_other = other;
+
+  if (invert) display_warning("grColorCombine : inverted result");
+
+  color_combiner_key = function | (factor << 4) | (local << 8) | (other << 10);
+  chroma_other_color = other;
+
+  strcpy(fragment_shader_color_combiner, "");
+  switch(function)
+  {
+  case GR_COMBINE_FUNCTION_ZERO:
+    strcat(fragment_shader_color_combiner, "gl_FragColor = vec4(0.0); \n");
+    break;
+  case GR_COMBINE_FUNCTION_LOCAL:
+    writeGLSLColorLocal(local);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = color_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_LOCAL_ALPHA:
+    writeGLSLColorLocal(local);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = vec4(color_local.a); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER:
+    writeGLSLColorOther(other);
+    writeGLSLColorFactor(factor,local,1,other,0);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = color_factor * color_other; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL:
+    writeGLSLColorLocal(local);
+    writeGLSLColorOther(other);
+    writeGLSLColorFactor(factor,local,0,other,0);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = color_factor * color_other + color_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL_ALPHA:
+    writeGLSLColorLocal(local);
+    writeGLSLColorOther(other);
+    writeGLSLColorFactor(factor,local,0,other,0);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = color_factor * color_other + vec4(color_local.a); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL:
+    writeGLSLColorLocal(local);
+    writeGLSLColorOther(other);
+    writeGLSLColorFactor(factor,local,0,other,0);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = color_factor * (color_other - color_local); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL:
+    writeGLSLColorLocal(local);
+    writeGLSLColorOther(other);
+    writeGLSLColorFactor(factor,local,0,other,0);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = color_factor * (color_other - color_local) + color_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL_ALPHA:
+    writeGLSLColorLocal(local);
+    writeGLSLColorOther(other);
+    writeGLSLColorFactor(factor,local,0,other,0);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = color_factor * (color_other - color_local) + vec4(color_local.a); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL:
+    writeGLSLColorLocal(local);
+    writeGLSLColorFactor(factor,local,0,other,1);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = color_factor * (-color_local) + color_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL_ALPHA:
+    writeGLSLColorLocal(local);
+    writeGLSLColorFactor(factor,local,0,other,1);
+    strcat(fragment_shader_color_combiner, "gl_FragColor = color_factor * (-color_local) + vec4(color_local.a); \n");
+    break;
+  default:
+    strcpy(fragment_shader_color_combiner, fragment_shader_default);
+    display_warning("grColorCombine : unknown function : %x", function);
+  }
+  //compile_shader();
+  need_to_compile = 1;
+}
+
+/*
+int setOtherAlphaSource(int other)
+{
+  switch(other)
+  {
+  case GR_COMBINE_OTHER_ITERATED:
+    return GL_PRIMARY_COLOR_ARB;
+    break;
+  case GR_COMBINE_OTHER_TEXTURE:
+    return GL_PREVIOUS_ARB;
+    break;
+  case GR_COMBINE_OTHER_CONSTANT:
+    return GL_CONSTANT_ARB;
+    break;
+  default:
+    display_warning("unknwown other alpha source : %x", other);
+  }
+  return 0;
+}
+
+int setLocalAlphaSource(int local)
+{
+  switch(local)
+  {
+  case GR_COMBINE_LOCAL_ITERATED:
+    return GL_PRIMARY_COLOR_ARB;
+    break;
+  case GR_COMBINE_LOCAL_CONSTANT:
+    return GL_CONSTANT_ARB;
+    break;
+  default:
+    display_warning("unknwown local alpha source : %x", local);
+  }
+  return 0;
+}
+*/
+
+void writeGLSLAlphaOther(int other)
+{
+  switch(other)
+  {
+  case GR_COMBINE_OTHER_ITERATED:
+    strcat(fragment_shader_alpha_combiner, "float alpha_other = gl_Color.a; \n");
+    break;
+  case GR_COMBINE_OTHER_TEXTURE:
+    strcat(fragment_shader_alpha_combiner, "float alpha_other = ctexture1.a; \n");
+    break;
+  case GR_COMBINE_OTHER_CONSTANT:
+    strcat(fragment_shader_alpha_combiner, "float alpha_other = constant_color.a; \n");
+    break;
+  default:
+    display_warning("unknown writeGLSLAlphaOther : %x", other);
+  }
+}
+
+void writeGLSLAlphaLocal(int local)
+{
+  switch(local)
+  {
+  case GR_COMBINE_LOCAL_ITERATED:
+    strcat(fragment_shader_alpha_combiner, "float alpha_local = gl_Color.a; \n");
+    break;
+  case GR_COMBINE_LOCAL_CONSTANT:
+    strcat(fragment_shader_alpha_combiner, "float alpha_local = constant_color.a; \n");
+    break;
+  default:
+    display_warning("unknown writeGLSLAlphaLocal : %x", local);
+  }
+}
+
+void writeGLSLAlphaFactor(int factor, int local, int need_local, int other, int need_other)
+{
+  switch(factor)
+  {
+  case GR_COMBINE_FACTOR_ZERO:
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = 0.0; \n");
+    break;
+  case GR_COMBINE_FACTOR_LOCAL:
+    if(need_local) writeGLSLAlphaLocal(local);
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = alpha_local; \n");
+    break;
+  case GR_COMBINE_FACTOR_OTHER_ALPHA:
+    if(need_other) writeGLSLAlphaOther(other);
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = alpha_other; \n");
+    break;
+  case GR_COMBINE_FACTOR_LOCAL_ALPHA:
+    if(need_local) writeGLSLAlphaLocal(local);
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = alpha_local; \n");
+    break;
+  case GR_COMBINE_FACTOR_TEXTURE_ALPHA:
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = ctexture1.a; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE:
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = 1.0; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_LOCAL:
+    if(need_local) writeGLSLAlphaLocal(local);
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = 1.0 - alpha_local; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_OTHER_ALPHA:
+    if(need_other) writeGLSLAlphaOther(other);
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = 1.0 - alpha_other; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA:
+    if(need_local) writeGLSLAlphaLocal(local);
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = 1.0 - alpha_local; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_TEXTURE_ALPHA:
+    strcat(fragment_shader_alpha_combiner, "float alpha_factor = 1.0 - ctexture1.a; \n");
+    break;
+  default:
+    display_warning("unknown writeGLSLAlphaFactor : %x", factor);
+  }
+}
+
+FX_ENTRY void FX_CALL
+grAlphaCombine(
+               GrCombineFunction_t function, GrCombineFactor_t factor,
+               GrCombineLocal_t local, GrCombineOther_t other,
+               FxBool invert
+               )
+{
+  LOG("grAlphaCombine(%d,%d,%d,%d,%d)\r\n", function, factor, local, other, invert);
+  static int last_function = 0;
+  static int last_factor = 0;
+  static int last_local = 0;
+  static int last_other = 0;
+
+  if(last_function == function && last_factor == factor &&
+    last_local == local && last_other == other && first_alpha == 0 && !a_combiner_ext) return;
+  first_alpha = 0;
+  a_combiner_ext = 0;
+
+  last_function = function;
+  last_factor = factor;
+  last_local = local;
+  last_other = other;
+
+  if (invert) display_warning("grAlphaCombine : inverted result");
+
+  alpha_combiner_key = function | (factor << 4) | (local << 8) | (other << 10);
+  chroma_other_alpha = other;
+
+  strcpy(fragment_shader_alpha_combiner, "");
+
+  switch(function)
+  {
+  case GR_COMBINE_FUNCTION_ZERO:
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = 0.0; \n");
+    break;
+  case GR_COMBINE_FUNCTION_LOCAL:
+    writeGLSLAlphaLocal(local);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_LOCAL_ALPHA:
+    writeGLSLAlphaLocal(local);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER:
+    writeGLSLAlphaOther(other);
+    writeGLSLAlphaFactor(factor,local,1,other,0);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_factor * alpha_other; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL:
+    writeGLSLAlphaLocal(local);
+    writeGLSLAlphaOther(other);
+    writeGLSLAlphaFactor(factor,local,0,other,0);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_factor * alpha_other + alpha_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL_ALPHA:
+    writeGLSLAlphaLocal(local);
+    writeGLSLAlphaOther(other);
+    writeGLSLAlphaFactor(factor,local,0,other,0);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_factor * alpha_other + alpha_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL:
+    writeGLSLAlphaLocal(local);
+    writeGLSLAlphaOther(other);
+    writeGLSLAlphaFactor(factor,local,0,other,0);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_factor * (alpha_other - alpha_local); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL:
+    writeGLSLAlphaLocal(local);
+    writeGLSLAlphaOther(other);
+    writeGLSLAlphaFactor(factor,local,0,other,0);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_factor * (alpha_other - alpha_local) + alpha_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL_ALPHA:
+    writeGLSLAlphaLocal(local);
+    writeGLSLAlphaOther(other);
+    writeGLSLAlphaFactor(factor,local,0,other,0);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_factor * (alpha_other - alpha_local) + alpha_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL:
+    writeGLSLAlphaLocal(local);
+    writeGLSLAlphaFactor(factor,local,0,other,1);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_factor * (-alpha_local) + alpha_local; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL_ALPHA:
+    writeGLSLAlphaLocal(local);
+    writeGLSLAlphaFactor(factor,local,0,other,1);
+    strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = alpha_factor * (-alpha_local) + alpha_local; \n");
+    break;
+  default:
+    display_warning("grAlphaCombine : unknown function : %x", function);
+  }
+
+  //compile_shader();
+  need_to_compile = 1;
+}
+
+void writeGLSLTextureColorFactor(int num_tex, int factor)
+{
+  switch(factor)
+  {
+  case GR_COMBINE_FACTOR_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = vec4(0.0); \n");
+    break;
+  case GR_COMBINE_FACTOR_LOCAL:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = readtex1; \n");
+    break;
+  case GR_COMBINE_FACTOR_OTHER_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = vec4(ctexture0.a); \n");
+    break;
+  case GR_COMBINE_FACTOR_LOCAL_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = vec4(readtex1.a); \n");
+    break;
+  case GR_COMBINE_FACTOR_DETAIL_FACTOR:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = vec4(lambda); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = vec4(lambda); \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = vec4(1.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = vec4(1.0); \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_LOCAL:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = vec4(1.0) - readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = vec4(1.0) - readtex1; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_OTHER_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = vec4(1.0) - vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = vec4(1.0) - vec4(ctexture0.a); \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = vec4(1.0) - vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = vec4(1.0) - vec4(readtex1.a); \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_DETAIL_FACTOR:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 texture0_color_factor = vec4(1.0) - vec4(lambda); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 texture1_color_factor = vec4(1.0) - vec4(lambda); \n");
+    break;
+  default:
+    display_warning("unknown writeGLSLTextureColorFactor : %x", factor);
+  }
+}
+
+void writeGLSLTextureAlphaFactor(int num_tex, int factor)
+{
+  switch(factor)
+  {
+  case GR_COMBINE_FACTOR_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = 0.0; \n");
+    break;
+  case GR_COMBINE_FACTOR_LOCAL:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = readtex1.a; \n");
+    break;
+  case GR_COMBINE_FACTOR_OTHER_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = ctexture0.a; \n");
+    break;
+  case GR_COMBINE_FACTOR_LOCAL_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = readtex1.a; \n");
+    break;
+  case GR_COMBINE_FACTOR_DETAIL_FACTOR:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = lambda; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = lambda; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = 1.0; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = 1.0; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_LOCAL:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = 1.0 - readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = 1.0 - readtex1.a; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_OTHER_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = 1.0 - 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = 1.0 - ctexture0.a; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_LOCAL_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = 1.0 - readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = 1.0 - readtex1.a; \n");
+    break;
+  case GR_COMBINE_FACTOR_ONE_MINUS_DETAIL_FACTOR:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "float texture0_alpha_factor = 1.0 - lambda; \n");
+    else
+      strcat(fragment_shader_texture1, "float texture1_alpha_factor = 1.0 - lambda; \n");
+    break;
+  default:
+    display_warning("unknown writeGLSLTextureAlphaFactor : %x", factor);
+  }
+}
+
+FX_ENTRY void FX_CALL 
+grTexCombine(
+             GrChipID_t tmu,
+             GrCombineFunction_t rgb_function,
+             GrCombineFactor_t rgb_factor, 
+             GrCombineFunction_t alpha_function,
+             GrCombineFactor_t alpha_factor,
+             FxBool rgb_invert,
+             FxBool alpha_invert
+             )
+{
+  LOG("grTexCombine(%d,%d,%d,%d,%d,%d,%d)\r\n", tmu, rgb_function, rgb_factor, alpha_function, alpha_factor, rgb_invert, alpha_invert);
+  int num_tex;
+
+  if (tmu == GR_TMU0) num_tex = 1;
+  else num_tex = 0;
+
+  if(num_tex == 0)
+  {
+    static int last_function = 0;
+    static int last_factor = 0;
+    static int last_afunction = 0;
+    static int last_afactor = 0;
+    static int last_rgb_invert = 0;
+
+    if(last_function == rgb_function && last_factor == rgb_factor &&
+      last_afunction == alpha_function && last_afactor == alpha_factor &&
+      last_rgb_invert == rgb_invert && first_texture0 == 0 && !tex0_combiner_ext) return;
+    first_texture0 = 0;
+    tex0_combiner_ext = 0;
+
+    last_function = rgb_function;
+    last_factor = rgb_factor;
+    last_afunction = alpha_function;
+    last_afactor = alpha_factor;
+    last_rgb_invert= rgb_invert;
+    texture0_combiner_key = rgb_function | (rgb_factor << 4) | 
+      (alpha_function << 8) | (alpha_factor << 12) | 
+      (rgb_invert << 16);
+    texture0_combinera_key = 0;
+    strcpy(fragment_shader_texture0, "");
+  }
+  else
+  {
+    static int last_function = 0;
+    static int last_factor = 0;
+    static int last_afunction = 0;
+    static int last_afactor = 0;
+    static int last_rgb_invert = 0;
+
+    if(last_function == rgb_function && last_factor == rgb_factor &&
+      last_afunction == alpha_function && last_afactor == alpha_factor &&
+      last_rgb_invert == rgb_invert && first_texture1 == 0 && !tex1_combiner_ext) return;
+    first_texture1 = 0;
+    tex1_combiner_ext = 0;
+
+    last_function = rgb_function;
+    last_factor = rgb_factor;
+    last_afunction = alpha_function;
+    last_afactor = alpha_factor;
+    last_rgb_invert = rgb_invert;
+
+    texture1_combiner_key = rgb_function | (rgb_factor << 4) | 
+      (alpha_function << 8) | (alpha_factor << 12) |
+      (rgb_invert << 16);
+    texture1_combinera_key = 0;
+    strcpy(fragment_shader_texture1, "");
+  }
+
+  switch(rgb_function)
+  {
+  case GR_COMBINE_FUNCTION_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = vec4(0.0); \n");
+    break;
+  case GR_COMBINE_FUNCTION_LOCAL:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = readtex1; \n");
+    break;
+  case GR_COMBINE_FUNCTION_LOCAL_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = vec4(readtex1.a); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER:
+    writeGLSLTextureColorFactor(num_tex, rgb_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = texture0_color_factor * vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = texture1_color_factor * ctexture0; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL:
+    writeGLSLTextureColorFactor(num_tex, rgb_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = texture0_color_factor * vec4(0.0) + readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = texture1_color_factor * ctexture0 + readtex1; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL_ALPHA:
+    writeGLSLTextureColorFactor(num_tex, rgb_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = texture0_color_factor * vec4(0.0) + vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = texture1_color_factor * ctexture0 + vec4(readtex1.a); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL:
+    writeGLSLTextureColorFactor(num_tex, rgb_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = texture0_color_factor * (vec4(0.0) - readtex0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = texture1_color_factor * (ctexture0 - readtex1); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL:
+    writeGLSLTextureColorFactor(num_tex, rgb_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = texture0_color_factor * (vec4(0.0) - readtex0) + readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = texture1_color_factor * (ctexture0 - readtex1) + readtex1; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL_ALPHA:
+    writeGLSLTextureColorFactor(num_tex, rgb_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = texture0_color_factor * (vec4(0.0) - readtex0) + vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = texture1_color_factor * (ctexture0 - readtex1) + vec4(readtex1.a); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL:
+    writeGLSLTextureColorFactor(num_tex, rgb_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = texture0_color_factor * (-readtex0) + readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = texture1_color_factor * (-readtex1) + readtex1; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL_ALPHA:
+    writeGLSLTextureColorFactor(num_tex, rgb_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = texture0_color_factor * (-readtex0) + vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = texture1_color_factor * (-readtex1) + vec4(readtex1.a); \n");
+    break;
+  default:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctexture0 = readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctexture1 = readtex1; \n");
+    display_warning("grTextCombine : unknown rgb function : %x", rgb_function);
+  }
+
+  if (rgb_invert)
+  {
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0 = vec4(1.0) - ctexture0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1 = vec4(1.0) - ctexture1; \n");
+  }
+
+  switch(alpha_function)
+  {
+  case GR_COMBINE_FACTOR_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = 0.0; \n");
+    break;
+  case GR_COMBINE_FUNCTION_LOCAL:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = readtex1.a; \n");
+    break;
+  case GR_COMBINE_FUNCTION_LOCAL_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = readtex1.a; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER:
+    writeGLSLTextureAlphaFactor(num_tex, alpha_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = texture0_alpha_factor * 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = texture1_alpha_factor * ctexture0.a; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL:
+    writeGLSLTextureAlphaFactor(num_tex, alpha_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = texture0_alpha_factor * 0.0 + readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = texture1_alpha_factor * ctexture0.a + readtex1.a; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL_ALPHA:
+    writeGLSLTextureAlphaFactor(num_tex, alpha_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = texture0_alpha_factor * 0.0 + readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = texture1_alpha_factor * ctexture0.a + readtex1.a; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL:
+    writeGLSLTextureAlphaFactor(num_tex, alpha_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = texture0_alpha_factor * (0.0 - readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = texture1_alpha_factor * (ctexture0.a - readtex1.a); \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL:
+    writeGLSLTextureAlphaFactor(num_tex, alpha_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = texture0_alpha_factor * (0.0 - readtex0.a) + readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = texture1_alpha_factor * (ctexture0.a - readtex1.a) + readtex1.a; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL_ADD_LOCAL_ALPHA:
+    writeGLSLTextureAlphaFactor(num_tex, alpha_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = texture0_alpha_factor * (0.0 - readtex0.a) + readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = texture1_alpha_factor * (ctexture0.a - readtex1.a) + readtex1.a; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL:
+    writeGLSLTextureAlphaFactor(num_tex, alpha_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = texture0_alpha_factor * (-readtex0.a) + readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = texture1_alpha_factor * (-readtex1.a) + readtex1.a; \n");
+    break;
+  case GR_COMBINE_FUNCTION_SCALE_MINUS_LOCAL_ADD_LOCAL_ALPHA:
+    writeGLSLTextureAlphaFactor(num_tex, alpha_factor);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = texture0_alpha_factor * (-readtex0.a) + readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = texture1_alpha_factor * (-readtex1.a) + readtex1.a; \n");
+    break;
+  default:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = ctexture0.a; \n");
+    display_warning("grTextCombine : unknown alpha function : %x", alpha_function);
+  }
+
+  if (alpha_invert)
+  {
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctexture0.a = 1.0 - ctexture0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctexture1.a = 1.0 - ctexture1.a; \n");
+  }
+  need_to_compile = 1;
+}
+
+FX_ENTRY void FX_CALL
+grAlphaBlendFunction(
+                     GrAlphaBlendFnc_t rgb_sf,   GrAlphaBlendFnc_t rgb_df,
+                     GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df
+                     )
+{
+  int sfactorRGB = 0, dfactorRGB = 0, sfactorAlpha = 0, dfactorAlpha = 0;
+  LOG("grAlphaBlendFunction(%d,%d,%d,%d)\r\n", rgb_sf, rgb_df, alpha_sf, alpha_df);
+
+  switch(rgb_sf)
+  {
+  case GR_BLEND_ZERO:
+    sfactorRGB = GL_ZERO;
+    break;
+  case GR_BLEND_SRC_ALPHA:
+    sfactorRGB = GL_SRC_ALPHA;
+    break;
+  case GR_BLEND_ONE:
+    sfactorRGB = GL_ONE;
+    break;
+  case GR_BLEND_ONE_MINUS_SRC_ALPHA:
+    sfactorRGB = GL_ONE_MINUS_SRC_ALPHA;
+    break;
+  default:
+    display_warning("grAlphaBlendFunction : rgb_sf = %x", rgb_sf);
+  }
+
+  switch(rgb_df)
+  {
+  case GR_BLEND_ZERO:
+    dfactorRGB = GL_ZERO;
+    break;
+  case GR_BLEND_SRC_ALPHA:
+    dfactorRGB = GL_SRC_ALPHA;
+    break;
+  case GR_BLEND_ONE:
+    dfactorRGB = GL_ONE;
+    break;
+  case GR_BLEND_ONE_MINUS_SRC_ALPHA:
+    dfactorRGB = GL_ONE_MINUS_SRC_ALPHA;
+    break;
+  default:
+    display_warning("grAlphaBlendFunction : rgb_df = %x", rgb_df);
+  }
+
+  switch(alpha_sf)
+  {
+  case GR_BLEND_ZERO:
+    sfactorAlpha = GL_ZERO;
+    break;
+  case GR_BLEND_ONE:
+    sfactorAlpha = GL_ONE;
+    break;
+  default:
+    display_warning("grAlphaBlendFunction : alpha_sf = %x", alpha_sf);
+  }
+
+  switch(alpha_df)
+  {
+  case GR_BLEND_ZERO:
+    dfactorAlpha = GL_ZERO;
+    break;
+  case GR_BLEND_ONE:
+    dfactorAlpha = GL_ONE;
+    break;
+  default:
+    display_warning("grAlphaBlendFunction : alpha_df = %x", alpha_df);
+  }
+  glEnable(GL_BLEND);
+  glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+/*
+  if (blend_func_separate_support)
+    glBlendFuncSeparateEXT(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+  else
+    glBlendFunc(sfactorRGB, dfactorRGB);
+*/
+}
+
+FX_ENTRY void FX_CALL
+grAlphaTestReferenceValue( GrAlpha_t value )
+{
+  LOG("grAlphaTestReferenceValue(%d)\r\n", value);
+  alpha_ref = value;
+  grAlphaTestFunction(alpha_func);
+}
+
+FX_ENTRY void FX_CALL
+grAlphaTestFunction( GrCmpFnc_t function )
+{
+  LOG("grAlphaTestFunction(%d)\r\n", function);
+  alpha_func = function;
+  switch(function)
+  {
+  case GR_CMP_GREATER:
+    //glAlphaFunc(GL_GREATER, alpha_ref/255.0f);
+    break;
+  case GR_CMP_GEQUAL:
+    //glAlphaFunc(GL_GEQUAL, alpha_ref/255.0f);
+    break;
+  case GR_CMP_ALWAYS:
+    //glAlphaFunc(GL_ALWAYS, alpha_ref/255.0f);
+    //glDisable(GL_ALPHA_TEST);
+    alpha_test = false;
+    return;
+    break;
+  default:
+    display_warning("grAlphaTestFunction : unknown function : %x", function);
+  }
+  //glEnable(GL_ALPHA_TEST);
+  alpha_test = true;
+}
+
+// fog
+
+FX_ENTRY void FX_CALL 
+grFogMode( GrFogMode_t mode )
+{
+  LOG("grFogMode(%d)\r\n", mode);
+  switch(mode)
+  {
+  case GR_FOG_DISABLE:
+    //glDisable(GL_FOG);
+    fog_enabled = 0;
+    break;
+  case GR_FOG_WITH_TABLE_ON_Q:
+    //glEnable(GL_FOG);
+    //glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT);
+    fog_enabled = 1;
+    break;
+  case GR_FOG_WITH_TABLE_ON_FOGCOORD_EXT:
+    //glEnable(GL_FOG);
+    //glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT);
+    fog_enabled = 2;
+    break;
+  default:
+    display_warning("grFogMode : unknown mode : %x", mode);
+  }
+  need_to_compile = 1;
+}
+
+FX_ENTRY float FX_CALL
+guFogTableIndexToW( int i )
+{
+  LOG("guFogTableIndexToW(%d)\r\n", i);
+  return (float)(pow(2.0, 3.0+(double)(i>>2)) / (8-(i&3)));
+}
+
+FX_ENTRY void FX_CALL
+guFogGenerateLinear(GrFog_t *fogtable,
+                    float nearZ, float farZ )
+{
+  LOG("guFogGenerateLinear(%f,%f)\r\n", nearZ, farZ);
+/*
+  glFogi(GL_FOG_MODE, GL_LINEAR);
+  glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT);
+  glFogf(GL_FOG_START, nearZ / 255.0f);
+  glFogf(GL_FOG_END, farZ / 255.0f);
+*/
+  fogStart = nearZ / 255.0f;
+  fogEnd = farZ / 255.0f;
+}
+
+FX_ENTRY void FX_CALL 
+grFogTable( const GrFog_t ft[] )
+{
+  LOG("grFogTable()\r\n");
+}
+
+FX_ENTRY void FX_CALL 
+grFogColorValue( GrColor_t fogcolor )
+{
+  LOG("grFogColorValue(%x)\r\n", fogcolor);
+
+  switch(lfb_color_fmt)
+  {
+  case GR_COLORFORMAT_ARGB:
+    fogColor[3] = ((fogcolor >> 24) & 0xFF) / 255.0f;
+    fogColor[0] = ((fogcolor >> 16) & 0xFF) / 255.0f;
+    fogColor[1] = ((fogcolor >>  8) & 0xFF) / 255.0f;
+    fogColor[2] = (fogcolor & 0xFF) / 255.0f;
+    break;
+  case GR_COLORFORMAT_RGBA:
+    fogColor[0] = ((fogcolor >> 24) & 0xFF) / 255.0f;
+    fogColor[1] = ((fogcolor >> 16) & 0xFF) / 255.0f;
+    fogColor[2] = ((fogcolor >>  8) & 0xFF) / 255.0f;
+    fogColor[3] = (fogcolor & 0xFF) / 255.0f;
+    break;
+  default:
+    display_warning("grFogColorValue: unknown color format : %x", lfb_color_fmt);
+  }
+
+  //glFogfv(GL_FOG_COLOR, color); 
+}
+
+// chroma
+
+FX_ENTRY void FX_CALL 
+grChromakeyMode( GrChromakeyMode_t mode )
+{
+  LOG("grChromakeyMode(%d)\r\n", mode);
+  switch(mode)
+  {
+  case GR_CHROMAKEY_DISABLE:
+    chroma_enabled = 0;
+    break;
+  case GR_CHROMAKEY_ENABLE:
+    chroma_enabled = 1;
+    break;
+  default:
+    display_warning("grChromakeyMode : unknown mode : %x", mode);
+  }
+  need_to_compile = 1;
+}
+
+FX_ENTRY void FX_CALL 
+grChromakeyValue( GrColor_t value )
+{
+  LOG("grChromakeyValue(%x)\r\n", value);
+  int chroma_color_location;
+
+  switch(lfb_color_fmt)
+  {
+  case GR_COLORFORMAT_ARGB:
+    chroma_color[3] = 1.0;//((value >> 24) & 0xFF) / 255.0f;
+    chroma_color[0] = ((value >> 16) & 0xFF) / 255.0f;
+    chroma_color[1] = ((value >>  8) & 0xFF) / 255.0f;
+    chroma_color[2] = (value & 0xFF) / 255.0f;
+    break;
+  case GR_COLORFORMAT_RGBA:
+    chroma_color[0] = ((value >> 24) & 0xFF) / 255.0f;
+    chroma_color[1] = ((value >> 16) & 0xFF) / 255.0f;
+    chroma_color[2] = ((value >>  8) & 0xFF) / 255.0f;
+    chroma_color[3] = 1.0;//(value & 0xFF) / 255.0f;
+    break;
+  default:
+    display_warning("grChromakeyValue: unknown color format : %x", lfb_color_fmt);
+  }
+  vbo_draw();
+  chroma_color_location = glGetUniformLocation(program_object, "chroma_color");
+  glUniform4f(chroma_color_location, chroma_color[0], chroma_color[1],
+    chroma_color[2], chroma_color[3]);
+}
+
+static void setPattern()
+{
+  int i;
+  GLubyte stip[32*4];
+  for(i=0; i<32; i++)
+  {
+    unsigned int val = (rand() << 17) | ((rand() & 1) << 16) | (rand() << 1) | (rand() & 1);
+    stip[i*4+0] = (val >> 24) & 0xFF;
+    stip[i*4+1] = (val >> 16) & 0xFF;
+    stip[i*4+2] = (val >> 8) & 0xFF;
+    stip[i*4+3] = val & 0xFF;
+  }
+  GLubyte texture[32*32*4];
+  for(i=0; i<32; i++)
+  {
+    int j;
+    for(j=0; j<4; j++)
+    {
+      texture[(i*32+j*8+0)*4+3] = ((stip[i*4+j] >> 7) & 1) ? 255 : 0;
+      texture[(i*32+j*8+1)*4+3] = ((stip[i*4+j] >> 6) & 1) ? 255 : 0;
+      texture[(i*32+j*8+2)*4+3] = ((stip[i*4+j] >> 5) & 1) ? 255 : 0;
+      texture[(i*32+j*8+3)*4+3] = ((stip[i*4+j] >> 4) & 1) ? 255 : 0;
+      texture[(i*32+j*8+4)*4+3] = ((stip[i*4+j] >> 3) & 1) ? 255 : 0;
+      texture[(i*32+j*8+5)*4+3] = ((stip[i*4+j] >> 2) & 1) ? 255 : 0;
+      texture[(i*32+j*8+6)*4+3] = ((stip[i*4+j] >> 1) & 1) ? 255 : 0;
+      texture[(i*32+j*8+7)*4+3] = ((stip[i*4+j] >> 0) & 1) ? 255 : 0;
+    }
+  }
+  glActiveTexture(GL_TEXTURE2);
+  glEnable(GL_TEXTURE_2D);
+  glBindTexture(GL_TEXTURE_2D, 33*1024*1024);
+  glTexImage2D(GL_TEXTURE_2D, 0, 4, 32, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glDisable(GL_TEXTURE_2D);
+}
+
+FX_ENTRY void FX_CALL
+grStipplePattern(
+                 GrStipplePattern_t stipple)
+{
+  LOG("grStipplePattern(%x)\r\n", stipple);
+  srand(stipple);
+  setPattern();
+}
+
+FX_ENTRY void FX_CALL
+grStippleMode( GrStippleMode_t mode )
+{
+  LOG("grStippleMode(%d)\r\n", mode);
+  switch(mode)
+  {
+  case GR_STIPPLE_DISABLE:
+    dither_enabled = 0;
+    glActiveTexture(GL_TEXTURE2);
+    glDisable(GL_TEXTURE_2D);
+    break;
+  case GR_STIPPLE_PATTERN:
+    setPattern();
+    dither_enabled = 1;
+    glActiveTexture(GL_TEXTURE2);
+    glEnable(GL_TEXTURE_2D);
+    break;
+  case GR_STIPPLE_ROTATE:
+    setPattern();
+    dither_enabled = 1;
+    glActiveTexture(GL_TEXTURE2);
+    glEnable(GL_TEXTURE_2D);
+    break;
+  default:
+    display_warning("grStippleMode:%x", mode);
+  }
+  need_to_compile = 1;
+}
+
+FX_ENTRY void FX_CALL 
+grColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode,
+                  GrCCUColor_t b, GrCombineMode_t b_mode,
+                  GrCCUColor_t c, FxBool c_invert,
+                  GrCCUColor_t d, FxBool d_invert,
+                  FxU32 shift, FxBool invert)
+{
+  LOG("grColorCombineExt(%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)\r\n", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
+  if (invert) display_warning("grColorCombineExt : inverted result");
+  if (shift) display_warning("grColorCombineExt : shift = %d", shift);
+
+  color_combiner_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) | 
+    ((b & 0x1F) << 7) | ((b_mode & 3) << 12) |
+    ((c & 0x1F) << 14) | ((c_invert & 1) << 19) |
+    ((d & 0x1F) << 20) | ((d_invert & 1) << 25);
+  c_combiner_ext = 1;
+  strcpy(fragment_shader_color_combiner, "");
+
+  switch(a)
+  {
+  case GR_CMBX_ZERO:
+    strcat(fragment_shader_color_combiner, "vec4 cs_a = vec4(0.0); \n");
+    break;
+  case GR_CMBX_TEXTURE_ALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 cs_a = vec4(ctexture1.a); \n");
+    break;
+  case GR_CMBX_CONSTANT_ALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 cs_a = vec4(constant_color.a); \n");
+    break;
+  case GR_CMBX_CONSTANT_COLOR:
+    strcat(fragment_shader_color_combiner, "vec4 cs_a = constant_color; \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 cs_a = vec4(gl_Color.a); \n");
+    break;
+  case GR_CMBX_ITRGB:
+    strcat(fragment_shader_color_combiner, "vec4 cs_a = gl_Color; \n");
+    break;
+  case GR_CMBX_TEXTURE_RGB:
+    strcat(fragment_shader_color_combiner, "vec4 cs_a = ctexture1; \n");
+    break;
+  default:
+    display_warning("grColorCombineExt : a = %x", a);
+    strcat(fragment_shader_color_combiner, "vec4 cs_a = vec4(0.0); \n");
+  }
+
+  switch(a_mode)
+  {
+  case GR_FUNC_MODE_ZERO:
+    strcat(fragment_shader_color_combiner, "vec4 c_a = vec4(0.0); \n");
+    break;
+  case GR_FUNC_MODE_X:
+    strcat(fragment_shader_color_combiner, "vec4 c_a = cs_a; \n");
+    break;
+  case GR_FUNC_MODE_ONE_MINUS_X:
+    strcat(fragment_shader_color_combiner, "vec4 c_a = vec4(1.0) - cs_a; \n");
+    break;
+  case GR_FUNC_MODE_NEGATIVE_X:
+    strcat(fragment_shader_color_combiner, "vec4 c_a = -cs_a; \n");
+    break;
+  default:
+    display_warning("grColorCombineExt : a_mode = %x", a_mode);
+    strcat(fragment_shader_color_combiner, "vec4 c_a = vec4(0.0); \n");
+  }
+
+  switch(b)
+  {
+  case GR_CMBX_ZERO:
+    strcat(fragment_shader_color_combiner, "vec4 cs_b = vec4(0.0); \n");
+    break;
+  case GR_CMBX_TEXTURE_ALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 cs_b = vec4(ctexture1.a); \n");
+    break;
+  case GR_CMBX_CONSTANT_ALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 cs_b = vec4(constant_color.a); \n");
+    break;
+  case GR_CMBX_CONSTANT_COLOR:
+    strcat(fragment_shader_color_combiner, "vec4 cs_b = constant_color; \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 cs_b = vec4(gl_Color.a); \n");
+    break;
+  case GR_CMBX_ITRGB:
+    strcat(fragment_shader_color_combiner, "vec4 cs_b = gl_Color; \n");
+    break;
+  case GR_CMBX_TEXTURE_RGB:
+    strcat(fragment_shader_color_combiner, "vec4 cs_b = ctexture1; \n");
+    break;
+  default:
+    display_warning("grColorCombineExt : b = %x", b);
+    strcat(fragment_shader_color_combiner, "vec4 cs_b = vec4(0.0); \n");
+  }
+
+  switch(b_mode)
+  {
+  case GR_FUNC_MODE_ZERO:
+    strcat(fragment_shader_color_combiner, "vec4 c_b = vec4(0.0); \n");
+    break;
+  case GR_FUNC_MODE_X:
+    strcat(fragment_shader_color_combiner, "vec4 c_b = cs_b; \n");
+    break;
+  case GR_FUNC_MODE_ONE_MINUS_X:
+    strcat(fragment_shader_color_combiner, "vec4 c_b = vec4(1.0) - cs_b; \n");
+    break;
+  case GR_FUNC_MODE_NEGATIVE_X:
+    strcat(fragment_shader_color_combiner, "vec4 c_b = -cs_b; \n");
+    break;
+  default:
+    display_warning("grColorCombineExt : b_mode = %x", b_mode);
+    strcat(fragment_shader_color_combiner, "vec4 c_b = vec4(0.0); \n");
+  }
+
+  switch(c)
+  {
+  case GR_CMBX_ZERO:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = vec4(0.0); \n");
+    break;
+  case GR_CMBX_TEXTURE_ALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = vec4(ctexture1.a); \n");
+    break;
+  case GR_CMBX_ALOCAL:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = vec4(c_b.a); \n");
+    break;
+  case GR_CMBX_AOTHER:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = vec4(c_a.a); \n");
+    break;
+  case GR_CMBX_B:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = cs_b; \n");
+    break;
+  case GR_CMBX_CONSTANT_ALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = vec4(constant_color.a); \n");
+    break;
+  case GR_CMBX_CONSTANT_COLOR:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = constant_color; \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = vec4(gl_Color.a); \n");
+    break;
+  case GR_CMBX_ITRGB:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = gl_Color; \n");
+    break;
+  case GR_CMBX_TEXTURE_RGB:
+    strcat(fragment_shader_color_combiner, "vec4 c_c = ctexture1; \n");
+    break;
+  default:
+    display_warning("grColorCombineExt : c = %x", c);
+    strcat(fragment_shader_color_combiner, "vec4 c_c = vec4(0.0); \n");
+  }
+
+  if(c_invert)
+    strcat(fragment_shader_color_combiner, "c_c = vec4(1.0) - c_c; \n");
+
+  switch(d)
+  {
+  case GR_CMBX_ZERO:
+    strcat(fragment_shader_color_combiner, "vec4 c_d = vec4(0.0); \n");
+    break;
+  case GR_CMBX_ALOCAL:
+    strcat(fragment_shader_color_combiner, "vec4 c_d = vec4(c_b.a); \n");
+    break;
+  case GR_CMBX_B:
+    strcat(fragment_shader_color_combiner, "vec4 c_d = cs_b; \n");
+    break;
+  case GR_CMBX_TEXTURE_RGB:
+    strcat(fragment_shader_color_combiner, "vec4 c_d = ctexture1; \n");
+    break;
+  case GR_CMBX_ITRGB:
+    strcat(fragment_shader_color_combiner, "vec4 c_d = gl_Color; \n");
+    break;
+  default:
+    display_warning("grColorCombineExt : d = %x", d);
+    strcat(fragment_shader_color_combiner, "vec4 c_d = vec4(0.0); \n");
+  }
+
+  if(d_invert)
+    strcat(fragment_shader_color_combiner, "c_d = vec4(1.0) - c_d; \n");
+
+  strcat(fragment_shader_color_combiner, "gl_FragColor = (c_a + c_b) * c_c + c_d; \n");
+
+  need_to_compile = 1;
+}
+
+FX_ENTRY void FX_CALL
+grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
+                  GrACUColor_t b, GrCombineMode_t b_mode,
+                  GrACUColor_t c, FxBool c_invert,
+                  GrACUColor_t d, FxBool d_invert,
+                  FxU32 shift, FxBool invert)
+{
+  LOG("grAlphaCombineExt(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d)\r\n", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
+  if (invert) display_warning("grAlphaCombineExt : inverted result");
+  if (shift) display_warning("grAlphaCombineExt : shift = %d", shift);
+
+  alpha_combiner_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) | 
+    ((b & 0x1F) << 7) | ((b_mode & 3) << 12) |
+    ((c & 0x1F) << 14) | ((c_invert & 1) << 19) |
+    ((d & 0x1F) << 20) | ((d_invert & 1) << 25);
+  a_combiner_ext = 1;
+  strcpy(fragment_shader_alpha_combiner, "");
+
+  switch(a)
+  {
+  case GR_CMBX_ZERO:
+    strcat(fragment_shader_alpha_combiner, "float as_a = 0.0; \n");
+    break;
+  case GR_CMBX_TEXTURE_ALPHA:
+    strcat(fragment_shader_alpha_combiner, "float as_a = ctexture1.a; \n");
+    break;
+  case GR_CMBX_CONSTANT_ALPHA:
+    strcat(fragment_shader_alpha_combiner, "float as_a = constant_color.a; \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    strcat(fragment_shader_alpha_combiner, "float as_a = gl_Color.a; \n");
+    break;
+  default:
+    display_warning("grAlphaCombineExt : a = %x", a);
+    strcat(fragment_shader_alpha_combiner, "float as_a = 0.0; \n");
+  }
+
+  switch(a_mode)
+  {
+  case GR_FUNC_MODE_ZERO:
+    strcat(fragment_shader_alpha_combiner, "float a_a = 0.0; \n");
+    break;
+  case GR_FUNC_MODE_X:
+    strcat(fragment_shader_alpha_combiner, "float a_a = as_a; \n");
+    break;
+  case GR_FUNC_MODE_ONE_MINUS_X:
+    strcat(fragment_shader_alpha_combiner, "float a_a = 1.0 - as_a; \n");
+    break;
+  case GR_FUNC_MODE_NEGATIVE_X:
+    strcat(fragment_shader_alpha_combiner, "float a_a = -as_a; \n");
+    break;
+  default:
+    display_warning("grAlphaCombineExt : a_mode = %x", a_mode);
+    strcat(fragment_shader_alpha_combiner, "float a_a = 0.0; \n");
+  }
+
+  switch(b)
+  {
+  case GR_CMBX_ZERO:
+    strcat(fragment_shader_alpha_combiner, "float as_b = 0.0; \n");
+    break;
+  case GR_CMBX_TEXTURE_ALPHA:
+    strcat(fragment_shader_alpha_combiner, "float as_b = ctexture1.a; \n");
+    break;
+  case GR_CMBX_CONSTANT_ALPHA:
+    strcat(fragment_shader_alpha_combiner, "float as_b = constant_color.a; \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    strcat(fragment_shader_alpha_combiner, "float as_b = gl_Color.a; \n");
+    break;
+  default:
+    display_warning("grAlphaCombineExt : b = %x", b);
+    strcat(fragment_shader_alpha_combiner, "float as_b = 0.0; \n");
+  }
+
+  switch(b_mode)
+  {
+  case GR_FUNC_MODE_ZERO:
+    strcat(fragment_shader_alpha_combiner, "float a_b = 0.0; \n");
+    break;
+  case GR_FUNC_MODE_X:
+    strcat(fragment_shader_alpha_combiner, "float a_b = as_b; \n");
+    break;
+  case GR_FUNC_MODE_ONE_MINUS_X:
+    strcat(fragment_shader_alpha_combiner, "float a_b = 1.0 - as_b; \n");
+    break;
+  case GR_FUNC_MODE_NEGATIVE_X:
+    strcat(fragment_shader_alpha_combiner, "float a_b = -as_b; \n");
+    break;
+  default:
+    display_warning("grAlphaCombineExt : b_mode = %x", b_mode);
+    strcat(fragment_shader_alpha_combiner, "float a_b = 0.0; \n");
+  }
+
+  switch(c)
+  {
+  case GR_CMBX_ZERO:
+    strcat(fragment_shader_alpha_combiner, "float a_c = 0.0; \n");
+    break;
+  case GR_CMBX_TEXTURE_ALPHA:
+    strcat(fragment_shader_alpha_combiner, "float a_c = ctexture1.a; \n");
+    break;
+  case GR_CMBX_ALOCAL:
+    strcat(fragment_shader_alpha_combiner, "float a_c = as_b; \n");
+    break;
+  case GR_CMBX_AOTHER:
+    strcat(fragment_shader_alpha_combiner, "float a_c = as_a; \n");
+    break;
+  case GR_CMBX_B:
+    strcat(fragment_shader_alpha_combiner, "float a_c = as_b; \n");
+    break;
+  case GR_CMBX_CONSTANT_ALPHA:
+    strcat(fragment_shader_alpha_combiner, "float a_c = constant_color.a; \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    strcat(fragment_shader_alpha_combiner, "float a_c = gl_Color.a; \n");
+    break;
+  default:
+    display_warning("grAlphaCombineExt : c = %x", c);
+    strcat(fragment_shader_alpha_combiner, "float a_c = 0.0; \n");
+  }
+
+  if(c_invert)
+    strcat(fragment_shader_alpha_combiner, "a_c = 1.0 - a_c; \n");
+
+  switch(d)
+  {
+  case GR_CMBX_ZERO:
+    strcat(fragment_shader_alpha_combiner, "float a_d = 0.0; \n");
+    break;
+  case GR_CMBX_TEXTURE_ALPHA:
+    strcat(fragment_shader_alpha_combiner, "float a_d = ctexture1.a; \n");
+    break;
+  case GR_CMBX_ALOCAL:
+    strcat(fragment_shader_alpha_combiner, "float a_d = as_b; \n");
+    break;
+  case GR_CMBX_B:
+    strcat(fragment_shader_alpha_combiner, "float a_d = as_b; \n");
+    break;
+  default:
+    display_warning("grAlphaCombineExt : d = %x", d);
+    strcat(fragment_shader_alpha_combiner, "float a_d = 0.0; \n");
+  }
+
+  if(d_invert)
+    strcat(fragment_shader_alpha_combiner, "a_d = 1.0 - a_d; \n");
+
+  strcat(fragment_shader_alpha_combiner, "gl_FragColor.a = (a_a + a_b) * a_c + a_d; \n");
+
+  need_to_compile = 1;
+}
+
+FX_ENTRY void FX_CALL 
+grTexColorCombineExt(GrChipID_t       tmu,
+                     GrTCCUColor_t a, GrCombineMode_t a_mode,
+                     GrTCCUColor_t b, GrCombineMode_t b_mode,
+                     GrTCCUColor_t c, FxBool c_invert,
+                     GrTCCUColor_t d, FxBool d_invert,
+                     FxU32 shift, FxBool invert)
+{
+  int num_tex;
+  LOG("grTexColorCombineExt(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d)\r\n", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
+
+  if (invert) display_warning("grTexColorCombineExt : inverted result");
+  if (shift) display_warning("grTexColorCombineExt : shift = %d", shift);
+
+  if (tmu == GR_TMU0) num_tex = 1;
+  else num_tex = 0;
+
+  if(num_tex == 0)
+  {
+    texture0_combiner_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) | 
+      ((b & 0x1F) << 7) | ((b_mode & 3) << 12) |
+      ((c & 0x1F) << 14) | ((c_invert & 1) << 19) |
+      ((d & 0x1F) << 20) | ((d_invert & 1) << 25);
+    tex0_combiner_ext = 1;
+    strcpy(fragment_shader_texture0, "");
+  }
+  else
+  {
+    texture1_combiner_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) | 
+      ((b & 0x1F) << 7) | ((b_mode & 3) << 12) |
+      ((c & 0x1F) << 14) | ((c_invert & 1) << 19) |
+      ((d & 0x1F) << 20) | ((d_invert & 1) << 25);
+    tex1_combiner_ext = 1;
+    strcpy(fragment_shader_texture1, "");
+  }
+
+  switch(a)
+  {
+  case GR_CMBX_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = vec4(0.0); \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = vec4(gl_Color.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = vec4(gl_Color.a); \n");
+    break;
+  case GR_CMBX_ITRGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = gl_Color; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = gl_Color; \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = vec4(readtex1.a); \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_RGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = readtex1; \n");
+    break;
+  case GR_CMBX_OTHER_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = vec4(ctexture0.a); \n");
+    break;
+  case GR_CMBX_OTHER_TEXTURE_RGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = ctexture0; \n");
+    break;
+  case GR_CMBX_TMU_CCOLOR:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = ccolor0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = ccolor1; \n");
+    break;
+  case GR_CMBX_TMU_CALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = vec4(ccolor0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = vec4(ccolor1.a); \n");
+    break;
+  default:
+    display_warning("grTexColorCombineExt : a = %x", a);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_a = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_a = vec4(0.0); \n");
+  }
+
+  switch(a_mode)
+  {
+  case GR_FUNC_MODE_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_a = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_a = vec4(0.0); \n");
+    break;
+  case GR_FUNC_MODE_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_a = ctex0s_a; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_a = ctex1s_a; \n");
+    break;
+  case GR_FUNC_MODE_ONE_MINUS_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_a = vec4(1.0) - ctex0s_a; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_a = vec4(1.0) - ctex1s_a; \n");
+    break;
+  case GR_FUNC_MODE_NEGATIVE_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_a = -ctex0s_a; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_a = -ctex1s_a; \n");
+    break;
+  default:
+    display_warning("grTexColorCombineExt : a_mode = %x", a_mode);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_a = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_a = vec4(0.0); \n");
+  }
+
+  switch(b)
+  {
+  case GR_CMBX_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = vec4(0.0); \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = vec4(gl_Color.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = vec4(gl_Color.a); \n");
+    break;
+  case GR_CMBX_ITRGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = gl_Color; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = gl_Color; \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = vec4(readtex1.a); \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_RGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = readtex1; \n");
+    break;
+  case GR_CMBX_OTHER_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = vec4(ctexture0.a); \n");
+    break;
+  case GR_CMBX_OTHER_TEXTURE_RGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = ctexture0; \n");
+    break;
+  case GR_CMBX_TMU_CALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = vec4(ccolor0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = vec4(ccolor1.a); \n");
+    break;
+  case GR_CMBX_TMU_CCOLOR:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = ccolor0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = ccolor1; \n");
+    break;
+  default:
+    display_warning("grTexColorCombineExt : b = %x", b);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0s_b = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1s_b = vec4(0.0); \n");
+  }
+
+  switch(b_mode)
+  {
+  case GR_FUNC_MODE_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_b = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_b = vec4(0.0); \n");
+    break;
+  case GR_FUNC_MODE_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_b = ctex0s_b; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_b = ctex1s_b; \n");
+    break;
+  case GR_FUNC_MODE_ONE_MINUS_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_b = vec4(1.0) - ctex0s_b; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_b = vec4(1.0) - ctex1s_b; \n");
+    break;
+  case GR_FUNC_MODE_NEGATIVE_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_b = -ctex0s_b; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_b = -ctex1s_b; \n");
+    break;
+  default:
+    display_warning("grTexColorCombineExt : b_mode = %x", b_mode);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_b = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_b = vec4(0.0); \n");
+  }
+
+  switch(c)
+  {
+  case GR_CMBX_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = vec4(0.0); \n");
+    break;
+  case GR_CMBX_B:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = ctex0s_b; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = ctex1s_b; \n");
+    break;
+  case GR_CMBX_DETAIL_FACTOR:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = vec4(lambda); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = vec4(lambda); \n");
+    break;
+  case GR_CMBX_ITRGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = gl_Color; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = gl_Color; \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = vec4(gl_Color.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = vec4(gl_Color.a); \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = vec4(readtex1.a); \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_RGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = readtex0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = readtex1; \n");
+    break;
+  case GR_CMBX_OTHER_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = vec4(ctexture0.a); \n");
+    break;
+  case GR_CMBX_OTHER_TEXTURE_RGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = ctexture0; \n");
+    break;
+  case GR_CMBX_TMU_CALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = vec4(ccolor0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = vec4(ccolor1.a); \n");
+    break;
+  case GR_CMBX_TMU_CCOLOR:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = ccolor0; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = ccolor1; \n");
+    break;
+  default:
+    display_warning("grTexColorCombineExt : c = %x", c);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_c = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_c = vec4(0.0); \n");
+  }
+
+  if(c_invert)
+  {
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c = vec4(1.0) - ctex0_c; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c = vec4(1.0) - ctex1_c; \n");
+  }
+
+  switch(d)
+  {
+  case GR_CMBX_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_d = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_d = vec4(0.0); \n");
+    break;
+  case GR_CMBX_B:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_d = ctex0s_b; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_d = ctex1s_b; \n");
+    break;
+  case GR_CMBX_ITRGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_d = gl_Color; \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_d = gl_Color; \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_d = vec4(readtex0.a); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_d = vec4(readtex1.a); \n");
+    break;
+  default:
+    display_warning("grTexColorCombineExt : d = %x", d);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "vec4 ctex0_d = vec4(0.0); \n");
+    else
+      strcat(fragment_shader_texture1, "vec4 ctex1_d = vec4(0.0); \n");
+  }
+
+  if(d_invert)
+  {
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_d = vec4(1.0) - ctex0_d; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_d = vec4(1.0) - ctex1_d; \n");
+  }
+
+  if(num_tex == 0)
+    strcat(fragment_shader_texture0, "vec4 ctexture0 = (ctex0_a + ctex0_b) * ctex0_c + ctex0_d; \n");
+  else
+    strcat(fragment_shader_texture1, "vec4 ctexture1 = (ctex1_a + ctex1_b) * ctex1_c + ctex1_d; \n");
+  need_to_compile = 1;
+}
+
+FX_ENTRY void FX_CALL 
+grTexAlphaCombineExt(GrChipID_t       tmu,
+                     GrTACUColor_t a, GrCombineMode_t a_mode,
+                     GrTACUColor_t b, GrCombineMode_t b_mode,
+                     GrTACUColor_t c, FxBool c_invert,
+                     GrTACUColor_t d, FxBool d_invert,
+                     FxU32 shift, FxBool invert)
+{
+  int num_tex;
+  LOG("grTexAlphaCombineExt(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d)\r\n", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
+
+  if (invert) display_warning("grTexAlphaCombineExt : inverted result");
+  if (shift) display_warning("grTexAlphaCombineExt : shift = %d", shift);
+
+  if (tmu == GR_TMU0) num_tex = 1;
+  else num_tex = 0;
+
+  if(num_tex == 0)
+  {
+    texture0_combinera_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) | 
+      ((b & 0x1F) << 7) | ((b_mode & 3) << 12) |
+      ((c & 0x1F) << 14) | ((c_invert & 1) << 19) |
+      ((d & 0x1F) << 20) | ((d_invert & 1) << 25);
+  }
+  else
+  {
+    texture1_combinera_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) | 
+      ((b & 0x1F) << 7) | ((b_mode & 3) << 12) |
+      ((c & 0x1F) << 14) | ((c_invert & 1) << 19) |
+      ((d & 0x1F) << 20) | ((d_invert & 1) << 25);
+  }
+
+  switch(a)
+  {
+  case GR_CMBX_ITALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_a.a = gl_Color.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_a.a = gl_Color.a; \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_a.a = readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_a.a = readtex1.a; \n");
+    break;
+  case GR_CMBX_OTHER_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_a.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_a.a = ctexture0.a; \n");
+    break;
+  case GR_CMBX_TMU_CALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_a.a = ccolor0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_a.a = ccolor1.a; \n");
+    break;
+  default:
+    display_warning("grTexAlphaCombineExt : a = %x", a);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_a.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_a.a = 0.0; \n");
+  }
+
+  switch(a_mode)
+  {
+  case GR_FUNC_MODE_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_a.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_a.a = 0.0; \n");
+    break;
+  case GR_FUNC_MODE_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_a.a = ctex0s_a.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_a.a = ctex1s_a.a; \n");
+    break;
+  case GR_FUNC_MODE_ONE_MINUS_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_a.a = 1.0 - ctex0s_a.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_a.a = 1.0 - ctex1s_a.a; \n");
+    break;
+  case GR_FUNC_MODE_NEGATIVE_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_a.a = -ctex0s_a.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_a.a = -ctex1s_a.a; \n");
+    break;
+  default:
+    display_warning("grTexAlphaCombineExt : a_mode = %x", a_mode);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_a.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_a.a = 0.0; \n");
+  }
+
+  switch(b)
+  {
+  case GR_CMBX_ITALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_b.a = gl_Color.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_b.a = gl_Color.a; \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_b.a = readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_b.a = readtex1.a; \n");
+    break;
+  case GR_CMBX_OTHER_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_b.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_b.a = ctexture0.a; \n");
+    break;
+  case GR_CMBX_TMU_CALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_b.a = ccolor0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_b.a = ccolor1.a; \n");
+    break;
+  default:
+    display_warning("grTexAlphaCombineExt : b = %x", b);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0s_b.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1s_b.a = 0.0; \n");
+  }
+
+  switch(b_mode)
+  {
+  case GR_FUNC_MODE_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_b.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_b.a = 0.0; \n");
+    break;
+  case GR_FUNC_MODE_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_b.a = ctex0s_b.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_b.a = ctex1s_b.a; \n");
+    break;
+  case GR_FUNC_MODE_ONE_MINUS_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_b.a = 1.0 - ctex0s_b.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_b.a = 1.0 - ctex1s_b.a; \n");
+    break;
+  case GR_FUNC_MODE_NEGATIVE_X:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_b.a = -ctex0s_b.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_b.a = -ctex1s_b.a; \n");
+    break;
+  default:
+    display_warning("grTexAlphaCombineExt : b_mode = %x", b_mode);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_b.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_b.a = 0.0; \n");
+  }
+
+  switch(c)
+  {
+  case GR_CMBX_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c.a = 0.0; \n");
+    break;
+  case GR_CMBX_B:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c.a = ctex0s_b.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c.a = ctex1s_b.a; \n");
+    break;
+  case GR_CMBX_DETAIL_FACTOR:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c.a = lambda; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c.a = lambda; \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c.a = gl_Color.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c.a = gl_Color.a; \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c.a = readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c.a = readtex1.a; \n");
+    break;
+  case GR_CMBX_OTHER_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c.a = ctexture0.a; \n");
+    break;
+  case GR_CMBX_TMU_CALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c.a = ccolor0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c.a = ccolor1.a; \n");
+    break;
+  default:
+    display_warning("grTexAlphaCombineExt : c = %x", c);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c.a = 0.0; \n");
+  }
+
+  if(c_invert)
+  {
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_c.a = 1.0 - ctex0_c.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_c.a = 1.0 - ctex1_c.a; \n");
+  }
+
+  switch(d)
+  {
+  case GR_CMBX_ZERO:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_d.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_d.a = 0.0; \n");
+    break;
+  case GR_CMBX_B:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_d.a = ctex0s_b.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_d.a = ctex1s_b.a; \n");
+    break;
+  case GR_CMBX_ITALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_d.a = gl_Color.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_d.a = gl_Color.a; \n");
+    break;
+  case GR_CMBX_ITRGB:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_d.a = gl_Color.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_d.a = gl_Color.a; \n");
+    break;
+  case GR_CMBX_LOCAL_TEXTURE_ALPHA:
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_d.a = readtex0.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_d.a = readtex1.a; \n");
+    break;
+  default:
+    display_warning("grTexAlphaCombineExt : d = %x", d);
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_d.a = 0.0; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_d.a = 0.0; \n");
+  }
+
+  if(d_invert)
+  {
+    if(num_tex == 0)
+      strcat(fragment_shader_texture0, "ctex0_d.a = 1.0 - ctex0_d.a; \n");
+    else
+      strcat(fragment_shader_texture1, "ctex1_d.a = 1.0 - ctex1_d.a; \n");
+  }
+
+  if(num_tex == 0)
+    strcat(fragment_shader_texture0, "ctexture0.a = (ctex0_a.a + ctex0_b.a) * ctex0_c.a + ctex0_d.a; \n");
+  else
+    strcat(fragment_shader_texture1, "ctexture1.a = (ctex1_a.a + ctex1_b.a) * ctex1_c.a + ctex1_d.a; \n");
+
+  need_to_compile = 1;
+}
+
+FX_ENTRY void FX_CALL
+grConstantColorValueExt(GrChipID_t    tmu,
+                        GrColor_t     value)
+{
+  int num_tex;
+  LOG("grConstantColorValueExt(%d,%d)\r\n", tmu, value);
+
+  if (tmu == GR_TMU0) num_tex = 1;
+  else num_tex = 0;
+
+  switch(lfb_color_fmt)
+  {
+  case GR_COLORFORMAT_ARGB:
+    if(num_tex == 0)
+    {
+      ccolor0[3] = ((value >> 24) & 0xFF) / 255.0f;
+      ccolor0[0] = ((value >> 16) & 0xFF) / 255.0f;
+      ccolor0[1] = ((value >>  8) & 0xFF) / 255.0f;
+      ccolor0[2] = (value & 0xFF) / 255.0f;
+    }
+    else
+    {
+      ccolor1[3] = ((value >> 24) & 0xFF) / 255.0f;
+      ccolor1[0] = ((value >> 16) & 0xFF) / 255.0f;
+      ccolor1[1] = ((value >>  8) & 0xFF) / 255.0f;
+      ccolor1[2] = (value & 0xFF) / 255.0f;
+    }
+    break;
+  case GR_COLORFORMAT_RGBA:
+    if(num_tex == 0)
+    {
+      ccolor0[0] = ((value >> 24) & 0xFF) / 255.0f;
+      ccolor0[1] = ((value >> 16) & 0xFF) / 255.0f;
+      ccolor0[2] = ((value >>  8) & 0xFF) / 255.0f;
+      ccolor0[3] = (value & 0xFF) / 255.0f;
+    }
+    else
+    {
+      ccolor1[0] = ((value >> 24) & 0xFF) / 255.0f;
+      ccolor1[1] = ((value >> 16) & 0xFF) / 255.0f;
+      ccolor1[2] = ((value >>  8) & 0xFF) / 255.0f;
+      ccolor1[3] = (value & 0xFF) / 255.0f;
+    }
+    break;
+  default:
+    display_warning("grConstantColorValue: unknown color format : %x", lfb_color_fmt);
+  }
+
+  vbo_draw();
+  if(num_tex == 0)
+  {
+    ccolor0_location = glGetUniformLocation(program_object, "ccolor0");
+    glUniform4f(ccolor0_location, ccolor0[0], ccolor0[1], ccolor0[2], ccolor0[3]);
+  }
+  else
+  {
+    ccolor1_location = glGetUniformLocation(program_object, "ccolor1");
+    glUniform4f(ccolor1_location, ccolor1[0], ccolor1[1], ccolor1[2], ccolor1[3]);
+  }
+}
diff --git a/Source/Glitch64/OGLESgeometry.cpp b/Source/Glitch64/OGLESgeometry.cpp
new file mode 100644
index 000000000..b2208c682
--- /dev/null
+++ b/Source/Glitch64/OGLESgeometry.cpp
@@ -0,0 +1,643 @@
+/*
+* Glide64 - Glide video plugin for Nintendo 64 emulators.
+* Copyright (c) 2002  Dave2001
+* Copyright (c) 2003-2009  Sergey 'Gonetz' Lipski
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#include <stdio.h>
+#include <string.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif // _WIN32
+#include "glide.h"
+#include "glitchmain.h"
+#include "../Glide64/winlnxdefs.h"
+#include "../Glide64/rdp.h"
+
+#define Z_MAX (65536.0f)
+#define VERTEX_SIZE sizeof(VERTEX) //Size of vertex struct
+
+#ifdef ANDROID_EDITION
+#include "ae_imports.h"
+static float polygonOffsetFactor;
+static float polygonOffsetUnits;
+#endif
+
+static int xy_off;
+static int xy_en;
+static int z_en;
+static int z_off;
+static int q_off;
+static int q_en;
+static int pargb_off;
+static int pargb_en;
+static int st0_off;
+static int st0_en;
+static int st1_off;
+static int st1_en;
+static int fog_ext_off;
+static int fog_ext_en;
+
+int w_buffer_mode;
+int inverted_culling;
+int culling_mode;
+
+#define VERTEX_BUFFER_SIZE 1500 //Max amount of vertices to buffer, this seems large enough.
+static VERTEX vertex_buffer[VERTEX_BUFFER_SIZE];
+static int vertex_buffer_count = 0;
+static GLenum vertex_draw_mode;
+static bool vertex_buffer_enabled = false;
+
+void vbo_init()
+{
+  
+}
+
+void vbo_draw()
+{
+  if(vertex_buffer_count)
+  {
+    glDrawArrays(vertex_draw_mode,0,vertex_buffer_count);
+    vertex_buffer_count = 0;
+  }
+}
+
+//Buffer vertices instead of glDrawArrays(...)
+void vbo_buffer(GLenum mode,GLint first,GLsizei count,void* pointers)
+{
+  if((count != 3 && mode != GL_TRIANGLES) || vertex_buffer_count + count > VERTEX_BUFFER_SIZE)
+  {
+    vbo_draw();
+  }
+
+  memcpy(&vertex_buffer[vertex_buffer_count],pointers,count * VERTEX_SIZE);
+  vertex_buffer_count += count;
+
+  if(count == 3 || mode == GL_TRIANGLES)
+  {
+    vertex_draw_mode = GL_TRIANGLES;
+  }
+  else
+  {
+    vertex_draw_mode = mode;
+    vbo_draw(); //Triangle fans and strips can't be joined as easily, just draw them straight away.
+  }
+
+
+}
+
+void vbo_enable()
+{
+  if(vertex_buffer_enabled)
+    return;
+
+  vertex_buffer_enabled = true;
+  glEnableVertexAttribArray(POSITION_ATTR);
+  glVertexAttribPointer(POSITION_ATTR, 4, GL_FLOAT, false, VERTEX_SIZE, &vertex_buffer[0].x); //Position
+
+  glEnableVertexAttribArray(COLOUR_ATTR);
+  glVertexAttribPointer(COLOUR_ATTR, 4, GL_UNSIGNED_BYTE, true, VERTEX_SIZE, &vertex_buffer[0].b); //Colour
+
+  glEnableVertexAttribArray(TEXCOORD_0_ATTR);
+  glVertexAttribPointer(TEXCOORD_0_ATTR, 2, GL_FLOAT, false, VERTEX_SIZE, &vertex_buffer[0].coord[2]); //Tex0
+
+  glEnableVertexAttribArray(TEXCOORD_1_ATTR);
+  glVertexAttribPointer(TEXCOORD_1_ATTR, 2, GL_FLOAT, false, VERTEX_SIZE, &vertex_buffer[0].coord[0]); //Tex1
+
+  glEnableVertexAttribArray(FOG_ATTR);
+  glVertexAttribPointer(FOG_ATTR, 1, GL_FLOAT, false, VERTEX_SIZE, &vertex_buffer[0].f); //Fog
+}
+
+void vbo_disable()
+{
+  vbo_draw();
+  vertex_buffer_enabled = false;
+}
+
+
+inline float ZCALC(const float & z, const float & q) {
+  float res = z_en ? ((z) / Z_MAX) / (q) : 1.0f;
+  return res;
+}
+
+/*
+#define zclamp (1.0f-1.0f/zscale)
+static inline void zclamp_glVertex4f(float a, float b, float c, float d)
+{
+  if (c<zclamp) c = zclamp;
+  glVertex4f(a,b,c,d);
+}
+#define glVertex4f(a,b,c,d) zclamp_glVertex4f(a,b,c,d)
+*/
+
+
+static inline float ytex(int tmu, float y) {
+  if (invtex[tmu])
+    return invtex[tmu] - y;
+  else
+    return y;
+}
+
+void init_geometry()
+{
+  xy_en = q_en = pargb_en = st0_en = st1_en = z_en = 0;
+  w_buffer_mode = 0;
+  inverted_culling = 0;
+
+  glDisable(GL_CULL_FACE);
+  glDisable(GL_DEPTH_TEST);
+
+  vbo_init();
+}
+
+FX_ENTRY void FX_CALL
+grCoordinateSpace( GrCoordinateSpaceMode_t mode )
+{
+  LOG("grCoordinateSpace(%d)\r\n", mode);
+  switch(mode)
+  {
+  case GR_WINDOW_COORDS:
+    break;
+  default:
+    display_warning("unknwown coordinate space : %x", mode);
+  }
+}
+
+FX_ENTRY void FX_CALL
+grVertexLayout(FxU32 param, FxI32 offset, FxU32 mode)
+{
+  LOG("grVertexLayout(%d,%d,%d)\r\n", param, offset, mode);
+  switch(param)
+  {
+  case GR_PARAM_XY:
+    xy_en = mode;
+    xy_off = offset;
+    break;
+  case GR_PARAM_Z:
+    z_en = mode;
+    z_off = offset;
+    break;
+  case GR_PARAM_Q:
+    q_en = mode;
+    q_off = offset;
+    break;
+  case GR_PARAM_FOG_EXT:
+    fog_ext_en = mode;
+    fog_ext_off = offset;
+    break;
+  case GR_PARAM_PARGB:
+    pargb_en = mode;
+    pargb_off = offset;
+    break;
+  case GR_PARAM_ST0:
+    st0_en = mode;
+    st0_off = offset;
+    break;
+  case GR_PARAM_ST1:
+    st1_en = mode;
+    st1_off = offset;
+    break;
+  default:
+    display_warning("unknown grVertexLayout parameter : %x", param);
+  }
+}
+
+FX_ENTRY void FX_CALL
+grCullMode( GrCullMode_t mode )
+{
+  LOG("grCullMode(%d)\r\n", mode);
+  static int oldmode = -1, oldinv = -1;
+  culling_mode = mode;
+  if (inverted_culling == oldinv && oldmode == mode)
+    return;
+  oldmode = mode;
+  oldinv = inverted_culling;
+  switch(mode)
+  {
+  case GR_CULL_DISABLE:
+    glDisable(GL_CULL_FACE);
+    break;
+  case GR_CULL_NEGATIVE:
+    if (!inverted_culling)
+      glCullFace(GL_FRONT);
+    else
+      glCullFace(GL_BACK);
+    glEnable(GL_CULL_FACE);
+    break;
+  case GR_CULL_POSITIVE:
+    if (!inverted_culling)
+      glCullFace(GL_BACK);
+    else
+      glCullFace(GL_FRONT);
+    glEnable(GL_CULL_FACE);
+    break;
+  default:
+    display_warning("unknown cull mode : %x", mode);
+  }
+}
+
+// Depth buffer
+
+FX_ENTRY void FX_CALL
+grDepthBufferMode( GrDepthBufferMode_t mode )
+{
+  LOG("grDepthBufferMode(%d)\r\n", mode);
+  switch(mode)
+  {
+  case GR_DEPTHBUFFER_DISABLE:
+    glDisable(GL_DEPTH_TEST);
+    w_buffer_mode = 0;
+    return;
+  case GR_DEPTHBUFFER_WBUFFER:
+  case GR_DEPTHBUFFER_WBUFFER_COMPARE_TO_BIAS:
+    glEnable(GL_DEPTH_TEST);
+    w_buffer_mode = 1;
+    break;
+  case GR_DEPTHBUFFER_ZBUFFER:
+  case GR_DEPTHBUFFER_ZBUFFER_COMPARE_TO_BIAS:
+    glEnable(GL_DEPTH_TEST);
+    w_buffer_mode = 0;
+    break;
+  default:
+    display_warning("unknown depth buffer mode : %x", mode);
+  }
+}
+
+FX_ENTRY void FX_CALL
+grDepthBufferFunction( GrCmpFnc_t function )
+{
+  LOG("grDepthBufferFunction(%d)\r\n", function);
+  switch(function)
+  {
+  case GR_CMP_GEQUAL:
+    if (w_buffer_mode)
+      glDepthFunc(GL_LEQUAL);
+    else
+      glDepthFunc(GL_GEQUAL);
+    break;
+  case GR_CMP_LEQUAL:
+    if (w_buffer_mode)
+      glDepthFunc(GL_GEQUAL);
+    else
+      glDepthFunc(GL_LEQUAL);
+    break;
+  case GR_CMP_LESS:
+    if (w_buffer_mode)
+      glDepthFunc(GL_GREATER);
+    else
+      glDepthFunc(GL_LESS);
+    break;
+  case GR_CMP_ALWAYS:
+    glDepthFunc(GL_ALWAYS);
+    break;
+  case GR_CMP_EQUAL:
+    glDepthFunc(GL_EQUAL);
+    break;
+  case GR_CMP_GREATER:
+    if (w_buffer_mode)
+      glDepthFunc(GL_LESS);
+    else
+      glDepthFunc(GL_GREATER);
+    break;
+  case GR_CMP_NEVER:
+    glDepthFunc(GL_NEVER);
+    break;
+  case GR_CMP_NOTEQUAL:
+    glDepthFunc(GL_NOTEQUAL);
+    break;
+
+  default:
+    display_warning("unknown depth buffer function : %x", function);
+  }
+}
+
+FX_ENTRY void FX_CALL
+grDepthMask( FxBool mask )
+{
+  LOG("grDepthMask(%d)\r\n", mask);
+  glDepthMask(mask);
+}
+float biasFactor = 0;
+#if 0
+void FindBestDepthBias()
+{
+#ifdef ANDROID_EDITION
+  int hardwareType = Android_JNI_GetHardwareType();
+  Android_JNI_GetPolygonOffset(hardwareType, 1, &polygonOffsetFactor, &polygonOffsetUnits);
+#else
+  float f, bestz = 0.25f;
+  int x;
+  if (biasFactor) return;
+  biasFactor = 64.0f; // default value
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+  glEnable(GL_DEPTH_TEST);
+  glDepthFunc(GL_ALWAYS);
+  glEnable(GL_POLYGON_OFFSET_FILL);
+  glDrawBuffer(GL_BACK);
+  glReadBuffer(GL_BACK);
+  glDisable(GL_BLEND);
+  glDisable(GL_ALPHA_TEST);
+  glColor4ub(255,255,255,255);
+  glDepthMask(GL_TRUE);
+  for (x=0, f=1.0f; f<=65536.0f; x+=4, f*=2.0f) {
+    float z;
+    glPolygonOffset(0, f);
+    glBegin(GL_TRIANGLE_STRIP);
+    glVertex3f(float(x+4 - widtho)/(width/2), float(0 - heighto)/(height/2), 0.5);
+    glVertex3f(float(x - widtho)/(width/2), float(0 - heighto)/(height/2), 0.5);
+    glVertex3f(float(x+4 - widtho)/(width/2), float(4 - heighto)/(height/2), 0.5);
+    glVertex3f(float(x - widtho)/(width/2), float(4 - heighto)/(height/2), 0.5);
+    glEnd();
+    glReadPixels(x+2, 2+viewport_offset, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
+    z -= 0.75f + 8e-6f;
+    if (z<0.0f) z = -z;
+    if (z > 0.01f) continue;
+    if (z < bestz) {
+      bestz = z;
+      biasFactor = f;
+    }
+    //printf("f %g z %g\n", f, z);
+  }
+  //printf(" --> bias factor %g\n", biasFactor);
+  glPopAttrib();
+#endif
+}
+#endif
+
+FX_ENTRY void FX_CALL
+grDepthBiasLevel( FxI32 level )
+{
+  LOG("grDepthBiasLevel(%d)\r\n", level);
+  if (level)
+  {
+    #ifdef ANDROID_EDITION
+    glPolygonOffset(polygonOffsetFactor, polygonOffsetUnits);
+    #else
+    if(w_buffer_mode)
+      glPolygonOffset(1.0f, -(float)level*zscale/255.0f);
+    else
+      glPolygonOffset(0, (float)level*biasFactor);
+    #endif
+    glEnable(GL_POLYGON_OFFSET_FILL);
+  }
+  else
+  {
+    glPolygonOffset(0,0);
+    glDisable(GL_POLYGON_OFFSET_FILL);
+  }
+}
+
+// draw
+
+FX_ENTRY void FX_CALL
+grDrawTriangle( const void *a, const void *b, const void *c )
+{
+  LOG("grDrawTriangle()\r\n\t");
+
+  if(nvidia_viewport_hack && !render_to_texture)
+  {
+    glViewport(0, viewport_offset, viewport_width, viewport_height);
+    nvidia_viewport_hack = 0;
+  }
+
+  reloadTexture();
+
+  if(need_to_compile) compile_shader();
+
+  if(vertex_buffer_count + 3 > VERTEX_BUFFER_SIZE)
+  {
+    vbo_draw();
+  }
+  vertex_draw_mode = GL_TRIANGLES;
+  memcpy(&vertex_buffer[vertex_buffer_count],a,VERTEX_SIZE);
+  memcpy(&vertex_buffer[vertex_buffer_count+1],b,VERTEX_SIZE);
+  memcpy(&vertex_buffer[vertex_buffer_count+2],c,VERTEX_SIZE);
+  vertex_buffer_count += 3;
+}
+
+FX_ENTRY void FX_CALL
+grDrawPoint( const void *pt )
+{
+/*
+  float *x = (float*)pt + xy_off/sizeof(float);
+  float *y = (float*)pt + xy_off/sizeof(float) + 1;
+  float *z = (float*)pt + z_off/sizeof(float);
+  float *q = (float*)pt + q_off/sizeof(float);
+  unsigned char *pargb = (unsigned char*)pt + pargb_off;
+  float *s0 = (float*)pt + st0_off/sizeof(float);
+  float *t0 = (float*)pt + st0_off/sizeof(float) + 1;
+  float *s1 = (float*)pt + st1_off/sizeof(float);
+  float *t1 = (float*)pt + st1_off/sizeof(float) + 1;
+  float *fog = (float*)pt + fog_ext_off/sizeof(float);
+  LOG("grDrawPoint()\r\n");
+
+  if(nvidia_viewport_hack && !render_to_texture)
+  {
+    glViewport(0, viewport_offset, viewport_width, viewport_height);
+    nvidia_viewport_hack = 0;
+  }
+
+  reloadTexture();
+
+  if(need_to_compile) compile_shader();
+
+  glBegin(GL_POINTS);
+
+  if (nbTextureUnits > 2)
+  {
+    if (st0_en)
+      glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *s0 / *q / (float)tex1_width,
+      ytex(0, *t0 / *q / (float)tex1_height));
+    if (st1_en)
+      glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *s1 / *q / (float)tex0_width,
+      ytex(1, *t1 / *q / (float)tex0_height));
+  }
+  else
+  {
+    if (st0_en)
+      glTexCoord2f(*s0 / *q / (float)tex0_width,
+      ytex(0, *t0 / *q / (float)tex0_height));
+  }
+  if (pargb_en)
+    glColor4f(pargb[2]/255.0f, pargb[1]/255.0f, pargb[0]/255.0f, pargb[3]/255.0f);
+  if (fog_enabled && fog_coord_support)
+  {
+    if(!fog_ext_en || fog_enabled != 2)
+      glSecondaryColor3f((1.0f / *q) / 255.0f, 0.0f, 0.0f);
+    else
+      glSecondaryColor3f((1.0f / *fog) / 255.0f, 0.0f, 0.0f);
+  }
+  glVertex4f((*x - (float)widtho) / (float)(width/2) / *q,
+    -(*y - (float)heighto) / (float)(height/2) / *q, ZCALC(*z ,*q), 1.0f / *q);
+
+  glEnd();
+*/
+}
+
+FX_ENTRY void FX_CALL
+grDrawLine( const void *a, const void *b )
+{
+/*
+  float *a_x = (float*)a + xy_off/sizeof(float);
+  float *a_y = (float*)a + xy_off/sizeof(float) + 1;
+  float *a_z = (float*)a + z_off/sizeof(float);
+  float *a_q = (float*)a + q_off/sizeof(float);
+  unsigned char *a_pargb = (unsigned char*)a + pargb_off;
+  float *a_s0 = (float*)a + st0_off/sizeof(float);
+  float *a_t0 = (float*)a + st0_off/sizeof(float) + 1;
+  float *a_s1 = (float*)a + st1_off/sizeof(float);
+  float *a_t1 = (float*)a + st1_off/sizeof(float) + 1;
+  float *a_fog = (float*)a + fog_ext_off/sizeof(float);
+
+  float *b_x = (float*)b + xy_off/sizeof(float);
+  float *b_y = (float*)b + xy_off/sizeof(float) + 1;
+  float *b_z = (float*)b + z_off/sizeof(float);
+  float *b_q = (float*)b + q_off/sizeof(float);
+  unsigned char *b_pargb = (unsigned char*)b + pargb_off;
+  float *b_s0 = (float*)b + st0_off/sizeof(float);
+  float *b_t0 = (float*)b + st0_off/sizeof(float) + 1;
+  float *b_s1 = (float*)b + st1_off/sizeof(float);
+  float *b_t1 = (float*)b + st1_off/sizeof(float) + 1;
+  float *b_fog = (float*)b + fog_ext_off/sizeof(float);
+  LOG("grDrawLine()\r\n");
+
+  if(nvidia_viewport_hack && !render_to_texture)
+  {
+    glViewport(0, viewport_offset, viewport_width, viewport_height);
+    nvidia_viewport_hack = 0;
+  }
+
+  reloadTexture();
+
+  if(need_to_compile) compile_shader();
+
+  glBegin(GL_LINES);
+
+  if (nbTextureUnits > 2)
+  {
+    if (st0_en)
+      glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *a_s0 / *a_q / (float)tex1_width, ytex(0, *a_t0 / *a_q / (float)tex1_height));
+    if (st1_en)
+      glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *a_s1 / *a_q / (float)tex0_width, ytex(1, *a_t1 / *a_q / (float)tex0_height));
+  }
+  else
+  {
+    if (st0_en)
+      glTexCoord2f(*a_s0 / *a_q / (float)tex0_width, ytex(0, *a_t0 / *a_q / (float)tex0_height));
+  }
+  if (pargb_en)
+    glColor4f(a_pargb[2]/255.0f, a_pargb[1]/255.0f, a_pargb[0]/255.0f, a_pargb[3]/255.0f);
+  if (fog_enabled && fog_coord_support)
+  {
+    if(!fog_ext_en || fog_enabled != 2)
+      glSecondaryColor3f((1.0f / *a_q) / 255.0f, 0.0f, 0.0f);
+    else
+      glSecondaryColor3f((1.0f / *a_fog) / 255.0f, 0.0f, 0.0f);
+  }
+  glVertex4f((*a_x - (float)widtho) / (float)(width/2) / *a_q,
+    -(*a_y - (float)heighto) / (float)(height/2) / *a_q, ZCALC(*a_z, *a_q), 1.0f / *a_q);
+
+  if (nbTextureUnits > 2)
+  {
+    if (st0_en)
+      glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *b_s0 / *b_q / (float)tex1_width,
+      ytex(0, *b_t0 / *b_q / (float)tex1_height));
+    if (st1_en)
+      glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *b_s1 / *b_q / (float)tex0_width,
+      ytex(1, *b_t1 / *b_q / (float)tex0_height));
+  }
+  else
+  {
+    if (st0_en)
+      glTexCoord2f(*b_s0 / *b_q / (float)tex0_width,
+      ytex(0, *b_t0 / *b_q / (float)tex0_height));
+  }
+  if (pargb_en)
+    glColor4f(b_pargb[2]/255.0f, b_pargb[1]/255.0f, b_pargb[0]/255.0f, b_pargb[3]/255.0f);
+  if (fog_enabled && fog_coord_support)
+  {
+    if(!fog_ext_en || fog_enabled != 2)
+      glSecondaryColor3f((1.0f / *b_q) / 255.0f, 0.0f, 0.0f);
+    else
+      glSecondaryColor3f((1.0f / *b_fog) / 255.0f, 0.0f, 0.0f);
+  }
+  glVertex4f((*b_x - (float)widtho) / (float)(width/2) / *b_q,
+    -(*b_y - (float)heighto) / (float)(height/2) / *b_q, ZCALC(*b_z, *b_q), 1.0f / *b_q);
+
+  glEnd();
+*/
+}
+
+FX_ENTRY void FX_CALL
+grDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
+{
+  void **pointers = (void**)pointers2;
+  LOG("grDrawVertexArray(%d,%d)\r\n", mode, Count);
+
+  if(nvidia_viewport_hack && !render_to_texture)
+  {
+    glViewport(0, viewport_offset, viewport_width, viewport_height);
+    nvidia_viewport_hack = 0;
+  }
+
+  reloadTexture();
+
+  if(need_to_compile) compile_shader();
+
+  if(mode != GR_TRIANGLE_FAN)
+  {
+    display_warning("grDrawVertexArray : unknown mode : %x", mode);
+  }
+
+  vbo_enable();
+  vbo_buffer(GL_TRIANGLE_FAN,0,Count,pointers[0]);
+}
+
+FX_ENTRY void FX_CALL
+grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride)
+{
+  LOG("grDrawVertexArrayContiguous(%d,%d,%d)\r\n", mode, Count, stride);
+
+  if(nvidia_viewport_hack && !render_to_texture)
+  {
+    glViewport(0, viewport_offset, viewport_width, viewport_height);
+    nvidia_viewport_hack = 0;
+  }
+
+  if(stride != 156)
+  {
+	  LOGINFO("Incompatible stride\n");
+  }
+
+  reloadTexture();
+
+  if(need_to_compile) compile_shader();
+
+  vbo_enable();
+
+  switch(mode)
+  {
+  case GR_TRIANGLE_STRIP:
+    vbo_buffer(GL_TRIANGLE_STRIP,0,Count,pointers);
+    break;
+  case GR_TRIANGLE_FAN:
+    vbo_buffer(GL_TRIANGLE_FAN,0,Count,pointers);
+    break;
+  default:
+    display_warning("grDrawVertexArrayContiguous : unknown mode : %x", mode);
+  }
+}
diff --git a/Source/Glitch64/OGLESglitchmain.cpp b/Source/Glitch64/OGLESglitchmain.cpp
new file mode 100644
index 000000000..d634af00b
--- /dev/null
+++ b/Source/Glitch64/OGLESglitchmain.cpp
@@ -0,0 +1,2604 @@
+/*
+* Glide64 - Glide video plugin for Nintendo 64 emulators.
+* Copyright (c) 2002  Dave2001
+* Copyright (c) 2003-2009  Sergey 'Gonetz' Lipski
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#define SAVE_CBUFFER
+
+#ifdef _WIN32
+#include <windows.h>
+#include <commctrl.h>
+#else
+#include <stdint.h>
+#include <stdarg.h>
+#include <string.h>
+#include <SDL.h>
+#endif // _WIN32
+#include <stdlib.h>
+#include <stdio.h>
+#include <iostream>
+#include <fstream>
+#include <math.h>
+#include "glide.h"
+#include "g3ext.h"
+#include "glitchmain.h"
+#include "m64p.h"
+
+#include <SDL_opengles.h>
+//#include <GL/glext.h>
+
+#define OPENGL_CHECK_ERRORS { const GLenum errcode = glGetError(); if (errcode != GL_NO_ERROR) LOG("OpenGL Error code %i in '%s' line %i\n", errcode, __FILE__, __LINE__-1); }
+
+#ifdef VPDEBUG
+#include <IL/il.h>
+#endif
+
+extern void (*renderCallback)(int);
+
+wrapper_config config = {0, 0, 0, 0};
+int screen_width, screen_height;
+
+/*
+static inline void opt_glCopyTexImage2D( GLenum target,
+                                        GLint level,
+                                        GLenum internalFormat,
+                                        GLint x,
+                                        GLint y,
+                                        GLsizei width,
+                                        GLsizei height,
+                                        GLint border )
+
+{
+  int w, h, fmt;
+  glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w);
+  glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h);
+  glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &fmt);
+  //printf("copyteximage %dx%d fmt %x oldfmt %x\n", width, height, internalFormat, fmt);
+  if (w == (int) width && h == (int) height && fmt == (int) internalFormat) {
+    if (x+width >= screen_width) {
+      width = screen_width - x;
+      //printf("resizing w --> %d\n", width);
+    }
+    if (y+height >= screen_height+viewport_offset) {
+      height = screen_height+viewport_offset - y;
+      //printf("resizing h --> %d\n", height);
+    }
+    glCopyTexSubImage2D(target, level, 0, 0, x, y, width, height);
+  } else {
+    //printf("copyteximage %dx%d fmt %x old %dx%d oldfmt %x\n", width, height, internalFormat, w, h, fmt);
+    //       glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width, height, 0, internalFormat, GL_UNSIGNED_BYTE, 0);
+    //       glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &fmt);
+    //       printf("--> %dx%d newfmt %x\n", width, height, fmt);
+    glCopyTexImage2D(target, level, internalFormat, x, y, width, height, border);
+  }
+}
+#define glCopyTexImage2D opt_glCopyTexImage2D
+*/
+
+
+#ifdef _WIN32
+PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
+PFNGLBLENDFUNCSEPARATEEXTPROC glBlendFuncSeparateEXT;
+PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;
+PFNGLFOGCOORDFPROC glFogCoordfEXT;
+
+PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB;
+
+PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
+PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
+PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
+PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT = NULL;
+PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT = NULL;
+PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT = NULL;
+PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT = NULL;
+PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT = NULL;
+PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
+PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
+
+PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
+PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
+PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
+PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
+PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
+PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
+PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
+PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB;
+PFNGLUNIFORM1IARBPROC glUniform1iARB;
+PFNGLUNIFORM4IARBPROC glUniform4iARB;
+PFNGLUNIFORM4FARBPROC glUniform4fARB;
+PFNGLUNIFORM1FARBPROC glUniform1fARB;
+PFNGLDELETEOBJECTARBPROC glDeleteObjectARB;
+PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
+PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
+PFNGLSECONDARYCOLOR3FPROC glSecondaryColor3f;
+
+// FXT1,DXT1,DXT5 support - Hiroshi Morii <koolsmoky(at)users.sourceforge.net>
+// NOTE: Glide64 + GlideHQ use the following formats
+// GL_COMPRESSED_RGB_S3TC_DXT1_EXT
+// GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
+// GL_COMPRESSED_RGB_FXT1_3DFX
+// GL_COMPRESSED_RGBA_FXT1_3DFX
+PFNGLCOMPRESSEDTEXIMAGE2DPROC glCompressedTexImage2DARB;
+#endif // _WIN32
+
+
+
+typedef struct
+{
+  unsigned int address;
+  int width;
+  int height;
+  unsigned int fbid;
+  unsigned int zbid;
+  unsigned int texid;
+  int buff_clear;
+} fb;
+
+int nbTextureUnits;
+int nbAuxBuffers, current_buffer;
+int width, widtho, heighto, height;
+int saved_width, saved_height;
+int blend_func_separate_support;
+int npot_support;
+int fog_coord_support;
+int render_to_texture = 0;
+int texture_unit;
+int use_fbo;
+int buffer_cleared;
+// ZIGGY
+// to allocate a new static texture name, take the value (free_texture++)
+int free_texture;
+int default_texture; // the infamous "32*1024*1024" is now configurable
+int current_texture;
+int depth_texture, color_texture;
+int glsl_support = 1;
+int viewport_width, viewport_height, viewport_offset = 0, nvidia_viewport_hack = 0;
+int save_w, save_h;
+int lfb_color_fmt;
+float invtex[2];
+//Gonetz
+int UMAmode = 0; //support for VSA-100 UMA mode;
+
+#ifdef _WIN32
+static HDC hDC = NULL;
+static HGLRC hGLRC = NULL;
+static HWND hToolBar = NULL;
+static HWND hwnd_win = NULL;
+static unsigned long windowedExStyle, windowedStyle;
+#endif // _WIN32
+static unsigned long fullscreen;
+#ifdef _WIN32
+static RECT windowedRect;
+static HMENU windowedMenu;
+#endif // _WIN32
+
+static int savedWidtho, savedHeighto;
+static int savedWidth, savedHeight;
+unsigned int pBufferAddress;
+static int pBufferFmt;
+static int pBufferWidth, pBufferHeight;
+static fb fbs[100];
+static int nb_fb = 0;
+static unsigned int curBufferAddr = 0;
+
+struct TMU_USAGE { int min, max; } tmu_usage[2] = { {0xfffffff, 0}, {0xfffffff, 0} };
+
+struct texbuf_t {
+  FxU32 start, end;
+  int fmt;
+};
+#define NB_TEXBUFS 128 // MUST be a power of two
+static texbuf_t texbufs[NB_TEXBUFS];
+static int texbuf_i;
+
+unsigned short frameBuffer[2048*2048];
+unsigned short depthBuffer[2048*2048];
+
+//#define VOODOO1
+
+void display_warning(const char *text, ...)
+{
+  static int first_message = 100;
+  if (first_message)
+  {
+    char buf[4096];
+
+    va_list ap;
+
+    va_start(ap, text);
+    vsprintf(buf, text, ap);
+    va_end(ap);
+    first_message--;
+    LOGINFO(buf);
+  }
+}
+
+#ifdef _WIN32
+void display_error()
+{
+  LPVOID lpMsgBuf;
+  if (!FormatMessage(
+    FORMAT_MESSAGE_ALLOCATE_BUFFER |
+    FORMAT_MESSAGE_FROM_SYSTEM |
+    FORMAT_MESSAGE_IGNORE_INSERTS,
+    NULL,
+    GetLastError(),
+    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+    (LPTSTR) &lpMsgBuf,
+    0,
+    NULL ))
+  {
+    // Handle the error.
+    return;
+  }
+  // Process any inserts in lpMsgBuf.
+  // ...
+  // Display the string.
+  MessageBox( NULL, (LPCTSTR)lpMsgBuf, "Error", MB_OK | MB_ICONINFORMATION );
+
+  // Free the buffer.
+  LocalFree( lpMsgBuf );
+}
+#endif // _WIN32
+
+#ifdef LOGGING
+char out_buf[256];
+bool log_open = false;
+std::ofstream log_file;
+
+void OPEN_LOG()
+{
+  if (!log_open)
+  {
+    log_file.open ("wrapper_log.txt", std::ios_base::out|std::ios_base::app);
+    log_open = true;
+  }
+}
+
+void CLOSE_LOG()
+{
+  if (log_open)
+  {
+    log_file.close();
+    log_open = false;
+  }
+}
+
+void LOG(const char *text, ...)
+{
+#ifdef VPDEBUG
+  if (!dumping) return;
+#endif
+	if (!log_open)
+    return;
+	va_list ap;
+	va_start(ap, text);
+	vsprintf(out_buf, text, ap);
+  log_file << out_buf;
+  log_file.flush();
+	va_end(ap);
+}
+
+class LogManager {
+public:
+	LogManager() {
+		OPEN_LOG();
+	}
+	~LogManager() {
+		CLOSE_LOG();
+	}
+};
+
+LogManager logManager;
+
+#else // LOGGING
+#define OPEN_LOG()
+#define CLOSE_LOG()
+//#define LOG
+#endif // LOGGING
+
+FX_ENTRY void FX_CALL
+grSstOrigin(GrOriginLocation_t  origin)
+{
+  LOG("grSstOrigin(%d)\r\n", origin);
+  if (origin != GR_ORIGIN_UPPER_LEFT)
+    display_warning("grSstOrigin : %x", origin);
+}
+
+FX_ENTRY void FX_CALL
+grClipWindow( FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy )
+{
+  LOG("grClipWindow(%d,%d,%d,%d)\r\n", minx, miny, maxx, maxy);
+
+  if (use_fbo && render_to_texture) {
+    if (int(minx) < 0) minx = 0;
+    if (int(miny) < 0) miny = 0;
+    if (maxx < minx) maxx = minx;
+    if (maxy < miny) maxy = miny;
+    glScissor(minx, miny, maxx - minx, maxy - miny);
+    glEnable(GL_SCISSOR_TEST);
+    return;
+  }
+
+  if (!use_fbo) {
+    int th = height;
+    if (th > screen_height)
+      th = screen_height;
+    maxy = th - maxy;
+    miny = th - miny;
+    FxU32 tmp = maxy; maxy = miny; miny = tmp;
+    if (maxx > (FxU32) width) maxx = width;
+    if (maxy > (FxU32) height) maxy = height;
+    if (int(minx) < 0) minx = 0;
+    if (int(miny) < 0) miny = 0;
+    if (maxx < minx) maxx = minx;
+    if (maxy < miny) maxy = miny;
+    glScissor(minx, miny+viewport_offset, maxx - minx, maxy - miny);
+    //printf("gl scissor %d %d %d %d\n", minx, miny, maxx, maxy);
+  } else {
+    glScissor(minx, (viewport_offset)+height-maxy, maxx - minx, maxy - miny);
+  }
+  glEnable(GL_SCISSOR_TEST);
+}
+
+FX_ENTRY void FX_CALL
+grColorMask( FxBool rgb, FxBool a )
+{
+  LOG("grColorMask(%d, %d)\r\n", rgb, a);
+  glColorMask(rgb, rgb, rgb, a);
+}
+
+FX_ENTRY void FX_CALL
+grGlideInit( void )
+{
+  LOG("grGlideInit()\r\n");
+}
+
+FX_ENTRY void FX_CALL
+grSstSelect( int which_sst )
+{
+  LOG("grSstSelect(%d)\r\n", which_sst);
+}
+
+int isExtensionSupported(const char *extension)
+{
+  return 0;
+  const GLubyte *extensions = NULL;
+  const GLubyte *start;
+  GLubyte *where, *terminator;
+
+  where = (GLubyte *)strchr(extension, ' ');
+  if (where || *extension == '\0')
+    return 0;
+
+  extensions = glGetString(GL_EXTENSIONS);
+
+  start = extensions;
+  for (;;)
+  {
+    where = (GLubyte *) strstr((const char *) start, extension);
+    if (!where)
+      break;
+
+    terminator = where + strlen(extension);
+    if (where == start || *(where - 1) == ' ')
+      if (*terminator == ' ' || *terminator == '\0')
+        return 1;
+
+    start = terminator;
+  }
+
+  return 0;
+}
+
+#ifdef _WIN32
+int isWglExtensionSupported(const char *extension)
+{
+  const GLubyte *extensions = NULL;
+  const GLubyte *start;
+  GLubyte *where, *terminator;
+
+  where = (GLubyte *)strchr(extension, ' ');
+  if (where || *extension == '\0')
+    return 0;
+
+  extensions = (GLubyte*)wglGetExtensionsStringARB(wglGetCurrentDC());
+
+  start = extensions;
+  for (;;)
+  {
+    where = (GLubyte *) strstr((const char *) start, extension);
+    if (!where)
+      break;
+
+    terminator = where + strlen(extension);
+    if (where == start || *(where - 1) == ' ')
+      if (*terminator == ' ' || *terminator == '\0')
+        return 1;
+
+    start = terminator;
+  }
+
+  return 0;
+}
+#endif // _WIN32
+
+#define GrPixelFormat_t int
+
+FX_ENTRY GrContext_t FX_CALL
+grSstWinOpenExt(
+                HWND                 hWnd,
+                GrScreenResolution_t screen_resolution,
+                GrScreenRefresh_t    refresh_rate,
+                GrColorFormat_t      color_format,
+                GrOriginLocation_t   origin_location,
+                GrPixelFormat_t      pixelformat,
+                int                  nColBuffers,
+                int                  nAuxBuffers)
+{
+  LOG("grSstWinOpenExt(%d, %d, %d, %d, %d, %d %d)\r\n", hWnd, screen_resolution, refresh_rate, color_format, origin_location, nColBuffers, nAuxBuffers);
+  return grSstWinOpen(hWnd, screen_resolution, refresh_rate, color_format,
+    origin_location, nColBuffers, nAuxBuffers);
+}
+
+#ifdef WIN32
+# include <fcntl.h>
+# ifndef ATTACH_PARENT_PROCESS
+#  define ATTACH_PARENT_PROCESS ((FxU32)-1)
+# endif
+#endif
+
+FX_ENTRY GrContext_t FX_CALL
+grSstWinOpen(
+             HWND                 hWnd,
+             GrScreenResolution_t screen_resolution,
+             GrScreenRefresh_t    refresh_rate,
+             GrColorFormat_t      color_format,
+             GrOriginLocation_t   origin_location,
+             int                  nColBuffers,
+             int                  nAuxBuffers)
+{
+  static int show_warning = 1;
+
+  // ZIGGY
+  // allocate static texture names
+  // the initial value should be big enough to support the maximal resolution
+  free_texture = 32*2048*2048;
+  default_texture = free_texture++;
+  color_texture = free_texture++;
+  depth_texture = free_texture++;
+
+  LOG("grSstWinOpen(%08lx, %d, %d, %d, %d, %d %d)\r\n", hWnd, screen_resolution&~0x80000000, refresh_rate, color_format, origin_location, nColBuffers, nAuxBuffers);
+
+#ifdef _WIN32
+  if ((HWND)hWnd == NULL) hWnd = GetActiveWindow();
+  hwnd_win = (HWND)hWnd;
+#endif // _WIN32
+  width = height = 0;
+
+  m64p_handle video_general_section;
+  printf("&ConfigOpenSection is %p\n", &ConfigOpenSection);
+  if (ConfigOpenSection("Video-General", &video_general_section) != M64ERR_SUCCESS)
+  {
+    printf("Could not open video settings");
+    return false;
+  }
+  width = ConfigGetParamInt(video_general_section, "ScreenWidth");
+  height = ConfigGetParamInt(video_general_section, "ScreenHeight");
+  fullscreen = ConfigGetParamBool(video_general_section, "Fullscreen");
+  int vsync = ConfigGetParamBool(video_general_section, "VerticalSync");
+  //viewport_offset = ((screen_resolution>>2) > 20) ? screen_resolution >> 2 : 20;
+  // ZIGGY viewport_offset is WIN32 specific, with SDL just set it to zero
+  viewport_offset = 0; //-10 //-20;
+
+  CoreVideo_Init();
+  CoreVideo_GL_SetAttribute(M64P_GL_DOUBLEBUFFER, 1);
+  CoreVideo_GL_SetAttribute(M64P_GL_SWAP_CONTROL, vsync);
+  CoreVideo_GL_SetAttribute(M64P_GL_BUFFER_SIZE, 16);
+  //   SDL_GL_SetAttribute(SDL_GL_BUFFER_SIZE, 32);
+  //   SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+  //   SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+  //   SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+  //   SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+  CoreVideo_GL_SetAttribute(M64P_GL_DEPTH_SIZE, 16);
+
+  printf("(II) Setting video mode %dx%d...\n", width, height);
+  if(CoreVideo_SetVideoMode(width, height, 0, fullscreen ? M64VIDEO_FULLSCREEN : M64VIDEO_WINDOWED, (m64p_video_flags) 0) != M64ERR_SUCCESS)
+  {
+    printf("(EE) Error setting videomode %dx%d\n", width, height);
+    return false;
+  }
+
+  char caption[500];
+# ifdef _DEBUG
+  sprintf(caption, "Glide64mk2 debug");
+# else // _DEBUG
+  sprintf(caption, "Glide64mk2");
+# endif // _DEBUG
+  CoreVideo_SetCaption(caption);
+
+  glViewport(0, viewport_offset, width, height);
+  lfb_color_fmt = color_format;
+  if (origin_location != GR_ORIGIN_UPPER_LEFT) display_warning("origin must be in upper left corner");
+  if (nColBuffers != 2) display_warning("number of color buffer is not 2");
+  if (nAuxBuffers != 1) display_warning("number of auxiliary buffer is not 1");
+
+  if (isExtensionSupported("GL_ARB_texture_env_combine") == 0 &&
+    isExtensionSupported("GL_EXT_texture_env_combine") == 0 &&
+    show_warning)
+    display_warning("Your video card doesn't support GL_ARB_texture_env_combine extension");
+  if (isExtensionSupported("GL_ARB_multitexture") == 0 && show_warning)
+    display_warning("Your video card doesn't support GL_ARB_multitexture extension");
+  if (isExtensionSupported("GL_ARB_texture_mirrored_repeat") == 0 && show_warning)
+    display_warning("Your video card doesn't support GL_ARB_texture_mirrored_repeat extension");
+  show_warning = 0;
+
+#ifdef _WIN32
+  glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)wglGetProcAddress("glActiveTextureARB");
+  glMultiTexCoord2fARB = (PFNGLMULTITEXCOORD2FARBPROC)wglGetProcAddress("glMultiTexCoord2fARB");
+#endif // _WIN32
+
+  nbTextureUnits = 4;
+  //glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &nbTextureUnits);
+  if (nbTextureUnits == 1) display_warning("You need a video card that has at least 2 texture units");
+
+  nbAuxBuffers = 4;
+  //glGetIntegerv(GL_AUX_BUFFERS, &nbAuxBuffers);
+  if (nbAuxBuffers > 0)
+    printf("Congratulations, you have %d auxilliary buffers, we'll use them wisely !\n", nbAuxBuffers);
+#ifdef VOODOO1
+  nbTextureUnits = 2;
+#endif
+
+  blend_func_separate_support = 1;
+  packed_pixels_support = 0;
+/*
+  if (isExtensionSupported("GL_EXT_blend_func_separate") == 0)
+    blend_func_separate_support = 0;
+  else
+    blend_func_separate_support = 1;
+
+  if (isExtensionSupported("GL_EXT_packed_pixels") == 0)
+    packed_pixels_support = 0;
+  else {
+    printf("packed pixels extension used\n");
+    packed_pixels_support = 1;
+  }
+*/
+
+  if (isExtensionSupported("GL_ARB_texture_non_power_of_two") == 0)
+    npot_support = 0;
+  else {
+    printf("NPOT extension used\n");
+    npot_support = 1;
+  }
+
+#ifdef _WIN32
+  glBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC)wglGetProcAddress("glBlendFuncSeparateEXT");
+#endif // _WIN32
+
+  if (isExtensionSupported("GL_EXT_fog_coord") == 0)
+    fog_coord_support = 0;
+  else
+    fog_coord_support = 1;
+
+#ifdef _WIN32
+  glFogCoordfEXT = (PFNGLFOGCOORDFPROC)wglGetProcAddress("glFogCoordfEXT");
+#endif // _WIN32
+
+#ifdef _WIN32
+  wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)wglGetProcAddress("wglGetExtensionsStringARB");
+#endif // _WIN32
+
+#ifdef _WIN32
+  glBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)wglGetProcAddress("glBindFramebufferEXT");
+  glFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)wglGetProcAddress("glFramebufferTexture2DEXT");
+  glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)wglGetProcAddress("glGenFramebuffersEXT");
+  glCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)wglGetProcAddress("glCheckFramebufferStatusEXT");
+  glDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC)wglGetProcAddress("glDeleteFramebuffersEXT");
+
+  glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC)wglGetProcAddress("glBindRenderbufferEXT");
+  glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC)wglGetProcAddress("glDeleteRenderbuffersEXT");
+  glGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC)wglGetProcAddress("glGenRenderbuffersEXT");
+  glRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC)wglGetProcAddress("glRenderbufferStorageEXT");
+  glFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)wglGetProcAddress("glFramebufferRenderbufferEXT");
+  use_fbo = config.fbo && (glFramebufferRenderbufferEXT != NULL);
+#else
+  use_fbo = config.fbo;
+#endif // _WIN32
+
+  LOGINFO("use_fbo %d\n", use_fbo);
+
+  if (isExtensionSupported("GL_ARB_shading_language_100") &&
+    isExtensionSupported("GL_ARB_shader_objects") &&
+    isExtensionSupported("GL_ARB_fragment_shader") &&
+    isExtensionSupported("GL_ARB_vertex_shader"))
+  {
+
+#ifdef _WIN32
+    glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)wglGetProcAddress("glCreateShaderObjectARB");
+    glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)wglGetProcAddress("glShaderSourceARB");
+    glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)wglGetProcAddress("glCompileShaderARB");
+    glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)wglGetProcAddress("glCreateProgramObjectARB");
+    glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)wglGetProcAddress("glAttachObjectARB");
+    glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)wglGetProcAddress("glLinkProgramARB");
+    glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)wglGetProcAddress("glUseProgramObjectARB");
+    glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)wglGetProcAddress("glGetUniformLocationARB");
+    glUniform1iARB = (PFNGLUNIFORM1IARBPROC)wglGetProcAddress("glUniform1iARB");
+    glUniform4iARB = (PFNGLUNIFORM4IARBPROC)wglGetProcAddress("glUniform4iARB");
+    glUniform4fARB = (PFNGLUNIFORM4FARBPROC)wglGetProcAddress("glUniform4fARB");
+    glUniform1fARB = (PFNGLUNIFORM1FARBPROC)wglGetProcAddress("glUniform1fARB");
+    glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC)wglGetProcAddress("glDeleteObjectARB");
+    glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC)wglGetProcAddress("glGetInfoLogARB");
+    glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)wglGetProcAddress("glGetObjectParameterivARB");
+
+    glSecondaryColor3f = (PFNGLSECONDARYCOLOR3FPROC)wglGetProcAddress("glSecondaryColor3f");
+#endif // _WIN32
+  }
+
+  if (isExtensionSupported("GL_EXT_texture_compression_s3tc") == 0  && show_warning)
+    display_warning("Your video card doesn't support GL_EXT_texture_compression_s3tc extension");
+  if (isExtensionSupported("GL_3DFX_texture_compression_FXT1") == 0  && show_warning)
+    display_warning("Your video card doesn't support GL_3DFX_texture_compression_FXT1 extension");
+
+#ifdef _WIN32
+  glCompressedTexImage2DARB = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)wglGetProcAddress("glCompressedTexImage2DARB");
+#endif
+
+
+#ifdef _WIN32
+  glViewport(0, viewport_offset, width, height);
+  viewport_width = width;
+  viewport_height = height;
+  nvidia_viewport_hack = 1;
+#else
+  glViewport(0, viewport_offset, width, height);
+  viewport_width = width;
+  viewport_height = height;
+#endif // _WIN32
+
+  //   void do_benchmarks();
+  //   do_benchmarks();
+
+  // VP try to resolve z precision issues
+//  glMatrixMode(GL_MODELVIEW);
+//  glLoadIdentity();
+//  glTranslatef(0, 0, 1-zscale);
+//  glScalef(1, 1, zscale);
+
+  widtho = width/2;
+  heighto = height/2;
+
+  pBufferWidth = pBufferHeight = -1;
+
+  current_buffer = GL_BACK;
+
+  texture_unit = GL_TEXTURE0;
+
+  {
+    int i;
+    for (i=0; i<NB_TEXBUFS; i++)
+      texbufs[i].start = texbufs[i].end = 0xffffffff;
+  }
+
+  if (!use_fbo && nbAuxBuffers == 0) {
+    // create the framebuffer saving texture
+    int w = width, h = height;
+    glBindTexture(GL_TEXTURE_2D, color_texture);
+    if (!npot_support) {
+      w = h = 1;
+      while (w<width) w*=2;
+      while (h<height) h*=2;
+    }
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, 0);
+    glBindTexture(GL_TEXTURE_2D, 0);
+    save_w = save_h = 0;
+  }
+
+  //void FindBestDepthBias();
+  //FindBestDepthBias();
+
+  init_geometry();
+  init_textures();
+  init_combiner();
+
+/*
+  // Aniso filter check
+  if (config.anisofilter > 0 )
+    glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
+
+  // ATI hack - certain texture formats are slow on ATI?
+  // Hmm, perhaps the internal format need to be specified explicitly...
+  {
+    GLint ifmt;
+    glTexImage2D(GL_PROXY_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, NULL);
+    glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &ifmt);
+    if (ifmt != GL_RGB5_A1) {
+      display_warning("ATI SUCKS %x\n", ifmt);
+      ati_sucks = 1;
+    } else
+      ati_sucks = 0;
+  }
+*/
+
+  return 1;
+}
+
+FX_ENTRY void FX_CALL
+grGlideShutdown( void )
+{
+  LOG("grGlideShutdown\r\n");
+}
+
+FX_ENTRY FxBool FX_CALL
+grSstWinClose( GrContext_t context )
+{
+  int i, clear_texbuff = use_fbo;
+  LOG("grSstWinClose(%d)\r\n", context);
+
+  for (i=0; i<2; i++) {
+    tmu_usage[i].min = 0xfffffff;
+    tmu_usage[i].max = 0;
+    invtex[i] = 0;
+  }
+
+  free_combiners();
+#ifndef WIN32
+  try // I don't know why, but opengl can be killed before this function call when emulator is closed (Gonetz).
+    // ZIGGY : I found the problem : it is a function pointer, when the extension isn't supported , it is then zero, so just need to check the pointer prior to do the call.
+  {
+    if (use_fbo)
+      glBindFramebuffer( GL_FRAMEBUFFER, 0 );
+  }
+  catch (...)
+  {
+    clear_texbuff = 0;
+  }
+
+  if (clear_texbuff)
+  {
+    for (i=0; i<nb_fb; i++)
+    {
+      glDeleteTextures( 1, &(fbs[i].texid) );
+      glDeleteFramebuffers( 1, &(fbs[i].fbid) );
+      glDeleteRenderbuffers( 1, &(fbs[i].zbid) );
+    }
+  }
+#endif
+  nb_fb = 0;
+
+  free_textures();
+#ifndef WIN32
+  // ZIGGY for some reasons, Pj64 doesn't like remove_tex on exit
+  remove_tex(0, 0xfffffff);
+#endif
+
+  //*/
+#ifdef _WIN32
+  if (hGLRC)
+  {
+    wglMakeCurrent(hDC,NULL);
+    wglDeleteContext(hGLRC);
+    hGLRC = NULL;
+  }
+  if (fullscreen)
+  {
+    ChangeDisplaySettings(NULL, 0);
+    SetWindowPos(hwnd_win, NULL,
+      windowedRect.left, windowedRect.top,
+      0, 0,
+      SWP_NOZORDER | SWP_NOSIZE);
+    SetWindowLong(hwnd_win, GWL_STYLE, windowedStyle);
+    SetWindowLong(hwnd_win, GWL_EXSTYLE, windowedExStyle);
+    if (windowedMenu) SetMenu(hwnd_win, windowedMenu);
+    fullscreen = 0;
+  }
+#else
+  //SDL_QuitSubSystem(SDL_INIT_VIDEO);
+  //sleep(2);
+#endif
+
+  CoreVideo_Quit();
+
+  return FXTRUE;
+}
+
+FX_ENTRY void FX_CALL grTextureBufferExt( GrChipID_t  		tmu,
+                                         FxU32 				startAddress,
+                                         GrLOD_t 			lodmin,
+                                         GrLOD_t 			lodmax,
+                                         GrAspectRatio_t 	aspect,
+                                         GrTextureFormat_t 	fmt,
+                                         FxU32 				evenOdd)
+{
+  int i;
+  static int fbs_init = 0;
+
+  //printf("grTextureBufferExt(%d, %d, %d, %d, %d, %d, %d)\r\n", tmu, startAddress, lodmin, lodmax, aspect, fmt, evenOdd);
+  LOG("grTextureBufferExt(%d, %d, %d, %d %d, %d, %d)\r\n", tmu, startAddress, lodmin, lodmax, aspect, fmt, evenOdd);
+  if (lodmin != lodmax) display_warning("grTextureBufferExt : loading more than one LOD");
+  if (!use_fbo) {
+
+    if (!render_to_texture) { //initialization
+      return;
+    }
+
+    render_to_texture = 2;
+
+    if (aspect < 0)
+    {
+      pBufferHeight = 1 << lodmin;
+      pBufferWidth = pBufferHeight >> -aspect;
+    }
+    else
+    {
+      pBufferWidth = 1 << lodmin;
+      pBufferHeight = pBufferWidth >> aspect;
+    }
+
+    if (curBufferAddr && startAddress+1 != curBufferAddr)
+      updateTexture();
+#ifdef SAVE_CBUFFER
+    //printf("saving %dx%d\n", pBufferWidth, pBufferHeight);
+    // save color buffer
+    if (nbAuxBuffers > 0) {
+      //glDrawBuffer(GL_AUX0);
+      //current_buffer = GL_AUX0;
+    } else {
+      int tw, th;
+      if (pBufferWidth < screen_width)
+        tw = pBufferWidth;
+      else
+        tw = screen_width;
+      if (pBufferHeight < screen_height)
+        th = pBufferHeight;
+      else
+        th = screen_height;
+      //glReadBuffer(GL_BACK);
+      glActiveTexture(texture_unit);
+      glBindTexture(GL_TEXTURE_2D, color_texture);
+      // save incrementally the framebuffer
+      if (save_w) {
+        if (tw > save_w && th > save_h) {
+          glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, save_h,
+            0, viewport_offset+save_h, tw, th-save_h);
+          glCopyTexSubImage2D(GL_TEXTURE_2D, 0, save_w, 0,
+            save_w, viewport_offset, tw-save_w, save_h);
+          save_w = tw;
+          save_h = th;
+        } else if (tw > save_w) {
+          glCopyTexSubImage2D(GL_TEXTURE_2D, 0, save_w, 0,
+            save_w, viewport_offset, tw-save_w, save_h);
+          save_w = tw;
+        } else if (th > save_h) {
+          glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, save_h,
+            0, viewport_offset+save_h, save_w, th-save_h);
+          save_h = th;
+        }
+      } else {
+        glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0,
+          0, viewport_offset, tw, th);
+        save_w = tw;
+        save_h = th;
+      }
+      glBindTexture(GL_TEXTURE_2D, default_texture);
+    }
+#endif
+
+    if (startAddress+1 != curBufferAddr ||
+      (curBufferAddr == 0L && nbAuxBuffers == 0))
+      buffer_cleared = 0;
+
+    curBufferAddr = pBufferAddress = startAddress+1;
+    pBufferFmt = fmt;
+
+    int rtmu = startAddress < grTexMinAddress(GR_TMU1)? 0 : 1;
+    int size = pBufferWidth*pBufferHeight*2; //grTexFormatSize(fmt);
+    if ((unsigned int) tmu_usage[rtmu].min > pBufferAddress)
+      tmu_usage[rtmu].min = pBufferAddress;
+    if ((unsigned int) tmu_usage[rtmu].max < pBufferAddress+size)
+      tmu_usage[rtmu].max = pBufferAddress+size;
+    //   printf("tmu %d usage now %gMb - %gMb\n",
+    //          rtmu, tmu_usage[rtmu].min/1024.0f, tmu_usage[rtmu].max/1024.0f);
+
+
+    width = pBufferWidth;
+    height = pBufferHeight;
+
+    widtho = width/2;
+    heighto = height/2;
+
+    // this could be improved, but might be enough as long as the set of
+    // texture buffer addresses stay small
+    for (i=(texbuf_i-1)&(NB_TEXBUFS-1) ; i!=texbuf_i; i=(i-1)&(NB_TEXBUFS-1))
+      if (texbufs[i].start == pBufferAddress)
+        break;
+    texbufs[i].start = pBufferAddress;
+    texbufs[i].end = pBufferAddress + size;
+    texbufs[i].fmt = fmt;
+    if (i == texbuf_i)
+      texbuf_i = (texbuf_i+1)&(NB_TEXBUFS-1);
+    //printf("texbuf %x fmt %x\n", pBufferAddress, fmt);
+
+    // ZIGGY it speeds things up to not delete the buffers
+    // a better thing would be to delete them *sometimes*
+    //   remove_tex(pBufferAddress+1, pBufferAddress + size);
+    add_tex(pBufferAddress);
+
+    //printf("viewport %dx%d\n", width, height);
+    if (height > screen_height) {
+      glViewport( 0, viewport_offset + screen_height - height, width, height);
+    } else
+      glViewport( 0, viewport_offset, width, height);
+
+    glScissor(0, viewport_offset, width, height);
+
+
+  } else {
+    if (!render_to_texture) //initialization
+    {
+      if(!fbs_init)
+      {
+        for(i=0; i<100; i++) fbs[i].address = 0;
+        fbs_init = 1;
+        nb_fb = 0;
+      }
+      return; //no need to allocate FBO if render buffer is not texture buffer
+    }
+
+    render_to_texture = 2;
+
+    if (aspect < 0)
+    {
+      pBufferHeight = 1 << lodmin;
+      pBufferWidth = pBufferHeight >> -aspect;
+    }
+    else
+    {
+      pBufferWidth = 1 << lodmin;
+      pBufferHeight = pBufferWidth >> aspect;
+    }
+    pBufferAddress = startAddress+1;
+
+    width = pBufferWidth;
+    height = pBufferHeight;
+
+    widtho = width/2;
+    heighto = height/2;
+
+    for (i=0; i<nb_fb; i++)
+    {
+      if (fbs[i].address == pBufferAddress)
+      {
+        if (fbs[i].width == width && fbs[i].height == height) //select already allocated FBO
+        {
+          glBindFramebuffer( GL_FRAMEBUFFER, 0 );
+          glBindFramebuffer( GL_FRAMEBUFFER, fbs[i].fbid );
+          glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fbs[i].texid, 0 );
+          glBindRenderbuffer( GL_RENDERBUFFER, fbs[i].zbid );
+          glFramebufferRenderbuffer( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, fbs[i].zbid );
+          glViewport( 0, 0, width, height);
+          glScissor( 0, 0, width, height);
+          if (fbs[i].buff_clear)
+          {
+            glDepthMask(1);
+            glClear( GL_DEPTH_BUFFER_BIT ); //clear z-buffer only. we may need content, stored in the frame buffer
+            fbs[i].buff_clear = 0;
+          }
+          CHECK_FRAMEBUFFER_STATUS();
+          curBufferAddr = pBufferAddress;
+          return;
+        }
+        else //create new FBO at the same address, delete old one
+        {
+          glDeleteFramebuffers( 1, &(fbs[i].fbid) );
+          glDeleteRenderbuffers( 1, &(fbs[i].zbid) );
+          if (nb_fb > 1)
+            memmove(&(fbs[i]), &(fbs[i+1]), sizeof(fb)*(nb_fb-i));
+          nb_fb--;
+          break;
+        }
+      }
+    }
+
+    remove_tex(pBufferAddress, pBufferAddress + width*height*2/*grTexFormatSize(fmt)*/);
+    //create new FBO
+    glGenFramebuffers( 1, &(fbs[nb_fb].fbid) );
+    glGenRenderbuffers( 1, &(fbs[nb_fb].zbid) );
+    glBindRenderbuffer( GL_RENDERBUFFER, fbs[nb_fb].zbid );
+    glRenderbufferStorage( GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height);
+    fbs[nb_fb].address = pBufferAddress;
+    fbs[nb_fb].width = width;
+    fbs[nb_fb].height = height;
+    fbs[nb_fb].texid = pBufferAddress;
+    fbs[nb_fb].buff_clear = 0;
+    add_tex(fbs[nb_fb].texid);
+    glBindTexture(GL_TEXTURE_2D, fbs[nb_fb].texid);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0,
+      GL_RGB, GL_UNSIGNED_BYTE, NULL);
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+    glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+
+    glBindFramebuffer( GL_FRAMEBUFFER, fbs[nb_fb].fbid);
+    glFramebufferTexture2D(GL_FRAMEBUFFER,
+      GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, fbs[nb_fb].texid, 0);
+    glFramebufferRenderbuffer( GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, fbs[nb_fb].zbid );
+    glViewport(0,0,width,height);
+    glScissor(0,0,width,height);
+    glClearColor( 0.0f, 0.0f, 0.0f, 1.0f );
+    glDepthMask(1);
+    glClear( GL_DEPTH_BUFFER_BIT );
+    CHECK_FRAMEBUFFER_STATUS();
+    curBufferAddr = pBufferAddress;
+    nb_fb++;
+  }
+}
+
+int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info )
+{
+  int found, i;
+  if (!use_fbo) {
+    for (found=i=0; i<2; i++)
+      if ((FxU32) tmu_usage[i].min <= startAddress && (FxU32) tmu_usage[i].max > startAddress) {
+        //printf("tmu %d == framebuffer %x\n", tmu, startAddress);
+        found = 1;
+        break;
+      }
+  } else {
+    found = i = 0;
+    while (i < nb_fb)
+    {
+      unsigned int end = fbs[i].address + fbs[i].width*fbs[i].height*2;
+      if (startAddress >= fbs[i].address &&  startAddress < end)
+      {
+        found = 1;
+        break;
+      }
+      i++;
+    }
+  }
+
+  if (!use_fbo && found) {
+    int tw, th, rh, cw, ch;
+    if (info->aspectRatioLog2 < 0)
+    {
+      th = 1 << info->largeLodLog2;
+      tw = th >> -info->aspectRatioLog2;
+    }
+    else
+    {
+      tw = 1 << info->largeLodLog2;
+      th = tw >> info->aspectRatioLog2;
+    }
+
+    if (info->aspectRatioLog2 < 0)
+    {
+      ch = 256;
+      cw = ch >> -info->aspectRatioLog2;
+    }
+    else
+    {
+      cw = 256;
+      ch = cw >> info->aspectRatioLog2;
+    }
+
+    if (use_fbo || th < screen_height)
+      rh = th;
+    else
+      rh = screen_height;
+
+    //printf("th %d rh %d ch %d\n", th, rh, ch);
+
+    invtex[tmu] = 1.0f - (th - rh) / (float)th;
+  } else
+    invtex[tmu] = 0;
+
+  if (info->format == GR_TEXFMT_ALPHA_INTENSITY_88 ) {
+    if (!found) {
+      return 0;
+    }
+    if(tmu == 0)
+    {
+      if(blackandwhite1 != found)
+      {
+        blackandwhite1 = found;
+        need_to_compile = 1;
+      }
+    }
+    else
+    {
+      if(blackandwhite0 != found)
+      {
+        blackandwhite0 = found;
+        need_to_compile = 1;
+      }
+    }
+    return 1;
+  }
+  return 0;
+
+}
+
+
+FX_ENTRY void FX_CALL
+grTextureAuxBufferExt( GrChipID_t tmu,
+                      FxU32      startAddress,
+                      GrLOD_t    thisLOD,
+                      GrLOD_t    largeLOD,
+                      GrAspectRatio_t aspectRatio,
+                      GrTextureFormat_t format,
+                      FxU32      odd_even_mask )
+{
+  LOG("grTextureAuxBufferExt(%d, %d, %d, %d %d, %d, %d)\r\n", tmu, startAddress, thisLOD, largeLOD, aspectRatio, format, odd_even_mask);
+  //display_warning("grTextureAuxBufferExt");
+}
+
+FX_ENTRY void FX_CALL grAuxBufferExt( GrBuffer_t buffer );
+
+FX_ENTRY GrProc FX_CALL
+grGetProcAddress( char *procName )
+{
+  LOG("grGetProcAddress(%s)\r\n", procName);
+  if(!strcmp(procName, "grSstWinOpenExt"))
+    return (GrProc)grSstWinOpenExt;
+  if(!strcmp(procName, "grTextureBufferExt"))
+    return (GrProc)grTextureBufferExt;
+  if(!strcmp(procName, "grChromaRangeExt"))
+    return (GrProc)grChromaRangeExt;
+  if(!strcmp(procName, "grChromaRangeModeExt"))
+    return (GrProc)grChromaRangeModeExt;
+  if(!strcmp(procName, "grTexChromaRangeExt"))
+    return (GrProc)grTexChromaRangeExt;
+  if(!strcmp(procName, "grTexChromaModeExt"))
+    return (GrProc)grTexChromaModeExt;
+  // ZIGGY framebuffer copy extension
+  if(!strcmp(procName, "grFramebufferCopyExt"))
+    return (GrProc)grFramebufferCopyExt;
+  if(!strcmp(procName, "grColorCombineExt"))
+    return (GrProc)grColorCombineExt;
+  if(!strcmp(procName, "grAlphaCombineExt"))
+    return (GrProc)grAlphaCombineExt;
+  if(!strcmp(procName, "grTexColorCombineExt"))
+    return (GrProc)grTexColorCombineExt;
+  if(!strcmp(procName, "grTexAlphaCombineExt"))
+    return (GrProc)grTexAlphaCombineExt;
+  if(!strcmp(procName, "grConstantColorValueExt"))
+    return (GrProc)grConstantColorValueExt;
+  if(!strcmp(procName, "grTextureAuxBufferExt"))
+    return (GrProc)grTextureAuxBufferExt;
+  if(!strcmp(procName, "grAuxBufferExt"))
+    return (GrProc)grAuxBufferExt;
+  if(!strcmp(procName, "grWrapperFullScreenResolutionExt"))
+    return (GrProc)grWrapperFullScreenResolutionExt;
+  if(!strcmp(procName, "grConfigWrapperExt"))
+    return (GrProc)grConfigWrapperExt;
+  if(!strcmp(procName, "grKeyPressedExt"))
+    return (GrProc)grKeyPressedExt;
+  if(!strcmp(procName, "grQueryResolutionsExt"))
+    return (GrProc)grQueryResolutionsExt;
+  if(!strcmp(procName, "grGetGammaTableExt"))
+    return (GrProc)grGetGammaTableExt;
+  display_warning("grGetProcAddress : %s", procName);
+  return 0;
+}
+
+FX_ENTRY FxU32 FX_CALL
+grGet( FxU32 pname, FxU32 plength, FxI32 *params )
+{
+  LOG("grGet(%d,%d)\r\n", pname, plength);
+  switch(pname)
+  {
+  case GR_MAX_TEXTURE_SIZE:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 2048;
+    return 4;
+    break;
+  case GR_NUM_TMU:
+    if (plength < 4 || params == NULL) return 0;
+    if (!nbTextureUnits)
+    {
+      grSstWinOpen((unsigned long)NULL, GR_RESOLUTION_640x480 | 0x80000000, 0, GR_COLORFORMAT_ARGB,
+        GR_ORIGIN_UPPER_LEFT, 2, 1);
+      grSstWinClose(0);
+    }
+#ifdef VOODOO1
+    params[0] = 1;
+#else
+    if (nbTextureUnits > 2)
+      params[0] = 2;
+    else
+      params[0] = 1;
+#endif
+    return 4;
+    break;
+  case GR_NUM_BOARDS:
+  case GR_NUM_FB:
+  case GR_REVISION_FB:
+  case GR_REVISION_TMU:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 1;
+    return 4;
+    break;
+  case GR_MEMORY_FB:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 16*1024*1024;
+    return 4;
+    break;
+  case GR_MEMORY_TMU:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 16*1024*1024;
+    return 4;
+    break;
+  case GR_MEMORY_UMA:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 16*1024*1024*nbTextureUnits;
+    return 4;
+    break;
+  case GR_BITS_RGBA:
+    if (plength < 16 || params == NULL) return 0;
+    params[0] = 8;
+    params[1] = 8;
+    params[2] = 8;
+    params[3] = 8;
+    return 16;
+    break;
+  case GR_BITS_DEPTH:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 16;
+    return 4;
+    break;
+  case GR_BITS_GAMMA:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 8;
+    return 4;
+    break;
+  case GR_GAMMA_TABLE_ENTRIES:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 256;
+    return 4;
+    break;
+  case GR_FOG_TABLE_ENTRIES:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 64;
+    return 4;
+    break;
+  case GR_WDEPTH_MIN_MAX:
+    if (plength < 8 || params == NULL) return 0;
+    params[0] = 0;
+    params[1] = 65528;
+    return 8;
+    break;
+  case GR_ZDEPTH_MIN_MAX:
+    if (plength < 8 || params == NULL) return 0;
+    params[0] = 0;
+    params[1] = 65535;
+    return 8;
+    break;
+  case GR_LFB_PIXEL_PIPE:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = FXFALSE;
+    return 4;
+    break;
+  case GR_MAX_TEXTURE_ASPECT_RATIO:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 3;
+    return 4;
+    break;
+  case GR_NON_POWER_OF_TWO_TEXTURES:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = FXFALSE;
+    return 4;
+    break;
+  case GR_TEXTURE_ALIGN:
+    if (plength < 4 || params == NULL) return 0;
+    params[0] = 0;
+    return 4;
+    break;
+  default:
+    display_warning("unknown pname in grGet : %x", pname);
+  }
+  return 0;
+}
+
+FX_ENTRY const char * FX_CALL
+grGetString( FxU32 pname )
+{
+  LOG("grGetString(%d)\r\n", pname);
+  switch(pname)
+  {
+  case GR_EXTENSION:
+    {
+      static char extension[] = "CHROMARANGE TEXCHROMA TEXMIRROR PALETTE6666 FOGCOORD EVOODOO TEXTUREBUFFER TEXUMA TEXFMT COMBINE GETGAMMA";
+      return extension;
+    }
+    break;
+  case GR_HARDWARE:
+    {
+      static char hardware[] = "Voodoo5 (tm)";
+      return hardware;
+    }
+    break;
+  case GR_VENDOR:
+    {
+      static char vendor[] = "3Dfx Interactive";
+      return vendor;
+    }
+    break;
+  case GR_RENDERER:
+    {
+      static char renderer[] = "Glide";
+      return renderer;
+    }
+    break;
+  case GR_VERSION:
+    {
+      static char version[] = "3.0";
+      return version;
+    }
+    break;
+  default:
+    display_warning("unknown grGetString selector : %x", pname);
+  }
+  return NULL;
+}
+
+static void render_rectangle(int texture_number,
+                             int dst_x, int dst_y,
+                             int src_width, int src_height,
+                             int tex_width, int tex_height, int invert)
+{
+  LOGINFO("render_rectangle(%d,%d,%d,%d,%d,%d,%d,%d)",texture_number,dst_x,dst_y,src_width,src_height,tex_width,tex_height,invert);
+  int vertexOffset_location;
+  int textureSizes_location;
+  static float data[] = {
+    (float)((int)dst_x),                      //X 0
+    (float)(invert*-((int)dst_y)),            //Y 0 
+    0.0f,                                     //U 0 
+    0.0f,                                     //V 0
+
+    (float)((int)dst_x),                      //X 1
+    (float)(invert*-((int)dst_y + (int)src_height)),   //Y 1
+    0.0f,                                     //U 1
+    (float)src_height / (float)tex_height,    //V 1
+
+    (float)((int)dst_x + (int)src_width), 
+    (float)(invert*-((int)dst_y + (int)src_height)),
+    (float)src_width / (float)tex_width,
+    (float)src_height / (float)tex_height,
+
+    (float)((int)dst_x),
+    (float)(invert*-((int)dst_y)),
+    0.0f,
+    0.0f
+  };
+
+  vbo_disable();
+  glDisableVertexAttribArray(COLOUR_ATTR);
+  glDisableVertexAttribArray(TEXCOORD_1_ATTR);
+  glDisableVertexAttribArray(FOG_ATTR);
+
+  glVertexAttribPointer(POSITION_ATTR,2,GL_FLOAT,false,2,data); //Position
+  glVertexAttribPointer(TEXCOORD_0_ATTR,2,GL_FLOAT,false,2,&data[2]); //Tex
+
+  glEnableVertexAttribArray(COLOUR_ATTR);
+  glEnableVertexAttribArray(TEXCOORD_1_ATTR);
+  glEnableVertexAttribArray(FOG_ATTR);
+
+
+  disable_textureSizes();
+
+  glDrawArrays(GL_TRIANGLE_STRIP,0,4);
+  vbo_enable();
+
+
+/*
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+  glBegin(GL_QUADS);
+  glMultiTexCoord2fARB(texture_number, 0.0f, 0.0f);
+  glVertex2f(((int)dst_x - widtho) / (float)(width/2),
+    invert*-((int)dst_y - heighto) / (float)(height/2));
+  glMultiTexCoord2fARB(texture_number, 0.0f, (float)src_height / (float)tex_height);
+  glVertex2f(((int)dst_x - widtho) / (float)(width/2),
+    invert*-((int)dst_y + (int)src_height - heighto) / (float)(height/2));
+  glMultiTexCoord2fARB(texture_number, (float)src_width / (float)tex_width, (float)src_height / (float)tex_height);
+  glVertex2f(((int)dst_x + (int)src_width - widtho) / (float)(width/2),
+    invert*-((int)dst_y + (int)src_height - heighto) / (float)(height/2));
+  glMultiTexCoord2fARB(texture_number, (float)src_width / (float)tex_width, 0.0f);
+  glVertex2f(((int)dst_x + (int)src_width - widtho) / (float)(width/2),
+    invert*-((int)dst_y - heighto) / (float)(height/2));
+  glMultiTexCoord2fARB(texture_number, 0.0f, 0.0f);
+  glVertex2f(((int)dst_x - widtho) / (float)(width/2),
+    invert*-((int)dst_y - heighto) / (float)(height/2));
+  glEnd();
+*/
+
+  compile_shader();
+
+  glEnable(GL_DEPTH_TEST);
+  glEnable(GL_BLEND);
+}
+
+void reloadTexture()
+{
+  if (use_fbo || !render_to_texture || buffer_cleared)
+    return;
+
+  LOG("reload texture %dx%d\n", width, height);
+  //printf("reload texture %dx%d\n", width, height);
+
+  buffer_cleared = 1;
+
+  //glPushAttrib(GL_ALL_ATTRIB_BITS);
+  glActiveTexture(texture_unit);
+  glBindTexture(GL_TEXTURE_2D, pBufferAddress);
+  //glDisable(GL_ALPHA_TEST);
+  //glDrawBuffer(current_buffer);
+  glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+  set_copy_shader();
+  glDisable(GL_DEPTH_TEST);
+  glDisable(GL_CULL_FACE);
+  int w = 0, h = 0;
+  if (height > screen_height) h = screen_height - height;
+  render_rectangle(texture_unit,
+    -w, -h,
+    width,  height,
+    width, height, -1);
+  glBindTexture(GL_TEXTURE_2D, default_texture);
+  //glPopAttrib();
+}
+
+void updateTexture()
+{
+  if (!use_fbo && render_to_texture == 2) {
+    LOG("update texture %x\n", pBufferAddress);
+    //printf("update texture %x\n", pBufferAddress);
+
+    // nothing changed, don't update the texture
+    if (!buffer_cleared) {
+      LOG("update cancelled\n", pBufferAddress);
+      return;
+    }
+
+    //glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+    // save result of render to texture into actual texture
+    //glReadBuffer(current_buffer);
+    glActiveTexture(texture_unit);
+    // ZIGGY
+    // deleting the texture before resampling it increases speed on certain old
+    // nvidia cards (geforce 2 for example), unfortunatly it slows down a lot
+    // on newer cards.
+    //glDeleteTextures( 1, &pBufferAddress );
+    glBindTexture(GL_TEXTURE_2D, pBufferAddress);
+    glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
+      0, viewport_offset, width, height, 0);
+
+    glBindTexture(GL_TEXTURE_2D, default_texture);
+    //glPopAttrib();
+  }
+}
+
+FX_ENTRY void FX_CALL grFramebufferCopyExt(int x, int y, int w, int h,
+                                           int from, int to, int mode)
+{
+  if (mode == GR_FBCOPY_MODE_DEPTH) {
+
+    int tw = 1, th = 1;
+    if (npot_support) {
+      tw = width; th = height;
+    } else {
+      while (tw < width) tw <<= 1;
+      while (th < height) th <<= 1;
+    }
+
+    if (from == GR_FBCOPY_BUFFER_BACK && to == GR_FBCOPY_BUFFER_FRONT) {
+      //printf("save depth buffer %d\n", render_to_texture);
+      // save the depth image in a texture
+      //glReadBuffer(current_buffer);
+      glBindTexture(GL_TEXTURE_2D, depth_texture);
+      glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT,
+        0, viewport_offset, tw, th, 0);
+      glBindTexture(GL_TEXTURE_2D, default_texture);
+      return;
+    }
+    if (from == GR_FBCOPY_BUFFER_FRONT && to == GR_FBCOPY_BUFFER_BACK) {
+      //printf("writing to depth buffer %d\n", render_to_texture);
+      //glPushAttrib(GL_ALL_ATTRIB_BITS);
+      //glDisable(GL_ALPHA_TEST);
+      //glDrawBuffer(current_buffer);
+      glActiveTexture(texture_unit);
+      glBindTexture(GL_TEXTURE_2D, depth_texture);
+      glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+      set_depth_shader();
+      glEnable(GL_DEPTH_TEST);
+      glDepthFunc(GL_ALWAYS);
+      glDisable(GL_CULL_FACE);
+      render_rectangle(texture_unit,
+        0, 0,
+        width,  height,
+        tw, th, -1);
+      glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+      glBindTexture(GL_TEXTURE_2D, default_texture);
+      //glPopAttrib();
+      return;
+    }
+
+  }
+}
+
+FX_ENTRY void FX_CALL
+grRenderBuffer( GrBuffer_t buffer )
+{
+#ifdef _WIN32
+  static HANDLE region = NULL;
+  int realWidth = pBufferWidth, realHeight = pBufferHeight;
+#endif // _WIN32
+  LOG("grRenderBuffer(%d)\r\n", buffer);
+  //printf("grRenderBuffer(%d)\n", buffer);
+
+  switch(buffer)
+  {
+  case GR_BUFFER_BACKBUFFER:
+    if(render_to_texture)
+    {
+      updateTexture();
+
+      // VP z fix
+      //glMatrixMode(GL_MODELVIEW);
+      //glLoadIdentity();
+      //glTranslatef(0, 0, 1-zscale);
+      //glScalef(1, 1, zscale);
+      inverted_culling = 0;
+      grCullMode(culling_mode);
+
+      width = savedWidth;
+      height = savedHeight;
+      widtho = savedWidtho;
+      heighto = savedHeighto;
+      if (use_fbo) {
+        glBindFramebuffer(GL_FRAMEBUFFER, 0);
+        glBindRenderbuffer( GL_RENDERBUFFER, 0 );
+      }
+      curBufferAddr = 0;
+
+      glViewport(0, viewport_offset, width, viewport_height);
+      glScissor(0, viewport_offset, width, height);
+
+#ifdef SAVE_CBUFFER
+      if (!use_fbo && render_to_texture == 2) {
+        // restore color buffer
+        if (nbAuxBuffers > 0) {
+          //glDrawBuffer(GL_BACK);
+          current_buffer = GL_BACK;
+        } else if (save_w) {
+          int tw = 1, th = 1;
+          //printf("restore %dx%d\n", save_w, save_h);
+          if (npot_support) {
+            tw = screen_width;
+            th = screen_height;
+          } else {
+            while (tw < screen_width) tw <<= 1;
+            while (th < screen_height) th <<= 1;
+          }
+
+          //glPushAttrib(GL_ALL_ATTRIB_BITS);
+          //glDisable(GL_ALPHA_TEST);
+          //glDrawBuffer(GL_BACK);
+          glActiveTexture(texture_unit);
+          glBindTexture(GL_TEXTURE_2D, color_texture);
+          glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+          set_copy_shader();
+          glDisable(GL_DEPTH_TEST);
+          glDisable(GL_CULL_FACE);
+          render_rectangle(texture_unit,
+            0, 0,
+            save_w,  save_h,
+            tw, th, -1);
+          glBindTexture(GL_TEXTURE_2D, default_texture);
+          //glPopAttrib();
+
+          save_w = save_h = 0;
+        }
+      }
+#endif
+      render_to_texture = 0;
+    }
+    //glDrawBuffer(GL_BACK);
+    break;
+  case 6: // RENDER TO TEXTURE
+    if(!render_to_texture)
+    {
+      savedWidth = width;
+      savedHeight = height;
+      savedWidtho = widtho;
+      savedHeighto = heighto;
+    }
+
+    {
+      if (!use_fbo) {
+        //glMatrixMode(GL_MODELVIEW);
+        //glLoadIdentity();
+        //glTranslatef(0, 0, 1-zscale);
+        //glScalef(1, 1, zscale);
+        inverted_culling = 0;
+      } else {
+/*
+        float m[4*4] = {1.0f, 0.0f, 0.0f, 0.0f,
+          0.0f,-1.0f, 0.0f, 0.0f,
+          0.0f, 0.0f, 1.0f, 0.0f,
+          0.0f, 0.0f, 0.0f, 1.0f};
+        glMatrixMode(GL_MODELVIEW);
+        glLoadMatrixf(m);
+        // VP z fix
+        glTranslatef(0, 0, 1-zscale);
+        glScalef(1, 1*1, zscale);
+*/
+        inverted_culling = 1;
+        grCullMode(culling_mode);
+      }
+    }
+    render_to_texture = 1;
+    break;
+  default:
+    display_warning("grRenderBuffer : unknown buffer : %x", buffer);
+  }
+}
+
+FX_ENTRY void FX_CALL
+grAuxBufferExt( GrBuffer_t buffer )
+{
+  LOG("grAuxBufferExt(%d)\r\n", buffer);
+  //display_warning("grAuxBufferExt");
+
+  if (buffer == GR_BUFFER_AUXBUFFER) {
+    invtex[0] = 0;
+    invtex[1] = 0;
+    need_to_compile = 0;
+    set_depth_shader();
+    glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+    glEnable(GL_DEPTH_TEST);
+    glDepthFunc(GL_ALWAYS);
+    glDisable(GL_CULL_FACE);
+    //glDisable(GL_ALPHA_TEST);
+    glDepthMask(GL_TRUE);
+    grTexFilterMode(GR_TMU1, GR_TEXTUREFILTER_POINT_SAMPLED, GR_TEXTUREFILTER_POINT_SAMPLED);
+  } else {
+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+    need_to_compile = 1;
+  }
+}
+void vbo_draw();
+FX_ENTRY void FX_CALL
+grBufferClear( GrColor_t color, GrAlpha_t alpha, FxU32 depth )
+{
+  vbo_draw();
+  LOG("grBufferClear(%d,%d,%d)\r\n", color, alpha, depth);
+  switch(lfb_color_fmt)
+  {
+  case GR_COLORFORMAT_ARGB:
+    glClearColor(((color >> 16) & 0xFF) / 255.0f,
+      ((color >>  8) & 0xFF) / 255.0f,
+      ( color        & 0xFF) / 255.0f,
+      alpha / 255.0f);
+    break;
+  case GR_COLORFORMAT_RGBA:
+    glClearColor(((color >> 24) & 0xFF) / 255.0f,
+      ((color >> 16) & 0xFF) / 255.0f,
+      (color         & 0xFF) / 255.0f,
+      alpha / 255.0f);
+    break;
+  default:
+    display_warning("grBufferClear: unknown color format : %x", lfb_color_fmt);
+  }
+
+  if (w_buffer_mode)
+    glClearDepthf(1.0f - ((1.0f + (depth >> 4) / 4096.0f) * (1 << (depth & 0xF))) / 65528.0);
+  else
+    glClearDepthf(depth / 65535.0f);
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+  // ZIGGY TODO check that color mask is on
+  buffer_cleared = 1;
+
+}
+
+// #include <unistd.h>
+FX_ENTRY void FX_CALL
+grBufferSwap( FxU32 swap_interval )
+{
+//   GLuint program;
+
+  vbo_draw();
+//	glFinish();
+//  printf("rendercallback is %p\n", renderCallback);
+  if(renderCallback) {
+//      glGetIntegerv(GL_CURRENT_PROGRAM, (GLint*) &program);
+//      glUseProgramObjectARB(0);
+      (*renderCallback)(1);
+//      if (program)
+//         glUseProgramObjectARB(program);
+  }
+  int i;
+  LOG("grBufferSwap(%d)\r\n", swap_interval);
+  //printf("swap\n");
+  if (render_to_texture) {
+    display_warning("swap while render_to_texture\n");
+    return;
+  }
+
+  CoreVideo_GL_SwapBuffers();
+  for (i = 0; i < nb_fb; i++)
+    fbs[i].buff_clear = 1;
+
+  // VP debugging
+#ifdef VPDEBUG
+  dump_stop();
+  SDL_Event event;
+  while (SDL_PollEvent(&event)) {
+    switch (event.type) {
+case SDL_KEYDOWN:
+  switch (event.key.keysym.sym) {
+case 'd':
+  printf("Dumping !\n");
+  dump_start();
+  break;
+case 'w': {
+  static int wireframe;
+  wireframe = !wireframe;
+  glPolygonMode(GL_FRONT_AND_BACK, wireframe? GL_LINE : GL_FILL);
+  break;
+          }
+  }
+  break;
+    }
+  }
+#endif
+}
+
+// frame buffer
+
+FX_ENTRY FxBool FX_CALL
+grLfbLock( GrLock_t type, GrBuffer_t buffer, GrLfbWriteMode_t writeMode,
+          GrOriginLocation_t origin, FxBool pixelPipeline,
+          GrLfbInfo_t *info )
+{
+  LOG("grLfbLock(%d,%d,%d,%d,%d)\r\n", type, buffer, writeMode, origin, pixelPipeline);
+  if (type == GR_LFB_WRITE_ONLY)
+  {
+    display_warning("grLfbLock : write only");
+  }
+  else
+  {
+    unsigned char *buf;
+    int i,j;
+
+    switch(buffer)
+    {
+    case GR_BUFFER_FRONTBUFFER:
+      //glReadBuffer(GL_FRONT);
+      break;
+    case GR_BUFFER_BACKBUFFER:
+      //glReadBuffer(GL_BACK);
+      break;
+    default:
+      display_warning("grLfbLock : unknown buffer : %x", buffer);
+    }
+
+    if(buffer != GR_BUFFER_AUXBUFFER)
+    {
+      if (writeMode == GR_LFBWRITEMODE_888) {
+        //printf("LfbLock GR_LFBWRITEMODE_888\n");
+        info->lfbPtr = frameBuffer;
+        info->strideInBytes = width*4;
+        info->writeMode = GR_LFBWRITEMODE_888;
+        info->origin = origin;
+        //glReadPixels(0, viewport_offset, width, height, GL_BGRA, GL_UNSIGNED_BYTE, frameBuffer);
+      } else {
+        buf = (unsigned char*)malloc(width*height*4);
+
+        info->lfbPtr = frameBuffer;
+        info->strideInBytes = width*2;
+        info->writeMode = GR_LFBWRITEMODE_565;
+        info->origin = origin;
+        glReadPixels(0, viewport_offset, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buf);
+
+        for (j=0; j<height; j++)
+        {
+          for (i=0; i<width; i++)
+          {
+            frameBuffer[(height-j-1)*width+i] =
+              ((buf[j*width*4+i*4+0] >> 3) << 11) |
+              ((buf[j*width*4+i*4+1] >> 2) <<  5) |
+              (buf[j*width*4+i*4+2] >> 3);
+          }
+        }
+        free(buf);
+      }
+    }
+    else
+    {
+      info->lfbPtr = depthBuffer;
+      info->strideInBytes = width*2;
+      info->writeMode = GR_LFBWRITEMODE_ZA16;
+      info->origin = origin;
+      glReadPixels(0, viewport_offset, width, height, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, depthBuffer);
+    }
+  }
+
+  return FXTRUE;
+}
+
+FX_ENTRY FxBool FX_CALL
+grLfbUnlock( GrLock_t type, GrBuffer_t buffer )
+{
+  LOG("grLfbUnlock(%d,%d)\r\n", type, buffer);
+  if (type == GR_LFB_WRITE_ONLY)
+  {
+    display_warning("grLfbUnlock : write only");
+  }
+  return FXTRUE;
+}
+
+FX_ENTRY FxBool FX_CALL
+grLfbReadRegion( GrBuffer_t src_buffer,
+                FxU32 src_x, FxU32 src_y,
+                FxU32 src_width, FxU32 src_height,
+                FxU32 dst_stride, void *dst_data )
+{
+  unsigned char *buf;
+  unsigned int i,j;
+  unsigned short *frameBuffer = (unsigned short*)dst_data;
+  unsigned short *depthBuffer = (unsigned short*)dst_data;
+  LOG("grLfbReadRegion(%d,%d,%d,%d,%d,%d)\r\n", src_buffer, src_x, src_y, src_width, src_height, dst_stride);
+
+  switch(src_buffer)
+  {
+  case GR_BUFFER_FRONTBUFFER:
+    //glReadBuffer(GL_FRONT);
+    break;
+  case GR_BUFFER_BACKBUFFER:
+    //glReadBuffer(GL_BACK);
+    break;
+    /*case GR_BUFFER_AUXBUFFER:
+    glReadBuffer(current_buffer);
+    break;*/
+  default:
+    display_warning("grReadRegion : unknown buffer : %x", src_buffer);
+  }
+
+  if(src_buffer != GR_BUFFER_AUXBUFFER)
+  {
+    buf = (unsigned char*)malloc(src_width*src_height*4);
+
+    glReadPixels(src_x, (viewport_offset)+height-src_y-src_height, src_width, src_height, GL_RGBA, GL_UNSIGNED_BYTE, buf);
+
+    for (j=0; j<src_height; j++)
+    {
+      for (i=0; i<src_width; i++)
+      {
+        frameBuffer[j*(dst_stride/2)+i] =
+          ((buf[(src_height-j-1)*src_width*4+i*4+0] >> 3) << 11) |
+          ((buf[(src_height-j-1)*src_width*4+i*4+1] >> 2) <<  5) |
+          (buf[(src_height-j-1)*src_width*4+i*4+2] >> 3);
+      }
+    }
+    free(buf);
+  }
+  else
+  {
+    buf = (unsigned char*)malloc(src_width*src_height*2);
+
+    glReadPixels(src_x, (viewport_offset)+height-src_y-src_height, src_width, src_height, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, depthBuffer);
+
+    for (j=0;j<src_height; j++)
+    {
+      for (i=0; i<src_width; i++)
+      {
+        depthBuffer[j*(dst_stride/2)+i] =
+          ((unsigned short*)buf)[(src_height-j-1)*src_width*4+i*4];
+      }
+    }
+    free(buf);
+  }
+
+  return FXTRUE;
+}
+
+FX_ENTRY FxBool FX_CALL
+grLfbWriteRegion( GrBuffer_t dst_buffer,
+                 FxU32 dst_x, FxU32 dst_y,
+                 GrLfbSrcFmt_t src_format,
+                 FxU32 src_width, FxU32 src_height,
+                 FxBool pixelPipeline,
+                 FxI32 src_stride, void *src_data )
+{
+  unsigned char *buf;
+  unsigned int i,j;
+  unsigned short *frameBuffer = (unsigned short*)src_data;
+  int texture_number;
+  unsigned int tex_width = 1, tex_height = 1;
+  LOG("grLfbWriteRegion(%d,%d,%d,%d,%d,%d,%d,%d)\r\n",dst_buffer, dst_x, dst_y, src_format, src_width, src_height, pixelPipeline, src_stride);
+
+  //glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+  while (tex_width < src_width) tex_width <<= 1;
+  while (tex_height < src_height) tex_height <<= 1;
+
+  switch(dst_buffer)
+  {
+  case GR_BUFFER_BACKBUFFER:
+    //glDrawBuffer(GL_BACK);
+    break;
+  case GR_BUFFER_AUXBUFFER:
+    //glDrawBuffer(current_buffer);
+    break;
+  default:
+    display_warning("grLfbWriteRegion : unknown buffer : %x", dst_buffer);
+  }
+
+  if(dst_buffer != GR_BUFFER_AUXBUFFER)
+  {
+    buf = (unsigned char*)malloc(tex_width*tex_height*4);
+
+    texture_number = GL_TEXTURE0;
+    glActiveTexture(texture_number);
+
+    const unsigned int half_stride = src_stride / 2;
+    switch(src_format)
+    {
+    case GR_LFB_SRC_FMT_1555:
+      for (j=0; j<src_height; j++)
+      {
+        for (i=0; i<src_width; i++)
+        {
+          const unsigned int col = frameBuffer[j*half_stride+i];
+          buf[j*tex_width*4+i*4+0]=((col>>10)&0x1F)<<3;
+          buf[j*tex_width*4+i*4+1]=((col>>5)&0x1F)<<3;
+          buf[j*tex_width*4+i*4+2]=((col>>0)&0x1F)<<3;
+          buf[j*tex_width*4+i*4+3]= (col>>15) ? 0xFF : 0;
+        }
+      }
+      break;
+    case GR_LFBWRITEMODE_555:
+      for (j=0; j<src_height; j++)
+      {
+        for (i=0; i<src_width; i++)
+        {
+          const unsigned int col = frameBuffer[j*half_stride+i];
+          buf[j*tex_width*4+i*4+0]=((col>>10)&0x1F)<<3;
+          buf[j*tex_width*4+i*4+1]=((col>>5)&0x1F)<<3;
+          buf[j*tex_width*4+i*4+2]=((col>>0)&0x1F)<<3;
+          buf[j*tex_width*4+i*4+3]=0xFF;
+        }
+      }
+      break;
+    case GR_LFBWRITEMODE_565:
+      for (j=0; j<src_height; j++)
+      {
+        for (i=0; i<src_width; i++)
+        {
+          const unsigned int col = frameBuffer[j*half_stride+i];
+          buf[j*tex_width*4+i*4+0]=((col>>11)&0x1F)<<3;
+          buf[j*tex_width*4+i*4+1]=((col>>5)&0x3F)<<2;
+          buf[j*tex_width*4+i*4+2]=((col>>0)&0x1F)<<3;
+          buf[j*tex_width*4+i*4+3]=0xFF;
+        }
+      }
+      break;
+    default:
+      display_warning("grLfbWriteRegion : unknown format : %d", src_format);
+    }
+
+#ifdef VPDEBUG
+    if (dumping) {
+      ilTexImage(tex_width, tex_height, 1, 4, IL_RGBA, IL_UNSIGNED_BYTE, buf);
+      char name[128];
+      static int id;
+      sprintf(name, "dump/writecolor%d.png", id++);
+      ilSaveImage(name);
+      //printf("dumped gdLfbWriteRegion %s\n", name);
+    }
+#endif
+
+    glBindTexture(GL_TEXTURE_2D, default_texture);
+    glTexImage2D(GL_TEXTURE_2D, 0, 4, tex_width, tex_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buf);
+    free(buf);
+
+    set_copy_shader();
+
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_BLEND);
+    render_rectangle(texture_number,
+      dst_x, dst_y,
+      src_width,  src_height,
+      tex_width,  tex_height, +1);
+
+  }
+  else
+  {
+    float *buf = (float*)malloc(src_width*(src_height+(viewport_offset))*sizeof(float));
+
+    if (src_format != GR_LFBWRITEMODE_ZA16)
+      display_warning("unknown depth buffer write format:%x", src_format);
+
+    if(dst_x || dst_y)
+      display_warning("dst_x:%d, dst_y:%d\n",dst_x, dst_y);
+
+    for (j=0; j<src_height; j++)
+    {
+      for (i=0; i<src_width; i++)
+      {
+        buf[(j+(viewport_offset))*src_width+i] =
+          (frameBuffer[(src_height-j-1)*(src_stride/2)+i]/(65536.0f*(2.0f/zscale)))+1-zscale/2.0f;
+      }
+    }
+
+#ifdef VPDEBUG
+    if (dumping) {
+      unsigned char * buf2 = (unsigned char *)malloc(src_width*(src_height+(viewport_offset)));
+      for (i=0; i<src_width*src_height ; i++)
+        buf2[i] = buf[i]*255.0f;
+      ilTexImage(src_width, src_height, 1, 1, IL_LUMINANCE, IL_UNSIGNED_BYTE, buf2);
+      char name[128];
+      static int id;
+      sprintf(name, "dump/writedepth%d.png", id++);
+      ilSaveImage(name);
+      //printf("dumped gdLfbWriteRegion %s\n", name);
+      free(buf2);
+    }
+#endif
+
+    glEnable(GL_DEPTH_TEST);
+    glDepthFunc(GL_ALWAYS);
+
+    //glDrawBuffer(GL_BACK);
+    glClear( GL_DEPTH_BUFFER_BIT );
+    glDepthMask(1);
+    //glDrawPixels(src_width, src_height+(viewport_offset), GL_DEPTH_COMPONENT, GL_FLOAT, buf);
+
+    free(buf);
+  }
+  //glDrawBuffer(current_buffer);
+  //glPopAttrib();
+  return FXTRUE;
+}
+
+/* wrapper-specific glide extensions */
+
+FX_ENTRY char ** FX_CALL
+grQueryResolutionsExt(FxI32 * Size)
+{
+  return 0;
+/*
+  LOG("grQueryResolutionsExt\r\n");
+  return g_FullScreenResolutions.getResolutionsList(Size);
+*/
+}
+
+FX_ENTRY GrScreenResolution_t FX_CALL grWrapperFullScreenResolutionExt(FxU32* width, FxU32* height)
+{
+  return 0;
+/*
+  LOG("grWrapperFullScreenResolutionExt\r\n");
+  g_FullScreenResolutions.getResolution(config.res, width, height);
+  return config.res;
+*/
+}
+
+FX_ENTRY FxBool FX_CALL grKeyPressedExt(FxU32 key)
+{
+  return 0;
+/*
+#ifdef _WIN32
+  return (GetAsyncKeyState(key) & 0x8000);
+#else
+  if (key == 1) //LBUTTON
+  {
+    Uint8 mstate = SDL_GetMouseState(NULL, NULL);
+    return (mstate & SDL_BUTTON_LMASK);
+  }
+  else
+  {
+    Uint8 *keystates = SDL_GetKeyState( NULL );
+    if( keystates[ key ] )
+    {
+      return 1;
+    }
+    else
+    {
+      return 0;
+    }
+  }
+#endif
+*/
+}
+
+FX_ENTRY void FX_CALL grConfigWrapperExt(FxI32 resolution, FxI32 vram, FxBool fbo, FxBool aniso)
+{
+  LOG("grConfigWrapperExt\r\n");
+  config.res = resolution;
+  config.vram_size = vram;
+  config.fbo = fbo;
+  config.anisofilter = aniso;
+}
+
+// unused by glide64
+
+FX_ENTRY FxI32 FX_CALL
+grQueryResolutions( const GrResolution *resTemplate, GrResolution *output )
+{
+  int res_inf = 0;
+  int res_sup = 0xf;
+  int i;
+  int n=0;
+  LOG("grQueryResolutions\r\n");
+  display_warning("grQueryResolutions");
+  if ((unsigned int)resTemplate->resolution != GR_QUERY_ANY)
+  {
+    res_inf = res_sup = resTemplate->resolution;
+  }
+  if ((unsigned int)resTemplate->refresh == GR_QUERY_ANY) display_warning("querying any refresh rate");
+  if ((unsigned int)resTemplate->numAuxBuffers == GR_QUERY_ANY) display_warning("querying any numAuxBuffers");
+  if ((unsigned int)resTemplate->numColorBuffers == GR_QUERY_ANY) display_warning("querying any numColorBuffers");
+
+  if (output == NULL) return res_sup - res_inf + 1;
+  for (i=res_inf; i<=res_sup; i++)
+  {
+    output[n].resolution = i;
+    output[n].refresh = resTemplate->refresh;
+    output[n].numAuxBuffers = resTemplate->numAuxBuffers;
+    output[n].numColorBuffers = resTemplate->numColorBuffers;
+    n++;
+  }
+  return res_sup - res_inf + 1;
+}
+
+FX_ENTRY FxBool FX_CALL
+grReset( FxU32 what )
+{
+  display_warning("grReset");
+  return 1;
+}
+
+FX_ENTRY void FX_CALL
+grEnable( GrEnableMode_t mode )
+{
+  LOG("grEnable(%d)\r\n", mode);
+  if (mode == GR_TEXTURE_UMA_EXT)
+    UMAmode = 1;
+}
+
+FX_ENTRY void FX_CALL
+grDisable( GrEnableMode_t mode )
+{
+  LOG("grDisable(%d)\r\n", mode);
+  if (mode == GR_TEXTURE_UMA_EXT)
+    UMAmode = 0;
+}
+
+FX_ENTRY void FX_CALL
+grDisableAllEffects( void )
+{
+  display_warning("grDisableAllEffects");
+}
+
+FX_ENTRY void FX_CALL
+grErrorSetCallback( GrErrorCallbackFnc_t fnc )
+{
+  display_warning("grErrorSetCallback");
+}
+
+FX_ENTRY void FX_CALL
+grFinish(void)
+{
+  display_warning("grFinish");
+}
+
+FX_ENTRY void FX_CALL
+grFlush(void)
+{
+  display_warning("grFlush");
+}
+
+FX_ENTRY void FX_CALL
+grTexMultibase( GrChipID_t tmu,
+               FxBool     enable )
+{
+  display_warning("grTexMultibase");
+}
+
+FX_ENTRY void FX_CALL
+grTexMipMapMode( GrChipID_t     tmu,
+                GrMipMapMode_t mode,
+                FxBool         lodBlend )
+{
+  display_warning("grTexMipMapMode");
+}
+
+FX_ENTRY void FX_CALL
+grTexDownloadTablePartial( GrTexTable_t type,
+                          void         *data,
+                          int          start,
+                          int          end )
+{
+  display_warning("grTexDownloadTablePartial");
+}
+
+FX_ENTRY void FX_CALL
+grTexDownloadTable( GrTexTable_t type,
+                   void         *data )
+{
+  display_warning("grTexDownloadTable");
+}
+
+FX_ENTRY FxBool FX_CALL
+grTexDownloadMipMapLevelPartial( GrChipID_t        tmu,
+                                FxU32             startAddress,
+                                GrLOD_t           thisLod,
+                                GrLOD_t           largeLod,
+                                GrAspectRatio_t   aspectRatio,
+                                GrTextureFormat_t format,
+                                FxU32             evenOdd,
+                                void              *data,
+                                int               start,
+                                int               end )
+{
+  display_warning("grTexDownloadMipMapLevelPartial");
+  return 1;
+}
+
+FX_ENTRY void FX_CALL
+grTexDownloadMipMapLevel( GrChipID_t        tmu,
+                         FxU32             startAddress,
+                         GrLOD_t           thisLod,
+                         GrLOD_t           largeLod,
+                         GrAspectRatio_t   aspectRatio,
+                         GrTextureFormat_t format,
+                         FxU32             evenOdd,
+                         void              *data )
+{
+  display_warning("grTexDownloadMipMapLevel");
+}
+
+FX_ENTRY void FX_CALL
+grTexNCCTable( GrNCCTable_t table )
+{
+  display_warning("grTexNCCTable");
+}
+
+FX_ENTRY void FX_CALL
+grViewport( FxI32 x, FxI32 y, FxI32 width, FxI32 height )
+{
+  display_warning("grViewport");
+}
+
+FX_ENTRY void FX_CALL
+grDepthRange( FxFloat n, FxFloat f )
+{
+  display_warning("grDepthRange");
+}
+
+FX_ENTRY void FX_CALL
+grSplash(float x, float y, float width, float height, FxU32 frame)
+{
+  display_warning("grSplash");
+}
+
+FX_ENTRY FxBool FX_CALL
+grSelectContext( GrContext_t context )
+{
+  display_warning("grSelectContext");
+  return 1;
+}
+
+FX_ENTRY void FX_CALL
+grAADrawTriangle(
+                 const void *a, const void *b, const void *c,
+                 FxBool ab_antialias, FxBool bc_antialias, FxBool ca_antialias
+                 )
+{
+  display_warning("grAADrawTriangle");
+}
+
+FX_ENTRY void FX_CALL
+grAlphaControlsITRGBLighting( FxBool enable )
+{
+  display_warning("grAlphaControlsITRGBLighting");
+}
+
+FX_ENTRY void FX_CALL
+grGlideSetVertexLayout( const void *layout )
+{
+  display_warning("grGlideSetVertexLayout");
+}
+
+FX_ENTRY void FX_CALL
+grGlideGetVertexLayout( void *layout )
+{
+  display_warning("grGlideGetVertexLayout");
+}
+
+FX_ENTRY void FX_CALL
+grGlideSetState( const void *state )
+{
+  display_warning("grGlideSetState");
+}
+
+FX_ENTRY void FX_CALL
+grGlideGetState( void *state )
+{
+  display_warning("grGlideGetState");
+}
+
+FX_ENTRY void FX_CALL
+grLfbWriteColorFormat(GrColorFormat_t colorFormat)
+{
+  display_warning("grLfbWriteColorFormat");
+}
+
+FX_ENTRY void FX_CALL
+grLfbWriteColorSwizzle(FxBool swizzleBytes, FxBool swapWords)
+{
+  display_warning("grLfbWriteColorSwizzle");
+}
+
+FX_ENTRY void FX_CALL
+grLfbConstantDepth( FxU32 depth )
+{
+  display_warning("grLfbConstantDepth");
+}
+
+FX_ENTRY void FX_CALL
+grLfbConstantAlpha( GrAlpha_t alpha )
+{
+  display_warning("grLfbConstantAlpha");
+}
+
+FX_ENTRY void FX_CALL
+grTexMultibaseAddress( GrChipID_t       tmu,
+                      GrTexBaseRange_t range,
+                      FxU32            startAddress,
+                      FxU32            evenOdd,
+                      GrTexInfo        *info )
+{
+  display_warning("grTexMultibaseAddress");
+}
+
+/*
+inline void MySleep(FxU32 ms)
+{
+#ifdef _WIN32
+  Sleep(ms);
+#else
+  SDL_Delay(ms);
+#endif
+}
+*/
+
+#ifdef _WIN32
+static void CorrectGamma(LPVOID apGammaRamp)
+{
+  HDC hdc = GetDC(NULL);
+  if (hdc != NULL)
+  {
+    SetDeviceGammaRamp(hdc, apGammaRamp);
+    ReleaseDC(NULL, hdc);
+  }
+}
+#else
+static void CorrectGamma(const FxU16 aGammaRamp[3][256])
+{
+  //TODO?
+  //int res = SDL_SetGammaRamp(aGammaRamp[0], aGammaRamp[1], aGammaRamp[2]);
+  //LOG("SDL_SetGammaRamp returned %d\r\n", res);
+}
+#endif
+
+FX_ENTRY void FX_CALL
+grLoadGammaTable( FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue)
+{
+  LOG("grLoadGammaTable\r\n");
+  if (!fullscreen)
+    return;
+  FxU16 aGammaRamp[3][256];
+  for (int i = 0; i < 256; i++)
+  {
+    aGammaRamp[0][i] = (FxU16)((red[i] << 8) & 0xFFFF);
+    aGammaRamp[1][i] = (FxU16)((green[i] << 8) & 0xFFFF);
+    aGammaRamp[2][i] = (FxU16)((blue[i] << 8) & 0xFFFF);
+  }
+  CorrectGamma(aGammaRamp);
+  //MySleep(1000); //workaround for Mupen64
+}
+
+FX_ENTRY void FX_CALL
+grGetGammaTableExt(FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue)
+{
+  return;
+  //TODO?
+  /*
+  LOG("grGetGammaTableExt()\r\n");
+  FxU16 aGammaRamp[3][256];
+#ifdef _WIN32
+  HDC hdc = GetDC(NULL);
+  if (hdc == NULL)
+    return;
+  if (GetDeviceGammaRamp(hdc, aGammaRamp) == TRUE)
+  {
+    ReleaseDC(NULL, hdc);
+#else
+  if (SDL_GetGammaRamp(aGammaRamp[0], aGammaRamp[1], aGammaRamp[2]) != -1)
+  {
+#endif
+    for (int i = 0; i < 256; i++)
+    {
+      red[i] = aGammaRamp[0][i] >> 8;
+      green[i] = aGammaRamp[1][i] >> 8;
+      blue[i] = aGammaRamp[2][i] >> 8;
+    }
+  }
+  */
+}
+
+FX_ENTRY void FX_CALL
+guGammaCorrectionRGB( FxFloat gammaR, FxFloat gammaG, FxFloat gammaB )
+{
+  LOG("guGammaCorrectionRGB()\r\n");
+  if (!fullscreen)
+    return;
+  FxU16 aGammaRamp[3][256];
+  for (int i = 0; i < 256; i++)
+  {
+    aGammaRamp[0][i] = (((FxU16)((pow(i/255.0F, 1.0F/gammaR)) * 255.0F + 0.5F)) << 8) & 0xFFFF;
+    aGammaRamp[1][i] = (((FxU16)((pow(i/255.0F, 1.0F/gammaG)) * 255.0F + 0.5F)) << 8) & 0xFFFF;
+    aGammaRamp[2][i] = (((FxU16)((pow(i/255.0F, 1.0F/gammaB)) * 255.0F + 0.5F)) << 8) & 0xFFFF;
+  }
+  CorrectGamma(aGammaRamp);
+}
+
+FX_ENTRY void FX_CALL
+grDitherMode( GrDitherMode_t mode )
+{
+  display_warning("grDitherMode");
+}
+
+void grChromaRangeExt(GrColor_t color0, GrColor_t color1, FxU32 mode)
+{
+  display_warning("grChromaRangeExt");
+}
+
+void grChromaRangeModeExt(GrChromakeyMode_t mode)
+{
+  display_warning("grChromaRangeModeExt");
+}
+
+void grTexChromaRangeExt(GrChipID_t tmu, GrColor_t color0, GrColor_t color1, GrTexChromakeyMode_t mode)
+{
+  display_warning("grTexChromaRangeExt");
+}
+
+void grTexChromaModeExt(GrChipID_t tmu, GrChromakeyMode_t mode)
+{
+  display_warning("grTexChromaRangeModeExt");
+}
+
+// VP debug
+#ifdef VPDEBUG
+int dumping = 0;
+static int tl_i;
+static int tl[10240];
+
+void dump_start()
+{
+  static int init;
+  if (!init) {
+    init = 1;
+    ilInit();
+    ilEnable(IL_FILE_OVERWRITE);
+  }
+  dumping = 1;
+  tl_i = 0;
+}
+
+void dump_stop()
+{
+  if (!dumping) return;
+
+  int i, j;
+  for (i=0; i<nb_fb; i++) {
+    dump_tex(fbs[i].texid);
+  }
+  dump_tex(default_texture);
+  dump_tex(depth_texture);
+
+  dumping = 0;
+
+  glReadBuffer(GL_FRONT);
+  glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, frameBuffer);
+  ilTexImage(width, height, 1, 4, IL_RGBA, IL_UNSIGNED_BYTE, frameBuffer);
+  ilSaveImage("dump/framecolor.png");
+  glReadPixels(0, 0, width, height, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, depthBuffer);
+  //   FILE * fp = fopen("glide_depth1.bin", "rb");
+  //   fread(depthBuffer, 2, width*height, fp);
+  //   fclose(fp);
+  for (j=0; j<height; j++) {
+    for (i=0; i<width; i++) {
+      //uint16_t d = ( (uint16_t *)depthBuffer )[i+(height-1-j)*width]/2 + 0x8000;
+      uint16_t d = ( (uint16_t *)depthBuffer )[i+j*width];
+      uint32_t c = ( (uint32_t *)frameBuffer )[i+j*width];
+      ( (unsigned char *)frameBuffer )[(i+j*width)*3] = d&0xff;
+      ( (unsigned char *)frameBuffer )[(i+j*width)*3+1] = d>>8;
+      ( (unsigned char *)frameBuffer )[(i+j*width)*3+2] = c&0xff;
+    }
+  }
+  ilTexImage(width, height, 1, 3, IL_RGB, IL_UNSIGNED_BYTE, frameBuffer);
+  ilSaveImage("dump/framedepth.png");
+
+  for (i=0; i<tl_i; i++) {
+    glBindTexture(GL_TEXTURE_2D, tl[i]);
+    GLint w, h, fmt;
+    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w);
+    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h);
+    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &fmt);
+    fprintf(stderr, "Texture %d %dx%d fmt %x\n", tl[i], (int)w, (int)h, (int) fmt);
+
+    uint32_t * pixels = (uint32_t *) malloc(w*h*4);
+    // 0x1902 is another constant meaning GL_DEPTH_COMPONENT
+    // (but isn't defined in gl's headers !!)
+    if (fmt != GL_DEPTH_COMPONENT && fmt != 0x1902) {
+      glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+      ilTexImage(w, h, 1, 4, IL_RGBA, IL_UNSIGNED_BYTE, pixels);
+    } else {
+      glGetTexImage(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, pixels);
+      int i;
+      for (i=0; i<w*h; i++)
+        ((unsigned char *)frameBuffer)[i] = ((unsigned short *)pixels)[i]/256;
+      ilTexImage(w, h, 1, 1, IL_LUMINANCE, IL_UNSIGNED_BYTE, frameBuffer);
+    }
+    char name[128];
+    //     sprintf(name, "mkdir -p dump ; rm -f dump/tex%04d.png", i);
+    //     system(name);
+    sprintf(name, "dump/tex%04d.png", i);
+    fprintf(stderr, "Writing '%s'\n", name);
+    ilSaveImage(name);
+
+    //     SDL_FreeSurface(surf);
+    free(pixels);
+  }
+  glBindTexture(GL_TEXTURE_2D, default_texture);
+}
+
+void dump_tex(int id)
+{
+  if (!dumping) return;
+
+  int n;
+  // yes, it's inefficient
+  for (n=0; n<tl_i; n++)
+    if (tl[n] == id)
+      return;
+
+  tl[tl_i++] = id;
+
+  int i = tl_i-1;
+}
+
+#endif
diff --git a/Source/Glitch64/OGLEStextures.cpp b/Source/Glitch64/OGLEStextures.cpp
new file mode 100644
index 000000000..2f06859c1
--- /dev/null
+++ b/Source/Glitch64/OGLEStextures.cpp
@@ -0,0 +1,900 @@
+/*
+* Glide64 - Glide video plugin for Nintendo 64 emulators.
+* Copyright (c) 2002  Dave2001
+* Copyright (c) 2003-2009  Sergey 'Gonetz' Lipski
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifdef _WIN32
+#include <windows.h>
+#else // _WIN32
+#include <stdlib.h>
+#endif // _WIN32
+#include "glide.h"
+#include "glitchmain.h"
+#include <stdio.h>
+
+/* Napalm extensions to GrTextureFormat_t */
+#define GR_TEXFMT_ARGB_CMP_FXT1           0x11
+#define GR_TEXFMT_ARGB_8888               0x12
+#define GR_TEXFMT_YUYV_422                0x13
+#define GR_TEXFMT_UYVY_422                0x14
+#define GR_TEXFMT_AYUV_444                0x15
+#define GR_TEXFMT_ARGB_CMP_DXT1           0x16
+#define GR_TEXFMT_ARGB_CMP_DXT2           0x17
+#define GR_TEXFMT_ARGB_CMP_DXT3           0x18
+#define GR_TEXFMT_ARGB_CMP_DXT4           0x19
+#define GR_TEXFMT_ARGB_CMP_DXT5           0x1A
+#define GR_TEXTFMT_RGB_888                0xFF
+
+int TMU_SIZE = 8*2048*2048;
+static unsigned char* texture = NULL;
+
+int packed_pixels_support = -1;
+int ati_sucks = -1;
+float largest_supported_anisotropy = 1.0f;
+
+#ifndef GL_TEXTURE_MAX_ANISOTROPY_EXT
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
+#endif
+
+int tex0_width, tex0_height, tex1_width, tex1_height;
+float lambda;
+
+static int min_filter0, mag_filter0, wrap_s0, wrap_t0;
+static int min_filter1, mag_filter1, wrap_s1, wrap_t1;
+
+unsigned char *filter(unsigned char *source, int width, int height, int *width2, int *height2);
+
+typedef struct _texlist
+{
+  unsigned int id;
+  struct _texlist *next;
+} texlist;
+
+static int nbTex = 0;
+static texlist *list = NULL;
+
+#ifdef _WIN32
+extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
+extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
+extern PFNGLCOMPRESSEDTEXIMAGE2DARBPROC glCompressedTexImage2DARB;
+#endif
+void remove_tex(unsigned int idmin, unsigned int idmax)
+{
+  unsigned int *t;
+  int n = 0;
+  texlist *aux = list;
+  int sz = nbTex;
+  if (aux == NULL) return;
+  t = (unsigned int*)malloc(sz * sizeof(int));
+  while (aux && aux->id >= idmin && aux->id < idmax)
+  {
+    if (n >= sz)
+      t = (unsigned int *) realloc(t, ++sz*sizeof(int));
+    t[n++] = aux->id;
+    aux = aux->next;
+    free(list);
+    list = aux;
+    nbTex--;
+  }
+  while (aux != NULL && aux->next != NULL)
+  {
+    if (aux->next->id >= idmin && aux->next->id < idmax)
+    {
+      texlist *aux2 = aux->next->next;
+      if (n >= sz)
+        t = (unsigned int *) realloc(t, ++sz*sizeof(int));
+      t[n++] = aux->next->id;
+      free(aux->next);
+      aux->next = aux2;
+      nbTex--;
+    }
+    aux = aux->next;
+  }
+  glDeleteTextures(n, t);
+  free(t);
+  //printf("RMVTEX nbtex is now %d (%06x - %06x)\n", nbTex, idmin, idmax);
+}
+
+
+void add_tex(unsigned int id)
+{
+  texlist *aux = list;
+  texlist *aux2;
+  //printf("ADDTEX nbtex is now %d (%06x)\n", nbTex, id);
+  if (list == NULL || id < list->id)
+  {
+    nbTex++;
+    list = (texlist*)malloc(sizeof(texlist));
+    list->next = aux;
+    list->id = id;
+    return;
+  }
+  while (aux->next != NULL && aux->next->id < id) aux = aux->next;
+  // ZIGGY added this test so that add_tex now accept re-adding an existing texture
+  if (aux->next != NULL && aux->next->id == id) return;
+  nbTex++;
+  aux2 = aux->next;
+  aux->next = (texlist*)malloc(sizeof(texlist));
+  aux->next->id = id;
+  aux->next->next = aux2;
+}
+
+void init_textures()
+{
+  tex0_width = tex0_height = tex1_width = tex1_height = 2;
+  // ZIGGY because remove_tex isn't called (Pj64 doesn't like it), it's better
+  // to leave these so that they'll be reused (otherwise we have a memory leak)
+  // 	list = NULL;
+  // 	nbTex = 0;
+
+  if (!texture)	texture = (unsigned char*)malloc(2048*2048*4);
+}
+
+void free_textures()
+{
+#ifndef WIN32
+  // ZIGGY for some reasons, Pj64 doesn't like remove_tex on exit
+  remove_tex(0x00000000, 0xFFFFFFFF);
+#endif
+  if (texture != NULL) {
+    free(texture);
+    texture = NULL;
+  }
+}
+
+FX_ENTRY FxU32 FX_CALL
+grTexMinAddress( GrChipID_t tmu )
+{
+  LOG("grTexMinAddress(%d)\r\n", tmu);
+  if (UMAmode)
+    return 0;
+  else
+    return tmu*TMU_SIZE;
+}
+
+FX_ENTRY FxU32 FX_CALL
+grTexMaxAddress( GrChipID_t tmu )
+{
+  LOG("grTexMaxAddress(%d)\r\n", tmu);
+  if (UMAmode)
+    return TMU_SIZE*2 - 1;
+  else
+    return tmu*TMU_SIZE + TMU_SIZE - 1;
+}
+
+FX_ENTRY FxU32 FX_CALL
+grTexTextureMemRequired( FxU32     evenOdd,
+                        GrTexInfo *info   )
+{
+  int width, height;
+  LOG("grTextureMemRequired(%d)\r\n", evenOdd);
+  if (info->largeLodLog2 != info->smallLodLog2) display_warning("grTexTextureMemRequired : loading more than one LOD");
+
+  if (info->aspectRatioLog2 < 0)
+  {
+    height = 1 << info->largeLodLog2;
+    width = height >> -info->aspectRatioLog2;
+  }
+  else
+  {
+    width = 1 << info->largeLodLog2;
+    height = width >> info->aspectRatioLog2;
+  }
+
+  switch(info->format)
+  {
+  case GR_TEXFMT_ALPHA_8:
+  case GR_TEXFMT_INTENSITY_8: // I8 support - H.Morii
+  case GR_TEXFMT_ALPHA_INTENSITY_44:
+    return width*height;
+    break;
+  case GR_TEXFMT_ARGB_1555:
+  case GR_TEXFMT_ARGB_4444:
+  case GR_TEXFMT_ALPHA_INTENSITY_88:
+  case GR_TEXFMT_RGB_565:
+    return (width*height)<<1;
+    break;
+  case GR_TEXFMT_ARGB_8888:
+    return (width*height)<<2;
+    break;
+  case GR_TEXFMT_ARGB_CMP_DXT1:  // FXT1,DXT1,5 support - H.Morii
+    return ((((width+0x3)&~0x3)*((height+0x3)&~0x3))>>1);
+  case GR_TEXFMT_ARGB_CMP_DXT3:
+    return ((width+0x3)&~0x3)*((height+0x3)&~0x3);
+  case GR_TEXFMT_ARGB_CMP_DXT5:
+    return ((width+0x3)&~0x3)*((height+0x3)&~0x3);
+  case GR_TEXFMT_ARGB_CMP_FXT1:
+    return ((((width+0x7)&~0x7)*((height+0x3)&~0x3))>>1);
+  default:
+    display_warning("grTexTextureMemRequired : unknown texture format: %x", info->format);
+  }
+  return 0;
+}
+
+FX_ENTRY FxU32 FX_CALL
+grTexCalcMemRequired(
+                     GrLOD_t lodmin, GrLOD_t lodmax,
+                     GrAspectRatio_t aspect, GrTextureFormat_t fmt)
+{
+  int width, height;
+  LOG("grTexCalcMemRequired(%d, %d, %d, %d)\r\n", lodmin, lodmax, aspect, fmt);
+  if (lodmax != lodmin) display_warning("grTexCalcMemRequired : loading more than one LOD");
+
+  if (aspect < 0)
+  {
+    height = 1 << lodmax;
+    width = height >> -aspect;
+  }
+  else
+  {
+    width = 1 << lodmax;
+    height = width >> aspect;
+  }
+
+  switch(fmt)
+  {
+  case GR_TEXFMT_ALPHA_8:
+  case GR_TEXFMT_INTENSITY_8: // I8 support - H.Morii
+  case GR_TEXFMT_ALPHA_INTENSITY_44:
+    return width*height;
+    break;
+  case GR_TEXFMT_ARGB_1555:
+  case GR_TEXFMT_ARGB_4444:
+  case GR_TEXFMT_ALPHA_INTENSITY_88:
+  case GR_TEXFMT_RGB_565:
+    return (width*height)<<1;
+    break;
+  case GR_TEXFMT_ARGB_8888:
+    return (width*height)<<2;
+    break;
+  case GR_TEXFMT_ARGB_CMP_DXT1:  // FXT1,DXT1,5 support - H.Morii
+    return ((((width+0x3)&~0x3)*((height+0x3)&~0x3))>>1);
+  case GR_TEXFMT_ARGB_CMP_DXT3:
+    return ((width+0x3)&~0x3)*((height+0x3)&~0x3);
+  case GR_TEXFMT_ARGB_CMP_DXT5:
+    return ((width+0x3)&~0x3)*((height+0x3)&~0x3);
+  case GR_TEXFMT_ARGB_CMP_FXT1:
+    return ((((width+0x7)&~0x7)*((height+0x3)&~0x3))>>1);
+  default:
+    display_warning("grTexTextureMemRequired : unknown texture format: %x", fmt);
+  }
+  return 0;
+}
+
+int grTexFormatSize(int fmt)
+{
+  int factor = -1;
+  switch(fmt) {
+  case GR_TEXFMT_ALPHA_8:
+  case GR_TEXFMT_INTENSITY_8: // I8 support - H.Morii
+    factor = 1;
+    break;
+  case GR_TEXFMT_ALPHA_INTENSITY_44:
+    factor = 1;
+    break;
+  case GR_TEXFMT_RGB_565:
+    factor = 2;
+    break;
+  case GR_TEXFMT_ARGB_1555:
+    factor = 2;
+    break;
+  case GR_TEXFMT_ALPHA_INTENSITY_88:
+    factor = 2;
+    break;
+  case GR_TEXFMT_ARGB_4444:
+    factor = 2;
+    break;
+  case GR_TEXFMT_ARGB_8888:
+    factor = 4;
+    break;
+  case GR_TEXFMT_ARGB_CMP_DXT1:  // FXT1,DXT1,5 support - H.Morii
+    factor = 8;                  // HACKALERT: factor holds block bytes
+    break;
+  case GR_TEXFMT_ARGB_CMP_DXT3:  // FXT1,DXT1,5 support - H.Morii
+    factor = 16;                  // HACKALERT: factor holds block bytes
+    break;
+  case GR_TEXFMT_ARGB_CMP_DXT5:
+    factor = 16;
+    break;
+  case GR_TEXFMT_ARGB_CMP_FXT1:
+    factor = 8;
+    break;
+  default:
+    display_warning("grTexFormatSize : unknown texture format: %x", fmt);
+  }
+  return factor;
+}
+
+int grTexFormat2GLPackedFmt(int fmt, int * gltexfmt, int * glpixfmt, int * glpackfmt)
+{
+    *gltexfmt = GL_RGBA;
+    *glpixfmt = GL_RGBA;
+    *glpackfmt = GL_UNSIGNED_BYTE;
+    return 0;
+/*
+  int factor = -1;
+  switch(fmt) {
+  case GR_TEXFMT_ALPHA_8:
+    factor = 1;
+    *gltexfmt = GL_INTENSITY8;
+    *glpixfmt = GL_LUMINANCE;
+    *glpackfmt = GL_UNSIGNED_BYTE;
+    break;
+  case GR_TEXFMT_INTENSITY_8: // I8 support - H.Morii
+    factor = 1;
+    *gltexfmt = GL_LUMINANCE8;
+    *glpixfmt = GL_LUMINANCE;
+    *glpackfmt = GL_UNSIGNED_BYTE;
+    break;
+  case GR_TEXFMT_ALPHA_INTENSITY_44:
+    break;
+  case GR_TEXFMT_RGB_565:
+    factor = 2;
+    *gltexfmt = GL_RGB;
+    *glpixfmt = GL_RGB;
+    *glpackfmt = GL_UNSIGNED_SHORT_5_6_5;
+    break;
+  case GR_TEXFMT_ARGB_1555:
+    if (ati_sucks > 0) return -1; // ATI sucks as usual (fixes slowdown on ATI)
+    factor = 2;
+    *gltexfmt = GL_RGB5_A1;
+    *glpixfmt = GL_BGRA;
+    *glpackfmt = GL_UNSIGNED_SHORT_1_5_5_5_REV;
+    break;
+  case GR_TEXFMT_ALPHA_INTENSITY_88:
+    factor = 2;
+    *gltexfmt = GL_LUMINANCE8_ALPHA8;
+    *glpixfmt = GL_LUMINANCE_ALPHA;
+    *glpackfmt = GL_UNSIGNED_BYTE;
+    break;
+  case GR_TEXFMT_ARGB_4444:
+    factor = 2;
+    *gltexfmt = GL_RGBA4;
+    *glpixfmt = GL_BGRA;
+    *glpackfmt = GL_UNSIGNED_SHORT_4_4_4_4_REV;
+    break;
+  case GR_TEXFMT_ARGB_8888:
+    factor = 4;
+    *gltexfmt = GL_RGBA8;
+    *glpixfmt = GL_BGRA;
+    *glpackfmt = GL_UNSIGNED_INT_8_8_8_8_REV;
+    break;
+  case GR_TEXFMT_ARGB_CMP_DXT1:  // FXT1,DXT1,5 support - H.Morii
+    // HACKALERT: 3Dfx Glide uses GR_TEXFMT_ARGB_CMP_DXT1 for both opaque DXT1 and DXT1 with 1bit alpha.
+    // GlideHQ compiled with GLIDE64_DXTN option enabled, uses opaqe DXT1 only.
+    factor = 8; // HACKALERT: factor holds block bytes
+    *gltexfmt = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; // these variables aren't used
+    *glpixfmt = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+    *glpackfmt = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+    break;
+  case GR_TEXFMT_ARGB_CMP_DXT3:
+    factor = 16;
+    *gltexfmt = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+    *glpixfmt = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+    *glpackfmt = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+    break;
+  case GR_TEXFMT_ARGB_CMP_DXT5:
+    factor = 16;
+    *gltexfmt = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+    *glpixfmt = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+    *glpackfmt = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+    break;
+  case GR_TEXFMT_ARGB_CMP_FXT1:
+    factor = 8;
+    *gltexfmt = GL_COMPRESSED_RGBA_FXT1_3DFX;
+    *glpixfmt = GL_COMPRESSED_RGBA_FXT1_3DFX;
+    *glpackfmt = GL_COMPRESSED_RGBA_FXT1_3DFX; // XXX: what should we do about GL_COMPRESSED_RGB_FXT1_3DFX?
+    break;
+  default:
+    display_warning("grTexFormat2GLPackedFmt : unknown texture format: %x", fmt);
+  }
+  return factor;
+*/
+}
+
+FX_ENTRY void FX_CALL
+grTexDownloadMipMap( GrChipID_t tmu,
+                    FxU32      startAddress,
+                    FxU32      evenOdd,
+                    GrTexInfo  *info )
+{
+  int width, height, i, j;
+  int factor;
+  int glformat = 0;
+  int gltexfmt, glpixfmt, glpackfmt;
+  LOG("grTexDownloadMipMap(%d,%d,%d)\r\n", tmu, startAddress, evenOdd);
+  if (info->largeLodLog2 != info->smallLodLog2) display_warning("grTexDownloadMipMap : loading more than one LOD");
+
+  if (info->aspectRatioLog2 < 0)
+  {
+    height = 1 << info->largeLodLog2;
+    width = height >> -info->aspectRatioLog2;
+  }
+  else
+  {
+    width = 1 << info->largeLodLog2;
+    height = width >> info->aspectRatioLog2;
+  }
+
+  if (!packed_pixels_support)
+    factor = -1;
+  else
+    factor = grTexFormat2GLPackedFmt(info->format, &gltexfmt, &glpixfmt, &glpackfmt);
+
+  if (factor < 0) {
+
+    // VP fixed the texture conversions to be more accurate, also swapped
+    // the for i/j loops so that is is less likely to break the memory cache
+    register int n = 0, m = 0;
+    switch(info->format)
+    {
+    case GR_TEXFMT_ALPHA_8:
+      for (i=0; i<height; i++)
+      {
+        for (j=0; j<width; j++)
+        {
+          unsigned int texel = (unsigned int)((unsigned char*)info->data)[m];
+          texel |= (texel << 8);
+          texel |= (texel << 16);
+          ((unsigned int*)texture)[n] = texel;
+          m++;
+          n++;
+        }
+      }
+      factor = 1;
+      glformat = GL_RGBA;
+      break;
+    case GR_TEXFMT_INTENSITY_8: // I8 support - H.Morii
+      for (i=0; i<height; i++)
+      {
+        for (j=0; j<width; j++)
+        {
+          unsigned int texel = (unsigned int)((unsigned char*)info->data)[m];
+          texel |= (0xFF000000 | (texel << 16) | (texel << 8));
+          ((unsigned int*)texture)[n] = texel;
+          m++;
+          n++;
+        }
+      }
+      factor = 1;
+      glformat = GL_ALPHA;
+      break;
+    case GR_TEXFMT_ALPHA_INTENSITY_44:
+#if 1
+      for (i=0; i<height; i++)
+      {
+        for (j=0; j<width; j++)
+        {
+          unsigned int texel = (unsigned int)((unsigned char*)info->data)[m];
+#if 1
+          /* accurate conversion */
+          unsigned int texel_hi = (texel & 0x000000F0) << 20;
+          unsigned int texel_low = texel & 0x0000000F;
+          texel_low |= (texel_low << 4);
+          texel_hi |= ((texel_hi << 4) | (texel_low << 16) | (texel_low << 8) | texel_low);
+#else
+          unsigned int texel_hi = (texel & 0x000000F0) << 24;
+          unsigned int texel_low = (texel & 0x0000000F) << 4;
+          texel_hi |= ((texel_low << 16) | (texel_low << 8) | texel_low);
+#endif
+          ((unsigned int*)texture)[n] = texel_hi;
+          m++;
+          n++;
+        }
+      }
+      factor = 1;
+      glformat = GL_LUMINANCE_ALPHA;
+#endif
+      break;
+    case GR_TEXFMT_RGB_565:
+      for (i=0; i<height; i++)
+      {
+        for (j=0; j<width; j++)
+        {
+          unsigned int texel = (unsigned int)((unsigned short*)info->data)[m];
+          unsigned int B = texel & 0x0000F800;
+          unsigned int G = texel & 0x000007E0;
+          unsigned int R = texel & 0x0000001F;
+#if 0
+          /* accurate conversion */
+          ((unsigned int*)texture)[n] = 0xFF000000 | (R << 19) | ((R >> 2) << 16) | (G << 5) | ((G >> 9) << 8) | (B >> 8) | (B >> 13);
+#else
+          ((unsigned int*)texture)[n] = 0xFF000000 | (R << 19) | (G << 5) | (B >> 8);
+#endif
+          m++;
+          n++;
+        }
+      }
+      factor = 2;
+      glformat = GL_RGB;
+      break;
+    case GR_TEXFMT_ARGB_1555:
+      for (i=0; i<height; i++)
+      {
+        for (j=0; j<width; j++)
+        {
+          unsigned int texel = (unsigned int)((unsigned short*)info->data)[m];
+          unsigned int A = texel & 0x00008000 ? 0xFF000000 : 0;
+          unsigned int B = texel & 0x00007C00;
+          unsigned int G = texel & 0x000003E0;
+          unsigned int R = texel & 0x0000001F;
+#if 0
+          /* accurate conversion */
+          ((unsigned int*)texture)[n] = A | (R << 19) | ((R >> 2) << 16) | (G << 6) | ((G >> 8) << 8) | (B >> 7) | (B >> 12);
+#else
+          ((unsigned int*)texture)[n] = A | (R << 19) | (G << 6) | (B >> 7);
+#endif
+          m++;
+          n++;
+        }
+      }
+      factor = 2;
+      glformat = GL_RGBA;
+      break;
+    case GR_TEXFMT_ALPHA_INTENSITY_88:
+      for (i=0; i<height; i++)
+      {
+        for (j=0; j<width; j++)
+        {
+          unsigned int AI = (unsigned int)((unsigned short*)info->data)[m];
+          unsigned int I = (unsigned int)(AI & 0x000000FF);
+          ((unsigned int*)texture)[n] = (AI << 16) | (I << 8) | I;
+          m++;
+          n++;
+        }
+      }
+      factor = 2;
+      glformat = GL_LUMINANCE_ALPHA;
+      break;
+    case GR_TEXFMT_ARGB_4444:
+
+      for (i=0; i<height; i++)
+      {
+        for (j=0; j<width; j++)
+        {
+          unsigned int texel = (unsigned int)((unsigned short*)info->data)[m];
+          unsigned int A = texel & 0x0000F000;
+          unsigned int B = texel & 0x00000F00;
+          unsigned int G = texel & 0x000000F0;
+          unsigned int R = texel & 0x0000000F;
+#if 0
+          /* accurate conversion */
+          ((unsigned int*)texture)[n] = (A << 16) | (A << 12) | (R << 20) | (R << 16) | (G << 8) | (G << 4) | (B >> 4) | (B >> 8);
+#else
+          ((unsigned int*)texture)[n] = (A << 16) | (R << 20) | (G << 8) | (B >> 4);
+#endif
+          m++;
+          n++;
+        }
+      }
+      factor = 2;
+      glformat = GL_RGBA;
+      break;
+    case GR_TEXFMT_ARGB_8888:
+      for (i=0; i<height; i++)
+      {
+        for (j=0; j<width; j++)
+        {
+          unsigned int texel = ((unsigned int*)info->data)[m];
+          unsigned int A = texel & 0xFF000000;
+          unsigned int B = texel & 0x00FF0000;
+          unsigned int G = texel & 0x0000FF00;
+          unsigned int R = texel & 0x000000FF;
+          ((unsigned int*)texture)[n] = A | (R << 16) | G | (B >> 16);
+          m++;
+          n++;
+        }
+      }
+      factor = 4;
+      glformat = GL_RGBA;
+      break;
+/*
+    case GR_TEXFMT_ARGB_CMP_DXT1: // FXT1,DXT1,5 support - H.Morii
+      factor = 8;                 // HACKALERT: factor holds block bytes
+      glformat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+      break;
+    case GR_TEXFMT_ARGB_CMP_DXT3: // FXT1,DXT1,5 support - H.Morii
+      factor = 16;                 // HACKALERT: factor holds block bytes
+      glformat = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+      break;
+    case GR_TEXFMT_ARGB_CMP_DXT5:
+      factor = 16;
+      glformat = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+      break;
+    case GR_TEXFMT_ARGB_CMP_FXT1:
+      factor = 8;
+      glformat = GL_COMPRESSED_RGBA_FXT1_3DFX;
+      break;
+*/
+    default:
+      display_warning("grTexDownloadMipMap : unknown texture format: %x", info->format);
+      factor = 0;
+    }
+  }
+
+  if (nbTextureUnits <= 2)
+    glActiveTexture(GL_TEXTURE1);
+  else
+    glActiveTexture(GL_TEXTURE2);
+
+  switch(info->format)
+  {
+  case GR_TEXFMT_ARGB_CMP_DXT1:
+  case GR_TEXFMT_ARGB_CMP_DXT3:
+  case GR_TEXFMT_ARGB_CMP_DXT5:
+  case GR_TEXFMT_ARGB_CMP_FXT1:
+    remove_tex(startAddress+1, startAddress+1+((width*height*factor)>>4));
+    break;
+  default:
+    remove_tex(startAddress+1, startAddress+1+(width*height*factor));
+  }
+
+  add_tex(startAddress+1);
+  glBindTexture(GL_TEXTURE_2D, startAddress+1);
+
+  if (largest_supported_anisotropy > 1.0f)
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);
+
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
+/*
+  switch(info->format)
+  {
+  case GR_TEXFMT_ARGB_CMP_DXT1:
+  case GR_TEXFMT_ARGB_CMP_DXT3:
+  case GR_TEXFMT_ARGB_CMP_DXT5:
+  case GR_TEXFMT_ARGB_CMP_FXT1:
+    glCompressedTexImage2DARB(GL_TEXTURE_2D, 0, (glformat ? glformat : gltexfmt), width, height, 0, (width*height*factor)>>4, info->data);
+    break;
+  default:
+    if (glformat) {
+      glTexImage2D(GL_TEXTURE_2D, 0, glformat, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
+    } else
+      glTexImage2D(GL_TEXTURE_2D, 0, gltexfmt, width, height, 0, glpixfmt, glpackfmt, info->data);
+  }
+*/
+
+  glBindTexture(GL_TEXTURE_2D, default_texture);
+}
+
+int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info );
+
+FX_ENTRY void FX_CALL
+grTexSource( GrChipID_t tmu,
+            FxU32      startAddress,
+            FxU32      evenOdd,
+            GrTexInfo  *info )
+{
+  LOG("grTexSource(%d,%d,%d)\r\n", tmu, startAddress, evenOdd);
+
+  if (tmu == GR_TMU1 || nbTextureUnits <= 2)
+  {
+    if (tmu == GR_TMU1 && nbTextureUnits <= 2) return;
+    glActiveTexture(GL_TEXTURE0);
+
+    if (info->aspectRatioLog2 < 0)
+    {
+      tex0_height = 256;
+      tex0_width = tex0_height >> -info->aspectRatioLog2;
+    }
+    else
+    {
+      tex0_width = 256;
+      tex0_height = tex0_width >> info->aspectRatioLog2;
+    }
+
+    glBindTexture(GL_TEXTURE_2D, startAddress+1);
+#ifdef VPDEBUG
+    dump_tex(startAddress+1);
+#endif
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter0);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter0);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s0);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t0);
+  }
+  else
+  {
+    glActiveTexture(GL_TEXTURE1);
+
+    if (info->aspectRatioLog2 < 0)
+    {
+      tex1_height = 256;
+      tex1_width = tex1_height >> -info->aspectRatioLog2;
+    }
+    else
+    {
+      tex1_width = 256;
+      tex1_height = tex1_width >> info->aspectRatioLog2;
+    }
+
+    glBindTexture(GL_TEXTURE_2D, startAddress+1);
+#ifdef VPDEBUG
+    dump_tex(startAddress+1);
+#endif
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter1);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter1);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s1);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t1);
+  }
+  if(!CheckTextureBufferFormat(tmu, startAddress+1, info))
+  {
+    if(tmu == 0 && blackandwhite1 != 0)
+    {
+      blackandwhite1 = 0;
+      need_to_compile = 1;
+    }
+    if(tmu == 1 && blackandwhite0 != 0)
+    {
+      blackandwhite0 = 0;
+      need_to_compile = 1;
+    }
+  }
+
+#if 0
+  extern int auxbuffer;
+  static int oldbuffer;
+  FX_ENTRY void FX_CALL grAuxBufferExt( GrBuffer_t buffer );
+  if (auxbuffer == GR_BUFFER_AUXBUFFER && auxbuffer != oldbuffer)
+    grAuxBufferExt(auxbuffer);
+  oldbuffer = auxbuffer;
+#endif
+}
+
+FX_ENTRY void FX_CALL
+grTexDetailControl(
+                   GrChipID_t tmu,
+                   int lod_bias,
+                   FxU8 detail_scale,
+                   float detail_max
+                   )
+{
+  LOG("grTexDetailControl(%d,%d,%d,%d)\r\n", tmu, lod_bias, detail_scale, detail_max);
+  if (lod_bias != 31 && detail_scale != 7)
+  {
+    if (!lod_bias && !detail_scale && !detail_max) return;
+    else
+      display_warning("grTexDetailControl : %d, %d, %f", lod_bias, detail_scale, detail_max);
+  }
+  lambda = detail_max;
+  if(lambda > 1.0f)
+  {
+    lambda = 1.0f - (255.0f - lambda);
+  }
+  if(lambda > 1.0f) display_warning("lambda:%f", lambda);
+
+  set_lambda();
+}
+
+FX_ENTRY void FX_CALL
+grTexLodBiasValue(GrChipID_t tmu, float bias )
+{
+  LOG("grTexLodBiasValue(%d,%f)\r\n", tmu, bias);
+}
+
+FX_ENTRY void FX_CALL
+grTexFilterMode(
+                GrChipID_t tmu,
+                GrTextureFilterMode_t minfilter_mode,
+                GrTextureFilterMode_t magfilter_mode
+                )
+{
+  LOG("grTexFilterMode(%d,%d,%d)\r\n", tmu, minfilter_mode, magfilter_mode);
+  if (tmu == GR_TMU1 || nbTextureUnits <= 2)
+  {
+    if (tmu == GR_TMU1 && nbTextureUnits <= 2) return;
+    if (minfilter_mode == GR_TEXTUREFILTER_POINT_SAMPLED) min_filter0 = GL_NEAREST;
+    else min_filter0 = GL_LINEAR;
+
+    if (magfilter_mode == GR_TEXTUREFILTER_POINT_SAMPLED) mag_filter0 = GL_NEAREST;
+    else mag_filter0 = GL_LINEAR;
+
+    glActiveTexture(GL_TEXTURE0);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter0);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter0);
+  }
+  else
+  {
+    if (minfilter_mode == GR_TEXTUREFILTER_POINT_SAMPLED) min_filter1 = GL_NEAREST;
+    else min_filter1 = GL_LINEAR;
+
+    if (magfilter_mode == GR_TEXTUREFILTER_POINT_SAMPLED) mag_filter1 = GL_NEAREST;
+    else mag_filter1 = GL_LINEAR;
+
+    glActiveTexture(GL_TEXTURE1);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter1);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter1);
+  }
+}
+
+FX_ENTRY void FX_CALL
+grTexClampMode(
+               GrChipID_t tmu,
+               GrTextureClampMode_t s_clampmode,
+               GrTextureClampMode_t t_clampmode
+               )
+{
+  LOG("grTexClampMode(%d, %d, %d)\r\n", tmu, s_clampmode, t_clampmode);
+  if (tmu == GR_TMU1 || nbTextureUnits <= 2)
+  {
+    if (tmu == GR_TMU1 && nbTextureUnits <= 2) return;
+    switch(s_clampmode)
+    {
+    case GR_TEXTURECLAMP_WRAP:
+      wrap_s0 = GL_REPEAT;
+      break;
+    case GR_TEXTURECLAMP_CLAMP:
+      wrap_s0 = GL_CLAMP_TO_EDGE;
+      break;
+    case GR_TEXTURECLAMP_MIRROR_EXT:
+      wrap_s0 = GL_MIRRORED_REPEAT;
+      break;
+    default:
+      display_warning("grTexClampMode : unknown s_clampmode : %x", s_clampmode);
+    }
+    switch(t_clampmode)
+    {
+    case GR_TEXTURECLAMP_WRAP:
+      wrap_t0 = GL_REPEAT;
+      break;
+    case GR_TEXTURECLAMP_CLAMP:
+      wrap_t0 = GL_CLAMP_TO_EDGE;
+      break;
+    case GR_TEXTURECLAMP_MIRROR_EXT:
+      wrap_t0 = GL_MIRRORED_REPEAT;
+      break;
+    default:
+      display_warning("grTexClampMode : unknown t_clampmode : %x", t_clampmode);
+    }
+    glActiveTexture(GL_TEXTURE0);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s0);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t0);
+  }
+  else
+  {
+    switch(s_clampmode)
+    {
+    case GR_TEXTURECLAMP_WRAP:
+      wrap_s1 = GL_REPEAT;
+      break;
+    case GR_TEXTURECLAMP_CLAMP:
+      wrap_s1 = GL_CLAMP_TO_EDGE;
+      break;
+    case GR_TEXTURECLAMP_MIRROR_EXT:
+      wrap_s1 = GL_MIRRORED_REPEAT;
+      break;
+    default:
+      display_warning("grTexClampMode : unknown s_clampmode : %x", s_clampmode);
+    }
+    switch(t_clampmode)
+    {
+    case GR_TEXTURECLAMP_WRAP:
+      wrap_t1 = GL_REPEAT;
+      break;
+    case GR_TEXTURECLAMP_CLAMP:
+      wrap_t1 = GL_CLAMP_TO_EDGE;
+      break;
+    case GR_TEXTURECLAMP_MIRROR_EXT:
+      wrap_t1 = GL_MIRRORED_REPEAT;
+      break;
+    default:
+      display_warning("grTexClampMode : unknown t_clampmode : %x", t_clampmode);
+    }
+    glActiveTexture(GL_TEXTURE1);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s1);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t1);
+  }
+}
diff --git a/Source/Glitch64/combiner.cpp b/Source/Glitch64/OGLcombiner.cpp
similarity index 96%
rename from Source/Glitch64/combiner.cpp
rename to Source/Glitch64/OGLcombiner.cpp
index d3620cb81..3fea2b1e6 100644
--- a/Source/Glitch64/combiner.cpp
+++ b/Source/Glitch64/OGLcombiner.cpp
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "glide.h"
-#include "main.h"
+#include "glitchmain.h"
 
 static int fct[4], source0[4], operand0[4], source1[4], operand1[4], source2[4], operand2[4];
 static int fcta[4],sourcea0[4],operanda0[4],sourcea1[4],operanda1[4],sourcea2[4],operanda2[4];
@@ -38,11 +38,9 @@ int need_to_compile;
 
 static GLhandleARB fragment_shader_object;
 static GLhandleARB fragment_depth_shader_object;
-static GLhandleARB fragment_bw_shader_object;
 static GLhandleARB vertex_shader_object;
 static GLhandleARB program_object_default;
 static GLhandleARB program_object_depth;
-static GLhandleARB program_object_bw;
 static GLhandleARB program_object;
 static int constant_color_location;
 static int ccolor0_location;
@@ -87,16 +85,6 @@ static const char* fragment_shader_default =
 "  gl_FragColor = texture2D(texture0, vec2(gl_TexCoord[0])); \n"
 ;
 
-static const char* fragment_shader_depth =
-"  gl_FragDepth = dot(texture2D(texture0, vec2(gl_TexCoord[0])), vec4(32*64*32/65536.0, 64*32/65536.0, 32/65536.0, 0))*0.5 + 0.5; \n"
-;
-
-static const char* fragment_shader_bw =
-"  vec4 readtex0 = texture2D(texture0, vec2(gl_TexCoord[0])); \n"
-"  gl_FragColor = vec4(vec3(readtex0.b),                      \n"
-"                 readtex0.r + readtex0.g * 8.0 / 256.0);     \n"
-;
-
 static const char* fragment_shader_readtex0color =
 "  vec4 readtex0 = texture2D(texture0, vec2(gl_TexCoord[0])); \n"
 ;
diff --git a/Source/Glitch64/geometry.cpp b/Source/Glitch64/OGLgeometry.cpp
similarity index 96%
rename from Source/Glitch64/geometry.cpp
rename to Source/Glitch64/OGLgeometry.cpp
index 3bfbb28ca..408b6651e 100644
--- a/Source/Glitch64/geometry.cpp
+++ b/Source/Glitch64/OGLgeometry.cpp
@@ -3,7 +3,7 @@
 #include <windows.h>
 #endif // _WIN32
 #include "glide.h"
-#include "main.h"
+#include "glitchmain.h"
 
 #define Z_MAX (65536.0f)
 
diff --git a/Source/Glitch64/main.cpp b/Source/Glitch64/OGLglitchmain.cpp
similarity index 96%
rename from Source/Glitch64/main.cpp
rename to Source/Glitch64/OGLglitchmain.cpp
index 7db272f07..cbdef0eac 100644
--- a/Source/Glitch64/main.cpp
+++ b/Source/Glitch64/OGLglitchmain.cpp
@@ -16,7 +16,7 @@
 #include <math.h>
 #include "glide.h"
 #include "g3ext.h"
-#include "main.h"
+#include "glitchmain.h"
 
 #ifdef VPDEBUG
 #include <IL/il.h>
@@ -762,7 +762,7 @@ int isWglExtensionSupported(const char *extension)
 
 FX_ENTRY GrContext_t FX_CALL
 grSstWinOpenExt(
-                FxU32                hWnd,
+                HWND                 hWnd,
                 GrScreenResolution_t screen_resolution,
                 GrScreenRefresh_t    refresh_rate,
                 GrColorFormat_t      color_format,
@@ -787,7 +787,7 @@ grSstWinOpenExt(
 
 FX_ENTRY GrContext_t FX_CALL
 grSstWinOpen(
-             FxU32                hWnd,
+             HWND                 hWnd,
              GrScreenResolution_t screen_resolution,
              GrScreenRefresh_t    refresh_rate,
              GrColorFormat_t      color_format,
@@ -824,7 +824,7 @@ grSstWinOpen(
   LOG("grSstWinOpen(%08lx, %d, %d, %d, %d, %d %d)\r\n", hWnd, screen_resolution&~0x80000000, refresh_rate, color_format, origin_location, nColBuffers, nAuxBuffers);
 
 #ifdef _WIN32
-  if ((HWND)hWnd == NULL) hWnd = (FxU32)GetActiveWindow();
+  if ((HWND)hWnd == NULL) hWnd = GetActiveWindow();
   hwnd_win = (HWND)hWnd;
 #endif // _WIN32
   width = height = 0;
@@ -2759,11 +2759,6 @@ FX_ENTRY void FX_CALL grConfigWrapperExt(FxI32 resolution, FxI32 vram, FxBool fb
   config.vram_size = vram;
   config.fbo = fbo;
   config.anisofilter = aniso;
-#ifdef _WIN32
-  int getVRAMSize();
-  if (config.vram_size == 0)
-    config.vram_size = getVRAMSize();
-#endif // _WIN32
 }
 
 // unused by glide64
diff --git a/Source/Glitch64/textures.cpp b/Source/Glitch64/OGLtextures.cpp
similarity index 96%
rename from Source/Glitch64/textures.cpp
rename to Source/Glitch64/OGLtextures.cpp
index 5b56384c0..d1ce05ab1 100644
--- a/Source/Glitch64/textures.cpp
+++ b/Source/Glitch64/OGLtextures.cpp
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #endif // _WIN32
 #include "glide.h"
-#include "main.h"
+#include "glitchmain.h"
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/Source/Glitch64/main.h b/Source/Glitch64/glitchmain.h
similarity index 80%
rename from Source/Glitch64/main.h
rename to Source/Glitch64/glitchmain.h
index 141ca5a2e..272126d19 100644
--- a/Source/Glitch64/main.h
+++ b/Source/Glitch64/glitchmain.h
@@ -44,9 +44,36 @@ extern int buffer_cleared; // mark that the buffer has been cleared, used to che
 #ifdef _WIN32
 #include <windows.h>
 extern "C" {
-#include "gl.h"
-#include "glext.h"
-#include "wglext.h"
+    #include <SDL_opengl.h>
+    extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
+    extern PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
+    extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
+    extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
+    extern PFNGLBLENDFUNCSEPARATEEXTPROC glBlendFuncSeparateEXT;
+    extern PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC glCheckFramebufferStatusEXT;
+    extern PFNGLCOMPILESHADERARBPROC glCompileShaderARB;
+    extern PFNGLCREATEPROGRAMOBJECTARBPROC glCreateProgramObjectARB;
+    extern PFNGLCREATESHADEROBJECTARBPROC glCreateShaderObjectARB;
+    extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
+    extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
+    extern PFNGLFOGCOORDFEXTPROC glFogCoordfEXT;
+    extern PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC glFramebufferRenderbufferEXT;
+    extern PFNGLFRAMEBUFFERTEXTURE2DEXTPROC glFramebufferTexture2DEXT;
+    extern PFNGLGENFRAMEBUFFERSEXTPROC glGenFramebuffersEXT;
+    extern PFNGLGENRENDERBUFFERSEXTPROC glGenRenderbuffersEXT;
+    extern PFNGLGETINFOLOGARBPROC glGetInfoLogARB;
+    extern PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
+    extern PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB;
+    extern PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
+    extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;
+    extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
+    extern PFNGLSECONDARYCOLOR3FPROC glSecondaryColor3f;
+    extern PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
+    extern PFNGLUNIFORM1FARBPROC glUniform1fARB;
+    extern PFNGLUNIFORM1IARBPROC glUniform1iARB;
+    extern PFNGLUNIFORM4FARBPROC glUniform4fARB;
+    extern PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
+    typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
 }
 #else
 #include <stdio.h>
diff --git a/Source/Glitch64/inc/3dfx.h b/Source/Glitch64/inc/3dfx.h
index cbeb7b11e..0901130d4 100644
--- a/Source/Glitch64/inc/3dfx.h
+++ b/Source/Glitch64/inc/3dfx.h
@@ -88,6 +88,9 @@ typedef struct { float r, g, b, a; } FxColor4;
 #elif defined(__unix__)
 #  define FX_ENTRY extern
 #  define FX_CALL
+#elif defined(__APPLE__)
+#  define FX_ENTRY extern
+#  define FX_CALL
 #elif defined(__MWERKS__)
 #  if macintosh
 #    define FX_ENTRY extern
diff --git a/Source/Glitch64/inc/dxdiag.h b/Source/Glitch64/inc/dxdiag.h
deleted file mode 100644
index 54a535f7f..000000000
--- a/Source/Glitch64/inc/dxdiag.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*==========================================================================;
- *
- *  Copyright (C) Microsoft Corporation.  All Rights Reserved.
- *
- *  File:       dxdiag.h
- *  Content:    DirectX Diagnostic Tool include file
- *
- ****************************************************************************/
-
-#ifndef _DXDIAG_H_
-#define _DXDIAG_H_
-
-#include <ole2.h>      // for DECLARE_INTERFACE_ and HRESULT
-
-// This identifier is passed to IDxDiagProvider::Initialize in order to ensure that an
-// application was built against the correct header files. This number is
-// incremented whenever a header (or other) change would require applications
-// to be rebuilt. If the version doesn't match, IDxDiagProvider::Initialize will fail.
-// (The number itself has no meaning.)
-#define DXDIAG_DX9_SDK_VERSION 111
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/****************************************************************************
- *
- * DxDiag Errors
- *
- ****************************************************************************/
-#define DXDIAG_E_INSUFFICIENT_BUFFER       ((HRESULT)0x8007007AL)  // HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)
-
-
-/****************************************************************************
- *
- * DxDiag CLSIDs
- *
- ****************************************************************************/
-
-// {A65B8071-3BFE-4213-9A5B-491DA4461CA7}
-DEFINE_GUID(CLSID_DxDiagProvider,
-0xA65B8071, 0x3BFE, 0x4213, 0x9A, 0x5B, 0x49, 0x1D, 0xA4, 0x46, 0x1C, 0xA7);
-
-
-/****************************************************************************
- *
- * DxDiag Interface IIDs
- *
- ****************************************************************************/
-
-// {9C6B4CB0-23F8-49CC-A3ED-45A55000A6D2}
-DEFINE_GUID(IID_IDxDiagProvider,
-0x9C6B4CB0, 0x23F8, 0x49CC, 0xA3, 0xED, 0x45, 0xA5, 0x50, 0x00, 0xA6, 0xD2);
-
-// {0x7D0F462F-0x4064-0x4862-BC7F-933E5058C10F}
-DEFINE_GUID(IID_IDxDiagContainer,
-0x7D0F462F, 0x4064, 0x4862, 0xBC, 0x7F, 0x93, 0x3E, 0x50, 0x58, 0xC1, 0x0F);
-
-
-/****************************************************************************
- *
- * DxDiag Interface Pointer definitions
- *
- ****************************************************************************/
-
-typedef struct IDxDiagProvider *LPDXDIAGPROVIDER, *PDXDIAGPROVIDER;
-
-typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER;
-
-
-/****************************************************************************
- *
- * DxDiag Structures
- *
- ****************************************************************************/
-
-typedef struct _DXDIAG_INIT_PARAMS
-{
-    DWORD   dwSize;                 // Size of this structure. 
-    DWORD   dwDxDiagHeaderVersion;  // Pass in DXDIAG_DX9_SDK_VERSION.  This verifies 
-                                    // the header and dll are correctly matched.
-    BOOL    bAllowWHQLChecks;       // If true, allow dxdiag to check if drivers are 
-                                    // digital signed as logo'd by WHQL which may 
-                                    // connect via internet to update WHQL certificates.
-    VOID*   pReserved;              // Reserved. Must be NULL. 
-} DXDIAG_INIT_PARAMS;
-
-
-/****************************************************************************
- *
- * DxDiag Application Interfaces
- *
- ****************************************************************************/
-
-//
-// COM definition for IDxDiagProvider
-//
-#undef INTERFACE                // External COM Implementation
-#define INTERFACE IDxDiagProvider
-DECLARE_INTERFACE_(IDxDiagProvider,IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface)               (THIS_ REFIID riid, LPVOID *ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef)                (THIS) PURE;
-    STDMETHOD_(ULONG,Release)               (THIS) PURE;
-    
-    /*** IDxDiagProvider methods ***/
-    STDMETHOD(Initialize)                   (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; 
-    STDMETHOD(GetRootContainer)             (THIS_ IDxDiagContainer **ppInstance) PURE;
-};
-
-
-//
-// COM definition for IDxDiagContainer
-//
-#undef INTERFACE                // External COM Implementation
-#define INTERFACE IDxDiagContainer
-DECLARE_INTERFACE_(IDxDiagContainer,IUnknown)
-{
-    /*** IUnknown methods ***/
-    STDMETHOD(QueryInterface)               (THIS_ REFIID riid, LPVOID *ppvObj) PURE;
-    STDMETHOD_(ULONG,AddRef)                (THIS) PURE;
-    STDMETHOD_(ULONG,Release)               (THIS) PURE;
-    
-    /*** IDxDiagContainer methods ***/
-    STDMETHOD(GetNumberOfChildContainers)   (THIS_ DWORD *pdwCount) PURE;
-    STDMETHOD(EnumChildContainerNames)      (THIS_ DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) PURE;
-    STDMETHOD(GetChildContainer)            (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE;  
-    STDMETHOD(GetNumberOfProps)             (THIS_ DWORD *pdwCount) PURE;
-    STDMETHOD(EnumPropNames)                (THIS_ DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) PURE;
-    STDMETHOD(GetProp)                      (THIS_ LPCWSTR pwszPropName, VARIANT *pvarProp) PURE;
-};
-
-
-/****************************************************************************
- *
- * DxDiag application interface macros
- *
- ****************************************************************************/
-
-#if !defined(__cplusplus) || defined(CINTERFACE)
-
-#define IDxDiagProvider_QueryInterface(p,a,b)                   (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDxDiagProvider_AddRef(p)                               (p)->lpVtbl->AddRef(p)
-#define IDxDiagProvider_Release(p)                              (p)->lpVtbl->Release(p)
-#define IDxDiagProvider_Initialize(p,a,b)                       (p)->lpVtbl->Initialize(p,a,b)
-#define IDxDiagProvider_GetRootContainer(p,a)                   (p)->lpVtbl->GetRootContainer(p,a)
-
-#define IDxDiagContainer_QueryInterface(p,a,b)                  (p)->lpVtbl->QueryInterface(p,a,b)
-#define IDxDiagContainer_AddRef(p)                              (p)->lpVtbl->AddRef(p)
-#define IDxDiagContainer_Release(p)                             (p)->lpVtbl->Release(p)
-#define IDxDiagContainer_GetNumberOfChildContainers(p,a)        (p)->lpVtbl->GetNumberOfChildContainers(p,a)
-#define IDxDiagContainer_EnumChildContainerNames(p,a,b,c)       (p)->lpVtbl->EnumChildContainerNames(p,a,b,c)
-#define IDxDiagContainer_GetChildContainer(p,a,b)               (p)->lpVtbl->GetChildContainer(p,a,b)
-#define IDxDiagContainer_GetNumberOfProps(p,a)                  (p)->lpVtbl->GetNumberOfProps(p,a)
-#define IDxDiagContainer_EnumProps(p,a,b)                       (p)->lpVtbl->EnumProps(p,a,b,c)
-#define IDxDiagContainer_GetProp(p,a,b)                         (p)->lpVtbl->GetProp(p,a,b)
-
-#else /* C++ */
-
-#define IDxDiagProvider_QueryInterface(p,a,b)                   (p)->QueryInterface(p,a,b)
-#define IDxDiagProvider_AddRef(p)                               (p)->AddRef(p)
-#define IDxDiagProvider_Release(p)                              (p)->Release(p)
-#define IDxDiagProvider_Initialize(p,a,b)                       (p)->Initialize(p,a,b)
-#define IDxDiagProvider_GetRootContainer(p,a)                   (p)->GetRootContainer(p,a)
-
-#define IDxDiagContainer_QueryInterface(p,a,b)                  (p)->QueryInterface(p,a,b)
-#define IDxDiagContainer_AddRef(p)                              (p)->AddRef(p)
-#define IDxDiagContainer_Release(p)                             (p)->Release(p)
-#define IDxDiagContainer_GetNumberOfChildContainers(p,a)        (p)->GetNumberOfChildContainers(p,a)
-#define IDxDiagContainer_EnumChildContainerNames(p,a,b,c)       (p)->EnumChildContainerNames(p,a,b,c)
-#define IDxDiagContainer_GetChildContainer(p,a,b)               (p)->GetChildContainer(p,a,b)
-#define IDxDiagContainer_GetNumberOfProps(p,a)                  (p)->GetNumberOfProps(p,a)
-#define IDxDiagContainer_EnumProps(p,a,b)                       (p)->EnumProps(p,a,b,c)
-#define IDxDiagContainer_GetProp(p,a,b)                         (p)->GetProp(p,a,b)
-
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _DXDIAG_H_ */
-
-
diff --git a/Source/Glitch64/inc/gl.h b/Source/Glitch64/inc/gl.h
deleted file mode 100644
index c48a3d923..000000000
--- a/Source/Glitch64/inc/gl.h
+++ /dev/null
@@ -1,1473 +0,0 @@
-/* $Id: gl.h,v 1.3 2003/09/12 13:26:51 earnie Exp $ */
-
-/*
- * Mesa 3-D graphics library
- * Version:  4.0
- *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-/************************************************************************
- * 2002-Apr-22, Jos� Fonseca:
- *   Removed non Win32 system-specific stuff
- *
- * 2002-Apr-17, Marcus Geelnard:
- *   For win32, OpenGL 1.2 & 1.3 definitions are not made in this file
- *   anymore, since under Windows those are regarded as extensions, and
- *   are better defined in glext.h (especially the function prototypes may
- *   conflict with extension function pointers). A few "cosmetical"
- *   changes were also made to this file.
- *
- * 2002-Apr-15, Marcus Geelnard:
- *   Modified this file to better fit a wider range of compilers, removed
- *   Mesa specific stuff, and removed extension definitions (this file now
- *   relies on GL/glext.h). Hopefully this file should now function as a
- *   generic OpenGL gl.h include file for most compilers and environments.
- *   Changed GLAPIENTRY to APIENTRY (to be consistent with GL/glext.h).
- ************************************************************************/
-
-
-#ifndef __gl_h_
-#define __gl_h_
-
-
-
-/************************************************************************
- * Begin system-specific stuff.
- */
-/* __WIN32__ */
-#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__))
-#  define __WIN32__
-#endif
-
-/* GLAPI, part 1 (use WINGDIAPI, if defined) */
-#if defined(__WIN32__) && defined(WINGDIAPI)
-#  define GLAPI WINGDIAPI
-#endif
-
-/* GLAPI, part 2 */
-#if !defined(GLAPI)
-#  if defined(_MSC_VER)                        /* Microsoft Visual C++ */
-#    define GLAPI __declspec(dllimport)
-#  elif defined(__LCC__) && defined(__WIN32__) /* LCC-Win32 */
-#    define GLAPI __stdcall
-#  else                                        /* Others (e.g. MinGW, Cygwin, non-win32) */
-#    define GLAPI extern
-#  endif
-#endif
-
-/* APIENTRY */
-#if !defined(APIENTRY)
-#  if defined(__WIN32__)
-#    define APIENTRY __stdcall
-#  else
-#    define APIENTRY
-#  endif
-#endif
-/*
- * End system-specific stuff.
- ************************************************************************/
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define __WIN32__
-
-#define GL_VERSION_1_1   1
-
-#if !defined(__WIN32__)
-#define GL_VERSION_1_2   1
-#define GL_VERSION_1_3   1
-#define GL_ARB_imaging   1
-#endif
-
-
-/*
- *
- * Datatypes
- *
- */
-#ifdef CENTERLINE_CLPP
-#define signed
-#endif
-typedef unsigned int    GLenum;
-typedef unsigned char   GLboolean;
-typedef unsigned int    GLbitfield;
-typedef void            GLvoid;
-typedef signed char     GLbyte;         /* 1-byte signed */
-typedef short           GLshort;        /* 2-byte signed */
-typedef int             GLint;          /* 4-byte signed */
-typedef unsigned char   GLubyte;        /* 1-byte unsigned */
-typedef unsigned short  GLushort;       /* 2-byte unsigned */
-typedef unsigned int    GLuint;         /* 4-byte unsigned */
-typedef int             GLsizei;        /* 4-byte signed */
-typedef float           GLfloat;        /* single precision float */
-typedef float           GLclampf;       /* single precision float in [0,1] */
-typedef double          GLdouble;       /* double precision float */
-typedef double          GLclampd;       /* double precision float in [0,1] */
-
-
-
-/************************************************************************
- *
- * Constants
- *
- ************************************************************************/
-
-/* Boolean values */
-#define GL_FALSE                                0x0
-#define GL_TRUE                                 0x1
-
-/* Data types */
-#define GL_BYTE                                 0x1400
-#define GL_UNSIGNED_BYTE                        0x1401
-#define GL_SHORT                                0x1402
-#define GL_UNSIGNED_SHORT                       0x1403
-#define GL_INT                                  0x1404
-#define GL_UNSIGNED_INT                         0x1405
-#define GL_FLOAT                                0x1406
-#define GL_DOUBLE                               0x140A
-#define GL_2_BYTES                              0x1407
-#define GL_3_BYTES                              0x1408
-#define GL_4_BYTES                              0x1409
-
-/* Primitives */
-#define GL_POINTS                               0x0000
-#define GL_LINES                                0x0001
-#define GL_LINE_LOOP                            0x0002
-#define GL_LINE_STRIP                           0x0003
-#define GL_TRIANGLES                            0x0004
-#define GL_TRIANGLE_STRIP                       0x0005
-#define GL_TRIANGLE_FAN                         0x0006
-#define GL_QUADS                                0x0007
-#define GL_QUAD_STRIP                           0x0008
-#define GL_POLYGON                              0x0009
-
-/* Vertex Arrays */
-#define GL_VERTEX_ARRAY                         0x8074
-#define GL_NORMAL_ARRAY                         0x8075
-#define GL_COLOR_ARRAY                          0x8076
-#define GL_INDEX_ARRAY                          0x8077
-#define GL_TEXTURE_COORD_ARRAY                  0x8078
-#define GL_EDGE_FLAG_ARRAY                      0x8079
-#define GL_VERTEX_ARRAY_SIZE                    0x807A
-#define GL_VERTEX_ARRAY_TYPE                    0x807B
-#define GL_VERTEX_ARRAY_STRIDE                  0x807C
-#define GL_NORMAL_ARRAY_TYPE                    0x807E
-#define GL_NORMAL_ARRAY_STRIDE                  0x807F
-#define GL_COLOR_ARRAY_SIZE                     0x8081
-#define GL_COLOR_ARRAY_TYPE                     0x8082
-#define GL_COLOR_ARRAY_STRIDE                   0x8083
-#define GL_INDEX_ARRAY_TYPE                     0x8085
-#define GL_INDEX_ARRAY_STRIDE                   0x8086
-#define GL_TEXTURE_COORD_ARRAY_SIZE             0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE             0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE           0x808A
-#define GL_EDGE_FLAG_ARRAY_STRIDE               0x808C
-#define GL_VERTEX_ARRAY_POINTER                 0x808E
-#define GL_NORMAL_ARRAY_POINTER                 0x808F
-#define GL_COLOR_ARRAY_POINTER                  0x8090
-#define GL_INDEX_ARRAY_POINTER                  0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER          0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER              0x8093
-#define GL_V2F                                  0x2A20
-#define GL_V3F                                  0x2A21
-#define GL_C4UB_V2F                             0x2A22
-#define GL_C4UB_V3F                             0x2A23
-#define GL_C3F_V3F                              0x2A24
-#define GL_N3F_V3F                              0x2A25
-#define GL_C4F_N3F_V3F                          0x2A26
-#define GL_T2F_V3F                              0x2A27
-#define GL_T4F_V4F                              0x2A28
-#define GL_T2F_C4UB_V3F                         0x2A29
-#define GL_T2F_C3F_V3F                          0x2A2A
-#define GL_T2F_N3F_V3F                          0x2A2B
-#define GL_T2F_C4F_N3F_V3F                      0x2A2C
-#define GL_T4F_C4F_N3F_V4F                      0x2A2D
-
-/* Matrix Mode */
-#define GL_MATRIX_MODE                          0x0BA0
-#define GL_MODELVIEW                            0x1700
-#define GL_PROJECTION                           0x1701
-#define GL_TEXTURE                              0x1702
-
-/* Points */
-#define GL_POINT_SMOOTH                         0x0B10
-#define GL_POINT_SIZE                           0x0B11
-#define GL_POINT_SIZE_GRANULARITY               0x0B13
-#define GL_POINT_SIZE_RANGE                     0x0B12
-
-/* Lines */
-#define GL_LINE_SMOOTH                          0x0B20
-#define GL_LINE_STIPPLE                         0x0B24
-#define GL_LINE_STIPPLE_PATTERN                 0x0B25
-#define GL_LINE_STIPPLE_REPEAT                  0x0B26
-#define GL_LINE_WIDTH                           0x0B21
-#define GL_LINE_WIDTH_GRANULARITY               0x0B23
-#define GL_LINE_WIDTH_RANGE                     0x0B22
-
-/* Polygons */
-#define GL_POINT                                0x1B00
-#define GL_LINE                                 0x1B01
-#define GL_FILL                                 0x1B02
-#define GL_CW                                   0x0900
-#define GL_CCW                                  0x0901
-#define GL_FRONT                                0x0404
-#define GL_BACK                                 0x0405
-#define GL_POLYGON_MODE                         0x0B40
-#define GL_POLYGON_SMOOTH                       0x0B41
-#define GL_POLYGON_STIPPLE                      0x0B42
-#define GL_EDGE_FLAG                            0x0B43
-#define GL_CULL_FACE                            0x0B44
-#define GL_CULL_FACE_MODE                       0x0B45
-#define GL_FRONT_FACE                           0x0B46
-#define GL_POLYGON_OFFSET_FACTOR                0x8038
-#define GL_POLYGON_OFFSET_UNITS                 0x2A00
-#define GL_POLYGON_OFFSET_POINT                 0x2A01
-#define GL_POLYGON_OFFSET_LINE                  0x2A02
-#define GL_POLYGON_OFFSET_FILL                  0x8037
-
-/* Display Lists */
-#define GL_COMPILE                              0x1300
-#define GL_COMPILE_AND_EXECUTE                  0x1301
-#define GL_LIST_BASE                            0x0B32
-#define GL_LIST_INDEX                           0x0B33
-#define GL_LIST_MODE                            0x0B30
-
-/* Depth buffer */
-#define GL_NEVER                                0x0200
-#define GL_LESS                                 0x0201
-#define GL_EQUAL                                0x0202
-#define GL_LEQUAL                               0x0203
-#define GL_GREATER                              0x0204
-#define GL_NOTEQUAL                             0x0205
-#define GL_GEQUAL                               0x0206
-#define GL_ALWAYS                               0x0207
-#define GL_DEPTH_TEST                           0x0B71
-#define GL_DEPTH_BITS                           0x0D56
-#define GL_DEPTH_CLEAR_VALUE                    0x0B73
-#define GL_DEPTH_FUNC                           0x0B74
-#define GL_DEPTH_RANGE                          0x0B70
-#define GL_DEPTH_WRITEMASK                      0x0B72
-#define GL_DEPTH_COMPONENT                      0x1902
-
-/* Lighting */
-#define GL_LIGHTING                             0x0B50
-#define GL_LIGHT0                               0x4000
-#define GL_LIGHT1                               0x4001
-#define GL_LIGHT2                               0x4002
-#define GL_LIGHT3                               0x4003
-#define GL_LIGHT4                               0x4004
-#define GL_LIGHT5                               0x4005
-#define GL_LIGHT6                               0x4006
-#define GL_LIGHT7                               0x4007
-#define GL_SPOT_EXPONENT                        0x1205
-#define GL_SPOT_CUTOFF                          0x1206
-#define GL_CONSTANT_ATTENUATION                 0x1207
-#define GL_LINEAR_ATTENUATION                   0x1208
-#define GL_QUADRATIC_ATTENUATION                0x1209
-#define GL_AMBIENT                              0x1200
-#define GL_DIFFUSE                              0x1201
-#define GL_SPECULAR                             0x1202
-#define GL_SHININESS                            0x1601
-#define GL_EMISSION                             0x1600
-#define GL_POSITION                             0x1203
-#define GL_SPOT_DIRECTION                       0x1204
-#define GL_AMBIENT_AND_DIFFUSE                  0x1602
-#define GL_COLOR_INDEXES                        0x1603
-#define GL_LIGHT_MODEL_TWO_SIDE                 0x0B52
-#define GL_LIGHT_MODEL_LOCAL_VIEWER             0x0B51
-#define GL_LIGHT_MODEL_AMBIENT                  0x0B53
-#define GL_FRONT_AND_BACK                       0x0408
-#define GL_SHADE_MODEL                          0x0B54
-#define GL_FLAT                                 0x1D00
-#define GL_SMOOTH                               0x1D01
-#define GL_COLOR_MATERIAL                       0x0B57
-#define GL_COLOR_MATERIAL_FACE                  0x0B55
-#define GL_COLOR_MATERIAL_PARAMETER             0x0B56
-#define GL_NORMALIZE                            0x0BA1
-
-/* User clipping planes */
-#define GL_CLIP_PLANE0                          0x3000
-#define GL_CLIP_PLANE1                          0x3001
-#define GL_CLIP_PLANE2                          0x3002
-#define GL_CLIP_PLANE3                          0x3003
-#define GL_CLIP_PLANE4                          0x3004
-#define GL_CLIP_PLANE5                          0x3005
-
-/* Accumulation buffer */
-#define GL_ACCUM_RED_BITS                       0x0D58
-#define GL_ACCUM_GREEN_BITS                     0x0D59
-#define GL_ACCUM_BLUE_BITS                      0x0D5A
-#define GL_ACCUM_ALPHA_BITS                     0x0D5B
-#define GL_ACCUM_CLEAR_VALUE                    0x0B80
-#define GL_ACCUM                                0x0100
-#define GL_ADD                                  0x0104
-#define GL_LOAD                                 0x0101
-#define GL_MULT                                 0x0103
-#define GL_RETURN                               0x0102
-
-/* Alpha testing */
-#define GL_ALPHA_TEST                           0x0BC0
-#define GL_ALPHA_TEST_REF                       0x0BC2
-#define GL_ALPHA_TEST_FUNC                      0x0BC1
-
-/* Blending */
-#define GL_BLEND                                0x0BE2
-#define GL_BLEND_SRC                            0x0BE1
-#define GL_BLEND_DST                            0x0BE0
-#define GL_ZERO                                 0x0
-#define GL_ONE                                  0x1
-#define GL_SRC_COLOR                            0x0300
-#define GL_ONE_MINUS_SRC_COLOR                  0x0301
-#define GL_SRC_ALPHA                            0x0302
-#define GL_ONE_MINUS_SRC_ALPHA                  0x0303
-#define GL_DST_ALPHA                            0x0304
-#define GL_ONE_MINUS_DST_ALPHA                  0x0305
-#define GL_DST_COLOR                            0x0306
-#define GL_ONE_MINUS_DST_COLOR                  0x0307
-#define GL_SRC_ALPHA_SATURATE                   0x0308
-#define GL_CONSTANT_COLOR                       0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR             0x8002
-#define GL_CONSTANT_ALPHA                       0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA             0x8004
-
-/* Render Mode */
-#define GL_FEEDBACK                             0x1C01
-#define GL_RENDER                               0x1C00
-#define GL_SELECT                               0x1C02
-
-/* Feedback */
-#define GL_2D                                   0x0600
-#define GL_3D                                   0x0601
-#define GL_3D_COLOR                             0x0602
-#define GL_3D_COLOR_TEXTURE                     0x0603
-#define GL_4D_COLOR_TEXTURE                     0x0604
-#define GL_POINT_TOKEN                          0x0701
-#define GL_LINE_TOKEN                           0x0702
-#define GL_LINE_RESET_TOKEN                     0x0707
-#define GL_POLYGON_TOKEN                        0x0703
-#define GL_BITMAP_TOKEN                         0x0704
-#define GL_DRAW_PIXEL_TOKEN                     0x0705
-#define GL_COPY_PIXEL_TOKEN                     0x0706
-#define GL_PASS_THROUGH_TOKEN                   0x0700
-#define GL_FEEDBACK_BUFFER_POINTER              0x0DF0
-#define GL_FEEDBACK_BUFFER_SIZE                 0x0DF1
-#define GL_FEEDBACK_BUFFER_TYPE                 0x0DF2
-
-/* Selection */
-#define GL_SELECTION_BUFFER_POINTER             0x0DF3
-#define GL_SELECTION_BUFFER_SIZE                0x0DF4
-
-/* Fog */
-#define GL_FOG                                  0x0B60
-#define GL_FOG_MODE                             0x0B65
-#define GL_FOG_DENSITY                          0x0B62
-#define GL_FOG_COLOR                            0x0B66
-#define GL_FOG_INDEX                            0x0B61
-#define GL_FOG_START                            0x0B63
-#define GL_FOG_END                              0x0B64
-#define GL_LINEAR                               0x2601
-#define GL_EXP                                  0x0800
-#define GL_EXP2                                 0x0801
-
-/* Logic Ops */
-#define GL_LOGIC_OP                             0x0BF1
-#define GL_INDEX_LOGIC_OP                       0x0BF1
-#define GL_COLOR_LOGIC_OP                       0x0BF2
-#define GL_LOGIC_OP_MODE                        0x0BF0
-#define GL_CLEAR                                0x1500
-#define GL_SET                                  0x150F
-#define GL_COPY                                 0x1503
-#define GL_COPY_INVERTED                        0x150C
-#define GL_NOOP                                 0x1505
-#define GL_INVERT                               0x150A
-#define GL_AND                                  0x1501
-#define GL_NAND                                 0x150E
-#define GL_OR                                   0x1507
-#define GL_NOR                                  0x1508
-#define GL_XOR                                  0x1506
-#define GL_EQUIV                                0x1509
-#define GL_AND_REVERSE                          0x1502
-#define GL_AND_INVERTED                         0x1504
-#define GL_OR_REVERSE                           0x150B
-#define GL_OR_INVERTED                          0x150D
-
-/* Stencil */
-#define GL_STENCIL_TEST                         0x0B90
-#define GL_STENCIL_WRITEMASK                    0x0B98
-#define GL_STENCIL_BITS                         0x0D57
-#define GL_STENCIL_FUNC                         0x0B92
-#define GL_STENCIL_VALUE_MASK                   0x0B93
-#define GL_STENCIL_REF                          0x0B97
-#define GL_STENCIL_FAIL                         0x0B94
-#define GL_STENCIL_PASS_DEPTH_PASS              0x0B96
-#define GL_STENCIL_PASS_DEPTH_FAIL              0x0B95
-#define GL_STENCIL_CLEAR_VALUE                  0x0B91
-#define GL_STENCIL_INDEX                        0x1901
-#define GL_KEEP                                 0x1E00
-#define GL_REPLACE                              0x1E01
-#define GL_INCR                                 0x1E02
-#define GL_DECR                                 0x1E03
-
-/* Buffers, Pixel Drawing/Reading */
-#define GL_NONE                                 0x0
-#define GL_LEFT                                 0x0406
-#define GL_RIGHT                                0x0407
-/*GL_FRONT                                      0x0404 */
-/*GL_BACK                                       0x0405 */
-/*GL_FRONT_AND_BACK                             0x0408 */
-#define GL_FRONT_LEFT                           0x0400
-#define GL_FRONT_RIGHT                          0x0401
-#define GL_BACK_LEFT                            0x0402
-#define GL_BACK_RIGHT                           0x0403
-#define GL_AUX0                                 0x0409
-#define GL_AUX1                                 0x040A
-#define GL_AUX2                                 0x040B
-#define GL_AUX3                                 0x040C
-#define GL_COLOR_INDEX                          0x1900
-#define GL_RED                                  0x1903
-#define GL_GREEN                                0x1904
-#define GL_BLUE                                 0x1905
-#define GL_ALPHA                                0x1906
-#define GL_LUMINANCE                            0x1909
-#define GL_LUMINANCE_ALPHA                      0x190A
-#define GL_ALPHA_BITS                           0x0D55
-#define GL_RED_BITS                             0x0D52
-#define GL_GREEN_BITS                           0x0D53
-#define GL_BLUE_BITS                            0x0D54
-#define GL_INDEX_BITS                           0x0D51
-#define GL_SUBPIXEL_BITS                        0x0D50
-#define GL_AUX_BUFFERS                          0x0C00
-#define GL_READ_BUFFER                          0x0C02
-#define GL_DRAW_BUFFER                          0x0C01
-#define GL_DOUBLEBUFFER                         0x0C32
-#define GL_STEREO                               0x0C33
-#define GL_BITMAP                               0x1A00
-#define GL_COLOR                                0x1800
-#define GL_DEPTH                                0x1801
-#define GL_STENCIL                              0x1802
-#define GL_DITHER                               0x0BD0
-#define GL_RGB                                  0x1907
-#define GL_RGBA                                 0x1908
-
-/* Implementation limits */
-#define GL_MAX_LIST_NESTING                     0x0B31
-#define GL_MAX_ATTRIB_STACK_DEPTH               0x0D35
-#define GL_MAX_MODELVIEW_STACK_DEPTH            0x0D36
-#define GL_MAX_NAME_STACK_DEPTH                 0x0D37
-#define GL_MAX_PROJECTION_STACK_DEPTH           0x0D38
-#define GL_MAX_TEXTURE_STACK_DEPTH              0x0D39
-#define GL_MAX_EVAL_ORDER                       0x0D30
-#define GL_MAX_LIGHTS                           0x0D31
-#define GL_MAX_CLIP_PLANES                      0x0D32
-#define GL_MAX_TEXTURE_SIZE                     0x0D33
-#define GL_MAX_PIXEL_MAP_TABLE                  0x0D34
-#define GL_MAX_VIEWPORT_DIMS                    0x0D3A
-#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH        0x0D3B
-
-/* Gets */
-#define GL_ATTRIB_STACK_DEPTH                   0x0BB0
-#define GL_CLIENT_ATTRIB_STACK_DEPTH            0x0BB1
-#define GL_COLOR_CLEAR_VALUE                    0x0C22
-#define GL_COLOR_WRITEMASK                      0x0C23
-#define GL_CURRENT_INDEX                        0x0B01
-#define GL_CURRENT_COLOR                        0x0B00
-#define GL_CURRENT_NORMAL                       0x0B02
-#define GL_CURRENT_RASTER_COLOR                 0x0B04
-#define GL_CURRENT_RASTER_DISTANCE              0x0B09
-#define GL_CURRENT_RASTER_INDEX                 0x0B05
-#define GL_CURRENT_RASTER_POSITION              0x0B07
-#define GL_CURRENT_RASTER_TEXTURE_COORDS        0x0B06
-#define GL_CURRENT_RASTER_POSITION_VALID        0x0B08
-#define GL_CURRENT_TEXTURE_COORDS               0x0B03
-#define GL_INDEX_CLEAR_VALUE                    0x0C20
-#define GL_INDEX_MODE                           0x0C30
-#define GL_INDEX_WRITEMASK                      0x0C21
-#define GL_MODELVIEW_MATRIX                     0x0BA6
-#define GL_MODELVIEW_STACK_DEPTH                0x0BA3
-#define GL_NAME_STACK_DEPTH                     0x0D70
-#define GL_PROJECTION_MATRIX                    0x0BA7
-#define GL_PROJECTION_STACK_DEPTH               0x0BA4
-#define GL_RENDER_MODE                          0x0C40
-#define GL_RGBA_MODE                            0x0C31
-#define GL_TEXTURE_MATRIX                       0x0BA8
-#define GL_TEXTURE_STACK_DEPTH                  0x0BA5
-#define GL_VIEWPORT                             0x0BA2
-
-/* Evaluators */
-#define GL_AUTO_NORMAL                          0x0D80
-#define GL_MAP1_COLOR_4                         0x0D90
-#define GL_MAP1_GRID_DOMAIN                     0x0DD0
-#define GL_MAP1_GRID_SEGMENTS                   0x0DD1
-#define GL_MAP1_INDEX                           0x0D91
-#define GL_MAP1_NORMAL                          0x0D92
-#define GL_MAP1_TEXTURE_COORD_1                 0x0D93
-#define GL_MAP1_TEXTURE_COORD_2                 0x0D94
-#define GL_MAP1_TEXTURE_COORD_3                 0x0D95
-#define GL_MAP1_TEXTURE_COORD_4                 0x0D96
-#define GL_MAP1_VERTEX_3                        0x0D97
-#define GL_MAP1_VERTEX_4                        0x0D98
-#define GL_MAP2_COLOR_4                         0x0DB0
-#define GL_MAP2_GRID_DOMAIN                     0x0DD2
-#define GL_MAP2_GRID_SEGMENTS                   0x0DD3
-#define GL_MAP2_INDEX                           0x0DB1
-#define GL_MAP2_NORMAL                          0x0DB2
-#define GL_MAP2_TEXTURE_COORD_1                 0x0DB3
-#define GL_MAP2_TEXTURE_COORD_2                 0x0DB4
-#define GL_MAP2_TEXTURE_COORD_3                 0x0DB5
-#define GL_MAP2_TEXTURE_COORD_4                 0x0DB6
-#define GL_MAP2_VERTEX_3                        0x0DB7
-#define GL_MAP2_VERTEX_4                        0x0DB8
-#define GL_COEFF                                0x0A00
-#define GL_DOMAIN                               0x0A02
-#define GL_ORDER                                0x0A01
-
-/* Hints */
-#define GL_FOG_HINT                             0x0C54
-#define GL_LINE_SMOOTH_HINT                     0x0C52
-#define GL_PERSPECTIVE_CORRECTION_HINT          0x0C50
-#define GL_POINT_SMOOTH_HINT                    0x0C51
-#define GL_POLYGON_SMOOTH_HINT                  0x0C53
-#define GL_DONT_CARE                            0x1100
-#define GL_FASTEST                              0x1101
-#define GL_NICEST                               0x1102
-
-/* Scissor box */
-#define GL_SCISSOR_TEST                         0x0C11
-#define GL_SCISSOR_BOX                          0x0C10
-
-/* Pixel Mode / Transfer */
-#define GL_MAP_COLOR                            0x0D10
-#define GL_MAP_STENCIL                          0x0D11
-#define GL_INDEX_SHIFT                          0x0D12
-#define GL_INDEX_OFFSET                         0x0D13
-#define GL_RED_SCALE                            0x0D14
-#define GL_RED_BIAS                             0x0D15
-#define GL_GREEN_SCALE                          0x0D18
-#define GL_GREEN_BIAS                           0x0D19
-#define GL_BLUE_SCALE                           0x0D1A
-#define GL_BLUE_BIAS                            0x0D1B
-#define GL_ALPHA_SCALE                          0x0D1C
-#define GL_ALPHA_BIAS                           0x0D1D
-#define GL_DEPTH_SCALE                          0x0D1E
-#define GL_DEPTH_BIAS                           0x0D1F
-#define GL_PIXEL_MAP_S_TO_S_SIZE                0x0CB1
-#define GL_PIXEL_MAP_I_TO_I_SIZE                0x0CB0
-#define GL_PIXEL_MAP_I_TO_R_SIZE                0x0CB2
-#define GL_PIXEL_MAP_I_TO_G_SIZE                0x0CB3
-#define GL_PIXEL_MAP_I_TO_B_SIZE                0x0CB4
-#define GL_PIXEL_MAP_I_TO_A_SIZE                0x0CB5
-#define GL_PIXEL_MAP_R_TO_R_SIZE                0x0CB6
-#define GL_PIXEL_MAP_G_TO_G_SIZE                0x0CB7
-#define GL_PIXEL_MAP_B_TO_B_SIZE                0x0CB8
-#define GL_PIXEL_MAP_A_TO_A_SIZE                0x0CB9
-#define GL_PIXEL_MAP_S_TO_S                     0x0C71
-#define GL_PIXEL_MAP_I_TO_I                     0x0C70
-#define GL_PIXEL_MAP_I_TO_R                     0x0C72
-#define GL_PIXEL_MAP_I_TO_G                     0x0C73
-#define GL_PIXEL_MAP_I_TO_B                     0x0C74
-#define GL_PIXEL_MAP_I_TO_A                     0x0C75
-#define GL_PIXEL_MAP_R_TO_R                     0x0C76
-#define GL_PIXEL_MAP_G_TO_G                     0x0C77
-#define GL_PIXEL_MAP_B_TO_B                     0x0C78
-#define GL_PIXEL_MAP_A_TO_A                     0x0C79
-#define GL_PACK_ALIGNMENT                       0x0D05
-#define GL_PACK_LSB_FIRST                       0x0D01
-#define GL_PACK_ROW_LENGTH                      0x0D02
-#define GL_PACK_SKIP_PIXELS                     0x0D04
-#define GL_PACK_SKIP_ROWS                       0x0D03
-#define GL_PACK_SWAP_BYTES                      0x0D00
-#define GL_UNPACK_ALIGNMENT                     0x0CF5
-#define GL_UNPACK_LSB_FIRST                     0x0CF1
-#define GL_UNPACK_ROW_LENGTH                    0x0CF2
-#define GL_UNPACK_SKIP_PIXELS                   0x0CF4
-#define GL_UNPACK_SKIP_ROWS                     0x0CF3
-#define GL_UNPACK_SWAP_BYTES                    0x0CF0
-#define GL_ZOOM_X                               0x0D16
-#define GL_ZOOM_Y                               0x0D17
-
-/* Texture mapping */
-#define GL_TEXTURE_ENV                          0x2300
-#define GL_TEXTURE_ENV_MODE                     0x2200
-#define GL_TEXTURE_1D                           0x0DE0
-#define GL_TEXTURE_2D                           0x0DE1
-#define GL_TEXTURE_WRAP_S                       0x2802
-#define GL_TEXTURE_WRAP_T                       0x2803
-#define GL_TEXTURE_MAG_FILTER                   0x2800
-#define GL_TEXTURE_MIN_FILTER                   0x2801
-#define GL_TEXTURE_ENV_COLOR                    0x2201
-#define GL_TEXTURE_GEN_S                        0x0C60
-#define GL_TEXTURE_GEN_T                        0x0C61
-#define GL_TEXTURE_GEN_MODE                     0x2500
-#define GL_TEXTURE_BORDER_COLOR                 0x1004
-#define GL_TEXTURE_WIDTH                        0x1000
-#define GL_TEXTURE_HEIGHT                       0x1001
-#define GL_TEXTURE_BORDER                       0x1005
-#define GL_TEXTURE_COMPONENTS                   0x1003
-#define GL_TEXTURE_RED_SIZE                     0x805C
-#define GL_TEXTURE_GREEN_SIZE                   0x805D
-#define GL_TEXTURE_BLUE_SIZE                    0x805E
-#define GL_TEXTURE_ALPHA_SIZE                   0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE               0x8060
-#define GL_TEXTURE_INTENSITY_SIZE               0x8061
-#define GL_NEAREST_MIPMAP_NEAREST               0x2700
-#define GL_NEAREST_MIPMAP_LINEAR                0x2702
-#define GL_LINEAR_MIPMAP_NEAREST                0x2701
-#define GL_LINEAR_MIPMAP_LINEAR                 0x2703
-#define GL_OBJECT_LINEAR                        0x2401
-#define GL_OBJECT_PLANE                         0x2501
-#define GL_EYE_LINEAR                           0x2400
-#define GL_EYE_PLANE                            0x2502
-#define GL_SPHERE_MAP                           0x2402
-#define GL_DECAL                                0x2101
-#define GL_MODULATE                             0x2100
-#define GL_NEAREST                              0x2600
-#define GL_REPEAT                               0x2901
-#define GL_CLAMP                                0x2900
-#define GL_S                                    0x2000
-#define GL_T                                    0x2001
-#define GL_R                                    0x2002
-#define GL_Q                                    0x2003
-#define GL_TEXTURE_GEN_R                        0x0C62
-#define GL_TEXTURE_GEN_Q                        0x0C63
-
-/* Utility */
-#define GL_VENDOR                               0x1F00
-#define GL_RENDERER                             0x1F01
-#define GL_VERSION                              0x1F02
-#define GL_EXTENSIONS                           0x1F03
-
-/* Errors */
-#define GL_NO_ERROR                             0x0
-#define GL_INVALID_VALUE                        0x0501
-#define GL_INVALID_ENUM                         0x0500
-#define GL_INVALID_OPERATION                    0x0502
-#define GL_STACK_OVERFLOW                       0x0503
-#define GL_STACK_UNDERFLOW                      0x0504
-#define GL_OUT_OF_MEMORY                        0x0505
-
-/* glPush/PopAttrib bits */
-#define GL_CURRENT_BIT                          0x00000001
-#define GL_POINT_BIT                            0x00000002
-#define GL_LINE_BIT                             0x00000004
-#define GL_POLYGON_BIT                          0x00000008
-#define GL_POLYGON_STIPPLE_BIT                  0x00000010
-#define GL_PIXEL_MODE_BIT                       0x00000020
-#define GL_LIGHTING_BIT                         0x00000040
-#define GL_FOG_BIT                              0x00000080
-#define GL_DEPTH_BUFFER_BIT                     0x00000100
-#define GL_ACCUM_BUFFER_BIT                     0x00000200
-#define GL_STENCIL_BUFFER_BIT                   0x00000400
-#define GL_VIEWPORT_BIT                         0x00000800
-#define GL_TRANSFORM_BIT                        0x00001000
-#define GL_ENABLE_BIT                           0x00002000
-#define GL_COLOR_BUFFER_BIT                     0x00004000
-#define GL_HINT_BIT                             0x00008000
-#define GL_EVAL_BIT                             0x00010000
-#define GL_LIST_BIT                             0x00020000
-#define GL_TEXTURE_BIT                          0x00040000
-#define GL_SCISSOR_BIT                          0x00080000
-#define GL_ALL_ATTRIB_BITS                      0x000FFFFF
-
-
-/* OpenGL 1.1 */
-#define GL_PROXY_TEXTURE_1D                     0x8063
-#define GL_PROXY_TEXTURE_2D                     0x8064
-#define GL_TEXTURE_PRIORITY                     0x8066
-#define GL_TEXTURE_RESIDENT                     0x8067
-#define GL_TEXTURE_BINDING_1D                   0x8068
-#define GL_TEXTURE_BINDING_2D                   0x8069
-#define GL_TEXTURE_INTERNAL_FORMAT              0x1003
-#define GL_ALPHA4                               0x803B
-#define GL_ALPHA8                               0x803C
-#define GL_ALPHA12                              0x803D
-#define GL_ALPHA16                              0x803E
-#define GL_LUMINANCE4                           0x803F
-#define GL_LUMINANCE8                           0x8040
-#define GL_LUMINANCE12                          0x8041
-#define GL_LUMINANCE16                          0x8042
-#define GL_LUMINANCE4_ALPHA4                    0x8043
-#define GL_LUMINANCE6_ALPHA2                    0x8044
-#define GL_LUMINANCE8_ALPHA8                    0x8045
-#define GL_LUMINANCE12_ALPHA4                   0x8046
-#define GL_LUMINANCE12_ALPHA12                  0x8047
-#define GL_LUMINANCE16_ALPHA16                  0x8048
-#define GL_INTENSITY                            0x8049
-#define GL_INTENSITY4                           0x804A
-#define GL_INTENSITY8                           0x804B
-#define GL_INTENSITY12                          0x804C
-#define GL_INTENSITY16                          0x804D
-#define GL_R3_G3_B2                             0x2A10
-#define GL_RGB4                                 0x804F
-#define GL_RGB5                                 0x8050
-#define GL_RGB8                                 0x8051
-#define GL_RGB10                                0x8052
-#define GL_RGB12                                0x8053
-#define GL_RGB16                                0x8054
-#define GL_RGBA2                                0x8055
-#define GL_RGBA4                                0x8056
-#define GL_RGB5_A1                              0x8057
-#define GL_RGBA8                                0x8058
-#define GL_RGB10_A2                             0x8059
-#define GL_RGBA12                               0x805A
-#define GL_RGBA16                               0x805B
-#define GL_CLIENT_PIXEL_STORE_BIT               0x00000001
-#define GL_CLIENT_VERTEX_ARRAY_BIT              0x00000002
-#define GL_ALL_CLIENT_ATTRIB_BITS               0xFFFFFFFF
-#define GL_CLIENT_ALL_ATTRIB_BITS               0xFFFFFFFF
-
-
-/* Under Windows, we do not define OpenGL 1.2 & 1.3 functionality, since
-   it is treated as extensions (defined in glext.h) */
-#if !defined(__WIN32__)
-
-/* OpenGL 1.2 */
-#define GL_RESCALE_NORMAL                       0x803A
-#define GL_CLAMP_TO_EDGE                        0x812F
-#define GL_MAX_ELEMENTS_VERTICES                0x80E8
-#define GL_MAX_ELEMENTS_INDICES                 0x80E9
-#define GL_BGR                                  0x80E0
-#define GL_BGRA                                 0x80E1
-#define GL_UNSIGNED_BYTE_3_3_2                  0x8032
-#define GL_UNSIGNED_BYTE_2_3_3_REV              0x8362
-#define GL_UNSIGNED_SHORT_5_6_5                 0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV             0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4               0x8033
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV           0x8365
-#define GL_UNSIGNED_SHORT_5_5_5_1               0x8034
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV           0x8366
-#define GL_UNSIGNED_INT_8_8_8_8                 0x8035
-#define GL_UNSIGNED_INT_8_8_8_8_REV             0x8367
-#define GL_UNSIGNED_INT_10_10_10_2              0x8036
-#define GL_UNSIGNED_INT_2_10_10_10_REV          0x8368
-#define GL_LIGHT_MODEL_COLOR_CONTROL            0x81F8
-#define GL_SINGLE_COLOR                         0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR              0x81FA
-#define GL_TEXTURE_MIN_LOD                      0x813A
-#define GL_TEXTURE_MAX_LOD                      0x813B
-#define GL_TEXTURE_BASE_LEVEL                   0x813C
-#define GL_TEXTURE_MAX_LEVEL                    0x813D
-#define GL_SMOOTH_POINT_SIZE_RANGE              0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY        0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE              0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY        0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE             0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE             0x846E
-#define GL_PACK_SKIP_IMAGES                     0x806B
-#define GL_PACK_IMAGE_HEIGHT                    0x806C
-#define GL_UNPACK_SKIP_IMAGES                   0x806D
-#define GL_UNPACK_IMAGE_HEIGHT                  0x806E
-#define GL_TEXTURE_3D                           0x806F
-#define GL_PROXY_TEXTURE_3D                     0x8070
-#define GL_TEXTURE_DEPTH                        0x8071
-#define GL_TEXTURE_WRAP_R                       0x8072
-#define GL_MAX_3D_TEXTURE_SIZE                  0x8073
-#define GL_TEXTURE_BINDING_3D                   0x806A
-
-/* OpenGL 1.2 imaging subset */
-/* GL_EXT_color_table */
-#define GL_COLOR_TABLE                          0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE         0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE        0x80D2
-#define GL_PROXY_COLOR_TABLE                    0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE   0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE  0x80D5
-#define GL_COLOR_TABLE_SCALE                    0x80D6
-#define GL_COLOR_TABLE_BIAS                     0x80D7
-#define GL_COLOR_TABLE_FORMAT                   0x80D8
-#define GL_COLOR_TABLE_WIDTH                    0x80D9
-#define GL_COLOR_TABLE_RED_SIZE                 0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE               0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE                0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE               0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE           0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE           0x80DF
-/* GL_EXT_convolution and GL_HP_convolution_border_modes */
-#define GL_CONVOLUTION_1D                       0x8010
-#define GL_CONVOLUTION_2D                       0x8011
-#define GL_SEPARABLE_2D                         0x8012
-#define GL_CONVOLUTION_BORDER_MODE              0x8013
-#define GL_CONVOLUTION_FILTER_SCALE             0x8014
-#define GL_CONVOLUTION_FILTER_BIAS              0x8015
-#define GL_REDUCE                               0x8016
-#define GL_CONVOLUTION_FORMAT                   0x8017
-#define GL_CONVOLUTION_WIDTH                    0x8018
-#define GL_CONVOLUTION_HEIGHT                   0x8019
-#define GL_MAX_CONVOLUTION_WIDTH                0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT               0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE           0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE         0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE          0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE         0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS            0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS          0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS           0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS          0x8023
-#define GL_CONSTANT_BORDER                      0x8151
-#define GL_REPLICATE_BORDER                     0x8153
-#define GL_CONVOLUTION_BORDER_COLOR             0x8154
-/* GL_SGI_color_matrix */
-#define GL_COLOR_MATRIX                         0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH             0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH         0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE          0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE        0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE         0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE        0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS           0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS         0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS          0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS         0x80BB
-/* GL_EXT_histogram */
-#define GL_HISTOGRAM                            0x8024
-#define GL_PROXY_HISTOGRAM                      0x8025
-#define GL_HISTOGRAM_WIDTH                      0x8026
-#define GL_HISTOGRAM_FORMAT                     0x8027
-#define GL_HISTOGRAM_RED_SIZE                   0x8028
-#define GL_HISTOGRAM_GREEN_SIZE                 0x8029
-#define GL_HISTOGRAM_BLUE_SIZE                  0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE                 0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE             0x802C
-#define GL_HISTOGRAM_SINK                       0x802D
-#define GL_MINMAX                               0x802E
-#define GL_MINMAX_FORMAT                        0x802F
-#define GL_MINMAX_SINK                          0x8030
-#define GL_TABLE_TOO_LARGE                      0x8031
-/* GL_EXT_blend_color, GL_EXT_blend_minmax */
-#define GL_BLEND_EQUATION                       0x8009
-#define GL_MIN                                  0x8007
-#define GL_MAX                                  0x8008
-#define GL_FUNC_ADD                             0x8006
-#define GL_FUNC_SUBTRACT                        0x800A
-#define GL_FUNC_REVERSE_SUBTRACT                0x800B
-#define GL_BLEND_COLOR                          0x8005
-
-
-/* OpenGL 1.3 */
-/* multitexture */
-#define GL_TEXTURE0                             0x84C0
-#define GL_TEXTURE1                             0x84C1
-#define GL_TEXTURE2                             0x84C2
-#define GL_TEXTURE3                             0x84C3
-#define GL_TEXTURE4                             0x84C4
-#define GL_TEXTURE5                             0x84C5
-#define GL_TEXTURE6                             0x84C6
-#define GL_TEXTURE7                             0x84C7
-#define GL_TEXTURE8                             0x84C8
-#define GL_TEXTURE9                             0x84C9
-#define GL_TEXTURE10                            0x84CA
-#define GL_TEXTURE11                            0x84CB
-#define GL_TEXTURE12                            0x84CC
-#define GL_TEXTURE13                            0x84CD
-#define GL_TEXTURE14                            0x84CE
-#define GL_TEXTURE15                            0x84CF
-#define GL_TEXTURE16                            0x84D0
-#define GL_TEXTURE17                            0x84D1
-#define GL_TEXTURE18                            0x84D2
-#define GL_TEXTURE19                            0x84D3
-#define GL_TEXTURE20                            0x84D4
-#define GL_TEXTURE21                            0x84D5
-#define GL_TEXTURE22                            0x84D6
-#define GL_TEXTURE23                            0x84D7
-#define GL_TEXTURE24                            0x84D8
-#define GL_TEXTURE25                            0x84D9
-#define GL_TEXTURE26                            0x84DA
-#define GL_TEXTURE27                            0x84DB
-#define GL_TEXTURE28                            0x84DC
-#define GL_TEXTURE29                            0x84DD
-#define GL_TEXTURE30                            0x84DE
-#define GL_TEXTURE31                            0x84DF
-#define GL_ACTIVE_TEXTURE                       0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE                0x84E1
-#define GL_MAX_TEXTURE_UNITS                    0x84E2
-/* texture_cube_map */
-#define GL_NORMAL_MAP                           0x8511
-#define GL_REFLECTION_MAP                       0x8512
-#define GL_TEXTURE_CUBE_MAP                     0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP             0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X          0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X          0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y          0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y          0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z          0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z          0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP               0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE            0x851C
-/* texture_compression */
-#define GL_COMPRESSED_ALPHA                     0x84E9
-#define GL_COMPRESSED_LUMINANCE                 0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA           0x84EB
-#define GL_COMPRESSED_INTENSITY                 0x84EC
-#define GL_COMPRESSED_RGB                       0x84ED
-#define GL_COMPRESSED_RGBA                      0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT             0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE        0x86A0
-#define GL_TEXTURE_COMPRESSED                   0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS       0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS           0x86A3
-/* multisample */
-#define GL_MULTISAMPLE                          0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE             0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE                  0x809F
-#define GL_SAMPLE_COVERAGE                      0x80A0
-#define GL_SAMPLE_BUFFERS                       0x80A8
-#define GL_SAMPLES                              0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE                0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT               0x80AB
-#define GL_MULTISAMPLE_BIT                      0x20000000
-/* transpose_matrix */
-#define GL_TRANSPOSE_MODELVIEW_MATRIX           0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX          0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX             0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX               0x84E6
-/* texture_env_combine */
-#define GL_COMBINE                              0x8570
-#define GL_COMBINE_RGB                          0x8571
-#define GL_COMBINE_ALPHA                        0x8572
-#define GL_SOURCE0_RGB                          0x8580
-#define GL_SOURCE1_RGB                          0x8581
-#define GL_SOURCE2_RGB                          0x8582
-#define GL_SOURCE0_ALPHA                        0x8588
-#define GL_SOURCE1_ALPHA                        0x8589
-#define GL_SOURCE2_ALPHA                        0x858A
-#define GL_OPERAND0_RGB                         0x8590
-#define GL_OPERAND1_RGB                         0x8591
-#define GL_OPERAND2_RGB                         0x8592
-#define GL_OPERAND0_ALPHA                       0x8598
-#define GL_OPERAND1_ALPHA                       0x8599
-#define GL_OPERAND2_ALPHA                       0x859A
-#define GL_RGB_SCALE                            0x8573
-#define GL_ADD_SIGNED                           0x8574
-#define GL_INTERPOLATE                          0x8575
-#define GL_SUBTRACT                             0x84E7
-#define GL_CONSTANT                             0x8576
-#define GL_PRIMARY_COLOR                        0x8577
-#define GL_PREVIOUS                             0x8578
-/* texture_env_dot3 */
-#define GL_DOT3_RGB                             0x86AE
-#define GL_DOT3_RGBA                            0x86AF
-/* texture_border_clamp */
-#define GL_CLAMP_TO_BORDER                      0x812D
-
-#endif /* __WIN32__ */
-
-
-
-/************************************************************************
- *
- * Function prototypes
- *
- ************************************************************************/
-
-/* Miscellaneous */
-GLAPI void APIENTRY glClearIndex( GLfloat c );
-GLAPI void APIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
-GLAPI void APIENTRY glClear( GLbitfield mask );
-GLAPI void APIENTRY glIndexMask( GLuint mask );
-GLAPI void APIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
-GLAPI void APIENTRY glAlphaFunc( GLenum func, GLclampf ref );
-GLAPI void APIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor );
-GLAPI void APIENTRY glLogicOp( GLenum opcode );
-GLAPI void APIENTRY glCullFace( GLenum mode );
-GLAPI void APIENTRY glFrontFace( GLenum mode );
-GLAPI void APIENTRY glPointSize( GLfloat size );
-GLAPI void APIENTRY glLineWidth( GLfloat width );
-GLAPI void APIENTRY glLineStipple( GLint factor, GLushort pattern );
-GLAPI void APIENTRY glPolygonMode( GLenum face, GLenum mode );
-GLAPI void APIENTRY glPolygonOffset( GLfloat factor, GLfloat units );
-GLAPI void APIENTRY glPolygonStipple( const GLubyte *mask );
-GLAPI void APIENTRY glGetPolygonStipple( GLubyte *mask );
-GLAPI void APIENTRY glEdgeFlag( GLboolean flag );
-GLAPI void APIENTRY glEdgeFlagv( const GLboolean *flag );
-GLAPI void APIENTRY glScissor( GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glClipPlane( GLenum plane, const GLdouble *equation );
-GLAPI void APIENTRY glGetClipPlane( GLenum plane, GLdouble *equation );
-GLAPI void APIENTRY glDrawBuffer( GLenum mode );
-GLAPI void APIENTRY glReadBuffer( GLenum mode );
-GLAPI void APIENTRY glEnable( GLenum cap );
-GLAPI void APIENTRY glDisable( GLenum cap );
-GLAPI GLboolean APIENTRY glIsEnabled( GLenum cap );
-GLAPI void APIENTRY glEnableClientState( GLenum cap );  /* 1.1 */
-GLAPI void APIENTRY glDisableClientState( GLenum cap );  /* 1.1 */
-GLAPI void APIENTRY glGetBooleanv( GLenum pname, GLboolean *params );
-GLAPI void APIENTRY glGetDoublev( GLenum pname, GLdouble *params );
-GLAPI void APIENTRY glGetFloatv( GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetIntegerv( GLenum pname, GLint *params );
-GLAPI void APIENTRY glPushAttrib( GLbitfield mask );
-GLAPI void APIENTRY glPopAttrib( void );
-GLAPI void APIENTRY glPushClientAttrib( GLbitfield mask );  /* 1.1 */
-GLAPI void APIENTRY glPopClientAttrib( void );  /* 1.1 */
-GLAPI GLint APIENTRY glRenderMode( GLenum mode );
-GLAPI GLenum APIENTRY glGetError( void );
-GLAPI const GLubyte* APIENTRY glGetString( GLenum name );
-GLAPI void APIENTRY glFinish( void );
-GLAPI void APIENTRY glFlush( void );
-GLAPI void APIENTRY glHint( GLenum target, GLenum mode );
-
-/* Depth Buffer */
-GLAPI void APIENTRY glClearDepth( GLclampd depth );
-GLAPI void APIENTRY glDepthFunc( GLenum func );
-GLAPI void APIENTRY glDepthMask( GLboolean flag );
-GLAPI void APIENTRY glDepthRange( GLclampd near_val, GLclampd far_val );
-
-/* Accumulation Buffer */
-GLAPI void APIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
-GLAPI void APIENTRY glAccum( GLenum op, GLfloat value );
-
-/* Transformation */
-GLAPI void APIENTRY glMatrixMode( GLenum mode );
-GLAPI void APIENTRY glOrtho( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val );
-GLAPI void APIENTRY glFrustum( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val );
-GLAPI void APIENTRY glViewport( GLint x, GLint y, GLsizei width, GLsizei height );
-GLAPI void APIENTRY glPushMatrix( void );
-GLAPI void APIENTRY glPopMatrix( void );
-GLAPI void APIENTRY glLoadIdentity( void );
-GLAPI void APIENTRY glLoadMatrixd( const GLdouble *m );
-GLAPI void APIENTRY glLoadMatrixf( const GLfloat *m );
-GLAPI void APIENTRY glMultMatrixd( const GLdouble *m );
-GLAPI void APIENTRY glMultMatrixf( const GLfloat *m );
-GLAPI void APIENTRY glRotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glRotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z );
-GLAPI void APIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z );
-GLAPI void APIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z );
-
-/* Display Lists */
-GLAPI GLboolean APIENTRY glIsList( GLuint list );
-GLAPI void APIENTRY glDeleteLists( GLuint list, GLsizei range );
-GLAPI GLuint APIENTRY glGenLists( GLsizei range );
-GLAPI void APIENTRY glNewList( GLuint list, GLenum mode );
-GLAPI void APIENTRY glEndList( void );
-GLAPI void APIENTRY glCallList( GLuint list );
-GLAPI void APIENTRY glCallLists( GLsizei n, GLenum type, const GLvoid *lists );
-GLAPI void APIENTRY glListBase( GLuint base );
-
-/* Drawing Functions */
-GLAPI void APIENTRY glBegin( GLenum mode );
-GLAPI void APIENTRY glEnd( void );
-GLAPI void APIENTRY glVertex2d( GLdouble x, GLdouble y );
-GLAPI void APIENTRY glVertex2f( GLfloat x, GLfloat y );
-GLAPI void APIENTRY glVertex2i( GLint x, GLint y );
-GLAPI void APIENTRY glVertex2s( GLshort x, GLshort y );
-GLAPI void APIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z );
-GLAPI void APIENTRY glVertex3i( GLint x, GLint y, GLint z );
-GLAPI void APIENTRY glVertex3s( GLshort x, GLshort y, GLshort z );
-GLAPI void APIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
-GLAPI void APIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
-GLAPI void APIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w );
-GLAPI void APIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
-GLAPI void APIENTRY glVertex2dv( const GLdouble *v );
-GLAPI void APIENTRY glVertex2fv( const GLfloat *v );
-GLAPI void APIENTRY glVertex2iv( const GLint *v );
-GLAPI void APIENTRY glVertex2sv( const GLshort *v );
-GLAPI void APIENTRY glVertex3dv( const GLdouble *v );
-GLAPI void APIENTRY glVertex3fv( const GLfloat *v );
-GLAPI void APIENTRY glVertex3iv( const GLint *v );
-GLAPI void APIENTRY glVertex3sv( const GLshort *v );
-GLAPI void APIENTRY glVertex4dv( const GLdouble *v );
-GLAPI void APIENTRY glVertex4fv( const GLfloat *v );
-GLAPI void APIENTRY glVertex4iv( const GLint *v );
-GLAPI void APIENTRY glVertex4sv( const GLshort *v );
-GLAPI void APIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz );
-GLAPI void APIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz );
-GLAPI void APIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz );
-GLAPI void APIENTRY glNormal3i( GLint nx, GLint ny, GLint nz );
-GLAPI void APIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz );
-GLAPI void APIENTRY glNormal3bv( const GLbyte *v );
-GLAPI void APIENTRY glNormal3dv( const GLdouble *v );
-GLAPI void APIENTRY glNormal3fv( const GLfloat *v );
-GLAPI void APIENTRY glNormal3iv( const GLint *v );
-GLAPI void APIENTRY glNormal3sv( const GLshort *v );
-GLAPI void APIENTRY glIndexd( GLdouble c );
-GLAPI void APIENTRY glIndexf( GLfloat c );
-GLAPI void APIENTRY glIndexi( GLint c );
-GLAPI void APIENTRY glIndexs( GLshort c );
-GLAPI void APIENTRY glIndexub( GLubyte c );  /* 1.1 */
-GLAPI void APIENTRY glIndexdv( const GLdouble *c );
-GLAPI void APIENTRY glIndexfv( const GLfloat *c );
-GLAPI void APIENTRY glIndexiv( const GLint *c );
-GLAPI void APIENTRY glIndexsv( const GLshort *c );
-GLAPI void APIENTRY glIndexubv( const GLubyte *c );  /* 1.1 */
-GLAPI void APIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue );
-GLAPI void APIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue );
-GLAPI void APIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue );
-GLAPI void APIENTRY glColor3i( GLint red, GLint green, GLint blue );
-GLAPI void APIENTRY glColor3s( GLshort red, GLshort green, GLshort blue );
-GLAPI void APIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue );
-GLAPI void APIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue );
-GLAPI void APIENTRY glColor3us( GLushort red, GLushort green, GLushort blue );
-GLAPI void APIENTRY glColor4b( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha );
-GLAPI void APIENTRY glColor4d( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha );
-GLAPI void APIENTRY glColor4f( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
-GLAPI void APIENTRY glColor4i( GLint red, GLint green, GLint blue, GLint alpha );
-GLAPI void APIENTRY glColor4s( GLshort red, GLshort green, GLshort blue, GLshort alpha );
-GLAPI void APIENTRY glColor4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha );
-GLAPI void APIENTRY glColor4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha );
-GLAPI void APIENTRY glColor4us( GLushort red, GLushort green, GLushort blue, GLushort alpha );
-GLAPI void APIENTRY glColor3bv( const GLbyte *v );
-GLAPI void APIENTRY glColor3dv( const GLdouble *v );
-GLAPI void APIENTRY glColor3fv( const GLfloat *v );
-GLAPI void APIENTRY glColor3iv( const GLint *v );
-GLAPI void APIENTRY glColor3sv( const GLshort *v );
-GLAPI void APIENTRY glColor3ubv( const GLubyte *v );
-GLAPI void APIENTRY glColor3uiv( const GLuint *v );
-GLAPI void APIENTRY glColor3usv( const GLushort *v );
-GLAPI void APIENTRY glColor4bv( const GLbyte *v );
-GLAPI void APIENTRY glColor4dv( const GLdouble *v );
-GLAPI void APIENTRY glColor4fv( const GLfloat *v );
-GLAPI void APIENTRY glColor4iv( const GLint *v );
-GLAPI void APIENTRY glColor4sv( const GLshort *v );
-GLAPI void APIENTRY glColor4ubv( const GLubyte *v );
-GLAPI void APIENTRY glColor4uiv( const GLuint *v );
-GLAPI void APIENTRY glColor4usv( const GLushort *v );
-GLAPI void APIENTRY glTexCoord1d( GLdouble s );
-GLAPI void APIENTRY glTexCoord1f( GLfloat s );
-GLAPI void APIENTRY glTexCoord1i( GLint s );
-GLAPI void APIENTRY glTexCoord1s( GLshort s );
-GLAPI void APIENTRY glTexCoord2d( GLdouble s, GLdouble t );
-GLAPI void APIENTRY glTexCoord2f( GLfloat s, GLfloat t );
-GLAPI void APIENTRY glTexCoord2i( GLint s, GLint t );
-GLAPI void APIENTRY glTexCoord2s( GLshort s, GLshort t );
-GLAPI void APIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r );
-GLAPI void APIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r );
-GLAPI void APIENTRY glTexCoord3i( GLint s, GLint t, GLint r );
-GLAPI void APIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r );
-GLAPI void APIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
-GLAPI void APIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
-GLAPI void APIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q );
-GLAPI void APIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
-GLAPI void APIENTRY glTexCoord1dv( const GLdouble *v );
-GLAPI void APIENTRY glTexCoord1fv( const GLfloat *v );
-GLAPI void APIENTRY glTexCoord1iv( const GLint *v );
-GLAPI void APIENTRY glTexCoord1sv( const GLshort *v );
-GLAPI void APIENTRY glTexCoord2dv( const GLdouble *v );
-GLAPI void APIENTRY glTexCoord2fv( const GLfloat *v );
-GLAPI void APIENTRY glTexCoord2iv( const GLint *v );
-GLAPI void APIENTRY glTexCoord2sv( const GLshort *v );
-GLAPI void APIENTRY glTexCoord3dv( const GLdouble *v );
-GLAPI void APIENTRY glTexCoord3fv( const GLfloat *v );
-GLAPI void APIENTRY glTexCoord3iv( const GLint *v );
-GLAPI void APIENTRY glTexCoord3sv( const GLshort *v );
-GLAPI void APIENTRY glTexCoord4dv( const GLdouble *v );
-GLAPI void APIENTRY glTexCoord4fv( const GLfloat *v );
-GLAPI void APIENTRY glTexCoord4iv( const GLint *v );
-GLAPI void APIENTRY glTexCoord4sv( const GLshort *v );
-GLAPI void APIENTRY glRasterPos2d( GLdouble x, GLdouble y );
-GLAPI void APIENTRY glRasterPos2f( GLfloat x, GLfloat y );
-GLAPI void APIENTRY glRasterPos2i( GLint x, GLint y );
-GLAPI void APIENTRY glRasterPos2s( GLshort x, GLshort y );
-GLAPI void APIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z );
-GLAPI void APIENTRY glRasterPos3i( GLint x, GLint y, GLint z );
-GLAPI void APIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z );
-GLAPI void APIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
-GLAPI void APIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
-GLAPI void APIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w );
-GLAPI void APIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w );
-GLAPI void APIENTRY glRasterPos2dv( const GLdouble *v );
-GLAPI void APIENTRY glRasterPos2fv( const GLfloat *v );
-GLAPI void APIENTRY glRasterPos2iv( const GLint *v );
-GLAPI void APIENTRY glRasterPos2sv( const GLshort *v );
-GLAPI void APIENTRY glRasterPos3dv( const GLdouble *v );
-GLAPI void APIENTRY glRasterPos3fv( const GLfloat *v );
-GLAPI void APIENTRY glRasterPos3iv( const GLint *v );
-GLAPI void APIENTRY glRasterPos3sv( const GLshort *v );
-GLAPI void APIENTRY glRasterPos4dv( const GLdouble *v );
-GLAPI void APIENTRY glRasterPos4fv( const GLfloat *v );
-GLAPI void APIENTRY glRasterPos4iv( const GLint *v );
-GLAPI void APIENTRY glRasterPos4sv( const GLshort *v );
-GLAPI void APIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
-GLAPI void APIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
-GLAPI void APIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 );
-GLAPI void APIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
-GLAPI void APIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 );
-GLAPI void APIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 );
-GLAPI void APIENTRY glRectiv( const GLint *v1, const GLint *v2 );
-GLAPI void APIENTRY glRectsv( const GLshort *v1, const GLshort *v2 );
-
-/* Lighting */
-GLAPI void APIENTRY glShadeModel( GLenum mode );
-GLAPI void APIENTRY glLightf( GLenum light, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glLighti( GLenum light, GLenum pname, GLint param );
-GLAPI void APIENTRY glLightfv( GLenum light, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glLightiv( GLenum light, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetLightfv( GLenum light, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetLightiv( GLenum light, GLenum pname, GLint *params );
-GLAPI void APIENTRY glLightModelf( GLenum pname, GLfloat param );
-GLAPI void APIENTRY glLightModeli( GLenum pname, GLint param );
-GLAPI void APIENTRY glLightModelfv( GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glLightModeliv( GLenum pname, const GLint *params );
-GLAPI void APIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glMateriali( GLenum face, GLenum pname, GLint param );
-GLAPI void APIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params );
-GLAPI void APIENTRY glColorMaterial( GLenum face, GLenum mode );
-
-/* Raster functions */
-GLAPI void APIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor );
-GLAPI void APIENTRY glPixelStoref( GLenum pname, GLfloat param );
-GLAPI void APIENTRY glPixelStorei( GLenum pname, GLint param );
-GLAPI void APIENTRY glPixelTransferf( GLenum pname, GLfloat param );
-GLAPI void APIENTRY glPixelTransferi( GLenum pname, GLint param );
-GLAPI void APIENTRY glPixelMapfv( GLenum map, GLint mapsize, const GLfloat *values );
-GLAPI void APIENTRY glPixelMapuiv( GLenum map, GLint mapsize, const GLuint *values );
-GLAPI void APIENTRY glPixelMapusv( GLenum map, GLint mapsize, const GLushort *values );
-GLAPI void APIENTRY glGetPixelMapfv( GLenum map, GLfloat *values );
-GLAPI void APIENTRY glGetPixelMapuiv( GLenum map, GLuint *values );
-GLAPI void APIENTRY glGetPixelMapusv( GLenum map, GLushort *values );
-GLAPI void APIENTRY glBitmap( GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap );
-GLAPI void APIENTRY glReadPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels );
-GLAPI void APIENTRY glDrawPixels( GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glCopyPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum type );
-
-/* Stenciling */
-GLAPI void APIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask );
-GLAPI void APIENTRY glStencilMask( GLuint mask );
-GLAPI void APIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass );
-GLAPI void APIENTRY glClearStencil( GLint s );
-
-/* Texture mapping */
-GLAPI void APIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param );
-GLAPI void APIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param );
-GLAPI void APIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params );
-GLAPI void APIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
-GLAPI void APIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params );
-GLAPI void APIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param );
-GLAPI void APIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param );
-GLAPI void APIENTRY glTexParameterfv( GLenum target, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glTexParameteriv( GLenum target, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetTexParameterfv( GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetTexParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glGetTexLevelParameterfv( GLenum target, GLint level, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetTexLevelParameteriv( GLenum target, GLint level, GLenum pname, GLint *params );
-GLAPI void APIENTRY glTexImage1D( GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glTexImage2D( GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glGetTexImage( GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels );
-
-/* Evaluators */
-GLAPI void APIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points );
-GLAPI void APIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points );
-GLAPI void APIENTRY glMap2d( GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points );
-GLAPI void APIENTRY glMap2f( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points );
-GLAPI void APIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v );
-GLAPI void APIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v );
-GLAPI void APIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v );
-GLAPI void APIENTRY glEvalCoord1d( GLdouble u );
-GLAPI void APIENTRY glEvalCoord1f( GLfloat u );
-GLAPI void APIENTRY glEvalCoord1dv( const GLdouble *u );
-GLAPI void APIENTRY glEvalCoord1fv( const GLfloat *u );
-GLAPI void APIENTRY glEvalCoord2d( GLdouble u, GLdouble v );
-GLAPI void APIENTRY glEvalCoord2f( GLfloat u, GLfloat v );
-GLAPI void APIENTRY glEvalCoord2dv( const GLdouble *u );
-GLAPI void APIENTRY glEvalCoord2fv( const GLfloat *u );
-GLAPI void APIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
-GLAPI void APIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
-GLAPI void APIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2 );
-GLAPI void APIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2 );
-GLAPI void APIENTRY glEvalPoint1( GLint i );
-GLAPI void APIENTRY glEvalPoint2( GLint i, GLint j );
-GLAPI void APIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 );
-GLAPI void APIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
-
-/* Fog */
-GLAPI void APIENTRY glFogf( GLenum pname, GLfloat param );
-GLAPI void APIENTRY glFogi( GLenum pname, GLint param );
-GLAPI void APIENTRY glFogfv( GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glFogiv( GLenum pname, const GLint *params );
-
-/* Selection and Feedback */
-GLAPI void APIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
-GLAPI void APIENTRY glPassThrough( GLfloat token );
-GLAPI void APIENTRY glSelectBuffer( GLsizei size, GLuint *buffer );
-GLAPI void APIENTRY glInitNames( void );
-GLAPI void APIENTRY glLoadName( GLuint name );
-GLAPI void APIENTRY glPushName( GLuint name );
-GLAPI void APIENTRY glPopName( void );
-
-
-/* 1.1 functions */
-/* texture objects */
-GLAPI void APIENTRY glGenTextures( GLsizei n, GLuint *textures );
-GLAPI void APIENTRY glDeleteTextures( GLsizei n, const GLuint *textures);
-GLAPI void APIENTRY glBindTexture( GLenum target, GLuint texture );
-GLAPI void APIENTRY glPrioritizeTextures( GLsizei n, const GLuint *textures, const GLclampf *priorities );
-GLAPI GLboolean APIENTRY glAreTexturesResident( GLsizei n, const GLuint *textures, GLboolean *residences );
-GLAPI GLboolean APIENTRY glIsTexture( GLuint texture );
-/* texture mapping */
-GLAPI void APIENTRY glTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glCopyTexImage1D( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border );
-GLAPI void APIENTRY glCopyTexImage2D( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border );
-GLAPI void APIENTRY glCopyTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );
-GLAPI void APIENTRY glCopyTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-/* vertex arrays */
-GLAPI void APIENTRY glVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glNormalPointer( GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glIndexPointer( GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glTexCoordPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glGetPointerv( GLenum pname, GLvoid **params );
-GLAPI void APIENTRY glArrayElement( GLint i );
-GLAPI void APIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count );
-GLAPI void APIENTRY glDrawElements( GLenum mode, GLsizei count, GLenum type, const GLvoid *indices );
-GLAPI void APIENTRY glInterleavedArrays( GLenum format, GLsizei stride, const GLvoid *pointer );
-
-
-
-/* Under Windows, we do not define OpenGL 1.2 & 1.3 functionality, since
-   it is treated as extensions (defined in glext.h) */
-#if !defined(__WIN32__)
-
-/* 1.2 functions */
-GLAPI void APIENTRY glDrawRangeElements( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
-GLAPI void APIENTRY glTexImage3D( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-
-/* 1.2 imaging extension functions */
-GLAPI void APIENTRY glColorTable( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table );
-GLAPI void APIENTRY glColorSubTable( GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data );
-GLAPI void APIENTRY glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glCopyColorSubTable( GLenum target, GLsizei start, GLint x, GLint y, GLsizei width );
-GLAPI void APIENTRY glCopyColorTable( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
-GLAPI void APIENTRY glGetColorTable( GLenum target, GLenum format, GLenum type, GLvoid *table );
-GLAPI void APIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glBlendEquation( GLenum mode );
-GLAPI void APIENTRY glBlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
-GLAPI void APIENTRY glHistogram( GLenum target, GLsizei width, GLenum internalformat, GLboolean sink );
-GLAPI void APIENTRY glResetHistogram( GLenum target );
-GLAPI void APIENTRY glGetHistogram( GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values );
-GLAPI void APIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glMinmax( GLenum target, GLenum internalformat, GLboolean sink );
-GLAPI void APIENTRY glResetMinmax( GLenum target );
-GLAPI void APIENTRY glGetMinmax( GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values );
-GLAPI void APIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glConvolutionFilter1D( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image );
-GLAPI void APIENTRY glConvolutionFilter2D( GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image );
-GLAPI void APIENTRY glConvolutionParameterf( GLenum target, GLenum pname, GLfloat params );
-GLAPI void APIENTRY glConvolutionParameterfv( GLenum target, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glConvolutionParameteri( GLenum target, GLenum pname, GLint params );
-GLAPI void APIENTRY glConvolutionParameteriv( GLenum target, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glCopyConvolutionFilter1D( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
-GLAPI void APIENTRY glCopyConvolutionFilter2D( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetConvolutionFilter( GLenum target, GLenum format, GLenum type, GLvoid *image );
-GLAPI void APIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glSeparableFilter2D( GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column );
-GLAPI void APIENTRY glGetSeparableFilter( GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
-
-/* 1.3 functions */
-GLAPI void APIENTRY glActiveTexture( GLenum texture );
-GLAPI void APIENTRY glClientActiveTexture( GLenum texture );
-GLAPI void APIENTRY glCompressedTexImage1D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glGetCompressedTexImage( GLenum target, GLint lod, GLvoid *img );
-GLAPI void APIENTRY glMultiTexCoord1d( GLenum target, GLdouble s );
-GLAPI void APIENTRY glMultiTexCoord1dv( GLenum target, const GLdouble *v );
-GLAPI void APIENTRY glMultiTexCoord1f( GLenum target, GLfloat s );
-GLAPI void APIENTRY glMultiTexCoord1fv( GLenum target, const GLfloat *v );
-GLAPI void APIENTRY glMultiTexCoord1i( GLenum target, GLint s );
-GLAPI void APIENTRY glMultiTexCoord1iv( GLenum target, const GLint *v );
-GLAPI void APIENTRY glMultiTexCoord1s( GLenum target, GLshort s );
-GLAPI void APIENTRY glMultiTexCoord1sv( GLenum target, const GLshort *v );
-GLAPI void APIENTRY glMultiTexCoord2d( GLenum target, GLdouble s, GLdouble t );
-GLAPI void APIENTRY glMultiTexCoord2dv( GLenum target, const GLdouble *v );
-GLAPI void APIENTRY glMultiTexCoord2f( GLenum target, GLfloat s, GLfloat t );
-GLAPI void APIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v );
-GLAPI void APIENTRY glMultiTexCoord2i( GLenum target, GLint s, GLint t );
-GLAPI void APIENTRY glMultiTexCoord2iv( GLenum target, const GLint *v );
-GLAPI void APIENTRY glMultiTexCoord2s( GLenum target, GLshort s, GLshort t );
-GLAPI void APIENTRY glMultiTexCoord2sv( GLenum target, const GLshort *v );
-GLAPI void APIENTRY glMultiTexCoord3d( GLenum target, GLdouble s, GLdouble t, GLdouble r );
-GLAPI void APIENTRY glMultiTexCoord3dv( GLenum target, const GLdouble *v );
-GLAPI void APIENTRY glMultiTexCoord3f( GLenum target, GLfloat s, GLfloat t, GLfloat r );
-GLAPI void APIENTRY glMultiTexCoord3fv( GLenum target, const GLfloat *v );
-GLAPI void APIENTRY glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r );
-GLAPI void APIENTRY glMultiTexCoord3iv( GLenum target, const GLint *v );
-GLAPI void APIENTRY glMultiTexCoord3s( GLenum target, GLshort s, GLshort t, GLshort r );
-GLAPI void APIENTRY glMultiTexCoord3sv( GLenum target, const GLshort *v );
-GLAPI void APIENTRY glMultiTexCoord4d( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
-GLAPI void APIENTRY glMultiTexCoord4dv( GLenum target, const GLdouble *v );
-GLAPI void APIENTRY glMultiTexCoord4f( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
-GLAPI void APIENTRY glMultiTexCoord4fv( GLenum target, const GLfloat *v );
-GLAPI void APIENTRY glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q );
-GLAPI void APIENTRY glMultiTexCoord4iv( GLenum target, const GLint *v );
-GLAPI void APIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
-GLAPI void APIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v );
-GLAPI void APIENTRY glLoadTransposeMatrixd( const GLdouble m[16] );
-GLAPI void APIENTRY glLoadTransposeMatrixf( const GLfloat m[16] );
-GLAPI void APIENTRY glMultTransposeMatrixd( const GLdouble m[16] );
-GLAPI void APIENTRY glMultTransposeMatrixf( const GLfloat m[16] );
-GLAPI void APIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
-GLAPI void APIENTRY glSamplePass( GLenum pass );
-
-#endif /* __WIN32__ */
-
-#undef __WIN32__
-
-/* Include external definitions of OpenGL extensions */
-/* Removed, see this bug report for reference:
- * http://sourceforge.net/tracker/index.php?func=detail&aid=610178&group_id=2435&atid=102435
- * 
- * #include <GL/glext.h>
- */
-
-
-/************************************************************************
- * Begin system-specific stuff
- */
-/*
- * End system-specific stuff
- ************************************************************************/
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gl_h_ */
diff --git a/Source/Glitch64/inc/glext.h b/Source/Glitch64/inc/glext.h
deleted file mode 100644
index 480e922ca..000000000
--- a/Source/Glitch64/inc/glext.h
+++ /dev/null
@@ -1,6498 +0,0 @@
-#ifndef __glext_h_
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2005/06/20 */
-/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
-#define GL_GLEXT_VERSION 29
-
-#ifndef GL_VERSION_1_2
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_TEXTURE_BINDING_3D             0x806A
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_ARB_imaging
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_BLEND_DST_RGB                  0x80C8
-#define GL_BLEND_SRC_RGB                  0x80C9
-#define GL_BLEND_DST_ALPHA                0x80CA
-#define GL_BLEND_SRC_ALPHA                0x80CB
-#define GL_POINT_SIZE_MIN                 0x8126
-#define GL_POINT_SIZE_MAX                 0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
-#define GL_POINT_DISTANCE_ATTENUATION     0x8129
-#define GL_GENERATE_MIPMAP                0x8191
-#define GL_GENERATE_MIPMAP_HINT           0x8192
-#define GL_DEPTH_COMPONENT16              0x81A5
-#define GL_DEPTH_COMPONENT24              0x81A6
-#define GL_DEPTH_COMPONENT32              0x81A7
-#define GL_MIRRORED_REPEAT                0x8370
-#define GL_FOG_COORDINATE_SOURCE          0x8450
-#define GL_FOG_COORDINATE                 0x8451
-#define GL_FRAGMENT_DEPTH                 0x8452
-#define GL_CURRENT_FOG_COORDINATE         0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
-#define GL_FOG_COORDINATE_ARRAY           0x8457
-#define GL_COLOR_SUM                      0x8458
-#define GL_CURRENT_SECONDARY_COLOR        0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
-#define GL_SECONDARY_COLOR_ARRAY          0x845E
-#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
-#define GL_TEXTURE_FILTER_CONTROL         0x8500
-#define GL_TEXTURE_LOD_BIAS               0x8501
-#define GL_INCR_WRAP                      0x8507
-#define GL_DECR_WRAP                      0x8508
-#define GL_TEXTURE_DEPTH_SIZE             0x884A
-#define GL_DEPTH_TEXTURE_MODE             0x884B
-#define GL_TEXTURE_COMPARE_MODE           0x884C
-#define GL_TEXTURE_COMPARE_FUNC           0x884D
-#define GL_COMPARE_R_TO_TEXTURE           0x884E
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_BUFFER_SIZE                    0x8764
-#define GL_BUFFER_USAGE                   0x8765
-#define GL_QUERY_COUNTER_BITS             0x8864
-#define GL_CURRENT_QUERY                  0x8865
-#define GL_QUERY_RESULT                   0x8866
-#define GL_QUERY_RESULT_AVAILABLE         0x8867
-#define GL_ARRAY_BUFFER                   0x8892
-#define GL_ELEMENT_ARRAY_BUFFER           0x8893
-#define GL_ARRAY_BUFFER_BINDING           0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_READ_ONLY                      0x88B8
-#define GL_WRITE_ONLY                     0x88B9
-#define GL_READ_WRITE                     0x88BA
-#define GL_BUFFER_ACCESS                  0x88BB
-#define GL_BUFFER_MAPPED                  0x88BC
-#define GL_BUFFER_MAP_POINTER             0x88BD
-#define GL_STREAM_DRAW                    0x88E0
-#define GL_STREAM_READ                    0x88E1
-#define GL_STREAM_COPY                    0x88E2
-#define GL_STATIC_DRAW                    0x88E4
-#define GL_STATIC_READ                    0x88E5
-#define GL_STATIC_COPY                    0x88E6
-#define GL_DYNAMIC_DRAW                   0x88E8
-#define GL_DYNAMIC_READ                   0x88E9
-#define GL_DYNAMIC_COPY                   0x88EA
-#define GL_SAMPLES_PASSED                 0x8914
-#define GL_FOG_COORD_SRC                  GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD_SOURCE               GL_FOG_COORDINATE_SOURCE
-#define GL_FOG_COORD                      GL_FOG_COORDINATE
-#define GL_CURRENT_FOG_COORD              GL_CURRENT_FOG_COORDINATE
-#define GL_FOG_COORD_ARRAY_TYPE           GL_FOG_COORDINATE_ARRAY_TYPE
-#define GL_FOG_COORD_ARRAY_STRIDE         GL_FOG_COORDINATE_ARRAY_STRIDE
-#define GL_FOG_COORD_ARRAY_POINTER        GL_FOG_COORDINATE_ARRAY_POINTER
-#define GL_FOG_COORD_ARRAY                GL_FOG_COORDINATE_ARRAY
-#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
-#define GL_SRC0_RGB                       GL_SOURCE0_RGB
-#define GL_SRC1_RGB                       GL_SOURCE1_RGB
-#define GL_SRC2_RGB                       GL_SOURCE2_RGB
-#define GL_SRC0_ALPHA                     GL_SOURCE0_ALPHA
-#define GL_SRC1_ALPHA                     GL_SOURCE1_ALPHA
-#define GL_SRC2_ALPHA                     GL_SOURCE2_ALPHA
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_BLEND_EQUATION_RGB             GL_BLEND_EQUATION
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
-#define GL_CURRENT_VERTEX_ATTRIB          0x8626
-#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#define GL_MAX_DRAW_BUFFERS               0x8824
-#define GL_DRAW_BUFFER0                   0x8825
-#define GL_DRAW_BUFFER1                   0x8826
-#define GL_DRAW_BUFFER2                   0x8827
-#define GL_DRAW_BUFFER3                   0x8828
-#define GL_DRAW_BUFFER4                   0x8829
-#define GL_DRAW_BUFFER5                   0x882A
-#define GL_DRAW_BUFFER6                   0x882B
-#define GL_DRAW_BUFFER7                   0x882C
-#define GL_DRAW_BUFFER8                   0x882D
-#define GL_DRAW_BUFFER9                   0x882E
-#define GL_DRAW_BUFFER10                  0x882F
-#define GL_DRAW_BUFFER11                  0x8830
-#define GL_DRAW_BUFFER12                  0x8831
-#define GL_DRAW_BUFFER13                  0x8832
-#define GL_DRAW_BUFFER14                  0x8833
-#define GL_DRAW_BUFFER15                  0x8834
-#define GL_BLEND_EQUATION_ALPHA           0x883D
-#define GL_POINT_SPRITE                   0x8861
-#define GL_COORD_REPLACE                  0x8862
-#define GL_MAX_VERTEX_ATTRIBS             0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_MAX_TEXTURE_COORDS             0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_VERTEX_SHADER                  0x8B31
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
-#define GL_MAX_VARYING_FLOATS             0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
-#define GL_SHADER_TYPE                    0x8B4F
-#define GL_FLOAT_VEC2                     0x8B50
-#define GL_FLOAT_VEC3                     0x8B51
-#define GL_FLOAT_VEC4                     0x8B52
-#define GL_INT_VEC2                       0x8B53
-#define GL_INT_VEC3                       0x8B54
-#define GL_INT_VEC4                       0x8B55
-#define GL_BOOL                           0x8B56
-#define GL_BOOL_VEC2                      0x8B57
-#define GL_BOOL_VEC3                      0x8B58
-#define GL_BOOL_VEC4                      0x8B59
-#define GL_FLOAT_MAT2                     0x8B5A
-#define GL_FLOAT_MAT3                     0x8B5B
-#define GL_FLOAT_MAT4                     0x8B5C
-#define GL_SAMPLER_1D                     0x8B5D
-#define GL_SAMPLER_2D                     0x8B5E
-#define GL_SAMPLER_3D                     0x8B5F
-#define GL_SAMPLER_CUBE                   0x8B60
-#define GL_SAMPLER_1D_SHADOW              0x8B61
-#define GL_SAMPLER_2D_SHADOW              0x8B62
-#define GL_DELETE_STATUS                  0x8B80
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-#define GL_INFO_LOG_LENGTH                0x8B84
-#define GL_ATTACHED_SHADERS               0x8B85
-#define GL_ACTIVE_UNIFORMS                0x8B86
-#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
-#define GL_SHADER_SOURCE_LENGTH           0x8B88
-#define GL_ACTIVE_ATTRIBUTES              0x8B89
-#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
-#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
-#define GL_CURRENT_PROGRAM                0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
-#define GL_LOWER_LEFT                     0x8CA1
-#define GL_UPPER_LEFT                     0x8CA2
-#define GL_STENCIL_BACK_REF               0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_COLOR_SUM_ARB                  0x8458
-#define GL_VERTEX_PROGRAM_ARB             0x8620
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
-#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
-#define GL_PROGRAM_LENGTH_ARB             0x8627
-#define GL_PROGRAM_STRING_ARB             0x8628
-#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
-#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
-#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
-#define GL_CURRENT_MATRIX_ARB             0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
-#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
-#define GL_PROGRAM_BINDING_ARB            0x8677
-#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
-#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
-#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
-#define GL_PROGRAM_FORMAT_ARB             0x8876
-#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
-#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
-#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
-#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
-#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
-#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
-#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
-#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
-#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
-#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
-#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
-#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
-#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
-#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
-#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
-#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
-#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
-#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
-#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
-#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
-#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
-#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
-#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
-#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
-#define GL_MATRIX0_ARB                    0x88C0
-#define GL_MATRIX1_ARB                    0x88C1
-#define GL_MATRIX2_ARB                    0x88C2
-#define GL_MATRIX3_ARB                    0x88C3
-#define GL_MATRIX4_ARB                    0x88C4
-#define GL_MATRIX5_ARB                    0x88C5
-#define GL_MATRIX6_ARB                    0x88C6
-#define GL_MATRIX7_ARB                    0x88C7
-#define GL_MATRIX8_ARB                    0x88C8
-#define GL_MATRIX9_ARB                    0x88C9
-#define GL_MATRIX10_ARB                   0x88CA
-#define GL_MATRIX11_ARB                   0x88CB
-#define GL_MATRIX12_ARB                   0x88CC
-#define GL_MATRIX13_ARB                   0x88CD
-#define GL_MATRIX14_ARB                   0x88CE
-#define GL_MATRIX15_ARB                   0x88CF
-#define GL_MATRIX16_ARB                   0x88D0
-#define GL_MATRIX17_ARB                   0x88D1
-#define GL_MATRIX18_ARB                   0x88D2
-#define GL_MATRIX19_ARB                   0x88D3
-#define GL_MATRIX20_ARB                   0x88D4
-#define GL_MATRIX21_ARB                   0x88D5
-#define GL_MATRIX22_ARB                   0x88D6
-#define GL_MATRIX23_ARB                   0x88D7
-#define GL_MATRIX24_ARB                   0x88D8
-#define GL_MATRIX25_ARB                   0x88D9
-#define GL_MATRIX26_ARB                   0x88DA
-#define GL_MATRIX27_ARB                   0x88DB
-#define GL_MATRIX28_ARB                   0x88DC
-#define GL_MATRIX29_ARB                   0x88DD
-#define GL_MATRIX30_ARB                   0x88DE
-#define GL_MATRIX31_ARB                   0x88DF
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_FRAGMENT_PROGRAM_ARB           0x8804
-#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
-#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
-#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
-#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
-#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
-#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
-#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
-#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
-#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
-#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
-#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
-#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
-#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_BUFFER_SIZE_ARB                0x8764
-#define GL_BUFFER_USAGE_ARB               0x8765
-#define GL_ARRAY_BUFFER_ARB               0x8892
-#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
-#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
-#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
-#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
-#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
-#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
-#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
-#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
-#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
-#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
-#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
-#define GL_READ_ONLY_ARB                  0x88B8
-#define GL_WRITE_ONLY_ARB                 0x88B9
-#define GL_READ_WRITE_ARB                 0x88BA
-#define GL_BUFFER_ACCESS_ARB              0x88BB
-#define GL_BUFFER_MAPPED_ARB              0x88BC
-#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
-#define GL_STREAM_DRAW_ARB                0x88E0
-#define GL_STREAM_READ_ARB                0x88E1
-#define GL_STREAM_COPY_ARB                0x88E2
-#define GL_STATIC_DRAW_ARB                0x88E4
-#define GL_STATIC_READ_ARB                0x88E5
-#define GL_STATIC_COPY_ARB                0x88E6
-#define GL_DYNAMIC_DRAW_ARB               0x88E8
-#define GL_DYNAMIC_READ_ARB               0x88E9
-#define GL_DYNAMIC_COPY_ARB               0x88EA
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_QUERY_COUNTER_BITS_ARB         0x8864
-#define GL_CURRENT_QUERY_ARB              0x8865
-#define GL_QUERY_RESULT_ARB               0x8866
-#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
-#define GL_SAMPLES_PASSED_ARB             0x8914
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_PROGRAM_OBJECT_ARB             0x8B40
-#define GL_SHADER_OBJECT_ARB              0x8B48
-#define GL_OBJECT_TYPE_ARB                0x8B4E
-#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-#define GL_FLOAT_VEC2_ARB                 0x8B50
-#define GL_FLOAT_VEC3_ARB                 0x8B51
-#define GL_FLOAT_VEC4_ARB                 0x8B52
-#define GL_INT_VEC2_ARB                   0x8B53
-#define GL_INT_VEC3_ARB                   0x8B54
-#define GL_INT_VEC4_ARB                   0x8B55
-#define GL_BOOL_ARB                       0x8B56
-#define GL_BOOL_VEC2_ARB                  0x8B57
-#define GL_BOOL_VEC3_ARB                  0x8B58
-#define GL_BOOL_VEC4_ARB                  0x8B59
-#define GL_FLOAT_MAT2_ARB                 0x8B5A
-#define GL_FLOAT_MAT3_ARB                 0x8B5B
-#define GL_FLOAT_MAT4_ARB                 0x8B5C
-#define GL_SAMPLER_1D_ARB                 0x8B5D
-#define GL_SAMPLER_2D_ARB                 0x8B5E
-#define GL_SAMPLER_3D_ARB                 0x8B5F
-#define GL_SAMPLER_CUBE_ARB               0x8B60
-#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_VERTEX_SHADER_ARB              0x8B31
-#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_FRAGMENT_SHADER_ARB            0x8B30
-#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_POINT_SPRITE_ARB               0x8861
-#define GL_COORD_REPLACE_ARB              0x8862
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
-#define GL_DRAW_BUFFER0_ARB               0x8825
-#define GL_DRAW_BUFFER1_ARB               0x8826
-#define GL_DRAW_BUFFER2_ARB               0x8827
-#define GL_DRAW_BUFFER3_ARB               0x8828
-#define GL_DRAW_BUFFER4_ARB               0x8829
-#define GL_DRAW_BUFFER5_ARB               0x882A
-#define GL_DRAW_BUFFER6_ARB               0x882B
-#define GL_DRAW_BUFFER7_ARB               0x882C
-#define GL_DRAW_BUFFER8_ARB               0x882D
-#define GL_DRAW_BUFFER9_ARB               0x882E
-#define GL_DRAW_BUFFER10_ARB              0x882F
-#define GL_DRAW_BUFFER11_ARB              0x8830
-#define GL_DRAW_BUFFER12_ARB              0x8831
-#define GL_DRAW_BUFFER13_ARB              0x8832
-#define GL_DRAW_BUFFER14_ARB              0x8833
-#define GL_DRAW_BUFFER15_ARB              0x8834
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_RGBA_FLOAT_MODE_ARB            0x8820
-#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
-#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
-#define GL_CLAMP_READ_COLOR_ARB           0x891C
-#define GL_FIXED_ONLY_ARB                 0x891D
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_HALF_FLOAT_ARB                 0x140B
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
-#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
-#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
-#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
-#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
-#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
-#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
-#define GL_RGBA32F_ARB                    0x8814
-#define GL_RGB32F_ARB                     0x8815
-#define GL_ALPHA32F_ARB                   0x8816
-#define GL_INTENSITY32F_ARB               0x8817
-#define GL_LUMINANCE32F_ARB               0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
-#define GL_RGBA16F_ARB                    0x881A
-#define GL_RGB16F_ARB                     0x881B
-#define GL_ALPHA16F_ARB                   0x881C
-#define GL_INTENSITY16F_ARB               0x881D
-#define GL_LUMINANCE16F_ARB               0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_DOT3_RGB_EXT                   0x8740
-#define GL_DOT3_RGBA_EXT                  0x8741
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_MIRROR_CLAMP_ATI               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_ELEMENT_ARRAY_APPLE            0x8768
-#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8769
-#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x876A
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_DRAW_PIXELS_APPLE              0x8A0A
-#define GL_FENCE_APPLE                    0x8A0B
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
-#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
-#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
-#define GL_STORAGE_CACHED_APPLE           0x85BE
-#define GL_STORAGE_SHARED_APPLE           0x85BF
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_YCBCR_422_APPLE                0x85B9
-#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_RGB_S3TC                       0x83A0
-#define GL_RGB4_S3TC                      0x83A1
-#define GL_RGBA_S3TC                      0x83A2
-#define GL_RGBA4_S3TC                     0x83A3
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
-#define GL_DRAW_BUFFER0_ATI               0x8825
-#define GL_DRAW_BUFFER1_ATI               0x8826
-#define GL_DRAW_BUFFER2_ATI               0x8827
-#define GL_DRAW_BUFFER3_ATI               0x8828
-#define GL_DRAW_BUFFER4_ATI               0x8829
-#define GL_DRAW_BUFFER5_ATI               0x882A
-#define GL_DRAW_BUFFER6_ATI               0x882B
-#define GL_DRAW_BUFFER7_ATI               0x882C
-#define GL_DRAW_BUFFER8_ATI               0x882D
-#define GL_DRAW_BUFFER9_ATI               0x882E
-#define GL_DRAW_BUFFER10_ATI              0x882F
-#define GL_DRAW_BUFFER11_ATI              0x8830
-#define GL_DRAW_BUFFER12_ATI              0x8831
-#define GL_DRAW_BUFFER13_ATI              0x8832
-#define GL_DRAW_BUFFER14_ATI              0x8833
-#define GL_DRAW_BUFFER15_ATI              0x8834
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_TYPE_RGBA_FLOAT_ATI            0x8820
-#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_MODULATE_ADD_ATI               0x8744
-#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
-#define GL_MODULATE_SUBTRACT_ATI          0x8746
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_RGBA_FLOAT32_ATI               0x8814
-#define GL_RGB_FLOAT32_ATI                0x8815
-#define GL_ALPHA_FLOAT32_ATI              0x8816
-#define GL_INTENSITY_FLOAT32_ATI          0x8817
-#define GL_LUMINANCE_FLOAT32_ATI          0x8818
-#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
-#define GL_RGBA_FLOAT16_ATI               0x881A
-#define GL_RGB_FLOAT16_ATI                0x881B
-#define GL_ALPHA_FLOAT16_ATI              0x881C
-#define GL_INTENSITY_FLOAT16_ATI          0x881D
-#define GL_LUMINANCE_FLOAT16_ATI          0x881E
-#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_FLOAT_R_NV                     0x8880
-#define GL_FLOAT_RG_NV                    0x8881
-#define GL_FLOAT_RGB_NV                   0x8882
-#define GL_FLOAT_RGBA_NV                  0x8883
-#define GL_FLOAT_R16_NV                   0x8884
-#define GL_FLOAT_R32_NV                   0x8885
-#define GL_FLOAT_RG16_NV                  0x8886
-#define GL_FLOAT_RG32_NV                  0x8887
-#define GL_FLOAT_RGB16_NV                 0x8888
-#define GL_FLOAT_RGB32_NV                 0x8889
-#define GL_FLOAT_RGBA16_NV                0x888A
-#define GL_FLOAT_RGBA32_NV                0x888B
-#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
-#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
-#define GL_FLOAT_RGBA_MODE_NV             0x888E
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
-#define GL_FRAGMENT_PROGRAM_NV            0x8870
-#define GL_MAX_TEXTURE_COORDS_NV          0x8871
-#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
-#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
-#define GL_PROGRAM_ERROR_STRING_NV        0x8874
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_HALF_FLOAT_NV                  0x140B
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
-#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
-#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
-#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
-#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
-#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_PRIMITIVE_RESTART_NV           0x8558
-#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
-#endif
-
-#ifndef GL_NV_vertex_program2
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_STENCIL_BACK_FUNC_ATI          0x8800
-#define GL_STENCIL_BACK_FAIL_ATI          0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
-#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
-#define GL_DEPTH_BOUNDS_EXT               0x8891
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_MIRROR_CLAMP_EXT               0x8742
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_BLEND_EQUATION_RGB_EXT         GL_BLEND_EQUATION
-#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_PACK_INVERT_MESA               0x8758
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
-#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
-#define GL_YCBCR_MESA                     0x8757
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
-#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
-#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
-#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
-#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
-#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
-#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
-#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */
-#endif
-
-#ifndef GL_NV_vertex_program3
-/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
-#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
-#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
-#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
-#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
-#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
-#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
-#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
-#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
-#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
-#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
-#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
-#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
-#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
-#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
-#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
-#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
-#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
-#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
-#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
-#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
-#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
-#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
-#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#define GL_RENDERBUFFER_EXT               0x8D41
-#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
-#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
-#define GL_STENCIL_INDEX1_EXT             0x8D46
-#define GL_STENCIL_INDEX4_EXT             0x8D47
-#define GL_STENCIL_INDEX8_EXT             0x8D48
-#define GL_STENCIL_INDEX16_EXT            0x8D49
-#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#endif
-
-
-/*************************************************************/
-
-#include <stddef.h>
-#ifndef GL_VERSION_2_0
-/* GL type for program/shader text */
-typedef char GLchar;			/* native character */
-#endif
-
-#ifndef GL_VERSION_1_5
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptr;
-typedef ptrdiff_t GLsizeiptr;
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-/* GL types for handling large vertex buffer objects */
-typedef ptrdiff_t GLintptrARB;
-typedef ptrdiff_t GLsizeiptrARB;
-#endif
-
-#ifndef GL_ARB_shader_objects
-/* GL types for handling shader object handles and program/shader text */
-typedef char GLcharARB;		/* native character */
-typedef unsigned int GLhandleARB;	/* shader object handle */
-#endif
-
-/* GL types for "half" precision (s10e5) float data in host memory */
-#ifndef GL_ARB_half_float_pixel
-typedef unsigned short GLhalfARB;
-#endif
-
-#ifndef GL_NV_half_float
-/* GL type for representing NVIDIA "half" floating point type in host memory */
-typedef unsigned short GLhalfNV;
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_VERSION_1_4
-#define GL_VERSION_1_4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glFogCoordf (GLfloat);
-GLAPI void APIENTRY glFogCoordfv (const GLfloat *);
-GLAPI void APIENTRY glFogCoordd (GLdouble);
-GLAPI void APIENTRY glFogCoorddv (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glPointParameteri (GLenum, GLint);
-GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *);
-GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3iv (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2i (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2iv (const GLint *);
-GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2sv (const GLshort *);
-GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dv (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fv (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3iv (const GLint *);
-GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3sv (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_VERSION_1_5
-#define GL_VERSION_1_5 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQuery (GLuint);
-GLAPI void APIENTRY glBeginQuery (GLenum, GLuint);
-GLAPI void APIENTRY glEndQuery (GLenum);
-GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *);
-GLAPI void APIENTRY glBindBuffer (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBuffer (GLuint);
-GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum);
-GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
-typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_VERSION_2_0
-#define GL_VERSION_2_0 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum);
-GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *);
-GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint);
-GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint);
-GLAPI void APIENTRY glAttachShader (GLuint, GLuint);
-GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *);
-GLAPI void APIENTRY glCompileShader (GLuint);
-GLAPI GLuint APIENTRY glCreateProgram (void);
-GLAPI GLuint APIENTRY glCreateShader (GLenum);
-GLAPI void APIENTRY glDeleteProgram (GLuint);
-GLAPI void APIENTRY glDeleteShader (GLuint);
-GLAPI void APIENTRY glDetachShader (GLuint, GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glEnableVertexAttribArray (GLuint);
-GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *);
-GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *);
-GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *);
-GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *);
-GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgram (GLuint);
-GLAPI GLboolean APIENTRY glIsShader (GLuint);
-GLAPI void APIENTRY glLinkProgram (GLuint);
-GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *);
-GLAPI void APIENTRY glUseProgram (GLuint);
-GLAPI void APIENTRY glUniform1f (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1i (GLint, GLint);
-GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glValidateProgram (GLuint);
-GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
-typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
-typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
-typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
-typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
-typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
-typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
-typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_ARB_texture_mirrored_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_ARB_vertex_program
-#define GL_ARB_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *);
-GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *);
-GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *);
-GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint);
-GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *);
-GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *);
-GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramARB (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
-typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
-typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
-#endif
-
-#ifndef GL_ARB_fragment_program
-#define GL_ARB_fragment_program 1
-/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */
-#endif
-
-#ifndef GL_ARB_vertex_buffer_object
-#define GL_ARB_vertex_buffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsBufferARB (GLuint);
-GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum);
-GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *);
-GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *);
-GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum);
-GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum);
-GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
-typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
-typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
-typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data);
-typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
-typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
-#endif
-
-#ifndef GL_ARB_occlusion_query
-#define GL_ARB_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsQueryARB (GLuint);
-GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint);
-GLAPI void APIENTRY glEndQueryARB (GLenum);
-GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_ARB_shader_objects
-#define GL_ARB_shader_objects 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum);
-GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum);
-GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
-GLAPI void APIENTRY glCompileShaderARB (GLhandleARB);
-GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
-GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB);
-GLAPI void APIENTRY glLinkProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB);
-GLAPI void APIENTRY glValidateProgramARB (GLhandleARB);
-GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat);
-GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glUniform1iARB (GLint, GLint);
-GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *);
-GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *);
-GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *);
-GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *);
-GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *);
-GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
-typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
-typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
-#endif
-
-#ifndef GL_ARB_vertex_shader
-#define GL_ARB_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *);
-GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *);
-GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
-#endif
-
-#ifndef GL_ARB_fragment_shader
-#define GL_ARB_fragment_shader 1
-#endif
-
-#ifndef GL_ARB_shading_language_100
-#define GL_ARB_shading_language_100 1
-#endif
-
-#ifndef GL_ARB_texture_non_power_of_two
-#define GL_ARB_texture_non_power_of_two 1
-#endif
-
-#ifndef GL_ARB_point_sprite
-#define GL_ARB_point_sprite 1
-#endif
-
-#ifndef GL_ARB_fragment_program_shadow
-#define GL_ARB_fragment_program_shadow 1
-#endif
-
-#ifndef GL_ARB_draw_buffers
-#define GL_ARB_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ARB_texture_rectangle
-#define GL_ARB_texture_rectangle 1
-#endif
-
-#ifndef GL_ARB_color_buffer_float
-#define GL_ARB_color_buffer_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glClampColorARB (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
-#endif
-
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#endif
-
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#endif
-
-#ifndef GL_ARB_pixel_buffer_object
-#define GL_ARB_pixel_buffer_object 1
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_EXT_color_matrix
-#define GL_EXT_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint);
-GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
-GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum);
-GLAPI void APIENTRY glTextureLightEXT (GLenum);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
-GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
-GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_blend_func_separate
-#define GL_INGR_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_EXT_texture_env_dot3
-#define GL_EXT_texture_env_dot3 1
-#endif
-
-#ifndef GL_ATI_texture_mirror_once
-#define GL_ATI_texture_mirror_once 1
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
-GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFinishFenceNV (GLuint);
-GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
-GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
-GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFreeObjectBufferATI (GLuint);
-GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *);
-GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr);
-typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-#ifndef GL_EXT_shadow_funcs
-#define GL_EXT_shadow_funcs 1
-#endif
-
-#ifndef GL_EXT_stencil_two_side
-#define GL_EXT_stencil_two_side 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
-#endif
-
-#ifndef GL_ATI_text_fragment_shader
-#define GL_ATI_text_fragment_shader 1
-#endif
-
-#ifndef GL_APPLE_client_storage
-#define GL_APPLE_client_storage 1
-#endif
-
-#ifndef GL_APPLE_element_array
-#define GL_APPLE_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
-typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
-#endif
-
-#ifndef GL_APPLE_fence
-#define GL_APPLE_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glSetFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint);
-GLAPI void APIENTRY glFinishFenceAPPLE (GLuint);
-GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint);
-GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
-typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
-typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
-typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
-typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
-#endif
-
-#ifndef GL_APPLE_vertex_array_object
-#define GL_APPLE_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint);
-GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
-typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
-typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
-#endif
-
-#ifndef GL_APPLE_vertex_array_range
-#define GL_APPLE_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *);
-GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_APPLE_ycbcr_422
-#define GL_APPLE_ycbcr_422 1
-#endif
-
-#ifndef GL_S3_s3tc
-#define GL_S3_s3tc 1
-#endif
-
-#ifndef GL_ATI_draw_buffers
-#define GL_ATI_draw_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
-#endif
-
-#ifndef GL_ATI_pixel_format_float
-#define GL_ATI_pixel_format_float 1
-/* This is really a WGL extension, but defines some associated GL enums.
- * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string.
- */
-#endif
-
-#ifndef GL_ATI_texture_env_combine3
-#define GL_ATI_texture_env_combine3 1
-#endif
-
-#ifndef GL_ATI_texture_float
-#define GL_ATI_texture_float 1
-#endif
-
-#ifndef GL_NV_float_buffer
-#define GL_NV_float_buffer 1
-#endif
-
-#ifndef GL_NV_fragment_program
-#define GL_NV_fragment_program 1
-/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *);
-GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *);
-GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
-typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
-#endif
-
-#ifndef GL_NV_half_float
-#define GL_NV_half_float 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV);
-GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *);
-GLAPI void APIENTRY glFogCoordhNV (GLhalfNV);
-GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *);
-GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV);
-GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV);
-GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *);
-GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
-typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
-typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
-typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
-typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
-typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
-typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
-#endif
-
-#ifndef GL_NV_pixel_data_range
-#define GL_NV_pixel_data_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *);
-GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
-typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
-#endif
-
-#ifndef GL_NV_primitive_restart
-#define GL_NV_primitive_restart 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPrimitiveRestartNV (void);
-GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
-typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
-#endif
-
-#ifndef GL_NV_texture_expand_normal
-#define GL_NV_texture_expand_normal 1
-#endif
-
-#ifndef GL_NV_vertex_program2
-#define GL_NV_vertex_program2 1
-#endif
-
-#ifndef GL_ATI_map_object_buffer
-#define GL_ATI_map_object_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
-#endif
-
-#ifndef GL_ATI_separate_stencil
-#define GL_ATI_separate_stencil 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-#endif
-
-#ifndef GL_ATI_vertex_attrib_array_object
-#define GL_ATI_vertex_attrib_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_OES_read_format
-#define GL_OES_read_format 1
-#endif
-
-#ifndef GL_EXT_depth_bounds_test
-#define GL_EXT_depth_bounds_test 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
-#endif
-
-#ifndef GL_EXT_texture_mirror_clamp
-#define GL_EXT_texture_mirror_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_equation_separate
-#define GL_EXT_blend_equation_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
-#endif
-
-#ifndef GL_MESA_pack_invert
-#define GL_MESA_pack_invert 1
-#endif
-
-#ifndef GL_MESA_ycbcr_texture
-#define GL_MESA_ycbcr_texture 1
-#endif
-
-#ifndef GL_EXT_pixel_buffer_object
-#define GL_EXT_pixel_buffer_object 1
-#endif
-
-#ifndef GL_NV_fragment_program_option
-#define GL_NV_fragment_program_option 1
-#endif
-
-#ifndef GL_NV_fragment_program2
-#define GL_NV_fragment_program2 1
-#endif
-
-#ifndef GL_NV_vertex_program2_option
-#define GL_NV_vertex_program2_option 1
-#endif
-
-#ifndef GL_NV_vertex_program3
-#define GL_NV_vertex_program3 1
-#endif
-
-#ifndef GL_EXT_framebuffer_object
-#define GL_EXT_framebuffer_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint);
-GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *);
-GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint);
-GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *);
-GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum);
-GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint);
-GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint);
-GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGenerateMipmapEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_GREMEDY_string_marker
-#define GL_GREMEDY_string_marker 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Source/Glitch64/inc/glide.h b/Source/Glitch64/inc/glide.h
index d89f049ff..25c9ca8e5 100644
--- a/Source/Glitch64/inc/glide.h
+++ b/Source/Glitch64/inc/glide.h
@@ -42,6 +42,10 @@
 #include <3dfx.h>
 #include <glidesys.h>
 #include <sst1vid.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,6 +64,10 @@ typedef FxU8  GrFog_t;
 typedef FxU32 GrContext_t;
 typedef int (FX_CALL *GrProc)();
 
+#ifndef _WIN32
+typedef int HWND;
+#endif
+
 /*
 ** -----------------------------------------------------------------------
 ** CONSTANTS AND TYPES
@@ -617,7 +625,7 @@ grFlush(void);
 
 FX_ENTRY GrContext_t FX_CALL 
 grSstWinOpen(
-          FxU32                hWnd,
+          HWND                 hWnd,
           GrScreenResolution_t screen_resolution,
           GrScreenRefresh_t    refresh_rate,
           GrColorFormat_t      color_format,
diff --git a/Source/Glitch64/inc/glidesys.h b/Source/Glitch64/inc/glidesys.h
index 4925b9d95..12d0fcbd6 100644
--- a/Source/Glitch64/inc/glidesys.h
+++ b/Source/Glitch64/inc/glidesys.h
@@ -110,13 +110,14 @@ n** -----------------------------------------------------------------------
 
 /* Check for OS */
 #if defined(__IRIX__) || defined(__sparc__) || defined(__linux__) || \
-	defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+   defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+   defined(__FreeBSD_kernel__) || defined(__GNU__)
 #  define GLIDE_OS        GLIDE_OS_UNIX
 #elif defined(__DOS__)
 #  define GLIDE_OS        GLIDE_OS_DOS32
 #elif defined(__WIN32__)
 #  define GLIDE_OS        GLIDE_OS_WIN32
-#elif defined(macintosh)
+#elif defined(macintosh) || defined(__APPLE__)
 #  define GLIDE_OS        GLIDE_OS_MACOS
 #else
 #error "Unknown OS"
diff --git a/Source/Glitch64/inc/wglext.h b/Source/Glitch64/inc/wglext.h
deleted file mode 100644
index 18804bedf..000000000
--- a/Source/Glitch64/inc/wglext.h
+++ /dev/null
@@ -1,648 +0,0 @@
-#ifndef __wglext_h_
-#define __wglext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** Copyright (c) 2007 The Khronos Group Inc.
-** 
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-** 
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-** 
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number */
-/* wglext.h last updated 2007/02/09 */
-/* Current version at http://www.opengl.org/registry/ */
-#define WGL_WGLEXT_VERSION 9
-
-#ifndef WGL_ARB_buffer_region
-#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
-#define WGL_BACK_COLOR_BUFFER_BIT_ARB  0x00000002
-#define WGL_DEPTH_BUFFER_BIT_ARB       0x00000004
-#define WGL_STENCIL_BUFFER_BIT_ARB     0x00000008
-#endif
-
-#ifndef WGL_ARB_multisample
-#define WGL_SAMPLE_BUFFERS_ARB         0x2041
-#define WGL_SAMPLES_ARB                0x2042
-#endif
-
-#ifndef WGL_ARB_extensions_string
-#endif
-
-#ifndef WGL_ARB_pixel_format
-#define WGL_NUMBER_PIXEL_FORMATS_ARB   0x2000
-#define WGL_DRAW_TO_WINDOW_ARB         0x2001
-#define WGL_DRAW_TO_BITMAP_ARB         0x2002
-#define WGL_ACCELERATION_ARB           0x2003
-#define WGL_NEED_PALETTE_ARB           0x2004
-#define WGL_NEED_SYSTEM_PALETTE_ARB    0x2005
-#define WGL_SWAP_LAYER_BUFFERS_ARB     0x2006
-#define WGL_SWAP_METHOD_ARB            0x2007
-#define WGL_NUMBER_OVERLAYS_ARB        0x2008
-#define WGL_NUMBER_UNDERLAYS_ARB       0x2009
-#define WGL_TRANSPARENT_ARB            0x200A
-#define WGL_TRANSPARENT_RED_VALUE_ARB  0x2037
-#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
-#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
-#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
-#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
-#define WGL_SHARE_DEPTH_ARB            0x200C
-#define WGL_SHARE_STENCIL_ARB          0x200D
-#define WGL_SHARE_ACCUM_ARB            0x200E
-#define WGL_SUPPORT_GDI_ARB            0x200F
-#define WGL_SUPPORT_OPENGL_ARB         0x2010
-#define WGL_DOUBLE_BUFFER_ARB          0x2011
-#define WGL_STEREO_ARB                 0x2012
-#define WGL_PIXEL_TYPE_ARB             0x2013
-#define WGL_COLOR_BITS_ARB             0x2014
-#define WGL_RED_BITS_ARB               0x2015
-#define WGL_RED_SHIFT_ARB              0x2016
-#define WGL_GREEN_BITS_ARB             0x2017
-#define WGL_GREEN_SHIFT_ARB            0x2018
-#define WGL_BLUE_BITS_ARB              0x2019
-#define WGL_BLUE_SHIFT_ARB             0x201A
-#define WGL_ALPHA_BITS_ARB             0x201B
-#define WGL_ALPHA_SHIFT_ARB            0x201C
-#define WGL_ACCUM_BITS_ARB             0x201D
-#define WGL_ACCUM_RED_BITS_ARB         0x201E
-#define WGL_ACCUM_GREEN_BITS_ARB       0x201F
-#define WGL_ACCUM_BLUE_BITS_ARB        0x2020
-#define WGL_ACCUM_ALPHA_BITS_ARB       0x2021
-#define WGL_DEPTH_BITS_ARB             0x2022
-#define WGL_STENCIL_BITS_ARB           0x2023
-#define WGL_AUX_BUFFERS_ARB            0x2024
-#define WGL_NO_ACCELERATION_ARB        0x2025
-#define WGL_GENERIC_ACCELERATION_ARB   0x2026
-#define WGL_FULL_ACCELERATION_ARB      0x2027
-#define WGL_SWAP_EXCHANGE_ARB          0x2028
-#define WGL_SWAP_COPY_ARB              0x2029
-#define WGL_SWAP_UNDEFINED_ARB         0x202A
-#define WGL_TYPE_RGBA_ARB              0x202B
-#define WGL_TYPE_COLORINDEX_ARB        0x202C
-#endif
-
-#ifndef WGL_ARB_make_current_read
-#define ERROR_INVALID_PIXEL_TYPE_ARB   0x2043
-#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054
-#endif
-
-#ifndef WGL_ARB_pbuffer
-#define WGL_DRAW_TO_PBUFFER_ARB        0x202D
-#define WGL_MAX_PBUFFER_PIXELS_ARB     0x202E
-#define WGL_MAX_PBUFFER_WIDTH_ARB      0x202F
-#define WGL_MAX_PBUFFER_HEIGHT_ARB     0x2030
-#define WGL_PBUFFER_LARGEST_ARB        0x2033
-#define WGL_PBUFFER_WIDTH_ARB          0x2034
-#define WGL_PBUFFER_HEIGHT_ARB         0x2035
-#define WGL_PBUFFER_LOST_ARB           0x2036
-#endif
-
-#ifndef WGL_ARB_render_texture
-#define WGL_BIND_TO_TEXTURE_RGB_ARB    0x2070
-#define WGL_BIND_TO_TEXTURE_RGBA_ARB   0x2071
-#define WGL_TEXTURE_FORMAT_ARB         0x2072
-#define WGL_TEXTURE_TARGET_ARB         0x2073
-#define WGL_MIPMAP_TEXTURE_ARB         0x2074
-#define WGL_TEXTURE_RGB_ARB            0x2075
-#define WGL_TEXTURE_RGBA_ARB           0x2076
-#define WGL_NO_TEXTURE_ARB             0x2077
-#define WGL_TEXTURE_CUBE_MAP_ARB       0x2078
-#define WGL_TEXTURE_1D_ARB             0x2079
-#define WGL_TEXTURE_2D_ARB             0x207A
-#define WGL_MIPMAP_LEVEL_ARB           0x207B
-#define WGL_CUBE_MAP_FACE_ARB          0x207C
-#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
-#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
-#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
-#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
-#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
-#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
-#define WGL_FRONT_LEFT_ARB             0x2083
-#define WGL_FRONT_RIGHT_ARB            0x2084
-#define WGL_BACK_LEFT_ARB              0x2085
-#define WGL_BACK_RIGHT_ARB             0x2086
-#define WGL_AUX0_ARB                   0x2087
-#define WGL_AUX1_ARB                   0x2088
-#define WGL_AUX2_ARB                   0x2089
-#define WGL_AUX3_ARB                   0x208A
-#define WGL_AUX4_ARB                   0x208B
-#define WGL_AUX5_ARB                   0x208C
-#define WGL_AUX6_ARB                   0x208D
-#define WGL_AUX7_ARB                   0x208E
-#define WGL_AUX8_ARB                   0x208F
-#define WGL_AUX9_ARB                   0x2090
-#endif
-
-#ifndef WGL_ARB_pixel_format_float
-#define WGL_TYPE_RGBA_FLOAT_ARB        0x21A0
-#endif
-
-#ifndef WGL_EXT_make_current_read
-#define ERROR_INVALID_PIXEL_TYPE_EXT   0x2043
-#endif
-
-#ifndef WGL_EXT_pixel_format
-#define WGL_NUMBER_PIXEL_FORMATS_EXT   0x2000
-#define WGL_DRAW_TO_WINDOW_EXT         0x2001
-#define WGL_DRAW_TO_BITMAP_EXT         0x2002
-#define WGL_ACCELERATION_EXT           0x2003
-#define WGL_NEED_PALETTE_EXT           0x2004
-#define WGL_NEED_SYSTEM_PALETTE_EXT    0x2005
-#define WGL_SWAP_LAYER_BUFFERS_EXT     0x2006
-#define WGL_SWAP_METHOD_EXT            0x2007
-#define WGL_NUMBER_OVERLAYS_EXT        0x2008
-#define WGL_NUMBER_UNDERLAYS_EXT       0x2009
-#define WGL_TRANSPARENT_EXT            0x200A
-#define WGL_TRANSPARENT_VALUE_EXT      0x200B
-#define WGL_SHARE_DEPTH_EXT            0x200C
-#define WGL_SHARE_STENCIL_EXT          0x200D
-#define WGL_SHARE_ACCUM_EXT            0x200E
-#define WGL_SUPPORT_GDI_EXT            0x200F
-#define WGL_SUPPORT_OPENGL_EXT         0x2010
-#define WGL_DOUBLE_BUFFER_EXT          0x2011
-#define WGL_STEREO_EXT                 0x2012
-#define WGL_PIXEL_TYPE_EXT             0x2013
-#define WGL_COLOR_BITS_EXT             0x2014
-#define WGL_RED_BITS_EXT               0x2015
-#define WGL_RED_SHIFT_EXT              0x2016
-#define WGL_GREEN_BITS_EXT             0x2017
-#define WGL_GREEN_SHIFT_EXT            0x2018
-#define WGL_BLUE_BITS_EXT              0x2019
-#define WGL_BLUE_SHIFT_EXT             0x201A
-#define WGL_ALPHA_BITS_EXT             0x201B
-#define WGL_ALPHA_SHIFT_EXT            0x201C
-#define WGL_ACCUM_BITS_EXT             0x201D
-#define WGL_ACCUM_RED_BITS_EXT         0x201E
-#define WGL_ACCUM_GREEN_BITS_EXT       0x201F
-#define WGL_ACCUM_BLUE_BITS_EXT        0x2020
-#define WGL_ACCUM_ALPHA_BITS_EXT       0x2021
-#define WGL_DEPTH_BITS_EXT             0x2022
-#define WGL_STENCIL_BITS_EXT           0x2023
-#define WGL_AUX_BUFFERS_EXT            0x2024
-#define WGL_NO_ACCELERATION_EXT        0x2025
-#define WGL_GENERIC_ACCELERATION_EXT   0x2026
-#define WGL_FULL_ACCELERATION_EXT      0x2027
-#define WGL_SWAP_EXCHANGE_EXT          0x2028
-#define WGL_SWAP_COPY_EXT              0x2029
-#define WGL_SWAP_UNDEFINED_EXT         0x202A
-#define WGL_TYPE_RGBA_EXT              0x202B
-#define WGL_TYPE_COLORINDEX_EXT        0x202C
-#endif
-
-#ifndef WGL_EXT_pbuffer
-#define WGL_DRAW_TO_PBUFFER_EXT        0x202D
-#define WGL_MAX_PBUFFER_PIXELS_EXT     0x202E
-#define WGL_MAX_PBUFFER_WIDTH_EXT      0x202F
-#define WGL_MAX_PBUFFER_HEIGHT_EXT     0x2030
-#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT  0x2031
-#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032
-#define WGL_PBUFFER_LARGEST_EXT        0x2033
-#define WGL_PBUFFER_WIDTH_EXT          0x2034
-#define WGL_PBUFFER_HEIGHT_EXT         0x2035
-#endif
-
-#ifndef WGL_EXT_depth_float
-#define WGL_DEPTH_FLOAT_EXT            0x2040
-#endif
-
-#ifndef WGL_3DFX_multisample
-#define WGL_SAMPLE_BUFFERS_3DFX        0x2060
-#define WGL_SAMPLES_3DFX               0x2061
-#endif
-
-#ifndef WGL_EXT_multisample
-#define WGL_SAMPLE_BUFFERS_EXT         0x2041
-#define WGL_SAMPLES_EXT                0x2042
-#endif
-
-#ifndef WGL_I3D_digital_video_control
-#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050
-#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051
-#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052
-#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053
-#endif
-
-#ifndef WGL_I3D_gamma
-#define WGL_GAMMA_TABLE_SIZE_I3D       0x204E
-#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D  0x204F
-#endif
-
-#ifndef WGL_I3D_genlock
-#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044
-#define WGL_GENLOCK_SOURCE_EXTENAL_SYNC_I3D 0x2045
-#define WGL_GENLOCK_SOURCE_EXTENAL_FIELD_I3D 0x2046
-#define WGL_GENLOCK_SOURCE_EXTENAL_TTL_I3D 0x2047
-#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048
-#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049
-#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A
-#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B
-#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C
-#endif
-
-#ifndef WGL_I3D_image_buffer
-#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001
-#define WGL_IMAGE_BUFFER_LOCK_I3D      0x00000002
-#endif
-
-#ifndef WGL_I3D_swap_frame_lock
-#endif
-
-#ifndef WGL_NV_render_depth_texture
-#define WGL_BIND_TO_TEXTURE_DEPTH_NV   0x20A3
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
-#define WGL_DEPTH_TEXTURE_FORMAT_NV    0x20A5
-#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6
-#define WGL_DEPTH_COMPONENT_NV         0x20A7
-#endif
-
-#ifndef WGL_NV_render_texture_rectangle
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1
-#define WGL_TEXTURE_RECTANGLE_NV       0x20A2
-#endif
-
-#ifndef WGL_ATI_pixel_format_float
-#define WGL_TYPE_RGBA_FLOAT_ATI        0x21A0
-#endif
-
-#ifndef WGL_NV_float_buffer
-#define WGL_FLOAT_COMPONENTS_NV        0x20B0
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3
-#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4
-#define WGL_TEXTURE_FLOAT_R_NV         0x20B5
-#define WGL_TEXTURE_FLOAT_RG_NV        0x20B6
-#define WGL_TEXTURE_FLOAT_RGB_NV       0x20B7
-#define WGL_TEXTURE_FLOAT_RGBA_NV      0x20B8
-#endif
-
-#ifndef WGL_3DL_stereo_control
-#define WGL_STEREO_EMITTER_ENABLE_3DL  0x2055
-#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056
-#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057
-#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058
-#endif
-
-#ifndef WGL_EXT_pixel_format_packed_float
-#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8
-#endif
-
-#ifndef WGL_EXT_framebuffer_sRGB
-#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9
-#endif
-
-
-/*************************************************************/
-
-#ifndef WGL_ARB_pbuffer
-DECLARE_HANDLE(HPBUFFERARB);
-#endif
-#ifndef WGL_EXT_pbuffer
-DECLARE_HANDLE(HPBUFFEREXT);
-#endif
-
-#ifndef WGL_ARB_buffer_region
-#define WGL_ARB_buffer_region 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern HANDLE WINAPI wglCreateBufferRegionARB (HDC, int, UINT);
-extern VOID WINAPI wglDeleteBufferRegionARB (HANDLE);
-extern BOOL WINAPI wglSaveBufferRegionARB (HANDLE, int, int, int, int);
-extern BOOL WINAPI wglRestoreBufferRegionARB (HANDLE, int, int, int, int, int, int);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
-typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion);
-typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
-typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
-#endif
-
-#ifndef WGL_ARB_multisample
-#define WGL_ARB_multisample 1
-#endif
-
-#ifndef WGL_ARB_extensions_string
-#define WGL_ARB_extensions_string 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern const char * WINAPI wglGetExtensionsStringARB (HDC);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
-#endif
-
-#ifndef WGL_ARB_pixel_format
-#define WGL_ARB_pixel_format 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetPixelFormatAttribivARB (HDC, int, int, UINT, const int *, int *);
-extern BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC, int, int, UINT, const int *, FLOAT *);
-extern BOOL WINAPI wglChoosePixelFormatARB (HDC, const int *, const FLOAT *, UINT, int *, UINT *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
-typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
-#endif
-
-#ifndef WGL_ARB_make_current_read
-#define WGL_ARB_make_current_read 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglMakeContextCurrentARB (HDC, HDC, HGLRC);
-extern HDC WINAPI wglGetCurrentReadDCARB (void);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void);
-#endif
-
-#ifndef WGL_ARB_pbuffer
-#define WGL_ARB_pbuffer 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern HPBUFFERARB WINAPI wglCreatePbufferARB (HDC, int, int, int, const int *);
-extern HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB);
-extern int WINAPI wglReleasePbufferDCARB (HPBUFFERARB, HDC);
-extern BOOL WINAPI wglDestroyPbufferARB (HPBUFFERARB);
-extern BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB, int, int *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
-typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer);
-typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
-typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer);
-typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
-#endif
-
-#ifndef WGL_ARB_render_texture
-#define WGL_ARB_render_texture 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglBindTexImageARB (HPBUFFERARB, int);
-extern BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB, int);
-extern BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB, const int *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
-typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
-typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList);
-#endif
-
-#ifndef WGL_ARB_pixel_format_float
-#define WGL_ARB_pixel_format_float 1
-#endif
-
-#ifndef WGL_EXT_display_color_table
-#define WGL_EXT_display_color_table 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort);
-extern GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *, GLuint);
-extern GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort);
-extern VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
-typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length);
-typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
-typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
-#endif
-
-#ifndef WGL_EXT_extensions_string
-#define WGL_EXT_extensions_string 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern const char * WINAPI wglGetExtensionsStringEXT (void);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
-#endif
-
-#ifndef WGL_EXT_make_current_read
-#define WGL_EXT_make_current_read 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglMakeContextCurrentEXT (HDC, HDC, HGLRC);
-extern HDC WINAPI wglGetCurrentReadDCEXT (void);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
-typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void);
-#endif
-
-#ifndef WGL_EXT_pbuffer
-#define WGL_EXT_pbuffer 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC, int, int, int, const int *);
-extern HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT);
-extern int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT, HDC);
-extern BOOL WINAPI wglDestroyPbufferEXT (HPBUFFEREXT);
-extern BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT, int, int *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
-typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer);
-typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC);
-typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer);
-typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue);
-#endif
-
-#ifndef WGL_EXT_pixel_format
-#define WGL_EXT_pixel_format 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC, int, int, UINT, int *, int *);
-extern BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC, int, int, UINT, int *, FLOAT *);
-extern BOOL WINAPI wglChoosePixelFormatEXT (HDC, const int *, const FLOAT *, UINT, int *, UINT *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues);
-typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues);
-typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
-#endif
-
-#ifndef WGL_EXT_swap_control
-#define WGL_EXT_swap_control 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglSwapIntervalEXT (int);
-extern int WINAPI wglGetSwapIntervalEXT (void);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
-typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
-#endif
-
-#ifndef WGL_EXT_depth_float
-#define WGL_EXT_depth_float 1
-#endif
-
-#ifndef WGL_NV_vertex_array_range
-#define WGL_NV_vertex_array_range 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern void* WINAPI wglAllocateMemoryNV (GLsizei, GLfloat, GLfloat, GLfloat);
-extern void WINAPI wglFreeMemoryNV (void *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef void* (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
-typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
-#endif
-
-#ifndef WGL_3DFX_multisample
-#define WGL_3DFX_multisample 1
-#endif
-
-#ifndef WGL_EXT_multisample
-#define WGL_EXT_multisample 1
-#endif
-
-#ifndef WGL_OML_sync_control
-#define WGL_OML_sync_control 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetSyncValuesOML (HDC, INT64 *, INT64 *, INT64 *);
-extern BOOL WINAPI wglGetMscRateOML (HDC, INT32 *, INT32 *);
-extern INT64 WINAPI wglSwapBuffersMscOML (HDC, INT64, INT64, INT64);
-extern INT64 WINAPI wglSwapLayerBuffersMscOML (HDC, int, INT64, INT64, INT64);
-extern BOOL WINAPI wglWaitForMscOML (HDC, INT64, INT64, INT64, INT64 *, INT64 *, INT64 *);
-extern BOOL WINAPI wglWaitForSbcOML (HDC, INT64, INT64 *, INT64 *, INT64 *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc);
-typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator);
-typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
-typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
-typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc);
-typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc);
-#endif
-
-#ifndef WGL_I3D_digital_video_control
-#define WGL_I3D_digital_video_control 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC, int, int *);
-extern BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC, int, const int *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
-typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
-#endif
-
-#ifndef WGL_I3D_gamma
-#define WGL_I3D_gamma 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetGammaTableParametersI3D (HDC, int, int *);
-extern BOOL WINAPI wglSetGammaTableParametersI3D (HDC, int, const int *);
-extern BOOL WINAPI wglGetGammaTableI3D (HDC, int, USHORT *, USHORT *, USHORT *);
-extern BOOL WINAPI wglSetGammaTableI3D (HDC, int, const USHORT *, const USHORT *, const USHORT *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue);
-typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue);
-typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue);
-typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue);
-#endif
-
-#ifndef WGL_I3D_genlock
-#define WGL_I3D_genlock 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglEnableGenlockI3D (HDC);
-extern BOOL WINAPI wglDisableGenlockI3D (HDC);
-extern BOOL WINAPI wglIsEnabledGenlockI3D (HDC, BOOL *);
-extern BOOL WINAPI wglGenlockSourceI3D (HDC, UINT);
-extern BOOL WINAPI wglGetGenlockSourceI3D (HDC, UINT *);
-extern BOOL WINAPI wglGenlockSourceEdgeI3D (HDC, UINT);
-extern BOOL WINAPI wglGetGenlockSourceEdgeI3D (HDC, UINT *);
-extern BOOL WINAPI wglGenlockSampleRateI3D (HDC, UINT);
-extern BOOL WINAPI wglGetGenlockSampleRateI3D (HDC, UINT *);
-extern BOOL WINAPI wglGenlockSourceDelayI3D (HDC, UINT);
-extern BOOL WINAPI wglGetGenlockSourceDelayI3D (HDC, UINT *);
-extern BOOL WINAPI wglQueryGenlockMaxSourceDelayI3D (HDC, UINT *, UINT *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC);
-typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC);
-typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL *pFlag);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT *uSource);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT *uEdge);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate);
-typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay);
-typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay);
-typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay);
-#endif
-
-#ifndef WGL_I3D_image_buffer
-#define WGL_I3D_image_buffer 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern LPVOID WINAPI wglCreateImageBufferI3D (HDC, DWORD, UINT);
-extern BOOL WINAPI wglDestroyImageBufferI3D (HDC, LPVOID);
-extern BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC, const HANDLE *, const LPVOID *, const DWORD *, UINT);
-extern BOOL WINAPI wglReleaseImageBufferEventsI3D (HDC, const LPVOID *, UINT);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
-typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
-typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count);
-typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count);
-#endif
-
-#ifndef WGL_I3D_swap_frame_lock
-#define WGL_I3D_swap_frame_lock 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglEnableFrameLockI3D (void);
-extern BOOL WINAPI wglDisableFrameLockI3D (void);
-extern BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *);
-extern BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag);
-typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag);
-#endif
-
-#ifndef WGL_I3D_swap_frame_usage
-#define WGL_I3D_swap_frame_usage 1
-#ifdef WGL_WGLEXT_PROTOTYPES
-extern BOOL WINAPI wglGetFrameUsageI3D (float *);
-extern BOOL WINAPI wglBeginFrameTrackingI3D (void);
-extern BOOL WINAPI wglEndFrameTrackingI3D (void);
-extern BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *, DWORD *, float *);
-#endif /* WGL_WGLEXT_PROTOTYPES */
-typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage);
-typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
-typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
-#endif
-
-#ifndef WGL_ATI_pixel_format_float
-#define WGL_ATI_pixel_format_float 1
-#endif
-
-#ifndef WGL_NV_float_buffer
-#define WGL_NV_float_buffer 1
-#endif
-
-#ifndef WGL_EXT_pixel_format_packed_float
-#define WGL_EXT_pixel_format_packed_float 1
-#endif
-
-#ifndef WGL_EXT_framebuffer_sRGB
-#define WGL_EXT_framebuffer_sRGB 1
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/Source/Glitch64/lib/dxguid.lib b/Source/Glitch64/lib/dxguid.lib
deleted file mode 100644
index daa54af58..000000000
Binary files a/Source/Glitch64/lib/dxguid.lib and /dev/null differ
diff --git a/Source/Glitch64/vram.cpp b/Source/Glitch64/vram.cpp
deleted file mode 100644
index 99c2f24be..000000000
--- a/Source/Glitch64/vram.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-#include <stdio.h>
-
-#ifdef _WIN32 //Windows, duh!
-#include <objbase.h>
-#include <InitGuid.h>
-#include "dxdiag.h"
-#include "main.h"
-#pragma comment(lib, "ole32.lib")
-#define SAFE_RELEASE(x) { if (x != NULL) { x->Release(); x = NULL; } }
-
-IDxDiagProvider* Provider;
-IDxDiagContainer* RootContainer;
-bool ComInitialized;
-
-static void InitCom()
-{
-  try
-  {
-    Provider = NULL;
-    RootContainer = NULL;
-
-    // Init COM
-    ComInitialized = SUCCEEDED(CoInitialize(NULL));
-
-    // Create a provider interface
-    if (FAILED(CoCreateInstance(CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, IID_IDxDiagProvider, (void**)&Provider)))
-      throw "Unable to create provider instance";
-
-    // Initialize the provider
-    DXDIAG_INIT_PARAMS initParams;
-    ZeroMemory(&initParams, sizeof(DXDIAG_INIT_PARAMS));
-    initParams.dwSize = sizeof(DXDIAG_INIT_PARAMS);
-    initParams.dwDxDiagHeaderVersion = DXDIAG_DX9_SDK_VERSION;
-    if (FAILED(Provider->Initialize(&initParams)))
-      throw "Unable to initialize provider";
-
-    // Get the root container
-    if (FAILED(Provider->GetRootContainer(&RootContainer)))
-      throw "Unable to get root container";
-  }
-  catch (const char* msg)
-  {
-    LOG("\nDxDiag Error: %s", msg);
-  }
-}
-
-static IDxDiagContainer* GetContainer(IDxDiagContainer* parent, const WCHAR* name)
-{
-  IDxDiagContainer* container;
-  if (SUCCEEDED(parent->GetChildContainer(name, &container)))
-    return container;
-
-  return NULL;
-}
-
-static void GetPropertyValue(IDxDiagContainer* container, const WCHAR* name, WCHAR* value, int maxValueLen)
-{
-  VARIANT var;
-  VariantInit(&var);
-  if (SUCCEEDED(container->GetProp(name, &var)))
-  {
-    // Assuming an integer or bstring value here
-    // @@ Handle all the VT_* types properly...
-    if (var.vt != VT_BSTR)
-      wsprintf((LPSTR)value, "%i", var.iVal);
-    else
-      wcsncpy(value, var.bstrVal, maxValueLen - 1);
-
-    value[maxValueLen - 1] = 0;
-    VariantClear(&var);
-  }
-  else
-  {
-    value[0] = 0;
-  }
-}
-
-static int GetTotalVideoMemory()
-{
-  if (RootContainer != NULL)
-  {
-    // Get device container
-    IDxDiagContainer* container = GetContainer(RootContainer, L"DxDiag_DisplayDevices");
-    if (container != NULL)
-    {
-      // Get device name
-      container = GetContainer(container, L"0");
-      if (container != NULL)
-      {
-        const int bufferLength = 256;
-        WCHAR buffer[bufferLength];
-        GetPropertyValue(container, L"szDisplayMemoryLocalized", buffer, bufferLength);
-        // Value in MB is first token in string
-        return _wtoi(buffer);
-      }
-    }
-  }
-
-  // No good!
-  return -1;
-}
-
-int getVRAMSize()
-{
-  static int mem;
-  if (!mem) {
-    InitCom();
-    mem = GetTotalVideoMemory();
-  }
-  return mem * 1024 * 1024;
-}
-#endif
-
-
diff --git a/Source/Installer/Installer.vcxproj b/Source/Installer/Installer.vcxproj
index e6e7b267b..e1db49060 100644
--- a/Source/Installer/Installer.vcxproj
+++ b/Source/Installer/Installer.vcxproj
@@ -15,49 +15,25 @@
     <ProjectGuid>{360A34F3-3172-4B09-8BC9-B3FBEE677863}</ProjectGuid>
     <RootNamespace>Project64Setup</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
+  <ImportGroup>
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
+  </ImportGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader />
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader />
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
     <CustomBuild Include="Installer.iss">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss"
-</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Project64.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)Setup Project64 2.2.exe;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss"</Command>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Project64.exe;%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)Setup Project64 2.2.exe;%(Outputs)</Outputs>
+      <Command>"$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss"</Command>
+      <AdditionalInputs>$(OutDir)Project64.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Outputs>$(OutDir)Setup Project64 2.2.exe;%(Outputs)</Outputs>
     </CustomBuild>
     <None Include="binno\binno.iss" />
     <None Include="binno\it_download.iss" />
@@ -69,7 +45,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Project64/3rd Party/zip.h b/Source/Project64/3rd Party/zip.h
index 1f6b0950a..90bab3205 100644
--- a/Source/Project64/3rd Party/zip.h	
+++ b/Source/Project64/3rd Party/zip.h	
@@ -1,4 +1,4 @@
-#pragma comment(lib, "3rd Party\\zlib\\zdll.lib") 
+#pragma once
 
-#include "Zlib\\unzip.h"
-#include "Zlib\\zip.h"
+#include "../3rd Party/zlib/contrib/minizip/unzip.h"
+#include "../3rd Party/zlib/contrib/minizip/zip.h"
diff --git a/Source/Project64/3rd Party/zlib/UNZIP.C b/Source/Project64/3rd Party/zlib/UNZIP.C
deleted file mode 100644
index ccf805204..000000000
--- a/Source/Project64/3rd Party/zlib/UNZIP.C	
+++ /dev/null
@@ -1,1259 +0,0 @@
-/* unzip.c -- IO on .zip files using zlib 
-   Version 0.15 beta, Mar 19th, 1998,
-
-   Read unzip.h for more info
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "zlib.h"
-#include "unzip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-
-#if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) && \
-                      !defined(CASESENSITIVITYDEFAULT_NO)
-#define CASESENSITIVITYDEFAULT_NO
-#endif
-
-
-#ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
-#endif
-
-#ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-const char unz_copyright[] =
-   " unzip 0.15 Copyright 1998 Gilles Vollant ";
-
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info_internal_s
-{
-    uLong offset_curfile;/* relative offset of local header 4 bytes */
-} unz_file_info_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-	char  *read_buffer;         /* internal buffer for compressed data */
-	z_stream stream;            /* zLib stream structure for inflate */
-
-	uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
-	uLong stream_initialised;   /* flag set if stream structure is initialised*/
-
-	uLong offset_local_extrafield;/* offset of the local extra field */
-	uInt  size_local_extrafield;/* size of the local extra field */
-	uLong pos_local_extrafield;   /* position in the local extra field in read*/
-
-	uLong crc32;                /* crc32 of all data uncompressed */
-	uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-	uLong rest_read_compressed; /* number of byte to be decompressed */
-	uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-	FILE* file;                 /* io structore of the zipfile */
-	uLong compression_method;   /* compression method (0==store) */
-	uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-} file_in_zip_read_info_s;
-
-
-/* unz_s contain internal information about the zipfile
-*/
-typedef struct
-{
-	FILE* file;                 /* io structore of the zipfile */
-	unz_global_info gi;       /* public global information */
-	uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-	uLong num_file;             /* number of the current file in the zipfile*/
-	uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
-	uLong current_file_ok;      /* flag about the usability of the current file*/
-	uLong central_pos;          /* position of the beginning of the central dir*/
-
-	uLong size_central_dir;     /* size of the central directory  */
-	uLong offset_central_dir;   /* offset of start of central directory with
-								   respect to the starting disk number */
-
-	unz_file_info cur_file_info; /* public info about the current file in zip*/
-	unz_file_info_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
-	                                    file if we are decompressing it */
-} unz_s;
-
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-
-
-local int unzlocal_getByte(FILE *fin, int *pi)
-{
-    unsigned char c;
-	int err = fread(&c, 1, 1, fin);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return UNZ_OK;
-    }
-    else
-    {
-        if (ferror(fin)) 
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets 
-*/
-local int unzlocal_getShort (FILE *fin, uLong *pX)
-{
-    uLong x ;
-    int i;
-    int err;
-
-    err = unzlocal_getByte(fin,&i);
-    x = (uLong)i;
-    
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
-    x += ((uLong)i)<<8;
-   
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int unzlocal_getLong (FILE *fin, uLong *pX)
-{
-    uLong x ;
-    int i;
-    int err;
-
-    err = unzlocal_getByte(fin,&i);
-    x = (uLong)i;
-    
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
-    x += ((uLong)i)<<24;
-   
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (const char* fileName1, const char* fileName2)
-{
-	for (;;)
-	{
-		char c1=*(fileName1++);
-		char c2=*(fileName2++);
-		if ((c1>='a') && (c1<='z'))
-			c1 -= 0x20;
-		if ((c2>='a') && (c2<='z'))
-			c2 -= 0x20;
-		if (c1=='\0')
-			return ((c2=='\0') ? 0 : -1);
-		if (c2=='\0')
-			return 1;
-		if (c1<c2)
-			return -1;
-		if (c1>c2)
-			return 1;
-	}
-}
-
-
-#ifdef  CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
-#endif
-
-/* 
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-        (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (const char* fileName1, const char* fileName2,int iCaseSensitivity)
-{
-	if (iCaseSensitivity==0)
-		iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
-
-	if (iCaseSensitivity==1)
-		return strcmp(fileName1,fileName2);
-
-	return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-} 
-
-#define BUFREADCOMMENT (0x400)
-
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local uLong unzlocal_SearchCentralDir(FILE *fin)
-{
-	unsigned char* buf;
-	uLong uSizeFile;
-	uLong uBackRead;
-	uLong uMaxBack=0xffff; /* maximum size of global comment */
-	uLong uPosFound=0;
-	
-	if (fseek(fin,0,SEEK_END) != 0)
-		return 0;
-
-
-	uSizeFile = ftell( fin );
-	
-	if (uMaxBack>uSizeFile)
-		uMaxBack = uSizeFile;
-
-	buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-	if (buf==NULL)
-		return 0;
-
-	uBackRead = 4;
-	while (uBackRead<uMaxBack)
-	{
-		uLong uReadSize,uReadPos ;
-		int i;
-		if (uBackRead+BUFREADCOMMENT>uMaxBack) 
-			uBackRead = uMaxBack;
-		else
-			uBackRead+=BUFREADCOMMENT;
-		uReadPos = uSizeFile-uBackRead ;
-		
-		uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? 
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-		if (fseek(fin,uReadPos,SEEK_SET)!=0)
-			break;
-
-		if (fread(buf,(uInt)uReadSize,1,fin)!=1)
-			break;
-
-		for (i=0;i<(int)uReadSize-3;i++)
-			if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && 
-				((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-			{
-				uPosFound = uReadPos+i;
-				break;
-			}
-
-		if (uPosFound!=0)
-			break;
-	}
-	TRYFREE(buf);
-	return uPosFound;
-}
-
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib109.zip" or on an Unix computer
-	 "zlib/zlib109.zip".
-	 If the zipfile cannot be opened (file don't exist or in not valid), the
-	   return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-	   of this unzip package.
-*/
-extern unzFile ZEXPORT unzOpen (const char *path)
-{
-	unz_s us;
-	unz_s *s;
-	uLong central_pos,uL;
-	FILE * fin ;
-
-	uLong number_disk;          /* number of the current dist, used for 
-								   spaning ZIP, unsupported, always 0*/
-	uLong number_disk_with_CD;  /* number the the disk with central dir, used
-								   for spaning ZIP, unsupported, always 0*/
-	uLong number_entry_CD;      /* total number of entries in
-	                               the central dir 
-	                               (same than number_entry on nospan) */
-
-	int err=UNZ_OK;
-
-    if (unz_copyright[0]!=' ')
-        return NULL;
-
-    fin=fopen(path,"rb");
-	if (fin==NULL)
-		return NULL;
-
-	central_pos = unzlocal_SearchCentralDir(fin);
-	if (central_pos==0)
-		err=UNZ_ERRNO;
-
-	if (fseek(fin,central_pos,SEEK_SET)!=0)
-		err=UNZ_ERRNO;
-
-	/* the signature, already checked */
-	if (unzlocal_getLong(fin,&uL)!=UNZ_OK)
-		err=UNZ_ERRNO;
-
-	/* number of this disk */
-	if (unzlocal_getShort(fin,&number_disk)!=UNZ_OK)
-		err=UNZ_ERRNO;
-
-	/* number of the disk with the start of the central directory */
-	if (unzlocal_getShort(fin,&number_disk_with_CD)!=UNZ_OK)
-		err=UNZ_ERRNO;
-
-	/* total number of entries in the central dir on this disk */
-	if (unzlocal_getShort(fin,&us.gi.number_entry)!=UNZ_OK)
-		err=UNZ_ERRNO;
-
-	/* total number of entries in the central dir */
-	if (unzlocal_getShort(fin,&number_entry_CD)!=UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if ((number_entry_CD!=us.gi.number_entry) ||
-		(number_disk_with_CD!=0) ||
-		(number_disk!=0))
-		err=UNZ_BADZIPFILE;
-
-	/* size of the central directory */
-	if (unzlocal_getLong(fin,&us.size_central_dir)!=UNZ_OK)
-		err=UNZ_ERRNO;
-
-	/* offset of start of central directory with respect to the 
-	      starting disk number */
-	if (unzlocal_getLong(fin,&us.offset_central_dir)!=UNZ_OK)
-		err=UNZ_ERRNO;
-
-	/* zipfile comment length */
-	if (unzlocal_getShort(fin,&us.gi.size_comment)!=UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if ((central_pos<us.offset_central_dir+us.size_central_dir) && 
-		(err==UNZ_OK))
-		err=UNZ_BADZIPFILE;
-
-	if (err!=UNZ_OK)
-	{
-		fclose(fin);
-		return NULL;
-	}
-
-	us.file=fin;
-	us.byte_before_the_zipfile = central_pos -
-		                    (us.offset_central_dir+us.size_central_dir);
-	us.central_pos = central_pos;
-    us.pfile_in_zip_read = NULL;
-	
-
-	s=(unz_s*)ALLOC(sizeof(unz_s));
-	*s=us;
-	unzGoToFirstFile((unzFile)s);	
-	return (unzFile)s;	
-}
-
-
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (unzFile file)
-{
-	unz_s* s;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-
-    if (s->pfile_in_zip_read!=NULL)
-        unzCloseCurrentFile(file);
-
-	fclose(s->file);
-	TRYFREE(s);
-	return UNZ_OK;
-}
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo (unzFile file, unz_global_info * pglobal_info)
-{
-	unz_s* s;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	*pglobal_info=s->gi;
-	return UNZ_OK;
-}
-
-
-/*
-   Translate date/time from Dos format to tm_unz (readable more easilty)
-*/
-local void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm)
-{
-    uLong uDate;
-    uDate = (uLong)(ulDosDate>>16);
-    ptm->tm_mday = (uInt)(uDate&0x1f) ;
-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
-
-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
-}
-
-/*
-  Get Info about the current file in the zipfile, with internal only info
-*/
-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-                                                  unz_file_info *pfile_info,
-                                                  unz_file_info_internal 
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-												  uLong fileNameBufferSize,
-                                                  void *extraField,
-												  uLong extraFieldBufferSize,
-                                                  char *szComment,
-												  uLong commentBufferSize));
-
-local int unzlocal_GetCurrentFileInfoInternal(
-	unzFile file,
-	unz_file_info *pfile_info,
-	unz_file_info_internal *pfile_info_internal,
-	char *szFileName,
-	uLong fileNameBufferSize,
-	void *extraField,
-	uLong extraFieldBufferSize,
-	char *szComment,
-	uLong commentBufferSize )
-{
-	unz_s* s;
-	unz_file_info file_info;
-	unz_file_info_internal file_info_internal;
-	int err=UNZ_OK;
-	uLong uMagic;
-	long lSeek=0;
-
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	if (fseek(s->file,s->pos_in_central_dir+s->byte_before_the_zipfile,SEEK_SET)!=0)
-		err=UNZ_ERRNO;
-
-
-	/* we check the magic */
-	if (err==UNZ_OK)
-		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
-			err=UNZ_ERRNO;
-		else if (uMagic!=0x02014b50)
-			err=UNZ_BADZIPFILE;
-
-	if (unzlocal_getShort(s->file,&file_info.version) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getShort(s->file,&file_info.version_needed) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getShort(s->file,&file_info.flag) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getShort(s->file,&file_info.compression_method) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getLong(s->file,&file_info.dosDate) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
-	if (unzlocal_getLong(s->file,&file_info.crc) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getLong(s->file,&file_info.compressed_size) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getLong(s->file,&file_info.uncompressed_size) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getShort(s->file,&file_info.size_filename) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getShort(s->file,&file_info.size_file_extra) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getShort(s->file,&file_info.size_file_comment) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getShort(s->file,&file_info.disk_num_start) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getShort(s->file,&file_info.internal_fa) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getLong(s->file,&file_info.external_fa) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getLong(s->file,&file_info_internal.offset_curfile) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	lSeek+=file_info.size_filename;
-	if ((err==UNZ_OK) && (szFileName!=NULL))
-	{
-		uLong uSizeRead ;
-		if (file_info.size_filename<fileNameBufferSize)
-		{
-			*(szFileName+file_info.size_filename)='\0';
-			uSizeRead = file_info.size_filename;
-		}
-		else
-			uSizeRead = fileNameBufferSize;
-
-		if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-			if (fread(szFileName,(uInt)uSizeRead,1,s->file)!=1)
-				err=UNZ_ERRNO;
-		lSeek -= uSizeRead;
-	}
-
-	
-	if ((err==UNZ_OK) && (extraField!=NULL))
-	{
-		uLong uSizeRead ;
-		if (file_info.size_file_extra<extraFieldBufferSize)
-			uSizeRead = file_info.size_file_extra;
-		else
-			uSizeRead = extraFieldBufferSize;
-
-		if (lSeek!=0)
-			if (fseek(s->file,lSeek,SEEK_CUR)==0)
-				lSeek=0;
-			else
-				err=UNZ_ERRNO;
-		if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-			if (fread(extraField,(uInt)uSizeRead,1,s->file)!=1)
-				err=UNZ_ERRNO;
-		lSeek += file_info.size_file_extra - uSizeRead;
-	}
-	else
-		lSeek+=file_info.size_file_extra; 
-
-	
-	if ((err==UNZ_OK) && (szComment!=NULL))
-	{
-		uLong uSizeRead ;
-		if (file_info.size_file_comment<commentBufferSize)
-		{
-			*(szComment+file_info.size_file_comment)='\0';
-			uSizeRead = file_info.size_file_comment;
-		}
-		else
-			uSizeRead = commentBufferSize;
-
-		if (lSeek!=0)
-			if (fseek(s->file,lSeek,SEEK_CUR)==0)
-				lSeek=0;
-			else
-				err=UNZ_ERRNO;
-		if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-			if (fread(szComment,(uInt)uSizeRead,1,s->file)!=1)
-				err=UNZ_ERRNO;
-		lSeek+=file_info.size_file_comment - uSizeRead;
-	}
-	else
-		lSeek+=file_info.size_file_comment;
-
-	if ((err==UNZ_OK) && (pfile_info!=NULL))
-		*pfile_info=file_info;
-
-	if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-		*pfile_info_internal=file_info_internal;
-
-	return err;
-}
-
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem.
-*/
-extern int ZEXPORT unzGetCurrentFileInfo(
-	unzFile file,
-	unz_file_info *pfile_info,
-	char *szFileName,
-	uLong fileNameBufferSize,
-	void *extraField,
-	uLong extraFieldBufferSize,
-	char *szComment,
-	uLong commentBufferSize )
-{
-	return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-												szFileName,fileNameBufferSize,
-												extraField,extraFieldBufferSize,
-												szComment,commentBufferSize);
-}
-
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile (unzFile file)
-{
-	int err=UNZ_OK;
-	unz_s* s;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	s->pos_in_central_dir=s->offset_central_dir;
-	s->num_file=0;
-	err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-											 &s->cur_file_info_internal,
-											 NULL,0,NULL,0,NULL,0);
-	s->current_file_ok = (err == UNZ_OK);
-	return err;
-}
-
-
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-extern int ZEXPORT unzGoToNextFile (unzFile file)
-{
-	unz_s* s;	
-	int err;
-
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_END_OF_LIST_OF_FILE;
-	if (s->num_file+1==s->gi.number_entry)
-		return UNZ_END_OF_LIST_OF_FILE;
-
-	s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-			s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-	s->num_file++;
-	err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-											   &s->cur_file_info_internal,
-											   NULL,0,NULL,0,NULL,0);
-	s->current_file_ok = (err == UNZ_OK);
-	return err;
-}
-
-
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzipStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-extern int ZEXPORT unzLocateFile(
-	unzFile file,
-	const char *szFileName,
-	int iCaseSensitivity )
-{
-	unz_s* s;	
-	int err;
-
-	
-	uLong num_fileSaved;
-	uLong pos_in_central_dirSaved;
-
-
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
-        return UNZ_PARAMERROR;
-
-	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_END_OF_LIST_OF_FILE;
-
-	num_fileSaved = s->num_file;
-	pos_in_central_dirSaved = s->pos_in_central_dir;
-
-	err = unzGoToFirstFile(file);
-
-	while (err == UNZ_OK)
-	{
-		char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-		unzGetCurrentFileInfo(file,NULL,
-								szCurrentFileName,sizeof(szCurrentFileName)-1,
-								NULL,0,NULL,0);
-		if (unzStringFileNameCompare(szCurrentFileName,
-										szFileName,iCaseSensitivity)==0)
-			return UNZ_OK;
-		err = unzGoToNextFile(file);
-	}
-
-	s->num_file = num_fileSaved ;
-	s->pos_in_central_dir = pos_in_central_dirSaved ;
-	return err;
-}
-
-
-/*
-  Read the local header of the current zipfile
-  Check the coherency of the local header and info in the end of central
-        directory about this file
-  store in *piSizeVar the size of extra info in local header
-        (filename and size of extra field data)
-*/
-local int unzlocal_CheckCurrentFileCoherencyHeader(
-	unz_s* s,
-	uInt* piSizeVar,
-	uLong *poffset_local_extrafield,
-	uInt  *psize_local_extrafield )
-{
-	uLong uMagic,uData,uFlags;
-	uLong size_filename;
-	uLong size_extra_field;
-	int err=UNZ_OK;
-
-	*piSizeVar = 0;
-	*poffset_local_extrafield = 0;
-	*psize_local_extrafield = 0;
-
-	if (fseek(s->file,s->cur_file_info_internal.offset_curfile +
-								s->byte_before_the_zipfile,SEEK_SET)!=0)
-		return UNZ_ERRNO;
-
-
-	if (err==UNZ_OK)
-		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
-			err=UNZ_ERRNO;
-		else if (uMagic!=0x04034b50)
-			err=UNZ_BADZIPFILE;
-
-	if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
-		err=UNZ_ERRNO;
-/*
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-		err=UNZ_BADZIPFILE;
-*/
-	if (unzlocal_getShort(s->file,&uFlags) != UNZ_OK)
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-		err=UNZ_BADZIPFILE;
-
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* date/time */
-		err=UNZ_ERRNO;
-
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* crc */
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-		                      ((uFlags & 8)==0))
-		err=UNZ_BADZIPFILE;
-
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size compr */
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
-							  ((uFlags & 8)==0))
-		err=UNZ_BADZIPFILE;
-
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size uncompr */
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && 
-							  ((uFlags & 8)==0))
-		err=UNZ_BADZIPFILE;
-
-
-	if (unzlocal_getShort(s->file,&size_filename) != UNZ_OK)
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-		err=UNZ_BADZIPFILE;
-
-	*piSizeVar += (uInt)size_filename;
-
-	if (unzlocal_getShort(s->file,&size_extra_field) != UNZ_OK)
-		err=UNZ_ERRNO;
-	*poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-									SIZEZIPLOCALHEADER + size_filename;
-	*psize_local_extrafield = (uInt)size_extra_field;
-
-	*piSizeVar += (uInt)size_extra_field;
-
-	return err;
-}
-												
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error and the file is opened, the return value is UNZ_OK.
-*/
-extern int ZEXPORT unzOpenCurrentFile (unzFile file)
-{
-	int err=UNZ_OK;
-	int Store;
-	uInt iSizeVar;
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	uLong offset_local_extrafield;  /* offset of the local extra field */
-	uInt  size_local_extrafield;    /* size of the local extra field */
-
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_PARAMERROR;
-
-    if (s->pfile_in_zip_read != NULL)
-        unzCloseCurrentFile(file);
-
-	if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
-				&offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-		return UNZ_BADZIPFILE;
-
-	pfile_in_zip_read_info = (file_in_zip_read_info_s*)
-									    ALLOC(sizeof(file_in_zip_read_info_s));
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_INTERNALERROR;
-
-	pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-	pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-	pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-	pfile_in_zip_read_info->pos_local_extrafield=0;
-
-	if (pfile_in_zip_read_info->read_buffer==NULL)
-	{
-		TRYFREE(pfile_in_zip_read_info);
-		return UNZ_INTERNALERROR;
-	}
-
-	pfile_in_zip_read_info->stream_initialised=0;
-	
-	if ((s->cur_file_info.compression_method!=0) &&
-        (s->cur_file_info.compression_method!=Z_DEFLATED))
-		err=UNZ_BADZIPFILE;
-	Store = s->cur_file_info.compression_method==0;
-
-	pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-	pfile_in_zip_read_info->crc32=0;
-	pfile_in_zip_read_info->compression_method =
-            s->cur_file_info.compression_method;
-	pfile_in_zip_read_info->file=s->file;
-	pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
-    pfile_in_zip_read_info->stream.total_out = 0;
-
-	if (!Store)
-	{
-	  pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-	  pfile_in_zip_read_info->stream.zfree = (free_func)0;
-	  pfile_in_zip_read_info->stream.opaque = (voidpf)0; 
-      
-	  err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-	  if (err == Z_OK)
-	    pfile_in_zip_read_info->stream_initialised=1;
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END. 
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the 
-         * size of both compressed and uncompressed data
-         */
-	}
-	pfile_in_zip_read_info->rest_read_compressed = 
-            s->cur_file_info.compressed_size ;
-	pfile_in_zip_read_info->rest_read_uncompressed = 
-            s->cur_file_info.uncompressed_size ;
-
-	
-	pfile_in_zip_read_info->pos_in_zipfile = 
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + 
-			  iSizeVar;
-	
-	pfile_in_zip_read_info->stream.avail_in = (uInt)0;
-
-
-	s->pfile_in_zip_read = pfile_in_zip_read_info;
-    return UNZ_OK;
-}
-
-
-/*
-  Read bytes from the current file.
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-extern int ZEXPORT unzReadCurrentFile(
-	unzFile file,
-	voidp buf,
-	unsigned len )
-{
-	int err=UNZ_OK;
-	uInt iRead = 0;
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
-
-
-	if ((pfile_in_zip_read_info->read_buffer == NULL))
-		return UNZ_END_OF_LIST_OF_FILE;
-	if (len==0)
-		return 0;
-
-	pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
-
-	pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-	
-	if (len>pfile_in_zip_read_info->rest_read_uncompressed)
-		pfile_in_zip_read_info->stream.avail_out = 
-		  (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
-	while (pfile_in_zip_read_info->stream.avail_out>0)
-	{
-		if ((pfile_in_zip_read_info->stream.avail_in==0) &&
-            (pfile_in_zip_read_info->rest_read_compressed>0))
-		{
-			uInt uReadThis = UNZ_BUFSIZE;
-			if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-				uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-			if (uReadThis == 0)
-				return UNZ_EOF;
-			if (fseek(pfile_in_zip_read_info->file,
-                      pfile_in_zip_read_info->pos_in_zipfile + 
-                         pfile_in_zip_read_info->byte_before_the_zipfile,SEEK_SET)!=0)
-				return UNZ_ERRNO;
-			if (fread(pfile_in_zip_read_info->read_buffer,uReadThis,1,
-                         pfile_in_zip_read_info->file)!=1)
-				return UNZ_ERRNO;
-			pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
-
-			pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-			
-			pfile_in_zip_read_info->stream.next_in = 
-                (Bytef*)pfile_in_zip_read_info->read_buffer;
-			pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-		}
-
-		if (pfile_in_zip_read_info->compression_method==0)
-		{
-			uInt uDoCopy,i ;
-			if (pfile_in_zip_read_info->stream.avail_out < 
-                            pfile_in_zip_read_info->stream.avail_in)
-				uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-			else
-				uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-				
-			for (i=0;i<uDoCopy;i++)
-				*(pfile_in_zip_read_info->stream.next_out+i) =
-                        *(pfile_in_zip_read_info->stream.next_in+i);
-					
-			pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-								pfile_in_zip_read_info->stream.next_out,
-								uDoCopy);
-			pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-			pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-			pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-			pfile_in_zip_read_info->stream.next_out += uDoCopy;
-			pfile_in_zip_read_info->stream.next_in += uDoCopy;
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;
-			iRead += uDoCopy;
-		}
-		else
-		{
-			uLong uTotalOutBefore,uTotalOutAfter;
-			const Bytef *bufBefore;
-			uLong uOutThis;
-			int flush=Z_SYNC_FLUSH;
-
-			uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-			bufBefore = pfile_in_zip_read_info->stream.next_out;
-
-			/*
-			if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-			         pfile_in_zip_read_info->stream.avail_out) &&
-				(pfile_in_zip_read_info->rest_read_compressed == 0))
-				flush = Z_FINISH;
-			*/
-			err=inflate(&pfile_in_zip_read_info->stream,flush);
-
-			uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-			uOutThis = uTotalOutAfter-uTotalOutBefore;
-			
-			pfile_in_zip_read_info->crc32 = 
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-                        (uInt)(uOutThis));
-
-			pfile_in_zip_read_info->rest_read_uncompressed -=
-                uOutThis;
-
-			iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-            
-			if (err==Z_STREAM_END)
-				return (iRead==0) ? UNZ_EOF : iRead;
-			if (err!=Z_OK) 
-				break;
-		}
-	}
-
-	if (err==Z_OK)
-		return iRead;
-	return err;
-}
-
-
-/*
-  Give the current position in uncompressed data
-*/
-extern z_off_t ZEXPORT unztell (unzFile file)
-{
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
-
-	return (z_off_t)pfile_in_zip_read_info->stream.total_out;
-}
-
-
-/*
-  return 1 if the end of file was reached, 0 elsewhere 
-*/
-extern int ZEXPORT unzeof (unzFile file)
-{
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
-	
-	if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-		return 1;
-	else
-		return 0;
-}
-
-
-
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field that can be read
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-	buf.
-  the return value is the number of bytes copied in buf, or (if <0) 
-	the error code
-*/
-extern int ZEXPORT unzGetLocalExtrafield(
-	unzFile file,
-	voidp buf,
-	unsigned len )
-{
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	uInt read_now;
-	uLong size_to_read;
-
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
-
-	size_to_read = (pfile_in_zip_read_info->size_local_extrafield - 
-				pfile_in_zip_read_info->pos_local_extrafield);
-
-	if (buf==NULL)
-		return (int)size_to_read;
-	
-	if (len>size_to_read)
-		read_now = (uInt)size_to_read;
-	else
-		read_now = (uInt)len ;
-
-	if (read_now==0)
-		return 0;
-	
-	if (fseek(pfile_in_zip_read_info->file,
-              pfile_in_zip_read_info->offset_local_extrafield + 
-			  pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0)
-		return UNZ_ERRNO;
-
-	if (fread(buf,(uInt)size_to_read,1,pfile_in_zip_read_info->file)!=1)
-		return UNZ_ERRNO;
-
-	return (int)read_now;
-}
-
-/*
-  Close the file in zip opened with unzipOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-extern int ZEXPORT unzCloseCurrentFile (unzFile file)
-{
-	int err=UNZ_OK;
-
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
-
-
-	if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-	{
-		if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-			err=UNZ_CRCERROR;
-	}
-
-
-	TRYFREE(pfile_in_zip_read_info->read_buffer);
-	pfile_in_zip_read_info->read_buffer = NULL;
-	if (pfile_in_zip_read_info->stream_initialised)
-		inflateEnd(&pfile_in_zip_read_info->stream);
-
-	pfile_in_zip_read_info->stream_initialised = 0;
-	TRYFREE(pfile_in_zip_read_info);
-
-    s->pfile_in_zip_read=NULL;
-
-	return err;
-}
-
-
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-extern int ZEXPORT unzGetGlobalComment(
-	unzFile file,
-	char *szComment,
-	uLong uSizeBuf )
-{
-	unz_s* s;
-	uLong uReadThis ;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-
-	uReadThis = uSizeBuf;
-	if (uReadThis>s->gi.size_comment)
-		uReadThis = s->gi.size_comment;
-
-	if (fseek(s->file,s->central_pos+22,SEEK_SET)!=0)
-		return UNZ_ERRNO;
-
-	if (uReadThis>0)
-    {
-      *szComment='\0';
-	  if (fread(szComment,(uInt)uReadThis,1,s->file)!=1)
-		return UNZ_ERRNO;
-    }
-
-	if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-		*(szComment+s->gi.size_comment)='\0';
-	return (int)uReadThis;
-}
-
diff --git a/Source/Project64/3rd Party/zlib/UNZIP.H b/Source/Project64/3rd Party/zlib/UNZIP.H
deleted file mode 100644
index 5692cc8d0..000000000
--- a/Source/Project64/3rd Party/zlib/UNZIP.H	
+++ /dev/null
@@ -1,275 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib 
-   Version 0.15 beta, Mar 19th, 1998,
-
-   Copyright (C) 1998 Gilles Vollant
-
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-   Encryption and multi volume ZipFile (span) are not supported.
-   Old compressions used by old PKZip 1.x are not supported
-
-   THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
-   CAN CHANGE IN FUTURE VERSION !!
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-/* for more info about .ZIP format, see 
-      ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip */
-
-#ifndef _unz_H
-#define _unz_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__; 
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK                                  (0)
-#define UNZ_END_OF_LIST_OF_FILE (-100)
-#define UNZ_ERRNO               (Z_ERRNO)
-#define UNZ_EOF                 (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s 
-{
-	uInt tm_sec;            /* seconds after the minute - [0,59] */
-	uInt tm_min;            /* minutes after the hour - [0,59] */
-	uInt tm_hour;           /* hours since midnight - [0,23] */
-	uInt tm_mday;           /* day of the month - [1,31] */
-	uInt tm_mon;            /* months since January - [0,11] */
-	uInt tm_year;           /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
-   These data comes from the end of central dir */
-typedef struct unz_global_info_s
-{
-	uLong number_entry;         /* total number of entries in
-				       the central dir on this disk */
-	uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info;
-
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */ 
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */ 
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-												 const char* fileName2,
-												 int iCaseSensitivity));
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-								or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-	(like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-	 "zlib/zlib111.zip".
-	 If the zipfile cannot be opened (file don't exist or in not valid), the
-	   return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-	   of this unzip package.
-*/
-
-extern int ZEXPORT unzClose OF((unzFile file));
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-					unz_global_info *pglobal_info));
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-										   char *szComment,
-					   uLong uSizeBuf));
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile OF((unzFile file, 
-				     const char *szFileName,
-				     int iCaseSensitivity));
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-					     unz_file_info *pfile_info,
-					     char *szFileName,
-					     uLong fileNameBufferSize,
-					     void *extraField,
-					     uLong extraFieldBufferSize,
-					     char *szComment,
-					     uLong commentBufferSize));
-/*
-  Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-	    the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
-			(fileNameBufferSize is the size of the buffer)
-  if extraField!=NULL, the extra field information will be copied in extraField
-			(extraFieldBufferSize is the size of the buffer).
-			This is the Central-header version of the extra field
-  if szComment!=NULL, the comment string of the file will be copied in szComment
-			(commentBufferSize is the size of the buffer)
-*/
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
-   from it, and close it (you can close it before reading all the file)
-   */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-												
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file, 
-					  voidp buf,
-					  unsigned len));
-/*
-  Read bytes from the current file (opened by unzOpenCurrentFile)
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-/*
-  Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
-  return 1 if the end of file was reached, 0 elsewhere 
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-											 voidp buf,
-											 unsigned len));
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-	buf.
-  the return value is the number of bytes copied in buf, or (if <0) 
-	the error code
-*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz_H */
diff --git a/Source/Project64/3rd Party/zlib/ZCONF.H b/Source/Project64/3rd Party/zlib/ZCONF.H
deleted file mode 100644
index e3b0c962e..000000000
--- a/Source/Project64/3rd Party/zlib/ZCONF.H	
+++ /dev/null
@@ -1,332 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
-#  define deflate               z_deflate
-#  define deflateEnd            z_deflateEnd
-#  define inflateInit_          z_inflateInit_
-#  define inflate               z_inflate
-#  define inflateEnd            z_inflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
-#  define deflateReset          z_deflateReset
-#  define deflateParams         z_deflateParams
-#  define deflateBound          z_deflateBound
-#  define deflatePrime          z_deflatePrime
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
-#  define inflateReset          z_inflateReset
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
-#  define uncompress            z_uncompress
-#  define adler32               z_adler32
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
-#  define zError                z_zError
-
-#  define alloc_func            z_alloc_func
-#  define free_func             z_free_func
-#  define in_func               z_in_func
-#  define out_func              z_out_func
-#  define Byte                  z_Byte
-#  define uInt                  z_uInt
-#  define uLong                 z_uLong
-#  define Bytef                 z_Bytef
-#  define charf                 z_charf
-#  define intf                  z_intf
-#  define uIntf                 z_uIntf
-#  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
-#  define voidp                 z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/Source/Project64/3rd Party/zlib/ZLIB.H b/Source/Project64/3rd Party/zlib/ZLIB.H
deleted file mode 100644
index 62d0e4675..000000000
--- a/Source/Project64/3rd Party/zlib/ZLIB.H	
+++ /dev/null
@@ -1,1357 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
-
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
-
-/*
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-     This library can optionally read and write gzip streams in memory as well.
-
-     The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumualte before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  the value returned by deflateBound (see below). If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it gets to the next deflate block boundary. When decoding the
-  zlib or gzip format, this will cause inflate() to return immediately after
-  the header and before the first block. When doing a raw inflate, inflate()
-  will go ahead and process the first block, and will return when it gets to
-  the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64
-  if inflate() is currently decoding the last block in the deflate stream,
-  plus 128 if inflate() returned immediately after decoding an end-of-block
-  code or decoding the complete header up to just before the first byte of the
-  deflate stream. The end-of-block will not be indicated until all of the
-  uncompressed data from that block has been written to strm->next_out.  The
-  number of unused bits may in general be greater than seven, except when
-  bit 7 of data_type is set, in which case the number of unused bits will be
-  less than eight.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster approach
-  may be used for the single inflate() call.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call. So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below. At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically.  Any information
-  contained in the gzip header is not retained, so applications that need that
-  information should instead use raw inflate, see inflateInit2() below, or
-  inflateBack() and perform their own processing of the gzip header and
-  trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing. If Z_DATA_ERROR is returned, the application may then
-  call inflateSync() to look for a good compression block if a partial recovery
-  of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer). It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
-   determines the window size. deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding. Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper. The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding). Filtered data consists mostly of small values with a somewhat
-   random distribution. In this case, the compression algorithm is tuned to
-   compress them better. The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
-   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
-   parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.  Z_FIXED prevents the
-   use of dynamic Huffman codes, allowing for a simpler decoder for special
-   applications.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front. In addition, the
-   current implementation of deflate will use at most the window size minus
-   262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit()
-   or deflateInit2().  This would be used to allocate an output buffer
-   for deflation in a single pass, and so would be called before deflate().
-*/
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-  is that this function is used to start off the deflate output with the
-  bits leftover from a previous deflate stream when appending to it.  As such,
-  this function can only be used for raw deflate, and must be used before the
-  first deflate() call after a deflateInit2() or deflateReset().  bits must be
-  less than or equal to 16, and that many of the least significant bits of
-  value will be inserted in the output.
-
-      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-      If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used. If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   determines the window size. inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream. This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values. If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is. Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding. Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
-   a crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
-   is set to null if there is no error message.  inflateInit2 does not perform
-   any decompression apart from reading the zlib header if present: this will
-   be done by inflate(). (So next_in and avail_in may be modified, but next_out
-   and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-  that this function is used to start inflating at a bit position in the
-  middle of a byte.  The provided bits will be used before any bytes are used
-  from next_in.  This function should only be used with raw inflate, and
-  should be used before the first inflate() call after inflateInit2() or
-  inflateReset().  bits must be less than or equal to 16, and that many of the
-  least significant bits of value will be inserted in the input.
-
-      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-      inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
-   force inflate() to return immediately after header processing is complete
-   and before any actual data is decompressed.
-
-      The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When
-   any of extra, name, or comment are not Z_NULL and the respective field is
-   not present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-      If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-   be allocated, or Z_VERSION_ERROR if the version of the library does not
-   match the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free
-   the allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects
-   only the raw deflate stream to decompress.  This is different from the
-   normal behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format
-   error in the deflate stream (in which case strm->msg is set to indicate the
-   nature of the error), or Z_STREAM_ERROR if the stream was not properly
-   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
-   distinguished using strm->next_in which will be Z_NULL only if in() returned
-   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
-   out() returning non-zero.  (in() will always be called before out(), so
-   strm->next_in is assured to be defined if out() returns non-zero.)  Note
-   that inflateBack() cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least the value returned
-   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen). Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before
-   a compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h", or 'R' for run-length encoding
-   as in "wb1R". (See the description of deflateInit2 for more information
-   about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
-                                   voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).  The number of
-   uncompressed bytes written is limited to 4095. The caller should assure that
-   this limit is not exceeded. If it is exceeded, then gzprintf() will return
-   return an error (0) with nothing written. In this case, there may also be a
-   buffer overflow with unpredictable consequences, which is possible only if
-   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   because the secure snprintf() or vsnprintf() functions were not available.
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
-/*
-      Push one character back onto the stream to be read again later.
-   Only one character of push-back is allowed.  gzungetc() returns the
-   character pushed, or -1 on failure.  gzungetc() will fail if a
-   character has been pushed but not read yet, or if c is -1. The pushed
-   character will be discarded if the stream is repositioned with gzseek()
-   or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-                                      z_off_t offset, int whence));
-/*
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns 1 if file is being read directly without decompression, otherwise
-   zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file. This is analogous to the
-   clearerr() function in stdio. This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-/*
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32. If buf is NULL, this function returns the required initial
-   value for the for the crc. Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-/*
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-        ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/Source/Project64/3rd Party/zlib/ZLIB113.LIB b/Source/Project64/3rd Party/zlib/ZLIB113.LIB
deleted file mode 100644
index 14bc50f8b..000000000
Binary files a/Source/Project64/3rd Party/zlib/ZLIB113.LIB and /dev/null differ
diff --git a/Source/Project64/3rd Party/zlib/zdll.exp b/Source/Project64/3rd Party/zlib/zdll.exp
deleted file mode 100644
index 2ca08c591..000000000
Binary files a/Source/Project64/3rd Party/zlib/zdll.exp and /dev/null differ
diff --git a/Source/Project64/3rd Party/zlib/zdll.lib b/Source/Project64/3rd Party/zlib/zdll.lib
deleted file mode 100644
index 01f4e10e6..000000000
Binary files a/Source/Project64/3rd Party/zlib/zdll.lib and /dev/null differ
diff --git a/Source/Project64/3rd Party/zlib/zip.c b/Source/Project64/3rd Party/zlib/zip.c
deleted file mode 100644
index 22c04222b..000000000
--- a/Source/Project64/3rd Party/zlib/zip.c	
+++ /dev/null
@@ -1,694 +0,0 @@
-/* zip.c -- IO on .zip files using zlib 
-   Version 0.15 beta, Mar 19th, 1998,
-
-   Read zip.h for more info
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "zlib.h"
-#include "zip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-#ifndef VERSIONMADEBY
-# define VERSIONMADEBY   (0x0) /* platform depedent */
-#endif
-
-#ifndef Z_BUFSIZE
-#define Z_BUFSIZE (16384)
-#endif
-
-#ifndef Z_MAXFILENAMEINZIP
-#define Z_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-/*
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-*/
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-#ifndef DEF_MEM_LEVEL
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-#endif
-const char zip_copyright[] =
-   " zip 0.15a Copyright 1998 Gilles Vollant ";
-
-
-#define SIZEDATA_INDATABLOCK (4096-(4*4))
-
-#define LOCALHEADERMAGIC    (0x04034b50)
-#define CENTRALHEADERMAGIC  (0x02014b50)
-#define ENDHEADERMAGIC      (0x06054b50)
-
-#define FLAG_LOCALHEADER_OFFSET (0x06)
-#define CRC_LOCALHEADER_OFFSET  (0x0e)
-
-#define SIZECENTRALHEADER (0x2e) /* 46 */
-
-typedef struct linkedlist_datablock_internal_s
-{
-  struct linkedlist_datablock_internal_s* next_datablock;
-  uLong  avail_in_this_block;
-  uLong  filled_in_this_block;
-  uLong  unused; /* for future use and alignement */
-  unsigned char data[SIZEDATA_INDATABLOCK];
-} linkedlist_datablock_internal;
-
-typedef struct linkedlist_data_s
-{
-    linkedlist_datablock_internal* first_block;
-    linkedlist_datablock_internal* last_block;
-} linkedlist_data;
-
-
-typedef struct
-{
-	z_stream stream;            /* zLib stream structure for inflate */
-    int  stream_initialised;    /* 1 is stream is initialised */
-    uInt pos_in_buffered_data;  /* last written byte in buffered_data */
-
-    uLong pos_local_header;     /* offset of the local header of the file 
-                                     currenty writing */
-    char* central_header;       /* central header data for the current file */
-    uLong size_centralheader;   /* size of the central header for cur file */
-    uLong flag;                 /* flag of the file currently writing */
-
-    int  method;                /* compression method of file currenty wr.*/
-    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
-    uLong dosDate;
-    uLong crc32;
-} curfile_info;
-
-typedef struct
-{
-    FILE * filezip;
-    linkedlist_data central_dir;/* datablock with central dir in construction*/
-    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
-    curfile_info ci;            /* info on the file curretly writing */
-
-    uLong begin_pos;            /* position of the beginning of the zipfile */
-    uLong number_entry;
-} zip_internal;
-
-local linkedlist_datablock_internal* allocate_new_datablock()
-{
-    linkedlist_datablock_internal* ldi;
-    ldi = (linkedlist_datablock_internal*)
-                 ALLOC(sizeof(linkedlist_datablock_internal));
-    if (ldi!=NULL)
-    {
-        ldi->next_datablock = NULL ;
-        ldi->filled_in_this_block = 0 ;
-        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
-    }
-    return ldi;
-}
-
-local void free_datablock(linkedlist_datablock_internal* ldi)
-{
-    while (ldi!=NULL)
-    {
-        linkedlist_datablock_internal* ldinext = ldi->next_datablock;
-        TRYFREE(ldi);
-        ldi = ldinext;
-    }
-}
-
-local void init_linkedlist(linkedlist_data* ll)
-{
-    ll->first_block = ll->last_block = NULL;
-}
-
-local void free_linkedlist(linkedlist_data* ll)
-{
-    free_datablock(ll->first_block);
-    ll->first_block = ll->last_block = NULL;
-}
-
-
-local int add_data_in_datablock(linkedlist_data* ll,const void* buf,uLong len)
-{
-    linkedlist_datablock_internal* ldi;
-    const unsigned char* from_copy;
-
-    if (ll==NULL)
-        return ZIP_INTERNALERROR;
-
-    if (ll->last_block == NULL)
-    {
-        ll->first_block = ll->last_block = allocate_new_datablock();
-        if (ll->first_block == NULL)
-            return ZIP_INTERNALERROR;
-    }
-
-    ldi = ll->last_block;
-    from_copy = (unsigned char*)buf;
-
-    while (len>0)
-    {
-        uInt copy_this;
-        uInt i;
-        unsigned char* to_copy;
-
-        if (ldi->avail_in_this_block==0)
-        {
-            ldi->next_datablock = allocate_new_datablock();
-            if (ldi->next_datablock == NULL)
-                return ZIP_INTERNALERROR;
-            ldi = ldi->next_datablock ;
-            ll->last_block = ldi;
-        }
-
-        if (ldi->avail_in_this_block < len)
-            copy_this = (uInt)ldi->avail_in_this_block;
-        else
-            copy_this = (uInt)len;
-
-        to_copy = &(ldi->data[ldi->filled_in_this_block]);
-
-        for (i=0;i<copy_this;i++)
-            *(to_copy+i)=*(from_copy+i);
-
-        ldi->filled_in_this_block += copy_this;
-        ldi->avail_in_this_block -= copy_this;
-        from_copy += copy_this ;
-        len -= copy_this;
-    }
-    return ZIP_OK;
-}
-
-
-local int write_datablock(FILE * fout,linkedlist_data* ll)
-{
-    linkedlist_datablock_internal* ldi;
-    ldi = ll->first_block;
-    while (ldi!=NULL)
-    {
-        if (ldi->filled_in_this_block > 0)
-            if (fwrite(ldi->data,(uInt)ldi->filled_in_this_block,1,fout)!=1)
-                return ZIP_ERRNO;
-        ldi = ldi->next_datablock;
-    }
-    return ZIP_OK;
-}
-
-/****************************************************************************/
-
-/* ===========================================================================
-   Outputs a long in LSB order to the given file
-   nbByte == 1, 2 or 4 (byte, short or long)
-*/
-
-local int ziplocal_putValue OF((FILE *file, uLong x, int nbByte));
-local int ziplocal_putValue (FILE *file, uLong x, int nbByte)
-{
-    unsigned char buf[4];
-    int n;
-    for (n = 0; n < nbByte; n++) {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-    if (fwrite(buf,nbByte,1,file)!=1)
-        return ZIP_ERRNO;
-    else
-        return ZIP_OK;
-}
-
-local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
-local void ziplocal_putValue_inmemory (void* dest, uLong x, int nbByte)
-{
-    unsigned char* buf=(unsigned char*)dest;
-    int n;
-    for (n = 0; n < nbByte; n++) {
-        buf[n] = (unsigned char)(x & 0xff);
-        x >>= 8;
-    }
-}
-/****************************************************************************/
-
-
-local uLong ziplocal_TmzDateToDosDate(const tm_zip* ptm,uLong dosDate)
-{
-    uLong year = (uLong)ptm->tm_year;
-	dosDate=dosDate;
-    if (year>1980)
-        year-=1980;
-    else if (year>80)
-        year-=80;
-    return
-      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
-        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
-}
-
-
-/****************************************************************************/
-
-extern zipFile ZEXPORT zipOpen (const char *pathname, int append)
-{
-    zip_internal ziinit;
-    zip_internal* zi;
-
-    ziinit.filezip = fopen(pathname,(append == 0) ? "wb" : "ab");
-    if (ziinit.filezip == NULL)
-        return NULL;
-    ziinit.begin_pos = ftell(ziinit.filezip);
-    ziinit.in_opened_file_inzip = 0;
-    ziinit.ci.stream_initialised = 0;
-    ziinit.number_entry = 0;
-    init_linkedlist(&(ziinit.central_dir));
-
-
-    zi = (zip_internal*)ALLOC(sizeof(zip_internal));
-    if (zi==NULL)
-    {
-        fclose(ziinit.filezip);
-        return NULL;
-    }
-
-    *zi = ziinit;
-    return (zipFile)zi;
-}
-
-extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi, 
-                                        const void* extrafield_local, uInt size_extrafield_local,
-                                        const void* extrafield_global, uInt size_extrafield_global,
-                                        const char* comment, int method, int level)
-{
-    zip_internal* zi;
-    uInt size_filename;
-    uInt size_comment;
-    uInt i;
-    int err = ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    if ((method!=0) && (method!=Z_DEFLATED))
-        return ZIP_PARAMERROR;
-
-    zi = (zip_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-        if (err != ZIP_OK)
-            return err;
-    }
-
-
-    if (filename==NULL)
-        filename="-";
-
-    if (comment==NULL)
-        size_comment = 0;
-    else
-        size_comment = strlen(comment);
-
-    size_filename = strlen(filename);
-
-    if (zipfi == NULL)
-        zi->ci.dosDate = 0;
-    else
-    {
-        if (zipfi->dosDate != 0)
-            zi->ci.dosDate = zipfi->dosDate;
-        else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);
-    }
-
-    zi->ci.flag = 0;
-    if ((level==8) || (level==9))
-      zi->ci.flag |= 2;
-    if ((level==2))
-      zi->ci.flag |= 4;
-    if ((level==1))
-      zi->ci.flag |= 6;
-
-    zi->ci.crc32 = 0;
-    zi->ci.method = method;
-    zi->ci.stream_initialised = 0;
-    zi->ci.pos_in_buffered_data = 0;
-    zi->ci.pos_local_header = ftell(zi->filezip);
-    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + 
-                                      size_extrafield_global + size_comment;
-    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);
-
-    ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
-    /* version info */
-    ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
-    ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
-    ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
-
-    if (zipfi==NULL)
-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2); 
-    else
-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2); 
-
-    if (zipfi==NULL)
-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4); 
-    else
-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
-
-    ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header,4);
-
-    for (i=0;i<size_filename;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
-
-    for (i=0;i<size_extrafield_global;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
-              *(((const char*)extrafield_global)+i);
-
-    for (i=0;i<size_comment;i++)
-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
-              size_extrafield_global+i) = *(comment+i);
-    if (zi->ci.central_header == NULL)
-        return ZIP_INTERNALERROR;
-
-    /* write the local header */
-    err = ziplocal_putValue(zi->filezip,(uLong)LOCALHEADERMAGIC,4);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(zi->filezip,(uLong)20,2);/* version needed to extract */
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.flag,2);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.method,2);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.dosDate,4);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(zi->filezip,(uLong)0,4); /* crc 32, unknown */
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(zi->filezip,(uLong)0,4); /* compressed size, unknown */
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(zi->filezip,(uLong)0,4); /* uncompressed size, unknown */
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(zi->filezip,(uLong)size_filename,2);
-
-    if (err==ZIP_OK)
-        err = ziplocal_putValue(zi->filezip,(uLong)size_extrafield_local,2);
-
-    if ((err==ZIP_OK) && (size_filename>0))
-        if (fwrite(filename,(uInt)size_filename,1,zi->filezip)!=1)
-                err = ZIP_ERRNO;
-
-    if ((err==ZIP_OK) && (size_extrafield_local>0))
-        if (fwrite(extrafield_local,(uInt)size_extrafield_local,1,zi->filezip)
-                                                                           !=1)
-                err = ZIP_ERRNO;
-
-    zi->ci.stream.avail_in = (uInt)0;
-    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-    zi->ci.stream.next_out = zi->ci.buffered_data;
-    zi->ci.stream.total_in = 0;
-    zi->ci.stream.total_out = 0;
-
-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED))
-    {
-        zi->ci.stream.zalloc = (alloc_func)0;
-        zi->ci.stream.zfree = (free_func)0;
-        zi->ci.stream.opaque = (voidpf)0;
-
-        err = deflateInit2(&zi->ci.stream, level,
-               Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, 0);
-
-        if (err==Z_OK)
-            zi->ci.stream_initialised = 1;
-    }
-
-
-    if (err==Z_OK)
-        zi->in_opened_file_inzip = 1;
-    return err;
-}
-
-extern int ZEXPORT zipWriteInFileInZip (zipFile file, const voidp buf, unsigned len)
-{
-    zip_internal* zi;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)
-        return ZIP_PARAMERROR;
-
-    zi->ci.stream.next_in = buf;
-    zi->ci.stream.avail_in = len;
-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
-
-    while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
-    {
-        if (zi->ci.stream.avail_out == 0)
-        {
-            if (fwrite(zi->ci.buffered_data,(uInt)zi->ci.pos_in_buffered_data,1,zi->filezip)
-                                                                           !=1)
-                err = ZIP_ERRNO;
-            zi->ci.pos_in_buffered_data = 0;
-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-            zi->ci.stream.next_out = zi->ci.buffered_data;
-        }
-
-        if (zi->ci.method == Z_DEFLATED)
-        {
-            uLong uTotalOutBefore = zi->ci.stream.total_out;
-            err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
-            zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-
-        }
-        else
-        {
-            uInt copy_this,i;
-            if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
-                copy_this = zi->ci.stream.avail_in;
-            else
-                copy_this = zi->ci.stream.avail_out;
-            for (i=0;i<copy_this;i++)
-                *(((char*)zi->ci.stream.next_out)+i) =
-                    *(((const char*)zi->ci.stream.next_in)+i);
-            {
-                zi->ci.stream.avail_in -= copy_this;
-                zi->ci.stream.avail_out-= copy_this;
-                zi->ci.stream.next_in+= copy_this;
-                zi->ci.stream.next_out+= copy_this;
-                zi->ci.stream.total_in+= copy_this;
-                zi->ci.stream.total_out+= copy_this;
-                zi->ci.pos_in_buffered_data += copy_this;
-            }
-        }
-    }
-
-    return 0;
-}
-
-extern int ZEXPORT zipCloseFileInZip (zipFile file)
-{
-    zip_internal* zi;
-    int err=ZIP_OK;
-
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip_internal*)file;
-
-    if (zi->in_opened_file_inzip == 0)    
-        return ZIP_PARAMERROR;
-    zi->ci.stream.avail_in = 0;
-    
-    if (zi->ci.method == Z_DEFLATED)
-        while (err==ZIP_OK)
-    {
-        uLong uTotalOutBefore;
-        if (zi->ci.stream.avail_out == 0)
-        {
-            if (fwrite(zi->ci.buffered_data,(uInt)zi->ci.pos_in_buffered_data,1,zi->filezip)
-                                                                           !=1)
-                err = ZIP_ERRNO;
-            zi->ci.pos_in_buffered_data = 0;
-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
-            zi->ci.stream.next_out = zi->ci.buffered_data;
-        }
-        uTotalOutBefore = zi->ci.stream.total_out;
-        err=deflate(&zi->ci.stream,  Z_FINISH);
-        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
-    }
-
-    if (err==Z_STREAM_END)
-        err=ZIP_OK; /* this is normal */
-
-    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
-        if (fwrite(zi->ci.buffered_data,(uInt)zi->ci.pos_in_buffered_data,1,zi->filezip)
-                                                                       !=1)
-            err = ZIP_ERRNO;
-
-    if ((zi->ci.method == Z_DEFLATED) && (err==ZIP_OK))
-    {
-        err=deflateEnd(&zi->ci.stream);
-        zi->ci.stream_initialised = 0;
-    }
-
-    ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)zi->ci.crc32,4); /*crc*/
-    ziplocal_putValue_inmemory(zi->ci.central_header+20,
-                                (uLong)zi->ci.stream.total_out,4); /*compr size*/
-    if (zi->ci.stream.data_type == Z_ASCII)
-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2); 
-    ziplocal_putValue_inmemory(zi->ci.central_header+24,
-                                (uLong)zi->ci.stream.total_in,4); /*uncompr size*/
-
-    if (err==ZIP_OK)
-        err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,
-                                       (uLong)zi->ci.size_centralheader);
-    free(zi->ci.central_header);
-
-    if (err==ZIP_OK)
-    {
-        long cur_pos_inzip = ftell(zi->filezip);
-	    if (fseek(zi->filezip,
-                  zi->ci.pos_local_header + 14,SEEK_SET)!=0)
-		    err = ZIP_ERRNO;
-
-        if (err==ZIP_OK)
-            err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.crc32,4); /* crc 32, unknown */
-
-        if (err==ZIP_OK) /* compressed size, unknown */
-            err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.stream.total_out,4); 
-
-        if (err==ZIP_OK) /* uncompressed size, unknown */
-            err = ziplocal_putValue(zi->filezip,(uLong)zi->ci.stream.total_in,4);
-
-	    if (fseek(zi->filezip,
-                  cur_pos_inzip,SEEK_SET)!=0)
-		    err = ZIP_ERRNO;
-    }
-
-    zi->number_entry ++;
-    zi->in_opened_file_inzip = 0;
-
-    return err;
-}
-
-extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
-{
-    zip_internal* zi;
-    int err = 0;
-    uLong size_centraldir = 0;
-    uLong centraldir_pos_inzip ;
-    uInt size_global_comment;
-    if (file == NULL)
-        return ZIP_PARAMERROR;
-    zi = (zip_internal*)file;
-
-    if (zi->in_opened_file_inzip == 1)
-    {
-        err = zipCloseFileInZip (file);
-    }
-
-    if (global_comment==NULL)
-        size_global_comment = 0;
-    else
-        size_global_comment = strlen(global_comment);
-
-
-    centraldir_pos_inzip = ftell(zi->filezip);
-    if (err==ZIP_OK)
-    {
-        linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;
-        while (ldi!=NULL)
-        {
-            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
-                if (fwrite(ldi->data,(uInt)ldi->filled_in_this_block,
-                                        1,zi->filezip) !=1 )
-                    err = ZIP_ERRNO;
-
-            size_centraldir += ldi->filled_in_this_block;
-            ldi = ldi->next_datablock;
-        }
-    }
-    free_datablock(zi->central_dir.first_block);
-
-    if (err==ZIP_OK) /* Magic End */
-        err = ziplocal_putValue(zi->filezip,(uLong)ENDHEADERMAGIC,4);
-
-    if (err==ZIP_OK) /* number of this disk */
-        err = ziplocal_putValue(zi->filezip,(uLong)0,2);
-
-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */
-        err = ziplocal_putValue(zi->filezip,(uLong)0,2);
-
-    if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
-        err = ziplocal_putValue(zi->filezip,(uLong)zi->number_entry,2);
-
-    if (err==ZIP_OK) /* total number of entries in the central dir */
-        err = ziplocal_putValue(zi->filezip,(uLong)zi->number_entry,2);
-
-    if (err==ZIP_OK) /* size of the central directory */
-        err = ziplocal_putValue(zi->filezip,(uLong)size_centraldir,4);
-
-    if (err==ZIP_OK) /* offset of start of central directory with respect to the 
-	                        starting disk number */
-        err = ziplocal_putValue(zi->filezip,(uLong)centraldir_pos_inzip ,4);
-
-    if (err==ZIP_OK) /* zipfile comment length */
-        err = ziplocal_putValue(zi->filezip,(uLong)size_global_comment,2);
-
-    if ((err==ZIP_OK) && (size_global_comment>0))
-        if (fwrite(global_comment,(uInt)size_global_comment,1,zi->filezip) !=1 )
-                err = ZIP_ERRNO;
-    fclose(zi->filezip);
-    TRYFREE(zi);
-
-    return err;
-}
diff --git a/Source/Project64/3rd Party/zlib/zip.h b/Source/Project64/3rd Party/zlib/zip.h
deleted file mode 100644
index 1eed46995..000000000
--- a/Source/Project64/3rd Party/zlib/zip.h	
+++ /dev/null
@@ -1,150 +0,0 @@
-/* zip.h -- IO for compress .zip files using zlib 
-   Version 0.15 alpha, Mar 19th, 1998,
-
-   Copyright (C) 1998 Gilles Vollant
-
-   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-   Encryption and multi volume ZipFile (span) are not supported.
-   Old compressions used by old PKZip 1.x are not supported
-
-  For uncompress .zip file, look at unzip.h
-
-   THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
-   CAN CHANGE IN FUTURE VERSION !!
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/zip.htm for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-
-/* for more info about .ZIP format, see 
-      ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _zip_H
-#define _zip_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagzipFile__ { int unused; } zipFile__; 
-typedef zipFile__ *zipFile;
-#else
-typedef voidp zipFile;
-#endif
-
-#define ZIP_OK                                  (0)
-#define ZIP_ERRNO               (Z_ERRNO)
-#define ZIP_PARAMERROR                  (-102)
-#define ZIP_INTERNALERROR               (-104)
-
-/* tm_zip contain date/time info */
-typedef struct tm_zip_s 
-{
-	uInt tm_sec;            /* seconds after the minute - [0,59] */
-	uInt tm_min;            /* minutes after the hour - [0,59] */
-	uInt tm_hour;           /* hours since midnight - [0,23] */
-	uInt tm_mday;           /* day of the month - [1,31] */
-	uInt tm_mon;            /* months since January - [0,11] */
-	uInt tm_year;           /* years - [1980..2044] */
-} tm_zip;
-
-typedef struct
-{
-	tm_zip      tmz_date;       /* date in understandable format           */
-    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */
-/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */
-
-    uLong       internal_fa;    /* internal file attributes        2 bytes */
-    uLong       external_fa;    /* external file attributes        4 bytes */
-} zip_fileinfo;
-
-extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
-/*
-  Create a zipfile.
-	 pathname contain on Windows NT a filename like "c:\\zlib\\zlib111.zip" or on
-	   an Unix computer "zlib/zlib111.zip".
-	 if the file pathname exist and append=1, the zip will be created at the end
-	   of the file. (useful if the file contain a self extractor code)
-	 If the zipfile cannot be opened, the return value is NULL.
-     Else, the return value is a zipFile Handle, usable with other function
-	   of this zip package.
-
-
-*/
-
-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
-					   const char* filename,
-					   const zip_fileinfo* zipfi,
-					   const void* extrafield_local,
-					   uInt size_extrafield_local,
-					   const void* extrafield_global,
-					   uInt size_extrafield_global,
-					   const char* comment,
-					   int method,
-					   int level));
-/*
-  Open a file in the ZIP for writing.
-  filename : the filename in zip (if NULL, '-' without quote will be used
-  *zipfi contain supplemental information
-  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
-    contains the extrafield data the the local header
-  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
-    contains the extrafield data the the local header
-  if comment != NULL, comment contain the comment string
-  method contain the compression method (0 for store, Z_DEFLATED for deflate)
-  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
-*/
-
-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
-					   const voidp buf,
-					   unsigned len));
-/*
-  Write data in the zipfile
-*/
-
-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
-/*
-  Close the current file in the zipfile
-*/
-
-extern int ZEXPORT zipClose OF((zipFile file,
-				const char* global_comment));
-/*
-  Close the zipfile
-*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _zip_H */
diff --git a/Source/Project64/3rd Party/zlib/zlib.def b/Source/Project64/3rd Party/zlib/zlib.def
deleted file mode 100644
index 03bcf1c5c..000000000
--- a/Source/Project64/3rd Party/zlib/zlib.def	
+++ /dev/null
@@ -1,60 +0,0 @@
-LIBRARY
-; zlib data compression library
-
-EXPORTS
-; basic functions
-    zlibVersion
-    deflate
-    deflateEnd
-    inflate
-    inflateEnd
-; advanced functions
-    deflateSetDictionary
-    deflateCopy
-    deflateReset
-    deflateParams
-    deflateBound
-    deflatePrime
-    inflateSetDictionary
-    inflateSync
-    inflateCopy
-    inflateReset
-    inflateBack
-    inflateBackEnd
-    zlibCompileFlags
-; utility functions
-    compress
-    compress2
-    compressBound
-    uncompress
-    gzopen
-    gzdopen
-    gzsetparams
-    gzread
-    gzwrite
-    gzprintf
-    gzputs
-    gzgets
-    gzputc
-    gzgetc
-    gzungetc
-    gzflush
-    gzseek
-    gzrewind
-    gztell
-    gzeof
-    gzclose
-    gzerror
-    gzclearerr
-; checksum functions
-    adler32
-    crc32
-; various hacks, don't look :)
-    deflateInit_
-    deflateInit2_
-    inflateInit_
-    inflateInit2_
-    inflateBackInit_
-    inflateSyncPoint
-    get_crc_table
-    zError
diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h
index 405d3f446..d0cf68ff3 100644
--- a/Source/Project64/Multilanguage.h
+++ b/Source/Project64/Multilanguage.h
@@ -371,6 +371,7 @@ enum LanguageStringID{
     ACCEL_CPUSTATE_2        =  689,
     ACCEL_CPUSTATE_3        =  690,
     ACCEL_CPUSTATE_4        =  691,
+	ACCEL_DETECTKEY         =  692,
 
 // Frame Rate Option
     STR_FR_VIS              = 700,
@@ -385,6 +386,7 @@ enum LanguageStringID{
 	BOTTOM_RESET_PAGE		= 720,
 	BOTTOM_RESET_ALL		= 721,
 	BOTTOM_APPLY			= 722,
+	BOTTOM_CLOSE			= 723,
 
 /*********************************************************************************
 * ROM Information                                                                *
diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp
index 5f093b445..3622da5d7 100644
--- a/Source/Project64/Multilanguage/Language Class.cpp	
+++ b/Source/Project64/Multilanguage/Language Class.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+#include <Common/stdtypes.h>
+#include <Common/path.h>
 
 CLanguage * g_Lang = NULL;
 
@@ -16,1005 +18,707 @@ void CLanguage::LoadDefaultStrings (void)
 {
 #define DEF_STR(ID,str) m_DefaultStrings.insert(LANG_STRINGS::value_type(ID,str))
 
-	DEF_STR(EMPTY_STRING,        L""                        );
+    DEF_STR(EMPTY_STRING,        L""                        );
 
-/*********************************************************************************
-* Meta Information                                                               *
-*********************************************************************************/
-//About DLL
-	DEF_STR(LANGUAGE_NAME,		 L""						);
-	DEF_STR(LANGUAGE_AUTHOR,	 L""						);
-	DEF_STR(LANGUAGE_VERSION,	 L""						);
-	DEF_STR(LANGUAGE_DATE,		 L""						);
+    /*********************************************************************************
+    * Meta Information                                                               *
+    *********************************************************************************/
+    //About DLL
+    DEF_STR(LANGUAGE_NAME,		 L""						);
+    DEF_STR(LANGUAGE_AUTHOR,	 L""						);
+    DEF_STR(LANGUAGE_VERSION,	 L""						);
+    DEF_STR(LANGUAGE_DATE,		 L""						);
 
-//About DLL Dialog
-	DEF_STR(INI_CURRENT_LANG,    L"Current Language"        );
-	DEF_STR(INI_AUTHOR,          L"Author"                  );
-	DEF_STR(INI_VERSION,         L"Version"                 );
-	DEF_STR(INI_DATE,            L"Date"                    );
-	DEF_STR(INI_HOMEPAGE,        L"Visit Home Page"         );
-	DEF_STR(INI_CURRENT_RDB,     L"ROM Database (.RDB)"     );
-	DEF_STR(INI_CURRENT_CHT,     L"Cheat Code File (.CHT)"  );
-	DEF_STR(INI_CURRENT_RDX,     L"Extended ROM Info (.RDX)");
+    //About DLL Dialog
+    DEF_STR(INI_CURRENT_LANG,    L"Current Language"        );
+    DEF_STR(INI_AUTHOR,          L"Author"                  );
+    DEF_STR(INI_VERSION,         L"Version"                 );
+    DEF_STR(INI_DATE,            L"Date"                    );
+    DEF_STR(INI_HOMEPAGE,        L"Visit Home Page"         );
+    DEF_STR(INI_CURRENT_RDB,     L"ROM Database (.RDB)"     );
+    DEF_STR(INI_CURRENT_CHT,     L"Cheat Code File (.CHT)"  );
+    DEF_STR(INI_CURRENT_RDX,     L"Extended ROM Info (.RDX)");
 
-//About INI title
-	DEF_STR(INI_TITLE,           L"About Config Files"         );
+    //About INI title
+    DEF_STR(INI_TITLE,           L"About Config Files"         );
 
-/*********************************************************************************
-* Numbers                                                                        *
-*********************************************************************************/
-	DEF_STR(NUMBER_0,             L"0"                      );
-	DEF_STR(NUMBER_1,             L"1"                      );
-	DEF_STR(NUMBER_2,             L"2"                      );
-	DEF_STR(NUMBER_3,             L"3"                      );
-	DEF_STR(NUMBER_4,             L"4"                      ),
-	DEF_STR(NUMBER_5,             L"5"                      );
-	DEF_STR(NUMBER_6,             L"6"                      );
-	DEF_STR(NUMBER_7,             L"7"                      );
-	DEF_STR(NUMBER_8,             L"8"                      );
-	DEF_STR(NUMBER_9,             L"9"                      );
+    /*********************************************************************************
+    * Numbers                                                                        *
+    *********************************************************************************/
+    DEF_STR(NUMBER_0,             L"0"                      );
+    DEF_STR(NUMBER_1,             L"1"                      );
+    DEF_STR(NUMBER_2,             L"2"                      );
+    DEF_STR(NUMBER_3,             L"3"                      );
+    DEF_STR(NUMBER_4,             L"4"                      ),
+        DEF_STR(NUMBER_5,             L"5"                      );
+    DEF_STR(NUMBER_6,             L"6"                      );
+    DEF_STR(NUMBER_7,             L"7"                      );
+    DEF_STR(NUMBER_8,             L"8"                      );
+    DEF_STR(NUMBER_9,             L"9"                      );
 
-/*********************************************************************************
-* Menu                                                                           *
-*********************************************************************************/
-//File Menu
-	DEF_STR(MENU_FILE,     L"&File"     );
-		DEF_STR(MENU_OPEN,       L"&Open ROM"               );
-		DEF_STR(MENU_ROM_INFO,   L"ROM &Info...."           );
-		DEF_STR(MENU_START,      L"Start Emulation"         );
-		DEF_STR(MENU_END,        L"&End Emulation"          );
-		DEF_STR(MENU_CHOOSE_ROM, L"Choose ROM Directory..." );
-		DEF_STR(MENU_REFRESH,    L"Refresh ROM List"        );
-		DEF_STR(MENU_RECENT_ROM, L"Recent ROM"              );
-		DEF_STR(MENU_RECENT_DIR, L"Recent ROM Directories"  );
-		DEF_STR(MENU_EXIT,       L"E&xit"                   );
+    /*********************************************************************************
+    * Menu                                                                           *
+    *********************************************************************************/
+    //File Menu
+    DEF_STR(MENU_FILE,     L"&File"     );
+    DEF_STR(MENU_OPEN,       L"&Open ROM"               );
+    DEF_STR(MENU_ROM_INFO,   L"ROM &Info...."           );
+    DEF_STR(MENU_START,      L"Start Emulation"         );
+    DEF_STR(MENU_END,        L"&End Emulation"          );
+    DEF_STR(MENU_CHOOSE_ROM, L"Choose ROM Directory..." );
+    DEF_STR(MENU_REFRESH,    L"Refresh ROM List"        );
+    DEF_STR(MENU_RECENT_ROM, L"Recent ROM"              );
+    DEF_STR(MENU_RECENT_DIR, L"Recent ROM Directories"  );
+    DEF_STR(MENU_EXIT,       L"E&xit"                   );
 
-//System Menu
-	DEF_STR(MENU_SYSTEM,   L"&System"   );
-		DEF_STR(MENU_RESET,       L"&Reset"                 );
-		DEF_STR(MENU_PAUSE,       L"&Pause"                 );
-		DEF_STR(MENU_BITMAP,      L"Generate Bitmap"        );
-		DEF_STR(MENU_LIMIT_FPS,   L"Limit FPS"              );
-		DEF_STR(MENU_SAVE,        L"&Save State"                  );
-		DEF_STR(MENU_SAVE_AS,     L"Save As..."             );
-		DEF_STR(MENU_RESTORE,     L"&Load State"               );
-		DEF_STR(MENU_LOAD,        L"Load..."                );
-		DEF_STR(MENU_CURRENT_SAVE,L"Current Save S&tate"    );
-		DEF_STR(MENU_CHEAT,       L"Cheats..."              );
-		DEF_STR(MENU_GS_BUTTON,   L"GS Button"              );
-		DEF_STR(MENU_RESUME,      L"R&esume"                );
-		DEF_STR(MENU_RESET_SOFT,  L"&Soft Reset"            );
-		DEF_STR(MENU_RESET_HARD,  L"&Hard Reset"            );
+    //System Menu
+    DEF_STR(MENU_SYSTEM,   L"&System"   );
+    DEF_STR(MENU_RESET,       L"&Reset"                 );
+    DEF_STR(MENU_PAUSE,       L"&Pause"                 );
+    DEF_STR(MENU_BITMAP,      L"Generate Bitmap"        );
+    DEF_STR(MENU_LIMIT_FPS,   L"Limit FPS"              );
+    DEF_STR(MENU_SAVE,        L"&Save State"                  );
+    DEF_STR(MENU_SAVE_AS,     L"Save As..."             );
+    DEF_STR(MENU_RESTORE,     L"&Load State"               );
+    DEF_STR(MENU_LOAD,        L"Load..."                );
+    DEF_STR(MENU_CURRENT_SAVE,L"Current Save S&tate"    );
+    DEF_STR(MENU_CHEAT,       L"Cheats..."              );
+    DEF_STR(MENU_GS_BUTTON,   L"GS Button"              );
+    DEF_STR(MENU_RESUME,      L"R&esume"                );
+    DEF_STR(MENU_RESET_SOFT,  L"&Soft Reset"            );
+    DEF_STR(MENU_RESET_HARD,  L"&Hard Reset"            );
 
-//Options Menu
-	DEF_STR(MENU_OPTIONS,  L"&Options"  );
-		DEF_STR(MENU_FULL_SCREEN, L"&Full Screen"                   );
-		DEF_STR(MENU_ON_TOP,      L"&Always on &Top"                );
-		DEF_STR(MENU_CONFG_GFX,   L"Configure Graphics Plugin..."   );
-		DEF_STR(MENU_CONFG_AUDIO, L"Configure Audio Plugin..."      );
-		DEF_STR(MENU_CONFG_CTRL,  L"Configure Controller Plugin..." );
-		DEF_STR(MENU_CONFG_RSP,   L"Configure RSP Plugin..."        );
-		DEF_STR(MENU_SHOW_CPU,    L"Show CPU Usage"                 );
-		DEF_STR(MENU_SETTINGS,    L"&Settings..."                   );
+    //Options Menu
+    DEF_STR(MENU_OPTIONS,  L"&Options"  );
+    DEF_STR(MENU_FULL_SCREEN, L"&Full Screen"                   );
+    DEF_STR(MENU_ON_TOP,      L"&Always on &Top"                );
+    DEF_STR(MENU_CONFG_GFX,   L"Configure Graphics Plugin..."   );
+    DEF_STR(MENU_CONFG_AUDIO, L"Configure Audio Plugin..."      );
+    DEF_STR(MENU_CONFG_CTRL,  L"Configure Controller Plugin..." );
+    DEF_STR(MENU_CONFG_RSP,   L"Configure RSP Plugin..."        );
+    DEF_STR(MENU_SHOW_CPU,    L"Show CPU Usage"                 );
+    DEF_STR(MENU_SETTINGS,    L"&Settings..."                   );
 
-//Debugger Menu
-	DEF_STR(MENU_DEBUGGER, L"&Debugger" );
+    //Debugger Menu
+    DEF_STR(MENU_DEBUGGER, L"&Debugger" );
 
-//Language Menu
-	DEF_STR(MENU_LANGUAGE, L"&Language" );
+    //Language Menu
+    DEF_STR(MENU_LANGUAGE, L"&Language" );
 
-//Help Menu
-	DEF_STR(MENU_HELP,     L"&Help"     );
-		DEF_STR(MENU_ABOUT_INI,   L"About Conf&ig Files"   );
-		DEF_STR(MENU_ABOUT_PJ64,  L"&About Project64"  );
-		DEF_STR(MENU_FORUM,	      L"Support &Forum"     );
-		DEF_STR(MENU_HOMEPAGE,	  L"&Homepage"          );
+    //Help Menu
+    DEF_STR(MENU_HELP,        L"&Help"     );
+    DEF_STR(MENU_ABOUT_INI,   L"About Conf&ig Files"   );
+    DEF_STR(MENU_ABOUT_PJ64,  L"&About Project64"  );
+    DEF_STR(MENU_FORUM,	      L"Support &Forum"     );
+    DEF_STR(MENU_HOMEPAGE,	  L"&Homepage"          );
 
-//Current Save Slot menu
-	DEF_STR(MENU_SLOT_DEFAULT,    L"Default"            );
-	DEF_STR(MENU_SLOT_1,      L"Slot 1"             );
-	DEF_STR(MENU_SLOT_2,      L"Slot 2"             );
-	DEF_STR(MENU_SLOT_3,      L"Slot 3"             );
-	DEF_STR(MENU_SLOT_4,      L"Slot 4"             );
-	DEF_STR(MENU_SLOT_5,      L"Slot 5"             );
-	DEF_STR(MENU_SLOT_6,      L"Slot 6"             );
-	DEF_STR(MENU_SLOT_7,      L"Slot 7"             );
-	DEF_STR(MENU_SLOT_8,      L"Slot 8"             );
-	DEF_STR(MENU_SLOT_9,      L"Slot 9"             );
-	DEF_STR(MENU_SLOT_10,     L"Slot 10"            );
+    //Current Save Slot menu
+    DEF_STR(MENU_SLOT_DEFAULT,L"Default"            );
+    DEF_STR(MENU_SLOT_1,      L"Slot 1"             );
+    DEF_STR(MENU_SLOT_2,      L"Slot 2"             );
+    DEF_STR(MENU_SLOT_3,      L"Slot 3"             );
+    DEF_STR(MENU_SLOT_4,      L"Slot 4"             );
+    DEF_STR(MENU_SLOT_5,      L"Slot 5"             );
+    DEF_STR(MENU_SLOT_6,      L"Slot 6"             );
+    DEF_STR(MENU_SLOT_7,      L"Slot 7"             );
+    DEF_STR(MENU_SLOT_8,      L"Slot 8"             );
+    DEF_STR(MENU_SLOT_9,      L"Slot 9"             );
+    DEF_STR(MENU_SLOT_10,     L"Slot 10"            );
 
-//Pop up Menu
-	DEF_STR(POPUP_PLAY,      L"Play Game"  );
-	DEF_STR(POPUP_INFO,      L"ROM Information"  );
-	DEF_STR(POPUP_SETTINGS,  L"Edit Game Settings"  );
-	DEF_STR(POPUP_CHEATS,    L"Edit Cheats"  );
-	DEF_STR(POPUP_GFX_PLUGIN,L"Graphics Plugin"  );
+    //Pop up Menu
+    DEF_STR(POPUP_PLAY,      L"Play Game"  );
+    DEF_STR(POPUP_INFO,      L"ROM Information"  );
+    DEF_STR(POPUP_SETTINGS,  L"Edit Game Settings"  );
+    DEF_STR(POPUP_CHEATS,    L"Edit Cheats"  );
+    DEF_STR(POPUP_GFX_PLUGIN,L"Graphics Plugin"  );
 
-//Alternate Name to save Slot
-	DEF_STR(SAVE_SLOT_DEFAULT,L"Save Slot - Default"       );
-	DEF_STR(SAVE_SLOT_1,      L"Save Slot - 1"             );
-	DEF_STR(SAVE_SLOT_2,      L"Save Slot - 2"             );
-	DEF_STR(SAVE_SLOT_3,      L"Save Slot - 3"             );
-	DEF_STR(SAVE_SLOT_4,      L"Save Slot - 4"             );
-	DEF_STR(SAVE_SLOT_5,      L"Save Slot - 5"             );
-	DEF_STR(SAVE_SLOT_6,      L"Save Slot - 6"             );
-	DEF_STR(SAVE_SLOT_7,      L"Save Slot - 7"             );
-	DEF_STR(SAVE_SLOT_8,      L"Save Slot - 8"             );
-	DEF_STR(SAVE_SLOT_9,      L"Save Slot - 9"             );
-	DEF_STR(SAVE_SLOT_10,     L"Save Slot - 10"            );
+    //Alternate Name to save Slot
+    DEF_STR(SAVE_SLOT_DEFAULT,L"Save Slot - Default"       );
+    DEF_STR(SAVE_SLOT_1,      L"Save Slot - 1"             );
+    DEF_STR(SAVE_SLOT_2,      L"Save Slot - 2"             );
+    DEF_STR(SAVE_SLOT_3,      L"Save Slot - 3"             );
+    DEF_STR(SAVE_SLOT_4,      L"Save Slot - 4"             );
+    DEF_STR(SAVE_SLOT_5,      L"Save Slot - 5"             );
+    DEF_STR(SAVE_SLOT_6,      L"Save Slot - 6"             );
+    DEF_STR(SAVE_SLOT_7,      L"Save Slot - 7"             );
+    DEF_STR(SAVE_SLOT_8,      L"Save Slot - 8"             );
+    DEF_STR(SAVE_SLOT_9,      L"Save Slot - 9"             );
+    DEF_STR(SAVE_SLOT_10,     L"Save Slot - 10"            );
 
-/*********************************************************************************
-* ROM Browser                                                                    *
-*********************************************************************************/
-//ROM Browser Fields
-	DEF_STR(RB_FILENAME,     L"File Name" );
-	DEF_STR(RB_INTERNALNAME, L"Internal Name" );
-	DEF_STR(RB_GOODNAME,     L"Good Name" );
-	DEF_STR(RB_STATUS,       L"Status" );
-	DEF_STR(RB_ROMSIZE,      L"ROM Size" );
-	DEF_STR(RB_NOTES_CORE,   L"Notes (core)" );
-	DEF_STR(RB_NOTES_PLUGIN, L"Notes (default plugins)" );
-	DEF_STR(RB_NOTES_USER,   L"Notes (user)" );
-	DEF_STR(RB_CART_ID,      L"Cartridge ID" );
-	DEF_STR(RB_MANUFACTUER,  L"Manufacturer" );
-	DEF_STR(RB_COUNTRY,      L"Country" );
-	DEF_STR(RB_DEVELOPER,    L"Developer" );
-	DEF_STR(RB_CRC1,         L"CRC1" );
-	DEF_STR(RB_CRC2,         L"CRC2" );
-	DEF_STR(RB_CICCHIP,      L"CIC Chip" );
-	DEF_STR(RB_RELEASE_DATE, L"Release Date" );
-	DEF_STR(RB_GENRE,        L"Genre" );
-	DEF_STR(RB_PLAYERS,      L"Players" );
-	DEF_STR(RB_FORCE_FEEDBACK,L"Force Feedback" );
-	DEF_STR(RB_FILE_FORMAT,   L"File Format" );
+    /*********************************************************************************
+    * ROM Browser                                                                    *
+    *********************************************************************************/
+    //ROM Browser Fields
+    DEF_STR(RB_FILENAME,     L"File Name" );
+    DEF_STR(RB_INTERNALNAME, L"Internal Name" );
+    DEF_STR(RB_GOODNAME,     L"Good Name" );
+    DEF_STR(RB_STATUS,       L"Status" );
+    DEF_STR(RB_ROMSIZE,      L"ROM Size" );
+    DEF_STR(RB_NOTES_CORE,   L"Notes (core)" );
+    DEF_STR(RB_NOTES_PLUGIN, L"Notes (default plugins)" );
+    DEF_STR(RB_NOTES_USER,   L"Notes (user)" );
+    DEF_STR(RB_CART_ID,      L"Cartridge ID" );
+    DEF_STR(RB_MANUFACTUER,  L"Manufacturer" );
+    DEF_STR(RB_COUNTRY,      L"Country" );
+    DEF_STR(RB_DEVELOPER,    L"Developer" );
+    DEF_STR(RB_CRC1,         L"CRC1" );
+    DEF_STR(RB_CRC2,         L"CRC2" );
+    DEF_STR(RB_CICCHIP,      L"CIC Chip" );
+    DEF_STR(RB_RELEASE_DATE, L"Release Date" );
+    DEF_STR(RB_GENRE,        L"Genre" );
+    DEF_STR(RB_PLAYERS,      L"Players" );
+    DEF_STR(RB_FORCE_FEEDBACK,L"Force Feedback" );
+    DEF_STR(RB_FILE_FORMAT,   L"File Format" );
 
-//Select ROM
-	DEF_STR(SELECT_ROM_DIR,  L"Select current ROM directory" );
+    //Select ROM
+    DEF_STR(SELECT_ROM_DIR,  L"Select current ROM directory" );
 
-//Messages
-	DEF_STR(RB_NOT_GOOD_FILE,L"Bad ROM? Use GoodN64 & check for updated RDB" );
+    //Messages
+    DEF_STR(RB_NOT_GOOD_FILE,L"Bad ROM? Use GoodN64 & check for updated RDB." );
 
-/*********************************************************************************
-* Options                                                                        *
-*********************************************************************************/
-//Options Title
-	DEF_STR(OPTIONS_TITLE,L"Settings");
+    /*********************************************************************************
+    * Options                                                                        *
+    *********************************************************************************/
+    //Options Title
+    DEF_STR(OPTIONS_TITLE,L"Settings");
 
-//Tabs
-	DEF_STR(TAB_PLUGIN,      L"Plugins");
-	DEF_STR(TAB_DIRECTORY,   L"Directories");
-	DEF_STR(TAB_OPTIONS,     L"Options");
-	DEF_STR(TAB_ROMSELECTION,L"ROM Selection");
-	DEF_STR(TAB_ADVANCED,    L"Advanced");
-	DEF_STR(TAB_ROMSETTINGS, L"General Settings");
-	DEF_STR(TAB_SHELLINTERGATION,L"Shell Integration");
-	DEF_STR(TAB_ROMNOTES,    L"Notes");
-	DEF_STR(TAB_SHORTCUTS,    L"Keyboard Shortcuts");
-	DEF_STR(TAB_ROMSTATUS,    L"Status");
-	DEF_STR(TAB_RECOMPILER,   L"Recompiler");
+    //Tabs
+    DEF_STR(TAB_PLUGIN,      L"Plugins");
+    DEF_STR(TAB_DIRECTORY,   L"Directories");
+    DEF_STR(TAB_OPTIONS,     L"Options");
+    DEF_STR(TAB_ROMSELECTION,L"ROM Selection");
+    DEF_STR(TAB_ADVANCED,    L"Advanced");
+    DEF_STR(TAB_ROMSETTINGS, L"General Settings");
+    DEF_STR(TAB_SHELLINTERGATION,L"Shell Integration");
+    DEF_STR(TAB_ROMNOTES,    L"Notes");
+    DEF_STR(TAB_SHORTCUTS,    L"Keyboard Shortcuts");
+    DEF_STR(TAB_ROMSTATUS,    L"Status");
+    DEF_STR(TAB_RECOMPILER,   L"Recompiler");
 
-//Plugin Dialog
-	DEF_STR(PLUG_ABOUT,    L"About");
-	DEF_STR(PLUG_RSP,      L" RSP (Reality Signal Processor) plugin: ");
-	DEF_STR(PLUG_GFX,      L" Video (graphics) plugin: ");
-	DEF_STR(PLUG_AUDIO,    L" Audio (sound) plugin: ");
-	DEF_STR(PLUG_CTRL,     L" Input (controller) plugin: ");
-	DEF_STR(PLUG_HLE_GFX,  L"Graphics HLE");
-	DEF_STR(PLUG_HLE_AUDIO,L"Audio HLE");
-	DEF_STR(PLUG_DEFAULT,  L"** Use System Plugin **");
+    //Plugin Dialog
+    DEF_STR(PLUG_ABOUT,    L"About");
+    DEF_STR(PLUG_RSP,      L" RSP (Reality Signal Processor) plugin: ");
+    DEF_STR(PLUG_GFX,      L" Video (graphics) plugin: ");
+    DEF_STR(PLUG_AUDIO,    L" Audio (sound) plugin: ");
+    DEF_STR(PLUG_CTRL,     L" Input (controller) plugin: ");
+    DEF_STR(PLUG_HLE_GFX,  L"Graphics HLE");
+    DEF_STR(PLUG_HLE_AUDIO,L"Audio HLE");
+    DEF_STR(PLUG_DEFAULT,  L"** Use System Plugin **");
 
-//Directory Dialog
-	DEF_STR(DIR_PLUGIN,        L" Plugin directory: ");
-	DEF_STR(DIR_ROM,           L" ROM directory: ");
-	DEF_STR(DIR_AUTO_SAVE,     L" N64 native saves directory: ");
-	DEF_STR(DIR_INSTANT_SAVE,  L" Saved states directory: ");
-	DEF_STR(DIR_SCREEN_SHOT,   L" Screenshot directory: ");
-	DEF_STR(DIR_ROM_DEFAULT,   L"Last folder that a ROM was open from");
-	DEF_STR(DIR_SELECT_PLUGIN, L"Select plugin directory");
-	DEF_STR(DIR_SELECT_ROM,    L"Select ROM directory");
-	DEF_STR(DIR_SELECT_AUTO,   L"Select N64 native saves directory");
-	DEF_STR(DIR_SELECT_INSTANT,L"Select saved states directory");
-	DEF_STR(DIR_SELECT_SCREEN, L"Select screenshot directory");
-	DEF_STR(DIR_TEXTURE,        L" Texture pack directory: ");
-	DEF_STR(DIR_SELECT_TEXTURE, L"Select texture pack directory");
+    //Directory Dialog
+    DEF_STR(DIR_PLUGIN,        L" Plugin directory: ");
+    DEF_STR(DIR_ROM,           L" ROM directory: ");
+    DEF_STR(DIR_AUTO_SAVE,     L" N64 native saves directory: ");
+    DEF_STR(DIR_INSTANT_SAVE,  L" Saved states directory: ");
+    DEF_STR(DIR_SCREEN_SHOT,   L" Screenshot directory: ");
+    DEF_STR(DIR_ROM_DEFAULT,   L"Last folder that a ROM was open from");
+    DEF_STR(DIR_SELECT_PLUGIN, L"Select plugin directory");
+    DEF_STR(DIR_SELECT_ROM,    L"Select ROM directory");
+    DEF_STR(DIR_SELECT_AUTO,   L"Select N64 native saves directory");
+    DEF_STR(DIR_SELECT_INSTANT,L"Select saved states directory");
+    DEF_STR(DIR_SELECT_SCREEN, L"Select screenshot directory");
+    DEF_STR(DIR_TEXTURE,        L" Texture pack directory: ");
+    DEF_STR(DIR_SELECT_TEXTURE, L"Select texture pack directory");
 
-//Options (general) Tab
-	DEF_STR(OPTION_AUTO_SLEEP,      L"Pause emulation when window is not active");
-	DEF_STR(OPTION_AUTO_FULLSCREEN, L"Enter full-screen mode when loading a ROM");
-	DEF_STR(OPTION_BASIC_MODE,      L"Hide advanced settings");
-	DEF_STR(OPTION_REMEMBER_CHEAT,  L"Remember selected cheats");
-	DEF_STR(OPTION_DISABLE_SS,      L"Disable screen saver when running a ROM");
-	DEF_STR(OPTION_DISPLAY_FR,      L"Display speed");
-	DEF_STR(OPTION_CHECK_RUNNING,   L"Check if Project64 is already running");
-	DEF_STR(OPTION_CHANGE_FR,       L"Speed display:");
+    //Options (general) Tab
+    DEF_STR(OPTION_AUTO_SLEEP,      L"Pause emulation when window is not active");
+    DEF_STR(OPTION_AUTO_FULLSCREEN, L"Enter full-screen mode when loading a ROM");
+    DEF_STR(OPTION_BASIC_MODE,      L"Hide advanced settings");
+    DEF_STR(OPTION_REMEMBER_CHEAT,  L"Remember selected cheats");
+    DEF_STR(OPTION_DISABLE_SS,      L"Disable screen saver when running a ROM");
+    DEF_STR(OPTION_DISPLAY_FR,      L"Display speed");
+    DEF_STR(OPTION_CHECK_RUNNING,   L"Check if Project64 is already running");
+    DEF_STR(OPTION_CHANGE_FR,       L"Speed display:");
 
-//ROM Browser Tab
-	DEF_STR(RB_MAX_ROMS,         L"Max # of ROMs remembered (0-10):");
-	DEF_STR(RB_ROMS,             L"ROMs");
-	DEF_STR(RB_MAX_DIRS,         L"Max # of ROM dirs remembered (0-10):");
-	DEF_STR(RB_DIRS,             L"dirs");
-	DEF_STR(RB_USE,              L"Use ROM browser");
-	DEF_STR(RB_DIR_RECURSION,    L"Use directory recursion");
-	DEF_STR(RB_AVALIABLE_FIELDS, L"Available fields:");
-	DEF_STR(RB_SHOW_FIELDS,      L"Show fields in this order:");
-	DEF_STR(RB_ADD,              L"Add ->");
-	DEF_STR(RB_REMOVE,           L"<- Remove");
-	DEF_STR(RB_UP,               L"Up");
-	DEF_STR(RB_DOWN,             L"Down");
-	DEF_STR(RB_REFRESH,          L"Automatically refresh browser");
+    //ROM Browser Tab
+    DEF_STR(RB_MAX_ROMS,         L"Max # of ROMs remembered (0-10):");
+    DEF_STR(RB_ROMS,             L"ROMs");
+    DEF_STR(RB_MAX_DIRS,         L"Max # of ROM dirs remembered (0-10):");
+    DEF_STR(RB_DIRS,             L"dirs");
+    DEF_STR(RB_USE,              L"Use ROM browser");
+    DEF_STR(RB_DIR_RECURSION,    L"Use directory recursion");
+    DEF_STR(RB_AVALIABLE_FIELDS, L"Available fields:");
+    DEF_STR(RB_SHOW_FIELDS,      L"Show fields in this order:");
+    DEF_STR(RB_ADD,              L"Add ->");
+    DEF_STR(RB_REMOVE,           L"<- Remove");
+    DEF_STR(RB_UP,               L"Up");
+    DEF_STR(RB_DOWN,             L"Down");
+    DEF_STR(RB_REFRESH,          L"Automatically refresh browser");
 
-//Advanced Options
-	DEF_STR(ADVANCE_INFO,        L"Most of these changes will not take effect until a new ROM is opened or current ROM is reset.");
-	DEF_STR(ADVANCE_DEFAULTS,    L"Core Defaults");
-	DEF_STR(ADVANCE_CPU_STYLE,   L"CPU core style:");
-	DEF_STR(ADVANCE_SMCM,        L"Self-mod methods:");
-	DEF_STR(ADVANCE_MEM_SIZE,    L"Default memory size:");
-	DEF_STR(ADVANCE_ABL,         L"Advanced block linking:");
-	DEF_STR(ADVANCE_AUTO_START,  L"Start emulation when ROM is opened");
-	DEF_STR(ADVANCE_OVERWRITE,   L"Always override default settings with ones from RDB");
-	DEF_STR(ADVANCE_COMPRESS,    L"Automatically compress saved states");
-	DEF_STR(ADVANCE_DEBUGGER,    L"Enable debugger");
-	DEF_STR(ADVANCE_SMM_CACHE,   L"Cache");
-	DEF_STR(ADVANCE_SMM_PIDMA,   L"PI DMA");
-	DEF_STR(ADVANCE_SMM_VALIDATE,L"Start changed");
-	DEF_STR(ADVANCE_SMM_PROTECT, L"Protect memory");
-	DEF_STR(ADVANCE_SMM_TLB,     L"TLB unmapping");
+    //Advanced Options
+    DEF_STR(ADVANCE_INFO,        L"Most of these changes will not take effect until a new ROM is opened or current ROM is reset.");
+    DEF_STR(ADVANCE_DEFAULTS,    L"Core Defaults");
+    DEF_STR(ADVANCE_CPU_STYLE,   L"CPU core style:");
+    DEF_STR(ADVANCE_SMCM,        L"Self-mod methods:");
+    DEF_STR(ADVANCE_MEM_SIZE,    L"Default memory size:");
+    DEF_STR(ADVANCE_ABL,         L"Advanced block linking");
+    DEF_STR(ADVANCE_AUTO_START,  L"Start emulation when ROM is opened");
+    DEF_STR(ADVANCE_OVERWRITE,   L"Always override default settings with ones from RDB");
+    DEF_STR(ADVANCE_COMPRESS,    L"Automatically compress saved states");
+    DEF_STR(ADVANCE_DEBUGGER,    L"Enable debugger");
+    DEF_STR(ADVANCE_SMM_CACHE,   L"Cache");
+    DEF_STR(ADVANCE_SMM_PIDMA,   L"PI DMA");
+    DEF_STR(ADVANCE_SMM_VALIDATE,L"Start changed");
+    DEF_STR(ADVANCE_SMM_PROTECT, L"Protect memory");
+    DEF_STR(ADVANCE_SMM_TLB,     L"TLB unmapping");
 
-//ROM Options
-	DEF_STR(ROM_CPU_STYLE,       L"CPU core style:");
-	DEF_STR(ROM_VIREFRESH,       L"VI refresh rate:");
-	DEF_STR(ROM_MEM_SIZE,        L"Memory size:");
-	DEF_STR(ROM_ABL,             L"Advanced block linking:");
-	DEF_STR(ROM_SAVE_TYPE,       L"Default save type:");
-	DEF_STR(ROM_COUNTER_FACTOR,  L"Counter factor:");
-	DEF_STR(ROM_LARGE_BUFFER,    L"Larger compile buffer");
-	DEF_STR(ROM_USE_TLB,         L"Use TLB");
-	DEF_STR(ROM_REG_CACHE,       L"Register caching");
-	DEF_STR(ROM_DELAY_SI,        L"Delay SI interrupt");
-	DEF_STR(ROM_FAST_SP,         L"Fast SP");
-	DEF_STR(ROM_DEFAULT,         L"Default");
-	DEF_STR(ROM_AUDIO_SIGNAL,    L"RSP audio signal");
-	DEF_STR(ROM_FIXED_AUDIO,     L"Fixed audio timing");
-	DEF_STR(ROM_FUNC_FIND,       L"Function lookup method:");
-	DEF_STR(ROM_CUSTOM_SMM,      L"Custom self mod Method");
-	DEF_STR(ROM_SYNC_AUDIO,      L"Sync using audio");
-	DEF_STR(ROM_COUNTPERBYTE,	 L"AI count per byte:");
-	DEF_STR(ROM_32BIT,			 L"32-bit engine:");
-	DEF_STR(ROM_DELAY_DP,		 L"Delay DP interrupt:");
+    //ROM Options
+    DEF_STR(ROM_CPU_STYLE,       L"CPU core style:");
+    DEF_STR(ROM_VIREFRESH,       L"VI refresh rate:");
+    DEF_STR(ROM_MEM_SIZE,        L"Memory size:");
+    DEF_STR(ROM_ABL,             L"Advanced block linking");
+    DEF_STR(ROM_SAVE_TYPE,       L"Default save type:");
+    DEF_STR(ROM_COUNTER_FACTOR,  L"Counter factor:");
+    DEF_STR(ROM_LARGE_BUFFER,    L"Larger compile buffer");
+    DEF_STR(ROM_USE_TLB,         L"Use TLB");
+    DEF_STR(ROM_REG_CACHE,       L"Register caching");
+    DEF_STR(ROM_DELAY_SI,        L"Delay SI interrupt");
+    DEF_STR(ROM_FAST_SP,         L"Fast SP");
+    DEF_STR(ROM_DEFAULT,         L"Default");
+    DEF_STR(ROM_AUDIO_SIGNAL,    L"RSP audio signal");
+    DEF_STR(ROM_FIXED_AUDIO,     L"Fixed audio timing");
+    DEF_STR(ROM_FUNC_FIND,       L"Function lookup method:");
+    DEF_STR(ROM_CUSTOM_SMM,      L"Custom self mod Method");
+    DEF_STR(ROM_SYNC_AUDIO,      L"Sync using audio");
+    DEF_STR(ROM_COUNTPERBYTE,	 L"AI count per byte:");
+    DEF_STR(ROM_32BIT,			 L"32-bit engine:");
+    DEF_STR(ROM_DELAY_DP,		 L"Delay DP interrupt:");
 
-//Core Styles
-	DEF_STR(CORE_INTERPTER,      L"Interpreter");
-	DEF_STR(CORE_RECOMPILER,     L"Recompiler");
-	DEF_STR(CORE_SYNC,           L"Synchronize cores");
+    //Core Styles
+    DEF_STR(CORE_INTERPTER,      L"Interpreter");
+    DEF_STR(CORE_RECOMPILER,     L"Recompiler");
+    DEF_STR(CORE_SYNC,           L"Synchronize cores");
 
-//Self Mod Methods
-	DEF_STR(SMCM_NONE,           L"None");
-	DEF_STR(SMCM_CACHE,          L"Cache");
-	DEF_STR(SMCM_PROECTED,       L"Protect memory");
-	DEF_STR(SMCM_CHECK_MEM,      L"Check memory & cache");
-	DEF_STR(SMCM_CHANGE_MEM,     L"Change memory & cache");
-	DEF_STR(SMCM_CHECK_ADV,      L"Check memory advance");
-	DEF_STR(SMCM_CACHE2,         L"Clear code on cache");
+    //Self Mod Methods
+    DEF_STR(SMCM_NONE,           L"None");
+    DEF_STR(SMCM_CACHE,          L"Cache");
+    DEF_STR(SMCM_PROECTED,       L"Protect memory");
+    DEF_STR(SMCM_CHECK_MEM,      L"Check memory & cache");
+    DEF_STR(SMCM_CHANGE_MEM,     L"Change memory & cache");
+    DEF_STR(SMCM_CHECK_ADV,      L"Check memory advance");
+    DEF_STR(SMCM_CACHE2,         L"Clear code on cache");
 
-//Function Lookup method
-	DEF_STR(FLM_PLOOKUP,         L"Physical lookup table");
-	DEF_STR(FLM_VLOOKUP,         L"Virtual lookup table");
-	DEF_STR(FLM_CHANGEMEM,       L"Change memory");
+    //Function Lookup method
+    DEF_STR(FLM_PLOOKUP,         L"Physical lookup table");
+    DEF_STR(FLM_VLOOKUP,         L"Virtual lookup table");
+    DEF_STR(FLM_CHANGEMEM,       L"Change memory");
 
-//RDRAM Size
-	DEF_STR(RDRAM_4MB,           L"4 MB");
-	DEF_STR(RDRAM_8MB,           L"8 MB");
+    //RDRAM Size
+    DEF_STR(RDRAM_4MB,           L"4 MB");
+    DEF_STR(RDRAM_8MB,           L"8 MB");
 
-//Advanced Block Linking
-	DEF_STR(ABL_ON,              L"On");
-	DEF_STR(ABL_OFF,             L"Off");
+    //Advanced Block Linking
+    DEF_STR(ABL_ON,              L"On");
+    DEF_STR(ABL_OFF,             L"Off");
 
-//Save Type
-	DEF_STR(SAVE_FIRST_USED,     L"Use first-used save type");
-	DEF_STR(SAVE_4K_EEPROM,      L"4-kbit EEPROM");
-	DEF_STR(SAVE_16K_EEPROM,     L"16-kbit EEPROM");
-	DEF_STR(SAVE_SRAM,           L"32-kbyte SRAM");
-	DEF_STR(SAVE_FLASHRAM,       L"Flash RAM");
+    //Save Type
+    DEF_STR(SAVE_FIRST_USED,     L"Use first-used save type");
+    DEF_STR(SAVE_4K_EEPROM,      L"4-kbit EEPROM");
+    DEF_STR(SAVE_16K_EEPROM,     L"16-kbit EEPROM");
+    DEF_STR(SAVE_SRAM,           L"32-kbyte SRAM");
+    DEF_STR(SAVE_FLASHRAM,       L"Flash RAM");
 
-//Shell Integration Tab
-	DEF_STR(SHELL_TEXT,          L"File extension association:");
+    //Shell Integration Tab
+    DEF_STR(SHELL_TEXT,          L"File extension association:");
 
-//ROM Notes
-	DEF_STR(NOTE_STATUS,         L"ROM status:");
-	DEF_STR(NOTE_CORE,           L"Core note:");
-	DEF_STR(NOTE_PLUGIN,         L"Plugin note:");
+    //ROM Notes
+    DEF_STR(NOTE_STATUS,         L"ROM status:");
+    DEF_STR(NOTE_CORE,           L"Core note:");
+    DEF_STR(NOTE_PLUGIN,         L"Plugin note:");
 
-// Accelerator Selector
-	DEF_STR(ACCEL_CPUSTATE_TITLE,    L"CPU state:");
-	DEF_STR(ACCEL_MENUITEM_TITLE,    L"Menu item:");
-	DEF_STR(ACCEL_CURRENTKEYS_TITLE, L"Current keys:");
-	DEF_STR(ACCEL_SELKEY_TITLE,      L"Select new shortcut key:");
-	DEF_STR(ACCEL_ASSIGNEDTO_TITLE,  L"Currently assigned to:");
-	DEF_STR(ACCEL_ASSIGN_BTN,        L"Assign");
-	DEF_STR(ACCEL_REMOVE_BTN,        L"Remove");
-	DEF_STR(ACCEL_RESETALL_BTN,      L"Reset all");
-	DEF_STR(ACCEL_CPUSTATE_1,        L"Game not playing");
-	DEF_STR(ACCEL_CPUSTATE_2,        L"Game playing");
-	DEF_STR(ACCEL_CPUSTATE_3,        L"Game playing (windowed)");
-	DEF_STR(ACCEL_CPUSTATE_4,        L"Game playing (full-screen)");
+    // Accelerator Selector
+    DEF_STR(ACCEL_CPUSTATE_TITLE,    L"CPU state:");
+    DEF_STR(ACCEL_MENUITEM_TITLE,    L"Menu item:");
+    DEF_STR(ACCEL_CURRENTKEYS_TITLE, L"Current keys:");
+    DEF_STR(ACCEL_SELKEY_TITLE,      L"Select new shortcut key:");
+    DEF_STR(ACCEL_ASSIGNEDTO_TITLE,  L"Currently assigned to:");
+    DEF_STR(ACCEL_ASSIGN_BTN,        L"Assign");
+    DEF_STR(ACCEL_REMOVE_BTN,        L"Remove");
+    DEF_STR(ACCEL_RESETALL_BTN,      L"Reset all");
+    DEF_STR(ACCEL_CPUSTATE_1,        L"Game not playing");
+    DEF_STR(ACCEL_CPUSTATE_2,        L"Game playing");
+    DEF_STR(ACCEL_CPUSTATE_3,        L"Game playing (windowed)");
+    DEF_STR(ACCEL_CPUSTATE_4,        L"Game playing (full-screen)");
+    DEF_STR(ACCEL_DETECTKEY,         L"Detect Key");
 
-// Frame Rate Option
-	DEF_STR(STR_FR_VIS,              L"Vertical interrupts per second");
-	DEF_STR(STR_FR_DLS,              L"Display lists per second");
-	DEF_STR(STR_FR_PERCENT,          L"Percentage of full speed");
+    // Frame Rate Option
+    DEF_STR(STR_FR_VIS,              L"Vertical interrupts per second");
+    DEF_STR(STR_FR_DLS,              L"Display lists per second");
+    DEF_STR(STR_FR_PERCENT,          L"Percentage of full speed");
 
-// Increase speed
-	DEF_STR(STR_INSREASE_SPEED,      L"Increase Game Speed");
-	DEF_STR(STR_DECREASE_SPEED,      L"Decrease Game Speed");
+    // Increase speed
+    DEF_STR(STR_INSREASE_SPEED,      L"Increase Game Speed");
+    DEF_STR(STR_DECREASE_SPEED,      L"Decrease Game Speed");
 
-//Bottom page buttons
-	DEF_STR(BOTTOM_RESET_PAGE,      L"Reset Page");
-	DEF_STR(BOTTOM_RESET_ALL,       L"Reset All");
-	DEF_STR(BOTTOM_APPLY,			L"Apply");
-	
-/*********************************************************************************
-* ROM Information                                                                *
-*********************************************************************************/
-//ROM Info Title
-	DEF_STR(INFO_TITLE,             L"ROM Information");
+    //Bottom page buttons
+    DEF_STR(BOTTOM_RESET_PAGE,      L"Reset Page");
+    DEF_STR(BOTTOM_RESET_ALL,       L"Reset All");
+    DEF_STR(BOTTOM_APPLY,			L"Apply");
+    DEF_STR(BOTTOM_CLOSE,			L"Close");
 
-//ROM Info Text
-	DEF_STR(INFO_ROM_NAME_TEXT,     L"ROM name:");
-	DEF_STR(INFO_FILE_NAME_TEXT,    L"File name:");
-	DEF_STR(INFO_LOCATION_TEXT,     L"Location:");
-	DEF_STR(INFO_SIZE_TEXT,         L"ROM size:");
-	DEF_STR(INFO_CART_ID_TEXT,      L"Cartridge ID:");
-	DEF_STR(INFO_MANUFACTURER_TEXT, L"Manufacturer:");
-	DEF_STR(INFO_COUNTRY_TEXT,      L"Country:");
-	DEF_STR(INFO_CRC1_TEXT,         L"CRC1:");
-	DEF_STR(INFO_CRC2_TEXT,         L"CRC2:");
-	DEF_STR(INFO_CIC_CHIP_TEXT,     L"CIC chip:");
-	DEF_STR(INFO_MD5_TEXT,          L"MD5:");
+    /*********************************************************************************
+    * ROM Information                                                                *
+    *********************************************************************************/
+    //ROM Info Title
+    DEF_STR(INFO_TITLE,             L"ROM Information");
 
-/*********************************************************************************
-* Cheats                                                                         *
-*********************************************************************************/
-//Cheat List
-	DEF_STR(CHEAT_TITLE,           L"Cheats");
-	DEF_STR(CHEAT_LIST_FRAME,      L"Cheats:");
-	DEF_STR(CHEAT_NOTES_FRAME,     L" Notes: ");
-	DEF_STR(CHEAT_MARK_ALL,        L"Mark All");
-	DEF_STR(CHEAT_MARK_NONE,       L"Unmark All");
+    //ROM Info Text
+    DEF_STR(INFO_ROM_NAME_TEXT,     L"ROM name:");
+    DEF_STR(INFO_FILE_NAME_TEXT,    L"File name:");
+    DEF_STR(INFO_LOCATION_TEXT,     L"Location:");
+    DEF_STR(INFO_SIZE_TEXT,         L"ROM size:");
+    DEF_STR(INFO_CART_ID_TEXT,      L"Cartridge ID:");
+    DEF_STR(INFO_MANUFACTURER_TEXT, L"Manufacturer:");
+    DEF_STR(INFO_COUNTRY_TEXT,      L"Country:");
+    DEF_STR(INFO_CRC1_TEXT,         L"CRC1:");
+    DEF_STR(INFO_CRC2_TEXT,         L"CRC2:");
+    DEF_STR(INFO_CIC_CHIP_TEXT,     L"CIC chip:");
+    DEF_STR(INFO_MD5_TEXT,          L"MD5:");
 
-//Add Cheat
-	DEF_STR(CHEAT_ADDCHEAT_FRAME,  L"Add Cheat");
-	DEF_STR(CHEAT_ADDCHEAT_NAME,   L"Name:");
-	DEF_STR(CHEAT_ADDCHEAT_CODE,   L"Code:");
-	DEF_STR(CHEAT_ADDCHEAT_INSERT, L"Insert");
-	DEF_STR(CHEAT_ADDCHEAT_CLEAR,  L"Clear");
-	DEF_STR(CHEAT_ADDCHEAT_NOTES,  L" Cheat Notes: ");
-	DEF_STR(CHEAT_ADD_TO_DB,       L"Add to DB");
+    /*********************************************************************************
+    * Cheats                                                                         *
+    *********************************************************************************/
+    //Cheat List
+    DEF_STR(CHEAT_TITLE,           L"Cheats");
+    DEF_STR(CHEAT_LIST_FRAME,      L"Cheats:");
+    DEF_STR(CHEAT_NOTES_FRAME,     L" Notes: ");
+    DEF_STR(CHEAT_MARK_ALL,        L"Mark All");
+    DEF_STR(CHEAT_MARK_NONE,       L"Unmark All");
 
-//Code extension
-	DEF_STR(CHEAT_CODE_EXT_TITLE,  L"Code Extensions");
-	DEF_STR(CHEAT_CODE_EXT_TXT,    L"Please choose a value to be used for:");
-	DEF_STR(CHEAT_OK,              L"OK");
-	DEF_STR(CHEAT_CANCEL,          L"Cancel");
+    //Add Cheat
+    DEF_STR(CHEAT_ADDCHEAT_FRAME,  L"Add Cheat");
+    DEF_STR(CHEAT_ADDCHEAT_NAME,   L"Name:");
+    DEF_STR(CHEAT_ADDCHEAT_CODE,   L"Code:");
+    DEF_STR(CHEAT_ADDCHEAT_INSERT, L"Insert");
+    DEF_STR(CHEAT_ADDCHEAT_CLEAR,  L"Clear");
+    DEF_STR(CHEAT_ADDCHEAT_NOTES,  L" Cheat Notes: ");
+    DEF_STR(CHEAT_ADD_TO_DB,       L"Add to DB");
 
-//Digital Value
-	DEF_STR(CHEAT_QUANTITY_TITLE,  L"Quantity Digit");
-	DEF_STR(CHEAT_CHOOSE_VALUE,    L"Please choose a value for:");
-	DEF_STR(CHEAT_VALUE,           L"&Value");
-	DEF_STR(CHEAT_FROM,            L"from");
-	DEF_STR(CHEAT_TO,              L"to");
-	DEF_STR(CHEAT_NOTES,           L"&Notes:");
-	DEF_STR(CHEAT_ADDCHEAT_ADD,    L"Add Cheat");
-	DEF_STR(CHEAT_ADDCHEAT_NEW,    L"New Cheat");
-	DEF_STR(CHEAT_ADDCHEAT_CODEDES,L"<address> <value>");
-	DEF_STR(CHEAT_ADDCHEAT_OPT,    L"Options:");
-	DEF_STR(CHEAT_ADDCHEAT_OPTDES, L"<value> <label>");
+    //Code extension
+    DEF_STR(CHEAT_CODE_EXT_TITLE,  L"Code Extensions");
+    DEF_STR(CHEAT_CODE_EXT_TXT,    L"Please choose a value to be used for:");
+    DEF_STR(CHEAT_OK,              L"OK");
+    DEF_STR(CHEAT_CANCEL,          L"Cancel");
 
-//Edit Cheat
-	DEF_STR(CHEAT_EDITCHEAT_WINDOW,L"Edit Cheat");
-	DEF_STR(CHEAT_EDITCHEAT_UPDATE,L"Update Cheat");
-	DEF_STR(CHEAT_CHANGED_MSG,     L"Cheat has been changed.\n\nDo you want to update?");
-	DEF_STR(CHEAT_CHANGED_TITLE,   L"Cheat updated");
+    //Digital Value
+    DEF_STR(CHEAT_QUANTITY_TITLE,  L"Quantity Digit");
+    DEF_STR(CHEAT_CHOOSE_VALUE,    L"Please choose a value for:");
+    DEF_STR(CHEAT_VALUE,           L"&Value");
+    DEF_STR(CHEAT_FROM,            L"from");
+    DEF_STR(CHEAT_TO,              L"to");
+    DEF_STR(CHEAT_NOTES,           L"&Notes:");
+    DEF_STR(CHEAT_ADDCHEAT_ADD,    L"Add Cheat");
+    DEF_STR(CHEAT_ADDCHEAT_NEW,    L"New Cheat");
+    DEF_STR(CHEAT_ADDCHEAT_CODEDES,L"<address> <value>");
+    DEF_STR(CHEAT_ADDCHEAT_OPT,    L"Options:");
+    DEF_STR(CHEAT_ADDCHEAT_OPTDES, L"<value> <label>");
 
-//Cheat Popup Menu
-	DEF_STR(CHEAT_ADDNEW,          L"Add New Cheat...");
-	DEF_STR(CHEAT_EDIT,            L"Edit");
-	DEF_STR(CHEAT_DELETE,          L"Delete");
+    //Edit Cheat
+    DEF_STR(CHEAT_EDITCHEAT_WINDOW,L"Edit Cheat");
+    DEF_STR(CHEAT_EDITCHEAT_UPDATE,L"Update Cheat");
+    DEF_STR(CHEAT_CHANGED_MSG,     L"Cheat has been changed.\n\nDo you want to update?");
+    DEF_STR(CHEAT_CHANGED_TITLE,   L"Cheat updated");
 
-// short-cut editor
-	DEF_STR(STR_SHORTCUT_RESET_TITLE, L"Reset short-cuts");
-	DEF_STR(STR_SHORTCUT_RESET_TEXT,  L"Are you sure you want to reset the short-cuts?\n\nThis action cannot be undone.");
-	DEF_STR(STR_SHORTCUT_FILEMENU,    L"File Menu");
-	DEF_STR(STR_SHORTCUT_SYSTEMMENU,  L"System Menu");
-	DEF_STR(STR_SHORTCUT_OPTIONS,     L"Options");
-	DEF_STR(STR_SHORTCUT_SAVESLOT,    L"Save Slots");
+    //Cheat Popup Menu
+    DEF_STR(CHEAT_ADDNEW,          L"Add New Cheat...");
+    DEF_STR(CHEAT_EDIT,            L"Edit");
+    DEF_STR(CHEAT_DELETE,          L"Delete");
 
-/*********************************************************************************
-* Messages                                                                       *
-*********************************************************************************/
-	DEF_STR(MSG_CPU_PAUSED,         L"*** CPU PAUSED ***");
-	DEF_STR(MSG_CPU_RESUMED,        L"CPU resumed");
-	DEF_STR(MSG_PERM_LOOP,          L"In a permanent loop that cannot be exited. \nEmulation will now stop. \n\nVerify ROM and ROM settings.");
-	DEF_STR(MSG_MEM_ALLOC_ERROR,    L"Failed to allocate memory");
-	DEF_STR(MSG_FAIL_INIT_GFX,      L"The default or selected video plugin is missing or invalid. \n\nYou need to go into Settings and select a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
-	DEF_STR(MSG_FAIL_INIT_AUDIO,    L"The default or selected audio plugin is missing or invalid. \n\nYou need to go into Settings and select a audio (sound) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
-	DEF_STR(MSG_FAIL_INIT_RSP,      L"The default or selected RSP plugin is missing or invalid. \n\nYou need to go into Settings and select a RSP (Reality Signal Processor) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
-	DEF_STR(MSG_FAIL_INIT_CONTROL,  L"The default or selected input plugin is missing or invalid. \n\nYou need to go into Settings and select an input (controller) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
-	DEF_STR(MSG_FAIL_LOAD_PLUGIN,   L"Failed to load plugin:");
-	DEF_STR(MSG_FAIL_LOAD_WORD,     L"Failed to load word.\n\nVerify ROM and ROM settings.");
-	DEF_STR(MSG_FAIL_OPEN_SAVE,     L"Failed to open save file");
-	DEF_STR(MSG_FAIL_OPEN_EEPROM,   L"Failed to open EEPROM");
-	DEF_STR(MSG_FAIL_OPEN_FLASH,    L"Failed to open flash RAM");
-	DEF_STR(MSG_FAIL_OPEN_MEMPAK,   L"Failed to open mempak");
-	DEF_STR(MSG_FAIL_OPEN_ZIP,      L"Attempt to open zip file failed. \n\nProbably a corrupt zip file - try unzipping ROM manually.");
-	DEF_STR(MSG_FAIL_OPEN_IMAGE,    L"Attempt to open file failed.");
-	DEF_STR(MSG_FAIL_ZIP,           L"Error occurred when trying to open zip file.");
-	DEF_STR(MSG_FAIL_IMAGE,         L"File loaded does not appear to be a valid N64 ROM. \n\nVerify your ROMs with GoodN64.");
-	DEF_STR(MSG_UNKNOWN_COUNTRY,    L"Unknown country");
-	DEF_STR(MSG_UNKNOWN_CIC_CHIP,   L"Unknown CIC chip");
-	DEF_STR(MSG_UNKNOWN_FILE_FORMAT,L"Unknown file format");
-	DEF_STR(MSG_UNKNOWN_MEM_ACTION, L"Unknown memory action\n\nEmulation stopped");
-	DEF_STR(MSG_UNHANDLED_OP,       L"Unhandled R4300i opcode at");
-	DEF_STR(MSG_NONMAPPED_SPACE,    L"Executing from non-mapped space.\n\nVerify ROM and ROM settings.");
-	DEF_STR(MSG_SAVE_STATE_HEADER,  L"This saved state does not appear to match the running ROM. \n\nStates must be saved & loaded between 100% identical ROMs. \nIn particular the REGION and VERSION need to be the same. \nLoading this state is likely to cause the game and/or emulator to crash. \n\nAre you sure you want to continue loading?");
-	DEF_STR(MSG_MSGBOX_TITLE,       L"Error");
-	DEF_STR(MSG_PIF2_ERROR,         L"Copyright sequence not found in LUT.  Game will no longer function.");
-	DEF_STR(MSG_PIF2_TITLE,         L"Copy Protection Failure");
-	DEF_STR(MSG_PLUGIN_CHANGE,      L"Changing a plugin requires Project64 to reset a running ROM. \nIf you don't want to lose your place, answer No and save the current state first. \n\nChange plugins and reset ROM now?");
-	DEF_STR(MSG_PLUGIN_CHANGE_TITLE,L"Change Plugins");
-	DEF_STR(MSG_EMULATION_ENDED,    L"Emulation ended");
-	DEF_STR(MSG_EMULATION_STARTED,  L"Emulation started");
-	DEF_STR(MSG_UNABLED_LOAD_STATE, L"Unable to load state");
-	DEF_STR(MSG_LOADED_STATE,       L"Loaded state");
-	DEF_STR(MSG_SAVED_STATE,        L"Saved current state to");
-	DEF_STR(MSG_SAVE_SLOT,          L"State slot");
-	DEF_STR(MSG_BYTESWAP,           L"Byte-swapping image");
-	DEF_STR(MSG_CHOOSE_IMAGE,       L"Choosing N64 image");
-	DEF_STR(MSG_LOADED,             L"Loaded");
-	DEF_STR(MSG_LOADING,            L"Loading image");
-	DEF_STR(MSG_PLUGIN_NOT_INIT,    L"Cannot open a ROM because plugins have not successfully initialized.");
-	DEF_STR(MSG_DEL_SURE,           L"Are you sure you really want to delete this?");
-	DEF_STR(MSG_DEL_TITLE,          L"Delete Cheat");
-	DEF_STR(MSG_CHEAT_NAME_IN_USE,  L"Cheat name is already in use.");
-	DEF_STR(MSG_MAX_CHEATS,         L"You have reached the maximum amount of cheats for this ROM.");
-	DEF_STR(MSG_PLUGIN_INIT,		L"Plugin initializing");
-	DEF_STR(MSG_NO_SHORTCUT_SEL,	L"You have not selected a virtual key to assign to the menu item.");
-	DEF_STR(MSG_NO_MENUITEM_SEL,	L"You need to select a menu item to assign this key to.");
-	DEF_STR(MSG_MENUITEM_ASSIGNED,	L"Short-cut has already been assigned to another menu item.");
-	DEF_STR(MSG_NO_SEL_SHORTCUT,	L"No shortcut has been selected to be removed.");
-	DEF_STR(MSG_WAITING_FOR_START,	L"ROM loaded. Waiting for emulation to start.");
-	DEF_STR(MSG_INVALID_EXE,		L"Project64 beta is for members only.\n\nIf you have an account at pj64.net, you should not be seeing this error!!\nPlease contact us on the site.");
-	DEF_STR(MSG_INVALID_EXE_TITLE,  L"Program Error");
-	DEF_STR(MSG_7Z_FILE_NOT_FOUND,  L"Failed to find filename in 7z file");
-	DEF_STR(MSG_SET_LLE_GFX_TITLE,  L"Graphics Low-Level Emulation");
-	DEF_STR(MSG_SET_LLE_GFX_MSG,    L"Graphics LLE is not for general use!!!\nIt is advisable that you only use this for testing and not for playing games.\n\nChange to graphics LLE?");
-	DEF_STR(MSG_SET_HLE_AUD_TITLE,  L"Audio High-Level Emulation");
-	DEF_STR(MSG_SET_HLE_AUD_MSG,    L"Audio HLE requires a third-party plugin!!!\nIf you do not use a third-party audio plugin that supports HLE, you will hear no sound.\n\nChange to audio HLE?");
+    // short-cut editor
+    DEF_STR(STR_SHORTCUT_RESET_TITLE, L"Reset short-cuts");
+    DEF_STR(STR_SHORTCUT_RESET_TEXT,  L"Are you sure you want to reset the short-cuts?\n\nThis action cannot be undone.");
+    DEF_STR(STR_SHORTCUT_FILEMENU,    L"File Menu");
+    DEF_STR(STR_SHORTCUT_SYSTEMMENU,  L"System Menu");
+    DEF_STR(STR_SHORTCUT_OPTIONS,     L"Options");
+    DEF_STR(STR_SHORTCUT_SAVESLOT,    L"Save Slots");
+
+    /*********************************************************************************
+    * Messages                                                                       *
+    *********************************************************************************/
+    DEF_STR(MSG_CPU_PAUSED,         L"*** CPU PAUSED ***");
+    DEF_STR(MSG_CPU_RESUMED,        L"CPU resumed");
+    DEF_STR(MSG_PERM_LOOP,          L"In a permanent loop that cannot be exited.\nEmulation will now stop.\n\nVerify ROM and its settings.");
+    DEF_STR(MSG_MEM_ALLOC_ERROR,    L"Failed to allocate memory");
+    DEF_STR(MSG_FAIL_INIT_GFX,      L"The default or selected video plugin is missing or invalid.\n\nYou need to go into Settings and select a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+    DEF_STR(MSG_FAIL_INIT_AUDIO,    L"The default or selected audio plugin is missing or invalid.\n\nYou need to go into Settings and select a audio (sound) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+    DEF_STR(MSG_FAIL_INIT_RSP,      L"The default or selected RSP plugin is missing or invalid.\n\nYou need to go into Settings and select a RSP (Reality Signal Processor) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+    DEF_STR(MSG_FAIL_INIT_CONTROL,  L"The default or selected input plugin is missing or invalid.\n\nYou need to go into Settings and select an input (controller) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+    DEF_STR(MSG_FAIL_LOAD_PLUGIN,   L"Failed to load plugin:");
+    DEF_STR(MSG_FAIL_LOAD_WORD,     L"Failed to load word.\n\nVerify ROM and its settings.");
+    DEF_STR(MSG_FAIL_OPEN_SAVE,     L"Failed to open save file");
+    DEF_STR(MSG_FAIL_OPEN_EEPROM,   L"Failed to open EEPROM");
+    DEF_STR(MSG_FAIL_OPEN_FLASH,    L"Failed to open flash RAM");
+    DEF_STR(MSG_FAIL_OPEN_MEMPAK,   L"Failed to open mempak");
+    DEF_STR(MSG_FAIL_OPEN_ZIP,      L"Attempt to open zip file failed.\n\nProbably a corrupt zip file - try unzipping ROM manually.");
+    DEF_STR(MSG_FAIL_OPEN_IMAGE,    L"Attempt to open file failed.");
+    DEF_STR(MSG_FAIL_ZIP,           L"Error occurred when trying to open zip file.");
+    DEF_STR(MSG_FAIL_IMAGE,         L"File loaded does not appear to be a valid N64 ROM.\n\nVerify your ROMs with GoodN64.");
+    DEF_STR(MSG_UNKNOWN_COUNTRY,    L"Unknown country");
+    DEF_STR(MSG_UNKNOWN_CIC_CHIP,   L"Unknown CIC chip");
+    DEF_STR(MSG_UNKNOWN_FILE_FORMAT,L"Unknown file format");
+    DEF_STR(MSG_UNKNOWN_MEM_ACTION, L"Unknown memory action\n\nEmulation stopped");
+    DEF_STR(MSG_UNHANDLED_OP,       L"Unhandled R4300i opcode at");
+    DEF_STR(MSG_NONMAPPED_SPACE,    L"Executing from non-mapped space.\n\nVerify ROM and its settings.");
+    DEF_STR(MSG_SAVE_STATE_HEADER,  L"This saved state does not appear to match the running ROM.\n\nStates must be saved & loaded between 100% identical ROMs.\nIn particular, the REGION and VERSION need to be the same.\nLoading this state is likely to cause the game and/or emulator to crash.\n\nAre you sure you want to continue loading?");
+    DEF_STR(MSG_MSGBOX_TITLE,       L"Error");
+    DEF_STR(MSG_PIF2_ERROR,         L"Copyright sequence not found in LUT. Game will no longer function.");
+    DEF_STR(MSG_PIF2_TITLE,         L"Copy Protection Failure");
+    DEF_STR(MSG_PLUGIN_CHANGE,      L"Changing a plugin requires Project64 to reset a running ROM.\nIf you don't want to lose your place, answer No and save the current state first.\n\nChange plugins and reset ROM now?");
+    DEF_STR(MSG_PLUGIN_CHANGE_TITLE,L"Change Plugins");
+    DEF_STR(MSG_EMULATION_ENDED,    L"Emulation ended");
+    DEF_STR(MSG_EMULATION_STARTED,  L"Emulation started");
+    DEF_STR(MSG_UNABLED_LOAD_STATE, L"Unable to load state");
+    DEF_STR(MSG_LOADED_STATE,       L"Loaded state");
+    DEF_STR(MSG_SAVED_STATE,        L"Saved current state to");
+    DEF_STR(MSG_SAVE_SLOT,          L"State slot");
+    DEF_STR(MSG_BYTESWAP,           L"Byte-swapping image");
+    DEF_STR(MSG_CHOOSE_IMAGE,       L"Choosing N64 image");
+    DEF_STR(MSG_LOADED,             L"Loaded");
+    DEF_STR(MSG_LOADING,            L"Loading image");
+    DEF_STR(MSG_PLUGIN_NOT_INIT,    L"Cannot open a ROM because plugins have not successfully initialized.");
+    DEF_STR(MSG_DEL_SURE,           L"Are you sure you really want to delete this?");
+    DEF_STR(MSG_DEL_TITLE,          L"Delete Cheat");
+    DEF_STR(MSG_CHEAT_NAME_IN_USE,  L"Cheat name is already in use.");
+    DEF_STR(MSG_MAX_CHEATS,         L"You have reached the maximum amount of cheats for this ROM.");
+    DEF_STR(MSG_PLUGIN_INIT,		L"Plugin initializing");
+    DEF_STR(MSG_NO_SHORTCUT_SEL,	L"You have not selected a virtual key to assign to the menu item.");
+    DEF_STR(MSG_NO_MENUITEM_SEL,	L"You need to select a menu item to assign this key to.");
+    DEF_STR(MSG_MENUITEM_ASSIGNED,	L"Short-cut has already been assigned to another menu item.");
+    DEF_STR(MSG_NO_SEL_SHORTCUT,	L"No shortcut has been selected to be removed.");
+    DEF_STR(MSG_WAITING_FOR_START,	L"ROM loaded. Waiting for emulation to start.");
+    DEF_STR(MSG_INVALID_EXE,		L"Project64 Beta is for members only.\n\nIf you have an account at www.pj64-emu.com, you should not be seeing this error!!\nPlease contact us on the site.");
+    DEF_STR(MSG_INVALID_EXE_TITLE,  L"Program Error");
+    DEF_STR(MSG_7Z_FILE_NOT_FOUND,  L"Failed to find filename in 7z file");
+    DEF_STR(MSG_SET_LLE_GFX_TITLE,  L"Graphics Low-Level Emulation");
+    DEF_STR(MSG_SET_LLE_GFX_MSG,    L"Graphics LLE is not for general use!!!\nIt is advisable that you only use this for testing and not for playing games.\n\nChange to graphics LLE?");
+    DEF_STR(MSG_SET_HLE_AUD_TITLE,  L"Audio High-Level Emulation");
+    DEF_STR(MSG_SET_HLE_AUD_MSG,    L"Audio HLE requires a third-party plugin!!!\nIf you do not use a third-party audio plugin that supports HLE, you will hear no sound.\n\nChange to audio HLE?");
 }
 
-LRESULT CALLBACK LangSelectProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
 CLanguage::CLanguage() :
-	m_emptyString(L"")
+    m_emptyString(L""),
+	m_LanguageLoaded(false)
 {
-	LoadDefaultStrings();
+    LoadDefaultStrings();
+	if (g_Settings)
+	{
+		m_SelectedLanguage = g_Settings->LoadStringVal(Setting_CurrentLanguage).ToUTF16();
+	}
 }
 
-void CLanguage::LoadCurrentStrings ( bool ShowSelectDialog ) 
+bool CLanguage::LoadCurrentStrings ( void )
 {
-	if (ShowSelectDialog)
-	{
-        m_SelectedLanguage = g_Settings->LoadString(Setting_CurrentLanguage).ToUTF16();
-	}
-	
-	LanguageList LangList = GetLangList();
-	stdstr       Filename;
+    LanguageList LangList = GetLangList();
+    stdstr       Filename;
 
-	//clear all the current strings loaded
-	m_CurrentStrings.clear();
+    //clear all the current strings loaded
+    m_CurrentStrings.clear();
 
-	//Find the file name of the current language
-	for (LanguageList::iterator Language = LangList.begin(); Language != LangList.end(); Language++)
+    //Find the file name of the current language
+    for (LanguageList::iterator Language = LangList.begin(); Language != LangList.end(); Language++)
     {
-		if (g_Lang->IsCurrentLang(*Language))
-		{
-			Filename = Language->Filename;
-			break;
-		}
-	}
-	if (ShowSelectDialog && Filename.length() == 0 && LangList.size() > 0) 
-	{ 	
-		//Do Dialog box to choose language
-		DialogBoxParam(GetModuleHandle(NULL),MAKEINTRESOURCE(IDD_Lang_Select),NULL,(DLGPROC)LangSelectProc, (LPARAM)this);
-		return; 
-	}
-	
-	if (Filename.length() == 0)
-	{
-		return;
-	}
+        if (g_Lang->IsCurrentLang(*Language))
+        {
+            Filename = Language->Filename;
+            break;
+        }
+    }
 
-	//Process the file
-	FILE *file = fopen(Filename.c_str(), "rb");
-	if (file == NULL) { return; }
+    if (Filename.length() == 0)
+    {
+        return false;
+    }
 
-	//Search for utf8 file marker
-	BYTE utf_bom[3];
-	if (fread(&utf_bom, sizeof(utf_bom),1,file) != 1 ||
-		utf_bom[0] != 0xEF || 
-		utf_bom[1] != 0xBB ||
-		utf_bom[2] != 0xBF)
-	{
-		fclose(file);
-		return;
-	}
+    //Process the file
+    FILE *file = fopen(Filename.c_str(), "rb");
+    if (file == NULL)
+    {
+        return false;
+    }
 
-	//String;
-	while(!feof(file))
-	{
-		m_CurrentStrings.insert(GetNextLangString(file));
-	}		
-	fclose(file);
+    //Search for utf8 file marker
+    uint8_t utf_bom[3];
+    if (fread(&utf_bom, sizeof(utf_bom),1,file) != 1 ||
+        utf_bom[0] != 0xEF ||
+        utf_bom[1] != 0xBB ||
+        utf_bom[2] != 0xBF)
+    {
+        fclose(file);
+        return false;
+    }
+
+    //String;
+    while (!feof(file))
+    {
+        m_CurrentStrings.insert(GetNextLangString(file));
+    }
+    fclose(file);
+	m_LanguageLoaded = true;
+	return true;
 }
 
-WNDPROC pfnWndLangSelectOkProc = NULL;
-HBITMAP hOkButton = NULL;
-
-DWORD CALLBACK LangSelectOkProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) 
-{		
-	static bool m_fPressed = false;
-	static HBITMAP hOkButtonDown = NULL;
-	
-	switch (uMsg) {
-	case WM_PAINT:
-		{
-			PAINTSTRUCT ps;
-
-			if (BeginPaint(hWnd,&ps))
-			{
-				if (m_fPressed)
-				{
-					if (hOkButtonDown == NULL)
-					{
-						hOkButtonDown = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_LANG_OK_DOWN)); 
-					}
-					if (hOkButtonDown)
-					{
-						RECT rcClient;
-						GetClientRect(hWnd, &rcClient);
-
-						BITMAP bmTL1;
-						GetObject(hOkButtonDown, sizeof(BITMAP), &bmTL1);
-						HDC     memdc	= CreateCompatibleDC(ps.hdc);
-						HGDIOBJ save	= SelectObject(memdc, hOkButtonDown);
-						BitBlt(ps.hdc, 0, 0, bmTL1.bmWidth, bmTL1.bmHeight, memdc, 0, 0, SRCCOPY);
-						SelectObject(memdc, save);
-						DeleteDC(memdc);
-					}
-				} else {
-					if (hOkButton)
-					{
-						RECT rcClient;
-						GetClientRect(hWnd, &rcClient);
-
-						BITMAP bmTL1;
-						GetObject(hOkButton, sizeof(BITMAP), &bmTL1);
-						HDC     memdc	= CreateCompatibleDC(ps.hdc);
-						HGDIOBJ save	= SelectObject(memdc, hOkButton);
-						BitBlt(ps.hdc, 0, 0, bmTL1.bmWidth, bmTL1.bmHeight, memdc, 0, 0, SRCCOPY);
-						SelectObject(memdc, save);
-						DeleteDC(memdc);
-					}
-				}
-				EndPaint(hWnd,&ps);
-			}
-		}
-		break;
-	case WM_MOUSEMOVE:
-		if(::GetCapture() == hWnd) 
-		{
-			POINT ptCursor = { ((int)(short)LOWORD(lParam)), ((int)(short)HIWORD(lParam)) };
-			ClientToScreen(hWnd, &ptCursor);
-			RECT rect;
-			GetWindowRect(hWnd, &rect);
-			bool uPressed = ::PtInRect(&rect, ptCursor)==TRUE;
-			if( m_fPressed != uPressed ) 
-			{
-				m_fPressed = uPressed;
-				::InvalidateRect(hWnd, NULL, TRUE);
-				UpdateWindow(hWnd);
-			}
-		}
-		break;
-	case WM_LBUTTONDOWN:
-		{
-			LRESULT lRet = 0;
-			lRet = DefWindowProc(hWnd, uMsg, wParam, lParam);
-			SetCapture(hWnd);
-			if( ::GetCapture()==hWnd ) 
-			{
-				m_fPressed = true;
-
-				if (m_fPressed)
-				{
-					::InvalidateRect(hWnd, NULL, TRUE);
-					UpdateWindow(hWnd);
-				}
-			}
-			return lRet;
-		}
-		break;
-	case WM_LBUTTONUP:
-		{
-			LRESULT lRet = 0;
-			lRet = DefWindowProc(hWnd, uMsg, wParam, lParam);
-			if(::GetCapture() == hWnd ) 
-			{
-				::ReleaseCapture();
-				if( m_fPressed )   
-				{
-					::SendMessage(GetParent(hWnd), WM_COMMAND, MAKEWPARAM(GetDlgCtrlID(hWnd), BN_CLICKED), (LPARAM)hWnd);
-				}
-			}
-			m_fPressed = false;
-
-			return lRet;
-		}
-		break;
-	}
-			
-	return CallWindowProc(pfnWndLangSelectOkProc, hWnd, uMsg, wParam, lParam);
-}
-
-LRESULT CALLBACK LangSelectProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) 
+LanguageList & CLanguage::GetLangList (void)
 {
-	static HBITMAP hbmpBackgroundTop = NULL;
-	static HBITMAP hbmpBackgroundBottom = NULL;
-	static HBITMAP hbmpBackgroundMiddle = NULL;
-	static HFONT   hTextFont = NULL;
-	static CLanguage * lngClass;
+    if (m_LanguageList.size() > 0)
+    {
+        return m_LanguageList;
+    }
 
-	switch (uMsg) {
-	case WM_INITDIALOG:
-		SetWindowPos(hDlg,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE);
-		{
-			lngClass = (CLanguage *)lParam;
-			
-			LanguageList LangList = lngClass->GetLangList();
-			if (LangList.size() == 0) { EndDialog(hDlg,0); }
-			for (LanguageList::iterator Language = LangList.begin(); Language != LangList.end(); Language++) 
-			{
-				int index = SendMessageW(GetDlgItem(hDlg,IDC_LANG_SEL),CB_ADDSTRING,0,(WPARAM)Language->LanguageName.c_str());
-				if (_wcsicmp(Language->LanguageName.c_str(),L"English") == 0) 
-                {
-					SendMessage(GetDlgItem(hDlg,IDC_LANG_SEL),CB_SETCURSEL,index,0);
-				}
-			}
+    CPath LanguageFiles(g_Settings->LoadStringVal(Setting_LanguageDir),"*.pj.Lang");
+    if (LanguageFiles.FindFirst())
+    {
+        do
+        {
+            LanguageFile File; //We temporally store the values in here to added to the list
 
-			
-			int Index = SendMessage(GetDlgItem(hDlg,IDC_LANG_SEL),CB_GETCURSEL,0,0);
-			if (Index < 0) { SendMessage(GetDlgItem(hDlg,IDC_LANG_SEL),CB_SETCURSEL,0,0); }
+			File.Filename = (std::string &)LanguageFiles;
+            File.LanguageName = GetLangString(LanguageFiles,LANGUAGE_NAME);
 
-		
-			enum { ROUND_EDGE = 15 };
+            if (File.LanguageName.length() == 0)
+            {
+                continue;
+            }
 
-			DWORD dwStyle = GetWindowLong(hDlg, GWL_STYLE);
-			dwStyle &= ~(WS_CAPTION|WS_SIZEBOX);
-			SetWindowLong(hDlg, GWL_STYLE, dwStyle);
-
-			// Use the size of the image
-			hbmpBackgroundTop    = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_ABOUT_TOP)); 
-			hbmpBackgroundBottom = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_ABOUT_BOTTOM)); 
-			hbmpBackgroundMiddle = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_ABOUT_MIDDLE)); 
-			BITMAP bmTL;
-			GetObject(hbmpBackgroundTop, sizeof(BITMAP), &bmTL);
-
-
-			if (hbmpBackgroundTop)
-			{
-//				int iHeight = bmTL.bmHeight;
-				int iWidth  = bmTL.bmWidth;
-
-				RECT rect;
-				GetWindowRect(hDlg, &rect);
-				rect.left -= rect.left;
-				rect.bottom -= rect.top;
-				rect.top -= rect.top;
-
-				// Tweaked
-				HRGN hWindowRegion= CreateRoundRectRgn
-				(
-					rect.left,
-					rect.top,
-					rect.left+iWidth+GetSystemMetrics(SM_CXEDGE)-1,
-					rect.bottom+GetSystemMetrics(SM_CYEDGE)-1,
-					ROUND_EDGE,
-					ROUND_EDGE
-				);
-
-				if (hWindowRegion)
-				{
-					SetWindowRgn(hDlg, hWindowRegion, TRUE);
-					DeleteObject(hWindowRegion);
-				}
-			}
-			hTextFont = ::CreateFont
-			(
-				18, 
-				0,
-				0, 
-				0, 
-				FW_NORMAL,
-				0,
-				0,
-				0,
-				DEFAULT_CHARSET,
-				OUT_DEFAULT_PRECIS,
-				CLIP_DEFAULT_PRECIS,
-				PROOF_QUALITY,
-				DEFAULT_PITCH|FF_DONTCARE,
-				_T("Arial")
-			);
-			SendDlgItemMessage(hDlg,IDC_SELECT_LANG,WM_SETFONT,(WPARAM)hTextFont,TRUE);
-		}
-		
-		hOkButton                = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_LANG_OK)); 
-		pfnWndLangSelectOkProc   = (WNDPROC)::GetWindowLongPtr(GetDlgItem(hDlg,IDOK), GWLP_WNDPROC);
-		::SetWindowLongPtr(GetDlgItem(hDlg,IDOK), GWLP_WNDPROC,(LONG_PTR)LangSelectOkProc);
-		break;
-	case WM_NCHITTEST:
-		{
-			int xPos = LOWORD(lParam); 
-			int yPos = HIWORD(lParam); 
-			RECT client, a;
-			GetClientRect(hDlg,&a);
-			GetClientRect(hDlg,&client);
-			ClientToScreen(hDlg,(LPPOINT)&client);
-			client.right += client.left;
-			client.bottom += client.top;
-
-
-			int nCaption = GetSystemMetrics(SM_CYCAPTION)*4;
-
-			LRESULT lResult = HTCLIENT;
-
-			//check caption
-			if (xPos <= client.right && xPos >= client.left && 
-				(yPos >= client.top+ 0)&& (yPos <= client.top + 0+nCaption))
-			{
-				lResult = HTCAPTION;
-			}
-			SetWindowLong(hDlg, DWL_MSGRESULT, lResult);
-
-			return TRUE;
-
-		}
-		break;
-	case WM_CTLCOLORSTATIC:
-		{
-			HDC hdcStatic = (HDC)wParam;
-			SetTextColor(hdcStatic, RGB(0, 0, 0));
-			SetBkMode(hdcStatic, TRANSPARENT);
-			return (LONG)(LRESULT)((HBRUSH)GetStockObject(NULL_BRUSH));
-		}
-		break;
-	case WM_PAINT:
-		{
-			PAINTSTRUCT ps;
-
-			if (BeginPaint(hDlg,&ps))
-			{
-				RECT rcClient;
-				GetClientRect(hDlg, &rcClient);
-
-				BITMAP bmTL_top, bmTL_bottom, bmTL_Middle;
-				GetObject(hbmpBackgroundTop, sizeof(BITMAP), &bmTL_top);
-				GetObject(hbmpBackgroundBottom, sizeof(BITMAP), &bmTL_bottom);
-				GetObject(hbmpBackgroundMiddle, sizeof(BITMAP), &bmTL_Middle);
-
-				HDC     memdc	= CreateCompatibleDC(ps.hdc);
-				HGDIOBJ save	= SelectObject(memdc, hbmpBackgroundTop);
-				BitBlt(ps.hdc, 0, 0, bmTL_top.bmWidth, bmTL_top.bmHeight, memdc, 0, 0, SRCCOPY);
-				SelectObject(memdc, save);
-				DeleteDC(memdc);
-
-				
-				memdc	= CreateCompatibleDC(ps.hdc);
-				save	= SelectObject(memdc, hbmpBackgroundMiddle);
-				for (int x = bmTL_top.bmHeight; x < rcClient.bottom; x += bmTL_Middle.bmHeight)
-				{
-					//BitBlt(ps.hdc, 0, bmTL_top.bmHeight, bmTL_Middle.bmWidth, rcClient.bottom - (bmTL_bottom.bmHeight + bmTL_top.bmHeight), memdc, 0, 0, SRCCOPY);
-					BitBlt(ps.hdc, 0, x, bmTL_Middle.bmWidth, bmTL_Middle.bmHeight, memdc, 0, 0, SRCCOPY);
-				}
-				SelectObject(memdc, save);
-				DeleteDC(memdc);
-
-				BITMAP ;
-				memdc	= CreateCompatibleDC(ps.hdc);
-				save	= SelectObject(memdc, hbmpBackgroundBottom);
-				BitBlt(ps.hdc, 0, rcClient.bottom - bmTL_bottom.bmHeight, bmTL_bottom.bmWidth, bmTL_bottom.bmHeight, memdc, 0, 0, SRCCOPY);
-				SelectObject(memdc, save);
-				DeleteDC(memdc);
-
-				BITMAP ;
-
-				EndPaint(hDlg,&ps);
-			}
-		}
-		break;
-	case WM_COMMAND:
-		switch (LOWORD(wParam)) {
-		case IDOK:
-			if (hbmpBackgroundTop)
-			{
-				DeleteObject(hbmpBackgroundTop);
-			}
-			if (hbmpBackgroundBottom)
-			{
-				DeleteObject(hbmpBackgroundBottom);
-			}
-			if (hbmpBackgroundMiddle)
-			{
-				DeleteObject(hbmpBackgroundMiddle);
-			}
-
-			if (hTextFont)
-			{
-				::DeleteObject(hTextFont);
-			}
-
-			{
-				int Index = SendMessage(GetDlgItem(hDlg,IDC_LANG_SEL),CB_GETCURSEL,0,0);
-				
-				if (Index >= 0) 
-				{ 
-					wchar_t String[255];
-					SendMessageW(GetDlgItem(hDlg,IDC_LANG_SEL),CB_GETLBTEXT,Index,(LPARAM)String);
-					lngClass->SetLanguage(String);
-				}
-			}
-
-			EndDialog(hDlg,0);
-			break;
-		}
-	default:
-		return FALSE;
-	}
-	return TRUE;
-}
-
-
-LanguageList & CLanguage::GetLangList (void) 
-{
-	if (m_LanguageList.size() > 0)
-	{
-		return m_LanguageList;
-	}
-
-	CPath LanguageFiles(g_Settings->LoadString(Setting_LanguageDir),"*.pj.Lang");
-	if (LanguageFiles.FindFirst())
-	{
-		do 
-		{
-			LanguageFile File; //We temporally store the values in here to added to the list
-
-			File.Filename     = LanguageFiles;
-			File.LanguageName = GetLangString(LanguageFiles,LANGUAGE_NAME);
-
-			if (File.LanguageName.length() == 0)
-			{
-				continue;
-			}
-
-			//get the name of the language from inside the file
-			m_LanguageList.push_back(File);
-		} while (LanguageFiles.FindNext());
-	}
-	return m_LanguageList;
+            //get the name of the language from inside the file
+            m_LanguageList.push_back(File);
+        } while (LanguageFiles.FindNext());
+    }
+    return m_LanguageList;
 }
 
 const std::wstring & CLanguage::GetString (LanguageStringID StringID)
-{	
-	LANG_STRINGS::iterator CurrentString = m_CurrentStrings.find(StringID);
-	if (CurrentString != m_CurrentStrings.end())
-	{
-		return CurrentString->second;
-	}
+{
+    LANG_STRINGS::iterator CurrentString = m_CurrentStrings.find(StringID);
+    if (CurrentString != m_CurrentStrings.end())
+    {
+        return CurrentString->second;
+    }
 
-	LANG_STRINGS::iterator DefString = m_DefaultStrings.find(StringID);
-	if (DefString != m_DefaultStrings.end()) 
-	{
-		return DefString->second;
-	}
+    LANG_STRINGS::iterator DefString = m_DefaultStrings.find(StringID);
+    if (DefString != m_DefaultStrings.end())
+    {
+        return DefString->second;
+    }
 #ifdef _DEBUG
-	g_Notify->BreakPoint(__FILEW__,__LINE__);
-#endif	
-	return m_emptyString;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+#endif
+    return m_emptyString;
 }
 
-std::wstring CLanguage::GetLangString ( const char * FileName, LanguageStringID ID ) 
+std::wstring CLanguage::GetLangString ( const char * FileName, LanguageStringID ID )
 {
-	FILE *file = fopen(FileName, "rb");
-	if (file == NULL) { return L""; }
+    FILE *file = fopen(FileName, "rb");
+    if (file == NULL)
+    {
+        return L"";
+    }
 
-	//Search for utf8 file marker
-	BYTE utf_bom[3];
-	if (fread(&utf_bom, sizeof(utf_bom),1,file) != 1 ||
-		utf_bom[0] != 0xEF || 
-		utf_bom[1] != 0xBB ||
-		utf_bom[2] != 0xBF)
-	{
-		return L"";
-	}
+    //Search for utf8 file marker
+    uint8_t utf_bom[3];
+    if (fread(&utf_bom, sizeof(utf_bom),1,file) != 1 ||
+        utf_bom[0] != 0xEF ||
+        utf_bom[1] != 0xBB ||
+        utf_bom[2] != 0xBF)
+    {
+        fclose(file);
+        return L"";
+    }
 
-	//String;
-	while(!feof(file))
-	{
-		LANG_STR String = GetNextLangString(file);
-		if (String.first == ID) 
-		{
-			fclose(file);
-			return String.second;
-		}
-	}		
-	fclose(file);
-	return L"";
-}	
-
-LANG_STR CLanguage::GetNextLangString (void * OpenFile) 
-{
-	enum { MAX_STRING_LEN = 400 }; 
-	int  StringID;
-	char szString[MAX_STRING_LEN];  //temp store the string from the file
-
-	FILE * file = (FILE *)OpenFile;
-
-	//while(token!='#' && !feof(file)) { fread(&token, 1, 1, file); }
-	if(feof(file)){ return LANG_STR(0,L""); } 
-
-	//Search for token #
-	char token=0;
-	while(token!='#' && !feof(file)) { fread(&token, 1, 1, file); }
-	if(feof(file)){ return LANG_STR(0,L""); } 
-		
-	//get StringID after token
-	fscanf(file, "%d", &StringID);
-	
-	//Search for token #
-	while(token!='#' && !feof(file)) { fread(&token, 1, 1, file); }
-	if(feof(file)){ StringID = EMPTY_STRING; return LANG_STR(0,L""); } 
-
-	//Search for start of string '"'
-	while(token!='"' && !feof(file)) { fread(&token, 1, 1, file); }
-	if(feof(file)){ StringID = EMPTY_STRING; return LANG_STR(0,L""); } 		
-
-	int pos = 0;
-	fread(&token, 1, 1, file); 
-	while(token!='"' && !feof(file))
-	{ 
-		szString[pos++] = token;
-		fread(&token, 1, 1, file); 
-		if (pos == MAX_STRING_LEN - 2) { token = '"'; }
-	}
-	szString[pos++] = 0;
-	stdstr text(szString);
-	text.Replace("\\n","\n");
-	return LANG_STR(StringID,text.ToUTF16());
+    //String;
+    while (!feof(file))
+    {
+        LANG_STR String = GetNextLangString(file);
+        if (String.first == ID)
+        {
+            fclose(file);
+            return String.second;
+        }
+    }
+    fclose(file);
+    return L"";
 }
 
-void CLanguage::SetLanguage ( const wchar_t * LanguageName ) 
+LANG_STR CLanguage::GetNextLangString (void * OpenFile)
 {
-	m_SelectedLanguage = LanguageName;
-	LoadCurrentStrings(false);
-	stdstr Language;
-	Language.FromUTF16(LanguageName);
-	g_Settings->SaveString(Setting_CurrentLanguage,Language);
+    enum { MAX_STRING_LEN = 400 };
+    int  StringID;
+    char szString[MAX_STRING_LEN];  //temp store the string from the file
+
+    FILE * file = (FILE *)OpenFile;
+
+    //while(token!='#' && !feof(file)) { fread(&token, 1, 1, file); }
+    if (feof(file))
+    {
+        return LANG_STR(0,L"");
+    }
+
+    //Search for token #
+    char token=0;
+    while (token!='#' && !feof(file))
+    {
+        fread(&token, 1, 1, file);
+    }
+    if (feof(file))
+    {
+        return LANG_STR(0,L"");
+    }
+
+    //get StringID after token
+    fscanf(file, "%d", &StringID);
+
+    //Search for token #
+    while(token!='#' && !feof(file))
+    {
+        fread(&token, 1, 1, file);
+    }
+    if (feof(file))
+    {
+        StringID = EMPTY_STRING; return LANG_STR(0,L"");
+    }
+
+    //Search for start of string '"'
+    while (token!='"' && !feof(file))
+    {
+        fread(&token, 1, 1, file);
+    }
+    if (feof(file))
+    {
+        StringID = EMPTY_STRING; return LANG_STR(0,L"");
+    }
+
+    int pos = 0;
+    fread(&token, 1, 1, file);
+    while (token!='"' && !feof(file))
+    {
+        szString[pos++] = token;
+        fread(&token, 1, 1, file);
+        if (pos == MAX_STRING_LEN - 2)
+        {
+            token = '"';
+        }
+    }
+    szString[pos++] = 0;
+    stdstr text(szString);
+    text.Replace("\\n","\n");
+    return LANG_STR(StringID,text.ToUTF16());
+}
+
+void CLanguage::SetLanguage ( const wchar_t * LanguageName )
+{
+    m_SelectedLanguage = LanguageName;
+    if (LoadCurrentStrings())
+	{
+		stdstr Language;
+		Language.FromUTF16(LanguageName);
+		g_Settings->SaveString(Setting_CurrentLanguage,Language);
+	}
 }
 
 bool CLanguage::IsCurrentLang( LanguageFile & File )
 {
-	if (m_SelectedLanguage == File.LanguageName)
-	{
-		return true;
-	}
-	return false;
+    if (m_SelectedLanguage == File.LanguageName)
+    {
+        return true;
+    }
+    return false;
 }
diff --git a/Source/Project64/Multilanguage/Language Class.h b/Source/Project64/Multilanguage/Language Class.h
index 84af4f2b1..50cb67be1 100644
--- a/Source/Project64/Multilanguage/Language Class.h	
+++ b/Source/Project64/Multilanguage/Language Class.h	
@@ -10,8 +10,6 @@
 ****************************************************************************/
 #pragma once
 
-#include "..\support.h"
-
 #pragma warning(disable:4786)
 #include <string>   //stl string
 #include <map>      //stl map
@@ -20,10 +18,11 @@
 typedef std::map<int, std::wstring, std::less<int> > LANG_STRINGS;
 typedef LANG_STRINGS::value_type               LANG_STR;
 
-typedef struct {
-	stdstr Filename;
-	std::wstring LanguageName;
-} LanguageFile;
+struct LanguageFile
+{
+    std::string Filename;
+    std::wstring LanguageName;
+};
 
 typedef std::list<LanguageFile> LanguageList;
 
@@ -32,30 +31,33 @@ class CLanguage
 public:
     CLanguage ();
 
-	const std::wstring & GetString ( LanguageStringID StringID );
-	LanguageList & GetLangList ( void );
-	void SetLanguage ( const wchar_t * LanguageName );
-	void LoadCurrentStrings ( bool ShowSelectDialog );
-	bool IsCurrentLang ( LanguageFile & File );
+    const std::wstring & GetString ( LanguageStringID StringID );
+    LanguageList & GetLangList ( void );
+    void SetLanguage ( const wchar_t * LanguageName );
+    bool LoadCurrentStrings ( void );
+    bool IsCurrentLang ( LanguageFile & File );
+	bool IsLanguageLoaded ( void ) const { return m_LanguageLoaded; }
 
 private:
-	CLanguage(const CLanguage&);				// Disable copy constructor
-	CLanguage& operator=(const CLanguage&);		// Disable assignment
+    CLanguage(const CLanguage&);				// Disable copy constructor
+    CLanguage& operator=(const CLanguage&);		// Disable assignment
 
-	std::wstring m_SelectedLanguage;
-	const std::wstring m_emptyString;
+    std::wstring m_SelectedLanguage;
+    const std::wstring m_emptyString;
 
-	LANG_STRINGS m_CurrentStrings, m_DefaultStrings;
-	LanguageList m_LanguageList;
+    LANG_STRINGS m_CurrentStrings, m_DefaultStrings;
+    LanguageList m_LanguageList;
 
-	std::wstring GetLangString ( const char * FileName, LanguageStringID ID );
-	LANG_STR GetNextLangString ( void * OpenFile );
-	void LoadDefaultStrings ( void );
+    std::wstring GetLangString ( const char * FileName, LanguageStringID ID );
+    LANG_STR GetNextLangString ( void * OpenFile );
+    void LoadDefaultStrings ( void );
+
+	bool m_LanguageLoaded;
 };
 
 extern CLanguage * g_Lang;
 
-inline LPCWSTR GS (LanguageStringID StringID)
+inline const wchar_t * GS (LanguageStringID StringID)
 {
-	return g_Lang->GetString(StringID).c_str();
+    return g_Lang->GetString(StringID).c_str();
 }
diff --git a/Source/Project64/Multilanguage/LanguageSelector.cpp b/Source/Project64/Multilanguage/LanguageSelector.cpp
new file mode 100644
index 000000000..e317d6b8b
--- /dev/null
+++ b/Source/Project64/Multilanguage/LanguageSelector.cpp
@@ -0,0 +1,351 @@
+/****************************************************************************
+*                                                                           *
+* Project 64 - A Nintendo 64 emulator.                                      *
+* http://www.pj64-emu.com/                                                  *
+* Copyright (C) 2012 Project64. All rights reserved.                        *
+*                                                                           *
+* License:                                                                  *
+* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html                        *
+*                                                                           *
+****************************************************************************/
+#include "stdafx.h"
+#include "LanguageSelector.h"
+
+CLanguageSelector::CLanguageSelector()
+{
+}
+
+void CLanguageSelector::Select ( void ) 
+{
+    DialogBoxParam(GetModuleHandle(NULL),MAKEINTRESOURCE(IDD_Lang_Select),NULL,(DLGPROC)LangSelectProc, (LPARAM)this);
+}
+
+static WNDPROC pfnWndLangSelectOkProc = NULL;
+static HBITMAP hOkButton = NULL;
+
+DWORD CALLBACK LangSelectOkProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam)
+{
+    static bool m_fPressed = false;
+    static HBITMAP hOkButtonDown = NULL;
+
+    switch (uMsg)
+    {
+    case WM_PAINT:
+        {
+            PAINTSTRUCT ps;
+
+            if (BeginPaint(hWnd,&ps))
+            {
+                if (m_fPressed)
+                {
+                    if (hOkButtonDown == NULL)
+                    {
+                        hOkButtonDown = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_LANG_OK_DOWN));
+                    }
+                    if (hOkButtonDown)
+                    {
+                        RECT rcClient;
+                        GetClientRect(hWnd, &rcClient);
+
+                        BITMAP bmTL1;
+                        GetObject(hOkButtonDown, sizeof(BITMAP), &bmTL1);
+                        HDC     memdc	= CreateCompatibleDC(ps.hdc);
+                        HGDIOBJ save	= SelectObject(memdc, hOkButtonDown);
+                        BitBlt(ps.hdc, 0, 0, bmTL1.bmWidth, bmTL1.bmHeight, memdc, 0, 0, SRCCOPY);
+                        SelectObject(memdc, save);
+                        DeleteDC(memdc);
+                    }
+                }
+                else
+                {
+                    if (hOkButton)
+                    {
+                        RECT rcClient;
+                        GetClientRect(hWnd, &rcClient);
+
+                        BITMAP bmTL1;
+                        GetObject(hOkButton, sizeof(BITMAP), &bmTL1);
+                        HDC     memdc	= CreateCompatibleDC(ps.hdc);
+                        HGDIOBJ save	= SelectObject(memdc, hOkButton);
+                        BitBlt(ps.hdc, 0, 0, bmTL1.bmWidth, bmTL1.bmHeight, memdc, 0, 0, SRCCOPY);
+                        SelectObject(memdc, save);
+                        DeleteDC(memdc);
+                    }
+                }
+                EndPaint(hWnd,&ps);
+            }
+        }
+        break;
+    case WM_MOUSEMOVE:
+        if (::GetCapture() == hWnd)
+        {
+            POINT ptCursor = { ((int)(short)LOWORD(lParam)), ((int)(short)HIWORD(lParam)) };
+            ClientToScreen(hWnd, &ptCursor);
+            RECT rect;
+            GetWindowRect(hWnd, &rect);
+            bool uPressed = ::PtInRect(&rect, ptCursor)==TRUE;
+            if ( m_fPressed != uPressed )
+            {
+                m_fPressed = uPressed;
+                ::InvalidateRect(hWnd, NULL, TRUE);
+                UpdateWindow(hWnd);
+            }
+        }
+        break;
+    case WM_LBUTTONDOWN:
+        {
+            LRESULT lRet = 0;
+            lRet = DefWindowProc(hWnd, uMsg, wParam, lParam);
+            SetCapture(hWnd);
+            if ( ::GetCapture()==hWnd )
+            {
+                m_fPressed = true;
+
+                if (m_fPressed)
+                {
+                    ::InvalidateRect(hWnd, NULL, TRUE);
+                    UpdateWindow(hWnd);
+                }
+            }
+            return lRet;
+        }
+        break;
+    case WM_LBUTTONUP:
+        {
+            LRESULT lRet = 0;
+            lRet = DefWindowProc(hWnd, uMsg, wParam, lParam);
+            if ( ::GetCapture() == hWnd )
+            {
+                ::ReleaseCapture();
+                if ( m_fPressed )
+                {
+                    ::SendMessage(GetParent(hWnd), WM_COMMAND, MAKEWPARAM(GetDlgCtrlID(hWnd), BN_CLICKED), (LPARAM)hWnd);
+                }
+            }
+            m_fPressed = false;
+
+            return lRet;
+        }
+        break;
+    }
+
+    return CallWindowProc(pfnWndLangSelectOkProc, hWnd, uMsg, wParam, lParam);
+}
+
+LRESULT CALLBACK CLanguageSelector::LangSelectProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    static HBITMAP hbmpBackgroundTop = NULL;
+    static HBITMAP hbmpBackgroundBottom = NULL;
+    static HBITMAP hbmpBackgroundMiddle = NULL;
+    static HFONT   hTextFont = NULL;
+    static CLanguageSelector * lngClass;
+
+    switch (uMsg)
+    {
+    case WM_INITDIALOG:
+        SetWindowPos(hDlg,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOSIZE);
+        {
+            lngClass = (CLanguageSelector *)lParam;
+
+            LanguageList LangList = g_Lang->GetLangList();
+            if (LangList.size() == 0)
+            {
+                EndDialog(hDlg,0);
+            }
+            for (LanguageList::iterator Language = LangList.begin(); Language != LangList.end(); Language++)
+            {
+                int index = SendMessageW(GetDlgItem(hDlg,IDC_LANG_SEL),CB_ADDSTRING,0,(WPARAM)Language->LanguageName.c_str());
+                if (_wcsicmp(Language->LanguageName.c_str(),L"English") == 0)
+                {
+                    SendMessage(GetDlgItem(hDlg,IDC_LANG_SEL),CB_SETCURSEL,index,0);
+                }
+            }
+
+            int Index = SendMessage(GetDlgItem(hDlg,IDC_LANG_SEL),CB_GETCURSEL,0,0);
+            if (Index < 0)
+            {
+                SendMessage(GetDlgItem(hDlg,IDC_LANG_SEL),CB_SETCURSEL,0,0);
+            }
+
+            enum { ROUND_EDGE = 15 };
+
+            DWORD dwStyle = GetWindowLong(hDlg, GWL_STYLE);
+            dwStyle &= ~(WS_CAPTION|WS_SIZEBOX);
+            SetWindowLong(hDlg, GWL_STYLE, dwStyle);
+
+            // Use the size of the image
+            hbmpBackgroundTop    = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_ABOUT_TOP));
+            hbmpBackgroundBottom = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_ABOUT_BOTTOM));
+            hbmpBackgroundMiddle = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_ABOUT_MIDDLE));
+            BITMAP bmTL;
+            GetObject(hbmpBackgroundTop, sizeof(BITMAP), &bmTL);
+
+            if (hbmpBackgroundTop)
+            {
+                //				int iHeight = bmTL.bmHeight;
+                int iWidth  = bmTL.bmWidth;
+
+                RECT rect;
+                GetWindowRect(hDlg, &rect);
+                rect.left -= rect.left;
+                rect.bottom -= rect.top;
+                rect.top -= rect.top;
+
+                // Tweaked
+                HRGN hWindowRegion= CreateRoundRectRgn
+                    (
+                    rect.left,
+                    rect.top,
+                    rect.left+iWidth+GetSystemMetrics(SM_CXEDGE)-1,
+                    rect.bottom+GetSystemMetrics(SM_CYEDGE)-1,
+                    ROUND_EDGE,
+                    ROUND_EDGE
+                    );
+
+                if (hWindowRegion)
+                {
+                    SetWindowRgn(hDlg, hWindowRegion, TRUE);
+                    DeleteObject(hWindowRegion);
+                }
+            }
+            hTextFont = ::CreateFont
+                (
+                18,
+                0,
+                0,
+                0,
+                FW_NORMAL,
+                0,
+                0,
+                0,
+                DEFAULT_CHARSET,
+                OUT_DEFAULT_PRECIS,
+                CLIP_DEFAULT_PRECIS,
+                PROOF_QUALITY,
+                DEFAULT_PITCH|FF_DONTCARE,
+                "Arial"
+                );
+            SendDlgItemMessage(hDlg,IDC_SELECT_LANG,WM_SETFONT,(WPARAM)hTextFont,TRUE);
+        }
+
+        hOkButton                = LoadBitmap(GetModuleHandle(NULL),MAKEINTRESOURCE(IDB_LANG_OK));
+        pfnWndLangSelectOkProc   = (WNDPROC)::GetWindowLongPtr(GetDlgItem(hDlg,IDOK), GWLP_WNDPROC);
+        ::SetWindowLongPtr(GetDlgItem(hDlg,IDOK), GWLP_WNDPROC,(LONG_PTR)LangSelectOkProc);
+        break;
+    case WM_NCHITTEST:
+        {
+            int xPos = LOWORD(lParam);
+            int yPos = HIWORD(lParam);
+            RECT client, a;
+            GetClientRect(hDlg,&a);
+            GetClientRect(hDlg,&client);
+            ClientToScreen(hDlg,(LPPOINT)&client);
+            client.right += client.left;
+            client.bottom += client.top;
+
+            int nCaption = GetSystemMetrics(SM_CYCAPTION)*4;
+
+            LRESULT lResult = HTCLIENT;
+
+            //check caption
+            if (xPos <= client.right && xPos >= client.left &&
+                (yPos >= client.top+ 0)&& (yPos <= client.top + 0+nCaption))
+            {
+                lResult = HTCAPTION;
+            }
+            SetWindowLong(hDlg, DWLP_MSGRESULT, lResult);
+            return TRUE;
+        }
+        break;
+    case WM_CTLCOLORSTATIC:
+        {
+            HDC hdcStatic = (HDC)wParam;
+            SetTextColor(hdcStatic, RGB(0, 0, 0));
+            SetBkMode(hdcStatic, TRANSPARENT);
+            return (LONG)(LRESULT)((HBRUSH)GetStockObject(NULL_BRUSH));
+        }
+        break;
+    case WM_PAINT:
+        {
+            PAINTSTRUCT ps;
+
+            if (BeginPaint(hDlg,&ps))
+            {
+                RECT rcClient;
+                GetClientRect(hDlg, &rcClient);
+
+                BITMAP bmTL_top, bmTL_bottom, bmTL_Middle;
+                GetObject(hbmpBackgroundTop, sizeof(BITMAP), &bmTL_top);
+                GetObject(hbmpBackgroundBottom, sizeof(BITMAP), &bmTL_bottom);
+                GetObject(hbmpBackgroundMiddle, sizeof(BITMAP), &bmTL_Middle);
+
+                HDC     memdc	= CreateCompatibleDC(ps.hdc);
+                HGDIOBJ save	= SelectObject(memdc, hbmpBackgroundTop);
+                BitBlt(ps.hdc, 0, 0, bmTL_top.bmWidth, bmTL_top.bmHeight, memdc, 0, 0, SRCCOPY);
+                SelectObject(memdc, save);
+                DeleteDC(memdc);
+
+                memdc	= CreateCompatibleDC(ps.hdc);
+                save	= SelectObject(memdc, hbmpBackgroundMiddle);
+                for (int x = bmTL_top.bmHeight; x < rcClient.bottom; x += bmTL_Middle.bmHeight)
+                {
+                    //BitBlt(ps.hdc, 0, bmTL_top.bmHeight, bmTL_Middle.bmWidth, rcClient.bottom - (bmTL_bottom.bmHeight + bmTL_top.bmHeight), memdc, 0, 0, SRCCOPY);
+                    BitBlt(ps.hdc, 0, x, bmTL_Middle.bmWidth, bmTL_Middle.bmHeight, memdc, 0, 0, SRCCOPY);
+                }
+                SelectObject(memdc, save);
+                DeleteDC(memdc);
+
+                BITMAP ;
+                memdc	= CreateCompatibleDC(ps.hdc);
+                save	= SelectObject(memdc, hbmpBackgroundBottom);
+                BitBlt(ps.hdc, 0, rcClient.bottom - bmTL_bottom.bmHeight, bmTL_bottom.bmWidth, bmTL_bottom.bmHeight, memdc, 0, 0, SRCCOPY);
+                SelectObject(memdc, save);
+                DeleteDC(memdc);
+
+                BITMAP ;
+
+                EndPaint(hDlg,&ps);
+            }
+        }
+        break;
+    case WM_COMMAND:
+        switch (LOWORD(wParam))
+        {
+        case IDOK:
+            if (hbmpBackgroundTop)
+            {
+                DeleteObject(hbmpBackgroundTop);
+            }
+            if (hbmpBackgroundBottom)
+            {
+                DeleteObject(hbmpBackgroundBottom);
+            }
+            if (hbmpBackgroundMiddle)
+            {
+                DeleteObject(hbmpBackgroundMiddle);
+            }
+
+            if (hTextFont)
+            {
+                ::DeleteObject(hTextFont);
+            }
+
+            {
+                int Index = SendMessage(GetDlgItem(hDlg,IDC_LANG_SEL),CB_GETCURSEL,0,0);
+
+                if (Index >= 0)
+                {
+                    wchar_t String[255];
+                    SendMessageW(GetDlgItem(hDlg,IDC_LANG_SEL),CB_GETLBTEXT,Index,(LPARAM)String);
+                    g_Lang->SetLanguage(String);
+                }
+            }
+
+            EndDialog(hDlg,0);
+            break;
+        }
+    default:
+        return FALSE;
+    }
+    return TRUE;
+}
\ No newline at end of file
diff --git a/Source/Project64/Multilanguage/LanguageSelector.h b/Source/Project64/Multilanguage/LanguageSelector.h
new file mode 100644
index 000000000..bb88af757
--- /dev/null
+++ b/Source/Project64/Multilanguage/LanguageSelector.h
@@ -0,0 +1,25 @@
+/****************************************************************************
+*                                                                           *
+* Project 64 - A Nintendo 64 emulator.                                      *
+* http://www.pj64-emu.com/                                                  *
+* Copyright (C) 2012 Project64. All rights reserved.                        *
+*                                                                           *
+* License:                                                                  *
+* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html                        *
+*                                                                           *
+****************************************************************************/
+#pragma once
+
+class CLanguageSelector
+{
+public:
+    CLanguageSelector ();
+
+	void Select ( void );
+
+private:
+    CLanguageSelector(const CLanguageSelector&);				// Disable copy constructor
+    CLanguageSelector& operator=(const CLanguageSelector&);		// Disable assignment
+
+	static LRESULT CALLBACK LangSelectProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+};
\ No newline at end of file
diff --git a/Source/Project64/N64 System.h b/Source/Project64/N64 System.h
index 03c51cbf7..2b37e1ca3 100644
--- a/Source/Project64/N64 System.h	
+++ b/Source/Project64/N64 System.h	
@@ -28,6 +28,7 @@ class CNotification;
 #include "N64 System/Mips/OpCode.h"
 #include "N64 System/Recompiler/X86ops.h"
 #include "N64 System/Mips/Mempak.h"
+#include "N64 System/Mips/Rumblepak.h"
 #include "N64 System/Mips/FlashRam.h"
 #include "N64 System/Mips/Sram.h"
 #include "N64 System/Mips/Eeprom.h"
diff --git a/Source/Project64/N64 System/C Core/Logging.cpp b/Source/Project64/N64 System/C Core/Logging.cpp
index 717e76f02..3247ccca5 100644
--- a/Source/Project64/N64 System/C Core/Logging.cpp	
+++ b/Source/Project64/N64 System/C Core/Logging.cpp	
@@ -10,6 +10,8 @@
 ****************************************************************************/
 #include "stdafx.h"
 
+#include <prsht.h>
+
 void LoadLogSetting (HKEY hKey,char * String, BOOL * Value);
 void SaveLogOptions (void);
 
@@ -20,7 +22,8 @@ LRESULT CALLBACK LogRegProc     ( HWND, UINT, WPARAM, LPARAM );
 LOG_OPTIONS LogOptions,TempOptions;
 HANDLE hLogFile = NULL;
 
-void EnterLogOptions(HWND hwndOwner) {
+void EnterLogOptions(HWND hwndOwner)
+{
     PROPSHEETPAGE psp[3];
     PROPSHEETHEADER psh;
 
@@ -62,24 +65,31 @@ void EnterLogOptions(HWND hwndOwner) {
     psh.pfnCallback = NULL;
 
     LoadLogOptions(&TempOptions,TRUE);
-	PropertySheet(&psh);
+#if defined(WINDOWS_UI)
+    PropertySheet(&psh);
+#else
+    g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
     SaveLogOptions();
 	LoadLogOptions(&LogOptions, FALSE);
 	return;
 }
 
-void LoadLogOptions (LOG_OPTIONS * LogOptions, BOOL AlwaysFill) {
+void LoadLogOptions (LOG_OPTIONS * LogOptions, BOOL AlwaysFill)
+{
 	long lResult;
 	HKEY hKeyResults = 0;
 	char String[200];
 
-	sprintf(String,"Software\\N64 Emulation\\%s\\Logging",g_Settings->LoadString(Setting_ApplicationName).c_str());
+	sprintf(String,"Software\\N64 Emulation\\%s\\Logging",g_Settings->LoadStringVal(Setting_ApplicationName).c_str());
 	lResult = RegOpenKeyEx( HKEY_CURRENT_USER,String,0,KEY_ALL_ACCESS,
 		&hKeyResults);
 	
-	if (lResult == ERROR_SUCCESS) {	
+	if (lResult == ERROR_SUCCESS)
+	{	
 		//LoadLogSetting(hKeyResults,"Generate Log File",&LogOptions->GenerateLog);
-		if (LogOptions->GenerateLog || AlwaysFill) {
+		if (LogOptions->GenerateLog || AlwaysFill)
+		{
 			LoadLogSetting(hKeyResults,"Log RDRAM",&LogOptions->LogRDRamRegisters);
 			LoadLogSetting(hKeyResults,"Log SP",&LogOptions->LogSPRegisters);
 			LoadLogSetting(hKeyResults,"Log DP Command",&LogOptions->LogDPCRegisters);
@@ -137,20 +147,26 @@ void LoadLogOptions (LOG_OPTIONS * LogOptions, BOOL AlwaysFill) {
 	LogOptions->LogUnknown           = FALSE;
 }
 
-void LoadLogSetting (HKEY hKey,char * String, BOOL * Value) {
+void LoadLogSetting (HKEY hKey,char * String, BOOL * Value)
+{
 	DWORD Type, dwResult, Bytes = 4;
 	long lResult;
 
 	lResult = RegQueryValueEx(hKey,String,0,&Type,(LPBYTE)(&dwResult),&Bytes);		
-	if (Type == REG_DWORD && lResult == ERROR_SUCCESS) { 
+	if (Type == REG_DWORD && lResult == ERROR_SUCCESS)
+	{ 
 		*Value = (BOOL)dwResult;
-	} else {
+	}
+	else
+	{
 		*Value = FALSE;
 	}
 }
 
-LRESULT CALLBACK LogGeneralProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lParam) {
-	switch (uMsg) {
+LRESULT CALLBACK LogGeneralProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lParam)
+{
+	switch (uMsg)
+	{
 	case WM_INITDIALOG:
 		if (TempOptions.LogCP0changes) { CheckDlgButton(hDlg,IDC_CP0_WRITE,BST_CHECKED); }
 		if (TempOptions.LogCP0reads)   { CheckDlgButton(hDlg,IDC_CP0_READ,BST_CHECKED); }
@@ -178,8 +194,12 @@ LRESULT CALLBACK LogGeneralProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM
 	return TRUE;
 }
 
-void Log_LW (DWORD PC, DWORD VAddr) {
-	if (!LogOptions.GenerateLog) { return; }
+void Log_LW (DWORD PC, DWORD VAddr)
+{
+	if (!LogOptions.GenerateLog)
+	{
+		return;
+	}
 
 	if ( VAddr < 0xA0000000 || VAddr >= 0xC0000000 )
 	{
@@ -196,12 +216,20 @@ void Log_LW (DWORD PC, DWORD VAddr) {
 	} 
 	
 	DWORD Value;
-	if ( VAddr >= 0xA0000000 && VAddr < (0xA0000000 + g_MMU->RdramSize())) { return; }
-	if ( VAddr >= 0xA3F00000 && VAddr <= 0xA3F00024) {
-		if (!LogOptions.LogRDRamRegisters) { return; }
+	if ( VAddr >= 0xA0000000 && VAddr < (0xA0000000 + g_MMU->RdramSize()))
+	{
+		return;
+	}
+	if ( VAddr >= 0xA3F00000 && VAddr <= 0xA3F00024)
+	{
+		if (!LogOptions.LogRDRamRegisters)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 
-		switch (VAddr) {
+		switch (VAddr)
+		{
 		case 0xA3F00000: LogMessage("%08X: read from RDRAM_CONFIG_REG/RDRAM_DEVICE_TYPE_REG (%08X)",PC, Value); return;
 		case 0xA3F00004: LogMessage("%08X: read from RDRAM_DEVICE_ID_REG (%08X)",PC, Value); return;
 		case 0xA3F00008: LogMessage("%08X: read from RDRAM_DELAY_REG (%08X)",PC, Value); return;
@@ -215,12 +243,20 @@ void Log_LW (DWORD PC, DWORD VAddr) {
 		}
 	}
 
-	if ( VAddr >= 0xA4000000 && VAddr <= 0xA4001FFC ) { return; }
-	if ( VAddr >= 0xA4040000 && VAddr <= 0xA404001C ) {
-		if (!LogOptions.LogSPRegisters) { return; }
+	if ( VAddr >= 0xA4000000 && VAddr <= 0xA4001FFC )
+	{
+		return;
+	}
+	if ( VAddr >= 0xA4040000 && VAddr <= 0xA404001C )
+	{
+		if (!LogOptions.LogSPRegisters)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 
-		switch (VAddr) {
+		switch (VAddr)
+		{
 		case 0xA4040000: LogMessage("%08X: read from SP_MEM_ADDR_REG (%08X)",PC, Value); break;
 		case 0xA4040004: LogMessage("%08X: read from SP_DRAM_ADDR_REG (%08X)",PC, Value); break;
 		case 0xA4040008: LogMessage("%08X: read from SP_RD_LEN_REG (%08X)",PC, Value); break;
@@ -232,17 +268,26 @@ void Log_LW (DWORD PC, DWORD VAddr) {
 		}
 		return;
 	}		
-	if ( VAddr == 0xA4080000) {
-		if (!LogOptions.LogSPRegisters) { return; }
+	if ( VAddr == 0xA4080000)
+	{
+		if (!LogOptions.LogSPRegisters)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 		LogMessage("%08X: read from SP_PC (%08X)",PC, Value);
 		return;
 	}
-	if (VAddr >= 0xA4100000 && VAddr <= 0xA410001C) {
-		if (!LogOptions.LogDPCRegisters) { return; }
+	if (VAddr >= 0xA4100000 && VAddr <= 0xA410001C)
+	{
+		if (!LogOptions.LogDPCRegisters)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 
-		switch (VAddr) {
+		switch (VAddr)
+		{
 		case 0xA4100000: LogMessage("%08X: read from DPC_START_REG (%08X)",PC, Value); return;
 		case 0xA4100004: LogMessage("%08X: read from DPC_END_REG (%08X)",PC, Value); return;
 		case 0xA4100008: LogMessage("%08X: read from DPC_CURRENT_REG (%08X)",PC, Value); return;
@@ -253,22 +298,32 @@ void Log_LW (DWORD PC, DWORD VAddr) {
 		case 0xA410001C: LogMessage("%08X: read from DPC_TMEM_REG (%08X)",PC, Value); return;
 		}
 	}
-	if (VAddr >= 0xA4300000 && VAddr <= 0xA430000C) {
-		if (!LogOptions.LogMIPSInterface) { return; }
+	if (VAddr >= 0xA4300000 && VAddr <= 0xA430000C)
+	{
+		if (!LogOptions.LogMIPSInterface)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 
-		switch (VAddr) {
+		switch (VAddr)
+		{
 		case 0xA4300000: LogMessage("%08X: read from MI_INIT_MODE_REG/MI_MODE_REG (%08X)",PC, Value); return;
 		case 0xA4300004: LogMessage("%08X: read from MI_VERSION_REG/MI_NOOP_REG (%08X)",PC, Value); return;
 		case 0xA4300008: LogMessage("%08X: read from MI_INTR_REG (%08X)",PC, Value); return;
 		case 0xA430000C: LogMessage("%08X: read from MI_INTR_MASK_REG (%08X)",PC, Value); return;
 		}
 	}
-	if (VAddr >= 0xA4400000 && VAddr <= 0xA4400034) {
-		if (!LogOptions.LogVideoInterface) { return; }
+	if (VAddr >= 0xA4400000 && VAddr <= 0xA4400034)
+	{
+		if (!LogOptions.LogVideoInterface)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 
-		switch (VAddr) {
+		switch (VAddr)
+		{
 		case 0xA4400000: LogMessage("%08X: read from VI_STATUS_REG/VI_CONTROL_REG (%08X)",PC, Value); return;
 		case 0xA4400004: LogMessage("%08X: read from VI_ORIGIN_REG/VI_DRAM_ADDR_REG (%08X)",PC, Value); return;
 		case 0xA4400008: LogMessage("%08X: read from VI_WIDTH_REG/VI_H_WIDTH_REG (%08X)",PC, Value); return;
@@ -285,11 +340,16 @@ void Log_LW (DWORD PC, DWORD VAddr) {
 		case 0xA4400034: LogMessage("%08X: read from VI_Y_SCALE_REG (%08X)",PC, Value); return;
 		}
 	}
-	if (VAddr >= 0xA4500000 && VAddr <= 0xA4500014) {
-		if (!LogOptions.LogAudioInterface) { return; }
+	if (VAddr >= 0xA4500000 && VAddr <= 0xA4500014)
+	{
+		if (!LogOptions.LogAudioInterface)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 
-		switch (VAddr) {
+		switch (VAddr)
+		{
 		case 0xA4500000: LogMessage("%08X: read from AI_DRAM_ADDR_REG (%08X)",PC, Value); return;
 		case 0xA4500004: LogMessage("%08X: read from AI_LEN_REG (%08X)",PC, Value); return;
 		case 0xA4500008: LogMessage("%08X: read from AI_CONTROL_REG (%08X)",PC, Value); return;
@@ -298,11 +358,16 @@ void Log_LW (DWORD PC, DWORD VAddr) {
 		case 0xA4500014: LogMessage("%08X: read from AI_BITRATE_REG (%08X)",PC, Value); return;
 		}
 	}
-	if (VAddr >= 0xA4600000 && VAddr <= 0xA4600030) {
-		if (!LogOptions.LogPerInterface) { return; }
+	if (VAddr >= 0xA4600000 && VAddr <= 0xA4600030)
+	{
+		if (!LogOptions.LogPerInterface)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 
-		switch (VAddr) {
+		switch (VAddr)
+		{
 		case 0xA4600000: LogMessage("%08X: read from PI_DRAM_ADDR_REG (%08X)",PC, Value); return;
 		case 0xA4600004: LogMessage("%08X: read from PI_CART_ADDR_REG (%08X)",PC, Value); return;
 		case 0xA4600008: LogMessage("%08X: read from PI_RD_LEN_REG (%08X)",PC, Value); return;
@@ -318,11 +383,16 @@ void Log_LW (DWORD PC, DWORD VAddr) {
 		case 0xA4600030: LogMessage("%08X: read from PI_BSD_DOM2_RLS_REG (%08X)",PC, Value); return;
 		}
 	}
-	if (VAddr >= 0xA4700000 && VAddr <= 0xA470001C) {
-		if (!LogOptions.LogRDRAMInterface) { return; }
+	if (VAddr >= 0xA4700000 && VAddr <= 0xA470001C)
+	{
+		if (!LogOptions.LogRDRAMInterface)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 
-		switch (VAddr) {
+		switch (VAddr)
+		{
 		case 0xA4700000: LogMessage("%08X: read from RI_MODE_REG (%08X)",PC, Value); return;
 		case 0xA4700004: LogMessage("%08X: read from RI_CONFIG_REG (%08X)",PC, Value); return;
 		case 0xA4700008: LogMessage("%08X: read from RI_CURRENT_LOAD_REG (%08X)",PC, Value); return;
@@ -333,43 +403,74 @@ void Log_LW (DWORD PC, DWORD VAddr) {
 		case 0xA470001C: LogMessage("%08X: read from RI_WERROR_REG (%08X)",PC, Value); return;
 		}
 	}
-	if ( VAddr == 0xA4800000) {
-		if (!LogOptions.LogSerialInterface) { return; }
+	if ( VAddr == 0xA4800000)
+	{
+		if (!LogOptions.LogSerialInterface)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 		LogMessage("%08X: read from SI_DRAM_ADDR_REG (%08X)",PC, Value);
 		return;
 	}
-	if ( VAddr == 0xA4800004) {
-		if (!LogOptions.LogSerialInterface) { return; }
+	if ( VAddr == 0xA4800004)
+	{
+		if (!LogOptions.LogSerialInterface)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 		LogMessage("%08X: read from SI_PIF_ADDR_RD64B_REG (%08X)",PC, Value);
 		return;
 	}
-	if ( VAddr == 0xA4800010) {
-		if (!LogOptions.LogSerialInterface) { return; }
+	if ( VAddr == 0xA4800010)
+	{
+		if (!LogOptions.LogSerialInterface)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 		LogMessage("%08X: read from SI_PIF_ADDR_WR64B_REG (%08X)",PC, Value);
 		return;
 	}
-	if ( VAddr == 0xA4800018) {
-		if (!LogOptions.LogSerialInterface) { return; }
+	if ( VAddr == 0xA4800018)
+	{
+		if (!LogOptions.LogSerialInterface)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 		LogMessage("%08X: read from SI_STATUS_REG (%08X)",PC, Value);
 		return;
 	}
-	if ( VAddr >= 0xBFC00000 && VAddr <= 0xBFC007C0 ) { return; }
-	if ( VAddr >= 0xBFC007C0 && VAddr <= 0xBFC007FC ) {
-		if (!LogOptions.LogPRDirectMemLoads) { return; }
+	if ( VAddr >= 0xBFC00000 && VAddr <= 0xBFC007C0 )
+	{
+		return;
+	}
+	if ( VAddr >= 0xBFC007C0 && VAddr <= 0xBFC007FC )
+	{
+		if (!LogOptions.LogPRDirectMemLoads)
+		{
+			return;
+		}
 		g_MMU->LW_VAddr(VAddr,Value);
 		LogMessage("%08X: read word from Pif Ram at 0x%X (%08X)",PC,VAddr - 0xBFC007C0, Value);
 		return;
 	}
-	if ( VAddr >= 0xB0000040 && ((VAddr - 0xB0000000) < g_Rom->GetRomSize())) { return; }
-	if ( VAddr >= 0xB0000000 && VAddr < 0xB0000040) {
-		if (!LogOptions.LogRomHeader) { return; }
+	if ( VAddr >= 0xB0000040 && ((VAddr - 0xB0000000) < g_Rom->GetRomSize()))
+	{
+		return;
+	}
+	if ( VAddr >= 0xB0000000 && VAddr < 0xB0000040)
+	{
+		if (!LogOptions.LogRomHeader)
+		{
+			return;
+		}
 
 		g_MMU->LW_VAddr(VAddr,Value);
-	    switch (VAddr) {        
+	    switch (VAddr)
+		{        
 		case 0xB0000004: LogMessage("%08X: read from Rom Clock Rate (%08X)",PC, Value); break;
 		case 0xB0000008: LogMessage("%08X: read from Rom Boot address offset (%08X)",PC, Value); break;
 		case 0xB000000C: LogMessage("%08X: read from Rom Release offset (%08X)",PC, Value); break;
@@ -379,17 +480,27 @@ void Log_LW (DWORD PC, DWORD VAddr) {
 		}
 		return;
 	}
-	if (!LogOptions.LogUnknown) { return; }
+	if (!LogOptions.LogUnknown)
+	{
+		return;
+	}
 	LogMessage("%08X: read from unknown ??? (%08X)",PC,VAddr);
 }
 
-void __cdecl LogMessage (char * Message, ...) {
+void __cdecl LogMessage (char * Message, ...)
+{
 	DWORD dwWritten;
 	char Msg[400];
 	va_list ap;
 
-	if(!g_Settings->LoadBool(Debugger_Enabled)) { return; }
-	if(hLogFile == NULL) { return; }
+	if (!g_Settings->LoadBool(Debugger_Enabled))
+	{
+		return;
+	}
+	if (hLogFile == NULL)
+	{
+		return;
+	}
 
 	va_start( ap, Message );
 	vsprintf( Msg, Message, ap );
@@ -400,8 +511,12 @@ void __cdecl LogMessage (char * Message, ...) {
 	WriteFile( hLogFile,Msg,strlen(Msg),&dwWritten,NULL );
 }
 
-void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
-	if (!LogOptions.GenerateLog) { return; }
+void Log_SW (DWORD PC, DWORD VAddr, DWORD Value)
+{
+	if (!LogOptions.GenerateLog)
+	{
+		return;
+	}
 
 	if ( VAddr < 0xA0000000 || VAddr >= 0xC0000000 )
 	{
@@ -417,10 +532,18 @@ void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
 		VAddr = PAddr + 0xA0000000;
 	} 
 
-	if ( VAddr >= 0xA0000000 && VAddr < (0xA0000000 + g_MMU->RdramSize())) { return; }
-	if ( VAddr >= 0xA3F00000 && VAddr <= 0xA3F00024) {
-		if (!LogOptions.LogRDRamRegisters) { return; }
-		switch (VAddr) {
+	if ( VAddr >= 0xA0000000 && VAddr < (0xA0000000 + g_MMU->RdramSize()))
+	{
+		return;
+	}
+	if ( VAddr >= 0xA3F00000 && VAddr <= 0xA3F00024)
+	{
+		if (!LogOptions.LogRDRamRegisters)
+		{
+			return;
+		}
+		switch (VAddr)
+		{
 		case 0xA3F00000: LogMessage("%08X: Writing 0x%08X to RDRAM_CONFIG_REG/RDRAM_DEVICE_TYPE_REG",PC, Value ); return;
 		case 0xA3F00004: LogMessage("%08X: Writing 0x%08X to RDRAM_DEVICE_ID_REG",PC, Value ); return;
 		case 0xA3F00008: LogMessage("%08X: Writing 0x%08X to RDRAM_DELAY_REG",PC, Value ); return;
@@ -433,11 +556,19 @@ void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
 		case 0xA3F00024: LogMessage("%08X: Writing 0x%08X to RDRAM_DEVICE_MANUF_REG",PC, Value ); return;
 		}
 	}
-	if ( VAddr >= 0xA4000000 && VAddr <= 0xA4001FFC ) { return; }
+	if ( VAddr >= 0xA4000000 && VAddr <= 0xA4001FFC )
+	{
+		return;
+	}
 
-    if ( VAddr >= 0xA4040000 && VAddr <= 0xA404001C) {
-		if (!LogOptions.LogSPRegisters) { return; }
-		switch (VAddr) {
+    if ( VAddr >= 0xA4040000 && VAddr <= 0xA404001C)
+	{
+		if (!LogOptions.LogSPRegisters)
+		{
+			return;
+		}
+		switch (VAddr)
+		{
 		case 0xA4040000: LogMessage("%08X: Writing 0x%08X to SP_MEM_ADDR_REG",PC, Value ); return;
 		case 0xA4040004: LogMessage("%08X: Writing 0x%08X to SP_DRAM_ADDR_REG",PC, Value ); return;
 		case 0xA4040008: LogMessage("%08X: Writing 0x%08X to SP_RD_LEN_REG",PC, Value ); return;
@@ -448,14 +579,23 @@ void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
 		case 0xA404001C: LogMessage("%08X: Writing 0x%08X to SP_SEMAPHORE_REG",PC, Value ); return;
 		}
 	}
-    if ( VAddr == 0xA4080000) {
-		if (!LogOptions.LogSPRegisters) { return; }		
+    if ( VAddr == 0xA4080000)
+	{
+		if (!LogOptions.LogSPRegisters)
+		{
+			return;
+		}		
 		LogMessage("%08X: Writing 0x%08X to SP_PC",PC, Value ); return;
 	}
 	
-    if ( VAddr >= 0xA4100000 && VAddr <= 0xA410001C) {
-		if (!LogOptions.LogDPCRegisters) { return; }
-		switch (VAddr) {
+    if ( VAddr >= 0xA4100000 && VAddr <= 0xA410001C)
+	{
+		if (!LogOptions.LogDPCRegisters)
+		{
+			return;
+		}
+		switch (VAddr)
+		{
 		case 0xA4100000: LogMessage("%08X: Writing 0x%08X to DPC_START_REG",PC, Value ); return;
 		case 0xA4100004: LogMessage("%08X: Writing 0x%08X to DPC_END_REG",PC, Value ); return;
 		case 0xA4100008: LogMessage("%08X: Writing 0x%08X to DPC_CURRENT_REG",PC, Value ); return;
@@ -467,9 +607,14 @@ void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
 		}
 	}
 
-    if ( VAddr >= 0xA4200000 && VAddr <= 0xA420000C) {
-		if (!LogOptions.LogDPSRegisters) { return; }
-		switch (VAddr) {
+    if ( VAddr >= 0xA4200000 && VAddr <= 0xA420000C)
+	{
+		if (!LogOptions.LogDPSRegisters)
+		{
+			return;
+		}
+		switch (VAddr)
+		{
 		case 0xA4200000: LogMessage("%08X: Writing 0x%08X to DPS_TBIST_REG",PC, Value ); return;
 		case 0xA4200004: LogMessage("%08X: Writing 0x%08X to DPS_TEST_MODE_REG",PC, Value ); return;
 		case 0xA4200008: LogMessage("%08X: Writing 0x%08X to DPS_BUFTEST_ADDR_REG",PC, Value ); return;
@@ -477,18 +622,28 @@ void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
 		}
 	}
 
-    if ( VAddr >= 0xA4300000 && VAddr <= 0xA430000C) {
-		if (!LogOptions.LogMIPSInterface) { return; }
-		switch (VAddr) {
+    if ( VAddr >= 0xA4300000 && VAddr <= 0xA430000C)
+	{
+		if (!LogOptions.LogMIPSInterface)
+		{
+			return;
+		}
+		switch (VAddr)
+		{
 		case 0xA4300000: LogMessage("%08X: Writing 0x%08X to MI_INIT_MODE_REG/MI_MODE_REG",PC, Value ); return;
 		case 0xA4300004: LogMessage("%08X: Writing 0x%08X to MI_VERSION_REG/MI_NOOP_REG",PC, Value ); return;
 		case 0xA4300008: LogMessage("%08X: Writing 0x%08X to MI_INTR_REG",PC, Value ); return;
 		case 0xA430000C: LogMessage("%08X: Writing 0x%08X to MI_INTR_MASK_REG",PC, Value ); return;
 		}
 	}
-    if ( VAddr >= 0xA4400000 && VAddr <= 0xA4400034) {
-		if (!LogOptions.LogVideoInterface) { return; }
-		switch (VAddr) {
+    if ( VAddr >= 0xA4400000 && VAddr <= 0xA4400034)
+	{
+		if (!LogOptions.LogVideoInterface)
+		{
+			return;
+		}
+		switch (VAddr)
+		{
 		case 0xA4400000: LogMessage("%08X: Writing 0x%08X to VI_STATUS_REG/VI_CONTROL_REG",PC, Value ); return;
 		case 0xA4400004: LogMessage("%08X: Writing 0x%08X to VI_ORIGIN_REG/VI_DRAM_ADDR_REG",PC, Value ); return;
 		case 0xA4400008: LogMessage("%08X: Writing 0x%08X to VI_WIDTH_REG/VI_H_WIDTH_REG",PC, Value ); return;
@@ -506,9 +661,14 @@ void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
 		}
 	}
 
-    if ( VAddr >= 0xA4500000 && VAddr <= 0xA4500014) {
-		if (!LogOptions.LogAudioInterface) { return; }
-		switch (VAddr) {
+    if ( VAddr >= 0xA4500000 && VAddr <= 0xA4500014)
+	{
+		if (!LogOptions.LogAudioInterface)
+		{
+			return;
+		}
+		switch (VAddr)
+		{
 		case 0xA4500000: LogMessage("%08X: Writing 0x%08X to AI_DRAM_ADDR_REG",PC, Value ); return;
 		case 0xA4500004: LogMessage("%08X: Writing 0x%08X to AI_LEN_REG",PC, Value ); return;
 		case 0xA4500008: LogMessage("%08X: Writing 0x%08X to AI_CONTROL_REG",PC, Value ); return;
@@ -518,9 +678,14 @@ void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
 		}
 	}
 
-    if ( VAddr >= 0xA4600000 && VAddr <= 0xA4600030) {
-		if (!LogOptions.LogPerInterface) { return; }
-		switch (VAddr) {
+    if ( VAddr >= 0xA4600000 && VAddr <= 0xA4600030)
+	{
+		if (!LogOptions.LogPerInterface)
+		{
+			return;
+		}
+		switch (VAddr)
+		{
 		case 0xA4600000: LogMessage("%08X: Writing 0x%08X to PI_DRAM_ADDR_REG",PC, Value ); return;
 		case 0xA4600004: LogMessage("%08X: Writing 0x%08X to PI_CART_ADDR_REG",PC, Value ); return;
 		case 0xA4600008: LogMessage("%08X: Writing 0x%08X to PI_RD_LEN_REG",PC, Value ); return;
@@ -536,9 +701,14 @@ void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
 		case 0xA4600030: LogMessage("%08X: Writing 0x%08X to PI_BSD_DOM2_RLS_REG",PC, Value ); return;
 		}
 	}
-    if ( VAddr >= 0xA4700000 && VAddr <= 0xA470001C) {
-		if (!LogOptions.LogRDRAMInterface) { return; }
-		switch (VAddr) {
+    if ( VAddr >= 0xA4700000 && VAddr <= 0xA470001C)
+	{
+		if (!LogOptions.LogRDRAMInterface)
+		{
+			return;
+		}
+		switch (VAddr)
+		{
 		case 0xA4700000: LogMessage("%08X: Writing 0x%08X to RI_MODE_REG",PC, Value ); return;
 		case 0xA4700004: LogMessage("%08X: Writing 0x%08X to RI_CONFIG_REG",PC, Value ); return;
 		case 0xA4700008: LogMessage("%08X: Writing 0x%08X to RI_CURRENT_LOAD_REG",PC, Value ); return;
@@ -549,40 +719,67 @@ void Log_SW (DWORD PC, DWORD VAddr, DWORD Value) {
 		case 0xA470001C: LogMessage("%08X: Writing 0x%08X to RI_WERROR_REG",PC, Value ); return;
 		}
 	}
-    if ( VAddr == 0xA4800000) {
-		if (!LogOptions.LogSerialInterface) { return; }		
+    if ( VAddr == 0xA4800000)
+	{
+		if (!LogOptions.LogSerialInterface)
+		{
+			return;
+		}		
 		LogMessage("%08X: Writing 0x%08X to SI_DRAM_ADDR_REG",PC, Value ); return;
 	}
-    if ( VAddr == 0xA4800004) {
-		if (LogOptions.LogPRDMAOperations) {
+    if ( VAddr == 0xA4800004)
+	{
+		if (LogOptions.LogPRDMAOperations)
+		{
 			LogMessage("%08X: A DMA transfer from the PIF ram has occured",PC );			
 		}
-		if (!LogOptions.LogSerialInterface) { return; }		
+		if (!LogOptions.LogSerialInterface)
+		{
+			return;
+		}		
 		LogMessage("%08X: Writing 0x%08X to SI_PIF_ADDR_RD64B_REG",PC, Value ); return;
 	}
-    if ( VAddr == 0xA4800010) {
-		if (LogOptions.LogPRDMAOperations) {
+    if ( VAddr == 0xA4800010)
+	{
+		if (LogOptions.LogPRDMAOperations)
+		{
 			LogMessage("%08X: A DMA transfer to the PIF ram has occured",PC );			
 		}
-		if (!LogOptions.LogSerialInterface) { return; }		
+		if (!LogOptions.LogSerialInterface)
+		{
+			return;
+		}		
 		LogMessage("%08X: Writing 0x%08X to SI_PIF_ADDR_WR64B_REG",PC, Value ); return;
 	}
-    if ( VAddr == 0xA4800018) {
-		if (!LogOptions.LogSerialInterface) { return; }		
+    if ( VAddr == 0xA4800018)
+	{
+		if (!LogOptions.LogSerialInterface)
+		{
+			return;
+		}		
 		LogMessage("%08X: Writing 0x%08X to SI_STATUS_REG",PC, Value ); return;
 	}
 
-	if ( VAddr >= 0xBFC007C0 && VAddr <= 0xBFC007FC ) {
-		if (!LogOptions.LogPRDirectMemStores) { return; }
+	if ( VAddr >= 0xBFC007C0 && VAddr <= 0xBFC007FC )
+	{
+		if (!LogOptions.LogPRDirectMemStores)
+		{
+			return;
+		}
 		LogMessage("%08X: Writing 0x%08X to Pif Ram at 0x%X",PC,Value, VAddr - 0xBFC007C0);
 		return;
 	}
-	if (!LogOptions.LogUnknown) { return; }
+	if (!LogOptions.LogUnknown)
+	{
+		return;
+	}
 	LogMessage("%08X: Writing 0x%08X to %08X ????",PC, Value, VAddr );
 }
 
-LRESULT CALLBACK LogPifProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lParam) {
-	switch (uMsg) {
+LRESULT CALLBACK LogPifProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lParam)
+{
+	switch (uMsg)
+	{
 	case WM_INITDIALOG:
 		if (TempOptions.LogPRDMAOperations)   { CheckDlgButton(hDlg,IDC_SI_DMA,BST_CHECKED); }
 		if (TempOptions.LogPRDirectMemLoads)  { CheckDlgButton(hDlg,IDC_DIRECT_WRITE,BST_CHECKED); }
@@ -592,7 +789,10 @@ LRESULT CALLBACK LogPifProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lPa
 		if (TempOptions.LogControllerPak)     { CheckDlgButton(hDlg,IDC_CONT_PAK,BST_CHECKED); }
 		break;
 	case WM_NOTIFY:
-		if (((NMHDR FAR *) lParam)->code != PSN_APPLY) { break; }		
+		if (((NMHDR FAR *) lParam)->code != PSN_APPLY)
+		{
+			break;
+		}		
 		TempOptions.LogPRDMAOperations   = IsDlgButtonChecked(hDlg,IDC_SI_DMA) == BST_CHECKED?TRUE:FALSE;
 		TempOptions.LogPRDirectMemLoads  = IsDlgButtonChecked(hDlg,IDC_DIRECT_WRITE) == BST_CHECKED?TRUE:FALSE;
 		TempOptions.LogPRDMAMemLoads     = IsDlgButtonChecked(hDlg,IDC_DMA_WRITE) == BST_CHECKED?TRUE:FALSE;
@@ -606,8 +806,10 @@ LRESULT CALLBACK LogPifProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lPa
 	return TRUE;
 }
 
-LRESULT CALLBACK LogRegProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lParam) {
-	switch (uMsg) {
+LRESULT CALLBACK LogRegProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lParam)
+{
+	switch (uMsg)
+	{
 	case WM_INITDIALOG:
 		if (TempOptions.LogRDRamRegisters)  { CheckDlgButton(hDlg,IDC_RDRAM,BST_CHECKED); }
 		if (TempOptions.LogSPRegisters)     { CheckDlgButton(hDlg,IDC_SP_REG,BST_CHECKED); }
@@ -621,7 +823,10 @@ LRESULT CALLBACK LogRegProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lPa
 		if (TempOptions.LogSerialInterface) { CheckDlgButton(hDlg,IDC_SI_REG,BST_CHECKED); }
 		break;
 	case WM_NOTIFY:
-		if (((NMHDR FAR *) lParam)->code != PSN_APPLY) { break; }
+		if (((NMHDR FAR *) lParam)->code != PSN_APPLY)
+		{
+			break;
+		}
 		TempOptions.LogRDRamRegisters  = IsDlgButtonChecked(hDlg,IDC_RDRAM) == BST_CHECKED?TRUE:FALSE;
 		TempOptions.LogSPRegisters     = IsDlgButtonChecked(hDlg,IDC_SP_REG) == BST_CHECKED?TRUE:FALSE;
 		TempOptions.LogDPCRegisters    = IsDlgButtonChecked(hDlg,IDC_DPC_REG) == BST_CHECKED?TRUE:FALSE;
@@ -639,18 +844,20 @@ LRESULT CALLBACK LogRegProc (HWND hDlg, UINT uMsg, WPARAM /*wParam*/, LPARAM lPa
 	return TRUE;
 }
 
-void SaveLogSetting (HKEY hKey,char * String, BOOL Value) {
+void SaveLogSetting (HKEY hKey,char * String, BOOL Value)
+{
 	DWORD StoreValue = Value;
 	RegSetValueEx(hKey,String,0,REG_DWORD,(CONST BYTE *)&StoreValue,sizeof(DWORD));
 }
 
-void SaveLogOptions (void) {	
+void SaveLogOptions (void)
+{	
 	long lResult;
 	HKEY hKeyResults = 0;
 	DWORD Disposition = 0;
 	char String[200];
 	
-	sprintf(String,"Software\\N64 Emulation\\%s\\Logging",g_Settings->LoadString(Setting_ApplicationName).c_str());
+	sprintf(String,"Software\\N64 Emulation\\%s\\Logging",g_Settings->LoadStringVal(Setting_ApplicationName).c_str());
 	lResult = RegCreateKeyEx( HKEY_CURRENT_USER,String,0,"", REG_OPTION_NON_VOLATILE,
 		KEY_ALL_ACCESS,NULL,&hKeyResults,&Disposition);
 	
@@ -684,23 +891,29 @@ void SaveLogOptions (void) {
 
 void StartLog (void) 
 {
-	if (!LogOptions.GenerateLog) { 
+	if (!LogOptions.GenerateLog)
+	{ 
 		StopLog();
 		return; 
 	}
-	if (hLogFile) { return; }
+	if (hLogFile)
+	{
+		return;
+	}
 
 	CPath LogFile(CPath::MODULE_DIRECTORY);
-	LogFile.AppendDirectory(_T("Logs"));
-	LogFile.SetNameExtension(_T("cpudebug.log"));
+	LogFile.AppendDirectory("Logs");
+	LogFile.SetNameExtension("cpudebug.log");
 		
 	hLogFile = CreateFile(LogFile,GENERIC_WRITE, FILE_SHARE_READ,NULL,CREATE_ALWAYS,
 		FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
 	SetFilePointer(hLogFile,0,NULL,FILE_BEGIN);
 }
 
-void StopLog (void) {
-	if (hLogFile) {
+void StopLog (void)
+{
+	if (hLogFile)
+	{
 		CloseHandle(hLogFile);
 	}
 	hLogFile = NULL;
diff --git a/Source/Project64/N64 System/C Core/Logging.h b/Source/Project64/N64 System/C Core/Logging.h
index 7539494c6..844fcdf04 100644
--- a/Source/Project64/N64 System/C Core/Logging.h	
+++ b/Source/Project64/N64 System/C Core/Logging.h	
@@ -13,7 +13,8 @@
 extern "C" {
 #endif
 
-typedef struct {
+typedef struct
+{
 	BOOL		GenerateLog;
 
 	/* Registers Log */
diff --git a/Source/Project64/N64 System/C Core/r4300i Commands.cpp b/Source/Project64/N64 System/C Core/r4300i Commands.cpp
index c23e3defa..9b01fd1f7 100644
--- a/Source/Project64/N64 System/C Core/r4300i Commands.cpp	
+++ b/Source/Project64/N64 System/C Core/r4300i Commands.cpp	
@@ -16,32 +16,41 @@
 BOOL InR4300iCommandsWindow = FALSE;
 char CommandName[100];
 
-void SetR4300iCommandToStepping ( void ) { 
+void SetR4300iCommandToStepping ( void )
+{
 }
 
-void SetR4300iCommandViewto ( UINT /*NewLocation*/ ) {
+void SetR4300iCommandViewto ( UINT /*NewLocation*/ )
+{
 }
 
-void __cdecl Enter_R4300i_Commands_Window ( void ) {
+void __cdecl Enter_R4300i_Commands_Window ( void )
+{
 }
 
 char strLabelName[100];
 
-char * LabelName (DWORD Address) {
+char * LabelName (DWORD Address)
+{
 	sprintf(strLabelName,"0x%08X",Address);
 	return strLabelName;
 }
 
-char * R4300iSpecialName ( DWORD OpCode, DWORD /*PC*/ ) {
+char * R4300iSpecialName ( DWORD OpCode, DWORD /*PC*/ )
+{
 	OPCODE command;
 	command.Hex = OpCode;
 
-	switch (command.funct) {
+	switch (command.funct)
+	{
 	case R4300i_SPECIAL_SLL:
-		if (command.Hex != 0) {
+		if (command.Hex != 0)
+		{
 			sprintf(CommandName,"sll\t%s, %s, 0x%X",CRegName::GPR[command.rd],
 			CRegName::GPR[command.rt], command.sa);
-		} else {
+		}
+		else
+		{
 			sprintf(CommandName,"nop");
 		}
 		break;
@@ -230,18 +239,22 @@ char * R4300iSpecialName ( DWORD OpCode, DWORD /*PC*/ ) {
 	return CommandName;
 }
 
-char * R4300iRegImmName ( DWORD OpCode, DWORD PC ) {
+char * R4300iRegImmName ( DWORD OpCode, DWORD PC )
+{
 	OPCODE command;
 	command.Hex = OpCode;
 
-	switch (command.rt) {
+	switch (command.rt)
+	{
 	case R4300i_REGIMM_BLTZ:
 		sprintf(CommandName,"bltz\t%s, %s",CRegName::GPR[command.rs], LabelName(PC + ((short)command.offset << 2) + 4));
 		break;
 	case R4300i_REGIMM_BGEZ:
-		if (command.rs == 0) {
+		if (command.rs == 0)
+		{
 			sprintf(CommandName,"b\t%s", LabelName(PC + ((short)command.offset << 2) + 4));
-		} else {
+		} else
+		{
 			sprintf(CommandName,"bgez\t%s, %s",CRegName::GPR[command.rs], LabelName(PC + ((short)command.offset << 2) + 4));
 		}
 		break;
@@ -273,9 +286,12 @@ char * R4300iRegImmName ( DWORD OpCode, DWORD PC ) {
 		sprintf(CommandName,"bltzal\t%s, %s",CRegName::GPR[command.rs], LabelName(PC + ((short)command.offset << 2) + 4));
 		break;
 	case R4300i_REGIMM_BGEZAL:
-		if (command.rs == 0) {
+		if (command.rs == 0)
+		{
 			sprintf(CommandName,"bal\t%s",LabelName(PC + ((short)command.offset << 2) + 4));
-		} else {
+		}
+		else
+		{
 			sprintf(CommandName,"bgezal\t%s, %s",CRegName::GPR[command.rs], LabelName(PC + ((short)command.offset << 2) + 4));
 		}
 		break;
@@ -292,11 +308,13 @@ char * R4300iRegImmName ( DWORD OpCode, DWORD PC ) {
 	return CommandName;
 }
 
-char * R4300iCop1Name ( DWORD OpCode, DWORD PC ) {
+char * R4300iCop1Name ( DWORD OpCode, DWORD PC )
+{
 	OPCODE command;
 	command.Hex = OpCode;
 
-	switch (command.fmt) {
+	switch (command.fmt)
+	{
 	case R4300i_COP1_MF:
 		sprintf(CommandName,"mfc1\t%s, %s",CRegName::GPR[command.rt], CRegName::FPR[command.fs]);
 		break;
@@ -316,7 +334,8 @@ char * R4300iCop1Name ( DWORD OpCode, DWORD PC ) {
 		sprintf(CommandName,"ctc1\t%s, %s",CRegName::GPR[command.rt], CRegName::FPR_Ctrl[command.fs]);
 		break;
 	case R4300i_COP1_BC:
-		switch (command.ft) {
+		switch (command.ft)
+		{
 		case R4300i_COP1_BC_BCF:
 			sprintf(CommandName,"BC1F\t%s", LabelName(PC + ((short)command.offset << 2) + 4));
 			break;
@@ -338,7 +357,8 @@ char * R4300iCop1Name ( DWORD OpCode, DWORD PC ) {
 	case R4300i_COP1_D:
 	case R4300i_COP1_W:
 	case R4300i_COP1_L:
-		switch (command.funct) {			
+		switch (command.funct)
+		{			
 		case R4300i_COP1_FUNCT_ADD:
 			sprintf(CommandName,"ADD.%s\t%s, %s, %s",FPR_Type(command.fmt),  
 				CRegName::FPR[command.fd], CRegName::FPR[command.fs], 
@@ -499,11 +519,13 @@ char * R4300iCop1Name ( DWORD OpCode, DWORD PC ) {
 	return CommandName;
 }
 
-char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ) {
+char * R4300iOpcodeName ( DWORD OpCode, DWORD PC )
+{
 	OPCODE command;
 	command.Hex = OpCode;
 		
-	switch (command.op) {
+	switch (command.op)
+	{
 	case R4300i_SPECIAL:
 		return R4300iSpecialName ( OpCode, PC );
 		break;
@@ -517,21 +539,29 @@ char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ) {
 		sprintf(CommandName,"jal\t%s",LabelName((PC & 0xF0000000) + (command.target << 2)));
 		break;
 	case R4300i_BEQ:
-		if (command.rs == 0 && command.rt == 0) {
+		if (command.rs == 0 && command.rt == 0)
+		{
 			sprintf(CommandName,"b\t%s", LabelName(PC + ((short)command.offset << 2) + 4));
-		} else if (command.rs == 0 || command.rt == 0) {
+		}
+		else if (command.rs == 0 || command.rt == 0)
+		{
 			sprintf(CommandName,"beqz\t%s, %s", CRegName::GPR[command.rs == 0 ? command.rt : command.rs ],
 				LabelName(PC + ((short)command.offset << 2) + 4));
-		} else {
+		}
+		else
+		{
 			sprintf(CommandName,"beq\t%s, %s, %s", CRegName::GPR[command.rs], CRegName::GPR[command.rt],
 				LabelName(PC + ((short)command.offset << 2) + 4));
 		}
 		break;
 	case R4300i_BNE:
-		if ((command.rs == 0) ^ (command.rt == 0)){
+		if ((command.rs == 0) ^ (command.rt == 0))
+		{
 			sprintf(CommandName,"bnez\t%s, %s", CRegName::GPR[command.rs == 0 ? command.rt : command.rs ],
 				LabelName(PC + ((short)command.offset << 2) + 4));
-		} else {
+		}
+		else
+		{
 			sprintf(CommandName,"bne\t%s, %s, %s", CRegName::GPR[command.rs], CRegName::GPR[command.rt],
 				LabelName(PC + ((short)command.offset << 2) + 4));
 		}
@@ -567,7 +597,8 @@ char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ) {
 		sprintf(CommandName,"lui\t%s, 0x%X",CRegName::GPR[command.rt], command.immediate);
 		break;
 	case R4300i_CP0:
-		switch (command.rs) {
+		switch (command.rs)
+		{
 		case R4300i_COP0_MF:
 			sprintf(CommandName,"mfc0\t%s, %s",CRegName::GPR[command.rt], CRegName::Cop0[command.rd]);
 			break;
@@ -575,8 +606,10 @@ char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ) {
 			sprintf(CommandName,"mtc0\t%s, %s",CRegName::GPR[command.rt], CRegName::Cop0[command.rd]);
 			break;
 		default:
-			if ( (command.rs & 0x10 ) != 0 ) {
-				switch( command.funct ) {
+			if ( (command.rs & 0x10 ) != 0 )
+			{
+				switch ( command.funct )
+				{
 				case R4300i_COP0_CO_TLBR:  sprintf(CommandName,"tlbr"); break;
 				case R4300i_COP0_CO_TLBWI: sprintf(CommandName,"tlbwi"); break;
 				case R4300i_COP0_CO_TLBWR: sprintf(CommandName,"tlbwr"); break;
@@ -586,7 +619,9 @@ char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ) {
 					sprintf(CommandName,"Unknown\t%02X %02X %02X %02X",
 						command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
 				}
-			} else {
+			}
+			else
+			{
 				sprintf(CommandName,"Unknown\t%02X %02X %02X %02X",
 				command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
 			}
@@ -596,21 +631,29 @@ char * R4300iOpcodeName ( DWORD OpCode, DWORD PC ) {
 	case R4300i_CP1:
 		return R4300iCop1Name ( OpCode, PC );
 	case R4300i_BEQL:
-		if (command.rs == command.rt) {
+		if (command.rs == command.rt)
+		{
 			sprintf(CommandName,"b\t%s", LabelName(PC + ((short)command.offset << 2) + 4));
-		} else if ((command.rs == 0) ^ (command.rt == 0)){
+		}
+		else if ((command.rs == 0) ^ (command.rt == 0))
+		{
 			sprintf(CommandName,"beqzl\t%s, %s", CRegName::GPR[command.rs == 0 ? command.rt : command.rs ],
 				LabelName(PC + ((short)command.offset << 2) + 4));
-		} else {
+		}
+		else
+		{
 			sprintf(CommandName,"beql\t%s, %s, %s", CRegName::GPR[command.rs], CRegName::GPR[command.rt],
 				LabelName(PC + ((short)command.offset << 2) + 4));
 		}
 		break;
 	case R4300i_BNEL:
-		if ((command.rs == 0) ^ (command.rt == 0)){
+		if ((command.rs == 0) ^ (command.rt == 0))
+		{
 			sprintf(CommandName,"bnezl\t%s, %s", CRegName::GPR[command.rs == 0 ? command.rt : command.rs ],
 				LabelName(PC + ((short)command.offset << 2) + 4));
-		} else {
+		}
+		else
+		{
 			sprintf(CommandName,"bnel\t%s, %s, %s", CRegName::GPR[command.rs], CRegName::GPR[command.rt],
 				LabelName(PC + ((short)command.offset << 2) + 4));
 		}
diff --git a/Source/Project64/N64 System/Cheat Class.cpp b/Source/Project64/N64 System/Cheat Class.cpp
index 76e166a56..0ec58f1e0 100644
--- a/Source/Project64/N64 System/Cheat Class.cpp	
+++ b/Source/Project64/N64 System/Cheat Class.cpp	
@@ -10,6 +10,8 @@
 ****************************************************************************/
 #include "stdafx.h"
 
+#include <commctrl.h>
+#include <windowsx.h>
 #include "Settings/SettingType/SettingsType-Cheats.h"
 
 enum { WM_EDITCHEAT           = WM_USER + 0x120 };
@@ -29,7 +31,8 @@ CCheats::CCheats (const CN64Rom * Rom ) :
 	m_hCheatTree   = NULL;
 }
 
-CCheats::~CCheats(void) {
+CCheats::~CCheats()
+{
 	delete m_rcList;
 	delete m_rcAdd;
 }
@@ -218,7 +221,7 @@ void CCheats::ApplyCheats(CMipsMemory * MMU)
 		const CODES & CodeEntry = m_Codes[CurrentCheat];
 		for (size_t CurrentEntry = 0; CurrentEntry < CodeEntry.size();)
 		{
-			CurrentEntry += ApplyCheatEntry(MMU, CodeEntry,CurrentEntry,TRUE);
+			CurrentEntry += ApplyCheatEntry(MMU, CodeEntry,CurrentEntry, true);
 		}
 	}
 }
@@ -334,7 +337,7 @@ bool CCheats::IsValid16BitCode (LPCSTR CheatString) const
 	return true;
 }
 
-int CCheats::ApplyCheatEntry (CMipsMemory * MMU, const CODES & CodeEntry, int CurrentEntry, BOOL Execute )
+int CCheats::ApplyCheatEntry (CMipsMemory * MMU, const CODES & CodeEntry, int CurrentEntry, bool Execute )
 {
 	if (CurrentEntry < 0 || CurrentEntry >= (int)CodeEntry.size())
 	{
@@ -404,22 +407,22 @@ int CCheats::ApplyCheatEntry (CMipsMemory * MMU, const CODES & CodeEntry, int Cu
 	case 0xD0000000:													// Added by Witten (witten@pj64cheats.net)
 		Address = 0x80000000 | (Code.Command & 0xFFFFFF);
 		MMU->LB_VAddr(Address,bMemory);
-		if (bMemory != Code.Value) { Execute = FALSE; }
+		if (bMemory != Code.Value) { Execute = false; }
 		return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
 	case 0xD1000000:													// Added by Witten (witten@pj64cheats.net)
 		Address = 0x80000000 | (Code.Command & 0xFFFFFF);
 		MMU->LH_VAddr(Address,wMemory);
-		if (wMemory != Code.Value) { Execute = FALSE; }
+		if (wMemory != Code.Value) { Execute = false; }
 		return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
 	case 0xD2000000:													// Added by Witten (witten@pj64cheats.net)
 		Address = 0x80000000 | (Code.Command & 0xFFFFFF);
 		MMU->LB_VAddr(Address,bMemory);
-		if (bMemory == Code.Value) { Execute = FALSE; }
+		if (bMemory == Code.Value) { Execute = false; }
 		return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
 	case 0xD3000000:													// Added by Witten (witten@pj64cheats.net)
 		Address = 0x80000000 | (Code.Command & 0xFFFFFF);
 		MMU->LH_VAddr(Address,wMemory);
-		if (wMemory == Code.Value) { Execute = FALSE; }
+		if (wMemory == Code.Value) { Execute = false; }
 		return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
 
 	// Xplorer64 (Author: Witten)
@@ -454,22 +457,22 @@ int CCheats::ApplyCheatEntry (CMipsMemory * MMU, const CODES & CodeEntry, int Cu
 	case 0xB8000000:
 		Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
 		MMU->LB_VAddr(Address,bMemory);
-		if (bMemory != ConvertXP64Value(Code.Value)) { Execute = FALSE; }
+		if (bMemory != ConvertXP64Value(Code.Value)) { Execute = false; }
 		return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
 	case 0xB9000000:
 		Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
 		MMU->LH_VAddr(Address,wMemory);
-		if (wMemory != ConvertXP64Value(Code.Value)) { Execute = FALSE; }
+		if (wMemory != ConvertXP64Value(Code.Value)) { Execute = false; }
 		return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
 	case 0xBA000000:
 		Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
 		MMU->LB_VAddr(Address,bMemory);
-		if (bMemory == ConvertXP64Value(Code.Value)) { Execute = FALSE; }
+		if (bMemory == ConvertXP64Value(Code.Value)) { Execute = false; }
 		return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
 	case 0xBB000000:
 		Address = 0x80000000 | (ConvertXP64Address(Code.Command) & 0xFFFFFF);
 		MMU->LH_VAddr(Address,wMemory);
-		if (wMemory == ConvertXP64Value(Code.Value)) { Execute = FALSE; }
+		if (wMemory == ConvertXP64Value(Code.Value)) { Execute = false; }
 		return ApplyCheatEntry(MMU,CodeEntry,CurrentEntry + 1,Execute) + 1;
 	case 0: return MaxGSEntries; break;
 	}
@@ -613,7 +616,7 @@ bool CCheats::CheatUsesCodeExtensions (const stdstr &LineEntry) {
 	return CodeExtension;
 }
 
-void CCheats::RefreshCheatManager(void) 
+void CCheats::RefreshCheatManager() 
 {
 	if (m_Window == NULL) { return; }
 	
@@ -985,6 +988,7 @@ int CALLBACK CCheats::CheatListProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lP
 			Style = GetWindowLong((HWND)_this->m_hCheatTree,GWL_STYLE);					
 			SetWindowLong((HWND)_this->m_hCheatTree,GWL_STYLE,TVS_CHECKBOXES |TVS_SHOWSELALWAYS| Style);
 
+#if defined(WINDOWS_UI)
 			//Creats an image list from the bitmap in the resource section
 			HIMAGELIST hImageList;
 			HBITMAP hBmp;
@@ -995,6 +999,9 @@ int CALLBACK CCheats::CheatListProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lP
 			DeleteObject(hBmp);
 			
 			TreeView_SetImageList((HWND)_this->m_hCheatTree,hImageList,TVSIL_STATE);
+#else
+			g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
 
 			_this->m_hSelectedItem = NULL;
 
@@ -1423,7 +1430,10 @@ int CALLBACK CCheats::ManageCheatsProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD
 			WndPlac.length = sizeof(WndPlac);
 			GetWindowPlacement(hDlg, &WndPlac);
 
+			LONG_PTR originalWndProc = GetWindowLongPtrW(hDlg, GWLP_WNDPROC);
+			SetWindowLongPtrW(hDlg, GWLP_WNDPROC, (LONG_PTR) DefWindowProcW);
 			SetWindowTextW(hDlg, GS(CHEAT_TITLE));
+			SetWindowLongPtrW(hDlg, GWLP_WNDPROC, originalWndProc);
 			_this->m_hSelectCheat = (HWND)CreateDialogParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_List),hDlg,(DLGPROC)CheatListProc,(LPARAM)_this);
 			SetWindowPos((HWND)_this->m_hSelectCheat,HWND_TOP, 5, 8, 0, 0, SWP_NOSIZE);
 			ShowWindow((HWND)_this->m_hSelectCheat,SW_SHOW);
@@ -1584,7 +1594,7 @@ int CCheats::TV_GetCheckState(HWND hwndTreeView, HWND hItem)
 	return ((int)(tvItem.state >> 12) -1);
 }
 
-void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShotCut)
+void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShortCut)
 {
 	MENUITEMINFOW MenuInfo;
 	wchar_t String[256];
@@ -1602,7 +1612,7 @@ void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, con
 	GetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo);
 	wcscpy(String,Title);
 	if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; }
-	if (ShotCut) { _swprintf(String,L"%s\t%s",String,ShotCut); }
+	if (ShortCut) { _swprintf(String,L"%s\t%s",String,ShortCut); }
 	SetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo);
 }
 
@@ -1768,7 +1778,7 @@ stdstr CCheats::ReadCodeString (HWND hDlg, bool &validcodes, bool &validoptions,
 		if (len <= 0) { continue; }
 
 		for (i=0; i<128; i++) {
-			if (((str[i] >= 'A') && (str[i] <= 'F')) || ((str[i] >= '0') && (str[i] <= '9'))) { // Is hexvalue
+			if (isxdigit(str[i])) {
 				tempformat[i] = 'X';
 			}
 			if ((str[i] == ' ') || (str[i] == '?')) {
@@ -1842,7 +1852,7 @@ stdstr CCheats::ReadOptionsString(HWND hDlg, bool &/*validcodes*/, bool &validop
 			case 1: //option = lower byte
 				if (len >= 2) {
 					for (i=0; i<2; i++) {
-						if (!(((str[i] >= 'a') && (str[i] <= 'f')) || ((str[i] >= 'A') && (str[i] <= 'F')) || ((str[i] >= '0') && (str[i] <= '9')))) {
+						if (!isxdigit(str[i])) {
 							validoptions = false;
 							break;
 						}
@@ -1875,7 +1885,7 @@ stdstr CCheats::ReadOptionsString(HWND hDlg, bool &/*validcodes*/, bool &validop
 			case 2: //option = word
 				if (len >= 4) {
 					for (i=0; i<4; i++) {
-						if (!(((str[i] >= 'a') && (str[i] <= 'f')) || ((str[i] >= 'A') && (str[i] <= 'F')) || ((str[i] >= '0') && (str[i] <= '9')))) {
+						if (!isxdigit(str[i])) {
 							validoptions = false;
 							break;
 						}
@@ -1909,6 +1919,3 @@ stdstr CCheats::ReadOptionsString(HWND hDlg, bool &/*validcodes*/, bool &validop
 	if (numoptions < 1) validoptions = false;
 	return optionsstring;
 }
-
-
-
diff --git a/Source/Project64/N64 System/Cheat Class.h b/Source/Project64/N64 System/Cheat Class.h
index c895aa9fc..9307d5701 100644
--- a/Source/Project64/N64 System/Cheat Class.h	
+++ b/Source/Project64/N64 System/Cheat Class.h	
@@ -24,10 +24,10 @@ public:
 	inline bool CheatsSlectionChanged ( void ) const { return m_CheatSelectionChanged; }
 
 private:
-	typedef struct {
+	struct GAMESHARK_CODE {
 		DWORD Command;
 		WORD  Value;
-	} GAMESHARK_CODE;
+	};
 
 	typedef std::vector<GAMESHARK_CODE> CODES;
 	typedef std::vector<CODES>          CODES_ARRAY;
@@ -62,14 +62,14 @@ private:
 	enum { MaxGSEntries = 100, IDC_MYTREE = 0x500 };
 
 	bool LoadCode ( int CheatNo, LPCSTR CheatString );
-	void AddCodeLayers           ( int CheatNumber, const stdstr &CheatName, HWND hParent, bool CheatActive ); 
+	void AddCodeLayers             ( int CheatNumber, const stdstr &CheatName, HWND hParent, bool CheatActive ); 
 	//Reload the cheats from the ini file to the select gui
-	void RefreshCheatManager      ( void );
-	void ChangeChildrenStatus     ( HWND hParent, bool Checked );
-	void CheckParentStatus        ( HWND hParent );
+	void RefreshCheatManager       ();
+	void ChangeChildrenStatus      ( HWND hParent, bool Checked );
+	void CheckParentStatus         ( HWND hParent );
 	static stdstr ReadCodeString   ( HWND hDlg, bool &validcodes, bool &validoption, bool &nooptions, int &codeformat );
 	static stdstr ReadOptionsString( HWND hDlg, bool &validcodes, bool &validoptions, bool &nooptions, int &codeformat );
-	int ApplyCheatEntry (CMipsMemory * MMU,const CODES & CodeEntry, int CurrentEntry, BOOL Execute );
+	int ApplyCheatEntry (CMipsMemory * MMU,const CODES & CodeEntry, int CurrentEntry, bool Execute );
 	void RecordCheatValues ( HWND hDlg );
 	bool CheatChanged ( HWND hDlg );
 	bool IsValid16BitCode ( LPCSTR CheatString ) const;
@@ -83,7 +83,7 @@ private:
 	static bool  TV_SetCheckState(HWND hwndTreeView, HWND hItem, TV_CHECK_STATE state);
 	static int   TV_GetCheckState(HWND hwndTreeView, HWND hItem);
 	static DWORD AsciiToHex            ( const char * HexValue );
-	static void  MenuSetText           ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShotCut );
+	static void  MenuSetText           ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShortCut );
 
 
 	//UI Functions
diff --git a/Source/Project64/N64 System/Debugger/Debug Dialog.h b/Source/Project64/N64 System/Debugger/Debug Dialog.h
index 7abd80bb1..519b02338 100644
--- a/Source/Project64/N64 System/Debugger/Debug Dialog.h	
+++ b/Source/Project64/N64 System/Debugger/Debug Dialog.h	
@@ -61,7 +61,9 @@ public:
 		if (m_hWnd)
 		{
 			SetForegroundWindow((HWND)m_hWnd);
-		} else {
+		}
+		else
+		{
 			DWORD ThreadID;
 			ResetEvent(m_CreatedEvent);
 			m_DialogThread = CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)CreateDebuggerWindow,(LPVOID)this,0, &ThreadID);
diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp
index 8c10f1d61..8d9ec77df 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CDumpMemory::CDumpMemory(CDebugger * debugger) :
@@ -140,13 +142,19 @@ LRESULT	CDumpMemory::OnClicked(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/,
 //	DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_Cheats_DumpMemory), 
 //			(HWND)hParent, (DLGPROC)WinProc,(LPARAM)this);
 //}
-//DWORD CDumpMemory::AsciiToHex (const char * HexValue) {
+//DWORD CDumpMemory::AsciiToHex (const char * HexValue)
+//{
 //	DWORD Count, Finish, Value = 0;
 //	Finish = strlen(HexValue);
-//	if (Finish > 8 ) { Finish = 8; }
-//	for (Count = 0; Count < Finish; Count++){
+//	if (Finish > 8 )
+//	{
+//		Finish = 8;
+//	}
+//	for (Count = 0; Count < Finish; Count++
+//	{
 //		Value = (Value << 4);
-//		switch( HexValue[Count] ) {
+//		switch ( HexValue[Count] )
+//		{
 //		case '0': break;
 //		case '1': Value += 1; break;
 //		case '2': Value += 2; break;
@@ -178,7 +186,8 @@ LRESULT	CDumpMemory::OnClicked(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/,
 //}
 //int CALLBACK CDumpMemory::WinProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) 
 //{
-//	switch (uMsg) {
+//	switch (uMsg)
+//	{
 //	case WM_INITDIALOG:
 //		{
 //			CDumpMemory * _this = (CDumpMemory *)lParam;
@@ -199,23 +208,39 @@ LRESULT	CDumpMemory::OnClicked(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/,
 //		case IDC_E_START_ADDR:
 //		case IDC_E_END_ADDR:
 //		case IDC_E_ALT_PC:
-//			if (HIWORD(wParam) == EN_UPDATE) {
+//			if (HIWORD(wParam) == EN_UPDATE)
+//			{
 //				CDumpMemory * _this = (CDumpMemory *)GetProp(hDlg,"Class");
 //				TCHAR szTmp[20], szTmp2[20];
 //				DWORD Value;
 //				GetDlgItemText(hDlg,LOWORD(wParam),szTmp,sizeof(szTmp));
 //				Value = szTmp[1] =='x'?AsciiToHex(&szTmp[2]):AsciiToHex(szTmp);
-//				//if (Value > Stop)  { Value = Stop; }
-//				//if (Value < Start) { Value = Start; }
+//				//if (Value > Stop)
+//				//{
+//				//	Value = Stop;
+//				//}
+//				//if (Value < Start)
+//				//{
+//				//	Value = Start;
+//				//}
 //				sprintf(szTmp2,"0x%X",Value);
-//				if (strcmp(szTmp,szTmp2) != 0) {
+//				if (strcmp(szTmp,szTmp2) != 0)
+//				{
 //					SetDlgItemText(hDlg,LOWORD(wParam),szTmp2);
-//					if (_this->SelStop == 0) { _this->SelStop = strlen(szTmp2); _this->SelStart = _this->SelStop; }
+//					if (_this->SelStop == 0)
+//					{
+//						_this->SelStop = strlen(szTmp2); _this->SelStart = _this->SelStop;
+//					}
 //					SendDlgItemMessage(hDlg,LOWORD(wParam),EM_SETSEL,(WPARAM)_this->SelStart,(LPARAM)_this->SelStop);
-//				} else {
+//				}
+//				else
+//				{
 //					WORD NewSelStart, NewSelStop;
 //					SendDlgItemMessage(hDlg,LOWORD(wParam),EM_GETSEL,(WPARAM)&NewSelStart,(LPARAM)&NewSelStop);
-//					if (NewSelStart != 0) { _this->SelStart = NewSelStart; _this->SelStop = NewSelStop; }
+//					if (NewSelStart != 0)
+//					{
+//						_this->SelStart = NewSelStart; _this->SelStop = NewSelStop;
+//					}
 //				}
 //			}
 //			break;
@@ -226,7 +251,7 @@ LRESULT	CDumpMemory::OnClicked(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/,
 //				char FileName[_MAX_PATH],Directory[_MAX_PATH];
 //				memset(&FileName, 0, sizeof(FileName));
 //				memset(&openfilename, 0, sizeof(openfilename));
-//				strcpy(Directory,g_Settings->LoadString(ApplicationDir).c_str());
+//				strcpy(Directory,g_Settings->LoadStringVal(ApplicationDir).c_str());
 //				openfilename.lStructSize  = sizeof( openfilename );
 //				openfilename.hwndOwner    = hDlg;
 //				openfilename.lpstrFilter  = "Text file (*.txt)\0*.txt;\0All files (*.*)\0*.*\0";
@@ -309,7 +334,7 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 			CLog LogFile;
 			if (!LogFile.Open(FileName))
 			{
-				g_Notify->DisplayError(L"Failed to open\n%s",FileName);
+				g_Notify->DisplayError(stdstr_f("Failed to open\n%s",FileName).ToUTF16().c_str());
 				return false;
 			}
 			LogFile.SetFlush(false);
@@ -348,15 +373,21 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 //			(HWND)hParent, (DLGPROC)WinProc,(LPARAM)this);
 //}
 //
-//DWORD CDumpMemory::AsciiToHex (const char * HexValue) {
+//DWORD CDumpMemory::AsciiToHex (const char * HexValue)
+//{
 //	DWORD Count, Finish, Value = 0;
 //
 //	Finish = strlen(HexValue);
-//	if (Finish > 8 ) { Finish = 8; }
+//	if (Finish > 8 )
+//	{
+//		Finish = 8;
+//	}
 //
-//	for (Count = 0; Count < Finish; Count++){
+//	for (Count = 0; Count < Finish; Count++)
+//	{
 //		Value = (Value << 4);
-//		switch( HexValue[Count] ) {
+//		switch ( HexValue[Count] )
+//		{
 //		case '0': break;
 //		case '1': Value += 1; break;
 //		case '2': Value += 2; break;
@@ -389,7 +420,8 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 //
 //int CALLBACK CDumpMemory::WinProc (HWND hDlg,DWORD uMsg,DWORD wParam, DWORD lParam) 
 //{
-//	switch (uMsg) {
+//	switch (uMsg)
+//	{
 //	case WM_INITDIALOG:
 //		{
 //			CDumpMemory * _this = (CDumpMemory *)lParam;
@@ -412,7 +444,8 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 //		case IDC_E_START_ADDR:
 //		case IDC_E_END_ADDR:
 //		case IDC_E_ALT_PC:
-//			if (HIWORD(wParam) == EN_UPDATE) {
+//			if (HIWORD(wParam) == EN_UPDATE)
+//			{
 //				CDumpMemory * _this = (CDumpMemory *)GetProp(hDlg,"Class");
 //
 //				TCHAR szTmp[20], szTmp2[20];
@@ -420,17 +453,29 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 //
 //				GetDlgItemText(hDlg,LOWORD(wParam),szTmp,sizeof(szTmp));
 //				Value = szTmp[1] =='x'?AsciiToHex(&szTmp[2]):AsciiToHex(szTmp);
-//				//if (Value > Stop)  { Value = Stop; }
-//				//if (Value < Start) { Value = Start; }
+//				//if (Value > Stop) 
+//				//{
+//				//	Value = Stop;
+//				//}
+//				//if (Value < Start)
+//				//{
+//				//	Value = Start;
+//				//}
 //				sprintf(szTmp2,"0x%X",Value);
-//				if (strcmp(szTmp,szTmp2) != 0) {
+//				if (strcmp(szTmp,szTmp2) != 0)
+//				{
 //					SetDlgItemText(hDlg,LOWORD(wParam),szTmp2);
 //					if (_this->SelStop == 0) { _this->SelStop = strlen(szTmp2); _this->SelStart = _this->SelStop; }
 //					SendDlgItemMessage(hDlg,LOWORD(wParam),EM_SETSEL,(WPARAM)_this->SelStart,(LPARAM)_this->SelStop);
-//				} else {
+//				}
+//				else
+//				{
 //					WORD NewSelStart, NewSelStop;
 //					SendDlgItemMessage(hDlg,LOWORD(wParam),EM_GETSEL,(WPARAM)&NewSelStart,(LPARAM)&NewSelStop);
-//					if (NewSelStart != 0) { _this->SelStart = NewSelStart; _this->SelStop = NewSelStop; }
+//					if (NewSelStart != 0)
+//					{
+//						_this->SelStart = NewSelStart; _this->SelStop = NewSelStop;
+//					}
 //				}
 //			}
 //			break;
@@ -444,7 +489,7 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 //				memset(&FileName, 0, sizeof(FileName));
 //				memset(&openfilename, 0, sizeof(openfilename));
 //
-//				strcpy(Directory,g_Settings->LoadString(ApplicationDir).c_str());
+//				strcpy(Directory,g_Settings->LoadStringVal(ApplicationDir).c_str());
 //
 //				openfilename.lStructSize  = sizeof( openfilename );
 //				openfilename.hwndOwner    = hDlg;
@@ -550,3 +595,4 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 //	}
 //	return false;
 //}
+#endif
diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp
index 2092e5640..9ea8ddc66 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CDebugMemorySearch::CDebugMemorySearch(CDebugger * debugger) :
@@ -226,7 +228,9 @@ void CDebugMemorySearch::EnableUnknownOptions( bool Enable )
 		{
 			::SetWindowText(GetDlgItem(IDC_BTN_SEARCH), m_HaveResults ? "Search Results" : "Search");
 		}
-	} else {
+	}
+	else
+	{
 		::EnableWindow(GetDlgItem(IDC_UNKNOWN_ALIGN), false );
 		if (Enable)
 		{
@@ -249,8 +253,14 @@ void CDebugMemorySearch::SearchForValue( void )
 	m_UnknownSize.SetCurSel(m_ValueSize.GetCurSel());
 
 	LPCTSTR DisplayStr = "0x%08X";
-	if (Size == _16Bit) { DisplayStr = "0x%04X"; }
-	else if (Size == _8Bit) { DisplayStr = "0x%04X"; }
+	if (Size == _16Bit)
+	{
+		DisplayStr = "0x%04X";
+	}
+	else if (Size == _8Bit)
+	{
+		DisplayStr = "0x%04X";
+	}
 
 	if (!m_HaveResults)
 	{		
@@ -288,7 +298,9 @@ void CDebugMemorySearch::SearchForValue( void )
 		::SetWindowText(GetDlgItem(IDC_BTN_SEARCH),"Search Results");
 		::ShowWindow(GetDlgItem(IDC_RESET_BUTTON),SW_SHOW);
 		::EnableWindow(GetDlgItem(IDC_VALUE_ALIGN),false);
-	} else {
+	}
+	else
+	{
 		int ItemCount = m_SearchResults.GetItemCount();
 		for (int i = ItemCount - 1; i >= 0; i--)
 		{
@@ -296,9 +308,10 @@ void CDebugMemorySearch::SearchForValue( void )
 			SearchResultItem & Result = m_SearchResult[ItemId];
 			
 			DWORD NewValue = 0;
-			BOOL valid = false;
+			bool valid = false;
 
-			switch (Size) {
+			switch (Size)
+			{
 			case _8Bit:
 				{
 					BYTE mem = 0;
@@ -328,7 +341,9 @@ void CDebugMemorySearch::SearchForValue( void )
 				sprintf(LocationStr,DisplayStr,Result.Value);
 				m_SearchResults.SetItemText(i,3,LocationStr);
 				Result.Value = NewValue;
-			} else {
+			}
+			else
+			{
 				m_SearchResults.DeleteItem(i);
 			}
 		}
@@ -351,8 +366,14 @@ void CDebugMemorySearch::SearchForUnknown()
 	MemorySize Size = (MemorySize)m_UnknownSize.GetItemData(m_UnknownSize.GetCurSel());
 	m_ValueSize.SetCurSel(m_UnknownSize.GetCurSel());
 	LPCTSTR DisplayStr = "0x%08X";
-	if (Size == _16Bit) { DisplayStr = "0x%04X"; }
-	else if (Size == _8Bit) { DisplayStr = "0x%04X"; }
+	if (Size == _16Bit)
+	{
+		DisplayStr = "0x%04X";
+	}
+	else if (Size == _8Bit)
+	{
+		DisplayStr = "0x%04X";
+	}
 	if (!m_HaveResults)
 	{		
 		m_HaveResults = true;
@@ -411,7 +432,9 @@ void CDebugMemorySearch::SearchForUnknown()
 		::ShowWindow(GetDlgItem(IDC_RESET_BUTTON),SW_SHOW);
 		::EnableWindow(GetDlgItem(IDC_RADIO_TEXT),false);
 		::EnableWindow(GetDlgItem(IDC_RADIO_JAL),false);
-	} else {
+	}
+	else
+	{
 		int ItemCount = m_SearchResults.GetItemCount();
 		for (int i = ItemCount - 1; i >= 0; i--)
 		{
@@ -420,9 +443,10 @@ void CDebugMemorySearch::SearchForUnknown()
 			
 			bool UpdateResult = false;
 			DWORD NewValue = 0;
-			BOOL valid = false;
+			bool valid = false;
 
-			switch (Size) {
+			switch (Size)
+			{
 			case _8Bit:
 				{
 					BYTE mem = 0;
@@ -482,7 +506,9 @@ void CDebugMemorySearch::SearchForUnknown()
 				sprintf(LocationStr,DisplayStr,Result.Value);
 				m_SearchResults.SetItemText(i,3,LocationStr);
 				Result.Value = NewValue;
-			} else {
+			}
+			else
+			{
 				m_SearchResults.DeleteItem(i);
 			}
 		}
@@ -652,8 +678,14 @@ bool CDebugMemorySearch::SearchForValue (DWORD Value, MemorySize Size, DWORD &St
 		return false;
 	}
 
-	if (Size == _32Bit) { StartAddress = ((StartAddress + 3) & ~3); }
-	if (Size == _16Bit) { StartAddress = ((StartAddress + 1) & ~1); }
+	if (Size == _32Bit)
+	{
+		StartAddress = ((StartAddress + 3) & ~3);
+	}
+	if (Size == _16Bit)
+	{
+		StartAddress = ((StartAddress + 1) & ~1);
+	}
 
 	//search memory
 	if (StartAddress < g_MMU->RdramSize())
@@ -757,4 +789,4 @@ bool CDebugMemorySearch::SearchForValue (DWORD Value, MemorySize Size, DWORD &St
 	}
 	return false;
 }
-
+#endif
diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.h b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.h
index 1ca9fec22..40e67bd76 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.h	
+++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.h	
@@ -41,10 +41,11 @@ private:
 		SearchChangeState_Lessthan,
 	};
 
-	typedef struct {
+	struct SearchResultItem
+	{
 		DWORD PAddr;
 		DWORD Value;
-	} SearchResultItem;
+	};
 
 	typedef std::vector<SearchResultItem> SearchResult;
 
diff --git a/Source/Project64/N64 System/Debugger/Debugger - TLB.cpp b/Source/Project64/N64 System/Debugger/Debugger - TLB.cpp
index 3e5fb4275..4662fbb4a 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - TLB.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger - TLB.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CDebugTlb::CDebugTlb(CDebugger * debugger) :
@@ -115,7 +117,8 @@ void CDebugTlb::RefreshTLBWindow (void)
 	int count;
 
 	CTLB::TLB_ENTRY * tlb = g_TLB->m_tlb;	
-	for (count = 0; count < 32; count ++) {
+	for (count = 0; count < 32; count ++)
+	{
 		sprintf(Output,"0x%02X",count);
 		item.mask      = LVIF_TEXT;
 		item.iItem     = count;
@@ -128,66 +131,87 @@ void CDebugTlb::RefreshTLBWindow (void)
 		OldItem.cchTextMax = sizeof( OldText )-1;
 		OldItem.iSubItem   = 0;
 
-		if (ListView_GetItemCount(hList) <= count) {
+		if (ListView_GetItemCount(hList) <= count)
+		{
 			ListView_InsertItem(hList,&item);
-		} else {
+		}
+		else
+		{
 			ListView_GetItem(hList,&OldItem);
-			if ( strcmp( item.pszText, OldItem.pszText ) != 0 ) {
+			if ( strcmp( item.pszText, OldItem.pszText ) != 0 )
+			{
 				ListView_SetItem(hList,&item);
 			}
 		}
-		if (tlb[count].EntryDefined) {
+		if (tlb[count].EntryDefined)
+		{
 			sprintf(Output,"0x%08X",tlb[count].PageMask.Value);
-		} else {
+		}
+		else
+		{
 			strcpy(Output,"................");
 		}
 		item.iSubItem  = 1;
 		OldItem.iSubItem   = 1;
 		ListView_GetItem(hList,&OldItem);
-		if ( strcmp( item.pszText, OldItem.pszText ) != 0 ) {
+		if ( strcmp( item.pszText, OldItem.pszText ) != 0 )
+		{
 			ListView_SetItem(hList,&item);
 		}
 
-		if (tlb[count].EntryDefined) {
+		if (tlb[count].EntryDefined)
+		{
 			sprintf(Output,"0x%08X",tlb[count].EntryHi.Value);
-		} else {
+		}
+		else
+		{
 			strcpy(Output,"................");
 		}
 		item.iSubItem  = 2;
 		OldItem.iSubItem   = 2;
 		ListView_GetItem(hList,&OldItem);
-		if ( strcmp( item.pszText, OldItem.pszText ) != 0 ) {
+		if ( strcmp( item.pszText, OldItem.pszText ) != 0 )
+		{
 			ListView_SetItem(hList,&item);
 		}
 
-		if (tlb[count].EntryDefined) {
+		if (tlb[count].EntryDefined)
+		{
 			sprintf(Output,"0x%08X",tlb[count].EntryLo0.Value);
-		} else {
+		}
+		else
+		{
 			strcpy(Output,"................");
 		}
 		item.iSubItem  = 3;
 		OldItem.iSubItem   = 3;
 		ListView_GetItem(hList,&OldItem);
-		if ( strcmp( item.pszText, OldItem.pszText ) != 0 ) {
+		if ( strcmp( item.pszText, OldItem.pszText ) != 0 )
+		{
 			ListView_SetItem(hList,&item);
 		}
 
-		if (tlb[count].EntryDefined) {
+		if (tlb[count].EntryDefined)
+		{
 			sprintf(Output,"0x%08X",tlb[count].EntryLo1.Value);
-		} else {
+		}
+		else
+		{
 			strcpy(Output,"................");
 		}
 		item.iSubItem  = 4;
 		OldItem.iSubItem   = 4;
 		ListView_GetItem(hList,&OldItem);
-		if ( strcmp( item.pszText, OldItem.pszText ) != 0 ) {
+		if ( strcmp( item.pszText, OldItem.pszText ) != 0 )
+		{
 			ListView_SetItem(hList,&item);
 		}
 	}
 	
 	CTLB::FASTTLB   * FastTlb = g_TLB->m_FastTlb;
 	hList = GetDlgItem(IDC_LIST2);	
-	for (count = 0; count < 64; count ++) {
+	for (count = 0; count < 64; count ++)
+	{
 		sprintf(Output,"0x%02X",count);
 		item.mask      = LVIF_TEXT;
 		item.iItem     = count;
@@ -200,50 +224,67 @@ void CDebugTlb::RefreshTLBWindow (void)
 		OldItem.cchTextMax = sizeof( OldText )-1;
 		OldItem.iSubItem   = 0;
 
-		if (ListView_GetItemCount(hList) <= count) {
+		if (ListView_GetItemCount(hList) <= count)
+		{
 			item.iItem = ListView_InsertItem(hList,&item);
-		} else {
+		}
+		else
+		{
 			ListView_GetItem(hList,&OldItem);
-			if ( strcmp( item.pszText, OldItem.pszText ) != 0 ) {
+			if ( strcmp( item.pszText, OldItem.pszText ) != 0 )
+			{
 				ListView_SetItem(hList,&item);
 			}
 		}
 
-		if (FastTlb[count].ValidEntry) {
+		if (FastTlb[count].ValidEntry)
+		{
 			sprintf(Output,"%s",FastTlb[count].VALID?"Yes":"No");
-		} else {
+		}
+		else
+		{
 			strcpy(Output,"................");
 		}
 		item.iSubItem  = 1;
 		OldItem.iSubItem   = 1;
 		ListView_GetItem(hList,&OldItem);
-		if ( strcmp( item.pszText, OldItem.pszText ) != 0 ) {
+		if ( strcmp( item.pszText, OldItem.pszText ) != 0 )
+		{
 			ListView_SetItem(hList,&item);
 		}
 
-		if (FastTlb[count].ValidEntry && FastTlb[count].VALID) {
+		if (FastTlb[count].ValidEntry && FastTlb[count].VALID)
+		{
 			sprintf(Output,"%s",FastTlb[count].DIRTY?"Yes":"No");
-		} else {
+		}
+		else
+		{
 			strcpy(Output,"................");
 		}
 		item.iSubItem  = 2;
 		OldItem.iSubItem   = 2;
 		ListView_GetItem(hList,&OldItem);
-		if ( strcmp( item.pszText, OldItem.pszText ) != 0 ) {
+		if ( strcmp( item.pszText, OldItem.pszText ) != 0 )
+		{
 			ListView_SetItem(hList,&item);
 		}
 
-		if (FastTlb[count].ValidEntry && FastTlb[count].VALID) {
+		if (FastTlb[count].ValidEntry && FastTlb[count].VALID)
+		{
 			sprintf(Output,"%08X:%08X -> %08X:%08X",FastTlb[count].VSTART,FastTlb[count].VEND,
 				FastTlb[count].PHYSSTART,FastTlb[count].PHYSEND);
-		} else {
+		}
+		else
+		{
 			strcpy(Output,"................");
 		}
 		item.iSubItem  = 3;
 		OldItem.iSubItem  = 3;
 		ListView_GetItem(hList,&OldItem);
-		if ( strcmp( item.pszText, OldItem.pszText ) != 0 ) {
+		if ( strcmp( item.pszText, OldItem.pszText ) != 0 )
+		{
 			ListView_SetItem(hList,&item);
 		}
 	}
 }
+#endif
diff --git a/Source/Project64/N64 System/Debugger/Debugger - View Memory.cpp b/Source/Project64/N64 System/Debugger/Debugger - View Memory.cpp
index 93f960841..7973689fb 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - View Memory.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger - View Memory.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CDebugMemoryView::CDebugMemoryView(CDebugger * debugger) :
@@ -34,7 +36,8 @@ LRESULT	CDebugMemoryView::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM
 	memset(m_CompareValid,0,sizeof(m_CompareValid));
 
 	HWND hScrlBar = GetDlgItem(IDC_SCRL_BAR);
-	if (hScrlBar) {
+	if (hScrlBar)
+	{
 		SCROLLINFO si;
 
 		si.cbSize = sizeof(si);
@@ -121,7 +124,7 @@ LRESULT CDebugMemoryView::OnDestroy ( void )
 
 LRESULT CDebugMemoryView::OnClicked (WORD /*wNotifyCode*/, WORD wID, HWND , BOOL& /*bHandled*/)
 {
-	switch(wID)
+	switch (wID)
 	{
 	case IDC_REFRSH_MEM:
 		RefreshMemory(true);
@@ -162,7 +165,10 @@ LRESULT CDebugMemoryView::OnMemoryModified ( LPNMHDR lpNMHDR )
 
 	LPCSTR strValue = m_MemoryList->GetItemText(pListNotify->m_nItem,pListNotify->m_nSubItem);
 	int Finish = strlen(strValue);
-	if (Finish > 8) { Finish = 8; }
+	if (Finish > 8)
+	{
+		Finish = 8;
+	}
 	DWORD Value = 0;
 	for (int i = 0; i < Finish; i++)
 	{
@@ -206,7 +212,9 @@ LRESULT CDebugMemoryView::OnMemoryModified ( LPNMHDR lpNMHDR )
 		{
 			WriteTraceF(TraceError,__FUNCTION__ ": failed to store at %X",m_DataStartLoc + Pos);
 		}
-	} else {
+	}
+	else
+	{
 		if (!g_MMU->SB_PAddr(m_DataStartLoc + Pos,(BYTE)Value))
 		{
 			WriteTraceF(TraceError,__FUNCTION__ ": failed to store at %X",m_DataStartLoc + Pos);
@@ -249,7 +257,9 @@ void CDebugMemoryView::Insert_MemoryLineDump ( int LineNumber )
 				m_MemoryList->SetItemText(LineNumber,i,"-");
 			}
 		}
-	} else {
+	}
+	else
+	{
 		if ( strcmp( Output, m_MemoryList->GetItemText(LineNumber, 0) ) != 0 ) 
 		{
 			m_MemoryList->SetItemText(LineNumber,0,Output);
@@ -286,11 +296,15 @@ void CDebugMemoryView::Insert_MemoryLineDump ( int LineNumber )
 			if (m_CurrentData[Pos] < 30)
 			{
 				strcat(Ascii,".");
-			} else {
+			}
+			else
+			{
 				sprintf(AsciiAddOn,"%c",m_CurrentData[Pos]);
 				strcat(Ascii,AsciiAddOn);
 			}
-		} else {
+		}
+		else
+		{
 			m_MemoryList->SetItemText(LineNumber,col,"**");
 			m_MemoryList->SetItemFormat( LineNumber,col, ITEM_FORMAT_NONE, ITEM_FLAGS_NONE );
 			m_MemoryList->SetItemColours( LineNumber, col, GetSysColor( COLOR_WINDOW ), GetSysColor( COLOR_WINDOWTEXT ) );
@@ -393,7 +407,9 @@ void CDebugMemoryView::RefreshMemory ( bool ResetCompare )
 			{ 
 				ValidData = false;
 			}
-		} else {
+		}
+		else
+		{
 			if (!g_MMU->LW_PAddr(m_DataStartLoc & ~3, word.UW)) 
 			{ 
 				ValidData = false;
@@ -428,7 +444,9 @@ void CDebugMemoryView::RefreshMemory ( bool ResetCompare )
 			{ 
 				ValidData = false;
 			}
-		} else {
+		}
+		else
+		{
 			if (!g_MMU->LW_PAddr(Pos, word.UW)) 
 			{ 
 				ValidData = false;
@@ -449,7 +467,9 @@ void CDebugMemoryView::RefreshMemory ( bool ResetCompare )
 		}
 	}
 
-	for (int count = 0 ; count < 16;count ++ ){
+	for (int count = 0 ; count < 16;count ++)
+	{
 		Insert_MemoryLineDump ( count );
 	}
 }
+#endif
diff --git a/Source/Project64/N64 System/Debugger/Debugger UI.h b/Source/Project64/N64 System/Debugger/Debugger UI.h
index d4e1d4e18..0884e6cf4 100644
--- a/Source/Project64/N64 System/Debugger/Debugger UI.h	
+++ b/Source/Project64/N64 System/Debugger/Debugger UI.h	
@@ -44,5 +44,3 @@
 #include "Debugger - View Memory.h"
 #include "Debugger - Memory Dump.h"
 #include "Debugger - TLB.h"
-
-
diff --git a/Source/Project64/N64 System/Debugger/Debugger.cpp b/Source/Project64/N64 System/Debugger/Debugger.cpp
index 304f735f9..ea190aaf3 100644
--- a/Source/Project64/N64 System/Debugger/Debugger.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CPj64Module _Module;
@@ -130,3 +132,4 @@ void CDebugger::Debug_ShowMemorySearch()
 		m_MemorySearch->ShowWindow();
 	}
 }
+#endif
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp b/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp
index b98c24d15..62596c765 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp	
@@ -17,18 +17,22 @@ void ExecuteInterpreterOps (DWORD /*Cycles*/)
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2) {
+bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2)
+{
 	OPCODE Command;
 
-	if (!g_MMU->LW_VAddr(PC + 4, Command.Hex)) {
+	if (!g_MMU->LW_VAddr(PC + 4, Command.Hex))
+	{
 		//g_Notify->DisplayError(L"Failed to load word 2");
 		//ExitThread(0);
-		return TRUE;
+		return true;
 	}
 
-	switch (Command.op) {
+	switch (Command.op)
+	{
 	case R4300i_SPECIAL:
-		switch (Command.funct) {
+		switch (Command.funct)
+		{
 		case R4300i_SPECIAL_SLL:
 		case R4300i_SPECIAL_SRL:
 		case R4300i_SPECIAL_SRA:
@@ -62,9 +66,14 @@ bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2) {
 		case R4300i_SPECIAL_DSLL32:
 		case R4300i_SPECIAL_DSRL32:
 		case R4300i_SPECIAL_DSRA32:
-			if (Command.rd == 0) { return FALSE; }
-			if (Command.rd == Reg1) { return TRUE; }
-			if (Command.rd == Reg2) { return TRUE; }
+			if (Command.rd == 0)
+			{
+				return false;
+			}
+			if (Command.rd == Reg1 || Command.rd == Reg2)
+			{
+				return true;
+			}
 			break;
 		case R4300i_SPECIAL_MULT:
 		case R4300i_SPECIAL_MULTU:
@@ -78,22 +87,30 @@ bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2) {
 		default:
 			if (g_Settings->LoadBool(Debugger_Enabled)) 
 			{
-				g_Notify->DisplayError(L"Does %s effect Delay slot at %X?",R4300iOpcodeName(Command.Hex,PC+4), PC);
+				g_Notify->DisplayError(stdstr_f("Does %s effect Delay slot at %X?",R4300iOpcodeName(Command.Hex,PC+4), PC).ToUTF16().c_str());
 			}
-			return TRUE;
+			return true;
 		}
 		break;
 	case R4300i_CP0:
-		switch (Command.rs) {
+		switch (Command.rs)
+		{
 		case R4300i_COP0_MT: break;
 		case R4300i_COP0_MF:
-			if (Command.rt == 0) { return FALSE; }
-			if (Command.rt == Reg1) { return TRUE; }
-			if (Command.rt == Reg2) { return TRUE; }
+			if (Command.rt == 0)
+			{
+				return false;
+			}
+			if (Command.rt == Reg1 || Command.rt == Reg2)
+			{
+				return true;
+			}
 			break;
 		default:
-			if ( (Command.rs & 0x10 ) != 0 ) {
-				switch( Command.funct ) {
+			if ( (Command.rs & 0x10 ) != 0 )
+			{
+				switch (Command.funct)
+				{
 				case R4300i_COP0_CO_TLBR: break;
 				case R4300i_COP0_CO_TLBWI: break;
 				case R4300i_COP0_CO_TLBWR: break;
@@ -101,25 +118,33 @@ bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2) {
 				default: 
 					if (g_Settings->LoadBool(Debugger_Enabled)) 
 					{
-						g_Notify->DisplayError(L"Does %s effect Delay slot at %X?\n6",R4300iOpcodeName(Command.Hex,PC+4), PC);
+						g_Notify->DisplayError(stdstr_f("Does %s effect Delay slot at %X?\n6",R4300iOpcodeName(Command.Hex,PC+4), PC).ToUTF16().c_str());
 					}
-					return TRUE;
+					return true;
 				}
-			} else {
+			}
+			else
+			{
 				if (g_Settings->LoadBool(Debugger_Enabled)) 
 				{
-					g_Notify->DisplayError(L"Does %s effect Delay slot at %X?\n7",R4300iOpcodeName(Command.Hex,PC+4), PC);
+					g_Notify->DisplayError(stdstr_f("Does %s effect Delay slot at %X?\n7",R4300iOpcodeName(Command.Hex,PC+4), PC).ToUTF16().c_str());
 				}
-				return TRUE;
+				return true;
 			}
 		}
 		break;
 	case R4300i_CP1:
-		switch (Command.fmt) {
+		switch (Command.fmt)
+		{
 		case R4300i_COP1_MF:
-			if (Command.rt == 0) { return FALSE; }
-			if (Command.rt == Reg1) { return TRUE; }
-			if (Command.rt == Reg2) { return TRUE; }
+			if (Command.rt == 0)
+			{
+				return false;
+			}
+			if (Command.rt == Reg1 || Command.rt == Reg2)
+			{
+				return true;
+			}
 			break;
 		case R4300i_COP1_CF: break;
 		case R4300i_COP1_MT: break;
@@ -131,9 +156,9 @@ bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2) {
 		default:
 			if (g_Settings->LoadBool(Debugger_Enabled)) 
 			{
-				g_Notify->DisplayError(L"Does %s effect Delay slot at %X?",R4300iOpcodeName(Command.Hex,PC+4), PC);
+				g_Notify->DisplayError(stdstr_f("Does %s effect Delay slot at %X?",R4300iOpcodeName(Command.Hex,PC+4), PC).ToUTF16().c_str());
 			}
-			return TRUE;
+			return true;
 		}
 		break;
 	case R4300i_ANDI:
@@ -158,9 +183,14 @@ bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2) {
 	case R4300i_LD:
 	case R4300i_LWC1:
 	case R4300i_LDC1:
-		if (Command.rt == 0) { return FALSE; }
-		if (Command.rt == Reg1) { return TRUE; }
-		if (Command.rt == Reg2) { return TRUE; }
+		if (Command.rt == 0)
+		{
+			return false;
+		}
+		if (Command.rt == Reg1 || Command.rt == Reg2)
+		{
+			return true;
+		}
 		break;
 	case R4300i_CACHE: break;
 	case R4300i_SB: break;
@@ -174,30 +204,36 @@ bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2) {
 	default:
 		if (g_Settings->LoadBool(Debugger_Enabled)) 
 		{
-			g_Notify->DisplayError(L"Does %s effect Delay slot at %X?",R4300iOpcodeName(Command.Hex,PC+4), PC);
+			g_Notify->DisplayError(stdstr_f("Does %s effect Delay slot at %X?",R4300iOpcodeName(Command.Hex,PC+4), PC).ToUTF16().c_str());
 		}
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
 
-void CInterpreterCPU::BuildCPU (void )
+void CInterpreterCPU::BuildCPU()
 { 
-	R4300iOp::m_TestTimer       = FALSE;
+	R4300iOp::m_TestTimer       = false;
 	R4300iOp::m_NextInstruction = NORMAL;
 	R4300iOp::m_JumpToLocation  = 0;
 	
 	if (g_Settings->LoadBool(Game_32Bit))
 	{
 		m_R4300i_Opcode = R4300iOp32::BuildInterpreter();
-	} else {
+	}
+	else
+	{
 		m_R4300i_Opcode = R4300iOp::BuildInterpreter();
 	}
 }
 
-void CInterpreterCPU::InPermLoop (void) {
+void CInterpreterCPU::InPermLoop()
+{
 	// *** Changed ***/
-	//if (CPU_Type == CPU_SyncCores) { SyncRegisters.CP0[9] +=5; }
+	//if (CPU_Type == CPU_SyncCores)
+	//{
+	//	SyncRegisters.CP0[9] +=5;
+	//}
 
 	/* Interrupts enabled */
 	if (( g_Reg->STATUS_REGISTER & STATUS_IE  ) == 0 ||
@@ -205,34 +241,40 @@ void CInterpreterCPU::InPermLoop (void) {
 		( g_Reg->STATUS_REGISTER & STATUS_ERL ) != 0 ||
 		( g_Reg->STATUS_REGISTER & 0xFF00) == 0) 
 	{
-		if (g_Plugins->Gfx()->UpdateScreen != NULL) { g_Plugins->Gfx()->UpdateScreen(); }
+		if (g_Plugins->Gfx()->UpdateScreen != NULL)
+		{
+			g_Plugins->Gfx()->UpdateScreen();
+		}
 		//CurrentFrame = 0;
 		//CurrentPercent = 0;
 		//DisplayFPS();
 		g_Notify->DisplayError(GS(MSG_PERM_LOOP));
 		g_System->CloseCpu();
-	} else {
-		if (*g_NextTimer > 0) {
+	}
+	else
+	{
+		if (*g_NextTimer > 0)
+		{
 			*g_NextTimer = 0 - g_System->CountPerOp();
 			g_SystemTimer->UpdateTimers();
 		}
 	}
 }
 
-void CInterpreterCPU::ExecuteCPU (void )
+void CInterpreterCPU::ExecuteCPU()
 { 	
 	bool   & Done            = g_System->m_EndEmulation;
 	DWORD  & PROGRAM_COUNTER = *_PROGRAM_COUNTER;
 	OPCODE & Opcode          = R4300iOp::m_Opcode;
 	DWORD  & JumpToLocation  = R4300iOp::m_JumpToLocation;
-	BOOL   & TestTimer       = R4300iOp::m_TestTimer;
+	bool   & TestTimer       = R4300iOp::m_TestTimer;
 	const BOOL & bDoSomething= g_SystemEvents->DoSomething();
 	DWORD CountPerOp         = g_System->CountPerOp();
 	int & NextTimer = *g_NextTimer;
 	
 	__try 
 	{
-		while(!Done)
+		while (!Done)
 		{
 			if (g_MMU->LW_VAddr(PROGRAM_COUNTER, Opcode.Hex)) 
 			{
@@ -265,7 +307,7 @@ void CInterpreterCPU::ExecuteCPU (void )
 						R4300iOp::m_NextInstruction = NORMAL;
 						if (CheckTimer)
 						{
-							TestTimer = FALSE;
+							TestTimer = false;
 							if (NextTimer < 0) 
 							{ 
 								g_SystemTimer->TimerDone();
@@ -290,31 +332,34 @@ void CInterpreterCPU::ExecuteCPU (void )
 				default:
 					g_Notify->BreakPoint(__FILEW__,__LINE__);
 				}
-			} else { 
+			}
+			else
+			{ 
 				g_Reg->DoTLBReadMiss(R4300iOp::m_NextInstruction == JUMP,PROGRAM_COUNTER);
 				R4300iOp::m_NextInstruction = NORMAL;
 			}
 		}
-	} __except( g_MMU->MemoryFilter( GetExceptionCode(), GetExceptionInformation()) ) {
+	} __except( g_MMU->MemoryFilter( GetExceptionCode(), GetExceptionInformation()) )
+	{
 		g_Notify->DisplayError(GS(MSG_UNKNOWN_MEM_ACTION));
 		ExitThread(0);
 	}
 }
 
 
-void CInterpreterCPU::ExecuteOps ( int Cycles )
+void CInterpreterCPU::ExecuteOps(int Cycles)
 {
 	bool   & Done            = g_System->m_EndEmulation;
 	DWORD  & PROGRAM_COUNTER = *_PROGRAM_COUNTER;
 	OPCODE & Opcode          = R4300iOp::m_Opcode;
 	DWORD  & JumpToLocation  = R4300iOp::m_JumpToLocation;
-	BOOL   & TestTimer       = R4300iOp::m_TestTimer;
-	const BOOL & DoSomething     = g_SystemEvents->DoSomething();
+	bool   & TestTimer       = R4300iOp::m_TestTimer;
+	const BOOL & DoSomething = g_SystemEvents->DoSomething();
 	DWORD CountPerOp         = g_System->CountPerOp();
 	
 	__try 
 	{
-		while(!Done)
+		while (!Done)
 		{
 			if (Cycles <= 0) 
 			{
@@ -372,9 +417,9 @@ void CInterpreterCPU::ExecuteOps ( int Cycles )
 						R4300iOp::m_NextInstruction = NORMAL;
 						if (CheckTimer)
 						{
-							TestTimer = FALSE;
-							if (*g_NextTimer < 0) 
-							{ 
+							TestTimer = false;
+							if (*g_NextTimer < 0)
+							{
 								g_SystemTimer->TimerDone();
 							}
 							if (DoSomething)
@@ -397,12 +442,15 @@ void CInterpreterCPU::ExecuteOps ( int Cycles )
 				default:
 					g_Notify->BreakPoint(__FILEW__,__LINE__);
 				}
-			} else { 
+			}
+			else
+			{ 
 				g_Reg->DoTLBReadMiss(R4300iOp::m_NextInstruction == JUMP,PROGRAM_COUNTER);
 				R4300iOp::m_NextInstruction = NORMAL;
 			}
 		}
-	} __except( g_MMU->MemoryFilter( GetExceptionCode(), GetExceptionInformation()) ) {
+	} __except( g_MMU->MemoryFilter( GetExceptionCode(), GetExceptionInformation()) )
+	{
 		g_Notify->DisplayError(GS(MSG_UNKNOWN_MEM_ACTION));
 		ExitThread(0);
 	}
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter CPU.h b/Source/Project64/N64 System/Interpreter/Interpreter CPU.h
index 2ab1833ba..8283f56ac 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter CPU.h	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter CPU.h	
@@ -14,15 +14,15 @@ class CInterpreterCPU :
 	private R4300iOp
 {
 public:
-	static void BuildCPU   ( void );
-	static void ExecuteCPU ( void );
-	static void ExecuteOps ( int Cycles );
-	static void InPermLoop ( void );
+	static void BuildCPU();
+	static void ExecuteCPU();
+	static void ExecuteOps(int Cycles);
+	static void InPermLoop();
 
 private:
-	CInterpreterCPU(void);									// Disable default constructor
-	CInterpreterCPU(const CInterpreterCPU&);				// Disable copy constructor
-	CInterpreterCPU& operator=(const CInterpreterCPU&);		// Disable assignment
+	CInterpreterCPU();                                  // Disable default constructor
+	CInterpreterCPU(const CInterpreterCPU&);            // Disable copy constructor
+	CInterpreterCPU& operator=(const CInterpreterCPU&); // Disable assignment
 
 	static R4300iOp::Func * m_R4300i_Opcode;
 };
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp
index a691f7a6c..ee5934aac 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp	
@@ -34,7 +34,7 @@ bool DelaySlotEffectsCompare ( DWORD PC, DWORD Reg1, DWORD Reg2 );
 	m_JumpToLocation = (*_PROGRAM_COUNTER);\
 	return;
 
-R4300iOp32::Func * R4300iOp32::BuildInterpreter (void )
+R4300iOp32::Func * R4300iOp32::BuildInterpreter()
 { 
 	Jump_Opcode[ 0] = SPECIAL;
 	Jump_Opcode[ 1] = REGIMM;
@@ -628,7 +628,8 @@ R4300iOp32::Func * R4300iOp32::BuildInterpreter (void )
 
 
 /************************* Opcode functions *************************/
-void R4300iOp32::JAL (void) {
+void R4300iOp32::JAL()
+{
 	m_NextInstruction = DELAY_SLOT;
 	m_JumpToLocation = ((*_PROGRAM_COUNTER) & 0xF0000000) + (m_Opcode.target << 2);
 	_GPR[31].UW[0] = (*_PROGRAM_COUNTER) + 8;
@@ -639,9 +640,11 @@ void R4300iOp32::JAL (void) {
 	}
 }
 
-void R4300iOp32::BEQ (void) {
+void R4300iOp32::BEQ()
+{
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].W[0] == _GPR[m_Opcode.rt].W[0]) {
+	if (_GPR[m_Opcode.rs].W[0] == _GPR[m_Opcode.rt].W[0])
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{			
@@ -650,14 +653,18 @@ void R4300iOp32::BEQ (void) {
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::BNE (void) {
+void R4300iOp32::BNE()
+{
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].W[0] != _GPR[m_Opcode.rt].W[0]) {
+	if (_GPR[m_Opcode.rs].W[0] != _GPR[m_Opcode.rt].W[0])
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{
@@ -666,14 +673,17 @@ void R4300iOp32::BNE (void) {
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::BLEZ (void) {
+void R4300iOp32::BLEZ() {
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].W[0] <= 0) {
+	if (_GPR[m_Opcode.rs].W[0] <= 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{
@@ -682,14 +692,18 @@ void R4300iOp32::BLEZ (void) {
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::BGTZ (void) {
+void R4300iOp32::BGTZ()
+{
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].W[0] > 0) {
+	if (_GPR[m_Opcode.rs].W[0] > 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{
@@ -698,48 +712,61 @@ void R4300iOp32::BGTZ (void) {
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::ADDI (void) {
+void R4300iOp32::ADDI()
+{
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rs == 29 && m_Opcode.rt == 29) {
+	if (m_Opcode.rs == 29 && m_Opcode.rt == 29)
+	{
 		StackValue += (short)m_Opcode.immediate;
 	}
 #endif
 	_GPR[m_Opcode.rt].W[0] = (_GPR[m_Opcode.rs].W[0] + ((short)m_Opcode.immediate));
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rt == 29 && m_Opcode.rs != 29) {
+	if (m_Opcode.rt == 29 && m_Opcode.rs != 29)
+	{
 		StackValue = _GPR[m_Opcode.rt].W[0];		
 	}
 #endif
 }
 
-void R4300iOp32::ADDIU (void) {
+void R4300iOp32::ADDIU()
+{
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rs == 29 && m_Opcode.rt == 29) {
+	if (m_Opcode.rs == 29 && m_Opcode.rt == 29)
+	{
 		StackValue += (short)m_Opcode.immediate;
 	}
 #endif
 	_GPR[m_Opcode.rt].W[0] = (_GPR[m_Opcode.rs].W[0] + ((short)m_Opcode.immediate));
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rt == 29 && m_Opcode.rs != 29) {
+	if (m_Opcode.rt == 29 && m_Opcode.rs != 29)
+	{
 		StackValue = _GPR[m_Opcode.rt].W[0];		
 	}
 #endif
 }
 
-void R4300iOp32::SLTI (void) {
-	if (_GPR[m_Opcode.rs].W[0] < (__int64)((short)m_Opcode.immediate)) {
+void R4300iOp32::SLTI()
+{
+	if (_GPR[m_Opcode.rs].W[0] < (__int64)((short)m_Opcode.immediate))
+	{
 		_GPR[m_Opcode.rt].W[0] = 1;
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].W[0] = 0;
 	}
 }
 
-void R4300iOp32::SLTIU (void) {
+void R4300iOp32::SLTIU()
+{
 	int imm32 = (short)m_Opcode.immediate;
 	__int64 imm64;
 
@@ -747,29 +774,36 @@ void R4300iOp32::SLTIU (void) {
 	_GPR[m_Opcode.rt].W[0] = _GPR[m_Opcode.rs].UW[0] < (unsigned __int64)imm64?1:0;
 }
 
-void R4300iOp32::ANDI (void) {
+void R4300iOp32::ANDI()
+{
 	_GPR[m_Opcode.rt].W[0] = _GPR[m_Opcode.rs].W[0] & m_Opcode.immediate;
 }
 
-void R4300iOp32::ORI (void) {
+void R4300iOp32::ORI()
+{
 	_GPR[m_Opcode.rt].W[0] = _GPR[m_Opcode.rs].W[0] | m_Opcode.immediate;
 }
 
-void R4300iOp32::XORI (void) {
+void R4300iOp32::XORI()
+{
 	_GPR[m_Opcode.rt].W[0] = _GPR[m_Opcode.rs].W[0] ^ m_Opcode.immediate;
 }
 
-void R4300iOp32::LUI (void) {
+void R4300iOp32::LUI()
+{
 	_GPR[m_Opcode.rt].W[0] = (long)((short)m_Opcode.offset << 16);
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rt == 29) {
+	if (m_Opcode.rt == 29)
+	{
 		StackValue = _GPR[m_Opcode.rt].W[0];
 	}
 #endif
 }
 
-void R4300iOp32::BEQL (void) {
-	if (_GPR[m_Opcode.rs].W[0] == _GPR[m_Opcode.rt].W[0]) {
+void R4300iOp32::BEQL()
+{
+	if (_GPR[m_Opcode.rs].W[0] == _GPR[m_Opcode.rt].W[0])
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -779,14 +813,18 @@ void R4300iOp32::BEQL (void) {
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::BNEL (void) {
-	if (_GPR[m_Opcode.rs].W[0] != _GPR[m_Opcode.rt].W[0]) {
+void R4300iOp32::BNEL()
+{
+	if (_GPR[m_Opcode.rs].W[0] != _GPR[m_Opcode.rt].W[0])
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -796,14 +834,18 @@ void R4300iOp32::BNEL (void) {
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::BLEZL (void) {
-	if (_GPR[m_Opcode.rs].W[0] <= 0) {
+void R4300iOp32::BLEZL()
+{
+	if (_GPR[m_Opcode.rs].W[0] <= 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -813,14 +855,18 @@ void R4300iOp32::BLEZL (void) {
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::BGTZL (void) {
-	if (_GPR[m_Opcode.rs].W[0] > 0) {
+void R4300iOp32::BGTZL()
+{
+	if (_GPR[m_Opcode.rs].W[0] > 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -830,38 +876,54 @@ void R4300iOp32::BGTZL (void) {
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::LB (void) {
+void R4300iOp32::LB()
+{
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LB TLB: %X",Address);
+	if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].W[0] = _GPR[m_Opcode.rt].B[0];
 	}
 }
 
-void R4300iOp32::LH (void) {
+void R4300iOp32::LH()
+{
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
-	if (!g_MMU->LH_VAddr(Address,_GPR[m_Opcode.rt].UHW[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LH TLB: %X",Address);
+	if ((Address & 1) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
+	if (!g_MMU->LH_VAddr(Address,_GPR[m_Opcode.rt].UHW[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].W[0] = _GPR[m_Opcode.rt].HW[0];
 	}
 }
 
-void R4300iOp32::LWL (void) {
+void R4300iOp32::LWL()
+{
 	DWORD Offset, Address, Value;
 	
 	Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;
@@ -869,8 +931,9 @@ void R4300iOp32::LWL (void) {
 
 	if (!g_MMU->LW_VAddr((Address & ~3),Value)) 
 	{
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LWL TLB: %X",Address);
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
 		return;
@@ -880,51 +943,73 @@ void R4300iOp32::LWL (void) {
 	_GPR[m_Opcode.rt].W[0] += (int)(Value << LWL_SHIFT[Offset]);
 }
 
-void R4300iOp32::LW (void) {
+void R4300iOp32::LW()
+{
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
 
 	if (LogOptions.GenerateLog)
 	{ 
 		Log_LW((*_PROGRAM_COUNTER),Address);
 	}
 
-	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LW TLB: %X",Address);
+	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].W[0] = _GPR[m_Opcode.rt].W[0];
 	}
 }
 
-void R4300iOp32::LBU (void) {
+void R4300iOp32::LBU()
+{
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LBU TLB: %X",Address);
+	if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].UW[0] = _GPR[m_Opcode.rt].UB[0];
 	}
 }
 
-void R4300iOp32::LHU (void) {
+void R4300iOp32::LHU()
+{
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
-	if (!g_MMU->LH_VAddr(Address,_GPR[m_Opcode.rt].UHW[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LHU TLB: %X",Address);
+	if ((Address & 1) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
+	if (!g_MMU->LH_VAddr(Address,_GPR[m_Opcode.rt].UHW[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].UW[0] = _GPR[m_Opcode.rt].UHW[0];
 	}
 }
 
-void R4300iOp32::LWR (void) {
+void R4300iOp32::LWR()
+{
 	DWORD Offset, Address, Value;
 	
 	Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;
@@ -935,7 +1020,7 @@ void R4300iOp32::LWR (void) {
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"LWR TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -944,138 +1029,180 @@ void R4300iOp32::LWR (void) {
 	_GPR[m_Opcode.rt].W[0] += (int)(Value >> LWR_SHIFT[Offset]);
 }
 
-void R4300iOp32::LWU (void) {
+void R4300iOp32::LWU()
+{
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
 
-	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LWU TLB: %X",Address);
+	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].UW[0] = _GPR[m_Opcode.rt].UW[0];
 	}
 }
 
 
-void R4300iOp32::LL (void) {
+void R4300iOp32::LL()
+{
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
 
-	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LL TLB: %X",Address);
+	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].W[0] = _GPR[m_Opcode.rt].W[0];
 		(*_LLBit) = 1;
 	}
 }
 
 /********************** R4300i OpCodes: Special **********************/
-void R4300iOp32::SPECIAL_SLL (void) {
+void R4300iOp32::SPECIAL_SLL()
+{
 	_GPR[m_Opcode.rd].W[0] = (_GPR[m_Opcode.rt].W[0] << m_Opcode.sa);
 }
 
-void R4300iOp32::SPECIAL_SRL (void) {
+void R4300iOp32::SPECIAL_SRL()
+{
 	_GPR[m_Opcode.rd].W[0] = (int)(_GPR[m_Opcode.rt].UW[0] >> m_Opcode.sa);
 }
 
-void R4300iOp32::SPECIAL_SRA (void) {
+void R4300iOp32::SPECIAL_SRA()
+{
 	_GPR[m_Opcode.rd].W[0] = (_GPR[m_Opcode.rt].W[0] >> m_Opcode.sa);
 }
 
-void R4300iOp32::SPECIAL_SLLV (void) {
+void R4300iOp32::SPECIAL_SLLV()
+{
 	_GPR[m_Opcode.rd].W[0] = (_GPR[m_Opcode.rt].W[0] << (_GPR[m_Opcode.rs].UW[0] & 0x1F));
 }
 
-void R4300iOp32::SPECIAL_SRLV (void) {
+void R4300iOp32::SPECIAL_SRLV()
+{
 	_GPR[m_Opcode.rd].W[0] = (int)(_GPR[m_Opcode.rt].UW[0] >> (_GPR[m_Opcode.rs].UW[0] & 0x1F));
 }
 
-void R4300iOp32::SPECIAL_SRAV (void) {
+void R4300iOp32::SPECIAL_SRAV()
+{
 	_GPR[m_Opcode.rd].W[0] = (_GPR[m_Opcode.rt].W[0] >> (_GPR[m_Opcode.rs].UW[0] & 0x1F));
 }
 
-void R4300iOp32::SPECIAL_JALR (void) {
+void R4300iOp32::SPECIAL_JALR()
+{
 	m_NextInstruction = DELAY_SLOT;
 	m_JumpToLocation = _GPR[m_Opcode.rs].UW[0];
 	_GPR[m_Opcode.rd].W[0] = (long)((*_PROGRAM_COUNTER) + 8);
-	m_TestTimer = TRUE;
+	m_TestTimer = true;
 }
 
-void R4300iOp32::SPECIAL_ADD (void) {
+void R4300iOp32::SPECIAL_ADD()
+{
 	_GPR[m_Opcode.rd].W[0] = _GPR[m_Opcode.rs].W[0] + _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp32::SPECIAL_ADDU (void) {
+void R4300iOp32::SPECIAL_ADDU()
+{
 	_GPR[m_Opcode.rd].W[0] = _GPR[m_Opcode.rs].W[0] + _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp32::SPECIAL_SUB (void) {
+void R4300iOp32::SPECIAL_SUB()
+{
 	_GPR[m_Opcode.rd].W[0] = _GPR[m_Opcode.rs].W[0] - _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp32::SPECIAL_SUBU (void) {
+void R4300iOp32::SPECIAL_SUBU()
+{
 	_GPR[m_Opcode.rd].W[0] = _GPR[m_Opcode.rs].W[0] - _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp32::SPECIAL_AND (void) {
+void R4300iOp32::SPECIAL_AND()
+{
 	_GPR[m_Opcode.rd].W[0] = _GPR[m_Opcode.rs].W[0] & _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp32::SPECIAL_OR (void) {
+void R4300iOp32::SPECIAL_OR()
+{
 	_GPR[m_Opcode.rd].W[0] = _GPR[m_Opcode.rs].W[0] | _GPR[m_Opcode.rt].W[0];
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rd == 29) {
+	if (m_Opcode.rd == 29)
+	{
 		StackValue = _GPR[m_Opcode.rd].W[0];
 	}
 #endif
 }
 
-void R4300iOp32::SPECIAL_NOR (void) {
+void R4300iOp32::SPECIAL_NOR()
+{
 	_GPR[m_Opcode.rd].W[0] = ~(_GPR[m_Opcode.rs].W[0] | _GPR[m_Opcode.rt].W[0]);
 }
 
-void R4300iOp32::SPECIAL_SLT (void) {
-	if (_GPR[m_Opcode.rs].W[0] < _GPR[m_Opcode.rt].W[0]) {
+void R4300iOp32::SPECIAL_SLT()
+{
+	if (_GPR[m_Opcode.rs].W[0] < _GPR[m_Opcode.rt].W[0])
+	{
 		_GPR[m_Opcode.rd].W[0] = 1;
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rd].W[0] = 0;
 	}
 }
 
-void R4300iOp32::SPECIAL_SLTU (void) {
-	if (_GPR[m_Opcode.rs].UW[0] < _GPR[m_Opcode.rt].UW[0]) {
+void R4300iOp32::SPECIAL_SLTU()
+{
+	if (_GPR[m_Opcode.rs].UW[0] < _GPR[m_Opcode.rt].UW[0])
+	{
 		_GPR[m_Opcode.rd].W[0] = 1;
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rd].W[0] = 0;
 	}
 }
 
-void R4300iOp32::SPECIAL_TEQ (void) {
+void R4300iOp32::SPECIAL_TEQ()
+{
 	if (_GPR[m_Opcode.rs].W[0] == _GPR[m_Opcode.rt].W[0] && g_Settings->LoadBool(Debugger_Enabled))
 	{
 		g_Notify->DisplayError(L"Should trap this ???");
 	}
 }
 
-void R4300iOp32::SPECIAL_DSRL32 (void) 
+void R4300iOp32::SPECIAL_DSRL32() 
 {
 	_GPR[m_Opcode.rd].UW[0] = (DWORD)(_GPR[m_Opcode.rt].UDW >> (m_Opcode.sa + 32));
 }
 
-void R4300iOp32::SPECIAL_DSRA32 (void) 
+void R4300iOp32::SPECIAL_DSRA32() 
 {
 	_GPR[m_Opcode.rd].W[0] = (long)(_GPR[m_Opcode.rt].DW >> (m_Opcode.sa + 32));
 }
 
 /********************** R4300i OpCodes: RegImm **********************/
-void R4300iOp32::REGIMM_BLTZ (void) {
+void R4300iOp32::REGIMM_BLTZ()
+{
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].W[0] < 0) {
+	if (_GPR[m_Opcode.rs].W[0] < 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{			
@@ -1084,14 +1211,18 @@ void R4300iOp32::REGIMM_BLTZ (void) {
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::REGIMM_BGEZ (void) {
+void R4300iOp32::REGIMM_BGEZ()
+{
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].W[0] >= 0) {
+	if (_GPR[m_Opcode.rs].W[0] >= 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{			
@@ -1100,13 +1231,17 @@ void R4300iOp32::REGIMM_BGEZ (void) {
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::REGIMM_BLTZL (void) {
-	if (_GPR[m_Opcode.rs].W[0] < 0) {
+void R4300iOp32::REGIMM_BLTZL()
+{
+	if (_GPR[m_Opcode.rs].W[0] < 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -1116,14 +1251,18 @@ void R4300iOp32::REGIMM_BLTZL (void) {
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::REGIMM_BGEZL (void) {
-	if (_GPR[m_Opcode.rs].W[0] >= 0) {
+void R4300iOp32::REGIMM_BGEZL()
+{
+	if (_GPR[m_Opcode.rs].W[0] >= 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -1133,15 +1272,19 @@ void R4300iOp32::REGIMM_BGEZL (void) {
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp32::REGIMM_BLTZAL (void) {
+void R4300iOp32::REGIMM_BLTZAL()
+{
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].W[0] < 0) {
+	if (_GPR[m_Opcode.rs].W[0] < 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{			
@@ -1150,15 +1293,19 @@ void R4300iOp32::REGIMM_BLTZAL (void) {
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 	_GPR[31].W[0]= (long)((*_PROGRAM_COUNTER) + 8);
 }
 
-void R4300iOp32::REGIMM_BGEZAL (void) {
+void R4300iOp32::REGIMM_BGEZAL()
+{
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].W[0] >= 0) {
+	if (_GPR[m_Opcode.rs].W[0] >= 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{			
@@ -1167,13 +1314,15 @@ void R4300iOp32::REGIMM_BGEZAL (void) {
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 	_GPR[31].W[0] = (long)((*_PROGRAM_COUNTER) + 8);
 }
 /************************** COP0 functions **************************/
-void R4300iOp32::COP0_MF (void) {
+void R4300iOp32::COP0_MF() {
 	if (LogOptions.LogCP0reads) 
 	{
 		LogMessage("%08X: R4300i Read from %s (0x%08X)", (*_PROGRAM_COUNTER), CRegName::Cop0[m_Opcode.rd], _CP0[m_Opcode.rd]);
@@ -1186,16 +1335,19 @@ void R4300iOp32::COP0_MF (void) {
 	_GPR[m_Opcode.rt].W[0] = (int)_CP0[m_Opcode.rd];
 }
 
-void R4300iOp32::COP0_MT (void) {
+void R4300iOp32::COP0_MT()
+{
 	if (LogOptions.LogCP0changes) 
 	{
 		LogMessage("%08X: Writing 0x%X to %s register (Originally: 0x%08X)",(*_PROGRAM_COUNTER), _GPR[m_Opcode.rt].UW[0],CRegName::Cop0[m_Opcode.rd], _CP0[m_Opcode.rd]);
-		if (m_Opcode.rd == 11) { //Compare
+		if (m_Opcode.rd == 11) //Compare
+		{
 			LogMessage("%08X: Cause register changed from %08X to %08X",(*_PROGRAM_COUNTER), g_Reg->CAUSE_REGISTER, (g_Reg->CAUSE_REGISTER & ~CAUSE_IP7));
 		}
 	}
 
-	switch (m_Opcode.rd) {	
+	switch (m_Opcode.rd)
+	{	
 	case 0: //Index
 	case 2: //EntryLo0
 	case 3: //EntryLo1
@@ -1229,10 +1381,13 @@ void R4300iOp32::COP0_MT (void) {
 		g_SystemTimer->UpdateCompareTimer();
 		break;		
 	case 12: //Status
-		if ((_CP0[m_Opcode.rd] & STATUS_FR) != (_GPR[m_Opcode.rt].UW[0] & STATUS_FR)) {
+		if ((_CP0[m_Opcode.rd] & STATUS_FR) != (_GPR[m_Opcode.rt].UW[0] & STATUS_FR))
+		{
 			_CP0[m_Opcode.rd] = _GPR[m_Opcode.rt].UW[0];
 			g_Reg->FixFpuLocations();
-		} else {
+		}
+		else
+		{
 			_CP0[m_Opcode.rd] = _GPR[m_Opcode.rt].UW[0];
 		}
 		if ((_CP0[m_Opcode.rd] & 0x18) != 0 && g_Settings->LoadBool(Debugger_Enabled)) 
@@ -1254,12 +1409,14 @@ void R4300iOp32::COP0_MT (void) {
 }
 
 /************************** COP1 functions **************************/
-void R4300iOp32::COP1_MF (void) {
+void R4300iOp32::COP1_MF()
+{
 	TEST_COP1_USABLE_EXCEPTION	
 	_GPR[m_Opcode.rt].W[0] = *(int *)_FPR_S[m_Opcode.fs];
 }
 
-void R4300iOp32::COP1_CF (void) {
+void R4300iOp32::COP1_CF()
+{
 	TEST_COP1_USABLE_EXCEPTION
 	if (m_Opcode.fs != 31 && m_Opcode.fs != 0) 
 	{
@@ -1269,8 +1426,8 @@ void R4300iOp32::COP1_CF (void) {
 	_GPR[m_Opcode.rt].W[0] = (int)_FPCR[m_Opcode.fs];
 }
 
-void R4300iOp32::COP1_DMT (void) {
+void R4300iOp32::COP1_DMT()
+{
 	TEST_COP1_USABLE_EXCEPTION
 	*(__int64 *)_FPR_D[m_Opcode.fs] = _GPR[m_Opcode.rt].W[0];
 }
-
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.h b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.h
index 98afd22d7..23a3965ed 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.h	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.h	
@@ -15,70 +15,70 @@ class R4300iOp32 :
 {
 public:
 	/************************* OpCode functions *************************/
-	static void  JAL            ( void );
-	static void  BEQ            ( void );
-	static void  BNE            ( void );
-	static void  BLEZ           ( void );
-	static void  BGTZ           ( void );
-	static void  ADDI           ( void );
-	static void  ADDIU          ( void );
-	static void  SLTI           ( void );
-	static void  SLTIU          ( void );
-	static void  ANDI           ( void );
-	static void  ORI            ( void );
-	static void  XORI           ( void );
-	static void  LUI            ( void );
-	static void  BEQL           ( void );
-	static void  BNEL           ( void );
-	static void  BLEZL          ( void );
-	static void  BGTZL          ( void );
-	static void  LB             ( void );
-	static void  LH             ( void );
-	static void  LWL            ( void );
-	static void  LW             ( void );
-	static void  LBU            ( void );
-	static void  LHU            ( void );
-	static void  LWR            ( void );
-	static void  LWU            ( void );
-	static void  LL             ( void );
+	static void  JAL();
+	static void  BEQ();
+	static void  BNE();
+	static void  BLEZ();
+	static void  BGTZ();
+	static void  ADDI();
+	static void  ADDIU();
+	static void  SLTI();
+	static void  SLTIU();
+	static void  ANDI();
+	static void  ORI();
+	static void  XORI();
+	static void  LUI();
+	static void  BEQL();
+	static void  BNEL();
+	static void  BLEZL();
+	static void  BGTZL();
+	static void  LB();
+	static void  LH();
+	static void  LWL();
+	static void  LW();
+	static void  LBU();
+	static void  LHU();
+	static void  LWR();
+	static void  LWU();
+	static void  LL();
 
 	/********************** R4300i OpCodes: Special **********************/
-	static void  SPECIAL_SLL    ( void );
-	static void  SPECIAL_SRL    ( void );
-	static void  SPECIAL_SRA    ( void );
-	static void  SPECIAL_SLLV   ( void );
-	static void  SPECIAL_SRLV   ( void );
-	static void  SPECIAL_SRAV   ( void );
-	static void  SPECIAL_JALR   ( void );
-	static void  SPECIAL_ADD    ( void );
-	static void  SPECIAL_ADDU   ( void );
-	static void  SPECIAL_SUB    ( void );
-	static void  SPECIAL_SUBU   ( void );
-	static void  SPECIAL_AND    ( void );
-	static void  SPECIAL_OR     ( void );
-	static void  SPECIAL_NOR    ( void );
-	static void  SPECIAL_SLT    ( void );
-	static void  SPECIAL_SLTU   ( void );
-	static void  SPECIAL_TEQ    ( void );
-	static void  SPECIAL_DSRL32 ( void );
-	static void  SPECIAL_DSRA32 ( void );
+	static void  SPECIAL_SLL();
+	static void  SPECIAL_SRL();
+	static void  SPECIAL_SRA();
+	static void  SPECIAL_SLLV();
+	static void  SPECIAL_SRLV();
+	static void  SPECIAL_SRAV();
+	static void  SPECIAL_JALR();
+	static void  SPECIAL_ADD();
+	static void  SPECIAL_ADDU();
+	static void  SPECIAL_SUB();
+	static void  SPECIAL_SUBU();
+	static void  SPECIAL_AND();
+	static void  SPECIAL_OR();
+	static void  SPECIAL_NOR();
+	static void  SPECIAL_SLT();
+	static void  SPECIAL_SLTU();
+	static void  SPECIAL_TEQ();
+	static void  SPECIAL_DSRL32();
+	static void  SPECIAL_DSRA32();
 
 	/********************** R4300i OpCodes: RegImm **********************/
-	static void  REGIMM_BLTZ    ( void );
-	static void  REGIMM_BGEZ    ( void );
-	static void  REGIMM_BLTZL   ( void );
-	static void  REGIMM_BGEZL   ( void );
-	static void  REGIMM_BLTZAL  ( void );
-	static void  REGIMM_BGEZAL  ( void );
+	static void  REGIMM_BLTZ();
+	static void  REGIMM_BGEZ();
+	static void  REGIMM_BLTZL();
+	static void  REGIMM_BGEZL();
+	static void  REGIMM_BLTZAL();
+	static void  REGIMM_BGEZAL();
 
 	/************************** COP0 functions **************************/
-	static void  COP0_MF        ( void );
-	static void  COP0_MT        ( void );
+	static void  COP0_MF();
+	static void  COP0_MT();
 
 	/************************** COP1 functions **************************/
-	static void  COP1_MF        ( void );
-	static void  COP1_CF        ( void );
-	static void  COP1_DMT       ( void );
+	static void  COP1_MF();
+	static void  COP1_CF();
+	static void  COP1_DMT();
 
-	static Func * BuildInterpreter (void );
+	static Func* BuildInterpreter();
 };
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp b/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp
index 1d4ead132..cbdce8121 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp	
@@ -11,10 +11,10 @@
 #include "stdafx.h"
 #include "../C Core/Logging.h"
 
-void InPermLoop         ( void );
-void TestInterpreterJump      ( DWORD PC, DWORD TargetPC, int Reg1, int Reg2 );
+void InPermLoop();
+void TestInterpreterJump(DWORD PC, DWORD TargetPC, int Reg1, int Reg2);
 
-BOOL        R4300iOp::m_TestTimer = false;
+bool        R4300iOp::m_TestTimer = false;
 DWORD       R4300iOp::m_NextInstruction;
 OPCODE      R4300iOp::m_Opcode;
 DWORD       R4300iOp::m_JumpToLocation;
@@ -37,7 +37,7 @@ const DWORD R4300iOp::LWL_MASK[4]  = { 0x00000000, 0x000000FF,0x0000FFFF,0x00FFF
 const DWORD R4300iOp::LWR_MASK[4]  = { 0xFFFFFF00, 0xFFFF0000,0xFF000000,0x0000000 };
 
 const int   R4300iOp::SWL_SHIFT[4] = { 0, 8, 16, 24 };
-const int   R4300iOp::SWR_SHIFT[4] = { 24, 16 , 8, 0  };
+const int   R4300iOp::SWR_SHIFT[4] = { 24, 16 , 8, 0 };
 const int   R4300iOp::LWL_SHIFT[4] = { 0, 8, 16, 24};
 const int   R4300iOp::LWR_SHIFT[4] = { 24, 16 ,8, 0 };
 
@@ -62,59 +62,59 @@ const int   R4300iOp::LWR_SHIFT[4] = { 24, 16 ,8, 0 };
 	m_JumpToLocation = (*_PROGRAM_COUNTER);\
 	return;
 
-void R4300iOp::SPECIAL (void)
+void R4300iOp::SPECIAL()
 {
 	Jump_Special[ m_Opcode.funct ]();
 }
 
-void R4300iOp::REGIMM (void)
+void R4300iOp::REGIMM()
 {
 	Jump_Regimm[ m_Opcode.rt ]();
 }
 
-void R4300iOp::COP0 (void)
+void R4300iOp::COP0()
 {
 	Jump_CoP0[ m_Opcode.rs ]();
 }
 
-void R4300iOp::COP0_CO (void)
+void R4300iOp::COP0_CO()
 {
 	Jump_CoP0_Function[ m_Opcode.funct ]();
 }
 
-void R4300iOp::COP1 (void)
+void R4300iOp::COP1()
 {
 	Jump_CoP1[ m_Opcode.fmt ]();
 }
 
-void R4300iOp::COP1_BC (void)
+void R4300iOp::COP1_BC()
 {
 	Jump_CoP1_BC[ m_Opcode.ft ]();
 }
 
-void R4300iOp::COP1_S (void)
+void R4300iOp::COP1_S()
 {
 	_controlfp(*_RoundingModel,_MCW_RC);
 	Jump_CoP1_S[ m_Opcode.funct ]();
 }
 
-void R4300iOp::COP1_D (void)
+void R4300iOp::COP1_D()
 {
 	_controlfp(*_RoundingModel,_MCW_RC);
 	Jump_CoP1_D[ m_Opcode.funct ]();
 }
 
-void R4300iOp::COP1_W (void)
+void R4300iOp::COP1_W()
 {
 	Jump_CoP1_W[ m_Opcode.funct ]();
 }
 
-void R4300iOp::COP1_L (void)
+void R4300iOp::COP1_L()
 {
 	Jump_CoP1_L[ m_Opcode.funct ]();
 }
 
-R4300iOp::Func * R4300iOp::BuildInterpreter (void )
+R4300iOp::Func * R4300iOp::BuildInterpreter()
 { 
 	Jump_Opcode[ 0] = SPECIAL;
 	Jump_Opcode[ 1] = REGIMM;
@@ -710,14 +710,20 @@ bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2);
 
 void TestInterpreterJump (DWORD PC, DWORD TargetPC, int Reg1, int Reg2) 
 {
-	if (PC != TargetPC) { return; }
-	if (DelaySlotEffectsCompare(PC,Reg1,Reg2)) { return; }
+	if (PC != TargetPC)
+	{
+		return;
+	}
+	if (DelaySlotEffectsCompare(PC,Reg1,Reg2))
+	{
+		return;
+	}
 	R4300iOp::m_NextInstruction = PERMLOOP_DO_DELAY;
-	R4300iOp::m_TestTimer = TRUE;
+	R4300iOp::m_TestTimer = true;
 }
 
 /************************* Opcode functions *************************/
-void R4300iOp::J (void)
+void R4300iOp::J()
 {
 	m_NextInstruction = DELAY_SLOT;
 	m_JumpToLocation = ((*_PROGRAM_COUNTER) & 0xF0000000) + (m_Opcode.target << 2);
@@ -727,7 +733,7 @@ void R4300iOp::J (void)
 	}
 }
 
-void R4300iOp::JAL (void)
+void R4300iOp::JAL()
 {
 	m_NextInstruction = DELAY_SLOT;
 	m_JumpToLocation = ((*_PROGRAM_COUNTER) & 0xF0000000) + (m_Opcode.target << 2);
@@ -739,10 +745,11 @@ void R4300iOp::JAL (void)
 	}
 }
 
-void R4300iOp::BEQ (void)
+void R4300iOp::BEQ()
 {
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].DW == _GPR[m_Opcode.rt].DW) {
+	if (_GPR[m_Opcode.rs].DW == _GPR[m_Opcode.rt].DW)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{
@@ -751,15 +758,18 @@ void R4300iOp::BEQ (void)
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::BNE (void)
+void R4300iOp::BNE()
 {
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].DW != _GPR[m_Opcode.rt].DW) {
+	if (_GPR[m_Opcode.rs].DW != _GPR[m_Opcode.rt].DW)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{
@@ -768,15 +778,18 @@ void R4300iOp::BNE (void)
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::BLEZ (void)
+void R4300iOp::BLEZ()
 {
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].DW <= 0) {
+	if (_GPR[m_Opcode.rs].DW <= 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{
@@ -785,15 +798,18 @@ void R4300iOp::BLEZ (void)
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::BGTZ (void)
+void R4300iOp::BGTZ()
 {
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].DW > 0) {
+	if (_GPR[m_Opcode.rs].DW > 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{
@@ -802,51 +818,60 @@ void R4300iOp::BGTZ (void)
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::ADDI (void)
+void R4300iOp::ADDI()
 {
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rs == 29 && m_Opcode.rt == 29) {
+	if (m_Opcode.rs == 29 && m_Opcode.rt == 29)
+	{
 		StackValue += (short)m_Opcode.immediate;
 	}
 #endif
 	_GPR[m_Opcode.rt].DW = (_GPR[m_Opcode.rs].W[0] + ((short)m_Opcode.immediate));
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rt == 29 && m_Opcode.rs != 29) {
+	if (m_Opcode.rt == 29 && m_Opcode.rs != 29)
+	{
 		StackValue = _GPR[m_Opcode.rt].W[0];		
 	}
 #endif
 }
 
-void R4300iOp::ADDIU (void)
+void R4300iOp::ADDIU()
 {
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rs == 29 && m_Opcode.rt == 29) {
+	if (m_Opcode.rs == 29 && m_Opcode.rt == 29)
+	{
 		StackValue += (short)m_Opcode.immediate;
 	}
 #endif
 	_GPR[m_Opcode.rt].DW = (_GPR[m_Opcode.rs].W[0] + ((short)m_Opcode.immediate));
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rt == 29 && m_Opcode.rs != 29) {
+	if (m_Opcode.rt == 29 && m_Opcode.rs != 29)
+	{
 		StackValue = _GPR[m_Opcode.rt].W[0];		
 	}
 #endif
 }
 
-void R4300iOp::SLTI (void)
+void R4300iOp::SLTI()
 {
-	if (_GPR[m_Opcode.rs].DW < (__int64)((short)m_Opcode.immediate)) {
+	if (_GPR[m_Opcode.rs].DW < (__int64)((short)m_Opcode.immediate))
+	{
 		_GPR[m_Opcode.rt].DW = 1;
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].DW = 0;
 	}
 }
 
-void R4300iOp::SLTIU (void)
+void R4300iOp::SLTIU()
 {
 	int imm32 = (short)m_Opcode.immediate;
 	__int64 imm64;
@@ -855,34 +880,36 @@ void R4300iOp::SLTIU (void)
 	_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].UDW < (unsigned __int64)imm64?1:0;
 }
 
-void R4300iOp::ANDI (void)
+void R4300iOp::ANDI()
 {
 	_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW & m_Opcode.immediate;
 }
 
-void R4300iOp::ORI (void)
+void R4300iOp::ORI()
 {
 	_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW | m_Opcode.immediate;
 }
 
-void R4300iOp::XORI (void)
+void R4300iOp::XORI()
 {
 	_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW ^ m_Opcode.immediate;
 }
 
-void R4300iOp::LUI (void)
+void R4300iOp::LUI()
 {
 	_GPR[m_Opcode.rt].DW = (long)((short)m_Opcode.offset << 16);
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rt == 29) {
+	if (m_Opcode.rt == 29)
+	{
 		StackValue = _GPR[m_Opcode.rt].W[0];
 	}
 #endif
 }
 
-void R4300iOp::BEQL (void)
+void R4300iOp::BEQL()
 {
-	if (_GPR[m_Opcode.rs].DW == _GPR[m_Opcode.rt].DW) {
+	if (_GPR[m_Opcode.rs].DW == _GPR[m_Opcode.rt].DW)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -892,15 +919,18 @@ void R4300iOp::BEQL (void)
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::BNEL (void)
+void R4300iOp::BNEL()
 {
-	if (_GPR[m_Opcode.rs].DW != _GPR[m_Opcode.rt].DW) {
+	if (_GPR[m_Opcode.rs].DW != _GPR[m_Opcode.rt].DW)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -910,15 +940,18 @@ void R4300iOp::BNEL (void)
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::BLEZL (void)
+void R4300iOp::BLEZL()
 {
-	if (_GPR[m_Opcode.rs].DW <= 0) {
+	if (_GPR[m_Opcode.rs].DW <= 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -928,15 +961,18 @@ void R4300iOp::BLEZL (void)
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::BGTZL (void)
+void R4300iOp::BGTZL()
 {
-	if (_GPR[m_Opcode.rs].DW > 0) {
+	if (_GPR[m_Opcode.rs].DW > 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -946,13 +982,15 @@ void R4300iOp::BGTZL (void)
 				m_NextInstruction = PERMLOOP_DO_DELAY;
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::DADDIU (void)
+void R4300iOp::DADDIU()
 {
 	_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW + (__int64)((short)m_Opcode.immediate);
 }
@@ -961,7 +999,7 @@ QWORD LDL_MASK[8] = { 0,0xFF,0xFFFF,0xFFFFFF,0xFFFFFFFF,0xFFFFFFFFFF,
 					 0xFFFFFFFFFFFF, 0xFFFFFFFFFFFFFF };
 int LDL_SHIFT[8] = { 0, 8, 16, 24, 32, 40, 48, 56 };
 
-void R4300iOp::LDL (void)
+void R4300iOp::LDL()
 {
 	DWORD Offset, Address;
 	QWORD Value;
@@ -974,7 +1012,7 @@ void R4300iOp::LDL (void)
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"LDL TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -988,7 +1026,7 @@ QWORD LDR_MASK[8] = { 0xFFFFFFFFFFFFFF00, 0xFFFFFFFFFFFF0000,
                       0xFF00000000000000, 0 };
 int LDR_SHIFT[8] = { 56, 48, 40, 32, 24, 16, 8, 0 };
 
-void R4300iOp::LDR (void)
+void R4300iOp::LDR()
 {
 	DWORD Offset, Address;
 	QWORD Value;
@@ -1001,7 +1039,7 @@ void R4300iOp::LDR (void)
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"LDR TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -1011,34 +1049,45 @@ void R4300iOp::LDR (void)
 
 }
 
-void R4300iOp::LB (void)
+void R4300iOp::LB()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LB TLB: %X",Address);
+	if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rt].B[0];
 	}
 }
 
-void R4300iOp::LH (void)
+void R4300iOp::LH()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
-	if (!g_MMU->LH_VAddr(Address,_GPR[m_Opcode.rt].UHW[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LH TLB: %X",Address);
+	if ((Address & 1) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
+	if (!g_MMU->LH_VAddr(Address,_GPR[m_Opcode.rt].UHW[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rt].HW[0];
 	}
 }
 
-void R4300iOp::LWL (void)
+void R4300iOp::LWL()
 {
 	DWORD Offset, Address, Value;
 	
@@ -1050,7 +1099,7 @@ void R4300iOp::LWL (void)
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"LWL TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -1059,54 +1108,72 @@ void R4300iOp::LWL (void)
 	_GPR[m_Opcode.rt].DW += (int)(Value << LWL_SHIFT[Offset]);
 }
 
-void R4300iOp::LW (void)
+void R4300iOp::LW()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
 
 	if (LogOptions.GenerateLog)
 	{ 
 		Log_LW((*_PROGRAM_COUNTER),Address);
 	}
 
-	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LW TLB: %X",Address);
+	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rt].W[0];
 	}
 }
 
-void R4300iOp::LBU (void)
+void R4300iOp::LBU()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LBU TLB: %X",Address);
+	if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].UDW = _GPR[m_Opcode.rt].UB[0];
 	}
 }
 
-void R4300iOp::LHU (void)
+void R4300iOp::LHU()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
-	if (!g_MMU->LH_VAddr(Address,_GPR[m_Opcode.rt].UHW[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LHU TLB: %X",Address);
+	if ((Address & 1) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
+	if (!g_MMU->LH_VAddr(Address,_GPR[m_Opcode.rt].UHW[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].UDW = _GPR[m_Opcode.rt].UHW[0];
 	}
 }
 
-void R4300iOp::LWR (void)
+void R4300iOp::LWR()
 {
 	DWORD Offset, Address, Value;
 	
@@ -1118,7 +1185,7 @@ void R4300iOp::LWR (void)
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"LWR TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -1127,40 +1194,51 @@ void R4300iOp::LWR (void)
 	_GPR[m_Opcode.rt].DW += (int)(Value >> LWR_SHIFT[Offset]);
 }
 
-void R4300iOp::LWU (void)
+void R4300iOp::LWU()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
 
-	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LWU TLB: %X",Address);
+	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].UDW = _GPR[m_Opcode.rt].UW[0];
 	}
 }
 
-void R4300iOp::SB (void) 
+void R4300iOp::SB() 
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if (!g_MMU->SB_VAddr(Address,_GPR[m_Opcode.rt].UB[0])) {
+	if (!g_MMU->SB_VAddr(Address,_GPR[m_Opcode.rt].UB[0]))
+	{
 		if (bHaveDebugger()) 
 		{
 			g_Notify->BreakPoint(__FILEW__,__LINE__);
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SB TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
 
-void R4300iOp::SH (void)
+void R4300iOp::SH()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,FALSE); }
+	if ((Address & 1) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, false);
+	}
 	if (!g_MMU->SH_VAddr(Address,_GPR[m_Opcode.rt].UHW[0])) 
 	{
 		if (bHaveDebugger()) 
@@ -1169,12 +1247,12 @@ void R4300iOp::SH (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SH TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
 
-void R4300iOp::SWL (void)
+void R4300iOp::SWL()
 {
 	DWORD Offset, Address, Value;
 	
@@ -1189,7 +1267,7 @@ void R4300iOp::SWL (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SWL TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -1205,16 +1283,19 @@ void R4300iOp::SWL (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SWL TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
 
 
-void R4300iOp::SW (void)
+void R4300iOp::SW()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,FALSE); }
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, false);
+	}
 	if (LogOptions.GenerateLog) 
 	{ 
 		Log_SW((*_PROGRAM_COUNTER),Address,_GPR[m_Opcode.rt].UW[0]);
@@ -1227,7 +1308,7 @@ void R4300iOp::SW (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SW TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
@@ -1238,11 +1319,11 @@ QWORD SDL_MASK[8] = { 0,0xFF00000000000000,
 						0xFFFFFFFF00000000,
 					    0xFFFFFFFFFF000000,
 						0xFFFFFFFFFFFF0000,
-						0xFFFFFFFFFFFFFF00 
-					};
+						0xFFFFFFFFFFFFFF00 };
+
 int SDL_SHIFT[8] = { 0, 8, 16, 24, 32, 40, 48, 56 };
 
-void R4300iOp::SDL (void)
+void R4300iOp::SDL()
 {
 	DWORD Offset, Address;
 	QWORD Value;
@@ -1258,7 +1339,7 @@ void R4300iOp::SDL (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SDL TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -1274,7 +1355,7 @@ void R4300iOp::SDL (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SDL TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
@@ -1286,11 +1367,11 @@ QWORD SDR_MASK[8] = { 0x00FFFFFFFFFFFFFF,
 					  0x0000000000FFFFFF,
 					  0x000000000000FFFF,
 					  0x00000000000000FF, 
-					  0x0000000000000000 
-					};
+					  0x0000000000000000 };
+
 int SDR_SHIFT[8] = { 56,48,40,32,24,16,8,0 };
 
-void R4300iOp::SDR (void)
+void R4300iOp::SDR()
 {
 	DWORD Offset, Address;
 	QWORD Value;
@@ -1306,7 +1387,7 @@ void R4300iOp::SDR (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SDR TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -1322,12 +1403,12 @@ void R4300iOp::SDR (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SDR TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
 
-void R4300iOp::SWR (void)
+void R4300iOp::SWR()
 {
 	DWORD Offset, Address, Value;
 	
@@ -1342,7 +1423,7 @@ void R4300iOp::SWR (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SWR TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -1358,53 +1439,69 @@ void R4300iOp::SWR (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SWR TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
 
-void R4300iOp::CACHE (void) 
+void R4300iOp::CACHE() 
 {
-	if (!LogOptions.LogCache) { return; }
+	if (!LogOptions.LogCache)
+	{
+		return;
+	}
 	LogMessage("%08X: Cache operation %d, 0x%08X", (*_PROGRAM_COUNTER), m_Opcode.rt,
 		_GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset );
 }
 
-void R4300iOp::LL (void) 
+void R4300iOp::LL() 
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
 
 	if (!g_MMU->LW_VAddr(Address,_GPR[m_Opcode.rt].UW[0])) 
 	{
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"LL TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rt].W[0];
 		(*_LLBit) = 1;
 	}
 }
 
-void R4300iOp::LWC1 (void) 
+void R4300iOp::LWC1() 
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (DWORD)((short)m_Opcode.offset);
 	TEST_COP1_USABLE_EXCEPTION
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
-	if (!g_MMU->LW_VAddr(Address,*(DWORD *)_FPR_S[m_Opcode.ft])) {
-		if (bShowTLBMisses()) {
-			g_Notify->DisplayError(L"LWC1 TLB: %X",Address);
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
+	if (!g_MMU->LW_VAddr(Address,*(DWORD *)_FPR_S[m_Opcode.ft]))
+	{
+		if (bShowTLBMisses())
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		TLB_READ_EXCEPTION(Address);
 	}
 }
 
-void R4300iOp::SC (void)
+void R4300iOp::SC()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,FALSE); }
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, false);
+	}
 	Log_SW((*_PROGRAM_COUNTER),Address,_GPR[m_Opcode.rt].UW[0]);
 	if ((*_LLBit) == 1) 
 	{
@@ -1413,17 +1510,20 @@ void R4300iOp::SC (void)
 			g_Notify->BreakPoint(__FILEW__,__LINE__);
 			if (bShowTLBMisses()) 
 			{
-				g_Notify->DisplayError(L"SC TLB: %X",Address);
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 			}
 		}
 	}
 	_GPR[m_Opcode.rt].UW[0] = (*_LLBit);
 }
 
-void R4300iOp::LD (void)
+void R4300iOp::LD()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 7) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
+	if ((Address & 7) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
 	if (!g_MMU->LD_VAddr(Address,_GPR[m_Opcode.rt].UDW)) 
 	{
 		if (bHaveDebugger()) 
@@ -1432,24 +1532,28 @@ void R4300iOp::LD (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"LD TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 		return;
 	}
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rt == 29) {
+	if (m_Opcode.rt == 29)
+	{
 		StackValue = _GPR[m_Opcode.rt].W[0];
 	}
 #endif
 }
 
 
-void R4300iOp::LDC1 (void)
+void R4300iOp::LDC1()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;
 
 	TEST_COP1_USABLE_EXCEPTION
-	if ((Address & 7) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); }
+	if ((Address & 7) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, true);
+	}
 	if (!g_MMU->LD_VAddr(Address,*(unsigned __int64 *)_FPR_D[m_Opcode.ft]))
 	{
 		if (bHaveDebugger()) 
@@ -1458,16 +1562,19 @@ void R4300iOp::LDC1 (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"LDC1 TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
 
-void R4300iOp::SWC1 (void)
+void R4300iOp::SWC1()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;
 	TEST_COP1_USABLE_EXCEPTION
-	if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,FALSE); }
+	if ((Address & 3) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, false);
+	}
 
 	if (!g_MMU->SW_VAddr(Address,*(DWORD *)_FPR_S[m_Opcode.ft])) 
 	{
@@ -1477,17 +1584,20 @@ void R4300iOp::SWC1 (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SWC1 TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
 
-void R4300iOp::SDC1 (void)
+void R4300iOp::SDC1()
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;
 
 	TEST_COP1_USABLE_EXCEPTION
-	if ((Address & 7) != 0) { ADDRESS_ERROR_EXCEPTION(Address,FALSE); }
+	if ((Address & 7) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, false);
+	}
 	if (!g_MMU->SD_VAddr(Address,*(__int64 *)_FPR_D[m_Opcode.ft])) 
 	{
 		if (bHaveDebugger()) 
@@ -1496,15 +1606,18 @@ void R4300iOp::SDC1 (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SDC1 TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
 
-void R4300iOp::SD (void) 
+void R4300iOp::SD() 
 {
 	DWORD Address =  _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset;	
-	if ((Address & 7) != 0) { ADDRESS_ERROR_EXCEPTION(Address,FALSE); }
+	if ((Address & 7) != 0)
+	{
+		ADDRESS_ERROR_EXCEPTION(Address, false);
+	}
 	if (!g_MMU->SD_VAddr(Address,_GPR[m_Opcode.rt].UDW)) 
 	{
 		if (bHaveDebugger()) 
@@ -1513,149 +1626,161 @@ void R4300iOp::SD (void)
 		}
 		if (bShowTLBMisses()) 
 		{
-			g_Notify->DisplayError(L"SD TLB: %X",Address);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str());
 		}
 	}
 }
 /********************** R4300i OpCodes: Special **********************/
-void R4300iOp::SPECIAL_SLL (void)
+void R4300iOp::SPECIAL_SLL()
 {
 	_GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].W[0] << m_Opcode.sa);
 }
 
-void R4300iOp::SPECIAL_SRL (void)
+void R4300iOp::SPECIAL_SRL()
 {
 	_GPR[m_Opcode.rd].DW = (int)(_GPR[m_Opcode.rt].UW[0] >> m_Opcode.sa);
 }
 
-void R4300iOp::SPECIAL_SRA (void)
+void R4300iOp::SPECIAL_SRA()
 {
 	_GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].W[0] >> m_Opcode.sa);
 }
 
-void R4300iOp::SPECIAL_SLLV (void)
+void R4300iOp::SPECIAL_SLLV()
 {
 	_GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].W[0] << (_GPR[m_Opcode.rs].UW[0] & 0x1F));
 }
 
-void R4300iOp::SPECIAL_SRLV (void)
+void R4300iOp::SPECIAL_SRLV()
 {
 	_GPR[m_Opcode.rd].DW = (int)(_GPR[m_Opcode.rt].UW[0] >> (_GPR[m_Opcode.rs].UW[0] & 0x1F));
 }
 
-void R4300iOp::SPECIAL_SRAV (void)
+void R4300iOp::SPECIAL_SRAV()
 {
 	_GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].W[0] >> (_GPR[m_Opcode.rs].UW[0] & 0x1F));
 }
 
-void R4300iOp::SPECIAL_JR (void)
+void R4300iOp::SPECIAL_JR()
 {
 	m_NextInstruction = DELAY_SLOT;
 	m_JumpToLocation = _GPR[m_Opcode.rs].UW[0];
-	m_TestTimer = TRUE;
+	m_TestTimer = true;
 }
 
-void R4300iOp::SPECIAL_JALR (void)
+void R4300iOp::SPECIAL_JALR()
 {
 	m_NextInstruction = DELAY_SLOT;
 	m_JumpToLocation = _GPR[m_Opcode.rs].UW[0];
 	_GPR[m_Opcode.rd].DW = (long)((*_PROGRAM_COUNTER) + 8);
-	m_TestTimer = TRUE;
+	m_TestTimer = true;
 }
 
-void R4300iOp::SPECIAL_SYSCALL (void)
+void R4300iOp::SPECIAL_SYSCALL()
 {
 	g_Reg->DoSysCallException(m_NextInstruction == JUMP);
 	m_NextInstruction = JUMP;
 	m_JumpToLocation = (*_PROGRAM_COUNTER);
 }
 
-void R4300iOp::SPECIAL_BREAK (void)
+void R4300iOp::SPECIAL_BREAK()
 {
 	g_Reg->DoBreakException(m_NextInstruction == JUMP);
 	m_NextInstruction = JUMP;
 	m_JumpToLocation = (*_PROGRAM_COUNTER);
 }
 
-void R4300iOp::SPECIAL_SYNC (void)
+void R4300iOp::SPECIAL_SYNC()
 {
+	
 }
 
-void R4300iOp::SPECIAL_MFHI (void)
+void R4300iOp::SPECIAL_MFHI()
 {
 	_GPR[m_Opcode.rd].DW = _RegHI->DW;
 }
 
-void R4300iOp::SPECIAL_MTHI (void)
+void R4300iOp::SPECIAL_MTHI()
 {
 	_RegHI->DW = _GPR[m_Opcode.rs].DW;
 }
 
-void R4300iOp::SPECIAL_MFLO (void)
+void R4300iOp::SPECIAL_MFLO()
 {
 	_GPR[m_Opcode.rd].DW = _RegLO->DW;
 }
 
-void R4300iOp::SPECIAL_MTLO (void)
+void R4300iOp::SPECIAL_MTLO()
 {
 	_RegLO->DW = _GPR[m_Opcode.rs].DW;
 }
 
-void R4300iOp::SPECIAL_DSLLV (void)
+void R4300iOp::SPECIAL_DSLLV()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rt].DW << (_GPR[m_Opcode.rs].UW[0] & 0x3F);
 }
 
-void R4300iOp::SPECIAL_DSRLV (void)
+void R4300iOp::SPECIAL_DSRLV()
 {
 	_GPR[m_Opcode.rd].UDW = _GPR[m_Opcode.rt].UDW >> (_GPR[m_Opcode.rs].UW[0] & 0x3F);
 }
 
-void R4300iOp::SPECIAL_DSRAV (void)
+void R4300iOp::SPECIAL_DSRAV()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rt].DW >> (_GPR[m_Opcode.rs].UW[0] & 0x3F);
 }
 
-void R4300iOp::SPECIAL_MULT (void)
+void R4300iOp::SPECIAL_MULT()
 {
 	_RegHI->DW = (__int64)(_GPR[m_Opcode.rs].W[0]) * (__int64)(_GPR[m_Opcode.rt].W[0]);
 	_RegLO->DW = _RegHI->W[0];
 	_RegHI->DW = _RegHI->W[1];
 }
 
-void R4300iOp::SPECIAL_MULTU (void)
+void R4300iOp::SPECIAL_MULTU()
 {
 	_RegHI->DW = (unsigned __int64)(_GPR[m_Opcode.rs].UW[0]) * (unsigned __int64)(_GPR[m_Opcode.rt].UW[0]);
 	_RegLO->DW = _RegHI->W[0];
 	_RegHI->DW = _RegHI->W[1];
 }
 
-void R4300iOp::SPECIAL_DIV (void)
+void R4300iOp::SPECIAL_DIV()
 {
-	if ( _GPR[m_Opcode.rt].UDW != 0 ) {
+	if ( _GPR[m_Opcode.rt].UDW != 0 )
+	{
 		_RegLO->DW = _GPR[m_Opcode.rs].W[0] / _GPR[m_Opcode.rt].W[0];
 		_RegHI->DW = _GPR[m_Opcode.rs].W[0] % _GPR[m_Opcode.rt].W[0];
-	} else {
-		if (bShowDivByZero()) { g_Notify->DisplayError(L"DIV by 0 ???"); }
+	}
+	else
+	{
+		if (bShowDivByZero())
+		{
+			g_Notify->DisplayError(L"DIV by 0 ???");
+		}
 		_RegLO->DW = 0;
 		_RegHI->DW = 0;
 	}
 }
 
-void R4300iOp::SPECIAL_DIVU (void)
+void R4300iOp::SPECIAL_DIVU()
 {
 	if (_GPR[m_Opcode.rt].UW[0] != 0) 
 	{
 		_RegLO->DW = (int)(_GPR[m_Opcode.rs].UW[0] / _GPR[m_Opcode.rt].UW[0]);
 		_RegHI->DW = (int)(_GPR[m_Opcode.rs].UW[0] % _GPR[m_Opcode.rt].UW[0]);
-	} else {
-		if (bShowDivByZero()) { g_Notify->DisplayError(L"DIVU by 0 ???"); }
+	}
+	else
+	{
+		if (bShowDivByZero())
+		{
+			g_Notify->DisplayError(L"DIVU by 0 ???");
+		}
 		_RegLO->DW = 0;
 		_RegHI->DW = 0;
 	}
 }
 
-void R4300iOp::SPECIAL_DMULT (void)
+void R4300iOp::SPECIAL_DMULT()
 {
 	MIPS_DWORD Tmp[3];
 	
@@ -1669,7 +1794,7 @@ void R4300iOp::SPECIAL_DMULT (void)
 	_RegHI->UDW += (QWORD)Tmp[0].W[1] + (QWORD)Tmp[1].W[1] + Tmp[2].UW[1];
 }
 
-void R4300iOp::SPECIAL_DMULTU (void) 
+void R4300iOp::SPECIAL_DMULTU() 
 {
 	MIPS_DWORD Tmp[3];
 	
@@ -1683,12 +1808,15 @@ void R4300iOp::SPECIAL_DMULTU (void)
 	_RegHI->UDW += (QWORD)Tmp[0].UW[1] + (QWORD)Tmp[1].UW[1] + Tmp[2].UW[1];
 }
 
-void R4300iOp::SPECIAL_DDIV (void)
+void R4300iOp::SPECIAL_DDIV()
 {
-	if ( _GPR[m_Opcode.rt].UDW != 0 ) {
+	if ( _GPR[m_Opcode.rt].UDW != 0 )
+	{
 		_RegLO->DW = _GPR[m_Opcode.rs].DW / _GPR[m_Opcode.rt].DW;
 		_RegHI->DW = _GPR[m_Opcode.rs].DW % _GPR[m_Opcode.rt].DW;
-	} else {
+	}
+	else
+	{
 		if (bHaveDebugger()) 
 		{
 			g_Notify->DisplayError(L"DDIV by 0 ???");
@@ -1696,12 +1824,15 @@ void R4300iOp::SPECIAL_DDIV (void)
 	}
 }
 
-void R4300iOp::SPECIAL_DDIVU (void)
+void R4300iOp::SPECIAL_DDIVU()
 {
-	if ( _GPR[m_Opcode.rt].UDW != 0 ) {
+	if ( _GPR[m_Opcode.rt].UDW != 0 )
+	{
 		_RegLO->UDW = _GPR[m_Opcode.rs].UDW / _GPR[m_Opcode.rt].UDW;
 		_RegHI->UDW = _GPR[m_Opcode.rs].UDW % _GPR[m_Opcode.rt].UDW;
-	} else {
+	}
+	else
+	{
 		if (bHaveDebugger()) 
 		{
 			g_Notify->DisplayError(L"DDIVU by 0 ???");
@@ -1709,90 +1840,97 @@ void R4300iOp::SPECIAL_DDIVU (void)
 	}
 }
 
-void R4300iOp::SPECIAL_ADD (void)
+void R4300iOp::SPECIAL_ADD()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].W[0] + _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp::SPECIAL_ADDU (void)
+void R4300iOp::SPECIAL_ADDU()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].W[0] + _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp::SPECIAL_SUB (void)
+void R4300iOp::SPECIAL_SUB()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].W[0] - _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp::SPECIAL_SUBU (void)
+void R4300iOp::SPECIAL_SUBU()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].W[0] - _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp::SPECIAL_AND (void)
+void R4300iOp::SPECIAL_AND()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW & _GPR[m_Opcode.rt].DW;
 }
 
-void R4300iOp::SPECIAL_OR (void)
+void R4300iOp::SPECIAL_OR()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW | _GPR[m_Opcode.rt].DW;
 #ifdef Interpreter_StackTest
-	if (m_Opcode.rd == 29) {
+	if (m_Opcode.rd == 29)
+	{
 		StackValue = _GPR[m_Opcode.rd].W[0];
 	}
 #endif
 }
 
-void R4300iOp::SPECIAL_XOR (void)
+void R4300iOp::SPECIAL_XOR()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW ^ _GPR[m_Opcode.rt].DW;
 }
 
-void R4300iOp::SPECIAL_NOR (void)
+void R4300iOp::SPECIAL_NOR()
 {
 	_GPR[m_Opcode.rd].DW = ~(_GPR[m_Opcode.rs].DW | _GPR[m_Opcode.rt].DW);
 }
 
-void R4300iOp::SPECIAL_SLT (void)
+void R4300iOp::SPECIAL_SLT()
 {
-	if (_GPR[m_Opcode.rs].DW < _GPR[m_Opcode.rt].DW) {
+	if (_GPR[m_Opcode.rs].DW < _GPR[m_Opcode.rt].DW)
+	{
 		_GPR[m_Opcode.rd].DW = 1;
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rd].DW = 0;
 	}
 }
 
-void R4300iOp::SPECIAL_SLTU (void)
+void R4300iOp::SPECIAL_SLTU()
 {
-	if (_GPR[m_Opcode.rs].UDW < _GPR[m_Opcode.rt].UDW) {
+	if (_GPR[m_Opcode.rs].UDW < _GPR[m_Opcode.rt].UDW)
+	{
 		_GPR[m_Opcode.rd].DW = 1;
-	} else {
+	}
+	else
+	{
 		_GPR[m_Opcode.rd].DW = 0;
 	}
 }
 
-void R4300iOp::SPECIAL_DADD (void)
+void R4300iOp::SPECIAL_DADD()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW + _GPR[m_Opcode.rt].DW;
 }
 
-void R4300iOp::SPECIAL_DADDU (void)
+void R4300iOp::SPECIAL_DADDU()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW + _GPR[m_Opcode.rt].DW;
 }
 
-void R4300iOp::SPECIAL_DSUB (void)
+void R4300iOp::SPECIAL_DSUB()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW - _GPR[m_Opcode.rt].DW;
 }
 
-void R4300iOp::SPECIAL_DSUBU (void)
+void R4300iOp::SPECIAL_DSUBU()
 {
 	_GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW - _GPR[m_Opcode.rt].DW;
 }
 
-void R4300iOp::SPECIAL_TEQ (void)
+void R4300iOp::SPECIAL_TEQ()
 {
 	if (_GPR[m_Opcode.rs].DW == _GPR[m_Opcode.rt].DW && bHaveDebugger()) 
 	{
@@ -1800,41 +1938,42 @@ void R4300iOp::SPECIAL_TEQ (void)
 	}
 }
 
-void R4300iOp::SPECIAL_DSLL (void)
+void R4300iOp::SPECIAL_DSLL()
 {
 	_GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].DW << m_Opcode.sa);
 }
 
-void R4300iOp::SPECIAL_DSRL (void)
+void R4300iOp::SPECIAL_DSRL()
 {
 	_GPR[m_Opcode.rd].UDW = (_GPR[m_Opcode.rt].UDW >> m_Opcode.sa);
 }
 
-void R4300iOp::SPECIAL_DSRA (void)
+void R4300iOp::SPECIAL_DSRA()
 {
 	_GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].DW >> m_Opcode.sa);
 }
 
-void R4300iOp::SPECIAL_DSLL32 (void)
+void R4300iOp::SPECIAL_DSLL32()
 {
 	_GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].DW << (m_Opcode.sa + 32));
 }
 
-void R4300iOp::SPECIAL_DSRL32 (void)
+void R4300iOp::SPECIAL_DSRL32()
 {
    _GPR[m_Opcode.rd].UDW = (_GPR[m_Opcode.rt].UDW >> (m_Opcode.sa + 32));
 }
 
-void R4300iOp::SPECIAL_DSRA32 (void)
+void R4300iOp::SPECIAL_DSRA32()
 {
 	_GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].DW >> (m_Opcode.sa + 32));
 }
 
 /********************** R4300i OpCodes: RegImm **********************/
-void R4300iOp::REGIMM_BLTZ (void)
+void R4300iOp::REGIMM_BLTZ()
 {
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].DW < 0) {
+	if (_GPR[m_Opcode.rs].DW < 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{			
@@ -1843,15 +1982,18 @@ void R4300iOp::REGIMM_BLTZ (void)
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::REGIMM_BGEZ (void)
+void R4300iOp::REGIMM_BGEZ()
 {
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].DW >= 0) {
+	if (_GPR[m_Opcode.rs].DW >= 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{			
@@ -1860,14 +2002,17 @@ void R4300iOp::REGIMM_BGEZ (void)
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::REGIMM_BLTZL (void)
+void R4300iOp::REGIMM_BLTZL()
 {
-	if (_GPR[m_Opcode.rs].DW < 0) {
+	if (_GPR[m_Opcode.rs].DW < 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -1877,15 +2022,18 @@ void R4300iOp::REGIMM_BLTZL (void)
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::REGIMM_BGEZL (void)
+void R4300iOp::REGIMM_BGEZL()
 {
-	if (_GPR[m_Opcode.rs].DW >= 0) {
+	if (_GPR[m_Opcode.rs].DW >= 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
@@ -1895,16 +2043,19 @@ void R4300iOp::REGIMM_BGEZL (void)
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::REGIMM_BLTZAL (void)
+void R4300iOp::REGIMM_BLTZAL()
 {
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].DW < 0) {
+	if (_GPR[m_Opcode.rs].DW < 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{			
@@ -1913,16 +2064,19 @@ void R4300iOp::REGIMM_BLTZAL (void)
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 	_GPR[31].DW= (long)((*_PROGRAM_COUNTER) + 8);
 }
 
-void R4300iOp::REGIMM_BGEZAL (void)
+void R4300iOp::REGIMM_BGEZAL()
 {
 	m_NextInstruction = DELAY_SLOT;
-	if (_GPR[m_Opcode.rs].DW >= 0) {
+	if (_GPR[m_Opcode.rs].DW >= 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
 		if ((*_PROGRAM_COUNTER) == m_JumpToLocation)
 		{			
@@ -1931,13 +2085,15 @@ void R4300iOp::REGIMM_BGEZAL (void)
 				CInterpreterCPU::InPermLoop();
 			}
 		}
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 	_GPR[31].DW = (long)((*_PROGRAM_COUNTER) + 8);
 }
 /************************** COP0 functions **************************/
-void R4300iOp::COP0_MF (void) 
+void R4300iOp::COP0_MF() 
 {
 	if (LogOptions.LogCP0reads) 
 	{
@@ -1951,7 +2107,7 @@ void R4300iOp::COP0_MF (void)
 	_GPR[m_Opcode.rt].DW = (int)_CP0[m_Opcode.rd];
 }
 
-void R4300iOp::COP0_MT (void)
+void R4300iOp::COP0_MT()
 {
 	if (LogOptions.LogCP0changes) 
 	{
@@ -1962,7 +2118,8 @@ void R4300iOp::COP0_MT (void)
 		}
 	}
 
-	switch (m_Opcode.rd) {	
+	switch (m_Opcode.rd)
+	{	
 	case 0: //Index
 	case 2: //EntryLo0
 	case 3: //EntryLo1
@@ -1996,10 +2153,13 @@ void R4300iOp::COP0_MT (void)
 		g_SystemTimer->UpdateCompareTimer();
 		break;		
 	case 12: //Status
-		if ((_CP0[m_Opcode.rd] & STATUS_FR) != (_GPR[m_Opcode.rt].UW[0] & STATUS_FR)) {
+		if ((_CP0[m_Opcode.rd] & STATUS_FR) != (_GPR[m_Opcode.rt].UW[0] & STATUS_FR))
+		{
 			_CP0[m_Opcode.rd] = _GPR[m_Opcode.rt].UW[0];
 			g_Reg->FixFpuLocations();
-		} else {
+		}
+		else
+		{
 			_CP0[m_Opcode.rd] = _GPR[m_Opcode.rt].UW[0];
 		}
 		if ((_CP0[m_Opcode.rd] & 0x18) != 0 && bHaveDebugger()) 
@@ -2021,87 +2181,106 @@ void R4300iOp::COP0_MT (void)
 }
 
 /************************** COP0 CO functions ***********************/
-void R4300iOp::COP0_CO_TLBR (void)
+void R4300iOp::COP0_CO_TLBR()
 {
-	if (!g_System->bUseTlb()) { return; }
+	if (!g_System->bUseTlb())
+	{
+		return;
+	}
 	g_TLB->ReadEntry();
 }
 
-void R4300iOp::COP0_CO_TLBWI (void)
+void R4300iOp::COP0_CO_TLBWI()
 {
-	if (!g_System->bUseTlb()) { return; }
-	g_TLB->WriteEntry(g_Reg->INDEX_REGISTER & 0x1F,FALSE);
+	if (!g_System->bUseTlb())
+	{
+		return;
+	}
+	g_TLB->WriteEntry(g_Reg->INDEX_REGISTER & 0x1F, false);
 }
 
-void R4300iOp::COP0_CO_TLBWR (void)
+void R4300iOp::COP0_CO_TLBWR()
 {
-	if (!g_System->bUseTlb()) { return; }
+	if (!g_System->bUseTlb())
+	{
+		return;
+	}
 	g_TLB->WriteEntry(g_Reg->RANDOM_REGISTER & 0x1F,true);
 }
 
-void R4300iOp::COP0_CO_TLBP (void)
+void R4300iOp::COP0_CO_TLBP()
 {
-	if (!g_System->bUseTlb()) { return; }
+	if (!g_System->bUseTlb())
+	{
+		return;
+	}
 	g_TLB->Probe();
 }
 
-void R4300iOp::COP0_CO_ERET (void)
+void R4300iOp::COP0_CO_ERET()
 {
 	m_NextInstruction = JUMP;
-	if ((g_Reg->STATUS_REGISTER & STATUS_ERL) != 0) {
+	if ((g_Reg->STATUS_REGISTER & STATUS_ERL) != 0)
+	{
 		m_JumpToLocation = g_Reg->ERROREPC_REGISTER;
 		g_Reg->STATUS_REGISTER &= ~STATUS_ERL;
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = g_Reg->EPC_REGISTER;
 		g_Reg->STATUS_REGISTER &= ~STATUS_EXL;
 	}
 	(*_LLBit) = 0;
 	g_Reg->CheckInterrupts();
-	m_TestTimer = TRUE;
+	m_TestTimer = true;
 }
 
 /************************** COP1 functions **************************/
-void R4300iOp::COP1_MF (void)
+void R4300iOp::COP1_MF()
 {
 	TEST_COP1_USABLE_EXCEPTION	
 	_GPR[m_Opcode.rt].DW = *(int *)_FPR_S[m_Opcode.fs];
 }
 
-void R4300iOp::COP1_DMF (void)
+void R4300iOp::COP1_DMF()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_GPR[m_Opcode.rt].DW = *(__int64 *)_FPR_D[m_Opcode.fs];
 }
 
-void R4300iOp::COP1_CF (void)
+void R4300iOp::COP1_CF()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	if (m_Opcode.fs != 31 && m_Opcode.fs != 0) 
 	{
-		if (bHaveDebugger()) { g_Notify->DisplayError(L"CFC1 what register are you writing to ?"); } 
+		if (bHaveDebugger())
+		{
+			g_Notify->DisplayError(L"CFC1 what register are you writing to ?");
+		} 
 		return;
 	}
 	_GPR[m_Opcode.rt].DW = (int)_FPCR[m_Opcode.fs];
 }
 
-void R4300iOp::COP1_MT (void)
+void R4300iOp::COP1_MT()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	*(int *)_FPR_S[m_Opcode.fs] = _GPR[m_Opcode.rt].W[0];
 }
 
-void R4300iOp::COP1_DMT (void)
+void R4300iOp::COP1_DMT()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	*(__int64 *)_FPR_D[m_Opcode.fs] = _GPR[m_Opcode.rt].DW;
 }
 
-void R4300iOp::COP1_CT (void)
+void R4300iOp::COP1_CT()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	if (m_Opcode.fs == 31) {
 		_FPCR[m_Opcode.fs] = _GPR[m_Opcode.rt].W[0];
-		switch((_FPCR[m_Opcode.fs] & 3)) {
+		switch ((_FPCR[m_Opcode.fs] & 3))
+		{
 		case 0: *_RoundingModel = ROUND_NEAR; break;
 		case 1: *_RoundingModel = ROUND_CHOP; break;
 		case 2: *_RoundingModel = ROUND_UP; break;
@@ -2109,110 +2288,145 @@ void R4300iOp::COP1_CT (void)
 		}
 		return;
 	}
-	if (bHaveDebugger()) { g_Notify->DisplayError(L"CTC1 what register are you writing to ?"); } 
+	if (bHaveDebugger())
+	{
+		g_Notify->DisplayError(L"CTC1 what register are you writing to ?");
+	} 
 }
 
 /************************* COP1: BC1 functions ***********************/
-void R4300iOp::COP1_BCF (void)
+void R4300iOp::COP1_BCF()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	m_NextInstruction = DELAY_SLOT;
-	if ((_FPCR[31] & FPCSR_C) == 0) {
+	if ((_FPCR[31] & FPCSR_C) == 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::COP1_BCT (void)
+void R4300iOp::COP1_BCT()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	m_NextInstruction = DELAY_SLOT;
-	if ((_FPCR[31] & FPCSR_C) != 0) {
+	if ((_FPCR[31] & FPCSR_C) != 0)
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
-	} else {
+	}
+	else
+	{
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::COP1_BCFL (void)
+void R4300iOp::COP1_BCFL()
 {
 	TEST_COP1_USABLE_EXCEPTION
-	if ((_FPCR[31] & FPCSR_C) == 0) {
+	if ((_FPCR[31] & FPCSR_C) == 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 
-void R4300iOp::COP1_BCTL (void)
+void R4300iOp::COP1_BCTL()
 {
 	TEST_COP1_USABLE_EXCEPTION
-	if ((_FPCR[31] & FPCSR_C) != 0) {
+	if ((_FPCR[31] & FPCSR_C) != 0)
+	{
 		m_NextInstruction = DELAY_SLOT;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + ((short)m_Opcode.offset << 2) + 4;
-	} else {
+	}
+	else
+	{
 		m_NextInstruction = JUMP;
 		m_JumpToLocation = (*_PROGRAM_COUNTER) + 8;
 	}
 }
 /************************** COP1: S functions ************************/
-__inline void Float_RoundToInteger32( int * Dest, float * Source ) {
-	_asm {
+__inline void Float_RoundToInteger32( int * Dest, float * Source )
+{
+#ifdef _M_IX86
+	_asm
+	{
 		mov esi, [Source]
 		mov edi, [Dest]
 		fld dword ptr [esi]
 		fistp dword ptr [edi]
 	}
+#else
+    __m128 xmm;
+
+    xmm = _mm_load_ss(Source);
+    *(Dest) = _mm_cvt_ss2si(xmm);
+#endif
 }
 
-__inline void Float_RoundToInteger64( __int64 * Dest, float * Source ) {
-	_asm {
+__inline void Float_RoundToInteger64( __int64 * Dest, float * Source )
+{
+#ifdef _M_IX86
+	_asm
+	{
 		mov esi, [Source]
 		mov edi, [Dest]
 		fld dword ptr [esi]
 		fistp qword ptr [edi]
 	}
+#else
+    __m128 xmm;
+
+    xmm = _mm_load_ss(Source);
+    *(Dest) = _mm_cvtss_si64(xmm);
+#endif
 }
 
-void R4300iOp::COP1_S_ADD (void)
+void R4300iOp::COP1_S_ADD()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] + *(float *)_FPR_S[m_Opcode.ft]); 
 }
 
-void R4300iOp::COP1_S_SUB (void)
+void R4300iOp::COP1_S_SUB()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] - *(float *)_FPR_S[m_Opcode.ft]); 
 }
 
-void R4300iOp::COP1_S_MUL (void)
+void R4300iOp::COP1_S_MUL()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] * *(float *)_FPR_S[m_Opcode.ft]); 
 }
 
-void R4300iOp::COP1_S_DIV (void)
+void R4300iOp::COP1_S_DIV()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] / *(float *)_FPR_S[m_Opcode.ft]); 
 }
 
-void R4300iOp::COP1_S_SQRT (void)
+void R4300iOp::COP1_S_SQRT()
 {
+    float * Dest   = (float *)(_FPR_S[m_Opcode.fd]);
+    float * Source = (float *)(_FPR_S[m_Opcode.fs]);
+
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
-	
-	float * Dest = (float *)_FPR_S[m_Opcode.fd];
-	float * Source = (float *)_FPR_S[m_Opcode.fs];
-	_asm {
+#ifdef _M_IX86
+	_asm
+	{
 		push esi
 		mov esi, dword ptr [Source]
 		fld dword ptr [esi]
@@ -2221,102 +2435,110 @@ void R4300iOp::COP1_S_SQRT (void)
 		fstp dword ptr [esi]
 		pop esi
 	}
+#else
+    __m128 xmm;
+
+    xmm = _mm_load_ss(Source);
+    xmm = _mm_sqrt_ss(xmm);
+    *(Dest) = _mm_cvtss_f32(xmm);
+#endif
 }
 
-void R4300iOp::COP1_S_ABS (void)
+void R4300iOp::COP1_S_ABS()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = (float)fabs(*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_MOV (void)
+void R4300iOp::COP1_S_MOV()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = *(float *)_FPR_S[m_Opcode.fs];
 }
 
-void R4300iOp::COP1_S_NEG (void)
+void R4300iOp::COP1_S_NEG()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] * -1.0f);
 }
 
-void R4300iOp::COP1_S_TRUNC_L (void)
+void R4300iOp::COP1_S_TRUNC_L()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_CHOP,_MCW_RC);
 	Float_RoundToInteger64(&*(__int64 *)_FPR_D[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_CEIL_L (void)
+void R4300iOp::COP1_S_CEIL_L()
 {	//added by Witten
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_UP,_MCW_RC);
 	Float_RoundToInteger64(&*(__int64 *)_FPR_D[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_FLOOR_L (void)
+void R4300iOp::COP1_S_FLOOR_L()
 {	//added by Witten
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_DOWN,_MCW_RC);
 	Float_RoundToInteger64(&*(__int64 *)_FPR_D[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_ROUND_W (void)
+void R4300iOp::COP1_S_ROUND_W()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_NEAR,_MCW_RC);
 	Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_TRUNC_W (void)
+void R4300iOp::COP1_S_TRUNC_W()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_CHOP,_MCW_RC);
 	Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_CEIL_W (void)
+void R4300iOp::COP1_S_CEIL_W()
 {	//added by Witten
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_UP,_MCW_RC);
 	Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_FLOOR_W (void)
+void R4300iOp::COP1_S_FLOOR_W()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_DOWN,_MCW_RC);
 	Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_CVT_D (void)
+void R4300iOp::COP1_S_CVT_D()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(double *)_FPR_D[m_Opcode.fd] = (double)(*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_CVT_W (void)
+void R4300iOp::COP1_S_CVT_W()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_CVT_L (void)
+void R4300iOp::COP1_S_CVT_L()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	Float_RoundToInteger64(&*(__int64 *)_FPR_D[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_S_CMP (void)
+void R4300iOp::COP1_S_CMP()
 {
-	int less, equal, unorded, condition;
+	bool less, equal, unorded;
+	int condition;
 	float Temp0, Temp1;
 
 	TEST_COP1_USABLE_EXCEPTION
@@ -2326,179 +2548,209 @@ void R4300iOp::COP1_S_CMP (void)
 
 	if (_isnan(Temp0) || _isnan(Temp1)) 
 	{
-		if (bHaveDebugger()) { g_Notify->DisplayError(__FUNCTIONW__ L": Nan ?"); }
-		less = FALSE;
-		equal = FALSE;
-		unorded = TRUE;
+		if (bHaveDebugger())
+		{
+			g_Notify->DisplayError(__FUNCTIONW__ L": Nan ?");
+		}
+		less = false;
+		equal = false;
+		unorded = true;
 		if ((m_Opcode.funct & 8) != 0) 
 		{
-			if (bHaveDebugger()) { g_Notify->DisplayError(L"Signal InvalidOperationException\nin r4300i_COP1_S_CMP\n%X  %ff\n%X  %ff", Temp0,Temp0,Temp1,Temp1); }
+			if (bHaveDebugger())
+			{
+				g_Notify->DisplayError(stdstr_f("Signal InvalidOperationException\nin r4300i_COP1_S_CMP\n%X  %ff\n%X  %ff", Temp0,Temp0,Temp1,Temp1).ToUTF16().c_str());
+			}
 		}
-	} else {
+	}
+	else
+	{
 		less = Temp0 < Temp1;
 		equal = Temp0 == Temp1;
-		unorded = FALSE;
+		unorded = false;
 	}
 	
 	condition = ((m_Opcode.funct & 4) && less) | ((m_Opcode.funct & 2) && equal) | 
 		((m_Opcode.funct & 1) && unorded);
 
-	if (condition) {
+	if (condition)
+	{
 		_FPCR[31] |= FPCSR_C;
-	} else {
+	}
+	else
+	{
 		_FPCR[31] &= ~FPCSR_C;
 	}
 	
 }
 
 /************************** COP1: D functions ************************/
-__inline void Double_RoundToInteger32( DWORD * Dest, double * Source ) {
-	_asm {
+__inline void Double_RoundToInteger32( DWORD * Dest, double * Source )
+{
+#ifdef _M_IX86
+	_asm
+	{
 		mov esi, [Source]
 		mov edi, [Dest]
 		fld qword ptr [esi]
 		fistp dword ptr [edi]
 	}
+#else
+    __m128d xmm;
+
+    xmm = _mm_load_sd(Source);
+    *(Dest) = _mm_cvtsd_si32(xmm);
+#endif
 }
 
-__inline void Double_RoundToInteger64( unsigned __int64 * Dest, double * Source ) {
-	_asm {
+__inline void Double_RoundToInteger64( unsigned __int64 * Dest, double * Source )
+{
+#ifdef _M_IX86
+	_asm
+	{
 		mov esi, [Source]
 		mov edi, [Dest]
 		fld qword ptr [esi]
 		fistp qword ptr [edi]
 	}
+#else
+    __m128d xmm;
+
+    xmm = _mm_load_sd(Source);
+    *(Dest) = _mm_cvtsd_si64(xmm);
+#endif
 }
 
-void R4300iOp::COP1_D_ADD (void)
+void R4300iOp::COP1_D_ADD()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(double *)_FPR_D[m_Opcode.fd] = *(double *)_FPR_D[m_Opcode.fs] + *(double *)_FPR_D[m_Opcode.ft]; 
 }
 
-void R4300iOp::COP1_D_SUB (void)
+void R4300iOp::COP1_D_SUB()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(double *)_FPR_D[m_Opcode.fd] = *(double *)_FPR_D[m_Opcode.fs] - *(double *)_FPR_D[m_Opcode.ft]; 
 }
 
-void R4300iOp::COP1_D_MUL (void)
+void R4300iOp::COP1_D_MUL()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(double *)_FPR_D[m_Opcode.fd] = *(double *)_FPR_D[m_Opcode.fs] * *(double *)_FPR_D[m_Opcode.ft]; 
 }
 
-void R4300iOp::COP1_D_DIV (void)
+void R4300iOp::COP1_D_DIV()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(double *)_FPR_D[m_Opcode.fd] = *(double *)_FPR_D[m_Opcode.fs] / *(double *)_FPR_D[m_Opcode.ft]; 
 }
 
-void R4300iOp::COP1_D_SQRT (void)
+void R4300iOp::COP1_D_SQRT()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(double *)_FPR_D[m_Opcode.fd] = (double)sqrt(*(double *)_FPR_D[m_Opcode.fs]); 
 }
 
-void R4300iOp::COP1_D_ABS (void)
+void R4300iOp::COP1_D_ABS()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(double *)_FPR_D[m_Opcode.fd] = fabs(*(double *)_FPR_D[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_D_MOV (void)
+void R4300iOp::COP1_D_MOV()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(__int64 *)_FPR_D[m_Opcode.fd] = *(__int64 *)_FPR_D[m_Opcode.fs];
 }
 
-void R4300iOp::COP1_D_NEG (void)
+void R4300iOp::COP1_D_NEG()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(double *)_FPR_D[m_Opcode.fd] = (*(double *)_FPR_D[m_Opcode.fs] * -1.0);
 }
 
-void R4300iOp::COP1_D_TRUNC_L (void)
+void R4300iOp::COP1_D_TRUNC_L()
 {	//added by Witten
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(RC_CHOP,_MCW_RC);
 	Double_RoundToInteger64(&*(QWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] );
 }
 
-void R4300iOp::COP1_D_CEIL_L (void)
+void R4300iOp::COP1_D_CEIL_L()
 {	//added by Witten
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(RC_UP,_MCW_RC);
 	Double_RoundToInteger64(&*(QWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] );
 }
 
-void R4300iOp::COP1_D_FLOOR_L (void)
+void R4300iOp::COP1_D_FLOOR_L()
 {	//added by Witten
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_DOWN,_MCW_RC);
 	Double_RoundToInteger64(&*(QWORD *)_FPR_D[m_Opcode.fd],&*(double *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_D_ROUND_W (void)
+void R4300iOp::COP1_D_ROUND_W()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_NEAR,_MCW_RC);
 	Double_RoundToInteger32(&*(DWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] );
 }
 
-void R4300iOp::COP1_D_TRUNC_W (void)
+void R4300iOp::COP1_D_TRUNC_W()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(RC_CHOP,_MCW_RC);
 	Double_RoundToInteger32(&*(DWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] );
 }
 
-void R4300iOp::COP1_D_CEIL_W (void)
+void R4300iOp::COP1_D_CEIL_W()
 {	//added by Witten
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(RC_UP,_MCW_RC);
 	Double_RoundToInteger32(&*(DWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] );
 }
 
-void R4300iOp::COP1_D_FLOOR_W (void)
+void R4300iOp::COP1_D_FLOOR_W()
 {	//added by Witten
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(_RC_DOWN,_MCW_RC);
 	Double_RoundToInteger32(&*(DWORD *)_FPR_D[m_Opcode.fd],&*(double *)_FPR_S[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_D_CVT_S (void) 
+void R4300iOp::COP1_D_CVT_S() 
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = (float)*(double *)_FPR_D[m_Opcode.fs];
 }
 
-void R4300iOp::COP1_D_CVT_W (void) 
+void R4300iOp::COP1_D_CVT_W() 
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	Double_RoundToInteger32(&*(DWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] );
 }
 
-void R4300iOp::COP1_D_CVT_L (void) 
+void R4300iOp::COP1_D_CVT_L() 
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	Double_RoundToInteger64(&*(unsigned __int64 *)_FPR_D[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs]);
 }
 
-void R4300iOp::COP1_D_CMP (void) 
+void R4300iOp::COP1_D_CMP()
 {
-	int less, equal, unorded, condition;
+	bool less, equal, unorded;
+	int condition;
 	MIPS_DWORD Temp0, Temp1;
 
 	TEST_COP1_USABLE_EXCEPTION
@@ -2508,41 +2760,50 @@ void R4300iOp::COP1_D_CMP (void)
 
 	if (_isnan(Temp0.D) || _isnan(Temp1.D)) 
 	{
-		if (bHaveDebugger()) { g_Notify->DisplayError(__FUNCTIONW__ L": Nan ?"); }
-		less = FALSE;
-		equal = FALSE;
-		unorded = TRUE;
+		if (bHaveDebugger())
+		{
+			g_Notify->DisplayError(__FUNCTIONW__ L": Nan ?");
+		}
+		less = false;
+		equal = false;
+		unorded = true;
 		if ((m_Opcode.funct & 8) != 0) 
 		{
-			if (bHaveDebugger()) { g_Notify->DisplayError(L"Signal InvalidOperationException\nin " __FUNCTIONW__); }
+			if (bHaveDebugger())
+			{
+				g_Notify->DisplayError(L"Signal InvalidOperationException\nin " __FUNCTIONW__);
+			}
 		}
 	} 
-    else 
-    {
+	else 
+	{
 		less = Temp0.D < Temp1.D;
 		equal = Temp0.D == Temp1.D;
-		unorded = FALSE;
+		unorded = false;
 	}
 	
 	condition = ((m_Opcode.funct & 4) && less) | ((m_Opcode.funct & 2) && equal) | 
 		((m_Opcode.funct & 1) && unorded);
 
-	if (condition) {
+	if (condition)
+	{
 		_FPCR[31] |= FPCSR_C;
-	} else {
+	}
+	else
+	{
 		_FPCR[31] &= ~FPCSR_C;
-	}	
+	}
 }
 
 /************************** COP1: W functions ************************/
-void R4300iOp::COP1_W_CVT_S (void)
+void R4300iOp::COP1_W_CVT_S()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = (float)*(int *)_FPR_S[m_Opcode.fs];
 }
 
-void R4300iOp::COP1_W_CVT_D (void)
+void R4300iOp::COP1_W_CVT_D()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
@@ -2550,14 +2811,14 @@ void R4300iOp::COP1_W_CVT_D (void)
 }
 
 /************************** COP1: L functions ************************/
-void R4300iOp::COP1_L_CVT_S (void)
+void R4300iOp::COP1_L_CVT_S()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
 	*(float *)_FPR_S[m_Opcode.fd] = (float)*(__int64 *)_FPR_D[m_Opcode.fs];
 }
 
-void R4300iOp::COP1_L_CVT_D (void)
+void R4300iOp::COP1_L_CVT_D()
 {
 	TEST_COP1_USABLE_EXCEPTION
 	_controlfp(*_RoundingModel,_MCW_RC);
@@ -2565,25 +2826,29 @@ void R4300iOp::COP1_L_CVT_D (void)
 }
 
 /************************** Other functions **************************/
-void R4300iOp::UnknownOpcode (void) 
+void R4300iOp::UnknownOpcode() 
 {
-	g_Notify->DisplayError(L"%s: %08X\n%s\n\nStopping Emulation !", GS(MSG_UNHANDLED_OP), (*_PROGRAM_COUNTER),
-		R4300iOpcodeName(m_Opcode.Hex,(*_PROGRAM_COUNTER)));
+	g_Notify->DisplayError(stdstr_f("%s: %08X\n%s\n\nStopping Emulation !", GS(MSG_UNHANDLED_OP), (*_PROGRAM_COUNTER),
+		R4300iOpcodeName(m_Opcode.Hex,(*_PROGRAM_COUNTER))).ToUTF16().c_str());
 	g_System->m_EndEmulation = true;
 	
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 #ifdef tofix
-	if (HaveDebugger && !inFullScreen) {
+	if (HaveDebugger && !inFullScreen)
+	{
 		int response;
 
 		strcat(Message,"\n\nDo you wish to enter the debugger ?");
 	
 		response = MessageBox(NULL,Message,GS(MSG_MSGBOX_TITLE), MB_YESNO | MB_ICONERROR );
-		if (response == IDYES) {
+		if (response == IDYES)
+		{
 			Enter_R4300i_Commands_Window ();
 		}
 		ExitThread(0);
-	} else {
+	}
+	else
+	{
 		g_Notify->DisplayError(Message);
 		ExitThread(0);
 	}
diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops.h b/Source/Project64/N64 System/Interpreter/Interpreter Ops.h
index 757d7d9fb..3c2153aba 100644
--- a/Source/Project64/N64 System/Interpreter/Interpreter Ops.h	
+++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops.h	
@@ -15,209 +15,210 @@ class R4300iOp :
 	protected CSystemRegisters
 {
 public:
-	typedef void ( * Func )();
+	typedef void(*Func)();
 
 	/************************* OpCode functions *************************/
-	static void  J              ( void );
-	static void  JAL            ( void );
-	static void  BNE            ( void );
-	static void  BEQ            ( void );
-	static void  BLEZ           ( void );
-	static void  BGTZ           ( void );
-	static void  ADDI           ( void );
-	static void  ADDIU          ( void );
-	static void  SLTI           ( void );
-	static void  SLTIU          ( void );
-	static void  ANDI           ( void );
-	static void  ORI            ( void );
-	static void  XORI           ( void );
-	static void  LUI            ( void );
-	static void  BEQL           ( void );
-	static void  BNEL           ( void );
-	static void  BLEZL          ( void );
-	static void  BGTZL          ( void );
-	static void  DADDIU         ( void );
-	static void  LDL            ( void );
-	static void  LDR            ( void );
-	static void  LB             ( void );
-	static void  LH             ( void );
-	static void  LWL            ( void );
-	static void  LW             ( void );
-	static void  LBU            ( void );
-	static void  LHU            ( void );
-	static void  LWR            ( void );
-	static void  LWU            ( void );
-	static void  SB             ( void );
-	static void  SH             ( void );
-	static void  SWL            ( void );
-	static void  SW             ( void );
-	static void  SDL            ( void );
-	static void  SDR            ( void );
-	static void  SWR            ( void );
-	static void  CACHE          ( void );
-	static void  LL             ( void );
-	static void  LWC1           ( void );
-	static void  LDC1           ( void );
-	static void  LD             ( void );
-	static void  SC             ( void );
-	static void  SWC1           ( void );
-	static void  SDC1           ( void );
-	static void  SD             ( void );
+	static void  J();
+	static void  JAL();
+	static void  BNE();
+	static void  BEQ();
+	static void  BLEZ();
+	static void  BGTZ();
+	static void  ADDI();
+	static void  ADDIU();
+	static void  SLTI();
+	static void  SLTIU();
+	static void  ANDI();
+	static void  ORI();
+	static void  XORI();
+	static void  LUI();
+	static void  BEQL();
+	static void  BNEL();
+	static void  BLEZL();
+	static void  BGTZL();
+	static void  DADDIU();
+	static void  LDL();
+	static void  LDR();
+	static void  LB();
+	static void  LH();
+	static void  LWL();
+	static void  LW();
+	static void  LBU();
+	static void  LHU();
+	static void  LWR();
+	static void  LWU();
+	static void  SB();
+	static void  SH();
+	static void  SWL();
+	static void  SW();
+	static void  SDL();
+	static void  SDR();
+	static void  SWR();
+	static void  CACHE();
+	static void  LL();
+	static void  LWC1();
+	static void  LDC1();
+	static void  LD();
+	static void  SC();
+	static void  SWC1();
+	static void  SDC1();
+	static void  SD();
+
 
 	/********************** R4300i OpCodes: Special **********************/
-	static void  SPECIAL_SLL    ( void );
-	static void  SPECIAL_SRL    ( void );
-	static void  SPECIAL_SRA    ( void );
-	static void  SPECIAL_SLLV   ( void );
-	static void  SPECIAL_SRLV   ( void );
-	static void  SPECIAL_SRAV   ( void );
-	static void  SPECIAL_JR     ( void );
-	static void  SPECIAL_JALR   ( void );
-	static void  SPECIAL_SYSCALL ( void );
-	static void  SPECIAL_BREAK   ( void );
-	static void  SPECIAL_SYNC    ( void );
-	static void  SPECIAL_MFHI    ( void );
-	static void  SPECIAL_MTHI    ( void );
-	static void  SPECIAL_MFLO   ( void );
-	static void  SPECIAL_MTLO   ( void );
-	static void  SPECIAL_DSLLV  ( void );
-	static void  SPECIAL_DSRLV  ( void );
-	static void  SPECIAL_DSRAV  ( void );
-	static void  SPECIAL_MULT   ( void );
-	static void  SPECIAL_MULTU  ( void );
-	static void  SPECIAL_DIV    ( void );
-	static void  SPECIAL_DIVU   ( void );
-	static void  SPECIAL_DMULT  ( void );
-	static void  SPECIAL_DMULTU ( void );
-	static void  SPECIAL_DDIV   ( void );
-	static void  SPECIAL_DDIVU  ( void );
-	static void  SPECIAL_ADD    ( void );
-	static void  SPECIAL_ADDU   ( void );
-	static void  SPECIAL_SUB    ( void );
-	static void  SPECIAL_SUBU   ( void );
-	static void  SPECIAL_AND    ( void );
-	static void  SPECIAL_OR     ( void );
-	static void  SPECIAL_XOR    ( void );
-	static void  SPECIAL_NOR    ( void );
-	static void  SPECIAL_SLT    ( void );
-	static void  SPECIAL_SLTU   ( void );
-	static void  SPECIAL_DADD   ( void );
-	static void  SPECIAL_DADDU  ( void );
-	static void  SPECIAL_DSUB   ( void );
-	static void  SPECIAL_DSUBU  ( void );
-	static void  SPECIAL_TEQ    ( void );
-	static void  SPECIAL_DSLL   ( void );
-	static void  SPECIAL_DSRL   ( void );
-	static void  SPECIAL_DSRA   ( void );
-	static void  SPECIAL_DSLL32 ( void );
-	static void  SPECIAL_DSRL32 ( void );
-	static void  SPECIAL_DSRA32 ( void );
+	static void  SPECIAL_SLL();
+	static void  SPECIAL_SRL();
+	static void  SPECIAL_SRA();
+	static void  SPECIAL_SLLV();
+	static void  SPECIAL_SRLV();
+	static void  SPECIAL_SRAV();
+	static void  SPECIAL_JR();
+	static void  SPECIAL_JALR();
+	static void  SPECIAL_SYSCALL();
+	static void  SPECIAL_BREAK();
+	static void  SPECIAL_SYNC();
+	static void  SPECIAL_MFHI();
+	static void  SPECIAL_MTHI();
+	static void  SPECIAL_MFLO();
+	static void  SPECIAL_MTLO();
+	static void  SPECIAL_DSLLV();
+	static void  SPECIAL_DSRLV();
+	static void  SPECIAL_DSRAV();
+	static void  SPECIAL_MULT();
+	static void  SPECIAL_MULTU();
+	static void  SPECIAL_DIV();
+	static void  SPECIAL_DIVU();
+	static void  SPECIAL_DMULT();
+	static void  SPECIAL_DMULTU();
+	static void  SPECIAL_DDIV();
+	static void  SPECIAL_DDIVU();
+	static void  SPECIAL_ADD();
+	static void  SPECIAL_ADDU();
+	static void  SPECIAL_SUB();
+	static void  SPECIAL_SUBU();
+	static void  SPECIAL_AND();
+	static void  SPECIAL_OR();
+	static void  SPECIAL_XOR();
+	static void  SPECIAL_NOR();
+	static void  SPECIAL_SLT();
+	static void  SPECIAL_SLTU();
+	static void  SPECIAL_DADD();
+	static void  SPECIAL_DADDU();
+	static void  SPECIAL_DSUB();
+	static void  SPECIAL_DSUBU();
+	static void  SPECIAL_TEQ();
+	static void  SPECIAL_DSLL();
+	static void  SPECIAL_DSRL();
+	static void  SPECIAL_DSRA();
+	static void  SPECIAL_DSLL32();
+	static void  SPECIAL_DSRL32();
+	static void  SPECIAL_DSRA32();
 
 	/********************** R4300i OpCodes: RegImm **********************/
-	static void  REGIMM_BLTZ    ( void );
-	static void  REGIMM_BGEZ    ( void );
-	static void  REGIMM_BLTZL   ( void );
-	static void  REGIMM_BGEZL   ( void );
-	static void  REGIMM_BLTZAL  ( void );
-	static void  REGIMM_BGEZAL  ( void );
+	static void  REGIMM_BLTZ();
+	static void  REGIMM_BGEZ();
+	static void  REGIMM_BLTZL();
+	static void  REGIMM_BGEZL();
+	static void  REGIMM_BLTZAL();
+	static void  REGIMM_BGEZAL();
 
 	/************************** COP0 functions **************************/
-	static void  COP0_MF        ( void );
-	static void  COP0_MT        ( void );
+	static void  COP0_MF();
+	static void  COP0_MT();
 
 	/************************** COP0 CO functions ***********************/
-	static void  COP0_CO_TLBR   ( void );
-	static void  COP0_CO_TLBWI  ( void );
-	static void  COP0_CO_TLBWR  ( void );
-	static void  COP0_CO_TLBP   ( void );
-	static void  COP0_CO_ERET   ( void );
+	static void  COP0_CO_TLBR();
+	static void  COP0_CO_TLBWI();
+	static void  COP0_CO_TLBWR();
+	static void  COP0_CO_TLBP();
+	static void  COP0_CO_ERET();
 
 	/************************** COP1 functions **************************/
-	static void  COP1_MF        ( void );
-	static void  COP1_DMF       ( void );
-	static void  COP1_CF        ( void );
-	static void  COP1_MT        ( void );
-	static void  COP1_DMT       ( void );
-	static void  COP1_CT        ( void );
+	static void  COP1_MF();
+	static void  COP1_DMF();
+	static void  COP1_CF();
+	static void  COP1_MT();
+	static void  COP1_DMT();
+	static void  COP1_CT();
 
 	/************************* COP1: BC1 functions ***********************/
-	static void  COP1_BCF       ( void );
-	static void  COP1_BCT       ( void );
-	static void  COP1_BCFL      ( void );
-	static void  COP1_BCTL      ( void );
+	static void  COP1_BCF();
+	static void  COP1_BCT();
+	static void  COP1_BCFL();
+	static void  COP1_BCTL();
 
 	/************************** COP1: S functions ************************/
-	static void  COP1_S_ADD     ( void );
-	static void  COP1_S_SUB     ( void );
-	static void  COP1_S_MUL     ( void );
-	static void  COP1_S_DIV     ( void );
-	static void  COP1_S_SQRT    ( void );
-	static void  COP1_S_ABS     ( void );
-	static void  COP1_S_MOV     ( void );
-	static void  COP1_S_NEG     ( void );
-	static void  COP1_S_TRUNC_L ( void );
-	static void  COP1_S_CEIL_L  ( void );	//added by Witten
-	static void  COP1_S_FLOOR_L ( void );	//added by Witten
-	static void  COP1_S_ROUND_W ( void );
-	static void  COP1_S_TRUNC_W ( void );
-	static void  COP1_S_CEIL_W  ( void );	//added by Witten
-	static void  COP1_S_FLOOR_W ( void );
-	static void  COP1_S_CVT_D   ( void );
-	static void  COP1_S_CVT_W   ( void );
-	static void  COP1_S_CVT_L   ( void );
-	static void  COP1_S_CMP     ( void );
+	static void  COP1_S_ADD();
+	static void  COP1_S_SUB();
+	static void  COP1_S_MUL();
+	static void  COP1_S_DIV();
+	static void  COP1_S_SQRT();
+	static void  COP1_S_ABS();
+	static void  COP1_S_MOV();
+	static void  COP1_S_NEG();
+	static void  COP1_S_TRUNC_L();
+	static void  COP1_S_CEIL_L();  //added by Witten
+	static void  COP1_S_FLOOR_L(); //added by Witten
+	static void  COP1_S_ROUND_W();
+	static void  COP1_S_TRUNC_W();
+	static void  COP1_S_CEIL_W();  //added by Witten
+	static void  COP1_S_FLOOR_W();
+	static void  COP1_S_CVT_D();
+	static void  COP1_S_CVT_W();
+	static void  COP1_S_CVT_L();
+	static void  COP1_S_CMP();
 
 	/************************** COP1: D functions ************************/
-	static void  COP1_D_ADD     ( void );
-	static void  COP1_D_SUB     ( void );
-	static void  COP1_D_MUL     ( void );
-	static void  COP1_D_DIV     ( void );
-	static void  COP1_D_SQRT    ( void );
-	static void  COP1_D_ABS     ( void );
-	static void  COP1_D_MOV     ( void );
-	static void  COP1_D_NEG     ( void );
-	static void  COP1_D_TRUNC_L ( void );	//added by Witten	
-	static void  COP1_D_CEIL_L  ( void );	//added by Witten
-	static void  COP1_D_FLOOR_L ( void );	//added by Witten
-	static void  COP1_D_ROUND_W ( void );
-	static void  COP1_D_TRUNC_W ( void );
-	static void  COP1_D_CEIL_W  ( void );	//added by Witten
-	static void  COP1_D_FLOOR_W ( void );	//added by Witten
-	static void  COP1_D_CVT_S   ( void );
-	static void  COP1_D_CVT_W   ( void );
-	static void  COP1_D_CVT_L   ( void );
-	static void  COP1_D_CMP     ( void );
+	static void  COP1_D_ADD();
+	static void  COP1_D_SUB();
+	static void  COP1_D_MUL();
+	static void  COP1_D_DIV();
+	static void  COP1_D_SQRT();
+	static void  COP1_D_ABS();
+	static void  COP1_D_MOV();
+	static void  COP1_D_NEG();
+	static void  COP1_D_TRUNC_L(); //added by Witten
+	static void  COP1_D_CEIL_L();  //added by Witten
+	static void  COP1_D_FLOOR_L(); //added by Witten
+	static void  COP1_D_ROUND_W();
+	static void  COP1_D_TRUNC_W();
+	static void  COP1_D_CEIL_W();  //added by Witten
+	static void  COP1_D_FLOOR_W(); //added by Witten
+	static void  COP1_D_CVT_S();
+	static void  COP1_D_CVT_W();
+	static void  COP1_D_CVT_L();
+	static void  COP1_D_CMP();
 
 	/************************** COP1: W functions ************************/
-	static void  COP1_W_CVT_S   ( void );
-	static void  COP1_W_CVT_D   ( void );
+	static void  COP1_W_CVT_S();
+	static void  COP1_W_CVT_D();
 
 	/************************** COP1: L functions ************************/
-	static void  COP1_L_CVT_S   ( void );
-	static void  COP1_L_CVT_D   ( void );
+	static void  COP1_L_CVT_S();
+	static void  COP1_L_CVT_D();
 
-	/************************** Other functions **************************/	
-	static void  UnknownOpcode ( void );
+	/************************** Other functions **************************/
+	static void  UnknownOpcode();
 
 
-	static Func * BuildInterpreter (void );
+	static Func* BuildInterpreter();
 
-	static BOOL        m_TestTimer;
+	static bool        m_TestTimer;
 	static DWORD       m_NextInstruction;
 	static OPCODE      m_Opcode;
 	static DWORD       m_JumpToLocation;
 
 protected:
-	static void  SPECIAL (void);
-	static void  REGIMM  (void);
-	static void  COP0    (void);
-	static void  COP0_CO (void);
-	static void  COP1    (void);
-	static void  COP1_BC (void);
-	static void  COP1_S  (void);
-	static void  COP1_D  (void);
-	static void  COP1_W  (void);
-	static void  COP1_L  (void);
+	static void  SPECIAL();
+	static void  REGIMM();
+	static void  COP0();
+	static void  COP0_CO();
+	static void  COP1();
+	static void  COP1_BC();
+	static void  COP1_S();
+	static void  COP1_D();
+	static void  COP1_W();
+	static void  COP1_L();
 
 	static Func Jump_Opcode[64];
 	static Func Jump_Special[64];
diff --git a/Source/Project64/N64 System/Mips/Audio.cpp b/Source/Project64/N64 System/Mips/Audio.cpp
index 984bd3215..06b7ec67b 100644
--- a/Source/Project64/N64 System/Mips/Audio.cpp	
+++ b/Source/Project64/N64 System/Mips/Audio.cpp	
@@ -10,43 +10,45 @@
 ****************************************************************************/
 #include "stdafx.h"
 
-CAudio::CAudio (void)
+CAudio::CAudio()
 {
 	Reset();
 }
 
-CAudio::~CAudio (void)
+CAudio::~CAudio()
 {
+	
 }
 
-void CAudio::Reset ( void )
+void CAudio::Reset()
 {
 	m_SecondBuff = 0;
 	m_Status = 0;
 	m_BytesPerSecond = 0;
 	m_CountsPerByte = g_System->AiCountPerBytes(); // should be calculated ... see below, instead allow from user settings
+	if (m_CountsPerByte == 0) m_CountsPerByte = 500; // If the user has no defined value, grant a default and we will calculate
 	m_FramesPerSecond = 60;
 }
 
-DWORD CAudio::GetLength ( void )
+DWORD CAudio::GetLength()
 {
 	WriteTraceF(TraceAudio,__FUNCTION__ ": Start (m_SecondBuff = %d)",m_SecondBuff);
 	DWORD TimeLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt), Res = 0;
 	if (TimeLeft > 0)
 	{
-		Res = (TimeLeft / m_CountsPerByte) + m_SecondBuff;
+		Res = (TimeLeft / m_CountsPerByte);
 	}
 	WriteTraceF(TraceAudio,__FUNCTION__ ": Done (res = %d, TimeLeft = %d)",Res, TimeLeft);
-	return Res;
+	return (Res+3)&~3;
 }
 
-DWORD CAudio::GetStatus ( void )
+DWORD CAudio::GetStatus()
 {
 	WriteTraceF(TraceAudio,__FUNCTION__ ": m_Status = %X",m_Status);
 	return m_Status;
 }
 
-void CAudio::LenChanged ( void )
+void CAudio::LenChanged()
 {
 	WriteTraceF(TraceAudio,__FUNCTION__ ": Start (g_Reg->AI_LEN_REG = %d)",g_Reg->AI_LEN_REG);
 	if (g_Reg->AI_LEN_REG != 0)
@@ -55,22 +57,30 @@ void CAudio::LenChanged ( void )
 		{
 			WriteTraceF(TraceAudio,__FUNCTION__ ": *** Ignoring Write, To Large (%X)",g_Reg->AI_LEN_REG);
 		} else {
-			m_Status |= ai_full;
+			m_Status |= ai_busy;
 			DWORD AudioLeft = g_SystemTimer->GetTimer(CSystemTimer::AiTimerInterrupt);
-			if (AudioLeft == 0)
+			if (m_SecondBuff == 0)
 			{
-				if (m_SecondBuff)
+				if (AudioLeft == 0)
 				{
-					g_Notify->BreakPoint(__FILEW__,__LINE__);
+					WriteTraceF(TraceAudio, __FUNCTION__ ": Set Timer  AI_LEN_REG: %d m_CountsPerByte: %d", g_Reg->AI_LEN_REG, m_CountsPerByte);
+					g_SystemTimer->SetTimer(CSystemTimer::AiTimerInterrupt, g_Reg->AI_LEN_REG * m_CountsPerByte, false);
 				}
-				WriteTraceF(TraceAudio,__FUNCTION__ ": Set Timer  AI_LEN_REG: %d m_CountsPerByte: %d",g_Reg->AI_LEN_REG,m_CountsPerByte);
-				g_SystemTimer->SetTimer(CSystemTimer::AiTimerInterrupt,g_Reg->AI_LEN_REG * m_CountsPerByte,false);
-			} else {
-				WriteTraceF(TraceAudio,__FUNCTION__ ": Increasing Second Buffer (m_SecondBuff %d Increase: %d)",m_SecondBuff,g_Reg->AI_LEN_REG);
-				m_SecondBuff += g_Reg->AI_LEN_REG;
+				else
+				{
+					WriteTraceF(TraceAudio, __FUNCTION__ ": Increasing Second Buffer (m_SecondBuff %d Increase: %d)", m_SecondBuff, g_Reg->AI_LEN_REG);
+					m_SecondBuff += g_Reg->AI_LEN_REG;
+					m_Status |= ai_full;
+				}
+			}
+			else
+			{
+				g_Notify->BreakPoint(__FILEW__, __LINE__);
 			}
 		}
-	} else {
+	}
+	else
+	{
 		WriteTraceF(TraceAudio,__FUNCTION__ ": *** Reset Timer to 0");
 		g_SystemTimer->StopTimer(CSystemTimer::AiTimerBusy);
 		g_SystemTimer->StopTimer(CSystemTimer::AiTimerInterrupt);
@@ -85,41 +95,42 @@ void CAudio::LenChanged ( void )
 	WriteTraceF(TraceAudio,__FUNCTION__ ": Done");
 }
 
-void CAudio::InterruptTimerDone ( void )
+void CAudio::InterruptTimerDone()
 {
 	WriteTraceF(TraceAudio,__FUNCTION__ ": Start (m_SecondBuff = %d)",m_SecondBuff);
-	if (m_SecondBuff != 0) 
+	m_Status &= ~ai_full;
+	g_Reg->MI_INTR_REG |= MI_INTR_AI;
+	g_Reg->CheckInterrupts();
+	if (m_SecondBuff != 0)
 	{
 		g_SystemTimer->SetTimer(CSystemTimer::AiTimerInterrupt,m_SecondBuff * m_CountsPerByte,false);
 		m_SecondBuff = 0;
-	} else {
-		if (g_Reg->m_AudioIntrReg == 0)
-		{
-			g_System->SyncToAudio();
-		}
-		g_Reg->MI_INTR_REG |= MI_INTR_AI;
-		g_Reg->CheckInterrupts();
-		m_Status &= ~ai_full;
+	}
+	else
+	{
+		m_Status &= ~ai_busy;
+	}
+	if (g_Reg->m_AudioIntrReg == 0)
+	{
+		g_System->SyncToAudio();
 	}
 	WriteTrace(TraceAudio,__FUNCTION__ ": Done");
 }
 
-void CAudio::BusyTimerDone ( void )
+void CAudio::BusyTimerDone()
 {
 	WriteTraceF(TraceAudio,__FUNCTION__ ": Start (m_SecondBuff = %d)",m_SecondBuff);
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 	m_Status &= ~ai_busy;
 }
 
-void CAudio::SetViIntr ( DWORD /*VI_INTR_TIME*/ )
+void CAudio::SetViIntr ( DWORD VI_INTR_TIME )
 {
-	/*
 	double CountsPerSecond = (DWORD)((double)VI_INTR_TIME * m_FramesPerSecond);
-	if (m_BytesPerSecond != 0)
+	if (m_BytesPerSecond != 0 && (g_System->AiCountPerBytes() == 0))
 	{
-		//m_CountsPerByte = (double)CountsPerSecond / (double)m_BytesPerSecond;
+		m_CountsPerByte = (int)((double)CountsPerSecond / (double)m_BytesPerSecond);
 	}
-	*/
 }
 
 
@@ -128,7 +139,8 @@ void CAudio::SetFrequency (DWORD Dacrate, DWORD System)
 	WriteTraceF(TraceAudio,__FUNCTION__ "(Dacrate: %X System: %d): AI_BITRATE_REG = %X",Dacrate,System,g_Reg->AI_BITRATE_REG);
 	DWORD Frequency;
 
-	switch (System) {
+	switch (System)
+	{
 	case SYSTEM_PAL:  Frequency = 49656530 / (Dacrate + 1); break;
 	case SYSTEM_MPAL: Frequency = 48628316 / (Dacrate + 1); break;
 	default:          Frequency = 48681812 / (Dacrate + 1); break;
@@ -136,9 +148,8 @@ void CAudio::SetFrequency (DWORD Dacrate, DWORD System)
 
 	//nBlockAlign = 16 / 8 * 2;
 	m_BytesPerSecond = Frequency * 4;
-	m_BytesPerSecond = 194532;
-	m_BytesPerSecond = 128024;
+	//m_BytesPerSecond = 194532;
+	//m_BytesPerSecond = 128024;
 
 	m_FramesPerSecond = System == SYSTEM_PAL ? 50 : 60;
 }
-
diff --git a/Source/Project64/N64 System/Mips/Audio.h b/Source/Project64/N64 System/Mips/Audio.h
index 6caca8141..51a50ae17 100644
--- a/Source/Project64/N64 System/Mips/Audio.h	
+++ b/Source/Project64/N64 System/Mips/Audio.h	
@@ -12,20 +12,21 @@
 
 class CAudio
 {	
-	enum {
+	enum
+	{
 		ai_full = 0x80000000,
 		ai_busy = 0x40000000,
 	};
 public:
-	CAudio (void);
-	~CAudio (void);
+	CAudio();
+	~CAudio();
 
-	DWORD GetLength         ( void );
-	DWORD GetStatus         ( void );
-	void  LenChanged        ( void );
-	void  InterruptTimerDone( void );
-	void  BusyTimerDone     ( void );
-	void  Reset             ( void );
+	DWORD GetLength         ();
+	DWORD GetStatus         ();
+	void  LenChanged        ();
+	void  InterruptTimerDone();
+	void  BusyTimerDone     ();
+	void  Reset             ();
 	void  SetViIntr         ( DWORD VI_INTR_TIME );
 	void  SetFrequency      ( DWORD Dacrate, DWORD System );
 
diff --git a/Source/Project64/N64 System/Mips/Dma.cpp b/Source/Project64/N64 System/Mips/Dma.cpp
index bdbdfa212..2ecf4e835 100644
--- a/Source/Project64/N64 System/Mips/Dma.cpp	
+++ b/Source/Project64/N64 System/Mips/Dma.cpp	
@@ -14,50 +14,117 @@ CDMA::CDMA(CFlashram & FlashRam, CSram & Sram) :
 	m_FlashRam(FlashRam),
 	m_Sram(Sram)
 {
+	
 }
 
-void CDMA::OnFirstDMA (void) {
-	switch (g_Rom->CicChipID()) {
+void CDMA::OnFirstDMA()
+{
+	switch (g_Rom->CicChipID())
+	{
 	case CIC_NUS_6101: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
+	case CIC_NUS_5167: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
 	case CIC_UNKNOWN:
 	case CIC_NUS_6102: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
 	case CIC_NUS_6103: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
 	case CIC_NUS_6105: *(DWORD *)&((g_MMU->Rdram())[0x3F0]) = g_MMU->RdramSize(); break;
 	case CIC_NUS_6106: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
-	default: g_Notify->DisplayError(L"Unhandled CicChip(%d) in first DMA",g_Rom->CicChipID());
+	default: g_Notify->DisplayError(stdstr_f("Unhandled CicChip(%d) in first DMA",g_Rom->CicChipID()).ToUTF16().c_str());
 	}
 }
 
-void CDMA::PI_DMA_READ (void) {
+void CDMA::PI_DMA_READ()
+{
 //	PI_STATUS_REG |= PI_STATUS_DMA_BUSY;
+	DWORD PI_RD_LEN_REG = ((g_Reg->PI_RD_LEN_REG) & 0x00FFFFFFul) + 1;
 
-	if ( g_Reg->PI_DRAM_ADDR_REG + g_Reg->PI_RD_LEN_REG + 1 > g_MMU->RdramSize()) 
+	if ((PI_RD_LEN_REG & 1) != 0)
 	{
-		if (bHaveDebugger()) { g_Notify->DisplayError(L"PI_DMA_READ not in Memory"); }
+		PI_RD_LEN_REG += 1; 
+	}
+	
+	if ( g_Reg->PI_DRAM_ADDR_REG + PI_RD_LEN_REG > g_MMU->RdramSize()) 
+	{
+		if (bHaveDebugger())
+		{
+			g_Notify->DisplayError(stdstr_f("PI_DMA_READ not in Memory: %08X", g_Reg->PI_DRAM_ADDR_REG + PI_RD_LEN_REG).ToUTF16().c_str());
+		}
 		g_Reg->PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
 		g_Reg->MI_INTR_REG |= MI_INTR_PI;
 		g_Reg->CheckInterrupts();
 		return;
 	}
 
-	if ( g_Reg->PI_CART_ADDR_REG >= 0x08000000 && g_Reg->PI_CART_ADDR_REG <= 0x08010000) {
-		if (g_System->m_SaveUsing == SaveChip_Auto) { g_System->m_SaveUsing = SaveChip_Sram; }
-		if (g_System->m_SaveUsing == SaveChip_Sram) {
+	//Write ROM Area (for 64DD Convert)
+	if (g_Reg->PI_CART_ADDR_REG >= 0x10000000 && g_Reg->PI_CART_ADDR_REG <= 0x1FBFFFFF && g_Settings->LoadBool(Game_AllowROMWrites))
+	{
+		DWORD i;
+		BYTE * ROM = g_Rom->GetRomAddress();
+		BYTE * RDRAM = g_MMU->Rdram();
+
+		DWORD OldProtect;
+		VirtualProtect(ROM, g_Rom->GetRomSize(), PAGE_READWRITE, &OldProtect);
+
+		g_Reg->PI_CART_ADDR_REG -= 0x10000000;
+		if (g_Reg->PI_CART_ADDR_REG + PI_RD_LEN_REG < g_Rom->GetRomSize())
+		{
+			for (i = 0; i < PI_RD_LEN_REG; i++)
+			{
+				*(ROM + ((g_Reg->PI_CART_ADDR_REG + i) ^ 3)) = *(RDRAM + ((g_Reg->PI_DRAM_ADDR_REG + i) ^ 3));
+			}
+		}
+		else
+		{
+			DWORD Len;
+			Len = g_Rom->GetRomSize() - g_Reg->PI_CART_ADDR_REG;
+			for (i = 0; i < Len; i++)
+			{
+				*(ROM + ((g_Reg->PI_CART_ADDR_REG + i) ^ 3)) = *(RDRAM + ((g_Reg->PI_DRAM_ADDR_REG + i) ^ 3));
+			}
+		}
+		g_Reg->PI_CART_ADDR_REG += 0x10000000;
+
+		if (!g_System->DmaUsed())
+		{
+			g_System->SetDmaUsed(true);
+			OnFirstDMA();
+		}
+		if (g_Recompiler && g_System->bSMM_PIDMA())
+		{
+			g_Recompiler->ClearRecompCode_Phys(g_Reg->PI_DRAM_ADDR_REG, g_Reg->PI_WR_LEN_REG, CRecompiler::Remove_DMA);
+		}
+
+		VirtualProtect(ROM, g_Rom->GetRomSize(), PAGE_READONLY, &OldProtect);
+		
+		g_Reg->PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
+		g_Reg->MI_INTR_REG |= MI_INTR_PI;
+		g_Reg->CheckInterrupts();
+		return;
+	}
+
+	if ( g_Reg->PI_CART_ADDR_REG >= 0x08000000 && g_Reg->PI_CART_ADDR_REG <= 0x08010000)
+	{
+		if (g_System->m_SaveUsing == SaveChip_Auto)
+		{
+			g_System->m_SaveUsing = SaveChip_Sram;
+		}
+		if (g_System->m_SaveUsing == SaveChip_Sram)
+		{
 			m_Sram.DmaToSram(
 				g_MMU->Rdram() + g_Reg->PI_DRAM_ADDR_REG,
 				g_Reg->PI_CART_ADDR_REG - 0x08000000,
-				g_Reg->PI_RD_LEN_REG + 1
+				PI_RD_LEN_REG
 			);
 			g_Reg->PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
 			g_Reg->MI_INTR_REG |= MI_INTR_PI;
 			g_Reg->CheckInterrupts();
 			return;
 		}
-		if (g_System->m_SaveUsing == SaveChip_FlashRam) {
+		if (g_System->m_SaveUsing == SaveChip_FlashRam)
+		{
 			m_FlashRam.DmaToFlashram(
 				g_MMU->Rdram()+g_Reg->PI_DRAM_ADDR_REG,
 				g_Reg->PI_CART_ADDR_REG - 0x08000000,
-				g_Reg->PI_RD_LEN_REG + 1
+				PI_RD_LEN_REG
 			);
 			g_Reg->PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
 			g_Reg->MI_INTR_REG |= MI_INTR_PI;
@@ -67,7 +134,7 @@ void CDMA::PI_DMA_READ (void) {
 	}
 	if (g_System->m_SaveUsing == SaveChip_FlashRam) 
 	{
-		g_Notify->DisplayError(L"**** FLashRam DMA Read address %X *****",g_Reg->PI_CART_ADDR_REG);
+		g_Notify->DisplayError(stdstr_f("**** FLashRam DMA Read address %08X *****",g_Reg->PI_CART_ADDR_REG).ToUTF16().c_str());
 		g_Reg->PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
 		g_Reg->MI_INTR_REG |= MI_INTR_PI;
 		g_Reg->CheckInterrupts();
@@ -75,7 +142,7 @@ void CDMA::PI_DMA_READ (void) {
 	}
 	if (bHaveDebugger()) 
 	{ 
-		g_Notify->DisplayError(L"PI_DMA_READ where are you dmaing to ?");
+		g_Notify->DisplayError(stdstr_f("PI_DMA_READ where are you dmaing to ? : ％08X", g_Reg->PI_CART_ADDR_REG).ToUTF16().c_str());
 	}
 	g_Reg->PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
 	g_Reg->MI_INTR_REG |= MI_INTR_PI;
@@ -83,7 +150,7 @@ void CDMA::PI_DMA_READ (void) {
 	return;
 }
 
-void CDMA::PI_DMA_WRITE (void)
+void CDMA::PI_DMA_WRITE()
 {
 	DWORD PI_WR_LEN_REG = ((g_Reg->PI_WR_LEN_REG) & 0x00FFFFFFul) + 1;
 
@@ -95,16 +162,21 @@ void CDMA::PI_DMA_WRITE (void)
 	g_Reg->PI_STATUS_REG |= PI_STATUS_DMA_BUSY;
 	if ( g_Reg->PI_DRAM_ADDR_REG + PI_WR_LEN_REG > g_MMU->RdramSize()) 
 	{
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"PI_DMA_WRITE not in Memory"); }
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(stdstr_f("PI_DMA_WRITE not in Memory: %08X", g_Reg->PI_DRAM_ADDR_REG + PI_WR_LEN_REG).ToUTF16().c_str()); }
 		g_Reg->PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
 		g_Reg->MI_INTR_REG |= MI_INTR_PI;
 		g_Reg->CheckInterrupts();
 		return;
 	}
 
-	if ( g_Reg->PI_CART_ADDR_REG >= 0x08000000 && g_Reg->PI_CART_ADDR_REG <= 0x08010000) {
-		if (g_System->m_SaveUsing == SaveChip_Auto) { g_System->m_SaveUsing = SaveChip_Sram; }
-		if (g_System->m_SaveUsing == SaveChip_Sram) {
+	if ( g_Reg->PI_CART_ADDR_REG >= 0x08000000 && g_Reg->PI_CART_ADDR_REG <= 0x08010000)
+	{
+		if (g_System->m_SaveUsing == SaveChip_Auto)
+		{
+			g_System->m_SaveUsing = SaveChip_Sram;
+		}
+		if (g_System->m_SaveUsing == SaveChip_Sram)
+		{
 			m_Sram.DmaFromSram(
 				g_MMU->Rdram()+g_Reg->PI_DRAM_ADDR_REG,
 				g_Reg->PI_CART_ADDR_REG - 0x08000000,
@@ -115,7 +187,8 @@ void CDMA::PI_DMA_WRITE (void)
 			g_Reg->CheckInterrupts();
 			return;
 		}
-		if (g_System->m_SaveUsing == SaveChip_FlashRam) {
+		if (g_System->m_SaveUsing == SaveChip_FlashRam)
+		{
 			m_FlashRam.DmaFromFlashram(
 				g_MMU->Rdram()+g_Reg->PI_DRAM_ADDR_REG,
 				g_Reg->PI_CART_ADDR_REG - 0x08000000,
@@ -128,31 +201,52 @@ void CDMA::PI_DMA_WRITE (void)
 		return;
 	}
 
-	if ( g_Reg->PI_CART_ADDR_REG >= 0x10000000 && g_Reg->PI_CART_ADDR_REG <= 0x1FBFFFFF) 
+	if ( g_Reg->PI_CART_ADDR_REG >= 0x10000000 && g_Reg->PI_CART_ADDR_REG <= 0x1FFFFFFF) 
 	{
 	DWORD i;	
+
 #ifdef tofix
 #ifdef ROM_IN_MAPSPACE
-		if (WrittenToRom) { 
+		if (WrittenToRom)
+		{ 
 			DWORD OldProtect;
 			VirtualProtect(ROM,m_RomFileSize,PAGE_READONLY, &OldProtect);
 		}
 #endif
 #endif
+
 		BYTE * ROM   = g_Rom->GetRomAddress();
 		BYTE * RDRAM = g_MMU->Rdram();
 		g_Reg->PI_CART_ADDR_REG -= 0x10000000;
-		if (g_Reg->PI_CART_ADDR_REG + PI_WR_LEN_REG < g_Rom->GetRomSize()) {
-			for (i = 0; i < PI_WR_LEN_REG; i ++) {
+		if (g_Reg->PI_CART_ADDR_REG + PI_WR_LEN_REG < g_Rom->GetRomSize())
+		{
+			for (i = 0; i < PI_WR_LEN_REG; i ++)
+			{
 				*(RDRAM+((g_Reg->PI_DRAM_ADDR_REG + i) ^ 3)) =  *(ROM+((g_Reg->PI_CART_ADDR_REG + i) ^ 3));
 			}
-		} else {
+		}
+		else if (g_Reg->PI_CART_ADDR_REG >= g_Rom->GetRomSize())
+		{
+			DWORD cart = g_Reg->PI_CART_ADDR_REG - g_Rom->GetRomSize();
+			while (cart >= g_Rom->GetRomSize())
+			{
+				cart -= g_Rom->GetRomSize();
+			}
+			for (i = 0; i < PI_WR_LEN_REG; i++)
+			{
+				*(RDRAM + ((g_Reg->PI_DRAM_ADDR_REG + i) ^ 3)) = *(ROM + ((cart + i) ^ 3));
+			}
+		}
+		else
+		{
 			DWORD Len;
 			Len = g_Rom->GetRomSize() - g_Reg->PI_CART_ADDR_REG;
-			for (i = 0; i < Len; i ++) {
+			for (i = 0; i < Len; i ++)
+			{
 				*(RDRAM+((g_Reg->PI_DRAM_ADDR_REG + i) ^ 3)) =  *(ROM+((g_Reg->PI_CART_ADDR_REG + i) ^ 3));
 			}
-			for (i = Len; i < PI_WR_LEN_REG - Len; i ++) {
+			for (i = Len; i < PI_WR_LEN_REG - Len; i ++)
+			{
 				*(RDRAM+((g_Reg->PI_DRAM_ADDR_REG + i) ^ 3)) =  0;
 			}
 		}
@@ -175,21 +269,25 @@ void CDMA::PI_DMA_WRITE (void)
 		return;
 	}
 	
-	if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"PI_DMA_WRITE not in ROM"); }
+	if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+	{
+		g_Notify->DisplayError(stdstr_f("PI_DMA_WRITE not in ROM: %08X", g_Reg->PI_CART_ADDR_REG).ToUTF16().c_str());
+	}
 	g_Reg->PI_STATUS_REG &= ~PI_STATUS_DMA_BUSY;
 	g_Reg->MI_INTR_REG |= MI_INTR_PI;
 	g_Reg->CheckInterrupts();
 
 }
 
-void CDMA::SP_DMA_READ (void) { 
+void CDMA::SP_DMA_READ()
+{ 
 	g_Reg->SP_DRAM_ADDR_REG &= 0x1FFFFFFF;
 
 	if (g_Reg->SP_DRAM_ADDR_REG > g_MMU->RdramSize()) 
 	{
 		if (bHaveDebugger()) 
 		{ 
-			g_Notify->DisplayError(__FUNCTIONW__ L"\nSP_DRAM_ADDR_REG not in RDRam space");
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nSP_DRAM_ADDR_REG not in RDRam space : % 08X", g_Reg->SP_DRAM_ADDR_REG).ToUTF16().c_str());
 		}
 		g_Reg->SP_DMA_BUSY_REG = 0;
 		g_Reg->SP_STATUS_REG  &= ~SP_STATUS_DMA_BUSY;
@@ -200,14 +298,23 @@ void CDMA::SP_DMA_READ (void) {
 	{
 		if (bHaveDebugger()) 
 		{ 
-			g_Notify->DisplayError(__FUNCTIONW__ L"\ncould not fit copy in memory segement");
+			g_Notify->DisplayError(__FUNCTIONW__ L"\nCould not fit copy in memory segment");
 		}
 		return;		
 	}
 	
-	if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__);  }
-	if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__);  }
-	if (((g_Reg->SP_RD_LEN_REG + 1) & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__);  }
+	if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0)
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__); 
+	}
+	if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0)
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__); 
+	}
+	if (((g_Reg->SP_RD_LEN_REG + 1) & 3) != 0)
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__); 
+	}
 
 	memcpy( g_MMU->Dmem() + (g_Reg->SP_MEM_ADDR_REG & 0x1FFF), g_MMU->Rdram() + g_Reg->SP_DRAM_ADDR_REG,
 		g_Reg->SP_RD_LEN_REG + 1 );
@@ -216,13 +323,13 @@ void CDMA::SP_DMA_READ (void) {
 	g_Reg->SP_STATUS_REG  &= ~SP_STATUS_DMA_BUSY;
 }
 
-void CDMA::SP_DMA_WRITE (void) 
+void CDMA::SP_DMA_WRITE() 
 { 
 	if (g_Reg->SP_DRAM_ADDR_REG > g_MMU->RdramSize()) 
 	{
 		if (bHaveDebugger()) 
 		{ 
-			g_Notify->DisplayError(L"SP DMA WRITE\nSP_DRAM_ADDR_REG not in RDRam space");
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nSP_DRAM_ADDR_REG not in RDRam space : % 08X", g_Reg->SP_DRAM_ADDR_REG).ToUTF16().c_str());
 		}
 		return;
 	}
@@ -236,9 +343,19 @@ void CDMA::SP_DMA_WRITE (void)
 		return;		
 	}
 
-	if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
-	if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__);  }
-	if (((g_Reg->SP_WR_LEN_REG + 1) & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__);  }
+	if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0)
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__); 
+	}
+	
+	if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0)
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__); 
+	}
+	if (((g_Reg->SP_WR_LEN_REG + 1) & 3) != 0)
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__); 
+	}
 
 	memcpy( g_MMU->Rdram() + g_Reg->SP_DRAM_ADDR_REG, g_MMU->Dmem() + (g_Reg->SP_MEM_ADDR_REG & 0x1FFF),
 		g_Reg->SP_WR_LEN_REG + 1);
@@ -246,4 +363,3 @@ void CDMA::SP_DMA_WRITE (void)
 	g_Reg->SP_DMA_BUSY_REG = 0;
 	g_Reg->SP_STATUS_REG  &= ~SP_STATUS_DMA_BUSY;
 }
-
diff --git a/Source/Project64/N64 System/Mips/Dma.h b/Source/Project64/N64 System/Mips/Dma.h
index 2dc7f1ff9..a05c35e96 100644
--- a/Source/Project64/N64 System/Mips/Dma.h	
+++ b/Source/Project64/N64 System/Mips/Dma.h	
@@ -16,22 +16,20 @@ class CDMA :
 	CDMA();
 
 public:
-	void SP_DMA_READ  ( void ); 
-	void SP_DMA_WRITE ( void );
-	void PI_DMA_READ  ( void );
-	void PI_DMA_WRITE ( void );
+	void SP_DMA_READ();
+	void SP_DMA_WRITE();
+	void PI_DMA_READ();
+	void PI_DMA_WRITE();
 
 protected:
 	CDMA (CFlashram & FlashRam, CSram & Sram);
 
-	//void SI_DMA_READ  ( void );
-	//void SI_DMA_WRITE ( void );
+	//void SI_DMA_READ();
+	//void SI_DMA_WRITE();
 
 private:
 	CFlashram & m_FlashRam;
 	CSram     & m_Sram;
 	
-	void OnFirstDMA   ( void );
+	void OnFirstDMA();
 };
-
-
diff --git a/Source/Project64/N64 System/Mips/Eeprom.cpp b/Source/Project64/N64 System/Mips/Eeprom.cpp
index 3d157a89e..0dfa07c54 100644
--- a/Source/Project64/N64 System/Mips/Eeprom.cpp	
+++ b/Source/Project64/N64 System/Mips/Eeprom.cpp	
@@ -11,15 +11,17 @@
 #include "stdafx.h"
 #include <time.h>
 
-CEeprom::CEeprom (bool ReadOnly):
+CEeprom::CEeprom(bool ReadOnly):
 	m_ReadOnly(ReadOnly),
 	m_hFile(NULL)
 {
 	memset(m_EEPROM,0xFF,sizeof(m_EEPROM));
 }
 
-CEeprom::~CEeprom (void) {
-	if (m_hFile) {
+CEeprom::~CEeprom()
+{
+	if (m_hFile)
+	{
 		CloseHandle(m_hFile);
 		m_hFile = NULL;
 	}
@@ -31,15 +33,21 @@ unsigned char byte2bcd(int n)
 	return (unsigned char)(((n / 10) << 4) | (n % 10));
 }
 
-void CEeprom::EepromCommand ( BYTE * Command) {
+void CEeprom::EepromCommand ( BYTE * Command)
+{
 	time_t curtime_time;
 	struct tm curtime;
 
-	if (g_System->m_SaveUsing == SaveChip_Auto) { g_System->m_SaveUsing = SaveChip_Eeprom_4K; }
+	if (g_System->m_SaveUsing == SaveChip_Auto)
+	{
+		g_System->m_SaveUsing = SaveChip_Eeprom_4K;
+	}
 
-	switch (Command[2]) {
+	switch (Command[2])
+	{
 	case 0: // check
-		if (g_System->m_SaveUsing != SaveChip_Eeprom_4K &&  g_System->m_SaveUsing != SaveChip_Eeprom_16K) {
+		if (g_System->m_SaveUsing != SaveChip_Eeprom_4K &&  g_System->m_SaveUsing != SaveChip_Eeprom_16K)
+		{
 			Command[1] |= 0x80;
 			break;
 		}
@@ -52,20 +60,34 @@ void CEeprom::EepromCommand ( BYTE * Command) {
 				 Command[4] = (g_System->m_SaveUsing == SaveChip_Eeprom_4K) ? 0x80 : 0xC0;
 			if ((Command[1] & 3) > 2)
 				Command[5] = 0x00;
-		} else {
+		}
+		else
+		{
 			Command[3] = 0x00;
 			Command[4] = g_System->m_SaveUsing == SaveChip_Eeprom_4K?0x80:0xC0;
 			Command[5] = 0x00;
 		}
 		break;
 	case 4: // Read from Eeprom
-		if (Command[0] != 2 && bHaveDebugger()) { g_Notify->DisplayError(L"What am I meant to do with this Eeprom Command"); }
-		if (Command[1] != 8 && bHaveDebugger()) { g_Notify->DisplayError(L"What am I meant to do with this Eeprom Command"); }
+		if (Command[0] != 2 && bHaveDebugger())
+		{
+			g_Notify->DisplayError(L"What am I meant to do with this Eeprom Command");
+		}
+		if (Command[1] != 8 && bHaveDebugger())
+		{
+			g_Notify->DisplayError(L"What am I meant to do with this Eeprom Command");
+		}
 		ReadFrom(&Command[4],Command[3]);
 		break;
 	case 5: //Write to Eeprom
-		if (Command[0] != 10 && bHaveDebugger()) { g_Notify->DisplayError(L"What am I meant to do with this Eeprom Command"); }
-		if (Command[1] != 1 && bHaveDebugger()) { g_Notify->DisplayError(L"What am I meant to do with this Eeprom Command"); }
+		if (Command[0] != 10 && bHaveDebugger())
+		{
+			g_Notify->DisplayError(L"What am I meant to do with this Eeprom Command");
+		}
+		if (Command[1] != 1 && bHaveDebugger())
+		{
+			g_Notify->DisplayError(L"What am I meant to do with this Eeprom Command");
+		}
 		WriteTo(&Command[4],Command[3]);
 		break;
 	case 6: //RTC Status query
@@ -74,7 +96,7 @@ void CEeprom::EepromCommand ( BYTE * Command) {
 		Command[5] = 0x00;
 		break;
 	case 7: //Read RTC block
-		switch(Command[3])
+		switch (Command[3])
 		{
 			case 0: //Block number
 				Command[4] = 0x00;
@@ -101,26 +123,33 @@ void CEeprom::EepromCommand ( BYTE * Command) {
 		break;
 	case 8:
 		//Write RTC, unimplemented
-		if (g_Settings->LoadDword(Debugger_ShowPifErrors)) { g_Notify->DisplayError(L"Write RTC, unimplemented"); }
+		if (g_Settings->LoadDword(Debugger_ShowPifErrors))
+		{
+			g_Notify->DisplayError(L"Write RTC, unimplemented");
+		}
 		break;
 	default:
-		if (g_Settings->LoadDword(Debugger_ShowPifErrors)) { g_Notify->DisplayError(L"Unknown EepromCommand %d",Command[2]); }
+		if (g_Settings->LoadDword(Debugger_ShowPifErrors))
+		{
+			g_Notify->DisplayError(stdstr_f("Unknown EepromCommand %d",Command[2]).ToUTF16().c_str());
+		}
 	}
 }
 
-void CEeprom::LoadEeprom (void) {
+void CEeprom::LoadEeprom()
+{
 	CPath FileName;
 	DWORD dwRead;
 
 	memset(m_EEPROM,0xFF,sizeof(m_EEPROM));
 
-	FileName.SetDriveDirectory( g_Settings->LoadString(Directory_NativeSave).c_str());
-	FileName.SetName(g_Settings->LoadString(Game_GameName).c_str());
+	FileName.SetDriveDirectory( g_Settings->LoadStringVal(Directory_NativeSave).c_str());
+	FileName.SetName(g_Settings->LoadStringVal(Game_GameName).c_str());
 	FileName.SetExtension("eep");
 
 	if (!FileName.DirectoryExists())
 	{
-		FileName.CreateDirectory();
+		FileName.DirectoryCreate();
 	}
 
 	m_hFile = CreateFile(FileName,m_ReadOnly ? GENERIC_READ : GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,
@@ -135,7 +164,8 @@ void CEeprom::LoadEeprom (void) {
 	ReadFile(m_hFile,m_EEPROM,sizeof(m_EEPROM),&dwRead,NULL);
 }
 
-void CEeprom::ReadFrom(BYTE * Buffer, int line) {
+void CEeprom::ReadFrom(BYTE * Buffer, int line)
+{
 	int i;
 	
 	if (m_hFile == NULL) 
@@ -143,13 +173,14 @@ void CEeprom::ReadFrom(BYTE * Buffer, int line) {
 		LoadEeprom();
 	}
 	
-	for(i=0; i < 8; i++) 
+	for (i=0; i < 8; i++) 
 	{
 		Buffer[i] = m_EEPROM[line*8+i]; 
 	}
 }
 
-void CEeprom::WriteTo(BYTE * Buffer, int line) {
+void CEeprom::WriteTo(BYTE * Buffer, int line)
+{
 	DWORD dwWritten;
 	int i;
 
@@ -157,7 +188,10 @@ void CEeprom::WriteTo(BYTE * Buffer, int line) {
 	{
 		LoadEeprom();
 	}
-	for(i=0;i<8;i++) { m_EEPROM[line*8+i]=Buffer[i]; }
+	for (i=0;i<8;i++)
+	{
+		m_EEPROM[line*8+i]=Buffer[i];
+	}
 	SetFilePointer(m_hFile,line*8,NULL,FILE_BEGIN);	
 	WriteFile( m_hFile,Buffer,8,&dwWritten,NULL );
 	FlushFileBuffers(m_hFile);
diff --git a/Source/Project64/N64 System/Mips/Eeprom.h b/Source/Project64/N64 System/Mips/Eeprom.h
index f94b849f1..34bd246ae 100644
--- a/Source/Project64/N64 System/Mips/Eeprom.h	
+++ b/Source/Project64/N64 System/Mips/Eeprom.h	
@@ -15,12 +15,12 @@ class CEeprom :
 {
 public:
 	CEeprom ( bool ReadOnly );
-   ~CEeprom ( void );
+	~CEeprom();
 
-   void EepromCommand ( BYTE * Command );
+	void EepromCommand ( BYTE * Command );
 
 private:
-	void LoadEeprom ( void );
+	void LoadEeprom ();
 	void ReadFrom   ( BYTE * Buffer, int line );
 	void WriteTo    ( BYTE * Buffer, int line );
 
diff --git a/Source/Project64/N64 System/Mips/FlashRam.cpp b/Source/Project64/N64 System/Mips/FlashRam.cpp
index 25d471ba0..19644dc24 100644
--- a/Source/Project64/N64 System/Mips/FlashRam.cpp	
+++ b/Source/Project64/N64 System/Mips/FlashRam.cpp	
@@ -10,18 +10,21 @@
 ****************************************************************************/
 #include "stdafx.h"
 
-CFlashram::CFlashram (bool ReadOnly):
+CFlashram::CFlashram(bool ReadOnly):
+	m_FlashRamPointer(NULL),
 	m_FlashFlag(FLASHRAM_MODE_NOPES),
 	m_FlashStatus(0),
-	m_FlashRamPointer(NULL),
 	m_FlashRAM_Offset(0),
 	m_ReadOnly(ReadOnly),
 	m_hFile(NULL)
 {
+	
 }
 
-CFlashram::~CFlashram (void) {
-	if (m_hFile) {
+CFlashram::~CFlashram()
+{
+	if (m_hFile)
+	{
 		CloseHandle(m_hFile);
 		m_hFile = NULL;
 	}
@@ -32,16 +35,21 @@ void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len)
 	BYTE FlipBuffer[0x10000];
 	DWORD dwRead, count;
 
-	switch (m_FlashFlag) {
+	switch (m_FlashFlag)
+	{
 	case FLASHRAM_MODE_READ:
-		if (m_hFile == NULL) {
-			if (!LoadFlashram()) { return; }
+		if (m_hFile == NULL)
+		{
+			if (!LoadFlashram())
+			{
+				return;
+			}
 		}
 		if (len > 0x10000) 
 		{
 			if (bHaveDebugger())
 			{
-				g_Notify->DisplayError(L"DmaFromFlashram FlipBuffer to small (len: %d)",len); 
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ ": DmaFromFlashram FlipBuffer to small (len: %d)", len).ToUTF16().c_str());
 			}
 			len = 0x10000;
 		}
@@ -49,7 +57,7 @@ void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len)
 		{
 			if (bHaveDebugger())
 			{
-				g_Notify->DisplayError(L"Unaligned flash ram read ???");
+				g_Notify->DisplayError(__FUNCTIONW__ L": Unaligned flash ram read ???");
 			}
 			return;
 		}
@@ -57,22 +65,18 @@ void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len)
 		StartOffset = StartOffset << 1;
 		SetFilePointer(m_hFile,StartOffset,NULL,FILE_BEGIN);	
 		ReadFile(m_hFile,FlipBuffer,len,&dwRead,NULL);
-		for (count = dwRead; (int)count < len; count ++) {
+		for (count = dwRead; (int)count < len; count ++)
+		{
 			FlipBuffer[count] = 0xFF;
 		}
-		_asm {
-			mov edi, dest
-			lea ecx, [FlipBuffer]
-			mov edx, 0
-			mov ebx, len
 
-		memcpyloop:
-			mov eax, dword ptr [ecx + edx]
-			;bswap eax
-			mov  dword ptr [edi + edx],eax
-			add edx, 4
-			cmp edx, ebx
-			jb memcpyloop
+		for (count = 0; (int)count < len; count += 4)
+		{
+			register DWORD eax;
+
+			eax = *(unsigned __int32 *)&FlipBuffer[count];
+		//	eax = swap32by8(eax); // ; bswap eax
+			*(unsigned __int32 *)(dest + count) = eax;
 		}
 		break;
 	case FLASHRAM_MODE_STATUS:
@@ -80,7 +84,7 @@ void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len)
 		{
 			if (bHaveDebugger())
 			{
-				g_Notify->DisplayError(L"Reading m_FlashStatus not being handled correctly\nStart: %X len: %X",StartOffset,len);
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ ": Reading m_FlashStatus not being handled correctly\nStart: %X len: %X", StartOffset, len).ToUTF16().c_str());
 			}
 		}
 		*((DWORD *)(dest)) = (DWORD)((m_FlashStatus >> 32) & 0xFFFFFFFF);
@@ -89,20 +93,22 @@ void CFlashram::DmaFromFlashram ( BYTE * dest, int StartOffset, int len)
 	default:
 		if (bHaveDebugger())
 		{
-			g_Notify->DisplayError(L"DmaFromFlashram Start: %X, Offset: %X len: %X",dest - g_MMU->Rdram(),StartOffset,len);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__": Start: %X, Offset: %X len: %X",dest - g_MMU->Rdram(),StartOffset,len).ToUTF16().c_str());
 		}
 	}
 }
 
-void CFlashram::DmaToFlashram(BYTE * Source, int StartOffset, int len) {
-	switch (m_FlashFlag) {
+void CFlashram::DmaToFlashram(BYTE * Source, int StartOffset, int len)
+{
+	switch (m_FlashFlag)
+	{
 	case FLASHRAM_MODE_WRITE:
 		m_FlashRamPointer = Source;
 		break;
 	default:
 		if (bHaveDebugger())
 		{
-			g_Notify->DisplayError(L"DmaToFlashram Start: %X, Offset: %X len: %X",Source - g_MMU->Rdram(),StartOffset,len);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ ": Start: %X, Offset: %X len: %X", Source - g_MMU->Rdram(), StartOffset, len).ToUTF16().c_str());
 		}
 	}
 }
@@ -110,28 +116,30 @@ void CFlashram::DmaToFlashram(BYTE * Source, int StartOffset, int len) {
 
 DWORD CFlashram::ReadFromFlashStatus (DWORD PAddr) 
 {
-	switch (PAddr) {
+	switch (PAddr)
+	{
 	case 0x08000000: return (DWORD)(m_FlashStatus >> 32);
 	default:
 		if (bHaveDebugger())
 		{
-			g_Notify->DisplayError(L"Reading from flash ram status (%X)",PAddr);
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ ": PAddr (%X)", PAddr).ToUTF16().c_str());
 		}
 		break;
 	}
 	return (DWORD)(m_FlashStatus >> 32);
 }
 
-bool CFlashram::LoadFlashram (void) {
+bool CFlashram::LoadFlashram()
+{
 	CPath FileName;
 
-	FileName.SetDriveDirectory( g_Settings->LoadString(Directory_NativeSave).c_str());
-	FileName.SetName(g_Settings->LoadString(Game_GameName).c_str());
+	FileName.SetDriveDirectory( g_Settings->LoadStringVal(Directory_NativeSave).c_str());
+	FileName.SetName(g_Settings->LoadStringVal(Game_GameName).c_str());
 	FileName.SetExtension("fla");
 
 	if (!FileName.DirectoryExists())
 	{
-		FileName.CreateDirectory();
+		FileName.DirectoryCreate();
 	}
 
 	m_hFile = CreateFile(FileName,m_ReadOnly ? GENERIC_READ : GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,
@@ -146,46 +154,50 @@ bool CFlashram::LoadFlashram (void) {
 	return true;
 }
 
-void CFlashram::WriteToFlashCommand(DWORD FlashRAM_Command) {
+void CFlashram::WriteToFlashCommand(DWORD FlashRAM_Command)
+{
 	BYTE EmptyBlock[128];
 	DWORD dwWritten;
 
-	switch (FlashRAM_Command & 0xFF000000) {
+	switch (FlashRAM_Command & 0xFF000000)
+	{
 	case 0xD2000000: 
-		switch (m_FlashFlag) {
+		switch (m_FlashFlag)
+		{
 		case FLASHRAM_MODE_NOPES: break;
 		case FLASHRAM_MODE_READ: break;
 		case FLASHRAM_MODE_STATUS: break;
 		case FLASHRAM_MODE_ERASE:
 			memset(EmptyBlock,0xFF,sizeof(EmptyBlock));
 			if (m_hFile == NULL) {
-				if (!LoadFlashram()) { return; }
+				if (!LoadFlashram())
+				{
+					return;
+				}
 			}
 			SetFilePointer(m_hFile,m_FlashRAM_Offset,NULL,FILE_BEGIN);	
 			WriteFile(m_hFile,EmptyBlock,128,&dwWritten,NULL);
 			break;
 		case FLASHRAM_MODE_WRITE:
 			if (m_hFile == NULL) {
-				if (!LoadFlashram()) { return; }
+				if (!LoadFlashram())
+				{
+					return;
+				}
 			}
 			{
 				BYTE FlipBuffer[128];
-				DWORD dwWritten;
+				register size_t edx;
 				BYTE * FlashRamPointer = m_FlashRamPointer;
 
 				memset(FlipBuffer,0,sizeof(FlipBuffer));
-				_asm {
-					lea edi, [FlipBuffer]
-					mov ecx, FlashRamPointer
-					mov edx, 0
+				for (edx = 0; edx < 128; edx += 4)
+				{
+					register DWORD eax;
 
-				memcpyloop:
-					mov eax, dword ptr [ecx + edx]
-					;bswap eax
-					mov  dword ptr [edi + edx],eax
-					add edx, 4
-					cmp edx, 128
-					jb memcpyloop
+					eax = *(unsigned __int32 *)&FlashRamPointer[edx];
+				//	eax = swap32by8(eax); // ; bswap eax
+					*(unsigned __int32 *)(FlipBuffer + edx) = eax;
 				}
 
 				SetFilePointer(m_hFile,m_FlashRAM_Offset,NULL,FILE_BEGIN);	
@@ -193,7 +205,7 @@ void CFlashram::WriteToFlashCommand(DWORD FlashRAM_Command) {
 			}
 			break;
 		default:
-			g_Notify->DisplayError(L"Writing %X to flash ram command register\nm_FlashFlag: %d",FlashRAM_Command,m_FlashFlag);
+			g_Notify->DisplayError(stdstr_f("Writing %X to flash ram command register\nm_FlashFlag: %d",FlashRAM_Command,m_FlashFlag).ToUTF16().c_str());
 		}
 		m_FlashFlag = FLASHRAM_MODE_NOPES;
 		break;
@@ -222,7 +234,7 @@ void CFlashram::WriteToFlashCommand(DWORD FlashRAM_Command) {
 	default:
 		if (bHaveDebugger())
 		{
-			g_Notify->DisplayError(L"Writing %X to flash ram command register",FlashRAM_Command);
+			g_Notify->DisplayError(stdstr_f("Writing %X to flash ram command register",FlashRAM_Command).ToUTF16().c_str());
 		}
 	}
 }
diff --git a/Source/Project64/N64 System/Mips/FlashRam.h b/Source/Project64/N64 System/Mips/FlashRam.h
index 59681c670..e3238b9fe 100644
--- a/Source/Project64/N64 System/Mips/FlashRam.h	
+++ b/Source/Project64/N64 System/Mips/FlashRam.h	
@@ -13,7 +13,8 @@
 class CFlashram :
 	private CDebugSettings
 {
-	enum Modes {
+	enum Modes
+	{
 		FLASHRAM_MODE_NOPES  = 0,
 		FLASHRAM_MODE_ERASE  = 1,
 		FLASHRAM_MODE_WRITE  = 2,
@@ -22,8 +23,8 @@ class CFlashram :
 	};
 
 public:
-	CFlashram ( bool ReadOnly );
-   ~CFlashram ( void );
+	CFlashram(bool ReadOnly);
+	~CFlashram();
 
 	void  DmaFromFlashram     ( BYTE * dest, int StartOffset, int len );
 	void  DmaToFlashram       ( BYTE * Source, int StartOffset, int len );
@@ -31,7 +32,7 @@ public:
 	void  WriteToFlashCommand ( DWORD Value );
 
 private:
-	bool  LoadFlashram ( void );
+	bool  LoadFlashram();
 
 	BYTE * m_FlashRamPointer;
 	Modes  m_FlashFlag;
diff --git a/Source/Project64/N64 System/Mips/Memory Class.h b/Source/Project64/N64 System/Mips/Memory Class.h
index e10dc7302..a35049058 100644
--- a/Source/Project64/N64 System/Mips/Memory Class.h	
+++ b/Source/Project64/N64 System/Mips/Memory Class.h	
@@ -10,6 +10,8 @@
 ****************************************************************************/
 #pragma once
 
+#include <objbase.h>
+
 interface CMipsMemory_CallBack 
 {
 	//Protected memory has been written to, returns true if that memory has been unprotected
@@ -19,31 +21,31 @@ interface CMipsMemory_CallBack
 class CMipsMemory
 {
 public:
-	virtual BYTE * Rdram        ( void ) = 0;
-	virtual DWORD  RdramSize    ( void ) = 0;
-	virtual BYTE * Dmem         ( void ) = 0;
-	virtual BYTE * Imem         ( void ) = 0;
-	virtual BYTE * PifRam       ( void ) = 0;
+	virtual BYTE * Rdram    () = 0;
+	virtual DWORD  RdramSize() = 0;
+	virtual BYTE * Dmem     () = 0;
+	virtual BYTE * Imem     () = 0;
+	virtual BYTE * PifRam   () = 0;
 	
-	virtual BOOL  LB_VAddr     ( DWORD VAddr, BYTE & Value ) = 0;
-	virtual BOOL  LH_VAddr     ( DWORD VAddr, WORD & Value ) = 0; 
-	virtual BOOL  LW_VAddr     ( DWORD VAddr, DWORD & Value ) = 0;
-	virtual BOOL  LD_VAddr     ( DWORD VAddr, QWORD & Value ) = 0;
+	virtual bool  LB_VAddr     ( DWORD VAddr, BYTE & Value ) = 0;
+	virtual bool  LH_VAddr     ( DWORD VAddr, WORD & Value ) = 0; 
+	virtual bool  LW_VAddr     ( DWORD VAddr, DWORD & Value ) = 0;
+	virtual bool  LD_VAddr     ( DWORD VAddr, QWORD & Value ) = 0;
 
-	virtual BOOL  LB_PAddr     ( DWORD PAddr, BYTE & Value ) = 0;
-	virtual BOOL  LH_PAddr     ( DWORD PAddr, WORD & Value ) = 0; 
-	virtual BOOL  LW_PAddr     ( DWORD PAddr, DWORD & Value ) = 0;
-	virtual BOOL  LD_PAddr     ( DWORD PAddr, QWORD & Value ) = 0;
+	virtual bool  LB_PAddr     ( DWORD PAddr, BYTE & Value ) = 0;
+	virtual bool  LH_PAddr     ( DWORD PAddr, WORD & Value ) = 0; 
+	virtual bool  LW_PAddr     ( DWORD PAddr, DWORD & Value ) = 0;
+	virtual bool  LD_PAddr     ( DWORD PAddr, QWORD & Value ) = 0;
 
-	virtual BOOL  SB_VAddr     ( DWORD VAddr, BYTE Value ) = 0;
-	virtual BOOL  SH_VAddr     ( DWORD VAddr, WORD Value ) = 0;
-	virtual BOOL  SW_VAddr     ( DWORD VAddr, DWORD Value ) = 0;
-	virtual BOOL  SD_VAddr     ( DWORD VAddr, QWORD Value ) = 0;
+	virtual bool  SB_VAddr     ( DWORD VAddr, BYTE Value ) = 0;
+	virtual bool  SH_VAddr     ( DWORD VAddr, WORD Value ) = 0;
+	virtual bool  SW_VAddr     ( DWORD VAddr, DWORD Value ) = 0;
+	virtual bool  SD_VAddr     ( DWORD VAddr, QWORD Value ) = 0;
 
-	virtual BOOL  SB_PAddr     ( DWORD PAddr, BYTE Value ) = 0;
-	virtual BOOL  SH_PAddr     ( DWORD PAddr, WORD Value ) = 0;
-	virtual BOOL  SW_PAddr     ( DWORD PAddr, DWORD Value ) = 0;
-	virtual BOOL  SD_PAddr     ( DWORD PAddr, QWORD Value ) = 0;
+	virtual bool  SB_PAddr     ( DWORD PAddr, BYTE Value ) = 0;
+	virtual bool  SH_PAddr     ( DWORD PAddr, WORD Value ) = 0;
+	virtual bool  SW_PAddr     ( DWORD PAddr, DWORD Value ) = 0;
+	virtual bool  SD_PAddr     ( DWORD PAddr, QWORD Value ) = 0;
 
 	virtual bool  ValidVaddr   ( DWORD VAddr ) const = 0;
 
@@ -55,31 +57,31 @@ public:
 	virtual void  UnProtectMemory  ( DWORD StartVaddr, DWORD EndVaddr ) = 0;
 
 	//Compilation Functions
-	virtual void ResetMemoryStack    ( void ) = 0;
+	virtual void ResetMemoryStack    () = 0;
 	
-	virtual void Compile_LB          ( void ) = 0;
-	virtual void Compile_LBU         ( void ) = 0;
-	virtual void Compile_LH          ( void ) = 0;
-	virtual void Compile_LHU         ( void ) = 0;
-	virtual void Compile_LW          ( void ) = 0;
-	virtual void Compile_LL          ( void ) = 0;
-	virtual void Compile_LWC1        ( void ) = 0;
-	virtual void Compile_LWU         ( void ) = 0;
-	virtual void Compile_LWL         ( void ) = 0;
-	virtual void Compile_LWR         ( void ) = 0;
-	virtual void Compile_LD          ( void ) = 0;
-	virtual void Compile_LDC1        ( void ) = 0;
-	virtual void Compile_LDL         ( void ) = 0;
-	virtual void Compile_LDR         ( void ) = 0;
-	virtual void Compile_SB          ( void ) = 0;
-	virtual void Compile_SH          ( void ) = 0;
-	virtual void Compile_SW          ( void ) = 0;
-	virtual void Compile_SWL         ( void ) = 0;
-	virtual void Compile_SWR         ( void ) = 0;
-	virtual void Compile_SD          ( void ) = 0;
-	virtual void Compile_SDL         ( void ) = 0;
-	virtual void Compile_SDR         ( void ) = 0;
-	virtual void Compile_SC          ( void ) = 0;
-	virtual void Compile_SWC1        ( void ) = 0;
-	virtual void Compile_SDC1        ( void ) = 0;
+	virtual void Compile_LB          () = 0;
+	virtual void Compile_LBU         () = 0;
+	virtual void Compile_LH          () = 0;
+	virtual void Compile_LHU         () = 0;
+	virtual void Compile_LW          () = 0;
+	virtual void Compile_LL          () = 0;
+	virtual void Compile_LWC1        () = 0;
+	virtual void Compile_LWU         () = 0;
+	virtual void Compile_LWL         () = 0;
+	virtual void Compile_LWR         () = 0;
+	virtual void Compile_LD          () = 0;
+	virtual void Compile_LDC1        () = 0;
+	virtual void Compile_LDL         () = 0;
+	virtual void Compile_LDR         () = 0;
+	virtual void Compile_SB          () = 0;
+	virtual void Compile_SH          () = 0;
+	virtual void Compile_SW          () = 0;
+	virtual void Compile_SWL         () = 0;
+	virtual void Compile_SWR         () = 0;
+	virtual void Compile_SD          () = 0;
+	virtual void Compile_SDL         () = 0;
+	virtual void Compile_SDR         () = 0;
+	virtual void Compile_SC          () = 0;
+	virtual void Compile_SWC1        () = 0;
+	virtual void Compile_SDC1        () = 0;
 };
diff --git a/Source/Project64/N64 System/Mips/Memory Labels Class.cpp b/Source/Project64/N64 System/Mips/Memory Labels Class.cpp
index f27b85cfb..1047a7c67 100644
--- a/Source/Project64/N64 System/Mips/Memory Labels Class.cpp	
+++ b/Source/Project64/N64 System/Mips/Memory Labels Class.cpp	
@@ -10,48 +10,48 @@
 ****************************************************************************/
 #include "stdafx.h"
 
-DWORD CMemoryLabel::AsciiToHex (char * HexValue) {
-	DWORD Count, Finish, Value = 0;
+DWORD CMemoryLabel::AsciiToHex (char * HexValue)
+{
+	DWORD Count, Finish, Current, Value = 0;
 
 	Finish = strlen(HexValue);
-	if (Finish > 8 ) { Finish = 8; }
+	if (Finish > 8 )
+	{
+		Finish = 8;
+	}
 
-	for (Count = 0; Count < Finish; Count++){
+	for (Count = 0; Count < Finish; Count++)
+	{
 		Value = (Value << 4);
-		switch( HexValue[Count] ) {
-		case '0': break;
-		case '1': Value += 1; break;
-		case '2': Value += 2; break;
-		case '3': Value += 3; break;
-		case '4': Value += 4; break;
-		case '5': Value += 5; break;
-		case '6': Value += 6; break;
-		case '7': Value += 7; break;
-		case '8': Value += 8; break;
-		case '9': Value += 9; break;
-		case 'A': Value += 10; break;
-		case 'a': Value += 10; break;
-		case 'B': Value += 11; break;
-		case 'b': Value += 11; break;
-		case 'C': Value += 12; break;
-		case 'c': Value += 12; break;
-		case 'D': Value += 13; break;
-		case 'd': Value += 13; break;
-		case 'E': Value += 14; break;
-		case 'e': Value += 14; break;
-		case 'F': Value += 15; break;
-		case 'f': Value += 15; break;
-		default: 
-			Value = (Value >> 4);
-			Count = Finish;
+		Current = HexValue[Count];
+		if(Current >= '0' && Current <= '9')
+		{
+			Value += Current - '0';
+		}
+		else
+		{
+			if(Current > 'F')
+				Current -= 32; //32 is the distance between A and a
+
+			if (Current >= 'A' && Current <= 'F')
+			{
+				Value += Current - 55; //55 is the code for 'A' less 10
+			}
+			else
+			{
+				Value = (Value >> 4);
+				Count = Finish;
+			}
 		}
 	}
 	return Value;
 }
 
-void CMemoryLabel::AddMemoryLabel ( DWORD Address, const char * Message, ... ) {
+void CMemoryLabel::AddMemoryLabel ( DWORD Address, const char * Message, ... )
+{
 	StringMap::iterator Item = m_LabelList.find(Address);
-	if (Item == m_LabelList.end()) {
+	if (Item == m_LabelList.end())
+	{
 		char Msg[1000];
 		va_list ap;
 
@@ -65,108 +65,145 @@ void CMemoryLabel::AddMemoryLabel ( DWORD Address, const char * Message, ... ) {
 	}
 }
 
-stdstr CMemoryLabel::LabelName ( DWORD Address ) const {
+stdstr CMemoryLabel::LabelName ( DWORD Address ) const
+{
 	//StringMap::iterator theIterator = m_LabelList.find(Address);
-	//if (theIterator != m_LabelList.end()) {
+	//if (theIterator != m_LabelList.end())
+	//{
 	//	return (*theIterator).second;
 	//}
-	
+
 	char strLabelName[100];
-	sprintf(strLabelName,"0x%08X",Address);		
+	sprintf(strLabelName,"0x%08X",Address);
 	return stdstr(strLabelName);
 }
 
-stdstr CMemoryLabel::StoredLabelName ( DWORD Address ) {
+stdstr CMemoryLabel::StoredLabelName ( DWORD Address )
+{
 	StringMap::iterator theIterator = m_LabelList.find(Address);
-	if (theIterator != m_LabelList.end()) {
+	if (theIterator != m_LabelList.end())
+	{
 		return (*theIterator).second;
 	}
 	return stdstr("");
 }
 
-void CMemoryLabel::LoadLabelList ( char * file ) {
+void CMemoryLabel::LoadLabelList ( char * file )
+{
 	m_LabelList.clear();
 	CurrentLabelFile = file;
 
 	HANDLE hFile = CreateFile(file,GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,
 		OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
-	if (hFile == INVALID_HANDLE_VALUE) { return; }
+	if (hFile == INVALID_HANDLE_VALUE)
+	{
+		return;
+	}
 
 	SetFilePointer(hFile,0,NULL,FILE_BEGIN);
-	
+
 	DWORD FileSize = GetFileSize(hFile,NULL);
 	void * FileContents = VirtualAlloc(NULL,FileSize,MEM_COMMIT,PAGE_READWRITE );
 
-	if (FileContents) {
+	if (FileContents)
+	{
 		DWORD dwRead;
-		if (!ReadFile(hFile,FileContents,FileSize,&dwRead,NULL)) {
+		if (!ReadFile(hFile,FileContents,FileSize,&dwRead,NULL))
+		{
 			VirtualFree(FileContents, 0, MEM_RELEASE);
 			FileContents = NULL;
 		}
 	}
 
-	if (FileContents) { ProcessCODFile((BYTE *)FileContents, FileSize); }
+	if (FileContents)
+	{
+		ProcessCODFile((BYTE *)FileContents, FileSize);
+	}
 
-	VirtualFree(FileContents, 0, MEM_RELEASE);	
+	VirtualFree(FileContents, 0, MEM_RELEASE);
 	CloseHandle(hFile);
 
 	m_NewLabels = 0;
 }
 
-// How many new labels been added since loading/saveing label file
-int  CMemoryLabel::NewLabels ( void ) {
+// How many new labels been added since loading/saving label file
+int  CMemoryLabel::NewLabels()
+{
 	return m_NewLabels;
 }
 
-void CMemoryLabel::SaveLabelList ( void ) {
+void CMemoryLabel::SaveLabelList()
+{
 	m_NewLabels = 0;
 
-	if (CurrentLabelFile.length() == 0) { return; }
+	if (CurrentLabelFile.length() == 0)
+	{
+		return;
+	}
 
 	HANDLE hFile = CreateFile(CurrentLabelFile.c_str(),GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,
 		CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
 	SetFilePointer(hFile,0,NULL,FILE_BEGIN);
-	
-	for (StringMap::iterator Item = m_LabelList.begin(); Item != m_LabelList.end(); Item++) {
+
+	for (StringMap::iterator Item = m_LabelList.begin(); Item != m_LabelList.end(); Item++)
+	{
 		char Text[300];
 		DWORD dwWritten;
 
 		sprintf(Text, "0x%08X,%s\r\n",(*Item).first,((*Item).second).c_str());
 
-		WriteFile( hFile,Text,strlen(Text),&dwWritten,NULL );		
+		WriteFile( hFile,Text,strlen(Text),&dwWritten,NULL );
 	}
-	
+
 	CloseHandle(hFile);
 
 }
 
-void CMemoryLabel::ProcessCODFile(BYTE * File, DWORD FileLen) {
+void CMemoryLabel::ProcessCODFile(BYTE * File, DWORD FileLen)
+{
 	char * CurrentPos = (char *)File;
 	char Label[40];
 	DWORD Address;
 	int Length;
 
-	while ( CurrentPos < (char *)File + FileLen ) {
-		if (*CurrentPos != '0') { return; }
+	while ( CurrentPos < (char *)File + FileLen )
+	{
+		if (*CurrentPos != '0')
+		{
+			return;
+		}
 		CurrentPos += 1;
-		if (*CurrentPos != 'x') { return; }
+		if (*CurrentPos != 'x')
+		{
+			return;
+		}
 		CurrentPos += 1;
-	
-		if (strchr(CurrentPos,',') - CurrentPos != 8) { return; }
+
+		if (strchr(CurrentPos,',') - CurrentPos != 8)
+		{
+			return;
+		}
 		Address = AsciiToHex (CurrentPos);
 		CurrentPos += 9;
 
 
-		if (strchr(CurrentPos,'\r') == NULL) {
+		if (strchr(CurrentPos,'\r') == NULL)
+		{
 			Length = strchr(CurrentPos,'\n') - CurrentPos;
-		} else {
+		}
+		else
+		{
 			Length = strchr(CurrentPos,'\r') - CurrentPos;
-			if (Length > (strchr(CurrentPos,'\n') - CurrentPos)) {
+			if (Length > (strchr(CurrentPos,'\n') - CurrentPos))
+			{
 				Length = strchr(CurrentPos,'\n') - CurrentPos;
 			}
 		}
 
-		if (Length > 40) { Length = 40; }
+		// Stay within label array bounds
+		if (Length > 39)
+			Length = 39;
+
 		memcpy(Label,CurrentPos,Length);
 		Label[Length] = '\0';
 
diff --git a/Source/Project64/N64 System/Mips/Memory Labels Class.h b/Source/Project64/N64 System/Mips/Memory Labels Class.h
index ce856553b..df1bcdb7a 100644
--- a/Source/Project64/N64 System/Mips/Memory Labels Class.h	
+++ b/Source/Project64/N64 System/Mips/Memory Labels Class.h	
@@ -12,7 +12,8 @@
 
 typedef std::map<DWORD, stdstr> StringMap;
 
-class CMemoryLabel {
+class CMemoryLabel
+{
 	// Variable dealing with Labels
 	StringMap m_LabelList;
 	int       m_NewLabels;
@@ -27,6 +28,6 @@ public:
 	stdstr LabelName       ( DWORD Address ) const;
 	stdstr StoredLabelName ( DWORD Address );
 	void   LoadLabelList   ( char * file );
-	int    NewLabels       ( void ); // How many new labels been added since loading/saveing label file
-	void   SaveLabelList   ( void );	
+	int    NewLabels       (); // How many new labels been added since loading/saving label file
+	void   SaveLabelList   ();
 };
diff --git a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp
index 2d182dc87..d311d8f44 100644
--- a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp	
+++ b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp	
@@ -15,15 +15,13 @@ DWORD RegModValue;
 BYTE * CMipsMemoryVM::m_Reserve1 = NULL;
 BYTE * CMipsMemoryVM::m_Reserve2 = NULL;
 
-CMipsMemoryVM::CMipsMemoryVM ( CMipsMemory_CallBack * CallBack, bool SavesReadOnly ) :
-	
+CMipsMemoryVM::CMipsMemoryVM( CMipsMemory_CallBack * CallBack, bool SavesReadOnly ) :
+
 	CPifRam(SavesReadOnly),
 	CFlashram(SavesReadOnly),
 	CSram(SavesReadOnly),
 	CDMA(*this,*this),
 	m_CBClass(CallBack),
-	m_TLB_ReadMap(NULL),
-	m_TLB_WriteMap(NULL),
 	m_RomMapped(false),
 	m_Rom(NULL),
 	m_RomSize(0),
@@ -32,7 +30,9 @@ CMipsMemoryVM::CMipsMemoryVM ( CMipsMemory_CallBack * CallBack, bool SavesReadOn
 	m_HalfLine(0),
 	m_HalfLineCheck(false),
 	m_FieldSerration(0),
-	m_TempValue(0)
+	m_TempValue(0),
+	m_TLB_ReadMap(NULL),
+	m_TLB_WriteMap(NULL)
 { 
 	g_Settings->RegisterChangeCB(Game_RDRamSize,this,(CSettings::SettingChangedFunc)RdramChanged);
 	m_RDRAM      = NULL;
@@ -40,7 +40,24 @@ CMipsMemoryVM::CMipsMemoryVM ( CMipsMemory_CallBack * CallBack, bool SavesReadOn
 	m_IMEM       = NULL;
 }
 
-CMipsMemoryVM::~CMipsMemoryVM (void) 
+static uint32_t swap32by8(uint32_t word)
+{
+    const uint32_t swapped =
+#if defined(_MSC_VER)
+        _byteswap_ulong(word)
+#elif defined(__GNUC__)
+        __builtin_bswap32(word)
+#else
+        (word & 0x000000FFul) << 24
+      | (word & 0x0000FF00ul) <<  8
+      | (word & 0x00FF0000ul) >>  8
+      | (word & 0xFF000000ul) >> 24
+#endif
+    ;
+    return (swapped & 0xFFFFFFFFul);
+}
+
+CMipsMemoryVM::~CMipsMemoryVM()
 {
 	g_Settings->UnregisterChangeCB(Game_RDRamSize,this,(CSettings::SettingChangedFunc)RdramChanged);
 	FreeMemory();
@@ -50,29 +67,32 @@ void CMipsMemoryVM::Reset( bool /*EraseMemory*/ )
 {
 	if (m_TLB_ReadMap)
 	{
-		memset(m_TLB_ReadMap,0,(0xFFFFF * sizeof(DWORD)));
-		memset(m_TLB_WriteMap,0,(0xFFFFF * sizeof(DWORD)));
-		for (DWORD address = 0x80000000; address < 0xC0000000; address += 0x1000) 
+		size_t address;
+
+		memset(m_TLB_ReadMap , 0, 0xFFFFF * sizeof(size_t));
+		memset(m_TLB_WriteMap, 0, 0xFFFFF * sizeof(size_t));
+		for (address = 0x80000000; address < 0xC0000000; address += 0x1000)
 		{
-			m_TLB_ReadMap[address >> 12] = ((DWORD)m_RDRAM + (address & 0x1FFFFFFF)) - address;
-			m_TLB_WriteMap[address >> 12] = ((DWORD)m_RDRAM + (address & 0x1FFFFFFF)) - address;
+			m_TLB_ReadMap[address >> 12] = ((size_t)m_RDRAM + (address & 0x1FFFFFFF)) - address;
+			m_TLB_WriteMap[address >> 12] = ((size_t)m_RDRAM + (address & 0x1FFFFFFF)) - address;
 		}
 		
 		if (g_Settings->LoadDword(Rdb_TLB_VAddrStart) != 0)
 		{
-			DWORD Start = g_Settings->LoadDword(Rdb_TLB_VAddrStart); //0x7F000000;
-			DWORD Len   = g_Settings->LoadDword(Rdb_TLB_VAddrLen);   //0x01000000;
-			DWORD PAddr = g_Settings->LoadDword(Rdb_TLB_PAddrStart); //0x10034b30;
-			DWORD End   = Start + Len;
-			for (DWORD address = Start; address < End; address += 0x1000) {
-				m_TLB_ReadMap[address >> 12] = ((DWORD)m_RDRAM + (address - Start + PAddr)) - address;
-				m_TLB_WriteMap[address >> 12] = ((DWORD)m_RDRAM + (address - Start + PAddr)) - address;
+			size_t Start = g_Settings->LoadDword(Rdb_TLB_VAddrStart); //0x7F000000;
+			size_t Len   = g_Settings->LoadDword(Rdb_TLB_VAddrLen);   //0x01000000;
+			size_t PAddr = g_Settings->LoadDword(Rdb_TLB_PAddrStart); //0x10034b30;
+			size_t End   = Start + Len;
+			for (address = Start; address < End; address += 0x1000)
+			{
+				m_TLB_ReadMap[address >> 12] = ((size_t)m_RDRAM + (address - Start + PAddr)) - address;
+				m_TLB_WriteMap[address >> 12] = ((size_t)m_RDRAM + (address - Start + PAddr)) - address;
 			}
 		}
 	}
 }
 
-void CMipsMemoryVM::ReserveMemory ( void )
+void CMipsMemoryVM::ReserveMemory()
 {
 	m_Reserve1 = (unsigned char *) VirtualAlloc( NULL, 0x20000000, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE );
 	if (g_Settings->LoadBool(Debugger_Enabled))
@@ -81,7 +101,7 @@ void CMipsMemoryVM::ReserveMemory ( void )
 	}
 }
 
-void CMipsMemoryVM::FreeReservedMemory ( void )
+void CMipsMemoryVM::FreeReservedMemory()
 {
 	if (m_Reserve1) 
 	{
@@ -95,17 +115,26 @@ void CMipsMemoryVM::FreeReservedMemory ( void )
 	}
 }
 
-BOOL CMipsMemoryVM::Initialize ( void )
+bool CMipsMemoryVM::Initialize()
 {
 	if (m_RDRAM != NULL)
 	{
 		return true;
 	}
 
-	if (m_Reserve1) { m_RDRAM = m_Reserve1; m_Reserve1 = NULL; }
-	if (m_RDRAM == NULL && m_Reserve2) { m_RDRAM = m_Reserve2; m_Reserve2 = NULL; }
-	if (m_RDRAM == NULL) { m_RDRAM = (unsigned char *) VirtualAlloc( NULL, 0x20000000, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); }
-	if( m_RDRAM == NULL ) 
+	if (m_Reserve1)
+	{
+		m_RDRAM = m_Reserve1; m_Reserve1 = NULL;
+	}
+	if (m_RDRAM == NULL && m_Reserve2)
+	{
+		m_RDRAM = m_Reserve2; m_Reserve2 = NULL;
+	}
+	if (m_RDRAM == NULL)
+	{
+		m_RDRAM = (unsigned char *) VirtualAlloc( NULL, 0x20000000, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE );
+	}
+	if ( m_RDRAM == NULL ) 
 	{  
 		WriteTraceF(TraceError,__FUNCTION__ ": Failed to Reserve RDRAM (Size: 0x%X)",0x20000000);
 		FreeMemory();
@@ -113,14 +142,14 @@ BOOL CMipsMemoryVM::Initialize ( void )
 	}
 	
 	m_AllocatedRdramSize = g_Settings->LoadDword(Game_RDRamSize);
-	if(VirtualAlloc(m_RDRAM, m_AllocatedRdramSize, MEM_COMMIT, PAGE_READWRITE)==NULL) 
+	if (VirtualAlloc(m_RDRAM, m_AllocatedRdramSize, MEM_COMMIT, PAGE_READWRITE)==NULL) 
 	{
 		WriteTraceF(TraceError,__FUNCTION__ ": Failed to Allocate RDRAM (Size: 0x%X)",m_AllocatedRdramSize);
 		FreeMemory();
 		return false;
 	}
 
-	if(VirtualAlloc(m_RDRAM + 0x04000000, 0x2000, MEM_COMMIT, PAGE_READWRITE)==NULL)
+	if (VirtualAlloc(m_RDRAM + 0x04000000, 0x2000, MEM_COMMIT, PAGE_READWRITE)==NULL)
 	{
 		WriteTraceF(TraceError,__FUNCTION__ ": Failed to Allocate DMEM/IMEM (Size: 0x%X)",0x2000);
 		FreeMemory();
@@ -135,7 +164,7 @@ BOOL CMipsMemoryVM::Initialize ( void )
 		m_RomMapped = true;
 		m_Rom = m_RDRAM + 0x10000000;
 		m_RomSize = g_Rom->GetRomSize();
-		if(VirtualAlloc(m_Rom, g_Rom->GetRomSize(), MEM_COMMIT, PAGE_READWRITE)==NULL) 
+		if (VirtualAlloc(m_Rom, g_Rom->GetRomSize(), MEM_COMMIT, PAGE_READWRITE)==NULL) 
 		{
 			WriteTraceF(TraceError,__FUNCTION__ ": Failed to Allocate Rom (Size: 0x%X)",g_Rom->GetRomSize());
 			FreeMemory();
@@ -145,25 +174,37 @@ BOOL CMipsMemoryVM::Initialize ( void )
 		
 		DWORD OldProtect;
 		VirtualProtect(m_Rom,g_Rom->GetRomSize(),PAGE_READONLY, &OldProtect);
-	} else {
+	}
+	else
+	{
 		m_RomMapped = false;
 		m_Rom = g_Rom->GetRomAddress();
 		m_RomSize = g_Rom->GetRomSize();
 	}
 	CPifRam::Reset();
 
-	m_TLB_ReadMap = (DWORD *)VirtualAlloc(NULL,0xFFFFF * sizeof(DWORD),MEM_RESERVE|MEM_COMMIT,PAGE_READWRITE);
+	m_TLB_ReadMap = (size_t *)VirtualAlloc(
+		NULL,
+		0xFFFFF * sizeof(size_t),
+		MEM_RESERVE | MEM_COMMIT,
+		PAGE_READWRITE
+	);
 	if (m_TLB_ReadMap == NULL) 
 	{
-		WriteTraceF(TraceError,__FUNCTION__ ": Failed to Allocate m_TLB_ReadMap (Size: 0x%X)",0xFFFFF * sizeof(DWORD));
+		WriteTraceF(TraceError,__FUNCTION__": Failed to Allocate m_TLB_ReadMap (Size: 0x%X)",0xFFFFF * sizeof(size_t));
 		FreeMemory();
 		return false;
 	}
 
-	m_TLB_WriteMap = (DWORD *)VirtualAlloc(NULL,0xFFFFF * sizeof(DWORD),MEM_RESERVE|MEM_COMMIT,PAGE_READWRITE);
+	m_TLB_WriteMap = (size_t *)VirtualAlloc(
+		NULL,
+		0xFFFFF * sizeof(size_t),
+		MEM_RESERVE | MEM_COMMIT,
+		PAGE_READWRITE
+	);
 	if (m_TLB_WriteMap == NULL) 
 	{
-		WriteTraceF(TraceError,__FUNCTION__ ": Failed to Allocate m_TLB_ReadMap (Size: 0x%X)",0xFFFFF * sizeof(DWORD));
+		WriteTraceF(TraceError,__FUNCTION__": Failed to Allocate m_TLB_WriteMap (Size: 0x%X)",0xFFFFF * sizeof(size_t));
 		FreeMemory();
 		return false;
 	}
@@ -171,15 +212,24 @@ BOOL CMipsMemoryVM::Initialize ( void )
 	return true;
 }
 
-void CMipsMemoryVM::FreeMemory ( void )
+void CMipsMemoryVM::FreeMemory()
 {
 	if (m_RDRAM) 
 	{
 		if (VirtualFree( m_RDRAM, 0x20000000,MEM_DECOMMIT) != 0)
 		{
-			if (m_Reserve1 == NULL) { m_Reserve1 = m_RDRAM; }
-			else if (m_Reserve2 == NULL) { m_Reserve2 = m_RDRAM; }
-			else { VirtualFree( m_RDRAM, 0 , MEM_RELEASE); }
+			if (m_Reserve1 == NULL)
+			{
+				m_Reserve1 = m_RDRAM;
+			}
+			else if (m_Reserve2 == NULL)
+			{
+				m_Reserve2 = m_RDRAM;
+			}
+			else
+			{
+				VirtualFree( m_RDRAM, 0 , MEM_RELEASE);
+			}
 		} else {
 			VirtualFree( m_RDRAM, 0 , MEM_RELEASE);
 		}
@@ -200,46 +250,54 @@ void CMipsMemoryVM::FreeMemory ( void )
 	CPifRam::Reset();
 }
 
-BYTE * CMipsMemoryVM::Rdram ( void )
+BYTE * CMipsMemoryVM::Rdram()
 {
 	return m_RDRAM;
 }
 
-DWORD CMipsMemoryVM::RdramSize ( void )
+DWORD CMipsMemoryVM::RdramSize()
 {
-	return m_AllocatedRdramSize; 
+	return m_AllocatedRdramSize;
 }
 
-BYTE * CMipsMemoryVM::Dmem ( void )
+BYTE * CMipsMemoryVM::Dmem()
 {
 	return m_DMEM;
 }
 
-BYTE * CMipsMemoryVM::Imem ( void )
+BYTE * CMipsMemoryVM::Imem()
 {
 	return m_IMEM;
 }
 
-BYTE * CMipsMemoryVM::PifRam ( void )
+BYTE * CMipsMemoryVM::PifRam()
 {
 	return m_PifRam;
 }
 
-BOOL CMipsMemoryVM::LB_VAddr ( DWORD VAddr, BYTE & Value ) 
+bool CMipsMemoryVM::LB_VAddr(DWORD VAddr, BYTE& Value)
 {
-	if (m_TLB_ReadMap[VAddr >> 12] == 0) { return FALSE; }
-	Value = *(BYTE *)(m_TLB_ReadMap[VAddr >> 12] + (VAddr ^ 3));
-	return TRUE;
+	if (m_TLB_ReadMap[VAddr >> 12] == 0)
+	{
+		return false;
+	}
+
+	Value = *(uint8_t *)(m_TLB_ReadMap[VAddr >> 12] + (VAddr ^ 3));
+	return true;
 }
 
-BOOL CMipsMemoryVM::LH_VAddr ( DWORD VAddr, WORD & Value ) 
+bool CMipsMemoryVM::LH_VAddr(DWORD VAddr, WORD& Value)
 {
-	if (m_TLB_ReadMap[VAddr >> 12] == 0) { return FALSE; }
-	Value = *(WORD *)(m_TLB_ReadMap[VAddr >> 12] + (VAddr ^ 2));
-	return TRUE;
+	if (m_TLB_ReadMap[VAddr >> 12] == 0)
+	{
+		return false;
+	}
+
+	Value = *(uint16_t *)(m_TLB_ReadMap[VAddr >> 12] + (VAddr ^ 2));
+	return true;
 }
 
-BOOL CMipsMemoryVM::LW_VAddr ( DWORD VAddr, DWORD & Value ) 
+bool CMipsMemoryVM::LW_VAddr(DWORD VAddr, DWORD& Value)
 {
 	if (VAddr >= 0xA3F00000 && VAddr < 0xC0000000)
 	{
@@ -250,104 +308,130 @@ BOOL CMipsMemoryVM::LW_VAddr ( DWORD VAddr, DWORD & Value )
 			return true;
 		}
 	}
-	BYTE * BaseAddress = (BYTE *)m_TLB_ReadMap[VAddr >> 12];
-	if (BaseAddress == 0) { return FALSE; }
-	Value = *(DWORD *)(BaseAddress + VAddr);
+
+	BYTE* BaseAddress = (BYTE*)m_TLB_ReadMap[VAddr >> 12];
+	if (BaseAddress == NULL)
+	{
+		return false;
+	}
+
+	Value = *(DWORD*)(BaseAddress + VAddr);
 
 //	if (LookUpMode == FuncFind_ChangeMemory)
 //	{
 //		g_Notify->BreakPoint(__FILEW__,__LINE__);
-//		if ( (Command.Hex >> 16) == 0x7C7C) {
+//		if ( (Command.Hex >> 16) == 0x7C7C)
+//		{
 //			Command.Hex = OrigMem[(Command.Hex & 0xFFFF)].OriginalValue;
 //		}
 //	}
 	return true;
 }
 
-BOOL CMipsMemoryVM::LD_VAddr ( DWORD VAddr, QWORD & Value ) 
+bool CMipsMemoryVM::LD_VAddr(DWORD VAddr, QWORD& Value)
 {
-	if (m_TLB_ReadMap[VAddr >> 12] == 0) { return FALSE; }
-	*((DWORD *)(&Value) + 1) = *(DWORD *)(m_TLB_ReadMap[VAddr >> 12] + VAddr);
-	*((DWORD *)(&Value)) = *(DWORD *)(m_TLB_ReadMap[VAddr >> 12] + VAddr + 4);
-	return TRUE;
+	if (m_TLB_ReadMap[VAddr >> 12] == 0)
+	{
+		return false;
+	}
+
+	*((DWORD*)(&Value) + 1) = *(DWORD*)(m_TLB_ReadMap[VAddr >> 12] + VAddr);
+	*((DWORD*)(&Value) + 0) = *(DWORD*)(m_TLB_ReadMap[VAddr >> 12] + VAddr + 4);
+	return true;
 }
 
-BOOL CMipsMemoryVM::LB_PAddr ( DWORD PAddr, BYTE & Value ) 
+bool CMipsMemoryVM::LB_PAddr(DWORD PAddr, BYTE& Value)
 {
 	if (PAddr < RdramSize())
 	{
-		Value = *(BYTE *)(m_RDRAM + (PAddr ^ 3));
+		Value = *(uint8_t *)(m_RDRAM + (PAddr ^ 3));
 		return true;
 	}
+
 	if (PAddr > 0x18000000)
 	{
 		return false;
 	}
+
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 	return false;
 }
 
-BOOL CMipsMemoryVM::LH_PAddr ( DWORD PAddr, WORD & Value ) 
+bool CMipsMemoryVM::LH_PAddr(DWORD PAddr, WORD& Value)
 {
 	if (PAddr < RdramSize())
 	{
-		Value = *(WORD *)(m_RDRAM + (PAddr ^ 2));
+		Value = *(uint16_t *)(m_RDRAM + (PAddr ^ 2));
 		return true;
 	}
+
 	if (PAddr > 0x18000000)
 	{
 		return false;
 	}
+
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 	return false;
 }
 
-BOOL CMipsMemoryVM::LW_PAddr ( DWORD PAddr, DWORD & Value ) 
+bool CMipsMemoryVM::LW_PAddr(DWORD PAddr, DWORD& Value)
 {
 	if (PAddr < RdramSize())
 	{
-		Value = *(DWORD *)(m_RDRAM + PAddr);
+		Value = *(DWORD*)(m_RDRAM + PAddr);
 		return true;
 	}
+
 	if (PAddr > 0x18000000)
 	{
 		return false;
 	}
+
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 	return false;
 }
 
-BOOL CMipsMemoryVM::LD_PAddr ( DWORD PAddr, QWORD & Value ) 
+bool CMipsMemoryVM::LD_PAddr(DWORD PAddr, QWORD& Value)
 {
 	if (PAddr < RdramSize())
 	{
-		*((DWORD *)(&Value) + 1) = *(DWORD *)(m_RDRAM + PAddr);
-		*((DWORD *)(&Value)) = *(DWORD *)(m_RDRAM + PAddr + 4);
+		*((DWORD*)(&Value) + 1) = *(DWORD*)(m_RDRAM + PAddr);
+		*((DWORD*)(&Value) + 0) = *(DWORD*)(m_RDRAM + PAddr + 4);
 		return true;
 	}
+
 	if (PAddr > 0x18000000)
 	{
 		return false;
 	}
+
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 	return false;
 }
 
-BOOL CMipsMemoryVM::SB_VAddr ( DWORD VAddr, BYTE Value ) 
+bool CMipsMemoryVM::SB_VAddr(DWORD VAddr, BYTE Value)
 {
-	if (m_TLB_WriteMap[VAddr >> 12] == 0) { return FALSE; }
-	*(BYTE *)(m_TLB_WriteMap[VAddr >> 12] + (VAddr ^ 3)) = Value;
-	return TRUE;
+	if (m_TLB_WriteMap[VAddr >> 12] == 0)
+	{
+		return false;
+	}
+
+	*(uint8_t *)(m_TLB_WriteMap[VAddr >> 12] + (VAddr ^ 3)) = Value;
+	return true;
 }
 
-BOOL CMipsMemoryVM::SH_VAddr ( DWORD VAddr, WORD Value )
+bool CMipsMemoryVM::SH_VAddr(DWORD VAddr, WORD Value)
 {
-	if (m_TLB_WriteMap[VAddr >> 12] == 0) { return FALSE; }
-	*(WORD *)(m_TLB_WriteMap[VAddr >> 12] + (VAddr ^ 2)) = Value;
-	return TRUE;
+	if (m_TLB_WriteMap[VAddr >> 12] == 0)
+	{
+		return false;
+	}
+
+	*(uint16_t *)(m_TLB_WriteMap[VAddr >> 12] + (VAddr ^ 2)) = Value;
+	return true;
 }
 
-BOOL CMipsMemoryVM::SW_VAddr ( DWORD VAddr, DWORD Value ) 
+bool CMipsMemoryVM::SW_VAddr(DWORD VAddr, DWORD Value)
 {
 	if (VAddr >= 0xA3F00000 && VAddr < 0xC0000000)
 	{
@@ -358,78 +442,95 @@ BOOL CMipsMemoryVM::SW_VAddr ( DWORD VAddr, DWORD Value )
 			return true;
 		}
 	}
-	if (m_TLB_WriteMap[VAddr >> 12] == 0) { return FALSE; }
-	*(DWORD *)(m_TLB_WriteMap[VAddr >> 12] + VAddr) = Value;
-	return TRUE;
+
+	if (m_TLB_WriteMap[VAddr >> 12] == 0)
+	{
+		return false;
+	}
+
+	*(DWORD*)(m_TLB_WriteMap[VAddr >> 12] + VAddr) = Value;
+	return true;
 }
 
 
-BOOL CMipsMemoryVM::SD_VAddr ( DWORD VAddr, QWORD Value )
+bool CMipsMemoryVM::SD_VAddr(DWORD VAddr, QWORD Value)
 {
-	if (m_TLB_WriteMap[VAddr >> 12] == 0) { return FALSE; }
-	*(DWORD *)(m_TLB_WriteMap[VAddr >> 12] + VAddr) = *((DWORD *)(&Value) + 1);
-	*(DWORD *)(m_TLB_WriteMap[VAddr >> 12] + VAddr + 4) = *((DWORD *)(&Value));
-	return TRUE;
+	if (m_TLB_WriteMap[VAddr >> 12] == 0)
+	{
+		return false;
+	}
+
+	*(DWORD*)(m_TLB_WriteMap[VAddr >> 12] + VAddr + 0) = *((DWORD*)(&Value) + 1);
+	*(DWORD*)(m_TLB_WriteMap[VAddr >> 12] + VAddr + 4) = *((DWORD*)(&Value));
+	return true;
 }
 
-BOOL CMipsMemoryVM::SB_PAddr ( DWORD PAddr, BYTE Value ) 
+bool CMipsMemoryVM::SB_PAddr(DWORD PAddr, BYTE Value)
 {
 	if (PAddr < RdramSize())
 	{
-		*(BYTE *)(m_RDRAM + (PAddr ^ 3)) = Value;
+		*(uint8_t *)(m_RDRAM + (PAddr ^ 3)) = Value;
 		return true;
 	}
+
 	if (PAddr > 0x18000000)
 	{
 		return false;
 	}
+
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 	return false;
 }
 
-BOOL CMipsMemoryVM::SH_PAddr ( DWORD PAddr, WORD Value )
+bool CMipsMemoryVM::SH_PAddr(DWORD PAddr, WORD Value)
 {
 	if (PAddr < RdramSize())
 	{
-		*(WORD *)(m_RDRAM + (PAddr ^ 2)) = Value;
+		*(uint16_t *)(m_RDRAM + (PAddr ^ 2)) = Value;
 		return true;
 	}
+
 	if (PAddr > 0x18000000)
 	{
 		return false;
 	}
+
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 	return false;
 }
 
-BOOL CMipsMemoryVM::SW_PAddr ( DWORD PAddr, DWORD Value ) 
+bool CMipsMemoryVM::SW_PAddr(DWORD PAddr, DWORD Value)
 {
 	if (PAddr < RdramSize())
 	{
-		*(DWORD *)(m_RDRAM + PAddr) = Value;
+		*(DWORD*)(m_RDRAM + PAddr) = Value;
 		return true;
 	}
+
 	if (PAddr > 0x18000000)
 	{
 		return false;
 	}
+
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 	return false;
 }
 
 
-BOOL CMipsMemoryVM::SD_PAddr ( DWORD PAddr, QWORD Value )
+bool CMipsMemoryVM::SD_PAddr(DWORD PAddr, QWORD Value)
 {
 	if (PAddr < RdramSize())
 	{
-		*(DWORD *)(m_RDRAM + PAddr) = *((DWORD *)(&Value) + 1);
-		*(DWORD *)(m_RDRAM + PAddr + 4) = *((DWORD *)(&Value));
+		*(DWORD*)(m_RDRAM + PAddr + 0) = *((DWORD*)(&Value) + 1);
+		*(DWORD*)(m_RDRAM + PAddr + 4) = *((DWORD*)(&Value));
 		return true;
 	}
+
 	if (PAddr > 0x18000000)
 	{
 		return false;
 	}
+
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 	return false;
 }
@@ -441,20 +542,27 @@ bool CMipsMemoryVM::ValidVaddr ( DWORD VAddr ) const
 
 bool CMipsMemoryVM::VAddrToRealAddr ( DWORD VAddr, void * &RealAddress ) const
 {
-	if (m_TLB_ReadMap[VAddr >> 12] == 0) { return false; }
+	if (m_TLB_ReadMap[VAddr >> 12] == 0)
+	{
+		return false;
+	}
 	RealAddress = (BYTE *)(m_TLB_ReadMap[VAddr >> 12] + VAddr);
 	return true;
 }
 
 bool CMipsMemoryVM::TranslateVaddr ( DWORD VAddr, DWORD &PAddr) const 
 {
-	//Change the Virtual address to a Phyiscal Address
-	if (m_TLB_ReadMap[VAddr >> 12] == 0) { return false; }
+	//Change the Virtual address to a Physical Address
+	if (m_TLB_ReadMap[VAddr >> 12] == 0)
+	{
+		return false;
+	}
 	PAddr = (DWORD)((BYTE *)(m_TLB_ReadMap[VAddr >> 12] + VAddr) - m_RDRAM);
 	return true;
 }
 
-void  CMipsMemoryVM::Compile_LB ( x86Reg Reg, DWORD VAddr, BOOL SignExtend) {
+void CMipsMemoryVM::Compile_LB(x86Reg Reg, DWORD VAddr, bool SignExtend)
+{
 	DWORD PAddr;
 	char VarName[100];
 
@@ -466,28 +574,36 @@ void  CMipsMemoryVM::Compile_LB ( x86Reg Reg, DWORD VAddr, BOOL SignExtend) {
 			return;
 		}
 
-		x86Reg TlbMappReg = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TlbMappReg = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr >> 12,TlbMappReg);
-		x86Reg AddrReg = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg AddrReg = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr,AddrReg);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TlbMappReg,TlbMappReg,4);
 		CompileReadTLBMiss(AddrReg,TlbMappReg);
-		if (SignExtend) {
+		if (SignExtend)
+		{
 			MoveSxByteX86regPointerToX86reg(AddrReg, TlbMappReg,Reg);
-		} else {
+		}
+		else
+		{
 			MoveZxByteX86regPointerToX86reg(AddrReg, TlbMappReg,Reg);
 		}
 		return;
 	}
 
-	if (!TranslateVaddr(VAddr,PAddr)) {
+	if (!TranslateVaddr(VAddr,PAddr))
+	{
 		MoveConstToX86reg(0,Reg);
-		CPU_Message("Compile_LB\nFailed to translate address %X",VAddr);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_LB\nFailed to translate address %X",VAddr); }
+		CPU_Message("Compile_LB\nFailed to translate address %08X",VAddr);
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address %08X",VAddr).ToUTF16().c_str());
+		}
 		return;
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000: 
 	case 0x00100000: 
 	case 0x00200000: 
@@ -498,19 +614,26 @@ void  CMipsMemoryVM::Compile_LB ( x86Reg Reg, DWORD VAddr, BOOL SignExtend) {
 	case 0x00700000: 
 	case 0x10000000: 
 		sprintf(VarName,"m_RDRAM + %X",PAddr);
-		if (SignExtend) {
+		if (SignExtend)
+		{
 			MoveSxVariableToX86regByte(PAddr + m_RDRAM,VarName,Reg); 
-		} else {
+		}
+		else
+		{
 			MoveZxVariableToX86regByte(PAddr + m_RDRAM,VarName,Reg); 
 		}
 		break;
 	default:
 		MoveConstToX86reg(0,Reg);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_LB\nFailed to compile address: %X",VAddr); }
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to compile address: %08X",VAddr).ToUTF16().c_str());
+		}
 	}
 }
 
-void  CMipsMemoryVM::Compile_LH ( x86Reg Reg, DWORD VAddr, BOOL SignExtend) {
+void  CMipsMemoryVM::Compile_LH(x86Reg Reg, DWORD VAddr, bool SignExtend)
+{
 	char VarName[100];
 	DWORD PAddr;
 
@@ -522,28 +645,36 @@ void  CMipsMemoryVM::Compile_LH ( x86Reg Reg, DWORD VAddr, BOOL SignExtend) {
 			return;
 		}
 
-		x86Reg TlbMappReg = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TlbMappReg = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr >> 12,TlbMappReg);
-		x86Reg AddrReg = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg AddrReg = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr,AddrReg);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TlbMappReg,TlbMappReg,4);
 		CompileReadTLBMiss(AddrReg,TlbMappReg);
-		if (SignExtend) {
+		if (SignExtend)
+		{
 			MoveSxHalfX86regPointerToX86reg(AddrReg, TlbMappReg,Reg);
-		} else {
+		}
+		else
+		{
 			MoveZxHalfX86regPointerToX86reg(AddrReg, TlbMappReg,Reg);
 		}
 		return;
 	}
 
-	if (!TranslateVaddr(VAddr, PAddr)) {
+	if (!TranslateVaddr(VAddr, PAddr))
+	{
 		MoveConstToX86reg(0,Reg);
-		CPU_Message("Compile_LH\nFailed to translate address %X",VAddr);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_LH\nFailed to translate address %X",VAddr); }
+		CPU_Message("Compile_LH\nFailed to translate address %08X",VAddr);
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address %08X",VAddr).ToUTF16().c_str());
+		}
 		return;
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000: 
 	case 0x00100000: 
 	case 0x00200000: 
@@ -554,19 +685,26 @@ void  CMipsMemoryVM::Compile_LH ( x86Reg Reg, DWORD VAddr, BOOL SignExtend) {
 	case 0x00700000: 
 	case 0x10000000: 
 		sprintf(VarName,"m_RDRAM + %X",PAddr);
-		if (SignExtend) {
+		if (SignExtend)
+		{
 			MoveSxVariableToX86regHalf(PAddr + m_RDRAM,VarName,Reg); 
-		} else {
+		}
+		else
+		{
 			MoveZxVariableToX86regHalf(PAddr + m_RDRAM,VarName,Reg); 
 		}
 		break;
 	default:
 		MoveConstToX86reg(0,Reg);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_LHU\nFailed to compile address: %X",VAddr); }
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to compile address: %08X", VAddr).ToUTF16().c_str());
+		}
 	}
 }
 
-void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
+void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr )
+{
 	char VarName[100];
 	DWORD PAddr;
 
@@ -579,19 +717,22 @@ void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
 			return;
 		}
 
-		x86Reg TlbMappReg = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TlbMappReg = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr >> 12,TlbMappReg);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TlbMappReg,TlbMappReg,4);
 		CompileReadTLBMiss(VAddr,TlbMappReg);
 		AddConstToX86Reg(TlbMappReg,VAddr);
 		MoveX86PointerToX86reg(Reg,TlbMappReg);
-	} else {
+	}
+	else
+	{
 		if (!TranslateVaddr(VAddr, PAddr)) 
 		{
 			g_Notify->BreakPoint(__FILEW__,__LINE__);
 		}
 
-		switch (PAddr & 0xFFF00000) {
+		switch (PAddr & 0xFFF00000)
+		{
 		case 0x00000000: 
 		case 0x00100000: 
 		case 0x00200000: 
@@ -604,12 +745,14 @@ void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
 			MoveVariableToX86reg(PAddr + m_RDRAM,VarName,Reg); 
 			break;
 		case 0x04000000:
-			if (PAddr < 0x04002000) { 
+			if (PAddr < 0x04002000)
+			{ 
 				sprintf(VarName,"m_RDRAM + %X",PAddr);
 				MoveVariableToX86reg(PAddr + m_RDRAM,VarName,Reg); 
 				break; 
 			}
-			switch (PAddr) {
+			switch (PAddr)
+			{
 			case 0x04040010: MoveVariableToX86reg(&g_Reg->SP_STATUS_REG,"SP_STATUS_REG",Reg); break;
 			case 0x04040014: MoveVariableToX86reg(&g_Reg->SP_DMA_FULL_REG,"SP_DMA_FULL_REG",Reg); break;
 			case 0x04040018: MoveVariableToX86reg(&g_Reg->SP_DMA_BUSY_REG,"SP_DMA_BUSY_REG",Reg); break;
@@ -620,7 +763,10 @@ void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
 			case 0x04080000: MoveVariableToX86reg(&g_Reg->SP_PC_REG,"SP_PC_REG",Reg); break;
 			default:
 				MoveConstToX86reg(0,Reg);
-				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(__FUNCTIONW__ L"\nFailed to translate address: %X",VAddr); }
+				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X",VAddr).ToUTF16().c_str());
+				}
 			}
 			break;
 		case 0x04100000:
@@ -636,18 +782,20 @@ void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
 			}
 			break;
 		case 0x04300000:
-			switch (PAddr) {
+			switch (PAddr)
+			{
 			case 0x04300000: MoveVariableToX86reg(&g_Reg->MI_MODE_REG,"MI_MODE_REG",Reg); break;
 			case 0x04300004: MoveVariableToX86reg(&g_Reg->MI_VERSION_REG,"MI_VERSION_REG",Reg); break;
 			case 0x04300008: MoveVariableToX86reg(&g_Reg->MI_INTR_REG,"MI_INTR_REG",Reg); break;
 			case 0x0430000C: MoveVariableToX86reg(&g_Reg->MI_INTR_MASK_REG,"MI_INTR_MASK_REG",Reg); break;
 			default:
 				MoveConstToX86reg(0,Reg);
-				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(__FUNCTIONW__ L"\nFailed to translate address: %X",VAddr); }
+				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X",VAddr).ToUTF16().c_str()); }
 			}
 			break;
 		case 0x04400000: 
-			switch (PAddr) {
+			switch (PAddr)
+			{
 			case 0x04400010:
 				m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
 				UpdateCounters(m_RegWorkingSet,false, true);
@@ -660,11 +808,15 @@ void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
 				break;
 			default:
 				MoveConstToX86reg(0,Reg);
-				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(__FUNCTIONW__ L"\nFailed to translate address: %X",VAddr); }
+				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X",VAddr).ToUTF16().c_str());
+				}
 			}
 			break;
 		case 0x04500000: /* AI registers */
-			switch (PAddr) {
+			switch (PAddr)
+			{
 			case 0x04500004: 
 				if (g_System->bFixedAudio())
 				{
@@ -677,14 +829,19 @@ void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
 					MoveX86regToVariable(x86_EAX,&m_TempValue,"m_TempValue"); 
 					AfterCallDirect(m_RegWorkingSet);
 					MoveVariableToX86reg(&m_TempValue,"m_TempValue",Reg);
-				} else {
-					if (g_Plugins->Audio()->AiReadLength != NULL) {
+				}
+				else
+				{
+					if (g_Plugins->Audio()->AiReadLength != NULL)
+					{
 						BeforeCallDirect(m_RegWorkingSet);
 						Call_Direct(g_Plugins->Audio()->AiReadLength, "AiReadLength");
 						MoveX86regToVariable(x86_EAX,&m_TempValue,"m_TempValue"); 
 						AfterCallDirect(m_RegWorkingSet);
 						MoveVariableToX86reg(&m_TempValue,"m_TempValue",Reg);
-					} else {
+					}
+					else
+					{
 						MoveConstToX86reg(0,Reg);
 					}						
 				}
@@ -698,17 +855,23 @@ void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
 					MoveX86regToVariable(x86_EAX,&m_TempValue,"m_TempValue"); 
 					AfterCallDirect(m_RegWorkingSet);
 					MoveVariableToX86reg(&m_TempValue,"m_TempValue",Reg);
-				} else {
+				}
+				else
+				{
 					MoveVariableToX86reg(&g_Reg->AI_STATUS_REG,"AI_STATUS_REG",Reg); 
 				}
 				break;
 			default:
 				MoveConstToX86reg(0,Reg);
-				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(__FUNCTIONW__ L"\nFailed to translate address: %X",VAddr); }
+				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X",VAddr).ToUTF16().c_str());
+				}
 			}
 			break;
 		case 0x04600000:
-			switch (PAddr) {
+			switch (PAddr)
+			{
 			case 0x04600010: MoveVariableToX86reg(&g_Reg->PI_STATUS_REG,"PI_STATUS_REG",Reg); break;
 			case 0x04600014: MoveVariableToX86reg(&g_Reg->PI_DOMAIN1_REG,"PI_DOMAIN1_REG",Reg); break;
 			case 0x04600018: MoveVariableToX86reg(&g_Reg->PI_BSD_DOM1_PWD_REG,"PI_BSD_DOM1_PWD_REG",Reg); break;
@@ -720,24 +883,35 @@ void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
 			case 0x04600030: MoveVariableToX86reg(&g_Reg->PI_BSD_DOM2_RLS_REG,"PI_BSD_DOM2_RLS_REG",Reg); break;
 			default:
 				MoveConstToX86reg(0,Reg);
-				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(__FUNCTIONW__ L"\nFailed to translate address: %X",VAddr); }
+				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X",VAddr).ToUTF16().c_str());
+				}
 			}
 			break;
 		case 0x04700000:
-			switch (PAddr) {
+			switch (PAddr)
+			{
 			case 0x0470000C: MoveVariableToX86reg(&g_Reg->RI_SELECT_REG,"RI_SELECT_REG",Reg); break;
 			case 0x04700010: MoveVariableToX86reg(&g_Reg->RI_REFRESH_REG,"RI_REFRESH_REG",Reg); break;
 			default:
 				MoveConstToX86reg(0,Reg);
-				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(__FUNCTIONW__ L"\nFailed to translate address: %X",VAddr); }
+				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X",VAddr).ToUTF16().c_str());
+				}
 			}
 			break;
 		case 0x04800000:
-			switch (PAddr) {
+			switch (PAddr)
+			{
 			case 0x04800018: MoveVariableToX86reg(&g_Reg->SI_STATUS_REG,"SI_STATUS_REG",Reg); break;
 			default:
 				MoveConstToX86reg(0,Reg);
-				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(__FUNCTIONW__ L"\nFailed to translate address: %X",VAddr); }
+				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X",VAddr).ToUTF16().c_str());
+				}
 			}
 			break;
 		case 0x1FC00000:
@@ -750,25 +924,29 @@ void  CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
 				// read from rom
 				sprintf(VarName,"m_RDRAM + %X",PAddr);
 				MoveVariableToX86reg(PAddr + m_RDRAM,VarName,Reg); 
-			} else {
+			}
+			else
+			{
 				MoveConstToX86reg(((PAddr & 0xFFFF) << 16) | (PAddr & 0xFFFF),Reg);
-				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { 
-					CPU_Message(__FUNCTION__ "\nFailed to translate address: %X",VAddr); 
-					g_Notify->DisplayError(__FUNCTIONW__ L"\nFailed to translate address: %X",VAddr); 
+				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+				{ 
+					CPU_Message(__FUNCTION__ "\nFailed to translate address: %08X",VAddr); 
+					g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X",VAddr).ToUTF16().c_str()); 
 				}
 			}
 		}
 	}
 }
 
-void  CMipsMemoryVM::Compile_SB_Const ( BYTE Value, DWORD VAddr ) {
+void  CMipsMemoryVM::Compile_SB_Const ( BYTE Value, DWORD VAddr )
+{
 	char VarName[100];
 	DWORD PAddr;
 
 	if (VAddr < 0x80000000 || VAddr >= 0xC0000000)
 	{
-		x86Reg TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
-		x86Reg TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TempReg1 = Map_TempReg(x86_Any, -1, false);
+		x86Reg TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr, TempReg1);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
@@ -778,13 +956,15 @@ void  CMipsMemoryVM::Compile_SB_Const ( BYTE Value, DWORD VAddr ) {
 		return;
 	}
 
-	if (!TranslateVaddr(VAddr, PAddr)) {
-		CPU_Message("Compile_SB\nFailed to translate address %X",VAddr);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SB\nFailed to translate address %X",VAddr); }
+	if (!TranslateVaddr(VAddr, PAddr))
+	{
+		CPU_Message("Compile_SB\nFailed to translate address: %08X",VAddr);
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X",VAddr).ToUTF16().c_str()); }
 		return;
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000: 
 	case 0x00100000: 
 	case 0x00200000: 
@@ -797,11 +977,15 @@ void  CMipsMemoryVM::Compile_SB_Const ( BYTE Value, DWORD VAddr ) {
 		MoveConstByteToVariable(Value,PAddr + m_RDRAM,VarName); 
 		break;
 	default:
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SB_Const\ntrying to store %X in %X?",Value,VAddr); }
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %02X in %08X?",Value,VAddr).ToUTF16().c_str());
+		}
 	}
 }
 
-void  CMipsMemoryVM::Compile_SB_Register ( x86Reg Reg, DWORD VAddr ) {
+void  CMipsMemoryVM::Compile_SB_Register ( x86Reg Reg, DWORD VAddr )
+{
 	char VarName[100];
 	DWORD PAddr;
 
@@ -809,8 +993,8 @@ void  CMipsMemoryVM::Compile_SB_Register ( x86Reg Reg, DWORD VAddr ) {
 	{
 		m_RegWorkingSet.SetX86Protected(Reg,true);
 
-		x86Reg TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
-		x86Reg TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TempReg1 = Map_TempReg(x86_Any, -1, false);
+		x86Reg TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr, TempReg1);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
@@ -820,13 +1004,18 @@ void  CMipsMemoryVM::Compile_SB_Register ( x86Reg Reg, DWORD VAddr ) {
 		return;
 	}
 
-	if (!TranslateVaddr(VAddr, PAddr)) {
-		CPU_Message("Compile_SB\nFailed to translate address %X",VAddr);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SB\nFailed to translate address %X",VAddr); }
+	if (!TranslateVaddr(VAddr, PAddr))
+	{
+		CPU_Message("Compile_SB\nFailed to translate address: %08X",VAddr);
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X", VAddr).ToUTF16().c_str());
+		}
 		return;
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000: 
 	case 0x00100000: 
 	case 0x00200000: 
@@ -839,18 +1028,22 @@ void  CMipsMemoryVM::Compile_SB_Register ( x86Reg Reg, DWORD VAddr ) {
 		MoveX86regByteToVariable(Reg,PAddr + m_RDRAM,VarName); 
 		break;
 	default:
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SB_Register\ntrying to store in %X?",VAddr); }
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+		}
 	}
 }
 
-void  CMipsMemoryVM::Compile_SH_Const ( WORD Value, DWORD VAddr ) {
+void  CMipsMemoryVM::Compile_SH_Const ( WORD Value, DWORD VAddr )
+{
 	char VarName[100];
 	DWORD PAddr;
 
 	if (VAddr < 0x80000000 || VAddr >= 0xC0000000)
 	{
-		x86Reg TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
-		x86Reg TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TempReg1 = Map_TempReg(x86_Any, -1, false);
+		x86Reg TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr, TempReg1);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
@@ -861,12 +1054,16 @@ void  CMipsMemoryVM::Compile_SH_Const ( WORD Value, DWORD VAddr ) {
 	}
 
 	if (!TranslateVaddr(VAddr, PAddr)) {
-		CPU_Message("Compile_SH\nFailed to translate address %X",VAddr);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SH\nFailed to translate address %X",VAddr); }
+		CPU_Message("Compile_SH\nFailed to translate address: %08X",VAddr);
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X", VAddr).ToUTF16().c_str());
+		}
 		return;
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000: 
 	case 0x00100000: 
 	case 0x00200000: 
@@ -879,11 +1076,15 @@ void  CMipsMemoryVM::Compile_SH_Const ( WORD Value, DWORD VAddr ) {
 		MoveConstHalfToVariable(Value,PAddr + m_RDRAM,VarName); 
 		break;
 	default:
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(__FUNCTIONW__ L"\ntrying to store %X in %X?",Value,VAddr); }
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %04X in %08X?",Value,VAddr).ToUTF16().c_str());
+		}
 	}
 }
 
-void CMipsMemoryVM::Compile_SH_Register ( x86Reg Reg, DWORD VAddr ) {
+void CMipsMemoryVM::Compile_SH_Register ( x86Reg Reg, DWORD VAddr )
+{
 	char VarName[100];
 	DWORD PAddr;
 
@@ -891,8 +1092,8 @@ void CMipsMemoryVM::Compile_SH_Register ( x86Reg Reg, DWORD VAddr ) {
 	{
 		m_RegWorkingSet.SetX86Protected(Reg,true);
 
-		x86Reg TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
-		x86Reg TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TempReg1 = Map_TempReg(x86_Any, -1, false);
+		x86Reg TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr, TempReg1);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
@@ -903,12 +1104,16 @@ void CMipsMemoryVM::Compile_SH_Register ( x86Reg Reg, DWORD VAddr ) {
 	}
 
 	if (!TranslateVaddr(VAddr, PAddr)) {
-		CPU_Message("Compile_SH\nFailed to translate address %X",VAddr);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SH\nFailed to translate address %X",VAddr); }
+		CPU_Message("Compile_SH\nFailed to translate address: %08X",VAddr);
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X", VAddr).ToUTF16().c_str());
+		}
 		return;
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000: 
 	case 0x00100000: 
 	case 0x00200000: 
@@ -921,19 +1126,23 @@ void CMipsMemoryVM::Compile_SH_Register ( x86Reg Reg, DWORD VAddr ) {
 		MoveX86regHalfToVariable(Reg,PAddr + m_RDRAM,VarName); 
 		break;
 	default:
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(__FUNCTIONW__ L"\ntrying to store in %X?",PAddr); }
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", PAddr).ToUTF16().c_str());
+		}
 	}
 }
 
-void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
+void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr )
+{
 	char VarName[100];
 	BYTE * Jump;
 	DWORD PAddr;
 
 	if (VAddr < 0x80000000 || VAddr >= 0xC0000000)
 	{
-		x86Reg TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
-		x86Reg TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TempReg1 = Map_TempReg(x86_Any, -1, false);
+		x86Reg TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr, TempReg1);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
@@ -943,13 +1152,18 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 		return;
 	}
 
-	if (!TranslateVaddr(VAddr, PAddr)) {
-		CPU_Message("Compile_SW\nFailed to translate address %X",VAddr);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW\nFailed to translate address %X",VAddr); }
+	if (!TranslateVaddr(VAddr, PAddr))
+	{
+		CPU_Message("Compile_SW\nFailed to translate address: %08X",VAddr);
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X", VAddr).ToUTF16().c_str());
+		}
 		return;
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000: 
 	case 0x00100000: 
 	case 0x00200000: 
@@ -962,7 +1176,8 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 		MoveConstToVariable(Value,PAddr + m_RDRAM,VarName); 
 		break;
 	case 0x03F00000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x03F00000: MoveConstToVariable(Value,&g_Reg->RDRAM_CONFIG_REG,"RDRAM_CONFIG_REG"); break;
 		case 0x03F00004: MoveConstToVariable(Value,&g_Reg->RDRAM_DEVICE_ID_REG,"RDRAM_DEVICE_ID_REG"); break;
 		case 0x03F00008: MoveConstToVariable(Value,&g_Reg->RDRAM_DELAY_REG,"RDRAM_DELAY_REG"); break;
@@ -980,16 +1195,21 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 		case 0x03F8000C: break;
 		case 0x03F80014: break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04000000:
-		if (PAddr < 0x04002000) { 
+		if (PAddr < 0x04002000)
+		{ 
 			sprintf(VarName,"m_RDRAM + %X",PAddr);
 			MoveConstToVariable(Value,PAddr + m_RDRAM,VarName); 
 			break;
 		}
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04040000: MoveConstToVariable(Value,&g_Reg->SP_MEM_ADDR_REG,"SP_MEM_ADDR_REG"); break;
 		case 0x04040004: MoveConstToVariable(Value,&g_Reg->SP_DRAM_ADDR_REG,"SP_DRAM_ADDR_REG"); break;
 		case 0x04040008:
@@ -1016,7 +1236,10 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 		case 0x0404001C: MoveConstToVariable(0,&g_Reg->SP_SEMAPHORE_REG,"SP_SEMAPHORE_REG"); break;
 		case 0x04080000: MoveConstToVariable(Value & 0xFFC,&g_Reg->SP_PC_REG,"SP_PC_REG"); break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04100000:
@@ -1031,30 +1254,54 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 			AfterCallDirect(m_RegWorkingSet);
 			break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04300000: 
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04300000: 
 			{
 				DWORD ModValue;
 				ModValue = 0x7F;
-				if ( ( Value & MI_CLR_INIT ) != 0 ) { ModValue |= MI_MODE_INIT; }
-				if ( ( Value & MI_CLR_EBUS ) != 0 ) { ModValue |= MI_MODE_EBUS; }
-				if ( ( Value & MI_CLR_RDRAM ) != 0 ) { ModValue |= MI_MODE_RDRAM; }
-				if (ModValue != 0) {
+				if ( ( Value & MI_CLR_INIT ) != 0 )
+				{
+					ModValue |= MI_MODE_INIT;
+				}
+				if ( ( Value & MI_CLR_EBUS ) != 0 )
+				{
+					ModValue |= MI_MODE_EBUS;
+				}
+				if ( ( Value & MI_CLR_RDRAM ) != 0 )
+				{
+					ModValue |= MI_MODE_RDRAM;
+				}
+				if (ModValue != 0)
+				{
 					AndConstToVariable(~ModValue,&g_Reg->MI_MODE_REG,"MI_MODE_REG");
 				}
 
 				ModValue = (Value & 0x7F);
-				if ( ( Value & MI_SET_INIT ) != 0 ) { ModValue |= MI_MODE_INIT; }
-				if ( ( Value & MI_SET_EBUS ) != 0 ) { ModValue |= MI_MODE_EBUS; }
-				if ( ( Value & MI_SET_RDRAM ) != 0 ) { ModValue |= MI_MODE_RDRAM; }
+				if ( ( Value & MI_SET_INIT ) != 0 )
+				{
+					ModValue |= MI_MODE_INIT;
+				}
+				if ( ( Value & MI_SET_EBUS ) != 0 )
+				{
+					ModValue |= MI_MODE_EBUS;
+				}
+				if ( ( Value & MI_SET_RDRAM ) != 0 )
+				{
+					ModValue |= MI_MODE_RDRAM;
+				}
 				if (ModValue != 0) {
 					OrConstToVariable(ModValue,&g_Reg->MI_MODE_REG,"MI_MODE_REG");
 				}
-				if ( ( Value & MI_CLR_DP_INTR ) != 0 ) { 
+				if ( ( Value & MI_CLR_DP_INTR ) != 0 )
+				{ 
 					AndConstToVariable((DWORD)~MI_INTR_DP,&g_Reg->MI_INTR_REG,"MI_INTR_REG");
 					AndConstToVariable((DWORD)~MI_INTR_DP,&g_Reg->m_GfxIntrReg,"m_GfxIntrReg");
 				}
@@ -1064,36 +1311,79 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 			{
 				DWORD ModValue;
 				ModValue = 0;
-				if ( ( Value & MI_INTR_MASK_CLR_SP ) != 0 ) { ModValue |= MI_INTR_MASK_SP; }
-				if ( ( Value & MI_INTR_MASK_CLR_SI ) != 0 ) { ModValue |= MI_INTR_MASK_SI; }
-				if ( ( Value & MI_INTR_MASK_CLR_AI ) != 0 ) { ModValue |= MI_INTR_MASK_AI; }
-				if ( ( Value & MI_INTR_MASK_CLR_VI ) != 0 ) { ModValue |= MI_INTR_MASK_VI; }
-				if ( ( Value & MI_INTR_MASK_CLR_PI ) != 0 ) { ModValue |= MI_INTR_MASK_PI; }
-				if ( ( Value & MI_INTR_MASK_CLR_DP ) != 0 ) { ModValue |= MI_INTR_MASK_DP; }
-				if (ModValue != 0) {
+				if ( ( Value & MI_INTR_MASK_CLR_SP ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_SP;
+				}
+				if ( ( Value & MI_INTR_MASK_CLR_SI ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_SI;
+				}
+				if ( ( Value & MI_INTR_MASK_CLR_AI ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_AI;
+				}
+				if ( ( Value & MI_INTR_MASK_CLR_VI ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_VI;
+				}
+				if ( ( Value & MI_INTR_MASK_CLR_PI ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_PI;
+				}
+				if ( ( Value & MI_INTR_MASK_CLR_DP ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_DP;
+				}
+				if (ModValue != 0)
+				{
 					AndConstToVariable(~ModValue,&g_Reg->MI_INTR_MASK_REG,"MI_INTR_MASK_REG");
 				}
 
 				ModValue = 0;
-				if ( ( Value & MI_INTR_MASK_SET_SP ) != 0 ) { ModValue |= MI_INTR_MASK_SP; }
-				if ( ( Value & MI_INTR_MASK_SET_SI ) != 0 ) { ModValue |= MI_INTR_MASK_SI; }
-				if ( ( Value & MI_INTR_MASK_SET_AI ) != 0 ) { ModValue |= MI_INTR_MASK_AI; }
-				if ( ( Value & MI_INTR_MASK_SET_VI ) != 0 ) { ModValue |= MI_INTR_MASK_VI; }
-				if ( ( Value & MI_INTR_MASK_SET_PI ) != 0 ) { ModValue |= MI_INTR_MASK_PI; }
-				if ( ( Value & MI_INTR_MASK_SET_DP ) != 0 ) { ModValue |= MI_INTR_MASK_DP; }
-				if (ModValue != 0) {
+				if ( ( Value & MI_INTR_MASK_SET_SP ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_SP;
+				}
+				if ( ( Value & MI_INTR_MASK_SET_SI ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_SI;
+				}
+				if ( ( Value & MI_INTR_MASK_SET_AI ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_AI;
+				}
+				if ( ( Value & MI_INTR_MASK_SET_VI ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_VI;
+				}
+				if ( ( Value & MI_INTR_MASK_SET_PI ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_PI;
+				}
+				if ( ( Value & MI_INTR_MASK_SET_DP ) != 0 )
+				{
+					ModValue |= MI_INTR_MASK_DP;
+				}
+				if (ModValue != 0)
+				{
 					OrConstToVariable(ModValue,&g_Reg->MI_INTR_MASK_REG,"MI_INTR_MASK_REG");
 				}
 			}
 			break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04400000: 
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04400000: 
-			if (g_Plugins->Gfx()->ViStatusChanged != NULL) {
+			if (g_Plugins->Gfx()->ViStatusChanged != NULL)
+			{
 				CompConstToVariable(Value,&g_Reg->VI_STATUS_REG,"VI_STATUS_REG");
 				JeLabel8("Continue",0);
 				Jump = m_RecompPos - 1;
@@ -1108,7 +1398,8 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 			break;
 		case 0x04400004: MoveConstToVariable((Value & 0xFFFFFF),&g_Reg->VI_ORIGIN_REG,"VI_ORIGIN_REG"); break;
 		case 0x04400008: 
-			if (g_Plugins->Gfx()->ViWidthChanged != NULL) {
+			if (g_Plugins->Gfx()->ViWidthChanged != NULL)
+			{
 				CompConstToVariable(Value,&g_Reg->VI_WIDTH_REG,"VI_WIDTH_REG");
 				JeLabel8("Continue",0);
 				Jump = m_RecompPos - 1;
@@ -1139,11 +1430,15 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 		case 0x04400030: MoveConstToVariable(Value,&g_Reg->VI_X_SCALE_REG,"VI_X_SCALE_REG"); break;
 		case 0x04400034: MoveConstToVariable(Value,&g_Reg->VI_Y_SCALE_REG,"VI_Y_SCALE_REG"); break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04500000: /* AI registers */
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04500000: MoveConstToVariable(Value,&g_Reg->AI_DRAM_ADDR_REG,"AI_DRAM_ADDR_REG"); break;
 		case 0x04500004: 
 			MoveConstToVariable(Value,&g_Reg->AI_LEN_REG,"AI_LEN_REG");
@@ -1153,7 +1448,9 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 				X86BreakPoint(__FILEW__,__LINE__);
 				MoveConstToX86reg((DWORD)g_Audio,x86_ECX);				
 				Call_Direct(AddressOf(&CAudio::LenChanged),"LenChanged");
-			} else {
+			}
+			else
+			{
 				Call_Direct(g_Plugins->Audio()->AiLenChanged,"AiLenChanged");
 			}
 			AfterCallDirect(m_RegWorkingSet);
@@ -1176,11 +1473,15 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 		default:
 			sprintf(VarName,"m_RDRAM + %X",PAddr);
 			MoveConstToVariable(Value,PAddr + m_RDRAM,VarName); 
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04600000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04600000: MoveConstToVariable(Value,&g_Reg->PI_DRAM_ADDR_REG,"PI_DRAM_ADDR_REG"); break;
 		case 0x04600004: MoveConstToVariable(Value,&g_Reg->PI_CART_ADDR_REG,"PI_CART_ADDR_REG"); break;
 		case 0x04600008: 
@@ -1198,7 +1499,8 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 			AfterCallDirect(m_RegWorkingSet);
 			break;
 		case 0x04600010: 
-			if ((Value & PI_CLR_INTR) != 0 ) {
+			if ((Value & PI_CLR_INTR) != 0 )
+			{
 				AndConstToVariable((DWORD)~MI_INTR_PI,&g_Reg->MI_INTR_REG,"MI_INTR_REG");
 				BeforeCallDirect(m_RegWorkingSet);
 				MoveConstToX86reg((DWORD)g_Reg,x86_ECX);
@@ -1211,21 +1513,29 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 		case 0x0460001C: MoveConstToVariable((Value & 0xFF),&g_Reg->PI_BSD_DOM1_PGS_REG,"PI_BSD_DOM1_PGS_REG"); break;
 		case 0x04600020: MoveConstToVariable((Value & 0xFF),&g_Reg->PI_BSD_DOM1_RLS_REG,"PI_BSD_DOM1_RLS_REG"); break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04700000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04700000: MoveConstToVariable(Value,&g_Reg->RI_MODE_REG,"RI_MODE_REG"); break;
 		case 0x04700004: MoveConstToVariable(Value,&g_Reg->RI_CONFIG_REG,"RI_CONFIG_REG"); break;
 		case 0x04700008: MoveConstToVariable(Value,&g_Reg->RI_CURRENT_LOAD_REG,"RI_CURRENT_LOAD_REG"); break;
 		case 0x0470000C: MoveConstToVariable(Value,&g_Reg->RI_SELECT_REG,"RI_SELECT_REG"); break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04800000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04800000: MoveConstToVariable(Value,&g_Reg->SI_DRAM_ADDR_REG,"SI_DRAM_ADDR_REG"); break;
 		case 0x04800004: 			
 			m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
@@ -1256,11 +1566,41 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
 			AfterCallDirect(m_RegWorkingSet);
 			break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+			}
+		}
+		break;
+	case 0x1fc00000:
+		{
+			m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount()-g_System->CountPerOp());
+			UpdateCounters(m_RegWorkingSet,false,true);
+			m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount()+g_System->CountPerOp());
+
+			BeforeCallDirect(m_RegWorkingSet);
+			PushImm32(Value);
+			PushImm32(PAddr);
+			MoveConstToX86reg((ULONG)((CMipsMemoryVM *)this),x86_ECX);
+			Call_Direct(AddressOf(&CMipsMemoryVM::SW_NonMemory),"CMipsMemoryVM::SW_NonMemory");
+			AfterCallDirect(m_RegWorkingSet);
 		}
 		break;
 	default:
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Const\ntrying to store %X in %X?",Value,VAddr); }
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store %08X in %08X?", Value, VAddr).ToUTF16().c_str());
+		}
+		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount()-g_System->CountPerOp());
+		UpdateCounters(m_RegWorkingSet,false,true);
+		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount()+g_System->CountPerOp());
+
+		BeforeCallDirect(m_RegWorkingSet);
+		PushImm32(Value);
+		PushImm32(PAddr);
+		MoveConstToX86reg((ULONG)((CMipsMemoryVM *)this),x86_ECX);
+		Call_Direct(AddressOf(&CMipsMemoryVM::SW_NonMemory),"CMipsMemoryVM::SW_NonMemory");
+		AfterCallDirect(m_RegWorkingSet);
 	}
 }
 
@@ -1270,8 +1610,8 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 	{
 		m_RegWorkingSet.SetX86Protected(Reg,true);
 
-		x86Reg TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
-		x86Reg TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TempReg1 = Map_TempReg(x86_Any, -1, false);
+		x86Reg TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveConstToX86reg(VAddr, TempReg1);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
@@ -1285,13 +1625,18 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 	BYTE * Jump;
 	DWORD PAddr;
 
-	if (!TranslateVaddr(VAddr, PAddr)) {
-		CPU_Message("Compile_SW_Register\nFailed to translate address %X",VAddr);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\nFailed to translate address %X",VAddr); }
+	if (!TranslateVaddr(VAddr, PAddr))
+	{
+		CPU_Message("Compile_SW_Register\nFailed to translate address: %08X",VAddr);
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nFailed to translate address: %08X", VAddr).ToUTF16().c_str());
+		}
 		return;
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000: 
 	case 0x00100000: 
 	case 0x00200000: 
@@ -1304,7 +1649,8 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 		MoveX86regToVariable(Reg,PAddr + m_RDRAM,VarName); 
 		break;
 	case 0x04000000: 
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04040000: MoveX86regToVariable(Reg,&g_Reg->SP_MEM_ADDR_REG,"SP_MEM_ADDR_REG"); break;
 		case 0x04040004: MoveX86regToVariable(Reg,&g_Reg->SP_DRAM_ADDR_REG,"SP_DRAM_ADDR_REG"); break;
 		case 0x04040008: 
@@ -1336,12 +1682,18 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 			AndConstToVariable(0xFFC,&g_Reg->SP_PC_REG,"SP_PC_REG");
 			break;
 		default:
-			if (PAddr < 0x04002000) {
+			if (PAddr < 0x04002000)
+			{
 				sprintf(VarName,"m_RDRAM + %X",PAddr);
 				MoveX86regToVariable(Reg,PAddr + m_RDRAM,VarName); 
-			} else {
-				CPU_Message("    Should be moving %s in to %X ?!?",x86_Name(Reg),VAddr);
-				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\ntrying to store at %X?",VAddr); }
+			}
+			else
+			{
+				CPU_Message("    Should be moving %s in to %08X ?!?",x86_Name(Reg),VAddr);
+				if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+				}
 			}
 		}
 		break;
@@ -1360,7 +1712,8 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 		AfterCallDirect(m_RegWorkingSet);
 		break;
 	case 0x04300000: 
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04300000: 
 			MoveX86regToVariable(Reg,&RegModValue,"RegModValue");
 			BeforeCallDirect(m_RegWorkingSet);
@@ -1374,14 +1727,18 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 			AfterCallDirect(m_RegWorkingSet);
 			break;
 		default:
-			CPU_Message("    Should be moving %s in to %X ?!?",x86_Name(Reg),VAddr);
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\ntrying to store at %X?",VAddr); }
+			CPU_Message("    Should be moving %s in to %08X ?!?",x86_Name(Reg),VAddr);
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04400000: 
 		switch (PAddr) {
 		case 0x04400000: 
-			if (g_Plugins->Gfx()->ViStatusChanged != NULL) {
+			if (g_Plugins->Gfx()->ViStatusChanged != NULL)
+			{
 				CompX86regToVariable(Reg,&g_Reg->VI_STATUS_REG,"VI_STATUS_REG");
 				JeLabel8("Continue",0);
 				Jump = m_RecompPos - 1;
@@ -1399,7 +1756,8 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 			AndConstToVariable(0xFFFFFF,&g_Reg->VI_ORIGIN_REG,"VI_ORIGIN_REG"); 
 			break;
 		case 0x04400008: 
-			if (g_Plugins->Gfx()->ViWidthChanged != NULL) {
+			if (g_Plugins->Gfx()->ViWidthChanged != NULL)
+			{
 				CompX86regToVariable(Reg,&g_Reg->VI_WIDTH_REG,"VI_WIDTH_REG");
 				JeLabel8("Continue",0);
 				Jump = m_RecompPos - 1;
@@ -1430,8 +1788,11 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 		case 0x04400030: MoveX86regToVariable(Reg,&g_Reg->VI_X_SCALE_REG,"VI_X_SCALE_REG"); break;
 		case 0x04400034: MoveX86regToVariable(Reg,&g_Reg->VI_Y_SCALE_REG,"VI_Y_SCALE_REG"); break;
 		default:
-			CPU_Message("    Should be moving %s in to %X ?!?",x86_Name(Reg),VAddr);
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\ntrying to store at %X?",VAddr); }
+			CPU_Message("    Should be moving %s in to %08X ?!?",x86_Name(Reg),VAddr);
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04500000: /* AI registers */
@@ -1447,7 +1808,9 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 			{
 				MoveConstToX86reg((DWORD)g_Audio,x86_ECX);				
 				Call_Direct(AddressOf(&CAudio::LenChanged),"LenChanged");
-			} else {
+			}
+			else
+			{
 				Call_Direct(g_Plugins->Audio()->AiLenChanged, "g_Plugins->Audio()->LenChanged");
 			}
 			AfterCallDirect(m_RegWorkingSet);
@@ -1472,10 +1835,15 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 		default:
 			sprintf(VarName,"m_RDRAM + %X",PAddr);
 			MoveX86regToVariable(Reg,PAddr + m_RDRAM,VarName); 
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\ntrying to store at %X?",VAddr); }		}
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) 
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+			}
+		}
 		break;
 	case 0x04600000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04600000: MoveX86regToVariable(Reg,&g_Reg->PI_DRAM_ADDR_REG,"PI_DRAM_ADDR_REG"); break;
 		case 0x04600004: MoveX86regToVariable(Reg,&g_Reg->PI_CART_ADDR_REG,"PI_CART_ADDR_REG"); break;
 		case 0x04600008:
@@ -1493,7 +1861,10 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 			AfterCallDirect(m_RegWorkingSet);
 			break;
 		case 0x04600010: 
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\ntrying to store at %X?",VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) 
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+			}
 			AndConstToVariable((DWORD)~MI_INTR_PI,&g_Reg->MI_INTR_REG,"MI_INTR_REG");
 			BeforeCallDirect(m_RegWorkingSet);
 			MoveConstToX86reg((DWORD)g_Reg,x86_ECX);
@@ -1517,19 +1888,27 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 			AndConstToVariable(0xFF,&g_Reg->PI_BSD_DOM1_RLS_REG,"PI_BSD_DOM1_RLS_REG"); 
 			break;
 		default:
-			CPU_Message("    Should be moving %s in to %X ?!?",x86_Name(Reg),VAddr);
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\ntrying to store at %X?",VAddr); }
+			CPU_Message("    Should be moving %s in to %08X ?!?",x86_Name(Reg),VAddr);
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04700000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04700010: MoveX86regToVariable(Reg,&g_Reg->RI_REFRESH_REG,"RI_REFRESH_REG"); break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\ntrying to store at %X?",VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x04800000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04800000: MoveX86regToVariable(Reg,&g_Reg->SI_DRAM_ADDR_REG,"SI_DRAM_ADDR_REG"); break;
 		case 0x04800004: 
 			MoveX86regToVariable(Reg,&g_Reg->SI_PIF_ADDR_RD64B_REG,"SI_PIF_ADDR_RD64B_REG"); 
@@ -1554,7 +1933,10 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 			AfterCallDirect(m_RegWorkingSet);
 			break;
 		default:
-			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\ntrying to store at %X?",VAddr); }
+			if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) 
+			{
+				g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+			}
 		}
 		break;
 	case 0x1FC00000:
@@ -1562,12 +1944,15 @@ void CMipsMemoryVM::Compile_SW_Register (x86Reg Reg, DWORD VAddr )
 		MoveX86regToVariable(Reg,PAddr + m_RDRAM,VarName); 
 		break;
 	default:
-		CPU_Message("    Should be moving %s in to %X ?!?",x86_Name(Reg),VAddr);
-		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory)) { g_Notify->DisplayError(L"Compile_SW_Register\ntrying to store in %X?",VAddr); }
+		CPU_Message("    Should be moving %s in to %08X ?!?",x86_Name(Reg),VAddr);
+		if (g_Settings->LoadBool(Debugger_ShowUnhandledMemory))
+		{
+			g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\ntrying to store in %08X?", VAddr).ToUTF16().c_str());
+		}
 	}
 }
 
-void CMipsMemoryVM::ResetMemoryStack ( void) 
+void CMipsMemoryVM::ResetMemoryStack()
 {
 	x86Reg Reg, TempReg;
 
@@ -1576,25 +1961,34 @@ void CMipsMemoryVM::ResetMemoryStack ( void)
 	Reg = Get_MemoryStack();
 	if (Reg == x86_Unknown) 
 	{
-		Reg = Map_TempReg(x86_Any, MipsReg, FALSE);
-	} else {
-		if (IsUnknown(MipsReg)) {
+		Reg = Map_TempReg(x86_Any, MipsReg, false);
+	}
+	else
+	{
+		if (IsUnknown(MipsReg))
+		{
 			MoveVariableToX86reg(&_GPR[MipsReg].UW[0],CRegName::GPR_Lo[MipsReg],Reg);
-		} else if (IsMapped(MipsReg)) {
+		}
+		else if (IsMapped(MipsReg))
+		{
 			MoveX86RegToX86Reg(GetMipsRegMapLo(MipsReg),Reg);
-		} else {
+		}
+		else
+		{
 			MoveConstToX86reg(GetMipsRegLo(MipsReg),Reg);
 		}
 	}
 
 	if (g_System->bUseTlb()) 
 	{	
-	    TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(Reg,TempReg);
 		ShiftRightUnsignImmed(TempReg,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg,TempReg,4);
 		AddX86RegToX86Reg(Reg,TempReg);
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(Reg,0x1FFFFFFF);
 		AddConstToX86Reg(Reg,(DWORD)m_RDRAM);
 	}
@@ -1603,44 +1997,65 @@ void CMipsMemoryVM::ResetMemoryStack ( void)
 
 int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer ) 
 {
+#if defined(_M_IX86) && defined(_WIN32)
+// to do:  Remove the _M_IX86 criteria.  This can compile on 64-bit Windows.
+#ifndef _WIN64
+	DWORD * Reg;
+// We need this to fix 32-bit Windows builds,
+// because Project64 currently uses DWORD all the time instead of int32_t.
+#else
+	size_t * Reg;
+#endif
+
 	if (dwExptCode != EXCEPTION_ACCESS_VIOLATION) 
 	{
-		if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+		if (bHaveDebugger())
+		{
+			g_Notify->BreakPoint(__FILEW__,__LINE__);
+		}
 		return EXCEPTION_EXECUTE_HANDLER;
 	}
 
-	//convert the pointer since we are not having win32 stuctures in headers
+	//convert the pointer since we are not having win32 structures in headers
 	LPEXCEPTION_POINTERS lpEP = (LPEXCEPTION_POINTERS)lpExceptionPointer;
 
 	DWORD MemAddress = (char *)lpEP->ExceptionRecord->ExceptionInformation[1] - (char *)g_MMU->Rdram();
     if ((int)(MemAddress) < 0 || MemAddress > 0x1FFFFFFF) 
 	{ 
-//		if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+//		if (bHaveDebugger())
+//		{
+//			g_Notify->BreakPoint(__FILEW__,__LINE__);
+//		}
 		return EXCEPTION_EXECUTE_HANDLER; 
 	}
-
-	DWORD * Reg = NULL;
 	
 	BYTE * TypePos = (unsigned char *)lpEP->ContextRecord->Eip;
 	EXCEPTION_RECORD exRec = *lpEP->ExceptionRecord;
-	
-	if (*TypePos == 0xF3 && *(TypePos + 1) == 0xA5) {
-		DWORD Start, End;
-		Start = (lpEP->ContextRecord->Edi - (DWORD)m_RDRAM);
-		End = (Start + (lpEP->ContextRecord->Ecx << 2) - 1);
+
+	Reg = NULL;
+	if (*TypePos == 0xF3 && (*(TypePos + 1) == 0xA4 || *(TypePos + 1) == 0xA5))
+	{
+		DWORD Start = (lpEP->ContextRecord->Edi - (DWORD)m_RDRAM);
+		DWORD End = Start + lpEP->ContextRecord->Ecx;
 		if ((int)Start < 0) 
 		{ 
-			if (bHaveDebugger()) {
+			if (bHaveDebugger())
+			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__); 
 			}
 			return EXCEPTION_EXECUTE_HANDLER;
 		}
 #ifdef CFB_READ
 		DWORD count, OldProtect;
-		if (Start >= CFBStart && End < CFBEnd) {
-			for ( count = Start; count < End; count += 0x1000 ) {
+		if (Start >= CFBStart && End < CFBEnd)
+		{
+			for ( count = Start; count < End; count += 0x1000 )
+			{
 				VirtualProtect(m_RDRAM+count,4,PAGE_READONLY, &OldProtect);
-				if (FrameBufferRead) { FrameBufferRead(count & ~0xFFF); }
+				if (FrameBufferRead)
+				{
+					FrameBufferRead(count & ~0xFFF);
+				}
 			}
 			return EXCEPTION_CONTINUE_EXECUTION;
 		}	
@@ -1653,48 +2068,66 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
 			}			
 			return EXCEPTION_CONTINUE_EXECUTION;
 		}
-		if (Start >= 0x04000000 && End < 0x04002000) {
+		if (Start >= 0x04000000 && End < 0x04002000)
+		{
 			g_Recompiler->ClearRecompCode_Phys(Start & ~0xFFF,0x1000,CRecompiler::Remove_ProtectedMem);
 			return EXCEPTION_CONTINUE_EXECUTION;
 		}
-		if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+		if (bHaveDebugger())
+		{
+			g_Notify->BreakPoint(__FILEW__,__LINE__);
+		}
 		return EXCEPTION_EXECUTE_HANDLER;
 	}
 
 	BYTE * ReadPos;
-	if (*TypePos == 0x0F && *(TypePos + 1) == 0xB6) {
+	if (*TypePos == 0x0F && *(TypePos + 1) == 0xB6)
+	{
 		ReadPos = TypePos + 2;
-	} else if (*TypePos == 0x0F && *(TypePos + 1) == 0xB7) {
+	}
+	else if (*TypePos == 0x0F && *(TypePos + 1) == 0xB7)
+	{
 		ReadPos = TypePos + 2;
-	} else if (*TypePos == 0x0F && *(TypePos + 1) == 0xBE) {
+	}
+	else if (*TypePos == 0x0F && *(TypePos + 1) == 0xBE)
+	{
 		ReadPos = TypePos + 2;
-	} else if (*TypePos == 0x0F && *(TypePos + 1) == 0xBF) {
+	}
+	else if (*TypePos == 0x0F && *(TypePos + 1) == 0xBF)
+	{
 		ReadPos = TypePos + 2;
-	} else if (*TypePos == 0x66) {
+	}
+	else if (*TypePos == 0x66)
+	{
 		ReadPos = TypePos + 2;
-	} else {
+	}
+	else
+	{
 		ReadPos = TypePos + 1;
 	}
 
-	switch ((*ReadPos & 0x38)) {
-	case 0x00: Reg = &lpEP->ContextRecord->Eax; break;
-	case 0x08: Reg = &lpEP->ContextRecord->Ecx; break; 
-	case 0x10: Reg = &lpEP->ContextRecord->Edx; break; 
-	case 0x18: Reg = &lpEP->ContextRecord->Ebx; break; 
-	case 0x20: Reg = &lpEP->ContextRecord->Esp; break;
-	case 0x28: Reg = &lpEP->ContextRecord->Ebp; break;
-	case 0x30: Reg = &lpEP->ContextRecord->Esi; break;
-	case 0x38: Reg = &lpEP->ContextRecord->Edi; break;
+	switch (*ReadPos & 0x38)
+	{
+	case 0x00: Reg = &(lpEP->ContextRecord->Eax); break;
+	case 0x08: Reg = &(lpEP->ContextRecord->Ecx); break;
+	case 0x10: Reg = &(lpEP->ContextRecord->Edx); break;
+	case 0x18: Reg = &(lpEP->ContextRecord->Ebx); break;
+	case 0x20: Reg = &(lpEP->ContextRecord->Esp); break;
+	case 0x28: Reg = &(lpEP->ContextRecord->Ebp); break;
+	case 0x30: Reg = &(lpEP->ContextRecord->Esi); break;
+	case 0x38: Reg = &(lpEP->ContextRecord->Edi); break;
 	}
 
-	switch ((*ReadPos & 0xC7)) {
+	switch ((*ReadPos & 0xC7))
+	{
 	case 0: ReadPos += 1; break;
 	case 1: ReadPos += 1; break;
 	case 2: ReadPos += 1; break;
 	case 3: ReadPos += 1; break;
 	case 4: 
 		ReadPos += 1; 
-		switch ((*ReadPos & 0xC7)) {
+		switch ((*ReadPos & 0xC7))
+		{
 		case 0: ReadPos += 1; break;
 		case 1: ReadPos += 1; break;
 		case 2: ReadPos += 1; break;
@@ -1723,216 +2156,288 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
 	case 0x86: ReadPos += 5; break;
 	case 0x87: ReadPos += 5; break;
 	default:
-		if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+		if (bHaveDebugger())
+		{
+			g_Notify->BreakPoint(__FILEW__,__LINE__);
+		}
 		return EXCEPTION_EXECUTE_HANDLER;
 	}
 
 	if (Reg == NULL)
 	{
-		if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+		if (bHaveDebugger())
+		{
+			g_Notify->BreakPoint(__FILEW__,__LINE__);
+		}
 		return EXCEPTION_EXECUTE_HANDLER;
 	}
 
-	switch(*TypePos) {
+	switch (*TypePos)
+	{
 	case 0x0F:
-		switch(*(TypePos + 1)) {
+		switch (*(TypePos + 1))
+		{
 		case 0xB6:
-			if (!LB_NonMemory(MemAddress,(DWORD *)Reg,FALSE)) {
-				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-					g_Notify->DisplayError(L"Failed to load byte\n\nMIPS Address: %X\nX86 Address",
+			if (!LB_NonMemory(MemAddress, (DWORD *)Reg, false))
+			{
+				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f("Failed to load byte\n\nMIPS Address: %08X\nX86 Address: %08X",
 						(char *)exRec.ExceptionInformation[1] - (char *)m_RDRAM,
-						*(unsigned char *)lpEP->ContextRecord->Eip);
+						(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 				}
 			}
 			lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-			return EXCEPTION_CONTINUE_EXECUTION;		
+			return EXCEPTION_CONTINUE_EXECUTION;
 		case 0xB7:
-			if (!LH_NonMemory(MemAddress,(DWORD *)Reg,FALSE)) {
-				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-					g_Notify->DisplayError(L"Failed to load half word\n\nMIPS Address: %X\nX86 Address",
+			if (!LH_NonMemory(MemAddress, (DWORD *)Reg, false))
+			{
+				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f("Failed to load half word\n\nMIPS Address: %08X\nX86 Address: %08X",
 						(char *)exRec.ExceptionInformation[1] - (char *)m_RDRAM,
-						*(unsigned char *)lpEP->ContextRecord->Eip);
+						(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 				}
 			}
 			lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-			return EXCEPTION_CONTINUE_EXECUTION;		
+			return EXCEPTION_CONTINUE_EXECUTION;
 		case 0xBE:
-			if (!LB_NonMemory(MemAddress,Reg,TRUE)) {
-				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-					g_Notify->DisplayError(L"Failed to load byte\n\nMIPS Address: %X\nX86 Address",
+			if (!LB_NonMemory(MemAddress, Reg, true))
+			{
+				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f("Failed to load byte\n\nMIPS Address: %08X\nX86 Address: %08X",
 						(char *)exRec.ExceptionInformation[1] - (char *)m_RDRAM,
-						*(unsigned char *)lpEP->ContextRecord->Eip);
+						(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 				}
 			}
 			lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-			return EXCEPTION_CONTINUE_EXECUTION;		
+			return EXCEPTION_CONTINUE_EXECUTION;
 		case 0xBF:
-			if (!LH_NonMemory(MemAddress,Reg,TRUE)) {
-				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-					g_Notify->DisplayError(L"Failed to load half word\n\nMIPS Address: %X\nX86 Address",
+			if (!LH_NonMemory(MemAddress, Reg, true))
+			{
+				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f("Failed to load half word\n\nMIPS Address: %08X\nX86 Address: %08X",
 						(char *)exRec.ExceptionInformation[1] - (char *)m_RDRAM,
-						*(unsigned char *)lpEP->ContextRecord->Eip);
+						(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 				}
 			}
 			lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-			return EXCEPTION_CONTINUE_EXECUTION;		
+			return EXCEPTION_CONTINUE_EXECUTION;
 		default:
-			if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+			if (bHaveDebugger())
+			{
+				g_Notify->BreakPoint(__FILEW__,__LINE__);
+			}
 			return EXCEPTION_EXECUTE_HANDLER;
 		}
 		break;
 	case 0x66:
-		switch(*(TypePos + 1)) {
+		switch (*(TypePos + 1))
+		{
 		case 0x8B:
-			if (!LH_NonMemory(MemAddress,Reg,FALSE)) {
-				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-					g_Notify->DisplayError(L"Failed to half word\n\nMIPS Address: %X\nX86 Address",
+			if (!LH_NonMemory(MemAddress, Reg, false))
+			{
+				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f("Failed to half word\n\nMIPS Address: %08X\nX86 Address: %08X",
 						(char *)exRec.ExceptionInformation[1] - (char *)m_RDRAM,
-						*(unsigned char *)lpEP->ContextRecord->Eip);
+						(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 				}
 			}
 			lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-			return EXCEPTION_CONTINUE_EXECUTION;		
+			return EXCEPTION_CONTINUE_EXECUTION;
 		case 0x89:
-			if (!SH_NonMemory(MemAddress,*(WORD *)Reg)) {
-				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-					g_Notify->DisplayError(L"Failed to store half word\n\nMIPS Address: %X\nX86 Address",MemAddress,
-						*(unsigned char *)lpEP->ContextRecord->Eip);
+			if (!SH_NonMemory(MemAddress,*(WORD *)Reg))
+			{
+				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f("Failed to store half word\n\nMIPS Address: %08X\nX86 Address: %08X", MemAddress,
+						(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 				}
 			}
 			lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-			return EXCEPTION_CONTINUE_EXECUTION;		
+			return EXCEPTION_CONTINUE_EXECUTION;
 		case 0xC7:
 			if (Reg != &lpEP->ContextRecord->Eax)
 			{
-				if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+				if (bHaveDebugger())
+				{
+					g_Notify->BreakPoint(__FILEW__,__LINE__);
+				}
 				return EXCEPTION_EXECUTE_HANDLER; 
 			}
 			if (!SH_NonMemory(MemAddress,*(WORD *)ReadPos)) {
-				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-					g_Notify->DisplayError(L"Failed to store half word\n\nMIPS Address: %X\nX86 Address",MemAddress,
-						*(unsigned char *)lpEP->ContextRecord->Eip);
+				if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+				{
+					g_Notify->DisplayError(stdstr_f("Failed to store half word\n\nMIPS Address: %08X\nX86 Address: %08X", MemAddress,
+						(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 				}
 			}
 			lpEP->ContextRecord->Eip = (DWORD)(ReadPos + 2);
-			return EXCEPTION_CONTINUE_EXECUTION;		
+			return EXCEPTION_CONTINUE_EXECUTION;
 		default:
-			if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+			if (bHaveDebugger())
+			{
+				g_Notify->BreakPoint(__FILEW__,__LINE__);
+			}
 			return EXCEPTION_EXECUTE_HANDLER;
 		}
 		break;
 	case 0x88: 
-		if (!SB_NonMemory(MemAddress,*(BYTE *)Reg)) {
-			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-				g_Notify->DisplayError(L"Failed to store byte\n\nMIPS Address: %X\nX86 Address",
+		if (!SB_NonMemory(MemAddress,*(BYTE *)Reg))
+		{
+			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f("Failed to store byte\n\nMIPS Address: %08X\nX86 Address: %08X",
 					(char *)exRec.ExceptionInformation[1] - (char *)m_RDRAM,
-					*(unsigned char *)lpEP->ContextRecord->Eip);
+					(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 			}
 		}
 		lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-		return EXCEPTION_CONTINUE_EXECUTION;		
+		return EXCEPTION_CONTINUE_EXECUTION;
 	case 0x8A: 
-		if (!LB_NonMemory(MemAddress,Reg,FALSE)) {
-			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-				g_Notify->DisplayError(L"Failed to load byte\n\nMIPS Address: %X\nX86 Address",
+		if (!LB_NonMemory(MemAddress, Reg, false))
+		{
+			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f("Failed to load byte\n\nMIPS Address: %08X\nX86 Address: %08X",
 					(char *)exRec.ExceptionInformation[1] - (char *)m_RDRAM,
-					*(unsigned char *)lpEP->ContextRecord->Eip);
+					(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 			}
 		}
 		lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-		return EXCEPTION_CONTINUE_EXECUTION;		
+		return EXCEPTION_CONTINUE_EXECUTION;
 	case 0x8B: 
-		if (!LW_NonMemory(MemAddress,Reg)) {
-			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-				g_Notify->DisplayError(L"Failed to load word\n\nMIPS Address: %X\nX86 Address",
+		if (!LW_NonMemory(MemAddress,Reg))
+		{
+			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f("Failed to load word\n\nMIPS Address: %08X\nX86 Address: %08X",
 					(char *)exRec.ExceptionInformation[1] - (char *)m_RDRAM,
-					*(unsigned char *)lpEP->ContextRecord->Eip);
+					(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 			}
 		}
 		lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-		return EXCEPTION_CONTINUE_EXECUTION;		
+		return EXCEPTION_CONTINUE_EXECUTION;
 	case 0x89:
-		if (!SW_NonMemory(MemAddress,*(DWORD *)Reg)) {
-			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-				g_Notify->DisplayError(L"Failed to store word\n\nMIPS Address: %X\nX86 Address",MemAddress,
-					*(unsigned char *)lpEP->ContextRecord->Eip);
+		if (!SW_NonMemory(MemAddress,*(DWORD *)Reg))
+		{
+			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f("Failed to store word\n\nMIPS Address: %08X\nX86 Address: %08X", MemAddress,
+					(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 			}
 		}
 		lpEP->ContextRecord->Eip = (DWORD)ReadPos;
-		return EXCEPTION_CONTINUE_EXECUTION;		
+		return EXCEPTION_CONTINUE_EXECUTION;
 	case 0xC6:
 		if (Reg != &lpEP->ContextRecord->Eax) 
 		{
-			if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+			if (bHaveDebugger())
+			{
+				g_Notify->BreakPoint(__FILEW__,__LINE__);
+			}
 			return EXCEPTION_EXECUTE_HANDLER; 
 		}
-		if (!SB_NonMemory(MemAddress,*(BYTE *)ReadPos)) {
-			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-				g_Notify->DisplayError(L"Failed to store byte\n\nMIPS Address: %X\nX86 Address",MemAddress,
-					*(unsigned char *)lpEP->ContextRecord->Eip);
+		if (!SB_NonMemory(MemAddress,*(BYTE *)ReadPos))
+		{
+			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f("Failed to store byte\n\nMIPS Address: %08X\nX86 Address: %08X", MemAddress,
+					(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 			}
 		}
 		lpEP->ContextRecord->Eip = (DWORD)(ReadPos + 1);
-		return EXCEPTION_CONTINUE_EXECUTION;		
+		return EXCEPTION_CONTINUE_EXECUTION;
 	case 0xC7:
 		if (Reg != &lpEP->ContextRecord->Eax) 
 		{
-			if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+			if (bHaveDebugger())
+			{
+				g_Notify->BreakPoint(__FILEW__,__LINE__);
+			}
 			return EXCEPTION_EXECUTE_HANDLER; 
 		}
-		if (!SW_NonMemory(MemAddress,*(DWORD *)ReadPos)) {
-			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory)) {
-				g_Notify->DisplayError(L"Failed to store word\n\nMIPS Address: %X\nX86 Address",MemAddress,
-					*(unsigned char *)lpEP->ContextRecord->Eip);
+		if (!SW_NonMemory(MemAddress,*(DWORD *)ReadPos))
+		{
+			if (g_Settings->LoadDword(Debugger_ShowUnhandledMemory))
+			{
+				g_Notify->DisplayError(stdstr_f("Failed to store word\n\nMIPS Address: %08X\nX86 Address: %08X", MemAddress,
+					(unsigned char *)lpEP->ContextRecord->Eip).ToUTF16().c_str());
 			}
 		}
 		lpEP->ContextRecord->Eip = (DWORD)(ReadPos + 4);
-		return EXCEPTION_CONTINUE_EXECUTION;		
+		return EXCEPTION_CONTINUE_EXECUTION;
 	}
-	if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+	if (bHaveDebugger())
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__);
+	}
+#else
+	g_Notify->BreakPoint(__FILEW__,__LINE__);
+#endif
 	return EXCEPTION_EXECUTE_HANDLER;
 }
 
-int CMipsMemoryVM::LB_NonMemory ( DWORD PAddr, DWORD * Value, BOOL /*SignExtend*/ ) 
+bool CMipsMemoryVM::LB_NonMemory(DWORD PAddr, DWORD* Value, bool /*SignExtend*/)
 {
 	if (PAddr < 0x800000)
 	{
-		* Value = 0;
+		*Value = 0;
 		return true;
 	}
+
 	if (PAddr >= 0x10000000 && PAddr < 0x16000000) 
 	{
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 #ifdef tofix
-		if (WrittenToRom) { return FALSE; }
-		if ((PAddr & 2) == 0) { PAddr = (PAddr + 4) ^ 2; }
-		if ((PAddr - 0x10000000) < RomFileSize) {
-			if (SignExtend) {
+		if (WrittenToRom)
+		{
+			return false;
+		}
+
+		if ((PAddr & 2) == 0)
+		{
+			PAddr = (PAddr + 4) ^ 2;
+		}
+
+		if ((PAddr - 0x10000000) < RomFileSize)
+		{
+			if (SignExtend)
+			{
 				*Value = (int)((char)ROM[PAddr - 0x10000000]);
-			} else {
+			}
+			else
+			{
 				*Value = ROM[PAddr - 0x10000000];
 			}
-			return TRUE;
-		} else {
+
+			return true;
+		}
+		else
+		{
 			*Value = 0;
-			return FALSE;
+			return false;
 		}
 #endif
 	}
-//	switch (PAddr & 0xFFF00000) {
+//	switch (PAddr & 0xFFF00000)
+//{
 //	default:
-		* Value = 0;
-//		return FALSE;
+		*Value = 0;
+//		return false;
 //		break;
 //	}
-	return TRUE;
+	return true;
 }
 
-int CMipsMemoryVM::LH_NonMemory ( DWORD PAddr, DWORD * Value, int/* SignExtend*/ ) 
+bool CMipsMemoryVM::LH_NonMemory(DWORD PAddr, DWORD* Value, bool/* SignExtend*/)
 {
 	if (PAddr < 0x800000)
 	{
-		* Value = 0;
+		*Value = 0;
 		return true;
 	}
 
@@ -1940,23 +2445,28 @@ int CMipsMemoryVM::LH_NonMemory ( DWORD PAddr, DWORD * Value, int/* SignExtend*/
 	{
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 	}
-//	switch (PAddr & 0xFFF00000) {
+//	switch (PAddr & 0xFFF00000)
+//	{
 //	default:
-		* Value = 0;
-		return FALSE;
-//		break;
+		*Value = 0;
+		return false;
 //	}
-//	return TRUE;
+//	return true;
 }
 
-int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) {
+bool CMipsMemoryVM::LW_NonMemory(DWORD PAddr, DWORD* Value)
+{
 #ifdef CFB_READ
-	if (PAddr >= CFBStart && PAddr < CFBEnd) {
+	if (PAddr >= CFBStart && PAddr < CFBEnd)
+	{
 		DWORD OldProtect;
 		VirtualProtect(m_RDRAM+(PAddr & ~0xFFF),0xFFC,PAGE_READONLY, &OldProtect);
-		if (FrameBufferRead) { FrameBufferRead(PAddr & ~0xFFF); }
+		if (FrameBufferRead)
+		{
+			FrameBufferRead(PAddr & ~0xFFF);
+		}
 		*Value = *(DWORD *)(m_RDRAM+PAddr);
-		return TRUE;
+		return true;
 	}	
 #endif
 	if (PAddr >= 0x10000000 && PAddr < 0x16000000) 
@@ -1964,29 +2474,34 @@ int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) {
 		if (m_RomWrittenTo) 
 		{ 
 			*Value = m_RomWroteValue;
-			//LogMessage("%X: Read crap from Rom %X from %X",PROGRAM_COUNTER,*Value,PAddr);
-			m_RomWrittenTo = FALSE;
+			//LogMessage("%X: Read crap from Rom %08X from %08X",PROGRAM_COUNTER,*Value,PAddr);
+			m_RomWrittenTo = false;
 #ifdef ROM_IN_MAPSPACE
 			{
 				DWORD OldProtect;
 				VirtualProtect(ROM,RomFileSize,PAGE_READONLY, &OldProtect);
 			}
 #endif
-			return TRUE;
+			return true;
 		}
-		if ((PAddr - 0x10000000) < m_RomSize) {
+		if ((PAddr - 0x10000000) < m_RomSize)
+		{
 			*Value = *(DWORD *)&m_Rom[PAddr - 0x10000000];
-			return TRUE;
-		} else {
+			return true;
+		}
+		else
+		{
 			*Value = PAddr & 0xFFFF;
 			*Value = (*Value << 16) | *Value;
-			return FALSE;
+			return false;
 		}
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x03F00000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x03F00000: * Value = g_Reg->RDRAM_CONFIG_REG; break;
 		case 0x03F00004: * Value = g_Reg->RDRAM_DEVICE_ID_REG; break;
 		case 0x03F00008: * Value = g_Reg->RDRAM_DELAY_REG; break;
@@ -1998,12 +2513,13 @@ int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) {
 		case 0x03F00020: * Value = g_Reg->RDRAM_ADDR_SELECT_REG; break;
 		case 0x03F00024: * Value = g_Reg->RDRAM_DEVICE_MANUF_REG; break;	
 		default:
-			* Value = 0;
-			return FALSE;
+			*Value = 0;
+			return false;
 		}
 		break;
 	case 0x04000000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04040010: *Value = g_Reg->SP_STATUS_REG; break;
 		case 0x04040014: *Value = g_Reg->SP_DMA_FULL_REG; break;
 		case 0x04040018: *Value = g_Reg->SP_DMA_BUSY_REG; break;
@@ -2014,34 +2530,37 @@ int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) {
 		case 0x04080000: *Value = g_Reg->SP_PC_REG; break;
 		default:
 			* Value = 0;
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x04100000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x0410000C: *Value = g_Reg->DPC_STATUS_REG; break;
 		case 0x04100010: *Value = g_Reg->DPC_CLOCK_REG; break;
 		case 0x04100014: *Value = g_Reg->DPC_BUFBUSY_REG; break;
 		case 0x04100018: *Value = g_Reg->DPC_PIPEBUSY_REG; break;
 		case 0x0410001C: *Value = g_Reg->DPC_TMEM_REG; break;
 		default:
-			* Value = 0;
-			return FALSE;
+			*Value = 0;
+			return false;
 		}
 		break;
 	case 0x04300000:
-		switch (PAddr) {
-		case 0x04300000: * Value = g_Reg->MI_MODE_REG; break;
-		case 0x04300004: * Value = g_Reg->MI_VERSION_REG; break;
-		case 0x04300008: * Value = g_Reg->MI_INTR_REG; break;
-		case 0x0430000C: * Value = g_Reg->MI_INTR_MASK_REG; break;
+		switch (PAddr)
+		{
+		case 0x04300000: *Value = g_Reg->MI_MODE_REG; break;
+		case 0x04300004: *Value = g_Reg->MI_VERSION_REG; break;
+		case 0x04300008: *Value = g_Reg->MI_INTR_REG; break;
+		case 0x0430000C: *Value = g_Reg->MI_INTR_MASK_REG; break;
 		default:
-			* Value = 0;
-			return FALSE;
+			*Value = 0;
+			return false;
 		}
 		break;
 	case 0x04400000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04400000: *Value = g_Reg->VI_STATUS_REG; break;
 		case 0x04400004: *Value = g_Reg->VI_ORIGIN_REG; break;
 		case 0x04400008: *Value = g_Reg->VI_WIDTH_REG; break;
@@ -2060,20 +2579,26 @@ int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) {
 		case 0x04400030: *Value = g_Reg->VI_X_SCALE_REG; break;
 		case 0x04400034: *Value = g_Reg->VI_Y_SCALE_REG; break;
 		default:
-			* Value = 0;
-			return FALSE;
+			*Value = 0;
+			return false;
 		}
 		break;
 	case 0x04500000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04500004: 
 			if (g_System->bFixedAudio())
 			{
 				*Value = g_Audio->GetLength();
-			} else {
-				if (g_Plugins->Audio()->AiReadLength != NULL) {
+			}
+			else
+			{
+				if (g_Plugins->Audio()->AiReadLength != NULL)
+				{
 					*Value = g_Plugins->Audio()->AiReadLength();
-				} else {
+				}
+				else
+				{
 					*Value = 0;
 				}
 			}
@@ -2082,17 +2607,20 @@ int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) {
 			if (g_System->bFixedAudio())
 			{
 				*Value = g_Audio->GetStatus();
-			} else {
+			}
+			else
+			{
 				*Value = g_Reg->AI_STATUS_REG; 
 			}
 			break;
 		default:
-			* Value = 0;
-			return FALSE;
+			*Value = 0;
+			return false;
 		}
 		break;
 	case 0x04600000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04600010: *Value = g_Reg->PI_STATUS_REG; break;
 		case 0x04600014: *Value = g_Reg->PI_DOMAIN1_REG; break;
 		case 0x04600018: *Value = g_Reg->PI_BSD_DOM1_PWD_REG; break;
@@ -2103,85 +2631,95 @@ int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) {
 		case 0x0460002C: *Value = g_Reg->PI_BSD_DOM2_PGS_REG; break;
 		case 0x04600030: *Value = g_Reg->PI_BSD_DOM2_RLS_REG; break;
 		default:
-			* Value = 0;
-			return FALSE;
+			*Value = 0;
+			return false;
 		}
 		break;
 	case 0x04700000:
-		switch (PAddr) {
-		case 0x04700000: * Value = g_Reg->RI_MODE_REG; break;
-		case 0x04700004: * Value = g_Reg->RI_CONFIG_REG; break;
-		case 0x04700008: * Value = g_Reg->RI_CURRENT_LOAD_REG; break;
-		case 0x0470000C: * Value = g_Reg->RI_SELECT_REG; break;
-		case 0x04700010: * Value = g_Reg->RI_REFRESH_REG; break;
-		case 0x04700014: * Value = g_Reg->RI_LATENCY_REG; break;
-		case 0x04700018: * Value = g_Reg->RI_RERROR_REG; break;
-		case 0x0470001C: * Value = g_Reg->RI_WERROR_REG; break;
+		switch (PAddr)
+		{
+		case 0x04700000: *Value = g_Reg->RI_MODE_REG; break;
+		case 0x04700004: *Value = g_Reg->RI_CONFIG_REG; break;
+		case 0x04700008: *Value = g_Reg->RI_CURRENT_LOAD_REG; break;
+		case 0x0470000C: *Value = g_Reg->RI_SELECT_REG; break;
+		case 0x04700010: *Value = g_Reg->RI_REFRESH_REG; break;
+		case 0x04700014: *Value = g_Reg->RI_LATENCY_REG; break;
+		case 0x04700018: *Value = g_Reg->RI_RERROR_REG; break;
+		case 0x0470001C: *Value = g_Reg->RI_WERROR_REG; break;
 		default:
-			* Value = 0;
-			return FALSE;
+			*Value = 0;
+			return false;
 		}
 		break;
 	case 0x04800000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04800018: *Value = g_Reg->SI_STATUS_REG; break;
 		default:
 			*Value = 0;
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x05000000:
 		*Value = PAddr & 0xFFFF;
 		*Value = (*Value << 16) | *Value;
-		return FALSE;
+		return false;
 	case 0x08000000:
-		if (g_System->m_SaveUsing == SaveChip_Auto) { g_System->m_SaveUsing = SaveChip_FlashRam; }
-		if (g_System->m_SaveUsing != SaveChip_FlashRam) { 
+		if (g_System->m_SaveUsing == SaveChip_Auto)
+		{
+			g_System->m_SaveUsing = SaveChip_FlashRam;
+		}
+		if (g_System->m_SaveUsing == SaveChip_Sram)
+		{
+			//Load Sram
+			BYTE tmp[4] = "";
+			DmaFromSram(tmp, PAddr - 0x08000000, 4);
+			*Value = tmp[3] << 24 | tmp[2] << 16 | tmp[1] << 8 | tmp[0];
+			return true;
+		}
+		else if (g_System->m_SaveUsing != SaveChip_FlashRam)
+		{ 
 			*Value = PAddr & 0xFFFF;
 			*Value = (*Value << 16) | *Value;
-			return FALSE;
+			return false;
 		}
 		*Value = ReadFromFlashStatus(PAddr);
 		break;
 	case 0x1FC00000:
-		if (PAddr < 0x1FC007C0) {
-/*			DWORD ToSwap = *(DWORD *)(&PifRom[PAddr - 0x1FC00000]);
-			_asm {
-				mov eax,ToSwap
-				bswap eax
-				mov ToSwap,eax
-			}
-			* Value = ToSwap;*/
+		if (PAddr < 0x1FC007C0)
+		{
+/*			*Value = *(DWORD *)(&PifRom[PAddr - 0x1FC00000]);
+			*Value = swap32by8(*Value); */
 			g_Notify->BreakPoint(__FILEW__,__LINE__);
-			return TRUE;
+			return true;
 		}
 		else if (PAddr < 0x1FC00800) 
 		{
 			BYTE * PIF_Ram = g_MMU->PifRam();
-			DWORD ToSwap = *(DWORD *)(&PIF_Ram[PAddr - 0x1FC007C0]);
-			_asm {
-				mov eax,ToSwap
-				bswap eax
-				mov ToSwap,eax
-			}
-			* Value = ToSwap;
-			return TRUE;
-		} else {
-			* Value = 0;
-			return FALSE;
+			*Value = *(DWORD *)(&PIF_Ram[PAddr - 0x1FC007C0]);
+			*Value = swap32by8(*Value);
+			return true;
+		}
+		else
+		{
+			*Value = 0;
+			return false;
 		}
 		break;
 	default:
 		*Value = PAddr & 0xFFFF;
 		*Value = (*Value << 16) | *Value;
-		return FALSE;
+		return false;
 		break;
 	}
-	return TRUE;
+
+	return true;
 }
 
-int CMipsMemoryVM::SB_NonMemory ( DWORD PAddr, BYTE Value ) {
-	switch (PAddr & 0xFFF00000) {
+bool CMipsMemoryVM::SB_NonMemory(DWORD PAddr, BYTE Value)
+{
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000:
 	case 0x00100000:
 	case 0x00200000:
@@ -2191,7 +2729,8 @@ int CMipsMemoryVM::SB_NonMemory ( DWORD PAddr, BYTE Value ) {
 	case 0x00600000:
 	case 0x00700000:
 #ifdef CFB_READ
-		if (PAddr >= CFBStart && PAddr < CFBEnd) {
+		if (PAddr >= CFBStart && PAddr < CFBEnd)
+		{
 			DWORD OldProtect;
 			VirtualProtect(m_RDRAM+(PAddr & ~0xFFF),0xFFC,PAGE_READWRITE, &OldProtect);
 			*(BYTE *)(m_RDRAM+PAddr) = Value;
@@ -2210,14 +2749,16 @@ int CMipsMemoryVM::SB_NonMemory ( DWORD PAddr, BYTE Value ) {
 		}
 		break;
 	default:
-		return FALSE;
-		break;
+		return false;
 	}
-	return TRUE;
+
+	return true;
 }
 
-int CMipsMemoryVM::SH_NonMemory ( DWORD PAddr, WORD Value ) {
-	switch (PAddr & 0xFFF00000) {
+bool CMipsMemoryVM::SH_NonMemory(DWORD PAddr, WORD Value)
+{
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000:
 	case 0x00100000:
 	case 0x00200000:
@@ -2227,7 +2768,8 @@ int CMipsMemoryVM::SH_NonMemory ( DWORD PAddr, WORD Value ) {
 	case 0x00600000:
 	case 0x00700000:
 #ifdef CFB_READ
-		if (PAddr >= CFBStart && PAddr < CFBEnd) {
+		if (PAddr >= CFBStart && PAddr < CFBEnd)
+		{
 			DWORD OldProtect;
 			VirtualProtect(m_RDRAM+(PAddr & ~0xFFF),0xFFC,PAGE_READWRITE, &OldProtect);
 			*(WORD *)(m_RDRAM+PAddr) = Value;
@@ -2238,7 +2780,8 @@ int CMipsMemoryVM::SH_NonMemory ( DWORD PAddr, WORD Value ) {
 			break;
 		}	
 #endif
-		if (PAddr < RdramSize()) {
+		if (PAddr < RdramSize())
+		{
 			DWORD OldProtect;
 			g_Recompiler->ClearRecompCode_Phys(PAddr & ~0xFFF,0x1000,CRecompiler::Remove_ProtectedMem);
 			VirtualProtect(m_RDRAM+(PAddr & ~0xFFF),0xFFC,PAGE_READWRITE, &OldProtect);
@@ -2246,17 +2789,19 @@ int CMipsMemoryVM::SH_NonMemory ( DWORD PAddr, WORD Value ) {
 		}
 		break;
 	default:
-		return FALSE;
-		break;
+		return false;
 	}
-	return TRUE;
+
+	return true;
 }
 
-int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
+bool CMipsMemoryVM::SW_NonMemory(DWORD PAddr, DWORD Value)
+{
 	if (PAddr >= 0x10000000 && PAddr < 0x16000000) 
 	{
-		if ((PAddr - 0x10000000) < g_Rom->GetRomSize()) {
-			m_RomWrittenTo = TRUE;
+		if ((PAddr - 0x10000000) < g_Rom->GetRomSize())
+		{
+			m_RomWrittenTo = true;
 			m_RomWroteValue = Value;
 #ifdef ROM_IN_MAPSPACE
 			{
@@ -2264,13 +2809,16 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 				VirtualProtect(ROM,RomFileSize,PAGE_NOACCESS, &OldProtect);
 			}
 #endif
-			//LogMessage("%X: Wrote To Rom %X from %X",PROGRAM_COUNTER,Value,PAddr);
-		} else {
-			return FALSE;
+			//LogMessage("%X: Wrote To Rom %08X from %08X",PROGRAM_COUNTER,Value,PAddr);
+		}
+		else
+		{
+			return false;
 		}
 	}
 
-	switch (PAddr & 0xFFF00000) {
+	switch (PAddr & 0xFFF00000)
+	{
 	case 0x00000000:
 	case 0x00100000:
 	case 0x00200000:
@@ -2280,7 +2828,8 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 	case 0x00600000:
 	case 0x00700000:
 #ifdef CFB_READ
-		if (PAddr >= CFBStart && PAddr < CFBEnd) {
+		if (PAddr >= CFBStart && PAddr < CFBEnd)
+		{
 			DWORD OldProtect;
 			VirtualProtect(m_RDRAM+(PAddr & ~0xFFF),0xFFC,PAGE_READWRITE, &OldProtect);
 			*(DWORD *)(m_RDRAM+PAddr) = Value;
@@ -2290,7 +2839,8 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 			break;
 		}	
 #endif
-		if (PAddr < RdramSize()) {
+		if (PAddr < RdramSize())
+		{
 			DWORD OldProtect;
 			g_Recompiler->ClearRecompCode_Phys(PAddr & ~0xFFF,0x1000,CRecompiler::Remove_ProtectedMem);
 			VirtualProtect(m_RDRAM+(PAddr & ~0xFFF),0xFFC,PAGE_READWRITE, &OldProtect);
@@ -2298,7 +2848,8 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 		}
 		break;
 	case 0x03F00000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x03F00000: g_Reg->RDRAM_CONFIG_REG = Value; break;
 		case 0x03F00004: g_Reg->RDRAM_DEVICE_ID_REG = Value; break;
 		case 0x03F00008: g_Reg->RDRAM_DELAY_REG = Value; break;
@@ -2316,15 +2867,19 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 		case 0x03F8000C: break;
 		case 0x03F80014: break;
 		default:
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x04000000: 
-		if (PAddr < 0x04002000) {
+		if (PAddr < 0x04002000)
+		{
 			g_Recompiler->ClearRecompCode_Phys(PAddr & ~0xFFF,0xFFF,CRecompiler::Remove_ProtectedMem);
 			*(DWORD *)(m_RDRAM+PAddr) = Value;
-		} else {
-			switch (PAddr) {
+		}
+		else
+		{
+			switch (PAddr)
+			{
 			case 0x04040000: g_Reg->SP_MEM_ADDR_REG = Value; break;
 			case 0x04040004: g_Reg->SP_DRAM_ADDR_REG = Value; break;
 			case 0x04040008: 
@@ -2336,50 +2891,125 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 				SP_DMA_WRITE();
 				break;
 			case 0x04040010: 
-				if ( ( Value & SP_CLR_HALT ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_HALT; }
-				if ( ( Value & SP_SET_HALT ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_HALT;  }
-				if ( ( Value & SP_CLR_BROKE ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_BROKE; }
-				if ( ( Value & SP_CLR_INTR ) != 0) { 
+				if ( ( Value & SP_CLR_HALT ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_HALT;
+				}
+				if ( ( Value & SP_SET_HALT ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_HALT;
+				}
+				if ( ( Value & SP_CLR_BROKE ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_BROKE;
+				}
+				if ( ( Value & SP_CLR_INTR ) != 0)
+				{ 
 					g_Reg->MI_INTR_REG &= ~MI_INTR_SP; 
 					g_Reg->m_RspIntrReg &= ~MI_INTR_SP; 
 					g_Reg->CheckInterrupts();
 				}
-				if ( ( Value & SP_SET_INTR ) != 0) { g_Notify->DisplayError(L"SP_SET_INTR"); }
-				if ( ( Value & SP_CLR_SSTEP ) != 0) { 
+				if ( ( Value & SP_SET_INTR ) != 0)
+				{
+					g_Notify->DisplayError(L"SP_SET_INTR");
+				}
+				if ( ( Value & SP_CLR_SSTEP ) != 0)
+				{ 
 					g_Reg->SP_STATUS_REG &= ~SP_STATUS_SSTEP; 
 				}
-				if ( ( Value & SP_SET_SSTEP ) != 0) { 
+				if ( ( Value & SP_SET_SSTEP ) != 0)
+				{ 
 					g_Reg->SP_STATUS_REG |= SP_STATUS_SSTEP;  
 				}
-				if ( ( Value & SP_CLR_INTR_BREAK ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_INTR_BREAK; }
-				if ( ( Value & SP_SET_INTR_BREAK ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_INTR_BREAK;  }
-				if ( ( Value & SP_CLR_SIG0 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG0; }
-				if ( ( Value & SP_SET_SIG0 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG0;  }
-				if ( ( Value & SP_CLR_SIG1 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG1; }
-				if ( ( Value & SP_SET_SIG1 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG1;  }
-				if ( ( Value & SP_CLR_SIG2 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG2; }
-				if ( ( Value & SP_SET_SIG2 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG2;  }
-				if ( ( Value & SP_CLR_SIG3 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG3; }
-				if ( ( Value & SP_SET_SIG3 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG3;  }
-				if ( ( Value & SP_CLR_SIG4 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG4; }
-				if ( ( Value & SP_SET_SIG4 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG4;  }
-				if ( ( Value & SP_CLR_SIG5 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG5; }
-				if ( ( Value & SP_SET_SIG5 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG5;  }
-				if ( ( Value & SP_CLR_SIG6 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG6; }
-				if ( ( Value & SP_SET_SIG6 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG6;  }
-				if ( ( Value & SP_CLR_SIG7 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG7; }
-				if ( ( Value & SP_SET_SIG7 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG7;  }
+				if ( ( Value & SP_CLR_INTR_BREAK ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_INTR_BREAK;
+				}
+				if ( ( Value & SP_SET_INTR_BREAK ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_INTR_BREAK;
+				}
+				if ( ( Value & SP_CLR_SIG0 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG0;
+				}
+				if ( ( Value & SP_SET_SIG0 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_SIG0;
+				}
+				if ( ( Value & SP_CLR_SIG1 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG1;
+				}
+				if ( ( Value & SP_SET_SIG1 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_SIG1;
+				}
+				if ( ( Value & SP_CLR_SIG2 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG2;
+				}
+				if ( ( Value & SP_SET_SIG2 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_SIG2;
+				}
+				if ( ( Value & SP_CLR_SIG3 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG3;
+				}
+				if ( ( Value & SP_SET_SIG3 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_SIG3;
+				}
+				if ( ( Value & SP_CLR_SIG4 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG4;
+				}
+				if ( ( Value & SP_SET_SIG4 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_SIG4;
+				}
+				if ( ( Value & SP_CLR_SIG5 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG5;
+				}
+				if ( ( Value & SP_SET_SIG5 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_SIG5;
+				}
+				if ( ( Value & SP_CLR_SIG6 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG6;
+				}
+				if ( ( Value & SP_SET_SIG6 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_SIG6;
+				}
+				if ( ( Value & SP_CLR_SIG7 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG7;
+				}
+				if ( ( Value & SP_SET_SIG7 ) != 0)
+				{
+					g_Reg->SP_STATUS_REG |= SP_STATUS_SIG7;
+				}
 				if ( ( Value & SP_SET_SIG0 ) != 0 && g_System->RspAudioSignal()) 
 				{ 
 					g_Reg->MI_INTR_REG |= MI_INTR_SP; 
 					g_Reg->CheckInterrupts();				
 				}
-				//if (*( DWORD *)(DMEM + 0xFC0) == 1) {
+				//if (*( DWORD *)(DMEM + 0xFC0) == 1)
+				//{
 				//	ChangeTimer(RspTimer,0x30000);
-				//} else {
-					try {
+				//}
+				//else
+				//{
+					try
+					{
 						g_System->RunRSP();
-					} catch (...) {
+					}
+					catch (...)
+					{
 						g_Notify->BreakPoint(__FILEW__,__LINE__);
 					}
 				//}
@@ -2387,111 +3017,218 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 			case 0x0404001C: g_Reg->SP_SEMAPHORE_REG = 0; break;
 			case 0x04080000: g_Reg->SP_PC_REG = Value & 0xFFC; break;
 			default:
-				return FALSE;
+				return false;
 			}
 		}
 		break;
 	case 0x04100000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04100000: 
 			g_Reg->DPC_START_REG = Value; 
 			g_Reg->DPC_CURRENT_REG = Value; 
 			break;
 		case 0x04100004: 
 			g_Reg->DPC_END_REG = Value; 
-			if (g_Plugins->Gfx()->ProcessRDPList) { g_Plugins->Gfx()->ProcessRDPList(); }
+			if (g_Plugins->Gfx()->ProcessRDPList)
+			{
+				g_Plugins->Gfx()->ProcessRDPList();
+			}
 			break;
 		//case 0x04100008: g_Reg->DPC_CURRENT_REG = Value; break;
 		case 0x0410000C:
-			if ( ( Value & DPC_CLR_XBUS_DMEM_DMA ) != 0) { g_Reg->DPC_STATUS_REG &= ~DPC_STATUS_XBUS_DMEM_DMA; }
-			if ( ( Value & DPC_SET_XBUS_DMEM_DMA ) != 0) { g_Reg->DPC_STATUS_REG |= DPC_STATUS_XBUS_DMEM_DMA;  }
-			if ( ( Value & DPC_CLR_FREEZE ) != 0) { g_Reg->DPC_STATUS_REG &= ~DPC_STATUS_FREEZE; }
-			if ( ( Value & DPC_SET_FREEZE ) != 0) { g_Reg->DPC_STATUS_REG |= DPC_STATUS_FREEZE;  }		
-			if ( ( Value & DPC_CLR_FLUSH ) != 0) { g_Reg->DPC_STATUS_REG &= ~DPC_STATUS_FLUSH; }
-			if ( ( Value & DPC_SET_FLUSH ) != 0) { g_Reg->DPC_STATUS_REG |= DPC_STATUS_FLUSH;  }
+			if ( ( Value & DPC_CLR_XBUS_DMEM_DMA ) != 0)
+			{
+				g_Reg->DPC_STATUS_REG &= ~DPC_STATUS_XBUS_DMEM_DMA;
+			}
+			if ( ( Value & DPC_SET_XBUS_DMEM_DMA ) != 0)
+			{
+				g_Reg->DPC_STATUS_REG |= DPC_STATUS_XBUS_DMEM_DMA;
+			}
+			if ( ( Value & DPC_CLR_FREEZE ) != 0)
+			{
+				g_Reg->DPC_STATUS_REG &= ~DPC_STATUS_FREEZE;
+			}
+			if ( ( Value & DPC_SET_FREEZE ) != 0)
+			{
+				g_Reg->DPC_STATUS_REG |= DPC_STATUS_FREEZE;
+			}		
+			if ( ( Value & DPC_CLR_FLUSH ) != 0)
+			{
+				g_Reg->DPC_STATUS_REG &= ~DPC_STATUS_FLUSH;
+			}
+			if ( ( Value & DPC_SET_FLUSH ) != 0)
+			{
+				g_Reg->DPC_STATUS_REG |= DPC_STATUS_FLUSH;
+			}
 			if ( ( Value & DPC_CLR_FREEZE ) != 0) 
 			{
 				if ( ( g_Reg->SP_STATUS_REG & SP_STATUS_HALT ) == 0) 
 				{
 					if ( ( g_Reg->SP_STATUS_REG & SP_STATUS_BROKE ) == 0 ) 
 					{
-						try {
+						try
+						{
 							g_System->RunRSP();
-						} catch (...) {
+						}
+						catch (...)
+						{
 							g_Notify->BreakPoint(__FILEW__,__LINE__);
 						}
 					}
 				}
 			}
 #ifdef tofix
-			if (ShowUnhandledMemory) {
-				//if ( ( Value & DPC_CLR_TMEM_CTR ) != 0) { g_Notify->DisplayError(L"RSP: DPC_STATUS_REG: DPC_CLR_TMEM_CTR"); }
-				//if ( ( Value & DPC_CLR_PIPE_CTR ) != 0) { g_Notify->DisplayError(L"RSP: DPC_STATUS_REG: DPC_CLR_PIPE_CTR"); }
-				//if ( ( Value & DPC_CLR_CMD_CTR ) != 0) { g_Notify->DisplayError(L"RSP: DPC_STATUS_REG: DPC_CLR_CMD_CTR"); }
-				//if ( ( Value & DPC_CLR_CLOCK_CTR ) != 0) { g_Notify->DisplayError(L"RSP: DPC_STATUS_REG: DPC_CLR_CLOCK_CTR"); }
+			if (ShowUnhandledMemory)
+			{
+				//if ( ( Value & DPC_CLR_TMEM_CTR ) != 0)
+				//{
+				//	g_Notify->DisplayError(L"RSP: DPC_STATUS_REG: DPC_CLR_TMEM_CTR");
+				//}
+				//if ( ( Value & DPC_CLR_PIPE_CTR ) != 0)
+				//{
+				//	g_Notify->DisplayError(L"RSP: DPC_STATUS_REG: DPC_CLR_PIPE_CTR");
+				//}
+				//if ( ( Value & DPC_CLR_CMD_CTR ) != 0)
+				//{
+				//	g_Notify->DisplayError(L"RSP: DPC_STATUS_REG: DPC_CLR_CMD_CTR");
+				//}
+				//if ( ( Value & DPC_CLR_CLOCK_CTR ) != 0)
+				//{
+				//	g_Notify->DisplayError(L"RSP: DPC_STATUS_REG: DPC_CLR_CLOCK_CTR");
+				//}
 			}
 #endif
 			break;
 		default:
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x04300000: 
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04300000: 
 			g_Reg->MI_MODE_REG &= ~0x7F;
 			g_Reg->MI_MODE_REG |= (Value & 0x7F);
-			if ( ( Value & MI_CLR_INIT ) != 0 ) { g_Reg->MI_MODE_REG &= ~MI_MODE_INIT; }
-			if ( ( Value & MI_SET_INIT ) != 0 ) { g_Reg->MI_MODE_REG |= MI_MODE_INIT; }
-			if ( ( Value & MI_CLR_EBUS ) != 0 ) { g_Reg->MI_MODE_REG &= ~MI_MODE_EBUS; }
-			if ( ( Value & MI_SET_EBUS ) != 0 ) { g_Reg->MI_MODE_REG |= MI_MODE_EBUS; }
-			if ( ( Value & MI_CLR_DP_INTR ) != 0 ) { 
+			if ( ( Value & MI_CLR_INIT ) != 0 )
+			{
+				g_Reg->MI_MODE_REG &= ~MI_MODE_INIT;
+			}
+			if ( ( Value & MI_SET_INIT ) != 0 )
+			{
+				g_Reg->MI_MODE_REG |= MI_MODE_INIT;
+			}
+			if ( ( Value & MI_CLR_EBUS ) != 0 )
+			{
+				g_Reg->MI_MODE_REG &= ~MI_MODE_EBUS;
+			}
+			if ( ( Value & MI_SET_EBUS ) != 0 )
+			{
+				g_Reg->MI_MODE_REG |= MI_MODE_EBUS;
+			}
+			if ( ( Value & MI_CLR_DP_INTR ) != 0 )
+			{ 
 				g_Reg->MI_INTR_REG &= ~MI_INTR_DP; 
 				g_Reg->m_GfxIntrReg &= ~MI_INTR_DP; 
 				g_Reg->CheckInterrupts();
 			}
-			if ( ( Value & MI_CLR_RDRAM ) != 0 ) { g_Reg->MI_MODE_REG &= ~MI_MODE_RDRAM; }
-			if ( ( Value & MI_SET_RDRAM ) != 0 ) { g_Reg->MI_MODE_REG |= MI_MODE_RDRAM; }
+			if ( ( Value & MI_CLR_RDRAM ) != 0 )
+			{
+				g_Reg->MI_MODE_REG &= ~MI_MODE_RDRAM;
+			}
+			if ( ( Value & MI_SET_RDRAM ) != 0 )
+			{
+				g_Reg->MI_MODE_REG |= MI_MODE_RDRAM;
+			}
 			break;
 		case 0x0430000C: 
-			if ( ( Value & MI_INTR_MASK_CLR_SP ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_SP; }
-			if ( ( Value & MI_INTR_MASK_SET_SP ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_SP; }
-			if ( ( Value & MI_INTR_MASK_CLR_SI ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_SI; }
-			if ( ( Value & MI_INTR_MASK_SET_SI ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_SI; }
-			if ( ( Value & MI_INTR_MASK_CLR_AI ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_AI; }
-			if ( ( Value & MI_INTR_MASK_SET_AI ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_AI; }
-			if ( ( Value & MI_INTR_MASK_CLR_VI ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_VI; }
-			if ( ( Value & MI_INTR_MASK_SET_VI ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_VI; }
-			if ( ( Value & MI_INTR_MASK_CLR_PI ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_PI; }
-			if ( ( Value & MI_INTR_MASK_SET_PI ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_PI; }
-			if ( ( Value & MI_INTR_MASK_CLR_DP ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_DP; }
-			if ( ( Value & MI_INTR_MASK_SET_DP ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_DP; }
+			if ( ( Value & MI_INTR_MASK_CLR_SP ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_SP;
+			}
+			if ( ( Value & MI_INTR_MASK_SET_SP ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_SP;
+			}
+			if ( ( Value & MI_INTR_MASK_CLR_SI ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_SI;
+			}
+			if ( ( Value & MI_INTR_MASK_SET_SI ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_SI;
+			}
+			if ( ( Value & MI_INTR_MASK_CLR_AI ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_AI;
+			}
+			if ( ( Value & MI_INTR_MASK_SET_AI ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_AI;
+			}
+			if ( ( Value & MI_INTR_MASK_CLR_VI ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_VI;
+			}
+			if ( ( Value & MI_INTR_MASK_SET_VI ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_VI;
+			}
+			if ( ( Value & MI_INTR_MASK_CLR_PI ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_PI;
+			}
+			if ( ( Value & MI_INTR_MASK_SET_PI ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_PI;
+			}
+			if ( ( Value & MI_INTR_MASK_CLR_DP ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_DP;
+			}
+			if ( ( Value & MI_INTR_MASK_SET_DP ) != 0 )
+			{
+				g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_DP;
+			}
 			break;
 		default:
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x04400000: 
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04400000: 
-			if (g_Reg->VI_STATUS_REG != Value) { 
+			if (g_Reg->VI_STATUS_REG != Value)
+			{ 
 				g_Reg->VI_STATUS_REG = Value; 
-				if (g_Plugins->Gfx()->ViStatusChanged != NULL ) { g_Plugins->Gfx()->ViStatusChanged(); }
+				if (g_Plugins->Gfx()->ViStatusChanged != NULL )
+				{
+					g_Plugins->Gfx()->ViStatusChanged();
+				}
 			}
 			break;
 		case 0x04400004: 
 #ifdef CFB_READ
-			if (g_Reg->VI_ORIGIN_REG > 0x280) {
+			if (g_Reg->VI_ORIGIN_REG > 0x280)
+			{
 				SetFrameBuffer(g_Reg->VI_ORIGIN_REG, (DWORD)(VI_WIDTH_REG * (VI_WIDTH_REG *.75)));
 			}
 #endif
 			g_Reg->VI_ORIGIN_REG = (Value & 0xFFFFFF); 
-			//if (UpdateScreen != NULL ) { UpdateScreen(); }
+			//if (UpdateScreen != NULL )
+			//{
+			//	UpdateScreen();
+			//}
 			break;
 		case 0x04400008: 
-			if (g_Reg->VI_WIDTH_REG != Value) {
+			if (g_Reg->VI_WIDTH_REG != Value)
+			{
 				g_Reg->VI_WIDTH_REG = Value; 
-				if (g_Plugins->Gfx()->ViWidthChanged != NULL ) { g_Plugins->Gfx()->ViWidthChanged(); }
+				if (g_Plugins->Gfx()->ViWidthChanged != NULL )
+				{
+					g_Plugins->Gfx()->ViWidthChanged();
+				}
 			}
 			break;
 		case 0x0440000C: g_Reg->VI_INTR_REG = Value; break;
@@ -2509,19 +3246,25 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 		case 0x04400030: g_Reg->VI_X_SCALE_REG = Value; break;
 		case 0x04400034: g_Reg->VI_Y_SCALE_REG = Value; break;
 		default:
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x04500000: 
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04500000: g_Reg->AI_DRAM_ADDR_REG = Value; break;
 		case 0x04500004: 
 			g_Reg->AI_LEN_REG = Value; 
 			if (g_System->bFixedAudio())
 			{
 				g_Audio->LenChanged();
-			} else {
-				if (g_Plugins->Audio()->AiLenChanged != NULL) { g_Plugins->Audio()->AiLenChanged(); }
+			}
+			else
+			{
+				if (g_Plugins->Audio()->AiLenChanged != NULL)
+				{
+					g_Plugins->Audio()->AiLenChanged();
+				}
 			}
 			break;
 		case 0x04500008: g_Reg->AI_CONTROL_REG = (Value & 1); break;
@@ -2541,11 +3284,12 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 			break;
 		case 0x04500014:  g_Reg->AI_BITRATE_REG = Value; break;
 		default:
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x04600000: 
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04600000: g_Reg->PI_DRAM_ADDR_REG = Value; break;
 		case 0x04600004: g_Reg->PI_CART_ADDR_REG = Value; break;
 		case 0x04600008: 
@@ -2557,8 +3301,12 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 			PI_DMA_WRITE();
 			break;
 		case 0x04600010:
-			//if ((Value & PI_SET_RESET) != 0 ) { g_Notify->DisplayError(L"reset Controller"); }
-			if ((Value & PI_CLR_INTR) != 0 ) {
+			//if ((Value & PI_SET_RESET) != 0 )
+			//{
+			//	g_Notify->DisplayError(L"reset Controller");
+			//}
+			if ((Value & PI_CLR_INTR) != 0 )
+			{
 				g_Reg->MI_INTR_REG &= ~MI_INTR_PI;
 				g_Reg->CheckInterrupts();
 			}
@@ -2572,11 +3320,12 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 		case 0x0460002C: g_Reg->PI_BSD_DOM2_PGS_REG = (Value & 0xFF); break;
 		case 0x04600030: g_Reg->PI_BSD_DOM2_RLS_REG = (Value & 0xFF); break;
 		default:
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x04700000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04700000: g_Reg->RI_MODE_REG = Value; break;
 		case 0x04700004: g_Reg->RI_CONFIG_REG = Value; break;
 		case 0x04700008: g_Reg->RI_CURRENT_LOAD_REG = Value; break;
@@ -2586,11 +3335,12 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 		case 0x04700018: g_Reg->RI_RERROR_REG = Value; break;
 		case 0x0470001C: g_Reg->RI_WERROR_REG = Value; break;
 		default:
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x04800000:
-		switch (PAddr) {
+		switch (PAddr)
+		{
 		case 0x04800000: g_Reg->SI_DRAM_ADDR_REG = Value; break;
 		case 0x04800004: 
 			g_Reg->SI_PIF_ADDR_RD64B_REG = Value; 
@@ -2606,46 +3356,68 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
 			g_Reg->CheckInterrupts();
 			break;
 		default:
-			return FALSE;
+			return false;
 		}
 		break;
 	case 0x08000000:
-		if (PAddr != 0x08010000) { return FALSE; }
-		if (g_System->m_SaveUsing == SaveChip_Auto) { g_System->m_SaveUsing = SaveChip_FlashRam; }
-		if (g_System->m_SaveUsing != SaveChip_FlashRam) { return TRUE; }
+		if (g_System->m_SaveUsing == SaveChip_Sram)
+		{
+			//Store Sram
+			BYTE tmp[4] = "";
+			tmp[0] = 0xFF & (Value);
+			tmp[1] = 0xFF & (Value >> 8);
+			tmp[2] = 0xFF & (Value >> 16);
+			tmp[3] = 0xFF & (Value >> 24);
+			DmaFromSram(tmp, PAddr - 0x08000000, 4);
+			return true;
+		}
+		if (PAddr != 0x08010000)
+		{
+			return false;
+		}
+		if (g_System->m_SaveUsing == SaveChip_Auto)
+		{
+			g_System->m_SaveUsing = SaveChip_FlashRam;
+		}
+		if (g_System->m_SaveUsing != SaveChip_FlashRam)
+		{
+			return true;
+		}
 		
 		WriteToFlashCommand(Value);
-		return TRUE;
+		return true;
 		break;
 	case 0x1FC00000:
-		if (PAddr < 0x1FC007C0) {
-			return FALSE;
-		} else if (PAddr < 0x1FC00800) {
-			_asm {
-				mov eax,Value
-				bswap eax
-				mov Value,eax
-			}
+		if (PAddr < 0x1FC007C0)
+		{
+			return false;
+		}
+		else if (PAddr < 0x1FC00800)
+		{
+			Value = swap32by8(Value);
 			*(DWORD *)(&m_PifRam[PAddr - 0x1FC007C0]) = Value;
-			if (PAddr == 0x1FC007FC) {
+			if (PAddr == 0x1FC007FC)
+			{
 				PifRamWrite();
 			}
-			return TRUE;
+			return true;
 		}
-		return FALSE;
+		return false;
 		break;
 	default:
-		return FALSE;
+		return false;
 		break;
 	}
-	return TRUE;
+
+	return true;
 }
 
-void CMipsMemoryVM::UpdateHalfLine (void)
+void CMipsMemoryVM::UpdateHalfLine()
 {
 	DWORD NextViTimer = g_SystemTimer->GetTimer(CSystemTimer::ViTimer);
 
-	if (*g_NextTimer < 0) { 
+	if (*g_NextTimer < 0)
+	{ 
 		m_HalfLine = 0;
 		return;
 	}
@@ -2661,9 +3433,10 @@ void CMipsMemoryVM::UpdateHalfLine (void)
 		g_SystemTimer->UpdateTimers();
 		NextViTimer = g_SystemTimer->GetTimer(CSystemTimer::ViTimer);
 	}
-	m_HalfLine = (DWORD)(NextViTimer / g_System->ViRefreshRate());
+	m_HalfLine = (DWORD)(*g_NextTimer / g_System->ViRefreshRate());
 	m_HalfLine &= ~1;
 	m_HalfLine |= m_FieldSerration;
+	g_Reg->VI_V_CURRENT_LINE_REG = m_HalfLine;
 	m_HalfLineCheck = NextViTimer;
 }
 
@@ -2675,138 +3448,191 @@ void CMipsMemoryVM::UpdateFieldSerration (unsigned int interlaced)
 
 void CMipsMemoryVM::ProtectMemory( DWORD StartVaddr, DWORD EndVaddr ) 
 {
-	WriteTraceF(TraceProtectedMem,__FUNCTION__ ": StartVaddr: %X EndVaddr: %X",StartVaddr,EndVaddr);
-	if (!ValidVaddr(StartVaddr) || !ValidVaddr(EndVaddr)) { return; }
+	WriteTraceF(TraceProtectedMem,__FUNCTION__ ": StartVaddr: %08X EndVaddr: %08X",StartVaddr,EndVaddr);
+	if (!ValidVaddr(StartVaddr) || !ValidVaddr(EndVaddr))
+	{
+		return;
+	}
 
 	//Get Physical Addresses passed
 	DWORD StartPAddr, EndPAddr;
-	if (!TranslateVaddr(StartVaddr,StartPAddr)) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
-	if (!TranslateVaddr(EndVaddr,EndPAddr)) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+	if (!TranslateVaddr(StartVaddr,StartPAddr))
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__);
+	}
+	if (!TranslateVaddr(EndVaddr,EndPAddr))
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__);
+	}
 	
 	//Get Length of memory being protected
 	int Length = ((EndPAddr + 3) - StartPAddr) & ~3;
-	if (Length < 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+	if (Length < 0)
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__);
+	}
 
-	//Proect that memory address space
+	//Protect that memory address space
 	DWORD OldProtect;
 	BYTE * MemLoc = Rdram() + StartPAddr;
-	WriteTraceF(TraceProtectedMem, __FUNCTION__ ": Paddr: %X Length: %X",StartPAddr,Length);
+	WriteTraceF(TraceProtectedMem, __FUNCTION__ ": Paddr: %08X Length: %X",StartPAddr,Length);
 	
 	VirtualProtect(MemLoc, Length, PAGE_READONLY, &OldProtect);	
 }
 
 void CMipsMemoryVM::UnProtectMemory( DWORD StartVaddr, DWORD EndVaddr ) 
 {
-	WriteTraceF(TraceProtectedMem,__FUNCTION__ ": StartVaddr: %X EndVaddr: %X",StartVaddr,EndVaddr);
+	WriteTraceF(TraceProtectedMem,__FUNCTION__ ": StartVaddr: %08X EndVaddr: %08X",StartVaddr,EndVaddr);
 	if (!ValidVaddr(StartVaddr) || !ValidVaddr(EndVaddr)) { return; }
 
 	//Get Physical Addresses passed
 	DWORD StartPAddr, EndPAddr;
-	if (!TranslateVaddr(StartVaddr,StartPAddr)) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
-	if (!TranslateVaddr(EndVaddr,EndPAddr)) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+	if (!TranslateVaddr(StartVaddr,StartPAddr))
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__);
+	}
+	if (!TranslateVaddr(EndVaddr,EndPAddr))
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__);
+	}
 	
 	//Get Length of memory being protected
 	int Length = ((EndPAddr + 3) - StartPAddr) & ~3;
-	if (Length < 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+	if (Length < 0)
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__);
+	}
 
-	//Proect that memory address space
+	//Protect that memory address space
 	DWORD OldProtect;
 	BYTE * MemLoc = Rdram() + StartPAddr;
 	
 	VirtualProtect(MemLoc, Length, PAGE_READWRITE, &OldProtect);
 }
 
-void CMipsMemoryVM::Compile_LB (void) 
+void CMipsMemoryVM::Compile_LB() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) { 
-		DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 3;
-		Map_GPR_32bit(Opcode.rt,TRUE,-1);
-		Compile_LB(GetMipsRegMapLo(Opcode.rt),Address,TRUE);
+	if (Opcode.rt == 0)
+	{
 		return;
 	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-	if (IsMapped(Opcode.base)) { 
+
+	if (IsConst(Opcode.base))
+	{ 
+		DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 3;
+		Map_GPR_32bit(Opcode.rt, true, -1);
+		Compile_LB(GetMipsRegMapLo(Opcode.rt), Address, true);
+		return;
+	}
+	if (IsMapped(Opcode.rt))
+	{
+		ProtectGPR(Opcode.rt);
+	}
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 		}
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		}
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 	}
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		CompileReadTLBMiss(TempReg1,TempReg2);
-		XorConstToX86Reg(TempReg1,3);	
-		Map_GPR_32bit(Opcode.rt,TRUE,-1);
+		XorConstToX86Reg(TempReg1,3);
+		Map_GPR_32bit(Opcode.rt, true, -1);
 		MoveSxByteX86regPointerToX86reg(TempReg1, TempReg2,GetMipsRegMapLo(Opcode.rt));
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		XorConstToX86Reg(TempReg1,3);
-		Map_GPR_32bit(Opcode.rt,TRUE,-1);
+		Map_GPR_32bit(Opcode.rt, true, -1);
 		MoveSxN64MemToX86regByte(GetMipsRegMapLo(Opcode.rt), TempReg1);
 	}
 }
 
-void CMipsMemoryVM::Compile_LBU (void) 
+void CMipsMemoryVM::Compile_LBU() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) { 
-		DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 3;
-		Map_GPR_32bit(Opcode.rt,FALSE,-1);
-		Compile_LB(GetMipsRegMapLo(Opcode.rt),Address,FALSE);
+	if (Opcode.rt == 0)
+	{
 		return;
 	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-	if (IsMapped(Opcode.base)) { 
+
+	if (IsConst(Opcode.base))
+	{ 
+		DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 3;
+		Map_GPR_32bit(Opcode.rt, false, -1);
+		Compile_LB(GetMipsRegMapLo(Opcode.rt), Address, false);
+		return;
+	}
+	if (IsMapped(Opcode.rt))
+	{
+		ProtectGPR(Opcode.rt);
+	}
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 		}
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		}
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 	}
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		CompileReadTLBMiss(TempReg1,TempReg2);
-		XorConstToX86Reg(TempReg1,3);	
-		Map_GPR_32bit(Opcode.rt,FALSE,-1);
+		XorConstToX86Reg(TempReg1,3);
+		Map_GPR_32bit(Opcode.rt, false, -1);
 		MoveZxByteX86regPointerToX86reg(TempReg1, TempReg2,GetMipsRegMapLo(Opcode.rt));
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		XorConstToX86Reg(TempReg1,3);
-		Map_GPR_32bit(Opcode.rt,FALSE,-1);
+		Map_GPR_32bit(Opcode.rt, false, -1);
 		MoveZxN64MemToX86regByte(GetMipsRegMapLo(Opcode.rt), TempReg1);
 	}
 }
 
-void CMipsMemoryVM::Compile_LH (void)
+void CMipsMemoryVM::Compile_LH()
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2;
@@ -2815,93 +3641,122 @@ void CMipsMemoryVM::Compile_LH (void)
 
 	if (Opcode.rt == 0) return;
 
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 2;
-		Map_GPR_32bit(Opcode.rt,TRUE,-1);
-		Compile_LH(GetMipsRegMapLo(Opcode.rt),Address,TRUE);
+		Map_GPR_32bit(Opcode.rt, true, -1);
+		Compile_LH(GetMipsRegMapLo(Opcode.rt), Address, true);
 		return;
 	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-	if (IsMapped(Opcode.base)) { 
+	if (IsMapped(Opcode.rt))
+	{
+		ProtectGPR(Opcode.rt);
+	}
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 		}
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		}
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 	}
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		CompileReadTLBMiss(TempReg1,TempReg2);
-		XorConstToX86Reg(TempReg1,2);	
-		Map_GPR_32bit(Opcode.rt,TRUE,-1);
+		XorConstToX86Reg(TempReg1,2);
+		Map_GPR_32bit(Opcode.rt, true, -1);
 		MoveSxHalfX86regPointerToX86reg(TempReg1, TempReg2,GetMipsRegMapLo(Opcode.rt));
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		XorConstToX86Reg(TempReg1,2);
-		Map_GPR_32bit(Opcode.rt,TRUE,-1);
+		Map_GPR_32bit(Opcode.rt, true, -1);
 		MoveSxN64MemToX86regHalf(GetMipsRegMapLo(Opcode.rt), TempReg1);
 	}
 }
 
-void CMipsMemoryVM::Compile_LHU (void) 
+void CMipsMemoryVM::Compile_LHU() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
-	if (Opcode.rt == 0) return;
-
-	if (IsConst(Opcode.base)) { 
-		DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 2;
-		Map_GPR_32bit(Opcode.rt,FALSE,-1);
-		Compile_LH(GetMipsRegMapLo(Opcode.rt),Address,FALSE);
+	if (Opcode.rt == 0)
+	{
 		return;
 	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-	if (IsMapped(Opcode.base)) { 
+
+	if (IsConst(Opcode.base))
+	{ 
+		DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 2;
+		Map_GPR_32bit(Opcode.rt, false, -1);
+		Compile_LH(GetMipsRegMapLo(Opcode.rt), Address, false);
+		return;
+	}
+	if (IsMapped(Opcode.rt))
+	{
+		ProtectGPR(Opcode.rt);
+	}
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 		}
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		}
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 	}
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		CompileReadTLBMiss(TempReg1,TempReg2);
-		XorConstToX86Reg(TempReg1,2);	
-		Map_GPR_32bit(Opcode.rt,FALSE,-1);
+		XorConstToX86Reg(TempReg1,2);
+		Map_GPR_32bit(Opcode.rt, false, -1);
 		MoveZxHalfX86regPointerToX86reg(TempReg1, TempReg2,GetMipsRegMapLo(Opcode.rt));
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		XorConstToX86Reg(TempReg1,2);
-		Map_GPR_32bit(Opcode.rt,TRUE,-1);
+		Map_GPR_32bit(Opcode.rt, true, -1);
 		MoveZxN64MemToX86regHalf(GetMipsRegMapLo(Opcode.rt), TempReg1);
 	}
 }
 
-void CMipsMemoryVM::Compile_LW (void) 
+void CMipsMemoryVM::Compile_LW() 
 {
 	Compile_LW(true,false);
 }
 
-void CMipsMemoryVM::Compile_LL (void) 
+void CMipsMemoryVM::Compile_LL() 
 {
 	Compile_LW(true,true);
 }
@@ -2914,7 +3769,8 @@ void CMipsMemoryVM::Compile_LW (bool ResultSigned, bool bRecordLLBit)
 	if (Opcode.rt == 0) return;
 
 	x86Reg TempReg1, TempReg2;
-	if (Opcode.base == 29 && g_System->bFastSP()) {
+	if (Opcode.base == 29 && g_System->bFastSP())
+	{
 		char String[100];
 
 		Map_GPR_32bit(Opcode.rt,ResultSigned,-1);
@@ -2925,8 +3781,11 @@ void CMipsMemoryVM::Compile_LW (bool ResultSigned, bool bRecordLLBit)
 		{
 			g_Notify->BreakPoint(__FILEW__,__LINE__);
 		}
-	} else {
-		if (IsConst(Opcode.base)) { 
+	}
+	else
+	{
+		if (IsConst(Opcode.base))
+		{ 
 			DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 			Map_GPR_32bit(Opcode.rt,ResultSigned,-1);
 			Compile_LW(GetMipsRegMapLo(Opcode.rt),Address);
@@ -2934,27 +3793,41 @@ void CMipsMemoryVM::Compile_LW (bool ResultSigned, bool bRecordLLBit)
 			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__);
 			}
-		} else {
-			if (g_System->bUseTlb()) {	
-				if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-				if (IsMapped(Opcode.base) && Opcode.offset == 0) { 
+		}
+		else
+		{
+			if (g_System->bUseTlb())
+			{	
+				if (IsMapped(Opcode.rt))
+				{
+					ProtectGPR(Opcode.rt);
+				}
+				if (IsMapped(Opcode.base) && Opcode.offset == 0)
+				{ 
 					ProtectGPR(Opcode.base);
 					TempReg1 = GetMipsRegMapLo(Opcode.base);
-				} else {
-					if (IsMapped(Opcode.base)) { 
+				}
+				else
+				{
+					if (IsMapped(Opcode.base))
+					{ 
 						ProtectGPR(Opcode.base);
 						if (Opcode.offset != 0) {
-							TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+							TempReg1 = Map_TempReg(x86_Any, -1, false);
 							LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-						} else {
-							TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 						}
-					} else {
-						TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+						else
+						{
+							TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+						}
+					}
+					else
+					{
+						TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 						AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 					}
 				}
-				TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+				TempReg2 = Map_TempReg(x86_Any, -1, false);
 				MoveX86RegToX86Reg(TempReg1, TempReg2);
 				ShiftRightUnsignImmed(TempReg2,12);
 				MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
@@ -2965,16 +3838,24 @@ void CMipsMemoryVM::Compile_LW (bool ResultSigned, bool bRecordLLBit)
 				{
 					MoveConstToVariable(1,_LLBit,"LLBit");
 				}
-			} else {
-				if (IsMapped(Opcode.base)) { 
+			}
+			else
+			{
+				if (IsMapped(Opcode.base))
+				{ 
 					ProtectGPR(Opcode.base);
-					if (Opcode.offset != 0) {
+					if (Opcode.offset != 0)
+					{
 						Map_GPR_32bit(Opcode.rt,ResultSigned,-1);
 						LeaSourceAndOffset(GetMipsRegMapLo(Opcode.rt),GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-					} else {
+					}
+					else
+					{
 						Map_GPR_32bit(Opcode.rt,ResultSigned,Opcode.base);
 					}
-				} else {
+				}
+				else
+				{
 					Map_GPR_32bit(Opcode.rt,ResultSigned,Opcode.base);
 					AddConstToX86Reg(GetMipsRegMapLo(Opcode.rt),(short)Opcode.immediate);
 				}
@@ -2994,7 +3875,7 @@ void CMipsMemoryVM::Compile_LW (bool ResultSigned, bool bRecordLLBit)
 	}
 }
 
-void CMipsMemoryVM::Compile_LWC1 (void) 
+void CMipsMemoryVM::Compile_LWC1() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2, TempReg3;
@@ -3003,69 +3884,98 @@ void CMipsMemoryVM::Compile_LWC1 (void)
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
 	m_Section->CompileCop1Test();
-	if ((Opcode.ft & 1) != 0) {
-		if (RegInStack(Opcode.ft-1,CRegInfo::FPU_Double) || RegInStack(Opcode.ft-1,CRegInfo::FPU_Qword)) {
-			UnMap_FPR(Opcode.ft-1,TRUE);
+	if ((Opcode.ft & 1) != 0)
+	{
+		if (RegInStack(Opcode.ft-1,CRegInfo::FPU_Double) || RegInStack(Opcode.ft-1,CRegInfo::FPU_Qword))
+		{
+			UnMap_FPR(Opcode.ft - 1, true);
 		}
 	}
-	if (RegInStack(Opcode.ft,CRegInfo::FPU_Double) || RegInStack(Opcode.ft,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(Opcode.ft,TRUE);
-	} else {
-		UnMap_FPR(Opcode.ft,FALSE);
+	if (RegInStack(Opcode.ft,CRegInfo::FPU_Double) || RegInStack(Opcode.ft,CRegInfo::FPU_Qword))
+	{
+		UnMap_FPR(Opcode.ft, true);
 	}
-	if (IsConst(Opcode.base)) { 
+	else
+	{
+		UnMap_FPR(Opcode.ft, false);
+	}
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 
-		TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg1 = Map_TempReg(x86_Any, -1, false);
 		Compile_LW(TempReg1,Address);
 
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_S[%d]",Opcode.ft);
 		MoveVariableToX86reg(&_FPR_S[Opcode.ft],Name,TempReg2);
 		MoveX86regToX86Pointer(TempReg1,TempReg2);
 		return;
 	}
-	if (IsMapped(Opcode.base) && Opcode.offset == 0) { 
-		if (g_System->bUseTlb()) {
+	if (IsMapped(Opcode.base) && Opcode.offset == 0)
+	{ 
+		if (g_System->bUseTlb())
+		{
 			ProtectGPR(Opcode.base);
 			TempReg1 = GetMipsRegMapLo(Opcode.base);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 		}
-	} else {
-		if (IsMapped(Opcode.base)) { 
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		}
+	}
+	else
+	{
+		if (IsMapped(Opcode.base))
+		{ 
 			ProtectGPR(Opcode.base);
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+			if (Opcode.offset != 0)
+			{
+				TempReg1 = Map_TempReg(x86_Any, -1, false);
 				LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+			}
+			else
+			{
+				TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 			}
 			UnProtectGPR(Opcode.base);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
-			if (Opcode.immediate == 0) { 
-			} else if (Opcode.immediate == 1) {
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+			if (Opcode.immediate == 0)
+			{
+				
+			}
+			else if (Opcode.immediate == 1)
+			{
 				IncX86reg(TempReg1);
-			} else if (Opcode.immediate == 0xFFFF) {			
+			}
+			else if (Opcode.immediate == 0xFFFF)
+			{
 				DecX86reg(TempReg1);
-			} else {
+			}
+			else
+			{
 				AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 			}
 		}
 	}
-	TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
-	if (g_System->bUseTlb()) {
+	TempReg2 = Map_TempReg(x86_Any, -1, false);
+	if (g_System->bUseTlb())
+	{
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		CompileReadTLBMiss(TempReg1,TempReg2);
 		
-		TempReg3 = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg3 = Map_TempReg(x86_Any, -1, false);
 		MoveX86regPointerToX86reg(TempReg1, TempReg2,TempReg3);
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
-		TempReg3 = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg3 = Map_TempReg(x86_Any, -1, false);
 		MoveN64MemToX86reg(TempReg3,TempReg1);
 	}
 	sprintf(Name,"_FPR_S[%d]",Opcode.ft);
@@ -3073,21 +3983,25 @@ void CMipsMemoryVM::Compile_LWC1 (void)
 	MoveX86regToX86Pointer(TempReg3,TempReg2);
 }
 
-void CMipsMemoryVM::Compile_LWL (void) 
+void CMipsMemoryVM::Compile_LWL() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1 = x86_Unknown, TempReg2 = x86_Unknown, OffsetReg = x86_Unknown, shift = x86_Unknown;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
-	if (Opcode.rt == 0) return;
+	if (Opcode.rt == 0)
+	{
+		return;
+	}
 
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 		DWORD Offset  = Address & 3;
 
-		Map_GPR_32bit(Opcode.rt,TRUE,Opcode.rt);
-		x86Reg Value = Map_TempReg(x86_Any,-1,FALSE);
+		Map_GPR_32bit(Opcode.rt, true, Opcode.rt);
+		x86Reg Value = Map_TempReg(x86_Any, -1, false);
 		Compile_LW(Value,(Address & ~3));
 		AndConstToX86Reg(GetMipsRegMapLo(Opcode.rt),LWL_MASK[Offset]);
 		ShiftLeftSignImmed(Value,(BYTE)LWL_SHIFT[Offset]);
@@ -3095,40 +4009,53 @@ void CMipsMemoryVM::Compile_LWL (void)
 		return;
 	}
 
-	shift = Map_TempReg(x86_ECX,-1,FALSE);
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-	if (IsMapped(Opcode.base)) { 
+	shift = Map_TempReg(x86_ECX, -1, false);
+	if (IsMapped(Opcode.rt))
+	{
+		ProtectGPR(Opcode.rt);
+	}
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		}
 		UnProtectGPR(Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 	}
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		
 		CompileReadTLBMiss(TempReg1,TempReg2);
 	}
-	OffsetReg = Map_TempReg(x86_Any,-1,FALSE);
+	OffsetReg = Map_TempReg(x86_Any, -1, false);
 	MoveX86RegToX86Reg(TempReg1, OffsetReg);
 	AndConstToX86Reg(OffsetReg,3);
 	AndConstToX86Reg(TempReg1,(DWORD)~3);
 
-	Map_GPR_32bit(Opcode.rt,TRUE,Opcode.rt);
+	Map_GPR_32bit(Opcode.rt, true, Opcode.rt);
 	AndVariableDispToX86Reg((void *)LWL_MASK,"LWL_MASK",GetMipsRegMapLo(Opcode.rt),OffsetReg,Multip_x4);
 	MoveVariableDispToX86Reg((void *)LWL_SHIFT,"LWL_SHIFT",shift,OffsetReg,4);
-	if (g_System->bUseTlb()) {			
+	if (g_System->bUseTlb())
+	{
 		MoveX86regPointerToX86reg(TempReg1, TempReg2,TempReg1);
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		MoveN64MemToX86reg(TempReg1,TempReg1);
 	}
@@ -3136,21 +4063,25 @@ void CMipsMemoryVM::Compile_LWL (void)
 	AddX86RegToX86Reg(GetMipsRegMapLo(Opcode.rt),TempReg1);
 }
 
-void CMipsMemoryVM::Compile_LWR (void) 
+void CMipsMemoryVM::Compile_LWR() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1 = x86_Unknown, TempReg2 = x86_Unknown, OffsetReg = x86_Unknown, shift = x86_Unknown;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
-	if (Opcode.rt == 0) return;
+	if (Opcode.rt == 0)
+	{
+		return;
+	}
 
-	if (IsConst(Opcode.base)) { 		
+	if (IsConst(Opcode.base))
+	{ 		
 		DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 		DWORD Offset  = Address & 3;
 
-		Map_GPR_32bit(Opcode.rt,TRUE,Opcode.rt);
-		x86Reg Value = Map_TempReg(x86_Any,-1,FALSE);
+		Map_GPR_32bit(Opcode.rt, true, Opcode.rt);
+		x86Reg Value = Map_TempReg(x86_Any, -1, false);
 		Compile_LW(Value,(Address & ~3));
 		AndConstToX86Reg(GetMipsRegMapLo(Opcode.rt),LWR_MASK[Offset]);
 		ShiftRightUnsignImmed(Value,(BYTE)LWR_SHIFT[Offset]);
@@ -3158,41 +4089,54 @@ void CMipsMemoryVM::Compile_LWR (void)
 		return;
 	}
 
-	shift = Map_TempReg(x86_ECX,-1,FALSE);
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-	if (IsMapped(Opcode.base)) { 
+	shift = Map_TempReg(x86_ECX, -1, false);
+	if (IsMapped(Opcode.rt))
+	{
+		ProtectGPR(Opcode.rt);
+	}
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		}
 		UnProtectGPR(Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 	}
 	
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		
 		CompileReadTLBMiss(TempReg1,TempReg2);
 	}
-	OffsetReg = Map_TempReg(x86_Any,-1,FALSE);
+	OffsetReg = Map_TempReg(x86_Any, -1, false);
 	MoveX86RegToX86Reg(TempReg1, OffsetReg);
 	AndConstToX86Reg(OffsetReg,3);
 	AndConstToX86Reg(TempReg1,(DWORD)~3);
 
-	Map_GPR_32bit(Opcode.rt,TRUE,Opcode.rt);
+	Map_GPR_32bit(Opcode.rt, true, Opcode.rt);
 	AndVariableDispToX86Reg((void *)LWR_MASK,"LWR_MASK",GetMipsRegMapLo(Opcode.rt),OffsetReg,Multip_x4);
 	MoveVariableDispToX86Reg((void *)LWR_SHIFT,"LWR_SHIFT",shift,OffsetReg,4);
-	if (g_System->bUseTlb()) {
+	if (g_System->bUseTlb())
+	{
 		MoveX86regPointerToX86reg(TempReg1, TempReg2,TempReg1);
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		MoveN64MemToX86reg(TempReg1,TempReg1);
 	}
@@ -3200,21 +4144,25 @@ void CMipsMemoryVM::Compile_LWR (void)
 	AddX86RegToX86Reg(GetMipsRegMapLo(Opcode.rt),TempReg1);
 }
 
-void CMipsMemoryVM::Compile_LWU (void)
+void CMipsMemoryVM::Compile_LWU()
 {
 	Compile_LW(false,false);
 }
 
-void CMipsMemoryVM::Compile_LD (void) 
+void CMipsMemoryVM::Compile_LD() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
-	if (Opcode.rt == 0) return;
+	if (Opcode.rt == 0)
+	{
+		return;
+	}
 	
 	x86Reg TempReg1, TempReg2;
 
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 		Map_GPR_64bit(Opcode.rt,-1);
 		Compile_LW(GetMipsRegMapHi(Opcode.rt),Address);
@@ -3225,30 +4173,46 @@ void CMipsMemoryVM::Compile_LD (void)
 		}
 		return;
 	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-	if (IsMapped(Opcode.base) && Opcode.offset == 0) { 
-		if (g_System->bUseTlb()) {
+	if (IsMapped(Opcode.rt))
+	{
+		ProtectGPR(Opcode.rt);
+	}
+	if (IsMapped(Opcode.base) && Opcode.offset == 0)
+	{ 
+		if (g_System->bUseTlb())
+		{
 			ProtectGPR(Opcode.base);
 			TempReg1 = GetMipsRegMapLo(Opcode.base);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 		}
-	} else {
-		if (IsMapped(Opcode.base)) { 
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		}
+	}
+	else
+	{
+		if (IsMapped(Opcode.base))
+		{ 
 			ProtectGPR(Opcode.base);
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+			if (Opcode.offset != 0)
+			{
+				TempReg1 = Map_TempReg(x86_Any, -1, false);
 				LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 			}
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+			else
+			{
+				TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+			}
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any,Opcode.base,false);
 			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 		}
 	}
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
@@ -3256,7 +4220,9 @@ void CMipsMemoryVM::Compile_LD (void)
 		Map_GPR_64bit(Opcode.rt,-1);
 		MoveX86regPointerToX86reg(TempReg1, TempReg2,GetMipsRegMapHi(Opcode.rt));
 		MoveX86regPointerToX86regDisp8(TempReg1, TempReg2,GetMipsRegMapLo(Opcode.rt),4);
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		Map_GPR_64bit(Opcode.rt,-1);
 		MoveN64MemToX86reg(GetMipsRegMapHi(Opcode.rt),TempReg1);
@@ -3269,7 +4235,7 @@ void CMipsMemoryVM::Compile_LD (void)
 	}
 }
 
-void CMipsMemoryVM::Compile_LDC1 (void) 
+void CMipsMemoryVM::Compile_LDC1() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2, TempReg3;
@@ -3279,13 +4245,14 @@ void CMipsMemoryVM::Compile_LDC1 (void)
 
 	m_Section->CompileCop1Test();
 
-	UnMap_FPR(Opcode.ft,FALSE);
-	if (IsConst(Opcode.base)) { 
+	UnMap_FPR(Opcode.ft, false);
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
-		TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg1 = Map_TempReg(x86_Any, -1, false);
 		Compile_LW(TempReg1,Address);
 
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_D[%d]",Opcode.ft);
 		MoveVariableToX86reg(&_FPR_D[Opcode.ft],Name,TempReg2);
 		AddConstToX86Reg(TempReg2,4);
@@ -3297,42 +4264,63 @@ void CMipsMemoryVM::Compile_LDC1 (void)
 		MoveX86regToX86Pointer(TempReg1,TempReg2);
 		return;
 	}
-	if (IsMapped(Opcode.base) && Opcode.offset == 0) { 
-		if (g_System->bUseTlb()) {
+	if (IsMapped(Opcode.base) && Opcode.offset == 0)
+	{ 
+		if (g_System->bUseTlb())
+		{
 			ProtectGPR(Opcode.base);
 			TempReg1 = GetMipsRegMapLo(Opcode.base);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 		}
-	} else {
-		if (IsMapped(Opcode.base)) { 
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		}
+	}
+	else
+	{
+		if (IsMapped(Opcode.base))
+		{ 
 			ProtectGPR(Opcode.base);
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+			if (Opcode.offset != 0)
+			{
+				TempReg1 = Map_TempReg(x86_Any, -1, false);
 				LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 			}
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
-			if (Opcode.immediate == 0) { 
-			} else if (Opcode.immediate == 1) {
+			else
+			{
+				TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+			}
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+			if (Opcode.immediate == 0)
+			{
+				
+			}
+			else if (Opcode.immediate == 1)
+			{
 				IncX86reg(TempReg1);
-			} else if (Opcode.immediate == 0xFFFF) {			
+			}
+			else if (Opcode.immediate == 0xFFFF)
+			{			
 				DecX86reg(TempReg1);
-			} else {
+			}
+			else
+			{
 				AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 			}
 		}
 	}
 
-	TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
-	if (g_System->bUseTlb()) {
+	TempReg2 = Map_TempReg(x86_Any, -1, false);
+	if (g_System->bUseTlb())
+	{
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		CompileReadTLBMiss(TempReg1,TempReg2);
-		TempReg3 = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg3 = Map_TempReg(x86_Any, -1, false);
 		MoveX86regPointerToX86reg(TempReg1, TempReg2,TempReg3);
 		Push(TempReg2);
 		sprintf(Name,"_FPR_S[%d]",Opcode.ft);
@@ -3344,9 +4332,11 @@ void CMipsMemoryVM::Compile_LDC1 (void)
 		sprintf(Name,"_FPR_S[%d]",Opcode.ft);
 		MoveVariableToX86reg(&_FPR_D[Opcode.ft],Name,TempReg2);
 		MoveX86regToX86Pointer(TempReg3,TempReg2);
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
-		TempReg3 = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg3 = Map_TempReg(x86_Any, -1, false);
 		MoveN64MemToX86reg(TempReg3,TempReg1);
 
 		sprintf(Name,"_FPR_S[%d]",Opcode.ft);
@@ -3361,161 +4351,242 @@ void CMipsMemoryVM::Compile_LDC1 (void)
 	}
 }
 
-void CMipsMemoryVM::Compile_LDL (void) 
+void CMipsMemoryVM::Compile_LDL() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
-	if (Opcode.base != 0) { UnMap_GPR(Opcode.base,TRUE); }
-	if (Opcode.rt != 0) { UnMap_GPR(Opcode.rt,TRUE); }
+
+	if (Opcode.base != 0)
+	{
+		UnMap_GPR(Opcode.base, true);
+	}
+
+	if (Opcode.rt != 0)
+	{
+		UnMap_GPR(Opcode.rt, true);
+	}
+
 	BeforeCallDirect(m_RegWorkingSet);
 	MoveConstToVariable(Opcode.Hex, &R4300iOp::m_Opcode.Hex, "R4300iOp::m_Opcode.Hex");
 	Call_Direct(R4300iOp::LDL, "R4300iOp::LDL");
 	AfterCallDirect(m_RegWorkingSet);
 }
 
-void CMipsMemoryVM::Compile_LDR (void) 
+void CMipsMemoryVM::Compile_LDR() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
-	if (Opcode.base != 0) { UnMap_GPR(Opcode.base,TRUE); }
-	if (Opcode.rt != 0) { UnMap_GPR(Opcode.rt,TRUE); }
+
+	if (Opcode.base != 0)
+	{
+		UnMap_GPR(Opcode.base, true);
+	}
+
+	if (Opcode.rt != 0)
+	{
+		UnMap_GPR(Opcode.rt, true);
+	}
+
 	BeforeCallDirect(m_RegWorkingSet);
 	MoveConstToVariable(Opcode.Hex, &R4300iOp::m_Opcode.Hex, "R4300iOp::m_Opcode.Hex");
 	Call_Direct(R4300iOp::LDR, "R4300iOp::LDR");
 	AfterCallDirect(m_RegWorkingSet);
 }
 
-void CMipsMemoryVM::Compile_SB (void)
+void CMipsMemoryVM::Compile_SB()
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 	
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 3;
 		
-		if (IsConst(Opcode.rt)) {
+		if (IsConst(Opcode.rt))
+		{
 			Compile_SB_Const((BYTE)(GetMipsRegLo(Opcode.rt) & 0xFF), Address);
-		} else if (IsMapped(Opcode.rt) && Is8BitReg(GetMipsRegMapLo(Opcode.rt))) {
-			Compile_SB_Register(GetMipsRegMapLo(Opcode.rt), Address);
-		} else {
-			Compile_SB_Register(Map_TempReg(x86_Any8Bit,Opcode.rt,FALSE), Address);
 		}
+		else if (IsMapped(Opcode.rt) && Is8BitReg(GetMipsRegMapLo(Opcode.rt)))
+		{
+			Compile_SB_Register(GetMipsRegMapLo(Opcode.rt), Address);
+		}
+		else
+		{
+			Compile_SB_Register(Map_TempReg(x86_Any8Bit, Opcode.rt, false), Address);
+		}
+
 		return;
 	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-	if (IsMapped(Opcode.base)) { 
+
+	if (IsMapped(Opcode.rt))
+	{
+		ProtectGPR(Opcode.rt);
+	}
+
+	if (IsMapped(Opcode.base))
+	{
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		}
 		UnProtectGPR(Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 	}
 	Compile_StoreInstructClean(TempReg1,4);
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_WriteMap,"m_TLB_WriteMap",TempReg2,TempReg2,4);
 		CompileWriteTLBMiss(TempReg1,TempReg2);
-		XorConstToX86Reg(TempReg1,3);	
-		if (IsConst(Opcode.rt)) {
+		XorConstToX86Reg(TempReg1,3);
+		if (IsConst(Opcode.rt))
+		{
 			MoveConstByteToX86regPointer((BYTE)(GetMipsRegLo(Opcode.rt) & 0xFF),TempReg1, TempReg2);
-		} else if (IsMapped(Opcode.rt) && Is8BitReg(GetMipsRegMapLo(Opcode.rt))) {
-			MoveX86regByteToX86regPointer(GetMipsRegMapLo(Opcode.rt),TempReg1, TempReg2);
-		} else {	
-			UnProtectGPR(Opcode.rt);
-			MoveX86regByteToX86regPointer(Map_TempReg(x86_Any8Bit,Opcode.rt,FALSE),TempReg1, TempReg2);
 		}
-	} else {
+		else if (IsMapped(Opcode.rt) && Is8BitReg(GetMipsRegMapLo(Opcode.rt)))
+		{
+			MoveX86regByteToX86regPointer(GetMipsRegMapLo(Opcode.rt),TempReg1, TempReg2);
+		}
+		else
+		{
+			UnProtectGPR(Opcode.rt);
+			MoveX86regByteToX86regPointer(Map_TempReg(x86_Any8Bit, Opcode.rt, false), TempReg1, TempReg2);
+		}
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		XorConstToX86Reg(TempReg1,3);
-		if (IsConst(Opcode.rt)) {
+		if (IsConst(Opcode.rt))
+		{
 			MoveConstByteToN64Mem((BYTE)(GetMipsRegLo(Opcode.rt) & 0xFF),TempReg1);
-		} else if (IsMapped(Opcode.rt) && Is8BitReg(GetMipsRegMapLo(Opcode.rt))) {
+		}
+		else if (IsMapped(Opcode.rt) && Is8BitReg(GetMipsRegMapLo(Opcode.rt)))
+		{
 			MoveX86regByteToN64Mem(GetMipsRegMapLo(Opcode.rt),TempReg1);
-		} else {	
+		}
+		else
+		{
 			UnProtectGPR(Opcode.rt);
-			MoveX86regByteToN64Mem(Map_TempReg(x86_Any8Bit,Opcode.rt,FALSE),TempReg1);
+			MoveX86regByteToN64Mem(Map_TempReg(x86_Any8Bit, Opcode.rt, false), TempReg1);
 		}
 	}
 }
 
-void CMipsMemoryVM::Compile_SH (void)
+void CMipsMemoryVM::Compile_SH()
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 	
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset) ^ 2;
 		
-		if (IsConst(Opcode.rt)) {
+		if (IsConst(Opcode.rt))
+		{
 			Compile_SH_Const((WORD)(GetMipsRegLo(Opcode.rt) & 0xFFFF), Address);
-		} else if (IsMapped(Opcode.rt)) {
-			Compile_SH_Register(GetMipsRegMapLo(Opcode.rt), Address);
-		} else {
-			Compile_SH_Register(Map_TempReg(x86_Any,Opcode.rt,FALSE), Address);
 		}
+		else if (IsMapped(Opcode.rt))
+		{
+			Compile_SH_Register(GetMipsRegMapLo(Opcode.rt), Address);
+		}
+		else
+		{
+			Compile_SH_Register(Map_TempReg(x86_Any, Opcode.rt, false), Address);
+		}
+
 		return;
 	}
-	if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-	if (IsMapped(Opcode.base)) { 
+
+	if (IsMapped(Opcode.rt))
+	{
+		ProtectGPR(Opcode.rt);
+	}
+
+	if (IsMapped(Opcode.base))
+	{
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		}
 		UnProtectGPR(Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 	}
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_WriteMap,"m_TLB_WriteMap",TempReg2,TempReg2,4);
 		CompileWriteTLBMiss(TempReg1,TempReg2);
-		XorConstToX86Reg(TempReg1,2);	
-		if (IsConst(Opcode.rt)) {
-			MoveConstHalfToX86regPointer((WORD)(GetMipsRegLo(Opcode.rt) & 0xFFFF),TempReg1, TempReg2);
-		} else if (IsMapped(Opcode.rt)) {
-			MoveX86regHalfToX86regPointer(GetMipsRegMapLo(Opcode.rt),TempReg1, TempReg2);
-		} else {	
-			MoveX86regHalfToX86regPointer(Map_TempReg(x86_Any,Opcode.rt,FALSE),TempReg1, TempReg2);
-		}
-	} else {
-		AndConstToX86Reg(TempReg1,0x1FFFFFFF);		
 		XorConstToX86Reg(TempReg1,2);
-		if (IsConst(Opcode.rt)) {
+		if (IsConst(Opcode.rt))
+		{
+			MoveConstHalfToX86regPointer((WORD)(GetMipsRegLo(Opcode.rt) & 0xFFFF),TempReg1, TempReg2);
+		}
+		else if (IsMapped(Opcode.rt))
+		{
+			MoveX86regHalfToX86regPointer(GetMipsRegMapLo(Opcode.rt),TempReg1, TempReg2);
+		}
+		else
+		{	
+			MoveX86regHalfToX86regPointer(Map_TempReg(x86_Any, Opcode.rt, false), TempReg1, TempReg2);
+		}
+	}
+	else
+	{
+		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
+		XorConstToX86Reg(TempReg1,2);
+		if (IsConst(Opcode.rt))
+		{
 			MoveConstHalfToN64Mem((WORD)(GetMipsRegLo(Opcode.rt) & 0xFFFF),TempReg1);
-		} else if (IsMapped(Opcode.rt)) {
-			MoveX86regHalfToN64Mem(GetMipsRegMapLo(Opcode.rt),TempReg1);		
-		} else {	
-			MoveX86regHalfToN64Mem(Map_TempReg(x86_Any,Opcode.rt,FALSE),TempReg1);		
+		}
+		else if (IsMapped(Opcode.rt))
+		{
+			MoveX86regHalfToN64Mem(GetMipsRegMapLo(Opcode.rt),TempReg1);
+		}
+		else
+		{	
+			MoveX86regHalfToN64Mem(Map_TempReg(x86_Any, Opcode.rt, false), TempReg1);
 		}
 	}
 }
 
-void CMipsMemoryVM::Compile_SW (void)
+void CMipsMemoryVM::Compile_SW()
 {
 	Compile_SW(false);
 }
 
-void CMipsMemoryVM::Compile_SC (void)
+void CMipsMemoryVM::Compile_SC()
 {
 	Compile_SW(true);
 }
@@ -3526,41 +4597,63 @@ void CMipsMemoryVM::Compile_SW (bool bCheckLLbit)
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 	
 	x86Reg TempReg1, TempReg2;
-	if (Opcode.base == 29 && g_System->bFastSP()) {
+	if (Opcode.base == 29 && g_System->bFastSP())
+	{
 		if (bCheckLLbit)
 		{
 			g_Notify->BreakPoint(__FILEW__,__LINE__);
 		}
-		if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-		TempReg1 = Map_MemoryStack(x86_Any,true);
+		if (IsMapped(Opcode.rt))
+		{
+			ProtectGPR(Opcode.rt);
+		}
+		TempReg1 = Map_MemoryStack(x86_Any, true);
 
-		if (IsConst(Opcode.rt)) {
+		if (IsConst(Opcode.rt))
+		{
 			MoveConstToMemoryDisp (GetMipsRegLo(Opcode.rt),TempReg1, (DWORD)((short)Opcode.offset));
-		} else if (IsMapped(Opcode.rt)) {
+		}
+		else if (IsMapped(Opcode.rt))
+		{
 			MoveX86regToMemory(GetMipsRegMapLo(Opcode.rt),TempReg1,(DWORD)((short)Opcode.offset));
-		} else {	
-			TempReg2 = Map_TempReg(x86_Any,Opcode.rt,FALSE);
+		}
+		else
+		{
+			TempReg2 = Map_TempReg(x86_Any, Opcode.rt, false);
 			MoveX86regToMemory(TempReg2,TempReg1,(DWORD)((short)Opcode.offset));
-		}		
-	} else {
-		if (IsConst(Opcode.base)) { 
+		}
+	}
+	else
+	{
+		if (IsConst(Opcode.base))
+		{ 
 			DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 			
 			if (bCheckLLbit)
 			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__);
 			}
-			if (IsConst(Opcode.rt)) {
+			if (IsConst(Opcode.rt))
+			{
 				Compile_SW_Const(GetMipsRegLo(Opcode.rt), Address);
-			} else if (IsMapped(Opcode.rt)) {
-				Compile_SW_Register(GetMipsRegMapLo(Opcode.rt), Address);
-			} else {
-				Compile_SW_Register(Map_TempReg(x86_Any,Opcode.rt,FALSE), Address);
 			}
+			else if (IsMapped(Opcode.rt))
+			{
+				Compile_SW_Register(GetMipsRegMapLo(Opcode.rt), Address);
+			}
+			else
+			{
+				Compile_SW_Register(Map_TempReg(x86_Any, Opcode.rt, false), Address);
+			}
+
 			return;
 		}
-		if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-		if (IsMapped(Opcode.base)) { 
+
+		if (IsMapped(Opcode.rt))
+			ProtectGPR(Opcode.rt);
+
+		if (IsMapped(Opcode.base))
+		{ 
 			ProtectGPR(Opcode.base);
 			if (g_System->bDelaySI() || g_System->bDelayDP())
 			{
@@ -3568,20 +4661,26 @@ void CMipsMemoryVM::Compile_SW (bool bCheckLLbit)
 				UpdateCounters(m_RegWorkingSet,false, true);
 				m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
 			}
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+			if (Opcode.offset != 0)
+			{
+				TempReg1 = Map_TempReg(x86_Any, -1, false);
 				LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+			}
+			else
+			{
+				TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 			}
 			UnProtectGPR(Opcode.base);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 		}
 		Compile_StoreInstructClean(TempReg1,4);
-		if (g_System->bUseTlb()) {
-			TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		if (g_System->bUseTlb())
+		{
+			TempReg2 = Map_TempReg(x86_Any, -1, false);
 			MoveX86RegToX86Reg(TempReg1, TempReg2);
 			ShiftRightUnsignImmed(TempReg2,12);
 			MoveVariableDispToX86Reg(m_TLB_WriteMap,"m_TLB_WriteMap",TempReg2,TempReg2,4);
@@ -3593,12 +4692,16 @@ void CMipsMemoryVM::Compile_SW (bool bCheckLLbit)
 				JneLabel8("LLBit_Continue",0);
 				Jump = m_RecompPos - 1;
 			}
-			if (IsConst(Opcode.rt)) {
+			if (IsConst(Opcode.rt))
+			{
 				MoveConstToX86regPointer(GetMipsRegLo(Opcode.rt),TempReg1, TempReg2);
-			} else if (IsMapped(Opcode.rt)) {
+			} else if (IsMapped(Opcode.rt))
+			{
 				MoveX86regToX86regPointer(GetMipsRegMapLo(Opcode.rt),TempReg1, TempReg2);
-			} else {	
-				MoveX86regToX86regPointer(Map_TempReg(x86_Any,Opcode.rt,FALSE),TempReg1, TempReg2);
+			}
+			else
+			{	
+				MoveX86regToX86regPointer(Map_TempReg(x86_Any, Opcode.rt, false), TempReg1, TempReg2);
 			}
 			if (bCheckLLbit)
 			{
@@ -3608,24 +4711,31 @@ void CMipsMemoryVM::Compile_SW (bool bCheckLLbit)
 				Map_GPR_32bit(Opcode.rt,false,-1);
 				MoveVariableToX86reg(_LLBit,"_LLBit",GetMipsRegMapLo(Opcode.rt));
 			}
-		} else {
+		}
+		else
+		{
 			if (bCheckLLbit)
 			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__);
 			}
 			AndConstToX86Reg(TempReg1,0x1FFFFFFF);
-			if (IsConst(Opcode.rt)) {
+			if (IsConst(Opcode.rt))
+			{
 				MoveConstToN64Mem(GetMipsRegLo(Opcode.rt),TempReg1);
-			} else if (IsMapped(Opcode.rt)) {
+			}
+			else if (IsMapped(Opcode.rt))
+			{
 				MoveX86regToN64Mem(GetMipsRegMapLo(Opcode.rt),TempReg1);
-			} else {	
-				MoveX86regToN64Mem(Map_TempReg(x86_Any,Opcode.rt,FALSE),TempReg1);
+			}
+			else
+			{	
+				MoveX86regToN64Mem(Map_TempReg(x86_Any, Opcode.rt, false), TempReg1);
 			}
 		}
 	}
 }
 
-void CMipsMemoryVM::Compile_SWC1 (void)
+void CMipsMemoryVM::Compile_SWC1()
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2, TempReg3;
@@ -3635,11 +4745,12 @@ void CMipsMemoryVM::Compile_SWC1 (void)
 
 	m_Section->CompileCop1Test();
 	
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 		
-		UnMap_FPR(Opcode.ft,TRUE);
-		TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		UnMap_FPR(Opcode.ft, true);
+		TempReg1 = Map_TempReg(x86_Any, -1, false);
 
 		sprintf(Name,"_FPR_S[%d]",Opcode.ft);
 		MoveVariableToX86reg(&_FPR_S[Opcode.ft],Name,TempReg1);
@@ -3647,41 +4758,58 @@ void CMipsMemoryVM::Compile_SWC1 (void)
 		Compile_SW_Register(TempReg1, Address);
 		return;
 	}
-	if (IsMapped(Opcode.base)) { 
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 		}
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
-		if (Opcode.immediate == 0) { 
-		} else if (Opcode.immediate == 1) {
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		}
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		if (Opcode.immediate == 0)
+		{
+			
+		}
+		else if (Opcode.immediate == 1)
+		{
 			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {			
+		}
+		else if (Opcode.immediate == 0xFFFF)
+		{
 			DecX86reg(TempReg1);
-		} else {
+		}
+		else
+		{
 			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 		}
 	}
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_WriteMap,"m_TLB_WriteMap",TempReg2,TempReg2,4);
 		CompileWriteTLBMiss(TempReg1,TempReg2);
 
-		UnMap_FPR(Opcode.ft,TRUE);
-		TempReg3 = Map_TempReg(x86_Any,-1,FALSE);
+		UnMap_FPR(Opcode.ft, true);
+		TempReg3 = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_S[%d]",Opcode.ft);
 		MoveVariableToX86reg(&_FPR_S[Opcode.ft],Name,TempReg3);
 		MoveX86PointerToX86reg(TempReg3,TempReg3);
 		MoveX86regToX86regPointer(TempReg3,TempReg1, TempReg2);
-	} else {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
-		UnMap_FPR(Opcode.ft,TRUE);
+	}
+	else
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
+		UnMap_FPR(Opcode.ft, true);
 		sprintf(Name,"_FPR_S[%d]",Opcode.ft);
 		MoveVariableToX86reg(&_FPR_S[Opcode.ft],Name,TempReg2);
 		MoveX86PointerToX86reg(TempReg2,TempReg2);
@@ -3690,7 +4818,7 @@ void CMipsMemoryVM::Compile_SWC1 (void)
 	}
 }
 
-void CMipsMemoryVM::Compile_SWL (void) 
+void CMipsMemoryVM::Compile_SWL() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1 = x86_Unknown, TempReg2 = x86_Unknown, Value = x86_Unknown, 
@@ -3698,82 +4826,102 @@ void CMipsMemoryVM::Compile_SWL (void)
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address;
 	
 		Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 		DWORD Offset  = Address & 3;
 		
-		Value = Map_TempReg(x86_Any,-1,FALSE);
+		Value = Map_TempReg(x86_Any, -1, false);
 		Compile_LW(Value,(Address & ~3));
 		AndConstToX86Reg(Value,R4300iOp::SWL_MASK[Offset]);
-		TempReg1 = Map_TempReg(x86_Any,Opcode.rt,FALSE);
-		ShiftRightUnsignImmed(TempReg1,(BYTE)SWL_SHIFT[Offset]);		
-		AddX86RegToX86Reg(Value,TempReg1);		
+		TempReg1 = Map_TempReg(x86_Any, Opcode.rt, false);
+		ShiftRightUnsignImmed(TempReg1,(BYTE)SWL_SHIFT[Offset]);
+		AddX86RegToX86Reg(Value,TempReg1);
 		Compile_SW_Register(Value, (Address & ~3));
 		return;
 	}
-	shift = Map_TempReg(x86_ECX,-1,FALSE);
-	if (IsMapped(Opcode.base)) { 
+	shift = Map_TempReg(x86_ECX, -1, false);
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		}
 		UnProtectGPR(Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-	}		
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	}
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		CompileReadTLBMiss(TempReg1,TempReg2);
 	}
 	
-	OffsetReg = Map_TempReg(x86_Any,-1,FALSE);
+	OffsetReg = Map_TempReg(x86_Any, -1, false);
 	MoveX86RegToX86Reg(TempReg1, OffsetReg);
 	AndConstToX86Reg(OffsetReg,3);
 	AndConstToX86Reg(TempReg1,(DWORD)~3);
 
-	Value = Map_TempReg(x86_Any,-1,FALSE);
-	if (g_System->bUseTlb()) {	
+	Value = Map_TempReg(x86_Any, -1, false);
+	if (g_System->bUseTlb())
+	{
 		MoveX86regPointerToX86reg(TempReg1, TempReg2,Value);
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		MoveN64MemToX86reg(Value,TempReg1);
 	}
 
 	AndVariableDispToX86Reg((void *)SWL_MASK,"SWL_MASK",Value,OffsetReg,Multip_x4);
-	if (!IsConst(Opcode.rt) || GetMipsRegLo(Opcode.rt) != 0) {
+	if (!IsConst(Opcode.rt) || GetMipsRegLo(Opcode.rt) != 0)
+	{
 		MoveVariableDispToX86Reg((void *)SWL_SHIFT,"SWL_SHIFT",shift,OffsetReg,4);
-		if (IsConst(Opcode.rt)) {
+		if (IsConst(Opcode.rt))
+		{
 			MoveConstToX86reg(GetMipsRegLo(Opcode.rt),OffsetReg);
-		} else if (IsMapped(Opcode.rt)) {
+		}
+		else if (IsMapped(Opcode.rt))
+		{
 			MoveX86RegToX86Reg(GetMipsRegMapLo(Opcode.rt),OffsetReg);
-		} else {
+		}
+		else
+		{
 			MoveVariableToX86reg(&_GPR[Opcode.rt].UW[0],CRegName::GPR_Lo[Opcode.rt],OffsetReg);
 		}
 		ShiftRightUnsign(OffsetReg);
 		AddX86RegToX86Reg(Value,OffsetReg);
 	}
 
-	if (g_System->bUseTlb()) {
+	if (g_System->bUseTlb())
+	{
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_WriteMap,"m_TLB_WriteMap",TempReg2,TempReg2,4);
 
 		MoveX86regToX86regPointer(Value,TempReg1, TempReg2);
-	} else {
+	}
+	else
+	{
 		MoveX86regToN64Mem(Value,TempReg1);
 	}
 }
 
-void CMipsMemoryVM::Compile_SWR (void) 
+void CMipsMemoryVM::Compile_SWR() 
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1 = x86_Unknown, TempReg2 = x86_Unknown, Value = x86_Unknown, 
@@ -3781,75 +4929,95 @@ void CMipsMemoryVM::Compile_SWR (void)
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 		DWORD Offset  = Address & 3;
 		
-		Value = Map_TempReg(x86_Any,-1,FALSE);
+		Value = Map_TempReg(x86_Any, -1, false);
 		Compile_LW(Value,(Address & ~3));
 		AndConstToX86Reg(Value,SWR_MASK[Offset]);
-		TempReg1 = Map_TempReg(x86_Any,Opcode.rt,FALSE);
-		ShiftLeftSignImmed(TempReg1,(BYTE)SWR_SHIFT[Offset]);		
-		AddX86RegToX86Reg(Value,TempReg1);		
+		TempReg1 = Map_TempReg(x86_Any, Opcode.rt, false);
+		ShiftLeftSignImmed(TempReg1,(BYTE)SWR_SHIFT[Offset]);
+		AddX86RegToX86Reg(Value,TempReg1);
 		Compile_SW_Register(Value, (Address & ~3));
 		return;
 	}
-	shift = Map_TempReg(x86_ECX,-1,FALSE);
-	if (IsMapped(Opcode.base)) { 
+	shift = Map_TempReg(x86_ECX, -1, false);
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		}
 		UnProtectGPR(Opcode.base);
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 		AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
-	}		
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	}
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
 		CompileReadTLBMiss(TempReg1,TempReg2);
 	}
 	
-	OffsetReg = Map_TempReg(x86_Any,-1,FALSE);
+	OffsetReg = Map_TempReg(x86_Any, -1, false);
 	MoveX86RegToX86Reg(TempReg1, OffsetReg);
 	AndConstToX86Reg(OffsetReg,3);
 	AndConstToX86Reg(TempReg1,(DWORD)~3);
 
-	Value = Map_TempReg(x86_Any,-1,FALSE);
-	if (g_System->bUseTlb()) {
+	Value = Map_TempReg(x86_Any, -1, false);
+	if (g_System->bUseTlb())
+	{
 		MoveX86regPointerToX86reg(TempReg1, TempReg2,Value);
-	} else {
+	}
+	else
+	{
 		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
 		MoveN64MemToX86reg(Value,TempReg1);
 	}
 
 	AndVariableDispToX86Reg((void *)SWR_MASK,"SWR_MASK",Value,OffsetReg,Multip_x4);
-	if (!IsConst(Opcode.rt) || GetMipsRegLo(Opcode.rt) != 0) {
+	if (!IsConst(Opcode.rt) || GetMipsRegLo(Opcode.rt) != 0)
+	{
 		MoveVariableDispToX86Reg((void *)SWR_SHIFT,"SWR_SHIFT",shift,OffsetReg,4);
-		if (IsConst(Opcode.rt)) {
+		if (IsConst(Opcode.rt))
+		{
 			MoveConstToX86reg(GetMipsRegLo(Opcode.rt),OffsetReg);
-		} else if (IsMapped(Opcode.rt)) {
+		}
+		else if (IsMapped(Opcode.rt))
+		{
 			MoveX86RegToX86Reg(GetMipsRegMapLo(Opcode.rt),OffsetReg);
-		} else {
+		}
+		else
+		{
 			MoveVariableToX86reg(&_GPR[Opcode.rt].UW[0],CRegName::GPR_Lo[Opcode.rt],OffsetReg);
 		}
 		ShiftLeftSign(OffsetReg);
 		AddX86RegToX86Reg(Value,OffsetReg);
 	}
 
-	if (g_System->bUseTlb()) {
+	if (g_System->bUseTlb())
+	{
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_WriteMap,"m_TLB_WriteMap",TempReg2,TempReg2,4);
 
 		MoveX86regToX86regPointer(Value,TempReg1, TempReg2);
-	} else {
+	}
+	else
+	{
 		MoveX86regToN64Mem(Value,TempReg1);
 	}
 }
@@ -3866,7 +5034,7 @@ void CMipsMemoryVM::Compile_StoreInstructClean (x86Reg AddressReg, int Length )
 	stdstr_f strLen("%d",Length);
 	UnMap_AllFPRs();
 	
-	/*x86Reg StoreTemp1 = Map_TempReg(x86_Any,-1,FALSE);
+	/*x86Reg StoreTemp1 = Map_TempReg(x86_Any,-1,false);
 	MoveX86RegToX86Reg(AddressReg, StoreTemp1);
  	AndConstToX86Reg(StoreTemp1,0xFFC);*/		
 	BeforeCallDirect(m_RegWorkingSet);
@@ -3906,104 +5074,150 @@ void CMipsMemoryVM::Compile_StoreInstructClean (x86Reg AddressReg, int Length )
 	X86Protected(StoreTemp1) = false;*/
 }
 
-void CMipsMemoryVM::Compile_SD (void)
+void CMipsMemoryVM::Compile_SD()
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
 
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{ 
 		DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
 		
-		if (IsConst(Opcode.rt)) {
+		if (IsConst(Opcode.rt))
+		{
 			Compile_SW_Const(Is64Bit(Opcode.rt) ? GetMipsRegHi(Opcode.rt) : (GetMipsRegLo_S(Opcode.rt) >> 31), Address);
 			Compile_SW_Const(GetMipsRegLo(Opcode.rt), Address + 4);
-		} else if (IsMapped(Opcode.rt)) {
-			Compile_SW_Register(Is64Bit(Opcode.rt) ? GetMipsRegMapHi(Opcode.rt) : Map_TempReg(x86_Any,Opcode.rt,TRUE), Address);
-			Compile_SW_Register(GetMipsRegMapLo(Opcode.rt), Address + 4);		
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.rt,TRUE);
-			Compile_SW_Register(TempReg1, Address);
-			Compile_SW_Register(Map_TempReg(TempReg1,Opcode.rt,FALSE), Address + 4);		
 		}
-	} else {
-		if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
-		if (IsMapped(Opcode.base)) { 
+		else if (IsMapped(Opcode.rt))
+		{
+			Compile_SW_Register(Is64Bit(Opcode.rt) ? GetMipsRegMapHi(Opcode.rt) : Map_TempReg(x86_Any, Opcode.rt, true), Address);
+			Compile_SW_Register(GetMipsRegMapLo(Opcode.rt), Address + 4);
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.rt, true);
+			Compile_SW_Register(TempReg1, Address);
+			Compile_SW_Register(Map_TempReg(TempReg1,Opcode.rt,false), Address + 4);
+		}
+	}
+	else
+	{
+		if (IsMapped(Opcode.rt))
+		{
+			ProtectGPR(Opcode.rt);
+		}
+		if (IsMapped(Opcode.base))
+		{ 
 			ProtectGPR(Opcode.base);
-			if (Opcode.offset != 0) {
-				TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+			if (Opcode.offset != 0)
+			{
+				TempReg1 = Map_TempReg(x86_Any, -1, false);
 				LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-			} else {
-				TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+			}
+			else
+			{
+				TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 			}
 			UnProtectGPR(Opcode.base);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
+		}
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
 			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 		}
 		
 		Compile_StoreInstructClean(TempReg1,8);
 		
-		if (g_System->bUseTlb()) {
-			TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+		if (g_System->bUseTlb())
+		{
+			TempReg2 = Map_TempReg(x86_Any, -1, false);
 			MoveX86RegToX86Reg(TempReg1, TempReg2);
 			ShiftRightUnsignImmed(TempReg2,12);
 			MoveVariableDispToX86Reg(m_TLB_WriteMap,"m_TLB_WriteMap",TempReg2,TempReg2,4);
 			CompileWriteTLBMiss(TempReg1,TempReg2);
 
-			if (IsConst(Opcode.rt)) {
-				if (Is64Bit(Opcode.rt)) {
+			if (IsConst(Opcode.rt))
+			{
+				if (Is64Bit(Opcode.rt))
+				{
 					MoveConstToX86regPointer(GetMipsRegHi(Opcode.rt),TempReg1, TempReg2);
-				} else {
+				}
+				else
+				{
 					MoveConstToX86regPointer((GetMipsRegLo_S(Opcode.rt) >> 31),TempReg1, TempReg2);
 				}
 				AddConstToX86Reg(TempReg1,4);
 				MoveConstToX86regPointer(GetMipsRegLo(Opcode.rt),TempReg1, TempReg2);
-			} else if (IsMapped(Opcode.rt)) {
-				if (Is64Bit(Opcode.rt)) {
+			}
+			else if (IsMapped(Opcode.rt))
+			{
+				if (Is64Bit(Opcode.rt))
+				{
 					MoveX86regToX86regPointer(GetMipsRegMapHi(Opcode.rt),TempReg1, TempReg2);
-				} else {
-					MoveX86regToX86regPointer(Map_TempReg(x86_Any,Opcode.rt,TRUE),TempReg1, TempReg2);
+				}
+				else
+				{
+					MoveX86regToX86regPointer(Map_TempReg(x86_Any, Opcode.rt, true), TempReg1, TempReg2);
 				}
 				AddConstToX86Reg(TempReg1,4);
 				MoveX86regToX86regPointer(GetMipsRegMapLo(Opcode.rt),TempReg1, TempReg2);
-			} else {	
-				x86Reg Reg = Map_TempReg(x86_Any,Opcode.rt,TRUE);
+			}
+			else
+			{	
+				x86Reg Reg = Map_TempReg(x86_Any, Opcode.rt, true);
 				MoveX86regToX86regPointer(Reg,TempReg1, TempReg2);
 				AddConstToX86Reg(TempReg1,4);
-				MoveX86regToX86regPointer(Map_TempReg(Reg,Opcode.rt,FALSE),TempReg1, TempReg2);
+				MoveX86regToX86regPointer(Map_TempReg(Reg, Opcode.rt, false), TempReg1, TempReg2);
 			}
-		} else {
-			AndConstToX86Reg(TempReg1,0x1FFFFFFF);		
-			if (IsConst(Opcode.rt)) {
-				if (Is64Bit(Opcode.rt)) {
+		}
+		else
+		{
+			AndConstToX86Reg(TempReg1,0x1FFFFFFF);
+			if (IsConst(Opcode.rt))
+			{
+				if (Is64Bit(Opcode.rt))
+				{
 					MoveConstToN64Mem(GetMipsRegHi(Opcode.rt),TempReg1);
-				} else if (IsSigned(Opcode.rt)) {
+				}
+				else if (IsSigned(Opcode.rt))
+				{
 					MoveConstToN64Mem((GetMipsRegLo_S(Opcode.rt) >> 31),TempReg1);
-				} else {
+				}
+				else
+				{
 					MoveConstToN64Mem(0,TempReg1);
 				}
 				MoveConstToN64MemDisp(GetMipsRegLo(Opcode.rt),TempReg1,4);
-			} else if (IsKnown(Opcode.rt) && IsMapped(Opcode.rt)) {
-				if (Is64Bit(Opcode.rt)) {
+			}
+			else if (IsKnown(Opcode.rt) && IsMapped(Opcode.rt))
+			{
+				if (Is64Bit(Opcode.rt))
+				{
 					MoveX86regToN64Mem(GetMipsRegMapHi(Opcode.rt),TempReg1);
-				} else if (IsSigned(Opcode.rt)) {
-					MoveX86regToN64Mem(Map_TempReg(x86_Any,Opcode.rt,TRUE), TempReg1);
-				} else {
+				}
+				else if (IsSigned(Opcode.rt))
+				{
+					MoveX86regToN64Mem(Map_TempReg(x86_Any, Opcode.rt, true), TempReg1);
+				}
+				else
+				{
 					MoveConstToN64Mem(0,TempReg1);
 				}
-				MoveX86regToN64MemDisp(GetMipsRegMapLo(Opcode.rt),TempReg1, 4);		
-			} else {	
+				MoveX86regToN64MemDisp(GetMipsRegMapLo(Opcode.rt),TempReg1, 4);
+			}
+			else
+			{	
 				x86Reg Reg;
-				MoveX86regToN64Mem(Reg = Map_TempReg(x86_Any,Opcode.rt,TRUE), TempReg1);
-				MoveX86regToN64MemDisp(Map_TempReg(Reg,Opcode.rt,FALSE), TempReg1,4);
+				MoveX86regToN64Mem(Reg = Map_TempReg(x86_Any, Opcode.rt, true), TempReg1);
+				MoveX86regToN64MemDisp(Map_TempReg(Reg, Opcode.rt, false), TempReg1, 4);
 			}
 		}
 	}
 }
 
-void CMipsMemoryVM::Compile_SDC1 (void)
+void CMipsMemoryVM::Compile_SDC1()
 {
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 	x86Reg TempReg1, TempReg2, TempReg3;
@@ -4013,10 +5227,11 @@ void CMipsMemoryVM::Compile_SDC1 (void)
 
 	m_Section->CompileCop1Test();
 	
-	if (IsConst(Opcode.base)) { 
+	if (IsConst(Opcode.base))
+	{
 		DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
-		
-		TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+
+		TempReg1 = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_D[%d]",Opcode.ft);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[Opcode.ft],Name,TempReg1);
 		AddConstToX86Reg(TempReg1,4);
@@ -4026,80 +5241,117 @@ void CMipsMemoryVM::Compile_SDC1 (void)
 		sprintf(Name,"_FPR_D[%d]",Opcode.ft);
 		MoveVariableToX86reg(&_FPR_D[Opcode.ft],Name,TempReg1);
 		MoveX86PointerToX86reg(TempReg1,TempReg1);
-		Compile_SW_Register(TempReg1, Address + 4);		
+		Compile_SW_Register(TempReg1, Address + 4);
 		return;
 	}
-	if (IsMapped(Opcode.base)) { 
+	if (IsMapped(Opcode.base))
+	{ 
 		ProtectGPR(Opcode.base);
-		if (Opcode.offset != 0) {
-			TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
+		if (Opcode.offset != 0)
+		{
+			TempReg1 = Map_TempReg(x86_Any, -1, false);
 			LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
-		} else {
-			TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
 		}
-	} else {
-		TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
-		if (Opcode.immediate == 0) { 
-		} else if (Opcode.immediate == 1) {
+		else
+		{
+			TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		}
+	}
+	else
+	{
+		TempReg1 = Map_TempReg(x86_Any, Opcode.base, false);
+		if (Opcode.immediate == 0)
+		{ 
+			
+		}
+		else if (Opcode.immediate == 1)
+		{
 			IncX86reg(TempReg1);
-		} else if (Opcode.immediate == 0xFFFF) {			
+		}
+		else if (Opcode.immediate == 0xFFFF)
+		{			
 			DecX86reg(TempReg1);
-		} else {
+		}
+		else
+		{
 			AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
 		}
 	}
-	if (g_System->bUseTlb()) {
-		TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
+	if (g_System->bUseTlb())
+	{
+		TempReg2 = Map_TempReg(x86_Any, -1, false);
 		MoveX86RegToX86Reg(TempReg1, TempReg2);
 		ShiftRightUnsignImmed(TempReg2,12);
 		MoveVariableDispToX86Reg(m_TLB_WriteMap,"m_TLB_WriteMap",TempReg2,TempReg2,4);
 		CompileWriteTLBMiss(TempReg1,TempReg2);
 
-		TempReg3 = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg3 = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_D[%d]",Opcode.ft);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[Opcode.ft],Name,TempReg3);
 		AddConstToX86Reg(TempReg3,4);
-		MoveX86PointerToX86reg(TempReg3,TempReg3);		
+		MoveX86PointerToX86reg(TempReg3,TempReg3);
 		MoveX86regToX86regPointer(TempReg3,TempReg1, TempReg2);
 		AddConstToX86Reg(TempReg1,4);
 
 		sprintf(Name,"_FPR_D[%d]",Opcode.ft);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[Opcode.ft],Name,TempReg3);
-		MoveX86PointerToX86reg(TempReg3,TempReg3);		
+		MoveX86PointerToX86reg(TempReg3,TempReg3);
 		MoveX86regToX86regPointer(TempReg3,TempReg1, TempReg2);
-	} else {
-		AndConstToX86Reg(TempReg1,0x1FFFFFFF);		
-		TempReg3 = Map_TempReg(x86_Any,-1,FALSE);
+	}
+	else
+	{
+		AndConstToX86Reg(TempReg1,0x1FFFFFFF);
+		TempReg3 = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_D[%d]",Opcode.ft);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[Opcode.ft],Name,TempReg3);
 		AddConstToX86Reg(TempReg3,4);
-		MoveX86PointerToX86reg(TempReg3,TempReg3);		
+		MoveX86PointerToX86reg(TempReg3,TempReg3);
 		MoveX86regToN64Mem(TempReg3, TempReg1);
 		sprintf(Name,"_FPR_D[%d]",Opcode.ft);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[Opcode.ft],Name,TempReg3);
-		MoveX86PointerToX86reg(TempReg3,TempReg3);		
+		MoveX86PointerToX86reg(TempReg3,TempReg3);
 		MoveX86regToN64MemDisp(TempReg3, TempReg1,4);
 	}
 }
 
-void CMipsMemoryVM::Compile_SDL (void) {
+void CMipsMemoryVM::Compile_SDL()
+{
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
-	if (Opcode.base != 0) { UnMap_GPR(Opcode.base,TRUE); }
-	if (Opcode.rt != 0) { UnMap_GPR(Opcode.rt,TRUE); }
+
+	if (Opcode.base != 0)
+	{
+		UnMap_GPR(Opcode.base, true);
+	}
+
+	if (Opcode.rt != 0)
+	{
+		UnMap_GPR(Opcode.rt, true);
+	}
+
 	BeforeCallDirect(m_RegWorkingSet);
 	MoveConstToVariable(Opcode.Hex, &R4300iOp::m_Opcode.Hex, "R4300iOp::m_Opcode.Hex");
 	Call_Direct(R4300iOp::SDL, "R4300iOp::SDL");
 	AfterCallDirect(m_RegWorkingSet);
 }
 
-void CMipsMemoryVM::Compile_SDR (void) {
+void CMipsMemoryVM::Compile_SDR()
+{
 	OPCODE & Opcode = CRecompilerOps::m_Opcode;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
-	if (Opcode.base != 0) { UnMap_GPR(Opcode.base,TRUE); }
-	if (Opcode.rt != 0) { UnMap_GPR(Opcode.rt,TRUE); }
+
+	if (Opcode.base != 0)
+	{
+		UnMap_GPR(Opcode.base, true);
+	}
+
+	if (Opcode.rt != 0)
+	{
+		UnMap_GPR(Opcode.rt, true);
+	}
+
 	BeforeCallDirect(m_RegWorkingSet);
 	MoveConstToVariable(Opcode.Hex, &R4300iOp::m_Opcode.Hex, "R4300iOp::m_Opcode.Hex");
 	Call_Direct(R4300iOp::SDR, "R4300iOp::SDR");
@@ -4109,31 +5361,39 @@ void CMipsMemoryVM::Compile_SDR (void) {
 LPCTSTR CMipsMemoryVM::LabelName ( DWORD Address ) const
 {
 	//StringMap::iterator theIterator = m_LabelList.find(Address);
-	//if (theIterator != m_LabelList.end()) {
+	//if (theIterator != m_LabelList.end())
+	//{
 	//	return (*theIterator).second;
 	//}
 	
-	sprintf(m_strLabelName,"0x%08X",Address);		
+	sprintf(m_strLabelName,"0x%08X",Address);
 	return m_strLabelName;
 }
 
 void CMipsMemoryVM::TLB_Mapped( DWORD VAddr, DWORD Len, DWORD PAddr, bool bReadOnly )
 {
-	for (DWORD count = VAddr, VEnd = VAddr + Len; count < VEnd; count += 0x1000) {
-		DWORD Index = count >> 12;
-		m_TLB_ReadMap[Index] = ((DWORD)m_RDRAM + (count - VAddr + PAddr)) - count;
+	size_t count, VEnd;
+
+	VEnd = VAddr + Len;
+	for (count = VAddr; count < VEnd; count += 0x1000)
+	{
+		size_t Index = count >> 12;
+		m_TLB_ReadMap[Index] = ((size_t)m_RDRAM + (count - VAddr + PAddr)) - count;
 		if (!bReadOnly) 
 		{
-			m_TLB_WriteMap[Index] = ((DWORD)m_RDRAM + (count - VAddr + PAddr)) - count;
+			m_TLB_WriteMap[Index] = ((size_t)m_RDRAM + (count - VAddr + PAddr)) - count;
 		}
 	}
 }
 
 void CMipsMemoryVM::TLB_Unmaped( DWORD Vaddr, DWORD Len )
 {
-	for (DWORD count = Vaddr, End = Vaddr + Len; count < End; count += 0x1000) 
+	size_t count, End;
+
+	End = Vaddr + Len;
+	for (count = Vaddr; count < End; count += 0x1000)
 	{
-		DWORD Index = count >> 12;
+		size_t Index = count >> 12;
 		m_TLB_ReadMap[Index] = NULL;
 		m_TLB_WriteMap[Index] = NULL;
 	}
@@ -4141,35 +5401,69 @@ void CMipsMemoryVM::TLB_Unmaped( DWORD Vaddr, DWORD Len )
 
 void CMipsMemoryVM::RdramChanged ( CMipsMemoryVM * _this )
 {
-	if (_this->m_AllocatedRdramSize == g_Settings->LoadDword(Game_RDRamSize))
+	const size_t new_size = g_Settings -> LoadDword(Game_RDRamSize);
+	const size_t old_size = _this -> m_AllocatedRdramSize;
+
+	if (old_size == new_size)
 	{
 		return;
 	}
-	if (_this->m_AllocatedRdramSize == 0x400000) { 
-		if (VirtualAlloc(_this->m_RDRAM + 0x400000, 0x400000, MEM_COMMIT, PAGE_READWRITE)==NULL)
+	if (old_size > new_size)
+	{
+		VirtualFree(
+			_this->m_RDRAM + new_size,
+			old_size - new_size,
+			MEM_DECOMMIT
+		);
+	}
+	else
+	{
+		void * result;
+
+		result = VirtualAlloc(
+			_this->m_RDRAM + old_size,
+			new_size - old_size,
+			MEM_COMMIT,
+			PAGE_READWRITE
+		);
+		if (result == NULL)
 		{
-			WriteTrace(TraceError,__FUNCTION__ ": failed to allocate extended memory");
-			g_Notify->FatalError(GS(MSG_MEM_ALLOC_ERROR));
+			WriteTrace(TraceError, __FUNCTION__":  failed to allocate extended memory");
+			g_Notify -> FatalError(GS(MSG_MEM_ALLOC_ERROR));
 		}
-		_this->m_AllocatedRdramSize = 0x800000;
-	} else {
-		VirtualFree(_this->m_RDRAM + 0x400000, 0x400000,MEM_DECOMMIT);
-		_this->m_AllocatedRdramSize = 0x400000;
 	}
 
+	if (new_size > 0xFFFFFFFFul)
+	{ // should be unreachable because:  size_t new_size = g_Settings->(DWORD)
+		g_Notify -> BreakPoint(__FILEW__, __LINE__);
+	} // ...However, FFFFFFFF also is a limit to RCP addressing, so we care.
+	_this->m_AllocatedRdramSize = (uint32_t)new_size;
 }
 
-void CMipsMemoryVM::ChangeSpStatus (void)
+void CMipsMemoryVM::ChangeSpStatus()
 {
-	if ( ( RegModValue & SP_CLR_HALT ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_HALT; }
-	if ( ( RegModValue & SP_SET_HALT ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_HALT;  }
-	if ( ( RegModValue & SP_CLR_BROKE ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_BROKE; }
-	if ( ( RegModValue & SP_CLR_INTR ) != 0) { 
+	if ( ( RegModValue & SP_CLR_HALT ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_HALT;
+	}
+	if ( ( RegModValue & SP_SET_HALT ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_HALT;
+	}
+	if ( ( RegModValue & SP_CLR_BROKE ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_BROKE;
+	}
+	if ( ( RegModValue & SP_CLR_INTR ) != 0)
+	{ 
 		g_Reg->MI_INTR_REG &= ~MI_INTR_SP; 
 		g_Reg->m_RspIntrReg &= ~MI_INTR_SP;
 		g_Reg->CheckInterrupts();
 	}
-	if ( ( RegModValue & SP_SET_INTR ) != 0 && bHaveDebugger()) { g_Notify->DisplayError(L"SP_SET_INTR"); }
+	if ( ( RegModValue & SP_SET_INTR ) != 0 && bHaveDebugger())
+	{
+		g_Notify->DisplayError(L"SP_SET_INTR");
+	}
 	if ( ( RegModValue & SP_CLR_SSTEP ) != 0) 
 	{ 
 		g_Reg->SP_STATUS_REG &= ~SP_STATUS_SSTEP; 
@@ -4178,52 +5472,149 @@ void CMipsMemoryVM::ChangeSpStatus (void)
 	{ 
 		g_Reg->SP_STATUS_REG |= SP_STATUS_SSTEP;  
 	}
-	if ( ( RegModValue & SP_CLR_INTR_BREAK ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_INTR_BREAK; }
-	if ( ( RegModValue & SP_SET_INTR_BREAK ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_INTR_BREAK;  }
-	if ( ( RegModValue & SP_CLR_SIG0 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG0; }
-	if ( ( RegModValue & SP_SET_SIG0 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG0;  }
-	if ( ( RegModValue & SP_CLR_SIG1 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG1; }
-	if ( ( RegModValue & SP_SET_SIG1 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG1;  }
-	if ( ( RegModValue & SP_CLR_SIG2 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG2; }
-	if ( ( RegModValue & SP_SET_SIG2 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG2;  }
-	if ( ( RegModValue & SP_CLR_SIG3 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG3; }
-	if ( ( RegModValue & SP_SET_SIG3 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG3;  }
-	if ( ( RegModValue & SP_CLR_SIG4 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG4; }
-	if ( ( RegModValue & SP_SET_SIG4 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG4;  }
-	if ( ( RegModValue & SP_CLR_SIG5 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG5; }
-	if ( ( RegModValue & SP_SET_SIG5 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG5;  }
-	if ( ( RegModValue & SP_CLR_SIG6 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG6; }
-	if ( ( RegModValue & SP_SET_SIG6 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG6;  }
-	if ( ( RegModValue & SP_CLR_SIG7 ) != 0) { g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG7; }
-	if ( ( RegModValue & SP_SET_SIG7 ) != 0) { g_Reg->SP_STATUS_REG |= SP_STATUS_SIG7;  }
+	if ( ( RegModValue & SP_CLR_INTR_BREAK ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_INTR_BREAK;
+	}
+	if ( ( RegModValue & SP_SET_INTR_BREAK ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_INTR_BREAK; 
+	}
+	if ( ( RegModValue & SP_CLR_SIG0 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG0;
+	}
+	if ( ( RegModValue & SP_SET_SIG0 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_SIG0;
+	}
+	if ( ( RegModValue & SP_CLR_SIG1 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG1;
+	}
+	if ( ( RegModValue & SP_SET_SIG1 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_SIG1;
+	}
+	if ( ( RegModValue & SP_CLR_SIG2 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG2;
+	}
+	if ( ( RegModValue & SP_SET_SIG2 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_SIG2;
+	}
+	if ( ( RegModValue & SP_CLR_SIG3 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG3;
+	}
+	if ( ( RegModValue & SP_SET_SIG3 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_SIG3;
+	}
+	if ( ( RegModValue & SP_CLR_SIG4 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG4;
+	}
+	if ( ( RegModValue & SP_SET_SIG4 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_SIG4;
+	}
+	if ( ( RegModValue & SP_CLR_SIG5 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG5;
+	}
+	if ( ( RegModValue & SP_SET_SIG5 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_SIG5;
+	}
+	if ( ( RegModValue & SP_CLR_SIG6 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG6;
+	}
+	if ( ( RegModValue & SP_SET_SIG6 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_SIG6;
+	}
+	if ( ( RegModValue & SP_CLR_SIG7 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG &= ~SP_STATUS_SIG7;
+	}
+	if ( ( RegModValue & SP_SET_SIG7 ) != 0)
+	{
+		g_Reg->SP_STATUS_REG |= SP_STATUS_SIG7;
+	}
 
 	if ( ( RegModValue & SP_SET_SIG0 ) != 0 && g_System->RspAudioSignal())
 	{
 		g_Reg->MI_INTR_REG |= MI_INTR_SP; 
 		g_Reg->CheckInterrupts();				
 	}
-	//if (*( DWORD *)(DMEM + 0xFC0) == 1) {
+	//if (*( DWORD *)(DMEM + 0xFC0) == 1)
+	//{
 	//	ChangeTimer(RspTimer,0x40000);
-	//} else {
-		try {
+	//}
+	//else
+	//{
+		try
+		{
 			g_System->RunRSP();
-		} catch (...) {
+		}
+		catch (...)
+		{
 			g_Notify->BreakPoint(__FILEW__,__LINE__);
 		}
 	//}
 }
 
-void CMipsMemoryVM::ChangeMiIntrMask (void) {
-	if ( ( RegModValue & MI_INTR_MASK_CLR_SP ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_SP; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_SP ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_SP; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_SI ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_SI; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_SI ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_SI; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_AI ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_AI; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_AI ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_AI; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_VI ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_VI; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_VI ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_VI; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_PI ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_PI; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_PI ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_PI; }
-	if ( ( RegModValue & MI_INTR_MASK_CLR_DP ) != 0 ) { g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_DP; }
-	if ( ( RegModValue & MI_INTR_MASK_SET_DP ) != 0 ) { g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_DP; }
+void CMipsMemoryVM::ChangeMiIntrMask()
+{
+	if ( ( RegModValue & MI_INTR_MASK_CLR_SP ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_SP;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_SET_SP ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_SP;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_CLR_SI ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_SI;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_SET_SI ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_SI;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_CLR_AI ) != 0)
+	{
+		g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_AI;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_SET_AI ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_AI;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_CLR_VI ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_VI;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_SET_VI ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_VI;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_CLR_PI ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_PI;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_SET_PI ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_PI;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_CLR_DP ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG &= ~MI_INTR_MASK_DP;
+	}
+	if ( ( RegModValue & MI_INTR_MASK_SET_DP ) != 0 )
+	{
+		g_Reg->MI_INTR_MASK_REG |= MI_INTR_MASK_DP;
+	}
 }
diff --git a/Source/Project64/N64 System/Mips/Memory Virtual Mem.h b/Source/Project64/N64 System/Mips/Memory Virtual Mem.h
index 07aeafe39..53fca048e 100644
--- a/Source/Project64/N64 System/Mips/Memory Virtual Mem.h	
+++ b/Source/Project64/N64 System/Mips/Memory Virtual Mem.h	
@@ -10,6 +10,37 @@
 ****************************************************************************/
 #pragma once
 
+/*
+ * 64-bit Windows exception recovery facilities will expect to interact with
+ * the 64-bit registers of the Intel architecture (e.g., rax instead of eax).
+ *
+ * Attempting to read the 32-bit subsets seems to be erroneous and forbidden.
+ * Refer to "MemoryFilter" in `Memory Virtual Mem.cpp`.
+ */
+#ifdef _WIN64
+#define Eax     Rax
+#define Ebx     Rbx
+#define Ecx     Rcx
+#define Edx     Rdx
+#define Esp     Rsp
+#define Ebp     Rbp
+#define Esi     Rsi
+#define Edi     Rdi
+
+#define Eip     Rip
+#endif
+
+/*
+ * To do:  Have address translation functions here?
+ * `return` either the translated address or the mask to XOR by?
+ *
+ * This will help us gradually be able to port Project64 for big-endian CPUs.
+ * Currently it is written to assume 32-bit little-endian, like so:
+ *
+ * 0xAABBCCDD EEFFGGHH --> 0xDDCCBBAA HHGGFFEE
+ *   GPR bits[63..0]         b1b2b3b4 b5b6b7b8
+ */
+
 class CMipsMemoryVM :
 	public CMipsMemory,
 	public CTransVaddr,
@@ -21,81 +52,80 @@ class CMipsMemoryVM :
 	private CDMA
 {
 public:
-	       CMipsMemoryVM        ( CMipsMemory_CallBack * CallBack, bool SavesReadOnly );
-	      ~CMipsMemoryVM        ( void );
+	CMipsMemoryVM(CMipsMemory_CallBack * CallBack, bool SavesReadOnly);
+	~CMipsMemoryVM();
 	
-	static void ReserveMemory      ( void );
-	static void FreeReservedMemory ( void );
+	static void ReserveMemory();
+	static void FreeReservedMemory();
 
-	BOOL   Initialize   ( void );
+	bool   Initialize   ();
 	void   Reset        ( bool EraseMemory );
 	
-	BYTE * Rdram        ( void );
-	DWORD  RdramSize    ( void );
-	BYTE * Dmem         ( void );
-	BYTE * Imem         ( void );
-	BYTE * PifRam       ( void );
+	BYTE * Rdram        ();
+	DWORD  RdramSize    ();
+	BYTE * Dmem         ();
+	BYTE * Imem         ();
+	BYTE * PifRam       ();
 
-	BOOL  LB_VAddr     ( DWORD VAddr, BYTE & Value );
-	BOOL  LH_VAddr     ( DWORD VAddr, WORD & Value ); 
-	BOOL  LW_VAddr     ( DWORD VAddr, DWORD & Value );
-	BOOL  LD_VAddr     ( DWORD VAddr, QWORD & Value );
+	bool  LB_VAddr     ( DWORD VAddr, BYTE & Value );
+	bool  LH_VAddr     ( DWORD VAddr, WORD & Value ); 
+	bool  LW_VAddr     ( DWORD VAddr, DWORD & Value );
+	bool  LD_VAddr     ( DWORD VAddr, QWORD & Value );
 
-	BOOL  LB_PAddr     ( DWORD PAddr, BYTE & Value );
-	BOOL  LH_PAddr     ( DWORD PAddr, WORD & Value ); 
-	BOOL  LW_PAddr     ( DWORD PAddr, DWORD & Value );
-	BOOL  LD_PAddr     ( DWORD PAddr, QWORD & Value );
+	bool  LB_PAddr     ( DWORD PAddr, BYTE & Value );
+	bool  LH_PAddr     ( DWORD PAddr, WORD & Value ); 
+	bool  LW_PAddr     ( DWORD PAddr, DWORD & Value );
+	bool  LD_PAddr     ( DWORD PAddr, QWORD & Value );
 
-	BOOL  SB_VAddr     ( DWORD VAddr, BYTE Value );
-	BOOL  SH_VAddr     ( DWORD VAddr, WORD Value );
-	BOOL  SW_VAddr     ( DWORD VAddr, DWORD Value );
-	BOOL  SD_VAddr     ( DWORD VAddr, QWORD Value );
+	bool  SB_VAddr     ( DWORD VAddr, BYTE Value );
+	bool  SH_VAddr     ( DWORD VAddr, WORD Value );
+	bool  SW_VAddr     ( DWORD VAddr, DWORD Value );
+	bool  SD_VAddr     ( DWORD VAddr, QWORD Value );
 
-	BOOL  SB_PAddr     ( DWORD PAddr, BYTE Value );
-	BOOL  SH_PAddr     ( DWORD PAddr, WORD Value );
-	BOOL  SW_PAddr     ( DWORD PAddr, DWORD Value );
-	BOOL  SD_PAddr     ( DWORD PAddr, QWORD Value );
+	bool  SB_PAddr     ( DWORD PAddr, BYTE Value );
+	bool  SH_PAddr     ( DWORD PAddr, WORD Value );
+	bool  SW_PAddr     ( DWORD PAddr, DWORD Value );
+	bool  SD_PAddr     ( DWORD PAddr, QWORD Value );
 
-	int   MemoryFilter ( DWORD dwExptCode, void * lpExceptionPointer );
-	void  UpdateFieldSerration (unsigned int interlaced);
+	int   MemoryFilter(DWORD dwExptCode, void * lpExceptionPointer);
+	void  UpdateFieldSerration(unsigned int interlaced);
 	
 	//Protect the Memory from being written to
-	void  ProtectMemory    ( DWORD StartVaddr, DWORD EndVaddr );
-	void  UnProtectMemory  ( DWORD StartVaddr, DWORD EndVaddr );
+	void  ProtectMemory(DWORD StartVaddr, DWORD EndVaddr);
+	void  UnProtectMemory(DWORD StartVaddr, DWORD EndVaddr);
 
 	//Compilation Functions
-	void ResetMemoryStack    ( void );
-	void ResetTLB            ( void );
-	
-	void Compile_LB          ( void );
-	void Compile_LBU         ( void );
-	void Compile_LH          ( void );
-	void Compile_LHU         ( void );
-	void Compile_LW          ( void );
-	void Compile_LL          ( void );
-	void Compile_LWC1        ( void );
-	void Compile_LWU         ( void );
-	void Compile_LWL         ( void );
-	void Compile_LWR         ( void );
-	void Compile_LD          ( void );
-	void Compile_LDC1        ( void );
-	void Compile_LDL         ( void );
-	void Compile_LDR         ( void );
-	void Compile_SB          ( void );
-	void Compile_SH          ( void );
-	void Compile_SW          ( void );
-	void Compile_SWL         ( void );
-	void Compile_SWR         ( void );
-	void Compile_SD          ( void );
-	void Compile_SDL         ( void );
-	void Compile_SDR         ( void );
-	void Compile_SC          ( void );
-	void Compile_SWC1        ( void );
-	void Compile_SDC1        ( void );
+	void ResetMemoryStack();
 
-	void ResetMemoryStack    ( CRegInfo	& RegInfo );
-	void Compile_LB          ( CX86Ops::x86Reg Reg, DWORD Addr, BOOL SignExtend );
-	void Compile_LH          ( CX86Ops::x86Reg Reg, DWORD Addr, BOOL SignExtend );
+	void Compile_LB();
+	void Compile_LBU();
+	void Compile_LH();
+	void Compile_LHU();
+	void Compile_LW();
+	void Compile_LL();
+	void Compile_LWC1();
+	void Compile_LWU();
+	void Compile_LWL();
+	void Compile_LWR();
+	void Compile_LD();
+	void Compile_LDC1();
+	void Compile_LDL();
+	void Compile_LDR();
+	void Compile_SB();
+	void Compile_SH();
+	void Compile_SW();
+	void Compile_SWL();
+	void Compile_SWR();
+	void Compile_SD();
+	void Compile_SDL();
+	void Compile_SDR();
+	void Compile_SC();
+	void Compile_SWC1();
+	void Compile_SDC1();
+
+	void ResetMemoryStack    ( CRegInfo& RegInfo );
+	void Compile_LB          ( CX86Ops::x86Reg Reg, DWORD Addr, bool SignExtend );
+	void Compile_LH          ( CX86Ops::x86Reg Reg, DWORD Addr, bool SignExtend );
 	void Compile_LW          ( CX86Ops::x86Reg Reg, DWORD Addr );
 	void Compile_SB_Const    ( BYTE Value, DWORD Addr );
 	void Compile_SB_Register ( CX86Ops::x86Reg Reg, DWORD Addr );
@@ -106,36 +136,36 @@ public:
 	void Compile_SW_Register ( CX86Ops::x86Reg Reg, DWORD Addr );
 	  
 	//Functions for TLB notification
-	void TLB_Mapped ( DWORD VAddr, DWORD Len, DWORD PAddr, bool bReadOnly );
-	void TLB_Unmaped ( DWORD Vaddr, DWORD Len );
+	void TLB_Mapped(DWORD VAddr, DWORD Len, DWORD PAddr, bool bReadOnly);
+	void TLB_Unmaped(DWORD Vaddr, DWORD Len);
 		  
 	// CTransVaddr interface
-	bool TranslateVaddr ( DWORD VAddr, DWORD &PAddr) const;
-	bool ValidVaddr  ( DWORD VAddr ) const;		  
-	bool VAddrToRealAddr ( DWORD VAddr, void * &RealAddress ) const;
+	bool TranslateVaddr(DWORD VAddr, DWORD &PAddr) const;
+	bool ValidVaddr(DWORD VAddr) const;
+	bool VAddrToRealAddr(DWORD VAddr, void * &RealAddress) const;
 	
 	// Labels
-	LPCTSTR LabelName      ( DWORD Address ) const;
+	LPCTSTR LabelName(DWORD Address) const;
 
 private:
-	CMipsMemoryVM(void);							// Disable default constructor
-	CMipsMemoryVM(const CMipsMemoryVM&);			// Disable copy constructor
-	CMipsMemoryVM& operator=(const CMipsMemoryVM&);	// Disable assignment
+	CMipsMemoryVM();                                // Disable default constructor
+	CMipsMemoryVM(const CMipsMemoryVM&);            // Disable copy constructor
+	CMipsMemoryVM& operator=(const CMipsMemoryVM&); // Disable assignment
 
 	void Compile_LW          ( bool ResultSigned, bool bRecordLLbit );
 	void Compile_SW          ( bool bCheckLLbit );
 
-	static void RdramChanged      ( CMipsMemoryVM * _this );
-	static void ChangeSpStatus    ( void );
-	static void ChangeMiIntrMask  ( void );
+	static void RdramChanged    ( CMipsMemoryVM * _this );
+	static void ChangeSpStatus  ();
+	static void ChangeMiIntrMask();
 
-	int  LB_NonMemory         ( DWORD PAddr, DWORD * Value, BOOL SignExtend );
-	int  LH_NonMemory         ( DWORD PAddr, DWORD * Value, int SignExtend );
-	int  LW_NonMemory         ( DWORD PAddr, DWORD * Value );
+	bool LB_NonMemory         ( DWORD PAddr, DWORD * Value, bool SignExtend );
+	bool LH_NonMemory         ( DWORD PAddr, DWORD * Value, bool SignExtend );
+	bool LW_NonMemory         ( DWORD PAddr, DWORD * Value );
 
-	int  SB_NonMemory         ( DWORD PAddr, BYTE Value );
-	int  SH_NonMemory         ( DWORD PAddr, WORD Value );
-	int  SW_NonMemory         ( DWORD PAddr, DWORD Value );
+	bool SB_NonMemory         ( DWORD PAddr, BYTE Value );
+	bool SH_NonMemory         ( DWORD PAddr, WORD Value );
+	bool SW_NonMemory         ( DWORD PAddr, DWORD Value );
 
 	void Compile_StoreInstructClean (x86Reg AddressReg, int Length );
 
@@ -154,18 +184,18 @@ private:
 	DWORD         m_RomWroteValue;
 
 	//Current Half line
-	void UpdateHalfLine       ( void );
+	void UpdateHalfLine();
 	DWORD         m_HalfLine;
 	DWORD         m_HalfLineCheck;
 	DWORD         m_FieldSerration;
 	DWORD         m_TempValue;
 
-	//Initilizing and reseting information about the memory system
-	void FreeMemory           ( void );
+	//Initializing and resetting information about the memory system
+	void FreeMemory();
 
 	mutable char m_strLabelName[100];
 
 	//BIG look up table to quickly translate the tlb to real mem address
-	DWORD * m_TLB_ReadMap;
-	DWORD * m_TLB_WriteMap;
+	size_t * m_TLB_ReadMap;
+	size_t * m_TLB_WriteMap;
 };
diff --git a/Source/Project64/N64 System/Mips/Mempak.H b/Source/Project64/N64 System/Mips/Mempak.H
index 68b4cae6b..650b466c3 100644
--- a/Source/Project64/N64 System/Mips/Mempak.H	
+++ b/Source/Project64/N64 System/Mips/Mempak.H	
@@ -13,9 +13,9 @@
 class Mempak
 {
 public:
-	static void Close		 ( void );
-	static BYTE CalculateCrc ( BYTE * DataToCrc );
-	static void ReadFrom	 ( int Control, int Address, BYTE * Buffer );
-	static void WriteTo		 ( int Control, int Address, BYTE * Buffer );
+	static void Close();
+	static BYTE CalculateCrc(BYTE * DataToCrc);
+	static void ReadFrom(int Control, BYTE * command);
+	static void WriteTo(int Control, BYTE * command);
 
 };
diff --git a/Source/Project64/N64 System/Mips/Mempak.cpp b/Source/Project64/N64 System/Mips/Mempak.cpp
index 1e793b988..83470cc43 100644
--- a/Source/Project64/N64 System/Mips/Mempak.cpp	
+++ b/Source/Project64/N64 System/Mips/Mempak.cpp	
@@ -12,7 +12,8 @@
 static BYTE Mempaks[4][0x8000];
 HANDLE hMempakFile[4];
 
-void Mempak::Close(void) {
+void Mempak::Close()
+{
 	for (int i = 0; i < 4; i++)
 	{
 		if (hMempakFile[i]) 
@@ -23,15 +24,16 @@ void Mempak::Close(void) {
 	}
 }
 
-void LoadMempak (int Control) {
+void LoadMempak (int Control)
+{
 	CPath FileName;
 	DWORD dwRead;
 	stdstr MempakName;
 	bool bFormatMempak = false;
 
-	MempakName.Format("%s_Cont_%d", g_Settings->LoadString(Game_GameName).c_str(), Control + 1);
+	MempakName.Format("%s_Cont_%d", g_Settings->LoadStringVal(Game_GameName).c_str(), Control + 1);
 
-	FileName.SetDriveDirectory(g_Settings->LoadString(Directory_NativeSave).c_str());
+	FileName.SetDriveDirectory(g_Settings->LoadStringVal(Directory_NativeSave).c_str());
 	FileName.SetName(MempakName.c_str());
 	FileName.SetExtension("mpk");
 	
@@ -41,10 +43,10 @@ void LoadMempak (int Control) {
 
 		if (!FileName.DirectoryExists())
 		{
-			FileName.CreateDirectory();
+			FileName.DirectoryCreate();
 		}
 
-		BYTE Initilize[] = {
+		BYTE Initialize[] = {
 			0x81,0x01,0x02,0x03, 0x04,0x05,0x06,0x07, 0x08,0x09,0x0a,0x0b, 0x0C,0x0D,0x0E,0x0F,
 			0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17, 0x18,0x19,0x1A,0x1B, 0x1C,0x1D,0x1E,0x1F,
 			0xFF,0xFF,0xFF,0xFF, 0x05,0x1A,0x5F,0x13, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,
@@ -64,7 +66,7 @@ void LoadMempak (int Control) {
 			0x00,0x71,0x00,0x03, 0x00,0x03,0x00,0x03, 0x00,0x03,0x00,0x03, 0x00,0x03,0x00,0x03,
 		};
 
-		memcpy(&Mempaks[Control][0], Initilize, 0x110);
+		memcpy(&Mempaks[Control][0], Initialize, 0x110);
 
 		for (int count = 0x110; count < 0x8000; count += 2) 
 		{
@@ -92,21 +94,28 @@ void LoadMempak (int Control) {
 	}
 }
 
-BYTE Mempak::CalculateCrc(BYTE * DataToCrc) {
+BYTE Mempak::CalculateCrc(BYTE * DataToCrc)
+{
 	DWORD Count;
 	DWORD XorTap;
 
 	int Length;
 	BYTE CRC = 0;
 
-	for (Count = 0; Count < 0x21; Count++) {
-		for (Length = 0x80; Length >= 1; Length >>= 1) {
-			XorTap = (CRC & 0x80) ? 0x85 : 0;
+	for (Count = 0; Count < 0x21; Count++)
+	{
+		for (Length = 0x80; Length >= 1; Length >>= 1)
+		{
+			XorTap = (CRC & 0x80) ? 0x85 : 0x00;
 			CRC <<= 1;
-			if (Count == 0x20) {
+			if (Count == 0x20)
+			{
 				CRC &= 0xFF;
-			} else {
-				if ((*DataToCrc & Length) != 0) {
+			}
+			else
+			{
+				if ((*DataToCrc & Length) != 0)
+				{
 					CRC |= 1;
 				}
 			}
@@ -118,33 +127,43 @@ BYTE Mempak::CalculateCrc(BYTE * DataToCrc) {
 	return CRC;
 }
 
-void Mempak::ReadFrom(int Control, int Address, BYTE * Buffer) {
-	if (Address < 0x8000) {
-		if (hMempakFile[Control] == NULL) {
+void Mempak::ReadFrom(int Control, BYTE * command)
+{
+	DWORD address = (command[3] << 8) | (command[4] & 0xE0);
+
+	if (address < 0x8000)
+	{
+		if (hMempakFile[Control] == NULL)
+		{
 			LoadMempak(Control);
 		}
-		memcpy(Buffer, &Mempaks[Control][Address], 0x20);
-	} else {
-		memset(Buffer, 0, 0x20);
+		memcpy(&command[5], &Mempaks[Control][address], 0x20);
+	}
+	else
+	{
+		memset(&command[5], 0x00, 0x20);
 		/* Rumble pack area */
 	}
-
-	Buffer[0x20] = CalculateCrc(Buffer);
 }
 
-void Mempak::WriteTo(int Control, int Address, BYTE * Buffer) {
+void Mempak::WriteTo(int Control, BYTE * command)
+{
 	DWORD dwWritten;
+	DWORD address = (command[3] << 8) | (command[4] & 0xE0);
 
-	if (Address < 0x8000) {
-		if (hMempakFile[Control] == NULL) {
+	if (address < 0x8000)
+	{
+		if (hMempakFile[Control] == NULL)
+		{
 			LoadMempak(Control);
 		}
-		memcpy(&Mempaks[Control][Address], Buffer, 0x20);
+		memcpy(&Mempaks[Control][address], &command[5], 0x20);
 
 		SetFilePointer(hMempakFile[Control], 0,NULL,FILE_BEGIN);
 		WriteFile(hMempakFile[Control], &Mempaks[Control][0], 0x8000, &dwWritten, NULL);
-	} else {
+	}
+	else
+	{
 		/* Rumble pack area */
 	}
-	Buffer[0x20] = CalculateCrc(Buffer);
 }
diff --git a/Source/Project64/N64 System/Mips/OpCode.h b/Source/Project64/N64 System/Mips/OpCode.h
index c46b38455..cc3b0a19d 100644
--- a/Source/Project64/N64 System/Mips/OpCode.h	
+++ b/Source/Project64/N64 System/Mips/OpCode.h	
@@ -10,30 +10,35 @@
 ****************************************************************************/
 #pragma once
 
-typedef union {
+union OPCODE
+{
 	unsigned long Hex;
 	unsigned char Ascii[4];
 	
-	struct {
+	struct
+	{
 		unsigned offset : 16;
 		unsigned rt : 5;
 		unsigned rs : 5;
 		unsigned op : 6;
 	};
 
-	struct {
+	struct
+	{
 		unsigned immediate : 16;
 		unsigned : 5;
 		unsigned base : 5;
 		unsigned : 6;
 	};
 	
-	struct {
+	struct
+	{
 		unsigned target : 26;
 		unsigned : 6;
 	};
 	
-	struct {
+	struct 
+	{
 		unsigned funct : 6;
 		unsigned sa : 5;
 		unsigned rd : 5;
@@ -42,15 +47,16 @@ typedef union {
 		unsigned : 6;
 	};
 
-	struct {
+	struct
+	{
 		unsigned : 6;
 		unsigned fd : 5;
 		unsigned fs : 5;
 		unsigned ft : 5;
 		unsigned fmt : 5;
 		unsigned : 6;
-	};	
-} OPCODE;
+	};
+};
 
 enum R4300iOpCodes
 {
diff --git a/Source/Project64/N64 System/Mips/Pif Ram.cpp b/Source/Project64/N64 System/Mips/Pif Ram.cpp
index ea4d95998..abf709b00 100644
--- a/Source/Project64/N64 System/Mips/Pif Ram.cpp	
+++ b/Source/Project64/N64 System/Mips/Pif Ram.cpp	
@@ -43,11 +43,12 @@ CPifRam::CPifRam( bool SavesReadOnly ) :
 	Reset();
 }
 
-CPifRam::~CPifRam( void )
+CPifRam::~CPifRam()
 {
+	
 }
 
-void CPifRam::Reset ( void )
+void CPifRam::Reset()
 {
 	memset(m_PifRam,0,sizeof(m_PifRam));
 	memset(m_PifRom,0,sizeof(m_PifRom));
@@ -66,22 +67,27 @@ void CPifRam::n64_cic_nus_6105(char challenge[], char respone[], int length)
 	char key, *lut;
 	int i, sgn, mag, mod;
 
-	for (key = 0xB, lut = lut0, i = 0; i < length; i++) {
+	for (key = 0xB, lut = lut0, i = 0; i < length; i++)
+	{
 		respone[i] = (key + 5 * challenge[i]) & 0xF;
 		key = lut[respone[i]];
 		sgn = (respone[i] >> 3) & 0x1;
 		mag = ((sgn == 1) ? ~respone[i] : respone[i]) & 0x7;
 		mod = (mag % 3 == 1) ? sgn : 1 - sgn;
 		if (lut == lut1 && (respone[i] == 0x1 || respone[i] == 0x9))
+		{
 			mod = 1;
+		}
 		if (lut == lut1 && (respone[i] == 0xB || respone[i] == 0xE))
+		{
 			mod = 0;
+		}
 		lut = (mod == 1) ? lut1 : lut0;
 	}
 }
 
 
-void CPifRam::PifRamRead (void) 
+void CPifRam::PifRamRead()
 {
 	if (m_PifRam[0x3F] == 0x2) 
 	{
@@ -93,7 +99,8 @@ void CPifRam::PifRamRead (void)
 	int Channel = 0;
 	for (int CurPos = 0; CurPos < 0x40; CurPos ++)
 	{
-		switch(m_PifRam[CurPos]) {
+		switch (m_PifRam[CurPos])
+		{
 		case 0x00: 
 			Channel += 1; 
 			if (Channel > 6) 
@@ -107,31 +114,49 @@ void CPifRam::PifRamRead (void)
 		default:
 			if ((m_PifRam[CurPos] & 0xC0) == 0) 
 			{
-				if (Channel < 4) {
-					if (Controllers[Channel].Present && Controllers[Channel].RawData) {
-						if (g_Plugins->Control()->ReadController) { g_Plugins->Control()->ReadController(Channel,&m_PifRam[CurPos]); }
-					} else {						
+				if (Channel < 4)
+				{
+					if (Controllers[Channel].Present && Controllers[Channel].RawData)
+					{
+						if (g_Plugins->Control()->ReadController)
+						{
+							g_Plugins->Control()->ReadController(Channel,&m_PifRam[CurPos]);
+						}
+					}
+					else
+					{						
 						ReadControllerCommand(Channel,&m_PifRam[CurPos]);
 					}
 				} 
 				CurPos += m_PifRam[CurPos] + (m_PifRam[CurPos + 1] & 0x3F) + 1;
 				Channel += 1;
-			} else {
-				if (bShowPifRamErrors()) { g_Notify->DisplayError(L"Unknown Command in PifRamRead(%X)",m_PifRam[CurPos]); }
+			}
+			else
+			{
+				if (bShowPifRamErrors())
+				{
+					g_Notify->DisplayError(stdstr_f("Unknown Command in PifRamRead(%X)",m_PifRam[CurPos]).ToUTF16().c_str());
+				}
 				CurPos = 0x40;
 			}
 			break;
 		}
 	} 
-	if (g_Plugins->Control()->ReadController) { g_Plugins->Control()->ReadController(-1,NULL); }
+	if (g_Plugins->Control()->ReadController)
+	{
+		g_Plugins->Control()->ReadController(-1,NULL);
+	}
 }
 
-void CPifRam::PifRamWrite (void) {
+void CPifRam::PifRamWrite()
+{
 	CONTROL * Controllers = g_Plugins->Control()->PluginControllers();
 	int Channel = 0, CurPos;
 
-	if( m_PifRam[0x3F] > 0x1) { 
-		switch (m_PifRam[0x3F]) {
+	if ( m_PifRam[0x3F] > 0x1)
+	{ 
+		switch (m_PifRam[0x3F])
+		{
 		case 0x02:
 			// format the 'challenge' message into 30 nibbles for X-Scale's CIC code
 			{
@@ -148,13 +173,13 @@ void CPifRam::PifRamWrite (void) {
 				{
 					ResponseValue = (ResponseValue << 8) | ((Response[(z - 1)*2] << 4) + Response[(z - 1)*2+1]);
 				}
-				*(QWORD *)&m_PifRam[48] = ResponseValue;
+				std::memcpy(&m_PifRam[48], &ResponseValue, sizeof(QWORD));
 				ResponseValue = 0;
 				for (int z = 7; z > 0; z--)
 				{
 					ResponseValue = (ResponseValue << 8) | ((Response[((z + 8) - 1)*2] << 4) + Response[((z + 8) - 1)*2+1]);
 				}
-				*(QWORD *)&m_PifRam[56] = ResponseValue;
+				std::memcpy(&m_PifRam[56], &ResponseValue, sizeof(QWORD));
 			}
 			break;
 		case 0x08: 
@@ -173,31 +198,51 @@ void CPifRam::PifRamWrite (void) {
 			memset(m_PifRam,0,0x40);
 			break;
 		default:
-			if (bShowPifRamErrors()) { g_Notify->DisplayError(L"Unkown PifRam control: %d",m_PifRam[0x3F]); }
+			if (bShowPifRamErrors())
+			{
+				g_Notify->DisplayError(stdstr_f("Unkown PifRam control: %d",m_PifRam[0x3F]).ToUTF16().c_str());
+			}
 		}
 		return;
 	}
 
-	for (CurPos = 0; CurPos < 0x40; CurPos++){
-		switch(m_PifRam[CurPos]) {
+	for (CurPos = 0; CurPos < 0x40; CurPos++)
+	{
+		switch (m_PifRam[CurPos])
+		{
 		case 0x00: 
 			Channel += 1; 
-			if (Channel > 6) { CurPos = 0x40; }
+			if (Channel > 6)
+			{
+				CurPos = 0x40;
+			}
 			break;
 		case 0xFE: CurPos = 0x40; break;
 		case 0xFF: break;
 		case 0xB4: case 0x56: case 0xB8: break; /* ??? */
 		default:
-			if ((m_PifRam[CurPos] & 0xC0) == 0) {
-				if (Channel < 4) {
-					if (Controllers[Channel].Present && Controllers[Channel].RawData) {
-						if (g_Plugins->Control()->ControllerCommand) { g_Plugins->Control()->ControllerCommand(Channel,&m_PifRam[CurPos]); }
-					} else {
+			if ((m_PifRam[CurPos] & 0xC0) == 0)
+			{
+				if (Channel < 4)
+				{
+					if (Controllers[Channel].Present && Controllers[Channel].RawData)
+					{
+						if (g_Plugins->Control()->ControllerCommand)
+						{
+							g_Plugins->Control()->ControllerCommand(Channel,&m_PifRam[CurPos]);
+						}
+					}
+					else
+					{
 						ProcessControllerCommand(Channel,&m_PifRam[CurPos]);
 					}
-				} else if (Channel == 4) {
+				}
+				else if (Channel == 4)
+				{
 					EepromCommand(&m_PifRam[CurPos]);
-				} else {
+				}
+				else
+				{
 					if (bShowPifRamErrors()) 
 					{
 						g_Notify->DisplayError(L"Command on channel 5?");
@@ -205,18 +250,26 @@ void CPifRam::PifRamWrite (void) {
 				}
 				CurPos += m_PifRam[CurPos] + (m_PifRam[CurPos + 1] & 0x3F) + 1;
 				Channel += 1;
-			} else {
-				if (bShowPifRamErrors()) { g_Notify->DisplayError(L"Unknown Command in PifRamWrite(%X)",m_PifRam[CurPos]); }
+			}
+			else
+			{
+				if (bShowPifRamErrors())
+				{
+					g_Notify->DisplayError(stdstr_f("Unknown Command in PifRamWrite(%X)",m_PifRam[CurPos]).ToUTF16().c_str());
+				}
 				CurPos = 0x40;
 			}
 			break;
 		}
 	}
 	m_PifRam[0x3F] = 0;
-	if (g_Plugins->Control()->ControllerCommand) { g_Plugins->Control()->ControllerCommand(-1,NULL); }
+	if (g_Plugins->Control()->ControllerCommand)
+	{
+		g_Plugins->Control()->ControllerCommand(-1,NULL);
+	}
 }
 
-void CPifRam::SI_DMA_READ (void) 
+void CPifRam::SI_DMA_READ() 
 {
 	BYTE * PifRamPos = m_PifRam;
 	BYTE * RDRAM = g_MMU->Rdram();
@@ -233,47 +286,38 @@ void CPifRam::SI_DMA_READ (void)
 	
 	PifRamRead();
 	SI_DRAM_ADDR_REG &= 0xFFFFFFF8;
-	if ((int)SI_DRAM_ADDR_REG < 0) {
+	if ((int)SI_DRAM_ADDR_REG < 0)
+	{
 		int count, RdramPos;
 
 		RdramPos = (int)SI_DRAM_ADDR_REG;
-		for (count = 0; count < 0x40; count++, RdramPos++) {
-			if (RdramPos < 0) { continue; }
-			RDRAM[RdramPos ^3] = m_PifRam[count];
+		for (count = 0; count < 0x40; count++, RdramPos++)
+		{
+			if (RdramPos < 0)
+			{
+				continue;
+			}
+			RDRAM[RdramPos ^ 3] = m_PifRam[count];
 		}
-	} else {
-		_asm {
-			mov edi, dword ptr [SI_DRAM_ADDR_REG]
-			mov edi, dword ptr [edi]
-			add edi, RDRAM
-			mov ecx, PifRamPos
-			mov edx, 0		
-	memcpyloop:
-			mov eax, dword ptr [ecx + edx]
-			bswap eax
-			mov  dword ptr [edi + edx],eax
-			mov eax, dword ptr [ecx + edx + 4]
-			bswap eax
-			mov  dword ptr [edi + edx + 4],eax
-			mov eax, dword ptr [ecx + edx + 8]
-			bswap eax
-			mov  dword ptr [edi + edx + 8],eax
-			mov eax, dword ptr [ecx + edx + 12]
-			bswap eax
-			mov  dword ptr [edi + edx + 12],eax
-			add edx, 16
-			cmp edx, 64
-			jb memcpyloop
+	}
+	else
+	{
+		for (size_t i = 0; i < 64; i++)
+		{
+			RDRAM[(SI_DRAM_ADDR_REG + i) ^ 3] = PifRamPos[i];
 		}
 	}
 	
-	if (LogOptions.LogPRDMAMemStores) {
+	if (LogOptions.LogPRDMAMemStores)
+	{
 		int count;
 		char HexData[100], AsciiData[100], Addon[20];
 		LogMessage("\tData DMAed to RDRAM:");			
 		LogMessage("\t--------------------");
-		for (count = 0; count < 16; count ++ ) {
-			if ((count % 4) == 0) { 
+		for (count = 0; count < 16; count ++ )
+		{
+			if ((count % 4) == 0)
+			{ 
 				sprintf(HexData,"\0"); 
 				sprintf(AsciiData,"\0"); 
 			}
@@ -281,7 +325,8 @@ void CPifRam::SI_DMA_READ (void)
 				m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1], 
 				m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3] );
 			strcat(HexData,Addon);
-			if (((count + 1) % 4) != 0) {
+			if (((count + 1) % 4) != 0)
+			{
 				sprintf(Addon,"-");
 				strcat(HexData,Addon);
 			} 
@@ -291,23 +336,27 @@ void CPifRam::SI_DMA_READ (void)
 				m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3] );
 			strcat(AsciiData,Addon);
 			
-			if (((count + 1) % 4) == 0) {
+			if (((count + 1) % 4) == 0)
+			{
 				LogMessage("\t%s %s",HexData, AsciiData);
 			} 
 		}
 		LogMessage("");
 	}
 
-	if (g_System->bDelaySI()) {
+	if (g_System->bDelaySI())
+	{
 		g_SystemTimer->SetTimer(CSystemTimer::SiTimer,0x900,false);
-	} else {
+	}
+	else
+	{
 		g_Reg->MI_INTR_REG |= MI_INTR_SI;
 		g_Reg->SI_STATUS_REG |= SI_STATUS_INTERRUPT;
 		g_Reg->CheckInterrupts();
 	}
 }
 
-void CPifRam::SI_DMA_WRITE (void) 
+void CPifRam::SI_DMA_WRITE()
 {
 	BYTE * PifRamPos = m_PifRam;
 	
@@ -324,48 +373,38 @@ void CPifRam::SI_DMA_WRITE (void)
 	SI_DRAM_ADDR_REG &= 0xFFFFFFF8;
 	BYTE * RDRAM = g_MMU->Rdram();
 
-	if ((int)SI_DRAM_ADDR_REG < 0) {
-		int count, RdramPos;
+	if ((int)SI_DRAM_ADDR_REG < 0)
+	{
+		int RdramPos = (int)SI_DRAM_ADDR_REG;
 
-		RdramPos = (int)SI_DRAM_ADDR_REG;
-		for (count = 0; count < 0x40; count++, RdramPos++) {
-			if (RdramPos < 0) { m_PifRam[count] = 0; continue; }
+		for (int count = 0; count < 0x40; count++, RdramPos++)
+		{
+			if (RdramPos < 0)
+			{
+				m_PifRam[count] = 0; continue;
+			}
 			m_PifRam[count] = RDRAM[RdramPos ^3];
 		}
-	} else {
-		_asm {
-			mov ecx, dword ptr [SI_DRAM_ADDR_REG]
-			mov ecx, dword ptr [ecx]
-			add ecx, RDRAM
-			mov edi, PifRamPos
-			mov edx, 0		
-	memcpyloop:
-			mov eax, dword ptr [ecx + edx]
-			bswap eax
-			mov  dword ptr [edi + edx],eax
-			mov eax, dword ptr [ecx + edx + 4]
-			bswap eax
-			mov  dword ptr [edi + edx + 4],eax
-			mov eax, dword ptr [ecx + edx + 8]
-			bswap eax
-			mov  dword ptr [edi + edx + 8],eax
-			mov eax, dword ptr [ecx + edx + 12]
-			bswap eax
-			mov  dword ptr [edi + edx + 12],eax
-			add edx, 16
-			cmp edx, 64
-			jb memcpyloop
+	}
+	else
+	{
+		for (size_t i = 0; i < 64; i++)
+		{
+			PifRamPos[i] = RDRAM[(SI_DRAM_ADDR_REG + i) ^ 3];
 		}
 	}
 	
-	if (LogOptions.LogPRDMAMemLoads) {
+	if (LogOptions.LogPRDMAMemLoads)
+	{
 		int count;
 		char HexData[100], AsciiData[100], Addon[20];
 		LogMessage("");
 		LogMessage("\tData DMAed to the Pif Ram:");			
 		LogMessage("\t--------------------------");
-		for (count = 0; count < 16; count ++ ) {
-			if ((count % 4) == 0) { 
+		for (count = 0; count < 16; count ++ )
+		{
+			if ((count % 4) == 0)
+			{ 
 				sprintf(HexData,"\0"); 
 				sprintf(AsciiData,"\0"); 
 			}
@@ -373,7 +412,8 @@ void CPifRam::SI_DMA_WRITE (void)
 				m_PifRam[(count << 2) + 0], m_PifRam[(count << 2) + 1], 
 				m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3] );
 			strcat(HexData,Addon);
-			if (((count + 1) % 4) != 0) {
+			if (((count + 1) % 4) != 0)
+			{
 				sprintf(Addon,"-");
 				strcat(HexData,Addon);
 			} 
@@ -383,7 +423,8 @@ void CPifRam::SI_DMA_WRITE (void)
 				m_PifRam[(count << 2) + 2], m_PifRam[(count << 2) + 3] );
 			strcat(AsciiData,Addon);
 			
-			if (((count + 1) % 4) == 0) {
+			if (((count + 1) % 4) == 0)
+			{
 				LogMessage("\t%s %s",HexData, AsciiData);
 			} 
 		}
@@ -392,9 +433,12 @@ void CPifRam::SI_DMA_WRITE (void)
 
 	PifRamWrite();
 	
-	if (g_System->bDelaySI()) {
+	if (g_System->bDelaySI())
+	{
 		g_SystemTimer->SetTimer(CSystemTimer::SiTimer,0x900,false);
-	} else {
+	}
+	else
+	{
 		g_Reg->MI_INTR_REG |= MI_INTR_SI;
 		g_Reg->SI_STATUS_REG |= SI_STATUS_INTERRUPT;
 		g_Reg->CheckInterrupts();
@@ -405,97 +449,156 @@ void CPifRam::ProcessControllerCommand ( int Control, BYTE * Command)
 {
 	CONTROL * Controllers = g_Plugins->Control()->PluginControllers();
 
-	switch (Command[2]) {
+	switch (Command[2])
+	{
 	case 0x00: // check
 	case 0xFF: // reset & check ?
-		if ((Command[1] & 0x80) != 0) { break; }
+		if ((Command[1] & 0x80) != 0)
+		{
+			break;
+		}
 		if (bShowPifRamErrors()) 
 		{
-			if (Command[0] != 1) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
-			if (Command[1] != 3) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
+			if (Command[0] != 1)
+			{
+				g_Notify->DisplayError(L"What am I meant to do with this Controller Command");
+			}
+			if (Command[1] != 3)
+			{
+				g_Notify->DisplayError(L"What am I meant to do with this Controller Command");
+			}
 		}
-		if (Controllers[Control].Present == TRUE) {
+		if (Controllers[Control].Present == TRUE)
+		{
 			Command[3] = 0x05;
 			Command[4] = 0x00;
-			switch ( Controllers[Control].Plugin) {
-			case PLUGIN_RUMBLE_PAK: Command[5] = 1; break;
-			case PLUGIN_MEMPAK: Command[5] = 1; break;
-			case PLUGIN_RAW: Command[5] = 1; break;
+			switch ( Controllers[Control].Plugin)
+			{
+			case PLUGIN_TANSFER_PAK:
+			case PLUGIN_RUMBLE_PAK:
+			case PLUGIN_MEMPAK:
+			case PLUGIN_RAW: 
+				Command[5] = 1; break;
 			default: Command[5] = 0; break;
 			}
-		} else {
+		}
+		else
+		{
 			Command[1] |= 0x80;
 		}
 		break;
 	case 0x01: // read controller
 		if (bShowPifRamErrors()) 
 		{
-			if (Command[0] != 1) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
-			if (Command[1] != 4) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
+			if (Command[0] != 1)
+			{
+				g_Notify->DisplayError(L"What am I meant to do with this Controller Command");
+			}
+			if (Command[1] != 4)
+			{
+				g_Notify->DisplayError(L"What am I meant to do with this Controller Command");
+			}
 		}
-		if (Controllers[Control].Present == FALSE) {
+		if (Controllers[Control].Present == FALSE)
+		{
 			Command[1] |= 0x80;
 		}
 		break;
 	case 0x02: //read from controller pack
-		if (LogOptions.LogControllerPak) { LogControllerPakData("Read: Before Gettting Results"); }
+		if (LogOptions.LogControllerPak)
+		{
+			LogControllerPakData("Read: Before Gettting Results");
+		}
 		if (bShowPifRamErrors()) 
 		{
-			if (Command[0] != 3) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
-			if (Command[1] != 33) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
+			if (Command[0] != 3)
+			{
+				g_Notify->DisplayError(L"What am I meant to do with this Controller Command");
+			}
+			if (Command[1] != 33)
+			{
+				g_Notify->DisplayError(L"What am I meant to do with this Controller Command");
+			}
 		}
-		if (Controllers[Control].Present == TRUE) {
-			DWORD address = ((Command[3] << 8) | Command[4] & 0xE0);
-			switch (Controllers[Control].Plugin) {
-			case PLUGIN_RUMBLE_PAK:
-				
-				memset(&Command[5], (address >= 0x8000 && address < 0x9000) ? 0x80 : 0x00, 0x20);
-				Command[0x25] = Mempak::CalculateCrc(&Command[5]);
-				break;
-			case PLUGIN_MEMPAK: Mempak::ReadFrom(Control, address, &Command[5]); break;
+		if (Controllers[Control].Present == TRUE)
+		{
+			switch (Controllers[Control].Plugin)
+			{
+			case PLUGIN_RUMBLE_PAK: Rumblepak::ReadFrom(Command); break;
+			case PLUGIN_MEMPAK: Mempak::ReadFrom(Control, Command); break;
+			case PLUGIN_TANSFER_PAK: /* TODO */; break;
 			case PLUGIN_RAW: if (g_Plugins->Control()->ControllerCommand) { g_Plugins->Control()->ControllerCommand(Control, Command); } break;
 			default:
 				memset(&Command[5], 0, 0x20);
-				Command[0x25] = 0;
 			}
-		} else {
-			Command[1] |= 0x80;
-		}
-		if (LogOptions.LogControllerPak) { LogControllerPakData("Read: After Gettting Results"); }
-		break;
-	case 0x03: //write controller pak
-		if (LogOptions.LogControllerPak) { LogControllerPakData("Write: Before Processing"); }
-		if (bShowPifRamErrors()) 
-		{
-			if (Command[0] != 35) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
-			if (Command[1] != 1) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
-		}		
-		if (Controllers[Control].Present == TRUE) {
-			DWORD address = ((Command[3] << 8) | Command[4] & 0xE0 );
-			switch (Controllers[Control].Plugin) {
-			case PLUGIN_MEMPAK: Mempak::WriteTo(Control, address, &Command[5]); break;
-			case PLUGIN_RAW: if (g_Plugins->Control()->ControllerCommand) { g_Plugins->Control()->ControllerCommand(Control, Command); } break;
-			case PLUGIN_RUMBLE_PAK: 
-				if ((address & 0xFFE0) == 0xC000 && g_Plugins->Control()->RumbleCommand != NULL) {
-					g_Plugins->Control()->RumbleCommand(Control, *(BOOL *)(&Command[5]));
-				}
-			default:
+
+			if (Controllers[Control].Plugin != PLUGIN_RAW)
+			{
 				Command[0x25] = Mempak::CalculateCrc(&Command[5]);
 			}
-		} else {
+		}
+		else
+		{
 			Command[1] |= 0x80;
 		}
-		if (LogOptions.LogControllerPak) { LogControllerPakData("Write: After Processing"); }
+		if (LogOptions.LogControllerPak)
+		{
+			LogControllerPakData("Read: After Gettting Results");
+		}
+		break;
+	case 0x03: //write controller pak
+		if (LogOptions.LogControllerPak)
+		{
+			LogControllerPakData("Write: Before Processing");
+		}
+		if (bShowPifRamErrors()) 
+		{
+			if (Command[0] != 35)
+			{
+				g_Notify->DisplayError(L"What am I meant to do with this Controller Command");
+			}
+			if (Command[1] != 1)
+			{
+				g_Notify->DisplayError(L"What am I meant to do with this Controller Command");
+			}
+		}		
+		if (Controllers[Control].Present == TRUE)
+		{
+			switch (Controllers[Control].Plugin)
+			{
+			case PLUGIN_MEMPAK: Mempak::WriteTo(Control, Command); break;
+			case PLUGIN_RUMBLE_PAK: Rumblepak::WriteTo(Control, Command); break;
+			case PLUGIN_TANSFER_PAK: /* TODO */; break;
+			case PLUGIN_RAW: if (g_Plugins->Control()->ControllerCommand) { g_Plugins->Control()->ControllerCommand(Control, Command); } break;
+			}
+
+			if (Controllers[Control].Plugin != PLUGIN_RAW)
+			{
+				Command[0x25] = Mempak::CalculateCrc(&Command[5]);
+			}
+		}
+		else
+		{
+			Command[1] |= 0x80;
+		}
+		if (LogOptions.LogControllerPak)
+		{
+			LogControllerPakData("Write: After Processing");
+		}
 		break;
 	default:
-		if (bShowPifRamErrors()) { g_Notify->DisplayError(L"Unknown ControllerCommand %d",Command[2]); }
+		if (bShowPifRamErrors())
+		{
+			g_Notify->DisplayError(stdstr_f("Unknown ControllerCommand %d",Command[2]).ToUTF16().c_str());
+		}
 	}
 }
 
 void CPifRam::ReadControllerCommand (int Control, BYTE * Command) {
 	CONTROL * Controllers = g_Plugins->Control()->PluginControllers();
 
-	switch (Command[2]) {
+	switch (Command[2])
+	{
 	case 0x01: // read controller
 		if (Controllers[Control].Present == TRUE) 
 		{
@@ -504,19 +607,25 @@ void CPifRam::ReadControllerCommand (int Control, BYTE * Command) {
 				if (Command[0] != 1) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
 				if (Command[1] != 4) { g_Notify->DisplayError(L"What am I meant to do with this Controller Command"); }
 			}
-			*(DWORD *)&Command[3] = g_BaseSystem->GetButtons(Control);
+
+			const DWORD buttons = g_BaseSystem->GetButtons(Control);
+			std::memcpy(&Command[3], &buttons, sizeof(DWORD));
 		}
 		break;
 	case 0x02: //read from controller pack
-		if (Controllers[Control].Present == TRUE) {
-			switch (Controllers[Control].Plugin) {
+		if (Controllers[Control].Present == TRUE)
+		{
+			switch (Controllers[Control].Plugin)
+			{
 			case PLUGIN_RAW: if (g_Plugins->Control()->ReadController) { g_Plugins->Control()->ReadController(Control, Command); } break;
 			}
 		} 
 		break;
 	case 0x03: //write controller pak
-		if (Controllers[Control].Present == TRUE) {
-			switch (Controllers[Control].Plugin) {
+		if (Controllers[Control].Present == TRUE)
+		{
+			switch (Controllers[Control].Plugin)
+			{
 			case PLUGIN_RAW: if (g_Plugins->Control()->ReadController) { g_Plugins->Control()->ReadController(Control, Command); } break;
 			}
 		}
@@ -532,8 +641,10 @@ void CPifRam::LogControllerPakData (char * Description)
 	char HexData[100], AsciiData[100], Addon[20];
 	LogMessage("\t%s:",Description);			
 	LogMessage("\t------------------------------");
-	for (count = 0; count < 16; count ++ ) {
-		if ((count % 4) == 0) { 
+	for (count = 0; count < 16; count ++ )
+	{
+		if ((count % 4) == 0)
+		{ 
 			sprintf(HexData,"\0"); 
 			sprintf(AsciiData,"\0"); 
 		}
@@ -541,22 +652,28 @@ void CPifRam::LogControllerPakData (char * Description)
 			PIF_Ram[(count << 2) + 0], PIF_Ram[(count << 2) + 1], 
 			PIF_Ram[(count << 2) + 2], PIF_Ram[(count << 2) + 3] );
 		strcat(HexData,Addon);
-		if (((count + 1) % 4) != 0) {
+		if (((count + 1) % 4) != 0)
+		{
 			sprintf(Addon,"-");
 			strcat(HexData,Addon);
 		} 
 		
 		Addon[0] = 0;
-		for (count2 = 0; count2 < 4; count2++) {
-			if (PIF_Ram[(count << 2) + count2] < 30) {
+		for (count2 = 0; count2 < 4; count2++)
+		{
+			if (PIF_Ram[(count << 2) + count2] < 30)
+			{
 				strcat(Addon,".");
-			} else {
+			}
+			else
+			{
 				sprintf(Addon,"%s%c",Addon,PIF_Ram[(count << 2) + count2]);
 			}
 		}
 		strcat(AsciiData,Addon);
 		
-		if (((count + 1) % 4) == 0) {
+		if (((count + 1) % 4) == 0)
+		{
 			LogMessage("\t%s %s",HexData, AsciiData);
 		} 
 	}
diff --git a/Source/Project64/N64 System/Mips/Pif Ram.h b/Source/Project64/N64 System/Mips/Pif Ram.h
index c10dcc218..dcacf494f 100644
--- a/Source/Project64/N64 System/Mips/Pif Ram.h	
+++ b/Source/Project64/N64 System/Mips/Pif Ram.h	
@@ -16,12 +16,15 @@ protected:
 	CPifRamSettings();
 	virtual ~CPifRamSettings();
 	
-	inline bool  bShowPifRamErrors    ( void ) const { return m_bShowPifRamErrors; }
+	bool  bShowPifRamErrors() const
+	{
+		return m_bShowPifRamErrors;
+	}
 
 private:
-	static void RefreshSettings ( void * );
+	static void RefreshSettings(void*);
 	
-	static bool  m_bShowPifRamErrors;
+	static bool m_bShowPifRamErrors;
 
 	static int  m_RefCount;
 
@@ -32,17 +35,16 @@ class CPifRam :
 	private CEeprom
 {
 public:
-	public:
-	     CPifRam      ( bool SavesReadOnly );
-		~CPifRam      ( void );
+	CPifRam(bool SavesReadOnly);
+	~CPifRam();
 
-	void Reset        ( void );
+	void Reset();
 
-	void PifRamWrite  ( void );
-	void PifRamRead   ( void );
+	void PifRamWrite();
+	void PifRamRead();
 
-	void SI_DMA_READ  ( void );
-	void SI_DMA_WRITE ( void );
+	void SI_DMA_READ();
+	void SI_DMA_WRITE();
 
 protected:
 	BYTE m_PifRom[0x7C0];
@@ -53,5 +55,5 @@ private:
 	void ProcessControllerCommand ( int Control, BYTE * Command );
 	void ReadControllerCommand    ( int Control, BYTE * Command );
 	void LogControllerPakData     ( char * Description );
-	void n64_cic_nus_6105		  (char challenge[], char response[], int length);
+	void n64_cic_nus_6105         (char challenge[], char response[], int length);
 };
diff --git a/Source/Project64/N64 System/Mips/Register Class.cpp b/Source/Project64/N64 System/Mips/Register Class.cpp
index caf77edd9..f3bc474d5 100644
--- a/Source/Project64/N64 System/Mips/Register Class.cpp	
+++ b/Source/Project64/N64 System/Mips/Register Class.cpp	
@@ -80,6 +80,7 @@ CP0registers::CP0registers(DWORD * _CP0) :
 	ERROREPC_REGISTER(_CP0[30]),
 	FAKE_CAUSE_REGISTER(_CP0[32])
 {
+	
 }
 
 Rdram_InterfaceReg::Rdram_InterfaceReg(DWORD * _RdramInterface) :
@@ -95,6 +96,7 @@ Rdram_InterfaceReg::Rdram_InterfaceReg(DWORD * _RdramInterface) :
 	RDRAM_ADDR_SELECT_REG(_RdramInterface[8]),
 	RDRAM_DEVICE_MANUF_REG(_RdramInterface[9])
 {
+	
 }
 
 Mips_InterfaceReg::Mips_InterfaceReg(DWORD * _MipsInterface) :
@@ -105,6 +107,7 @@ Mips_InterfaceReg::Mips_InterfaceReg(DWORD * _MipsInterface) :
 	MI_INTR_REG(_MipsInterface[2]),
 	MI_INTR_MASK_REG(_MipsInterface[3])
 {
+	
 }
 
 Video_InterfaceReg::Video_InterfaceReg(DWORD * _VideoInterface) :
@@ -132,6 +135,7 @@ Video_InterfaceReg::Video_InterfaceReg(DWORD * _VideoInterface) :
 	VI_X_SCALE_REG(_VideoInterface[12]),
 	VI_Y_SCALE_REG(_VideoInterface[13])
 {
+	
 }
 
 AudioInterfaceReg::AudioInterfaceReg(DWORD * _AudioInterface) :
@@ -142,6 +146,7 @@ AudioInterfaceReg::AudioInterfaceReg(DWORD * _AudioInterface) :
 	AI_DACRATE_REG(_AudioInterface[4]),
 	AI_BITRATE_REG(_AudioInterface[5])
 {
+	
 }
 	
 PeripheralInterfaceReg::PeripheralInterfaceReg(DWORD * PeripheralInterface) :
@@ -161,6 +166,7 @@ PeripheralInterfaceReg::PeripheralInterfaceReg(DWORD * PeripheralInterface) :
 	PI_BSD_DOM2_PGS_REG(PeripheralInterface[11]),
 	PI_BSD_DOM2_RLS_REG(PeripheralInterface[12])
 {
+	
 }
 
 RDRAMInt_InterfaceReg::RDRAMInt_InterfaceReg(DWORD * RdramInterface) :
@@ -174,6 +180,7 @@ RDRAMInt_InterfaceReg::RDRAMInt_InterfaceReg(DWORD * RdramInterface) :
 	RI_RERROR_REG(RdramInterface[6]),
 	RI_WERROR_REG(RdramInterface[7])
 {
+	
 }
 
 DisplayControlReg::DisplayControlReg(DWORD * _DisplayProcessor) :
@@ -186,6 +193,7 @@ DisplayControlReg::DisplayControlReg(DWORD * _DisplayProcessor) :
 	DPC_PIPEBUSY_REG(_DisplayProcessor[6]),
 	DPC_TMEM_REG(_DisplayProcessor[7])
 {
+	
 }
 
 SigProcessor_InterfaceReg::SigProcessor_InterfaceReg(DWORD * _SignalProcessorInterface) :
@@ -200,6 +208,7 @@ SigProcessor_InterfaceReg::SigProcessor_InterfaceReg(DWORD * _SignalProcessorInt
 	SP_PC_REG(_SignalProcessorInterface[8]),
 	SP_IBIST_REG(_SignalProcessorInterface[9])
 {
+	
 }
 
 Serial_InterfaceReg::Serial_InterfaceReg(DWORD * SerialInterface) :
@@ -208,6 +217,7 @@ Serial_InterfaceReg::Serial_InterfaceReg(DWORD * SerialInterface) :
 	SI_PIF_ADDR_WR64B_REG(SerialInterface[2]),
 	SI_STATUS_REG(SerialInterface[3])
 {
+	
 }
 
 CRegisters::CRegisters(CN64System * System, CSystemEvents * SystemEvents) :
@@ -259,7 +269,7 @@ void CRegisters::Reset()
 	FixFpuLocations();
 }
 
-void CRegisters::SetAsCurrentSystem ( void )
+void CRegisters::SetAsCurrentSystem()
 {
 	_PROGRAM_COUNTER = &m_PROGRAM_COUNTER;
 	_GPR = m_GPR;
@@ -274,25 +284,39 @@ void CRegisters::SetAsCurrentSystem ( void )
 	_RoundingModel = &m_RoundingModel;
 }
 
-void CRegisters::CheckInterrupts ( void ) 
+void CRegisters::CheckInterrupts()
 {
-	if (!m_System->bFixedAudio() && (CPU_TYPE)g_Settings->LoadDword(Game_CpuType) != CPU_SyncCores) {
+	if (!m_System->bFixedAudio() && CpuType() != CPU_SyncCores)
+	{
 		MI_INTR_REG &= ~MI_INTR_AI;
 		MI_INTR_REG |= (m_AudioIntrReg & MI_INTR_AI);
 	}
 	MI_INTR_REG |= (m_RspIntrReg & MI_INTR_SP);
 	MI_INTR_REG |= (m_GfxIntrReg & MI_INTR_DP);
-	if ((MI_INTR_MASK_REG & MI_INTR_REG) != 0) {
+	if ((MI_INTR_MASK_REG & MI_INTR_REG) != 0)
+	{
 		FAKE_CAUSE_REGISTER |= CAUSE_IP2;
-	} else  {
+	}
+	else
+	{
 		FAKE_CAUSE_REGISTER &= ~CAUSE_IP2;
 	}
 
-	if (( STATUS_REGISTER & STATUS_IE   ) == 0 ) { return; }
-	if (( STATUS_REGISTER & STATUS_EXL  ) != 0 ) { return; }
-	if (( STATUS_REGISTER & STATUS_ERL  ) != 0 ) { return; }
+	if (( STATUS_REGISTER & STATUS_IE   ) == 0 )
+	{
+		return;
+	}
+	if (( STATUS_REGISTER & STATUS_EXL  ) != 0 )
+	{
+		return;
+	}
+	if (( STATUS_REGISTER & STATUS_ERL  ) != 0 )
+	{
+		return;
+	}
 
-	if (( STATUS_REGISTER & FAKE_CAUSE_REGISTER & 0xFF00) != 0) {
+	if (( STATUS_REGISTER & FAKE_CAUSE_REGISTER & 0xFF00) != 0)
+	{
 		if (m_FirstInterupt)
 		{
 			m_FirstInterupt = false;
@@ -305,42 +329,55 @@ void CRegisters::CheckInterrupts ( void )
 	}
 }
 
-void CRegisters::DoAddressError ( BOOL DelaySlot, DWORD BadVaddr, BOOL FromRead) 
+void CRegisters::DoAddressError(bool DelaySlot, DWORD BadVaddr, bool FromRead)
 {
 	if (bHaveDebugger())
 	{
 		g_Notify->DisplayError(L"AddressError");
-		if (( STATUS_REGISTER & STATUS_EXL  ) != 0 ) { 
+		if (( STATUS_REGISTER & STATUS_EXL  ) != 0 )
+		{ 
 			g_Notify->DisplayError(L"EXL set in AddressError Exception");
 		}
-		if (( STATUS_REGISTER & STATUS_ERL  ) != 0 ) { 
+		if (( STATUS_REGISTER & STATUS_ERL  ) != 0 )
+		{ 
 			g_Notify->DisplayError(L"ERL set in AddressError Exception");
 		}
 	}
 
-	if (FromRead) {
+	if (FromRead)
+	{
 		CAUSE_REGISTER = EXC_RADE;
-	} else {
+	}
+	else
+	{
 		CAUSE_REGISTER = EXC_WADE;
 	}
 	BAD_VADDR_REGISTER = BadVaddr;
-	if (DelaySlot) {
+	if (DelaySlot)
+	{
 		CAUSE_REGISTER |= CAUSE_BD;
 		EPC_REGISTER = m_PROGRAM_COUNTER - 4;
-	} else {
+	}
+	else
+	{
 		EPC_REGISTER = m_PROGRAM_COUNTER;
 	}
 	STATUS_REGISTER |= STATUS_EXL;
 	m_PROGRAM_COUNTER = 0x80000180;
 }
 
-void CRegisters::FixFpuLocations ( void ) {	
-	if ((STATUS_REGISTER & STATUS_FR) == 0) {
-		for (int count = 0; count < 32; count ++) {
+void CRegisters::FixFpuLocations()
+{	
+	if ((STATUS_REGISTER & STATUS_FR) == 0)
+	{
+		for (int count = 0; count < 32; count ++)
+		{
 			m_FPR_S[count] = &m_FPR[count >> 1].F[count & 1];
 			m_FPR_D[count] = &m_FPR[count >> 1].D;
 		}
-	} else {
+	}
+	else
+	{
 		for (int count = 0; count < 32; count ++) {
 			m_FPR_S[count] = &m_FPR[count].F[1];
 			m_FPR_D[count] = &m_FPR[count].D;
@@ -348,47 +385,60 @@ void CRegisters::FixFpuLocations ( void ) {
 	}
 }
 
-void CRegisters::DoBreakException ( BOOL DelaySlot) 
+void CRegisters::DoBreakException(bool DelaySlot)
 {
 	if (bHaveDebugger())
 	{
-		if (( STATUS_REGISTER & STATUS_EXL  ) != 0 ) { 
+		if (( STATUS_REGISTER & STATUS_EXL  ) != 0 )
+		{ 
 			g_Notify->DisplayError(L"EXL set in Break Exception");
 		}
-		if (( STATUS_REGISTER & STATUS_ERL  ) != 0 ) { 
+		if (( STATUS_REGISTER & STATUS_ERL  ) != 0 )
+		{ 
 			g_Notify->DisplayError(L"ERL set in Break Exception");
 		}
 	}
 
 	CAUSE_REGISTER = EXC_BREAK;
-	if (DelaySlot) {
+	if (DelaySlot)
+	{
 		CAUSE_REGISTER |= CAUSE_BD;
 		EPC_REGISTER = m_PROGRAM_COUNTER - 4;
-	} else {
+	}
+	else
+	{
 		EPC_REGISTER = m_PROGRAM_COUNTER;
 	}
 	STATUS_REGISTER |= STATUS_EXL;
 	m_PROGRAM_COUNTER = 0x80000180;
 }
 
-void CRegisters::DoCopUnusableException ( BOOL DelaySlot, int Coprocessor )
+void CRegisters::DoCopUnusableException(bool DelaySlot, int Coprocessor)
 {
 	if (bHaveDebugger())
 	{
-		if (( STATUS_REGISTER & STATUS_EXL  ) != 0 ) { 
+		if (( STATUS_REGISTER & STATUS_EXL  ) != 0 )
+		{ 
 			g_Notify->DisplayError(L"EXL set in Break Exception");
 		}
-		if (( STATUS_REGISTER & STATUS_ERL  ) != 0 ) { 
+		if (( STATUS_REGISTER & STATUS_ERL  ) != 0 )
+		{ 
 			g_Notify->DisplayError(L"ERL set in Break Exception");
 		}
 	}
 
 	CAUSE_REGISTER = EXC_CPU;
-	if (Coprocessor == 1) { CAUSE_REGISTER |= 0x10000000; }
-	if (DelaySlot) {
+	if (Coprocessor == 1)
+	{
+		CAUSE_REGISTER |= 0x10000000;
+	}
+	if (DelaySlot)
+	{
 		CAUSE_REGISTER |= CAUSE_BD;
 		EPC_REGISTER = m_PROGRAM_COUNTER - 4;
-	} else {
+	}
+	else
+	{
 		EPC_REGISTER = m_PROGRAM_COUNTER;
 	}
 	STATUS_REGISTER |= STATUS_EXL;
@@ -396,77 +446,108 @@ void CRegisters::DoCopUnusableException ( BOOL DelaySlot, int Coprocessor )
 }
 
 
-BOOL CRegisters::DoIntrException ( BOOL DelaySlot ) 
+bool CRegisters::DoIntrException(bool DelaySlot)
 {
-	if (( STATUS_REGISTER & STATUS_IE   ) == 0 ) { return FALSE; }
-	if (( STATUS_REGISTER & STATUS_EXL  ) != 0 ) { return FALSE; }
-	if (( STATUS_REGISTER & STATUS_ERL  ) != 0 ) { return FALSE; }
-	if (LogOptions.GenerateLog && LogOptions.LogExceptions && !LogOptions.NoInterrupts) {
-		LogMessage("%08X: Interupt Generated", m_PROGRAM_COUNTER );
+	if ((STATUS_REGISTER & STATUS_IE) == 0)
+	{
+		return false;
 	}
+
+	if ((STATUS_REGISTER & STATUS_EXL) != 0)
+	{
+		return false;
+	}
+
+	if ((STATUS_REGISTER & STATUS_ERL) != 0)
+	{
+		return false;
+	}
+
+	if (LogOptions.GenerateLog && LogOptions.LogExceptions && !LogOptions.NoInterrupts)
+	{
+		LogMessage("%08X: Interrupt Generated", m_PROGRAM_COUNTER);
+	}
+
 	CAUSE_REGISTER = FAKE_CAUSE_REGISTER;
 	CAUSE_REGISTER |= EXC_INT;
-	if (DelaySlot) {
+
+	if (DelaySlot)
+	{
 		CAUSE_REGISTER |= CAUSE_BD;
 		EPC_REGISTER = m_PROGRAM_COUNTER - 4;
-	} else {
+	}
+	else
+	{
 		EPC_REGISTER = m_PROGRAM_COUNTER;
 	}
+
 	STATUS_REGISTER |= STATUS_EXL;
 	m_PROGRAM_COUNTER = 0x80000180;
-	return TRUE;
+	return true;
 }
 
-void CRegisters::DoTLBReadMiss ( BOOL DelaySlot, DWORD BadVaddr ) 
+void CRegisters::DoTLBReadMiss(bool DelaySlot, DWORD BadVaddr)
 {
 	CAUSE_REGISTER = EXC_RMISS;
 	BAD_VADDR_REGISTER = BadVaddr;
 	CONTEXT_REGISTER &= 0xFF80000F;
 	CONTEXT_REGISTER |= (BadVaddr >> 9) & 0x007FFFF0;
 	ENTRYHI_REGISTER = (BadVaddr & 0xFFFFE000);
-	if ((STATUS_REGISTER & STATUS_EXL) == 0) {
-		if (DelaySlot) {
+	if ((STATUS_REGISTER & STATUS_EXL) == 0)
+	{
+		if (DelaySlot)
+		{
 			CAUSE_REGISTER |= CAUSE_BD;
 			EPC_REGISTER = m_PROGRAM_COUNTER - 4;
-		} else {
+		}
+		else
+		{
 			EPC_REGISTER = m_PROGRAM_COUNTER;
 		}
 		if (g_TLB->AddressDefined(BadVaddr)) 
 		{
 			m_PROGRAM_COUNTER = 0x80000180;
-		} else {
+		}
+		else
+		{
 			m_PROGRAM_COUNTER = 0x80000000;
 		}
 		STATUS_REGISTER |= STATUS_EXL;
-	} else {
+	}
+	else
+	{
 		if (bHaveDebugger())
 		{
-			g_Notify->DisplayError(L"TLBMiss - EXL Set\nBadVaddr = %X\nAddress Defined: %s",BadVaddr,g_TLB->AddressDefined(BadVaddr)?"TRUE":"FALSE");
+			g_Notify->DisplayError(stdstr_f("TLBMiss - EXL Set\nBadVaddr = %X\nAddress Defined: %s",BadVaddr,g_TLB->AddressDefined(BadVaddr)?"TRUE":"FALSE").ToUTF16().c_str());
 		}
 		m_PROGRAM_COUNTER = 0x80000180;
 	}
 }
 
-void CRegisters::DoSysCallException ( BOOL DelaySlot) 
+void CRegisters::DoSysCallException(bool DelaySlot)
 {
 	if (bHaveDebugger())
 	{
-		if (( STATUS_REGISTER & STATUS_EXL  ) != 0 ) { 
+		if (( STATUS_REGISTER & STATUS_EXL  ) != 0 )
+		{ 
 			g_Notify->DisplayError(L"EXL set in SysCall Exception");
 		}
-		if (( STATUS_REGISTER & STATUS_ERL  ) != 0 ) { 
+		if (( STATUS_REGISTER & STATUS_ERL  ) != 0 )
+		{ 
 			g_Notify->DisplayError(L"ERL set in SysCall Exception");
 		}
 	}
 
 	CAUSE_REGISTER = EXC_SYSCALL;
-	if (DelaySlot) {
+	if (DelaySlot)
+	{
 		CAUSE_REGISTER |= CAUSE_BD;
 		EPC_REGISTER = m_PROGRAM_COUNTER - 4;
-	} else {
+	}
+	else
+	{
 		EPC_REGISTER = m_PROGRAM_COUNTER;
 	}
 	STATUS_REGISTER |= STATUS_EXL;
 	m_PROGRAM_COUNTER = 0x80000180;
 }
-
diff --git a/Source/Project64/N64 System/Mips/Register Class.h b/Source/Project64/N64 System/Mips/Register Class.h
index d13fb2231..9699d4e97 100644
--- a/Source/Project64/N64 System/Mips/Register Class.h	
+++ b/Source/Project64/N64 System/Mips/Register Class.h	
@@ -13,7 +13,7 @@
 //CPO registers by name
 class CP0registers
 {
-	CP0registers (void);
+	CP0registers();
 
 protected:
 	CP0registers (DWORD * _CP0);
@@ -41,7 +41,8 @@ public:
 };
 
 //CPO register flags
-enum {
+enum
+{
 	//Status Register
 	STATUS_IE  = 0x00000001, STATUS_EXL = 0x00000002, STATUS_ERL = 0x00000004,
 	STATUS_IP0 = 0x00000100, STATUS_IP1 = 0x00000200, STATUS_IP2 = 0x00000400,
@@ -83,7 +84,8 @@ enum {
 };
 
 //Float point control status register flags
-enum {
+enum
+{
 	FPCSR_FS			= 0x01000000, /* flush denorm to zero */
 	FPCSR_C				= 0x00800000, /* condition bit */	
 	FPCSR_CE			= 0x00020000, /* cause: unimplemented operation */
@@ -112,7 +114,7 @@ enum {
 //Rdram Registers
 class Rdram_InterfaceReg
 {
-	Rdram_InterfaceReg (void);
+	Rdram_InterfaceReg();
 
 protected:
 	Rdram_InterfaceReg (DWORD * _RdramInterface);
@@ -149,7 +151,8 @@ public:
 };
 
 //Mips interface flags
-enum {
+enum
+{
 	MI_MODE_INIT			= 0x0080,		/* Bit  7: init mode */
 	MI_MODE_EBUS			= 0x0100,		/* Bit  8: ebus test mode */
 	MI_MODE_RDRAM			= 0x0200,		/* Bit  9: RDRAM reg mode */
@@ -195,7 +198,7 @@ enum {
 //Mips interface registers
 class Video_InterfaceReg
 {
-	Video_InterfaceReg (void);
+	Video_InterfaceReg();
 
 protected:
 	Video_InterfaceReg (DWORD * _VideoInterface);
@@ -229,7 +232,7 @@ public:
 //Display Processor Control Registers
 class DisplayControlReg
 {
-	DisplayControlReg (void);
+	DisplayControlReg();
 
 protected:
 	DisplayControlReg (DWORD * _DisplayProcessor);
@@ -245,7 +248,8 @@ public:
 	DWORD & DPC_TMEM_REG;
 };
 
-enum {
+enum
+{
 	DPC_CLR_XBUS_DMEM_DMA	    = 0x0001,	/* Bit 0: clear xbus_dmem_dma */
 	DPC_SET_XBUS_DMEM_DMA	    = 0x0002,	/* Bit 1: set xbus_dmem_dma */
 	DPC_CLR_FREEZE			    = 0x0004,	/* Bit 2: clear freeze */
@@ -275,7 +279,7 @@ enum {
 */
 class AudioInterfaceReg
 {
-	AudioInterfaceReg (void);
+	AudioInterfaceReg();
 
 protected:
 	AudioInterfaceReg (DWORD * _AudioInterface);
@@ -289,7 +293,8 @@ public:
 	DWORD & AI_BITRATE_REG;
 };
 
-enum {
+enum
+{
 	AI_STATUS_FIFO_FULL			= 0x80000000,	/* Bit 31: full */
 	AI_STATUS_DMA_BUSY			= 0x40000000,	/* Bit 30: busy */
 };
@@ -298,7 +303,7 @@ enum {
 
 class PeripheralInterfaceReg
 {
-	PeripheralInterfaceReg (void);
+	PeripheralInterfaceReg();
 	
 protected:
 	PeripheralInterfaceReg (DWORD * PeripheralInterface);
@@ -323,7 +328,7 @@ public:
 
 class RDRAMInt_InterfaceReg
 {
-	RDRAMInt_InterfaceReg (void);
+	RDRAMInt_InterfaceReg();
 
 protected:
 	RDRAMInt_InterfaceReg (DWORD * RdramInterface);
@@ -360,7 +365,8 @@ public:
 };
 
 //Signal Processor interface flags
-enum {
+enum
+{
 	SP_CLR_HALT				= 0x00001,	    /* Bit  0: clear halt */
 	SP_SET_HALT				= 0x00002,	    /* Bit  1: set halt */
 	SP_CLR_BROKE			= 0x00004,	    /* Bit  2: clear broke */
@@ -405,7 +411,8 @@ enum {
 };
 
 //Peripheral Interface flags
-enum {
+enum
+{
 	PI_STATUS_DMA_BUSY	=	0x01,
 	PI_STATUS_IO_BUSY	=	0x02,
 	PI_STATUS_ERROR		=	0x04,
@@ -417,7 +424,7 @@ enum {
 
 class Serial_InterfaceReg
 {
-	Serial_InterfaceReg (void);
+	Serial_InterfaceReg();
 
 protected:
 	Serial_InterfaceReg (DWORD * SerialInterface);
@@ -430,7 +437,8 @@ public:
 };
 
 //Serial Interface flags
-enum {
+enum
+{
 	SI_STATUS_DMA_BUSY	=	0x0001,
 	SI_STATUS_RD_BUSY   =	0x0002,
 	SI_STATUS_DMA_ERROR	=	0x0008,
@@ -438,7 +446,8 @@ enum {
 };
 
 
-enum ROUNDING_MODE {
+enum ROUNDING_MODE
+{
 	ROUND_NEAR = _RC_NEAR, 
 	ROUND_DOWN = _RC_DOWN,	
 	ROUND_UP   = _RC_UP, 
@@ -464,7 +473,7 @@ protected:
 	static DWORD         * _CP0;
 	static MIPS_DWORD    * _RegHI;
 	static MIPS_DWORD    * _RegLO;
-	static float         ** _FPR_S;		
+	static float         ** _FPR_S;
 	static double        ** _FPR_D;
 	static DWORD         * _FPCR;
 	static DWORD         * _LLBit;
@@ -476,6 +485,7 @@ class CSystemEvents;
 
 class CRegisters : 
 	private CDebugSettings,
+	private CGameSettings,
 	protected CSystemRegisters,
 	public CP0registers,
 	public Rdram_InterfaceReg,
@@ -503,7 +513,7 @@ public:
 	DWORD           m_FPCR[32];
 	ROUNDING_MODE   m_RoundingModel;
 	MIPS_DWORD      m_FPR[32];
-	float         * m_FPR_S[32];		
+	float         * m_FPR_S[32];
 	double        * m_FPR_D[32];
 
 	//Memory Mapped N64 registers
@@ -521,21 +531,21 @@ public:
 	DWORD           m_RspIntrReg;
 
 
-	void CheckInterrupts        ( void );
-	void DoAddressError         ( BOOL DelaySlot, DWORD BadVaddr, BOOL FromRead ); 
-	void DoBreakException       ( BOOL DelaySlot ); 
-	void DoCopUnusableException ( BOOL DelaySlot, int Coprocessor );
-	BOOL DoIntrException        ( BOOL DelaySlot );
-	void DoTLBReadMiss          ( BOOL DelaySlot, DWORD BadVaddr );
-	void DoSysCallException     ( BOOL DelaySlot);
-	void FixFpuLocations        ( void );
-	void Reset                  ( void );
-	void SetAsCurrentSystem     ( void );
+	void CheckInterrupts        ();
+	void DoAddressError         ( bool DelaySlot, DWORD BadVaddr, bool FromRead );
+	void DoBreakException       ( bool DelaySlot );
+	void DoCopUnusableException ( bool DelaySlot, int Coprocessor );
+	bool DoIntrException        ( bool DelaySlot );
+	void DoTLBReadMiss          ( bool DelaySlot, DWORD BadVaddr );
+	void DoSysCallException     ( bool DelaySlot);
+	void FixFpuLocations        ();
+	void Reset                  ();
+	void SetAsCurrentSystem     ();
 
 private:
-	CRegisters(void);							// Disable default constructor
-	CRegisters(const CRegisters&);				// Disable copy constructor
-	CRegisters& operator=(const CRegisters&);	// Disable assignment
+	CRegisters();                             // Disable default constructor
+	CRegisters(const CRegisters&);            // Disable copy constructor
+	CRegisters& operator=(const CRegisters&); // Disable assignment
 
 	bool            m_FirstInterupt;
 	CN64System    * m_System;
diff --git a/Source/Project64/N64 System/Mips/Rumblepak.cpp b/Source/Project64/N64 System/Mips/Rumblepak.cpp
new file mode 100644
index 000000000..51051cc6d
--- /dev/null
+++ b/Source/Project64/N64 System/Mips/Rumblepak.cpp	
@@ -0,0 +1,38 @@
+/****************************************************************************
+*                                                                           *
+* Project 64 - A Nintendo 64 emulator.                                      *
+* http://www.pj64-emu.com/                                                  *
+* Copyright (C) 2012 Project64. All rights reserved.                        *
+*                                                                           *
+* License:                                                                  *
+* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html                        *
+*                                                                           *
+****************************************************************************/
+#include "stdafx.h"
+
+void Rumblepak::ReadFrom(BYTE * command)
+{
+	DWORD address = (command[3] << 8) | (command[4] & 0xE0);
+
+	if ((address >= 0x8000) && (address < 0x9000))
+	{
+		memset(&command[5], 0x80, 0x20);
+	}
+	else
+	{
+		memset(&command[5], 0x00, 0x20);
+	}
+}
+
+void Rumblepak::WriteTo(int Control, BYTE * command)
+{
+	DWORD address = (command[3] << 8) | (command[4] & 0xE0);
+
+	if ((address) == 0xC000)
+	{
+		if (g_Plugins->Control()->RumbleCommand != NULL)
+		{
+			g_Plugins->Control()->RumbleCommand(Control, *(BOOL *)(&command[5]));
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/Project64/N64 System/Mips/Rumblepak.h b/Source/Project64/N64 System/Mips/Rumblepak.h
new file mode 100644
index 000000000..73b476c15
--- /dev/null
+++ b/Source/Project64/N64 System/Mips/Rumblepak.h	
@@ -0,0 +1,19 @@
+/****************************************************************************
+*                                                                           *
+* Project 64 - A Nintendo 64 emulator.                                      *
+* http://www.pj64-emu.com/                                                  *
+* Copyright (C) 2012 Project64. All rights reserved.                        *
+*                                                                           *
+* License:                                                                  *
+* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html                        *
+*                                                                           *
+****************************************************************************/
+#pragma once
+
+class Rumblepak
+{
+public:
+	static void ReadFrom(BYTE * command);
+	static void WriteTo(int Control, BYTE * command);
+
+};
diff --git a/Source/Project64/N64 System/Mips/Sram.cpp b/Source/Project64/N64 System/Mips/Sram.cpp
index 130a8d13d..fc70b7f96 100644
--- a/Source/Project64/N64 System/Mips/Sram.cpp	
+++ b/Source/Project64/N64 System/Mips/Sram.cpp	
@@ -11,29 +11,32 @@
 #include "stdafx.h"
 
 CSram::CSram ( bool ReadOnly ) :
-	m_hFile(NULL),
-	m_ReadOnly(ReadOnly)
+	m_ReadOnly(ReadOnly),
+	m_hFile(NULL)
 {
+	
 }
 
-CSram::~CSram (void) 
+CSram::~CSram()
 {
-	if (m_hFile) {
+	if (m_hFile)
+	{
 		CloseHandle(m_hFile);
 		m_hFile = NULL;
 	}
 }
 
-BOOL CSram::LoadSram (void) {
+bool CSram::LoadSram()
+{
 	CPath FileName;
 
-	FileName.SetDriveDirectory( g_Settings->LoadString(Directory_NativeSave).c_str());
-	FileName.SetName(g_Settings->LoadString(Game_GameName).c_str());
+	FileName.SetDriveDirectory( g_Settings->LoadStringVal(Directory_NativeSave).c_str());
+	FileName.SetName(g_Settings->LoadStringVal(Game_GameName).c_str());
 	FileName.SetExtension("sra");
 
 	if (!FileName.DirectoryExists())
 	{
-		FileName.CreateDirectory();
+		FileName.DirectoryCreate();
 	}
 
 	m_hFile = CreateFile(FileName,m_ReadOnly ? GENERIC_READ : GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,NULL,OPEN_ALWAYS,
@@ -47,32 +50,163 @@ BOOL CSram::LoadSram (void) {
 	return true;
 }
 
-void CSram::DmaFromSram(BYTE * dest, int StartOffset, int len) {
+void CSram::DmaFromSram(BYTE * dest, int StartOffset, int len)
+{
 	DWORD dwRead;
+	DWORD i;
+	BYTE tmp[4];
 
-	if (m_hFile == NULL) {
-		if (!LoadSram()) {
+	if (m_hFile == NULL)
+	{
+		if (!LoadSram())
+		{
 			return;
 		}
 	}
-	SetFilePointer(m_hFile,StartOffset,NULL,FILE_BEGIN);	
-	ReadFile(m_hFile,dest,len,&dwRead,NULL);
+	DWORD Offset = StartOffset & 3;
 
+	if (Offset == 0)
+	{
+		SetFilePointer(m_hFile, StartOffset, NULL, FILE_BEGIN);
+		ReadFile(m_hFile, dest, len, &dwRead, NULL);
+	}
+	else
+	{
+		SetFilePointer(m_hFile, StartOffset - Offset, NULL, FILE_BEGIN);
+
+		ReadFile(m_hFile, tmp, 4, &dwRead, NULL);
+		for (i = 0; i < (4 - Offset); i++)
+		{
+			dest[i + Offset] = tmp[i];
+		}
+		for (i = 4 - Offset; i < len - Offset; i += 4)
+		{
+			ReadFile(m_hFile, tmp, 4, &dwRead, NULL);
+			switch (Offset)
+			{
+			case 1:
+				dest[i + 2] = tmp[0];
+				dest[i + 3] = tmp[1];
+				dest[i + 4] = tmp[2];
+				dest[i - 3] = tmp[3];
+				break;
+			case 2:
+				dest[i + 4] = tmp[0];
+				dest[i + 5] = tmp[1];
+				dest[i - 2] = tmp[2];
+				dest[i - 1] = tmp[3];
+				break;
+			case 3:
+				dest[i + 6] = tmp[0];
+				dest[i - 1] = tmp[1];
+				dest[i] = tmp[2];
+				dest[i + 1] = tmp[3];
+				break;
+			default:
+				break;
+			}
+		}
+		ReadFile(m_hFile, tmp, 4, &dwRead, NULL);
+		switch (Offset)
+		{
+		case 1:
+			dest[i - 3] = tmp[3];
+			break;
+		case 2:
+			dest[i - 2] = tmp[2];
+			dest[i - 1] = tmp[3];
+			break;
+		case 3:
+			dest[i - 1] = tmp[1];
+			dest[i] = tmp[2];
+			dest[i + 1] = tmp[3];
+			break;
+		default:
+			break;
+		}
+	}
 }
 
-void CSram::DmaToSram(BYTE * Source, int StartOffset, int len) {
+void CSram::DmaToSram(BYTE * Source, int StartOffset, int len)
+{
+	DWORD dwWritten;
+	DWORD i;
+	BYTE tmp[4];
+
 	if (m_ReadOnly)
 	{
 		return;
 	}
 
-	if (m_hFile == NULL) {
-		if (!LoadSram()) {
+	if (m_hFile == NULL)
+	{
+		if (!LoadSram())
+		{
 			return;
 		}
 	}
-	DWORD dwWritten;
-	SetFilePointer(m_hFile,StartOffset,NULL,FILE_BEGIN);	
-	WriteFile(m_hFile,Source,len,&dwWritten,NULL);
+	DWORD Offset = StartOffset & 3;
+	if (Offset == 0)
+	{
+		SetFilePointer(m_hFile, StartOffset, NULL, FILE_BEGIN);
+		WriteFile(m_hFile, Source, len, &dwWritten, NULL);
+	}
+	else
+	{
+		for (i = 0; i < (4 - Offset); i++)
+		{
+			tmp[i] = Source[i + Offset];
+		}
+		SetFilePointer(m_hFile, StartOffset - Offset, NULL, FILE_BEGIN);
+		WriteFile(m_hFile, tmp, (4 - Offset), &dwWritten, NULL);
+
+		SetFilePointer(m_hFile, Offset, NULL, FILE_CURRENT);
+		for (i = 4 - Offset; i < len - Offset; i += 4)
+		{
+			switch (Offset)
+			{
+			case 1:
+				tmp[0] = Source[i + 2];
+				tmp[1] = Source[i + 3];
+				tmp[2] = Source[i + 4];
+				tmp[3] = Source[i - 3];
+				break;
+			case 2:
+				tmp[0] = Source[i + 4];
+				tmp[1] = Source[i + 5];
+				tmp[2] = Source[i - 2];
+				tmp[3] = Source[i - 1];
+				break;
+			case 3:
+				tmp[0] = Source[i + 6];
+				tmp[1] = Source[i - 1];
+				tmp[2] = Source[i];
+				tmp[3] = Source[i + 1];
+				break;
+			default:
+				break;
+			}
+			WriteFile(m_hFile, tmp, 4, &dwWritten, NULL);
+		}
+		switch (Offset)
+		{
+		case 1:
+			tmp[0] = Source[i - 3];
+			break;
+		case 2:
+			tmp[0] = Source[i - 2];
+			tmp[0] = Source[i - 1];
+			break;
+		case 3:
+			tmp[0] = Source[i - 1];
+			tmp[0] = Source[i];
+			tmp[0] = Source[i + 1];
+			break;
+		default:
+			break;
+		}
+		SetFilePointer(m_hFile, 4 - Offset, NULL, FILE_CURRENT);
+		WriteFile(m_hFile, tmp, Offset, &dwWritten, NULL);
+	}
 	FlushFileBuffers(m_hFile);
 }
diff --git a/Source/Project64/N64 System/Mips/Sram.h b/Source/Project64/N64 System/Mips/Sram.h
index 30206ccb0..1b9c9f32c 100644
--- a/Source/Project64/N64 System/Mips/Sram.h	
+++ b/Source/Project64/N64 System/Mips/Sram.h	
@@ -13,14 +13,14 @@
 class CSram 
 {
 public:
-	CSram ( bool ReadOnly );
-   ~CSram ( void );
+	CSram(bool ReadOnly);
+	~CSram();
 
-	void DmaFromSram ( BYTE * dest, int StartOffset, int len);
-	void DmaToSram   ( BYTE * Source, int StartOffset, int len);
+	void DmaFromSram(BYTE * dest, int StartOffset, int len);
+	void DmaToSram(BYTE * Source, int StartOffset, int len);
 
 private:
-	BOOL LoadSram    ( void );
+	bool LoadSram();
 
 	bool   m_ReadOnly;
 	HANDLE m_hFile;
diff --git a/Source/Project64/N64 System/Mips/System Events.cpp b/Source/Project64/N64 System/Mips/System Events.cpp
index 402e7ed8f..ff8b9a4e5 100644
--- a/Source/Project64/N64 System/Mips/System Events.cpp	
+++ b/Source/Project64/N64 System/Mips/System Events.cpp	
@@ -11,14 +11,16 @@
 #include "stdafx.h"
 
 CSystemEvents::CSystemEvents(CN64System * System, CPlugins * Plugins) :
-	m_bDoSomething(false),
 	m_System(System),
-	m_Plugins(Plugins)
+	m_Plugins(Plugins),
+	m_bDoSomething(false)
 {
+	
 }
 
 CSystemEvents::~CSystemEvents()
 {
+	
 }
 
 void CSystemEvents::QueueEvent(SystemEvent action)
@@ -36,7 +38,7 @@ void CSystemEvents::QueueEvent(SystemEvent action)
 	m_Events.push_back(action);
 }
 
-void CSystemEvents::ExecuteEvents ( void )
+void CSystemEvents::ExecuteEvents()
 {
 	EventList Events;
 	{
@@ -120,7 +122,7 @@ void CSystemEvents::ExecuteEvents ( void )
 			ChangePluginFunc();
 			break;
 		case SysEvent_ChangingFullScreen:
-			g_Notify->ChangeFullScreen();
+			Notify().ChangeFullScreen();
 			break;
 		case SysEvent_GSButtonPressed:
 			if (m_System->m_Cheats.CheatsSlectionChanged())
@@ -205,7 +207,7 @@ void CSystemEvents::ExecuteEvents ( void )
 	}
 }
 
-void CSystemEvents::ChangePluginFunc ( void )
+void CSystemEvents::ChangePluginFunc()
 {
 	g_Notify->DisplayMessage(0,MSG_PLUGIN_INIT);
 	m_System->PluginReset();
diff --git a/Source/Project64/N64 System/Mips/System Events.h b/Source/Project64/N64 System/Mips/System Events.h
index 07127c908..3bb02bbc3 100644
--- a/Source/Project64/N64 System/Mips/System Events.h	
+++ b/Source/Project64/N64 System/Mips/System Events.h	
@@ -10,7 +10,8 @@
 ****************************************************************************/
 #pragma once
 
-enum SystemEvent {
+enum SystemEvent
+{
 	SysEvent_ExecuteInterrupt,
 	SysEvent_GSButtonPressed,
 	SysEvent_ResetCPU_Soft,
@@ -58,17 +59,20 @@ protected:
 	virtual ~CSystemEvents();
 
 public:
-	void ExecuteEvents ( void );
-	void QueueEvent    ( SystemEvent action);
+	void ExecuteEvents();
+	void QueueEvent(SystemEvent action);
 
-	inline const BOOL & DoSomething ( void ) const { return m_bDoSomething; }
+	const BOOL & DoSomething() const
+	{
+		return m_bDoSomething;
+	}
 
 private:
-	CSystemEvents(void);							// Disable default constructor
-	CSystemEvents(const CSystemEvents&);			// Disable copy constructor
-	CSystemEvents& operator=(const CSystemEvents&);	// Disable assignment
+	CSystemEvents();                                // Disable default constructor
+	CSystemEvents(const CSystemEvents&);            // Disable copy constructor
+	CSystemEvents& operator=(const CSystemEvents&); // Disable assignment
 
-	void ChangePluginFunc( void );
+	void ChangePluginFunc();
 
 	CN64System    * m_System;
 	CPlugins      * m_Plugins;
diff --git a/Source/Project64/N64 System/Mips/System Timing.cpp b/Source/Project64/N64 System/Mips/System Timing.cpp
index 2a16c8fd9..82f23388a 100644
--- a/Source/Project64/N64 System/Mips/System Timing.cpp	
+++ b/Source/Project64/N64 System/Mips/System Timing.cpp	
@@ -14,9 +14,10 @@ CSystemTimer::CSystemTimer( int & NextTimer ) :
 	m_NextTimer(NextTimer),
 	m_inFixTimer(false)
 {
+	
 }
 
-void CSystemTimer::Reset ( void ) 
+void CSystemTimer::Reset()
 {
 	//initialise Structure
 	for (int i = 0; i < MaxTimer; i++)
@@ -47,10 +48,14 @@ void CSystemTimer::SetTimer ( TimerType Type, DWORD Cycles, bool bRelative )
 		if (m_TimerDetatils[Type].Active) 
 		{
 			m_TimerDetatils[Type].CyclesToTimer += Cycles; //Add to the timer
-		} else {
+		}
+		else
+		{
 			m_TimerDetatils[Type].CyclesToTimer = (__int64)Cycles - (__int64)m_NextTimer;  //replace the new cycles
 		}
-	} else {
+	}
+	else
+	{
 		m_TimerDetatils[Type].CyclesToTimer = (__int64)Cycles - (__int64)m_NextTimer;  //replace the new cycles
 	}
 	FixTimers();
@@ -91,7 +96,7 @@ void CSystemTimer::StopTimer ( TimerType Type )
 }
 
 
-void CSystemTimer::FixTimers (void)
+void CSystemTimer::FixTimers()
 {
 
 	if (m_inFixTimer)
@@ -148,7 +153,7 @@ void CSystemTimer::FixTimers (void)
 	m_inFixTimer = false;
 }
 
-void CSystemTimer::UpdateTimers ( void )
+void CSystemTimer::UpdateTimers()
 {
 	int TimeTaken = m_LastUpdate - m_NextTimer;
 	if (TimeTaken != 0)
@@ -163,19 +168,22 @@ void CSystemTimer::UpdateTimers ( void )
 	}
 }
 
-void CSystemTimer::TimerDone (void) 
+void CSystemTimer::TimerDone()
 {
 	UpdateTimers();
 
 /*	DWORD LastTimer;
-	if (Profiling) { 
+	if (Profiling)
+	{ 
 		LastTimer = StartTimer(Timer_Done); 
 	}
-	if (LogOptions.GenerateLog && LogOptions.LogExceptions && !LogOptions.NoInterrupts) {
+	if (LogOptions.GenerateLog && LogOptions.LogExceptions && !LogOptions.NoInterrupts)
+	{
 		LogMessage("%08X: Timer Done (Type: %d CurrentTimer: %d)", *_PROGRAM_COUNTER, m_Current, *_Timer );
 	}
 */
-	switch (m_Current) {
+	switch (m_Current)
+	{
 	case CSystemTimer::CompareTimer:
 		g_Reg->FAKE_CAUSE_REGISTER |= CAUSE_IP7;
 		g_Reg->CheckInterrupts();
@@ -211,9 +219,12 @@ void CSystemTimer::TimerDone (void)
 		break;
 	case CSystemTimer::RspTimer:
 		g_SystemTimer->StopTimer(CSystemTimer::RspTimer);
-		try {
+		try
+		{
 			g_System->RunRSP();
-		} catch (...) {
+		}
+		catch (...)
+		{
 			g_Notify->BreakPoint(__FILEW__,__LINE__);
 		}
 		break;
@@ -234,12 +245,13 @@ void CSystemTimer::TimerDone (void)
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 	}
 	//CheckTimer();
-	/*if (Profiling) { 
+	/*if (Profiling)
+	{ 
 		StartTimer(LastTimer); 
 	}*/
 }
 
-void CSystemTimer::SetCompareTimer ( void )
+void CSystemTimer::SetCompareTimer()
 {
 	DWORD NextCompare = 0x7FFFFFFF;
 	if (g_Reg)
@@ -266,8 +278,14 @@ bool CSystemTimer::SaveAllowed  ( void )
 	}
 	for (int i = 0; i < MaxTimer; i++)
 	{
-		if (i == CompareTimer) { continue; }
-		if (i == ViTimer) { continue; }
+		if (i == CompareTimer)
+		{
+			continue;
+		}
+		if (i == ViTimer)
+		{
+			continue;
+		}
 		if (m_TimerDetatils[i].Active)
 		{
 			return false;
@@ -295,8 +313,16 @@ void CSystemTimer::LoadData ( void * file )
 	unzReadCurrentFile( file,&TimerDetailsSize,sizeof(TimerDetailsSize));
 	unzReadCurrentFile( file,&Entries,sizeof(Entries));
 
-	if (TimerDetailsSize != sizeof(TIMER_DETAILS)) { g_Notify->BreakPoint(__FILEW__,__LINE__); return; }
-	if (Entries != sizeof(m_TimerDetatils)/sizeof(m_TimerDetatils[0])) { g_Notify->BreakPoint(__FILEW__,__LINE__); return; }
+	if (TimerDetailsSize != sizeof(TIMER_DETAILS))
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__);
+		return;
+	}
+	if (Entries != sizeof(m_TimerDetatils)/sizeof(m_TimerDetatils[0]))
+	{
+		g_Notify->BreakPoint(__FILEW__,__LINE__);
+		return;
+	}
 
 	unzReadCurrentFile(file,(void *)&m_TimerDetatils,sizeof(m_TimerDetatils));
 	unzReadCurrentFile(file,(void *)&m_LastUpdate,sizeof(m_LastUpdate));
@@ -338,15 +364,33 @@ void CSystemTimer::RecordDifference( CLog &LogFile, const CSystemTimer& rSystemT
 
 bool CSystemTimer::operator == (const CSystemTimer& rSystemTimer) const
 {
-	if (m_LastUpdate != rSystemTimer.m_LastUpdate) { return false; }
-	if (m_NextTimer != rSystemTimer.m_NextTimer) { return false; }
-	if (m_Current != rSystemTimer.m_Current) { return false; }
-	if (m_inFixTimer != rSystemTimer.m_inFixTimer) { return false; }
+	if (m_LastUpdate != rSystemTimer.m_LastUpdate)
+	{
+		return false;
+	}
+	if (m_NextTimer != rSystemTimer.m_NextTimer)
+	{
+		return false;
+	}
+	if (m_Current != rSystemTimer.m_Current)
+	{
+		return false;
+	}
+	if (m_inFixTimer != rSystemTimer.m_inFixTimer)
+	{
+		return false;
+	}
 
 	for (int i = 0; i < MaxTimer; i++)
 	{
-		if (m_TimerDetatils[i].Active != rSystemTimer.m_TimerDetatils[i].Active) { return false; }
-		if (m_TimerDetatils[i].CyclesToTimer != rSystemTimer.m_TimerDetatils[i].CyclesToTimer) { return false; }
+		if (m_TimerDetatils[i].Active != rSystemTimer.m_TimerDetatils[i].Active)
+		{
+			return false;
+		}
+		if (m_TimerDetatils[i].CyclesToTimer != rSystemTimer.m_TimerDetatils[i].CyclesToTimer)
+		{
+			return false;
+		}
 	}
 	return true;
 }
diff --git a/Source/Project64/N64 System/Mips/System Timing.h b/Source/Project64/N64 System/Mips/System Timing.h
index fcc246739..74da3abc6 100644
--- a/Source/Project64/N64 System/Mips/System Timing.h	
+++ b/Source/Project64/N64 System/Mips/System Timing.h	
@@ -15,7 +15,8 @@
 class CSystemTimer
 {
 public:
-	enum TimerType {
+	enum TimerType
+	{
 		UnknownTimer, 
 		CompareTimer, 
 		SoftResetTimer, 
@@ -30,39 +31,40 @@ public:
 		MaxTimer
 	};
 
-	typedef struct {
+	struct TIMER_DETAILS
+	{
 		bool    Active;
 		__int64 CyclesToTimer;
-	} TIMER_DETAILS;
+	};
 
 public:
 	          CSystemTimer         ( int & NextTimer );
 	void      SetTimer             ( TimerType Type, DWORD Cycles, bool bRelative );
 	DWORD     GetTimer             ( TimerType Type );
 	void      StopTimer            ( TimerType Type );
-	void      UpdateTimers         ( void ); 
-	void      TimerDone            ( void ); 
-	void      Reset                ( void );
-	void      UpdateCompareTimer   ( void );
-	bool      SaveAllowed          ( void );
+	void      UpdateTimers         ();
+	void      TimerDone            ();
+	void      Reset                ();
+	void      UpdateCompareTimer   ();
+	bool      SaveAllowed          ();
 	
 	void      SaveData             ( void * file ) const;
 	void      LoadData             ( void * file );
 
 	void RecordDifference( CLog &LogFile, const CSystemTimer& rSystemTimer);
 
-	inline TimerType CurrentType ( void ) const { return m_Current; }
+	TimerType CurrentType() const { return m_Current; }
 
-    bool operator == (const CSystemTimer& rSystemTimer) const;
-    bool operator != (const CSystemTimer& rSystemTimer) const;
+	bool operator == (const CSystemTimer& rSystemTimer) const;
+	bool operator != (const CSystemTimer& rSystemTimer) const;
 
-private:	
+private:
 	TIMER_DETAILS m_TimerDetatils[MaxTimer];
 	int           m_LastUpdate; //Timer at last update
-	int         & m_NextTimer;  
+	int         & m_NextTimer;
 	TimerType     m_Current;
 	bool          m_inFixTimer;
 
-	void SetCompareTimer   ( void );
-	void FixTimers         ( void );
+	void SetCompareTimer();
+	void FixTimers();
 };
diff --git a/Source/Project64/N64 System/Mips/TLB Class.h b/Source/Project64/N64 System/Mips/TLB Class.h
index bc3fdf7f1..1a373b2a1 100644
--- a/Source/Project64/N64 System/Mips/TLB Class.h	
+++ b/Source/Project64/N64 System/Mips/TLB Class.h	
@@ -12,25 +12,28 @@
 
 class CDebugTlb;
 
-class CTLB_CB 
+class CTLB_CB
 {
-public:	
-	virtual void TLB_Mapped  ( DWORD VAddr, DWORD Len, DWORD PAddr, bool bReadOnly ) = 0;
-	virtual void TLB_Unmaped ( DWORD VAddr, DWORD Len ) = 0;
-	virtual void TLB_Changed ( void ) = 0;
+public:
+	virtual void TLB_Mapped(DWORD VAddr, DWORD Len, DWORD PAddr, bool bReadOnly) = 0;
+	virtual void TLB_Unmaped(DWORD VAddr, DWORD Len) = 0;
+	virtual void TLB_Changed() = 0;
 };
 
 class CTLB :
 	protected CSystemRegisters
 {
 public:
-	typedef struct {
+	struct TLB_ENTRY
+	{
 		bool EntryDefined;
-		union {
+		union
+		{
 			unsigned long Value;
 			unsigned char A[4];
 			
-			struct {
+			struct
+			{
 				unsigned zero : 13;
 				unsigned Mask : 12;
 				unsigned zero2 : 7;
@@ -38,11 +41,13 @@ public:
 			
 		} PageMask;
 		
-		union {
+		union
+		{
 			unsigned long Value;
 			unsigned char A[4];
 			
-			struct {
+			struct
+			{
 				unsigned ASID : 8;
 				unsigned Zero : 4;
 				unsigned G : 1;
@@ -51,11 +56,13 @@ public:
 			
 		} EntryHi;
 
-		union {
+		union
+		{
 			unsigned long Value;
 			unsigned char A[4];
 			
-			struct {
+			struct
+			{
 				unsigned GLOBAL: 1;
 				unsigned V : 1;
 				unsigned D : 1;
@@ -66,11 +73,13 @@ public:
 			
 		} EntryLo0;
 		
-		union {
+		union
+		{
 			unsigned long Value;
 			unsigned char A[4];
 			
-			struct {
+			struct
+			{
 				unsigned GLOBAL: 1;
 				unsigned V : 1;
 				unsigned D : 1;
@@ -80,33 +89,37 @@ public:
 			} ;
 			
 		} EntryLo1;
-	} TLB_ENTRY;
+	};
 	
 public:
-	     CTLB ( CTLB_CB * CallBack );
-		~CTLB ( void );
+	CTLB(CTLB_CB * CallBack);
+	~CTLB();
 
-	void Reset          ( bool InvalidateTLB );
+	void Reset(bool InvalidateTLB);
 	
 	//Used by opcodes of the same name to manipulate the tlb (reads the registers)
-	void Probe          ( void );
-	void ReadEntry      ( void );
-	void WriteEntry     ( int index, bool Random );
+	void Probe();
+	void ReadEntry();
+	void WriteEntry(int index, bool Random);
 
 	//See if a VAddr has an entry to translate to a PAddr
-	bool AddressDefined ( DWORD VAddr );
+	bool AddressDefined(DWORD VAddr);
 	
-	const TLB_ENTRY & TlbEntry ( int Entry) const { return m_tlb[Entry]; }
+	const TLB_ENTRY & TlbEntry(int Entry) const
+	{
+		return m_tlb[Entry];
+	}
 
-	bool PAddrToVAddr       ( DWORD PAddr, DWORD & VAddr, DWORD & Index );
+	bool PAddrToVAddr(DWORD PAddr, DWORD & VAddr, DWORD & Index);
 
-	void RecordDifference ( CLog &LogFile, const CTLB& rTLB);
+	void RecordDifference(CLog &LogFile, const CTLB& rTLB);
 
 	bool operator == (const CTLB& rTLB) const;
 	bool operator != (const CTLB& rTLB) const;
 
 private:
-	typedef struct {
+	struct FASTTLB
+	{
 		DWORD VSTART;
 		DWORD VEND;
 		DWORD PHYSSTART;
@@ -118,7 +131,7 @@ private:
 		bool  ValidEntry;
 		bool  Random;
 		bool  Probed;
-	} FASTTLB; 
+	};
 
 	friend CDebugTlb; // enable debug window to read class
 
@@ -127,5 +140,5 @@ private:
 	TLB_ENTRY m_tlb[32];
 	FASTTLB   m_FastTlb[64];
 
-	void SetupTLB_Entry     ( int index, bool Random );
+	void SetupTLB_Entry(int index, bool Random);
 };
diff --git a/Source/Project64/N64 System/Mips/TLB class.cpp b/Source/Project64/N64 System/Mips/TLB class.cpp
index 2032c4b20..71b7d05eb 100644
--- a/Source/Project64/N64 System/Mips/TLB class.cpp	
+++ b/Source/Project64/N64 System/Mips/TLB class.cpp	
@@ -20,12 +20,14 @@ CTLB::CTLB(CTLB_CB * CallBack ):
 	WriteTrace(TraceTLB,__FUNCTION__ ": Done");
 }
 
-CTLB::~CTLB (void) {
+CTLB::~CTLB()
+{
 	WriteTrace(TraceTLB,__FUNCTION__ ": Start");
 	WriteTrace(TraceTLB,__FUNCTION__ ": Done");
 }
 
-void CTLB::Reset (bool InvalidateTLB) {
+void CTLB::Reset (bool InvalidateTLB)
+{
 	DWORD count;
 
 	for (count = 0; count < 64; count++) 
@@ -39,7 +41,9 @@ void CTLB::Reset (bool InvalidateTLB) {
 		{ 
 			m_tlb[count].EntryDefined = false; 
 		}
-	} else {
+	}
+	else
+	{
 		for (count = 0; count < 32; count ++) 
 		{ 
 			SetupTLB_Entry(count,false); 
@@ -47,10 +51,12 @@ void CTLB::Reset (bool InvalidateTLB) {
 	}
 }
 
-bool CTLB::AddressDefined ( DWORD VAddr) {
+bool CTLB::AddressDefined ( DWORD VAddr)
+{
 	DWORD i;
 
-	if (VAddr >= 0x80000000 && VAddr <= 0xBFFFFFFF) {
+	if (VAddr >= 0x80000000 && VAddr <= 0xBFFFFFFF)
+	{
 		return true;
 	}
 
@@ -66,7 +72,8 @@ bool CTLB::AddressDefined ( DWORD VAddr) {
 	return false;
 }
 
-void CTLB::Probe (void) {
+void CTLB::Probe()
+{
 	int Counter;
 	
 	WriteTrace(TraceTLB,__FUNCTION__ ": Start");
@@ -83,7 +90,8 @@ void CTLB::Probe (void) {
 		DWORD TlbValueMasked = TlbEntryHiValue & Mask;
 		DWORD EntryHiMasked = g_Reg->ENTRYHI_REGISTER & Mask;
 
-		if (TlbValueMasked == EntryHiMasked) {			
+		if (TlbValueMasked == EntryHiMasked)
+		{			
 			if ((TlbEntryHiValue & 0x100) != 0 || //Global
 				((TlbEntryHiValue & 0xFF) == (g_Reg->ENTRYHI_REGISTER & 0xFF))) //SameAsid 
 			{
@@ -98,7 +106,8 @@ void CTLB::Probe (void) {
 	WriteTrace(TraceTLB,__FUNCTION__ ": Done");
 }
 
-void CTLB::ReadEntry (void) {
+void CTLB::ReadEntry()
+{
 	DWORD index = g_Reg->INDEX_REGISTER & 0x1F;
 
 	g_Reg->PAGE_MASK_REGISTER = m_tlb[index].PageMask.Value ;
@@ -107,13 +116,15 @@ void CTLB::ReadEntry (void) {
 	g_Reg->ENTRYLO1_REGISTER = m_tlb[index].EntryLo1.Value;		
 }
 
-void CTLB::WriteEntry (int index, bool Random) {
+void CTLB::WriteEntry (int index, bool Random)
+{
 	int FastIndx;
 
 	WriteTraceF(TraceTLB,__FUNCTION__ ": %02d %d %08X %08X %08X %08X ",index,Random,g_Reg->PAGE_MASK_REGISTER,g_Reg->ENTRYHI_REGISTER,g_Reg->ENTRYLO0_REGISTER,g_Reg->ENTRYLO1_REGISTER);
 
 	//Check to see if entry is unmapping it self
-	if (m_tlb[index].EntryDefined) {
+	if (m_tlb[index].EntryDefined)
+	{
 		FastIndx = index << 1;
 		if (*_PROGRAM_COUNTER >= m_FastTlb[FastIndx].VSTART && 
 			*_PROGRAM_COUNTER < m_FastTlb[FastIndx].VEND &&
@@ -134,16 +145,25 @@ void CTLB::WriteEntry (int index, bool Random) {
 	//Reset old addresses
 	if (m_tlb[index].EntryDefined) 
 	{
-		for ( FastIndx = index << 1; FastIndx <= (index << 1) + 1; FastIndx++) {
-			if (!m_FastTlb[FastIndx].ValidEntry) { continue; }
-			if (!m_FastTlb[FastIndx].VALID) { continue; }
+		for ( FastIndx = index << 1; FastIndx <= (index << 1) + 1; FastIndx++)
+		{
+			if (!m_FastTlb[FastIndx].ValidEntry)
+			{
+				continue;
+			}
+			if (!m_FastTlb[FastIndx].VALID)
+			{
+				continue;
+			}
 			if (m_tlb[index].PageMask.Value == g_Reg->PAGE_MASK_REGISTER &&
 				m_tlb[index].EntryHi.Value == g_Reg->ENTRYHI_REGISTER) 
 			{
-				if (FastIndx == (index << 1) && m_tlb[index].EntryLo0.Value == g_Reg->ENTRYLO0_REGISTER) {
+				if (FastIndx == (index << 1) && m_tlb[index].EntryLo0.Value == g_Reg->ENTRYLO0_REGISTER)
+				{
 					continue;
 				}
-				if (FastIndx != (index << 1) && m_tlb[index].EntryLo1.Value == g_Reg->ENTRYLO1_REGISTER) {
+				if (FastIndx != (index << 1) && m_tlb[index].EntryLo1.Value == g_Reg->ENTRYLO1_REGISTER)
+				{
 					continue;
 				}
 			}
@@ -161,9 +181,13 @@ void CTLB::WriteEntry (int index, bool Random) {
 	m_CB->TLB_Changed();
 }
 
-void CTLB::SetupTLB_Entry (int index, bool Random) {
+void CTLB::SetupTLB_Entry (int index, bool Random)
+{
 	//Fix up Fast TLB entries
-	if (!m_tlb[index].EntryDefined) { return; }
+	if (!m_tlb[index].EntryDefined)
+	{
+		return;
+	}
 
 	int FastIndx = index << 1;
 	if (m_FastTlb[FastIndx].VALID) 
@@ -178,7 +202,7 @@ void CTLB::SetupTLB_Entry (int index, bool Random) {
 	m_FastTlb[FastIndx].VALID = m_tlb[index].EntryLo0.V;
 	m_FastTlb[FastIndx].DIRTY = m_tlb[index].EntryLo0.D; 
 	m_FastTlb[FastIndx].GLOBAL = m_tlb[index].EntryLo0.GLOBAL & m_tlb[index].EntryLo1.GLOBAL;
-	m_FastTlb[FastIndx].ValidEntry = FALSE;
+	m_FastTlb[FastIndx].ValidEntry = false;
 	m_FastTlb[FastIndx].Random = Random;
 	m_FastTlb[FastIndx].Probed = false;
 
@@ -196,24 +220,29 @@ void CTLB::SetupTLB_Entry (int index, bool Random) {
 	m_FastTlb[FastIndx].VALID = m_tlb[index].EntryLo1.V;
 	m_FastTlb[FastIndx].DIRTY = m_tlb[index].EntryLo1.D; 
 	m_FastTlb[FastIndx].GLOBAL = m_tlb[index].EntryLo0.GLOBAL & m_tlb[index].EntryLo1.GLOBAL;
-	m_FastTlb[FastIndx].ValidEntry = FALSE;
+	m_FastTlb[FastIndx].ValidEntry = false;
 	m_FastTlb[FastIndx].Random = Random;
 	m_FastTlb[FastIndx].Probed = false;
 
 	//Test both entries to see if they are valid
- 	for ( FastIndx = index << 1; FastIndx <= (index << 1) + 1; FastIndx++) {
-		if (!m_FastTlb[FastIndx].VALID) { 
+ 	for ( FastIndx = index << 1; FastIndx <= (index << 1) + 1; FastIndx++)
+	{
+		if (!m_FastTlb[FastIndx].VALID)
+		{ 
 			m_FastTlb[FastIndx].ValidEntry = true;
 			continue; 
 		}
 		
-		if (m_FastTlb[FastIndx].VEND <= m_FastTlb[FastIndx].VSTART) {
+		if (m_FastTlb[FastIndx].VEND <= m_FastTlb[FastIndx].VSTART)
+		{
 			continue;
 		}
-		if (m_FastTlb[FastIndx].VSTART >= 0x80000000 && m_FastTlb[FastIndx].VEND <= 0xBFFFFFFF) {
+		if (m_FastTlb[FastIndx].VSTART >= 0x80000000 && m_FastTlb[FastIndx].VEND <= 0xBFFFFFFF)
+		{
 			continue;
 		}
-		if (m_FastTlb[FastIndx].PHYSSTART > 0x1FFFFFFF) {
+		if (m_FastTlb[FastIndx].PHYSSTART > 0x1FFFFFFF)
+		{
 			continue;				
 		}
 			
@@ -227,7 +256,10 @@ bool CTLB::PAddrToVAddr(DWORD PAddr, DWORD & VAddr, DWORD & Index )
 {
 	for (int i = Index; i < 64; i++)
 	{
-		if (m_FastTlb[i].ValidEntry == false) { continue; }
+		if (m_FastTlb[i].ValidEntry == false)
+		{
+			continue;
+		}
 		if (PAddr >= m_FastTlb[i].PHYSSTART && PAddr < m_FastTlb[i].PHYSEND) 
 		{
 			VAddr = m_FastTlb[i].VSTART + (PAddr - m_FastTlb[i].PHYSSTART);
@@ -248,7 +280,10 @@ void CTLB::RecordDifference( CLog &LogFile, const CTLB& rTLB)
 			LogFile.LogF("TLB[%d] Defined: %s %s\r\n",i,m_tlb[i].EntryDefined ? "Yes" : "No",rTLB.m_tlb[i].EntryDefined ? "Yes" : "No");
 			continue;
 		}
-		if (!m_tlb[i].EntryDefined) { continue; }
+		if (!m_tlb[i].EntryDefined)
+		{
+			continue;
+		}
 		if (m_tlb[i].PageMask.Value != rTLB.m_tlb[i].PageMask.Value)
 		{
 			LogFile.LogF("TLB[%d] PageMask: %X %X\r\n",i,m_tlb[i].PageMask.Value,rTLB.m_tlb[i].PageMask.Value);
@@ -272,8 +307,14 @@ bool CTLB::operator == (const CTLB& rTLB) const
 {
 	for (int i = 0, n = sizeof(m_tlb)/sizeof(m_tlb[0]); i < n; i++)
 	{
-		if (m_tlb[i].EntryDefined != rTLB.m_tlb[i].EntryDefined) { return false; }
-		if (!m_tlb[i].EntryDefined) { continue; }
+		if (m_tlb[i].EntryDefined != rTLB.m_tlb[i].EntryDefined)
+		{
+			return false;
+		}
+		if (!m_tlb[i].EntryDefined)
+		{
+			continue;
+		}
 		if (m_tlb[i].PageMask.Value != rTLB.m_tlb[i].PageMask.Value ||
 			m_tlb[i].EntryHi.Value != rTLB.m_tlb[i].EntryHi.Value ||
 			m_tlb[i].EntryLo0.Value != rTLB.m_tlb[i].EntryLo0.Value ||
diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp
index de59a2f5d..e4ac22b6c 100644
--- a/Source/Project64/N64 System/N64 Class.cpp	
+++ b/Source/Project64/N64 System/N64 Class.cpp	
@@ -13,35 +13,36 @@
 #pragma warning(disable:4355) // Disable 'this' : used in base member initializer list
 
 #include <windows.h>
+#include <commdlg.h>
 
 CN64System::CN64System ( CPlugins * Plugins, bool SavesReadOnly ) :
 	CSystemEvents(this, Plugins),
+	m_Cheats(NULL),
+	m_EndEmulation(false),
+	m_SaveUsing((SAVE_CHIP_TYPE)g_Settings->LoadDword(Game_SaveChip)),
+	m_Plugins(Plugins),
+	m_SyncCPU(NULL),
 	m_SyncPlugins(NULL),
 	m_SyncWindow(NULL),
-	m_Reg(this,this),
 	m_MMU_VM(this,SavesReadOnly),
 	m_TLB(this),
-	m_FPS(g_Notify),
-	m_Plugins(Plugins),
-	m_Cheats(NULL),
-	m_SyncCPU(NULL),
+	m_Reg(this,this),
 	m_Recomp(NULL),
 	m_InReset(false),
-	m_EndEmulation(false),
-	m_bCleanFrameBox(true),
-	m_bInitilized(false),
+	m_NextTimer(0),
 	m_SystemTimer(m_NextTimer),
+	m_bCleanFrameBox(true),
+	m_bInitialized(false),
+	m_RspBroke(true),
 	m_DMAUsed(false),
-	m_CPU_Handle(NULL),
-	m_CPU_ThreadID(0),
 	m_TestTimer(false),
 	m_NextInstruction(0),
 	m_JumpToLocation(0),
 	m_TLBLoadAddress(0),
 	m_TLBStoreAddress(0),
-	m_SaveUsing((SAVE_CHIP_TYPE)g_Settings->LoadDword(Game_SaveChip)),
-	m_RspBroke(true),
-	m_SyncCount(0)
+	m_SyncCount(0),
+	m_CPU_Handle(NULL),
+	m_CPU_ThreadID(0)
 {
 	DWORD gameHertz = g_Settings->LoadDword(Game_ScreenHertz);
 	if (gameHertz == 0)
@@ -54,7 +55,7 @@ CN64System::CN64System ( CPlugins * Plugins, bool SavesReadOnly ) :
 	m_Cheats.LoadCheats(!g_Settings->LoadDword(Setting_RememberCheats), Plugins);
 }
 
-CN64System::~CN64System ( void ) 
+CN64System::~CN64System()
 {
 	SetActiveSystem(false);
 	Mempak::Close();
@@ -184,7 +185,7 @@ bool CN64System::RunFileImage ( const char * FileLoc )
 
 	//Mark the rom as loading
 	g_Settings->SaveBool(GameRunning_LoadingInProgress,true);
-	g_Notify->RefreshMenu();
+	Notify().RefreshMenu();
 
 	//Try to load the passed N64 rom
 	if (g_Rom == NULL)
@@ -203,8 +204,11 @@ bool CN64System::RunFileImage ( const char * FileLoc )
 		g_System->RefreshGameSettings();
 
 		WriteTrace(TraceDebug,__FUNCTION__ ": Add Recent Rom");
-		g_Notify->AddRecentRom(FileLoc);
-        g_Notify->SetWindowCaption(g_Settings->LoadString(Game_GoodName).ToUTF16().c_str());
+		Notify().AddRecentRom(FileLoc);
+		Notify().SetWindowCaption(g_Settings->LoadStringVal(Game_GoodName).ToUTF16().c_str());
+
+		g_Settings->SaveBool(GameRunning_LoadingInProgress, false);
+		Notify().RefreshMenu();
 
 		if (g_Settings->LoadDword(Setting_AutoStart) != 0)
 		{
@@ -214,8 +218,6 @@ bool CN64System::RunFileImage ( const char * FileLoc )
 				g_BaseSystem->StartEmulation(true);
 			}
 		}
-		g_Settings->SaveBool(GameRunning_LoadingInProgress,false);
-		g_Notify->RefreshMenu();
 	}
 	else
 	{
@@ -224,17 +226,17 @@ bool CN64System::RunFileImage ( const char * FileLoc )
 		delete g_Rom;
 		g_Rom = NULL;
 		g_Settings->SaveBool(GameRunning_LoadingInProgress,false);
-		g_Notify->RefreshMenu();
+		Notify().RefreshMenu();
 		return false;
 	}
 	return true;
 }
 
-void CN64System::CloseSystem ( void ) 
+void CN64System::CloseSystem()
 {
 	if (g_BaseSystem)
 	{
-		g_BaseSystem->CloseCpu(); 
+		g_BaseSystem->CloseCpu();
 		delete g_BaseSystem;
 		g_BaseSystem = NULL;
 	}
@@ -251,7 +253,7 @@ bool CN64System::EmulationStarting ( HANDLE hThread, DWORD ThreadId )
 		g_BaseSystem->m_CPU_ThreadID = ThreadId;
 		WriteTrace(TraceDebug,__FUNCTION__ ": Setting up N64 system done");
 		g_Settings->SaveBool(GameRunning_LoadingInProgress,false);
-		g_Notify->RefreshMenu();
+		Notify().RefreshMenu();
 		try
 		{
 			WriteTrace(TraceDebug,__FUNCTION__ ": Game set to auto start, starting");
@@ -271,7 +273,7 @@ bool CN64System::EmulationStarting ( HANDLE hThread, DWORD ThreadId )
 		WriteTrace(TraceError,__FUNCTION__ ": SetActiveSystem failed");
 		g_Notify->DisplayError(__FUNCTIONW__ L": Failed to Initialize N64 System");
 		g_Settings->SaveBool(GameRunning_LoadingInProgress,false);
-		g_Notify->RefreshMenu();
+		Notify().RefreshMenu();
 		bRes = false;
 	}
 	return bRes;
@@ -283,7 +285,7 @@ void  CN64System::StartEmulation2   ( bool NewThread )
 	{
 		WriteTrace(TraceDebug,__FUNCTION__ ": Starting");
 
-		g_Notify->HideRomBrowser();
+		Notify().HideRomBrowser();
 
 		if (bHaveDebugger()) 
 		{
@@ -305,12 +307,16 @@ void  CN64System::StartEmulation2   ( bool NewThread )
 		if (CpuType == CPU_SyncCores)
 		{
 			g_Notify->DisplayMessage(5,L"Copy Plugins");
-			g_Plugins->CopyPlugins(g_Settings->LoadString(Directory_PluginSync));
+			g_Plugins->CopyPlugins(g_Settings->LoadStringVal(Directory_PluginSync));
+#if defined(WINDOWS_UI)
 			m_SyncWindow = new CMainGui(false);
-			m_SyncPlugins = new CPlugins( g_Settings->LoadString(Directory_PluginSync) ); 
+			m_SyncPlugins = new CPlugins( g_Settings->LoadStringVal(Directory_PluginSync) ); 
 			m_SyncPlugins->SetRenderWindows(m_SyncWindow,m_SyncWindow);
 
 			m_SyncCPU = new CN64System(m_SyncPlugins, true);
+#else
+			g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
 		}
 
 		if (CpuType == CPU_Recompiler || CpuType == CPU_SyncCores)
@@ -334,11 +340,11 @@ void  CN64System::StartEmulation2   ( bool NewThread )
 			g_Settings->SaveBool(GameRunning_LoadingInProgress,false);
 			g_Notify->DisplayError(MSG_PLUGIN_NOT_INIT);
 
-			g_Notify->RefreshMenu();
-			g_Notify->ShowRomBrowser();
+			Notify().RefreshMenu();
+			Notify().ShowRomBrowser();
 		}
 
-		g_Notify->MakeWindowOnTop(g_Settings->LoadBool(UserInterface_AlwaysOnTop));
+		Notify().MakeWindowOnTop(g_Settings->LoadBool(UserInterface_AlwaysOnTop));
 
 		ThreadInfo * Info = new ThreadInfo;
 		HANDLE  * hThread = new HANDLE;
@@ -358,14 +364,14 @@ void  CN64System::StartEmulation2   ( bool NewThread )
 		if (g_Settings->LoadBool(Setting_AutoFullscreen)) 
 		{
 			WriteTrace(TraceDebug,__FUNCTION__ " 15");
-			CIniFile RomIniFile(g_Settings->LoadString(SupportFile_RomDatabase).c_str());
-			stdstr Status = g_Settings->LoadString(Rdb_Status);
+			CIniFile RomIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str());
+			stdstr Status = g_Settings->LoadStringVal(Rdb_Status);
 
 			char String[100];
 			RomIniFile.GetString("Rom Status",stdstr_f("%s.AutoFullScreen", Status.c_str()).c_str(),"true",String,sizeof(String));
 			if (_stricmp(String,"true") == 0)
 			{
-				g_Notify->ChangeFullScreen();
+				Notify().ChangeFullScreen();
 			}
 		}
 		ExecuteCPU();
@@ -397,7 +403,7 @@ void CN64System::StartEmulationThread (  ThreadInfo * Info )
 	CoUninitialize();
 }
 
-void CN64System::CloseCpu ( void ) 
+void CN64System::CloseCpu()
 {
 	if (m_CPU_Handle == NULL) 
 	{
@@ -420,7 +426,7 @@ void CN64System::CloseCpu ( void )
 	for (int count = 0; count < 200; count ++ ) 
 	{
 		Sleep(100);
-		if (g_Notify->ProcessGuiMessages())
+		if (Notify().ProcessGuiMessages())
 		{
 			return;
 		}
@@ -460,7 +466,7 @@ void CN64System::DisplayRomInfo ( HWND hParent )
 	Info.DisplayInformation(hParent);
 }
 
-void CN64System::Pause(void)
+void CN64System::Pause()
 {
 	if (m_EndEmulation)
 	{
@@ -468,13 +474,13 @@ void CN64System::Pause(void)
 	}
 	ResetEvent(m_hPauseEvent);
 	g_Settings->SaveBool(GameRunning_CPU_Paused,true);
-	g_Notify->RefreshMenu();
+	Notify().RefreshMenu();
 	g_Notify->DisplayMessage(5,MSG_CPU_PAUSED);
 	WaitForSingleObject(m_hPauseEvent, INFINITE);
 	ResetEvent(m_hPauseEvent);
 	g_Settings->SaveBool(GameRunning_CPU_Paused,(DWORD)false);
-	g_Notify->RefreshMenu();
-	g_Notify->DisplayMessage(5,MSG_CPU_RESUMED);
+	Notify().RefreshMenu();
+	Notify().DisplayMessage(5, MSG_CPU_RESUMED);
 }
 
 stdstr CN64System::ChooseFileToOpen ( HWND hParent ) 
@@ -485,11 +491,11 @@ stdstr CN64System::ChooseFileToOpen ( HWND hParent )
 	memset(&FileName, 0, sizeof(FileName));
 	memset(&openfilename, 0, sizeof(openfilename));
 
-	strcpy(Directory,g_Settings->LoadString(Directory_Game).c_str());
+	strcpy(Directory,g_Settings->LoadStringVal(Directory_Game).c_str());
 
 	openfilename.lStructSize  = sizeof( openfilename );
 	openfilename.hwndOwner    = (HWND)hParent;
-	openfilename.lpstrFilter  = "N64 ROMs (*.zip, *.?64, *.rom, *.usa, *.jap, *.pal, *.bin)\0*.?64;*.zip;*.bin;*.rom;*.usa;*.jap;*.pal\0All files (*.*)\0*.*\0";
+	openfilename.lpstrFilter = "N64 ROMs (*.zip, *.7z, *.?64, *.rom, *.usa, *.jap, *.pal, *.bin)\0*.?64;*.zip;*.7z;*.bin;*.rom;*.usa;*.jap;*.pal\0All files (*.*)\0*.*\0";
 	openfilename.lpstrFile    = FileName;
 	openfilename.lpstrInitialDir    = Directory;
 	openfilename.nMaxFile     = MAX_PATH;
@@ -511,7 +517,7 @@ bool CN64System::IsDialogMsg( MSG * msg )
 	return false;
 }
 
-void CN64System::GameReset (void) 
+void CN64System::GameReset()
 {
 	m_SystemTimer.SetTimer(CSystemTimer::SoftResetTimer,0x3000000,false);
 	m_Plugins->Gfx()->ShowCFB();
@@ -523,7 +529,7 @@ void CN64System::GameReset (void)
 	}
 }
 
-void CN64System::PluginReset ( void )
+void CN64System::PluginReset()
 {
 	if (!m_Plugins->ResetInUiThread(this))
 	{
@@ -544,7 +550,7 @@ void CN64System::PluginReset ( void )
 			}
 		}
 	}
-	g_Notify->RefreshMenu();
+	Notify().RefreshMenu();
 	if (m_Recomp)
 	{
 		m_Recomp->Reset();
@@ -554,6 +560,9 @@ void CN64System::PluginReset ( void )
 	{
 		m_SyncCPU->m_Plugins->RomOpened();
 	}
+#ifndef _WIN64
+	_controlfp(_PC_53, _MCW_PC);
+#endif
 }
 
 void CN64System::Reset (bool bInitReg, bool ClearMenory) 
@@ -561,7 +570,11 @@ void CN64System::Reset (bool bInitReg, bool ClearMenory)
 	RefreshGameSettings();
 	m_Audio.Reset();
 	m_MMU_VM.Reset(ClearMenory);
+#if defined(WINDOWS_UI)
 	Debug_Reset();
+#else
+	g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
 	Mempak::Close();
 
 	m_CyclesToSkip = 0;
@@ -649,14 +662,14 @@ bool CN64System::SetActiveSystem( bool bActive )
 		R4300iOp::m_NextInstruction = m_NextInstruction;
 		R4300iOp::m_JumpToLocation = m_JumpToLocation;
 
-		if (!m_bInitilized)
+		if (!m_bInitialized)
 		{
 			if (!m_MMU_VM.Initialize())
 			{
 				return false;
 			}
 			bReset = true;
-			m_bInitilized = true;
+			m_bInitialized = true;
 			bInitPlugin = true;
 		}
 	}
@@ -809,6 +822,10 @@ void CN64System::InitRegisters( bool bPostPif, CMipsMemory & MMU )
 		case CIC_NUS_6101: 
 			m_Reg.m_GPR[22].DW=0x000000000000003F; 
 			break;
+		case CIC_NUS_8303:		//64DD IPL CIC
+		case CIC_NUS_5167:		//64DD CONVERSION CIC
+			m_Reg.m_GPR[22].DW=0x00000000000000DD;
+			break;
 		case CIC_UNKNOWN:
 		case CIC_NUS_6102: 
 			m_Reg.m_GPR[1].DW=0x0000000000000001;
@@ -879,7 +896,7 @@ void CN64System::InitRegisters( bool bPostPif, CMipsMemory & MMU )
 	}
 }
 
-void CN64System::ExecuteCPU ( void ) 
+void CN64System::ExecuteCPU()
 {
 	//reset code
 	g_Settings->SaveBool(GameRunning_CPU_Running,true);
@@ -887,22 +904,28 @@ void CN64System::ExecuteCPU ( void )
 	g_Notify->DisplayMessage(5,MSG_EMULATION_STARTED);
 	
 	m_EndEmulation = false;
-	g_Notify->RefreshMenu();
+	Notify().RefreshMenu();
 
 	m_Plugins->RomOpened();
 	if (m_SyncCPU)
 	{
 		m_SyncCPU->m_Plugins->RomOpened();
 	}
+#ifndef _WIN64
+	_controlfp(_PC_53, _MCW_PC);
+#endif
 
 	switch ((CPU_TYPE)g_Settings->LoadDword(Game_CpuType))
 	{
+// Currently the compiler is 32-bit only.  We might have to ignore that RDB setting for now.
+#ifndef _WIN64
 	case CPU_Recompiler: ExecuteRecompiler(); break;
 	case CPU_SyncCores:  ExecuteSyncCPU();    break;
+#endif
 	default:             ExecuteInterpret();  break;
 	}
 	g_Settings->SaveBool(GameRunning_CPU_Running,(DWORD)false);
-	g_Notify->WindowMode();
+	Notify().WindowMode();
 	m_Plugins->RomClosed();
 	if (m_SyncCPU)
 	{
@@ -910,27 +933,27 @@ void CN64System::ExecuteCPU ( void )
 	}
 }
 
-void CN64System::ExecuteInterpret () 
+void CN64System::ExecuteInterpret()
 {
 	SetActiveSystem();
 	CInterpreterCPU::ExecuteCPU();
 }
 
-void CN64System::ExecuteRecompiler ()
+void CN64System::ExecuteRecompiler()
 {	
 	m_Recomp->Run();
 }
 
-void CN64System::ExecuteSyncCPU () 
+void CN64System::ExecuteSyncCPU()
 {
-	g_Notify->BringToTop();
+	Notify().BringToTop();
 	m_Recomp->Run();
 }
 
-void CN64System::CpuStopped ( void ) 
+void CN64System::CpuStopped()
 {
 	g_Settings->SaveBool(GameRunning_CPU_Running,(DWORD)false);
-	g_Notify->WindowMode();
+	Notify().WindowMode();
 	if (!m_InReset)
 	{
 		if (m_hPauseEvent)
@@ -939,12 +962,12 @@ void CN64System::CpuStopped ( void )
 			m_hPauseEvent = NULL;
 		}
 
-		g_Notify->RefreshMenu();
-		g_Notify->MakeWindowOnTop(false);
+		Notify().RefreshMenu();
+		Notify().MakeWindowOnTop(false);
 		g_Notify->DisplayMessage(5,MSG_EMULATION_ENDED);
 		if (g_Settings->LoadDword(RomBrowser_Enabled))
 		{
-			g_Notify->ShowRomBrowser(); 
+			Notify().ShowRomBrowser();
 		}	
 	}
 	if (m_SyncCPU)
@@ -1372,10 +1395,9 @@ void CN64System::DumpSyncErrors (CN64System * SecondCPU)
 
 	g_Notify->DisplayError(L"Sync Error");
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
-//	AddEvent(CloseCPU);
 }
 
-bool CN64System::SaveState(void) 
+bool CN64System::SaveState()
 {
 	WriteTrace(TraceDebug,__FUNCTION__ ": Start");
 
@@ -1383,22 +1405,22 @@ bool CN64System::SaveState(void)
 	if ((m_Reg.STATUS_REGISTER & STATUS_EXL) != 0) { return false; }
 	
 	//Get the file Name
-	stdstr FileName, ExtraInfoFileName, CurrentSaveName = g_Settings->LoadString(GameRunning_InstantSaveFile);
+	stdstr FileName, ExtraInfoFileName, CurrentSaveName = g_Settings->LoadStringVal(GameRunning_InstantSaveFile);
 	if (CurrentSaveName.empty())
 	{
 		int Slot = g_Settings->LoadDword(Game_CurrentSaveState);
 		if (Slot != 0) 
 		{ 
-			CurrentSaveName.Format("%s.pj%d",g_Settings->LoadString(Game_GoodName).c_str(), Slot);
+			CurrentSaveName.Format("%s.pj%d",g_Settings->LoadStringVal(Game_GoodName).c_str(), Slot);
 		}
 		else 
 		{
-			CurrentSaveName.Format("%s.pj",g_Settings->LoadString(Game_GoodName).c_str());
+			CurrentSaveName.Format("%s.pj",g_Settings->LoadStringVal(Game_GoodName).c_str());
 		}
-		FileName.Format("%s%s",g_Settings->LoadString(Directory_InstantSave).c_str(),CurrentSaveName.c_str());
+		FileName.Format("%s%s",g_Settings->LoadStringVal(Directory_InstantSave).c_str(),CurrentSaveName.c_str());
 		stdstr_f ZipFileName("%s.zip",FileName.c_str());
 		//Make sure the target dir exists	
-		CreateDirectory(g_Settings->LoadString(Directory_InstantSave).c_str(),NULL);
+		CreateDirectory(g_Settings->LoadStringVal(Directory_InstantSave).c_str(),NULL);
 		//delete any old save
 		DeleteFile(FileName.c_str());
 		DeleteFile(ZipFileName.c_str());
@@ -1413,8 +1435,19 @@ bool CN64System::SaveState(void)
 	} 
 	else
 	{
-		FileName.Format("%s%s",CurrentSaveName.c_str(), g_Settings->LoadDword(Setting_AutoZipInstantSave) ? ".pj.zip" : ".pj");
-		ExtraInfoFileName.Format("%s.dat",FileName.c_str());
+		char drive[_MAX_DRIVE], dir[_MAX_DIR], fname[_MAX_FNAME], ext[_MAX_EXT];
+		_splitpath(CurrentSaveName.c_str(), drive, dir, fname, ext);
+
+		FileName.Format("%s.pj", CurrentSaveName.c_str());
+
+		CurrentSaveName.Format("%s.pj", fname);
+		ExtraInfoFileName.Format("%s.dat", fname);
+
+		//If ziping save add .zip on the end
+		if (g_Settings->LoadDword(Setting_AutoZipInstantSave))
+		{
+			FileName.Format("%s.zip", FileName.c_str());
+		}
 	}
 	if (FileName.empty()) { return true; }
 
@@ -1518,15 +1551,15 @@ bool CN64System::SaveState(void)
 
 	CPath SavedFileName(FileName);
 	
-    g_Notify->DisplayMessage(5,L"%s %s",SaveMessage.c_str(),SavedFileName.GetNameExtension().ToUTF16().c_str());
-	g_Notify->RefreshMenu();
+    g_Notify->DisplayMessage(5,stdstr_f("%s %s",SaveMessage.c_str(),SavedFileName.GetNameExtension()).ToUTF16().c_str());
+	Notify().RefreshMenu();
 	WriteTrace(TraceDebug,__FUNCTION__ ": Done");
 	return true;
 }
 
-bool CN64System::LoadState(void) 
+bool CN64System::LoadState()
 {
-	stdstr InstantFileName = g_Settings->LoadString(GameRunning_InstantSaveFile);
+	stdstr InstantFileName = g_Settings->LoadStringVal(GameRunning_InstantSaveFile);
 	if (!InstantFileName.empty())
 	{
 		bool Result = LoadState(InstantFileName.c_str());
@@ -1535,14 +1568,14 @@ bool CN64System::LoadState(void)
 	}
 
 	CPath FileName;
-	FileName.SetDriveDirectory(g_Settings->LoadString(Directory_InstantSave).c_str());
+	FileName.SetDriveDirectory(g_Settings->LoadStringVal(Directory_InstantSave).c_str());
 	if (g_Settings->LoadDword(Game_CurrentSaveState) != 0) 
 	{
-		FileName.SetNameExtension(stdstr_f("%s.pj%d",g_Settings->LoadString(Game_GoodName).c_str(),g_Settings->LoadDword(Game_CurrentSaveState)).c_str());
+		FileName.SetNameExtension(stdstr_f("%s.pj%d",g_Settings->LoadStringVal(Game_GoodName).c_str(),g_Settings->LoadDword(Game_CurrentSaveState)).c_str());
 	} 
 	else 
 	{
-		FileName.SetNameExtension(stdstr_f("%s.pj",g_Settings->LoadString(Game_GoodName).c_str()).c_str());
+		FileName.SetNameExtension(stdstr_f("%s.pj",g_Settings->LoadStringVal(Game_GoodName).c_str()).c_str());
 	}
 
 	CPath ZipFileName;
@@ -1559,20 +1592,23 @@ bool CN64System::LoadState(void)
 	//Use old file Name
 	if (g_Settings->LoadDword(Game_CurrentSaveState) != 0) 
 	{ 
-		FileName.SetNameExtension(stdstr_f("%s.pj%d",g_Settings->LoadString(Game_GameName).c_str(),g_Settings->LoadDword(Game_CurrentSaveState)).c_str());
+		FileName.SetNameExtension(stdstr_f("%s.pj%d",g_Settings->LoadStringVal(Game_GameName).c_str(),g_Settings->LoadDword(Game_CurrentSaveState)).c_str());
 	}
 	else
 	{
-		FileName.SetNameExtension(stdstr_f("%s.pj",g_Settings->LoadString(Game_GameName).c_str()).c_str());
+		FileName.SetNameExtension(stdstr_f("%s.pj",g_Settings->LoadStringVal(Game_GameName).c_str()).c_str());
 	}
 	return LoadState(FileName);
 }
 
 bool CN64System::LoadState(LPCSTR FileName) 
 {
-	DWORD dwRead, Value,SaveRDRAMSize, NextVITimer = 0;
-	bool LoadedZipFile = false;
-
+	DWORD dwRead, Value,SaveRDRAMSize, NextVITimer = 0, old_status, old_width, old_dacrate;
+	bool LoadedZipFile = false, AudioResetOnLoad;
+	old_status = g_Reg->VI_STATUS_REG;
+	old_width = g_Reg->VI_WIDTH_REG;
+	old_dacrate = g_Reg->AI_DACRATE_REG;
+	
 	WriteTraceF((TraceType)(TraceDebug | TraceRecompiler),__FUNCTION__ "(%s): Start",FileName);
 
 	char drive[_MAX_DRIVE] ,dir[_MAX_DIR], fname[_MAX_FNAME],ext[_MAX_EXT];
@@ -1594,43 +1630,45 @@ bool CN64System::LoadState(LPCSTR FileName)
 		}
 		DWORD Value;
 		while (port == UNZ_OK) 
-        {
+		{
 			unz_file_info info;
 			char zname[132];
 
 			unzGetCurrentFileInfo(file, &info, zname, 128, NULL,0, NULL,0);
-		    if (unzLocateFile(file, zname, 1) != UNZ_OK ) 
-            {
+			if (unzLocateFile(file, zname, 1) != UNZ_OK ) 
+			{
 				unzClose(file);
 				port = -1;
 				continue;
 			}
 			if( unzOpenCurrentFile(file) != UNZ_OK ) 
-            {
+			{
 				unzClose(file);
 				port = -1;
 				continue;
 			}
 			unzReadCurrentFile(file,&Value,4);
 			if (Value != 0x23D8A6C8 && Value != 0x56D2CD23) 
-            { 
+			{
 				unzCloseCurrentFile(file);
 				port = unzGoToNextFile(file);
 				continue;
 			}
 			if (!LoadedZipFile && Value == 0x23D8A6C8 && port == UNZ_OK) 
-            {
+			{
 				unzReadCurrentFile(file,&SaveRDRAMSize,sizeof(SaveRDRAMSize));
 				//Check header
 
 				BYTE LoadHeader[64];
-				unzReadCurrentFile(file,LoadHeader,0x40);	
+				unzReadCurrentFile(file,LoadHeader,0x40);
 				if (memcmp(LoadHeader,g_Rom->GetRomAddress(),0x40) != 0)
-                {
-					//if (inFullScreen) { return FALSE; }
+				{
+					//if (inFullScreen) { return false; }
 					int result = MessageBoxW(NULL,GS(MSG_SAVE_STATE_HEADER),GS(MSG_MSGBOX_TITLE),
 						MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2);
-					if (result == IDNO) { return FALSE; }
+
+					if (result == IDNO)
+						return false;
 				}
 				Reset(false,true);
 
@@ -1665,8 +1703,8 @@ bool CN64System::LoadState(LPCSTR FileName)
 				continue;
 			}
 			if (LoadedZipFile && Value == 0x56D2CD23 && port == UNZ_OK) 
-            {
-				m_SystemTimer.LoadData(file);			
+			{
+				m_SystemTimer.LoadData(file);
 			}
 			unzCloseCurrentFile(file);
 			port = unzGoToNextFile(file);
@@ -1674,27 +1712,32 @@ bool CN64System::LoadState(LPCSTR FileName)
 		unzClose(file);
 	}
 	if (!LoadedZipFile) 
-    {
+	{
 		HANDLE hSaveFile = CreateFile(FileNameStr.c_str(),GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ,NULL,
 			OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL);
 		if (hSaveFile == INVALID_HANDLE_VALUE) 
-        {
-            g_Notify->DisplayMessage(5,L"%s %s",GS(MSG_UNABLED_LOAD_STATE),FileNameStr.ToUTF16().c_str());
+		{
+			g_Notify->DisplayMessage(5,stdstr_f("%s %s",GS(MSG_UNABLED_LOAD_STATE),FileNameStr).ToUTF16().c_str());
 			return false;
 		}
-		SetFilePointer(hSaveFile,0,NULL,FILE_BEGIN);	
+
+		SetFilePointer(hSaveFile,0,NULL,FILE_BEGIN);
 		ReadFile( hSaveFile,&Value,sizeof(Value),&dwRead,NULL);
-		if (Value != 0x23D8A6C8) { return FALSE; }
-		ReadFile( hSaveFile,&SaveRDRAMSize,sizeof(SaveRDRAMSize),&dwRead,NULL);		
+		if (Value != 0x23D8A6C8)
+			return false;
+
+		ReadFile( hSaveFile,&SaveRDRAMSize,sizeof(SaveRDRAMSize),&dwRead,NULL);
 		//Check header
 		BYTE LoadHeader[64];
-		ReadFile( hSaveFile,LoadHeader,0x40,&dwRead,NULL);	
+		ReadFile( hSaveFile,LoadHeader,0x40,&dwRead,NULL);
 		if (memcmp(LoadHeader,g_Rom->GetRomAddress(),0x40) != 0)
-        {
-			//if (inFullScreen) { return FALSE; }
+		{
+			//if (inFullScreen) { return false; }
 			int result = MessageBoxW(NULL,GS(MSG_SAVE_STATE_HEADER),GS(MSG_MSGBOX_TITLE),
 				MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2);
-			if (result == IDNO) { return FALSE; }
+
+			if (result == IDNO)
+				return false;
 		}
 		Reset(false,true);
 		m_MMU_VM.UnProtectMemory(0x80000000,0x80000000 + g_Settings->LoadDword(Game_RDRamSize) - 4);
@@ -1725,10 +1768,39 @@ bool CN64System::LoadState(LPCSTR FileName)
 		ReadFile( hSaveFile,m_MMU_VM.Imem(),0x1000,&dwRead,NULL);
 		CloseHandle(hSaveFile);
 	}
-
+	
+	//Fix losing audio in certain games with certain plugins
+	AudioResetOnLoad = g_Settings->LoadBool(Game_AudioResetOnLoad);
+	if (AudioResetOnLoad)
+	{
+		m_Reg.m_AudioIntrReg |= MI_INTR_AI;
+		m_Reg.AI_STATUS_REG &= ~AI_STATUS_FIFO_FULL;
+		g_Reg->MI_INTR_REG |= MI_INTR_AI;
+	}
+	
+	if (bFixedAudio())
+	{
+		m_Audio.SetFrequency(m_Reg.AI_DACRATE_REG, g_System->SystemType());
+	}
+	
+	if (old_status != g_Reg->VI_STATUS_REG)
+	{
+		g_Plugins->Gfx()->ViStatusChanged();
+	}
+	
+	if (old_width != g_Reg->VI_WIDTH_REG)
+	{
+		g_Plugins->Gfx()->ViWidthChanged();
+	}
+	
+	if (old_dacrate != g_Reg->AI_DACRATE_REG)
+	{
+		g_Plugins->Audio()->DacrateChanged(g_System->SystemType());
+	}
+	
 	//Fix Random Register
 	while ((int)m_Reg.RANDOM_REGISTER < (int)m_Reg.WIRED_REGISTER)
-    {
+	{
 		m_Reg.RANDOM_REGISTER += 32 - m_Reg.WIRED_REGISTER;
 	}
 	//Fix up timer
@@ -1758,7 +1830,7 @@ bool CN64System::LoadState(LPCSTR FileName)
 	if (bFastSP() && m_Recomp) { m_Recomp->ResetMemoryStackPos(); }
 
 	if (g_Settings->LoadDword(Game_CpuType) == CPU_SyncCores) 
-    {
+	{
 		if (m_SyncCPU)
 		{
 			for (int i = 0; i < (sizeof(m_LastSuccessSyncPC)/sizeof(m_LastSuccessSyncPC[0])); i++) 
@@ -1773,12 +1845,17 @@ bool CN64System::LoadState(LPCSTR FileName)
 	}
 	WriteTrace(TraceDebug,__FUNCTION__ ": 13");
 	std::wstring LoadMsg = g_Lang->GetString(MSG_LOADED_STATE);
-    g_Notify->DisplayMessage(5,L"%s %s",LoadMsg.c_str(),CPath(FileNameStr).GetNameExtension().ToUTF16().c_str());
+	g_Notify->DisplayMessage(5,stdstr_f("%s %s",LoadMsg.c_str(),CPath(FileNameStr).GetNameExtension()).ToUTF16().c_str());
 	WriteTrace(TraceDebug,__FUNCTION__ ": Done");
 	return true;
 }
 
-void CN64System::RunRSP ( void ) 
+void CN64System::DisplayRSPListCount()
+{
+	g_Notify->DisplayMessage(0, stdstr_f("Dlist: %d   Alist: %d   Unknown: %d", m_DlistCount, m_AlistCount, m_UnknownCount).ToUTF16().c_str());
+}
+
+void CN64System::RunRSP()
 {
 	WriteTraceF(TraceRSP, __FUNCTION__ ": Start (SP Status %X)",m_Reg.SP_STATUS_REG);
 	if ( ( m_Reg.SP_STATUS_REG & SP_STATUS_HALT ) == 0) 
@@ -1815,8 +1892,8 @@ void CN64System::RunRSP ( void )
 				}
 
 				if (bShowDListAListCount())
-				{				
-					g_Notify->DisplayMessage(0,L"Dlist: %d   Alist: %d   Unknown: %d",m_DlistCount,m_AlistCount,m_UnknownCount);
+				{
+					DisplayRSPListCount();
 				}
 				if (bShowCPUPer()) 
 				{
@@ -1868,7 +1945,7 @@ void CN64System::RunRSP ( void )
 	WriteTraceF(TraceRSP, __FUNCTION__ ": Done (SP Status %X)",m_Reg.SP_STATUS_REG);
 }
 
-void CN64System::SyncToAudio ( void ) 
+void CN64System::SyncToAudio()
 {
 	if (!bSyncToAudio() || !bLimitFPS())
 	{
@@ -1893,7 +1970,7 @@ void CN64System::SyncToAudio ( void )
 	}
 }
 
-void CN64System::RefreshScreen ( void ) 
+void CN64System::RefreshScreen()
 {
 	SPECIAL_TIMERS CPU_UsageAddr = Timer_None/*, ProfilingAddr = Timer_None*/;
 	DWORD VI_INTR_TIME = 500000;
@@ -2019,7 +2096,11 @@ void CN64System::TLB_Unmaped ( DWORD VAddr, DWORD Len )
 	}
 }
 
-void CN64System::TLB_Changed   ( void )
+void CN64System::TLB_Changed()
 {
+#if defined(WINDOWS_UI)
 	Debug_RefreshTLBWindow();
-}
\ No newline at end of file
+#else
+	g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
+}
diff --git a/Source/Project64/N64 System/N64 Class.h b/Source/Project64/N64 System/N64 Class.h
index b94ef9899..f8a99de24 100644
--- a/Source/Project64/N64 System/N64 Class.h	
+++ b/Source/Project64/N64 System/N64 Class.h	
@@ -25,17 +25,21 @@ class CN64System :
 	private CSystemEvents,
 	protected CN64SystemSettings,
 	public CGameSettings,
+#if defined(WINDOWS_UI)
 	protected CDebugSettings,
 	public CDebugger
+#else
+	protected CDebugSettings
+#endif
 {
 public:
-    CN64System ( CPlugins * Plugins, bool SavesReadOnly );
-    virtual ~CN64System ( void );
+	CN64System ( CPlugins * Plugins, bool SavesReadOnly );
+	virtual ~CN64System ( void );
 
-	typedef struct {
+	struct ThreadInfo {
 		HANDLE * ThreadHandle;
 		DWORD    ThreadID;
-	} ThreadInfo;
+	};
 
 	CProfiling m_Profile;
 	CCheats    m_Cheats;
@@ -46,29 +50,29 @@ public:
 	static bool RunFileImage ( const char * FileLoc );
 	static void CloseSystem ( void );
 		
-	void   CloseCpu         ( void );
+	void   CloseCpu         ();
 	void   ExternalEvent    ( SystemEvent action ); //covers gui interacting and timers etc..
 	stdstr ChooseFileToOpen ( HWND hParent );
 	void   DisplayRomInfo   ( HWND hParent );
 	void   SelectCheats     ( HWND hParent );
 	void   StartEmulation   ( bool NewThread );
-	void   SyncToAudio      ( void );
+	void   SyncToAudio      ();
 	bool   IsDialogMsg      ( MSG * msg );
-	void   IncreaseSpeed    ( void ) { m_Limitor.IncreaeSpeed(); }
-	void   DecreaeSpeed     ( void ) { m_Limitor.DecreaeSpeed(); }
+	void   IncreaseSpeed    () { m_Limitor.IncreaseSpeed(); }
+	void   DecreaseSpeed    () { m_Limitor.DecreaseSpeed(); }
 	void   Reset            ( bool bInitReg, bool ClearMenory );
-	void   GameReset        ( void );
-	void   PluginReset      ( void );
+	void   GameReset        ();
+	void   PluginReset      ();
 
-	void   Pause           ( void );
-	void   RunRSP           ( void );
-	bool   SaveState        ( void );
+	void   Pause            ();
+	void   RunRSP           ();
+	bool   SaveState        ();
 	bool   LoadState        ( LPCSTR FileName );
-	bool   LoadState        ( void );	
+	bool   LoadState        ();
 
-	inline bool   DmaUsed     ( void ) const { return m_DMAUsed; }
-	inline void   SetDmaUsed  ( bool DMAUsed) { m_DMAUsed = DMAUsed; }
-	inline DWORD  GetButtons  ( int Control ) { return m_Buttons[Control]; }
+	bool   DmaUsed() const { return m_DMAUsed; }
+	void   SetDmaUsed(bool DMAUsed) { m_DMAUsed = DMAUsed; }
+	DWORD  GetButtons(int Control) const { return m_Buttons[Control]; }
 
 	//Variable used to track that the SP is being handled and stays the same as the real SP in sync core
 #ifdef TEST_SP_TRACKING
@@ -78,8 +82,8 @@ public:
 	void   UpdateSyncCPU    ( CN64System * const SecondCPU, DWORD const Cycles );
 	void   SyncCPU          ( CN64System * const SecondCPU );
 	void   SyncCPUPC        ( CN64System * const SecondCPU );
-	void   SyncSystem		( void );
-	void   SyncSystemPC		( void );
+	void   SyncSystem       ();
+	void   SyncSystemPC     ();
 private:
 	//Make sure plugins can directly access this information
 	friend CGfxPlugin;
@@ -90,61 +94,55 @@ private:
 	//Recompiler has access to manipulate and call functions
 	friend CSystemTimer;
 
-	//Used for loading and potentialy executing the CPU in its own thread.
+	//Used for loading and potentially executing the CPU in its own thread.
 	static void StartEmulationThread ( ThreadInfo * Info );
 	static bool EmulationStarting    ( HANDLE hThread, DWORD ThreadId );
 
-	void   ExecuteCPU       ( void );
-	void   RefreshScreen    ( void );
-	bool   InternalEvent    ( void );
+	void   ExecuteCPU       ();
+	void   RefreshScreen    ();
 	void   DumpSyncErrors   ( CN64System * SecondCPU );
 	void   StartEmulation2  ( bool NewThread );
 	bool   SetActiveSystem  ( bool bActive = true );
 	void   InitRegisters    ( bool bPostPif, CMipsMemory & MMU );
+	void    DisplayRSPListCount();
 
 	//CPU Methods
-	void   ExecuteRecompiler ( );
-	void   ExecuteInterpret  (  );
-	void   ExecuteSyncCPU    ();
+	void   ExecuteRecompiler();
+	void   ExecuteInterpret();
+	void   ExecuteSyncCPU();
 
-	void   AddEvent          ( SystemEvent Event);
-
-	//Notification of changing conditions
-	void   FunctionStarted ( DWORD NewFuncAddress, DWORD OldFuncAddress, DWORD ReturnAddress );
-	void   FunctionEnded   ( DWORD ReturnAddress, DWORD StackPos );
-
-	//Mark information saying that the CPU has stoped
-	void   CpuStopped      ( void );
+	//Mark information saying that the CPU has stopped
+	void   CpuStopped();
 
 	//Function in CMipsMemory_CallBack
-	virtual bool WriteToProtectedMemory (DWORD Address, int length);
+	virtual bool WriteToProtectedMemory(DWORD Address, int length);
 
 	//Functions in CTLB_CB
-	void TLB_Mapped  ( DWORD VAddr, DWORD Len, DWORD PAddr, bool bReadOnly );
-	void TLB_Unmaped ( DWORD VAddr, DWORD Len );
-	void TLB_Changed ( void );
+	void TLB_Mapped(DWORD VAddr, DWORD Len, DWORD PAddr, bool bReadOnly);
+	void TLB_Unmaped(DWORD VAddr, DWORD Len);
+	void TLB_Changed();
 
     CPlugins      * const m_Plugins;  //The plugin container 
 	CN64System    * m_SyncCPU;
 	CPlugins      * m_SyncPlugins;
 	CMainGui      * m_SyncWindow;
-	CMipsMemoryVM  m_MMU_VM;   //Memory of the n64 
-	CTLB           m_TLB;
-	CRegisters     m_Reg;   
+	CMipsMemoryVM   m_MMU_VM;   //Memory of the n64 
+	CTLB            m_TLB;
+	CRegisters      m_Reg;
 	CFramePerSecond m_FPS;
-	CProfiling		m_CPU_Usage; //used to track the cpu usage
-	CRecompiler     * m_Recomp;
+	CProfiling      m_CPU_Usage; //used to track the cpu usage
+	CRecompiler   * m_Recomp;
 	CAudio          m_Audio;
 	CSpeedLimitor   m_Limitor;
 	bool            m_InReset;
+	int             m_NextTimer;
 	CSystemTimer    m_SystemTimer;
 	bool            m_bCleanFrameBox;
-	bool            m_bInitilized;
+	bool            m_bInitialized;
 	bool            m_RspBroke;
-	int             m_NextTimer;
 	bool            m_DMAUsed;
 	DWORD           m_Buttons[4];
-	BOOL            m_TestTimer;
+	bool            m_TestTimer;
 	DWORD           m_NextInstruction;
 	DWORD           m_JumpToLocation;
 	DWORD           m_TLBLoadAddress;
diff --git a/Source/Project64/N64 System/N64 Rom Class.cpp b/Source/Project64/N64 System/N64 Rom Class.cpp
index d64d58b4b..dd2569dc3 100644
--- a/Source/Project64/N64 System/N64 Rom Class.cpp	
+++ b/Source/Project64/N64 System/N64 Rom Class.cpp	
@@ -10,7 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 
-CN64Rom::CN64Rom ( void ) 
+CN64Rom::CN64Rom()
 {
 	m_hRomFile        = NULL;
 	m_hRomFileMapping = NULL;
@@ -23,7 +23,8 @@ CN64Rom::CN64Rom ( void )
 	m_CicChip         = CIC_UNKNOWN;
 }
 
-CN64Rom::~CN64Rom ( void ) {
+CN64Rom::~CN64Rom()
+{
 	UnallocateRomImage();
 }
 
@@ -74,7 +75,7 @@ bool CN64Rom::AllocateAndLoadN64Image ( const char * FileLoc, bool LoadBootCodeO
 		TotalRead += dwRead;
 
 		//Show Message of how much % wise of the rom has been loaded
-		g_Notify->DisplayMessage(0,L"%s: %.2f%c",GS(MSG_LOADED),((float)TotalRead/(float)RomFileSize) * 100.0f,'%');
+		g_Notify->DisplayMessage(0,stdstr_f("%s: %.2f%c",GS(MSG_LOADED),((float)TotalRead/(float)RomFileSize) * 100.0f,'%').ToUTF16().c_str());
 	}
 	dwRead = TotalRead;
 
@@ -100,16 +101,17 @@ bool CN64Rom::AllocateAndLoadN64Image ( const char * FileLoc, bool LoadBootCodeO
 	return true;
 }
 
-bool CN64Rom::AllocateAndLoadZipImage ( const char * FileLoc, bool LoadBootCodeOnly ) {
+bool CN64Rom::AllocateAndLoadZipImage(const char * FileLoc, bool LoadBootCodeOnly) {
 	unzFile file = unzOpen(FileLoc);
-	if (file == NULL) { return false; }
+	if (file == NULL)
+		return false;
 
 	int port = unzGoToFirstFile(file);
-	bool FoundRom = FALSE; 
+	bool FoundRom = false; 
 	
 	//scan through all files in zip to a suitable file is found
-	while(port == UNZ_OK && FoundRom == FALSE) {
-	    unz_file_info info;
+	while(port == UNZ_OK && !FoundRom) {
+		unz_file_info info;
 		char zname[_MAX_PATH];
 
 		unzGetCurrentFileInfo(file, &info, zname, sizeof(zname), NULL,0, NULL,0);
@@ -157,7 +159,7 @@ bool CN64Rom::AllocateAndLoadZipImage ( const char * FileLoc, bool LoadBootCodeO
 				TotalRead += dwRead;
 
 				//Show Message of how much % wise of the rom has been loaded
-				g_Notify->DisplayMessage(5,L"%s: %.2f%c",GS(MSG_LOADED),((float)TotalRead/(float)RomFileSize) * 100.0f,'%');
+				g_Notify->DisplayMessage(5,stdstr_f("%s: %.2f%c",GS(MSG_LOADED),((float)TotalRead/(float)RomFileSize) * 100.0f,'%').ToUTF16().c_str());
 			}
 			dwRead = TotalRead + 4;
 
@@ -184,16 +186,16 @@ bool CN64Rom::AllocateAndLoadZipImage ( const char * FileLoc, bool LoadBootCodeO
 			g_Notify->DisplayMessage(1,L"");
 		}
 		unzCloseCurrentFile(file);
-		if (FoundRom == FALSE) {
+
+		if (!FoundRom)
 			port = unzGoToNextFile(file);
-		}
 	}
 	unzClose(file);
 	
 	return FoundRom;
 }
 
-void CN64Rom::ByteSwapRom (void) {
+void CN64Rom::ByteSwapRom() {
 	DWORD count;
 
 	switch (*((DWORD *)&m_ROMImage[0])) {
@@ -201,29 +203,30 @@ void CN64Rom::ByteSwapRom (void) {
 		for( count = 0 ; count < m_RomFileSize; count += 4 ) {
 			m_ROMImage[count] ^= m_ROMImage[count+2];
 			m_ROMImage[count + 2] ^= m_ROMImage[count];
-			m_ROMImage[count] ^= m_ROMImage[count+2];			
+			m_ROMImage[count] ^= m_ROMImage[count+2];
 			m_ROMImage[count + 1] ^= m_ROMImage[count + 3];
 			m_ROMImage[count + 3] ^= m_ROMImage[count + 1];
-			m_ROMImage[count + 1] ^= m_ROMImage[count + 3];			
+			m_ROMImage[count + 1] ^= m_ROMImage[count + 3];
 		}
 		break;
+	case 0x40072780: //64DD IPL
 	case 0x40123780:
 		for( count = 0 ; count < m_RomFileSize; count += 4 ) {
 			m_ROMImage[count] ^= m_ROMImage[count+3];
 			m_ROMImage[count + 3] ^= m_ROMImage[count];
-			m_ROMImage[count] ^= m_ROMImage[count+3];			
+			m_ROMImage[count] ^= m_ROMImage[count+3];
 			m_ROMImage[count + 1] ^= m_ROMImage[count + 2];
 			m_ROMImage[count + 2] ^= m_ROMImage[count + 1];
-			m_ROMImage[count + 1] ^= m_ROMImage[count + 2];			
+			m_ROMImage[count + 1] ^= m_ROMImage[count + 2];
 		}
 		break;
 	case 0x80371240: break;
 	default:
-		g_Notify->DisplayError(L"ByteSwapRom: %X",m_ROMImage[0]);
+		g_Notify->DisplayError(stdstr_f("ByteSwapRom: %X",m_ROMImage[0]).ToUTF16().c_str());
 	}
 }
 
-void CN64Rom::CalculateCicChip ( void )
+void CN64Rom::CalculateCicChip()
 {
 	__int64 CRC = 0;
 	
@@ -243,15 +246,102 @@ void CN64Rom::CalculateCicChip ( void )
 	case 0x000000D6497E414B: m_CicChip = CIC_NUS_6103; break;
 	case 0x0000011A49F60E96: m_CicChip = CIC_NUS_6105; break;
 	case 0x000000D6D5BE5580: m_CicChip = CIC_NUS_6106; break;
+	case 0x000001053BC19870: m_CicChip = CIC_NUS_5167; break;	//64DD CONVERSION CIC
+	case 0x000000D2E53EF008: m_CicChip = CIC_NUS_8303; break;	//64DD IPL
 	default:
 		if (bHaveDebugger())
-			g_Notify->DisplayError(L"Unknown CIC checksum:\n%I64d.", CRC);
+		{
+			g_Notify->DisplayError(stdstr_f("Unknown CIC checksum:\n%I64X.", CRC).ToUTF16().c_str());
+		}
 		m_CicChip = CIC_UNKNOWN; break;
 	}
 
 }
 
-CICChip CN64Rom::CicChipID ( void ) {
+void CN64Rom::CalculateRomCrc()
+{
+	DWORD t0, t2, t3, t4, t5;
+	DWORD a0, a1, a2, a3;
+	DWORD s0;
+	DWORD v0, v1;
+
+	// CIC_NUS_6101	at=0x5D588B65 , s6=0x3F
+	// CIC_NUS_6102	at=0x5D588B65 , s6=0x3F
+	// CIC_NUS_6103	at=0x6C078965 , s6=0x78
+	// CIC_NUS_6105	at=0x5d588b65 , s6=0x91
+	// CIC_NUS_6106	at=0x6C078965 , s6=0x85
+
+	// 64DD IPL		at=0x02E90EDD , s6=0xdd
+
+	//v0 = 0xFFFFFFFF & (0x3F * at) + 1;
+	switch (m_CicChip){
+	case CIC_NUS_6101:
+	case CIC_NUS_6102: v0 = 0xF8CA4DDC; break;
+	case CIC_NUS_6103: v0 = 0xA3886759; break;
+	case CIC_NUS_6105: v0 = 0xDF26F436; break;
+	case CIC_NUS_6106: v0 = 0x1FEA617A; break;
+	default:
+		return;
+	}
+
+	DWORD OldProtect;
+	VirtualProtect(m_ROMImage, m_RomFileSize, PAGE_READWRITE, &OldProtect);
+
+	v1 = 0;
+	t0 = 0;
+	t5 = 0x20;
+
+	a3 = v0;
+	t2 = v0;
+	t3 = v0;
+	s0 = v0;
+	a2 = v0;
+	t4 = v0;
+
+	for (t0 = 0; t0 < 0x00100000; t0 += 4){
+		v0 = *(DWORD *)(m_ROMImage + t0 + 0x1000);
+
+		v1 = a3 + v0;
+		a1 = v1;
+
+		if (v1 < a3) t2 += 0x1;
+		v1 = v0 & 0x001F;
+
+		a0 = (v0 << v1) | (v0 >> (t5 - v1));
+
+		a3 = a1;
+		t3 = t3 ^ v0;
+
+		s0 = s0 + a0;
+		if (a2 < v0) a2 = a3 ^ v0 ^ a2;
+		else a2 = a2 ^ a0;
+
+		if (m_CicChip == CIC_NUS_6105){
+			t4 = (v0 ^ (*(DWORD *)(m_ROMImage + (0xFF & t0) + 0x750))) + t4;
+		}
+		else t4 = (v0 ^ s0) + t4;
+	}
+	if (m_CicChip == CIC_NUS_6103){
+		a3 = (a3 ^ t2) + t3;
+		s0 = (s0 ^ a2) + t4;
+	}
+	else if (m_CicChip == CIC_NUS_6106){
+		a3 = 0xFFFFFFFF & (a3 * t2) + t3;
+		s0 = 0xFFFFFFFF & (s0 * a2) + t4;
+	}
+	else {
+		a3 = a3 ^ t2 ^ t3;
+		s0 = s0 ^ a2 ^ t4;
+	}
+
+	*(DWORD *)(m_ROMImage + 0x10) = a3;
+	*(DWORD *)(m_ROMImage + 0x14) = s0;
+
+	VirtualProtect(m_ROMImage, m_RomFileSize, PAGE_READONLY, &OldProtect);
+}
+
+CICChip CN64Rom::CicChipID()
+{
 	return m_CicChip;
 }
 
@@ -259,12 +349,13 @@ bool CN64Rom::IsValidRomImage ( BYTE Test[4] ) {
 	if ( *((DWORD *)&Test[0]) == 0x40123780 ) { return true; }
 	if ( *((DWORD *)&Test[0]) == 0x12408037 ) { return true; }
 	if ( *((DWORD *)&Test[0]) == 0x80371240 ) { return true; }
+	if ( *((DWORD *)&Test[0]) == 0x40072780 ) { return true; } //64DD IPL
 	return false;
 }
 
 void CN64Rom::NotificationCB ( LPCWSTR Status, CN64Rom * /*_this*/ )
 {
-	g_Notify->DisplayMessage(5,L"%s",Status);
+	g_Notify->DisplayMessage(5,stdstr_f("%s",Status).ToUTF16().c_str());
 }
 
 bool CN64Rom::LoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly ) {
@@ -274,7 +365,8 @@ bool CN64Rom::LoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly ) {
 	char drive[_MAX_DRIVE], dir[_MAX_DIR], fname[_MAX_FNAME], ext[_MAX_EXT];
 	_splitpath(FileLoc,drive,dir,fname,ext);
 	bool Loaded7zFile = false;
-	if (strstr(FileLoc,"?") != NULL || strcmp(ext,".z7") == 0)
+
+	if (strstr(FileLoc,"?") != NULL || strcmp(ext,".7z") == 0)
 	{
 		char FullPath[MAX_PATH + 100];
 		strcpy(FullPath,FileLoc);
@@ -285,7 +377,7 @@ bool CN64Rom::LoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly ) {
 		{
 			//Pop up a dialog and select file
 			//allocate memory for sub name and copy selected file name to var
-			return false; //remove once dialog is done
+			//return false; //remove once dialog is done
 		} else {
 			*SubFile = '\0';
 			SubFile += 1;
@@ -300,11 +392,15 @@ bool CN64Rom::LoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly ) {
 			{
 				continue;
 			}
+
 			stdstr ZipFileName;
 			ZipFileName.FromUTF16(ZipFile.FileNameIndex(i).c_str());
-			if (_stricmp(ZipFileName.c_str(), SubFile) != 0)
+			if (SubFile != NULL)
 			{
-				continue;
+				if (_stricmp(ZipFileName.c_str(), SubFile) != 0)
+				{
+					continue;
+				}
 			}
 
 			//Get the size of the rom and try to allocate the memory needed.
@@ -459,6 +555,13 @@ bool CN64Rom::LoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly ) {
 	{
 		SaveRomSettingID(false);
 	}
+	
+	if (g_Settings->LoadBool(Game_CRC_Recalc))
+	{
+		//Calculate ROM Header CRC
+		CalculateRomCrc();
+	}
+	
 	return true;
 }
 
@@ -483,17 +586,19 @@ void CN64Rom::SaveRomSettingID ( bool temp )
 	}
 }
 
-void CN64Rom::ClearRomSettingID ( void ) 
+void CN64Rom::ClearRomSettingID()
 {
 	g_Settings->SaveString(Game_GameName,"");
 	g_Settings->SaveString(Game_IniKey,"");
 }
 
-void CN64Rom::SetError ( LanguageStringID ErrorMsg ) {
+void CN64Rom::SetError(LanguageStringID ErrorMsg)
+{
 	m_ErrorMsg = ErrorMsg;
 }
 
-void CN64Rom::UnallocateRomImage ( void ) {
+void CN64Rom::UnallocateRomImage()
+{
 	if (m_hRomFileMapping) {
 		UnmapViewOfFile (m_ROMImage);
         CloseHandle(m_hRomFileMapping);
diff --git a/Source/Project64/N64 System/N64 Rom Class.h b/Source/Project64/N64 System/N64 Rom Class.h
index fde5303b8..363add814 100644
--- a/Source/Project64/N64 System/N64 Rom Class.h	
+++ b/Source/Project64/N64 System/N64 Rom Class.h	
@@ -14,7 +14,7 @@
 
 class CN64Rom :
 	protected CDebugSettings
-{	
+{
 	//constant values
 	enum { ReadFromRomSection = 0x400000 };
 	
@@ -29,27 +29,29 @@ class CN64Rom :
 
 	bool   AllocateAndLoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly );
 	bool   AllocateAndLoadZipImage ( const char * FileLoc, bool LoadBootCodeOnly );
-	void   ByteSwapRom             ( void );
-    void   SetError                ( LanguageStringID ErrorMsg );
+	void   ByteSwapRom             ();
+	void   SetError                ( LanguageStringID ErrorMsg );
 	static void  __stdcall NotificationCB ( LPCWSTR Status, CN64Rom * _this );
-	void   CalculateCicChip         ( void );
+	void   CalculateCicChip        ();
+	void   CalculateRomCrc         ();
 
 public:
-	        CN64Rom            ( void );
-	       ~CN64Rom            ( void );
+	CN64Rom();
+	~CN64Rom();
+
 	bool    LoadN64Image       ( const char * FileLoc, bool LoadBootCodeOnly = false );
 	static bool IsValidRomImage( BYTE Test[4] );
 	void    SaveRomSettingID   ( bool temp );
-	void    ClearRomSettingID  ( void );
-	CICChip CicChipID          ( void );
-	BYTE *  GetRomAddress      ( void ) { return m_ROMImage; }
-	DWORD   GetRomSize         ( void ) { return m_RomFileSize; }
-	stdstr  GetRomMD5          ( void ) { return m_MD5; }
-	stdstr  GetRomName         ( void ) { return m_RomName; }
-	stdstr  GetFileName        ( void ) { return m_FileName; }
-	Country GetCountry         ( void ) { return m_Country; }
-	void    UnallocateRomImage ( void );
-   
+	void    ClearRomSettingID  ();
+	CICChip CicChipID          ();
+	BYTE *  GetRomAddress      () { return m_ROMImage; }
+	DWORD   GetRomSize         () const { return m_RomFileSize; }
+	stdstr  GetRomMD5          () const { return m_MD5; }
+	stdstr  GetRomName         () const { return m_RomName; }
+	stdstr  GetFileName        () const { return m_FileName; }
+	Country GetCountry         () const { return m_Country; }
+	void    UnallocateRomImage ();
+
 	//Get a message id for the reason that you failed to load the rom
-	LanguageStringID GetError  ( void ) { return m_ErrorMsg; }
+	LanguageStringID GetError  () const { return m_ErrorMsg; }
 };
diff --git a/Source/Project64/N64 System/N64 Types.h b/Source/Project64/N64 System/N64 Types.h
index 83ff7ddf6..9855fc7f9 100644
--- a/Source/Project64/N64 System/N64 Types.h	
+++ b/Source/Project64/N64 System/N64 Types.h	
@@ -51,7 +51,8 @@ enum SYSTEM_TYPE {
 
 enum CICChip { 
 	CIC_UNKNOWN  = -1, CIC_NUS_6101 = 1, CIC_NUS_6102 = 2, CIC_NUS_6103 = 3, 
-	CIC_NUS_6104 = 4,  CIC_NUS_6105 = 5, CIC_NUS_6106 = 6
+	CIC_NUS_6104 = 4,  CIC_NUS_6105 = 5, CIC_NUS_6106 = 6, CIC_NUS_5167 = 7,
+	CIC_NUS_8303 = 8
 };
 
 enum Country { 
diff --git a/Source/Project64/N64 System/Profiling Class.cpp b/Source/Project64/N64 System/Profiling Class.cpp
index c5435bc2a..367ba545f 100644
--- a/Source/Project64/N64 System/Profiling Class.cpp	
+++ b/Source/Project64/N64 System/Profiling Class.cpp	
@@ -25,6 +25,7 @@ SPECIAL_TIMERS CProfiling::StartTimer(SPECIAL_TIMERS Address)
 	SPECIAL_TIMERS OldTimerAddr = StopTimer();
 	m_CurrentTimerAddr = Address;
 
+#ifdef _M_IX86
 	DWORD HiValue, LoValue;
 	_asm {
 		pushad
@@ -35,14 +36,18 @@ SPECIAL_TIMERS CProfiling::StartTimer(SPECIAL_TIMERS Address)
 	}
 	m_StartTimeHi = HiValue;
 	m_StartTimeLo = LoValue;
+#else
+	g_Notify->BreakPoint(__FILEW__,__LINE__);
+#endif
 	return OldTimerAddr;
 }
 
-SPECIAL_TIMERS CProfiling::StopTimer(void) {
+SPECIAL_TIMERS CProfiling::StopTimer() {
 	DWORD HiValue, LoValue;
 	
 	if (m_CurrentTimerAddr == Timer_None) { return m_CurrentTimerAddr; }
 
+#ifdef _M_IX86
 	_asm {
 		pushad
 		rdtsc
@@ -50,6 +55,9 @@ SPECIAL_TIMERS CProfiling::StopTimer(void) {
 		mov LoValue, eax
 		popad
 	}
+#else
+	g_Notify->BreakPoint(__FILEW__,__LINE__);
+#endif
 
 	__int64 StopTime  = ((unsigned __int64)HiValue << 32) + (unsigned __int64)LoValue;
 	__int64 StartTime = ((unsigned __int64)m_StartTimeHi << 32) + (unsigned __int64)m_StartTimeLo;
@@ -67,7 +75,7 @@ SPECIAL_TIMERS CProfiling::StopTimer(void) {
 	return OldTimerAddr;
 }
 
-void CProfiling::ShowCPU_Usage (void) {
+void CProfiling::ShowCPU_Usage() {
 	__int64 TotalTime, CPU = 0, Alist = 0, Dlist = 0, Idle = 0;
 	PROFILE_ENRTY Entry;
 	
@@ -95,22 +103,25 @@ void CProfiling::ShowCPU_Usage (void) {
 
 	TotalTime = CPU + Alist + Dlist + Idle;
 
-	g_Notify->DisplayMessage(0,L"r4300i: %0.1f%c    GFX: %0.1f%c    Alist: %0.1f%c    Idle: %0.1f%c",
+	g_Notify->DisplayMessage(0,stdstr_f("r4300i: %0.1f%c    GFX: %0.1f%c    Alist: %0.1f%c    Idle: %0.1f%c",
 		(float)(((double)CPU / (double)TotalTime) * 100),'%',
 		(float)(((double)Dlist / (double)TotalTime) * 100),'%',
 		(float)(((double)Alist / (double)TotalTime) * 100),'%',
-		(float)(((double)Idle / (double)TotalTime) * 100),'%');
+		(float)(((double)Idle / (double)TotalTime) * 100),'%').ToUTF16().c_str());
 
 	ResetCounters();
 }
 
-void CProfiling::ResetCounters (void) {
+void CProfiling::ResetCounters() {
 	m_Entries.clear();
 }
 
-typedef struct { SPECIAL_TIMERS Timer; char * Name; } TIMER_NAME;
+struct TIMER_NAME {
+	SPECIAL_TIMERS Timer;
+	char * Name;
+};
 
-void CProfiling::GenerateLog(void) {
+void CProfiling::GenerateLog() {
 	stdstr LogFileName;
 	{
 		CLog Log;
diff --git a/Source/Project64/N64 System/Profiling Class.h b/Source/Project64/N64 System/Profiling Class.h
index 1089b4f80..4e1221a86 100644
--- a/Source/Project64/N64 System/Profiling Class.h	
+++ b/Source/Project64/N64 System/Profiling Class.h	
@@ -14,27 +14,27 @@ typedef std::map<SPECIAL_TIMERS, __int64 >     PROFILE_ENRTIES;
 typedef PROFILE_ENRTIES::iterator     PROFILE_ENRTY;
 typedef PROFILE_ENRTIES::value_type   PROFILE_VALUE;
 
-class CProfiling 
+class CProfiling
 {
-public:	
-	CProfiling (void);
+public:
+	CProfiling();
 	
-	//recording timing against current timer, returns the address of the timer stoped
-	SPECIAL_TIMERS StartTimer ( SPECIAL_TIMERS Address );
-	SPECIAL_TIMERS StopTimer  ( void );
+	//recording timing against current timer, returns the address of the timer stopped
+	SPECIAL_TIMERS StartTimer(SPECIAL_TIMERS Address);
+	SPECIAL_TIMERS StopTimer();
 
 	//Display the CPU Usage
-	void ShowCPU_Usage ( void ); 
+	void ShowCPU_Usage();
 
 	//Reset all the counters back to 0
-	void ResetCounters ( void );
+	void ResetCounters();
 
 	//Generate a log file with the current results, this will also reset the counters
-	void GenerateLog   ( void );
+	void GenerateLog();
 
 private:
-	CProfiling(const CProfiling&);				// Disable copy constructor
-	CProfiling& operator=(const CProfiling&);		// Disable assignment
+	CProfiling(const CProfiling&);            // Disable copy constructor
+	CProfiling& operator=(const CProfiling&); // Disable assignment
 
 	SPECIAL_TIMERS m_CurrentTimerAddr;
 	DWORD m_CurrentDisplayCount;
diff --git a/Source/Project64/N64 System/Recompiler/Code Block.cpp b/Source/Project64/N64 System/Recompiler/Code Block.cpp
index 0f3442fcb..adcae84cd 100644
--- a/Source/Project64/N64 System/Recompiler/Code Block.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Code Block.cpp	
@@ -17,8 +17,8 @@ CCodeBlock::CCodeBlock(DWORD VAddrEnter, BYTE * RecompPos) :
 	m_VAddrFirst(VAddrEnter),
 	m_VAddrLast(VAddrEnter),
 	m_CompiledLocation(RecompPos),
-	m_Test(1),
-	m_EnterSection(NULL)
+	m_EnterSection(NULL),
+	m_Test(1)
 {
 	CCodeSection * baseSection = new CCodeSection(this, VAddrEnter, 0, false);
 	if (baseSection == NULL)
@@ -48,7 +48,9 @@ CCodeBlock::CCodeBlock(DWORD VAddrEnter, BYTE * RecompPos) :
 		m_MemLocation[1] = m_MemLocation[0] + 1;
 		m_MemContents[0] = *m_MemLocation[0];
 		m_MemContents[1] = *m_MemLocation[1];
-	} else {
+	}
+	else
+	{
 		memset(m_MemLocation,0,sizeof(m_MemLocation));
 		memset(m_MemContents,0,sizeof(m_MemContents));
 	}
@@ -189,7 +191,9 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
 					}
 				}
 			}
-		} else {
+		}
+		else
+		{
 			CurrentSection->m_EndSection = true;
 			break;
 		}
@@ -265,12 +269,16 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
 					CPU_Message(__FUNCTION__ ": Jump End Block");
 					JumpSection->m_EndSection = true;
 					TargetPC = (DWORD)-1;
-				} else {
+				}
+				else
+				{
 					JumpSection->SetJumpAddress(TestPC, TargetPC,false);
 				}
 				JumpSection->SetDelaySlot();
 				SetSection(JumpSection->m_JumpSection,JumpSection,TargetPC,true,TestPC);
-			} else {
+			}
+			else
+			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__);
 			}
 		} 
@@ -331,7 +339,10 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
 		{
 			continue;
 		}
-		if (!CreateBlockLinkage(Section)) { return false; }
+		if (!CreateBlockLinkage(Section))
+		{
+			return false;
+		}
 		break;
 	}
 	if (CurrentSection->m_EndPC == (DWORD)-1)
@@ -341,7 +352,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
 	return true;
 }
 
-void CCodeBlock::DetermineLoops ( void ) 
+void CCodeBlock::DetermineLoops()
 {
 	for (SectionMap::iterator itr = m_SectionMap.begin(); itr != m_SectionMap.end(); itr++)
 	{
@@ -352,7 +363,7 @@ void CCodeBlock::DetermineLoops ( void )
 	}
 }
 
-void CCodeBlock::LogSectionInfo ( void )
+void CCodeBlock::LogSectionInfo()
 {
 	for (SectionList::iterator itr = m_Sections.begin(); itr != m_Sections.end(); itr++)
 	{
@@ -361,10 +372,16 @@ void CCodeBlock::LogSectionInfo ( void )
 	}
 }
 
-bool CCodeBlock::AnalyseBlock ( void ) 
+bool CCodeBlock::AnalyseBlock()
 {
-	if (!g_System->bLinkBlocks()) { return true; }
-	if (!CreateBlockLinkage(m_EnterSection)) { return false; }
+	if (!g_System->bLinkBlocks())
+	{
+		return true;
+	}
+	if (!CreateBlockLinkage(m_EnterSection))
+	{
+		return false;
+	}
 	DetermineLoops();
 	LogSectionInfo();
 	return true;
@@ -380,7 +397,8 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
 	PermLoop = false;
 
 	OPCODE Command;
-	if (!g_MMU->LW_VAddr(PC, Command.Hex)) {
+	if (!g_MMU->LW_VAddr(PC, Command.Hex))
+	{
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 		return false;
 	}
@@ -432,7 +450,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
 			if (TargetPC == PC + 8)
 			{
 				TargetPC = (DWORD)-1;
-			} else {
+			}
+			else
+			{
 				if (TargetPC == PC && !DelaySlotEffectsCompare(PC,Command.rs,0))
 				{
 					PermLoop = true;
@@ -447,14 +467,18 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
 			if (TargetPC == PC + 8)
 			{
 				TargetPC = (DWORD)-1;
-			} else {
+			}
+			else
+			{
 				if (TargetPC == PC)
 				{
 					if (Command.rs == 0)
 					{
 						TargetPC = (DWORD)-1;
 						EndBlock = true;
-					} else {
+					}
+					else
+					{
 						if (!DelaySlotEffectsCompare(PC,Command.rs,Command.rt))
 						{
 							PermLoop = true;
@@ -509,7 +533,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
 		if (TargetPC == PC + 8)
 		{
 			TargetPC = (DWORD)-1;
-		} else {
+		}
+		else
+		{
 			if (Command.rs != 0 || Command.rt != 0)
 			{
 				ContinuePC = PC + 8;
@@ -529,7 +555,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
 		if (TargetPC == PC + 8)
 		{
 			TargetPC = (DWORD)-1;
-		} else {
+		}
+		else
+		{
 			if (TargetPC == PC)
 			{
 				if (!DelaySlotEffectsCompare(PC,Command.rs,Command.rt))
@@ -549,7 +577,8 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
 		default:
 			if ( (Command.rs & 0x10 ) != 0 ) 
 			{
-				switch( Command.funct ) {
+				switch ( Command.funct )
+				{
 				case R4300i_COP0_CO_TLBR: case R4300i_COP0_CO_TLBWI: 
 				case R4300i_COP0_CO_TLBWR: case R4300i_COP0_CO_TLBP: 
 					break;
@@ -560,7 +589,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
 					g_Notify->BreakPoint(__FILEW__,__LINE__);
 					return false;
 				}
-			} else {
+			}
+			else
+			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__);
 				return false;
 			}
@@ -568,7 +599,8 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
 		}
 		break;
 	case R4300i_CP1:
-		switch (Command.fmt) {
+		switch (Command.fmt)
+		{
 		case R4300i_COP1_MF:  case R4300i_COP1_DMF: case R4300i_COP1_CF: case R4300i_COP1_MT: 
 		case R4300i_COP1_DMT: case R4300i_COP1_CT:  case R4300i_COP1_S:  case R4300i_COP1_D:  
 		case R4300i_COP1_W:   case R4300i_COP1_L:
@@ -581,7 +613,9 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
 				if (TargetPC == PC + 8)
 				{
 					TargetPC = (DWORD)-1;
-				} else {
+				}
+				else
+				{
 					if (TargetPC == PC)
 					{
 						g_Notify->BreakPoint(__FILEW__,__LINE__);
@@ -674,14 +708,21 @@ bool CCodeBlock::Compile()
 
 	EnterCodeBlock();
 
-	if (g_SyncSystem) {
-		//if ((DWORD)BlockInfo.CompiledLocation == 0x60A7B73B) { X86BreakPoint(__FILEW__,__LINE__); }
+	if (g_SyncSystem)
+	{
+		//if ((DWORD)BlockInfo.CompiledLocation == 0x60A7B73B)
+		//{
+		//	X86BreakPoint(__FILEW__,__LINE__);
+		//}
 		//MoveConstToVariable((DWORD)BlockInfo.CompiledLocation,&CurrentBlock,"CurrentBlock");
 	}
 
-	if (g_System->bLinkBlocks()) {
+	if (g_System->bLinkBlocks())
+	{
 		while (m_EnterSection->GenerateX86Code(NextTest()));
-	} else {
+	}
+	else
+	{
 		if (!m_EnterSection->GenerateX86Code(NextTest()))
 		{
 			return false;
@@ -697,7 +738,7 @@ bool CCodeBlock::Compile()
 }
 
 
-void CCodeBlock::CompileExitCode ( void )
+void CCodeBlock::CompileExitCode()
 {
 	for (EXIT_LIST::iterator ExitIter = m_ExitInfo.begin(); ExitIter != m_ExitInfo.end(); ExitIter++)
 	{
@@ -709,7 +750,7 @@ void CCodeBlock::CompileExitCode ( void )
 	}
 }
 
-DWORD CCodeBlock::NextTest ( void )
+DWORD CCodeBlock::NextTest()
 {
 	return InterlockedIncrement(&m_Test);
 }
diff --git a/Source/Project64/N64 System/Recompiler/Code Block.h b/Source/Project64/N64 System/Recompiler/Code Block.h
index ae786c447..fe80196e9 100644
--- a/Source/Project64/N64 System/Recompiler/Code Block.h	
+++ b/Source/Project64/N64 System/Recompiler/Code Block.h	
@@ -17,48 +17,48 @@ public:
 	CCodeBlock(DWORD VAddrEnter, BYTE * RecompPos );
 	~CCodeBlock();
 
-	bool Compile ( void );
+	bool Compile();
 
-	inline DWORD    VAddrEnter ( void ) const { return m_VAddrEnter; }
-	inline DWORD	VAddrFirst ( void ) const { return m_VAddrFirst; }
-	inline DWORD	VAddrLast  ( void ) const { return m_VAddrLast;  }
-	inline BYTE *   CompiledLocation ( void ) const { return m_CompiledLocation; }
-	inline int      NoOfSections ( void ) const { return m_Sections.size(); }
-	inline const CCodeSection & EnterSection ( void ) const { return *m_EnterSection; }
-	inline const MD5Digest & Hash ( void ) const { return m_Hash; }
+	DWORD    VAddrEnter() const { return m_VAddrEnter; }
+	DWORD    VAddrFirst() const { return m_VAddrFirst; }
+	DWORD    VAddrLast()  const { return m_VAddrLast; }
+	BYTE *   CompiledLocation() const { return m_CompiledLocation; }
+	int      NoOfSections() const { return m_Sections.size(); }
+	const CCodeSection & EnterSection() const { return *m_EnterSection; }
+	const MD5Digest & Hash() const { return m_Hash; }
 
-	inline void	SetVAddrFirst ( DWORD VAddr ) { m_VAddrFirst = VAddr; }
-	inline void	SetVAddrLast  ( DWORD VAddr ) { m_VAddrLast  = VAddr; }
+	void SetVAddrFirst(DWORD VAddr) { m_VAddrFirst = VAddr; }
+	void SetVAddrLast(DWORD VAddr) { m_VAddrLast = VAddr; }
 
-	CCodeSection * ExistingSection ( DWORD Addr ) { return m_EnterSection->ExistingSection(Addr,NextTest()); }
-	bool SectionAccessible ( DWORD m_SectionID ) { return m_EnterSection->SectionAccessible(m_SectionID,NextTest()); }
+	CCodeSection * ExistingSection(DWORD Addr) { return m_EnterSection->ExistingSection(Addr, NextTest()); }
+	bool SectionAccessible(DWORD m_SectionID) { return m_EnterSection->SectionAccessible(m_SectionID, NextTest()); }
 
-	inline QWORD   MemContents(int i) const { return m_MemContents[i]; }
-	inline QWORD * MemLocation(int i) const { return m_MemLocation[i]; }
+	QWORD   MemContents(int i) const { return m_MemContents[i]; }
+	QWORD * MemLocation(int i) const { return m_MemLocation[i]; }
+
+	DWORD NextTest();
 
 	EXIT_LIST       m_ExitInfo;
-	DWORD    NextTest   ( void );
 
 private:
-	CCodeBlock(void);							// Disable default constructor
-	CCodeBlock(const CCodeBlock&);				// Disable copy constructor
-	CCodeBlock& operator=(const CCodeBlock&);	// Disable assignment
+	CCodeBlock();                             // Disable default constructor
+	CCodeBlock(const CCodeBlock&);            // Disable copy constructor
+	CCodeBlock& operator=(const CCodeBlock&); // Disable assignment
 
-	bool AnalyseBlock    ( void );
-	void CompileExitCode ( void );
+	bool AnalyseBlock();
+	void CompileExitCode();
 
-	bool CreateBlockLinkage ( CCodeSection * EnterSection ) ;
-	void DetermineLoops     ( void ) ;
-	void LogSectionInfo     ( void ) ;
+	bool CreateBlockLinkage ( CCodeSection * EnterSection );
+	void DetermineLoops     ();
+	void LogSectionInfo     ();
 	bool SetSection         ( CCodeSection * & Section, CCodeSection * CurrentSection, DWORD TargetPC, bool LinkAllowed, DWORD CurrentPC );
-	bool SetJumpInfo        ( CCodeSection * & Section, DWORD TargetPC, DWORD CurrentPC );
 	bool AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & ContinuePC, bool & LikelyBranch, bool & IncludeDelaySlot, 
 		bool & EndBlock, bool & PermLoop );
 
-	DWORD	 	    m_VAddrEnter;
-	DWORD	 	    m_VAddrFirst;       // the address of the first opcode in the block
-	DWORD	 	    m_VAddrLast;        // the address of the first opcode in the block
-	BYTE *		    m_CompiledLocation; // What address is this compiled at
+	DWORD           m_VAddrEnter;
+	DWORD           m_VAddrFirst;       // the address of the first opcode in the block
+	DWORD           m_VAddrLast;        // the address of the first opcode in the block
+	BYTE*           m_CompiledLocation; // What address is this compiled at
 	
 	typedef std::map<DWORD,CCodeSection *> SectionMap;
 	typedef std::list<CCodeSection *>      SectionList;
diff --git a/Source/Project64/N64 System/Recompiler/Code Section.cpp b/Source/Project64/N64 System/Recompiler/Code Section.cpp
index 17bac5041..6da875477 100644
--- a/Source/Project64/N64 System/Recompiler/Code Section.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Code Section.cpp	
@@ -10,19 +10,20 @@
 ****************************************************************************/
 #include "stdafx.h"
 
-void InPermLoop         ( void );
+void InPermLoop();
 
-bool DelaySlotEffectsCompare ( DWORD PC, DWORD Reg1, DWORD Reg2 );
+bool DelaySlotEffectsCompare(DWORD PC, DWORD Reg1, DWORD Reg2);
 
-int DelaySlotEffectsJump (DWORD JumpPC) {
+static bool DelaySlotEffectsJump(DWORD JumpPC) {
 	OPCODE Command;
 
-	if (!g_MMU->LW_VAddr(JumpPC, Command.Hex)) { return TRUE; }
+	if (!g_MMU->LW_VAddr(JumpPC, Command.Hex))
+		return true;
 
 	switch (Command.op) {
 	case R4300i_SPECIAL:
 		switch (Command.funct) {
-		case R4300i_SPECIAL_JR:	return DelaySlotEffectsCompare(JumpPC,Command.rs,0);
+		case R4300i_SPECIAL_JR: return DelaySlotEffectsCompare(JumpPC,Command.rs,0);
 		case R4300i_SPECIAL_JALR: return DelaySlotEffectsCompare(JumpPC,Command.rs,31);
 		}
 		break;
@@ -39,7 +40,7 @@ int DelaySlotEffectsJump (DWORD JumpPC) {
 		break;
 	case R4300i_JAL: 
 	case R4300i_SPECIAL_JALR: return DelaySlotEffectsCompare(JumpPC,31,0); break;
-	case R4300i_J: return FALSE;
+	case R4300i_J: return false;
 	case R4300i_BEQ: 
 	case R4300i_BNE: 
 	case R4300i_BLEZ: 
@@ -54,19 +55,20 @@ int DelaySlotEffectsJump (DWORD JumpPC) {
 			case R4300i_COP1_BC_BCFL:
 			case R4300i_COP1_BC_BCTL:
 				{
-					int EffectDelaySlot;
+					bool EffectDelaySlot = false;
 					OPCODE NewCommand;
 
-					if (!g_MMU->LW_VAddr(JumpPC + 4, NewCommand.Hex)) { return TRUE; }
-					
-					EffectDelaySlot = FALSE;
+					if (!g_MMU->LW_VAddr(JumpPC + 4, NewCommand.Hex)) {
+						return true;
+					}
+
 					if (NewCommand.op == R4300i_CP1) {
-						if (NewCommand.fmt == R4300i_COP1_S && (NewCommand.funct & 0x30) == 0x30 ) {
-							EffectDelaySlot = TRUE;
-						} 
-						if (NewCommand.fmt == R4300i_COP1_D && (NewCommand.funct & 0x30) == 0x30 ) {
-							EffectDelaySlot = TRUE;
-						} 
+						if (NewCommand.fmt == R4300i_COP1_S && (NewCommand.funct & 0x30) == 0x30) {
+							EffectDelaySlot = true;
+						}
+						if (NewCommand.fmt == R4300i_COP1_D && (NewCommand.funct & 0x30) == 0x30) {
+							EffectDelaySlot = true;
+						}
 					}
 					return EffectDelaySlot;
 				} 
@@ -81,32 +83,32 @@ int DelaySlotEffectsJump (DWORD JumpPC) {
 	case R4300i_BGTZL: 
 		return DelaySlotEffectsCompare(JumpPC,Command.rs,Command.rt);
 	}
-	return TRUE;
+	return true;
 }
 
 CCodeSection::CCodeSection( CCodeBlock * CodeBlock, DWORD EnterPC, DWORD ID, bool LinkAllowed) :
 	m_BlockInfo(CodeBlock),
+	m_SectionID(ID),
 	m_EnterPC(EnterPC),
 	m_EndPC((DWORD)-1),
-	m_SectionID(ID),
 	m_ContinueSection(NULL),
 	m_JumpSection(NULL),
+	m_EndSection(false),
 	m_LinkAllowed(LinkAllowed),
-	m_CompiledLocation(NULL),
 	m_Test(0),
 	m_Test2(0),
+	m_CompiledLocation(NULL),
 	m_InLoop(false),
-	m_EndSection(false),
 	m_DelaySlot(false)
 {
 	CPU_Message(__FUNCTION__ ": ID %d EnterPC 0x%08X",ID,EnterPC);
 }
 
-CCodeSection::~CCodeSection( void )
+CCodeSection::~CCodeSection()
 {
 }
 
-void CCodeSection::CompileExit ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason, int CompileNow, void (*x86Jmp)(const char * Label, DWORD Value))
+void CCodeSection::CompileExit(DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason, bool CompileNow, void(*x86Jmp)(const char * Label, DWORD Value))
 {
 	if (!CompileNow) 
 	{
@@ -341,7 +343,7 @@ void CCodeSection::CompileExit ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitReg
 	}
 }
 
-void CCodeSection::GenerateSectionLinkage (void)
+void CCodeSection::GenerateSectionLinkage()
 {
 	CCodeSection * TargetSection[] = { m_ContinueSection, m_JumpSection };
 	CJumpInfo * JumpInfo[] = { &m_Cont, &m_Jump };
@@ -569,7 +571,7 @@ void CCodeSection::GenerateSectionLinkage (void)
 	{
 		if (JumpInfo[i]->FallThrough && !TargetSection[i]->GenerateX86Code(m_BlockInfo->NextTest())) 
 		{ 
-			JumpInfo[i]->FallThrough = FALSE;				
+			JumpInfo[i]->FallThrough = false;
 			JmpLabel32(JumpInfo[i]->BranchLabel.c_str(),0);
 			JumpInfo[i]->LinkLocation = (DWORD *)(m_RecompPos - 4);
 		}
@@ -837,7 +839,7 @@ void CCodeSection::SyncRegState ( const CRegInfo & SyncTo )
 	}
 }
 
-void CCodeSection::SetDelaySlot (void) 
+void CCodeSection::SetDelaySlot()
 {
 	m_DelaySlot = true;
 }
@@ -857,14 +859,17 @@ void CCodeSection::SetContinueAddress (DWORD JumpPC, DWORD TargetPC)
 	m_Cont.BranchLabel.Format("0x%08X",TargetPC);
 }
 
-void CCodeSection::CompileCop1Test (void) {
-	if (m_RegWorkingSet.FpuBeenUsed()) { return; }
+void CCodeSection::CompileCop1Test()
+{
+	if (m_RegWorkingSet.FpuBeenUsed())
+		return;
+
 	TestVariable(STATUS_CU1,&g_Reg->STATUS_REGISTER,"STATUS_REGISTER");
-	CompileExit(m_CompilePC,m_CompilePC,m_RegWorkingSet,CExitInfo::COP1_Unuseable,FALSE,JeLabel32);
-	m_RegWorkingSet.FpuBeenUsed() = TRUE;
+	CompileExit(m_CompilePC,m_CompilePC,m_RegWorkingSet,CExitInfo::COP1_Unuseable,false,JeLabel32);
+	m_RegWorkingSet.FpuBeenUsed() = true;
 }
 
-bool CCodeSection::ParentContinue ( void )
+bool CCodeSection::ParentContinue()
 {
 	if (m_ParentSection.size() > 0)
 	{
@@ -884,7 +889,7 @@ bool CCodeSection::ParentContinue ( void )
 }
 
 /*int TestValue = 0;
-void TestFunc ( void )
+void TestFunc()
 {
 	TestValue += 1;
 	if (TestValue >= 4)
@@ -1607,7 +1612,7 @@ bool CCodeSection::IsAllParentLoops(CCodeSection * Parent, bool IgnoreIfCompiled
 	return true;
 }
 
-bool CCodeSection::SetupRegisterForLoop ( void )
+bool CCodeSection::SetupRegisterForLoop()
 {
 	CRegInfo OriginalReg = m_RegWorkingSet;
 	if (!LoopAnalysis(m_BlockInfo, this).SetupRegisterForLoop())
@@ -1624,7 +1629,7 @@ bool CCodeSection::SetupRegisterForLoop ( void )
 	return true;
 }
 
-bool CCodeSection::InheritParentInfo ( void )
+bool CCodeSection::InheritParentInfo()
 {	
 	if (m_CompiledLocation == NULL)
 	{
@@ -2037,7 +2042,7 @@ bool CCodeSection::DisplaySectionInformation (DWORD ID, DWORD Test)
 	return true;
 }
 
-void CCodeSection::DisplaySectionInformation (void)
+void CCodeSection::DisplaySectionInformation()
 {
 	if (m_SectionID == 0)
 	{
diff --git a/Source/Project64/N64 System/Recompiler/Code Section.h b/Source/Project64/N64 System/Recompiler/Code Section.h
index 35ad0fb58..979aafd9d 100644
--- a/Source/Project64/N64 System/Recompiler/Code Section.h	
+++ b/Source/Project64/N64 System/Recompiler/Code Section.h	
@@ -19,22 +19,21 @@ public:
 	typedef std::list<CCodeSection *> SECTION_LIST;
 
 	CCodeSection( CCodeBlock * CodeBlock, DWORD EnterPC, DWORD ID, bool LinkAllowed);
-	~CCodeSection( void );
+	~CCodeSection();
 
-	void SetDelaySlot              ( void );
+	void SetDelaySlot              ();
 	void SetJumpAddress            ( DWORD JumpPC, DWORD TargetPC, bool PermLoop );
 	void SetContinueAddress        ( DWORD JumpPC, DWORD TargetPC );
-	void CompileCop1Test           ( void );
-	bool CreateSectionLinkage      ( void );
+	void CompileCop1Test           ();
 	bool GenerateX86Code           ( DWORD Test );
-	void GenerateSectionLinkage    ( void );
-	void CompileExit               ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason, int CompileNow, void (*x86Jmp)(const char * Label, DWORD Value));
+	void GenerateSectionLinkage    ();
+	void CompileExit               ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason, bool CompileNow, void (*x86Jmp)(const char * Label, DWORD Value));
 	void DetermineLoop             ( DWORD Test, DWORD Test2, DWORD TestID );
 	bool FixConstants              ( DWORD Test );
 	CCodeSection * ExistingSection ( DWORD Addr, DWORD Test );
 	bool SectionAccessible         ( DWORD SectionId, DWORD Test );
 	bool DisplaySectionInformation ( DWORD ID, DWORD Test );
-	void DisplaySectionInformation ( void );
+	void DisplaySectionInformation ();
 	void AddParent                 ( CCodeSection * Parent );
 	void SwitchParent              ( CCodeSection * OldParent, CCodeSection * NewParent );
 
@@ -48,14 +47,14 @@ public:
 	CCodeSection     * m_JumpSection;
 	bool               m_EndSection;   // if this section does not link
 	bool               m_LinkAllowed;  // are other sections allowed to find block to link to it
-	DWORD		       m_Test;
-	DWORD		       m_Test2;
+	DWORD              m_Test;
+	DWORD              m_Test2;
 	BYTE             * m_CompiledLocation;
-	bool		       m_InLoop;
-	bool		       m_DelaySlot;
+	bool               m_InLoop;
+	bool               m_DelaySlot;
 
 	/* Register Info */
-	CRegInfo	m_RegEnter;
+	CRegInfo    m_RegEnter;
 
 	/* Jump Info */
 	CJumpInfo   m_Jump;
@@ -63,12 +62,12 @@ public:
 
 private:
 	void UnlinkParent           ( CCodeSection * Parent, bool ContinueSection );
-	void InheritConstants       ( void );
+	void InheritConstants       ();
 	void TestRegConstantStates  ( CRegInfo & Base, CRegInfo & Reg );
 	void SyncRegState           ( const CRegInfo & SyncTo );
 	bool IsAllParentLoops       ( CCodeSection * Parent, bool IgnoreIfCompiled, DWORD Test ); 
-	bool ParentContinue         ( void );
-	bool InheritParentInfo      ( void );
-	bool SetupRegisterForLoop   ( void );
+	bool ParentContinue         ();
+	bool InheritParentInfo      ();
+	bool SetupRegisterForLoop   ();
 };
 
diff --git a/Source/Project64/N64 System/Recompiler/Delay Slot Map Class.h b/Source/Project64/N64 System/Recompiler/Delay Slot Map Class.h
index 5813f8af8..d68152166 100644
--- a/Source/Project64/N64 System/Recompiler/Delay Slot Map Class.h	
+++ b/Source/Project64/N64 System/Recompiler/Delay Slot Map Class.h	
@@ -17,13 +17,13 @@ class CDelaySlotFunctionMap
 	FUNCTION_MAP FunctionMap;
 
 public:
-	CDelaySlotFunctionMap ( void );
-	~CDelaySlotFunctionMap ( void );
+	CDelaySlotFunctionMap();
+	~CDelaySlotFunctionMap();
 
-	CCompiledFunc * AddFunctionInfo ( DWORD vAddr, DWORD pAddr );
-	CCompiledFunc * FindFunction    ( DWORD vAddr, int Length );
-	CCompiledFunc * FindFunction    ( DWORD vAddr ) const;
+	CCompiledFunc* AddFunctionInfo(DWORD vAddr, DWORD pAddr);
+	CCompiledFunc* FindFunction(DWORD vAddr, int Length);
+	CCompiledFunc* FindFunction(DWORD vAddr) const;
 
-	void Remove ( CCompiledFunc * info );
-	void Reset  ( void );
+	void Remove(CCompiledFunc* info);
+	void Reset();
 };
diff --git a/Source/Project64/N64 System/Recompiler/Function Info.cpp b/Source/Project64/N64 System/Recompiler/Function Info.cpp
index b273d1e3e..38b694ff1 100644
--- a/Source/Project64/N64 System/Recompiler/Function Info.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Function Info.cpp	
@@ -14,8 +14,8 @@ CCompiledFunc::CCompiledFunc( const CCodeBlock & CodeBlock ) :
 	m_EnterPC(CodeBlock.VAddrEnter()),
 	m_MinPC(CodeBlock.VAddrFirst()),
 	m_MaxPC(CodeBlock.VAddrLast()),
-	m_Function((Func)CodeBlock.CompiledLocation()),
 	m_Hash(CodeBlock.Hash()),
+	m_Function((Func)CodeBlock.CompiledLocation()),
 	m_Next(NULL)
 {
 	m_MemContents[0] = CodeBlock.MemContents(0);
diff --git a/Source/Project64/N64 System/Recompiler/Function Info.h b/Source/Project64/N64 System/Recompiler/Function Info.h
index dd6261908..1b3840372 100644
--- a/Source/Project64/N64 System/Recompiler/Function Info.h	
+++ b/Source/Project64/N64 System/Recompiler/Function Info.h	
@@ -13,37 +13,37 @@
 class CCompiledFunc
 {
 	//constructor
-	CCompiledFunc ( void ); // not implemented
+	CCompiledFunc(); // not implemented
 
 public:
-	CCompiledFunc ( const CCodeBlock & CodeBlock );
+	CCompiledFunc(const CCodeBlock & CodeBlock);
 
-	typedef void (* Func)(void);
+	typedef void (*Func)();
 
 	//Get Private Information
-	inline const DWORD  EnterPC   ( void ) const { return m_EnterPC; }
-	inline const DWORD  MinPC     ( void ) const { return m_MinPC; }
-	inline const DWORD  MaxPC     ( void ) const { return m_MaxPC; }
-	inline const Func   Function  ( void ) const { return m_Function; }
-	inline const MD5Digest & Hash ( void ) const { return m_Hash; }
+	const DWORD  EnterPC   () const { return m_EnterPC; }
+	const DWORD  MinPC     () const { return m_MinPC; }
+	const DWORD  MaxPC     () const { return m_MaxPC; }
+	const Func   Function  () const { return m_Function; }
+	const MD5Digest&  Hash () const { return m_Hash; }
 
-	inline CCompiledFunc * Next ( void ) const { return m_Next; }
-	inline void SetNext ( CCompiledFunc * Next ) { m_Next = Next; }
+	CCompiledFunc*    Next () const { return m_Next; }
+	void SetNext(CCompiledFunc* Next) { m_Next = Next; }
 
-	inline QWORD MemContents(int i) { return m_MemContents[i]; }
-	inline QWORD * MemLocation(int i) { return m_MemLocation[i]; }
+	QWORD MemContents(int i) { return m_MemContents[i]; }
+	QWORD* MemLocation(int i) { return m_MemLocation[i]; }
 
 private:
 	//Information
-	DWORD m_EnterPC;		// The Entry PC
-	DWORD m_MinPC;			// The Lowest PC in the function
-	DWORD m_MaxPC;			// The Highest PC in the function
+	DWORD m_EnterPC; // The Entry PC
+	DWORD m_MinPC;   // The Lowest PC in the function
+	DWORD m_MaxPC;   // The Highest PC in the function
 
 	MD5Digest m_Hash;
 	//From querying the recompiler get information about the function
 	Func  m_Function;
 
-	CCompiledFunc * m_Next;
+	CCompiledFunc* m_Next;
 	
 	//Validation
 	QWORD m_MemContents[2], * m_MemLocation[2];
diff --git a/Source/Project64/N64 System/Recompiler/Function Map Class.cpp b/Source/Project64/N64 System/Recompiler/Function Map Class.cpp
index 4def42865..4c20dbe08 100644
--- a/Source/Project64/N64 System/Recompiler/Function Map Class.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Function Map Class.cpp	
@@ -47,7 +47,7 @@ bool CFunctionMap::AllocateMemory()
 	return true;
 }
 
-void CFunctionMap::CleanBuffers  ( void )
+void CFunctionMap::CleanBuffers()
 {
 	if (m_FunctionTable)
 	{
diff --git a/Source/Project64/N64 System/Recompiler/Function Map Class.h b/Source/Project64/N64 System/Recompiler/Function Map Class.h
index 7748b7e08..b79673895 100644
--- a/Source/Project64/N64 System/Recompiler/Function Map Class.h	
+++ b/Source/Project64/N64 System/Recompiler/Function Map Class.h	
@@ -19,15 +19,15 @@ protected:
 	CFunctionMap();
 	~CFunctionMap();
 
-	bool AllocateMemory ( void );
-	void Reset          ( bool bAllocate);
+	bool AllocateMemory();
+	void Reset(bool bAllocate);
 
 public:
-	inline PCCompiledFunc_TABLE * FunctionTable  ( void ) const { return m_FunctionTable; }
-	inline PCCompiledFunc       * JumpTable      ( void ) const { return m_JumpTable; }
+	PCCompiledFunc_TABLE * FunctionTable() const { return m_FunctionTable; }
+	PCCompiledFunc       * JumpTable() const { return m_JumpTable; }
 
 private:
-	void CleanBuffers  ( void );
+	void CleanBuffers();
 
 	PCCompiledFunc       * m_JumpTable;
 	PCCompiledFunc_TABLE * m_FunctionTable;
diff --git a/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp b/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp
index 5d47c5fed..e8ebe7760 100644
--- a/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp	
@@ -47,7 +47,7 @@ LoopAnalysis::~LoopAnalysis()
 	m_JumpRegisters.clear();
 }
 
-bool LoopAnalysis::SetupRegisterForLoop ( void )
+bool LoopAnalysis::SetupRegisterForLoop()
 {
 	if (!m_EnterSection->m_InLoop)
 	{
@@ -503,29 +503,32 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
 				break;
 			case R4300i_COP0_MT: break;
 			default:
-				if ( (m_Command.rs & 0x10 ) != 0 ) {
-					switch( m_Command.funct ) {
+				if ( (m_Command.rs & 0x10 ) != 0 )
+				{
+					switch( m_Command.funct ) 
+					{
 					case R4300i_COP0_CO_TLBR: break;
 					case R4300i_COP0_CO_TLBWI: break;
 					case R4300i_COP0_CO_TLBWR: break;
 					case R4300i_COP0_CO_TLBP: break;
 					case R4300i_COP0_CO_ERET: m_NextInstruction = END_BLOCK; break;
 					default:
-						g_Notify->DisplayError(L"Unhandled R4300i OpCode in FillSectionInfo\n%s",
-							R4300iOpcodeName(m_Command.Hex,m_PC));
+						g_Notify->DisplayError(stdstr_f("Unhandled R4300i OpCode in FillSectionInfo\n%s",R4300iOpcodeName(m_Command.Hex,m_PC)).ToUTF16().c_str());
 						m_NextInstruction = END_BLOCK;
 						m_PC -= 4;
 					}
-				} else {
-					g_Notify->DisplayError(L"Unhandled R4300i OpCode in FillSectionInfo 3\n%s",
-						R4300iOpcodeName(m_Command.Hex,m_PC));
+				} 
+				else 
+				{
+					g_Notify->DisplayError(stdstr_f("Unhandled R4300i OpCode in FillSectionInfo 3\n%s",R4300iOpcodeName(m_Command.Hex,m_PC)).ToUTF16().c_str());
 					m_NextInstruction = END_BLOCK;
 					m_PC -= 4;
 				}
 			}
 			break;
 		case R4300i_CP1:
-			switch (m_Command.fmt) {
+			switch (m_Command.fmt) 
+			{
 			case R4300i_COP1_CF:
 			case R4300i_COP1_MF:
 			case R4300i_COP1_DMF:
@@ -594,8 +597,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
 			case R4300i_COP1_W: break;
 			case R4300i_COP1_L: break;
 			default:
-				g_Notify->DisplayError(L"Unhandled R4300i OpCode in FillSectionInfo 2\n%s",
-					R4300iOpcodeName(m_Command.Hex,m_PC));
+				g_Notify->DisplayError(stdstr_f("Unhandled R4300i OpCode in FillSectionInfo 2\n%s",R4300iOpcodeName(m_Command.Hex,m_PC)).ToUTF16().c_str());
 				m_NextInstruction = END_BLOCK;
 				m_PC -= 4;
 			}
@@ -689,8 +691,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
 			if (m_Command.Hex == 0xF1F3F5F7) { break; }
 			if (m_Command.Hex == 0xC1200000) { break; }
 			if (m_Command.Hex == 0x4C5A5353) { break; }
-			g_Notify->DisplayError(L"Unhandled R4300i OpCode in FillSectionInfo 1\n%s\n%X",
-				R4300iOpcodeName(m_Command.Hex,m_PC),m_Command.Hex);
+			g_Notify->DisplayError(stdstr_f("Unhandled R4300i OpCode in FillSectionInfo 1\n%s\n%X",R4300iOpcodeName(m_Command.Hex,m_PC),m_Command.Hex).ToUTF16().c_str());
 		}
 
 		CPU_Message("  %s state: %X value: %X",CRegName::GPR[5],m_Reg.GetMipsRegState(5),m_Reg.GetMipsRegLo(5));
@@ -808,25 +809,25 @@ void LoopAnalysis::SetContinueRegSet ( CCodeSection * Section, const CRegInfo &R
 	}
 }
 
-void LoopAnalysis::SPECIAL_SLL ( void )
+void LoopAnalysis::SPECIAL_SLL()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);
 }
 
-void LoopAnalysis::SPECIAL_SRL ( void )
+void LoopAnalysis::SPECIAL_SRL()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_SRA ( void )
+void LoopAnalysis::SPECIAL_SRA()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_SLLV ( void )
+void LoopAnalysis::SPECIAL_SLLV()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd) {
@@ -840,7 +841,7 @@ void LoopAnalysis::SPECIAL_SLLV ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_SRLV ( void )
+void LoopAnalysis::SPECIAL_SRLV()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd)
@@ -855,7 +856,7 @@ void LoopAnalysis::SPECIAL_SRLV ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_SRAV ( void )
+void LoopAnalysis::SPECIAL_SRAV()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd)
@@ -870,7 +871,7 @@ void LoopAnalysis::SPECIAL_SRAV ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_JR ( void )
+void LoopAnalysis::SPECIAL_JR()
 {
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 #ifdef tofix
@@ -883,7 +884,7 @@ void LoopAnalysis::SPECIAL_JR ( void )
 	m_NextInstruction = DELAY_SLOT;
 }
 
-void LoopAnalysis::SPECIAL_JALR ( void )
+void LoopAnalysis::SPECIAL_JALR()
 {
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 #ifdef tofix
@@ -938,27 +939,27 @@ void LoopAnalysis::SPECIAL_BREAK ( CCodeSection * Section )
 	m_PC -= 4;
 }
 
-void LoopAnalysis::SPECIAL_MFHI ( void )
+void LoopAnalysis::SPECIAL_MFHI()
 {
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);
 }
 
-void LoopAnalysis::SPECIAL_MTHI ( void )
+void LoopAnalysis::SPECIAL_MTHI()
 {
 
 }
 
-void LoopAnalysis::SPECIAL_MFLO ( void )
+void LoopAnalysis::SPECIAL_MFLO()
 {
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);
 }
 
-void LoopAnalysis::SPECIAL_MTLO ( void )
+void LoopAnalysis::SPECIAL_MTLO()
 {
 
 }
 
-void LoopAnalysis::SPECIAL_DSLLV ( void )
+void LoopAnalysis::SPECIAL_DSLLV()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd)
@@ -973,7 +974,7 @@ void LoopAnalysis::SPECIAL_DSLLV ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DSRLV ( void )
+void LoopAnalysis::SPECIAL_DSRLV()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd)
@@ -989,7 +990,7 @@ void LoopAnalysis::SPECIAL_DSRLV ( void )
 
 }
 
-void LoopAnalysis::SPECIAL_DSRAV ( void )
+void LoopAnalysis::SPECIAL_DSRAV()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd)
@@ -1004,67 +1005,67 @@ void LoopAnalysis::SPECIAL_DSRAV ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_ADD ( void )
+void LoopAnalysis::SPECIAL_ADD()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_ADDU ( void )
+void LoopAnalysis::SPECIAL_ADDU()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_SUB ( void )
+void LoopAnalysis::SPECIAL_SUB()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_SUBU ( void )
+void LoopAnalysis::SPECIAL_SUBU()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_AND ( void )
+void LoopAnalysis::SPECIAL_AND()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_OR ( void )
+void LoopAnalysis::SPECIAL_OR()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_XOR ( void )
+void LoopAnalysis::SPECIAL_XOR()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_NOR ( void )
+void LoopAnalysis::SPECIAL_NOR()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);	
 }
 
-void LoopAnalysis::SPECIAL_SLT ( void )
+void LoopAnalysis::SPECIAL_SLT()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);
 }
 
-void LoopAnalysis::SPECIAL_SLTU ( void )
+void LoopAnalysis::SPECIAL_SLTU()
 {
 	if (m_Command.rd == 0) { return; }
 	m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_MODIFIED);
 }
 
-void LoopAnalysis::SPECIAL_DADD ( void )
+void LoopAnalysis::SPECIAL_DADD()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd)
@@ -1082,7 +1083,7 @@ void LoopAnalysis::SPECIAL_DADD ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DADDU ( void )
+void LoopAnalysis::SPECIAL_DADDU()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd)
@@ -1100,7 +1101,7 @@ void LoopAnalysis::SPECIAL_DADDU ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DSUB ( void )
+void LoopAnalysis::SPECIAL_DSUB()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd)
@@ -1118,7 +1119,7 @@ void LoopAnalysis::SPECIAL_DSUB ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DSUBU ( void )
+void LoopAnalysis::SPECIAL_DSUBU()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd || m_Command.rs == m_Command.rd)
@@ -1136,7 +1137,7 @@ void LoopAnalysis::SPECIAL_DSUBU ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DSLL ( void )
+void LoopAnalysis::SPECIAL_DSLL()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd) 
@@ -1151,7 +1152,7 @@ void LoopAnalysis::SPECIAL_DSLL ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DSRL ( void )
+void LoopAnalysis::SPECIAL_DSRL()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd) 
@@ -1166,7 +1167,7 @@ void LoopAnalysis::SPECIAL_DSRL ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DSRA ( void )
+void LoopAnalysis::SPECIAL_DSRA()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd) 
@@ -1181,7 +1182,7 @@ void LoopAnalysis::SPECIAL_DSRA ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DSLL32 ( void )
+void LoopAnalysis::SPECIAL_DSLL32()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd) 
@@ -1196,7 +1197,7 @@ void LoopAnalysis::SPECIAL_DSLL32 ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DSRL32 ( void )
+void LoopAnalysis::SPECIAL_DSRL32()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd) 
@@ -1211,7 +1212,7 @@ void LoopAnalysis::SPECIAL_DSRL32 ( void )
 	}
 }
 
-void LoopAnalysis::SPECIAL_DSRA32 ( void )
+void LoopAnalysis::SPECIAL_DSRA32()
 {
 	if (m_Command.rd == 0) { return; }
 	if (m_Command.rt == m_Command.rd) 
diff --git a/Source/Project64/N64 System/Recompiler/Loop Analysis.h b/Source/Project64/N64 System/Recompiler/Loop Analysis.h
index 161f8d4bd..37b3f5620 100644
--- a/Source/Project64/N64 System/Recompiler/Loop Analysis.h	
+++ b/Source/Project64/N64 System/Recompiler/Loop Analysis.h	
@@ -19,57 +19,57 @@ public:
 	LoopAnalysis(CCodeBlock * CodeBlock, CCodeSection * Section);
 	~LoopAnalysis();
 
-	bool SetupRegisterForLoop ( void );
+	bool SetupRegisterForLoop();
 
 private:
-	LoopAnalysis(void);								// Disable default constructor
-	LoopAnalysis(const LoopAnalysis&);				// Disable copy constructor
-	LoopAnalysis& operator=(const LoopAnalysis&);	// Disable assignment
+	LoopAnalysis();                               // Disable default constructor
+	LoopAnalysis(const LoopAnalysis&);            // Disable copy constructor
+	LoopAnalysis& operator=(const LoopAnalysis&); // Disable assignment
 
 	bool SetupEnterSection ( CCodeSection * Section, bool & bChanged, bool & bSkipedSection );
 	bool CheckLoopRegisterUsage ( CCodeSection * Section );
 	bool SyncRegState ( CRegInfo & RegSet, const CRegInfo& SyncReg );
 	void SetJumpRegSet ( CCodeSection * Section, const CRegInfo &Reg );
-	void SetContinueRegSet ( CCodeSection * Section, const CRegInfo &Reg );
+	void SetContinueRegSet(CCodeSection * Section, const CRegInfo &Reg);
 
 	/********************** R4300i OpCodes: Special **********************/
-	void SPECIAL_SLL     ( void );
-	void SPECIAL_SRL     ( void );
-	void SPECIAL_SRA     ( void );
-	void SPECIAL_SLLV    ( void );
-	void SPECIAL_SRLV    ( void );
-	void SPECIAL_SRAV    ( void );
-	void SPECIAL_JR      ( void );
-	void SPECIAL_JALR    ( void );
-	void SPECIAL_SYSCALL ( CCodeSection * Section );
-	void SPECIAL_BREAK   ( CCodeSection * Section );
-	void SPECIAL_MFHI    ( void );
-	void SPECIAL_MTHI    ( void );
-	void SPECIAL_MFLO    ( void );
-	void SPECIAL_MTLO    ( void );
-	void SPECIAL_DSLLV   ( void );
-	void SPECIAL_DSRLV   ( void );
-	void SPECIAL_DSRAV   ( void );
-	void SPECIAL_ADD     ( void );
-	void SPECIAL_ADDU    ( void );
-	void SPECIAL_SUB     ( void );
-	void SPECIAL_SUBU    ( void );
-	void SPECIAL_AND     ( void );
-	void SPECIAL_OR      ( void );
-	void SPECIAL_XOR     ( void );
-	void SPECIAL_NOR     ( void );
-	void SPECIAL_SLT     ( void );
-	void SPECIAL_SLTU    ( void );
-	void SPECIAL_DADD    ( void );
-	void SPECIAL_DADDU   ( void );
-	void SPECIAL_DSUB    ( void );
-	void SPECIAL_DSUBU   ( void );
-	void SPECIAL_DSLL    ( void );
-	void SPECIAL_DSRL    ( void );
-	void SPECIAL_DSRA    ( void );
-	void SPECIAL_DSLL32  ( void );
-	void SPECIAL_DSRL32  ( void );
-	void SPECIAL_DSRA32  ( void );
+	void SPECIAL_SLL();
+	void SPECIAL_SRL();
+	void SPECIAL_SRA();
+	void SPECIAL_SLLV();
+	void SPECIAL_SRLV();
+	void SPECIAL_SRAV();
+	void SPECIAL_JR();
+	void SPECIAL_JALR();
+	void SPECIAL_SYSCALL(CCodeSection * Section);
+	void SPECIAL_BREAK(CCodeSection * Section);
+	void SPECIAL_MFHI();
+	void SPECIAL_MTHI();
+	void SPECIAL_MFLO();
+	void SPECIAL_MTLO();
+	void SPECIAL_DSLLV();
+	void SPECIAL_DSRLV();
+	void SPECIAL_DSRAV();
+	void SPECIAL_ADD();
+	void SPECIAL_ADDU();
+	void SPECIAL_SUB();
+	void SPECIAL_SUBU();
+	void SPECIAL_AND();
+	void SPECIAL_OR();
+	void SPECIAL_XOR();
+	void SPECIAL_NOR();
+	void SPECIAL_SLT();
+	void SPECIAL_SLTU();
+	void SPECIAL_DADD();
+	void SPECIAL_DADDU();
+	void SPECIAL_DSUB();
+	void SPECIAL_DSUBU();
+	void SPECIAL_DSLL();
+	void SPECIAL_DSRL();
+	void SPECIAL_DSRA();
+	void SPECIAL_DSLL32();
+	void SPECIAL_DSRL32();
+	void SPECIAL_DSRA32();
 
 	typedef std::map<int,CRegInfo *> RegisterMap;
 
@@ -79,7 +79,7 @@ private:
 	CCodeSection * m_EnterSection;
 	CCodeBlock   * m_BlockInfo;
 	DWORD          m_PC;
-	CRegInfo	   m_Reg;
+	CRegInfo       m_Reg;
 	STEP_TYPE      m_NextInstruction;
 	OPCODE         m_Command;
 	DWORD          m_Test;
diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Class.cpp b/Source/Project64/N64 System/Recompiler/Recompiler Class.cpp
index 9dc1730b0..0a5aa6993 100644
--- a/Source/Project64/N64 System/Recompiler/Recompiler Class.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Recompiler Class.cpp	
@@ -13,8 +13,8 @@
 CRecompiler::CRecompiler(CRegisters & Registers, CProfiling & Profile, bool & EndEmulation ) :
 	m_Registers(Registers),
 	m_Profile(Profile),
-	PROGRAM_COUNTER(Registers.m_PROGRAM_COUNTER),
-	m_EndEmulation(EndEmulation)
+	m_EndEmulation(EndEmulation),
+	PROGRAM_COUNTER(Registers.m_PROGRAM_COUNTER)
 {
 	if (g_MMU != NULL)
 	{
@@ -90,7 +90,7 @@ void CRecompiler::Run()
 	}
 }
 
-void CRecompiler::RecompilerMain_VirtualTable ( void )
+void CRecompiler::RecompilerMain_VirtualTable()
 {
 	bool & Done = m_EndEmulation;
 	DWORD & PC = PROGRAM_COUNTER;
@@ -102,7 +102,7 @@ void CRecompiler::RecompilerMain_VirtualTable ( void )
 			m_Registers.DoTLBReadMiss(false,PC);
 			if (!g_TransVaddr->ValidVaddr(PC)) 
 			{
-				g_Notify->DisplayError(L"Failed to translate PC to a PAddr: %X\n\nEmulation stopped",PC);
+				g_Notify->DisplayError(stdstr_f("Failed to translate PC to a PAddr: %X\n\nEmulation stopped",PC).ToUTF16().c_str());
 				return;
 			}
 			continue;
@@ -146,7 +146,7 @@ void CRecompiler::RecompilerMain_VirtualTable ( void )
 	}
 }
 
-void CRecompiler::RecompilerMain_VirtualTable_validate ( void )
+void CRecompiler::RecompilerMain_VirtualTable_validate()
 {
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 /*	PCCompiledFunc_TABLE * m_FunctionTable = m_Functions.GetFunctionTable();
@@ -320,7 +320,7 @@ void CRecompiler::RecompilerMain_VirtualTable_validate ( void )
 	*/
 }
 
-void CRecompiler::RecompilerMain_Lookup( void )
+void CRecompiler::RecompilerMain_Lookup()
 {
 	while(!m_EndEmulation) 
 	{
@@ -510,7 +510,7 @@ void CRecompiler::RecompilerMain_Lookup( void )
 	}*/
 }
 
-void CRecompiler::RecompilerMain_Lookup_TLB( void )
+void CRecompiler::RecompilerMain_Lookup_TLB()
 {
 	DWORD PhysicalAddr;
 
@@ -521,7 +521,7 @@ void CRecompiler::RecompilerMain_Lookup_TLB( void )
 			m_Registers.DoTLBReadMiss(false,PROGRAM_COUNTER);
 			if (!g_TransVaddr->TranslateVaddr(PROGRAM_COUNTER, PhysicalAddr))
 			{
-				g_Notify->DisplayError(L"Failed to translate PC to a PAddr: %X\n\nEmulation stopped",PROGRAM_COUNTER);
+				g_Notify->DisplayError(stdstr_f("Failed to translate PC to a PAddr: %X\n\nEmulation stopped",PROGRAM_COUNTER).ToUTF16().c_str());
 				m_EndEmulation = true;
 			}
 			continue;
@@ -544,7 +544,9 @@ void CRecompiler::RecompilerMain_Lookup_TLB( void )
 				JumpTable()[PhysicalAddr >> 2] = info;
 			}
 			(info->Function())();
-		} else {
+		}
+		else 
+		{
 			DWORD opsExecuted = 0;
 
 			while (g_TransVaddr->TranslateVaddr(PROGRAM_COUNTER, PhysicalAddr) && PhysicalAddr >= g_System->RdramSize())
@@ -562,7 +564,7 @@ void CRecompiler::RecompilerMain_Lookup_TLB( void )
 	}
 }
 
-void CRecompiler::RecompilerMain_Lookup_validate( void )
+void CRecompiler::RecompilerMain_Lookup_validate()
 {
 	while(!m_EndEmulation) 
 	{
@@ -610,7 +612,7 @@ void CRecompiler::RecompilerMain_Lookup_validate( void )
 	}
 }
 
-void CRecompiler::RecompilerMain_Lookup_validate_TLB( void )
+void CRecompiler::RecompilerMain_Lookup_validate_TLB()
 {
 	DWORD PhysicalAddr;
 
@@ -621,7 +623,7 @@ void CRecompiler::RecompilerMain_Lookup_validate_TLB( void )
 			m_Registers.DoTLBReadMiss(false,PROGRAM_COUNTER);
 			if (!g_TransVaddr->TranslateVaddr(PROGRAM_COUNTER, PhysicalAddr))
 			{
-				g_Notify->DisplayError(L"Failed to translate PC to a PAddr: %X\n\nEmulation stopped",PROGRAM_COUNTER);
+				g_Notify->DisplayError(stdstr_f("Failed to translate PC to a PAddr: %X\n\nEmulation stopped",PROGRAM_COUNTER).ToUTF16().c_str());
 				m_EndEmulation = true;
 			}
 			continue;
@@ -705,7 +707,7 @@ void CRecompiler::ResetRecompCode( bool bAllocate )
 	m_Functions.clear();
 }
 
-void CRecompiler::RecompilerMain_ChangeMemory ( void )
+void CRecompiler::RecompilerMain_ChangeMemory()
 {
 	g_Notify->BreakPoint(__FILEW__,__LINE__);
 #ifdef tofix
@@ -842,7 +844,7 @@ void CRecompiler::RecompilerMain_ChangeMemory ( void )
 #endif
 }
 
-CCompiledFunc * CRecompiler::CompilerCode ( void )
+CCompiledFunc * CRecompiler::CompilerCode()
 {
 	DWORD pAddr = 0;
 	if (!g_TransVaddr->TranslateVaddr(PROGRAM_COUNTER,pAddr))
@@ -979,7 +981,7 @@ void CRecompiler::ClearRecompCode_Virt(DWORD Address, int length,REMOVE_REASON R
 	}
 }
 
-void CRecompiler::ResetMemoryStackPos( void ) 
+void CRecompiler::ResetMemoryStackPos()
 {
 	if (g_MMU == NULL)
 	{
diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Class.h b/Source/Project64/N64 System/Recompiler/Recompiler Class.h
index 643af35ab..0f17d71b9 100644
--- a/Source/Project64/N64 System/Recompiler/Recompiler Class.h	
+++ b/Source/Project64/N64 System/Recompiler/Recompiler Class.h	
@@ -29,48 +29,39 @@ public:
 		Remove_StoreInstruc,
 	};
 
-	typedef void (* DelayFunc)(void);
+	typedef void (*DelayFunc)();
 
 public:
-	CRecompiler (CRegisters & Registers, CProfiling & Profile, bool & EndEmulation );
-	~CRecompiler (void);
+	CRecompiler(CRegisters & Registers, CProfiling & Profile, bool & EndEmulation);
+	~CRecompiler();
 
-	void Run             ( void );
-	void Reset           ( void );
-	void ResetRecompCode ( bool bAllocate );
-
-	bool GenerateX86Code (CCodeBlock & BlockInfo, CCodeSection * Section, DWORD Test );
+	void Run();
+	void Reset();
+	void ResetRecompCode(bool bAllocate);
 
 	//Self modifying code methods
 	void ClearRecompCode_Virt ( DWORD VirtualAddress, int length, REMOVE_REASON Reason );
 	void ClearRecompCode_Phys ( DWORD PhysicalAddress, int length, REMOVE_REASON Reason );
 	
-	void ResetMemoryStackPos  ( void );
+	void ResetMemoryStackPos();
 
-	inline DWORD & MemoryStackPos ( void ) { return m_MemoryStack; }
+	DWORD& MemoryStackPos() { return m_MemoryStack; }
 
 private:
-	CRecompiler(void);							// Disable default constructor
-	CRecompiler(const CRecompiler&);			// Disable copy constructor
-	CRecompiler& operator=(const CRecompiler&);	// Disable assignment
+	CRecompiler();                              // Disable default constructor
+	CRecompiler(const CRecompiler&);            // Disable copy constructor
+	CRecompiler& operator=(const CRecompiler&); // Disable assignment
 	
-	CCompiledFunc * CompilerCode        ( void );
-	bool            Compiler4300iBlock  ( CCompiledFunc * info );
-
-	// Compiling code
-	bool CreateSectionLinkage ( CCodeSection * Section );
-	bool DisplaySectionInformation (CCodeSection * Section, DWORD ID, DWORD Test);
+	CCompiledFunc * CompilerCode();
 
 	// Main loops for the different look up methods
-	void RecompilerMain_VirtualTable          ( void );
-	void RecompilerMain_VirtualTable_validate ( void );
-	void RecompilerMain_ChangeMemory          ( void );
-	void RecompilerMain_Lookup                ( void );
-	void RecompilerMain_Lookup_TLB            ( void );
-	void RecompilerMain_Lookup_validate       ( void );
-	void RecompilerMain_Lookup_validate_TLB   ( void );
-
-	void RemoveFunction (CCompiledFunc * FunInfo, bool DelaySlot, REMOVE_REASON Reason );
+	void RecompilerMain_VirtualTable();
+	void RecompilerMain_VirtualTable_validate();
+	void RecompilerMain_ChangeMemory();
+	void RecompilerMain_Lookup();
+	void RecompilerMain_Lookup_TLB();
+	void RecompilerMain_Lookup_validate();
+	void RecompilerMain_Lookup_validate_TLB();
 
 	CCompiledFuncList  m_Functions;
 	CRegisters       & m_Registers;
diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Memory.cpp b/Source/Project64/N64 System/Recompiler/Recompiler Memory.cpp
index 1d1ef256a..b119c6449 100644
--- a/Source/Project64/N64 System/Recompiler/Recompiler Memory.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Recompiler Memory.cpp	
@@ -30,20 +30,20 @@ CRecompMemory::~CRecompMemory()
 bool CRecompMemory::AllocateMemory()
 {
 	BYTE * RecompCodeBase = (BYTE *)VirtualAlloc( NULL, MaxCompileBufferSize + 4, MEM_RESERVE|MEM_TOP_DOWN, PAGE_EXECUTE_READWRITE);
-	if (RecompCodeBase==NULL) 
-	{  
+	if (RecompCodeBase == NULL)
+	{
 		WriteTrace(TraceError,__FUNCTION__ ": failed to allocate RecompCodeBase");
 		g_Notify->DisplayError(MSG_MEM_ALLOC_ERROR);
-		return FALSE;
+		return false;
 	}
 
 	m_RecompCode = (BYTE *)VirtualAlloc( RecompCodeBase, InitialCompileBufferSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-	if (m_RecompCode==NULL) 
-	{  
+	if (m_RecompCode == NULL)
+	{
 		WriteTrace(TraceError,__FUNCTION__ ": failed to commit initial buffer");
 		VirtualFree( RecompCodeBase, 0 , MEM_RELEASE);
 		g_Notify->DisplayError(MSG_MEM_ALLOC_ERROR);
-		return FALSE;
+		return false;
 	}
 	m_RecompSize = InitialCompileBufferSize;
 	m_RecompPos = m_RecompCode;
@@ -51,7 +51,7 @@ bool CRecompMemory::AllocateMemory()
 	return true;
 }
 
-void CRecompMemory::CheckRecompMem ( void )
+void CRecompMemory::CheckRecompMem()
 {
 	DWORD Size = (DWORD)((BYTE *)m_RecompPos - (BYTE *)m_RecompCode);
 	if ((Size + 0x20000) < m_RecompSize)
@@ -88,5 +88,5 @@ void CRecompMemory::ShowMemUsed()
 
 	DWORD TotalAvaliable = m_RecompSize / 0x100000;
 	
-	g_Notify->DisplayMessage(0,L"Memory used: %d mb %-3d kb %-3d bytes     Total Available: %d mb",MB,KB,Size, TotalAvaliable);
+	g_Notify->DisplayMessage(0,stdstr_f("Memory used: %d mb %-3d kb %-3d bytes     Total Available: %d mb",MB,KB,Size, TotalAvaliable).ToUTF16().c_str());
 }
diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Memory.h b/Source/Project64/N64 System/Recompiler/Recompiler Memory.h
index 56f682133..17a9024c8 100644
--- a/Source/Project64/N64 System/Recompiler/Recompiler Memory.h	
+++ b/Source/Project64/N64 System/Recompiler/Recompiler Memory.h	
@@ -17,17 +17,17 @@ protected:
 	CRecompMemory();
 	~CRecompMemory();
 
-	bool AllocateMemory ( void );
-	void CheckRecompMem ( void );
-	void Reset          ( void );
-	void ShowMemUsed    ( void );
-	
-	inline BYTE * RecompPos ( void ) const { return m_RecompPos; }
+	bool AllocateMemory();
+	void CheckRecompMem();
+	void Reset();
+	void ShowMemUsed();
+
+	BYTE* RecompPos() const { return m_RecompPos; }
 
 private:
 	BYTE          * m_RecompCode;
 	DWORD           m_RecompSize;
-	
+
 	enum { MaxCompileBufferSize      = 0x03C00000 };
 	enum { InitialCompileBufferSize  = 0x00500000 };
 	enum { IncreaseCompileBufferSize = 0x00100000 };
diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp b/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp
index 077ac0c08..eb9ecb840 100644
--- a/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp	
@@ -11,7 +11,7 @@
 #include "stdafx.h"
 
 CCodeSection * CRecompilerOps::m_Section = NULL;
-CRegInfo	   CRecompilerOps::m_RegWorkingSet;
+CRegInfo       CRecompilerOps::m_RegWorkingSet;
 STEP_TYPE      CRecompilerOps::m_NextInstruction;
 DWORD          CRecompilerOps::m_CompilePC;
 OPCODE         CRecompilerOps::m_Opcode;
@@ -21,38 +21,36 @@ void CRecompilerOps::CompileReadTLBMiss (DWORD VirtualAddress, x86Reg LookUpReg
 {
 	MoveConstToVariable(VirtualAddress,g_TLBLoadAddress,"TLBLoadAddress");
 	TestX86RegToX86Reg(LookUpReg,LookUpReg);
-	m_Section->CompileExit(m_CompilePC, m_CompilePC,m_RegWorkingSet,CExitInfo::TLBReadMiss,FALSE,JeLabel32);
+	m_Section->CompileExit(m_CompilePC, m_CompilePC, m_RegWorkingSet, CExitInfo::TLBReadMiss, false, JeLabel32);
 }
 
 void CRecompilerOps::CompileReadTLBMiss (x86Reg AddressReg, x86Reg LookUpReg ) 
 {
 	MoveX86regToVariable(AddressReg,g_TLBLoadAddress,"TLBLoadAddress");
 	TestX86RegToX86Reg(LookUpReg,LookUpReg);
-	m_Section->CompileExit(m_CompilePC, m_CompilePC,m_RegWorkingSet,CExitInfo::TLBReadMiss,FALSE,JeLabel32);
+	m_Section->CompileExit(m_CompilePC, m_CompilePC, m_RegWorkingSet, CExitInfo::TLBReadMiss, false, JeLabel32);
 }
 
 void CRecompilerOps::CompileWriteTLBMiss (x86Reg AddressReg, x86Reg LookUpReg ) 
 {
 	MoveX86regToVariable(AddressReg,&g_TLBStoreAddress,"g_TLBStoreAddress");
 	TestX86RegToX86Reg(LookUpReg,LookUpReg);
-	m_Section->CompileExit(m_CompilePC, m_CompilePC,m_RegWorkingSet,CExitInfo::TLBWriteMiss,FALSE,JeLabel32);
+	m_Section->CompileExit(m_CompilePC, m_CompilePC, m_RegWorkingSet, CExitInfo::TLBWriteMiss, false, JeLabel32);
 }
 
 bool DelaySlotEffectsCompare ( DWORD PC, DWORD Reg1, DWORD Reg2 );
 
 /************************** Branch functions  ************************/
-void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc, BRANCH_TYPE BranchType, BOOL Link)
+void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc, BRANCH_TYPE BranchType, bool Link)
 {
 	static CRegInfo RegBeforeDelay;
 	static bool EffectDelaySlot;
 
-	if ( m_NextInstruction == NORMAL ) {
+	if (m_NextInstruction == NORMAL) {
 		CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 		
 		if (m_CompilePC + ((short)m_Opcode.offset << 2) + 4 == m_CompilePC + 8)
-		{
-			return; 
-		}
+			return;
 
 		if ((m_CompilePC & 0xFFC) != 0xFFC) 
 		{
@@ -68,14 +66,13 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
 						ExitThread(0);
 					}
 					
-					EffectDelaySlot = FALSE;
+					EffectDelaySlot = false;
 					if (Command.op == R4300i_CP1) {
-						if (Command.fmt == R4300i_COP1_S && (Command.funct & 0x30) == 0x30 ) {
-							EffectDelaySlot = TRUE;
-						} 
-						if (Command.fmt == R4300i_COP1_D && (Command.funct & 0x30) == 0x30 ) {
-							EffectDelaySlot = TRUE;
-						} 
+						if (Command.fmt == R4300i_COP1_S && (Command.funct & 0x30) == 0x30)
+							EffectDelaySlot = true;
+
+						if (Command.fmt == R4300i_COP1_D && (Command.funct & 0x30) == 0x30)
+							EffectDelaySlot = true;
 					}
 				}
 				break;
@@ -94,7 +91,7 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
 		}
 		m_Section->m_Jump.LinkLocation    = NULL;
 		m_Section->m_Jump.LinkLocation2   = NULL;
-		m_Section->m_Jump.DoneDelaySlot   = FALSE;
+		m_Section->m_Jump.DoneDelaySlot   = false;
 		m_Section->m_Cont.JumpPC          = m_CompilePC;
 		m_Section->m_Cont.TargetPC        = m_CompilePC + 8;
 		if (m_Section->m_ContinueSection != NULL) {
@@ -104,17 +101,17 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
 		}
 		m_Section->m_Cont.LinkLocation    = NULL;
 		m_Section->m_Cont.LinkLocation2   = NULL;
-		m_Section->m_Cont.DoneDelaySlot   = FALSE;
+		m_Section->m_Cont.DoneDelaySlot   = false;
 		if (m_Section->m_Jump.TargetPC < m_Section->m_Cont.TargetPC) {
-			m_Section->m_Cont.FallThrough = FALSE;
-			m_Section->m_Jump.FallThrough = TRUE;
+			m_Section->m_Cont.FallThrough = false;
+			m_Section->m_Jump.FallThrough = true;
 		} else {
-			m_Section->m_Cont.FallThrough = TRUE;
-			m_Section->m_Jump.FallThrough = FALSE;
+			m_Section->m_Cont.FallThrough = true;
+			m_Section->m_Jump.FallThrough = false;
 		}
 
 		if (Link) {
-			UnMap_GPR( 31, FALSE);
+			UnMap_GPR(31, false);
 			m_RegWorkingSet.SetMipsRegLo(31,m_CompilePC + 8);
 			m_RegWorkingSet.SetMipsRegState(31,CRegInfo::STATE_CONST_32_SIGN);
 		}
@@ -141,7 +138,7 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
 						SetJump32((DWORD *)m_Section->m_Jump.LinkLocation2,(DWORD *)m_RecompPos);
 						m_Section->m_Jump.LinkLocation2 = NULL;
 					}
-					m_Section->m_Jump.FallThrough = TRUE;
+					m_Section->m_Jump.FallThrough = true;
 				} else if (m_Section->m_Cont.LinkLocation != NULL){
 					CPU_Message("");
 					CPU_Message("      %s:",m_Section->m_Cont.BranchLabel.c_str());
@@ -151,7 +148,7 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
 						SetJump32((DWORD *)m_Section->m_Cont.LinkLocation2,(DWORD *)m_RecompPos);
 						m_Section->m_Cont.LinkLocation2 = NULL;
 					}
-					m_Section->m_Cont.FallThrough = TRUE;
+					m_Section->m_Cont.FallThrough = true;
 				}
 			}
 			if ((m_CompilePC & 0xFFC) == 0xFFC) 
@@ -249,9 +246,9 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
 						m_Section->m_Cont.BranchLabel = "ExitBlock";
 					}
 				}		
-				FallInfo->DoneDelaySlot = TRUE;
+				FallInfo->DoneDelaySlot = true;
 				if (!JumpInfo->DoneDelaySlot) {
-					FallInfo->FallThrough = FALSE;				
+					FallInfo->FallThrough = false;
 					JmpLabel32(FallInfo->BranchLabel.c_str(),0);
 					FallInfo->LinkLocation = (DWORD *)(m_RecompPos - 4);
 					
@@ -263,7 +260,7 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
 							SetJump32((DWORD *)JumpInfo->LinkLocation2,(DWORD *)m_RecompPos);
 							JumpInfo->LinkLocation2 = NULL;
 						}
-						JumpInfo->FallThrough = TRUE;
+						JumpInfo->FallThrough = true;
 						m_NextInstruction = DO_DELAY_SLOT;
 						m_RegWorkingSet = RegBeforeDelay;
 						return; 
@@ -298,14 +295,14 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
 	} else {
 		if (bHaveDebugger())
 		{
-			g_Notify->DisplayError(L"WTF\n\nBranch\nNextInstruction = %X", m_NextInstruction);
+			g_Notify->DisplayError(stdstr_f("WTF\n\nBranch\nNextInstruction = %X", m_NextInstruction).ToUTF16().c_str());
 		}
 	}
 }
 
-void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, BOOL Link)
+void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, bool Link)
 {
-	if ( m_NextInstruction == NORMAL ) {		
+	if (m_NextInstruction == NORMAL) {
 		CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 		
 		if (!g_System->bLinkBlocks() || (m_CompilePC & 0xFFC) == 0xFFC)
@@ -314,42 +311,43 @@ void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, BOOL Link
 			m_Section->m_Jump.TargetPC = m_CompilePC + ((short)m_Opcode.offset << 2) + 4;
 			m_Section->m_Cont.JumpPC   = m_CompilePC;
 			m_Section->m_Cont.TargetPC = m_CompilePC + 8;
-		} else {
+		}
+		else
+		{
 			if (m_Section->m_Jump.JumpPC != m_CompilePC)
-			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__);
-			}
+
 			if (m_Section->m_Cont.JumpPC != m_CompilePC)
-			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__);
-			}
+
 			if (m_Section->m_Cont.TargetPC != m_CompilePC + 8)
-			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__);
-			}
 		}
-		if (m_Section->m_JumpSection != NULL) {
+
+		if (m_Section->m_JumpSection != NULL)
 			m_Section->m_Jump.BranchLabel.Format("Section_%d",((CCodeSection *)m_Section->m_JumpSection)->m_SectionID);
-		} else {
+		else
 			m_Section->m_Jump.BranchLabel = "ExitBlock";
-		}
-		if (m_Section->m_ContinueSection != NULL) {
+
+		if (m_Section->m_ContinueSection != NULL)
 			m_Section->m_Cont.BranchLabel.Format("Section_%d",((CCodeSection *)m_Section->m_ContinueSection)->m_SectionID);
-		} else {
+		else
 			m_Section->m_Cont.BranchLabel = "ExitBlock";
-		}
-		m_Section->m_Jump.FallThrough   = TRUE;
+
+		m_Section->m_Jump.FallThrough   = true;
 		m_Section->m_Jump.LinkLocation  = NULL;
 		m_Section->m_Jump.LinkLocation2 = NULL;
-		m_Section->m_Cont.FallThrough   = FALSE;
+		m_Section->m_Cont.FallThrough   = false;
 		m_Section->m_Cont.LinkLocation  = NULL;
 		m_Section->m_Cont.LinkLocation2 = NULL;
+
 		if (Link)
 		{
-			UnMap_GPR( 31, FALSE);
+			UnMap_GPR(31, false);
 			m_RegWorkingSet.SetMipsRegLo(31, m_CompilePC + 8);
 			m_RegWorkingSet.SetMipsRegState(31,CRegInfo::STATE_CONST_32_SIGN);
 		}
+
 		CompareFunc(); 
 		ResetX86Protection();
 
@@ -359,9 +357,7 @@ void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, BOOL Link
 			if (m_Section->m_Cont.FallThrough) 
 			{
 				if (m_Section->m_Jump.LinkLocation != NULL)
-				{
-					g_Notify->BreakPoint(__FILEW__,__LINE__); 
-				}
+					g_Notify->BreakPoint(__FILEW__,__LINE__);
 			}
 
 			if (m_Section->m_Jump.LinkLocation != NULL || m_Section->m_Jump.FallThrough) 
@@ -391,7 +387,7 @@ void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, BOOL Link
 					m_Section->m_Cont.LinkLocation2 = NULL;
 				}
 			}
-			m_Section->CompileExit(m_CompilePC, m_CompilePC + 8,m_Section->m_Cont.RegSet,CExitInfo::Normal,TRUE,NULL);
+			m_Section->CompileExit(m_CompilePC, m_CompilePC + 8, m_Section->m_Cont.RegSet, CExitInfo::Normal, true, NULL);
 			return;
 		} else {
 			m_NextInstruction = DO_DELAY_SLOT;
@@ -419,11 +415,11 @@ void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, BOOL Link
 		m_Section->GenerateSectionLinkage();
 		m_NextInstruction = END_BLOCK;
 	} else if (bHaveDebugger()) {
-		g_Notify->DisplayError(L"WTF\n\nBranchLikely\nNextInstruction = %X", m_NextInstruction);
+		g_Notify->DisplayError(stdstr_f("WTF\n\nBranchLikely\nNextInstruction = %X", m_NextInstruction).ToUTF16().c_str());
 	}
 }
 
-void CRecompilerOps::BNE_Compare (void) 
+void CRecompilerOps::BNE_Compare()
 {
 	BYTE *Jump = NULL;
 
@@ -432,11 +428,11 @@ void CRecompilerOps::BNE_Compare (void)
 			if (Is64Bit(m_Opcode.rs) || Is64Bit(m_Opcode.rt)) {
 				CRecompilerOps::UnknownOpcode();
 			} else if (GetMipsRegLo(m_Opcode.rs) != GetMipsRegLo(m_Opcode.rt)) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		} else if (IsMapped(m_Opcode.rs) && IsMapped(m_Opcode.rt)) {
 			ProtectGPR(m_Opcode.rs);
@@ -444,8 +440,8 @@ void CRecompilerOps::BNE_Compare (void)
 			if (Is64Bit(m_Opcode.rs) || Is64Bit(m_Opcode.rt)) 
 			{
 				CompX86RegToX86Reg(
-					Is32Bit(m_Opcode.rs)?Map_TempReg(x86_Any,m_Opcode.rs,TRUE):GetMipsRegMapHi(m_Opcode.rs),
-					Is32Bit(m_Opcode.rt)?Map_TempReg(x86_Any,m_Opcode.rt,TRUE):GetMipsRegMapHi(m_Opcode.rt)
+					Is32Bit(m_Opcode.rs) ? Map_TempReg(x86_Any, m_Opcode.rs, true) : GetMipsRegMapHi(m_Opcode.rs),
+					Is32Bit(m_Opcode.rt) ? Map_TempReg(x86_Any, m_Opcode.rt, true) : GetMipsRegMapHi(m_Opcode.rt)
 				);
 					
 				if (m_Section->m_Jump.FallThrough) {
@@ -494,7 +490,7 @@ void CRecompilerOps::BNE_Compare (void)
 				if (Is32Bit(ConstReg) || Is32Bit(MappedReg)) {
 					ProtectGPR(MappedReg);
 					if (Is32Bit(MappedReg)) {
-						CompConstToX86reg(Map_TempReg(x86_Any,MappedReg,TRUE),GetMipsRegHi(ConstReg));
+						CompConstToX86reg(Map_TempReg(x86_Any, MappedReg, true), GetMipsRegHi(ConstReg));
 					} else {
 						CompConstToX86reg(GetMipsRegMapHi(MappedReg),GetMipsRegLo_S(ConstReg) >> 31);
 					}
@@ -559,7 +555,7 @@ void CRecompilerOps::BNE_Compare (void)
 					CompX86regToVariable(GetMipsRegMapHi(KnownReg),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
 				} else if (IsSigned(KnownReg)) {
 					ProtectGPR(KnownReg);
-					CompX86regToVariable(Map_TempReg(x86_Any,KnownReg,TRUE),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
+					CompX86regToVariable(Map_TempReg(x86_Any,KnownReg,true),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
 				} else {
 					CompConstToVariable(0,&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
 				}
@@ -612,7 +608,7 @@ void CRecompilerOps::BNE_Compare (void)
 
 		if (!g_System->b32BitCore())
 		{
-			Reg = Map_TempReg(x86_Any,m_Opcode.rt,TRUE);		
+			Reg = Map_TempReg(x86_Any, m_Opcode.rt, true);
 			CompX86regToVariable(Reg,&_GPR[m_Opcode.rs].W[1],CRegName::GPR_Hi[m_Opcode.rs]);
 			if (m_Section->m_Jump.FallThrough) {
 				JneLabel8("continue",0);
@@ -623,7 +619,7 @@ void CRecompilerOps::BNE_Compare (void)
 			}
 		}
 
-		Reg = Map_TempReg(Reg,m_Opcode.rt,FALSE);
+		Reg = Map_TempReg(Reg, m_Opcode.rt, false);
 		CompX86regToVariable(Reg,&_GPR[m_Opcode.rs].W[0],CRegName::GPR_Lo[m_Opcode.rs]);
 		if (m_Section->m_Cont.FallThrough) {
 			JneLabel32 ( m_Section->m_Jump.BranchLabel.c_str(), 0 );
@@ -656,7 +652,7 @@ void CRecompilerOps::BNE_Compare (void)
 	}
 }
 
-void CRecompilerOps::BEQ_Compare (void) {
+void CRecompilerOps::BEQ_Compare() {
 	BYTE *Jump = NULL;
 
 	if (IsKnown(m_Opcode.rs) && IsKnown(m_Opcode.rt)) {
@@ -664,11 +660,11 @@ void CRecompilerOps::BEQ_Compare (void) {
 			if (Is64Bit(m_Opcode.rs) || Is64Bit(m_Opcode.rt)) {
 				CRecompilerOps::UnknownOpcode();
 			} else if (GetMipsRegLo(m_Opcode.rs) == GetMipsRegLo(m_Opcode.rt)) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		}
 		else if (IsMapped(m_Opcode.rs) && IsMapped(m_Opcode.rt)) 
@@ -679,8 +675,8 @@ void CRecompilerOps::BEQ_Compare (void) {
 				ProtectGPR(m_Opcode.rt);
 
 				CompX86RegToX86Reg(
-					Is32Bit(m_Opcode.rs)?Map_TempReg(x86_Any,m_Opcode.rs,TRUE):GetMipsRegMapHi(m_Opcode.rs),
-					Is32Bit(m_Opcode.rt)?Map_TempReg(x86_Any,m_Opcode.rt,TRUE):GetMipsRegMapHi(m_Opcode.rt)
+					Is32Bit(m_Opcode.rs) ? Map_TempReg(x86_Any, m_Opcode.rs, true) : GetMipsRegMapHi(m_Opcode.rs),
+					Is32Bit(m_Opcode.rt) ? Map_TempReg(x86_Any, m_Opcode.rt, true) : GetMipsRegMapHi(m_Opcode.rt)
 				);
 				if (m_Section->m_Cont.FallThrough) {
 					JneLabel8("continue",0);
@@ -728,7 +724,7 @@ void CRecompilerOps::BEQ_Compare (void) {
 				if (Is32Bit(ConstReg) || Is32Bit(MappedReg)) {
 					if (Is32Bit(MappedReg)) {
 						ProtectGPR(MappedReg);
-						CompConstToX86reg(Map_TempReg(x86_Any,MappedReg,TRUE),GetMipsRegHi(ConstReg));
+						CompConstToX86reg(Map_TempReg(x86_Any, MappedReg, true), GetMipsRegHi(ConstReg));
 					} else {
 						CompConstToX86reg(GetMipsRegMapHi(MappedReg),GetMipsRegLo_S(ConstReg) >> 31);
 					}
@@ -793,7 +789,7 @@ void CRecompilerOps::BEQ_Compare (void) {
 				if (Is64Bit(KnownReg)) {
 					CompX86regToVariable(GetMipsRegMapHi(KnownReg),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
 				} else if (IsSigned(KnownReg)) {
-					CompX86regToVariable(Map_TempReg(x86_Any,KnownReg,TRUE),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
+					CompX86regToVariable(Map_TempReg(x86_Any,KnownReg,true),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
 				} else {
 					CompConstToVariable(0,&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
 				}
@@ -838,7 +834,7 @@ void CRecompilerOps::BEQ_Compare (void) {
 		x86Reg Reg = x86_Any;
 		if (!g_System->b32BitCore())
 		{
-			Reg = Map_TempReg(x86_Any,m_Opcode.rs,TRUE);
+			Reg = Map_TempReg(x86_Any, m_Opcode.rs, true);
 			CompX86regToVariable(Reg,&_GPR[m_Opcode.rt].W[1],CRegName::GPR_Hi[m_Opcode.rt]);
 			if (m_Section->m_Cont.FallThrough) {
 				JneLabel8("continue",0);
@@ -848,7 +844,7 @@ void CRecompilerOps::BEQ_Compare (void) {
 				m_Section->m_Cont.LinkLocation = (DWORD *)(m_RecompPos - 4);
 			}
 		}
-		CompX86regToVariable(Map_TempReg(Reg,m_Opcode.rs,FALSE),&_GPR[m_Opcode.rt].W[0],CRegName::GPR_Lo[m_Opcode.rt]);
+		CompX86regToVariable(Map_TempReg(Reg, m_Opcode.rs, false), &_GPR[m_Opcode.rt].W[0], CRegName::GPR_Lo[m_Opcode.rt]);
 		if (m_Section->m_Cont.FallThrough) {
 			JeLabel32 ( m_Section->m_Jump.BranchLabel.c_str(), 0 );
 			m_Section->m_Jump.LinkLocation = (DWORD *)(m_RecompPos - 4);
@@ -880,23 +876,23 @@ void CRecompilerOps::BEQ_Compare (void) {
 	}
 }
 
-void CRecompilerOps::BGTZ_Compare (void) {
+void CRecompilerOps::BGTZ_Compare() {
 	if (IsConst(m_Opcode.rs)) {
 		if (Is64Bit(m_Opcode.rs)) {
 			if (GetMipsReg_S(m_Opcode.rs) > 0) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		} else {
 			if (GetMipsRegLo_S(m_Opcode.rs) > 0) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		}
 	} else if (IsMapped(m_Opcode.rs) && Is32Bit(m_Opcode.rs)) {
@@ -976,31 +972,31 @@ void CRecompilerOps::BGTZ_Compare (void) {
 	}
 }
 
-void CRecompilerOps::BLEZ_Compare (void) {
+void CRecompilerOps::BLEZ_Compare() {
 	if (IsConst(m_Opcode.rs)) {
 		if (Is64Bit(m_Opcode.rs)) {
 			if (GetMipsReg_S(m_Opcode.rs) <= 0) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		} else if (IsSigned(m_Opcode.rs)) {
 			if (GetMipsRegLo_S(m_Opcode.rs) <= 0) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		} else {
 			if (GetMipsRegLo(m_Opcode.rs) == 0) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		}
 	} else if (IsMapped(m_Opcode.rs)) {
@@ -1134,27 +1130,27 @@ void CRecompilerOps::BLEZ_Compare (void) {
 	}
 }
 
-void CRecompilerOps::BLTZ_Compare (void) {
+void CRecompilerOps::BLTZ_Compare() {
 	if (IsConst(m_Opcode.rs)) {
 		if (Is64Bit(m_Opcode.rs)) {
 			if (GetMipsReg_S(m_Opcode.rs) < 0) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		} else if (IsSigned(m_Opcode.rs)) {
 			if (GetMipsRegLo_S(m_Opcode.rs) < 0) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		} else {
-			m_Section->m_Jump.FallThrough = FALSE;
-			m_Section->m_Cont.FallThrough = TRUE;
+			m_Section->m_Jump.FallThrough = false;
+			m_Section->m_Cont.FallThrough = true;
 		}
 	} else if (IsMapped(m_Opcode.rs)) {
 		if (Is64Bit(m_Opcode.rs)) {
@@ -1186,8 +1182,8 @@ void CRecompilerOps::BLTZ_Compare (void) {
 				m_Section->m_Jump.LinkLocation = (DWORD *)(m_RecompPos - 4);
 			}
 		} else {
-			m_Section->m_Jump.FallThrough = FALSE;
-			m_Section->m_Cont.FallThrough = TRUE;
+			m_Section->m_Jump.FallThrough = false;
+			m_Section->m_Cont.FallThrough = true;
 		}
 	} else if (IsUnknown(m_Opcode.rs)) {
 		if (g_System->b32BitCore())
@@ -1211,22 +1207,22 @@ void CRecompilerOps::BLTZ_Compare (void) {
 	}
 }
 
-void CRecompilerOps::BGEZ_Compare (void) {
+void CRecompilerOps::BGEZ_Compare() {
 	if (IsConst(m_Opcode.rs)) {
 		if (Is64Bit(m_Opcode.rs)) {
 			g_Notify->BreakPoint(__FILEW__,__LINE__);
 			CRecompilerOps::UnknownOpcode();
 		} else if (IsSigned(m_Opcode.rs)) {
 			if (GetMipsRegLo_S(m_Opcode.rs) >= 0) {
-				m_Section->m_Jump.FallThrough = TRUE;
-				m_Section->m_Cont.FallThrough = FALSE;
+				m_Section->m_Jump.FallThrough = true;
+				m_Section->m_Cont.FallThrough = false;
 			} else {
-				m_Section->m_Jump.FallThrough = FALSE;
-				m_Section->m_Cont.FallThrough = TRUE;
+				m_Section->m_Jump.FallThrough = false;
+				m_Section->m_Cont.FallThrough = true;
 			}
 		} else {
-			m_Section->m_Jump.FallThrough = TRUE;
-			m_Section->m_Cont.FallThrough = FALSE;
+			m_Section->m_Jump.FallThrough = true;
+			m_Section->m_Cont.FallThrough = false;
 		}
 	} else if (IsMapped(m_Opcode.rs)) {
 		if (Is64Bit(m_Opcode.rs)) { 
@@ -1258,8 +1254,8 @@ void CRecompilerOps::BGEZ_Compare (void) {
 				m_Section->m_Jump.LinkLocation = (DWORD *)(m_RecompPos - 4);
 			}
 		} else { 
-			m_Section->m_Jump.FallThrough = TRUE;
-			m_Section->m_Cont.FallThrough = FALSE;
+			m_Section->m_Jump.FallThrough = true;
+			m_Section->m_Cont.FallThrough = false;
 		}
 	} else {
 		if (g_System->b32BitCore())
@@ -1283,7 +1279,7 @@ void CRecompilerOps::BGEZ_Compare (void) {
 	}
 }
 
-void CRecompilerOps::COP1_BCF_Compare (void) {
+void CRecompilerOps::COP1_BCF_Compare() {
 	TestVariable(FPCSR_C,&_FPCR[31],"_FPCR[31]");
 	if (m_Section->m_Cont.FallThrough) {
 		JeLabel32 ( m_Section->m_Jump.BranchLabel.c_str(), 0 );
@@ -1299,7 +1295,7 @@ void CRecompilerOps::COP1_BCF_Compare (void) {
 	}
 }
 
-void CRecompilerOps::COP1_BCT_Compare (void) {
+void CRecompilerOps::COP1_BCT_Compare() {
 	TestVariable(FPCSR_C,&_FPCR[31],"_FPCR[31]");
 	if (m_Section->m_Cont.FallThrough) {
 		JneLabel32 ( m_Section->m_Jump.BranchLabel.c_str(), 0 );
@@ -1316,7 +1312,7 @@ void CRecompilerOps::COP1_BCT_Compare (void) {
 }
 
 /*************************  OpCode functions *************************/
-void CRecompilerOps::J (void) {
+void CRecompilerOps::J() {
 	if ( m_NextInstruction == NORMAL ) {
 		CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 		if ((m_CompilePC & 0xFFC) == 0xFFC) 
@@ -1333,20 +1329,21 @@ void CRecompilerOps::J (void) {
 		} else {
 			m_Section->m_Jump.BranchLabel = "ExitBlock";
 		}
-		m_Section->m_Jump.FallThrough   = TRUE;
+		m_Section->m_Jump.FallThrough   = true;
 		m_Section->m_Jump.LinkLocation  = NULL;
 		m_Section->m_Jump.LinkLocation2 = NULL;
 		m_NextInstruction = DO_DELAY_SLOT;
-	} else if (m_NextInstruction == DELAY_SLOT_DONE ) {		
+	} else if (m_NextInstruction == DELAY_SLOT_DONE ) {
 		m_Section->m_Jump.RegSet = m_RegWorkingSet;
 		m_Section->GenerateSectionLinkage();
 		m_NextInstruction = END_BLOCK;
 	} else if (bHaveDebugger()) {
-		g_Notify->DisplayError(L"WTF\n\nJ\nNextInstruction = %X", m_NextInstruction);
+		g_Notify->DisplayError(stdstr_f("WTF\n\nJ\nNextInstruction = %X", m_NextInstruction).ToUTF16().c_str());
 	}
 }
 
-void CRecompilerOps::JAL (void) {
+void CRecompilerOps::JAL() 
+{
 	if ( m_NextInstruction == NORMAL ) 
 	{
 		CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
@@ -1367,11 +1364,11 @@ void CRecompilerOps::JAL (void) {
 		} else {
 			m_Section->m_Jump.BranchLabel = "ExitBlock";
 		}
-		m_Section->m_Jump.FallThrough   = TRUE;
+		m_Section->m_Jump.FallThrough   = true;
 		m_Section->m_Jump.LinkLocation  = NULL;
 		m_Section->m_Jump.LinkLocation2 = NULL;
 		m_NextInstruction = DO_DELAY_SLOT;
-	} else if (m_NextInstruction == DELAY_SLOT_DONE ) {		
+	} else if (m_NextInstruction == DELAY_SLOT_DONE ) {
 		if (m_Section->m_JumpSection)
 		{
 			m_Section->m_Jump.RegSet = m_RegWorkingSet;
@@ -1389,7 +1386,7 @@ void CRecompilerOps::JAL (void) {
 			bool bCheck = TargetPC <= m_CompilePC;
 			UpdateCounters(m_RegWorkingSet,bCheck, true);
 
-			m_Section->CompileExit((DWORD)-1, (DWORD)-1,m_RegWorkingSet,bCheck ? CExitInfo::Normal : CExitInfo::Normal_NoSysCheck,TRUE,NULL);
+			m_Section->CompileExit((DWORD)-1, (DWORD)-1, m_RegWorkingSet, bCheck ? CExitInfo::Normal : CExitInfo::Normal_NoSysCheck, true, NULL);
 		}
 		m_NextInstruction = END_BLOCK;
 	} else {
@@ -1398,7 +1395,7 @@ void CRecompilerOps::JAL (void) {
 	return;
 }
 
-void CRecompilerOps::ADDI (void) {
+void CRecompilerOps::ADDI() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	if (m_Opcode.rt == 0) { return; }
@@ -1408,11 +1405,13 @@ void CRecompilerOps::ADDI (void) {
 	}
 
 	if (IsConst(m_Opcode.rs)) { 
-		if (IsMapped(m_Opcode.rt)) { UnMap_GPR(m_Opcode.rt, FALSE); }
+		if (IsMapped(m_Opcode.rt))
+			UnMap_GPR(m_Opcode.rt, false);
+
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rt, GetMipsRegLo(m_Opcode.rs) + (short)m_Opcode.immediate);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rt,CRegInfo::STATE_CONST_32_SIGN);
 	} else {
-		Map_GPR_32bit(m_Opcode.rt,TRUE,m_Opcode.rs);
+		Map_GPR_32bit(m_Opcode.rt, true, m_Opcode.rs);
 		AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rt),(short)m_Opcode.immediate);
 	}
 	if (g_System->bFastSP() && m_Opcode.rt == 29 && m_Opcode.rs != 29) { 
@@ -1421,25 +1420,28 @@ void CRecompilerOps::ADDI (void) {
 	}
 }
 
-void CRecompilerOps::ADDIU (void) {
+void CRecompilerOps::ADDIU() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (m_Opcode.rt == 0 || (m_Opcode.immediate == 0 && m_Opcode.rs == m_Opcode.rt)) { return; }
+	if (m_Opcode.rt == 0 || (m_Opcode.immediate == 0 && m_Opcode.rs == m_Opcode.rt))
+		return;
 
 	if (g_System->bFastSP())
 	{
 		if (m_Opcode.rs == 29 && m_Opcode.rt == 29) 
 		{
-			AddConstToX86Reg(Map_MemoryStack(x86_Any, TRUE),(short)m_Opcode.immediate);
+			AddConstToX86Reg(Map_MemoryStack(x86_Any, true),(short)m_Opcode.immediate);
 		}
 	}
 
 	if (IsConst(m_Opcode.rs)) { 
-		if (IsMapped(m_Opcode.rt)) { UnMap_GPR(m_Opcode.rt, FALSE); }
+		if (IsMapped(m_Opcode.rt))
+			UnMap_GPR(m_Opcode.rt, false);
+
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rt, GetMipsRegLo(m_Opcode.rs) + (short)m_Opcode.immediate);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rt,CRegInfo::STATE_CONST_32_SIGN);
 	} else {
-		Map_GPR_32bit(m_Opcode.rt,TRUE,m_Opcode.rs);
+		Map_GPR_32bit(m_Opcode.rt, true, m_Opcode.rs);
 		AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rt),(short)m_Opcode.immediate);
 	}
 
@@ -1449,15 +1451,16 @@ void CRecompilerOps::ADDIU (void) {
 	}
 }
 
-void CRecompilerOps::SLTIU (void) {
+void CRecompilerOps::SLTIU() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rt == 0) { return; }
+	if (m_Opcode.rt == 0)
+		return;
 
 	if (IsConst(m_Opcode.rs)) 
 	{ 
 		DWORD Result = Is64Bit(m_Opcode.rs) ? GetMipsReg(m_Opcode.rs) < ((unsigned)((__int64)((short)m_Opcode.immediate)))?1:0 : 
 						GetMipsRegLo(m_Opcode.rs) < ((unsigned)((short)m_Opcode.immediate))?1:0;
-		UnMap_GPR(m_Opcode.rt, FALSE);
+		UnMap_GPR(m_Opcode.rt, false);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rt,CRegInfo::STATE_CONST_32_SIGN);
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rt,Result);
 	} else if (IsMapped(m_Opcode.rs)) { 
@@ -1478,18 +1481,18 @@ void CRecompilerOps::SLTIU (void) {
 			CPU_Message("");
 			CPU_Message("      Continue:");
 			SetJump8(Jump[1],m_RecompPos);
-			Map_GPR_32bit(m_Opcode.rt,FALSE, -1);
+			Map_GPR_32bit(m_Opcode.rt, false, -1);
 			MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rt));
 		} else {
 			CompConstToX86reg(GetMipsRegMapLo(m_Opcode.rs),(short)m_Opcode.immediate);
 			SetbVariable(&m_BranchCompare,"m_BranchCompare");
-			Map_GPR_32bit(m_Opcode.rt,FALSE, -1);
+			Map_GPR_32bit(m_Opcode.rt, false, -1);
 			MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rt));
 		}
 	} else if (g_System->b32BitCore()) {
 		CompConstToVariable((short)m_Opcode.immediate,&_GPR[m_Opcode.rs].W[0],CRegName::GPR_Lo[m_Opcode.rs]);
 		SetbVariable(&m_BranchCompare,"m_BranchCompare");
-		Map_GPR_32bit(m_Opcode.rt,FALSE, -1);
+		Map_GPR_32bit(m_Opcode.rt, false, -1);
 		MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rt));
 	} else {
 		BYTE * Jump = NULL;
@@ -1502,22 +1505,23 @@ void CRecompilerOps::SLTIU (void) {
 		CPU_Message("      CompareSet:");
 		SetJump8(Jump,m_RecompPos);
 		SetbVariable(&m_BranchCompare,"m_BranchCompare");
-		Map_GPR_32bit(m_Opcode.rt,FALSE, -1);
-		MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rt));	
+		Map_GPR_32bit(m_Opcode.rt, false, -1);
+		MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rt));
 	}
 }
 
-void CRecompilerOps::SLTI (void) 
+void CRecompilerOps::SLTI()
 {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rt == 0) { return; }
+	if (m_Opcode.rt == 0)
+		return;
 
 	if (IsConst(m_Opcode.rs)) { 
 		DWORD Result = Is64Bit(m_Opcode.rs) ? 
 			((__int64)GetMipsReg(m_Opcode.rs) < (__int64)((short)m_Opcode.immediate) ? 1:0) :
 			( GetMipsRegLo_S(m_Opcode.rs) < (short)m_Opcode.immediate?1:0);
 
-		UnMap_GPR(m_Opcode.rt, FALSE);
+		UnMap_GPR(m_Opcode.rt, false);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rt,CRegInfo::STATE_CONST_32_SIGN);
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rt,Result);
 	} else if (IsMapped(m_Opcode.rs)) { 
@@ -1538,16 +1542,16 @@ void CRecompilerOps::SLTI (void)
 			CPU_Message("");
 			CPU_Message("      Continue:");
 			SetJump8(Jump[1],m_RecompPos);
-			Map_GPR_32bit(m_Opcode.rt,FALSE, -1);
+			Map_GPR_32bit(m_Opcode.rt, false, -1);
 			MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rt));
 		} else {
 		/*	CompConstToX86reg(GetMipsRegMapLo(m_Opcode.rs),(short)m_Opcode.immediate);
 			SetlVariable(&m_BranchCompare,"m_BranchCompare");
-			Map_GPR_32bit(m_Opcode.rt,FALSE, -1);
+			Map_GPR_32bit(m_Opcode.rt, false, -1);
 			MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rt));
 			*/
 			ProtectGPR( m_Opcode.rs);
-			Map_GPR_32bit(m_Opcode.rt,FALSE, -1);
+			Map_GPR_32bit(m_Opcode.rt, false, -1);
 			CompConstToX86reg(GetMipsRegMapLo(m_Opcode.rs),(short)m_Opcode.immediate);
 			
 			if (GetMipsRegMapLo(m_Opcode.rt) > x86_EBX) {
@@ -1559,7 +1563,7 @@ void CRecompilerOps::SLTI (void)
 			}
 		}
 	} else if (g_System->b32BitCore()) {
-		Map_GPR_32bit(m_Opcode.rt,FALSE, -1);
+		Map_GPR_32bit(m_Opcode.rt, false, -1);
 		CompConstToVariable((short)m_Opcode.immediate,&_GPR[m_Opcode.rs].W[0],CRegName::GPR_Lo[m_Opcode.rs]);
 
 		if (GetMipsRegMapLo(m_Opcode.rt) > x86_EBX) {
@@ -1588,38 +1592,44 @@ void CRecompilerOps::SLTI (void)
 			CPU_Message("      Continue:");
 			SetJump8(Jump[1],m_RecompPos);
 		}
-		Map_GPR_32bit(m_Opcode.rt,FALSE, -1);
+		Map_GPR_32bit(m_Opcode.rt, false, -1);
 		MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rt));
 	}
 }
 
-void CRecompilerOps::ANDI (void) {
+void CRecompilerOps::ANDI() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (m_Opcode.rt == 0) { return;}
+	if (m_Opcode.rt == 0)
+		return;
 
 	if (IsConst(m_Opcode.rs)) {
-		if (IsMapped(m_Opcode.rt)) { UnMap_GPR(m_Opcode.rt, FALSE); }
+		if (IsMapped(m_Opcode.rt))
+			UnMap_GPR(m_Opcode.rt, false);
+
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rt,CRegInfo::STATE_CONST_32_SIGN);
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rt, GetMipsRegLo(m_Opcode.rs) & m_Opcode.immediate);
 	} else if (m_Opcode.immediate != 0) { 
-		Map_GPR_32bit(m_Opcode.rt,FALSE,m_Opcode.rs);
+		Map_GPR_32bit(m_Opcode.rt, false, m_Opcode.rs);
 		AndConstToX86Reg(GetMipsRegMapLo(m_Opcode.rt),m_Opcode.immediate);
 	} else {
-		Map_GPR_32bit(m_Opcode.rt,FALSE,0);
+		Map_GPR_32bit(m_Opcode.rt, false, 0);
 	}
 }
 
-void CRecompilerOps::ORI (void) {
+void CRecompilerOps::ORI() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rt == 0) { return;}
+	if (m_Opcode.rt == 0)
+		return;
 
 	if (g_System->bFastSP() && m_Opcode.rs == 29 && m_Opcode.rt == 29) {
 		OrConstToX86Reg(m_Opcode.immediate,Map_MemoryStack(x86_Any, true));
 	}
 
 	if (IsConst(m_Opcode.rs)) {
-		if (IsMapped(m_Opcode.rt)) { UnMap_GPR(m_Opcode.rt, FALSE); }
+		if (IsMapped(m_Opcode.rt))
+			UnMap_GPR(m_Opcode.rt, false);
+
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rt,GetMipsRegState(m_Opcode.rs));
 		m_RegWorkingSet.SetMipsRegHi(m_Opcode.rt,GetMipsRegHi(m_Opcode.rs));
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rt,GetMipsRegLo(m_Opcode.rs) | m_Opcode.immediate);
@@ -1651,12 +1661,15 @@ void CRecompilerOps::ORI (void) {
 	}
 }
 
-void CRecompilerOps::XORI (void) {
+void CRecompilerOps::XORI() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rt == 0) { return;}
+	if (m_Opcode.rt == 0)
+		return;
 
 	if (IsConst(m_Opcode.rs)) {
-		if (m_Opcode.rs != m_Opcode.rt) { UnMap_GPR(m_Opcode.rt, FALSE); }
+		if (m_Opcode.rs != m_Opcode.rt)
+			UnMap_GPR(m_Opcode.rt, false);
+
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rt,GetMipsRegState(m_Opcode.rs));
 		m_RegWorkingSet.SetMipsRegHi(m_Opcode.rt,GetMipsRegHi(m_Opcode.rs));
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rt,GetMipsRegLo(m_Opcode.rs) ^ m_Opcode.immediate);
@@ -1672,9 +1685,10 @@ void CRecompilerOps::XORI (void) {
 	}
 }
 
-void CRecompilerOps::LUI (void) {
+void CRecompilerOps::LUI() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rt == 0) { return;}
+	if (m_Opcode.rt == 0)
+		return;
 
 	if (g_System->bFastSP() && m_Opcode.rt == 29) {
 		x86Reg Reg = Map_MemoryStack(x86_Any, true, false);
@@ -1688,23 +1702,27 @@ void CRecompilerOps::LUI (void) {
 		}
 	}
 
-	UnMap_GPR(m_Opcode.rt, FALSE);
+	UnMap_GPR(m_Opcode.rt, false);
 	m_RegWorkingSet.SetMipsRegLo(m_Opcode.rt, ((short)m_Opcode.offset << 16));
 	m_RegWorkingSet.SetMipsRegState(m_Opcode.rt,CRegInfo::STATE_CONST_32_SIGN);
 }
 
-void CRecompilerOps::DADDIU (void) {
+void CRecompilerOps::DADDIU() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (m_Opcode.rs != 0) { UnMap_GPR(m_Opcode.rs,TRUE); }
-	if (m_Opcode.rs != 0) { UnMap_GPR(m_Opcode.rt,TRUE); }
+	if (m_Opcode.rs != 0)
+		UnMap_GPR(m_Opcode.rs, true);
+
+	if (m_Opcode.rs != 0)
+		UnMap_GPR(m_Opcode.rt, true);
+
 	BeforeCallDirect(m_RegWorkingSet);
 	MoveConstToVariable(m_Opcode.Hex, &R4300iOp::m_Opcode.Hex, "R4300iOp::m_Opcode.Hex");
 	Call_Direct(R4300iOp::DADDIU, "R4300iOp::DADDIU");
 	AfterCallDirect(m_RegWorkingSet);
 }
 
-void CRecompilerOps::CACHE (void){
+void CRecompilerOps::CACHE(){
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	if (g_Settings->LoadDword(Game_SMM_Cache) == 0)
@@ -1746,19 +1764,22 @@ void CRecompilerOps::CACHE (void){
 	default:
 		if (bHaveDebugger())
 		{
-			g_Notify->DisplayError(L"cache: %d",m_Opcode.rt);
+			g_Notify->DisplayError(stdstr_f("cache: %d",m_Opcode.rt).ToUTF16().c_str());
 		}
 	}
 }
 
 /********************** R4300i OpCodes: Special **********************/
-void CRecompilerOps::SPECIAL_SLL (void) {
+void CRecompilerOps::SPECIAL_SLL() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)) {
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, GetMipsRegLo(m_Opcode.rt) << m_Opcode.sa);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 		return;
@@ -1766,139 +1787,155 @@ void CRecompilerOps::SPECIAL_SLL (void) {
 	if (m_Opcode.rd != m_Opcode.rt && IsMapped(m_Opcode.rt)) {
 		switch (m_Opcode.sa) {
 		case 0: 
-			Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+			Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 			break;
 		case 1:
 			ProtectGPR(m_Opcode.rt);
-			Map_GPR_32bit(m_Opcode.rd,TRUE,-1);
+			Map_GPR_32bit(m_Opcode.rd, true, -1);
 			LeaRegReg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(m_Opcode.rt), 0, Multip_x2);
-			break;			
+			break;
 		case 2:
 			ProtectGPR(m_Opcode.rt);
-			Map_GPR_32bit(m_Opcode.rd,TRUE,-1);
+			Map_GPR_32bit(m_Opcode.rd, true, -1);
 			LeaRegReg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(m_Opcode.rt), 0, Multip_x4);
-			break;			
+			break;
 		case 3:
 			ProtectGPR(m_Opcode.rt);
-			Map_GPR_32bit(m_Opcode.rd,TRUE,-1);
+			Map_GPR_32bit(m_Opcode.rd, true, -1);
 			LeaRegReg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(m_Opcode.rt), 0, Multip_x8);
 			break;
 		default:
-			Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+			Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 			ShiftLeftSignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)m_Opcode.sa);
 		}
 	} else {
-		Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+		Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 		ShiftLeftSignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)m_Opcode.sa);
 	}
 }
 
-void CRecompilerOps::SPECIAL_SRL (void) {
+void CRecompilerOps::SPECIAL_SRL() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
-	
+	if (m_Opcode.rd == 0)
+		return;
+
 	if (IsConst(m_Opcode.rt)) {
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, GetMipsRegLo(m_Opcode.rt) >> m_Opcode.sa);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 		return;
 	}
-	Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+	Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 	ShiftRightUnsignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)m_Opcode.sa);
 }
 
-void CRecompilerOps::SPECIAL_SRA (void) {
+void CRecompilerOps::SPECIAL_SRA() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 	
 	if (IsConst(m_Opcode.rt)) {
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, GetMipsRegLo_S(m_Opcode.rt) >> m_Opcode.sa);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 		return;
 	}
-	Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+	Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 	ShiftRightSignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)m_Opcode.sa);
 }
 
-void CRecompilerOps::SPECIAL_SLLV (void) {
+void CRecompilerOps::SPECIAL_SLLV() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 	
 	if (IsConst(m_Opcode.rs)) {
 		DWORD Shift = (GetMipsRegLo(m_Opcode.rs) & 0x1F);
 		if (IsConst(m_Opcode.rt)) {
-			if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+			if (IsMapped(m_Opcode.rd))
+				UnMap_GPR(m_Opcode.rd, false);
+
 			m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, GetMipsRegLo(m_Opcode.rt) << Shift);
 			m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 		} else {
-			Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+			Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 			ShiftLeftSignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)Shift);
 		}
 		return;
 	}
-	Map_TempReg(x86_ECX,m_Opcode.rs,FALSE);
-	AndConstToX86Reg(x86_ECX,0x1F);
-	Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+	Map_TempReg(x86_ECX, m_Opcode.rs, false);
+	AndConstToX86Reg(x86_ECX, 0x1F);
+	Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 	ShiftLeftSign(GetMipsRegMapLo(m_Opcode.rd));
 }
 
-void CRecompilerOps::SPECIAL_SRLV (void) {
+void CRecompilerOps::SPECIAL_SRLV() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
-	
+	if (m_Opcode.rd == 0)
+		return;
+
 	if (IsKnown(m_Opcode.rs) && IsConst(m_Opcode.rs)) {
 		DWORD Shift = (GetMipsRegLo(m_Opcode.rs) & 0x1F);
 		if (IsConst(m_Opcode.rt)) {
-			if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+			if (IsMapped(m_Opcode.rd))
+				UnMap_GPR(m_Opcode.rd, false);
+
 			m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, GetMipsRegLo(m_Opcode.rt) >> Shift);
 			m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 			return;
 		}
-		Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+		Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 		ShiftRightUnsignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)Shift);
 		return;
 	}
-	Map_TempReg(x86_ECX,m_Opcode.rs,FALSE);
-	AndConstToX86Reg(x86_ECX,0x1F);
-	Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+
+	Map_TempReg(x86_ECX, m_Opcode.rs, false);
+	AndConstToX86Reg(x86_ECX, 0x1F);
+	Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 	ShiftRightUnsign(GetMipsRegMapLo(m_Opcode.rd));
 }
 
-void CRecompilerOps::SPECIAL_SRAV (void) {
+void CRecompilerOps::SPECIAL_SRAV() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 	
 	if (IsKnown(m_Opcode.rs) && IsConst(m_Opcode.rs)) {
 		DWORD Shift = (GetMipsRegLo(m_Opcode.rs) & 0x1F);
 		if (IsConst(m_Opcode.rt)) {
-			if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+			if (IsMapped(m_Opcode.rd))
+				UnMap_GPR(m_Opcode.rd, false);
+
 			m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, GetMipsRegLo_S(m_Opcode.rt) >> Shift);
 			m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 			return;
 		}
-		Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+		Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 		ShiftRightSignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)Shift);
 		return;
 	}
-	Map_TempReg(x86_ECX,m_Opcode.rs,FALSE);
+	Map_TempReg(x86_ECX, m_Opcode.rs, false);
 	AndConstToX86Reg(x86_ECX,0x1F);
-	Map_GPR_32bit(m_Opcode.rd,TRUE,m_Opcode.rt);
+	Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rt);
 	ShiftRightSign(GetMipsRegMapLo(m_Opcode.rd));
 }
 
-void CRecompilerOps::SPECIAL_JR (void) {
-	if ( m_NextInstruction == NORMAL ) 
+void CRecompilerOps::SPECIAL_JR() {
+	if (m_NextInstruction == NORMAL)
 	{
 		CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-		if ((m_CompilePC & 0xFFC) == 0xFFC) 
+		if ((m_CompilePC & 0xFFC) == 0xFFC)
 		{
 			if (IsMapped(m_Opcode.rs)) {
-				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs),&R4300iOp::m_JumpToLocation,"R4300iOp::m_JumpToLocation");
+				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs), &R4300iOp::m_JumpToLocation, "R4300iOp::m_JumpToLocation");
 				m_RegWorkingSet.WriteBackRegisters();
 			} else {
 				m_RegWorkingSet.WriteBackRegisters();
-				MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rs,FALSE),&R4300iOp::m_JumpToLocation,"R4300iOp::m_JumpToLocation");
+				MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rs, false), &R4300iOp::m_JumpToLocation, "R4300iOp::m_JumpToLocation");
 			}
 			OverflowDelaySlot(true);
 			return;
@@ -1907,70 +1944,90 @@ void CRecompilerOps::SPECIAL_JR (void) {
 		m_Section->m_Jump.FallThrough   = false;
 		m_Section->m_Jump.LinkLocation  = NULL;
 		m_Section->m_Jump.LinkLocation2 = NULL;
-		m_Section->m_Cont.FallThrough   = FALSE;
+		m_Section->m_Cont.FallThrough   = false;
 		m_Section->m_Cont.LinkLocation  = NULL;
 		m_Section->m_Cont.LinkLocation2 = NULL;
 
 		if (DelaySlotEffectsCompare(m_CompilePC,m_Opcode.rs,0)) {
-			if (IsConst(m_Opcode.rs)) { 
-				MoveConstToVariable(GetMipsRegLo(m_Opcode.rs),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
-			} else 	if (IsMapped(m_Opcode.rs)) { 
-				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			if (IsConst(m_Opcode.rs)) {
+				MoveConstToVariable(GetMipsRegLo(m_Opcode.rs), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			} else if (IsMapped(m_Opcode.rs)) {
+				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
 			} else {
-				MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rs,FALSE),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
+				MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rs, false), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
 			}
 		}
 		m_NextInstruction = DO_DELAY_SLOT;
-	} else if (m_NextInstruction == DELAY_SLOT_DONE ) {		
-		if (DelaySlotEffectsCompare(m_CompilePC,m_Opcode.rs,0)) {
-			m_Section->CompileExit(m_CompilePC,(DWORD)-1,m_RegWorkingSet,CExitInfo::Normal,TRUE,NULL);
-		} else {
+	}
+	else if (m_NextInstruction == DELAY_SLOT_DONE)
+	{
+		if (DelaySlotEffectsCompare(m_CompilePC,m_Opcode.rs,0)) 
+		{
+			m_Section->CompileExit(m_CompilePC, (DWORD)-1, m_RegWorkingSet, CExitInfo::Normal, true, NULL);
+		} 
+		else
+		{
 			UpdateCounters(m_RegWorkingSet,true,true);
-			if (IsConst(m_Opcode.rs)) { 
-				MoveConstToVariable(GetMipsRegLo(m_Opcode.rs),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
-			} else if (IsMapped(m_Opcode.rs)) { 
-				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
-			} else {
-				MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rs,FALSE),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			if (IsConst(m_Opcode.rs))
+			{ 
+				MoveConstToVariable(GetMipsRegLo(m_Opcode.rs), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			} 
+			else if (IsMapped(m_Opcode.rs)) 
+			{ 
+				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
 			}
-			m_Section->CompileExit((DWORD)-1, (DWORD)-1,m_RegWorkingSet,CExitInfo::Normal,TRUE,NULL);
+			else
+			{
+				MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rs, false), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			}
+			m_Section->CompileExit((DWORD)-1, (DWORD)-1, m_RegWorkingSet, CExitInfo::Normal, true, NULL);
 			if (m_Section->m_JumpSection)
 			{
 				m_Section->GenerateSectionLinkage();
 			}
 		}
 		m_NextInstruction = END_BLOCK;
-	} else if (bHaveDebugger()) {
-		g_Notify->DisplayError(L"WTF\n\nBranch\nNextInstruction = %X", m_NextInstruction);
+	}
+	else if (bHaveDebugger())
+	{
+		g_Notify->DisplayError(stdstr_f("WTF\n\nBranch\nNextInstruction = %X", m_NextInstruction).ToUTF16().c_str());
 	}
 }
 
-void CRecompilerOps::SPECIAL_JALR (void) 
+void CRecompilerOps::SPECIAL_JALR()
 {
-	if ( m_NextInstruction == NORMAL ) 
+	if (m_NextInstruction == NORMAL)
 	{
 		CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 		if (DelaySlotEffectsCompare(m_CompilePC,m_Opcode.rs,0) && (m_CompilePC & 0xFFC) != 0xFFC)
 		{
-			if (IsConst(m_Opcode.rs)) { 
-				MoveConstToVariable(GetMipsRegLo(m_Opcode.rs),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
-			} else 	if (IsMapped(m_Opcode.rs)) { 
-				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
-			} else {
-				MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rs,FALSE),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			if (IsConst(m_Opcode.rs)) 
+			{
+				MoveConstToVariable(GetMipsRegLo(m_Opcode.rs), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			}
+			else if (IsMapped(m_Opcode.rs)) 
+			{
+				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			}
+			else 
+			{
+				MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rs, false), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
 			}
 		}
-		UnMap_GPR( m_Opcode.rd, FALSE);
+		UnMap_GPR(m_Opcode.rd, false);
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd,m_CompilePC + 8);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 		if ((m_CompilePC & 0xFFC) == 0xFFC) 
 		{
-			if (IsMapped(m_Opcode.rs)) {
-				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs),&R4300iOp::m_JumpToLocation,"R4300iOp::m_JumpToLocation");
+			if (IsMapped(m_Opcode.rs))
+			{
+				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs), &R4300iOp::m_JumpToLocation, "R4300iOp::m_JumpToLocation");
 				m_RegWorkingSet.WriteBackRegisters();
-			} else {
+			}
+			else 
+			{
 				m_RegWorkingSet.WriteBackRegisters();
-				MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rs,FALSE),&R4300iOp::m_JumpToLocation,"R4300iOp::m_JumpToLocation");
+				MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rs, false), &R4300iOp::m_JumpToLocation, "R4300iOp::m_JumpToLocation");
 			}
 			OverflowDelaySlot(true);
 			return;
@@ -1979,42 +2036,56 @@ void CRecompilerOps::SPECIAL_JALR (void)
 		m_Section->m_Jump.FallThrough   = false;
 		m_Section->m_Jump.LinkLocation  = NULL;
 		m_Section->m_Jump.LinkLocation2 = NULL;
-		m_Section->m_Cont.FallThrough   = FALSE;
+		m_Section->m_Cont.FallThrough   = false;
 		m_Section->m_Cont.LinkLocation  = NULL;
 		m_Section->m_Cont.LinkLocation2 = NULL;
 
 		m_NextInstruction = DO_DELAY_SLOT;
-	} else if (m_NextInstruction == DELAY_SLOT_DONE ) {		
-		if (DelaySlotEffectsCompare(m_CompilePC,m_Opcode.rs,0)) {
-			m_Section->CompileExit(m_CompilePC,(DWORD)-1,m_RegWorkingSet,CExitInfo::Normal,TRUE,NULL);
-		} else {
+	} 
+	else if (m_NextInstruction == DELAY_SLOT_DONE ) 
+	{		
+		if (DelaySlotEffectsCompare(m_CompilePC,m_Opcode.rs,0)) 
+		{
+			m_Section->CompileExit(m_CompilePC, (DWORD)-1, m_RegWorkingSet, CExitInfo::Normal, true, NULL);
+		} 
+		else 
+		{
 			UpdateCounters(m_RegWorkingSet,true,true);
-			if (IsConst(m_Opcode.rs)) { 
-				MoveConstToVariable(GetMipsRegLo(m_Opcode.rs),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
-			} else if (IsMapped(m_Opcode.rs)) { 
-				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
-			} else {
-				MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rs,FALSE),_PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			if (IsConst(m_Opcode.rs))
+			{ 
+				MoveConstToVariable(GetMipsRegLo(m_Opcode.rs), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			} 
+			else if (IsMapped(m_Opcode.rs))
+			{ 
+				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
 			}
-			m_Section->CompileExit((DWORD)-1, (DWORD)-1,m_RegWorkingSet,CExitInfo::Normal,TRUE,NULL);
+			else 
+			{
+				MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rs, false), _PROGRAM_COUNTER, "PROGRAM_COUNTER");
+			}
+			m_Section->CompileExit((DWORD)-1, (DWORD)-1, m_RegWorkingSet, CExitInfo::Normal, true, NULL);
 			if (m_Section->m_JumpSection)
 			{
 				m_Section->GenerateSectionLinkage();
 			}
 		}
 		m_NextInstruction = END_BLOCK;
-	} else if (bHaveDebugger()) {
-		g_Notify->DisplayError(L"WTF\n\nBranch\nNextInstruction = %X", m_NextInstruction);
+	} 
+	else if (bHaveDebugger())
+	{
+		g_Notify->DisplayError(stdstr_f("WTF\n\nBranch\nNextInstruction = %X", m_NextInstruction).ToUTF16().c_str());
 	}
 }
 
-void CRecompilerOps::SPECIAL_SYSCALL (void) {
+void CRecompilerOps::SPECIAL_SYSCALL()
+{
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	m_Section->CompileExit(m_CompilePC,(DWORD)-1,m_RegWorkingSet,CExitInfo::DoSysCall,TRUE,NULL);
+	m_Section->CompileExit(m_CompilePC, (DWORD)-1, m_RegWorkingSet, CExitInfo::DoSysCall, true, NULL);
 	m_NextInstruction = END_BLOCK;
 }
 
-void CRecompilerOps::SPECIAL_MFLO (void) {
+void CRecompilerOps::SPECIAL_MFLO() 
+{
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	if (m_Opcode.rd == 0) { return; }
 
@@ -2023,35 +2094,51 @@ void CRecompilerOps::SPECIAL_MFLO (void) {
 	MoveVariableToX86reg(&_RegLO->UW[1],"_RegLO->UW[1]",GetMipsRegMapHi(m_Opcode.rd));
 }
 
-void CRecompilerOps::SPECIAL_MTLO (void) {
+void CRecompilerOps::SPECIAL_MTLO() 
+{
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (IsKnown(m_Opcode.rs) && IsConst(m_Opcode.rs)) {
-		if (Is64Bit(m_Opcode.rs)) {
+	if (IsKnown(m_Opcode.rs) && IsConst(m_Opcode.rs))
+	{
+		if (Is64Bit(m_Opcode.rs))
+		{
 			MoveConstToVariable(GetMipsRegHi(m_Opcode.rs),&_RegLO->UW[1],"_RegLO->UW[1]");
-		} else if (IsSigned(m_Opcode.rs) && ((GetMipsRegLo(m_Opcode.rs) & 0x80000000) != 0)) {
+		} 
+		else if (IsSigned(m_Opcode.rs) && ((GetMipsRegLo(m_Opcode.rs) & 0x80000000) != 0))
+		{
 			MoveConstToVariable(0xFFFFFFFF,&_RegLO->UW[1],"_RegLO->UW[1]");
-		} else {
+		}
+		else
+		{
 			MoveConstToVariable(0,&_RegLO->UW[1],"_RegLO->UW[1]");
 		}
 		MoveConstToVariable(GetMipsRegLo(m_Opcode.rs), &_RegLO->UW[0],"_RegLO->UW[0]");
-	} else if (IsKnown(m_Opcode.rs) && IsMapped(m_Opcode.rs)) {
-		if (Is64Bit(m_Opcode.rs)) {
+	} 
+	else if (IsKnown(m_Opcode.rs) && IsMapped(m_Opcode.rs)) 
+	{
+		if (Is64Bit(m_Opcode.rs))
+		{
 			MoveX86regToVariable(GetMipsRegMapHi(m_Opcode.rs),&_RegLO->UW[1],"_RegLO->UW[1]");
-		} else if (IsSigned(m_Opcode.rs)) {
-			MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rs,TRUE),&_RegLO->UW[1],"_RegLO->UW[1]");
-		} else {
+		} 
+		else if (IsSigned(m_Opcode.rs)) 
+		{
+			MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rs, true), &_RegLO->UW[1], "_RegLO->UW[1]");
+		} 
+		else 
+		{
 			MoveConstToVariable(0,&_RegLO->UW[1],"_RegLO->UW[1]");
 		}
 		MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs), &_RegLO->UW[0],"_RegLO->UW[0]");
-	} else {
-		x86Reg reg = Map_TempReg(x86_Any,m_Opcode.rs,TRUE);
+	} 
+	else 
+	{
+		x86Reg reg = Map_TempReg(x86_Any, m_Opcode.rs, true);
 		MoveX86regToVariable(reg,&_RegLO->UW[1],"_RegLO->UW[1]");
-		MoveX86regToVariable(Map_TempReg(reg,m_Opcode.rs,FALSE), &_RegLO->UW[0],"_RegLO->UW[0]");
+		MoveX86regToVariable(Map_TempReg(reg, m_Opcode.rs, false), &_RegLO->UW[0], "_RegLO->UW[0]");
 	}
 }
 
-void CRecompilerOps::SPECIAL_MFHI (void) {
+void CRecompilerOps::SPECIAL_MFHI() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	if (m_Opcode.rd == 0) { return; }
 
@@ -2060,7 +2147,7 @@ void CRecompilerOps::SPECIAL_MFHI (void) {
 	MoveVariableToX86reg(&_RegHI->UW[1],"_RegHI->UW[1]",GetMipsRegMapHi(m_Opcode.rd));
 }
 
-void CRecompilerOps::SPECIAL_MTHI (void) {
+void CRecompilerOps::SPECIAL_MTHI() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	if (IsKnown(m_Opcode.rs) && IsConst(m_Opcode.rs)) {
@@ -2076,23 +2163,24 @@ void CRecompilerOps::SPECIAL_MTHI (void) {
 		if (Is64Bit(m_Opcode.rs)) {
 			MoveX86regToVariable(GetMipsRegMapHi(m_Opcode.rs),&_RegHI->UW[1],"_RegHI->UW[1]");
 		} else if (IsSigned(m_Opcode.rs)) {
-			MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rs,TRUE),&_RegHI->UW[1],"_RegHI->UW[1]");
+			MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rs, true), &_RegHI->UW[1], "_RegHI->UW[1]");
 		} else {
 			MoveConstToVariable(0,&_RegHI->UW[1],"_RegHI->UW[1]");
 		}
 		MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rs), &_RegHI->UW[0],"_RegHI->UW[0]");
 	} else {
-		x86Reg reg = Map_TempReg(x86_Any,m_Opcode.rs,TRUE);
-		MoveX86regToVariable(reg,&_RegHI->UW[1],"_RegHI->UW[1]");
-		MoveX86regToVariable(Map_TempReg(reg,m_Opcode.rs,FALSE), &_RegHI->UW[0],"_RegHI->UW[0]");
+		x86Reg reg = Map_TempReg(x86_Any, m_Opcode.rs, true);
+		MoveX86regToVariable(reg, &_RegHI->UW[1], "_RegHI->UW[1]");
+		MoveX86regToVariable(Map_TempReg(reg, m_Opcode.rs, false), &_RegHI->UW[0], "_RegHI->UW[0]");
 	}
 }
 
-void CRecompilerOps::SPECIAL_DSLLV (void) {
+void CRecompilerOps::SPECIAL_DSLLV() {
 	BYTE * Jump[2];
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 	
 	if (IsConst(m_Opcode.rs)) 
 	{
@@ -2100,7 +2188,7 @@ void CRecompilerOps::SPECIAL_DSLLV (void) {
 		CRecompilerOps::UnknownOpcode();
 		return;
 	}
-	Map_TempReg(x86_ECX,m_Opcode.rs,FALSE);
+	Map_TempReg(x86_ECX, m_Opcode.rs, false);
 	AndConstToX86Reg(x86_ECX,0x3F);
 	Map_GPR_64bit(m_Opcode.rd,m_Opcode.rt);
 	CompConstToX86reg(x86_ECX,0x20);
@@ -2126,16 +2214,19 @@ void CRecompilerOps::SPECIAL_DSLLV (void) {
 	SetJump8(Jump[1],m_RecompPos);
 }
 
-void CRecompilerOps::SPECIAL_DSRLV (void) {
+void CRecompilerOps::SPECIAL_DSRLV() {
 	BYTE * Jump[2];
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 	
 	if (IsConst(m_Opcode.rs)) {
 		DWORD Shift = (GetMipsRegLo(m_Opcode.rs) & 0x3F);
 		if (IsConst(m_Opcode.rt)) {
-			if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+			if (IsMapped(m_Opcode.rd))
+				UnMap_GPR(m_Opcode.rd, false);
+
 			m_RegWorkingSet.SetMipsReg(m_Opcode.rd, Is64Bit(m_Opcode.rt)?GetMipsReg(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt));
 			m_RegWorkingSet.SetMipsReg(m_Opcode.rd, GetMipsReg(m_Opcode.rd) >> Shift);
 			if ((GetMipsRegHi(m_Opcode.rd) == 0) && (GetMipsRegLo(m_Opcode.rd) & 0x80000000) == 0) {
@@ -2153,7 +2244,7 @@ void CRecompilerOps::SPECIAL_DSRLV (void) {
 			return;
 		}
 
-		Map_TempReg(x86_ECX,-1,FALSE);
+		Map_TempReg(x86_ECX, -1, false);
 		MoveConstToX86reg(Shift, x86_ECX);
 		Map_GPR_64bit(m_Opcode.rd,m_Opcode.rt);
 		if ((Shift & 0x20) == 0x20)
@@ -2167,7 +2258,7 @@ void CRecompilerOps::SPECIAL_DSRLV (void) {
 			ShiftRightUnsign(GetMipsRegMapHi(m_Opcode.rd));
 		}
 	} else {
-		Map_TempReg(x86_ECX,m_Opcode.rs,FALSE);
+		Map_TempReg(x86_ECX, m_Opcode.rs, false);
 		AndConstToX86Reg(x86_ECX,0x3F);
 		Map_GPR_64bit(m_Opcode.rd,m_Opcode.rt);
 		CompConstToX86reg(x86_ECX,0x20);
@@ -2194,12 +2285,13 @@ void CRecompilerOps::SPECIAL_DSRLV (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_DSRAV (void) 
+void CRecompilerOps::SPECIAL_DSRAV() 
 {
 	BYTE * Jump[2];
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 	
 	if (IsConst(m_Opcode.rs)) 
 	{
@@ -2207,7 +2299,7 @@ void CRecompilerOps::SPECIAL_DSRAV (void)
 		CRecompilerOps::UnknownOpcode();
 		return;
 	}
-	Map_TempReg(x86_ECX,m_Opcode.rs,FALSE);
+	Map_TempReg(x86_ECX, m_Opcode.rs, false);
 	AndConstToX86Reg(x86_ECX,0x3F);
 	Map_GPR_64bit(m_Opcode.rd,m_Opcode.rt);
 	CompConstToX86reg(x86_ECX,0x20);
@@ -2233,13 +2325,13 @@ void CRecompilerOps::SPECIAL_DSRAV (void)
 	SetJump8(Jump[1],m_RecompPos);
 }
 
-void CRecompilerOps::SPECIAL_MULT ( void) {
+void CRecompilerOps::SPECIAL_MULT() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	m_RegWorkingSet.SetX86Protected(x86_EDX,TRUE);
-	Map_TempReg(x86_EAX,m_Opcode.rs,FALSE);
-	m_RegWorkingSet.SetX86Protected(x86_EDX,FALSE);
-	Map_TempReg(x86_EDX,m_Opcode.rt,FALSE);
+	m_RegWorkingSet.SetX86Protected(x86_EDX, true);
+	Map_TempReg(x86_EAX, m_Opcode.rs, false);
+	m_RegWorkingSet.SetX86Protected(x86_EDX, false);
+	Map_TempReg(x86_EDX, m_Opcode.rt, false);
 
 	imulX86reg(x86_EDX);
 
@@ -2251,13 +2343,13 @@ void CRecompilerOps::SPECIAL_MULT ( void) {
 	MoveX86regToVariable(x86_EDX,&_RegHI->UW[1],"_RegHI->UW[1]");
 }
 
-void CRecompilerOps::SPECIAL_MULTU (void) {
+void CRecompilerOps::SPECIAL_MULTU() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	m_RegWorkingSet.SetX86Protected(x86_EDX, TRUE);
-	Map_TempReg(x86_EAX,m_Opcode.rs,FALSE);
-	m_RegWorkingSet.SetX86Protected(x86_EDX,FALSE);
-	Map_TempReg(x86_EDX,m_Opcode.rt,FALSE);
+	m_RegWorkingSet.SetX86Protected(x86_EDX, true);
+	Map_TempReg(x86_EAX, m_Opcode.rs, false);
+	m_RegWorkingSet.SetX86Protected(x86_EDX, false);
+	Map_TempReg(x86_EDX, m_Opcode.rt, false);
 
 	MulX86reg(x86_EDX);
 
@@ -2269,7 +2361,7 @@ void CRecompilerOps::SPECIAL_MULTU (void) {
 	MoveX86regToVariable(x86_EDX,&_RegHI->UW[1],"_RegHI->UW[1]");
 }
 
-void CRecompilerOps::SPECIAL_DIV (void) 
+void CRecompilerOps::SPECIAL_DIV()
 {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
@@ -2287,17 +2379,17 @@ void CRecompilerOps::SPECIAL_DIV (void)
 		} else {
 			CompConstToVariable(0, &_GPR[m_Opcode.rt].W[0], CRegName::GPR_Lo[m_Opcode.rt]);
 		}
-		m_Section->CompileExit(m_CompilePC, m_CompilePC,m_RegWorkingSet,CExitInfo::DivByZero,FALSE,JeLabel32);
+		m_Section->CompileExit(m_CompilePC, m_CompilePC, m_RegWorkingSet, CExitInfo::DivByZero, false, JeLabel32);
 	}
 	/*	lo = (SD)rs / (SD)rt;
 		hi = (SD)rs % (SD)rt; */
 
-	m_RegWorkingSet.SetX86Protected(x86_EDX,TRUE);
-	Map_TempReg(x86_EAX,m_Opcode.rs,FALSE);
+	m_RegWorkingSet.SetX86Protected(x86_EDX, true);
+	Map_TempReg(x86_EAX, m_Opcode.rs, false);
 
 	/* edx is the signed portion to eax */
-	m_RegWorkingSet.SetX86Protected(x86_EDX, FALSE);
-	Map_TempReg(x86_EDX, -1, FALSE);
+	m_RegWorkingSet.SetX86Protected(x86_EDX, false);
+	Map_TempReg(x86_EDX, -1, false);
 
 	MoveX86RegToX86Reg(x86_EAX, x86_EDX);
 	ShiftRightSignImmed(x86_EDX,31);
@@ -2305,7 +2397,7 @@ void CRecompilerOps::SPECIAL_DIV (void)
 	if (IsMapped(m_Opcode.rt)) {
 		idivX86reg(GetMipsRegMapLo(m_Opcode.rt));
 	} else {
-		idivX86reg(Map_TempReg(x86_Any,m_Opcode.rt,FALSE));
+		idivX86reg(Map_TempReg(x86_Any, m_Opcode.rt, false));
 	}
 		
 
@@ -2317,7 +2409,7 @@ void CRecompilerOps::SPECIAL_DIV (void)
 	MoveX86regToVariable(x86_EDX,&_RegHI->UW[1],"_RegHI->UW[1]");
 }
 
-void CRecompilerOps::SPECIAL_DIVU ( void) {
+void CRecompilerOps::SPECIAL_DIVU() {
 	BYTE *Jump[2];
 	x86Reg Reg;
 
@@ -2358,12 +2450,12 @@ void CRecompilerOps::SPECIAL_DIVU ( void) {
 	/*	lo = (UD)rs / (UD)rt;
 		hi = (UD)rs % (UD)rt; */
 
-	m_RegWorkingSet.SetX86Protected(x86_EAX,TRUE);
-	Map_TempReg(x86_EDX, 0, FALSE);
-	m_RegWorkingSet.SetX86Protected(x86_EAX,FALSE);
+	m_RegWorkingSet.SetX86Protected(x86_EAX, true);
+	Map_TempReg(x86_EDX, 0, false);
+	m_RegWorkingSet.SetX86Protected(x86_EAX, false);
 
-	Map_TempReg(x86_EAX,m_Opcode.rs,FALSE);
-	Reg = Map_TempReg(x86_Any,m_Opcode.rt,FALSE);
+	Map_TempReg(x86_EAX, m_Opcode.rs, false);
+	Reg = Map_TempReg(x86_Any, m_Opcode.rt, false);
 
 	DivX86reg(Reg);
 
@@ -2384,23 +2476,27 @@ void CRecompilerOps::SPECIAL_DIVU ( void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_DMULT (void) 
+void CRecompilerOps::SPECIAL_DMULT()
 {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (m_Opcode.rs != 0) { UnMap_GPR(m_Opcode.rs,TRUE); }
-	if (m_Opcode.rs != 0) { UnMap_GPR(m_Opcode.rt,TRUE); }
+	if (m_Opcode.rs != 0)
+		UnMap_GPR(m_Opcode.rs, true);
+
+	if (m_Opcode.rs != 0)
+		UnMap_GPR(m_Opcode.rt, true);
+
 	BeforeCallDirect(m_RegWorkingSet);
 	MoveConstToVariable(m_Opcode.Hex, &R4300iOp::m_Opcode.Hex, "R4300iOp::m_Opcode.Hex");
 	Call_Direct(R4300iOp::SPECIAL_DMULT, "R4300iOp::SPECIAL_DMULT");
 	AfterCallDirect(m_RegWorkingSet);
 }
 
-void CRecompilerOps::SPECIAL_DMULTU (void) {
+void CRecompilerOps::SPECIAL_DMULTU() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	UnMap_GPR(m_Opcode.rs,TRUE);
-	UnMap_GPR(m_Opcode.rt,TRUE);
+	UnMap_GPR(m_Opcode.rs, true);
+	UnMap_GPR(m_Opcode.rt, true);
 	BeforeCallDirect(m_RegWorkingSet);
 	MoveConstToVariable(m_Opcode.Hex, &R4300iOp::m_Opcode.Hex, "R4300iOp::m_Opcode.Hex");
 	Call_Direct(R4300iOp::SPECIAL_DMULTU, "R4300iOp::SPECIAL_DMULTU");
@@ -2408,41 +2504,41 @@ void CRecompilerOps::SPECIAL_DMULTU (void) {
 
 #ifdef toremove
 	/* _RegLO->UDW = (uint64)_GPR[m_Opcode.rs].UW[0] * (uint64)_GPR[m_Opcode.rt].UW[0]; */
-	X86Protected(x86_EDX) = TRUE;
-	Map_TempReg(x86_EAX,m_Opcode.rs,FALSE);
-	X86Protected(x86_EDX) = FALSE;
-	Map_TempReg(x86_EDX,m_Opcode.rt,FALSE);
+	X86Protected(x86_EDX) = true;
+	Map_TempReg(x86_EAX,m_Opcode.rs,false);
+	X86Protected(x86_EDX) = false;
+	Map_TempReg(x86_EDX,m_Opcode.rt,false);
 
 	MulX86reg(x86_EDX);
 	MoveX86regToVariable(x86_EAX, &_RegLO->UW[0], "_RegLO->UW[0]");
 	MoveX86regToVariable(x86_EDX, &_RegLO->UW[1], "_RegLO->UW[1]");
 
 	/* _RegHI->UDW = (uint64)_GPR[m_Opcode.rs].UW[1] * (uint64)_GPR[m_Opcode.rt].UW[1]; */
-	Map_TempReg(x86_EAX,m_Opcode.rs,TRUE);
-	Map_TempReg(x86_EDX,m_Opcode.rt,TRUE);
+	Map_TempReg(x86_EAX,m_Opcode.rs,true);
+	Map_TempReg(x86_EDX,m_Opcode.rt,true);
 
 	MulX86reg(x86_EDX);
 	MoveX86regToVariable(x86_EAX, &_RegHI->UW[0], "_RegHI->UW[0]");
 	MoveX86regToVariable(x86_EDX, &_RegHI->UW[1], "_RegHI->UW[1]");
 
 	/* Tmp[0].UDW = (uint64)_GPR[m_Opcode.rs].UW[1] * (uint64)_GPR[m_Opcode.rt].UW[0]; */
-	Map_TempReg(x86_EAX,m_Opcode.rs,TRUE);
-	Map_TempReg(x86_EDX,m_Opcode.rt,FALSE);
+	Map_TempReg(x86_EAX,m_Opcode.rs,true);
+	Map_TempReg(x86_EDX,m_Opcode.rt,false);
 
-	Map_TempReg(x86_EBX,-1,FALSE);
-	Map_TempReg(x86_ECX,-1,FALSE);
+	Map_TempReg(x86_EBX,-1,false);
+	Map_TempReg(x86_ECX,-1,false);
 
 	MulX86reg(x86_EDX);
 	MoveX86RegToX86Reg(x86_EAX, x86_EBX); /* EDX:EAX -> ECX:EBX */
 	MoveX86RegToX86Reg(x86_EDX, x86_ECX);
 
 	/* Tmp[1].UDW = (uint64)_GPR[m_Opcode.rs].UW[0] * (uint64)_GPR[m_Opcode.rt].UW[1]; */
-	Map_TempReg(x86_EAX,m_Opcode.rs,FALSE);
-	Map_TempReg(x86_EDX,m_Opcode.rt,TRUE);
+	Map_TempReg(x86_EAX,m_Opcode.rs,false);
+	Map_TempReg(x86_EDX,m_Opcode.rt,true);
 
 	MulX86reg(x86_EDX);
-	Map_TempReg(x86_ESI,-1,FALSE);
-	Map_TempReg(x86_EDI,-1,FALSE);
+	Map_TempReg(x86_ESI,-1,false);
+	Map_TempReg(x86_EDI,-1,false);
 	MoveX86RegToX86Reg(x86_EAX, x86_ESI); /* EDX:EAX -> EDI:ESI */
 	MoveX86RegToX86Reg(x86_EDX, x86_EDI);
 
@@ -2474,45 +2570,48 @@ void CRecompilerOps::SPECIAL_DMULTU (void) {
 #endif
 }
 
-void CRecompilerOps::SPECIAL_DDIV (void) {
+void CRecompilerOps::SPECIAL_DDIV() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	UnMap_GPR(m_Opcode.rs,TRUE);
-	UnMap_GPR(m_Opcode.rt,TRUE);
+	UnMap_GPR(m_Opcode.rs, true);
+	UnMap_GPR(m_Opcode.rt, true);
 	BeforeCallDirect(m_RegWorkingSet);
 	MoveConstToVariable(m_Opcode.Hex, &R4300iOp::m_Opcode.Hex, "R4300iOp::m_Opcode.Hex");
 	Call_Direct(R4300iOp::SPECIAL_DDIV, "R4300iOp::SPECIAL_DDIV");
 	AfterCallDirect(m_RegWorkingSet);
 }
 
-void CRecompilerOps::SPECIAL_DDIVU (void) 
+void CRecompilerOps::SPECIAL_DDIVU()
 {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	UnMap_GPR(m_Opcode.rs,TRUE);
-	UnMap_GPR(m_Opcode.rt,TRUE);
+	UnMap_GPR(m_Opcode.rs, true);
+	UnMap_GPR(m_Opcode.rt, true);
 	BeforeCallDirect(m_RegWorkingSet);
 	MoveConstToVariable(m_Opcode.Hex, &R4300iOp::m_Opcode.Hex, "R4300iOp::m_Opcode.Hex");
 	Call_Direct(R4300iOp::SPECIAL_DDIVU, "R4300iOp::SPECIAL_DDIVU");
 	AfterCallDirect(m_RegWorkingSet);
 }
 
-void CRecompilerOps::SPECIAL_ADD (void) {
+void CRecompilerOps::SPECIAL_ADD() {
 	int source1 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rt:m_Opcode.rs;
 	int source2 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rs:m_Opcode.rt;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(source1) && IsConst(source2)) {
 		DWORD temp = GetMipsRegLo(source1) + GetMipsRegLo(source2);
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd,temp);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 		return;
 	}
 
-	Map_GPR_32bit(m_Opcode.rd,TRUE, source1);
+	Map_GPR_32bit(m_Opcode.rd, true, source1);
 	if (IsConst(source2)) {
 		AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(source2));
 	} else if (IsKnown(source2) && IsMapped(source2)) {
@@ -2526,22 +2625,25 @@ void CRecompilerOps::SPECIAL_ADD (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_ADDU (void) {
+void CRecompilerOps::SPECIAL_ADDU() {
 	int source1 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rt:m_Opcode.rs;
 	int source2 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rs:m_Opcode.rt;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(source1) && IsConst(source2)) {
 		DWORD temp = GetMipsRegLo(source1) + GetMipsRegLo(source2);
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd,temp);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 		return;
 	}
 
-	Map_GPR_32bit(m_Opcode.rd,TRUE, source1);
+	Map_GPR_32bit(m_Opcode.rd, true, source1);
 	if (IsConst(source2)) {
 		AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(source2));
 	} else if (IsKnown(source2) && IsMapped(source2)) {
@@ -2555,23 +2657,27 @@ void CRecompilerOps::SPECIAL_ADDU (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_SUB (void) {
+void CRecompilerOps::SPECIAL_SUB() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)  && IsConst(m_Opcode.rs)) {
 		DWORD temp = GetMipsRegLo(m_Opcode.rs) - GetMipsRegLo(m_Opcode.rt);
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd,temp);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 	} else {
 		if (m_Opcode.rd == m_Opcode.rt) {
-			x86Reg Reg = Map_TempReg(x86_Any,m_Opcode.rt,FALSE);
-			Map_GPR_32bit(m_Opcode.rd,TRUE, m_Opcode.rs);
+			x86Reg Reg = Map_TempReg(x86_Any, m_Opcode.rt, false);
+			Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rs);
 			SubX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),Reg);
 			return;
 		}
-		Map_GPR_32bit(m_Opcode.rd,TRUE, m_Opcode.rs);
+		Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rs);
 		if (IsConst(m_Opcode.rt)) {
 			SubConstFromX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(m_Opcode.rt));
 		} else if (IsMapped(m_Opcode.rt)) {
@@ -2586,23 +2692,27 @@ void CRecompilerOps::SPECIAL_SUB (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_SUBU (void) {
+void CRecompilerOps::SPECIAL_SUBU() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)  && IsConst(m_Opcode.rs)) {
 		DWORD temp = GetMipsRegLo(m_Opcode.rs) - GetMipsRegLo(m_Opcode.rt);
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd,temp);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 	} else {
 		if (m_Opcode.rd == m_Opcode.rt) {
-			x86Reg Reg = Map_TempReg(x86_Any,m_Opcode.rt,FALSE);
-			Map_GPR_32bit(m_Opcode.rd,TRUE, m_Opcode.rs);
+			x86Reg Reg = Map_TempReg(x86_Any, m_Opcode.rt, false);
+			Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rs);
 			SubX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),Reg);
 			return;
 		}
-		Map_GPR_32bit(m_Opcode.rd,TRUE, m_Opcode.rs);
+		Map_GPR_32bit(m_Opcode.rd, true, m_Opcode.rs);
 		if (IsConst(m_Opcode.rt)) {
 			SubConstFromX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(m_Opcode.rt));
 		} else if (IsMapped(m_Opcode.rt)) {
@@ -2618,7 +2728,7 @@ void CRecompilerOps::SPECIAL_SUBU (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_AND (void) 
+void CRecompilerOps::SPECIAL_AND() 
 {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
@@ -2648,17 +2758,17 @@ void CRecompilerOps::SPECIAL_AND (void)
 			ProtectGPR(source1);
 			ProtectGPR(source2);
 			if (Is32Bit(source1) && Is32Bit(source2)) {
-				bool Sign = (IsSigned(m_Opcode.rt) && IsSigned(m_Opcode.rs))?true:false;
-				Map_GPR_32bit(m_Opcode.rd,Sign,source1);				
+				bool Sign = (IsSigned(m_Opcode.rt) && IsSigned(m_Opcode.rs));
+				Map_GPR_32bit(m_Opcode.rd, Sign, source1);
 				AndX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2));
 			} else if (Is32Bit(source1) || Is32Bit(source2)) {
 				if (IsUnsigned(Is32Bit(source1)?source1:source2)) {
-					Map_GPR_32bit(m_Opcode.rd,FALSE,source1);
+					Map_GPR_32bit(m_Opcode.rd, false, source1);
 					AndX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2));
 				} else {
 					Map_GPR_64bit(m_Opcode.rd,source1);
 					if (Is32Bit(source2)) {
-						AndX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),Map_TempReg(x86_Any,source2,TRUE));
+						AndX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),Map_TempReg(x86_Any,source2,true));
 					} else {
 						AndX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegMapHi(source2));
 					}
@@ -2676,10 +2786,10 @@ void CRecompilerOps::SPECIAL_AND (void)
 			if (Is64Bit(ConstReg)) {
 				if (Is32Bit(MappedReg) && IsUnsigned(MappedReg)) {
 					if (GetMipsRegLo(ConstReg) == 0) {
-						Map_GPR_32bit(m_Opcode.rd,FALSE, 0);
+						Map_GPR_32bit(m_Opcode.rd, false, 0);
 					} else {
 						DWORD Value = GetMipsRegLo(ConstReg);
-						Map_GPR_32bit(m_Opcode.rd,FALSE, MappedReg);
+						Map_GPR_32bit(m_Opcode.rd, false, MappedReg);
 						AndConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),Value);
 					}
 				} else {
@@ -2691,20 +2801,23 @@ void CRecompilerOps::SPECIAL_AND (void)
 			} else if (Is64Bit(MappedReg)) {
 				DWORD Value = GetMipsRegLo(ConstReg); 
 				if (Value != 0) {
-					Map_GPR_32bit(m_Opcode.rd,IsSigned(ConstReg)?TRUE:FALSE,MappedReg);					
+					Map_GPR_32bit(m_Opcode.rd, IsSigned(ConstReg), MappedReg);
 					AndConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),Value);
 				} else {
-					Map_GPR_32bit(m_Opcode.rd,IsSigned(ConstReg)?TRUE:FALSE, 0);
+					Map_GPR_32bit(m_Opcode.rd, IsSigned(ConstReg), 0);
 				}
 			} else {
 				DWORD Value = GetMipsRegLo(ConstReg); 
 				bool Sign = false;
-				if (IsSigned(ConstReg) && IsSigned(MappedReg)) { Sign = true; }				
+
+				if (IsSigned(ConstReg) && IsSigned(MappedReg))
+					Sign = true;
+
 				if (Value != 0) {
 					Map_GPR_32bit(m_Opcode.rd,Sign,MappedReg);
 					AndConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),Value);
 				} else {
-					Map_GPR_32bit(m_Opcode.rd,false, 0);
+					Map_GPR_32bit(m_Opcode.rd, false, 0);
 				}
 			}
 		}
@@ -2757,13 +2870,16 @@ void CRecompilerOps::SPECIAL_AND (void)
 	}
 }
 
-void CRecompilerOps::SPECIAL_OR (void) {
+void CRecompilerOps::SPECIAL_OR() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	if (IsKnown(m_Opcode.rt) && IsKnown(m_Opcode.rs)) {
 		if (IsConst(m_Opcode.rt) && IsConst(m_Opcode.rs)) {
-			if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
-			if (Is64Bit(m_Opcode.rt) || Is64Bit(m_Opcode.rs)) {				
+
+			if (IsMapped(m_Opcode.rd))
+				UnMap_GPR(m_Opcode.rd, false);
+
+			if (Is64Bit(m_Opcode.rt) || Is64Bit(m_Opcode.rs)) {
 				m_RegWorkingSet.SetMipsReg(m_Opcode.rd,
 					(Is64Bit(m_Opcode.rt)?GetMipsReg(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt)) |
 					(Is64Bit(m_Opcode.rs)?GetMipsReg(m_Opcode.rs):(__int64)GetMipsRegLo_S(m_Opcode.rs))
@@ -2790,11 +2906,11 @@ void CRecompilerOps::SPECIAL_OR (void) {
 				if (Is64Bit(source2)) {
 					OrX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegMapHi(source2));
 				} else {
-					OrX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),Map_TempReg(x86_Any,source2,TRUE));
+					OrX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd), Map_TempReg(x86_Any, source2, true));
 				}
 			} else {
 				ProtectGPR(source2);
-				Map_GPR_32bit(m_Opcode.rd,TRUE,source1);
+				Map_GPR_32bit(m_Opcode.rd, true, source1);
 			}
 			OrX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2));
 		} else {
@@ -2819,7 +2935,7 @@ void CRecompilerOps::SPECIAL_OR (void) {
 				}
 			} else {
 				int Value = GetMipsRegLo(ConstReg);
-				Map_GPR_32bit(m_Opcode.rd,TRUE, MappedReg);
+				Map_GPR_32bit(m_Opcode.rd, true, MappedReg);
 				if (Value != 0) { OrConstToX86Reg(Value,GetMipsRegMapLo(m_Opcode.rd)); }
 			}
 		}
@@ -2875,19 +2991,22 @@ void CRecompilerOps::SPECIAL_OR (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_XOR (void) {
+void CRecompilerOps::SPECIAL_XOR() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (m_Opcode.rt == m_Opcode.rs) {
-		UnMap_GPR( m_Opcode.rd, FALSE);
+		UnMap_GPR(m_Opcode.rd, false);
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, 0);
 		return;
 	}
 	if (IsKnown(m_Opcode.rt) && IsKnown(m_Opcode.rs)) {
 		if (IsConst(m_Opcode.rt) && IsConst(m_Opcode.rs)) {
-			if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+			if (IsMapped(m_Opcode.rd))
+				UnMap_GPR(m_Opcode.rd, false);
+
 			if (Is64Bit(m_Opcode.rt) || Is64Bit(m_Opcode.rs)) {
 				if (bHaveDebugger()) { g_Notify->DisplayError(L"XOR 1"); }
 				CRecompilerOps::UnknownOpcode();
@@ -2906,12 +3025,12 @@ void CRecompilerOps::SPECIAL_XOR (void) {
 				if (Is64Bit(source2)) {
 					XorX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegMapHi(source2));
 				} else if (IsSigned(source2)) {
-					XorX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),Map_TempReg(x86_Any,source2,TRUE));
+					XorX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd), Map_TempReg(x86_Any, source2, true));
 				}
 				XorX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2));
 			} else {
 				if (IsSigned(m_Opcode.rt) != IsSigned(m_Opcode.rs)) {
-					Map_GPR_32bit(m_Opcode.rd,TRUE,source1);
+					Map_GPR_32bit(m_Opcode.rd, true, source1);
 				} else {
 					Map_GPR_32bit(m_Opcode.rd,IsSigned(m_Opcode.rt),source1);
 				}
@@ -2932,9 +3051,9 @@ void CRecompilerOps::SPECIAL_XOR (void) {
 			} else {
 				int Value = GetMipsRegLo(ConstReg);
 				if (IsSigned(m_Opcode.rt) != IsSigned(m_Opcode.rs)) {
-					Map_GPR_32bit(m_Opcode.rd,TRUE, MappedReg);
+					Map_GPR_32bit(m_Opcode.rd, true, MappedReg);
 				} else {
-					Map_GPR_32bit(m_Opcode.rd,IsSigned(MappedReg)?TRUE:FALSE, MappedReg);
+					Map_GPR_32bit(m_Opcode.rd, IsSigned(MappedReg), MappedReg);
 				}
 				if (Value != 0) { XorConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),Value); }
 			}
@@ -2985,13 +3104,15 @@ void CRecompilerOps::SPECIAL_XOR (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_NOR (void) {
+void CRecompilerOps::SPECIAL_NOR() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	if (IsKnown(m_Opcode.rt) && IsKnown(m_Opcode.rs)) {
 		if (IsConst(m_Opcode.rt) && IsConst(m_Opcode.rs)) {
-			if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
-			if (Is64Bit(m_Opcode.rt) || Is64Bit(m_Opcode.rs)) {				
+			if (IsMapped(m_Opcode.rd))
+				UnMap_GPR(m_Opcode.rd, false);
+
+			if (Is64Bit(m_Opcode.rt) || Is64Bit(m_Opcode.rs)) {
 				m_RegWorkingSet.SetMipsReg(m_Opcode.rd,
 					~((Is64Bit(m_Opcode.rt)?GetMipsReg(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt)) |
 					(Is64Bit(m_Opcode.rs)?GetMipsReg(m_Opcode.rs):(__int64)GetMipsRegLo_S(m_Opcode.rs)))
@@ -3018,11 +3139,11 @@ void CRecompilerOps::SPECIAL_NOR (void) {
 				if (Is64Bit(source2)) {
 					OrX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegMapHi(source2));
 				} else {
-					OrX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),Map_TempReg(x86_Any,source2,TRUE));
+					OrX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd), Map_TempReg(x86_Any, source2, true));
 				}
 			} else {
 				ProtectGPR(source2);
-				Map_GPR_32bit(m_Opcode.rd,TRUE,source1);
+				Map_GPR_32bit(m_Opcode.rd, true, source1);
 			}
 			OrX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2));
 		} else {
@@ -3047,7 +3168,7 @@ void CRecompilerOps::SPECIAL_NOR (void) {
 				}
 			} else {
 				int Value = GetMipsRegLo(ConstReg);
-				Map_GPR_32bit(m_Opcode.rd,TRUE, MappedReg);
+				Map_GPR_32bit(m_Opcode.rd, true, MappedReg);
 				if (Value != 0) { OrConstToX86Reg(Value,GetMipsRegMapLo(m_Opcode.rd)); }
 			}
 		}
@@ -3103,13 +3224,14 @@ void CRecompilerOps::SPECIAL_NOR (void) {
 		{
 			NotX86Reg(GetMipsRegMapHi(m_Opcode.rd));
 		} 
-		NotX86Reg(GetMipsRegMapLo(m_Opcode.rd));		
+		NotX86Reg(GetMipsRegMapLo(m_Opcode.rd));
 	}
 }
 
-void CRecompilerOps::SPECIAL_SLT (void) {
+void CRecompilerOps::SPECIAL_SLT() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsKnown(m_Opcode.rt) && IsKnown(m_Opcode.rs)) {
 		if (IsConst(m_Opcode.rt) && IsConst(m_Opcode.rs)) {
@@ -3117,8 +3239,10 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 				g_Notify->DisplayError(L"1");
 				CRecompilerOps::UnknownOpcode();
 			} else {
-				if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
-				m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);	
+				if (IsMapped(m_Opcode.rd))
+					UnMap_GPR(m_Opcode.rd, false);
+
+				m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 				if (GetMipsRegLo_S(m_Opcode.rs) < GetMipsRegLo_S(m_Opcode.rt)) {
 					m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd,1);
 				} else {
@@ -3134,8 +3258,8 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 				BYTE *Jump[2];
 
 				CompX86RegToX86Reg(
-					Is64Bit(m_Opcode.rs)?GetMipsRegMapHi(m_Opcode.rs):Map_TempReg(x86_Any,m_Opcode.rs,TRUE), 
-					Is64Bit(m_Opcode.rt)?GetMipsRegMapHi(m_Opcode.rt):Map_TempReg(x86_Any,m_Opcode.rt,TRUE)
+					Is64Bit(m_Opcode.rs) ? GetMipsRegMapHi(m_Opcode.rs) : Map_TempReg(x86_Any, m_Opcode.rs, true),
+					Is64Bit(m_Opcode.rt) ? GetMipsRegMapHi(m_Opcode.rt) : Map_TempReg(x86_Any, m_Opcode.rt, true)
 					);
 				JeLabel8("Low Compare",0);
 				Jump[0] = m_RecompPos - 1;
@@ -3151,16 +3275,16 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 				CPU_Message("");
 				CPU_Message("      Continue:");
 				SetJump8(Jump[1],m_RecompPos);
-				Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 			} else {
-				Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				CompX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rs), GetMipsRegMapLo(m_Opcode.rt));
 
 				if (GetMipsRegMapLo(m_Opcode.rd) > x86_EBX) {
 					SetlVariable(&m_BranchCompare,"m_BranchCompare");
 					MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
-				} else {					
+				} else {
 					Setl(GetMipsRegMapLo(m_Opcode.rd));
 					AndConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd), 1);
 				}
@@ -3174,8 +3298,8 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 				BYTE *Jump[2];
 
 				CompConstToX86reg(
-					Is64Bit(MappedReg)?GetMipsRegMapHi(MappedReg):Map_TempReg(x86_Any,MappedReg,TRUE), 
-					Is64Bit(ConstReg)?GetMipsRegHi(ConstReg):(GetMipsRegLo_S(ConstReg) >> 31)
+					Is64Bit(MappedReg) ? GetMipsRegMapHi(MappedReg) : Map_TempReg(x86_Any, MappedReg, true),
+					Is64Bit(ConstReg)  ? GetMipsRegHi(ConstReg) : (GetMipsRegLo_S(ConstReg) >> 31)
 					);
 				JeLabel8("Low Compare",0);
 				Jump[0] = m_RecompPos - 1;
@@ -3199,11 +3323,11 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 				CPU_Message("");
 				CPU_Message("      Continue:");
 				SetJump8(Jump[1],m_RecompPos);
-				Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 			} else {
 				DWORD Constant = GetMipsRegLo(ConstReg);
-				Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				CompConstToX86reg(GetMipsRegMapLo(MappedReg), Constant);
 
 				if (GetMipsRegMapLo(m_Opcode.rd) > x86_EBX) {
@@ -3213,7 +3337,7 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 						SetgVariable(&m_BranchCompare,"m_BranchCompare");
 					}
 					MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
-				} else {					
+				} else {
 					if (MappedReg == m_Opcode.rs) {
 						Setl(GetMipsRegMapLo(m_Opcode.rd));
 					} else {
@@ -3241,7 +3365,7 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 					CompConstToVariable((GetMipsRegLo_S(KnownReg) >> 31),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
 				} else {
 					ProtectGPR(KnownReg);
-					CompX86regToVariable(Map_TempReg(x86_Any,KnownReg,TRUE),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
+					CompX86regToVariable(Map_TempReg(x86_Any, KnownReg, true), &_GPR[UnknownReg].W[1], CRegName::GPR_Hi[UnknownReg]);
 				}
 			}
 			JeLabel8("Low Compare",0);
@@ -3270,7 +3394,7 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 			CPU_Message("");
 			CPU_Message("      Continue:");
 			SetJump8(Jump[1],m_RecompPos);
-			Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+			Map_GPR_32bit(m_Opcode.rd, true, -1);
 			MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 		} else {
 			if (IsMapped(KnownReg))
@@ -3280,7 +3404,7 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 			bool bConstant = IsConst(KnownReg);
 			DWORD Value = IsConst(KnownReg) ? GetMipsRegLo(KnownReg) : 0;
 
-			Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+			Map_GPR_32bit(m_Opcode.rd, true, -1);
 			if (bConstant) {
 				CompConstToVariable(Value,&_GPR[UnknownReg].W[0],CRegName::GPR_Lo[UnknownReg]);
 			} else {
@@ -3293,7 +3417,7 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 					SetlVariable(&m_BranchCompare,"m_BranchCompare");
 				}
 				MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
-			} else {					
+			} else {
 				if (KnownReg == (bConstant?m_Opcode.rs:m_Opcode.rt)) {
 					Setg(GetMipsRegMapLo(m_Opcode.rd));
 				} else {
@@ -3309,14 +3433,14 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 		if (GetMipsRegMapLo(m_Opcode.rd) > x86_EBX) {
 			SetlVariable(&m_BranchCompare,"m_BranchCompare");
 			MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
-		} else {					
+		} else {
 			Setl(GetMipsRegMapLo(m_Opcode.rd));
 			AndConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd), 1);
 		}
 	} else {
 		BYTE *Jump[2] = { NULL, NULL };
 
-		x86Reg Reg = Map_TempReg(x86_Any,m_Opcode.rs,TRUE);
+		x86Reg Reg = Map_TempReg(x86_Any, m_Opcode.rs, true);
 		CompX86regToVariable(Reg,&_GPR[m_Opcode.rt].W[1],CRegName::GPR_Hi[m_Opcode.rt]);
 		JeLabel8("Low Compare",0);
 		Jump[0] = m_RecompPos - 1;
@@ -3327,7 +3451,7 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 		CPU_Message("");
 		CPU_Message("      Low Compare:");
 		SetJump8(Jump[0],m_RecompPos);
-		CompX86regToVariable(Map_TempReg(Reg,m_Opcode.rs,FALSE),&_GPR[m_Opcode.rt].W[0],CRegName::GPR_Lo[m_Opcode.rt]);
+		CompX86regToVariable(Map_TempReg(Reg, m_Opcode.rs, false), &_GPR[m_Opcode.rt].W[0], CRegName::GPR_Lo[m_Opcode.rt]);
 		SetbVariable(&m_BranchCompare,"m_BranchCompare");
 		if (Jump[1])
 		{
@@ -3335,14 +3459,15 @@ void CRecompilerOps::SPECIAL_SLT (void) {
 			CPU_Message("      Continue:");
 			SetJump8(Jump[1],m_RecompPos);
 		}
-		Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+		Map_GPR_32bit(m_Opcode.rd, true, -1);
 		MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 	}
 }
 
-void CRecompilerOps::SPECIAL_SLTU (void) {
+void CRecompilerOps::SPECIAL_SLTU() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsKnown(m_Opcode.rt) && IsKnown(m_Opcode.rs)) {
 		if (IsConst(m_Opcode.rt) && IsConst(m_Opcode.rs)) {
@@ -3350,8 +3475,10 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 				g_Notify->DisplayError(L"1");
 				CRecompilerOps::UnknownOpcode();
 			} else {
-				if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
-				m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);	
+				if (IsMapped(m_Opcode.rd))
+					UnMap_GPR(m_Opcode.rd, false);
+
+				m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 				if (GetMipsRegLo(m_Opcode.rs) < GetMipsRegLo(m_Opcode.rt)) {
 					m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd,1);
 				} else {
@@ -3367,8 +3494,8 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 				BYTE *Jump[2];
 
 				CompX86RegToX86Reg(
-					Is64Bit(m_Opcode.rs)?GetMipsRegMapHi(m_Opcode.rs):Map_TempReg(x86_Any,m_Opcode.rs,TRUE), 
-					Is64Bit(m_Opcode.rt)?GetMipsRegMapHi(m_Opcode.rt):Map_TempReg(x86_Any,m_Opcode.rt,TRUE)
+					Is64Bit(m_Opcode.rs) ? GetMipsRegMapHi(m_Opcode.rs) : Map_TempReg(x86_Any, m_Opcode.rs, true),
+					Is64Bit(m_Opcode.rt) ? GetMipsRegMapHi(m_Opcode.rt) : Map_TempReg(x86_Any, m_Opcode.rt, true)
 					);
 				JeLabel8("Low Compare",0);
 				Jump[0] = m_RecompPos - 1;
@@ -3384,12 +3511,12 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 				CPU_Message("");
 				CPU_Message("      Continue:");
 				SetJump8(Jump[1],m_RecompPos);
-				Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 			} else {
 				CompX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rs), GetMipsRegMapLo(m_Opcode.rt));
 				SetbVariable(&m_BranchCompare,"m_BranchCompare");
-				Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 			}
 		} else {
@@ -3409,11 +3536,11 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 				MappedRegLo = GetMipsRegMapLo(MappedReg);
 				MappedRegHi = GetMipsRegMapHi(MappedReg);
 				if (Is32Bit(MappedReg)) {
-					MappedRegHi = Map_TempReg(x86_Any,MappedReg,TRUE);
+					MappedRegHi = Map_TempReg(x86_Any, MappedReg, true);
 				}
 
 
-				Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				CompConstToX86reg(MappedRegHi, ConstHi);
 				JeLabel8("Low Compare",0);
 				Jump[0] = m_RecompPos - 1;
@@ -3437,7 +3564,7 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 				CPU_Message("");
 				CPU_Message("      Continue:");
 				SetJump8(Jump[1],m_RecompPos);
-				Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 			} else {
 				DWORD Const = IsConst(m_Opcode.rs)?GetMipsRegLo(m_Opcode.rs):GetMipsRegLo(m_Opcode.rt);
@@ -3449,7 +3576,7 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 				} else {
 					SetaVariable(&m_BranchCompare,"m_BranchCompare");
 				}
-				Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 			}
 		}		
@@ -3464,7 +3591,7 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 			DWORD TestReg = IsConst(KnownReg)?m_Opcode.rs:m_Opcode.rt;
 			if (IsConst(KnownReg)) {
 				DWORD Value = GetMipsRegLo(KnownReg);
-				Map_GPR_32bit(m_Opcode.rd,TRUE,-1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				CompConstToVariable(Value,&_GPR[UnknownReg].W[0],CRegName::GPR_Lo[UnknownReg]);
 			} else {
 				CompX86regToVariable(GetMipsRegMapLo(KnownReg),&_GPR[UnknownReg].W[0],CRegName::GPR_Lo[UnknownReg]);
@@ -3487,7 +3614,7 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 					CompX86regToVariable(GetMipsRegMapHi(KnownReg),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
 				} else {
 					ProtectGPR(KnownReg);
-					CompX86regToVariable(Map_TempReg(x86_Any,KnownReg,TRUE),&_GPR[UnknownReg].W[1],CRegName::GPR_Hi[UnknownReg]);
+					CompX86regToVariable(Map_TempReg(x86_Any, KnownReg, true), &_GPR[UnknownReg].W[1], CRegName::GPR_Hi[UnknownReg]);
 				}			
 			}
 			JeLabel8("Low Compare",0);
@@ -3521,7 +3648,7 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 				SetJump8(Jump[1],m_RecompPos);
 			}
 		}
-		Map_GPR_32bit(m_Opcode.rd,TRUE,-1);
+		Map_GPR_32bit(m_Opcode.rd, true, -1);
 		MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 	} else if (g_System->b32BitCore()) {
 		x86Reg Reg = Map_TempReg(x86_Any,m_Opcode.rs,false);
@@ -3532,7 +3659,7 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 	} else {
 		BYTE *Jump[2] = { NULL, NULL };
 
-		x86Reg Reg = Map_TempReg(x86_Any,m_Opcode.rs,TRUE);
+		x86Reg Reg = Map_TempReg(x86_Any, m_Opcode.rs, true);
 		CompX86regToVariable(Reg,&_GPR[m_Opcode.rt].W[1],CRegName::GPR_Hi[m_Opcode.rt]);
 		JeLabel8("Low Compare",0);
 		Jump[0] = m_RecompPos - 1;
@@ -3543,7 +3670,7 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 		CPU_Message("");
 		CPU_Message("      Low Compare:");
 		SetJump8(Jump[0],m_RecompPos);
-		CompX86regToVariable(Map_TempReg(Reg,m_Opcode.rs,FALSE),&_GPR[m_Opcode.rt].W[0],CRegName::GPR_Lo[m_Opcode.rt]);
+		CompX86regToVariable(Map_TempReg(Reg, m_Opcode.rs, false), &_GPR[m_Opcode.rt].W[0], CRegName::GPR_Lo[m_Opcode.rt]);
 		SetbVariable(&m_BranchCompare,"m_BranchCompare");
 		if (Jump[1])
 		{
@@ -3551,17 +3678,20 @@ void CRecompilerOps::SPECIAL_SLTU (void) {
 			CPU_Message("      Continue:");
 			SetJump8(Jump[1],m_RecompPos);
 		}
-		Map_GPR_32bit(m_Opcode.rd,TRUE, -1);
+		Map_GPR_32bit(m_Opcode.rd, true, -1);
 		MoveVariableToX86reg(&m_BranchCompare,"m_BranchCompare",GetMipsRegMapLo(m_Opcode.rd));
 	}
 }
 
-void CRecompilerOps::SPECIAL_DADD (void) {
+void CRecompilerOps::SPECIAL_DADD() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)  && IsConst(m_Opcode.rs)) {
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsReg(m_Opcode.rd,
 			Is64Bit(m_Opcode.rs)?GetMipsReg(m_Opcode.rs):(__int64)GetMipsRegLo_S(m_Opcode.rs) +
 			Is64Bit(m_Opcode.rt)?GetMipsReg(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt)
@@ -3583,7 +3713,7 @@ void CRecompilerOps::SPECIAL_DADD (void) {
 			AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(source2));
 			AddConstToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegHi(source2));
 		} else if (IsMapped(source2)) {
-			x86Reg HiReg = Is64Bit(source2)?GetMipsRegMapHi(source2):Map_TempReg(x86_Any,source2,TRUE);
+			x86Reg HiReg = Is64Bit(source2) ? GetMipsRegMapHi(source2) : Map_TempReg(x86_Any, source2, true);
 			AddX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2));
 			AdcX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
 		} else {
@@ -3593,14 +3723,17 @@ void CRecompilerOps::SPECIAL_DADD (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_DADDU (void) {
+void CRecompilerOps::SPECIAL_DADDU() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)  && IsConst(m_Opcode.rs)) {
 		__int64 ValRs = Is64Bit(m_Opcode.rs)?GetMipsReg(m_Opcode.rs):(__int64)GetMipsRegLo_S(m_Opcode.rs);
 		__int64 ValRt = Is64Bit(m_Opcode.rt)?GetMipsReg(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt);
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsReg(m_Opcode.rd, ValRs + ValRt);
 		if ((GetMipsRegHi(m_Opcode.rd) == 0) && (GetMipsRegLo(m_Opcode.rd) & 0x80000000) == 0) {
 			m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
@@ -3619,7 +3752,7 @@ void CRecompilerOps::SPECIAL_DADDU (void) {
 			AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(source2));
 			AddConstToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegHi(source2));
 		} else if (IsMapped(source2)) {
-			x86Reg HiReg = Is64Bit(source2)?GetMipsRegMapHi(source2):Map_TempReg(x86_Any,source2,TRUE);
+			x86Reg HiReg = Is64Bit(source2) ? GetMipsRegMapHi(source2) : Map_TempReg(x86_Any, source2, true);
 			AddX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2));
 			AdcX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
 		} else {
@@ -3629,12 +3762,15 @@ void CRecompilerOps::SPECIAL_DADDU (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_DSUB (void) {
+void CRecompilerOps::SPECIAL_DSUB() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)  && IsConst(m_Opcode.rs)) {
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsReg(m_Opcode.rd,
 			Is64Bit(m_Opcode.rs)?GetMipsReg(m_Opcode.rs):(__int64)GetMipsRegLo_S(m_Opcode.rs) -
 			Is64Bit(m_Opcode.rt)?GetMipsReg(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt)
@@ -3648,8 +3784,8 @@ void CRecompilerOps::SPECIAL_DSUB (void) {
 		}
 	} else {
 		if (m_Opcode.rd == m_Opcode.rt) {
-			x86Reg HiReg = Map_TempReg(x86_Any,m_Opcode.rt,TRUE);
-			x86Reg LoReg = Map_TempReg(x86_Any,m_Opcode.rt,FALSE);
+			x86Reg HiReg = Map_TempReg(x86_Any, m_Opcode.rt, true);
+			x86Reg LoReg = Map_TempReg(x86_Any, m_Opcode.rt, false);
 			Map_GPR_64bit(m_Opcode.rd,m_Opcode.rs);
 			SubX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),LoReg);
 			SbbX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
@@ -3662,7 +3798,7 @@ void CRecompilerOps::SPECIAL_DSUB (void) {
 			SubConstFromX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(m_Opcode.rt));
 			SbbConstFromX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegHi(m_Opcode.rt));
 		} else if (IsMapped(m_Opcode.rt)) {
-			x86Reg HiReg = Is64Bit(m_Opcode.rt)?GetMipsRegMapHi(m_Opcode.rt):Map_TempReg(x86_Any,m_Opcode.rt,TRUE);
+			x86Reg HiReg = Is64Bit(m_Opcode.rt) ? GetMipsRegMapHi(m_Opcode.rt) : Map_TempReg(x86_Any, m_Opcode.rt, true);
 			SubX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(m_Opcode.rt));
 			SbbX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
 		} else {
@@ -3672,12 +3808,15 @@ void CRecompilerOps::SPECIAL_DSUB (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_DSUBU (void) {
+void CRecompilerOps::SPECIAL_DSUBU() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)  && IsConst(m_Opcode.rs)) {
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsReg(m_Opcode.rd, 
 			Is64Bit(m_Opcode.rs)?GetMipsReg(m_Opcode.rs):(__int64)GetMipsRegLo_S(m_Opcode.rs) -
 			Is64Bit(m_Opcode.rt)?GetMipsReg(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt)
@@ -3691,8 +3830,8 @@ void CRecompilerOps::SPECIAL_DSUBU (void) {
 		}
 	} else {
 		if (m_Opcode.rd == m_Opcode.rt) {
-			x86Reg HiReg = Map_TempReg(x86_Any,m_Opcode.rt,TRUE);
-			x86Reg LoReg = Map_TempReg(x86_Any,m_Opcode.rt,FALSE);
+			x86Reg HiReg = Map_TempReg(x86_Any, m_Opcode.rt, true);
+			x86Reg LoReg = Map_TempReg(x86_Any, m_Opcode.rt, false);
 			Map_GPR_64bit(m_Opcode.rd,m_Opcode.rs);
 			SubX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),LoReg);
 			SbbX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
@@ -3704,7 +3843,7 @@ void CRecompilerOps::SPECIAL_DSUBU (void) {
 			SubConstFromX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(m_Opcode.rt));
 			SbbConstFromX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegHi(m_Opcode.rt));
 		} else if (IsMapped(m_Opcode.rt)) {
-			x86Reg HiReg = Is64Bit(m_Opcode.rt)?GetMipsRegMapHi(m_Opcode.rt):Map_TempReg(x86_Any,m_Opcode.rt,TRUE);
+			x86Reg HiReg = Is64Bit(m_Opcode.rt) ? GetMipsRegMapHi(m_Opcode.rt) : Map_TempReg(x86_Any, m_Opcode.rt, true);
 			SubX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(m_Opcode.rt));
 			SbbX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
 		} else {
@@ -3714,14 +3853,16 @@ void CRecompilerOps::SPECIAL_DSUBU (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_DSLL (void) {
+void CRecompilerOps::SPECIAL_DSLL() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)) 
 	{
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
 
 		__int64 Value = Is64Bit(m_Opcode.rt)?GetMipsReg_S(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt);
 		m_RegWorkingSet.SetMipsReg(m_Opcode.rd, Value << m_Opcode.sa);
@@ -3737,16 +3878,18 @@ void CRecompilerOps::SPECIAL_DSLL (void) {
 	
 	Map_GPR_64bit(m_Opcode.rd,m_Opcode.rt);
 	ShiftLeftDoubleImmed(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegMapLo(m_Opcode.rd),(BYTE)m_Opcode.sa);
-	ShiftLeftSignImmed(	GetMipsRegMapLo(m_Opcode.rd),(BYTE)m_Opcode.sa);
+	ShiftLeftSignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)m_Opcode.sa);
 }
 
-void CRecompilerOps::SPECIAL_DSRL (void) {
+void CRecompilerOps::SPECIAL_DSRL() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)) {
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
 
 		__int64 Value = Is64Bit(m_Opcode.rt)?GetMipsReg_S(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt);
 		m_RegWorkingSet.SetMipsReg(m_Opcode.rd,Value >> m_Opcode.sa);
@@ -3764,13 +3907,15 @@ void CRecompilerOps::SPECIAL_DSRL (void) {
 	ShiftRightUnsignImmed(GetMipsRegMapHi(m_Opcode.rd),(BYTE)m_Opcode.sa);
 }
 
-void CRecompilerOps::SPECIAL_DSRA (void) {
+void CRecompilerOps::SPECIAL_DSRA() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
 
 	if (IsConst(m_Opcode.rt)) {
-		if (IsMapped(m_Opcode.rd)) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (IsMapped(m_Opcode.rd))
+			UnMap_GPR(m_Opcode.rd, false);
 
 		__int64 Value = Is64Bit(m_Opcode.rt)?GetMipsReg_S(m_Opcode.rt):(__int64)GetMipsRegLo_S(m_Opcode.rt);
 		m_RegWorkingSet.SetMipsReg_S(m_Opcode.rd, Value >> m_Opcode.sa);
@@ -3782,18 +3927,23 @@ void CRecompilerOps::SPECIAL_DSRA (void) {
 			m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_64);
 		}
 		return;
-	}	
+	}
+
 	Map_GPR_64bit(m_Opcode.rd,m_Opcode.rt);
 	ShiftRightDoubleImmed(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapHi(m_Opcode.rd),(BYTE)m_Opcode.sa);
 	ShiftRightSignImmed(GetMipsRegMapHi(m_Opcode.rd),(BYTE)m_Opcode.sa);
 }
 
-void CRecompilerOps::SPECIAL_DSLL32 (void) {
+void CRecompilerOps::SPECIAL_DSLL32() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
-	if (m_Opcode.rd == 0) { return; }
+	if (m_Opcode.rd == 0)
+		return;
+
 	if (IsConst(m_Opcode.rt)) {
-		if (m_Opcode.rt != m_Opcode.rd) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (m_Opcode.rt != m_Opcode.rd)
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsRegHi(m_Opcode.rd,GetMipsRegLo(m_Opcode.rt) << m_Opcode.sa);
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd,0);
 		if (GetMipsRegLo_S(m_Opcode.rd) < 0 && GetMipsRegHi_S(m_Opcode.rd) == -1){ 
@@ -3803,7 +3953,6 @@ void CRecompilerOps::SPECIAL_DSLL32 (void) {
 		} else {
 			m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_64);
 		}
-
 	} else if (IsMapped(m_Opcode.rt)) {
 		ProtectGPR(m_Opcode.rt);
 		Map_GPR_64bit(m_Opcode.rd,-1);		
@@ -3829,13 +3978,15 @@ void CRecompilerOps::SPECIAL_DSLL32 (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_DSRL32 (void) {
+void CRecompilerOps::SPECIAL_DSRL32() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	if (IsConst(m_Opcode.rt)) {
-		if (m_Opcode.rt != m_Opcode.rd) { UnMap_GPR(m_Opcode.rd, FALSE); }
-		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_ZERO);
-		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, (DWORD)(GetMipsReg(m_Opcode.rt) >> (m_Opcode.sa + 32)));
+		if (m_Opcode.rt != m_Opcode.rd)
+			UnMap_GPR(m_Opcode.rd, false);
+		
+		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd, CRegInfo::STATE_CONST_64);
+		m_RegWorkingSet.SetMipsReg(m_Opcode.rd, (DWORD)(GetMipsRegHi(m_Opcode.rt) >> m_Opcode.sa));
 	} else if (IsMapped(m_Opcode.rt)) {
 		ProtectGPR(m_Opcode.rt);
 		if (Is64Bit(m_Opcode.rt)) {
@@ -3844,9 +3995,9 @@ void CRecompilerOps::SPECIAL_DSRL32 (void) {
 				x86Reg HiReg = GetMipsRegMapHi(m_Opcode.rt);
 				m_RegWorkingSet.SetMipsRegMapHi(m_Opcode.rt,GetMipsRegMapLo(m_Opcode.rt));
 				m_RegWorkingSet.SetMipsRegMapLo(m_Opcode.rt,HiReg);
-				Map_GPR_32bit(m_Opcode.rd,FALSE,-1);
+				Map_GPR_32bit(m_Opcode.rd, false, -1);
 			} else {
-				Map_GPR_32bit(m_Opcode.rd,FALSE,-1);
+				Map_GPR_32bit(m_Opcode.rd, false, -1);
 				MoveX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rt),GetMipsRegMapLo(m_Opcode.rd));
 			}
 			if ((BYTE)m_Opcode.sa != 0) {
@@ -3856,7 +4007,7 @@ void CRecompilerOps::SPECIAL_DSRL32 (void) {
 			CRecompilerOps::UnknownOpcode();
 		}
 	} else {
-		Map_GPR_32bit(m_Opcode.rd,FALSE,-1);
+		Map_GPR_32bit(m_Opcode.rd, false, -1);
 		MoveVariableToX86reg(&_GPR[m_Opcode.rt].UW[1],CRegName::GPR_Hi[m_Opcode.rt],GetMipsRegMapLo(m_Opcode.rd));
 		if ((BYTE)m_Opcode.sa != 0) {
 			ShiftRightUnsignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)m_Opcode.sa);
@@ -3864,11 +4015,13 @@ void CRecompilerOps::SPECIAL_DSRL32 (void) {
 	}
 }
 
-void CRecompilerOps::SPECIAL_DSRA32 (void) {
+void CRecompilerOps::SPECIAL_DSRA32() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	if (IsConst(m_Opcode.rt)) {
-		if (m_Opcode.rt != m_Opcode.rd) { UnMap_GPR(m_Opcode.rd, FALSE); }
+		if (m_Opcode.rt != m_Opcode.rd)
+			UnMap_GPR(m_Opcode.rd, false);
+
 		m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_SIGN);
 		m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd,(DWORD)(GetMipsReg_S(m_Opcode.rt) >> (m_Opcode.sa + 32)));
 	} else if (IsMapped(m_Opcode.rt)) {
@@ -3879,9 +4032,9 @@ void CRecompilerOps::SPECIAL_DSRA32 (void) {
 				x86Reg HiReg = GetMipsRegMapHi(m_Opcode.rt);
 				m_RegWorkingSet.SetMipsRegMapHi(m_Opcode.rt,GetMipsRegMapLo(m_Opcode.rt));
 				m_RegWorkingSet.SetMipsRegMapLo(m_Opcode.rt,HiReg);
-				Map_GPR_32bit(m_Opcode.rd,TRUE,-1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 			} else {
-				Map_GPR_32bit(m_Opcode.rd,TRUE,-1);
+				Map_GPR_32bit(m_Opcode.rd, true, -1);
 				MoveX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rt),GetMipsRegMapLo(m_Opcode.rd));
 			}
 			if ((BYTE)m_Opcode.sa != 0) {
@@ -3891,7 +4044,7 @@ void CRecompilerOps::SPECIAL_DSRA32 (void) {
 			CRecompilerOps::UnknownOpcode();
 		}
 	} else {
-		Map_GPR_32bit(m_Opcode.rd,TRUE,-1);
+		Map_GPR_32bit(m_Opcode.rd, true, -1);
 		MoveVariableToX86reg(&_GPR[m_Opcode.rt].UW[1],CRegName::GPR_Lo[m_Opcode.rt],GetMipsRegMapLo(m_Opcode.rd));
 		if ((BYTE)m_Opcode.sa != 0) {
 			ShiftRightSignImmed(GetMipsRegMapLo(m_Opcode.rd),(BYTE)m_Opcode.sa);
@@ -3900,24 +4053,24 @@ void CRecompilerOps::SPECIAL_DSRA32 (void) {
 }
 
 /************************** COP0 functions **************************/
-void CRecompilerOps::COP0_MF(void) {
+void CRecompilerOps::COP0_MF() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	switch (m_Opcode.rd) {
 	case 9: //Count
-		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp()) ;
+		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
 		UpdateCounters(m_RegWorkingSet,false, true);
-		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp()) ;
+		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
 		BeforeCallDirect(m_RegWorkingSet);
-		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);		
+		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);
 		Call_Direct(AddressOf(&CSystemTimer::UpdateTimers), "CSystemTimer::UpdateTimers");
 		AfterCallDirect(m_RegWorkingSet);
 	}
-	Map_GPR_32bit(m_Opcode.rt,TRUE,-1);
+	Map_GPR_32bit(m_Opcode.rt, true, -1);
 	MoveVariableToX86reg(&_CP0[m_Opcode.rd],CRegName::Cop0[m_Opcode.rd],GetMipsRegMapLo(m_Opcode.rt));
 }
 
-void CRecompilerOps::COP0_MT (void) {
+void CRecompilerOps::COP0_MT() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	BYTE *Jump;
@@ -3941,7 +4094,7 @@ void CRecompilerOps::COP0_MT (void) {
 		} else if (IsMapped(m_Opcode.rt)) {
 			MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rt), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 		} else {
-			MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rt,FALSE), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
+			MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rt, false), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 		}
 		if (m_Opcode.rd == 4) //Context
 		{
@@ -3953,7 +4106,7 @@ void CRecompilerOps::COP0_MT (void) {
 		UpdateCounters(m_RegWorkingSet,false, true);
 		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp()) ;
 		BeforeCallDirect(m_RegWorkingSet);
-		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);		
+		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);
 		Call_Direct(AddressOf(&CSystemTimer::UpdateTimers), "CSystemTimer::UpdateTimers");
 		AfterCallDirect(m_RegWorkingSet);
 		if (IsConst(m_Opcode.rt)) {
@@ -3961,11 +4114,11 @@ void CRecompilerOps::COP0_MT (void) {
 		} else if (IsMapped(m_Opcode.rt)) {
 			MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rt), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 		} else {
-			MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rt,FALSE), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
+			MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rt, false), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 		}
 		AndConstToVariable((DWORD)~CAUSE_IP7,&g_Reg->FAKE_CAUSE_REGISTER,"FAKE_CAUSE_REGISTER");
 		BeforeCallDirect(m_RegWorkingSet);
-		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);		
+		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);
 		Call_Direct(AddressOf(&CSystemTimer::UpdateCompareTimer), "CSystemTimer::UpdateCompareTimer");
 		AfterCallDirect(m_RegWorkingSet);
 		break;
@@ -3974,7 +4127,7 @@ void CRecompilerOps::COP0_MT (void) {
 		UpdateCounters(m_RegWorkingSet,false, true);
 		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp()) ;
 		BeforeCallDirect(m_RegWorkingSet);
-		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);		
+		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);
 		Call_Direct(AddressOf(&CSystemTimer::UpdateTimers), "CSystemTimer::UpdateTimers");
 		AfterCallDirect(m_RegWorkingSet);
 		if (IsConst(m_Opcode.rt)) {
@@ -3982,23 +4135,23 @@ void CRecompilerOps::COP0_MT (void) {
 		} else if (IsMapped(m_Opcode.rt)) {
 			MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rt), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 		} else {
-			MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rt,FALSE), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
+			MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rt, false), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 		}
 		BeforeCallDirect(m_RegWorkingSet);
-		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);		
+		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);
 		Call_Direct(AddressOf(&CSystemTimer::UpdateCompareTimer), "CSystemTimer::UpdateCompareTimer");
 		AfterCallDirect(m_RegWorkingSet);
 		break;
 	case 12: //Status
 		{
-			x86Reg OldStatusReg = Map_TempReg(x86_Any,-1,FALSE);
+			x86Reg OldStatusReg = Map_TempReg(x86_Any, -1, false);
 			MoveVariableToX86reg(&_CP0[m_Opcode.rd],CRegName::Cop0[m_Opcode.rd],OldStatusReg);
 			if (IsConst(m_Opcode.rt)) {
 				MoveConstToVariable(GetMipsRegLo(m_Opcode.rt), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 			} else if (IsMapped(m_Opcode.rt)) {
 				MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rt), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 			} else {
-				MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rt,FALSE), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
+				MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rt, false), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 			}
 			XorVariableToX86reg(&_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd],OldStatusReg);
 			TestConstToX86Reg(STATUS_FR,OldStatusReg);
@@ -4006,13 +4159,13 @@ void CRecompilerOps::COP0_MT (void) {
 			Jump = m_RecompPos - 1;
 			BeforeCallDirect(m_RegWorkingSet);
 			MoveConstToX86reg((DWORD)g_Reg,x86_ECX); 
-            Call_Direct(AddressOf(&CRegisters::FixFpuLocations),"CRegisters::FixFpuLocations");
+			Call_Direct(AddressOf(&CRegisters::FixFpuLocations),"CRegisters::FixFpuLocations");
 
 			AfterCallDirect(m_RegWorkingSet);
-			SetJump8(Jump,m_RecompPos);		
-			
+			SetJump8(Jump,m_RecompPos);
+
 			//TestConstToX86Reg(STATUS_FR,OldStatusReg);
-			//BreakPoint(__FILEW__,__LINE__); //m_Section->CompileExit(m_CompilePC+4,m_RegWorkingSet,ExitResetRecompCode,FALSE,JneLabel32);
+			//BreakPoint(__FILEW__,__LINE__); //m_Section->CompileExit(m_CompilePC+4,m_RegWorkingSet,ExitResetRecompCode,false,JneLabel32);
 			BeforeCallDirect(m_RegWorkingSet);
 			MoveConstToX86reg((DWORD)g_Reg,x86_ECX);
 			Call_Direct(AddressOf(&CRegisters::CheckInterrupts),"CRegisters::CheckInterrupts");
@@ -4020,12 +4173,12 @@ void CRecompilerOps::COP0_MT (void) {
 		}
 		break;
 	case 6: //Wired
-		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp()) ;
+		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
 		UpdateCounters(m_RegWorkingSet,false, true);
-		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp()) ;
+		m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
 
 		BeforeCallDirect(m_RegWorkingSet);
-		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);		
+		MoveConstToX86reg((DWORD)g_SystemTimer,x86_ECX);
 		Call_Direct(AddressOf(&CSystemTimer::UpdateTimers), "CSystemTimer::UpdateTimers");
 		AfterCallDirect(m_RegWorkingSet);
 		if (IsConst(m_Opcode.rt)) {
@@ -4033,7 +4186,7 @@ void CRecompilerOps::COP0_MT (void) {
 		} else if (IsMapped(m_Opcode.rt)) {
 			MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rt), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 		} else {
-			MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rt,FALSE), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
+			MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rt, false), &_CP0[m_Opcode.rd], CRegName::Cop0[m_Opcode.rd]);
 		}
 		break;
 	case 13: //cause
@@ -4068,7 +4221,7 @@ void CRecompilerOps::COP0_CO_TLBWI( void) {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	if (!g_System->bUseTlb()) {	return; }
 	BeforeCallDirect(m_RegWorkingSet);
-	PushImm32("FALSE",FALSE);
+	PushImm32("FALSE", 0);
 	MoveVariableToX86reg(&g_Reg->INDEX_REGISTER,"INDEX_REGISTER",x86_ECX);
 	AndConstToX86Reg(x86_ECX,0x1F);
 	Push(x86_ECX);
@@ -4107,7 +4260,7 @@ void CRecompilerOps::COP0_CO_TLBP( void) {
 	AfterCallDirect(m_RegWorkingSet);
 }
 
-void compiler_COP0_CO_ERET (void) {
+void compiler_COP0_CO_ERET() {
 	if ((g_Reg->STATUS_REGISTER & STATUS_ERL) != 0) {
 		g_Reg->m_PROGRAM_COUNTER = g_Reg->ERROREPC_REGISTER;
 		g_Reg->STATUS_REGISTER &= ~STATUS_ERL;
@@ -4126,12 +4279,12 @@ void CRecompilerOps::COP0_CO_ERET( void) {
 	Call_Direct(compiler_COP0_CO_ERET,"compiler_COP0_CO_ERET");
 
 	UpdateCounters(m_RegWorkingSet,true,true);
-	m_Section->CompileExit(m_CompilePC, (DWORD)-1,m_RegWorkingSet,CExitInfo::Normal,TRUE,NULL);
+	m_Section->CompileExit(m_CompilePC, (DWORD)-1, m_RegWorkingSet, CExitInfo::Normal, true, NULL);
 	m_NextInstruction = END_BLOCK;
 }
 
 /************************** FPU Options **************************/
-void CRecompilerOps::ChangeDefaultRoundingModel (void) {
+void CRecompilerOps::ChangeDefaultRoundingModel() {
 	switch((_FPCR[31] & 3)) {
 	case 0: *_RoundingModel = ROUND_NEAR; break;
 	case 1: *_RoundingModel = ROUND_CHOP; break;
@@ -4141,51 +4294,56 @@ void CRecompilerOps::ChangeDefaultRoundingModel (void) {
 }
 
 /************************** COP1 functions **************************/
-void CRecompilerOps::COP1_MF (void) {
+void CRecompilerOps::COP1_MF() {
 	x86Reg TempReg;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	m_Section->CompileCop1Test();
 
-	UnMap_FPR(m_Opcode.fs,TRUE);
-	Map_GPR_32bit(m_Opcode.rt, TRUE, -1);
-	TempReg = Map_TempReg(x86_Any,-1,FALSE);
+	UnMap_FPR(m_Opcode.fs, true);
+	Map_GPR_32bit(m_Opcode.rt, true, -1);
+	TempReg = Map_TempReg(x86_Any, -1, false);
 	char Name[100];
 	sprintf(Name,"_FPR_S[%d]",m_Opcode.fs);
 	MoveVariableToX86reg((BYTE *)&_FPR_S[m_Opcode.fs],Name,TempReg);
-	MoveX86PointerToX86reg(GetMipsRegMapLo(m_Opcode.rt),TempReg);		
+	MoveX86PointerToX86reg(GetMipsRegMapLo(m_Opcode.rt),TempReg);
 }
 
-void CRecompilerOps::COP1_DMF (void) {
+void CRecompilerOps::COP1_DMF() {
 	x86Reg TempReg;
 	char Name[50];
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	m_Section->CompileCop1Test();
 
-	UnMap_FPR(m_Opcode.fs,TRUE);
+	UnMap_FPR(m_Opcode.fs, true);
 	Map_GPR_64bit(m_Opcode.rt, -1);
-	TempReg = Map_TempReg(x86_Any,-1,FALSE);
+	TempReg = Map_TempReg(x86_Any, -1, false);
 	sprintf(Name,"_FPR_D[%d]",m_Opcode.fs);
 	MoveVariableToX86reg((BYTE *)&_FPR_D[m_Opcode.fs],Name,TempReg);
 	AddConstToX86Reg(TempReg,4);
-	MoveX86PointerToX86reg(GetMipsRegMapHi(m_Opcode.rt),TempReg);		
+	MoveX86PointerToX86reg(GetMipsRegMapHi(m_Opcode.rt),TempReg);
 	sprintf(Name,"_FPR_D[%d]",m_Opcode.fs);
 	MoveVariableToX86reg((BYTE *)&_FPR_D[m_Opcode.fs],Name,TempReg);
-	MoveX86PointerToX86reg(GetMipsRegMapLo(m_Opcode.rt),TempReg);		
+	MoveX86PointerToX86reg(GetMipsRegMapLo(m_Opcode.rt),TempReg);
 }
 
-void CRecompilerOps::COP1_CF(void) {
+void CRecompilerOps::COP1_CF() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	m_Section->CompileCop1Test();
 	
-	if (m_Opcode.fs != 31 && m_Opcode.fs != 0) { UnknownOpcode(); return; }
-	Map_GPR_32bit(m_Opcode.rt,TRUE,-1);
+	if (m_Opcode.fs != 31 && m_Opcode.fs != 0)
+	{
+		UnknownOpcode();
+		return;
+	}
+
+	Map_GPR_32bit(m_Opcode.rt, true, -1);
 	MoveVariableToX86reg(&_FPCR[m_Opcode.fs],CRegName::FPR_Ctrl[m_Opcode.fs],GetMipsRegMapLo(m_Opcode.rt));
 }
 
-void CRecompilerOps::COP1_MT( void) {	
+void CRecompilerOps::COP1_MT() {
 	x86Reg TempReg;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
@@ -4193,11 +4351,11 @@ void CRecompilerOps::COP1_MT( void) {
 	
 	if ((m_Opcode.fs & 1) != 0) {
 		if (RegInStack(m_Opcode.fs-1,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fs-1,CRegInfo::FPU_Qword)) {
-			UnMap_FPR(m_Opcode.fs-1,TRUE);
+			UnMap_FPR(m_Opcode.fs - 1, true);
 		}
 	}
-	UnMap_FPR(m_Opcode.fs,TRUE);
-	TempReg = Map_TempReg(x86_Any,-1,FALSE);
+	UnMap_FPR(m_Opcode.fs, true);
+	TempReg = Map_TempReg(x86_Any, -1, false);
 	char Name[50];
 	sprintf(Name,"_FPR_S[%d]",m_Opcode.fs);
 	MoveVariableToX86reg((BYTE *)&_FPR_S[m_Opcode.fs],Name,TempReg);
@@ -4207,11 +4365,11 @@ void CRecompilerOps::COP1_MT( void) {
 	} else if (IsMapped(m_Opcode.rt)) {
 		MoveX86regToX86Pointer(GetMipsRegMapLo(m_Opcode.rt),TempReg);
 	} else {
-		MoveX86regToX86Pointer(Map_TempReg(x86_Any, m_Opcode.rt, FALSE),TempReg);
+		MoveX86regToX86Pointer(Map_TempReg(x86_Any, m_Opcode.rt, false), TempReg);
 	}
 }
 
-void CRecompilerOps::COP1_DMT( void) {
+void CRecompilerOps::COP1_DMT() {
 	x86Reg TempReg;
 
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
@@ -4219,11 +4377,11 @@ void CRecompilerOps::COP1_DMT( void) {
 	
 	if ((m_Opcode.fs & 1) == 0) {
 		if (RegInStack(m_Opcode.fs+1,CRegInfo::FPU_Float) || RegInStack(m_Opcode.fs+1,CRegInfo::FPU_Dword)) {
-			UnMap_FPR(m_Opcode.fs+1,TRUE);
+			UnMap_FPR(m_Opcode.fs+1, true);
 		}
 	}
-	UnMap_FPR(m_Opcode.fs,TRUE);
-	TempReg = Map_TempReg(x86_Any,-1,FALSE);
+	UnMap_FPR(m_Opcode.fs, true);
+	TempReg = Map_TempReg(x86_Any, -1, false);
 	char Name[50];
 	sprintf(Name,"_FPR_D[%d]",m_Opcode.fs);
 	MoveVariableToX86reg((BYTE *)&_FPR_D[m_Opcode.fs],Name,TempReg);
@@ -4242,28 +4400,32 @@ void CRecompilerOps::COP1_DMT( void) {
 		if (Is64Bit(m_Opcode.rt)) {
 			MoveX86regToX86Pointer(GetMipsRegMapHi(m_Opcode.rt),TempReg);
 		} else {
-			MoveX86regToX86Pointer(Map_TempReg(x86_Any, m_Opcode.rt, TRUE),TempReg);
+			MoveX86regToX86Pointer(Map_TempReg(x86_Any, m_Opcode.rt, true), TempReg);
 		}
 	} else {
-		x86Reg Reg= Map_TempReg(x86_Any, m_Opcode.rt, FALSE);
+		x86Reg Reg = Map_TempReg(x86_Any, m_Opcode.rt, false);
 		MoveX86regToX86Pointer(Reg,TempReg);
 		AddConstToX86Reg(TempReg,4);
-		MoveX86regToX86Pointer(Map_TempReg(Reg, m_Opcode.rt, TRUE),TempReg);
+		MoveX86regToX86Pointer(Map_TempReg(Reg, m_Opcode.rt, true), TempReg);
 	}
 }
 
 
-void CRecompilerOps::COP1_CT(void) {
+void CRecompilerOps::COP1_CT() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	m_Section->CompileCop1Test();
-	if (m_Opcode.fs != 31) { UnknownOpcode(); return; }
+
+	if (m_Opcode.fs != 31) {
+		UnknownOpcode();
+		return;
+	}
 
 	if (IsConst(m_Opcode.rt)) {
 		MoveConstToVariable(GetMipsRegLo(m_Opcode.rt),&_FPCR[m_Opcode.fs],CRegName::FPR_Ctrl[m_Opcode.fs]);
 	} else if (IsMapped(m_Opcode.rt)) {
 		MoveX86regToVariable(GetMipsRegMapLo(m_Opcode.rt),&_FPCR[m_Opcode.fs],CRegName::FPR_Ctrl[m_Opcode.fs]);
 	} else {
-		MoveX86regToVariable(Map_TempReg(x86_Any,m_Opcode.rt,FALSE),&_FPCR[m_Opcode.fs],CRegName::FPR_Ctrl[m_Opcode.fs]);		
+		MoveX86regToVariable(Map_TempReg(x86_Any, m_Opcode.rt, false), &_FPCR[m_Opcode.fs], CRegName::FPR_Ctrl[m_Opcode.fs]);
 	}
 	BeforeCallDirect(m_RegWorkingSet);
 	Call_Direct(ChangeDefaultRoundingModel, "ChangeDefaultRoundingModel");
@@ -4272,13 +4434,13 @@ void CRecompilerOps::COP1_CT(void) {
 }
 
 /************************** COP1: S functions ************************/
-void CRecompilerOps::COP1_S_ADD (void) {
+void CRecompilerOps::COP1_S_ADD() {
 	DWORD Reg1 = m_Opcode.ft == m_Opcode.fd?m_Opcode.ft:m_Opcode.fs;
 	DWORD Reg2 = m_Opcode.ft == m_Opcode.fd?m_Opcode.fs:m_Opcode.ft;
 	
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	FixRoundModel(CRegInfo::RoundDefault);
 
 	Load_FPR_ToTop(m_Opcode.fd,Reg1, CRegInfo::FPU_Float);
@@ -4287,33 +4449,33 @@ void CRecompilerOps::COP1_S_ADD (void) {
 	} else {
 		x86Reg TempReg;
 
-		UnMap_FPR(Reg2,TRUE);
-		TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		UnMap_FPR(Reg2, true);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		char Name[50];
 		sprintf(Name,"_FPR_S[%d]",Reg2);
 		MoveVariableToX86reg((BYTE *)&_FPR_S[Reg2],Name,TempReg);
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fd, CRegInfo::FPU_Float);
 		fpuAddDwordRegPointer(TempReg);
 	}
-	UnMap_FPR(m_Opcode.fd,TRUE);
+	UnMap_FPR(m_Opcode.fd, true);
 }
 
-void CRecompilerOps::COP1_S_SUB (void) {
+void CRecompilerOps::COP1_S_SUB() {
 	DWORD Reg1 = m_Opcode.ft == m_Opcode.fd?m_Opcode.ft:m_Opcode.fs;
 	DWORD Reg2 = m_Opcode.ft == m_Opcode.fd?m_Opcode.fs:m_Opcode.ft;
 	x86Reg TempReg;
-	char Name[50];		
+	char Name[50];
 	
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	FixRoundModel(CRegInfo::RoundDefault);
 
 	if (m_Opcode.fd == m_Opcode.ft) {
-		UnMap_FPR(m_Opcode.fd,TRUE);
+		UnMap_FPR(m_Opcode.fd, true);
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Float);
 
-		TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_S[%d]",m_Opcode.ft);
 		MoveVariableToX86reg((BYTE *)&_FPR_S[m_Opcode.ft],Name,TempReg);
 		fpuSubDwordRegPointer(TempReg);
@@ -4322,19 +4484,19 @@ void CRecompilerOps::COP1_S_SUB (void) {
 		if (RegInStack(Reg2, CRegInfo::FPU_Float)) {
 			fpuSubReg(StackPosition(Reg2));
 		} else {
-			UnMap_FPR(Reg2,TRUE);
+			UnMap_FPR(Reg2, true);
 			Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fd, CRegInfo::FPU_Float);
 
-			TempReg = Map_TempReg(x86_Any,-1,FALSE);
+			TempReg = Map_TempReg(x86_Any, -1, false);
 			sprintf(Name,"_FPR_S[%d]",Reg2);
 			MoveVariableToX86reg((BYTE *)&_FPR_S[Reg2],Name,TempReg);
-			fpuSubDwordRegPointer(TempReg);			
+			fpuSubDwordRegPointer(TempReg);
 		}
 	}
-	UnMap_FPR(m_Opcode.fd,TRUE);
+	UnMap_FPR(m_Opcode.fd, true);
 }
 
-void CRecompilerOps::COP1_S_MUL (void) {
+void CRecompilerOps::COP1_S_MUL() {
 	DWORD Reg1 = m_Opcode.ft == m_Opcode.fd?m_Opcode.ft:m_Opcode.fs;
 	DWORD Reg2 = m_Opcode.ft == m_Opcode.fd?m_Opcode.fs:m_Opcode.ft;
 	x86Reg TempReg;
@@ -4348,19 +4510,19 @@ void CRecompilerOps::COP1_S_MUL (void) {
 	if (RegInStack(Reg2, CRegInfo::FPU_Float)) {
 		fpuMulReg(StackPosition(Reg2));
 	} else {
-		UnMap_FPR(Reg2,TRUE);
+		UnMap_FPR(Reg2, true);
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fd, CRegInfo::FPU_Float);
 
-		TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		char Name[50];
 		sprintf(Name,"_FPR_S[%d]",Reg2);
 		MoveVariableToX86reg((BYTE *)&_FPR_S[Reg2],Name,TempReg);
-		fpuMulDwordRegPointer(TempReg);			
+		fpuMulDwordRegPointer(TempReg);
 	}
-	UnMap_FPR(m_Opcode.fd,TRUE);
+	UnMap_FPR(m_Opcode.fd, true);
 }
 
-void CRecompilerOps::COP1_S_DIV (void) {
+void CRecompilerOps::COP1_S_DIV() {
 	DWORD Reg1 = m_Opcode.ft == m_Opcode.fd?m_Opcode.ft:m_Opcode.fs;
 	DWORD Reg2 = m_Opcode.ft == m_Opcode.fd?m_Opcode.fs:m_Opcode.ft;
 	x86Reg TempReg;
@@ -4372,10 +4534,10 @@ void CRecompilerOps::COP1_S_DIV (void) {
 	FixRoundModel(CRegInfo::RoundDefault);
 
 	if (m_Opcode.fd == m_Opcode.ft) {
-		UnMap_FPR(m_Opcode.fd,TRUE);
+		UnMap_FPR(m_Opcode.fd, true);
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Float);
 
-		TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_S[%d]",m_Opcode.ft);
 		MoveVariableToX86reg((BYTE *)&_FPR_S[m_Opcode.ft],Name,TempReg);
 		fpuDivDwordRegPointer(TempReg);
@@ -4384,64 +4546,64 @@ void CRecompilerOps::COP1_S_DIV (void) {
 		if (RegInStack(Reg2, CRegInfo::FPU_Float)) {
 			fpuDivReg(StackPosition(Reg2));
 		} else {
-			UnMap_FPR(Reg2,TRUE);
+			UnMap_FPR(Reg2, true);
 			Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fd, CRegInfo::FPU_Float);
 
-			TempReg = Map_TempReg(x86_Any,-1,FALSE);
+			TempReg = Map_TempReg(x86_Any, -1, false);
 			sprintf(Name,"_FPR_S[%d]",Reg2);
 			MoveVariableToX86reg((BYTE *)&_FPR_S[Reg2],Name,TempReg);
-			fpuDivDwordRegPointer(TempReg);			
+			fpuDivDwordRegPointer(TempReg);
 		}
 	}
 
-	UnMap_FPR(m_Opcode.fd,TRUE);
+	UnMap_FPR(m_Opcode.fd, true);
 }
 
-void CRecompilerOps::COP1_S_ABS (void) {
+void CRecompilerOps::COP1_S_ABS() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	FixRoundModel(CRegInfo::RoundDefault);
 	Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Float);
 	fpuAbs();
-	UnMap_FPR(m_Opcode.fd,TRUE);
+	UnMap_FPR(m_Opcode.fd, true);
 }
 
-void CRecompilerOps::COP1_S_NEG (void) {
+void CRecompilerOps::COP1_S_NEG() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	FixRoundModel(CRegInfo::RoundDefault);
 	Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Float);
 	fpuNeg();
-	UnMap_FPR(m_Opcode.fd,TRUE);
+	UnMap_FPR(m_Opcode.fd, true);
 }
 
-void CRecompilerOps::COP1_S_SQRT (void) {
+void CRecompilerOps::COP1_S_SQRT() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	FixRoundModel(CRegInfo::RoundDefault);
 	Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Float);
 	fpuSqrt();
-	UnMap_FPR(m_Opcode.fd,TRUE);
+	UnMap_FPR(m_Opcode.fd, true);
 }
 
-void CRecompilerOps::COP1_S_MOV (void) {
+void CRecompilerOps::COP1_S_MOV() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	FixRoundModel(CRegInfo::RoundDefault);
 	Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Float);
 }
 
-void CRecompilerOps::COP1_S_TRUNC_L (void) {
+void CRecompilerOps::COP1_S_TRUNC_L() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Float)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Float); 
 	}
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Qword,CRegInfo::RoundTruncate);
 }
 
-void CRecompilerOps::COP1_S_CEIL_L (void) {			//added by Witten
+void CRecompilerOps::COP1_S_CEIL_L() {			//added by Witten
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4451,7 +4613,7 @@ void CRecompilerOps::COP1_S_CEIL_L (void) {			//added by Witten
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Qword,CRegInfo::RoundUp);
 }
 
-void CRecompilerOps::COP1_S_FLOOR_L (void) {			//added by Witten
+void CRecompilerOps::COP1_S_FLOOR_L() {			//added by Witten
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4461,7 +4623,7 @@ void CRecompilerOps::COP1_S_FLOOR_L (void) {			//added by Witten
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Qword,CRegInfo::RoundDown);
 }
 
-void CRecompilerOps::COP1_S_ROUND_W (void) 
+void CRecompilerOps::COP1_S_ROUND_W() 
 {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
@@ -4472,7 +4634,7 @@ void CRecompilerOps::COP1_S_ROUND_W (void)
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Dword,CRegInfo::RoundNearest);
 }
 
-void CRecompilerOps::COP1_S_TRUNC_W (void) {
+void CRecompilerOps::COP1_S_TRUNC_W() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4482,7 +4644,7 @@ void CRecompilerOps::COP1_S_TRUNC_W (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Dword,CRegInfo::RoundTruncate);
 }
 
-void CRecompilerOps::COP1_S_CEIL_W (void) {			// added by Witten
+void CRecompilerOps::COP1_S_CEIL_W() {			// added by Witten
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4492,7 +4654,7 @@ void CRecompilerOps::COP1_S_CEIL_W (void) {			// added by Witten
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Dword,CRegInfo::RoundUp);
 }
 
-void CRecompilerOps::COP1_S_FLOOR_W (void) {
+void CRecompilerOps::COP1_S_FLOOR_W() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4502,7 +4664,7 @@ void CRecompilerOps::COP1_S_FLOOR_W (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Dword,CRegInfo::RoundDown);
 }
 
-void CRecompilerOps::COP1_S_CVT_D (void) 
+void CRecompilerOps::COP1_S_CVT_D() 
 {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
@@ -4513,7 +4675,7 @@ void CRecompilerOps::COP1_S_CVT_D (void)
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Double,CRegInfo::RoundDefault);
 }
 
-void CRecompilerOps::COP1_S_CVT_W (void) {
+void CRecompilerOps::COP1_S_CVT_W() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4523,7 +4685,7 @@ void CRecompilerOps::COP1_S_CVT_W (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Dword,CRegInfo::RoundDefault);
 }
 
-void CRecompilerOps::COP1_S_CVT_L (void) {
+void CRecompilerOps::COP1_S_CVT_L() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4533,7 +4695,7 @@ void CRecompilerOps::COP1_S_CVT_L (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Float,CRegInfo::FPU_Qword,CRegInfo::RoundDefault);
 }
 
-void CRecompilerOps::COP1_S_CMP (void) {
+void CRecompilerOps::COP1_S_CMP() {
 	DWORD Reg1 = m_Opcode.fs; 
 	DWORD Reg2 = m_Opcode.ft;
 	DWORD cmp = 0;
@@ -4546,37 +4708,37 @@ void CRecompilerOps::COP1_S_CMP (void) {
 	
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if ((m_Opcode.funct & 7) == 0) { CRecompilerOps::UnknownOpcode(); }
 	if ((m_Opcode.funct & 2) != 0) { cmp |= 0x4000; }
 	if ((m_Opcode.funct & 4) != 0) { cmp |= 0x0100; }
 	
 	Load_FPR_ToTop(Reg1,Reg1, CRegInfo::FPU_Float);
-	Map_TempReg(x86_EAX, 0, FALSE);
+	Map_TempReg(x86_EAX, 0, false);
 	if (RegInStack(Reg2, CRegInfo::FPU_Float)) {
-		fpuComReg(StackPosition(Reg2),FALSE);
+		fpuComReg(StackPosition(Reg2), false);
 	} else {
-		UnMap_FPR(Reg2,TRUE);
+		UnMap_FPR(Reg2, true);
 		Load_FPR_ToTop(Reg1,Reg1, CRegInfo::FPU_Float);
 
-		x86Reg TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		x86Reg TempReg = Map_TempReg(x86_Any, -1, false);
 		char Name[50];
 		sprintf(Name,"_FPR_S[%d]",Reg2);
 		MoveVariableToX86reg((BYTE *)&_FPR_S[Reg2],Name,TempReg);
-		fpuComDwordRegPointer(TempReg,FALSE);
+		fpuComDwordRegPointer(TempReg, false);
 	}
 	AndConstToVariable((DWORD)~FPCSR_C, &_FPCR[31], "_FPCR[31]");
 	fpuStoreStatus();
-	x86Reg Reg = Map_TempReg(x86_Any8Bit, 0, FALSE);
-	TestConstToX86Reg(cmp,x86_EAX);	
+	x86Reg Reg = Map_TempReg(x86_Any8Bit, 0, false);
+	TestConstToX86Reg(cmp,x86_EAX);
 	Setnz(Reg);
 	
 	if (cmp != 0) {
-		TestConstToX86Reg(cmp,x86_EAX);	
+		TestConstToX86Reg(cmp,x86_EAX);
 		Setnz(Reg);
 		
 		if ((m_Opcode.funct & 1) != 0) {
-			x86Reg Reg2 = Map_TempReg(x86_Any8Bit, 0, FALSE);
+			x86Reg Reg2 = Map_TempReg(x86_Any8Bit, 0, false);
 			AndConstToX86Reg(x86_EAX, 0x4300);
 			CompConstToX86reg(x86_EAX, 0x4300);
 			Setz(Reg2);
@@ -4593,14 +4755,14 @@ void CRecompilerOps::COP1_S_CMP (void) {
 }
 
 /************************** COP1: D functions ************************/
-void CRecompilerOps::COP1_D_ADD (void) {
+void CRecompilerOps::COP1_D_ADD() {
 	DWORD Reg1 = m_Opcode.ft == m_Opcode.fd?m_Opcode.ft:m_Opcode.fs;
 	DWORD Reg2 = m_Opcode.ft == m_Opcode.fd?m_Opcode.fs:m_Opcode.ft;
 	char Name[50];
 	
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 
 	Load_FPR_ToTop(m_Opcode.fd,Reg1, CRegInfo::FPU_Double);
 	if (RegInStack(Reg2, CRegInfo::FPU_Double)) {
@@ -4608,16 +4770,16 @@ void CRecompilerOps::COP1_D_ADD (void) {
 	} else {
 		x86Reg TempReg;
 
-		UnMap_FPR(Reg2,TRUE);
-		TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		UnMap_FPR(Reg2, true);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_D[%d]",Reg2);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[Reg2],Name,TempReg);
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fd, CRegInfo::FPU_Double);
-		fpuAddQwordRegPointer(TempReg);	
+		fpuAddQwordRegPointer(TempReg);
 	}
 }
 
-void CRecompilerOps::COP1_D_SUB (void) {
+void CRecompilerOps::COP1_D_SUB() {
 	DWORD Reg1 = m_Opcode.ft == m_Opcode.fd?m_Opcode.ft:m_Opcode.fs;
 	DWORD Reg2 = m_Opcode.ft == m_Opcode.fd?m_Opcode.fs:m_Opcode.ft;
 	x86Reg TempReg;
@@ -4625,11 +4787,11 @@ void CRecompilerOps::COP1_D_SUB (void) {
 	
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 
 	if (m_Opcode.fd == m_Opcode.ft) {
-		UnMap_FPR(m_Opcode.fd,TRUE);
-		TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		UnMap_FPR(m_Opcode.fd, true);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_D[%d]",m_Opcode.ft);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[m_Opcode.ft],Name,TempReg);
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double);
@@ -4639,9 +4801,9 @@ void CRecompilerOps::COP1_D_SUB (void) {
 		if (RegInStack(Reg2, CRegInfo::FPU_Double)) {
 			fpuSubReg(StackPosition(Reg2));
 		} else {
-			UnMap_FPR(Reg2,TRUE);
+			UnMap_FPR(Reg2, true);
 
-			TempReg = Map_TempReg(x86_Any,-1,FALSE);
+			TempReg = Map_TempReg(x86_Any, -1, false);
 			sprintf(Name,"_FPR_D[%d]",Reg2);
 			MoveVariableToX86reg((BYTE *)&_FPR_D[Reg2],Name,TempReg);
 			Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fd, CRegInfo::FPU_Double);
@@ -4650,7 +4812,7 @@ void CRecompilerOps::COP1_D_SUB (void) {
 	}
 }
 
-void CRecompilerOps::COP1_D_MUL (void) {
+void CRecompilerOps::COP1_D_MUL() {
 	DWORD Reg1 = m_Opcode.ft == m_Opcode.fd?m_Opcode.ft:m_Opcode.fs;
 	DWORD Reg2 = m_Opcode.ft == m_Opcode.fd?m_Opcode.fs:m_Opcode.ft;
 	x86Reg TempReg;
@@ -4665,16 +4827,16 @@ void CRecompilerOps::COP1_D_MUL (void) {
 	if (RegInStack(Reg2, CRegInfo::FPU_Double)) {
 		fpuMulReg(StackPosition(Reg2));
 	} else {
-		UnMap_FPR(Reg2,TRUE);
+		UnMap_FPR(Reg2, true);
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fd, CRegInfo::FPU_Double);
-		TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_D[%d]",Reg2);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[Reg2],Name,TempReg);
 		fpuMulQwordRegPointer(TempReg);
 	}
 }
 
-void CRecompilerOps::COP1_D_DIV (void) {
+void CRecompilerOps::COP1_D_DIV() {
 	DWORD Reg1 = m_Opcode.ft == m_Opcode.fd?m_Opcode.ft:m_Opcode.fs;
 	DWORD Reg2 = m_Opcode.ft == m_Opcode.fd?m_Opcode.fs:m_Opcode.ft;
 	x86Reg TempReg;
@@ -4682,11 +4844,11 @@ void CRecompilerOps::COP1_D_DIV (void) {
 	
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 
 	if (m_Opcode.fd == m_Opcode.ft) {
-		UnMap_FPR(m_Opcode.fd,TRUE);
-		TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		UnMap_FPR(m_Opcode.fd, true);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_D[%d]",m_Opcode.ft);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[m_Opcode.ft],Name,TempReg);
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double);
@@ -4696,8 +4858,8 @@ void CRecompilerOps::COP1_D_DIV (void) {
 		if (RegInStack(Reg2, CRegInfo::FPU_Double)) {
 			fpuDivReg(StackPosition(Reg2));
 		} else {
-			UnMap_FPR(Reg2,TRUE);
-			TempReg = Map_TempReg(x86_Any,-1,FALSE);
+			UnMap_FPR(Reg2, true);
+			TempReg = Map_TempReg(x86_Any, -1, false);
 			sprintf(Name,"_FPR_D[%d]",Reg2);
 			MoveVariableToX86reg((BYTE *)&_FPR_D[Reg2],Name,TempReg);
 			Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fd, CRegInfo::FPU_Double);
@@ -4706,35 +4868,35 @@ void CRecompilerOps::COP1_D_DIV (void) {
 	}
 }
 
-void CRecompilerOps::COP1_D_ABS (void) {
+void CRecompilerOps::COP1_D_ABS() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double);
 	fpuAbs();
 }
 
-void CRecompilerOps::COP1_D_NEG (void) {
+void CRecompilerOps::COP1_D_NEG() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double);
 	fpuNeg();
 }
 
-void CRecompilerOps::COP1_D_SQRT (void) {
+void CRecompilerOps::COP1_D_SQRT() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double);
 	fpuSqrt();
 }
 
-void CRecompilerOps::COP1_D_MOV (void) {
+void CRecompilerOps::COP1_D_MOV() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double);
 }
 
-void CRecompilerOps::COP1_D_TRUNC_L (void) {			//added by Witten
+void CRecompilerOps::COP1_D_TRUNC_L() {			//added by Witten
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fs,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fs,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fs,TRUE);
+		UnMap_FPR(m_Opcode.fs, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4742,12 +4904,12 @@ void CRecompilerOps::COP1_D_TRUNC_L (void) {			//added by Witten
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Qword,CRegInfo::RoundTruncate);
 }
 
-void CRecompilerOps::COP1_D_CEIL_L (void) {			//added by Witten
+void CRecompilerOps::COP1_D_CEIL_L() {			//added by Witten
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fs,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fs,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fs,TRUE);
+		UnMap_FPR(m_Opcode.fs, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4755,12 +4917,12 @@ void CRecompilerOps::COP1_D_CEIL_L (void) {			//added by Witten
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Qword,CRegInfo::RoundUp);
 }
 
-void CRecompilerOps::COP1_D_FLOOR_L (void) {			//added by Witten
+void CRecompilerOps::COP1_D_FLOOR_L() {			//added by Witten
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fs,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fs,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fs,TRUE);
+		UnMap_FPR(m_Opcode.fs, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4768,12 +4930,12 @@ void CRecompilerOps::COP1_D_FLOOR_L (void) {			//added by Witten
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Qword,CRegInfo::RoundDown);
 }
 
-void CRecompilerOps::COP1_D_ROUND_W (void) {
+void CRecompilerOps::COP1_D_ROUND_W() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fs,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fs,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fs,TRUE);
+		UnMap_FPR(m_Opcode.fs, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4781,12 +4943,12 @@ void CRecompilerOps::COP1_D_ROUND_W (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Dword,CRegInfo::RoundNearest);
 }
 
-void CRecompilerOps::COP1_D_TRUNC_W (void) {
+void CRecompilerOps::COP1_D_TRUNC_W() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fd,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fd,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fd,TRUE);
+		UnMap_FPR(m_Opcode.fd, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4794,12 +4956,12 @@ void CRecompilerOps::COP1_D_TRUNC_W (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Dword,CRegInfo::RoundTruncate);
 }
 
-void CRecompilerOps::COP1_D_CEIL_W (void) {				// added by Witten
+void CRecompilerOps::COP1_D_CEIL_W() {				// added by Witten
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fs,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fs,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fs,TRUE);
+		UnMap_FPR(m_Opcode.fs, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4807,12 +4969,12 @@ void CRecompilerOps::COP1_D_CEIL_W (void) {				// added by Witten
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Dword,CRegInfo::RoundUp);
 }
 
-void CRecompilerOps::COP1_D_FLOOR_W (void) {			//added by Witten
+void CRecompilerOps::COP1_D_FLOOR_W() {			//added by Witten
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fs,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fs,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fs,TRUE);
+		UnMap_FPR(m_Opcode.fs, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4820,12 +4982,12 @@ void CRecompilerOps::COP1_D_FLOOR_W (void) {			//added by Witten
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Dword,CRegInfo::RoundDown);
 }
 
-void CRecompilerOps::COP1_D_CVT_S (void) {
+void CRecompilerOps::COP1_D_CVT_S() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fd,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fd,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fd,TRUE);
+		UnMap_FPR(m_Opcode.fd, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4833,12 +4995,12 @@ void CRecompilerOps::COP1_D_CVT_S (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Float,CRegInfo::RoundDefault);
 }
 
-void CRecompilerOps::COP1_D_CVT_W (void) {
+void CRecompilerOps::COP1_D_CVT_W() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fs,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fs,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fs,TRUE);
+		UnMap_FPR(m_Opcode.fs, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4846,12 +5008,12 @@ void CRecompilerOps::COP1_D_CVT_W (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Dword,CRegInfo::RoundDefault);
 }
 
-void CRecompilerOps::COP1_D_CVT_L (void) {
+void CRecompilerOps::COP1_D_CVT_L() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
-	m_Section->CompileCop1Test();	
+	m_Section->CompileCop1Test();
 	if (RegInStack(m_Opcode.fs,CRegInfo::FPU_Double) || RegInStack(m_Opcode.fs,CRegInfo::FPU_Qword)) {
-		UnMap_FPR(m_Opcode.fs,TRUE);
+		UnMap_FPR(m_Opcode.fs, true);
 	}
 	if (m_Opcode.fd != m_Opcode.fs || !RegInStack(m_Opcode.fd,CRegInfo::FPU_Double)) { 
 		Load_FPR_ToTop(m_Opcode.fd,m_Opcode.fs,CRegInfo::FPU_Double); 
@@ -4859,7 +5021,7 @@ void CRecompilerOps::COP1_D_CVT_L (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Double,CRegInfo::FPU_Qword,CRegInfo::RoundDefault);
 }
 
-void CRecompilerOps::COP1_D_CMP (void) {
+void CRecompilerOps::COP1_D_CMP() {
 	DWORD Reg1 = m_Opcode.fs; 
 	DWORD Reg2 = m_Opcode.ft;
 	DWORD cmp = 0;
@@ -4877,30 +5039,30 @@ void CRecompilerOps::COP1_D_CMP (void) {
 	if ((m_Opcode.funct & 4) != 0) { cmp |= 0x0100; }
 	
 	Load_FPR_ToTop(Reg1,Reg1, CRegInfo::FPU_Double);
-	Map_TempReg(x86_EAX, 0, FALSE);
+	Map_TempReg(x86_EAX, 0, false);
 	if (RegInStack(Reg2, CRegInfo::FPU_Double)) {
-		fpuComReg(StackPosition(Reg2),FALSE);
+		fpuComReg(StackPosition(Reg2), false);
 	} else {
 		char Name[50];
 
-		UnMap_FPR(Reg2,TRUE);
-		x86Reg TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		UnMap_FPR(Reg2, true);
+		x86Reg TempReg = Map_TempReg(x86_Any, -1, false);
 		sprintf(Name,"_FPR_D[%d]",Reg2);
 		MoveVariableToX86reg((BYTE *)&_FPR_D[Reg2],Name,TempReg);
 		Load_FPR_ToTop(Reg1,Reg1, CRegInfo::FPU_Double);
-		fpuComQwordRegPointer(TempReg,FALSE);
+		fpuComQwordRegPointer(TempReg, false);
 	}
 	AndConstToVariable((DWORD)~FPCSR_C, &_FPCR[31], "_FPCR[31]");
 	fpuStoreStatus();
-	x86Reg Reg = Map_TempReg(x86_Any8Bit, 0, FALSE);
-	TestConstToX86Reg(cmp,x86_EAX);	
+	x86Reg Reg = Map_TempReg(x86_Any8Bit, 0, false);
+	TestConstToX86Reg(cmp,x86_EAX);
 	Setnz(Reg);
 	if (cmp != 0) {
-		TestConstToX86Reg(cmp,x86_EAX);	
+		TestConstToX86Reg(cmp,x86_EAX);
 		Setnz(Reg);
 		
 		if ((m_Opcode.funct & 1) != 0) {
-			x86Reg Reg2 = Map_TempReg(x86_Any8Bit, 0, FALSE);
+			x86Reg Reg2 = Map_TempReg(x86_Any8Bit, 0, false);
 			AndConstToX86Reg(x86_EAX, 0x4300);
 			CompConstToX86reg(x86_EAX, 0x4300);
 			Setz(Reg2);
@@ -4917,7 +5079,7 @@ void CRecompilerOps::COP1_D_CMP (void) {
 }
 
 /************************** COP1: W functions ************************/
-void CRecompilerOps::COP1_W_CVT_S (void) {
+void CRecompilerOps::COP1_W_CVT_S() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4927,7 +5089,7 @@ void CRecompilerOps::COP1_W_CVT_S (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Dword,CRegInfo::FPU_Float,CRegInfo::RoundDefault);
 }
 
-void CRecompilerOps::COP1_W_CVT_D (void) {
+void CRecompilerOps::COP1_W_CVT_D() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4938,7 +5100,7 @@ void CRecompilerOps::COP1_W_CVT_D (void) {
 }
 
 /************************** COP1: L functions ************************/
-void CRecompilerOps::COP1_L_CVT_S (void) {
+void CRecompilerOps::COP1_L_CVT_S() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4948,7 +5110,7 @@ void CRecompilerOps::COP1_L_CVT_S (void) {
 	ChangeFPURegFormat(m_Opcode.fd,CRegInfo::FPU_Qword,CRegInfo::FPU_Float,CRegInfo::RoundDefault);
 }
 
-void CRecompilerOps::COP1_L_CVT_D (void) {
+void CRecompilerOps::COP1_L_CVT_D() {
 	CPU_Message("  %X %s",m_CompilePC,R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 	
 	m_Section->CompileCop1Test();	
@@ -4959,7 +5121,7 @@ void CRecompilerOps::COP1_L_CVT_D (void) {
 }
 
 /************************** Other functions **************************/
-void CRecompilerOps::UnknownOpcode (void) {
+void CRecompilerOps::UnknownOpcode() {
 	CPU_Message("  %X Unhandled Opcode: %s",m_CompilePC, R4300iOpcodeName(m_Opcode.Hex,m_CompilePC));
 
 	m_RegWorkingSet.WriteBackRegisters();
@@ -4989,7 +5151,7 @@ void CRecompilerOps::AfterCallDirect ( CRegInfo  & RegSet )
 	RegSet.SetRoundingModel(CRegInfo::RoundUnknown);
 }
 
-void CRecompilerOps::EnterCodeBlock ( void )
+void CRecompilerOps::EnterCodeBlock()
 {
 #ifdef _DEBUG
 	Push(x86_ESI);
@@ -5000,7 +5162,7 @@ void CRecompilerOps::EnterCodeBlock ( void )
 #endif
 }
 
-void CRecompilerOps::ExitCodeBlock ( void )
+void CRecompilerOps::ExitCodeBlock()
 {
 #ifdef _DEBUG
 	Pop(x86_ESI);
@@ -5083,35 +5245,40 @@ void CRecompilerOps::CompileSystemCheck (DWORD TargetPC, const CRegInfo & RegSet
 	SetJump32(Jump,(DWORD *)m_RecompPos);	
 }
 
-void CRecompilerOps::OverflowDelaySlot (BOOL TestTimer)
+void CRecompilerOps::OverflowDelaySlot(bool TestTimer)
 {
 	m_RegWorkingSet.WriteBackRegisters();
 	UpdateCounters(m_RegWorkingSet,false,true);
 	MoveConstToVariable(CompilePC() + 4,_PROGRAM_COUNTER,"PROGRAM_COUNTER");
-	if (g_SyncSystem) { 
-		MoveConstToX86reg((DWORD)g_BaseSystem,x86_ECX);
-		Call_Direct(AddressOf(&CN64System::SyncSystem), "CN64System::SyncSystem"); 
-	}
-	MoveConstToVariable(JUMP,&R4300iOp::m_NextInstruction,"R4300iOp::m_NextInstruction");
-	if (TestTimer)
+
+	if (g_SyncSystem)
 	{
-		MoveConstToVariable(TestTimer,&R4300iOp::m_TestTimer,"R4300iOp::m_TestTimer");
+		MoveConstToX86reg((DWORD)g_BaseSystem,x86_ECX);
+		Call_Direct(AddressOf(&CN64System::SyncSystem), "CN64System::SyncSystem");
 	}
+
+	MoveConstToVariable(JUMP,&R4300iOp::m_NextInstruction,"R4300iOp::m_NextInstruction");
+
+	if (TestTimer)
+		MoveConstToVariable(TestTimer,&R4300iOp::m_TestTimer,"R4300iOp::m_TestTimer");
+
 	PushImm32("g_System->CountPerOp()",g_System->CountPerOp());
 	Call_Direct(CInterpreterCPU::ExecuteOps, "CInterpreterCPU::ExecuteOps");
 	AddConstToX86Reg(x86_ESP,4);
+
 	if (g_System->bFastSP() && g_Recompiler)
 	{
-		MoveConstToX86reg((DWORD)g_Recompiler,x86_ECX);		
+		MoveConstToX86reg((DWORD)g_Recompiler,x86_ECX);
 		Call_Direct(AddressOf(&CRecompiler::ResetMemoryStackPos), "CRecompiler::ResetMemoryStackPos");
 	}
 
-	if (g_SyncSystem) 
-	{ 
+	if (g_SyncSystem)
+	{
 		UpdateSyncCPU(m_RegWorkingSet,g_System->CountPerOp());
 		MoveConstToX86reg((DWORD)g_BaseSystem,x86_ECX);
-		Call_Direct(AddressOf(&CN64System::SyncSystem), "CN64System::SyncSystem"); 
+		Call_Direct(AddressOf(&CN64System::SyncSystem), "CN64System::SyncSystem");
 	}
+
 	ExitCodeBlock();
 	m_NextInstruction = END_BLOCK;
 }
diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Ops.h b/Source/Project64/N64 System/Recompiler/Recompiler Ops.h
index ddfdef936..6ce00179c 100644
--- a/Source/Project64/N64 System/Recompiler/Recompiler Ops.h	
+++ b/Source/Project64/N64 System/Recompiler/Recompiler Ops.h	
@@ -28,304 +28,303 @@ protected:
 	typedef void ( * BranchFunction )();
 	
 	/************************** Branch functions  ************************/
-	static void Compile_Branch         ( BranchFunction CompareFunc, BRANCH_TYPE BranchType, BOOL Link);
-	static void Compile_BranchLikely   ( BranchFunction CompareFunc, BOOL Link);
-	static void BNE_Compare            ( void );
-	static void BEQ_Compare            ( void );
-	static void BGTZ_Compare           ( void );
-	static void BLEZ_Compare           ( void );
-	static void BLTZ_Compare           ( void );
-	static void BGEZ_Compare           ( void );
-	static void COP1_BCF_Compare       ( void );
-	static void COP1_BCT_Compare       ( void );
+	static void Compile_Branch         ( BranchFunction CompareFunc, BRANCH_TYPE BranchType, bool Link);
+	static void Compile_BranchLikely   ( BranchFunction CompareFunc, bool Link);
+	static void BNE_Compare();
+	static void BEQ_Compare();
+	static void BGTZ_Compare();
+	static void BLEZ_Compare();
+	static void BLTZ_Compare();
+	static void BGEZ_Compare();
+	static void COP1_BCF_Compare();
+	static void COP1_BCT_Compare();
 
 	/*************************  OpCode functions *************************/
-	static void J              ( void );
-	static void JAL            ( void );
-	static void ADDI           ( void );
-	static void ADDIU          ( void );
-	static void SLTI           ( void );
-	static void SLTIU          ( void );
-	static void ANDI           ( void );
-	static void ORI            ( void );
-	static void XORI           ( void );
-	static void LUI            ( void );
-	static void DADDIU         ( void );
-//	static void LDL            ( void );
-//	static void LDR            ( void );
-//	static void LB             ( void );
-//	static void LH             ( void );
-//	static void LWL            ( void );
-//	static void LW             ( void );
-//	static void LBU            ( void );
-//	static void LHU            ( void );
-//	static void LWR            ( void );
-//	static void LWU            ( void );		//added by Witten
-//	static void SB             ( void );
-//	static void SH             ( void );
-//	static void SWL            ( void );
-//	static void SW             ( void );
-//	static void SWR            ( void );
-//	static void SDL            ( void );
-//	static void SDR            ( void );
-	static void CACHE          ( void );
-//	static void LL             ( void );
-//	static void LWC1           ( void );
-//	static void LDC1           ( void );
-//	static void LD             ( void );
-//	static void SC             ( void );
-//	static void SWC1           ( void );
-//	static void SDC1           ( void );
-//	static void SD             ( void );
+	static void J              ();
+	static void JAL            ();
+	static void ADDI           ();
+	static void ADDIU          ();
+	static void SLTI           ();
+	static void SLTIU          ();
+	static void ANDI           ();
+	static void ORI            ();
+	static void XORI           ();
+	static void LUI            ();
+	static void DADDIU         ();
+//	static void LDL            ();
+//	static void LDR            ();
+//	static void LB             ();
+//	static void LH             ();
+//	static void LWL            ();
+//	static void LW             ();
+//	static void LBU            ();
+//	static void LHU            ();
+//	static void LWR            ();
+//	static void LWU            (); //added by Witten
+//	static void SB             ();
+//	static void SH             ();
+//	static void SWL            ();
+//	static void SW             ();
+//	static void SWR            ();
+//	static void SDL            ();
+//	static void SDR            ();
+	static void CACHE          ();
+//	static void LL             ();
+//	static void LWC1           ();
+//	static void LDC1           ();
+//	static void LD             ();
+//	static void SC             ();
+//	static void SWC1           ();
+//	static void SDC1           ();
+//	static void SD             ();
 
 	/********************** R4300i OpCodes: Special **********************/
-	static void SPECIAL_SLL    ( void );
-	static void SPECIAL_SRL    ( void );
-	static void SPECIAL_SRA    ( void );
-	static void SPECIAL_SLLV   ( void );
-	static void SPECIAL_SRLV   ( void );
-	static void SPECIAL_SRAV   ( void );
-	static void SPECIAL_JR     ( void );
-	static void SPECIAL_JALR   ( void );
-	static void SPECIAL_SYSCALL( void );
-	static void SPECIAL_MFLO   ( void );
-	static void SPECIAL_MTLO   ( void );
-	static void SPECIAL_MFHI   ( void );
-	static void SPECIAL_MTHI   ( void );
-	static void SPECIAL_DSLLV  ( void );
-	static void SPECIAL_DSRLV  ( void );
-	static void SPECIAL_DSRAV  ( void );
-	static void SPECIAL_MULT   ( void );
-	static void SPECIAL_MULTU  ( void );
-	static void SPECIAL_DIV    ( void );
-	static void SPECIAL_DIVU   ( void );
-	static void SPECIAL_DMULT  ( void );
-	static void SPECIAL_DMULTU ( void );
-	static void SPECIAL_DDIV   ( void );
-	static void SPECIAL_DDIVU  ( void );
-	static void SPECIAL_ADD    ( void );
-	static void SPECIAL_ADDU   ( void );
-	static void SPECIAL_SUB    ( void );
-	static void SPECIAL_SUBU   ( void );
-	static void SPECIAL_AND    ( void );
-	static void SPECIAL_OR     ( void );
-	static void SPECIAL_XOR    ( void );
-	static void SPECIAL_NOR    ( void );
-	static void SPECIAL_SLT    ( void );
-	static void SPECIAL_SLTU   ( void );
-	static void SPECIAL_DADD   ( void );
-	static void SPECIAL_DADDU  ( void );
-	static void SPECIAL_DSUB   ( void );
-	static void SPECIAL_DSUBU  ( void );
-	static void SPECIAL_DSLL   ( void );
-	static void SPECIAL_DSRL   ( void );
-	static void SPECIAL_DSRA   ( void );
-	static void SPECIAL_DSLL32 ( void );
-	static void SPECIAL_DSRL32 ( void );
-	static void SPECIAL_DSRA32 ( void );
+	static void SPECIAL_SLL    ();
+	static void SPECIAL_SRL    ();
+	static void SPECIAL_SRA    ();
+	static void SPECIAL_SLLV   ();
+	static void SPECIAL_SRLV   ();
+	static void SPECIAL_SRAV   ();
+	static void SPECIAL_JR     ();
+	static void SPECIAL_JALR   ();
+	static void SPECIAL_SYSCALL();
+	static void SPECIAL_MFLO   ();
+	static void SPECIAL_MTLO   ();
+	static void SPECIAL_MFHI   ();
+	static void SPECIAL_MTHI   ();
+	static void SPECIAL_DSLLV  ();
+	static void SPECIAL_DSRLV  ();
+	static void SPECIAL_DSRAV  ();
+	static void SPECIAL_MULT   ();
+	static void SPECIAL_MULTU  ();
+	static void SPECIAL_DIV    ();
+	static void SPECIAL_DIVU   ();
+	static void SPECIAL_DMULT  ();
+	static void SPECIAL_DMULTU ();
+	static void SPECIAL_DDIV   ();
+	static void SPECIAL_DDIVU  ();
+	static void SPECIAL_ADD    ();
+	static void SPECIAL_ADDU   ();
+	static void SPECIAL_SUB    ();
+	static void SPECIAL_SUBU   ();
+	static void SPECIAL_AND    ();
+	static void SPECIAL_OR     ();
+	static void SPECIAL_XOR    ();
+	static void SPECIAL_NOR    ();
+	static void SPECIAL_SLT    ();
+	static void SPECIAL_SLTU   ();
+	static void SPECIAL_DADD   ();
+	static void SPECIAL_DADDU  ();
+	static void SPECIAL_DSUB   ();
+	static void SPECIAL_DSUBU  ();
+	static void SPECIAL_DSLL   ();
+	static void SPECIAL_DSRL   ();
+	static void SPECIAL_DSRA   ();
+	static void SPECIAL_DSLL32 ();
+	static void SPECIAL_DSRL32 ();
+	static void SPECIAL_DSRA32 ();
 
 	/************************** COP0 functions **************************/
-	static void COP0_MF        ( void );
-	static void COP0_MT        ( void );
+	static void COP0_MF        ();
+	static void COP0_MT        ();
 
 	/************************** COP0 CO functions ***********************/
-	static void COP0_CO_TLBR   ( void );
-	static void COP0_CO_TLBWI  ( void );
-	static void COP0_CO_TLBWR  ( void );
-	static void COP0_CO_TLBP   ( void );
-	static void COP0_CO_ERET   ( void );
+	static void COP0_CO_TLBR   ();
+	static void COP0_CO_TLBWI  ();
+	static void COP0_CO_TLBWR  ();
+	static void COP0_CO_TLBP   ();
+	static void COP0_CO_ERET   ();
 
 	/************************** COP1 functions **************************/
-	static void COP1_MF        ( void );
-	static void COP1_DMF       ( void );
-	static void COP1_CF        ( void );
-	static void COP1_MT        ( void );
-	static void COP1_DMT       ( void );
-	static void COP1_CT        ( void );
+	static void COP1_MF        ();
+	static void COP1_DMF       ();
+	static void COP1_CF        ();
+	static void COP1_MT        ();
+	static void COP1_DMT       ();
+	static void COP1_CT        ();
 
 	/************************** COP1: S functions ************************/
-	static void COP1_S_ADD     ( void );
-	static void COP1_S_SUB     ( void );
-	static void COP1_S_MUL     ( void );
-	static void COP1_S_DIV     ( void );
-	static void COP1_S_ABS     ( void );
-	static void COP1_S_NEG     ( void );
-	static void COP1_S_SQRT    ( void );
-	static void COP1_S_MOV     ( void );
-	static void COP1_S_TRUNC_L ( void );
-	static void COP1_S_CEIL_L  ( void );			//added by Witten
-	static void COP1_S_FLOOR_L ( void );			//added by Witten
-	static void COP1_S_ROUND_W ( void );
-	static void COP1_S_TRUNC_W ( void );
-	static void COP1_S_CEIL_W  ( void );			//added by Witten
-	static void COP1_S_FLOOR_W ( void );
-	static void COP1_S_CVT_D   ( void );
-	static void COP1_S_CVT_W   ( void );
-	static void COP1_S_CVT_L   ( void );
-	static void COP1_S_CMP     ( void );
+	static void COP1_S_ADD     ();
+	static void COP1_S_SUB     ();
+	static void COP1_S_MUL     ();
+	static void COP1_S_DIV     ();
+	static void COP1_S_ABS     ();
+	static void COP1_S_NEG     ();
+	static void COP1_S_SQRT    ();
+	static void COP1_S_MOV     ();
+	static void COP1_S_TRUNC_L ();
+	static void COP1_S_CEIL_L  (); //added by Witten
+	static void COP1_S_FLOOR_L (); //added by Witten
+	static void COP1_S_ROUND_W ();
+	static void COP1_S_TRUNC_W ();
+	static void COP1_S_CEIL_W  (); //added by Witten
+	static void COP1_S_FLOOR_W ();
+	static void COP1_S_CVT_D   ();
+	static void COP1_S_CVT_W   ();
+	static void COP1_S_CVT_L   ();
+	static void COP1_S_CMP     ();
 
 	/************************** COP1: D functions ************************/
-	static void COP1_D_ADD     ( void );
-	static void COP1_D_SUB     ( void );
-	static void COP1_D_MUL     ( void );
-	static void COP1_D_DIV     ( void );
-	static void COP1_D_ABS     ( void );
-	static void COP1_D_NEG     ( void );
-	static void COP1_D_SQRT    ( void );
-	static void COP1_D_MOV     ( void );
-	static void COP1_D_TRUNC_L ( void );			//added by Witten
-	static void COP1_D_CEIL_L  ( void );			//added by Witten
-	static void COP1_D_FLOOR_L ( void );			//added by Witten
-	static void COP1_D_ROUND_W ( void );
-	static void COP1_D_TRUNC_W ( void );
-	static void COP1_D_CEIL_W  ( void );			//added by Witten
-	static void COP1_D_FLOOR_W ( void );			//added by Witten
-	static void COP1_D_CVT_S   ( void );
-	static void COP1_D_CVT_W   ( void );
-	static void COP1_D_CVT_L   ( void );
-	static void COP1_D_CMP     ( void );
+	static void COP1_D_ADD     ();
+	static void COP1_D_SUB     ();
+	static void COP1_D_MUL     ();
+	static void COP1_D_DIV     ();
+	static void COP1_D_ABS     ();
+	static void COP1_D_NEG     ();
+	static void COP1_D_SQRT    ();
+	static void COP1_D_MOV     ();
+	static void COP1_D_TRUNC_L (); //added by Witten
+	static void COP1_D_CEIL_L  (); //added by Witten
+	static void COP1_D_FLOOR_L (); //added by Witten
+	static void COP1_D_ROUND_W ();
+	static void COP1_D_TRUNC_W ();
+	static void COP1_D_CEIL_W  (); //added by Witten
+	static void COP1_D_FLOOR_W (); //added by Witten
+	static void COP1_D_CVT_S   ();
+	static void COP1_D_CVT_W   ();
+	static void COP1_D_CVT_L   ();
+	static void COP1_D_CMP     ();
 
 	/************************** COP1: W functions ************************/
-	static void COP1_W_CVT_S   ( void );
-	static void COP1_W_CVT_D   ( void );
+	static void COP1_W_CVT_S   ();
+	static void COP1_W_CVT_D   ();
 
 	/************************** COP1: L functions ************************/
-	static void COP1_L_CVT_S   ( void );
-	static void COP1_L_CVT_D   ( void );
+	static void COP1_L_CVT_S   ();
+	static void COP1_L_CVT_D   ();
 
 	/************************** Other functions **************************/
-	static void UnknownOpcode  ( void );
+	static void UnknownOpcode  ();
 	
 	
-	static void BeforeCallDirect  ( CRegInfo  & RegSet );
-	static void AfterCallDirect   ( CRegInfo  & RegSet );
-	static void EnterCodeBlock    ( void );
-	static void ExitCodeBlock     ( void );
-	static void CompileReadTLBMiss  (DWORD VirtualAddress, x86Reg LookUpReg );
-	static void CompileReadTLBMiss  (x86Reg AddressReg, x86Reg LookUpReg );
-	static void CompileWriteTLBMiss (DWORD VirtualAddress, x86Reg LookUpReg );
-	static void CompileWriteTLBMiss (x86Reg AddressReg, x86Reg LookUpReg );
-	static void UpdateSyncCPU       (CRegInfo & RegSet, DWORD Cycles);
-	static void UpdateCounters      (CRegInfo & RegSet, bool CheckTimer, bool ClearValues = false );
-	static void CompileSystemCheck  ( DWORD TargetPC, const CRegInfo & RegSet );
-	static void ChangeDefaultRoundingModel ( void );
-	static void OverflowDelaySlot ( BOOL TestTimer );
+	static void BeforeCallDirect(CRegInfo  & RegSet);
+	static void AfterCallDirect(CRegInfo  & RegSet);
+	static void EnterCodeBlock();
+	static void ExitCodeBlock();
+	static void CompileReadTLBMiss(DWORD VirtualAddress, x86Reg LookUpReg);
+	static void CompileReadTLBMiss(x86Reg AddressReg, x86Reg LookUpReg);
+	static void CompileWriteTLBMiss(x86Reg AddressReg, x86Reg LookUpReg);
+	static void UpdateSyncCPU(CRegInfo & RegSet, DWORD Cycles);
+	static void UpdateCounters(CRegInfo & RegSet, bool CheckTimer, bool ClearValues = false);
+	static void CompileSystemCheck(DWORD TargetPC, const CRegInfo & RegSet);
+	static void ChangeDefaultRoundingModel();
+	static void OverflowDelaySlot(bool TestTimer);
 
 
 
 	static STEP_TYPE      m_NextInstruction;
 	static DWORD          m_CompilePC;
 	static OPCODE         m_Opcode;
-	static CRegInfo	      m_RegWorkingSet;
+	static CRegInfo       m_RegWorkingSet;
 	static DWORD          m_BranchCompare;
 	static CCodeSection * m_Section;
 
 	/********* Helper Functions *********/
 	typedef CRegInfo::REG_STATE REG_STATE;
 
-	static inline REG_STATE         GetMipsRegState ( int Reg ) { return m_RegWorkingSet.GetMipsRegState(Reg); }
-	static inline unsigned __int64  GetMipsReg      ( int Reg ) { return m_RegWorkingSet.GetMipsReg(Reg); }
-	static inline __int64           GetMipsReg_S    ( int Reg ) { return m_RegWorkingSet.GetMipsReg_S(Reg); }
-	static inline DWORD             GetMipsRegLo    ( int Reg ) { return m_RegWorkingSet.GetMipsRegLo(Reg); }
-	static inline long              GetMipsRegLo_S  ( int Reg ) { return m_RegWorkingSet.GetMipsRegLo_S(Reg); }
-	static inline DWORD             GetMipsRegHi    ( int Reg ) { return m_RegWorkingSet.GetMipsRegHi(Reg); }
-	static inline long              GetMipsRegHi_S  ( int Reg ) { return m_RegWorkingSet.GetMipsRegHi_S(Reg); }
-	static inline CX86Ops::x86Reg   GetMipsRegMapLo ( int Reg ) { return m_RegWorkingSet.GetMipsRegMapLo(Reg); }
-	static inline CX86Ops::x86Reg   GetMipsRegMapHi ( int Reg ) { return m_RegWorkingSet.GetMipsRegMapHi(Reg); }
+	static REG_STATE         GetMipsRegState ( int Reg ) { return m_RegWorkingSet.GetMipsRegState(Reg); }
+	static unsigned __int64  GetMipsReg      ( int Reg ) { return m_RegWorkingSet.GetMipsReg(Reg); }
+	static __int64           GetMipsReg_S    ( int Reg ) { return m_RegWorkingSet.GetMipsReg_S(Reg); }
+	static DWORD             GetMipsRegLo    ( int Reg ) { return m_RegWorkingSet.GetMipsRegLo(Reg); }
+	static long              GetMipsRegLo_S  ( int Reg ) { return m_RegWorkingSet.GetMipsRegLo_S(Reg); }
+	static DWORD             GetMipsRegHi    ( int Reg ) { return m_RegWorkingSet.GetMipsRegHi(Reg); }
+	static long              GetMipsRegHi_S  ( int Reg ) { return m_RegWorkingSet.GetMipsRegHi_S(Reg); }
+	static CX86Ops::x86Reg   GetMipsRegMapLo ( int Reg ) { return m_RegWorkingSet.GetMipsRegMapLo(Reg); }
+	static CX86Ops::x86Reg   GetMipsRegMapHi ( int Reg ) { return m_RegWorkingSet.GetMipsRegMapHi(Reg); }
 
-	static inline bool IsKnown       ( int Reg ) { return m_RegWorkingSet.IsKnown(Reg); }
-	static inline bool IsUnknown     ( int Reg ) { return m_RegWorkingSet.IsUnknown(Reg); }
-	static inline bool IsMapped      ( int Reg ) { return m_RegWorkingSet.IsMapped(Reg); }
-	static inline bool IsConst       ( int Reg ) { return m_RegWorkingSet.IsConst(Reg); }
-	static inline bool IsSigned      ( int Reg ) { return m_RegWorkingSet.IsSigned(Reg); }
-	static inline bool IsUnsigned    ( int Reg ) { return m_RegWorkingSet.IsUnsigned(Reg); }
-	static inline bool Is32Bit       ( int Reg ) { return m_RegWorkingSet.Is32Bit(Reg); }
-	static inline bool Is64Bit       ( int Reg ) { return m_RegWorkingSet.Is64Bit(Reg); }
-	static inline bool Is32BitMapped ( int Reg ) { return m_RegWorkingSet.Is32BitMapped(Reg); }
-	static inline bool Is64BitMapped ( int Reg ) { return m_RegWorkingSet.Is64BitMapped(Reg); }
+	static bool IsKnown       ( int Reg ) { return m_RegWorkingSet.IsKnown(Reg); }
+	static bool IsUnknown     ( int Reg ) { return m_RegWorkingSet.IsUnknown(Reg); }
+	static bool IsMapped      ( int Reg ) { return m_RegWorkingSet.IsMapped(Reg); }
+	static bool IsConst       ( int Reg ) { return m_RegWorkingSet.IsConst(Reg); }
+	static bool IsSigned      ( int Reg ) { return m_RegWorkingSet.IsSigned(Reg); }
+	static bool IsUnsigned    ( int Reg ) { return m_RegWorkingSet.IsUnsigned(Reg); }
+	static bool Is32Bit       ( int Reg ) { return m_RegWorkingSet.Is32Bit(Reg); }
+	static bool Is64Bit       ( int Reg ) { return m_RegWorkingSet.Is64Bit(Reg); }
+	static bool Is32BitMapped ( int Reg ) { return m_RegWorkingSet.Is32BitMapped(Reg); }
+	static bool Is64BitMapped ( int Reg ) { return m_RegWorkingSet.Is64BitMapped(Reg); }
 
-	static inline void FixRoundModel ( CRegInfo::FPU_ROUND RoundMethod )
+	static void FixRoundModel ( CRegInfo::FPU_ROUND RoundMethod )
 	{
 		m_RegWorkingSet.FixRoundModel(RoundMethod); 
 	}
-	static inline void ChangeFPURegFormat ( int Reg, CRegInfo::FPU_STATE OldFormat, CRegInfo::FPU_STATE NewFormat, CRegInfo::FPU_ROUND RoundingModel )
+	static void ChangeFPURegFormat ( int Reg, CRegInfo::FPU_STATE OldFormat, CRegInfo::FPU_STATE NewFormat, CRegInfo::FPU_ROUND RoundingModel )
 	{
 		m_RegWorkingSet.ChangeFPURegFormat(Reg,OldFormat,NewFormat,RoundingModel); 
 	}
-	static inline void Load_FPR_ToTop ( int Reg, int RegToLoad, CRegInfo::FPU_STATE Format)
+	static void Load_FPR_ToTop ( int Reg, int RegToLoad, CRegInfo::FPU_STATE Format)
 	{
 		m_RegWorkingSet.Load_FPR_ToTop(Reg,RegToLoad,Format); 
 	}
-	static inline BOOL RegInStack ( int Reg, CRegInfo::FPU_STATE Format )
+	static bool RegInStack ( int Reg, CRegInfo::FPU_STATE Format )
 	{
 		return m_RegWorkingSet.RegInStack(Reg,Format); 
 	}
-	static inline x86FpuValues StackPosition ( int Reg )
+	static x86FpuValues StackPosition ( int Reg )
 	{
 		return m_RegWorkingSet.StackPosition(Reg); 
 	}
-	static inline void UnMap_AllFPRs ( void )
+	static void UnMap_AllFPRs()
 	{
-		m_RegWorkingSet.UnMap_AllFPRs(); 
+		m_RegWorkingSet.UnMap_AllFPRs();
 	}
-	static inline void UnMap_FPR ( DWORD Reg, bool WriteBackValue )
+	static void UnMap_FPR ( DWORD Reg, bool WriteBackValue )
 	{
 		m_RegWorkingSet.UnMap_FPR(Reg,WriteBackValue); 
 	}
 
-	static inline x86Reg FreeX86Reg ( void )
+	static x86Reg FreeX86Reg()
 	{
-		return m_RegWorkingSet.FreeX86Reg(); 
+		return m_RegWorkingSet.FreeX86Reg();
 	}
-	static inline x86Reg Free8BitX86Reg ( void )
+	static x86Reg Free8BitX86Reg()
 	{
 		return m_RegWorkingSet.Free8BitX86Reg();
 	}
-	static inline void Map_GPR_32bit ( int Reg, bool SignValue, int MipsRegToLoad )
+	static void Map_GPR_32bit ( int Reg, bool SignValue, int MipsRegToLoad )
 	{
 		m_RegWorkingSet.Map_GPR_32bit(Reg,SignValue,MipsRegToLoad);
 	}
-	static inline void Map_GPR_64bit ( int Reg, int MipsRegToLoad )
+	static void Map_GPR_64bit ( int Reg, int MipsRegToLoad )
 	{
 		m_RegWorkingSet.Map_GPR_64bit(Reg,MipsRegToLoad);
 	}
-	static inline x86Reg Get_MemoryStack ( void )
+	static x86Reg Get_MemoryStack()
 	{
 		return m_RegWorkingSet.Get_MemoryStack();
 	}
-	static inline x86Reg Map_MemoryStack ( x86Reg Reg, bool bMapRegister, bool LoadValue = true )
+	static x86Reg Map_MemoryStack ( x86Reg Reg, bool bMapRegister, bool LoadValue = true )
 	{
 		return m_RegWorkingSet.Map_MemoryStack(Reg,bMapRegister,LoadValue);
 	}
-	static inline x86Reg Map_TempReg ( x86Reg Reg, int MipsReg, BOOL LoadHiWord )
+	static x86Reg Map_TempReg ( x86Reg Reg, int MipsReg, bool LoadHiWord )
 	{
-		return m_RegWorkingSet.Map_TempReg(Reg,MipsReg,LoadHiWord); 
+		return m_RegWorkingSet.Map_TempReg(Reg,MipsReg,LoadHiWord);
 	}
-	static inline void ProtectGPR ( DWORD Reg )
+	static void ProtectGPR ( DWORD Reg )
 	{
 		m_RegWorkingSet.ProtectGPR(Reg);
 	}
-	static inline void UnProtectGPR ( DWORD Reg )
+	static void UnProtectGPR ( DWORD Reg )
 	{
 		m_RegWorkingSet.UnProtectGPR(Reg);
 	}
-	static inline void ResetX86Protection ( void )
+	static void ResetX86Protection()
 	{
 		m_RegWorkingSet.ResetX86Protection(); 
 	}
-	static inline x86Reg UnMap_TempReg ( void )
+	static x86Reg UnMap_TempReg()
 	{
 		return m_RegWorkingSet.UnMap_TempReg(); 
 	}
-	static inline void UnMap_GPR ( DWORD Reg, bool WriteBackValue )
+	static void UnMap_GPR ( DWORD Reg, bool WriteBackValue )
 	{
 		m_RegWorkingSet.UnMap_GPR(Reg,WriteBackValue); 
 	}
-	static inline bool UnMap_X86reg ( x86Reg Reg )
+	static bool UnMap_X86reg ( x86Reg Reg )
 	{
 		return m_RegWorkingSet.UnMap_X86reg(Reg); 
 	}
 
 public:
-	static DWORD CompilePC ( void ) { return m_CompilePC; }
+	static DWORD CompilePC() { return m_CompilePC; }
 };
diff --git a/Source/Project64/N64 System/Recompiler/Reg Info.cpp b/Source/Project64/N64 System/Recompiler/Reg Info.cpp
index 4f48633f7..672e864b9 100644
--- a/Source/Project64/N64 System/Recompiler/Reg Info.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Reg Info.cpp	
@@ -14,7 +14,7 @@ unsigned int CRegInfo::m_fpuControl = 0;
 
 char *Format_Name[] = {"Unknown","dword","qword","float","double"};
 
-CRegInfo::CRegInfo ( void ) :
+CRegInfo::CRegInfo() :
 	m_CycleCount(0),
 	m_Stack_TopPos(0),
 	m_Fpu_Used(false),
@@ -141,15 +141,15 @@ void CRegInfo::FixRoundModel(FPU_ROUND RoundMethod )
 	}
 	CPU_Message("    FixRoundModel: CurrentRoundingModel: %s  targetRoundModel: %s",RoundingModelName(GetRoundingModel()),RoundingModelName(RoundMethod));
 
-	m_fpuControl = 0;			
+	m_fpuControl = 0;
 	fpuStoreControl(&m_fpuControl, "m_fpuControl");
-	x86Reg reg = Map_TempReg(x86_Any,-1,FALSE);
+	x86Reg reg = Map_TempReg(x86_Any, -1, false);
 	MoveVariableToX86reg(&m_fpuControl, "m_fpuControl", reg);
 	AndConstToX86Reg(reg, 0xF3FF);
-		
+
 	if (RoundMethod == RoundDefault)
-	{ 
-		x86Reg RoundReg = Map_TempReg(x86_Any,-1,FALSE);
+	{
+		x86Reg RoundReg = Map_TempReg(x86_Any, -1, false);
 		MoveVariableToX86reg(&g_Reg->m_RoundingModel,"m_RoundingModel", RoundReg);
 		ShiftLeftSignImmed(RoundReg,2);
 		OrX86RegToX86Reg(reg,RoundReg);
@@ -179,8 +179,8 @@ void CRegInfo::ChangeFPURegFormat (int Reg, FPU_STATE OldFormat, FPU_STATE NewFo
 			continue;
 		}
 		if (x86fpu_State[i] != OldFormat || x86fpu_StateChanged[i])
-		{		
-			UnMap_FPR(Reg,TRUE);
+		{
+			UnMap_FPR(Reg, true);
 			Load_FPR_ToTop(Reg,Reg,OldFormat);
 		} else {
 			CPU_Message("    regcache: Changed format of ST(%d) from %s to %s", (i - StackTopPos() + 8) & 7,Format_Name[OldFormat],Format_Name[NewFormat]);			
@@ -210,14 +210,14 @@ void CRegInfo::Load_FPR_ToTop ( int Reg, int RegToLoad, FPU_STATE Format)
 	if (Reg < 0) { g_Notify->DisplayError(L"Load_FPR_ToTop\nReg < 0 ???"); return; }
 
 	if (Format == FPU_Double || Format == FPU_Qword) {
-		UnMap_FPR(Reg + 1,TRUE);
-		UnMap_FPR(RegToLoad + 1,TRUE);
+		UnMap_FPR(Reg + 1, true);
+		UnMap_FPR(RegToLoad + 1, true);
 	} else {
 		if ((Reg & 1) != 0) {
 			for (i = 0; i < 8; i++) {
 				if (x86fpu_MappedTo[i] == (Reg - 1)) {
 					if (x86fpu_State[i] == FPU_Double || x86fpu_State[i] == FPU_Qword) {
-						UnMap_FPR(Reg,TRUE);
+						UnMap_FPR(Reg, true);
 					}
 					i = 8;
 				}
@@ -227,7 +227,7 @@ void CRegInfo::Load_FPR_ToTop ( int Reg, int RegToLoad, FPU_STATE Format)
 			for (i = 0; i < 8; i++) {
 				if (x86fpu_MappedTo[i] == (RegToLoad - 1)) {
 					if (x86fpu_State[i] == FPU_Double || x86fpu_State[i] == FPU_Qword) {
-						UnMap_FPR(RegToLoad,TRUE);
+						UnMap_FPR(RegToLoad, true);
 					}
 					i = 8;
 				}
@@ -243,7 +243,7 @@ void CRegInfo::Load_FPR_ToTop ( int Reg, int RegToLoad, FPU_STATE Format)
 				continue;
 			}
 			if (x86fpu_State[i] != Format) {
-				UnMap_FPR(Reg,TRUE);
+				UnMap_FPR(Reg, true);
 			}
 			break;
 		}
@@ -263,15 +263,15 @@ void CRegInfo::Load_FPR_ToTop ( int Reg, int RegToLoad, FPU_STATE Format)
 	if (RegInStack(RegToLoad,Format)) {
 		if (Reg != RegToLoad) {
 			if (x86fpu_MappedTo[(StackTopPos() - 1) & 7] != RegToLoad) {
-				UnMap_FPR(x86fpu_MappedTo[(StackTopPos() - 1) & 7],TRUE);
+				UnMap_FPR(x86fpu_MappedTo[(StackTopPos() - 1) & 7], true);
 				CPU_Message("    regcache: allocate ST(0) to %s", CRegName::FPR[Reg]);
-				fpuLoadReg(&StackTopPos(),StackPosition(RegToLoad));		
+				fpuLoadReg(&StackTopPos(),StackPosition(RegToLoad));
 				FpuRoundingModel(StackTopPos())    = RoundDefault;
 				x86fpu_MappedTo[StackTopPos()]     = Reg;
 				x86fpu_State[StackTopPos()]        = Format;
 				x86fpu_StateChanged[StackTopPos()] = false;
 			} else {
-				UnMap_FPR(x86fpu_MappedTo[(StackTopPos() - 1) & 7],TRUE);
+				UnMap_FPR(x86fpu_MappedTo[(StackTopPos() - 1) & 7], true);
 				Load_FPR_ToTop (Reg, RegToLoad, Format);
 			}
 		} else {
@@ -306,15 +306,15 @@ void CRegInfo::Load_FPR_ToTop ( int Reg, int RegToLoad, FPU_STATE Format)
 		char Name[50];
 		x86Reg TempReg;
 
-		UnMap_FPR(x86fpu_MappedTo[(StackTopPos() - 1) & 7],TRUE);
+		UnMap_FPR(x86fpu_MappedTo[(StackTopPos() - 1) & 7], true);
 		for (i = 0; i < 8; i++) {
 			if (x86fpu_MappedTo[i] == RegToLoad) {
-				UnMap_FPR(RegToLoad,TRUE);
+				UnMap_FPR(RegToLoad, true);
 				i = 8;
 			}
 		}
 		CPU_Message("    regcache: allocate ST(0) to %s", CRegName::FPR[Reg]);
-		TempReg = Map_TempReg(x86_Any,-1,FALSE);
+		TempReg = Map_TempReg(x86_Any, -1, false);
 		switch (Format) {
 		case FPU_Dword:
 			sprintf(Name,"m_FPR_S[%d]",RegToLoad);
@@ -337,9 +337,9 @@ void CRegInfo::Load_FPR_ToTop ( int Reg, int RegToLoad, FPU_STATE Format)
 			fpuLoadQwordFromX86Reg(&StackTopPos(),TempReg);
 			break;
 		default:
-			if (bHaveDebugger()) { g_Notify->DisplayError(L"Load_FPR_ToTop\nUnkown format to load %d",Format); }
+			if (bHaveDebugger()) { g_Notify->DisplayError(stdstr_f("Load_FPR_ToTop\nUnkown format to load %d",Format).ToUTF16().c_str()); }
 		}
-		SetX86Protected(TempReg,FALSE);
+		SetX86Protected(TempReg, false);
 		FpuRoundingModel(StackTopPos()) = RoundDefault;
 		x86fpu_MappedTo[StackTopPos()]      = Reg;
 		x86fpu_State[StackTopPos()]         = Format;
@@ -359,7 +359,7 @@ CRegInfo::x86FpuValues CRegInfo::StackPosition (int Reg)
 	return x86_ST_Unknown;
 }
 
-CX86Ops::x86Reg CRegInfo::FreeX86Reg ( void ) 
+CX86Ops::x86Reg CRegInfo::FreeX86Reg()
 {
 	if (GetX86Mapped(x86_EDI) == NotMapped && !GetX86Protected(x86_EDI)) { return x86_EDI; }
 	if (GetX86Mapped(x86_ESI) == NotMapped && !GetX86Protected(x86_ESI)) { return x86_ESI; }
@@ -418,7 +418,7 @@ CX86Ops::x86Reg CRegInfo::FreeX86Reg ( void )
 	return x86_Unknown;
 }
 
-CX86Ops::x86Reg CRegInfo::Free8BitX86Reg ( void ) 
+CX86Ops::x86Reg CRegInfo::Free8BitX86Reg()
 {
 	
 	if (GetX86Mapped(x86_EBX) == NotMapped && !GetX86Protected(x86_EBX)) {return x86_EBX; }
@@ -463,24 +463,24 @@ CX86Ops::x86Reg CRegInfo::Free8BitX86Reg ( void )
 	return x86_Unknown;
 }
 
-CX86Ops::x86Reg CRegInfo::UnMap_8BitTempReg (void )
+CX86Ops::x86Reg CRegInfo::UnMap_8BitTempReg()
 {
 	int count;
 
 	for (count = 0; count < 10; count ++) {
 		if (!Is8BitReg((x86Reg)count)) { continue; }
 		if (GetMipsRegState((x86Reg)count) == Temp_Mapped) {
-			if (GetX86Protected((x86Reg)count) == FALSE) {
+			if (GetX86Protected((x86Reg)count) == false) {
 				CPU_Message("    regcache: unallocate %s from temp storage",x86_Name((x86Reg)count));
 				SetX86Mapped((x86Reg)count, CRegInfo::NotMapped);
 				return (x86Reg)count;
-			}		
+			}
 		}
 	}
 	return x86_Unknown;
 }
 
-CRegInfo::x86Reg CRegInfo::Get_MemoryStack ( void ) const
+CRegInfo::x86Reg CRegInfo::Get_MemoryStack() const
 {
 	for (int i = 0, n = sizeof(x86_Registers)/ sizeof(x86_Registers[0]); i < n; i++) 
 	{
@@ -573,7 +573,7 @@ void CRegInfo::Map_GPR_32bit (int MipsReg, bool SignValue, int MipsRegToLoad)
 			CPU_Message("    regcache: unallocate %s from high 32bit of %s",x86_Name(GetMipsRegMapHi(MipsReg)),CRegName::GPR_Hi[MipsReg]);
 			SetX86MapOrder(GetMipsRegMapHi(MipsReg),0);
 			SetX86Mapped(GetMipsRegMapHi(MipsReg),NotMapped);
-			SetX86Protected(GetMipsRegMapHi(MipsReg),FALSE);
+			SetX86Protected(GetMipsRegMapHi(MipsReg), false);
 			SetMipsRegHi(MipsReg,0);
 		}
 		Reg = GetMipsRegMapLo(MipsReg);
@@ -605,7 +605,7 @@ void CRegInfo::Map_GPR_32bit (int MipsReg, bool SignValue, int MipsRegToLoad)
 		XorX86RegToX86Reg(Reg,Reg);
 	}
 	SetX86Mapped(Reg,GPR_Mapped);
-	SetX86Protected(Reg,TRUE);
+	SetX86Protected(Reg, true);
 	SetMipsRegMapLo(MipsReg,Reg);
 	SetMipsRegState(MipsReg,SignValue ? STATE_MAPPED_32_SIGN : STATE_MAPPED_32_ZERO);
 }
@@ -628,25 +628,25 @@ void CRegInfo::Map_GPR_64bit ( int MipsReg, int MipsRegToLoad)
 			if (bHaveDebugger()) { g_Notify->DisplayError(L"Map_GPR_64bit\n\nOut of registers"); }
 			return; 
 		}
-		SetX86Protected(x86Hi,TRUE);
+		SetX86Protected(x86Hi, true);
 
 		x86lo = FreeX86Reg();
 		if (x86lo < 0) {  g_Notify->DisplayError(L"Map_GPR_64bit\n\nOut of registers"); return; }
-		SetX86Protected(x86lo,TRUE);
+		SetX86Protected(x86lo, true);
 		
 		CPU_Message("    regcache: allocate %s to hi word of %s",x86_Name(x86Hi),CRegName::GPR[MipsReg]);
 		CPU_Message("    regcache: allocate %s to low word of %s",x86_Name(x86lo),CRegName::GPR[MipsReg]);
 	} else {
 		x86lo = GetMipsRegMapLo(MipsReg);
 		if (Is32Bit(MipsReg)) {
-			SetX86Protected(x86lo,TRUE);
+			SetX86Protected(x86lo, true);
 			x86Hi = FreeX86Reg();
 			if (x86Hi == x86_Unknown)
 			{
 				g_Notify->BreakPoint(__FILEW__,__LINE__); 
 				return;
 			}
-			SetX86Protected(x86Hi,TRUE);
+			SetX86Protected(x86Hi, true);
 
 			CPU_Message("    regcache: allocate %s to hi word of %s",x86_Name(x86Hi),CRegName::GPR[MipsReg]);
 		} else {
@@ -710,7 +710,7 @@ CPU_Message("Map_GPR_64bit 11");
 	SetMipsRegState(MipsReg,STATE_MAPPED_64);
 }
 
-CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL LoadHiWord)
+CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, bool LoadHiWord)
 {
 	int count;
 
@@ -771,7 +771,7 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL Lo
 			{
 				if (NewReg == x86_Unknown)
 				{
-					UnMap_GPR(count,TRUE);
+					UnMap_GPR(count, true);
 					break;
 				}
 				CPU_Message("    regcache: change allocation of %s from %s to %s",CRegName::GPR[count],x86_Name(Reg),x86_Name(NewReg));
@@ -779,14 +779,15 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL Lo
 				SetX86MapOrder(NewReg,GetX86MapOrder(Reg));
 				SetMipsRegMapLo(count,NewReg);
 				MoveX86RegToX86Reg(Reg,NewReg);
-				if (MipsReg == count && LoadHiWord == FALSE) { MipsReg = -1; }
+				if (MipsReg == count && !LoadHiWord)
+					MipsReg = -1;
 				break;
 			}
-			if (Is64Bit(count) && GetMipsRegMapHi(count) == Reg) 
+			if (Is64Bit(count) && GetMipsRegMapHi(count) == Reg)
 			{
-				if (NewReg == x86_Unknown) 
+				if (NewReg == x86_Unknown)
 				{
-					UnMap_GPR(count,TRUE);
+					UnMap_GPR(count, true);
 					break;
 				}
 				CPU_Message("    regcache: change allocation of %s from %s to %s",CRegName::GPR_Hi[count],x86_Name(Reg),x86_Name(NewReg));
@@ -794,7 +795,8 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL Lo
 				SetX86MapOrder(NewReg,GetX86MapOrder(Reg));
 				SetMipsRegMapHi(count,NewReg);
 				MoveX86RegToX86Reg(Reg,NewReg);
-				if (MipsReg == count && LoadHiWord == TRUE) { MipsReg = -1; }
+				if (MipsReg == count && LoadHiWord)
+					MipsReg = -1;
 				break;
 			}
 		}
@@ -822,7 +824,7 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL Lo
 					MoveConstToX86reg(0,Reg);
 				}
 			} else {
-				if (Is64Bit(MipsReg)) 
+				if (Is64Bit(MipsReg))
 				{
 					MoveConstToX86reg(GetMipsRegHi(MipsReg),Reg);
 				} else {
@@ -840,11 +842,11 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL Lo
 		}
 	}
 	SetX86Mapped(Reg,Temp_Mapped);
-	SetX86Protected(Reg,TRUE);
-	for (count = 0; count < 10; count ++) 
+	SetX86Protected(Reg, true);
+	for (count = 0; count < 10; count++)
 	{
 		int MapOrder = GetX86MapOrder((x86Reg)count);
-		if (MapOrder > 0) { 
+		if (MapOrder > 0) {
 			SetX86MapOrder((x86Reg)count,MapOrder + 1);
 		}
 	}
@@ -853,22 +855,28 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL Lo
 }
 
 void CRegInfo::ProtectGPR(DWORD Reg) {
-	if (IsUnknown(Reg) || IsConst(Reg)) { return; }
-	if (Is64Bit(Reg)) {
-		SetX86Protected(GetMipsRegMapHi(Reg),TRUE);
+	if (IsUnknown(Reg) || IsConst(Reg)) {
+		return;
 	}
-	SetX86Protected(GetMipsRegMapLo(Reg),TRUE);
+	if (Is64Bit(Reg)) {
+		SetX86Protected(GetMipsRegMapHi(Reg), true);
+	}
+
+	SetX86Protected(GetMipsRegMapLo(Reg), true);
 }
 
 void CRegInfo::UnProtectGPR(DWORD Reg) {
-	if (IsUnknown(Reg) || IsConst(Reg)) { return; }
-	if (Is64Bit(Reg)) {
-		SetX86Protected(GetMipsRegMapHi(Reg),false);
+	if (IsUnknown(Reg) || IsConst(Reg)) {
+		return;
 	}
+	if (Is64Bit(Reg)) {
+		SetX86Protected(GetMipsRegMapHi(Reg), false);
+	}
+
 	SetX86Protected(GetMipsRegMapLo(Reg),false);
 }
 
-void CRegInfo::ResetX86Protection (void)
+void CRegInfo::ResetX86Protection()
 {
 	for (int count = 0; count < 10; count ++) 
 	{ 
@@ -876,29 +884,29 @@ void CRegInfo::ResetX86Protection (void)
 	}
 }
 
-BOOL CRegInfo::RegInStack( int Reg, FPU_STATE Format) {
-	int i;
-
-	for (i = 0; i < 8; i++) 
+bool CRegInfo::RegInStack( int Reg, FPU_STATE Format) {
+	for (int i = 0; i < 8; i++)
 	{
-		if (x86fpu_MappedTo[i] == Reg) 
+		if (x86fpu_MappedTo[i] == Reg)
 		{
-			if (x86fpu_State[i] == Format || Format == FPU_Any) 
-			{ 
-				return TRUE; 
+			if (x86fpu_State[i] == Format || Format == FPU_Any)
+			{
+				return true;
 			}
-			return FALSE;
+
+			return false;
 		}
 	}
-	return FALSE;
+
+	return false;
 }
 
-void CRegInfo::UnMap_AllFPRs ( void )
+void CRegInfo::UnMap_AllFPRs()
 {
 	for (;;) {
 		int StackPos = StackTopPos();
 		if (x86fpu_MappedTo[StackPos] != -1 ) {
-			UnMap_FPR(x86fpu_MappedTo[StackPos],TRUE);
+			UnMap_FPR(x86fpu_MappedTo[StackPos], true);
 			continue;
 		}
 		//see if any more registers mapped
@@ -931,7 +939,7 @@ void CRegInfo::UnMap_FPR (int Reg, int WriteBackValue )
 				} else {
 					CRegInfo::FPU_ROUND RoundingModel = FpuRoundingModel(StackTopPos());
 					FPU_STATE RegState  = x86fpu_State[StackTopPos()];
-					BOOL Changed        = x86fpu_StateChanged[StackTopPos()];
+					bool Changed        = x86fpu_StateChanged[StackTopPos()];
 					DWORD MappedTo      = x86fpu_MappedTo[StackTopPos()];
 					FpuRoundingModel(StackTopPos()) = FpuRoundingModel(i);
 					x86fpu_MappedTo[StackTopPos()]      = x86fpu_MappedTo[i];
@@ -948,37 +956,37 @@ void CRegInfo::UnMap_FPR (int Reg, int WriteBackValue )
 			FixRoundModel(FpuRoundingModel(i));
 
 			RegPos = StackTopPos();
-			x86Reg TempReg = Map_TempReg(x86_Any,-1,FALSE);
+			x86Reg TempReg = Map_TempReg(x86_Any, -1, false);
 			switch (x86fpu_State[StackTopPos()]) {
 			case FPU_Dword: 
 				sprintf(Name,"_FPR_S[%d]",x86fpu_MappedTo[StackTopPos()]);
 				MoveVariableToX86reg(&_FPR_S[x86fpu_MappedTo[StackTopPos()]],Name,TempReg);
-				fpuStoreIntegerDwordFromX86Reg(&StackTopPos(),TempReg, TRUE); 
+				fpuStoreIntegerDwordFromX86Reg(&StackTopPos(),TempReg, true);
 				break;
 			case FPU_Qword: 
 				sprintf(Name,"_FPR_D[%d]",x86fpu_MappedTo[StackTopPos()]);
 				MoveVariableToX86reg(&_FPR_D[x86fpu_MappedTo[StackTopPos()]],Name,TempReg);
-				fpuStoreIntegerQwordFromX86Reg(&StackTopPos(),TempReg, TRUE); 
+				fpuStoreIntegerQwordFromX86Reg(&StackTopPos(),TempReg, true);
 				break;
 			case FPU_Float: 
 				sprintf(Name,"_FPR_S[%d]",x86fpu_MappedTo[StackTopPos()]);
 				MoveVariableToX86reg(&_FPR_S[x86fpu_MappedTo[StackTopPos()]],Name,TempReg);
-				fpuStoreDwordFromX86Reg(&StackTopPos(),TempReg, TRUE); 
+				fpuStoreDwordFromX86Reg(&StackTopPos(),TempReg, true);
 				break;
 			case FPU_Double: 
 				sprintf(Name,"_FPR_D[%d]",x86fpu_MappedTo[StackTopPos()]);
 				MoveVariableToX86reg(&_FPR_D[x86fpu_MappedTo[StackTopPos()]],Name,TempReg);
-				fpuStoreQwordFromX86Reg(&StackTopPos(),TempReg, TRUE); 
+				fpuStoreQwordFromX86Reg(&StackTopPos(),TempReg, true);
 				break;
 			default:
-				if (bHaveDebugger()) { g_Notify->DisplayError(__FUNCTIONW__ L"\nUnknown format to load %d",x86fpu_State[StackTopPos()]); }
+				if (bHaveDebugger()) { g_Notify->DisplayError(stdstr_f(__FUNCTION__ "\nUnknown format to load %d",x86fpu_State[StackTopPos()]).ToUTF16().c_str()); }
 			}
-			SetX86Protected(TempReg,FALSE);
+			SetX86Protected(TempReg, false);
 			FpuRoundingModel(RegPos) = RoundDefault;
 			x86fpu_MappedTo[RegPos]      = -1;
 			x86fpu_State[RegPos]         = FPU_Unknown;
 			x86fpu_StateChanged[RegPos]  = false;
-		} else {				
+		} else {
 			fpuFree((x86FpuValues)((i - StackTopPos()) & 7));
 			FpuRoundingModel(i) = RoundDefault;
 			x86fpu_MappedTo[i]      = -1;
@@ -1022,11 +1030,11 @@ void CRegInfo::UnMap_GPR (DWORD Reg, bool WriteBackValue)
 	if (Is64Bit(Reg)) {
 		CPU_Message("    regcache: unallocate %s from %s",x86_Name(GetMipsRegMapHi(Reg)),CRegName::GPR_Hi[Reg]);
 		SetX86Mapped(GetMipsRegMapHi(Reg),NotMapped);
-		SetX86Protected(GetMipsRegMapHi(Reg),FALSE);
+		SetX86Protected(GetMipsRegMapHi(Reg), false);
 	}
 	CPU_Message("    regcache: unallocate %s from %s",x86_Name(GetMipsRegMapLo(Reg)),CRegName::GPR_Lo[Reg]);
 	SetX86Mapped(GetMipsRegMapLo(Reg),NotMapped);
-	SetX86Protected(GetMipsRegMapLo(Reg),FALSE);
+	SetX86Protected(GetMipsRegMapLo(Reg), false);
 	if (!WriteBackValue)
 	{ 
 		SetMipsRegState(Reg,STATE_UNKNOWN);
@@ -1051,7 +1059,7 @@ void CRegInfo::UnMap_GPR (DWORD Reg, bool WriteBackValue)
 	SetMipsRegState(Reg,STATE_UNKNOWN);
 }
 
-CX86Ops::x86Reg CRegInfo::UnMap_TempReg ( void ) 
+CX86Ops::x86Reg CRegInfo::UnMap_TempReg()
 {
 	CX86Ops::x86Reg Reg = x86_Unknown;
 
@@ -1075,7 +1083,7 @@ CX86Ops::x86Reg CRegInfo::UnMap_TempReg ( void )
 	return Reg;
 }
 
-bool CRegInfo::UnMap_X86reg ( CX86Ops::x86Reg Reg )
+bool CRegInfo::UnMap_X86reg(CX86Ops::x86Reg Reg)
 {
 	int count;
 
@@ -1083,60 +1091,66 @@ bool CRegInfo::UnMap_X86reg ( CX86Ops::x86Reg Reg )
 	{
 		if (!GetX86Protected(Reg))
 		{
-			return TRUE; 
+			return true;
 		}
-	} else if (GetX86Mapped(Reg) == CRegInfo::GPR_Mapped) {
+	}
+	else if (GetX86Mapped(Reg) == CRegInfo::GPR_Mapped)
+	{
 		for (count = 1; count < 32; count ++) 
 		{
 			if (!IsMapped(count)) 
-			{
 				continue;
-			}
+
 			if (Is64Bit(count) && GetMipsRegMapHi(count) == Reg) 
 			{
-				if (GetX86Protected(Reg) == FALSE) 
+				if (!GetX86Protected(Reg))
 				{
-					UnMap_GPR(count,TRUE);
-					return TRUE;
+					UnMap_GPR(count, true);
+					return true;
 				}
 				break;
 			} 
-			if (GetMipsRegMapLo(count) == Reg) 
+			if (GetMipsRegMapLo(count) == Reg)
 			{
-				if (GetX86Protected(Reg) == FALSE) 
+				if (!GetX86Protected(Reg))
 				{
-					UnMap_GPR(count,TRUE);
-					return TRUE;
+					UnMap_GPR(count, true);
+					return true;
 				}
 				break;
 			}
 		}
-	} else if (GetX86Mapped(Reg) == CRegInfo::Temp_Mapped) { 
-		if (GetX86Protected(Reg) == FALSE) {
+	}
+	else if (GetX86Mapped(Reg) == CRegInfo::Temp_Mapped)
+	{
+		if (!GetX86Protected(Reg)) {
 			CPU_Message("    regcache: unallocate %s from temp storage",x86_Name(Reg));
 			SetX86Mapped(Reg,NotMapped);
-			return TRUE;
+			return true;
 		}
-	} else if (GetX86Mapped(Reg) == CRegInfo::Stack_Mapped) { 
+	}
+	else if (GetX86Mapped(Reg) == CRegInfo::Stack_Mapped)
+	{
 		CPU_Message("    regcache: unallocate %s from Memory Stack",x86_Name(Reg));
 		MoveX86regToVariable(Reg,&(g_Recompiler->MemoryStackPos()),"MemoryStack");
 		SetX86Mapped(Reg,NotMapped);
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+
+	return false;
 }
 
-void CRegInfo::WriteBackRegisters ()
+void CRegInfo::WriteBackRegisters()
 {
 	UnMap_AllFPRs();
 
 	int count;
-	bool bEdiZero = FALSE;
-	bool bEsiSign = FALSE;
+	bool bEdiZero = false;
+	bool bEsiSign = false;
 
 	int X86RegCount = sizeof(x86_Registers)/ sizeof(x86_Registers[0]);
-	for (int i = 0; i < X86RegCount; i++) { SetX86Protected(x86_Registers[i],FALSE); } 
-	for (int i = 0; i < X86RegCount; i++) { UnMap_X86reg(x86_Registers[i]); } 
+	for (int i = 0; i < X86RegCount; i++) { SetX86Protected(x86_Registers[i], false); }
+	for (int i = 0; i < X86RegCount; i++) { UnMap_X86reg(x86_Registers[i]); }
 
 	/*************************************/
 	
@@ -1149,12 +1163,12 @@ void CRegInfo::WriteBackRegisters ()
 				if (!bEdiZero && (!GetMipsRegLo(count) || !(GetMipsRegLo(count) & 0x80000000))) 
 				{
 					XorX86RegToX86Reg(x86_EDI, x86_EDI);
-					bEdiZero = TRUE;
+					bEdiZero = true;
 				}
 				if (!bEsiSign && (GetMipsRegLo(count) & 0x80000000))
 				{
 					MoveConstToX86reg(0xFFFFFFFF, x86_ESI);
-					bEsiSign = TRUE;
+					bEsiSign = true;
 				}
 				if ((GetMipsRegLo(count) & 0x80000000) != 0) 
 				{
@@ -1173,7 +1187,7 @@ void CRegInfo::WriteBackRegisters ()
 					if (!bEdiZero)
 					{
 						XorX86RegToX86Reg(x86_EDI, x86_EDI);
-						bEdiZero = TRUE;
+						bEdiZero = true;
 					}
 				}
 				MoveX86regToVariable(x86_EDI,&_GPR[count].UW[0],CRegName::GPR_Lo[count]);
@@ -1185,7 +1199,7 @@ void CRegInfo::WriteBackRegisters ()
 					if (!bEsiSign)
 					{
 						MoveConstToX86reg(0xFFFFFFFF, x86_ESI);
-						bEsiSign = TRUE;
+						bEsiSign = true;
 					}
 				}
 				MoveX86regToVariable(x86_ESI,&_GPR[count].UW[0],CRegName::GPR_Lo[count]);
@@ -1203,7 +1217,7 @@ void CRegInfo::WriteBackRegisters ()
 				if (!bEdiZero) 
 				{
 					XorX86RegToX86Reg(x86_EDI, x86_EDI);
-					bEdiZero = TRUE;
+					bEdiZero = true;
 				}
 				MoveX86regToVariable(x86_EDI,&_GPR[count].UW[1],CRegName::GPR_Hi[count]);
 			}
@@ -1215,7 +1229,7 @@ void CRegInfo::WriteBackRegisters ()
 					if (!bEdiZero)
 					{
 						XorX86RegToX86Reg(x86_EDI, x86_EDI);
-						bEdiZero = TRUE;
+						bEdiZero = true;
 					}
 				}
 				MoveX86regToVariable(x86_EDI,&_GPR[count].UW[0],CRegName::GPR_Lo[count]);
@@ -1230,11 +1244,11 @@ void CRegInfo::WriteBackRegisters ()
 		case CRegInfo::STATE_CONST_64:
 			if (GetMipsRegLo(count) == 0 || GetMipsRegHi(count) == 0) {
 				XorX86RegToX86Reg(x86_EDI, x86_EDI);
-				bEdiZero = TRUE;
+				bEdiZero = true;
 			}
 			if (GetMipsRegLo(count) == 0xFFFFFFFF || GetMipsRegHi(count) == 0xFFFFFFFF) {
 				MoveConstToX86reg(0xFFFFFFFF, x86_ESI);
-				bEsiSign = TRUE;
+				bEsiSign = true;
 			}
 
 			if (GetMipsRegHi(count) == 0) {
diff --git a/Source/Project64/N64 System/Recompiler/Reg Info.h b/Source/Project64/N64 System/Recompiler/Reg Info.h
index 4b6376706..e3f3c50e9 100644
--- a/Source/Project64/N64 System/Recompiler/Reg Info.h	
+++ b/Source/Project64/N64 System/Recompiler/Reg Info.h	
@@ -73,104 +73,104 @@ public:
 	void   FixRoundModel      ( FPU_ROUND RoundMethod );
 	void   ChangeFPURegFormat ( int Reg, FPU_STATE OldFormat, FPU_STATE NewFormat, FPU_ROUND RoundingModel );
 	void   Load_FPR_ToTop     ( int Reg, int RegToLoad, FPU_STATE Format);
-	BOOL   RegInStack         ( int Reg, FPU_STATE Format );
-	void   UnMap_AllFPRs      ( void );
+	bool   RegInStack         ( int Reg, FPU_STATE Format );
+	void   UnMap_AllFPRs      ();
 	void   UnMap_FPR          ( int Reg, int WriteBackValue );
-	x86FpuValues StackPosition      ( int Reg );
+	x86FpuValues StackPosition( int Reg );
 
-	x86Reg FreeX86Reg         ( void );
-	x86Reg Free8BitX86Reg     ( void );
+	x86Reg FreeX86Reg         ();
+	x86Reg Free8BitX86Reg     ();
 	void   Map_GPR_32bit      ( int MipsReg, bool SignValue, int MipsRegToLoad );
 	void   Map_GPR_64bit      ( int MipsReg, int MipsRegToLoad );
-	x86Reg Get_MemoryStack    ( void ) const;
+	x86Reg Get_MemoryStack    () const;
 	x86Reg Map_MemoryStack    ( x86Reg Reg, bool bMapRegister, bool LoadValue = true );
-	x86Reg Map_TempReg        ( x86Reg Reg, int MipsReg, BOOL LoadHiWord );
+	x86Reg Map_TempReg        ( x86Reg Reg, int MipsReg, bool LoadHiWord );
 	void   ProtectGPR         ( DWORD Reg );
 	void   UnProtectGPR       ( DWORD Reg );
-	void   ResetX86Protection ( void );
-	x86Reg UnMap_TempReg      ( void );
+	void   ResetX86Protection ();
+	x86Reg UnMap_TempReg      ();
 	void   UnMap_GPR          ( DWORD Reg, bool WriteBackValue );
 	bool   UnMap_X86reg       ( x86Reg Reg );
-	void   WriteBackRegisters ( void );
+	void   WriteBackRegisters ();
 
-	inline bool IsKnown(int Reg) const   { return ((GetMipsRegState(Reg) & STATE_KNOWN_VALUE) != 0); }
-	inline bool IsUnknown(int Reg) const { return ((GetMipsRegState(Reg) & STATE_KNOWN_VALUE) == 0); }
-	inline bool IsModified(int Reg) const { return ((GetMipsRegState(Reg) & STATE_MODIFIED) != 0); }
+	bool IsKnown(int Reg) const   { return ((GetMipsRegState(Reg) & STATE_KNOWN_VALUE) != 0); }
+	bool IsUnknown(int Reg) const { return ((GetMipsRegState(Reg) & STATE_KNOWN_VALUE) == 0); }
+	bool IsModified(int Reg) const { return ((GetMipsRegState(Reg) & STATE_MODIFIED) != 0); }
 
-	inline bool IsMapped(int Reg) const	{ return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_X86_MAPPED)) == (STATE_KNOWN_VALUE | STATE_X86_MAPPED)); }
-	inline bool IsConst(int Reg) const	{ return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_X86_MAPPED)) == STATE_KNOWN_VALUE); }
+	bool IsMapped(int Reg) const { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_X86_MAPPED)) == (STATE_KNOWN_VALUE | STATE_X86_MAPPED)); }
+	bool IsConst(int Reg) const  { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_X86_MAPPED)) == STATE_KNOWN_VALUE); }
 
-	inline bool IsSigned(int Reg) const	{ return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_SIGN)) == (STATE_KNOWN_VALUE | STATE_SIGN)); }
-	inline bool IsUnsigned(int Reg) const { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_SIGN)) == STATE_KNOWN_VALUE); }
+	bool IsSigned(int Reg) const   { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_SIGN)) == (STATE_KNOWN_VALUE | STATE_SIGN)); }
+	bool IsUnsigned(int Reg) const { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_SIGN)) == STATE_KNOWN_VALUE); }
 
-	inline bool Is32Bit(int Reg) const	{ return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_32BIT)) == (STATE_KNOWN_VALUE | STATE_32BIT)); }
-	inline bool Is64Bit(int Reg) const	{ return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_32BIT)) == STATE_KNOWN_VALUE); }
+	bool Is32Bit(int Reg) const { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_32BIT)) == (STATE_KNOWN_VALUE | STATE_32BIT)); }
+	bool Is64Bit(int Reg) const { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_32BIT)) == STATE_KNOWN_VALUE); }
 
-	inline bool Is32BitMapped(int Reg) const { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_32BIT | STATE_X86_MAPPED)) == (STATE_KNOWN_VALUE | STATE_32BIT | STATE_X86_MAPPED)); }
-	inline bool Is64BitMapped(int Reg) const { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_32BIT | STATE_X86_MAPPED)) == (STATE_KNOWN_VALUE | STATE_X86_MAPPED)); }
+	bool Is32BitMapped(int Reg) const { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_32BIT | STATE_X86_MAPPED)) == (STATE_KNOWN_VALUE | STATE_32BIT | STATE_X86_MAPPED)); }
+	bool Is64BitMapped(int Reg) const { return ((GetMipsRegState(Reg) & (STATE_KNOWN_VALUE | STATE_32BIT | STATE_X86_MAPPED)) == (STATE_KNOWN_VALUE | STATE_X86_MAPPED)); }
 
-	inline REG_STATE         GetMipsRegState ( int Reg ) const { return m_MIPS_RegState[Reg]; }
-	inline unsigned __int64  GetMipsReg      ( int Reg ) const { return m_MIPS_RegVal[Reg].UDW; }
-	inline __int64           GetMipsReg_S    ( int Reg ) const { return m_MIPS_RegVal[Reg].DW; }
-	inline DWORD             GetMipsRegLo    ( int Reg ) const { return m_MIPS_RegVal[Reg].UW[0]; }
-	inline long              GetMipsRegLo_S  ( int Reg ) const { return m_MIPS_RegVal[Reg].W[0]; }
-	inline DWORD             GetMipsRegHi    ( int Reg ) const { return m_MIPS_RegVal[Reg].UW[1]; }
-	inline long              GetMipsRegHi_S  ( int Reg ) const { return m_MIPS_RegVal[Reg].W[1]; }
-	inline CX86Ops::x86Reg   GetMipsRegMapLo ( int Reg ) const { return m_RegMapLo[Reg]; }
-	inline CX86Ops::x86Reg   GetMipsRegMapHi ( int Reg ) const { return m_RegMapHi[Reg]; }
+	REG_STATE         GetMipsRegState ( int Reg ) const { return m_MIPS_RegState[Reg]; }
+	unsigned __int64  GetMipsReg      ( int Reg ) const { return m_MIPS_RegVal[Reg].UDW; }
+	__int64           GetMipsReg_S    ( int Reg ) const { return m_MIPS_RegVal[Reg].DW; }
+	DWORD             GetMipsRegLo    ( int Reg ) const { return m_MIPS_RegVal[Reg].UW[0]; }
+	long              GetMipsRegLo_S  ( int Reg ) const { return m_MIPS_RegVal[Reg].W[0]; }
+	DWORD             GetMipsRegHi    ( int Reg ) const { return m_MIPS_RegVal[Reg].UW[1]; }
+	long              GetMipsRegHi_S  ( int Reg ) const { return m_MIPS_RegVal[Reg].W[1]; }
+	CX86Ops::x86Reg   GetMipsRegMapLo ( int Reg ) const { return m_RegMapLo[Reg]; }
+	CX86Ops::x86Reg   GetMipsRegMapHi ( int Reg ) const { return m_RegMapHi[Reg]; }
 
-	inline DWORD             GetX86MapOrder  ( x86Reg Reg ) const { return m_x86reg_MapOrder[Reg]; }
-	inline bool              GetX86Protected ( x86Reg Reg )	const { return m_x86reg_Protected[Reg]; }
-	inline REG_MAPPED        GetX86Mapped    ( x86Reg Reg )	const { return m_x86reg_MappedTo[Reg]; }
+	DWORD             GetX86MapOrder  ( x86Reg Reg ) const { return m_x86reg_MapOrder[Reg]; }
+	bool              GetX86Protected ( x86Reg Reg ) const { return m_x86reg_Protected[Reg]; }
+	REG_MAPPED        GetX86Mapped    ( x86Reg Reg ) const { return m_x86reg_MappedTo[Reg]; }
 
-	inline DWORD             GetBlockCycleCount ( void ) const { return m_CycleCount; }
+	DWORD             GetBlockCycleCount() const { return m_CycleCount; }
 
-	inline void              SetMipsReg      ( int Reg, unsigned __int64 Value ) { m_MIPS_RegVal[Reg].UDW = Value; }
-	inline void              SetMipsReg_S    ( int Reg, __int64 Value)           { m_MIPS_RegVal[Reg].DW = Value; }
-	inline void              SetMipsRegLo    ( int Reg, DWORD Value )            { m_MIPS_RegVal[Reg].UW[0] = Value; }
-	inline void              SetMipsRegHi    ( int Reg, DWORD Value )            { m_MIPS_RegVal[Reg].UW[1] = Value; }
-	inline void              SetMipsRegMapLo ( int GetMipsReg, x86Reg Reg )         { m_RegMapLo[GetMipsReg] = Reg; }
-	inline void              SetMipsRegMapHi ( int GetMipsReg, x86Reg Reg )         { m_RegMapHi[GetMipsReg] = Reg; }
-	inline void              SetMipsRegState ( int GetMipsReg, REG_STATE State )    { m_MIPS_RegState[GetMipsReg] = State; }
+	void              SetMipsReg      ( int Reg, unsigned __int64 Value ) { m_MIPS_RegVal[Reg].UDW = Value; }
+	void              SetMipsReg_S    ( int Reg, __int64 Value)           { m_MIPS_RegVal[Reg].DW = Value; }
+	void              SetMipsRegLo    ( int Reg, DWORD Value )            { m_MIPS_RegVal[Reg].UW[0] = Value; }
+	void              SetMipsRegHi    ( int Reg, DWORD Value )            { m_MIPS_RegVal[Reg].UW[1] = Value; }
+	void              SetMipsRegMapLo ( int GetMipsReg, x86Reg Reg )      { m_RegMapLo[GetMipsReg] = Reg; }
+	void              SetMipsRegMapHi ( int GetMipsReg, x86Reg Reg )      { m_RegMapHi[GetMipsReg] = Reg; }
+	void              SetMipsRegState ( int GetMipsReg, REG_STATE State ) { m_MIPS_RegState[GetMipsReg] = State; }
 
-	inline void              SetX86MapOrder  ( x86Reg Reg, DWORD Order )         { m_x86reg_MapOrder[Reg] = Order; }
-	inline void              SetX86Protected ( x86Reg Reg, bool Protected )	     { m_x86reg_Protected[Reg] = Protected; }
-	inline void              SetX86Mapped    ( x86Reg Reg, REG_MAPPED Mapping )  { m_x86reg_MappedTo[Reg] = Mapping; }
+	void              SetX86MapOrder  ( x86Reg Reg, DWORD Order )         { m_x86reg_MapOrder[Reg] = Order; }
+	void              SetX86Protected ( x86Reg Reg, bool Protected )      { m_x86reg_Protected[Reg] = Protected; }
+	void              SetX86Mapped    ( x86Reg Reg, REG_MAPPED Mapping )  { m_x86reg_MappedTo[Reg] = Mapping; }
 
 
-	inline void  SetBlockCycleCount ( DWORD CyleCount ) { m_CycleCount = CyleCount; }
+	void  SetBlockCycleCount(DWORD CyleCount) { m_CycleCount = CyleCount; }
 
-	inline int & StackTopPos ( void ) { return m_Stack_TopPos; }
-	inline int & FpuMappedTo( int Reg) { return x86fpu_MappedTo[Reg]; }
-	inline FPU_STATE & FpuState(int Reg) { return x86fpu_State[Reg]; }
-	inline FPU_ROUND & FpuRoundingModel(int Reg) { return x86fpu_RoundingModel[Reg]; }
-	inline bool & FpuBeenUsed (void )	{ return m_Fpu_Used; }
+	int & StackTopPos() { return m_Stack_TopPos; }
+	int & FpuMappedTo(int Reg) { return x86fpu_MappedTo[Reg]; }
+	FPU_STATE & FpuState(int Reg) { return x86fpu_State[Reg]; }
+	FPU_ROUND & FpuRoundingModel(int Reg) { return x86fpu_RoundingModel[Reg]; }
+	bool & FpuBeenUsed() { return m_Fpu_Used; }
 	
-	inline FPU_ROUND GetRoundingModel ( void ) const { return m_RoundingModel; }
-	inline void      SetRoundingModel ( FPU_ROUND RoundingModel ) { m_RoundingModel = RoundingModel; }
+	FPU_ROUND GetRoundingModel() const { return m_RoundingModel; }
+	void      SetRoundingModel(FPU_ROUND RoundingModel) { m_RoundingModel = RoundingModel; }
 
 private:
-	const char * RoundingModelName ( FPU_ROUND RoundType );
-	x86Reg UnMap_8BitTempReg ( void );
+	const char * RoundingModelName(FPU_ROUND RoundType);
+	x86Reg UnMap_8BitTempReg();
 
 	//r4k
 	REG_STATE   m_MIPS_RegState[32];
-	MIPS_DWORD	m_MIPS_RegVal[32];
-	x86Reg	    m_RegMapHi[32];
-	x86Reg	    m_RegMapLo[32];
+	MIPS_DWORD  m_MIPS_RegVal[32];
+	x86Reg      m_RegMapHi[32];
+	x86Reg      m_RegMapLo[32];
 
-	REG_MAPPED	m_x86reg_MappedTo[10];
-	DWORD		m_x86reg_MapOrder[10];
-	bool		m_x86reg_Protected[10];
+	REG_MAPPED  m_x86reg_MappedTo[10];
+	DWORD       m_x86reg_MapOrder[10];
+	bool        m_x86reg_Protected[10];
 	
-	DWORD		m_CycleCount;
+	DWORD       m_CycleCount;
 
 	//FPU
-	int			m_Stack_TopPos;
-	int			x86fpu_MappedTo[8];
-	FPU_STATE	x86fpu_State[8];
-	BOOL		x86fpu_StateChanged[8];
-	FPU_ROUND	x86fpu_RoundingModel[8];
+	int         m_Stack_TopPos;
+	int         x86fpu_MappedTo[8];
+	FPU_STATE   x86fpu_State[8];
+	bool        x86fpu_StateChanged[8];
+	FPU_ROUND   x86fpu_RoundingModel[8];
 	
 	bool        m_Fpu_Used;
 	FPU_ROUND   m_RoundingModel;
diff --git a/Source/Project64/N64 System/Recompiler/Section Info.cpp b/Source/Project64/N64 System/Recompiler/Section Info.cpp
index f43c05102..00cec2444 100644
--- a/Source/Project64/N64 System/Recompiler/Section Info.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Section Info.cpp	
@@ -103,7 +103,7 @@ void CCodeSection::UnlinkParent( CCodeSection * Parent, bool AllowDelete, bool C
 	}	
 }
 
-CCodeSection::~CCodeSection ( void )
+CCodeSection::~CCodeSection()
 {
 	while (ParentSection.size() > 0)
 	{
@@ -132,7 +132,7 @@ CCodeSection::~CCodeSection ( void )
 	}
 }
 
-DWORD CCodeSection::GetNewTestValue(void) 
+DWORD CCodeSection::GetNewTestValue()
 {
 	static DWORD LastTest = 0;
 	if (LastTest == 0xFFFFFFFF) { LastTest = 0; }
@@ -140,7 +140,7 @@ DWORD CCodeSection::GetNewTestValue(void)
 	return LastTest;
 }
 
-void CRegInfo::Initilize ( void )
+void CRegInfo::Initialize()
 {
 	int count;
 	
diff --git a/Source/Project64/N64 System/Recompiler/Section Info.h b/Source/Project64/N64 System/Recompiler/Section Info.h
index 90c55b562..e44a30a59 100644
--- a/Source/Project64/N64 System/Recompiler/Section Info.h	
+++ b/Source/Project64/N64 System/Recompiler/Section Info.h	
@@ -11,14 +11,11 @@
 #pragma once
 
 class CCodeSection;
-
-
 class CCodeBlock;
 
-
-typedef struct {
+struct BLOCK_PARENT {
 	CCodeSection * Parent;
-	CJumpInfo     * JumpInfo;
-} BLOCK_PARENT;
+	CJumpInfo    * JumpInfo;
+};
 
 typedef std::vector<BLOCK_PARENT> BLOCK_PARENT_LIST;
diff --git a/Source/Project64/N64 System/Recompiler/X86ops.cpp b/Source/Project64/N64 System/Recompiler/X86ops.cpp
index fce4210f4..9bf6c0df1 100644
--- a/Source/Project64/N64 System/Recompiler/X86ops.cpp	
+++ b/Source/Project64/N64 System/Recompiler/X86ops.cpp	
@@ -168,7 +168,7 @@ void CX86Ops::BreakPointNotification (const wchar_t * const FileName, const int
 	g_Notify->BreakPoint(FileName,LineNumber);
 }
 
-void CX86Ops::X86HardBreakPoint (void)
+void CX86Ops::X86HardBreakPoint()
 {
 	CPU_Message("      int 3");
 	PUTDST8(m_RecompPos,0xCC);
@@ -3007,13 +3007,13 @@ void CX86Ops::fpuAddRegPop(int * StackPos, x86FpuValues reg) {
 	}
 }
 
-void CX86Ops::fpuComDword(void *Variable, const char * VariableName, BOOL Pop) {
+void CX86Ops::fpuComDword(void *Variable, const char * VariableName, bool Pop) {
 	CPU_Message("      fcom%s ST(0), dword ptr [%s]", m_fpupop[Pop], VariableName);
-	PUTDST16(m_RecompPos, (Pop == TRUE) ? 0x1DD8 : 0x15D8);
+	PUTDST16(m_RecompPos, Pop ? 0x1DD8 : 0x15D8);
 	PUTDST32(m_RecompPos,Variable);
 }
 
-void CX86Ops::fpuComDwordRegPointer(x86Reg x86Pointer, BOOL Pop) {
+void CX86Ops::fpuComDwordRegPointer(x86Reg x86Pointer, bool Pop) {
 	WORD x86Command;
 
 	CPU_Message("      fcom%s ST(0), dword ptr [%s]",m_fpupop[Pop],x86_Name(x86Pointer));
@@ -3027,17 +3027,22 @@ void CX86Ops::fpuComDwordRegPointer(x86Reg x86Pointer, BOOL Pop) {
 	default:
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 	}
-	if (Pop) { x86Command |= 0x0800; }
+
+	if (Pop)
+	{
+		x86Command |= 0x0800;
+	}
+
 	PUTDST16(m_RecompPos,x86Command);
 }
 
-void CX86Ops::fpuComQword(void *Variable, const char * VariableName, BOOL Pop) {
+void CX86Ops::fpuComQword(void *Variable, const char * VariableName, bool Pop) {
 	CPU_Message("      fcom%s ST(0), qword ptr [%s]", m_fpupop[Pop], VariableName);
-	PUTDST16(m_RecompPos, (Pop == TRUE) ? 0x1DDC : 0x15DC);
+	PUTDST16(m_RecompPos, Pop ? 0x1DDC : 0x15DC);
 	PUTDST32(m_RecompPos,Variable);
 }
 
-void CX86Ops::fpuComQwordRegPointer(x86Reg x86Pointer, BOOL Pop) {
+void CX86Ops::fpuComQwordRegPointer(x86Reg x86Pointer, bool Pop) {
 	WORD x86Command;
 
 	CPU_Message("      fcom%s ST(0), qword ptr [%s]",m_fpupop[Pop],x86_Name(x86Pointer));
@@ -3051,12 +3056,17 @@ void CX86Ops::fpuComQwordRegPointer(x86Reg x86Pointer, BOOL Pop) {
 	default:
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 	}
-	if (Pop) { x86Command |= 0x0800; }
+
+	if (Pop)
+	{
+		x86Command |= 0x0800;
+	}
+
 	PUTDST16(m_RecompPos,x86Command);
 }
 
-void CX86Ops::fpuComReg(x86FpuValues x86reg, BOOL Pop) {
-	int s = (Pop == TRUE) ? 0x0800 : 0x0000;
+void CX86Ops::fpuComReg(x86FpuValues x86reg, bool Pop) {
+	int s = Pop ? 0x0800 : 0x0000;
 	CPU_Message("      fcom%s ST(0), %s", m_fpupop[Pop], fpu_Name(x86reg));
 
 	switch (x86reg) {
@@ -3460,18 +3470,24 @@ void CX86Ops::fpuStoreControl(void *Variable, const char * VariableName) {
 	PUTDST32(m_RecompPos,Variable);
 }
 
-void CX86Ops::fpuStoreDword(int * StackPos,void *Variable, const char * VariableName, BOOL pop) {
+void CX86Ops::fpuStoreDword(int * StackPos,void *Variable, const char * VariableName, bool pop) {
 	CPU_Message("      fst%s dword ptr [%s]", m_fpupop[pop], VariableName);
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-	PUTDST16(m_RecompPos,(pop == FALSE) ? 0x15D9 : 0x1DD9);
+
+	if (pop)
+		*StackPos = (*StackPos + 1) & 7;
+
+	PUTDST16(m_RecompPos, pop ? 0x1DD9 : 0x15D9);
 	PUTDST32(m_RecompPos,Variable);
 }
 
-void CX86Ops::fpuStoreDwordFromX86Reg(int * StackPos,x86Reg x86reg, BOOL pop) {
+void CX86Ops::fpuStoreDwordFromX86Reg(int * StackPos,x86Reg x86reg, bool pop) {
 	BYTE Command = 0;
 
 	CPU_Message("      fst%s dword ptr [%s]", m_fpupop[pop], x86_Name(x86reg));
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
+
+	if (pop)
+		*StackPos = (*StackPos + 1) & 7;
+
 	PUTDST8(m_RecompPos,0xD9);
 
 	switch (x86reg) {
@@ -3484,14 +3500,17 @@ void CX86Ops::fpuStoreDwordFromX86Reg(int * StackPos,x86Reg x86reg, BOOL pop) {
 	default:
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 	}
-	PUTDST8(m_RecompPos, (pop == FALSE) ? Command : (Command + 0x8));
+
+	PUTDST8(m_RecompPos, pop ? (Command + 0x8) : Command);
 }
 
-void CX86Ops::fpuStoreDwordToN64Mem(int * StackPos,x86Reg x86reg, BOOL Pop) {
-	int s = (Pop == TRUE) ? 0x0800 : 0;
+void CX86Ops::fpuStoreDwordToN64Mem(int * StackPos,x86Reg x86reg, bool Pop) {
+	int s = Pop ? 0x0800 : 0;
 
 	CPU_Message("      fst%s dword ptr [%s+N64mem]", m_fpupop[Pop], x86_Name(x86reg));
-	if (Pop) { *StackPos = (*StackPos + 1) & 7; }
+
+	if (Pop)
+		*StackPos = (*StackPos + 1) & 7;
 
 	switch (x86reg) {
 	case x86_EAX: PUTDST16(m_RecompPos,0x90D9|s); break;
@@ -3504,21 +3523,30 @@ void CX86Ops::fpuStoreDwordToN64Mem(int * StackPos,x86Reg x86reg, BOOL Pop) {
 	default:
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 	}
+
 	PUTDST32(m_RecompPos,g_MMU->Rdram());
 }
 
-void CX86Ops::fpuStoreIntegerDword(int * StackPos,void *Variable, const char * VariableName, BOOL pop) {
+void CX86Ops::fpuStoreIntegerDword(int * StackPos,void *Variable, const char * VariableName, bool pop) {
 	CPU_Message("      fist%s dword ptr [%s]", m_fpupop[pop], VariableName);
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-	PUTDST16(m_RecompPos, (pop == FALSE) ? 0x15DB : 0x1DDB);
+
+	if (pop)
+		*StackPos = (*StackPos + 1) & 7;
+
+	PUTDST16(m_RecompPos, pop ? 0x1DDB : 0x15DB);
 	PUTDST32(m_RecompPos,Variable);
 }
 
-void CX86Ops::fpuStoreIntegerDwordFromX86Reg(int * StackPos,x86Reg x86reg, BOOL pop) {
+void CX86Ops::fpuStoreIntegerDwordFromX86Reg(int * StackPos,x86Reg x86reg, bool pop) {
 	BYTE Command = 0;
 
 	CPU_Message("      fist%s dword ptr [%s]", m_fpupop[pop], x86_Name(x86reg));
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
+
+	if (pop)
+	{
+		*StackPos = (*StackPos + 1) & 7;
+	}
+
 	PUTDST8(m_RecompPos,0xDB);
 	
 	switch (x86reg) {
@@ -3531,22 +3559,37 @@ void CX86Ops::fpuStoreIntegerDwordFromX86Reg(int * StackPos,x86Reg x86reg, BOOL
 	default:
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 	}
-	PUTDST8(m_RecompPos, (pop == FALSE) ? Command : (Command + 0x8));
+
+	PUTDST8(m_RecompPos, pop ? (Command + 0x8) : Command);
 }
 
-void CX86Ops::fpuStoreIntegerQword(int * StackPos,void *Variable, const char * VariableName, BOOL pop) {
+void CX86Ops::fpuStoreIntegerQword(int * StackPos,void *Variable, const char * VariableName, bool pop) {
 	CPU_Message("      fist%s qword ptr [%s]", m_fpupop[pop], VariableName);
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
-	PUTDST16(m_RecompPos, (pop == FALSE) ? 0x35DF : 0x3DDF);
+
+	if (pop)
+	{
+		*StackPos = (*StackPos + 1) & 7;
+	}
+
+	PUTDST16(m_RecompPos, pop ? 0x3DDF : 0x35DF);
 	PUTDST32(m_RecompPos,Variable);
-	if (!pop) { X86BreakPoint(__FILEW__,__LINE__); }
+
+	if (!pop)
+	{
+		X86BreakPoint(__FILEW__,__LINE__);
+	}
 }
 
-void CX86Ops::fpuStoreIntegerQwordFromX86Reg(int * StackPos, x86Reg x86reg, BOOL pop) {
+void CX86Ops::fpuStoreIntegerQwordFromX86Reg(int * StackPos, x86Reg x86reg, bool pop) {
 	BYTE Command = 0;
 
 	CPU_Message("      fist%s qword ptr [%s]", m_fpupop[pop], x86_Name(x86reg));
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
+
+	if (pop)
+	{
+		*StackPos = (*StackPos + 1) & 7;
+	}
+
 	PUTDST8(m_RecompPos,0xDF);
 
 	switch (x86reg) {
@@ -3559,14 +3602,20 @@ void CX86Ops::fpuStoreIntegerQwordFromX86Reg(int * StackPos, x86Reg x86reg, BOOL
 	default:
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 	}
-	PUTDST8(m_RecompPos, (pop == FALSE) ? Command : (Command + 0x8));
+
+	PUTDST8(m_RecompPos, pop ? (Command + 0x8) : Command);
 }
 
-void CX86Ops::fpuStoreQwordFromX86Reg(int * StackPos, x86Reg x86reg, BOOL pop) {
+void CX86Ops::fpuStoreQwordFromX86Reg(int * StackPos, x86Reg x86reg, bool pop) {
 	BYTE Command = 0;
 
 	CPU_Message("      fst%s qword ptr [%s]", m_fpupop[pop], x86_Name(x86reg));
-	if (pop) { *StackPos = (*StackPos + 1) & 7; }
+
+	if (pop)
+	{
+		*StackPos = (*StackPos + 1) & 7;
+	}
+
 	PUTDST8(m_RecompPos,0xDD);
 
 	switch (x86reg) {
@@ -3579,7 +3628,8 @@ void CX86Ops::fpuStoreQwordFromX86Reg(int * StackPos, x86Reg x86reg, BOOL pop) {
 	default:
 		g_Notify->BreakPoint(__FILEW__,__LINE__);
 	}
-	PUTDST8(m_RecompPos, (pop == FALSE) ? Command : (Command + 0x8));
+
+	PUTDST8(m_RecompPos, pop ? (Command + 0x8) : Command);
 }
 
 void CX86Ops::fpuStoreStatus(void) {
@@ -3739,13 +3789,13 @@ const char * CX86Ops::fpu_Name ( x86FpuValues Reg ) {
 	return "???";
 }
 
-BOOL CX86Ops::Is8BitReg ( x86Reg Reg )
+bool CX86Ops::Is8BitReg(x86Reg Reg)
 {
-	if (Reg == x86_EAX) { return TRUE; }
-	if (Reg == x86_EBX) { return TRUE; }
-	if (Reg == x86_ECX) { return TRUE; }
-	if (Reg == x86_EDX) { return TRUE; }
-	return FALSE;
+	return (Reg == x86_EAX) ||
+	       (Reg == x86_EBX) ||
+	       (Reg == x86_ECX) ||
+	       (Reg == x86_EDX);
+
 }
 
 BYTE CX86Ops::CalcMultiplyCode (Multipler Multiply)
diff --git a/Source/Project64/N64 System/Recompiler/X86ops.h b/Source/Project64/N64 System/Recompiler/X86ops.h
index ced3ff94a..e2614d26f 100644
--- a/Source/Project64/N64 System/Recompiler/X86ops.h	
+++ b/Source/Project64/N64 System/Recompiler/X86ops.h	
@@ -76,7 +76,7 @@ protected:
 	static void AndVariableToX86Reg             ( void * Variable, const char * VariableName, x86Reg Reg );
 	static void AndVariableDispToX86Reg         ( void * Variable, const char * VariableName, x86Reg Reg, x86Reg AddrReg, Multipler Multiply);
 	static void AndX86RegToX86Reg               ( x86Reg Destination, x86Reg Source );
-	static void X86HardBreakPoint               ( void );
+	static void X86HardBreakPoint               ();
 	static void X86BreakPoint                   ( const wchar_t * FileName, int LineNumber );
 	static void Call_Direct                     ( void * FunctAddress, const char * FunctName );
 	static void Call_Indirect                   ( void * FunctAddress, const char * FunctName );
@@ -84,7 +84,7 @@ protected:
 	static void CompConstToX86reg               ( x86Reg Reg, DWORD Const );
 	static void CompConstToX86regPointer        ( x86Reg Reg, DWORD Const );
 	static void CompX86regToVariable            ( x86Reg Reg, void * Variable, const char * VariableName );
-	static void CompVariableToX86reg	        ( x86Reg Reg, void * Variable, const char * VariableName );
+	static void CompVariableToX86reg            ( x86Reg Reg, void * Variable, const char * VariableName );
 	static void CompX86RegToX86Reg              ( x86Reg Destination, x86Reg Source );
 	static void DecX86reg                       ( x86Reg Reg );
 	static void DivX86reg                       ( x86Reg reg );
@@ -181,13 +181,13 @@ protected:
 	static void OrVariableToX86Reg              ( void * Variable, const char * VariableName, x86Reg Reg );
 	static void OrX86RegToVariable              ( void * Variable, const char * VariableName, x86Reg Reg );
 	static void OrX86RegToX86Reg                ( x86Reg Destination, x86Reg Source );
-	static void Push					        ( x86Reg reg );
-	static void Pushad                          ( void );
+	static void Push                            ( x86Reg reg );
+	static void Pushad                          ();
 	static void PushImm32                       ( DWORD Value );
 	static void PushImm32                       ( const char * String, DWORD Value );
-	static void Pop					            ( x86Reg reg );
-	static void Popad                           ( void );
-	static void Ret                             ( void );
+	static void Pop                             ( x86Reg reg );
+	static void Popad                           ();
+	static void Ret                             ();
 	static void Seta                            ( x86Reg reg );
 	static void Setae                           ( x86Reg reg );
 	static void SetaVariable                    ( void * Variable, const char * VariableName );
@@ -197,8 +197,8 @@ protected:
 	static void SetgVariable                    ( void * Variable, const char * VariableName );
 	static void Setl                            ( x86Reg reg );
 	static void SetlVariable                    ( void * Variable, const char * VariableName );
-	static void Setz					        ( x86Reg reg );
-	static void Setnz					        ( x86Reg reg );
+	static void Setz                            ( x86Reg reg );
+	static void Setnz                           ( x86Reg reg );
 	static void ShiftLeftDouble                 ( x86Reg Destination, x86Reg Source );
 	static void ShiftLeftDoubleImmed            ( x86Reg Destination, x86Reg Source, BYTE Immediate );
 	static void ShiftLeftSign                   ( x86Reg reg );
@@ -224,38 +224,38 @@ protected:
 	static void XorVariableToX86reg             ( void * Variable, const char * VariableName, x86Reg reg );
 
 
-	static void fpuAbs					        ( void );
-	static void fpuAddDword			            ( void * Variable, const char * VariableName );
+	static void fpuAbs                          ();
+	static void fpuAddDword                     ( void * Variable, const char * VariableName );
 	static void fpuAddDwordRegPointer           ( x86Reg x86Pointer );
-	static void fpuAddQword			            ( void * Variable, const char * VariableName );
+	static void fpuAddQword                     ( void * Variable, const char * VariableName );
 	static void fpuAddQwordRegPointer           ( x86Reg X86Pointer );
-	static void fpuAddReg				        ( x86FpuValues reg );
-	static void fpuAddRegPop			        ( int * StackPos, x86FpuValues reg );
-	static void fpuComDword			            ( void * Variable, const char * VariableName, BOOL Pop );
-	static void fpuComDwordRegPointer           ( x86Reg X86Pointer, BOOL Pop );
-	static void fpuComQword			            ( void * Variable, const char * VariableName, BOOL Pop );
-	static void fpuComQwordRegPointer           ( x86Reg X86Pointer, BOOL Pop );
-	static void fpuComReg                       ( x86FpuValues reg, BOOL Pop );
-	static void fpuDivDword			            ( void * Variable, const char * VariableName );
+	static void fpuAddReg                       ( x86FpuValues reg );
+	static void fpuAddRegPop                    ( int * StackPos, x86FpuValues reg );
+	static void fpuComDword                     ( void * Variable, const char * VariableName, bool Pop );
+	static void fpuComDwordRegPointer           ( x86Reg X86Pointer, bool Pop );
+	static void fpuComQword                     ( void * Variable, const char * VariableName, bool Pop );
+	static void fpuComQwordRegPointer           ( x86Reg X86Pointer, bool Pop );
+	static void fpuComReg                       ( x86FpuValues reg, bool Pop );
+	static void fpuDivDword                     ( void * Variable, const char * VariableName );
 	static void fpuDivDwordRegPointer           ( x86Reg X86Pointer );
-	static void fpuDivQword			            ( void * Variable, const char * VariableName );
+	static void fpuDivQword                     ( void * Variable, const char * VariableName );
 	static void fpuDivQwordRegPointer           ( x86Reg X86Pointer );
 	static void fpuDivReg                       ( x86FpuValues Reg );
-	static void fpuDivRegPop			        ( x86FpuValues reg );
+	static void fpuDivRegPop                    ( x86FpuValues reg );
 	static void fpuExchange                     ( x86FpuValues Reg );
 	static void fpuFree                         ( x86FpuValues Reg );
 	static void fpuDecStack                     ( int * StackPos );
 	static void fpuIncStack                     ( int * StackPos );
-	static void fpuLoadControl			        ( void * Variable, const char * VariableName );
-	static void fpuLoadDword			        ( int * StackPos, void * Variable, const char * VariableName );
+	static void fpuLoadControl                  ( void * Variable, const char * VariableName );
+	static void fpuLoadDword                    ( int * StackPos, void * Variable, const char * VariableName );
 	static void fpuLoadDwordFromX86Reg          ( int * StackPos, x86Reg reg );
 	static void fpuLoadDwordFromN64Mem          ( int * StackPos, x86Reg reg );
 	static void fpuLoadInt32bFromN64Mem         ( int * StackPos, x86Reg reg );
-	static void fpuLoadIntegerDword	            ( int * StackPos, void * Variable, const char * VariableName );
+	static void fpuLoadIntegerDword             ( int * StackPos, void * Variable, const char * VariableName );
 	static void fpuLoadIntegerDwordFromX86Reg   ( int * StackPos,x86Reg Reg );
-	static void fpuLoadIntegerQword	            ( int * StackPos, void * Variable, const char * VariableName );
+	static void fpuLoadIntegerQword             ( int * StackPos, void * Variable, const char * VariableName );
 	static void fpuLoadIntegerQwordFromX86Reg   ( int * StackPos,x86Reg Reg );
-	static void fpuLoadQword			        ( int * StackPos, void * Variable, const char * VariableName );
+	static void fpuLoadQword                    ( int * StackPos, void * Variable, const char * VariableName );
 	static void fpuLoadQwordFromX86Reg          ( int * StackPos, x86Reg Reg );
 	static void fpuLoadQwordFromN64Mem          ( int * StackPos, x86Reg reg );
 	static void fpuLoadReg                      ( int * StackPos, x86FpuValues Reg );
@@ -265,30 +265,29 @@ protected:
 	static void fpuMulQwordRegPointer           ( x86Reg X86Pointer );
 	static void fpuMulReg                       ( x86FpuValues reg );
 	static void fpuMulRegPop                    ( x86FpuValues reg );
-	static void fpuNeg					        ( void );
-	static void fpuRound				        ( void );
-	static void fpuSqrt				            ( void );
-	static void fpuStoreControl		            ( void * Variable, const char * VariableName );
-	static void fpuStoreDword			        ( int * StackPos, void * Variable, const char * VariableName, BOOL pop );
-	static void fpuStoreDwordFromX86Reg         ( int * StackPos,x86Reg Reg, BOOL pop );
-	static void fpuStoreDwordToN64Mem	        ( int * StackPos, x86Reg reg, BOOL Pop );
-	static void fpuStoreIntegerDword            ( int * StackPos, void * Variable, const char * VariableName, BOOL pop );
-	static void fpuStoreIntegerDwordFromX86Reg  ( int * StackPos,x86Reg Reg, BOOL pop );
-	static void fpuStoreIntegerQword            ( int * StackPos, void * Variable, const char * VariableName, BOOL pop );
-	static void fpuStoreIntegerQwordFromX86Reg  ( int * StackPos, x86Reg Reg, BOOL pop );
-	static void fpuStoreQword			        ( int * StackPos, void * Variable, const char * VariableName, BOOL pop );
-	static void fpuStoreQwordFromX86Reg         ( int * StackPos, x86Reg Reg, BOOL pop );
-	static void fpuStoreStatus			        ( void );
-	static void fpuSubDword			            ( void * Variable, const char * VariableName );
+	static void fpuNeg                          ();
+	static void fpuRound                        ();
+	static void fpuSqrt                         ();
+	static void fpuStoreControl                 ( void * Variable, const char * VariableName );
+	static void fpuStoreDword                   ( int * StackPos, void * Variable, const char * VariableName, bool pop );
+	static void fpuStoreDwordFromX86Reg         ( int * StackPos,x86Reg Reg, bool pop );
+	static void fpuStoreDwordToN64Mem           ( int * StackPos, x86Reg reg, bool Pop );
+	static void fpuStoreIntegerDword            ( int * StackPos, void * Variable, const char * VariableName, bool pop );
+	static void fpuStoreIntegerDwordFromX86Reg  ( int * StackPos,x86Reg Reg, bool pop );
+	static void fpuStoreIntegerQword            ( int * StackPos, void * Variable, const char * VariableName, bool pop );
+	static void fpuStoreIntegerQwordFromX86Reg  ( int * StackPos, x86Reg Reg, bool pop );
+	static void fpuStoreQwordFromX86Reg         ( int * StackPos, x86Reg Reg, bool pop );
+	static void fpuStoreStatus                  ();
+	static void fpuSubDword                     ( void * Variable, const char * VariableName );
 	static void fpuSubDwordRegPointer           ( x86Reg X86Pointer );
 	static void fpuSubDwordReverse              ( void * Variable, const char * VariableName );
-	static void fpuSubQword			            ( void * Variable, const char * VariableName );
+	static void fpuSubQword                     ( void * Variable, const char * VariableName );
 	static void fpuSubQwordRegPointer           ( x86Reg X86Pointer );
 	static void fpuSubQwordReverse              ( void * Variable, const char * VariableName );
-	static void fpuSubReg				        ( x86FpuValues reg );
-	static void fpuSubRegPop			        ( x86FpuValues reg );	
+	static void fpuSubReg                       ( x86FpuValues reg );
+	static void fpuSubRegPop                    ( x86FpuValues reg );	
 	
-	static BOOL Is8BitReg                       ( x86Reg Reg );
+	static bool Is8BitReg                       ( x86Reg Reg );
 	static BYTE CalcMultiplyCode                ( Multipler Multiply );
 	static BYTE * m_RecompPos;
 
diff --git a/Source/Project64/N64 System/Recompiler/x86CodeLog.cpp b/Source/Project64/N64 System/Recompiler/x86CodeLog.cpp
index 1417f9128..ec7f2cce7 100644
--- a/Source/Project64/N64 System/Recompiler/x86CodeLog.cpp	
+++ b/Source/Project64/N64 System/Recompiler/x86CodeLog.cpp	
@@ -31,7 +31,7 @@ void Start_x86_Log (void) {
 
 	CPath LogFileName(CPath::MODULE_DIRECTORY);
 	LogFileName.AppendDirectory("Logs");
-	LogFileName.SetNameExtension(_T("CPUoutput.log"));
+	LogFileName.SetNameExtension("CPUoutput.log");
 		
 	if (hCPULogFile) { Stop_x86_Log(); }
 	hCPULogFile = CreateFile(LogFileName,GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,
diff --git a/Source/Project64/N64 System/Rom Information Class.cpp b/Source/Project64/N64 System/Rom Information Class.cpp
index 9bb96db11..6eca5542a 100644
--- a/Source/Project64/N64 System/Rom Information Class.cpp	
+++ b/Source/Project64/N64 System/Rom Information Class.cpp	
@@ -31,10 +31,10 @@ RomInformation::RomInformation (CN64Rom * RomInfo) :
 {
 }
 
-RomInformation::~RomInformation(void) {
-	if (m_DeleteRomInfo) {
+RomInformation::~RomInformation()
+{
+	if (m_DeleteRomInfo)
 		delete m_pRomInfo;
-	}
 }
 
 #include <windows.h>
@@ -53,7 +53,11 @@ DWORD CALLBACK RomInfoProc (HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) {
 			SetProp(hDlg,"this",(RomInformation *)lParam);
 			RomInformation * _this = (RomInformation *)lParam;
 			
+			LONG_PTR originalWndProc = GetWindowLongPtrW(hDlg, GWLP_WNDPROC);
+			SetWindowLongPtrW(hDlg, GWLP_WNDPROC, (LONG_PTR) DefWindowProcW);
 			SetWindowTextW(hDlg, GS(INFO_TITLE));
+			SetWindowLongPtrW(hDlg, GWLP_WNDPROC, originalWndProc);
+
 			SetDlgItemTextW(hDlg, IDC_ROM_NAME, GS(INFO_ROM_NAME_TEXT));
 			SetDlgItemTextW(hDlg, IDC_FILE_NAME, GS(INFO_FILE_NAME_TEXT));
 			SetDlgItemTextW(hDlg, IDC_LOCATION, GS(INFO_LOCATION_TEXT));
@@ -65,6 +69,7 @@ DWORD CALLBACK RomInfoProc (HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) {
 			SetDlgItemTextW(hDlg, IDC_CRC1, GS(INFO_CRC1_TEXT));
 			SetDlgItemTextW(hDlg, IDC_CRC2, GS(INFO_CRC2_TEXT));
 			SetDlgItemTextW(hDlg, IDC_CIC_CHIP, GS(INFO_CIC_CHIP_TEXT));
+			SetDlgItemTextW(hDlg, IDC_CLOSE_BUTTON, GS(BOTTOM_CLOSE));
 
 			SetDlgItemText(hDlg,IDC_INFO_ROMNAME,_this->m_pRomInfo->GetRomName().c_str());
 			
@@ -120,10 +125,19 @@ DWORD CALLBACK RomInfoProc (HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) {
 
 			if (_this->m_pRomInfo->CicChipID() == CIC_UNKNOWN) { 
 				sprintf(&String[1],"Unknown");
-			} else {
+			}
+			else if (_this->m_pRomInfo->CicChipID() == CIC_NUS_8303) {
+				sprintf(&String[1], "CIC-NUS-8303");
+			}
+			else if (_this->m_pRomInfo->CicChipID() == CIC_NUS_5167) {
+				sprintf(&String[1], "CIC-NUS-5167");
+			}
+			else {
 				sprintf(&String[1],"CIC-NUS-610%d",_this->m_pRomInfo->CicChipID());
 			}
 			SetDlgItemText(hDlg,IDC_INFO_CIC,String);
+
+			
 		}
 		break;
 	case WM_COMMAND:
diff --git a/Source/Project64/N64 System/Rom Information Class.h b/Source/Project64/N64 System/Rom Information Class.h
index f526fae31..e4be02d00 100644
--- a/Source/Project64/N64 System/Rom Information Class.h	
+++ b/Source/Project64/N64 System/Rom Information Class.h	
@@ -19,9 +19,9 @@ class RomInformation
 	friend DWORD CALLBACK RomInfoProc ( HWND, DWORD, DWORD, DWORD );
 
 public:
-	RomInformation(const char * RomFile );
-	RomInformation(CN64Rom * RomInfo );
-	~RomInformation(void);
+	RomInformation(const char* RomFile);
+	RomInformation(CN64Rom* RomInfo);
+	~RomInformation();
 	
-	void DisplayInformation (HWND hParent) const;
+	void DisplayInformation(HWND hParent) const;
 };
diff --git a/Source/Project64/N64 System/Speed Limitor Class.cpp b/Source/Project64/N64 System/Speed Limitor Class.cpp
index 33f6bced0..5d61147dd 100644
--- a/Source/Project64/N64 System/Speed Limitor Class.cpp	
+++ b/Source/Project64/N64 System/Speed Limitor Class.cpp	
@@ -11,7 +11,7 @@
 #include "stdafx.h"
 #pragma comment(lib, "winmm.lib") 
 
-CSpeedLimitor::CSpeedLimitor(void)
+CSpeedLimitor::CSpeedLimitor()
 {
 	m_Frames    = 0;
 	m_LastTime  = 0;
@@ -26,19 +26,21 @@ CSpeedLimitor::CSpeedLimitor(void)
 	}
 }
 
-CSpeedLimitor::~CSpeedLimitor(void) {
+CSpeedLimitor::~CSpeedLimitor()
+{
 	TIMECAPS Caps;
 	timeGetDevCaps(&Caps, sizeof(Caps));
 	timeEndPeriod(Caps.wPeriodMin);
 }
 
-void CSpeedLimitor::SetHertz (DWORD Hertz ) {
+void CSpeedLimitor::SetHertz(DWORD Hertz)
+{
 	m_Speed = Hertz;
 	m_BaseSpeed = Hertz;
 	FixSpeedRatio();
 }
 
-void CSpeedLimitor::FixSpeedRatio ( void )
+void CSpeedLimitor::FixSpeedRatio()
 {
 	m_Ratio = 1000.0f / static_cast<double>(m_Speed);
 	m_Frames = 0;
@@ -73,37 +75,37 @@ bool CSpeedLimitor::Timer_Process (DWORD * FrameRate ) {
 	}
 }
 
-void CSpeedLimitor::IncreaeSpeed ( void )
+void CSpeedLimitor::IncreaseSpeed()
 {
-	if (m_Speed >= 60)      
+	if (m_Speed >= 60)
 	{
-		m_Speed += 10; 
+		m_Speed += 10;
 	}
-	else if (m_Speed >= 15) 
+	else if (m_Speed >= 15)
 	{ 
-		m_Speed += 5; 
+		m_Speed += 5;
 	}
 	else 
 	{
-		m_Speed += 1; 		
+		m_Speed += 1;
 	}
 	SpeedChanged(m_Speed);
 	FixSpeedRatio();
 }
 
-void CSpeedLimitor::DecreaeSpeed ( void )
+void CSpeedLimitor::DecreaseSpeed()
 {
-	if (m_Speed > 60)      
+	if (m_Speed > 60)
 	{
-		m_Speed -= 10; 
+		m_Speed -= 10;
 	}
-	else if (m_Speed > 15) 
+	else if (m_Speed > 15)
 	{ 
-		m_Speed -= 5; 
+		m_Speed -= 5;
 	}
 	else if (m_Speed > 1)
 	{
-		m_Speed -= 1; 		
+		m_Speed -= 1;
 	}
 	SpeedChanged(m_Speed);
 	FixSpeedRatio();
diff --git a/Source/Project64/N64 System/Speed Limitor Class.h b/Source/Project64/N64 System/Speed Limitor Class.h
index 285a5e850..42cd3fd21 100644
--- a/Source/Project64/N64 System/Speed Limitor Class.h	
+++ b/Source/Project64/N64 System/Speed Limitor Class.h	
@@ -14,20 +14,20 @@ class CSpeedLimitor :
 	private CGameSettings
 {	
 public:
-	     CSpeedLimitor     ( void );
-	    ~CSpeedLimitor     ( void );
+	CSpeedLimitor();
+	~CSpeedLimitor();
 
-	void SetHertz          ( const DWORD Hertz );
-	bool Timer_Process     ( DWORD * const FrameRate );
-	void IncreaeSpeed      ( void );
-	void DecreaeSpeed      ( void );
+	void SetHertz(const DWORD Hertz);
+	bool Timer_Process(DWORD* const FrameRate);
+	void IncreaseSpeed();
+	void DecreaseSpeed();
 
 private:
-	CSpeedLimitor(const CSpeedLimitor&);			// Disable copy constructor
-	CSpeedLimitor& operator=(const CSpeedLimitor&);	// Disable assignment
+	CSpeedLimitor(const CSpeedLimitor&);            // Disable copy constructor
+	CSpeedLimitor& operator=(const CSpeedLimitor&); // Disable assignment
 
-	void FixSpeedRatio     ( void );
+	void FixSpeedRatio();
 
-	DWORD                 m_Speed, m_BaseSpeed, m_Frames, m_LastTime;
-	double                m_Ratio;
+	DWORD  m_Speed, m_BaseSpeed, m_Frames, m_LastTime;
+	double m_Ratio;
 };
diff --git a/Source/Project64/N64 System/Types.h b/Source/Project64/N64 System/Types.h
index 3a577b321..4627d6b2f 100644
--- a/Source/Project64/N64 System/Types.h	
+++ b/Source/Project64/N64 System/Types.h	
@@ -10,6 +10,12 @@
 ****************************************************************************/
 #pragma once
 
+#include <common/stdtypes.h>
+
+/*
+ * To do:  Use fixed-size types for MIPS union members, not WINAPI types.
+ * On Win32 x86, `unsigned long DWORD` versus `int32_t` is the only conflict.
+ */
 typedef unsigned char    BYTE;
 typedef unsigned short   WORD;
 typedef unsigned long    DWORD;
@@ -17,25 +23,27 @@ typedef unsigned __int64 QWORD;
 typedef void *           HANDLE;
 typedef int              BOOL;
 
-typedef union tagUWORD {
-	long				W;
-	float				F;
-	unsigned long		UW;
-	short				HW[2];
-	unsigned short		UHW[2];
-	char				B[4];
-	unsigned char		UB[4];
-} MIPS_WORD;
+union MIPS_WORD {
+	long           W;
+	unsigned long  UW;
+	short          HW[2];
+	unsigned short UHW[2];
+	char           B[4];
+	unsigned char  UB[4];
 
-typedef union tagUDWORD {
-	double				D;
-	__int64				DW;
-	unsigned __int64	UDW;
-	long				W[2];
-	float				F[2];
-	unsigned long		UW[2];
-	short				HW[4];
-	unsigned short		UHW[4];
-	char				B[8];
-	unsigned char		UB[8];
-} MIPS_DWORD;
+    float       F;
+};
+
+union MIPS_DWORD {
+	__int64          DW;
+	unsigned __int64 UDW;
+	long             W[2];
+	unsigned long    UW[2];
+	short            HW[4];
+	unsigned short   UHW[4];
+	char             B[8];
+	unsigned char    UB[8];
+
+    double      D;
+    float       F[2];
+};
diff --git a/Source/Project64/Plugins/Audio Plugin.cpp b/Source/Project64/Plugins/Audio Plugin.cpp
index 1e73d1006..8d7c6e52e 100644
--- a/Source/Project64/Plugins/Audio Plugin.cpp	
+++ b/Source/Project64/Plugins/Audio Plugin.cpp	
@@ -11,12 +11,12 @@
 #include "stdafx.h"
 
 CAudioPlugin::CAudioPlugin() :
-	m_hAudioThread(NULL),
-	AiDacrateChanged(NULL),
 	AiLenChanged(NULL),
 	AiReadLength(NULL),
 	ProcessAList(NULL),
-	AiUpdate(NULL)
+	m_hAudioThread(NULL),
+	AiUpdate(NULL),
+	AiDacrateChanged(NULL)
 {
 }
 
@@ -126,7 +126,7 @@ bool CAudioPlugin::Initiate(CN64System * System, CMainGui * RenderWindow)
 		Info.AI__BITRATE_REG = &g_Reg->AI_BITRATE_REG;
 	}
 
-	m_Initilized = InitiateAudio(Info) != 0;
+	m_Initialized = InitiateAudio(Info) != 0;
 
 	//jabo had a bug so I call CreateThread so his dllmain gets called again
 	DWORD ThreadID;
@@ -137,6 +137,11 @@ bool CAudioPlugin::Initiate(CN64System * System, CMainGui * RenderWindow)
 	{
 		if (AiUpdate)
 		{ 
+			if (m_hAudioThread)
+			{
+				WriteTraceF(TraceAudio, __FUNCTION__ ": Terminate Audio Thread");
+				TerminateThread(m_hAudioThread, 0);
+			}
 			m_hAudioThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)AudioThread, (LPVOID)this, 0, &ThreadID);
 		}
 	
@@ -145,7 +150,7 @@ bool CAudioPlugin::Initiate(CN64System * System, CMainGui * RenderWindow)
 			DacrateChanged(System->SystemType());
 		}
 	}
-	return m_Initilized;
+	return m_Initialized;
 }
 
 void CAudioPlugin::UnloadPluginDetails(void)
@@ -165,7 +170,7 @@ void CAudioPlugin::UnloadPluginDetails(void)
 
 void CAudioPlugin::DacrateChanged(SYSTEM_TYPE Type)
 {
-	if (!Initilized()) { return; }
+	if (!Initialized()) { return; }
 	WriteTraceF(TraceAudio, __FUNCTION__ ": SystemType: %s", Type == SYSTEM_NTSC ? "SYSTEM_NTSC" : "SYSTEM_PAL");
 
 	//DWORD Frequency = g_Reg->AI_DACRATE_REG * 30;
diff --git a/Source/Project64/Plugins/Controller Plugin.cpp b/Source/Project64/Plugins/Controller Plugin.cpp
index 2907b602c..b935a02d9 100644
--- a/Source/Project64/Plugins/Controller Plugin.cpp	
+++ b/Source/Project64/Plugins/Controller Plugin.cpp	
@@ -11,13 +11,13 @@
 #include "stdafx.h"
 
 CControl_Plugin::CControl_Plugin(void) :
-	m_AllocatedControllers(false),
 	WM_KeyDown(NULL),
 	WM_KeyUp(NULL),
 	RumbleCommand(NULL),
 	GetKeys(NULL),
 	ReadController(NULL),
-	ControllerCommand(NULL)
+	ControllerCommand(NULL),
+	m_AllocatedControllers(false)
 {
 	memset(&m_PluginControllers, 0, sizeof(m_PluginControllers));
 	memset(&m_Controllers, 0, sizeof(m_Controllers));
@@ -75,7 +75,7 @@ bool CControl_Plugin::Initiate(CN64System * System, CMainGui * RenderWindow)
 		InitiateControllers_1_0 = (void (__cdecl *)(HWND, CONTROL *))GetProcAddress( (HMODULE)m_hDll, "InitiateControllers" );
 		if (InitiateControllers_1_0 == NULL) { return false; }
 		InitiateControllers_1_0((HWND)RenderWindow->m_hMainWindow,m_PluginControllers);
-		m_Initilized = true;
+		m_Initialized = true;
 	}
 	else if (m_PluginInfo.Version >= 0x0101)
 	{
@@ -107,7 +107,7 @@ bool CControl_Plugin::Initiate(CN64System * System, CMainGui * RenderWindow)
 		ControlInfo.MemoryBswaped = TRUE;
 
 		InitiateControllers_1_1(&ControlInfo);
-		m_Initilized = true;
+		m_Initialized = true;
 	}
 
 	//jabo had a bug so I call CreateThread so his dllmain gets called again
@@ -115,7 +115,7 @@ bool CControl_Plugin::Initiate(CN64System * System, CMainGui * RenderWindow)
 	HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID);
 	CloseHandle(hthread);
 
-	return m_Initilized;
+	return m_Initialized;
 }
 
 void CControl_Plugin::UnloadPluginDetails(void)
diff --git a/Source/Project64/Plugins/GFX plugin.cpp b/Source/Project64/Plugins/GFX plugin.cpp
index e8534f4f6..771af44ee 100644
--- a/Source/Project64/Plugins/GFX plugin.cpp	
+++ b/Source/Project64/Plugins/GFX plugin.cpp	
@@ -95,7 +95,7 @@ bool CGfxPlugin::LoadFunctions ( void )
 
 bool CGfxPlugin::Initiate(CN64System * System, CMainGui * RenderWindow)
 {
-	if (m_Initilized)
+	if (m_Initialized)
 		Close();
 
 	typedef struct {
@@ -213,14 +213,14 @@ bool CGfxPlugin::Initiate(CN64System * System, CMainGui * RenderWindow)
 		Info.VI__Y_SCALE_REG = &g_Reg->VI_Y_SCALE_REG;
 	}
 
-	m_Initilized = InitiateGFX(Info) != 0;
+	m_Initialized = InitiateGFX(Info) != 0;
 
 	//jabo had a bug so I call CreateThread so his dllmain gets called again
 	DWORD ThreadID;
 	HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID);
 	CloseHandle(hthread);
 
-	return m_Initilized;
+	return m_Initialized;
 }
 
 void CGfxPlugin::UnloadPluginDetails(void)
diff --git a/Source/Project64/Plugins/Plugin Base.cpp b/Source/Project64/Plugins/Plugin Base.cpp
index f0a2c7848..49a73dce0 100644
--- a/Source/Project64/Plugins/Plugin Base.cpp	
+++ b/Source/Project64/Plugins/Plugin Base.cpp	
@@ -11,18 +11,18 @@
 #include "stdafx.h"
 
 CPlugin::CPlugin() :
-	m_hDll(NULL),
-	m_Initilized(false),
-	m_RomOpen(false),
-	RomOpen(NULL),
-	RomClosed(NULL),
-	CloseDLL(NULL),
-	PluginOpened(NULL),
 	DllAbout(NULL),
 	DllConfig(NULL),
+	CloseDLL(NULL),
+	RomOpen(NULL),
+	RomClosed(NULL),
+	PluginOpened(NULL),
 	SetSettingInfo(NULL),
 	SetSettingInfo2(NULL),
-	SetSettingInfo3(NULL)
+	SetSettingInfo3(NULL),
+	m_hDll(NULL),
+	m_Initialized(false),
+	m_RomOpen(false)
 {
 	memset(&m_PluginInfo, 0, sizeof(m_PluginInfo));
 }
@@ -169,10 +169,10 @@ void CPlugin::Close()
 {
 	WriteTraceF(PluginTraceType(),__FUNCTION__ "(%s): Start",PluginType());
 	RomClose();
-	if (m_Initilized)
+	if (m_Initialized)
 	{
 		CloseDLL();
-		m_Initilized = false;
+		m_Initialized = false;
 	}
 	WriteTraceF(PluginTraceType(),__FUNCTION__ "(%s): Done",PluginType());
 }
diff --git a/Source/Project64/Plugins/Plugin Base.h b/Source/Project64/Plugins/Plugin Base.h
index 42a95f24a..0d5e92d4d 100644
--- a/Source/Project64/Plugins/Plugin Base.h	
+++ b/Source/Project64/Plugins/Plugin Base.h	
@@ -17,7 +17,7 @@ public:
 	CPlugin();
 	virtual ~CPlugin();
 	inline const char * PluginName() const { return m_PluginInfo.Name; }
-	inline bool Initilized() { return m_Initilized; }
+	inline bool Initialized() { return m_Initialized; }
 
 	virtual int GetDefaultSettingStartRange() const = 0;
 	virtual int GetSettingStartRange() const = 0;
@@ -50,7 +50,7 @@ protected:
 	void(__cdecl *SetSettingInfo3)	(PLUGIN_SETTINGS3 *);
 
 	void * m_hDll;
-	bool   m_Initilized, m_RomOpen;
+	bool   m_Initialized, m_RomOpen;
 	PLUGIN_INFO m_PluginInfo;
 
 	// Loads a function pointer from the currently loaded DLL
diff --git a/Source/Project64/Plugins/Plugin Class.cpp b/Source/Project64/Plugins/Plugin Class.cpp
index 1a6ba89d6..e4f08c84a 100644
--- a/Source/Project64/Plugins/Plugin Class.cpp	
+++ b/Source/Project64/Plugins/Plugin Class.cpp	
@@ -11,9 +11,9 @@
 #include "stdafx.h"
 
 CPlugins::CPlugins (const stdstr & PluginDir):
-	m_PluginDir(PluginDir),
-	m_Gfx(NULL), m_Audio(NULL), m_RSP(NULL), m_Control(NULL),
-	m_RenderWindow(NULL), m_DummyWindow(NULL)
+	m_RenderWindow(NULL), m_DummyWindow(NULL),
+	m_PluginDir(PluginDir), m_Gfx(NULL), m_Audio(NULL),
+	m_RSP(NULL), m_Control(NULL)
 {
 	CreatePlugins();
 	g_Settings->RegisterChangeCB(Plugin_RSP_Current,this,(CSettings::SettingChangedFunc)PluginChanged);
@@ -53,10 +53,10 @@ void CPlugins::PluginChanged ( CPlugins * _this )
 	{
 		return;
 	}
-	bool bGfxChange = _stricmp(_this->m_GfxFile.c_str(),g_Settings->LoadString(Game_Plugin_Gfx).c_str()) != 0;
-	bool bAudioChange = _stricmp(_this->m_AudioFile.c_str(),g_Settings->LoadString(Game_Plugin_Audio).c_str()) != 0;
-	bool bRspChange = _stricmp(_this->m_RSPFile.c_str(),g_Settings->LoadString(Game_Plugin_RSP).c_str()) != 0;
-	bool bContChange = _stricmp(_this->m_ControlFile.c_str(),g_Settings->LoadString(Game_Plugin_Controller).c_str()) != 0;
+	bool bGfxChange = _stricmp(_this->m_GfxFile.c_str(),g_Settings->LoadStringVal(Game_Plugin_Gfx).c_str()) != 0;
+	bool bAudioChange = _stricmp(_this->m_AudioFile.c_str(),g_Settings->LoadStringVal(Game_Plugin_Audio).c_str()) != 0;
+	bool bRspChange = _stricmp(_this->m_RSPFile.c_str(),g_Settings->LoadStringVal(Game_Plugin_RSP).c_str()) != 0;
+	bool bContChange = _stricmp(_this->m_ControlFile.c_str(),g_Settings->LoadStringVal(Game_Plugin_Controller).c_str()) != 0;
 	
 	if ( bGfxChange || bAudioChange || bRspChange || bContChange )
 	{
@@ -71,7 +71,7 @@ void CPlugins::PluginChanged ( CPlugins * _this )
 		else
 		{
 			_this->Reset(NULL);
-			g_Notify->RefreshMenu();
+			Notify().RefreshMenu();
 		}
 	}
 }
@@ -83,7 +83,7 @@ static void LoadPlugin (SettingID PluginSettingID, SettingID PluginVerSettingID,
 	{
 		return;
 	}
-	FileName = g_Settings->LoadString(PluginSettingID);
+	FileName = g_Settings->LoadStringVal(PluginSettingID);
 	CPath PluginFileName(PluginDir,FileName.c_str());
 	plugin = new plugin_type();
 	if (plugin)
@@ -125,7 +125,7 @@ void CPlugins::CreatePlugins( void )
 
 	if (bHaveDebugger())
 	{
-		g_Notify->RefreshMenu();
+		Notify().RefreshMenu();
 	}
 }
 
@@ -261,17 +261,22 @@ bool CPlugins::Initiate ( CN64System * System )
 
 bool CPlugins::ResetInUiThread ( CN64System * System )
 {
+#if defined(WINDOWS_UI)
 	return m_RenderWindow->ResetPlugins(this, System);
+#else
+	g_Notify -> BreakPoint(__FILEW__, __LINE__);
+	return false;
+#endif
 }
 
 bool CPlugins::Reset ( CN64System * System ) 
 {
 	WriteTrace(TraceDebug,__FUNCTION__ ": Start");	
 
-	bool bGfxChange = _stricmp(m_GfxFile.c_str(),g_Settings->LoadString(Game_Plugin_Gfx).c_str()) != 0;
-	bool bAudioChange = _stricmp(m_AudioFile.c_str(),g_Settings->LoadString(Game_Plugin_Audio).c_str()) != 0;
-	bool bRspChange = _stricmp(m_RSPFile.c_str(),g_Settings->LoadString(Game_Plugin_RSP).c_str()) != 0;
-	bool bContChange = _stricmp(m_ControlFile.c_str(),g_Settings->LoadString(Game_Plugin_Controller).c_str()) != 0;
+	bool bGfxChange = _stricmp(m_GfxFile.c_str(),g_Settings->LoadStringVal(Game_Plugin_Gfx).c_str()) != 0;
+	bool bAudioChange = _stricmp(m_AudioFile.c_str(),g_Settings->LoadStringVal(Game_Plugin_Audio).c_str()) != 0;
+	bool bRspChange = _stricmp(m_RSPFile.c_str(),g_Settings->LoadStringVal(Game_Plugin_RSP).c_str()) != 0;
+	bool bContChange = _stricmp(m_ControlFile.c_str(),g_Settings->LoadStringVal(Game_Plugin_Controller).c_str()) != 0;
 
 	//if GFX and Audio has changed we also need to force reset of RSP
 	if (bGfxChange || bAudioChange)
@@ -316,7 +321,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) {
 	switch (Type) {
 	case PLUGIN_TYPE_RSP:
 		if (m_RSP == NULL || m_RSP->DllConfig == NULL) { break; }
-		if (!m_RSP->Initilized()) {
+		if (!m_RSP->Initialized()) {
 			if (!m_RSP->Initiate(NULL,NULL)) {				
 				break;
 			}
@@ -325,7 +330,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) {
 		break;
 	case PLUGIN_TYPE_GFX:
 		if (m_Gfx == NULL || m_Gfx->DllConfig == NULL) { break; }
-		if (!m_Gfx->Initilized()) {
+		if (!m_Gfx->Initialized()) {
 			if (!m_Gfx->Initiate(NULL,m_DummyWindow)) {
 				break;
 			}
@@ -334,7 +339,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) {
 		break;
 	case PLUGIN_TYPE_AUDIO:
 		if (m_Audio == NULL || m_Audio->DllConfig == NULL) { break; }
-		if (!m_Audio->Initilized()) {
+		if (!m_Audio->Initialized()) {
 			if (!m_Audio->Initiate(NULL,m_DummyWindow)) {
 				break;
 			}
@@ -343,7 +348,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) {
 		break;
 	case PLUGIN_TYPE_CONTROLLER:
 		if (m_Control == NULL || m_Control->DllConfig == NULL) { break; }
-		if (!m_Control->Initilized()) {
+		if (!m_Control->Initialized()) {
 			if (!m_Control->Initiate(NULL,m_DummyWindow)) {
 				break;
 			}
@@ -377,12 +382,12 @@ void CPlugins::CreatePluginDir ( const stdstr & DstDir ) const {
 bool CPlugins::CopyPlugins (  const stdstr & DstDir ) const 
 {	
 	//Copy GFX Plugin
-	CPath srcGfxPlugin(m_PluginDir.c_str(),g_Settings->LoadString(Game_Plugin_Gfx).c_str());
-	CPath dstGfxPlugin(DstDir.c_str(),g_Settings->LoadString(Game_Plugin_Gfx).c_str());
+	CPath srcGfxPlugin(m_PluginDir.c_str(),g_Settings->LoadStringVal(Game_Plugin_Gfx).c_str());
+	CPath dstGfxPlugin(DstDir.c_str(),g_Settings->LoadStringVal(Game_Plugin_Gfx).c_str());
 	
 	if (CopyFile(srcGfxPlugin,dstGfxPlugin,false) == 0) 
 	{
-		if (GetLastError() == ERROR_PATH_NOT_FOUND) { dstGfxPlugin.CreateDirectory(); }
+		if (GetLastError() == ERROR_PATH_NOT_FOUND) { dstGfxPlugin.DirectoryCreate(); }
 		if (!CopyFile(srcGfxPlugin,dstGfxPlugin,false)) 
 		{
 			return false;
@@ -390,10 +395,10 @@ bool CPlugins::CopyPlugins (  const stdstr & DstDir ) const
 	}
 
 	//Copy m_Audio Plugin
-	CPath srcAudioPlugin(m_PluginDir.c_str(),g_Settings->LoadString(Game_Plugin_Audio).c_str());
-	CPath dstAudioPlugin(DstDir.c_str(), g_Settings->LoadString(Game_Plugin_Audio).c_str());
+	CPath srcAudioPlugin(m_PluginDir.c_str(),g_Settings->LoadStringVal(Game_Plugin_Audio).c_str());
+	CPath dstAudioPlugin(DstDir.c_str(), g_Settings->LoadStringVal(Game_Plugin_Audio).c_str());
 	if (CopyFile(srcAudioPlugin,dstAudioPlugin,false) == 0) {
-		if (GetLastError() == ERROR_PATH_NOT_FOUND) { dstAudioPlugin.CreateDirectory(); }
+		if (GetLastError() == ERROR_PATH_NOT_FOUND) { dstAudioPlugin.DirectoryCreate(); }
 		if (!CopyFile(srcAudioPlugin,dstAudioPlugin,false))
 		{
 			return false;
@@ -401,10 +406,10 @@ bool CPlugins::CopyPlugins (  const stdstr & DstDir ) const
 	}
 
 	//Copy RSP Plugin
-	CPath srcRSPPlugin(m_PluginDir.c_str(), g_Settings->LoadString(Game_Plugin_RSP).c_str());
-	CPath dstRSPPlugin(DstDir.c_str(),g_Settings->LoadString(Game_Plugin_RSP).c_str());
+	CPath srcRSPPlugin(m_PluginDir.c_str(), g_Settings->LoadStringVal(Game_Plugin_RSP).c_str());
+	CPath dstRSPPlugin(DstDir.c_str(),g_Settings->LoadStringVal(Game_Plugin_RSP).c_str());
 	if (CopyFile(srcRSPPlugin,dstRSPPlugin,false) == 0) {
-		if (GetLastError() == ERROR_PATH_NOT_FOUND) { dstRSPPlugin.CreateDirectory(); }
+		if (GetLastError() == ERROR_PATH_NOT_FOUND) { dstRSPPlugin.DirectoryCreate(); }
 		if (!CopyFile(srcRSPPlugin,dstRSPPlugin,false))
 		{
 			return false;
@@ -412,11 +417,11 @@ bool CPlugins::CopyPlugins (  const stdstr & DstDir ) const
 	}
 
 	//Copy Controller Plugin
-	CPath srcContPlugin(m_PluginDir.c_str(), g_Settings->LoadString(Game_Plugin_Controller).c_str());
-	CPath dstContPlugin(DstDir.c_str(),g_Settings->LoadString(Game_Plugin_Controller).c_str());
+	CPath srcContPlugin(m_PluginDir.c_str(), g_Settings->LoadStringVal(Game_Plugin_Controller).c_str());
+	CPath dstContPlugin(DstDir.c_str(),g_Settings->LoadStringVal(Game_Plugin_Controller).c_str());
 	if (!srcContPlugin.CopyTo(dstContPlugin))
 	{
-		if (GetLastError() == ERROR_PATH_NOT_FOUND) { dstContPlugin.CreateDirectory(); }
+		if (GetLastError() == ERROR_PATH_NOT_FOUND) { dstContPlugin.DirectoryCreate(); }
 		if (!CopyFile(srcContPlugin,dstContPlugin,false))
 		{
 			DWORD dwError = GetLastError();
diff --git a/Source/Project64/Plugins/Plugin List.cpp b/Source/Project64/Plugins/Plugin List.cpp
index 366744c01..36bfe52e3 100644
--- a/Source/Project64/Plugins/Plugin List.cpp	
+++ b/Source/Project64/Plugins/Plugin List.cpp	
@@ -9,9 +9,10 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+#include <io.h>
 
 CPluginList::CPluginList(bool bAutoFill /* = true */) :
-	m_PluginDir(g_Settings->LoadString(Directory_Plugin),"")
+	m_PluginDir(g_Settings->LoadStringVal(Directory_Plugin),"")
 {
 	if (bAutoFill)
 	{
@@ -69,13 +70,15 @@ void CPluginList::AddPluginFromDir ( CPath Dir)
 				hLib = NULL;
 			}
 
-			UINT LastErrorMode = SetErrorMode( SEM_FAILCRITICALERRORS );
+			//UINT LastErrorMode = SetErrorMode( SEM_FAILCRITICALERRORS );
 			WriteTraceF(TraceDebug,__FUNCTION__ ": loading %s",(LPCSTR)Dir);
-			hLib = LoadLibrary(Dir);		
-			SetErrorMode(LastErrorMode);
+			hLib = LoadLibrary(Dir);
+			//SetErrorMode(LastErrorMode);
 
 			if (hLib == NULL) 
 			{ 
+				DWORD LoadError = GetLastError();
+				WriteTraceF(TraceDebug, __FUNCTION__ ": failed to loadi %s (error: %d)", (LPCSTR)Dir, LoadError);
 				continue;
 			}
 
diff --git a/Source/Project64/Plugins/Plugin List.h b/Source/Project64/Plugins/Plugin List.h
index 510510bc0..17edd39c3 100644
--- a/Source/Project64/Plugins/Plugin List.h	
+++ b/Source/Project64/Plugins/Plugin List.h	
@@ -3,21 +3,14 @@
 class CPluginList  
 {
 public:
-	typedef struct {
+	typedef struct 
+	{
 		PLUGIN_INFO Info;
 		bool        AboutFunction;
 		CPath       FullPath;
 		stdstr      FileName;
 	} PLUGIN;
 
-private:	
-	typedef std::vector<PLUGIN>   PluginList;
-
-	PluginList m_PluginList;
-	CPath      m_PluginDir;
-
-	void AddPluginFromDir   ( CPath Dir);
-
 public:
 	   CPluginList(bool bAutoFill = true);
 	  ~CPluginList();
@@ -26,4 +19,12 @@ public:
 	int      GetPluginCount ( void ) const;
 	const PLUGIN * GetPluginInfo  ( int indx ) const;
 	static bool ValidPluginVersion ( PLUGIN_INFO & PluginInfo );
+
+private:
+	typedef std::vector<PLUGIN>   PluginList;
+
+	PluginList m_PluginList;
+	CPath      m_PluginDir;
+
+	void AddPluginFromDir(CPath Dir);
 };
diff --git a/Source/Project64/Plugins/RSP Plugin.cpp b/Source/Project64/Plugins/RSP Plugin.cpp
index 5164037f1..5239068db 100644
--- a/Source/Project64/Plugins/RSP Plugin.cpp	
+++ b/Source/Project64/Plugins/RSP Plugin.cpp	
@@ -15,9 +15,9 @@ void DummyFunc1(BOOL /*a*/) {}
 CRSP_Plugin::CRSP_Plugin(void) :
 	DoRspCycles(NULL),
 	EnableDebugging(NULL),
+	m_CycleCount(0),
 	GetDebugInfo(NULL),
-	InitiateDebugger(NULL),
-	m_CycleCount(0)
+	InitiateDebugger(NULL)
 {
 	memset(&m_RSPDebug, 0, sizeof(m_RSPDebug));
 }
@@ -184,13 +184,13 @@ bool CRSP_Plugin::Initiate(CPlugins * Plugins, CN64System * System)
 	}
 
 	InitiateRSP(Info, &m_CycleCount);
-	m_Initilized = true;
+	m_Initialized = true;
 
 	//jabo had a bug so I call CreateThread so his dllmain gets called again
 	DWORD ThreadID;
 	HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID);
 	CloseHandle(hthread);
-	return m_Initilized;
+	return m_Initialized;
 }
 
 void CRSP_Plugin::UnloadPluginDetails(void) 
diff --git a/Source/Project64/Plugins/RSP Plugin.h b/Source/Project64/Plugins/RSP Plugin.h
index 690d0b48d..bdc963807 100644
--- a/Source/Project64/Plugins/RSP Plugin.h	
+++ b/Source/Project64/Plugins/RSP Plugin.h	
@@ -66,7 +66,6 @@ private:
 	virtual int GetSettingStartRange() const { return FirstRSPSettings; }
 
 	bool LoadFunctions ( void );
-	bool Initiate_1_0 ( CPlugins * Plugins, CN64System * System );
 	void UnloadPluginDetails ( void );
 
 	RSPDEBUG_INFO m_RSPDebug;
diff --git a/Source/Project64/Project64.vcproj b/Source/Project64/Project64.vcproj
index 42494391c..e76138d2c 100644
--- a/Source/Project64/Project64.vcproj
+++ b/Source/Project64/Project64.vcproj
@@ -408,6 +408,10 @@
 					RelativePath="Multilanguage\Language Class.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\Multilanguage\LanguageSelector.cpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="N64 System Source"
@@ -479,6 +483,10 @@
 						RelativePath="N64 System\Mips\Register Class.cpp"
 						>
 					</File>
+					<File
+						RelativePath=".\N64 System\Mips\Rumblepak.cpp"
+						>
+					</File>
 					<File
 						RelativePath="N64 System\Mips\Sram.cpp"
 						>
@@ -636,7 +644,7 @@
 					Name="ZLib Source"
 					>
 					<File
-						RelativePath="3rd Party\zlib\UNZIP.C"
+						RelativePath="..\3rd Party\zlib\contrib\minizip\unzip.c"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -660,7 +668,7 @@
 						</FileConfiguration>
 					</File>
 					<File
-						RelativePath="3rd Party\zlib\zip.c"
+						RelativePath="..\3rd Party\zlib\contrib\minizip\zip.c"
 						>
 						<FileConfiguration
 							Name="Debug|Win32"
@@ -777,10 +785,6 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
-			<File
-				RelativePath="Version.h"
-				>
-			</File>
 			<File
 				RelativePath="Multilanguage.h"
 				>
@@ -805,6 +809,10 @@
 				RelativePath="User Interface.h"
 				>
 			</File>
+			<File
+				RelativePath="Version.h"
+				>
+			</File>
 			<File
 				RelativePath="WTL App.h"
 				>
@@ -1044,6 +1052,10 @@
 					RelativePath="Multilanguage\Language Class.h"
 					>
 				</File>
+				<File
+					RelativePath=".\Multilanguage\LanguageSelector.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="N64 System Headers"
@@ -1131,6 +1143,10 @@
 						RelativePath="N64 System\Mips\Register Class.h"
 						>
 					</File>
+					<File
+						RelativePath=".\N64 System\Mips\Rumblepak.h"
+						>
+					</File>
 					<File
 						RelativePath="N64 System\Mips\Sram.h"
 						>
@@ -1316,19 +1332,19 @@
 					Name="Zlib Headers"
 					>
 					<File
-						RelativePath="3rd Party\zlib\UNZIP.H"
+						RelativePath="..\3rd Party\zlib\contrib\minizip\unzip.h"
 						>
 					</File>
 					<File
-						RelativePath="3rd Party\zlib\ZCONF.H"
+						RelativePath="..\3rd Party\zlib\zconf.h"
 						>
 					</File>
 					<File
-						RelativePath="3rd Party\zlib\zip.h"
+						RelativePath="..\3rd Party\zlib\contrib\minizip\zip.h"
 						>
 					</File>
 					<File
-						RelativePath="3rd Party\zlib\ZLIB.H"
+						RelativePath="..\3rd Party\zlib\zlib.h"
 						>
 					</File>
 				</Filter>
diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj
index 71f90e274..b0f514ca7 100644
--- a/Source/Project64/Project64.vcxproj
+++ b/Source/Project64/Project64.vcxproj
@@ -5,51 +5,45 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}</ProjectGuid>
     <RootNamespace>Project64</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup>
     <Link>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <SubSystem>Windows</SubSystem>
+      <MinimumRequiredVersion Condition="'$(Platform)'=='Win32'">5.01</MinimumRequiredVersion>
+      <MinimumRequiredVersion Condition="'$(Platform)'=='x64'">5.02</MinimumRequiredVersion>
+      <StackReserveSize>1</StackReserveSize>
       <DataExecutionPrevention>false</DataExecutionPrevention>
-      <MinimumRequiredVersion Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-      <SubSystem Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Windows</SubSystem>
-      <ManifestFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-      <AllowIsolation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-      <EnableUAC Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-      <UACExecutionLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-      <UACUIAccess Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-      <ManifestFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-      <AllowIsolation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-      <EnableUAC Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-      <UACExecutionLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-      <UACUIAccess Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="Multilanguage\LanguageSelector.cpp" />
+    <ClCompile Include="N64 System\Mips\Rumblepak.cpp" />
     <ClCompile Include="Plugins\Plugin Base.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
@@ -153,10 +147,10 @@
     <ClCompile Include="3rd Party\7zip.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="3rd Party\zlib\UNZIP.C">
+    <ClCompile Include="..\3rd Party\zlib\contrib\minizip\unzip.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="3rd Party\zlib\zip.c">
+    <ClCompile Include="..\3rd Party\zlib\contrib\minizip\zip.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
@@ -179,13 +173,14 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="User Interface\UI Resources.rc">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">User Interface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">User Interface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>User Interface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Multilanguage.h" />
+    <ClInclude Include="Multilanguage\LanguageSelector.h" />
     <ClInclude Include="N64 System.h" />
+    <ClInclude Include="N64 System\Mips\Rumblepak.h" />
     <ClInclude Include="Plugin.h" />
     <ClInclude Include="Plugins\Plugin Base.h" />
     <ClInclude Include="Settings.h" />
@@ -303,10 +298,10 @@
     <ClInclude Include="Plugins\RSP Plugin.h" />
     <ClInclude Include="3rd Party\7zip.h" />
     <ClInclude Include="3rd Party\zip.h" />
-    <ClInclude Include="3rd Party\zlib\UNZIP.H" />
-    <ClInclude Include="3rd Party\zlib\ZCONF.H" />
-    <ClInclude Include="3rd Party\zlib\zip.h" />
-    <ClInclude Include="3rd Party\zlib\ZLIB.H" />
+    <ClInclude Include="..\3rd Party\zlib\zconf.h" />
+    <ClInclude Include="..\3rd Party\zlib\zlib.h" />
+    <ClInclude Include="..\3rd Party\zlib\contrib\minizip\unzip.h" />
+    <ClInclude Include="..\3rd Party\zlib\contrib\minizip\zip.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\3rd Party\7zip\7zip.vcxproj">
@@ -321,12 +316,5 @@
       <Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\Glide64\Glide64.vcxproj">
-      <Project>{a4d13408-a794-4199-8fc7-4a9a32505005}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters
index 7889ae8fb..9a2ce8ce0 100644
--- a/Source/Project64/Project64.vcxproj.filters
+++ b/Source/Project64/Project64.vcxproj.filters
@@ -1,834 +1,846 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{994eee48-3b61-4493-9a7f-6340a5a47175}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Settings Files">
-      <UniqueIdentifier>{60e2fd87-7b6b-4147-82fe-e12516efe43c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Settings Files\Setting Types Files">
-      <UniqueIdentifier>{305f064d-be0e-418e-a93e-7de72242550e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\User Interface Source">
-      <UniqueIdentifier>{7b81a6a8-b20b-464e-8184-864886bb00fd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\User Interface Source\Settings Source">
-      <UniqueIdentifier>{bbef87b7-814a-4c87-9713-a07a2de577d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\User Interface Source\WTL Controls Source">
-      <UniqueIdentifier>{19f68e68-7068-4a3c-a11d-c3ff48fe78b2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\User Interface Source\Debugger Source">
-      <UniqueIdentifier>{89244064-68f5-44d9-9021-7a592d910e43}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Multilanguage Source">
-      <UniqueIdentifier>{94e87bf5-3b11-4f61-8a4a-333690ecf588}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\N64 System Source">
-      <UniqueIdentifier>{4d3c9ef9-7903-4112-8356-1e7ab2112c20}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\N64 System Source\Mips Source">
-      <UniqueIdentifier>{2b25c9d1-e1ec-46b6-988a-034edc1fc184}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\N64 System Source\C Core Source">
-      <UniqueIdentifier>{28ecfeb8-9360-4619-ae95-6f67d66f848d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\N64 System Source\Recompiler Files">
-      <UniqueIdentifier>{9a830b90-21d4-429d-b211-26ab691d6474}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\N64 System Source\Interpreter Files">
-      <UniqueIdentifier>{b5142b69-6b3b-4221-a3cb-2c6c0a35e1d7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Plugin Source">
-      <UniqueIdentifier>{242ae4a5-b150-44e6-b31c-027acd6d38b0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\3rd Party Source">
-      <UniqueIdentifier>{0b08dc3f-d3a6-453b-98ab-169c510f34a5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\3rd Party Source\ZLib Source">
-      <UniqueIdentifier>{547023e2-7478-40d0-9123-eef7659a97ab}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{1e3eb4f7-a0b1-4d09-9e50-b5c699f24050}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{bc88015e-37f7-4320-8aa4-d5043d17a386}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-    <Filter Include="Header Files\Settings Headers">
-      <UniqueIdentifier>{80441979-1696-4aca-8652-199a9db22d06}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Settings Headers\Setting Types Header">
-      <UniqueIdentifier>{024d5b64-27a9-466b-9388-5c08c5eb5a47}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\User Interface Headers">
-      <UniqueIdentifier>{54e8f51f-d81d-4f8f-b4f1-76584c1b29a5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\User Interface Headers\Settings Header">
-      <UniqueIdentifier>{81b58fad-f73f-4098-8ebc-ffceaff53478}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\User Interface Headers\WTL Controls Headers">
-      <UniqueIdentifier>{838a58e7-e1d2-45d3-bcf0-dcedad19610c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Multilanguage Headers">
-      <UniqueIdentifier>{5531af4d-33bb-4e84-8a55-c971a18ec7bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\N64 System Headers">
-      <UniqueIdentifier>{6cfab019-2f8d-4e09-be41-1df513b5a680}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\N64 System Headers\Mips Headers">
-      <UniqueIdentifier>{34662870-e7f3-4ab8-8788-a659bf32f764}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\N64 System Headers\C Core Headers">
-      <UniqueIdentifier>{4db18f2d-3c89-4a86-adf7-46731ca35087}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\N64 System Headers\Debugger Headers">
-      <UniqueIdentifier>{c4249d55-df70-4453-b017-b548514ad094}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\N64 System Headers\Recompiler Headers">
-      <UniqueIdentifier>{a3157468-d5a6-4167-b28f-9de5719ec1e9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\N64 System Headers\Interpreter Headers">
-      <UniqueIdentifier>{d87d7401-c716-40f7-a51b-2d9803936b23}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Plugin Headers">
-      <UniqueIdentifier>{93ec15cf-1fb2-4095-ae07-95128a67d3df}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\3rd Party Headers">
-      <UniqueIdentifier>{21f6da31-289d-4d03-80bb-b77fe60355d7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\3rd Party Headers\Zlib Headers">
-      <UniqueIdentifier>{ef4a164b-c5ed-4469-a0e2-4eb21f800b11}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\Debug Settings.cpp">
-      <Filter>Source Files\Settings Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\Game Settings.cpp">
-      <Filter>Source Files\Settings Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\Gui Settings.cpp">
-      <Filter>Source Files\Settings Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\N64System Settings.cpp">
-      <Filter>Source Files\Settings Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\Notification Settings.cpp">
-      <Filter>Source Files\Settings Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\Recompiler Settings.cpp">
-      <Filter>Source Files\Settings Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\Settings Class.cpp">
-      <Filter>Source Files\Settings Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-Application.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-ApplicationIndex.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-ApplicationPath.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-Cheats.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-GameSetting.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-GameSettingIndex.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-RDBCpuType.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-RDBOnOff.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-RDBRamSize.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-RDBSaveChip.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-RDBYesNo.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-RelativePath.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabase.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabaseIndex.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabaseSetting.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-SelectedDirectory.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-TempBool.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-TempNumber.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\SettingType\SettingsType-TempString.cpp">
-      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Frame Per Second Class.cpp">
-      <Filter>Source Files\User Interface Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Gui Class.cpp">
-      <Filter>Source Files\User Interface Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Main Menu Class.cpp">
-      <Filter>Source Files\User Interface Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Menu Class.cpp">
-      <Filter>Source Files\User Interface Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\MenuShortCuts.cpp">
-      <Filter>Source Files\User Interface Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Notification Class.cpp">
-      <Filter>Source Files\User Interface Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Rom Browser Class.cpp">
-      <Filter>Source Files\User Interface Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings Config.cpp">
-      <Filter>Source Files\User Interface Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Advanced Options.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Directories.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Game - General.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Game - Plugin.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Game - Recompiler.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Game - Status.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Game Browser.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Keyboard Shortcuts.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Options.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page - Plugin.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\Settings\Settings Page.cpp">
-      <Filter>Source Files\User Interface Source\Settings Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\WTL Controls\ModifiedEditBox.cpp">
-      <Filter>Source Files\User Interface Source\WTL Controls Source</Filter>
-    </ClCompile>
-    <ClCompile Include="User Interface\WTL Controls\PartialGroupBox.cpp">
-      <Filter>Source Files\User Interface Source\WTL Controls Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Debugger\Debugger - Memory Dump.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Debugger\Debugger - Memory Search.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Debugger\Debugger - TLB.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Debugger\Debugger - View Memory.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Debugger\Debugger.cpp">
-      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Multilanguage\Language Class.cpp">
-      <Filter>Source Files\Multilanguage Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Cheat Class.cpp">
-      <Filter>Source Files\N64 System Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\N64 Class.cpp">
-      <Filter>Source Files\N64 System Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\N64 Rom Class.cpp">
-      <Filter>Source Files\N64 System Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Profiling Class.cpp">
-      <Filter>Source Files\N64 System Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Rom Information Class.cpp">
-      <Filter>Source Files\N64 System Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Speed Limitor Class.cpp">
-      <Filter>Source Files\N64 System Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\System Globals.cpp">
-      <Filter>Source Files\N64 System Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\Audio.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\Dma.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\Eeprom.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\FlashRam.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\Memory Labels Class.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\Memory Virtual Mem.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\Mempak.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\Pif Ram.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\Register Class.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\Sram.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\System Events.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\System Timing.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Mips\TLB class.cpp">
-      <Filter>Source Files\N64 System Source\Mips Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\C Core\Logging.cpp">
-      <Filter>Source Files\N64 System Source\C Core Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\C Core\r4300i Commands.cpp">
-      <Filter>Source Files\N64 System Source\C Core Source</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Code Block.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Code Section.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Function Info.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Function Map Class.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Loop Analysis.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Recompiler Class.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Recompiler Memory.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Recompiler Ops.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Reg Info.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\Section Info.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\x86CodeLog.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Recompiler\X86ops.cpp">
-      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Interpreter\Interpreter CPU.cpp">
-      <Filter>Source Files\N64 System Source\Interpreter Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Interpreter\Interpreter Ops 32.cpp">
-      <Filter>Source Files\N64 System Source\Interpreter Files</Filter>
-    </ClCompile>
-    <ClCompile Include="N64 System\Interpreter\Interpreter Ops.cpp">
-      <Filter>Source Files\N64 System Source\Interpreter Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Plugins\Audio Plugin.cpp">
-      <Filter>Source Files\Plugin Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Plugins\Controller Plugin.cpp">
-      <Filter>Source Files\Plugin Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Plugins\GFX plugin.cpp">
-      <Filter>Source Files\Plugin Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Plugins\Plugin Class.cpp">
-      <Filter>Source Files\Plugin Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Plugins\Plugin List.cpp">
-      <Filter>Source Files\Plugin Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Plugins\RSP Plugin.cpp">
-      <Filter>Source Files\Plugin Source</Filter>
-    </ClCompile>
-    <ClCompile Include="3rd Party\7zip.cpp">
-      <Filter>Source Files\3rd Party Source</Filter>
-    </ClCompile>
-    <ClCompile Include="3rd Party\zlib\UNZIP.C">
-      <Filter>Source Files\3rd Party Source\ZLib Source</Filter>
-    </ClCompile>
-    <ClCompile Include="3rd Party\zlib\zip.c">
-      <Filter>Source Files\3rd Party Source\ZLib Source</Filter>
-    </ClCompile>
-    <ClCompile Include="Plugins\Plugin Base.cpp">
-      <Filter>Source Files\Plugin Source</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="User Interface\Bitmaps\AboutScreenBottom.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Bitmaps\AboutScreenMiddle.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Bitmaps\AboutScreenTop.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Bitmaps\CloseNormal.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Bitmaps\LangOK.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Bitmaps\LangOK_down.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Icons\left.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Bitmaps\ListItems.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Icons\PJ64.ICO">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Icons\right.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-    <Image Include="User Interface\Bitmaps\tri-state.bmp">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="User Interface\Icons\divider.cur">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="User Interface\Icons\hand.cur">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="User Interface\UI Resources.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Multilanguage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugin.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="WTL App.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\Debug Settings.h">
-      <Filter>Header Files\Settings Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\Game Settings.h">
-      <Filter>Header Files\Settings Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\Gui Settings.h">
-      <Filter>Header Files\Settings Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\N64System Settings.h">
-      <Filter>Header Files\Settings Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\Notification Settings.h">
-      <Filter>Header Files\Settings Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\Recompiler Settings.h">
-      <Filter>Header Files\Settings Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\Settings Class.h">
-      <Filter>Header Files\Settings Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-Application.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-ApplicationIndex.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-ApplicationPath.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-Base.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-Cheats.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-GameSetting.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-GameSettingIndex.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-RDBCpuType.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-RDBOnOff.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-RDBRamSize.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-RDBSaveChip.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-RDBYesNo.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-RelativePath.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabase.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabaseIndex.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabaseSetting.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-SelectedDirectory.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-TempBool.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-TempNumber.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="Settings\SettingType\SettingsType-TempString.h">
-      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Frame Per Second Class.h">
-      <Filter>Header Files\User Interface Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Gui Class.h">
-      <Filter>Header Files\User Interface Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Main Menu Class.h">
-      <Filter>Header Files\User Interface Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Menu Class.h">
-      <Filter>Header Files\User Interface Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\MenuShortCuts.h">
-      <Filter>Header Files\User Interface Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Notification Class.h">
-      <Filter>Header Files\User Interface Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\resource.h">
-      <Filter>Header Files\User Interface Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Rom Browser.h">
-      <Filter>Header Files\User Interface Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Advanced Options.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Directories.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Game - General.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Game - Plugin.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Game - Recompiler.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Game - Status.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Game Browser.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Keyboard Shortcuts.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Options.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page - Plugin.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\Settings\Settings Page.h">
-      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\WTL Controls\ModifiedCheckBox.h">
-      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\WTL Controls\ModifiedComboBox.h">
-      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\WTL Controls\ModifiedEditBox.h">
-      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\WTL Controls\numberctrl.h">
-      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="User Interface\WTL Controls\PartialGroupBox.h">
-      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Multilanguage\Language Class.h">
-      <Filter>Header Files\Multilanguage Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Cheat Class.h">
-      <Filter>Header Files\N64 System Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\N64 Class.h">
-      <Filter>Header Files\N64 System Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\N64 Rom Class.h">
-      <Filter>Header Files\N64 System Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\N64 Types.h">
-      <Filter>Header Files\N64 System Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Profiling Class.h">
-      <Filter>Header Files\N64 System Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Rom Information Class.h">
-      <Filter>Header Files\N64 System Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Speed Limitor Class.h">
-      <Filter>Header Files\N64 System Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\System Globals.h">
-      <Filter>Header Files\N64 System Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Types.h">
-      <Filter>Header Files\N64 System Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Audio.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Dma.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Eeprom.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\FlashRam.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Memory Class.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Memory Labels Class.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Memory Virtual Mem.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Mempak.H">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\OpCode.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Pif Ram.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Register Class.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\Sram.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\System Events.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\System Timing.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\TLB Class.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Mips\TranslateVaddr.h">
-      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\C Core\Logging.h">
-      <Filter>Header Files\N64 System Headers\C Core Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\C Core\r4300i Commands.h">
-      <Filter>Header Files\N64 System Headers\C Core Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Debugger\Debugger - Memory Dump.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Debugger\Debugger - Memory Search.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Debugger\Debugger - TLB.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Debugger\Debugger - View Memory.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Debugger\debugger.h">
-      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Code Block.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Code Section.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Delay Slot Map Class.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Exit Info.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Function Info.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Function Map Class.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Jump Info.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Loop Analysis.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Recompiler Class.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Recompiler Memory.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Recompiler Ops.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Reg Info.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\Section Info.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\x86CodeLog.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Recompiler\X86ops.h">
-      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Interpreter\Interpreter CPU.h">
-      <Filter>Header Files\N64 System Headers\Interpreter Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Interpreter\Interpreter Ops 32.h">
-      <Filter>Header Files\N64 System Headers\Interpreter Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="N64 System\Interpreter\Interpreter Ops.h">
-      <Filter>Header Files\N64 System Headers\Interpreter Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugins\Audio Plugin.h">
-      <Filter>Header Files\Plugin Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugins\Controller Plugin.h">
-      <Filter>Header Files\Plugin Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugins\GFX plugin.h">
-      <Filter>Header Files\Plugin Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugins\Plugin Class.h">
-      <Filter>Header Files\Plugin Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugins\Plugin List.h">
-      <Filter>Header Files\Plugin Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugins\RSP Plugin.h">
-      <Filter>Header Files\Plugin Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="3rd Party\7zip.h">
-      <Filter>Header Files\3rd Party Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="3rd Party\zip.h">
-      <Filter>Header Files\3rd Party Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="3rd Party\zlib\UNZIP.H">
-      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="3rd Party\zlib\ZCONF.H">
-      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="3rd Party\zlib\zip.h">
-      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="3rd Party\zlib\ZLIB.H">
-      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Plugins\Plugin Base.h">
-      <Filter>Header Files\Plugin Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="Version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{994eee48-3b61-4493-9a7f-6340a5a47175}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Source Files\Settings Files">
+      <UniqueIdentifier>{60e2fd87-7b6b-4147-82fe-e12516efe43c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Settings Files\Setting Types Files">
+      <UniqueIdentifier>{305f064d-be0e-418e-a93e-7de72242550e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\User Interface Source">
+      <UniqueIdentifier>{7b81a6a8-b20b-464e-8184-864886bb00fd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\User Interface Source\Settings Source">
+      <UniqueIdentifier>{bbef87b7-814a-4c87-9713-a07a2de577d4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\User Interface Source\WTL Controls Source">
+      <UniqueIdentifier>{19f68e68-7068-4a3c-a11d-c3ff48fe78b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\User Interface Source\Debugger Source">
+      <UniqueIdentifier>{89244064-68f5-44d9-9021-7a592d910e43}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Multilanguage Source">
+      <UniqueIdentifier>{94e87bf5-3b11-4f61-8a4a-333690ecf588}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source">
+      <UniqueIdentifier>{4d3c9ef9-7903-4112-8356-1e7ab2112c20}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source\Mips Source">
+      <UniqueIdentifier>{2b25c9d1-e1ec-46b6-988a-034edc1fc184}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source\C Core Source">
+      <UniqueIdentifier>{28ecfeb8-9360-4619-ae95-6f67d66f848d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source\Recompiler Files">
+      <UniqueIdentifier>{9a830b90-21d4-429d-b211-26ab691d6474}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\N64 System Source\Interpreter Files">
+      <UniqueIdentifier>{b5142b69-6b3b-4221-a3cb-2c6c0a35e1d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\Plugin Source">
+      <UniqueIdentifier>{242ae4a5-b150-44e6-b31c-027acd6d38b0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\3rd Party Source">
+      <UniqueIdentifier>{0b08dc3f-d3a6-453b-98ab-169c510f34a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\3rd Party Source\ZLib Source">
+      <UniqueIdentifier>{547023e2-7478-40d0-9123-eef7659a97ab}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{1e3eb4f7-a0b1-4d09-9e50-b5c699f24050}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bc88015e-37f7-4320-8aa4-d5043d17a386}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Header Files\Settings Headers">
+      <UniqueIdentifier>{80441979-1696-4aca-8652-199a9db22d06}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Settings Headers\Setting Types Header">
+      <UniqueIdentifier>{024d5b64-27a9-466b-9388-5c08c5eb5a47}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\User Interface Headers">
+      <UniqueIdentifier>{54e8f51f-d81d-4f8f-b4f1-76584c1b29a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\User Interface Headers\Settings Header">
+      <UniqueIdentifier>{81b58fad-f73f-4098-8ebc-ffceaff53478}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\User Interface Headers\WTL Controls Headers">
+      <UniqueIdentifier>{838a58e7-e1d2-45d3-bcf0-dcedad19610c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Multilanguage Headers">
+      <UniqueIdentifier>{5531af4d-33bb-4e84-8a55-c971a18ec7bf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers">
+      <UniqueIdentifier>{6cfab019-2f8d-4e09-be41-1df513b5a680}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\Mips Headers">
+      <UniqueIdentifier>{34662870-e7f3-4ab8-8788-a659bf32f764}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\C Core Headers">
+      <UniqueIdentifier>{4db18f2d-3c89-4a86-adf7-46731ca35087}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\Debugger Headers">
+      <UniqueIdentifier>{c4249d55-df70-4453-b017-b548514ad094}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\Recompiler Headers">
+      <UniqueIdentifier>{a3157468-d5a6-4167-b28f-9de5719ec1e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\N64 System Headers\Interpreter Headers">
+      <UniqueIdentifier>{d87d7401-c716-40f7-a51b-2d9803936b23}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Plugin Headers">
+      <UniqueIdentifier>{93ec15cf-1fb2-4095-ae07-95128a67d3df}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\3rd Party Headers">
+      <UniqueIdentifier>{21f6da31-289d-4d03-80bb-b77fe60355d7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\3rd Party Headers\Zlib Headers">
+      <UniqueIdentifier>{ef4a164b-c5ed-4469-a0e2-4eb21f800b11}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Debug Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Game Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Gui Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\N64System Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Notification Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Recompiler Settings.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\Settings Class.cpp">
+      <Filter>Source Files\Settings Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-Application.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-ApplicationIndex.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-ApplicationPath.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-Cheats.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-GameSetting.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-GameSettingIndex.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBCpuType.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBOnOff.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBRamSize.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBSaveChip.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RDBYesNo.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RelativePath.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabase.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabaseIndex.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-RomDatabaseSetting.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-SelectedDirectory.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-TempBool.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-TempNumber.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\SettingType\SettingsType-TempString.cpp">
+      <Filter>Source Files\Settings Files\Setting Types Files</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Frame Per Second Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Gui Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Main Menu Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Menu Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\MenuShortCuts.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Notification Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Rom Browser Class.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings Config.cpp">
+      <Filter>Source Files\User Interface Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Advanced Options.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Directories.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - General.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - Plugin.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - Recompiler.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game - Status.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Game Browser.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Keyboard Shortcuts.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Options.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page - Plugin.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\Settings\Settings Page.cpp">
+      <Filter>Source Files\User Interface Source\Settings Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\WTL Controls\ModifiedEditBox.cpp">
+      <Filter>Source Files\User Interface Source\WTL Controls Source</Filter>
+    </ClCompile>
+    <ClCompile Include="User Interface\WTL Controls\PartialGroupBox.cpp">
+      <Filter>Source Files\User Interface Source\WTL Controls Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger - Memory Dump.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger - Memory Search.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger - TLB.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger - View Memory.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Debugger\Debugger.cpp">
+      <Filter>Source Files\User Interface Source\Debugger Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Multilanguage\Language Class.cpp">
+      <Filter>Source Files\Multilanguage Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Cheat Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\N64 Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\N64 Rom Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Profiling Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Rom Information Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Speed Limitor Class.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\System Globals.cpp">
+      <Filter>Source Files\N64 System Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Audio.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Dma.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Eeprom.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\FlashRam.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Memory Labels Class.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Memory Virtual Mem.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Mempak.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Pif Ram.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Register Class.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Sram.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\System Events.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\System Timing.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\TLB class.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\C Core\Logging.cpp">
+      <Filter>Source Files\N64 System Source\C Core Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\C Core\r4300i Commands.cpp">
+      <Filter>Source Files\N64 System Source\C Core Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Code Block.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Code Section.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Function Info.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Function Map Class.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Loop Analysis.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Recompiler Class.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Recompiler Memory.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Recompiler Ops.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Reg Info.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\Section Info.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\x86CodeLog.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Recompiler\X86ops.cpp">
+      <Filter>Source Files\N64 System Source\Recompiler Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Interpreter\Interpreter CPU.cpp">
+      <Filter>Source Files\N64 System Source\Interpreter Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Interpreter\Interpreter Ops 32.cpp">
+      <Filter>Source Files\N64 System Source\Interpreter Files</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Interpreter\Interpreter Ops.cpp">
+      <Filter>Source Files\N64 System Source\Interpreter Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\Audio Plugin.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\Controller Plugin.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\GFX plugin.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\Plugin Class.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\Plugin List.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\RSP Plugin.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="3rd Party\7zip.cpp">
+      <Filter>Source Files\3rd Party Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3rd Party\zlib\contrib\minizip\unzip.c">
+      <Filter>Source Files\3rd Party Source\ZLib Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\3rd Party\zlib\contrib\minizip\zip.c">
+      <Filter>Source Files\3rd Party Source\ZLib Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Plugins\Plugin Base.cpp">
+      <Filter>Source Files\Plugin Source</Filter>
+    </ClCompile>
+    <ClCompile Include="N64 System\Mips\Rumblepak.cpp">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClCompile>
+    <ClCompile Include="Multilanguage\LanguageSelector.cpp">
+      <Filter>Source Files\Multilanguage Source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="User Interface\Bitmaps\AboutScreenBottom.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\AboutScreenMiddle.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\AboutScreenTop.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\CloseNormal.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\LangOK.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\LangOK_down.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Icons\left.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\ListItems.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Icons\PJ64.ICO">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Icons\right.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+    <Image Include="User Interface\Bitmaps\tri-state.bmp">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="User Interface\Icons\divider.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="User Interface\Icons\hand.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="User Interface\UI Resources.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Multilanguage.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugin.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WTL App.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Debug Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Game Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Gui Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\N64System Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Notification Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Recompiler Settings.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\Settings Class.h">
+      <Filter>Header Files\Settings Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-Application.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-ApplicationIndex.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-ApplicationPath.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-Base.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-Cheats.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-GameSetting.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-GameSettingIndex.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBCpuType.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBOnOff.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBRamSize.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBSaveChip.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RDBYesNo.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RelativePath.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabase.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabaseIndex.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-RomDatabaseSetting.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-SelectedDirectory.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-TempBool.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-TempNumber.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="Settings\SettingType\SettingsType-TempString.h">
+      <Filter>Header Files\Settings Headers\Setting Types Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Frame Per Second Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Gui Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Main Menu Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Menu Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\MenuShortCuts.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Notification Class.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\resource.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Rom Browser.h">
+      <Filter>Header Files\User Interface Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Advanced Options.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Directories.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - General.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - Plugin.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - Recompiler.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game - Status.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Game Browser.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Keyboard Shortcuts.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Options.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page - Plugin.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\Settings\Settings Page.h">
+      <Filter>Header Files\User Interface Headers\Settings Header</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\ModifiedCheckBox.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\ModifiedComboBox.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\ModifiedEditBox.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\numberctrl.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="User Interface\WTL Controls\PartialGroupBox.h">
+      <Filter>Header Files\User Interface Headers\WTL Controls Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Multilanguage\Language Class.h">
+      <Filter>Header Files\Multilanguage Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Cheat Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\N64 Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\N64 Rom Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\N64 Types.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Profiling Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Rom Information Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Speed Limitor Class.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\System Globals.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Types.h">
+      <Filter>Header Files\N64 System Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Audio.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Dma.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Eeprom.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\FlashRam.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Memory Class.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Memory Labels Class.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Memory Virtual Mem.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Mempak.H">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\OpCode.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Pif Ram.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Register Class.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Sram.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\System Events.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\System Timing.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\TLB Class.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\TranslateVaddr.h">
+      <Filter>Header Files\N64 System Headers\Mips Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\C Core\Logging.h">
+      <Filter>Header Files\N64 System Headers\C Core Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\C Core\r4300i Commands.h">
+      <Filter>Header Files\N64 System Headers\C Core Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\Debugger - Memory Dump.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\Debugger - Memory Search.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\Debugger - TLB.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\Debugger - View Memory.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Debugger\debugger.h">
+      <Filter>Header Files\N64 System Headers\Debugger Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Code Block.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Code Section.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Delay Slot Map Class.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Exit Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Function Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Function Map Class.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Jump Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Loop Analysis.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Recompiler Class.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Recompiler Memory.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Recompiler Ops.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Reg Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\Section Info.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\x86CodeLog.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Recompiler\X86ops.h">
+      <Filter>Header Files\N64 System Headers\Recompiler Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Interpreter\Interpreter CPU.h">
+      <Filter>Header Files\N64 System Headers\Interpreter Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Interpreter\Interpreter Ops 32.h">
+      <Filter>Header Files\N64 System Headers\Interpreter Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Interpreter\Interpreter Ops.h">
+      <Filter>Header Files\N64 System Headers\Interpreter Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\Audio Plugin.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\Controller Plugin.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\GFX plugin.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\Plugin Class.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\Plugin List.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\RSP Plugin.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\7zip.h">
+      <Filter>Header Files\3rd Party Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="3rd Party\zip.h">
+      <Filter>Header Files\3rd Party Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\3rd Party\zlib\zconf.h">
+      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\3rd Party\zlib\zlib.h">
+      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\3rd Party\zlib\contrib\minizip\unzip.h">
+      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\3rd Party\zlib\contrib\minizip\zip.h">
+      <Filter>Header Files\3rd Party Headers\Zlib Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Plugins\Plugin Base.h">
+      <Filter>Header Files\Plugin Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="Version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="N64 System\Mips\Rumblepak.h">
+      <Filter>Source Files\N64 System Source\Mips Source</Filter>
+    </ClInclude>
+    <ClInclude Include="Multilanguage\LanguageSelector.h">
+      <Filter>Header Files\Multilanguage Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Project64/Settings.h b/Source/Project64/Settings.h
index 8a09add1a..94b407a72 100644
--- a/Source/Project64/Settings.h
+++ b/Source/Project64/Settings.h
@@ -95,6 +95,9 @@ enum SettingID {
 	Rdb_GameCheatFixPlugin,
 	Rdb_ViRefreshRate,
 	Rdb_AiCountPerBytes,
+	Rdb_AudioResetOnLoad,
+	Rdb_AllowROMWrites,
+	Rdb_CRC_Recalc,
 
 	//Individual Game Settings
 	Game_IniKey,
@@ -139,6 +142,9 @@ enum SettingID {
 	Game_LoadRomToMemory,
 	Game_ViRefreshRate,
 	Game_AiCountPerBytes,
+	Game_AudioResetOnLoad,
+	Game_AllowROMWrites,
+	Game_CRC_Recalc,
 
 	// General Game running info
 	GameRunning_LoadingInProgress,
diff --git a/Source/Project64/Settings/Game Settings.cpp b/Source/Project64/Settings/Game Settings.cpp
index 1094b300b..af2ffdc57 100644
--- a/Source/Project64/Settings/Game Settings.cpp	
+++ b/Source/Project64/Settings/Game Settings.cpp	
@@ -33,6 +33,7 @@ bool  CGameSettings::m_RegCaching;
 bool  CGameSettings::m_bLinkBlocks;
 DWORD CGameSettings::m_LookUpMode; //FUNC_LOOKUP_METHOD
 SYSTEM_TYPE CGameSettings::m_SystemType = SYSTEM_NTSC;
+CPU_TYPE CGameSettings::m_CpuType = CPU_Recompiler;
 
 void CGameSettings::RefreshGameSettings()
 {
@@ -58,6 +59,7 @@ void CGameSettings::RefreshGameSettings()
 	m_bLinkBlocks       = g_Settings->LoadBool(Game_BlockLinking);
 	m_LookUpMode        = g_Settings->LoadDword(Game_FuncLookupMode);
 	m_SystemType        = (SYSTEM_TYPE)g_Settings->LoadDword(Game_SystemType);
+	m_CpuType           = (CPU_TYPE)g_Settings->LoadDword(Game_CpuType);
 
 	m_bSyncingToAudio   = m_bSyncToAudio;
 	if (m_CountPerOp == 0)
diff --git a/Source/Project64/Settings/Game Settings.h b/Source/Project64/Settings/Game Settings.h
index 7d5bed627..44690d25f 100644
--- a/Source/Project64/Settings/Game Settings.h	
+++ b/Source/Project64/Settings/Game Settings.h	
@@ -21,7 +21,7 @@ public:
 	inline static bool  bRegCaching       ( void ) { return m_RegCaching; }
 	inline static bool  bLinkBlocks       ( void ) { return m_bLinkBlocks; }
 	inline static FUNC_LOOKUP_METHOD LookUpMode ( void ) { return (FUNC_LOOKUP_METHOD)m_LookUpMode; }
-	static inline bool  bUseTlb           ( void ) { return m_bUseTlb; }
+	inline static bool  bUseTlb           ( void ) { return m_bUseTlb; }
 	inline static DWORD CountPerOp        ( void ) { return m_CountPerOp; }
 	inline static DWORD ViRefreshRate     ( void ) { return m_ViRefreshRate; }
 	inline static DWORD AiCountPerBytes   ( void ) { return m_AiCountPerBytes; }
@@ -33,12 +33,13 @@ public:
 	inline static bool  bFastSP           ( void ) { return m_bFastSP; }
 	inline static bool  b32BitCore        ( void ) { return m_b32Bit; }
 	inline static bool  RspAudioSignal    ( void ) { return m_RspAudioSignal; }
-	static inline bool  bSMM_StoreInstruc ( void ) { return m_bSMM_StoreInstruc;  }
-	static inline bool  bSMM_Protect      ( void ) { return m_bSMM_Protect;       }
-	static inline bool  bSMM_ValidFunc    ( void ) { return m_bSMM_ValidFunc;     }
-	static inline bool  bSMM_PIDMA        ( void ) { return m_bSMM_PIDMA;         }
-	static inline bool  bSMM_TLB          ( void ) { return m_bSMM_TLB;           }
+	inline static bool  bSMM_StoreInstruc ( void ) { return m_bSMM_StoreInstruc; }
+	inline static bool  bSMM_Protect      ( void ) { return m_bSMM_Protect; }
+	inline static bool  bSMM_ValidFunc    ( void ) { return m_bSMM_ValidFunc; }
+	inline static bool  bSMM_PIDMA        ( void ) { return m_bSMM_PIDMA; }
+	inline static bool  bSMM_TLB          ( void ) { return m_bSMM_TLB; }
 	inline static SYSTEM_TYPE SystemType  ( void ) { return m_SystemType; }
+	inline static CPU_TYPE CpuType        ( void ) { return m_CpuType; }
 
 protected:
 	static void SpeedChanged (int SpeedLimit );
@@ -68,4 +69,5 @@ private:
 	static bool  m_bSMM_PIDMA;
 	static bool  m_bSMM_TLB;
 	static SYSTEM_TYPE m_SystemType;
+	static CPU_TYPE m_CpuType;
 };
diff --git a/Source/Project64/Settings/Notification Settings.cpp b/Source/Project64/Settings/Notification Settings.cpp
index bccd89f04..dad717a84 100644
--- a/Source/Project64/Settings/Notification Settings.cpp	
+++ b/Source/Project64/Settings/Notification Settings.cpp	
@@ -14,8 +14,6 @@ bool CNotificationSettings::m_bInFullScreen = false;
 
 CNotificationSettings::CNotificationSettings()
 {
-	g_Settings->RegisterChangeCB(UserInterface_InFullScreen,this,(CSettings::SettingChangedFunc)StaticRefreshSettings);
-	RefreshSettings();
 }
 
 CNotificationSettings::~CNotificationSettings()
@@ -26,6 +24,12 @@ CNotificationSettings::~CNotificationSettings()
 	}
 }
 
+void CNotificationSettings::RegisterNotifications()
+{
+	g_Settings->RegisterChangeCB(UserInterface_InFullScreen, this, (CSettings::SettingChangedFunc)StaticRefreshSettings);
+	RefreshSettings();
+}
+
 void CNotificationSettings::RefreshSettings()
 {
 	m_bInFullScreen = g_Settings->LoadBool(UserInterface_InFullScreen);
diff --git a/Source/Project64/Settings/Notification Settings.h b/Source/Project64/Settings/Notification Settings.h
index 5c4f0963a..5e75da155 100644
--- a/Source/Project64/Settings/Notification Settings.h	
+++ b/Source/Project64/Settings/Notification Settings.h	
@@ -25,5 +25,6 @@ protected:
 	CNotificationSettings();
 	virtual ~CNotificationSettings();
 
+	void RegisterNotifications (void);
 	inline bool InFullScreen ( void ) const { return m_bInFullScreen; }
 };
diff --git a/Source/Project64/Settings/SettingType/SettingsType-Application.cpp b/Source/Project64/Settings/SettingType/SettingsType-Application.cpp
index f41bfc841..98f0634be 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-Application.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-Application.cpp
@@ -10,47 +10,48 @@
 ****************************************************************************/
 #include "stdafx.h"
 #include "SettingsType-Application.h"
+#include <Common/path.h>
 
 bool       CSettingTypeApplication::m_UseRegistry     = false;
 CIniFile * CSettingTypeApplication::m_SettingsIniFile = NULL;
 
-CSettingTypeApplication::CSettingTypeApplication(LPCSTR Section, LPCSTR Name, DWORD DefaultValue ) :
-	m_Section(FixSectionName(Section)),
-	m_KeyName(Name),
-	m_DefaultStr(""),
-	m_DefaultValue(DefaultValue),
-	m_DefaultSetting(Default_Constant),
-	m_KeyNameIdex(m_KeyName)
+CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, uint32_t DefaultValue ) :
+    m_DefaultStr(""),
+    m_DefaultValue(DefaultValue),
+    m_DefaultSetting(Default_Constant),
+    m_Section(FixSectionName(Section)),
+    m_KeyName(Name),
+    m_KeyNameIdex(m_KeyName)
 {
 }
 
-CSettingTypeApplication::CSettingTypeApplication(LPCSTR Section, LPCSTR Name, bool DefaultValue ) :
-	m_Section(FixSectionName(Section)),
-	m_KeyName(Name),
-	m_DefaultStr(""),
-	m_DefaultValue(DefaultValue),
-	m_DefaultSetting(Default_Constant),
-	m_KeyNameIdex(m_KeyName)
+CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, bool DefaultValue ) :
+    m_DefaultStr(""),
+    m_DefaultValue(DefaultValue),
+    m_DefaultSetting(Default_Constant),
+    m_Section(FixSectionName(Section)),
+    m_KeyName(Name),
+    m_KeyNameIdex(m_KeyName)
 {
 }
 
-CSettingTypeApplication::CSettingTypeApplication(LPCSTR Section, LPCSTR Name, LPCSTR DefaultValue ) :
-	m_Section(FixSectionName(Section)),
-	m_KeyName(Name),
-	m_DefaultStr(DefaultValue),
-	m_DefaultValue(0),
-	m_DefaultSetting(Default_Constant),
-	m_KeyNameIdex(m_KeyName)
+CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, const char * DefaultValue ) :
+    m_DefaultStr(DefaultValue),
+    m_DefaultValue(0),
+    m_DefaultSetting(Default_Constant),
+    m_Section(FixSectionName(Section)),
+    m_KeyName(Name),
+    m_KeyNameIdex(m_KeyName)
 {
 }
 
-CSettingTypeApplication::CSettingTypeApplication(LPCSTR Section, LPCSTR Name, SettingID DefaultSetting ) :
-	m_Section(FixSectionName(Section)),
-	m_KeyName(Name),
-	m_DefaultStr(""),
-	m_DefaultValue(0),
-	m_DefaultSetting(DefaultSetting),
-	m_KeyNameIdex(m_KeyName)
+CSettingTypeApplication::CSettingTypeApplication(const char * Section, const char * Name, SettingID DefaultSetting ) :
+    m_DefaultStr(""),
+    m_DefaultValue(0),
+    m_DefaultSetting(DefaultSetting),
+    m_Section(FixSectionName(Section)),
+    m_KeyName(Name),
+    m_KeyNameIdex(m_KeyName)
 {
 }
 
@@ -58,229 +59,228 @@ CSettingTypeApplication::~CSettingTypeApplication()
 {
 }
 
-
-void CSettingTypeApplication::Initilize( const char * /*AppName*/ )
+void CSettingTypeApplication::Initialize( const char * /*AppName*/ )
 {
-	stdstr SettingsFile, OrigSettingsFile;
-	
-	for (int i = 0; i < 100; i++)
-	{
-		OrigSettingsFile = SettingsFile;
-		if (!g_Settings->LoadString(SupportFile_Settings,SettingsFile) && i > 0)
-		{
-			break;
-		}
-		if (SettingsFile == OrigSettingsFile)
-		{
-			break;
-		}
-		if (m_SettingsIniFile)
-		{
-			delete m_SettingsIniFile;
-		}
-		CPath SettingsDir(CPath(SettingsFile).GetDriveDirectory(),"");
-		if (!SettingsDir.DirectoryExists())
-		{
-			SettingsDir.CreateDirectory();
-		}
+    stdstr SettingsFile, OrigSettingsFile;
 
-		m_SettingsIniFile = new CIniFile(SettingsFile.c_str());
-	}
-	
-	m_SettingsIniFile->SetAutoFlush(false);
-	m_UseRegistry = g_Settings->LoadBool(Setting_UseFromRegistry);
+    for (int i = 0; i < 100; i++)
+    {
+        OrigSettingsFile = SettingsFile;
+        if (!g_Settings->LoadStringVal(SupportFile_Settings,SettingsFile) && i > 0)
+        {
+            break;
+        }
+        if (SettingsFile == OrigSettingsFile)
+        {
+            break;
+        }
+        if (m_SettingsIniFile)
+        {
+            delete m_SettingsIniFile;
+        }
+        CPath SettingsDir(CPath(SettingsFile).GetDriveDirectory(),"");
+        if (!SettingsDir.DirectoryExists())
+        {
+			SettingsDir.DirectoryCreate();
+        }
+
+        m_SettingsIniFile = new CIniFile(SettingsFile.c_str());
+    }
+
+    m_SettingsIniFile->SetAutoFlush(false);
+    m_UseRegistry = g_Settings->LoadBool(Setting_UseFromRegistry);
 }
 
 void CSettingTypeApplication::Flush()
 {
-	if (m_SettingsIniFile)
-	{
-		m_SettingsIniFile->FlushChanges();
-	}
+    if (m_SettingsIniFile)
+    {
+        m_SettingsIniFile->FlushChanges();
+    }
 }
 
 void CSettingTypeApplication::CleanUp()
 {
-	if (m_SettingsIniFile)
-	{
-		m_SettingsIniFile->SetAutoFlush(true);
-		delete m_SettingsIniFile;
-		m_SettingsIniFile = NULL;
-	}
+    if (m_SettingsIniFile)
+    {
+        m_SettingsIniFile->SetAutoFlush(true);
+        delete m_SettingsIniFile;
+        m_SettingsIniFile = NULL;
+    }
 }
 
 bool CSettingTypeApplication::Load ( int /*Index*/, bool & Value ) const
 {
-	bool bRes = false;
+    bool bRes = false;
 
-	if (!m_UseRegistry)
-	{
-		DWORD dwValue;
-		bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,dwValue);
-		if (bRes)
-		{
-			Value = dwValue != 0;
-		}
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	
-	if (!bRes && m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue != 0;
-		} else {
-			g_Settings->LoadBool(m_DefaultSetting,Value);
-		}
-	}
-	return bRes;
+    if (!m_UseRegistry)
+    {
+        uint32_t dwValue;
+        bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,dwValue);
+        if (bRes)
+        {
+            Value = dwValue != 0;
+        }
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+
+    if (!bRes && m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue != 0;
+        } else {
+            g_Settings->LoadBool(m_DefaultSetting,Value);
+        }
+    }
+    return bRes;
 }
 
-bool CSettingTypeApplication::Load ( int /*Index*/, ULONG & Value ) const
+bool CSettingTypeApplication::Load ( int /*Index*/, uint32_t & Value ) const
 {
-	bool bRes = false;
-	if (!m_UseRegistry)
-	{
-		bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,Value);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	if (!bRes && m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue;
-		} else {
-			g_Settings->LoadDword(m_DefaultSetting,Value);
-		}
-	}
-	return bRes;
+    bool bRes = false;
+    if (!m_UseRegistry)
+    {
+        bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,Value);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    if (!bRes && m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue;
+        } else {
+            g_Settings->LoadDword(m_DefaultSetting,Value);
+        }
+    }
+    return bRes;
 }
 
-LPCSTR CSettingTypeApplication::SectionName ( void ) const 
+const char * CSettingTypeApplication::SectionName ( void ) const
 {
-	return m_Section.c_str();
+    return m_Section.c_str();
 }
 
 bool CSettingTypeApplication::Load ( int Index, stdstr & Value ) const
 {
-	bool bRes = false;
-	if (!m_UseRegistry)
-	{
-		bRes = m_SettingsIniFile ? m_SettingsIniFile->GetString(SectionName(),m_KeyNameIdex.c_str(),m_DefaultStr,Value) : false;
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	if (!bRes)
-	{
-		CSettingTypeApplication::LoadDefault(Index,Value);
-	}
-	return bRes;
+    bool bRes = false;
+    if (!m_UseRegistry)
+    {
+        bRes = m_SettingsIniFile ? m_SettingsIniFile->GetString(SectionName(),m_KeyNameIdex.c_str(),m_DefaultStr,Value) : false;
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    if (!bRes)
+    {
+        CSettingTypeApplication::LoadDefault(Index,Value);
+    }
+    return bRes;
 }
 
 //return the default values
 void CSettingTypeApplication::LoadDefault ( int /*Index*/, bool & Value   ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue != 0;
-		} else {
-			g_Settings->LoadBool(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue != 0;
+        } else {
+            g_Settings->LoadBool(m_DefaultSetting,Value);
+        }
+    }
 }
 
-void CSettingTypeApplication::LoadDefault ( int /*Index*/, ULONG & Value  ) const
+void CSettingTypeApplication::LoadDefault ( int /*Index*/, uint32_t & Value  ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue;
-		} else {
-			g_Settings->LoadDword(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue;
+        } else {
+            g_Settings->LoadDword(m_DefaultSetting,Value);
+        }
+    }
 }
 
 void CSettingTypeApplication::LoadDefault ( int /*Index*/, stdstr & Value ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultStr;
-		} else {
-			g_Settings->LoadString(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultStr;
+        } else {
+            g_Settings->LoadStringVal(m_DefaultSetting,Value);
+        }
+    }
 }
 
 //Update the settings
 void CSettingTypeApplication::Save ( int /*Index*/, bool Value )
 {
-	if (!m_UseRegistry)
-	{
-		m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
+    if (!m_UseRegistry)
+    {
+        m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
 }
 
-void CSettingTypeApplication::Save ( int /*Index*/, ULONG Value )
+void CSettingTypeApplication::Save ( int /*Index*/, uint32_t Value )
 {
-	if (!m_UseRegistry)
-	{
-		m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
+    if (!m_UseRegistry)
+    {
+        m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
 }
 
 void CSettingTypeApplication::Save ( int /*Index*/, const stdstr & Value )
 {
-	if (!m_UseRegistry)
-	{
-		m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value.c_str());
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
+    if (!m_UseRegistry)
+    {
+        m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value.c_str());
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
 }
 
 void CSettingTypeApplication::Save ( int /*Index*/, const char * Value )
 {
-	if (!m_UseRegistry)
-	{
-		m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
+    if (!m_UseRegistry)
+    {
+        m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
 }
 
-stdstr CSettingTypeApplication::FixSectionName(LPCSTR Section)
+stdstr CSettingTypeApplication::FixSectionName(const char * Section)
 {
-	stdstr SectionName(Section);
+    stdstr SectionName(Section);
 
-	if (!m_UseRegistry)
-	{
-		if (SectionName.empty()) 
-		{ 
-			SectionName = "default";
-		}
-		SectionName.Replace("\\","-");
-	}
-	return SectionName;
+    if (!m_UseRegistry)
+    {
+        if (SectionName.empty())
+        {
+            SectionName = "default";
+        }
+        SectionName.Replace("\\","-");
+    }
+    return SectionName;
 }
 
 void CSettingTypeApplication::Delete( int /*Index*/ )
 {
-	if (!m_UseRegistry)
-	{
-		m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),NULL);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
+    if (!m_UseRegistry)
+    {
+        m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),NULL);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-Application.h b/Source/Project64/Settings/SettingType/SettingsType-Application.h
index 49bd006e3..ff14203c0 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-Application.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-Application.h
@@ -10,59 +10,64 @@
 ****************************************************************************/
 #pragma once
 
+#include <Common/Ini File Class.h>
+#include "SettingsType-Base.h"
+
 class CSettingTypeApplication :
-	public CSettingType
+    public CSettingType
 {
-	
-protected:
-	const LPCSTR    m_DefaultStr;
-	const DWORD     m_DefaultValue;
-	const SettingID m_DefaultSetting;
-
-	stdstr FixSectionName (LPCSTR Section);
-
-	static CIniFile * m_SettingsIniFile;
-	static bool       m_UseRegistry;
-	const stdstr      m_Section;
-	const stdstr      m_KeyName;
-	mutable stdstr    m_KeyNameIdex;
-
-	virtual LPCSTR    SectionName ( void ) const;
-
 public:
-	CSettingTypeApplication(LPCSTR Section, LPCSTR Name, LPCSTR DefaultValue );
-	CSettingTypeApplication(LPCSTR Section, LPCSTR Name, bool DefaultValue );
-	CSettingTypeApplication(LPCSTR Section, LPCSTR Name, DWORD DefaultValue );
-	CSettingTypeApplication(LPCSTR Section, LPCSTR Name, SettingID DefaultSetting );
-	virtual ~CSettingTypeApplication();
+    CSettingTypeApplication(const char * Section, const char * Name, const char * DefaultValue );
+    CSettingTypeApplication(const char * Section, const char * Name, bool DefaultValue );
+    CSettingTypeApplication(const char * Section, const char * Name, uint32_t DefaultValue );
+    CSettingTypeApplication(const char * Section, const char * Name, SettingID DefaultSetting );
+    virtual ~CSettingTypeApplication();
 
-	virtual bool        IndexBasedSetting ( void ) const { return false; }
-	virtual SettingType GetSettingType    ( void ) const { return m_UseRegistry ? SettingType_Registry : SettingType_CfgFile; }	
+    virtual bool        IndexBasedSetting ( void ) const { return false; }
+    virtual SettingType GetSettingType    ( void ) const { return m_UseRegistry ? SettingType_Registry : SettingType_CfgFile; }
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
 
-	// Initilize this class to use ini or registry
-	static void Initilize ( const char * AppName );
-	static void CleanUp   ( void );
-	static void Flush     ( void );
+    // Initialize this class to use ini or registry
+    static void Initialize( const char * AppName );
+    static void CleanUp   ( void );
+    static void Flush     ( void );
 
-	LPCSTR GetKeyName ( void) const { return m_KeyName.c_str(); }
+    const char * GetKeyName ( void) const { return m_KeyName.c_str(); }
+
+protected:
+    const char * m_DefaultStr;
+    const uint32_t m_DefaultValue;
+    const SettingID m_DefaultSetting;
+
+    stdstr FixSectionName (const char * Section);
+
+    static CIniFile * m_SettingsIniFile;
+    static bool       m_UseRegistry;
+    const stdstr      m_Section;
+    const stdstr      m_KeyName;
+    mutable stdstr    m_KeyNameIdex;
+
+    virtual const char * SectionName ( void ) const;
+
+private:
+    CSettingTypeApplication(const CSettingTypeApplication&);				// Disable copy constructor
+    CSettingTypeApplication& operator=(const CSettingTypeApplication&);		// Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.cpp b/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.cpp
index f02902beb..427917a15 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.cpp
@@ -12,24 +12,23 @@
 #include "SettingsType-Application.h"
 #include "SettingsType-ApplicationIndex.h"
 
-
-CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(LPCSTR Section, LPCSTR Name, DWORD DefaultValue ) :
-	CSettingTypeApplication(Section,Name,DefaultValue)
+CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, uint32_t DefaultValue ) :
+    CSettingTypeApplication(Section,Name,DefaultValue)
 {
 }
 
-CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(LPCSTR Section, LPCSTR Name, bool DefaultValue ) :
-	CSettingTypeApplication(Section,Name,DefaultValue)
+CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, bool DefaultValue ) :
+    CSettingTypeApplication(Section,Name,DefaultValue)
 {
 }
 
-CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(LPCSTR Section, LPCSTR Name, LPCSTR DefaultValue ) :
-	CSettingTypeApplication(Section,Name,DefaultValue)
+CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, const char * DefaultValue ) :
+    CSettingTypeApplication(Section,Name,DefaultValue)
 {
 }
 
-CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(LPCSTR Section, LPCSTR Name, SettingID DefaultSetting ) :
-	CSettingTypeApplication(Section,Name,DefaultSetting)
+CSettingTypeApplicationIndex::CSettingTypeApplicationIndex(const char * Section, const char * Name, SettingID DefaultSetting ) :
+    CSettingTypeApplication(Section,Name,DefaultSetting)
 {
 }
 
@@ -39,68 +38,68 @@ CSettingTypeApplicationIndex::~CSettingTypeApplicationIndex ( void )
 
 bool CSettingTypeApplicationIndex::Load ( int Index, bool & Value ) const
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	return CSettingTypeApplication::Load(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    return CSettingTypeApplication::Load(0,Value);
 }
 
-bool CSettingTypeApplicationIndex::Load ( int Index, ULONG & Value ) const
+bool CSettingTypeApplicationIndex::Load ( int Index, uint32_t & Value ) const
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	return CSettingTypeApplication::Load(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    return CSettingTypeApplication::Load(0,Value);
 }
 
 bool CSettingTypeApplicationIndex::Load ( int Index, stdstr & Value ) const
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	return CSettingTypeApplication::Load(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    return CSettingTypeApplication::Load(0,Value);
 }
 
 //return the default values
 void CSettingTypeApplicationIndex::LoadDefault ( int Index, bool & Value   ) const
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	CSettingTypeApplication::LoadDefault(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    CSettingTypeApplication::LoadDefault(0,Value);
 }
 
-void CSettingTypeApplicationIndex::LoadDefault ( int Index, ULONG & Value  ) const
+void CSettingTypeApplicationIndex::LoadDefault ( int Index, uint32_t & Value  ) const
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	CSettingTypeApplication::LoadDefault(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    CSettingTypeApplication::LoadDefault(0,Value);
 }
 
 void CSettingTypeApplicationIndex::LoadDefault ( int Index, stdstr & Value ) const
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	CSettingTypeApplication::LoadDefault(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    CSettingTypeApplication::LoadDefault(0,Value);
 }
 
 //Update the settings
 void CSettingTypeApplicationIndex::Save ( int Index, bool Value )
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	CSettingTypeApplication::Save(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    CSettingTypeApplication::Save(0,Value);
 }
 
-void CSettingTypeApplicationIndex::Save ( int Index, ULONG Value )
+void CSettingTypeApplicationIndex::Save ( int Index, uint32_t Value )
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	CSettingTypeApplication::Save(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    CSettingTypeApplication::Save(0,Value);
 }
 
 void CSettingTypeApplicationIndex::Save ( int Index, const stdstr & Value )
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	CSettingTypeApplication::Save(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    CSettingTypeApplication::Save(0,Value);
 }
 
 void CSettingTypeApplicationIndex::Save ( int Index, const char * Value )
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	CSettingTypeApplication::Save(0,Value);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    CSettingTypeApplication::Save(0,Value);
 }
 
 void CSettingTypeApplicationIndex::Delete ( int Index )
 {
-	m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
-	CSettingTypeApplication::Save(0,(const char *)NULL);
+    m_KeyNameIdex.Format("%s %d",m_KeyName.c_str(),Index);
+    CSettingTypeApplication::Save(0,(const char *)NULL);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.h b/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.h
index b2281d271..336ed62b1 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-ApplicationIndex.h
@@ -11,35 +11,38 @@
 #pragma once
 
 class CSettingTypeApplicationIndex :
-	public CSettingTypeApplication
+    public CSettingTypeApplication
 {
-
 public:
-	CSettingTypeApplicationIndex(LPCSTR Section, LPCSTR Name, LPCSTR DefaultValue );
-	CSettingTypeApplicationIndex(LPCSTR Section, LPCSTR Name, bool DefaultValue );
-	CSettingTypeApplicationIndex(LPCSTR Section, LPCSTR Name, DWORD DefaultValue );
-	CSettingTypeApplicationIndex(LPCSTR Section, LPCSTR Name, SettingID DefaultSetting );
-	~CSettingTypeApplicationIndex();
+    CSettingTypeApplicationIndex(const char * Section, const char * Name, const char * DefaultValue );
+    CSettingTypeApplicationIndex(const char * Section, const char * Name, bool DefaultValue );
+    CSettingTypeApplicationIndex(const char * Section, const char * Name, uint32_t DefaultValue );
+    CSettingTypeApplicationIndex(const char * Section, const char * Name, SettingID DefaultSetting );
+    ~CSettingTypeApplicationIndex();
 
-	virtual bool            IndexBasedSetting   ( void ) const { return true; }
+    virtual bool IndexBasedSetting ( void ) const { return true; }
 
-	//return the values
-	virtual bool Load ( int Index, bool & Value   ) const; 
-	virtual bool Load ( int Index, ULONG & Value  ) const;
-	virtual bool Load ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load ( int Index, bool & Value   ) const;
+    virtual bool Load ( int Index, uint32_t & Value  ) const;
+    virtual bool Load ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save ( int Index, bool Value ); 
-	virtual void Save ( int Index, ULONG Value ); 
-	virtual void Save ( int Index, const stdstr & Value );
-	virtual void Save ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save ( int Index, bool Value );
+    virtual void Save ( int Index, uint32_t Value );
+    virtual void Save ( int Index, const stdstr & Value );
+    virtual void Save ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeApplicationIndex(void);                                             // Disable default constructor
+    CSettingTypeApplicationIndex(const CSettingTypeApplicationIndex&);              // Disable copy constructor
+    CSettingTypeApplicationIndex& operator=(const CSettingTypeApplicationIndex&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.cpp b/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.cpp
index adedf7fbc..ed907c7e1 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.cpp
@@ -11,8 +11,9 @@
 #include "stdafx.h"
 #include "SettingsType-Application.h"
 #include "SettingsType-ApplicationPath.h"
+#include <common/path.h>
 
-CSettingTypeApplicationPath::CSettingTypeApplicationPath(LPCSTR Section, LPCSTR Name, SettingID DefaultSetting ) :
+CSettingTypeApplicationPath::CSettingTypeApplicationPath(const char * Section, const char * Name, SettingID DefaultSetting ) :
 	CSettingTypeApplication(Section,Name,DefaultSetting)
 {
 
@@ -34,7 +35,7 @@ bool CSettingTypeApplicationPath::Load ( int Index, stdstr & Value ) const
 			FullFilePath.SetNameExtension(RelativePath.GetNameExtension().c_str());
 			FullFilePath.AppendDirectory(RelativePath.GetDirectory().c_str());
 
-			Value = FullFilePath;
+			Value = (std::string &)FullFilePath;
 		}
 	}
 	return bRes;
diff --git a/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.h b/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.h
index e37bd34d2..65e1bf2c6 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-ApplicationPath.h
@@ -11,19 +11,22 @@
 #pragma once
 
 class CSettingTypeApplicationPath :
-	public CSettingTypeApplication
+    public CSettingTypeApplication
 {
-private:
-	CSettingTypeApplicationPath(LPCSTR Section, LPCSTR Name, LPCSTR DefaultValue );
-	CSettingTypeApplicationPath(LPCSTR Section, LPCSTR Name, bool DefaultValue );
-	CSettingTypeApplicationPath(LPCSTR Section, LPCSTR Name, DWORD DefaultValue );
-
 public:
-	virtual ~CSettingTypeApplicationPath();
+    virtual ~CSettingTypeApplicationPath();
 
-	CSettingTypeApplicationPath(LPCSTR Section, LPCSTR Name, SettingID DefaultSetting );
+    CSettingTypeApplicationPath(const char * Section, const char * Name, SettingID DefaultSetting );
 
-	//return the values
-	virtual bool Load   ( int Index, stdstr & Value ) const;
+    //return the values
+    virtual bool Load   ( int Index, stdstr & Value ) const;
+
+private:
+    CSettingTypeApplicationPath(void);                                            // Disable default constructor
+    CSettingTypeApplicationPath(const CSettingTypeApplicationPath&);              // Disable copy constructor
+    CSettingTypeApplicationPath& operator=(const CSettingTypeApplicationPath&);   // Disable assignment
+
+    CSettingTypeApplicationPath(const char * Section, const char * Name, const char * DefaultValue );
+    CSettingTypeApplicationPath(const char * Section, const char * Name, bool DefaultValue );
+    CSettingTypeApplicationPath(const char * Section, const char * Name, uint32_t DefaultValue );
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-Base.h b/Source/Project64/Settings/SettingType/SettingsType-Base.h
index 93385759c..56b8d7192 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-Base.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-Base.h
@@ -10,50 +10,50 @@
 ****************************************************************************/
 #pragma once
 
+#include "../Settings.h"
+
 enum SettingType {
-	SettingType_Unknown           = -1, 
-	SettingType_ConstString       = 0, 
-	SettingType_ConstValue        = 1, 
-	SettingType_CfgFile           = 2, 
-	SettingType_Registry          = 3, 
-	SettingType_RelativePath      = 4, 
-	TemporarySetting              = 5, 
-	SettingType_RomDatabase       = 6, 
-	SettingType_CheatSetting      = 7, 
-	SettingType_GameSetting       = 8,
-	SettingType_BoolVariable      = 9, 
-	SettingType_NumberVariable    = 10, 
-	SettingType_StringVariable    = 11, 
-	SettingType_SelectedDirectory = 12, 
-	SettingType_RdbSetting        = 13, 
+    SettingType_Unknown           = -1,
+    SettingType_ConstString       = 0,
+    SettingType_ConstValue        = 1,
+    SettingType_CfgFile           = 2,
+    SettingType_Registry          = 3,
+    SettingType_RelativePath      = 4,
+    TemporarySetting              = 5,
+    SettingType_RomDatabase       = 6,
+    SettingType_CheatSetting      = 7,
+    SettingType_GameSetting       = 8,
+    SettingType_BoolVariable      = 9,
+    SettingType_NumberVariable    = 10,
+    SettingType_StringVariable    = 11,
+    SettingType_SelectedDirectory = 12,
+    SettingType_RdbSetting        = 13,
 };
 
 class CSettingType
 {
 public:
-	virtual ~CSettingType() {};
+    virtual ~CSettingType() {};
 
-	virtual SettingType GetSettingType    ( void ) const = 0;	
-	virtual bool        IndexBasedSetting ( void ) const = 0;
+    virtual SettingType GetSettingType    ( void ) const = 0;
+    virtual bool        IndexBasedSetting ( void ) const = 0;
 
-	//return the values
-	virtual bool Load ( int Index, bool & Value   ) const = 0; 
-	virtual bool Load ( int Index, ULONG & Value  ) const = 0; 
-	virtual bool Load ( int Index, stdstr & Value ) const = 0; 
+    //return the values
+    virtual bool Load ( int Index, bool & Value ) const = 0;
+    virtual bool Load ( int Index, uint32_t & Value ) const = 0;
+    virtual bool Load ( int Index, stdstr & Value ) const = 0;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const = 0; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const = 0; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const = 0; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value ) const = 0;
+    virtual void LoadDefault ( int Index, uint32_t & Value ) const = 0;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const = 0;
 
-	//Update the settings
-	virtual void Save ( int Index, bool Value ) = 0; 
-	virtual void Save ( int Index, ULONG Value ) = 0; 
-	virtual void Save ( int Index, const stdstr & Value ) = 0;
-	virtual void Save ( int Index, const char * Value ) = 0;
-
-	// Delete the setting
-	virtual void Delete ( int Index ) = 0; 
+    //Update the settings
+    virtual void Save ( int Index, bool Value ) = 0;
+    virtual void Save ( int Index, uint32_t Value ) = 0;
+    virtual void Save ( int Index, const stdstr & Value ) = 0;
+    virtual void Save ( int Index, const char * Value ) = 0;
 
+    // Delete the setting
+    virtual void Delete ( int Index ) = 0;
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp b/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp
index 3f05d41cc..60efd7290 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp
@@ -11,11 +11,13 @@
 #include "stdafx.h"
 #include "SettingsType-Cheats.h"
 
+
+
 CIniFile * CSettingTypeCheats::m_CheatIniFile = NULL;
 stdstr   * CSettingTypeCheats::m_SectionIdent = NULL;
 
-CSettingTypeCheats::CSettingTypeCheats(LPCSTR PostFix ) :
-	m_PostFix(PostFix)
+CSettingTypeCheats::CSettingTypeCheats(const char * PostFix ) :
+    m_PostFix(PostFix)
 {
 }
 
@@ -23,125 +25,124 @@ CSettingTypeCheats::~CSettingTypeCheats ( void )
 {
 }
 
-void CSettingTypeCheats::Initilize ( void )
+void CSettingTypeCheats::Initialize ( void )
 {
-	m_CheatIniFile = new CIniFile(g_Settings->LoadString(SupportFile_Cheats).c_str());
-	m_CheatIniFile->SetAutoFlush(false);
-	g_Settings->RegisterChangeCB(Game_IniKey,NULL,GameChanged);
-	m_SectionIdent = new stdstr(g_Settings->LoadString(Game_IniKey));
-	GameChanged(NULL);
+    m_CheatIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_Cheats).c_str());
+    m_CheatIniFile->SetAutoFlush(false);
+    g_Settings->RegisterChangeCB(Game_IniKey,NULL,GameChanged);
+    m_SectionIdent = new stdstr(g_Settings->LoadStringVal(Game_IniKey));
+    GameChanged(NULL);
 }
 
 void CSettingTypeCheats::CleanUp   ( void )
 {
-	if (m_CheatIniFile)
-	{
-		m_CheatIniFile->SetAutoFlush(true);
-		delete m_CheatIniFile;
-		m_CheatIniFile = NULL;
-	}
-	if (m_SectionIdent)
-	{
-		delete m_SectionIdent;
-		m_SectionIdent = NULL;
-	}
+    if (m_CheatIniFile)
+    {
+        m_CheatIniFile->SetAutoFlush(true);
+        delete m_CheatIniFile;
+        m_CheatIniFile = NULL;
+    }
+    if (m_SectionIdent)
+    {
+        delete m_SectionIdent;
+        m_SectionIdent = NULL;
+    }
 }
 
 void CSettingTypeCheats::FlushChanges( void )
 {
-	if (m_CheatIniFile)
-	{
-		m_CheatIniFile->FlushChanges();
-	}
+    if (m_CheatIniFile)
+    {
+        m_CheatIniFile->FlushChanges();
+    }
 }
 
 void CSettingTypeCheats::GameChanged ( void * /*Data */ )
 {
-	*m_SectionIdent = g_Settings->LoadString(Game_IniKey);
+    *m_SectionIdent = g_Settings->LoadStringVal(Game_IniKey);
 }
 
-
-/*stdstr CSettingTypeCheats::FixName ( LPCSTR Section, LPCSTR Name )
+/*stdstr CSettingTypeCheats::FixName ( const char * Section, const char * Name )
 {
 }
 
-LPCSTR CSettingTypeCheats::SectionName ( void ) const
+const char * CSettingTypeCheats::SectionName ( void ) const
 {
-	return "";
+return "";
 }
 
 void CSettingTypeCheats::UpdateSettings ( void *  )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__);
+g_Notify->BreakPoint(__FILEW__,__LINE__);
 }*/
 
 bool CSettingTypeCheats::Load ( int /*Index*/, bool & /*Value*/ ) const
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__);
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
-bool CSettingTypeCheats::Load ( int /*Index*/, ULONG & /*Value*/ ) const
+bool CSettingTypeCheats::Load ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__);
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 bool CSettingTypeCheats::Load ( int Index,  stdstr & Value ) const
 {
-	if (m_CheatIniFile == NULL) 
-	{ 
-		return false; 
-	}
-	stdstr_f Key("Cheat%d%s",Index,m_PostFix);
-	return m_CheatIniFile->GetString(m_SectionIdent->c_str(),Key.c_str(),"",Value);
+    if (m_CheatIniFile == NULL)
+    {
+        return false;
+    }
+    stdstr_f Key("Cheat%d%s",Index,m_PostFix);
+    return m_CheatIniFile->GetString(m_SectionIdent->c_str(),Key.c_str(),"",Value);
 }
 
 //return the default values
 void CSettingTypeCheats::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeCheats::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
+void CSettingTypeCheats::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeCheats::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 //Update the settings
 void CSettingTypeCheats::Save ( int /*Index*/, bool /*Value*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeCheats::Save ( int /*Index*/, ULONG /*Value*/ )
+void CSettingTypeCheats::Save ( int /*Index*/, uint32_t /*Value*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeCheats::Save ( int Index, const stdstr & Value )
 {
-	if (m_CheatIniFile == NULL) {  return;  }
-	
-	stdstr_f Key("Cheat%d%s",Index,m_PostFix);
-	m_CheatIniFile->SaveString(m_SectionIdent->c_str(),Key.c_str(),Value.c_str());
+    if (m_CheatIniFile == NULL) {  return;  }
+
+    stdstr_f Key("Cheat%d%s",Index,m_PostFix);
+    m_CheatIniFile->SaveString(m_SectionIdent->c_str(),Key.c_str(),Value.c_str());
 }
 
 void CSettingTypeCheats::Save ( int Index, const char * Value )
 {
-	if (m_CheatIniFile == NULL) {  return;  }
-	
-	stdstr_f Key("Cheat%d%s",Index,m_PostFix);
-	m_CheatIniFile->SaveString(m_SectionIdent->c_str(),Key.c_str(),Value);
+    if (m_CheatIniFile == NULL) {  return;  }
+
+    stdstr_f Key("Cheat%d%s",Index,m_PostFix);
+    m_CheatIniFile->SaveString(m_SectionIdent->c_str(),Key.c_str(),Value);
 }
 
 void CSettingTypeCheats::Delete ( int Index )
 {
-	stdstr_f Key("Cheat%d%s",Index,m_PostFix);
-	m_CheatIniFile->SaveString(m_SectionIdent->c_str(),Key.c_str(),NULL);
+    stdstr_f Key("Cheat%d%s",Index,m_PostFix);
+    m_CheatIniFile->SaveString(m_SectionIdent->c_str(),Key.c_str(),NULL);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-Cheats.h b/Source/Project64/Settings/SettingType/SettingsType-Cheats.h
index dfbbbcc97..cc21be450 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-Cheats.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-Cheats.h
@@ -10,46 +10,51 @@
 ****************************************************************************/
 #pragma once
 
+#include "SettingsType-Base.h"
+#include <Common/Ini File Class.h>
+
 class CSettingTypeCheats :
-	public CSettingType
+    public CSettingType
 {
-	
-protected:
-	static CIniFile * m_CheatIniFile;
-	static stdstr   * m_SectionIdent;
-	const LPCSTR      m_PostFix;
-	static void GameChanged ( void * /*Data */ );
-
 public:
-	CSettingTypeCheats(LPCSTR PostFix );
-	~CSettingTypeCheats();
+    CSettingTypeCheats(const char * PostFix );
+    ~CSettingTypeCheats();
 
-	virtual bool        IndexBasedSetting ( void ) const { return true; }
-	virtual SettingType GetSettingType    ( void ) const { return SettingType_CheatSetting; }	
+    virtual bool        IndexBasedSetting ( void ) const { return true; }
+    virtual SettingType GetSettingType    ( void ) const { return SettingType_CheatSetting; }
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
 
-	// Initilize this class to use ini or registry
-	static void Initilize    ( void );
-	static void CleanUp      ( void );
-	static void FlushChanges ( void );
+    // Initialize this class to use ini or registry
+    static void Initialize   ( void );
+    static void CleanUp      ( void );
+    static void FlushChanges ( void );
 
+protected:
+    static CIniFile * m_CheatIniFile;
+    static stdstr   * m_SectionIdent;
+    const char * const m_PostFix;
+    static void GameChanged ( void * /*Data */ );
+
+private:
+    CSettingTypeCheats(void);                                   // Disable default constructor
+    CSettingTypeCheats(const CSettingTypeCheats&);              // Disable copy constructor
+    CSettingTypeCheats& operator=(const CSettingTypeCheats&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp b/Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp
index d8233a916..74b2d3c29 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp
@@ -16,18 +16,18 @@ bool     CSettingTypeGame::m_RdbEditor = false;
 bool     CSettingTypeGame::m_EraseDefaults = true;
 stdstr * CSettingTypeGame::m_SectionIdent = NULL;
 
-CSettingTypeGame::CSettingTypeGame(LPCSTR Name, LPCSTR DefaultValue )	:
-	CSettingTypeApplication("",Name,DefaultValue)
+CSettingTypeGame::CSettingTypeGame(const char * Name, const char * DefaultValue )	:
+    CSettingTypeApplication("",Name,DefaultValue)
 {
 }
 
-CSettingTypeGame::CSettingTypeGame(LPCSTR Name, DWORD DefaultValue ) :
-	CSettingTypeApplication("",Name,DefaultValue)
+CSettingTypeGame::CSettingTypeGame(const char * Name, uint32_t DefaultValue ) :
+    CSettingTypeApplication("",Name,DefaultValue)
 {
 }
 
-CSettingTypeGame::CSettingTypeGame(LPCSTR Name, SettingID DefaultSetting ) :
-	CSettingTypeApplication("",Name,DefaultSetting)
+CSettingTypeGame::CSettingTypeGame(const char * Name, SettingID DefaultSetting ) :
+    CSettingTypeApplication("",Name,DefaultSetting)
 {
 }
 
@@ -35,226 +35,225 @@ CSettingTypeGame::~CSettingTypeGame()
 {
 }
 
-void CSettingTypeGame::Initilize ( void )
+void CSettingTypeGame::Initialize ( void )
 {
-	UpdateSettings(NULL);
-	g_Settings->RegisterChangeCB(Game_IniKey,NULL,UpdateSettings);
+    UpdateSettings(NULL);
+    g_Settings->RegisterChangeCB(Game_IniKey,NULL,UpdateSettings);
 }
 
 void CSettingTypeGame::CleanUp   ( void )
 {
-	g_Settings->UnregisterChangeCB(Game_IniKey,NULL,UpdateSettings);
-	if (m_SectionIdent)
-	{
-		delete m_SectionIdent;
-		m_SectionIdent = NULL;
-	}
+    g_Settings->UnregisterChangeCB(Game_IniKey,NULL,UpdateSettings);
+    if (m_SectionIdent)
+    {
+        delete m_SectionIdent;
+        m_SectionIdent = NULL;
+    }
 }
 
-LPCSTR CSettingTypeGame::SectionName ( void ) const
+const char * CSettingTypeGame::SectionName ( void ) const
 {
-	return m_SectionIdent ? m_SectionIdent->c_str() : "";
+    return m_SectionIdent ? m_SectionIdent->c_str() : "";
 }
 
 void CSettingTypeGame::UpdateSettings ( void * /*Data */ )
 {
-	m_RdbEditor     = g_Settings->LoadBool(Setting_RdbEditor);
-	m_EraseDefaults = g_Settings->LoadBool(Setting_EraseGameDefaults);
-	stdstr SectionIdent = g_Settings->LoadString(Game_IniKey);
-
-	if (m_SectionIdent == NULL)
-	{
-		m_SectionIdent = new stdstr;
-	}
-	if (SectionIdent != *m_SectionIdent)
-	{
-		*m_SectionIdent = SectionIdent;
-		g_Settings->SettingTypeChanged(SettingType_GameSetting);
-		g_Settings->SettingTypeChanged(SettingType_RomDatabase);
-	}
+    m_RdbEditor     = g_Settings->LoadBool(Setting_RdbEditor);
+    m_EraseDefaults = g_Settings->LoadBool(Setting_EraseGameDefaults);
+    stdstr SectionIdent = g_Settings->LoadStringVal(Game_IniKey);
 
+    if (m_SectionIdent == NULL)
+    {
+        m_SectionIdent = new stdstr;
+    }
+    if (SectionIdent != *m_SectionIdent)
+    {
+        *m_SectionIdent = SectionIdent;
+        g_Settings->SettingTypeChanged(SettingType_GameSetting);
+        g_Settings->SettingTypeChanged(SettingType_RomDatabase);
+    }
 }
 
 bool CSettingTypeGame::Load ( int Index, bool & Value ) const
 {
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			return g_Settings->LoadBoolIndex(m_DefaultSetting,Index,Value);
-		} else {
-			return g_Settings->LoadBool(m_DefaultSetting,Value);
-		}
-	}
-	return CSettingTypeApplication::Load(Index,Value);
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            return g_Settings->LoadBoolIndex(m_DefaultSetting,Index,Value);
+        } else {
+            return g_Settings->LoadBool(m_DefaultSetting,Value);
+        }
+    }
+    return CSettingTypeApplication::Load(Index,Value);
 }
 
-bool CSettingTypeGame::Load ( int Index, ULONG & Value ) const
+bool CSettingTypeGame::Load ( int Index, uint32_t & Value ) const
 {
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			return g_Settings->LoadDwordIndex(m_DefaultSetting,Index,Value);
-		} else {
-			return g_Settings->LoadDword(m_DefaultSetting,Value);
-		}
-	}
-	return CSettingTypeApplication::Load(Index,Value);
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            return g_Settings->LoadDwordIndex(m_DefaultSetting,Index,Value);
+        } else {
+            return g_Settings->LoadDword(m_DefaultSetting,Value);
+        }
+    }
+    return CSettingTypeApplication::Load(Index,Value);
 }
 
 bool CSettingTypeGame::Load ( int Index,  stdstr & Value ) const
 {
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			return g_Settings->LoadStringIndex(m_DefaultSetting,Index,Value);
-		} else {
-			return g_Settings->LoadString(m_DefaultSetting,Value);
-		}
-	}	
-	return CSettingTypeApplication::Load(Index,Value);
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            return g_Settings->LoadStringIndex(m_DefaultSetting,Index,Value);
+        } else {
+            return g_Settings->LoadStringVal(m_DefaultSetting,Value);
+        }
+    }
+    return CSettingTypeApplication::Load(Index,Value);
 }
 
 //return the default values
 void CSettingTypeGame::LoadDefault ( int Index, bool & Value   ) const
 {
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			g_Settings->LoadDefaultBoolIndex(m_DefaultSetting,Index,Value);
-		} else {
-			g_Settings->LoadDefaultBool(m_DefaultSetting,Value);
-		}
-	} else {
-		CSettingTypeApplication::LoadDefault(Index,Value);
-	}
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            g_Settings->LoadDefaultBoolIndex(m_DefaultSetting,Index,Value);
+        } else {
+            g_Settings->LoadDefaultBool(m_DefaultSetting,Value);
+        }
+    } else {
+        CSettingTypeApplication::LoadDefault(Index,Value);
+    }
 }
 
-void CSettingTypeGame::LoadDefault ( int Index, ULONG & Value  ) const
+void CSettingTypeGame::LoadDefault ( int Index, uint32_t & Value  ) const
 {
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			g_Settings->LoadDefaultDwordIndex(m_DefaultSetting,Index,Value);
-		} else {
-			g_Settings->LoadDefaultDword(m_DefaultSetting,Value);
-		}
-	} else {
-		CSettingTypeApplication::LoadDefault(Index,Value);
-	}
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            g_Settings->LoadDefaultDwordIndex(m_DefaultSetting,Index,Value);
+        } else {
+            g_Settings->LoadDefaultDword(m_DefaultSetting,Value);
+        }
+    } else {
+        CSettingTypeApplication::LoadDefault(Index,Value);
+    }
 }
 
 void CSettingTypeGame::LoadDefault ( int Index, stdstr & Value ) const
 {
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			g_Settings->LoadDefaultStringIndex(m_DefaultSetting,Index,Value);
-		} else {
-			g_Settings->LoadDefaultString(m_DefaultSetting,Value);
-		}
-	} else {
-		CSettingTypeApplication::LoadDefault(Index,Value);
-	}
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            g_Settings->LoadDefaultStringIndex(m_DefaultSetting,Index,Value);
+        } else {
+            g_Settings->LoadDefaultString(m_DefaultSetting,Value);
+        }
+    } else {
+        CSettingTypeApplication::LoadDefault(Index,Value);
+    }
 }
 
 //Update the settings
 void CSettingTypeGame::Save ( int Index, bool Value )
 {
-	if (m_EraseDefaults)
-	{
-		bool bDefault;
-		LoadDefault(Index,bDefault);
-		if (bDefault == Value)
-		{
-			Delete(Index);
-			return;
-		}
-	}
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			g_Settings->SaveBoolIndex(m_DefaultSetting,Index,Value);
-		} else {
-			 g_Settings->SaveBool(m_DefaultSetting,Value);
-		}
-	} else {
-		CSettingTypeApplication::Save(Index,Value);
-	}
+    if (m_EraseDefaults)
+    {
+        bool bDefault;
+        LoadDefault(Index,bDefault);
+        if (bDefault == Value)
+        {
+            Delete(Index);
+            return;
+        }
+    }
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            g_Settings->SaveBoolIndex(m_DefaultSetting,Index,Value);
+        } else {
+            g_Settings->SaveBool(m_DefaultSetting,Value);
+        }
+    } else {
+        CSettingTypeApplication::Save(Index,Value);
+    }
 }
 
-void CSettingTypeGame::Save ( int Index, ULONG Value )
+void CSettingTypeGame::Save ( int Index, uint32_t Value )
 {
-	if (m_EraseDefaults)
-	{
-		ULONG ulDefault;
-		CSettingTypeGame::LoadDefault(Index,ulDefault);
-		if (ulDefault == Value)
-		{
-			Delete(Index);
-			return;
-		}
-	}
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			g_Settings->SaveDwordIndex(m_DefaultSetting,Index,Value);
-		} else {
-			 g_Settings->SaveDword(m_DefaultSetting,Value);
-		}
-	} else {
-		CSettingTypeApplication::Save(Index,Value);
-	}
+    if (m_EraseDefaults)
+    {
+		uint32_t ulDefault;
+        CSettingTypeGame::LoadDefault(Index,ulDefault);
+        if (ulDefault == Value)
+        {
+            Delete(Index);
+            return;
+        }
+    }
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            g_Settings->SaveDwordIndex(m_DefaultSetting,Index,Value);
+        } else {
+            g_Settings->SaveDword(m_DefaultSetting,Value);
+        }
+    } else {
+        CSettingTypeApplication::Save(Index,Value);
+    }
 }
 
 void CSettingTypeGame::Save ( int Index, const stdstr & Value )
 {
-	Save(Index,Value.c_str()); 
+    Save(Index,Value.c_str());
 }
 
 void CSettingTypeGame::Save ( int Index, const char * Value )
 {
-	if (m_EraseDefaults && m_DefaultSetting != Rdb_GoodName)
-	{
-		stdstr szDefault;
-		CSettingTypeGame::LoadDefault(Index,szDefault);
-		if (_stricmp(szDefault.c_str(),Value) == 0)
-		{
-			Delete(Index);
-			return;
-		}
-	}
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			g_Settings->SaveStringIndex(m_DefaultSetting,Index,Value);
-		} else {
-			 g_Settings->SaveString(m_DefaultSetting,Value);
-		}
-	} else {
-		CSettingTypeApplication::Save(Index,Value);
-	}
+    if (m_EraseDefaults && m_DefaultSetting != Rdb_GoodName)
+    {
+        stdstr szDefault;
+        CSettingTypeGame::LoadDefault(Index,szDefault);
+        if (_stricmp(szDefault.c_str(),Value) == 0)
+        {
+            Delete(Index);
+            return;
+        }
+    }
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            g_Settings->SaveStringIndex(m_DefaultSetting,Index,Value);
+        } else {
+            g_Settings->SaveString(m_DefaultSetting,Value);
+        }
+    } else {
+        CSettingTypeApplication::Save(Index,Value);
+    }
 }
 
 void CSettingTypeGame::Delete ( int Index )
 {
-	if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
-	{
-		if (g_Settings->IndexBasedSetting(m_DefaultSetting))
-		{
-			g_Settings->DeleteSettingIndex(m_DefaultSetting,Index);
-		} else {
-			g_Settings->DeleteSetting(m_DefaultSetting);
-		}
-	} else {
-		CSettingTypeApplication::Delete(Index);
-	}
+    if (m_RdbEditor && g_Settings->GetSettingType(m_DefaultSetting) == SettingType_RomDatabase)
+    {
+        if (g_Settings->IndexBasedSetting(m_DefaultSetting))
+        {
+            g_Settings->DeleteSettingIndex(m_DefaultSetting,Index);
+        } else {
+            g_Settings->DeleteSetting(m_DefaultSetting);
+        }
+    } else {
+        CSettingTypeApplication::Delete(Index);
+    }
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.h b/Source/Project64/Settings/SettingType/SettingsType-GameSetting.h
index f1dbe5c99..9b3a35bc5 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-GameSetting.h
@@ -11,46 +11,50 @@
 #pragma once
 
 class CSettingTypeGame :
-	public CSettingTypeApplication
+    public CSettingTypeApplication
 {
 protected:
-	static bool     m_RdbEditor;
-	static bool     m_EraseDefaults;
-	static stdstr * m_SectionIdent;
+    static bool     m_RdbEditor;
+    static bool     m_EraseDefaults;
+    static stdstr * m_SectionIdent;
 
-	static void   UpdateSettings ( void * /*Data */ );
+    static void   UpdateSettings ( void * /*Data */ );
 
-	virtual LPCSTR SectionName ( void ) const;
+    virtual const char * SectionName ( void ) const;
 
 public:
-	CSettingTypeGame(LPCSTR Name, LPCSTR DefaultValue );
-	CSettingTypeGame(LPCSTR Name, DWORD DefaultValue );
-	CSettingTypeGame(LPCSTR Name, SettingID DefaultSetting );
-	virtual ~CSettingTypeGame();
+    CSettingTypeGame(const char * Name, const char * DefaultValue );
+    CSettingTypeGame(const char * Name, uint32_t DefaultValue );
+    CSettingTypeGame(const char * Name, SettingID DefaultSetting );
+    virtual ~CSettingTypeGame();
 
-	virtual bool        IndexBasedSetting ( void ) const { return false; }
-	virtual SettingType GetSettingType    ( void ) const { return SettingType_GameSetting; }	
+    virtual bool        IndexBasedSetting ( void ) const { return false; }
+    virtual SettingType GetSettingType    ( void ) const { return SettingType_GameSetting; }
 
-	static void Initilize ( void );
-	static void CleanUp   ( void );
+    static void Initialize( void );
+    static void CleanUp   ( void );
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeGame(void);                                 // Disable default constructor
+    CSettingTypeGame(const CSettingTypeGame&);              // Disable copy constructor
+    CSettingTypeGame& operator=(const CSettingTypeGame&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp b/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp
index 787b90a49..8fdb9e52d 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp
@@ -13,25 +13,24 @@
 #include "SettingsType-GameSetting.h"
 #include "SettingsType-GameSettingIndex.h"
 
-
-CSettingTypeGameIndex::CSettingTypeGameIndex(LPCSTR PreIndex, LPCSTR PostIndex, SettingID DefaultSetting ) :
-	CSettingTypeGame("", DefaultSetting),
-	m_PreIndex(PreIndex),
-	m_PostIndex(PostIndex)
+CSettingTypeGameIndex::CSettingTypeGameIndex(const char * PreIndex, const char * PostIndex, SettingID DefaultSetting ) :
+    CSettingTypeGame("", DefaultSetting),
+    m_PreIndex(PreIndex),
+    m_PostIndex(PostIndex)
 {
 }
 
-CSettingTypeGameIndex::CSettingTypeGameIndex(LPCSTR PreIndex, LPCSTR PostIndex, DWORD DefaultValue ) :
-	CSettingTypeGame("", DefaultValue),
-	m_PreIndex(PreIndex),
-	m_PostIndex(PostIndex)
+CSettingTypeGameIndex::CSettingTypeGameIndex(const char * PreIndex, const char * PostIndex, uint32_t DefaultValue ) :
+    CSettingTypeGame("", DefaultValue),
+    m_PreIndex(PreIndex),
+    m_PostIndex(PostIndex)
 {
 }
 
-CSettingTypeGameIndex::CSettingTypeGameIndex(LPCSTR PreIndex, LPCSTR PostIndex, LPCSTR DefaultValue ) :
-	CSettingTypeGame("", DefaultValue),
-	m_PreIndex(PreIndex),
-	m_PostIndex(PostIndex)
+CSettingTypeGameIndex::CSettingTypeGameIndex(const char * PreIndex, const char * PostIndex, const char * DefaultValue ) :
+    CSettingTypeGame("", DefaultValue),
+    m_PreIndex(PreIndex),
+    m_PostIndex(PostIndex)
 {
 }
 
@@ -41,65 +40,65 @@ CSettingTypeGameIndex::~CSettingTypeGameIndex()
 
 bool CSettingTypeGameIndex::Load ( int Index, bool & Value ) const
 {
-	m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	return CSettingTypeGame::Load(Index,Value);
+    m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    return CSettingTypeGame::Load(Index,Value);
 }
 
-bool CSettingTypeGameIndex::Load ( int /*Index*/, ULONG & /*Value*/ ) const
+bool CSettingTypeGameIndex::Load ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 bool CSettingTypeGameIndex::Load ( int Index,  stdstr & Value ) const
 {
-	m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	return CSettingTypeGame::Load(0,Value);
+    m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    return CSettingTypeGame::Load(0,Value);
 }
 
 //return the default values
 void CSettingTypeGameIndex::LoadDefault ( int Index, bool & Value   ) const
 {
-	m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	CSettingTypeGame::LoadDefault(0,Value);
+    m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    CSettingTypeGame::LoadDefault(0,Value);
 }
 
-void CSettingTypeGameIndex::LoadDefault ( int /*Index*/, ULONG & /*Value*/  ) const
+void CSettingTypeGameIndex::LoadDefault ( int /*Index*/, uint32_t & /*Value*/  ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeGameIndex::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 //Update the settings
 void CSettingTypeGameIndex::Save ( int Index, bool Value )
 {
-	m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	CSettingTypeGame::Save(Index,Value);
+    m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    CSettingTypeGame::Save(Index,Value);
 }
 
-void CSettingTypeGameIndex::Save ( int Index, ULONG Value )
+void CSettingTypeGameIndex::Save(int Index, uint32_t Value)
 {
-	m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	CSettingTypeGame::Save(0,Value);
+    m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    CSettingTypeGame::Save(0,Value);
 }
 
 void CSettingTypeGameIndex::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeGameIndex::Save ( int Index, const char * Value )
 {
-	m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	CSettingTypeGame::Save(0,Value);
+    m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    CSettingTypeGame::Save(0,Value);
 }
 
 void CSettingTypeGameIndex::Delete ( int Index )
 {
-	m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	CSettingTypeGame::Delete(0);
+    m_KeyNameIdex.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    CSettingTypeGame::Delete(0);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.h b/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.h
index fb40dc361..6940b6812 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.h
@@ -11,36 +11,40 @@
 #pragma once
 
 class CSettingTypeGameIndex :
-	public CSettingTypeGame
+    public CSettingTypeGame
 {
-	stdstr m_PreIndex, m_PostIndex;
+    stdstr m_PreIndex, m_PostIndex;
 
 public:
-	CSettingTypeGameIndex(LPCSTR PreIndex, LPCSTR PostIndex, LPCSTR DefaultValue );
-	CSettingTypeGameIndex(LPCSTR PreIndex, LPCSTR PostIndex, DWORD DefaultValue );
-	CSettingTypeGameIndex(LPCSTR PreIndex, LPCSTR PostIndex, SettingID DefaultSetting );
-	~CSettingTypeGameIndex();
+    CSettingTypeGameIndex(const char * PreIndex, const char * PostIndex, const char * DefaultValue );
+    CSettingTypeGameIndex(const char * PreIndex, const char * PostIndex, uint32_t DefaultValue );
+    CSettingTypeGameIndex(const char * PreIndex, const char * PostIndex, SettingID DefaultSetting );
+    ~CSettingTypeGameIndex();
 
-	virtual bool        IndexBasedSetting ( void ) const { return true; }
-	virtual SettingType GetSettingType    ( void ) const { return SettingType_GameSetting; }	
+    virtual bool        IndexBasedSetting ( void ) const { return true; }
+    virtual SettingType GetSettingType    ( void ) const { return SettingType_GameSetting; }
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeGameIndex(void);                                      // Disable default constructor
+    CSettingTypeGameIndex(const CSettingTypeGameIndex&);              // Disable copy constructor
+    CSettingTypeGameIndex& operator=(const CSettingTypeGameIndex&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp
index 80e7f5e9e..79200f6a8 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp
@@ -11,14 +11,15 @@
 #include "stdafx.h"
 #include "SettingsType-RomDatabase.h"
 #include "SettingsType-RDBCpuType.h"
+#include "../../N64 System/N64 Types.h"
 
-CSettingTypeRDBCpuType::CSettingTypeRDBCpuType(LPCSTR Name, SettingID DefaultSetting ) :
-	CSettingTypeRomDatabase(Name,DefaultSetting)
+CSettingTypeRDBCpuType::CSettingTypeRDBCpuType(const char * Name, SettingID DefaultSetting ) :
+    CSettingTypeRomDatabase(Name,DefaultSetting)
 {
 }
 
-CSettingTypeRDBCpuType::CSettingTypeRDBCpuType(LPCSTR Name, int DefaultValue ) :
-	CSettingTypeRomDatabase(Name,DefaultValue)
+CSettingTypeRDBCpuType::CSettingTypeRDBCpuType(const char * Name, int DefaultValue ) :
+    CSettingTypeRomDatabase(Name,DefaultValue)
 {
 }
 
@@ -28,96 +29,95 @@ CSettingTypeRDBCpuType::~CSettingTypeRDBCpuType()
 
 bool CSettingTypeRDBCpuType::Load ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
-bool CSettingTypeRDBCpuType::Load ( int Index, ULONG & Value ) const
+bool CSettingTypeRDBCpuType::Load ( int Index, uint32_t & Value ) const
 {
-	stdstr strValue;
-	bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue);
-	if (!bRes)
-	{
-		LoadDefault(Index,Value);
-		return false;
-	}
-	LPCSTR String = strValue.c_str();
+    stdstr strValue;
+    bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue);
+    if (!bRes)
+    {
+        LoadDefault(Index,Value);
+        return false;
+    }
+    const char * String = strValue.c_str();
 
-	if (_stricmp(String,"Interpreter") == 0)      { Value = CPU_Interpreter; } 
-	else if (_stricmp(String,"Recompiler") == 0)  { Value = CPU_Recompiler; } 
-	else if (_stricmp(String,"SyncCores") == 0)   { Value = CPU_SyncCores; } 
-	else if (_stricmp(String,"default") == 0)     
-	{
-		LoadDefault(Index,Value);
-		return false;
-	} 
-	else { Notify().BreakPoint(__FILEW__,__LINE__); }
-	
-	return true;
+    if (_stricmp(String,"Interpreter") == 0)      { Value = CPU_Interpreter; }
+    else if (_stricmp(String,"Recompiler") == 0)  { Value = CPU_Recompiler; }
+    else if (_stricmp(String,"SyncCores") == 0)   { Value = CPU_SyncCores; }
+    else if (_stricmp(String,"default") == 0)
+    {
+        LoadDefault(Index,Value);
+        return false;
+    }
+    else { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+
+    return true;
 }
 
 bool CSettingTypeRDBCpuType::Load ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 //return the default values
 void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, ULONG & Value  ) const
+void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, uint32_t & Value  ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue;
-		} else {
-			g_Settings->LoadDword(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue;
+        } else {
+            g_Settings->LoadDword(m_DefaultSetting,Value);
+        }
+    }
 }
 
 void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 //Update the settings
 void CSettingTypeRDBCpuType::Save ( int /*Index*/, bool /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeRDBCpuType::Save ( int /*Index*/, ULONG Value )
+void CSettingTypeRDBCpuType::Save ( int /*Index*/, uint32_t Value )
 {
-
-	stdstr strValue;
-	switch (Value)
-	{
-	case CPU_Interpreter: strValue = "Interpreter"; break;
-	case CPU_Recompiler:  strValue = "Recompiler"; break;
-	case CPU_SyncCores:   strValue = "SyncCores"; break;
-	default: 
-		Notify().BreakPoint(__FILEW__,__LINE__); 
-	}
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),strValue.c_str());
+    stdstr strValue;
+    switch (Value)
+    {
+    case CPU_Interpreter: strValue = "Interpreter"; break;
+    case CPU_Recompiler:  strValue = "Recompiler"; break;
+    case CPU_SyncCores:   strValue = "SyncCores"; break;
+    default:
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),strValue.c_str());
 }
 
 void CSettingTypeRDBCpuType::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBCpuType::Save ( int /*Index*/, const char * /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBCpuType::Delete( int /*Index*/ )
 {
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.h b/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.h
index 686525b03..231c69ea8 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.h
@@ -11,31 +11,34 @@
 #pragma once
 
 class CSettingTypeRDBCpuType :
-	public CSettingTypeRomDatabase
+    public CSettingTypeRomDatabase
 {
-	
 public:
-	CSettingTypeRDBCpuType(LPCSTR Name, SettingID DefaultSetting );
-	CSettingTypeRDBCpuType(LPCSTR Name, int DefaultValue );
-	~CSettingTypeRDBCpuType();
+    CSettingTypeRDBCpuType(const char * Name, SettingID DefaultSetting );
+    CSettingTypeRDBCpuType(const char * Name, int DefaultValue );
+    ~CSettingTypeRDBCpuType();
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeRDBCpuType(void);                                       // Disable default constructor
+    CSettingTypeRDBCpuType(const CSettingTypeRDBCpuType&);              // Disable copy constructor
+    CSettingTypeRDBCpuType& operator=(const CSettingTypeRDBCpuType&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp
index b8bd5b687..0e48cbba7 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp
@@ -12,102 +12,101 @@
 #include "SettingsType-RomDatabase.h"
 #include "SettingsType-RDBOnOff.h"
 
-CSettingTypeRDBOnOff::CSettingTypeRDBOnOff(LPCSTR Name, SettingID DefaultSetting ) :
-	CSettingTypeRomDatabase(Name,DefaultSetting)
+CSettingTypeRDBOnOff::CSettingTypeRDBOnOff(const char * Name, SettingID DefaultSetting ) :
+    CSettingTypeRomDatabase(Name,DefaultSetting)
 {
 }
 
-CSettingTypeRDBOnOff::CSettingTypeRDBOnOff(LPCSTR Name, int DefaultValue ) :
-	CSettingTypeRomDatabase(Name,DefaultValue)
+CSettingTypeRDBOnOff::CSettingTypeRDBOnOff(const char * Name, int DefaultValue ) :
+    CSettingTypeRomDatabase(Name,DefaultValue)
 {
 }
 
-	CSettingTypeRDBOnOff::~CSettingTypeRDBOnOff()
+CSettingTypeRDBOnOff::~CSettingTypeRDBOnOff()
 {
 }
 
 bool CSettingTypeRDBOnOff::Load ( int Index, bool & Value ) const
 {
-	stdstr strValue;
-	bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue);
-	if (!bRes)
-	{
-		LoadDefault(Index,Value);
-		return false;
-	}
-	LPCSTR String = strValue.c_str();
+    stdstr strValue;
+    bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue);
+    if (!bRes)
+    {
+        LoadDefault(Index,Value);
+        return false;
+    }
+    const char * String = strValue.c_str();
 
-	if (_stricmp(String,"On") == 0)    { Value = true; } 
-	else if (_stricmp(String,"Off") == 0)  { Value = false; } 
-	else if (_stricmp(String,"Global") == 0 || _stricmp(String,"default"))  
-	{
-		LoadDefault(Index,Value);
-		return false;
-	} 
-	else { Notify().BreakPoint(__FILEW__,__LINE__); }
-	
-	return true;
+    if (_stricmp(String,"On") == 0)    { Value = true; }
+    else if (_stricmp(String,"Off") == 0)  { Value = false; }
+    else if (_stricmp(String,"Global") == 0 || _stricmp(String,"default"))
+    {
+        LoadDefault(Index,Value);
+        return false;
+    }
+    else { g_Notify->BreakPoint(__FILEW__,__LINE__); }
+
+    return true;
 }
 
-bool CSettingTypeRDBOnOff::Load ( int /*Index*/, ULONG & /*Value*/ ) const
+bool CSettingTypeRDBOnOff::Load ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 bool CSettingTypeRDBOnOff::Load ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 //return the default values
 void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, bool & Value ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue != 0;
-		} else {
-			g_Settings->LoadBool(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue != 0;
+        } else {
+            g_Settings->LoadBool(m_DefaultSetting,Value);
+        }
+    }
 }
 
-void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
+void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-
 //Update the settings
 void CSettingTypeRDBOnOff::Save ( int /*Index*/, bool Value )
 {
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),Value? "On" : "Off");
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),Value? "On" : "Off");
 }
 
-void CSettingTypeRDBOnOff::Save ( int /*Index*/, ULONG /*Value*/ )
+void CSettingTypeRDBOnOff::Save ( int /*Index*/, uint32_t /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBOnOff::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBOnOff::Save ( int /*Index*/, const char * /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBOnOff::Delete( int /*Index*/ )
 {
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.h b/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.h
index 5c21d301c..46f91bed4 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.h
@@ -11,31 +11,34 @@
 #pragma once
 
 class CSettingTypeRDBOnOff :
-	public CSettingTypeRomDatabase
+    public CSettingTypeRomDatabase
 {
-	
 public:
-	CSettingTypeRDBOnOff(LPCSTR Name, SettingID DefaultSetting );
-	CSettingTypeRDBOnOff(LPCSTR Name, int DefaultValue );
-	~CSettingTypeRDBOnOff();
+    CSettingTypeRDBOnOff(const char * Name, SettingID DefaultSetting );
+    CSettingTypeRDBOnOff(const char * Name, int DefaultValue );
+    ~CSettingTypeRDBOnOff();
 
-	//return the values
-	virtual bool Load ( int Index, bool & Value   ) const; 
-	virtual bool Load ( int Index, ULONG & Value  ) const;
-	virtual bool Load ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load ( int Index, bool & Value   ) const;
+    virtual bool Load ( int Index, uint32_t & Value  ) const;
+    virtual bool Load ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save ( int Index, bool Value ); 
-	virtual void Save ( int Index, ULONG Value ); 
-	virtual void Save ( int Index, const stdstr & Value );
-	virtual void Save ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save ( int Index, bool Value );
+    virtual void Save ( int Index, uint32_t Value );
+    virtual void Save ( int Index, const stdstr & Value );
+    virtual void Save ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeRDBOnOff(void);                                     // Disable default constructor
+    CSettingTypeRDBOnOff(const CSettingTypeRDBOnOff&);              // Disable copy constructor
+    CSettingTypeRDBOnOff& operator=(const CSettingTypeRDBOnOff&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp
index 8fd1c0b42..aafda1a9e 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp
@@ -14,13 +14,13 @@
 
 // == 8 ? 0x800000 : 0x400000
 
-CSettingTypeRDBRDRamSize::CSettingTypeRDBRDRamSize(LPCSTR Name, SettingID DefaultSetting ) :
-	CSettingTypeRomDatabase(Name,DefaultSetting)
+CSettingTypeRDBRDRamSize::CSettingTypeRDBRDRamSize(const char * Name, SettingID DefaultSetting ) :
+    CSettingTypeRomDatabase(Name,DefaultSetting)
 {
 }
 
-CSettingTypeRDBRDRamSize::CSettingTypeRDBRDRamSize(LPCSTR Name, int DefaultValue ) :
-	CSettingTypeRomDatabase(Name,DefaultValue)
+CSettingTypeRDBRDRamSize::CSettingTypeRDBRDRamSize(const char * Name, int DefaultValue ) :
+    CSettingTypeRomDatabase(Name,DefaultValue)
 {
 }
 
@@ -30,70 +30,70 @@ CSettingTypeRDBRDRamSize::~CSettingTypeRDBRDRamSize()
 
 bool CSettingTypeRDBRDRamSize::Load ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
-bool CSettingTypeRDBRDRamSize::Load ( int Index, ULONG & Value ) const
+bool CSettingTypeRDBRDRamSize::Load ( int Index, uint32_t & Value ) const
 {
-	ULONG ulValue;
-	bool bRes = m_SettingsIniFile->GetNumber(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultValue,ulValue);
-	if (!bRes)
-	{
-		LoadDefault(Index,ulValue);
-	}
-	Value = 0x400000;
-	if (ulValue == 8)
-	{
-		Value = 0x800000;
-	}
-	return bRes;
+    uint32_t ulValue;
+    bool bRes = m_SettingsIniFile->GetNumber(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultValue,ulValue);
+    if (!bRes)
+    {
+        LoadDefault(Index,ulValue);
+    }
+    Value = 0x400000;
+    if (ulValue == 8)
+    {
+        Value = 0x800000;
+    }
+    return bRes;
 }
 
 bool CSettingTypeRDBRDRamSize::Load ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 //return the default values
 void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, bool & /*Value*/   ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, ULONG & Value  ) const
+void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, uint32_t & Value  ) const
 {
-	Value = m_DefaultValue; 
+    Value = m_DefaultValue;
 }
 
 void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 //Update the settings
 void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, bool /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, ULONG Value )
+void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, uint32_t Value )
 {
-	m_SettingsIniFile->SaveNumber(m_SectionIdent->c_str(),m_KeyName.c_str(),Value == 0x800000 ? 8 : 4);
+    m_SettingsIniFile->SaveNumber(m_SectionIdent->c_str(),m_KeyName.c_str(),Value == 0x800000 ? 8 : 4);
 }
 
 void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, const char * /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBRDRamSize::Delete( int /*Index*/ )
 {
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.h b/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.h
index 8c1cdba37..81352e0f1 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.h
@@ -11,31 +11,34 @@
 #pragma once
 
 class CSettingTypeRDBRDRamSize :
-	public CSettingTypeRomDatabase
+    public CSettingTypeRomDatabase
 {
-	
 public:
-	CSettingTypeRDBRDRamSize(LPCSTR Name, SettingID DefaultSetting );
-	CSettingTypeRDBRDRamSize(LPCSTR Name, int DefaultValue );
-	~CSettingTypeRDBRDRamSize();
+    CSettingTypeRDBRDRamSize(const char * Name, SettingID DefaultSetting );
+    CSettingTypeRDBRDRamSize(const char * Name, int DefaultValue );
+    ~CSettingTypeRDBRDRamSize();
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeRDBRDRamSize(void);                                         // Disable default constructor
+    CSettingTypeRDBRDRamSize(const CSettingTypeRDBRDRamSize&);              // Disable copy constructor
+    CSettingTypeRDBRDRamSize& operator=(const CSettingTypeRDBRDRamSize&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp
index 590869192..6946e9a4c 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp
@@ -11,115 +11,116 @@
 #include "stdafx.h"
 #include "SettingsType-RomDatabase.h"
 #include "SettingsType-RDBSaveChip.h"
+#include "../../N64 System/N64 Types.h"
 
-CSettingTypeRDBSaveChip::CSettingTypeRDBSaveChip(LPCSTR Name, SettingID DefaultSetting ) :
-	CSettingTypeRomDatabase(Name,DefaultSetting)
+CSettingTypeRDBSaveChip::CSettingTypeRDBSaveChip(const char * Name, SettingID DefaultSetting ) :
+    CSettingTypeRomDatabase(Name,DefaultSetting)
 {
 }
 
-CSettingTypeRDBSaveChip::CSettingTypeRDBSaveChip(LPCSTR Name, int DefaultValue ) :
-	CSettingTypeRomDatabase(Name,DefaultValue)
+CSettingTypeRDBSaveChip::CSettingTypeRDBSaveChip(const char * Name, int DefaultValue ) :
+    CSettingTypeRomDatabase(Name,DefaultValue)
 {
 }
 
-	CSettingTypeRDBSaveChip::~CSettingTypeRDBSaveChip()
+CSettingTypeRDBSaveChip::~CSettingTypeRDBSaveChip()
 {
 }
 
 bool CSettingTypeRDBSaveChip::Load ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
-bool CSettingTypeRDBSaveChip::Load ( int Index, ULONG & Value ) const
+bool CSettingTypeRDBSaveChip::Load ( int Index, uint32_t & Value ) const
 {
-	stdstr strValue;
-	bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue);
-	if (!bRes)
-	{
-		LoadDefault(Index,Value);
-		return false;
-	}
-	LPCSTR String = strValue.c_str();
+    stdstr strValue;
+    bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue);
+    if (!bRes)
+    {
+        LoadDefault(Index,Value);
+        return false;
+    }
+    const char * String = strValue.c_str();
 
-	if (_stricmp(String,"First Save Type") == 0)    { Value = (ULONG)SaveChip_Auto; } 
-	else if (_stricmp(String,"4kbit Eeprom") == 0)  { Value = SaveChip_Eeprom_4K; } 
-	else if (_stricmp(String,"16kbit Eeprom") == 0) { Value = SaveChip_Eeprom_16K; } 
-	else if (_stricmp(String,"Sram") == 0)          { Value = SaveChip_Sram; } 
-	else if (_stricmp(String,"FlashRam") == 0)      { Value = SaveChip_FlashRam; } 
-	else if (_stricmp(String,"default") == 0)       
-	{ 
-		LoadDefault(Index,Value);
-		return false;
-	} else 	{ 
-		Notify().BreakPoint(__FILEW__,__LINE__); 
-	}
-	
-	return true;
+    if (_stricmp(String,"First Save Type") == 0)    { Value = (uint32_t)SaveChip_Auto; }
+    else if (_stricmp(String,"4kbit Eeprom") == 0)  { Value = SaveChip_Eeprom_4K; }
+    else if (_stricmp(String,"16kbit Eeprom") == 0) { Value = SaveChip_Eeprom_16K; }
+    else if (_stricmp(String,"Sram") == 0)          { Value = SaveChip_Sram; }
+    else if (_stricmp(String,"FlashRam") == 0)      { Value = SaveChip_FlashRam; }
+    else if (_stricmp(String,"default") == 0)
+    {
+        LoadDefault(Index,Value);
+        return false;
+    } else 	{
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+
+    return true;
 }
 
 bool CSettingTypeRDBSaveChip::Load ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 //return the default values
 void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, ULONG & Value  ) const
+void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, uint32_t & Value  ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue;
-		} else {
-			g_Settings->LoadDword(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue;
+        } else {
+            g_Settings->LoadDword(m_DefaultSetting,Value);
+        }
+    }
 }
 
 void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 //Update the settings
 void CSettingTypeRDBSaveChip::Save ( int /*Index*/, bool /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeRDBSaveChip::Save ( int /*Index*/, ULONG Value )
+void CSettingTypeRDBSaveChip::Save ( int /*Index*/, uint32_t Value )
 {
-	switch (Value)
-	{
-	case SaveChip_Auto:       m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"First Save Type"); break;
-	case SaveChip_Eeprom_4K:  m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"4kbit Eeprom"); break;
-	case SaveChip_Eeprom_16K: m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"16kbit Eeprom"); break;
-	case SaveChip_Sram:       m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"Sram"); break;
-	case SaveChip_FlashRam:   m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"FlashRam"); break;
-	default:
-		Notify().BreakPoint(__FILEW__,__LINE__); 
-	}
+    switch (Value)
+    {
+    case SaveChip_Auto:       m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"First Save Type"); break;
+    case SaveChip_Eeprom_4K:  m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"4kbit Eeprom"); break;
+    case SaveChip_Eeprom_16K: m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"16kbit Eeprom"); break;
+    case SaveChip_Sram:       m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"Sram"); break;
+    case SaveChip_FlashRam:   m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"FlashRam"); break;
+    default:
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
 }
 
 void CSettingTypeRDBSaveChip::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBSaveChip::Save ( int /*Index*/, const char * /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBSaveChip::Delete( int /*Index*/ )
 {
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.h b/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.h
index 4af75ff05..bf98725d5 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.h
@@ -11,31 +11,34 @@
 #pragma once
 
 class CSettingTypeRDBSaveChip :
-	public CSettingTypeRomDatabase
+    public CSettingTypeRomDatabase
 {
-	
 public:
-	CSettingTypeRDBSaveChip(LPCSTR Name, SettingID DefaultSetting );
-	CSettingTypeRDBSaveChip(LPCSTR Name, int DefaultValue );
-	~CSettingTypeRDBSaveChip();
+    CSettingTypeRDBSaveChip(const char * Name, SettingID DefaultSetting );
+    CSettingTypeRDBSaveChip(const char * Name, int DefaultValue );
+    ~CSettingTypeRDBSaveChip();
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeRDBSaveChip(void);                                        // Disable default constructor
+    CSettingTypeRDBSaveChip(const CSettingTypeRDBSaveChip&);              // Disable copy constructor
+    CSettingTypeRDBSaveChip& operator=(const CSettingTypeRDBSaveChip&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp
index f8f81d2d1..3c4acaef2 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp
@@ -12,13 +12,13 @@
 #include "SettingsType-RomDatabase.h"
 #include "SettingsType-RDBYesNo.h"
 
-CSettingTypeRDBYesNo::CSettingTypeRDBYesNo(LPCSTR Name, SettingID DefaultSetting ) :
-	CSettingTypeRomDatabase(Name,DefaultSetting)
+CSettingTypeRDBYesNo::CSettingTypeRDBYesNo(const char * Name, SettingID DefaultSetting ) :
+    CSettingTypeRomDatabase(Name,DefaultSetting)
 {
 }
 
-CSettingTypeRDBYesNo::CSettingTypeRDBYesNo(LPCSTR Name, int DefaultValue ) :
-	CSettingTypeRomDatabase(Name,DefaultValue)
+CSettingTypeRDBYesNo::CSettingTypeRDBYesNo(const char * Name, int DefaultValue ) :
+    CSettingTypeRomDatabase(Name,DefaultValue)
 {
 }
 
@@ -28,89 +28,96 @@ CSettingTypeRDBYesNo::~CSettingTypeRDBYesNo()
 
 bool CSettingTypeRDBYesNo::Load ( int Index, bool & Value ) const
 {
-	stdstr strValue;
-	bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue);
-	if (!bRes)
-	{
-		LoadDefault(Index,Value);
-		return false;
-	}
-	LPCSTR String = strValue.c_str();
+    stdstr strValue;
+    bool bRes = m_SettingsIniFile->GetString(m_SectionIdent->c_str(),m_KeyName.c_str(),m_DefaultStr,strValue);
+    if (!bRes)
+    {
+        LoadDefault(Index,Value);
+        return false;
+    }
+    const char * String = strValue.c_str();
 
-	if (_stricmp(String,"Yes") == 0)    { Value = true; } 
-	else if (_stricmp(String,"No") == 0)  { Value = false; } 
-	else if (_stricmp(String,"default") == 0)  
-	{ 
-		LoadDefault(Index,Value);
-		return false;
-	}  else { 
-		WriteTraceF(TraceError,__FUNCTION__ ": Invalid Yes/No setting value (Section: %s Key: %s Value: %s)",m_SectionIdent->c_str(),String,m_KeyName.c_str(),strValue.c_str());
-		LoadDefault(Index,Value);
-		return false;
-	}
-	
-	return true;
+    if (_stricmp(String,"Yes") == 0)
+    {
+        Value = true;
+    }
+    else if (_stricmp(String,"No") == 0)
+    {
+        Value = false;
+    }
+    else if (_stricmp(String,"default") == 0)
+    {
+        LoadDefault(Index,Value);
+        return false;
+    }
+    else
+    {
+        WriteTraceF(TraceError,__FUNCTION__ ": Invalid Yes/No setting value (Section: %s Key: %s Value: %s)",m_SectionIdent->c_str(),String,m_KeyName.c_str(),strValue.c_str());
+        LoadDefault(Index,Value);
+        return false;
+    }
+
+    return true;
 }
 
-bool CSettingTypeRDBYesNo::Load ( int /*Index*/, ULONG & /*Value*/ ) const
+bool CSettingTypeRDBYesNo::Load ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 bool CSettingTypeRDBYesNo::Load ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 //return the default values
 void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, bool & Value   ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue != 0;
-		} else {
-			g_Settings->LoadBool(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue != 0;
+        } else {
+            g_Settings->LoadBool(m_DefaultSetting,Value);
+        }
+    }
 }
 
-void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
+void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-
 //Update the settings
 void CSettingTypeRDBYesNo::Save ( int /*Index*/, bool Value )
 {
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),Value? "Yes" : "No");
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),Value? "Yes" : "No");
 }
 
-void CSettingTypeRDBYesNo::Save ( int /*Index*/, ULONG Value )
+void CSettingTypeRDBYesNo::Save ( int /*Index*/, uint32_t Value )
 {
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),Value? "Yes" : "No");
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),Value? "Yes" : "No");
 }
 
 void CSettingTypeRDBYesNo::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBYesNo::Save ( int /*Index*/, const char * /*Value*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRDBYesNo::Delete( int /*Index*/ )
 {
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.h b/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.h
index 65b8e8607..6331504b0 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.h
@@ -11,31 +11,34 @@
 #pragma once
 
 class CSettingTypeRDBYesNo :
-	public CSettingTypeRomDatabase
+    public CSettingTypeRomDatabase
 {
-	
 public:
-	CSettingTypeRDBYesNo(LPCSTR Name, SettingID DefaultSetting );
-	CSettingTypeRDBYesNo(LPCSTR Name, int DefaultValue );
-	~CSettingTypeRDBYesNo();
+    CSettingTypeRDBYesNo(const char * Name, SettingID DefaultSetting );
+    CSettingTypeRDBYesNo(const char * Name, int DefaultValue );
+    ~CSettingTypeRDBYesNo();
 
-	//return the values
-	virtual bool Load ( int Index, bool & Value   ) const; 
-	virtual bool Load ( int Index, ULONG & Value  ) const;
-	virtual bool Load ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load ( int Index, bool & Value   ) const;
+    virtual bool Load ( int Index, uint32_t & Value  ) const;
+    virtual bool Load ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save ( int Index, bool Value ); 
-	virtual void Save ( int Index, ULONG Value ); 
-	virtual void Save ( int Index, const stdstr & Value );
-	virtual void Save ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save ( int Index, bool Value );
+    virtual void Save ( int Index, uint32_t Value );
+    virtual void Save ( int Index, const stdstr & Value );
+    virtual void Save ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeRDBYesNo(void);                                     // Disable default constructor
+    CSettingTypeRDBYesNo(const CSettingTypeRDBYesNo&);              // Disable copy constructor
+    CSettingTypeRDBYesNo& operator=(const CSettingTypeRDBYesNo&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp b/Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp
index 0ce607ba3..19a547db5 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp
@@ -11,10 +11,10 @@
 #include "stdafx.h"
 #include "SettingsType-RelativePath.h"
 
-CSettingTypeRelativePath::CSettingTypeRelativePath(LPCSTR Path, LPCSTR FileName)
+CSettingTypeRelativePath::CSettingTypeRelativePath(const char * Path, const char * FileName)
 {
-	m_FileName = CPath(CPath::MODULE_DIRECTORY,FileName);
-	m_FileName.AppendDirectory(Path);
+    m_FileName = CPath(CPath::MODULE_DIRECTORY,FileName);
+    m_FileName.AppendDirectory(Path);
 }
 
 CSettingTypeRelativePath::~CSettingTypeRelativePath ( void )
@@ -23,47 +23,47 @@ CSettingTypeRelativePath::~CSettingTypeRelativePath ( void )
 
 bool CSettingTypeRelativePath::Load ( int /*Index*/, stdstr & value ) const
 {
-	value = (LPCSTR)m_FileName;
-	return true;
+    value = (const char *)m_FileName;
+    return true;
 }
 
 //return the default values
 void CSettingTypeRelativePath::LoadDefault ( int /*Index*/, bool & /*Value*/   ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeRelativePath::LoadDefault ( int /*Index*/, ULONG & /*Value*/  ) const
+void CSettingTypeRelativePath::LoadDefault ( int /*Index*/, uint32_t & /*Value*/  ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRelativePath::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRelativePath::Save ( int /*Index*/, bool /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeRelativePath::Save ( int /*Index*/, ULONG /*Value*/ )
+void CSettingTypeRelativePath::Save ( int /*Index*/, uint32_t /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRelativePath::Save ( int /*Index*/, const stdstr & Value )
 {
-	m_FileName = CPath(CPath::MODULE_DIRECTORY,Value.c_str());
+    m_FileName = CPath(CPath::MODULE_DIRECTORY,Value.c_str());
 }
 
 void CSettingTypeRelativePath::Save ( int /*Index*/, const char * Value )
 {
-	m_FileName = CPath(CPath::MODULE_DIRECTORY,Value);
+    m_FileName = CPath(CPath::MODULE_DIRECTORY,Value);
 }
 
 void CSettingTypeRelativePath::Delete ( int /*Index*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RelativePath.h b/Source/Project64/Settings/SettingType/SettingsType-RelativePath.h
index 51572f5ab..4d3fc24b1 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RelativePath.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RelativePath.h
@@ -9,36 +9,42 @@
 *                                                                           *
 ****************************************************************************/
 #pragma once
+#include <Common/path.h>
+#include "SettingsType-Base.h"
 
 class CSettingTypeRelativePath :
-	public CSettingType
+    public CSettingType
 {
-	CPath m_FileName;
+    CPath m_FileName;
 
 public:
-	CSettingTypeRelativePath(LPCSTR Path, LPCSTR FileName);
-	~CSettingTypeRelativePath();
+    CSettingTypeRelativePath(const char * Path, const char * FileName);
+    ~CSettingTypeRelativePath();
 
-	bool        IndexBasedSetting ( void ) const { return false; }
-	SettingType GetSettingType    ( void ) const { return SettingType_RelativePath; }	
+    bool        IndexBasedSetting ( void ) const { return false; }
+    SettingType GetSettingType    ( void ) const { return SettingType_RelativePath; }
 
-	//return the values
-	bool Load   ( int /*Index*/, bool & /*Value*/ ) const { return false; }; 
-	bool Load   ( int /*Index*/, ULONG & /*Value*/  ) const { return false; };
-	bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    bool Load   ( int /*Index*/, bool & /*Value*/ ) const { return false; };
+    bool Load   ( int /*Index*/, uint32_t & /*Value*/  ) const { return false; };
+    bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	void LoadDefault ( int Index, bool & Value   ) const; 
-	void LoadDefault ( int Index, ULONG & Value  ) const; 
-	void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    void LoadDefault ( int Index, bool & Value   ) const;
+    void LoadDefault ( int Index, uint32_t & Value  ) const;
+    void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	void Save   ( int Index, bool Value ); 
-	void Save   ( int Index, ULONG Value ); 
-	void Save   ( int Index, const stdstr & Value );
-	void Save   ( int Index, const char * Value );
+    //Update the settings
+    void Save   ( int Index, bool Value );
+    void Save   ( int Index, uint32_t Value );
+    void Save   ( int Index, const stdstr & Value );
+    void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	void Delete ( int Index ); 
+    // Delete the setting
+    void Delete ( int Index );
+
+private:
+    CSettingTypeRelativePath(void);                                         // Disable default constructor
+    CSettingTypeRelativePath(const CSettingTypeRelativePath&);              // Disable copy constructor
+    CSettingTypeRelativePath& operator=(const CSettingTypeRelativePath&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp
index 184bab4b7..13ed2e890 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp
@@ -15,43 +15,43 @@ CIniFile * CSettingTypeRomDatabase::m_SettingsIniFile = NULL;
 CIniFile * CSettingTypeRomDatabase::m_GlideIniFile    = NULL;
 stdstr   * CSettingTypeRomDatabase::m_SectionIdent    = NULL;
 
-CSettingTypeRomDatabase::CSettingTypeRomDatabase(LPCSTR Name, int DefaultValue, bool DeleteOnDefault ) :
-	m_KeyName(StripNameSection(Name)),
-	m_DefaultStr(""),
-	m_DefaultValue(DefaultValue),
-	m_DefaultSetting(Default_Constant),
-	m_DeleteOnDefault(DeleteOnDefault),
-	m_GlideSetting(IsGlideSetting(Name))
+CSettingTypeRomDatabase::CSettingTypeRomDatabase(const char * Name, int DefaultValue, bool DeleteOnDefault ) :
+    m_KeyName(StripNameSection(Name)),
+    m_DefaultStr(""),
+    m_DefaultValue(DefaultValue),
+    m_DefaultSetting(Default_Constant),
+    m_DeleteOnDefault(DeleteOnDefault),
+    m_GlideSetting(IsGlideSetting(Name))
 {
 }
 
-CSettingTypeRomDatabase::CSettingTypeRomDatabase(LPCSTR Name, bool DefaultValue, bool DeleteOnDefault ) :
-	m_KeyName(StripNameSection(Name)),
-	m_DefaultStr(""),
-	m_DefaultValue(DefaultValue),
-	m_DefaultSetting(Default_Constant),
-	m_DeleteOnDefault(DeleteOnDefault),
-	m_GlideSetting(IsGlideSetting(Name))
+CSettingTypeRomDatabase::CSettingTypeRomDatabase(const char * Name, bool DefaultValue, bool DeleteOnDefault ) :
+    m_KeyName(StripNameSection(Name)),
+    m_DefaultStr(""),
+    m_DefaultValue(DefaultValue),
+    m_DefaultSetting(Default_Constant),
+    m_DeleteOnDefault(DeleteOnDefault),
+    m_GlideSetting(IsGlideSetting(Name))
 {
 }
 
-CSettingTypeRomDatabase::CSettingTypeRomDatabase(LPCSTR Name, LPCSTR DefaultValue, bool DeleteOnDefault ) :
-	m_KeyName(StripNameSection(Name)),
-	m_DefaultStr(DefaultValue),
-	m_DefaultValue(0),
-	m_DefaultSetting(Default_Constant),
-	m_DeleteOnDefault(DeleteOnDefault),
-	m_GlideSetting(IsGlideSetting(Name))
+CSettingTypeRomDatabase::CSettingTypeRomDatabase(const char * Name, const char * DefaultValue, bool DeleteOnDefault ) :
+    m_KeyName(StripNameSection(Name)),
+    m_DefaultStr(DefaultValue),
+    m_DefaultValue(0),
+    m_DefaultSetting(Default_Constant),
+    m_DeleteOnDefault(DeleteOnDefault),
+    m_GlideSetting(IsGlideSetting(Name))
 {
 }
 
-CSettingTypeRomDatabase::CSettingTypeRomDatabase(LPCSTR Name, SettingID DefaultSetting, bool DeleteOnDefault ) :
-	m_KeyName(Name),
-	m_DefaultStr(""),
-	m_DefaultValue(0),
-	m_DefaultSetting(DefaultSetting),
-	m_DeleteOnDefault(DeleteOnDefault),
-	m_GlideSetting(IsGlideSetting(Name))
+CSettingTypeRomDatabase::CSettingTypeRomDatabase(const char * Name, SettingID DefaultSetting, bool DeleteOnDefault ) :
+    m_KeyName(Name),
+    m_DefaultStr(""),
+    m_DefaultValue(0),
+    m_DefaultSetting(DefaultSetting),
+    m_DeleteOnDefault(DeleteOnDefault),
+    m_GlideSetting(IsGlideSetting(Name))
 {
 }
 
@@ -59,244 +59,242 @@ CSettingTypeRomDatabase::~CSettingTypeRomDatabase()
 {
 }
 
-void CSettingTypeRomDatabase::Initilize( void )
+void CSettingTypeRomDatabase::Initialize( void )
 {
-	m_SettingsIniFile = new CIniFile(g_Settings->LoadString(SupportFile_RomDatabase).c_str());
-	m_GlideIniFile = new CIniFile(g_Settings->LoadString(SupportFile_Glide64RDB).c_str());
+    m_SettingsIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str());
+    m_GlideIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_Glide64RDB).c_str());
 
-	g_Settings->RegisterChangeCB(Game_IniKey,NULL,GameChanged);
-	
-	m_SectionIdent = new stdstr(g_Settings->LoadString(Game_IniKey));
+    g_Settings->RegisterChangeCB(Game_IniKey,NULL,GameChanged);
+
+    m_SectionIdent = new stdstr(g_Settings->LoadStringVal(Game_IniKey));
 }
 
 void CSettingTypeRomDatabase::CleanUp( void )
 {
-	g_Settings->UnregisterChangeCB(Game_IniKey,NULL,GameChanged);
-	if (m_SettingsIniFile)
-	{
-		delete m_SettingsIniFile;
-		m_SettingsIniFile = NULL;
-	}
-	if (m_GlideIniFile)
-	{
-		delete m_GlideIniFile;
-		m_GlideIniFile = NULL;
-	}
-	if (m_SectionIdent)
-	{
-		delete m_SectionIdent;
-		m_SectionIdent = NULL;
-	}
+    g_Settings->UnregisterChangeCB(Game_IniKey,NULL,GameChanged);
+    if (m_SettingsIniFile)
+    {
+        delete m_SettingsIniFile;
+        m_SettingsIniFile = NULL;
+    }
+    if (m_GlideIniFile)
+    {
+        delete m_GlideIniFile;
+        m_GlideIniFile = NULL;
+    }
+    if (m_SectionIdent)
+    {
+        delete m_SectionIdent;
+        m_SectionIdent = NULL;
+    }
 }
 
 void CSettingTypeRomDatabase::GameChanged ( void * /*Data */ )
 {
-	if (m_SectionIdent)
-	{
-		*m_SectionIdent = g_Settings->LoadString(Game_IniKey);
-	}
+    if (m_SectionIdent)
+    {
+        *m_SectionIdent = g_Settings->LoadStringVal(Game_IniKey);
+    }
 }
 
 bool CSettingTypeRomDatabase::Load ( int Index, bool & Value ) const
 {
-	DWORD temp_value = Value;
-	bool bRes = Load(Index,temp_value);
-	Value = temp_value != 0;
-	return bRes;
+    uint32_t temp_value = Value;
+    bool bRes = Load(Index,temp_value);
+    Value = temp_value != 0;
+    return bRes;
 }
 
-bool CSettingTypeRomDatabase::Load ( int Index, ULONG & Value ) const
+bool CSettingTypeRomDatabase::Load ( int Index, uint32_t & Value ) const
 {
-	bool bRes = false;
-	if (m_GlideSetting)
-	{
-		bRes = m_GlideIniFile->GetNumber(Section(),m_KeyName.c_str(),Value,Value);
-	}
-	else 
-	{
-		bRes = m_SettingsIniFile->GetNumber(Section(),m_KeyName.c_str(),Value,Value);
-	}
-	if (!bRes)
-	{
-		LoadDefault(Index,Value);
-	}
-	return bRes;
+    bool bRes = false;
+    if (m_GlideSetting)
+    {
+        bRes = m_GlideIniFile->GetNumber(Section(),m_KeyName.c_str(),Value,Value);
+    }
+    else
+    {
+        bRes = m_SettingsIniFile->GetNumber(Section(),m_KeyName.c_str(),Value,Value);
+    }
+    if (!bRes)
+    {
+        LoadDefault(Index,Value);
+    }
+    return bRes;
 }
 
 bool CSettingTypeRomDatabase::Load ( int Index, stdstr & Value ) const
 {
-	stdstr temp_value;
-	bool bRes = false;
-	if (m_GlideSetting)
-	{
-		bRes = m_GlideIniFile->GetString(Section(),m_KeyName.c_str(),m_DefaultStr,temp_value);
-	}
-	else
-	{
-		bRes = m_SettingsIniFile->GetString(Section(),m_KeyName.c_str(),m_DefaultStr,temp_value);
-	}
-	if (bRes)
-	{
-		Value = temp_value;
-	}
-	else 
-	{
-		LoadDefault(Index,Value);
-	}
-	return bRes;
+    stdstr temp_value;
+    bool bRes = false;
+    if (m_GlideSetting)
+    {
+        bRes = m_GlideIniFile->GetString(Section(),m_KeyName.c_str(),m_DefaultStr,temp_value);
+    }
+    else
+    {
+        bRes = m_SettingsIniFile->GetString(Section(),m_KeyName.c_str(),m_DefaultStr,temp_value);
+    }
+    if (bRes)
+    {
+        Value = temp_value;
+    }
+    else
+    {
+        LoadDefault(Index,Value);
+    }
+    return bRes;
 }
 
-
 //return the default values
 void CSettingTypeRomDatabase::LoadDefault ( int /*Index*/, bool & Value ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue != 0;
-		} else {
-			g_Settings->LoadBool(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue != 0;
+        } else {
+            g_Settings->LoadBool(m_DefaultSetting,Value);
+        }
+    }
 }
 
-void CSettingTypeRomDatabase::LoadDefault ( int /*Index*/, ULONG & Value  ) const
+void CSettingTypeRomDatabase::LoadDefault ( int /*Index*/, uint32_t & Value  ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultValue;
-		} else {
-			g_Settings->LoadDword(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultValue;
+        } else {
+            g_Settings->LoadDword(m_DefaultSetting,Value);
+        }
+    }
 }
 
 void CSettingTypeRomDatabase::LoadDefault ( int /*Index*/, stdstr & Value ) const
 {
-	if (m_DefaultSetting != Default_None)
-	{
-		if (m_DefaultSetting == Default_Constant)
-		{
-			Value = m_DefaultStr;
-		} else {
-			g_Settings->LoadString(m_DefaultSetting,Value);
-		}
-	}
+    if (m_DefaultSetting != Default_None)
+    {
+        if (m_DefaultSetting == Default_Constant)
+        {
+            Value = m_DefaultStr;
+        } else {
+            g_Settings->LoadStringVal(m_DefaultSetting,Value);
+        }
+    }
 }
 
-
 //Update the settings
 void CSettingTypeRomDatabase::Save ( int /*Index*/, bool Value )
 {
-	if (!g_Settings->LoadBool(Setting_RdbEditor))
-	{
-		return;
-	}
-	if (m_DeleteOnDefault)
-	{	
-		Notify().BreakPoint(__FILEW__,__LINE__); 
-	}
-	if (m_GlideSetting)
-	{
-		m_GlideIniFile->SaveNumber(Section(),m_KeyName.c_str(),Value);
-	}
-	else 
-	{
-		m_SettingsIniFile->SaveNumber(Section(),m_KeyName.c_str(),Value);
-	}
+    if (!g_Settings->LoadBool(Setting_RdbEditor))
+    {
+        return;
+    }
+    if (m_DeleteOnDefault)
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    if (m_GlideSetting)
+    {
+        m_GlideIniFile->SaveNumber(Section(),m_KeyName.c_str(),Value);
+    }
+    else
+    {
+        m_SettingsIniFile->SaveNumber(Section(),m_KeyName.c_str(),Value);
+    }
 }
 
-void CSettingTypeRomDatabase::Save ( int Index, ULONG Value )
+void CSettingTypeRomDatabase::Save ( int Index, uint32_t Value )
 {
-	if (!g_Settings->LoadBool(Setting_RdbEditor))
-	{
-		return;
-	}
-	if (m_DeleteOnDefault)
-	{	
-		ULONG defaultValue = 0;
-		LoadDefault(Index,defaultValue);
-		if (defaultValue == Value)
-		{
-			Delete(Index);
-			return;
-		}
-	}
-	if (m_GlideSetting)
-	{
-		m_GlideIniFile->SaveNumber(Section(),m_KeyName.c_str(),Value);
-	}
-	else
-	{
-		m_SettingsIniFile->SaveNumber(Section(),m_KeyName.c_str(),Value);
-	}
+    if (!g_Settings->LoadBool(Setting_RdbEditor))
+    {
+        return;
+    }
+    if (m_DeleteOnDefault)
+    {
+        uint32_t defaultValue = 0;
+        LoadDefault(Index,defaultValue);
+        if (defaultValue == Value)
+        {
+            Delete(Index);
+            return;
+        }
+    }
+    if (m_GlideSetting)
+    {
+        m_GlideIniFile->SaveNumber(Section(),m_KeyName.c_str(),Value);
+    }
+    else
+    {
+        m_SettingsIniFile->SaveNumber(Section(),m_KeyName.c_str(),Value);
+    }
 }
 
 void CSettingTypeRomDatabase::Save ( int /*Index*/, const stdstr & Value )
 {
-	if (!g_Settings->LoadBool(Setting_RdbEditor))
-	{
-		return;
-	}
-	if (m_GlideSetting)
-	{
-		m_GlideIniFile->SaveString(Section(),m_KeyName.c_str(),Value.c_str());
-	}
-	else
-	{
-		m_SettingsIniFile->SaveString(Section(),m_KeyName.c_str(),Value.c_str());
-	}
+    if (!g_Settings->LoadBool(Setting_RdbEditor))
+    {
+        return;
+    }
+    if (m_GlideSetting)
+    {
+        m_GlideIniFile->SaveString(Section(),m_KeyName.c_str(),Value.c_str());
+    }
+    else
+    {
+        m_SettingsIniFile->SaveString(Section(),m_KeyName.c_str(),Value.c_str());
+    }
 }
 
 void CSettingTypeRomDatabase::Save ( int /*Index*/, const char * Value )
 {
-	if (!g_Settings->LoadBool(Setting_RdbEditor))
-	{
-		return; 
-	}
-	if (m_GlideSetting)
-	{
-		m_GlideIniFile->SaveString(Section(),m_KeyName.c_str(),Value);
-	}
-	else
-	{
-		m_SettingsIniFile->SaveString(Section(),m_KeyName.c_str(),Value);
-	}
+    if (!g_Settings->LoadBool(Setting_RdbEditor))
+    {
+        return;
+    }
+    if (m_GlideSetting)
+    {
+        m_GlideIniFile->SaveString(Section(),m_KeyName.c_str(),Value);
+    }
+    else
+    {
+        m_SettingsIniFile->SaveString(Section(),m_KeyName.c_str(),Value);
+    }
 }
 
 void CSettingTypeRomDatabase::Delete ( int /*Index*/ )
 {
-	if (!g_Settings->LoadBool(Setting_RdbEditor))
-	{
-		return; 
-	}
-	if (m_GlideSetting)
-	{
-		m_GlideIniFile->SaveString(Section(),m_KeyName.c_str(),NULL);
-	}
-	else
-	{
-		m_SettingsIniFile->SaveString(Section(),m_KeyName.c_str(),NULL);
-	}
+    if (!g_Settings->LoadBool(Setting_RdbEditor))
+    {
+        return;
+    }
+    if (m_GlideSetting)
+    {
+        m_GlideIniFile->SaveString(Section(),m_KeyName.c_str(),NULL);
+    }
+    else
+    {
+        m_SettingsIniFile->SaveString(Section(),m_KeyName.c_str(),NULL);
+    }
 }
 
-bool CSettingTypeRomDatabase::IsGlideSetting (LPCSTR Name)
+bool CSettingTypeRomDatabase::IsGlideSetting (const char * Name)
 {
-	if (_strnicmp(Name,"Glide64-",8) == 0)
-	{
-		return true;
-	}
-	return false;
+    if (_strnicmp(Name,"Glide64-",8) == 0)
+    {
+        return true;
+    }
+    return false;
 }
 
-LPCSTR CSettingTypeRomDatabase::StripNameSection (LPCSTR Name)
+const char * CSettingTypeRomDatabase::StripNameSection (const char * Name)
 {
-	if (_strnicmp(Name,"Glide64-",8) == 0)
-	{
-		return &Name[8];
-	}
-	return Name;
+    if (_strnicmp(Name,"Glide64-",8) == 0)
+    {
+        return &Name[8];
+    }
+    return Name;
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h
index d020c67fe..c74723a36 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h
@@ -10,58 +10,65 @@
 ****************************************************************************/
 #pragma once
 
+#include <Common/Ini File Class.h>
+#include "SettingsType-Base.h"
+
 class CSettingTypeRomDatabase :
-	public CSettingType
+    public CSettingType
 {
 public:
-	CSettingTypeRomDatabase(LPCSTR Name, LPCSTR DefaultValue, bool DeleteOnDefault = false );
-	CSettingTypeRomDatabase(LPCSTR Name, bool DefaultValue, bool DeleteOnDefault = false );
-	CSettingTypeRomDatabase(LPCSTR Name, int DefaultValue, bool DeleteOnDefault = false );
-	CSettingTypeRomDatabase(LPCSTR Name, SettingID DefaultSetting, bool DeleteOnDefault = false );
-	
-	virtual ~CSettingTypeRomDatabase();
+    CSettingTypeRomDatabase(const char * Name, const char * DefaultValue, bool DeleteOnDefault = false );
+    CSettingTypeRomDatabase(const char * Name, bool DefaultValue, bool DeleteOnDefault = false );
+    CSettingTypeRomDatabase(const char * Name, int DefaultValue, bool DeleteOnDefault = false );
+    CSettingTypeRomDatabase(const char * Name, SettingID DefaultSetting, bool DeleteOnDefault = false );
 
-	virtual bool        IndexBasedSetting ( void ) const { return false; }
-	virtual SettingType GetSettingType    ( void ) const { return SettingType_RomDatabase; }	
+    virtual ~CSettingTypeRomDatabase();
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    virtual bool        IndexBasedSetting ( void ) const { return false; }
+    virtual SettingType GetSettingType    ( void ) const { return SettingType_RomDatabase; }
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
 
-	static void Initilize ( void );
-	static void CleanUp   ( void );
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+    static void Initialize( void );
+    static void CleanUp   ( void );
 
 protected:
-	static void GameChanged ( void * /*Data */ );
+    static void GameChanged ( void * /*Data */ );
 
-	static bool IsGlideSetting (LPCSTR Name);
-	static LPCSTR StripNameSection (LPCSTR Name);
-	virtual LPCSTR Section ( void ) const { return m_SectionIdent->c_str(); }
+    static bool IsGlideSetting (const char * Name);
+    static const char * StripNameSection (const char * Name);
+    virtual const char * Section ( void ) const { return m_SectionIdent->c_str(); }
 
-	mutable stdstr  m_KeyName;
-	const LPCSTR    m_DefaultStr;
-	const int       m_DefaultValue;
-	const SettingID m_DefaultSetting;
-	const bool      m_DeleteOnDefault;
-	bool            m_GlideSetting;
+    mutable stdstr  m_KeyName;
+    const char *const m_DefaultStr;
+    const int       m_DefaultValue;
+    const SettingID m_DefaultSetting;
+    const bool      m_DeleteOnDefault;
+    bool            m_GlideSetting;
 
-	static stdstr   * m_SectionIdent;
-	static CIniFile * m_SettingsIniFile;
-	static CIniFile * m_GlideIniFile;
+    static stdstr   * m_SectionIdent;
+    static CIniFile * m_SettingsIniFile;
+    static CIniFile * m_GlideIniFile;
+
+private:
+    CSettingTypeRomDatabase();                                          // Disable default constructor
+    CSettingTypeRomDatabase(const CSettingTypeRomDatabase&);            // Disable copy constructor
+    CSettingTypeRomDatabase& operator=(const CSettingTypeRomDatabase&); // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp
index 9ad30a40b..296d70d09 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp
@@ -12,31 +12,31 @@
 #include "SettingsType-RomDatabase.h"
 #include "SettingsType-RomDatabaseIndex.h"
 
-CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(LPCSTR PreIndex, LPCSTR PostIndex, LPCSTR DefaultValue ) :
-	CSettingTypeRomDatabase("",DefaultValue),
-	m_PreIndex(PreIndex),
-	m_PostIndex(PostIndex)
+CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, const char * DefaultValue ) :
+    CSettingTypeRomDatabase("",DefaultValue),
+    m_PreIndex(PreIndex),
+    m_PostIndex(PostIndex)
 {
 }
 
-CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(LPCSTR PreIndex, LPCSTR PostIndex, bool DefaultValue ) :
-	CSettingTypeRomDatabase("",DefaultValue),
-	m_PreIndex(PreIndex),
-	m_PostIndex(PostIndex)
+CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, bool DefaultValue ) :
+    CSettingTypeRomDatabase("",DefaultValue),
+    m_PreIndex(PreIndex),
+    m_PostIndex(PostIndex)
 {
 }
 
-CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(LPCSTR PreIndex, LPCSTR PostIndex, int DefaultValue ) :
-	CSettingTypeRomDatabase("",DefaultValue),
-	m_PreIndex(PreIndex),
-	m_PostIndex(PostIndex)
+CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, int DefaultValue ) :
+    CSettingTypeRomDatabase("",DefaultValue),
+    m_PreIndex(PreIndex),
+    m_PostIndex(PostIndex)
 {
 }
 
-CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(LPCSTR PreIndex, LPCSTR PostIndex, SettingID DefaultSetting ) :
-	CSettingTypeRomDatabase("",DefaultSetting),
-	m_PreIndex(PreIndex),
-	m_PostIndex(PostIndex)
+CSettingTypeRomDatabaseIndex::CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, SettingID DefaultSetting ) :
+    CSettingTypeRomDatabase("",DefaultSetting),
+    m_PreIndex(PreIndex),
+    m_PostIndex(PostIndex)
 {
 }
 
@@ -44,63 +44,63 @@ CSettingTypeRomDatabaseIndex::~CSettingTypeRomDatabaseIndex()
 {
 }
 
-bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, bool & /*Value*/ ) const 
+bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
-bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, ULONG & /*Value*/ ) const
+bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 bool CSettingTypeRomDatabaseIndex::Load ( int Index, stdstr & Value ) const
 {
-	m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	return CSettingTypeRomDatabase::Load(0,Value);
+    m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    return CSettingTypeRomDatabase::Load(0,Value);
 }
 
 void CSettingTypeRomDatabaseIndex::LoadDefault ( int Index, bool & Value   ) const
 {
-	m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	CSettingTypeRomDatabase::LoadDefault(0,Value);
+    m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    CSettingTypeRomDatabase::LoadDefault(0,Value);
 }
 
-void CSettingTypeRomDatabaseIndex::LoadDefault ( int Index, ULONG & Value  ) const
+void CSettingTypeRomDatabaseIndex::LoadDefault ( int Index, uint32_t & Value  ) const
 {
-	m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	CSettingTypeRomDatabase::LoadDefault(0,Value);
+    m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    CSettingTypeRomDatabase::LoadDefault(0,Value);
 }
 
 void CSettingTypeRomDatabaseIndex::LoadDefault ( int Index, stdstr & Value ) const
 {
-	m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
-	CSettingTypeRomDatabase::LoadDefault(0,Value);
+    m_KeyName.Format("%s%d%s",m_PreIndex.c_str(),Index,m_PostIndex.c_str());
+    CSettingTypeRomDatabase::LoadDefault(0,Value);
 }
 
 void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, bool /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, ULONG /*Value*/ )
+void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, uint32_t /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, const char * /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeRomDatabaseIndex::Delete ( int /*Index*/ )
 {
-	m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
+    m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),NULL);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.h b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.h
index cece9254d..1373f4ef5 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.h
@@ -11,37 +11,41 @@
 #pragma once
 
 class CSettingTypeRomDatabaseIndex :
-	public CSettingTypeRomDatabase
+    public CSettingTypeRomDatabase
 {
-	stdstr m_PreIndex, m_PostIndex;
-
 public:
-	CSettingTypeRomDatabaseIndex(LPCSTR PreIndex, LPCSTR PostIndex, LPCSTR DefaultValue );
-	CSettingTypeRomDatabaseIndex(LPCSTR PreIndex, LPCSTR PostIndex, bool DefaultValue );
-	CSettingTypeRomDatabaseIndex(LPCSTR PreIndex, LPCSTR PostIndex, int DefaultValue );
-	CSettingTypeRomDatabaseIndex(LPCSTR PreIndex, LPCSTR PostIndex, SettingID DefaultSetting );
-	
-	virtual ~CSettingTypeRomDatabaseIndex();
+    CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, const char * DefaultValue );
+    CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, bool DefaultValue );
+    CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, int DefaultValue );
+    CSettingTypeRomDatabaseIndex(const char * PreIndex, const char * PostIndex, SettingID DefaultSetting );
 
-	virtual bool        IndexBasedSetting ( void ) const { return true; }
+    virtual ~CSettingTypeRomDatabaseIndex();
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    virtual bool        IndexBasedSetting ( void ) const { return true; }
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
+
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeRomDatabaseIndex(void);                                             // Disable default constructor
+    CSettingTypeRomDatabaseIndex(const CSettingTypeRomDatabaseIndex&);              // Disable copy constructor
+    CSettingTypeRomDatabaseIndex& operator=(const CSettingTypeRomDatabaseIndex&);   // Disable assignment
+
+    stdstr m_PreIndex, m_PostIndex;
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp
index 7f77fed6d..0c45ae4f3 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.cpp
@@ -11,7 +11,7 @@
 #include "stdafx.h"
 #include "SettingsType-RomDatabaseSetting.h"
 
-CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(LPCSTR SectionIdent, LPCSTR Name, int DefaultValue, bool DeleteOnDefault ) :
+CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, int DefaultValue, bool DeleteOnDefault ) :
 	CSettingTypeRomDatabase(Name, DefaultValue, DeleteOnDefault),
 	m_SectionIdent(SectionIdent)
 {
@@ -23,7 +23,7 @@ CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(LPCSTR SectionIde
 	}
 }
 
-CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(LPCSTR SectionIdent, LPCSTR Name, bool DefaultValue, bool DeleteOnDefault ) :
+CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, bool DefaultValue, bool DeleteOnDefault ) :
 	CSettingTypeRomDatabase(Name, DefaultValue, DeleteOnDefault),
 	m_SectionIdent(SectionIdent)
 {
@@ -35,7 +35,7 @@ CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(LPCSTR SectionIde
 	}
 }
 
-CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(LPCSTR SectionIdent, LPCSTR Name, LPCSTR DefaultValue, bool DeleteOnDefault ) :
+CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, const char * DefaultValue, bool DeleteOnDefault ) :
 	CSettingTypeRomDatabase(Name, DefaultValue, DeleteOnDefault),
 	m_SectionIdent(SectionIdent)
 {
@@ -47,7 +47,7 @@ CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(LPCSTR SectionIde
 	}
 }
 
-CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(LPCSTR SectionIdent, LPCSTR Name, SettingID DefaultSetting, bool DeleteOnDefault ) :
+CSettingTypeRomDatabaseSetting::CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, SettingID DefaultSetting, bool DeleteOnDefault ) :
 	CSettingTypeRomDatabase(Name, DefaultSetting, DeleteOnDefault),
 	m_SectionIdent(SectionIdent)
 {
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.h b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.h
index 92d00e56a..49db4fd06 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseSetting.h
@@ -13,21 +13,25 @@
 #include "SettingsType-RomDatabase.h"
 
 class CSettingTypeRomDatabaseSetting :
-	public CSettingTypeRomDatabase
+    public CSettingTypeRomDatabase
 {
 public:
-	CSettingTypeRomDatabaseSetting(LPCSTR SectionIdent, LPCSTR Name, LPCSTR DefaultValue, bool DeleteOnDefault = false );
-	CSettingTypeRomDatabaseSetting(LPCSTR SectionIdent, LPCSTR Name, bool DefaultValue, bool DeleteOnDefault = false );
-	CSettingTypeRomDatabaseSetting(LPCSTR SectionIdent, LPCSTR Name, int DefaultValue, bool DeleteOnDefault = false );
-	CSettingTypeRomDatabaseSetting(LPCSTR SectionIdent, LPCSTR Name, SettingID DefaultSetting, bool DeleteOnDefault = false );
-	
-	virtual ~CSettingTypeRomDatabaseSetting();
+    CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, const char * DefaultValue, bool DeleteOnDefault = false );
+    CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, bool DefaultValue, bool DeleteOnDefault = false );
+    CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, int DefaultValue, bool DeleteOnDefault = false );
+    CSettingTypeRomDatabaseSetting(const char * SectionIdent, const char * Name, SettingID DefaultSetting, bool DeleteOnDefault = false );
 
-	virtual SettingType GetSettingType    ( void ) const { return SettingType_RdbSetting; }	
+    virtual ~CSettingTypeRomDatabaseSetting();
+
+    virtual SettingType GetSettingType    ( void ) const { return SettingType_RdbSetting; }
 
 private:
-	virtual LPCSTR Section ( void ) const { return m_SectionIdent.c_str(); }
+    virtual const char * Section ( void ) const { return m_SectionIdent.c_str(); }
 
-	stdstr m_SectionIdent;
+    stdstr m_SectionIdent;
+
+private:
+    CSettingTypeRomDatabaseSetting(void);                                               // Disable default constructor
+    CSettingTypeRomDatabaseSetting(const CSettingTypeRomDatabaseSetting&);              // Disable copy constructor
+    CSettingTypeRomDatabaseSetting& operator=(const CSettingTypeRomDatabaseSetting&);   // Disable assignment
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomSetting.h b/Source/Project64/Settings/SettingType/SettingsType-RomSetting.h
index 3183094a8..56e11a0c8 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-RomSetting.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-RomSetting.h
@@ -1,38 +1,41 @@
 #pragma once
 
 class CSettingTypeRomDatabase :
-	public CSettingType
+    public CSettingType
 {
-	
-	const LPCSTR    m_KeyName;
-	const LPCSTR    m_DefaultStr;
-	const int       m_DefaultValue;
-	const SettingID m_DefaultSetting;
-
-	static CIniFile * m_SettingsIniFile;
-	static bool       m_UseRegistry;
-	stdstr            m_SectionIdent;
-
 public:
-	CSettingTypeRomDatabase(LPCSTR Name, LPCSTR DefaultValue );
-	CSettingTypeRomDatabase(LPCSTR Name, bool DefaultValue );
-	CSettingTypeRomDatabase(LPCSTR Name, int DefaultValue );
-	CSettingTypeRomDatabase(LPCSTR Name, SettingID DefaultSetting );
-	~CSettingTypeRomDatabase();
+    CSettingTypeRomDatabase(const char * Name, const char * DefaultValue );
+    CSettingTypeRomDatabase(const char * Name, bool DefaultValue );
+    CSettingTypeRomDatabase(const char * Name, int DefaultValue );
+    CSettingTypeRomDatabase(const char * Name, SettingID DefaultSetting );
+    ~CSettingTypeRomDatabase();
 
-	virtual SettingLocation GetSettingsLocation ( void ) const { return SettingLocation_RomDatabase; }	
+    virtual SettingLocation GetSettingsLocation ( void ) const { return SettingLocation_RomDatabase; }
 
-	//return the values
-	virtual bool Load ( int Index, bool & Value   ) const; 
-	virtual bool Load ( int Index, ULONG & Value  ) const;
-	virtual bool Load ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load ( int Index, bool & Value   ) const;
+    virtual bool Load ( int Index, uint32_t & Value  ) const;
+    virtual bool Load ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save ( int Index, bool Value ); 
-	virtual void Save ( int Index, ULONG Value ); 
-	virtual void Save ( int Index, const stdstr & Value );
-	virtual void Save ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save ( int Index, bool Value );
+    virtual void Save ( int Index, uint32_t Value );
+    virtual void Save ( int Index, const stdstr & Value );
+    virtual void Save ( int Index, const char * Value );
 
-	static void Initilize ( void );
+    static void Initilize ( void );
+
+private:
+    CSettingTypeRomDatabase(void);                                               // Disable default constructor
+    CSettingTypeRomDatabase(const CSettingTypeRomDatabase&);              // Disable copy constructor
+    CSettingTypeRomDatabase& operator=(const CSettingTypeRomDatabase&);   // Disable assignment
+
+    const const char * m_KeyName;
+    const const char * m_DefaultStr;
+    const int          m_DefaultValue;
+    const SettingID    m_DefaultSetting;
+
+    static CIniFile *  m_SettingsIniFile;
+    static bool        m_UseRegistry;
+    stdstr             m_SectionIdent;
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp b/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp
index d08bc1ca0..58de69139 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp
@@ -11,77 +11,75 @@
 #include "stdafx.h"
 #include "SettingsType-SelectedDirectory.h"
 
-
-CSettingTypeSelectedDirectory::CSettingTypeSelectedDirectory(LPCSTR Name, SettingID InitialDir, SettingID SelectedDir, SettingID UseSelected ) :
-	m_Name(Name),
-	m_InitialDir(InitialDir),
-	m_SelectedDir(SelectedDir),
-	m_UseSelected(UseSelected)
+CSettingTypeSelectedDirectory::CSettingTypeSelectedDirectory(const char * Name, SettingID InitialDir, SettingID SelectedDir, SettingID UseSelected ) :
+    m_Name(Name),
+    m_InitialDir(InitialDir),
+    m_SelectedDir(SelectedDir),
+    m_UseSelected(UseSelected)
 {
 }
 
-
 CSettingTypeSelectedDirectory::~CSettingTypeSelectedDirectory()
 {
 }
 
 bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
-bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, ULONG & /*Value*/ ) const
+bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, stdstr & Value ) const
 {
-	SettingID DirSettingId = g_Settings->LoadBool(m_UseSelected) ? m_SelectedDir : m_InitialDir; 
-	return g_Settings->LoadString(DirSettingId, Value);
+    SettingID DirSettingId = g_Settings->LoadBool(m_UseSelected) ? m_SelectedDir : m_InitialDir;
+    return g_Settings->LoadStringVal(DirSettingId, Value);
 }
 
 //return the default values
 void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, bool & /*Value*/   ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, ULONG & /*Value*/  ) const
+void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, uint32_t & /*Value*/  ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 //Update the settings
 void CSettingTypeSelectedDirectory::Save ( int /*Index*/, bool /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeSelectedDirectory::Save ( int /*Index*/, ULONG /*Value*/ )
+void CSettingTypeSelectedDirectory::Save ( int /*Index*/, uint32_t /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeSelectedDirectory::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeSelectedDirectory::Save ( int /*Index*/, const char * Value )
 {
-	g_Settings->SaveBool(m_UseSelected,true);
-	g_Settings->SaveString(m_SelectedDir,Value);
+    g_Settings->SaveBool(m_UseSelected,true);
+    g_Settings->SaveString(m_SelectedDir,Value);
 }
 
 void CSettingTypeSelectedDirectory::Delete( int /*Index*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.h b/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.h
index f2f86002a..f6ebba028 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.h
@@ -10,40 +10,46 @@
 ****************************************************************************/
 #pragma once
 
+#include "SettingsType-Base.h"
+
 class CSettingTypeSelectedDirectory :
-	public CSettingType
+    public CSettingType
 {
-	std::string m_Name;
-	SettingID m_InitialDir;
-	SettingID m_SelectedDir;
-	SettingID m_UseSelected;
-	
 public:
-	CSettingTypeSelectedDirectory(LPCSTR Name, SettingID InitialDir, SettingID SelectedDir, SettingID UseSelected );
-	~CSettingTypeSelectedDirectory();
+    CSettingTypeSelectedDirectory(const char * Name, SettingID InitialDir, SettingID SelectedDir, SettingID UseSelected );
+    ~CSettingTypeSelectedDirectory();
 
-	virtual bool        IndexBasedSetting ( void ) const { return false; }
-	virtual SettingType GetSettingType    ( void ) const { return SettingType_SelectedDirectory; }	
+    virtual bool        IndexBasedSetting ( void ) const { return false; }
+    virtual SettingType GetSettingType    ( void ) const { return SettingType_SelectedDirectory; }
 
-	LPCSTR GetName ( void ) const { return m_Name.c_str(); }
+    const char * GetName ( void ) const { return m_Name.c_str(); }
 
-	//return the values
-	virtual bool Load   ( int Index, bool & Value   ) const; 
-	virtual bool Load   ( int Index, ULONG & Value  ) const;
-	virtual bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    virtual bool Load   ( int Index, bool & Value   ) const;
+    virtual bool Load   ( int Index, uint32_t & Value  ) const;
+    virtual bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	virtual void LoadDefault ( int Index, bool & Value   ) const; 
-	virtual void LoadDefault ( int Index, ULONG & Value  ) const; 
-	virtual void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    virtual void LoadDefault ( int Index, bool & Value   ) const;
+    virtual void LoadDefault ( int Index, uint32_t & Value  ) const;
+    virtual void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	virtual void Save   ( int Index, bool Value ); 
-	virtual void Save   ( int Index, ULONG Value ); 
-	virtual void Save   ( int Index, const stdstr & Value );
-	virtual void Save   ( int Index, const char * Value );
+    //Update the settings
+    virtual void Save   ( int Index, bool Value );
+    virtual void Save   ( int Index, uint32_t Value );
+    virtual void Save   ( int Index, const stdstr & Value );
+    virtual void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	virtual void Delete ( int Index ); 
+    // Delete the setting
+    virtual void Delete ( int Index );
+
+private:
+    CSettingTypeSelectedDirectory(void);                                              // Disable default constructor
+    CSettingTypeSelectedDirectory(const CSettingTypeSelectedDirectory&);              // Disable copy constructor
+    CSettingTypeSelectedDirectory& operator=(const CSettingTypeSelectedDirectory&);   // Disable assignment
+
+    std::string m_Name;
+    SettingID m_InitialDir;
+    SettingID m_SelectedDir;
+    SettingID m_UseSelected;
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp b/Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp
index 46ee982dc..52dfd2a4c 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp
@@ -12,7 +12,7 @@
 #include "SettingsType-TempBool.h"
 
 CSettingTypeTempBool::CSettingTypeTempBool(bool initialValue) :
-	m_value(initialValue)
+    m_value(initialValue)
 {
 }
 
@@ -22,59 +22,59 @@ CSettingTypeTempBool::~CSettingTypeTempBool ( void )
 
 bool CSettingTypeTempBool::Load ( int /*Index*/, bool & Value ) const
 {
-	Value = m_value;
-	return true;
+    Value = m_value;
+    return true;
 }
 
-bool CSettingTypeTempBool::Load ( int /*Index*/, ULONG & /*Value*/ ) const
+bool CSettingTypeTempBool::Load ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 bool CSettingTypeTempBool::Load ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 //return the default values
 void CSettingTypeTempBool::LoadDefault ( int /*Index*/, bool & /*Value*/   ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeTempBool::LoadDefault ( int /*Index*/, ULONG & /*Value*/  ) const
+void CSettingTypeTempBool::LoadDefault ( int /*Index*/, uint32_t & /*Value*/  ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempBool::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempBool::Save ( int /*Index*/, bool Value )
 {
-	m_value = Value;
+    m_value = Value;
 }
 
-void CSettingTypeTempBool::Save ( int /*Index*/, ULONG /*Value*/ )
+void CSettingTypeTempBool::Save ( int /*Index*/, uint32_t /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempBool::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempBool::Save ( int /*Index*/, const char * /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempBool::Delete( int /*Index*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempBool.h b/Source/Project64/Settings/SettingType/SettingsType-TempBool.h
index 508ea5b14..67e4ca8eb 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-TempBool.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-TempBool.h
@@ -10,35 +10,41 @@
 ****************************************************************************/
 #pragma once
 
+#include "SettingsType-Base.h"
+
 class CSettingTypeTempBool :
-	public CSettingType
+    public CSettingType
 {
-	bool m_value;
-
 public:
-	CSettingTypeTempBool(bool initialValue );
-	~CSettingTypeTempBool();
+    CSettingTypeTempBool(bool initialValue );
+    ~CSettingTypeTempBool();
 
-	bool        IndexBasedSetting ( void ) const { return false; }
-	SettingType GetSettingType    ( void ) const { return SettingType_BoolVariable; }	
+    bool        IndexBasedSetting ( void ) const { return false; }
+    SettingType GetSettingType    ( void ) const { return SettingType_BoolVariable; }
 
-	//return the values
-	bool Load   ( int Index, bool & Value   ) const; 
-	bool Load   ( int Index, ULONG & Value  ) const;
-	bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    bool Load   ( int Index, bool & Value   ) const;
+    bool Load   ( int Index, uint32_t & Value  ) const;
+    bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	void LoadDefault ( int Index, bool & Value   ) const; 
-	void LoadDefault ( int Index, ULONG & Value  ) const; 
-	void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    void LoadDefault ( int Index, bool & Value   ) const;
+    void LoadDefault ( int Index, uint32_t & Value  ) const;
+    void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	void Save   ( int Index, bool Value ); 
-	void Save   ( int Index, ULONG Value ); 
-	void Save   ( int Index, const stdstr & Value );
-	void Save   ( int Index, const char * Value );
+    //Update the settings
+    void Save   ( int Index, bool Value );
+    void Save   ( int Index, uint32_t Value );
+    void Save   ( int Index, const stdstr & Value );
+    void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	void Delete ( int Index ); 
+    // Delete the setting
+    void Delete ( int Index );
+
+private:
+    CSettingTypeTempBool(void);                                   // Disable default constructor
+    CSettingTypeTempBool(const CSettingTypeTempBool&);            // Disable copy constructor
+    CSettingTypeTempBool& operator=(const CSettingTypeTempBool&); // Disable assignment
+
+    bool m_value;
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp b/Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp
index 77a1a43af..d501ada61 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp
@@ -11,8 +11,8 @@
 #include "stdafx.h"
 #include "SettingsType-TempNumber.h"
 
-CSettingTypeTempNumber::CSettingTypeTempNumber(ULONG initialValue) :
-	m_value(initialValue)
+CSettingTypeTempNumber::CSettingTypeTempNumber(uint32_t initialValue) :
+    m_value(initialValue)
 {
 }
 
@@ -22,59 +22,59 @@ CSettingTypeTempNumber::~CSettingTypeTempNumber ( void )
 
 bool CSettingTypeTempNumber::Load ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return true;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return true;
 }
 
-bool CSettingTypeTempNumber::Load ( int /*Index*/, ULONG & Value ) const
+bool CSettingTypeTempNumber::Load ( int /*Index*/, uint32_t & Value ) const
 {
-	Value = m_value;
-	return false;
+    Value = m_value;
+    return false;
 }
 
 bool CSettingTypeTempNumber::Load ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 //return the default values
 void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
+void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempNumber::Save ( int /*Index*/, bool /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeTempNumber::Save ( int /*Index*/, ULONG Value )
+void CSettingTypeTempNumber::Save ( int /*Index*/, uint32_t Value )
 {
-	m_value = Value;
+    m_value = Value;
 }
 
 void CSettingTypeTempNumber::Save ( int /*Index*/, const stdstr & /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempNumber::Save ( int /*Index*/, const char * /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempNumber::Delete( int /*Index*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempNumber.h b/Source/Project64/Settings/SettingType/SettingsType-TempNumber.h
index af62a3b20..b9c72d7eb 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-TempNumber.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-TempNumber.h
@@ -10,36 +10,41 @@
 ****************************************************************************/
 #pragma once
 
+#include "SettingsType-Base.h"
+
 class CSettingTypeTempNumber :
-	public CSettingType
+    public CSettingType
 {
-
-	ULONG m_value;
-	
 public:
-	CSettingTypeTempNumber(ULONG initialValue);
-	~CSettingTypeTempNumber();
+    CSettingTypeTempNumber(uint32_t initialValue);
+    ~CSettingTypeTempNumber();
 
-	bool        IndexBasedSetting ( void ) const { return false; }
-	SettingType GetSettingType    ( void ) const { return SettingType_NumberVariable; }
+    bool        IndexBasedSetting ( void ) const { return false; }
+    SettingType GetSettingType    ( void ) const { return SettingType_NumberVariable; }
 
-	//return the values
-	bool Load   ( int Index, bool & Value   ) const; 
-	bool Load   ( int Index, ULONG & Value  ) const;
-	bool Load   ( int Index, stdstr & Value ) const; 
+    //return the values
+    bool Load   ( int Index, bool & Value   ) const;
+    bool Load   ( int Index, uint32_t & Value  ) const;
+    bool Load   ( int Index, stdstr & Value ) const;
 
-	//return the default values
-	void LoadDefault ( int Index, bool & Value   ) const; 
-	void LoadDefault ( int Index, ULONG & Value  ) const; 
-	void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the default values
+    void LoadDefault ( int Index, bool & Value   ) const;
+    void LoadDefault ( int Index, uint32_t & Value  ) const;
+    void LoadDefault ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	void Save   ( int Index, bool Value ); 
-	void Save   ( int Index, ULONG Value ); 
-	void Save   ( int Index, const stdstr & Value );
-	void Save   ( int Index, const char * Value );
+    //Update the settings
+    void Save   ( int Index, bool Value );
+    void Save   ( int Index, uint32_t Value );
+    void Save   ( int Index, const stdstr & Value );
+    void Save   ( int Index, const char * Value );
 
-	// Delete the setting
-	void Delete ( int Index ); 
+    // Delete the setting
+    void Delete ( int Index );
+
+private:
+    CSettingTypeTempNumber(void);                                     // Disable default constructor
+    CSettingTypeTempNumber(const CSettingTypeTempNumber&);            // Disable copy constructor
+    CSettingTypeTempNumber& operator=(const CSettingTypeTempNumber&); // Disable assignment
+
+    uint32_t m_value;
 };
-
diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempString.cpp b/Source/Project64/Settings/SettingType/SettingsType-TempString.cpp
index 0e93bf547..a102b890c 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-TempString.cpp
+++ b/Source/Project64/Settings/SettingType/SettingsType-TempString.cpp
@@ -11,8 +11,8 @@
 #include "stdafx.h"
 #include "SettingsType-TempString.h"
 
-CSettingTypeTempString::CSettingTypeTempString(LPCSTR initialValue) :
-	m_value(initialValue)
+CSettingTypeTempString::CSettingTypeTempString(const char * initialValue) :
+    m_value(initialValue)
 {
 }
 
@@ -20,62 +20,61 @@ CSettingTypeTempString::~CSettingTypeTempString ( void )
 {
 }
 
-
 bool CSettingTypeTempString::Load ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
-bool CSettingTypeTempString::Load ( int /*Index*/, ULONG & /*Value*/ ) const
+bool CSettingTypeTempString::Load ( int /*Index*/, uint32_t & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 bool CSettingTypeTempString::Load ( int /*Index*/, stdstr & Value ) const
 {
-	Value = m_value;
-	return true;
+    Value = m_value;
+    return true;
 }
 
 //return the default values
 void CSettingTypeTempString::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeTempString::LoadDefault ( int /*Index*/, ULONG & /*Value*/  ) const
+void CSettingTypeTempString::LoadDefault ( int /*Index*/, uint32_t & /*Value*/  ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempString::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempString::Save ( int /*Index*/, bool /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-void CSettingTypeTempString::Save ( int /*Index*/, ULONG /*Value*/ )
+void CSettingTypeTempString::Save ( int /*Index*/, uint32_t /*Value*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettingTypeTempString::Save ( int /*Index*/, const stdstr & Value )
 {
-	m_value = Value;
+    m_value = Value;
 }
 
 void CSettingTypeTempString::Save ( int /*Index*/, const char * Value )
 {
-	m_value = Value;
+    m_value = Value;
 }
 
 void CSettingTypeTempString::Delete( int /*Index*/ )
 {
-	Notify().BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempString.h b/Source/Project64/Settings/SettingType/SettingsType-TempString.h
index 588c7af50..f79db8e33 100644
--- a/Source/Project64/Settings/SettingType/SettingsType-TempString.h
+++ b/Source/Project64/Settings/SettingType/SettingsType-TempString.h
@@ -10,36 +10,41 @@
 ****************************************************************************/
 #pragma once
 
+#include "SettingsType-Base.h"
+
 class CSettingTypeTempString :
-	public CSettingType
+    public CSettingType
 {
-
-	stdstr m_value;
-	
 public:
-	CSettingTypeTempString(LPCSTR initialValue);
-	~CSettingTypeTempString();
+    CSettingTypeTempString(const char * initialValue);
+    ~CSettingTypeTempString();
 
-	bool        IndexBasedSetting ( void ) const { return false; }
-	SettingType GetSettingType    ( void ) const { return SettingType_StringVariable; }
-	
-	//return the values
-	bool Load   ( int Index, bool & Value   ) const; 
-	bool Load   ( int Index, ULONG & Value  ) const;
-	bool Load   ( int Index, stdstr & Value ) const; 
+    bool        IndexBasedSetting ( void ) const { return false; }
+    SettingType GetSettingType    ( void ) const { return SettingType_StringVariable; }
 
-	//return the default values
-	void LoadDefault ( int Index, bool & Value   ) const; 
-	void LoadDefault ( int Index, ULONG & Value  ) const; 
-	void LoadDefault ( int Index, stdstr & Value ) const; 
+    //return the values
+    bool Load   ( int Index, bool & Value   ) const;
+    bool Load   ( int Index, uint32_t & Value  ) const;
+    bool Load   ( int Index, stdstr & Value ) const;
 
-	//Update the settings
-	void Save   ( int Index, bool Value ); 
-	void Save   ( int Index, ULONG Value ); 
-	void Save   ( int Index, const stdstr & Value );
-	void Save   ( int Index, const char * Value );
+    //return the default values
+    void LoadDefault ( int Index, bool & Value   ) const;
+    void LoadDefault ( int Index, uint32_t & Value  ) const;
+    void LoadDefault ( int Index, stdstr & Value ) const;
 
-	// Delete the setting
-	void Delete ( int Index ); 
+    //Update the settings
+    void Save   ( int Index, bool Value );
+    void Save   ( int Index, uint32_t Value );
+    void Save   ( int Index, const stdstr & Value );
+    void Save   ( int Index, const char * Value );
+
+    // Delete the setting
+    void Delete ( int Index );
+
+private:
+    CSettingTypeTempString(void);                                     // Disable default constructor
+    CSettingTypeTempString(const CSettingTypeTempString&);            // Disable copy constructor
+    CSettingTypeTempString& operator=(const CSettingTypeTempString&); // Disable assignment
+
+    stdstr m_value;
 };
-
diff --git a/Source/Project64/Settings/Settings Class.cpp b/Source/Project64/Settings/Settings Class.cpp
index a10494d3f..ac680db6a 100644
--- a/Source/Project64/Settings/Settings Class.cpp	
+++ b/Source/Project64/Settings/Settings Class.cpp	
@@ -29,1082 +29,1092 @@
 #include "SettingType/SettingsType-TempString.h"
 #include "SettingType/SettingsType-TempNumber.h"
 #include "SettingType/SettingsType-TempBool.h"
+#include "Settings Class.h"
+#include <Common/TraceDefs.h>
 
 CSettings * g_Settings = NULL;
 
 CSettings::CSettings() :
-	m_NextAutoSettingId(0x200000)
+    m_NextAutoSettingId(0x200000)
 {
 }
 
 CSettings::~CSettings()
 {
-	CSettingTypeApplication::CleanUp();
-	CSettingTypeRomDatabase::CleanUp();
-	CSettingTypeGame::CleanUp();
-	CSettingTypeCheats::CleanUp();
+    CSettingTypeApplication::CleanUp();
+    CSettingTypeRomDatabase::CleanUp();
+    CSettingTypeGame::CleanUp();
+    CSettingTypeCheats::CleanUp();
 
-	for (SETTING_MAP::iterator iter = m_SettingInfo.begin(); iter != m_SettingInfo.end(); iter++)
-	{
-		delete iter->second;
-	}
+    for (SETTING_MAP::iterator iter = m_SettingInfo.begin(); iter != m_SettingInfo.end(); iter++)
+    {
+        delete iter->second;
+    }
 
-	for (SETTING_CALLBACK::iterator cb_iter = m_Callback.begin(); cb_iter != m_Callback.end(); cb_iter++)
-	{
-
-		SETTING_CHANGED_CB * item = cb_iter->second;
-		while (item != NULL)
-		{
-			SETTING_CHANGED_CB * current_item = item;
-			item = item->Next;
-			delete current_item;
-		}
-	}
+    for (SETTING_CALLBACK::iterator cb_iter = m_Callback.begin(); cb_iter != m_Callback.end(); cb_iter++)
+    {
+        SETTING_CHANGED_CB * item = cb_iter->second;
+        while (item != NULL)
+        {
+            SETTING_CHANGED_CB * current_item = item;
+            item = item->Next;
+            delete current_item;
+        }
+    }
 }
 
 void CSettings::AddHandler ( SettingID TypeID, CSettingType * Handler )
 {
-	SETTING_MAP::_Pairib res = m_SettingInfo.insert(SETTING_MAP::value_type(TypeID,Handler));
-	if (!res.second)
-	{
-		delete res.first->second;
-		m_SettingInfo.erase(res.first);
-		res = m_SettingInfo.insert(SETTING_MAP::value_type(TypeID,Handler));
-		if (!res.second)
-		{
-			delete Handler;
-		}
-	}
+    SETTING_MAP::_Pairib res = m_SettingInfo.insert(SETTING_MAP::value_type(TypeID,Handler));
+    if (!res.second)
+    {
+        delete res.first->second;
+        m_SettingInfo.erase(res.first);
+        res = m_SettingInfo.insert(SETTING_MAP::value_type(TypeID,Handler));
+        if (!res.second)
+        {
+            delete Handler;
+        }
+    }
 }
 
 void CSettings::AddHowToHandleSetting ()
 {
-	//information - temp keys
-	AddHandler(Info_ShortCutsChanged,   new CSettingTypeTempBool(false));
+    //information - temp keys
+    AddHandler(Info_ShortCutsChanged,   new CSettingTypeTempBool(false));
 
+    //Support Files
+    AddHandler(SupportFile_Settings,           new CSettingTypeApplicationPath("","ConfigFile",SupportFile_SettingsDefault));
+    AddHandler(SupportFile_SettingsDefault,    new CSettingTypeRelativePath("Config","Project64.cfg"));
+    AddHandler(SupportFile_RomDatabase,        new CSettingTypeApplicationPath("","RomDatabase",SupportFile_RomDatabaseDefault));
+    AddHandler(SupportFile_RomDatabaseDefault, new CSettingTypeRelativePath("Config","Project64.rdb"));
+    AddHandler(SupportFile_Glide64RDB,         new CSettingTypeApplicationPath("","Glide64RDB",SupportFile_Glide64RDBDefault));
+    AddHandler(SupportFile_Glide64RDBDefault,  new CSettingTypeRelativePath("Config","Glide64.rdb"));
+    AddHandler(SupportFile_Cheats,             new CSettingTypeApplicationPath("","Cheats",SupportFile_CheatsDefault));
+    AddHandler(SupportFile_CheatsDefault,      new CSettingTypeRelativePath("Config","Project64.cht"));
+    AddHandler(SupportFile_Notes,              new CSettingTypeApplicationPath("","Notes",SupportFile_NotesDefault));
+    AddHandler(SupportFile_NotesDefault,       new CSettingTypeRelativePath("Config","Project64.rdn"));
+    AddHandler(SupportFile_ExtInfo,            new CSettingTypeApplicationPath("","ExtInfo",SupportFile_ExtInfoDefault));
+    AddHandler(SupportFile_ExtInfoDefault,     new CSettingTypeRelativePath("Config","Project64.rdx"));
+    AddHandler(SupportFile_ShortCuts,          new CSettingTypeApplicationPath("","ShortCuts",SupportFile_ShortCutsDefault));
+    AddHandler(SupportFile_ShortCutsDefault,   new CSettingTypeRelativePath("Config","Project64.sc3"));
+    AddHandler(SupportFile_RomListCache,       new CSettingTypeApplicationPath("","RomListCache",SupportFile_RomListCacheDefault));
+    AddHandler(SupportFile_RomListCacheDefault,new CSettingTypeRelativePath("Config","Project64.cache3"));
+    AddHandler(SupportFile_7zipCache,          new CSettingTypeApplicationPath("","7zipCache",SupportFile_7zipCacheDefault));
+    AddHandler(SupportFile_7zipCacheDefault,   new CSettingTypeRelativePath("Config","Project64.zcache"));
 
-	//Support Files
-	AddHandler(SupportFile_Settings,           new CSettingTypeApplicationPath("","ConfigFile",SupportFile_SettingsDefault));
-	AddHandler(SupportFile_SettingsDefault,    new CSettingTypeRelativePath("Config","Project64.cfg"));
-	AddHandler(SupportFile_RomDatabase,        new CSettingTypeApplicationPath("","RomDatabase",SupportFile_RomDatabaseDefault));
-	AddHandler(SupportFile_RomDatabaseDefault, new CSettingTypeRelativePath("Config","Project64.rdb"));
-	AddHandler(SupportFile_Glide64RDB,         new CSettingTypeApplicationPath("","Glide64RDB",SupportFile_Glide64RDBDefault));
-	AddHandler(SupportFile_Glide64RDBDefault,  new CSettingTypeRelativePath("Config","Glide64.rdb"));
-	AddHandler(SupportFile_Cheats,             new CSettingTypeApplicationPath("","Cheats",SupportFile_CheatsDefault));
-	AddHandler(SupportFile_CheatsDefault,      new CSettingTypeRelativePath("Config","Project64.cht"));
-	AddHandler(SupportFile_Notes,              new CSettingTypeApplicationPath("","Notes",SupportFile_NotesDefault));
-	AddHandler(SupportFile_NotesDefault,       new CSettingTypeRelativePath("Config","Project64.rdn"));
-	AddHandler(SupportFile_ExtInfo,            new CSettingTypeApplicationPath("","ExtInfo",SupportFile_ExtInfoDefault));
-	AddHandler(SupportFile_ExtInfoDefault,     new CSettingTypeRelativePath("Config","Project64.rdx"));
-	AddHandler(SupportFile_ShortCuts,          new CSettingTypeApplicationPath("","ShortCuts",SupportFile_ShortCutsDefault));
-	AddHandler(SupportFile_ShortCutsDefault,   new CSettingTypeRelativePath("Config","Project64.sc3"));
-	AddHandler(SupportFile_RomListCache,       new CSettingTypeApplicationPath("","RomListCache",SupportFile_RomListCacheDefault));
-	AddHandler(SupportFile_RomListCacheDefault,new CSettingTypeRelativePath("Config","Project64.cache3"));
-	AddHandler(SupportFile_7zipCache,          new CSettingTypeApplicationPath("","7zipCache",SupportFile_7zipCacheDefault));
-	AddHandler(SupportFile_7zipCacheDefault,   new CSettingTypeRelativePath("Config","Project64.zcache"));
-	
-	//AddHandler(SyncPluginDir,   new CSettingTypeRelativePath("SyncPlugin",""));
+    //AddHandler(SyncPluginDir,   new CSettingTypeRelativePath("SyncPlugin",""));
 
-	//Settings location
-	AddHandler(Setting_ApplicationName, new CSettingTypeTempString(""));
-	AddHandler(Setting_UseFromRegistry, new CSettingTypeApplication("Settings","Use Registry",(DWORD)false));
-	AddHandler(Setting_RdbEditor,       new CSettingTypeApplication("","Rdb Editor",          false));
-	AddHandler(Setting_PluginPageFirst, new CSettingTypeApplication("","Plugin Page First",   false));
-	AddHandler(Setting_DisableScrSaver, new CSettingTypeApplication("","Disable Screen Saver",(DWORD)true));
-	AddHandler(Setting_AutoSleep,       new CSettingTypeApplication("","Auto Sleep",          (DWORD)true));
-	AddHandler(Setting_AutoStart,       new CSettingTypeApplication("","Auto Start",          (DWORD)true));
-	AddHandler(Setting_AutoFullscreen,  new CSettingTypeApplication("","Auto Full Screen",    (DWORD)false));
-	AddHandler(Setting_AutoZipInstantSave,new CSettingTypeApplication("","Auto Zip Saves",    (DWORD)true));
-	AddHandler(Setting_EraseGameDefaults, new CSettingTypeApplication("","Erase on default",  (DWORD)true));
-	AddHandler(Setting_CheckEmuRunning, new CSettingTypeApplication("","Check Running",       (DWORD)true));
+    //Settings location
+    AddHandler(Setting_ApplicationName, new CSettingTypeTempString(""));
+    AddHandler(Setting_UseFromRegistry, new CSettingTypeApplication("Settings","Use Registry",(uint32_t)false));
+    AddHandler(Setting_RdbEditor,       new CSettingTypeApplication("","Rdb Editor",          false));
+    AddHandler(Setting_PluginPageFirst, new CSettingTypeApplication("","Plugin Page First",   false));
+    AddHandler(Setting_DisableScrSaver, new CSettingTypeApplication("","Disable Screen Saver",(uint32_t)true));
+    AddHandler(Setting_AutoSleep,       new CSettingTypeApplication("","Auto Sleep",          (uint32_t)true));
+    AddHandler(Setting_AutoStart,       new CSettingTypeApplication("","Auto Start",          (uint32_t)true));
+    AddHandler(Setting_AutoFullscreen,  new CSettingTypeApplication("","Auto Full Screen",    (uint32_t)false));
+    AddHandler(Setting_AutoZipInstantSave,new CSettingTypeApplication("","Auto Zip Saves",    (uint32_t)true));
+    AddHandler(Setting_EraseGameDefaults, new CSettingTypeApplication("","Erase on default",  (uint32_t)true));
+    AddHandler(Setting_CheckEmuRunning, new CSettingTypeApplication("","Check Running",       (uint32_t)true));
 
-	AddHandler(Setting_RememberCheats,  new CSettingTypeApplication("","Remember Cheats",     (DWORD)false));
-	AddHandler(Setting_CurrentLanguage, new CSettingTypeApplication("","Current Language",""));
-	AddHandler(Setting_LanguageDirDefault, new CSettingTypeRelativePath("Lang",""));
-	AddHandler(Setting_LanguageDir,     new CSettingTypeApplicationPath("Directory","Lang",Setting_LanguageDirDefault));
+    AddHandler(Setting_RememberCheats,  new CSettingTypeApplication("","Remember Cheats",     (uint32_t)false));
+    AddHandler(Setting_CurrentLanguage, new CSettingTypeApplication("","Current Language",""));
+    AddHandler(Setting_LanguageDirDefault, new CSettingTypeRelativePath("Lang",""));
+    AddHandler(Setting_LanguageDir,     new CSettingTypeApplicationPath("Directory","Lang",Setting_LanguageDirDefault));
 
-	AddHandler(Rdb_GoodName,            new CSettingTypeRomDatabase("Good Name",Game_GameName));
-	AddHandler(Rdb_SaveChip,            new CSettingTypeRDBSaveChip("Save Type",SaveChip_Auto));
+    AddHandler(Rdb_GoodName,            new CSettingTypeRomDatabase("Good Name",Game_GameName));
+    AddHandler(Rdb_SaveChip,            new CSettingTypeRDBSaveChip("Save Type",SaveChip_Auto));
 #ifdef _DEBUG
-	AddHandler(Rdb_CpuType,             new CSettingTypeRDBCpuType("CPU Type",CPU_SyncCores));
+    AddHandler(Rdb_CpuType,             new CSettingTypeRDBCpuType("CPU Type",CPU_SyncCores));
 #else
-	AddHandler(Rdb_CpuType,             new CSettingTypeRDBCpuType("CPU Type",CPU_Recompiler));
+    AddHandler(Rdb_CpuType,             new CSettingTypeRDBCpuType("CPU Type",CPU_Recompiler));
 #endif
-	AddHandler(Rdb_RDRamSize,           new CSettingTypeRDBRDRamSize("RDRAM Size",0x400000));
-	AddHandler(Rdb_CounterFactor,       new CSettingTypeRomDatabase("Counter Factor",2));
-	AddHandler(Rdb_UseTlb,              new CSettingTypeRDBYesNo("Use TLB",true));
-	AddHandler(Rdb_DelayDP,             new CSettingTypeRDBYesNo("Delay DP",true));
-	AddHandler(Rdb_DelaySi,             new CSettingTypeRDBYesNo("Delay SI",false));
-	AddHandler(Rdb_32Bit,               new CSettingTypeRDBYesNo("32bit",true));
-	AddHandler(Rdb_FastSP,              new CSettingTypeRDBYesNo("Fast SP",true));
-	AddHandler(Rdb_Status,              new CSettingTypeRomDatabase("Status","Unknown"));
-	AddHandler(Rdb_NotesCore,           new CSettingTypeRomDatabase("Core Note",""));
-	AddHandler(Rdb_NotesPlugin,         new CSettingTypeRomDatabase("Plugin Note",""));
+    AddHandler(Rdb_RDRamSize,           new CSettingTypeRDBRDRamSize("RDRAM Size",0x400000));
+    AddHandler(Rdb_CounterFactor,       new CSettingTypeRomDatabase("Counter Factor",2));
+    AddHandler(Rdb_UseTlb,              new CSettingTypeRDBYesNo("Use TLB",true));
+    AddHandler(Rdb_DelayDP,             new CSettingTypeRDBYesNo("Delay DP",true));
+    AddHandler(Rdb_DelaySi,             new CSettingTypeRDBYesNo("Delay SI",false));
+    AddHandler(Rdb_32Bit,               new CSettingTypeRDBYesNo("32bit",true));
+    AddHandler(Rdb_FastSP,              new CSettingTypeRDBYesNo("Fast SP",true));
+    AddHandler(Rdb_Status,              new CSettingTypeRomDatabase("Status","Unknown"));
+    AddHandler(Rdb_NotesCore,           new CSettingTypeRomDatabase("Core Note",""));
+    AddHandler(Rdb_NotesPlugin,         new CSettingTypeRomDatabase("Plugin Note",""));
 #ifdef _DEBUG
-	AddHandler(Rdb_FixedAudio,          new CSettingTypeRomDatabase("Fixed Audio",true));
+    AddHandler(Rdb_FixedAudio,          new CSettingTypeRomDatabase("Fixed Audio",true));
 #else
-	AddHandler(Rdb_FixedAudio,          new CSettingTypeRomDatabase("Fixed Audio",false));
+    AddHandler(Rdb_FixedAudio,          new CSettingTypeRomDatabase("Fixed Audio",false));
 #endif
-	AddHandler(Rdb_SyncViaAudio,        new CSettingTypeRomDatabase("Sync Audio",true));
-	AddHandler(Rdb_RspAudioSignal,      new CSettingTypeRDBYesNo("Audio Signal",false));
-	AddHandler(Rdb_TLB_VAddrStart,      new CSettingTypeRomDatabase("TLB: Vaddr Start",0));
-	AddHandler(Rdb_TLB_VAddrLen,        new CSettingTypeRomDatabase("TLB: Vaddr Len",0));
-	AddHandler(Rdb_TLB_PAddrStart,      new CSettingTypeRomDatabase("TLB: PAddr Start",0));
-	AddHandler(Rdb_UseHleGfx,           new CSettingTypeRomDatabase("HLE GFX",Plugin_UseHleGfx));
-	AddHandler(Rdb_UseHleAudio,         new CSettingTypeRomDatabase("HLE Audio",Plugin_UseHleAudio));
-	AddHandler(Rdb_LoadRomToMemory,     new CSettingTypeRomDatabase("Rom In Memory",false));	
-	AddHandler(Rdb_ScreenHertz,         new CSettingTypeRomDatabase("ScreenHertz",0));	
-	AddHandler(Rdb_FuncLookupMode,      new CSettingTypeRomDatabase("FuncFind",FuncFind_PhysicalLookup));	
-	AddHandler(Rdb_RegCache,            new CSettingTypeRDBYesNo("Reg Cache",true));	
-	AddHandler(Rdb_BlockLinking,        new CSettingTypeRDBOnOff("Linking",true));	
-	AddHandler(Rdb_SMM_Cache,           new CSettingTypeRomDatabase("SMM-Cache",true));
-	AddHandler(Rdb_SMM_StoreInstruc,    new CSettingTypeRomDatabase("SMM-StoreInstr",false));
-	AddHandler(Rdb_SMM_PIDMA,           new CSettingTypeRomDatabase("SMM-PI DMA",true));
-	AddHandler(Rdb_SMM_TLB,             new CSettingTypeRomDatabase("SMM-TLB",true));
-	AddHandler(Rdb_SMM_Protect,         new CSettingTypeRomDatabase("SMM-Protect",false));
-	AddHandler(Rdb_SMM_ValidFunc,       new CSettingTypeRomDatabase("SMM-FUNC",true));
-	AddHandler(Rdb_GameCheatFix,        new CSettingTypeRomDatabaseIndex("Cheat","",""));
-	AddHandler(Rdb_GameCheatFixPlugin,  new CSettingTypeRomDatabaseIndex("CheatPlugin","",""));
-	AddHandler(Rdb_ViRefreshRate,       new CSettingTypeRomDatabase("ViRefresh",1500));
-	AddHandler(Rdb_AiCountPerBytes,     new CSettingTypeRomDatabase("AiCountPerBytes",400));
-	
-	AddHandler(Game_IniKey,             new CSettingTypeTempString(""));
-	AddHandler(Game_GameName,           new CSettingTypeTempString(""));
-	AddHandler(Game_GoodName,           new CSettingTypeGame("Good Name",Rdb_GoodName));
-	AddHandler(Game_TempLoaded,         new CSettingTypeTempBool(false));
-	AddHandler(Game_SystemType,         new CSettingTypeTempNumber(SYSTEM_NTSC));
-	AddHandler(Game_EditPlugin_Gfx,     new CSettingTypeGame("Plugin-Gfx",Default_None));
-	AddHandler(Game_EditPlugin_Audio,   new CSettingTypeGame("Plugin-Audio",Default_None));
-	AddHandler(Game_EditPlugin_Contr,   new CSettingTypeGame("Plugin-Controller",Default_None));
-	AddHandler(Game_EditPlugin_RSP,     new CSettingTypeGame("Plugin-RSP",Default_None));
-	AddHandler(Game_Plugin_Gfx,         new CSettingTypeGame("Plugin-Gfx",Plugin_GFX_Current));
-	AddHandler(Game_Plugin_Audio,       new CSettingTypeGame("Plugin-Audio",Plugin_AUDIO_Current));
-	AddHandler(Game_Plugin_Controller,  new CSettingTypeGame("Plugin-Controller",Plugin_CONT_Current));
-	AddHandler(Game_Plugin_RSP,         new CSettingTypeGame("Plugin-RSP",Plugin_RSP_Current));
-	AddHandler(Game_SaveChip,           new CSettingTypeGame("SaveChip",Rdb_SaveChip));
-	AddHandler(Game_CpuType,            new CSettingTypeGame("CpuType",Rdb_CpuType));
-	AddHandler(Game_LastSaveSlot,       new CSettingTypeGame("Last Used Save Slot",(DWORD)0));
-	AddHandler(Game_FixedAudio,         new CSettingTypeGame("Fixed Audio",Rdb_FixedAudio));
-	AddHandler(Game_RDRamSize,          new CSettingTypeGame("RDRamSize",Rdb_RDRamSize));
-	AddHandler(Game_CounterFactor,      new CSettingTypeGame("Counter Factor",Rdb_CounterFactor));
-	AddHandler(Game_UseTlb,             new CSettingTypeGame("Use TLB",Rdb_UseTlb));
-	AddHandler(Game_DelayDP,            new CSettingTypeGame("Delay DP",Rdb_DelayDP));
-	AddHandler(Game_DelaySI,            new CSettingTypeGame("Delay SI",Rdb_DelaySi));
-	AddHandler(Game_RspAudioSignal,     new CSettingTypeGame("Audio Signal",Rdb_RspAudioSignal));
-	AddHandler(Game_32Bit,              new CSettingTypeGame("32bit",Rdb_32Bit));
-	AddHandler(Game_FastSP,             new CSettingTypeGame("Fast SP",Rdb_FastSP));
-	AddHandler(Game_CurrentSaveState,   new CSettingTypeTempNumber(0));
-	AddHandler(Game_SyncViaAudio,       new CSettingTypeGame("Sync Audio",Rdb_SyncViaAudio));
-	AddHandler(Game_UseHleGfx,          new CSettingTypeGame("HLE GFX",Rdb_UseHleGfx));
-	AddHandler(Game_UseHleAudio,        new CSettingTypeGame("HLE Audio",Rdb_UseHleAudio));
-	AddHandler(Game_LoadRomToMemory,    new CSettingTypeGame("Rom In Memory",Rdb_LoadRomToMemory));
-	AddHandler(Game_ScreenHertz,        new CSettingTypeGame("ScreenHertz",Rdb_ScreenHertz));
-	AddHandler(Game_FuncLookupMode,     new CSettingTypeGame("FuncFind",Rdb_FuncLookupMode));
-	AddHandler(Game_RegCache,           new CSettingTypeGame("Reg Cache",Rdb_RegCache));
-	AddHandler(Game_BlockLinking,       new CSettingTypeGame("Linking",Rdb_BlockLinking));	
-	AddHandler(Game_SMM_StoreInstruc,   new CSettingTypeGame("SMM-StoreInst",Rdb_SMM_StoreInstruc));
-	AddHandler(Game_SMM_Cache,          new CSettingTypeGame("SMM-Cache",Rdb_SMM_Cache));
-	AddHandler(Game_SMM_PIDMA,          new CSettingTypeGame("SMM-PI DMA",Rdb_SMM_PIDMA));
-	AddHandler(Game_SMM_TLB,            new CSettingTypeGame("SMM-TLB",Rdb_SMM_TLB));
-	AddHandler(Game_SMM_Protect,        new CSettingTypeGame("SMM-Protect",Rdb_SMM_Protect));
-	AddHandler(Game_SMM_ValidFunc,      new CSettingTypeGame("SMM-FUNC",Rdb_SMM_ValidFunc));
-	AddHandler(Game_ViRefreshRate,      new CSettingTypeGame("ViRefresh",Rdb_ViRefreshRate));
-	AddHandler(Game_AiCountPerBytes,    new CSettingTypeGame("AiCountPerBytes",Rdb_AiCountPerBytes));
+    AddHandler(Rdb_SyncViaAudio,        new CSettingTypeRomDatabase("Sync Audio",true));
+    AddHandler(Rdb_RspAudioSignal,      new CSettingTypeRDBYesNo("Audio Signal",false));
+    AddHandler(Rdb_TLB_VAddrStart,      new CSettingTypeRomDatabase("TLB: Vaddr Start",0));
+    AddHandler(Rdb_TLB_VAddrLen,        new CSettingTypeRomDatabase("TLB: Vaddr Len",0));
+    AddHandler(Rdb_TLB_PAddrStart,      new CSettingTypeRomDatabase("TLB: PAddr Start",0));
+    AddHandler(Rdb_UseHleGfx,           new CSettingTypeRomDatabase("HLE GFX",Plugin_UseHleGfx));
+    AddHandler(Rdb_UseHleAudio,         new CSettingTypeRomDatabase("HLE Audio",Plugin_UseHleAudio));
+    AddHandler(Rdb_LoadRomToMemory,     new CSettingTypeRomDatabase("Rom In Memory",false));
+    AddHandler(Rdb_ScreenHertz,         new CSettingTypeRomDatabase("ScreenHertz",0));
+    AddHandler(Rdb_FuncLookupMode,      new CSettingTypeRomDatabase("FuncFind",FuncFind_PhysicalLookup));
+    AddHandler(Rdb_RegCache,            new CSettingTypeRDBYesNo("Reg Cache",true));
+    AddHandler(Rdb_BlockLinking,        new CSettingTypeRDBOnOff("Linking",true));
+    AddHandler(Rdb_SMM_Cache,           new CSettingTypeRomDatabase("SMM-Cache",true));
+    AddHandler(Rdb_SMM_StoreInstruc,    new CSettingTypeRomDatabase("SMM-StoreInstr",false));
+    AddHandler(Rdb_SMM_PIDMA,           new CSettingTypeRomDatabase("SMM-PI DMA",true));
+    AddHandler(Rdb_SMM_TLB,             new CSettingTypeRomDatabase("SMM-TLB",true));
+    AddHandler(Rdb_SMM_Protect,         new CSettingTypeRomDatabase("SMM-Protect",false));
+    AddHandler(Rdb_SMM_ValidFunc,       new CSettingTypeRomDatabase("SMM-FUNC",true));
+    AddHandler(Rdb_GameCheatFix,        new CSettingTypeRomDatabaseIndex("Cheat","",""));
+    AddHandler(Rdb_GameCheatFixPlugin,  new CSettingTypeRomDatabaseIndex("CheatPlugin","",""));
+    AddHandler(Rdb_ViRefreshRate,       new CSettingTypeRomDatabase("ViRefresh",1500));
+    AddHandler(Rdb_AiCountPerBytes,     new CSettingTypeRomDatabase("AiCountPerBytes",400));
+    AddHandler(Rdb_AudioResetOnLoad,    new CSettingTypeRDBYesNo("AudioResetOnLoad", false));
+    AddHandler(Rdb_AllowROMWrites,      new CSettingTypeRDBYesNo("AllowROMWrites", false));
+    AddHandler(Rdb_CRC_Recalc,          new CSettingTypeRDBYesNo("CRC-Recalc", false));
 
-	//User Interface
-	AddHandler(UserInterface_BasicMode,        new CSettingTypeApplication("","Basic Mode",          (DWORD)true));
-	AddHandler(UserInterface_ShowCPUPer,       new CSettingTypeApplication("","Display CPU Usage",   (DWORD)false));
-	AddHandler(UserInterface_DisplayFrameRate, new CSettingTypeApplication("","Display Frame Rate",  (DWORD)true));
-	AddHandler(UserInterface_InFullScreen,     new CSettingTypeTempBool(false));
-	AddHandler(UserInterface_FrameDisplayType, new CSettingTypeApplication("","Frame Rate Display Type", (DWORD)FR_VIs));
-	AddHandler(UserInterface_MainWindowTop,    new CSettingTypeApplication("Main Window","Top"        ,Default_None));
-	AddHandler(UserInterface_MainWindowLeft,   new CSettingTypeApplication("Main Window","Left"       ,Default_None));
-	AddHandler(UserInterface_AlwaysOnTop,      new CSettingTypeApplication("","Always on top",       (DWORD)false));
+    AddHandler(Game_IniKey,             new CSettingTypeTempString(""));
+    AddHandler(Game_GameName,           new CSettingTypeTempString(""));
+    AddHandler(Game_GoodName,           new CSettingTypeGame("Good Name",Rdb_GoodName));
+    AddHandler(Game_TempLoaded,         new CSettingTypeTempBool(false));
+    AddHandler(Game_SystemType,         new CSettingTypeTempNumber(SYSTEM_NTSC));
+    AddHandler(Game_EditPlugin_Gfx,     new CSettingTypeGame("Plugin-Gfx",Default_None));
+    AddHandler(Game_EditPlugin_Audio,   new CSettingTypeGame("Plugin-Audio",Default_None));
+    AddHandler(Game_EditPlugin_Contr,   new CSettingTypeGame("Plugin-Controller",Default_None));
+    AddHandler(Game_EditPlugin_RSP,     new CSettingTypeGame("Plugin-RSP",Default_None));
+    AddHandler(Game_Plugin_Gfx,         new CSettingTypeGame("Plugin-Gfx",Plugin_GFX_Current));
+    AddHandler(Game_Plugin_Audio,       new CSettingTypeGame("Plugin-Audio",Plugin_AUDIO_Current));
+    AddHandler(Game_Plugin_Controller,  new CSettingTypeGame("Plugin-Controller",Plugin_CONT_Current));
+    AddHandler(Game_Plugin_RSP,         new CSettingTypeGame("Plugin-RSP",Plugin_RSP_Current));
+    AddHandler(Game_SaveChip,           new CSettingTypeGame("SaveChip",Rdb_SaveChip));
+    AddHandler(Game_CpuType,            new CSettingTypeGame("CpuType",Rdb_CpuType));
+    AddHandler(Game_LastSaveSlot,       new CSettingTypeGame("Last Used Save Slot",(uint32_t)0));
+    AddHandler(Game_FixedAudio,         new CSettingTypeGame("Fixed Audio",Rdb_FixedAudio));
+    AddHandler(Game_RDRamSize,          new CSettingTypeGame("RDRamSize",Rdb_RDRamSize));
+    AddHandler(Game_CounterFactor,      new CSettingTypeGame("Counter Factor",Rdb_CounterFactor));
+    AddHandler(Game_UseTlb,             new CSettingTypeGame("Use TLB",Rdb_UseTlb));
+    AddHandler(Game_DelayDP,            new CSettingTypeGame("Delay DP",Rdb_DelayDP));
+    AddHandler(Game_DelaySI,            new CSettingTypeGame("Delay SI",Rdb_DelaySi));
+    AddHandler(Game_RspAudioSignal,     new CSettingTypeGame("Audio Signal",Rdb_RspAudioSignal));
+    AddHandler(Game_32Bit,              new CSettingTypeGame("32bit",Rdb_32Bit));
+    AddHandler(Game_FastSP,             new CSettingTypeGame("Fast SP",Rdb_FastSP));
+    AddHandler(Game_CurrentSaveState,   new CSettingTypeTempNumber(0));
+    AddHandler(Game_SyncViaAudio,       new CSettingTypeGame("Sync Audio",Rdb_SyncViaAudio));
+    AddHandler(Game_UseHleGfx,          new CSettingTypeGame("HLE GFX",Rdb_UseHleGfx));
+    AddHandler(Game_UseHleAudio,        new CSettingTypeGame("HLE Audio",Rdb_UseHleAudio));
+    AddHandler(Game_LoadRomToMemory,    new CSettingTypeGame("Rom In Memory",Rdb_LoadRomToMemory));
+    AddHandler(Game_ScreenHertz,        new CSettingTypeGame("ScreenHertz",Rdb_ScreenHertz));
+    AddHandler(Game_FuncLookupMode,     new CSettingTypeGame("FuncFind",Rdb_FuncLookupMode));
+    AddHandler(Game_RegCache,           new CSettingTypeGame("Reg Cache",Rdb_RegCache));
+    AddHandler(Game_BlockLinking,       new CSettingTypeGame("Linking",Rdb_BlockLinking));
+    AddHandler(Game_SMM_StoreInstruc,   new CSettingTypeGame("SMM-StoreInst",Rdb_SMM_StoreInstruc));
+    AddHandler(Game_SMM_Cache,          new CSettingTypeGame("SMM-Cache",Rdb_SMM_Cache));
+    AddHandler(Game_SMM_PIDMA,          new CSettingTypeGame("SMM-PI DMA",Rdb_SMM_PIDMA));
+    AddHandler(Game_SMM_TLB,            new CSettingTypeGame("SMM-TLB",Rdb_SMM_TLB));
+    AddHandler(Game_SMM_Protect,        new CSettingTypeGame("SMM-Protect",Rdb_SMM_Protect));
+    AddHandler(Game_SMM_ValidFunc,      new CSettingTypeGame("SMM-FUNC",Rdb_SMM_ValidFunc));
+    AddHandler(Game_ViRefreshRate,      new CSettingTypeGame("ViRefresh",Rdb_ViRefreshRate));
+    AddHandler(Game_AiCountPerBytes,    new CSettingTypeGame("AiCountPerBytes",Rdb_AiCountPerBytes));
+    AddHandler(Game_AudioResetOnLoad,   new CSettingTypeGame("AudioResetOnLoad", Rdb_AudioResetOnLoad));
+    AddHandler(Game_AllowROMWrites,     new CSettingTypeGame("AllowROMWrites", Rdb_AllowROMWrites));
+    AddHandler(Game_CRC_Recalc,         new CSettingTypeGame("CRC-Recalc", Rdb_CRC_Recalc));
 
-	AddHandler(RomBrowser_Enabled,             new CSettingTypeApplication("Rom Browser","Rom Browser",true));
-	AddHandler(RomBrowser_ColoumnsChanged,     new CSettingTypeTempBool(false));
-	AddHandler(RomBrowser_Top,                 new CSettingTypeApplication("Rom Browser","Top"        ,Default_None));
-	AddHandler(RomBrowser_Left,                new CSettingTypeApplication("Rom Browser","Left"       ,Default_None));
-	AddHandler(RomBrowser_Width,               new CSettingTypeApplication("Rom Browser","Width",     (DWORD)640));
-	AddHandler(RomBrowser_Height,              new CSettingTypeApplication("Rom Browser","Height",    (DWORD)480));
-	AddHandler(RomBrowser_PosIndex,            new CSettingTypeApplicationIndex("Rom Browser\\Field Pos","Field",Default_None));
-	AddHandler(RomBrowser_WidthIndex,          new CSettingTypeApplicationIndex("Rom Browser\\Field Width","Field",Default_None));
-	AddHandler(RomBrowser_SortFieldIndex,      new CSettingTypeApplicationIndex("Rom Browser", "Sort Field",  Default_None));
-	AddHandler(RomBrowser_SortAscendingIndex,  new CSettingTypeApplicationIndex("Rom Browser", "Sort Ascending",  Default_None));
-	AddHandler(RomBrowser_Recursive,           new CSettingTypeApplication("Rom Browser","Recursive", false));
-	AddHandler(RomBrowser_Maximized,           new CSettingTypeApplication("Rom Browser","Maximized", false));
+    //User Interface
+    AddHandler(UserInterface_BasicMode,        new CSettingTypeApplication("","Basic Mode",          (uint32_t)true));
+    AddHandler(UserInterface_ShowCPUPer,       new CSettingTypeApplication("","Display CPU Usage",   (uint32_t)false));
+    AddHandler(UserInterface_DisplayFrameRate, new CSettingTypeApplication("","Display Frame Rate",  (uint32_t)true));
+    AddHandler(UserInterface_InFullScreen,     new CSettingTypeTempBool(false));
+    AddHandler(UserInterface_FrameDisplayType, new CSettingTypeApplication("","Frame Rate Display Type", (uint32_t)FR_VIs));
+    AddHandler(UserInterface_MainWindowTop,    new CSettingTypeApplication("Main Window","Top"        ,Default_None));
+    AddHandler(UserInterface_MainWindowLeft,   new CSettingTypeApplication("Main Window","Left"       ,Default_None));
+    AddHandler(UserInterface_AlwaysOnTop,      new CSettingTypeApplication("","Always on top",       (uint32_t)false));
 
-	AddHandler(Directory_RecentGameDirCount,   new CSettingTypeApplication("","Remembered Rom Dirs",(DWORD)10));
-	AddHandler(Directory_RecentGameDirIndex,   new CSettingTypeApplicationIndex("Recent Dir","Recent Dir",Default_None));
+    AddHandler(RomBrowser_Enabled,             new CSettingTypeApplication("Rom Browser","Rom Browser",true));
+    AddHandler(RomBrowser_ColoumnsChanged,     new CSettingTypeTempBool(false));
+    AddHandler(RomBrowser_Top,                 new CSettingTypeApplication("Rom Browser","Top"        ,Default_None));
+    AddHandler(RomBrowser_Left,                new CSettingTypeApplication("Rom Browser","Left"       ,Default_None));
+    AddHandler(RomBrowser_Width,               new CSettingTypeApplication("Rom Browser","Width",     (uint32_t)640));
+    AddHandler(RomBrowser_Height,              new CSettingTypeApplication("Rom Browser","Height",    (uint32_t)480));
+    AddHandler(RomBrowser_PosIndex,            new CSettingTypeApplicationIndex("Rom Browser\\Field Pos","Field",Default_None));
+    AddHandler(RomBrowser_WidthIndex,          new CSettingTypeApplicationIndex("Rom Browser\\Field Width","Field",Default_None));
+    AddHandler(RomBrowser_SortFieldIndex,      new CSettingTypeApplicationIndex("Rom Browser", "Sort Field",  Default_None));
+    AddHandler(RomBrowser_SortAscendingIndex,  new CSettingTypeApplicationIndex("Rom Browser", "Sort Ascending",  Default_None));
+    AddHandler(RomBrowser_Recursive,           new CSettingTypeApplication("Rom Browser","Recursive", false));
+    AddHandler(RomBrowser_Maximized,           new CSettingTypeApplication("Rom Browser","Maximized", false));
 
-	//Directory_Game,
-	AddHandler(Directory_Game,                 new CSettingTypeSelectedDirectory("Dir:Game",Directory_GameInitial,Directory_GameSelected,Directory_GameUseSelected));
-	AddHandler(Directory_GameInitial,          new CSettingTypeRelativePath("Game Directory",""));
-	AddHandler(Directory_GameSelected,         new CSettingTypeApplication("Directory","Game",Directory_GameInitial));
-	AddHandler(Directory_GameUseSelected,      new CSettingTypeApplication("Directory","Game - Use Selected",false));
+    AddHandler(Directory_RecentGameDirCount,   new CSettingTypeApplication("","Remembered Rom Dirs",(uint32_t)10));
+    AddHandler(Directory_RecentGameDirIndex,   new CSettingTypeApplicationIndex("Recent Dir","Recent Dir",Default_None));
 
-	AddHandler(Directory_Plugin,               new CSettingTypeSelectedDirectory("Dir:Plugin",Directory_PluginInitial,Directory_PluginSelected,Directory_PluginUseSelected));
-	AddHandler(Directory_PluginInitial,        new CSettingTypeRelativePath("Plugin",""));
-	AddHandler(Directory_PluginSelected,       new CSettingTypeApplicationPath("Directory","Plugin",Directory_PluginInitial));
-	AddHandler(Directory_PluginUseSelected,    new CSettingTypeApplication("Directory","Plugin - Use Selected",false));
-	AddHandler(Directory_PluginSync,           new CSettingTypeRelativePath("SyncPlugin",""));
-	
-	AddHandler(Directory_SnapShot,             new CSettingTypeSelectedDirectory("Dir:Snapshot",Directory_SnapShotInitial,Directory_SnapShotSelected,Directory_SnapShotUseSelected));
-	AddHandler(Directory_SnapShotInitial,      new CSettingTypeRelativePath("Screenshots",""));
-	AddHandler(Directory_SnapShotSelected,     new CSettingTypeApplicationPath("Directory","Snap Shot",Directory_SnapShotInitial));
-	AddHandler(Directory_SnapShotUseSelected,  new CSettingTypeApplication("Directory","Snap Shot - Use Selected",false));
+    //Directory_Game,
+    AddHandler(Directory_Game,                 new CSettingTypeSelectedDirectory("Dir:Game",Directory_GameInitial,Directory_GameSelected,Directory_GameUseSelected));
+    AddHandler(Directory_GameInitial,          new CSettingTypeRelativePath("Game Directory",""));
+    AddHandler(Directory_GameSelected,         new CSettingTypeApplication("Directory","Game",Directory_GameInitial));
+    AddHandler(Directory_GameUseSelected,      new CSettingTypeApplication("Directory","Game - Use Selected",false));
 
-	AddHandler(Directory_NativeSave,           new CSettingTypeSelectedDirectory("Dir:NativeSave",Directory_NativeSaveInitial,Directory_NativeSaveSelected,Directory_NativeSaveUseSelected));
-	AddHandler(Directory_NativeSaveInitial,    new CSettingTypeRelativePath("Save",""));
-	AddHandler(Directory_NativeSaveSelected,   new CSettingTypeApplicationPath("Directory","Save",Directory_NativeSaveInitial));
-	AddHandler(Directory_NativeSaveUseSelected,new CSettingTypeApplication("Directory","Save - Use Selected",false));
+    AddHandler(Directory_Plugin,               new CSettingTypeSelectedDirectory("Dir:Plugin",Directory_PluginInitial,Directory_PluginSelected,Directory_PluginUseSelected));
+#ifdef _M_IX86
+    AddHandler(Directory_PluginInitial,        new CSettingTypeRelativePath("Plugin", ""));
+    AddHandler(Directory_PluginSelected,       new CSettingTypeApplicationPath("Directory","Plugin",Directory_PluginInitial));
+    AddHandler(Directory_PluginUseSelected,    new CSettingTypeApplication("Directory","Plugin - Use Selected",false));
+    AddHandler(Directory_PluginSync,           new CSettingTypeRelativePath("SyncPlugin",""));
+#else
+    AddHandler(Directory_PluginInitial, new CSettingTypeRelativePath("Plugin64", ""));
+    AddHandler(Directory_PluginSelected, new CSettingTypeApplicationPath("Directory", "Plugin64", Directory_PluginInitial));
+    AddHandler(Directory_PluginUseSelected, new CSettingTypeApplication("Directory", "Plugin - Use Selected", false));
+    AddHandler(Directory_PluginSync, new CSettingTypeRelativePath("SyncPlugin64", ""));
+#endif
 
-	AddHandler(Directory_InstantSave,           new CSettingTypeSelectedDirectory("Dir:InstantSave",Directory_InstantSaveInitial,Directory_InstantSaveSelected,Directory_InstantSaveUseSelected));
-	AddHandler(Directory_InstantSaveInitial,    new CSettingTypeRelativePath("Save",""));
-	AddHandler(Directory_InstantSaveSelected,   new CSettingTypeApplicationPath("Directory","Instant Save",Directory_InstantSaveInitial));
-	AddHandler(Directory_InstantSaveUseSelected,new CSettingTypeApplication("Directory","Instant Save - Use Selected",false));
+    AddHandler(Directory_SnapShot,             new CSettingTypeSelectedDirectory("Dir:Snapshot",Directory_SnapShotInitial,Directory_SnapShotSelected,Directory_SnapShotUseSelected));
+    AddHandler(Directory_SnapShotInitial,      new CSettingTypeRelativePath("Screenshots",""));
+    AddHandler(Directory_SnapShotSelected,     new CSettingTypeApplicationPath("Directory","Snap Shot",Directory_SnapShotInitial));
+    AddHandler(Directory_SnapShotUseSelected,  new CSettingTypeApplication("Directory","Snap Shot - Use Selected",false));
 
-	AddHandler(Directory_Texture,               new CSettingTypeSelectedDirectory("Dir:Texture",Directory_TextureInitial,Directory_TextureSelected,Directory_TextureUseSelected));
-	AddHandler(Directory_TextureInitial,        new CSettingTypeRelativePath("Textures",""));
-	AddHandler(Directory_TextureSelected,       new CSettingTypeApplicationPath("Directory","Texture Dir",Directory_InstantSaveInitial));
-	AddHandler(Directory_TextureUseSelected,    new CSettingTypeApplication("Directory","Texture Dir - Use Selected",false));
+    AddHandler(Directory_NativeSave,           new CSettingTypeSelectedDirectory("Dir:NativeSave",Directory_NativeSaveInitial,Directory_NativeSaveSelected,Directory_NativeSaveUseSelected));
+    AddHandler(Directory_NativeSaveInitial,    new CSettingTypeRelativePath("Save",""));
+    AddHandler(Directory_NativeSaveSelected,   new CSettingTypeApplicationPath("Directory","Save",Directory_NativeSaveInitial));
+    AddHandler(Directory_NativeSaveUseSelected,new CSettingTypeApplication("Directory","Save - Use Selected",false));
 
-	AddHandler(Directory_LastSave,              new CSettingTypeApplication("Directory","Last Save Directory",    Directory_InstantSave));
+    AddHandler(Directory_InstantSave,           new CSettingTypeSelectedDirectory("Dir:InstantSave",Directory_InstantSaveInitial,Directory_InstantSaveSelected,Directory_InstantSaveUseSelected));
+    AddHandler(Directory_InstantSaveInitial,    new CSettingTypeRelativePath("Save",""));
+    AddHandler(Directory_InstantSaveSelected,   new CSettingTypeApplicationPath("Directory","Instant Save",Directory_InstantSaveInitial));
+    AddHandler(Directory_InstantSaveUseSelected,new CSettingTypeApplication("Directory","Instant Save - Use Selected",false));
 
-	AddHandler(GameRunning_LoadingInProgress,  new CSettingTypeTempBool(false));
-	AddHandler(GameRunning_CPU_Running,        new CSettingTypeTempBool(false));
-	AddHandler(GameRunning_CPU_Paused,         new CSettingTypeTempBool(false));
-	AddHandler(GameRunning_CPU_PausedType,     new CSettingTypeTempNumber(Default_None));
-	AddHandler(GameRunning_InstantSaveFile,    new CSettingTypeTempString(""));
-	AddHandler(GameRunning_LimitFPS,           new CSettingTypeTempBool(true));
-	AddHandler(GameRunning_ScreenHertz,        new CSettingTypeTempNumber(60));
+    AddHandler(Directory_Texture,               new CSettingTypeSelectedDirectory("Dir:Texture",Directory_TextureInitial,Directory_TextureSelected,Directory_TextureUseSelected));
+    AddHandler(Directory_TextureInitial,        new CSettingTypeRelativePath("Textures",""));
+    AddHandler(Directory_TextureSelected,       new CSettingTypeApplicationPath("Directory","Texture Dir",Directory_InstantSaveInitial));
+    AddHandler(Directory_TextureUseSelected,    new CSettingTypeApplication("Directory","Texture Dir - Use Selected",false));
 
-	AddHandler(File_RecentGameFileCount,       new CSettingTypeApplication("","Remembered Rom Files",(DWORD)10));
-	AddHandler(File_RecentGameFileIndex,       new CSettingTypeApplicationIndex("Recent File","Recent Rom",Default_None));
+    AddHandler(Directory_LastSave,              new CSettingTypeApplication("Directory","Last Save Directory", Directory_InstantSave));
 
-	AddHandler(Debugger_Enabled,                new CSettingTypeApplication("Debugger","Debugger",false));
-	AddHandler(Debugger_ShowTLBMisses,          new CSettingTypeApplication("Debugger","Show TLB Misses",false));
-	AddHandler(Debugger_ShowUnhandledMemory,    new CSettingTypeApplication("Debugger","Show Unhandled Memory",false));
-	AddHandler(Debugger_ShowPifErrors,          new CSettingTypeApplication("Debugger","Show Pif Errors",false));
-	AddHandler(Debugger_DisableGameFixes,       new CSettingTypeApplication("Debugger","Disable Game Fixes",false));
-	AddHandler(Debugger_ShowDListAListCount,    new CSettingTypeApplication("Debugger","Show Dlist Alist Count",false));
-	AddHandler(Debugger_ShowRecompMemSize,      new CSettingTypeApplication("Debugger","Show Recompiler Memory size",false));
-	AddHandler(Debugger_ShowDivByZero,          new CSettingTypeApplication("Debugger","Show Div by zero",false));
-	AddHandler(Debugger_GenerateDebugLog,       new CSettingTypeApplication("Debugger","Generate Debug Code",false));
-	AddHandler(Debugger_ProfileCode,            new CSettingTypeApplication("Debugger","Profile Code",        (DWORD)false));
-	AddHandler(Debugger_AppLogLevel,            new CSettingTypeApplication("Logging","Log Level",(DWORD)TraceError));
-	AddHandler(Debugger_AppLogFlush,            new CSettingTypeApplication("Logging","Log Auto Flush",(DWORD)false));
-	AddHandler(Debugger_GenerateLogFiles,       new CSettingTypeApplication("Debugger","Generate Log Files", false));
+    AddHandler(GameRunning_LoadingInProgress,  new CSettingTypeTempBool(false));
+    AddHandler(GameRunning_CPU_Running,        new CSettingTypeTempBool(false));
+    AddHandler(GameRunning_CPU_Paused,         new CSettingTypeTempBool(false));
+    AddHandler(GameRunning_CPU_PausedType,     new CSettingTypeTempNumber(Default_None));
+    AddHandler(GameRunning_InstantSaveFile,    new CSettingTypeTempString(""));
+    AddHandler(GameRunning_LimitFPS,           new CSettingTypeTempBool(true));
+    AddHandler(GameRunning_ScreenHertz,        new CSettingTypeTempNumber(60));
 
-	//Plugin
-	AddHandler(Plugin_RSP_Current,   new CSettingTypeApplication("Plugin","RSP Dll",       "RSP\\RSP 1.7.dll"));
-	AddHandler(Plugin_GFX_Current,   new CSettingTypeApplication("Plugin","Graphics Dll",  "GFX\\Jabo_Direct3D8.dll"));
-	AddHandler(Plugin_AUDIO_Current, new CSettingTypeApplication("Plugin","Audio Dll",     "Audio\\Jabo_Dsound.dll"));
-	AddHandler(Plugin_CONT_Current,  new CSettingTypeApplication("Plugin","Controller Dll","Input\\PJ64_NRage.dll"));
+    AddHandler(File_RecentGameFileCount,       new CSettingTypeApplication("","Remembered Rom Files",(uint32_t)10));
+    AddHandler(File_RecentGameFileIndex,       new CSettingTypeApplicationIndex("Recent File","Recent Rom",Default_None));
 
-	AddHandler(Plugin_RSP_CurVer,    new CSettingTypeApplication("Plugin","RSP Dll Ver",        ""));
-	AddHandler(Plugin_GFX_CurVer,    new CSettingTypeApplication("Plugin","Graphics Dll Ver",   ""));
-	AddHandler(Plugin_AUDIO_CurVer,  new CSettingTypeApplication("Plugin","Audio Dll Ver",      ""));
-	AddHandler(Plugin_CONT_CurVer,   new CSettingTypeApplication("Plugin","Controller Dll Ver", ""));
+    AddHandler(Debugger_Enabled,                new CSettingTypeApplication("Debugger","Debugger",false));
+    AddHandler(Debugger_ShowTLBMisses,          new CSettingTypeApplication("Debugger","Show TLB Misses",false));
+    AddHandler(Debugger_ShowUnhandledMemory,    new CSettingTypeApplication("Debugger","Show Unhandled Memory",false));
+    AddHandler(Debugger_ShowPifErrors,          new CSettingTypeApplication("Debugger","Show Pif Errors",false));
+    AddHandler(Debugger_DisableGameFixes,       new CSettingTypeApplication("Debugger","Disable Game Fixes",false));
+    AddHandler(Debugger_ShowDListAListCount,    new CSettingTypeApplication("Debugger","Show Dlist Alist Count",false));
+    AddHandler(Debugger_ShowRecompMemSize,      new CSettingTypeApplication("Debugger","Show Recompiler Memory size",false));
+    AddHandler(Debugger_ShowDivByZero,          new CSettingTypeApplication("Debugger","Show Div by zero",false));
+    AddHandler(Debugger_GenerateDebugLog,       new CSettingTypeApplication("Debugger","Generate Debug Code",false));
+    AddHandler(Debugger_ProfileCode,            new CSettingTypeApplication("Debugger","Profile Code",(uint32_t)false));
+    AddHandler(Debugger_AppLogLevel,            new CSettingTypeApplication("Logging","Log Level",(uint32_t)TraceError));
+    AddHandler(Debugger_AppLogFlush,            new CSettingTypeApplication("Logging","Log Auto Flush",(uint32_t)false));
+    AddHandler(Debugger_GenerateLogFiles,       new CSettingTypeApplication("Debugger","Generate Log Files", false));
 
-	AddHandler(Plugin_UseHleGfx,     new CSettingTypeApplication("RSP","HLE GFX",true));
-	AddHandler(Plugin_UseHleAudio,   new CSettingTypeApplication("RSP","HLE Audio",false));
+    //Plugin
+    AddHandler(Plugin_RSP_Current,   new CSettingTypeApplication("Plugin","RSP Dll",       "RSP\\RSP 1.7.dll"));
+    AddHandler(Plugin_GFX_Current,   new CSettingTypeApplication("Plugin","Graphics Dll",  "GFX\\Jabo_Direct3D8.dll"));
+    AddHandler(Plugin_AUDIO_Current, new CSettingTypeApplication("Plugin","Audio Dll",     "Audio\\Jabo_Dsound.dll"));
+    AddHandler(Plugin_CONT_Current,  new CSettingTypeApplication("Plugin","Controller Dll","Input\\PJ64_NRage.dll"));
 
-	// cheats
-	AddHandler(Cheat_Entry,          new CSettingTypeCheats(""));
-	AddHandler(Cheat_Active,         new CSettingTypeGameIndex("Cheat","",(DWORD)false));	
-	AddHandler(Cheat_Extension,      new CSettingTypeGameIndex("Cheat",".exten","??? - Not Set"));	
-	AddHandler(Cheat_Notes,          new CSettingTypeCheats("_N"));	
-	AddHandler(Cheat_Options,        new CSettingTypeCheats("_O"));	
-	AddHandler(Cheat_Range,          new CSettingTypeCheats("_R"));	
-	AddHandler(Cheat_RangeNotes,     new CSettingTypeCheats("_RN"));	
+    AddHandler(Plugin_RSP_CurVer,    new CSettingTypeApplication("Plugin","RSP Dll Ver",        ""));
+    AddHandler(Plugin_GFX_CurVer,    new CSettingTypeApplication("Plugin","Graphics Dll Ver",   ""));
+    AddHandler(Plugin_AUDIO_CurVer,  new CSettingTypeApplication("Plugin","Audio Dll Ver",      ""));
+    AddHandler(Plugin_CONT_CurVer,   new CSettingTypeApplication("Plugin","Controller Dll Ver", ""));
+
+    AddHandler(Plugin_UseHleGfx,     new CSettingTypeApplication("RSP","HLE GFX",true));
+    AddHandler(Plugin_UseHleAudio,   new CSettingTypeApplication("RSP","HLE Audio",false));
+
+    // cheats
+    AddHandler(Cheat_Entry,          new CSettingTypeCheats(""));
+    AddHandler(Cheat_Active,         new CSettingTypeGameIndex("Cheat","",(uint32_t)false));
+    AddHandler(Cheat_Extension,      new CSettingTypeGameIndex("Cheat",".exten","??? - Not Set"));
+    AddHandler(Cheat_Notes,          new CSettingTypeCheats("_N"));
+    AddHandler(Cheat_Options,        new CSettingTypeCheats("_O"));
+    AddHandler(Cheat_Range,          new CSettingTypeCheats("_R"));
+    AddHandler(Cheat_RangeNotes,     new CSettingTypeCheats("_RN"));
 }
 
-DWORD CSettings::FindSetting ( CSettings * _this, char * Name )
+uint32_t CSettings::FindSetting ( CSettings * _this, const char * Name )
 {
-	for (SETTING_MAP::iterator iter = _this->m_SettingInfo.begin(); iter != _this->m_SettingInfo.end(); iter++)
-	{
-		CSettingType * Setting = iter->second;
-		if (Setting->GetSettingType() == SettingType_GameSetting)
-		{
-			CSettingTypeGame * GameSetting = (CSettingTypeGame *)Setting;
-			if (_stricmp(GameSetting->GetKeyName(),Name) != 0)
-			{
-				continue;
-			}
-			return iter->first;
-		}
-		if (Setting->GetSettingType() == SettingType_CfgFile)
-		{
-			CSettingTypeApplication * CfgSetting = (CSettingTypeApplication *)Setting;
-			if (_stricmp(CfgSetting->GetKeyName(),Name) != 0)
-			{
-				continue;
-			}
-			return iter->first;
-		}
-		if (Setting->GetSettingType() == SettingType_SelectedDirectory)
-		{
-			CSettingTypeSelectedDirectory * SelectedDirectory = (CSettingTypeSelectedDirectory *)Setting;
-			if (_stricmp(SelectedDirectory->GetName(),Name) != 0)
-			{
-				continue;
-			}
-			return iter->first;
-		}
-	}
-	return 0;
+    for (SETTING_MAP::iterator iter = _this->m_SettingInfo.begin(); iter != _this->m_SettingInfo.end(); iter++)
+    {
+        CSettingType * Setting = iter->second;
+        if (Setting->GetSettingType() == SettingType_GameSetting)
+        {
+            CSettingTypeGame * GameSetting = (CSettingTypeGame *)Setting;
+            if (_stricmp(GameSetting->GetKeyName(),Name) != 0)
+            {
+                continue;
+            }
+            return iter->first;
+        }
+        if (Setting->GetSettingType() == SettingType_CfgFile)
+        {
+            CSettingTypeApplication * CfgSetting = (CSettingTypeApplication *)Setting;
+            if (_stricmp(CfgSetting->GetKeyName(),Name) != 0)
+            {
+                continue;
+            }
+            return iter->first;
+        }
+        if (Setting->GetSettingType() == SettingType_SelectedDirectory)
+        {
+            CSettingTypeSelectedDirectory * SelectedDirectory = (CSettingTypeSelectedDirectory *)Setting;
+            if (_stricmp(SelectedDirectory->GetName(),Name) != 0)
+            {
+                continue;
+            }
+            return iter->first;
+        }
+    }
+    return 0;
 }
 
 void CSettings::FlushSettings ( CSettings * /*_this*/ )
 {
-	CSettingTypeCheats::FlushChanges();
-	CSettingTypeApplication::Flush();
+    CSettingTypeCheats::FlushChanges();
+    CSettingTypeApplication::Flush();
 }
 
-DWORD CSettings::GetSetting ( CSettings * _this, SettingID Type )
+uint32_t CSettings::GetSetting ( CSettings * _this, SettingID Type )
 {
-	return _this->LoadDword(Type);
+    return _this->LoadDword(Type);
 }
 
 const char * CSettings::GetSettingSz ( CSettings * _this, SettingID Type, char * Buffer, int BufferSize )
 {
-	if (Buffer && BufferSize > 0)
-	{
-		Buffer[0] = 0;
-		_this->LoadString(Type, Buffer,BufferSize);
-	}
-	return Buffer;
+    if (Buffer && BufferSize > 0)
+    {
+        Buffer[0] = 0;
+        _this->LoadStringVal(Type, Buffer,BufferSize);
+    }
+    return Buffer;
 }
 
 void CSettings::SetSetting ( CSettings * _this, SettingID ID, unsigned int Value )
 {
-	_this->SaveDword(ID,Value);
+    _this->SaveDword(ID,Value);
 }
 
 void CSettings::SetSettingSz ( CSettings * _this, SettingID ID, const char * Value )
 {
-	_this->SaveString(ID,Value);
+    _this->SaveString(ID,Value);
 }
 
-void CSettings::RegisterSetting ( CSettings * _this, SettingID ID, SettingID DefaultID, SettingDataType DataType, 
-                                      SettingType Type, const char * Category, const char * DefaultStr, 
-									  DWORD Value )
+void CSettings::RegisterSetting ( CSettings * _this, SettingID ID, SettingID DefaultID, SettingDataType DataType,
+                                 SettingType Type, const char * Category, const char * DefaultStr,
+                                 uint32_t Value )
 {
-	switch (Type)
-	{
-	case SettingType_ConstValue:
-		if (DataType != Data_DWORD) 
-		{
-			g_Notify->BreakPoint(__FILEW__,__LINE__); 
-			return;
-		}
-		_this->AddHandler(ID,new CSettingTypeTempNumber(Value));
-		break;
-	case SettingType_ConstString:
-		if (DataType != Data_String) 
-		{
-			g_Notify->BreakPoint(__FILEW__,__LINE__); 
-			return;
-		}
-		_this->AddHandler(ID,new CSettingTypeTempString(DefaultStr));
-		break;
-	case SettingType_CfgFile:
-	case SettingType_Registry:
-		switch (DataType)
-		{
-		case Data_DWORD:
-			if (DefaultID == Default_None)
-			{
-				_this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,Value));
-			} else {
-				_this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,DefaultID));
-			}
-			break;
-		case Data_String:
-			if (DefaultID == Default_None)
-			{
-				_this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,""));
-			} else {
-				_this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,DefaultID));
-			}
-			break;
-		default:
-			g_Notify->BreakPoint(__FILEW__,__LINE__); 
-		}
-		break;
-	case SettingType_GameSetting:
-		{
-			stdstr_f Name("%s-%s",Category,DefaultStr);
-			switch (DataType)
-			{
-			case Data_DWORD:
-				if (DefaultID == Default_None)
-				{
-					SettingID RdbSetting = (SettingID)_this->m_NextAutoSettingId;
-					_this->m_NextAutoSettingId += 1;
-					_this->AddHandler(RdbSetting,new CSettingTypeRomDatabase(Name.c_str(),(int)Value));
-					_this->AddHandler(ID,new CSettingTypeGame(Name.c_str(),RdbSetting));
-				} else {
-					_this->AddHandler(ID,new CSettingTypeGame(Name.c_str(),DefaultID));
-				}
-				break;
-			case Data_String:
-				if (DefaultID == Default_None)
-				{
-					_this->AddHandler(ID,new CSettingTypeGame(Name.c_str(),""));
-				} else {
-					_this->AddHandler(ID,new CSettingTypeGame(Name.c_str(),DefaultID));
-				}
-				break;
-			default:
-				g_Notify->BreakPoint(__FILEW__,__LINE__); 
-			}
-		}
-		break;
-	case SettingType_RomDatabase:
-		switch (DataType)
-		{
-		case Data_DWORD:
-			if (DefaultID == Default_None)
-			{
-				_this->AddHandler(ID,new CSettingTypeRomDatabase(DefaultStr,(int)Value,true));
-			} else {
-				_this->AddHandler(ID,new CSettingTypeRomDatabase(DefaultStr,(SettingID)Value,true));
-			}
-			break;
-		case Data_String:
-			if (DefaultID == Default_None)
-			{
-				_this->AddHandler(ID,new CSettingTypeRomDatabase(DefaultStr,"",true));
-			} else {
-				_this->AddHandler(ID,new CSettingTypeRomDatabase(DefaultStr,DefaultID,true));
-			}
-			break;
-		default:
-			g_Notify->BreakPoint(__FILEW__,__LINE__); 
-		}
-		break;
-	case SettingType_RdbSetting:
-		switch (DataType)
-		{
-		case Data_DWORD:
-			if (DefaultID == Default_None)
-			{
-				_this->AddHandler(ID,new CSettingTypeRomDatabaseSetting(Category, DefaultStr,(int)Value,true));
-			} else {
-				SettingID RdbSetting = (SettingID)_this->m_NextAutoSettingId;
-				_this->m_NextAutoSettingId += 1;
-				_this->AddHandler(RdbSetting,new CSettingTypeRomDatabaseSetting(Category, DefaultStr,DefaultID,true));
-				_this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,RdbSetting));
-			}
-			break;
-		default:
-			g_Notify->BreakPoint(__FILEW__,__LINE__); 
-		}
-		break;
-	default:
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
+    switch (Type)
+    {
+    case SettingType_ConstValue:
+        if (DataType != Data_DWORD)
+        {
+            g_Notify->BreakPoint(__FILEW__,__LINE__);
+            return;
+        }
+        _this->AddHandler(ID,new CSettingTypeTempNumber(Value));
+        break;
+    case SettingType_ConstString:
+        if (DataType != Data_String)
+        {
+            g_Notify->BreakPoint(__FILEW__,__LINE__);
+            return;
+        }
+        _this->AddHandler(ID,new CSettingTypeTempString(DefaultStr));
+        break;
+    case SettingType_CfgFile:
+    case SettingType_Registry:
+        switch (DataType)
+        {
+        case Data_DWORD:
+            if (DefaultID == Default_None)
+            {
+                _this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,Value));
+            } else {
+                _this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,DefaultID));
+            }
+            break;
+        case Data_String:
+            if (DefaultID == Default_None)
+            {
+                _this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,""));
+            } else {
+                _this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,DefaultID));
+            }
+            break;
+        default:
+            g_Notify->BreakPoint(__FILEW__,__LINE__);
+        }
+        break;
+    case SettingType_GameSetting:
+        {
+            stdstr_f Name("%s-%s",Category,DefaultStr);
+            switch (DataType)
+            {
+            case Data_DWORD:
+                if (DefaultID == Default_None)
+                {
+                    SettingID RdbSetting = (SettingID)_this->m_NextAutoSettingId;
+                    _this->m_NextAutoSettingId += 1;
+                    _this->AddHandler(RdbSetting,new CSettingTypeRomDatabase(Name.c_str(),(int)Value));
+                    _this->AddHandler(ID,new CSettingTypeGame(Name.c_str(),RdbSetting));
+                } else {
+                    _this->AddHandler(ID,new CSettingTypeGame(Name.c_str(),DefaultID));
+                }
+                break;
+            case Data_String:
+                if (DefaultID == Default_None)
+                {
+                    _this->AddHandler(ID,new CSettingTypeGame(Name.c_str(),""));
+                } else {
+                    _this->AddHandler(ID,new CSettingTypeGame(Name.c_str(),DefaultID));
+                }
+                break;
+            default:
+                g_Notify->BreakPoint(__FILEW__,__LINE__);
+            }
+        }
+        break;
+    case SettingType_RomDatabase:
+        switch (DataType)
+        {
+        case Data_DWORD:
+            if (DefaultID == Default_None)
+            {
+                _this->AddHandler(ID,new CSettingTypeRomDatabase(DefaultStr,(int)Value,true));
+            } else {
+                _this->AddHandler(ID,new CSettingTypeRomDatabase(DefaultStr,(SettingID)Value,true));
+            }
+            break;
+        case Data_String:
+            if (DefaultID == Default_None)
+            {
+                _this->AddHandler(ID,new CSettingTypeRomDatabase(DefaultStr,"",true));
+            } else {
+                _this->AddHandler(ID,new CSettingTypeRomDatabase(DefaultStr,DefaultID,true));
+            }
+            break;
+        default:
+            g_Notify->BreakPoint(__FILEW__,__LINE__);
+        }
+        break;
+    case SettingType_RdbSetting:
+        switch (DataType)
+        {
+        case Data_DWORD:
+            if (DefaultID == Default_None)
+            {
+                _this->AddHandler(ID,new CSettingTypeRomDatabaseSetting(Category, DefaultStr,(int)Value,true));
+            } else {
+                SettingID RdbSetting = (SettingID)_this->m_NextAutoSettingId;
+                _this->m_NextAutoSettingId += 1;
+                _this->AddHandler(RdbSetting,new CSettingTypeRomDatabaseSetting(Category, DefaultStr,DefaultID,true));
+                _this->AddHandler(ID,new CSettingTypeApplication(Category,DefaultStr,RdbSetting));
+            }
+            break;
+        default:
+            g_Notify->BreakPoint(__FILEW__,__LINE__);
+        }
+        break;
+    default:
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
 }
 
-bool CSettings::Initilize( const char * AppName )
+bool CSettings::Initialize( const char * AppName )
 {
-	AddHowToHandleSetting();
-	CSettingTypeApplication::Initilize(AppName);
-	CSettingTypeRomDatabase::Initilize();
-	CSettingTypeGame::Initilize();
-	CSettingTypeCheats::Initilize();
+    AddHowToHandleSetting();
+    CSettingTypeApplication::Initialize(AppName);
+    CSettingTypeRomDatabase::Initialize();
+    CSettingTypeGame::Initialize();
+    CSettingTypeCheats::Initialize();
 
-	g_Settings->SaveString(Setting_ApplicationName,AppName);
-	return true;
+    g_Settings->SaveString(Setting_ApplicationName,AppName);
+    return true;
 }
 
 bool CSettings::LoadBool ( SettingID Type )
 {
-	bool Value = false;
-	LoadBool(Type,Value);
-	return Value;
+    bool Value = false;
+    LoadBool(Type,Value);
+    return Value;
 }
 
 bool CSettings::LoadBool ( SettingID Type, bool & Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return 0; 
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	} else {
-		return FindInfo->second->Load(0,Value);
-	}
-	return false;
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return 0;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    } else {
+        return FindInfo->second->Load(0,Value);
+    }
+    return false;
 }
 
 bool CSettings::LoadBoolIndex( SettingID Type, int index )
 {
-	bool Value = false;
-	LoadBoolIndex(Type,index,Value);
-	return Value;
+    bool Value = false;
+    LoadBoolIndex(Type,index,Value);
+    return Value;
 }
 
 bool CSettings::LoadBoolIndex( SettingID Type, int index , bool & Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return false; 
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		return FindInfo->second->Load(index,Value);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	return false;
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return false;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        return FindInfo->second->Load(index,Value);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    return false;
 }
 
-DWORD CSettings::LoadDword ( SettingID Type )
+uint32_t CSettings::LoadDword ( SettingID Type )
 {
-	DWORD Value = 0;
-	LoadDword(Type,Value);
-	return Value;
+    uint32_t Value = 0;
+    LoadDword(Type,Value);
+    return Value;
 }
 
-bool CSettings::LoadDword ( SettingID Type, DWORD & Value)
+bool CSettings::LoadDword ( SettingID Type, uint32_t & Value)
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return 0; 
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	} else {
-		return FindInfo->second->Load(0,Value);
-	}
-	return false;
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return 0;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    } else {
+        return FindInfo->second->Load(0,Value);
+    }
+    return false;
 }
 
-DWORD CSettings::LoadDwordIndex( SettingID Type, int index)
+uint32_t CSettings::LoadDwordIndex( SettingID Type, int index)
 {
-	DWORD Value;
-	LoadDwordIndex(Type,index,Value);
-	return Value;
+    uint32_t Value;
+    LoadDwordIndex(Type,index,Value);
+    return Value;
 }
 
-bool CSettings::LoadDwordIndex( SettingID Type, int index, DWORD & Value)
+bool CSettings::LoadDwordIndex( SettingID Type, int index, uint32_t & Value)
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return 0; 
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		return FindInfo->second->Load(index,Value);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	return false;
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return 0;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        return FindInfo->second->Load(index,Value);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    return false;
 }
 
-stdstr CSettings::LoadString ( SettingID Type )
+stdstr CSettings::LoadStringVal ( SettingID Type )
 {
-	stdstr Value;
-	LoadString(Type,Value);
-	return Value;
+    stdstr Value;
+    LoadStringVal(Type,Value);
+    return Value;
 }
 
-bool CSettings::LoadString ( SettingID Type, stdstr & Value )
+bool CSettings::LoadStringVal ( SettingID Type, stdstr & Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return 0; 
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	} else {
-		return FindInfo->second->Load(0,Value);
-	}
-	return false;
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return 0;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    } else {
+        return FindInfo->second->Load(0,Value);
+    }
+    return false;
 }
 
-bool CSettings::LoadString ( SettingID Type, char * Buffer, int BufferSize )
+bool CSettings::LoadStringVal ( SettingID Type, char * Buffer, int BufferSize )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return 0; 
-	}
-	bool bRes = false;
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	} else {
-		stdstr Value;
-		bRes = FindInfo->second->Load(0,Value);
-		int len = BufferSize;
-		if ((Value.length() + 1) < (size_t)len)
-		{
-			len = Value.length() + 1;
-		}
-		strncpy(Buffer,Value.c_str(),len);
-	}
-	return bRes;
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return 0;
+    }
+    bool bRes = false;
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    } else {
+        stdstr Value;
+        bRes = FindInfo->second->Load(0,Value);
+        int len = BufferSize;
+        if ((Value.length() + 1) < (size_t)len)
+        {
+            len = Value.length() + 1;
+        }
+        strncpy(Buffer,Value.c_str(),len);
+    }
+    return bRes;
 }
 
 stdstr CSettings::LoadStringIndex ( SettingID Type, int index )
 {
-	stdstr Value;
-	LoadStringIndex(Type,index,Value);
-	return Value;
+    stdstr Value;
+    LoadStringIndex(Type,index,Value);
+    return Value;
 }
 
 bool CSettings::LoadStringIndex ( SettingID Type, int index, stdstr & Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return 0; 
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		return FindInfo->second->Load(index,Value);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	return false;
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return 0;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        return FindInfo->second->Load(index,Value);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    return false;
 }
 
 bool CSettings::LoadStringIndex ( SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 //Load the default value for the setting
 bool CSettings::LoadDefaultBool ( SettingID Type )
 {
-	bool Value = false;
-	LoadDefaultBool(Type,Value);
-	return Value;
+    bool Value = false;
+    LoadDefaultBool(Type,Value);
+    return Value;
 }
 
 void CSettings::LoadDefaultBool ( SettingID Type, bool & Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-	} else {
-		if (FindInfo->second->IndexBasedSetting())
-		{
-			g_Notify->BreakPoint(__FILEW__,__LINE__); 
-		} else {
-			FindInfo->second->LoadDefault(0,Value);
-		}
-	}
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+    } else {
+        if (FindInfo->second->IndexBasedSetting())
+        {
+            g_Notify->BreakPoint(__FILEW__,__LINE__);
+        } else {
+            FindInfo->second->LoadDefault(0,Value);
+        }
+    }
 }
 
 bool CSettings::LoadDefaultBoolIndex ( SettingID /*Type*/, int /*index*/  )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 void CSettings::LoadDefaultBoolIndex ( SettingID /*Type*/, int /*index*/, bool & /*Value*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
-DWORD  CSettings::LoadDefaultDword ( SettingID Type )
+uint32_t  CSettings::LoadDefaultDword ( SettingID Type )
 {
-	DWORD Value = 0;
-	LoadDefaultDword(Type,Value);
-	return Value;
+    uint32_t Value = 0;
+    LoadDefaultDword(Type,Value);
+    return Value;
 }
 
-void CSettings::LoadDefaultDword ( SettingID Type, DWORD & Value)
+void CSettings::LoadDefaultDword ( SettingID Type, uint32_t & Value)
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-	} else {
-		if (FindInfo->second->IndexBasedSetting())
-		{
-			g_Notify->BreakPoint(__FILEW__,__LINE__); 
-		} else {
-			FindInfo->second->LoadDefault(0,Value);
-		}
-	}
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+    } else {
+        if (FindInfo->second->IndexBasedSetting())
+        {
+            g_Notify->BreakPoint(__FILEW__,__LINE__);
+        } else {
+            FindInfo->second->LoadDefault(0,Value);
+        }
+    }
 }
 
-DWORD  CSettings::LoadDefaultDwordIndex ( SettingID /*Type*/, int /*index*/ )
+uint32_t  CSettings::LoadDefaultDwordIndex ( SettingID /*Type*/, int /*index*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
-void CSettings::LoadDefaultDwordIndex ( SettingID /*Type*/, int /*index*/, DWORD & /*Value*/)
+void CSettings::LoadDefaultDwordIndex ( SettingID /*Type*/, int /*index*/, uint32_t & /*Value*/)
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 stdstr CSettings::LoadDefaultString ( SettingID Type )
 {
-	stdstr Value;
-	LoadDefaultString(Type,Value);
-	return Value;
+    stdstr Value;
+    LoadDefaultString(Type,Value);
+    return Value;
 }
 
 void CSettings::LoadDefaultString ( SettingID Type, stdstr & Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-	} else {
-		if (FindInfo->second->IndexBasedSetting())
-		{
-			g_Notify->BreakPoint(__FILEW__,__LINE__); 
-		} else {
-			FindInfo->second->LoadDefault(0,Value);
-		}
-	}
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+    } else {
+        if (FindInfo->second->IndexBasedSetting())
+        {
+            g_Notify->BreakPoint(__FILEW__,__LINE__);
+        } else {
+            FindInfo->second->LoadDefault(0,Value);
+        }
+    }
 }
 
 void CSettings::LoadDefaultString ( SettingID /*Type*/, char * /*Buffer*/, int /*BufferSize*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 stdstr CSettings::LoadDefaultStringIndex ( SettingID /*Type*/, int /*index*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	return false;
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    return false;
 }
 
 void CSettings::LoadDefaultStringIndex ( SettingID /*Type*/, int /*index*/, stdstr & /*Value*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettings::LoadDefaultStringIndex ( SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/ )
 {
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 }
 
 void CSettings::SaveBool ( SettingID Type, bool Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return;
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	} else {
-		FindInfo->second->Save(0,Value);
-	}
-	NotifyCallBacks(Type);
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    } else {
+        FindInfo->second->Save(0,Value);
+    }
+    NotifyCallBacks(Type);
 }
 
 void CSettings::SaveBoolIndex( SettingID Type, int index, bool Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return;
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		FindInfo->second->Save(index,Value);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	NotifyCallBacks(Type);
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        FindInfo->second->Save(index,Value);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    NotifyCallBacks(Type);
 }
 
-void CSettings::SaveDword ( SettingID Type, DWORD Value )
+void CSettings::SaveDword ( SettingID Type, uint32_t Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return;
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	} else {
-		FindInfo->second->Save(0,Value);
-	}
-	NotifyCallBacks(Type);
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    } else {
+        FindInfo->second->Save(0,Value);
+    }
+    NotifyCallBacks(Type);
 }
 
-void CSettings::SaveDwordIndex ( SettingID Type, int index, DWORD Value )
+void CSettings::SaveDwordIndex ( SettingID Type, int index, uint32_t Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return;
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		FindInfo->second->Save(index,Value);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	NotifyCallBacks(Type);
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        FindInfo->second->Save(index,Value);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    NotifyCallBacks(Type);
 }
 
 void CSettings::SaveString ( SettingID Type, const stdstr & Value )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-		return;
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	} else {
-		FindInfo->second->Save(0,Value);
-	}
-	NotifyCallBacks(Type);
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+        return;
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    } else {
+        FindInfo->second->Save(0,Value);
+    }
+    NotifyCallBacks(Type);
 }
 
 void CSettings::SaveString ( SettingID Type, const char * Buffer )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	} else {
-		FindInfo->second->Save(0,Buffer);
-	}
-	NotifyCallBacks(Type);
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    } else {
+        FindInfo->second->Save(0,Buffer);
+    }
+    NotifyCallBacks(Type);
 }
 
 void CSettings::SaveStringIndex( SettingID Type, int index, const char * Buffer )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		FindInfo->second->Save(index,Buffer);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	NotifyCallBacks(Type);
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        FindInfo->second->Save(index,Buffer);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    NotifyCallBacks(Type);
 }
 
 void CSettings::SaveStringIndex( SettingID Type, int index, const stdstr & Value )
 {
-	SaveStringIndex(Type,index,Value.c_str());
+    SaveStringIndex(Type,index,Value.c_str());
 }
 
 void CSettings::DeleteSetting( SettingID Type )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	} else {
-		FindInfo->second->Delete(0);
-	}
-	NotifyCallBacks(Type);
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    } else {
+        FindInfo->second->Delete(0);
+    }
+    NotifyCallBacks(Type);
 }
 
 void CSettings::DeleteSettingIndex( SettingID Type, int index  )
 {
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		//if not found do nothing
-		UnknownSetting(Type);
-	}
-	if (FindInfo->second->IndexBasedSetting())
-	{
-		FindInfo->second->Delete(index);
-	} else {
-		g_Notify->BreakPoint(__FILEW__,__LINE__); 
-	}
-	NotifyCallBacks(Type);
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        //if not found do nothing
+        UnknownSetting(Type);
+    }
+    if (FindInfo->second->IndexBasedSetting())
+    {
+        FindInfo->second->Delete(index);
+    } else {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
+    NotifyCallBacks(Type);
 }
 
 SettingType CSettings::GetSettingType ( SettingID Type )
 {
-	if (Type == Default_None || Type == Default_Constant)
-	{
-		return SettingType_Unknown;
-	}
+    if (Type == Default_None || Type == Default_Constant)
+    {
+        return SettingType_Unknown;
+    }
 
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		return SettingType_Unknown;
-	}
-	return FindInfo->second->GetSettingType();
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        return SettingType_Unknown;
+    }
+    return FindInfo->second->GetSettingType();
 }
 
 bool CSettings::IndexBasedSetting ( SettingID Type )
 {
-
-	SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
-	if (FindInfo == m_SettingInfo.end()) 
-	{  
-		return false;
-	}
-	return FindInfo->second->IndexBasedSetting();
+    SETTING_HANDLER FindInfo = m_SettingInfo.find(Type);
+    if (FindInfo == m_SettingInfo.end())
+    {
+        return false;
+    }
+    return FindInfo->second->IndexBasedSetting();
 }
 
-
 void CSettings::SettingTypeChanged( SettingType Type )
 {
-	for (SETTING_MAP::iterator iter = m_SettingInfo.begin(); iter != m_SettingInfo.end(); iter++)
-	{
-		if (iter->second->GetSettingType() == Type)
-		{
-			NotifyCallBacks(iter->first);
-		}
-	}
+    for (SETTING_MAP::iterator iter = m_SettingInfo.begin(); iter != m_SettingInfo.end(); iter++)
+    {
+        if (iter->second->GetSettingType() == Type)
+        {
+            NotifyCallBacks(iter->first);
+        }
+    }
 }
 void CSettings::UnknownSetting (SettingID /*Type*/)
 {
 #ifdef _DEBUG
-	g_Notify->BreakPoint(__FILEW__,__LINE__); 
+    g_Notify->BreakPoint(__FILEW__,__LINE__);
 #endif
 }
 
 void CSettings::NotifyCallBacks( SettingID Type )
 {
-	SETTING_CALLBACK::iterator Callback = m_Callback.find(Type);
-	if (Callback == m_Callback.end())
-	{
-		return;
-	}
-		
-	for (SETTING_CHANGED_CB * item = Callback->second; item != NULL; item = item->Next)
-	{
-		item->Func(item->Data);
-	}
+    SETTING_CALLBACK::iterator Callback = m_Callback.find(Type);
+    if (Callback == m_Callback.end())
+    {
+        return;
+    }
+
+    for (SETTING_CHANGED_CB * item = Callback->second; item != NULL; item = item->Next)
+    {
+        item->Func(item->Data);
+    }
 }
 
 void CSettings::RegisterChangeCB(SettingID Type,void * Data, SettingChangedFunc Func)
 {
-	SETTING_CHANGED_CB * new_item = new SETTING_CHANGED_CB;
-	new_item->Data = Data;
-	new_item->Func = Func;
-	new_item->Next = NULL;
+    SETTING_CHANGED_CB * new_item = new SETTING_CHANGED_CB;
+    new_item->Data = Data;
+    new_item->Func = Func;
+    new_item->Next = NULL;
 
-
-	SETTING_CALLBACK::iterator Callback = m_Callback.find(Type);
-	if (Callback != m_Callback.end())
-	{
-		SETTING_CHANGED_CB * item = Callback->second;
-		while (item->Next)
-		{
-			item = item->Next;
-		}
-		item->Next = new_item;
-	} else {
-		m_Callback.insert(SETTING_CALLBACK::value_type(Type,new_item));
-	}
+    SETTING_CALLBACK::iterator Callback = m_Callback.find(Type);
+    if (Callback != m_Callback.end())
+    {
+        SETTING_CHANGED_CB * item = Callback->second;
+        while (item->Next)
+        {
+            item = item->Next;
+        }
+        item->Next = new_item;
+    } else {
+        m_Callback.insert(SETTING_CALLBACK::value_type(Type,new_item));
+    }
 }
 
 void CSettings::UnregisterChangeCB(SettingID Type,void * Data, SettingChangedFunc Func)
 {
-	bool bRemoved = false;
+    bool bRemoved = false;
 
-	//Find out the information for handling the setting type from the list
-	SETTING_CALLBACK::iterator Callback = m_Callback.find(Type);
-	if (Callback != m_Callback.end())
-	{
-		SETTING_CHANGED_CB * PrevItem = NULL;
-		SETTING_CHANGED_CB * item = Callback->second;
+    //Find out the information for handling the setting type from the list
+    SETTING_CALLBACK::iterator Callback = m_Callback.find(Type);
+    if (Callback != m_Callback.end())
+    {
+        SETTING_CHANGED_CB * PrevItem = NULL;
+        SETTING_CHANGED_CB * item = Callback->second;
 
-		while (item)
-		{
-			if (Callback->first == Type && item->Data == Data && item->Func == Func)
-			{
-				bRemoved = true;
-				if (PrevItem == NULL)
-				{ 
-					if (item->Next)
-					{
-						SettingID Type = Callback->first;
-						_SETTING_CHANGED_CB * Next = item->Next;
-						m_Callback.erase(Callback);
-						m_Callback.insert(SETTING_CALLBACK::value_type(Type,Next));
-					} else {
-						m_Callback.erase(Callback);
-					}
-				} else {
-					PrevItem->Next = item->Next;
-				}
-				delete item;
-				item = NULL;
-				break;
-			}
-			PrevItem = item;
-			item = item->Next;
-		}
-	} else {
-		UnknownSetting(Type);
-		return; 
-	}
+        while (item)
+        {
+            if (Callback->first == Type && item->Data == Data && item->Func == Func)
+            {
+                bRemoved = true;
+                if (PrevItem == NULL)
+                {
+                    if (item->Next)
+                    {
+                        SettingID Type = Callback->first;
+                        SETTING_CHANGED_CB * Next = item->Next;
+                        m_Callback.erase(Callback);
+                        m_Callback.insert(SETTING_CALLBACK::value_type(Type,Next));
+                    } else {
+                        m_Callback.erase(Callback);
+                    }
+                } else {
+                    PrevItem->Next = item->Next;
+                }
+                delete item;
+                item = NULL;
+                break;
+            }
+            PrevItem = item;
+            item = item->Next;
+        }
+    } else {
+        UnknownSetting(Type);
+        return;
+    }
 
-	if (!bRemoved)
-	{
-		g_Notify->BreakPoint(__FILEW__,__LINE__);
-	}
+    if (!bRemoved)
+    {
+        g_Notify->BreakPoint(__FILEW__,__LINE__);
+    }
 }
diff --git a/Source/Project64/Settings/Settings Class.h b/Source/Project64/Settings/Settings Class.h
index 6f45e5797..1f7479223 100644
--- a/Source/Project64/Settings/Settings Class.h	
+++ b/Source/Project64/Settings/Settings Class.h	
@@ -12,114 +12,116 @@
 
 #include "SettingType/SettingsType-Base.h"
 
-enum SettingDataType {
-	Data_DWORD    = 0, 
-	Data_String   = 1, 
-	Data_CPUTYPE  = 2, 
-	Data_SelfMod  = 3, 
-	Data_OnOff    = 4, 
-	Data_YesNo    = 5, 
-	Data_SaveChip = 6 
+enum SettingDataType
+{
+    Data_DWORD    = 0,
+    Data_String   = 1,
+    Data_CPUTYPE  = 2,
+    Data_SelfMod  = 3,
+    Data_OnOff    = 4,
+    Data_YesNo    = 5,
+    Data_SaveChip = 6
 };
 
-class CSettings  {
+class CSettings
+{
 public:
-	typedef void (* SettingChangedFunc)(void *);
+    typedef void (* SettingChangedFunc)(void *);
 
 private:
-	void AddHandler ( SettingID TypeID, CSettingType * Handler );
-	void AddHowToHandleSetting (void);
-	void UnknownSetting (SettingID Type);
+    void AddHandler ( SettingID TypeID, CSettingType * Handler );
+    void AddHowToHandleSetting (void);
+    void UnknownSetting (SettingID Type);
 
-	typedef struct _SETTING_CHANGED_CB
-	{
-		void                * Data;
-		SettingChangedFunc    Func;
-		_SETTING_CHANGED_CB * Next; 
-	} SETTING_CHANGED_CB;
+    struct SETTING_CHANGED_CB
+    {
+        void               * Data;
+        SettingChangedFunc   Func;
+        SETTING_CHANGED_CB * Next;
+    };
 
-	typedef std::map<SettingID, SETTING_CHANGED_CB *> SETTING_CALLBACK;
-	typedef std::map<SettingID, CSettingType *> SETTING_MAP;
-	typedef SETTING_MAP::iterator SETTING_HANDLER;
+    typedef std::map<SettingID, SETTING_CHANGED_CB *> SETTING_CALLBACK;
+    typedef std::map<SettingID, CSettingType *> SETTING_MAP;
+    typedef SETTING_MAP::iterator SETTING_HANDLER;
 
 public:
-	CSettings(void);
-	~CSettings(void);
-	
-	bool Initilize ( const char * AppName );
+    CSettings(void);
+    ~CSettings(void);
 
-	//return the values
-	bool   LoadBool         ( SettingID Type );
-	bool   LoadBool         ( SettingID Type, bool & Value );
-	bool   LoadBoolIndex    ( SettingID Type, int index  );
-	bool   LoadBoolIndex    ( SettingID Type, int index , bool & Value );
-	DWORD  LoadDword        ( SettingID Type ); 
-	bool   LoadDword        ( SettingID Type, DWORD & Value); 
-	DWORD  LoadDwordIndex   ( SettingID Type, int index ); 
-	bool   LoadDwordIndex   ( SettingID Type, int index, DWORD & Value); 
-	stdstr LoadString       ( SettingID Type ); 
-	bool   LoadString       ( SettingID Type, stdstr & Value ); 
-	bool   LoadString       ( SettingID Type, char * Buffer, int BufferSize ); 
-	stdstr LoadStringIndex  ( SettingID Type, int index ); 
-	bool   LoadStringIndex  ( SettingID Type, int index, stdstr & Value ); 
-	bool   LoadStringIndex  ( SettingID Type, int index, char * Buffer, int BufferSize ); 
+    bool Initialize ( const char * AppName );
 
-	//Load the default value for the setting
-	bool   LoadDefaultBool         ( SettingID Type );
-	void   LoadDefaultBool         ( SettingID Type, bool & Value );
-	bool   LoadDefaultBoolIndex    ( SettingID Type, int index  );
-	void   LoadDefaultBoolIndex    ( SettingID Type, int index , bool & Value );
-	DWORD  LoadDefaultDword        ( SettingID Type ); 
-	void   LoadDefaultDword        ( SettingID Type, DWORD & Value); 
-	DWORD  LoadDefaultDwordIndex   ( SettingID Type, int index ); 
-	void   LoadDefaultDwordIndex   ( SettingID Type, int index, DWORD & Value); 
-	stdstr LoadDefaultString       ( SettingID Type ); 
-	void   LoadDefaultString       ( SettingID Type, stdstr & Value ); 
-	void   LoadDefaultString       ( SettingID Type, char * Buffer, int BufferSize ); 
-	stdstr LoadDefaultStringIndex  ( SettingID Type, int index ); 
-	void   LoadDefaultStringIndex  ( SettingID Type, int index, stdstr & Value ); 
-	void   LoadDefaultStringIndex  ( SettingID Type, int index, char * Buffer, int BufferSize ); 
+    //return the values
+    bool   LoadBool         ( SettingID Type );
+    bool   LoadBool         ( SettingID Type, bool & Value );
+    bool   LoadBoolIndex    ( SettingID Type, int index  );
+    bool   LoadBoolIndex    ( SettingID Type, int index , bool & Value );
+    uint32_t LoadDword      ( SettingID Type );
+    bool   LoadDword        ( SettingID Type, uint32_t & Value);
+    uint32_t LoadDwordIndex ( SettingID Type, int index );
+    bool   LoadDwordIndex   ( SettingID Type, int index, uint32_t & Value);
+    stdstr LoadStringVal    ( SettingID Type );
+	bool   LoadStringVal    (SettingID Type, stdstr & Value);
+	bool   LoadStringVal    (SettingID Type, char * Buffer, int BufferSize);
+    stdstr LoadStringIndex  ( SettingID Type, int index );
+    bool   LoadStringIndex  ( SettingID Type, int index, stdstr & Value );
+    bool   LoadStringIndex  ( SettingID Type, int index, char * Buffer, int BufferSize );
 
-	//Update the settings
-	void   SaveBool         ( SettingID Type, bool Value ); 
-	void   SaveBoolIndex    ( SettingID Type, int index, bool Value ); 
-	void   SaveDword        ( SettingID Type, DWORD Value ); 
-	void   SaveDwordIndex   ( SettingID Type, int index, DWORD Value ); 
-	void   SaveString       ( SettingID Type, const stdstr & Value );
-	void   SaveStringIndex  ( SettingID Type, int index, const stdstr & Value );
-	void   SaveString       ( SettingID Type, const char * Buffer );
-	void   SaveStringIndex  ( SettingID Type, int index, const char * Buffer );
+    //Load the default value for the setting
+    bool   LoadDefaultBool         ( SettingID Type );
+    void   LoadDefaultBool         ( SettingID Type, bool & Value );
+    bool   LoadDefaultBoolIndex    ( SettingID Type, int index  );
+    void   LoadDefaultBoolIndex    ( SettingID Type, int index , bool & Value );
+    uint32_t LoadDefaultDword      ( SettingID Type );
+    void   LoadDefaultDword        ( SettingID Type, uint32_t & Value);
+    uint32_t LoadDefaultDwordIndex ( SettingID Type, int index );
+    void   LoadDefaultDwordIndex   ( SettingID Type, int index, uint32_t & Value);
+    stdstr LoadDefaultString       ( SettingID Type );
+    void   LoadDefaultString       ( SettingID Type, stdstr & Value );
+    void   LoadDefaultString       ( SettingID Type, char * Buffer, int BufferSize );
+    stdstr LoadDefaultStringIndex  ( SettingID Type, int index );
+    void   LoadDefaultStringIndex  ( SettingID Type, int index, stdstr & Value );
+    void   LoadDefaultStringIndex  ( SettingID Type, int index, char * Buffer, int BufferSize );
 
-	// Delete a setting
-	void   DeleteSetting      ( SettingID Type );
-	void   DeleteSettingIndex ( SettingID Type, int index );
-	
-	//Register Notification of change
-	void RegisterChangeCB   ( SettingID Type, void * Data, SettingChangedFunc Func);
-	void UnregisterChangeCB ( SettingID Type, void * Data, SettingChangedFunc Func);
+    //Update the settings
+    void   SaveBool         ( SettingID Type, bool Value );
+    void   SaveBoolIndex    ( SettingID Type, int index, bool Value );
+    void   SaveDword        ( SettingID Type, uint32_t Value );
+    void   SaveDwordIndex   ( SettingID Type, int index, uint32_t Value );
+    void   SaveString       ( SettingID Type, const stdstr & Value );
+    void   SaveStringIndex  ( SettingID Type, int index, const stdstr & Value );
+    void   SaveString       ( SettingID Type, const char * Buffer );
+    void   SaveStringIndex  ( SettingID Type, int index, const char * Buffer );
 
-	// information about setting
-	SettingType   GetSettingType     ( SettingID Type   );
-	bool          IndexBasedSetting  ( SettingID Type   );
-	void          SettingTypeChanged ( SettingType Type );
+    // Delete a setting
+    void   DeleteSetting      ( SettingID Type );
+    void   DeleteSettingIndex ( SettingID Type, int index );
 
-	// static functions for plugins
-	static DWORD  GetSetting      ( CSettings * _this, SettingID Type );
-	static LPCSTR GetSettingSz    ( CSettings * _this, SettingID Type, char * Buffer, int BufferSize );
+    //Register Notification of change
+    void RegisterChangeCB   ( SettingID Type, void * Data, SettingChangedFunc Func);
+    void UnregisterChangeCB ( SettingID Type, void * Data, SettingChangedFunc Func);
+
+    // information about setting
+    SettingType   GetSettingType     ( SettingID Type   );
+    bool          IndexBasedSetting  ( SettingID Type   );
+    void          SettingTypeChanged ( SettingType Type );
+
+    // static functions for plugins
+    static uint32_t  GetSetting      ( CSettings * _this, SettingID Type );
+    static const char * GetSettingSz    ( CSettings * _this, SettingID Type, char * Buffer, int BufferSize );
     static void   SetSetting      ( CSettings * _this, SettingID ID, unsigned int Value );
     static void   SetSettingSz    ( CSettings * _this, SettingID ID, const char * Value );
-	static void   RegisterSetting ( CSettings * _this, SettingID ID, SettingID DefaultID, SettingDataType DataType, 
-                                      SettingType Type, const char * Category, const char * DefaultStr, 
-									  DWORD Value );
-	static DWORD  FindSetting ( CSettings * _this, char * Name );
-	static void   FlushSettings ( CSettings * _this );
+    static void   RegisterSetting ( CSettings * _this, SettingID ID, SettingID DefaultID, SettingDataType DataType,
+        SettingType Type, const char * Category, const char * DefaultStr,
+        uint32_t Value );
+    static uint32_t  FindSetting ( CSettings * _this, const char * Name );
+    static void   FlushSettings ( CSettings * _this );
 
 private:
-	void NotifyCallBacks ( SettingID Type );
+    void NotifyCallBacks ( SettingID Type );
 
-	SETTING_MAP      m_SettingInfo;
-	SETTING_CALLBACK m_Callback;
-	int              m_NextAutoSettingId;
+    SETTING_MAP      m_SettingInfo;
+    SETTING_CALLBACK m_Callback;
+    int              m_NextAutoSettingId;
 };
 
 extern CSettings * g_Settings;
diff --git a/Source/Project64/Support.h b/Source/Project64/Support.h
index 3f8b3249a..7aa159fb4 100644
--- a/Source/Project64/Support.h
+++ b/Source/Project64/Support.h
@@ -12,4 +12,3 @@
 #include <common/Smart Pointer.h>
 #include <common/Ini File Class.h>
 #include <common/md5.h>
-#include <common/Registry.h>
diff --git a/Source/Project64/User Interface.h b/Source/Project64/User Interface.h
index 05b97978f..8b17aa2c1 100644
--- a/Source/Project64/User Interface.h	
+++ b/Source/Project64/User Interface.h	
@@ -23,35 +23,42 @@ typedef unsigned __int64 QWORD;
 typedef void *           HANDLE;
 typedef const char *     LPCSTR;
 
-typedef struct
+struct RECT_STRUCT
 {
 	long left;
 	long top;
 	long right;
 	long bottom;
-} RECT_STRUCT;
+};
 
-typedef struct {
-    HDC   hdc;
-    int        fErase;
+struct WINDOWS_PAINTSTRUCT {
+    HDC         hdc;
+    int         fErase;
     RECT_STRUCT rcPaint;
-    int        fRestore;
-    int        fIncUpdate;
+    int         fRestore;
+    int         fIncUpdate;
     BYTE        rgbReserved[32];
-} WINDOWS_PAINTSTRUCT;
+};
 
 #define CALLBACK    __stdcall
 
 class CN64System;
 
+#define WINDOWS_UI
+// Remove this to test compilation outside of the Windows ATL environment.
+
+#ifdef WINDOWS_UI
 #include <WTL App.h>
+#endif
 #include <User Interface/MenuShortCuts.h>
+
 #include ".\\User Interface\\Rom Browser.h"
 #include ".\\User Interface\\Gui Class.h"
 #include ".\\User Interface\\Menu Class.h"
-#include ".\\User Interface\\Menu Class.h"
 #include ".\\User Interface\\Main Menu Class.h"
 #include ".\\User Interface\\Notification Class.h"
 #include ".\\User Interface\\Frame Per Second Class.h"
 #include ".\\User Interface\\resource.h"
+#ifdef WINDOWS_UI
 #include ".\\User Interface\\Settings Config.h"
+#endif
diff --git a/Source/Project64/User Interface/Frame Per Second Class.cpp b/Source/Project64/User Interface/Frame Per Second Class.cpp
index bf7a26262..3228a31cc 100644
--- a/Source/Project64/User Interface/Frame Per Second Class.cpp	
+++ b/Source/Project64/User Interface/Frame Per Second Class.cpp	
@@ -10,8 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 
-CFramePerSecond::CFramePerSecond (CNotification * Notification):
-	g_Notify(Notification)
+CFramePerSecond::CFramePerSecond ()
 {
 	m_iFrameRateType = g_Settings->LoadDword(UserInterface_FrameDisplayType);
 	m_ScreenHertz = g_Settings->LoadDword(GameRunning_ScreenHertz);
@@ -25,7 +24,7 @@ CFramePerSecond::CFramePerSecond (CNotification * Notification):
 	
 	LARGE_INTEGER Freq;
 	QueryPerformanceFrequency(&Freq);
-	Frequency = Freq.QuadPart;
+	m_Frequency = Freq.QuadPart;
 	Reset(true);
 }
 
@@ -37,12 +36,12 @@ CFramePerSecond::~CFramePerSecond()
 
 void CFramePerSecond::Reset (bool ClearDisplay) 
 {
-	CurrentFrame = 0;
-	LastFrame = 0;
+	m_CurrentFrame = 0;
+	m_LastFrame = 0;
 
 	for (int count = 0; count < NoOfFrames; count ++) 
     {
-		Frames[count] = 0;
+		m_Frames[count] = 0;
 	}
 	if (ClearDisplay)
 	{
@@ -62,14 +61,15 @@ void CFramePerSecond::UpdateViCounter ( void )
 	{
 		return;
 	}
-	if ((CurrentFrame & 7) == 0) {
+	if ((m_CurrentFrame & 7) == 0)
+	{
 		LARGE_INTEGER Time;
 		QueryPerformanceCounter(&Time);
-		Frames[(CurrentFrame >> 3) % NoOfFrames] = Time.QuadPart - LastFrame;
-		LastFrame = Time.QuadPart;	
+		m_Frames[(m_CurrentFrame >> 3) % NoOfFrames] = Time.QuadPart - m_LastFrame;
+		m_LastFrame = Time.QuadPart;
 		DisplayViCounter(0);
 	}
-	CurrentFrame += 1;
+	m_CurrentFrame += 1;
 }
 
 void CFramePerSecond::DisplayViCounter(DWORD FrameRate) 
@@ -78,20 +78,20 @@ void CFramePerSecond::DisplayViCounter(DWORD FrameRate)
 	{
 		if (FrameRate != 0) 
         {
-			g_Notify->DisplayMessage2(L"VI/s: %d.00", FrameRate);
+			g_Notify->DisplayMessage2(stdstr_f("VI/s: %d.00", FrameRate).ToUTF16().c_str());
 		} 
         else 
         {
-			if (CurrentFrame > (NoOfFrames << 3)) 
+			if (m_CurrentFrame > (NoOfFrames << 3))
             {
 				__int64 Total;
 				
 				Total = 0;
 				for (int count = 0; count < NoOfFrames; count ++) 
                 {
-					Total += Frames[count];
+					Total += m_Frames[count];
 				}
-				g_Notify->DisplayMessage2(L"VI/s: %.2f", Frequency/ ((double)Total / (NoOfFrames << 3)));
+				g_Notify->DisplayMessage2(stdstr_f("VI/s: %.2f", m_Frequency / ((double)Total / (NoOfFrames << 3))).ToUTF16().c_str());
 			}
             else 
             {
@@ -108,16 +108,16 @@ void CFramePerSecond::DisplayViCounter(DWORD FrameRate)
 		}
         else 
         {
-			if (CurrentFrame > (NoOfFrames << 3)) 
+			if (m_CurrentFrame > (NoOfFrames << 3))
             {
 				__int64 Total;
 				
 				Total = 0;
 				for (int count = 0; count < NoOfFrames; count ++) 
                 {
-					Total += Frames[count];
+					Total += m_Frames[count];
 				}
-				Percent = ((float)(Frequency/ ((double)Total / (NoOfFrames << 3)))) / m_ScreenHertz;
+				Percent = ((float)(m_Frequency / ((double)Total / (NoOfFrames << 3)))) / m_ScreenHertz;
 			}
             else 
             {
@@ -125,13 +125,13 @@ void CFramePerSecond::DisplayViCounter(DWORD FrameRate)
 				return;
 			}
 		}
-		g_Notify->DisplayMessage2(L"%.1f %%",Percent * 100);
+		g_Notify->DisplayMessage2(stdstr_f("%.1f %%",Percent * 100).ToUTF16().c_str());
 	}
 }
 
 void CFramePerSecond::FrameRateTypeChanged (CFramePerSecond * _this)
 {
-	_this->m_iFrameRateType    = g_Settings->LoadDword(UserInterface_FrameDisplayType);
+	_this->m_iFrameRateType = g_Settings->LoadDword(UserInterface_FrameDisplayType);
 	_this->Reset(true);
 }
 
@@ -147,33 +147,41 @@ void CFramePerSecond::UpdateDlCounter  ( void )
 	{
 		return;
 	}
-	if ((CurrentFrame & 3) == 0) {
+	if ((m_CurrentFrame & 3) == 0) {
 		LARGE_INTEGER Time;
 		QueryPerformanceCounter(&Time);
-		Frames[(CurrentFrame >> 2) % NoOfFrames] = Time.QuadPart - LastFrame;
-		LastFrame = Time.QuadPart;	
+		m_Frames[(m_CurrentFrame >> 2) % NoOfFrames] = Time.QuadPart - m_LastFrame;
+		m_LastFrame = Time.QuadPart;
 		DisplayDlCounter(0);
 	}
-	CurrentFrame += 1;
+	m_CurrentFrame += 1;
 }
 
-void CFramePerSecond::DisplayDlCounter(DWORD FrameRate) {
+void CFramePerSecond::DisplayDlCounter(DWORD FrameRate) 
+{
 	if (m_iFrameRateType != FR_DLs)
 	{
 		return;
 	}
-	if (FrameRate != 0) {
-		g_Notify->DisplayMessage2(L"DL/s: %d.00", FrameRate);
-	} else {
-		if (CurrentFrame > (NoOfFrames << 2)) {
+	if (FrameRate != 0)
+	{
+		g_Notify->DisplayMessage2(stdstr_f("DL/s: %d.00", FrameRate).ToUTF16().c_str());
+	}
+	else
+	{
+		if (m_CurrentFrame > (NoOfFrames << 2)) 
+		{
 			__int64 Total;
 			
 			Total = 0;
-			for (int count = 0; count < NoOfFrames; count ++) {
-				Total += Frames[count];
+			for (int count = 0; count < NoOfFrames; count ++) 
+			{
+				Total += m_Frames[count];
 			}
-			g_Notify->DisplayMessage2(L"DL/s: %.1f", Frequency/ ((double)Total / (NoOfFrames << 2)));
-		} else {
+			g_Notify->DisplayMessage2(stdstr_f("DL/s: %.1f", m_Frequency / ((double)Total / (NoOfFrames << 2))).ToUTF16().c_str());
+		} 
+		else 
+		{
 			g_Notify->DisplayMessage2(L"DL/s: -.--");
 		}
 	}
diff --git a/Source/Project64/User Interface/Frame Per Second Class.h b/Source/Project64/User Interface/Frame Per Second Class.h
index bbb32cbbf..0525fe4b0 100644
--- a/Source/Project64/User Interface/Frame Per Second Class.h	
+++ b/Source/Project64/User Interface/Frame Per Second Class.h	
@@ -10,21 +10,10 @@
 ****************************************************************************/
 #pragma once
 
-class CFramePerSecond {
-	CNotification * const g_Notify;
-	int  m_iFrameRateType, m_ScreenHertz;
-	
-	enum { NoOfFrames = 7 };
-
-	__int64 Frequency, Frames[NoOfFrames], LastFrame;
-	int CurrentFrame;
-
-	static void FrameRateTypeChanged (CFramePerSecond * _this);
-	static void ScreenHertzChanged   (CFramePerSecond * _this);
-
-
+class CFramePerSecond 
+{
 public:
-         CFramePerSecond ( CNotification * Notification );
+         CFramePerSecond ( void );
         ~CFramePerSecond ( void );
 
 	void Reset           ( bool ClearDisplay );
@@ -33,5 +22,15 @@ public:
 	void UpdateViCounter  ( void );
 	void DisplayDlCounter ( DWORD FrameRate );
 	void DisplayViCounter ( DWORD FrameRate );
-//	void ClearDisplay     ( void );
+
+private:
+	static void FrameRateTypeChanged(CFramePerSecond * _this);
+	static void ScreenHertzChanged(CFramePerSecond * _this);
+
+	int  m_iFrameRateType, m_ScreenHertz;
+
+	enum { NoOfFrames = 7 };
+
+	__int64 m_Frequency, m_Frames[NoOfFrames], m_LastFrame;
+	int m_CurrentFrame;
 };
diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp
index 70e3180ae..e917a2a65 100644
--- a/Source/Project64/User Interface/Gui Class.cpp	
+++ b/Source/Project64/User Interface/Gui Class.cpp	
@@ -9,6 +9,9 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
+#include <commctrl.h>
 #include "Settings/SettingType/SettingsType-Application.h"
 
 extern "C" 
@@ -19,7 +22,14 @@ void EnterLogOptions(HWND hwndOwner);
 #pragma comment(lib, "Comctl32.lib") 
 
 DWORD CALLBACK AboutBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam);
-DWORD CALLBACK MainGui_Proc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam);
+LRESULT CALLBACK MainGui_Proc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD lParam);
+
+extern BOOL set_about_field(
+    HWND hDlg,
+    int nIDDlgItem,
+    const wchar_t * config_string,
+    const wchar_t * language_string
+);
 
 CMainGui::CMainGui (bool bMainWindow, const char * WindowTitle ) :
 	CRomBrowser(m_hMainWindow,m_hStatusWnd),
@@ -158,15 +168,14 @@ void CMainGui::AboutIniBox (void)
 	DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_About_Ini), m_hMainWindow, (DLGPROC)AboutIniBoxProc,(LPARAM)this);
 }
 
-DWORD CALLBACK AboutIniBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD /*lParam*/) 
+DWORD CALLBACK AboutIniBoxProc (HWND hDlg, DWORD uMsg, DWORD wParam, DWORD /*lParam*/) 
 {
 	static wchar_t RDBHomePage[300], CHTHomePage[300], RDXHomePage[300];
 	
 	switch (uMsg) {
 	case WM_INITDIALOG:
 		{
-			HWND hDlg = (HWND)WndHandle;
-			wchar_t String[200], String2[200];
+			wchar_t String[200];
 			
 			//Title
 			LONG_PTR originalWndProc = GetWindowLongPtrW(hDlg, GWLP_WNDPROC);
@@ -176,12 +185,9 @@ DWORD CALLBACK AboutIniBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD
 
 			//Language
 			SetDlgItemTextW(hDlg,IDC_LAN,GS(INI_CURRENT_LANG));
-			swprintf(String, L"%s: %s", GS(INI_AUTHOR),GS(LANGUAGE_AUTHOR));
-			SetDlgItemTextW(hDlg,IDC_LAN_AUTHOR,String);
-			swprintf(String, L"%s: %s",GS(INI_VERSION),GS(LANGUAGE_VERSION));
-			SetDlgItemTextW(hDlg,IDC_LAN_VERSION,String);
-			swprintf(String, L"%s: %s",GS(INI_DATE),GS(LANGUAGE_DATE));
-			SetDlgItemTextW(hDlg,IDC_LAN_DATE,String);
+			set_about_field(hDlg, IDC_LAN_AUTHOR, GS(INI_AUTHOR), GS(LANGUAGE_AUTHOR));
+			set_about_field(hDlg, IDC_LAN_VERSION, GS(INI_VERSION), GS(LANGUAGE_VERSION));
+			set_about_field(hDlg, IDC_LAN_DATE, GS(INI_DATE), GS(LANGUAGE_DATE));
 			if (wcslen(GS(LANGUAGE_NAME)) == 0) 
             {
 				EnableWindow(GetDlgItem(hDlg,IDC_LAN),FALSE);
@@ -191,9 +197,8 @@ DWORD CALLBACK AboutIniBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD
 			}
 			
 			//RDB
-			stdstr IniFile = g_Settings->LoadString(SupportFile_RomDatabase).c_str();
-			SetDlgItemTextW(hDlg,IDC_RDB,GS(INI_CURRENT_RDB));
-			GetPrivateProfileStringW(L"Meta",L"Author",L"",String,sizeof(String),(wchar_t *)IniFile.c_str());
+			CIniFile RdbIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str());
+			wcsncpy(String, RdbIniFile.GetString("Meta","Author","").ToUTF16().c_str(),sizeof(String) / sizeof(String[0]));
 			if (wcslen(String) == 0) 
             {
 				EnableWindow(GetDlgItem(hDlg,IDC_RDB),FALSE);
@@ -202,24 +207,24 @@ DWORD CALLBACK AboutIniBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD
 				EnableWindow(GetDlgItem(hDlg,IDC_RDB_DATE),FALSE);
 				EnableWindow(GetDlgItem(hDlg,IDC_RDB_HOME),FALSE);
 			}
-			swprintf(String2,L"%s: %s",GS(INI_AUTHOR),String);
-			SetDlgItemTextW(hDlg,IDC_RDB_AUTHOR,String2);
-			GetPrivateProfileStringW(L"Meta",L"Version",L"",String,sizeof(String),(wchar_t *)IniFile.c_str());
-			swprintf(String2,L"%s: %s",GS(INI_VERSION),String);
-			SetDlgItemTextW(hDlg,IDC_RDB_VERSION,String2);
-			GetPrivateProfileStringW(L"Meta",L"Date",L"",String,sizeof(String),(wchar_t *)IniFile.c_str());
-			swprintf(String2,L"%s: %s",GS(INI_DATE),String);
-			SetDlgItemTextW(hDlg,IDC_RDB_DATE,String2);
-			GetPrivateProfileStringW(L"Meta",L"Homepage",L"",RDBHomePage,sizeof(RDBHomePage),(wchar_t *)IniFile.c_str());
-			SetDlgItemTextW(hDlg,IDC_RDB_HOME,GS(INI_HOMEPAGE));
-			if (wcslen(RDBHomePage) == 0) {
+
+			set_about_field(hDlg, IDC_RDB_AUTHOR, GS(INI_AUTHOR), String);
+			
+			wcsncpy(String, RdbIniFile.GetString("Meta","Version","").ToUTF16().c_str(),sizeof(String) / sizeof(String[0]));
+			set_about_field(hDlg, IDC_RDB_VERSION, GS(INI_VERSION), String);
+			wcsncpy(String, RdbIniFile.GetString("Meta","Date","").ToUTF16().c_str(),sizeof(String) / sizeof(String[0]));
+			set_about_field(hDlg, IDC_RDB_DATE, GS(INI_DATE), String);
+			wcsncpy(RDBHomePage, RdbIniFile.GetString("Meta","Homepage","").ToUTF16().c_str(),sizeof(RDBHomePage) / sizeof(RDBHomePage[0]));
+			SetDlgItemTextW(hDlg, IDC_RDB_HOME, GS(INI_HOMEPAGE));
+			if (wcslen(RDBHomePage) == 0) 
+			{
 				EnableWindow(GetDlgItem(hDlg,IDC_RDB_HOME),FALSE);
 			}
 			
 			//Cheat
 			SetDlgItemTextW(hDlg,IDC_CHT,GS(INI_CURRENT_CHT));
-			IniFile = g_Settings->LoadString(SupportFile_Cheats).c_str();
-			GetPrivateProfileStringW(L"Meta",L"Author",L"",String,sizeof(String),(wchar_t *)IniFile.c_str());
+			CIniFile CheatIniFile(g_Settings->LoadStringVal(SupportFile_Cheats).c_str());
+			wcsncpy(String, CheatIniFile.GetString("Meta","Author","").ToUTF16().c_str(),sizeof(String) / sizeof(String[0]));
 			if (wcslen(String) == 0) 
 			{
 				EnableWindow(GetDlgItem(hDlg,IDC_CHT),FALSE);
@@ -228,25 +233,22 @@ DWORD CALLBACK AboutIniBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD
 				EnableWindow(GetDlgItem(hDlg,IDC_CHT_DATE),FALSE);
 				EnableWindow(GetDlgItem(hDlg,IDC_CHT_HOME),FALSE);
 			}
-			swprintf(String2,L"%s: %s",GS(INI_AUTHOR),String);
-			SetDlgItemTextW(hDlg,IDC_CHT_AUTHOR,String2);
-			GetPrivateProfileStringW(L"Meta",L"Version",L"",String,sizeof(String),(wchar_t *)IniFile.c_str());
-			swprintf(String2,L"%s: %s",GS(INI_VERSION),String);
-			SetDlgItemTextW(hDlg,IDC_CHT_VERSION,String2);
-			GetPrivateProfileStringW(L"Meta",L"Date",L"",String,sizeof(String),(wchar_t *)IniFile.c_str());
-			swprintf(String2,L"%s: %s",GS(INI_DATE),String);
-			SetDlgItemTextW(hDlg,IDC_CHT_DATE,String2);
-			GetPrivateProfileStringW(L"Meta",L"Homepage",L"",CHTHomePage,sizeof(CHTHomePage),(wchar_t *)IniFile.c_str());
-			SetDlgItemTextW(hDlg,IDC_CHT_HOME,GS(INI_HOMEPAGE));
+			set_about_field(hDlg, IDC_CHT_AUTHOR, GS(INI_AUTHOR), String);
+			wcsncpy(String, CheatIniFile.GetString("Meta","Version","").ToUTF16().c_str(),sizeof(String) / sizeof(String[0]));
+			set_about_field(hDlg, IDC_CHT_VERSION, GS(INI_VERSION), String);
+			wcsncpy(String, CheatIniFile.GetString("Meta","Date","").ToUTF16().c_str(),sizeof(String) / sizeof(String[0]));
+			set_about_field(hDlg, IDC_CHT_DATE, GS(INI_DATE), String);
+			wcsncpy(CHTHomePage, CheatIniFile.GetString("Meta","Homepage","").ToUTF16().c_str(),sizeof(CHTHomePage) / sizeof(CHTHomePage[0]));
+			SetDlgItemTextW(hDlg, IDC_CHT_HOME, GS(INI_HOMEPAGE));
 			if (wcslen(CHTHomePage) == 0)
             {
 				EnableWindow(GetDlgItem(hDlg,IDC_CHT_HOME),FALSE);
 			}
 			
 			//Extended Info
-			SetDlgItemTextW(hDlg,IDC_RDX,GS(INI_CURRENT_RDX));
-			IniFile = g_Settings->LoadString(SupportFile_ExtInfo).c_str();
-			GetPrivateProfileStringW(L"Meta",L"Author",L"",String,sizeof(String),(wchar_t *)IniFile.c_str());
+			SetDlgItemTextW(hDlg, IDC_RDX, GS(INI_CURRENT_RDX));
+			CIniFile RdxIniFile(g_Settings->LoadStringVal(SupportFile_ExtInfo).c_str());
+			wcsncpy(String, RdxIniFile.GetString("Meta","Author","").ToUTF16().c_str(),sizeof(String) / sizeof(String[0]));
 			if (wcslen(String) == 0) 
 			{
 				EnableWindow(GetDlgItem(hDlg,IDC_RDX),FALSE);
@@ -255,23 +257,18 @@ DWORD CALLBACK AboutIniBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD
 				EnableWindow(GetDlgItem(hDlg,IDC_RDX_DATE),FALSE);
 				EnableWindow(GetDlgItem(hDlg,IDC_RDX_HOME),FALSE);
 			}
-			swprintf(String2,L"%s: %s",GS(INI_AUTHOR),String);
-			SetDlgItemTextW(hDlg,IDC_RDX_AUTHOR,String2);
-			GetPrivateProfileStringW(L"Meta",L"Version",L"",String,sizeof(String),(wchar_t *)IniFile.c_str());
-			swprintf(String2,L"%s: %s",GS(INI_VERSION),String);
-			SetDlgItemTextW(hDlg,IDC_RDX_VERSION,String2);
-			GetPrivateProfileStringW(L"Meta",L"Date",L"",String,sizeof(String),(wchar_t *)IniFile.c_str());
-			swprintf(String2,L"%s: %s",GS(INI_DATE),String);
-			SetDlgItemTextW(hDlg,IDC_RDX_DATE,String2);
-			GetPrivateProfileStringW(L"Meta",L"Homepage",L"",RDXHomePage,sizeof(CHTHomePage),(wchar_t *)IniFile.c_str());
-			SetDlgItemTextW(hDlg,IDC_RDX_HOME,GS(INI_HOMEPAGE));
+			set_about_field(hDlg, IDC_RDX_AUTHOR, GS(INI_AUTHOR), String);
+			wcsncpy(String, RdxIniFile.GetString("Meta","Version","").ToUTF16().c_str(),sizeof(String) / sizeof(String[0]));
+			set_about_field(hDlg, IDC_RDX_VERSION, GS(INI_VERSION), String);
+			wcsncpy(String, RdxIniFile.GetString("Meta","Date","").ToUTF16().c_str(),sizeof(String) / sizeof(String[0]));
+			set_about_field(hDlg, IDC_RDX_DATE, GS(INI_DATE), String);
+			wcsncpy(RDXHomePage, RdxIniFile.GetString("Meta","Homepage","").ToUTF16().c_str(),sizeof(RDXHomePage) / sizeof(RDXHomePage[0]));
+			SetDlgItemTextW(hDlg, IDC_RDX_HOME, GS(INI_HOMEPAGE));
 			if (wcslen(RDXHomePage) == 0) 
             {
 				EnableWindow(GetDlgItem(hDlg,IDC_RDX_HOME),FALSE);
 			}
-
 			SetDlgItemTextW(hDlg, IDOK, GS(CHEAT_OK));
-
 		}
 		break;
 	case WM_COMMAND:
@@ -282,7 +279,7 @@ DWORD CALLBACK AboutIniBoxProc (HWND WndHandle, DWORD uMsg, DWORD wParam, DWORD
 		case IDC_RDX_HOME: ShellExecuteW(NULL,L"open",RDXHomePage,NULL,NULL,SW_SHOWNORMAL); break;
 		case IDOK:
 		case IDCANCEL:
-			EndDialog((HWND)WndHandle,0);
+			EndDialog(hDlg,0);
 			break;
 		}
 	default:
@@ -348,12 +345,14 @@ void CMainGui::Create (const char * WindowTitle)
 	m_Created = m_hMainWindow != NULL;
 }
 
-void CMainGui::CreateStatusBar (void) {
+void CMainGui::CreateStatusBar (void)
+{
 	m_hStatusWnd = (HWND)CreateStatusWindow( WS_CHILD | WS_VISIBLE, "", m_hMainWindow, StatusBarID );
 	SendMessage( (HWND)m_hStatusWnd, SB_SETTEXT, 0, (LPARAM)"" );
 }
 
-int CMainGui::ProcessAllMessages (void) {
+WPARAM CMainGui::ProcessAllMessages (void)
+{
 	MSG msg;
 
 	while (GetMessage(&msg,NULL,0,0))
@@ -530,8 +529,10 @@ void CMainGui::SaveWindowLoc ( void )
 	}
 }
 
-DWORD CALLBACK CMainGui::MainGui_Proc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam) {
-	switch (uMsg) {	
+LRESULT CALLBACK CMainGui::MainGui_Proc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam)
+{
+	switch (uMsg)
+	{	
 	case WM_CREATE:
 		{
 			//record class for future usage	
@@ -546,8 +547,8 @@ DWORD CALLBACK CMainGui::MainGui_Proc (HWND hWnd, DWORD uMsg, DWORD wParam, DWOR
 			int X = (GetSystemMetrics( SM_CXSCREEN ) - _this->Width()) / 2;
 			int	Y = (GetSystemMetrics( SM_CYSCREEN ) - _this->Height()) / 2;
 
-			g_Settings->LoadDword(UserInterface_MainWindowTop,(DWORD &)Y);
-			g_Settings->LoadDword(UserInterface_MainWindowLeft,(DWORD &)X);
+			g_Settings->LoadDword(UserInterface_MainWindowTop,(uint32_t &)Y);
+			g_Settings->LoadDword(UserInterface_MainWindowLeft, (uint32_t &)X);
 
 			_this->SetPos(X,Y);
 			
@@ -776,7 +777,7 @@ DWORD CALLBACK CMainGui::MainGui_Proc (HWND hWnd, DWORD uMsg, DWORD wParam, DWOR
 			{
 				if (!fActive && g_Settings->LoadBool(UserInterface_InFullScreen))
 				{
-					g_Notify->WindowMode();
+					Notify().WindowMode();
 					if (bAutoSleep() && g_BaseSystem)
 					{
 						//System->ExternalEvent(PauseCPU_AppLostActiveDelayed );
@@ -845,7 +846,7 @@ DWORD CALLBACK CMainGui::MainGui_Proc (HWND hWnd, DWORD uMsg, DWORD wParam, DWOR
 					CN64Rom Rom;
 					Rom.LoadN64Image(_this->CurrentedSelectedRom(),true);
 					Rom.SaveRomSettingID(true);
-					/*if (g_Settings->LoadString(ROM_MD5).length() == 0) {
+					/*if (g_Settings->LoadStringVal(ROM_MD5).length() == 0) {
 						Rom.LoadN64Image(_this->CurrentedSelectedRom(),false);
 						g_Settings->SaveString(ROM_MD5,Rom.GetRomMD5().c_str());
 						g_Settings->SaveString(ROM_InternalName,Rom.GetRomName().c_str());
@@ -927,7 +928,7 @@ DWORD CALLBACK CMainGui::MainGui_Proc (HWND hWnd, DWORD uMsg, DWORD wParam, DWOR
 			CMainGui   * _this = (CMainGui *)GetProp((HWND)hWnd,"Class");
 			if (_this->m_bMainWindow)
 			{
-				g_Notify->WindowMode();
+				Notify().WindowMode();
 			}
 			_this->m_hMainWindow = NULL;
 			WriteTrace(TraceDebug,__FUNCTION__ ": WM_DESTROY - 1");
@@ -1059,7 +1060,7 @@ DWORD CALLBACK AboutBoxProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam)
 				CLIP_DEFAULT_PRECIS,
 				PROOF_QUALITY,
 				DEFAULT_PITCH|FF_DONTCARE,
-				_T("Arial")
+				"Arial"
 			);
 
 			hAuthorFont = ::CreateFont
@@ -1077,7 +1078,7 @@ DWORD CALLBACK AboutBoxProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam)
 				CLIP_DEFAULT_PRECIS,
 				PROOF_QUALITY,
 				DEFAULT_PITCH|FF_DONTCARE,
-				_T("Arial")
+				"Arial"
 			);
 
 			hPageHeadingFont = ::CreateFont
@@ -1095,7 +1096,7 @@ DWORD CALLBACK AboutBoxProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam)
 				CLIP_DEFAULT_PRECIS,
 				PROOF_QUALITY,
 				DEFAULT_PITCH|FF_DONTCARE,
-				_T("Arial Bold")
+				"Arial Bold"
 			);
 
 			SendDlgItemMessage(hWnd,IDC_VERSION,WM_SETFONT,(WPARAM)hTextFont,TRUE);
@@ -1141,10 +1142,8 @@ DWORD CALLBACK AboutBoxProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam)
 			{
 				lResult = HTCAPTION;
 			}
-			SetWindowLong(hWnd, DWL_MSGRESULT, lResult);
-
+			SetWindowLong(hWnd, DWLP_MSGRESULT, lResult);
 			return TRUE;
-
 		}
 		break;
 	case WM_CTLCOLORSTATIC:
@@ -1232,3 +1231,27 @@ DWORD CALLBACK AboutBoxProc (HWND hWnd, DWORD uMsg, DWORD wParam, DWORD lParam)
 	}
 	return TRUE;
 }
+
+BOOL set_about_field(
+    HWND hDlg,
+    int nIDDlgItem,
+    const wchar_t * config_string,
+    const wchar_t * language_string
+)
+{
+    wchar_t temp_string[200];
+
+    swprintf(
+        temp_string,
+        sizeof(temp_string) / sizeof(temp_string[0]),
+        L"%s: %s",
+        config_string,
+        language_string
+    );
+    return SetDlgItemTextW(
+        hDlg,
+        nIDDlgItem,
+        temp_string
+    );
+}
+#endif
diff --git a/Source/Project64/User Interface/Gui Class.h b/Source/Project64/User Interface/Gui Class.h
index 7b664744e..30dcca993 100644
--- a/Source/Project64/User Interface/Gui Class.h	
+++ b/Source/Project64/User Interface/Gui Class.h	
@@ -33,19 +33,19 @@ class CMainGui :
 
 	enum { Timer_SetWindowPos = 1 };
 
-	typedef struct 
+	struct RESET_PLUGIN
 	{
 		CN64System * system;
 		CPlugins * plugins;
 		HANDLE hEvent;
 		bool res;
-	} RESET_PLUGIN;
+	};
 public:
 		 CMainGui ( bool bMainWindow, const char * WindowTitle = "" );
 		~CMainGui ( void );
 	
 	//Message Processing	 
-	int  ProcessAllMessages ( void );
+	WPARAM ProcessAllMessages ( void );
 	bool ProcessGuiMessages ( void );
 
 	//debugging functions
@@ -99,7 +99,7 @@ private:
 
 	friend DWORD CALLBACK AboutBoxProc ( HWND, DWORD, DWORD, DWORD );
 	friend DWORD CALLBACK AboutIniBoxProc ( HWND, DWORD, DWORD, DWORD );
-	static DWORD CALLBACK MainGui_Proc ( HWND, DWORD, DWORD, DWORD );
+	static LRESULT CALLBACK MainGui_Proc ( HWND, DWORD, DWORD, DWORD );
 
 	friend void RomBowserEnabledChanged  (CMainGui * Gui);
 	friend void RomBowserColoumnsChanged (CMainGui * Gui);
diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp
index 04adca6b0..54cacfe09 100644
--- a/Source/Project64/User Interface/Main Menu Class.cpp	
+++ b/Source/Project64/User Interface/Main Menu Class.cpp	
@@ -1,5 +1,9 @@
 #include "stdafx.h"
 
+#ifdef WINDOWS_UI
+#include <windows.h>
+#include <commdlg.h>
+
 CMainMenu::CMainMenu ( CMainGui * hMainWindow ):
 	CBaseMenu(),
     m_ResetAccelerators(true)
@@ -120,7 +124,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
 		break;
 	case ID_SYSTEM_BITMAP:
 		{
-			stdstr Dir(g_Settings->LoadString(Directory_SnapShot));
+			stdstr Dir(g_Settings->LoadStringVal(Directory_SnapShot));
 			WriteTraceF(TraceGfxPlugin,__FUNCTION__ ": CaptureScreen(%s): Starting",Dir.c_str());
 			g_Plugins->Gfx()->CaptureScreen(Dir.c_str());
 			WriteTrace(TraceGfxPlugin,__FUNCTION__ ": CaptureScreen: Done");
@@ -144,7 +148,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
 			memset(&SaveFile, 0, sizeof(SaveFile));
 			memset(&openfilename, 0, sizeof(openfilename));
 
-			g_Settings->LoadString(Directory_LastSave, Directory,sizeof(Directory));
+			g_Settings->LoadStringVal(Directory_LastSave, Directory,sizeof(Directory));
 
 			openfilename.lStructSize  = sizeof( openfilename );
 			openfilename.hwndOwner    = (HWND)hWnd;
@@ -187,7 +191,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
 			memset(&SaveFile, 0, sizeof(SaveFile));
 			memset(&openfilename, 0, sizeof(openfilename));
 
-			g_Settings->LoadString(Directory_LastSave, Directory,sizeof(Directory));
+			g_Settings->LoadStringVal(Directory_LastSave, Directory,sizeof(Directory));
 
 			openfilename.lStructSize  = sizeof( openfilename );
 			openfilename.hwndOwner    = (HWND)hWnd;
@@ -237,7 +241,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
 		g_BaseSystem->IncreaseSpeed();
 		break;
 	case ID_OPTIONS_DECREASE_SPEED:
-		g_BaseSystem->DecreaeSpeed();
+		g_BaseSystem->DecreaseSpeed();
 		break;
 	case ID_OPTIONS_FULLSCREEN:
 		g_BaseSystem->ExternalEvent(SysEvent_ChangingFullScreen);		
@@ -467,7 +471,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
 	case ID_DEBUGGER_INTERRUPT_PI: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_PI); break;
 	case ID_DEBUGGER_INTERRUPT_DP: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_DP); break;
 	case ID_CURRENT_SAVE_DEFAULT: 
-		Notify().DisplayMessage(3,L"Save Slot (%s) selected",GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str());
+		Notify().DisplayMessage(3,stdstr_f("Save Slot (%s) selected",GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str()).ToUTF16().c_str());
 		g_Settings->SaveDword(Game_CurrentSaveState,(DWORD)(MenuID - ID_CURRENT_SAVE_DEFAULT)); 
 		break;
 	case ID_CURRENT_SAVE_1: 
@@ -480,7 +484,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
 	case ID_CURRENT_SAVE_8: 
 	case ID_CURRENT_SAVE_9: 
 	case ID_CURRENT_SAVE_10: 
-		Notify().DisplayMessage(3,L"Save Slot (%s) selected",GetSaveSlotString((MenuID - ID_CURRENT_SAVE_1) + 1).c_str());
+		Notify().DisplayMessage(3,stdstr_f("Save Slot (%s) selected",GetSaveSlotString((MenuID - ID_CURRENT_SAVE_1) + 1)).ToUTF16().c_str());
 		g_Settings->SaveDword(Game_CurrentSaveState,(DWORD)((MenuID - ID_CURRENT_SAVE_1) + 1)); 
 		break;
 	case ID_HELP_SUPPORTFORUM: ShellExecute(NULL, "open", "http://forum.pj64-emu.com/", NULL, NULL, SW_SHOWMAXIMIZED); break;
@@ -501,7 +505,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
 			stdstr Dir = g_Settings->LoadStringIndex(Directory_RecentGameDirIndex,Offset);
 			if (Dir.length() > 0) {
 				g_Settings->SaveString(Directory_Game,Dir.c_str());
-				g_Notify->AddRecentDir(Dir.c_str());
+				Notify().AddRecentDir(Dir.c_str());
 				_Gui->RefreshMenu();
 				if (_Gui->RomBrowserVisible()) {
 					_Gui->RefreshRomBrowser();
@@ -597,8 +601,8 @@ std::wstring CMainMenu::GetSaveSlotString (int Slot)
 	stdstr LastSaveTime;
 
 	//check first save name
-	stdstr _GoodName = g_Settings->LoadString(Game_GoodName);
-	stdstr _InstantSaveDirectory = g_Settings->LoadString(Directory_InstantSave);
+	stdstr _GoodName = g_Settings->LoadStringVal(Game_GoodName);
+	stdstr _InstantSaveDirectory = g_Settings->LoadStringVal(Directory_InstantSave);
 	stdstr CurrentSaveName;
 	if (Slot != 0)
 	{ 
@@ -623,7 +627,7 @@ std::wstring CMainMenu::GetSaveSlotString (int Slot)
 	// Check old file name 
 	if (LastSaveTime.empty())
 	{
-		stdstr _RomName = g_Settings->LoadString(Game_GameName);
+		stdstr _RomName = g_Settings->LoadStringVal(Game_GameName);
 		if (Slot > 0) 
 		{ 
 			FileName.Format("%s%s.pj%d", _InstantSaveDirectory.c_str(), _RomName.c_str(),Slot);
@@ -657,7 +661,7 @@ void CMainMenu::FillOutMenu ( HMENU hMenu )
 	bool inBasicMode = g_Settings->LoadBool(UserInterface_BasicMode);
 	bool CPURunning  = g_Settings->LoadBool(GameRunning_CPU_Running);
 	bool RomLoading  = g_Settings->LoadBool(GameRunning_LoadingInProgress);
-	bool RomLoaded   = g_Settings->LoadString(Game_GameName).length() > 0;
+	bool RomLoaded   = g_Settings->LoadStringVal(Game_GameName).length() > 0;
 	bool RomList     = g_Settings->LoadBool(RomBrowser_Enabled) && !CPURunning;
 	
 	CMenuShortCutKey::ACCESS_MODE AccessLevel = CMenuShortCutKey::GAME_NOT_RUNNING;
@@ -695,7 +699,11 @@ void CMainMenu::FillOutMenu ( HMENU hMenu )
 			break;
 		}
 		stdstr_f MenuString("&%d %s",(count + 1) % 10,LastRom.c_str());
-        RecentRomMenu.push_back(MENU_ITEM(ID_RECENT_ROM_START + count,EMPTY_STRING,EMPTY_STDSTR,NULL,MenuString.ToUTF16().c_str()));
+
+		WCHAR *w_LastRom = new WCHAR[MenuString.length() + 1];
+		::mbstowcs(w_LastRom, MenuString.c_str(), MenuString.length() + 1);
+		RecentRomMenu.push_back(MENU_ITEM(ID_RECENT_ROM_START + count, EMPTY_STRING, EMPTY_STDSTR, NULL, w_LastRom));
+		delete[] w_LastRom;
 	}
 
 	
@@ -713,7 +721,11 @@ void CMainMenu::FillOutMenu ( HMENU hMenu )
 		}
 		
 		stdstr_f MenuString("&%d %s",(count + 1) % 10,LastDir.c_str());
-        RecentDirMenu.push_back(MENU_ITEM(ID_RECENT_DIR_START + count,EMPTY_STRING,EMPTY_STDSTR,NULL,MenuString.ToUTF16().c_str()));
+
+		WCHAR *w_LastDir = new WCHAR[MenuString.length() + 1];
+		::mbstowcs(w_LastDir, MenuString.c_str(), MenuString.length() + 1);
+		RecentDirMenu.push_back(MENU_ITEM(ID_RECENT_DIR_START + count, EMPTY_STRING, EMPTY_STDSTR, NULL, w_LastDir));
+		delete[] w_LastDir;
 	}
 
 	/* File Menu
@@ -1237,3 +1249,4 @@ void CMainMenu::ResetMenu(void)
 
 	WriteTrace(TraceDebug,__FUNCTION__ ": Done");
 }
+#endif
diff --git a/Source/Project64/User Interface/Main Menu Class.h b/Source/Project64/User Interface/Main Menu Class.h
index cb7ce9f54..880c36208 100644
--- a/Source/Project64/User Interface/Main Menu Class.h	
+++ b/Source/Project64/User Interface/Main Menu Class.h	
@@ -1,4 +1,7 @@
-enum MainMenuID {
+#pragma once
+
+enum MainMenuID 
+{
 	//File Menu
 	ID_FILE_OPEN_ROM = 4000, ID_FILE_ROM_INFO, ID_FILE_STARTEMULATION, ID_FILE_ENDEMULATION,
 	ID_FILE_ROMDIRECTORY, ID_FILE_REFRESHROMLIST, ID_FILE_EXIT,
diff --git a/Source/Project64/User Interface/Menu Class.cpp b/Source/Project64/User Interface/Menu Class.cpp
index 0055f4f04..42b4fe3eb 100644
--- a/Source/Project64/User Interface/Menu Class.cpp	
+++ b/Source/Project64/User Interface/Menu Class.cpp	
@@ -58,11 +58,11 @@ bool CBaseMenu::AddMenu(HMENU hMenu, MenuItemList Items ) {
 			SetMenuItemInfo((HMENU)ItemID, (DWORD)MenuItem->SubMenu(), FALSE,&lpmii);
 		}
 		
-		if (MenuItem->ShotCut().empty() == false) 
+		if (MenuItem->ShortCut().empty() == false)
         {
 			String = Text;
 			String += L"\t";
-			String += MenuItem->ShotCut();
+			String += MenuItem->ShortCut();
 			Text = String;
 		}
 		AppendMenuW(hMenu,uFlags,ItemID,Text.c_str());
diff --git a/Source/Project64/User Interface/Menu Class.h b/Source/Project64/User Interface/Menu Class.h
index c34ba9e21..a8e1fc8b7 100644
--- a/Source/Project64/User Interface/Menu Class.h	
+++ b/Source/Project64/User Interface/Menu Class.h	
@@ -27,17 +27,17 @@ public:
     {
 		Reset(NO_ID);
 	}
-	MENU_ITEM ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShotCut = EMPTY_STDSTR,
+	MENU_ITEM ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShortCut = EMPTY_STDSTR,
 		void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR) 
 	{
-		Reset(ID,Title,ShotCut,SubMenu,ManualString);
+		Reset(ID,Title,ShortCut,SubMenu,ManualString);
 	}
-	void Reset ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShotCut2 = EMPTY_STDSTR,
+	void Reset ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShortCut2 = EMPTY_STDSTR,
 		void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR) 
 	{
 		this->m_ID           = ID;
 		this->m_Title        = Title;
-		this->m_ShotCut      = ShotCut2;
+		this->m_ShortCut     = ShortCut2;
 		this->m_SubMenu      = SubMenu;
 		this->m_ManualString = ManualString;
 		this->m_ItemTicked   = false;
@@ -46,7 +46,7 @@ public:
 
     int ID() const { return m_ID;  }
 	LanguageStringID Title() const { return m_Title;  }
-	const std::wstring & ShotCut() const { return m_ShotCut;  }
+	const std::wstring & ShortCut() const { return m_ShortCut;  }
 	void * SubMenu() const { return m_SubMenu;  }
 	const std::wstring & ManualString() const { return m_ManualString;  }
 	bool ItemTicked() const { return m_ItemTicked;  }
@@ -59,7 +59,7 @@ public:
 private:
     int                m_ID; 
 	LanguageStringID   m_Title; 
-	std::wstring       m_ShotCut;
+	std::wstring       m_ShortCut;
 	void *             m_SubMenu;
 	std::wstring       m_ManualString;
 	bool               m_ItemTicked;
diff --git a/Source/Project64/User Interface/MenuShortCuts.cpp b/Source/Project64/User Interface/MenuShortCuts.cpp
index d2f1a5952..b051b503e 100644
--- a/Source/Project64/User Interface/MenuShortCuts.cpp	
+++ b/Source/Project64/User Interface/MenuShortCuts.cpp	
@@ -348,7 +348,7 @@ void CShortCuts::Load (bool InitialValues )
 	AddShortCut(ID_OPTIONS_CPU_USAGE,   STR_SHORTCUT_OPTIONS, MENU_SHOW_CPU,    CMenuShortCutKey::GAME_RUNNING );
 	AddShortCut(ID_OPTIONS_SETTINGS,    STR_SHORTCUT_OPTIONS, MENU_SETTINGS,    CMenuShortCutKey::NOT_IN_FULLSCREEN );
 
-	CPath ShortCutFile = g_Settings->LoadString(SupportFile_ShortCuts);
+	CPath ShortCutFile = g_Settings->LoadStringVal(SupportFile_ShortCuts);
 	if (!ShortCutFile.Exists() || InitialValues) 
 	{
 		m_ShortCuts.find(ID_FILE_OPEN_ROM)->second.AddShortCut('O',TRUE,false,false,CMenuShortCutKey::GAME_RUNNING);
@@ -416,7 +416,7 @@ void CShortCuts::Save( void )
 {
 	CGuard CS(m_CS);
 
-	stdstr FileName = g_Settings->LoadString(SupportFile_ShortCuts);
+	stdstr FileName = g_Settings->LoadStringVal(SupportFile_ShortCuts);
 	FILE *file = fopen(FileName.c_str(),"w");
 	if (file == NULL)
 	{
diff --git a/Source/Project64/User Interface/MenuShortCuts.h b/Source/Project64/User Interface/MenuShortCuts.h
index 8652553cf..f3ccb90cb 100644
--- a/Source/Project64/User Interface/MenuShortCuts.h	
+++ b/Source/Project64/User Interface/MenuShortCuts.h	
@@ -10,11 +10,11 @@
 ****************************************************************************/
 #pragma once
 
-typedef struct { 
-	LPCSTR    Name; 
-	int       Key;  
-	LPCSTR    KeyName; 
-} VIRTUAL_KEY;
+struct VIRTUAL_KEY {
+	LPCSTR    Name;
+	int       Key;
+	LPCSTR    KeyName;
+};
 
 class CMenuShortCutKey {
 public:
diff --git a/Source/Project64/User Interface/Notification Class.cpp b/Source/Project64/User Interface/Notification Class.cpp
index ba41100ce..bb758782c 100644
--- a/Source/Project64/User Interface/Notification Class.cpp	
+++ b/Source/Project64/User Interface/Notification Class.cpp	
@@ -7,14 +7,19 @@ CNotification & Notify ( void )
 	return g_Notify;
 }
 
-CNotification::CNotification  ( ) :
-	m_NextMsg(0), 
+CNotification::CNotification() :
+	m_hWnd(NULL), 
 	m_gfxPlugin(NULL),
-	m_hWnd(NULL)
+	m_NextMsg(0)
 {
 	 _tzset();
 }
 
+void CNotification::AppInitDone(void)
+{
+	CNotificationSettings::RegisterNotifications();
+}
+
 void CNotification::SetMainWindow  ( CMainGui * Gui ) 
 {
 	m_hWnd = Gui;
@@ -43,23 +48,17 @@ void CNotification::WindowMode ( void ) const
 	InsideFunc = false;
 }
 
-void CNotification::DisplayError ( const wchar_t * Message, ... ) const 
+void CNotification::DisplayError(LanguageStringID StringID) const
 {
-	va_list ap;
-	va_start( ap, Message );
-	DisplayError (Message,ap);
+	DisplayError(g_Lang->GetString(StringID).c_str());
 }
 
-void CNotification::DisplayError ( const wchar_t * Message, va_list ap ) const 
+void CNotification::DisplayError(const wchar_t * Message) const
 {
 	if (this == NULL) { return; }
-	wchar_t Msg[1000];
-
-	_vsnwprintf( Msg,sizeof(Msg) - 1,Message, ap );
-	va_end( ap );
 
     stdstr TraceMessage;
-    TraceMessage.FromUTF16(Msg);
+	TraceMessage.FromUTF16(Message);
 	WriteTrace(TraceError,TraceMessage.c_str());
 	WindowMode();
 
@@ -68,17 +67,15 @@ void CNotification::DisplayError ( const wchar_t * Message, va_list ap ) const
     { 
         Parent = m_hWnd->GetHandle(); 
     }
-	MessageBoxW(Parent,Msg,GS(MSG_MSGBOX_TITLE),MB_OK|MB_ICONERROR|MB_SETFOREGROUND);
+	MessageBoxW(Parent, Message, GS(MSG_MSGBOX_TITLE), MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
 }
 
-void CNotification::DisplayMessage  ( int DisplayTime, const wchar_t * Message, ... ) const 
+void CNotification::DisplayMessage(int DisplayTime, LanguageStringID StringID) const
 {
-	va_list ap;
-	va_start( ap, Message );
-	DisplayMessage (DisplayTime, Message,ap);
+	DisplayMessage(DisplayTime, g_Lang->GetString(StringID).c_str());
 }
 
-void CNotification::DisplayMessage  ( int DisplayTime, const wchar_t * Message, va_list ap ) const 
+void CNotification::DisplayMessage(int DisplayTime, const wchar_t * Message) const
 {
 	if (!m_hWnd) { return; }
 
@@ -97,13 +94,7 @@ void CNotification::DisplayMessage  ( int DisplayTime, const wchar_t * Message,
 		{
 			m_NextMsg = 0;
 		}
-	}
-	
-	wchar_t Msg[1000];
-
-	_vsnwprintf( Msg,sizeof(Msg) - 1,Message, ap );
-	va_end( ap );
-	
+	}	
 	
 	if (InFullScreen())
 	{
@@ -111,33 +102,30 @@ void CNotification::DisplayMessage  ( int DisplayTime, const wchar_t * Message,
 		{
 			WriteTrace(TraceGfxPlugin,__FUNCTION__ ": DrawStatus - Starting");
 			stdstr PluginMessage;
-			PluginMessage.FromUTF16(Msg);
+			PluginMessage.FromUTF16(Message);
 			m_gfxPlugin->DrawStatus(PluginMessage.c_str(), FALSE);
 			WriteTrace(TraceGfxPlugin,__FUNCTION__ ": DrawStatus - Done");
 		}
 	} 
     else 
     {
-		m_hWnd->SetStatusText(0, Msg);
+#if defined(WINDOWS_UI)
+		m_hWnd->SetStatusText(0, Message);
+#else
+		g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
 	}
 }
 
-void CNotification::DisplayMessage2 ( const wchar_t * Message, ... ) const 
-{
-	va_list ap;
-	va_start( ap, Message );
-	DisplayMessage2 (Message,ap);
-}
-
-void CNotification::DisplayMessage2 (  const wchar_t * Message, va_list ap ) const 
+void CNotification::DisplayMessage2 ( const wchar_t * Message ) const 
 {
 	if (!m_hWnd) { return; }
 
-	wchar_t Msg[1000];
-	_vsnwprintf( Msg,sizeof(Msg) - 1 ,Message, ap );
-	va_end( ap );
-	
-    m_hWnd->SetStatusText(1,Msg);
+#if defined(WINDOWS_UI)
+	m_hWnd->SetStatusText(1, Message);
+#else
+    g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
 }
 
 void CNotification::SetGfxPlugin( CGfxPlugin * Plugin )
@@ -147,25 +135,30 @@ void CNotification::SetGfxPlugin( CGfxPlugin * Plugin )
 
 void CNotification::SetWindowCaption (const wchar_t * Caption)
 {
-	wchar_t WinTitle[256];
-    _snwprintf( WinTitle, sizeof(WinTitle), L"%s - %s", Caption, g_Settings->LoadString(Setting_ApplicationName).ToUTF16().c_str());
-	WinTitle[sizeof(WinTitle) - 1] = 0;
+	static const size_t TITLE_SIZE = 256;
+	wchar_t WinTitle[TITLE_SIZE];
+
+	_snwprintf(WinTitle, TITLE_SIZE, L"%s - %s", Caption, g_Settings->LoadStringVal(Setting_ApplicationName).ToUTF16().c_str());
+	WinTitle[TITLE_SIZE - 1] = 0;
+#if defined(WINDOWS_UI)
 	m_hWnd->Caption(WinTitle);
+#else
+	g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
 }
 
-void CNotification::FatalError  ( const wchar_t * Message, ... ) const 
+void CNotification::FatalError(LanguageStringID StringID) const
 {
-	wchar_t Msg[1000];
-	va_list ap;
+	FatalError(g_Lang->GetString(StringID).c_str());
+}
 
+void CNotification::FatalError(const wchar_t * Message) const
+{
 	WindowMode();
 
-	va_start( ap, Message );
-	_vsnwprintf( Msg,(sizeof(Msg) / sizeof(Msg[0])) - 1, Message, ap );
-	va_end( ap );
 	HWND Parent = NULL;
 	if (m_hWnd) { Parent = reinterpret_cast<HWND>(m_hWnd->GetHandle()); }
-	MessageBoxW(Parent,Msg,L"Error",MB_OK|MB_ICONERROR|MB_SETFOREGROUND);
+	MessageBoxW(Parent, Message, L"Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
 	ExitThread(0);
 }
 
@@ -255,7 +248,12 @@ void CNotification::AddRecentRom ( const char * ImagePath )
 void CNotification::RefreshMenu ( void )
 {
 	if (m_hWnd == NULL) { return; }
+
+#if defined(WINDOWS_UI)
 	m_hWnd->RefreshMenu();
+#else
+	g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
 }
 
 void CNotification::HideRomBrowser ( void )
@@ -278,13 +276,23 @@ void CNotification::ShowRomBrowser ( void )
 void CNotification::BringToTop ( void )
 {
 	if (m_hWnd == NULL) { return; }
+
+#if defined(WINDOWS_UI)
 	m_hWnd->BringToTop();
+#else
+	g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
 }
 
 void CNotification::MakeWindowOnTop ( bool OnTop )
 {
 	if (m_hWnd == NULL) { return; }
+
+#if defined(WINDOWS_UI)
 	m_hWnd->MakeWindowOnTop(OnTop);
+#else
+	g_Notify -> BreakPoint(__FILEW__, __LINE__);
+#endif
 }
 
 void CNotification::ChangeFullScreen ( void ) const
@@ -296,14 +304,20 @@ void CNotification::ChangeFullScreen ( void ) const
 bool CNotification::ProcessGuiMessages ( void ) const
 {
 	if (m_hWnd == NULL) { return false; }
+
+#if defined(WINDOWS_UI)
 	return m_hWnd->ProcessGuiMessages();
+#else
+	g_Notify -> BreakPoint(__FILEW__, __LINE__);
+	return false;
+#endif
 }
 
 void CNotification::BreakPoint ( const wchar_t * FileName, const int LineNumber )
 {
 	if (g_Settings->LoadBool(Debugger_Enabled))
 	{
-		DisplayError(L"Break point found at\n%s\n%d",FileName, LineNumber);
+		DisplayError(stdstr_f("Break point found at\n%s\n%d",FileName, LineNumber).ToUTF16().c_str());
 		if (IsDebuggerPresent() != 0)
 		{
 			DebugBreak();
diff --git a/Source/Project64/User Interface/Notification Class.h b/Source/Project64/User Interface/Notification Class.h
index 8a7a2faf0..ed600f4f3 100644
--- a/Source/Project64/User Interface/Notification Class.h	
+++ b/Source/Project64/User Interface/Notification Class.h	
@@ -20,27 +20,25 @@ class CNotification :
 public:
          CNotification    ( void );
 	
+	void AppInitDone ( void );
+
 	// Make sure we are not in full screen
 	void WindowMode       ( void ) const;
 
 	//Error Messages
-    void DisplayError     ( const wchar_t * Message, ... ) const;
-	void DisplayError     ( const wchar_t * Message, va_list ap ) const;
-    void DisplayError     ( LanguageStringID StringID ) const { std::wstring str = g_Lang->GetString(StringID); DisplayError(str.c_str()); }
-	void FatalError       ( const wchar_t * Message, ... ) const;
-	void FatalError       ( const wchar_t * Message, va_list ap ) const;
-	void FatalError       ( LanguageStringID StringID ) const { std::wstring str = g_Lang->GetString(StringID); FatalError(str.c_str()); }
-	
+	virtual void DisplayError(const wchar_t * Message) const;
+	virtual void DisplayError(LanguageStringID StringID) const;
+
+	virtual void FatalError(const wchar_t * Message) const;
+	virtual void FatalError(LanguageStringID StringID) const;
+		
 	//User Feedback
-    void DisplayMessage   ( int DisplayTime, const wchar_t * Message, ... ) const;
-	void DisplayMessage   ( int DisplayTime, const wchar_t * Message, va_list ap ) const;
-	void DisplayMessage   ( int DisplayTime, LanguageStringID StringID ) const 
-	{ 
-		std::wstring str = g_Lang->GetString(StringID); 
-		DisplayMessage(DisplayTime,L"%s",str.c_str()); 
-	}
-	void DisplayMessage2  ( const wchar_t * Message, ... ) const;
-	void DisplayMessage2  ( const wchar_t * Message, va_list ap ) const;
+	virtual void DisplayMessage(int DisplayTime, const wchar_t * Message) const;
+	virtual void DisplayMessage(int DisplayTime, LanguageStringID StringID) const;
+
+	virtual void DisplayMessage2(const wchar_t * Message) const;
+	virtual void BreakPoint(const wchar_t * FileName, const int LineNumber);
+
 	void SetWindowCaption ( const wchar_t * Caption );
 	
 	//Remember roms loaded and Rom Dir selected
@@ -54,7 +52,6 @@ public:
 	void ShowRomBrowser     ( void );
 	void MakeWindowOnTop    ( bool OnTop );
 	void BringToTop         ( void );
-	void BreakPoint         ( const wchar_t * FileName, const int LineNumber);
 	bool ProcessGuiMessages ( void ) const;
 	void ChangeFullScreen   ( void ) const;
 	void SetGfxPlugin       ( CGfxPlugin * Plugin );
diff --git a/Source/Project64/User Interface/Rom Browser Class.cpp b/Source/Project64/User Interface/Rom Browser Class.cpp
index 1f25f7e35..82d810f22 100644
--- a/Source/Project64/User Interface/Rom Browser Class.cpp	
+++ b/Source/Project64/User Interface/Rom Browser Class.cpp	
@@ -1,23 +1,26 @@
 #include "stdafx.h"
 
+#include <commctrl.h>
+#include <shlobj.h>
+
 CRomBrowser::CRomBrowser (HWND & MainWindow, HWND & StatusWindow ) :
 	m_MainWindow(MainWindow), 
 	m_StatusWindow(StatusWindow),
+	m_ShowingRomBrowser(false),
 	m_RefreshThread(NULL),
 	m_RomIniFile(NULL),
 	m_NotesIniFile(NULL),
 	m_ExtIniFile(NULL),
 	m_ZipIniFile(NULL),
-	m_WatchThreadID(0),
-	m_ShowingRomBrowser(false),
-	m_AllowSelectionLastRom(true)
+	m_AllowSelectionLastRom(true),
+	m_WatchThreadID(0)
 {
 	if (g_Settings) 
 	{
-		m_RomIniFile = new CIniFile(g_Settings->LoadString(SupportFile_RomDatabase).c_str());
-		m_NotesIniFile = new CIniFile(g_Settings->LoadString(SupportFile_Notes).c_str());
-		m_ExtIniFile = new CIniFile(g_Settings->LoadString(SupportFile_ExtInfo).c_str());
-		m_ZipIniFile = new CIniFile(g_Settings->LoadString(SupportFile_7zipCache).c_str());
+		m_RomIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str());
+		m_NotesIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_Notes).c_str());
+		m_ExtIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_ExtInfo).c_str());
+		m_ZipIniFile = new CIniFile(g_Settings->LoadStringVal(SupportFile_7zipCache).c_str());
 	}
 	
 	m_hRomList = 0;
@@ -97,7 +100,6 @@ int CRomBrowser::CalcSortPosition (DWORD lParam)
 		return 0;
 	}
 
-
 	for (int SortIndex = NoOfSortKeys; SortIndex >= 0; SortIndex --) 
 	{
 		stdstr SortFieldName = g_Settings->LoadStringIndex(RomBrowser_SortFieldIndex,SortIndex);
@@ -439,7 +441,7 @@ void CRomBrowser::FillRomExtensionInfo(ROM_INFO * pRomInfo)
 	}
 	if (m_Fields[RB_Players].Pos() >= 0) 
 	{		
-		 m_ExtIniFile->GetNumber(Identifier,"Players",1,(DWORD &)pRomInfo->Players);
+		 m_ExtIniFile->GetNumber(Identifier,"Players",1,(uint32_t &)pRomInfo->Players);
 	}
 	if (m_Fields[RB_ForceFeedback].Pos() >= 0)
 	{
@@ -586,7 +588,7 @@ bool CRomBrowser::GetRomFileNames( strlist & FileList, const CPath & BaseDirecto
 
 void CRomBrowser::NotificationCB ( LPCWSTR Status, CRomBrowser * /*_this*/ )
 {
- 	g_Notify->DisplayMessage(5,L"%s",Status);
+ 	g_Notify->DisplayMessage(5,Status);
 }
 
 
@@ -615,7 +617,8 @@ void CRomBrowser::FillRomList ( strlist & FileList, const CPath & BaseDirectory,
 	CPath SearchPath(BaseDirectory,"*.*");
 	SearchPath.AppendDirectory(Directory.c_str());
 
-	WriteTraceF(TraceDebug,__FUNCTION__ ": 1 %s",(LPCSTR)SearchPath);
+	//TODO: Fix exception on Windows XP (Visual Studio 2010+)
+	//WriteTraceF(TraceDebug,__FUNCTION__ ": 1 %s",(LPCSTR)SearchPath);
 	if (!SearchPath.FindFirst(CPath::_A_ALLFILES))
 	{
 		return;
@@ -623,7 +626,8 @@ void CRomBrowser::FillRomList ( strlist & FileList, const CPath & BaseDirectory,
 
 	do 
 	{
-		WriteTraceF(TraceDebug,__FUNCTION__ ": 2 %s m_StopRefresh = %d",(LPCSTR)SearchPath,m_StopRefresh);
+		//TODO: Fix exception on Windows XP (Visual Studio 2010+)
+		//WriteTraceF(TraceDebug,__FUNCTION__ ": 2 %s m_StopRefresh = %d",(LPCSTR)SearchPath,m_StopRefresh);
 		if (m_StopRefresh) { break; }
 
 		if (SearchPath.IsDirectory())
@@ -751,6 +755,9 @@ void CRomBrowser::FillRomList ( strlist & FileList, const CPath & BaseDirectory,
 						RomInfo.InternalName[count + 2] ^= RomInfo.InternalName[count + 1];
 						RomInfo.InternalName[count + 1] ^= RomInfo.InternalName[count + 2];			
 					}
+
+					RomInfo.RomSize = (int)f->Size;
+
 					WriteTrace(TraceDebug,__FUNCTION__ ": 15");
 					RomInfo.InternalName[21] = '\0';
 					RomInfo.CartID[0] = *(RomData + 0x3F);
@@ -760,7 +767,7 @@ void CRomBrowser::FillRomList ( strlist & FileList, const CPath & BaseDirectory,
 					RomInfo.Country = *(RomData + 0x3D);
 					RomInfo.CRC1 = *(DWORD *)(RomData + 0x10);
 					RomInfo.CRC2 = *(DWORD *)(RomData + 0x14);
-					m_ZipIniFile->GetNumber(SectionName.c_str(),stdstr_f("%s-Cic",FileName.c_str()).c_str(), (ULONG)-1,(DWORD &)RomInfo.CicChip);
+					m_ZipIniFile->GetNumber(SectionName.c_str(),stdstr_f("%s-Cic",FileName.c_str()).c_str(), (ULONG)-1,(uint32_t &)RomInfo.CicChip);
 					WriteTrace(TraceDebug,__FUNCTION__ ": 16");
 					FillRomExtensionInfo(&RomInfo);
 
@@ -858,7 +865,7 @@ bool CRomBrowser::LoadDataFromRomFile(char * FileName,BYTE * Data,int DataLen, i
 	BYTE Test[4];
 
 	if (_strnicmp(&FileName[strlen(FileName)-4], ".ZIP",4) == 0 )
-	{ 
+	{
 		int len, port = 0, FoundRom;
 	    unz_file_info info;
 		char zname[132];
@@ -972,7 +979,7 @@ void CRomBrowser::ByteSwapRomData (BYTE * Data, int DataLen)
 }
 
 void CRomBrowser::LoadRomList (void) {
-	stdstr FileName = g_Settings->LoadString(SupportFile_RomListCache);
+	stdstr FileName = g_Settings->LoadStringVal(SupportFile_RomListCache);
 	
 	//Open the cache file
 	HANDLE hFile = CreateFile(FileName.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL);
@@ -1022,7 +1029,7 @@ void CRomBrowser::LoadRomList (void) {
 	RomList_SortList();
 }
 
-void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShotCut)
+void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShortCut)
 {
 	MENUITEMINFOW MenuInfo;
     wchar_t String[256];
@@ -1040,7 +1047,7 @@ void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title,
 	GetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo);
 	wcscpy(String,Title);
 	if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; }
-	if (ShotCut) { swprintf(String,sizeof(String) / sizeof(String[0]),L"%s\t%s",String,ShotCut); }
+	if (ShortCut) { swprintf(String,sizeof(String) / sizeof(String[0]),L"%s\t%s",String,ShortCut); }
 	SetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo);
 }
 
@@ -1065,7 +1072,7 @@ void CRomBrowser::RefreshRomBrowserStatic (CRomBrowser * _this)
 		if (_this->m_hRomList == NULL) { return; }
 
 		//delete cache
-		stdstr CacheFileName = g_Settings->LoadString(SupportFile_RomListCache);
+		stdstr CacheFileName = g_Settings->LoadStringVal(SupportFile_RomListCache);
 		DeleteFile(CacheFileName.c_str());
 
 		//clear all current items
@@ -1078,7 +1085,7 @@ void CRomBrowser::RefreshRomBrowserStatic (CRomBrowser * _this)
 		Sleep(100);
 		WriteTrace(TraceDebug,__FUNCTION__ " 3");
 
-		if (_this->m_WatchRomDir != g_Settings->LoadString(Directory_Game))
+		if (_this->m_WatchRomDir != g_Settings->LoadStringVal(Directory_Game))
 		{
 			WriteTrace(TraceDebug,__FUNCTION__ " 4");
 			_this->WatchThreadStop();
@@ -1088,7 +1095,7 @@ void CRomBrowser::RefreshRomBrowserStatic (CRomBrowser * _this)
 		}
 
 		WriteTrace(TraceDebug,__FUNCTION__ " 7");
-		stdstr RomDir  = g_Settings->LoadString(Directory_Game);
+		stdstr RomDir  = g_Settings->LoadStringVal(Directory_Game);
 		stdstr LastRom = g_Settings->LoadStringIndex(File_RecentGameFileIndex,0);
 		WriteTrace(TraceDebug,__FUNCTION__ " 8");
 		
@@ -1200,16 +1207,15 @@ bool CRomBrowser::RomListDrawItem(int idCtrl, DWORD lParam)
 	RECT rcItem, rcDraw;
 	char String[300];
 	LV_ITEM lvItem;
-	BOOL bSelected;
 	HBRUSH hBrush;
-    LV_COLUMN lvc; 
+	LV_COLUMN lvc; 
 	int nColumn;
 
 	lvItem.mask = LVIF_PARAM;
 	lvItem.iItem = ditem->itemID;
 	if (!ListView_GetItem((HWND)m_hRomList, &lvItem)) { return false; }
 	lvItem.state = ListView_GetItemState((HWND)m_hRomList, ditem->itemID, -1);
-	bSelected = (lvItem.state & LVIS_SELECTED);
+	bool bSelected = (lvItem.state & LVIS_SELECTED) != 0;
 
 	if (lvItem.lParam < 0 || lvItem.lParam >= (LPARAM)m_RomInfo.size())
 	{
@@ -1244,7 +1250,7 @@ bool CRomBrowser::RomListDrawItem(int idCtrl, DWORD lParam)
 		text = GS(RB_NOT_GOOD_FILE);
 	}
 
-	DrawTextW(ditem->hDC, text.c_str(), text.length(), &rcDraw, DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_VCENTER);	
+	DrawTextW(ditem->hDC, text.c_str(), text.length(), &rcDraw, DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_VCENTER | DT_WORD_ELLIPSIS);
 	
     memset(&lvc,0,sizeof(lvc));
 	lvc.mask = LVCF_FMT | LVCF_WIDTH; 
@@ -1256,7 +1262,12 @@ bool CRomBrowser::RomListDrawItem(int idCtrl, DWORD lParam)
 		ListView_GetItemText((HWND)m_hRomList,ditem->itemID, nColumn, String, sizeof(String)); 
 		memcpy(&rcDraw,&rcItem,sizeof(RECT));
 		rcDraw.right -= 3;
-		DrawText(ditem->hDC, String, strlen(String), &rcDraw, DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_VCENTER);
+		std::wstring text = stdstr(String).ToUTF16();
+		if (wcscmp(L"#340#", text.c_str()) == 0)
+		{
+			text = GS(RB_NOT_GOOD_FILE);
+		}
+		DrawTextW(ditem->hDC, text.c_str(), text.length(), &rcDraw, DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_VCENTER | DT_WORD_ELLIPSIS);
 	}
 	return true;
 }
@@ -1575,7 +1586,7 @@ void CRomBrowser::SaveRomList ( strlist & FileList )
 {
 	MD5 ListHash = RomListHash(FileList);
 	
-	stdstr FileName = g_Settings->LoadString(SupportFile_RomListCache);
+	stdstr FileName = g_Settings->LoadStringVal(SupportFile_RomListCache);
 	HANDLE hFile = CreateFile(FileName.c_str(),GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL);
 
 	DWORD dwWritten;
@@ -1658,7 +1669,7 @@ void CRomBrowser::SelectRomDir(void)
 	BROWSEINFOW bi;
 
 	WriteTrace(TraceDebug,__FUNCTION__ " 1");
-	stdstr RomDir = g_Settings->LoadString(Directory_Game);
+	stdstr RomDir = g_Settings->LoadStringVal(Directory_Game);
 	bi.hwndOwner = m_MainWindow;
 	bi.pidlRoot = NULL;
 	bi.pszDisplayName = SelectedDir;
@@ -1684,7 +1695,7 @@ void CRomBrowser::SelectRomDir(void)
 			WriteTrace(TraceDebug,__FUNCTION__ " 6");
 			g_Settings->SaveString(Directory_Game,Directory);
 			WriteTrace(TraceDebug,__FUNCTION__ " 7");
-			g_Notify->AddRecentDir(Directory);
+			Notify().AddRecentDir(Directory);
 			WriteTrace(TraceDebug,__FUNCTION__ " 8");
 			RefreshRomBrowser();
 			WriteTrace(TraceDebug,__FUNCTION__ " 9");
@@ -1707,8 +1718,8 @@ void CRomBrowser::FixRomListWindow (void)
 	int	Y = (GetSystemMetrics(SM_CYSCREEN) - (rect.bottom - rect.top)) / 2;
 	
 	//Load the value from settings, if none is available, default to above
-	g_Settings->LoadDword(RomBrowser_Top, (DWORD &)Y);
-	g_Settings->LoadDword(RomBrowser_Left,(DWORD &)X);
+	g_Settings->LoadDword(RomBrowser_Top, (uint32_t &)Y);
+	g_Settings->LoadDword(RomBrowser_Left, (uint32_t &)X);
 
 	SetWindowPos(m_MainWindow,NULL,X,Y,0,0,SWP_NOZORDER|SWP_NOSIZE);
 
@@ -1789,8 +1800,8 @@ void CRomBrowser::HideRomList (void)
 	GetWindowRect(m_MainWindow,&rect);
 	int X = (GetSystemMetrics( SM_CXSCREEN ) - (rect.right - rect.left)) / 2;
 	int	Y = (GetSystemMetrics( SM_CYSCREEN ) - (rect.bottom - rect.top)) / 2;
-	g_Settings->LoadDword(UserInterface_MainWindowTop,(DWORD &)Y);
-	g_Settings->LoadDword(UserInterface_MainWindowLeft,(DWORD &)X);
+	g_Settings->LoadDword(UserInterface_MainWindowTop,(uint32_t &)Y);
+	g_Settings->LoadDword(UserInterface_MainWindowLeft, (uint32_t &)X);
 	SetWindowPos(m_MainWindow,NULL,X,Y,0,0,SWP_NOZORDER|SWP_NOSIZE);
 
 	//Mark the window as not visible
@@ -1807,7 +1818,7 @@ bool CRomBrowser::RomDirNeedsRefresh ( void )
 	bool InWatchThread = (m_WatchThreadID ==  GetCurrentThreadId());
 	
 	//Get Old MD5 of file names
-	stdstr FileName = g_Settings->LoadString(SupportFile_RomListCache);
+	stdstr FileName = g_Settings->LoadStringVal(SupportFile_RomListCache);
 	HANDLE hFile = CreateFile(FileName.c_str(),GENERIC_READ,0,NULL,OPEN_EXISTING,FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL);
 	if (hFile == INVALID_HANDLE_VALUE) 
 	{
@@ -1822,7 +1833,7 @@ bool CRomBrowser::RomDirNeedsRefresh ( void )
 
 	//Get Current MD5 of file names
 	strlist FileNames;
-	if (!GetRomFileNames(FileNames,CPath(g_Settings->LoadString(Directory_Game)),stdstr(""), InWatchThread ))
+	if (!GetRomFileNames(FileNames,CPath(g_Settings->LoadStringVal(Directory_Game)),stdstr(""), InWatchThread ))
 	{
 		return false;
 	}
@@ -1855,7 +1866,7 @@ void CRomBrowser::WatchRomDirChanged ( CRomBrowser * _this )
 	try
 	{
 		WriteTrace(TraceDebug,__FUNCTION__ ": 1");
-		_this->m_WatchRomDir = g_Settings->LoadString(Directory_Game);
+		_this->m_WatchRomDir = g_Settings->LoadStringVal(Directory_Game);
 		WriteTrace(TraceDebug,__FUNCTION__ ": 2");
 		if (_this->RomDirNeedsRefresh())
 		{
diff --git a/Source/Project64/User Interface/Rom Browser.h b/Source/Project64/User Interface/Rom Browser.h
index 491f9d2df..4465b5032 100644
--- a/Source/Project64/User Interface/Rom Browser.h	
+++ b/Source/Project64/User Interface/Rom Browser.h	
@@ -13,14 +13,13 @@
 #include <vector>
 
 class CMainGui;
-class CNotification;
 class CPlugins;
 
 class ROMBROWSER_FIELDS {
 	stdstr m_Name;
 	size_t m_Pos, m_DefaultPos;
 	int    m_ID;
-	ULONG  m_ColWidth;
+	uint32_t  m_ColWidth;
 	LanguageStringID  m_LangID;
 	bool   m_PosChanged;
 
@@ -37,7 +36,7 @@ public:
 	{
 		if (!UseDefault)
 		{
-			m_PosChanged = g_Settings->LoadDwordIndex(RomBrowser_PosIndex,m_ID,(ULONG &)m_Pos );
+			m_PosChanged = g_Settings->LoadDwordIndex(RomBrowser_PosIndex,m_ID,(uint32_t &)m_Pos );
 			g_Settings->LoadDwordIndex(RomBrowser_WidthIndex,m_ID,m_ColWidth);
 		}
 	}
@@ -71,11 +70,11 @@ typedef std::vector<ROMBROWSER_FIELDS>   ROMBROWSER_FIELDS_LIST;
 typedef std::vector<int>                 FIELD_TYPE_LIST;
 
 class CRomBrowser;
-typedef struct {
+struct SORT_FIELD {
 	CRomBrowser * _this;
 	int           Key;
 	bool          KeyAscend;
-} SORT_FIELD;
+};
 
 class C7zip;
 class CRomBrowser 
@@ -100,7 +99,7 @@ class CRomBrowser
 		NoOfSortKeys = 3
 	};
 
-	typedef struct {
+	struct ROM_INFO {
 		char     szFullFileName[300];
 		FILE_FORMAT FileFormat;
 		char     Status[60];
@@ -126,7 +125,7 @@ class CRomBrowser
 		DWORD    CRC2;
 		int      CicChip;
 		char     ForceFeedback[15];
-	} ROM_INFO;
+	};
 
 	typedef std::vector<ROM_INFO>   ROMINFO_LIST;
 
@@ -163,7 +162,7 @@ class CRomBrowser
 	static int   GetCicChipID     ( BYTE * RomData );
 	bool  LoadDataFromRomFile     ( char * FileName, BYTE * Data,int DataLen, int * RomSize, FILE_FORMAT & FileFormat );
 	void  LoadRomList             ( void );
-	void  MenuSetText             ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShotCut);
+	void  MenuSetText             ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShortCut);
 	void  SaveRomList             ( strlist & FileList );
 	void  RomList_ColoumnSortList ( DWORD pnmh );
 	void  RomList_GetDispInfo     ( DWORD pnmh );
@@ -208,7 +207,6 @@ public:
 	void  ShowRomList             ( void );
 	bool  ShowingRomBrowser       ( void ) { return m_ShowingRomBrowser; } 
 	LPCSTR CurrentedSelectedRom   ( void ) { return m_SelectedRom.c_str(); }
-	void  Store7ZipInfo           ( C7zip & ZipFile, int FileNo );
 
 	static void GetFieldInfo      ( ROMBROWSER_FIELDS_LIST & Fields, bool UseDefault = false );
 };
diff --git a/Source/Project64/User Interface/Settings Config.cpp b/Source/Project64/User Interface/Settings Config.cpp
index fb4bf44e6..5b29fe923 100644
--- a/Source/Project64/User Interface/Settings Config.cpp	
+++ b/Source/Project64/User Interface/Settings Config.cpp	
@@ -1,4 +1,6 @@
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Config.h"
 #include "Settings/Settings Page.h"
 #include "Settings/SettingType/SettingsType-Application.h"
@@ -75,11 +77,11 @@ bool CSettingConfig::UpdateAdvanced ( bool AdvancedMode, HTREEITEM hItem )
 
 LRESULT	CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
 {
-	stdstr ConfigRomTitle, GameIni(g_Settings->LoadString(Game_IniKey));
+	stdstr ConfigRomTitle, GameIni(g_Settings->LoadStringVal(Game_IniKey));
 
 	if (!GameIni.empty())
 	{
-		ConfigRomTitle.Format("Config: %s",g_Settings->LoadString(Game_GoodName).c_str());
+		ConfigRomTitle.Format("Config: %s",g_Settings->LoadStringVal(Game_GoodName).c_str());
 	}
 
 	RECT rcSettingInfo;
@@ -172,7 +174,7 @@ LRESULT	CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
 		
 		HTREEITEM hSectionItem = NULL;	
 
-		for (int i = 0; i < Section->GetPageCount(); i++ )
+		for (size_t i = 0; i < Section->GetPageCount(); i++)
 		{
 			CSettingsPage * Page = Section->GetPage(i);
 			if (HideAdvanced && Page == m_AdvancedPage)
@@ -227,7 +229,7 @@ LRESULT CSettingConfig::OnClicked (WORD /*wNotifyCode*/, WORD wID, HWND , BOOL&
 		{
 			CConfigSettingSection * Section = *iter;
 			
-			for (int i = 0; i < Section->GetPageCount(); i++ )
+			for (size_t i = 0; i < Section->GetPageCount(); i++ )
 			{
 				CSettingsPage * Page = Section->GetPage(i);
 				if (Page->EnableReset())
@@ -244,12 +246,12 @@ LRESULT CSettingConfig::OnClicked (WORD /*wNotifyCode*/, WORD wID, HWND , BOOL&
 
 void CSettingConfig::ApplySettings( bool UpdateScreen )
 {
-	stdstr GameIni(g_Settings->LoadString(Game_IniKey));
+	stdstr GameIni(g_Settings->LoadStringVal(Game_IniKey));
 
 	if (!GameIni.empty())
 	{
 		stdstr GoodName;
-		if (!g_Settings->LoadString(Game_GoodName,GoodName))
+		if (!g_Settings->LoadStringVal(Game_GoodName,GoodName))
 		{
 			g_Settings->SaveString(Game_GoodName,GoodName);
 		}
@@ -259,7 +261,7 @@ void CSettingConfig::ApplySettings( bool UpdateScreen )
 	{
 		CConfigSettingSection * Section = *iter;
 		
-		for (int i = 0; i < Section->GetPageCount(); i++ )
+		for (size_t i = 0; i < Section->GetPageCount(); i++ )
 		{
 			CSettingsPage * Page = Section->GetPage(i);
 			Page->ApplySettings(UpdateScreen);
@@ -273,9 +275,9 @@ void CSettingConfig::ApplySettings( bool UpdateScreen )
 	}
 	
 
-	if (!g_Settings->LoadString(Game_IniKey).empty())
+	if (!g_Settings->LoadStringVal(Game_IniKey).empty())
 	{
-		stdstr GoodName = g_Settings->LoadString(Rdb_GoodName);
+		stdstr GoodName = g_Settings->LoadStringVal(Rdb_GoodName);
 		if (GoodName.length() > 0)
 		{
 			g_Settings->SaveString(Game_GoodName,GoodName);
@@ -339,4 +341,4 @@ void CSettingConfig::BoldChangedPages ( HTREEITEM hItem )
 		::EnableWindow(GetDlgItem(IDC_RESET_ALL), true);
 	}
 }
-
+#endif
diff --git a/Source/Project64/User Interface/Settings Config.h b/Source/Project64/User Interface/Settings Config.h
index aa2704b84..34ad0371d 100644
--- a/Source/Project64/User Interface/Settings Config.h	
+++ b/Source/Project64/User Interface/Settings Config.h	
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <commctrl.h>
+
 class CConfigSettingSection;
 class CSettingsPage;
 
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp b/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp
index c91c6e1bc..9e0d7b17a 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 CAdvancedOptionsPage::CAdvancedOptionsPage (HWND hParent, const RECT & rcDispay )
@@ -70,3 +72,4 @@ void CAdvancedOptionsPage::ResetPage()
 {
 	CSettingsPageImpl<CAdvancedOptionsPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Directories.cpp b/Source/Project64/User Interface/Settings/Settings Page - Directories.cpp
index a793e3ad3..d25569b9e 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Directories.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Directories.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 COptionsDirectoriesPage::COptionsDirectoriesPage (HWND hParent, const RECT & rcDispay ) :
@@ -166,15 +168,15 @@ void COptionsDirectoriesPage::UpdatePageSettings()
 	stdstr Directory;
 
 	m_InUpdateSettings = true;
-	m_PluginDir.SetChanged(g_Settings->LoadString(Directory_PluginSelected,Directory));
+	m_PluginDir.SetChanged(g_Settings->LoadStringVal(Directory_PluginSelected,Directory));
 	m_PluginDir.SetWindowText(Directory.c_str());
-	m_AutoSaveDir.SetChanged(g_Settings->LoadString(Directory_NativeSaveSelected,Directory));
+	m_AutoSaveDir.SetChanged(g_Settings->LoadStringVal(Directory_NativeSaveSelected,Directory));
 	m_AutoSaveDir.SetWindowText(Directory.c_str());
-	m_InstantSaveDir.SetChanged(g_Settings->LoadString(Directory_InstantSaveSelected,Directory));
+	m_InstantSaveDir.SetChanged(g_Settings->LoadStringVal(Directory_InstantSaveSelected,Directory));
 	m_InstantSaveDir.SetWindowText(Directory.c_str());
-	m_ScreenShotDir.SetChanged(g_Settings->LoadString(Directory_SnapShotSelected,Directory));
+	m_ScreenShotDir.SetChanged(g_Settings->LoadStringVal(Directory_SnapShotSelected,Directory));
 	m_ScreenShotDir.SetWindowText(Directory.c_str());
-	m_TextureDir.SetChanged(g_Settings->LoadString(Directory_TextureSelected,Directory));
+	m_TextureDir.SetChanged(g_Settings->LoadStringVal(Directory_TextureSelected,Directory));
 	m_TextureDir.SetWindowText(Directory.c_str());
 
 	bool UseSelected;
@@ -351,3 +353,4 @@ void COptionsDirectoriesPage::ResetPage()
 
 	SendMessage(GetParent(),PSM_CHANGED,(WPARAM)m_hWnd,0);
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp
index 169a38d87..835742a32 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 #include "Settings Page - Game - General.h"
 
@@ -76,7 +78,7 @@ CGameGeneralPage::CGameGeneralPage (HWND hParent, const RECT & rcDispay )
 		ComboBox->AddItemW(GS(NUMBER_6), 6 );
 	}
 
-	SetDlgItemText(IDC_GOOD_NAME,g_Settings->LoadString(Game_GoodName).c_str());
+	SetDlgItemText(IDC_GOOD_NAME,g_Settings->LoadStringVal(Game_GoodName).c_str());
 
 	CModifiedEditBox * TxtBox = AddModTextBox(GetDlgItem(IDC_VIREFRESH),Game_ViRefreshRate, false);
 	TxtBox->SetTextField(GetDlgItem(IDC_VIREFESH_TEXT));
@@ -113,3 +115,4 @@ void CGameGeneralPage::ResetPage()
 {
 	CSettingsPageImpl<CGameGeneralPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Plugin.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Plugin.cpp
index 5e61a4cb7..b0f3ff035 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game - Plugin.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Plugin.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 #include "Settings Page - Game - Plugin.h"
 
@@ -52,7 +54,7 @@ CGamePluginPage::CGamePluginPage (HWND hParent, const RECT & rcDispay )
 void CGamePluginPage::AddPlugins (int ListId,SettingID Type, PLUGIN_TYPE PluginType )
 {
 	stdstr Default;
-	bool PluginSelected = g_Settings->LoadString(Type,Default);
+	bool PluginSelected = g_Settings->LoadStringVal(Type,Default);
 
 	CModifiedComboBox * ComboBox;
 	ComboBox = AddModComboBox(GetDlgItem(ListId),Type);
@@ -181,7 +183,7 @@ void CGamePluginPage::UpdatePageSettings ( void )
 		CModifiedComboBox * ComboBox = cb_iter->second;
 		stdstr SelectedValue;
 		
-		bool PluginChanged = g_Settings->LoadString(cb_iter->first,SelectedValue);
+		bool PluginChanged = g_Settings->LoadStringVal(cb_iter->first,SelectedValue);
 		ComboBox->SetChanged(PluginChanged);
 		if (PluginChanged)
 		{
@@ -257,7 +259,7 @@ void CGamePluginPage::ApplyComboBoxes ( void )
 
 			if (Plugin)
 			{
-				if (g_Settings->LoadString(cb_iter->first) != Plugin->FileName.c_str())
+				if (g_Settings->LoadStringVal(cb_iter->first) != Plugin->FileName.c_str())
 				{
 					g_Settings->SaveString(cb_iter->first,Plugin->FileName.c_str());
 				}
@@ -345,3 +347,4 @@ void CGamePluginPage::HleAudioChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
 		break;
 	}
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp
index 91325cfa5..648d0edf1 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 #include "Settings Page - Game - Recompiler.h"
 
@@ -94,3 +96,4 @@ void CGameRecompilePage::ResetPage()
 {
 	CSettingsPageImpl<CGameRecompilePage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Status.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Status.cpp
index 8dbc855f2..89627b03b 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game - Status.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Status.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 #include "Settings Page - Game - Status.h"
 
@@ -19,10 +21,10 @@ CGameStatusPage::CGameStatusPage (HWND hParent, const RECT & rcDispay )
 		return;
 	}
 
-	CIniFile RomIniFile  (g_Settings->LoadString(SupportFile_RomDatabase).c_str());
+	CIniFile RomIniFile  (g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str());
 	strlist Keys;
 	RomIniFile.GetKeyList("Rom Status",Keys);
-	stdstr Status = g_Settings->LoadString(Rdb_Status);
+	stdstr Status = g_Settings->LoadStringVal(Rdb_Status);
 
 	CModifiedComboBoxTxt * ComboBox;
 	ComboBox = AddModComboBoxTxt(GetDlgItem(IDC_STATUS_TYPE),Rdb_Status);
@@ -70,3 +72,4 @@ void CGameStatusPage::ResetPage()
 {
 	CSettingsPageImpl<CGameStatusPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game Browser.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game Browser.cpp
index b0ed6195f..6a9171810 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game Browser.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game Browser.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 COptionsGameBrowserPage::COptionsGameBrowserPage (HWND hParent, const RECT & rcDispay ) :
@@ -253,3 +255,4 @@ void COptionsGameBrowserPage::ResetPage()
 	}
 	CSettingsPageImpl<COptionsGameBrowserPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp b/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp
index e05da4b69..df720dd89 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 COptionsShortCutsPage::COptionsShortCutsPage (HWND hParent, const RECT & rcDispay ) :
@@ -25,7 +27,8 @@ COptionsShortCutsPage::COptionsShortCutsPage (HWND hParent, const RECT & rcDispa
 	SetDlgItemTextW(m_hWnd, IDC_S_SELECT_SHORT,GS(ACCEL_SELKEY_TITLE));	
 	SetDlgItemTextW(m_hWnd, IDC_S_CURRENT_ASSIGN,GS(ACCEL_ASSIGNEDTO_TITLE));	
 	SetDlgItemTextW(m_hWnd, IDC_ASSIGN,GS(ACCEL_ASSIGN_BTN));	
-	SetDlgItemTextW(m_hWnd, IDC_REMOVE,GS(ACCEL_REMOVE_BTN));	
+	SetDlgItemTextW(m_hWnd, IDC_REMOVE,GS(ACCEL_REMOVE_BTN));
+	SetDlgItemTextW(m_hWnd, IDC_KEY_PROMPT, GS(ACCEL_DETECTKEY));
 
 	m_CreateNewShortCut.AttachToDlgItem(m_hWnd,IDC_S_SELECT_SHORT);
 	m_CpuState.Attach(GetDlgItem(IDC_C_CPU_STATE));
@@ -304,7 +307,7 @@ BOOL CALLBACK KeyPromptDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM /*lP
 
 void COptionsShortCutsPage::InputGetKeys (void) 
 {
-	HWND hKeyDlg = CreateDialogParam(GetModuleHandle(NULL),MAKEINTRESOURCE(IDD_Key_Prompt),m_hWnd,KeyPromptDlgProc,(LPARAM)::GetDlgItem(m_hWnd,IDC_VIRTUALKEY));
+	HWND hKeyDlg = CreateDialogParam(GetModuleHandle(NULL),MAKEINTRESOURCE(IDD_Key_Prompt),m_hWnd,(DLGPROC)KeyPromptDlgProc,(LPARAM)::GetDlgItem(m_hWnd,IDC_VIRTUALKEY));
 	::EnableWindow(GetParent(),false);
 	MSG msg;
 
@@ -377,3 +380,4 @@ void COptionsShortCutsPage::ResetPage()
 	m_CurrentKeys.ResetContent();
 	CSettingsPageImpl<COptionsShortCutsPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Options.cpp b/Source/Project64/User Interface/Settings/Settings Page - Options.cpp
index 49441f3ea..5187435d8 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Options.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Options.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 CGeneralOptionsPage::CGeneralOptionsPage(CSettingConfig * SettingsConfig, HWND hParent, const RECT & rcDispay ) :
@@ -75,3 +77,4 @@ void CGeneralOptionsPage::OnBasicMode ( UINT Code, int id, HWND ctl )
 	CheckBoxChanged(Code,id,ctl);
 	m_SettingsConfig->UpdateAdvanced((int)::SendMessage(ctl, BM_GETCHECK, 0, 0) == 0);
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Plugin.cpp b/Source/Project64/User Interface/Settings/Settings Page - Plugin.cpp
index 9a1d603c2..c387e5efb 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Plugin.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Plugin.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 COptionPluginPage::COptionPluginPage (HWND hParent, const RECT & rcDispay )
@@ -50,7 +52,7 @@ COptionPluginPage::COptionPluginPage (HWND hParent, const RECT & rcDispay )
 
 void COptionPluginPage::AddPlugins (int ListId,SettingID Type, PLUGIN_TYPE PluginType )
 {
-	stdstr Default = g_Settings->LoadString(Type);
+	stdstr Default = g_Settings->LoadStringVal(Type);
 
 	CModifiedComboBox * ComboBox;
 	ComboBox = AddModComboBox(GetDlgItem(ListId),Type);
@@ -173,7 +175,7 @@ void COptionPluginPage::UpdatePageSettings ( void )
 		CModifiedComboBox * ComboBox = cb_iter->second;
 		stdstr SelectedValue;
 		
-		ComboBox->SetChanged(g_Settings->LoadString(cb_iter->first,SelectedValue));
+		ComboBox->SetChanged(g_Settings->LoadStringVal(cb_iter->first,SelectedValue));
 		for (int i = 0, n = ComboBox->GetCount(); i < n; i++ )
 		{
 			const CPluginList::PLUGIN ** PluginPtr = (const CPluginList::PLUGIN **)ComboBox->GetItemDataPtr(i);
@@ -331,3 +333,4 @@ void COptionPluginPage::HleAudioChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
 		break;
 	}
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page.cpp b/Source/Project64/User Interface/Settings/Settings Page.cpp
index 6c63fdd5f..f7b26d581 100644
--- a/Source/Project64/User Interface/Settings/Settings Page.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 CConfigSettingSection::CConfigSettingSection( LPCWSTR PageTitle ) :
@@ -39,3 +41,4 @@ CSettingsPage * CConfigSettingSection::GetPage ( int PageNo )
 	}
 	return m_Pages[PageNo];
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page.h b/Source/Project64/User Interface/Settings/Settings Page.h
index f9a3581d0..c1a4eff6c 100644
--- a/Source/Project64/User Interface/Settings/Settings Page.h	
+++ b/Source/Project64/User Interface/Settings/Settings Page.h	
@@ -10,6 +10,8 @@
 ****************************************************************************/
 #pragma once
 
+#include <prsht.h>
+
 class CSettingsPage 
 {
 public:
@@ -252,14 +254,14 @@ protected:
 			CModifiedComboBoxTxt * ComboBox = cbtxt_iter->second;
 			stdstr SelectedValue;
 			
-			ComboBox->SetChanged(g_Settings->LoadString(cbtxt_iter->first,SelectedValue));
+			ComboBox->SetChanged(g_Settings->LoadStringVal(cbtxt_iter->first,SelectedValue));
 			ComboBox->SetDefault(SelectedValue);
 		}
 
 		for (ComboBoxList::iterator cb_iter = m_ComboBoxList.begin(); cb_iter != m_ComboBoxList.end(); cb_iter ++)
 		{
 			CModifiedComboBox * ComboBox = cb_iter->second;
-			DWORD SelectedValue;
+			uint32_t SelectedValue;
 			
 			ComboBox->SetChanged(g_Settings->LoadDword(cb_iter->first,SelectedValue));
 			ComboBox->SetDefault(SelectedValue);
@@ -276,10 +278,10 @@ protected:
 			if (TextBox->IsbString())
 			{
 				stdstr SelectedValue;
-				TextBox->SetChanged(g_Settings->LoadString(iter->first,SelectedValue));
+				TextBox->SetChanged(g_Settings->LoadStringVal(iter->first,SelectedValue));
 				TextBox->SetWindowText(SelectedValue.c_str());
 			} else {
-				DWORD SelectedValue;
+				uint32_t SelectedValue;
 				TextBox->SetChanged(g_Settings->LoadDword(iter->first,SelectedValue));
 				TextBox->SetWindowText(stdstr_f("%d",SelectedValue).c_str());
 			}
@@ -558,7 +560,7 @@ public:
 
 	LPCWSTR GetPageTitle    ( void ) const { return m_PageTitle.c_str(); }
 	void    AddPage         ( CSettingsPage * Page );
-	int     GetPageCount    ( void ) const { return m_Pages.size(); }
+	size_t  GetPageCount    ( void ) const { return m_Pages.size(); }
 	CSettingsPage * GetPage ( int PageNo );
 };
 
diff --git a/Source/Project64/User Interface/UI Resources.rc b/Source/Project64/User Interface/UI Resources.rc
index 5e49cceb3..1c5069ef4 100644
--- a/Source/Project64/User Interface/UI Resources.rc	
+++ b/Source/Project64/User Interface/UI Resources.rc	
@@ -19,7 +19,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
 
+#ifdef _M_IX86
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "..\Project64.exe.manifest"
+#endif
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
diff --git a/Source/Project64/User Interface/WTL Controls/ClistCtrl/ListEdit.h b/Source/Project64/User Interface/WTL Controls/ClistCtrl/ListEdit.h
index d07dd9d41..aefcd3aca 100644
--- a/Source/Project64/User Interface/WTL Controls/ClistCtrl/ListEdit.h	
+++ b/Source/Project64/User Interface/WTL Controls/ClistCtrl/ListEdit.h	
@@ -144,27 +144,29 @@ public:
 				(nCharValue >= 'A' && nCharValue <= 'F' || nCharValue >= 'a' && nCharValue <= 'f'))
 			{
 				if ( nDigitIndex < 0 )
-					nDigitIndex = nCharIndex;
+				{
+					nDigitIndex = (int)nCharIndex;
+				}
 				break;
 			}
 
 			switch ( nCharValue )
 			{
-				case _T( '-' ):	nNegativeIndex = nCharIndex;
+				case _T( '-' ):	nNegativeIndex = (int)nCharIndex;
 								break;
 				case _T( '>' ):	if ( !( m_nFlags & ITEM_FLAGS_EDIT_OPERATOR ) )
 									return FALSE;
-								nGreaterIndex = nCharIndex;
+								nGreaterIndex = (int)nCharIndex;
 								nGreaterThan++;
 								break;
 				case _T( '<' ):	if ( !( m_nFlags & ITEM_FLAGS_EDIT_OPERATOR ) )
 									return FALSE;
-								nLessIndex = nCharIndex;
+								nLessIndex = (int)nCharIndex;
 								nLessThan++;
 								break;
 				case _T( '=' ):	if ( !( m_nFlags & ITEM_FLAGS_EDIT_OPERATOR ) )
 									return FALSE;
-								nEqualIndex = nCharIndex;
+								nEqualIndex = (int)nCharIndex;
 								nEquals++;
 								break;
 				case _T( '.' ):	if ( !( m_nFlags & ITEM_FLAGS_EDIT_FLOAT ) )
diff --git a/Source/Project64/User Interface/WTL Controls/ClistCtrl/TitleTip.h b/Source/Project64/User Interface/WTL Controls/ClistCtrl/TitleTip.h
index e4ad5bed4..e3c815a11 100644
--- a/Source/Project64/User Interface/WTL Controls/ClistCtrl/TitleTip.h	
+++ b/Source/Project64/User Interface/WTL Controls/ClistCtrl/TitleTip.h	
@@ -75,7 +75,7 @@ public:
 		CRect rcTextExtent( rcRect );
 				
 		// calculate item text extent...
-		dcClient.DrawText( strItemText.c_str(), strItemText.length(), rcTextExtent, DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_VCENTER | DT_CALCRECT );
+		dcClient.DrawText( strItemText.c_str(), (int)strItemText.length(), rcTextExtent, DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_VCENTER | DT_CALCRECT );
 		
 		dcClient.SelectFont( hOldFont );
 		
@@ -216,7 +216,7 @@ public:
 		CRect rcItemText( rcClient );
 		rcItemText.OffsetRect( 4, 0 );
 		
-		dcPaint.DrawText( strItemText.c_str(), strItemText.length(), rcItemText, DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_VCENTER );
+		dcPaint.DrawText( strItemText.c_str(), (int)strItemText.length(), rcItemText, DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_VCENTER );
 	
 		dcPaint.RestoreDC( nContextState );
 	}
diff --git a/Source/Project64/User Interface/WTL Controls/ModifiedComboBox.h b/Source/Project64/User Interface/WTL Controls/ModifiedComboBox.h
index 843b64d6f..e6da4a608 100644
--- a/Source/Project64/User Interface/WTL Controls/ModifiedComboBox.h	
+++ b/Source/Project64/User Interface/WTL Controls/ModifiedComboBox.h	
@@ -19,14 +19,14 @@ class CModifiedComboBoxT :
 public:
 	// Constructors
 	CModifiedComboBoxT(TParam defaultValue, HWND hWnd = NULL, bool AllwaysSelected = true) : 
-	    CComboBox(hWnd),
-		m_defaultValue(defaultValue),
-		m_AllwaysSelected(AllwaysSelected),
+		CComboBox(hWnd),
 		m_Changed(false),
 		m_Reset(false),
+		m_defaultValue(defaultValue),
 		m_BoldFont(NULL),
 		m_OriginalFont(NULL),
-		m_TextField(NULL)
+		m_TextField(NULL),
+		m_AllwaysSelected(AllwaysSelected)
 	{ 		
 	}
 	
diff --git a/Source/Project64/User Interface/WTL Controls/ModifiedEditBox.cpp b/Source/Project64/User Interface/WTL Controls/ModifiedEditBox.cpp
index 6c3d5854b..826655802 100644
--- a/Source/Project64/User Interface/WTL Controls/ModifiedEditBox.cpp	
+++ b/Source/Project64/User Interface/WTL Controls/ModifiedEditBox.cpp	
@@ -10,6 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 
+#ifdef WINDOWS_UI
 CModifiedEditBox::CModifiedEditBox(bool bString /* = true */, HWND hWnd /* = NULL */) :
 	CEdit(hWnd),
 	m_Changed(false),
@@ -103,3 +104,4 @@ void CModifiedEditBox::SetTextField (HWND hWnd)
 		::SendMessage(m_TextField,WM_SETFONT,(WPARAM)m_BoldFont,0);
 	}
 }
+#endif
diff --git a/Source/Project64/User Interface/WTL Controls/PartialGroupBox.cpp b/Source/Project64/User Interface/WTL Controls/PartialGroupBox.cpp
index 1772d2ab5..b50b99619 100644
--- a/Source/Project64/User Interface/WTL Controls/PartialGroupBox.cpp	
+++ b/Source/Project64/User Interface/WTL Controls/PartialGroupBox.cpp	
@@ -10,6 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 
+#ifdef WINDOWS_UI
 BOOL CPartialGroupBox::Attach(HWND hWnd)
 {
 	ATLASSUME(m_hWnd == NULL);
@@ -118,5 +119,5 @@ void CPartialGroupBox::OnPaint(HDC /*hDC*/)
 
 		dc.DrawTextW(grptext,-1,fontrect,DT_SINGLELINE|DT_LEFT);
 	}
-
 }
+#endif
diff --git a/Source/Project64/User Interface/WTL Controls/numberctrl.h b/Source/Project64/User Interface/WTL Controls/numberctrl.h
index dcb63a75c..f75766d61 100644
--- a/Source/Project64/User Interface/WTL Controls/numberctrl.h	
+++ b/Source/Project64/User Interface/WTL Controls/numberctrl.h	
@@ -45,7 +45,7 @@ protected:
 		GetWindowText(WindowText,sizeof(WindowText));
 
 		bool bPaste=true;
-		unsigned int Len = strlen(WindowText);
+		size_t Len = strlen(WindowText);
 		char head   = Len > 0 ? WindowText[0] : 0;
 		char second = Len > 1 ? WindowText[1] : 0;
 
@@ -180,14 +180,15 @@ protected:
 		//CString text;
 		char WindowText[200];
 		GetWindowText(WindowText,sizeof(WindowText));
-		int Len = strlen(WindowText);
+		size_t Len = strlen(WindowText);
 
 		char head   = Len > 0 ? WindowText[0] : 0;
 		char second = Len > 1 ? WindowText[1] : 0;
 		
 		if (uMsg == WM_CHAR)
 		{
-			int MaxLen = 30;
+			size_t MaxLen = 30;
+
 			if (m_DisplayType == DisplayHex)
 			{
 				MaxLen = 8;
@@ -229,7 +230,7 @@ protected:
 				}
 				return true;
 			}
-			else if ( c >= 48 && c<= 57 || c >= 'A' && c<= 'F')
+			else if (c >= '0' && c <= '9' || c >= 'A' && c <= 'F')
 			{
 				if (Len >= MaxLen && start == end)
 				{
@@ -294,14 +295,14 @@ public:
 			return atoi(text);
 		} 
 
-		int Finish = strlen(text);
+		size_t Finish = strlen(text);
 		char second = Finish > 1 ? text[1] : 0;
-		int Start = (second == 'x' || second == 'X') ? 2 : 0;
+		size_t Start = (second == 'x' || second == 'X') ? 2 : 0;
 
-		if (Finish > (8 + Start)) { Finish = (8 + Start); }
+		if (Finish > 8 + Start) { Finish = 8 + Start; }
 		
 		DWORD Value = 0;
-		for (int i = Start; i < Finish; i++)
+		for (size_t i = Start; i < Finish; i++)
 		{
 			Value = (Value << 4);
 			switch( text[i] ) {
diff --git a/Source/Project64/Version.h b/Source/Project64/Version.h
index ff88e0b3a..becdd7831 100644
--- a/Source/Project64/Version.h
+++ b/Source/Project64/Version.h
@@ -14,7 +14,7 @@
 #define VERSION_MAJOR               2
 #define VERSION_MINOR               2
 #define VERSION_REVISION            0
-#define VERSION_BUILD               3
+#define VERSION_BUILD               9999
 
 #define VER_FILE_DESCRIPTION_STR    "Project 64"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
diff --git a/Source/Project64/main.cpp b/Source/Project64/main.cpp
index c8f876e52..9f38a1d09 100644
--- a/Source/Project64/main.cpp
+++ b/Source/Project64/main.cpp
@@ -1,202 +1,219 @@
 #include "stdafx.h"
+#include "Multilanguage\LanguageSelector.h"
 #include <Tlhelp32.h>
 
 CTraceFileLog * LogFile = NULL;
 
 void LogLevelChanged (CTraceFileLog * LogFile)
 {
-	LogFile->SetTraceLevel((TraceLevel)g_Settings->LoadDword(Debugger_AppLogLevel));
+    LogFile->SetTraceLevel((TraceLevel)g_Settings->LoadDword(Debugger_AppLogLevel));
 }
 
 void LogFlushChanged (CTraceFileLog * LogFile)
 {
-	LogFile->SetFlushFile(g_Settings->LoadDword(Debugger_AppLogFlush) != 0);
+    LogFile->SetFlushFile(g_Settings->LoadDword(Debugger_AppLogFlush) != 0);
 }
 
-
-void InitializeLog ( void) 
+void InitializeLog ( void)
 {
-	CPath LogFilePath(CPath::MODULE_DIRECTORY);
-	LogFilePath.AppendDirectory("Logs");
-	if (!LogFilePath.DirectoryExists())
-	{
-		LogFilePath.CreateDirectory();
-	}
-	LogFilePath.SetNameExtension(_T("Project64.log"));
+    CPath LogFilePath(CPath::MODULE_DIRECTORY);
+    LogFilePath.AppendDirectory("Logs");
+    if (!LogFilePath.DirectoryExists())
+    {
+		LogFilePath.DirectoryCreate();
+    }
+    LogFilePath.SetNameExtension("Project64.log");
 
-	LogFile = new CTraceFileLog(LogFilePath, g_Settings->LoadDword(Debugger_AppLogFlush) != 0, Log_New,500);
+    LogFile = new CTraceFileLog(LogFilePath, g_Settings->LoadDword(Debugger_AppLogFlush) != 0, Log_New,500);
 #ifdef VALIDATE_DEBUG
-	LogFile->SetTraceLevel((TraceLevel)(g_Settings->LoadDword(Debugger_AppLogLevel) | TraceValidate));
+    LogFile->SetTraceLevel((TraceLevel)(g_Settings->LoadDword(Debugger_AppLogLevel) | TraceValidate | TraceDebug));
 #else
-	LogFile->SetTraceLevel((TraceLevel)g_Settings->LoadDword(Debugger_AppLogLevel));
+    LogFile->SetTraceLevel((TraceLevel)g_Settings->LoadDword(Debugger_AppLogLevel));
 #endif
-	AddTraceModule(LogFile);
-	
-	g_Settings->RegisterChangeCB(Debugger_AppLogLevel,LogFile,(CSettings::SettingChangedFunc)LogLevelChanged);
-	g_Settings->RegisterChangeCB(Debugger_AppLogFlush,LogFile,(CSettings::SettingChangedFunc)LogFlushChanged);
-}
+    AddTraceModule(LogFile);
 
+    g_Settings->RegisterChangeCB(Debugger_AppLogLevel,LogFile,(CSettings::SettingChangedFunc)LogLevelChanged);
+    g_Settings->RegisterChangeCB(Debugger_AppLogFlush,LogFile,(CSettings::SettingChangedFunc)LogFlushChanged);
+}
 
 /*bool ChangeDirPermission ( const CPath & Dir)
 {
-	if (Dir.DirectoryExists())
-	{
-		HANDLE hDir = CreateFile(Dir,READ_CONTROL|WRITE_DAC,0,NULL,OPEN_EXISTING,FILE_FLAG_BACKUP_SEMANTICS,NULL);
-		if (hDir != INVALID_HANDLE_VALUE)
-		{
-			ACL * pOldDACL = NULL;
-			PSECURITY_DESCRIPTOR pSD = NULL;
+if (Dir.DirectoryExists())
+{
+HANDLE hDir = CreateFile(Dir,READ_CONTROL|WRITE_DAC,0,NULL,OPEN_EXISTING,FILE_FLAG_BACKUP_SEMANTICS,NULL);
+if (hDir != INVALID_HANDLE_VALUE)
+{
+ACL * pOldDACL = NULL;
+PSECURITY_DESCRIPTOR pSD = NULL;
 
-			if (GetSecurityInfo(hDir,SE_FILE_OBJECT,DACL_SECURITY_INFORMATION,NULL,NULL,&pOldDACL,NULL,&pSD) == ERROR_SUCCESS)
-			{
-				bool bAdd = true;
+if (GetSecurityInfo(hDir,SE_FILE_OBJECT,DACL_SECURITY_INFORMATION,NULL,NULL,&pOldDACL,NULL,&pSD) == ERROR_SUCCESS)
+{
+bool bAdd = true;
 
-				PEXPLICIT_ACCESS_W pListOfExplictEntries;
-				ULONG cCountOfExplicitEntries;
-				if (GetExplicitEntriesFromAclW(pOldDACL,&cCountOfExplicitEntries,&pListOfExplictEntries) == ERROR_SUCCESS)
-				{
-					for (int i = 0; i < cCountOfExplicitEntries; i ++)
-					{
-						EXPLICIT_ACCESS_W &ea = pListOfExplictEntries[i];
-						if (ea.grfAccessMode != GRANT_ACCESS) { continue; }
-						if (ea.grfAccessPermissions != GENERIC_ALL) { continue; }
-						if ((ea.grfInheritance & (CONTAINER_INHERIT_ACE|OBJECT_INHERIT_ACE)) != (CONTAINER_INHERIT_ACE|OBJECT_INHERIT_ACE)) { continue; }
+PEXPLICIT_ACCESS_W pListOfExplictEntries;
+ULONG cCountOfExplicitEntries;
+if (GetExplicitEntriesFromAclW(pOldDACL,&cCountOfExplicitEntries,&pListOfExplictEntries) == ERROR_SUCCESS)
+{
+for (int i = 0; i < cCountOfExplicitEntries; i ++)
+{
+EXPLICIT_ACCESS_W &ea = pListOfExplictEntries[i];
+if (ea.grfAccessMode != GRANT_ACCESS) { continue; }
+if (ea.grfAccessPermissions != GENERIC_ALL) { continue; }
+if ((ea.grfInheritance & (CONTAINER_INHERIT_ACE|OBJECT_INHERIT_ACE)) != (CONTAINER_INHERIT_ACE|OBJECT_INHERIT_ACE)) { continue; }
 
-						if (ea.Trustee.TrusteeType == TRUSTEE_IS_SID)
-						{
-							
-						}
-						bAdd = false;
-					}
-				}
+if (ea.Trustee.TrusteeType == TRUSTEE_IS_SID)
+{
+}
+bAdd = false;
+}
+}
 
-				if (bAdd)
-				{
-					EXPLICIT_ACCESS ea = {0};
-					ea.grfAccessMode = GRANT_ACCESS;
-					ea.grfAccessPermissions = GENERIC_ALL;
-					ea.grfInheritance = CONTAINER_INHERIT_ACE|OBJECT_INHERIT_ACE;
-					ea.Trustee.TrusteeType = TRUSTEE_IS_GROUP;
-					ea.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
-					ea.Trustee.ptstrName = TEXT("Users");
+if (bAdd)
+{
+EXPLICIT_ACCESS ea = {0};
+ea.grfAccessMode = GRANT_ACCESS;
+ea.grfAccessPermissions = GENERIC_ALL;
+ea.grfInheritance = CONTAINER_INHERIT_ACE|OBJECT_INHERIT_ACE;
+ea.Trustee.TrusteeType = TRUSTEE_IS_GROUP;
+ea.Trustee.TrusteeForm = TRUSTEE_IS_NAME;
+ea.Trustee.ptstrName = TEXT("Users");
 
-					ACL * pNewDACL = NULL;
-					SetEntriesInAcl(1,&ea,pOldDACL,&pNewDACL);
+ACL * pNewDACL = NULL;
+SetEntriesInAcl(1,&ea,pOldDACL,&pNewDACL);
 
-					SetSecurityInfo(hDir,SE_FILE_OBJECT,DACL_SECURITY_INFORMATION,NULL,NULL,pNewDACL,NULL);
-					LocalFree(pNewDACL);
-				}
-				LocalFree(pSD);
-			}
-			CloseHandle(hDir);
-		}
-	}
-	return true;
+SetSecurityInfo(hDir,SE_FILE_OBJECT,DACL_SECURITY_INFORMATION,NULL,NULL,pNewDACL,NULL);
+LocalFree(pNewDACL);
+}
+LocalFree(pSD);
+}
+CloseHandle(hDir);
+}
+}
+return true;
 }*/
 
 void FixDirectories ( void )
 {
 	CPath Directory(CPath::MODULE_DIRECTORY);
-	Directory.AppendDirectory(_T("Config"));
-	if (!Directory.DirectoryExists()) Directory.CreateDirectory();
+	Directory.AppendDirectory("Config");
+	if (!Directory.DirectoryExists()) Directory.DirectoryCreate();
 
 	Directory.UpDirectory();
 	Directory.AppendDirectory("Logs");
-	if (!Directory.DirectoryExists()) Directory.CreateDirectory();
+	if (!Directory.DirectoryExists()) Directory.DirectoryCreate();
 
 	Directory.UpDirectory();
 	Directory.AppendDirectory("Save");
-	if (!Directory.DirectoryExists()) Directory.CreateDirectory();
+	if (!Directory.DirectoryExists()) Directory.DirectoryCreate();
 
 	Directory.UpDirectory();
 	Directory.AppendDirectory("Screenshots");
-	if (!Directory.DirectoryExists()) Directory.CreateDirectory();
+	if (!Directory.DirectoryExists()) Directory.DirectoryCreate();
 
 	Directory.UpDirectory();
 	Directory.AppendDirectory("textures");
-	if (!Directory.DirectoryExists()) Directory.CreateDirectory();
+	if (!Directory.DirectoryExists()) Directory.DirectoryCreate();
 }
 
 bool TerminatedExistingEmu()
 {
-	bool bTerminated = false;
-	bool AskedUser = false;
-	DWORD pid = GetCurrentProcessId();
+    bool bTerminated = false;
+    bool AskedUser = false;
+    DWORD pid = GetCurrentProcessId();
 
-	HANDLE nSearch = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-	if(nSearch != INVALID_HANDLE_VALUE)
-	{
-		PROCESSENTRY32 lppe;
+    HANDLE nSearch = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if(nSearch != INVALID_HANDLE_VALUE)
+    {
+        PROCESSENTRY32 lppe;
 
-		memset(&lppe, 0, sizeof(PROCESSENTRY32));
-		lppe.dwSize = sizeof(PROCESSENTRY32);
-		stdstr ModuleName = CPath(CPath::MODULE_FILE).GetNameExtension();
+        memset(&lppe, 0, sizeof(PROCESSENTRY32));
+        lppe.dwSize = sizeof(PROCESSENTRY32);
+        stdstr ModuleName = CPath(CPath::MODULE_FILE).GetNameExtension();
 
-		if (Process32First(nSearch, &lppe))
-		{
-			do 
-			{
-				if(_stricmp(lppe.szExeFile, ModuleName.c_str()) != 0 || 
-					lppe.th32ProcessID == pid)
-				{
-					continue;
-				}
-				if (!AskedUser)
-				{
-					AskedUser = true;
-					int res = MessageBox(NULL,stdstr_f("Project64.exe currently running\n\nTerminate pid %d now?",lppe.th32ProcessID).c_str(),"Terminate project64",MB_YESNO|MB_ICONEXCLAMATION);
-					if (res != IDYES)
-					{
-						break;
-					}
-				}
-				HANDLE hHandle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, lppe.th32ProcessID);
-				if(hHandle != NULL)
-				{
-					if (TerminateProcess(hHandle, 0))
-					{
-						bTerminated = true;
-					} else {
-						MessageBox(NULL,stdstr_f("Failed to terminate pid %d",lppe.th32ProcessID).c_str(),"Terminate project64 failed!",MB_YESNO|MB_ICONEXCLAMATION);
-					}
-					CloseHandle(hHandle);
-				}
-			} while (Process32Next(nSearch, &lppe));
-		}
-		CloseHandle(nSearch);
-	}
-	return bTerminated;
+        if (Process32First(nSearch, &lppe))
+        {
+            do
+            {
+                if(_stricmp(lppe.szExeFile, ModuleName.c_str()) != 0 ||
+                    lppe.th32ProcessID == pid)
+                {
+                    continue;
+                }
+                if (!AskedUser)
+                {
+                    AskedUser = true;
+                    int res = MessageBox(NULL,stdstr_f("Project64.exe currently running\n\nTerminate pid %d now?",lppe.th32ProcessID).c_str(),"Terminate project64",MB_YESNO|MB_ICONEXCLAMATION);
+                    if (res != IDYES)
+                    {
+                        break;
+                    }
+                }
+                HANDLE hHandle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, lppe.th32ProcessID);
+                if(hHandle != NULL)
+                {
+                    if (TerminateProcess(hHandle, 0))
+                    {
+                        bTerminated = true;
+                    } else {
+                        MessageBox(NULL,stdstr_f("Failed to terminate pid %d",lppe.th32ProcessID).c_str(),"Terminate project64 failed!",MB_YESNO|MB_ICONEXCLAMATION);
+                    }
+                    CloseHandle(hHandle);
+                }
+            } while (Process32Next(nSearch, &lppe));
+        }
+        CloseHandle(nSearch);
+    }
+    return bTerminated;
 }
 
-const char * AppName ( void ) 
+const char * AppName ( void )
 {
-	static stdstr Name;
-	if (Name.empty())
-	{
-		Name = stdstr_f("Project64 %s", VER_FILE_VERSION_STR);
-	}
-	return Name.c_str();
+    static stdstr Name;
+    if (Name.empty())
+    {
+        Name = stdstr_f("Project64 %s", VER_FILE_VERSION_STR);
+    }
+    return Name.c_str();
 }
 
-int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /*lpszArgs*/, int /*nWinMode*/) 
+#ifndef WINDOWS_UI
+int main(int argc, char* argv[])
+{
+    while (argc > 0)
+    {
+        puts(argv[--argc]);
+    }
+    putchar('\n');
+
+    fprintf(
+        stderr,
+        "Cross-platform (graphical/terminal?) UI not yet implemented.\n"
+    );
+    return 0;
+}
+#else
+int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /*lpszArgs*/, int /*nWinMode*/)
 {
 	FixDirectories();
 
-	CoInitialize(NULL);
-	try
-	{
-		SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL );
-		g_Lang = new CLanguage();
+	char *lbuffer = new char[10];
+	if (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SABBREVLANGNAME, lbuffer, 10))
+		setlocale(LC_ALL, lbuffer);
+	delete[] lbuffer;
 
+	CoInitialize(NULL);
+    try
+    {
+		SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL );
 		g_Settings = new CSettings;
-		g_Settings->Initilize(AppName());
+		g_Settings->Initialize(AppName());
 
 		if (g_Settings->LoadBool(Setting_CheckEmuRunning) && 
 			TerminatedExistingEmu())
 		{
 			delete g_Settings;
 			g_Settings = new CSettings;
-			g_Settings->Initilize(AppName());
+			g_Settings->Initialize(AppName());
 		}
 
 		InitializeLog();
@@ -208,64 +225,69 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /
 
 		//Create the plugin container
 		WriteTrace(TraceDebug,__FUNCTION__ ": Create Plugins");
-		g_Plugins = new CPlugins(g_Settings->LoadString(Directory_Plugin));
+		g_Plugins = new CPlugins(g_Settings->LoadStringVal(Directory_Plugin));
 
 		//Select the language
-		g_Lang->LoadCurrentStrings(true);
+		g_Lang = new CLanguage();
+		if (!g_Lang->LoadCurrentStrings())
+		{
+			CLanguageSelector().Select();
+		}
 
-		//Create the main window with Menu
-		WriteTrace(TraceDebug,__FUNCTION__ ": Create Main Window");
+
+        //Create the main window with Menu
+        WriteTrace(TraceDebug,__FUNCTION__ ": Create Main Window");
 		stdstr WinTitle(AppName());
 
 		WinTitle.Format("Project64 %s", VER_FILE_VERSION_STR);
 
 		CMainGui  MainWindow(true,WinTitle.c_str()), HiddenWindow(false);
-		CMainMenu MainMenu(&MainWindow);
-		g_Plugins->SetRenderWindows(&MainWindow,&HiddenWindow);
-		g_Notify->SetMainWindow(&MainWindow);
+        CMainMenu MainMenu(&MainWindow);
+        g_Plugins->SetRenderWindows(&MainWindow,&HiddenWindow);
+		Notify().SetMainWindow(&MainWindow);
 
-		if (__argc > 1)
-		{
-			WriteTraceF(TraceDebug,__FUNCTION__ ": Cmd line found \"%s\"",__argv[1]);
-			MainWindow.Show(true);	//Show the main window
-			CN64System::RunFileImage(__argv[1]);
-		} 
-		else 
-		{		
-			if (g_Settings->LoadDword(RomBrowser_Enabled))
-			{ 
-				WriteTrace(TraceDebug,__FUNCTION__ ": Show Rom Browser");
-				//Display the rom browser
-				MainWindow.ShowRomList(); 
-				MainWindow.Show(true);	//Show the main window
-				MainWindow.HighLightLastRom();
-			} else {
-				WriteTrace(TraceDebug,__FUNCTION__ ": Show Main Window");
-				MainWindow.Show(true);	//Show the main window
-			}
-		}
-		
-		//Process Messages till program is closed
-		WriteTrace(TraceDebug,__FUNCTION__ ": Entering Message Loop");
-		MainWindow.ProcessAllMessages();
-		WriteTrace(TraceDebug,__FUNCTION__ ": Message Loop Finished");
+        if (__argc > 1)
+        {
+            WriteTraceF(TraceDebug,__FUNCTION__ ": Cmd line found \"%s\"",__argv[1]);
+            MainWindow.Show(true);	//Show the main window
+            CN64System::RunFileImage(__argv[1]);
+        }
+        else
+        {
+            if (g_Settings->LoadDword(RomBrowser_Enabled))
+            {
+                WriteTrace(TraceDebug,__FUNCTION__ ": Show Rom Browser");
+                //Display the rom browser
+                MainWindow.ShowRomList();
+                MainWindow.Show(true);	//Show the main window
+                MainWindow.HighLightLastRom();
+            } else {
+                WriteTrace(TraceDebug,__FUNCTION__ ": Show Main Window");
+                MainWindow.Show(true);	//Show the main window
+            }
+        }
 
-		if (g_BaseSystem)
-		{
-			g_BaseSystem->CloseCpu();
-			delete g_BaseSystem;
-			g_BaseSystem = NULL;
-		}
-		WriteTrace(TraceDebug,__FUNCTION__ ": System Closed");
-		
-		g_Settings->UnregisterChangeCB(Debugger_AppLogLevel,LogFile,(CSettings::SettingChangedFunc)LogLevelChanged);
-		g_Settings->UnregisterChangeCB(Debugger_AppLogFlush,LogFile,(CSettings::SettingChangedFunc)LogFlushChanged);
-	}
-	catch(...)
-	{
-		WriteTraceF(TraceError,__FUNCTION__ ": Exception caught (File: \"%s\" Line: %d)",__FILE__,__LINE__);
-		MessageBox(NULL,stdstr_f("Exception caught\nFile: %s\nLine: %d",__FILE__,__LINE__).c_str(),"Exception",MB_OK);
-	}
+        //Process Messages till program is closed
+        WriteTrace(TraceDebug,__FUNCTION__ ": Entering Message Loop");
+        MainWindow.ProcessAllMessages();
+        WriteTrace(TraceDebug,__FUNCTION__ ": Message Loop Finished");
+
+        if (g_BaseSystem)
+        {
+            g_BaseSystem->CloseCpu();
+            delete g_BaseSystem;
+            g_BaseSystem = NULL;
+        }
+        WriteTrace(TraceDebug,__FUNCTION__ ": System Closed");
+
+        g_Settings->UnregisterChangeCB(Debugger_AppLogLevel,LogFile,(CSettings::SettingChangedFunc)LogLevelChanged);
+        g_Settings->UnregisterChangeCB(Debugger_AppLogFlush,LogFile,(CSettings::SettingChangedFunc)LogFlushChanged);
+    }
+    catch(...)
+    {
+        WriteTraceF(TraceError,__FUNCTION__ ": Exception caught (File: \"%s\" Line: %d)",__FILE__,__LINE__);
+        MessageBox(NULL,stdstr_f("Exception caught\nFile: %s\nLine: %d",__FILE__,__LINE__).c_str(),"Exception",MB_OK);
+    }
 	WriteTrace(TraceDebug,__FUNCTION__ ": cleaning up global objects");
 	
 	if (g_Rom)      { delete g_Rom; g_Rom = NULL; }
@@ -278,5 +300,6 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /
 	CoUninitialize();
 	WriteTrace(TraceDebug,__FUNCTION__ ": Done");
 	CloseTrace();
-	return true;
+    return true;
 }
+#endif
diff --git a/Source/Project64/stdafx.h b/Source/Project64/stdafx.h
index 858d6f457..2c0f1950b 100644
--- a/Source/Project64/stdafx.h
+++ b/Source/Project64/stdafx.h
@@ -15,6 +15,8 @@
 
 #include <common/MemTest.h>
 #include <common/CriticalSection.h>
+#include <windows.h>
+#include <exception>
 #include <shellapi.h>
 #include "Multilanguage.h"
 #include "User Interface.h"
diff --git a/Source/RSP/Cpu.c b/Source/RSP/Cpu.c
index ce3f1b04f..567256593 100644
--- a/Source/RSP/Cpu.c
+++ b/Source/RSP/Cpu.c
@@ -167,7 +167,7 @@ void Build_RSP ( void )
 			BYTE Temp;
 
 			Temp = Indx[i].B[count];
-			Indx[i].B[count] = Indx[i].B[7 - count]; 
+			Indx[i].B[count] = Indx[i].B[7 - count];
 			Indx[i].B[7 - count] = Temp;
 		}
 	}
@@ -200,7 +200,7 @@ __declspec(dllexport) DWORD DoRspCycles ( DWORD Cycles )
 /*	if (*RSPInfo.SP_STATUS_REG & SP_STATUS_SIG0)
 	{
 		*RSPInfo.SP_STATUS_REG &= ~SP_STATUS_SIG0;
-		*RSPInfo.MI_INTR_REG |= MI_INTR_SP; 
+		*RSPInfo.MI_INTR_REG |= MI_INTR_SP;
 		RSPInfo.CheckInterrupts();
 		return Cycles;
 	}
diff --git a/Source/RSP/Interpreter CPU.c b/Source/RSP/Interpreter CPU.c
index 0849ef90d..f762d9b9f 100644
--- a/Source/RSP/Interpreter CPU.c	
+++ b/Source/RSP/Interpreter CPU.c	
@@ -432,7 +432,7 @@ DWORD RunInterpreterCPU(DWORD Cycles) {
 			SetRSPCommandViewto( *PrgCount );
 			UpdateRSPRegistersScreen();
 			while ( WaitingForStep == TRUE ){ 
-				Sleep(20);						
+				Sleep(20);
 				if (!Stepping_Commands) {
 					WaitingForStep = FALSE;
 				}
@@ -448,22 +448,22 @@ DWORD RunInterpreterCPU(DWORD Cycles) {
 
 		switch (RSP_NextInstruction) {
 		case NORMAL: 
-			*PrgCount = (*PrgCount + 4) & 0xFFC; 
+			*PrgCount = (*PrgCount + 4) & 0xFFC;
 			break;
 		case DELAY_SLOT:
 			RSP_NextInstruction = JUMP;
-			*PrgCount = (*PrgCount + 4) & 0xFFC; 
+			*PrgCount = (*PrgCount + 4) & 0xFFC;
 			break;
 		case JUMP:
 			RSP_NextInstruction = NORMAL;
 			*PrgCount  = RSP_JumpTo;
 			break;
 		case SINGLE_STEP: 
-			*PrgCount = (*PrgCount + 4) & 0xFFC; 
+			*PrgCount = (*PrgCount + 4) & 0xFFC;
 			RSP_NextInstruction = SINGLE_STEP_DONE;
 			break;
 		case SINGLE_STEP_DONE:
-			*PrgCount = (*PrgCount + 4) & 0xFFC; 
+			*PrgCount = (*PrgCount + 4) & 0xFFC;
 			*RSPInfo.SP_STATUS_REG |= SP_STATUS_HALT;
 			RSP_Running = FALSE;
 			break;
@@ -472,3 +472,18 @@ DWORD RunInterpreterCPU(DWORD Cycles) {
 	return Cycles;
 }
 
+unsigned int RSP_branch_if(int condition)
+{
+    unsigned int new_PC;
+
+ /* RSP_NextInstruction = DELAY_SLOT; */
+    if (condition)
+    {
+        new_PC = *PrgCount + 4 + ((short)RSPOpC.offset << 2);
+    }
+    else
+    {
+        new_PC = *PrgCount + 4 + 4;
+    }
+    return (new_PC & 0xFFC);
+}
diff --git a/Source/RSP/Interpreter CPU.h b/Source/RSP/Interpreter CPU.h
index 861319ba3..17c33ec3a 100644
--- a/Source/RSP/Interpreter CPU.h	
+++ b/Source/RSP/Interpreter CPU.h	
@@ -38,5 +38,11 @@
 
 extern DWORD RSP_NextInstruction, RSP_JumpTo, RSP_MfStatusCount;
 
+/*
+ * standard MIPS PC-relative branch
+ * returns the new PC, based on whether the condition passes
+ */
+unsigned int RSP_branch_if(int condition);
+
 void BuildInterpreterCPU(void);
 DWORD RunInterpreterCPU(DWORD Cycles);
diff --git a/Source/RSP/Interpreter Ops.c b/Source/RSP/Interpreter Ops.c
index 5622a9d9a..cdb87cfec 100644
--- a/Source/RSP/Interpreter Ops.c	
+++ b/Source/RSP/Interpreter Ops.c	
@@ -63,38 +63,22 @@ void RSP_Opcode_JAL ( void ) {
 
 void RSP_Opcode_BEQ ( void ) {
 	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W == RSP_GPR[RSPOpC.rt].W) {
-		RSP_JumpTo = ( *PrgCount + ((short)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else  {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
+	RSP_JumpTo = RSP_branch_if(RSP_GPR[RSPOpC.rs].W == RSP_GPR[RSPOpC.rt].W);
 }
 
 void RSP_Opcode_BNE ( void ) {
 	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W != RSP_GPR[RSPOpC.rt].W) {
-		RSP_JumpTo = ( *PrgCount + ((short)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else  {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
+	RSP_JumpTo = RSP_branch_if(RSP_GPR[RSPOpC.rs].W != RSP_GPR[RSPOpC.rt].W);
 }
 
 void RSP_Opcode_BLEZ ( void ) {
 	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W <= 0) {
-		RSP_JumpTo = ( *PrgCount + ((short)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else  {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
+	RSP_JumpTo = RSP_branch_if(RSP_GPR[RSPOpC.rs].W <= 0);
 }
 
 void RSP_Opcode_BGTZ ( void ) {
 	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W > 0) {
-		RSP_JumpTo = ( *PrgCount + ((short)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else  {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
+	RSP_JumpTo = RSP_branch_if(RSP_GPR[RSPOpC.rs].W >  0);
 }
 
 void RSP_Opcode_ADDI ( void ) {
@@ -106,19 +90,11 @@ void RSP_Opcode_ADDIU ( void ) {
 }
 
 void RSP_Opcode_SLTI (void) {
-	if (RSP_GPR[RSPOpC.rs].W < (int16_t)RSPOpC.immediate) {
-		RSP_GPR[RSPOpC.rt].W = 1;
-	} else {
-		RSP_GPR[RSPOpC.rt].W = 0;
-	}
+	RSP_GPR[RSPOpC.rt].W = (RSP_GPR[RSPOpC.rs].W < (int16_t)RSPOpC.immediate) ? 1 : 0;
 }
 
 void RSP_Opcode_SLTIU (void) {
-	if (RSP_GPR[RSPOpC.rs].UW < (uint32_t)(int16_t)RSPOpC.immediate) {
-		RSP_GPR[RSPOpC.rt].W = 1;
-	} else {
-		RSP_GPR[RSPOpC.rt].W = 0;
-	}
+	RSP_GPR[RSPOpC.rt].W = (RSP_GPR[RSPOpC.rs].UW < (uint32_t)(int16_t)RSPOpC.immediate) ? 1 : 0;
 }
 
 void RSP_Opcode_ANDI ( void ) {
@@ -275,58 +251,34 @@ void RSP_Special_NOR (void) {
 }
 
 void RSP_Special_SLT (void) {
-	if (RSP_GPR[RSPOpC.rs].W < RSP_GPR[RSPOpC.rt].W) {
-		RSP_GPR[RSPOpC.rd].UW = 1;
-	} else {
-		RSP_GPR[RSPOpC.rd].UW = 0;
-	}
+	RSP_GPR[RSPOpC.rd].UW = (RSP_GPR[RSPOpC.rs].W < RSP_GPR[RSPOpC.rt].W) ? 1 : 0;
 }
 
 void RSP_Special_SLTU (void) {
-	if (RSP_GPR[RSPOpC.rs].UW < RSP_GPR[RSPOpC.rt].UW) {
-		RSP_GPR[RSPOpC.rd].UW = 1;
-	} else {
-		RSP_GPR[RSPOpC.rd].UW = 0;
-	}
+	RSP_GPR[RSPOpC.rd].UW = (RSP_GPR[RSPOpC.rs].UW < RSP_GPR[RSPOpC.rt].UW) ? 1 : 0;
 }
 
 /********************** R4300i OpCodes: RegImm **********************/
 void RSP_Opcode_BLTZ ( void ) {
 	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W < 0) {
-		RSP_JumpTo = ( *PrgCount + ((short)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else  {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
+	RSP_JumpTo = RSP_branch_if(RSP_GPR[RSPOpC.rs].W <  0);
 }
 
 void RSP_Opcode_BGEZ ( void ) {
 	RSP_NextInstruction = DELAY_SLOT;
-	if (RSP_GPR[RSPOpC.rs].W >= 0) {
-		RSP_JumpTo = ( *PrgCount + ((short)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else  {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
+	RSP_JumpTo = RSP_branch_if(RSP_GPR[RSPOpC.rs].W >= 0);
 }
 
 void RSP_Opcode_BLTZAL ( void ) {
 	RSP_NextInstruction = DELAY_SLOT;
 	RSP_GPR[31].UW = ( *PrgCount + 8 ) & 0xFFC;
-	if (RSP_GPR[RSPOpC.rs].W < 0) {
-		RSP_JumpTo = ( *PrgCount + ((short)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else  {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
+	RSP_JumpTo = RSP_branch_if(RSP_GPR[RSPOpC.rs].W <  0);
 }
 
 void RSP_Opcode_BGEZAL ( void ) {
 	RSP_NextInstruction = DELAY_SLOT;
 	RSP_GPR[31].UW = ( *PrgCount + 8 ) & 0xFFC;
-	if (RSP_GPR[RSPOpC.rs].W >= 0) {
-		RSP_JumpTo = ( *PrgCount + ((short)RSPOpC.offset << 2) + 4 ) & 0xFFC;
-	} else  {
-		RSP_JumpTo = ( *PrgCount + 8 ) & 0xFFC;
-	}
+	RSP_JumpTo = RSP_branch_if(RSP_GPR[RSPOpC.rs].W >= 0);
 }
 
 /************************** Cop0 functions *************************/
@@ -340,7 +292,7 @@ void RSP_Cop0_MF (void) {
 	case 1: RSP_GPR[RSPOpC.rt].UW = *RSPInfo.SP_DRAM_ADDR_REG; break;
 	case 4: 
 		RSP_MfStatusCount += 1;
-		RSP_GPR[RSPOpC.rt].UW = *RSPInfo.SP_STATUS_REG; 
+		RSP_GPR[RSPOpC.rt].UW = *RSPInfo.SP_STATUS_REG;
 		if (RSP_MfStatusCount > 10)
 		{
 			RSP_Running = FALSE;
@@ -377,12 +329,12 @@ void RSP_Cop0_MT (void) {
 	case 0: *RSPInfo.SP_MEM_ADDR_REG  = RSP_GPR[RSPOpC.rt].UW; break;
 	case 1: *RSPInfo.SP_DRAM_ADDR_REG = RSP_GPR[RSPOpC.rt].UW; break;
 	case 2: 
-		*RSPInfo.SP_RD_LEN_REG = RSP_GPR[RSPOpC.rt].UW; 
-		SP_DMA_READ();		
+		*RSPInfo.SP_RD_LEN_REG = RSP_GPR[RSPOpC.rt].UW;
+		SP_DMA_READ();
 		break;
 	case 3: 
-		*RSPInfo.SP_WR_LEN_REG = RSP_GPR[RSPOpC.rt].UW; 
-		SP_DMA_WRITE();		
+		*RSPInfo.SP_WR_LEN_REG = RSP_GPR[RSPOpC.rt].UW;
+		SP_DMA_WRITE();
 		break;
 	case 4:
 		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_HALT ) != 0) { *RSPInfo.SP_STATUS_REG &= ~SP_STATUS_HALT; }
@@ -397,7 +349,7 @@ void RSP_Cop0_MT (void) {
 		}
 		if ( ( RSP_GPR[RSPOpC.rt].W & SP_CLR_SSTEP ) != 0) 
 		{
-			*RSPInfo.SP_STATUS_REG &= ~SP_STATUS_SSTEP; 
+			*RSPInfo.SP_STATUS_REG &= ~SP_STATUS_SSTEP;
 		}
 		if ( ( RSP_GPR[RSPOpC.rt].W & SP_SET_SSTEP ) != 0) 
 		{
@@ -425,11 +377,11 @@ void RSP_Cop0_MT (void) {
 		break;
 	case 7: *RSPInfo.SP_SEMAPHORE_REG = 0; break;
 	case 8: 
-		*RSPInfo.DPC_START_REG = RSP_GPR[RSPOpC.rt].UW; 
-		*RSPInfo.DPC_CURRENT_REG = RSP_GPR[RSPOpC.rt].UW; 
+		*RSPInfo.DPC_START_REG = RSP_GPR[RSPOpC.rt].UW;
+		*RSPInfo.DPC_CURRENT_REG = RSP_GPR[RSPOpC.rt].UW;
 		break;
 	case 9: 
-		*RSPInfo.DPC_END_REG = RSP_GPR[RSPOpC.rt].UW; 
+		*RSPInfo.DPC_END_REG = RSP_GPR[RSPOpC.rt].UW;
 		RDP_LogDlist();
 		if (RSPInfo.ProcessRdpList != NULL) { RSPInfo.ProcessRdpList(); }
 		break;
@@ -499,18 +451,14 @@ void RSP_Vector_VMULF (void) {
 		del = EleSpec[RSPOpC.rs].B[el];
 
 		if (RSP_Vect[RSPOpC.rd].UHW[el] != 0x8000 || RSP_Vect[RSPOpC.rt].UHW[del] != 0x8000) {
-			temp.W = ((long)RSP_Vect[RSPOpC.rd].HW[el] * (long)RSP_Vect[RSPOpC.rt].HW[del]) << 1; 
+			temp.W   = ((int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)RSP_Vect[RSPOpC.rt].HW[del]) << 1;
 			temp.UW += 0x8000;
 			RSP_ACCUM[el].HW[2] = temp.HW[1];
 			RSP_ACCUM[el].HW[1] = temp.HW[0];
-			if ( RSP_ACCUM[el].HW[2] < 0 ) {
-				RSP_ACCUM[el].HW[3] = -1;
-			} else {
-				RSP_ACCUM[el].HW[3] = 0;
-			}
+			RSP_ACCUM[el].HW[3] = (RSP_ACCUM[el].HW[2] < 0) ? -1 : 0;
 			result.HW[el] = RSP_ACCUM[el].HW[2];
 		} else {
-			temp.W = 0x80000000; 
+			temp.W = 0x80000000;
 			RSP_ACCUM[el].UHW[3] = 0;
 			RSP_ACCUM[el].UHW[2] = 0x8000;
 			RSP_ACCUM[el].UHW[1] = 0x8000;
@@ -526,11 +474,11 @@ void RSP_Vector_VMULU (void) {
 
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
-		RSP_ACCUM[el].DW = (__int64)(RSP_Vect[RSPOpC.rd].HW[el] * RSP_Vect[RSPOpC.rt].HW[del]) << 17;
+		RSP_ACCUM[el].DW = (int64_t)(RSP_Vect[RSPOpC.rd].HW[el] * RSP_Vect[RSPOpC.rt].HW[del]) << 17;
 		RSP_ACCUM[el].DW += 0x80000000;
 		if (RSP_ACCUM[el].DW < 0) {
 			result.HW[el] = 0;
-		} else if ((short)(RSP_ACCUM[el].UHW[3] ^ RSP_ACCUM[el].UHW[2]) < 0) {
+		} else if ((int16_t)(RSP_ACCUM[el].UHW[3] ^ RSP_ACCUM[el].UHW[2]) < 0) {
 			result.HW[el] = -1;
 		} else {
 			result.HW[el] = RSP_ACCUM[el].HW[2];
@@ -547,10 +495,10 @@ void RSP_Vector_VMUDL (void) {
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
 
-		temp.UW = (DWORD)RSP_Vect[RSPOpC.rd].UHW[el] * (DWORD)RSP_Vect[RSPOpC.rt].UHW[del];
+		temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
 		RSP_ACCUM[el].W[1] = 0;
 		RSP_ACCUM[el].HW[1] = temp.HW[1];
-		result.HW[el] = RSP_ACCUM[el].HW[1];		
+		result.HW[el] = RSP_ACCUM[el].HW[1];
 	}
 	RSP_Vect[RSPOpC.sa] = result;
 }
@@ -563,7 +511,7 @@ void RSP_Vector_VMUDM (void) {
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
 
-		temp.UW = (DWORD)((long)RSP_Vect[RSPOpC.rd].HW[el]) * (DWORD)RSP_Vect[RSPOpC.rt].UHW[del];
+		temp.UW = (uint32_t)((int32_t)RSP_Vect[RSPOpC.rd].HW[el]) * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
 		if (temp.W < 0) {
 			RSP_ACCUM[el].HW[3] = -1;
 		} else {
@@ -584,7 +532,7 @@ void RSP_Vector_VMUDN (void) {
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
 
-		temp.UW = (DWORD)RSP_Vect[RSPOpC.rd].UHW[el] * (DWORD)(long)(RSP_Vect[RSPOpC.rt].HW[del]);
+		temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)((int32_t)RSP_Vect[RSPOpC.rt].HW[del]);
 		if (temp.W < 0) {
 			RSP_ACCUM[el].HW[3] = -1;
 		} else {
@@ -603,15 +551,15 @@ void RSP_Vector_VMUDH (void) {
 
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
-		
-		RSP_ACCUM[el].W[1] = (long)RSP_Vect[RSPOpC.rd].HW[el] * (long)RSP_Vect[RSPOpC.rt].HW[del]; 
+
+		RSP_ACCUM[el].W[1]  = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)RSP_Vect[RSPOpC.rt].HW[del];
 		RSP_ACCUM[el].HW[1] = 0;
 		if (RSP_ACCUM[el].HW[3] < 0) {
 			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) { 
-				result.HW[el] = (WORD)0x8000;
+				result.HW[el] = 0x8000;
 			} else {
 				if (RSP_ACCUM[el].HW[2] >= 0) {
-					result.HW[el] = (WORD)0x8000;
+					result.HW[el] = 0x8000;
 				} else {
 					result.HW[el] = RSP_ACCUM[el].HW[2];
 				}
@@ -647,14 +595,14 @@ void RSP_Vector_VMACF (void) {
 		temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
 		RSP_ACCUM[el].HW[2] = temp2.HW[0];
 		RSP_ACCUM[el].HW[3] += temp2.HW[1];*/
-		temp.W = (long)RSP_Vect[RSPOpC.rd].HW[el] * (long)(DWORD)RSP_Vect[RSPOpC.rt].HW[del];
-		RSP_ACCUM[el].DW += ((__int64)temp.W) << 17;
+		temp.W = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)(uint32_t)RSP_Vect[RSPOpC.rt].HW[del];
+		RSP_ACCUM[el].DW += ((int64_t)temp.W) << 17;
 		if (RSP_ACCUM[el].HW[3] < 0) {
 			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) { 
-				result.HW[el] = (WORD)0x8000;
+				result.HW[el] = 0x8000;
 			} else {
 				if (RSP_ACCUM[el].HW[2] >= 0) {
-					result.HW[el] = (WORD)0x8000;
+					result.HW[el] = 0x8000;
 				} else {
 					result.HW[el] = RSP_ACCUM[el].HW[2];
 				}
@@ -682,7 +630,7 @@ void RSP_Vector_VMACU (void) {
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
 
-		temp.W = (long)RSP_Vect[RSPOpC.rd].HW[el] * (long)(DWORD)RSP_Vect[RSPOpC.rt].HW[del];
+		temp.W = (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)(uint32_t)RSP_Vect[RSPOpC.rt].HW[del];
 		RSP_ACCUM[el].UHW[3] = (RSP_ACCUM[el].UHW[3] + (WORD)(temp.W >> 31)) & 0xFFFF;
 		temp.UW = temp.UW << 1;
 		temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
@@ -694,10 +642,10 @@ void RSP_Vector_VMACU (void) {
 			result.HW[el] = 0;
 		} else {
 			if (RSP_ACCUM[el].UHW[3] != 0) { 
-				result.UHW[el] = 0xFFFF; 
+				result.UHW[el] = 0xFFFF;
 			} else {
 				if (RSP_ACCUM[el].HW[2] < 0) {
-					result.UHW[el] = 0xFFFF; 
+					result.UHW[el] = 0xFFFF;
 				} else {
 					result.HW[el] = RSP_ACCUM[el].HW[2];
 				}
@@ -758,7 +706,7 @@ void RSP_Vector_VMADL (void) {
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
 
-		temp.UW = (DWORD)RSP_Vect[RSPOpC.rd].UHW[el] * (DWORD)RSP_Vect[RSPOpC.rt].UHW[del];
+		temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
 		temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[1];
 		RSP_ACCUM[el].HW[1] = temp2.HW[0];
 		temp2.UW = RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
@@ -776,10 +724,10 @@ void RSP_Vector_VMADL (void) {
 			}
 		} else {
 			if (RSP_ACCUM[el].UHW[3] != 0) { 
-				result.UHW[el] = 0xFFFF; 
+				result.UHW[el] = 0xFFFF;
 			} else {
 				if (RSP_ACCUM[el].HW[2] < 0) {
-					result.UHW[el] = 0xFFFF; 
+					result.UHW[el] = 0xFFFF;
 				} else {
 					result.HW[el] = RSP_ACCUM[el].HW[1];
 				}
@@ -797,21 +745,21 @@ void RSP_Vector_VMADM (void) {
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
 
-		temp.UW = (DWORD)((long)RSP_Vect[RSPOpC.rd].HW[el]) * (DWORD)RSP_Vect[RSPOpC.rt].UHW[del];
+		temp.UW = (uint32_t)((int32_t)RSP_Vect[RSPOpC.rd].HW[el]) * (uint32_t)RSP_Vect[RSPOpC.rt].UHW[del];
 		temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
 		RSP_ACCUM[el].HW[1] = temp2.HW[0];
 		temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
 		RSP_ACCUM[el].HW[2] = temp2.HW[0];
 		RSP_ACCUM[el].HW[3] += temp2.HW[1];
 		if (temp.W < 0) { 
-			RSP_ACCUM[el].HW[3] -= 1; 
+			RSP_ACCUM[el].HW[3] -= 1;
 		}
 		if (RSP_ACCUM[el].HW[3] < 0) {
 			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) { 
-				result.HW[el] = (WORD)0x8000;
+				result.HW[el] = 0x8000;
 			} else {
 				if (RSP_ACCUM[el].HW[2] >= 0) {
-					result.HW[el] = (WORD)0x8000;
+					result.HW[el] = 0x8000;
 				} else {
 					result.HW[el] = RSP_ACCUM[el].HW[2];
 				}
@@ -840,14 +788,14 @@ void RSP_Vector_VMADN (void) {
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
 
-		temp.UW = (DWORD)RSP_Vect[RSPOpC.rd].UHW[el] * (DWORD)((long)RSP_Vect[RSPOpC.rt].HW[del]);
+		temp.UW = (uint32_t)RSP_Vect[RSPOpC.rd].UHW[el] * (uint32_t)((int32_t)RSP_Vect[RSPOpC.rt].HW[del]);
 		temp2.UW = temp.UHW[0] + RSP_ACCUM[el].UHW[1];
 		RSP_ACCUM[el].HW[1] = temp2.HW[0];
 		temp2.UW = temp.UHW[1] + RSP_ACCUM[el].UHW[2] + temp2.UHW[1];
 		RSP_ACCUM[el].HW[2] = temp2.HW[0];
 		RSP_ACCUM[el].HW[3] += temp2.HW[1];
 		if (temp.W < 0) { 
-			RSP_ACCUM[el].HW[3] -= 1; 
+			RSP_ACCUM[el].HW[3] -= 1;
 		}
 		if (RSP_ACCUM[el].HW[3] < 0) {
 			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) { 
@@ -880,14 +828,14 @@ void RSP_Vector_VMADH (void) {
 
 	for (el = 0; el < 8; el ++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
-		
-		RSP_ACCUM[el].W[1] += (long)RSP_Vect[RSPOpC.rd].HW[el] * (long)RSP_Vect[RSPOpC.rt].HW[del]; 
+
+		RSP_ACCUM[el].W[1] += (int32_t)RSP_Vect[RSPOpC.rd].HW[el] * (int32_t)RSP_Vect[RSPOpC.rt].HW[del];
 		if (RSP_ACCUM[el].HW[3] < 0) {
 			if (RSP_ACCUM[el].UHW[3] != 0xFFFF) { 
-				result.HW[el] = (WORD)0x8000;
+				result.HW[el] = 0x8000;
 			} else {
 				if (RSP_ACCUM[el].HW[2] >= 0) {
-					result.HW[el] = (WORD)0x8000;
+					result.HW[el] = 0x8000;
 				} else {
 					result.HW[el] = RSP_ACCUM[el].HW[2];
 				}
@@ -911,7 +859,7 @@ void RSP_Vector_VADD (void) {
 	int el, del;
 	UWORD32 temp;
 	VECTOR result = {0};
-	
+
 	for ( el = 0; el < 8; el++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
         
@@ -920,7 +868,7 @@ void RSP_Vector_VADD (void) {
 		RSP_ACCUM[el].HW[1] = temp.HW[0];
 		if ((temp.HW[0] & 0x8000) == 0) {
 			if (temp.HW[1] != 0) {
-				result.HW[el] = (WORD)0x8000;
+				result.HW[el] = 0x8000;
 			} else {
 				result.HW[el] = temp.HW[0];
 			}
@@ -940,7 +888,7 @@ void RSP_Vector_VSUB (void) {
 	int el, del;
 	UWORD32 temp;
 	VECTOR result = {0};
-	
+
 	for ( el = 0; el < 8; el++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
         
@@ -949,7 +897,7 @@ void RSP_Vector_VSUB (void) {
 		RSP_ACCUM[el].HW[1] = temp.HW[0];
 		if ((temp.HW[0] & 0x8000) == 0) {
 			if (temp.HW[1] != 0) {
-				result.HW[el] = (WORD)0x8000;
+				result.HW[el] = 0x8000;
 			} else {
 				result.HW[el] = temp.HW[0];
 			}
@@ -975,7 +923,7 @@ void RSP_Vector_VABS (void) {
 		if (RSP_Vect[RSPOpC.rd].HW[el] > 0) {
 			result.HW[el] = RSP_Vect[RSPOpC.rt].UHW[del];
 		} else if (RSP_Vect[RSPOpC.rd].HW[el] < 0) {
-			if (RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[el]] == 0x8000) {
+			if (RSP_Vect[RSPOpC.rt].UHW[del] == 0x8000) {
 				result.HW[el] = 0x7FFF;
 			} else {
 				result.HW[el] = RSP_Vect[RSPOpC.rt].HW[del] * -1;
@@ -992,7 +940,7 @@ void RSP_Vector_VADDC (void) {
 	int el, del;
 	UWORD32 temp;
 	VECTOR result = {0};
-	
+
 	RSP_Flags[0].UW = 0;
 	for ( el = 0; el < 8; el++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
@@ -1011,7 +959,7 @@ void RSP_Vector_VSUBC (void) {
 	int el, del;
 	UWORD32 temp;
 	VECTOR result = {0};
-	
+
 	RSP_Flags[0].UW = 0x0;
 	for ( el = 0; el < 8; el++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
@@ -1073,7 +1021,7 @@ void RSP_Vector_VSAW (void) {
 void RSP_Vector_VLT (void) {
 	int el, del;
 	VECTOR result = {0};
-	
+
 	RSP_Flags[1].UW = 0;
 	for ( el = 0; el < 8; el++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
@@ -1092,7 +1040,7 @@ void RSP_Vector_VLT (void) {
 				RSP_Flags[1].UW &= ~( 1 << (7 - el) );
 			}
 		}
-		RSP_ACCUM[el].HW[1] = result.HW[el];			
+		RSP_ACCUM[el].HW[1] = result.HW[el];
 	}
 	RSP_Flags[0].UW = 0;
 	RSP_Vect[RSPOpC.sa] = result;
@@ -1101,7 +1049,7 @@ void RSP_Vector_VLT (void) {
 void RSP_Vector_VEQ (void) {
 	int el, del;
 	VECTOR result = {0};
-	
+
 	RSP_Flags[1].UW = 0;
 	for ( el = 0; el < 8; el++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
@@ -1112,7 +1060,7 @@ void RSP_Vector_VEQ (void) {
 			}
 		}
         result.HW[el] = RSP_Vect[RSPOpC.rt].UHW[del];
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rt].UHW[del];			
+		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rt].UHW[del];
 	}
 	RSP_Flags[0].UW = 0;
 	RSP_Vect[RSPOpC.sa] = result;
@@ -1121,7 +1069,7 @@ void RSP_Vector_VEQ (void) {
 void RSP_Vector_VNE (void) {
 	int el, del;
 	VECTOR result = {0};
-	
+
 	RSP_Flags[1].UW = 0;
 	for ( el = 0; el < 8; el++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
@@ -1134,7 +1082,7 @@ void RSP_Vector_VNE (void) {
 			}
 		}
         result.HW[el] = RSP_Vect[RSPOpC.rd].UHW[el];
-		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].UHW[el];			
+		RSP_ACCUM[el].HW[1] = RSP_Vect[RSPOpC.rd].UHW[el];
 	}
 	RSP_Flags[0].UW = 0;
 	RSP_Vect[RSPOpC.sa] = result;
@@ -1143,7 +1091,7 @@ void RSP_Vector_VNE (void) {
 void RSP_Vector_VGE (void) {
 	int el, del;
 	VECTOR result = {0};
-	
+
 	RSP_Flags[1].UW = 0;
 	for ( el = 0; el < 8; el++ ) {
 		del = EleSpec[RSPOpC.rs].B[el];
@@ -1162,7 +1110,7 @@ void RSP_Vector_VGE (void) {
 			result.HW[el] = RSP_Vect[RSPOpC.rt].UHW[del];
 			RSP_Flags[1].UW &= ~( 1 << (7 - el) );
 		}
-		RSP_ACCUM[el].HW[1] = result.HW[el];			
+		RSP_ACCUM[el].HW[1] = result.HW[el];
 	}
 	RSP_Flags[0].UW = 0;
 	RSP_Vect[RSPOpC.sa] = result;
@@ -1228,7 +1176,7 @@ void RSP_Vector_VCL (void) {
 void RSP_Vector_VCH (void) {
 	int el, del;
 	VECTOR result = {0};
-	
+
 	RSP_Flags[0].UW = 0;
 	RSP_Flags[1].UW = 0;
 	RSP_Flags[2].UW = 0;
@@ -1445,7 +1393,7 @@ void RSP_Vector_VRCP (void) {
 
 void RSP_Vector_VRCPL (void) {
 	int count, neg;
-	
+
 	RecpResult.UW = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]] | Recp.W;
 	if (RecpResult.UW == 0) {
 		RecpResult.UW = 0x7FFFFFFF;
@@ -1500,10 +1448,10 @@ void RSP_Vector_VRCPH (void) {
 
 void RSP_Vector_VMOV (void) {
 	int count;
+
 	for ( count = 0; count < 8; count++ ) {
 		RSP_ACCUM[count].HW[1] = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[count]];
 	}
-	
 	RSP_Vect[RSPOpC.sa].UHW[7 - (RSPOpC.rd & 0x7)] =
 		RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]];
 }
@@ -1553,7 +1501,7 @@ void RSP_Vector_VRSQ (void) {
 
 void RSP_Vector_VRSQL (void) {
 	int count, neg;
-	
+
 	SQrootResult.UW = RSP_Vect[RSPOpC.rt].UHW[EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)]] | SQroot.W;
 	if (SQrootResult.UW == 0) {
 		SQrootResult.UW = 0x7FFFFFFF;
@@ -1738,7 +1686,7 @@ void rsp_UnknownOpcode (void) {
 	} else {
 		sprintf(Message,"Unhandled Opcode\n%s\n\nStoping Emulation!\n\nDo you wish to enter the debugger ?", 
 			RSPOpcodeName(RSPOpC.Hex,*PrgCount));
-		response = MessageBox(NULL,Message,"Error", MB_YESNO | MB_ICONERROR );	
+		response = MessageBox(NULL,Message,"Error", MB_YESNO | MB_ICONERROR);
 		if (response == IDYES) {		
 			Enter_RSP_Commands_Window ();
 		}
diff --git a/Source/RSP/Main.cpp b/Source/RSP/Main.cpp
index 943778a04..874394503 100644
--- a/Source/RSP/Main.cpp
+++ b/Source/RSP/Main.cpp
@@ -98,12 +98,12 @@ const char * AboutMsg ( void )
 /************ Functions ***********/
 DWORD AsciiToHex (char * HexValue)
 {
-	DWORD Count, Finish, Value = 0;
+	DWORD Value = 0;
 
-	Finish = strlen(HexValue);
+	size_t Finish = strlen(HexValue);
 	if (Finish > 8 ) { Finish = 8; }
 
-	for (Count = 0; Count < Finish; Count++)
+	for (size_t Count = 0; Count < Finish; Count++)
 	{
 		Value = (Value << 4);
 		switch( HexValue[Count] )
@@ -273,6 +273,7 @@ void DetectCpuSpecs(void)
 	DWORD AMD_Features = 0;
 
 	__try {
+#ifdef _M_IX86
 		_asm {
 			/* Intel features */
 			mov eax, 1
@@ -284,7 +285,15 @@ void DetectCpuSpecs(void)
 			cpuid
 			or [AMD_Features], edx
 		}
-    } __except ( EXCEPTION_EXECUTE_HANDLER) {
+#else
+		int cpuInfo[4];
+		__cpuid(cpuInfo, 1);
+		Intel_Features = cpuInfo[3];
+		__cpuid(cpuInfo, 0x80000001);
+		AMD_Features = cpuInfo[3];
+#endif
+	}
+	__except (EXCEPTION_EXECUTE_HANDLER) {
 		AMD_Features = Intel_Features = 0;
     }
 
@@ -411,7 +420,7 @@ void ProcessMenuItem(int ID)
 		}
 		break;
 	case ID_COMPILER:		
-		DialogBox(hinstDLL, "RSPCOMPILER", HWND_DESKTOP, CompilerDlgProc);
+		DialogBox(hinstDLL, "RSPCOMPILER", HWND_DESKTOP, (DLGPROC)CompilerDlgProc);
 		break;
 	case ID_BREAKONSTARTOFTASK:
 		{
@@ -768,5 +777,5 @@ __declspec(dllexport) void PluginLoaded (void)
 
 void UseUnregisteredSetting (int /*SettingID*/)
 {
-	_asm int 3
+	DebugBreak();
 }
diff --git a/Source/RSP/Profiling.cpp b/Source/RSP/Profiling.cpp
index 3e15f4198..95891554b 100644
--- a/Source/RSP/Profiling.cpp
+++ b/Source/RSP/Profiling.cpp
@@ -59,6 +59,7 @@ public:
 		DWORD OldTimerAddr = StopTimer();
 		m_CurrentTimerAddr = Address;
 
+#ifdef _M_IX86
 		DWORD HiValue, LoValue;
 		_asm {
 			pushad
@@ -69,14 +70,17 @@ public:
 		}
 		m_StartTimeHi = HiValue;
 		m_StartTimeLo = LoValue;
+#else
+		DebugBreak();
+#endif
 		return OldTimerAddr;
 	}
 	DWORD StopTimer  ( void )
-	{
-		DWORD HiValue, LoValue;
-		
+	{		
 		if (m_CurrentTimerAddr == Timer_None) { return m_CurrentTimerAddr; }
 
+#ifdef _M_IX86
+		DWORD HiValue, LoValue;
 		_asm {
 			pushad
 			rdtsc
@@ -85,10 +89,10 @@ public:
 			popad
 		}
 
-		__int64 StopTime  = ((unsigned __int64)HiValue << 32) + (unsigned __int64)LoValue;
+		__int64 StopTime = ((unsigned __int64)HiValue << 32) + (unsigned __int64)LoValue;
 		__int64 StartTime = ((unsigned __int64)m_StartTimeHi << 32) + (unsigned __int64)m_StartTimeLo;
 		__int64 TimeTaken = StopTime - StartTime;
-		
+
 		PROFILE_ENRTY Entry = m_Entries.find(m_CurrentTimerAddr);
 		if (Entry != m_Entries.end())
 		{
@@ -96,8 +100,11 @@ public:
 		}
 		else
 		{
-			m_Entries.insert(PROFILE_ENRTIES::value_type(m_CurrentTimerAddr,TimeTaken));
+			m_Entries.insert(PROFILE_ENRTIES::value_type(m_CurrentTimerAddr, TimeTaken));
 		}
+#else
+		DebugBreak();
+#endif
 
 		DWORD OldTimerAddr = m_CurrentTimerAddr;
 		m_CurrentTimerAddr = Timer_None;
diff --git a/Source/RSP/RSP Command.c b/Source/RSP/RSP Command.c
index ff6bcb2d0..221854342 100644
--- a/Source/RSP/RSP Command.c	
+++ b/Source/RSP/RSP Command.c	
@@ -26,6 +26,8 @@
 
 #include <windows.h>
 #include <stdio.h>
+#include <stdlib.h>
+
 #include "opcode.h"
 #include "RSP.h"
 #include "CPU.h"
@@ -91,7 +93,7 @@ void Create_RSP_Commands_Window ( int Child )
 		{
 			Stepping_Commands = TRUE;
 			CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)Create_RSP_Commands_Window,
-				(LPVOID)TRUE,0, &ThreadID);	
+				(LPVOID)TRUE,0, &ThreadID);
 		}
 		else
 		{
@@ -129,7 +131,7 @@ int DisplayRSPCommand (DWORD location, int InsertPos)
 {
 	uint32_t OpCode;
 	DWORD LinesUsed = 1, status;
-	BOOL Redraw = FALSE;	
+	BOOL Redraw = FALSE;
 
 	RSP_LW_IMEM(location, &OpCode);
 
@@ -148,12 +150,12 @@ int DisplayRSPCommand (DWORD location, int InsertPos)
 			RSPOpcodeName ( OpCode, location ));
 		if ( SendMessage(hList,LB_GETCOUNT,0,0) <= InsertPos)
 		{
-			SendMessage(hList,LB_INSERTSTRING,(WPARAM)InsertPos, (LPARAM)location); 
+			SendMessage(hList,LB_INSERTSTRING,(WPARAM)InsertPos, (LPARAM)location);
 		}
 		else
 		{
 			RECT ItemRC;
-			SendMessage(hList,LB_GETITEMRECT,(WPARAM)InsertPos, (LPARAM)&ItemRC); 
+			SendMessage(hList,LB_GETITEMRECT,(WPARAM)InsertPos, (LPARAM)&ItemRC);
 			RedrawWindow(hList,&ItemRC,NULL, RDW_INVALIDATE );
 		}
 	}
@@ -194,9 +196,23 @@ void DumpRSPCode (void)
 	SetFilePointer(hLogFile,0,NULL,FILE_BEGIN);
 
 	for (location = 0; location < 0x1000; location += 4) {
+		unsigned int characters_to_write;
+		int characters_converted;
+
 		RSP_LW_IMEM(location, &OpCode);
-		sprintf(string," 0x%03X\t%s\r\n",location, RSPOpcodeName ( OpCode, location ));
-		WriteFile( hLogFile,string,strlen(string),&dwWritten,NULL );
+		characters_converted = sprintf(
+			&string[0],
+			" 0x%03X\t%s\r\n",
+			location,
+			RSPOpcodeName(OpCode, location)
+		);
+
+		if (characters_converted < 0) {
+			DisplayError("Failed to sprintf IMEM from 0x%03X.", location);
+			break;
+		}
+		characters_to_write = (unsigned)characters_converted;
+		WriteFile(hLogFile, string, characters_to_write, &dwWritten, NULL);
 	}
 	CloseHandle(hLogFile);
 }
@@ -235,9 +251,23 @@ void DumpRSPData (void)
 
 	for (location = 0; location < 0x1000; location += 4)
 	{
+		unsigned int characters_to_write;
+		int characters_converted;
+
 		RSP_LW_DMEM(location, &value);
-		sprintf(string," 0x%03X\t0x%08X\r\n", location, value);
-		WriteFile( hLogFile,string,strlen(string),&dwWritten,NULL );
+		characters_converted = sprintf(
+			&string[0],
+			" 0x%03X\t0x%08X\r\n",
+			location,
+			value
+		);
+
+		if (characters_converted < 0) {
+			DisplayError("Failed to sprintf DMEM from 0x%03X.", location);
+			break;
+		}
+		characters_to_write = (unsigned)characters_converted;
+		WriteFile(hLogFile, string, characters_to_write, &dwWritten, NULL);
 	}
 	CloseHandle(hLogFile);
 }
@@ -245,6 +275,7 @@ void DumpRSPData (void)
 void DrawRSPCommand ( LPARAM lParam )
 {
 	char Command[150], Offset[30], Instruction[30], Arguments[40];
+	int printed_offset, printed_instruction, printed_arguments;
 	LPDRAWITEMSTRUCT ditem;
 	COLORREF oldColor = {0};
 	int ResetColor;
@@ -258,26 +289,31 @@ void DrawRSPCommand ( LPARAM lParam )
 	if (strchr(Command,'\t'))
 	{
 		p1 = strchr(Command,'\t');
-		sprintf(Offset,"%.*s",p1 - Command, Command);
+		printed_offset = sprintf(Offset, "%.*s", p1 - Command, Command);
 		p1++;
 		if (strchr(p1,'\t'))
 		{
 			p2 = strchr(p1,'\t');
-			sprintf(Instruction,"%.*s",p2 - p1, p1);
-			sprintf(Arguments,"%s",p2 + 1);
+			printed_instruction = sprintf(Instruction, "%.*s", p2 - p1, p1);
+			printed_arguments   = sprintf(Arguments, "%s", p2 + 1);
 		}
 		else
 		{
-			sprintf(Instruction,"%s",p1);
-			sprintf(Arguments,"\0");
+			printed_instruction = sprintf(Instruction, "%s", p1);
+			printed_arguments   = sprintf(Arguments, "\0");
 		}
-		sprintf(Command,"\0");
+		Command[0] = '\0';
 	}
 	else
 	{
-		sprintf(Offset,"\0");
-		sprintf(Instruction,"\0");
-		sprintf(Arguments,"\0");
+		printed_offset      = sprintf(Offset, "\0");
+		printed_instruction = sprintf(Instruction, "\0");
+		printed_arguments   = sprintf(Arguments, "\0");
+	}
+
+	if (printed_offset < 0 || printed_instruction < 0 || printed_arguments < 0)
+	{
+		DisplayError("Failed to sprintf from item %u.", ditem -> itemID);
 	}
 
 	if (*PrgCount == RSPCommandLine[ditem->itemID].Location)
@@ -305,26 +341,46 @@ void DrawRSPCommand ( LPARAM lParam )
 		}
 	}
 
-	FillRect( ditem->hDC, &ditem->rcItem,hBrush);	
+	FillRect( ditem->hDC, &ditem->rcItem,hBrush);
 	SetBkMode( ditem->hDC, TRANSPARENT );
 
-	if (strlen (Command) == 0 )
+	if (Command[0] == '\0')
 	{
 		SetRect(&TextRect,ditem->rcItem.left,ditem->rcItem.top, ditem->rcItem.left + 83,
-			ditem->rcItem.bottom);	
-		DrawText(ditem->hDC,Offset,strlen(Offset), &TextRect,DT_SINGLELINE | DT_VCENTER);
+			ditem->rcItem.bottom);
+		DrawText(
+			ditem->hDC,
+			&Offset[0], printed_offset,
+			&TextRect,
+			DT_SINGLELINE | DT_VCENTER
+		);
 
 		SetRect(&TextRect,ditem->rcItem.left + 83,ditem->rcItem.top, ditem->rcItem.left + 165,
-			ditem->rcItem.bottom);	
-		DrawText(ditem->hDC,Instruction,strlen(Instruction), &TextRect,DT_SINGLELINE | DT_VCENTER);
+			ditem->rcItem.bottom);
+		DrawText(
+			ditem->hDC,
+			&Instruction[0], printed_instruction,
+			&TextRect,
+			DT_SINGLELINE | DT_VCENTER
+		);
 
 		SetRect(&TextRect,ditem->rcItem.left + 165,ditem->rcItem.top, ditem->rcItem.right,
-			ditem->rcItem.bottom);	
-		DrawText(ditem->hDC,Arguments,strlen(Arguments), &TextRect,DT_SINGLELINE | DT_VCENTER);
+			ditem->rcItem.bottom);
+		DrawText(
+			ditem->hDC,
+			&Arguments[0], printed_arguments,
+			&TextRect,
+			DT_SINGLELINE | DT_VCENTER
+		);
 	}
 	else
 	{
-		DrawText(ditem->hDC,Command,strlen(Command), &ditem->rcItem,DT_SINGLELINE | DT_VCENTER);
+		DrawText(
+			ditem->hDC,
+			&Command[0], (signed int)strlen(Command),
+			&ditem->rcItem,
+			DT_SINGLELINE | DT_VCENTER
+		);
 	}
 
 	if (ResetColor == TRUE) {
@@ -358,7 +414,7 @@ void Enable_RSP_Commands_Window ( void )
 		si.nMax   = (0x1000 >> 2) -1;
 		si.nPos   = (*PrgCount >> 2);
 		si.nPage  = 30;
-		SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);		
+		SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
 
 		SetRSPCommandViewto( *PrgCount );
 		SetForegroundWindow(RSPCommandshWnd);
@@ -468,9 +524,11 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 		case IDC_LIST:
 			if (HIWORD(wParam) == LBN_DBLCLK )
 			{
-				DWORD Location, Selected;
-				Selected = SendMessage(hList,LB_GETCURSEL,(WPARAM)0, (LPARAM)0); 
-				Location = RSPCommandLine[Selected].Location; 
+				LRESULT Selected;
+				DWORD Location;
+
+				Selected = SendMessage(hList, LB_GETCURSEL, 0, 0);
+				Location = RSPCommandLine[Selected].Location;
 				if (Location != (DWORD)-1)
 				{
 					if (CheckForRSPBPoint(Location))
@@ -507,7 +565,7 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 		case IDC_BP_BUTTON:	
 			if (DebugInfo.Enter_BPoint_Window != NULL)
 			{
-				DebugInfo.Enter_BPoint_Window(); 
+				DebugInfo.Enter_BPoint_Window();
 			}
 			break;
 		case IDC_RSP_REGISTERS_BUTTON:
@@ -516,19 +574,19 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 		case IDC_R4300I_DEBUGGER_BUTTON: 
 			if (DebugInfo.Enter_R4300i_Commands_Window != NULL)
 			{
-				DebugInfo.Enter_R4300i_Commands_Window(); 
+				DebugInfo.Enter_R4300i_Commands_Window();
 			}
 			break;
 		case IDC_R4300I_REGISTERS_BUTTON:
 			if (DebugInfo.Enter_R4300i_Register_Window != NULL)
 			{
-				DebugInfo.Enter_R4300i_Register_Window(); 
+				DebugInfo.Enter_R4300i_Register_Window();
 			}
 			break;
 		case IDC_MEMORY_BUTTON:
 			if (DebugInfo.Enter_Memory_Window != NULL)
 			{
-				DebugInfo.Enter_Memory_Window(); 
+				DebugInfo.Enter_Memory_Window();
 			}
 			break;
 		case IDCANCEL:			
@@ -551,7 +609,7 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 			case SB_THUMBTRACK:
 				sprintf(Value,"%03X",((short int)HIWORD(wParam) << 2 ));
 				SetWindowText(hAddress,Value);
-				si.cbSize = sizeof(si);			
+				si.cbSize = sizeof(si);
 				si.fMask  = SIF_POS;
 				si.nPos   = (short int)HIWORD(wParam);
 				SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
@@ -561,7 +619,7 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				{
 					sprintf(Value,"%03X",location + 0x4);
 					SetWindowText(hAddress,Value);
-					si.cbSize = sizeof(si);			
+					si.cbSize = sizeof(si);
 					si.fMask  = SIF_POS;
 					si.nPos   = ((location + 0x4) >> 2);
 					SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
@@ -570,7 +628,7 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				{
 					sprintf(Value,"%03X",0xF88);
 					SetWindowText(hAddress,Value);
-					si.cbSize = sizeof(si);			
+					si.cbSize = sizeof(si);
 					si.fMask  = SIF_POS;
 					si.nPos   = (0xFFC >> 2);
 					SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
@@ -581,7 +639,7 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				{
 					sprintf(Value,"%03X",location - 0x4);
 					SetWindowText(hAddress,Value);
-					si.cbSize = sizeof(si);			
+					si.cbSize = sizeof(si);
 					si.fMask  = SIF_POS;
 					si.nPos   = ((location - 0x4) >> 2);
 					SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
@@ -590,7 +648,7 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				{
 					sprintf(Value,"%03X",0);
 					SetWindowText(hAddress,Value);
-					si.cbSize = sizeof(si);			
+					si.cbSize = sizeof(si);
 					si.fMask  = SIF_POS;
 					si.nPos   = 0;
 					SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
@@ -601,7 +659,7 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				{
 					sprintf(Value,"%03X",location + 0x74);
 					SetWindowText(hAddress,Value);
-					si.cbSize = sizeof(si);			
+					si.cbSize = sizeof(si);
 					si.fMask  = SIF_POS;
 					si.nPos   = ((location + 0x74) >> 2);
 					SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
@@ -610,18 +668,18 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				{
 					sprintf(Value,"%03X",0xF88);
 					SetWindowText(hAddress,Value);
-					si.cbSize = sizeof(si);			
+					si.cbSize = sizeof(si);
 					si.fMask  = SIF_POS;
 					si.nPos   = (0xF8F >> 2);
 					SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
 				}
-				break;			
+				break;
 			case SB_PAGEUP:
 				if ((location - 0x74) > 0x74 )
 				{
 					sprintf(Value,"%03X",location - 0x74);
 					SetWindowText(hAddress,Value);
-					si.cbSize = sizeof(si);			
+					si.cbSize = sizeof(si);
 					si.fMask  = SIF_POS;
 					si.nPos   = ((location - 0x74) >> 2);
 					SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
@@ -630,7 +688,7 @@ LRESULT CALLBACK RSP_Commands_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				{
 					sprintf(Value,"%03X",0);
 					SetWindowText(hAddress,Value);
-					si.cbSize = sizeof(si);			
+					si.cbSize = sizeof(si);
 					si.fMask  = SIF_POS;
 					si.nPos   = 0;
 					SetScrollInfo(hScrlBar,SB_CTL,&si,TRUE);
@@ -661,7 +719,7 @@ void RSP_Commands_Setup ( HWND hDlg )
 		SendMessage(hList,LB_SETITEMHEIGHT, (WPARAM)0,(LPARAM)MAKELPARAM(14, 0));
 	}
 
-	sprintf(Location,"%03X",*PrgCount);
+	sprintf(Location, "%03X", PrgCount ? *PrgCount : 0);
 	hAddress = CreateWindowEx(0,"EDIT",Location, WS_CHILD | ES_UPPERCASE | WS_VISIBLE | 
 		WS_BORDER | WS_TABSTOP,375,17,36,18, hDlg,(HMENU)IDC_ADDRESS,hinstDLL, NULL );
 	if (hAddress)
@@ -672,7 +730,7 @@ void RSP_Commands_Setup ( HWND hDlg )
 
 	hFunctionlist = CreateWindowEx(0,"COMBOBOX","", WS_CHILD | WS_VSCROLL |
 		CBS_DROPDOWNLIST | CBS_SORT | WS_TABSTOP,352,56,89,150,hDlg,
-		(HMENU)IDC_FUNCTION_COMBO,hinstDLL,NULL);		
+		(HMENU)IDC_FUNCTION_COMBO,hinstDLL,NULL);
 	if (hFunctionlist)
 	{
 		SendMessage(hFunctionlist,WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT),0);
@@ -793,6 +851,69 @@ void RSP_Commands_Setup ( HWND hDlg )
 	SetWindowPos(hDlg,NULL,X,Y,WindowWidth,WindowHeight, SWP_NOZORDER | SWP_SHOWWINDOW);
 }
 
+static const char unused_op[] = "invalid";
+static const char* mnemonics_primary[8 << 3] = {
+    "SPECIAL","REGIMM" ,"J"      ,"JAL"    ,"BEQ"    ,"BNE"    ,"BLEZ"   ,"BGTZ"   ,
+    "ADDI"   ,"ADDIU"  ,"SLTI"   ,"SLTIU"  ,"ANDI"   ,"ORI"    ,"XORI"   ,"LUI"    ,
+    "COP0"   ,unused_op,"COP2"   ,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    "LB"     ,"LH"     ,unused_op,"LW"     ,"LBU"    ,"LHU"    ,unused_op,unused_op,
+    "SB"     ,"SH"     ,unused_op,"SW"     ,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,"LWC2"   ,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,"SWC2"   ,unused_op,unused_op,unused_op,unused_op,unused_op,
+};/*   000   |   001   |   010   |   011   |   100   |   101   |   110   |   111  */
+static const char* mnemonics_special[8 << 3] = {
+    "SLL"    ,unused_op,"SRL"    ,"SRA"    ,"SLLV"   ,unused_op,"SRLV"   ,"SRAV"   ,
+    "JR"     ,"JALR"   ,unused_op,unused_op,unused_op,"BREAK"  ,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    "ADD"    ,"ADDU"   ,"SUB"    ,"SUBU"   ,"AND"    ,"OR"     ,"XOR"    ,"NOR"    ,
+    unused_op,unused_op,"SLT"    ,"SLTU"   ,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+};/*   000   |   001   |   010   |   011   |   100   |   101   |   110   |   111  */
+static const char* mnemonics_regimm[8 << 2] = {
+    "BLTZ"   ,"BGEZ"   ,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    "BLTZAL" ,"BGEZAL" ,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+};/*   000   |   001   |   010   |   011   |   100   |   101   |   110   |   111  */
+static const char* mnemonics_cop0[8 << 2] = {
+    "MFC0"   ,unused_op,unused_op,unused_op,"MTC0"   ,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+};/*   000   |   001   |   010   |   011   |   100   |   101   |   110   |   111  */
+static const char* mnemonics_cop2[8 << 2] = {
+    "MFC2"   ,unused_op,"CFC2"   ,unused_op,"MTC2"   ,unused_op,"CTC2"   ,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    "C2"     ,"C2"     ,"C2"     ,"C2"     ,"C2"     ,"C2"     ,"C2"     ,"C2"     ,
+    "C2"     ,"C2"     ,"C2"     ,"C2"     ,"C2"     ,"C2"     ,"C2"     ,"C2"     ,
+};/*   000   |   001   |   010   |   011   |   100   |   101   |   110   |   111  */
+static const char* mnemonics_vector[8 << 3] = {
+    "VMULF"  ,"VMULU"  ,unused_op,unused_op,"VMUDL"  ,"VMUDM"  ,"VMUDN"  ,"VMUDH"  ,
+    "VMACF"  ,"VMACU"  ,unused_op,"VMACQ"  ,"VMADL"  ,"VMADM"  ,"VMADN"  ,"VMADH"  ,
+    "VADD"   ,"VSUB"   ,unused_op,"VABS"   ,"VADDC"  ,"VSUBC"  ,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,"VSAW"   ,unused_op,unused_op,
+    "VLT"    ,"VEQ"    ,"VNE"    ,"VGE"    ,"VCL"    ,"VCH"    ,"VCR"    ,"VMRG"   ,
+    "VAND"   ,"VNAND"  ,"VOR"    ,"VNOR"   ,"VXOR"   ,"VNXOR"  ,unused_op,unused_op,
+    "VRCP"   ,"VRCPL"  ,"VRCPH"  ,"VMOV"   ,"VRSQ"   ,"VRSQL"  ,"VRSQH"  ,"VNOP"   ,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+};/*   000   |   001   |   010   |   011   |   100   |   101   |   110   |   111  */
+static const char* mnemonics_lwc2[8 << 2] = {
+    "LBV"    ,"LSV"    ,"LLV"    ,"LDV"    ,"LQV"    ,"LRV"    ,"LPV"    ,"LUV"    ,
+    "LHV"    ,"LFV"    ,unused_op,"LTV"    ,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+};/*   000   |   001   |   010   |   011   |   100   |   101   |   110   |   111  */
+static const char* mnemonics_swc2[8 << 2] = {
+    "SBV"    ,"SSV"    ,"SLV"    ,"SDV"    ,"SQV"    ,"SRV"    ,"SPV"    ,"SUV"    ,
+    "SHV"    ,"SFV"    ,"SWV"    ,"STV"    ,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+    unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,unused_op,
+};/*   000   |   001   |   010   |   011   |   100   |   101   |   110   |   111  */
+
+
 char * RSPSpecialName ( DWORD OpCode, DWORD PC )
 {
 	OPCODE command;
@@ -800,91 +921,64 @@ char * RSPSpecialName ( DWORD OpCode, DWORD PC )
 	
 	PC = PC; // unused
 
-	switch (command.funct)
+	if (strcmp(mnemonics_special[command.funct], unused_op) == 0)
 	{
-	case RSP_SPECIAL_SLL:
-		if (command.rd != 0)
-		{
-			sprintf(CommandName,"SLL\t%s, %s, 0x%X",GPR_Name(command.rd),
-				GPR_Name(command.rt), command.sa);
-		}
-		else
-		{
-			sprintf(CommandName,"NOP");
-		}
-		break;
-	case RSP_SPECIAL_SRL:
-		sprintf(CommandName,"SRL\t%s, %s, 0x%X",GPR_Name(command.rd),
-			GPR_Name(command.rt), command.sa);
-		break;
-	case RSP_SPECIAL_SRA:
-		sprintf(CommandName,"SRA\t%s, %s, 0x%X",GPR_Name(command.rd),
-			GPR_Name(command.rt), command.sa);
-		break;
-	case RSP_SPECIAL_SLLV:
-		sprintf(CommandName,"SLLV\t%s, %s, %s",GPR_Name(command.rd),
-			GPR_Name(command.rt), GPR_Name(command.rs));
-		break;
-	case RSP_SPECIAL_SRLV:
-		sprintf(CommandName,"SRLV\t%s, %s, %s",GPR_Name(command.rd),
-			GPR_Name(command.rt), GPR_Name(command.rs));
-		break;
-	case RSP_SPECIAL_SRAV:
-		sprintf(CommandName,"SRAV\t%s, %s, %s",GPR_Name(command.rd),
-			GPR_Name(command.rt), GPR_Name(command.rs));
-		break;
-	case RSP_SPECIAL_JR:
-		sprintf(CommandName,"JR\t%s",GPR_Name(command.rs));
-		break;
-	case RSP_SPECIAL_JALR:
-		sprintf(CommandName,"JALR\t%s, %s",GPR_Name(command.rd),GPR_Name(command.rs));
-		break;
-	case RSP_SPECIAL_BREAK:
-		sprintf(CommandName,"BREAK");
-		break;
-	case RSP_SPECIAL_ADD:
-		sprintf(CommandName,"ADD\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	case RSP_SPECIAL_ADDU:
-		sprintf(CommandName,"ADDU\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	case RSP_SPECIAL_SUB:
-		sprintf(CommandName,"SUB\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	case RSP_SPECIAL_SUBU:
-		sprintf(CommandName,"SUBU\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	case RSP_SPECIAL_AND:
-		sprintf(CommandName,"AND\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	case RSP_SPECIAL_OR:
-		sprintf(CommandName,"OR\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	case RSP_SPECIAL_XOR:
-		sprintf(CommandName,"XOR\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	case RSP_SPECIAL_NOR:
-		sprintf(CommandName,"NOR\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	case RSP_SPECIAL_SLT:
-		sprintf(CommandName,"SLT\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	case RSP_SPECIAL_SLTU:
-		sprintf(CommandName,"SLTU\t%s, %s, %s",GPR_Name(command.rd),GPR_Name(command.rs),
-			GPR_Name(command.rt));
-		break;
-	default:
-		sprintf(CommandName,"RSP: Unknown\t%02X %02X %02X %02X",
-			command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
+		sprintf(CommandName, "RSP: Unknown\t%02X %02X %02X %02X",
+			command.Ascii[3],
+			command.Ascii[2],
+			command.Ascii[1],
+			command.Ascii[0]
+		);
+	}
+	else if (command.Hex == 0x00000000)
+	{
+		strcpy(CommandName, "NOP");
+	}
+	else if (command.funct >= RSP_SPECIAL_SLL && command.funct < RSP_SPECIAL_SLLV)
+	{
+		sprintf(CommandName, "%s\t%s, %s, 0x%X",
+			mnemonics_special[command.funct],
+			GPR_Name(command.rd),
+			GPR_Name(command.rt),
+			command.sa
+		);
+	}
+	else if (command.funct >= RSP_SPECIAL_SLLV && command.funct < RSP_SPECIAL_JR)
+	{
+		sprintf(CommandName, "%s\t%s, %s, %s",
+			mnemonics_special[command.funct],
+			GPR_Name(command.rd),
+			GPR_Name(command.rt),
+			GPR_Name(command.rs)
+		);
+	}
+	else if (command.funct == RSP_SPECIAL_JR)
+	{
+		sprintf(CommandName, "%s\t%s",
+			mnemonics_special[command.funct],
+			GPR_Name(command.rs)
+		);
+	}
+	else if (command.funct == RSP_SPECIAL_JALR)
+	{
+		sprintf(CommandName, "%s\t%s, %s",
+			mnemonics_special[command.funct],
+			GPR_Name(command.rd),
+			GPR_Name(command.rs)
+		);
+	}
+	else if (command.funct == RSP_SPECIAL_BREAK)
+	{
+		strcpy(CommandName, mnemonics_special[RSP_SPECIAL_BREAK]);
+	}
+	else
+	{
+		sprintf(CommandName, "%s\t%s, %s, %s",
+			mnemonics_special[command.funct],
+			GPR_Name(command.rd),
+			GPR_Name(command.rs),
+			GPR_Name(command.rt)
+		);
 	}
 	return CommandName;
 }
@@ -893,35 +987,35 @@ char * RSPRegimmName ( DWORD OpCode, DWORD PC )
 {
 	OPCODE command;
 	command.Hex = OpCode;
-		
-	switch (command.rt)
+
+	if (strcmp(mnemonics_regimm[command.rt], unused_op) == 0)
 	{
-	case RSP_REGIMM_BLTZ:
-		sprintf(CommandName,"BLTZ\t%s, 0x%03X",GPR_Name(command.rs),
-			(PC + ((short)command.offset << 2) + 4) & 0xFFC);
-		break;
-	case RSP_REGIMM_BGEZ:
-		sprintf(CommandName,"BGEZ\t%s, 0x%03X",GPR_Name(command.rs),
-			(PC + ((short)command.offset << 2) + 4) & 0xFFC);
-		break;
-	case RSP_REGIMM_BLTZAL:
-		sprintf(CommandName,"BLTZAL\t%s, 0x%03X",GPR_Name(command.rs),
-			(PC + ((short)command.offset << 2) + 4) & 0xFFC);
-		break;
-	case RSP_REGIMM_BGEZAL:
-		if (command.rs == 0)
-		{
-			sprintf(CommandName,"BAL\t0x%03X",(PC + ((short)command.offset << 2) + 4) & 0xFFC);
-		}
-		else
-		{
-			sprintf(CommandName,"BGEZAL\t%s, 0x%03X",GPR_Name(command.rs),
-				(PC + ((short)command.offset << 2) + 4) & 0xFFC);
-		}	
-		break;
-	default:
-		sprintf(CommandName,"RSP: Unknown\t%02X %02X %02X %02X",
-			command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
+		sprintf(
+			CommandName,
+			"RSP: Unknown\t%02X %02X %02X %02X",
+			command.Ascii[3],
+			command.Ascii[2],
+			command.Ascii[1],
+			command.Ascii[0]
+		);
+	}
+	else if (command.rt == RSP_REGIMM_BGEZAL && command.rs == 0)
+	{ /* MIPS pseudo-instruction:  BAL (Branch and Link) */
+		sprintf(
+			CommandName,
+			"BAL\t0x%03X",
+			(PC + ((short)command.offset << 2) + 4) & 0xFFC
+		);
+	}
+	else
+	{
+		sprintf(
+			CommandName,
+			"%s\t%s, 0x%03X",
+			mnemonics_regimm[command.rt],
+			GPR_Name(command.rs),
+			(PC + ((short)command.offset << 2) + 4) & 0xFFC
+		);
 	}
 	return CommandName;
 }
@@ -933,17 +1027,26 @@ char * RSPCop0Name ( DWORD OpCode, DWORD PC )
 
 	PC = PC; // unused
 
-	switch (command.rs)
+	if (strcmp(mnemonics_cop0[command.rs], unused_op) == 0)
 	{
-	case RSP_COP0_MF:
-		sprintf(CommandName,"MFC0\t%s, %s",GPR_Name(command.rt),COP0_Name(command.rd));
-		break;
-	case RSP_COP0_MT:
-		sprintf(CommandName,"MTC0\t%s, %s",GPR_Name(command.rt),COP0_Name(command.rd));
-		break;
-	default:
-		sprintf(CommandName,"RSP: Unknown\t%02X %02X %02X %02X",
-			command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
+		sprintf(
+			CommandName,
+			"RSP: Unknown\t%02X %02X %02X %02X",
+			command.Ascii[3],
+			command.Ascii[2],
+			command.Ascii[1],
+			command.Ascii[0]
+		);
+	}
+	else
+	{
+		sprintf(
+			CommandName,
+			"%s\t%s, %s",
+			mnemonics_cop0[command.rs],
+			GPR_Name(command.rt),
+			COP0_Name(command.rd)
+		);
 	}
 	return CommandName;
 }
@@ -957,211 +1060,67 @@ char * RSPCop2Name ( DWORD OpCode, DWORD PC )
 
 	if ( ( command.rs & 0x10 ) == 0 )
 	{
-		switch (command.rs)
+		if (strcmp(mnemonics_cop2[command.rs], unused_op) == 0)
 		{
-		case RSP_COP2_MF:
-			sprintf(CommandName,"MFC2\t%s, $v%d [%d]",GPR_Name(command.rt),
-				command.rd, command.sa >> 1);
-			break;
-		case RSP_COP2_CF:		
-			sprintf(CommandName,"CFC2\t%s, %d",GPR_Name(command.rt),
-				command.rd % 4);
-			break;
-		case RSP_COP2_MT:
-			sprintf(CommandName,"MTC2\t%s, $v%d [%d]",GPR_Name(command.rt),
-				command.rd, command.sa >> 1);
-			break;
-		case RSP_COP2_CT:		
-			sprintf(CommandName,"CTC2\t%s, %d",GPR_Name(command.rt),
-				command.rd % 4);
-			break;
-		default:
-			sprintf(CommandName,"RSP: Unknown\t%02X %02X %02X %02X",
-				command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
+			sprintf(CommandName, "RSP: Unknown\t%02X %02X %02X %02X",
+				command.Ascii[3],
+				command.Ascii[2],
+				command.Ascii[1],
+				command.Ascii[0]
+			);
+		}
+		else if (command.rs & 002) /* CFC2 or CTC2 */
+		{
+			sprintf(CommandName, "%s\t%s, %d",
+				mnemonics_cop2[command.rs],
+				GPR_Name(command.rt),
+				command.rd % 4
+			);
+		}
+		else
+		{
+			sprintf(CommandName, "%s\t%s, $v%d[%d]",
+				mnemonics_cop2[command.rs],
+				GPR_Name(command.rt),
+				command.rd,
+				command.sa >> 1
+			);
 		}
 	}
 	else
 	{
-		switch (command.funct)
+		if (strcmp(mnemonics_vector[command.funct], unused_op) == 0)
 		{
-		case RSP_VECTOR_VMULF:
-			sprintf(CommandName,"VMULF\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMULU:
-			sprintf(CommandName,"VMULU\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VRNDP:
-			sprintf(CommandName,"VRNDP\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMULQ:
-			sprintf(CommandName,"VMULQ\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMUDL:
-			sprintf(CommandName,"VMUDL\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMUDM:
-			sprintf(CommandName,"VMUDM\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMUDN:
-			sprintf(CommandName,"VMUDN\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMUDH:
-			sprintf(CommandName,"VMUDH\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMACF:
-			sprintf(CommandName,"VMACF\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMACU:
-			sprintf(CommandName,"VMACU\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VRNDN:
-			sprintf(CommandName,"VRNDN\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMACQ:
-			sprintf(CommandName,"VMACQ\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMADL:
-			sprintf(CommandName,"VMADL\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMADM:
-			sprintf(CommandName,"VMADM\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMADN:
-			sprintf(CommandName,"VMADN\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMADH:
-			sprintf(CommandName,"VMADH\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VADD:
-			sprintf(CommandName,"VADD\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VSUB:
-			sprintf(CommandName,"VSUB\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VABS:
-			sprintf(CommandName,"VABS\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VADDC:
-			sprintf(CommandName,"VADDC\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VSUBC:
-			sprintf(CommandName,"VSUBC\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VSAW:
-			sprintf(CommandName,"VSAW\t$v%d [%d], $v%d, $v%d ",command.sa, (command.rs & 0xF),
-				command.rd, command.rt);
-			break;
-		case RSP_VECTOR_VLT:
-			sprintf(CommandName,"VLT\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VEQ:
-			sprintf(CommandName,"VEQ\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VNE:
-			sprintf(CommandName,"VNE\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VGE:
-			sprintf(CommandName,"VGE\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VCL:
-			sprintf(CommandName,"VCL\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VCH:
-			sprintf(CommandName,"VCH\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VCR:
-			sprintf(CommandName,"VCR\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMRG:
-			sprintf(CommandName,"VMRG\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VAND:
-			sprintf(CommandName,"VAND\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VNAND:
-			sprintf(CommandName,"VNAND\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VOR:
-			sprintf(CommandName,"VOR\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VNOR:
-			sprintf(CommandName,"VNOR\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VXOR:
-			sprintf(CommandName,"VXOR\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VNXOR:
-			sprintf(CommandName,"VNXOR\t$v%d, $v%d, $v%d%s",command.sa, command.rd, 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VRCP:
-			sprintf(CommandName,"VRCP\t$v%d [%d], $v%d%s",command.sa, (command.rd & 0x7), 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VRCPL:
-			sprintf(CommandName,"VRCPL\t$v%d [%d], $v%d%s",command.sa, (command.rd & 0x7), 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VRCPH:
-			sprintf(CommandName,"VRCPH\t$v%d [%d], $v%d%s",command.sa, (command.rd & 0x7), 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VMOV:
-			sprintf(CommandName,"VMOV\t$v%d [%d], $v%d%s",command.sa, (command.rd & 0x7), 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VRSQ:
-			sprintf(CommandName,"VRSQ\t$v%d [%d], $v%d%s",command.sa, (command.rd & 0x7), 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VRSQL:
-			sprintf(CommandName,"VRSQL\t$v%d [%d], $v%d%s",command.sa, (command.rd & 0x7), 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VRSQH:
-			sprintf(CommandName,"VRSQH\t$v%d [%d], $v%d%s",command.sa, (command.rd & 0x7), 
-				command.rt, ElementSpecifier(command.rs & 0xF));
-			break;
-		case RSP_VECTOR_VNOOP:
-			sprintf(CommandName,"VNOOP");
-			break;
-		default:
-			sprintf(CommandName,"RSP: Unknown\t%02X %02X %02X %02X",
-				command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
+			sprintf(CommandName, "RSP: Unknown\t%02X %02X %02X %02X",
+				command.Ascii[3],
+				command.Ascii[2],
+				command.Ascii[1],
+				command.Ascii[0]
+			);
+		}
+		else if (command.funct >= RSP_VECTOR_VRCP && command.funct < RSP_VECTOR_VNOOP)
+		{ /* RSP division -- VRCP[L,H], VRSQ[L,H], and VMOV */
+			sprintf(CommandName, "%s\t$v%d[%d], $v%d%s",
+				mnemonics_vector[command.funct],
+				command.sa,
+				command.rd & 0x7,
+				command.rt,
+				ElementSpecifier(command.rs & 0xF)
+			);
+		}
+		else if (command.funct == RSP_VECTOR_VNOOP)
+		{
+			strcpy(CommandName, mnemonics_vector[RSP_VECTOR_VNOOP]);
+		}
+		else
+		{
+			sprintf(CommandName, "%s\t$v%d, $v%d, $v%d%s",
+				mnemonics_vector[command.funct],
+				command.sa,
+				command.rd,
+				command.rt,
+				ElementSpecifier(command.rs & 0xF)
+			);
 		}
 	}
 	return CommandName;
@@ -1174,59 +1133,29 @@ char * RSPLc2Name ( DWORD OpCode, DWORD PC )
 
 	PC = PC; // unused
 
-	switch (command.rd)
+	if (strcmp(mnemonics_lwc2[command.rd], unused_op) == 0)
 	{
-	case RSP_LSC2_BV:
-		sprintf(CommandName,"LBV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			command.voffset, GPR_Name(command.base));
-		break;
-	case RSP_LSC2_SV:
-		sprintf(CommandName,"LSV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 1), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_LV:
-		sprintf(CommandName,"LLV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 2), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_DV:
-		sprintf(CommandName,"LDV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 3), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_QV:
-		sprintf(CommandName,"LQV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_RV:
-		sprintf(CommandName,"LRV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_PV:
-		sprintf(CommandName,"LPV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 3), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_UV:
-		sprintf(CommandName,"LUV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 3), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_HV:
-		sprintf(CommandName,"LHV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_FV:
-		sprintf(CommandName,"LFV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_WV:
-		sprintf(CommandName,"LWV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_TV:
-		sprintf(CommandName,"LTV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	default:
-		sprintf(CommandName,"RSP: Unknown\t%02X %02X %02X %02X",
-			command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
+		sprintf(
+			CommandName,
+			"RSP: Unknown\t%02X %02X %02X %02X",
+			command.Ascii[3],
+			command.Ascii[2],
+			command.Ascii[1],
+			command.Ascii[0]
+		);
+	}
+	else
+	{
+		sprintf(
+			CommandName,
+			"%s\t$v%d[%d], %c0x%03X(%s)",
+			mnemonics_lwc2[command.rd],
+			command.rt,
+			command.del,
+			(command.voffset < 0) ? '-' : '+',
+			abs(command.voffset),
+			GPR_Name(command.base)
+		);
 	}
 	return CommandName;
 }
@@ -1238,59 +1167,29 @@ char * RSPSc2Name ( DWORD OpCode, DWORD PC )
 
 	PC = PC; // unused
 
-	switch (command.rd)
+	if (strcmp(mnemonics_swc2[command.rd], unused_op) == 0)
 	{
-	case RSP_LSC2_BV:
-		sprintf(CommandName,"SBV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			command.voffset, GPR_Name(command.base));
-		break;
-	case RSP_LSC2_SV:
-		sprintf(CommandName,"SSV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 1), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_LV:
-		sprintf(CommandName,"SLV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 2), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_DV:
-		sprintf(CommandName,"SDV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 3), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_QV:
-		sprintf(CommandName,"SQV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_RV:
-		sprintf(CommandName,"SRV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_PV:
-		sprintf(CommandName,"SPV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 3), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_UV:
-		sprintf(CommandName,"SUV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 3), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_HV:
-		sprintf(CommandName,"SHV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_FV:
-		sprintf(CommandName,"SFV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_WV:
-		sprintf(CommandName,"SWV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	case RSP_LSC2_TV:
-		sprintf(CommandName,"STV\t$v%d [%d], 0x%04X (%s)",command.rt, command.del, 
-			(command.voffset << 4), GPR_Name(command.base));
-		break;
-	default:
-		sprintf(CommandName,"RSP: Unknown\t%02X %02X %02X %02X",
-			command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
+		sprintf(
+			CommandName,
+			"RSP: Unknown\t%02X %02X %02X %02X",
+			command.Ascii[3],
+			command.Ascii[2],
+			command.Ascii[1],
+			command.Ascii[0]
+		);
+	}
+	else
+	{
+		sprintf(
+			CommandName,
+			"%s\t$v%d[%d], %c0x%03X(%s)",
+			mnemonics_swc2[command.rd],
+			command.rt,
+			command.del,
+			(command.voffset < 0) ? '-' : '+',
+			abs(command.voffset),
+			GPR_Name(command.base)
+		);
 	}
 	return CommandName;
 }
@@ -1309,67 +1208,67 @@ char * RSPOpcodeName ( DWORD OpCode, DWORD PC )
 		return RSPRegimmName(OpCode,PC);
 		break;
 	case RSP_J:
-		sprintf(CommandName,"J\t0x%03X",(command.target << 2) & 0xFFC);
-		break;
 	case RSP_JAL:
-		sprintf(CommandName,"JAL\t0x%03X",(command.target << 2) & 0xFFC);
+		sprintf(CommandName, "%s\t0x%03X",
+			mnemonics_primary[command.op],
+			(command.target << 2) & 0xFFC
+		);
 		break;
 	case RSP_BEQ:
 		if (command.rs == 0 && command.rt == 0)
 		{
-			sprintf(CommandName,"B\t0x%03X",(PC + ((short)command.offset << 2) + 4) & 0xFFC);
+			sprintf(CommandName, "%s\t0x%03X",
+				"B",
+				(PC + ((short)command.offset << 2) + 4) & 0xFFC
+			);
+			break;
 		}
 		else if (command.rs == 0 || command.rt == 0)
 		{
-			sprintf(CommandName,"BEQZ\t%s, 0x%03X",GPR_Name(command.rs == 0 ? command.rt : command.rs),
-				(PC + ((short)command.offset << 2) + 4) & 0xFFC);
+			sprintf(CommandName, "%s\t%s, 0x%03X",
+				"BEQZ",
+				GPR_Name(command.rs == 0 ? command.rt : command.rs),
+				(PC + ((short)command.offset << 2) + 4) & 0xFFC
+			);
+			break;
 		}
-		else
-		{
-			sprintf(CommandName,"BEQ\t%s, %s, 0x%03X",GPR_Name(command.rs),GPR_Name(command.rt),
-				(PC + ((short)command.offset << 2) + 4) & 0xFFC);
-		}
-		break;
+		/* else { fall through to show the full BEQ } */
 	case RSP_BNE:
-		sprintf(CommandName,"BNE\t%s, %s, 0x%03X",GPR_Name(command.rs),GPR_Name(command.rt),
-			(PC + ((short)command.offset << 2) + 4) & 0xFFC);
+		sprintf(CommandName, "%s\t%s, %s, 0x%03X",
+			mnemonics_primary[command.op],
+			GPR_Name(command.rs),
+			GPR_Name(command.rt),
+			(PC + ((short)command.offset << 2) + 4) & 0xFFC
+		);
 		break;
 	case RSP_BLEZ:
-		sprintf(CommandName,"BLEZ\t%s, 0x%03X",GPR_Name(command.rs),(PC + ((short)command.offset << 2) + 4) & 0xFFC);
-		break;
 	case RSP_BGTZ:
-		sprintf(CommandName,"BGTZ\t%s, 0x%03X",GPR_Name(command.rs),(PC + ((short)command.offset << 2) + 4) & 0xFFC);
+		sprintf(CommandName, "%s\t%s, 0x%03X",
+			mnemonics_primary[command.op],
+			GPR_Name(command.rs),
+			(PC + ((short)command.offset << 2) + 4) & 0xFFC
+		);
 		break;
 	case RSP_ADDI:
-		sprintf(CommandName,"ADDI\t%s, %s, 0x%04X",GPR_Name(command.rt), GPR_Name(command.rs),
-			command.immediate);
-		break;
 	case RSP_ADDIU:
-		sprintf(CommandName,"ADDIU\t%s, %s, 0x%04X",GPR_Name(command.rt), GPR_Name(command.rs),
-			command.immediate);
-		break;
 	case RSP_SLTI:
-		sprintf(CommandName,"SLTI\t%s, %s, 0x%04X",GPR_Name(command.rt), GPR_Name(command.rs),
-			command.immediate);
-		break;
 	case RSP_SLTIU:
-		sprintf(CommandName,"SLTIU\t%s, %s, 0x%04X",GPR_Name(command.rt), GPR_Name(command.rs),
-			command.immediate);
-		break;
 	case RSP_ANDI:
-		sprintf(CommandName,"ANDI\t%s, %s, 0x%04X",GPR_Name(command.rt), GPR_Name(command.rs),
-			command.immediate);
-		break;
 	case RSP_ORI:
-		sprintf(CommandName,"ORI\t%s, %s, 0x%04X",GPR_Name(command.rt), GPR_Name(command.rs),
-			command.immediate);
-		break;
 	case RSP_XORI:
-		sprintf(CommandName,"XORI\t%s, %s, 0x%04X",GPR_Name(command.rt), GPR_Name(command.rs),
-			command.immediate);
+		sprintf(CommandName, "%s\t%s, %s, 0x%04X",
+			mnemonics_primary[command.op],
+			GPR_Name(command.rt),
+			GPR_Name(command.rs),
+			command.immediate
+		);
 		break;
 	case RSP_LUI:
-		sprintf(CommandName,"LUI\t%s, 0x%04X",GPR_Name(command.rt), command.immediate);
+		sprintf(CommandName, "%s\t%s, 0x%04X",
+			mnemonics_primary[RSP_LUI],
+			GPR_Name(command.rt),
+			command.immediate
+		);
 		break;
 	case RSP_CP0:
 		return RSPCop0Name(OpCode,PC);
@@ -1378,36 +1277,20 @@ char * RSPOpcodeName ( DWORD OpCode, DWORD PC )
 		return RSPCop2Name(OpCode,PC);
 		break;
 	case RSP_LB:
-		sprintf(CommandName,"LB\t%s, 0x%04X(%s)",GPR_Name(command.rt), command.offset,
-			GPR_Name(command.base));
-		break;
 	case RSP_LH:
-		sprintf(CommandName,"LH\t%s, 0x%04X(%s)",GPR_Name(command.rt), command.offset,
-			GPR_Name(command.base));
-		break;
 	case RSP_LW:
-		sprintf(CommandName,"LW\t%s, 0x%04X(%s)",GPR_Name(command.rt), command.offset,
-			GPR_Name(command.base));
-		break;
 	case RSP_LBU:
-		sprintf(CommandName,"LBU\t%s, 0x%04X(%s)",GPR_Name(command.rt), command.offset,
-			GPR_Name(command.base));
-		break;
 	case RSP_LHU:
-		sprintf(CommandName,"LHU\t%s, 0x%04X(%s)",GPR_Name(command.rt), command.offset,
-			GPR_Name(command.base));
-		break;
 	case RSP_SB:
-		sprintf(CommandName,"SB\t%s, 0x%04X(%s)",GPR_Name(command.rt), command.offset,
-			GPR_Name(command.base));
-		break;
 	case RSP_SH:
-		sprintf(CommandName,"SH\t%s, 0x%04X(%s)",GPR_Name(command.rt), command.offset,
-			GPR_Name(command.base));
-		break;
 	case RSP_SW:
-		sprintf(CommandName,"SW\t%s, 0x%04X(%s)",GPR_Name(command.rt), command.offset,
-			GPR_Name(command.base));
+		sprintf(CommandName, "%s\t%s, %c0x%04X(%s)",
+			mnemonics_primary[command.op],
+			GPR_Name(command.rt),
+			((int16_t)command.offset < 0) ? '-' : '+',
+			abs((int16_t)command.offset),
+			GPR_Name(command.base)
+		);
 		break;
 	case RSP_LC2:
 		return RSPLc2Name(OpCode,PC);
@@ -1416,8 +1299,12 @@ char * RSPOpcodeName ( DWORD OpCode, DWORD PC )
 		return RSPSc2Name(OpCode,PC);
 		break;
 	default:
-		sprintf(CommandName,"RSP: Unknown\t%02X %02X %02X %02X",
-			command.Ascii[3],command.Ascii[2],command.Ascii[1],command.Ascii[0]);
+		sprintf(CommandName, "RSP: Unknown\t%02X %02X %02X %02X",
+			command.Ascii[3],
+			command.Ascii[2],
+			command.Ascii[1],
+			command.Ascii[0]
+		);
 	}
 	return CommandName;
 }
diff --git a/Source/RSP/RSP Register.c b/Source/RSP/RSP Register.c
index d93cdf756..bb8197415 100644
--- a/Source/RSP/RSP Register.c	
+++ b/Source/RSP/RSP Register.c	
@@ -83,7 +83,7 @@ void Create_RSP_Register_Window ( int Child ) {
 	} else {
 		if (!InRSPRegisterWindow) {
 			CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)Create_RSP_Register_Window,
-				(LPVOID)TRUE,0, &ThreadID);	
+				(LPVOID)TRUE,0, &ThreadID);
 		} else {
 			SetForegroundWindow(RSP_Registers_hDlg);
 		}	
@@ -112,7 +112,7 @@ void HideRSP_RegisterPanel ( int Panel) {
 		break;
 	case Vector2:
 		for (count = 0; count < 16;count ++) { ShowWindow(hVECT2[count], FALSE ); }
-		break;		
+		break;
 	}
 }
 
@@ -138,11 +138,11 @@ void PaintRSP_HiddenPanel (HWND hWnd) {
 
 	rcBox.left   = 75; rcBox.top    = 35;
 	rcBox.right  = 150; rcBox.bottom = 50;
-	FillRect( ps.hdc, &rcBox,(HBRUSH)COLOR_WINDOW);		
+	FillRect( ps.hdc, &rcBox,(HBRUSH)COLOR_WINDOW);
 
 	rcBox.left   = 365; rcBox.top    = 35;
 	rcBox.right  = 425; rcBox.bottom = 50;
-	FillRect( ps.hdc, &rcBox,(HBRUSH)COLOR_WINDOW);		
+	FillRect( ps.hdc, &rcBox,(HBRUSH)COLOR_WINDOW);
 
 	hOldFont = SelectObject( ps.hdc,
 	GetStockObject(DEFAULT_GUI_FONT) );
@@ -398,10 +398,10 @@ LRESULT CALLBACK RSP_Registers_Proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 		switch (((NMHDR *)lParam)->code) {
 		case TCN_SELCHANGE:
 			InvalidateRect( hTab, &rcDisp, TRUE );
-			HideRSP_RegisterPanel (CurrentPanel);			
+			HideRSP_RegisterPanel (CurrentPanel);
 			item.mask = TCIF_PARAM;
 			TabCtrl_GetItem( hTab, TabCtrl_GetCurSel( hTab ), &item );
-			CurrentPanel = item.lParam;
+			CurrentPanel = (int)item.lParam;
 			InvalidateRect( hStatic, NULL, FALSE );
 			UpdateRSPRegistersScreen();
 			ShowRSP_RegisterPanel ( CurrentPanel );
@@ -491,19 +491,19 @@ void SetupRSP_RegistersMain (HWND hDlg) {
 		item.mask    = TCIF_TEXT | TCIF_PARAM;
 		item.pszText = " General Purpose ";
 		item.lParam  = GeneralPurpose;
-		TabCtrl_InsertItem( hTab,0, &item);		
+		TabCtrl_InsertItem( hTab,0, &item);
 		item.lParam  = ControlProcessor0;
 		item.pszText = " Control Processor 0 ";
-		TabCtrl_InsertItem( hTab,1, &item);	
+		TabCtrl_InsertItem( hTab,1, &item);
 		item.lParam  = HiddenRegisters;
 		item.pszText = " Hidden Registers ";
-		TabCtrl_InsertItem( hTab,2, &item);	
+		TabCtrl_InsertItem( hTab,2, &item);
 		item.lParam  = Vector1;
 		item.pszText = " RSP Vectors $v0 - $v15 ";
-		TabCtrl_InsertItem( hTab,3, &item);	
+		TabCtrl_InsertItem( hTab,3, &item);
 		item.lParam  = Vector2;
 		item.pszText = " RSP Vectors $v16 - $v31 ";
-		TabCtrl_InsertItem( hTab,4, &item);	
+		TabCtrl_InsertItem( hTab,4, &item);
 	}
 	
     SetupRSP_HiddenPanel ( hDlg );
@@ -513,7 +513,11 @@ void SetupRSP_RegistersMain (HWND hDlg) {
 	SetupRSP_Vect2Panel ( hDlg );
 
 	hStatic = CreateWindowEx(0,"STATIC","", WS_CHILD|WS_VISIBLE, 5,6,616,290,hDlg,0,hinstDLL,NULL );
-	RefreshProc = (FARPROC)SetWindowLong( hStatic,GWL_WNDPROC,(long)RefreshRSP_RegProc);
+#ifdef _M_IX86
+	RefreshProc = (FARPROC)SetWindowLong(hStatic, GWL_WNDPROC, (long)RefreshRSP_RegProc);
+#else
+	DebugBreak();
+#endif
 
 	UpdateRSPRegistersScreen ();
 	ShowRSP_RegisterPanel ( GeneralPurpose );
@@ -575,10 +579,10 @@ void ShowRSP_RegisterPanel ( int Panel) {
 		break;
 	case Vector1:
 		for (count = 0; count < 16;count ++) { ShowWindow(hVECT1[count], TRUE ); }
-		break;		
+		break;
 	case Vector2:
 		for (count = 0; count < 16;count ++) { ShowWindow(hVECT2[count], TRUE ); }
-		break;		
+		break;
 	}
 }
 
@@ -617,7 +621,7 @@ void UpdateRSPRegistersScreen ( void ) {
 				sprintf(RegisterValue," 0x%08X",*RSPInfo.SP_DMA_BUSY_REG);
 				SetWindowText(hCP0[6],RegisterValue);
 				sprintf(RegisterValue," 0x%08X",*RSPInfo.SP_SEMAPHORE_REG);
-				SetWindowText(hCP0[7],RegisterValue);			
+				SetWindowText(hCP0[7],RegisterValue);
 				sprintf(RegisterValue," 0x%08X",*RSPInfo.DPC_START_REG);
 				SetWindowText(hCP0[8],RegisterValue);
 				sprintf(RegisterValue," 0x%08X",*RSPInfo.DPC_END_REG);
@@ -654,14 +658,14 @@ void UpdateRSPRegistersScreen ( void ) {
 					RSP_Vect[count].W[2], RSP_Vect[count].W[1], RSP_Vect[count].W[0]);
 				SetWindowText(hVECT1[count],RegisterValue);
 			}
-			break;		
+			break;
 		case Vector2:
 			for (count = 0; count < 16;count ++) { 
 				sprintf(RegisterValue," 0x%08X - %08X - %08X - %08X", RSP_Vect[count + 16].W[3],
 					RSP_Vect[count + 16].W[2], RSP_Vect[count + 16].W[1], RSP_Vect[count + 16].W[0]);
 				SetWindowText(hVECT2[count],RegisterValue);
 			}
-			break;		
+			break;
 		}
 	}
 }
diff --git a/Source/RSP/RSP.vcxproj b/Source/RSP/RSP.vcxproj
index 58706df18..7f1721105 100644
--- a/Source/RSP/RSP.vcxproj
+++ b/Source/RSP/RSP.vcxproj
@@ -5,35 +5,37 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}</ProjectGuid>
     <RootNamespace>RSP</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>RSP 1.7</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RSP_d 1.7</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">RSP_d 1.7</TargetName>
     <OutDir>$(SolutionDir)Plugin\RSP\</OutDir>
+    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\RSP\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -97,7 +99,4 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/RSP/Recompiler Analysis.c b/Source/RSP/Recompiler Analysis.c
index a36bb64eb..2fc25468a 100644
--- a/Source/RSP/Recompiler Analysis.c	
+++ b/Source/RSP/Recompiler Analysis.c	
@@ -142,7 +142,7 @@ DWORD WriteToAccum2 (int Location, int PC, BOOL RecursiveCall) {
 	if (Compiler.bAccum == FALSE) return TRUE;
 
 	if (Instruction_State == DELAY_SLOT) { 
-		return TRUE; 
+		return TRUE;
 	}
 
 	do {
@@ -199,16 +199,24 @@ DWORD WriteToAccum2 (int Location, int PC, BOOL RecursiveCall) {
 			break;
 		case RSP_J:
 			/* there is no way a loopback is going to use accumulator */
-			if (Compiler.bAudioUcode && ((int)(RspOp.target << 2) < PC)) {
+			if (Compiler.bAudioUcode && (((int)(RspOp.target << 2) & 0xFFC) < PC)) {
 				return FALSE;
 			}
 			/* rarely occurs let them have their way */
-			return TRUE;
+			else {
+				Instruction_State = DO_DELAY_SLOT;
+				break;
+			}
 
 		case RSP_JAL:
 			/* there is no way calling a subroutine is going to use accum */
 			/* or come back and continue an existing calculation */
-			return (Compiler.bAudioUcode) ? FALSE : TRUE;
+			if(Compiler.bAudioUcode) {
+				break;
+			} else {
+				Instruction_State = DO_DELAY_SLOT;
+				break;
+			}
 
 		case RSP_BEQ:
 		case RSP_BNE:
@@ -370,7 +378,7 @@ DWORD WriteToAccum2 (int Location, int PC, BOOL RecursiveCall) {
 			Instruction_State = DELAY_SLOT;
 			break;
 		case DELAY_SLOT: 
-			Instruction_State = FINISH_BLOCK; 
+			Instruction_State = FINISH_BLOCK;
 			break;
 		}
 	} while (Instruction_State != FINISH_BLOCK);
@@ -447,7 +455,7 @@ BOOL WriteToVectorDest2 (DWORD DestReg, int PC, BOOL RecursiveCall) {
 	if (Compiler.bDest == FALSE) return TRUE;
 
 	if (Instruction_State == DELAY_SLOT) { 
-		return TRUE; 
+		return TRUE;
 	}
 	
 	do {
@@ -685,7 +693,7 @@ BOOL WriteToVectorDest2 (DWORD DestReg, int PC, BOOL RecursiveCall) {
 			Instruction_State = DELAY_SLOT;
 			break;
 		case DELAY_SLOT: 
-			Instruction_State = FINISH_BLOCK; 
+			Instruction_State = FINISH_BLOCK;
 			break;
 		}
 	} while (Instruction_State != FINISH_BLOCK);
@@ -762,7 +770,7 @@ BOOL UseRspFlags (int PC) {
 	if (Compiler.bFlags == FALSE) return TRUE;
 
 	if (Instruction_State == DELAY_SLOT) { 
-		return TRUE; 
+		return TRUE;
 	}
 
 	do {
@@ -963,7 +971,7 @@ BOOL UseRspFlags (int PC) {
 			Instruction_State = DELAY_SLOT;
 			break;
 		case DELAY_SLOT: 
-			Instruction_State = FINISH_BLOCK; 
+			Instruction_State = FINISH_BLOCK;
 			break;
 		}
 	} while ( Instruction_State != FINISH_BLOCK);
@@ -1050,7 +1058,7 @@ BOOL IsRegisterConstant (DWORD Reg, DWORD * Constant) {
 			if (RspOp.rt == Reg) {
 				if (RspOp.rs == 0) {
 					if (References > 0) {
-						return FALSE; 
+						return FALSE;
 					}
 					Const = (short)RspOp.immediate;
 					References++;
@@ -1410,7 +1418,7 @@ void GetInstructionInfo(DWORD PC, OPCODE * RspOp, OPCODE_INFO * info) {
 			info->SourceReg0 = UNUSED_OPERAND;
 			info->SourceReg1 = UNUSED_OPERAND;
 			if (RspOp->rd == 0x4 || RspOp->rd == 0x7){
-				info->flags = InvalidOpcode;
+				info->flags = InvalidOpcode | COPO_MF_Instruction;
 			} else{
 				info->flags = COPO_MF_Instruction | GPR_Instruction | Load_Operation;
 			}			
@@ -1564,7 +1572,7 @@ void GetInstructionInfo(DWORD PC, OPCODE * RspOp, OPCODE_INFO * info) {
 		info->StoredReg = RspOp->rt;
 		info->IndexReg = RspOp->base;
 		info->SourceReg1 = UNUSED_OPERAND;
-		info->flags = Store_Operation | GPR_Instruction;		
+		info->flags = Store_Operation | GPR_Instruction;
 		break;
 	case RSP_LC2:
 		switch (RspOp->rd) {
diff --git a/Source/RSP/Recompiler CPU.c b/Source/RSP/Recompiler CPU.c
index cbe636de6..ed2a98def 100644
--- a/Source/RSP/Recompiler CPU.c	
+++ b/Source/RSP/Recompiler CPU.c	
@@ -509,10 +509,10 @@ void ReOrderSubBlock(RSP_BLOCK * Block) {
 	DWORD count;
 
 	if (!Compiler.bReOrdering) { 
-		return; 
+		return;
 	}
 	if (Block->CurrPC > 0xFF0) { 
-		return; 
+		return;
 	}
 
 	/* find the label or jump closest to us */
@@ -550,7 +550,7 @@ void DetectGPRConstants(RSP_CODE * code) {
 	memset(&code->MipsRegConst, 0, sizeof(DWORD) * 0x20);
 	
 	if (!Compiler.bGPRConstants) { 
-		return; 
+		return;
 	}
 	CPU_Message("***** Detecting constants *****");
 
@@ -634,7 +634,7 @@ void LinkBranches(RSP_BLOCK * Block) {
 	RSP_BLOCK Save;
 
 	if (!CurrentBlock.ResolveCount) { 
-		return; 
+		return;
 	}
 	CPU_Message("***** Linking branches (%i) *****", CurrentBlock.ResolveCount);
 
@@ -732,7 +732,7 @@ BOOL IsJumpLabel(DWORD PC) {
 	DWORD Count;
 	
 	if (!RspCode.LabelCount) {
-		return FALSE; 
+		return FALSE;
 	}
 
 	for (Count = 0; Count < RspCode.LabelCount; Count++) {
@@ -827,7 +827,7 @@ void CompilerRSPBlock ( void ) {
 
 		if (LogRDP && NextInstruction != DELAY_SLOT_DONE){
 			char str[40];
-			sprintf(str,"%X",CompilePC);		
+			sprintf(str,"%X",CompilePC);
 			PushImm32(str,CompilePC);
 			Call_Direct(RDP_LogLoc,"RDP_LogLoc");
 			AddConstToX86Reg(x86_ESP, 4);
@@ -860,7 +860,7 @@ void CompilerRSPBlock ( void ) {
 			NextInstruction = NORMAL;
 			CompilePC += 8;
 			if (CompilePC >= 0x1000) {
-				NextInstruction = FINISH_BLOCK;				
+				NextInstruction = FINISH_BLOCK;
 			} else if (NULL == *(JumpTable + (CompilePC >> 2))) {
 				/* this is for the new block being compiled now */
 				CPU_Message("**** Continuing static SubBlock (jump table entry added for PC: %04X at X86: %08X) *****", CompilePC, RecompPos);
@@ -923,7 +923,7 @@ DWORD RunRecompilerCPU ( DWORD Cycles ) {
 			** that go out of it, let's rock
 			**/
 
-			LinkBranches(&CurrentBlock);			
+			LinkBranches(&CurrentBlock);
 			if (Profiling && !IndvidualBlock) {
 				StopTimer();
 			}
@@ -933,11 +933,15 @@ DWORD RunRecompilerCPU ( DWORD Cycles ) {
 			StartTimer(*PrgCount);
 		}
 
+#ifdef _M_IX86
 		_asm {
 			pushad
 			call Block
 			popad
 		}		
+#else
+		DebugBreak();
+#endif
 		if (Profiling && IndvidualBlock) {
 			StopTimer();
 		}
@@ -948,7 +952,11 @@ DWORD RunRecompilerCPU ( DWORD Cycles ) {
 	}
 
 	if (IsMmxEnabled == TRUE) {
+#ifdef _M_IX86
 		_asm emms
+#else
+		DebugBreak();
+#endif
 	}
 	return Cycles;
 }
diff --git a/Source/RSP/Recompiler Ops.c b/Source/RSP/Recompiler Ops.c
index 2534787ab..594f3c925 100644
--- a/Source/RSP/Recompiler Ops.c	
+++ b/Source/RSP/Recompiler Ops.c	
@@ -41,6 +41,7 @@
 
 #pragma warning(disable : 4152) // nonstandard extension, function/data pointer conversion in expression
 
+extern BOOL AudioHle, GraphicsHle;
 UWORD32 Recp, RecpResult, SQroot, SQrootResult;
 DWORD ESP_RegSave = 0, EBP_RegSave = 0;
 DWORD BranchCompare = 0;
@@ -73,6 +74,12 @@ DWORD BranchCompare = 0;
 #	define CompileVmadn	/* Verified 12/17/2000 - Jabo */
 #endif
 #ifdef RSP_VectorMisc
+#	define CompileVne
+#	define CompileVeq
+#	define CompileVge
+#	define CompileVlt
+#	define CompileVrcp
+#	define CompileVrcpl
 #	define CompileVrsqh
 #	define CompileVrcph
 #	define CompileVsaw		/* Verified 12/17/2000 - Jabo */
@@ -91,6 +98,10 @@ DWORD BranchCompare = 0;
 #	define CompileVnand
 #endif
 #ifdef RSP_VectorLoads
+#	define CompileLbv
+#	define CompileLpv
+#	define CompileLuv
+#	define CompileLhv
 #	define CompileSqv		/* Verified 12/17/2000 - Jabo */
 #	define CompileSdv		/* Verified 12/17/2000 - Jabo */
 #	define CompileSsv		/* Verified 12/17/2000 - Jabo */
@@ -133,13 +144,17 @@ void Cheat_r4300iOpcodeNoMessage(p_func FunctAddress, char * FunctName) {
 
 void x86_SetBranch8b(void * JumpByte, void * Destination) {
 	/* calculate 32-bit relative offset */
-	signed int n = (BYTE*)Destination - ((BYTE*)JumpByte + 1);
+	size_t n = (BYTE*)Destination - ((BYTE*)JumpByte + 1);
+	SSIZE_T signed_n = (SSIZE_T)n;
 
 	/* check limits, no pun intended */
-	if (n > 0x80 || n < -0x7F) {
-		CompilerWarning("FATAL: Jump out of 8b range %i (PC = %04X)", n, CompilePC);
-	} else
-		*(BYTE*)(JumpByte) = (BYTE)n;
+	if (signed_n > +128 || signed_n < -127) {
+		CompilerWarning(
+			"FATAL: Jump out of 8b range %i (PC = %04X)", n, CompilePC
+		);
+	} else {
+		*(uint8_t *)(JumpByte) = (uint8_t)(n & 0xFF);
+	}
 }
 
 void x86_SetBranch32b(void * JumpByte, void * Destination) {
@@ -155,7 +170,7 @@ void CompileBranchExit(DWORD TargetPC, DWORD ContinuePC)
 {
 	DWORD * X86Loc = NULL;
 
-	NextInstruction = FINISH_SUB_BLOCK;	
+	NextInstruction = FINISH_SUB_BLOCK;
 	CompConstToVariable(TRUE, &BranchCompare, "BranchCompare");
 	JeLabel32("BranchEqual", 0);
 	X86Loc = (DWORD*)(RecompPos - 4);
@@ -187,7 +202,7 @@ void Compile_J ( void ) {
 		NextInstruction = FINISH_SUB_BLOCK;
 	} else if ( NextInstruction == DELAY_SLOT_EXIT_DONE ) {
 		MoveConstToVariable((RSPOpC.target << 2) & 0xFFC,PrgCount,"RSP PC");
-		NextInstruction = FINISH_SUB_BLOCK;	
+		NextInstruction = FINISH_SUB_BLOCK;
 		Ret();
 	} else {
 		CompilerWarning("J error\nWeird Delay Slot.\n\nNextInstruction = %X\nEmulation will now stop", NextInstruction);
@@ -217,7 +232,7 @@ void Compile_JAL ( void ) {
 		NextInstruction = FINISH_SUB_BLOCK;
 	} else if ( NextInstruction == DELAY_SLOT_EXIT_DONE ) {
 		MoveConstToVariable((RSPOpC.target << 2) & 0xFFC,PrgCount,"RSP PC");
-		NextInstruction = FINISH_SUB_BLOCK;	
+		NextInstruction = FINISH_SUB_BLOCK;
 		Ret();
 	} else {
 		CompilerWarning("J error\nWeird Delay Slot.\n\nNextInstruction = %X\nEmulation will now stop", NextInstruction);
@@ -231,7 +246,7 @@ void Compile_BEQ ( void ) {
 	if ( NextInstruction == NORMAL ) {
 		CPU_Message("  %X %s",CompilePC,RSPOpcodeName(RSPOpC.Hex,CompilePC));
 		if (RSPOpC.rs == 0 && RSPOpC.rt == 0) {
-			NextInstruction = DO_DELAY_SLOT;			
+			NextInstruction = DO_DELAY_SLOT;
 			return;
 		}
 		bDelayAffect = DelaySlotAffectBranch(CompilePC);
@@ -248,7 +263,7 @@ void Compile_BEQ ( void ) {
 			CompX86regToVariable(x86_EAX,&RSP_GPR[RSPOpC.rs].W,GPR_Name(RSPOpC.rs));
 		}
 		SetzVariable(&BranchCompare, "BranchCompare");
-		NextInstruction = DO_DELAY_SLOT;	
+		NextInstruction = DO_DELAY_SLOT;
 	} else if ( NextInstruction == DELAY_SLOT_DONE ) {
 		DWORD Target = (CompilePC + ((short)RSPOpC.offset << 2) + 4) & 0xFFC;
 		
@@ -308,7 +323,7 @@ void Compile_BNE ( void ) {
 			CompX86regToVariable(x86_EAX,&RSP_GPR[RSPOpC.rs].W,GPR_Name(RSPOpC.rs));
 		}
 		SetnzVariable(&BranchCompare, "BranchCompare");
-		NextInstruction = DO_DELAY_SLOT;	
+		NextInstruction = DO_DELAY_SLOT;
 	} else if ( NextInstruction == DELAY_SLOT_DONE ) {
 		DWORD Target = (CompilePC + ((short)RSPOpC.offset << 2) + 4) & 0xFFC;
 		
@@ -349,7 +364,7 @@ void Compile_BLEZ ( void ) {
 	if ( NextInstruction == NORMAL ) {
 		CPU_Message("  %X %s",CompilePC,RSPOpcodeName(RSPOpC.Hex,CompilePC));
 		if (RSPOpC.rs == 0) {
-			NextInstruction = DO_DELAY_SLOT;			
+			NextInstruction = DO_DELAY_SLOT;
 			return;
 		}
 		bDelayAffect = DelaySlotAffectBranch(CompilePC);
@@ -359,7 +374,7 @@ void Compile_BLEZ ( void ) {
 		}
 		CompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W,GPR_Name(RSPOpC.rs));
 		SetleVariable(&BranchCompare, "BranchCompare");
-		NextInstruction = DO_DELAY_SLOT;	
+		NextInstruction = DO_DELAY_SLOT;
 	} else if ( NextInstruction == DELAY_SLOT_DONE ) {
 		DWORD Target = (CompilePC + ((short)RSPOpC.offset << 2) + 4) & 0xFFC;
 		
@@ -395,7 +410,7 @@ void Compile_BGTZ ( void ) {
 	if ( NextInstruction == NORMAL ) {
 		CPU_Message("  %X %s",CompilePC,RSPOpcodeName(RSPOpC.Hex,CompilePC));
 		if (RSPOpC.rs == 0) {
-			NextInstruction = DO_DELAY_SLOT;			
+			NextInstruction = DO_DELAY_SLOT;
 			return;
 		}
 		bDelayAffect = DelaySlotAffectBranch(CompilePC);
@@ -405,7 +420,7 @@ void Compile_BGTZ ( void ) {
 		}
 		CompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W,GPR_Name(RSPOpC.rs));
 		SetgVariable(&BranchCompare, "BranchCompare");
-		NextInstruction = DO_DELAY_SLOT;	
+		NextInstruction = DO_DELAY_SLOT;
 	} else if ( NextInstruction == DELAY_SLOT_DONE ) {
 		DWORD Target = (CompilePC + ((short)RSPOpC.offset << 2) + 4) & 0xFFC;
 		
@@ -444,17 +459,19 @@ void Compile_ADDI ( void ) {
 	if (RSPOpC.rt == 0) return;
 
 	if (RSPOpC.rt == RSPOpC.rs) {
-		AddConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+		if (Immediate != 0) {
+			AddConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+		}
 	} else if (RSPOpC.rs == 0) {
 		MoveConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
-	} else if ((IsRegConst(RSPOpC.rs) && 1) != 0) {
+	} else if ((IsRegConst(RSPOpC.rs) & 1) != 0) {
 		MoveConstToVariable(MipsRegConst(RSPOpC.rs) + Immediate, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
 	} else {
 		MoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].UW, GPR_Name(RSPOpC.rs), x86_EAX);
 		if (Immediate != 0) {
 			AddConstToX86Reg(x86_EAX, Immediate);
 		}
-		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));		
+		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
 	}
 }
 
@@ -470,24 +487,52 @@ void Compile_ADDIU ( void ) {
 	if (RSPOpC.rt == 0) return;
 
 	if (RSPOpC.rt == RSPOpC.rs) {
-		AddConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+		if (Immediate != 0) {
+			AddConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+		}
 	} else if (RSPOpC.rs == 0) {
 		MoveConstToVariable(Immediate, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
 	} else {
 		MoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].UW, GPR_Name(RSPOpC.rs), x86_EAX);
-		AddConstToX86Reg(x86_EAX, Immediate);
+		if (Immediate != 0) {
+			AddConstToX86Reg(x86_EAX, Immediate);
+		}
 		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
 	}
 }
 
 void Compile_SLTI ( void ) {
+#ifndef Compile_Immediates
 	Cheat_r4300iOpcode(RSP_Opcode_SLTI,"RSP_Opcode_SLTI");
+#endif
+	int Immediate;
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
 	
+	if (RSPOpC.rt == 0) return;
+
+	Immediate = (short)RSPOpC.immediate;
+	XorX86RegToX86Reg(x86_ECX, x86_ECX);
+	CompConstToVariable(Immediate, &RSP_GPR[RSPOpC.rs].UW, GPR_Name(RSPOpC.rs));
+	Setl(x86_ECX);
+	MoveX86regToVariable(x86_ECX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
 }
 
 void Compile_SLTIU ( void ) {
+#ifndef Compile_Immediates
 	Cheat_r4300iOpcode(RSP_Opcode_SLTIU,"RSP_Opcode_SLTIU");
+#endif
+	int Immediate;
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
 	
+	if (RSPOpC.rt == 0) return;
+
+	Immediate = (short)RSPOpC.immediate;
+	XorX86RegToX86Reg(x86_ECX, x86_ECX);
+	CompConstToVariable(Immediate, &RSP_GPR[RSPOpC.rs].UW, GPR_Name(RSPOpC.rs));
+	Setb(x86_ECX);
+	MoveX86regToVariable(x86_ECX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
 }
 
 void Compile_ANDI ( void ) {
@@ -584,12 +629,25 @@ void Compile_COP2 (void) {
 void Compile_LB ( void ) {
 	int Offset = (short)RSPOpC.offset;
 
+	if (RSPOpC.rt == 0)
+		return;
 	#ifndef Compile_GPRLoads
 	Cheat_r4300iOpcode(RSP_Opcode_LB,"RSP_Opcode_LB"); return;
 	#endif
 
 	CPU_Message("  %X %s",CompilePC,RSPOpcodeName(RSPOpC.Hex,CompilePC));
 	
+	if (IsRegConst(RSPOpC.base) == TRUE) {
+		char Address[32];
+		DWORD Addr = (MipsRegConst(RSPOpC.base) + Offset) ^ 3;
+		Addr &= 0xfff;
+		
+		sprintf(Address, "Dmem + %Xh", Addr);
+		MoveSxVariableToX86regByte(RSPInfo.DMEM + Addr, Address, x86_EAX);
+		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+		return;
+	}
+	
 	MoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, GPR_Name(RSPOpC.base), x86_EBX);
 	if (Offset != 0) AddConstToX86Reg(x86_EBX, Offset);
 	XorConstToX86Reg(x86_EBX, 3);
@@ -603,6 +661,8 @@ void Compile_LH ( void ) {
 	int Offset = (short)RSPOpC.offset;
 	BYTE * Jump[2];
 
+	if (RSPOpC.rt == 0)
+		return;
 	#ifndef Compile_GPRLoads
 	Cheat_r4300iOpcode(RSP_Opcode_LH,"RSP_Opcode_LH"); return;
 	#endif
@@ -614,10 +674,17 @@ void Compile_LH ( void ) {
 		Addr &= 0xfff;
 
 		if ((Addr & 1) != 0) {
-			CompilerWarning("Unaligned LH at constant address PC = %04X", CompilePC);
-			Cheat_r4300iOpcodeNoMessage(RSP_Opcode_LH,"RSP_Opcode_LH");
+			if ((Addr & 2) == 0) {
+				CompilerWarning("Unaligned LH at constant address PC = %04X", CompilePC);
+				Cheat_r4300iOpcodeNoMessage(RSP_Opcode_LH,"RSP_Opcode_LH");
+			} else {
+				char Address[32];
+				sprintf(Address, "Dmem + %Xh", Addr);
+				MoveSxVariableToX86regHalf(RSPInfo.DMEM + (Addr ^ 2), Address, x86_EAX);
+				MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+			}
 		} else {
-			char Address[32];			
+			char Address[32];
 			sprintf(Address, "Dmem + %Xh", Addr);
 			MoveSxVariableToX86regHalf(RSPInfo.DMEM + Addr, Address, x86_EAX);
 			MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
@@ -658,6 +725,8 @@ void Compile_LW ( void ) {
 	int Offset = (short)RSPOpC.offset;
 	BYTE * Jump[2];
 
+	if (RSPOpC.rt == 0)
+		return;
 	#ifndef Compile_GPRLoads
 	Cheat_r4300iOpcode(RSP_Opcode_LW,"RSP_Opcode_LW"); return;
 	#endif
@@ -667,11 +736,20 @@ void Compile_LW ( void ) {
 	if (IsRegConst(RSPOpC.base) == TRUE) {
 		DWORD Addr = (MipsRegConst(RSPOpC.base) + Offset) & 0xfff;
 
-		if ((Addr & 3) != 0) {
+		if ((Addr & 1) != 0) {
 			CompilerWarning("Unaligned LW at constant address PC = %04X", CompilePC);
 			Cheat_r4300iOpcodeNoMessage(RSP_Opcode_LW,"RSP_Opcode_LW");
+		} else if ((Addr & 2) != 0) {
+			char Address[32];
+			sprintf(Address, "Dmem + %Xh", Addr - 2);
+			MoveVariableToX86regHalf(RSPInfo.DMEM + Addr - 2, Address, x86_EAX);
+			sprintf(Address, "Dmem + %Xh", Addr);
+			MoveVariableToX86regHalf(RSPInfo.DMEM + Addr + 4, Address, x86_ECX);
+			
+			MoveX86regHalfToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UHW[1], GPR_Name(RSPOpC.rt));
+			MoveX86regHalfToVariable(x86_ECX, &RSP_GPR[RSPOpC.rt].UHW[0], GPR_Name(RSPOpC.rt));
 		} else {
-			char Address[32];			
+			char Address[32];
 			sprintf(Address, "Dmem + %Xh", Addr);
 			MoveVariableToX86reg(RSPInfo.DMEM + Addr, Address, x86_EAX);
 			MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
@@ -724,12 +802,25 @@ void Compile_LW ( void ) {
 void Compile_LBU ( void ) {
 	int Offset = (short)RSPOpC.offset;
 
+	if (RSPOpC.rt == 0)
+		return;
 	#ifndef Compile_GPRLoads
 	Cheat_r4300iOpcode(RSP_Opcode_LBU,"RSP_Opcode_LBU"); return;
 	#endif
 
 	CPU_Message("  %X %s",CompilePC,RSPOpcodeName(RSPOpC.Hex,CompilePC));
 
+	if (IsRegConst(RSPOpC.base) == TRUE) {
+		char Address[32];
+		DWORD Addr = (MipsRegConst(RSPOpC.base) + Offset) ^ 3;
+		Addr &= 0xfff;
+
+		sprintf(Address, "Dmem + %Xh", Addr);
+		MoveZxVariableToX86regByte(RSPInfo.DMEM + Addr, Address, x86_EAX);
+		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+		return;
+	}
+	
 	MoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, GPR_Name(RSPOpC.base), x86_EBX);
 	XorX86RegToX86Reg(x86_EAX, x86_EAX);
 
@@ -745,6 +836,8 @@ void Compile_LHU ( void ) {
 	int Offset = (short)RSPOpC.offset;
 	BYTE * Jump[2];
 
+	if (RSPOpC.rt == 0)
+		return;
 	#ifndef Compile_GPRLoads
 	Cheat_r4300iOpcode(RSP_Opcode_LHU,"RSP_Opcode_LHU"); return;
 	#endif
@@ -756,11 +849,18 @@ void Compile_LHU ( void ) {
 		Addr &= 0xfff;
 
 		if ((Addr & 1) != 0) {
-			CompilerWarning("Unaligned LHU at constant address PC = %04X", CompilePC);
-			Cheat_r4300iOpcodeNoMessage(RSP_Opcode_LHU,"RSP_Opcode_LHU");
+			if ((Addr & 2) == 0) {
+				CompilerWarning("Unaligned LHU at constant address PC = %04X", CompilePC);
+				Cheat_r4300iOpcodeNoMessage(RSP_Opcode_LHU, "RSP_Opcode_LHU");
+			} else {
+				char Address[32];
+				sprintf(Address, "Dmem + %Xh", Addr);
+				MoveZxVariableToX86regHalf(RSPInfo.DMEM + (Addr ^ 2), Address, x86_ECX);
+				MoveX86regToVariable(x86_ECX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+			}
 			return;
 		} else {
-			char Address[32];			
+			char Address[32];
 			sprintf(Address, "Dmem + %Xh", Addr);
 			MoveZxVariableToX86regHalf(RSPInfo.DMEM + Addr, Address, x86_ECX);
 			MoveX86regToVariable(x86_ECX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
@@ -834,7 +934,7 @@ void Compile_SH ( void ) {
 			Cheat_r4300iOpcodeNoMessage(RSP_Opcode_SH,"RSP_Opcode_SH");
 			return;
 		} else {
-			char Address[32];			
+			char Address[32];
 			sprintf(Address, "Dmem + %Xh", Addr);
 			MoveVariableToX86regHalf(&RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt), x86_EAX);
 			MoveX86regHalfToVariable(x86_EAX, RSPInfo.DMEM + Addr, Address);
@@ -888,10 +988,10 @@ void Compile_SW ( void ) {
 			Cheat_r4300iOpcodeNoMessage(RSP_Opcode_SW,"RSP_Opcode_SW");
 			return;
 		} else {
-			char Address[32];			
+			char Address[32];
 			sprintf(Address, "Dmem + %Xh", Addr);
 			MoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt), x86_EAX);
-			MoveX86regToVariable(x86_EAX, RSPInfo.DMEM + Addr, Address);			
+			MoveX86regToVariable(x86_EAX, RSPInfo.DMEM + Addr, Address);
 			return;
 		}
 	} 
@@ -941,7 +1041,7 @@ void Compile_SW ( void ) {
 	if (RSPOpC.rt == 0) {
 		XorX86RegToX86Reg(x86_EAX,x86_EAX);
 	} else {
-		MoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt), x86_EAX);		
+		MoveVariableToX86reg(&RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt), x86_EAX);
 	}
 	MoveX86regToN64Mem(x86_EAX, x86_EBX);
 	
@@ -1025,7 +1125,7 @@ void Compile_Special_SRLV ( void ) {
 	MoveVariableToX86reg(&RSP_GPR[RSPOpC.rs].W, GPR_Name(RSPOpC.rs), x86_ECX);
 	AndConstToX86Reg(x86_ECX, 0x1F);
 	ShiftRightUnsign(x86_EAX);
-	MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W, GPR_Name(RSPOpC.rd));	
+	MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rd].W, GPR_Name(RSPOpC.rd));
 }
 
 void Compile_Special_SRAV ( void ) {
@@ -1080,7 +1180,7 @@ void Compile_Special_JR (void) {
 		ChangedPC = FALSE;
 		NextInstruction = FINISH_SUB_BLOCK;
 	} else if ( NextInstruction == DELAY_SLOT_EXIT_DONE ) {
-		NextInstruction = FINISH_SUB_BLOCK;	
+		NextInstruction = FINISH_SUB_BLOCK;
 		Ret();
 	} else {
 		CompilerWarning("WTF\n\nJR\nNextInstruction = %X", NextInstruction);
@@ -1114,7 +1214,7 @@ void Compile_Special_JALR ( void ) {
 		Ret();
 		NextInstruction = FINISH_SUB_BLOCK;
 	} else if ( NextInstruction == DELAY_SLOT_EXIT_DONE ) {
-		NextInstruction = FINISH_SUB_BLOCK;	
+		NextInstruction = FINISH_SUB_BLOCK;
 		Ret();
 	} else {
 		CompilerWarning("WTF\n\nJALR\nNextInstruction = %X", NextInstruction);
@@ -1361,7 +1461,7 @@ void Compile_RegImm_BLTZ ( void ) {
 	if ( NextInstruction == NORMAL ) {
 		CPU_Message("  %X %s",CompilePC,RSPOpcodeName(RSPOpC.Hex,CompilePC));
 		if (RSPOpC.rs == 0) {
-			NextInstruction = DO_DELAY_SLOT;			
+			NextInstruction = DO_DELAY_SLOT;
 			return;
 		}
 		bDelayAffect = DelaySlotAffectBranch(CompilePC);
@@ -1371,7 +1471,7 @@ void Compile_RegImm_BLTZ ( void ) {
 		}
 		CompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W,GPR_Name(RSPOpC.rs));
 		SetlVariable(&BranchCompare, "BranchCompare");
-		NextInstruction = DO_DELAY_SLOT;	
+		NextInstruction = DO_DELAY_SLOT;
 	} else if ( NextInstruction == DELAY_SLOT_DONE ) {
 		DWORD Target = (CompilePC + ((short)RSPOpC.offset << 2) + 4) & 0xFFC;
 		
@@ -1404,7 +1504,7 @@ void Compile_RegImm_BGEZ ( void ) {
 	if ( NextInstruction == NORMAL ) {
 		CPU_Message("  %X %s",CompilePC,RSPOpcodeName(RSPOpC.Hex,CompilePC));
 		if (RSPOpC.rs == 0) {
-			NextInstruction = DO_DELAY_SLOT;			
+			NextInstruction = DO_DELAY_SLOT;
 			return;
 		}
 		bDelayAffect = DelaySlotAffectBranch(CompilePC);
@@ -1414,7 +1514,7 @@ void Compile_RegImm_BGEZ ( void ) {
 		}
 		CompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W,GPR_Name(RSPOpC.rs));
 		SetgeVariable(&BranchCompare, "BranchCompare");
-		NextInstruction = DO_DELAY_SLOT;	
+		NextInstruction = DO_DELAY_SLOT;
 	} else if ( NextInstruction == DELAY_SLOT_DONE ) {
 		DWORD Target = (CompilePC + ((short)RSPOpC.offset << 2) + 4) & 0xFFC;
 		
@@ -1448,12 +1548,12 @@ void Compile_RegImm_BLTZAL ( void ) {
 		CPU_Message("  %X %s",CompilePC,RSPOpcodeName(RSPOpC.Hex,CompilePC));
 		MoveConstToVariable(CompilePC + 8, &RSP_GPR[31].UW, "RA.W");
 		if (RSPOpC.rs == 0) {
-			NextInstruction = DO_DELAY_SLOT;			
+			NextInstruction = DO_DELAY_SLOT;
 			return;
 		}
 		CompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W,GPR_Name(RSPOpC.rs));
 		SetlVariable(&BranchCompare, "BranchCompare");
-		NextInstruction = DO_DELAY_SLOT;	
+		NextInstruction = DO_DELAY_SLOT;
 	} else if ( NextInstruction == DELAY_SLOT_DONE ) {
 		DWORD Target = (CompilePC + ((short)RSPOpC.offset << 2) + 4) & 0xFFC;
 		
@@ -1493,7 +1593,7 @@ void Compile_RegImm_BGEZAL ( void ) {
 		}
 		CompConstToVariable(0,&RSP_GPR[RSPOpC.rs].W,GPR_Name(RSPOpC.rs));
 		SetgeVariable(&BranchCompare, "BranchCompare");
-		NextInstruction = DO_DELAY_SLOT;	
+		NextInstruction = DO_DELAY_SLOT;
 	} else if ( NextInstruction == DELAY_SLOT_DONE ) {
 		DWORD Target = (CompilePC + ((short)RSPOpC.offset << 2) + 4) & 0xFFC;
 		
@@ -1532,14 +1632,14 @@ void Compile_Cop0_MF ( void ) {
 
 		sprintf(str,"%d",RSPOpC.rd);
 		PushImm32(str,RSPOpC.rd);
-		sprintf(str,"%X",CompilePC);		
+		sprintf(str,"%X",CompilePC);
 		PushImm32(str,CompilePC);
 		Call_Direct(RDP_LogMF0,"RDP_LogMF0");
 		AddConstToX86Reg(x86_ESP, 8);
 	}
 
 #ifndef Compile_Cop0
-	Cheat_r4300iOpcode(RSP_Cop0_MF,"RSP_Cop0_MF"); 
+	Cheat_r4300iOpcode(RSP_Cop0_MF,"RSP_Cop0_MF");
 	if (NextInstruction == NORMAL)
 	{
 		MoveConstToVariable(CompilePC + 4,PrgCount,"RSP PC");
@@ -1554,6 +1654,14 @@ void Compile_Cop0_MF ( void ) {
 	return;
 #else
 	switch (RSPOpC.rd) {
+	case 0: 
+		MoveVariableToX86reg(RSPInfo.SP_MEM_ADDR_REG, "SP_MEM_ADDR_REG", x86_EAX);
+		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+		break;
+	case 1: 
+		MoveVariableToX86reg(RSPInfo.SP_DRAM_ADDR_REG, "SP_DRAM_ADDR_REG", x86_EAX);
+		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+		break;
 	case 5: 
 		MoveVariableToX86reg(RSPInfo.SP_DMA_FULL_REG, "SP_DMA_FULL_REG", x86_EAX);
 		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
@@ -1563,9 +1671,14 @@ void Compile_Cop0_MF ( void ) {
 		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
 		break;
 	case 4: 
-	case 7: 
-		MoveConstToVariable(RSPOpC.Hex, &RSPOpC.Hex, "RSPOpC.Hex" );
-		Call_Direct(RSP_Cop0_MF,"RSP_Cop0_MF");
+		MoveVariableToX86reg(&RSP_MfStatusCount, "RSP_MfStatusCount", x86_ECX);
+		MoveVariableToX86reg(RSPInfo.SP_STATUS_REG, "SP_STATUS_REG", x86_EAX);
+		CompConstToX86reg(x86_ECX, 10);
+		JbLabel8("label", 10);
+		MoveConstToVariable(0, &RSP_Running, "RSP_Running");
+		IncX86reg(x86_ECX);
+		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
+		MoveX86regToVariable(x86_ECX, &RSP_MfStatusCount, "RSP_MfStatusCount");
 		if (NextInstruction == NORMAL)
 		{
 			MoveConstToVariable(CompilePC + 4,PrgCount,"RSP PC");
@@ -1578,6 +1691,28 @@ void Compile_Cop0_MF ( void ) {
 			BreakPoint();
 		}
 		break;
+	case 7:
+		if (AudioHle || GraphicsHle)
+		{
+			MoveConstToVariable(0, &RSP_GPR[RSPOpC.rt].W, GPR_Name(RSPOpC.rt));
+		} else {
+			MoveVariableToX86reg(RSPInfo.SP_SEMAPHORE_REG, "SP_SEMAPHORE_REG", x86_EAX);
+			MoveConstToVariable(0, &RSP_Running, "RSP_Running");
+			MoveConstToVariable(1, RSPInfo.SP_SEMAPHORE_REG, "SP_SEMAPHORE_REG");
+			MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].W, GPR_Name(RSPOpC.rt));
+			if (NextInstruction == NORMAL)
+			{
+				MoveConstToVariable(CompilePC + 4, PrgCount, "RSP PC");
+				Ret();
+				NextInstruction = FINISH_SUB_BLOCK;
+			} else if (NextInstruction == DELAY_SLOT) {
+				NextInstruction = DELAY_SLOT_EXIT;
+			} else {
+				CompilerWarning("MF error\nWeird Delay Slot.\n\nNextInstruction = %X\nEmulation will now stop", NextInstruction);
+				BreakPoint();
+			}
+		}
+		break;
 	case 8:
 		MoveVariableToX86reg(RSPInfo.DPC_START_REG, "DPC_START_REG", x86_EAX);
 		MoveX86regToVariable(x86_EAX, &RSP_GPR[RSPOpC.rt].UW, GPR_Name(RSPOpC.rt));
@@ -1600,7 +1735,7 @@ void Compile_Cop0_MF ( void ) {
 		break;
 
 	default:
-		CompilerWarning("have not implemented RSP MF CP0 reg %s (%d)",COP0_Name(RSPOpC.rd),RSPOpC.rd);
+		DisplayError("have not implemented RSP MF CP0 reg %s (%d)",COP0_Name(RSPOpC.rd),RSPOpC.rd);
 	}
 #endif
 }
@@ -1617,7 +1752,7 @@ void Compile_Cop0_MT ( void )
 		Push(x86_EAX);
 		sprintf(str,"%d",RSPOpC.rd);
 		PushImm32(str,RSPOpC.rd);
-		sprintf(str,"%X",CompilePC);		
+		sprintf(str,"%X",CompilePC);
 		PushImm32(str,CompilePC);
 		Call_Direct(RDP_LogMT0,"RDP_LogMT0");
 		AddConstToX86Reg(x86_ESP, 12);
@@ -2533,7 +2668,7 @@ BOOL Compile_Vector_VMUDH_MMX ( void ) {
 
 	MmxUnpackLowWord(x86_MM0, x86_MM4);
 	MmxUnpackHighWord(x86_MM6, x86_MM4);
-	MmxUnpackLowWord(x86_MM1, x86_MM5);		
+	MmxUnpackLowWord(x86_MM1, x86_MM5);
 	MmxUnpackHighWord(x86_MM7, x86_MM5);
 
 	/* Integrate copies */
@@ -3520,7 +3655,7 @@ void Compile_Vector_VABS ( void ) {
 			}
 			if (bWriteToAccum == TRUE) {
 				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
-				MoveX86regHalfToVariable(x86_EDI, &RSP_ACCUM[el].HW[1], Reg);	
+				MoveX86regHalfToVariable(x86_EDI, &RSP_ACCUM[el].HW[1], Reg);
 			}
 		}
 	}
@@ -3707,15 +3842,220 @@ void Compile_Vector_VSAW ( void ) {
 }
 
 void Compile_Vector_VLT ( void ) {
+	BOOL bWriteToDest  = WriteToVectorDest(RSPOpC.sa, CompilePC);
+	BOOL bWriteToAccum = WriteToAccum(Low16BitAccum, CompilePC);
+	BYTE *jump[3];
+	DWORD flag;
+	char Reg[256];
+	int el, del, last;
+	
+#ifndef CompileVlt
 	Cheat_r4300iOpcode(RSP_Vector_VLT,"RSP_Vector_VLT");
+	return;
+#endif
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+	last = -1;
+	XorX86RegToX86Reg(x86_EBX, x86_EBX);
+	MoveVariableToX86reg(&RSP_Flags[0].UW, "&RSP_Flags[0].UW", x86_ESI);
+	for (el = 0; el < 8; el++) {
+		del = EleSpec[RSPOpC.rs].B[el];
+		flag = 0x101 << (7 - el);
+		if (del != el || RSPOpC.rt != RSPOpC.rd) {
+			if (del != last) {
+				sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.rt, del);
+				MoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], Reg, x86_ECX);
+				last = del;
+			}
+			sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.rd, el);
+			MoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], Reg, x86_EDX);
+
+			CompX86RegToX86Reg(x86_EDX, x86_ECX);
+			JgeLabel8("jge", 0);
+			jump[0] = (BYTE*)(RecompPos - 1);
+
+			if (bWriteToAccum || bWriteToDest) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_EDX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+			OrConstToX86Reg((flag & 0xFF), x86_EBX);
+
+			JmpLabel8("jmp", 0);
+			jump[1] = (BYTE*)(RecompPos - 1);
+			x86_SetBranch8b(jump[0], RecompPos);
+
+			if (bWriteToAccum || bWriteToDest) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_ECX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+			JneLabel8("jne", 0);
+			jump[2] = (BYTE*)(RecompPos - 1);
+
+			MoveX86RegToX86Reg(x86_ESI, x86_EDI);
+			AndConstToX86Reg(x86_EDI, flag);
+			ShiftRightUnsignImmed(x86_EDI, 8);
+			AndX86RegToX86Reg(x86_EDI, x86_ESI);
+			OrX86RegToX86Reg(x86_EBX, x86_EDI);
+
+			x86_SetBranch8b(jump[2], RecompPos);
+			x86_SetBranch8b(jump[1], RecompPos);
+		} else {
+			MoveX86RegToX86Reg(x86_ESI, x86_EDI);
+			if (bWriteToAccum || bWriteToDest) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_ECX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+			AndConstToX86Reg(x86_EDI, flag);
+			ShiftRightUnsignImmed(x86_EDI, 8);
+			AndX86RegToX86Reg(x86_EDI, x86_ESI);
+			OrX86RegToX86Reg(x86_EBX, x86_EDI);
+		}
+	}
+
+	MoveConstToVariable(0, &RSP_Flags[0].UW, "RSP_Flags[0].UW");
+	MoveX86regToVariable(x86_EBX, &RSP_Flags[1].UW, "RSP_Flags[1].UW");
+
+	if (bWriteToDest != FALSE) {
+		for (el = 0; el < 8; el += 2) {
+			sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+			MoveVariableToX86regHalf(&RSP_ACCUM[el].HW[1], Reg, x86_EAX);
+
+			sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el + 1);
+			MoveVariableToX86regHalf(&RSP_ACCUM[el + 1].HW[1], Reg, x86_ECX);
+
+			sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.sa, el);
+			MoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el], Reg);
+
+			sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.sa, el + 1);
+			MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].HW[el + 1], Reg);
+		}
+	}
 }
 
 void Compile_Vector_VEQ ( void ) {
+	BOOL bWriteToDest = WriteToVectorDest(RSPOpC.sa, CompilePC);
+	BOOL bWriteToAccum = WriteToAccum(Low16BitAccum, CompilePC);
+	DWORD flag;
+	char Reg[256];
+	int count, el, del, last = -1;
+
+#ifndef CompileVeq
 	Cheat_r4300iOpcode(RSP_Vector_VEQ,"RSP_Vector_VEQ");
+	return;
+#endif
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+
+	MoveZxVariableToX86regHalf(&RSP_Flags[0].UHW[1], "&RSP_Flags[0].UHW[1]", x86_EBX);
+	XorConstToX86Reg(x86_EBX, 0xFFFF);
+	for (el = 0; el < 8; el++) {
+		del = EleSpec[RSPOpC.rs].B[el];
+		flag = (0x101 << (7 - el)) ^ 0xFFFF;
+		if (del != el || RSPOpC.rt != RSPOpC.rd) {
+			if (del != last) {
+				sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.rt, del);
+				MoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], Reg, x86_ECX);
+				last = del;
+			}
+
+			sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.rd, el);
+			MoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], Reg, x86_EDX);
+
+			if (bWriteToAccum) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_ECX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+
+			SubX86RegToX86Reg(x86_EDX, x86_ECX);
+			CompConstToX86reg(x86_EDX, 1);
+			SbbX86RegToX86Reg(x86_EDX, x86_EDX);
+			OrConstToX86Reg(flag, x86_EDX);
+			AndX86RegToX86Reg(x86_EBX, x86_EDX);
+		} else {
+			if (bWriteToAccum) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_ECX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+		}
+	}
+
+	MoveConstToVariable(0, &RSP_Flags[0].UW, "RSP_Flags[0].UW");
+	MoveX86regToVariable(x86_EBX, &RSP_Flags[1].UW, "RSP_Flags[1].UW");
+
+	if (bWriteToDest != FALSE) {
+		for (count = 0; count < 8; count++) {
+			el = EleSpec[RSPOpC.rs].B[count];
+
+			if (el != last) {
+				sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.rt, el);
+				MoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], Reg, x86_EDX);
+				last = el;
+			}
+
+			sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.sa, count);
+			MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.sa].HW[count], Reg);
+		}
+	}
 }
 
 void Compile_Vector_VNE ( void ) {
+	BOOL bWriteToDest = WriteToVectorDest(RSPOpC.sa, CompilePC);
+	BOOL bWriteToAccum = WriteToAccum(Low16BitAccum, CompilePC);
+	DWORD flag;
+	char Reg[256];
+	int el, del, last = -1;
+
+#ifndef CompileVne
 	Cheat_r4300iOpcode(RSP_Vector_VNE,"RSP_Vector_VNE");
+	return;
+#endif
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+
+	MoveZxVariableToX86regHalf(&RSP_Flags[0].UHW[1], "&RSP_Flags[0].UHW[1]", x86_EBX);
+
+	for (el = 0; el < 8; el++) {
+		del = EleSpec[RSPOpC.rs].B[el];
+		flag = 0x101 << (7 - el);
+		if (del != el || RSPOpC.rt != RSPOpC.rd) {
+			sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.rd, el);
+			MoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], Reg, x86_EDX);
+
+			if (del != last) {
+				sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.rt, del);
+				MoveZxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], Reg, x86_ECX);
+				last = del;
+			}
+			if (bWriteToAccum) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_EDX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+			
+			SubX86RegToX86Reg(x86_EDX, x86_ECX);
+			NegateX86reg(x86_EDX);
+			SbbX86RegToX86Reg(x86_EDX, x86_EDX);
+			AndConstToX86Reg(x86_EDX, flag);
+			OrX86RegToX86Reg(x86_EBX, x86_EDX);
+		} else {
+			if (bWriteToAccum) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_EDX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+		}
+	}
+
+	MoveConstToVariable(0, &RSP_Flags[0].UW, "RSP_Flags[0].UW");
+	MoveX86regToVariable(x86_EBX, &RSP_Flags[1].UW, "RSP_Flags[1].UW");
+
+	if (bWriteToDest != FALSE) {
+		for (el = 0; el < 4; el++) {
+			sprintf(Reg, "RSP_Vect[%i].W[%i]", RSPOpC.rd, el);
+			MoveVariableToX86reg(&RSP_Vect[RSPOpC.rd].W[el], Reg, x86_EDX);
+
+			sprintf(Reg, "RSP_Vect[%i].W[%i]", RSPOpC.sa, el);
+			MoveX86regToVariable(x86_EDX, &RSP_Vect[RSPOpC.sa].W[el], Reg);
+		}
+	}
 }
 
 BOOL Compile_Vector_VGE_MMX ( void ) {
@@ -3769,7 +4109,97 @@ void Compile_Vector_VGE ( void ) {
 	}
 	#endif
 */
+	BOOL bWriteToDest  = WriteToVectorDest(RSPOpC.sa, CompilePC);
+	BOOL bWriteToAccum = WriteToAccum(Low16BitAccum, CompilePC);
+	BYTE *jump[3];
+	DWORD flag;
+	char Reg[256];
+	int el, del, last = -1;
+
+#ifndef CompileVge
 	Cheat_r4300iOpcode(RSP_Vector_VGE,"RSP_Vector_VGE");
+	return;
+#endif
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+
+	XorX86RegToX86Reg(x86_EBX, x86_EBX);
+	MoveVariableToX86reg(&RSP_Flags[0].UW, "&RSP_Flags[0].UW", x86_ESI);
+	for (el = 0; el < 8; el++) {
+		del = EleSpec[RSPOpC.rs].B[el];
+		flag = 0x101 << (7 - el);
+		if (del != el || RSPOpC.rt != RSPOpC.rd) {
+			if (del != last) {
+				sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.rt, del);
+				MoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[del], Reg, x86_ECX);
+				last = del;
+			}
+			sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.rd, el);
+			MoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rd].HW[el], Reg, x86_EDX);
+
+			CompX86RegToX86Reg(x86_EDX, x86_ECX);
+			JleLabel8("jle", 0);
+			jump[0] = (BYTE*)(RecompPos - 1);
+
+			if (bWriteToAccum || bWriteToDest) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_EDX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+			OrConstToX86Reg((flag & 0xFF), x86_EBX);
+
+			JmpLabel8("jmp", 0);
+			jump[1] = (BYTE*)(RecompPos - 1);\
+			x86_SetBranch8b(jump[0], RecompPos);
+
+			if (bWriteToAccum || bWriteToDest) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_ECX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+
+			JneLabel8("jne", 0);
+			jump[2] = (BYTE*)(RecompPos - 1);
+
+			MoveX86RegToX86Reg(x86_ESI, x86_EDI);
+			AndConstToX86Reg(x86_EDI, flag);
+			SubConstFromX86Reg(x86_EDI, flag);
+			ShiftRightSignImmed(x86_EDI, 31);
+			AndConstToX86Reg(x86_EDI, (flag & 0xFF));
+			OrX86RegToX86Reg(x86_EBX, x86_EDI);
+
+			x86_SetBranch8b(jump[1], RecompPos);
+			x86_SetBranch8b(jump[2], RecompPos);
+		} else {
+			MoveX86RegToX86Reg(x86_ESI, x86_EDI);
+			if (bWriteToAccum || bWriteToDest) {
+				sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el);
+				MoveX86regHalfToVariable(x86_ECX, &RSP_ACCUM[el].HW[1], Reg);
+			}
+			AndConstToX86Reg(x86_EDI, flag);
+			SubConstFromX86Reg(x86_EDI, flag);
+			ShiftRightSignImmed(x86_EDI, 31);
+			AndConstToX86Reg(x86_EDI, (flag & 0xFF));
+			OrX86RegToX86Reg(x86_EBX, x86_EDI);
+		}
+	}
+
+	MoveConstToVariable(0, &RSP_Flags[0].UW, "RSP_Flags[0].UW");
+	MoveX86regToVariable(x86_EBX, &RSP_Flags[1].UW, "RSP_Flags[1].UW");
+
+	if (bWriteToDest != FALSE) {
+		for (el = 0; el < 8; el += 2) {
+			sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el + 0);
+			MoveVariableToX86regHalf(&RSP_ACCUM[el].HW[1], Reg, x86_EAX);
+
+			sprintf(Reg, "RSP_ACCUM[%i].HW[1]", el + 1);
+			MoveVariableToX86regHalf(&RSP_ACCUM[el + 1].HW[1], Reg, x86_ECX);
+
+			sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.sa, el + 0);
+			MoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el + 0], Reg);
+
+			sprintf(Reg, "RSP_Vect[%i].HW[%i]", RSPOpC.sa, el + 1);
+			MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].HW[el + 1], Reg);
+		}
+	}
 }
 
 void Compile_Vector_VCL ( void ) {
@@ -4353,16 +4783,147 @@ void Compile_Vector_VNXOR ( void ) {
 }
 
 void Compile_Vector_VRCP ( void ) {
+	char Reg[256];
+	int count, el, last;
+	BOOL bWriteToAccum = WriteToAccum(Low16BitAccum, CompilePC);
+	DWORD *end = NULL;
+	
+#ifndef CompileVrcp
 	Cheat_r4300iOpcode(RSP_Vector_VRCP,"RSP_Vector_VRCP");
+	return;
+#endif
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+
+	el = EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)];
+	sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.rt, el);
+	MoveSxVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[el], Reg, x86_ESI);
+	MoveConstToX86reg(0x7FFFFFFF, x86_EAX);
+	TestX86RegToX86Reg(x86_ESI, x86_ESI);
+	MoveX86RegToX86Reg(x86_ESI, x86_EDI);
+	JeLabel32("Done", 0);
+	end = (DWORD*)(RecompPos - 4);
+
+	MoveConstToX86reg(0xFFC0, x86_EBX);
+	ShiftRightSignImmed(x86_ESI, 31);
+	XorX86RegToX86Reg(x86_EDX, x86_EDX);
+	XorX86RegToX86Reg(x86_EDI, x86_ESI);
+	SubX86RegToX86Reg(x86_EDI, x86_ESI);
+
+	BsrX86RegToX86Reg(x86_ECX, x86_EDI);
+	XorConstToX86Reg(x86_ECX, 15);
+	ShiftRightUnsign(x86_EBX);
+	AndX86RegToX86Reg(x86_EDI, x86_EBX);
+
+	idivX86reg(x86_EDI);
+
+	MoveConstToX86reg(0xFFFF8000, x86_EBX);
+	BsrX86RegToX86Reg(x86_ECX, x86_EAX);
+	XorConstToX86Reg(x86_ECX, 31);
+	ShiftRightUnsign(x86_EBX);
+	AndX86RegToX86Reg(x86_EAX, x86_EBX);
+	XorX86RegToX86Reg(x86_EAX, x86_ESI);
+
+	x86_SetBranch32b(end, RecompPos);
+
+	if (bWriteToAccum != FALSE){
+		last = -1;
+		for (count = 0; count < 8; count++) {
+			el = EleSpec[RSPOpC.rs].B[count];
+
+			if (el != last) {
+				sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.rt, el);
+				MoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], Reg, x86_ECX);
+				last = el;
+			}
+
+			sprintf(Reg, "RSP_ACCUM[%i].HW[1]", count);
+			MoveX86regHalfToVariable(x86_ECX, &RSP_ACCUM[count].HW[1], Reg);
+		}
+	}
+
+	el = 7 - (RSPOpC.rd & 0x7);
+	sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.sa, el);
+	MoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el], Reg);
+	MoveX86regToVariable(x86_EAX, &RecpResult.W, "RecpResult.W");
 }
 
 void Compile_Vector_VRCPL ( void ) {
+	char Reg[256];
+	int count, el, last;
+	BOOL bWriteToAccum = WriteToAccum(Low16BitAccum, CompilePC);
+	DWORD *end = NULL;
+
+#ifndef CompileVrcpl
 	Cheat_r4300iOpcode(RSP_Vector_VRCPL,"RSP_Vector_VRCPL");
+	return;
+#endif
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+
+	el = EleSpec[RSPOpC.rs].B[(RSPOpC.rd & 0x7)];
+	sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.rt, el);
+	MoveVariableToX86reg(&Recp.W, "Recp.W", x86_ESI);
+	OrVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].HW[el], Reg, x86_ESI);
+	
+	MoveConstToX86reg(0x7FFFFFFF, x86_EAX);
+	TestX86RegToX86Reg(x86_ESI, x86_ESI);
+	MoveX86RegToX86Reg(x86_ESI, x86_EDI);
+	JeLabel32("Done", 0);
+	end = (DWORD*)(RecompPos - 4);
+
+	MoveConstToX86reg(0xFFC00000, x86_EBX);
+	ShiftRightSignImmed(x86_ESI, 31);
+	MoveX86RegToX86Reg(x86_EDI, x86_ECX);
+	MoveZxX86RegHalfToX86Reg(x86_EDI, x86_EDX);
+	OrConstToX86Reg(0xFFFF, x86_ECX);
+	ShiftRightUnsignImmed(x86_EDX, 15);
+
+	XorX86RegToX86Reg(x86_EDI, x86_ESI);
+	AddX86RegToX86Reg(x86_ECX, x86_EDX);
+	AdcConstToX86reg(0, x86_EDI);
+	XorX86RegToX86Reg(x86_EDX, x86_EDX);
+
+	BsrX86RegToX86Reg(x86_ECX, x86_EDI);
+	XorConstToX86Reg(x86_ECX, 31);
+	ShiftRightUnsign(x86_EBX);
+	AndX86RegToX86Reg(x86_EDI, x86_EBX);
+
+	idivX86reg(x86_EDI);
+	MoveConstToX86reg(0xFFFF8000, x86_EBX);
+	BsrX86RegToX86Reg(x86_ECX, x86_EAX);
+	XorConstToX86Reg(x86_ECX, 31);
+	ShiftRightUnsign(x86_EBX);
+	AndX86RegToX86Reg(x86_EAX, x86_EBX);
+	XorX86RegToX86Reg(x86_EAX, x86_ESI);
+
+	x86_SetBranch32b(end, RecompPos);
+
+	if (bWriteToAccum != FALSE){
+		last = -1;
+		for (count = 0; count < 8; count++) {
+			el = EleSpec[RSPOpC.rs].B[count];
+
+			if (el != last) {
+				sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.rt, el);
+				MoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], Reg, x86_ECX);
+				last = el;
+			}
+
+			sprintf(Reg, "RSP_ACCUM[%i].HW[1]", count);
+			MoveX86regHalfToVariable(x86_ECX, &RSP_ACCUM[count].HW[1], Reg);
+		}
+	}
+
+	el = 7 - (RSPOpC.rd & 0x7);
+	sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.sa, el);
+	MoveX86regHalfToVariable(x86_EAX, &RSP_Vect[RSPOpC.sa].HW[el], Reg);
+	MoveX86regToVariable(x86_EAX, &RecpResult.W, "RecpResult.W");
 }
 
 void Compile_Vector_VRCPH ( void ) {
 	char Reg[256];
-	int count, el, last = -1;
+	int count, el, last;
 	BOOL bWriteToAccum = WriteToAccum(Low16BitAccum, CompilePC);
 
 	#ifndef CompileVrcph
@@ -4376,27 +4937,27 @@ void Compile_Vector_VRCPH ( void ) {
 	MoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], Reg, x86_EDX);
 	MoveX86regHalfToVariable(x86_EDX, &Recp.UHW[1], "Recp.UHW[1]");
 	
-	MoveConstHalfToVariable(0, &Recp.UHW[0], "Recp.UHW[0]");
-	
 	MoveVariableToX86regHalf(&RecpResult.UHW[1], "RecpResult.UHW[1]", x86_ECX);
+	
+	if (bWriteToAccum != FALSE) {
+		last = -1;
+		for (count = 0; count < 8; count++) {
+			el = EleSpec[RSPOpC.rs].B[count];
+
+			if (el != last) {
+				sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.rt, el);
+				MoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], Reg, x86_EAX);
+				last = el;
+			}
+
+			sprintf(Reg, "RSP_ACCUM[%i].HW[1]", count);
+			MoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[count].HW[1], Reg);
+		}
+	}
+	
 	el = 7 - (RSPOpC.rd & 0x7);
 	sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.sa, el);
 	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].UHW[el], Reg);
-
-	if (bWriteToAccum == FALSE) return;
-
-	for (count = 0; count < 8; count++) {
-		el = EleSpec[RSPOpC.rs].B[count];
-
-		if (el != last) {
-			sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.rt, el);
-			MoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], Reg, x86_EAX);
-			last = el;
-		}
-
-		sprintf(Reg, "RSP_ACCUM[%i].HW[1]", count);
-		MoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[count].HW[1], Reg);
-	}
 }
 
 void Compile_Vector_VMOV ( void ) {
@@ -4441,7 +5002,8 @@ void Compile_Vector_VRSQL ( void ) {
 
 void Compile_Vector_VRSQH ( void ) {
 	char Reg[256];
-	int count, el;
+	int count, el, last;
+	BOOL bWriteToAccum = WriteToAccum(Low16BitAccum, CompilePC);
 
 	#ifndef CompileVrsqh
 	Cheat_r4300iOpcode(RSP_Vector_VRSQH,"RSP_Vector_VRSQH"); return;
@@ -4455,18 +5017,26 @@ void Compile_Vector_VRSQH ( void ) {
 	MoveX86regHalfToVariable(x86_EDX, &SQroot.UHW[1], "SQroot.UHW[1]");
 
 	MoveVariableToX86regHalf(&SQrootResult.UHW[1], "SQrootResult.UHW[1]", x86_ECX);
+	
+	if (bWriteToAccum != FALSE) {
+		last = -1;
+		for (count = 0; count < 8; count++) {
+			el = EleSpec[RSPOpC.rs].B[count];
+			
+			if(el != last){
+				sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.rt, el);
+				MoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], Reg, x86_EAX);
+				last = el;
+			}
+
+			sprintf(Reg, "RSP_ACCUM[%i].HW[1]", count);
+			MoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[count].HW[1], Reg);
+		}
+	}
+	
 	el = 7 - (RSPOpC.rd & 0x7);
 	sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.sa, el);
 	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.sa].UHW[el], Reg);
-
-	for (count = 0; count < 8; count++) {
-		el = EleSpec[RSPOpC.rs].B[count];
-		sprintf(Reg, "RSP_Vect[%i].UHW[%i]", RSPOpC.rt, el);
-		MoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].UHW[el], Reg, x86_EAX);
-
-		sprintf(Reg, "RSP_ACCUM[%i].HW[1]", count);
-		MoveX86regHalfToVariable(x86_EAX, &RSP_ACCUM[count].HW[1], Reg);
-	}
 }
 
 void Compile_Vector_VNOOP ( void ) {
@@ -4476,7 +5046,24 @@ void Compile_Vector_VNOOP ( void ) {
 /************************** lc2 functions **************************/
 
 void Compile_Opcode_LBV ( void ) {
-	Cheat_r4300iOpcode(RSP_Opcode_LBV,"RSP_Opcode_LBV");
+	char Reg[256];
+	int offset = RSPOpC.voffset << 0;
+
+	#ifndef CompileLbv
+	Cheat_r4300iOpcode(RSP_Opcode_LBV,"RSP_Opcode_LBV"); return;
+	#endif
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+
+	MoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, GPR_Name(RSPOpC.base), x86_EBX);
+	if (offset != 0)
+		AddConstToX86Reg(x86_EBX, offset);
+
+	AndConstToX86Reg(x86_EBX, 0x0FFF);
+	XorConstToX86Reg(x86_EBX, 3);
+	MoveN64MemToX86regByte(x86_ECX, x86_EBX);
+	sprintf(Reg, "RSP_Vect[%i].B[%i]", RSPOpC.rt, 15 - RSPOpC.del);
+	MoveX86regByteToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[15 - RSPOpC.del], Reg);
 }
 
 void Compile_Opcode_LSV ( void ) {
@@ -4644,7 +5231,7 @@ void Compile_Opcode_LDV ( void ) {
 
 		sprintf(Reg, "RSP_Vect[%i].B[%i]", RSPOpC.rt, 16 - RSPOpC.del - 4);
 		MoveX86regToVariable(x86_EAX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4], Reg);
-		if(RSPOpC.del != 12){
+		if (RSPOpC.del != 12){
 			sprintf(Reg, "RSP_Vect[%i].B[%i]", RSPOpC.rt, 16 - RSPOpC.del - 8);
 			MoveX86regToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 8], Reg);
 		}
@@ -4666,7 +5253,7 @@ void Compile_Opcode_LDV ( void ) {
 	sprintf(Reg, "RSP_Vect[%i].UB[%i]", RSPOpC.rt, 15 - RSPOpC.del);
 	MoveOffsetToX86reg((DWORD)&RSP_Vect[RSPOpC.rt].UB[15 - RSPOpC.del], Reg, x86_EDI);
 	length = 8;
-	if(RSPOpC.del == 12){
+	if (RSPOpC.del == 12){
 		length = 4;
 	}
 	MoveConstToX86reg(length, x86_ECX);
@@ -4681,7 +5268,7 @@ void Compile_Opcode_LDV ( void ) {
       jne $Loop */
 
 	LoopEntry = RecompPos;
-	CPU_Message("   Loop:");	
+	CPU_Message("   Loop:");
 	MoveX86RegToX86Reg(x86_EBX, x86_EAX);
 	XorConstToX86Reg(x86_EAX, 3);
 	MoveN64MemToX86regByte(x86_EDX, x86_EAX);
@@ -4702,7 +5289,7 @@ void Compile_Opcode_LDV ( void ) {
 	/* Because of byte swapping this swizzle works nicely */
 	sprintf(Reg, "RSP_Vect[%i].B[%i]", RSPOpC.rt, 16 - RSPOpC.del - 4);
 	MoveX86regToVariable(x86_EAX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 4], Reg);
-	if(RSPOpC.del != 12){
+	if (RSPOpC.del != 12){
 		sprintf(Reg, "RSP_Vect[%i].B[%i]", RSPOpC.rt, 16 - RSPOpC.del - 8);
 		MoveX86regToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].B[16 - RSPOpC.del - 8], Reg);
 	}
@@ -4870,9 +5457,9 @@ void Compile_Opcode_LRV ( void ) {
 	MoveN64MemToX86regHalf(x86_EDX, x86_ESI);
 	MoveX86regHalfToX86regPointer(x86_EDX, x86_EAX);
 
-	AddConstToX86Reg(x86_EBX, 2);	/* Dmem pointer	*/
-	SubConstFromX86Reg(x86_EAX, 2);	/* Vector pointer */	
-	DecX86reg(x86_ECX);				/* Loop counter	*/
+	AddConstToX86Reg(x86_EBX, 2);   /* Dmem pointer */
+	SubConstFromX86Reg(x86_EAX, 2); /* Vector pointer */
+	DecX86reg(x86_ECX);             /* Loop counter */
 	JneLabel8("Loop", 0);
 	x86_SetBranch8b(RecompPos - 1, Loop);
 
@@ -4885,16 +5472,331 @@ void Compile_Opcode_LRV ( void ) {
 }
 
 void Compile_Opcode_LPV ( void ) {
-	Cheat_r4300iOpcode(RSP_Opcode_LPV,"RSP_Opcode_LPV");
+	char Reg[256];
+	int offset = (RSPOpC.voffset << 3);
+
+	#ifndef CompileLpv
+	Cheat_r4300iOpcode(RSP_Opcode_LPV,"RSP_Opcode_LPV"); return;
+	#endif
+	
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+	
+	MoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, GPR_Name(RSPOpC.base), x86_EBX);
+	if (offset != 0) {
+		AddConstToX86Reg(x86_EBX, offset);
+	}
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+	MoveX86RegToX86Reg(x86_EBX, x86_EDI);
+	
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 0) & 0xF );			
+	AddConstToX86Reg(x86_EDI, (0x10 - RSPOpC.del + 1) & 0xF );
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EDI, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EDI, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EDI);
+
+	ShiftLeftSignImmed(x86_ECX, 8);
+	ShiftLeftSignImmed(x86_EDX, 8);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[7]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[7], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[6]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[6], Reg);
+
+
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+	MoveX86RegToX86Reg(x86_EBX, x86_EDI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 2) & 0xF );			
+	AddConstToX86Reg(x86_EDI, (0x10 - RSPOpC.del + 3) & 0xF );
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EDI, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EDI, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EDI);
+
+	ShiftLeftSignImmed(x86_ECX, 8);
+	ShiftLeftSignImmed(x86_EDX, 8);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[5]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[5], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[4]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[4], Reg);
+
+
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+	MoveX86RegToX86Reg(x86_EBX, x86_EDI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 4) & 0xF );			
+	AddConstToX86Reg(x86_EDI, (0x10 - RSPOpC.del + 5) & 0xF );
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EDI, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EDI, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EDI);
+
+	ShiftLeftSignImmed(x86_ECX, 8);
+	ShiftLeftSignImmed(x86_EDX, 8);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[3]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[3], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[2]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[2], Reg);
+
+
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 6) & 0xF );			
+	AddConstToX86Reg(x86_EBX, (0x10 - RSPOpC.del + 7) & 0xF );
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EBX, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EBX, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EBX);
+
+	ShiftLeftSignImmed(x86_ECX, 8);
+	ShiftLeftSignImmed(x86_EDX, 8);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[1]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[1], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[0]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[0], Reg);
 }
 
 void Compile_Opcode_LUV ( void ) {
-	Cheat_r4300iOpcode(RSP_Opcode_LUV,"RSP_Opcode_LUV");
+	char Reg[256];
+	int offset = (RSPOpC.voffset << 3);
+
+	#ifndef CompileLuv
+	Cheat_r4300iOpcode(RSP_Opcode_LUV,"RSP_Opcode_LUV"); return;
+	#endif
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+
+	MoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, GPR_Name(RSPOpC.base), x86_EBX);
+	if (offset != 0) {
+		AddConstToX86Reg(x86_EBX, offset);
+	}
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+	MoveX86RegToX86Reg(x86_EBX, x86_EDI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 0) & 0xF );			
+	AddConstToX86Reg(x86_EDI, (0x10 - RSPOpC.del + 1) & 0xF);
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EDI, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EDI, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EDI);
+
+	ShiftLeftSignImmed(x86_ECX, 7);
+	ShiftLeftSignImmed(x86_EDX, 7);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[7]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[7], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[6]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[6], Reg);
+
+
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+	MoveX86RegToX86Reg(x86_EBX, x86_EDI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 2) & 0xF);
+	AddConstToX86Reg(x86_EDI, (0x10 - RSPOpC.del + 3) & 0xF);
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EDI, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EDI, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EDI);
+
+	ShiftLeftSignImmed(x86_ECX, 7);
+	ShiftLeftSignImmed(x86_EDX, 7);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[5]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[5], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[4]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[4], Reg);
+
+
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+	MoveX86RegToX86Reg(x86_EBX, x86_EDI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 4) & 0xF);
+	AddConstToX86Reg(x86_EDI, (0x10 - RSPOpC.del + 5) & 0xF);
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EDI, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EDI, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EDI);
+
+	ShiftLeftSignImmed(x86_ECX, 7);
+	ShiftLeftSignImmed(x86_EDX, 7);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[3]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[3], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[2]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[2], Reg);
+
+
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 6) & 0xF);
+	AddConstToX86Reg(x86_EBX, (0x10 - RSPOpC.del + 7) & 0xF);
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EBX, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EBX, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EBX);
+
+	ShiftLeftSignImmed(x86_ECX, 7);
+	ShiftLeftSignImmed(x86_EDX, 7);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[1]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[1], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[0]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[0], Reg);
 }
 
 
 void Compile_Opcode_LHV ( void ) {
-	Cheat_r4300iOpcode(RSP_Opcode_LHV,"RSP_Opcode_LHV");
+	char Reg[256];
+	int offset = (RSPOpC.voffset << 4);
+
+	#ifndef CompileLhv
+	Cheat_r4300iOpcode(RSP_Opcode_LHV,"RSP_Opcode_LHV"); return;
+	#endif
+
+	CPU_Message("  %X %s", CompilePC, RSPOpcodeName(RSPOpC.Hex, CompilePC));
+
+	MoveVariableToX86reg(&RSP_GPR[RSPOpC.base].UW, GPR_Name(RSPOpC.base), x86_EBX);
+	if (offset != 0) {
+		AddConstToX86Reg(x86_EBX, offset);
+	}
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+	MoveX86RegToX86Reg(x86_EBX, x86_EDI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 0) & 0xF);
+	AddConstToX86Reg(x86_EDI, (0x10 - RSPOpC.del + 2) & 0xF);
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EDI, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EDI, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EDI);
+
+	ShiftLeftSignImmed(x86_ECX, 7);
+	ShiftLeftSignImmed(x86_EDX, 7);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[7]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[7], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[6]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[6], Reg);
+
+
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+	MoveX86RegToX86Reg(x86_EBX, x86_EDI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 4) & 0xF);
+	AddConstToX86Reg(x86_EDI, (0x10 - RSPOpC.del + 6) & 0xF);
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EDI, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EDI, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EDI);
+
+	ShiftLeftSignImmed(x86_ECX, 7);
+	ShiftLeftSignImmed(x86_EDX, 7);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[5]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[5], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[4]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[4], Reg);
+
+
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+	MoveX86RegToX86Reg(x86_EBX, x86_EDI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 8) & 0xF);
+	AddConstToX86Reg(x86_EDI, (0x10 - RSPOpC.del + 10) & 0xF);
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EDI, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EDI, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EDI);
+
+	ShiftLeftSignImmed(x86_ECX, 7);
+	ShiftLeftSignImmed(x86_EDX, 7);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[3]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[3], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[2]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[2], Reg);
+
+
+	MoveX86RegToX86Reg(x86_EBX, x86_ESI);
+
+	AddConstToX86Reg(x86_ESI, (0x10 - RSPOpC.del + 12) & 0xF);
+	AddConstToX86Reg(x86_EBX, (0x10 - RSPOpC.del + 14) & 0xF);
+
+	XorConstToX86Reg(x86_ESI, 3);
+	XorConstToX86Reg(x86_EBX, 3);
+
+	AndConstToX86Reg(x86_ESI, 0x0fff);
+	AndConstToX86Reg(x86_EBX, 0x0fff);
+
+	MoveZxN64MemToX86regByte(x86_ECX, x86_ESI);
+	MoveZxN64MemToX86regByte(x86_EDX, x86_EBX);
+
+	ShiftLeftSignImmed(x86_ECX, 7);
+	ShiftLeftSignImmed(x86_EDX, 7);
+
+	sprintf(Reg, "RSP_Vect[%i].HW[1]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_ECX, &RSP_Vect[RSPOpC.rt].HW[1], Reg);
+	sprintf(Reg, "RSP_Vect[%i].HW[0]", RSPOpC.rt);
+	MoveX86regHalfToVariable(x86_EDX, &RSP_Vect[RSPOpC.rt].HW[0], Reg);
 }
 
 
@@ -4957,7 +5859,7 @@ void Compile_Opcode_SSV ( void ) {
 		sprintf(Reg, "RSP_Vect[%i].B[%i]", RSPOpC.rt, 15 - (RSPOpC.del + 1));
 		MoveVariableToX86regHalf(&RSP_Vect[RSPOpC.rt].B[15 - (RSPOpC.del + 1)], Reg, x86_ECX);
 		XorConstToX86Reg(x86_EBX, 2);
-		MoveX86regHalfToN64Mem(x86_ECX, x86_EBX);		
+		MoveX86regHalfToN64Mem(x86_ECX, x86_EBX);
 	} else {
 		LeaSourceAndOffset(x86_EAX, x86_EBX, 1);
 		XorConstToX86Reg(x86_EBX, 3);
@@ -5280,7 +6182,7 @@ void Compile_Opcode_SWV ( void ) {
 /************************** Other functions **************************/
 
 void Compile_UnknownOpcode (void) {
-	CPU_Message("  %X Unhandled Opcode: %s",CompilePC, RSPOpcodeName(RSPOpC.Hex,CompilePC) );	
+	CPU_Message("  %X Unhandled Opcode: %s",CompilePC, RSPOpcodeName(RSPOpC.Hex,CompilePC) );
 	NextInstruction = FINISH_BLOCK;
 	MoveConstToVariable(CompilePC,PrgCount,"RSP PC");
 	MoveConstToVariable(RSPOpC.Hex,&RSPOpC.Hex, "RSPOpC.Hex");
diff --git a/Source/RSP/Recompiler Sections.c b/Source/RSP/Recompiler Sections.c
index 5a15b8363..8a6558285 100644
--- a/Source/RSP/Recompiler Sections.c	
+++ b/Source/RSP/Recompiler Sections.c	
@@ -748,7 +748,7 @@ void RSP_Sections_VMACF ( OPCODE RspOp, DWORD AccumStyle ) {
 
 /******************** Microcode Sections *********************/
 
-static DWORD Section_000_VMADN;	/* Yah i know, but leave it */
+static DWORD Section_000_VMADN; /* Yah i know, but leave it */
 
 BOOL Check_Section_000(void) {
 	DWORD i;
@@ -809,7 +809,7 @@ void Compile_Section_000(void) {
 	CPU_Message("  %X %s",CompilePC+0x00,RSPOpcodeName(vmudn.Hex,CompilePC + 0x00));
 	if (LogRDP){
 		char str[40];
-		sprintf(str,"%X",CompilePC);		
+		sprintf(str,"%X",CompilePC);
 		PushImm32(str,CompilePC);
 		Call_Direct(RDP_LogLoc,"RDP_LogLoc");
 		AddConstToX86Reg(x86_ESP, 4);
@@ -821,7 +821,7 @@ void Compile_Section_000(void) {
 
 		if (LogRDP){
 			char str[40];
-			sprintf(str,"%X",CompilePC+0x04+(i*4));		
+			sprintf(str,"%X",CompilePC+0x04+(i*4));
 			PushImm32(str,CompilePC+0x04+(i*4));
 			Call_Direct(RDP_LogLoc,"RDP_LogLoc");
 			AddConstToX86Reg(x86_ESP, 4);
@@ -977,7 +977,7 @@ BOOL Check_Section_002 ( void ) {
 		return FALSE;
 	}
 	if ((op[0].rs & 0xF) < 8) {
-		return FALSE; 
+		return FALSE;
 	}
 
 	for (Count = 1; Count < 10; Count++) {
@@ -1009,13 +1009,13 @@ void Compile_Section_002 ( void ) {
 
 	OPCODE vmudh, vsaw;
 
-	CPU_Message("Compiling: %X to ..., RSP Optimization $002", CompilePC);	
+	CPU_Message("Compiling: %X to ..., RSP Optimization $002", CompilePC);
 	for (Count = 0; Count < 0xC; Count++) {
 		RSP_LW_IMEM(CompilePC + (Count * 0x04), &op[Count].Hex);
 		CPU_Message("  %X %s",CompilePC+(Count*0x04),RSPOpcodeName(op[Count].Hex,CompilePC + (Count*0x04)));
 		if (LogRDP){
 			char str[40];
-			sprintf(str,"%X",CompilePC+(Count*0x04));		
+			sprintf(str,"%X",CompilePC+(Count*0x04));
 			PushImm32(str,CompilePC+(Count*0x04));
 			Call_Direct(RDP_LogLoc,"RDP_LogLoc");
 			AddConstToX86Reg(x86_ESP, 4);
@@ -1079,10 +1079,10 @@ static void resampler_hle() {
 	UDWORD accum, initial;
 	DWORD const2 = (DWORD)RSP_Vect[18].UHW[4 ^ 7];
 	__int64 const3 = (__int64)((int)RSP_Vect[30].HW[0 ^ 7]) << 16;
-	int i;	
+	int i;
 
 	// VMUDM $v23, $v31, $v23 [7]
-	initial.DW = (__int64)((DWORD)RSP_Vect[23].UHW[7 ^ 7]) << 16;	
+	initial.DW = (__int64)((DWORD)RSP_Vect[23].UHW[7 ^ 7]) << 16;
 	// VMADH $v23, $v31, $v22 [7]
 	initial.W[1] += (int)RSP_Vect[22].HW[7 ^ 7];
 
@@ -1112,7 +1112,7 @@ static void resampler_hle() {
 }
 
 void Compile_Section_003 ( void ) {
-	CPU_Message("Compiling: %X to ..., RSP Optimization $003", CompilePC);	
+	CPU_Message("Compiling: %X to ..., RSP Optimization $003", CompilePC);
 	Call_Direct(resampler_hle, "Resampler_HLE");
 	CompilePC += 4 * sizeof(OPCODE);
 }
diff --git a/Source/RSP/Types.h b/Source/RSP/Types.h
index 16e8af390..deaa101f0 100644
--- a/Source/RSP/Types.h
+++ b/Source/RSP/Types.h
@@ -27,23 +27,7 @@
 #ifndef __Types_h
 #define __Types_h
 
-/*
- * Some versions of Microsoft Visual C/++ compilers before Visual Studio 2010
- * have <stdint.h> removed in favor of these nonstandard built-in types:
- */
-#if defined(_MSC_VER) && (_MSC_VER < 1600)
-typedef signed __int8           int8_t;
-typedef signed __int16          int16_t;
-typedef signed __int32          int32_t;
-typedef signed __int64          int64_t;
-
-typedef unsigned __int8         uint8_t;
-typedef unsigned __int16        uint16_t;
-typedef unsigned __int32        uint32_t;
-typedef unsigned __int64        uint64_t;
-#else
-#include <stdint.h>
-#endif
+#include <common/stdtypes.h>
 
 /*
  * pointer to RSP operation code functions or "func"
diff --git a/Source/RSP/Version.h b/Source/RSP/Version.h
index e5c65881d..909f9602b 100644
--- a/Source/RSP/Version.h
+++ b/Source/RSP/Version.h
@@ -30,7 +30,7 @@
 #define VERSION_MAJOR               1
 #define VERSION_MINOR               7
 #define VERSION_REVISION            0
-#define VERSION_BUILD               13
+#define VERSION_BUILD               9999
 
 #define VER_FILE_DESCRIPTION_STR    "RSP emulation Plugin"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
diff --git a/Source/RSP/X86.c b/Source/RSP/X86.c
index 7eff6c39e..3abdf6c0e 100644
--- a/Source/RSP/X86.c
+++ b/Source/RSP/X86.c
@@ -95,11 +95,11 @@ void AdcX86regToVariable(int x86reg, void * Variable, char * VariableName) {
 	case x86_ESI: PUTDST16(RecompPos,0x3511); break;
 	case x86_EDI: PUTDST16(RecompPos,0x3D11); break;
 	case x86_ESP: PUTDST16(RecompPos,0x2511); break;
-	case x86_EBP: PUTDST16(RecompPos,0x2D11); break;	
+	case x86_EBP: PUTDST16(RecompPos,0x2D11); break;
 	default:
 		DisplayError("AddVariableToX86reg\nUnknown x86 Register");
 	}
-    PUTDST32(RecompPos,Variable); 
+    PUTDST32(RecompPos,Variable);
 }
 
 void AdcX86regHalfToVariable(int x86reg, void * Variable, char * VariableName) {
@@ -114,11 +114,11 @@ void AdcX86regHalfToVariable(int x86reg, void * Variable, char * VariableName) {
 	case x86_ESI: PUTDST16(RecompPos,0x3511); break;
 	case x86_EDI: PUTDST16(RecompPos,0x3D11); break;
 	case x86_ESP: PUTDST16(RecompPos,0x2511); break;
-	case x86_EBP: PUTDST16(RecompPos,0x2D11); break;	
+	case x86_EBP: PUTDST16(RecompPos,0x2D11); break;
 	default:
 		DisplayError("AdcX86regHalfToVariable\nUnknown x86 Register");
 	}
-    PUTDST32(RecompPos,Variable); 
+    PUTDST32(RecompPos,Variable);
 }
 
 void AdcConstToVariable(void *Variable, char *VariableName, BYTE Constant) {
@@ -142,7 +142,7 @@ void AdcConstToX86reg( BYTE Constant, int x86reg ) {
 	default:
 		DisplayError("AdcConstantToX86reg\nUnknown x86 Register");
 	}
-    PUTDST8(RecompPos,Constant); 
+    PUTDST8(RecompPos,Constant);
 }
 
 void AddConstToVariable (DWORD Const, void *Variable, char *VariableName) {
@@ -207,7 +207,7 @@ void AddVariableToX86reg(int x86reg, void * Variable, char * VariableName) {
 	default:
 		DisplayError("AddVariableToX86reg\nUnknown x86 Register");
 	}
-    PUTDST32(RecompPos,Variable); 
+    PUTDST32(RecompPos,Variable);
 }
 
 void AddX86regToVariable(int x86reg, void * Variable, char * VariableName) {
@@ -224,7 +224,7 @@ void AddX86regToVariable(int x86reg, void * Variable, char * VariableName) {
 	default:
 		DisplayError("AddVariableToX86reg\nUnknown x86 Register");
 	}
-    PUTDST32(RecompPos,Variable); 
+    PUTDST32(RecompPos,Variable);
 }
 
 void AddX86regHalfToVariable(int x86reg, void * Variable, char * VariableName) {
@@ -427,6 +427,36 @@ void X86BreakPoint (LPCSTR FileName, int LineNumber) {
 	PUTDST8(RecompPos,0xCC);
 }
 
+void BsrX86RegToX86Reg(int Destination, int Source) {
+	BYTE x86Command = 0;
+
+	CPU_Message("      bsr %s, %s", x86_Name(Destination), x86_Name(Source));
+	
+	PUTDST16(RecompPos, 0xBD0F);
+	switch (Source) {
+	case x86_EAX: x86Command = 0x00; break;
+	case x86_EBX: x86Command = 0x03; break;
+	case x86_ECX: x86Command = 0x01; break;
+	case x86_EDX: x86Command = 0x02; break;
+	case x86_ESI: x86Command = 0x06; break;
+	case x86_EDI: x86Command = 0x07; break;
+	case x86_ESP: x86Command = 0x04; break;
+	case x86_EBP: x86Command = 0x05; break;
+	}
+
+	switch (Destination) {
+	case x86_EAX: x86Command += 0xC0; break;
+	case x86_EBX: x86Command += 0xD8; break;
+	case x86_ECX: x86Command += 0xC8; break;
+	case x86_EDX: x86Command += 0xD0; break;
+	case x86_ESI: x86Command += 0xF0; break;
+	case x86_EDI: x86Command += 0xF8; break;
+	case x86_ESP: x86Command += 0xE0; break;
+	case x86_EBP: x86Command += 0xE8; break;
+	}
+	PUTDST8(RecompPos, x86Command);
+}
+
 void Call_Direct(void * FunctAddress, char * FunctName) {
 	CPU_Message("      call offset %s",FunctName);
 	PUTDST8(RecompPos,0xE8);
@@ -1145,7 +1175,7 @@ void MoveConstToX86reg(DWORD Const, int x86reg) {
 	default:
 		DisplayError("MoveConstToX86reg\nUnknown x86 Register");
 	}
-    PUTDST32(RecompPos,Const); 
+    PUTDST32(RecompPos,Const);
 }
 
 void MoveOffsetToX86reg(DWORD Const, char * VariableName, int x86reg) {
@@ -1162,7 +1192,7 @@ void MoveOffsetToX86reg(DWORD Const, char * VariableName, int x86reg) {
 	default:
 		DisplayError("MoveOffsetToX86reg\nUnknown x86 Register");
 	}
-    PUTDST32(RecompPos,Const); 
+    PUTDST32(RecompPos,Const);
 }
 
 void MoveX86regPointerToX86regByte(int Destination, int AddrReg) {
@@ -1824,6 +1854,25 @@ void MoveSxX86RegPtrDispToX86RegHalf(int AddrReg, BYTE Disp, int Destination) {
 	PUTDST8(RecompPos, Disp);
 }
 
+void MoveSxVariableToX86regByte(void *Variable, char *VariableName, int x86reg) {
+	CPU_Message("      movsx %s, byte ptr [%s]",x86_Name(x86reg),VariableName);
+
+	PUTDST16(RecompPos, 0xbe0f);
+
+	switch (x86reg) {
+	case x86_EAX: PUTDST8(RecompPos,0x05); break;
+	case x86_EBX: PUTDST8(RecompPos,0x1D); break;
+	case x86_ECX: PUTDST8(RecompPos,0x0D); break;
+	case x86_EDX: PUTDST8(RecompPos,0x15); break;
+	case x86_ESI: PUTDST8(RecompPos,0x35); break;
+	case x86_EDI: PUTDST8(RecompPos,0x3D); break;
+	case x86_ESP: PUTDST8(RecompPos,0x25); break;
+	case x86_EBP: PUTDST8(RecompPos,0x2D); break;
+	default: DisplayError("MoveSxVariableToX86regByte\nUnknown x86 Register");
+	}
+    PUTDST32(RecompPos,Variable);
+}
+
 void MoveSxVariableToX86regHalf(void *Variable, char *VariableName, int x86reg) {
 	CPU_Message("      movsx %s, word ptr [%s]",x86_Name(x86reg),VariableName);
 
@@ -1963,6 +2012,25 @@ void MoveZxX86RegPtrDispToX86RegHalf(int AddrReg, BYTE Disp, int Destination) {
 	PUTDST8(RecompPos, Disp);
 }
 
+void MoveZxVariableToX86regByte(void *Variable, char *VariableName, int x86reg) {
+	CPU_Message("      movzx %s, byte ptr [%s]",x86_Name(x86reg),VariableName);
+
+	PUTDST16(RecompPos, 0xb60f);
+
+	switch (x86reg) {
+	case x86_EAX: PUTDST8(RecompPos,0x05); break;
+	case x86_EBX: PUTDST8(RecompPos,0x1D); break;
+	case x86_ECX: PUTDST8(RecompPos,0x0D); break;
+	case x86_EDX: PUTDST8(RecompPos,0x15); break;
+	case x86_ESI: PUTDST8(RecompPos,0x35); break;
+	case x86_EDI: PUTDST8(RecompPos,0x3D); break;
+	case x86_ESP: PUTDST8(RecompPos,0x25); break;
+	case x86_EBP: PUTDST8(RecompPos,0x2D); break;
+	default: DisplayError("MoveZxVariableToX86regByte\nUnknown x86 Register");
+	}
+    PUTDST32(RecompPos,Variable);
+}
+
 void MoveZxVariableToX86regHalf(void *Variable, char *VariableName, int x86reg) {
 	CPU_Message("      movzx %s, word ptr [%s]",x86_Name(x86reg),VariableName);
 
@@ -2609,7 +2677,7 @@ void SubVariableFromX86reg(int x86reg, void * Variable, char * VariableName) {
 	default:
 		DisplayError("SubVariableFromX86reg\nUnknown x86 Register");
 	}
-    PUTDST32(RecompPos,Variable); 
+    PUTDST32(RecompPos,Variable);
 }
 
 void SubX86regFromVariable(int x86reg, void * Variable, char * VariableName) {
@@ -2626,7 +2694,7 @@ void SubX86regFromVariable(int x86reg, void * Variable, char * VariableName) {
 	default:
 		DisplayError("SubX86regFromVariable\nUnknown x86 Register");
 	}
-    PUTDST32(RecompPos,Variable); 
+    PUTDST32(RecompPos,Variable);
 }
 
 void SubX86RegToX86Reg(int Destination, int Source) {
diff --git a/Source/RSP/X86.h b/Source/RSP/X86.h
index 9ce5950ae..6723fe11b 100644
--- a/Source/RSP/X86.h
+++ b/Source/RSP/X86.h
@@ -59,6 +59,7 @@ void AndX86RegToVariable			( void * Variable, char * VariableName, int x86Reg );
 void AndX86RegToX86Reg				( int Destination, int Source );
 void AndX86RegHalfToX86RegHalf		( int Destination, int Source );
 void X86BreakPoint                  ( LPCSTR FileName, int LineNumber );
+void BsrX86RegToX86Reg              ( int Destination, int Source );
 void Call_Direct					( void * FunctAddress, char * FunctName );
 void Call_Indirect					( void * FunctAddress, char * FunctName );
 void CondMoveEqual					( int Destination, int Source );
@@ -141,11 +142,13 @@ void MoveSxX86RegHalfToX86Reg		( int Source, int Destination );
 void MoveSxX86RegPtrDispToX86RegHalf( int AddrReg, BYTE Disp, int Destination );
 void MoveSxN64MemToX86regByte		( int x86reg, int AddrReg );
 void MoveSxN64MemToX86regHalf		( int x86reg, int AddrReg );
+void MoveSxVariableToX86regByte		( void *Variable, char *VariableName, int x86reg );
 void MoveSxVariableToX86regHalf		( void *Variable, char *VariableName, int x86reg );
 void MoveZxX86RegHalfToX86Reg		( int Source, int Destination );
 void MoveZxX86RegPtrDispToX86RegHalf( int AddrReg, BYTE Disp, int Destination );
 void MoveZxN64MemToX86regByte		( int x86reg, int AddrReg );
 void MoveZxN64MemToX86regHalf		( int x86reg, int AddrReg );
+void MoveZxVariableToX86regByte		( void *Variable, char *VariableName, int x86reg );
 void MoveZxVariableToX86regHalf		( void *Variable, char *VariableName, int x86reg );
 void MulX86reg						( int x86reg );
 void NegateX86reg					( int x86reg );
diff --git a/Source/RSP/breakpoint.c b/Source/RSP/breakpoint.c
index c60fe7a14..b56bcecf1 100644
--- a/Source/RSP/breakpoint.c
+++ b/Source/RSP/breakpoint.c
@@ -40,7 +40,7 @@ void Add_BPoint ( void )
 	GetWindowText(hRSPLocation,Title,sizeof(Title));
 	if (!AddRSP_BPoint(AsciiToHex(Title),TRUE )) {
 		SendMessage(hRSPLocation,EM_SETSEL,(WPARAM)0,(LPARAM)-1);
-		SetFocus(hRSPLocation);	
+		SetFocus(hRSPLocation);
 	}
 }
 
@@ -69,7 +69,7 @@ int AddRSP_BPoint( DWORD Location, int Confirm )
 		int Response;
 
 		sprintf(Message,"Break when:\n\nRSP's Program Counter = 0x%03X\n\nIs this correct?",
-			Location); 
+			Location);
 		Response = MessageBox(BPoint_Win_hDlg, Message, "Breakpoint", MB_YESNO | MB_ICONINFORMATION);
 		if (Response == IDNO)
 		{
@@ -138,12 +138,18 @@ void ShowBPPanel ( void )
 void RefreshBpoints ( HWND hList )
 {
 	char Message[100];
-	int count, location;
+	LRESULT location;
+	int count;
 
 	for (count = 0; count < NoOfBpoints; count ++ ) {
 		sprintf(Message," at 0x%03X (RSP)", BPoint[count].Location);
-		location = SendMessage(hList,LB_ADDSTRING,0,(LPARAM)Message);	
-		SendMessage(hList,LB_SETITEMDATA,(WPARAM)location,(LPARAM)BPoint[count].Location);	
+		location = SendMessage(hList, LB_ADDSTRING, 0, (LPARAM)Message);
+		SendMessage(
+			hList,
+			LB_SETITEMDATA,
+			(WPARAM)location,
+			(LPARAM)BPoint[count].Location
+		);
 	}
 }
 
@@ -154,9 +160,18 @@ void RemoveAllBpoint ( void )
 
 void RemoveBpoint ( HWND hList, int index )
 {
-	DWORD location;
-	
-	location = SendMessage(hList,LB_GETITEMDATA,(WPARAM)index,0);	
+	LRESULT response;
+	uint32_t location;
+
+	response = SendMessage(hList, LB_GETITEMDATA, (WPARAM)index, 0);
+	if (response < 0 || response > 0x7FFFFFFFL)
+	{
+		DisplayError(
+			"LB_GETITEMDATA response for %i out of DWORD range.",
+			index
+		);
+	}
+	location = (uint32_t)response;
 	RemoveRSPBreakPoint(location);
 }
 
diff --git a/Source/RSP/dma.c b/Source/RSP/dma.c
index 6a40a1d15..faad399af 100644
--- a/Source/RSP/dma.c
+++ b/Source/RSP/dma.c
@@ -39,7 +39,7 @@ void SP_DMA_READ (void)
 
     addr = (*RSPInfo.SP_DRAM_ADDR_REG) & 0x00FFFFFF;
 
-	if (addr > 0x800000)
+	if (addr > 0x7FFFFF)
 	{
 		MessageBox(NULL,"SP DMA READ\nSP_DRAM_ADDR_REG not in RDRam space","Error",MB_OK);
 		return;
@@ -47,8 +47,8 @@ void SP_DMA_READ (void)
 	
 	if ((*RSPInfo.SP_RD_LEN_REG & 0xFFF) + 1  + (*RSPInfo.SP_MEM_ADDR_REG & 0xFFF) > 0x1000)
 	{
-		MessageBox(NULL,"SP DMA READ\ncould not fit copy in memory segement","Error",MB_OK);
-		return;		
+		MessageBox(NULL,"SP DMA READ\ncould not fit copy in memory segment","Error",MB_OK);
+		return;
 	}
 
 	Length = ((*RSPInfo.SP_RD_LEN_REG & 0xFFF) | 7) + 1;
@@ -115,7 +115,7 @@ void SP_DMA_WRITE (void)
 
     addr = (*RSPInfo.SP_DRAM_ADDR_REG) & 0x00FFFFFF;
 
-	if (addr > 0x800000)
+	if (addr > 0x7FFFFF)
 	{
 		MessageBox(NULL,"SP DMA WRITE\nSP_DRAM_ADDR_REG not in RDRam space","Error",MB_OK);
 		return;
@@ -123,8 +123,8 @@ void SP_DMA_WRITE (void)
 
 	if ((*RSPInfo.SP_WR_LEN_REG & 0xFFF) + 1  + (*RSPInfo.SP_MEM_ADDR_REG & 0xFFF) > 0x1000)
 	{
-		MessageBox(NULL,"SP DMA WRITE\ncould not fit copy in memory segement","Error",MB_OK);
-		return;		
+		MessageBox(NULL,"SP DMA WRITE\ncould not fit copy in memory segment","Error",MB_OK);
+		return;
 	}
 
 	Length = ((*RSPInfo.SP_WR_LEN_REG & 0xFFF) | 7) + 1;
diff --git a/Source/RSP/memory.c b/Source/RSP/memory.c
index 6d1e5f4f6..a6cf3c026 100644
--- a/Source/RSP/memory.c
+++ b/Source/RSP/memory.c
@@ -35,24 +35,30 @@ BYTE * RecompCode, * RecompCodeSecondary, * RecompPos, *JumpTables;
 void ** JumpTable;
 
 int AllocateMemory (void) {
-	RecompCode=(BYTE *) VirtualAlloc( NULL, 0x00400004, MEM_RESERVE, PAGE_EXECUTE_READWRITE);
-	RecompCode=(BYTE *) VirtualAlloc( RecompCode, 0x00400000, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-	
-	if(RecompCode == NULL) {
-		DisplayError("Not enough memory for RSP RecompCode!");
-		return FALSE;
+	if (RecompCode == NULL){
+		RecompCode=(BYTE *) VirtualAlloc( NULL, 0x00400004, MEM_RESERVE, PAGE_EXECUTE_READWRITE);
+		RecompCode=(BYTE *) VirtualAlloc( RecompCode, 0x00400000, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+		
+		if(RecompCode == NULL) {
+			DisplayError("Not enough memory for RSP RecompCode!");
+			return FALSE;
+		}
 	}
 
-	RecompCodeSecondary = (BYTE *)VirtualAlloc( NULL, 0x00200000, MEM_COMMIT, PAGE_EXECUTE_READWRITE );
-	if(RecompCodeSecondary == NULL) {
-		DisplayError("Not enough memory for RSP RecompCode Secondary!");
-		return FALSE;
+	if (RecompCodeSecondary == NULL){
+		RecompCodeSecondary = (BYTE *)VirtualAlloc( NULL, 0x00200000, MEM_COMMIT, PAGE_EXECUTE_READWRITE );
+		if(RecompCodeSecondary == NULL) {
+			DisplayError("Not enough memory for RSP RecompCode Secondary!");
+			return FALSE;
+		}
 	}
 
-	JumpTables = (BYTE *)VirtualAlloc( NULL, 0x1000 * MaxMaps, MEM_COMMIT, PAGE_READWRITE );
-	if( JumpTables == NULL ) {  
-		DisplayError("Not enough memory for Jump Table!");
-		return FALSE;
+	if (JumpTables == NULL){
+		JumpTables = (BYTE *)VirtualAlloc( NULL, 0x1000 * MaxMaps, MEM_COMMIT, PAGE_READWRITE );
+		if( JumpTables == NULL ) {  
+			DisplayError("Not enough memory for Jump Table!");
+			return FALSE;
+		}
 	}
 
 	JumpTable = (void **)JumpTables;
@@ -65,6 +71,10 @@ void FreeMemory (void) {
 	VirtualFree( RecompCode, 0 , MEM_RELEASE);
 	VirtualFree( JumpTable, 0 , MEM_RELEASE);
 	VirtualFree( RecompCodeSecondary, 0 , MEM_RELEASE);
+	
+	RecompCode = NULL;
+	JumpTables = NULL;
+	RecompCodeSecondary = NULL;
 }
 
 void ResetJumpTables ( void )
diff --git a/Source/Script/UpdateVersion.cmd b/Source/Script/UpdateVersion.cmd
new file mode 100644
index 000000000..0824a4db0
--- /dev/null
+++ b/Source/Script/UpdateVersion.cmd
@@ -0,0 +1,56 @@
+@echo off
+SETLOCAL
+
+set origdir=%cd%
+cd /d %~dp0..\..
+set base_dir=%cd%
+cd /d %origdir%
+
+
+if exist "C:\Program Files\Git\usr\bin\sed.exe" ( set SED="C:\Program Files\Git\usr\bin\sed.exe")
+if exist "C:\Program Files (x86)\Git\bin\sed.exe" ( set SED="C:\Program Files (x86)\Git\bin\sed.exe")
+
+if %SED% == "" ( 
+	echo can not find sed.exe
+	goto :end
+)
+
+SETLOCAL EnableDelayedExpansion
+FOR /F "tokens=1 delims=" %%A in ('git describe --tags --long') do SET current_tag=%%A
+FOR /F "tokens=1 delims=" %%A in ('echo !current_tag! ^| !sed! "s/v[0-9]*\.[0-9]*-\([0-9]*\).*/\1/"') do SET commits_since_tag=%%A
+
+call :setVersion %base_dir%\Source\Project64\version.h !commits_since_tag!
+call :setVersion %base_dir%\Source\nragev20\version.h !commits_since_tag!
+call :setVersion %base_dir%\Source\RSP\version.h !commits_since_tag!
+call :setVersion %base_dir%\Source\Glide64\version.h !commits_since_tag!
+
+ENDLOCAL
+
+goto :eof
+
+:setVersion
+set version_file=%~1
+set out_file=%~1.out
+set build_no=%~2
+
+if exist "%out_file%" del "%out_file%"
+
+SETLOCAL DisableDelayedExpansion
+FOR /F "usebackq delims=" %%a in (`"findstr /n ^^ %version_file%"`) do (
+    set "line=%%a"
+    SETLOCAL EnableDelayedExpansion
+    set "line=!line:9999=%build_no%!"
+    set "line=!line:*:=!"
+    echo(!line!>>!out_file!
+    ENDLOCAL
+)
+ENDLOCAL
+
+if exist "%out_file%" ( 
+	if exist "%version_file%" ( 
+		del "%version_file%"
+		move "%out_file%" "%version_file%"
+	)
+)
+
+goto :eof
diff --git a/Source/Script/build.cmd b/Source/Script/build.cmd
new file mode 100644
index 000000000..f287eab38
--- /dev/null
+++ b/Source/Script/build.cmd
@@ -0,0 +1,41 @@
+@ECHO OFF
+SETLOCAL
+
+set BuildMode=Release
+if not "%1" == "" set BuildMode=%1
+if "%1" == "debug" set BuildMode=Debug
+if "%1" == "release" set BuildMode=Release
+
+set MSVC-BUILDER=
+set origdir=%cd%
+cd /d %~dp0..\..\
+set base_dir=%cd%
+cd /d %origdir%
+
+if exist "C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe" ( set MSVC-BUILDER="C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe")
+if exist "C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe" ( set MSVC-BUILDER="C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\devenv.exe")
+
+if %MSVC-BUILDER% == "" ( 
+	echo can not find visual studio 2008
+	goto :end
+)
+
+:: Build Win32 version of the software
+IF EXIST "%base_dir%\output.txt" del "%base_dir%\output.txt"
+%MSVC-BUILDER% "%base_dir%\Project64.vs2008.sln" /build "%BuildMode%|Win32" /out "%base_dir%\output.txt"
+set Result=%ERRORLEVEL%
+type "%base_dir%\output.txt"
+echo Done - ERRORLEVEL: %Result%
+IF %Result% NEQ 0 goto :EndErr
+
+echo Build ok
+goto :end
+
+:EndErr
+ENDLOCAL
+echo Build failed
+exit /B 1
+
+:End
+ENDLOCAL
+exit /B 0
diff --git a/Source/Installer/package_zip.bat b/Source/Script/package_zip.cmd
similarity index 84%
rename from Source/Installer/package_zip.bat
rename to Source/Script/package_zip.cmd
index c1a2e3dd6..d43ece42f 100644
--- a/Source/Installer/package_zip.bat
+++ b/Source/Script/package_zip.cmd
@@ -1,5 +1,13 @@
 @echo off
 
+if exist "C:\Program Files\7-Zip\7z.exe" ( set zip="C:\Program Files\7-Zip\7z.exe")
+
+
+if %zip% == "" ( 
+	echo can not find 7z.exe
+	goto :end
+)
+
 SET current_dir=%cd%
 cd /d %~dp0..\..\
 SET base_dir=%cd%
@@ -26,3 +34,7 @@ copy "%base_dir%\Plugin\GFX\Jabo_Direct3D8.dll" "%base_dir%\Bin\Package\Plugin\G
 copy "%base_dir%\Plugin\GFX\PJ64Glide64.dll" "%base_dir%\Bin\Package\Plugin\GFX"
 copy "%base_dir%\Plugin\Input\PJ64_NRage.dll" "%base_dir%\Bin\Package\Plugin\Input"
 copy "%base_dir%\Plugin\RSP\RSP 1.7.dll" "%base_dir%\Bin\Package\Plugin\RSP"
+
+cd %base_dir%\Bin\Package
+%zip% a -tzip -r ../project64 *
+cd /d %current_dir%
diff --git a/Source/Script/upload_beta.vbs b/Source/Script/upload_beta.vbs
new file mode 100644
index 000000000..822fc4b5d
--- /dev/null
+++ b/Source/Script/upload_beta.vbs
@@ -0,0 +1,516 @@
+' On Error Resume Next
+
+if WScript.Arguments.Count < 4 then
+    WScript.StdOut.WriteLine "Missing parameters"
+    WScript.StdOut.WriteLine "[password] [file to upload] [BuildUrl] [Posttitle]"
+	WScript.Quit
+end if
+
+Set IE = CreateIeWindow()
+WScript.StdOut.WriteLine IE.HWND
+IE.Visible = True
+
+Login IE
+PostThread IE
+IE.Quit
+
+function CreateIeWindow ()
+	on error resume next
+
+	Set CreateIeWindow = nothing
+	For count = 0 to 100
+		WScript.StdOut.WriteLine count & ": Trying to create Internet Explorer"
+		Set IE = WScript.CreateObject("InternetExplorer.Application", "IE_")
+		if not IE is nothing then
+			WScript.StdOut.WriteLine count & ": Created Internet Explorer"
+			WScript.StdOut.WriteLine IE.HWND
+			IE.Visible = True
+
+			WScript.StdOut.WriteLine IE.HWND
+			Set CreateIeWindow = IE
+			exit for
+		end if
+		WScript.StdOut.WriteLine count & ": Not created"
+		WScript.Sleep 100
+		WScript.StdOut.WriteLine count & ": Should loop"
+	Next
+	if CreateIeWindow is nothing then
+		WScript.StdOut.WriteLine "Failed to create InternetExplorer.Application"
+		WScript.Quit
+	end if
+End Function
+
+Sub Wait(IE)
+	Dim complete
+	complete = False
+
+	WScript.StdOut.WriteLine "Waiting for IE"
+
+	For count = 0 to 1000
+		WScript.StdOut.WriteLine "before sleep"
+		WScript.Sleep 100
+		WScript.StdOut.WriteLine "after sleep"
+		if IE is nothing then
+			WScript.StdOut.WriteLine "after sleep"
+		end if
+		WScript.StdOut.WriteLine count & ": IE.readyState: " & IE.readyState
+		if IE.readyState >= 4 then
+			WScript.StdOut.WriteLine count & ": IE.Busy: " & IE.Busy
+			if not IE.Busy then
+				WScript.StdOut.WriteLine count & ": IE.document.readyState: " & IE.document.readyState
+				if StrComp(IE.document.readyState, "complete", vbTextCompare) = 0 then
+					complete = true
+					exit for
+				end if
+			end if
+		end if
+	Next
+
+	if  not complete then
+		WScript.StdOut.WriteLine "Failed to wait for IE"
+		WScript.Quit
+	end if
+	WScript.StdOut.WriteLine "IE Done"
+End Sub
+
+Function FindIeWindow(ieID)
+	on error resume next
+	set IE = nothing
+
+	Set Shell = CreateObject("Shell.Application")
+	For i = 0 to Shell.Windows.Count -1 
+		set Win  = Shell.Windows.Item(i)
+		WScript.StdOut.WriteLine i & ": " & TypeName(win.Document)
+
+		If TypeName(win.Document) = "HTMLDocument" Then					
+			WScript.StdOut.WriteLine "uniqueID: @" & win.HWND & "@" & ieID & "@"
+			if win.HWND = ieID then
+				WScript.StdOut.WriteLine "matched"
+				set IE = win
+			end if
+		End If
+		if not IE is nothing then
+			exit for
+		end if
+	Next
+	set FindIeWindow = IE
+	
+	if IE is nothing then
+		WScript.StdOut.WriteLine "Failed to find navigating window"
+	else
+		WScript.StdOut.WriteLine "HWND : " & IE.HWND 
+	end if
+End Function
+
+Sub Navigate(IE, url)
+	dim ieId
+	ieID = IE.HWND
+ 	WScript.StdOut.WriteLine "Navigating (" & IE.HWND  & ") to: " & url
+	IE.Navigate url
+	WScript.Sleep 100
+	' set IE = FindIeWindow(ieID)
+	Wait IE
+End Sub
+
+Sub ValidateLoggedIn(IE)
+	WScript.StdOut.WriteLine "ValidateLoggedIn - 1"
+	WScript.StdOut.WriteLine "ValidateLoggedIn start"
+	WScript.StdOut.WriteLine "ValidateLoggedIn - 2"
+	Navigate IE, "http://forum.pj64-emu.com/"
+	WScript.StdOut.WriteLine "ValidateLoggedIn - 3"
+	Wait IE
+	WScript.StdOut.WriteLine "ValidateLoggedIn - 4"
+
+	Dim LoggedIn
+	LoggedIn = False
+	WScript.StdOut.WriteLine "ValidateLoggedIn - 5"
+	Set NodeList = IE.document.getElementsByTagName("a") 
+	WScript.StdOut.WriteLine "ValidateLoggedIn - 6"
+	WScript.StdOut.WriteLine "Got Node list"
+	For Each Elem In NodeList
+		WScript.StdOut.WriteLine Elem.href
+		if lcase(Mid(Elem.href,1,39)) = "http://forum.pj64-emu.com/member.php?u=" then
+			if lcase(Mid(Elem.parentElement.innerHTML,1,11))  = "welcome, <a" then
+				if lcase(Elem.innerHTML)  = "buildbot" then	
+					WScript.StdOut.WriteLine "Found welcome message"
+					LoggedIn = true
+					exit for
+				end if
+			end if
+		end if
+	Next
+
+	if LoggedIn = false then
+		WScript.StdOut.WriteLine "Failed to login"
+		WScript.Quit
+	end if
+ 	WScript.StdOut.WriteLine "ValidateLoggedIn Done"
+End Sub
+
+Sub Login(IE)
+	'On Error resume next
+
+	Set IE2 = WScript.CreateObject("InternetExplorer.Application", "IE_")
+	IE2.Visible = True
+ 	WScript.StdOut.WriteLine "Login start"
+	Navigate IE2, "http://forum.pj64-emu.com/"
+
+	set navbar_username = IE2.document.getelementbyid("navbar_username")
+	set navbar_password = IE2.document.getelementbyid("navbar_password")
+	if navbar_username is nothing then
+		WScript.StdOut.WriteLine "Failed to find login form, checking if already logged in"
+		ValidateLoggedIn IE	
+		exit sub
+	end if
+
+ 	WScript.StdOut.WriteLine "Found login form"
+	navbar_username.value = "buildbot"
+	navbar_password.value = WScript.Arguments(0)
+	navbar_username.form.submit
+	Wait IE2
+	Dim FoundIt
+	FoundIt = False
+
+ 	WScript.StdOut.WriteLine "Looking for redirect"
+	For count = 0 to 100
+		Set NodeList = IE2.document.getElementsByTagName("a") 
+		WScript.StdOut.WriteLine count & ": Found " & NodeList.length & " a tags"
+		For Each Elem In NodeList
+			if StrComp(Elem.href, "http://forum.pj64-emu.com/", vbTextCompare) = 0 then
+				if StrComp(Elem.innerHTML, "Click here if your browser does not automatically redirect you.", vbTextCompare) = 0 then
+					FoundIt = True
+					Exit For
+				End if
+			end if  
+		Next
+		if FoundIt = True then
+			Exit For
+		end if
+		WScript.Sleep 100
+	Next	
+
+	if FoundIt = false then
+		WScript.StdOut.WriteLine "Failed to find redirect"
+		WScript.Quit
+	end if
+
+	WScript.StdOut.WriteLine "found redirect"
+	Navigate IE, "http://forum.pj64-emu.com/"
+	Wait IE
+
+	WScript.StdOut.WriteLine "Quitting IE2"
+	IE2.Quit
+	ValidateLoggedIn IE	
+	WScript.StdOut.WriteLine "Login Done"
+End Sub
+
+
+Sub PostThread(IE)
+	WScript.StdOut.WriteLine "PostThread start"
+    Navigate IE, "http://forum.pj64-emu.com/newthread.php?do=newthread&f=10"
+    Wait IE
+
+	Dim submitButton
+	For count = 0 to 100
+        WScript.StdOut.WriteLine count & ": looking for submit button"
+		set submitButton = nothing
+		Set NodeList = IE.document.getElementsByTagName("input") 
+		For Each Elem In NodeList
+			WScript.StdOut.WriteLine count & ": " & lcase(Elem.className)
+			if lcase(Elem.className) = "button" and lcase(Elem.value) = "submit new thread" then
+				WScript.StdOut.WriteLine count & ": found submit button"
+				set submitButton = Elem
+				exit for
+			end if
+		Next
+		if not submitButton is nothing then
+			exit for
+		end if
+		WScript.Sleep 300
+	Next
+	
+	if submitButton is nothing then
+        WScript.StdOut.WriteLine "failed to find submit button"
+        WScript.Quit
+	end if
+
+	dim ieId
+	ieID = IE.HWND
+
+	SetPostDetails IE, WScript.Arguments(2), WScript.Arguments(3)
+	UploadFile WScript.Arguments(1)	
+
+	WScript.StdOut.WriteLine "submitting"
+	submitButton.click
+	WScript.Sleep 100
+	' set IE = FindIeWindow(ieID)
+	Wait IE
+	WScript.StdOut.WriteLine "PostThread Finished"
+End Sub
+
+Sub SetPostDetails(IE, BuildUrl, PostTitle)
+	WScript.StdOut.WriteLine "Posting Details"
+    Dim oReq
+    Set oReq = CreateObject("MSXML2.XMLHTTP")
+    oReq.open "GET", BuildUrl & "api/xml?wrapper=changes", False
+    oReq.send
+
+    if (oReq.status <> 200) then
+        WScript.StdOut.WriteLine "failed to get job details (" & BuildUrl & "api/xml?wrapper=changes)"
+        WScript.Quit
+    end if
+
+    Dim xmlDoc
+    Set xmlDoc = oReq.responseXML
+    Set objLst = xmlDoc.getElementsByTagName("freeStyleBuild")
+
+    Dim PostContent
+    For each elem in objLst
+        set childNodes = elem.childNodes
+        for each node in childNodes
+             if lcase(node.nodeName)="changeset" then
+                for each item in node.childNodes
+                    dim commitId, comment
+
+                    commitId = ""
+                    comment = ""
+
+                    for each itemDetail in  item.childNodes
+                        if lcase(itemDetail.nodeName)="commitid" then
+                            commitId = itemDetail.text
+                        end if
+                        if lcase(itemDetail.nodeName)="comment" then
+                            comment = Replace(Replace(itemDetail.text, vbLf, " "), vbCr, " ") 
+                        end if
+                    next
+
+                    if (Len(comment) > 0 and Len(commitId) > 0) then
+                        PostContent = PostContent & "[*]" & comment & " (commit: [URL=""https://github.com/project64/project64/commit/" & commitId & """]"& commitId & "[/URL])" & vbCr
+                    end if
+                next
+            end if
+        next
+    Next
+
+    if (Len(PostContent) > 0) then
+        PostContent = "Changes:"&vbCr&"[LIST=1]" & vbCr & PostContent & "[/LIST]"
+    else
+        PostContent = "No code changes"
+    end if
+
+    WScript.StdOut.WriteLine "PostTitle = """ & PostTitle & """"
+    WScript.StdOut.WriteLine "PostContent = """ & PostContent & """"
+
+	Dim SetTitle
+	SetTitle = False
+	Set NodeList = IE.document.getElementsByTagName("input") 
+	For Each Elem In NodeList
+		if lcase(Elem.name) = "subject" then
+			Elem.value = PostTitle
+			SetTitle = true
+			exit for
+		end if
+	Next
+
+	if not SetTitle then
+		WScript.StdOut.WriteLine "failed to set post title"
+		WScript.Quit
+	end if
+
+	Dim SetMessage
+	SetMessage = False
+	Set NodeList = IE.document.getElementsByTagName("textarea") 
+	For Each Elem In NodeList
+		WScript.StdOut.WriteLine Elem.name
+		if lcase(Elem.name) = "message" then
+			Elem.value = PostContent
+			SetMessage = true
+			exit for
+		end if
+	Next
+
+	if not SetMessage then
+		WScript.StdOut.WriteLine "failed to set post message"
+		WScript.Quit
+	end if
+
+end sub
+
+sub UploadFile(FileToUpload)
+	WScript.StdOut.WriteLine "UploadFile start"
+
+	dim filePos
+	filePos = InStrRev(FileToUpload, "\")
+	if filePos = 0 then 
+		WScript.StdOut.WriteLine "failed to find directory seperator in " & FileToUpload
+		WScript.Quit
+	end if
+
+	dim fileName
+	fileName = Mid(FileToUpload, filePos + 1, len(FileToUpload))
+	WScript.StdOut.WriteLine fileName
+
+	extPos = InStrRev(fileName, ".")
+	if extPos = 0 then 
+		WScript.StdOut.WriteLine "failed to find file extension in " & fileName
+		WScript.Quit
+	end if
+	extension = Mid(fileName, extPos, len(fileName))
+	if lcase(extension) <> ".zip" then 
+		WScript.StdOut.WriteLine "not a zip file: " & fileName
+		WScript.Quit
+	end if	
+
+
+	set manage_attachments_button = ie.document.getelementbyid("manage_attachments_button")
+	if manage_attachments_button is nothing then
+		WScript.StdOut.WriteLine "failed to find manage_attachments_button"
+		WScript.Quit
+	end if
+
+	WScript.StdOut.WriteLine "InStr(1, lcase(manage_attachments_button.onclick), ""vb_attachments"") = " & InStr(1, lcase(manage_attachments_button.onclick), "vb_attachments")
+	dim startPos, endPos
+	startPos = InStr(1, lcase(manage_attachments_button.onclick), "vb_attachments")
+	if startPos = 0 then 
+		WScript.StdOut.WriteLine "failed to find vb_attachments in " & manage_attachments_button.onclick
+		WScript.Quit
+	end if
+	startPos = InStr(startPos, lcase(manage_attachments_button.onclick), "'")
+	if startPos = 0 then 
+		WScript.StdOut.WriteLine "failed to find first quote in " & manage_attachments_button.onclick
+		WScript.Quit
+	end if
+	startPos = startPos + 1
+	endPos = InStr(startPos,manage_attachments_button.onclick, "'")
+	if endPos = 0 then 
+		WScript.StdOut.WriteLine "failed to find second quote in " & manage_attachments_button.onclick
+		WScript.Quit
+	end if
+
+	Set IE2 = WScript.CreateObject("InternetExplorer.Application", "IE_")
+	IE2.Visible = True
+	Navigate IE2, "http://forum.pj64-emu.com/" & Mid(manage_attachments_button.onclick, startPos, endPos - startPos)
+	Wait IE2
+
+	Set FormList = IE2.document.getElementsByTagName("form") 
+	if FormList.length <> 1 or FormList(0).name <> "newattachment" then 
+		WScript.StdOut.WriteLine "failed to find attachement form"
+		WScript.Quit
+	end if
+
+	Set InputList = FormList(0).getElementsByTagName("input")
+	WScript.StdOut.WriteLine "InputList.length = " & InputList.length
+
+	dim PreFormData, PostFormData
+
+	For Each Input In InputList
+		if lcase(Input.type) = "hidden" then
+			PreFormData = PreFormData & "--AaB03x" & vbCrLf & "Content-Disposition: form-data; name=""" & Input.name & """" & vbCrLf & vbCrLf & Input.value& vbCrLf   
+		end if
+		WScript.StdOut.WriteLine "Input.type: " & Input.type & " Input.name: " & Input.name & " Input.value: " & Input.value
+	next
+	PreFormData = PreFormData & "--AaB03x" & vbCrLf & "Content-Disposition: form-data; name=""attachment[]""; filename=""" & fileName & """" & vbCrLf
+	PreFormData = PreFormData & "Content-Type: application/zip" & vbCrLf & vbCrLf
+	PostFormData = vbCrLf & "--AaB03x" & vbCrLf & "Content-Disposition: form-data; name=""upload""" & vbCrLf & vbCrLf & "Upload" & vbCrLf   
+	PostFormData = PostFormData & vbCrLf & vbCrLf & "--AaB03x--"& vbCrLf
+
+	WScript.StdOut.WriteLine  PreFormData & PostFormData
+
+	dim fileContents
+	fileContents = ReadBinaryFile(FileToUpload)
+
+	dim UploadUrl
+	UploadUrl = "http://forum.pj64-emu.com/" & FormList(0).action
+	IE2.Quit
+
+	Header = "Content-Type: multipart/form-data; boundary=AaB03x" & vbCrLf
+
+	Const adTypeBinary = 1
+
+	Dim DataToPOSTStream
+	Set DataToPOSTStream = CreateObject("ADODB.Stream")  
+
+	DataToPOSTStream.type=adTypeBinary
+	DataToPOSTStream.Open
+
+	DataToPOSTStream.Write = Stream_StringToBinary(PreFormData,"us-ascii")
+	DataToPOSTStream.Write = fileContents
+	DataToPOSTStream.Write = Stream_StringToBinary(PostFormData,"us-ascii")
+	DataToPOSTStream.Position = 0
+	DataToPOSTStream.Type = adTypeBinary
+	Dim DataToPOST
+	DataToPOST = DataToPOSTStream.Read
+
+	Set IE3 = CreateIeWindow()
+	IE3.Visible = 1
+	dim ieId
+	ieID = IE3.HWND
+	WScript.StdOut.WriteLine "Uploading form to: " & UploadUrl	
+	IE3.Navigate UploadUrl, Nothing, Nothing, DataToPOST, Header
+	WScript.Sleep 100
+	'set IE3 = FindIeWindow(ieID)
+	Wait IE3
+
+	Dim UploadDone
+	UploadDone = False
+	For count = 0 to 1000
+		WScript.StdOut.WriteLine count & ": Waiting for upload done"
+		Set NodeList = IE3.document.getElementsByTagName("legend") 
+		For Each Elem In NodeList
+			if (len(Elem.innerHTML) > 19) and lcase(Mid(Elem.innerHTML, 1, 19)) = "current attachments" then 
+				UploadDone = true
+				WScript.StdOut.WriteLine "Upload done"
+				exit for
+			end if
+		Next
+		if UploadDone then
+			exit for
+		end if
+	Next
+
+	if not UploadDone then
+		WScript.StdOut.WriteLine "Failed to upload file"
+		WScript.Quit
+	end if
+	IE3.Quit
+
+	WScript.StdOut.WriteLine "UploadFile Finished"
+end sub
+
+Function Stream_StringToBinary(Text, CharSet)
+  Const adTypeText = 2
+  Const adTypeBinary = 1
+
+  Dim BinaryStream
+  Set BinaryStream = CreateObject("ADODB.Stream")
+
+  BinaryStream.Type = adTypeText
+  BinaryStream.CharSet = CharSet
+
+  BinaryStream.Open
+  BinaryStream.WriteText Text
+
+  BinaryStream.Position = 0
+  BinaryStream.Type = adTypeBinary
+  Stream_StringToBinary = BinaryStream.Read
+
+  Set BinaryStream = Nothing
+End Function
+
+Function ReadBinaryFile(path)
+    Const adTypeText = 2
+    Const adTypeBinary = 1
+
+    dim inStream
+    dim myByte,myByteValue,myCharacter
+
+    set inStream=WScript.CreateObject("ADODB.Stream")
+
+    inStream.Open
+    inStream.type=1
+
+    inStream.LoadFromFile path 
+
+    ReadBinaryFile=inStream.Read()
+    inStream.Close
+End Function
diff --git a/Source/Settings/Settings.vcxproj b/Source/Settings/Settings.vcxproj
index bbccf9443..b6fc47e64 100644
--- a/Source/Settings/Settings.vcxproj
+++ b/Source/Settings/Settings.vcxproj
@@ -5,31 +5,32 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8B9961B1-88D9-4EA3-A752-507A00DD9F3D}</ProjectGuid>
     <RootNamespace>Settings</RootNamespace>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader />
@@ -41,7 +42,4 @@
   <ItemGroup>
     <ClInclude Include="Settings.h" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/nragev20/DirectInput.cpp b/Source/nragev20/DirectInput.cpp
index 006f2218b..2e960c798 100644
--- a/Source/nragev20/DirectInput.cpp
+++ b/Source/nragev20/DirectInput.cpp
@@ -22,6 +22,7 @@
 */
 
 
+#include <InitGuid.h>
 #include "commonIncludes.h"
 #include <dinput.h>
 #include "NRagePluginV2.h"
@@ -29,6 +30,7 @@
 #include "DirectInput.h"
 #include "XInputController.h"
 #include <math.h>
+#include <CGuid.h>
 
 // ProtoTypes //
 HRESULT AcquireDevice( LPDIRECTINPUTDEVICE8 lpDirectInputDevice );
diff --git a/Source/nragev20/FileAccess.cpp b/Source/nragev20/FileAccess.cpp
index a08104dac..122637baa 100644
--- a/Source/nragev20/FileAccess.cpp
+++ b/Source/nragev20/FileAccess.cpp
@@ -253,6 +253,10 @@ bool ProcessKey( DWORD dwKey, DWORD dwSection, LPCSTR pszLine, LPTSTR pszFFDevic
 		if (pController)
 			pController->fXInput = atoi(pszLine);
 		break;
+	case CHK_N64MOUSE:
+		if (pController)
+			pController->fN64Mouse = atoi(pszLine);
+		break;
 	case CHK_PAKTYPE:
 		if (pController)
 			pController->PakType = atoi(pszLine);
@@ -1485,6 +1489,7 @@ void DumpControllerSettings(FILE * fFile, int i, bool bIsINI)
 
 	fprintf(fFile, STRING_INI_PLUGGED "=%u\n", g_ivConfig->Controllers[i].fPlugged);
 	fprintf(fFile, STRING_INI_XINPUT "=%u\n", g_ivConfig->Controllers[i].fXInput);
+	fprintf(fFile, STRING_INI_N64MOUSE "=%u\n", g_ivConfig->Controllers[i].fN64Mouse);
 	fprintf(fFile, STRING_INI_RAWDATA "=%u\n", g_ivConfig->Controllers[i].fRawData);
 	fprintf(fFile, STRING_INI_PAKTYPE "=%u\n", g_ivConfig->Controllers[i].PakType);
 	fprintf(fFile, STRING_INI_REALN64RANGE "=%u\n", g_ivConfig->Controllers[i].fRealN64Range);
diff --git a/Source/nragev20/FileAccess.h b/Source/nragev20/FileAccess.h
index 2a4ec74fd..fbd3e8217 100644
--- a/Source/nragev20/FileAccess.h
+++ b/Source/nragev20/FileAccess.h
@@ -86,6 +86,7 @@ unsigned long djbHash(const char *str);
 
 #define STRING_INI_PLUGGED		"Plugged"
 #define STRING_INI_XINPUT		"xInput"
+#define STRING_INI_N64MOUSE		"N64Mouse"
 #define STRING_INI_RAWDATA		"RawData"
 #define STRING_INI_PAKTYPE		"PakType"
 #define STRING_INI_REALN64RANGE	"RealN64Range"
@@ -154,6 +155,7 @@ unsigned long djbHash(const char *str);
 
 #define CHK_PLUGGED			3378836077
 #define CHK_XINPUT			3665436173
+#define CHK_N64MOUSE		863329606
 #define CHK_RAWDATA			1238573385
 #define CHK_PAKTYPE			2936974691
 #define CHK_REALN64RANGE	1279831790
diff --git a/Source/nragev20/Interface.cpp b/Source/nragev20/Interface.cpp
index 7f8941861..c7f9eaf02 100644
--- a/Source/nragev20/Interface.cpp
+++ b/Source/nragev20/Interface.cpp
@@ -183,10 +183,10 @@ BOOL CALLBACK MainDlgProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
 				case TAB_CONTROLLER2:
 				case TAB_CONTROLLER3:
 				case TAB_CONTROLLER4:
-					hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLLER ), hDlg, ControllerTabProc );
+					hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLLER), hDlg, (DLGPROC)ControllerTabProc);
 					break;
 				case TAB_SHORTCUTS:
-					hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_SHORTCUT ), hDlg, ShortcutsTabProc );
+					hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_SHORTCUT), hDlg, (DLGPROC)ShortcutsTabProc);
 					break;
 				default:
 					hTabControl = NULL;
@@ -420,18 +420,18 @@ BOOL CALLBACK ControllerTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 					{
 					case TAB_CONTROLS:
 						if( pcController->fXInput)	// added to show the xinput controller config tab --tecnicors
-							hTabControl = CreateDialog ( g_hResourceDLL, MAKEINTRESOURCE( IDD_XCONTROLS ), hDlg, XControlsTabProc );
+							hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_XCONTROLS), hDlg, (DLGPROC)XControlsTabProc);
 						else
-							hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLS ), hDlg, ControlsTabProc );
+							hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLS), hDlg, (DLGPROC)ControlsTabProc);
 						break;
 					case TAB_DEVICES:
-						hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_DEVICES ), hDlg, DevicesTabProc );
+						hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_DEVICES), hDlg, (DLGPROC)DevicesTabProc);
 						break;
 					case TAB_MODIFIERS:
-						hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_MODIFIER ), hDlg, ModifierTabProc );
+						hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_MODIFIER), hDlg, (DLGPROC)ModifierTabProc);
 						break;
 					case TAB_PAK:
-						hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLLERPAK ), hDlg, ControllerPakTabProc );
+						hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLLERPAK), hDlg, (DLGPROC)ControllerPakTabProc);
 						break;
 					default:
 						hTabControl = NULL;
@@ -528,9 +528,9 @@ BOOL CALLBACK ControllerTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				if( hTabControl )
 						DestroyWindow( hTabControl );
 				if( pcController->fXInput )
-					hTabControl = CreateDialog ( g_hResourceDLL, MAKEINTRESOURCE( IDD_XCONTROLS ), hDlg, XControlsTabProc );
+					hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_XCONTROLS), hDlg, (DLGPROC)XControlsTabProc);
 				else
-					hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLS ), hDlg, ControlsTabProc );
+					hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLS), hDlg, (DLGPROC)ControlsTabProc);
 				{
 					hDlgItem = GetDlgItem( hDlg, IDC_CONTROLLERTAB );
 
@@ -548,6 +548,10 @@ BOOL CALLBACK ControllerTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				}
 				return TRUE;	// END IDC_XINPUT_ENABLER
 
+			case IDC_N64MOUSE:
+				pcController->fN64Mouse = (IsDlgButtonChecked(hDlg, LOWORD(wParam)) == BST_CHECKED);
+				return TRUE;
+
 			default:
 				return FALSE;
 		}
@@ -556,14 +560,15 @@ BOOL CALLBACK ControllerTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 		// for this dialog
 		CheckDlgButton( hDlg, IDC_PLUGGED, pcController->fPlugged ? BST_CHECKED : BST_UNCHECKED );
 		CheckDlgButton( hDlg, IDC_XINPUT_ENABLER, pcController->fXInput ? BST_CHECKED : BST_UNCHECKED );
+		CheckDlgButton( hDlg, IDC_N64MOUSE, pcController->fN64Mouse ? BST_CHECKED : BST_UNCHECKED);
 
 		if( hTabControl )
 			DestroyWindow( hTabControl );
 
 		if( pcController->fXInput )
-			hTabControl = CreateDialog ( g_hResourceDLL, MAKEINTRESOURCE( IDD_XCONTROLS ), hDlg, XControlsTabProc );
+			hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_XCONTROLS), hDlg, (DLGPROC)XControlsTabProc);
 		else
-			hTabControl = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_CONTROLS ), hDlg, ControlsTabProc );
+			hTabControl = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_CONTROLS), hDlg, (DLGPROC)ControlsTabProc);
 
 		{
 			hDlgItem = GetDlgItem( hDlg, IDC_CONTROLLERTAB );
@@ -1770,13 +1775,13 @@ BOOL CALLBACK ModifierTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			switch( bByte )
 			{
 			case MDT_MOVE:
-				hModProperties = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_MOD_MOVE ), hDlg, MoveModifierDialog );
+				hModProperties = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_MOD_MOVE), hDlg, (DLGPROC)MoveModifierDialog);
 				break;
 			case MDT_MACRO:
-				hModProperties = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_MOD_MACRO ), hDlg, MacroModifierDialog );
+				hModProperties = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_MOD_MACRO), hDlg, (DLGPROC)MacroModifierDialog);
 				break;
 			case MDT_CONFIG:
-				hModProperties = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_MOD_CONFIG ), hDlg, ConfigModifierDialog );
+				hModProperties = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_MOD_CONFIG), hDlg, (DLGPROC)ConfigModifierDialog);
 				break;
 			case MDT_NONE:
 			default:
@@ -1948,23 +1953,23 @@ BOOL CALLBACK ControllerPakTabProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 			switch( bByte )
 			{
 			case PAK_MEM:
-				hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_MEMPAK ), hDlg, MemPakProc );
+				hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_MEMPAK), hDlg, (DLGPROC)MemPakProc);
 				break;
 			case PAK_RUMBLE:
-				hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_RUMBLE ), hDlg, RumblePakProc );
+				hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_RUMBLE), hDlg, (DLGPROC)RumblePakProc);
 				break;
 			case PAK_TRANSFER:
-				hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_TRANSFER ), hDlg, TransferPakProc );
+				hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_TRANSFER), hDlg, (DLGPROC)TransferPakProc);
 				break;
 			case PAK_ADAPTOID:
-				hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_ADAPTOID ), hDlg, PakProc );
+				hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_ADAPTOID), hDlg, (DLGPROC)PakProc);
 				break;
 
 			case PAK_VOICE:
 			case PAK_NONRAW:
 			case PAK_NONE:
 			default:
-				hPakWindow = CreateDialog( g_hResourceDLL, MAKEINTRESOURCE( IDD_PAK_TEXT ), hDlg, PakProc );
+				hPakWindow = CreateDialog(g_hResourceDLL, MAKEINTRESOURCE(IDD_PAK_TEXT), hDlg, (DLGPROC)PakProc);
 
 			}
 			if( hPakWindow )
@@ -2118,7 +2123,7 @@ BOOL CALLBACK MemPakProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
 			}
 			return TRUE;
 		case IDC_CHGDIR:
-			if( DialogBox( g_hResourceDLL, MAKEINTRESOURCE( IDD_FOLDERS ), hDlg, FoldersDialogProc ) == TRUE )
+			if (DialogBox(g_hResourceDLL, MAKEINTRESOURCE(IDD_FOLDERS), hDlg, (DLGPROC)FoldersDialogProc) == TRUE)
 				MemPakProc( hDlg, WM_USER_UPDATE, 0, 0 );
 			return TRUE;
 
@@ -2746,7 +2751,7 @@ BOOL CALLBACK TransferPakProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			return TRUE;
 
 		case IDC_CHGDIR:
-			if( DialogBox( g_hResourceDLL, MAKEINTRESOURCE( IDD_FOLDERS ), hDlg, FoldersDialogProc ) == TRUE )
+			if (DialogBox(g_hResourceDLL, MAKEINTRESOURCE(IDD_FOLDERS), hDlg, (DLGPROC)FoldersDialogProc) == TRUE)
 				TransferPakProc( hDlg, WM_USER_UPDATE, 0, 0 );
 			return TRUE;
 
diff --git a/Source/nragev20/NRagePluginV2.cpp b/Source/nragev20/NRagePluginV2.cpp
index 970013e0d..193a68385 100644
--- a/Source/nragev20/NRagePluginV2.cpp
+++ b/Source/nragev20/NRagePluginV2.cpp
@@ -243,7 +243,7 @@ EXPORT void CALL DllConfig ( HWND hParent )
 		}
 		LeaveCriticalSection( &g_critical );
 
-		int iOK = DialogBox( g_hResourceDLL, MAKEINTRESOURCE( IDD_MAINCFGDIALOG ), hParent, MainDlgProc );
+		int iOK = DialogBox(g_hResourceDLL, MAKEINTRESOURCE(IDD_MAINCFGDIALOG), hParent, (DLGPROC)MainDlgProc);
 
 		// If we go into the dialog box, and the user navigates to the Rumble window, our FF device can get unacquired.
 		// So let's reinit them now if we're running, just to be safe --rabid
@@ -605,6 +605,9 @@ EXPORT void CALL ReadController( int Control, BYTE * Command )
 		Command[3] = RD_GAMEPAD | RD_ABSOLUTE;
 		Command[4] = RD_NOEEPROM;
 
+		if (g_pcControllers[Control].fN64Mouse)		// Is Controller a mouse?
+			Command[3] = RD_RELATIVE;
+
 		if( g_pcControllers[Control].fPakInitialized && g_pcControllers[Control].pPakData )
 		{
 			if( *(BYTE*)g_pcControllers[Control].pPakData == PAK_ADAPTOID )
diff --git a/Source/nragev20/NRagePluginV2.h b/Source/nragev20/NRagePluginV2.h
index 06057dd9f..a8eedefd4 100644
--- a/Source/nragev20/NRagePluginV2.h
+++ b/Source/nragev20/NRagePluginV2.h
@@ -126,6 +126,7 @@ typedef struct _CONTROLLER		// AN N64 CONTROLLER
 {
 	unsigned fPlugged;			// is the controller "plugged" (i.e. does the emulator see a controller on this port?)
 	unsigned fXInput;			// is the controller an xInput device?
+	unsigned fN64Mouse;			// is the controller a N64 Mouse (Relative)?
 	unsigned fRawData;			// are we using RAW mode for this controller?
 	unsigned fIsAdaptoid;		// is it an adaptoid?
 
diff --git a/Source/nragev20/NRagePluginV2.rc b/Source/nragev20/NRagePluginV2.rc
index 07d4cafa4..bfa2617ab 100644
--- a/Source/nragev20/NRagePluginV2.rc
+++ b/Source/nragev20/NRagePluginV2.rc
@@ -179,12 +179,13 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL         "Plugged",IDC_PLUGGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,45,13
-    PUSHBUTTON      "Clear Controller",IDC_CLEARCONTROLLER,63,7,67,13
-    PUSHBUTTON      "Default Config",IDC_SETDEFAULT,63,21,67,13
+    PUSHBUTTON      "Clear Controller",IDC_CLEARCONTROLLER,104,7,67,13
+    PUSHBUTTON      "Default Config",IDC_SETDEFAULT,104,21,67,13
     PUSHBUTTON      "Load Profile",IDC_LOADPROFILE,191,7,67,13
     PUSHBUTTON      "Save Profile",IDC_SAVEPROFILE,272,7,67,13
     CONTROL         "PLACEHOLDER",IDC_CONTROLLERTAB,"SysTabControl32",WS_GROUP | WS_TABSTOP,0,38,375,196
     CONTROL         "XInput",IDC_XINPUT_ENABLER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,22,37,10
+    CONTROL         "N64 Mouse",IDC_N64MOUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,22,51,10
 END
 
 IDD_SHORTCUT DIALOGEX 0, 0, 376, 235
diff --git a/Source/nragev20/NRage_Input_V2.vcxproj b/Source/nragev20/NRage_Input_V2.vcxproj
index 352338f6d..1a99b0f0d 100644
--- a/Source/nragev20/NRage_Input_V2.vcxproj
+++ b/Source/nragev20/NRage_Input_V2.vcxproj
@@ -5,36 +5,38 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FD617E80-9E40-4138-85DA-B94633972E6A}</ProjectGuid>
     <RootNamespace>NRage_Input_V2</RootNamespace>
     <ProjectName>PJ64 NRage</ProjectName>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Release.props" />
-    <Import Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Project="$(SolutionDir)PropertySheets/Win32.Debug.props" />
+    <Import Project="$(SolutionDir)PropertySheets\Platform.$(Configuration).props" />
   </ImportGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
-  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>PJ64_NRage</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PJ64_NRage_d</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">PJ64_NRage_d</TargetName>
     <OutDir>$(SolutionDir)Plugin\Input\</OutDir>
+    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)Plugin64\Input\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -45,12 +47,13 @@
     <Link>
       <AdditionalDependencies>xinput.lib;dinput8.lib;dxguid.lib;Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(Root)Source\3rd Party\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rd Party\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Debug.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="DirectInput.cpp" />
     <ClCompile Include="FileAccess.cpp" />
@@ -84,7 +87,4 @@
   <ItemGroup>
     <ResourceCompile Include="NRagePluginV2.rc" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/nragev20/Version.h b/Source/nragev20/Version.h
index 082b821b8..17e3a9216 100644
--- a/Source/nragev20/Version.h
+++ b/Source/nragev20/Version.h
@@ -26,7 +26,7 @@
 #define VERSION_MAJOR               2
 #define VERSION_MINOR               4
 #define VERSION_REVISION            0
-#define VERSION_BUILD               4
+#define VERSION_BUILD               9999
 
 #define VER_FILE_DESCRIPTION_STR    "N-Rage for Project64"
 #define VER_FILE_VERSION            VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD
diff --git a/Source/nragev20/configs/Controller1.cpf b/Source/nragev20/configs/Controller1.cpf
index 441313e1d..5d92a97df 100644
--- a/Source/nragev20/configs/Controller1.cpf
+++ b/Source/nragev20/configs/Controller1.cpf
@@ -1,5 +1,5 @@
 Plugged=1
-RawData=1
+RawData=0
 PakType=1
 RealN64Range=1
 RapidFireEnabled=0
diff --git a/Source/nragev20/resource.h b/Source/nragev20/resource.h
index ad81693c1..877b9bc84 100644
--- a/Source/nragev20/resource.h
+++ b/Source/nragev20/resource.h
@@ -361,6 +361,7 @@
 #define IDC_XC_DPAD                     1193
 #define IDC_XC_LTS                      1194
 #define IDC_XC_RTS                      1195
+#define IDC_N64MOUSE                    1196
 
 // Next default values for new objects
 // 
@@ -368,7 +369,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        147
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1196
+#define _APS_NEXT_CONTROL_VALUE         1197
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif